diff --git a/.all-contributorsrc b/.all-contributorsrc
index d7624a4314..ba9f54a99b 100644
--- a/.all-contributorsrc
+++ b/.all-contributorsrc
@@ -2590,10 +2590,10 @@
       ]
     },
     {
-      "login": "QveenSi",
+      "login": "qveensi",
       "name": "Yevhenii Huzii",
       "avatar_url": "https://avatars.githubusercontent.com/u/19945501?v=4",
-      "profile": "https://github.com/QveenSi",
+      "profile": "https://github.com/qveensi",
       "contributions": [
         "code"
       ]
@@ -2607,15 +2607,6 @@
         "code"
       ]
     },
-    {
-      "login": "QveenSi",
-      "name": "Yevhenii Huzii",
-      "avatar_url": "https://avatars.githubusercontent.com/u/19945501?v=4",
-      "profile": "https://github.com/QveenSi",
-      "contributions": [
-        "code"
-      ]
-    },
     {
       "login": "chrisweirich",
       "name": "Christian Weirich",
@@ -3136,6 +3127,1059 @@
       "contributions": [
         "doc"
       ]
+    },
+    {
+      "login": "FlorentDotMe",
+      "name": "Florent Bervas",
+      "avatar_url": "https://avatars.githubusercontent.com/u/292081?v=4",
+      "profile": "http://spoontux.net",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "dbakan",
+      "name": "Daniel Albertsen",
+      "avatar_url": "https://avatars.githubusercontent.com/u/4498077?v=4",
+      "profile": "https://ditscheri.com",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "r-xyz",
+      "name": "r-xyz",
+      "avatar_url": "https://avatars.githubusercontent.com/u/100710244?v=4",
+      "profile": "https://github.com/r-xyz",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "DrekiDegga",
+      "name": "Steven Mainor",
+      "avatar_url": "https://avatars.githubusercontent.com/u/47491036?v=4",
+      "profile": "https://github.com/DrekiDegga",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "arne-kroeger",
+      "name": "arne-kroeger",
+      "avatar_url": "https://avatars.githubusercontent.com/u/65785975?v=4",
+      "profile": "https://github.com/arne-kroeger",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "Glukose1",
+      "name": "Glukose1",
+      "avatar_url": "https://avatars.githubusercontent.com/u/167117705?v=4",
+      "profile": "https://github.com/Glukose1",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "Scarzy",
+      "name": "Scarzy",
+      "avatar_url": "https://avatars.githubusercontent.com/u/1197791?v=4",
+      "profile": "https://github.com/Scarzy",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "setpill",
+      "name": "setpill",
+      "avatar_url": "https://avatars.githubusercontent.com/u/37372069?v=4",
+      "profile": "https://github.com/setpill",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "swift2512",
+      "name": "swift2512",
+      "avatar_url": "https://avatars.githubusercontent.com/u/3755203?v=4",
+      "profile": "https://github.com/swift2512",
+      "contributions": [
+        "bug"
+      ]
+    },
+    {
+      "login": "DarrenRainey",
+      "name": "Darren Rainey",
+      "avatar_url": "https://avatars.githubusercontent.com/u/6136439?v=4",
+      "profile": "https://darrenraineys.co.uk",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "maciej-poleszczyk",
+      "name": "maciej-poleszczyk",
+      "avatar_url": "https://avatars.githubusercontent.com/u/133033121?v=4",
+      "profile": "https://github.com/maciej-poleszczyk",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "sgross-emlix",
+      "name": "Sebastian Groß",
+      "avatar_url": "https://avatars.githubusercontent.com/u/143394709?v=4",
+      "profile": "https://github.com/sgross-emlix",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "AnouarTouati",
+      "name": "Anouar Touati",
+      "avatar_url": "https://avatars.githubusercontent.com/u/41107778?v=4",
+      "profile": "https://github.com/AnouarTouati",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "aHVzY2g",
+      "name": "aHVzY2g",
+      "avatar_url": "https://avatars.githubusercontent.com/u/25596663?v=4",
+      "profile": "https://github.com/aHVzY2g",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "brlin-tw",
+      "name": "林博仁 Buo-ren Lin",
+      "avatar_url": "https://avatars.githubusercontent.com/u/13408130?v=4",
+      "profile": "https://brlin.me",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "addex12",
+      "name": "Adugna Gizaw",
+      "avatar_url": "https://avatars.githubusercontent.com/u/18550946?v=4",
+      "profile": "https://orbalia.pythonanywhere.com/",
+      "contributions": [
+        "translation"
+      ]
+    },
+    {
+      "login": "jostrander",
+      "name": "Jesse Ostrander",
+      "avatar_url": "https://avatars.githubusercontent.com/u/760989?v=4",
+      "profile": "https://github.com/jostrander",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "azmcnutt",
+      "name": "James M",
+      "avatar_url": "https://avatars.githubusercontent.com/u/31522486?v=4",
+      "profile": "https://github.com/azmcnutt",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "Fiala06",
+      "name": "Fiala06",
+      "avatar_url": "https://avatars.githubusercontent.com/u/5183146?v=4",
+      "profile": "https://github.com/Fiala06",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "ntaylor-86",
+      "name": "Nathan Taylor",
+      "avatar_url": "https://avatars.githubusercontent.com/u/28693782?v=4",
+      "profile": "https://github.com/ntaylor-86",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "fvollmer",
+      "name": "fvollmer",
+      "avatar_url": "https://avatars.githubusercontent.com/u/16699443?v=4",
+      "profile": "https://github.com/fvollmer",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "36864",
+      "name": "36864",
+      "avatar_url": "https://avatars.githubusercontent.com/u/109086466?v=4",
+      "profile": "https://github.com/36864",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "CloCkWeRX",
+      "name": "Daniel O'Connor",
+      "avatar_url": "https://avatars.githubusercontent.com/u/365751?v=4",
+      "profile": "http://clockwerx.blogspot.com/",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "BeatSpark",
+      "name": "BeatSpark",
+      "avatar_url": "https://avatars.githubusercontent.com/u/102852568?v=4",
+      "profile": "https://github.com/BeatSpark",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "mrdahbi",
+      "name": "mrdahbi",
+      "avatar_url": "https://avatars.githubusercontent.com/u/59203607?v=4",
+      "profile": "https://github.com/mrdahbi",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "chfsx",
+      "name": "Fabian Schmid",
+      "avatar_url": "https://avatars.githubusercontent.com/u/6661332?v=4",
+      "profile": "http://sr.solutions",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "realchrisolin",
+      "name": "Chris Olin",
+      "avatar_url": "https://avatars.githubusercontent.com/u/1288116?v=4",
+      "profile": "https://www.chrisolin.com",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "mnemonicly",
+      "name": "Dan",
+      "avatar_url": "https://avatars.githubusercontent.com/u/3803132?v=4",
+      "profile": "https://github.com/mnemonicly",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "NebelKreis",
+      "name": "Nebel",
+      "avatar_url": "https://avatars.githubusercontent.com/u/43917728?v=4",
+      "profile": "https://github.com/NebelKreis",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "test1337ahp",
+      "name": "test1337ahp",
+      "avatar_url": "https://avatars.githubusercontent.com/u/132433803?v=4",
+      "profile": "https://github.com/test1337ahp",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "JonathonReinhart",
+      "name": "Jonathon Reinhart",
+      "avatar_url": "https://avatars.githubusercontent.com/u/1916566?v=4",
+      "profile": "https://github.com/JonathonReinhart",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "aranar-pro",
+      "name": "aranar-pro",
+      "avatar_url": "https://avatars.githubusercontent.com/u/484742?v=4",
+      "profile": "https://github.com/aranar-pro",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "phil-flip",
+      "name": "Phil",
+      "avatar_url": "https://avatars.githubusercontent.com/u/27019397?v=4",
+      "profile": "https://github.com/phil-flip",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "fe80",
+      "name": "Steffy Fort",
+      "avatar_url": "https://avatars.githubusercontent.com/u/6473460?v=4",
+      "profile": "https://fe80.fr/",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "sorvani",
+      "name": "Jared Busch",
+      "avatar_url": "https://avatars.githubusercontent.com/u/3302372?v=4",
+      "profile": "https://github.com/sorvani",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "seanborg-codethink",
+      "name": "seanborg-codethink",
+      "avatar_url": "https://avatars.githubusercontent.com/u/111956991?v=4",
+      "profile": "https://github.com/seanborg-codethink",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "dkaatz",
+      "name": "dkaatz",
+      "avatar_url": "https://avatars.githubusercontent.com/u/160669961?v=4",
+      "profile": "https://github.com/dkaatz",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "DanielRuf",
+      "name": "Daniel Ruf",
+      "avatar_url": "https://avatars.githubusercontent.com/u/827205?v=4",
+      "profile": "https://threema.id/74SF7MW6?text=",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "ahpaleus",
+      "name": "ahpaleus",
+      "avatar_url": "https://avatars.githubusercontent.com/u/38883201?v=4",
+      "profile": "https://github.com/ahpaleus",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "mink-adao-duy",
+      "name": "Anh DAO-DUY",
+      "avatar_url": "https://avatars.githubusercontent.com/u/22906055?v=4",
+      "profile": "https://github.com/mink-adao-duy",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "Serdnad",
+      "name": "Andres Gutierrez",
+      "avatar_url": "https://avatars.githubusercontent.com/u/4723453?v=4",
+      "profile": "https://github.com/Serdnad",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "wewhite",
+      "name": "Warren White",
+      "avatar_url": "https://avatars.githubusercontent.com/u/111083379?v=4",
+      "profile": "https://github.com/wewhite",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "robintemme",
+      "name": "Robin Temme",
+      "avatar_url": "https://avatars.githubusercontent.com/u/2809241?v=4",
+      "profile": "https://robintemme.de/",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "herroworrd",
+      "name": "herroworrd",
+      "avatar_url": "https://avatars.githubusercontent.com/u/47008367?v=4",
+      "profile": "https://github.com/herroworrd",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "vicleos",
+      "name": "vicleos",
+      "avatar_url": "https://avatars.githubusercontent.com/u/28558609?v=4",
+      "profile": "https://mubiu.com/",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "thinkl33t",
+      "name": "Bob Clough",
+      "avatar_url": "https://avatars.githubusercontent.com/u/1016780?v=4",
+      "profile": "http://thinkl33t.co.uk/",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "brandon-bailey",
+      "name": "Brandon Daniel Bailey",
+      "avatar_url": "https://avatars.githubusercontent.com/u/10648463?v=4",
+      "profile": "https://github.com/brandon-bailey",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "marcquark",
+      "name": "Marc Bartelt",
+      "avatar_url": "https://avatars.githubusercontent.com/u/23556080?v=4",
+      "profile": "https://github.com/marcquark",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "manu-crealytics",
+      "name": "manu-crealytics",
+      "avatar_url": "https://avatars.githubusercontent.com/u/18286893?v=4",
+      "profile": "https://github.com/manu-crealytics",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "Galaxy102",
+      "name": "Konstantin Köhring",
+      "avatar_url": "https://avatars.githubusercontent.com/u/18245993?v=4",
+      "profile": "https://www.galaxy102.de/",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "deloz",
+      "name": "Deloz",
+      "avatar_url": "https://avatars.githubusercontent.com/u/685167?v=4",
+      "profile": "https://deloz.net/",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "mbrrg",
+      "name": "Martin Berg",
+      "avatar_url": "https://avatars.githubusercontent.com/u/2682426?v=4",
+      "profile": "https://github.com/mbrrg",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "Nothing4You",
+      "name": "Richard Schwab",
+      "avatar_url": "https://avatars.githubusercontent.com/u/3694534?v=4",
+      "profile": "https://github.com/Nothing4You",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "rickheil",
+      "name": "Rick Heil",
+      "avatar_url": "https://avatars.githubusercontent.com/u/8959676?v=4",
+      "profile": "https://rickheil.com/",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "rosscdh",
+      "name": "Ross Crawford-d'Heureuse",
+      "avatar_url": "https://avatars.githubusercontent.com/u/397106?v=4",
+      "profile": "https://github.com/rosscdh",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "McG800",
+      "name": "Ryan McGuire",
+      "avatar_url": "https://avatars.githubusercontent.com/u/1621107?v=4",
+      "profile": "https://github.com/McG800",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "SBrown2021",
+      "name": "SBrown2021",
+      "avatar_url": "https://avatars.githubusercontent.com/u/77835667?v=4",
+      "profile": "https://github.com/SBrown2021",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "serkanerip",
+      "name": "Serkan",
+      "avatar_url": "https://avatars.githubusercontent.com/u/8780913?v=4",
+      "profile": "https://github.com/serkanerip",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "Shankschn",
+      "name": "Shanks",
+      "avatar_url": "https://avatars.githubusercontent.com/u/63188620?v=4",
+      "profile": "https://www.yudelei.com/",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "cendai-mis",
+      "name": "cendai-mis",
+      "avatar_url": "https://avatars.githubusercontent.com/u/198525698?v=4",
+      "profile": "https://github.com/cendai-mis",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "smcpeck",
+      "name": "Shaun McPeck",
+      "avatar_url": "https://avatars.githubusercontent.com/u/8724583?v=4",
+      "profile": "https://smcpeck.github.io/",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "snazy2000",
+      "name": "Stephen",
+      "avatar_url": "https://avatars.githubusercontent.com/u/1378836?v=4",
+      "profile": "https://github.com/snazy2000",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "Nevets82",
+      "name": "Steven",
+      "avatar_url": "https://avatars.githubusercontent.com/u/4462739?v=4",
+      "profile": "http://nevets82.github.io/",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "Mateus-Romera",
+      "name": "Mateus Villar",
+      "avatar_url": "https://avatars.githubusercontent.com/u/29017267?v=4",
+      "profile": "https://mateusvillar.com/",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "mzack5020",
+      "name": "Matthew Zackschewski",
+      "avatar_url": "https://avatars.githubusercontent.com/u/12749393?v=4",
+      "profile": "https://github.com/mzack5020",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "firefrei",
+      "name": "Matthias Frei",
+      "avatar_url": "https://avatars.githubusercontent.com/u/12660103?v=4",
+      "profile": "https://www.frei.media/",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "nticaric",
+      "name": "Nenad Ticaric",
+      "avatar_url": "https://avatars.githubusercontent.com/u/824840?v=4",
+      "profile": "https://github.com/nticaric",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "Scorcher",
+      "name": "Nikolay Didenko",
+      "avatar_url": "https://avatars.githubusercontent.com/u/706439?v=4",
+      "profile": "https://github.com/Scorcher",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "nunomaduro",
+      "name": "Nuno Maduro",
+      "avatar_url": "https://avatars.githubusercontent.com/u/5457236?v=4",
+      "profile": "https://nunomaduro.com/sponsorships",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "owalerys",
+      "name": "Oliver Walerys",
+      "avatar_url": "https://avatars.githubusercontent.com/u/8883074?v=4",
+      "profile": "https://tektikhq.com/",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "rcmcdonald91",
+      "name": "R. Christian McDonald",
+      "avatar_url": "https://avatars.githubusercontent.com/u/3102039?v=4",
+      "profile": "https://keybase.io/rcmcdonald91",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "nixn",
+      "name": "nix",
+      "avatar_url": "https://avatars.githubusercontent.com/u/1525581?v=4",
+      "profile": "https://nnix.net/",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "octobunny",
+      "name": "octobunny",
+      "avatar_url": "https://avatars.githubusercontent.com/u/55462380?v=4",
+      "profile": "https://github.com/octobunny",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "sreyemnayr",
+      "name": "Ryan",
+      "avatar_url": "https://avatars.githubusercontent.com/u/8558670?v=4",
+      "profile": "https://github.com/sreyemnayr",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "p3nj",
+      "name": "p3nj",
+      "avatar_url": "https://avatars.githubusercontent.com/u/1501022?v=4",
+      "profile": "https://benji.ltd/",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "timwsuqld",
+      "name": "Tim White",
+      "avatar_url": "https://avatars.githubusercontent.com/u/6201617?v=4",
+      "profile": "https://github.com/timwsuqld",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "yannikp",
+      "name": "yannikp",
+      "avatar_url": "https://avatars.githubusercontent.com/u/22473767?v=4",
+      "profile": "https://github.com/yannikp",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "viclou",
+      "name": "victoria",
+      "avatar_url": "https://avatars.githubusercontent.com/u/20525448?v=4",
+      "profile": "https://github.com/viclou",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "valentyntu",
+      "name": "Valentyn Tulub",
+      "avatar_url": "https://avatars.githubusercontent.com/u/40685314?v=4",
+      "profile": "https://github.com/valentyntu",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "Wouter0100",
+      "name": "Wouter van Os",
+      "avatar_url": "https://avatars.githubusercontent.com/u/864520?v=4",
+      "profile": "http://wouter0100.nl/",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "xWyatt",
+      "name": "Wyatt Teeter",
+      "avatar_url": "https://avatars.githubusercontent.com/u/3946540?v=4",
+      "profile": "https://www.linkedin.com/in/wyatt-teeter",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "terwey",
+      "name": "Yorick Terweijden",
+      "avatar_url": "https://avatars.githubusercontent.com/u/1596124?v=4",
+      "profile": "https://github.com/terwey",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "bmkalle",
+      "name": "bmkalle",
+      "avatar_url": "https://avatars.githubusercontent.com/u/69298836?v=4",
+      "profile": "https://github.com/bmkalle",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "bricelabelle",
+      "name": "bricelabelle",
+      "avatar_url": "https://avatars.githubusercontent.com/u/28403467?v=4",
+      "profile": "https://github.com/bricelabelle",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "corydlamb",
+      "name": "corydlamb",
+      "avatar_url": "https://avatars.githubusercontent.com/u/97770090?v=4",
+      "profile": "https://github.com/corydlamb",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "splashx",
+      "name": "Diogenes S. Jesus",
+      "avatar_url": "https://avatars.githubusercontent.com/u/1154133?v=4",
+      "profile": "http://twitter.com/splash",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "dkmansion",
+      "name": "D M",
+      "avatar_url": "https://avatars.githubusercontent.com/u/5826629?v=4",
+      "profile": "https://github.com/dkmansion",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "Jarli01",
+      "name": "Dustin B",
+      "avatar_url": "https://avatars.githubusercontent.com/u/14837699?v=4",
+      "profile": "https://github.com/Jarli01",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "fabiang",
+      "name": "Fabian Grutschus",
+      "avatar_url": "https://avatars.githubusercontent.com/u/348344?v=4",
+      "profile": "https://github.com/fabiang",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "MelonSmasher",
+      "name": "MelonSmasher",
+      "avatar_url": "https://avatars.githubusercontent.com/u/1491053?v=4",
+      "profile": "https://github.com/MelonSmasher",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "AlexanderWPapyrus",
+      "name": "AlexanderWPapyrus",
+      "avatar_url": "https://avatars.githubusercontent.com/u/80526133?v=4",
+      "profile": "https://github.com/AlexanderWPapyrus",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "disc",
+      "name": "Alexandr Hacicheant",
+      "avatar_url": "https://avatars.githubusercontent.com/u/306231?v=4",
+      "profile": "https://github.com/disc",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "hex128",
+      "name": "Hex",
+      "avatar_url": "https://avatars.githubusercontent.com/u/3032891?v=4",
+      "profile": "https://hex128.io/",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "arukompas",
+      "name": "Arunas Skirius",
+      "avatar_url": "https://avatars.githubusercontent.com/u/8697942?v=4",
+      "profile": "https://github.com/arukompas",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "benperiton",
+      "name": "Ben Periton",
+      "avatar_url": "https://avatars.githubusercontent.com/u/104396?v=4",
+      "profile": "https://github.com/benperiton",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "byronwolfman",
+      "name": "Byron Wolfman",
+      "avatar_url": "https://avatars.githubusercontent.com/u/11906832?v=4",
+      "profile": "https://wolfman.dev/",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "CalvinSchwartz",
+      "name": "Calvin",
+      "avatar_url": "https://avatars.githubusercontent.com/u/56485508?v=4",
+      "profile": "https://github.com/CalvinSchwartz",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "juanfont",
+      "name": "Juan Font",
+      "avatar_url": "https://avatars.githubusercontent.com/u/181059?v=4",
+      "profile": "https://github.com/juanfont",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "juhotaipale",
+      "name": "Juho Taipale",
+      "avatar_url": "https://avatars.githubusercontent.com/u/13137708?v=4",
+      "profile": "https://github.com/juhotaipale",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "KorvinSzanto",
+      "name": "Korvin Szanto",
+      "avatar_url": "https://avatars.githubusercontent.com/u/1007419?v=4",
+      "profile": "https://github.com/KorvinSzanto",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "sniff122",
+      "name": "Lewis Foster",
+      "avatar_url": "https://avatars.githubusercontent.com/u/8513053?v=4",
+      "profile": "https://lewisfoster.foo/",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "loganswartz",
+      "name": "Logan Swartzendruber",
+      "avatar_url": "https://avatars.githubusercontent.com/u/33877541?v=4",
+      "profile": "https://github.com/loganswartz",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "lopezio",
+      "name": "Lorenzo P.",
+      "avatar_url": "https://avatars.githubusercontent.com/u/1156208?v=4",
+      "profile": "https://github.com/lopezio",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "m4us1ne",
+      "name": "Lukas Jung",
+      "avatar_url": "https://avatars.githubusercontent.com/u/33946590?v=4",
+      "profile": "https://github.com/m4us1ne",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "LeafedFox",
+      "name": "Ellie",
+      "avatar_url": "https://avatars.githubusercontent.com/u/10965027?v=4",
+      "profile": "https://leafedfox.xyz/",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "gastamper",
+      "name": "GA Stamper",
+      "avatar_url": "https://avatars.githubusercontent.com/u/20960555?v=4",
+      "profile": "https://github.com/gastamper",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "gl-pup",
+      "name": "Guillaume Lefranc",
+      "avatar_url": "https://avatars.githubusercontent.com/u/206553556?v=4",
+      "profile": "https://github.com/gl-pup",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "dasjoe",
+      "name": "Hajo Möller",
+      "avatar_url": "https://avatars.githubusercontent.com/u/733892?v=4",
+      "profile": "https://github.com/dasjoe",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "pottom",
+      "name": "Istvan Basa",
+      "avatar_url": "https://avatars.githubusercontent.com/u/3420063?v=4",
+      "profile": "https://github.com/pottom",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "jjasghar",
+      "name": "JJ Asghar",
+      "avatar_url": "https://avatars.githubusercontent.com/u/810824?v=4",
+      "profile": "https://jjasghar.github.io/",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "JemCdo",
+      "name": "James E. Msenga",
+      "avatar_url": "https://avatars.githubusercontent.com/u/40404495?v=4",
+      "profile": "https://github.com/JemCdo",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "jfwiebe",
+      "name": "Jan Felix Wiebe",
+      "avatar_url": "https://avatars.githubusercontent.com/u/6865786?v=4",
+      "profile": "https://github.com/jfwiebe",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "drexljo",
+      "name": "Jo Drexl",
+      "avatar_url": "https://avatars.githubusercontent.com/u/43412008?v=4",
+      "profile": "https://www.nfon.com/",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "austinsasko",
+      "name": "Austin Sasko",
+      "avatar_url": "https://avatars.githubusercontent.com/u/4807843?v=4",
+      "profile": "https://github.com/austinsasko",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "JassonCordones",
+      "name": "Jasson",
+      "avatar_url": "https://avatars.githubusercontent.com/u/4875039?v=4",
+      "profile": "http://jassoncordones.github.io",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "Tinyblargon",
+      "name": "Okean",
+      "avatar_url": "https://avatars.githubusercontent.com/u/76069640?v=4",
+      "profile": "https://github.com/Tinyblargon",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "amedranogil",
+      "name": "Alejandro Medrano",
+      "avatar_url": "https://avatars.githubusercontent.com/u/6515064?v=4",
+      "profile": "https://www.lst.tfo.upm.es/alejandro-medrano/",
+      "contributions": [
+        "code"
+      ]
     }
   ]
 }
diff --git a/.env.dev.docker b/.env.dev.docker
index 7b9e2000cf..f47e69ce4b 100644
--- a/.env.dev.docker
+++ b/.env.dev.docker
@@ -1,6 +1,8 @@
 # --------------------------------------------
 # REQUIRED: DB SETUP
 # --------------------------------------------
+# https://mariadb.com/kb/en/mariadb-server-docker-official-image-environment-variables/
+
 MYSQL_DATABASE=snipeit
 MYSQL_USER=snipeit
 MYSQL_PASSWORD=changeme1234
@@ -9,12 +11,12 @@ MYSQL_ROOT_PASSWORD=changeme1234
 # REQUIRED: BASIC APP SETTINGS
 # --------------------------------------------
 APP_ENV=develop
-APP_DEBUG=false
+APP_DEBUG=true
 # please regenerate the APP_KEY value by calling `docker-compose run --rm snipeit bash` and then `php artisan key:generate --show` and then copy paste the value here
 APP_KEY=base64:3ilviXqB9u6DX1NRcyWGJ+sjySF+H18CPDGb3+IVwMQ=
 APP_URL=http://localhost:8000
 APP_TIMEZONE='UTC'
-APP_LOCALE=en
+APP_LOCALE=en-US
 MAX_RESULTS=500
 
 # --------------------------------------------
@@ -33,6 +35,7 @@ DB_USERNAME=snipeit
 DB_PASSWORD=changeme1234
 DB_PREFIX=null
 DB_DUMP_PATH='/usr/bin'
+DB_DUMP_SKIP_SSL=true
 DB_CHARSET=utf8mb4
 DB_COLLATION=utf8mb4_unicode_ci
 
@@ -76,6 +79,13 @@ MAIL_BACKUP_NOTIFICATION_DRIVER=null
 MAIL_BACKUP_NOTIFICATION_ADDRESS=null
 BACKUP_ENV=true
 
+# --------------------------------------------
+# OPTIONAL: CHANGE PHP UPLOAD LIMITS (UNCOMMENT WHEN NEEDING TO BE CHANGED)
+# --------------------------------------------
+#PHP_UPLOAD_LIMIT=10
+#PHP_POST_MAX_SIZE=10
+#PHP_UPLOAD_MAX_FILESIZE=10
+#PHP_MEMORY_LIMIT=10
 
 # --------------------------------------------
 # OPTIONAL: SESSION SETTINGS
@@ -156,7 +166,7 @@ RESET_PASSWORD_LINK_EXPIRES=900
 # --------------------------------------------
 # OPTIONAL: MISC
 # --------------------------------------------
-LOG_CHANNEL=stderr
+LOG_CHANNEL=single
 LOG_MAX_DAYS=10
 APP_LOCKED=false
 APP_CIPHER=AES-256-CBC
diff --git a/.env.docker b/.env.docker
index 35c10bfde1..88b65b8f79 100644
--- a/.env.docker
+++ b/.env.docker
@@ -1,7 +1,7 @@
 # --------------------------------------------
 # REQUIRED: DOCKER SPECIFIC SETTINGS
 # --------------------------------------------
-APP_VERSION=v6.4.1
+APP_VERSION=
 APP_PORT=8000
 
 # --------------------------------------------
@@ -9,12 +9,12 @@ APP_PORT=8000
 # --------------------------------------------
 APP_ENV=production
 APP_DEBUG=false
-# Please regenerate the APP_KEY value by calling `docker compose run --rm snipeit php artisan key:generate --show`. Copy paste the value here
+# Please regenerate the APP_KEY value by calling `docker compose run --rm app php artisan key:generate --show`. Copy paste the value here
 APP_KEY=base64:3ilviXqB9u6DX1NRcyWGJ+sjySF+H18CPDGb3+IVwMQ=
 APP_URL=http://localhost:8000
 # https://en.wikipedia.org/wiki/List_of_tz_database_time_zones - TZ identifier
 APP_TIMEZONE='UTC'
-APP_LOCALE=en
+APP_LOCALE=en-US
 MAX_RESULTS=500
 
 # --------------------------------------------
@@ -35,6 +35,7 @@ DB_PASSWORD=changeme1234
 MYSQL_ROOT_PASSWORD=changeme1234
 DB_PREFIX=null
 DB_DUMP_PATH='/usr/bin'
+DB_DUMP_SKIP_SSL=true
 DB_CHARSET=utf8mb4
 DB_COLLATION=utf8mb4_unicode_ci
 
@@ -83,6 +84,15 @@ MAIL_BACKUP_NOTIFICATION_DRIVER=null
 MAIL_BACKUP_NOTIFICATION_ADDRESS=null
 BACKUP_ENV=true
 
+# --------------------------------------------
+# OPTIONAL: CHANGE PHP UPLOAD LIMITS (UNCOMMENT WHEN NEEDING TO BE CHANGED)
+# --------------------------------------------
+#PHP_UPLOAD_LIMIT=10
+#PHP_POST_MAX_SIZE=10
+#PHP_UPLOAD_MAX_FILESIZE=10
+#PHP_MEMORY_LIMIT=10
+
+
 # --------------------------------------------
 # OPTIONAL: SESSION SETTINGS
 # --------------------------------------------
@@ -97,7 +107,7 @@ API_TOKEN_EXPIRATION_YEARS=40
 # --------------------------------------------
 # OPTIONAL: SECURITY HEADER SETTINGS
 # --------------------------------------------
-APP_TRUSTED_PROXIES=192.168.1.1,10.0.0.1,172.0.0.0/8
+APP_TRUSTED_PROXIES=192.168.1.1,10.0.0.1,172.16.0.0/12
 ALLOW_IFRAMING=false
 REFERRER_POLICY=same-origin
 ENABLE_CSP=false
diff --git a/.env.dusk.example b/.env.dusk.example
index 2f16f44c7a..e306a06cf8 100644
--- a/.env.dusk.example
+++ b/.env.dusk.example
@@ -6,7 +6,7 @@ APP_DEBUG=false
 APP_KEY=base64:hTUIUh9CP6dQx+6EjSlfWTgbaMaaRvlpEwk45vp+xmk=
 APP_URL=http://127.0.0.1:8000
 APP_TIMEZONE='US/Eastern'
-APP_LOCALE=en
+APP_LOCALE=en-US
 APP_LOCKED=false
 MAX_RESULTS=200
 
diff --git a/.env.example b/.env.example
index c92dc22b71..81de24ead1 100644
--- a/.env.example
+++ b/.env.example
@@ -30,8 +30,11 @@ DB_USERNAME=null
 DB_PASSWORD=null
 DB_PREFIX=null
 DB_DUMP_PATH='/usr/bin'
+DB_DUMP_SKIP_SSL=false
 DB_CHARSET=utf8mb4
 DB_COLLATION=utf8mb4_unicode_ci
+DB_SANITIZE_BY_DEFAULT=false
+
 
 # --------------------------------------------
 # OPTIONAL: SSL DATABASE SETTINGS
@@ -78,6 +81,12 @@ MAIL_BACKUP_NOTIFICATION_ADDRESS=null
 BACKUP_ENV=true
 ALLOW_BACKUP_DELETE=false
 ALLOW_DATA_PURGE=false
+ALL_BACKUP_KEEP_DAYS=7
+DAILY_BACKUP_KEEP_DAYS=16
+WEEKLY_BACKUP_KEEP_WEEKS=8
+MONTHLY_BACKUP_KEEP_MONTHS=4
+YEARLY_BACKUP_KEEP_YEARS=2
+BACKUP_PURGE_OLDEST_AT_MEGS=5000
 
 # --------------------------------------------
 # OPTIONAL: SESSION SETTINGS
@@ -87,10 +96,11 @@ SESSION_LIFETIME=12000
 EXPIRE_ON_CLOSE=false
 ENCRYPT=false
 COOKIE_NAME=snipeit_session
+PASSPORT_COOKIE_NAME='snipeit_passport_token'
 COOKIE_DOMAIN=null
 SECURE_COOKIES=false
 API_TOKEN_EXPIRATION_YEARS=15
-BS_TABLE_STORAGE=cookieStorage
+BS_TABLE_STORAGE=localStorage
 BS_TABLE_DEEPLINK=true
 
 # --------------------------------------------
@@ -169,6 +179,7 @@ PASSWORD_RESET_MAX_ATTEMPTS_PER_MIN=50
 # OPTIONAL: MISC
 # --------------------------------------------
 LOG_CHANNEL=single
+LOG_DEPRECATIONS=false
 LOG_MAX_DAYS=10
 APP_LOCKED=false
 APP_CIPHER=AES-256-CBC
@@ -183,6 +194,7 @@ REPORT_TIME_LIMIT=12000
 REQUIRE_SAML=false
 API_THROTTLE_PER_MINUTE=120
 CSV_ESCAPE_FORMULAS=true
+LIVEWIRE_URL_PREFIX=null
 
 # --------------------------------------------
 # OPTIONAL: HASHING
diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
deleted file mode 100644
index b5f067cc68..0000000000
--- a/.github/ISSUE_TEMPLATE.md
+++ /dev/null
@@ -1,38 +0,0 @@
-#### Expected Behavior (or desired behavior if a feature request)
-
-(what you expect to happen goes here)
-
------
-
-#### Actual Behavior
-
-(what actually happens goes here)
-
------
-
-#### Please confirm you have done the following before posting your bug report:
-
-- [ ] I have enabled debug mode 
-- [ ] I have read [checked the Common Issues page](https://snipe-it.readme.io/docs/common-issues)
-
------
-#### Provide answers to these questions:
-
-- Is this a fresh install or an upgrade? 
-- Version of Snipe-IT you're running
-- Version of PHP you're running
-- Version of MySQL/MariaDB you're running
-- What OS and web server you're running Snipe-IT on
-- What method you used to install Snipe-IT (install.sh, manual installation, docker, etc)
-- WITH DEBUG TURNED ON, if you're getting an error in your browser, include that error
-- What specific Snipe-IT page you're on, and what specific element you're interacting with to trigger the error
-- If a stacktrace is provided in the error, include that too.
-- Any errors that appear in your browser's error console.
-- Confirm whether the error is reproducible on the demo: https://snipeitapp.com/demo.
-- Include any additional information you can find in `storage/logs` and your webserver's logs.
-- Include what you've done so far in the installation, and if you got any error messages along the way.
-- Indicate whether or not you've manually edited any data directly in the database
-
-Please do not post an issue without answering the related questions above. If you have opened a different issue and already answered these questions, answer them again, once for every ticket. It will be next to impossible for us to help you.
-
-https://snipe-it.readme.io/docs/getting-help
diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml
deleted file mode 100644
index 5cc00c2a31..0000000000
--- a/.github/ISSUE_TEMPLATE/bug_report.yml
+++ /dev/null
@@ -1,129 +0,0 @@
-name: Bug Report
-description: Create a report to help us improve
-body:
-  - type: checkboxes
-    attributes:
-      label: Debug mode
-      description: Please confirm you have done the following before posting your bug report
-      options:
-        - label: I have enabled debug mode
-          required: true
-        - label: I have read [checked the Common Issues page](https://snipe-it.readme.io/docs/common-issues)
-          required: true
-  - type: textarea
-    attributes:
-      label: Describe the bug
-      description: A clear and concise description of what the bug is.
-    validations:
-      required: true
-  - type: textarea
-    attributes:
-      label: Reproduction steps
-      description: Steps to reproduce the behavior.
-      value: |
-        1.
-        2.
-        3.
-        ...
-    validations:
-        required: true
-  - type: textarea
-    attributes:
-      label: Expected behavior
-      description: A clear and concise description of what you expected to happen.
-    validations:
-      required: true
-  - type: textarea
-    attributes:
-      label: Screenshots
-      description: 'If applicable, add screenshots to help explain your problem.'
-  - type: markdown
-    attributes:
-      value: "### Server"
-  - type: input
-    attributes:
-      label: Snipe-IT Version
-    validations:
-      required: true
-  - type: input
-    id: server_operatingSystem
-    attributes:
-      label: Operating System
-      description: 'e.g. Ubuntu, Windows'
-    validations:
-      required: true
-  - type: input
-    attributes:
-      label: Web Server
-      description: 'e.g. Apache, IIS'
-    validations:
-      required: true
-  - type: input
-    attributes:
-      label: PHP Version
-    validations:
-      required: true
-  - type: markdown
-    attributes:
-      value: "### Desktop"
-  - type: input
-    id: desktop_operatingSystem
-    attributes:
-      label: Operating System
-      description: 'e.g. Ubuntu, Windows'
-  - type: input
-    id: desktop_browser
-    attributes:
-      label: Browser
-      description: 'e.g. Google Chrome, Safari'
-  - type: input
-    id: desktop_version
-    attributes:
-      label: Version
-      description: 'e.g. 93'
-  - type: markdown
-    attributes:
-      value: "### Mobile"
-  - type: input
-    attributes:
-      label: Device
-      description: 'e.g. iPhone 6, Pixel 4a'
-  - type: input
-    id: mobile_operatingSystem
-    attributes:
-      label: Operating System
-      description: 'e.g. iOS 8.1, Android 9'
-  - type: input
-    id: mobile_browser
-    attributes:
-      label: Browser
-      description: 'e.g. Google Chrome, Safari'
-  - type: input
-    id: mobile_version
-    attributes:
-      label: Version
-      description: 'e.g. 93'
-  - type: textarea
-    attributes:
-      label: Error messages
-      description: |
-        WITH DEBUG TURNED ON, if you're getting an error in your browser, include that error
-        If a stacktrace is provided in the error, include that too.
-        Any errors that appear in your browser's error console.
-        Confirm whether the error is reproducible on the demo: https://snipeitapp.com/demo.
-        Include any additional information you can find in `storage/logs` and your webserver's logs.
-        Include the output from `php -m` (this should display what modules you have enabled.)
-      render: shell
-  - type: textarea
-    attributes:
-      label: Additional context
-      description: |
-        Is this a fresh install or an upgrade?
-        What OS and web server you're running Snipe-IT on
-        What method you used to install Snipe-IT (install.sh, manual installation, docker, etc)
-        Include what you've done so far in the installation, and if you got any error messages along the way.
-        Indicate whether or not you've manually edited any data directly in the database
-        Add any other context about the problem here.
-  - type: markdown
-    attributes:
-      value: Please do not post an issue without answering the related questions above. If you have opened a different issue and already answered these questions, answer them again, once for every ticket. It will be next to impossible for us to help you.
diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml
deleted file mode 100644
index 3ba13e0cec..0000000000
--- a/.github/ISSUE_TEMPLATE/config.yml
+++ /dev/null
@@ -1 +0,0 @@
-blank_issues_enabled: false
diff --git a/.github/ISSUE_TEMPLATE/feature_request.yml b/.github/ISSUE_TEMPLATE/feature_request.yml
deleted file mode 100644
index dec3a8fe08..0000000000
--- a/.github/ISSUE_TEMPLATE/feature_request.yml
+++ /dev/null
@@ -1,25 +0,0 @@
-name: Feature Request
-description: Suggest an idea for this project
-title: "[Feature Request]: "
-labels: ["feature request"]
-body:
-  - type: textarea
-    attributes:
-      label: Is your feature request related to a problem? Please describe.
-      description: A clear and concise description of what the problem is. The more information you can provide about your use-case, the more liklely we are to consider your feature.
-    validations:
-      required: true
-  - type: textarea
-    attributes:
-      label: Describe the solution you'd like
-      description: A clear and concise description of what you want to happen.
-    validations:
-      required: true
-  - type: textarea
-    attributes:
-      label: Describe alternatives you've considered
-      description: A clear and concise description of any alternative solutions or features you've considered.
-  - type: textarea
-    attributes:
-      label: Additional context
-      description: Add any other context or screenshots about the feature request here.
diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
deleted file mode 100644
index 7ef56a0d5f..0000000000
--- a/.github/pull_request_template.md
+++ /dev/null
@@ -1,40 +0,0 @@
-# Description
-
-Please include a summary of the change and which issue is fixed. Please also include relevant motivation and context, providing screenshots where practical. List any dependencies that are required for this change.
-
-Fixes # (issue)
-
-## Type of change
-
-Please delete options that are not relevant.
-
-- [ ] Bug fix (non-breaking change which fixes an issue)
-- [ ] New feature (non-breaking change which adds functionality)
-- [ ] Breaking change (fix or feature that would cause existing functionality to not work as expected)
-- [ ] This change requires a documentation update
-
-# How Has This Been Tested?
-
-Please describe the tests that you ran to verify your changes. Provide instructions so we can reproduce. Please also list any relevant details for your test configuration
-
-- [ ] Test A
-- [ ] Test B
-
-**Test Configuration**:
-* PHP version:
-* MySQL version
-* Webserver version
-* OS version
-
-
-# Checklist:
-
-- [ ] I have read the Contributing documentation available here: https://snipe-it.readme.io/docs/contributing-overview
-- [ ] I have formatted this PR according to the project guidelines: https://snipe-it.readme.io/docs/contributing-overview#pull-request-guidelines
-- [ ] My code follows the style guidelines of this project
-- [ ] I have performed a self-review of my own code
-- [ ] I have commented my code, particularly in hard-to-understand areas
-- [ ] I have made corresponding changes to the documentation
-- [ ] My changes generate no new warnings
-- [ ] I have added tests that prove my fix is effective or that my feature works
-- [ ] New and existing unit tests pass locally with my changes
diff --git a/.github/stale.yml b/.github/stale.yml
deleted file mode 100644
index 53acc282e4..0000000000
--- a/.github/stale.yml
+++ /dev/null
@@ -1,43 +0,0 @@
-# Number of days of inactivity before an issue becomes stale
-daysUntilStale: 60
-# Number of days of inactivity before a stale issue is closed
-daysUntilClose: 7
-# Issues with these labels will never be considered stale
-exemptLabels:
-  - pinned
-  - security
-  - :woman_technologist: ready for dev
-  - :moneybag: bounty
-  - :hand: bug
-  - "🔐 security"
-  - "👩‍💻 ready for dev"
-  - "💰 bounty"
-  - "✋ bug"
-
-exemptMilestones: true
-
-# Label to use when marking an issue as stale
-staleLabel: stale
-
-only: issues
-
-# Comment to post when removing the stale label.
-unmarkComment: >
-  Okay, it looks like this issue or feature request might still be important. We'll re-open
-  it for now. Thank you for letting us know!
-
-# Comment to post when marking an issue as stale. Set to `false` to disable
-markComment: >
-  Is this still relevant? We haven't heard from anyone in a bit. If so,
-  please comment with any updates or additional detail.
-
-  This issue has been automatically marked as stale because it has not had
-  recent activity. It will be closed if no further activity occurs. Don't
-  take it personally, we just need to keep a handle on things. Thank you
-  for your contributions!
-# Comment to post when closing a stale issue. Set to `false` to disable
-closeComment: >
-  This issue has been automatically closed because it has not had
-  recent activity. If you believe this is still an issue, please confirm that
-  this issue is still happening in the most recent version of Snipe-IT and reply
-  to this thread to re-open it.
diff --git a/.github/travis-memory.ini b/.github/travis-memory.ini
deleted file mode 100644
index 6bd8019ec4..0000000000
--- a/.github/travis-memory.ini
+++ /dev/null
@@ -1 +0,0 @@
-memory_limit= 2048M
diff --git a/.github/weekly-digest.yml b/.github/weekly-digest.yml
deleted file mode 100644
index fe502fbc98..0000000000
--- a/.github/weekly-digest.yml
+++ /dev/null
@@ -1,7 +0,0 @@
-# Configuration for weekly-digest - https://github.com/apps/weekly-digest
-publishDay: sun
-canPublishIssues: true
-canPublishPullRequests: true
-canPublishContributors: true
-canPublishStargazers: true
-canPublishCommits: true
diff --git a/.github/workflows/codacy-analysis.yml b/.github/workflows/codacy-analysis.yml
index f8368dff83..a11509d69e 100644
--- a/.github/workflows/codacy-analysis.yml
+++ b/.github/workflows/codacy-analysis.yml
@@ -10,10 +10,10 @@ name: Codacy Security Scan
 
 on:
   push:
-    branches: [ master ]
+    branches: [ develop ]
   pull_request:
     # The branches below must be a subset of the branches above
-    branches: [ master ]
+    branches: [ develop ]
   schedule:
     - cron: '36 23 * * 3'
 
@@ -22,11 +22,11 @@ permissions:
 
 jobs:
   codacy-security-scan:
-    # Ensure schedule job never runs on forked repos. It's only executed for 'snipe/snipe-it'
+    # Ensure schedule job never runs on forked repos. It's only executed for 'grokability/snipe-it'
     permissions:
       contents: read  # for actions/checkout to fetch code
       security-events: write  # for github/codeql-action/upload-sarif to upload SARIF results
-    if: (github.repository == 'snipe/snipe-it') || ((github.repository != 'snipe/snipe-it') && (github.event_name != 'schedule'))
+    if: (github.repository == 'grokability/snipe-it') || ((github.repository != 'grokability/snipe-it') && (github.event_name != 'schedule'))
     name: Codacy Security Scan
     runs-on: ubuntu-latest
     steps:
@@ -36,7 +36,7 @@ jobs:
 
       # Execute Codacy Analysis CLI and generate a SARIF output with the security issues identified during the analysis
       - name: Run Codacy Analysis CLI
-        uses: codacy/codacy-analysis-cli-action@v4.4.1
+        uses: codacy/codacy-analysis-cli-action@v4.4.5
         with:
           # Check https://github.com/codacy/codacy-analysis-cli#project-token to get your project token from your Codacy repository
           # You can also omit the token and run the tools that support default configurations
diff --git a/.github/workflows/docker-alpine.yml b/.github/workflows/docker-alpine.yml
index bd46f9567b..86e0c022e2 100644
--- a/.github/workflows/docker-alpine.yml
+++ b/.github/workflows/docker-alpine.yml
@@ -20,8 +20,8 @@ permissions:
 
 jobs:
   docker:
-    # Ensure this job never runs on forked repos. It's only executed for 'snipe/snipe-it'
-    if: github.repository == 'snipe/snipe-it'
+    # Ensure this job never runs on forked repos. It's only executed for 'grokability/snipe-it'
+    if: github.repository == 'grokability/snipe-it'
     runs-on: ubuntu-latest
     env:
       # Define tags to use for Docker images based on Git tags/branches (for docker/metadata-action)
@@ -32,7 +32,7 @@ jobs:
         type=raw,value=latest,enable=${{ endsWith(github.ref, github.event.repository.default_branch) }},suffix=-alpine
         type=ref,event=branch,enable=${{ !endsWith(github.ref, github.event.repository.default_branch) }},suffix=-alpine
         type=ref,event=tag,suffix=-alpine
-        type=semver,pattern=v{{major}}-latest-alpine 
+        type=semver,pattern=v{{major}}-latest-alpine
       # Define default tag "flavor" for docker/metadata-action per
       # https://github.com/docker/metadata-action#flavor-input
       # We turn off 'latest' tag by default.
diff --git a/.github/workflows/docker.yml b/.github/workflows/docker-ubuntu.yml
similarity index 95%
rename from .github/workflows/docker.yml
rename to .github/workflows/docker-ubuntu.yml
index adb87f3a5d..a78ba7413c 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker-ubuntu.yml
@@ -1,5 +1,5 @@
 # Snipe-IT Docker image build for hub.docker.com
-name: Docker images
+name: Docker images (Ubuntu)
 
 # Run this Build for all pushes to 'master' or develop branch, or tagged releases.
 # Also run for PRs to ensure PR doesn't break Docker build process
@@ -20,8 +20,8 @@ permissions:
 
 jobs:
   docker:
-    # Ensure this job never runs on forked repos. It's only executed for 'snipe/snipe-it'
-    if: github.repository == 'snipe/snipe-it'
+    # Ensure this job never runs on forked repos. It's only executed for 'grokability/snipe-it'
+    if: github.repository == 'grokability/snipe-it'
     runs-on: ubuntu-latest
     env:
       # Define tags to use for Docker images based on Git tags/branches (for docker/metadata-action)
@@ -32,7 +32,7 @@ jobs:
         type=raw,value=latest,enable=${{ endsWith(github.ref, github.event.repository.default_branch) }}
         type=ref,event=branch,enable=${{ !endsWith(github.ref, github.event.repository.default_branch) }}
         type=ref,event=tag
-        type=semver,pattern=v{{major}}-latest 
+        type=semver,pattern=v{{major}}-latest
       # Define default tag "flavor" for docker/metadata-action per
       # https://github.com/docker/metadata-action#flavor-input
       # We turn off 'latest' tag by default.
diff --git a/.github/workflows/stale.yml b/.github/workflows/stale.yml
new file mode 100644
index 0000000000..5a4042aee4
--- /dev/null
+++ b/.github/workflows/stale.yml
@@ -0,0 +1,40 @@
+name: 'Close stale issues'
+on:
+  schedule:
+    - cron: '30 1 * * *'
+
+jobs:
+  stale:
+    runs-on: ubuntu-latest
+    permissions:
+      #  contents: write # only for delete-branch option
+      issues: write
+      #  pull-requests: write
+    steps:
+      - uses: actions/stale@v9
+        with:
+          debug-only: true
+          ascending: true
+          operations-per-run: 1000 # just while we're debugging
+          repo-token: ${{ secrets.GITHUB_TOKEN }}
+          days-before-stale: 60
+          days-before-close: 7
+          exempt-all-milestones: true
+          stale-issue-message: >
+            Is this still relevant? We haven't heard from anyone in a bit. If so,
+            please comment with any updates or additional detail.
+            
+            This issue has been automatically marked as stale because it has not had
+            recent activity. It will be closed if no further activity occurs. Don't
+            take it personally, we just need to keep a handle on things. Thank you
+            for your contributions!
+          close-issue-message: >
+            This issue has been automatically closed because it has not had
+            recent activity. If you believe this is still an issue, please confirm that
+            this issue is still happening in the most recent version of Snipe-IT and reply
+            to this thread to re-open it.
+          # There doesn't seem to be a 'reopen issue message'?
+          # Since there is no 'stale-pr-message' - PR's should not be stale'd
+          stale-issue-label: stale
+          exempt-issue-labels: >
+            pinned,security,:woman_technologist: ready for dev,:moneybag: bounty,:hand: bug,🔐 security,👩‍💻 ready for dev,💰 bounty,✋ bug
\ No newline at end of file
diff --git a/.github/workflows/tests-mysql.yml b/.github/workflows/tests-mysql.yml
index 737a86dca3..16190900b0 100644
--- a/.github/workflows/tests-mysql.yml
+++ b/.github/workflows/tests-mysql.yml
@@ -25,9 +25,9 @@ jobs:
       fail-fast: false
       matrix:
         php-version:
-          - "8.1"
           - "8.2"
           - "8.3"
+          - "8.4"
 
     name: PHP ${{ matrix.php-version }}
 
@@ -67,7 +67,7 @@ jobs:
         run: |
           php artisan key:generate
           php artisan migrate --force
-          php artisan passport:install
+          php artisan passport:install --no-interaction
           chmod -R 777 storage bootstrap/cache
 
       - name: Execute tests (Unit and Feature tests) via PHPUnit
@@ -76,4 +76,4 @@ jobs:
           DB_DATABASE: snipeit
           DB_PORT: ${{ job.services.mysql.ports[3306] }}
           DB_USERNAME: root
-        run: php artisan test --parallel
+        run: php artisan test
diff --git a/.github/workflows/tests-postgres.yml b/.github/workflows/tests-postgres.yml
index b12fdebbc4..d111fc87a5 100644
--- a/.github/workflows/tests-postgres.yml
+++ b/.github/workflows/tests-postgres.yml
@@ -22,6 +22,9 @@ jobs:
       matrix:
         php-version:
           - "8.2"
+          - "8.3"
+          - "8.4"
+
 
     name: PHP ${{ matrix.php-version }}
 
@@ -62,7 +65,7 @@ jobs:
         run: |
           php artisan key:generate
           php artisan migrate --force
-          php artisan passport:install
+          php artisan passport:install --no-interaction
           chmod -R 777 storage bootstrap/cache
 
       - name: Execute tests (Unit and Feature tests) via PHPUnit
@@ -72,4 +75,4 @@ jobs:
           DB_PORT: ${{ job.services.postgresql.ports[5432] }}
           DB_USERNAME: snipeit
           DB_PASSWORD: password
-        run: php artisan test --parallel
+        run: php artisan test
diff --git a/.github/workflows/tests-sqlite.yml b/.github/workflows/tests-sqlite.yml
index 49c7c92d8e..cd06805e01 100644
--- a/.github/workflows/tests-sqlite.yml
+++ b/.github/workflows/tests-sqlite.yml
@@ -15,7 +15,7 @@ jobs:
       fail-fast: false
       matrix:
         php-version:
-          - "8.1.1"
+          - "8.3"
 
     name: PHP ${{ matrix.php-version }}
 
@@ -43,6 +43,9 @@ jobs:
           cp -v .env.testing.example .env
           cp -v .env.testing.example .env.testing
 
+      - name: Create database file
+        run: touch database/database.sqlite
+
       - name: Install Dependencies
         run: composer install -q --no-ansi --no-interaction --no-scripts --no-progress --prefer-dist
 
@@ -57,5 +60,5 @@ jobs:
 
       - name: Execute tests (Unit and Feature tests) via PHPUnit
         env:
-          DB_CONNECTION: sqlite_testing
-        run: php artisan test --parallel
+          DB_CONNECTION: sqlite
+        run: php artisan test
diff --git a/.gitignore b/.gitignore
index bf8360ba24..17a7d28dab 100755
--- a/.gitignore
+++ b/.gitignore
@@ -47,6 +47,7 @@ storage/private_uploads/users/*
 tests/_data/scenarios
 tests/_output/*
 tests/_support/_generated/*
+tests/coverage/*
 /npm-debug.log
 /storage/oauth-private.key
 /storage/oauth-public.key
@@ -67,3 +68,6 @@ _ide_helper_models.php
 /.phplint-cache
 storage/ldap_client_tls.cert
 storage/ldap_client_tls.key
+/storage/framework/testing
+
+/.phpunit.cache
\ No newline at end of file
diff --git a/.pa11yci.json b/.pa11yci.json
new file mode 100644
index 0000000000..73b84a8140
--- /dev/null
+++ b/.pa11yci.json
@@ -0,0 +1,240 @@
+{
+    "standard": "WCAG2AA",
+    "level": "error",
+    "defaults": {
+      "useIncognitoBrowserContext": false,
+      "timeout": 500000,
+      "wait": 5000,
+      "ignore" : [
+        "WCAG2AA.Principle1.Guideline1_4.1_4_3.G145.Fail",
+        "WCAG2AA.Principle1.Guideline1_4.1_4_3.G18.Fail"
+      ],
+
+      "viewport": {
+        "width": 1280,
+        "height": 1024
+      }
+    },
+    "urls": [
+        {
+          "__NOTE"  : "this should always be FIRST (if browser context is preserved)",
+          "url": "https://snipe-it.test/login",
+          "actions": [
+            "navigate to https://snipe-it.test/login",
+            "screen capture tests/pa11y/login.png",
+             "set field input[name='username'] to admin",
+             "set field input[name='password'] to password",
+             "click element button[type=submit]",
+             "wait for url to be https://snipe-it.test/",
+             "screen capture tests/pa11y/dashboard.png"
+          ]
+        },
+        {
+          "url"     : "https://snipe-it.test/admin",
+          "actions" : [
+            "navigate to https://snipe-it.test/admin",
+            "screen capture tests/pa11y/admin-settings.png"
+          ]
+        },
+        {
+          "url"     : "https://snipe-it.test/admin/branding",
+          "actions" : [
+            "navigate to https://snipe-it.test/admin/branding",
+            "screen capture tests/pa11y/admin-branding.png"
+          ]
+        },
+        {
+          "url"     : "https://snipe-it.test/admin/general",
+          "actions" : [
+            "navigate to https://snipe-it.test/admin/general",
+            "screen capture tests/pa11y/admin-general.png"
+          ]
+        },
+        {
+          "url"     : "https://snipe-it.test/hardware/create",
+          "actions" : [
+            "navigate to https://snipe-it.test/hardware/create",
+            "screen capture tests/pa11y/asset-create.png"
+          ]
+        },
+       {
+        "url"     : "https://snipe-it.test/hardware",
+        "actions" : [
+          "navigate to https://snipe-it.test/hardware",
+          "screen capture tests/pa11y/asset-list.png"
+        ]
+      },
+      {
+        "url"     : "https://snipe-it.test/hardware/1",
+        "actions" : [
+          "navigate to https://snipe-it.test/hardware/1",
+          "screen capture tests/pa11y/asset-detail.png"
+        ]
+      },
+      {
+        "url"     : "https://snipe-it.test/account/view-assets",
+        "actions" : [
+          "navigate to https://snipe-it.test/account/view-assets",
+          "screen capture tests/pa11y/profile.png"
+        ]
+      },
+      {
+        "url"     : "https://snipe-it.test/licences",
+        "actions" : [
+          "navigate to https://snipe-it.test/licenses",
+          "screen capture tests/pa11y/license-list.png"
+        ]
+      },
+      {
+        "url"     : "https://snipe-it.test/licences/create",
+        "actions" : [
+          "navigate to https://snipe-it.test/licenses/create",
+          "screen capture tests/pa11y/license-create.png"
+        ]
+      },
+      {
+        "url"     : "https://snipe-it.test/licences/1",
+        "actions" : [
+          "navigate to https://snipe-it.test/licenses/1",
+          "screen capture tests/pa11y/license-view.png"
+        ]
+      },
+      {
+        "url"     : "https://snipe-it.test/consumables",
+        "actions" : [
+          "navigate to https://snipe-it.test/consumables",
+          "screen capture tests/pa11y/consumable-list.png"
+        ]
+      },
+      {
+        "url"     : "https://snipe-it.test/consumables/create",
+        "actions" : [
+          "navigate to https://snipe-it.test/consumables/create",
+          "screen capture tests/pa11y/consumable-create.png"
+        ]
+      },
+      {
+        "url"     : "https://snipe-it.test/consumables/1",
+        "actions" : [
+          "navigate to https://snipe-it.test/consumables/1",
+          "screen capture tests/pa11y/consumable-view.png"
+        ]
+      },
+      {
+        "url"     : "https://snipe-it.test/accessories",
+        "actions" : [
+          "navigate to https://snipe-it.test/accessories",
+          "screen capture tests/pa11y/accessory-list.png"
+        ]
+      },
+      {
+        "url"     : "https://snipe-it.test/accessories/create",
+        "actions" : [
+          "navigate to https://snipe-it.test/accessories/create",
+          "screen capture tests/pa11y/accessory-create.png"
+        ]
+      },
+      {
+        "url"     : "https://snipe-it.test/accessories/1",
+        "actions" : [
+          "navigate to https://snipe-it.test/accessories/1",
+          "screen capture tests/pa11y/accessory-view.png"
+        ]
+      },
+      {
+        "url"     : "https://snipe-it.test/locations",
+        "actions" : [
+          "navigate to https://snipe-it.test/locations",
+          "screen capture tests/pa11y/location-list.png"
+        ]
+      },
+      {
+        "url"     : "https://snipe-it.test/locations/create",
+        "actions" : [
+          "navigate to https://snipe-it.test/locations/create",
+          "screen capture tests/pa11y/location-create.png"
+        ]
+      },
+      {
+        "url"     : "https://snipe-it.test/locations/1",
+        "actions" : [
+          "navigate to https://snipe-it.test/locations/1",
+          "screen capture tests/pa11y/location-view.png"
+        ]
+      },
+
+      {
+        "url"     : "https://snipe-it.test/models",
+        "actions" : [
+          "navigate to https://snipe-it.test/models",
+          "screen capture tests/pa11y/model-list.png"
+        ]
+      },
+      {
+        "url"     : "https://snipe-it.test/models/create",
+        "actions" : [
+          "navigate to https://snipe-it.test/models/create",
+          "screen capture tests/pa11y/model-create.png"
+        ]
+      },
+      {
+        "url"     : "https://snipe-it.test/models/1",
+        "actions" : [
+          "navigate to https://snipe-it.test/models/1",
+          "screen capture tests/pa11y/model-view.png"
+        ]
+      },
+
+      {
+        "url"     : "https://snipe-it.test/companies",
+        "actions" : [
+          "navigate to https://snipe-it.test/companies",
+          "screen capture tests/pa11y/company-list.png"
+        ]
+      },
+      {
+        "url"     : "https://snipe-it.test/companies/create",
+        "actions" : [
+          "navigate to https://snipe-it.test/companies/create",
+          "screen capture tests/pa11y/company-create.png"
+        ]
+      },
+      {
+        "url"     : "https://snipe-it.test/companies/1",
+        "actions" : [
+          "navigate to https://snipe-it.test/companies/1",
+          "screen capture tests/pa11y/company-view.png"
+        ]
+      },
+
+      {
+        "url"     : "https://snipe-it.test/departments",
+        "actions" : [
+          "navigate to https://snipe-it.test/departments",
+          "screen capture tests/pa11y/department-list.png"
+        ]
+      },
+      {
+        "url"     : "https://snipe-it.test/departments/create",
+        "actions" : [
+          "navigate to https://snipe-it.test/departments/create",
+          "screen capture tests/pa11y/department-create.png"
+        ]
+      },
+      {
+        "url"     : "https://snipe-it.test/departments/1",
+        "actions" : [
+          "navigate to https://snipe-it.test/departments/1",
+          "screen capture tests/pa11y/department-view.png"
+        ]
+      },
+
+      {
+        "url"     : "https://snipe-it.test/invalid-url",
+        "actions" : [
+          "navigate to https://snipe-it.test/invalid-url",
+          "screen capture tests/pa11y/404.png"
+        ]
+      }
+    ]
+}
\ No newline at end of file
diff --git a/.upgrade_requirements.json b/.upgrade_requirements.json
index 53d7337b62..9c4ece093b 100644
--- a/.upgrade_requirements.json
+++ b/.upgrade_requirements.json
@@ -3,8 +3,8 @@
     "DOC2": "In other words, what you see locally are the requirements for your _current_ install",
     "DOC3": "Please don't rely on these versions for planning upgrades unless you've fetched the most recent version",
     "DOC4": "You should really just ignore it and run upgrade.php. Really",
-    "php_min_version": "8.1.0",
-    "php_max_major_minor": "8.3",
-    "php_max_wontwork": "8.4.0",
-    "current_snipeit_version": "7.0"
+    "php_min_version": "8.2.0",
+    "php_max_major_minor": "8.4",
+    "php_max_wontwork": "8.5.0",
+    "current_snipeit_version": "8.0"
 }
diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md
index c0ca7951dd..7ab3810780 100644
--- a/CONTRIBUTORS.md
+++ b/CONTRIBUTORS.md
@@ -1,461 +1,73 @@
 Thanks goes to all of these wonderful people ([emoji key](https://github.com/kentcdodds/all-contributors#emoji-key)) who have helped Snipe-IT get this far:
 
 <!-- ALL-CONTRIBUTORS-LIST:START - Do not remove or modify this section -->
-<!-- prettier-ignore-start -->
-<!-- markdownlint-disable -->
-<table>
-  <tbody>
-    <tr>
-      <td align="center" valign="top" width="14.28%"><a href="http://www.snipe.net"><img src="https://avatars3.githubusercontent.com/u/197404?v=3?s=110" width="110px;" alt="snipe"/><br /><sub><b>snipe</b></sub></a><br /><a href="https://github.com/snipe/snipe-it/commits?author=snipe" title="Code">💻</a> <a href="#infra-snipe" title="Infrastructure (Hosting, Build-Tools, etc)">🚇</a> <a href="https://github.com/snipe/snipe-it/commits?author=snipe" title="Documentation">📖</a> <a href="https://github.com/snipe/snipe-it/commits?author=snipe" title="Tests">⚠️</a> <a href="https://github.com/snipe/snipe-it/issues?q=author%3Asnipe" title="Bug reports">🐛</a> <a href="#design-snipe" title="Design">🎨</a> <a href="https://github.com/snipe/snipe-it/pulls?q=is%3Apr+reviewed-by%3Asnipe" title="Reviewed Pull Requests">👀</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="http://www.uberbrady.com"><img src="https://avatars0.githubusercontent.com/u/36335?v=3?s=110" width="110px;" alt="Brady Wetherington"/><br /><sub><b>Brady Wetherington</b></sub></a><br /><a href="https://github.com/snipe/snipe-it/commits?author=uberbrady" title="Code">💻</a> <a href="https://github.com/snipe/snipe-it/commits?author=uberbrady" title="Documentation">📖</a> <a href="#infra-uberbrady" title="Infrastructure (Hosting, Build-Tools, etc)">🚇</a> <a href="https://github.com/snipe/snipe-it/pulls?q=is%3Apr+reviewed-by%3Auberbrady" title="Reviewed Pull Requests">👀</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/dmeltzer"><img src="https://avatars0.githubusercontent.com/u/3803132?v=3?s=110" width="110px;" alt="Daniel Meltzer"/><br /><sub><b>Daniel Meltzer</b></sub></a><br /><a href="https://github.com/snipe/snipe-it/commits?author=dmeltzer" title="Code">💻</a> <a href="https://github.com/snipe/snipe-it/commits?author=dmeltzer" title="Tests">⚠️</a> <a href="https://github.com/snipe/snipe-it/commits?author=dmeltzer" title="Documentation">📖</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="http://www.tuckertechonline.com"><img src="https://avatars0.githubusercontent.com/u/1609106?v=3?s=110" width="110px;" alt="Michael T"/><br /><sub><b>Michael T</b></sub></a><br /><a href="https://github.com/snipe/snipe-it/commits?author=mtucker6784" title="Code">💻</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/madd15"><img src="https://avatars2.githubusercontent.com/u/3274937?v=3?s=110" width="110px;" alt="madd15"/><br /><sub><b>madd15</b></sub></a><br /><a href="https://github.com/snipe/snipe-it/commits?author=madd15" title="Documentation">📖</a> <a href="#question-madd15" title="Answering Questions">💬</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/vsposato"><img src="https://avatars2.githubusercontent.com/u/894126?v=3?s=110" width="110px;" alt="Vincent Sposato"/><br /><sub><b>Vincent Sposato</b></sub></a><br /><a href="https://github.com/snipe/snipe-it/commits?author=vsposato" title="Code">💻</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/vjandrea"><img src="https://avatars0.githubusercontent.com/u/1639757?v=3?s=110" width="110px;" alt="Andrea Bergamasco"/><br /><sub><b>Andrea Bergamasco</b></sub></a><br /><a href="https://github.com/snipe/snipe-it/commits?author=vjandrea" title="Code">💻</a></td>
-    </tr>
-    <tr>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/kpawelski"><img src="https://avatars0.githubusercontent.com/u/10640152?v=3?s=110" width="110px;" alt="Karol"/><br /><sub><b>Karol</b></sub></a><br /><a href="#translation-kpawelski" title="Translation">🌍</a> <a href="https://github.com/snipe/snipe-it/commits?author=kpawelski" title="Code">💻</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="http://blog.morph027.de/"><img src="https://avatars3.githubusercontent.com/u/600106?v=3?s=110" width="110px;" alt="morph027"/><br /><sub><b>morph027</b></sub></a><br /><a href="https://github.com/snipe/snipe-it/commits?author=morph027" title="Code">💻</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/fvleminckx"><img src="https://avatars3.githubusercontent.com/u/22935755?v=3?s=110" width="110px;" alt="fvleminckx"/><br /><sub><b>fvleminckx</b></sub></a><br /><a href="#infra-fvleminckx" title="Infrastructure (Hosting, Build-Tools, etc)">🚇</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/itsupportcmsukorg"><img src="https://avatars2.githubusercontent.com/u/15633547?v=3?s=110" width="110px;" alt="itsupportcmsukorg"/><br /><sub><b>itsupportcmsukorg</b></sub></a><br /><a href="https://github.com/snipe/snipe-it/commits?author=itsupportcmsukorg" title="Code">💻</a> <a href="https://github.com/snipe/snipe-it/issues?q=author%3Aitsupportcmsukorg" title="Bug reports">🐛</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://override.io"><img src="https://avatars3.githubusercontent.com/u/12373799?v=3?s=110" width="110px;" alt="Frank"/><br /><sub><b>Frank</b></sub></a><br /><a href="https://github.com/snipe/snipe-it/commits?author=base-zero" title="Code">💻</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/ghost"><img src="https://avatars0.githubusercontent.com/u/10137?v=3?s=110" width="110px;" alt="Deleted user"/><br /><sub><b>Deleted user</b></sub></a><br /><a href="#translation-ghost" title="Translation">🌍</a> <a href="https://github.com/snipe/snipe-it/commits?author=ghost" title="Code">💻</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/tiagom62"><img src="https://avatars1.githubusercontent.com/u/10802313?v=3?s=110" width="110px;" alt="tiagom62"/><br /><sub><b>tiagom62</b></sub></a><br /><a href="https://github.com/snipe/snipe-it/commits?author=tiagom62" title="Code">💻</a> <a href="#infra-tiagom62" title="Infrastructure (Hosting, Build-Tools, etc)">🚇</a></td>
-    </tr>
-    <tr>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/rystaf"><img src="https://avatars3.githubusercontent.com/u/2389047?v=3?s=110" width="110px;" alt="Ryan Stafford"/><br /><sub><b>Ryan Stafford</b></sub></a><br /><a href="https://github.com/snipe/snipe-it/commits?author=rystaf" title="Code">💻</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/ehanlon"><img src="https://avatars2.githubusercontent.com/u/10345935?v=3?s=110" width="110px;" alt="Eammon Hanlon"/><br /><sub><b>Eammon Hanlon</b></sub></a><br /><a href="https://github.com/snipe/snipe-it/commits?author=ehanlon" title="Code">💻</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/zjean"><img src="https://avatars0.githubusercontent.com/u/441924?v=3?s=110" width="110px;" alt="zjean"/><br /><sub><b>zjean</b></sub></a><br /><a href="https://github.com/snipe/snipe-it/commits?author=zjean" title="Code">💻</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="http://www.frei.media"><img src="https://avatars0.githubusercontent.com/u/12660103?v=3?s=110" width="110px;" alt="Matthias Frei"/><br /><sub><b>Matthias Frei</b></sub></a><br /><a href="https://github.com/snipe/snipe-it/commits?author=FREImedia" title="Code">💻</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/opsydev"><img src="https://avatars0.githubusercontent.com/u/3767518?v=3?s=110" width="110px;" alt="opsydev"/><br /><sub><b>opsydev</b></sub></a><br /><a href="https://github.com/snipe/snipe-it/commits?author=opsydev" title="Code">💻</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="http://www.ddreier.com"><img src="https://avatars1.githubusercontent.com/u/82290?v=3?s=110" width="110px;" alt="Daniel Dreier"/><br /><sub><b>Daniel Dreier</b></sub></a><br /><a href="https://github.com/snipe/snipe-it/commits?author=ddreier" title="Code">💻</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="http://rassie.org"><img src="https://avatars0.githubusercontent.com/u/23448?v=3?s=110" width="110px;" alt="Nikolai Prokoschenko"/><br /><sub><b>Nikolai Prokoschenko</b></sub></a><br /><a href="https://github.com/snipe/snipe-it/commits?author=rassie" title="Code">💻</a></td>
-    </tr>
-    <tr>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/YetAnotherCodeMonkey"><img src="https://avatars0.githubusercontent.com/u/13452757?v=3?s=110" width="110px;" alt="Drew"/><br /><sub><b>Drew</b></sub></a><br /><a href="https://github.com/snipe/snipe-it/commits?author=YetAnotherCodeMonkey" title="Code">💻</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/merid14"><img src="https://avatars0.githubusercontent.com/u/1342320?v=3?s=110" width="110px;" alt="Walter"/><br /><sub><b>Walter</b></sub></a><br /><a href="https://github.com/snipe/snipe-it/commits?author=merid14" title="Code">💻</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/balous"><img src="https://avatars3.githubusercontent.com/u/11254614?v=3?s=110" width="110px;" alt="Petr Baloun"/><br /><sub><b>Petr Baloun</b></sub></a><br /><a href="https://github.com/snipe/snipe-it/commits?author=balous" title="Code">💻</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/reidblomquist"><img src="https://avatars0.githubusercontent.com/u/6117660?v=3?s=110" width="110px;" alt="reidblomquist"/><br /><sub><b>reidblomquist</b></sub></a><br /><a href="https://github.com/snipe/snipe-it/commits?author=reidblomquist" title="Documentation">📖</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/mathieuk"><img src="https://avatars0.githubusercontent.com/u/539914?v=3?s=110" width="110px;" alt="Mathieu Kooiman"/><br /><sub><b>Mathieu Kooiman</b></sub></a><br /><a href="https://github.com/snipe/snipe-it/commits?author=mathieuk" title="Code">💻</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/csayre"><img src="https://avatars3.githubusercontent.com/u/6606421?v=3?s=110" width="110px;" alt="csayre"/><br /><sub><b>csayre</b></sub></a><br /><a href="https://github.com/snipe/snipe-it/commits?author=csayre" title="Documentation">📖</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/adamdunson"><img src="https://avatars1.githubusercontent.com/u/768488?v=3?s=110" width="110px;" alt="Adam Dunson"/><br /><sub><b>Adam Dunson</b></sub></a><br /><a href="https://github.com/snipe/snipe-it/commits?author=adamdunson" title="Code">💻</a></td>
-    </tr>
-    <tr>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/thehereward"><img src="https://avatars0.githubusercontent.com/u/5547470?v=3?s=110" width="110px;" alt="Hereward"/><br /><sub><b>Hereward</b></sub></a><br /><a href="https://github.com/snipe/snipe-it/commits?author=thehereward" title="Code">💻</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/swoopdk"><img src="https://avatars0.githubusercontent.com/u/5802977?v=3?s=110" width="110px;" alt="swoopdk"/><br /><sub><b>swoopdk</b></sub></a><br /><a href="https://github.com/snipe/snipe-it/commits?author=swoopdk" title="Code">💻</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://linkedin.com/in/ahimta"><img src="https://avatars1.githubusercontent.com/u/3470403?v=3?s=110" width="110px;" alt="Abdullah Alansari"/><br /><sub><b>Abdullah Alansari</b></sub></a><br /><a href="https://github.com/snipe/snipe-it/commits?author=Ahimta" title="Code">💻</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/MicaelRodrigues"><img src="https://avatars0.githubusercontent.com/u/796443?v=3?s=110" width="110px;" alt="Micael Rodrigues"/><br /><sub><b>Micael Rodrigues</b></sub></a><br /><a href="https://github.com/snipe/snipe-it/commits?author=MicaelRodrigues" title="Code">💻</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="http://macadmincorner.com"><img src="https://avatars0.githubusercontent.com/u/614564?v=3?s=110" width="110px;" alt="Patrick Gallagher"/><br /><sub><b>Patrick Gallagher</b></sub></a><br /><a href="https://github.com/snipe/snipe-it/commits?author=patgmac" title="Documentation">📖</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/Miliamber"><img src="https://avatars3.githubusercontent.com/u/7165922?v=3?s=110" width="110px;" alt="Miliamber"/><br /><sub><b>Miliamber</b></sub></a><br /><a href="https://github.com/snipe/snipe-it/commits?author=Miliamber" title="Code">💻</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/hawk554"><img src="https://avatars3.githubusercontent.com/u/861766?v=3?s=110" width="110px;" alt="hawk554"/><br /><sub><b>hawk554</b></sub></a><br /><a href="https://github.com/snipe/snipe-it/commits?author=hawk554" title="Code">💻</a></td>
-    </tr>
-    <tr>
-      <td align="center" valign="top" width="14.28%"><a href="http://jbirdkerr.net"><img src="https://avatars1.githubusercontent.com/u/1695622?v=3?s=110" width="110px;" alt="Justin Kerr"/><br /><sub><b>Justin Kerr</b></sub></a><br /><a href="https://github.com/snipe/snipe-it/commits?author=jbirdkerr" title="Code">💻</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="http://www.irasnyder.com/devel/"><img src="https://avatars3.githubusercontent.com/u/11426176?v=3?s=110" width="110px;" alt="Ira W. Snyder"/><br /><sub><b>Ira W. Snyder</b></sub></a><br /><a href="https://github.com/snipe/snipe-it/commits?author=irasnyd" title="Documentation">📖</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/aalaily"><img src="https://avatars2.githubusercontent.com/u/2475759?v=3?s=110" width="110px;" alt="Aladin Alaily"/><br /><sub><b>Aladin Alaily</b></sub></a><br /><a href="https://github.com/snipe/snipe-it/commits?author=aalaily" title="Code">💻</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/kobie-chasehansen"><img src="https://avatars0.githubusercontent.com/u/10247644?v=3?s=110" width="110px;" alt="Chase Hansen"/><br /><sub><b>Chase Hansen</b></sub></a><br /><a href="https://github.com/snipe/snipe-it/commits?author=kobie-chasehansen" title="Code">💻</a> <a href="#question-kobie-chasehansen" title="Answering Questions">💬</a> <a href="https://github.com/snipe/snipe-it/issues?q=author%3Akobie-chasehansen" title="Bug reports">🐛</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/IDM-Helpdesk"><img src="https://avatars2.githubusercontent.com/u/13545400?v=3?s=110" width="110px;" alt="IDM Helpdesk"/><br /><sub><b>IDM Helpdesk</b></sub></a><br /><a href="https://github.com/snipe/snipe-it/commits?author=IDM-Helpdesk" title="Code">💻</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="http://balticer.de"><img src="https://avatars2.githubusercontent.com/u/614439?v=3?s=110" width="110px;" alt="Kai"/><br /><sub><b>Kai</b></sub></a><br /><a href="https://github.com/snipe/snipe-it/commits?author=balticer" title="Code">💻</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="http://www.michaeldaniels.me"><img src="https://avatars1.githubusercontent.com/u/8762511?v=3?s=110" width="110px;" alt="Michael Daniels"/><br /><sub><b>Michael Daniels</b></sub></a><br /><a href="https://github.com/snipe/snipe-it/commits?author=mdaniels5757" title="Code">💻</a></td>
-    </tr>
-    <tr>
-      <td align="center" valign="top" width="14.28%"><a href="http://tomcastleman.me"><img src="https://avatars3.githubusercontent.com/u/1532660?v=3?s=110" width="110px;" alt="Tom Castleman"/><br /><sub><b>Tom Castleman</b></sub></a><br /><a href="https://github.com/snipe/snipe-it/commits?author=tomcastleman" title="Code">💻</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/DanielNemanic"><img src="https://avatars3.githubusercontent.com/u/10723243?v=3?s=110" width="110px;" alt="Daniel Nemanic"/><br /><sub><b>Daniel Nemanic</b></sub></a><br /><a href="https://github.com/snipe/snipe-it/commits?author=DanielNemanic" title="Code">💻</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/southwolf"><img src="https://avatars0.githubusercontent.com/u/150648?v=3?s=110" width="110px;" alt="SouthWolf"/><br /><sub><b>SouthWolf</b></sub></a><br /><a href="https://github.com/snipe/snipe-it/commits?author=southwolf" title="Code">💻</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/ivarne"><img src="https://avatars2.githubusercontent.com/u/131616?v=3?s=110" width="110px;" alt="Ivar Nesje"/><br /><sub><b>Ivar Nesje</b></sub></a><br /><a href="https://github.com/snipe/snipe-it/commits?author=ivarne" title="Code">💻</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="http://www.j0k3r.net"><img src="https://avatars1.githubusercontent.com/u/62333?v=3?s=110" width="110px;" alt="Jérémy Benoist"/><br /><sub><b>Jérémy Benoist</b></sub></a><br /><a href="https://github.com/snipe/snipe-it/commits?author=j0k3r" title="Documentation">📖</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/cleathley"><img src="https://avatars2.githubusercontent.com/u/724344?v=3?s=110" width="110px;" alt="Chris Leathley"/><br /><sub><b>Chris Leathley</b></sub></a><br /><a href="#infra-cleathley" title="Infrastructure (Hosting, Build-Tools, etc)">🚇</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/splaer"><img src="https://avatars0.githubusercontent.com/u/972498?v=3?s=110" width="110px;" alt="splaer"/><br /><sub><b>splaer</b></sub></a><br /><a href="https://github.com/snipe/snipe-it/issues?q=author%3Asplaer" title="Bug reports">🐛</a> <a href="https://github.com/snipe/snipe-it/commits?author=splaer" title="Code">💻</a></td>
-    </tr>
-    <tr>
-      <td align="center" valign="top" width="14.28%"><a href="http://www.joeferguson.me"><img src="https://avatars1.githubusercontent.com/u/967362?v=3?s=110" width="110px;" alt="Joe Ferguson"/><br /><sub><b>Joe Ferguson</b></sub></a><br /><a href="https://github.com/snipe/snipe-it/commits?author=svpernova09" title="Code">💻</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/diwanicki"><img src="https://avatars3.githubusercontent.com/u/6108682?v=3?s=110" width="110px;" alt="diwanicki"/><br /><sub><b>diwanicki</b></sub></a><br /><a href="https://github.com/snipe/snipe-it/commits?author=diwanicki" title="Code">💻</a> <a href="https://github.com/snipe/snipe-it/commits?author=diwanicki" title="Documentation">📖</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/pakkua80"><img src="https://avatars3.githubusercontent.com/u/2527115?v=3?s=110" width="110px;" alt="Lee Thoong Ching"/><br /><sub><b>Lee Thoong Ching</b></sub></a><br /><a href="https://github.com/snipe/snipe-it/commits?author=pakkua80" title="Documentation">📖</a> <a href="https://github.com/snipe/snipe-it/commits?author=pakkua80" title="Code">💻</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="http://shu.io"><img src="https://avatars1.githubusercontent.com/u/461491?v=3?s=110" width="110px;" alt="Marek Šuppa"/><br /><sub><b>Marek Šuppa</b></sub></a><br /><a href="https://github.com/snipe/snipe-it/commits?author=mrshu" title="Code">💻</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/mizar1616"><img src="https://avatars1.githubusercontent.com/u/8693762?v=3?s=110" width="110px;" alt="Juan J. Martinez"/><br /><sub><b>Juan J. Martinez</b></sub></a><br /><a href="#translation-mizar1616" title="Translation">🌍</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/rrdial"><img src="https://avatars1.githubusercontent.com/u/1458388?v=3?s=110" width="110px;" alt="R Ryan Dial"/><br /><sub><b>R Ryan Dial</b></sub></a><br /><a href="#translation-rrdial" title="Translation">🌍</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/burlito"><img src="https://avatars2.githubusercontent.com/u/2871745?v=3?s=110" width="110px;" alt="Andrej Manduch"/><br /><sub><b>Andrej Manduch</b></sub></a><br /><a href="https://github.com/snipe/snipe-it/commits?author=burlito" title="Documentation">📖</a></td>
-    </tr>
-    <tr>
-      <td align="center" valign="top" width="14.28%"><a href="http://www.cordeos.com"><img src="https://avatars0.githubusercontent.com/u/8341172?v=3?s=110" width="110px;" alt="Jay Richards"/><br /><sub><b>Jay Richards</b></sub></a><br /><a href="https://github.com/snipe/snipe-it/commits?author=technogenus" title="Code">💻</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://necurity.co.uk"><img src="https://avatars2.githubusercontent.com/u/7295127?v=3?s=110" width="110px;" alt="Alexander Innes"/><br /><sub><b>Alexander Innes</b></sub></a><br /><a href="https://github.com/snipe/snipe-it/commits?author=leostat" title="Code">💻</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://buzzedword.codes"><img src="https://avatars2.githubusercontent.com/u/334485?v=3?s=110" width="110px;" alt="Danny Garcia"/><br /><sub><b>Danny Garcia</b></sub></a><br /><a href="https://github.com/snipe/snipe-it/commits?author=buzzedword" title="Code">💻</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/archpoint"><img src="https://avatars2.githubusercontent.com/u/366855?v=3?s=110" width="110px;" alt="archpoint"/><br /><sub><b>archpoint</b></sub></a><br /><a href="https://github.com/snipe/snipe-it/commits?author=archpoint" title="Code">💻</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="http://www.jakemcgraw.com"><img src="https://avatars1.githubusercontent.com/u/67991?v=3?s=110" width="110px;" alt="Jake McGraw"/><br /><sub><b>Jake McGraw</b></sub></a><br /><a href="https://github.com/snipe/snipe-it/commits?author=jakemcgraw" title="Code">💻</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/FleischKarussel"><img src="https://avatars1.githubusercontent.com/u/1714374?v=3?s=110" width="110px;" alt="FleischKarussel"/><br /><sub><b>FleischKarussel</b></sub></a><br /><a href="https://github.com/snipe/snipe-it/commits?author=FleischKarussel" title="Documentation">📖</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/feeva"><img src="https://avatars3.githubusercontent.com/u/319644?v=3?s=110" width="110px;" alt="Dylan Yi"/><br /><sub><b>Dylan Yi</b></sub></a><br /><a href="https://github.com/snipe/snipe-it/commits?author=feeva" title="Code">💻</a></td>
-    </tr>
-    <tr>
-      <td align="center" valign="top" width="14.28%"><a href="http://FlashingCursor.com"><img src="https://avatars2.githubusercontent.com/u/857740?v=3?s=110" width="110px;" alt="Gil Rutkowski"/><br /><sub><b>Gil Rutkowski</b></sub></a><br /><a href="https://github.com/snipe/snipe-it/commits?author=flashingcursor" title="Code">💻</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="http://www.desmondmorris.com"><img src="https://avatars3.githubusercontent.com/u/129360?v=3?s=110" width="110px;" alt="Desmond Morris"/><br /><sub><b>Desmond Morris</b></sub></a><br /><a href="https://github.com/snipe/snipe-it/commits?author=desmondmorris" title="Code">💻</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="http://peelman.us"><img src="https://avatars2.githubusercontent.com/u/52936?v=3?s=110" width="110px;" alt="Nick Peelman"/><br /><sub><b>Nick Peelman</b></sub></a><br /><a href="https://github.com/snipe/snipe-it/commits?author=peelman" title="Code">💻</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://abrahamvegh.com"><img src="https://avatars0.githubusercontent.com/u/53161?v=3?s=110" width="110px;" alt="Abraham Vegh"/><br /><sub><b>Abraham Vegh</b></sub></a><br /><a href="https://github.com/snipe/snipe-it/commits?author=abrahamvegh" title="Code">💻</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/rashivkp"><img src="https://avatars0.githubusercontent.com/u/2818680?v=3?s=110" width="110px;" alt="Mohamed Rashid"/><br /><sub><b>Mohamed Rashid</b></sub></a><br /><a href="https://github.com/snipe/snipe-it/commits?author=rashivkp" title="Documentation">📖</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="http://hinchk.github.io"><img src="https://avatars3.githubusercontent.com/u/1509456?v=3?s=110" width="110px;" alt="Kasey"/><br /><sub><b>Kasey</b></sub></a><br /><a href="https://github.com/snipe/snipe-it/commits?author=HinchK" title="Code">💻</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/BrettFagerlund"><img src="https://avatars2.githubusercontent.com/u/10522541?v=3?s=110" width="110px;" alt="Brett"/><br /><sub><b>Brett</b></sub></a><br /><a href="https://github.com/snipe/snipe-it/commits?author=BrettFagerlund" title="Tests">⚠️</a></td>
-    </tr>
-    <tr>
-      <td align="center" valign="top" width="14.28%"><a href="http://jasonspriggs.com"><img src="https://avatars2.githubusercontent.com/u/16108587?v=3?s=110" width="110px;" alt="Jason Spriggs"/><br /><sub><b>Jason Spriggs</b></sub></a><br /><a href="https://github.com/snipe/snipe-it/commits?author=jasonspriggs" title="Code">💻</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="http://n8felton.wordpress.com"><img src="https://avatars2.githubusercontent.com/u/1134568?v=3?s=110" width="110px;" alt="Nate Felton"/><br /><sub><b>Nate Felton</b></sub></a><br /><a href="https://github.com/snipe/snipe-it/commits?author=n8felton" title="Code">💻</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="http://homepages.dcc.ufmg.br/~manassesferreira"><img src="https://avatars2.githubusercontent.com/u/14036694?v=3?s=110" width="110px;" alt="Manasses Ferreira"/><br /><sub><b>Manasses Ferreira</b></sub></a><br /><a href="https://github.com/snipe/snipe-it/commits?author=manassesferreira" title="Code">💻</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/steveelwood"><img src="https://avatars0.githubusercontent.com/u/15913949?v=3?s=110" width="110px;" alt="Steve"/><br /><sub><b>Steve</b></sub></a><br /><a href="https://github.com/snipe/snipe-it/commits?author=steveelwood" title="Tests">⚠️</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="http://twitter.com/matc"><img src="https://avatars1.githubusercontent.com/u/3361683?v=3?s=110" width="110px;" alt="matc"/><br /><sub><b>matc</b></sub></a><br /><a href="https://github.com/snipe/snipe-it/commits?author=matc" title="Tests">⚠️</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="http://www.davisracingteam.com"><img src="https://avatars3.githubusercontent.com/u/7405702?v=3?s=110" width="110px;" alt="Cole R. Davis"/><br /><sub><b>Cole R. Davis</b></sub></a><br /><a href="https://github.com/snipe/snipe-it/commits?author=VanillaNinjaD" title="Tests">⚠️</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/gibsonjoshua55"><img src="https://avatars2.githubusercontent.com/u/10167681?v=3?s=110" width="110px;" alt="gibsonjoshua55"/><br /><sub><b>gibsonjoshua55</b></sub></a><br /><a href="https://github.com/snipe/snipe-it/commits?author=gibsonjoshua55" title="Code">💻</a></td>
-    </tr>
-    <tr>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/zwerch"><img src="https://avatars2.githubusercontent.com/u/2809241?v=4?s=110" width="110px;" alt="Robin Temme"/><br /><sub><b>Robin Temme</b></sub></a><br /><a href="https://github.com/snipe/snipe-it/commits?author=zwerch" title="Code">💻</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/imanghafoori1"><img src="https://avatars0.githubusercontent.com/u/6961695?v=4?s=110" width="110px;" alt="Iman"/><br /><sub><b>Iman</b></sub></a><br /><a href="https://github.com/snipe/snipe-it/commits?author=imanghafoori1" title="Code">💻</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/richardhofman6"><img src="https://avatars1.githubusercontent.com/u/6551003?v=4?s=110" width="110px;" alt="Richard Hofman"/><br /><sub><b>Richard Hofman</b></sub></a><br /><a href="https://github.com/snipe/snipe-it/commits?author=richardhofman6" title="Code">💻</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/gizzmojr"><img src="https://avatars0.githubusercontent.com/u/3697569?v=4?s=110" width="110px;" alt="gizzmojr"/><br /><sub><b>gizzmojr</b></sub></a><br /><a href="https://github.com/snipe/snipe-it/commits?author=gizzmojr" title="Code">💻</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/imjennyli"><img src="https://avatars3.githubusercontent.com/u/404729?v=4?s=110" width="110px;" alt="Jenny Li"/><br /><sub><b>Jenny Li</b></sub></a><br /><a href="https://github.com/snipe/snipe-it/commits?author=imjennyli" title="Documentation">📖</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/GeoffYoung"><img src="https://avatars0.githubusercontent.com/u/869227?v=4?s=110" width="110px;" alt="Geoff Young"/><br /><sub><b>Geoff Young</b></sub></a><br /><a href="https://github.com/snipe/snipe-it/commits?author=GeoffYoung" title="Code">💻</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="http://www.elliotblackburn.com"><img src="https://avatars3.githubusercontent.com/u/1068477?v=4?s=110" width="110px;" alt="Elliot Blackburn"/><br /><sub><b>Elliot Blackburn</b></sub></a><br /><a href="https://github.com/snipe/snipe-it/commits?author=BlueHatbRit" title="Documentation">📖</a></td>
-    </tr>
-    <tr>
-      <td align="center" valign="top" width="14.28%"><a href="http://andmemasin.eu"><img src="https://avatars1.githubusercontent.com/u/6357451?v=4?s=110" width="110px;" alt="Tõnis Ormisson"/><br /><sub><b>Tõnis Ormisson</b></sub></a><br /><a href="https://github.com/snipe/snipe-it/commits?author=TonisOrmisson" title="Code">💻</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="http://www.nicolai-essig.de"><img src="https://avatars0.githubusercontent.com/u/449411?v=4?s=110" width="110px;" alt="Nicolai Essig"/><br /><sub><b>Nicolai Essig</b></sub></a><br /><a href="https://github.com/snipe/snipe-it/commits?author=thakilla" title="Code">💻</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/techincolor"><img src="https://avatars1.githubusercontent.com/u/14809698?v=4?s=110" width="110px;" alt="Danielle"/><br /><sub><b>Danielle</b></sub></a><br /><a href="https://github.com/snipe/snipe-it/commits?author=techincolor" title="Documentation">📖</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/TheVakman"><img src="https://avatars1.githubusercontent.com/u/18545156?v=4?s=110" width="110px;" alt="Lawrence"/><br /><sub><b>Lawrence</b></sub></a><br /><a href="https://github.com/snipe/snipe-it/commits?author=TheVakman" title="Tests">⚠️</a> <a href="https://github.com/snipe/snipe-it/issues?q=author%3ATheVakman" title="Bug reports">🐛</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/uknzaeinozpas"><img src="https://avatars1.githubusercontent.com/u/22473767?v=4?s=110" width="110px;" alt="uknzaeinozpas"/><br /><sub><b>uknzaeinozpas</b></sub></a><br /><a href="https://github.com/snipe/snipe-it/commits?author=uknzaeinozpas" title="Tests">⚠️</a> <a href="https://github.com/snipe/snipe-it/commits?author=uknzaeinozpas" title="Code">💻</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/Gelob"><img src="https://avatars3.githubusercontent.com/u/422752?v=4?s=110" width="110px;" alt="Ryan"/><br /><sub><b>Ryan</b></sub></a><br /><a href="https://github.com/snipe/snipe-it/commits?author=Gelob" title="Documentation">📖</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/vcordes79"><img src="https://avatars1.githubusercontent.com/u/10672546?v=4?s=110" width="110px;" alt="vcordes79"/><br /><sub><b>vcordes79</b></sub></a><br /><a href="https://github.com/snipe/snipe-it/commits?author=vcordes79" title="Code">💻</a></td>
-    </tr>
-    <tr>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/fordster78"><img src="https://avatars3.githubusercontent.com/u/27958330?v=4?s=110" width="110px;" alt="fordster78"/><br /><sub><b>fordster78</b></sub></a><br /><a href="https://github.com/snipe/snipe-it/commits?author=fordster78" title="Code">💻</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/CronKz"><img src="https://avatars0.githubusercontent.com/u/34064225?v=4?s=110" width="110px;" alt="CronKz"/><br /><sub><b>CronKz</b></sub></a><br /><a href="https://github.com/snipe/snipe-it/commits?author=CronKz" title="Code">💻</a> <a href="#translation-CronKz" title="Translation">🌍</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/tdb"><img src="https://avatars1.githubusercontent.com/u/585486?v=4?s=110" width="110px;" alt="Tim Bishop"/><br /><sub><b>Tim Bishop</b></sub></a><br /><a href="https://github.com/snipe/snipe-it/commits?author=tdb" title="Code">💻</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://www.seanmcilvenna.com"><img src="https://avatars2.githubusercontent.com/u/5384694?v=4?s=110" width="110px;" alt="Sean McIlvenna"/><br /><sub><b>Sean McIlvenna</b></sub></a><br /><a href="https://github.com/snipe/snipe-it/commits?author=seanmcilvenna" title="Code">💻</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/cepacs"><img src="https://avatars3.githubusercontent.com/u/36515590?v=4?s=110" width="110px;" alt="cepacs"/><br /><sub><b>cepacs</b></sub></a><br /><a href="https://github.com/snipe/snipe-it/issues?q=author%3Acepacs" title="Bug reports">🐛</a> <a href="https://github.com/snipe/snipe-it/commits?author=cepacs" title="Documentation">📖</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/lea-mink"><img src="https://avatars2.githubusercontent.com/u/37537300?v=4?s=110" width="110px;" alt="lea-mink"/><br /><sub><b>lea-mink</b></sub></a><br /><a href="https://github.com/snipe/snipe-it/commits?author=lea-mink" title="Code">💻</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/hannahtinkler"><img src="https://avatars0.githubusercontent.com/u/7140719?v=4?s=110" width="110px;" alt="Hannah Tinkler"/><br /><sub><b>Hannah Tinkler</b></sub></a><br /><a href="https://github.com/snipe/snipe-it/commits?author=hannahtinkler" title="Code">💻</a></td>
-    </tr>
-    <tr>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/doekman"><img src="https://avatars1.githubusercontent.com/u/1086388?v=4?s=110" width="110px;" alt="Doeke Zanstra"/><br /><sub><b>Doeke Zanstra</b></sub></a><br /><a href="https://github.com/snipe/snipe-it/commits?author=doekman" title="Code">💻</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://www.sdhd.nl/"><img src="https://avatars1.githubusercontent.com/u/4325936?v=4?s=110" width="110px;" alt="Djamon Staal"/><br /><sub><b>Djamon Staal</b></sub></a><br /><a href="https://github.com/snipe/snipe-it/commits?author=SjamonDaal" title="Code">💻</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/EarlRamirez"><img src="https://avatars3.githubusercontent.com/u/12306859?v=4?s=110" width="110px;" alt="Earl Ramirez"/><br /><sub><b>Earl Ramirez</b></sub></a><br /><a href="https://github.com/snipe/snipe-it/commits?author=EarlRamirez" title="Code">💻</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/RichardRay"><img src="https://avatars2.githubusercontent.com/u/8671456?v=4?s=110" width="110px;" alt="Richard Ray Thomas"/><br /><sub><b>Richard Ray Thomas</b></sub></a><br /><a href="https://github.com/snipe/snipe-it/commits?author=RichardRay" title="Code">💻</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://www.taisun.io/"><img src="https://avatars3.githubusercontent.com/u/1852688?v=4?s=110" width="110px;" alt="Ryan Kuba"/><br /><sub><b>Ryan Kuba</b></sub></a><br /><a href="https://github.com/snipe/snipe-it/commits?author=thelamer" title="Code">💻</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/ParadoxGuitarist"><img src="https://avatars1.githubusercontent.com/u/6751928?v=4?s=110" width="110px;" alt="Brian Monroe"/><br /><sub><b>Brian Monroe</b></sub></a><br /><a href="https://github.com/snipe/snipe-it/commits?author=ParadoxGuitarist" title="Code">💻</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/plexorama"><img src="https://avatars1.githubusercontent.com/u/605167?v=4?s=110" width="110px;" alt="plexorama"/><br /><sub><b>plexorama</b></sub></a><br /><a href="https://github.com/snipe/snipe-it/commits?author=plexorama" title="Code">💻</a></td>
-    </tr>
-    <tr>
-      <td align="center" valign="top" width="14.28%"><a href="https://tilldeeke.de"><img src="https://avatars2.githubusercontent.com/u/1795149?v=4?s=110" width="110px;" alt="Till Deeke"/><br /><sub><b>Till Deeke</b></sub></a><br /><a href="https://github.com/snipe/snipe-it/commits?author=tilldeeke" title="Code">💻</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/5quirrel"><img src="https://avatars0.githubusercontent.com/u/12634129?v=4?s=110" width="110px;" alt="5quirrel"/><br /><sub><b>5quirrel</b></sub></a><br /><a href="https://github.com/snipe/snipe-it/commits?author=5quirrel" title="Code">💻</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/jasonlshelton"><img src="https://avatars1.githubusercontent.com/u/13071957?v=4?s=110" width="110px;" alt="Jason"/><br /><sub><b>Jason</b></sub></a><br /><a href="https://github.com/snipe/snipe-it/commits?author=jasonlshelton" title="Code">💻</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/chemfy"><img src="https://avatars3.githubusercontent.com/u/7128321?v=4?s=110" width="110px;" alt="Antti"/><br /><sub><b>Antti</b></sub></a><br /><a href="https://github.com/snipe/snipe-it/commits?author=chemfy" title="Code">💻</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/DeusMaximus"><img src="https://avatars3.githubusercontent.com/u/10080364?v=4?s=110" width="110px;" alt="DeusMaximus"/><br /><sub><b>DeusMaximus</b></sub></a><br /><a href="https://github.com/snipe/snipe-it/commits?author=DeusMaximus" title="Code">💻</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/A-ROYAL"><img src="https://avatars2.githubusercontent.com/u/16384611?v=4?s=110" width="110px;" alt="a-royal"/><br /><sub><b>a-royal</b></sub></a><br /><a href="#translation-A-ROYAL" title="Translation">🌍</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/albertoaldrigo"><img src="https://avatars0.githubusercontent.com/u/5358208?v=4?s=110" width="110px;" alt="Alberto Aldrigo"/><br /><sub><b>Alberto Aldrigo</b></sub></a><br /><a href="#translation-albertoaldrigo" title="Translation">🌍</a></td>
-    </tr>
-    <tr>
-      <td align="center" valign="top" width="14.28%"><a href="http://alex.stanev.org/blog"><img src="https://avatars0.githubusercontent.com/u/1412342?v=4?s=110" width="110px;" alt="Alex Stanev"/><br /><sub><b>Alex Stanev</b></sub></a><br /><a href="#translation-RealEnder" title="Translation">🌍</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="http://devel.itsolution2.de"><img src="https://avatars0.githubusercontent.com/u/177295?v=4?s=110" width="110px;" alt="Andreas Rehm"/><br /><sub><b>Andreas Rehm</b></sub></a><br /><a href="#translation-sirrus" title="Translation">🌍</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/xelan"><img src="https://avatars0.githubusercontent.com/u/5080535?v=4?s=110" width="110px;" alt="Andreas Erhard"/><br /><sub><b>Andreas Erhard</b></sub></a><br /><a href="#translation-xelan" title="Translation">🌍</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/angeldeejay"><img src="https://avatars2.githubusercontent.com/u/142350?v=4?s=110" width="110px;" alt="Andrés Vanegas Jiménez"/><br /><sub><b>Andrés Vanegas Jiménez</b></sub></a><br /><a href="#translation-angeldeejay" title="Translation">🌍</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/aschiavon91"><img src="https://avatars0.githubusercontent.com/u/3910403?v=4?s=110" width="110px;" alt="Antonio Schiavon"/><br /><sub><b>Antonio Schiavon</b></sub></a><br /><a href="#translation-aschiavon91" title="Translation">🌍</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/benunter"><img src="https://avatars0.githubusercontent.com/u/10464547?v=4?s=110" width="110px;" alt="benunter"/><br /><sub><b>benunter</b></sub></a><br /><a href="#translation-benunter" title="Translation">🌍</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="http://catweb24.pl"><img src="https://avatars1.githubusercontent.com/u/5038647?v=4?s=110" width="110px;" alt="Borys Żmuda"/><br /><sub><b>Borys Żmuda</b></sub></a><br /><a href="#translation-rudashi" title="Translation">🌍</a></td>
-    </tr>
-    <tr>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/chibacityblues"><img src="https://avatars0.githubusercontent.com/u/5539359?v=4?s=110" width="110px;" alt="chibacityblues"/><br /><sub><b>chibacityblues</b></sub></a><br /><a href="#translation-chibacityblues" title="Translation">🌍</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/cwlin0416"><img src="https://avatars1.githubusercontent.com/u/1954830?v=4?s=110" width="110px;" alt="Chien Wei Lin"/><br /><sub><b>Chien Wei Lin</b></sub></a><br /><a href="#translation-cwlin0416" title="Translation">🌍</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/Againstreality"><img src="https://avatars3.githubusercontent.com/u/11700533?v=4?s=110" width="110px;" alt="Christian Schuster"/><br /><sub><b>Christian Schuster</b></sub></a><br /><a href="#translation-Againstreality" title="Translation">🌍</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="http://chriss.webhostid.com"><img src="https://avatars1.githubusercontent.com/u/4308704?v=4?s=110" width="110px;" alt="Christian Stefanus"/><br /><sub><b>Christian Stefanus</b></sub></a><br /><a href="#translation-kopi-item" title="Translation">🌍</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="http://wxcafe.net"><img src="https://avatars3.githubusercontent.com/u/3009327?v=4?s=110" width="110px;" alt="wxcafé"/><br /><sub><b>wxcafé</b></sub></a><br /><a href="#translation-wxcafe" title="Translation">🌍</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/dpyroc"><img src="https://avatars3.githubusercontent.com/u/35761525?v=4?s=110" width="110px;" alt="dpyroc"/><br /><sub><b>dpyroc</b></sub></a><br /><a href="#translation-dpyroc" title="Translation">🌍</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="http://www.friedlmaier.net"><img src="https://avatars1.githubusercontent.com/u/2153639?v=4?s=110" width="110px;" alt="Daniel Friedlmaier"/><br /><sub><b>Daniel Friedlmaier</b></sub></a><br /><a href="#translation-da-friedl" title="Translation">🌍</a></td>
-    </tr>
-    <tr>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/danielheene"><img src="https://avatars1.githubusercontent.com/u/2947640?v=4?s=110" width="110px;" alt="Daniel Heene"/><br /><sub><b>Daniel Heene</b></sub></a><br /><a href="#translation-danielheene" title="Translation">🌍</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/danielcb"><img src="https://avatars3.githubusercontent.com/u/319022?v=4?s=110" width="110px;" alt="danielcb"/><br /><sub><b>danielcb</b></sub></a><br /><a href="#translation-danielcb" title="Translation">🌍</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/dominiksenti"><img src="https://avatars3.githubusercontent.com/u/15846537?v=4?s=110" width="110px;" alt="Dominik Senti"/><br /><sub><b>Dominik Senti</b></sub></a><br /><a href="#translation-dominiksenti" title="Translation">🌍</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="http://www.konectik.com"><img src="https://avatars0.githubusercontent.com/u/25570954?v=4?s=110" width="110px;" alt="Eric Gautheron"/><br /><sub><b>Eric Gautheron</b></sub></a><br /><a href="#translation-EpixFr" title="Translation">🌍</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://erlpil.com"><img src="https://avatars1.githubusercontent.com/u/5732623?v=4?s=110" width="110px;" alt="Erlend Pilø"/><br /><sub><b>Erlend Pilø</b></sub></a><br /><a href="#translation-Erlpil" title="Translation">🌍</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="http://fabio.technology"><img src="https://avatars0.githubusercontent.com/u/541832?v=4?s=110" width="110px;" alt="Fabio Rapposelli"/><br /><sub><b>Fabio Rapposelli</b></sub></a><br /><a href="#translation-frapposelli" title="Translation">🌍</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/fgbs"><img src="https://avatars2.githubusercontent.com/u/3605240?v=4?s=110" width="110px;" alt="Felipe Barros"/><br /><sub><b>Felipe Barros</b></sub></a><br /><a href="#translation-fgbs" title="Translation">🌍</a></td>
-    </tr>
-    <tr>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/possebon"><img src="https://avatars0.githubusercontent.com/u/257745?v=4?s=110" width="110px;" alt="Fernando Possebon"/><br /><sub><b>Fernando Possebon</b></sub></a><br /><a href="#translation-possebon" title="Translation">🌍</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/gdraque"><img src="https://avatars3.githubusercontent.com/u/2540832?v=4?s=110" width="110px;" alt="gdraque"/><br /><sub><b>gdraque</b></sub></a><br /><a href="#translation-gdraque" title="Translation">🌍</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/georgwallisch"><img src="https://avatars0.githubusercontent.com/u/23440381?v=4?s=110" width="110px;" alt="Georg Wallisch"/><br /><sub><b>Georg Wallisch</b></sub></a><br /><a href="#translation-georgwallisch" title="Translation">🌍</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/jgroblesr85"><img src="https://avatars1.githubusercontent.com/u/9852832?v=4?s=110" width="110px;" alt="Gerardo Robles"/><br /><sub><b>Gerardo Robles</b></sub></a><br /><a href="#translation-jgroblesr85" title="Translation">🌍</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://t.me/Gluek"><img src="https://avatars2.githubusercontent.com/u/11082640?v=4?s=110" width="110px;" alt="Gluek"/><br /><sub><b>Gluek</b></sub></a><br /><a href="#translation-mrgluek" title="Translation">🌍</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/AdnanAbuShahad"><img src="https://avatars0.githubusercontent.com/u/6847946?v=4?s=110" width="110px;" alt="AdnanAbuShahad"/><br /><sub><b>AdnanAbuShahad</b></sub></a><br /><a href="#translation-AdnanAbuShahad" title="Translation">🌍</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://hafidzi.my"><img src="https://avatars1.githubusercontent.com/u/3580608?v=4?s=110" width="110px;" alt="Hafidzi My"/><br /><sub><b>Hafidzi My</b></sub></a><br /><a href="#translation-hafidzi" title="Translation">🌍</a></td>
-    </tr>
-    <tr>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/fofwisdom"><img src="https://avatars2.githubusercontent.com/u/205521?v=4?s=110" width="110px;" alt="Harim Park"/><br /><sub><b>Harim Park</b></sub></a><br /><a href="#translation-fofwisdom" title="Translation">🌍</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="http://www.kentsson.se"><img src="https://avatars2.githubusercontent.com/u/3333841?v=4?s=110" width="110px;" alt="Henrik Kentsson"/><br /><sub><b>Henrik Kentsson</b></sub></a><br /><a href="#translation-Kentsson" title="Translation">🌍</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/husnulyaqien"><img src="https://avatars0.githubusercontent.com/u/36551034?v=4?s=110" width="110px;" alt="Husnul Yaqien"/><br /><sub><b>Husnul Yaqien</b></sub></a><br /><a href="#translation-husnulyaqien" title="Translation">🌍</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="http://abaalkhail.org"><img src="https://avatars1.githubusercontent.com/u/2372747?v=4?s=110" width="110px;" alt="Ibrahim"/><br /><sub><b>Ibrahim</b></sub></a><br /><a href="#translation-abaalkh" title="Translation">🌍</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/igolman"><img src="https://avatars0.githubusercontent.com/u/1389334?v=4?s=110" width="110px;" alt="igolman"/><br /><sub><b>igolman</b></sub></a><br /><a href="#translation-igolman" title="Translation">🌍</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/itangiang"><img src="https://avatars1.githubusercontent.com/u/3257070?v=4?s=110" width="110px;" alt="itangiang"/><br /><sub><b>itangiang</b></sub></a><br /><a href="#translation-itangiang" title="Translation">🌍</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/jarby1211"><img src="https://avatars2.githubusercontent.com/u/14814254?v=4?s=110" width="110px;" alt="jarby1211"/><br /><sub><b>jarby1211</b></sub></a><br /><a href="#translation-jarby1211" title="Translation">🌍</a></td>
-    </tr>
-    <tr>
-      <td align="center" valign="top" width="14.28%"><a href="http://jwillker.com"><img src="https://avatars3.githubusercontent.com/u/6719357?v=4?s=110" width="110px;" alt="Jhonn Willker"/><br /><sub><b>Jhonn Willker</b></sub></a><br /><a href="#translation-JohnWillker" title="Translation">🌍</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/joxelito94"><img src="https://avatars2.githubusercontent.com/u/10983635?v=4?s=110" width="110px;" alt="Jose"/><br /><sub><b>Jose</b></sub></a><br /><a href="#translation-joxelito94" title="Translation">🌍</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/laopangzi"><img src="https://avatars0.githubusercontent.com/u/5206122?v=4?s=110" width="110px;" alt="laopangzi"/><br /><sub><b>laopangzi</b></sub></a><br /><a href="#translation-laopangzi" title="Translation">🌍</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="http://usrportage.de"><img src="https://avatars2.githubusercontent.com/u/79707?v=4?s=110" width="110px;" alt="Lars Strojny"/><br /><sub><b>Lars Strojny</b></sub></a><br /><a href="#translation-lstrojny" title="Translation">🌍</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="http://twitter.com/marcosbl"><img src="https://avatars0.githubusercontent.com/u/389801?v=4?s=110" width="110px;" alt="MarcosBL"/><br /><sub><b>MarcosBL</b></sub></a><br /><a href="#translation-MarcosBL" title="Translation">🌍</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/mariejoyacajes"><img src="https://avatars3.githubusercontent.com/u/35664606?v=4?s=110" width="110px;" alt="marie joy cajes"/><br /><sub><b>marie joy cajes</b></sub></a><br /><a href="#translation-mariejoyacajes" title="Translation">🌍</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="http://www.markjohansen.dk"><img src="https://avatars2.githubusercontent.com/u/3052816?v=4?s=110" width="110px;" alt="Mark S. Johansen"/><br /><sub><b>Mark S. Johansen</b></sub></a><br /><a href="#translation-msjohansen" title="Translation">🌍</a></td>
-    </tr>
-    <tr>
-      <td align="center" valign="top" width="14.28%"><a href="http://martinstub.dk"><img src="https://avatars2.githubusercontent.com/u/982885?v=4?s=110" width="110px;" alt="Martin Stub"/><br /><sub><b>Martin Stub</b></sub></a><br /><a href="#translation-stubben" title="Translation">🌍</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/meyerf99"><img src="https://avatars2.githubusercontent.com/u/28959963?v=4?s=110" width="110px;" alt="Meyer Flavio"/><br /><sub><b>Meyer Flavio</b></sub></a><br /><a href="#translation-meyerf99" title="Translation">🌍</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/MicaelRodrigues"><img src="https://avatars3.githubusercontent.com/u/796443?v=4?s=110" width="110px;" alt="Micael Rodrigues"/><br /><sub><b>Micael Rodrigues</b></sub></a><br /><a href="#translation-MicaelRodrigues" title="Translation">🌍</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="http://rubixy.com/"><img src="https://avatars0.githubusercontent.com/u/10481331?v=4?s=110" width="110px;" alt="Mikael Rasmussen"/><br /><sub><b>Mikael Rasmussen</b></sub></a><br /><a href="#translation-mikaelssen" title="Translation">🌍</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/IxFail"><img src="https://avatars1.githubusercontent.com/u/1544552?v=4?s=110" width="110px;" alt="IxFail"/><br /><sub><b>IxFail</b></sub></a><br /><a href="#translation-IxFail" title="Translation">🌍</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="http://www.mohammedfota.com"><img src="https://avatars3.githubusercontent.com/u/18483118?v=4?s=110" width="110px;" alt="Mohammed Fota"/><br /><sub><b>Mohammed Fota</b></sub></a><br /><a href="#translation-MohammedFota" title="Translation">🌍</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/omego"><img src="https://avatars0.githubusercontent.com/u/227080?v=4?s=110" width="110px;" alt="Moayad Alserihi"/><br /><sub><b>Moayad Alserihi</b></sub></a><br /><a href="#translation-omego" title="Translation">🌍</a></td>
-    </tr>
-    <tr>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/saymd"><img src="https://avatars0.githubusercontent.com/u/1680266?v=4?s=110" width="110px;" alt="saymd"/><br /><sub><b>saymd</b></sub></a><br /><a href="#translation-saymd" title="Translation">🌍</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://nordsken.se"><img src="https://avatars0.githubusercontent.com/u/1826808?v=4?s=110" width="110px;" alt="Patrik Larsson"/><br /><sub><b>Patrik Larsson</b></sub></a><br /><a href="#translation-pooot" title="Translation">🌍</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/drcryo"><img src="https://avatars1.githubusercontent.com/u/20584746?v=4?s=110" width="110px;" alt="drcryo"/><br /><sub><b>drcryo</b></sub></a><br /><a href="#translation-drcryo" title="Translation">🌍</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/pawel1615"><img src="https://avatars1.githubusercontent.com/u/19408004?v=4?s=110" width="110px;" alt="pawel1615"/><br /><sub><b>pawel1615</b></sub></a><br /><a href="#translation-pawel1615" title="Translation">🌍</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/bodrovics"><img src="https://avatars2.githubusercontent.com/u/23340468?v=4?s=110" width="110px;" alt="bodrovics"/><br /><sub><b>bodrovics</b></sub></a><br /><a href="#translation-bodrovics" title="Translation">🌍</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/priatna"><img src="https://avatars0.githubusercontent.com/u/3257654?v=4?s=110" width="110px;" alt="priatna"/><br /><sub><b>priatna</b></sub></a><br /><a href="#translation-priatna" title="Translation">🌍</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://amayume.net"><img src="https://avatars1.githubusercontent.com/u/5358374?v=4?s=110" width="110px;" alt="Fan Jiang"/><br /><sub><b>Fan Jiang</b></sub></a><br /><a href="#translation-ProfFan" title="Translation">🌍</a></td>
-    </tr>
-    <tr>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/ragnarcx"><img src="https://avatars1.githubusercontent.com/u/22555451?v=4?s=110" width="110px;" alt="ragnarcx"/><br /><sub><b>ragnarcx</b></sub></a><br /><a href="#translation-ragnarcx" title="Translation">🌍</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="http://www.reinvanhaaren.nl/"><img src="https://avatars2.githubusercontent.com/u/18654582?v=4?s=110" width="110px;" alt="Rein van Haaren"/><br /><sub><b>Rein van Haaren</b></sub></a><br /><a href="#translation-reinvanhaaren" title="Translation">🌍</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="http://dheche.songolimo.net"><img src="https://avatars1.githubusercontent.com/u/386672?v=4?s=110" width="110px;" alt="Teguh Dwicaksana"/><br /><sub><b>Teguh Dwicaksana</b></sub></a><br /><a href="#translation-dheche" title="Translation">🌍</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/FRaccie"><img src="https://avatars2.githubusercontent.com/u/2572552?v=4?s=110" width="110px;" alt="fraccie"/><br /><sub><b>fraccie</b></sub></a><br /><a href="#translation-FRaccie" title="Translation">🌍</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/vinzruzell"><img src="https://avatars0.githubusercontent.com/u/35182720?v=4?s=110" width="110px;" alt="vinzruzell"/><br /><sub><b>vinzruzell</b></sub></a><br /><a href="#translation-vinzruzell" title="Translation">🌍</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="http://kevinaustin.com"><img src="https://avatars1.githubusercontent.com/u/7883603?v=4?s=110" width="110px;" alt="Kevin Austin"/><br /><sub><b>Kevin Austin</b></sub></a><br /><a href="#translation-vipsystem" title="Translation">🌍</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="http://azuraweb.xyz"><img src="https://avatars3.githubusercontent.com/u/3861828?v=4?s=110" width="110px;" alt="Wira Sandy"/><br /><sub><b>Wira Sandy</b></sub></a><br /><a href="#translation-wira-sandy" title="Translation">🌍</a></td>
-    </tr>
-    <tr>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/GrayHoax"><img src="https://avatars2.githubusercontent.com/u/8663789?v=4?s=110" width="110px;" alt="Илья"/><br /><sub><b>Илья</b></sub></a><br /><a href="#translation-GrayHoax" title="Translation">🌍</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/godusevpn"><img src="https://avatars3.githubusercontent.com/u/30119111?v=4?s=110" width="110px;" alt="GodUseVPN"/><br /><sub><b>GodUseVPN</b></sub></a><br /><a href="#translation-godusevpn" title="Translation">🌍</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/EngrZhou"><img src="https://avatars1.githubusercontent.com/u/745576?v=4?s=110" width="110px;" alt="周周"/><br /><sub><b>周周</b></sub></a><br /><a href="#translation-EngrZhou" title="Translation">🌍</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/takuy"><img src="https://avatars3.githubusercontent.com/u/1631095?v=4?s=110" width="110px;" alt="Sam"/><br /><sub><b>Sam</b></sub></a><br /><a href="https://github.com/snipe/snipe-it/commits?author=takuy" title="Code">💻</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://www.illisian.com.au"><img src="https://avatars1.githubusercontent.com/u/264022?v=4?s=110" width="110px;" alt="Azerothian"/><br /><sub><b>Azerothian</b></sub></a><br /><a href="https://github.com/snipe/snipe-it/commits?author=Azerothian" title="Code">💻</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="http://macfoo.wordpress.com/"><img src="https://avatars1.githubusercontent.com/u/4930051?v=4?s=110" width="110px;" alt="Wes Hulette"/><br /><sub><b>Wes Hulette</b></sub></a><br /><a href="https://github.com/snipe/snipe-it/commits?author=jwhulette" title="Code">💻</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/patrict"><img src="https://avatars0.githubusercontent.com/u/8134591?v=4?s=110" width="110px;" alt="patrict"/><br /><sub><b>patrict</b></sub></a><br /><a href="https://github.com/snipe/snipe-it/commits?author=patrict" title="Code">💻</a></td>
-    </tr>
-    <tr>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/VELIKII-DIVAN"><img src="https://avatars3.githubusercontent.com/u/2611616?v=4?s=110" width="110px;" alt="Dmitriy Minaev"/><br /><sub><b>Dmitriy Minaev</b></sub></a><br /><a href="https://github.com/snipe/snipe-it/commits?author=VELIKII-DIVAN" title="Code">💻</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/liquidhorse"><img src="https://avatars0.githubusercontent.com/u/5132245?v=4?s=110" width="110px;" alt="liquidhorse"/><br /><sub><b>liquidhorse</b></sub></a><br /><a href="https://github.com/snipe/snipe-it/commits?author=liquidhorse" title="Code">💻</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://seld.be/"><img src="https://avatars1.githubusercontent.com/u/183678?v=4?s=110" width="110px;" alt="Jordi Boggiano"/><br /><sub><b>Jordi Boggiano</b></sub></a><br /><a href="https://github.com/snipe/snipe-it/commits?author=Seldaek" title="Code">💻</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/inietov"><img src="https://avatars0.githubusercontent.com/u/653557?v=4?s=110" width="110px;" alt="Ivan Nieto"/><br /><sub><b>Ivan Nieto</b></sub></a><br /><a href="https://github.com/snipe/snipe-it/commits?author=inietov" title="Code">💻</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/benrubson"><img src="https://avatars2.githubusercontent.com/u/6764151?v=4?s=110" width="110px;" alt="Ben RUBSON"/><br /><sub><b>Ben RUBSON</b></sub></a><br /><a href="https://github.com/snipe/snipe-it/commits?author=benrubson" title="Code">💻</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/NMathar"><img src="https://avatars2.githubusercontent.com/u/8554558?v=4?s=110" width="110px;" alt="NMathar"/><br /><sub><b>NMathar</b></sub></a><br /><a href="https://github.com/snipe/snipe-it/commits?author=NMathar" title="Code">💻</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/smb"><img src="https://avatars1.githubusercontent.com/u/139566?v=4?s=110" width="110px;" alt="Steffen"/><br /><sub><b>Steffen</b></sub></a><br /><a href="https://github.com/snipe/snipe-it/commits?author=smb" title="Code">💻</a></td>
-    </tr>
-    <tr>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/Sxderp"><img src="https://avatars0.githubusercontent.com/u/6609453?v=4?s=110" width="110px;" alt="Sxderp"/><br /><sub><b>Sxderp</b></sub></a><br /><a href="https://github.com/snipe/snipe-it/commits?author=Sxderp" title="Code">💻</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/fanta8897"><img src="https://avatars1.githubusercontent.com/u/4807843?v=4?s=110" width="110px;" alt="fanta8897"/><br /><sub><b>fanta8897</b></sub></a><br /><a href="https://github.com/snipe/snipe-it/commits?author=fanta8897" title="Code">💻</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://andreybolonin.com/phpconsulting/"><img src="https://avatars2.githubusercontent.com/u/2576509?v=4?s=110" width="110px;" alt="Andrey Bolonin"/><br /><sub><b>Andrey Bolonin</b></sub></a><br /><a href="https://github.com/snipe/snipe-it/commits?author=andreybolonin" title="Code">💻</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="http://www.shinayoshi.net/"><img src="https://avatars3.githubusercontent.com/u/2173307?v=4?s=110" width="110px;" alt="shinayoshi"/><br /><sub><b>shinayoshi</b></sub></a><br /><a href="https://github.com/snipe/snipe-it/commits?author=shinayoshi" title="Code">💻</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/reuser"><img src="https://avatars3.githubusercontent.com/u/2130159?v=4?s=110" width="110px;" alt="Hubert"/><br /><sub><b>Hubert</b></sub></a><br /><a href="https://github.com/snipe/snipe-it/commits?author=reuser" title="Code">💻</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://brashear.me"><img src="https://avatars0.githubusercontent.com/u/6865789?v=4?s=110" width="110px;" alt="KeenRivals"/><br /><sub><b>KeenRivals</b></sub></a><br /><a href="https://github.com/snipe/snipe-it/commits?author=KeenRivals" title="Code">💻</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/omyno"><img src="https://avatars3.githubusercontent.com/u/2902513?v=4?s=110" width="110px;" alt="omyno"/><br /><sub><b>omyno</b></sub></a><br /><a href="https://github.com/snipe/snipe-it/commits?author=omyno" title="Code">💻</a></td>
-    </tr>
-    <tr>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/jackka"><img src="https://avatars1.githubusercontent.com/u/6271335?v=4?s=110" width="110px;" alt="Evgeny"/><br /><sub><b>Evgeny</b></sub></a><br /><a href="https://github.com/snipe/snipe-it/commits?author=jackka" title="Code">💻</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://digitalist.se"><img src="https://avatars2.githubusercontent.com/u/1169963?v=4?s=110" width="110px;" alt="Colin Campbell"/><br /><sub><b>Colin Campbell</b></sub></a><br /><a href="https://github.com/snipe/snipe-it/commits?author=colin-campbell" title="Code">💻</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/lubo"><img src="https://avatars3.githubusercontent.com/u/2872098?v=4?s=110" width="110px;" alt="Ľubomír Kučera"/><br /><sub><b>Ľubomír Kučera</b></sub></a><br /><a href="https://github.com/snipe/snipe-it/commits?author=lubo" title="Code">💻</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://www.sourceguru.net"><img src="https://avatars3.githubusercontent.com/u/570639?v=4?s=110" width="110px;" alt="Martin Meredith"/><br /><sub><b>Martin Meredith</b></sub></a><br /><a href="https://github.com/snipe/snipe-it/commits?author=Mezzle" title="Code">💻</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/timothyfarmer"><img src="https://avatars1.githubusercontent.com/u/7632599?v=4?s=110" width="110px;" alt="Tim Farmer"/><br /><sub><b>Tim Farmer</b></sub></a><br /><a href="https://github.com/snipe/snipe-it/commits?author=timothyfarmer" title="Code">💻</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/mskrip"><img src="https://avatars0.githubusercontent.com/u/17459600?v=4?s=110" width="110px;" alt="Marián Skrip"/><br /><sub><b>Marián Skrip</b></sub></a><br /><a href="https://github.com/snipe/snipe-it/commits?author=mskrip" title="Code">💻</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/Godmartinz"><img src="https://avatars2.githubusercontent.com/u/47435081?v=4?s=110" width="110px;" alt="Godfrey Martinez"/><br /><sub><b>Godfrey Martinez</b></sub></a><br /><a href="https://github.com/snipe/snipe-it/commits?author=Godmartinz" title="Code">💻</a></td>
-    </tr>
-    <tr>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/bigtreeEdo"><img src="https://avatars1.githubusercontent.com/u/2075128?v=4?s=110" width="110px;" alt="bigtreeEdo"/><br /><sub><b>bigtreeEdo</b></sub></a><br /><a href="https://github.com/snipe/snipe-it/commits?author=bigtreeEdo" title="Code">💻</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://colinmcneil.me/"><img src="https://avatars0.githubusercontent.com/u/5000430?v=4?s=110" width="110px;" alt="Colin  McNeil"/><br /><sub><b>Colin  McNeil</b></sub></a><br /><a href="https://github.com/snipe/snipe-it/commits?author=ColinMcNeil" title="Code">💻</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/JoKneeMo"><img src="https://avatars0.githubusercontent.com/u/421625?v=4?s=110" width="110px;" alt="JoKneeMo"/><br /><sub><b>JoKneeMo</b></sub></a><br /><a href="https://github.com/snipe/snipe-it/commits?author=JoKneeMo" title="Code">💻</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="http://www.redbridge.se"><img src="https://avatars0.githubusercontent.com/u/54849013?v=4?s=110" width="110px;" alt="Joshi"/><br /><sub><b>Joshi</b></sub></a><br /><a href="https://github.com/snipe/snipe-it/commits?author=joshi-redbridge" title="Code">💻</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/anthonypburns"><img src="https://avatars2.githubusercontent.com/u/15731458?v=4?s=110" width="110px;" alt="Anthony Burns"/><br /><sub><b>Anthony Burns</b></sub></a><br /><a href="https://github.com/snipe/snipe-it/commits?author=anthonypburns" title="Code">💻</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/johnson-yi"><img src="https://avatars1.githubusercontent.com/u/63399474?v=4?s=110" width="110px;" alt="johnson-yi"/><br /><sub><b>johnson-yi</b></sub></a><br /><a href="https://github.com/snipe/snipe-it/commits?author=johnson-yi" title="Code">💻</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://tangentmc.net"><img src="https://avatars1.githubusercontent.com/u/1862720?v=4?s=110" width="110px;" alt="Sanjay Govind"/><br /><sub><b>Sanjay Govind</b></sub></a><br /><a href="https://github.com/snipe/snipe-it/commits?author=sanjay900" title="Code">💻</a></td>
-    </tr>
-    <tr>
-      <td align="center" valign="top" width="14.28%"><a href="https://peter.upfold.org.uk/"><img src="https://avatars0.githubusercontent.com/u/1255375?v=4?s=110" width="110px;" alt="Peter Upfold"/><br /><sub><b>Peter Upfold</b></sub></a><br /><a href="https://github.com/snipe/snipe-it/commits?author=PeterUpfold" title="Code">💻</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/jbiel"><img src="https://avatars2.githubusercontent.com/u/961717?v=4?s=110" width="110px;" alt="Jared Biel"/><br /><sub><b>Jared Biel</b></sub></a><br /><a href="https://github.com/snipe/snipe-it/commits?author=jbiel" title="Code">💻</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/dampfklon"><img src="https://avatars1.githubusercontent.com/u/1733625?v=4?s=110" width="110px;" alt="Dampfklon"/><br /><sub><b>Dampfklon</b></sub></a><br /><a href="https://github.com/snipe/snipe-it/commits?author=dampfklon" title="Code">💻</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://communityclosing.com"><img src="https://avatars2.githubusercontent.com/u/52973156?v=4?s=110" width="110px;" alt="Charles Hamilton"/><br /><sub><b>Charles Hamilton</b></sub></a><br /><a href="https://github.com/snipe/snipe-it/commits?author=chamilton-ccn" title="Code">💻</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/giannello"><img src="https://avatars.githubusercontent.com/u/551789?v=4?s=110" width="110px;" alt="Giuseppe Iannello"/><br /><sub><b>Giuseppe Iannello</b></sub></a><br /><a href="https://github.com/snipe/snipe-it/commits?author=giannello" title="Code">💻</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://www.peterdavehello.org/"><img src="https://avatars.githubusercontent.com/u/3691490?v=4?s=110" width="110px;" alt="Peter Dave Hello"/><br /><sub><b>Peter Dave Hello</b></sub></a><br /><a href="https://github.com/snipe/snipe-it/commits?author=PeterDaveHello" title="Code">💻</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/sigmoidal"><img src="https://avatars.githubusercontent.com/u/6106332?v=4?s=110" width="110px;" alt="sigmoidal"/><br /><sub><b>sigmoidal</b></sub></a><br /><a href="https://github.com/snipe/snipe-it/commits?author=sigmoidal" title="Code">💻</a></td>
-    </tr>
-    <tr>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/phenixdotnet"><img src="https://avatars.githubusercontent.com/u/2082554?v=4?s=110" width="110px;" alt="Vincent Lainé"/><br /><sub><b>Vincent Lainé</b></sub></a><br /><a href="https://github.com/snipe/snipe-it/commits?author=phenixdotnet" title="Code">💻</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="http://www.lucas-pless.com"><img src="https://avatars.githubusercontent.com/u/1943040?v=4?s=110" width="110px;" alt="Lucas Pleß"/><br /><sub><b>Lucas Pleß</b></sub></a><br /><a href="https://github.com/snipe/snipe-it/commits?author=derlucas" title="Code">💻</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="http://twitter.com/iansltx"><img src="https://avatars.githubusercontent.com/u/472804?v=4?s=110" width="110px;" alt="Ian Littman"/><br /><sub><b>Ian Littman</b></sub></a><br /><a href="https://github.com/snipe/snipe-it/commits?author=iansltx" title="Code">💻</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/PauloLuna"><img src="https://avatars.githubusercontent.com/u/3519029?v=4?s=110" width="110px;" alt="João Paulo"/><br /><sub><b>João Paulo</b></sub></a><br /><a href="https://github.com/snipe/snipe-it/commits?author=PauloLuna" title="Code">💻</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/ThoBur"><img src="https://avatars.githubusercontent.com/u/70443365?v=4?s=110" width="110px;" alt="ThoBur"/><br /><sub><b>ThoBur</b></sub></a><br /><a href="https://github.com/snipe/snipe-it/commits?author=ThoBur" title="Code">💻</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="http://phpprofi.ru/"><img src="https://avatars.githubusercontent.com/u/1972329?v=4?s=110" width="110px;" alt="Alexander Chibrikin"/><br /><sub><b>Alexander Chibrikin</b></sub></a><br /><a href="https://github.com/snipe/snipe-it/commits?author=alek13" title="Code">💻</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/winstan"><img src="https://avatars.githubusercontent.com/u/438332?v=4?s=110" width="110px;" alt="Anthony Winstanley"/><br /><sub><b>Anthony Winstanley</b></sub></a><br /><a href="https://github.com/snipe/snipe-it/commits?author=winstan" title="Code">💻</a></td>
-    </tr>
-    <tr>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/fashberg"><img src="https://avatars.githubusercontent.com/u/3075214?v=4?s=110" width="110px;" alt="Folke"/><br /><sub><b>Folke</b></sub></a><br /><a href="https://github.com/snipe/snipe-it/commits?author=fashberg" title="Code">💻</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/benwa"><img src="https://avatars.githubusercontent.com/u/1351571?v=4?s=110" width="110px;" alt="Bennett Blodinger"/><br /><sub><b>Bennett Blodinger</b></sub></a><br /><a href="https://github.com/snipe/snipe-it/commits?author=benwa" title="Code">💻</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://nmc.dev"><img src="https://avatars.githubusercontent.com/u/2974631?v=4?s=110" width="110px;" alt="NMC"/><br /><sub><b>NMC</b></sub></a><br /><a href="https://github.com/snipe/snipe-it/commits?author=ncareau" title="Code">💻</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/andres-baller"><img src="https://avatars.githubusercontent.com/u/52182449?v=4?s=110" width="110px;" alt="andres-baller"/><br /><sub><b>andres-baller</b></sub></a><br /><a href="https://github.com/snipe/snipe-it/commits?author=andres-baller" title="Code">💻</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/sean-borg"><img src="https://avatars.githubusercontent.com/u/67109348?v=4?s=110" width="110px;" alt="sean-borg"/><br /><sub><b>sean-borg</b></sub></a><br /><a href="https://github.com/snipe/snipe-it/commits?author=sean-borg" title="Code">💻</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/EDVLeer"><img src="https://avatars.githubusercontent.com/u/32170051?v=4?s=110" width="110px;" alt="EDVLeer"/><br /><sub><b>EDVLeer</b></sub></a><br /><a href="https://github.com/snipe/snipe-it/commits?author=EDVLeer" title="Code">💻</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/Kurokat"><img src="https://avatars.githubusercontent.com/u/23075196?v=4?s=110" width="110px;" alt="Kurokat"/><br /><sub><b>Kurokat</b></sub></a><br /><a href="https://github.com/snipe/snipe-it/commits?author=Kurokat" title="Code">💻</a></td>
-    </tr>
-    <tr>
-      <td align="center" valign="top" width="14.28%"><a href="https://www.kevinkoellmann.de"><img src="https://avatars.githubusercontent.com/u/915514?v=4?s=110" width="110px;" alt="Kevin Köllmann"/><br /><sub><b>Kevin Köllmann</b></sub></a><br /><a href="https://github.com/snipe/snipe-it/commits?author=koelle25" title="Code">💻</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/sw-mreyes"><img src="https://avatars.githubusercontent.com/u/49025941?v=4?s=110" width="110px;" alt="sw-mreyes"/><br /><sub><b>sw-mreyes</b></sub></a><br /><a href="https://github.com/snipe/snipe-it/commits?author=sw-mreyes" title="Code">💻</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://pittet.ca"><img src="https://avatars.githubusercontent.com/u/70129?v=4?s=110" width="110px;" alt="Joel Pittet"/><br /><sub><b>Joel Pittet</b></sub></a><br /><a href="https://github.com/snipe/snipe-it/commits?author=joelpittet" title="Code">💻</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://elyscape.com"><img src="https://avatars.githubusercontent.com/u/792695?v=4?s=110" width="110px;" alt="Eli Young"/><br /><sub><b>Eli Young</b></sub></a><br /><a href="https://github.com/snipe/snipe-it/commits?author=elyscape" title="Code">💻</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/raelldottin"><img src="https://avatars.githubusercontent.com/u/317015?v=4?s=110" width="110px;" alt="Raell Dottin"/><br /><sub><b>Raell Dottin</b></sub></a><br /><a href="https://github.com/snipe/snipe-it/commits?author=raelldottin" title="Code">💻</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/misilot"><img src="https://avatars.githubusercontent.com/u/1446856?v=4?s=110" width="110px;" alt="Tom Misilo"/><br /><sub><b>Tom Misilo</b></sub></a><br /><a href="https://github.com/snipe/snipe-it/commits?author=misilot" title="Code">💻</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="http://david.davenne.be"><img src="https://avatars.githubusercontent.com/u/4496300?v=4?s=110" width="110px;" alt="David Davenne"/><br /><sub><b>David Davenne</b></sub></a><br /><a href="https://github.com/snipe/snipe-it/commits?author=JuustoMestari" title="Code">💻</a></td>
-    </tr>
-    <tr>
-      <td align="center" valign="top" width="14.28%"><a href="https://markstenglein.com"><img src="https://avatars.githubusercontent.com/u/9255772?v=4?s=110" width="110px;" alt="Mark Stenglein"/><br /><sub><b>Mark Stenglein</b></sub></a><br /><a href="https://github.com/snipe/snipe-it/commits?author=ocelotsloth" title="Code">💻</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/ajsy"><img src="https://avatars.githubusercontent.com/u/35658596?v=4?s=110" width="110px;" alt="ajsy"/><br /><sub><b>ajsy</b></sub></a><br /><a href="https://github.com/snipe/snipe-it/commits?author=ajsy" title="Code">💻</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/t3easy"><img src="https://avatars.githubusercontent.com/u/3628035?v=4?s=110" width="110px;" alt="Jan Kiesewetter"/><br /><sub><b>Jan Kiesewetter</b></sub></a><br /><a href="https://github.com/snipe/snipe-it/commits?author=t3easy" title="Code">💻</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/Tetrachloromethane250"><img src="https://avatars.githubusercontent.com/u/79449630?v=4?s=110" width="110px;" alt="Tetrachloromethane250"/><br /><sub><b>Tetrachloromethane250</b></sub></a><br /><a href="https://github.com/snipe/snipe-it/commits?author=Tetrachloromethane250" title="Code">💻</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://www.kajes.se/"><img src="https://avatars.githubusercontent.com/u/22004482?v=4?s=110" width="110px;" alt="Lars Kajes"/><br /><sub><b>Lars Kajes</b></sub></a><br /><a href="https://github.com/snipe/snipe-it/commits?author=kajes" title="Code">💻</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/Joly0"><img src="https://avatars.githubusercontent.com/u/13993216?v=4?s=110" width="110px;" alt="Joly0"/><br /><sub><b>Joly0</b></sub></a><br /><a href="https://github.com/snipe/snipe-it/commits?author=Joly0" title="Code">💻</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/limeless"><img src="https://avatars.githubusercontent.com/u/1501022?v=4?s=110" width="110px;" alt="theburger"/><br /><sub><b>theburger</b></sub></a><br /><a href="https://github.com/snipe/snipe-it/commits?author=limeless" title="Code">💻</a></td>
-    </tr>
-    <tr>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/deivishome"><img src="https://avatars.githubusercontent.com/u/36065681?v=4?s=110" width="110px;" alt="David Valin Alonso"/><br /><sub><b>David Valin Alonso</b></sub></a><br /><a href="https://github.com/snipe/snipe-it/commits?author=deivishome" title="Code">💻</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/andreaci"><img src="https://avatars.githubusercontent.com/u/8290389?v=4?s=110" width="110px;" alt="andreaci"/><br /><sub><b>andreaci</b></sub></a><br /><a href="https://github.com/snipe/snipe-it/commits?author=andreaci" title="Code">💻</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="http://www.jellesebreghts.be"><img src="https://avatars.githubusercontent.com/u/1828542?v=4?s=110" width="110px;" alt="Jelle Sebreghts"/><br /><sub><b>Jelle Sebreghts</b></sub></a><br /><a href="https://github.com/snipe/snipe-it/commits?author=Jelle-S" title="Code">💻</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/Skywalker-11"><img src="https://avatars.githubusercontent.com/u/11180862?v=4?s=110" width="110px;" alt="Michael Pietsch"/><br /><sub><b>Michael Pietsch</b></sub></a><br /></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/sh1hab"><img src="https://avatars.githubusercontent.com/u/22068886?v=4?s=110" width="110px;" alt="Masudul Haque Shihab"/><br /><sub><b>Masudul Haque Shihab</b></sub></a><br /><a href="https://github.com/snipe/snipe-it/commits?author=sh1hab" title="Code">💻</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="http://www.freedomdive.com/"><img src="https://avatars.githubusercontent.com/u/16099942?v=4?s=110" width="110px;" alt="Supapong Areeprasertkul"/><br /><sub><b>Supapong Areeprasertkul</b></sub></a><br /><a href="https://github.com/snipe/snipe-it/commits?author=zybersup" title="Code">💻</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/psarossy"><img src="https://avatars.githubusercontent.com/u/207358?v=4?s=110" width="110px;" alt="Peter Sarossy"/><br /><sub><b>Peter Sarossy</b></sub></a><br /><a href="https://github.com/snipe/snipe-it/commits?author=psarossy" title="Code">💻</a></td>
-    </tr>
-    <tr>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/nepella"><img src="https://avatars.githubusercontent.com/u/11823649?v=4?s=110" width="110px;" alt="Renee Margaret McConahy"/><br /><sub><b>Renee Margaret McConahy</b></sub></a><br /><a href="https://github.com/snipe/snipe-it/commits?author=nepella" title="Code">💻</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/JohnnyPicnic"><img src="https://avatars.githubusercontent.com/u/5553884?v=4?s=110" width="110px;" alt="JohnnyPicnic"/><br /><sub><b>JohnnyPicnic</b></sub></a><br /><a href="https://github.com/snipe/snipe-it/commits?author=JohnnyPicnic" title="Code">💻</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/markbrule"><img src="https://avatars.githubusercontent.com/u/8799594?v=4?s=110" width="110px;" alt="markbrule"/><br /><sub><b>markbrule</b></sub></a><br /><a href="https://github.com/snipe/snipe-it/commits?author=markbrule" title="Code">💻</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/mikecmpbll"><img src="https://avatars.githubusercontent.com/u/1962801?v=4?s=110" width="110px;" alt="Mike Campbell"/><br /><sub><b>Mike Campbell</b></sub></a><br /><a href="https://github.com/snipe/snipe-it/commits?author=mikecmpbll" title="Code">💻</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/tbrconnect"><img src="https://avatars.githubusercontent.com/u/11973217?v=4?s=110" width="110px;" alt="tbrconnect"/><br /><sub><b>tbrconnect</b></sub></a><br /><a href="https://github.com/snipe/snipe-it/commits?author=tbrconnect" title="Code">💻</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/kcoyo"><img src="https://avatars.githubusercontent.com/u/12447225?v=4?s=110" width="110px;" alt="kcoyo"/><br /><sub><b>kcoyo</b></sub></a><br /><a href="https://github.com/snipe/snipe-it/commits?author=kcoyo" title="Code">💻</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://travismiller.com/"><img src="https://avatars.githubusercontent.com/u/494017?v=4?s=110" width="110px;" alt="Travis Miller"/><br /><sub><b>Travis Miller</b></sub></a><br /><a href="https://github.com/snipe/snipe-it/commits?author=travismiller" title="Code">💻</a></td>
-    </tr>
-    <tr>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/Delta5"><img src="https://avatars.githubusercontent.com/u/1975640?v=4?s=110" width="110px;" alt="Evan Taylor"/><br /><sub><b>Evan Taylor</b></sub></a><br /><a href="https://github.com/snipe/snipe-it/commits?author=Delta5" title="Code">💻</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/PetriAsi"><img src="https://avatars.githubusercontent.com/u/8735148?v=4?s=110" width="110px;" alt="Petri Asikainen"/><br /><sub><b>Petri Asikainen</b></sub></a><br /><a href="https://github.com/snipe/snipe-it/commits?author=PetriAsi" title="Code">💻</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/derdeagle"><img src="https://avatars.githubusercontent.com/u/11424540?v=4?s=110" width="110px;" alt="derdeagle"/><br /><sub><b>derdeagle</b></sub></a><br /><a href="https://github.com/snipe/snipe-it/commits?author=derdeagle" title="Code">💻</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://wh0rd.org/"><img src="https://avatars.githubusercontent.com/u/176950?v=4?s=110" width="110px;" alt="Mike Frysinger"/><br /><sub><b>Mike Frysinger</b></sub></a><br /><a href="https://github.com/snipe/snipe-it/commits?author=vapier" title="Code">💻</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/AL4AL"><img src="https://avatars.githubusercontent.com/u/22044358?v=4?s=110" width="110px;" alt="ALPHA"/><br /><sub><b>ALPHA</b></sub></a><br /><a href="https://github.com/snipe/snipe-it/commits?author=AL4AL" title="Code">💻</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://www.ifern.de"><img src="https://avatars.githubusercontent.com/u/1042587?v=4?s=110" width="110px;" alt="FliegenKLATSCH"/><br /><sub><b>FliegenKLATSCH</b></sub></a><br /><a href="https://github.com/snipe/snipe-it/commits?author=FliegenKLATSCH" title="Code">💻</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/jerm"><img src="https://avatars.githubusercontent.com/u/442138?v=4?s=110" width="110px;" alt="Jeremy Price"/><br /><sub><b>Jeremy Price</b></sub></a><br /><a href="https://github.com/snipe/snipe-it/commits?author=jerm" title="Code">💻</a></td>
-    </tr>
-    <tr>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/Toreg87"><img src="https://avatars.githubusercontent.com/u/84392209?v=4?s=110" width="110px;" alt="Toreg87"/><br /><sub><b>Toreg87</b></sub></a><br /><a href="https://github.com/snipe/snipe-it/commits?author=Toreg87" title="Code">💻</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/Computroniks"><img src="https://avatars.githubusercontent.com/u/67638596?v=4?s=110" width="110px;" alt="Matthew Nickson"/><br /><sub><b>Matthew Nickson</b></sub></a><br /><a href="https://github.com/snipe/snipe-it/commits?author=Computroniks" title="Code">💻</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://jethron.id.au"><img src="https://avatars.githubusercontent.com/u/1646397?v=4?s=110" width="110px;" alt="Jethro Nederhof"/><br /><sub><b>Jethro Nederhof</b></sub></a><br /><a href="https://github.com/snipe/snipe-it/commits?author=jethron" title="Code">💻</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/01ste02"><img src="https://avatars.githubusercontent.com/u/23289826?v=4?s=110" width="110px;" alt="Oskar Stenberg"/><br /><sub><b>Oskar Stenberg</b></sub></a><br /><a href="https://github.com/snipe/snipe-it/commits?author=01ste02" title="Code">💻</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/Robert-Azelis"><img src="https://avatars.githubusercontent.com/u/82208283?v=4?s=110" width="110px;" alt="Robert-Azelis"/><br /><sub><b>Robert-Azelis</b></sub></a><br /><a href="https://github.com/snipe/snipe-it/commits?author=Robert-Azelis" title="Code">💻</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/alwism"><img src="https://avatars.githubusercontent.com/u/60648387?v=4?s=110" width="110px;" alt="Alexander William Smith"/><br /><sub><b>Alexander William Smith</b></sub></a><br /><a href="https://github.com/snipe/snipe-it/commits?author=alwism" title="Code">💻</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://www.leitwerk.de/"><img src="https://avatars.githubusercontent.com/u/24418301?v=4?s=110" width="110px;" alt="LEITWERK AG"/><br /><sub><b>LEITWERK AG</b></sub></a><br /><a href="https://github.com/snipe/snipe-it/commits?author=leitwerk-ag" title="Code">💻</a></td>
-    </tr>
-    <tr>
-      <td align="center" valign="top" width="14.28%"><a href="http://www.aboutcher.co.uk"><img src="https://avatars.githubusercontent.com/u/1911435?v=4?s=110" width="110px;" alt="Adam"/><br /><sub><b>Adam</b></sub></a><br /><a href="https://github.com/snipe/snipe-it/commits?author=adamboutcher" title="Code">💻</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://snksrv.com"><img src="https://avatars.githubusercontent.com/u/16104273?v=4?s=110" width="110px;" alt="Ian"/><br /><sub><b>Ian</b></sub></a><br /><a href="https://github.com/snipe/snipe-it/commits?author=sneak-it" title="Code">💻</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="http://blog.bestlong.idv.tw/"><img src="https://avatars.githubusercontent.com/u/4023909?v=4?s=110" width="110px;" alt="Shao Yu-Lung (Allen)"/><br /><sub><b>Shao Yu-Lung (Allen)</b></sub></a><br /><a href="https://github.com/snipe/snipe-it/commits?author=bestlong" title="Code">💻</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/Haxatron"><img src="https://avatars.githubusercontent.com/u/76475453?v=4?s=110" width="110px;" alt="Haxatron"/><br /><sub><b>Haxatron</b></sub></a><br /><a href="https://github.com/snipe/snipe-it/commits?author=Haxatron" title="Code">💻</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/PlaneNuts"><img src="https://avatars.githubusercontent.com/u/88776392?v=4?s=110" width="110px;" alt="PlaneNuts"/><br /><sub><b>PlaneNuts</b></sub></a><br /><a href="https://github.com/snipe/snipe-it/commits?author=PlaneNuts" title="Code">💻</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="http://bjcpgd.cias.rit.edu"><img src="https://avatars.githubusercontent.com/u/3842948?v=4?s=110" width="110px;" alt="Bradley Coudriet"/><br /><sub><b>Bradley Coudriet</b></sub></a><br /><a href="https://github.com/snipe/snipe-it/commits?author=exula" title="Code">💻</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://daltondur.st"><img src="https://avatars.githubusercontent.com/u/21966173?v=4?s=110" width="110px;" alt="Dalton Durst"/><br /><sub><b>Dalton Durst</b></sub></a><br /><a href="https://github.com/snipe/snipe-it/commits?author=UniversalSuperBox" title="Code">💻</a></td>
-    </tr>
-    <tr>
-      <td align="center" valign="top" width="14.28%"><a href="https://adagiohealth.org"><img src="https://avatars.githubusercontent.com/u/38761237?v=4?s=110" width="110px;" alt="Alex Janes"/><br /><sub><b>Alex Janes</b></sub></a><br /><a href="https://github.com/snipe/snipe-it/commits?author=adagioajanes" title="Code">💻</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/nuraeil"><img src="https://avatars.githubusercontent.com/u/32387849?v=4?s=110" width="110px;" alt="Nuraeil"/><br /><sub><b>Nuraeil</b></sub></a><br /><a href="https://github.com/snipe/snipe-it/commits?author=nuraeil" title="Code">💻</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/TenOfTens"><img src="https://avatars.githubusercontent.com/u/48162670?v=4?s=110" width="110px;" alt="TenOfTens"/><br /><sub><b>TenOfTens</b></sub></a><br /><a href="https://github.com/snipe/snipe-it/commits?author=TenOfTens" title="Code">💻</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://ditisjens.be/"><img src="https://avatars.githubusercontent.com/u/9415391?v=4?s=110" width="110px;" alt="waffle"/><br /><sub><b>waffle</b></sub></a><br /><a href="https://github.com/snipe/snipe-it/commits?author=insert-waffle" title="Code">💻</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/QveenSi"><img src="https://avatars.githubusercontent.com/u/19945501?v=4?s=110" width="110px;" alt="Yevhenii Huzii"/><br /><sub><b>Yevhenii Huzii</b></sub></a><br /><a href="https://github.com/snipe/snipe-it/commits?author=QveenSi" title="Code">💻</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/veenone"><img src="https://avatars.githubusercontent.com/u/3839381?v=4?s=110" width="110px;" alt="Achmad Fienan Rahardianto"/><br /><sub><b>Achmad Fienan Rahardianto</b></sub></a><br /><a href="https://github.com/snipe/snipe-it/commits?author=veenone" title="Code">💻</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/QveenSi"><img src="https://avatars.githubusercontent.com/u/19945501?v=4?s=110" width="110px;" alt="Yevhenii Huzii"/><br /><sub><b>Yevhenii Huzii</b></sub></a><br /><a href="https://github.com/snipe/snipe-it/commits?author=QveenSi" title="Code">💻</a></td>
-    </tr>
-    <tr>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/chrisweirich"><img src="https://avatars.githubusercontent.com/u/97299851?v=4?s=110" width="110px;" alt="Christian Weirich"/><br /><sub><b>Christian Weirich</b></sub></a><br /><a href="https://github.com/snipe/snipe-it/commits?author=chrisweirich" title="Code">💻</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/denzfarid"><img src="https://avatars.githubusercontent.com/u/1294403?v=4?s=110" width="110px;" alt="denzfarid"/><br /><sub><b>denzfarid</b></sub></a><br /></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/ntbutler-nbcs"><img src="https://avatars.githubusercontent.com/u/94018771?v=4?s=110" width="110px;" alt="ntbutler-nbcs"/><br /><sub><b>ntbutler-nbcs</b></sub></a><br /><a href="https://github.com/snipe/snipe-it/commits?author=ntbutler-nbcs" title="Code">💻</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://naveensrinivasan.dev"><img src="https://avatars.githubusercontent.com/u/172697?v=4?s=110" width="110px;" alt="Naveen"/><br /><sub><b>Naveen</b></sub></a><br /><a href="https://github.com/snipe/snipe-it/commits?author=naveensrinivasan" title="Code">💻</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/mikeroq"><img src="https://avatars.githubusercontent.com/u/55674383?v=4?s=110" width="110px;" alt="Mike Roquemore"/><br /><sub><b>Mike Roquemore</b></sub></a><br /><a href="https://github.com/snipe/snipe-it/commits?author=mikeroq" title="Code">💻</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/reederda"><img src="https://avatars.githubusercontent.com/u/7991086?v=4?s=110" width="110px;" alt="Daniel Reeder"/><br /><sub><b>Daniel Reeder</b></sub></a><br /><a href="#translation-reederda" title="Translation">🌍</a> <a href="#translation-reederda" title="Translation">🌍</a> <a href="https://github.com/snipe/snipe-it/commits?author=reederda" title="Code">💻</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/vickyjaura183"><img src="https://avatars.githubusercontent.com/u/109422491?v=4?s=110" width="110px;" alt="vickyjaura183"/><br /><sub><b>vickyjaura183</b></sub></a><br /><a href="https://github.com/snipe/snipe-it/commits?author=vickyjaura183" title="Code">💻</a></td>
-    </tr>
-    <tr>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/julian-piehl"><img src="https://avatars.githubusercontent.com/u/32363424?v=4?s=110" width="110px;" alt="Peace"/><br /><sub><b>Peace</b></sub></a><br /><a href="https://github.com/snipe/snipe-it/commits?author=julian-piehl" title="Code">💻</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/kylegordon"><img src="https://avatars.githubusercontent.com/u/231528?v=4?s=110" width="110px;" alt="Kyle Gordon"/><br /><sub><b>Kyle Gordon</b></sub></a><br /><a href="https://github.com/snipe/snipe-it/commits?author=kylegordon" title="Code">💻</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="http://www.bfh.ch"><img src="https://avatars.githubusercontent.com/u/53009155?v=4?s=110" width="110px;" alt="Katharina Drexel"/><br /><sub><b>Katharina Drexel</b></sub></a><br /><a href="https://github.com/snipe/snipe-it/commits?author=sunflowerbofh" title="Code">💻</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://david.sferruzza.fr/"><img src="https://avatars.githubusercontent.com/u/1931963?v=4?s=110" width="110px;" alt="David Sferruzza"/><br /><sub><b>David Sferruzza</b></sub></a><br /><a href="https://github.com/snipe/snipe-it/commits?author=dsferruzza" title="Code">💻</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/rnelsonee"><img src="https://avatars.githubusercontent.com/u/19511639?v=4?s=110" width="110px;" alt="Rick Nelson"/><br /><sub><b>Rick Nelson</b></sub></a><br /><a href="https://github.com/snipe/snipe-it/commits?author=rnelsonee" title="Code">💻</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/BasO12"><img src="https://avatars.githubusercontent.com/u/94169344?v=4?s=110" width="110px;" alt="BasO12"/><br /><sub><b>BasO12</b></sub></a><br /><a href="https://github.com/snipe/snipe-it/commits?author=BasO12" title="Code">💻</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/Vautia"><img src="https://avatars.githubusercontent.com/u/111710123?v=4?s=110" width="110px;" alt="Vautia"/><br /><sub><b>Vautia</b></sub></a><br /><a href="https://github.com/snipe/snipe-it/commits?author=Vautia" title="Code">💻</a></td>
-    </tr>
-    <tr>
-      <td align="center" valign="top" width="14.28%"><a href="http://www.littlehart.net/atthekeyboard"><img src="https://avatars.githubusercontent.com/u/28321?v=4?s=110" width="110px;" alt="Chris Hartjes"/><br /><sub><b>Chris Hartjes</b></sub></a><br /><a href="https://github.com/snipe/snipe-it/commits?author=chartjes" title="Code">💻</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/geo-chen"><img src="https://avatars.githubusercontent.com/u/2404584?v=4?s=110" width="110px;" alt="geo-chen"/><br /><sub><b>geo-chen</b></sub></a><br /><a href="https://github.com/snipe/snipe-it/commits?author=geo-chen" title="Code">💻</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/nh314"><img src="https://avatars.githubusercontent.com/u/6006620?v=4?s=110" width="110px;" alt="Phan Nguyen"/><br /><sub><b>Phan Nguyen</b></sub></a><br /><a href="https://github.com/snipe/snipe-it/commits?author=nh314" title="Code">💻</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/StarlessNights"><img src="https://avatars.githubusercontent.com/u/115993812?v=4?s=110" width="110px;" alt="Iisakki Jaakkola"/><br /><sub><b>Iisakki Jaakkola</b></sub></a><br /><a href="https://github.com/snipe/snipe-it/commits?author=StarlessNights" title="Code">💻</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://bandism.net/"><img src="https://avatars.githubusercontent.com/u/22633385?v=4?s=110" width="110px;" alt="Ikko Ashimine"/><br /><sub><b>Ikko Ashimine</b></sub></a><br /><a href="https://github.com/snipe/snipe-it/commits?author=eltociear" title="Code">💻</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/lukasfehling"><img src="https://avatars.githubusercontent.com/u/56871540?v=4?s=110" width="110px;" alt="Lukas Fehling"/><br /><sub><b>Lukas Fehling</b></sub></a><br /><a href="https://github.com/snipe/snipe-it/commits?author=lukasfehling" title="Code">💻</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/fernando-almeida"><img src="https://avatars.githubusercontent.com/u/1975990?v=4?s=110" width="110px;" alt="Fernando Almeida"/><br /><sub><b>Fernando Almeida</b></sub></a><br /><a href="https://github.com/snipe/snipe-it/commits?author=fernando-almeida" title="Code">💻</a></td>
-    </tr>
-    <tr>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/akemidx"><img src="https://avatars.githubusercontent.com/u/116301219?v=4?s=110" width="110px;" alt="akemidx"/><br /><sub><b>akemidx</b></sub></a><br /><a href="https://github.com/snipe/snipe-it/commits?author=akemidx" title="Code">💻</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="http://oguz.site"><img src="https://avatars.githubusercontent.com/u/144778?v=4?s=110" width="110px;" alt="Oguz Bilgic"/><br /><sub><b>Oguz Bilgic</b></sub></a><br /><a href="https://github.com/snipe/snipe-it/commits?author=oguzbilgic" title="Code">💻</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/scoo73r"><img src="https://avatars.githubusercontent.com/u/9262438?v=4?s=110" width="110px;" alt="Scooter Crawford"/><br /><sub><b>Scooter Crawford</b></sub></a><br /><a href="https://github.com/snipe/snipe-it/commits?author=scoo73r" title="Code">💻</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/subdriven"><img src="https://avatars.githubusercontent.com/u/5957345?v=4?s=110" width="110px;" alt="subdriven"/><br /><sub><b>subdriven</b></sub></a><br /><a href="https://github.com/snipe/snipe-it/commits?author=subdriven" title="Code">💻</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/AndrewSav"><img src="https://avatars.githubusercontent.com/u/658865?v=4?s=110" width="110px;" alt="Andrew Savinykh"/><br /><sub><b>Andrew Savinykh</b></sub></a><br /><a href="https://github.com/snipe/snipe-it/commits?author=AndrewSav" title="Code">💻</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://kenchan0130.github.io"><img src="https://avatars.githubusercontent.com/u/1155067?v=4?s=110" width="110px;" alt="Tadayuki Onishi"/><br /><sub><b>Tadayuki Onishi</b></sub></a><br /><a href="https://github.com/snipe/snipe-it/commits?author=kenchan0130" title="Code">💻</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/floschoepfer"><img src="https://avatars.githubusercontent.com/u/112496896?v=4?s=110" width="110px;" alt="Florian"/><br /><sub><b>Florian</b></sub></a><br /><a href="https://github.com/snipe/snipe-it/commits?author=floschoepfer" title="Code">💻</a></td>
-    </tr>
-    <tr>
-      <td align="center" valign="top" width="14.28%"><a href="http://spencerlong.com"><img src="https://avatars.githubusercontent.com/u/7305753?v=4?s=110" width="110px;" alt="Spencer Long"/><br /><sub><b>Spencer Long</b></sub></a><br /><a href="https://github.com/snipe/snipe-it/commits?author=spencerrlongg" title="Code">💻</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/marcusmoore"><img src="https://avatars.githubusercontent.com/u/1141514?v=4?s=110" width="110px;" alt="Marcus Moore"/><br /><sub><b>Marcus Moore</b></sub></a><br /><a href="https://github.com/snipe/snipe-it/commits?author=marcusmoore" title="Code">💻</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/Mezzle"><img src="https://avatars.githubusercontent.com/u/570639?v=4?s=110" width="110px;" alt="Martin Meredith"/><br /><sub><b>Martin Meredith</b></sub></a><br /></td>
-      <td align="center" valign="top" width="14.28%"><a href="http://dboth.de"><img src="https://avatars.githubusercontent.com/u/5731963?v=4?s=110" width="110px;" alt="dboth"/><br /><sub><b>dboth</b></sub></a><br /><a href="https://github.com/snipe/snipe-it/commits?author=dboth" title="Code">💻</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/zacharyfleck"><img src="https://avatars.githubusercontent.com/u/87536651?v=4?s=110" width="110px;" alt="Zachary Fleck"/><br /><sub><b>Zachary Fleck</b></sub></a><br /><a href="https://github.com/snipe/snipe-it/commits?author=zacharyfleck" title="Code">💻</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/vikaas-cyper"><img src="https://avatars.githubusercontent.com/u/74609912?v=4?s=110" width="110px;" alt="VIKAAS-A"/><br /><sub><b>VIKAAS-A</b></sub></a><br /><a href="https://github.com/snipe/snipe-it/commits?author=vikaas-cyper" title="Code">💻</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/ak-piracha"><img src="https://avatars.githubusercontent.com/u/88882041?v=4?s=110" width="110px;" alt="Abdul Kareem"/><br /><sub><b>Abdul Kareem</b></sub></a><br /><a href="https://github.com/snipe/snipe-it/commits?author=ak-piracha" title="Code">💻</a></td>
-    </tr>
-    <tr>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/NojoudAlshehri"><img src="https://avatars.githubusercontent.com/u/111287779?v=4?s=110" width="110px;" alt="NojoudAlshehri"/><br /><sub><b>NojoudAlshehri</b></sub></a><br /><a href="https://github.com/snipe/snipe-it/commits?author=NojoudAlshehri" title="Code">💻</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/stefanstidlffg"><img src="https://avatars.githubusercontent.com/u/54367449?v=4?s=110" width="110px;" alt="Stefan Stidl"/><br /><sub><b>Stefan Stidl</b></sub></a><br /><a href="https://github.com/snipe/snipe-it/commits?author=stefanstidlffg" title="Code">💻</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/qay21"><img src="https://avatars.githubusercontent.com/u/87803479?v=4?s=110" width="110px;" alt="Quentin Aymard"/><br /><sub><b>Quentin Aymard</b></sub></a><br /><a href="https://github.com/snipe/snipe-it/commits?author=qay21" title="Code">💻</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/cram42"><img src="https://avatars.githubusercontent.com/u/5396871?v=4?s=110" width="110px;" alt="Grant Le Roux"/><br /><sub><b>Grant Le Roux</b></sub></a><br /><a href="https://github.com/snipe/snipe-it/commits?author=cram42" title="Code">💻</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="http://@singrity"><img src="https://avatars.githubusercontent.com/u/58479551?v=4?s=110" width="110px;" alt="Bogdan"/><br /><sub><b>Bogdan</b></sub></a><br /><a href="https://github.com/snipe/snipe-it/commits?author=Singrity" title="Code">💻</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/mmanjos"><img src="https://avatars.githubusercontent.com/u/3483684?v=4?s=110" width="110px;" alt="mmanjos"/><br /><sub><b>mmanjos</b></sub></a><br /><a href="https://github.com/snipe/snipe-it/commits?author=mmanjos" title="Code">💻</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://azooz2014.github.io/"><img src="https://avatars.githubusercontent.com/u/7429229?v=4?s=110" width="110px;" alt="Abdelaziz Faki"/><br /><sub><b>Abdelaziz Faki</b></sub></a><br /><a href="https://github.com/snipe/snipe-it/commits?author=Azooz2014" title="Code">💻</a></td>
-    </tr>
-    <tr>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/bilias"><img src="https://avatars.githubusercontent.com/u/47315739?v=4?s=110" width="110px;" alt="bilias"/><br /><sub><b>bilias</b></sub></a><br /><a href="https://github.com/snipe/snipe-it/commits?author=bilias" title="Code">💻</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/coach1988"><img src="https://avatars.githubusercontent.com/u/2565989?v=4?s=110" width="110px;" alt="coach1988"/><br /><sub><b>coach1988</b></sub></a><br /><a href="https://github.com/snipe/snipe-it/commits?author=coach1988" title="Code">💻</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/mauro-miatello"><img src="https://avatars.githubusercontent.com/u/11910225?v=4?s=110" width="110px;" alt="MrM"/><br /><sub><b>MrM</b></sub></a><br /><a href="https://github.com/snipe/snipe-it/commits?author=mauro-miatello" title="Code">💻</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/koiakoia"><img src="https://avatars.githubusercontent.com/u/60405354?v=4?s=110" width="110px;" alt="koiakoia"/><br /><sub><b>koiakoia</b></sub></a><br /><a href="https://github.com/snipe/snipe-it/commits?author=koiakoia" title="Code">💻</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/mustafa-online"><img src="https://avatars.githubusercontent.com/u/5323832?v=4?s=110" width="110px;" alt="Mustafa Online"/><br /><sub><b>Mustafa Online</b></sub></a><br /><a href="https://github.com/snipe/snipe-it/commits?author=mustafa-online" title="Code">💻</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/franceslui"><img src="https://avatars.githubusercontent.com/u/104601439?v=4?s=110" width="110px;" alt="franceslui"/><br /><sub><b>franceslui</b></sub></a><br /><a href="https://github.com/snipe/snipe-it/commits?author=franceslui" title="Code">💻</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/Q4kK"><img src="https://avatars.githubusercontent.com/u/125313163?v=4?s=110" width="110px;" alt="Q4kK"/><br /><sub><b>Q4kK</b></sub></a><br /><a href="https://github.com/snipe/snipe-it/commits?author=Q4kK" title="Code">💻</a></td>
-    </tr>
-    <tr>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/squintfox"><img src="https://avatars.githubusercontent.com/u/55590532?v=4?s=110" width="110px;" alt="squintfox"/><br /><sub><b>squintfox</b></sub></a><br /><a href="https://github.com/snipe/snipe-it/commits?author=squintfox" title="Code">💻</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/jeffclay"><img src="https://avatars.githubusercontent.com/u/1380084?v=4?s=110" width="110px;" alt="Jeff Clay"/><br /><sub><b>Jeff Clay</b></sub></a><br /><a href="https://github.com/snipe/snipe-it/commits?author=jeffclay" title="Code">💻</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/PP-JN-RL"><img src="https://avatars.githubusercontent.com/u/52716446?v=4?s=110" width="110px;" alt="Phil J R"/><br /><sub><b>Phil J R</b></sub></a><br /><a href="https://github.com/snipe/snipe-it/commits?author=PP-JN-RL" title="Code">💻</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://www.corelight.com/"><img src="https://avatars.githubusercontent.com/u/1496725?v=4?s=110" width="110px;" alt="i_virus"/><br /><sub><b>i_virus</b></sub></a><br /><a href="https://github.com/snipe/snipe-it/commits?author=chandanchowdhury" title="Code">💻</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/gitgrimbo"><img src="https://avatars.githubusercontent.com/u/1020541?v=4?s=110" width="110px;" alt="Paul Grime"/><br /><sub><b>Paul Grime</b></sub></a><br /><a href="https://github.com/snipe/snipe-it/commits?author=gitgrimbo" title="Code">💻</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://leeporte.co.uk"><img src="https://avatars.githubusercontent.com/u/922815?v=4?s=110" width="110px;" alt="Lee Porte"/><br /><sub><b>Lee Porte</b></sub></a><br /><a href="https://github.com/snipe/snipe-it/commits?author=LeePorte" title="Code">💻</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/bryanlopezinc"><img src="https://avatars.githubusercontent.com/u/23613427?v=4?s=110" width="110px;" alt="BRYAN "/><br /><sub><b>BRYAN </b></sub></a><br /><a href="https://github.com/snipe/snipe-it/commits?author=bryanlopezinc" title="Code">💻</a> <a href="https://github.com/snipe/snipe-it/commits?author=bryanlopezinc" title="Tests">⚠️</a></td>
-    </tr>
-    <tr>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/U-H-T"><img src="https://avatars.githubusercontent.com/u/64061710?v=4?s=110" width="110px;" alt="U-H-T"/><br /><sub><b>U-H-T</b></sub></a><br /><a href="https://github.com/snipe/snipe-it/commits?author=U-H-T" title="Code">💻</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/Tyree"><img src="https://avatars.githubusercontent.com/u/5395363?v=4?s=110" width="110px;" alt="Matt Tyree"/><br /><sub><b>Matt Tyree</b></sub></a><br /><a href="https://github.com/snipe/snipe-it/commits?author=Tyree" title="Documentation">📖</a></td>
-    </tr>
-  </tbody>
-</table>
-
-<!-- markdownlint-restore -->
-<!-- prettier-ignore-end -->
-
+| [<img src="https://avatars3.githubusercontent.com/u/197404?v=3" width="110px;"/><br /><sub>snipe</sub>](http://www.snipe.net)<br />[💻](https://github.com/snipe/snipe-it/commits?author=snipe "Code") [🚇](#infra-snipe "Infrastructure (Hosting, Build-Tools, etc)") [📖](https://github.com/snipe/snipe-it/commits?author=snipe "Documentation") [⚠️](https://github.com/snipe/snipe-it/commits?author=snipe "Tests") [🐛](https://github.com/snipe/snipe-it/issues?q=author%3Asnipe "Bug reports") [🎨](#design-snipe "Design") [👀](#review-snipe "Reviewed Pull Requests") | [<img src="https://avatars0.githubusercontent.com/u/36335?v=3" width="110px;"/><br /><sub>Brady Wetherington</sub>](http://www.uberbrady.com)<br />[💻](https://github.com/snipe/snipe-it/commits?author=uberbrady "Code") [📖](https://github.com/snipe/snipe-it/commits?author=uberbrady "Documentation") [🚇](#infra-uberbrady "Infrastructure (Hosting, Build-Tools, etc)") [👀](#review-uberbrady "Reviewed Pull Requests") | [<img src="https://avatars0.githubusercontent.com/u/3803132?v=3" width="110px;"/><br /><sub>Daniel Meltzer</sub>](https://github.com/dmeltzer)<br />[💻](https://github.com/snipe/snipe-it/commits?author=dmeltzer "Code") [⚠️](https://github.com/snipe/snipe-it/commits?author=dmeltzer "Tests") [📖](https://github.com/snipe/snipe-it/commits?author=dmeltzer "Documentation") | [<img src="https://avatars0.githubusercontent.com/u/1609106?v=3" width="110px;"/><br /><sub>Michael T</sub>](http://www.tuckertechonline.com)<br />[💻](https://github.com/snipe/snipe-it/commits?author=mtucker6784 "Code") | [<img src="https://avatars2.githubusercontent.com/u/3274937?v=3" width="110px;"/><br /><sub>madd15</sub>](https://github.com/madd15)<br />[📖](https://github.com/snipe/snipe-it/commits?author=madd15 "Documentation") [💬](#question-madd15 "Answering Questions") | [<img src="https://avatars2.githubusercontent.com/u/894126?v=3" width="110px;"/><br /><sub>Vincent Sposato</sub>](https://github.com/vsposato)<br />[💻](https://github.com/snipe/snipe-it/commits?author=vsposato "Code") | [<img src="https://avatars0.githubusercontent.com/u/1639757?v=3" width="110px;"/><br /><sub>Andrea Bergamasco</sub>](https://github.com/vjandrea)<br />[💻](https://github.com/snipe/snipe-it/commits?author=vjandrea "Code") |
+| :---: | :---: | :---: | :---: | :---: | :---: | :---: |
+| [<img src="https://avatars0.githubusercontent.com/u/10640152?v=3" width="110px;"/><br /><sub>Karol</sub>](https://github.com/kpawelski)<br />[🌍](#translation-kpawelski "Translation") [💻](https://github.com/snipe/snipe-it/commits?author=kpawelski "Code") | [<img src="https://avatars3.githubusercontent.com/u/600106?v=3" width="110px;"/><br /><sub>morph027</sub>](http://blog.morph027.de/)<br />[💻](https://github.com/snipe/snipe-it/commits?author=morph027 "Code") | [<img src="https://avatars3.githubusercontent.com/u/22935755?v=3" width="110px;"/><br /><sub>fvleminckx</sub>](https://github.com/fvleminckx)<br />[🚇](#infra-fvleminckx "Infrastructure (Hosting, Build-Tools, etc)") | [<img src="https://avatars2.githubusercontent.com/u/15633547?v=3" width="110px;"/><br /><sub>itsupportcmsukorg</sub>](https://github.com/itsupportcmsukorg)<br />[💻](https://github.com/snipe/snipe-it/commits?author=itsupportcmsukorg "Code") [🐛](https://github.com/snipe/snipe-it/issues?q=author%3Aitsupportcmsukorg "Bug reports") | [<img src="https://avatars3.githubusercontent.com/u/12373799?v=3" width="110px;"/><br /><sub>Frank</sub>](https://override.io)<br />[💻](https://github.com/snipe/snipe-it/commits?author=base-zero "Code") | [<img src="https://avatars0.githubusercontent.com/u/10137?v=3" width="110px;"/><br /><sub>Deleted user</sub>](https://github.com/ghost)<br />[🌍](#translation-ghost "Translation") [💻](https://github.com/snipe/snipe-it/commits?author=ghost "Code") | [<img src="https://avatars1.githubusercontent.com/u/10802313?v=3" width="110px;"/><br /><sub>tiagom62</sub>](https://github.com/tiagom62)<br />[💻](https://github.com/snipe/snipe-it/commits?author=tiagom62 "Code") [🚇](#infra-tiagom62 "Infrastructure (Hosting, Build-Tools, etc)") |
+| [<img src="https://avatars3.githubusercontent.com/u/2389047?v=3" width="110px;"/><br /><sub>Ryan Stafford</sub>](https://github.com/rystaf)<br />[💻](https://github.com/snipe/snipe-it/commits?author=rystaf "Code") | [<img src="https://avatars2.githubusercontent.com/u/10345935?v=3" width="110px;"/><br /><sub>Eammon Hanlon</sub>](https://github.com/ehanlon)<br />[💻](https://github.com/snipe/snipe-it/commits?author=ehanlon "Code") | [<img src="https://avatars0.githubusercontent.com/u/441924?v=3" width="110px;"/><br /><sub>zjean</sub>](https://github.com/zjean)<br />[💻](https://github.com/snipe/snipe-it/commits?author=zjean "Code") | [<img src="https://avatars0.githubusercontent.com/u/12660103?v=3" width="110px;"/><br /><sub>Matthias Frei</sub>](http://www.frei.media)<br />[💻](https://github.com/snipe/snipe-it/commits?author=FREImedia "Code") | [<img src="https://avatars0.githubusercontent.com/u/3767518?v=3" width="110px;"/><br /><sub>opsydev</sub>](https://github.com/opsydev)<br />[💻](https://github.com/snipe/snipe-it/commits?author=opsydev "Code") | [<img src="https://avatars1.githubusercontent.com/u/82290?v=3" width="110px;"/><br /><sub>Daniel Dreier</sub>](http://www.ddreier.com)<br />[💻](https://github.com/snipe/snipe-it/commits?author=ddreier "Code") | [<img src="https://avatars0.githubusercontent.com/u/23448?v=3" width="110px;"/><br /><sub>Nikolai Prokoschenko</sub>](http://rassie.org)<br />[💻](https://github.com/snipe/snipe-it/commits?author=rassie "Code") |
+| [<img src="https://avatars0.githubusercontent.com/u/13452757?v=3" width="110px;"/><br /><sub>Drew</sub>](https://github.com/YetAnotherCodeMonkey)<br />[💻](https://github.com/snipe/snipe-it/commits?author=YetAnotherCodeMonkey "Code") | [<img src="https://avatars0.githubusercontent.com/u/1342320?v=3" width="110px;"/><br /><sub>Walter</sub>](https://github.com/merid14)<br />[💻](https://github.com/snipe/snipe-it/commits?author=merid14 "Code") | [<img src="https://avatars3.githubusercontent.com/u/11254614?v=3" width="110px;"/><br /><sub>Petr Baloun</sub>](https://github.com/balous)<br />[💻](https://github.com/snipe/snipe-it/commits?author=balous "Code") | [<img src="https://avatars0.githubusercontent.com/u/6117660?v=3" width="110px;"/><br /><sub>reidblomquist</sub>](https://github.com/reidblomquist)<br />[📖](https://github.com/snipe/snipe-it/commits?author=reidblomquist "Documentation") | [<img src="https://avatars0.githubusercontent.com/u/539914?v=3" width="110px;"/><br /><sub>Mathieu Kooiman</sub>](https://github.com/mathieuk)<br />[💻](https://github.com/snipe/snipe-it/commits?author=mathieuk "Code") | [<img src="https://avatars3.githubusercontent.com/u/6606421?v=3" width="110px;"/><br /><sub>csayre</sub>](https://github.com/csayre)<br />[📖](https://github.com/snipe/snipe-it/commits?author=csayre "Documentation") | [<img src="https://avatars1.githubusercontent.com/u/768488?v=3" width="110px;"/><br /><sub>Adam Dunson</sub>](https://github.com/adamdunson)<br />[💻](https://github.com/snipe/snipe-it/commits?author=adamdunson "Code") |
+| [<img src="https://avatars0.githubusercontent.com/u/5547470?v=3" width="110px;"/><br /><sub>Hereward</sub>](https://github.com/thehereward)<br />[💻](https://github.com/snipe/snipe-it/commits?author=thehereward "Code") | [<img src="https://avatars0.githubusercontent.com/u/5802977?v=3" width="110px;"/><br /><sub>swoopdk</sub>](https://github.com/swoopdk)<br />[💻](https://github.com/snipe/snipe-it/commits?author=swoopdk "Code") | [<img src="https://avatars1.githubusercontent.com/u/3470403?v=3" width="110px;"/><br /><sub>Abdullah Alansari</sub>](https://linkedin.com/in/ahimta)<br />[💻](https://github.com/snipe/snipe-it/commits?author=Ahimta "Code") | [<img src="https://avatars0.githubusercontent.com/u/796443?v=3" width="110px;"/><br /><sub>Micael Rodrigues</sub>](https://github.com/MicaelRodrigues)<br />[💻](https://github.com/snipe/snipe-it/commits?author=MicaelRodrigues "Code") | [<img src="https://avatars0.githubusercontent.com/u/614564?v=3" width="110px;"/><br /><sub>Patrick Gallagher</sub>](http://macadmincorner.com)<br />[📖](https://github.com/snipe/snipe-it/commits?author=patgmac "Documentation") | [<img src="https://avatars3.githubusercontent.com/u/7165922?v=3" width="110px;"/><br /><sub>Miliamber</sub>](https://github.com/Miliamber)<br />[💻](https://github.com/snipe/snipe-it/commits?author=Miliamber "Code") | [<img src="https://avatars3.githubusercontent.com/u/861766?v=3" width="110px;"/><br /><sub>hawk554</sub>](https://github.com/hawk554)<br />[💻](https://github.com/snipe/snipe-it/commits?author=hawk554 "Code") |
+| [<img src="https://avatars1.githubusercontent.com/u/1695622?v=3" width="110px;"/><br /><sub>Justin Kerr</sub>](http://jbirdkerr.net)<br />[💻](https://github.com/snipe/snipe-it/commits?author=jbirdkerr "Code") | [<img src="https://avatars3.githubusercontent.com/u/11426176?v=3" width="110px;"/><br /><sub>Ira W. Snyder</sub>](http://www.irasnyder.com/devel/)<br />[📖](https://github.com/snipe/snipe-it/commits?author=irasnyd "Documentation") | [<img src="https://avatars2.githubusercontent.com/u/2475759?v=3" width="110px;"/><br /><sub>Aladin Alaily</sub>](https://github.com/aalaily)<br />[💻](https://github.com/snipe/snipe-it/commits?author=aalaily "Code") | [<img src="https://avatars0.githubusercontent.com/u/10247644?v=3" width="110px;"/><br /><sub>Chase Hansen</sub>](https://github.com/kobie-chasehansen)<br />[💻](https://github.com/snipe/snipe-it/commits?author=kobie-chasehansen "Code") [💬](#question-kobie-chasehansen "Answering Questions") [🐛](https://github.com/snipe/snipe-it/issues?q=author%3Akobie-chasehansen "Bug reports") | [<img src="https://avatars2.githubusercontent.com/u/13545400?v=3" width="110px;"/><br /><sub>IDM Helpdesk</sub>](https://github.com/IDM-Helpdesk)<br />[💻](https://github.com/snipe/snipe-it/commits?author=IDM-Helpdesk "Code") | [<img src="https://avatars2.githubusercontent.com/u/614439?v=3" width="110px;"/><br /><sub>Kai</sub>](http://balticer.de)<br />[💻](https://github.com/snipe/snipe-it/commits?author=balticer "Code") | [<img src="https://avatars1.githubusercontent.com/u/8762511?v=3" width="110px;"/><br /><sub>Michael Daniels</sub>](http://www.michaeldaniels.me)<br />[💻](https://github.com/snipe/snipe-it/commits?author=mdaniels5757 "Code") |
+| [<img src="https://avatars3.githubusercontent.com/u/1532660?v=3" width="110px;"/><br /><sub>Tom Castleman</sub>](http://tomcastleman.me)<br />[💻](https://github.com/snipe/snipe-it/commits?author=tomcastleman "Code") | [<img src="https://avatars3.githubusercontent.com/u/10723243?v=3" width="110px;"/><br /><sub>Daniel Nemanic</sub>](https://github.com/DanielNemanic)<br />[💻](https://github.com/snipe/snipe-it/commits?author=DanielNemanic "Code") | [<img src="https://avatars0.githubusercontent.com/u/150648?v=3" width="110px;"/><br /><sub>SouthWolf</sub>](https://github.com/southwolf)<br />[💻](https://github.com/snipe/snipe-it/commits?author=southwolf "Code") | [<img src="https://avatars2.githubusercontent.com/u/131616?v=3" width="110px;"/><br /><sub>Ivar Nesje</sub>](https://github.com/ivarne)<br />[💻](https://github.com/snipe/snipe-it/commits?author=ivarne "Code") | [<img src="https://avatars1.githubusercontent.com/u/62333?v=3" width="110px;"/><br /><sub>Jérémy Benoist</sub>](http://www.j0k3r.net)<br />[📖](https://github.com/snipe/snipe-it/commits?author=j0k3r "Documentation") | [<img src="https://avatars2.githubusercontent.com/u/724344?v=3" width="110px;"/><br /><sub>Chris Leathley</sub>](https://github.com/cleathley)<br />[🚇](#infra-cleathley "Infrastructure (Hosting, Build-Tools, etc)") | [<img src="https://avatars0.githubusercontent.com/u/972498?v=3" width="110px;"/><br /><sub>splaer</sub>](https://github.com/splaer)<br />[🐛](https://github.com/snipe/snipe-it/issues?q=author%3Asplaer "Bug reports") [💻](https://github.com/snipe/snipe-it/commits?author=splaer "Code") |
+| [<img src="https://avatars1.githubusercontent.com/u/967362?v=3" width="110px;"/><br /><sub>Joe Ferguson</sub>](http://www.joeferguson.me)<br />[💻](https://github.com/snipe/snipe-it/commits?author=svpernova09 "Code") | [<img src="https://avatars3.githubusercontent.com/u/6108682?v=3" width="110px;"/><br /><sub>diwanicki</sub>](https://github.com/diwanicki)<br />[💻](https://github.com/snipe/snipe-it/commits?author=diwanicki "Code") [📖](https://github.com/snipe/snipe-it/commits?author=diwanicki "Documentation") | [<img src="https://avatars3.githubusercontent.com/u/2527115?v=3" width="110px;"/><br /><sub>Lee Thoong Ching</sub>](https://github.com/pakkua80)<br />[📖](https://github.com/snipe/snipe-it/commits?author=pakkua80 "Documentation") [💻](https://github.com/snipe/snipe-it/commits?author=pakkua80 "Code") | [<img src="https://avatars1.githubusercontent.com/u/461491?v=3" width="110px;"/><br /><sub>Marek Šuppa</sub>](http://shu.io)<br />[💻](https://github.com/snipe/snipe-it/commits?author=mrshu "Code") | [<img src="https://avatars1.githubusercontent.com/u/8693762?v=3" width="110px;"/><br /><sub>Juan J. Martinez</sub>](https://github.com/mizar1616)<br />[🌍](#translation-mizar1616 "Translation") | [<img src="https://avatars1.githubusercontent.com/u/1458388?v=3" width="110px;"/><br /><sub>R Ryan Dial</sub>](https://github.com/rrdial)<br />[🌍](#translation-rrdial "Translation") | [<img src="https://avatars2.githubusercontent.com/u/2871745?v=3" width="110px;"/><br /><sub>Andrej Manduch</sub>](https://github.com/burlito)<br />[📖](https://github.com/snipe/snipe-it/commits?author=burlito "Documentation") |
+| [<img src="https://avatars0.githubusercontent.com/u/8341172?v=3" width="110px;"/><br /><sub>Jay Richards</sub>](http://www.cordeos.com)<br />[💻](https://github.com/snipe/snipe-it/commits?author=technogenus "Code") | [<img src="https://avatars2.githubusercontent.com/u/7295127?v=3" width="110px;"/><br /><sub>Alexander Innes</sub>](https://necurity.co.uk)<br />[💻](https://github.com/snipe/snipe-it/commits?author=leostat "Code") | [<img src="https://avatars2.githubusercontent.com/u/334485?v=3" width="110px;"/><br /><sub>Danny Garcia</sub>](https://buzzedword.codes)<br />[💻](https://github.com/snipe/snipe-it/commits?author=buzzedword "Code") | [<img src="https://avatars2.githubusercontent.com/u/366855?v=3" width="110px;"/><br /><sub>archpoint</sub>](https://github.com/archpoint)<br />[💻](https://github.com/snipe/snipe-it/commits?author=archpoint "Code") | [<img src="https://avatars1.githubusercontent.com/u/67991?v=3" width="110px;"/><br /><sub>Jake McGraw</sub>](http://www.jakemcgraw.com)<br />[💻](https://github.com/snipe/snipe-it/commits?author=jakemcgraw "Code") | [<img src="https://avatars1.githubusercontent.com/u/1714374?v=3" width="110px;"/><br /><sub>FleischKarussel</sub>](https://github.com/FleischKarussel)<br />[📖](https://github.com/snipe/snipe-it/commits?author=FleischKarussel "Documentation") | [<img src="https://avatars3.githubusercontent.com/u/319644?v=3" width="110px;"/><br /><sub>Dylan Yi</sub>](https://github.com/feeva)<br />[💻](https://github.com/snipe/snipe-it/commits?author=feeva "Code") |
+| [<img src="https://avatars2.githubusercontent.com/u/857740?v=3" width="110px;"/><br /><sub>Gil Rutkowski</sub>](http://FlashingCursor.com)<br />[💻](https://github.com/snipe/snipe-it/commits?author=flashingcursor "Code") | [<img src="https://avatars3.githubusercontent.com/u/129360?v=3" width="110px;"/><br /><sub>Desmond Morris</sub>](http://www.desmondmorris.com)<br />[💻](https://github.com/snipe/snipe-it/commits?author=desmondmorris "Code") | [<img src="https://avatars2.githubusercontent.com/u/52936?v=3" width="110px;"/><br /><sub>Nick Peelman</sub>](http://peelman.us)<br />[💻](https://github.com/snipe/snipe-it/commits?author=peelman "Code") | [<img src="https://avatars0.githubusercontent.com/u/53161?v=3" width="110px;"/><br /><sub>Abraham Vegh</sub>](https://abrahamvegh.com)<br />[💻](https://github.com/snipe/snipe-it/commits?author=abrahamvegh "Code") | [<img src="https://avatars0.githubusercontent.com/u/2818680?v=3" width="110px;"/><br /><sub>Mohamed Rashid</sub>](https://github.com/rashivkp)<br />[📖](https://github.com/snipe/snipe-it/commits?author=rashivkp "Documentation") | [<img src="https://avatars3.githubusercontent.com/u/1509456?v=3" width="110px;"/><br /><sub>Kasey</sub>](http://hinchk.github.io)<br />[💻](https://github.com/snipe/snipe-it/commits?author=HinchK "Code") | [<img src="https://avatars2.githubusercontent.com/u/10522541?v=3" width="110px;"/><br /><sub>Brett</sub>](https://github.com/BrettFagerlund)<br />[⚠️](https://github.com/snipe/snipe-it/commits?author=BrettFagerlund "Tests") |
+| [<img src="https://avatars2.githubusercontent.com/u/16108587?v=3" width="110px;"/><br /><sub>Jason Spriggs</sub>](http://jasonspriggs.com)<br />[💻](https://github.com/snipe/snipe-it/commits?author=jasonspriggs "Code") | [<img src="https://avatars2.githubusercontent.com/u/1134568?v=3" width="110px;"/><br /><sub>Nate Felton</sub>](http://n8felton.wordpress.com)<br />[💻](https://github.com/snipe/snipe-it/commits?author=n8felton "Code") | [<img src="https://avatars2.githubusercontent.com/u/14036694?v=3" width="110px;"/><br /><sub>Manasses Ferreira</sub>](http://homepages.dcc.ufmg.br/~manassesferreira)<br />[💻](https://github.com/snipe/snipe-it/commits?author=manassesferreira "Code") | [<img src="https://avatars0.githubusercontent.com/u/15913949?v=3" width="110px;"/><br /><sub>Steve</sub>](https://github.com/steveelwood)<br />[⚠️](https://github.com/snipe/snipe-it/commits?author=steveelwood "Tests") | [<img src="https://avatars1.githubusercontent.com/u/3361683?v=3" width="110px;"/><br /><sub>matc</sub>](http://twitter.com/matc)<br />[⚠️](https://github.com/snipe/snipe-it/commits?author=matc "Tests") | [<img src="https://avatars3.githubusercontent.com/u/7405702?v=3" width="110px;"/><br /><sub>Cole R. Davis</sub>](http://www.davisracingteam.com)<br />[⚠️](https://github.com/snipe/snipe-it/commits?author=VanillaNinjaD "Tests") | [<img src="https://avatars2.githubusercontent.com/u/10167681?v=3" width="110px;"/><br /><sub>gibsonjoshua55</sub>](https://github.com/gibsonjoshua55)<br />[💻](https://github.com/snipe/snipe-it/commits?author=gibsonjoshua55 "Code") |
+| [<img src="https://avatars2.githubusercontent.com/u/2809241?v=4" width="110px;"/><br /><sub>Robin Temme</sub>](https://github.com/zwerch)<br />[💻](https://github.com/snipe/snipe-it/commits?author=zwerch "Code") | [<img src="https://avatars0.githubusercontent.com/u/6961695?v=4" width="110px;"/><br /><sub>Iman</sub>](https://github.com/imanghafoori1)<br />[💻](https://github.com/snipe/snipe-it/commits?author=imanghafoori1 "Code") | [<img src="https://avatars1.githubusercontent.com/u/6551003?v=4" width="110px;"/><br /><sub>Richard Hofman</sub>](https://github.com/richardhofman6)<br />[💻](https://github.com/snipe/snipe-it/commits?author=richardhofman6 "Code") | [<img src="https://avatars0.githubusercontent.com/u/3697569?v=4" width="110px;"/><br /><sub>gizzmojr</sub>](https://github.com/gizzmojr)<br />[💻](https://github.com/snipe/snipe-it/commits?author=gizzmojr "Code") | [<img src="https://avatars3.githubusercontent.com/u/404729?v=4" width="110px;"/><br /><sub>Jenny Li</sub>](https://github.com/imjennyli)<br />[📖](https://github.com/snipe/snipe-it/commits?author=imjennyli "Documentation") | [<img src="https://avatars0.githubusercontent.com/u/869227?v=4" width="110px;"/><br /><sub>Geoff Young</sub>](https://github.com/GeoffYoung)<br />[💻](https://github.com/snipe/snipe-it/commits?author=GeoffYoung "Code") | [<img src="https://avatars3.githubusercontent.com/u/1068477?v=4" width="110px;"/><br /><sub>Elliot Blackburn</sub>](http://www.elliotblackburn.com)<br />[📖](https://github.com/snipe/snipe-it/commits?author=BlueHatbRit "Documentation") |
+| [<img src="https://avatars1.githubusercontent.com/u/6357451?v=4" width="110px;"/><br /><sub>Tõnis Ormisson</sub>](http://andmemasin.eu)<br />[💻](https://github.com/snipe/snipe-it/commits?author=TonisOrmisson "Code") | [<img src="https://avatars0.githubusercontent.com/u/449411?v=4" width="110px;"/><br /><sub>Nicolai Essig</sub>](http://www.nicolai-essig.de)<br />[💻](https://github.com/snipe/snipe-it/commits?author=thakilla "Code") | [<img src="https://avatars1.githubusercontent.com/u/14809698?v=4" width="110px;"/><br /><sub>Danielle</sub>](https://github.com/techincolor)<br />[📖](https://github.com/snipe/snipe-it/commits?author=techincolor "Documentation") | [<img src="https://avatars1.githubusercontent.com/u/18545156?v=4" width="110px;"/><br /><sub>Lawrence</sub>](https://github.com/TheVakman)<br />[⚠️](https://github.com/snipe/snipe-it/commits?author=TheVakman "Tests") [🐛](https://github.com/snipe/snipe-it/issues?q=author%3ATheVakman "Bug reports") | [<img src="https://avatars1.githubusercontent.com/u/22473767?v=4" width="110px;"/><br /><sub>uknzaeinozpas</sub>](https://github.com/uknzaeinozpas)<br />[⚠️](https://github.com/snipe/snipe-it/commits?author=uknzaeinozpas "Tests") [💻](https://github.com/snipe/snipe-it/commits?author=uknzaeinozpas "Code") | [<img src="https://avatars3.githubusercontent.com/u/422752?v=4" width="110px;"/><br /><sub>Ryan</sub>](https://github.com/Gelob)<br />[📖](https://github.com/snipe/snipe-it/commits?author=Gelob "Documentation") | [<img src="https://avatars1.githubusercontent.com/u/10672546?v=4" width="110px;"/><br /><sub>vcordes79</sub>](https://github.com/vcordes79)<br />[💻](https://github.com/snipe/snipe-it/commits?author=vcordes79 "Code") |
+| [<img src="https://avatars3.githubusercontent.com/u/27958330?v=4" width="110px;"/><br /><sub>fordster78</sub>](https://github.com/fordster78)<br />[💻](https://github.com/snipe/snipe-it/commits?author=fordster78 "Code") | [<img src="https://avatars0.githubusercontent.com/u/34064225?v=4" width="110px;"/><br /><sub>CronKz</sub>](https://github.com/CronKz)<br />[💻](https://github.com/snipe/snipe-it/commits?author=CronKz "Code") [🌍](#translation-CronKz "Translation") | [<img src="https://avatars1.githubusercontent.com/u/585486?v=4" width="110px;"/><br /><sub>Tim Bishop</sub>](https://github.com/tdb)<br />[💻](https://github.com/snipe/snipe-it/commits?author=tdb "Code") | [<img src="https://avatars2.githubusercontent.com/u/5384694?v=4" width="110px;"/><br /><sub>Sean McIlvenna</sub>](https://www.seanmcilvenna.com)<br />[💻](https://github.com/snipe/snipe-it/commits?author=seanmcilvenna "Code") | [<img src="https://avatars3.githubusercontent.com/u/36515590?v=4" width="110px;"/><br /><sub>cepacs</sub>](https://github.com/cepacs)<br />[🐛](https://github.com/snipe/snipe-it/issues?q=author%3Acepacs "Bug reports") [📖](https://github.com/snipe/snipe-it/commits?author=cepacs "Documentation") | [<img src="https://avatars2.githubusercontent.com/u/37537300?v=4" width="110px;"/><br /><sub>lea-mink</sub>](https://github.com/lea-mink)<br />[💻](https://github.com/snipe/snipe-it/commits?author=lea-mink "Code") | [<img src="https://avatars0.githubusercontent.com/u/7140719?v=4" width="110px;"/><br /><sub>Hannah Tinkler</sub>](https://github.com/hannahtinkler)<br />[💻](https://github.com/snipe/snipe-it/commits?author=hannahtinkler "Code") |
+| [<img src="https://avatars1.githubusercontent.com/u/1086388?v=4" width="110px;"/><br /><sub>Doeke Zanstra</sub>](https://github.com/doekman)<br />[💻](https://github.com/snipe/snipe-it/commits?author=doekman "Code") | [<img src="https://avatars1.githubusercontent.com/u/4325936?v=4" width="110px;"/><br /><sub>Djamon Staal</sub>](https://www.sdhd.nl/)<br />[💻](https://github.com/snipe/snipe-it/commits?author=SjamonDaal "Code") | [<img src="https://avatars3.githubusercontent.com/u/12306859?v=4" width="110px;"/><br /><sub>Earl Ramirez</sub>](https://github.com/EarlRamirez)<br />[💻](https://github.com/snipe/snipe-it/commits?author=EarlRamirez "Code") | [<img src="https://avatars2.githubusercontent.com/u/8671456?v=4" width="110px;"/><br /><sub>Richard Ray Thomas</sub>](https://github.com/RichardRay)<br />[💻](https://github.com/snipe/snipe-it/commits?author=RichardRay "Code") | [<img src="https://avatars3.githubusercontent.com/u/1852688?v=4" width="110px;"/><br /><sub>Ryan Kuba</sub>](https://www.taisun.io/)<br />[💻](https://github.com/snipe/snipe-it/commits?author=thelamer "Code") | [<img src="https://avatars1.githubusercontent.com/u/6751928?v=4" width="110px;"/><br /><sub>Brian Monroe</sub>](https://github.com/ParadoxGuitarist)<br />[💻](https://github.com/snipe/snipe-it/commits?author=ParadoxGuitarist "Code") | [<img src="https://avatars1.githubusercontent.com/u/605167?v=4" width="110px;"/><br /><sub>plexorama</sub>](https://github.com/plexorama)<br />[💻](https://github.com/snipe/snipe-it/commits?author=plexorama "Code") |
+| [<img src="https://avatars2.githubusercontent.com/u/1795149?v=4" width="110px;"/><br /><sub>Till Deeke</sub>](https://tilldeeke.de)<br />[💻](https://github.com/snipe/snipe-it/commits?author=tilldeeke "Code") | [<img src="https://avatars0.githubusercontent.com/u/12634129?v=4" width="110px;"/><br /><sub>5quirrel</sub>](https://github.com/5quirrel)<br />[💻](https://github.com/snipe/snipe-it/commits?author=5quirrel "Code") | [<img src="https://avatars1.githubusercontent.com/u/13071957?v=4" width="110px;"/><br /><sub>Jason</sub>](https://github.com/jasonlshelton)<br />[💻](https://github.com/snipe/snipe-it/commits?author=jasonlshelton "Code") | [<img src="https://avatars3.githubusercontent.com/u/7128321?v=4" width="110px;"/><br /><sub>Antti</sub>](https://github.com/chemfy)<br />[💻](https://github.com/snipe/snipe-it/commits?author=chemfy "Code") | [<img src="https://avatars3.githubusercontent.com/u/10080364?v=4" width="110px;"/><br /><sub>DeusMaximus</sub>](https://github.com/DeusMaximus)<br />[💻](https://github.com/snipe/snipe-it/commits?author=DeusMaximus "Code") | [<img src="https://avatars2.githubusercontent.com/u/16384611?v=4" width="110px;"/><br /><sub>a-royal</sub>](https://github.com/A-ROYAL)<br />[🌍](#translation-A-ROYAL "Translation") | [<img src="https://avatars0.githubusercontent.com/u/5358208?v=4" width="110px;"/><br /><sub>Alberto Aldrigo</sub>](https://github.com/albertoaldrigo)<br />[🌍](#translation-albertoaldrigo "Translation") |
+| [<img src="https://avatars0.githubusercontent.com/u/1412342?v=4" width="110px;"/><br /><sub>Alex Stanev</sub>](http://alex.stanev.org/blog)<br />[🌍](#translation-RealEnder "Translation") | [<img src="https://avatars0.githubusercontent.com/u/177295?v=4" width="110px;"/><br /><sub>Andreas Rehm</sub>](http://devel.itsolution2.de)<br />[🌍](#translation-sirrus "Translation") | [<img src="https://avatars0.githubusercontent.com/u/5080535?v=4" width="110px;"/><br /><sub>Andreas Erhard</sub>](https://github.com/xelan)<br />[🌍](#translation-xelan "Translation") | [<img src="https://avatars2.githubusercontent.com/u/142350?v=4" width="110px;"/><br /><sub>Andrés Vanegas Jiménez</sub>](https://github.com/angeldeejay)<br />[🌍](#translation-angeldeejay "Translation") | [<img src="https://avatars0.githubusercontent.com/u/3910403?v=4" width="110px;"/><br /><sub>Antonio Schiavon</sub>](https://github.com/aschiavon91)<br />[🌍](#translation-aschiavon91 "Translation") | [<img src="https://avatars0.githubusercontent.com/u/10464547?v=4" width="110px;"/><br /><sub>benunter</sub>](https://github.com/benunter)<br />[🌍](#translation-benunter "Translation") | [<img src="https://avatars1.githubusercontent.com/u/5038647?v=4" width="110px;"/><br /><sub>Borys Żmuda</sub>](http://catweb24.pl)<br />[🌍](#translation-rudashi "Translation") |
+| [<img src="https://avatars0.githubusercontent.com/u/5539359?v=4" width="110px;"/><br /><sub>chibacityblues</sub>](https://github.com/chibacityblues)<br />[🌍](#translation-chibacityblues "Translation") | [<img src="https://avatars1.githubusercontent.com/u/1954830?v=4" width="110px;"/><br /><sub>Chien Wei Lin</sub>](https://github.com/cwlin0416)<br />[🌍](#translation-cwlin0416 "Translation") | [<img src="https://avatars3.githubusercontent.com/u/11700533?v=4" width="110px;"/><br /><sub>Christian Schuster</sub>](https://github.com/Againstreality)<br />[🌍](#translation-Againstreality "Translation") | [<img src="https://avatars1.githubusercontent.com/u/4308704?v=4" width="110px;"/><br /><sub>Christian Stefanus</sub>](http://chriss.webhostid.com)<br />[🌍](#translation-kopi-item "Translation") | [<img src="https://avatars3.githubusercontent.com/u/3009327?v=4" width="110px;"/><br /><sub>wxcafé</sub>](http://wxcafe.net)<br />[🌍](#translation-wxcafe "Translation") | [<img src="https://avatars3.githubusercontent.com/u/35761525?v=4" width="110px;"/><br /><sub>dpyroc</sub>](https://github.com/dpyroc)<br />[🌍](#translation-dpyroc "Translation") | [<img src="https://avatars1.githubusercontent.com/u/2153639?v=4" width="110px;"/><br /><sub>Daniel Friedlmaier</sub>](http://www.friedlmaier.net)<br />[🌍](#translation-da-friedl "Translation") |
+| [<img src="https://avatars1.githubusercontent.com/u/2947640?v=4" width="110px;"/><br /><sub>Daniel Heene</sub>](https://github.com/danielheene)<br />[🌍](#translation-danielheene "Translation") | [<img src="https://avatars3.githubusercontent.com/u/319022?v=4" width="110px;"/><br /><sub>danielcb</sub>](https://github.com/danielcb)<br />[🌍](#translation-danielcb "Translation") | [<img src="https://avatars3.githubusercontent.com/u/15846537?v=4" width="110px;"/><br /><sub>Dominik Senti</sub>](https://github.com/dominiksenti)<br />[🌍](#translation-dominiksenti "Translation") | [<img src="https://avatars0.githubusercontent.com/u/25570954?v=4" width="110px;"/><br /><sub>Eric Gautheron</sub>](http://www.konectik.com)<br />[🌍](#translation-EpixFr "Translation") | [<img src="https://avatars1.githubusercontent.com/u/5732623?v=4" width="110px;"/><br /><sub>Erlend Pilø</sub>](https://erlpil.com)<br />[🌍](#translation-Erlpil "Translation") | [<img src="https://avatars0.githubusercontent.com/u/541832?v=4" width="110px;"/><br /><sub>Fabio Rapposelli</sub>](http://fabio.technology)<br />[🌍](#translation-frapposelli "Translation") | [<img src="https://avatars2.githubusercontent.com/u/3605240?v=4" width="110px;"/><br /><sub>Felipe Barros</sub>](https://github.com/fgbs)<br />[🌍](#translation-fgbs "Translation") |
+| [<img src="https://avatars0.githubusercontent.com/u/257745?v=4" width="110px;"/><br /><sub>Fernando Possebon</sub>](https://github.com/possebon)<br />[🌍](#translation-possebon "Translation") | [<img src="https://avatars3.githubusercontent.com/u/2540832?v=4" width="110px;"/><br /><sub>gdraque</sub>](https://github.com/gdraque)<br />[🌍](#translation-gdraque "Translation") | [<img src="https://avatars0.githubusercontent.com/u/23440381?v=4" width="110px;"/><br /><sub>Georg Wallisch</sub>](https://github.com/georgwallisch)<br />[🌍](#translation-georgwallisch "Translation") | [<img src="https://avatars1.githubusercontent.com/u/9852832?v=4" width="110px;"/><br /><sub>Gerardo Robles</sub>](https://github.com/jgroblesr85)<br />[🌍](#translation-jgroblesr85 "Translation") | [<img src="https://avatars2.githubusercontent.com/u/11082640?v=4" width="110px;"/><br /><sub>Gluek</sub>](https://t.me/Gluek)<br />[🌍](#translation-mrgluek "Translation") | [<img src="https://avatars0.githubusercontent.com/u/6847946?v=4" width="110px;"/><br /><sub>AdnanAbuShahad</sub>](https://github.com/AdnanAbuShahad)<br />[🌍](#translation-AdnanAbuShahad "Translation") | [<img src="https://avatars1.githubusercontent.com/u/3580608?v=4" width="110px;"/><br /><sub>Hafidzi My</sub>](https://hafidzi.my)<br />[🌍](#translation-hafidzi "Translation") |
+| [<img src="https://avatars2.githubusercontent.com/u/205521?v=4" width="110px;"/><br /><sub>Harim Park</sub>](https://github.com/fofwisdom)<br />[🌍](#translation-fofwisdom "Translation") | [<img src="https://avatars2.githubusercontent.com/u/3333841?v=4" width="110px;"/><br /><sub>Henrik Kentsson</sub>](http://www.kentsson.se)<br />[🌍](#translation-Kentsson "Translation") | [<img src="https://avatars0.githubusercontent.com/u/36551034?v=4" width="110px;"/><br /><sub>Husnul Yaqien</sub>](https://github.com/husnulyaqien)<br />[🌍](#translation-husnulyaqien "Translation") | [<img src="https://avatars1.githubusercontent.com/u/2372747?v=4" width="110px;"/><br /><sub>Ibrahim</sub>](http://abaalkhail.org)<br />[🌍](#translation-abaalkh "Translation") | [<img src="https://avatars0.githubusercontent.com/u/1389334?v=4" width="110px;"/><br /><sub>igolman</sub>](https://github.com/igolman)<br />[🌍](#translation-igolman "Translation") | [<img src="https://avatars1.githubusercontent.com/u/3257070?v=4" width="110px;"/><br /><sub>itangiang</sub>](https://github.com/itangiang)<br />[🌍](#translation-itangiang "Translation") | [<img src="https://avatars2.githubusercontent.com/u/14814254?v=4" width="110px;"/><br /><sub>jarby1211</sub>](https://github.com/jarby1211)<br />[🌍](#translation-jarby1211 "Translation") |
+| [<img src="https://avatars3.githubusercontent.com/u/6719357?v=4" width="110px;"/><br /><sub>Jhonn Willker</sub>](http://jwillker.com)<br />[🌍](#translation-JohnWillker "Translation") | [<img src="https://avatars2.githubusercontent.com/u/10983635?v=4" width="110px;"/><br /><sub>Jose</sub>](https://github.com/joxelito94)<br />[🌍](#translation-joxelito94 "Translation") | [<img src="https://avatars0.githubusercontent.com/u/5206122?v=4" width="110px;"/><br /><sub>laopangzi</sub>](https://github.com/laopangzi)<br />[🌍](#translation-laopangzi "Translation") | [<img src="https://avatars2.githubusercontent.com/u/79707?v=4" width="110px;"/><br /><sub>Lars Strojny</sub>](http://usrportage.de)<br />[🌍](#translation-lstrojny "Translation") | [<img src="https://avatars0.githubusercontent.com/u/389801?v=4" width="110px;"/><br /><sub>MarcosBL</sub>](http://twitter.com/marcosbl)<br />[🌍](#translation-MarcosBL "Translation") | [<img src="https://avatars3.githubusercontent.com/u/35664606?v=4" width="110px;"/><br /><sub>marie joy cajes</sub>](https://github.com/mariejoyacajes)<br />[🌍](#translation-mariejoyacajes "Translation") | [<img src="https://avatars2.githubusercontent.com/u/3052816?v=4" width="110px;"/><br /><sub>Mark S. Johansen</sub>](http://www.markjohansen.dk)<br />[🌍](#translation-msjohansen "Translation") |
+| [<img src="https://avatars2.githubusercontent.com/u/982885?v=4" width="110px;"/><br /><sub>Martin Stub</sub>](http://martinstub.dk)<br />[🌍](#translation-stubben "Translation") | [<img src="https://avatars2.githubusercontent.com/u/28959963?v=4" width="110px;"/><br /><sub>Meyer Flavio</sub>](https://github.com/meyerf99)<br />[🌍](#translation-meyerf99 "Translation") | [<img src="https://avatars3.githubusercontent.com/u/796443?v=4" width="110px;"/><br /><sub>Micael Rodrigues</sub>](https://github.com/MicaelRodrigues)<br />[🌍](#translation-MicaelRodrigues "Translation") | [<img src="https://avatars0.githubusercontent.com/u/10481331?v=4" width="110px;"/><br /><sub>Mikael Rasmussen</sub>](http://rubixy.com/)<br />[🌍](#translation-mikaelssen "Translation") | [<img src="https://avatars1.githubusercontent.com/u/1544552?v=4" width="110px;"/><br /><sub>IxFail</sub>](https://github.com/IxFail)<br />[🌍](#translation-IxFail "Translation") | [<img src="https://avatars3.githubusercontent.com/u/18483118?v=4" width="110px;"/><br /><sub>Mohammed Fota</sub>](http://www.mohammedfota.com)<br />[🌍](#translation-MohammedFota "Translation") | [<img src="https://avatars0.githubusercontent.com/u/227080?v=4" width="110px;"/><br /><sub>Moayad Alserihi</sub>](https://github.com/omego)<br />[🌍](#translation-omego "Translation") |
+| [<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/4930051?v=4" width="110px;"/><br /><sub>Wes Hulette</sub>](http://macfoo.wordpress.com/)<br />[💻](https://github.com/snipe/snipe-it/commits?author=jwhulette "Code") | [<img src="https://avatars0.githubusercontent.com/u/8134591?v=4" width="110px;"/><br /><sub>patrict</sub>](https://github.com/patrict)<br />[💻](https://github.com/snipe/snipe-it/commits?author=patrict "Code") |
+| [<img src="https://avatars3.githubusercontent.com/u/2611616?v=4" width="110px;"/><br /><sub>Dmitriy Minaev</sub>](https://github.com/VELIKII-DIVAN)<br />[💻](https://github.com/snipe/snipe-it/commits?author=VELIKII-DIVAN "Code") | [<img src="https://avatars0.githubusercontent.com/u/5132245?v=4" width="110px;"/><br /><sub>liquidhorse</sub>](https://github.com/liquidhorse)<br />[💻](https://github.com/snipe/snipe-it/commits?author=liquidhorse "Code") | [<img src="https://avatars1.githubusercontent.com/u/183678?v=4" width="110px;"/><br /><sub>Jordi Boggiano</sub>](https://seld.be/)<br />[💻](https://github.com/snipe/snipe-it/commits?author=Seldaek "Code") | [<img src="https://avatars0.githubusercontent.com/u/653557?v=4" width="110px;"/><br /><sub>Ivan Nieto</sub>](https://github.com/inietov)<br />[💻](https://github.com/snipe/snipe-it/commits?author=inietov "Code") | [<img src="https://avatars2.githubusercontent.com/u/6764151?v=4" width="110px;"/><br /><sub>Ben RUBSON</sub>](https://github.com/benrubson)<br />[💻](https://github.com/snipe/snipe-it/commits?author=benrubson "Code") | [<img src="https://avatars2.githubusercontent.com/u/8554558?v=4" width="110px;"/><br /><sub>NMathar</sub>](https://github.com/NMathar)<br />[💻](https://github.com/snipe/snipe-it/commits?author=NMathar "Code") | [<img src="https://avatars1.githubusercontent.com/u/139566?v=4" width="110px;"/><br /><sub>Steffen</sub>](https://github.com/smb)<br />[💻](https://github.com/snipe/snipe-it/commits?author=smb "Code") |
+| [<img src="https://avatars0.githubusercontent.com/u/6609453?v=4" width="110px;"/><br /><sub>Sxderp</sub>](https://github.com/Sxderp)<br />[💻](https://github.com/snipe/snipe-it/commits?author=Sxderp "Code") | [<img src="https://avatars1.githubusercontent.com/u/4807843?v=4" width="110px;"/><br /><sub>fanta8897</sub>](https://github.com/fanta8897)<br />[💻](https://github.com/snipe/snipe-it/commits?author=fanta8897 "Code") | [<img src="https://avatars2.githubusercontent.com/u/2576509?v=4" width="110px;"/><br /><sub>Andrey Bolonin</sub>](https://andreybolonin.com/phpconsulting/)<br />[💻](https://github.com/snipe/snipe-it/commits?author=andreybolonin "Code") | [<img src="https://avatars3.githubusercontent.com/u/2173307?v=4" width="110px;"/><br /><sub>shinayoshi</sub>](http://www.shinayoshi.net/)<br />[💻](https://github.com/snipe/snipe-it/commits?author=shinayoshi "Code") | [<img src="https://avatars3.githubusercontent.com/u/2130159?v=4" width="110px;"/><br /><sub>Hubert</sub>](https://github.com/reuser)<br />[💻](https://github.com/snipe/snipe-it/commits?author=reuser "Code") | [<img src="https://avatars0.githubusercontent.com/u/6865789?v=4" width="110px;"/><br /><sub>KeenRivals</sub>](https://brashear.me)<br />[💻](https://github.com/snipe/snipe-it/commits?author=KeenRivals "Code") | [<img src="https://avatars3.githubusercontent.com/u/2902513?v=4" width="110px;"/><br /><sub>omyno</sub>](https://github.com/omyno)<br />[💻](https://github.com/snipe/snipe-it/commits?author=omyno "Code") |
+| [<img src="https://avatars1.githubusercontent.com/u/6271335?v=4" width="110px;"/><br /><sub>Evgeny</sub>](https://github.com/jackka)<br />[💻](https://github.com/snipe/snipe-it/commits?author=jackka "Code") | [<img src="https://avatars2.githubusercontent.com/u/1169963?v=4" width="110px;"/><br /><sub>Colin Campbell</sub>](https://digitalist.se)<br />[💻](https://github.com/snipe/snipe-it/commits?author=colin-campbell "Code") | [<img src="https://avatars3.githubusercontent.com/u/2872098?v=4" width="110px;"/><br /><sub>Ľubomír Kučera</sub>](https://github.com/lubo)<br />[💻](https://github.com/snipe/snipe-it/commits?author=lubo "Code") | [<img src="https://avatars3.githubusercontent.com/u/570639?v=4" width="110px;"/><br /><sub>Martin Meredith</sub>](https://www.sourceguru.net)<br />[💻](https://github.com/snipe/snipe-it/commits?author=Mezzle "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") | [<img src="https://avatars0.githubusercontent.com/u/421625?v=4" width="110px;"/><br /><sub>JoKneeMo</sub>](https://github.com/JoKneeMo)<br />[💻](https://github.com/snipe/snipe-it/commits?author=JoKneeMo "Code") | [<img src="https://avatars0.githubusercontent.com/u/54849013?v=4" width="110px;"/><br /><sub>Joshi</sub>](http://www.redbridge.se)<br />[💻](https://github.com/snipe/snipe-it/commits?author=joshi-redbridge "Code") | [<img src="https://avatars2.githubusercontent.com/u/15731458?v=4" width="110px;"/><br /><sub>Anthony Burns</sub>](https://github.com/anthonypburns)<br />[💻](https://github.com/snipe/snipe-it/commits?author=anthonypburns "Code") | [<img src="https://avatars1.githubusercontent.com/u/63399474?v=4" width="110px;"/><br /><sub>johnson-yi</sub>](https://github.com/johnson-yi)<br />[💻](https://github.com/snipe/snipe-it/commits?author=johnson-yi "Code") | [<img src="https://avatars1.githubusercontent.com/u/1862720?v=4" width="110px;"/><br /><sub>Sanjay Govind</sub>](https://tangentmc.net)<br />[💻](https://github.com/snipe/snipe-it/commits?author=sanjay900 "Code") |
+| [<img src="https://avatars0.githubusercontent.com/u/1255375?v=4" width="110px;"/><br /><sub>Peter Upfold</sub>](https://peter.upfold.org.uk/)<br />[💻](https://github.com/snipe/snipe-it/commits?author=PeterUpfold "Code") | [<img src="https://avatars2.githubusercontent.com/u/961717?v=4" width="110px;"/><br /><sub>Jared Biel</sub>](https://github.com/jbiel)<br />[💻](https://github.com/snipe/snipe-it/commits?author=jbiel "Code") | [<img src="https://avatars1.githubusercontent.com/u/1733625?v=4" width="110px;"/><br /><sub>Dampfklon</sub>](https://github.com/dampfklon)<br />[💻](https://github.com/snipe/snipe-it/commits?author=dampfklon "Code") | [<img src="https://avatars2.githubusercontent.com/u/52973156?v=4" width="110px;"/><br /><sub>Charles Hamilton</sub>](https://communityclosing.com)<br />[💻](https://github.com/snipe/snipe-it/commits?author=chamilton-ccn "Code") | [<img src="https://avatars.githubusercontent.com/u/551789?v=4" width="110px;"/><br /><sub>Giuseppe Iannello</sub>](https://github.com/giannello)<br />[💻](https://github.com/snipe/snipe-it/commits?author=giannello "Code") | [<img src="https://avatars.githubusercontent.com/u/3691490?v=4" width="110px;"/><br /><sub>Peter Dave Hello</sub>](https://www.peterdavehello.org/)<br />[💻](https://github.com/snipe/snipe-it/commits?author=PeterDaveHello "Code") | [<img src="https://avatars.githubusercontent.com/u/6106332?v=4" width="110px;"/><br /><sub>sigmoidal</sub>](https://github.com/sigmoidal)<br />[💻](https://github.com/snipe/snipe-it/commits?author=sigmoidal "Code") |
+| [<img src="https://avatars.githubusercontent.com/u/2082554?v=4" width="110px;"/><br /><sub>Vincent Lainé</sub>](https://github.com/phenixdotnet)<br />[💻](https://github.com/snipe/snipe-it/commits?author=phenixdotnet "Code") | [<img src="https://avatars.githubusercontent.com/u/1943040?v=4" width="110px;"/><br /><sub>Lucas Pleß</sub>](http://www.lucas-pless.com)<br />[💻](https://github.com/snipe/snipe-it/commits?author=derlucas "Code") | [<img src="https://avatars.githubusercontent.com/u/472804?v=4" width="110px;"/><br /><sub>Ian Littman</sub>](http://twitter.com/iansltx)<br />[💻](https://github.com/snipe/snipe-it/commits?author=iansltx "Code") | [<img src="https://avatars.githubusercontent.com/u/3519029?v=4" width="110px;"/><br /><sub>João Paulo</sub>](https://github.com/PauloLuna)<br />[💻](https://github.com/snipe/snipe-it/commits?author=PauloLuna "Code") | [<img src="https://avatars.githubusercontent.com/u/70443365?v=4" width="110px;"/><br /><sub>ThoBur</sub>](https://github.com/ThoBur)<br />[💻](https://github.com/snipe/snipe-it/commits?author=ThoBur "Code") | [<img src="https://avatars.githubusercontent.com/u/1972329?v=4" width="110px;"/><br /><sub>Alexander Chibrikin</sub>](http://phpprofi.ru/)<br />[💻](https://github.com/snipe/snipe-it/commits?author=alek13 "Code") | [<img src="https://avatars.githubusercontent.com/u/438332?v=4" width="110px;"/><br /><sub>Anthony Winstanley</sub>](https://github.com/winstan)<br />[💻](https://github.com/snipe/snipe-it/commits?author=winstan "Code") |
+| [<img src="https://avatars.githubusercontent.com/u/3075214?v=4" width="110px;"/><br /><sub>Folke</sub>](https://github.com/fashberg)<br />[💻](https://github.com/snipe/snipe-it/commits?author=fashberg "Code") | [<img src="https://avatars.githubusercontent.com/u/1351571?v=4" width="110px;"/><br /><sub>Bennett Blodinger</sub>](https://github.com/benwa)<br />[💻](https://github.com/snipe/snipe-it/commits?author=benwa "Code") | [<img src="https://avatars.githubusercontent.com/u/2974631?v=4" width="110px;"/><br /><sub>NMC</sub>](https://nmc.dev)<br />[💻](https://github.com/snipe/snipe-it/commits?author=ncareau "Code") | [<img src="https://avatars.githubusercontent.com/u/52182449?v=4" width="110px;"/><br /><sub>andres-baller</sub>](https://github.com/andres-baller)<br />[💻](https://github.com/snipe/snipe-it/commits?author=andres-baller "Code") | [<img src="https://avatars.githubusercontent.com/u/67109348?v=4" width="110px;"/><br /><sub>sean-borg</sub>](https://github.com/sean-borg)<br />[💻](https://github.com/snipe/snipe-it/commits?author=sean-borg "Code") | [<img src="https://avatars.githubusercontent.com/u/32170051?v=4" width="110px;"/><br /><sub>EDVLeer</sub>](https://github.com/EDVLeer)<br />[💻](https://github.com/snipe/snipe-it/commits?author=EDVLeer "Code") | [<img src="https://avatars.githubusercontent.com/u/23075196?v=4" width="110px;"/><br /><sub>Kurokat</sub>](https://github.com/Kurokat)<br />[💻](https://github.com/snipe/snipe-it/commits?author=Kurokat "Code") |
+| [<img src="https://avatars.githubusercontent.com/u/915514?v=4" width="110px;"/><br /><sub>Kevin Köllmann</sub>](https://www.kevinkoellmann.de)<br />[💻](https://github.com/snipe/snipe-it/commits?author=koelle25 "Code") | [<img src="https://avatars.githubusercontent.com/u/49025941?v=4" width="110px;"/><br /><sub>sw-mreyes</sub>](https://github.com/sw-mreyes)<br />[💻](https://github.com/snipe/snipe-it/commits?author=sw-mreyes "Code") | [<img src="https://avatars.githubusercontent.com/u/70129?v=4" width="110px;"/><br /><sub>Joel Pittet</sub>](https://pittet.ca)<br />[💻](https://github.com/snipe/snipe-it/commits?author=joelpittet "Code") | [<img src="https://avatars.githubusercontent.com/u/792695?v=4" width="110px;"/><br /><sub>Eli Young</sub>](https://elyscape.com)<br />[💻](https://github.com/snipe/snipe-it/commits?author=elyscape "Code") | [<img src="https://avatars.githubusercontent.com/u/317015?v=4" width="110px;"/><br /><sub>Raell Dottin</sub>](https://github.com/raelldottin)<br />[💻](https://github.com/snipe/snipe-it/commits?author=raelldottin "Code") | [<img src="https://avatars.githubusercontent.com/u/1446856?v=4" width="110px;"/><br /><sub>Tom Misilo</sub>](https://github.com/misilot)<br />[💻](https://github.com/snipe/snipe-it/commits?author=misilot "Code") | [<img src="https://avatars.githubusercontent.com/u/4496300?v=4" width="110px;"/><br /><sub>David Davenne</sub>](http://david.davenne.be)<br />[💻](https://github.com/snipe/snipe-it/commits?author=JuustoMestari "Code") |
+| [<img src="https://avatars.githubusercontent.com/u/9255772?v=4" width="110px;"/><br /><sub>Mark Stenglein</sub>](https://markstenglein.com)<br />[💻](https://github.com/snipe/snipe-it/commits?author=ocelotsloth "Code") | [<img src="https://avatars.githubusercontent.com/u/35658596?v=4" width="110px;"/><br /><sub>ajsy</sub>](https://github.com/ajsy)<br />[💻](https://github.com/snipe/snipe-it/commits?author=ajsy "Code") | [<img src="https://avatars.githubusercontent.com/u/3628035?v=4" width="110px;"/><br /><sub>Jan Kiesewetter</sub>](https://github.com/t3easy)<br />[💻](https://github.com/snipe/snipe-it/commits?author=t3easy "Code") | [<img src="https://avatars.githubusercontent.com/u/79449630?v=4" width="110px;"/><br /><sub>Tetrachloromethane250</sub>](https://github.com/Tetrachloromethane250)<br />[💻](https://github.com/snipe/snipe-it/commits?author=Tetrachloromethane250 "Code") | [<img src="https://avatars.githubusercontent.com/u/22004482?v=4" width="110px;"/><br /><sub>Lars Kajes</sub>](https://www.kajes.se/)<br />[💻](https://github.com/snipe/snipe-it/commits?author=kajes "Code") | [<img src="https://avatars.githubusercontent.com/u/13993216?v=4" width="110px;"/><br /><sub>Joly0</sub>](https://github.com/Joly0)<br />[💻](https://github.com/snipe/snipe-it/commits?author=Joly0 "Code") | [<img src="https://avatars.githubusercontent.com/u/1501022?v=4" width="110px;"/><br /><sub>theburger</sub>](https://github.com/limeless)<br />[💻](https://github.com/snipe/snipe-it/commits?author=limeless "Code") |
+| [<img src="https://avatars.githubusercontent.com/u/36065681?v=4" width="110px;"/><br /><sub>David Valin Alonso</sub>](https://github.com/deivishome)<br />[💻](https://github.com/snipe/snipe-it/commits?author=deivishome "Code") | [<img src="https://avatars.githubusercontent.com/u/8290389?v=4" width="110px;"/><br /><sub>andreaci</sub>](https://github.com/andreaci)<br />[💻](https://github.com/snipe/snipe-it/commits?author=andreaci "Code") | [<img src="https://avatars.githubusercontent.com/u/1828542?v=4" width="110px;"/><br /><sub>Jelle Sebreghts</sub>](http://www.jellesebreghts.be)<br />[💻](https://github.com/snipe/snipe-it/commits?author=Jelle-S "Code") | [<img src="https://avatars.githubusercontent.com/u/11180862?v=4" width="110px;"/><br /><sub>Michael Pietsch</sub>](https://github.com/Skywalker-11)<br /> | [<img src="https://avatars.githubusercontent.com/u/22068886?v=4" width="110px;"/><br /><sub>Masudul Haque Shihab</sub>](https://github.com/sh1hab)<br />[💻](https://github.com/snipe/snipe-it/commits?author=sh1hab "Code") | [<img src="https://avatars.githubusercontent.com/u/16099942?v=4" width="110px;"/><br /><sub>Supapong Areeprasertkul</sub>](http://www.freedomdive.com/)<br />[💻](https://github.com/snipe/snipe-it/commits?author=zybersup "Code") | [<img src="https://avatars.githubusercontent.com/u/207358?v=4" width="110px;"/><br /><sub>Peter Sarossy</sub>](https://github.com/psarossy)<br />[💻](https://github.com/snipe/snipe-it/commits?author=psarossy "Code") |
+| [<img src="https://avatars.githubusercontent.com/u/11823649?v=4" width="110px;"/><br /><sub>Renee Margaret McConahy</sub>](https://github.com/nepella)<br />[💻](https://github.com/snipe/snipe-it/commits?author=nepella "Code") | [<img src="https://avatars.githubusercontent.com/u/5553884?v=4" width="110px;"/><br /><sub>JohnnyPicnic</sub>](https://github.com/JohnnyPicnic)<br />[💻](https://github.com/snipe/snipe-it/commits?author=JohnnyPicnic "Code") | [<img src="https://avatars.githubusercontent.com/u/8799594?v=4" width="110px;"/><br /><sub>markbrule</sub>](https://github.com/markbrule)<br />[💻](https://github.com/snipe/snipe-it/commits?author=markbrule "Code") | [<img src="https://avatars.githubusercontent.com/u/1962801?v=4" width="110px;"/><br /><sub>Mike Campbell</sub>](https://github.com/mikecmpbll)<br />[💻](https://github.com/snipe/snipe-it/commits?author=mikecmpbll "Code") | [<img src="https://avatars.githubusercontent.com/u/11973217?v=4" width="110px;"/><br /><sub>tbrconnect</sub>](https://github.com/tbrconnect)<br />[💻](https://github.com/snipe/snipe-it/commits?author=tbrconnect "Code") | [<img src="https://avatars.githubusercontent.com/u/12447225?v=4" width="110px;"/><br /><sub>kcoyo</sub>](https://github.com/kcoyo)<br />[💻](https://github.com/snipe/snipe-it/commits?author=kcoyo "Code") | [<img src="https://avatars.githubusercontent.com/u/494017?v=4" width="110px;"/><br /><sub>Travis Miller</sub>](https://travismiller.com/)<br />[💻](https://github.com/snipe/snipe-it/commits?author=travismiller "Code") |
+| [<img src="https://avatars.githubusercontent.com/u/1975640?v=4" width="110px;"/><br /><sub>Evan Taylor</sub>](https://github.com/Delta5)<br />[💻](https://github.com/snipe/snipe-it/commits?author=Delta5 "Code") | [<img src="https://avatars.githubusercontent.com/u/8735148?v=4" width="110px;"/><br /><sub>Petri Asikainen</sub>](https://github.com/PetriAsi)<br />[💻](https://github.com/snipe/snipe-it/commits?author=PetriAsi "Code") | [<img src="https://avatars.githubusercontent.com/u/11424540?v=4" width="110px;"/><br /><sub>derdeagle</sub>](https://github.com/derdeagle)<br />[💻](https://github.com/snipe/snipe-it/commits?author=derdeagle "Code") | [<img src="https://avatars.githubusercontent.com/u/176950?v=4" width="110px;"/><br /><sub>Mike Frysinger</sub>](https://wh0rd.org/)<br />[💻](https://github.com/snipe/snipe-it/commits?author=vapier "Code") | [<img src="https://avatars.githubusercontent.com/u/22044358?v=4" width="110px;"/><br /><sub>ALPHA</sub>](https://github.com/AL4AL)<br />[💻](https://github.com/snipe/snipe-it/commits?author=AL4AL "Code") | [<img src="https://avatars.githubusercontent.com/u/1042587?v=4" width="110px;"/><br /><sub>FliegenKLATSCH</sub>](https://www.ifern.de)<br />[💻](https://github.com/snipe/snipe-it/commits?author=FliegenKLATSCH "Code") | [<img src="https://avatars.githubusercontent.com/u/442138?v=4" width="110px;"/><br /><sub>Jeremy Price</sub>](https://github.com/jerm)<br />[💻](https://github.com/snipe/snipe-it/commits?author=jerm "Code") |
+| [<img src="https://avatars.githubusercontent.com/u/84392209?v=4" width="110px;"/><br /><sub>Toreg87</sub>](https://github.com/Toreg87)<br />[💻](https://github.com/snipe/snipe-it/commits?author=Toreg87 "Code") | [<img src="https://avatars.githubusercontent.com/u/67638596?v=4" width="110px;"/><br /><sub>Matthew Nickson</sub>](https://github.com/Computroniks)<br />[💻](https://github.com/snipe/snipe-it/commits?author=Computroniks "Code") | [<img src="https://avatars.githubusercontent.com/u/1646397?v=4" width="110px;"/><br /><sub>Jethro Nederhof</sub>](https://jethron.id.au)<br />[💻](https://github.com/snipe/snipe-it/commits?author=jethron "Code") | [<img src="https://avatars.githubusercontent.com/u/23289826?v=4" width="110px;"/><br /><sub>Oskar Stenberg</sub>](https://github.com/01ste02)<br />[💻](https://github.com/snipe/snipe-it/commits?author=01ste02 "Code") | [<img src="https://avatars.githubusercontent.com/u/82208283?v=4" width="110px;"/><br /><sub>Robert-Azelis</sub>](https://github.com/Robert-Azelis)<br />[💻](https://github.com/snipe/snipe-it/commits?author=Robert-Azelis "Code") | [<img src="https://avatars.githubusercontent.com/u/60648387?v=4" width="110px;"/><br /><sub>Alexander William Smith</sub>](https://github.com/alwism)<br />[💻](https://github.com/snipe/snipe-it/commits?author=alwism "Code") | [<img src="https://avatars.githubusercontent.com/u/24418301?v=4" width="110px;"/><br /><sub>LEITWERK AG</sub>](https://www.leitwerk.de/)<br />[💻](https://github.com/snipe/snipe-it/commits?author=leitwerk-ag "Code") |
+| [<img src="https://avatars.githubusercontent.com/u/1911435?v=4" width="110px;"/><br /><sub>Adam</sub>](http://www.aboutcher.co.uk)<br />[💻](https://github.com/snipe/snipe-it/commits?author=adamboutcher "Code") | [<img src="https://avatars.githubusercontent.com/u/16104273?v=4" width="110px;"/><br /><sub>Ian</sub>](https://snksrv.com)<br />[💻](https://github.com/snipe/snipe-it/commits?author=sneak-it "Code") | [<img src="https://avatars.githubusercontent.com/u/4023909?v=4" width="110px;"/><br /><sub>Shao Yu-Lung (Allen)</sub>](http://blog.bestlong.idv.tw/)<br />[💻](https://github.com/snipe/snipe-it/commits?author=bestlong "Code") | [<img src="https://avatars.githubusercontent.com/u/76475453?v=4" width="110px;"/><br /><sub>Haxatron</sub>](https://github.com/Haxatron)<br />[💻](https://github.com/snipe/snipe-it/commits?author=Haxatron "Code") | [<img src="https://avatars.githubusercontent.com/u/88776392?v=4" width="110px;"/><br /><sub>PlaneNuts</sub>](https://github.com/PlaneNuts)<br />[💻](https://github.com/snipe/snipe-it/commits?author=PlaneNuts "Code") | [<img src="https://avatars.githubusercontent.com/u/3842948?v=4" width="110px;"/><br /><sub>Bradley Coudriet</sub>](http://bjcpgd.cias.rit.edu)<br />[💻](https://github.com/snipe/snipe-it/commits?author=exula "Code") | [<img src="https://avatars.githubusercontent.com/u/21966173?v=4" width="110px;"/><br /><sub>Dalton Durst</sub>](https://daltondur.st)<br />[💻](https://github.com/snipe/snipe-it/commits?author=UniversalSuperBox "Code") |
+| [<img src="https://avatars.githubusercontent.com/u/38761237?v=4" width="110px;"/><br /><sub>Alex Janes</sub>](https://adagiohealth.org)<br />[💻](https://github.com/snipe/snipe-it/commits?author=adagioajanes "Code") | [<img src="https://avatars.githubusercontent.com/u/32387849?v=4" width="110px;"/><br /><sub>Nuraeil</sub>](https://github.com/nuraeil)<br />[💻](https://github.com/snipe/snipe-it/commits?author=nuraeil "Code") | [<img src="https://avatars.githubusercontent.com/u/48162670?v=4" width="110px;"/><br /><sub>TenOfTens</sub>](https://github.com/TenOfTens)<br />[💻](https://github.com/snipe/snipe-it/commits?author=TenOfTens "Code") | [<img src="https://avatars.githubusercontent.com/u/9415391?v=4" width="110px;"/><br /><sub>waffle</sub>](https://ditisjens.be/)<br />[💻](https://github.com/snipe/snipe-it/commits?author=insert-waffle "Code") | [<img src="https://avatars.githubusercontent.com/u/19945501?v=4" width="110px;"/><br /><sub>Yevhenii Huzii</sub>](https://github.com/qveensi)<br />[💻](https://github.com/snipe/snipe-it/commits?author=qveensi "Code") | [<img src="https://avatars.githubusercontent.com/u/3839381?v=4" width="110px;"/><br /><sub>Achmad Fienan Rahardianto</sub>](https://github.com/veenone)<br />[💻](https://github.com/snipe/snipe-it/commits?author=veenone "Code") | [<img src="https://avatars.githubusercontent.com/u/97299851?v=4" width="110px;"/><br /><sub>Christian Weirich</sub>](https://github.com/chrisweirich)<br />[💻](https://github.com/snipe/snipe-it/commits?author=chrisweirich "Code") |
+| [<img src="https://avatars.githubusercontent.com/u/1294403?v=4" width="110px;"/><br /><sub>denzfarid</sub>](https://github.com/denzfarid)<br /> | [<img src="https://avatars.githubusercontent.com/u/94018771?v=4" width="110px;"/><br /><sub>ntbutler-nbcs</sub>](https://github.com/ntbutler-nbcs)<br />[💻](https://github.com/snipe/snipe-it/commits?author=ntbutler-nbcs "Code") | [<img src="https://avatars.githubusercontent.com/u/172697?v=4" width="110px;"/><br /><sub>Naveen</sub>](https://naveensrinivasan.dev)<br />[💻](https://github.com/snipe/snipe-it/commits?author=naveensrinivasan "Code") | [<img src="https://avatars.githubusercontent.com/u/55674383?v=4" width="110px;"/><br /><sub>Mike Roquemore</sub>](https://github.com/mikeroq)<br />[💻](https://github.com/snipe/snipe-it/commits?author=mikeroq "Code") | [<img src="https://avatars.githubusercontent.com/u/7991086?v=4" width="110px;"/><br /><sub>Daniel Reeder</sub>](https://github.com/reederda)<br />[🌍](#translation-reederda "Translation") [🌍](#translation-reederda "Translation") [💻](https://github.com/snipe/snipe-it/commits?author=reederda "Code") | [<img src="https://avatars.githubusercontent.com/u/109422491?v=4" width="110px;"/><br /><sub>vickyjaura183</sub>](https://github.com/vickyjaura183)<br />[💻](https://github.com/snipe/snipe-it/commits?author=vickyjaura183 "Code") | [<img src="https://avatars.githubusercontent.com/u/32363424?v=4" width="110px;"/><br /><sub>Peace</sub>](https://github.com/julian-piehl)<br />[💻](https://github.com/snipe/snipe-it/commits?author=julian-piehl "Code") |
+| [<img src="https://avatars.githubusercontent.com/u/231528?v=4" width="110px;"/><br /><sub>Kyle Gordon</sub>](https://github.com/kylegordon)<br />[💻](https://github.com/snipe/snipe-it/commits?author=kylegordon "Code") | [<img src="https://avatars.githubusercontent.com/u/53009155?v=4" width="110px;"/><br /><sub>Katharina Drexel</sub>](http://www.bfh.ch)<br />[💻](https://github.com/snipe/snipe-it/commits?author=sunflowerbofh "Code") | [<img src="https://avatars.githubusercontent.com/u/1931963?v=4" width="110px;"/><br /><sub>David Sferruzza</sub>](https://david.sferruzza.fr/)<br />[💻](https://github.com/snipe/snipe-it/commits?author=dsferruzza "Code") | [<img src="https://avatars.githubusercontent.com/u/19511639?v=4" width="110px;"/><br /><sub>Rick Nelson</sub>](https://github.com/rnelsonee)<br />[💻](https://github.com/snipe/snipe-it/commits?author=rnelsonee "Code") | [<img src="https://avatars.githubusercontent.com/u/94169344?v=4" width="110px;"/><br /><sub>BasO12</sub>](https://github.com/BasO12)<br />[💻](https://github.com/snipe/snipe-it/commits?author=BasO12 "Code") | [<img src="https://avatars.githubusercontent.com/u/111710123?v=4" width="110px;"/><br /><sub>Vautia</sub>](https://github.com/Vautia)<br />[💻](https://github.com/snipe/snipe-it/commits?author=Vautia "Code") | [<img src="https://avatars.githubusercontent.com/u/28321?v=4" width="110px;"/><br /><sub>Chris Hartjes</sub>](http://www.littlehart.net/atthekeyboard)<br />[💻](https://github.com/snipe/snipe-it/commits?author=chartjes "Code") |
+| [<img src="https://avatars.githubusercontent.com/u/2404584?v=4" width="110px;"/><br /><sub>geo-chen</sub>](https://github.com/geo-chen)<br />[💻](https://github.com/snipe/snipe-it/commits?author=geo-chen "Code") | [<img src="https://avatars.githubusercontent.com/u/6006620?v=4" width="110px;"/><br /><sub>Phan Nguyen</sub>](https://github.com/nh314)<br />[💻](https://github.com/snipe/snipe-it/commits?author=nh314 "Code") | [<img src="https://avatars.githubusercontent.com/u/115993812?v=4" width="110px;"/><br /><sub>Iisakki Jaakkola</sub>](https://github.com/StarlessNights)<br />[💻](https://github.com/snipe/snipe-it/commits?author=StarlessNights "Code") | [<img src="https://avatars.githubusercontent.com/u/22633385?v=4" width="110px;"/><br /><sub>Ikko Ashimine</sub>](https://bandism.net/)<br />[💻](https://github.com/snipe/snipe-it/commits?author=eltociear "Code") | [<img src="https://avatars.githubusercontent.com/u/56871540?v=4" width="110px;"/><br /><sub>Lukas Fehling</sub>](https://github.com/lukasfehling)<br />[💻](https://github.com/snipe/snipe-it/commits?author=lukasfehling "Code") | [<img src="https://avatars.githubusercontent.com/u/1975990?v=4" width="110px;"/><br /><sub>Fernando Almeida</sub>](https://github.com/fernando-almeida)<br />[💻](https://github.com/snipe/snipe-it/commits?author=fernando-almeida "Code") | [<img src="https://avatars.githubusercontent.com/u/116301219?v=4" width="110px;"/><br /><sub>akemidx</sub>](https://github.com/akemidx)<br />[💻](https://github.com/snipe/snipe-it/commits?author=akemidx "Code") |
+| [<img src="https://avatars.githubusercontent.com/u/144778?v=4" width="110px;"/><br /><sub>Oguz Bilgic</sub>](http://oguz.site)<br />[💻](https://github.com/snipe/snipe-it/commits?author=oguzbilgic "Code") | [<img src="https://avatars.githubusercontent.com/u/9262438?v=4" width="110px;"/><br /><sub>Scooter Crawford</sub>](https://github.com/scoo73r)<br />[💻](https://github.com/snipe/snipe-it/commits?author=scoo73r "Code") | [<img src="https://avatars.githubusercontent.com/u/5957345?v=4" width="110px;"/><br /><sub>subdriven</sub>](https://github.com/subdriven)<br />[💻](https://github.com/snipe/snipe-it/commits?author=subdriven "Code") | [<img src="https://avatars.githubusercontent.com/u/658865?v=4" width="110px;"/><br /><sub>Andrew Savinykh</sub>](https://github.com/AndrewSav)<br />[💻](https://github.com/snipe/snipe-it/commits?author=AndrewSav "Code") | [<img src="https://avatars.githubusercontent.com/u/1155067?v=4" width="110px;"/><br /><sub>Tadayuki Onishi</sub>](https://kenchan0130.github.io)<br />[💻](https://github.com/snipe/snipe-it/commits?author=kenchan0130 "Code") | [<img src="https://avatars.githubusercontent.com/u/112496896?v=4" width="110px;"/><br /><sub>Florian</sub>](https://github.com/floschoepfer)<br />[💻](https://github.com/snipe/snipe-it/commits?author=floschoepfer "Code") | [<img src="https://avatars.githubusercontent.com/u/7305753?v=4" width="110px;"/><br /><sub>Spencer Long</sub>](http://spencerlong.com)<br />[💻](https://github.com/snipe/snipe-it/commits?author=spencerrlongg "Code") |
+| [<img src="https://avatars.githubusercontent.com/u/1141514?v=4" width="110px;"/><br /><sub>Marcus Moore</sub>](https://github.com/marcusmoore)<br />[💻](https://github.com/snipe/snipe-it/commits?author=marcusmoore "Code") | [<img src="https://avatars.githubusercontent.com/u/570639?v=4" width="110px;"/><br /><sub>Martin Meredith</sub>](https://github.com/Mezzle)<br /> | [<img src="https://avatars.githubusercontent.com/u/5731963?v=4" width="110px;"/><br /><sub>dboth</sub>](http://dboth.de)<br />[💻](https://github.com/snipe/snipe-it/commits?author=dboth "Code") | [<img src="https://avatars.githubusercontent.com/u/87536651?v=4" width="110px;"/><br /><sub>Zachary Fleck</sub>](https://github.com/zacharyfleck)<br />[💻](https://github.com/snipe/snipe-it/commits?author=zacharyfleck "Code") | [<img src="https://avatars.githubusercontent.com/u/74609912?v=4" width="110px;"/><br /><sub>VIKAAS-A</sub>](https://github.com/vikaas-cyper)<br />[💻](https://github.com/snipe/snipe-it/commits?author=vikaas-cyper "Code") | [<img src="https://avatars.githubusercontent.com/u/88882041?v=4" width="110px;"/><br /><sub>Abdul Kareem</sub>](https://github.com/ak-piracha)<br />[💻](https://github.com/snipe/snipe-it/commits?author=ak-piracha "Code") | [<img src="https://avatars.githubusercontent.com/u/111287779?v=4" width="110px;"/><br /><sub>NojoudAlshehri</sub>](https://github.com/NojoudAlshehri)<br />[💻](https://github.com/snipe/snipe-it/commits?author=NojoudAlshehri "Code") |
+| [<img src="https://avatars.githubusercontent.com/u/54367449?v=4" width="110px;"/><br /><sub>Stefan Stidl</sub>](https://github.com/stefanstidlffg)<br />[💻](https://github.com/snipe/snipe-it/commits?author=stefanstidlffg "Code") | [<img src="https://avatars.githubusercontent.com/u/87803479?v=4" width="110px;"/><br /><sub>Quentin Aymard</sub>](https://github.com/qay21)<br />[💻](https://github.com/snipe/snipe-it/commits?author=qay21 "Code") | [<img src="https://avatars.githubusercontent.com/u/5396871?v=4" width="110px;"/><br /><sub>Grant Le Roux</sub>](https://github.com/cram42)<br />[💻](https://github.com/snipe/snipe-it/commits?author=cram42 "Code") | [<img src="https://avatars.githubusercontent.com/u/58479551?v=4" width="110px;"/><br /><sub>Bogdan</sub>](http://@singrity)<br />[💻](https://github.com/snipe/snipe-it/commits?author=Singrity "Code") | [<img src="https://avatars.githubusercontent.com/u/3483684?v=4" width="110px;"/><br /><sub>mmanjos</sub>](https://github.com/mmanjos)<br />[💻](https://github.com/snipe/snipe-it/commits?author=mmanjos "Code") | [<img src="https://avatars.githubusercontent.com/u/7429229?v=4" width="110px;"/><br /><sub>Abdelaziz Faki</sub>](https://azooz2014.github.io/)<br />[💻](https://github.com/snipe/snipe-it/commits?author=Azooz2014 "Code") | [<img src="https://avatars.githubusercontent.com/u/47315739?v=4" width="110px;"/><br /><sub>bilias</sub>](https://github.com/bilias)<br />[💻](https://github.com/snipe/snipe-it/commits?author=bilias "Code") |
+| [<img src="https://avatars.githubusercontent.com/u/2565989?v=4" width="110px;"/><br /><sub>coach1988</sub>](https://github.com/coach1988)<br />[💻](https://github.com/snipe/snipe-it/commits?author=coach1988 "Code") | [<img src="https://avatars.githubusercontent.com/u/11910225?v=4" width="110px;"/><br /><sub>MrM</sub>](https://github.com/mauro-miatello)<br />[💻](https://github.com/snipe/snipe-it/commits?author=mauro-miatello "Code") | [<img src="https://avatars.githubusercontent.com/u/60405354?v=4" width="110px;"/><br /><sub>koiakoia</sub>](https://github.com/koiakoia)<br />[💻](https://github.com/snipe/snipe-it/commits?author=koiakoia "Code") | [<img src="https://avatars.githubusercontent.com/u/5323832?v=4" width="110px;"/><br /><sub>Mustafa Online</sub>](https://github.com/mustafa-online)<br />[💻](https://github.com/snipe/snipe-it/commits?author=mustafa-online "Code") | [<img src="https://avatars.githubusercontent.com/u/104601439?v=4" width="110px;"/><br /><sub>franceslui</sub>](https://github.com/franceslui)<br />[💻](https://github.com/snipe/snipe-it/commits?author=franceslui "Code") | [<img src="https://avatars.githubusercontent.com/u/125313163?v=4" width="110px;"/><br /><sub>Q4kK</sub>](https://github.com/Q4kK)<br />[💻](https://github.com/snipe/snipe-it/commits?author=Q4kK "Code") | [<img src="https://avatars.githubusercontent.com/u/55590532?v=4" width="110px;"/><br /><sub>squintfox</sub>](https://github.com/squintfox)<br />[💻](https://github.com/snipe/snipe-it/commits?author=squintfox "Code") |
+| [<img src="https://avatars.githubusercontent.com/u/1380084?v=4" width="110px;"/><br /><sub>Jeff Clay</sub>](https://github.com/jeffclay)<br />[💻](https://github.com/snipe/snipe-it/commits?author=jeffclay "Code") | [<img src="https://avatars.githubusercontent.com/u/52716446?v=4" width="110px;"/><br /><sub>Phil J R</sub>](https://github.com/PP-JN-RL)<br />[💻](https://github.com/snipe/snipe-it/commits?author=PP-JN-RL "Code") | [<img src="https://avatars.githubusercontent.com/u/1496725?v=4" width="110px;"/><br /><sub>i_virus</sub>](https://www.corelight.com/)<br />[💻](https://github.com/snipe/snipe-it/commits?author=chandanchowdhury "Code") | [<img src="https://avatars.githubusercontent.com/u/1020541?v=4" width="110px;"/><br /><sub>Paul Grime</sub>](https://github.com/gitgrimbo)<br />[💻](https://github.com/snipe/snipe-it/commits?author=gitgrimbo "Code") | [<img src="https://avatars.githubusercontent.com/u/922815?v=4" width="110px;"/><br /><sub>Lee Porte</sub>](https://leeporte.co.uk)<br />[💻](https://github.com/snipe/snipe-it/commits?author=LeePorte "Code") | [<img src="https://avatars.githubusercontent.com/u/23613427?v=4" width="110px;"/><br /><sub>BRYAN </sub>](https://github.com/bryanlopezinc)<br />[💻](https://github.com/snipe/snipe-it/commits?author=bryanlopezinc "Code") [⚠️](https://github.com/snipe/snipe-it/commits?author=bryanlopezinc "Tests") | [<img src="https://avatars.githubusercontent.com/u/64061710?v=4" width="110px;"/><br /><sub>U-H-T</sub>](https://github.com/U-H-T)<br />[💻](https://github.com/snipe/snipe-it/commits?author=U-H-T "Code") |
+| [<img src="https://avatars.githubusercontent.com/u/5395363?v=4" width="110px;"/><br /><sub>Matt Tyree</sub>](https://github.com/Tyree)<br />[📖](https://github.com/snipe/snipe-it/commits?author=Tyree "Documentation") | [<img src="https://avatars.githubusercontent.com/u/292081?v=4" width="110px;"/><br /><sub>Florent Bervas</sub>](http://spoontux.net)<br />[💻](https://github.com/snipe/snipe-it/commits?author=FlorentDotMe "Code") | [<img src="https://avatars.githubusercontent.com/u/4498077?v=4" width="110px;"/><br /><sub>Daniel Albertsen</sub>](https://ditscheri.com)<br />[💻](https://github.com/snipe/snipe-it/commits?author=dbakan "Code") | [<img src="https://avatars.githubusercontent.com/u/100710244?v=4" width="110px;"/><br /><sub>r-xyz</sub>](https://github.com/r-xyz)<br />[💻](https://github.com/snipe/snipe-it/commits?author=r-xyz "Code") | [<img src="https://avatars.githubusercontent.com/u/47491036?v=4" width="110px;"/><br /><sub>Steven Mainor</sub>](https://github.com/DrekiDegga)<br />[💻](https://github.com/snipe/snipe-it/commits?author=DrekiDegga "Code") | [<img src="https://avatars.githubusercontent.com/u/65785975?v=4" width="110px;"/><br /><sub>arne-kroeger</sub>](https://github.com/arne-kroeger)<br />[💻](https://github.com/snipe/snipe-it/commits?author=arne-kroeger "Code") | [<img src="https://avatars.githubusercontent.com/u/167117705?v=4" width="110px;"/><br /><sub>Glukose1</sub>](https://github.com/Glukose1)<br />[💻](https://github.com/snipe/snipe-it/commits?author=Glukose1 "Code") |
+| [<img src="https://avatars.githubusercontent.com/u/1197791?v=4" width="110px;"/><br /><sub>Scarzy</sub>](https://github.com/Scarzy)<br />[💻](https://github.com/snipe/snipe-it/commits?author=Scarzy "Code") | [<img src="https://avatars.githubusercontent.com/u/37372069?v=4" width="110px;"/><br /><sub>setpill</sub>](https://github.com/setpill)<br />[💻](https://github.com/snipe/snipe-it/commits?author=setpill "Code") | [<img src="https://avatars.githubusercontent.com/u/3755203?v=4" width="110px;"/><br /><sub>swift2512</sub>](https://github.com/swift2512)<br />[🐛](https://github.com/snipe/snipe-it/issues?q=author%3Aswift2512 "Bug reports") | [<img src="https://avatars.githubusercontent.com/u/6136439?v=4" width="110px;"/><br /><sub>Darren Rainey</sub>](https://darrenraineys.co.uk)<br />[💻](https://github.com/snipe/snipe-it/commits?author=DarrenRainey "Code") | [<img src="https://avatars.githubusercontent.com/u/133033121?v=4" width="110px;"/><br /><sub>maciej-poleszczyk</sub>](https://github.com/maciej-poleszczyk)<br />[💻](https://github.com/snipe/snipe-it/commits?author=maciej-poleszczyk "Code") | [<img src="https://avatars.githubusercontent.com/u/143394709?v=4" width="110px;"/><br /><sub>Sebastian Groß</sub>](https://github.com/sgross-emlix)<br />[💻](https://github.com/snipe/snipe-it/commits?author=sgross-emlix "Code") | [<img src="https://avatars.githubusercontent.com/u/41107778?v=4" width="110px;"/><br /><sub>Anouar Touati</sub>](https://github.com/AnouarTouati)<br />[💻](https://github.com/snipe/snipe-it/commits?author=AnouarTouati "Code") |
+| [<img src="https://avatars.githubusercontent.com/u/25596663?v=4" width="110px;"/><br /><sub>aHVzY2g</sub>](https://github.com/aHVzY2g)<br />[💻](https://github.com/snipe/snipe-it/commits?author=aHVzY2g "Code") | [<img src="https://avatars.githubusercontent.com/u/13408130?v=4" width="110px;"/><br /><sub>林博仁 Buo-ren Lin</sub>](https://brlin.me)<br />[💻](https://github.com/snipe/snipe-it/commits?author=brlin-tw "Code") | [<img src="https://avatars.githubusercontent.com/u/18550946?v=4" width="110px;"/><br /><sub>Adugna Gizaw</sub>](https://orbalia.pythonanywhere.com/)<br />[🌍](#translation-addex12 "Translation") | [<img src="https://avatars.githubusercontent.com/u/760989?v=4" width="110px;"/><br /><sub>Jesse Ostrander</sub>](https://github.com/jostrander)<br />[💻](https://github.com/snipe/snipe-it/commits?author=jostrander "Code") | [<img src="https://avatars.githubusercontent.com/u/31522486?v=4" width="110px;"/><br /><sub>James M</sub>](https://github.com/azmcnutt)<br />[💻](https://github.com/snipe/snipe-it/commits?author=azmcnutt "Code") | [<img src="https://avatars.githubusercontent.com/u/5183146?v=4" width="110px;"/><br /><sub>Fiala06</sub>](https://github.com/Fiala06)<br />[💻](https://github.com/snipe/snipe-it/commits?author=Fiala06 "Code") | [<img src="https://avatars.githubusercontent.com/u/28693782?v=4" width="110px;"/><br /><sub>Nathan Taylor</sub>](https://github.com/ntaylor-86)<br />[💻](https://github.com/snipe/snipe-it/commits?author=ntaylor-86 "Code") |
+| [<img src="https://avatars.githubusercontent.com/u/16699443?v=4" width="110px;"/><br /><sub>fvollmer</sub>](https://github.com/fvollmer)<br />[💻](https://github.com/snipe/snipe-it/commits?author=fvollmer "Code") | [<img src="https://avatars.githubusercontent.com/u/109086466?v=4" width="110px;"/><br /><sub>36864</sub>](https://github.com/36864)<br />[💻](https://github.com/snipe/snipe-it/commits?author=36864 "Code") | [<img src="https://avatars.githubusercontent.com/u/365751?v=4" width="110px;"/><br /><sub>Daniel O'Connor</sub>](http://clockwerx.blogspot.com/)<br />[💻](https://github.com/snipe/snipe-it/commits?author=CloCkWeRX "Code") | [<img src="https://avatars.githubusercontent.com/u/102852568?v=4" width="110px;"/><br /><sub>BeatSpark</sub>](https://github.com/BeatSpark)<br />[💻](https://github.com/snipe/snipe-it/commits?author=BeatSpark "Code") | [<img src="https://avatars.githubusercontent.com/u/59203607?v=4" width="110px;"/><br /><sub>mrdahbi</sub>](https://github.com/mrdahbi)<br />[💻](https://github.com/snipe/snipe-it/commits?author=mrdahbi "Code") | [<img src="https://avatars.githubusercontent.com/u/6661332?v=4" width="110px;"/><br /><sub>Fabian Schmid</sub>](http://sr.solutions)<br />[💻](https://github.com/snipe/snipe-it/commits?author=chfsx "Code") | [<img src="https://avatars.githubusercontent.com/u/1288116?v=4" width="110px;"/><br /><sub>Chris Olin</sub>](https://www.chrisolin.com)<br />[💻](https://github.com/snipe/snipe-it/commits?author=realchrisolin "Code") |
+| [<img src="https://avatars.githubusercontent.com/u/3803132?v=4" width="110px;"/><br /><sub>Dan</sub>](https://github.com/mnemonicly)<br />[💻](https://github.com/snipe/snipe-it/commits?author=mnemonicly "Code") | [<img src="https://avatars.githubusercontent.com/u/43917728?v=4" width="110px;"/><br /><sub>Nebel</sub>](https://github.com/NebelKreis)<br />[💻](https://github.com/snipe/snipe-it/commits?author=NebelKreis "Code") | [<img src="https://avatars.githubusercontent.com/u/132433803?v=4" width="110px;"/><br /><sub>test1337ahp</sub>](https://github.com/test1337ahp)<br />[💻](https://github.com/snipe/snipe-it/commits?author=test1337ahp "Code") | [<img src="https://avatars.githubusercontent.com/u/1916566?v=4" width="110px;"/><br /><sub>Jonathon Reinhart</sub>](https://github.com/JonathonReinhart)<br />[💻](https://github.com/snipe/snipe-it/commits?author=JonathonReinhart "Code") | [<img src="https://avatars.githubusercontent.com/u/484742?v=4" width="110px;"/><br /><sub>aranar-pro</sub>](https://github.com/aranar-pro)<br />[💻](https://github.com/snipe/snipe-it/commits?author=aranar-pro "Code") | [<img src="https://avatars.githubusercontent.com/u/27019397?v=4" width="110px;"/><br /><sub>Phil</sub>](https://github.com/phil-flip)<br />[💻](https://github.com/snipe/snipe-it/commits?author=phil-flip "Code") | [<img src="https://avatars.githubusercontent.com/u/6473460?v=4" width="110px;"/><br /><sub>Steffy Fort</sub>](https://fe80.fr/)<br />[💻](https://github.com/snipe/snipe-it/commits?author=fe80 "Code") |
+| [<img src="https://avatars.githubusercontent.com/u/3302372?v=4" width="110px;"/><br /><sub>Jared Busch</sub>](https://github.com/sorvani)<br />[💻](https://github.com/snipe/snipe-it/commits?author=sorvani "Code") | [<img src="https://avatars.githubusercontent.com/u/111956991?v=4" width="110px;"/><br /><sub>seanborg-codethink</sub>](https://github.com/seanborg-codethink)<br />[💻](https://github.com/snipe/snipe-it/commits?author=seanborg-codethink "Code") | [<img src="https://avatars.githubusercontent.com/u/160669961?v=4" width="110px;"/><br /><sub>dkaatz</sub>](https://github.com/dkaatz)<br />[💻](https://github.com/snipe/snipe-it/commits?author=dkaatz "Code") | [<img src="https://avatars.githubusercontent.com/u/827205?v=4" width="110px;"/><br /><sub>Daniel Ruf</sub>](https://threema.id/74SF7MW6?text=)<br />[💻](https://github.com/snipe/snipe-it/commits?author=DanielRuf "Code") | [<img src="https://avatars.githubusercontent.com/u/38883201?v=4" width="110px;"/><br /><sub>ahpaleus</sub>](https://github.com/ahpaleus)<br />[💻](https://github.com/snipe/snipe-it/commits?author=ahpaleus "Code") | [<img src="https://avatars.githubusercontent.com/u/22906055?v=4" width="110px;"/><br /><sub>Anh DAO-DUY</sub>](https://github.com/mink-adao-duy)<br />[💻](https://github.com/snipe/snipe-it/commits?author=mink-adao-duy "Code") | [<img src="https://avatars.githubusercontent.com/u/4723453?v=4" width="110px;"/><br /><sub>Andres Gutierrez</sub>](https://github.com/Serdnad)<br />[💻](https://github.com/snipe/snipe-it/commits?author=Serdnad "Code") |
+| [<img src="https://avatars.githubusercontent.com/u/111083379?v=4" width="110px;"/><br /><sub>Warren White</sub>](https://github.com/wewhite)<br />[💻](https://github.com/snipe/snipe-it/commits?author=wewhite "Code") | [<img src="https://avatars.githubusercontent.com/u/2809241?v=4" width="110px;"/><br /><sub>Robin Temme</sub>](https://robintemme.de/)<br />[💻](https://github.com/snipe/snipe-it/commits?author=robintemme "Code") | [<img src="https://avatars.githubusercontent.com/u/47008367?v=4" width="110px;"/><br /><sub>herroworrd</sub>](https://github.com/herroworrd)<br />[💻](https://github.com/snipe/snipe-it/commits?author=herroworrd "Code") | [<img src="https://avatars.githubusercontent.com/u/28558609?v=4" width="110px;"/><br /><sub>vicleos</sub>](https://mubiu.com/)<br />[💻](https://github.com/snipe/snipe-it/commits?author=vicleos "Code") | [<img src="https://avatars.githubusercontent.com/u/1016780?v=4" width="110px;"/><br /><sub>Bob Clough</sub>](http://thinkl33t.co.uk/)<br />[💻](https://github.com/snipe/snipe-it/commits?author=thinkl33t "Code") | [<img src="https://avatars.githubusercontent.com/u/10648463?v=4" width="110px;"/><br /><sub>Brandon Daniel Bailey</sub>](https://github.com/brandon-bailey)<br />[💻](https://github.com/snipe/snipe-it/commits?author=brandon-bailey "Code") | [<img src="https://avatars.githubusercontent.com/u/23556080?v=4" width="110px;"/><br /><sub>Marc Bartelt</sub>](https://github.com/marcquark)<br />[💻](https://github.com/snipe/snipe-it/commits?author=marcquark "Code") |
+| [<img src="https://avatars.githubusercontent.com/u/18286893?v=4" width="110px;"/><br /><sub>manu-crealytics</sub>](https://github.com/manu-crealytics)<br />[💻](https://github.com/snipe/snipe-it/commits?author=manu-crealytics "Code") | [<img src="https://avatars.githubusercontent.com/u/18245993?v=4" width="110px;"/><br /><sub>Konstantin Köhring</sub>](https://www.galaxy102.de/)<br />[💻](https://github.com/snipe/snipe-it/commits?author=Galaxy102 "Code") | [<img src="https://avatars.githubusercontent.com/u/685167?v=4" width="110px;"/><br /><sub>Deloz</sub>](https://deloz.net/)<br />[💻](https://github.com/snipe/snipe-it/commits?author=deloz "Code") | [<img src="https://avatars.githubusercontent.com/u/2682426?v=4" width="110px;"/><br /><sub>Martin Berg</sub>](https://github.com/mbrrg)<br />[💻](https://github.com/snipe/snipe-it/commits?author=mbrrg "Code") | [<img src="https://avatars.githubusercontent.com/u/3694534?v=4" width="110px;"/><br /><sub>Richard Schwab</sub>](https://github.com/Nothing4You)<br />[💻](https://github.com/snipe/snipe-it/commits?author=Nothing4You "Code") | [<img src="https://avatars.githubusercontent.com/u/8959676?v=4" width="110px;"/><br /><sub>Rick Heil</sub>](https://rickheil.com/)<br />[💻](https://github.com/snipe/snipe-it/commits?author=rickheil "Code") | [<img src="https://avatars.githubusercontent.com/u/397106?v=4" width="110px;"/><br /><sub>Ross Crawford-d'Heureuse</sub>](https://github.com/rosscdh)<br />[💻](https://github.com/snipe/snipe-it/commits?author=rosscdh "Code") |
+| [<img src="https://avatars.githubusercontent.com/u/1621107?v=4" width="110px;"/><br /><sub>Ryan McGuire</sub>](https://github.com/McG800)<br />[💻](https://github.com/snipe/snipe-it/commits?author=McG800 "Code") | [<img src="https://avatars.githubusercontent.com/u/77835667?v=4" width="110px;"/><br /><sub>SBrown2021</sub>](https://github.com/SBrown2021)<br />[💻](https://github.com/snipe/snipe-it/commits?author=SBrown2021 "Code") | [<img src="https://avatars.githubusercontent.com/u/8780913?v=4" width="110px;"/><br /><sub>Serkan</sub>](https://github.com/serkanerip)<br />[💻](https://github.com/snipe/snipe-it/commits?author=serkanerip "Code") | [<img src="https://avatars.githubusercontent.com/u/63188620?v=4" width="110px;"/><br /><sub>Shanks</sub>](https://www.yudelei.com/)<br />[💻](https://github.com/snipe/snipe-it/commits?author=Shankschn "Code") | [<img src="https://avatars.githubusercontent.com/u/198525698?v=4" width="110px;"/><br /><sub>cendai-mis</sub>](https://github.com/cendai-mis)<br />[💻](https://github.com/snipe/snipe-it/commits?author=cendai-mis "Code") | [<img src="https://avatars.githubusercontent.com/u/8724583?v=4" width="110px;"/><br /><sub>Shaun McPeck</sub>](https://smcpeck.github.io/)<br />[💻](https://github.com/snipe/snipe-it/commits?author=smcpeck "Code") | [<img src="https://avatars.githubusercontent.com/u/1378836?v=4" width="110px;"/><br /><sub>Stephen</sub>](https://github.com/snazy2000)<br />[💻](https://github.com/snipe/snipe-it/commits?author=snazy2000 "Code") |
+| [<img src="https://avatars.githubusercontent.com/u/4462739?v=4" width="110px;"/><br /><sub>Steven</sub>](http://nevets82.github.io/)<br />[💻](https://github.com/snipe/snipe-it/commits?author=Nevets82 "Code") | [<img src="https://avatars.githubusercontent.com/u/29017267?v=4" width="110px;"/><br /><sub>Mateus Villar</sub>](https://mateusvillar.com/)<br />[💻](https://github.com/snipe/snipe-it/commits?author=Mateus-Romera "Code") | [<img src="https://avatars.githubusercontent.com/u/12749393?v=4" width="110px;"/><br /><sub>Matthew Zackschewski</sub>](https://github.com/mzack5020)<br />[💻](https://github.com/snipe/snipe-it/commits?author=mzack5020 "Code") | [<img src="https://avatars.githubusercontent.com/u/12660103?v=4" width="110px;"/><br /><sub>Matthias Frei</sub>](https://www.frei.media/)<br />[💻](https://github.com/snipe/snipe-it/commits?author=firefrei "Code") | [<img src="https://avatars.githubusercontent.com/u/824840?v=4" width="110px;"/><br /><sub>Nenad Ticaric</sub>](https://github.com/nticaric)<br />[💻](https://github.com/snipe/snipe-it/commits?author=nticaric "Code") | [<img src="https://avatars.githubusercontent.com/u/706439?v=4" width="110px;"/><br /><sub>Nikolay Didenko</sub>](https://github.com/Scorcher)<br />[💻](https://github.com/snipe/snipe-it/commits?author=Scorcher "Code") | [<img src="https://avatars.githubusercontent.com/u/5457236?v=4" width="110px;"/><br /><sub>Nuno Maduro</sub>](https://nunomaduro.com/sponsorships)<br />[💻](https://github.com/snipe/snipe-it/commits?author=nunomaduro "Code") |
+| [<img src="https://avatars.githubusercontent.com/u/8883074?v=4" width="110px;"/><br /><sub>Oliver Walerys</sub>](https://tektikhq.com/)<br />[💻](https://github.com/snipe/snipe-it/commits?author=owalerys "Code") | [<img src="https://avatars.githubusercontent.com/u/3102039?v=4" width="110px;"/><br /><sub>R. Christian McDonald</sub>](https://keybase.io/rcmcdonald91)<br />[💻](https://github.com/snipe/snipe-it/commits?author=rcmcdonald91 "Code") | [<img src="https://avatars.githubusercontent.com/u/1525581?v=4" width="110px;"/><br /><sub>nix</sub>](https://nnix.net/)<br />[💻](https://github.com/snipe/snipe-it/commits?author=nixn "Code") | [<img src="https://avatars.githubusercontent.com/u/55462380?v=4" width="110px;"/><br /><sub>octobunny</sub>](https://github.com/octobunny)<br />[💻](https://github.com/snipe/snipe-it/commits?author=octobunny "Code") | [<img src="https://avatars.githubusercontent.com/u/8558670?v=4" width="110px;"/><br /><sub>Ryan</sub>](https://github.com/sreyemnayr)<br />[💻](https://github.com/snipe/snipe-it/commits?author=sreyemnayr "Code") | [<img src="https://avatars.githubusercontent.com/u/1501022?v=4" width="110px;"/><br /><sub>p3nj</sub>](https://benji.ltd/)<br />[💻](https://github.com/snipe/snipe-it/commits?author=p3nj "Code") | [<img src="https://avatars.githubusercontent.com/u/6201617?v=4" width="110px;"/><br /><sub>Tim White</sub>](https://github.com/timwsuqld)<br />[💻](https://github.com/snipe/snipe-it/commits?author=timwsuqld "Code") |
+| [<img src="https://avatars.githubusercontent.com/u/22473767?v=4" width="110px;"/><br /><sub>yannikp</sub>](https://github.com/yannikp)<br />[💻](https://github.com/snipe/snipe-it/commits?author=yannikp "Code") | [<img src="https://avatars.githubusercontent.com/u/20525448?v=4" width="110px;"/><br /><sub>victoria</sub>](https://github.com/viclou)<br />[💻](https://github.com/snipe/snipe-it/commits?author=viclou "Code") | [<img src="https://avatars.githubusercontent.com/u/40685314?v=4" width="110px;"/><br /><sub>Valentyn Tulub</sub>](https://github.com/valentyntu)<br />[💻](https://github.com/snipe/snipe-it/commits?author=valentyntu "Code") | [<img src="https://avatars.githubusercontent.com/u/864520?v=4" width="110px;"/><br /><sub>Wouter van Os</sub>](http://wouter0100.nl/)<br />[💻](https://github.com/snipe/snipe-it/commits?author=Wouter0100 "Code") | [<img src="https://avatars.githubusercontent.com/u/3946540?v=4" width="110px;"/><br /><sub>Wyatt Teeter</sub>](https://www.linkedin.com/in/wyatt-teeter)<br />[💻](https://github.com/snipe/snipe-it/commits?author=xWyatt "Code") | [<img src="https://avatars.githubusercontent.com/u/1596124?v=4" width="110px;"/><br /><sub>Yorick Terweijden</sub>](https://github.com/terwey)<br />[💻](https://github.com/snipe/snipe-it/commits?author=terwey "Code") | [<img src="https://avatars.githubusercontent.com/u/69298836?v=4" width="110px;"/><br /><sub>bmkalle</sub>](https://github.com/bmkalle)<br />[💻](https://github.com/snipe/snipe-it/commits?author=bmkalle "Code") |
+| [<img src="https://avatars.githubusercontent.com/u/28403467?v=4" width="110px;"/><br /><sub>bricelabelle</sub>](https://github.com/bricelabelle)<br />[💻](https://github.com/snipe/snipe-it/commits?author=bricelabelle "Code") | [<img src="https://avatars.githubusercontent.com/u/97770090?v=4" width="110px;"/><br /><sub>corydlamb</sub>](https://github.com/corydlamb)<br />[💻](https://github.com/snipe/snipe-it/commits?author=corydlamb "Code") | [<img src="https://avatars.githubusercontent.com/u/1154133?v=4" width="110px;"/><br /><sub>Diogenes S. Jesus</sub>](http://twitter.com/splash)<br />[💻](https://github.com/snipe/snipe-it/commits?author=splashx "Code") | [<img src="https://avatars.githubusercontent.com/u/5826629?v=4" width="110px;"/><br /><sub>D M</sub>](https://github.com/dkmansion)<br />[💻](https://github.com/snipe/snipe-it/commits?author=dkmansion "Code") | [<img src="https://avatars.githubusercontent.com/u/14837699?v=4" width="110px;"/><br /><sub>Dustin B</sub>](https://github.com/Jarli01)<br />[💻](https://github.com/snipe/snipe-it/commits?author=Jarli01 "Code") | [<img src="https://avatars.githubusercontent.com/u/348344?v=4" width="110px;"/><br /><sub>Fabian Grutschus</sub>](https://github.com/fabiang)<br />[💻](https://github.com/snipe/snipe-it/commits?author=fabiang "Code") | [<img src="https://avatars.githubusercontent.com/u/1491053?v=4" width="110px;"/><br /><sub>MelonSmasher</sub>](https://github.com/MelonSmasher)<br />[💻](https://github.com/snipe/snipe-it/commits?author=MelonSmasher "Code") |
+| [<img src="https://avatars.githubusercontent.com/u/80526133?v=4" width="110px;"/><br /><sub>AlexanderWPapyrus</sub>](https://github.com/AlexanderWPapyrus)<br />[💻](https://github.com/snipe/snipe-it/commits?author=AlexanderWPapyrus "Code") | [<img src="https://avatars.githubusercontent.com/u/306231?v=4" width="110px;"/><br /><sub>Alexandr Hacicheant</sub>](https://github.com/disc)<br />[💻](https://github.com/snipe/snipe-it/commits?author=disc "Code") | [<img src="https://avatars.githubusercontent.com/u/3032891?v=4" width="110px;"/><br /><sub>Hex</sub>](https://hex128.io/)<br />[💻](https://github.com/snipe/snipe-it/commits?author=hex128 "Code") | [<img src="https://avatars.githubusercontent.com/u/8697942?v=4" width="110px;"/><br /><sub>Arunas Skirius</sub>](https://github.com/arukompas)<br />[💻](https://github.com/snipe/snipe-it/commits?author=arukompas "Code") | [<img src="https://avatars.githubusercontent.com/u/104396?v=4" width="110px;"/><br /><sub>Ben Periton</sub>](https://github.com/benperiton)<br />[💻](https://github.com/snipe/snipe-it/commits?author=benperiton "Code") | [<img src="https://avatars.githubusercontent.com/u/11906832?v=4" width="110px;"/><br /><sub>Byron Wolfman</sub>](https://wolfman.dev/)<br />[💻](https://github.com/snipe/snipe-it/commits?author=byronwolfman "Code") | [<img src="https://avatars.githubusercontent.com/u/56485508?v=4" width="110px;"/><br /><sub>Calvin</sub>](https://github.com/CalvinSchwartz)<br />[💻](https://github.com/snipe/snipe-it/commits?author=CalvinSchwartz "Code") |
+| [<img src="https://avatars.githubusercontent.com/u/181059?v=4" width="110px;"/><br /><sub>Juan Font</sub>](https://github.com/juanfont)<br />[💻](https://github.com/snipe/snipe-it/commits?author=juanfont "Code") | [<img src="https://avatars.githubusercontent.com/u/13137708?v=4" width="110px;"/><br /><sub>Juho Taipale</sub>](https://github.com/juhotaipale)<br />[💻](https://github.com/snipe/snipe-it/commits?author=juhotaipale "Code") | [<img src="https://avatars.githubusercontent.com/u/1007419?v=4" width="110px;"/><br /><sub>Korvin Szanto</sub>](https://github.com/KorvinSzanto)<br />[💻](https://github.com/snipe/snipe-it/commits?author=KorvinSzanto "Code") | [<img src="https://avatars.githubusercontent.com/u/8513053?v=4" width="110px;"/><br /><sub>Lewis Foster</sub>](https://lewisfoster.foo/)<br />[💻](https://github.com/snipe/snipe-it/commits?author=sniff122 "Code") | [<img src="https://avatars.githubusercontent.com/u/33877541?v=4" width="110px;"/><br /><sub>Logan Swartzendruber</sub>](https://github.com/loganswartz)<br />[💻](https://github.com/snipe/snipe-it/commits?author=loganswartz "Code") | [<img src="https://avatars.githubusercontent.com/u/1156208?v=4" width="110px;"/><br /><sub>Lorenzo P.</sub>](https://github.com/lopezio)<br />[💻](https://github.com/snipe/snipe-it/commits?author=lopezio "Code") | [<img src="https://avatars.githubusercontent.com/u/33946590?v=4" width="110px;"/><br /><sub>Lukas Jung</sub>](https://github.com/m4us1ne)<br />[💻](https://github.com/snipe/snipe-it/commits?author=m4us1ne "Code") |
+| [<img src="https://avatars.githubusercontent.com/u/10965027?v=4" width="110px;"/><br /><sub>Ellie</sub>](https://leafedfox.xyz/)<br />[💻](https://github.com/snipe/snipe-it/commits?author=LeafedFox "Code") | [<img src="https://avatars.githubusercontent.com/u/20960555?v=4" width="110px;"/><br /><sub>GA Stamper</sub>](https://github.com/gastamper)<br />[💻](https://github.com/snipe/snipe-it/commits?author=gastamper "Code") | [<img src="https://avatars.githubusercontent.com/u/206553556?v=4" width="110px;"/><br /><sub>Guillaume Lefranc</sub>](https://github.com/gl-pup)<br />[💻](https://github.com/snipe/snipe-it/commits?author=gl-pup "Code") | [<img src="https://avatars.githubusercontent.com/u/733892?v=4" width="110px;"/><br /><sub>Hajo Möller</sub>](https://github.com/dasjoe)<br />[💻](https://github.com/snipe/snipe-it/commits?author=dasjoe "Code") | [<img src="https://avatars.githubusercontent.com/u/3420063?v=4" width="110px;"/><br /><sub>Istvan Basa</sub>](https://github.com/pottom)<br />[💻](https://github.com/snipe/snipe-it/commits?author=pottom "Code") | [<img src="https://avatars.githubusercontent.com/u/810824?v=4" width="110px;"/><br /><sub>JJ Asghar</sub>](https://jjasghar.github.io/)<br />[💻](https://github.com/snipe/snipe-it/commits?author=jjasghar "Code") | [<img src="https://avatars.githubusercontent.com/u/40404495?v=4" width="110px;"/><br /><sub>James E. Msenga</sub>](https://github.com/JemCdo)<br />[💻](https://github.com/snipe/snipe-it/commits?author=JemCdo "Code") |
+| [<img src="https://avatars.githubusercontent.com/u/6865786?v=4" width="110px;"/><br /><sub>Jan Felix Wiebe</sub>](https://github.com/jfwiebe)<br />[💻](https://github.com/snipe/snipe-it/commits?author=jfwiebe "Code") | [<img src="https://avatars.githubusercontent.com/u/43412008?v=4" width="110px;"/><br /><sub>Jo Drexl</sub>](https://www.nfon.com/)<br />[💻](https://github.com/snipe/snipe-it/commits?author=drexljo "Code") | [<img src="https://avatars.githubusercontent.com/u/4807843?v=4" width="110px;"/><br /><sub>Austin Sasko</sub>](https://github.com/austinsasko)<br />[💻](https://github.com/snipe/snipe-it/commits?author=austinsasko "Code") | [<img src="https://avatars.githubusercontent.com/u/4875039?v=4" width="110px;"/><br /><sub>Jasson</sub>](http://jassoncordones.github.io)<br />[💻](https://github.com/snipe/snipe-it/commits?author=JassonCordones "Code") | [<img src="https://avatars.githubusercontent.com/u/76069640?v=4" width="110px;"/><br /><sub>Okean</sub>](https://github.com/Tinyblargon)<br />[💻](https://github.com/snipe/snipe-it/commits?author=Tinyblargon "Code") | [<img src="https://avatars.githubusercontent.com/u/6515064?v=4" width="110px;"/><br /><sub>Alejandro Medrano</sub>](https://www.lst.tfo.upm.es/alejandro-medrano/)<br />[💻](https://github.com/snipe/snipe-it/commits?author=amedranogil "Code") |
 <!-- ALL-CONTRIBUTORS-LIST:END -->
 
 This project follows the [all-contributors](https://github.com/kentcdodds/all-contributors) specification. Contributions of any kind welcome!
diff --git a/Dockerfile b/Dockerfile
index bd363ccd18..b4c4e8a357 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,8 +1,8 @@
-FROM ubuntu:22.04
+FROM ubuntu:24.04
 LABEL maintainer="Brady Wetherington <bwetherington@grokability.com>"
 
 # No need to add `apt-get clean` here, reference:
-# - https://github.com/snipe/snipe-it/pull/9201
+# - https://github.com/grokability/snipe-it/pull/9201
 # - https://docs.docker.com/develop/develop-images/dockerfile_best-practices/#apt-get
 
 RUN export DEBIAN_FRONTEND=noninteractive; \
@@ -14,16 +14,16 @@ RUN export DEBIAN_FRONTEND=noninteractive; \
 apt-utils \
 apache2 \
 apache2-bin \
-libapache2-mod-php8.1 \
-php8.1-curl \
-php8.1-ldap \
-php8.1-mysql \
-php8.1-gd \
-php8.1-xml \
-php8.1-mbstring \
-php8.1-zip \
-php8.1-bcmath \
-php8.1-redis \
+libapache2-mod-php8.3 \
+php8.3-curl \
+php8.3-ldap \
+php8.3-mysql \
+php8.3-gd \
+php8.3-xml \
+php8.3-mbstring \
+php8.3-zip \
+php8.3-bcmath \
+php8.3-redis \
 php-memcached \
 patch \
 curl \
@@ -40,8 +40,7 @@ autoconf \
 libc-dev \
 libldap-common \
 pkg-config \
-libmcrypt-dev \
-php8.1-dev \
+php8.3-dev \
 ca-certificates \
 unzip \
 dnsutils \
@@ -51,18 +50,13 @@ dnsutils \
 RUN curl -L -O https://github.com/pear/pearweb_phars/raw/master/go-pear.phar
 RUN php go-pear.phar
 
-RUN pecl install mcrypt
-
-RUN bash -c "echo extension=/usr/lib/php/20210902/mcrypt.so > /etc/php/8.1/mods-available/mcrypt.ini"
-
-RUN phpenmod mcrypt
 RUN phpenmod gd
 RUN phpenmod bcmath
 
-RUN sed -i 's/variables_order = .*/variables_order = "EGPCS"/' /etc/php/8.1/apache2/php.ini
-RUN sed -i 's/variables_order = .*/variables_order = "EGPCS"/' /etc/php/8.1/cli/php.ini
+RUN sed -i 's/variables_order = .*/variables_order = "EGPCS"/' /etc/php/8.3/apache2/php.ini
+RUN sed -i 's/variables_order = .*/variables_order = "EGPCS"/' /etc/php/8.3/cli/php.ini
 
-RUN useradd -m --uid 1000 --gid 50 docker
+RUN useradd -m --uid 10000 --gid 50 docker
 
 RUN echo export APACHE_RUN_USER=docker >> /etc/apache2/envvars
 RUN echo export APACHE_RUN_GROUP=staff >> /etc/apache2/envvars
@@ -116,7 +110,7 @@ COPY --from=composer:latest /usr/bin/composer /usr/bin/composer
 
 # Get dependencies
 USER docker
-RUN composer install --no-dev --working-dir=/var/www/html
+RUN COMPOSER_CACHE_DIR=/dev/null composer install --no-dev --working-dir=/var/www/html && rm -rf /var/www/html/vendor/*/*/.git
 USER root
 
 ############### APPLICATION INSTALL/INIT #################
diff --git a/Dockerfile.alpine b/Dockerfile.alpine
index 6d68e7ad9e..5df4b6d06a 100644
--- a/Dockerfile.alpine
+++ b/Dockerfile.alpine
@@ -1,35 +1,35 @@
-FROM alpine:3.18.6
+FROM alpine:3.19
 # Apache + PHP
 RUN  apk add --no-cache \
         apache2 \
-        php81 \
-        php81-common \
-        php81-apache2 \
-        php81-curl \
-        php81-ldap \
-        php81-mysqli \
-        php81-gd \
-        php81-xml \
-        php81-mbstring \
-        php81-zip \
-        php81-ctype \
-        php81-tokenizer \
-        php81-pdo_mysql \
-        php81-openssl \
-        php81-bcmath \
-        php81-phar \
-        php81-json \
-        php81-iconv \
-        php81-fileinfo \
-        php81-simplexml \
-        php81-session \
-        php81-dom \
-        php81-xmlwriter \
-        php81-xmlreader \
-        php81-sodium \
-        php81-redis \
-        php81-pecl-memcached \
-        php81-exif \
+        php82 \
+        php82-common \
+        php82-apache2 \
+        php82-curl \
+        php82-ldap \
+        php82-mysqli \
+        php82-gd \
+        php82-xml \
+        php82-mbstring \
+        php82-zip \
+        php82-ctype \
+        php82-tokenizer \
+        php82-pdo_mysql \
+        php82-openssl \
+        php82-bcmath \
+        php82-phar \
+        php82-json \
+        php82-iconv \
+        php82-fileinfo \
+        php82-simplexml \
+        php82-session \
+        php82-dom \
+        php82-xmlwriter \
+        php82-xmlreader \
+        php82-sodium \
+        php82-redis \
+        php82-pecl-memcached \
+        php82-exif \
         curl \
         wget \
         vim \
@@ -42,7 +42,7 @@ COPY docker/column-statistics.cnf /etc/mysql/conf.d/column-statistics.cnf
 # Where apache's PID lives
 RUN mkdir -p /run/apache2 && chown apache:apache /run/apache2
 
-RUN sed -i 's/variables_order = .*/variables_order = "EGPCS"/' /etc/php81/php.ini
+RUN sed -i 's/variables_order = .*/variables_order = "EGPCS"/' /etc/php82/php.ini
 COPY  docker/000-default-2.4.conf /etc/apache2/conf.d/default.conf
 
 # Enable mod_rewrite
@@ -73,18 +73,18 @@ RUN mkdir -p /var/www/.composer && chown apache /var/www/.composer
 
 # Install dependencies
 USER apache
-RUN COMPOSER_CACHE_DIR=/dev/null composer install --no-dev --working-dir=/var/www/html
+RUN COMPOSER_CACHE_DIR=/dev/null composer install --working-dir=/var/www/html
 
 USER root
 
 VOLUME ["/var/lib/snipeit"]
 
-# Entrypoints
-COPY docker/entrypoint_alpine.sh /entrypoint.sh
-RUN chmod +x /entrypoint.sh
+# Startup script
+COPY docker/startup_alpine.sh /startup.sh
+RUN chmod +x /startup.sh
 
 ENTRYPOINT ["/sbin/tini", "--"]
 
-CMD ["/entrypoint.sh"]
+CMD ["/startup.sh"]
 
 EXPOSE 80
diff --git a/Dockerfile.fpm-alpine b/Dockerfile.fpm-alpine
index 77302524d4..0b89672267 100644
--- a/Dockerfile.fpm-alpine
+++ b/Dockerfile.fpm-alpine
@@ -70,7 +70,7 @@ COPY --from=composer /usr/bin/composer /usr/local/bin
 ARG COMPOSER_ALLOW_SUPERUSER=1
 RUN set -eux; \
 # Download and extract snipeit tarball
-	curl -o snipeit.tar.gz -fL "https://github.com/snipe/snipe-it/archive/v$SNIPEIT_RELEASE.tar.gz"; \
+	curl -o snipeit.tar.gz -fL "https://github.com/grokability/snipe-it/archive/v$SNIPEIT_RELEASE.tar.gz"; \
 	tar -xzf snipeit.tar.gz --strip-components=1 -C /var/www/html/; \
 	rm snipeit.tar.gz; \
 # Install composer php dependencies
@@ -97,7 +97,7 @@ RUN set -eux; \
 VOLUME [ "/var/lib/snipeit" ]
 
 COPY --chown=www-data:www-data docker/docker-secrets.env /var/www/html/.env
-COPY --chmod=655 docker/docker-entrypoint.sh /usr/local/bin/docker-snipeit-entrypoint
+COPY --chmod=655 docker/startup_alpine_fpm.sh /startup.sh
 COPY docker/column-statistics.cnf /etc/mysql/conf.d/column-statistics.cnf
-ENTRYPOINT [ "/usr/local/bin/docker-snipeit-entrypoint" ]
-CMD [ "/usr/local/bin/docker-php-entrypoint", "php-fpm" ]
+ENTRYPOINT [ "/startup.sh" ]
+CMD [ "/startup.sh", "php-fpm" ]
diff --git a/README.md b/README.md
index 6d2c45ac71..062be60453 100644
--- a/README.md
+++ b/README.md
@@ -1,19 +1,34 @@
-![snipe-it-by-grok](https://github.com/snipe/snipe-it/assets/197404/b515673b-c7c8-4d9a-80f5-9fa58829a602)
+![snipe-it-by-grok](https://github.com/grokability/snipe-it/assets/197404/b515673b-c7c8-4d9a-80f5-9fa58829a602)
 
-[![Crowdin](https://d322cqt584bo4o.cloudfront.net/snipe-it/localized.svg)](https://crowdin.com/project/snipe-it) [![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://app.codacy.com/project/badge/Grade/553ce52037fc43ea99149785afcfe641)](https://app.codacy.com/gh/snipe/snipe-it/dashboard?utm_source=gh&utm_medium=referral&utm_content=&utm_campaign=Badge_grade) [![Tests](https://github.com/snipe/snipe-it/actions/workflows/tests.yml/badge.svg)](https://github.com/snipe/snipe-it/actions/workflows/tests.yml)
+[![Crowdin](https://d322cqt584bo4o.cloudfront.net/snipe-it/localized.svg)](https://crowdin.com/project/snipe-it) [![Docker Pulls](https://img.shields.io/docker/pulls/snipe/snipe-it.svg)](https://hub.docker.com/r/snipe/snipe-it/) [![Codacy Badge](https://app.codacy.com/project/badge/Grade/804dd1beb14a41f38810ab77d64fc4fc)](https://app.codacy.com/gh/grokability/snipe-it/dashboard?utm_source=gh&utm_medium=referral&utm_content=&utm_campaign=Badge_grade) [![Tests](https://github.com/grokability/snipe-it/actions/workflows/tests.yml/badge.svg)](https://github.com/grokability/snipe-it/actions/workflows/tests.yml)
 [![All Contributors](https://img.shields.io/badge/all_contributors-331-orange.svg?style=flat-square)](#contributing) [![Discord](https://badgen.net/badge/icon/discord?icon=discord&label)](https://discord.gg/yZFtShAcKk)
 
 ## Snipe-IT - Open Source Asset Management System
 
 This is a FOSS project for asset management in IT Operations. Knowing who has which laptop, when it was purchased in order to depreciate it correctly, handling software licenses, etc.
 
-It is built on [Laravel 10](http://laravel.com).
+It is built on [Laravel 11](http://laravel.com).
 
-Snipe-IT is actively developed and we [release quite frequently](https://github.com/snipe/snipe-it/releases). ([Check out the live demo here](https://snipeitapp.com/demo/).)
+Snipe-IT is actively developed and we [release quite frequently](https://github.com/grokability/snipe-it/releases). ([Check out the live demo here](https://snipeitapp.com/demo/).)
 
 > [!TIP]
 > __This is web-based software__. This means there is no executable file (aka no .exe files), and it must be run on a web server and accessed through a web browser. It runs on any Mac OSX, any flavor of Linux, as well as Windows, and we have a [Docker image](https://snipe-it.readme.io/docs/docker) available if that's what you're into.
 
+-----
+
+### Table of Contents
+* [Installation](#installation)
+* [User's Manual](#users-manual)
+* [Bug Reports & Feature Requests](#bug-reports--feature-requests)
+* [Security](#security)
+* [Upgrading](#upgrading)
+* [Translations!](#translations-)
+* [Libraries, Modules & Related Projects](#libraries-modules--related-projects)
+* [Join the Community!](#join-the-community)
+* [Contributing](#contributing)
+* [Announcement List](#announcement-list)
+
+
 -----
 
 ### Installation
@@ -22,8 +37,6 @@ For instructions on installing and configuring Snipe-IT on your server, check ou
 
 If you're having trouble with the installation, please check the [Common Issues](https://snipe-it.readme.io/docs/common-issues) and [Getting Help](https://snipe-it.readme.io/docs/getting-help) documentation, and search this repository's open *and* closed issues for help.
 
-<!-- [![Deploy](https://www.herokucdn.com/deploy/button.svg)](https://heroku.com/deploy) -->
-
 -----
 ### User's Manual
 For help using Snipe-IT, check out the [user's manual](https://snipe-it.readme.io/docs/overview).
@@ -31,24 +44,25 @@ For help using Snipe-IT, check out the [user's manual](https://snipe-it.readme.i
 -----
 ### Bug Reports & Feature Requests
 
-Feel free to check out the [GitHub Issues for this project](https://github.com/snipe/snipe-it/issues) to open a bug report or see what open issues you can help with. Please search through existing issues (open *and* closed) to see if your question has already been answered before opening a new issue.
+Feel free to check out the [GitHub Issues for this project](https://github.com/grokability/snipe-it/issues) to open a bug report or see what open issues you can help with. Please search through existing issues (open *and* closed) to see if your question has already been answered before opening a new issue.
 
 > [!IMPORTANT]  
 > **PLEASE see the [Getting Help Guidelines](https://snipe-it.readme.io/docs/getting-help) and [Common Issues](https://snipe-it.readme.io/docs/common-issues) before opening a ticket, and be sure to complete all of the questions in the Github Issue template to help us to help you as quickly as possible.**
-> 
+
 -----
 
+### Security
+
+> [!IMPORTANT]
+> **To report a security vulnerability, please email security@snipeitapp.com instead of using the issue tracker.**
+-----
+
+
 ### Upgrading
 
 Please see the [upgrading documentation](https://snipe-it.readme.io/docs/upgrading) for instructions on upgrading Snipe-IT.
 
 ------
-### Announcement List
-
-To be notified of important news (such as new releases, security advisories, etc), [sign up for our list](http://eepurl.com/XyZKz). We'll never sell or give away your info, and we'll only email you when it's important.
-
-------
-
 ### Translations!
 
 Please see the [translations documentation](https://snipe-it.readme.io/docs/translations) for information about available languages and how to add translations to Snipe-IT.
@@ -62,38 +76,72 @@ Since the release of the JSON REST API, several third-party developers have been
 > [!NOTE]  
 > As these were created by third-parties, Snipe-IT cannot provide support for these project, and you should contact the developers directly if you need assistance. Additionally, Snipe-IT makes no guarantees as to the reliability, accuracy or maintainability of these libraries. Use at your own risk. :)
 
-- [Python Module](https://github.com/jbloomer/SnipeIT-PythonAPI) by [@jbloomer](https://github.com/jbloomer)
+#### Libraries & Modules
+
 - [SnipeSharp - .NET module in C#](https://github.com/barrycarey/SnipeSharp) by [@barrycarey](https://github.com/barrycarey)
-- [InQRy -unmaintained-](https://github.com/Microsoft/InQRy) by [@Microsoft](https://github.com/Microsoft)
 - [SnipeitPS](https://github.com/snazy2000/SnipeitPS) by [@snazy2000](https://github.com/snazy2000) - Powershell API Wrapper for Snipe-it
 - [jamf2snipe](https://github.com/grokability/jamf2snipe) - Python script to sync assets between a JAMFPro instance and a Snipe-IT instance
 - [jamf-snipe-rename](https://macblog.org/jamf-snipe-rename/) - Python script to rename computers in Jamf from Snipe-IT
-- [Marksman](https://github.com/Scope-IT/marksman) - A Windows agent for Snipe-IT
 - [Snipe-IT plugin for Jira Service Desk](https://marketplace.atlassian.com/apps/1220964/snipe-it-for-jira)
 - [Python 3 CSV importer](https://github.com/gastamper/snipeit-csvimporter) - allows importing assets into Snipe-IT based on Item Name rather than Asset Tag.
 - [Snipe-IT Kubernetes Helm Chart](https://github.com/t3n/helm-charts/tree/master/snipeit) - For more information, [click here](https://hub.helm.sh/charts/t3n/snipeit).
-- [Snipe-IT Bulk Edit](https://github.com/bricelabelle/snipe-it-bulkedit) - Google Script files to use Google Sheets as a bulk checkout/checkin/edit tool for Snipe-it.
-- [MosyleSnipeSync](https://github.com/RodneyLeeBrands/MosyleSnipeSync) by [@Karpadiem](https://github.com/Karpadiem) - Python script to synchronize information between Mosyle and Snipe-IT
+- [Snipe-IT Bulk Edit](https://github.com/bricelabelle/snipe-it-bulkedit) - Google Script files to use Google Sheets as a bulk checkout/checkin/edit tool for Snipe-IT.
+- [MosyleSnipeSync](https://github.com/RodneyLeeBrands/MosyleSnipeSync) by [@Karpadiem](https://github.com/Karpadiem) - Python script to synchronize information between Mosyle and Snipe-IT.
 - [WWW::SnipeIT](https://github.com/SEDC/perl-www-snipeit) by [@SEDC](https://github.com/SEDC) - perl module for accessing the API
-- [UniFi to Snipe-IT](https://github.com/RodneyLeeBrands/UnifiSnipeSync) by [@karpadiem](https://github.com/karpadiem) - Python script that synchronizes UniFi devices with Snipe-IT.
+- [UniFi to Snipe-IT](https://www.edtechirl.com/p/snipe-it-and-azure-asset-management) originally by [@karpadiem](https://github.com/karpadiem) - Python script that synchronizes UniFi devices with Snipe-IT.
 - [Kandji2Snipe](https://github.com/grokability/kandji2snipe) by [@briangoldstein](https://github.com/briangoldstein) - Python script that synchronizes Kandji with Snipe-IT.
-- [SnipeAgent](https://github.com/ReticentRobot/SnipeAgent) by @ReticentRobot - Windows agent for Snipe-IT
+- [SnipeAgent](https://github.com/ReticentRobot/SnipeAgent) by [@ReticentRobot](https://github.com/ReticentRobot) - Windows agent for Snipe-IT.
+- [Gate Pass Generator](https://github.com/cha7uraAE/snipe-it-gate-pass-system) by [@cha7uraAE](https://github.com/cha7uraAE) - A Streamlit application for generating gate passes based on hardware data from a Snipe-IT API.
+- [InQRy (archived)](https://github.com/Microsoft/InQRy) by [@Microsoft](https://github.com/Microsoft)
+- [Marksman (archived)](https://github.com/Scope-IT/marksman) - A Windows agent for Snipe-IT
+- [Python Module (archived)](https://github.com/jbloomer/SnipeIT-PythonAPI) by [@jbloomer](https://github.com/jbloomer)
+
+We also have a handful of [Google Apps scripts](https://github.com/grokability/google-apps-scripts-for-snipe-it) to help with various tasks.
+
+#### Mobile Apps
+
+We're currently working on our own mobile app, but in the meantime, check out these third-party apps that work with Snipe-IT:
+
+- [SnipeMate](https://snipemate.app/) (iOS, Google Play, Huawei AppGallery) by Mars Technology
+- [Snipe-Scan](https://apps.apple.com/do/app/snipe-scan/id6744179400?uo=2) (iOS) by Nicolas Maton
+- [Snipe-IT Assets Management](https://play.google.com/store/apps/details?id=com.diegogarciadev.assetsmanager.snipeit&hl=en&pli=1) (Google Play) by DiegoGarciaDEV
+- [AssetX](https://apps.apple.com/my/app/assetx-for-snipe-it/id6741996196?uo=2) (iOS) for Snipe-IT by Rishi Gupta
+
+-----
+
+### Join the Community!
+
+- **[Join our Discord](https://discord.gg/yZFtShAcKk)!** It’s full of great people. We even wrote about it [here](https://grokstar.dev/culture/2024/06/the-unlikely-rise-of-discord-as-a-support-channel/)!
+- **Follow us on Bluesky** at [@snipeitapp.com](https://bsky.app/profile/snipeitapp.com)
+- **Follow us on Mastodon** at [hachyderm.io/@grokability](https://hachyderm.io/@grokability)
+- **Follow our blog** at [Grokstar.Dev](https://grokstar.dev)
+- **Subscribe here** on Github for notifications about new releases. (We recommend selecting "Releases" only for most users - this repo can get noisy.)
 
 -----
 
 ### Contributing
 
-Please see the documentation on [contributing and developing for Snipe-IT](https://snipe-it.readme.io/docs/contributing-overview).
+**Please refrain from submitting issues or pull requests generated by fully-automated tools. Maintainers reserve the right, at their sole discretion, to close such submissions and to block any account responsible for them.** 
 
-Please note that this project is released with a [Contributor Code of Conduct](CODE_OF_CONDUCT.md). By participating in this project you agree to abide by its terms.
+Contributions should follow from a human-to-human discussion in the form of an issue for the best chances of being merged into the core project. (Sometimes we might already be working on that feature, sometimes we've decided against )
+
+Please see the complete documentation on [contributing and developing for Snipe-IT](https://snipe-it.readme.io/docs/contributing-overview).
+
+This project is released with a [Contributor Code of Conduct](CODE_OF_CONDUCT.md). By participating in this project you agree to abide by its terms.
 
 The ERD is available [online here](https://drawsql.app/templates/snipe-it).
 
-[Here is a list](CONTRIBUTORS.md) of the wonderful people that have contributed to the Snipe-IT.
+Be sure to check out all of the [amazing people](CONTRIBUTORS.md) that have contributed to Snipe-IT over the years!
 
 -----
 
-### Security
+### Star History
 
-> [!IMPORTANT]
-> **To report a security vulnerability, please email security@snipeitapp.com instead of using the issue tracker.**
+[![Star History Chart](https://api.star-history.com/svg?repos=grokability/snipe-it&type=Date)](https://www.star-history.com/#grokability/snipe-it&Date)
+
+------
+### Announcement List
+
+To be notified of important news (such as new releases, security advisories, etc), [sign up for our list](http://eepurl.com/XyZKz). We'll never sell or give away your info, and we'll only email you when it's important. 
+
+We also usually make smaller announcements on our social accounts, our Discord, and our blog, so be sure to subscribe to those if you're looking for more granular announcements.
diff --git a/SECURITY.md b/SECURITY.md
index dcbfd3e6f0..e052527bd1 100644
--- a/SECURITY.md
+++ b/SECURITY.md
@@ -10,10 +10,13 @@ however there are times when library dependencies and/or PHP/MySQL dependencies
 make it impossible to backport security fixes on older versions. 
 
 | Version | Supported          |
-| ------- | ------------------ |
-| 5.1.x   | :white_check_mark: |
+|---------| ------------------ |
+| 8.x     | :white_check_mark: |
+| 7.x     | :white_check_mark: |
+| 6.x     | :x:                |
+| 5.1.x   | :x:                |
 | 5.0.x   | :x:                |
-| 4.0.x   | :white_check_mark: |
+| 4.0.x   | :x:                |
 | < 4.0   | :x:                |
 
 ## Reporting a Vulnerability
diff --git a/TESTING.md b/TESTING.md
index 92f3184eec..002cf27d3a 100644
--- a/TESTING.md
+++ b/TESTING.md
@@ -20,7 +20,7 @@ APP_DEBUG=true
 APP_KEY=base64:glJpcM7BYwWiBggp3SQ/+NlRkqsBQMaGEOjemXqJzOU=
 APP_URL=http://localhost:8000
 APP_TIMEZONE='UTC'
-APP_LOCALE=en
+APP_LOCALE=en-US
 
 # --------------------------------------------
 # REQUIRED: DATABASE SETTINGS
diff --git a/Vagrantfile b/Vagrantfile
index 27efef7b1a..7c12ed642b 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -1,7 +1,7 @@
 # -*- mode: ruby -*-
 # vi: set ft=ruby :
 
-SNIPEIT_SH_URL= "https://raw.githubusercontent.com/snipe/snipe-it/master/snipeit.sh"
+SNIPEIT_SH_URL= "https://raw.githubusercontent.com/grokability/snipe-it/master/snipeit.sh"
 NETWORK_BRIDGE= "en0: Wi-Fi (AirPort)"
 
 Vagrant.configure("2") do |config|
diff --git a/app.json b/app.json
index 0bf523f5e4..24d874114a 100644
--- a/app.json
+++ b/app.json
@@ -6,7 +6,7 @@
       "it asset"
     ],
     "website": "https://snipeitapp.com/",
-    "repository": "https://github.com/snipe/snipe-it",
+    "repository": "https://github.com/grokability/snipe-it",
     "logo": "https://pbs.twimg.com/profile_images/976748875733020672/K-HnZCCK_400x400.jpg",
     "success_url": "/setup",
     "env": {
diff --git a/app/Actions/CheckoutRequests/CancelCheckoutRequestAction.php b/app/Actions/CheckoutRequests/CancelCheckoutRequestAction.php
new file mode 100644
index 0000000000..2d6dd68a08
--- /dev/null
+++ b/app/Actions/CheckoutRequests/CancelCheckoutRequestAction.php
@@ -0,0 +1,48 @@
+<?php
+
+namespace App\Actions\CheckoutRequests;
+
+use App\Models\Actionlog;
+use App\Models\Asset;
+use App\Models\Company;
+use App\Models\Setting;
+use App\Models\User;
+use App\Notifications\RequestAssetCancelation;
+use Illuminate\Auth\Access\AuthorizationException;
+
+class CancelCheckoutRequestAction
+{
+    public static function run(Asset $asset, User $user)
+    {
+        if (!Company::isCurrentUserHasAccess($asset)) {
+            throw new AuthorizationException();
+        }
+
+        $asset->cancelRequest();
+
+        $asset->decrement('requests_counter', 1);
+
+        $data['item'] = $asset;
+        $data['target'] = $user;
+        $data['item_quantity'] = 1;
+        $settings = Setting::getSettings();
+
+        $logaction = new Actionlog();
+        $logaction->item_id = $data['asset_id'] = $asset->id;
+        $logaction->item_type = $data['item_type'] = Asset::class;
+        $logaction->created_at = $data['requested_date'] = date('Y-m-d H:i:s');
+        $logaction->target_id = $data['user_id'] = auth()->id();
+        $logaction->target_type = User::class;
+        $logaction->location_id = $user->location_id ?? null;
+        $logaction->logaction('request canceled');
+
+        try {
+            $settings->notify(new RequestAssetCancelation($data));
+        } catch (\Exception $e) {
+            \Log::warning($e);
+        }
+
+        return true;
+    }
+
+}
\ No newline at end of file
diff --git a/app/Actions/CheckoutRequests/CreateCheckoutRequestAction.php b/app/Actions/CheckoutRequests/CreateCheckoutRequestAction.php
new file mode 100644
index 0000000000..6870cfba2d
--- /dev/null
+++ b/app/Actions/CheckoutRequests/CreateCheckoutRequestAction.php
@@ -0,0 +1,54 @@
+<?php
+
+namespace App\Actions\CheckoutRequests;
+
+use App\Exceptions\AssetNotRequestable;
+use App\Models\Actionlog;
+use App\Models\Asset;
+use App\Models\Company;
+use App\Models\Setting;
+use App\Models\User;
+use App\Notifications\RequestAssetNotification;
+use Illuminate\Auth\Access\AuthorizationException;
+use Log;
+
+class CreateCheckoutRequestAction
+{
+    /**
+     * @throws AssetNotRequestable
+     * @throws AuthorizationException
+     */
+    public static function run(Asset $asset, User $user): string
+    {
+        if (is_null(Asset::RequestableAssets()->find($asset->id))) {
+            throw new AssetNotRequestable($asset);
+        }
+        if (!Company::isCurrentUserHasAccess($asset)) {
+            throw new AuthorizationException();
+        }
+
+        $data['item'] = $asset;
+        $data['target'] = $user;
+        $data['item_quantity'] = 1;
+        $settings = Setting::getSettings();
+
+        $logaction = new Actionlog();
+        $logaction->item_id = $data['asset_id'] = $asset->id;
+        $logaction->item_type = $data['item_type'] = Asset::class;
+        $logaction->created_at = $data['requested_date'] = date('Y-m-d H:i:s');
+        $logaction->target_id = $data['user_id'] = auth()->id();
+        $logaction->target_type = User::class;
+        $logaction->location_id = $user->location_id ?? null;
+        $logaction->logaction('requested');
+
+        $asset->request();
+        $asset->increment('requests_counter', 1);
+        try {
+            $settings->notify(new RequestAssetNotification($data));
+        } catch (\Exception $e) {
+            Log::warning($e);
+        }
+
+        return true;
+    }
+}
\ No newline at end of file
diff --git a/app/Console/Commands/DisableSAML.php b/app/Console/Commands/DisableSAML.php
new file mode 100644
index 0000000000..795e65f1c7
--- /dev/null
+++ b/app/Console/Commands/DisableSAML.php
@@ -0,0 +1,53 @@
+<?php
+
+namespace App\Console\Commands;
+
+use App\Models\Setting;
+use Illuminate\Console\Command;
+
+class DisableSAML extends Command
+{
+    /**
+     * The name and signature of the console command.
+     *
+     * @var string
+     */
+    protected $signature = 'snipeit:saml-disable';
+
+    /**
+     * The console command description.
+     *
+     * @var string
+     */
+    protected $description = 'This is a rescue command that can be used to turn off SAML settings in the event that you managed to lock yourself out using bad SAML settings.';
+
+    /**
+     * Create a new command instance.
+     *
+     * @return void
+     */
+    public function __construct()
+    {
+        parent::__construct();
+    }
+
+    /**
+     * Execute the console command.
+     *
+     * @return mixed
+     */
+    public function handle()
+    {
+        if ($this->confirm("\n****************************************************\nThis will disable SAML support. You will not be able \nto login with an account that does not exist \nlocally in the Snipe-IT local database. \n****************************************************\n\nDo you wish to continue? [y|N]")) {
+            $setting = Setting::getSettings();
+            $setting->saml_enabled = 0;
+            if ($setting->save()) {
+                $this->info('SAML has been set to disabled.');
+            } else {
+                $this->info('Unable to disable SAML.');
+            }
+        } else {
+            $this->info('Canceled. No actions taken.');
+        }
+    }
+}
diff --git a/app/Console/Commands/FixBulkAccessoryCheckinActionLogEntries.php b/app/Console/Commands/FixBulkAccessoryCheckinActionLogEntries.php
new file mode 100644
index 0000000000..694d8d3b30
--- /dev/null
+++ b/app/Console/Commands/FixBulkAccessoryCheckinActionLogEntries.php
@@ -0,0 +1,151 @@
+<?php
+
+namespace App\Console\Commands;
+
+use App\Models\Accessory;
+use App\Models\Actionlog;
+use Illuminate\Console\Command;
+use Illuminate\Database\Eloquent\Model;
+
+class FixBulkAccessoryCheckinActionLogEntries extends Command
+{
+    /**
+     * The name and signature of the console command.
+     *
+     * @var string
+     */
+    protected $signature = 'snipeit:fix-bulk-accessory-action-log-entries {--dry-run : Run the sync process but don\'t update the database} {--skip-backup : Skip pre-execution backup}';
+
+    /**
+     * The console command description.
+     *
+     * @var string
+     */
+    protected $description = 'This script attempts to fix timestamps and missing created_by values for bulk checkin entries in the log table';
+
+    private bool $dryrun = false;
+    private bool $skipBackup = false;
+
+    /**
+     * Execute the console command.
+     */
+    public function handle()
+    {
+        $this->skipBackup = $this->option('skip-backup');
+        $this->dryrun = $this->option('dry-run');
+
+        if ($this->dryrun) {
+            $this->info('This is a DRY RUN - no changes will be saved.');
+            $this->newLine();
+        }
+
+        $logs = Actionlog::query()
+            // only look for accessory checkin logs
+            ->where('item_type', Accessory::class)
+            // that were part of a bulk checkin
+            ->where('note', 'Bulk checkin items')
+            // logs that were improperly timestamped should have created_at in the 1970s
+            ->whereYear('created_at', '1970')
+            ->get();
+
+        if ($logs->isEmpty()) {
+            $this->info('No logs found with incorrect timestamps.');
+            return 0;
+        }
+
+        $this->info('Found ' . $logs->count() . ' logs with incorrect timestamps:');
+
+        $this->table(
+            ['ID', 'Created By', 'Created At', 'Updated At'],
+            $logs->map(function ($log) {
+                return [
+                    $log->id,
+                    $log->created_by,
+                    $log->created_at,
+                    $log->updated_at,
+                ];
+            })
+        );
+
+        if (!$this->dryrun && !$this->confirm('Update these logs?')) {
+            return 0;
+        }
+
+        if (!$this->dryrun && !$this->skipBackup) {
+            $this->info('Backing up the database before making changes...');
+            $this->call('snipeit:backup');
+        }
+
+        if ($this->dryrun) {
+            $this->newLine();
+            $this->info('DRY RUN. NOT ACTUALLY UPDATING LOGS.');
+        }
+
+        foreach ($logs as $log) {
+            $this->newLine();
+            $this->info('Processing log id:' . $log->id);
+
+            // created_by was not being set for accessory bulk checkins
+            // so let's see if there was another bulk checkin log
+            // with the same timestamp and a created_by value we can use.
+            if (is_null($log->created_by)) {
+                $createdByFromSimilarLog = $this->getCreatedByAttributeFromSimilarLog($log);
+
+                if ($createdByFromSimilarLog) {
+                    $this->line(vsprintf('Updating log id:%s created_by to %s', [$log->id, $createdByFromSimilarLog]));
+                    $log->created_by = $createdByFromSimilarLog;
+                } else {
+                    $this->warn(vsprintf('No created_by found for log id:%s', [$log->id]));
+                    $this->warn('Skipping updating this log since no similar log was found to update created_by from.');
+
+                    // If we can't find a similar log then let's skip updating it
+                    continue;
+                }
+            }
+
+            $this->line(vsprintf('Updating log id:%s from %s to %s', [$log->id, $log->created_at, $log->updated_at]));
+            $log->created_at = $log->updated_at;
+
+            if (!$this->dryrun) {
+                Model::withoutTimestamps(function () use ($log) {
+                    $log->saveQuietly();
+                });
+            }
+        }
+
+        $this->newLine();
+
+        if ($this->dryrun) {
+            $this->info('DRY RUN. NO CHANGES WERE ACTUALLY MADE.');
+        }
+
+        return 0;
+    }
+
+    /**
+     * Hopefully the bulk checkin included other items like assets or licenses
+     * so we can use one of those logs to get the correct created_by value.
+     *
+     * This method attempts to find a bulk check in log that was
+     * created at the same time as the log passed in.
+     */
+    private function getCreatedByAttributeFromSimilarLog(Actionlog $log): null|int
+    {
+        $similarLog = Actionlog::query()
+            ->whereNotNull('created_by')
+            ->where([
+                'action_type' => 'checkin from',
+                'note' => 'Bulk checkin items',
+                'target_id' => $log->target_id,
+                'target_type' => $log->target_type,
+                'created_at' => $log->updated_at,
+            ])
+            ->first();
+
+        if ($similarLog) {
+            return $similarLog->created_by;
+        }
+
+        return null;
+    }
+}
diff --git a/app/Console/Commands/FixUpAssignedTypeWithoutAssignedTo.php b/app/Console/Commands/FixUpAssignedTypeWithoutAssignedTo.php
new file mode 100644
index 0000000000..f368929f16
--- /dev/null
+++ b/app/Console/Commands/FixUpAssignedTypeWithoutAssignedTo.php
@@ -0,0 +1,32 @@
+<?php
+
+namespace App\Console\Commands;
+
+use Illuminate\Console\Command;
+use Illuminate\Support\Facades\DB;
+
+class FixUpAssignedTypeWithoutAssignedTo extends Command
+{
+    /**
+     * The name and signature of the console command.
+     *
+     * @var string
+     */
+    protected $signature = 'snipeit:assigned-type-fixup';
+
+    /**
+     * The console command description.
+     *
+     * @var string
+     */
+    protected $description = 'Fixes up assets that have an assigned_type but no assigned_to';
+
+    /**
+     * Execute the console command.
+     */
+    public function handle()
+    {
+        DB::table('assets')->whereNotNull('assigned_type')->whereNull('assigned_to')->update(['assigned_type' => null]);
+        $this->info("Assets with an assigned_type but no assigned_to are fixed");
+    }
+}
diff --git a/app/Console/Commands/FixupAssignedToWithoutAssignedType.php b/app/Console/Commands/FixupAssignedToWithoutAssignedType.php
new file mode 100644
index 0000000000..ea3a55439a
--- /dev/null
+++ b/app/Console/Commands/FixupAssignedToWithoutAssignedType.php
@@ -0,0 +1,66 @@
+<?php
+
+namespace App\Console\Commands;
+
+use App\Models\Asset;
+use Illuminate\Console\Command;
+
+class FixupAssignedToWithoutAssignedType extends Command
+{
+    /**
+     * The name and signature of the console command.
+     *
+     * @var string
+     */
+    protected $signature = 'snipeit:assigned-to-fixup
+                            {--debug : Display debugging output}';
+
+    /**
+     * The console command description.
+     *
+     * @var string
+     */
+    protected $description = 'Fixes up assets that have an assigned_to but no assigned_type';
+
+    /**
+     * Execute the console command.
+     */
+    public function handle()
+    {
+        $assets = Asset::whereNull("assigned_type")->whereNotNull("assigned_to")->withTrashed();
+        $this->withProgressBar($assets->get(), function (Asset $asset) {
+            //now check each action log, from the most recent backwards, to find the last checkin or checkout
+            foreach($asset->log()->orderBy("id","desc")->get() as $action_log) {
+                if($this->option("debug")) {
+                    $this->info("Asset id: " . $asset->id . " action log, action type is: " . $action_log->action_type);
+                }
+                switch($action_log->action_type) {
+                    case 'checkin from':
+                        if($this->option("debug")) {
+                            $this->info("Doing a checkin for ".$asset->id);
+                        }
+                        $asset->assigned_to = null;
+                        // if you have a required custom field, we still want to save, and we *don't* want an action_log
+                        $asset->saveQuietly();
+                        return;
+
+                    case 'checkout':
+                        if($this->option("debug")) {
+                            $this->info("Doing a checkout for " . $asset->id . " picking target type: " . $action_log->target_type);
+                        }
+                        if($asset->assigned_to != $action_log->target_id) {
+                            $this->error("Asset's assigned_to does *NOT* match Action Log's target_id. \$asset->assigned_to=".$asset->assigned_to." vs. \$action_log->target_id=".$action_log->target_id);
+                            //FIXME - do we abort here? Do we try to keep looking? I don't know, this means your data is *really* messed up...
+                        }
+                        $asset->assigned_type = $action_log->target_type;
+                        $asset->saveQuietly(); // see above
+                        return;
+                }
+            }
+            $asset->assigned_to = null; //asset was never checked in or out in its lifetime - it stays 'checked in'
+            $asset->saveQuietly(); //see above
+        });
+        $this->newLine();
+        $this->info("Assets assigned_type are fixed");
+    }
+}
diff --git a/app/Console/Commands/GeneratePersonalAccessToken.php b/app/Console/Commands/GeneratePersonalAccessToken.php
index c5f531213c..63b246978e 100644
--- a/app/Console/Commands/GeneratePersonalAccessToken.php
+++ b/app/Console/Commands/GeneratePersonalAccessToken.php
@@ -2,11 +2,9 @@
 
 namespace App\Console\Commands;
 
-use App\Helpers\Helper;
 use Illuminate\Console\Command;
 use App\Models\User;
 use Laravel\Passport\TokenRepository;
-use Illuminate\Contracts\Validation\Factory as ValidationFactory;
 use Illuminate\Support\Facades\DB;
 
 class GeneratePersonalAccessToken extends Command
@@ -43,9 +41,8 @@ class GeneratePersonalAccessToken extends Command
      *
      * @return void
      */
-    public function __construct(TokenRepository $tokenRepository, ValidationFactory $validation)
+    public function __construct(TokenRepository $tokenRepository)
     {
-        $this->validation = $validation;
         $this->tokenRepository = $tokenRepository;
         parent::__construct();
     }
@@ -76,7 +73,7 @@ class GeneratePersonalAccessToken extends Command
 
             } else {
 
-                $this->warn('Your API Token has been created. Be sure to copy this token now, as it will not be accessible again.');
+                $this->warn('Your API Token has been created. Be sure to copy this token now, as it WILL NOT be accessible again.');
 
                 if ($token = DB::table('oauth_access_tokens')->where('user_id', '=', $user->id)->where('name','=',$accessTokenName)->orderBy('created_at', 'desc')->first()) {
                     $this->info('API Token ID: '.$token->id);
diff --git a/app/Console/Commands/LdapSync.php b/app/Console/Commands/LdapSync.php
old mode 100755
new mode 100644
index 1856bf10fc..f90aeafd8d
--- a/app/Console/Commands/LdapSync.php
+++ b/app/Console/Commands/LdapSync.php
@@ -2,6 +2,7 @@
 
 namespace App\Console\Commands;
 
+use App\Models\Asset;
 use App\Models\Department;
 use App\Models\Group;
 use Illuminate\Console\Command;
@@ -53,18 +54,22 @@ class LdapSync extends Command
 
         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;
-        $ldap_result_active_flag = Setting::getSettings()->ldap_active_flag;
-        $ldap_result_emp_num = Setting::getSettings()->ldap_emp_num;
-        $ldap_result_email = Setting::getSettings()->ldap_email;
-        $ldap_result_phone = Setting::getSettings()->ldap_phone_field;
-        $ldap_result_jobtitle = Setting::getSettings()->ldap_jobtitle;
-        $ldap_result_country = Setting::getSettings()->ldap_country;
-        $ldap_result_location = Setting::getSettings()->ldap_location;
-        $ldap_result_dept = Setting::getSettings()->ldap_dept;
-        $ldap_result_manager = Setting::getSettings()->ldap_manager;
+
+        $ldap_map = [
+            "username" => Setting::getSettings()->ldap_username_field,
+            "last_name" => Setting::getSettings()->ldap_lname_field,
+            "first_name" => Setting::getSettings()->ldap_fname_field,
+            "active_flag" => Setting::getSettings()->ldap_active_flag,
+            "emp_num" => Setting::getSettings()->ldap_emp_num,
+            "email" => Setting::getSettings()->ldap_email,
+            "phone" => Setting::getSettings()->ldap_phone_field,
+            "jobtitle" => Setting::getSettings()->ldap_jobtitle,
+            "country" => Setting::getSettings()->ldap_country,
+            "location" => Setting::getSettings()->ldap_location,
+            "dept" => Setting::getSettings()->ldap_dept,
+            "manager" => Setting::getSettings()->ldap_manager,
+        ];
+
         $ldap_default_group = Setting::getSettings()->ldap_default_group;
         $search_base = Setting::getSettings()->ldap_base_dn;
 
@@ -107,14 +112,25 @@ class LdapSync extends Command
             }
 
             /**
-             * If a filter has been specified, use that
+             * If a filter has been specified, use that, otherwise default to null
              */
             if ($this->option('filter') != '') {
-                $results = Ldap::findLdapUsers($search_base, -1, $this->option('filter'));
+                $filter = $this->option('filter');
             } else {
-                $results = Ldap::findLdapUsers($search_base);
+                $filter = null;
             }
-            
+
+            /**
+             * We only need to request the LDAP attributes that we process
+             */
+            $attributes = array_values(array_filter($ldap_map));
+
+            if (Setting::getSettings()->is_ad === 1 && is_null($ldap_map['active_flag'])) {
+                $attributes[] = 'useraccountcontrol';
+            }
+
+            $results = Ldap::findLdapUsers($search_base, -1, $filter, $attributes);
+
         } catch (\Exception $e) {
             if ($this->option('json_summary')) {
                 $json_summary = ['error' => true, 'error_message' => $e->getMessage(), 'summary' => []];
@@ -126,23 +142,24 @@ class LdapSync extends Command
         }
 
         /* Determine which location to assign users to by default. */
-        $location = null; // TODO - this would be better called "$default_location", which is more explicit about its purpose
+        $default_location = null;
         if ($this->option('location') != '') {
-            if ($location = Location::where('name', '=', $this->option('location'))->first()) {
+            if ($default_location = Location::where('name', '=', $this->option('location'))->first()) {
                 Log::debug('Location name ' . $this->option('location') . ' passed');
-                Log::debug('Importing to ' . $location->name . ' (' . $location->id . ')');
+                Log::debug('Importing to '.$default_location->name.' ('.$default_location->id.')');
             }
 
         } elseif ($this->option('location_id')) {
+            //TODO - figure out how or why this is an array?
             foreach($this->option('location_id') as $location_id) {
-                if ($location = Location::where('id', '=', $location_id)->first()) {
+                if ($default_location = Location::where('id', '=', $location_id)->first()) {
                     Log::debug('Location ID ' . $location_id . ' passed');
-                    Log::debug('Importing to ' . $location->name . ' (' . $location->id . ')');
+                    Log::debug('Importing to '.$default_location->name.' ('.$default_location->id.')');
                 }
 
             }
         }
-        if (! isset($location)) {
+        if (!isset($default_location)) {
             Log::debug('That location is invalid or a location was not provided, so no location will be assigned by default.');
         }
 
@@ -183,17 +200,17 @@ class LdapSync extends Command
                 }
                 $usernames = [];
                 for ($i = 0; $i < $location_users['count']; $i++) {
-                    if (array_key_exists($ldap_result_username, $location_users[$i])) {
+                    if (array_key_exists($ldap_map["username"], $location_users[$i])) {
                         $location_users[$i]['ldap_location_override'] = true;
                         $location_users[$i]['location_id'] = $ldap_loc['id'];
-                        $usernames[] = $location_users[$i][$ldap_result_username][0];
+                        $usernames[] = $location_users[$i][$ldap_map["username"]][0];
                     }
                 }
 
                 // Delete located users from the general group.
                 foreach ($results as $key => $generic_entry) {
-                    if ((is_array($generic_entry)) && (array_key_exists($ldap_result_username, $generic_entry))) {
-                        if (in_array($generic_entry[$ldap_result_username][0], $usernames)) {
+                    if ((is_array($generic_entry)) && (array_key_exists($ldap_map["username"], $generic_entry))) {
+                        if (in_array($generic_entry[$ldap_map["username"]][0], $usernames)) {
                             unset($results[$key]);
                         }
                     }
@@ -218,76 +235,78 @@ class LdapSync extends Command
 
 
         for ($i = 0; $i < $results['count']; $i++) {
-                $item = [];
-                $item['username'] = $results[$i][$ldap_result_username][0] ?? '';
-                $item['employee_number'] = $results[$i][$ldap_result_emp_num][0] ?? '';
-                $item['lastname'] = $results[$i][$ldap_result_last_name][0] ?? '';
-                $item['firstname'] = $results[$i][$ldap_result_first_name][0] ?? '';
-                $item['email'] = $results[$i][$ldap_result_email][0] ?? '';
-                $item['ldap_location_override'] = $results[$i]['ldap_location_override'] ?? '';
-                $item['location_id'] = $results[$i]['location_id'] ?? '';
-                $item['telephone'] = $results[$i][$ldap_result_phone][0] ?? '';
-                $item['jobtitle'] = $results[$i][$ldap_result_jobtitle][0] ?? '';
-                $item['country'] = $results[$i][$ldap_result_country][0] ?? '';
-                $item['department'] = $results[$i][$ldap_result_dept][0] ?? '';
-                $item['manager'] = $results[$i][$ldap_result_manager][0] ?? '';
-                $item['location'] = $results[$i][$ldap_result_location][0] ?? '';
+            $item = [];
+            $item['username'] = $results[$i][$ldap_map["username"]][0] ?? '';
+            $item['employee_number'] = $results[$i][$ldap_map["emp_num"]][0] ?? '';
+            $item['lastname'] = $results[$i][$ldap_map["last_name"]][0] ?? '';
+            $item['firstname'] = $results[$i][$ldap_map["first_name"]][0] ?? '';
+            $item['email'] = $results[$i][$ldap_map["email"]][0] ?? '';
+            $item['ldap_location_override'] = $results[$i]['ldap_location_override'] ?? '';
+            $item['location_id'] = $results[$i]['location_id'] ?? '';
+            $item['telephone'] = $results[$i][$ldap_map["phone"]][0] ?? '';
+            $item['jobtitle'] = $results[$i][$ldap_map["jobtitle"]][0] ?? '';
+            $item['country'] = $results[$i][$ldap_map["country"]][0] ?? '';
+            $item['department'] = $results[$i][$ldap_map["dept"]][0] ?? '';
+            $item['manager'] = $results[$i][$ldap_map["manager"]][0] ?? '';
+            $item['location'] = $results[$i][$ldap_map["location"]][0] ?? '';
+            $location = $default_location; //initially, set '$location' to the default_location (which may just be `null`)
 
-                // ONLY if you are using the "ldap_location" option *AND* you have an actual result
-                if ($ldap_result_location && $item['location']) {
-                        $location = Location::firstOrCreate([
-                                'name' => $item['location'],
-                        ]);
-                }
-                $department = Department::firstOrCreate([
-                    'name' => $item['department'],
+            // ONLY if you are using the "ldap_location" option *AND* you have an actual result
+            if ($ldap_map["location"] && $item['location']) {
+                $location = Location::firstOrCreate([
+                    'name' => $item['location'],
                 ]);
+            }
+            $department = Department::firstOrCreate([
+                'name' => $item['department'],
+            ]);
 
-                $user = User::where('username', $item['username'])->first();
-                if ($user) {
-                    // Updating an existing user.
-                    $item['createorupdate'] = 'updated';
-                } else {
-                    // Creating a new user.
-                    $user = new User;
-                    $user->password = $user->noPassword();
-                    $user->activated = 1; // newly created users can log in by default, unless AD's UAC is in use, or an active flag is set (below)
-                    $item['createorupdate'] = 'created';
-                }
+            $user = User::where('username', $item['username'])->first();
+            if ($user) {
+                // Updating an existing user.
+                $item['createorupdate'] = 'updated';
+            } else {
+                // Creating a new user.
+                $user = new User;
+                $user->password = $user->noPassword();
+                $user->locale = app()->getLocale();
+                $user->activated = 1; // newly created users can log in by default, unless AD's UAC is in use, or an active flag is set (below)
+                $item['createorupdate'] = 'created';
+            }
 
             //If a sync option is not filled in on the LDAP settings don't populate the user field
-            if($ldap_result_username  != null){
+            if($ldap_map["username"]  != null){
                 $user->username = $item['username'];
             }
-            if($ldap_result_last_name != null){
+            if($ldap_map["last_name"] != null){
                 $user->last_name = $item['lastname'];
             }
-            if($ldap_result_first_name != null){
+            if($ldap_map["first_name"] != null){
                 $user->first_name = $item['firstname'];
             }
-            if($ldap_result_emp_num  != null){
+            if($ldap_map["emp_num"]  != null){
                 $user->employee_num = e($item['employee_number']);
             }
-            if($ldap_result_email != null){
+            if($ldap_map["email"] != null){
                 $user->email = $item['email'];
             }
-            if($ldap_result_phone != null){
+            if($ldap_map["phone"] != null){
                 $user->phone = $item['telephone'];
             }
-            if($ldap_result_jobtitle != null){
+            if($ldap_map["jobtitle"] != null){
                 $user->jobtitle = $item['jobtitle'];
             }
-            if($ldap_result_country != null){
+            if($ldap_map["country"] != null){
                 $user->country = $item['country'];
             }
-            if($ldap_result_dept  != null){
+            if($ldap_map["dept"]  != null){
                 $user->department_id = $department->id;
             }
-            if($ldap_result_location != null){
-                $user->location_id = $location ? $location->id : null;
+            if($ldap_map["location"] != null){
+                $user->location_id = $location?->id;
             }
 
-            if($ldap_result_manager != null){
+            if($ldap_map["manager"] != null){
                 if($item['manager'] != null) {
                     // Check Cache first
                     if (isset($manager_cache[$item['manager']])) {
@@ -304,63 +323,76 @@ class LdapSync extends Command
                             $ldap_manager = [
                                 "count" => 1,
                                 0 => [
-                                    $ldap_result_username => [$item['manager']]
+                                    $ldap_map["username"] => [$item['manager']]
                                 ]
                             ];
                         }
-
+                        
+                        $add_manager_to_cache = true;
                         if ($ldap_manager["count"] > 0) {
+                            try {
+                                // Get the Manager's username
+                                // PHP LDAP returns every LDAP attribute as an array, and 90% of the time it's an array of just one item. But, hey, it's an array.
+                                $ldapManagerUsername = $ldap_manager[0][$ldap_map["username"]][0];
 
-                            // Get the Manager's username
-                            // PHP LDAP returns every LDAP attribute as an array, and 90% of the time it's an array of just one item. But, hey, it's an array.
-                            $ldapManagerUsername = $ldap_manager[0][$ldap_result_username][0];
+                                // Get User from Manager username.
+                                $ldap_manager = User::where('username', $ldapManagerUsername)->first();
 
-                            // Get User from Manager username.
-                            $ldap_manager = User::where('username', $ldapManagerUsername)->first();
-
-                            if ($ldap_manager && isset($ldap_manager->id)) {
-                                // Link user to manager id.
-                                $user->manager_id = $ldap_manager->id;
+                                if ($ldap_manager && isset($ldap_manager->id)) {
+                                    // Link user to manager id.
+                                    $user->manager_id = $ldap_manager->id;
+                                }
+                            } catch (\Exception $e) {
+                                $add_manager_to_cache = false;
+                                \Log::warning('Handling ldap manager ' . $item['manager'] . ' caused an exception: ' . $e->getMessage() . '. Continuing synchronization.');
                             }
                         }
-                        $manager_cache[$item['manager']] = $ldap_manager && isset($ldap_manager->id)  ? $ldap_manager->id : null; // Store results in cache, even if 'failed'
+                        if ($add_manager_to_cache) {
+                            $manager_cache[$item['manager']] = $ldap_manager && isset($ldap_manager->id)  ? $ldap_manager->id : null; // Store results in cache, even if 'failed'
+                        }
 
                     }
                 }
             }
 
-                // Sync activated state for Active Directory.
-                if ( !empty($ldap_result_active_flag)) { // IF we have an 'active' flag set....
-                    // ....then *most* things that are truthy will activate the user. Anything falsey will deactivate them.
-                    // (Specifically, we don't handle a value of '0.0' correctly)
-                    $raw_value = @$results[$i][$ldap_result_active_flag][0];
-                    $filter_var = filter_var($raw_value, FILTER_VALIDATE_BOOLEAN, FILTER_NULL_ON_FAILURE);
-                    $boolean_cast = (bool)$raw_value;
-
+            // Sync activated state for Active Directory.
+            if (!empty($ldap_map["active_flag"])) { // IF we have an 'active' flag set....
+                // ....then *most* things that are truthy will activate the user. Anything falsey will deactivate them.
+                // (Specifically, we don't handle a value of '0.0' correctly)
+                $raw_value = @$results[$i][$ldap_map["active_flag"]][0];
+                $filter_var = filter_var($raw_value, FILTER_VALIDATE_BOOLEAN, FILTER_NULL_ON_FAILURE);
+                
+                $boolean_cast = (bool) $raw_value;
+                
+                if (Setting::getSettings()->ldap_invert_active_flag === 1) {
+                    // Because ldap_active_flag is set, if filter_var is true or boolean_cast is true, then user is suspended
+                    $user->activated = !($filter_var ?? $boolean_cast);
+                }else{
                     $user->activated = $filter_var ?? $boolean_cast; // if filter_var() was true or false, use that. If it's null, use the $boolean_cast
+                }
 
-                } elseif (array_key_exists('useraccountcontrol', $results[$i]) ) {
-                    // ....otherwise, (ie if no 'active' LDAP flag is defined), IF the UAC setting exists,
-                    // ....then use the UAC setting on the account to determine can-log-in vs. cannot-log-in
+            } elseif (array_key_exists('useraccountcontrol', $results[$i])) {
+                // ....otherwise, (ie if no 'active' LDAP flag is defined), IF the UAC setting exists,
+                // ....then use the UAC setting on the account to determine can-log-in vs. cannot-log-in
 
 
-                   /* The following is _probably_ the correct logic, but we can't use it because
-                       some users may have been dependent upon the previous behavior, and this
-                       could cause additional access to be available to users they don't want
-                       to allow to log in.
+                /* The following is _probably_ the correct logic, but we can't use it because
+                    some users may have been dependent upon the previous behavior, and this
+                    could cause additional access to be available to users they don't want
+                    to allow to log in.
 
-                    $useraccountcontrol = $results[$i]['useraccountcontrol'][0];
-                    if(
-                        // based on MS docs at: https://support.microsoft.com/en-us/help/305144/how-to-use-useraccountcontrol-to-manipulate-user-account-properties
-                        ($useraccountcontrol & 0x200) && // is a NORMAL_ACCOUNT
-                        !($useraccountcontrol & 0x02) && // *and* _not_ ACCOUNTDISABLE
-                        !($useraccountcontrol & 0x10)    // *and* _not_ LOCKOUT
-                    ) {
-                        $user->activated = 1;
-                    } else {
-                        $user->activated = 0;
-                    } */
-                    $enabled_accounts = [
+                 $useraccountcontrol = $results[$i]['useraccountcontrol'][0];
+                 if(
+                     // based on MS docs at: https://support.microsoft.com/en-us/help/305144/how-to-use-useraccountcontrol-to-manipulate-user-account-properties
+                     ($useraccountcontrol & 0x200) && // is a NORMAL_ACCOUNT
+                     !($useraccountcontrol & 0x02) && // *and* _not_ ACCOUNTDISABLE
+                     !($useraccountcontrol & 0x10)    // *and* _not_ LOCKOUT
+                 ) {
+                     $user->activated = 1;
+                 } else {
+                     $user->activated = 0;
+                 } */
+                $enabled_accounts = [
                     '512',    //     0x200 NORMAL_ACCOUNT
                     '544',    //     0x220 NORMAL_ACCOUNT, PASSWD_NOTREQD
                     '66048',  //   0x10200 NORMAL_ACCOUNT, DONT_EXPIRE_PASSWORD
@@ -373,44 +405,59 @@ class LdapSync extends Command
                     '4260352', // 0x410200 NORMAL_ACCOUNT, DONT_EXPIRE_PASSWORD, DONT_REQ_PREAUTH
                     '1049088', // 0x100200 NORMAL_ACCOUNT, NOT_DELEGATED
                     '1114624', // 0x110200 NORMAL_ACCOUNT, DONT_EXPIRE_PASSWORD, NOT_DELEGATED,
-                  ];
-                    $user->activated = (in_array($results[$i]['useraccountcontrol'][0], $enabled_accounts)) ? 1 : 0;
+                ];
+                $user->activated = (in_array($results[$i]['useraccountcontrol'][0], $enabled_accounts)) ? 1 : 0;
 
                 // If we're not using AD, and there isn't an activated flag set, activate all users
-                } /* implied 'else' here - leave the $user->activated flag alone. Newly-created accounts will be active.
-                already-existing accounts will be however the administrator has set them */
+            } /* implied 'else' here - leave the $user->activated flag alone. Newly-created accounts will be active.
+            already-existing accounts will be however the administrator has set them */
 
 
-                if ($item['ldap_location_override'] == true) {
-                    $user->location_id = $item['location_id'];
-                } elseif ((isset($location)) && (! empty($location))) {
-                    if ((is_array($location)) && (array_key_exists('id', $location))) {
-                        $user->location_id = $location['id'];
-                    } elseif (is_object($location)) {
-                        $user->location_id = $location->id;
+            if ($item['ldap_location_override'] == true) {
+                $user->location_id = $item['location_id'];
+            } elseif ((isset($location)) && (!empty($location))) {
+                if ((is_array($location)) && (array_key_exists('id', $location))) {
+                    $user->location_id = $location['id'];
+                } elseif (is_object($location)) {
+                    $user->location_id = $location->id; //THIS is the magic line, this should do it.
+                }
+            }
+            // TODO - should we be NULLING locations if $location is really `null`, and that's what we came up with?
+            // will that conflict with any overriding setting that the user set? Like, if they moved someone from
+            // the 'null' location to somewhere, we wouldn't want to try to override that, right?
+            $location = null;
+            $user->ldap_import = 1;
+
+            $errors = '';
+
+            if ($user->save()) {
+                $item['note'] = $item['createorupdate'];
+                $item['status'] = 'success';
+                if ($item['createorupdate'] === 'created' && $ldap_default_group) {
+                 // Check if the relationship already exists
+                if (!$user->groups()->where('group_id', $ldap_default_group)->exists()) {
+                $user->groups()->attach($ldap_default_group);
                     }
                 }
-                $location = null;
-                $user->ldap_import = 1;
-
-                $errors = '';
-
-                if ($user->save()) {
-                    $item['note'] = $item['createorupdate'];
-                    $item['status'] = 'success';
-                    if ( $item['createorupdate'] === 'created' && $ldap_default_group) {
-                         $user->groups()->attach($ldap_default_group);
+                
+                //updates assets location based on user's location
+                if ($user->wasChanged('location_id')) {
+                    foreach ($user->assets as $asset) {
+                        $asset->location_id = $user->location_id;
+                        // TODO: somehow add note? "Asset Location Changed because of thing"
+                        $asset->save();
                     }
-
-                } else {
-                    foreach ($user->getErrors()->getMessages() as $key => $err) {
-                        $errors .= $err[0];
-                    }
-                    $item['note'] = $errors;
-                    $item['status'] = 'error';
                 }
 
-                array_push($summary, $item);
+            } else {
+                foreach ($user->getErrors()->getMessages() as $key => $err) {
+                    $errors .= $err[0];
+                }
+                $item['note'] = $errors;
+                $item['status'] = 'error';
+            }
+
+            array_push($summary, $item);
         }
 
         if ($this->option('summary')) {
diff --git a/app/Console/Commands/MergeUsersByUsername.php b/app/Console/Commands/MergeUsersByUsername.php
index 390942708d..0c5e966ab9 100644
--- a/app/Console/Commands/MergeUsersByUsername.php
+++ b/app/Console/Commands/MergeUsersByUsername.php
@@ -2,6 +2,7 @@
 
 namespace App\Console\Commands;
 
+use App\Events\UserMerged;
 use App\Models\User;
 use Carbon\Carbon;
 use Illuminate\Console\Command;
@@ -51,7 +52,7 @@ class MergeUsersByUsername extends Command
 
             $bad_users = User::where('username', '=', trim($parts[0]))
                 ->whereNull('deleted_at')
-                ->with('assets', 'manager', 'userlog', 'licenses', 'consumables', 'accessories', 'managedLocations')
+                ->with('assets', 'manager', 'userlog', 'licenses', 'consumables', 'accessories', 'managedLocations','uploads', 'acceptances')
                 ->get();
 
 
@@ -105,10 +106,26 @@ class MergeUsersByUsername extends Command
                     $managedLocation->save();
                 }
 
+                foreach ($bad_user->uploads as $upload) {
+                    $this->info('Updating upload log record '.$upload->id.' to user '.$user->id);
+                    $upload->item_id = $user->id;
+                    $upload->save();
+                }
+
+                foreach ($bad_user->acceptances as $acceptance) {
+                    $this->info('Updating acceptance log record '.$acceptance->id.' to user '.$user->id);
+                    $acceptance->item_id = $user->id;
+                    $acceptance->save();
+                }
+
                 // Mark the user as deleted
                 $this->info('Marking the user as deleted');
                 $bad_user->deleted_at = Carbon::now()->timestamp;
                 $bad_user->save();
+
+                event(new UserMerged($bad_user, $user, null));
+
+
             }
         }
     }
diff --git a/app/Console/Commands/ObjectImportCommand.php b/app/Console/Commands/ObjectImportCommand.php
index 8370e7c050..b79949521a 100644
--- a/app/Console/Commands/ObjectImportCommand.php
+++ b/app/Console/Commands/ObjectImportCommand.php
@@ -6,6 +6,7 @@ use Illuminate\Console\Command;
 use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputOption;
 use Illuminate\Support\Facades\Log;
+use Symfony\Component\Console\Helper\ProgressIndicator;
 
 ini_set('max_execution_time', env('IMPORT_TIME_LIMIT', 600)); //600 seconds = 10 minutes
 ini_set('memory_limit', env('IMPORT_MEMORY_LIMIT', '500M'));
@@ -29,6 +30,11 @@ class ObjectImportCommand extends Command
      */
     protected $description = 'Import Items from CSV';
 
+    /**
+     * The progress indicator instance.
+     */
+    protected ProgressIndicator $progressIndicator;
+
     /**
      * Create a new command instance.
      *
@@ -39,8 +45,6 @@ class ObjectImportCommand extends Command
         parent::__construct();
     }
 
-    private $bar;
-
     /**
      * Execute the console command.
      *
@@ -48,12 +52,14 @@ class ObjectImportCommand extends Command
      */
     public function handle()
     {
+        $this->progressIndicator = new ProgressIndicator($this->output);
+
         $filename = $this->argument('filename');
         $class = title_case($this->option('item-type'));
         $classString = "App\\Importer\\{$class}Importer";
         $importer = new $classString($filename);
         $importer->setCallbacks([$this, 'log'], [$this, 'progress'], [$this, 'errorCallback'])
-                 ->setUserId($this->option('user_id'))
+                 ->setCreatedBy($this->option('user_id'))
                  ->setUpdating($this->option('update'))
                  ->setShouldNotify($this->option('send-welcome'))
                  ->setUsernameFormat($this->option('username_format'));
@@ -61,46 +67,25 @@ class ObjectImportCommand extends Command
         // This $logFile/useFiles() bit is currently broken, so commenting it out for now
         // $logFile = $this->option('logfile');
         // Log::useFiles($logFile);
-        $this->comment('======= Importing Items from '.$filename.' =========');
+        $this->progressIndicator->start('======= Importing Items from '.$filename.' =========');
+
         $importer->import();
 
-        $this->bar = null;
-
-        if (! empty($this->errors)) {
-            $this->comment('The following Errors were encountered.');
-            foreach ($this->errors as $asset => $error) {
-                $this->comment('Error: Item: '.$asset.' failed validation: '.json_encode($error));
-            }
-        } else {
-            $this->comment('All Items imported successfully!');
-        }
-        $this->comment('');
+        $this->progressIndicator->finish('Import finished.');
     }
 
-    public function errorCallback($item, $field, $errorString)
+    public function errorCallback($item, $field, $error)
     {
-        $this->errors[$item->name][$field] = $errorString;
+        $this->output->write("\x0D\x1B[2K");
+
+        $this->warn('Error: Item: '.$item->name.' failed validation: '.json_encode($error));
     }
 
-    public function progress($count)
+    public function progress($importedItemsCount)
     {
-        if (! $this->bar) {
-            $this->bar = $this->output->createProgressBar($count);
-        }
-        static $index = 0;
-        $index++;
-        if ($index < $count) {
-            $this->bar->advance();
-        } else {
-            $this->bar->finish();
-        }
+        $this->progressIndicator->advance();
     }
 
-    // Tracks the current item for error messages
-    private $updating;
-    // An array of errors encountered while parsing
-    private $errors;
-
     /**
      * Log a message to file, configurable by the --log-file parameter.
      * If a warning message is passed, we'll spit it to the console as well.
diff --git a/app/Console/Commands/PaveIt.php b/app/Console/Commands/PaveIt.php
index 09c846ea68..ef69d25a5b 100644
--- a/app/Console/Commands/PaveIt.php
+++ b/app/Console/Commands/PaveIt.php
@@ -51,8 +51,7 @@ class PaveIt extends Command
         }
 
         // List all the tables in the database so we don't have to worry about missing some as the app grows
-        $tables = DB::connection()->getDoctrineSchemaManager()->listTableNames();
-
+        $tables = Schema::getTables();
         $except_tables = [
             'oauth_access_tokens',
             'oauth_clients',
@@ -74,7 +73,8 @@ class PaveIt extends Command
             }
         }
 
-        foreach ($tables as $table) {
+        foreach ($tables as $table_obj) {
+            $table = $table_obj['name'];
             if (in_array($table, $except_tables)) {
                 $this->info($table. ' is SKIPPED.');
             } else {
diff --git a/app/Console/Commands/Purge.php b/app/Console/Commands/Purge.php
index 7abd83c85c..1dd2aaa51d 100644
--- a/app/Console/Commands/Purge.php
+++ b/app/Console/Commands/Purge.php
@@ -3,6 +3,7 @@
 namespace App\Console\Commands;
 
 use App\Models\Accessory;
+use App\Models\Actionlog;
 use App\Models\Asset;
 use App\Models\AssetModel;
 use App\Models\Category;
@@ -15,6 +16,8 @@ use App\Models\Statuslabel;
 use App\Models\Supplier;
 use App\Models\User;
 use Illuminate\Console\Command;
+use Illuminate\Support\Facades\Log;
+use Illuminate\Support\Facades\Storage;
 
 class Purge extends Command
 {
@@ -141,6 +144,20 @@ class Purge extends Command
             $this->info($users->count().' users purged.');
             $user_assoc = 0;
             foreach ($users as $user) {
+
+                $rel_path = 'private_uploads/users';
+                $filenames = Actionlog::where('action_type', 'uploaded')
+                    ->where('item_id', $user->id)
+                    ->pluck('filename');
+                foreach($filenames as $filename) {
+                    try {
+                        if (Storage::exists($rel_path . '/' . $filename)) {
+                            Storage::delete($rel_path . '/' . $filename);
+                        }
+                    } catch (\Exception $e) {
+                        Log::info('An error occurred while deleting files: ' . $e->getMessage());
+                    }
+                }
                 $this->info('- User "'.$user->username.'" deleted.');
                 $user_assoc += $user->userlog()->count();
                 $user->userlog()->forceDelete();
diff --git a/app/Console/Commands/RecryptFromMcrypt.php b/app/Console/Commands/RecryptFromMcrypt.php
deleted file mode 100644
index 33c8ae65c9..0000000000
--- a/app/Console/Commands/RecryptFromMcrypt.php
+++ /dev/null
@@ -1,157 +0,0 @@
-<?php
-
-namespace App\Console\Commands;
-
-use App\LegacyEncrypter\McryptEncrypter;
-use App\Models\Asset;
-use App\Models\CustomField;
-use App\Models\Setting;
-use Illuminate\Console\Command;
-use Illuminate\Support\Facades\Storage;
-
-class RecryptFromMcrypt extends Command
-{
-    /**
-     * The name and signature of the console command.
-     *
-     * @var string
-     */
-    protected $signature = 'snipeit:legacy-recrypt 
-                {--force : Force a re-crypt of encrypted data from MCRYPT.}';
-
-    /**
-     * The console command description.
-     *
-     * @var string
-     */
-    protected $description = 'This command allows upgrading users to de-encrypt their deprecated mcrypt encrypted fields and re-encrypt them using the current OpenSSL encryption.';
-
-    /**
-     * Create a new command instance.
-     *
-     * @return void
-     */
-    public function __construct()
-    {
-        parent::__construct();
-    }
-
-    /**
-     * Execute the console command.
-     *
-     * @return mixed
-     */
-    public function handle()
-    {
-
-        // Check and see if they have a legacy app key listed in their .env
-        // If not, we can try to use the current APP_KEY if looks like it's old
-        $legacy_key = env('LEGACY_APP_KEY');
-        $key_parts = explode(':', $legacy_key);
-        $legacy_cipher = env('LEGACY_CIPHER', 'rijndael-256');
-        $errors = [];
-
-        if (! $legacy_key) {
-            $this->error('ERROR: You do not have a LEGACY_APP_KEY set in your .env file. Please locate your old APP_KEY and ADD a line to your .env file like: LEGACY_APP_KEY=YOUR_OLD_APP_KEY');
-
-            return false;
-        }
-
-        // Do some basic legacy app key length checks
-        if (strlen($legacy_key) == 32) {
-            $legacy_length_check = true;
-        } elseif (array_key_exists('1', $key_parts) && (strlen($key_parts[1]) == 44)) {
-            $legacy_key = base64_decode($key_parts[1], true);
-            $legacy_length_check = true;
-        } else {
-            $legacy_length_check = false;
-        }
-
-        // Check that the app key is 32 characters
-        if ($legacy_length_check === true) {
-            $this->comment('INFO: Your LEGACY_APP_KEY looks correct. Okay to continue.');
-        } else {
-            $this->error('ERROR: Your LEGACY_APP_KEY is not the correct length (32 characters or base64 followed by 44 characters for later versions). Please locate your old APP_KEY and use that as your LEGACY_APP_KEY in your .env file to continue.');
-
-            return false;
-        }
-
-        $this->error('================================!!!! WARNING !!!!================================');
-        $this->error('================================!!!! WARNING !!!!================================');
-        $this->comment("This tool will attempt to decrypt your old Snipe-IT (mcrypt, now deprecated) encrypted data and re-encrypt it using OpenSSL. \n\nYou should only continue if you have backed up any and all old APP_KEYs and have backed up your data.");
-
-        $force = ($this->option('force')) ? true : false;
-
-        if ($force || ($this->confirm('Are you SURE you wish to continue?'))) {
-            $backup_file = 'backups/env-backups/'.'app_key-'.date('Y-m-d-gis');
-
-            try {
-                Storage::disk('local')->put($backup_file, 'APP_KEY: '.config('app.key'));
-                Storage::disk('local')->append($backup_file, 'LEGACY_APP_KEY: '.$legacy_key);
-            } catch (\Exception $e) {
-                $this->info('WARNING: Could not backup app keys');
-            }
-
-            if ($legacy_cipher) {
-                $mcrypter = new McryptEncrypter($legacy_key, $legacy_cipher);
-            } else {
-                $mcrypter = new McryptEncrypter($legacy_key);
-            }
-            $settings = Setting::getSettings();
-
-            if ($settings->ldap_pword == '') {
-                $this->comment('INFO: No LDAP password found. Skipping... ');
-            } else {
-                $decrypted_ldap_pword = $mcrypter->decrypt($settings->ldap_pword);
-                $settings->ldap_pword = Crypt::encrypt($decrypted_ldap_pword);
-                $settings->save();
-            }
-            /** @var CustomField[] $custom_fields */
-            $custom_fields = CustomField::where('field_encrypted', '=', 1)->get();
-            $this->comment('INFO: Retrieving encrypted custom fields...');
-
-            $query = Asset::withTrashed();
-
-            foreach ($custom_fields as $custom_field) {
-                $this->comment('FIELD TO RECRYPT:  '.$custom_field->name.' ('.$custom_field->db_column.')');
-                $query->orWhereNotNull($custom_field->db_column);
-            }
-
-            // Get all assets with a value in any of the fields that were encrypted
-            /** @var Asset[] $assets */
-            $assets = $query->get();
-
-            $bar = $this->output->createProgressBar(count($assets));
-
-            foreach ($assets as $asset) {
-                foreach ($custom_fields as $encrypted_field) {
-                    $columnName = $encrypted_field->db_column;
-
-                    // Make sure the value isn't null
-                    if ($asset->{$columnName} != '') {
-                        // Try to decrypt the payload using the legacy app key
-                        try {
-                            $decrypted_field = $mcrypter->decrypt($asset->{$columnName});
-                            $asset->{$columnName} = Crypt::encrypt($decrypted_field);
-                            $this->comment($decrypted_field);
-                        } catch (\Exception $e) {
-                            $errors[] = ' - ERROR: Could not decrypt field ['.$encrypted_field->name.']: '.$e->getMessage();
-                        }
-                    }
-                }
-                $asset->save();
-                $bar->advance();
-            }
-
-            $bar->finish();
-
-            if (count($errors) > 0) {
-                $this->comment("\n\n");
-                $this->error("The decrypter encountered some errors: \n");
-                foreach ($errors as $error) {
-                    $this->error($error);
-                }
-            }
-        }
-    }
-}
diff --git a/app/Console/Commands/RemoveExplicitEols.php b/app/Console/Commands/RemoveExplicitEols.php
new file mode 100644
index 0000000000..f5164c2ee0
--- /dev/null
+++ b/app/Console/Commands/RemoveExplicitEols.php
@@ -0,0 +1,60 @@
+<?php
+
+namespace App\Console\Commands;
+
+use App\Models\Asset;
+use App\Models\AssetModel;
+use Illuminate\Console\Command;
+
+class RemoveExplicitEols extends Command
+{
+    /**
+     * The name and signature of the console command.
+     *
+     * @var string
+     */
+    protected $signature = 'snipeit:remove-explicit-eols {--model_name= : The name of the asset model to update (use "all" to update all models)}';
+
+    /**
+     * The console command description.
+     *
+     * @var string
+     */
+    protected $description = 'Removes explicit EOLs on assets with selected model so they may inherit the asset model EOL';
+
+    /**
+     * Execute the console command.
+     */
+    public function handle()
+    {
+        $startTime = microtime(true);
+
+        if ($this->option('model_name') == 'all') {
+            $assets = Asset::all();
+            $this->updateAssets($assets);
+        } else {
+            $assetModel = AssetModel::where('name', '=', $this->option('model_name'))->first();
+
+            if ($assetModel) {
+                $assets = Asset::where('model_id', '=', $assetModel->id)->get();
+                $this->updateAssets($assets);
+            } else {
+                $this->error('Asset model not found');
+            }
+        }
+        $endTime = microtime(true);
+        $executionTime = ($endTime - $startTime);
+        $this->info('Command executed in ' . round($executionTime, 2) . ' seconds.');
+    }
+
+    private function updateAssets($assets)
+    {
+        foreach ($assets as $asset) {
+            $asset->eol_explicit = 0;
+            $asset->asset_eol_date = null;
+            $asset->save();
+        }
+
+        $this->info($assets->count() . ' Assets updated successfully');
+    }
+}
diff --git a/app/Console/Commands/ResetDemoSettings.php b/app/Console/Commands/ResetDemoSettings.php
index 9ddade9efb..8eda65240b 100644
--- a/app/Console/Commands/ResetDemoSettings.php
+++ b/app/Console/Commands/ResetDemoSettings.php
@@ -50,12 +50,12 @@ class ResetDemoSettings extends Command
         $settings->alert_email = 'service@snipe-it.io';
         $settings->login_note = 'Use `admin` / `password` to login to the demo.';
         $settings->header_color = null;
-        $settings->barcode_type = 'QRCODE';
+        $settings->label2_2d_type = 'QRCODE';
         $settings->default_currency = 'USD';
         $settings->brand = 2;
         $settings->ldap_enabled = 0;
         $settings->full_multiple_companies_support = 0;
-        $settings->alt_barcode = 'C128';
+        $settings->label2_1d_type = 'C128';
         $settings->skin = '';
         $settings->email_domain = 'snipeitapp.com';
         $settings->email_format = 'filastname';
@@ -65,7 +65,7 @@ class ResetDemoSettings extends Command
         $settings->thumbnail_max_h = '30';
         $settings->locale = 'en-US';
         $settings->version_footer = 'on';
-        $settings->support_footer = null;
+        $settings->support_footer = 'on';
         $settings->saml_enabled = '0';
         $settings->saml_sp_x509cert = null;
         $settings->saml_idp_metadata = null;
@@ -73,6 +73,7 @@ class ResetDemoSettings extends Command
         $settings->saml_forcelogin = '0';
         $settings->saml_slo = null;
         $settings->saml_custom_settings = null;
+        $settings->default_avatar = 'default.png';
 
 
         $settings->save();
diff --git a/app/Console/Commands/RestoreFromBackup.php b/app/Console/Commands/RestoreFromBackup.php
index 1cc9b280e1..35e67a82e7 100644
--- a/app/Console/Commands/RestoreFromBackup.php
+++ b/app/Console/Commands/RestoreFromBackup.php
@@ -30,8 +30,11 @@ class SQLStreamer {
     public function parse_sql(string $line): string {
         // take into account the 'start of line or not' setting as an instance variable?
         // 'continuation' lines for a permitted statement are PERMITTED.
+        // remove *only* line-feeds & carriage-returns; helpful for regexes against lines from
+        // Windows dumps
+        $line = trim($line, "\r\n");
         if($this->statement_is_permitted && $line[0] === ' ') {
-            return $line;
+            return $line . "\n"; //re-add the newline
         }
 
         $table_regex = '`?([a-zA-Z0-9_]+)`?';
@@ -42,8 +45,14 @@ class SQLStreamer {
             "/^(INSERT INTO )$table_regex(.*)$/" => false,
             "/^UNLOCK TABLES/" => false,
             // "/^\\) ENGINE=InnoDB AUTO_INCREMENT=16 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;/" => false, // FIXME not sure what to do here?
-            "/^\\)[a-zA-Z0-9_= ]*;$/" => false
-            // ^^^^^^ that bit should *exit* the 'perimitted' black
+            "/^\\)[a-zA-Z0-9_= ]*;$/" => false,
+            // ^^^^^^ that bit should *exit* the 'permitted' block
+            "/^\\(.*\\)[,;]$/" => false, //older MySQL dump style with one set of values per line
+            /* we *could* have made the ^INSERT INTO blah VALUES$ turn on the capturing state, and closed it with
+               a ^(blahblah);$ but it's cleaner to not have to manage the state machine. We're just going to
+               assume that (blahblah), or (blahblah); are values for INSERT and are always acceptable. */
+            "<^/\*!40101 SET NAMES '?[a-zA-Z0-9_-]+'? \*/;$>"                                   => false, //using weird delimiters (<,>) for readability. allow quoted or unquoted charsets
+            "<^/\*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' \*/;$>" => false, //same, now handle zero-values
         ];
 
         foreach($allowed_statements as $statement => $statechange) {
@@ -67,7 +76,7 @@ class SQLStreamer {
                 }
                 //how do we *replace* the tablename?
 //                print "RETURNING LINE: $line";
-                return $line;
+                return $line . "\n"; //re-add newline
             }
         }
         // all that is not allowed is denied.
@@ -85,7 +94,7 @@ class SQLStreamer {
         $parser->line_aware_piping(); // <----- THIS is doing the heavy lifting!
 
         $check_tables = ['settings' => null, 'migrations' => null /* 'assets' => null */]; //TODO - move to statics?
-        //can't use 'users' because the 'accessories_users' table?
+        //can't use 'users' because the 'accessories_checkout' table?
         // can't use 'assets' because 'ver1_components_assets'
         foreach($check_tables as $check_table => $_ignore) {
             foreach ($parser->tablenames as $tablename => $_count) {
@@ -164,7 +173,8 @@ class RestoreFromBackup extends Command
                                             {filename : The zip file to be migrated}
                                             {--no-progress : Don\'t show a progress bar}
                                             {--sanitize-guess-prefix : Guess and output the table-prefix needed to "sanitize" the SQL}
-                                            {--sanitize-with-prefix= : "Sanitize" the SQL, using the passed-in table prefix (can be learned from --sanitize-guess-prefix). Pass as just \'--sanitize-with-prefix=\' to use no prefix}';
+                                            {--sanitize-with-prefix= : "Sanitize" the SQL, using the passed-in table prefix (can be learned from --sanitize-guess-prefix). Pass as just \'--sanitize-with-prefix=\' to use no prefix}
+                                            {--sql-stdout-only : ONLY "Sanitize" the SQL and print it to stdout - useful for debugging - probably requires --sanitize-with-prefix= }';
 
     /**
      * The console command description.
@@ -239,6 +249,7 @@ class RestoreFromBackup extends Command
             'storage/private_uploads/consumables',
             'storage/private_uploads/eula-pdfs',
             'storage/private_uploads/imports',
+            'storage/private_uploads/locations',
             'storage/private_uploads/licenses',
             'storage/private_uploads/signatures',
             'storage/private_uploads/users',
@@ -279,6 +290,7 @@ class RestoreFromBackup extends Command
 
         $interesting_files = [];
         $boring_files = [];
+        $unsafe_files = [];
 
         for ($i = 0; $i < $za->numFiles; $i++) {
             $stat_results = $za->statIndex($i);
@@ -318,7 +330,8 @@ class RestoreFromBackup extends Command
                 }
             }
             $good_extensions = ['png', 'gif', 'jpg', 'svg', 'jpeg', 'doc', 'docx', 'pdf', 'txt',
-                'zip', 'rar', 'xls', 'xlsx', 'lic', 'xml', 'rtf', 'webp', 'key', 'ico',];
+                                'zip', 'rar', 'xls', 'xlsx', 'lic', 'xml', 'rtf', 'webp', 'key', 'ico', 'avif'
+            ];
             foreach (array_merge($private_files, $public_files) as $file) {
                 $has_wildcard = (strpos($file, '*') !== false);
                 if ($has_wildcard) {
@@ -328,7 +341,9 @@ class RestoreFromBackup extends Command
                 if ($last_pos !== false) {
                     $extension = strtolower(pathinfo($raw_path, PATHINFO_EXTENSION));
                     if (!in_array($extension, $good_extensions)) {
-                        $this->warn('Potentially unsafe file ' . $raw_path . ' is being skipped');
+                        // gathering potentially unsafe files here to return at exit
+                        $unsafe_files[] = $raw_path;
+                        Log::debug('Potentially unsafe file '.$raw_path.' is being skipped');
                         $boring_files[] = $raw_path;
                         continue 2;
                     }
@@ -362,7 +377,17 @@ class RestoreFromBackup extends Command
         if ($this->option('sanitize-guess-prefix')) {
             $prefix = SQLStreamer::guess_prefix($sql_contents);
             $this->line($prefix);
-            return $this->info("Re-run this command with '--sanitize-with-prefix=".$prefix."' to see an attempt to sanitze your SQL.");
+
+            return $this->info("Re-run this command with '--sanitize-with-prefix=".$prefix."' to see an attempt to sanitize your SQL.");
+        }
+
+        // If we're doing --sql-stdout-only, handle that now so we don't have to open pipes to mysql and all of that silliness
+        if ($this->option('sql-stdout-only')) {
+            $sql_importer = new SQLStreamer($sql_contents, STDOUT, $this->option('sanitize-with-prefix'));
+            $bytes_read = $sql_importer->line_aware_piping();
+            return $this->warn("$bytes_read total bytes read");
+            //TODO - it'd be nice to dump this message to STDERR so that STDOUT is just pure SQL,
+            // which would be good for redirecting to a file, and not having to trim the last line off of it
         }
 
         //how to invoke the restore?
@@ -466,6 +491,9 @@ class RestoreFromBackup extends Command
             $ugly_file_name = $za->statIndex($file_details['index'])['name'];
             $fp = $za->getStream($ugly_file_name);
             //$this->info("Weird problem, here are file details? ".print_r($file_details,true));
+            if (!is_dir($file_details['dest'])) {
+                mkdir($file_details['dest'], 0755, true); //0755 is what Laravel uses, so we do that
+            }
             $migrated_file = fopen($file_details['dest'].'/'.basename($pretty_file_name), 'w');
             while (($buffer = fgets($fp, SQLStreamer::$buffer_size)) !== false) {
                 fwrite($migrated_file, $buffer);
@@ -483,6 +511,11 @@ class RestoreFromBackup extends Command
         } else {
             $this->info(count($interesting_files).' files were succesfully transferred');
         }
+        if (count($unsafe_files) > 0) {
+            foreach ($unsafe_files as $unsafe_file) {
+                $this->warn('Potentially unsafe file '.$unsafe_file.' was skipped');
+            }
+        }
         foreach ($boring_files as $boring_file) {
             $this->warn($boring_file.' was skipped.');
         }
diff --git a/app/Console/Commands/SendAcceptanceReminder.php b/app/Console/Commands/SendAcceptanceReminder.php
new file mode 100644
index 0000000000..c1cf4ffda2
--- /dev/null
+++ b/app/Console/Commands/SendAcceptanceReminder.php
@@ -0,0 +1,111 @@
+<?php
+
+namespace App\Console\Commands;
+
+use App\Mail\UnacceptedAssetReminderMail;
+use App\Models\Asset;
+use App\Models\CheckoutAcceptance;
+use App\Models\Setting;
+use App\Models\User;
+use App\Notifications\CheckoutAssetNotification;
+use App\Notifications\CurrentInventory;
+use Illuminate\Console\Command;
+use Illuminate\Support\Facades\Mail;
+
+class SendAcceptanceReminder extends Command
+{
+    /**
+     * The name and signature of the console command.
+     *
+     * @var string
+     */
+    protected $signature = 'snipeit:acceptance-reminder';
+
+    /**
+     * The console command description.
+     *
+     * @var string
+     */
+    protected $description = 'This will resend users with unaccepted assets a reminder to accept or decline them.';
+
+    /**
+     * Create a new command instance.
+     *
+     * @return void
+     */
+    public function __construct()
+    {
+        parent::__construct();
+    }
+
+    /**
+     * Execute the console command.
+     *
+     * @return mixed
+     */
+    public function handle()
+    {
+        $pending = CheckoutAcceptance::pending()->where('checkoutable_type', 'App\Models\Asset')
+                                                ->whereHas('checkoutable', function($query) {
+                                                    $query->where('accepted_at', null)
+                                                          ->where('declined_at', null);
+                                                })
+                                                ->with(['assignedTo', 'checkoutable.assignedTo', 'checkoutable.model', 'checkoutable.adminuser'])
+                                                ->get();
+
+        $count = 0;
+        $unacceptedAssetGroups = $pending
+            ->filter(function($acceptance) {
+                return $acceptance->checkoutable_type == 'App\Models\Asset';
+            })
+            ->map(function($acceptance) {
+                return ['assetItem' => $acceptance->checkoutable, 'acceptance' => $acceptance];
+            })
+            ->groupBy(function($item) {
+                return $item['acceptance']->assignedTo ? $item['acceptance']->assignedTo->id : '';
+            });
+            $no_email_list= [];
+
+        foreach($unacceptedAssetGroups as $unacceptedAssetGroup) {
+            // The [0] is weird, but it allows for the item_count to work and grabs the appropriate info for each user.
+            // Collapsing and flattening the collection doesn't work above.
+            $acceptance = $unacceptedAssetGroup[0]['acceptance'];
+
+            $locale = $acceptance->assignedTo?->locale;
+            $email = $acceptance->assignedTo?->email;
+
+            if(!$email){
+                $no_email_list[] = [
+                    'id' => $acceptance->assignedTo?->id,
+                    'name' => $acceptance->assignedTo?->present()->fullName(),
+                ];
+            } else {
+                $count++;
+            }
+            $item_count = $unacceptedAssetGroup->count();
+
+            if ($locale && $email) {
+                Mail::to($email)->send((new UnacceptedAssetReminderMail($acceptance, $item_count))->locale($locale));
+            } elseif ($email) {
+                Mail::to($email)->send((new UnacceptedAssetReminderMail($acceptance, $item_count)));
+            }
+
+        }
+
+        $this->info($count.' users notified.');
+        $headers = ['ID', 'Name'];
+        $rows = [];
+
+        foreach ($no_email_list as $user) {
+            $rows[] = [$user['id'], $user['name']];
+        }
+
+        if (!empty($rows)) {
+            $this->info("The following users do not have an email address:");
+            $this->table($headers, $rows);
+        }
+
+        return 0;
+    }
+
+}
diff --git a/app/Console/Commands/SendExpirationAlerts.php b/app/Console/Commands/SendExpirationAlerts.php
index 025ba2ce23..64aff907fb 100644
--- a/app/Console/Commands/SendExpirationAlerts.php
+++ b/app/Console/Commands/SendExpirationAlerts.php
@@ -2,13 +2,13 @@
 
 namespace App\Console\Commands;
 
+use App\Mail\ExpiringAssetsMail;
+use App\Mail\ExpiringLicenseMail;
 use App\Models\Asset;
 use App\Models\License;
-use App\Models\Recipients\AlertRecipient;
 use App\Models\Setting;
-use App\Notifications\ExpiringAssetsNotification;
-use App\Notifications\ExpiringLicenseNotification;
 use Illuminate\Console\Command;
+use Illuminate\Support\Facades\Mail;
 
 class SendExpirationAlerts extends Command
 {
@@ -42,27 +42,28 @@ class SendExpirationAlerts extends Command
     public function handle()
     {
         $settings = Setting::getSettings();
-        $threshold = $settings->alert_interval;
+        $alert_interval = $settings->alert_interval;
 
         if (($settings->alert_email != '') && ($settings->alerts_enabled == 1)) {
 
             // Send a rollup to the admin, if settings dictate
-            $recipients = collect(explode(',', $settings->alert_email))->map(function ($item, $key) {
-                return new AlertRecipient($item);
-            });
-
+            $recipients = collect(explode(',', $settings->alert_email))
+                ->map(fn($item) => trim($item)) // Trim each email
+                ->filter(fn($item) => !empty($item))
+                ->all();
             // Expiring Assets
-            $assets = Asset::getExpiringWarrantee($threshold);
+            $assets = Asset::getExpiringWarrantee($alert_interval);
+
             if ($assets->count() > 0) {
-                $this->info(trans_choice('mail.assets_warrantee_alert', $assets->count(), ['count' => $assets->count(), 'threshold' => $threshold]));
-                \Notification::send($recipients, new ExpiringAssetsNotification($assets, $threshold));
+                $this->info(trans_choice('mail.assets_warrantee_alert', $assets->count(), ['count' => $assets->count(), 'threshold' => $alert_interval]));
+                Mail::to($recipients)->send(new ExpiringAssetsMail($assets, $alert_interval));
             }
 
             // Expiring licenses
-            $licenses = License::getExpiringLicenses($threshold);
+            $licenses = License::getExpiringLicenses($alert_interval);
             if ($licenses->count() > 0) {
-                $this->info(trans_choice('mail.license_expiring_alert', $licenses->count(), ['count' => $licenses->count(), 'threshold' => $threshold]));
-                \Notification::send($recipients, new ExpiringLicenseNotification($licenses, $threshold));
+                $this->info(trans_choice('mail.license_expiring_alert', $licenses->count(), ['count' => $licenses->count(), 'threshold' => $alert_interval]));
+                Mail::to($recipients)->send(new ExpiringLicenseMail($licenses, $alert_interval));
             }
         } else {
             if ($settings->alert_email == '') {
diff --git a/app/Console/Commands/SendUpcomingAuditReport.php b/app/Console/Commands/SendUpcomingAuditReport.php
index 7c81a37d3a..854488adc6 100644
--- a/app/Console/Commands/SendUpcomingAuditReport.php
+++ b/app/Console/Commands/SendUpcomingAuditReport.php
@@ -2,13 +2,12 @@
 
 namespace App\Console\Commands;
 
+use App\Mail\SendUpcomingAuditMail;
 use App\Models\Asset;
-use App\Models\Recipients\AlertRecipient;
 use App\Models\Setting;
-use App\Notifications\SendUpcomingAuditNotification;
 use Carbon\Carbon;
-use Illuminate\Support\Facades\DB;
 use Illuminate\Console\Command;
+use Illuminate\Support\Facades\Mail;
 
 class SendUpcomingAuditReport extends Command
 {
@@ -48,19 +47,20 @@ class SendUpcomingAuditReport extends Command
         $today = Carbon::now();
         $interval_date = $today->copy()->addDays($interval);
 
-        $assets = Asset::whereNull('deleted_at')->DueOrOverdueForAudit($settings)->orderBy('assets.next_audit_date', 'desc')->get();
-        $this->info($assets->count().' assets must be audited in on or before '.$interval_date.' is deadline');
+        $assets = Asset::whereNull('deleted_at')->dueOrOverdueForAudit($settings)->orderBy('assets.next_audit_date', 'desc')->get();
+        $this->info($assets->count() . ' assets must be audited in on or before ' . $interval_date . ' is deadline');
 
 
-        if (($assets) && ($assets->count() > 0) && ($settings->alert_email != '')) {
+        if ((count($assets) !== 0) && ($assets->count() > 0) && ($settings->alert_email != '')) {
             // Send a rollup to the admin, if settings dictate
-            $recipients = collect(explode(',', $settings->alert_email))->map(function ($item) {
-                return new AlertRecipient($item);
-            });
+            $recipients = collect(explode(',', $settings->alert_email))
+                ->map(fn($item) => trim($item))
+                ->filter(fn($item) => !empty($item))
+                ->all();
 
-            $this->info('Sending Admin SendUpcomingAuditNotification to: '.$settings->alert_email);
-            \Notification::send($recipients, new SendUpcomingAuditNotification($assets, $settings->audit_warning_days));
 
+            $this->info('Sending Admin SendUpcomingAuditNotification to: ' . $settings->alert_email);
+            Mail::to($recipients)->send(new SendUpcomingAuditMail($assets, $settings->audit_warning_days));
         }
 
     }
diff --git a/app/Console/Commands/TestLocationsFMCS.php b/app/Console/Commands/TestLocationsFMCS.php
new file mode 100644
index 0000000000..70eface2de
--- /dev/null
+++ b/app/Console/Commands/TestLocationsFMCS.php
@@ -0,0 +1,51 @@
+<?php
+
+namespace App\Console\Commands;
+
+use App\Helpers\Helper;
+use Illuminate\Console\Command;
+
+class TestLocationsFMCS extends Command
+{
+    /**
+     * The name and signature of the console command.
+     *
+     * @var string
+     */
+    protected $signature = 'snipeit:test-locations-fmcs {--location_id=}';
+
+    /**
+     * The console command description.
+     *
+     * @var string
+     */
+    protected $description = 'Test for company ID inconsistencies if FullMultipleCompanySupport with scoped locations will be used.';
+
+    /**
+     * Execute the console command.
+     */
+    public function handle()
+    {
+        $this->info('This script checks for company ID inconsistencies if Full Multiple Company Support with scoped locations will be used.');
+        $this->info('This could take a few moments if have a very large dataset.');
+        $this->newLine();
+
+        // if parameter location_id is set, only test this location
+        $location_id = null;
+        if ($this->option('location_id')) {
+            $location_id = $this->option('location_id');
+        }
+
+        $mismatched = Helper::test_locations_fmcs(true, $location_id);
+        $this->warn(trans_choice('admin/settings/message.location_scoping.mismatch', count($mismatched)));
+        $this->newLine();
+        $this->info('Edit your locations to associate them with the correct company.');
+
+        $header = ['Type', 'ID', 'Name', 'Checkout Type',  'Company ID', 'Item Company', 'Item Location', 'Location Company', 'Location Company ID'];
+        sort($mismatched);
+
+        $this->table($header, $mismatched);
+
+    }
+
+}
diff --git a/app/Console/Kernel.php b/app/Console/Kernel.php
index 8d512f303b..ca85459b67 100644
--- a/app/Console/Kernel.php
+++ b/app/Console/Kernel.php
@@ -5,6 +5,7 @@ namespace App\Console;
 use App\Console\Commands\ImportLocations;
 use App\Console\Commands\ReEncodeCustomFieldNames;
 use App\Console\Commands\RestoreDeletedUsers;
+use App\Models\Setting;
 use Illuminate\Console\Scheduling\Schedule;
 use Illuminate\Foundation\Console\Kernel as ConsoleKernel;
 
@@ -18,12 +19,14 @@ class Kernel extends ConsoleKernel
      */
     protected function schedule(Schedule $schedule)
     {
-        $schedule->command('snipeit:inventory-alerts')->daily();
-        $schedule->command('snipeit:expiring-alerts')->daily();
-        $schedule->command('snipeit:expected-checkin')->daily();
+        if(Setting::getSettings()?->alerts_enabled === 1) {
+            $schedule->command('snipeit:inventory-alerts')->daily();
+            $schedule->command('snipeit:expiring-alerts')->daily();
+            $schedule->command('snipeit:expected-checkin')->daily();
+            $schedule->command('snipeit:upcoming-audits')->daily();
+        }
         $schedule->command('snipeit:backup')->weekly();
         $schedule->command('backup:clean')->daily();
-        $schedule->command('snipeit:upcoming-audits')->daily();
         $schedule->command('auth:clear-resets')->everyFifteenMinutes();
         $schedule->command('saml:clear_expired_nonces')->weekly();
     }
diff --git a/app/Events/CheckoutableCheckedIn.php b/app/Events/CheckoutableCheckedIn.php
index 48aed2a64d..fedbd49fbe 100644
--- a/app/Events/CheckoutableCheckedIn.php
+++ b/app/Events/CheckoutableCheckedIn.php
@@ -28,7 +28,7 @@ class CheckoutableCheckedIn
         $this->checkedOutTo = $checkedOutTo;
         $this->checkedInBy = $checkedInBy;
         $this->note = $note;
-        $this->action_date = $action_date ?? date('Y-m-d');
+        $this->action_date = $action_date ?? date('Y-m-d H:i:s');
         $this->originalValues = $originalValues;
     }
 }
diff --git a/app/Events/UserMerged.php b/app/Events/UserMerged.php
index b045fdef03..3a7f4d6a2c 100644
--- a/app/Events/UserMerged.php
+++ b/app/Events/UserMerged.php
@@ -15,7 +15,7 @@ class UserMerged
      *
      * @return void
      */
-    public function __construct(User $from_user, User $to_user, User $admin)
+    public function __construct(User $from_user, User $to_user, ?User $admin)
     {
         $this->merged_from        = $from_user;
         $this->merged_to      = $to_user;
diff --git a/app/Exceptions/AssetNotRequestable.php b/app/Exceptions/AssetNotRequestable.php
new file mode 100644
index 0000000000..4067dda385
--- /dev/null
+++ b/app/Exceptions/AssetNotRequestable.php
@@ -0,0 +1,9 @@
+<?php
+
+namespace App\Exceptions;
+
+use Exception;
+
+class AssetNotRequestable extends Exception
+{
+}
diff --git a/app/Exceptions/Handler.php b/app/Exceptions/Handler.php
index 2b8eaa3627..f544180750 100644
--- a/app/Exceptions/Handler.php
+++ b/app/Exceptions/Handler.php
@@ -11,6 +11,7 @@ use Illuminate\Support\Facades\Log;
 use Throwable;
 use JsonException;
 use Carbon\Exceptions\InvalidFormatException;
+use Illuminate\Http\Exceptions\ThrottleRequestsException;
 
 class Handler extends ExceptionHandler
 {
@@ -107,11 +108,10 @@ class Handler extends ExceptionHandler
 
                 $statusCode = $e->getStatusCode();
 
+                // API throttle requests are handled in the RouteServiceProvider configureRateLimiting() method, so we don't need to handle them here
                 switch ($e->getStatusCode()) {
                     case '404':
                        return response()->json(Helper::formatStandardApiResponse('error', null, $statusCode . ' endpoint not found'), 404);
-                    case '429':
-                        return response()->json(Helper::formatStandardApiResponse('error', null, 'Too many requests'), 429);
                      case '405':
                         return response()->json(Helper::formatStandardApiResponse('error', null, 'Method not allowed'), 405);
                     default:
@@ -122,6 +122,37 @@ class Handler extends ExceptionHandler
         }
 
 
+        // This is traaaaash but it handles models that are not found while using route model binding :(
+        // The only alternative is to set that at *each* route, which is crazypants
+        if ($e instanceof \Illuminate\Database\Eloquent\ModelNotFoundException) {
+
+            // This gets the MVC model name from the exception and formats in a way that's less fugly
+            $model_name = strtolower(implode(" ", preg_split('/(?=[A-Z])/', last(explode('\\', $e->getModel())))));
+            $route = str_plural(strtolower(last(explode('\\', $e->getModel())))).'.index';
+
+            // Sigh.
+            if ($route == 'assets.index') {
+                $route = 'hardware.index';
+            } elseif ($route == 'reporttemplates.index') {
+                $route = 'reports/custom';
+            } elseif ($route == 'assetmodels.index') {
+                $route = 'models.index';
+            } elseif ($route == 'predefinedkits.index') {
+                $route = 'kits.index';
+            } elseif ($route == 'assetmaintenances.index') {
+                $route = 'maintenances.index';
+            } elseif ($route === 'licenseseats.index') {
+                $route = 'licenses.index';
+            } elseif ($route === 'customfields.index') {
+                $route = 'fields.index';
+            } elseif ($route === 'customfieldsets.index') {
+                $route = 'fields.index';
+            }
+
+            return redirect()
+                ->route($route)
+                ->withError(trans('general.generic_model_not_found', ['model' => $model_name]));
+        }
 
 
         if ($this->isHttpException($e) && (isset($statusCode)) && ($statusCode == '404' )) {
@@ -174,8 +205,9 @@ class Handler extends ExceptionHandler
      */
     public function register()
     {
+
         $this->reportable(function (Throwable $e) {
             //
         });
     }
-}
\ No newline at end of file
+}
diff --git a/app/Exceptions/UserDoestExistException.php b/app/Exceptions/UserDoestExistException.php
new file mode 100644
index 0000000000..e14069dca4
--- /dev/null
+++ b/app/Exceptions/UserDoestExistException.php
@@ -0,0 +1,10 @@
+<?php
+
+namespace App\Exceptions;
+
+use Exception;
+
+class UserDoestExistException extends Exception
+{
+
+}
diff --git a/app/Helpers/Helper.php b/app/Helpers/Helper.php
index 1ac2a90a34..f544f2bc36 100644
--- a/app/Helpers/Helper.php
+++ b/app/Helpers/Helper.php
@@ -12,10 +12,12 @@ use App\Models\Depreciation;
 use App\Models\Setting;
 use App\Models\Statuslabel;
 use App\Models\License;
+use App\Models\Location;
 use Illuminate\Support\Facades\Crypt;
 use Illuminate\Contracts\Encryption\DecryptException;
 use Carbon\Carbon;
 use Illuminate\Support\Facades\Log;
+use Illuminate\Support\Str;
 use Intervention\Image\ImageManagerStatic as Image;
 use Illuminate\Support\Facades\Session;
 
@@ -62,8 +64,9 @@ class Helper
         'mn' => 'mn-MN', // Mongolian
         'ms' => 'ms-MY', // Malay
         'nl' => 'nl-NL', // Dutch
-        'no' => 'no-NO', // Norwegian
+        'no' => 'nb-NO', // Norwegian Bokmål
         'pl' => 'pl-PL', // Polish
+        'pt' => 'pt-PT', // Portuguese
         'ro' => 'ro-RO', // Romanian
         'ru' => 'ru-RU', // Russian
         'sk' => 'sk-SK', // Slovak
@@ -707,6 +710,28 @@ class Helper
 
         return $randomString;
     }
+    /**
+     * A method to be used to handle deprecations notifications, currently handling MS Teams. more can be added when needed.
+     *
+     *
+     * @author [Godfrey Martinez]
+     * @since [v7.0.14]
+     * @return array
+     */
+    public static function deprecationCheck()  : array {
+        // The check and message that the user is still using the deprecated version
+        $deprecations = [
+            'ms_teams_deprecated' => array(
+            'check' => !Str::contains(Setting::getSettings()->webhook_endpoint, 'workflows') && (Setting::getSettings()->webhook_selected === 'microsoft'),
+            'message' => 'The Microsoft Teams webhook URL being used will be deprecated Dec 31st, 2025. <a class="btn btn-primary" href="' . route('settings.slack.index') . '">Change webhook endpoint</a>'),
+        ];
+
+        // if item of concern is being used and its being used with the deprecated values return the notification array.
+        if(Setting::getSettings()->webhook_selected === 'microsoft' && $deprecations['ms_teams_deprecated']['check']) {
+            return $deprecations;
+        }
+            return [];
+    }
 
     /**
      * This nasty little method gets the low inventory info for the
@@ -720,7 +745,7 @@ class Helper
     {
         $alert_threshold = \App\Models\Setting::getSettings()->alert_threshold;
         $consumables = Consumable::withCount('consumableAssignments as consumable_assignments_count')->whereNotNull('min_amt')->get();
-        $accessories = Accessory::withCount('users as users_count')->whereNotNull('min_amt')->get();
+        $accessories = Accessory::withCount('checkouts as checkouts_count')->whereNotNull('min_amt')->get();
         $components = Component::whereNotNull('min_amt')->get();
         $asset_models = AssetModel::where('min_amt', '>', 0)->get();
         $licenses = License::where('min_amt', '>', 0)->get();
@@ -748,7 +773,7 @@ class Helper
         }
 
         foreach ($accessories as $accessory) {
-            $avail = $accessory->qty - $accessory->users_count;
+            $avail = $accessory->qty - $accessory->checkouts_count;
             if ($avail < ($accessory->min_amt) + $alert_threshold) {
                 if ($accessory->qty > 0) {
                     $percent = number_format((($avail / $accessory->qty) * 100), 0);
@@ -844,7 +869,7 @@ class Helper
         $filetype = @finfo_file($finfo, $file);
         finfo_close($finfo);
 
-        if (($filetype == 'image/jpeg') || ($filetype == 'image/jpg') || ($filetype == 'image/png') || ($filetype == 'image/bmp') || ($filetype == 'image/gif') || ($filetype == 'image/avif')) {
+        if (($filetype == 'image/jpeg') || ($filetype == 'image/jpg') || ($filetype == 'image/png') || ($filetype == 'image/bmp') || ($filetype == 'image/gif') || ($filetype == 'image/avif') || ($filetype == 'image/webp')) {
             return $filetype;
         }
 
@@ -871,6 +896,12 @@ class Helper
     public static function selectedPermissionsArray($permissions, $selected_arr = [])
     {
         $permissions_arr = [];
+        if (is_array($permissions)) {
+            $permissions = json_encode($permissions);
+        }
+
+        // Set default to empty JSON if the value is null
+        $permissions = json_decode($permissions ?? '{}', JSON_OBJECT_AS_ARRAY);
 
         foreach ($permissions as $permission) {
             for ($x = 0; $x < count($permission); $x++) {
@@ -881,13 +912,13 @@ class Helper
                     if (is_array($selected_arr)) {
 
                         if (array_key_exists($permission_name, $selected_arr)) {
-                            $permissions_arr[$permission_name] = $selected_arr[$permission_name];
+                            $permissions_arr[$permission_name] = (int) $selected_arr[$permission_name];
                         } else {
-                            $permissions_arr[$permission_name] = '0';
+                            $permissions_arr[$permission_name] = 0;
                         }
 
                     } else {
-                        $permissions_arr[$permission_name] = '0';
+                        $permissions_arr[$permission_name] = 0;
                     }
                 }
             }
@@ -913,13 +944,22 @@ class Helper
         $rules = $class::rules();
         foreach ($rules as $rule_name => $rule) {
             if ($rule_name == $field) {
-                if (strpos($rule, 'required') === false) {
-                    return false;
+                if (is_array($rule)) {
+                    if (in_array('required', $rule)) {
+                       return true;
+                    } else {
+                        return false;
+                    }
                 } else {
-                    return true;
-                }
+                    if (strpos($rule, 'required') === false) {
+                            return false;
+                        } else {
+                            return true;
+                        }
+                    }
             }
         }
+        return false;
     }
 
     /**
@@ -1113,6 +1153,7 @@ class Helper
             'png'   => 'far fa-image',
             'webp'   => 'far fa-image',
             'avif'   => 'far fa-image',
+            'svg' => 'fas fa-vector-square',
             // word
             'doc'   => 'far fa-file-word',
             'docx'   => 'far fa-file-word',
@@ -1125,7 +1166,7 @@ class Helper
             //Text
             'txt'   => 'far fa-file-alt',
             'rtf'   => 'far fa-file-alt',
-            'xml'   => 'far fa-file-alt',
+            'xml'   => 'fas fa-code',
             // Misc
             'pdf'   => 'far fa-file-pdf',
             'lic'   => 'far fa-save',
@@ -1138,41 +1179,7 @@ class Helper
         return 'far fa-file';
     }
 
-    public static function show_file_inline($filename)
-    {
-        $extension = substr(strrchr($filename, '.'), 1);
 
-        if ($extension) {
-            switch ($extension) {
-                case 'jpg':
-                case 'jpeg':
-                case 'gif':
-                case 'png':
-                case 'webp':
-                case 'avif':
-                    return true;
-                    break;
-                default:
-                    return false;
-            }
-        }
-
-        return false;
-    }
-
-    /**
-     * Generate a random encrypted password.
-     *
-     * @author Wes Hulette <jwhulette@gmail.com>
-     *
-     * @since 5.0.0
-     *
-     * @return string
-     */
-    public static function generateEncyrptedPassword(): string
-    {
-        return bcrypt(self::generateUnencryptedPassword());
-    }
 
     /**
      * Get a random unencrypted password.
@@ -1306,25 +1313,24 @@ class Helper
         switch ($item) {
             case 'asset':
                 return 'fas fa-barcode';
-                break;
             case 'accessory':
                 return 'fas fa-keyboard';
-                break;
             case 'component':
                 return 'fas fa-hdd';
-                break;
             case 'consumable':
                 return 'fas fa-tint';
-                break;
             case 'license':
                 return 'far fa-save';
-                break;
             case 'location':
                 return 'fas fa-map-marker-alt';
-                break;
             case 'user':
                 return 'fas fa-user';
-                break;
+            case 'supplier':
+                return 'fa-solid fa-store';
+            case 'manufacturer':
+                return 'fa-solid fa-building';
+            case 'category':
+                return 'fa-solid fa-table-columns';
         }
 
     }
@@ -1440,7 +1446,6 @@ class Helper
 
         foreach (self::$language_map as $legacy => $new) {
             if ($language_code == $legacy) {
-                Log::debug('Current language is '.$legacy.', using '.$new.' instead');
                 return $new;
             }
         }
@@ -1451,6 +1456,7 @@ class Helper
 
     public static function mapBackToLegacyLocale($new_locale = null)
     {
+
         if (strlen($new_locale) <= 4) {
             return $new_locale; //"new locale" apparently wasn't quite so new
         }
@@ -1458,44 +1464,193 @@ class Helper
         // This does a *reverse* search against our new language map array - given the value, find the *key* for it
         $legacy_locale = array_search($new_locale, self::$language_map);
 
-        if($legacy_locale !== false) {
+        if ($legacy_locale !== false) {
             return $legacy_locale;
         }
         return $new_locale; // better that you have some weird locale that doesn't fit into our mappings anywhere than 'void'
     }
 
+    public static function determineLanguageDirection() {
+        return in_array(app()->getLocale(),
+            [
+                'ar-SA',
+                'fa-IR',
+                'he-IL'
+            ]) ? 'rtl' : 'ltr';
+    }
 
-    static public function getRedirectOption($request, $id, $table, $asset_id = null)
+
+    static public function getRedirectOption($request, $id, $table, $item_id = null)
     {
 
         $redirect_option = Session::get('redirect_option');
         $checkout_to_type = Session::get('checkout_to_type');
+        $checkedInFrom = Session::get('checkedInFrom');
+        $other_redirect = Session::get('other_redirect');
 
-        //return to index
-        if ($redirect_option == '0') {
+        // return to index
+        if ($redirect_option == 'index') {
             switch ($table) {
                 case "Assets":
-                    return redirect()->route('hardware.index')->with('success', trans('admin/hardware/message.checkout.success'));
+                    return route('hardware.index');
+                case "Users":
+                    return route('users.index');
+                case "Licenses":
+                    return route('licenses.index');
+                case "Accessories":
+                    return route('accessories.index');
+                case "Components":
+                    return route('components.index');
+                case "Consumables":
+                    return route('consumables.index');
             }
         }
-        //return to thing being assigned
-        if ($redirect_option == '1') {
+
+        // return to thing being assigned
+        if ($redirect_option == 'item') {
             switch ($table) {
                 case "Assets":
-                    return redirect()->route('hardware.show', $id ? $id : $asset_id)->with('success', trans('admin/hardware/message.checkout.success'));
+                    return route('hardware.show', $id ?? $item_id);
+                case "Users":
+                    return route('users.show', $id ?? $item_id);
+                case "Licenses":
+                    return route('licenses.show', $id ?? $item_id);
+                case "Accessories":
+                    return route('accessories.show', $id ?? $item_id);
+                case "Components":
+                    return route('components.show', $id ?? $item_id);
+                case "Consumables":
+                    return route('consumables.show', $id ?? $item_id);
             }
         }
-        //return to thing being assigned to
-        if ($redirect_option == '2') {
+
+        // return to assignment target
+        if ($redirect_option == 'target') {
             switch ($checkout_to_type) {
                 case 'user':
-                    return redirect()->route('users.show', $request->assigned_user)->with('success', trans('admin/hardware/message.checkout.success'));
+                    return route('users.show', $request->assigned_user ?? $checkedInFrom);
                 case 'location':
-                    return redirect()->route('locations.show', $request->assigned_location)->with('success', trans('admin/hardware/message.checkout.success'));
+                    return route('locations.show', $request->assigned_location ?? $checkedInFrom);
                 case 'asset':
-                    return redirect()->route('hardware.show', $request->assigned_asset)->with('success', trans('admin/hardware/message.checkout.success'));
+                    return route('hardware.show', $request->assigned_asset ?? $checkedInFrom);
             }
         }
+
+        // return to somewhere else
+        if ($redirect_option == 'other_redirect') {
+            switch ($other_redirect) {
+                case 'audit':
+                    return route('assets.audit.due');
+            }
+
+        }
+
         return redirect()->back()->with('error', trans('admin/hardware/message.checkout.error'));
     }
+
+    /**
+     * Check for inconsistencies before activating scoped locations with FullMultipleCompanySupport
+     * If there are locations with different companies than related objects unforseen problems could arise
+     *
+     * @author T. Regnery <tobias.regnery@gmail.com>
+     * @since 7.0
+     *
+     * @param $artisan          when false, bail out on first inconsistent entry
+     * @param $location_id      when set, only test this specific location
+     * @param $new_company_id   in case of updating a location, this is the newly requested company_id
+     * @return string []
+     */
+    static public function test_locations_fmcs($artisan, $location_id = null, $new_company_id = null) {
+        $mismatched = [];
+
+        if ($location_id) {
+            $location = Location::find($location_id);
+            if ($location) {
+                $locations = collect([])->push(Location::find($location_id));
+            }
+        } else {
+            $locations = Location::all();
+        }
+
+        // Bail out early if there are no locations
+        if ($locations->count() == 0) {
+            return [];
+        }
+
+        foreach($locations as $location) {
+            // in case of an update of a single location, use the newly requested company_id
+            if ($new_company_id) {
+                $location_company = $new_company_id;
+            } else {
+                $location_company = $location->company_id;
+            }
+
+            // Depending on the relationship, we must use different operations to retrieve the objects
+            $keywords_relation = [
+                'many' => [
+                            'accessories',
+                            'assets',
+                            'assignedAccessories',
+                            'assignedAssets',
+                            'components',
+                            'consumables',
+                            'rtd_assets',
+                            'users',
+                        ],
+                    'one'  => [
+                        'manager',
+                        'parent',
+                    ]];
+
+            // In case of a single location, the children must be checked as well, because we don't walk every location
+            if ($location_id) {
+                $keywords_relation['many'][] = 'children';
+            }
+
+            foreach ($keywords_relation as $relation => $keywords) {
+                foreach($keywords as $keyword) {
+                    if ($relation == 'many') {
+                        $items = $location->{$keyword}->all();
+                    } else {
+                        $items = collect([])->push($location->$keyword);
+                    }
+
+                    $count = 0;
+                    foreach ($items as $item) {
+
+
+                        if ($item && $item->company_id != $location_company) {
+
+                            $mismatched[] = [
+                                    class_basename(get_class($item)),
+                                    $item->id,
+                                    $item->name ?? $item->asset_tag ?? $item->serial ?? $item->username,
+                                    $item->assigned_type ? str_replace('App\\Models\\', '', $item->assigned_type) : null,
+                                    $item->company_id ?? null,
+                                    $item->company->name ?? null,
+//                                    $item->defaultLoc->id ?? null,
+//                                    $item->defaultLoc->name ?? null,
+//                                    $item->defaultLoc->company->id ?? null,
+//                                    $item->defaultLoc->company->name ?? null,
+                                    $item->location->name ?? null,
+                                    $item->location->company->name ?? null,
+                                    $location_company ?? null,
+                                ];
+
+                            $count++;
+
+                            // Bail early if this is not being run via artisan
+                            if ((!$artisan) && ($count > 0)) {
+                                return $mismatched;
+                            }
+
+
+
+                        }
+                    }
+                }
+            }
+        }
+        return $mismatched;
+    }        
 }
diff --git a/app/Helpers/IconHelper.php b/app/Helpers/IconHelper.php
new file mode 100644
index 0000000000..7c8e2a7456
--- /dev/null
+++ b/app/Helpers/IconHelper.php
@@ -0,0 +1,196 @@
+<?php
+
+namespace App\Helpers;
+
+class IconHelper
+{
+
+    public static function icon($type) {
+        switch ($type) {
+            case 'checkout':
+                return 'fa-solid fa-rotate-left';
+            case 'checkin':
+                return 'fa-solid fa-rotate-right';
+            case 'edit':
+                return 'fas fa-pencil-alt';
+            case 'clone':
+                return 'far fa-clone';
+            case 'delete':
+                return 'fas fa-trash';
+            case 'create':
+                return 'fa-solid fa-plus';
+            case 'audit':
+                return 'fa-solid fa-clipboard-check';
+            case '2fa reset':
+                return 'fa-solid fa-mobile-screen';
+            case 'new-user':
+                return 'fa-solid fa-user-plus';
+            case 'merged-user':
+                return 'fa-solid fa-people-arrows';
+            case 'delete-user':
+                return 'fa-solid fa-user-minus';
+            case 'update-user':
+                return 'fa-solid fa-user-pen';
+            case 'user':
+                return 'fa-solid fa-user';
+            case 'users':
+                return 'fas fa-users';
+            case 'restore':
+                return 'fa-solid fa-trash-arrow-up';
+            case 'external-link':
+                return 'fa fa-external-link';
+            case 'email':
+                return 'fa-regular fa-envelope';
+            case 'phone':
+                return 'fa-solid fa-phone';
+            case 'long-arrow-right':
+                return 'fas fa-long-arrow-alt-right';
+            case 'download':
+                return 'fas fa-download';
+            case 'checkmark':
+                return 'fas fa-check icon-white';
+            case 'x':
+                return 'fas fa-times';
+            case 'logout':
+                return 'fa fa-sign-out';
+            case 'admin-settings':
+                return 'fas fa-cogs';
+            case 'settings':
+                return 'fas fa-cog';
+            case 'angle-left':
+                return 'fas fa-angle-left';
+            case 'angle-right':
+                return 'fas fa-angle-right';
+            case 'warning':
+                return 'fas fa-exclamation-triangle';
+            case 'kits':
+                return 'fas fa-object-group';
+            case 'assets':
+            case 'asset':
+                return 'fas fa-barcode';
+            case 'accessories':
+            case 'accessory':
+                return 'far fa-keyboard';
+            case 'components':
+            case 'component':
+                return 'far fa-hdd';
+            case 'consumables':
+            case 'consumable':
+                return 'fas fa-tint';
+            case 'licenses':
+            case 'license':
+                return 'far fa-save';
+            case 'requestable':
+                return 'fas fa-laptop';
+            case 'reports':
+                return 'fas fa-chart-bar';
+            case 'heart':
+                return 'fas fa-heart';
+            case 'circle':
+                return 'fa-regular fa-circle';
+            case 'circle-solid':
+                return 'fa-solid fa-circle';
+            case 'due':
+                return 'fas fa-history';
+            case 'import':
+                return 'fas fa-cloud-upload-alt';
+            case 'search':
+                return 'fas fa-search';
+            case 'alerts':
+                return 'far fa-flag';
+            case 'password':
+                return 'fa-solid fa-key';
+            case 'api-key':
+                return 'fa-solid fa-user-secret';
+            case 'nav-toggle':
+                return 'fas fa-bars';
+            case 'dashboard':
+                return 'fas fa-tachometer-alt';
+            case 'info-circle':
+                    return 'fas fa-info-circle';
+            case 'caret-right':
+                return 'fa fa-caret-right';
+            case 'caret-up':
+                return 'fa fa-caret-up';
+            case 'caret-down':
+                return 'fa fa-caret-down';
+            case 'arrow-circle-right':
+                return 'fa fa-arrow-circle-right';
+            case 'minus':
+                return 'fas fa-minus';
+            case 'spinner':
+                return 'fas fa-spinner fa-spin';
+            case 'copy-clipboard':
+                return 'fa-regular fa-clipboard';
+            case 'paperclip':
+                return 'fas fa-paperclip';
+            case 'files':
+                return 'fa-regular fa-file';
+            case 'more-info':
+                return 'far fa-life-ring';
+            case 'calendar':
+                return 'fas fa-calendar';
+            case 'plus':
+                return 'fas fa-plus';
+            case 'history':
+                return 'fas fa-history';
+            case 'more-files':
+                return 'fa-solid fa-laptop-file';
+            case 'maintenances':
+                return 'fas fa-wrench';
+            case 'seats':
+                return 'far fa-list-alt';
+            case 'globe-us':
+                return 'fas fa-globe-americas';
+            case 'locked':
+                return 'fas fa-lock';
+            case 'unlocked':
+                return 'fas fa-lock';
+            case 'locations':
+                return 'fas fa-map-marker-alt';
+            case 'location':
+                return 'fas fa-map-marker-alt';
+            case 'superadmin':
+                return 'fas fa-crown';
+            case 'print':
+                return 'fa-solid fa-print';
+            case 'checkin-and-delete':
+                return 'fa-solid fa-user-xmark';
+            case 'branding':
+                return 'fas fa-copyright';
+            case 'general-settings':
+                return 'fa-solid fa-list-check';
+            case 'groups':
+                return 'fa-solid fa-user-group';
+            case 'bell':
+                return 'fa-solid fa-bell';
+            case 'hashtag':
+                return 'fa-solid fa-hashtag';
+            case 'asset-tags':
+                return 'fas fa-list-ol';
+            case 'labels':
+                return 'fas fa-tags';
+            case 'ldap':
+                return 'fas fa-sitemap';
+            case 'google':
+                return 'fa-brands fa-google';
+            case 'saml':
+                return 'fas fa-sign-in-alt';
+            case 'backups':
+                return 'fas fa-file-archive';
+            case 'logins':
+                return 'fas fa-crosshairs';
+            case 'oauth':
+                return 'fas fa-user-secret';
+            case 'employee_num' :
+                return 'fa-regular fa-id-card';
+            case 'department' :
+                return 'fa-solid fa-building-user';
+            case 'home' :
+                return 'fa-solid fa-house';
+            case 'note':
+            case 'notes':
+                return 'fas fa-sticky-note';
+        }
+    }
+}
diff --git a/app/Helpers/StorageHelper.php b/app/Helpers/StorageHelper.php
index 94dfe62c76..47700f913a 100644
--- a/app/Helpers/StorageHelper.php
+++ b/app/Helpers/StorageHelper.php
@@ -3,10 +3,14 @@
 namespace App\Helpers;
 
 use Illuminate\Support\Facades\Storage;
-
+use Illuminate\Http\Response;
+use Illuminate\Http\RedirectResponse;
+use Symfony\Component\HttpFoundation\BinaryFileResponse;
+use Symfony\Component\HttpFoundation\StreamedResponse;
+use Illuminate\Contracts\Filesystem\FileNotFoundException;
 class StorageHelper
 {
-    public static function downloader($filename, $disk = 'default')
+    public static function downloader($filename, $disk = 'default') : BinaryFileResponse | RedirectResponse | StreamedResponse
     {
         if ($disk == 'default') {
             $disk = config('filesystems.default');
@@ -22,4 +26,64 @@ class StorageHelper
                 return Storage::disk($disk)->download($filename);
         }
     }
+
+
+    /**
+     * This determines the file types that should be allowed inline and checks their fileinfo extension
+     * to determine that they are safe to display inline.
+     *
+     * @author <A. Gianotto> [<snipe@snipe.net]>
+     * @since v7.0.14
+     * @param $file_with_path
+     * @return bool
+     */
+    public static function allowSafeInline($file_with_path) {
+
+        $allowed_inline = [
+            'pdf',
+            'svg',
+            'jpg',
+            'gif',
+            'svg',
+            'avif',
+            'webp',
+            'png',
+        ];
+
+
+        // The file exists and is allowed to be displayed inline
+        if (Storage::exists($file_with_path) && (in_array(pathinfo($file_with_path, PATHINFO_EXTENSION), $allowed_inline))) {
+            return true;
+        }
+        return false;
+
+    }
+
+    /**
+     * Decide whether to show the file inline or download it.
+     */
+    public static function showOrDownloadFile($file, $filename) {
+
+        $headers = [];
+
+        if (request('inline') == 'true') {
+
+            $headers = [
+                'Content-Disposition' => 'inline',
+            ];
+
+            // This is NOT allowed as inline - force it to be displayed as text in the browser
+            if (self::allowSafeInline($file) != true) {
+                $headers = array_merge($headers, ['Content-Type' => 'text/plain']);
+            }
+        }
+
+        // Everything else seems okay, but the file doesn't exist on the server.
+        if (Storage::missing($file)) {
+            throw new FileNotFoundException();
+        }
+
+        return Storage::download($file, $filename, $headers);
+
+    }
 }
diff --git a/app/Http/Controllers/Accessories/AccessoriesController.php b/app/Http/Controllers/Accessories/AccessoriesController.php
index 81d5d692c5..66a914e9a9 100755
--- a/app/Http/Controllers/Accessories/AccessoriesController.php
+++ b/app/Http/Controllers/Accessories/AccessoriesController.php
@@ -7,10 +7,10 @@ use App\Http\Controllers\Controller;
 use App\Http\Requests\ImageUploadRequest;
 use App\Models\Accessory;
 use App\Models\Company;
-use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\Storage;
 use Illuminate\Support\Facades\Validator;
-use Redirect;
+use \Illuminate\Contracts\View\View;
+use \Illuminate\Http\RedirectResponse;
 use Illuminate\Support\Facades\Log;
 
 /** This controller handles all actions related to Accessories for
@@ -27,24 +27,19 @@ class AccessoriesController extends Controller
      * @author [A. Gianotto] [<snipe@snipe.net>]
      * @see AccessoriesController::getDatatable() method that generates the JSON response
      * @since [v1.0]
-     * @return View
-     * @throws \Illuminate\Auth\Access\AuthorizationException
      */
-    public function index()
+    public function index() : View
     {
         $this->authorize('index', Accessory::class);
-
-        return view('accessories/index');
+        return view('accessories.index');
     }
 
     /**
      * Returns a view with a form to create a new Accessory.
      *
      * @author [A. Gianotto] [<snipe@snipe.net>]
-     * @return View
-     * @throws \Illuminate\Auth\Access\AuthorizationException
      */
-    public function create()
+    public function create() : View
     {
         $this->authorize('create', Accessory::class);
         $category_type = 'accessory';
@@ -58,10 +53,8 @@ class AccessoriesController extends Controller
      *
      * @author [A. Gianotto] [<snipe@snipe.net>]
      * @param ImageUploadRequest $request
-     * @return \Illuminate\Http\RedirectResponse
-     * @throws \Illuminate\Auth\Access\AuthorizationException
      */
-    public function store(ImageUploadRequest $request)
+    public function store(ImageUploadRequest $request) : RedirectResponse
     {
         $this->authorize(Accessory::class);
         
@@ -80,16 +73,17 @@ class AccessoriesController extends Controller
         $accessory->purchase_date           = request('purchase_date');
         $accessory->purchase_cost           = request('purchase_cost');
         $accessory->qty                     = request('qty');
-        $accessory->user_id                 = Auth::user()->id;
+        $accessory->created_by              = auth()->id();
         $accessory->supplier_id             = request('supplier_id');
         $accessory->notes                   = request('notes');
 
         $accessory = $request->handleImages($accessory);
 
+        session()->put(['redirect_option' => $request->get('redirect_option')]);
         // Was the accessory created?
         if ($accessory->save()) {
             // Redirect to the new accessory  page
-            return redirect()->route('accessories.index')->with('success', trans('admin/accessories/message.create.success'));
+            return redirect()->to(Helper::getRedirectOption($request, $accessory->id, 'Accessories'))->with('success', trans('admin/accessories/message.create.success'));
         }
 
         return redirect()->back()->withInput()->withErrors($accessory->getErrors());
@@ -100,20 +94,11 @@ class AccessoriesController extends Controller
      *
      * @author [A. Gianotto] [<snipe@snipe.net>]
      * @param  int $accessoryId
-     * @return View
-     * @throws \Illuminate\Auth\Access\AuthorizationException
      */
-    public function edit($accessoryId = null)
+    public function edit(Accessory $accessory) : View | RedirectResponse
     {
-
-        if ($item = Accessory::find($accessoryId)) {
-            $this->authorize($item);
-
-            return view('accessories/edit', compact('item'))->with('category_type', 'accessory');
-        }
-
-        return redirect()->route('accessories.index')->with('error', trans('admin/accessories/message.does_not_exist'));
-
+        $this->authorize('update', Accessory::class);
+        return view('accessories.edit')->with('item', $accessory)->with('category_type', 'accessory');
     }
 
     /**
@@ -122,26 +107,18 @@ class AccessoriesController extends Controller
      * @author [J. Vinsmoke]
      * @param int $accessoryId
      * @since [v6.0]
-     * @return View
      */
-    public function getClone($accessoryId = null)
+    public function getClone(Accessory $accessory) : View | RedirectResponse
     {
 
         $this->authorize('create', Accessory::class);
-
-        // Check if the asset exists
-        if (is_null($accessory_to_clone = Accessory::find($accessoryId))) {
-            // Redirect to the asset management page
-            return redirect()->route('accessories.index')
-                ->with('error', trans('admin/accessories/message.does_not_exist', ['id' => $accessoryId]));
-        }
-
-        $accessory = clone $accessory_to_clone;
-        $accessory->id = null;
-        $accessory->location_id = null;
+        $cloned = clone $accessory;
+        $cloned->id = null;
+        $cloned->deleted_at = '';
+        $cloned->location_id = null;
 
         return view('accessories/edit')
-            ->with('item', $accessory);
+            ->with('item', $cloned);
         
     }
 
@@ -151,17 +128,15 @@ class AccessoriesController extends Controller
      * @author [A. Gianotto] [<snipe@snipe.net>]
      * @param ImageUploadRequest $request
      * @param  int $accessoryId
-     * @return \Illuminate\Http\RedirectResponse
-     * @throws \Illuminate\Auth\Access\AuthorizationException
      */
-    public function update(ImageUploadRequest $request, $accessoryId = null)
+    public function update(ImageUploadRequest $request, Accessory $accessory) : RedirectResponse
     {
-        if ($accessory = Accessory::withCount('users as users_count')->find($accessoryId)) {
+        if ($accessory = Accessory::withCount('checkouts as checkouts_count')->find($accessory->id)) {
 
             $this->authorize($accessory);
 
             $validator = Validator::make($request->all(), [
-                "qty" => "required|numeric|min:$accessory->users_count"
+                "qty" => "required|numeric|min:$accessory->checkouts_count"
             ]);
 
             if ($validator->fails()) {
@@ -189,9 +164,10 @@ class AccessoriesController extends Controller
 
             $accessory = $request->handleImages($accessory);
 
-            // Was the accessory updated?
+            session()->put(['redirect_option' => $request->get('redirect_option')]);
+
             if ($accessory->save()) {
-                return redirect()->route('accessories.index')->with('success', trans('admin/accessories/message.update.success'));
+                return redirect()->to(Helper::getRedirectOption($request, $accessory->id, 'Accessories'))->with('success', trans('admin/accessories/message.update.success'));
             }
         } else {
             return redirect()->route('accessories.index')->with('error', trans('admin/accessories/message.does_not_exist'));
@@ -205,20 +181,18 @@ class AccessoriesController extends Controller
      *
      * @author [A. Gianotto] [<snipe@snipe.net>]
      * @param  int $accessoryId
-     * @return \Illuminate\Http\RedirectResponse
-     * @throws \Illuminate\Auth\Access\AuthorizationException
      */
-    public function destroy($accessoryId)
+    public function destroy($accessoryId) : RedirectResponse
     {
-        if (is_null($accessory = Accessory::find($accessoryId))) {
+        if (is_null($accessory = Accessory::withCount('checkouts as checkouts_count')->find($accessoryId))) {
             return redirect()->route('accessories.index')->with('error', trans('admin/accessories/message.not_found'));
         }
 
         $this->authorize($accessory);
 
 
-        if ($accessory->hasUsers() > 0) {
-            return redirect()->route('accessories.index')->with('error', trans('admin/accessories/message.assoc_users', ['count'=> $accessory->hasUsers()]));
+        if ($accessory->checkouts_count > 0) {
+            return redirect()->route('accessories.index')->with('error', trans('admin/accessories/general.delete_disabled'));
         }
 
         if ($accessory->image) {
@@ -243,17 +217,14 @@ class AccessoriesController extends Controller
      * @param  int $accessoryID
      * @see AccessoriesController::getDataView() method that generates the JSON response
      * @since [v1.0]
-     * @return View
-     * @throws \Illuminate\Auth\Access\AuthorizationException
      */
-    public function show($accessoryID = null)
+    public function show(Accessory $accessory) : View | RedirectResponse
     {
-        $accessory = Accessory::withCount('users as users_count')->find($accessoryID);
-        $this->authorize('view', $accessory);
-        if (isset($accessory->id)) {
-            return view('accessories/view', compact('accessory'));
-        }
+        $accessory->loadCount('checkouts as checkouts_count');
 
-        return redirect()->route('accessories.index')->with('error', trans('admin/accessories/message.does_not_exist', ['id' => $accessoryID]));
+        $accessory->load(['adminuser' => fn($query) => $query->withTrashed()]);
+
+        $this->authorize('view', $accessory);
+        return view('accessories.view', compact('accessory'));
     }
 }
diff --git a/app/Http/Controllers/Accessories/AccessoriesFilesController.php b/app/Http/Controllers/Accessories/AccessoriesFilesController.php
index 75fa0b2f12..9dbb16d83a 100644
--- a/app/Http/Controllers/Accessories/AccessoriesFilesController.php
+++ b/app/Http/Controllers/Accessories/AccessoriesFilesController.php
@@ -7,10 +7,13 @@ use App\Http\Controllers\Controller;
 use App\Http\Requests\UploadFileRequest;
 use App\Models\Actionlog;
 use App\Models\Accessory;
-use Illuminate\Support\Facades\Response;
 use Illuminate\Support\Facades\Storage;
-use Symfony\Accessory\HttpFoundation\JsonResponse;
 use Illuminate\Support\Facades\Log;
+use \Illuminate\Contracts\View\View;
+use \Illuminate\Http\RedirectResponse;
+use Illuminate\Support\Facades\Response;
+use Symfony\Component\HttpFoundation\BinaryFileResponse;
+use Symfony\Component\HttpFoundation\StreamedResponse;
 
 class AccessoriesFilesController extends Controller
 {
@@ -19,20 +22,17 @@ class AccessoriesFilesController extends Controller
      *
      * @param UploadFileRequest $request
      * @param int $accessoryId
-     * @return \Illuminate\Http\RedirectResponse
-     * @throws \Illuminate\Auth\Access\AuthorizationException
-     *@author [A. Gianotto] [<snipe@snipe.net>]
+     * @author [A. Gianotto] [<snipe@snipe.net>]
      * @since [v1.0]
      * @todo Switch to using the AssetFileRequest form request validator.
      */
-    public function store(UploadFileRequest $request, $accessoryId = null)
+    public function store(UploadFileRequest $request, $accessoryId = null) : RedirectResponse
     {
 
         if (config('app.lock_passwords')) {
             return redirect()->route('accessories.show', ['accessory'=>$accessoryId])->with('error', trans('general.feature_disabled'));
         }
 
-
         $accessory = Accessory::find($accessoryId);
 
         if (isset($accessory->id)) {
@@ -51,15 +51,15 @@ class AccessoriesFilesController extends Controller
                 }
 
 
-                return redirect()->route('accessories.show', $accessory->id)->with('success', trans('general.file_upload_success'));
+                return redirect()->route('accessories.show', $accessory->id)->withFragment('files')->with('success', trans('general.file_upload_success'));
 
             }
 
-            return redirect()->route('accessories.show', $accessory->id)->with('error', trans('general.no_files_uploaded'));
+            return redirect()->route('accessories.show', $accessory->id)->withFragment('files')->with('error', trans('general.no_files_uploaded'));
         }
         // Prepare the error message
-        return redirect()->route('accessories.index')
-            ->with('error', trans('general.file_does_not_exist'));
+        return redirect()->route('accessories.index')->with('error', trans('admin/accessories/message.does_not_exist'));
+
     }
 
     /**
@@ -69,35 +69,30 @@ class AccessoriesFilesController extends Controller
      * @since [v1.0]
      * @param int $accessoryId
      * @param int $fileId
-     * @return \Illuminate\Http\RedirectResponse
-     * @throws \Illuminate\Auth\Access\AuthorizationException
      */
-    public function destroy($accessoryId = null, $fileId = null)
+    public function destroy($accessoryId = null, $fileId = null) : RedirectResponse
     {
-        $accessory = Accessory::find($accessoryId);
-
-        // the asset is valid
-        if (isset($accessory->id)) {
+        if ($accessory = Accessory::find($accessoryId)) {
             $this->authorize('update', $accessory);
-            $log = Actionlog::find($fileId);
 
-            // Remove the file if one exists
-            if (Storage::exists('accessories/'.$log->filename)) {
-                try {
-                    Storage::delete('accessories/'.$log->filename);
-                } catch (\Exception $e) {
-                    Log::debug($e);
+            if ($log = Actionlog::find($fileId)) {
+
+                if (Storage::exists('private_uploads/accessories/'.$log->filename)) {
+                    try {
+                        Storage::delete('private_uploads/accessories/' . $log->filename);
+                        $log->delete();
+                        return redirect()->back()->withFragment('files')->with('success', trans('admin/hardware/message.deletefile.success'));
+                    } catch (\Exception $e) {
+                        Log::debug($e);
+                        return redirect()->route('accessories.index')->with('error', trans('general.file_does_not_exist'));
+                    }
                 }
+
             }
-
-            $log->delete();
-
-            return redirect()->back()
-                ->with('success', trans('admin/hardware/message.deletefile.success'));
+            return redirect()->route('accessories.show', ['accessory' => $accessory])->withFragment('files')->with('error',  trans('general.log_record_not_found'));
         }
 
-        // Redirect to the licence management page
-        return redirect()->route('accessories.index')->with('error', trans('general.file_does_not_exist'));
+        return redirect()->route('accessories.index')->with('error', trans('admin/accessories/message.does_not_exist'));
     }
 
     /**
@@ -107,53 +102,31 @@ class AccessoriesFilesController extends Controller
      * @since [v1.4]
      * @param int $accessoryId
      * @param int $fileId
-     * @return \Symfony\Accessory\HttpFoundation\Response
-     * @throws \Illuminate\Auth\Access\AuthorizationException
      */
-    public function show($accessoryId = null, $fileId = null, $download = true)
+    public function show($accessoryId = null, $fileId = null) : View | RedirectResponse | Response | BinaryFileResponse | StreamedResponse
     {
 
-        Log::debug('Private filesystem is: '.config('filesystems.default'));
-        $accessory = Accessory::find($accessoryId);
-
-
 
         // the accessory is valid
-        if (isset($accessory->id)) {
+        if ($accessory = Accessory::find($accessoryId)) {
             $this->authorize('view', $accessory);
             $this->authorize('accessories.files', $accessory);
 
-            if (! $log = Actionlog::whereNotNull('filename')->where('item_id', $accessory->id)->find($fileId)) {
-                return redirect()->route('accessories.index')->with('error',  trans('admin/users/message.log_record_not_found'));
-            }
+            if ($log = Actionlog::whereNotNull('filename')->where('item_id', $accessory->id)->find($fileId)) {
+                $file = 'private_uploads/accessories/'.$log->filename;
 
-            $file = 'private_uploads/accessories/'.$log->filename;
-
-            if (Storage::missing($file)) {
-                Log::debug('FILE DOES NOT EXISTS for '.$file);
-                Log::debug('URL should be '.Storage::url($file));
-
-                return response('File '.$file.' ('.Storage::url($file).') not found on server', 404)
-                    ->header('Content-Type', 'text/plain');
-            } else {
-
-                // Display the file inline
-                if (request('inline') == 'true') {
-                    $headers = [
-                        'Content-Disposition' => 'inline',
-                    ];
-                    return Storage::download($file, $log->filename, $headers);
-                }
-
-
-                // We have to override the URL stuff here, since local defaults in Laravel's Flysystem
-                // won't work, as they're not accessible via the web
-                if (config('filesystems.default') == 'local') { // TODO - is there any way to fix this at the StorageHelper layer?
-                    return StorageHelper::downloader($file);
+                try {
+                    return StorageHelper::showOrDownloadFile($file, $log->filename);
+                } catch (\Exception $e) {
+                    return redirect()->route('accessories.show', ['accessory' => $accessory])->with('error',  trans('general.file_not_found'));
                 }
             }
+
+            return redirect()->route('accessories.show', ['accessory' => $accessory])->withFragment('files')->with('error',  trans('general.log_record_not_found'));
+
         }
 
-        return redirect()->route('accessories.index')->with('error', trans('general.file_does_not_exist', ['id' => $fileId]));
+        return redirect()->route('accessories.index')->with('error', trans('admin/accessories/message.does_not_exist'));
+
     }
 }
diff --git a/app/Http/Controllers/Accessories/AccessoryCheckinController.php b/app/Http/Controllers/Accessories/AccessoryCheckinController.php
index 29c6065057..ab24200d78 100644
--- a/app/Http/Controllers/Accessories/AccessoryCheckinController.php
+++ b/app/Http/Controllers/Accessories/AccessoryCheckinController.php
@@ -3,12 +3,14 @@
 namespace App\Http\Controllers\Accessories;
 
 use App\Events\CheckoutableCheckedIn;
+use App\Helpers\Helper;
 use App\Http\Controllers\Controller;
 use App\Models\Accessory;
-use App\Models\User;
+use App\Models\AccessoryCheckout;
 use Illuminate\Http\Request;
-use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\DB;
+use \Illuminate\Contracts\View\View;
+use \Illuminate\Http\RedirectResponse;
 
 class AccessoryCheckinController extends Controller
 {
@@ -19,22 +21,25 @@ class AccessoryCheckinController extends Controller
      * @param Request $request
      * @param int $accessoryUserId
      * @param string $backto
-     * @return View
-     * @internal param int $accessoryId
-     * @throws \Illuminate\Auth\Access\AuthorizationException
      */
-    public function create($accessoryUserId = null, $backto = null)
+    public function create($accessoryUserId = null, $backto = null) : View | RedirectResponse
     {
-        // Check if the accessory exists
-        if (is_null($accessory_user = DB::table('accessories_users')->find($accessoryUserId))) {
-            // Redirect to the accessory management page with error
+        if (is_null($accessory_user = DB::table('accessories_checkout')->find($accessoryUserId))) {
             return redirect()->route('accessories.index')->with('error', trans('admin/accessories/message.not_found'));
         }
 
         $accessory = Accessory::find($accessory_user->accessory_id);
+
+        //based on what the accessory is checked out to the target redirect option will be displayed accordingly.
+        $target_option = match ($accessory_user->assigned_type) {
+            'App\Models\Asset' => trans('admin/hardware/form.redirect_to_type', ['type' => trans('general.asset')]),
+            'App\Models\Location' => trans('admin/hardware/form.redirect_to_type', ['type' => trans('general.location')]),
+            default => trans('admin/hardware/form.redirect_to_type', ['type' => trans('general.user')]),
+        };
         $this->authorize('checkin', $accessory);
 
-        return view('accessories/checkin', compact('accessory'))->with('backto', $backto);
+        return view('accessories/checkin', compact('accessory', 'target_option'))->with('backto', $backto);
+
     }
 
     /**
@@ -42,24 +47,25 @@ class AccessoryCheckinController extends Controller
      *
      * @uses Accessory::checkin_email() to determine if an email can and should be sent
      * @author [A. Gianotto] [<snipe@snipe.net>]
-     * @param null $accessoryUserId
+     * @param null $accessoryCheckoutId
      * @param string $backto
-     * @return \Illuminate\Http\RedirectResponse
-     * @throws \Illuminate\Auth\Access\AuthorizationException
-     * @internal param int $accessoryId
      */
-    public function store(Request $request, $accessoryUserId = null, $backto = null)
+    public function store(Request $request, $accessoryCheckoutId = null, $backto = null) : RedirectResponse
     {
-        // Check if the accessory exists
-        if (is_null($accessory_user = DB::table('accessories_users')->find($accessoryUserId))) {
-            // Redirect to the accessory management page with error
+        if (is_null($accessory_checkout = AccessoryCheckout::find($accessoryCheckoutId))) {
             return redirect()->route('accessories.index')->with('error', trans('admin/accessories/message.does_not_exist'));
         }
 
-        $accessory = Accessory::find($accessory_user->accessory_id);
+        $accessory = Accessory::find($accessory_checkout->accessory_id);
+
+        session()->put('checkedInFrom', $accessory_checkout->assigned_to);
+        session()->put('checkout_to_type', match ($accessory_checkout->assigned_type) {
+            'App\Models\User' => 'user',
+            'App\Models\Location' => 'location',
+            'App\Models\Asset' => 'asset',
+        });
 
         $this->authorize('checkin', $accessory);
-
         $checkin_hours = date('H:i:s');
         $checkin_at = date('Y-m-d H:i:s');
         if ($request->filled('checkin_at')) {
@@ -67,12 +73,12 @@ class AccessoryCheckinController extends Controller
         }
 
         // Was the accessory updated?
-        if (DB::table('accessories_users')->where('id', '=', $accessory_user->id)->delete()) {
-            $return_to = e($accessory_user->assigned_to);
+        if ($accessory_checkout->delete()) {
+            event(new CheckoutableCheckedIn($accessory, $accessory_checkout->assignedTo, auth()->user(), $request->input('note'), $checkin_at));
 
-            event(new CheckoutableCheckedIn($accessory, User::find($return_to), Auth::user(), $request->input('note'), $checkin_at));
+            session()->put(['redirect_option' => $request->get('redirect_option')]);
 
-            return redirect()->route('accessories.show', $accessory->id)->with('success', trans('admin/accessories/message.checkin.success'));
+            return redirect()->to(Helper::getRedirectOption($request, $accessory->id, 'Accessories'))->with('success', trans('admin/accessories/message.checkin.success'));
         }
         // Redirect to the accessory management page with error
         return redirect()->route('accessories.index')->with('error', trans('admin/accessories/message.checkin.error'));
diff --git a/app/Http/Controllers/Accessories/AccessoryCheckoutController.php b/app/Http/Controllers/Accessories/AccessoryCheckoutController.php
index 679b8d4251..58ce787245 100644
--- a/app/Http/Controllers/Accessories/AccessoryCheckoutController.php
+++ b/app/Http/Controllers/Accessories/AccessoryCheckoutController.php
@@ -3,29 +3,34 @@
 namespace App\Http\Controllers\Accessories;
 
 use App\Events\CheckoutableCheckedOut;
+use App\Helpers\Helper;
+use App\Http\Controllers\CheckInOutRequest;
 use App\Http\Controllers\Controller;
+use App\Http\Requests\AccessoryCheckoutRequest;
 use App\Models\Accessory;
+use App\Models\AccessoryCheckout;
 use App\Models\User;
 use Carbon\Carbon;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Auth;
-use Illuminate\Support\Facades\DB;
-use Illuminate\Support\Facades\Input;
+use \Illuminate\Contracts\View\View;
+use \Illuminate\Http\RedirectResponse;
 
 class AccessoryCheckoutController extends Controller
 {
+
+    use CheckInOutRequest;
+
     /**
      * Return the form to checkout an Accessory to a user.
      *
      * @author [A. Gianotto] [<snipe@snipe.net>]
      * @param  int $id
-     * @return View
-     * @throws \Illuminate\Auth\Access\AuthorizationException
      */
-    public function create($id)
+    public function create($id) : View | RedirectResponse
     {
 
-        if ($accessory = Accessory::withCount('users as users_count')->find($id)) {
+        if ($accessory = Accessory::withCount('checkouts as checkouts_count')->find($id)) {
 
             $this->authorize('checkout', $accessory);
 
@@ -58,46 +63,41 @@ class AccessoryCheckoutController extends Controller
      *
      * @author [A. Gianotto] [<snipe@snipe.net>]
      * @param Request $request
-     * @param  int $accessoryId
-     * @return \Illuminate\Http\RedirectResponse
-     * @throws \Illuminate\Auth\Access\AuthorizationException
+     * @param  Accessory $accessory
      */
-    public function store(Request $request, $accessoryId)
+    public function store(AccessoryCheckoutRequest $request, Accessory $accessory) : RedirectResponse
     {
-        // Check if the accessory exists
-        if (is_null($accessory = Accessory::withCount('users as users_count')->find($accessoryId))) {
-            // Redirect to the accessory management page with error
-            return redirect()->route('accessories.index')->with('error', trans('admin/accessories/message.user_not_found'));
-        }
-
+        
         $this->authorize('checkout', $accessory);
 
-        if (!$user = User::find($request->input('assigned_to'))) {
-            return redirect()->route('accessories.checkout.show', $accessory->id)->with('error', trans('admin/accessories/message.checkout.user_does_not_exist'));
+        $target = $this->determineCheckoutTarget();
+        
+        $accessory->checkout_qty = $request->input('checkout_qty', 1);
+        
+        for ($i = 0; $i < $accessory->checkout_qty; $i++) {
+
+            $accessory_checkout = new AccessoryCheckout([
+                'accessory_id' => $accessory->id,
+                'created_at' => Carbon::now(),
+                'assigned_to' => $target->id,
+                'assigned_type' => $target::class,
+                'note' => $request->input('note'),
+            ]);
+
+            $accessory_checkout->created_by = auth()->id();
+            $accessory_checkout->save();
         }
 
-        // Make sure there is at least one available to checkout
-        if ($accessory->numRemaining() <= 0){
-            return redirect()->route('accessories.index')->with('error', trans('admin/accessories/message.checkout.unavailable'));
-        }
+        event(new CheckoutableCheckedOut($accessory,  $target, auth()->user(), $request->input('note')));
 
+        $request->request->add(['checkout_to_type' => request('checkout_to_type')]);
+        $request->request->add(['assigned_to' => $target->id]);
 
-        // Update the accessory data
-        $accessory->assigned_to = e($request->input('assigned_to'));
+        session()->put(['redirect_option' => $request->get('redirect_option'), 'checkout_to_type' => $request->get('checkout_to_type')]);
 
-        $accessory->users()->attach($accessory->id, [
-            'accessory_id' => $accessory->id,
-            'created_at' => Carbon::now(),
-            'user_id' => Auth::id(),
-            'assigned_to' => $request->get('assigned_to'),
-            'note' => $request->input('note'),
-        ]);
-
-        DB::table('accessories_users')->where('assigned_to', '=', $accessory->assigned_to)->where('accessory_id', '=', $accessory->id)->first();
-
-        event(new CheckoutableCheckedOut($accessory, $user, Auth::user(), $request->input('note')));
 
         // Redirect to the new accessory page
-        return redirect()->route('accessories.index')->with('success', trans('admin/accessories/message.checkout.success'));
+        return redirect()->to(Helper::getRedirectOption($request, $accessory->id, 'Accessories'))
+            ->with('success', trans('admin/accessories/message.checkout.success'));
     }
 }
diff --git a/app/Http/Controllers/Account/AcceptanceController.php b/app/Http/Controllers/Account/AcceptanceController.php
index fafb6aeda5..b20f7d97e8 100644
--- a/app/Http/Controllers/Account/AcceptanceController.php
+++ b/app/Http/Controllers/Account/AcceptanceController.php
@@ -28,20 +28,18 @@ use Illuminate\Support\Str;
 use App\Http\Controllers\SettingsController;
 use Barryvdh\DomPDF\Facade\Pdf;
 use Carbon\Carbon;
-use phpDocumentor\Reflection\Types\Compound;
+use \Illuminate\Contracts\View\View;
+use \Illuminate\Http\RedirectResponse;
 use Illuminate\Support\Facades\Log;
 
 class AcceptanceController extends Controller
 {
     /**
      * Show a listing of pending checkout acceptances for the current user
-     *
-     * @return View
      */
-    public function index()
+    public function index() : View
     {
-        $acceptances = CheckoutAcceptance::forUser(Auth::user())->pending()->get();
-
+        $acceptances = CheckoutAcceptance::forUser(auth()->user())->pending()->get();
         return view('account/accept.index', compact('acceptances'));
     }
 
@@ -49,9 +47,8 @@ class AcceptanceController extends Controller
      * Shows a form to either accept or decline the checkout acceptance
      *
      * @param  int  $id
-     * @return mixed
      */
-    public function create($id)
+    public function create($id) : View | RedirectResponse
     {
         $acceptance = CheckoutAcceptance::find($id);
 
@@ -64,7 +61,7 @@ class AcceptanceController extends Controller
             return redirect()->route('account.accept')->with('error', trans('admin/users/message.error.asset_already_accepted'));
         }
 
-        if (! $acceptance->isCheckedOutTo(Auth::user())) {
+        if (! $acceptance->isCheckedOutTo(auth()->user())) {
             return redirect()->route('account.accept')->with('error', trans('admin/users/message.error.incorrect_user_accepted'));
         }
 
@@ -80,9 +77,8 @@ class AcceptanceController extends Controller
      *
      * @param  Request $request
      * @param  int  $id
-     * @return \Illuminate\Http\RedirectResponse
      */
-    public function store(Request $request, $id)
+    public function store(Request $request, $id) : RedirectResponse
     {
         $acceptance = CheckoutAcceptance::find($id);
 
@@ -94,7 +90,7 @@ class AcceptanceController extends Controller
             return redirect()->route('account.accept')->with('error', trans('admin/users/message.error.asset_already_accepted'));
         }
 
-        if (! $acceptance->isCheckedOutTo(Auth::user())) {
+        if (! $acceptance->isCheckedOutTo(auth()->user())) {
             return redirect()->route('account.accept')->with('error', trans('admin/users/message.error.incorrect_user_accepted'));
         }
 
@@ -212,9 +208,12 @@ class AcceptanceController extends Controller
              */
             $branding_settings = SettingsController::getPDFBranding();
 
-            if (is_null($branding_settings->logo)){
-                $path_logo = "";
-            } else {
+            $path_logo = "";
+
+            // Check for the PDF logo path and use that, otherwise use the regular logo path
+            if (!is_null($branding_settings->acceptance_pdf_logo)) {
+                $path_logo = public_path() . '/uploads/' . $branding_settings->acceptance_pdf_logo;
+            } elseif (!is_null($branding_settings->logo)) {
                 $path_logo = public_path() . '/uploads/' . $branding_settings->logo;
             }
             
@@ -222,6 +221,7 @@ class AcceptanceController extends Controller
                 'item_tag' => $item->asset_tag,
                 'item_model' => $display_model,
                 'item_serial' => $item->serial,
+                'item_status' => $item->assetstatus?->name,
                 'eula' => $item->getEula(),
                 'note' => $request->input('note'),
                 'check_out_date' => Carbon::parse($acceptance->created_at)->format('Y-m-d'),
@@ -240,7 +240,11 @@ class AcceptanceController extends Controller
             }
 
             $acceptance->accept($sig_filename, $item->getEula(), $pdf_filename, $request->input('note'));
-            $acceptance->notify(new AcceptanceAssetAcceptedNotification($data));
+            try {
+                $acceptance->notify(new AcceptanceAssetAcceptedNotification($data));
+            } catch (\Exception $e) {
+                Log::warning($e);
+            }
             event(new CheckoutAccepted($acceptance));
 
             $return_msg = trans('admin/users/message.accepted');
@@ -312,6 +316,7 @@ class AcceptanceController extends Controller
                 'item_tag' => $item->asset_tag,
                 'item_model' => $display_model,
                 'item_serial' => $item->serial,
+                'item_status' => $item->assetstatus?->name,
                 'note' => $request->input('note'),
                 'declined_date' => Carbon::parse($acceptance->declined_at)->format('Y-m-d'),
                 'signature' => ($sig_filename) ? storage_path() . '/private_uploads/signatures/' . $sig_filename : null,
@@ -336,4 +341,5 @@ class AcceptanceController extends Controller
         return redirect()->to('account/accept')->with('success', $return_msg);
 
     }
+
 }
diff --git a/app/Http/Controllers/ActionlogController.php b/app/Http/Controllers/ActionlogController.php
index 2d194b7ca6..057ca465bc 100644
--- a/app/Http/Controllers/ActionlogController.php
+++ b/app/Http/Controllers/ActionlogController.php
@@ -3,13 +3,14 @@
 namespace App\Http\Controllers;
 
 use App\Helpers\Helper;
-use App\Models\Actionlog;
-use Illuminate\Support\Facades\Response;
+use Illuminate\Http\RedirectResponse;
 use Illuminate\Support\Facades\Log;
 use Illuminate\Support\Facades\Storage;
+use \Illuminate\Http\Response;
+use Symfony\Component\HttpFoundation\BinaryFileResponse;
 class ActionlogController extends Controller
 {
-    public function displaySig($filename)
+    public function displaySig($filename) : RedirectResponse | Response | bool
     {
         // PHP doesn't let you handle file not found errors well with 
         // file_get_contents, so we set the error reporting for just this class
@@ -17,6 +18,7 @@ class ActionlogController extends Controller
 
         $disk = config('filesystems.default');
         switch (config("filesystems.disks.$disk.driver")) {
+
             case 's3':
                 $file = 'private_uploads/signatures/'.$filename;
                 return redirect()->away(Storage::disk($disk)->temporaryUrl($file, now()->addMinutes(5)));
@@ -30,15 +32,24 @@ class ActionlogController extends Controller
                     Log::warning('File '.$file.' not found');
                     return false;
                 } else {
-                    return Response::make($contents)->header('Content-Type', $filetype);
+                    return response()->make($contents)->header('Content-Type', $filetype);
                 }
         }
     }
 
-    public function getStoredEula($filename){
+    public function getStoredEula($filename) : Response | BinaryFileResponse | RedirectResponse
+    {
         $this->authorize('view', \App\Models\Asset::class);
-        $file = config('app.private_uploads').'/eula-pdfs/'.$filename;
 
-        return Response::download($file);
+        if (config('filesystems.default') == 's3_private') {
+            return redirect()->away(Storage::disk('s3_private')->temporaryUrl('private_uploads/eula-pdfs/'.$filename, now()->addMinutes(5)));
+        }
+
+        if (Storage::exists('private_uploads/eula-pdfs/'.$filename)) {
+            return response()->download(config('app.private_uploads').'/eula-pdfs/'.$filename);
+        }
+
+        return redirect()->back()->with('error',  trans('general.file_does_not_exist'));
+
     }
 }
diff --git a/app/Http/Controllers/Api/AccessoriesController.php b/app/Http/Controllers/Api/AccessoriesController.php
index eb74a9e0f0..90486b40f2 100644
--- a/app/Http/Controllers/Api/AccessoriesController.php
+++ b/app/Http/Controllers/Api/AccessoriesController.php
@@ -4,20 +4,27 @@ namespace App\Http\Controllers\Api;
 
 use App\Events\CheckoutableCheckedOut;
 use App\Helpers\Helper;
+use App\Http\Controllers\CheckInOutRequest;
 use App\Http\Controllers\Controller;
+use App\Http\Requests\AccessoryCheckoutRequest;
+use App\Http\Requests\StoreAccessoryRequest;
 use App\Http\Transformers\AccessoriesTransformer;
 use App\Http\Transformers\SelectlistTransformer;
 use App\Models\Accessory;
 use App\Models\Company;
 use App\Models\User;
+use Illuminate\Http\JsonResponse;
 use Illuminate\Support\Facades\Auth;
 use Carbon\Carbon;
 use Illuminate\Support\Facades\DB;
 use Illuminate\Http\Request;
 use App\Http\Requests\ImageUploadRequest;
+use App\Models\AccessoryCheckout;
 
 class AccessoriesController extends Controller
 {
+    use CheckInOutRequest;
+
     /**
      * Display a listing of the resource.
      *
@@ -45,20 +52,21 @@ class AccessoriesController extends Controller
                 'min_amt',
                 'company_id',
                 'notes',
-                'users_count',
+                'checkouts_count',
                 'qty',
             ];
 
 
-        $accessories = Accessory::select('accessories.*')->with('category', 'company', 'manufacturer', 'users', 'location', 'supplier')
-                                ->withCount('users as users_count');
+        $accessories = Accessory::select('accessories.*')
+            ->with('category', 'company', 'manufacturer', 'checkouts', 'location', 'supplier', 'adminuser')
+            ->withCount('checkouts as checkouts_count');
 
         if ($request->filled('search')) {
             $accessories = $accessories->TextSearch($request->input('search'));
         }
 
         if ($request->filled('company_id')) {
-            $accessories->where('company_id', '=', $request->input('company_id'));
+            $accessories->where('accessories.company_id', '=', $request->input('company_id'));
         }
 
         if ($request->filled('category_id')) {
@@ -104,7 +112,10 @@ class AccessoriesController extends Controller
                 break;    
             case 'supplier':
                 $accessories = $accessories->OrderSupplier($order);
-                break;       
+                break;
+            case 'created_by':
+                $accessories = $accessories->OrderByCreatedByName($order);
+                break;
             default:
                 $accessories = $accessories->orderBy($column_sort, $order);
                 break;
@@ -120,14 +131,13 @@ class AccessoriesController extends Controller
     /**
      * Store a newly created resource in storage.
      *
+     * @param  \App\Http\Requests\ImageUploadRequest $request
+     * @return \Illuminate\Http\JsonResponse
      * @author [A. Gianotto] [<snipe@snipe.net>]
      * @since [v4.0]
-     * @param  \App\Http\Requests\ImageUploadRequest $request
-     * @return \Illuminate\Http\Response
      */
-    public function store(ImageUploadRequest $request)
+    public function store(StoreAccessoryRequest $request)
     {
-        $this->authorize('create', Accessory::class);
         $accessory = new Accessory;
         $accessory->fill($request->all());
         $accessory = $request->handleImages($accessory);
@@ -143,15 +153,15 @@ class AccessoriesController extends Controller
     /**
      * Display the specified resource.
      *
+     * @param  int  $id
+     * @return array
      * @author [A. Gianotto] [<snipe@snipe.net>]
      * @since [v4.0]
-     * @param  int  $id
-     * @return \Illuminate\Http\Response
      */
     public function show($id)
     {
         $this->authorize('view', Accessory::class);
-        $accessory = Accessory::withCount('users as users_count')->findOrFail($id);
+        $accessory = Accessory::withCount('checkouts as checkouts_count')->findOrFail($id);
 
         return (new AccessoriesTransformer)->transformAccessory($accessory);
     }
@@ -160,10 +170,10 @@ class AccessoriesController extends Controller
     /**
      * Display the specified resource.
      *
+     * @param  int  $id
+     * @return array
      * @author [A. Gianotto] [<snipe@snipe.net>]
      * @since [v4.0]
-     * @param  int  $id
-     * @return \Illuminate\Http\Response
      */
     public function accessory_detail($id)
     {
@@ -175,47 +185,33 @@ class AccessoriesController extends Controller
 
 
     /**
-     * Display the specified resource.
+     * Get the list of checkouts for a specific accessory
      *
      * @author [A. Gianotto] [<snipe@snipe.net>]
      * @since [v4.0]
      * @param  int  $id
-     * @return \Illuminate\Http\Response
+     * @return  | array
      */
-    public function checkedout($id, Request $request)
+    public function checkedout(Request $request, $id)
     {
         $this->authorize('view', Accessory::class);
 
         $accessory = Accessory::with('lastCheckout')->findOrFail($id);
-        if (! Company::isCurrentUserHasAccess($accessory)) {
-            return ['total' => 0, 'rows' => []];
-        }
-
         $offset = request('offset', 0);
         $limit = request('limit', 50);
 
-        $accessory_users = $accessory->users;
-        $total = $accessory_users->count();
-
-        if ($total < $offset) {
-            $offset = 0;
-        }
-
-        $accessory_users = $accessory->users()->skip($offset)->take($limit)->get();
+        // Total count of all checkouts for this asset
+        $accessory_checkouts = $accessory->checkouts();
 
+        // Check for search text in the request
         if ($request->filled('search')) {
-            $accessory_users = $accessory->users()
-                                         ->where(function ($query) use ($request) {
-                                             $search_str = '%' . $request->input('search') . '%';
-                                             $query->where('first_name', 'like', $search_str)
-                                                   ->orWhere('last_name', 'like', $search_str)
-                                                   ->orWhere('note', 'like', $search_str);
-                                         })
-                                         ->get();
-            $total = $accessory_users->count();
+            $accessory_checkouts = $accessory_checkouts->TextSearch($request->input('search'));
         }
 
-        return (new AccessoriesTransformer)->transformCheckedoutAccessory($accessory, $accessory_users, $total);
+        $total = $accessory_checkouts->count();
+        $accessory_checkouts = $accessory_checkouts->skip($offset)->take($limit)->get();
+
+        return (new AccessoriesTransformer)->transformCheckedoutAccessory($accessory_checkouts, $total);
     }
 
 
@@ -226,7 +222,7 @@ class AccessoriesController extends Controller
      * @since [v4.0]
      * @param  \App\Http\Requests\ImageUploadRequest $request
      * @param  int  $id
-     * @return \Illuminate\Http\Response
+     * @return \Illuminate\Http\JsonResponse
      */
     public function update(ImageUploadRequest $request, $id)
     {
@@ -248,16 +244,16 @@ class AccessoriesController extends Controller
      * @author [A. Gianotto] [<snipe@snipe.net>]
      * @since [v4.0]
      * @param  int  $id
-     * @return \Illuminate\Http\Response
+     * @return \Illuminate\Http\JsonResponse
      */
     public function destroy($id)
     {
         $this->authorize('delete', Accessory::class);
-        $accessory = Accessory::findOrFail($id);
+        $accessory = Accessory::withCount('checkouts as checkouts_count')->findOrFail($id);
         $this->authorize($accessory);
 
-        if ($accessory->hasUsers() > 0) {
-            return response()->json(Helper::formatStandardApiResponse('error', null, trans('admin/accessories/message.assoc_users', ['count'=> $accessory->hasUsers()])));
+        if ($accessory->checkouts_count > 0) {
+            return response()->json(Helper::formatStandardApiResponse('error', null, trans('admin/accessories/general.delete_disabled')));
         }
 
         $accessory->delete();
@@ -272,43 +268,34 @@ class AccessoriesController extends Controller
      * If Slack is enabled and/or asset acceptance is enabled, it will also
      * trigger a Slack message and send an email.
      *
-     * @author [A. Gianotto] [<snipe@snipe.net>]
      * @param  int  $accessoryId
-     * @return \Illuminate\Http\RedirectResponse
+     * @return \Illuminate\Http\JsonResponse
+     * @author [A. Gianotto] [<snipe@snipe.net>]
      */
-    public function checkout(Request $request, $accessoryId)
+    public function checkout(AccessoryCheckoutRequest $request, Accessory $accessory)
     {
-        // Check if the accessory exists
-        if (is_null($accessory = Accessory::withCount('users as users_count')->find($accessoryId))) {
-            return response()->json(Helper::formatStandardApiResponse('error', null, trans('admin/accessories/message.does_not_exist')));
-        }
-
         $this->authorize('checkout', $accessory);
+        $target = $this->determineCheckoutTarget();
+        $accessory->checkout_qty = $request->input('checkout_qty', 1);
 
+        for ($i = 0; $i < $accessory->checkout_qty; $i++) {
 
-        if ($accessory->numRemaining() > 0) {
-
-            if (! $user = User::find($request->input('assigned_to'))) {
-                return response()->json(Helper::formatStandardApiResponse('error', null, trans('admin/accessories/message.checkout.user_does_not_exist')));
-            }
-
-            // Update the accessory data
-            $accessory->assigned_to = $request->input('assigned_to');
-
-            $accessory->users()->attach($accessory->id, [
+            $accessory_checkout = new AccessoryCheckout([
                 'accessory_id' => $accessory->id,
                 'created_at' => Carbon::now(),
-                'user_id' => Auth::id(),
-                'assigned_to' => $request->get('assigned_to'),
-                'note' => $request->get('note'),
+                'assigned_to' => $target->id,
+                'assigned_type' => $target::class,
+                'note' => $request->input('note'),
             ]);
 
-            event(new CheckoutableCheckedOut($accessory, $user, Auth::user(), $request->input('note')));
-
-            return response()->json(Helper::formatStandardApiResponse('success', null, trans('admin/accessories/message.checkout.success')));
+            $accessory_checkout->created_by = auth()->id();
+            $accessory_checkout->save();
         }
 
-        return response()->json(Helper::formatStandardApiResponse('error', null, 'No accessories remaining'));
+        // Set this value to be able to pass the qty through to the event
+        event(new CheckoutableCheckedOut($accessory, $target, auth()->user(), $request->input('note')));
+
+        return response()->json(Helper::formatStandardApiResponse('success', null, trans('admin/accessories/message.checkout.success')));
 
     }
 
@@ -325,29 +312,21 @@ class AccessoriesController extends Controller
      */
     public function checkin(Request $request, $accessoryUserId = null)
     {
-        if (is_null($accessory_user = DB::table('accessories_users')->find($accessoryUserId))) {
+        if (is_null($accessory_checkout = AccessoryCheckout::find($accessoryUserId))) {
             return response()->json(Helper::formatStandardApiResponse('error', null, trans('admin/accessories/message.does_not_exist')));
         }
 
-        $accessory = Accessory::find($accessory_user->accessory_id);
+        $accessory = Accessory::find($accessory_checkout->accessory_id);
         $this->authorize('checkin', $accessory);
 
-        $logaction = $accessory->logCheckin(User::find($accessory_user->assigned_to), $request->input('note'));
+        $accessory->logCheckin(User::find($accessory_checkout->assigned_to), $request->input('note'));
 
         // Was the accessory updated?
-        if (DB::table('accessories_users')->where('id', '=', $accessory_user->id)->delete()) {
-            if (! is_null($accessory_user->assigned_to)) {
-                $user = User::find($accessory_user->assigned_to);
+        if ($accessory_checkout->delete()) {
+            if (! is_null($accessory_checkout->assigned_to)) {
+                $user = User::find($accessory_checkout->assigned_to);
             }
 
-            $data['log_id'] = $logaction->id;
-            $data['first_name'] = $user->first_name;
-            $data['last_name'] = $user->last_name;
-            $data['item_name'] = $accessory->name;
-            $data['checkin_date'] = $logaction->created_at;
-            $data['item_tag'] = '';
-            $data['note'] = $logaction->note;
-
             return response()->json(Helper::formatStandardApiResponse('success', null,  trans('admin/accessories/message.checkin.success')));
         }
 
diff --git a/app/Http/Controllers/Api/AssetFilesController.php b/app/Http/Controllers/Api/AssetFilesController.php
index d8bc5e3841..fabe9ebbb3 100644
--- a/app/Http/Controllers/Api/AssetFilesController.php
+++ b/app/Http/Controllers/Api/AssetFilesController.php
@@ -3,29 +3,18 @@
 namespace App\Http\Controllers\Api;
 
 use App\Helpers\StorageHelper;
+use App\Http\Transformers\UploadedFilesTransformer;
 use Illuminate\Support\Facades\Storage;
-use Illuminate\Database\Eloquent\Builder;
-use Illuminate\Http\JsonResponse;
-use Illuminate\Support\Facades\Crypt;
-use Illuminate\Support\Facades\Gate;
 use App\Helpers\Helper;
 use App\Http\Controllers\Controller;
 use App\Models\Asset;
-use App\Models\AssetModel;
 use App\Models\Actionlog;
-use \Illuminate\Support\Facades\Auth;
-use Carbon\Carbon;
-use DB;
-use Illuminate\Http\Request;
 use App\Http\Requests\UploadFileRequest;
+use Illuminate\Http\JsonResponse;
 use Illuminate\Support\Facades\Log;
-use Input;
-use Paginator;
-use Slack;
-use Str;
-use TCPDF;
-use Validator;
-use Route;
+use Symfony\Component\HttpFoundation\StreamedResponse;
+use Symfony\Component\HttpFoundation\BinaryFileResponse;
+use Illuminate\Http\Request;
 
 
 /**
@@ -44,12 +33,10 @@ class AssetFilesController extends Controller
      *
      * @param \App\Http\Requests\UploadFileRequest $request
      * @param int $assetId
-     * @return \Illuminate\Http\JsonResponse
-     * @throws \Illuminate\Auth\Access\AuthorizationException
      * @since [v6.0]
      * @author [T. Scarsbrook] [<snipe@scarzybrook.co.uk>]
      */
-    public function store(UploadFileRequest $request, $assetId = null)
+    public function store(UploadFileRequest $request, $assetId = null) : JsonResponse
     {
         // Start by checking if the asset being acted upon exists
         if (! $asset = Asset::find($assetId)) {
@@ -59,7 +46,7 @@ class AssetFilesController extends Controller
         // Make sure we are allowed to update this asset
         $this->authorize('update', $asset);
 
-	if ($request->hasFile('file')) {
+	    if ($request->hasFile('file')) {
             // If the file storage directory doesn't exist; create it
             if (! Storage::exists('private_uploads/assets')) {
                 Storage::makeDirectory('private_uploads/assets', 775);
@@ -84,38 +71,40 @@ class AssetFilesController extends Controller
      * List the files for an asset.
      *
      * @param  int $assetId
-     * @return \Illuminate\Http\JsonResponse
-     * @throws \Illuminate\Auth\Access\AuthorizationException
      * @since [v6.0]
      * @author [T. Scarsbrook] [<snipe@scarzybrook.co.uk>]
      */
-    public function list($assetId = null)
+    public function list(Asset $asset, Request $request) : JsonResponse | array
     {
-        // Start by checking if the asset being acted upon exists
-        if (! $asset = Asset::find($assetId)) {
-            return response()->json(Helper::formatStandardApiResponse('error', null, trans('admin/hardware/message.does_not_exist')), 404);
-        }
-	
-	// the asset is valid
-        if (isset($asset->id)) {
-            $this->authorize('view', $asset);
 
-            // Check that there are some uploads on this asset that can be listed
-            if ($asset->uploads->count() > 0) {
-                $files = array();
-                foreach ($asset->uploads as $upload) {
-                    array_push($files, $upload);
-		}
-                // Give the list of files back to the user
-                return response()->json(Helper::formatStandardApiResponse('success', $files, trans('admin/hardware/message.upload.success')));
-            }
+        $this->authorize('view', $asset);
 
-	    // There are no files.
-            return response()->json(Helper::formatStandardApiResponse('success', array(), trans('admin/hardware/message.upload.success')));
+        $allowed_columns =
+            [
+                'id',
+                'filename',
+                'eol',
+                'notes',
+                'created_at',
+                'updated_at',
+            ];
+
+        $files = Actionlog::select('action_logs.*')->where('action_type', '=', 'uploaded')->where('item_type', '=', Asset::class)->where('item_id', '=', $asset->id);
+
+        if ($request->filled('search')) {
+            $files = $files->TextSearch($request->input('search'));
         }
 
-        // Send back an error message
-        return response()->json(Helper::formatStandardApiResponse('error', null, trans('admin/hardware/message.download.error')), 500);
+        // Make sure the offset and limit are actually integers and do not exceed system limits
+        $offset = ($request->input('offset') > $files->count()) ? $files->count() : abs($request->input('offset'));
+        $limit = app('api_limit_value');
+        $order = $request->input('order') === 'asc' ? 'asc' : 'desc';
+        $sort = in_array($request->input('sort'), $allowed_columns) ? $request->input('sort') : 'created_at';
+        $files = $files->orderBy($sort, $order);
+
+        $files = $files->skip($offset)->take($limit)->get();
+        return (new UploadedFilesTransformer())->transformFiles($files, $files->count());
+
     }
 
     /**
@@ -128,12 +117,8 @@ class AssetFilesController extends Controller
      * @since [v6.0]
      * @author [T. Scarsbrook] [<snipe@scarzybrook.co.uk>]
      */
-    public function show($assetId = null, $fileId = null)
+    public function show(Asset $asset, $fileId = null) : JsonResponse | StreamedResponse | Storage | StorageHelper | BinaryFileResponse
     {
-        // Start by checking if the asset being acted upon exists
-        if (! $asset = Asset::find($assetId)) {
-            return response()->json(Helper::formatStandardApiResponse('error', null, trans('admin/hardware/message.does_not_exist')), 404);
-        }
 
         // the asset is valid
         if (isset($asset->id)) {
@@ -146,7 +131,7 @@ class AssetFilesController extends Controller
 
 	    // Form the full filename with path
             $file = 'private_uploads/assets/'.$log->filename;
-            \Log::debug('Checking for '.$file);
+            Log::debug('Checking for '.$file);
 
             if ($log->action_type == 'audit') {
                 $file = 'private_uploads/audits/'.$log->filename;
@@ -178,17 +163,11 @@ class AssetFilesController extends Controller
      *
      * @param  int $assetId
      * @param  int $fileId
-     * @return \Illuminate\Http\JsonResponse
-     * @throws \Illuminate\Auth\Access\AuthorizationException
      * @since [v6.0]
      * @author [T. Scarsbrook] [<snipe@scarzybrook.co.uk>]
      */
-    public function destroy($assetId = null, $fileId = null)
+    public function destroy(Asset $asset, $fileId = null) : JsonResponse
     {
-        // Start by checking if the asset being acted upon exists
-        if (! $asset = Asset::find($assetId)) {
-            return response()->json(Helper::formatStandardApiResponse('error', null, trans('admin/hardware/message.does_not_exist')), 404);
-        }
 
         $rel_path = 'private_uploads/assets';
 
@@ -198,12 +177,14 @@ class AssetFilesController extends Controller
 
             // Check for the file
             $log = Actionlog::find($fileId);
-	    if ($log) {
-                // Check the file actually exists, and delete it
-                if (Storage::exists($rel_path.'/'.$log->filename)) {
-                    Storage::delete($rel_path.'/'.$log->filename);
-		}
-		// Delete the record of the file
+
+                if ($log) {
+                        // Check the file actually exists, and delete it
+                        if (Storage::exists($rel_path.'/'.$log->filename)) {
+                            Storage::delete($rel_path.'/'.$log->filename);
+                }
+
+		        // Delete the record of the file
                 $log->delete();
 
                 // All deleting done - notify the user of success
diff --git a/app/Http/Controllers/Api/AssetMaintenancesController.php b/app/Http/Controllers/Api/AssetMaintenancesController.php
index 1ecb3be257..b4e9b44196 100644
--- a/app/Http/Controllers/Api/AssetMaintenancesController.php
+++ b/app/Http/Controllers/Api/AssetMaintenancesController.php
@@ -9,9 +9,8 @@ use App\Models\Asset;
 use App\Models\AssetMaintenance;
 use App\Models\Company;
 use Illuminate\Support\Facades\Auth;
-use Carbon\Carbon;
 use Illuminate\Http\Request;
-use Illuminate\Support\Facades\Input;
+use Illuminate\Http\JsonResponse;
 
 /**
  * This controller handles all actions related to Asset Maintenance for
@@ -22,7 +21,6 @@ use Illuminate\Support\Facades\Input;
 class AssetMaintenancesController extends Controller
 {
 
-
     /**
      *  Generates the JSON response for asset maintenances listing view.
      *
@@ -30,14 +28,13 @@ class AssetMaintenancesController extends Controller
      * @author  Vincent Sposato <vincent.sposato@gmail.com>
      * @version v1.0
      * @since [v1.8]
-     * @return string JSON
      */
-    public function index(Request $request)
+    public function index(Request $request) : JsonResponse | array
     {
         $this->authorize('view', Asset::class);
 
         $maintenances = AssetMaintenance::select('asset_maintenances.*')
-            ->with('asset', 'asset.model', 'asset.location', 'asset.defaultLoc', 'supplier', 'asset.company',  'asset.assetstatus', 'admin');
+            ->with('asset', 'asset.model', 'asset.location', 'asset.defaultLoc', 'supplier', 'asset.company',  'asset.assetstatus', 'adminuser');
 
         if ($request->filled('search')) {
             $maintenances = $maintenances->TextSearch($request->input('search'));
@@ -51,6 +48,10 @@ class AssetMaintenancesController extends Controller
             $maintenances->where('asset_maintenances.supplier_id', '=', $request->input('supplier_id'));
         }
 
+        if ($request->filled('created_by')) {
+            $maintenances->where('asset_maintenances.created_by', '=', $request->input('created_by'));
+        }
+
         if ($request->filled('asset_maintenance_type')) {
             $maintenances->where('asset_maintenance_type', '=', $request->input('asset_maintenance_type'));
         }
@@ -72,7 +73,7 @@ class AssetMaintenancesController extends Controller
                                 'asset_tag',
                                 'asset_name',
                                 'serial',
-                                'user_id',
+                                'created_by',
                                 'supplier',
                                 'is_warranty',
                                 'status_label',
@@ -82,8 +83,8 @@ class AssetMaintenancesController extends Controller
         $sort = in_array($request->input('sort'), $allowed_columns) ? e($request->input('sort')) : 'created_at';
 
         switch ($sort) {
-            case 'user_id':
-                $maintenances = $maintenances->OrderAdmin($order);
+            case 'created_by':
+                $maintenances = $maintenances->OrderByCreatedBy($order);
                 break;
             case 'supplier':
                 $maintenances = $maintenances->OrderBySupplier($order);
@@ -120,15 +121,14 @@ class AssetMaintenancesController extends Controller
      * @author  Vincent Sposato <vincent.sposato@gmail.com>
      * @version v1.0
      * @since [v1.8]
-     * @return string JSON
      */
-    public function store(Request $request)
+    public function store(Request $request) : JsonResponse | array
     {
         $this->authorize('update', Asset::class);
         // create a new model instance
         $maintenance = new AssetMaintenance();
         $maintenance->fill($request->all());
-        $maintenance->user_id = Auth::id();
+        $maintenance->created_by = auth()->id();
 
         // Was the asset maintenance created?
         if ($maintenance->save()) {
@@ -148,9 +148,8 @@ class AssetMaintenancesController extends Controller
      * @param int $request
      * @version v1.0
      * @since [v4.0]
-     * @return string JSON
      */
-    public function update(Request $request, $id)
+    public function update(Request $request, $id) : JsonResponse | array
     {
         $this->authorize('update', Asset::class);
 
@@ -186,17 +185,13 @@ class AssetMaintenancesController extends Controller
      * @param int $assetMaintenanceId
      * @version v1.0
      * @since [v4.0]
-     * @return string JSON
      */
-    public function destroy($assetMaintenanceId)
+    public function destroy($assetMaintenanceId) : JsonResponse | array
     {
         $this->authorize('update', Asset::class);
         // Check if the asset maintenance exists
-        $assetMaintenance = AssetMaintenance::findOrFail($assetMaintenanceId);
 
-        if (! Company::isCurrentUserHasAccess($assetMaintenance->asset)) {
-            return response()->json(Helper::formatStandardApiResponse('error', null, 'You cannot delete a maintenance for that asset'));
-        }
+        $assetMaintenance = AssetMaintenance::findOrFail($assetMaintenanceId);
 
         $assetMaintenance->delete();
 
@@ -212,9 +207,8 @@ class AssetMaintenancesController extends Controller
      * @param int $assetMaintenanceId
      * @version v1.0
      * @since [v4.0]
-     * @return string JSON
      */
-    public function show($assetMaintenanceId)
+    public function show($assetMaintenanceId) : JsonResponse | array
     {
         $this->authorize('view', Asset::class);
         $assetMaintenance = AssetMaintenance::findOrFail($assetMaintenanceId);
diff --git a/app/Http/Controllers/Api/AssetModelFilesController.php b/app/Http/Controllers/Api/AssetModelFilesController.php
new file mode 100644
index 0000000000..d0a4747bf4
--- /dev/null
+++ b/app/Http/Controllers/Api/AssetModelFilesController.php
@@ -0,0 +1,184 @@
+<?php
+
+namespace App\Http\Controllers\Api;
+
+use App\Helpers\StorageHelper;
+use Illuminate\Support\Facades\Storage;
+use App\Helpers\Helper;
+use App\Http\Controllers\Controller;
+use App\Models\AssetModel;
+use App\Models\Actionlog;
+use App\Http\Requests\UploadFileRequest;
+use App\Http\Transformers\AssetModelsTransformer;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Support\Facades\Log;
+use Symfony\Component\HttpFoundation\StreamedResponse;
+use Symfony\Component\HttpFoundation\BinaryFileResponse;
+
+
+/**
+ * This class controls file related actions related
+ * to assets for the Snipe-IT Asset Management application.
+ *
+ * Based on the Assets/AssetFilesController by A. Gianotto <snipe@snipe.net>
+ *
+ * @version    v1.0
+ * @author [T. Scarsbrook] [<snipe@scarzybrook.co.uk>]
+ */
+class AssetModelFilesController extends Controller
+{
+    /**
+     * Accepts a POST to upload a file to the server.
+     *
+     * @param \App\Http\Requests\UploadFileRequest $request
+     * @param int $assetModelId
+     * @since [v7.0.12]
+     * @author [r-xyz]
+     */
+    public function store(UploadFileRequest $request, $assetModelId = null) : JsonResponse
+    {
+        // Start by checking if the asset being acted upon exists
+        if (! $assetModel = AssetModel::find($assetModelId)) {
+            return response()->json(Helper::formatStandardApiResponse('error', null, trans('admin/models/message.does_not_exist')), 404);
+        }
+
+        // Make sure we are allowed to update this asset
+        $this->authorize('update', $assetModel);
+
+            if ($request->hasFile('file')) {
+            // If the file storage directory doesn't exist; create it
+            if (! Storage::exists('private_uploads/assetmodels')) {
+                Storage::makeDirectory('private_uploads/assetmodels', 775);
+            }
+
+            // Loop over the attached files and add them to the asset
+            foreach ($request->file('file') as $file) {
+                $file_name = $request->handleFile('private_uploads/assetmodels/','model-'.$assetModel->id, $file);
+                
+                $assetModel->logUpload($file_name, e($request->get('notes')));
+            }
+
+            // All done - report success
+            return response()->json(Helper::formatStandardApiResponse('success', $assetModel, trans('admin/models/message.upload.success')));
+        }
+
+        // We only reach here if no files were included in the POST, so tell the user this
+        return response()->json(Helper::formatStandardApiResponse('error', null, trans('admin/models/message.upload.nofiles')), 500);
+    }
+
+    /**
+     * List the files for an asset.
+     *
+     * @param  int $assetmodel
+     * @since [v7.0.12]
+     * @author [r-xyz]
+     */
+    public function list($assetmodel_id) : JsonResponse | array
+    {
+        // Start by checking if the asset being acted upon exists
+        if (! $assetModel = AssetModel::find($assetmodel_id)) {
+            return response()->json(Helper::formatStandardApiResponse('error', null, trans('admin/models/message.does_not_exist')), 404);
+        }
+
+            $assetmodel = AssetModel::with('uploads')->find($assetmodel_id);
+            $this->authorize('view', $assetmodel);
+            return (new AssetModelsTransformer)->transformAssetModelFiles($assetmodel, $assetmodel->uploads()->count());
+    }
+
+    /**
+     * Check for permissions and display the file.
+     *
+     * @param  int $assetModelId
+     * @param  int $fileId
+     * @return \Illuminate\Http\JsonResponse
+     * @throws \Illuminate\Auth\Access\AuthorizationException
+     * @since [v7.0.12]
+     * @author [r-xyz]
+     */
+    public function show($assetModelId = null, $fileId = null) : JsonResponse | StreamedResponse | Storage | StorageHelper | BinaryFileResponse
+    {
+        // Start by checking if the asset being acted upon exists
+        if (! $assetModel = AssetModel::find($assetModelId)) {
+            return response()->json(Helper::formatStandardApiResponse('error', null, trans('admin/models/message.does_not_exist')), 404);
+        }
+
+        // the asset is valid
+        if (isset($assetModel->id)) {
+            $this->authorize('view', $assetModel);
+
+            // Check that the file being requested exists for the asset
+            if (! $log = Actionlog::whereNotNull('filename')->where('item_id', $assetModel->id)->find($fileId)) {
+                return response()->json(Helper::formatStandardApiResponse('error', null, trans('admin/models/message.download.no_match', ['id' => $fileId])), 404);
+            }
+
+            // Form the full filename with path
+            $file = 'private_uploads/assetmodels/'.$log->filename;
+            Log::debug('Checking for '.$file);
+
+            if ($log->action_type == 'audit') {
+                $file = 'private_uploads/audits/'.$log->filename;
+            }
+
+            // Check the file actually exists on the filesystem
+            if (! Storage::exists($file)) {
+                return response()->json(Helper::formatStandardApiResponse('error', null, trans('admin/models/message.download.does_not_exist', ['id' => $fileId])), 404);
+            }
+
+            if (request('inline') == 'true') {
+
+                $headers = [
+                    'Content-Disposition' => 'inline',
+                ];
+
+                return Storage::download($file, $log->filename, $headers);
+            }
+
+            return StorageHelper::downloader($file);
+        }
+
+        // Send back an error message
+        return response()->json(Helper::formatStandardApiResponse('error', null, trans('admin/models/message.download.error', ['id' => $fileId])), 500);
+    }
+
+    /**
+     * Delete the associated file
+     *
+     * @param  int $assetModelId
+     * @param  int $fileId
+     * @since [v7.0.12]
+     * @author [r-xyz]
+     */
+    public function destroy($assetModelId = null, $fileId = null) : JsonResponse
+    {
+        // Start by checking if the asset being acted upon exists
+        if (! $assetModel = AssetModel::find($assetModelId)) {
+            return response()->json(Helper::formatStandardApiResponse('error', null, trans('admin/models/message.does_not_exist')), 404);
+        }
+
+        $rel_path = 'private_uploads/assetmodels';
+
+        // the asset is valid
+        if (isset($assetModel->id)) {
+            $this->authorize('update', $assetModel);
+
+            // Check for the file
+            $log = Actionlog::find($fileId);
+            if ($log) {
+                // Check the file actually exists, and delete it
+                if (Storage::exists($rel_path.'/'.$log->filename)) {
+                    Storage::delete($rel_path.'/'.$log->filename);
+                }
+                // Delete the record of the file
+                $log->delete();
+
+                // All deleting done - notify the user of success
+                return response()->json(Helper::formatStandardApiResponse('success', null, trans('admin/models/message.deletefile.success')), 200);
+            }
+
+            // The file doesn't seem to really exist, so report an error
+            return response()->json(Helper::formatStandardApiResponse('error', null, trans('admin/models/message.deletefile.error')), 500);
+        }
+
+        return response()->json(Helper::formatStandardApiResponse('error', null, trans('admin/models/message.deletefile.error')), 500);
+    }
+}
diff --git a/app/Http/Controllers/Api/AssetModelsController.php b/app/Http/Controllers/Api/AssetModelsController.php
index f1fa5369d1..3b6b287334 100644
--- a/app/Http/Controllers/Api/AssetModelsController.php
+++ b/app/Http/Controllers/Api/AssetModelsController.php
@@ -4,15 +4,16 @@ namespace App\Http\Controllers\Api;
 
 use App\Helpers\Helper;
 use App\Http\Controllers\Controller;
+use App\Http\Requests\StoreAssetModelRequest;
 use App\Http\Transformers\AssetModelsTransformer;
 use App\Http\Transformers\AssetsTransformer;
 use App\Http\Transformers\SelectlistTransformer;
 use App\Models\Asset;
 use App\Models\AssetModel;
 use Illuminate\Http\Request;
-use App\Http\Requests\ImageUploadRequest;
 use Illuminate\Support\Facades\Storage;
 use Illuminate\Support\Facades\Log;
+use Illuminate\Http\JsonResponse;
 
 /**
  * This class controls all actions related to asset models for
@@ -28,9 +29,8 @@ class AssetModelsController extends Controller
      *
      * @author [A. Gianotto] [<snipe@snipe.net>]
      * @since [v4.0]
-     * @return \Illuminate\Http\Response
      */
-    public function index(Request $request)
+    public function index(Request $request) : JsonResponse | array
     {
         $this->authorize('view', AssetModel::class);
         $allowed_columns =
@@ -48,36 +48,61 @@ class AssetModelsController extends Controller
                 'assets_count',
                 'category',
                 'fieldset',
+                'deleted_at',
+                'updated_at',
             ];
 
         $assetmodels = AssetModel::select([
             'models.id',
             'models.image',
             'models.name',
-            'model_number',
-            'min_amt',
-            'eol',
-            'requestable',
+            'models.model_number',
+            'models.min_amt',
+            'models.eol',
+            'models.created_by',
+            'models.requestable',
             'models.notes',
             'models.created_at',
-            'category_id',
-            'manufacturer_id',
-            'depreciation_id',
-            'fieldset_id',
+            'models.category_id',
+            'models.manufacturer_id',
+            'models.depreciation_id',
+            'models.fieldset_id',
             'models.deleted_at',
             'models.updated_at',
          ])
-            ->with('category', 'depreciation', 'manufacturer', 'fieldset.fields.defaultValues')
+            ->with('category', 'depreciation', 'manufacturer', 'fieldset.fields.defaultValues', 'adminuser')
             ->withCount('assets as assets_count');
 
         if ($request->input('status')=='deleted') {
             $assetmodels->onlyTrashed();
         }
 
+        if ($request->filled('name')) {
+            $assetmodels = $assetmodels->where('models.name', '=', $request->input('name'));
+        }
+
+        if ($request->filled('model_number')) {
+            $assetmodels = $assetmodels->where('models.model_number', '=', $request->input('model_number'));
+        }
+
+        if ($request->input('requestable') == 'true') {
+            $assetmodels = $assetmodels->where('models.requestable', '=', '1');
+        } elseif ($request->input('requestable') == 'false') {
+            $assetmodels = $assetmodels->where('models.requestable', '=', '0');
+        }        
+
+        if ($request->filled('notes')) {
+            $assetmodels = $assetmodels->where('models.notes', '=', $request->input('notes'));
+        }
+
         if ($request->filled('category_id')) {
             $assetmodels = $assetmodels->where('models.category_id', '=', $request->input('category_id'));
         }
 
+        if ($request->filled('depreciation_id')) {
+            $assetmodels = $assetmodels->where('models.depreciation_id', '=', $request->input('depreciation_id'));
+        }
+
         if ($request->filled('search')) {
             $assetmodels->TextSearch($request->input('search'));
         }
@@ -89,7 +114,7 @@ class AssetModelsController extends Controller
         $order = $request->input('order') === 'asc' ? 'asc' : 'desc';
         $sort = in_array($request->input('sort'), $allowed_columns) ? $request->input('sort') : 'models.created_at';
 
-        switch ($sort) {
+        switch ($request->input('sort')) {
             case 'manufacturer':
                 $assetmodels->OrderManufacturer($order);
                 break;
@@ -99,6 +124,9 @@ class AssetModelsController extends Controller
             case 'fieldset':
                 $assetmodels->OrderFieldset($order);
                 break;
+            case 'created_by':
+                $assetmodels->OrderByCreatedByName($order);
+                break;
             default:
                 $assetmodels->orderBy($sort, $order);
                 break;
@@ -116,10 +144,9 @@ class AssetModelsController extends Controller
      *
      * @author [A. Gianotto] [<snipe@snipe.net>]
      * @since [v4.0]
-     * @param  \App\Http\Requests\ImageUploadRequest  $request
-     * @return \Illuminate\Http\Response
+     * @param  \App\Http\Requests\StoreAssetModelRequest  $request
      */
-    public function store(ImageUploadRequest $request)
+    public function store(StoreAssetModelRequest $request) : JsonResponse
     {
         $this->authorize('create', AssetModel::class);
         $assetmodel = new AssetModel;
@@ -140,9 +167,8 @@ class AssetModelsController extends Controller
      * @author [A. Gianotto] [<snipe@snipe.net>]
      * @since [v4.0]
      * @param  int  $id
-     * @return \Illuminate\Http\Response
      */
-    public function show($id)
+    public function show($id) :  array
     {
         $this->authorize('view', AssetModel::class);
         $assetmodel = AssetModel::withCount('assets as assets_count')->findOrFail($id);
@@ -156,9 +182,8 @@ class AssetModelsController extends Controller
      * @author [A. Gianotto] [<snipe@snipe.net>]
      * @since [v4.0]
      * @param  int  $id
-     * @return \Illuminate\Http\Response
      */
-    public function assets($id)
+    public function assets($id) : array
     {
         $this->authorize('view', AssetModel::class);
         $assets = Asset::where('model_id', '=', $id)->get();
@@ -176,7 +201,7 @@ class AssetModelsController extends Controller
      * @param  int  $id
      * @return \Illuminate\Http\Response
      */
-    public function update(ImageUploadRequest $request, $id)
+    public function update(StoreAssetModelRequest $request, $id) : JsonResponse
     {
         $this->authorize('update', AssetModel::class);
         $assetmodel = AssetModel::findOrFail($id);
@@ -209,9 +234,8 @@ class AssetModelsController extends Controller
      * @author [A. Gianotto] [<snipe@snipe.net>]
      * @since [v4.0]
      * @param  int  $id
-     * @return \Illuminate\Http\Response
      */
-    public function destroy($id)
+    public function destroy($id) : JsonResponse
     {
         $this->authorize('delete', AssetModel::class);
         $assetmodel = AssetModel::findOrFail($id);
@@ -241,7 +265,7 @@ class AssetModelsController extends Controller
      * @since [v4.0.16]
      * @see \App\Http\Transformers\SelectlistTransformer
      */
-    public function selectlist(Request $request)
+    public function selectlist(Request $request) : array
     {
 
         $this->authorize('view.selectlists');
diff --git a/app/Http/Controllers/Api/AssetsController.php b/app/Http/Controllers/Api/AssetsController.php
index dc20588b75..57f188d92f 100644
--- a/app/Http/Controllers/Api/AssetsController.php
+++ b/app/Http/Controllers/Api/AssetsController.php
@@ -4,7 +4,9 @@ namespace App\Http\Controllers\Api;
 
 use App\Events\CheckoutableCheckedIn;
 use App\Http\Requests\StoreAssetRequest;
+use App\Http\Requests\UpdateAssetRequest;
 use App\Http\Traits\MigratesLegacyAssetLocations;
+use App\Models\AccessoryCheckout;
 use App\Models\CheckoutAcceptance;
 use App\Models\LicenseSeat;
 use Illuminate\Database\Eloquent\Builder;
@@ -25,18 +27,14 @@ use App\Models\License;
 use App\Models\Location;
 use App\Models\Setting;
 use App\Models\User;
-use \Illuminate\Support\Facades\Auth;
 use Carbon\Carbon;
 use Illuminate\Support\Facades\DB;
 use Illuminate\Http\Request;
-use App\Http\Requests\ImageUploadRequest;
 use Illuminate\Support\Facades\Log;
-use Paginator;
-use Slack;
-use Str;
-use TCPDF;
-use Validator;
 use Illuminate\Support\Facades\Route;
+use App\View\Label;
+use Illuminate\Support\Facades\Storage;
+use Illuminate\Support\Facades\Validator;
 
 
 /**
@@ -56,11 +54,15 @@ class AssetsController extends Controller
      * @author [A. Gianotto] [<snipe@snipe.net>]
      * @param int $assetId
      * @since [v4.0]
-     * @return \Illuminate\Http\JsonResponse
      */
-    public function index(Request $request, $action = null, $upcoming_status = null)
+    public function index(Request $request, $action = null, $upcoming_status = null) : JsonResponse | array
     {
 
+
+        // This handles the legacy audit endpoints :(
+        if ($action == 'audit') {
+            $action = 'audits';
+        }
         $filter_non_deprecable_assets = false;
 
         /**
@@ -80,10 +82,10 @@ class AssetsController extends Controller
             $this->authorize('reports.view');
         } else {
             $transformer = 'App\Http\Transformers\AssetsTransformer';
-            $this->authorize('index', Asset::class);          
+            $this->authorize('index', Asset::class);
         }
-        
-       
+
+
         $settings = Setting::getSettings();
 
         $allowed_columns = [
@@ -126,8 +128,20 @@ class AssetsController extends Controller
         }
 
         $assets = Asset::select('assets.*')
-            ->with('location', 'assetstatus', 'company', 'defaultLoc','assignedTo',
-                'model.category', 'model.manufacturer', 'model.fieldset','supplier'); //it might be tempting to add 'assetlog' here, but don't. It blows up update-heavy users.
+            ->with(
+                'model',
+                'location',
+                'assetstatus',
+                'company',
+                'defaultLoc',
+                'assignedTo',
+                'adminuser',
+                'model.depreciation',
+                'model.category',
+                'model.manufacturer',
+                'model.fieldset',
+                'supplier'
+            ); // it might be tempting to add 'assetlog' here, but don't. It blows up update-heavy users.
 
 
         if ($filter_non_deprecable_assets) {
@@ -159,8 +173,8 @@ class AssetsController extends Controller
          * Handle due and overdue audits and checkin dates
          */
         switch ($action) {
+                // Audit (singular) is left over from earlier legacy APIs
             case 'audits':
-
                 switch ($upcoming_status) {
                     case 'due':
                         $assets->DueForAudit($settings);
@@ -187,7 +201,7 @@ class AssetsController extends Controller
                         break;
                 }
                 break;
-            }
+        }
 
         /**
          * End handling due and overdue audits and checkin dates
@@ -265,7 +279,6 @@ class AssetsController extends Controller
                         $join->on('status_alias.id', '=', 'assets.status_id');
                     });
                 }
-
         }
 
 
@@ -285,9 +298,15 @@ class AssetsController extends Controller
         if ($request->input('requestable') == 'true') {
             $assets->where('assets.requestable', '=', '1');
         }
-
+        
         if ($request->filled('model_id')) {
-            $assets->InModelList([$request->input('model_id')]);
+            // If model_id is already an array, just use it as-is
+            if (is_array($request->input('model_id'))) {
+                $assets->InModelList($request->input('model_id'));
+            } else {
+                // Otherwise, turn it into an array
+                $assets->InModelList([$request->input('model_id')]);
+            }
         }
 
         if ($request->filled('category_id')) {
@@ -345,7 +364,7 @@ class AssetsController extends Controller
         $column_sort = in_array($sort_override, $allowed_columns) ? $sort_override : 'assets.created_at';
 
         $order = $request->input('order') === 'asc' ? 'asc' : 'desc';
-        
+
         switch ($sort_override) {
             case 'model':
                 $assets->OrderModels($order);
@@ -376,8 +395,32 @@ class AssetsController extends Controller
             case 'assigned_to':
                 $assets->OrderAssigned($order);
                 break;
+            case 'created_by':
+                $assets->OrderByCreatedByName($order);
+                break;
             default:
-                $assets->orderBy($column_sort, $order);
+                $numeric_sort = false;
+
+                // Search through the custom fields array to see if we're sorting on a custom field
+                if (array_search($column_sort, $all_custom_fields->pluck('db_column')->toArray()) !== false) {
+
+                    // Check to see if this is a numeric field type
+                    foreach ($all_custom_fields as $field) {
+                        if (($field->db_column == $sort_override) && ($field->format == 'NUMERIC')) {
+                            $numeric_sort = true;
+                            break;
+                        }
+                    }
+
+                    // This may not work for all databases, but it works for MySQL
+                    if ($numeric_sort) {
+                        $assets->orderByRaw(DB::getTablePrefix() . 'assets.' . $sort_override . ' * 1 ' . $order);
+                    } else {
+                        $assets->orderBy($sort_override, $order);
+                    }
+                } else {
+                    $assets->orderBy($column_sort, $order);
+                }
                 break;
         }
 
@@ -388,23 +431,17 @@ class AssetsController extends Controller
 
         $total = $assets->count();
         $assets = $assets->skip($offset)->take($limit)->get();
-        
+
 
         /**
          * Include additional associated relationships
-         */  
+         */
         if ($request->input('components')) {
             $assets->loadMissing(['components' => function ($query) {
                 $query->orderBy('created_at', 'desc');
             }]);
         }
 
-
-
-        /**
-         * Here we're just determining which Transformer (via $transformer) to use based on the 
-         * variables we set earlier on in this method - we default to AssetsTransformer.
-         */
         return (new $transformer)->transformAssets($assets, $total, $request);
     }
 
@@ -415,9 +452,8 @@ class AssetsController extends Controller
      * @param string $tag
      * @since [v4.2.1]
      * @author [A. Gianotto] [<snipe@snipe.net>]
-     * @return \Illuminate\Http\JsonResponse
      */
-    public function showByTag(Request $request, $tag)
+    public function showByTag(Request $request, $tag): JsonResponse | array
     {
         $this->authorize('index', Asset::class);
         $assets = Asset::where('asset_tag', $tag)->with('assetstatus')->with('assignedTo');
@@ -439,12 +475,10 @@ class AssetsController extends Controller
             } else {
                 return (new AssetsTransformer)->transformAssets($assets, $assets->count());
             }
-
         }
 
         // If there are 0 results, return the "no such asset" response
         return response()->json(Helper::formatStandardApiResponse('error', null, trans('admin/hardware/message.does_not_exist')), 200);
-
     }
 
     /**
@@ -455,23 +489,39 @@ class AssetsController extends Controller
      * @since [v4.2.1]
      * @return \Illuminate\Http\JsonResponse
      */
-    public function showBySerial(Request $request, $serial)
+    public function showBySerial(Request $request, $serial): JsonResponse | array
     {
         $this->authorize('index', Asset::class);
-        $assets = Asset::where('serial', $serial)->with('assetstatus')->with('assignedTo');
+        $assets = Asset::where('serial', $serial)->with([
+            'assetstatus',
+            'assignedTo',
+            'company',
+            'defaultLoc',
+            'location',
+            'model.category',
+            'model.depreciation',
+            'model.fieldset',
+            'model.manufacturer',
+            'supplier',
+        ]);
 
         // Check if they've passed ?deleted=true
         if ($request->input('deleted', 'false') == 'true') {
             $assets = $assets->withTrashed();
         }
-        
-        if (($assets = $assets->get()) && ($assets->count()) > 0) {
-             return (new AssetsTransformer)->transformAssets($assets, $assets->count());
+
+        $offset = ($request->input('offset') > $assets->count()) ? $assets->count() : app('api_offset_value');
+        $limit = app('api_limit_value');
+
+        $total = $assets->count();
+        $assets = $assets->skip($offset)->take($limit)->get();
+
+        if (($assets) && ($assets->count()) > 0) {
+            return (new AssetsTransformer)->transformAssets($assets, $total);
         }
 
         // If there are 0 results, return the "no such asset" response
         return response()->json(Helper::formatStandardApiResponse('error', null, trans('admin/hardware/message.does_not_exist')), 200);
-
     }
 
     /**
@@ -482,19 +532,20 @@ class AssetsController extends Controller
      * @since [v4.0]
      * @return \Illuminate\Http\JsonResponse
      */
-    public function show(Request $request, $id)
+    public function show(Request $request, $id): JsonResponse | array
     {
-        if ($asset = Asset::with('assetstatus')->with('assignedTo')->withTrashed()
-            ->withCount('checkins as checkins_count', 'checkouts as checkouts_count', 'userRequests as user_requests_count')->findOrFail($id)) {
+        if ($asset = Asset::with('assetstatus')
+            ->with('assignedTo')->withTrashed()
+            ->withCount('checkins as checkins_count', 'checkouts as checkouts_count', 'userRequests as user_requests_count')->find($id)
+        ) {
             $this->authorize('view', $asset);
 
-            return (new AssetsTransformer)->transformAsset($asset, $request->input('components') );
+            return (new AssetsTransformer)->transformAsset($asset, $request->input('components'));
         }
-
-
+        return response()->json(Helper::formatStandardApiResponse('error', null, trans('admin/hardware/message.does_not_exist')), 200);
     }
 
-    public function licenses(Request $request, $id)
+    public function licenses(Request $request, $id): array
     {
         $this->authorize('view', Asset::class);
         $this->authorize('view', License::class);
@@ -502,7 +553,7 @@ class AssetsController extends Controller
         $licenses = $asset->licenses()->get();
 
         return (new LicensesTransformer())->transformLicenses($licenses, $licenses->count());
-     }
+    }
 
 
     /**
@@ -511,9 +562,8 @@ class AssetsController extends Controller
      * @author [A. Gianotto] [<snipe@snipe.net>]
      * @since [v4.0.16]
      * @see \App\Http\Transformers\SelectlistTransformer
-     * @return \Illuminate\Http\JsonResponse
      */
-    public function selectlist(Request $request)
+    public function selectlist(Request $request): array
     {
 
         $assets = Asset::select([
@@ -524,7 +574,12 @@ class AssetsController extends Controller
             'assets.assigned_to',
             'assets.assigned_type',
             'assets.status_id',
-            ])->with('model', 'assetstatus', 'assignedTo')->NotArchived();
+        ])->with('model', 'assetstatus', 'assignedTo')
+            ->NotArchived();
+
+        if ((Setting::getSettings()->full_multiple_companies_support=='1') &&  ($request->filled('companyId'))) {
+            $assets->where('assets.company_id', $request->input('companyId'));
+        }
 
         if ($request->filled('assetStatusType') && $request->input('assetStatusType') === 'RTD') {
             $assets = $assets->RTD();
@@ -534,7 +589,6 @@ class AssetsController extends Controller
             $assets = $assets->AssignedSearch($request->input('search'));
         }
 
-
         $assets = $assets->paginate(50);
 
         // Loop through and set some custom properties for the transformer to use.
@@ -546,12 +600,12 @@ class AssetsController extends Controller
             $asset->use_text = $asset->present()->fullName;
 
             if (($asset->checkedOutToUser()) && ($asset->assigned)) {
-                $asset->use_text .= ' → '.$asset->assigned->getFullNameAttribute();
+                $asset->use_text .= ' → ' . $asset->assigned->getFullNameAttribute();
             }
 
 
             if ($asset->assetstatus->getStatuslabelType() == 'pending') {
-                $asset->use_text .= '('.$asset->assetstatus->getStatuslabelType().')';
+                $asset->use_text .= '(' . $asset->assetstatus->getStatuslabelType() . ')';
             }
 
             $asset->use_image = ($asset->getImageUrl()) ? $asset->getImageUrl() : null;
@@ -574,15 +628,15 @@ class AssetsController extends Controller
         $asset->model()->associate(AssetModel::find((int) $request->get('model_id')));
 
         $asset->fill($request->validated());
-        $asset->user_id    = Auth::id();
+        $asset->created_by    = auth()->id();
 
         /**
-        * this is here just legacy reasons. Api\AssetController
-        * used image_source  once to allow encoded image uploads.
-        */
+         * this is here just legacy reasons. Api\AssetController
+         * used image_source  once to allow encoded image uploads.
+         */
         if ($request->has('image_source')) {
             $request->offsetSet('image', $request->offsetGet('image_source'));
-        }     
+        }
 
         $asset = $request->handleImages($asset);
 
@@ -599,16 +653,16 @@ class AssetsController extends Controller
 
                 // If input value is null, use custom field's default value
                 if ($field_val == null) {
-                    Log::debug('Field value for '.$field->db_column.' is null');
+                    Log::debug('Field value for ' . $field->db_column . ' is null');
                     $field_val = $field->defaultValue($request->get('model_id'));
-                    Log::debug('Use the default fieldset value of '.$field->defaultValue($request->get('model_id')));
+                    Log::debug('Use the default fieldset value of ' . $field->defaultValue($request->get('model_id')));
                 }
 
                 // if the field is set to encrypted, make sure we encrypt the value
                 if ($field->field_encrypted == '1') {
                     Log::debug('This model field is encrypted in this fieldset.');
 
-                    if (Gate::allows('admin')) {
+                    if (Gate::allows('assets.view.encrypted_custom_fields')) {
 
                         // If input value is null, use custom field's default value
                         if (($field_val == null) && ($request->has('model_id') != '')) {
@@ -619,7 +673,7 @@ class AssetsController extends Controller
                     }
                 }
                 if ($field->element == 'checkbox') {
-                    if(is_array($field_val)) {
+                    if (is_array($field_val)) {
                         $field_val = implode(',', $field_val);
                     }
                 }
@@ -638,7 +692,7 @@ class AssetsController extends Controller
                 $target = Location::find(request('assigned_location'));
             }
             if (isset($target)) {
-                $asset->checkOut($target, Auth::user(), date('Y-m-d H:i:s'), '', 'Checked out on asset creation', e($request->get('name')));
+                $asset->checkOut($target, auth()->user(), date('Y-m-d H:i:s'), '', 'Checked out on asset creation', e($request->get('name')));
             }
 
             if ($asset->image) {
@@ -647,7 +701,9 @@ class AssetsController extends Controller
 
             return response()->json(Helper::formatStandardApiResponse('success', $asset, trans('admin/hardware/message.create.success')));
 
-            return response()->json(Helper::formatStandardApiResponse('success', (new AssetsTransformer)->transformAsset($asset), trans('admin/hardware/message.create.success')));
+            // below is what we want the _eventual_ return to look like - in a more standardized format.
+            // return response()->json(Helper::formatStandardApiResponse('success', (new AssetsTransformer)->transformAsset($asset), trans('admin/hardware/message.create.success')));
+
         }
 
         return response()->json(Helper::formatStandardApiResponse('error', null, $asset->getErrors()), 200);
@@ -658,95 +714,91 @@ class AssetsController extends Controller
      * Accepts a POST request to update an asset
      *
      * @author [A. Gianotto] [<snipe@snipe.net>]
-     * @param \App\Http\Requests\ImageUploadRequest $request
      * @since [v4.0]
-     * @return \Illuminate\Http\JsonResponse
      */
-    public function update(ImageUploadRequest $request, $id)
+    public function update(UpdateAssetRequest $request, Asset $asset): JsonResponse
     {
-        $this->authorize('update', Asset::class);
+        $asset->fill($request->validated());
 
-        if ($asset = Asset::find($id)) {
-            $asset->fill($request->all());
-
-            ($request->filled('model_id')) ?
-                $asset->model()->associate(AssetModel::find($request->get('model_id'))) : null;
-            ($request->filled('rtd_location_id')) ?
-                $asset->location_id = $request->get('rtd_location_id') : '';
-            ($request->filled('company_id')) ?
-                $asset->company_id = Company::getIdForCurrentUser($request->get('company_id')) : '';
-
-            ($request->filled('rtd_location_id')) ?
-                $asset->location_id = $request->get('rtd_location_id') : null;
-
-            /**
-            * this is here just legacy reasons. Api\AssetController
-            * used image_source  once to allow encoded image uploads.
-            */
-            if ($request->has('image_source')) {
-                $request->offsetSet('image', $request->offsetGet('image_source'));
-            }     
-
-            $asset = $request->handleImages($asset);
-            $model = AssetModel::find($asset->model_id);
-            
-            // Update custom fields
-            $problems_updating_encrypted_custom_fields = false;
-            if (($model) && (isset($model->fieldset))) {
-                foreach ($model->fieldset->fields as $field) {
-                    $field_val = $request->input($field->db_column, null);
-
-                    if ($request->has($field->db_column)) {
-                        if ($field->element == 'checkbox') {
-                            if(is_array($field_val)) {
-                                $field_val = implode(',', $field_val);
-                            }
-                        }
-                        if ($field->field_encrypted == '1') {
-                            if (Gate::allows('admin')) {
-                                $field_val = Crypt::encrypt($field_val);
-                            } else {
-                                $problems_updating_encrypted_custom_fields = true;
-                                continue;
-                            }
-                        }
-                        $asset->{$field->db_column} = $field_val;
-                    }
-                }
-            }
-
-
-            if ($asset->save()) {
-                if (($request->filled('assigned_user')) && ($target = User::find($request->get('assigned_user')))) {
-                        $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::class)->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;
-                }
-
-                if (isset($target)) {
-                    $asset->checkOut($target, Auth::user(), date('Y-m-d H:i:s'), '', 'Checked out on asset update', e($request->get('name')), $location);
-                }
-
-                if ($asset->image) {
-                    $asset->image = $asset->getImageUrl();
-                }
-
-                if ($problems_updating_encrypted_custom_fields) {
-                    return response()->json(Helper::formatStandardApiResponse('success', $asset, trans('admin/hardware/message.update.encrypted_warning')));
-                } else {
-                    return response()->json(Helper::formatStandardApiResponse('success', $asset, trans('admin/hardware/message.update.success')));
-                }
-            }
-
-            return response()->json(Helper::formatStandardApiResponse('error', null, $asset->getErrors()), 200);
+        if ($request->has('model_id')) {
+            $asset->model()->associate(AssetModel::find($request->validated()['model_id']));
+        }
+        if ($request->has('company_id')) {
+            $asset->company_id = Company::getIdForCurrentUser($request->validated()['company_id']);
+        }
+        if ($request->has('rtd_location_id') && !$request->has('location_id')) {
+            $asset->location_id = $request->validated()['rtd_location_id'];
+        }
+        if ($request->input('last_audit_date')) {
+            $asset->last_audit_date = Carbon::parse($request->input('last_audit_date'))->startOfDay()->format('Y-m-d H:i:s');
         }
 
-        return response()->json(Helper::formatStandardApiResponse('error', null, trans('admin/hardware/message.does_not_exist')), 200);
+        /**
+         * this is here just legacy reasons. Api\AssetController
+         * used image_source  once to allow encoded image uploads.
+         */
+        if ($request->has('image_source')) {
+            $request->offsetSet('image', $request->offsetGet('image_source'));
+        }
+
+        $asset = $request->handleImages($asset);
+        $model = $asset->model;
+
+        // Update custom fields
+        $problems_updating_encrypted_custom_fields = false;
+        if (($model) && (isset($model->fieldset))) {
+            foreach ($model->fieldset->fields as $field) {
+                $field_val = $request->input($field->db_column, null);
+
+                if ($request->has($field->db_column)) {
+                    if ($field->element == 'checkbox') {
+                        if (is_array($field_val)) {
+                            $field_val = implode(',', $field_val);
+                        }
+                    }
+                    if ($field->field_encrypted == '1') {
+                        if (Gate::allows('assets.view.encrypted_custom_fields')) {
+                            $field_val = Crypt::encrypt($field_val);
+                        } else {
+                            $problems_updating_encrypted_custom_fields = true;
+                            continue;
+                        }
+                    }
+                    $asset->{$field->db_column} = $field_val;
+                }
+            }
+        }
+        if ($asset->save()) {
+            if (($request->filled('assigned_user')) && ($target = User::find($request->get('assigned_user')))) {
+                $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::class)->where('assigned_to', $asset->id)
+                    ->update(['location_id' => $target->location_id]);
+            } elseif (($request->filled('assigned_location')) && ($target = Location::find($request->get('assigned_location')))) {
+                $location = $target->id;
+            }
+
+            if (isset($target)) {
+                $asset->checkOut($target, auth()->user(), date('Y-m-d H:i:s'), '', 'Checked out on asset update', e($request->get('name')), $location);
+            }
+
+            if ($asset->image) {
+                $asset->image = $asset->getImageUrl();
+            }
+
+            if ($problems_updating_encrypted_custom_fields) {
+                return response()->json(Helper::formatStandardApiResponse('success', $asset, trans('admin/hardware/message.update.encrypted_warning')));
+                // Below is the *correct* return since it uses the transformer, but we have to use the old, flat return for now until we can update Jamf2Snipe and Kanji2Snipe
+                // return response()->json(Helper::formatStandardApiResponse('success', (new AssetsTransformer)->transformAsset($asset), trans('admin/hardware/message.update.encrypted_warning')));
+            } else {
+                return response()->json(Helper::formatStandardApiResponse('success', $asset, trans('admin/hardware/message.update.success')));
+                // Below is the *correct* return since it uses the transformer, but we have to use the old, flat return for now until we can update Jamf2Snipe and Kanji2Snipe
+                /// return response()->json(Helper::formatStandardApiResponse('success', (new AssetsTransformer)->transformAsset($asset), trans('admin/hardware/message.update.success')));
+            }
+        }
+        return response()->json(Helper::formatStandardApiResponse('error', null, $asset->getErrors()), 200);
     }
 
 
@@ -756,18 +808,24 @@ class AssetsController extends Controller
      * @author [A. Gianotto] [<snipe@snipe.net>]
      * @param int $assetId
      * @since [v4.0]
-     * @return \Illuminate\Http\JsonResponse
      */
-    public function destroy($id)
+    public function destroy($id): JsonResponse
     {
         $this->authorize('delete', Asset::class);
 
         if ($asset = Asset::find($id)) {
             $this->authorize('delete', $asset);
 
-            DB::table('assets')
-                ->where('id', $asset->id)
-                ->update(['assigned_to' => null]);
+            if ($asset->assignedTo) {
+
+                $target = $asset->assignedTo;
+                $checkin_at = date('Y-m-d H:i:s');
+                $originalValues = $asset->getRawOriginal();
+                event(new CheckoutableCheckedIn($asset, $target, auth()->user(), 'Checkin on delete', $checkin_at, $originalValues));
+                DB::table('assets')
+                    ->where('id', $asset->id)
+                    ->update(['assigned_to' => null]);
+            }
 
             $asset->delete();
 
@@ -777,7 +835,7 @@ class AssetsController extends Controller
         return response()->json(Helper::formatStandardApiResponse('error', null, trans('admin/hardware/message.does_not_exist')), 200);
     }
 
-    
+
 
     /**
      * Restore a soft-deleted asset.
@@ -785,9 +843,8 @@ class AssetsController extends Controller
      * @author [A. Gianotto] [<snipe@snipe.net>]
      * @param int $assetId
      * @since [v5.1.18]
-     * @return \Illuminate\Http\JsonResponse
      */
-    public function restore(Request $request, $assetId = null)
+    public function restore(Request $request, $assetId = null): JsonResponse
     {
 
         if ($asset = Asset::withTrashed()->find($assetId)) {
@@ -806,7 +863,6 @@ class AssetsController extends Controller
         }
 
         return response()->json(Helper::formatStandardApiResponse('error', null, trans('admin/hardware/message.does_not_exist')), 200);
-
     }
 
     /**
@@ -815,9 +871,8 @@ class AssetsController extends Controller
      * @author [N. Butler]
      * @param string $tag
      * @since [v6.0.5]
-     * @return \Illuminate\Http\JsonResponse
      */
-    public function checkoutByTag(AssetCheckoutRequest $request, $tag)
+    public function checkoutByTag(AssetCheckoutRequest $request, $tag): JsonResponse
     {
         if ($asset = Asset::where('asset_tag', $tag)->first()) {
             return $this->checkout($request, $asset->id);
@@ -831,15 +886,14 @@ class AssetsController extends Controller
      * @author [A. Gianotto] [<snipe@snipe.net>]
      * @param int $assetId
      * @since [v4.0]
-     * @return \Illuminate\Http\JsonResponse
      */
-    public function checkout(AssetCheckoutRequest $request, $asset_id)
+    public function checkout(AssetCheckoutRequest $request, $asset_id): JsonResponse
     {
         $this->authorize('checkout', Asset::class);
         $asset = Asset::findOrFail($asset_id);
 
         if (! $asset->availableForCheckout()) {
-            return response()->json(Helper::formatStandardApiResponse('error', ['asset'=> e($asset->asset_tag)], trans('admin/hardware/message.checkout.not_available')));
+            return response()->json(Helper::formatStandardApiResponse('error', ['asset' => e($asset->asset_tag)], trans('admin/hardware/message.checkout.not_available')));
         }
 
         $this->authorize('checkout', $asset);
@@ -856,14 +910,12 @@ class AssetsController extends Controller
             $asset->location_id = ($target) ? $target->id : '';
             $error_payload['target_id'] = $request->input('assigned_location');
             $error_payload['target_type'] = 'location';
-
         } elseif (request('checkout_to_type') == 'asset') {
             $target = Asset::where('id', '!=', $asset_id)->find(request('assigned_asset'));
             // Override with the asset's location_id if it has one
             $asset->location_id = (($target) && (isset($target->location_id))) ? $target->location_id : '';
             $error_payload['target_id'] = $request->input('assigned_asset');
             $error_payload['target_type'] = 'asset';
-
         } elseif (request('checkout_to_type') == 'user') {
             // Fetch the target and set the asset's new location_id
             $target = User::find(request('assigned_user'));
@@ -877,7 +929,7 @@ class AssetsController extends Controller
         }
 
         if (! isset($target)) {
-            return response()->json(Helper::formatStandardApiResponse('error', $error_payload, 'Checkout target for asset '.e($asset->asset_tag).' is invalid - '.$error_payload['target_type'].' does not exist.'));
+            return response()->json(Helper::formatStandardApiResponse('error', $error_payload, 'Checkout target for asset ' . e($asset->asset_tag) . ' is invalid - ' . $error_payload['target_type'] . ' does not exist.'));
         }
 
         $checkout_at = request('checkout_at', date('Y-m-d H:i:s'));
@@ -891,15 +943,15 @@ class AssetsController extends Controller
         // TODO: Follow up here. WTF. Commented out for now. 
 
 
-//        if ((isset($target->rtd_location_id)) && ($asset->rtd_location_id!='')) {
-//            $asset->location_id = $target->rtd_location_id;
-//        }
+        //        if ((isset($target->rtd_location_id)) && ($asset->rtd_location_id!='')) {
+        //            $asset->location_id = $target->rtd_location_id;
+        //        }
 
-        if ($asset->checkOut($target, Auth::user(), $checkout_at, $expected_checkin, $note, $asset_name, $asset->location_id)) {
-            return response()->json(Helper::formatStandardApiResponse('success', ['asset'=> e($asset->asset_tag)], trans('admin/hardware/message.checkout.success')));
+        if ($asset->checkOut($target, auth()->user(), $checkout_at, $expected_checkin, $note, $asset_name, $asset->location_id)) {
+            return response()->json(Helper::formatStandardApiResponse('success', ['asset' => e($asset->asset_tag)], trans('admin/hardware/message.checkout.success')));
         }
 
-        return response()->json(Helper::formatStandardApiResponse('error', ['asset'=> e($asset->asset_tag)], trans('admin/hardware/message.checkout.error')));
+        return response()->json(Helper::formatStandardApiResponse('error', ['asset' => e($asset->asset_tag)], trans('admin/hardware/message.checkout.error')));
     }
 
 
@@ -909,9 +961,8 @@ class AssetsController extends Controller
      * @author [A. Gianotto] [<snipe@snipe.net>]
      * @param int $assetId
      * @since [v4.0]
-     * @return \Illuminate\Http\JsonResponse
      */
-    public function checkin(Request $request, $asset_id)
+    public function checkin(Request $request, $asset_id): JsonResponse
     {
         $asset = Asset::with('model')->findOrFail($asset_id);
         $this->authorize('checkin', $asset);
@@ -919,7 +970,7 @@ class AssetsController extends Controller
         $target = $asset->assignedTo;
         if (is_null($target)) {
             return response()->json(Helper::formatStandardApiResponse('error', [
-                'asset_tag'=> e($asset->asset_tag),
+                'asset_tag' => e($asset->asset_tag),
                 'model' => e($asset->model->name),
                 'model_number' => e($asset->model->model_number)
             ], trans('admin/hardware/message.checkin.already_checked_in')));
@@ -942,16 +993,16 @@ class AssetsController extends Controller
         if ($request->filled('location_id')) {
             $asset->location_id = $request->input('location_id');
 
-            if ($request->input('update_default_location')){
+            if ($request->input('update_default_location')) {
                 $asset->rtd_location_id = $request->input('location_id');
             }
         }
 
-        if ($request->has('status_id')) {
+        if ($request->filled('status_id')) {
             $asset->status_id = $request->input('status_id');
         }
-        
-        $checkin_at = $request->filled('checkin_at') ? $request->input('checkin_at').' '. date('H:i:s') : date('Y-m-d H:i:s');
+
+        $checkin_at = $request->filled('checkin_at') ? $request->input('checkin_at') . ' ' . date('H:i:s') : date('Y-m-d H:i:s');
         $originalValues = $asset->getRawOriginal();
 
         if (($request->filled('checkin_at')) && ($request->get('checkin_at') != date('Y-m-d'))) {
@@ -969,23 +1020,24 @@ class AssetsController extends Controller
                 [Asset::class],
                 function (Builder $query) use ($asset) {
                     $query->where('id', $asset->id);
-                })
+                }
+            )
             ->get()
             ->map(function ($acceptance) {
                 $acceptance->delete();
             });
 
         if ($asset->save()) {
-            event(new CheckoutableCheckedIn($asset, $target, Auth::user(), $request->input('note'), $checkin_at, $originalValues));
+            event(new CheckoutableCheckedIn($asset, $target, auth()->user(), $request->input('note'), $checkin_at, $originalValues));
 
             return response()->json(Helper::formatStandardApiResponse('success', [
-                'asset_tag'=> e($asset->asset_tag),
+                'asset_tag' => e($asset->asset_tag),
                 'model' => e($asset->model->name),
                 'model_number' => e($asset->model->model_number)
             ], trans('admin/hardware/message.checkin.success')));
         }
 
-        return response()->json(Helper::formatStandardApiResponse('error', ['asset'=> e($asset->asset_tag)], trans('admin/hardware/message.checkin.error')));
+        return response()->json(Helper::formatStandardApiResponse('error', ['asset' => e($asset->asset_tag)], trans('admin/hardware/message.checkin.error')));
     }
 
     /**
@@ -993,12 +1045,11 @@ class AssetsController extends Controller
      *
      * @author [A. Janes] [<ajanes@adagiohealth.org>]
      * @since [v6.0]
-     * @return \Illuminate\Http\JsonResponse
      */
-    public function checkinByTag(Request $request, $tag = null)
+    public function checkinByTag(Request $request, $tag = null): JsonResponse
     {
         $this->authorize('checkin', Asset::class);
-        if(null == $tag && null !== ($request->input('asset_tag'))) {
+        if (null == $tag && null !== ($request->input('asset_tag'))) {
             $tag = $request->input('asset_tag');
         }
         $asset = Asset::where('asset_tag', $tag)->first();
@@ -1008,8 +1059,8 @@ class AssetsController extends Controller
         }
 
         return response()->json(Helper::formatStandardApiResponse('error', [
-            'asset'=> e($tag)
-        ], 'Asset with tag '.e($tag).' not found'));
+            'asset' => e($tag)
+        ], 'Asset with tag ' . e($tag) . ' not found'));
     }
 
 
@@ -1019,9 +1070,8 @@ class AssetsController extends Controller
      * @author [A. Gianotto] [<snipe@snipe.net>]
      * @param int $id
      * @since [v4.0]
-     * @return \Illuminate\Http\JsonResponse
      */
-    public function audit(Request $request)
+    public function audit(Request $request, Asset $asset): JsonResponse
 
     {
         $this->authorize('audit', Asset::class);
@@ -1029,36 +1079,15 @@ class AssetsController extends Controller
         $settings = Setting::getSettings();
         $dt = Carbon::now()->addMonths($settings->audit_interval)->toDateString();
 
-        // No tag passed - return an error
-        if (!$request->filled('asset_tag')) {
-            return response()->json(Helper::formatStandardApiResponse('error', [
-                'asset_tag'=> '',
-                'error'=> trans('admin/hardware/message.no_tag'),
-            ], trans('admin/hardware/message.no_tag')), 200);
+        // Allow the asset tag to be passed in the payload (legacy method)
+        if ($request->filled('asset_tag')) {
+            $asset = Asset::where('asset_tag', '=', $request->input('asset_tag'))->first();
         }
 
-
-        $asset = Asset::where('asset_tag', '=', $request->input('asset_tag'))->first();
-
-
         if ($asset) {
 
-            /**
-             * Even though we do a save() further down, we don't want to log this as a "normal" asset update,
-             * which would trigger the Asset Observer and would log an asset *update* log entry (because the
-             * de-normed fields like next_audit_date on the asset itself will change on save()) *in addition* to
-             * the audit log entry we're creating through this controller.
-             *
-             * To prevent this double-logging (one for update and one for audit), we skip the observer and bypass
-             * that de-normed update log entry by using unsetEventDispatcher(), BUT invoking unsetEventDispatcher()
-             * will bypass normal model-level validation that's usually handled at the observer )
-             *
-             * We handle validation on the save() by checking if the asset is valid via the ->isValid() method,
-             * which manually invokes Watson Validating to make sure the asset's model is valid.
-             *
-             * @see \App\Observers\AssetObserver::updating()
-             */
-            $asset->unsetEventDispatcher();
+            $originalValues = $asset->getRawOriginal();
+
             $asset->next_audit_date = $dt;
 
             if ($request->filled('next_audit_date')) {
@@ -1073,35 +1102,88 @@ class AssetsController extends Controller
 
             $asset->last_audit_date = date('Y-m-d H:i:s');
 
+            // Set up the payload for re-display in the API response
+            $payload = [
+                'id' => $asset->id,
+                'asset_tag' => $asset->asset_tag,
+                'note' => $request->input('note'),
+                'next_audit_date' => Helper::getFormattedDateObject($asset->next_audit_date),
+            ];
+
+
+            /**
+             * Update custom fields in the database.
+             * Validation for these fields is handled through the AssetRequest form request
+             * $model = AssetModel::find($request->get('model_id'));
+            */
+            if (($asset->model) && ($asset->model->fieldset)) {
+                $payload['custom_fields'] = [];
+                foreach ($asset->model->fieldset->fields as $field) {
+                    if (($field->display_audit=='1') && ($request->has($field->db_column))) {
+                        if ($field->field_encrypted == '1') {
+                            if (Gate::allows('assets.view.encrypted_custom_fields')) {
+                                if (is_array($request->input($field->db_column))) {
+                                    $asset->{$field->db_column} = Crypt::encrypt(implode(', ', $request->input($field->db_column)));
+                                } else {
+                                    $asset->{$field->db_column} = Crypt::encrypt($request->input($field->db_column));
+                                }
+                            }
+                        } else {
+                            if (is_array($request->input($field->db_column))) {
+                                $asset->{$field->db_column} = implode(', ', $request->input($field->db_column));
+                            } else {
+                                $asset->{$field->db_column} = $request->input($field->db_column);
+                            }
+                        }
+                        $payload['custom_fields'][$field->db_column] =  $request->input($field->db_column);
+                    }
+
+                }
+            }
+
+            // Invoke the validation to see if the audit will complete successfully
+            $asset->setRules($asset->getRules() + $asset->customFieldValidationRules());
+
+            // Validate the rest of the data before we turn off the event dispatcher
+            if ($asset->isInvalid()) {
+                return response()->json(Helper::formatStandardApiResponse('error', ['asset_tag' => $asset->asset_tag],  $asset->getErrors()));
+            }
+
+
+            /**
+             * Even though we do a save() further down, we don't want to log this as a "normal" asset update,
+             * which would trigger the Asset Observer and would log an asset *update* log entry (because the
+             * de-normed fields like next_audit_date on the asset itself will change on save()) *in addition* to
+             * the audit log entry we're creating through this controller.
+             *
+             * To prevent this double-logging (one for update and one for audit), we skip the observer and bypass
+             * that de-normed update log entry by using unsetEventDispatcher(), BUT invoking unsetEventDispatcher()
+             * will bypass normal model-level validation that's usually handled at the observer)
+             *
+             * We handle validation on the save() by checking if the asset is valid via the ->isValid() method,
+             * which manually invokes Watson Validating to make sure the asset's model is valid.
+             *
+             * @see \App\Observers\AssetObserver::updating()
+             * @see \App\Models\Asset::save()
+             */
+
+             $asset->unsetEventDispatcher();
+
+
             /**
              * Invoke Watson Validating to check the asset itself and check to make sure it saved correctly.
              * We have to invoke this manually because of the unsetEventDispatcher() above.)
              */
             if ($asset->isValid() && $asset->save()) {
-                $asset->logAudit(request('note'), request('location_id'));
-
-                return response()->json(Helper::formatStandardApiResponse('success', [
-                    'asset_tag'=> e($asset->asset_tag),
-                    'note'=> e($request->input('note')),
-                    'next_audit_date' => Helper::getFormattedDateObject($asset->next_audit_date),
-                ], trans('admin/hardware/message.audit.success')));
+                $asset->logAudit(request('note'), request('location_id'), null, $originalValues);
+                return response()->json(Helper::formatStandardApiResponse('success', $payload, trans('admin/hardware/message.audit.success')));
             }
 
-            // Asset failed validation or was not able to be saved
-            return response()->json(Helper::formatStandardApiResponse('error', [
-                'asset_tag'=> e($asset->asset_tag),
-                'error'=> $asset->getErrors()->first(),
-            ], trans('admin/hardware/message.audit.error', ['error' => $asset->getErrors()->first()])), 200);
-
         }
 
 
         // No matching asset for the asset tag that was passed.
-        return response()->json(Helper::formatStandardApiResponse('error', [
-            'asset_tag'=> e($request->input('asset_tag')),
-            'error'=> trans('admin/hardware/message.audit.error'),
-        ], trans('admin/hardware/message.audit.error', ['error' => trans('admin/hardware/message.does_not_exist')])), 200);
-
+        return response()->json(Helper::formatStandardApiResponse('error', null,  trans('admin/hardware/message.does_not_exist')), 200);
 
     }
 
@@ -1112,9 +1194,8 @@ class AssetsController extends Controller
      *
      * @author [A. Gianotto] [<snipe@snipe.net>]
      * @since [v4.0]
-     * @return \Illuminate\Http\JsonResponse
      */
-    public function requestable(Request $request)
+    public function requestable(Request $request): JsonResponse | array
     {
         $this->authorize('viewRequestable', Asset::class);
 
@@ -1135,8 +1216,18 @@ class AssetsController extends Controller
         }
 
         $assets = Asset::select('assets.*')
-            ->with('location', 'assetstatus', 'assetlog', 'company','assignedTo',
-                'model.category', 'model.manufacturer', 'model.fieldset', 'supplier', 'requests');
+            ->with(
+                'location',
+                'assetstatus',
+                'assetlog',
+                'company',
+                'assignedTo',
+                'model.category',
+                'model.manufacturer',
+                'model.fieldset',
+                'supplier',
+                'requests'
+            );
 
 
 
@@ -1144,7 +1235,7 @@ class AssetsController extends Controller
         if ($request->filled('search')) {
             $assets->TextSearch($request->input('search'));
         }
-        
+
         // Search custom fields by column name
         foreach ($all_custom_fields as $field) {
             if ($request->filled($field->db_column_name())) {
@@ -1185,4 +1276,115 @@ class AssetsController extends Controller
 
         return (new AssetsTransformer)->transformRequestedAssets($assets, $total);
     }
+
+
+    public function assignedAssets(Request $request, Asset $asset) : JsonResponse | array
+    {
+
+        return [];
+        // to do
+    }
+
+    public function assignedAccessories(Request $request, Asset $asset) : JsonResponse | array
+    {
+        $this->authorize('view', Asset::class);
+        $this->authorize('view', $asset);
+        $accessory_checkouts = AccessoryCheckout::AssetsAssigned()
+            ->where('assigned_to', $asset->id)
+            ->with('adminuser')
+            ->with('accessories');
+
+        $offset = ($request->input('offset') > $accessory_checkouts->count()) ? $accessory_checkouts->count() : app('api_offset_value');
+        $limit = app('api_limit_value');
+
+        $total = $accessory_checkouts->count();
+        $accessory_checkouts = $accessory_checkouts->skip($offset)->take($limit)->get();
+        return (new AssetsTransformer)->transformCheckedoutAccessories($accessory_checkouts, $total);
+    }
+
+
+    /**
+     * Generate asset labels by tag
+     * 
+     * @author [Nebelkreis] [https://github.com/NebelKreis]
+     * 
+     * @param Request $request Contains asset_tags array of asset tags to generate labels for
+     * @return JsonResponse Returns base64 encoded PDF on success, error message on failure
+     */
+    public function getLabels(Request $request): JsonResponse
+    {
+        try {
+            $this->authorize('view', Asset::class);
+
+             // Validate that asset tags were provided in the request
+            if (!$request->filled('asset_tags')) {
+                return response()->json(Helper::formatStandardApiResponse('error', null, 
+                    trans('admin/hardware/message.no_assets_selected')), 400);
+            }
+
+             // Convert asset tags from request into collection and fetch matching assets
+            $asset_tags = collect($request->input('asset_tags'));
+            $assets = Asset::whereIn('asset_tag', $asset_tags)->get();
+
+             // Return error if no assets were found for the provided tags
+            if ($assets->isEmpty()) {
+                return response()->json(Helper::formatStandardApiResponse('error', null,
+                    trans('admin/hardware/message.does_not_exist')), 404);
+            }
+
+            try {
+                $settings = Setting::getSettings();
+
+                // Check if logo file exists in storage and disable logo if not found
+                // This prevents errors when trying to include a non-existent logo in the PDF
+                $settings->label_logo = ($original_logo = $settings->label_logo) && !Storage::disk('public')->exists('/' . $original_logo) ? null : $settings->label_logo;
+
+
+                $label = new Label();
+                
+                if (!$label) {
+                    throw new \Exception('Label object could not be created');
+                }
+
+                // Configure label with assets and settings
+                // bulkedit=false and count=0 are default values for label generation
+                $label = $label->with('assets', $assets)
+                              ->with('settings', $settings)
+                              ->with('bulkedit', false)
+                              ->with('count', 0);
+
+                // Generate PDF using callback function
+                // The callback captures the PDF content in $pdf_content variable
+                $pdf_content = '';
+                $label->render(function($pdf) use (&$pdf_content) {
+                    $pdf_content = $pdf->Output('', 'S');
+                    return $pdf;
+                });
+
+                // Verify PDF was generated successfully
+                if (empty($pdf_content)) {
+                    throw new \Exception('PDF content is empty');
+                }
+
+                $encoded_content = base64_encode($pdf_content);
+
+                return response()->json(Helper::formatStandardApiResponse('success', [
+                    'pdf' => $encoded_content
+                ], trans('admin/hardware/message.labels_generated')));
+
+            } catch (\Exception $e) {
+                return response()->json(Helper::formatStandardApiResponse('error', [
+                    'error_message' => $e->getMessage(),
+                    'error_line' => $e->getLine(),
+                    'error_file' => $e->getFile()
+                ], trans('admin/hardware/message.error_generating_labels')), 500);
+            }
+        } catch (\Exception $e) {
+            return response()->json(Helper::formatStandardApiResponse('error', [
+                'error_message' => $e->getMessage(),
+                'error_line' => $e->getLine(),
+                'error_file' => $e->getFile()
+            ], $e->getMessage()), 500);
+        }
+    }
 }
diff --git a/app/Http/Controllers/Api/CategoriesController.php b/app/Http/Controllers/Api/CategoriesController.php
index 2aa4b3741c..85cb70b126 100644
--- a/app/Http/Controllers/Api/CategoriesController.php
+++ b/app/Http/Controllers/Api/CategoriesController.php
@@ -8,9 +8,9 @@ use App\Http\Transformers\CategoriesTransformer;
 use App\Http\Transformers\SelectlistTransformer;
 use App\Models\Category;
 use Illuminate\Http\Request;
+use Illuminate\Http\JsonResponse;
 use App\Http\Requests\ImageUploadRequest;
 use Illuminate\Support\Facades\Storage;
-use Illuminate\Support\Facades\Validator;
 
 class CategoriesController extends Controller
 {
@@ -21,7 +21,7 @@ class CategoriesController extends Controller
      * @since [v4.0]
      * @return \Illuminate\Http\Response
      */
-    public function index(Request $request)
+    public function index(Request $request) : array
     {
         $this->authorize('view', Category::class);
         $allowed_columns = [
@@ -39,10 +39,12 @@ class CategoriesController extends Controller
             'components_count',
             'licenses_count',
             'image',
+            'notes',
         ];
 
         $categories = Category::select([
             'id',
+            'created_by',
             'created_at',
             'updated_at',
             'name', 'category_type',
@@ -50,8 +52,11 @@ class CategoriesController extends Controller
             'eula_text',
             'require_acceptance',
             'checkin_email',
-            'image'
-            ])->withCount('accessories as accessories_count', 'consumables as consumables_count', 'components as components_count', 'licenses as licenses_count');
+            'image',
+            'notes',
+            ])
+            ->with('adminuser')
+            ->withCount('accessories as accessories_count', 'consumables as consumables_count', 'components as components_count', 'licenses as licenses_count', 'models as models_count');
 
 
         /*
@@ -91,13 +96,33 @@ class CategoriesController extends Controller
             $categories->where('checkin_email', '=', $request->input('checkin_email'));
         }
 
+        if ($request->filled('created_by')) {
+            $categories->where('created_by', '=', $request->input('created_by'));
+        }
+
+        if ($request->filled('created_at')) {
+            $categories->where('created_at', '=', $request->input('created_at'));
+        }
+
+        if ($request->filled('updated_at')) {
+            $categories->where('updated_at', '=', $request->input('updated_at'));
+        }
+
         // Make sure the offset and limit are actually integers and do not exceed system limits
         $offset = ($request->input('offset') > $categories->count()) ? $categories->count() : app('api_offset_value');
         $limit = app('api_limit_value');
-
         $order = $request->input('order') === 'asc' ? 'asc' : 'desc';
-        $sort = in_array($request->input('sort'), $allowed_columns) ? $request->input('sort') : 'assets_count';
-        $categories->orderBy($sort, $order);
+        $sort_override =  $request->input('sort');
+        $column_sort = in_array($sort_override, $allowed_columns) ? $sort_override : 'assets_count';
+
+        switch ($sort_override) {
+            case 'created_by':
+                $categories = $categories->OrderByCreatedBy($order);
+                break;
+            default:
+                $categories = $categories->orderBy($column_sort, $order);
+                break;
+        }
 
         $total = $categories->count();
         $categories = $categories->skip($offset)->take($limit)->get();
@@ -115,7 +140,7 @@ class CategoriesController extends Controller
      * @param  \App\Http\Requests\ImageUploadRequest $request
      * @return \Illuminate\Http\Response
      */
-    public function store(ImageUploadRequest $request)
+    public function store(ImageUploadRequest $request) : JsonResponse
     {
         $this->authorize('create', Category::class);
         $category = new Category;
@@ -136,9 +161,8 @@ class CategoriesController extends Controller
      * @author [A. Gianotto] [<snipe@snipe.net>]
      * @since [v4.0]
      * @param  int  $id
-     * @return \Illuminate\Http\Response
      */
-    public function show($id)
+    public function show($id) : array
     {
         $this->authorize('view', Category::class);
         $category = Category::withCount('assets as assets_count', 'accessories as accessories_count', 'consumables as consumables_count', 'components as components_count', 'licenses as licenses_count')->findOrFail($id);
@@ -156,7 +180,7 @@ class CategoriesController extends Controller
      * @param  int  $id
      * @return \Illuminate\Http\Response
      */
-    public function update(ImageUploadRequest $request, $id)
+    public function update(ImageUploadRequest $request, $id) : JsonResponse
     {
         $this->authorize('update', Category::class);
         $category = Category::findOrFail($id);
@@ -164,7 +188,7 @@ class CategoriesController extends Controller
         // Don't allow the user to change the category_type once it's been created
         if (($request->filled('category_type')) && ($category->category_type != $request->input('category_type'))) {
             return response()->json(
-                Helper::formatStandardApiResponse('error', null,  trans('admin/categories/message.update.cannot_change_category_type'))
+                Helper::formatStandardApiResponse('error', null,  ['category_type' => trans('admin/categories/message.update.cannot_change_category_type')], 422)
             );
         }
         $category->fill($request->all());
@@ -185,10 +209,10 @@ class CategoriesController extends Controller
      * @param  int  $id
      * @return \Illuminate\Http\Response
      */
-    public function destroy($id)
+    public function destroy($id) : JsonResponse
     {
         $this->authorize('delete', Category::class);
-        $category = Category::withCount('assets as assets_count', 'accessories as accessories_count', 'consumables as consumables_count', 'components as components_count', 'licenses as licenses_count')->findOrFail($id);
+        $category = Category::withCount('assets as assets_count', 'accessories as accessories_count', 'consumables as consumables_count', 'components as components_count', 'licenses as licenses_count', 'models as models_count')->findOrFail($id);
 
         if (! $category->isDeletable()) {
             return response()->json(
@@ -208,7 +232,7 @@ class CategoriesController extends Controller
      * @since [v4.0.16]
      * @see \App\Http\Transformers\SelectlistTransformer
      */
-    public function selectlist(Request $request, $category_type = 'asset')
+    public function selectlist(Request $request, $category_type = 'asset') : array
     {
         $this->authorize('view.selectlists');
         $categories = Category::select([
diff --git a/app/Http/Controllers/Api/CheckoutRequest.php b/app/Http/Controllers/Api/CheckoutRequest.php
new file mode 100644
index 0000000000..9b66531ae4
--- /dev/null
+++ b/app/Http/Controllers/Api/CheckoutRequest.php
@@ -0,0 +1,44 @@
+<?php
+
+namespace App\Http\Controllers\Api;
+
+use App\Actions\CheckoutRequests\CancelCheckoutRequestAction;
+use App\Actions\CheckoutRequests\CreateCheckoutRequestAction;
+use App\Exceptions\AssetNotRequestable;
+use App\Helpers\Helper;
+use App\Http\Controllers\Controller;
+use App\Models\Asset;
+use Illuminate\Auth\Access\AuthorizationException;
+use Illuminate\Http\JsonResponse;
+use Exception;
+
+class CheckoutRequest extends Controller
+{
+    public function store(Asset $asset): JsonResponse
+    {
+        try {
+            CreateCheckoutRequestAction::run($asset, auth()->user());
+            return response()->json(Helper::formatStandardApiResponse('success', null, trans('admin/hardware/message.requests.success')));
+        } catch (AssetNotRequestable $e) {
+            return response()->json(Helper::formatStandardApiResponse('error', 'Asset is not requestable'));
+        } catch (AuthorizationException $e) {
+            return response()->json(Helper::formatStandardApiResponse('error', null, trans('general.insufficient_permissions')));
+        } catch (Exception $e) {
+            report($e);
+            return response()->json(Helper::formatStandardApiResponse('error', null, trans('general.something_went_wrong')));
+        }
+    }
+
+    public function destroy(Asset $asset): JsonResponse
+    {
+        try {
+            CancelCheckoutRequestAction::run($asset, auth()->user());
+            return response()->json(Helper::formatStandardApiResponse('success', null, trans('admin/hardware/message.requests.canceled')));
+        } catch (AuthorizationException $e) {
+            return response()->json(Helper::formatStandardApiResponse('error', null, trans('general.insufficient_permissions')));
+        } catch (Exception $e) {
+            report($e);
+            return response()->json(Helper::formatStandardApiResponse('error', null, trans('general.something_went_wrong')));
+        }
+    }
+}
diff --git a/app/Http/Controllers/Api/CompaniesController.php b/app/Http/Controllers/Api/CompaniesController.php
index 9c667973a3..fd7f57ddce 100644
--- a/app/Http/Controllers/Api/CompaniesController.php
+++ b/app/Http/Controllers/Api/CompaniesController.php
@@ -10,6 +10,7 @@ use App\Models\Company;
 use Illuminate\Http\Request;
 use App\Http\Requests\ImageUploadRequest;
 use Illuminate\Support\Facades\Storage;
+use Illuminate\Http\JsonResponse;
 
 class CompaniesController extends Controller
 {
@@ -18,9 +19,8 @@ class CompaniesController extends Controller
      *
      * @author [A. Gianotto] [<snipe@snipe.net>]
      * @since [v4.0]
-     * @return \Illuminate\Http\Response
      */
-    public function index(Request $request)
+    public function index(Request $request) : JsonResponse | array
     {
         $this->authorize('view', Company::class);
 
@@ -38,6 +38,7 @@ class CompaniesController extends Controller
             'accessories_count',
             'consumables_count',
             'components_count',
+            'notes',
         ];
 
         $companies = Company::withCount(['assets as assets_count'  => function ($query) {
@@ -56,17 +57,29 @@ class CompaniesController extends Controller
             $companies->where('email', '=', $request->input('email'));
         }
 
+        if ($request->filled('created_by')) {
+            $companies->where('created_by', '=', $request->input('created_by'));
+        }
+
 
         // Make sure the offset and limit are actually integers and do not exceed system limits
         $offset = ($request->input('offset') > $companies->count()) ? $companies->count() : app('api_offset_value');
         $limit = app('api_limit_value');
-
-
         $order = $request->input('order') === 'asc' ? 'asc' : 'desc';
-        $sort = in_array($request->input('sort'), $allowed_columns) ? $request->input('sort') : 'created_at';
-        $companies->orderBy($sort, $order);
+        $sort_override =  $request->input('sort');
+        $column_sort = in_array($sort_override, $allowed_columns) ? $sort_override : 'created_at';
+
+        switch ($sort_override) {
+            case 'created_by':
+                $companies = $companies->OrderByCreatedBy($order);
+                break;
+            default:
+                $companies = $companies->orderBy($column_sort, $order);
+                break;
+        }
 
         $total = $companies->count();
+
         $companies = $companies->skip($offset)->take($limit)->get();
         return (new CompaniesTransformer)->transformCompanies($companies, $total);
 
@@ -79,9 +92,8 @@ class CompaniesController extends Controller
      * @author [A. Gianotto] [<snipe@snipe.net>]
      * @since [v4.0]
      * @param  \App\Http\Requests\ImageUploadRequest $request
-     * @return \Illuminate\Http\Response
      */
-    public function store(ImageUploadRequest $request)
+    public function store(ImageUploadRequest $request) : JsonResponse
     {
         $this->authorize('create', Company::class);
         $company = new Company;
@@ -102,9 +114,8 @@ class CompaniesController extends Controller
      * @author [A. Gianotto] [<snipe@snipe.net>]
      * @since [v4.0]
      * @param  int  $id
-     * @return \Illuminate\Http\Response
      */
-    public function show($id)
+    public function show($id) : array
     {
         $this->authorize('view', Company::class);
         $company = Company::findOrFail($id);
@@ -120,9 +131,8 @@ class CompaniesController extends Controller
      * @since [v4.0]
      * @param  \App\Http\Requests\ImageUploadRequest  $request
      * @param  int  $id
-     * @return \Illuminate\Http\Response
      */
-    public function update(ImageUploadRequest $request, $id)
+    public function update(ImageUploadRequest $request, $id) : JsonResponse
     {
         $this->authorize('update', Company::class);
         $company = Company::findOrFail($id);
@@ -144,9 +154,8 @@ class CompaniesController extends Controller
      * @author [A. Gianotto] [<snipe@snipe.net>]
      * @since [v4.0]
      * @param  int  $id
-     * @return \Illuminate\Http\Response
      */
-    public function destroy($id)
+    public function destroy($id) : JsonResponse
     {
         $this->authorize('delete', Company::class);
         $company = Company::findOrFail($id);
@@ -169,7 +178,7 @@ class CompaniesController extends Controller
      * @since [v4.0.16]
      * @see \App\Http\Transformers\SelectlistTransformer
      */
-    public function selectlist(Request $request)
+    public function selectlist(Request $request) : array
     {
         $this->authorize('view.selectlists');
         $companies = Company::select([
diff --git a/app/Http/Controllers/Api/ComponentsController.php b/app/Http/Controllers/Api/ComponentsController.php
index 4cf8173eac..8881628b39 100644
--- a/app/Http/Controllers/Api/ComponentsController.php
+++ b/app/Http/Controllers/Api/ComponentsController.php
@@ -5,16 +5,17 @@ namespace App\Http\Controllers\Api;
 use App\Helpers\Helper;
 use App\Http\Controllers\Controller;
 use App\Http\Transformers\ComponentsTransformer;
-use App\Models\Company;
 use App\Models\Component;
 use Illuminate\Http\Request;
 use App\Http\Requests\ImageUploadRequest;
 use App\Events\CheckoutableCheckedIn;
-use App\Events\ComponentCheckedIn;
 use App\Models\Asset;
 use Illuminate\Support\Facades\Validator;
 use Illuminate\Database\Query\Builder;
 use Illuminate\Support\Facades\Log;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Support\Facades\DB;
+use Carbon\Carbon;
 
 class ComponentsController extends Controller
 {
@@ -24,9 +25,8 @@ class ComponentsController extends Controller
      * @author [A. Gianotto] [<snipe@snipe.net>]
      * @since [v4.0]
      *
-     * @return \Illuminate\Http\Response
      */
-    public function index(Request $request)
+    public function index(Request $request) : JsonResponse | array
     {
         $this->authorize('view', Component::class);
 
@@ -38,6 +38,7 @@ class ComponentsController extends Controller
                 'name',
                 'min_amt',
                 'order_number',
+                'model_number',
                 'serial',
                 'purchase_date',
                 'purchase_cost',
@@ -47,7 +48,8 @@ class ComponentsController extends Controller
             ];
 
         $components = Component::select('components.*')
-            ->with('company', 'location', 'category', 'assets', 'supplier');
+            ->with('company', 'location', 'category', 'assets', 'supplier', 'adminuser', 'manufacturer', 'uncontrainedAssets')
+            ->withSum('uncontrainedAssets', 'components_assets.assigned_qty');
 
         if ($request->filled('search')) {
             $components = $components->TextSearch($request->input('search'));
@@ -58,7 +60,7 @@ class ComponentsController extends Controller
         }
 
         if ($request->filled('company_id')) {
-            $components->where('company_id', '=', $request->input('company_id'));
+            $components->where('components.company_id', '=', $request->input('company_id'));
         }
 
         if ($request->filled('category_id')) {
@@ -69,6 +71,14 @@ class ComponentsController extends Controller
             $components->where('supplier_id', '=', $request->input('supplier_id'));
         }
 
+        if ($request->filled('manufacturer_id')) {
+            $components->where('manufacturer_id', '=', $request->input('manufacturer_id'));
+        }
+
+        if ($request->filled('model_number')) {
+            $components->where('model_number', '=', $request->input('model_number'));
+        }
+
         if ($request->filled('location_id')) {
             $components->where('location_id', '=', $request->input('location_id'));
         }
@@ -98,6 +108,12 @@ class ComponentsController extends Controller
             case 'supplier':
                 $components = $components->OrderSupplier($order);
                 break;
+            case 'manufacturer':
+                $components = $components->OrderManufacturer($order);
+                break;
+            case 'created_by':
+                $components = $components->OrderByCreatedBy($order);
+                break;
             default:
                 $components = $components->orderBy($column_sort, $order);
                 break;
@@ -116,9 +132,8 @@ class ComponentsController extends Controller
      * @author [A. Gianotto] [<snipe@snipe.net>]
      * @since [v4.0]
      * @param  \App\Http\Requests\ImageUploadRequest  $request
-     * @return \Illuminate\Http\Response
      */
-    public function store(ImageUploadRequest $request)
+    public function store(ImageUploadRequest $request) : JsonResponse
     {
         $this->authorize('create', Component::class);
         $component = new Component;
@@ -137,9 +152,8 @@ class ComponentsController extends Controller
      *
      * @author [A. Gianotto] [<snipe@snipe.net>]
      * @param  int  $id
-     * @return \Illuminate\Http\Response
      */
-    public function show($id)
+    public function show($id) : array
     {
         $this->authorize('view', Component::class);
         $component = Component::findOrFail($id);
@@ -156,9 +170,8 @@ class ComponentsController extends Controller
      * @since [v4.0]
      * @param   \App\Http\Requests\ImageUploadRequest  $request
      * @param  int  $id
-     * @return \Illuminate\Http\Response
      */
-    public function update(ImageUploadRequest $request, $id)
+    public function update(ImageUploadRequest $request, $id) : JsonResponse
     {
         $this->authorize('update', Component::class);
         $component = Component::findOrFail($id);
@@ -179,13 +192,17 @@ class ComponentsController extends Controller
      * @author [A. Gianotto] [<snipe@snipe.net>]
      * @since [v4.0]
      * @param  int  $id
-     * @return \Illuminate\Http\Response
      */
-    public function destroy($id)
+    public function destroy($id) : JsonResponse
     {
         $this->authorize('delete', Component::class);
         $component = Component::findOrFail($id);
         $this->authorize('delete', $component);
+
+        if ($component->numCheckedOut() > 0) {
+            return response()->json(Helper::formatStandardApiResponse('error', null,  trans('admin/components/message.delete.error_qty')));
+        }
+
         $component->delete();
 
         return response()->json(Helper::formatStandardApiResponse('success', null, trans('admin/components/message.delete.success')));
@@ -198,9 +215,8 @@ class ComponentsController extends Controller
      * @since [v4.0]
      * @param Request $request
      * @param int $id
-     * @return \Illuminate\Http\Response
     */
-    public function getAssets(Request $request, $id)
+    public function getAssets(Request $request, $id) : array
     {
         $this->authorize('view', \App\Models\Asset::class);
         
@@ -241,10 +257,8 @@ class ComponentsController extends Controller
      * @since [v5.1.8]
      * @param Request $request
      * @param int $componentId
-     * @return \Illuminate\Http\RedirectResponse
-     * @throws \Illuminate\Auth\Access\AuthorizationException
      */
-    public function checkout(Request $request, $componentId)
+    public function checkout(Request $request, $componentId) : JsonResponse
     {
         // Check if the component exists
         if (!$component = Component::find($componentId)) {
@@ -275,9 +289,9 @@ class ComponentsController extends Controller
 
             $component->assets()->attach($component->id, [
                 'component_id' => $component->id,
-                'created_at' => \Carbon::now(),
+                'created_at' => Carbon::now(),
                 'assigned_qty' => $request->get('assigned_qty', 1),
-                'user_id' => \Auth::id(),
+                'created_by' => auth()->id(),
                 'asset_id' => $request->get('assigned_to'),
                 'note' => $request->get('note'),
             ]);
@@ -297,15 +311,11 @@ class ComponentsController extends Controller
      * @since [v5.1.8]
      * @param Request $request
      * @param $component_asset_id
-     * @return \Illuminate\Http\RedirectResponse
-     * @throws \Illuminate\Auth\Access\AuthorizationException
      */
-    public function checkin(Request $request, $component_asset_id)
+    public function checkin(Request $request, $component_asset_id) : JsonResponse
     {
-        if ($component_assets = \DB::table('components_assets')->find($component_asset_id)) {
-
+        if ($component_assets = DB::table('components_assets')->find($component_asset_id)) {
             if (is_null($component = Component::find($component_assets->component_id))) {
-
                 return response()->json(Helper::formatStandardApiResponse('error', null, trans('admin/components/message.not_found')));
             }
 
@@ -313,17 +323,13 @@ class ComponentsController extends Controller
 
             $max_to_checkin = $component_assets->assigned_qty;
 
-            if ($max_to_checkin > 1) {
-                
-                $validator = \Validator::make($request->all(), [
-                    "checkin_qty" => "required|numeric|between:1,$max_to_checkin"
-                ]);
-    
-                if ($validator->fails()) {
-                    return response()->json(Helper::formatStandardApiResponse('error', null, 'Checkin quantity must be between 1 and '.$max_to_checkin));
-                }
+            $validator = Validator::make($request->all(), [
+                "checkin_qty" => "required|numeric|between:1,$max_to_checkin"
+            ]);
+
+            if ($validator->fails()) {
+                return response()->json(Helper::formatStandardApiResponse('error', null, 'Checkin quantity must be between 1 and ' . $max_to_checkin));
             }
-            
 
             // Validation passed, so let's figure out what we have to do here.
             $qty_remaining_in_checkout = ($component_assets->assigned_qty - (int)$request->input('checkin_qty', 1));
@@ -333,28 +339,23 @@ class ComponentsController extends Controller
             $component_assets->assigned_qty = $qty_remaining_in_checkout;
 
             Log::debug($component_asset_id.' - '.$qty_remaining_in_checkout.' remaining in record '.$component_assets->id);
-            
-            \DB::table('components_assets')->where('id',
-                $component_asset_id)->update(['assigned_qty' => $qty_remaining_in_checkout]);
+
+            DB::table('components_assets')->where('id', $component_asset_id)->update(['assigned_qty' => $qty_remaining_in_checkout]);
 
             // If the checked-in qty is exactly the same as the assigned_qty,
             // we can simply delete the associated components_assets record
-            if ($qty_remaining_in_checkout == 0) {
-                \DB::table('components_assets')->where('id', '=', $component_asset_id)->delete();
+            if ($qty_remaining_in_checkout === 0) {
+                DB::table('components_assets')->where('id', '=', $component_asset_id)->delete();
             }
-            
 
             $asset = Asset::find($component_assets->asset_id);
 
-            event(new CheckoutableCheckedIn($component, $asset, \Auth::user(), $request->input('note'), \Carbon::now()));
+            event(new CheckoutableCheckedIn($component, $asset, auth()->user(), $request->input('note'), Carbon::now()));
 
             return response()->json(Helper::formatStandardApiResponse('success', null,  trans('admin/components/message.checkin.success')));
-
         }
 
         return response()->json(Helper::formatStandardApiResponse('error', null, 'No matching checkouts for that component join record'));
-
-    
     }
 
 }
diff --git a/app/Http/Controllers/Api/ConsumablesController.php b/app/Http/Controllers/Api/ConsumablesController.php
index 956a176580..7bddde070c 100644
--- a/app/Http/Controllers/Api/ConsumablesController.php
+++ b/app/Http/Controllers/Api/ConsumablesController.php
@@ -5,6 +5,7 @@ namespace App\Http\Controllers\Api;
 use App\Events\CheckoutableCheckedOut;
 use App\Helpers\Helper;
 use App\Http\Controllers\Controller;
+use App\Http\Requests\StoreConsumableRequest;
 use App\Http\Transformers\ConsumablesTransformer;
 use App\Http\Transformers\SelectlistTransformer;
 use App\Models\Company;
@@ -12,8 +13,8 @@ use App\Models\Consumable;
 use App\Models\User;
 use Illuminate\Http\Request;
 use App\Http\Requests\ImageUploadRequest;
-use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\Log;
+use Illuminate\Http\JsonResponse;
 
 class ConsumablesController extends Controller
 {
@@ -22,34 +23,13 @@ class ConsumablesController extends Controller
      *
      * @author [A. Gianotto] [<snipe@snipe.net>]
      * @since [v4.0]
-     *
-     * @return \Illuminate\Http\Response
      */
-    public function index(Request $request)
+    public function index(Request $request) : array
     {
         $this->authorize('index', Consumable::class);
 
-        // This array is what determines which fields should be allowed to be sorted on ON the table itself, no relations
-        // Relations will be handled in query scopes a little further down.
-        $allowed_columns = 
-            [
-                'id',
-                'name',
-                'order_number',
-                'min_amt',
-                'purchase_date',
-                'purchase_cost',
-                'company',
-                'category',
-                'model_number', 
-                'item_no', 
-                'qty',
-                'image',
-                'notes',
-                ];
-
-        $consumables = Consumable::select('consumables.*')
-            ->with('company', 'location', 'category', 'users', 'manufacturer');
+        $consumables = Consumable::with('company', 'location', 'category', 'supplier', 'manufacturer')
+            ->withCount('users as consumables_users_count');
 
         if ($request->filled('search')) {
             $consumables = $consumables->TextSearch(e($request->input('search')));
@@ -60,7 +40,7 @@ class ConsumablesController extends Controller
         }
 
         if ($request->filled('company_id')) {
-            $consumables->where('company_id', '=', $request->input('company_id'));
+            $consumables->where('consumables.company_id', '=', $request->input('company_id'));
         }
 
         if ($request->filled('category_id')) {
@@ -91,15 +71,9 @@ class ConsumablesController extends Controller
         // Make sure the offset and limit are actually integers and do not exceed system limits
         $offset = ($request->input('offset') > $consumables->count()) ? $consumables->count() : app('api_offset_value');
         $limit = app('api_limit_value');
-
-        $allowed_columns = ['id', 'name', 'order_number', 'min_amt', 'purchase_date', 'purchase_cost', 'company', 'category', 'model_number', 'item_no', 'manufacturer', 'location', 'qty', 'image'];
         $order = $request->input('order') === 'asc' ? 'asc' : 'desc';
 
-        $sort_override =  $request->input('sort');
-        $column_sort = in_array($sort_override, $allowed_columns) ? $sort_override : 'created_at';
-
-
-        switch ($sort_override) {
+        switch ($request->input('sort')) {
             case 'category':
                 $consumables = $consumables->OrderCategory($order);
                 break;
@@ -112,11 +86,37 @@ class ConsumablesController extends Controller
             case 'company':
                 $consumables = $consumables->OrderCompany($order);
                 break;
+            case 'remaining':
+                $consumables = $consumables->OrderRemaining($order);
+                break;
             case 'supplier':
-                $components = $consumables->OrderSupplier($order);
+                $consumables = $consumables->OrderSupplier($order);
+                break;
+            case 'created_by':
+                $consumables = $consumables->OrderByCreatedBy($order);
                 break;
             default:
-                $consumables = $consumables->orderBy($column_sort, $order);
+                // This array is what determines which fields should be allowed to be sorted on ON the table itself.
+                // These must match a column on the consumables table directly.
+                $allowed_columns = [
+                    'id',
+                    'name',
+                    'order_number',
+                    'min_amt',
+                    'purchase_date',
+                    'purchase_cost',
+                    'company',
+                    'category',
+                    'model_number',
+                    'item_no',
+                    'manufacturer',
+                    'location',
+                    'qty',
+                    'image'
+                ];
+
+                $sort = in_array($request->input('sort'), $allowed_columns) ? $request->input('sort') : 'created_at';
+                $consumables = $consumables->orderBy($sort, $order);
                 break;
         }
 
@@ -132,9 +132,8 @@ class ConsumablesController extends Controller
      * @author [A. Gianotto] [<snipe@snipe.net>]
      * @since [v4.0]
      * @param  \App\Http\Requests\ImageUploadRequest $request
-     * @return \Illuminate\Http\Response
      */
-    public function store(ImageUploadRequest $request)
+    public function store(StoreConsumableRequest $request) : JsonResponse
     {
         $this->authorize('create', Consumable::class);
         $consumable = new Consumable;
@@ -153,9 +152,8 @@ class ConsumablesController extends Controller
      *
      * @author [A. Gianotto] [<snipe@snipe.net>]
      * @param  int $id
-     * @return \Illuminate\Http\Response
      */
-    public function show($id)
+    public function show($id) : array
     {
         $this->authorize('view', Consumable::class);
         $consumable = Consumable::with('users')->findOrFail($id);
@@ -170,9 +168,8 @@ class ConsumablesController extends Controller
      * @since [v4.0]
      * @param  \App\Http\Requests\ImageUploadRequest $request
      * @param  int $id
-     * @return \Illuminate\Http\Response
      */
-    public function update(ImageUploadRequest $request, $id)
+    public function update(StoreConsumableRequest $request, $id) : JsonResponse
     {
         $this->authorize('update', Consumable::class);
         $consumable = Consumable::findOrFail($id);
@@ -192,9 +189,8 @@ class ConsumablesController extends Controller
      * @author [A. Gianotto] [<snipe@snipe.net>]
      * @since [v4.0]
      * @param  int $id
-     * @return \Illuminate\Http\Response
      */
-    public function destroy($id)
+    public function destroy($id) : JsonResponse
     {
         $this->authorize('delete', Consumable::class);
         $consumable = Consumable::findOrFail($id);
@@ -211,14 +207,13 @@ class ConsumablesController extends Controller
     * @see \App\Http\Controllers\Consumables\ConsumablesController::getView() method that returns the form.
     * @since [v1.0]
     * @param int $consumableId
-    * @return array
      */
-    public function getDataView($consumableId)
+    public function getDataView($consumableId) : array
     {
         $consumable = Consumable::with(['consumableAssignments'=> function ($query) {
             $query->orderBy($query->getModel()->getTable().'.created_at', 'DESC');
         },
-        'consumableAssignments.admin'=> function ($query) {
+        'consumableAssignments.adminuser'=> function ($query) {
         },
         'consumableAssignments.user'=> function ($query) {
         },
@@ -236,7 +231,8 @@ class ConsumablesController extends Controller
                 'name' => ($consumable_assignment->user) ? $consumable_assignment->user->present()->nameUrl() : 'Deleted User',
                 'created_at' => Helper::getFormattedDateObject($consumable_assignment->created_at, 'datetime'),
                 'note' => ($consumable_assignment->note) ? e($consumable_assignment->note) : null,
-                'admin' => ($consumable_assignment->admin) ? $consumable_assignment->admin->present()->nameUrl() : null,
+                'admin' => ($consumable_assignment->adminuser) ? $consumable_assignment->adminuser->present()->nameUrl() : null, // legacy, so we don't change the shape of the response
+                'created_by' => ($consumable_assignment->adminuser) ? $consumable_assignment->adminuser->present()->nameUrl() : null,
             ];
         }
 
@@ -252,9 +248,8 @@ class ConsumablesController extends Controller
      * @author [A. Gutierrez] [<andres@baller.tv>]
      * @param int $id
      * @since [v4.9.5]
-     * @return JsonResponse
      */
-    public function checkout(Request $request, $id)
+    public function checkout(Request $request, $id) : JsonResponse
     {
         // Check if the consumable exists
         if (!$consumable = Consumable::with('users')->find($id)) {
@@ -263,6 +258,8 @@ class ConsumablesController extends Controller
 
         $this->authorize('checkout', $consumable);
 
+        $consumable->checkout_qty = $request->input('checkout_qty', 1);
+
         // Make sure there is at least one available to checkout
         if ($consumable->numRemaining() <= 0) {
             return response()->json(Helper::formatStandardApiResponse('error', null, trans('admin/consumables/message.checkout.unavailable')));
@@ -273,27 +270,35 @@ class ConsumablesController extends Controller
             return response()->json(Helper::formatStandardApiResponse('error', null, trans('general.invalid_item_category_single', ['type' => trans('general.consumable')])));
         }
 
+        // Make sure there is at least one available to checkout
+        if ($consumable->numRemaining() <= 0 || $consumable->checkout_qty > $consumable->numRemaining()) {
+            return response()->json(Helper::formatStandardApiResponse('error', null, trans('admin/consumables/message.checkout.unavailable', ['requested' => $consumable->checkout_qty, 'remaining' => $consumable->numRemaining() ])));
+        }
+
+
 
         // Check if the user exists - @TODO:  this should probably be handled via validation, not here??
         if (!$user = User::find($request->input('assigned_to'))) {
             // Return error message
             return response()->json(Helper::formatStandardApiResponse('error', null, 'No user found'));
-            Log::debug('No valid user');
         }
 
         // Update the consumable data
         $consumable->assigned_to = $request->input('assigned_to');
 
-        $consumable->users()->attach($consumable->id,
+        for ($i = 0; $i < $consumable->checkout_qty; $i++) {
+            $consumable->users()->attach($consumable->id,
                 [
                     'consumable_id' => $consumable->id,
-                    'user_id' => $user->id,
+                    'created_by' => $user->id,
                     'assigned_to' => $request->input('assigned_to'),
                     'note' => $request->input('note'),
                 ]
             );
+        }
 
-        event(new CheckoutableCheckedOut($consumable, $user, Auth::user(), $request->input('note')));
+
+        event(new CheckoutableCheckedOut($consumable, $user, auth()->user(), $request->input('note')));
 
         return response()->json(Helper::formatStandardApiResponse('success', null, trans('admin/consumables/message.checkout.success')));
 
@@ -304,7 +309,7 @@ class ConsumablesController extends Controller
     *
     * @see \App\Http\Transformers\SelectlistTransformer
     */
-    public function selectlist(Request $request)
+    public function selectlist(Request $request) : array
     {
         $consumables = Consumable::select([
             'consumables.id',
diff --git a/app/Http/Controllers/Api/CustomFieldsController.php b/app/Http/Controllers/Api/CustomFieldsController.php
index 470d672ccc..207a92e274 100644
--- a/app/Http/Controllers/Api/CustomFieldsController.php
+++ b/app/Http/Controllers/Api/CustomFieldsController.php
@@ -8,7 +8,8 @@ use App\Http\Transformers\CustomFieldsTransformer;
 use App\Models\CustomField;
 use App\Models\CustomFieldset;
 use Illuminate\Http\Request;
-use Validator;
+use Illuminate\Support\Facades\Validator;
+use Illuminate\Http\JsonResponse;
 
 class CustomFieldsController extends Controller
 {
@@ -20,7 +21,7 @@ class CustomFieldsController extends Controller
      * @since [v3.0]
      * @return array
      */
-    public function index()
+    public function index() : array
     {
         $this->authorize('index', CustomField::class);
         $fields = CustomField::get();
@@ -33,9 +34,8 @@ class CustomFieldsController extends Controller
      * @author [V. Cordes] [<volker@fdatek.de>]
      * @param int $id
      * @since [v4.1.10]
-     * @return View
      */
-    public function show($id)
+    public function show($id) : JsonResponse | array
     {
         $this->authorize('view', CustomField::class);
         if ($field = CustomField::find($id)) {
@@ -52,9 +52,8 @@ class CustomFieldsController extends Controller
      * @since [v4.1.10]
      * @param  \Illuminate\Http\Request  $request
      * @param  int  $id
-     * @return \Illuminate\Http\Response
      */
-    public function update(Request $request, $id)
+    public function update(Request $request, $id) : JsonResponse
     {
         $this->authorize('update', CustomField::class);
         $field = CustomField::findOrFail($id);
@@ -86,9 +85,8 @@ class CustomFieldsController extends Controller
      * @author [V. Cordes] [<volker@fdatek.de>]
      * @since [v4.1.10]
      * @param  \Illuminate\Http\Request  $request
-     * @return \Illuminate\Http\Response
      */
-    public function store(Request $request)
+    public function store(Request $request) : JsonResponse
     {
         $this->authorize('create', CustomField::class);
         $field = new CustomField;
@@ -136,7 +134,7 @@ class CustomFieldsController extends Controller
         return $fieldset->fields()->sync($fields);
     }
 
-    public function associate(Request $request, $field_id)
+    public function associate(Request $request, $field_id) : JsonResponse
     {
         $this->authorize('update', CustomFieldset::class);
 
@@ -155,10 +153,9 @@ class CustomFieldsController extends Controller
         return response()->json(Helper::formatStandardApiResponse('success', $fieldset, trans('admin/custom_fields/message.fieldset.update.success')));
     }
 
-    public function disassociate(Request $request, $field_id)
+    public function disassociate(Request $request, $field_id) : JsonResponse
     {
         $this->authorize('update', CustomFieldset::class);
-
         $field = CustomField::findOrFail($field_id);
 
         $fieldset_id = $request->input('fieldset_id');
@@ -179,9 +176,8 @@ class CustomFieldsController extends Controller
      *
      * @author [Brady Wetherington] [<uberbrady@gmail.com>]
      * @since [v1.8]
-     * @return \Illuminate\Http\RedirectResponse
      */
-    public function destroy($field_id)
+    public function destroy($field_id) : JsonResponse
     {
         $field = CustomField::findOrFail($field_id);
 
diff --git a/app/Http/Controllers/Api/CustomFieldsetsController.php b/app/Http/Controllers/Api/CustomFieldsetsController.php
index 2fa22f5491..5dbd507917 100644
--- a/app/Http/Controllers/Api/CustomFieldsetsController.php
+++ b/app/Http/Controllers/Api/CustomFieldsetsController.php
@@ -9,8 +9,7 @@ use App\Http\Transformers\CustomFieldsTransformer;
 use App\Models\CustomFieldset;
 use App\Models\CustomField;
 use Illuminate\Http\Request;
-use Redirect;
-use View;
+use Illuminate\Http\JsonResponse;
 
 /**
  * This controller handles all actions related to Custom Asset Fieldsets for
@@ -30,9 +29,8 @@ class CustomFieldsetsController extends Controller
      * @author [Josh Gibson]
      * @param int $id
      * @since [v1.8]
-     * @return View
      */
-    public function index()
+    public function index() : array
     {
         $this->authorize('index', CustomField::class);
         $fieldsets = CustomFieldset::withCount('fields as fields_count', 'models as models_count')->get();
@@ -46,9 +44,8 @@ class CustomFieldsetsController extends Controller
      * @author [Josh Gibson]
      * @param int $id
      * @since [v1.8]
-     * @return View
      */
-    public function show($id)
+    public function show($id) : JsonResponse | array
     {
         $this->authorize('view', CustomField::class);
         if ($fieldset = CustomFieldset::find($id)) {
@@ -65,9 +62,8 @@ class CustomFieldsetsController extends Controller
      * @since [v4.0]
      * @param  \Illuminate\Http\Request  $request
      * @param  int  $id
-     * @return \Illuminate\Http\Response
      */
-    public function update(Request $request, $id)
+    public function update(Request $request, $id) : JsonResponse
     {
         $this->authorize('update', CustomField::class);
         $fieldset = CustomFieldset::findOrFail($id);
@@ -86,9 +82,8 @@ class CustomFieldsetsController extends Controller
      * @author [A. Gianotto] [<snipe@snipe.net>]
      * @since [v4.0]
      * @param  \Illuminate\Http\Request  $request
-     * @return \Illuminate\Http\Response
      */
-    public function store(Request $request)
+    public function store(Request $request) : JsonResponse
     {
         $this->authorize('create', CustomField::class);
         $fieldset = new CustomFieldset;
@@ -118,9 +113,8 @@ class CustomFieldsetsController extends Controller
      *
      * @author [A. Gianotto] [<snipe@snipe.net>]
      * @since [v4.0]
-     * @return \Illuminate\Http\RedirectResponse
      */
-    public function destroy($id)
+    public function destroy($id) : JsonResponse
     {
         $this->authorize('delete', CustomField::class);
         $fieldset = CustomFieldset::findOrFail($id);
@@ -147,7 +141,7 @@ class CustomFieldsetsController extends Controller
      * @param $fieldsetId
      * @return string JSON
      */
-    public function fields($id)
+    public function fields($id) : array
     {
         $this->authorize('view', CustomField::class);
         $set = CustomFieldset::findOrFail($id);
@@ -164,14 +158,11 @@ class CustomFieldsetsController extends Controller
      * @param $fieldsetId
      * @return string JSON
      */
-    public function fieldsWithDefaultValues($fieldsetId, $modelId)
+    public function fieldsWithDefaultValues($fieldsetId, $modelId) : array
     {
         $this->authorize('view', CustomField::class);
-
         $set = CustomFieldset::findOrFail($fieldsetId);
-
         $fields = $set->fields;
-
         return (new CustomFieldsTransformer)->transformCustomFieldsWithDefaultValues($fields, $modelId, $fields->count());
     }
 }
diff --git a/app/Http/Controllers/Api/DepartmentsController.php b/app/Http/Controllers/Api/DepartmentsController.php
index 485e614b25..167d5cbc2a 100644
--- a/app/Http/Controllers/Api/DepartmentsController.php
+++ b/app/Http/Controllers/Api/DepartmentsController.php
@@ -6,12 +6,11 @@ use App\Helpers\Helper;
 use App\Http\Controllers\Controller;
 use App\Http\Transformers\DepartmentsTransformer;
 use App\Http\Transformers\SelectlistTransformer;
-use App\Models\Company;
 use App\Models\Department;
-use Illuminate\Support\Facades\Auth;
 use Illuminate\Http\Request;
 use App\Http\Requests\ImageUploadRequest;
 use Illuminate\Support\Facades\Storage;
+use Illuminate\Http\JsonResponse;
 
 class DepartmentsController extends Controller
 {
@@ -20,12 +19,11 @@ class DepartmentsController extends Controller
      *
      * @author [Godfrey Martinez] [<snipe@snipe.net>]
      * @since [v4.0]
-     * @return \Illuminate\Http\Response
      */
-    public function index(Request $request)
+    public function index(Request $request) : JsonResponse | array
     {
         $this->authorize('view', Department::class);
-        $allowed_columns = ['id', 'name', 'image', 'users_count'];
+        $allowed_columns = ['id', 'name', 'image', 'users_count', 'notes'];
 
         $departments = Department::select(
             'departments.id',
@@ -37,7 +35,8 @@ class DepartmentsController extends Controller
             'departments.manager_id',
             'departments.created_at',
             'departments.updated_at',
-            'departments.image'
+            'departments.image',
+            'departments.notes',
         )->with('users')->with('location')->with('manager')->with('company')->withCount('users as users_count');
 
         if ($request->filled('search')) {
@@ -74,6 +73,9 @@ class DepartmentsController extends Controller
             case 'manager':
                 $departments->OrderManager($order);
                 break;
+            case 'company':
+                $departments->OrderCompany($order);
+                break;
             default:
                 $departments->orderBy($sort, $order);
                 break;
@@ -91,16 +93,15 @@ class DepartmentsController extends Controller
      * @author [A. Gianotto] [<snipe@snipe.net>]
      * @since [v4.0]
      * @param  \App\Http\Requests\ImageUploadRequest  $request
-     * @return \Illuminate\Http\Response
      */
-    public function store(ImageUploadRequest $request)
+    public function store(ImageUploadRequest $request) : JsonResponse
     {
         $this->authorize('create', Department::class);
         $department = new Department;
         $department->fill($request->all());
         $department = $request->handleImages($department);
 
-        $department->user_id = Auth::user()->id;
+        $department->created_by = auth()->id();
         $department->manager_id = ($request->filled('manager_id') ? $request->input('manager_id') : null);
 
         if ($department->save()) {
@@ -116,13 +117,11 @@ class DepartmentsController extends Controller
      * @author [A. Gianotto] [<snipe@snipe.net>]
      * @since [v4.0]
      * @param  int  $id
-     * @return \Illuminate\Http\Response
      */
-    public function show($id)
+    public function show($id) : array
     {
         $this->authorize('view', Department::class);
         $department = Department::findOrFail($id);
-
         return (new DepartmentsTransformer)->transformDepartment($department);
     }
 
@@ -133,9 +132,8 @@ class DepartmentsController extends Controller
      * @since [v5.0]
      * @param  \App\Http\Requests\ImageUploadRequest  $request
      * @param  int  $id
-     * @return \Illuminate\Http\Response
      */
-    public function update(ImageUploadRequest $request, $id)
+    public function update(ImageUploadRequest $request, $id) : JsonResponse
     {
         $this->authorize('update', Department::class);
         $department = Department::findOrFail($id);
@@ -156,9 +154,8 @@ class DepartmentsController extends Controller
      * @author [A. Gianotto] [<snipe@snipe.net>]
      * @param int $locationId
      * @since [v4.0]
-     * @return \Illuminate\Http\RedirectResponse
      */
-    public function destroy($id)
+    public function destroy($id) : JsonResponse
     {
         $department = Department::findOrFail($id);
 
@@ -180,7 +177,7 @@ class DepartmentsController extends Controller
      * @since [v4.0.16]
      * @see \App\Http\Transformers\SelectlistTransformer
      */
-    public function selectlist(Request $request)
+    public function selectlist(Request $request) : array
     {
 
         $this->authorize('view.selectlists');
diff --git a/app/Http/Controllers/Api/DepreciationsController.php b/app/Http/Controllers/Api/DepreciationsController.php
index 502a0741b7..254a72c98e 100644
--- a/app/Http/Controllers/Api/DepreciationsController.php
+++ b/app/Http/Controllers/Api/DepreciationsController.php
@@ -7,6 +7,7 @@ use App\Http\Controllers\Controller;
 use App\Http\Transformers\DepreciationsTransformer;
 use App\Models\Depreciation;
 use Illuminate\Http\Request;
+use Illuminate\Http\JsonResponse;
 
 class DepreciationsController extends Controller
 {
@@ -15,14 +16,27 @@ class DepreciationsController extends Controller
      *
      * @author [A. Gianotto] [<snipe@snipe.net>]
      * @since [v4.0]
-     * @return \Illuminate\Http\Response
      */
-    public function index(Request $request)
+    public function index(Request $request) : JsonResponse | array
     {
         $this->authorize('view', Depreciation::class);
-        $allowed_columns = ['id','name','months','depreciation_min','created_at'];
+        $allowed_columns = [
+            'id',
+            'name',
+            'months',
+            'depreciation_min',
+            'depreciation_type',
+            'created_at',
+            'assets_count',
+            'models_count',
+            'licenses_count',
+        ];
 
-        $depreciations = Depreciation::select('id','name','months','depreciation_min','user_id','created_at','updated_at');
+        $depreciations = Depreciation::select('id','name','months','depreciation_min','depreciation_type','created_at','updated_at', 'created_by')
+            ->with('adminuser')
+            ->withCount('assets as assets_count')
+            ->withCount('models as models_count')
+            ->withCount('licenses as licenses_count');
 
         if ($request->filled('search')) {
             $depreciations = $depreciations->TextSearch($request->input('search'));
@@ -31,10 +45,18 @@ class DepreciationsController extends Controller
         // Make sure the offset and limit are actually integers and do not exceed system limits
         $offset = ($request->input('offset') > $depreciations->count()) ? $depreciations->count() : app('api_offset_value');
         $limit = app('api_limit_value');
-
         $order = $request->input('order') === 'asc' ? 'asc' : 'desc';
-        $sort = in_array($request->input('sort'), $allowed_columns) ? $request->input('sort') : 'created_at';
-        $depreciations->orderBy($sort, $order);
+        $sort_override =  $request->input('sort');
+        $column_sort = in_array($sort_override, $allowed_columns) ? $sort_override : 'created_at';
+
+        switch ($sort_override) {
+            case 'created_by':
+                $depreciations = $depreciations->OrderByCreatedBy($order);
+                break;
+            default:
+                $depreciations = $depreciations->orderBy($column_sort, $order);
+                break;
+        }
 
         $total = $depreciations->count();
         $depreciations = $depreciations->skip($offset)->take($limit)->get();
@@ -48,9 +70,8 @@ class DepreciationsController extends Controller
      * @author [A. Gianotto] [<snipe@snipe.net>]
      * @since [v4.0]
      * @param  \Illuminate\Http\Request  $request
-     * @return \Illuminate\Http\Response
      */
-    public function store(Request $request)
+    public function store(Request $request) : JsonResponse
     {
         $this->authorize('create', Depreciation::class);
         $depreciation = new Depreciation;
@@ -69,9 +90,8 @@ class DepreciationsController extends Controller
      * @author [A. Gianotto] [<snipe@snipe.net>]
      * @since [v4.0]
      * @param  int  $id
-     * @return \Illuminate\Http\Response
      */
-    public function show($id)
+    public function show($id) : JsonResponse | array
     {
         $this->authorize('view', Depreciation::class);
         $depreciation = Depreciation::findOrFail($id);
@@ -86,9 +106,8 @@ class DepreciationsController extends Controller
      * @since [v4.0]
      * @param  \Illuminate\Http\Request  $request
      * @param  int  $id
-     * @return \Illuminate\Http\Response
      */
-    public function update(Request $request, $id)
+    public function update(Request $request, $id) : JsonResponse
     {
         $this->authorize('update', Depreciation::class);
         $depreciation = Depreciation::findOrFail($id);
@@ -107,9 +126,8 @@ class DepreciationsController extends Controller
      * @author [A. Gianotto] [<snipe@snipe.net>]
      * @since [v4.0]
      * @param  int  $id
-     * @return \Illuminate\Http\Response
      */
-    public function destroy($id)
+    public function destroy($id) : JsonResponse
     {
         $this->authorize('delete', Depreciation::class);
         $depreciation = Depreciation::withCount('models as models_count')->findOrFail($id);
diff --git a/app/Http/Controllers/Api/GroupsController.php b/app/Http/Controllers/Api/GroupsController.php
index f1eafd49dc..0f474ece83 100644
--- a/app/Http/Controllers/Api/GroupsController.php
+++ b/app/Http/Controllers/Api/GroupsController.php
@@ -7,7 +7,7 @@ use App\Http\Controllers\Controller;
 use App\Http\Transformers\GroupsTransformer;
 use App\Models\Group;
 use Illuminate\Http\Request;
-use Illuminate\Support\Facades\Auth;
+use Illuminate\Http\JsonResponse;
 
 
 class GroupsController extends Controller
@@ -17,16 +17,14 @@ class GroupsController extends Controller
      *
      * @author [A. Gianotto] [<snipe@snipe.net>]
      * @since [v4.0]
-     * @return \Illuminate\Http\Response
      */
-    public function index(Request $request)
+    public function index(Request $request) : JsonResponse | array
     {
         $this->authorize('superadmin');
 
         $this->authorize('view', Group::class);
-        $allowed_columns = ['id', 'name', 'created_at', 'users_count'];
 
-        $groups = Group::select('id', 'name', 'permissions', 'created_at', 'updated_at', 'created_by')->with('admin')->withCount('users as users_count');
+        $groups = Group::select('id', 'name', 'permissions', 'notes', 'created_at', 'updated_at', 'created_by')->with('adminuser')->withCount('users as users_count');
 
         if ($request->filled('search')) {
             $groups = $groups->TextSearch($request->input('search'));
@@ -36,13 +34,29 @@ class GroupsController extends Controller
             $groups->where('name', '=', $request->input('name'));
         }
 
-        // Make sure the offset and limit are actually integers and do not exceed system limits
+
         $offset = ($request->input('offset') > $groups->count()) ? $groups->count() : app('api_offset_value');
         $limit = app('api_limit_value');
-
         $order = $request->input('order') === 'asc' ? 'asc' : 'desc';
-        $sort = in_array($request->input('sort'), $allowed_columns) ? $request->input('sort') : 'created_at';
-        $groups->orderBy($sort, $order);
+
+        switch ($request->input('sort')) {
+            case 'created_by':
+                $groups = $groups->OrderByCreatedBy($order);
+                break;
+            default:
+                // This array is what determines which fields should be allowed to be sorted on ON the table itself.
+                // These must match a column on the consumables table directly.
+                $allowed_columns = [
+                    'id',
+                    'name',
+                    'created_at',
+                    'users_count',
+                ];
+
+                $sort = in_array($request->input('sort'), $allowed_columns) ? $request->input('sort') : 'created_at';
+                $groups = $groups->orderBy($sort, $order);
+                break;
+        }
 
         $total = $groups->count();
         $groups = $groups->skip($offset)->take($limit)->get();
@@ -56,18 +70,18 @@ class GroupsController extends Controller
      * @author [A. Gianotto] [<snipe@snipe.net>]
      * @since [v4.0]
      * @param  \Illuminate\Http\Request  $request
-     * @return \Illuminate\Http\Response
      */
-    public function store(Request $request)
+    public function store(Request $request) : JsonResponse
     {
         $this->authorize('superadmin');
         $group = new Group;
         // Get all the available permissions
-        $permissions = config('permissions');
+        $permissions = json_encode(config('permissions'));
         $groupPermissions = Helper::selectedPermissionsArray($permissions, $permissions);
 
         $group->name = $request->input('name');
-        $group->created_by = Auth::user()->id;
+        $group->created_by = auth()->id();
+        $group->notes = $request->input('notes');
         $group->permissions = json_encode($request->input('permissions', $groupPermissions));
 
         if ($group->save()) {
@@ -83,9 +97,8 @@ class GroupsController extends Controller
      * @author [A. Gianotto] [<snipe@snipe.net>]
      * @since [v4.0]
      * @param  int  $id
-     * @return \Illuminate\Http\Response
      */
-    public function show($id)
+    public function show($id) : array
     {
         $this->authorize('superadmin');
         $group = Group::findOrFail($id);
@@ -99,14 +112,14 @@ class GroupsController extends Controller
      * @since [v4.0]
      * @param  \Illuminate\Http\Request  $request
      * @param  int  $id
-     * @return \Illuminate\Http\Response
      */
-    public function update(Request $request, $id)
+    public function update(Request $request, $id) : JsonResponse
     {
         $this->authorize('superadmin');
         $group = Group::findOrFail($id);
 
         $group->name = $request->input('name');
+        $group->notes = $request->input('notes');
         $group->permissions = $request->input('permissions'); // Todo - some JSON validation stuff here
 
         if ($group->save()) {
@@ -122,9 +135,8 @@ class GroupsController extends Controller
      * @author [A. Gianotto] [<snipe@snipe.net>]
      * @since [v4.0]
      * @param  int  $id
-     * @return \Illuminate\Http\Response
      */
-    public function destroy($id)
+    public function destroy($id) : JsonResponse
     {
         $this->authorize('superadmin');
         $group = Group::findOrFail($id);
diff --git a/app/Http/Controllers/Api/ImportController.php b/app/Http/Controllers/Api/ImportController.php
index d5323bfdd4..c18df26683 100644
--- a/app/Http/Controllers/Api/ImportController.php
+++ b/app/Http/Controllers/Api/ImportController.php
@@ -9,27 +9,28 @@ use App\Http\Transformers\ImportsTransformer;
 use App\Models\Asset;
 use App\Models\Company;
 use App\Models\Import;
+use Illuminate\Http\UploadedFile;
 use Illuminate\Support\Facades\Artisan;
 use Illuminate\Database\Eloquent\JsonEncodingException;
 use Illuminate\Support\Facades\Request;
 use Illuminate\Support\Facades\Session;
 use Illuminate\Support\Facades\Storage;
 use League\Csv\Reader;
+use Onnov\DetectEncoding\EncodingDetector;
 use Symfony\Component\HttpFoundation\File\Exception\FileException;
 use Illuminate\Support\Facades\Log;
+use Illuminate\Http\JsonResponse;
 
 class ImportController extends Controller
 {
     /**
      * Display a listing of the resource.
      *
-     * @return \Illuminate\Http\Response
      */
-    public function index()
+    public function index() : JsonResponse | array
     {
         $this->authorize('import');
-        $imports = Import::latest()->get();
-
+        $imports = Import::with('adminuser')->latest()->get();
         return (new ImportsTransformer)->transformImports($imports);
     }
 
@@ -37,9 +38,8 @@ class ImportController extends Controller
      * Process and store a CSV upload file.
      *
      * @param  \Illuminate\Http\Request  $request
-     * @return \Illuminate\Http\JsonResponse
      */
-    public function store()
+    public function store() : JsonResponse
     {
         $this->authorize('import');
         if (! config('app.lock_passwords')) {
@@ -47,6 +47,8 @@ class ImportController extends Controller
             $path = config('app.private_uploads').'/imports';
             $results = [];
             $import = new Import;
+            $detector = new EncodingDetector();
+
             foreach ($files as $file) {
                 if (! in_array($file->getMimeType(), [
                     'application/vnd.ms-excel',
@@ -57,7 +59,6 @@ class ImportController extends Controller
                     'text/comma-separated-values',
                     'text/tsv', ])) {
                     $results['error'] = 'File type must be CSV. Uploaded file is '.$file->getMimeType();
-
                     return response()->json(Helper::formatStandardApiResponse('error', null, $results['error']), 422);
                 }
 
@@ -65,6 +66,40 @@ class ImportController extends Controller
                 if (! ini_get('auto_detect_line_endings')) {
                     ini_set('auto_detect_line_endings', '1');
                 }
+                if (function_exists('iconv')) {
+                    $file_contents = $file->getContent(); //TODO - this *does* load the whole file in RAM, but we need that to be able to 'iconv' it?
+                    $encoding = $detector->getEncoding($file_contents);
+                    \Log::warning("Discovered encoding: $encoding in uploaded CSV");
+                    $reader = null;
+                    if (strcasecmp($encoding, 'UTF-8') != 0) {
+                        $transliterated = false;
+                        try {
+                            $transliterated = iconv(strtoupper($encoding), 'UTF-8', $file_contents);
+                        } catch (\Exception $e) {
+                            $transliterated = false; //blank out the partially-decoded string
+                            return response()->json(
+                                Helper::formatStandardApiResponse(
+                                    'error',
+                                    null,
+                                    trans('admin/hardware/message.import.transliterate_failure', ["encoding" => $encoding])
+                                ),
+                                422
+                            );
+                        }
+                        if ($transliterated !== false) {
+                            $tmpname = tempnam(sys_get_temp_dir(), '');
+                            $tmpresults = file_put_contents($tmpname, $transliterated);
+                            $transliterated = null; //save on memory?
+                            if ($tmpresults !== false) {
+                                $newfile = new UploadedFile($tmpname, $file->getClientOriginalName(), null, null, true); //WARNING: this is enabling 'test mode' - which is gross, but otherwise the file won't be treated as 'uploaded'
+                                if ($newfile->isValid()) {
+                                    $file = $newfile;
+                                }
+                            }
+                        }
+                    }
+                    $file_contents = null; //try to save on memory, I guess?
+                }
                 $reader = Reader::createFromFileObject($file->openFile('r')); //file pointer leak?
 
                 try {
@@ -134,7 +169,7 @@ class ImportController extends Controller
                 }
 
                 $import->filesize = filesize($path.'/'.$file_name);
-                
+                $import->created_by = auth()->id();
                 $import->save();
                 $results[] = $import;
             }
@@ -152,9 +187,8 @@ class ImportController extends Controller
      * Processes the specified Import.
      *
      * @param  int  $import_id
-     * @return \Illuminate\Http\Response
      */
-    public function process(ItemImportRequest $request, $import_id)
+    public function process(ItemImportRequest $request, $import_id) : JsonResponse
     {
         $this->authorize('import');
 
@@ -179,6 +213,9 @@ class ImportController extends Controller
             case 'asset':
                 $redirectTo = 'hardware.index';
                 break;
+            case 'assetModel':
+                $redirectTo = 'models.index';
+                break;
             case 'accessory':
                 $redirectTo = 'accessories.index';
                 break;
@@ -197,6 +234,15 @@ class ImportController extends Controller
             case 'location':
                 $redirectTo = 'locations.index';
                 break;
+            case 'supplier':
+                $redirectTo = 'suppliers.index';
+                break;
+            case 'manufacturer':
+                $redirectTo = 'manufacturers.index';
+                break;
+            case 'category':
+                $redirectTo = 'categories.index';
+                break;
         }
 
         if ($errors) { //Failure
@@ -212,9 +258,8 @@ class ImportController extends Controller
      * Remove the specified resource from storage.
      *
      * @param  int  $import_id
-     * @return \Illuminate\Http\Response
      */
-    public function destroy($import_id)
+    public function destroy($import_id) : JsonResponse
     {
         $this->authorize('create', Asset::class);
 
@@ -231,6 +276,8 @@ class ImportController extends Controller
 
                 return response()->json(Helper::formatStandardApiResponse('warning', null, trans('admin/hardware/message.import.file_not_deleted_warning')));
             }
+
         }
+        return response()->json(Helper::formatStandardApiResponse('warning', null, trans('admin/hardware/message.import.file_not_deleted_warning')));
     }
 }
diff --git a/app/Http/Controllers/Api/LabelsController.php b/app/Http/Controllers/Api/LabelsController.php
index 126fe99438..0b54235422 100644
--- a/app/Http/Controllers/Api/LabelsController.php
+++ b/app/Http/Controllers/Api/LabelsController.php
@@ -8,7 +8,7 @@ use App\Http\Transformers\LabelsTransformer;
 use App\Models\Labels\Label;
 use Illuminate\Http\Request;
 use Illuminate\Support\ItemNotFoundException;
-use Illuminate\Support\Facades\Auth;
+use Illuminate\Http\JsonResponse;
 
 class LabelsController extends Controller
 {
@@ -16,9 +16,8 @@ class LabelsController extends Controller
      * Returns JSON listing of all labels.
      *
      * @author Grant Le Roux <grant.leroux+snipe-it@gmail.com>
-     * @return JsonResponse
      */
-    public function index(Request $request)
+    public function index(Request $request) : JsonResponse | array
     {
         $this->authorize('view', Label::class);
 
@@ -50,9 +49,8 @@ class LabelsController extends Controller
      *
      * @author Grant Le Roux <grant.leroux+snipe-it@gmail.com>
      * @param  string  $labelName
-     * @return JsonResponse
      */
-    public function show(string $labelName)
+    public function show(string $labelName) : JsonResponse | array
     {
         $labelName = str_replace('/', '\\', $labelName);
         try {
diff --git a/app/Http/Controllers/Api/LicenseSeatsController.php b/app/Http/Controllers/Api/LicenseSeatsController.php
index 317b098768..babca4a319 100644
--- a/app/Http/Controllers/Api/LicenseSeatsController.php
+++ b/app/Http/Controllers/Api/LicenseSeatsController.php
@@ -9,7 +9,7 @@ use App\Models\Asset;
 use App\Models\License;
 use App\Models\LicenseSeat;
 use App\Models\User;
-use Illuminate\Support\Facades\Auth;
+use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
 
 class LicenseSeatsController extends Controller
@@ -19,11 +19,10 @@ class LicenseSeatsController extends Controller
      *
      * @param  \Illuminate\Http\Request  $request
      * @param  int  $licenseId
-     * @return \Illuminate\Http\Response
      */
-    public function index(Request $request, $licenseId)
+    public function index(Request $request, $licenseId) : JsonResponse | array
     {
-        //
+
         if ($license = License::find($licenseId)) {
             $this->authorize('view', $license);
 
@@ -35,7 +34,7 @@ class LicenseSeatsController extends Controller
             if ($request->input('sort') == 'department') {
                 $seats->OrderDepartments($order);
             } else {
-                $seats->orderBy('id', $order);
+                $seats->orderBy('updated_at', $order);
             }
 
             $total = $seats->count();
@@ -64,11 +63,10 @@ class LicenseSeatsController extends Controller
      *
      * @param  int  $licenseId
      * @param  int  $seatId
-     * @return \Illuminate\Http\Response
      */
-    public function show($licenseId, $seatId)
+    public function show($licenseId, $seatId) : JsonResponse | array
     {
-        //
+
         $this->authorize('view', License::class);
         // sanity checks:
         // 1. does the license seat exist?
@@ -89,19 +87,18 @@ class LicenseSeatsController extends Controller
      * @param  \Illuminate\Http\Request  $request
      * @param  int  $licenseId
      * @param  int  $seatId
-     * @return \Illuminate\Http\Response
      */
-    public function update(Request $request, $licenseId, $seatId)
+    public function update(Request $request, $licenseId, $seatId) : JsonResponse | array
     {
         $this->authorize('checkout', License::class);
 
-        // sanity checks:
-        // 1. does the license seat exist?
+
         if (! $licenseSeat = LicenseSeat::find($seatId)) {
             return response()->json(Helper::formatStandardApiResponse('error', null, 'Seat not found'));
         }
-        // 2. does the seat belong to the specified license?
-        if (! $license = $licenseSeat->license()->first() || $license->id != intval($licenseId)) {
+
+        $license = $licenseSeat->license()->first();
+        if (!$license || $license->id != intval($licenseId)) {
             return response()->json(Helper::formatStandardApiResponse('error', null, 'Seat does not belong to the specified license'));
         }
 
@@ -110,7 +107,7 @@ class LicenseSeatsController extends Controller
 
         // attempt to update the license seat
         $licenseSeat->fill($request->all());
-        $licenseSeat->user_id = Auth::user()->id;
+        $licenseSeat->created_by = auth()->id();
 
         // check if this update is a checkin operation
         // 1. are relevant fields touched at all?
@@ -139,13 +136,13 @@ class LicenseSeatsController extends Controller
         if ($licenseSeat->save()) {
 
             if ($is_checkin) {
-                $licenseSeat->logCheckin($target, $request->input('note'));
+                $licenseSeat->logCheckin($target, $request->input('notes'));
 
                 return response()->json(Helper::formatStandardApiResponse('success', $licenseSeat, trans('admin/licenses/message.update.success')));
             }
 
             // in this case, relevant fields are touched but it's not a checkin operation. so it must be a checkout operation.
-            $licenseSeat->logCheckout($request->input('note'), $target);
+            $licenseSeat->logCheckout($request->input('notes'), $target);
 
             return response()->json(Helper::formatStandardApiResponse('success', $licenseSeat, trans('admin/licenses/message.update.success')));
         }
diff --git a/app/Http/Controllers/Api/LicensesController.php b/app/Http/Controllers/Api/LicensesController.php
index c35b669d70..db39f987aa 100644
--- a/app/Http/Controllers/Api/LicensesController.php
+++ b/app/Http/Controllers/Api/LicensesController.php
@@ -4,14 +4,12 @@ namespace App\Http\Controllers\Api;
 
 use App\Helpers\Helper;
 use App\Http\Controllers\Controller;
-use App\Http\Transformers\LicenseSeatsTransformer;
 use App\Http\Transformers\LicensesTransformer;
 use App\Http\Transformers\SelectlistTransformer;
-use App\Models\Company;
 use App\Models\License;
-use App\Models\LicenseSeat;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\DB;
+use Illuminate\Http\JsonResponse;
 
 class LicensesController extends Controller
 {
@@ -21,16 +19,15 @@ class LicensesController extends Controller
      * @author [A. Gianotto] [<snipe@snipe.net>]
      * @since [v4.0]
      *
-     * @return \Illuminate\Http\Response
      */
-    public function index(Request $request)
+    public function index(Request $request) : JsonResponse | array
     {
         $this->authorize('view', License::class);
 
-        $licenses = License::with('company', 'manufacturer', 'supplier','category')->withCount('freeSeats as free_seats_count');
+        $licenses = License::with('company', 'manufacturer', 'supplier','category', 'adminuser')->withCount('freeSeats as free_seats_count');
 
         if ($request->filled('company_id')) {
-            $licenses->where('company_id', '=', $request->input('company_id'));
+            $licenses->where('licenses.company_id', '=', $request->input('company_id'));
         }
 
         if ($request->filled('name')) {
@@ -73,6 +70,9 @@ class LicensesController extends Controller
             $licenses->where('depreciation_id', '=', $request->input('depreciation_id'));
         }
 
+        if ($request->filled('created_by')) {
+            $licenses->where('created_by', '=', $request->input('created_by'));
+        }
 
         if (($request->filled('maintained')) && ($request->input('maintained')=='true')) {
             $licenses->where('maintained','=',1);
@@ -116,6 +116,9 @@ class LicensesController extends Controller
             case 'company':
                 $licenses = $licenses->leftJoin('companies', 'licenses.company_id', '=', 'companies.id')->orderBy('companies.name', $order);
                 break;
+            case 'created_by':
+                $licenses = $licenses->OrderByCreatedBy($order);
+                break;
             default:
                 $allowed_columns =
                     [
@@ -156,11 +159,9 @@ class LicensesController extends Controller
      * @author [A. Gianotto] [<snipe@snipe.net>]
      * @since [v4.0]
      * @param  \Illuminate\Http\Request  $request
-     * @return \Illuminate\Http\Response
      */
-    public function store(Request $request)
+    public function store(Request $request) : JsonResponse
     {
-        //
         $this->authorize('create', License::class);
         $license = new License;
         $license->fill($request->all());
@@ -177,12 +178,11 @@ class LicensesController extends Controller
      *
      * @author [A. Gianotto] [<snipe@snipe.net>]
      * @param  int  $id
-     * @return \Illuminate\Http\Response
      */
-    public function show($id)
+    public function show($id) : JsonResponse | array
     {
         $this->authorize('view', License::class);
-        $license = License::withCount('freeSeats')->findOrFail($id);
+        $license = License::withCount('freeSeats as free_seats_count')->findOrFail($id);
         $license = $license->load('assignedusers', 'licenseSeats.user', 'licenseSeats.asset');
 
         return (new LicensesTransformer)->transformLicense($license);
@@ -195,9 +195,8 @@ class LicensesController extends Controller
      * @since [v4.0]
      * @param  \Illuminate\Http\Request  $request
      * @param  int  $id
-     * @return \Illuminate\Http\Response
      */
-    public function update(Request $request, $id)
+    public function update(Request $request, $id) : JsonResponse | array
     {
         //
         $this->authorize('update', License::class);
@@ -218,11 +217,9 @@ class LicensesController extends Controller
      * @author [A. Gianotto] [<snipe@snipe.net>]
      * @since [v4.0]
      * @param  int  $id
-     * @return \Illuminate\Http\Response
      */
-    public function destroy($id)
+    public function destroy($id) : JsonResponse
     {
-        //
         $license = License::findOrFail($id);
         $this->authorize('delete', $license);
 
@@ -248,7 +245,7 @@ class LicensesController extends Controller
      *
      * @see \App\Http\Transformers\SelectlistTransformer
      */
-    public function selectlist(Request $request)
+    public function selectlist(Request $request) : array
     {
         $licenses = License::select([
             'licenses.id',
diff --git a/app/Http/Controllers/Api/LocationsController.php b/app/Http/Controllers/Api/LocationsController.php
index 78cf43c671..b5c911a6ca 100644
--- a/app/Http/Controllers/Api/LocationsController.php
+++ b/app/Http/Controllers/Api/LocationsController.php
@@ -3,11 +3,19 @@
 namespace App\Http\Controllers\Api;
 
 use App\Helpers\Helper;
-use App\Http\Requests\ImageUploadRequest;
 use App\Http\Controllers\Controller;
+use App\Http\Requests\ImageUploadRequest;
+use App\Http\Transformers\AccessoriesTransformer;
+use App\Http\Transformers\AssetsTransformer;
 use App\Http\Transformers\LocationsTransformer;
 use App\Http\Transformers\SelectlistTransformer;
+use App\Models\Accessory;
+use App\Models\AccessoryCheckout;
+use App\Models\Asset;
+use App\Models\Company;
 use App\Models\Location;
+use App\Models\Setting;
+use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
 use Illuminate\Pagination\LengthAwarePaginator;
 use Illuminate\Support\Collection;
@@ -21,30 +29,34 @@ class LocationsController extends Controller
      * @since [v4.0]
      * @return \Illuminate\Http\Response
      */
-    public function index(Request $request)
+    public function index(Request $request) : JsonResponse | array
     {
         $this->authorize('view', Location::class);
         $allowed_columns = [
-            'id',
-            'name',
+            'accessories_count',
             'address',
             'address2',
+            'assets_count',
+            'assets_count',
+            'assigned_accessories_count',
+            'assigned_assets_count',
+            'assigned_assets_count',
             'city',
-            'state',
             'country',
-            'zip',
             'created_at',
-            'updated_at',
-            'manager_id',
-            'image',
-            'assigned_assets_count',
-            'users_count',
-            'assets_count',
-            'assigned_assets_count',
-            'assets_count',
-            'rtd_assets_count',
             'currency',
+            'id',
+            'image',
             'ldap_ou',
+            'company_id',
+            'manager_id',
+            'name',
+            'rtd_assets_count',
+            'state',
+            'updated_at',
+            'users_count',
+            'zip',
+            'notes',
             ];
 
         $locations = Location::with('parent', 'manager', 'children')->select([
@@ -65,11 +77,23 @@ class LocationsController extends Controller
             'locations.image',
             'locations.ldap_ou',
             'locations.currency',
-        ])->withCount('assignedAssets as assigned_assets_count')
+            'locations.company_id',
+            'locations.notes',
+        ])
+            ->withCount('assignedAssets as assigned_assets_count')
+            ->withCount('assignedAssets as assigned_assets_count')
             ->withCount('assets as assets_count')
+            ->withCount('assignedAccessories as assigned_accessories_count')
+            ->withCount('accessories as accessories_count')
             ->withCount('rtd_assets as rtd_assets_count')
             ->withCount('children as children_count')
-            ->withCount('users as users_count');
+            ->withCount('users as users_count')
+            ->with('adminuser');
+
+        // Only scope locations if the setting is enabled
+        if (Setting::getSettings()->scope_locations_fmcs) {
+            $locations = Company::scopeCompanyables($locations);
+        }
 
         if ($request->filled('search')) {
             $locations = $locations->TextSearch($request->input('search'));
@@ -103,6 +127,10 @@ class LocationsController extends Controller
             $locations->where('locations.manager_id', '=', $request->input('manager_id'));
         }
 
+        if ($request->filled('company_id')) {
+            $locations->where('locations.company_id', '=', $request->input('company_id'));
+        }
+
         // Make sure the offset and limit are actually integers and do not exceed system limits
         $offset = ($request->input('offset') > $locations->count()) ? $locations->count() : app('api_offset_value');
         $limit = app('api_limit_value');
@@ -119,6 +147,9 @@ class LocationsController extends Controller
             case 'manager':
                 $locations->OrderManager($order);
                 break;
+            case 'company':
+                $locations->OrderCompany($order);
+                break;
             default:
                 $locations->orderBy($sort, $order);
                 break;
@@ -138,15 +169,23 @@ class LocationsController extends Controller
      * @author [A. Gianotto] [<snipe@snipe.net>]
      * @since [v4.0]
      * @param  \App\Http\Requests\ImageUploadRequest  $request
-     * @return \Illuminate\Http\Response
      */
-    public function store(ImageUploadRequest $request)
+    public function store(ImageUploadRequest $request) : JsonResponse
     {
         $this->authorize('create', Location::class);
         $location = new Location;
         $location->fill($request->all());
         $location = $request->handleImages($location);
 
+        // Only scope location if the setting is enabled
+        if (Setting::getSettings()->scope_locations_fmcs) {
+            $location->company_id = Company::getIdForCurrentUser($request->get('company_id'));
+            // check if parent is set and has a different company
+            if ($location->parent_id && Location::find($location->parent_id)->company_id != $location->company_id) {
+                response()->json(Helper::formatStandardApiResponse('error', null, 'different company than parent'));
+            }    
+        }
+
         if ($location->save()) {
             return response()->json(Helper::formatStandardApiResponse('success', (new LocationsTransformer)->transformLocation($location), trans('admin/locations/message.create.success')));
         }
@@ -160,12 +199,11 @@ class LocationsController extends Controller
      * @author [A. Gianotto] [<snipe@snipe.net>]
      * @since [v4.0]
      * @param  int  $id
-     * @return \Illuminate\Http\Response
      */
-    public function show($id)
+    public function show($id) : JsonResponse | array
     {
         $this->authorize('view', Location::class);
-        $location = Location::with('parent', 'manager', 'children')
+        $location = Location::with('parent', 'manager', 'children', 'company')
             ->select([
                 'locations.id',
                 'locations.name',
@@ -181,6 +219,8 @@ class LocationsController extends Controller
                 'locations.updated_at',
                 'locations.image',
                 'locations.currency',
+                'locations.company_id',
+                'locations.notes',
             ])
             ->withCount('assignedAssets as assigned_assets_count')
             ->withCount('assets as assets_count')
@@ -199,9 +239,8 @@ class LocationsController extends Controller
      * @since [v4.0]
      * @param  \App\Http\Requests\ImageUploadRequest  $request
      * @param  int  $id
-     * @return \Illuminate\Http\JsonResponse
      */
-    public function update(ImageUploadRequest $request, $id)
+    public function update(ImageUploadRequest $request, $id) : JsonResponse
     {
         $this->authorize('update', Location::class);
         $location = Location::findOrFail($id);
@@ -209,6 +248,19 @@ class LocationsController extends Controller
         $location->fill($request->all());
         $location = $request->handleImages($location);
 
+        if ($request->filled('company_id')) {
+            // Only scope location if the setting is enabled
+            if (Setting::getSettings()->scope_locations_fmcs) {
+                $location->company_id = Company::getIdForCurrentUser($request->get('company_id'));
+                // check if there are related objects with different company
+                if (Helper::test_locations_fmcs(false, $id, $location->company_id)) {
+                    return response()->json(Helper::formatStandardApiResponse('error', null, 'error scoped locations'));
+                }                
+            } else {
+                $location->company_id = $request->get('company_id');
+            }
+        }
+
         if ($location->isValid()) {
 
             $location->save();
@@ -224,15 +276,47 @@ class LocationsController extends Controller
         return response()->json(Helper::formatStandardApiResponse('error', null, $location->getErrors()));
     }
 
+
+    public function assets(Request $request, Location $location) : JsonResponse | array
+    {
+        $this->authorize('view', Asset::class);
+        $this->authorize('view', $location);
+        $assets = Asset::where('location_id', '=', $location->id)->with('model', 'model.category', 'assetstatus', 'location', 'company', 'defaultLoc');
+        $assets = $assets->get();
+        return (new AssetsTransformer)->transformAssets($assets, $assets->count(), $request);
+    }
+
+    public function assignedAssets(Request $request, Location $location) : JsonResponse | array
+    {
+        $this->authorize('view', Asset::class);
+        $this->authorize('view', $location);
+        $assets = Asset::where('assigned_to', '=', $location->id)->where('assigned_type', '=', Location::class)->with('model', 'model.category', 'assetstatus', 'location', 'company', 'defaultLoc');
+        $assets = $assets->get();
+        return (new AssetsTransformer)->transformAssets($assets, $assets->count(), $request);
+    }
+
+    public function assignedAccessories(Request $request, Location $location) : JsonResponse | array
+    {
+        $this->authorize('view', Accessory::class);
+        $this->authorize('view', $location);
+        $accessory_checkouts = AccessoryCheckout::LocationAssigned()->where('assigned_to', $location->id)->with('adminuser')->with('accessories');
+
+        $offset = ($request->input('offset') > $accessory_checkouts->count()) ? $accessory_checkouts->count() : app('api_offset_value');
+        $limit = app('api_limit_value');
+
+        $total = $accessory_checkouts->count();
+        $accessory_checkouts = $accessory_checkouts->skip($offset)->take($limit)->get();
+        return (new LocationsTransformer)->transformCheckedoutAccessories($accessory_checkouts, $total);
+    }
+
     /**
      * Remove the specified resource from storage.
      *
      * @author [A. Gianotto] [<snipe@snipe.net>]
      * @since [v4.0]
      * @param  int  $id
-     * @return \Illuminate\Http\Response
      */
-    public function destroy($id)
+    public function destroy($id) : JsonResponse
     {
         $this->authorize('delete', Location::class);
         $location = Location::withCount('assignedAssets as assigned_assets_count')
@@ -240,6 +324,7 @@ class LocationsController extends Controller
             ->withCount('rtd_assets as rtd_assets_count')
             ->withCount('children as children_count')
             ->withCount('users as users_count')
+            ->withCount('accessories as accessories_count')
             ->findOrFail($id);
 
         if (! $location->isDeletable()) {
@@ -280,7 +365,7 @@ class LocationsController extends Controller
      * @since [v4.0.16]
      * @see \App\Http\Transformers\SelectlistTransformer
      */
-    public function selectlist(Request $request)
+    public function selectlist(Request $request) : array
     {
         // If a user is in the process of editing their profile, as determined by the referrer,
         // then we check that they have permission to edit their own location.
@@ -296,6 +381,11 @@ class LocationsController extends Controller
             'locations.image',
         ]);
 
+        // Only scope locations if the setting is enabled
+        if (Setting::getSettings()->scope_locations_fmcs) {
+            $locations = Company::scopeCompanyables($locations);
+        }
+
         $page = 1;
         if ($request->filled('page')) {
             $page = $request->input('page');
@@ -325,7 +415,6 @@ class LocationsController extends Controller
 
         $paginated_results = new LengthAwarePaginator($locations_formatted->forPage($page, 500), $locations_formatted->count(), 500, $page, []);
 
-        //return [];
         return (new SelectlistTransformer)->transformSelectlist($paginated_results);
     }
 }
diff --git a/app/Http/Controllers/Api/ManufacturersController.php b/app/Http/Controllers/Api/ManufacturersController.php
index 6b5a130229..652fad1cfc 100644
--- a/app/Http/Controllers/Api/ManufacturersController.php
+++ b/app/Http/Controllers/Api/ManufacturersController.php
@@ -10,8 +10,8 @@ use App\Models\Actionlog;
 use App\Models\Manufacturer;
 use Illuminate\Http\Request;
 use App\Http\Requests\ImageUploadRequest;
-use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\Storage;
+use Illuminate\Http\JsonResponse;
 
 class ManufacturersController extends Controller
 {
@@ -22,14 +22,48 @@ class ManufacturersController extends Controller
      * @since [v4.0]
      * @return \Illuminate\Http\Response
      */
-    public function index(Request $request)
+    public function index(Request $request) : JsonResponse | array
     {
         $this->authorize('view', Manufacturer::class);
-        $allowed_columns = ['id', 'name', 'url', 'support_url', 'support_email', 'warranty_lookup_url', 'support_phone', 'created_at', 'updated_at', 'image', 'assets_count', 'consumables_count', 'components_count', 'licenses_count'];
+        $allowed_columns =  [
+            'id',
+            'name',
+            'url',
+            'support_url',
+            'support_email',
+            'warranty_lookup_url',
+            'support_phone',
+            'created_at',
+            'updated_at',
+            'image',
+            'assets_count',
+            'consumables_count',
+            'components_count',
+            'licenses_count',
+            'notes',
+        ];
 
-        $manufacturers = Manufacturer::select(
-            ['id', 'name', 'url', 'support_url', 'warranty_lookup_url', 'support_email', 'support_phone', 'created_at', 'updated_at', 'image', 'deleted_at']
-        )->withCount('assets as assets_count')->withCount('licenses as licenses_count')->withCount('consumables as consumables_count')->withCount('accessories as accessories_count');
+        $manufacturers = Manufacturer::select([
+                'id',
+                'name',
+                'url',
+                'support_url',
+                'warranty_lookup_url',
+                'support_email',
+                'support_phone',
+                'created_by',
+                'created_at',
+                'updated_at',
+                'image',
+                'deleted_at',
+                'notes',
+            ])
+            ->with('adminuser')
+            ->withCount('assets as assets_count')
+            ->withCount('licenses as licenses_count')
+            ->withCount('consumables as consumables_count')
+            ->withCount('accessories as accessories_count')
+            ->withCount('components as components_count');
 
         if ($request->input('deleted') == 'true') {
             $manufacturers->onlyTrashed();
@@ -66,10 +100,18 @@ class ManufacturersController extends Controller
         // Make sure the offset and limit are actually integers and do not exceed system limits
         $offset = ($request->input('offset') > $manufacturers->count()) ? $manufacturers->count() : app('api_offset_value');
         $limit = app('api_limit_value');
-
         $order = $request->input('order') === 'asc' ? 'asc' : 'desc';
-        $sort = in_array($request->input('sort'), $allowed_columns) ? $request->input('sort') : 'created_at';
-        $manufacturers->orderBy($sort, $order);
+        $sort_override =  $request->input('sort');
+        $column_sort = in_array($sort_override, $allowed_columns) ? $sort_override : 'created_at';
+
+        switch ($sort_override) {
+            case 'created_by':
+                $manufacturers = $manufacturers->OrderByCreatedBy($order);
+                break;
+            default:
+                $manufacturers = $manufacturers->orderBy($column_sort, $order);
+                break;
+        }
 
         $total = $manufacturers->count();
         $manufacturers = $manufacturers->skip($offset)->take($limit)->get();
@@ -83,9 +125,8 @@ class ManufacturersController extends Controller
      * @author [A. Gianotto] [<snipe@snipe.net>]
      * @since [v4.0]
      * @param  \App\Http\Requests\ImageUploadRequest $request
-     * @return \Illuminate\Http\Response
      */
-    public function store(ImageUploadRequest $request)
+    public function store(ImageUploadRequest $request) : JsonResponse
     {
         $this->authorize('create', Manufacturer::class);
         $manufacturer = new Manufacturer;
@@ -105,9 +146,8 @@ class ManufacturersController extends Controller
      * @author [A. Gianotto] [<snipe@snipe.net>]
      * @since [v4.0]
      * @param  int  $id
-     * @return \Illuminate\Http\Response
      */
-    public function show($id)
+    public function show($id) : JsonResponse | array
     {
         $this->authorize('view', Manufacturer::class);
         $manufacturer = Manufacturer::withCount('assets as assets_count')->withCount('licenses as licenses_count')->withCount('consumables as consumables_count')->withCount('accessories as accessories_count')->findOrFail($id);
@@ -122,9 +162,8 @@ class ManufacturersController extends Controller
      * @since [v4.0]
      * @param  \App\Http\Requests\ImageUploadRequest  $request
      * @param  int  $id
-     * @return \Illuminate\Http\Response
      */
-    public function update(ImageUploadRequest $request, $id)
+    public function update(ImageUploadRequest $request, $id) : JsonResponse
     {
         $this->authorize('update', Manufacturer::class);
         $manufacturer = Manufacturer::findOrFail($id);
@@ -144,9 +183,8 @@ class ManufacturersController extends Controller
      * @author [A. Gianotto] [<snipe@snipe.net>]
      * @since [v4.0]
      * @param  int  $id
-     * @return \Illuminate\Http\Response
      */
-    public function destroy($id)
+    public function destroy($id) : JsonResponse
     {
         $this->authorize('delete', Manufacturer::class);
         $manufacturer = Manufacturer::findOrFail($id);
@@ -167,10 +205,9 @@ class ManufacturersController extends Controller
      * @author [A. Gianotto] [<snipe@snipe.net>]
      * @since [v6.3.4]
      * @param int $id
-     * @return \Illuminate\Http\JsonResponse
      * @throws \Illuminate\Auth\Access\AuthorizationException
      */
-    public function restore($id)
+    public function restore($id) : JsonResponse
     {
         $this->authorize('delete', Manufacturer::class);
 
@@ -186,7 +223,7 @@ class ManufacturersController extends Controller
                 $logaction->item_type = Manufacturer::class;
                 $logaction->item_id = $manufacturer->id;
                 $logaction->created_at = date('Y-m-d H:i:s');
-                $logaction->user_id = Auth::user()->id;
+                $logaction->created_by = auth()->id();
                 $logaction->logaction('restore');
 
                 return response()->json(Helper::formatStandardApiResponse('success', trans('admin/manufacturers/message.restore.success')), 200);
@@ -206,7 +243,7 @@ class ManufacturersController extends Controller
      * @since [v4.0.16]
      * @see \App\Http\Transformers\SelectlistTransformer
      */
-    public function selectlist(Request $request)
+    public function selectlist(Request $request) : array
     {
 
         $this->authorize('view.selectlists');
diff --git a/app/Http/Controllers/Api/PredefinedKitsController.php b/app/Http/Controllers/Api/PredefinedKitsController.php
index b398dbfae2..24f1320185 100644
--- a/app/Http/Controllers/Api/PredefinedKitsController.php
+++ b/app/Http/Controllers/Api/PredefinedKitsController.php
@@ -7,6 +7,8 @@ use App\Http\Controllers\Controller;
 use App\Http\Transformers\PredefinedKitsTransformer;
 use App\Models\PredefinedKit;
 use Illuminate\Http\Request;
+use Illuminate\Http\JsonResponse;
+use App\Http\Transformers\SelectlistTransformer;
 
 /**
  *  @author [D. Minaev.] [<dmitriy.minaev.v@gmail.com>]
@@ -18,12 +20,11 @@ class PredefinedKitsController extends Controller
      *
      * @return \Illuminate\Http\Response
      */
-    public function index(Request $request)
+    public function index(Request $request) : JsonResponse | array
     {
         $this->authorize('view', PredefinedKit::class);
-        $allowed_columns = ['id', 'name'];
 
-        $kits = PredefinedKit::query();
+        $kits = PredefinedKit::query()->with('adminuser');
 
         if ($request->filled('search')) {
             $kits = $kits->TextSearch($request->input('search'));
@@ -34,8 +35,25 @@ class PredefinedKitsController extends Controller
         $limit = app('api_limit_value');
 
         $order = $request->input('order') === 'desc' ? 'desc' : 'asc';
-        $sort = in_array($request->input('sort'), $allowed_columns) ? $request->input('sort') : 'name';
-        $kits->orderBy($sort, $order);
+
+        switch ($request->input('sort')) {
+            case 'created_by':
+                $kits = $kits->OrderByCreatedBy($order);
+                break;
+            default:
+                // This array is what determines which fields should be allowed to be sorted on ON the table itself.
+                // These must match a column on the consumables table directly.
+                $allowed_columns = [
+                    'id',
+                    'name',
+                    'created_at',
+                    'updated_at',
+                ];
+
+                $sort = in_array($request->input('sort'), $allowed_columns) ? $request->input('sort') : 'created_at';
+                $kits = $kits->orderBy($sort, $order);
+                break;
+        }
 
         $total = $kits->count();
         $kits = $kits->skip($offset)->take($limit)->get();
@@ -47,9 +65,8 @@ class PredefinedKitsController extends Controller
      * Store a newly created resource in storage.
      *
      * @param  \Illuminate\Http\Request  $request
-     * @return \Illuminate\Http\Response
      */
-    public function store(Request $request)
+    public function store(Request $request) : JsonResponse
     {
         $this->authorize('create', PredefinedKit::class);
         $kit = new PredefinedKit;
@@ -66,9 +83,8 @@ class PredefinedKitsController extends Controller
      * Display the specified resource.
      *
      * @param  int  $id
-     * @return \Illuminate\Http\Response
      */
-    public function show($id)
+    public function show($id) :  array
     {
         $this->authorize('view', PredefinedKit::class);
         $kit = PredefinedKit::findOrFail($id);
@@ -81,9 +97,8 @@ class PredefinedKitsController extends Controller
      *
      * @param  \Illuminate\Http\Request  $request
      * @param  int  $id kit id
-     * @return \Illuminate\Http\Response
      */
-    public function update(Request $request, $id)
+    public function update(Request $request, $id) : JsonResponse
     {
         $this->authorize('update', PredefinedKit::class);
         $kit = PredefinedKit::findOrFail($id);
@@ -100,9 +115,8 @@ class PredefinedKitsController extends Controller
      * Remove the specified resource from storage.
      *
      * @param  int  $id
-     * @return \Illuminate\Http\Response
      */
-    public function destroy($id)
+    public function destroy($id) : JsonResponse
     {
         $this->authorize('delete', PredefinedKit::class);
         $kit = PredefinedKit::findOrFail($id);
@@ -123,7 +137,7 @@ class PredefinedKitsController extends Controller
      *
      * @see \App\Http\Transformers\SelectlistTransformer
      */
-    public function selectlist(Request $request)
+    public function selectlist(Request $request) : array
     {
         $kits = PredefinedKit::select([
             'id',
@@ -145,7 +159,7 @@ class PredefinedKitsController extends Controller
      * @param  int  $id
      * @return \Illuminate\Http\Response
      */
-    public function indexLicenses($kit_id)
+    public function indexLicenses($kit_id) : array
     {
         $this->authorize('view', PredefinedKit::class);
         $kit = PredefinedKit::findOrFail($kit_id);
@@ -160,7 +174,7 @@ class PredefinedKitsController extends Controller
      * @param  int  $id
      * @return \Illuminate\Http\Response
      */
-    public function storeLicense(Request $request, $kit_id)
+    public function storeLicense(Request $request, $kit_id) : JsonResponse
     {
         $this->authorize('update', PredefinedKit::class);
 
@@ -186,9 +200,8 @@ class PredefinedKitsController extends Controller
      *
      * @param  \Illuminate\Http\Request  $request
      * @param  int  $kit_id
-     * @return \Illuminate\Http\Response
      */
-    public function updateLicense(Request $request, $kit_id, $license_id)
+    public function updateLicense(Request $request, $kit_id, $license_id) : JsonResponse
     {
         $this->authorize('update', PredefinedKit::class);
         $kit = PredefinedKit::findOrFail($kit_id);
@@ -205,9 +218,8 @@ class PredefinedKitsController extends Controller
      * Remove the specified resource from storage.
      *
      * @param  int  $kit_id
-     * @return \Illuminate\Http\Response
      */
-    public function detachLicense($kit_id, $license_id)
+    public function detachLicense($kit_id, $license_id) : JsonResponse
     {
         $this->authorize('update', PredefinedKit::class);
         $kit = PredefinedKit::findOrFail($kit_id);
@@ -221,9 +233,8 @@ class PredefinedKitsController extends Controller
      * Display the specified resource.
      *
      * @param  int  $kit_id
-     * @return \Illuminate\Http\Response
      */
-    public function indexModels($kit_id)
+    public function indexModels($kit_id) : array
     {
         $this->authorize('view', PredefinedKit::class);
         $kit = PredefinedKit::findOrFail($kit_id);
@@ -236,9 +247,8 @@ class PredefinedKitsController extends Controller
      * Store the specified resource.
      *
      * @param  int  $id
-     * @return \Illuminate\Http\Response
      */
-    public function storeModel(Request $request, $kit_id)
+    public function storeModel(Request $request, $kit_id) : JsonResponse
     {
         $this->authorize('update', PredefinedKit::class);
 
@@ -252,7 +262,7 @@ class PredefinedKitsController extends Controller
 
         $relation = $kit->models();
         if ($relation->find($model_id)) {
-            return response()->json(Helper::formatStandardApiResponse('error', null, ['model' => 'Model already attached to kit']));
+            return response()->json(Helper::formatStandardApiResponse('error', null, ['model' => trans('admin/kits/general.model_already_attached')]));
         }
         $relation->attach($model_id, ['quantity' => $quantity]);
 
@@ -264,9 +274,8 @@ class PredefinedKitsController extends Controller
      *
      * @param  \Illuminate\Http\Request  $request
      * @param  int  $kit_id
-     * @return \Illuminate\Http\Response
      */
-    public function updateModel(Request $request, $kit_id, $model_id)
+    public function updateModel(Request $request, $kit_id, $model_id) : JsonResponse
     {
         $this->authorize('update', PredefinedKit::class);
         $kit = PredefinedKit::findOrFail($kit_id);
@@ -283,9 +292,8 @@ class PredefinedKitsController extends Controller
      * Remove the specified resource from storage.
      *
      * @param  int  $kit_id
-     * @return \Illuminate\Http\Response
      */
-    public function detachModel($kit_id, $model_id)
+    public function detachModel($kit_id, $model_id) : JsonResponse
     {
         $this->authorize('update', PredefinedKit::class);
         $kit = PredefinedKit::findOrFail($kit_id);
@@ -299,9 +307,8 @@ class PredefinedKitsController extends Controller
      * Display the specified resource.
      *
      * @param  int  $kit_id
-     * @return \Illuminate\Http\Response
      */
-    public function indexConsumables($kit_id)
+    public function indexConsumables($kit_id) : array
     {
         $this->authorize('view', PredefinedKit::class);
         $kit = PredefinedKit::findOrFail($kit_id);
@@ -314,9 +321,8 @@ class PredefinedKitsController extends Controller
      * Store the specified resource.
      *
      * @param  int  $id
-     * @return \Illuminate\Http\Response
      */
-    public function storeConsumable(Request $request, $kit_id)
+    public function storeConsumable(Request $request, $kit_id) : JsonResponse
     {
         $this->authorize('update', PredefinedKit::class);
 
@@ -342,9 +348,8 @@ class PredefinedKitsController extends Controller
      *
      * @param  \Illuminate\Http\Request  $request
      * @param  int  $kit_id
-     * @return \Illuminate\Http\Response
      */
-    public function updateConsumable(Request $request, $kit_id, $consumable_id)
+    public function updateConsumable(Request $request, $kit_id, $consumable_id) : JsonResponse
     {
         $this->authorize('update', PredefinedKit::class);
         $kit = PredefinedKit::findOrFail($kit_id);
@@ -361,9 +366,8 @@ class PredefinedKitsController extends Controller
      * Remove the specified resource from storage.
      *
      * @param  int  $kit_id
-     * @return \Illuminate\Http\Response
      */
-    public function detachConsumable($kit_id, $consumable_id)
+    public function detachConsumable($kit_id, $consumable_id) : JsonResponse
     {
         $this->authorize('update', PredefinedKit::class);
         $kit = PredefinedKit::findOrFail($kit_id);
@@ -377,9 +381,8 @@ class PredefinedKitsController extends Controller
      * Display the specified resource.
      *
      * @param  int  $kit_id
-     * @return \Illuminate\Http\Response
      */
-    public function indexAccessories($kit_id)
+    public function indexAccessories($kit_id) : array
     {
         $this->authorize('view', PredefinedKit::class);
         $kit = PredefinedKit::findOrFail($kit_id);
@@ -392,9 +395,8 @@ class PredefinedKitsController extends Controller
      * Store the specified resource.
      *
      * @param  int  $kit_id
-     * @return \Illuminate\Http\Response
      */
-    public function storeAccessory(Request $request, $kit_id)
+    public function storeAccessory(Request $request, $kit_id) : JsonResponse
     {
         $this->authorize('update', PredefinedKit::class);
 
@@ -420,9 +422,8 @@ class PredefinedKitsController extends Controller
      *
      * @param  \Illuminate\Http\Request  $request
      * @param  int  $kit_id
-     * @return \Illuminate\Http\Response
      */
-    public function updateAccessory(Request $request, $kit_id, $accessory_id)
+    public function updateAccessory(Request $request, $kit_id, $accessory_id) : JsonResponse
     {
         $this->authorize('update', PredefinedKit::class);
         $kit = PredefinedKit::findOrFail($kit_id);
@@ -439,9 +440,8 @@ class PredefinedKitsController extends Controller
      * Remove the specified resource from storage.
      *
      * @param  int  $kit_id
-     * @return \Illuminate\Http\Response
      */
-    public function detachAccessory($kit_id, $accessory_id)
+    public function detachAccessory($kit_id, $accessory_id) : JsonResponse
     {
         $this->authorize('update', PredefinedKit::class);
         $kit = PredefinedKit::findOrFail($kit_id);
diff --git a/app/Http/Controllers/Api/ProfileController.php b/app/Http/Controllers/Api/ProfileController.php
index b6752dd1ed..f7f91e094e 100644
--- a/app/Http/Controllers/Api/ProfileController.php
+++ b/app/Http/Controllers/Api/ProfileController.php
@@ -6,13 +6,13 @@ use App\Helpers\Helper;
 use App\Http\Controllers\Controller;
 use App\Models\CheckoutRequest;
 use Illuminate\Http\Response;
-use Illuminate\Support\Facades\Auth;
 use Illuminate\Http\Request;
 use Laravel\Passport\TokenRepository;
 use Illuminate\Contracts\Validation\Factory as ValidationFactory;
 use Illuminate\Support\Facades\Gate;
 use App\Models\CustomField;
 use Illuminate\Support\Facades\DB;
+use Illuminate\Http\JsonResponse;
 
 class ProfileController extends Controller
 {
@@ -42,12 +42,10 @@ class ProfileController extends Controller
      *
      * @author [A. Gianotto] [<snipe@snipe.net>]
      * @since [v4.3.0]
-     *
-     * @return array
      */
-    public function requestedAssets()
+    public function requestedAssets() :  array
     {
-        $checkoutRequests = CheckoutRequest::where('user_id', '=', Auth::user()->id)->get();
+        $checkoutRequests = CheckoutRequest::where('user_id', '=', auth()->id())->get();
 
         $results = array();
         $show_field = array();
@@ -95,10 +93,9 @@ class ProfileController extends Controller
      *
      * @author [A. Gianotto] [<snipe@snipe.net>]
      * @since [v6.0.5]
-     *
-     * @return \Illuminate\Http\Response
      */
-    public function createApiToken(Request $request) {
+    public function createApiToken(Request $request) : JsonResponse
+    {
 
         if (!Gate::allows('self.api')) {
             abort(403);
@@ -106,14 +103,14 @@ class ProfileController extends Controller
 
         $accessTokenName = $request->input('name', 'Auth Token');
 
-        if ($accessToken = Auth::user()->createToken($accessTokenName)->accessToken) {
+        if ($accessToken = auth()->user()->createToken($accessTokenName)->accessToken) {
 
             // Get the ID so we can return that with the payload
-            $token = DB::table('oauth_access_tokens')->where('user_id', '=', Auth::user()->id)->where('name','=',$accessTokenName)->orderBy('created_at', 'desc')->first();
+            $token = DB::table('oauth_access_tokens')->where('user_id', '=', auth()->id())->where('name','=',$accessTokenName)->orderBy('created_at', 'desc')->first();
             $accessTokenData['id'] = $token->id;
             $accessTokenData['token'] = $accessToken;
             $accessTokenData['name'] = $accessTokenName;
-            return response()->json(Helper::formatStandardApiResponse('success', $accessTokenData, 'Personal access token '.$accessTokenName.' created successfully'));
+            return response()->json(Helper::formatStandardApiResponse('success', $accessTokenData, trans('account/general.personal_api_keys_success', ['key' => $accessTokenName])));
         }
         return response()->json(Helper::formatStandardApiResponse('error', null, 'Token could not be created.'));
 
@@ -125,17 +122,16 @@ class ProfileController extends Controller
      *
      * @author [A. Gianotto] [<snipe@snipe.net>]
      * @since [v6.0.5]
-     *
-     * @return \Illuminate\Http\Response
      */
-    public function deleteApiToken($tokenId) {
+    public function deleteApiToken($tokenId) : Response
+    {
 
         if (!Gate::allows('self.api')) {
             abort(403);
         }
 
         $token = $this->tokenRepository->findForUser(
-            $tokenId, Auth::user()->getAuthIdentifier()
+            $tokenId, auth()->user()->getAuthIdentifier()
         );
 
         if (is_null($token)) {
@@ -154,16 +150,15 @@ class ProfileController extends Controller
      *
      * @author [A. Gianotto] [<snipe@snipe.net>]
      * @since [v6.0.5]
-     *
-     * @return \Illuminate\Http\Response
      */
-    public function showApiTokens(Request $request) {
+    public function showApiTokens() : JsonResponse
+    {
 
         if (!Gate::allows('self.api')) {
             abort(403);
         }
         
-        $tokens = $this->tokenRepository->forUser(Auth::user()->getAuthIdentifier());
+        $tokens = $this->tokenRepository->forUser(auth()->user()->getAuthIdentifier());
         $token_values = $tokens->load('client')->filter(function ($token) {
             return $token->client->personal_access_client && ! $token->revoked;
         })->values();
diff --git a/app/Http/Controllers/Api/ReportsController.php b/app/Http/Controllers/Api/ReportsController.php
index 8761c9442b..c03dddf6b7 100644
--- a/app/Http/Controllers/Api/ReportsController.php
+++ b/app/Http/Controllers/Api/ReportsController.php
@@ -5,7 +5,10 @@ namespace App\Http\Controllers\Api;
 use App\Http\Controllers\Controller;
 use App\Http\Transformers\ActionlogsTransformer;
 use App\Models\Actionlog;
+use App\Models\Company;
+use App\Models\Setting;
 use Illuminate\Http\Request;
+use Illuminate\Http\JsonResponse;
 
 class ReportsController extends Controller
 {
@@ -14,13 +17,13 @@ class ReportsController extends Controller
      *
      * @author [A. Gianotto] [<snipe@snipe.net>]
      * @since [v4.0]
-     * @return View
      */
-    public function index(Request $request)
+    public function index(Request $request) : JsonResponse | array
     {
-        $this->authorize('reports.view');
+        $this->authorize('activity.view');
+
+        $actionlogs = Actionlog::with('item', 'user', 'adminuser', 'target', 'location');
 
-        $actionlogs = Actionlog::with('item', 'user', 'admin', 'target', 'location');
 
         if ($request->filled('search')) {
             $actionlogs = $actionlogs->TextSearch(e($request->input('search')));
@@ -45,36 +48,40 @@ class ReportsController extends Controller
         }
 
         if ($request->filled('action_type')) {
-            $actionlogs = $actionlogs->where('action_type', '=', $request->input('action_type'))->orderBy('created_at', 'desc');
+            $actionlogs = $actionlogs->where('action_type', '=', $request->input('action_type'));
         }
 
-        if ($request->filled('user_id')) {
-            $actionlogs = $actionlogs->where('user_id', '=', $request->input('user_id'));
+        if ($request->filled('created_by')) {
+            $actionlogs = $actionlogs->where('created_by', '=', $request->input('created_by'));
         }
 
         if ($request->filled('action_source')) {
-            $actionlogs = $actionlogs->where('action_source', '=', $request->input('action_source'))->orderBy('created_at', 'desc');
+            $actionlogs = $actionlogs->where('action_source', '=', $request->input('action_source'));
+        }
+        
+        if ($request->filled('remote_ip')) {
+            $actionlogs = $actionlogs->where('remote_ip', '=', $request->input('remote_ip'));
         }
 
-        if ($request->filled('remote_ip')) {
-            $actionlogs = $actionlogs->where('remote_ip', '=', $request->input('remote_ip'))->orderBy('created_at', 'desc');
-        }
 
         if ($request->filled('uploads')) {
-            $actionlogs = $actionlogs->whereNotNull('filename')->orderBy('created_at', 'desc');
+            $actionlogs = $actionlogs->whereNotNull('filename');
         }
 
         $allowed_columns = [
             'id',
             'created_at',
             'target_id',
-            'user_id',
+            'created_by',
             'accept_signature',
             'action_type',
             'note',
             'remote_ip',
             'user_agent',
+            'target_type',
+            'item_type',
             'action_source',
+            'action_date',
         ];
 
 
@@ -83,11 +90,19 @@ class ReportsController extends Controller
         $offset = ($request->input('offset') > $total) ? $total : app('api_offset_value');
         $limit = app('api_limit_value');
 
-        $sort = in_array($request->input('sort'), $allowed_columns) ? e($request->input('sort')) : 'created_at';
         $order = ($request->input('order') == 'asc') ? 'asc' : 'desc';
 
+        switch ($request->input('sort')) {
+            case 'created_by':
+                $actionlogs->OrderByCreatedBy($order);
+                break;
+            default:
+                $sort = in_array($request->input('sort'), $allowed_columns) ? e($request->input('sort')) : 'action_logs.created_at';
+                $actionlogs = $actionlogs->orderBy($sort, $order);
+                break;
+        }
 
-        $actionlogs = $actionlogs->orderBy($sort, $order)->skip($offset)->take($limit)->get();
+        $actionlogs = $actionlogs->skip($offset)->take($limit)->get();
 
         return response()->json((new ActionlogsTransformer)->transformActionlogs($actionlogs, $total), 200, ['Content-Type' => 'application/json;charset=utf8'], JSON_UNESCAPED_UNICODE);
     }
diff --git a/app/Http/Controllers/Api/SettingsController.php b/app/Http/Controllers/Api/SettingsController.php
index d9059988f2..7eb28a4815 100644
--- a/app/Http/Controllers/Api/SettingsController.php
+++ b/app/Http/Controllers/Api/SettingsController.php
@@ -9,26 +9,22 @@ use Illuminate\Http\Request;
 use App\Http\Controllers\Controller;
 use App\Models\Ldap;
 use App\Models\Setting;
-use Mail;
-use App\Notifications\SlackTest;
 use App\Notifications\MailTest;
-use GuzzleHttp\Client;
 use Illuminate\Http\JsonResponse;
-use Illuminate\Http\Response;
 use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\Log;
 use Illuminate\Support\Facades\Notification;
 use Illuminate\Support\Facades\Storage;
-use Illuminate\Support\Facades\Validator; 
-use App\Http\Requests\SlackSettingsRequest;
+use Illuminate\Support\Facades\Validator;
 use App\Http\Transformers\LoginAttemptsTransformer;
+use Symfony\Component\HttpFoundation\BinaryFileResponse;
 
 
 class SettingsController extends Controller
 {
 
 
-    public function ldaptest()
+    public function ldaptest() : JsonResponse
     {
         $settings = Setting::getSettings();
 
@@ -88,7 +84,7 @@ class SettingsController extends Controller
 
     }
 
-    public function ldaptestlogin(Request $request)
+    public function ldaptestlogin(Request $request) : JsonResponse
     {
 
         if (Setting::getSettings()->ldap_enabled != '1') {
@@ -148,9 +144,8 @@ class SettingsController extends Controller
      *
      * @author [A. Gianotto] [<snipe@snipe.net>]
      * @since [v3.0]
-     * @return JsonResponse
      */
-    public function ajaxTestEmail()
+    public function ajaxTestEmail() : JsonResponse
     {
         if (!config('app.lock_passwords')) {
             try {
@@ -170,9 +165,8 @@ class SettingsController extends Controller
      *
      * @author [A. Gianotto] [<snipe@snipe.net>]
      * @since [v5.0.0]
-     * @return JsonResponse
      */
-    public function purgeBarcodes()
+    public function purgeBarcodes() : JsonResponse
     {
         $file_count = 0;
         $files = Storage::disk('public')->files('barcodes');
@@ -211,9 +205,8 @@ class SettingsController extends Controller
      * @author [A. Gianotto] [<snipe@snipe.net>]
      * @since [v5.0.0]
      * @param  \Illuminate\Http\Request  $request
-     * @return array | JsonResponse
      */
-    public function showLoginAttempts(Request $request)
+    public function showLoginAttempts(Request $request) : array
     {
         $allowed_columns = ['id', 'username', 'remote_ip', 'user_agent', 'successful', 'created_at'];
 
@@ -233,9 +226,9 @@ class SettingsController extends Controller
      * Lists backup files
      *
      * @author [A. Gianotto]
-     * @return array | JsonResponse
      */
-    public function listBackups() {
+    public function listBackups() : array
+    {
         $settings = Setting::getSettings();
         $path = 'app/backups';
         $backup_files = Storage::files($path);
@@ -276,9 +269,9 @@ class SettingsController extends Controller
      * exhausts memory on larger files.
      *
      * @author [A. Gianotto]
-     * @return JsonResponse|\Symfony\Component\HttpFoundation\BinaryFileResponse
      */
-    public function downloadBackup($file) {
+    public function downloadBackup($file) : JsonResponse | BinaryFileResponse
+    {
 
         $path = storage_path('app/backups');
         
@@ -296,9 +289,9 @@ class SettingsController extends Controller
      *
      * @author [A. Gianotto]
      * @since [v6.3.1]
-     * @return JsonResponse|\Symfony\Component\HttpFoundation\BinaryFileResponse
      */
-    public function downloadLatestBackup() {
+    public function downloadLatestBackup() : JsonResponse | BinaryFileResponse
+    {
 
         $fileData = collect();
         foreach (Storage::files('app/backups') as $file) {
diff --git a/app/Http/Controllers/Api/StatuslabelsController.php b/app/Http/Controllers/Api/StatuslabelsController.php
index 7c8e260c2f..b3503ff152 100644
--- a/app/Http/Controllers/Api/StatuslabelsController.php
+++ b/app/Http/Controllers/Api/StatuslabelsController.php
@@ -8,10 +8,11 @@ use App\Http\Transformers\AssetsTransformer;
 use App\Http\Transformers\SelectlistTransformer;
 use App\Http\Transformers\StatuslabelsTransformer;
 use App\Models\Asset;
+use App\Models\Setting;
 use App\Models\Statuslabel;
 use Illuminate\Http\Request;
 use App\Http\Transformers\PieChartTransformer;
-use Illuminate\Support\Arr;
+use Illuminate\Http\JsonResponse;
 
 class StatuslabelsController extends Controller
 {
@@ -20,14 +21,21 @@ class StatuslabelsController extends Controller
      *
      * @author [A. Gianotto] [<snipe@snipe.net>]
      * @since [v4.0]
-     * @return \Illuminate\Http\Response
      */
-    public function index(Request $request)
+    public function index(Request $request) : array
     {
         $this->authorize('view', Statuslabel::class);
-        $allowed_columns = ['id', 'name', 'created_at', 'assets_count', 'color', 'notes', 'default_label'];
+        $allowed_columns = [
+            'id',
+            'name',
+            'created_at',
+            'assets_count',
+            'color',
+            'notes',
+            'default_label'
+        ];
 
-        $statuslabels = Statuslabel::withCount('assets as assets_count');
+        $statuslabels = Statuslabel::with('adminuser')->withCount('assets as assets_count');
 
         if ($request->filled('search')) {
             $statuslabels = $statuslabels->TextSearch($request->input('search'));
@@ -54,10 +62,18 @@ class StatuslabelsController extends Controller
         // Make sure the offset and limit are actually integers and do not exceed system limits
         $offset = ($request->input('offset') > $statuslabels->count()) ? $statuslabels->count() : app('api_offset_value');
         $limit = app('api_limit_value');
-
         $order = $request->input('order') === 'asc' ? 'asc' : 'desc';
-        $sort = in_array($request->input('sort'), $allowed_columns) ? $request->input('sort') : 'created_at';
-        $statuslabels->orderBy($sort, $order);
+        $sort_override =  $request->input('sort');
+        $column_sort = in_array($sort_override, $allowed_columns) ? $sort_override : 'created_at';
+
+        switch ($sort_override) {
+            case 'created_by':
+                $statuslabels = $statuslabels->OrderByCreatedBy($order);
+                break;
+            default:
+                $statuslabels = $statuslabels->orderBy($column_sort, $order);
+                break;
+        }
 
         $total = $statuslabels->count();
         $statuslabels = $statuslabels->skip($offset)->take($limit)->get();
@@ -72,15 +88,15 @@ class StatuslabelsController extends Controller
      * @author [A. Gianotto] [<snipe@snipe.net>]
      * @since [v4.0]
      * @param  \Illuminate\Http\Request  $request
-     * @return \Illuminate\Http\Response
      */
-    public function store(Request $request)
+    public function store(Request $request) : JsonResponse
     {
         $this->authorize('create', Statuslabel::class);
         $request->except('deployable', 'pending', 'archived');
 
         if (! $request->filled('type')) {
-            return response()->json(Helper::formatStandardApiResponse('error', null, ['type' => ['Status label type is required.']]), 500);
+
+            return response()->json(Helper::formatStandardApiResponse('error', null, ['type' => ['Status label type is required.']]));
         }
 
         $statuslabel = new Statuslabel;
@@ -108,9 +124,8 @@ class StatuslabelsController extends Controller
      * @author [A. Gianotto] [<snipe@snipe.net>]
      * @since [v4.0]
      * @param  int  $id
-     * @return \Illuminate\Http\Response
      */
-    public function show($id)
+    public function show($id) : array
     {
         $this->authorize('view', Statuslabel::class);
         $statuslabel = Statuslabel::findOrFail($id);
@@ -126,9 +141,8 @@ class StatuslabelsController extends Controller
      * @since [v4.0]
      * @param  \Illuminate\Http\Request  $request
      * @param  int  $id
-     * @return \Illuminate\Http\Response
      */
-    public function update(Request $request, $id)
+    public function update(Request $request, $id) : JsonResponse
     {
         $this->authorize('update', Statuslabel::class);
         $statuslabel = Statuslabel::findOrFail($id);
@@ -163,9 +177,8 @@ class StatuslabelsController extends Controller
      * @author [A. Gianotto] [<snipe@snipe.net>]
      * @since [v4.0]
      * @param  int  $id
-     * @return \Illuminate\Http\Response
      */
-    public function destroy($id)
+    public function destroy($id) : JsonResponse
     {
         $this->authorize('delete', Statuslabel::class);
         $statuslabel = Statuslabel::findOrFail($id);
@@ -188,13 +201,18 @@ class StatuslabelsController extends Controller
      *
      * @author [A. Gianotto] [<snipe@snipe.net>]
      * @since [v3.0]
-     * @return array
      */
-    public function getAssetCountByStatuslabel()
+    public function getAssetCountByStatuslabel() : array
     {
         $this->authorize('view', Statuslabel::class);
-        $statuslabels = Statuslabel::withCount('assets')->get();
-        $total = Array();
+
+        if (Setting::getSettings()->show_archived_in_list == 0 ) {
+            $statuslabels = Statuslabel::withCount('assets')->where('archived','0')->get();
+        } else {
+            $statuslabels = Statuslabel::withCount('assets')->get();
+        }
+
+        $total = [];
 
         foreach ($statuslabels as $statuslabel) {
 
@@ -215,9 +233,8 @@ class StatuslabelsController extends Controller
      *
      * @author [A. Gianotto] [<snipe@snipe.net>]
      * @since [v6.0.11]
-     * @return array
      */
-    public function getAssetCountByMetaStatus()
+    public function getAssetCountByMetaStatus() : array
     {
         $this->authorize('view', Statuslabel::class);
 
@@ -245,9 +262,8 @@ class StatuslabelsController extends Controller
      * @author [A. Gianotto] [<snipe@snipe.net>]
      * @since [v4.0]
      * @param  int  $id
-     * @return \Illuminate\Http\Response
      */
-    public function assets(Request $request, $id)
+    public function assets(Request $request, $id) : array
     {
         $this->authorize('view', Statuslabel::class);
         $this->authorize('index', Asset::class);
@@ -274,19 +290,20 @@ class StatuslabelsController extends Controller
 
     /**
      * Returns a boolean response based on whether the status label
-     * is one that is deployable.
+     * is one that is deployable or pending.
      *
      * This is used by the hardware create/edit view to determine whether
-     * we should provide a dropdown of users for them to check the asset out to.
+     * we should provide a dropdown of users for them to check the asset out to,
+     * and whether we show a warning that the asset will be checked in if it's already
+     * assigned but the status is changed to one that isn't pending or deployable
      *
      * @author [A. Gianotto] [<snipe@snipe.net>]
      * @since [v4.0]
-     * @return bool
      */
-    public function checkIfDeployable($id)
+    public function checkIfDeployable($id) : string
     {
         $statuslabel = Statuslabel::findOrFail($id);
-        if ($statuslabel->getStatuslabelType() == 'deployable') {
+        if (($statuslabel->getStatuslabelType() == 'pending') || ($statuslabel->getStatuslabelType() == 'deployable')) {
             return '1';
         }
 
@@ -300,7 +317,7 @@ class StatuslabelsController extends Controller
      * @since [v6.1.1]
      * @see \App\Http\Transformers\SelectlistTransformer
      */
-    public function selectlist(Request $request)
+    public function selectlist(Request $request) : array
     {
 
         $this->authorize('view.selectlists');
diff --git a/app/Http/Controllers/Api/SuppliersController.php b/app/Http/Controllers/Api/SuppliersController.php
index 3e3d637be0..ab0db67909 100644
--- a/app/Http/Controllers/Api/SuppliersController.php
+++ b/app/Http/Controllers/Api/SuppliersController.php
@@ -10,6 +10,7 @@ use App\Models\Supplier;
 use Illuminate\Http\Request;
 use App\Http\Requests\ImageUploadRequest;
 use Illuminate\Support\Facades\Storage;
+use Illuminate\Http\JsonResponse;
 
 class SuppliersController extends Controller
 {
@@ -20,13 +21,18 @@ class SuppliersController extends Controller
      * @since [v4.0]
      * @return \Illuminate\Http\Response
      */
-    public function index(Request $request)
+    public function index(Request $request): array
     {
         $this->authorize('view', Supplier::class);
-        $allowed_columns = ['
-            id',
+        $allowed_columns = [
+            'id',
             'name',
             'address',
+            'address2',
+            'city',
+            'state',
+            'country',
+            'zip',
             'phone',
             'contact',
             'fax',
@@ -38,21 +44,24 @@ class SuppliersController extends Controller
             'components_count',
             'consumables_count',
             'url',
+            'notes',
         ];
         
         $suppliers = Supplier::select(
-                ['id', 'name', 'address', 'address2', 'city', 'state', 'country', 'fax', 'phone', 'email', 'contact', 'created_at', 'updated_at', 'deleted_at', 'image', 'notes', 'url'])
+                ['id', 'name', 'address', 'address2', 'city', 'state', 'country', 'fax', 'phone', 'email', 'contact', 'created_at', 'created_by', 'updated_at', 'deleted_at', 'image', 'notes', 'url', 'zip'])
                     ->withCount('assets as assets_count')
                     ->withCount('licenses as licenses_count')
                     ->withCount('accessories as accessories_count')
                     ->withCount('components as components_count')
-                    ->withCount('consumables as consumables_count');
+                    ->withCount('consumables as consumables_count')
+                    ->with('adminuser');
 
 
         if ($request->filled('search')) {
-            $suppliers = $suppliers->TextSearch($request->input('search'));
+            $suppliers->TextSearch($request->input('search'));
         }
 
+
         if ($request->filled('name')) {
             $suppliers->where('name', '=', $request->input('name'));
         }
@@ -99,7 +108,15 @@ class SuppliersController extends Controller
 
         $order = $request->input('order') === 'asc' ? 'asc' : 'desc';
         $sort = in_array($request->input('sort'), $allowed_columns) ? $request->input('sort') : 'created_at';
-        $suppliers->orderBy($sort, $order);
+
+        switch ($request->input('sort')) {
+            case 'created_by':
+                $suppliers->OrderByCreatedByName($order);
+                break;
+            default:
+                $suppliers->orderBy($sort, $order);
+                break;
+        }
 
         $total = $suppliers->count();
         $suppliers = $suppliers->skip($offset)->take($limit)->get();
@@ -114,9 +131,8 @@ class SuppliersController extends Controller
      * @author [A. Gianotto] [<snipe@snipe.net>]
      * @since [v4.0]
      * @param  \App\Http\Requests\ImageUploadRequest  $request
-     * @return \Illuminate\Http\Response
      */
-    public function store(ImageUploadRequest $request)
+    public function store(ImageUploadRequest $request) : JsonResponse
     {
         $this->authorize('create', Supplier::class);
         $supplier = new Supplier;
@@ -136,9 +152,8 @@ class SuppliersController extends Controller
      * @author [A. Gianotto] [<snipe@snipe.net>]
      * @since [v4.0]
      * @param  int  $id
-     * @return \Illuminate\Http\Response
      */
-    public function show($id)
+    public function show($id) : array
     {
         $this->authorize('view', Supplier::class);
         $supplier = Supplier::findOrFail($id);
@@ -154,9 +169,8 @@ class SuppliersController extends Controller
      * @since [v4.0]
      * @param  \App\Http\Requests\ImageUploadRequest  $request
      * @param  int  $id
-     * @return \Illuminate\Http\Response
      */
-    public function update(ImageUploadRequest $request, $id)
+    public function update(ImageUploadRequest $request, $id) : JsonResponse
     {
         $this->authorize('update', Supplier::class);
         $supplier = Supplier::findOrFail($id);
@@ -176,9 +190,8 @@ class SuppliersController extends Controller
      * @author [A. Gianotto] [<snipe@snipe.net>]
      * @since [v4.0]
      * @param  int  $id
-     * @return \Illuminate\Http\Response
      */
-    public function destroy($id)
+    public function destroy($id) : JsonResponse
     {
         $this->authorize('delete', Supplier::class);
         $supplier = Supplier::with('asset_maintenances', 'assets', 'licenses')->withCount('asset_maintenances as asset_maintenances_count', 'assets as assets_count', 'licenses as licenses_count')->findOrFail($id);
@@ -209,7 +222,7 @@ class SuppliersController extends Controller
      * @since [v4.0.16]
      * @see \App\Http\Transformers\SelectlistTransformer
      */
-    public function selectlist(Request $request)
+    public function selectlist(Request $request) : array
     {
 
         $this->authorize('view.selectlists');
diff --git a/app/Http/Controllers/Api/UsersController.php b/app/Http/Controllers/Api/UsersController.php
index 3374f1907e..994ad15f25 100644
--- a/app/Http/Controllers/Api/UsersController.php
+++ b/app/Http/Controllers/Api/UsersController.php
@@ -6,6 +6,7 @@ use App\Helpers\Helper;
 use App\Http\Controllers\Controller;
 use App\Http\Requests\SaveUserRequest;
 use App\Http\Transformers\AccessoriesTransformer;
+use App\Http\Transformers\ActionlogsTransformer;
 use App\Http\Transformers\AssetsTransformer;
 use App\Http\Transformers\ConsumablesTransformer;
 use App\Http\Transformers\LicensesTransformer;
@@ -14,16 +15,19 @@ use App\Http\Transformers\UsersTransformer;
 use App\Models\Actionlog;
 use App\Models\Asset;
 use App\Models\Accessory;
+use App\Models\Company;
 use App\Models\Consumable;
 use App\Models\License;
 use App\Models\User;
 use App\Notifications\CurrentInventory;
 use Illuminate\Support\Facades\Auth;
+use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Storage;
 use Illuminate\Support\Facades\Validator;
 use Illuminate\Support\Facades\Log;
 use App\Http\Requests\DeleteUserRequest;
+use Illuminate\Http\JsonResponse;
 
 class UsersController extends Controller
 {
@@ -35,19 +39,20 @@ class UsersController extends Controller
      *
      * @return array
      */
-    public function index(Request $request)
+    public function index(Request $request) : array
     {
         $this->authorize('view', User::class);
 
         $users = User::select([
             'users.activated',
-            'users.created_by',
             'users.address',
             'users.avatar',
             'users.city',
             'users.company_id',
             'users.country',
+            'users.created_by',
             'users.created_at',
+            'users.updated_at',
             'users.deleted_at',
             'users.department_id',
             'users.email',
@@ -66,7 +71,6 @@ class UsersController extends Controller
             'users.state',
             'users.two_factor_enrolled',
             'users.two_factor_optin',
-            'users.updated_at',
             'users.username',
             'users.zip',
             'users.remote',
@@ -77,8 +81,17 @@ class UsersController extends Controller
             'users.autoassign_licenses',
             'users.website',
 
-        ])->with('manager', 'groups', 'userloc', 'company', 'department', 'assets', 'licenses', 'accessories', 'consumables', 'createdBy', 'managesUsers', 'managedLocations')
-            ->withCount('assets as assets_count', 'licenses as licenses_count', 'accessories as accessories_count', 'consumables as consumables_count', 'managesUsers as manages_users_count', 'managedLocations as manages_locations_count');
+        ])->with('manager', 'groups', 'userloc', 'company', 'department', 'assets', 'licenses', 'accessories', 'consumables', 'createdBy', 'managesUsers', 'managedLocations', 'eulas')
+            ->withCount([
+                'assets as assets_count' => function(Builder $query) {
+                    $query->withoutTrashed();
+                },
+                'licenses as licenses_count',
+                'accessories as accessories_count',
+                'consumables as consumables_count',
+                'managesUsers as manages_users_count',
+                'managedLocations as manages_locations_count'
+            ]);
 
 
         if ($request->filled('search') != '') {
@@ -194,17 +207,21 @@ class UsersController extends Controller
         }
 
         if ($request->filled('manages_users_count')) {
-            $users->has('manages_users_count', '=', $request->input('manages_users_count'));
+            $users->has('managesUsers', '=', $request->input('manages_users_count'));
         }
 
         if ($request->filled('manages_locations_count')) {
-            $users->has('manages_locations_count', '=', $request->input('manages_locations_count'));
+            $users->has('managedLocations', '=', $request->input('manages_locations_count'));
         }
 
         if ($request->filled('autoassign_licenses')) {
             $users->where('autoassign_licenses', '=', $request->input('autoassign_licenses'));
         }
 
+        if ($request->filled('locale')) {
+            $users = $users->where('users.locale', '=', $request->input('locale'));
+        }
+
 
         if (($request->filled('deleted')) && ($request->input('deleted') == 'true')) {
             $users = $users->onlyTrashed();
@@ -247,13 +264,10 @@ class UsersController extends Controller
                         'jobtitle',
                         'username',
                         'employee_num',
-                        'assets',
-                        'accessories',
-                        'consumables',
-                        'licenses',
                         'groups',
                         'activated',
                         'created_at',
+                        'updated_at',
                         'two_factor_enrolled',
                         'two_factor_optin',
                         'last_login',
@@ -279,6 +293,8 @@ class UsersController extends Controller
                         'end_date',
                         'autoassign_licenses',
                         'website',
+                        'locale',
+                        'notes',
                     ];
 
                 $sort = in_array($request->input('sort'), $allowed_columns) ? $request->input('sort') : 'first_name';
@@ -305,7 +321,7 @@ class UsersController extends Controller
      * @since [v4.0.16]
      * @see \App\Http\Transformers\SelectlistTransformer
      */
-    public function selectlist(Request $request)
+    public function selectlist(Request $request) : array
     {
         $users = User::select(
             [
@@ -324,6 +340,7 @@ class UsersController extends Controller
             $users = $users->where(function ($query) use ($request) {
                 $query->SimpleNameSearch($request->get('search'))
                     ->orWhere('username', 'LIKE', '%'.$request->get('search').'%')
+                    ->orWhere('email', 'LIKE', '%'.$request->get('search').'%')
                     ->orWhere('employee_num', 'LIKE', '%'.$request->get('search').'%');
             });
         }
@@ -361,21 +378,21 @@ class UsersController extends Controller
      * @author [A. Gianotto] [<snipe@snipe.net>]
      * @since [v4.0]
      * @param  \Illuminate\Http\Request  $request
-     * @return array | \Illuminate\Http\JsonResponse
      */
-    public function store(SaveUserRequest $request)
+    public function store(SaveUserRequest $request) : JsonResponse
     {
         $this->authorize('create', User::class);
 
         $user = new User;
         $user->fill($request->all());
-        $user->created_by = Auth::user()->id;
+        $user->company_id = Company::getIdForCurrentUser($request->input('company_id'));
+        $user->created_by = auth()->id();
 
         if ($request->has('permissions')) {
             $permissions_array = $request->input('permissions');
 
             // Strip out the superuser permission if the API user isn't a superadmin
-            if (! Auth::user()->isSuperUser()) {
+            if (! auth()->user()->isSuperUser()) {
                 unset($permissions_array['superuser']);
             }
             $user->permissions = $permissions_array;
@@ -408,9 +425,8 @@ class UsersController extends Controller
      *
      * @author [A. Gianotto] [<snipe@snipe.net>]
      * @param  int  $id
-     * @return array | \Illuminate\Http\JsonResponse
      */
-    public function show($id)
+    public function show($id) : JsonResponse | array
     {
         $this->authorize('view', User::class);
 
@@ -431,15 +447,11 @@ class UsersController extends Controller
      * @since [v4.0]
      * @param  \Illuminate\Http\Request  $request
      * @param  int  $id
-     * @return \Illuminate\Http\JsonResponse
      */
-    public function update(SaveUserRequest $request, $id)
+    public function update(SaveUserRequest $request, User $user): JsonResponse
     {
         $this->authorize('update', User::class);
 
-        if ($user = User::find($id)) {
-
-
             $this->authorize('update', $user);
 
             /**
@@ -449,14 +461,16 @@ class UsersController extends Controller
              *
              */
 
-
-            if ((($id == 1) || ($id == 2)) && (config('app.lock_passwords'))) {
+        if ((($user->id == 1) || ($user->id == 2)) && (config('app.lock_passwords'))) {
                 return response()->json(Helper::formatStandardApiResponse('error', null, 'Permission denied. You cannot update user information via API on the demo.'));
             }
 
-
             $user->fill($request->all());
 
+            if ($request->filled('company_id')) {
+                $user->company_id = Company::getIdForCurrentUser($request->input('company_id'));
+            }
+
             if ($user->id == $request->input('manager_id')) {
                 return response()->json(Helper::formatStandardApiResponse('error', null, 'You cannot be your own manager'));
             }
@@ -472,25 +486,23 @@ class UsersController extends Controller
                 $permissions_array = $request->input('permissions');
 
                 // Strip out the individual superuser permission if the API user isn't a superadmin
-                if (!Auth::user()->isSuperUser()) {
+                if (!auth()->user()->isSuperUser()) {
                     unset($permissions_array['superuser']);
                 }
 
                 $user->permissions = $permissions_array;
             }
 
-
-            // Update the location of any assets checked out to this user
-            Asset::where('assigned_type', User::class)
-                ->where('assigned_to', $user->id)->update(['location_id' => $request->input('location_id', null)]);
-
-
+            if($request->has('location_id')) {
+                // Update the location of any assets checked out to this user
+                Asset::where('assigned_type', User::class)
+                    ->where('assigned_to', $user->id)->update(['location_id' => $request->input('location_id', null)]);
+            }
             app('App\Http\Requests\ImageUploadRequest')->handleImages($user, 600, 'image', 'avatars', 'avatar');
 
             if ($user->save()) {
-
                 // Check if the request has groups passed and has a value, AND that the user us a superuser
-                if (($request->has('groups')) && (Auth::user()->isSuperUser())) {
+                if (($request->has('groups')) && (auth()->user()->isSuperUser())) {
 
                     $validator = Validator::make($request->only('groups'), [
                         'groups.*' => 'integer|exists:permission_groups,id',
@@ -502,18 +514,10 @@ class UsersController extends Controller
 
                     // Sync the groups since the user is a superuser and the groups pass validation
                     $user->groups()->sync($request->input('groups'));
-
-
                 }
-
                 return response()->json(Helper::formatStandardApiResponse('success', (new UsersTransformer)->transformUser($user), trans('admin/users/message.success.update')));
             }
-
             return response()->json(Helper::formatStandardApiResponse('error', null, $user->getErrors()));
-        }
-
-        return response()->json(Helper::formatStandardApiResponse('error', null, trans('admin/users/message.user_not_found', compact('id'))));
-
     }
 
     /**
@@ -522,9 +526,8 @@ class UsersController extends Controller
      * @author [A. Gianotto] [<snipe@snipe.net>]
      * @since [v4.0]
      * @param  int  $id
-     * @return \Illuminate\Http\JsonResponse
      */
-    public function destroy(DeleteUserRequest $request, $id)
+    public function destroy(DeleteUserRequest $request, $id) : JsonResponse
     {
         $this->authorize('delete', User::class);
 
@@ -560,9 +563,8 @@ class UsersController extends Controller
      * @author [A. Gianotto] [<snipe@snipe.net>]
      * @since [v3.0]
      * @param $userId
-     * @return array | \Illuminate\Http\JsonResponse
      */
-    public function assets(Request $request, $id)
+    public function assets(Request $request, $id) : JsonResponse | array
     {
         $this->authorize('view', User::class);
         $this->authorize('view', Asset::class);
@@ -605,9 +607,9 @@ class UsersController extends Controller
      * @since [v6.0.13]
      * @param Request $request
      * @param $id
-     * @return string JSON
      */
-    public function emailAssetList(Request $request, $id)
+    public function emailAssetList(Request $request, $id) : JsonResponse
+
     {
         $this->authorize('update', User::class);
 
@@ -633,9 +635,8 @@ class UsersController extends Controller
      * @author [A. Gianotto] [<snipe@snipe.net>]
      * @since [v3.0]
      * @param $userId
-     * @return array | \Illuminate\Http\JsonResponse
      */
-    public function consumables(Request $request, $id)
+    public function consumables(Request $request, $id) : array
     {
         $this->authorize('view', User::class);
         $this->authorize('view', Consumable::class);
@@ -651,9 +652,8 @@ class UsersController extends Controller
      * @author [A. Gianotto] [<snipe@snipe.net>]
      * @since [v4.6.14]
      * @param $userId
-     * @return array
      */
-    public function accessories($id)
+    public function accessories($id) : array
     {
         $this->authorize('view', User::class);
         $user = User::findOrFail($id);
@@ -670,9 +670,8 @@ class UsersController extends Controller
      * @author [N. Mathar] [<snipe@snipe.net>]
      * @since [v5.0]
      * @param $userId
-     * @return array | \Illuminate\Http\JsonResponse
      */
-    public function licenses($id)
+    public function licenses($id) : JsonResponse | array
     {
         $this->authorize('view', User::class);
         $this->authorize('view', License::class);
@@ -693,9 +692,8 @@ class UsersController extends Controller
      * @author [A. Gianotto] [<snipe@snipe.net>]
      * @since [v3.0]
      * @param $userId
-     * @return string JSON
      */
-    public function postTwoFactorReset(Request $request)
+    public function postTwoFactorReset(Request $request) : JsonResponse
     {
         $this->authorize('update', User::class);
 
@@ -714,7 +712,7 @@ class UsersController extends Controller
                 $logaction->item_type = User::class;
                 $logaction->item_id = $user->id;
                 $logaction->created_at = date('Y-m-d H:i:s');
-                $logaction->user_id = Auth::user()->id;
+                $logaction->created_by = auth()->id();
                 $logaction->logaction('2FA reset');
 
                 return response()->json(['message' => trans('admin/settings/general.two_factor_reset_success')], 200);
@@ -733,22 +731,39 @@ class UsersController extends Controller
      * @author [Juan Font] [<juanfontalonso@gmail.com>]
      * @since [v4.4.2]
      * @param  \Illuminate\Http\Request  $request
-     * @return array
      */
-    public function getCurrentUserInfo(Request $request)
+    public function getCurrentUserInfo(Request $request) : array
     {
         return (new UsersTransformer)->transformUser($request->user());
     }
 
+    /**
+     * Display the EULAs accepted by the user.
+     *
+     *  @param \App\Models\User $user
+     *  @param \App\Http\Transformers\ActionlogsTransformer $transformer
+     *  @return \Illuminate\Http\JsonResponse
+     *@since [v8.1.16]
+     * @author [Godfrey Martinez] [<gmartinez@grokability.com>]
+     */
+    public function eulas(User $user, ActionlogsTransformer $transformer)
+    {
+        $this->authorize('view', Asset::class);
+
+        $eulas = $user->eulas;
+        return response()->json(
+            $transformer->transformActionlogs($eulas, $eulas->count())
+        );
+    }
+
     /**
      * Restore a soft-deleted user.
      *
      * @author [E. Taylor] [<dev@evantaylor.name>]
      * @param int $userId
      * @since [v6.0.0]
-     * @return \Illuminate\Http\JsonResponse
      */
-    public function restore($userId)
+    public function restore($userId) : JsonResponse
     {
         $this->authorize('delete', User::class);
 
@@ -766,7 +781,7 @@ class UsersController extends Controller
                 $logaction->item_type = User::class;
                 $logaction->item_id = $user->id;
                 $logaction->created_at = date('Y-m-d H:i:s');
-                $logaction->user_id = Auth::user()->id;
+                $logaction->created_by = auth()->id();
                 $logaction->logaction('restore');
 
                 return response()->json(Helper::formatStandardApiResponse('success', null, trans('admin/users/message.success.restored')), 200);
diff --git a/app/Http/Controllers/AssetMaintenancesController.php b/app/Http/Controllers/AssetMaintenancesController.php
index c9ffea9a4c..0e46118af7 100644
--- a/app/Http/Controllers/AssetMaintenancesController.php
+++ b/app/Http/Controllers/AssetMaintenancesController.php
@@ -2,17 +2,14 @@
 
 namespace App\Http\Controllers;
 
-use App\Helpers\Helper;
 use App\Models\Asset;
 use App\Models\AssetMaintenance;
 use App\Models\Company;
 use Illuminate\Support\Facades\Auth;
 use Carbon\Carbon;
 use Illuminate\Http\Request;
-use Slack;
-use Str;
-use TCPDF;
-use View;
+use \Illuminate\Contracts\View\View;
+use \Illuminate\Http\RedirectResponse;
 
 /**
  * This controller handles all actions related to Asset Maintenance for
@@ -22,20 +19,6 @@ use View;
  */
 class AssetMaintenancesController extends Controller
 {
-    /**
-    * Checks for permissions for this action.
-    *
-    * @todo This should be replaced with middleware and/or policies
-    * @author  Vincent Sposato <vincent.sposato@gmail.com>
-    * @version v1.0
-    * @since [v1.8]
-    * @return View
-    */
-    private static function getInsufficientPermissionsRedirect()
-    {
-        return redirect()->route('maintenances.index')
-          ->with('error', trans('general.insufficient_permissions'));
-    }
 
     /**
     *  Returns a view that invokes the ajax tables which actually contains
@@ -46,9 +29,8 @@ class AssetMaintenancesController extends Controller
     * @author  Vincent Sposato <vincent.sposato@gmail.com>
     * @version v1.0
     * @since [v1.8]
-    * @return View
     */
-    public function index()
+    public function index() : View
     {
         $this->authorize('view', Asset::class);
         return view('asset_maintenances/index');
@@ -63,7 +45,7 @@ class AssetMaintenancesController extends Controller
      * @since [v1.8]
      * @return mixed
      */
-    public function create()
+    public function create() : View
     {
         $this->authorize('update', Asset::class);
         $asset = null;
@@ -72,16 +54,10 @@ class AssetMaintenancesController extends Controller
             // We have to set this so that the correct property is set in the select2 ajax dropdown
             $asset->asset_id = $asset->id;
         }
-
-        // Prepare Asset Maintenance Type List
-        $assetMaintenanceType = [
-                                    '' => 'Select an asset maintenance type',
-                                ] + AssetMaintenance::getImprovementOptions();
-        // Mark the selected asset, if it came in
-
+        
         return view('asset_maintenances/edit')
+                   ->with('assetMaintenanceType', AssetMaintenance::getImprovementOptions())
                    ->with('asset', $asset)
-                   ->with('assetMaintenanceType', $assetMaintenanceType)
                    ->with('item', new AssetMaintenance);
     }
 
@@ -92,48 +68,49 @@ class AssetMaintenancesController extends Controller
     * @author  Vincent Sposato <vincent.sposato@gmail.com>
     * @version v1.0
     * @since [v1.8]
-    * @return mixed
     */
-    public function store(Request $request)
+    public function store(Request $request) : RedirectResponse
     {
         $this->authorize('update', Asset::class);
-        // create a new model instance
-        $assetMaintenance = new AssetMaintenance();
-        $assetMaintenance->supplier_id = $request->input('supplier_id');
-        $assetMaintenance->is_warranty = $request->input('is_warranty');
-        $assetMaintenance->cost = $request->input('cost');
-        $assetMaintenance->notes = $request->input('notes');
-        $asset = Asset::find($request->input('asset_id'));
 
-        if ((! Company::isCurrentUserHasAccess($asset)) && ($asset != null)) {
-            return static::getInsufficientPermissionsRedirect();
+        $assets = Asset::whereIn('id', $request->input('selected_assets'))->get();
+
+        // Loop through the selected assets
+        foreach ($assets as $asset) {
+
+            $assetMaintenance = new AssetMaintenance();
+            $assetMaintenance->supplier_id = $request->input('supplier_id');
+            $assetMaintenance->is_warranty = $request->input('is_warranty');
+            $assetMaintenance->cost = $request->input('cost');
+            $assetMaintenance->notes = $request->input('notes');
+
+            // Save the asset maintenance data
+            $assetMaintenance->asset_id = $asset->id;
+            $assetMaintenance->asset_maintenance_type = $request->input('asset_maintenance_type');
+            $assetMaintenance->title = $request->input('title');
+            $assetMaintenance->start_date = $request->input('start_date');
+            $assetMaintenance->completion_date = $request->input('completion_date');
+            $assetMaintenance->created_by = auth()->id();
+
+            if (($assetMaintenance->completion_date !== null)
+                && ($assetMaintenance->start_date !== '')
+                && ($assetMaintenance->start_date !== '0000-00-00')
+            ) {
+                $startDate = Carbon::parse($assetMaintenance->start_date);
+                $completionDate = Carbon::parse($assetMaintenance->completion_date);
+                $assetMaintenance->asset_maintenance_time = (int) $completionDate->diffInDays($startDate, true);
+            }
+
+
+            // Was the asset maintenance created?
+            if (!$assetMaintenance->save()) {
+                return redirect()->back()->withInput()->withErrors($assetMaintenance->getErrors());
+            }
         }
 
-        // Save the asset maintenance data
-        $assetMaintenance->asset_id = $request->input('asset_id');
-        $assetMaintenance->asset_maintenance_type = $request->input('asset_maintenance_type');
-        $assetMaintenance->title = $request->input('title');
-        $assetMaintenance->start_date = $request->input('start_date');
-        $assetMaintenance->completion_date = $request->input('completion_date');
-        $assetMaintenance->user_id = Auth::id();
+        return redirect()->route('maintenances.index')
+            ->with('success', trans('admin/asset_maintenances/message.create.success'));
 
-        if (($assetMaintenance->completion_date !== null)
-            && ($assetMaintenance->start_date !== '')
-            && ($assetMaintenance->start_date !== '0000-00-00')
-        ) {
-            $startDate = Carbon::parse($assetMaintenance->start_date);
-            $completionDate = Carbon::parse($assetMaintenance->completion_date);
-            $assetMaintenance->asset_maintenance_time = $completionDate->diffInDays($startDate);
-        }
-
-        // Was the asset maintenance created?
-        if ($assetMaintenance->save()) {
-            // Redirect to the new asset maintenance page
-            return redirect()->route('maintenances.index')
-                           ->with('success', trans('admin/asset_maintenances/message.create.success'));
-        }
-
-        return redirect()->back()->withInput()->withErrors($assetMaintenance->getErrors());
     }
 
     /**
@@ -141,39 +118,19 @@ class AssetMaintenancesController extends Controller
     *
     * @see AssetMaintenancesController::postEdit() method that stores the data
     * @author  Vincent Sposato <vincent.sposato@gmail.com>
-    * @param int $assetMaintenanceId
     * @version v1.0
     * @since [v1.8]
-    * @return mixed
     */
-    public function edit($assetMaintenanceId = null)
+    public function edit(AssetMaintenance $maintenance) : View | RedirectResponse
     {
         $this->authorize('update', Asset::class);
-        // Check if the asset maintenance exists
-        $this->authorize('update', Asset::class);
-        // Check if the asset maintenance exists
-        if (is_null($assetMaintenance = AssetMaintenance::find($assetMaintenanceId))) {
-            // Redirect to the asset maintenance management page
-            return redirect()->route('maintenances.index')->with('error', trans('admin/asset_maintenances/message.not_found'));
-        } elseif ((!$assetMaintenance->asset) || ($assetMaintenance->asset->deleted_at!='')) {
-            // Redirect to the asset maintenance management page
-            return redirect()->route('maintenances.index')->with('error', 'asset does not exist');
-        } elseif (! Company::isCurrentUserHasAccess($assetMaintenance->asset)) {
-            return static::getInsufficientPermissionsRedirect();
-        }
+        $this->authorize('update', $maintenance->asset);
 
-
-        // Prepare Improvement Type List
-        $assetMaintenanceType = [
-                                    '' => 'Select an improvement type',
-                                ] + AssetMaintenance::getImprovementOptions();
-
-        // Get Supplier List
-        // Render the view
         return view('asset_maintenances/edit')
-                   ->with('selectedAsset', null)
-                   ->with('assetMaintenanceType', $assetMaintenanceType)
-                   ->with('item', $assetMaintenance);
+            ->with('selected_assets', $maintenance->asset->pluck('id')->toArray())
+            ->with('asset_ids', request()->input('asset_ids', []))
+            ->with('assetMaintenanceType', AssetMaintenance::getImprovementOptions())
+            ->with('item', $maintenance);
     }
 
     /**
@@ -183,69 +140,49 @@ class AssetMaintenancesController extends Controller
      * @author  Vincent Sposato <vincent.sposato@gmail.com>
      * @param Request $request
      * @param int $assetMaintenanceId
-     * @return mixed
      * @version v1.0
      * @since [v1.8]
      */
-    public function update(Request $request, $assetMaintenanceId = null)
+    public function update(Request $request, AssetMaintenance $maintenance) : View | RedirectResponse
     {
         $this->authorize('update', Asset::class);
-        // Check if the asset maintenance exists
-        if (is_null($assetMaintenance = AssetMaintenance::find($assetMaintenanceId))) {
-            // Redirect to the asset maintenance management page
-            return redirect()->route('maintenances.index')->with('error', trans('admin/asset_maintenances/message.not_found'));
-        } elseif ((!$assetMaintenance->asset) || ($assetMaintenance->asset->deleted_at!='')) {
-                // Redirect to the asset maintenance management page
-                return redirect()->route('maintenances.index')->with('error', 'asset does not exist');
-        } elseif (! Company::isCurrentUserHasAccess($assetMaintenance->asset)) {
-            return static::getInsufficientPermissionsRedirect();
-        }
+        $this->authorize('update', $maintenance->asset);
 
-        $assetMaintenance->supplier_id = $request->input('supplier_id');
-        $assetMaintenance->is_warranty = $request->input('is_warranty');
-        $assetMaintenance->cost =  $request->input('cost');
-        $assetMaintenance->notes = $request->input('notes');
+        $maintenance->supplier_id = $request->input('supplier_id');
+        $maintenance->is_warranty = $request->input('is_warranty', 0);
+        $maintenance->cost =  $request->input('cost');
+        $maintenance->notes = $request->input('notes');
+        $maintenance->asset_maintenance_type = $request->input('asset_maintenance_type');
+        $maintenance->title = $request->input('title');
+        $maintenance->start_date = $request->input('start_date');
+        $maintenance->completion_date = $request->input('completion_date');
 
-        $asset = Asset::find(request('asset_id'));
 
-        if (! Company::isCurrentUserHasAccess($asset)) {
-            return static::getInsufficientPermissionsRedirect();
-        }
-
-        // Save the asset maintenance data
-        $assetMaintenance->asset_id = $request->input('asset_id');
-        $assetMaintenance->asset_maintenance_type = $request->input('asset_maintenance_type');
-        $assetMaintenance->title = $request->input('title');
-        $assetMaintenance->start_date = $request->input('start_date');
-        $assetMaintenance->completion_date = $request->input('completion_date');
-
-        if (($assetMaintenance->completion_date == null)
-        ) {
-            if (($assetMaintenance->asset_maintenance_time !== 0)
-              || (! is_null($assetMaintenance->asset_maintenance_time))
+        // Todo - put this in a getter/setter?
+        if (($maintenance->completion_date == null))
+        {
+            if (($maintenance->asset_maintenance_time !== 0)
+              || (! is_null($maintenance->asset_maintenance_time))
             ) {
-                $assetMaintenance->asset_maintenance_time = null;
+                $maintenance->asset_maintenance_time = null;
             }
         }
 
-        if (($assetMaintenance->completion_date !== null)
-          && ($assetMaintenance->start_date !== '')
-          && ($assetMaintenance->start_date !== '0000-00-00')
+        if (($maintenance->completion_date !== null)
+          && ($maintenance->start_date !== '')
+          && ($maintenance->start_date !== '0000-00-00')
         ) {
-            $startDate = Carbon::parse($assetMaintenance->start_date);
-            $completionDate = Carbon::parse($assetMaintenance->completion_date);
-            $assetMaintenance->asset_maintenance_time = $completionDate->diffInDays($startDate);
+            $startDate = Carbon::parse($maintenance->start_date);
+            $completionDate = Carbon::parse($maintenance->completion_date);
+            $maintenance->asset_maintenance_time = (int) $completionDate->diffInDays($startDate, true);
         }
 
-      // Was the asset maintenance created?
-        if ($assetMaintenance->save()) {
-
-            // Redirect to the new asset maintenance page
+        if ($maintenance->save()) {
             return redirect()->route('maintenances.index')
-                         ->with('success', trans('admin/asset_maintenances/message.edit.success'));
+                            ->with('success', trans('admin/asset_maintenances/message.edit.success'));
         }
 
-        return redirect()->back()->withInput()->withErrors($assetMaintenance->getErrors());
+        return redirect()->back()->withInput()->withErrors($maintenance->getErrors());
     }
 
     /**
@@ -255,23 +192,13 @@ class AssetMaintenancesController extends Controller
     * @param int $assetMaintenanceId
     * @version v1.0
     * @since [v1.8]
-    * @return mixed
     */
-    public function destroy($assetMaintenanceId)
+    public function destroy(AssetMaintenance $maintenance) : RedirectResponse
     {
         $this->authorize('update', Asset::class);
-        // Check if the asset maintenance exists
-        if (is_null($assetMaintenance = AssetMaintenance::find($assetMaintenanceId))) {
-            // Redirect to the asset maintenance management page
-            return redirect()->route('maintenances.index')
-                           ->with('error', trans('admin/asset_maintenances/message.not_found'));
-        } elseif (! Company::isCurrentUserHasAccess($assetMaintenance->asset)) {
-            return static::getInsufficientPermissionsRedirect();
-        }
-
+        $this->authorize('update', $maintenance->asset);
         // Delete the asset maintenance
-        $assetMaintenance->delete();
-
+        $maintenance->delete();
         // Redirect to the asset_maintenance management page
         return redirect()->route('maintenances.index')
                        ->with('success', trans('admin/asset_maintenances/message.delete.success'));
@@ -284,21 +211,9 @@ class AssetMaintenancesController extends Controller
     * @param int $assetMaintenanceId
     * @version v1.0
     * @since [v1.8]
-    * @return View
     */
-    public function show($assetMaintenanceId)
+    public function show(AssetMaintenance $maintenance) : View | RedirectResponse
     {
-        $this->authorize('view', Asset::class);
-
-        // Check if the asset maintenance exists
-        if (is_null($assetMaintenance = AssetMaintenance::find($assetMaintenanceId))) {
-            // Redirect to the asset maintenance management page
-            return redirect()->route('maintenances.index')
-                           ->with('error', trans('admin/asset_maintenances/message.not_found'));
-        } elseif (! Company::isCurrentUserHasAccess($assetMaintenance->asset)) {
-            return static::getInsufficientPermissionsRedirect();
-        }
-
-        return view('asset_maintenances/view')->with('assetMaintenance', $assetMaintenance);
+        return view('asset_maintenances/view')->with('assetMaintenance', $maintenance);
     }
 }
diff --git a/app/Http/Controllers/AssetModelsController.php b/app/Http/Controllers/AssetModelsController.php
index a2deb616b0..0795588776 100755
--- a/app/Http/Controllers/AssetModelsController.php
+++ b/app/Http/Controllers/AssetModelsController.php
@@ -4,19 +4,22 @@ namespace App\Http\Controllers;
 
 use App\Helpers\Helper;
 use App\Http\Requests\ImageUploadRequest;
+use App\Http\Requests\StoreAssetModelRequest;
 use App\Models\Actionlog;
-use App\Models\Asset;
 use App\Models\AssetModel;
 use App\Models\CustomField;
+use App\Models\SnipeModel;
 use App\Models\User;
 use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\DB;
-use Illuminate\Support\Facades\View;
 use Illuminate\Support\Facades\Validator;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Storage;
-use Symfony\Component\HttpFoundation\JsonResponse;
 use Illuminate\Support\Facades\Log;
+use \Illuminate\Contracts\View\View;
+use \Illuminate\Http\RedirectResponse;
+use Illuminate\Support\MessageBag;
+
 
 /**
  * This class controls all actions related to asset models for
@@ -27,16 +30,15 @@ use Illuminate\Support\Facades\Log;
  */
 class AssetModelsController extends Controller
 {
+    protected MessageBag $validatorErrors;
     /**
      * Returns a view that invokes the ajax tables which actually contains
      * the content for the accessories listing, which is generated in getDatatable.
      *
      * @author [A. Gianotto] [<snipe@snipe.net>]
      * @since [v1.0]
-     * @return View
-     * @throws \Illuminate\Auth\Access\AuthorizationException
      */
-    public function index()
+    public function index() : View
     {
         $this->authorize('index', AssetModel::class);
 
@@ -48,10 +50,8 @@ class AssetModelsController extends Controller
      *
      * @author [A. Gianotto] [<snipe@snipe.net>]
      * @since [v1.0]
-     * @return View
-     * @throws \Illuminate\Auth\Access\AuthorizationException
      */
-    public function create()
+    public function create() : View
     {
         $this->authorize('create', AssetModel::class);
 
@@ -66,16 +66,12 @@ class AssetModelsController extends Controller
      * @author [A. Gianotto] [<snipe@snipe.net>]
      * @since [v1.0]
      * @param ImageUploadRequest $request
-     * @return \Illuminate\Http\RedirectResponse
-     * @throws \Illuminate\Auth\Access\AuthorizationException
      */
-    public function store(ImageUploadRequest $request)
+    public function store(StoreAssetModelRequest $request) : RedirectResponse
     {
         $this->authorize('create', AssetModel::class);
-        // Create a new asset model
         $model = new AssetModel;
 
-        // Save the model data
         $model->eol = $request->input('eol');
         $model->depreciation_id = $request->input('depreciation_id');
         $model->name = $request->input('name');
@@ -84,7 +80,7 @@ class AssetModelsController extends Controller
         $model->manufacturer_id = $request->input('manufacturer_id');
         $model->category_id = $request->input('category_id');
         $model->notes = $request->input('notes');
-        $model->user_id = Auth::id();
+        $model->created_by = auth()->id();
         $model->requestable = $request->has('requestable');
 
         if ($request->input('fieldset_id') != '') {
@@ -93,7 +89,6 @@ class AssetModelsController extends Controller
 
         $model = $request->handleImages($model);
 
-        // Was it created?
         if ($model->save()) {
             if ($this->shouldAddDefaultValues($request->input())) {
                 if (!$this->assignCustomFieldsDefaultValues($model, $request->input('default_values'))){
@@ -113,21 +108,12 @@ class AssetModelsController extends Controller
      * @author [A. Gianotto] [<snipe@snipe.net>]
      * @since [v1.0]
      * @param int $modelId
-     * @return View
-     * @throws \Illuminate\Auth\Access\AuthorizationException
      */
-    public function edit($modelId = null)
+    public function edit(AssetModel $model) : View | RedirectResponse
     {
         $this->authorize('update', AssetModel::class);
-        if ($item = AssetModel::find($modelId)) {
-            $category_type = 'asset';
-            $view = View::make('models/edit', compact('item', 'category_type'));
-            $view->with('depreciation_list', Helper::depreciationList());
-
-            return $view;
-        }
-
-        return redirect()->route('models.index')->with('error', trans('admin/models/message.does_not_exist'));
+        $category_type = 'asset';
+        return view('models/edit', compact('category_type'))->with('item', $model)->with('depreciation_list', Helper::depreciationList());
     }
 
 
@@ -142,17 +128,11 @@ class AssetModelsController extends Controller
      * @return \Illuminate\Http\RedirectResponse
      * @throws \Illuminate\Auth\Access\AuthorizationException
      */
-    public function update(ImageUploadRequest $request, $modelId = null)
+    public function update(StoreAssetModelRequest $request, AssetModel $model) : RedirectResponse
     {
         $this->authorize('update', AssetModel::class);
-        // Check if the model exists
-        if (is_null($model = AssetModel::find($modelId))) {
-            // Redirect to the models management page
-            return redirect()->route('models.index')->with('error', trans('admin/models/message.does_not_exist'));
-        }
 
         $model = $request->handleImages($model);
-
         $model->depreciation_id = $request->input('depreciation_id');
         $model->eol = $request->input('eol');
         $model->name = $request->input('name');
@@ -163,20 +143,17 @@ class AssetModelsController extends Controller
         $model->notes = $request->input('notes');
         $model->requestable = $request->input('requestable', '0');
 
-        $this->removeCustomFieldsDefaultValues($model);
-
         $model->fieldset_id = $request->input('fieldset_id');
 
-        if ($this->shouldAddDefaultValues($request->input())) {
-            if (!$this->assignCustomFieldsDefaultValues($model, $request->input('default_values'))){
-                return redirect()->back()->withInput()->with('error', trans('admin/custom_fields/message.fieldset_default_value.error'));
-            }
-        }
-
-       
-      
-       
         if ($model->save()) {
+            $this->removeCustomFieldsDefaultValues($model);
+
+            if ($this->shouldAddDefaultValues($request->input())) {
+                if (!$this->assignCustomFieldsDefaultValues($model, $request->input('default_values'))) {
+                    return redirect()->back()->withInput()->withErrors($this->validatorErrors);
+                }
+            }
+
             if ($model->wasChanged('eol')) {
                     if ($model->eol > 0) {
                         $newEol = $model->eol; 
@@ -200,30 +177,17 @@ class AssetModelsController extends Controller
      * @author [A. Gianotto] [<snipe@snipe.net>]
      * @since [v1.0]
      * @param int $modelId
-     * @return \Illuminate\Http\RedirectResponse
-     * @throws \Illuminate\Auth\Access\AuthorizationException
      */
-    public function destroy($modelId)
+    public function destroy(AssetModel $model) : RedirectResponse
     {
         $this->authorize('delete', AssetModel::class);
-        // Check if the model exists
-        if (is_null($model = AssetModel::find($modelId))) {
-            return redirect()->route('models.index')->with('error', trans('admin/models/message.does_not_exist'));
-        }
+
 
         if ($model->assets()->count() > 0) {
             // Throw an error that this model is associated with assets
             return redirect()->route('models.index')->with('error', trans('admin/models/message.assoc_users'));
         }
 
-        if ($model->image) {
-            try {
-                Storage::disk('public')->delete('models/'.$model->image);
-            } catch (\Exception $e) {
-                Log::info($e);
-            }
-        }
-
         // Delete the model
         $model->delete();
 
@@ -237,10 +201,8 @@ class AssetModelsController extends Controller
      * @author [A. Gianotto] [<snipe@snipe.net>]
      * @since [v1.0]
      * @param int $id
-     * @return \Illuminate\Http\RedirectResponse
-     * @throws \Illuminate\Auth\Access\AuthorizationException
      */
-    public function getRestore($id)
+    public function getRestore($id) : RedirectResponse
     {
         $this->authorize('create', AssetModel::class);
 
@@ -252,10 +214,10 @@ class AssetModelsController extends Controller
 
             if ($model->restore()) {
                 $logaction = new Actionlog();
-                $logaction->item_type = User::class;
+                $logaction->item_type = AssetModel::class;
                 $logaction->item_id = $model->id;
                 $logaction->created_at = date('Y-m-d H:i:s');
-                $logaction->user_id = Auth::user()->id;
+                $logaction->created_by = auth()->id();
                 $logaction->logaction('restore');
 
 
@@ -282,19 +244,11 @@ class AssetModelsController extends Controller
      * @author [A. Gianotto] [<snipe@snipe.net>]
      * @since [v1.0]
      * @param int $modelId
-     * @return View
-     * @throws \Illuminate\Auth\Access\AuthorizationException
      */
-    public function show($modelId = null)
+    public function show(AssetModel $model) : View | RedirectResponse
     {
         $this->authorize('view', AssetModel::class);
-        $model = AssetModel::withTrashed()->find($modelId);
-
-        if (isset($model->id)) {
-            return view('models/view', compact('model'));
-        }
-
-        return redirect()->route('models.index')->with('error', trans('admin/models/message.does_not_exist'));
+        return view('models/view', compact('model'));
     }
 
     /**
@@ -303,25 +257,21 @@ class AssetModelsController extends Controller
      * @author [A. Gianotto] [<snipe@snipe.net>]
      * @since [v1.0]
      * @param int $modelId
-     * @return View
      */
-    public function getClone($modelId = null)
+    public function getClone(AssetModel $model) : View | RedirectResponse
     {
         $this->authorize('create', AssetModel::class);
-        // Check if the model exists
-        if (is_null($model_to_clone = AssetModel::find($modelId))) {
-            return redirect()->route('models.index')->with('error', trans('admin/models/message.does_not_exist'));
-        }
 
-        $model = clone $model_to_clone;
+        $cloned_model = clone $model;
         $model->id = null;
+        $model->deleted_at = null;
 
         // Show the page
         return view('models/edit')
             ->with('depreciation_list', Helper::depreciationList())
             ->with('item', $model)
-            ->with('model_id', $model_to_clone->id)
-            ->with('clone_model', $model_to_clone);
+            ->with('model_id', $model->id)
+            ->with('clone_model', $cloned_model);
     }
 
 
@@ -331,9 +281,8 @@ class AssetModelsController extends Controller
      * @author [B. Wetherington] [<uberbrady@gmail.com>]
      * @since [v2.0]
      * @param int $modelId
-     * @return View
      */
-    public function getCustomFields($modelId)
+    public function getCustomFields($modelId) : View
     {
         return view('models.custom_fields_form')->with('model', AssetModel::find($modelId));
     }
@@ -341,13 +290,12 @@ class AssetModelsController extends Controller
 
 
     /**
-     * Returns a view that allows the user to bulk edit model attrbutes
+     * Returns a view that allows the user to bulk edit model attributes
      *
      * @author [A. Gianotto] [<snipe@snipe.net>]
      * @since [v1.7]
-     * @return \Illuminate\Contracts\View\View
      */
-    public function postBulkEdit(Request $request)
+    public function postBulkEdit(Request $request) : View | RedirectResponse
     {
         $models_raw_array = $request->input('ids');
 
@@ -389,9 +337,8 @@ class AssetModelsController extends Controller
      *
      * @author [A. Gianotto] [<snipe@snipe.net>]
      * @since [v1.7]
-     * @return \Illuminate\Contracts\View\View
      */
-    public function postBulkEditSave(Request $request)
+    public function postBulkEditSave(Request $request) : RedirectResponse
     {
         $models_raw_array = $request->input('ids');
         $update_array = [];
@@ -429,9 +376,8 @@ class AssetModelsController extends Controller
      * @author [A. Gianotto] [<snipe@snipe.net>]
      * @since [v1.0]
      * @param int $modelId
-     * @return \Illuminate\Http\RedirectResponse
      */
-    public function postBulkDelete(Request $request)
+    public function postBulkDelete(Request $request) : RedirectResponse
     {
         $models_raw_array = $request->input('ids');
 
@@ -470,9 +416,8 @@ class AssetModelsController extends Controller
      * any default values were entered into the form.
      *
      * @param  array  $input
-     * @return bool
      */
-    private function shouldAddDefaultValues(array $input)
+    private function shouldAddDefaultValues(array $input) : bool
     {
         return ! empty($input['add_default_values'])
             && ! empty($input['default_values'])
@@ -484,9 +429,8 @@ class AssetModelsController extends Controller
      *
      * @param  AssetModel $model
      * @param  array      $defaultValues
-     * @return void
      */
-    private function assignCustomFieldsDefaultValues(AssetModel $model, array $defaultValues): bool
+    private function assignCustomFieldsDefaultValues(AssetModel|SnipeModel $model, array $defaultValues): bool
     {
         $data = array();
         foreach ($defaultValues as $customFieldId => $defaultValue) {
@@ -495,22 +439,28 @@ class AssetModelsController extends Controller
             $data[$customField->db_column] = $defaultValue;
         }
 
-        $fieldsets = $model->fieldset->validation_rules();
+        $allRules = $model->fieldset->validation_rules();
         $rules = array();
 
-        foreach ($fieldsets as $fieldset => $validation){
+        foreach ($allRules as $field => $validation) {
             // If the field is marked as required, eliminate the rule so it doesn't interfere with the default values
             // (we are at model level, the rule still applies when creating a new asset using this model)
             $index = array_search('required', $validation);
             if ($index !== false){
                 $validation[$index] = 'nullable';
             }
-            $rules[$fieldset] = $validation;
+            $rules[$field] = $validation;
         }
 
-        $validator = Validator::make($data, $rules);
+        $attributes = [];
+        foreach ($model->fieldset->fields as $field) {
+            $attributes[$field->db_column] = trim(preg_replace('/_+|snipeit|\d+/', ' ', $field->db_column));
+        }
+
+        $validator = Validator::make($data, $rules)->setAttributeNames($attributes);
 
         if($validator->fails()){
+            $this->validatorErrors = $validator->errors();
             return false;
         }
 
@@ -527,9 +477,8 @@ class AssetModelsController extends Controller
     /**
      * Removes all default values
      *
-     * @return void
      */
-    private function removeCustomFieldsDefaultValues(AssetModel $model)
+    private function removeCustomFieldsDefaultValues(AssetModel|SnipeModel $model): void
     {
         $model->defaultValues()->detach();
     }
diff --git a/app/Http/Controllers/AssetModelsFilesController.php b/app/Http/Controllers/AssetModelsFilesController.php
index c8247ffc15..14b2c1fc0b 100644
--- a/app/Http/Controllers/AssetModelsFilesController.php
+++ b/app/Http/Controllers/AssetModelsFilesController.php
@@ -6,8 +6,11 @@ use App\Helpers\StorageHelper;
 use App\Http\Requests\UploadFileRequest;
 use App\Models\Actionlog;
 use App\Models\AssetModel;
-use Illuminate\Support\Facades\Response;
+use Illuminate\Http\RedirectResponse;
+use Illuminate\Http\Response;
 use Illuminate\Support\Facades\Storage;
+use \Symfony\Component\HttpFoundation\StreamedResponse;
+use Symfony\Component\HttpFoundation\BinaryFileResponse;
 
 class AssetModelsFilesController extends Controller
 {
@@ -21,7 +24,7 @@ class AssetModelsFilesController extends Controller
      *@since [v1.0]
      * @author [A. Gianotto] [<snipe@snipe.net>]
      */
-    public function store(UploadFileRequest $request, $modelId = null)
+    public function store(UploadFileRequest $request, $modelId = null) : RedirectResponse
     {
         if (! $model = AssetModel::find($modelId)) {
             return redirect()->route('models.index')->with('error', trans('admin/hardware/message.does_not_exist'));
@@ -41,10 +44,10 @@ class AssetModelsFilesController extends Controller
                 $model->logUpload($file_name, $request->get('notes'));
             }
 
-            return redirect()->back()->with('success', trans('general.file_upload_success'));
+            return redirect()->back()->withFragment('files')->with('success', trans('general.file_upload_success'));
         }
 
-        return redirect()->back()->with('error', trans('admin/hardware/message.upload.nofiles'));
+        return redirect()->back()->withFragment('files')->with('error', trans('admin/hardware/message.upload.nofiles'));
     }
 
     /**
@@ -54,14 +57,10 @@ class AssetModelsFilesController extends Controller
      * @param  int $modelId
      * @param  int $fileId
      * @since [v1.0]
-     * @return View
-     * @throws \Illuminate\Auth\Access\AuthorizationException
      */
-    public function show($modelId = null, $fileId = null)
+    public function show(AssetModel $model, $fileId = null) : StreamedResponse | Response | RedirectResponse | BinaryFileResponse
     {
-        $model = AssetModel::find($modelId);
-        // the asset is valid
-        if (isset($model->id)) {
+
             $this->authorize('view', $model);
 
             if (! $log = Actionlog::find($fileId)) {
@@ -86,12 +85,6 @@ class AssetModelsFilesController extends Controller
             }
 
             return StorageHelper::downloader($file);
-        }
-        // Prepare the error message
-        $error = trans('admin/hardware/message.does_not_exist', ['id' => $fileId]);
-
-        // Redirect to the hardware management page
-        return redirect()->route('hardware.index')->with('error', $error);
     }
 
     /**
@@ -101,33 +94,22 @@ class AssetModelsFilesController extends Controller
      * @param  int $modelId
      * @param  int $fileId
      * @since [v1.0]
-     * @return View
-     * @throws \Illuminate\Auth\Access\AuthorizationException
      */
-    public function destroy($modelId = null, $fileId = null)
+    public function destroy(AssetModel $model, $fileId = null) : RedirectResponse
     {
-        $model = AssetModel::find($modelId);
-        $this->authorize('update', $model);
         $rel_path = 'private_uploads/assetmodels';
-
-        // the asset is valid
-        if (isset($model->id)) {
-            $this->authorize('update', $model);
-            $log = Actionlog::find($fileId);
-            if ($log) {
-                if (Storage::exists($rel_path.'/'.$log->filename)) {
-                    Storage::delete($rel_path.'/'.$log->filename);
-                }
-                $log->delete();
-
-                return redirect()->back()->with('success', trans('admin/hardware/message.deletefile.success'));
+        $this->authorize('update', $model);
+        $log = Actionlog::find($fileId);
+        if ($log) {
+            if (Storage::exists($rel_path.'/'.$log->filename)) {
+                Storage::delete($rel_path.'/'.$log->filename);
             }
+            $log->delete();
 
-            return redirect()->back()
-                ->with('success', trans('admin/hardware/message.deletefile.success'));
+            return redirect()->back()->withFragment('files')->with('success', trans('admin/hardware/message.deletefile.success'));
         }
 
-        // Redirect to the hardware management page
-        return redirect()->route('hardware.index')->with('error', trans('admin/hardware/message.does_not_exist'));
+        return redirect()->back()->withFragment('files')->with('success', trans('admin/hardware/message.deletefile.success'));
+
     }
 }
diff --git a/app/Http/Controllers/Assets/AssetCheckinController.php b/app/Http/Controllers/Assets/AssetCheckinController.php
index 73f4838a6a..3e1b75a4d7 100644
--- a/app/Http/Controllers/Assets/AssetCheckinController.php
+++ b/app/Http/Controllers/Assets/AssetCheckinController.php
@@ -11,10 +11,10 @@ use App\Models\Asset;
 use App\Models\CheckoutAcceptance;
 use App\Models\LicenseSeat;
 use Illuminate\Database\Eloquent\Builder;
-use Illuminate\Support\Facades\Auth;
-use Illuminate\Support\Facades\Session;
-use Illuminate\Support\Facades\View;
 use Illuminate\Support\Facades\Log;
+use \Illuminate\Contracts\View\View;
+use \Illuminate\Http\RedirectResponse;
+use Illuminate\Support\Facades\Validator;
 
 class AssetCheckinController extends Controller
 {
@@ -26,22 +26,14 @@ class AssetCheckinController extends Controller
      * @author [A. Gianotto] [<snipe@snipe.net>]
      * @param int $assetId
      * @param string $backto
-     * @return View
-     * @throws \Illuminate\Auth\Access\AuthorizationException
      * @since [v1.0]
      */
-    public function create($assetId, $backto = null)
+    public function create(Asset $asset, $backto = null) : View | RedirectResponse
     {
-        // Check if the asset exists
-        if (is_null($asset = Asset::find($assetId))) {
-            // Redirect to the asset management page with error
-            return redirect()->route('hardware.index')->with('error', trans('admin/hardware/message.does_not_exist'));
-        }
 
         $this->authorize('checkin', $asset);
 
         // This asset is already checked in, redirect
-        
         if (is_null($asset->assignedTo)) {
             return redirect()->route('hardware.index')->with('error', trans('admin/hardware/message.checkin.already_checked_in'));
         }
@@ -50,7 +42,23 @@ class AssetCheckinController extends Controller
             return redirect()->route('hardware.show', $asset->id)->with('error', trans('admin/hardware/general.model_invalid_fix'));
         }
 
-        return view('hardware/checkin', compact('asset'))->with('statusLabel_list', Helper::statusLabelList())->with('backto', $backto)->with('table_name', 'Assets');
+        // Invoke the validation to see if the audit will complete successfully
+        $asset->setRules($asset->getRules() + $asset->customFieldValidationRules());
+
+        if ($asset->isInvalid()) {
+            return redirect()->route('hardware.edit', $asset)->withErrors($asset->getErrors());
+        }
+
+        $target_option = match ($asset->assigned_type) {
+            'App\Models\Asset' => trans('admin/hardware/form.redirect_to_type', ['type' => trans('general.asset_previous')]),
+            'App\Models\Location' => trans('admin/hardware/form.redirect_to_type', ['type' => trans('general.location')]),
+            default => trans('admin/hardware/form.redirect_to_type', ['type' => trans('general.user')]),
+        };
+        return view('hardware/checkin', compact('asset', 'target_option'))
+            ->with('item', $asset)
+            ->with('statusLabel_list', Helper::statusLabelList())
+            ->with('backto', $backto)
+            ->with('table_name', 'Assets');
     }
 
     /**
@@ -60,11 +68,9 @@ class AssetCheckinController extends Controller
      * @param AssetCheckinRequest $request
      * @param int $assetId
      * @param null $backto
-     * @return \Illuminate\Http\RedirectResponse
-     * @throws \Illuminate\Auth\Access\AuthorizationException
      * @since [v1.0]
      */
-    public function store(AssetCheckinRequest $request, $assetId = null, $backto = null)
+    public function store(AssetCheckinRequest $request, $assetId = null, $backto = null) : RedirectResponse
     {
         // Check if the asset exists
         if (is_null($asset = Asset::find($assetId))) {
@@ -82,13 +88,14 @@ class AssetCheckinController extends Controller
 
         $this->authorize('checkin', $asset);
 
-        if ($asset->assignedType() == Asset::USER) {
-            $user = $asset->assignedTo;
-        }
+        session()->put('checkedInFrom', $asset->assignedTo->id);
+        session()->put('checkout_to_type', match ($asset->assigned_type) {
+            'App\Models\User' => 'user',
+            'App\Models\Location' => 'location',
+            'App\Models\Asset' => 'asset',
+        });
 
         $asset->expected_checkin = null;
-        //$asset->last_checkout = null;
-        $asset->last_checkin = now();
         $asset->assignedTo()->disassociate($asset);
         $asset->accepted = null;
         $asset->name = $request->get('name');
@@ -97,6 +104,9 @@ class AssetCheckinController extends Controller
             $asset->status_id = e($request->get('status_id'));
         }
 
+        // Add any custom fields that should be included in the checkout
+        $asset->customFieldsForCheckinCheckout('display_checkin');
+
         $this->migrateLegacyLocations($asset);
 
         $asset->location_id = $asset->rtd_location_id;
@@ -112,11 +122,14 @@ class AssetCheckinController extends Controller
 
         $originalValues = $asset->getRawOriginal();
 
+        // Handle last checkin date
         $checkin_at = date('Y-m-d H:i:s');
         if (($request->filled('checkin_at')) && ($request->get('checkin_at') != date('Y-m-d'))) {
             $originalValues['action_date'] = $checkin_at;
             $checkin_at = $request->get('checkin_at');
+
         }
+        $asset->last_checkin = $checkin_at;
 
         $asset->licenseseats->each(function (LicenseSeat $seat) {
             $seat->update(['assigned_to' => null]);
@@ -132,12 +145,15 @@ class AssetCheckinController extends Controller
             $acceptance->delete();
         });
 
-        Session::put('redirect_option', $request->get('redirect_option'));
-        // Was the asset updated?
+        session()->put('redirect_option', $request->get('redirect_option'));
+
+        // Add any custom fields that should be included in the checkout
+        $asset->customFieldsForCheckinCheckout('display_checkin');
+
         if ($asset->save()) {
 
-            event(new CheckoutableCheckedIn($asset, $target, Auth::user(), $request->input('note'), $checkin_at, $originalValues));
-            return Helper::getRedirectOption($asset, $assetId, 'Assets');
+            event(new CheckoutableCheckedIn($asset, $target, auth()->user(), $request->input('note'), $checkin_at, $originalValues));
+            return redirect()->to(Helper::getRedirectOption($request, $asset->id, 'Assets'))->with('success', trans('admin/hardware/message.checkin.success'));
         }
         // Redirect to the asset management page with error
         return redirect()->route('hardware.index')->with('error', trans('admin/hardware/message.checkin.error').$asset->getErrors());
diff --git a/app/Http/Controllers/Assets/AssetCheckoutController.php b/app/Http/Controllers/Assets/AssetCheckoutController.php
index 36f00f0fc6..da2c0a2550 100644
--- a/app/Http/Controllers/Assets/AssetCheckoutController.php
+++ b/app/Http/Controllers/Assets/AssetCheckoutController.php
@@ -9,8 +9,10 @@ use App\Http\Controllers\Controller;
 use App\Http\Requests\AssetCheckoutRequest;
 use App\Models\Asset;
 use Illuminate\Database\Eloquent\ModelNotFoundException;
-use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\Session;
+use \Illuminate\Contracts\View\View;
+use \Illuminate\Http\RedirectResponse;
+use Illuminate\Support\Facades\Validator;
 
 class AssetCheckoutController extends Controller
 {
@@ -23,29 +25,35 @@ class AssetCheckoutController extends Controller
      * @author [A. Gianotto] [<snipe@snipe.net>]
      * @param int $assetId
      * @since [v1.0]
-     * @return View
+     * @return \Illuminate\Contracts\View\View
      */
-    public function create($assetId)
+    public function create(Asset $asset) : View | RedirectResponse
     {
-        // Check if the asset exists
-        if (is_null($asset = Asset::with('company')->find(e($assetId)))) {
-            return redirect()->route('hardware.index')->with('error', trans('admin/hardware/message.does_not_exist'));
-        }
 
         $this->authorize('checkout', $asset);
 
         if (!$asset->model) {
-            return redirect()->route('hardware.show', $asset->id)->with('error', trans('admin/hardware/general.model_invalid_fix'));
+            return redirect()->route('hardware.show', $asset)
+                ->with('error', trans('admin/hardware/general.model_invalid_fix'));
         }
 
+        // Invoke the validation to see if the audit will complete successfully
+        $asset->setRules($asset->getRules() + $asset->customFieldValidationRules());
+
+        if ($asset->isInvalid()) {
+            return redirect()->route('hardware.edit', $asset)->withErrors($asset->getErrors());
+        }
+
+        
         if ($asset->availableForCheckout()) {
             return view('hardware/checkout', compact('asset'))
                 ->with('statusLabel_list', Helper::deployableStatusLabelList())
-                ->with('table_name', 'Assets');
+                ->with('table_name', 'Assets')
+                ->with('item', $asset);
         }
 
-
-        return redirect()->route('hardware.index')->with('error', trans('admin/hardware/message.checkout.not_available'));
+        return redirect()->route('hardware.index')
+            ->with('error', trans('admin/hardware/message.checkout.not_available'));
     }
 
     /**
@@ -53,11 +61,9 @@ class AssetCheckoutController extends Controller
      *
      * @author [A. Gianotto] [<snipe@snipe.net>]
      * @param AssetCheckoutRequest $request
-     * @param int $assetId
-     * @return \Illuminate\Http\RedirectResponse
      * @since [v1.0]
      */
-    public function store(AssetCheckoutRequest $request, $assetId)
+    public function store(AssetCheckoutRequest $request, $assetId) : RedirectResponse
     {
         try {
             // Check if the asset exists
@@ -69,10 +75,10 @@ class AssetCheckoutController extends Controller
             $this->authorize('checkout', $asset);
 
             if (!$asset->model) {
-                return redirect()->route('hardware.show', $asset->id)->with('error', trans('admin/hardware/general.model_invalid_fix'));
+                return redirect()->route('hardware.show', $asset)->with('error', trans('admin/hardware/general.model_invalid_fix'));
             }
 
-            $admin = Auth::user();
+            $admin = auth()->user();
 
             $target = $this->determineCheckoutTarget();
 
@@ -92,6 +98,7 @@ class AssetCheckoutController extends Controller
                 $asset->status_id = $request->get('status_id');
             }
 
+
             if(!empty($asset->licenseseats->all())){
                 if(request('checkout_to_type') == 'user') {
                     foreach ($asset->licenseseats as $seat){
@@ -101,22 +108,26 @@ class AssetCheckoutController extends Controller
                 }
             }
 
+            // Add any custom fields that should be included in the checkout
+            $asset->customFieldsForCheckinCheckout('display_checkout');
+
             $settings = \App\Models\Setting::getSettings();
 
             // We have to check whether $target->company_id is null here since locations don't have a company yet
             if (($settings->full_multiple_companies_support) && ((!is_null($target->company_id)) &&  (!is_null($asset->company_id)))) {
                 if ($target->company_id != $asset->company_id){
-                    return redirect()->to("hardware/$assetId/checkout")->with('error', trans('general.error_user_company'));
+                    return redirect()->route('hardware.checkout.create', $asset)->with('error', trans('general.error_user_company'));
                 }
             }
 
-                Session::put(['redirect_option' => $request->get('redirect_option'), 'checkout_to_type' => $request->get('checkout_to_type')]);
+            session()->put(['redirect_option' => $request->get('redirect_option'), 'checkout_to_type' => $request->get('checkout_to_type')]);
 
             if ($asset->checkOut($target, $admin, $checkout_at, $expected_checkin, $request->get('note'), $request->get('name'))) {
-                return Helper::getRedirectOption($request, $assetId, 'Assets');
+                return redirect()->to(Helper::getRedirectOption($request, $asset->id, 'Assets'))
+                    ->with('success', trans('admin/hardware/message.checkout.success'));
             }
             // Redirect to the asset management page with error
-            return redirect()->to("hardware/$assetId/checkout")->with('error', trans('admin/hardware/message.checkout.error').$asset->getErrors());
+            return redirect()->route("hardware.checkout.create", $asset)->with('error', trans('admin/hardware/message.checkout.error').$asset->getErrors());
         } catch (ModelNotFoundException $e) {
             return redirect()->back()->with('error', trans('admin/hardware/message.checkout.error'))->withErrors($asset->getErrors());
         } catch (CheckoutNotAllowed $e) {
diff --git a/app/Http/Controllers/Assets/AssetFilesController.php b/app/Http/Controllers/Assets/AssetFilesController.php
index 01ff0288ef..cf119edddc 100644
--- a/app/Http/Controllers/Assets/AssetFilesController.php
+++ b/app/Http/Controllers/Assets/AssetFilesController.php
@@ -7,8 +7,12 @@ use App\Http\Controllers\Controller;
 use App\Http\Requests\UploadFileRequest;
 use App\Models\Actionlog;
 use App\Models\Asset;
-use Illuminate\Support\Facades\Response;
+use \Illuminate\Http\Response;
 use Illuminate\Support\Facades\Storage;
+use \Illuminate\Contracts\View\View;
+use \Illuminate\Http\RedirectResponse;
+use Symfony\Component\HttpFoundation\StreamedResponse;
+use Symfony\Component\HttpFoundation\BinaryFileResponse;
 
 class AssetFilesController extends Controller
 {
@@ -22,11 +26,8 @@ class AssetFilesController extends Controller
      *@since [v1.0]
      * @author [A. Gianotto] [<snipe@snipe.net>]
      */
-    public function store(UploadFileRequest $request, $assetId = null)
+    public function store(UploadFileRequest $request, Asset $asset) : RedirectResponse
     {
-        if (! $asset = Asset::find($assetId)) {
-            return redirect()->route('hardware.index')->with('error', trans('admin/hardware/message.does_not_exist'));
-        }
 
         $this->authorize('update', $asset);
 
@@ -41,7 +42,7 @@ class AssetFilesController extends Controller
                 $asset->logUpload($file_name, $request->get('notes'));
             }
 
-            return redirect()->back()->with('success', trans('admin/hardware/message.upload.success'));
+            return redirect()->back()->withFragment('files')->with('success', trans('admin/hardware/message.upload.success'));
         }
 
         return redirect()->back()->with('error', trans('admin/hardware/message.upload.nofiles'));
@@ -54,48 +55,30 @@ class AssetFilesController extends Controller
      * @param  int $assetId
      * @param  int $fileId
      * @since [v1.0]
-     * @return View
-     * @throws \Illuminate\Auth\Access\AuthorizationException
      */
-    public function show($assetId = null, $fileId = null)
+    public function show(Asset $asset, $fileId = null) : View | RedirectResponse | Response | StreamedResponse | BinaryFileResponse
     {
-        $asset = Asset::find($assetId);
-        // the asset is valid
-        if (isset($asset->id)) {
-            $this->authorize('view', $asset);
 
-            if (! $log = Actionlog::whereNotNull('filename')->where('item_id', $asset->id)->find($fileId)) {
-                return response('No matching record for that asset/file', 500)
-                    ->header('Content-Type', 'text/plain');
-            }
+        $this->authorize('view', $asset);
 
+        if ($log = Actionlog::whereNotNull('filename')->where('item_id', $asset->id)->find($fileId)) {
             $file = 'private_uploads/assets/'.$log->filename;
 
             if ($log->action_type == 'audit') {
                 $file = 'private_uploads/audits/'.$log->filename;
             }
 
-            if (! Storage::exists($file)) {
-                return response('File '.$file.' not found on server', 404)
-                    ->header('Content-Type', 'text/plain');
+            try {
+                 return StorageHelper::showOrDownloadFile($file, $log->filename);
+            } catch (\Exception $e) {
+                return redirect()->route('hardware.show', $asset)->with('error', trans('general.file_not_found'));
             }
 
-            if (request('inline') == 'true') {
-
-                $headers = [
-                    'Content-Disposition' => 'inline',
-                ];
-
-                return Storage::download($file, $log->filename, $headers);
-            }
-
-            return StorageHelper::downloader($file);
         }
-        // Prepare the error message
-        $error = trans('admin/hardware/message.does_not_exist', ['id' => $fileId]);
 
-        // Redirect to the hardware management page
-        return redirect()->route('hardware.index')->with('error', $error);
+        return redirect()->route('hardware.show', $asset)->with('error', trans('general.log_record_not_found'));
+
+
     }
 
     /**
@@ -105,33 +88,21 @@ class AssetFilesController extends Controller
      * @param  int $assetId
      * @param  int $fileId
      * @since [v1.0]
-     * @return View
-     * @throws \Illuminate\Auth\Access\AuthorizationException
      */
-    public function destroy($assetId = null, $fileId = null)
+    public function destroy(Asset $asset, $fileId = null) : RedirectResponse
     {
-        $asset = Asset::find($assetId);
         $this->authorize('update', $asset);
         $rel_path = 'private_uploads/assets';
 
-        // the asset is valid
-        if (isset($asset->id)) {
-            $this->authorize('update', $asset);
-            $log = Actionlog::find($fileId);
-            if ($log) {
-                if (Storage::exists($rel_path.'/'.$log->filename)) {
-                    Storage::delete($rel_path.'/'.$log->filename);
-                }
-                $log->delete();
-
-                return redirect()->back()->with('success', trans('admin/hardware/message.deletefile.success'));
+        if ($log = Actionlog::find($fileId)) {
+            if (Storage::exists($rel_path.'/'.$log->filename)) {
+                Storage::delete($rel_path.'/'.$log->filename);
             }
-
-            return redirect()->back()
-                ->with('success', trans('admin/hardware/message.deletefile.success'));
+            $log->delete();
+            return redirect()->back()->withFragment('files')->with('success', trans('admin/hardware/message.deletefile.success'));
         }
 
-        // Redirect to the hardware management page
-        return redirect()->route('hardware.index')->with('error', trans('admin/hardware/message.does_not_exist'));
+        return redirect()->route('hardware.show', $asset)->with('error', trans('general.log_record_not_found'));
     }
+
 }
diff --git a/app/Http/Controllers/Assets/AssetsController.php b/app/Http/Controllers/Assets/AssetsController.php
index bf3a3ec3a8..03486ffe82 100755
--- a/app/Http/Controllers/Assets/AssetsController.php
+++ b/app/Http/Controllers/Assets/AssetsController.php
@@ -2,9 +2,11 @@
 
 namespace App\Http\Controllers\Assets;
 
+use App\Events\CheckoutableCheckedIn;
 use App\Helpers\Helper;
 use App\Http\Controllers\Controller;
 use App\Http\Requests\ImageUploadRequest;
+use App\Http\Requests\UpdateAssetRequest;
 use App\Models\Actionlog;
 use App\Http\Requests\UploadFileRequest;
 use Illuminate\Support\Facades\Log;
@@ -16,18 +18,20 @@ use App\Models\Location;
 use App\Models\Setting;
 use App\Models\Statuslabel;
 use App\Models\User;
-use Illuminate\Support\Facades\Auth;
 use App\View\Label;
 use Carbon\Carbon;
 use Illuminate\Support\Facades\DB;
-use Illuminate\Support\Facades\View;
 use Illuminate\Support\Facades\Gate;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Crypt;
 use Illuminate\Support\Facades\Storage;
 use Illuminate\Support\Facades\Validator;
 use League\Csv\Reader;
-use Illuminate\Support\Facades\Redirect;
+use Illuminate\Http\Response;
+use Illuminate\Contracts\View\View;
+use Illuminate\Http\RedirectResponse;
+use Symfony\Component\HttpFoundation\BinaryFileResponse;
+use TypeError;
 
 /**
  * This class controls all actions related to assets for
@@ -55,10 +59,8 @@ class AssetsController extends Controller
      * @see AssetController::getDatatable() method that generates the JSON response
      * @since [v1.0]
      * @param Request $request
-     * @return View
-     * @throws \Illuminate\Auth\Access\AuthorizationException
      */
-    public function index(Request $request)
+    public function index(Request $request) : View
     {
         $this->authorize('index', Asset::class);
         $company = Company::find($request->input('company_id'));
@@ -72,13 +74,12 @@ class AssetsController extends Controller
      * @author [A. Gianotto] [<snipe@snipe.net>]
      * @since [v1.0]
      * @param Request $request
-     * @return View
      * @internal param int $model_id
      */
-    public function create(Request $request)
+    public function create(Request $request) : View
     {
         $this->authorize('create', Asset::class);
-        $view = View::make('hardware/edit')
+        $view = view('hardware/edit')
             ->with('statuslabel_list', Helper::statusLabelList())
             ->with('item', new Asset)
             ->with('statuslabel_types', Helper::statusTypeList());
@@ -96,9 +97,8 @@ class AssetsController extends Controller
      *
      * @author [A. Gianotto] [<snipe@snipe.net>]
      * @since [v1.0]
-     * @return \Illuminate\Http\RedirectResponse
      */
-    public function store(ImageUploadRequest $request)
+    public function store(ImageUploadRequest $request) : RedirectResponse
     {
         $this->authorize(Asset::class);
 
@@ -113,8 +113,10 @@ class AssetsController extends Controller
 
         $settings = Setting::getSettings();
 
-        $success = false;
+        $successes = [];
+        $failures = [];
         $serials = $request->input('serials');
+        $asset = null;
 
         for ($a = 1; $a <= count($asset_tags); $a++) {
             $asset = new Asset();
@@ -134,7 +136,7 @@ class AssetsController extends Controller
             $asset->model_id                = $request->input('model_id');
             $asset->order_number            = $request->input('order_number');
             $asset->notes                   = $request->input('notes');
-            $asset->user_id                 = Auth::id();
+            $asset->created_by              = auth()->id();
             $asset->status_id               = request('status_id');
             $asset->warranty_months         = request('warranty_months', null);
             $asset->purchase_cost           = request('purchase_cost');
@@ -147,7 +149,7 @@ class AssetsController extends Controller
             $asset->byod                    = request('byod', 0);
 
             if (! empty($settings->audit_interval)) {
-                $asset->next_audit_date = Carbon::now()->addMonths($settings->audit_interval)->toDateString();
+                $asset->next_audit_date = Carbon::now()->addMonths((int) $settings->audit_interval)->toDateString();
             }
 
             // Set location_id to rtd_location_id ONLY if the asset isn't being checked out
@@ -167,7 +169,7 @@ class AssetsController extends Controller
             if (($model) && ($model->fieldset)) {
                 foreach ($model->fieldset->fields as $field) {
                     if ($field->field_encrypted == '1') {
-                        if (Gate::allows('admin')) {
+                        if (Gate::allows('assets.view.encrypted_custom_fields')) {
                             if (is_array($request->input($field->db_column))) {
                                 $asset->{$field->db_column} = Crypt::encrypt(implode(', ', $request->input($field->db_column)));
                             } else {
@@ -186,61 +188,85 @@ class AssetsController extends Controller
 
             // Validate the asset before saving
             if ($asset->isValid() && $asset->save()) {
-                if (request('assigned_user')) {
-                    $target = User::find(request('assigned_user'));
+                $target = null;
+                $location = null;
+
+                if ($userId = request('assigned_user')) {
+                    $target = User::find($userId);
+
+                    if (!$target) {
+                        return redirect()->back()->withInput()->with('error', trans('admin/hardware/message.create.target_not_found.user'));
+                    }
                     $location = $target->location_id;
-                } elseif (request('assigned_asset')) {
-                    $target = Asset::find(request('assigned_asset'));
+
+                } elseif ($assetId = request('assigned_asset')) {
+                    $target = Asset::find($assetId);
+
+                    if (!$target) {
+                        return redirect()->back()->withInput()->with('error', trans('admin/hardware/message.create.target_not_found.asset'));
+                    }
                     $location = $target->location_id;
-                } elseif (request('assigned_location')) {
-                    $target = Location::find(request('assigned_location'));
+
+                } elseif ($locationId = request('assigned_location')) {
+                    $target = Location::find($locationId);
+
+                    if (!$target) {
+                        return redirect()->back()->withInput()->with('error', trans('admin/hardware/message.create.target_not_found.location'));
+                    }
                     $location = $target->id;
                 }
 
                 if (isset($target)) {
-                    $asset->checkOut($target, Auth::user(), date('Y-m-d H:i:s'), $request->input('expected_checkin', null), 'Checked out on asset creation', $request->get('name'), $location);
+                    $asset->checkOut($target, auth()->user(), date('Y-m-d H:i:s'), $request->input('expected_checkin', null), 'Checked out on asset creation', $request->get('name'), $location);
                 }
 
-                $success = true;
-                
+                $successes[] = "<a href='" . route('hardware.show', $asset) . "' style='color: white;'>" . e($asset->asset_tag) . "</a>";
+
+            } else {
+                $failures[] = join(",", $asset->getErrors()->all());
             }
         }
 
-        if ($success) {
-            Log::debug(e($asset->asset_tag));
-            return redirect()->route('hardware.index')
-                ->with('success-unescaped', trans('admin/hardware/message.create.success_linked', ['link' => route('hardware.show', $asset->id), 'id', 'tag' => e($asset->asset_tag)]));
-               
-      
+        session()->put(['redirect_option' => $request->get('redirect_option'), 'checkout_to_type' => $request->get('checkout_to_type')]);
+
+
+        if ($successes) {
+            if ($failures) {
+                //some succeeded, some failed
+                return redirect()->to(Helper::getRedirectOption($request, $asset->id, 'Assets')) //FIXME - not tested
+                ->with('success-unescaped', trans_choice('admin/hardware/message.create.multi_success_linked', $successes, ['links' => join(", ", $successes)]))
+                    ->with('warning', trans_choice('admin/hardware/message.create.partial_failure', $failures, ['failures' => join("; ", $failures)]));
+            } else {
+                if (count($successes) == 1) {
+                    //the most common case, keeping it so we don't have to make every use of that translation string be trans_choice'ed
+                    //and re-translated
+                    return redirect()->to(Helper::getRedirectOption($request, $asset->id, 'Assets'))
+                        ->with('success-unescaped', trans('admin/hardware/message.create.success_linked', ['link' => route('hardware.show', $asset), 'id', 'tag' => e($asset->asset_tag)]));
+                } else {
+                    //multi-success
+                    return redirect()->to(Helper::getRedirectOption($request, $asset->id, 'Assets'))
+                        ->with('success-unescaped', trans_choice('admin/hardware/message.create.multi_success_linked', $successes, ['links' => join(", ", $successes)]));
+                }
+            }
+
         }
 
         return redirect()->back()->withInput()->withErrors($asset->getErrors());
     }
 
-    public function getOptionCookie(Request $request){
-        $value = $request->cookie('optional_info');
-        echo $value;
-        return $value;
-     }
 
     /**
      * Returns a view that presents a form to edit an existing asset.
      *
      * @author [A. Gianotto] [<snipe@snipe.net>]
-     * @param int $assetId
      * @since [v1.0]
-     * @return View
+     * @return \Illuminate\Contracts\View\View
      */
-    public function edit($assetId = null)
+    public function edit(Asset $asset) : View | RedirectResponse
     {
-        if (! $item = Asset::find($assetId)) {
-            // Redirect to the asset management page with error
-            return redirect()->route('hardware.index')->with('error', trans('admin/hardware/message.does_not_exist'));
-        }
-        //Handles company checks and permissions.
-        $this->authorize($item);
-
-        return view('hardware/edit', compact('item'))
+        $this->authorize($asset);
+        return view('hardware/edit')
+            ->with('item', $asset)
             ->with('statuslabel_list', Helper::statusLabelList())
             ->with('statuslabel_types', Helper::statusTypeList());
     }
@@ -252,17 +278,16 @@ class AssetsController extends Controller
      * @author [A. Gianotto] [<snipe@snipe.net>]
      * @param int $assetId
      * @since [v1.0]
-     * @return View
+     * @return \Illuminate\Contracts\View\View
      */
-    public function show($assetId = null)
+    public function show(Asset $asset) : View | RedirectResponse
     {
-        $asset = Asset::withTrashed()->find($assetId);
         $this->authorize('view', $asset);
         $settings = Setting::getSettings();
 
         if (isset($asset)) {
             $audit_log = Actionlog::where('action_type', '=', 'audit')
-                ->where('item_id', '=', $assetId)
+                ->where('item_id', '=', $asset->id)
                 ->where('item_type', '=', Asset::class)
                 ->orderBy('created_at', 'DESC')->first();
 
@@ -278,7 +303,7 @@ class AssetsController extends Controller
 
             $qr_code = (object) [
                 'display' => $settings->qr_code == '1',
-                'url' => route('qr_code/hardware', $asset->id),
+                'url' => route('qr_code/hardware', $asset),
             ];
 
             return view('hardware/view', compact('asset', 'qr_code', 'settings'))
@@ -292,17 +317,12 @@ class AssetsController extends Controller
      * Validate and process asset edit form.
      *
      * @param int $assetId
-     * @return \Illuminate\Http\RedirectResponse|Redirect
      * @since [v1.0]
      * @author [A. Gianotto] [<snipe@snipe.net>]
      */
-    public function update(ImageUploadRequest $request, $assetId = null)
+    public function update(ImageUploadRequest $request, Asset $asset) : RedirectResponse
     {
-        // Check if the asset exists
-        if (! $asset = Asset::find($assetId)) {
-            // Redirect to the asset management page with error
-            return redirect()->route('hardware.index')->with('error', trans('admin/hardware/message.does_not_exist'));
-        }
+
         $this->authorize($asset);
 
         $asset->status_id = $request->input('status_id', null);
@@ -316,7 +336,7 @@ class AssetsController extends Controller
             $asset->eol_explicit = false;
         } elseif ($request->filled('asset_eol_date')) {
            $asset->asset_eol_date = $request->input('asset_eol_date', null);
-           $months = Carbon::parse($asset->asset_eol_date)->diffInMonths($asset->purchase_date);
+            $months = (int) Carbon::parse($asset->asset_eol_date)->diffInMonths($asset->purchase_date, true);
            if($asset->model->eol) {
                if($months != $asset->model->eol > 0) {
                    $asset->eol_explicit = true;
@@ -332,23 +352,22 @@ class AssetsController extends Controller
         }
         $asset->supplier_id = $request->input('supplier_id', null);
         $asset->expected_checkin = $request->input('expected_checkin', null);
-
-        // If the box isn't checked, it's not in the request at all.
-        $asset->requestable = $request->filled('requestable');
+        $asset->requestable = $request->input('requestable', 0);
         $asset->rtd_location_id = $request->input('rtd_location_id', null);
         $asset->byod = $request->input('byod', 0);
 
-        $status = Statuslabel::find($asset->status_id);
+        $status = Statuslabel::find($request->input('status_id'));
 
-        if($status->archived){
+        // This is an archived or undeployable - we should check the asset back in.
+        // Pending is allowed here
+        if (($status) && (($status->getStatuslabelType() != 'pending') && ($status->getStatuslabelType() != 'deployable')) && ($target = $asset->assignedTo)) {
+            $originalValues = $asset->getRawOriginal();
             $asset->assigned_to = null;
+            $asset->assigned_type = null;
+            $asset->accepted = null;
+            event(new CheckoutableCheckedIn($asset, $target, auth()->user(), 'Checkin on asset update with '.$status->getStatuslabelType().' status', date('Y-m-d H:i:s'), $originalValues));
         }
 
-        if ($asset->assigned_to == '') {
-            $asset->location_id = $request->input('rtd_location_id', null);
-        }
-
-
         if ($request->filled('image_delete')) {
             try {
                 unlink(public_path().'/uploads/assets/'.$asset->image);
@@ -359,46 +378,60 @@ class AssetsController extends Controller
         }
 
         // Update the asset data
-        $asset_tag = $request->input('asset_tags');
+
         $serial = $request->input('serials');
+        $asset->serial = $request->input('serials');
+
+        if (is_array($request->input('serials'))) {
+            $asset->serial = $serial[1];
+        }
+
         $asset->name = $request->input('name');
-        $asset->serial = $serial[1];
         $asset->company_id = Company::getIdForCurrentUser($request->input('company_id'));
         $asset->model_id = $request->input('model_id');
         $asset->order_number = $request->input('order_number');
-        $asset->asset_tag = $asset_tag[1];
+
+        $asset_tags = $request->input('asset_tags');
+        $asset->asset_tag = $request->input('asset_tags');
+
+        if (is_array($request->input('asset_tags'))) {
+            $asset->asset_tag = $asset_tags[1];
+        }
+
         $asset->notes = $request->input('notes');
 
         $asset = $request->handleImages($asset);
 
         // Update custom fields in the database.
-        // Validation for these fields is handlded through the AssetRequest form request
         // FIXME: No idea why this is returning a Builder error on db_column_name.
         // Need to investigate and fix. Using static method for now.
         $model = AssetModel::find($request->get('model_id'));
         if (($model) && ($model->fieldset)) {
             foreach ($model->fieldset->fields as $field) {
-                if ($field->field_encrypted == '1') {
-                    if (Gate::allows('admin')) {
-                        if (is_array($request->input($field->db_column))) {
-                            $asset->{$field->db_column} = Crypt::encrypt(implode(', ', $request->input($field->db_column)));
-                        } else {
-                            $asset->{$field->db_column} = Crypt::encrypt($request->input($field->db_column));
+                if ($request->has($field->db_column)) {
+                    if ($field->field_encrypted == '1') {
+                        if (Gate::allows('assets.view.encrypted_custom_fields')) {
+                            if (is_array($request->input($field->db_column))) {
+                                $asset->{$field->db_column} = Crypt::encrypt(implode(', ', $request->input($field->db_column)));
+                            } else {
+                                $asset->{$field->db_column} = Crypt::encrypt($request->input($field->db_column));
+                            }
                         }
-                    }
-                } else {
-                    if (is_array($request->input($field->db_column))) {
-                        $asset->{$field->db_column} = implode(', ', $request->input($field->db_column));
                     } else {
-                        $asset->{$field->db_column} = $request->input($field->db_column);
+                        if (is_array($request->input($field->db_column))) {
+                            $asset->{$field->db_column} = implode(', ', $request->input($field->db_column));
+                        } else {
+                            $asset->{$field->db_column} = $request->input($field->db_column);
+                        }
                     }
                 }
             }
         }
 
+        session()->put(['redirect_option' => $request->get('redirect_option'), 'checkout_to_type' => $request->get('checkout_to_type')]);
 
         if ($asset->save()) {
-            return redirect()->route('hardware.show', $assetId)
+            return redirect()->to(Helper::getRedirectOption($request, $asset->id, 'Assets'))
                 ->with('success', trans('admin/hardware/message.update.success'));
         }
 
@@ -411,9 +444,8 @@ class AssetsController extends Controller
      * @author [A. Gianotto] [<snipe@snipe.net>]
      * @param int $assetId
      * @since [v1.0]
-     * @return \Illuminate\Http\RedirectResponse
      */
-    public function destroy($assetId)
+    public function destroy(Request $request, $assetId) : RedirectResponse
     {
         // Check if the asset exists
         if (is_null($asset = Asset::find($assetId))) {
@@ -423,9 +455,17 @@ class AssetsController extends Controller
 
         $this->authorize('delete', $asset);
 
-        DB::table('assets')
-            ->where('id', $asset->id)
-            ->update(['assigned_to' => null]);
+        if ($asset->assignedTo) {
+
+            $target = $asset->assignedTo;
+            $checkin_at = date('Y-m-d H:i:s');
+            $originalValues = $asset->getRawOriginal();
+            event(new CheckoutableCheckedIn($asset, $target, auth()->user(), 'Checkin on delete', $checkin_at, $originalValues));
+            DB::table('assets')
+                ->where('id', $asset->id)
+                ->update(['assigned_to' => null, 'assigned_type' => null]);
+        }
+
 
         if ($asset->image) {
             try {
@@ -435,6 +475,7 @@ class AssetsController extends Controller
             }
         }
 
+
         $asset->delete();
 
         return redirect()->route('hardware.index')->with('success', trans('admin/hardware/message.delete.success'));
@@ -445,9 +486,8 @@ class AssetsController extends Controller
      *
      * @author [A. Gianotto] [<snipe@snipe.net>]
      * @since [v3.0]
-     * @return \Illuminate\Http\RedirectResponse
      */
-    public function getAssetBySerial(Request $request)
+    public function getAssetBySerial(Request $request) : RedirectResponse
     {
         $topsearch = ($request->get('topsearch')=="true");
 
@@ -465,14 +505,21 @@ class AssetsController extends Controller
      * @since [v3.0]
      * @return \Illuminate\Http\RedirectResponse
      */
-    public function getAssetByTag(Request $request, $tag=null)
+    public function getAssetByTag(Request $request, $tag=null) : RedirectResponse
     {
         $tag = $tag ? $tag : $request->get('assetTag');
         $topsearch = ($request->get('topsearch') == 'true');
 
-        if (! $asset = Asset::where('asset_tag', '=', $tag)->first()) {
-            return redirect()->route('hardware.index')->with('error', trans('admin/hardware/message.does_not_exist'));
+        // Search for an exact and unique asset tag match
+        $assets = Asset::where('asset_tag', '=', $tag);
+
+        // If not a unique result, redirect to the index view
+        if ($assets->count() != 1) {
+            return redirect()->route('hardware.index')
+                ->with('search', $tag)
+                ->with('warning', trans('admin/hardware/message.does_not_exist_var', [ 'asset_tag' => $tag ]));
         }
+        $asset = $assets->first();
         $this->authorize('view', $asset);
 
         return redirect()->route('hardware.show', $asset->id)->with('topsearch', $topsearch);
@@ -485,16 +532,15 @@ class AssetsController extends Controller
      * @author [A. Gianotto] [<snipe@snipe.net>]
      * @param int $assetId
      * @since [v1.0]
-     * @return Response
      */
-    public function getQrCode($assetId = null)
+    public function getQrCode(Asset $asset) : Response | BinaryFileResponse | string | bool
     {
         $settings = Setting::getSettings();
 
-        if ($settings->qr_code == '1') {
-            $asset = Asset::withTrashed()->find($assetId);
+        if ($settings->label2_2d_type !== 'none') {
+
             if ($asset) {
-                $size = Helper::barcodeDimensions($settings->barcode_type);
+                $size = Helper::barcodeDimensions($settings->label2_2d_type);
                 $qr_file = public_path().'/uploads/barcodes/qr-'.str_slug($asset->asset_tag).'-'.str_slug($asset->id).'.png';
 
                 if (isset($asset->id, $asset->asset_tag)) {
@@ -504,7 +550,7 @@ class AssetsController extends Controller
                         return response()->file($qr_file, $header);
                     } else {
                         $barcode = new \Com\Tecnick\Barcode\Barcode();
-                        $barcode_obj = $barcode->getBarcodeObj($settings->barcode_type, route('hardware.show', $asset->id), $size['height'], $size['width'], 'black', [-2, -2, -2, -2]);
+                        $barcode_obj = $barcode->getBarcodeObj($settings->label2_2d_type, route('hardware.show', $asset->id), $size['height'], $size['width'], 'black', [-2, -2, -2, -2]);
                         file_put_contents($qr_file, $barcode_obj->getPngData());
 
                         return response($barcode_obj->getPngData())->header('Content-type', 'image/png');
@@ -514,6 +560,7 @@ class AssetsController extends Controller
 
             return 'That asset is invalid';
         }
+        return false;
     }
 
     /**
@@ -528,7 +575,7 @@ class AssetsController extends Controller
     {
         $settings = Setting::getSettings();
         if ($asset = Asset::withTrashed()->find($assetId)) {
-            $barcode_file = public_path().'/uploads/barcodes/'.str_slug($settings->alt_barcode).'-'.str_slug($asset->asset_tag).'.png';
+            $barcode_file = public_path().'/uploads/barcodes/'.str_slug($settings->label2_1d_type).'-'.str_slug($asset->asset_tag).'.png';
 
             if (isset($asset->id, $asset->asset_tag)) {
                 if (file_exists($barcode_file)) {
@@ -541,11 +588,11 @@ class AssetsController extends Controller
 
                     $barcode = new \Com\Tecnick\Barcode\Barcode();
                     try {
-                        $barcode_obj = $barcode->getBarcodeObj($settings->alt_barcode, $asset->asset_tag, ($barcode_width < 300 ? $barcode_width : 300), 50);
+                        $barcode_obj = $barcode->getBarcodeObj($settings->label2_1d_type, $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) {
+                    } catch (\Exception|TypeError $e) {
                         Log::debug('The barcode format is invalid.');
 
                         return response(file_get_contents(public_path('uploads/barcodes/invalid_barcode.gif')))->header('Content-type', 'image/gif');
@@ -561,7 +608,7 @@ class AssetsController extends Controller
      *
      * @author [L. Swartzendruber] [<logan.swartzendruber@gmail.com>
      * @param int $assetId
-     * @return View
+     * @return \Illuminate\Contracts\View\View
      */
     public function getLabel($assetId = null)
     {
@@ -585,28 +632,22 @@ class AssetsController extends Controller
      * @author [A. Gianotto] [<snipe@snipe.net>]
      * @param int $assetId
      * @since [v1.0]
-     * @return View
+     * @return \Illuminate\Contracts\View\View
      */
-    public function getClone($assetId = null)
+    public function getClone(Asset $asset)
     {
-        // Check if the asset exists
-        if (is_null($asset_to_clone = Asset::find($assetId))) {
-            // Redirect to the asset management page
-            return redirect()->route('hardware.index')->with('error', trans('admin/hardware/message.does_not_exist'));
-        }
-
-        $this->authorize('create', $asset_to_clone);
-
-        $asset = clone $asset_to_clone;
-        $asset->id = null;
-        $asset->asset_tag = '';
-        $asset->serial = '';
-        $asset->assigned_to = '';
+        $this->authorize('create', $asset);
+        $cloned = clone $asset;
+        $cloned->id = null;
+        $cloned->asset_tag = '';
+        $cloned->serial = '';
+        $cloned->assigned_to = '';
+        $cloned->deleted_at = '';
 
         return view('hardware/edit')
             ->with('statuslabel_list', Helper::statusLabelList())
             ->with('statuslabel_types', Helper::statusTypeList())
-            ->with('item', $asset);
+            ->with('item', $cloned);
     }
 
     /**
@@ -614,7 +655,7 @@ class AssetsController extends Controller
      *
      * @author [A. Gianotto] [<snipe@snipe.net>]
      * @since [v1.0]
-     * @return View
+     * @return \Illuminate\Contracts\View\View
      */
     public function getImportHistory()
     {
@@ -636,7 +677,7 @@ class AssetsController extends Controller
      *
      * @author [A. Gianotto] [<snipe@snipe.net>]
      * @since [v3.3]
-     * @return View
+     * @return \Illuminate\Contracts\View\View
      */
     public function postImportHistory(Request $request)
     {
@@ -730,8 +771,8 @@ class AssetsController extends Controller
                         Actionlog::firstOrCreate([
                             'item_id' => $asset->id,
                             'item_type' => Asset::class,
-                            'user_id' =>  Auth::user()->id,
-                            'note' => 'Checkout imported by '.Auth::user()->present()->fullName().' from history importer',
+                            'created_by' =>  auth()->id(),
+                            'note' => 'Checkout imported by '.auth()->user()->present()->fullName().' from history importer',
                             'target_id' => $item[$asset_tag][$batch_counter]['user_id'],
                             'target_type' => User::class,
                             'created_at' =>  $item[$asset_tag][$batch_counter]['checkout_date'],
@@ -758,8 +799,8 @@ class AssetsController extends Controller
                             Actionlog::firstOrCreate([
                                 'item_id' => $item[$asset_tag][$batch_counter]['asset_id'],
                                 'item_type' => Asset::class,
-                                'user_id' => Auth::user()->id,
-                                'note' => 'Checkin imported by '.Auth::user()->present()->fullName().' from history importer',
+                                'created_by' => auth()->id(),
+                                'note' => 'Checkin imported by '.auth()->user()->present()->fullName().' from history importer',
                                 'target_id' => null,
                                 'created_at' => $checkin_date,
                                 'action_type' => 'checkin',
@@ -796,7 +837,7 @@ class AssetsController extends Controller
      * @author [A. Gianotto] [<snipe@snipe.net>]
      * @param int $assetId
      * @since [v1.0]
-     * @return View
+     * @return \Illuminate\Contracts\View\View
      */
     public function getRestore($assetId = null)
     {
@@ -826,8 +867,8 @@ class AssetsController extends Controller
     public function quickScan()
     {
         $this->authorize('audit', Asset::class);
-        $dt = Carbon::now()->addMonths(12)->toDateString();
-
+        $settings = Setting::getSettings();
+        $dt = Carbon::now()->addMonths($settings->audit_interval)->toDateString();
         return view('hardware/quickscan')->with('next_audit_date', $dt);
     }
 
@@ -835,18 +876,9 @@ class AssetsController extends Controller
     {
         $this->authorize('checkin', Asset::class);
 
-        return view('hardware/quickscan-checkin');
+        return view('hardware/quickscan-checkin')->with('statusLabel_list', Helper::statusLabelList());
     }
 
-    public function audit($id)
-    {
-        $settings = Setting::getSettings();
-        $this->authorize('audit', Asset::class);
-        $dt = Carbon::now()->addMonths($settings->audit_interval)->toDateString();
-        $asset = Asset::findOrFail($id);
-
-        return view('hardware/audit')->with('asset', $asset)->with('next_audit_date', $dt)->with('locations_list');
-    }
 
     public function dueForAudit()
     {
@@ -863,22 +895,73 @@ class AssetsController extends Controller
     }
 
 
-    public function auditStore(UploadFileRequest $request, $id)
+    public function audit(Asset $asset): View | RedirectResponse
     {
         $this->authorize('audit', Asset::class);
+        $settings = Setting::getSettings();
 
-        $rules = [
-            'location_id' => 'exists:locations,id|nullable|numeric',
-            'next_audit_date' => 'date|nullable',
-        ];
 
-        $validator = Validator::make($request->all(), $rules);
+        // Invoke the validation to see if the audit will complete successfully
+        $asset->setRules($asset->getRules() + $asset->customFieldValidationRules());
 
-        if ($validator->fails()) {
-            return response()->json(Helper::formatStandardApiResponse('error', null, $validator->errors()->all()));
+        if ($asset->isInvalid()) {
+            return redirect()->route('hardware.edit', $asset)->withErrors($asset->getErrors());
         }
 
-        $asset = Asset::findOrFail($id);
+        $dt = Carbon::now()->addMonths( (int) $settings->audit_interval)->toDateString();
+        return view('hardware/audit')->with('asset', $asset)->with('item', $asset)->with('next_audit_date', $dt)->with('locations_list');
+    }
+
+    public function auditStore(UploadFileRequest $request, Asset $asset)
+    {
+
+        $this->authorize('audit', Asset::class);
+
+        session()->put('redirect_option', $request->get('redirect_option'));
+        session()->put('other_redirect', 'audit');
+
+
+        $originalValues = $asset->getRawOriginal();
+
+        $asset->next_audit_date = $request->input('next_audit_date');
+        $asset->last_audit_date = date('Y-m-d H:i:s');
+
+        // Check to see if they checked the box to update the physical location,
+        // not just note it in the audit notes
+        if ($request->input('update_location') == '1') {
+            $asset->location_id = $request->input('location_id');
+        }
+
+        // Update custom fields in the database
+        if (($asset->model) && ($asset->model->fieldset)) {
+            foreach ($asset->model->fieldset->fields as $field) {
+                if (($field->display_audit=='1') && ($request->has($field->db_column))) {
+                    if ($field->field_encrypted == '1') {
+                        if (Gate::allows('assets.view.encrypted_custom_fields')) {
+                            if (is_array($request->input($field->db_column))) {
+                                $asset->{$field->db_column} = Crypt::encrypt(implode(', ', $request->input($field->db_column)));
+                            } else {
+                                $asset->{$field->db_column} = Crypt::encrypt($request->input($field->db_column));
+                            }
+                        }
+                    } else {
+                        if (is_array($request->input($field->db_column))) {
+                            $asset->{$field->db_column} = implode(', ', $request->input($field->db_column));
+                        } else {
+                            $asset->{$field->db_column} = $request->input($field->db_column);
+                        }
+                    }
+                }
+            }
+        }
+
+        // Invoke the validation to see if the audit will complete successfully
+        $asset->setRules($asset->getRules() + $asset->customFieldValidationRules());
+
+        // Validate the rest of the data before we turn off the event dispatcher
+        if ($asset->isInvalid()) {
+            return redirect()->back()->withInput()->withErrors($asset->getErrors());
+        }
 
         /**
          * Even though we do a save() further down, we don't want to log this as a "normal" asset update,
@@ -894,18 +977,11 @@ class AssetsController extends Controller
          * which manually invokes Watson Validating to make sure the asset's model is valid.
          *
          * @see \App\Observers\AssetObserver::updating()
+         * @see \App\Models\Asset::save()
          */
+
         $asset->unsetEventDispatcher();
 
-        $asset->next_audit_date = $request->input('next_audit_date');
-        $asset->last_audit_date = date('Y-m-d H:i:s');
-
-        // Check to see if they checked the box to update the physical location,
-        // not just note it in the audit notes
-        if ($request->input('update_location') == '1') {
-            $asset->location_id = $request->input('location_id');
-        }
-
 
         /**
          * Invoke Watson Validating to check the asset itself and check to make sure it saved correctly.
@@ -919,8 +995,8 @@ class AssetsController extends Controller
                 $file_name = $request->handleFile('private_uploads/audits/', 'audit-'.$asset->id, $request->file('image'));
             }
 
-            $asset->logAudit($request->input('note'), $request->input('location_id'), $file_name);
-            return redirect()->route('assets.audit.due')->with('success', trans('admin/hardware/message.audit.success'));
+            $asset->logAudit($request->input('note'), $request->input('location_id'), $file_name, $originalValues);
+            return redirect()->to(Helper::getRedirectOption($request, $asset->id, 'Assets'))->with('success', trans('admin/hardware/message.audit.success'));
         }
 
         return redirect()->back()->withInput()->withErrors($asset->getErrors());
diff --git a/app/Http/Controllers/Assets/BulkAssetsController.php b/app/Http/Controllers/Assets/BulkAssetsController.php
index ffbf81944b..5ef1539392 100644
--- a/app/Http/Controllers/Assets/BulkAssetsController.php
+++ b/app/Http/Controllers/Assets/BulkAssetsController.php
@@ -2,7 +2,6 @@
 
 namespace App\Http\Controllers\Assets;
 
-use App\Models\Actionlog;
 use App\Helpers\Helper;
 use App\Http\Controllers\CheckInOutRequest;
 use App\Http\Controllers\Controller;
@@ -11,15 +10,17 @@ use App\Models\AssetModel;
 use App\Models\Statuslabel;
 use App\Models\Setting;
 use App\View\Label;
+use Carbon\Carbon;
 use Illuminate\Http\Request;
-use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\Crypt;
 use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\Gate;
 use Illuminate\Support\Facades\Log;
-use Illuminate\Support\Facades\Session;
 use App\Http\Requests\AssetCheckoutRequest;
 use App\Models\CustomField;
+use Illuminate\Contracts\View\View;
+use Illuminate\Http\RedirectResponse;
+use Illuminate\Database\Eloquent\ModelNotFoundException;
 
 class BulkAssetsController extends Controller
 {
@@ -36,12 +37,10 @@ class BulkAssetsController extends Controller
      * action would make a lot more sense here and make things a lot more clear.
      *
      * @author [A. Gianotto] [<snipe@snipe.net>]
-     * @return View
      * @internal param int $assetId
      * @since [v2.0]
-     * @throws \Illuminate\Auth\Access\AuthorizationException
      */
-    public function edit(Request $request)
+    public function edit(Request $request) : View | RedirectResponse
     {
         $this->authorize('view', Asset::class);
 
@@ -54,6 +53,25 @@ class BulkAssetsController extends Controller
 
         $asset_ids = $request->input('ids');
 
+        if ($request->input('bulk_actions') === 'checkout') {
+            $status_check =$this->hasUndeployableStatus($asset_ids);
+            if($status_check && $status_check['status'] === true){
+
+                $asset_tags = implode(', ', array_column($status_check['tags'], 'asset_tag'));
+                $asset_ids = $status_check['asset_ids'];
+
+                session()->flash('warning', trans('admin/hardware/message.undeployable', ['asset_tags' => $asset_tags]));
+            }
+
+            $request->session()->flashInput(['selected_assets' => $asset_ids]);
+            return redirect()->route('hardware.bulkcheckout.show');
+        }
+
+        if ($request->input('bulk_actions') === 'maintenance') {
+            $request->session()->flashInput(['selected_assets' => $asset_ids]);
+            return redirect()->route('maintenances.create');
+        }
+
         // Figure out where we need to send the user after the update is complete, and store that in the session
         $bulk_back_url = request()->headers->get('referer');
         session(['bulk_back_url' => $bulk_back_url]);
@@ -94,7 +112,9 @@ class BulkAssetsController extends Controller
         // This handles all of the pivot sorting below (versus the assets.* fields in the allowed_columns array)
         $column_sort = in_array($sort_override, $allowed_columns) ? $sort_override : 'assets.id';
 
-        $assets = Asset::with('assignedTo', 'location', 'model')->whereIn('assets.id', $asset_ids);
+        $assets = Asset::with('assignedTo', 'location', 'model')
+                ->whereIn('assets.id', $asset_ids)
+                ->withTrashed();
 
         $assets = $assets->get();
 
@@ -194,7 +214,7 @@ class BulkAssetsController extends Controller
      * @internal param array $assets
      * @since [v2.0]
      */
-    public function update(Request $request)
+    public function update(Request $request) : RedirectResponse
     {
         $this->authorize('update', Asset::class);
         $has_errors = 0;
@@ -209,6 +229,21 @@ class BulkAssetsController extends Controller
 
        $custom_field_columns = CustomField::all()->pluck('db_column')->toArray();
 
+        // find custom field input attributes that start with 'null_'
+        $null_custom_fields_inputs = array_filter($request->all(), function ($key) {
+            // filter out all keys that start with 'null_'
+            return (strpos($key, 'null_') === 0);
+        }, ARRAY_FILTER_USE_KEY);;
+        // remove 'null' from the keys
+        $custom_fields_to_null = [];
+        foreach ($null_custom_fields_inputs as $key => $value) {
+            $custom_fields_to_null[str_replace('null', '', $key)] = $value;
+        }
+
+
+
+
+
      
         if (! $request->filled('ids') || count($request->input('ids')) == 0) {
             return redirect($bulk_back_url)->with('error', trans('admin/hardware/message.update.no_assets_selected'));
@@ -227,7 +262,8 @@ class BulkAssetsController extends Controller
          * its checkout status.
          */
 
-        if (($request->filled('purchase_date'))
+        if (($request->filled('name'))
+            || ($request->filled('purchase_date'))
             || ($request->filled('expected_checkin'))
             || ($request->filled('purchase_cost'))
             || ($request->filled('supplier_id'))
@@ -239,10 +275,14 @@ class BulkAssetsController extends Controller
             || ($request->filled('status_id'))
             || ($request->filled('model_id'))
             || ($request->filled('next_audit_date'))
+            || ($request->filled('asset_eol_date'))
+            || ($request->filled('null_name'))
             || ($request->filled('null_purchase_date'))
             || ($request->filled('null_expected_checkin_date'))
             || ($request->filled('null_next_audit_date'))
+            || ($request->filled('null_asset_eol_date'))
             || ($request->anyFilled($custom_field_columns))
+            || ($request->anyFilled(array_keys($null_custom_fields_inputs)))
 
         ) {
             // Let's loop through those assets and build an update array
@@ -251,28 +291,58 @@ class BulkAssetsController extends Controller
                 $this->update_array = [];
 
                 /**
-                 * Leave out model_id and status here because we do math on that later. We have to do some extra
-                 * validation and checks on those two.
+                 * Leave out model_id and status here because we do math on that later. We have to do some
+                 * extra validation and checks on those two.
                  *
                  * It's tempting to make these match the request check above, but some of these values require
                  * extra work to make sure the data makes sense.
                  */
-                $this->conditionallyAddItem('purchase_date')
+                $this->conditionallyAddItem('name')
+                    ->conditionallyAddItem('purchase_date')
                     ->conditionallyAddItem('expected_checkin')
                     ->conditionallyAddItem('order_number')
                     ->conditionallyAddItem('requestable')
                     ->conditionallyAddItem('supplier_id')
                     ->conditionallyAddItem('warranty_months')
-                    ->conditionallyAddItem('next_audit_date');
+                    ->conditionallyAddItem('next_audit_date')
+                    ->conditionallyAddItem('asset_eol_date');
                     foreach ($custom_field_columns as $key => $custom_field_column) {
                         $this->conditionallyAddItem($custom_field_column); 
                    }
+                foreach ($custom_fields_to_null as $key => $custom_field_to_null) {
+                    $this->conditionallyAddItem($key);
+                }
 
+                if (!($asset->eol_explicit)) {
+					if ($request->filled('model_id')) {
+						$model = AssetModel::find($request->input('model_id'));
+						if ($model->eol > 0) {
+							if ($request->filled('purchase_date')) {
+								$this->update_array['asset_eol_date'] = Carbon::parse($request->input('purchase_date'))->addMonths($model->eol)->format('Y-m-d');
+							} else {
+								$this->update_array['asset_eol_date'] = Carbon::parse($asset->purchase_date)->addMonths($model->eol)->format('Y-m-d');
+							}
+						} else {
+							$this->update_array['asset_eol_date'] = null;
+						}
+					} elseif (($request->filled('purchase_date')) && ($asset->model->eol > 0)) {
+						$this->update_array['asset_eol_date'] = Carbon::parse($request->input('purchase_date'))->addMonths($asset->model->eol)->format('Y-m-d');
+					}
+				}                
+                
                 /**
                  * Blank out fields that were requested to be blanked out via checkbox
                  */
+                if ($request->input('null_name')=='1') {
+
+                    $this->update_array['name'] = null;
+                }
+
                 if ($request->input('null_purchase_date')=='1') {
                     $this->update_array['purchase_date'] = null;
+                    if (!($asset->eol_explicit)) {
+						$this->update_array['asset_eol_date'] = null;
+					}
                 }
 
                 if ($request->input('null_expected_checkin_date')=='1') {
@@ -283,6 +353,17 @@ class BulkAssetsController extends Controller
                     $this->update_array['next_audit_date'] = null;
                 }
 
+                if ($request->input('null_asset_eol_date')=='1') {
+                    $this->update_array['asset_eol_date'] = null;
+
+                    // If they are nulling the EOL date to allow it to calculate, set eol explicit to 0
+                    if ($request->input('calc_eol')=='1') {
+                        $this->update_array['eol_explicit'] = 0;
+                    }
+                }
+
+
+
                 if ($request->filled('purchase_cost')) {
                     $this->update_array['purchase_cost'] =  $request->input('purchase_cost');
                 }
@@ -311,16 +392,22 @@ class BulkAssetsController extends Controller
                  * to someone/something.
                  */
                 if ($request->filled('status_id')) {
-                    $updated_status = Statuslabel::find($request->input('status_id'));
+                    try {
+                        $updated_status = Statuslabel::findOrFail($request->input('status_id'));
+                    } catch (ModelNotFoundException $e) {
+                        return redirect($bulk_back_url)->with('error', trans('admin/statuslabels/message.does_not_exist'));
+                    }
 
                     // We cannot assign a non-deployable status type if the asset is already assigned.
                     // This could probably be added to a form request.
                     // If the asset isn't assigned, we don't care what the status is.
                     // Otherwise we need to make sure the status type is still a deployable one.
-                    if (
-                        ($asset->assigned_to == '')
-                        || ($updated_status->deployable == '1') && ($asset->assetstatus->deployable == '1')
-                    ) {
+
+                    $unassigned = $asset->assigned_to == '';
+                    $deployable = $updated_status->deployable == '1' && $asset->assetstatus?->deployable == '1';
+                    $pending =  $updated_status->pending === 1;
+
+                    if ($unassigned || $deployable || $pending) {
                         $this->update_array['status_id'] = $updated_status->id;
                     }
 
@@ -372,6 +459,7 @@ class BulkAssetsController extends Controller
                 }
 
                 /**
+                 *
                  * Start all the custom fields shenanigans
                  */
 
@@ -379,6 +467,15 @@ class BulkAssetsController extends Controller
                 if ($asset->model->fieldset) {
                     foreach ($asset->model->fieldset->fields as $field) {
 
+                        // null custom fields
+                        if ($custom_fields_to_null) {
+                            foreach ($custom_fields_to_null as $key => $custom_field_to_null) {
+                                if ($field->db_column == $key) {
+                                    $this->update_array[$field->db_column] = null;
+                                }
+                            }
+                        }
+
                         if ((array_key_exists($field->db_column, $this->update_array)) && ($field->field_encrypted == '1')) {
                             if (Gate::allows('admin')) {
                                 $decrypted_old = Helper::gracefulDecrypt($field, $asset->{$field->db_column});
@@ -455,9 +552,8 @@ class BulkAssetsController extends Controller
     /**
      * Adds parameter to update array for an item if it exists in request
      * @param  string $field field name
-     * @return BulkAssetsController Model for Chaining
      */
-    protected function conditionallyAddItem($field)
+    protected function conditionallyAddItem($field) : BulkAssetsController
     {
         if (request()->filled($field)) {
             $this->update_array[$field] = request()->input($field);
@@ -471,61 +567,62 @@ class BulkAssetsController extends Controller
      *
      * @author [A. Gianotto] [<snipe@snipe.net>]
      * @param Request $request
-     * @return View
-     * @throws \Illuminate\Auth\Access\AuthorizationException
      * @internal param array $assets
      * @since [v2.0]
      */
-    public function destroy(Request $request)
+    public function destroy(Request $request) : RedirectResponse
     {
         $this->authorize('delete', Asset::class);
 
         $bulk_back_url = route('hardware.index');
+
         if ($request->session()->has('bulk_back_url')) {
             $bulk_back_url = $request->session()->pull('bulk_back_url');
         }
+        $assetIds = $request->get('ids');
 
-        if ($request->filled('ids')) {
-            $assets = Asset::find($request->get('ids'));
-            foreach ($assets as $asset) {
-                $update_array['deleted_at'] = date('Y-m-d H:i:s');
-                $update_array['assigned_to'] = null;
-
-                DB::table('assets')
-                    ->where('id', $asset->id)
-                    ->update($update_array);
-            } // endforeach
-
-            return redirect($bulk_back_url)->with('success', trans('admin/hardware/message.delete.success'));
-            // no values given, nothing to update
+        if(empty($assetIds)) {
+            return redirect($bulk_back_url)->with('error', trans('admin/hardware/message.delete.nothing_updated'));
         }
 
-        return redirect($bulk_back_url)->with('error', trans('admin/hardware/message.delete.nothing_updated'));
+        $assignedAssets = Asset::whereIn('id', $assetIds)->whereNotNull('assigned_to')->get();
+        if($assignedAssets->isNotEmpty()) {
+
+            //if assets are checked out, return a list of asset tags that would need to be checked in first.
+            $assetTags = $assignedAssets->pluck('asset_tag')->implode(', ');
+            return redirect($bulk_back_url)->with('error', trans_choice('admin/hardware/message.delete.assigned_to_error', $assignedAssets->count(), ['asset_tag' => $assetTags] ));
+        }
+
+        foreach (Asset::wherein('id', $assetIds)->get() as $asset) {
+                $asset->delete();
+            }
+
+        return redirect($bulk_back_url)->with('success', trans('admin/hardware/message.delete.success'));
+            // no values given, nothing to update
+
     }
 
     /**
      * Show Bulk Checkout Page
-     * @return View View to checkout multiple assets
      */
-    public function showCheckout()
+    public function showCheckout() : View
     {
         $this->authorize('checkout', Asset::class);
-        // Filter out assets that are not deployable.
 
-        return view('hardware/bulk-checkout');
+        $do_not_change = ['' => trans('general.do_not_change')];
+        $status_label_list = $do_not_change + Helper::deployableStatusLabelList();
+        return view('hardware/bulk-checkout')->with('statusLabel_list', $status_label_list);
     }
 
     /**
      * Process Multiple Checkout Request
-     * @return View
      */
-    public function storeCheckout(AssetCheckoutRequest $request)
+    public function storeCheckout(AssetCheckoutRequest $request) : RedirectResponse | ModelNotFoundException
     {
-
         $this->authorize('checkout', Asset::class);
 
         try {
-            $admin = Auth::user();
+            $admin = auth()->user();
 
             $target = $this->determineCheckoutTarget();
 
@@ -535,6 +632,8 @@ class BulkAssetsController extends Controller
 
             $asset_ids = array_filter($request->get('selected_assets'));
 
+            $assets = Asset::findOrFail($asset_ids);
+
             if (request('checkout_to_type') == 'asset') {
                 foreach ($asset_ids as $asset_id) {
                     if ($target->id == $asset_id) {
@@ -544,57 +643,87 @@ class BulkAssetsController extends Controller
             }
             $checkout_at = date('Y-m-d H:i:s');
             if (($request->filled('checkout_at')) && ($request->get('checkout_at') != date('Y-m-d'))) {
-                $checkout_at = e($request->get('checkout_at'));
+                $checkout_at = $request->get('checkout_at');
             }
 
             $expected_checkin = '';
 
             if ($request->filled('expected_checkin')) {
-                $expected_checkin = e($request->get('expected_checkin'));
+                $expected_checkin = $request->get('expected_checkin');
             }
 
             $errors = [];
-            DB::transaction(function () use ($target, $admin, $checkout_at, $expected_checkin, $errors, $asset_ids, $request) {
-                foreach ($asset_ids as $asset_id) {
-                    $asset = Asset::findOrFail($asset_id);
+            DB::transaction(function () use ($target, $admin, $checkout_at, $expected_checkin, &$errors, $assets, $request) { //NOTE: $errors is passsed by reference!
+                foreach ($assets as $asset) {
                     $this->authorize('checkout', $asset);
 
-                    $error = $asset->checkOut($target, $admin, $checkout_at, $expected_checkin, e($request->get('note')), $asset->name, null);
-
-                    if ($target->location_id != '') {
-                        $asset->location_id = $target->location_id;
-                        $asset->unsetEventDispatcher();
-                        $asset->save();
+                    // See if there is a status label passed
+                    if ($request->filled('status_id')) {
+                        $asset->status_id = $request->get('status_id');
                     }
 
-                    if ($error) {
-                        array_merge_recursive($errors, $asset->getErrors()->toArray());
+                    $checkout_success = $asset->checkOut($target, $admin, $checkout_at, $expected_checkin, e($request->get('note')), $asset->name, null);
+
+                    //TODO - I think this logic is duplicated in the checkOut method?
+                    if ($target->location_id != '') {
+                        $asset->location_id = $target->location_id;
+                        // TODO - I don't know why this is being saved without events
+                        $asset::withoutEvents(function () use ($asset) {
+                            $asset->save();
+                        });
+                    }
+
+                    if (!$checkout_success) {
+                        $errors = array_merge_recursive($errors, $asset->getErrors()->toArray());
                     }
                 }
             });
 
             if (! $errors) {
                 // Redirect to the new asset page
-                return redirect()->to('hardware')->with('success', trans('admin/hardware/message.checkout.success'));
+                return redirect()->to('hardware')->with('success', trans_choice('admin/hardware/message.multi-checkout.success', $asset_ids));
             }
             // Redirect to the asset management page with error
-            return redirect()->route('hardware.bulkcheckout.show')->with('error', trans('admin/hardware/message.checkout.error'))->withErrors($errors);
+            return redirect()->route('hardware.bulkcheckout.show')->withInput()->with('error', trans_choice('admin/hardware/message.multi-checkout.error', $asset_ids))->withErrors($errors);
         } catch (ModelNotFoundException $e) {
-            return redirect()->route('hardware.bulkcheckout.show')->with('error', $e->getErrors());
+            return redirect()->route('hardware.bulkcheckout.show')->withInput()->with('error', trans_choice('admin/hardware/message.multi-checkout.error', $request->input('selected_assets')));
         }
         
     }
-    public function restore(Request $request) {
+    public function restore(Request $request) : RedirectResponse
+    {
         $this->authorize('update', Asset::class);
-       $assetIds = $request->get('ids');
-      if (empty($assetIds)) {
-          return redirect()->route('hardware.index')->with('error', trans('admin/hardware/message.restore.nothing_updated'));
+        $assetIds = $request->get('ids');
+
+        if (empty($assetIds)) {
+            return redirect()->route('hardware.index')->with('error', trans('admin/hardware/message.restore.nothing_updated'));
         } else {
             foreach ($assetIds as $key => $assetId) {
-                    $asset = Asset::withTrashed()->find($assetId);
-                    $asset->restore(); 
+                $asset = Asset::withTrashed()->find($assetId);
+                $asset->restore();
             } 
-        return redirect()->route('hardware.index')->with('success', trans('admin/hardware/message.restore.success'));
+            return redirect()->route('hardware.index')->with('success', trans('admin/hardware/message.restore.success'));
         }
     }
+    public function hasUndeployableStatus (array $asset_ids)
+    {
+        $undeployable = Asset::whereIn('id', $asset_ids)
+            ->undeployable()
+            ->get();
+
+        $undeployableTags = $undeployable->map(function ($asset) {
+            return [
+                'id' => $asset->id,
+                'asset_tag' => $asset->asset_tag,
+            ];
+        })->toArray();
+
+        $undeployableIds = array_column($undeployableTags, 'id');
+        $filtered_ids = array_diff($asset_ids, $undeployableIds);
+
+         if($undeployable->isNotEmpty()) {
+             return ['status' => true, 'tags' => $undeployableTags, 'asset_ids' => $filtered_ids];
+         }
+        return false;
+    }
 }
diff --git a/app/Http/Controllers/Auth/ForgotPasswordController.php b/app/Http/Controllers/Auth/ForgotPasswordController.php
index a7322e7e59..f385c054c6 100644
--- a/app/Http/Controllers/Auth/ForgotPasswordController.php
+++ b/app/Http/Controllers/Auth/ForgotPasswordController.php
@@ -50,14 +50,14 @@ class ForgotPasswordController extends Controller
      */
     public function sendResetLinkEmail(Request $request)
     {
-
         /**
          * Let's set a max character count here to prevent potential
          * buffer overflow issues with attackers sending very large
-         * payloads through.
+         * payloads through. The addition of the string rule prevents attackers
+         * sending arrays through and causing 500s
          */
         $request->validate([
-            'username' => ['required', 'max:255'],
+            'username' => ['required', 'max:255', 'string'],
         ]);
 
         /**
diff --git a/app/Http/Controllers/Auth/LoginController.php b/app/Http/Controllers/Auth/LoginController.php
index ac19a57a72..0b87865455 100644
--- a/app/Http/Controllers/Auth/LoginController.php
+++ b/app/Http/Controllers/Auth/LoginController.php
@@ -127,7 +127,7 @@ class LoginController extends Controller
                     $saml->clearData();
                 }
 
-                if ($user = Auth::user()) {
+                if ($user = auth()->user()) {
                     $user->last_login = \Carbon::now();
                     $user->saveQuietly();
                 }
@@ -206,6 +206,7 @@ class LoginController extends Controller
                 $user->password = bcrypt($request->input('password'));
             }
 
+            $user->last_login = \Carbon::now();
             $user->email = $ldap_attr['email'];
             $user->first_name = $ldap_attr['firstname'];
             $user->last_name = $ldap_attr['lastname']; //FIXME (or TODO?) - do we need to map additional fields that we now support? E.g. country, phone, etc.
@@ -226,7 +227,7 @@ class LoginController extends Controller
 
             $strip_prefixes = [
                 // IIS/AD
-                // https://github.com/snipe/snipe-it/pull/5862
+                // https://github.com/grokability/snipe-it/pull/5862
                 '\\',
 
                 // Google Cloud IAP
@@ -283,8 +284,11 @@ class LoginController extends Controller
             return redirect()->back()->withInput()->withErrors($validator);
         }
 
-        $this->maxLoginAttempts = config('auth.passwords.users.throttle.max_attempts');
-        $this->lockoutTime = config('auth.passwords.users.throttle.lockout_duration');
+        // Set the custom lockout attempts from the env and sett the custom lockout throttle from the env.
+        // We divide decayMinutes by 60 here to get minutes, since Laravel changed the default from minutes
+        // to seconds, and we don't want to break limits on existing systems
+        $this->maxAttempts = config('auth.passwords.users.throttle.max_attempts');
+        $this->decayMinutes = (config('auth.passwords.users.throttle.lockout_duration') / 60);
 
         if ($lockedOut = $this->hasTooManyLoginAttempts($request)) {
             $this->fireLockoutEvent($request);
@@ -326,7 +330,7 @@ class LoginController extends Controller
             }
         }
 
-        if ($user = Auth::user()) {
+        if ($user = auth()->user()) {
             $user->last_login = \Carbon::now();
             $user->activated = 1;
             $user->saveQuietly();
@@ -350,11 +354,11 @@ class LoginController extends Controller
         }
 
         $settings = Setting::getSettings();
-        $user = Auth::user();
+        $user = auth()->user();
 
         // We wouldn't normally see this page if 2FA isn't enforced via the
         // \App\Http\Middleware\CheckForTwoFactor middleware AND if a device isn't enrolled,
-        // but let's check check anyway in case there's a browser history or back button thing.
+        // but let's check anyway in case there's a browser history or back button thing.
         // While you can access this page directly, enrolling a device when 2FA isn't enforced
         // won't cause any harm.
 
@@ -398,7 +402,7 @@ class LoginController extends Controller
             return redirect()->route('login')->with('error', trans('auth/general.login_prompt'));
         }
 
-        $user = Auth::user();
+        $user = auth()->user();
 
         // Check whether there is a device enrolled.
         // This *should* be handled via the \App\Http\Middleware\CheckForTwoFactor middleware
@@ -427,11 +431,12 @@ class LoginController extends Controller
             return redirect()->route('two-factor')->with('error', trans('auth/message.two_factor.code_required'));
         }
 
-        $user = Auth::user();
+        $user = auth()->user();
         $secret = $request->input('two_factor_secret');
 
         if (Google2FA::verifyKey($user->two_factor_secret, $secret)) {
             $user->two_factor_enrolled = 1;
+            $user->last_login = \Carbon::now();
             $user->saveQuietly();
             $request->session()->put('2fa_authed', $user->id);
 
@@ -479,6 +484,7 @@ class LoginController extends Controller
         }
 
         $request->session()->regenerate(true);
+        $request->session()->forget('2fa_authed');
 
         if ($request->session()->has('password_hash_'.Auth::getDefaultDriver())){
             $request->session()->remove('password_hash_'.Auth::getDefaultDriver());
@@ -508,8 +514,8 @@ class LoginController extends Controller
     protected function validator(array $data)
     {
         return Validator::make($data, [
-            'username' => 'required',
-            'password' => 'required',
+            'username' => 'required|not_array',
+            'password' => 'required|not_array',
         ]);
     }
 
@@ -519,45 +525,6 @@ class LoginController extends Controller
         return 'username';
     }
 
-    /**
-     * Redirect the user after determining they are locked out.
-     *
-     * @param  \Illuminate\Http\Request  $request
-     * @return \Illuminate\Http\RedirectResponse
-     */
-    protected function sendLockoutResponse(Request $request)
-    {
-        $seconds = $this->limiter()->availableIn(
-            $this->throttleKey($request)
-        );
-
-        $minutes = round($seconds / 60);
-
-        $message = trans('auth/message.throttle', ['minutes' => $minutes]);
-
-        return redirect()->back()
-            ->withInput($request->only($this->username(), 'remember'))
-            ->withErrors([$this->username() => $message]);
-    }
-
-
-    /**
-     * Override the lockout time and duration
-     *
-     * @param  \Illuminate\Http\Request  $request
-     * @return bool
-     */
-    protected function hasTooManyLoginAttempts(Request $request)
-    {
-        $lockoutTime = config('auth.passwords.users.throttle.lockout_duration');
-        $maxLoginAttempts = config('auth.passwords.users.throttle.max_attempts');
-
-        return $this->limiter()->tooManyAttempts(
-            $this->throttleKey($request),
-            $maxLoginAttempts,
-            $lockoutTime
-        );
-    }
 
     public function legacyAuthRedirect()
     {
diff --git a/app/Http/Controllers/Auth/ResetPasswordController.php b/app/Http/Controllers/Auth/ResetPasswordController.php
index fe1b331289..805b829180 100644
--- a/app/Http/Controllers/Auth/ResetPasswordController.php
+++ b/app/Http/Controllers/Auth/ResetPasswordController.php
@@ -87,7 +87,7 @@ class ResetPasswordController extends Controller
             'password.not_in' => trans('validation.disallow_same_pwd_as_user_fields'),
         ];
 
-        $request->validate($this->rules(), $request->all(), $this->validationErrorMessages());
+        $request->validate($this->rules());
 
         Log::debug('Checking if '.$request->input('username').' exists');
         // Check to see if the user even exists - we'll treat the response the same to prevent user sniffing
@@ -103,22 +103,24 @@ class ResetPasswordController extends Controller
                     ], $messages);
             }
 
+            if ($user->ldap_import != '1') {
 
-            // set the response
-            $response = $broker->reset(
-                $this->credentials($request), function ($user, $password) {
-                $this->resetPassword($user, $password);
-            });
+                    // set the response
+                    $response = $broker->reset(
+                        $this->credentials($request), function ($user, $password) {
+                        $this->resetPassword($user, $password);
+                    });
 
-            // Check if the password reset above actually worked
-            if ($response == \Password::PASSWORD_RESET) {
-                Log::debug('Password reset for '.$user->username.' worked');
-                return redirect()->guest('login')->with('success', trans('passwords.reset'));
+                    // Check if the password reset above actually worked
+                    if ($response == \Password::PASSWORD_RESET) {
+                        Log::debug('Password reset for ' . $user->username . ' worked');
+                        return redirect()->guest('login')->with('success', trans('passwords.reset'));
+                    }
+
+                    Log::debug('Password reset for ' . $user->username . ' FAILED - this user exists but the token is not valid');
+                    return redirect()->back()->withInput($request->only('email'))->with('success', trans('passwords.reset'));
             }
 
-            Log::debug('Password reset for '.$user->username.' FAILED - this user exists but the token is not valid');
-            return redirect()->back()->withInput($request->only('email'))->with('success', trans('passwords.reset'));
-
         }
 
 
diff --git a/app/Http/Controllers/Auth/SamlController.php b/app/Http/Controllers/Auth/SamlController.php
index 769f903494..6a4c1f65b0 100644
--- a/app/Http/Controllers/Auth/SamlController.php
+++ b/app/Http/Controllers/Auth/SamlController.php
@@ -99,12 +99,18 @@ class SamlController extends Controller
     {
         $saml = $this->saml;
         $auth = $saml->getAuth();
-        $auth->processResponse();
+        $saml_exception = false;
+        try {
+            $auth->processResponse();
+        } catch (\Exception $e) {
+            Log::warning("Exception caught in SAML login: " . $e->getMessage());
+            $saml_exception = true;
+        }
         $errors = $auth->getErrors();
 
-        if (! empty($errors)) {
-            Log::error('There was an error with SAML ACS: '.implode(', ', $errors));
-            Log::error('Reason: '.$auth->getLastErrorReason());
+        if (!empty($errors) || $saml_exception) {
+            Log::warning('There was an error with SAML ACS: ' . implode(', ', $errors));
+            Log::warning('Reason: ' . $auth->getLastErrorReason());
 
             return redirect()->route('login')->with('error', trans('auth/message.signin.error'));
         }
@@ -132,12 +138,18 @@ class SamlController extends Controller
     {
         $auth = $this->saml->getAuth();
         $retrieveParametersFromServer = $this->saml->getSetting('retrieveParametersFromServer', false);
-        $sloUrl = $auth->processSLO(true, null, $retrieveParametersFromServer, null, true);
+        $saml_exception = false;
+        try {
+            $sloUrl = $auth->processSLO(true, null, $retrieveParametersFromServer, null, true);
+        } catch (\Exception $e) {
+            Log::warning("Exception caught in SAML single-logout: " . $e->getMessage());
+            $saml_exception = true;
+        }
         $errors = $auth->getErrors();
 
-        if (! empty($errors)) {
-            Log::error('There was an error with SAML SLS: '.implode(', ', $errors));
-            Log::error('Reason: '.$auth->getLastErrorReason());
+        if (!empty($errors) || $saml_exception) {
+            Log::warning('There was an error with SAML SLS: ' . implode(', ', $errors));
+            Log::warning('Reason: ' . $auth->getLastErrorReason());
 
             return view('errors.403');
         }
diff --git a/app/Http/Controllers/BulkAssetModelsController.php b/app/Http/Controllers/BulkAssetModelsController.php
index 5437791aa8..5f64ea0838 100644
--- a/app/Http/Controllers/BulkAssetModelsController.php
+++ b/app/Http/Controllers/BulkAssetModelsController.php
@@ -5,8 +5,8 @@ namespace App\Http\Controllers;
 use App\Helpers\Helper;
 use App\Models\AssetModel;
 use Illuminate\Http\Request;
-use Illuminate\Support\Facades\Input;
-use Illuminate\Support\Facades\Redirect;
+use Illuminate\Http\RedirectResponse;
+use \Illuminate\Contracts\View\View;
 
 class BulkAssetModelsController extends Controller
 {
@@ -16,9 +16,8 @@ class BulkAssetModelsController extends Controller
      * @author [A. Gianotto] [<snipe@snipe.net>]
      * @since [v1.7]
      * @param Request $request
-     * @return \Illuminate\Contracts\View\View
      */
-    public function edit(Request $request)
+    public function edit(Request $request) : View | RedirectResponse
     {
         $models_raw_array = $request->input('ids');
 
@@ -61,9 +60,8 @@ class BulkAssetModelsController extends Controller
      * @author [A. Gianotto] [<snipe@snipe.net>]
      * @since [v1.7]
      * @param Request $request
-     * @return \Illuminate\Contracts\View\View
      */
-    public function update(Request $request)
+    public function update(Request $request): View | RedirectResponse
     {
         $this->authorize('update', AssetModel::class);
       
@@ -73,20 +71,28 @@ class BulkAssetModelsController extends Controller
         if (($request->filled('manufacturer_id') && ($request->input('manufacturer_id') != 'NC'))) {
             $update_array['manufacturer_id'] = $request->input('manufacturer_id');
         }
+        
         if (($request->filled('category_id') && ($request->input('category_id') != 'NC'))) {
             $update_array['category_id'] = $request->input('category_id');
         }
+
         if ($request->input('fieldset_id') != 'NC') {
             $update_array['fieldset_id'] = $request->input('fieldset_id');
         }
+
         if ($request->input('depreciation_id') != 'NC') {
             $update_array['depreciation_id'] = $request->input('depreciation_id');
         }
 
-        if ($request->filled('requestable') != '') {
+        if ($request->input('requestable') != '') {
             $update_array['requestable'] = $request->input('requestable');
         }
 
+        if ($request->filled('min_amt')) {
+            $update_array['min_amt'] = $request->input('min_amt');
+        }
+
+
 
         if (count($update_array) > 0) {
             AssetModel::whereIn('id', $models_raw_array)->update($update_array);
@@ -105,9 +111,8 @@ class BulkAssetModelsController extends Controller
      *
      * @author [A. Gianotto] [<snipe@snipe.net>]
      * @since [v1.0]
-     * @return \Illuminate\Http\RedirectResponse
      */
-    public function destroy(Request $request)
+    public function destroy(Request $request) : RedirectResponse
     {
         $this->authorize('delete', AssetModel::class);
       
diff --git a/app/Http/Controllers/CategoriesController.php b/app/Http/Controllers/CategoriesController.php
index d7e83b43d8..692e2745ac 100755
--- a/app/Http/Controllers/CategoriesController.php
+++ b/app/Http/Controllers/CategoriesController.php
@@ -4,10 +4,11 @@ namespace App\Http\Controllers;
 
 use App\Helpers\Helper;
 use App\Http\Requests\ImageUploadRequest;
-use App\Models\Category as Category;
+use App\Models\Category;
 use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\Storage;
-use Str;
+use Illuminate\Http\RedirectResponse;
+use \Illuminate\Contracts\View\View;
 
 /**
  * This class controls all actions related to Categories for
@@ -25,10 +26,8 @@ class CategoriesController extends Controller
      * @author [A. Gianotto] [<snipe@snipe.net>]
      * @see CategoriesController::getDatatable() method that generates the JSON response
      * @since [v1.0]
-     * @return \Illuminate\Contracts\View\View
-     * @throws \Illuminate\Auth\Access\AuthorizationException
      */
-    public function index()
+    public function index() : View
     {
         // Show the page
         $this->authorize('view', Category::class);
@@ -42,10 +41,8 @@ class CategoriesController extends Controller
      * @author [A. Gianotto] [<snipe@snipe.net>]
      * @see CategoriesController::store() method that stores the data
      * @since [v1.0]
-     * @return \Illuminate\Contracts\View\View
-     * @throws \Illuminate\Auth\Access\AuthorizationException
      */
-    public function create()
+    public function create() : View
     {
         // Show the page
         $this->authorize('create', Category::class);
@@ -61,10 +58,8 @@ class CategoriesController extends Controller
      * @see CategoriesController::create() method that makes the form.
      * @since [v1.0]
      * @param ImageUploadRequest $request
-     * @return \Illuminate\Http\RedirectResponse
-     * @throws \Illuminate\Auth\Access\AuthorizationException
      */
-    public function store(ImageUploadRequest $request)
+    public function store(ImageUploadRequest $request) : RedirectResponse
     {
         $this->authorize('create', Category::class);
         $category = new Category();
@@ -74,7 +69,8 @@ class CategoriesController extends Controller
         $category->use_default_eula = $request->input('use_default_eula', '0');
         $category->require_acceptance = $request->input('require_acceptance', '0');
         $category->checkin_email = $request->input('checkin_email', '0');
-        $category->user_id = Auth::id();
+        $category->notes = $request->input('notes');
+        $category->created_by = auth()->id();
 
         $category = $request->handleImages($category);
         if ($category->save()) {
@@ -91,17 +87,11 @@ class CategoriesController extends Controller
      * @see CategoriesController::postEdit() method saves the data
      * @param int $categoryId
      * @since [v1.0]
-     * @return \Illuminate\Contracts\View\View
-     * @throws \Illuminate\Auth\Access\AuthorizationException
      */
-    public function edit($categoryId = null)
+    public function edit(Category $category) : RedirectResponse | View
     {
         $this->authorize('update', Category::class);
-        if (is_null($item = Category::find($categoryId))) {
-            return redirect()->route('categories.index')->with('error', trans('admin/categories/message.does_not_exist'));
-        }
-
-        return view('categories/edit', compact('item'))
+        return view('categories/edit')->with('item', $category)
         ->with('category_types', Helper::categoryTypeList());
     }
 
@@ -112,27 +102,27 @@ class CategoriesController extends Controller
      * @see CategoriesController::getEdit() method that makes the form.
      * @param ImageUploadRequest $request
      * @param int $categoryId
-     * @return \Illuminate\Http\RedirectResponse
-     * @throws \Illuminate\Auth\Access\AuthorizationException
      * @since [v1.0]
      */
-    public function update(ImageUploadRequest $request, $categoryId = null)
+    public function update(ImageUploadRequest $request, Category $category) : RedirectResponse
     {
         $this->authorize('update', Category::class);
-        if (is_null($category = Category::find($categoryId))) {
-            // Redirect to the categories management page
-            return redirect()->to('admin/categories')->with('error', trans('admin/categories/message.does_not_exist'));
-        }
-
-        // Update the category data
         $category->name = $request->input('name');
-        // If the item count is > 0, we disable the category type in the edit. Disabled items
-        // don't POST, so if the category_type is blank we just set it to the default.
+
+        // Don't allow the user to change the category_type once it's been created
+        if (($request->filled('category_type') && ($category->itemCount() > 0))) {
+            $request->validate(['category_type' => 'in:'.$category->category_type]);
+        }
+        
         $category->category_type = $request->input('category_type', $category->category_type);
+
+        $category->fill($request->all());
+
         $category->eula_text = $request->input('eula_text');
         $category->use_default_eula = $request->input('use_default_eula', '0');
         $category->require_acceptance = $request->input('require_acceptance', '0');
         $category->checkin_email = $request->input('checkin_email', '0');
+        $category->notes = $request->input('notes');
 
         $category = $request->handleImages($category);
 
@@ -150,14 +140,12 @@ class CategoriesController extends Controller
      * @author [A. Gianotto] [<snipe@snipe.net>]
      * @since [v1.0]
      * @param int $categoryId
-     * @return \Illuminate\Http\RedirectResponse
-     * @throws \Illuminate\Auth\Access\AuthorizationException
      */
-    public function destroy($categoryId)
+    public function destroy($categoryId) : RedirectResponse
     {
         $this->authorize('delete', Category::class);
         // Check if the category exists
-        if (is_null($category = Category::findOrFail($categoryId))) {
+        if (is_null($category = Category::withCount('assets as assets_count', 'accessories as accessories_count', 'consumables as consumables_count', 'components as components_count', 'licenses as licenses_count', 'models as models_count')->findOrFail($categoryId))) {
             return redirect()->route('categories.index')->with('error', trans('admin/categories/message.not_found'));
         }
 
@@ -167,7 +155,6 @@ class CategoriesController extends Controller
 
         Storage::disk('public')->delete('categories'.'/'.$category->image);
         $category->delete();
-        // Redirect to the locations management page
         return redirect()->route('categories.index')->with('success', trans('admin/categories/message.delete.success'));
     }
 
@@ -178,14 +165,12 @@ class CategoriesController extends Controller
      * @author [A. Gianotto] [<snipe@snipe.net>]
      * @see CategoriesController::getDataView() method that generates the JSON response
      * @param $id
-     * @return \Illuminate\Contracts\View\View
-     * @throws \Illuminate\Auth\Access\AuthorizationException
      * @since [v1.8]
      */
-    public function show($id)
+    public function show(Category $category) : View | RedirectResponse
     {
         $this->authorize('view', Category::class);
-        if ($category = Category::find($id)) {
+
             if ($category->category_type == 'asset') {
                 $category_type = 'hardware';
                 $category_type_route = 'assets';
@@ -200,8 +185,5 @@ class CategoriesController extends Controller
             return view('categories/view', compact('category'))
                 ->with('category_type', $category_type)
                 ->with('category_type_route', $category_type_route);
-        }
-
-        return redirect()->route('categories.index')->with('error', trans('admin/categories/message.does_not_exist'));
     }
 }
diff --git a/app/Http/Controllers/CheckInOutRequest.php b/app/Http/Controllers/CheckInOutRequest.php
index 6dd7e4aba3..6ab327fff8 100644
--- a/app/Http/Controllers/CheckInOutRequest.php
+++ b/app/Http/Controllers/CheckInOutRequest.php
@@ -11,9 +11,8 @@ trait CheckInOutRequest
 {
     /**
      * Find target for checkout
-     * @return SnipeModel        Target asset is being checked out to.
      */
-    protected function determineCheckoutTarget()
+    protected function determineCheckoutTarget() : ?SnipeModel
     {
         // This item is checked out to a location
         switch (request('checkout_to_type')) {
@@ -21,7 +20,7 @@ trait CheckInOutRequest
                 return Location::findOrFail(request('assigned_location'));
             case 'asset':
                 return Asset::findOrFail(request('assigned_asset'));
-            case 'user':
+            default:
                 return User::findOrFail(request('assigned_user'));
         }
 
@@ -34,7 +33,7 @@ trait CheckInOutRequest
      * @param  SnipeModel $target Target with location
      * @return Asset        Asset being updated
      */
-    protected function updateAssetLocation($asset, $target)
+    protected function updateAssetLocation($asset, $target) : Asset
     {
         switch (request('checkout_to_type')) {
             case 'location':
diff --git a/app/Http/Controllers/CompaniesController.php b/app/Http/Controllers/CompaniesController.php
index 63205a598d..96a80e87e6 100644
--- a/app/Http/Controllers/CompaniesController.php
+++ b/app/Http/Controllers/CompaniesController.php
@@ -7,6 +7,8 @@ use App\Models\Company;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Storage;
 use Illuminate\Support\Facades\Log;
+use Illuminate\Http\RedirectResponse;
+use \Illuminate\Contracts\View\View;
 
 /**
  * This controller handles all actions related to Companies for
@@ -21,10 +23,8 @@ final class CompaniesController extends Controller
      *
      * @author [Abdullah Alansari] [<ahimta@gmail.com>]
      * @since [v1.8]
-     * @return \Illuminate\Contracts\View\View
-     * @throws \Illuminate\Auth\Access\AuthorizationException
      */
-    public function index()
+    public function index() : View
     {
         $this->authorize('view', Company::class);
 
@@ -36,10 +36,8 @@ final class CompaniesController extends Controller
      *
      * @author [Abdullah Alansari] [<ahimta@gmail.com>]
      * @since [v1.8]
-     * @return \Illuminate\Contracts\View\View
-     * @throws \Illuminate\Auth\Access\AuthorizationException
      */
-    public function create()
+    public function create() : View
     {
         $this->authorize('create', Company::class);
 
@@ -52,10 +50,8 @@ final class CompaniesController extends Controller
      * @author [Abdullah Alansari] [<ahimta@gmail.com>]
      * @since [v1.8]
      * @param Request $request
-     * @return \Illuminate\Http\RedirectResponse
-     * @throws \Illuminate\Auth\Access\AuthorizationException
      */
-    public function store(ImageUploadRequest $request)
+    public function store(ImageUploadRequest $request) : RedirectResponse
     {
         $this->authorize('create', Company::class);
 
@@ -64,6 +60,8 @@ final class CompaniesController extends Controller
         $company->phone = $request->input('phone');
         $company->fax = $request->input('fax');
         $company->email = $request->input('email');
+        $company->notes = $request->input('notes');
+        $company->created_by = auth()->id();
 
         $company = $request->handleImages($company);
 
@@ -81,19 +79,11 @@ final class CompaniesController extends Controller
      * @author [Abdullah Alansari] [<ahimta@gmail.com>]
      * @since [v1.8]
      * @param int $companyId
-     * @return \Illuminate\Contracts\View\View
-     * @throws \Illuminate\Auth\Access\AuthorizationException
      */
-    public function edit($companyId)
+    public function edit(Company $company) : View | RedirectResponse
     {
-        if (is_null($item = Company::find($companyId))) {
-            return redirect()->route('companies.index')
-                ->with('error', trans('admin/companies/message.does_not_exist'));
-        }
-
-        $this->authorize('update', $item);
-
-        return view('companies/edit')->with('item', $item);
+        $this->authorize('update', $company);
+        return view('companies/edit')->with('item', $company);
     }
 
     /**
@@ -103,21 +93,16 @@ final class CompaniesController extends Controller
      * @since [v1.8]
      * @param ImageUploadRequest $request
      * @param int $companyId
-     * @return \Illuminate\Http\RedirectResponse
-     * @throws \Illuminate\Auth\Access\AuthorizationException
      */
-    public function update(ImageUploadRequest $request, $companyId)
+    public function update(ImageUploadRequest $request, Company $company) : RedirectResponse
     {
-        if (is_null($company = Company::find($companyId))) {
-            return redirect()->route('companies.index')->with('error', trans('admin/companies/message.does_not_exist'));
-        }
 
         $this->authorize('update', $company);
-
         $company->name = $request->input('name');
         $company->phone = $request->input('phone');
         $company->fax = $request->input('fax');
         $company->email = $request->input('email');
+        $company->notes = $request->input('notes');
 
         $company = $request->handleImages($company);
 
@@ -135,10 +120,8 @@ final class CompaniesController extends Controller
      * @author [Abdullah Alansari] [<ahimta@gmail.com>]
      * @since [v1.8]
      * @param int $companyId
-     * @return \Illuminate\Http\RedirectResponse
-     * @throws \Illuminate\Auth\Access\AuthorizationException
      */
-    public function destroy($companyId)
+    public function destroy($companyId) : RedirectResponse
     {
         if (is_null($company = Company::find($companyId))) {
             return redirect()->route('companies.index')
@@ -165,15 +148,9 @@ final class CompaniesController extends Controller
             ->with('success', trans('admin/companies/message.delete.success'));
     }
 
-    public function show($id)
+    public function show(Company $company) : View | RedirectResponse
     {
         $this->authorize('view', Company::class);
-
-        if (is_null($company = Company::find($id))) {
-            return redirect()->route('companies.index')
-                ->with('error', trans('admin/companies/message.not_found'));
-        }
-
         return view('companies/view')->with('company', $company);
     }
 }
diff --git a/app/Http/Controllers/Components/ComponentCheckinController.php b/app/Http/Controllers/Components/ComponentCheckinController.php
index 9f4724e353..379882c3c5 100644
--- a/app/Http/Controllers/Components/ComponentCheckinController.php
+++ b/app/Http/Controllers/Components/ComponentCheckinController.php
@@ -4,6 +4,7 @@ namespace App\Http\Controllers\Components;
 
 use App\Events\CheckoutableCheckedIn;
 use App\Events\ComponentCheckedIn;
+use App\Helpers\Helper;
 use App\Http\Controllers\Controller;
 use App\Models\Asset;
 use App\Models\Component;
@@ -95,13 +96,11 @@ class ComponentCheckinController extends Controller
 
             $asset = Asset::find($component_assets->asset_id);
 
-            event(new CheckoutableCheckedIn($component, $asset, Auth::user(), $request->input('note'), Carbon::now()));
-            if ($backto == 'asset'){
-                return redirect()->route('hardware.show', $asset->id)->with('success',
-                    trans('admin/components/message.checkin.success'));
-            }
+            event(new CheckoutableCheckedIn($component, $asset, auth()->user(), $request->input('note'), Carbon::now()));
 
-            return redirect()->route('components.index')->with('success',
+            session()->put(['redirect_option' => $request->get('redirect_option')]);
+
+            return redirect()->to(Helper::getRedirectOption($request, $component->id, 'Components'))->with('success',
                 trans('admin/components/message.checkin.success'));
         }
 
diff --git a/app/Http/Controllers/Components/ComponentCheckoutController.php b/app/Http/Controllers/Components/ComponentCheckoutController.php
index 79ff57e7df..b40d592369 100644
--- a/app/Http/Controllers/Components/ComponentCheckoutController.php
+++ b/app/Http/Controllers/Components/ComponentCheckoutController.php
@@ -4,9 +4,11 @@ namespace App\Http\Controllers\Components;
 
 use App\Events\CheckoutableCheckedOut;
 use App\Events\ComponentCheckedOut;
+use App\Helpers\Helper;
 use App\Http\Controllers\Controller;
 use App\Models\Asset;
 use App\Models\Component;
+use App\Models\Setting;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\Input;
@@ -93,22 +95,31 @@ class ComponentCheckoutController extends Controller
                 ->withInput();
         }
 
-        // Check if the user exists
+        // Check if the asset exists
         $asset = Asset::find($request->input('asset_id'));
 
+        if ((Setting::getSettings()->full_multiple_companies_support) && $component->company_id !== $asset->company_id) {
+            return redirect()->route('components.checkout.show', $componentId)->with('error', trans('general.error_user_company'));
+        }
+
         // Update the component data
         $component->asset_id = $request->input('asset_id');
         $component->assets()->attach($component->id, [
             'component_id' => $component->id,
-            'user_id' => Auth::user(),
+            'created_by' => auth()->user()->id,
             'created_at' => date('Y-m-d H:i:s'),
             'assigned_qty' => $request->input('assigned_qty'),
             'asset_id' => $request->input('asset_id'),
             'note' => $request->input('note'),
         ]);
 
-        event(new CheckoutableCheckedOut($component, $asset, Auth::user(), $request->input('note')));
+        event(new CheckoutableCheckedOut($component, $asset, auth()->user(), $request->input('note')));
 
-        return redirect()->route('components.index')->with('success', trans('admin/components/message.checkout.success'));
+        $request->request->add(['checkout_to_type' => 'asset']);
+        $request->request->add(['assigned_asset' => $asset->id]);
+
+        session()->put(['redirect_option' => $request->get('redirect_option'), 'checkout_to_type' => $request->get('checkout_to_type')]);
+
+        return redirect()->to(Helper::getRedirectOption($request, $component->id, 'Components'))->with('success', trans('admin/components/message.checkout.success'));
     }
 }
diff --git a/app/Http/Controllers/Components/ComponentsController.php b/app/Http/Controllers/Components/ComponentsController.php
index 33ebde6456..74594d312b 100644
--- a/app/Http/Controllers/Components/ComponentsController.php
+++ b/app/Http/Controllers/Components/ComponentsController.php
@@ -73,6 +73,8 @@ class ComponentsController extends Controller
         $component->name                   = $request->input('name');
         $component->category_id            = $request->input('category_id');
         $component->supplier_id            = $request->input('supplier_id');
+        $component->manufacturer_id        = $request->input('manufacturer_id');
+        $component->model_number           = $request->input('model_number');
         $component->location_id            = $request->input('location_id');
         $component->company_id             = Company::getIdForCurrentUser($request->input('company_id'));
         $component->order_number           = $request->input('order_number', null);
@@ -81,13 +83,15 @@ class ComponentsController extends Controller
         $component->purchase_date          = $request->input('purchase_date', null);
         $component->purchase_cost          = $request->input('purchase_cost', null);
         $component->qty                    = $request->input('qty');
-        $component->user_id                = Auth::id();
+        $component->created_by                = auth()->id();
         $component->notes                  = $request->input('notes');
 
         $component = $request->handleImages($component);
 
+        session()->put(['redirect_option' => $request->get('redirect_option')]);
+
         if ($component->save()) {
-            return redirect()->route('components.index')->with('success', trans('admin/components/message.create.success'));
+            return redirect()->to(Helper::getRedirectOption($request, $component->id, 'Components'))->with('success', trans('admin/components/message.create.success'));
         }
 
         return redirect()->back()->withInput()->withErrors($component->getErrors());
@@ -103,15 +107,13 @@ class ComponentsController extends Controller
      * @return \Illuminate\Contracts\View\View
      * @throws \Illuminate\Auth\Access\AuthorizationException
      */
-    public function edit($componentId = null)
+    public function edit(Component $component)
     {
-        if ($item = Component::find($componentId)) {
-            $this->authorize('update', $item);
 
-            return view('components/edit', compact('item'))->with('category_type', 'component');
-        }
-
-        return redirect()->route('components.index')->with('error', trans('admin/components/message.does_not_exist'));
+            $this->authorize('update', $component);
+            return view('components/edit')
+                ->with('item', $component)
+                ->with('category_type', 'component');
     }
 
 
@@ -126,11 +128,8 @@ class ComponentsController extends Controller
      * @throws \Illuminate\Auth\Access\AuthorizationException
      * @since [v3.0]
      */
-    public function update(ImageUploadRequest $request, $componentId = null)
+    public function update(ImageUploadRequest $request, Component $component)
     {
-        if (is_null($component = Component::find($componentId))) {
-            return redirect()->route('components.index')->with('error', trans('admin/components/message.does_not_exist'));
-        }
         $min = $component->numCheckedOut();
         $validator = Validator::make($request->all(), [
             'qty' => "required|numeric|min:$min",
@@ -148,6 +147,8 @@ class ComponentsController extends Controller
         $component->name                   = $request->input('name');
         $component->category_id            = $request->input('category_id');
         $component->supplier_id            = $request->input('supplier_id');
+        $component->manufacturer_id        = $request->input('manufacturer_id');
+        $component->model_number           = $request->input('model_number');
         $component->location_id            = $request->input('location_id');
         $component->company_id             = Company::getIdForCurrentUser($request->input('company_id'));
         $component->order_number           = $request->input('order_number');
@@ -160,8 +161,10 @@ class ComponentsController extends Controller
 
         $component = $request->handleImages($component);
 
+        session()->put(['redirect_option' => $request->get('redirect_option')]);
+
         if ($component->save()) {
-            return redirect()->route('components.index')->with('success', trans('admin/components/message.update.success'));
+            return redirect()->to(Helper::getRedirectOption($request, $component->id, 'Components'))->with('success', trans('admin/components/message.update.success'));
         }
 
         return redirect()->back()->withInput()->withErrors($component->getErrors());
@@ -185,7 +188,7 @@ class ComponentsController extends Controller
         $this->authorize('delete', $component);
 
         // Remove the image if one exists
-        if (Storage::disk('public')->exists('components/'.$component->image)) {
+        if ($component->image && Storage::disk('public')->exists('components/' . $component->image)) {
             try {
                 Storage::disk('public')->delete('components/'.$component->image);
             } catch (\Exception $e) {
@@ -193,6 +196,10 @@ class ComponentsController extends Controller
             }
         }
 
+        if ($component->numCheckedOut() > 0) {
+            return redirect()->route('components.index')->with('error', trans('admin/components/message.delete.error_qty'));
+        }
+
         $component->delete();
 
         return redirect()->route('components.index')->with('success', trans('admin/components/message.delete.success'));
@@ -208,17 +215,9 @@ class ComponentsController extends Controller
      * @return \Illuminate\Contracts\View\View
      * @throws \Illuminate\Auth\Access\AuthorizationException
      */
-    public function show($componentId = null)
+    public function show(Component $component)
     {
-        $component = Component::find($componentId);
-
-        if (isset($component->id)) {
             $this->authorize('view', $component);
-
             return view('components/view', compact('component'));
-        }
-        // Redirect to the user management page
-        return redirect()->route('components.index')
-            ->with('error', trans('admin/components/message.does_not_exist'));
     }
 }
diff --git a/app/Http/Controllers/Components/ComponentsFilesController.php b/app/Http/Controllers/Components/ComponentsFilesController.php
index a7d42bb072..b5e30aa694 100644
--- a/app/Http/Controllers/Components/ComponentsFilesController.php
+++ b/app/Http/Controllers/Components/ComponentsFilesController.php
@@ -50,7 +50,7 @@ class ComponentsFilesController extends Controller
                 }
 
 
-                return redirect()->route('components.show', $component->id)->with('success', trans('general.file_upload_success'));
+                return redirect()->route('components.show', $component->id)->withFragment('files')->with('success', trans('general.file_upload_success'));
 
             }
 
@@ -91,7 +91,7 @@ class ComponentsFilesController extends Controller
 
             $log->delete();
 
-            return redirect()->back()
+            return redirect()->back()->withFragment('files')
                 ->with('success', trans('admin/hardware/message.deletefile.success'));
         }
 
@@ -112,40 +112,25 @@ class ComponentsFilesController extends Controller
     public function show($componentId = null, $fileId = null)
     {
         Log::debug('Private filesystem is: '.config('filesystems.default'));
-        $component = Component::find($componentId);
+
 
         // the component is valid
-        if (isset($component->id)) {
+        if ($component = Component::find($componentId)) {
             $this->authorize('view', $component);
             $this->authorize('components.files', $component);
 
-            if (! $log = Actionlog::whereNotNull('filename')->where('item_id', $component->id)->find($fileId)) {
-                return response('No matching record for that asset/file', 500)
-                    ->header('Content-Type', 'text/plain');
-            }
+            if ($log = Actionlog::whereNotNull('filename')->where('item_id', $component->id)->find($fileId)) {
 
-            $file = 'private_uploads/components/'.$log->filename;
+                $file = 'private_uploads/components/'.$log->filename;
 
-            if (Storage::missing($file)) {
-                Log::debug('FILE DOES NOT EXISTS for '.$file);
-                Log::debug('URL should be '.Storage::url($file));
-
-                return response('File '.$file.' ('.Storage::url($file).') not found on server', 404)
-                    ->header('Content-Type', 'text/plain');
-            } else {
-
-                // Display the file inline
-                if (request('inline') == 'true') {
-                    $headers = [
-                        'Content-Disposition' => 'inline',
-                    ];
-                    return Storage::download($file, $log->filename, $headers);
+                try {
+                    return StorageHelper::showOrDownloadFile($file, $log->filename);
+                } catch (\Exception $e) {
+                    return redirect()->route('components.show', ['component' => $component])->with('error',  trans('general.file_not_found'));
                 }
-
-                if (config('filesystems.default') == 'local') { // TODO - is there any way to fix this at the StorageHelper layer?
-                    return StorageHelper::downloader($file);
-                } 
             }
+            return redirect()->route('components.show', ['component' => $component])->with('error',  trans('general.log_record_not_found'));
+
         }
 
         return redirect()->route('components.index')->with('error', trans('general.file_does_not_exist', ['id' => $fileId]));
diff --git a/app/Http/Controllers/Consumables/ConsumableCheckoutController.php b/app/Http/Controllers/Consumables/ConsumableCheckoutController.php
index d838ee5696..e08da41229 100644
--- a/app/Http/Controllers/Consumables/ConsumableCheckoutController.php
+++ b/app/Http/Controllers/Consumables/ConsumableCheckoutController.php
@@ -3,13 +3,13 @@
 namespace App\Http\Controllers\Consumables;
 
 use App\Events\CheckoutableCheckedOut;
+use App\Helpers\Helper;
 use App\Http\Controllers\Controller;
-use App\Models\Accessory;
 use App\Models\Consumable;
 use App\Models\User;
 use Illuminate\Http\Request;
-use Illuminate\Support\Facades\Auth;
-use Illuminate\Support\Facades\Input;
+use \Illuminate\Contracts\View\View;
+use \Illuminate\Http\RedirectResponse;
 
 class ConsumableCheckoutController extends Controller
 {
@@ -20,13 +20,11 @@ class ConsumableCheckoutController extends Controller
      * @see ConsumableCheckoutController::store() method that stores the data.
      * @since [v1.0]
      * @param int $id
-     * @return \Illuminate\Contracts\View\View
-     * @throws \Illuminate\Auth\Access\AuthorizationException
      */
-    public function create($id)
+    public function create($id) : View | RedirectResponse
     {
 
-        if ($consumable = Consumable::with('users')->find($id)) {
+        if ($consumable = Consumable::find($id)) {
 
             $this->authorize('checkout', $consumable);
 
@@ -36,7 +34,7 @@ class ConsumableCheckoutController extends Controller
                 // Make sure there is at least one available to checkout
                 if ($consumable->numRemaining() <= 0){
                     return redirect()->route('consumables.index')
-                        ->with('error', trans('admin/consumables/message.checkout.unavailable'));
+                        ->with('error', trans('admin/consumables/message.checkout.unavailable', ['requested' => 1, 'remaining' => $consumable->numRemaining()]));
                 }
 
                 // Return the checkout view
@@ -72,17 +70,17 @@ class ConsumableCheckoutController extends Controller
         $this->authorize('checkout', $consumable);
 
         // If the quantity is not present in the request or is not a positive integer, set it to 1
-        $quantity = $request->input('qty');
+        $quantity = $request->input('checkout_qty');
         if (!isset($quantity) || !ctype_digit((string)$quantity) || $quantity <= 0) {
             $quantity = 1;
         }
 
         // Make sure there is at least one available to checkout
         if ($consumable->numRemaining() <= 0 || $quantity > $consumable->numRemaining()) {
-            return redirect()->route('consumables.index')->with('error', trans('admin/consumables/message.checkout.unavailable'));
+            return redirect()->route('consumables.index')->with('error', trans('admin/consumables/message.checkout.unavailable', ['requested' => $quantity, 'remaining' => $consumable->numRemaining() ]));
         }
 
-        $admin_user = Auth::user();
+        $admin_user = auth()->user();
         $assigned_to = e($request->input('assigned_to'));
 
         // Check if the user exists
@@ -94,17 +92,25 @@ class ConsumableCheckoutController extends Controller
         // Update the consumable data
         $consumable->assigned_to = e($request->input('assigned_to'));
 
-        for($i = 0; $i < $quantity; $i++){
+        for ($i = 0; $i < $quantity; $i++){
         $consumable->users()->attach($consumable->id, [
             'consumable_id' => $consumable->id,
-            'user_id' => $admin_user->id,
+            'created_by' => $admin_user->id,
             'assigned_to' => e($request->input('assigned_to')),
             'note' => $request->input('note'),
         ]);
         }
-        event(new CheckoutableCheckedOut($consumable, $user, Auth::user(), $request->input('note')));
+
+        $consumable->checkout_qty = $quantity;
+        event(new CheckoutableCheckedOut($consumable, $user, auth()->user(), $request->input('note')));
+
+        $request->request->add(['checkout_to_type' => 'user']);
+        $request->request->add(['assigned_user' => $user->id]);
+
+        session()->put(['redirect_option' => $request->get('redirect_option'), 'checkout_to_type' => $request->get('checkout_to_type')]);
+
 
         // Redirect to the new consumable page
-        return redirect()->route('consumables.index')->with('success', trans('admin/consumables/message.checkout.success'));
+        return redirect()->to(Helper::getRedirectOption($request, $consumable->id, 'Consumables'))->with('success', trans('admin/consumables/message.checkout.success'));
     }
 }
diff --git a/app/Http/Controllers/Consumables/ConsumablesController.php b/app/Http/Controllers/Consumables/ConsumablesController.php
index b33e6e07a9..c96c2db975 100644
--- a/app/Http/Controllers/Consumables/ConsumablesController.php
+++ b/app/Http/Controllers/Consumables/ConsumablesController.php
@@ -8,8 +8,10 @@ use App\Http\Requests\ImageUploadRequest;
 use App\Models\Company;
 use App\Models\Consumable;
 use Illuminate\Support\Facades\Auth;
-use Illuminate\Support\Facades\Input;
 use Illuminate\Support\Facades\Validator;
+use Illuminate\Http\RedirectResponse;
+use \Illuminate\Contracts\View\View;
+use App\Http\Requests\StoreConsumableRequest;
 
 /**
  * This controller handles all actions related to Consumables for
@@ -48,7 +50,7 @@ class ConsumablesController extends Controller
     {
         $this->authorize('create', Consumable::class);
 
-        return view('consumables/edit')->with('category_type', 'consumable')
+        return view('consumables.edit')->with('category_type', 'consumable')
             ->with('item', new Consumable);
     }
 
@@ -62,7 +64,7 @@ class ConsumablesController extends Controller
      * @return \Illuminate\Http\RedirectResponse
      * @throws \Illuminate\Auth\Access\AuthorizationException
      */
-    public function store(ImageUploadRequest $request)
+    public function store(StoreConsumableRequest $request)
     {
         $this->authorize('create', Consumable::class);
         $consumable = new Consumable();
@@ -79,14 +81,16 @@ class ConsumablesController extends Controller
         $consumable->purchase_date          = $request->input('purchase_date');
         $consumable->purchase_cost          = $request->input('purchase_cost');
         $consumable->qty                    = $request->input('qty');
-        $consumable->user_id                = Auth::id();
+        $consumable->created_by                = auth()->id();
         $consumable->notes                  = $request->input('notes');
 
 
         $consumable = $request->handleImages($consumable);
 
+        session()->put(['redirect_option' => $request->get('redirect_option')]);
+
         if ($consumable->save()) {
-            return redirect()->route('consumables.index')->with('success', trans('admin/consumables/message.create.success'));
+            return redirect()->to(Helper::getRedirectOption($request, $consumable->id, 'Consumables'))->with('success', trans('admin/consumables/message.create.success'));
         }
 
         return redirect()->back()->withInput()->withErrors($consumable->getErrors());
@@ -99,18 +103,14 @@ class ConsumablesController extends Controller
      * @param  int $consumableId
      * @see ConsumablesController::postEdit() method that stores the form data.
      * @since [v1.0]
-     * @return \Illuminate\Contracts\View\View
-     * @throws \Illuminate\Auth\Access\AuthorizationException
      */
-    public function edit($consumableId = null)
+    public function edit(Consumable $consumable) : View | RedirectResponse
     {
-        if ($item = Consumable::find($consumableId)) {
-            $this->authorize($item);
+            $this->authorize($consumable);
+            return view('consumables/edit')
+                ->with('item', $consumable)
+                ->with('category_type', 'consumable');
 
-            return view('consumables/edit', compact('item'))->with('category_type', 'consumable');
-        }
-
-        return redirect()->route('consumables.index')->with('error', trans('admin/consumables/message.does_not_exist'));
     }
 
     /**
@@ -124,11 +124,8 @@ class ConsumablesController extends Controller
      * @see ConsumablesController::getEdit() method that stores the form data.
      * @since [v1.0]
      */
-    public function update(ImageUploadRequest $request, $consumableId = null)
+    public function update(StoreConsumableRequest $request, Consumable $consumable)
     {
-        if (is_null($consumable = Consumable::find($consumableId))) {
-            return redirect()->route('consumables.index')->with('error', trans('admin/consumables/message.does_not_exist'));
-        }
 
         $min = $consumable->numCheckedOut();
         $validator = Validator::make($request->all(), [
@@ -160,8 +157,10 @@ class ConsumablesController extends Controller
 
         $consumable = $request->handleImages($consumable);
 
+        session()->put(['redirect_option' => $request->get('redirect_option')]);
+
         if ($consumable->save()) {
-            return redirect()->route('consumables.index')->with('success', trans('admin/consumables/message.update.success'));
+            return redirect()->to(Helper::getRedirectOption($request, $consumable->id, 'Consumables'))->with('success', trans('admin/consumables/message.update.success'));
         }
 
         return redirect()->back()->withInput()->withErrors($consumable->getErrors());
@@ -182,6 +181,7 @@ class ConsumablesController extends Controller
             return redirect()->route('consumables.index')->with('error', trans('admin/consumables/message.not_found'));
         }
         $this->authorize($consumable);
+
         $consumable->delete();
         // Redirect to the locations management page
         return redirect()->route('consumables.index')->with('success', trans('admin/consumables/message.delete.success'));
@@ -197,15 +197,22 @@ class ConsumablesController extends Controller
      * @return \Illuminate\Contracts\View\View
      * @throws \Illuminate\Auth\Access\AuthorizationException
      */
-    public function show($consumableId = null)
+    public function show(Consumable $consumable)
     {
-        $consumable = Consumable::find($consumableId);
+        $consumable = Consumable::withCount('users as users_consumables')->find($consumable->id);
         $this->authorize($consumable);
-        if (isset($consumable->id)) {
-            return view('consumables/view', compact('consumable'));
-        }
+        return view('consumables/view', compact('consumable'));
+    }
 
-        return redirect()->route('consumables.index')
-            ->with('error', trans('admin/consumables/message.does_not_exist'));
+    public function clone(Consumable $consumable) : View
+    {
+        $this->authorize('create', $consumable);
+        $consumable_to_close = $consumable;
+        $consumable = clone $consumable_to_close;
+        $consumable->id = null;
+        $consumable->image = null;
+        $consumable->created_by = null;
+
+        return view('consumables/edit')->with('item', $consumable);
     }
 }
diff --git a/app/Http/Controllers/Consumables/ConsumablesFilesController.php b/app/Http/Controllers/Consumables/ConsumablesFilesController.php
index 35a4ae841e..545b008dc0 100644
--- a/app/Http/Controllers/Consumables/ConsumablesFilesController.php
+++ b/app/Http/Controllers/Consumables/ConsumablesFilesController.php
@@ -48,7 +48,7 @@ class ConsumablesFilesController extends Controller
                 }
 
 
-                return redirect()->route('consumables.show', $consumable->id)->with('success', trans('general.file_upload_success'));
+                return redirect()->route('consumables.show', $consumable->id)->withFragment('files')->with('success', trans('general.file_upload_success'));
 
             }
 
@@ -89,7 +89,7 @@ class ConsumablesFilesController extends Controller
 
             $log->delete();
 
-            return redirect()->back()
+            return redirect()->back()->withFragment('files')
                 ->with('success', trans('admin/hardware/message.deletefile.success'));
         }
 
@@ -104,7 +104,6 @@ class ConsumablesFilesController extends Controller
      * @since [v1.4]
      * @param int $consumableId
      * @param int $fileId
-     * @return \Symfony\Consumable\HttpFoundation\Response
      * @throws \Illuminate\Auth\Access\AuthorizationException
      */
     public function show($consumableId = null, $fileId = null)
@@ -116,36 +115,18 @@ class ConsumablesFilesController extends Controller
             $this->authorize('view', $consumable);
             $this->authorize('consumables.files', $consumable);
 
-            if (! $log = Actionlog::whereNotNull('filename')->where('item_id', $consumable->id)->find($fileId)) {
-                return response('No matching record for that asset/file', 500)
-                    ->header('Content-Type', 'text/plain');
-            }
+            if ($log = Actionlog::whereNotNull('filename')->where('item_id', $consumable->id)->find($fileId)) {
+                $file = 'private_uploads/consumables/'.$log->filename;
 
-            $file = 'private_uploads/consumables/'.$log->filename;
-
-            if (Storage::missing($file)) {
-                Log::debug('FILE DOES NOT EXISTS for '.$file);
-                Log::debug('URL should be '.Storage::url($file));
-
-                return response('File '.$file.' ('.Storage::url($file).') not found on server', 404)
-                    ->header('Content-Type', 'text/plain');
-            } else {
-
-                // Display the file inline
-                if (request('inline') == 'true') {
-                    $headers = [
-                        'Content-Disposition' => 'inline',
-                    ];
-                    return Storage::download($file, $log->filename, $headers);
-                }
-
-
-                // We have to override the URL stuff here, since local defaults in Laravel's Flysystem
-                // won't work, as they're not accessible via the web
-                if (config('filesystems.default') == 'local') { // TODO - is there any way to fix this at the StorageHelper layer?
-                    return StorageHelper::downloader($file);
+                try {
+                    return StorageHelper::showOrDownloadFile($file, $log->filename);
+                } catch (\Exception $e) {
+                    return redirect()->route('consumables.show', ['consumable' => $consumable])->with('error',  trans('general.file_not_found'));
                 }
             }
+            // The log record doesn't exist somehow
+            return redirect()->route('consumables.show', ['consumable' => $consumable])->with('error',  trans('general.log_record_not_found'));
+
         }
 
         return redirect()->route('consumables.index')->with('error', trans('general.file_does_not_exist', ['id' => $fileId]));
diff --git a/app/Http/Controllers/Controller.php b/app/Http/Controllers/Controller.php
index c716fff368..74fff19a37 100644
--- a/app/Http/Controllers/Controller.php
+++ b/app/Http/Controllers/Controller.php
@@ -35,6 +35,6 @@ abstract class Controller extends BaseController
     public function __construct()
     {
         view()->share('signedIn', Auth::check());
-        view()->share('user', Auth::user());
+        view()->share('user', auth()->user());
     }
 }
diff --git a/app/Http/Controllers/CustomFieldsController.php b/app/Http/Controllers/CustomFieldsController.php
index 94b45552fd..7862719276 100644
--- a/app/Http/Controllers/CustomFieldsController.php
+++ b/app/Http/Controllers/CustomFieldsController.php
@@ -8,6 +8,8 @@ use App\Models\CustomField;
 use App\Models\CustomFieldset;
 use Illuminate\Support\Facades\Auth;
 use Illuminate\Http\Request;
+use Illuminate\Http\RedirectResponse;
+use \Illuminate\Contracts\View\View;
 
 /**
  * This controller handles all actions related to Custom Asset Fields for
@@ -25,10 +27,8 @@ class CustomFieldsController extends Controller
      *
      * @author [Brady Wetherington] [<uberbrady@gmail.com>]
      * @since [v1.8]
-     * @return \Illuminate\Support\Facades\View
-     * @throws \Illuminate\Auth\Access\AuthorizationException
      */
-    public function index()
+    public function index() : View
     {
         $this->authorize('view', CustomField::class);
 
@@ -45,10 +45,8 @@ class CustomFieldsController extends Controller
      * @see CustomFieldsController::storeField()
      * @author [A. Gianotto] [<snipe@snipe.net>]
      * @since [v5.1.5]
-     * @return \Illuminate\Http\RedirectResponse
-     * @throws \Illuminate\Auth\Access\AuthorizationException
      */
-    public function show()
+    public function show() : RedirectResponse
     {
         return redirect()->route('fields.index');
     }
@@ -60,10 +58,8 @@ class CustomFieldsController extends Controller
      * @see CustomFieldsController::storeField()
      * @author [Brady Wetherington] [<uberbrady@gmail.com>]
      * @since [v1.8]
-     * @return \Illuminate\Support\Facades\View
-     * @throws \Illuminate\Auth\Access\AuthorizationException
      */
-    public function create(Request $request)
+    public function create(Request $request) : View
     {
         $this->authorize('create', CustomField::class);
         $fieldsets = CustomFieldset::get();
@@ -82,35 +78,36 @@ class CustomFieldsController extends Controller
      * @see CustomFieldsController::createField()
      * @author [Brady Wetherington] [<uberbrady@gmail.com>]
      * @since [v1.8]
-     * @return \Illuminate\Http\RedirectResponse
-     * @throws \Illuminate\Auth\Access\AuthorizationException
      */
-    public function store(CustomFieldRequest $request)
+    public function store(CustomFieldRequest $request) : RedirectResponse
     {
         $this->authorize('create', CustomField::class);
 
-        $show_in_email = $request->get("show_in_email", 0);
-        $display_in_user_view = $request->get("display_in_user_view", 0);
+        $show_in_email = $request->input("show_in_email", 0);
+        $display_in_user_view = $request->input("display_in_user_view", 0);
 
         // Override the display settings if the field is encrypted
-        if ($request->get("field_encrypted") == '1') {
+        if ($request->input("field_encrypted") == '1') {
             $show_in_email = '0';
             $display_in_user_view = '0';
         }
-
+        
         $field = new CustomField([
-            "name" => trim($request->get("name")),
-            "element" => $request->get("element"),
-            "help_text" => $request->get("help_text"),
-            "field_values" => $request->get("field_values"),
-            "field_encrypted" => $request->get("field_encrypted", 0),
+            "name" => trim($request->input("name")),
+            "element" => $request->input("element"),
+            "help_text" => $request->input("help_text"),
+            "field_values" => $request->input("field_values"),
+            "field_encrypted" => $request->input("field_encrypted", 0),
             "show_in_email" => $show_in_email,
-            "is_unique" => $request->get("is_unique", 0),
+            "is_unique" => $request->input("is_unique", 0),
             "display_in_user_view" => $display_in_user_view,
-            "auto_add_to_fieldsets" => $request->get("auto_add_to_fieldsets", 0),
-            "show_in_listview" => $request->get("show_in_listview", 0),
-            "show_in_requestable_list" => $request->get("show_in_requestable_list", 0),
-            "user_id" => Auth::id()
+            "auto_add_to_fieldsets" => $request->input("auto_add_to_fieldsets", 0),
+            "show_in_listview" => $request->input("show_in_listview", 0),
+            "show_in_requestable_list" => $request->input("show_in_requestable_list", 0),
+            "display_checkin" => $request->input("display_checkin", 0),
+            "display_checkout" => $request->input("display_checkout", 0),
+            "display_audit" => $request->input("display_audit", 0),
+            "created_by" => auth()->id()
         ]);
 
 
@@ -144,10 +141,8 @@ class CustomFieldsController extends Controller
      *
      * @author [A. Gianotto] [<snipe@snipe.net>]
      * @since [v3.0]
-     * @return \Illuminate\Http\RedirectResponse
-     * @throws \Illuminate\Auth\Access\AuthorizationException
      */
-    public function deleteFieldFromFieldset($field_id, $fieldset_id)
+    public function deleteFieldFromFieldset($field_id, $fieldset_id) : RedirectResponse
     {
         $field = CustomField::find($field_id);
 
@@ -176,10 +171,8 @@ class CustomFieldsController extends Controller
      *
      * @author [Brady Wetherington] [<uberbrady@gmail.com>]
      * @since [v1.8]
-     * @return \Illuminate\Http\RedirectResponse
-     * @throws \Illuminate\Auth\Access\AuthorizationException
      */
-    public function destroy($field_id)
+    public function destroy($field_id) : RedirectResponse
     {
         if ($field = CustomField::find($field_id)) {
             $this->authorize('delete', $field);
@@ -202,13 +195,9 @@ class CustomFieldsController extends Controller
      * @author [A. Gianotto] [<snipe@snipe.net>]
      * @param  int $id
      * @since [v4.0]
-     * @return \Illuminate\Support\Facades\View
-     * @throws \Illuminate\Auth\Access\AuthorizationException
      */
-    public function edit(Request $request, $id)
+    public function edit(Request $request, CustomField $field) : View | RedirectResponse
     {
-        if ($field = CustomField::find($id)) {
-
         $this->authorize('update', $field);
         $fieldsets = CustomFieldset::get();
         $customFormat = '';
@@ -222,11 +211,7 @@ class CustomFieldsController extends Controller
             'fieldsets'         => $fieldsets,
             'predefinedFormats' => Helper::predefined_formats(),
         ]);
-        } 
 
-        return redirect()->route("fields.index")
-            ->with("error", trans('admin/custom_fields/message.field.invalid'));
-        
     }
 
 
@@ -241,13 +226,9 @@ class CustomFieldsController extends Controller
      * @return \Illuminate\Http\RedirectResponse
      * @throws \Illuminate\Auth\Access\AuthorizationException
      */
-    public function update(CustomFieldRequest $request, $id)
+    public function update(CustomFieldRequest $request, CustomField $field) : RedirectResponse
     {
-        $field = CustomField::find($id);
-
         $this->authorize('update', $field);
-
-
         $show_in_email = $request->get("show_in_email", 0);
         $display_in_user_view = $request->get("display_in_user_view", 0);
 
@@ -257,10 +238,10 @@ class CustomFieldsController extends Controller
             $display_in_user_view = '0';
         }
         
-        $field->name          = trim(e($request->get("name")));
-        $field->element       = e($request->get("element"));
+        $field->name          = trim($request->get("name"));
+        $field->element       = $request->get("element");
         $field->field_values  = $request->get("field_values");
-        $field->user_id       = Auth::id();
+        $field->created_by       = auth()->id();
         $field->help_text     = $request->get("help_text");
         $field->show_in_email = $show_in_email;
         $field->is_unique     = $request->get("is_unique", 0);
@@ -268,11 +249,14 @@ class CustomFieldsController extends Controller
         $field->auto_add_to_fieldsets = $request->get("auto_add_to_fieldsets", 0);
         $field->show_in_listview = $request->get("show_in_listview", 0);
         $field->show_in_requestable_list = $request->get("show_in_requestable_list", 0);
+        $field->display_checkin = $request->get("display_checkin", 0);
+        $field->display_checkout = $request->get("display_checkout", 0);
+        $field->display_audit = $request->get("display_audit", 0);
 
         if ($request->get('format') == 'CUSTOM REGEX') {
-            $field->format = e($request->get('custom_format'));
+            $field->format = $request->get('custom_format');
         } else {
-            $field->format = e($request->get('format'));
+            $field->format = $request->get('format');
         }
 
         if ($field->element == 'checkbox' || $field->element == 'radio'){
diff --git a/app/Http/Controllers/CustomFieldsetsController.php b/app/Http/Controllers/CustomFieldsetsController.php
index e4382a31ea..fde585ba6f 100644
--- a/app/Http/Controllers/CustomFieldsetsController.php
+++ b/app/Http/Controllers/CustomFieldsetsController.php
@@ -6,10 +6,9 @@ use App\Models\AssetModel;
 use App\Models\CustomField;
 use App\Models\CustomFieldset;
 use Illuminate\Http\Request;
-use Illuminate\Support\Facades\Auth;
-use Illuminate\Support\Facades\Input;
 use Illuminate\Support\Facades\Validator;
-use Redirect;
+use Illuminate\Http\RedirectResponse;
+use \Illuminate\Contracts\View\View;
 
 /**
  * This controller handles all actions related to Custom Asset Fields for
@@ -23,7 +22,7 @@ use Redirect;
 class CustomFieldsetsController extends Controller
 {
 
-    public function index() 
+    public function index() : RedirectResponse
     {
         return redirect()->route("fields.index")
         ->with("error", trans('admin/custom_fields/message.fieldset.does_not_exist'));
@@ -34,14 +33,14 @@ class CustomFieldsetsController extends Controller
      *
      * @author [Brady Wetherington] [<uberbrady@gmail.com>]
      * @param int $id
-     * @return \Illuminate\Support\Facades\View
-     * @throws \Illuminate\Auth\Access\AuthorizationException
      * @since [v1.8]
      */
-    public function show($id)
+    public function show(CustomFieldset $fieldset) : View | RedirectResponse
     {
         $cfset = CustomFieldset::with('fields')
-            ->where('id', '=', $id)->orderBy('id', 'ASC')->first();
+            ->where('id', '=', $fieldset->id)
+            ->orderBy('id', 'ASC')
+            ->first();
 
         $this->authorize('view', $cfset);
 
@@ -70,10 +69,8 @@ class CustomFieldsetsController extends Controller
      *
      * @author [Brady Wetherington] [<uberbrady@gmail.com>]
      * @since [v1.8]
-     * @return \Illuminate\Support\Facades\View
-     * @throws \Illuminate\Auth\Access\AuthorizationException
      */
-    public function create()
+    public function create() : View
     {
         $this->authorize('create', CustomField::class);
 
@@ -89,13 +86,13 @@ class CustomFieldsetsController extends Controller
      * @return \Illuminate\Http\RedirectResponse
      * @throws \Illuminate\Auth\Access\AuthorizationException
      */
-    public function store(Request $request)
+    public function store(Request $request) : RedirectResponse
     {
         $this->authorize('create', CustomField::class);
 
         $fieldset = new CustomFieldset([
                 'name' => $request->get('name'),
-                'user_id' => Auth::user()->id,
+                'created_by' => auth()->id(),
         ]);
 
         $validator = Validator::make($request->all(), $fieldset->rules);
@@ -126,19 +123,11 @@ class CustomFieldsetsController extends Controller
      * @author [A. Gianotto] [<snipe@snipe.net>]
      * @param  int  $id
      * @since [v6.0.14]
-     * @return \Illuminate\Http\RedirectResponse
-     * @throws \Illuminate\Auth\Access\AuthorizationException
      */
-    public function edit($id)
+    public function edit(CustomFieldset $fieldset) : View | RedirectResponse
     {
         $this->authorize('create', CustomField::class);
-
-        if ($fieldset = CustomFieldset::find($id)) {
-            return view('custom_fields.fieldsets.edit')->with('item', $fieldset);
-        }
-
-        return redirect()->route('fields.index')->with('error', trans('admin/custom_fields/general.fieldset_does_not_exist', ['id' => $id]));
-
+        return view('custom_fields.fieldsets.edit')->with('item', $fieldset);
     }
 
     /**
@@ -147,26 +136,19 @@ class CustomFieldsetsController extends Controller
      * @author [A. Gianotto] [<snipe@snipe.net>]
      * @param  int  $id
      * @since [v6.0.14]
-     * @return \Illuminate\Http\RedirectResponse
-     * @throws \Illuminate\Auth\Access\AuthorizationException
      */
-    public function update(Request $request, $id)
+    public function update(Request $request, CustomFieldset $fieldset) : RedirectResponse
     {
         $this->authorize('create', CustomField::class);
 
-        if ($fieldset = CustomFieldset::find($id)) {
-
-            $fieldset->name = $request->input('name');
-
-            if ($fieldset->save()) {
-                return redirect()->route('fields.index')->with('success', trans('admin/custom_fields/general.fieldset_updated'));
-            }
-
-            return redirect()->back()->withInput()->withErrors($fieldset->getErrors());
+        $fieldset->name = $request->input('name');
 
+        if ($fieldset->save()) {
+            return redirect()->route('fields.index')->with('success', trans('admin/custom_fields/general.fieldset_updated'));
         }
 
-        return redirect()->route('fields.index')->with('error', trans('admin/custom_fields/general.fieldset_does_not_exist', ['id' => $id]));
+        return redirect()->back()->withInput()->withErrors($fieldset->getErrors());
+
     }
 
     /**
@@ -175,10 +157,8 @@ class CustomFieldsetsController extends Controller
      * @author [Brady Wetherington] [<uberbrady@gmail.com>]
      * @param  int $id
      * @since [v1.8]
-     * @return View
-     * @throws \Illuminate\Auth\Access\AuthorizationException
      */
-    public function destroy($id)
+    public function destroy($id) : RedirectResponse
     {
         $fieldset = CustomFieldset::find($id);
 
@@ -203,9 +183,8 @@ class CustomFieldsetsController extends Controller
      *
      * @author [Brady Wetherington] [<uberbrady@gmail.com>]
      * @since [v1.8]
-     * @return View
      */
-    public function associate(Request $request, $id)
+    public function associate(Request $request, $id) : RedirectResponse
     {
         $set = CustomFieldset::find($id);
 
@@ -223,7 +202,7 @@ class CustomFieldsetsController extends Controller
             return redirect()->route('fieldsets.show', [$id])->with('success', trans('admin/custom_fields/message.field.create.assoc_success'));
         }
 
-        return redirect()->route('fieldsets.show', [$id])->with('error', 'No field selected.');
+        return redirect()->route('fieldsets.show', [$id])->with('error', trans('admin/custom_fields/message.field.none_selected'));
     }
 
     /**
@@ -232,7 +211,7 @@ class CustomFieldsetsController extends Controller
      * @author [A. Gianotto] [<snipe@snipe.net>]
      * @since [v5.0]
      */
-    public function makeFieldRequired($fieldset_id, $field_id)
+    public function makeFieldRequired($fieldset_id, $field_id) : RedirectResponse
     {
         $this->authorize('update', CustomField::class);
         $field = CustomField::findOrFail($field_id);
@@ -250,7 +229,7 @@ class CustomFieldsetsController extends Controller
      * @author [A. Gianotto] [<snipe@snipe.net>]
      * @since [v5.0]
      */
-    public function makeFieldOptional($fieldset_id, $field_id)
+    public function makeFieldOptional($fieldset_id, $field_id) : RedirectResponse
     {
         $this->authorize('update', CustomField::class);
         $field = CustomField::findOrFail($field_id);
diff --git a/app/Http/Controllers/DashboardController.php b/app/Http/Controllers/DashboardController.php
index 89283a7c21..a2ccb62475 100755
--- a/app/Http/Controllers/DashboardController.php
+++ b/app/Http/Controllers/DashboardController.php
@@ -2,8 +2,10 @@
 
 namespace App\Http\Controllers;
 
-use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\Artisan;
+use Illuminate\Http\RedirectResponse;
+use \Illuminate\Contracts\View\View;
+use Illuminate\Support\Facades\Session;
 
 
 /**
@@ -21,12 +23,11 @@ class DashboardController extends Controller
      *
      * @author [A. Gianotto] [<snipe@snipe.net>]
      * @since [v1.0]
-     * @return View
      */
-    public function index()
+    public function index() : View | RedirectResponse
     {
         // Show the page
-        if (Auth::user()->hasAccess('admin')) {
+        if (auth()->user()->hasAccess('admin')) {
             $asset_stats = null;
 
             $counts['asset'] = \App\Models\Asset::count();
@@ -34,16 +35,18 @@ class DashboardController extends Controller
             $counts['license'] = \App\Models\License::assetcount();
             $counts['consumable'] = \App\Models\Consumable::count();
             $counts['component'] = \App\Models\Component::count();
-            $counts['user'] = \App\Models\Company::scopeCompanyables(Auth::user())->count();
+            $counts['user'] = \App\Models\Company::scopeCompanyables(auth()->user())->count();
             $counts['grand_total'] = $counts['asset'] + $counts['accessory'] + $counts['license'] + $counts['consumable'];
 
             if ((! file_exists(storage_path().'/oauth-private.key')) || (! file_exists(storage_path().'/oauth-public.key'))) {
                 Artisan::call('migrate', ['--force' => true]);
-                \Artisan::call('passport:install');
+                Artisan::call('passport:install', ['--no-interaction' => true]);
             }
 
             return view('dashboard')->with('asset_stats', $asset_stats)->with('counts', $counts);
         } else {
+            Session::reflash();
+
             // Redirect to the profile page
             return redirect()->intended('account/view-assets');
         }
diff --git a/app/Http/Controllers/DepartmentsController.php b/app/Http/Controllers/DepartmentsController.php
index 62823098ba..f49242127e 100644
--- a/app/Http/Controllers/DepartmentsController.php
+++ b/app/Http/Controllers/DepartmentsController.php
@@ -4,8 +4,10 @@ namespace App\Http\Controllers;
 
 use App\Http\Requests\ImageUploadRequest;
 use App\Models\Department;
+use App\Models\Company;
 use Illuminate\Http\Request;
-use Illuminate\Support\Facades\Auth;
+use Illuminate\Http\RedirectResponse;
+use \Illuminate\Contracts\View\View;
 use Illuminate\Support\Facades\Storage;
 use Illuminate\Support\Facades\Log;
 
@@ -25,10 +27,8 @@ class DepartmentsController extends Controller
      * @see AssetController::getDatatable() method that generates the JSON response
      * @since [v4.0]
      * @param Request $request
-     * @return \Illuminate\Support\Facades\View
-     * @throws \Illuminate\Auth\Access\AuthorizationException
      */
-    public function index(Request $request)
+    public function index(Request $request) : View
     {
         $this->authorize('index', Department::class);
         $company = null;
@@ -45,18 +45,17 @@ class DepartmentsController extends Controller
      * @author [A. Gianotto] [<snipe@snipe.net>]
      * @since [v4.0]
      * @param ImageUploadRequest $request
-     * @return \Illuminate\Http\Response
-     * @throws \Illuminate\Auth\Access\AuthorizationException
      */
-    public function store(ImageUploadRequest $request)
+    public function store(ImageUploadRequest $request) : RedirectResponse
     {
         $this->authorize('create', Department::class);
         $department = new Department;
         $department->fill($request->all());
-        $department->user_id = Auth::user()->id;
+        $department->created_by = auth()->id();
         $department->manager_id = ($request->filled('manager_id') ? $request->input('manager_id') : null);
         $department->location_id = ($request->filled('location_id') ? $request->input('location_id') : null);
         $department->company_id = ($request->filled('company_id') ? $request->input('company_id') : null);
+        $department->notes = $request->input('notes');
         $department = $request->handleImages($department);
 
         if ($department->save()) {
@@ -73,20 +72,11 @@ class DepartmentsController extends Controller
      * @author [A. Gianotto] [<snipe@snipe.net>]
      * @param int $id
      * @since [v4.0]
-     * @return \Illuminate\Contracts\View\View
-     * @throws \Illuminate\Auth\Access\AuthorizationException
      */
-    public function show($id)
+    public function show(Department $department) : View | RedirectResponse
     {
-        $department = Department::find($id);
-
         $this->authorize('view', $department);
-
-        if (isset($department->id)) {
-            return view('departments/view', compact('department'));
-        }
-
-        return redirect()->route('departments.index')->with('error', trans('admin/departments/message.does_not_exist'));
+        return view('departments/view', compact('department'));
     }
 
     /**
@@ -95,10 +85,8 @@ class DepartmentsController extends Controller
      * @author [A. Gianotto] [<snipe@snipe.net>]
      * @see DepartmentsController::postCreate() method that validates and stores the data
      * @since [v4.0]
-     * @return \Illuminate\Contracts\View\View
-     * @throws \Illuminate\Auth\Access\AuthorizationException
      */
-    public function create()
+    public function create() : View
     {
         $this->authorize('create', Department::class);
 
@@ -111,10 +99,8 @@ class DepartmentsController extends Controller
      * @author [A. Gianotto] [<snipe@snipe.net>]
      * @param int $locationId
      * @since [v4.0]
-     * @return \Illuminate\Http\RedirectResponse
-     * @throws \Illuminate\Auth\Access\AuthorizationException
      */
-    public function destroy($id)
+    public function destroy($id) : RedirectResponse
     {
         if (is_null($department = Department::find($id))) {
             return redirect()->to(route('departments.index'))->with('error', trans('admin/departments/message.not_found'));
@@ -145,25 +131,23 @@ class DepartmentsController extends Controller
      * @see LocationsController::postCreate() method that validates and stores
      * @param int $departmentId
      * @since [v1.0]
-     * @return \Illuminate\Contracts\View\View
-     * @throws \Illuminate\Auth\Access\AuthorizationException
      */
-    public function edit($departmentId = null)
+    public function edit(Department $department) : View | RedirectResponse
     {
-        if (is_null($item = Department::find($departmentId))) {
-            return redirect()->back()->with('error', trans('admin/locations/message.does_not_exist'));
-        }
-
-        $this->authorize('update', $item);
-
-        return view('departments/edit', compact('item'));
+        $this->authorize('update', $department);
+        return view('departments/edit')->with('item', $department);
     }
 
-    public function update(ImageUploadRequest $request, $id)
+    /**
+     * Save updated Department information.
+     *
+     * @author [A. Gianotto] [<snipe@snipe.net>]
+     * @see LocationsController::postCreate() method that validates and stores
+     * @param int $departmentId
+     * @since [v1.0]
+     */
+    public function update(ImageUploadRequest $request, Department $department) : RedirectResponse
     {
-        if (is_null($department = Department::find($id))) {
-            return redirect()->route('departments.index')->with('error', trans('admin/departments/message.does_not_exist'));
-        }
 
         $this->authorize('update', $department);
 
@@ -173,7 +157,7 @@ class DepartmentsController extends Controller
         $department->company_id = ($request->filled('company_id') ? $request->input('company_id') : null);
         $department->phone = $request->input('phone');
         $department->fax = $request->input('fax');
-
+        $department->notes = $request->input('notes');
         $department = $request->handleImages($department);
 
         if ($department->save()) {
diff --git a/app/Http/Controllers/DepreciationsController.php b/app/Http/Controllers/DepreciationsController.php
index 70bfb78cb5..2c98e240b9 100755
--- a/app/Http/Controllers/DepreciationsController.php
+++ b/app/Http/Controllers/DepreciationsController.php
@@ -5,7 +5,8 @@ namespace App\Http\Controllers;
 use App\Models\Depreciation;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Auth;
-
+use Illuminate\Http\RedirectResponse;
+use \Illuminate\Contracts\View\View;
 /**
  * This controller handles all actions related to Depreciations for
  * the Snipe-IT Asset Management application.
@@ -21,14 +22,10 @@ class DepreciationsController extends Controller
      * @author [A. Gianotto] [<snipe@snipe.net]
      * @see DepreciationsController::getDatatable() method that generates the JSON response
      * @since [v1.0]
-     * @return \Illuminate\Contracts\View\View
-     * @throws \Illuminate\Auth\Access\AuthorizationException
      */
-    public function index()
+    public function index() : View
     {
         $this->authorize('view', Depreciation::class);
-
-        // Show the page
         return view('depreciations/index');
     }
 
@@ -38,10 +35,8 @@ class DepreciationsController extends Controller
      * @author [A. Gianotto] [<snipe@snipe.net]
      * @see DepreciationsController::postCreate()
      * @since [v1.0]
-     * @return \Illuminate\Contracts\View\View
-     * @throws \Illuminate\Auth\Access\AuthorizationException
      */
-    public function create()
+    public function create() : View
     {
         $this->authorize('create', Depreciation::class);
 
@@ -56,10 +51,8 @@ class DepreciationsController extends Controller
      * @see DepreciationsController::postCreate()
      * @since [v1.0]
      * @param Request $request
-     * @return \Illuminate\Http\RedirectResponse
-     * @throws \Illuminate\Auth\Access\AuthorizationException
      */
-    public function store(Request $request)
+    public function store(Request $request) : RedirectResponse
     {
         $this->authorize('create', Depreciation::class);
 
@@ -68,7 +61,21 @@ class DepreciationsController extends Controller
         // Depreciation data
         $depreciation->name = $request->input('name');
         $depreciation->months = $request->input('months');
-        $depreciation->user_id = Auth::id();
+        $depreciation->created_by = auth()->id();
+
+        $request->validate([
+            'depreciation_min' => [
+                'required',
+                'numeric',
+                function ($attribute, $value, $fail) use ($request) {
+                    if ($request->input('depreciation_type') == 'percent' && ($value < 0 || $value > 100)) {
+                        $fail(trans('validation.percent'));
+                    }
+                },
+            ],
+            'depreciation_type' => 'required|in:amount,percent',
+        ]);
+        $depreciation->depreciation_type = $request->input('depreciation_type');
         $depreciation->depreciation_min = $request->input('depreciation_min');
 
         // Was the asset created?
@@ -87,20 +94,12 @@ class DepreciationsController extends Controller
      * @see DepreciationsController::postEdit()
      * @param int $depreciationId
      * @since [v1.0]
-     * @return \Illuminate\Contracts\View\View
-     * @throws \Illuminate\Auth\Access\AuthorizationException
      */
-    public function edit($depreciationId = null)
+    public function edit(Depreciation $depreciation) : RedirectResponse | View
     {
-        // Check if the depreciation exists
-        if (is_null($item = Depreciation::find($depreciationId))) {
-            // Redirect to the blogs management page
-            return redirect()->route('depreciations.index')->with('error', trans('admin/depreciations/message.does_not_exist'));
-        }
 
-        $this->authorize('update', $item);
-
-        return view('depreciations/edit', compact('item'));
+        $this->authorize('update', $depreciation);
+        return view('depreciations/edit')->with('item', $depreciation);
     }
 
     /**
@@ -110,23 +109,28 @@ class DepreciationsController extends Controller
      * @see DepreciationsController::getEdit()
      * @param Request $request
      * @param int $depreciationId
-     * @return \Illuminate\Http\RedirectResponse
      * @since [v1.0]
-     * @throws \Illuminate\Auth\Access\AuthorizationException
      */
-    public function update(Request $request, $depreciationId = null)
+    public function update(Request $request, Depreciation $depreciation) : RedirectResponse
     {
-        // Check if the depreciation exists
-        if (is_null($depreciation = Depreciation::find($depreciationId))) {
-            // Redirect to the blogs management page
-            return redirect()->route('depreciations.index')->with('error', trans('admin/depreciations/message.does_not_exist'));
-        }
 
         $this->authorize('update', $depreciation);
-
-        // Depreciation data
         $depreciation->name             = $request->input('name');
         $depreciation->months           = $request->input('months');
+
+        $request->validate([
+            'depreciation_min' => [
+                'required',
+                'numeric',
+                function ($attribute, $value, $fail) use ($request) {
+                    if ($request->input('depreciation_type') == 'percent' && ($value < 0 || $value > 100)) {
+                        $fail(trans('validation.percent'));
+                    }
+                },
+            ],
+            'depreciation_type' => 'required|in:amount,percent',
+        ]);
+        $depreciation->depreciation_type = $request->input('depreciation_type');
         $depreciation->depreciation_min = $request->input('depreciation_min');
 
         // Was the asset created?
@@ -146,10 +150,8 @@ class DepreciationsController extends Controller
      * @author [A. Gianotto] [<snipe@snipe.net]
      * @since [v1.0]
      * @param int $depreciationId
-     * @return \Illuminate\Http\RedirectResponse
-     * @throws \Illuminate\Auth\Access\AuthorizationException
      */
-    public function destroy($depreciationId)
+    public function destroy($depreciationId) : RedirectResponse
     {
         // Check if the depreciation exists
         if (is_null($depreciation = Depreciation::withCount('models as models_count')->find($depreciationId))) {
@@ -175,18 +177,23 @@ class DepreciationsController extends Controller
      * @see DepreciationsController::postEdit()
      * @param int $depreciationId
      * @since [v1.0]
-     * @return \Illuminate\Contracts\View\View
-     * @throws \Illuminate\Auth\Access\AuthorizationException
      */
-    public function show($id)
+    public function show(Depreciation $depreciation) : View | RedirectResponse
     {
-        if (is_null($depreciation = Depreciation::find($id))) {
-            // Redirect to the blogs management page
-            return redirect()->route('depreciations.index')->with('error', trans('admin/depreciations/message.does_not_exist'));
-        }
+        $depreciation = Depreciation::withCount('assets as assets_count')
+            ->withCount('models as models_count')
+            ->withCount('licenses as licenses_count')
+            ->find($depreciation->id);
 
         $this->authorize('view', $depreciation);
 
-        return view('depreciations/view', compact('depreciation'));
+        if ($depreciation) {
+            return view('depreciations/view', compact('depreciation'));
+
+        }
+
+        return redirect()->route('depreciations.index')->with('error', trans('admin/depreciations/message.does_not_exist'));
+
+
     }
 }
diff --git a/app/Http/Controllers/GoogleAuthController.php b/app/Http/Controllers/GoogleAuthController.php
index 6f5d02fde9..d873491c5b 100644
--- a/app/Http/Controllers/GoogleAuthController.php
+++ b/app/Http/Controllers/GoogleAuthController.php
@@ -2,7 +2,7 @@
 
 namespace App\Http\Controllers;
 
-use Illuminate\Http\Request;
+use Illuminate\Http\RedirectResponse;
 use App\Models\User;
 use Illuminate\Support\Facades\Auth;
 use Laravel\Socialite\Facades\Socialite;
@@ -30,7 +30,7 @@ class GoogleAuthController extends Controller
         return Socialite::driver('google')->redirect();
     }
 
-    public function handleGoogleCallback()
+    public function handleGoogleCallback() : RedirectResponse
     {
         try {
             $socialUser = Socialite::driver('google')->user();
diff --git a/app/Http/Controllers/GroupsController.php b/app/Http/Controllers/GroupsController.php
index bfc8907524..577030390b 100755
--- a/app/Http/Controllers/GroupsController.php
+++ b/app/Http/Controllers/GroupsController.php
@@ -5,7 +5,8 @@ namespace App\Http\Controllers;
 use App\Helpers\Helper;
 use App\Models\Group;
 use Illuminate\Http\Request;
-use Illuminate\Support\Facades\Auth;
+use Illuminate\Http\RedirectResponse;
+use \Illuminate\Contracts\View\View;
 
 /**
  * This controller handles all actions related to User Groups for
@@ -22,11 +23,9 @@ class GroupsController extends Controller
      * @author [A. Gianotto] [<snipe@snipe.net]
      * @see GroupsController::getDatatable() method that generates the JSON response
      * @since [v1.0]
-     * @return \Illuminate\Contracts\View\View
      */
-    public function index()
+    public function index(): View
     {
-        // Show the page
         return view('groups/index');
     }
 
@@ -36,9 +35,8 @@ class GroupsController extends Controller
      * @author [A. Gianotto] [<snipe@snipe.net]
      * @see GroupsController::postCreate()
      * @since [v1.0]
-     * @return \Illuminate\Contracts\View\View
      */
-    public function create(Request $request)
+    public function create(Request $request) : View
     {
         $group = new Group;
         // Get all the available permissions
@@ -56,15 +54,15 @@ class GroupsController extends Controller
      * @author [A. Gianotto] [<snipe@snipe.net]
      * @see GroupsController::getCreate()
      * @since [v1.0]
-     * @return \Illuminate\Http\RedirectResponse
      */
-    public function store(Request $request)
+    public function store(Request $request) : RedirectResponse
     {
         // create a new group instance
         $group = new Group();
         $group->name = $request->input('name');
         $group->permissions = json_encode($request->input('permission'));
-        $group->created_by = Auth::user()->id;
+        $group->created_by = auth()->id();
+        $group->notes = $request->input('notes');
 
         if ($group->save()) {
             return redirect()->route('groups.index')->with('success', trans('admin/groups/message.success.create'));
@@ -80,21 +78,17 @@ class GroupsController extends Controller
      * @see GroupsController::postEdit()
      * @param int $id
      * @since [v1.0]
-     * @return \Illuminate\Contracts\View\View
      */
-    public function edit($id)
+    public function edit(Group $group) : View | RedirectResponse
     {
-        $group = Group::find($id);
+        $permissions = config('permissions');
+        $groupPermissions = $group->decodePermissions();
 
-        if ($group) {
-            $permissions = config('permissions');
-            $groupPermissions = $group->decodePermissions();
-            $selected_array = Helper::selectedPermissionsArray($permissions, $groupPermissions);
-
-            return view('groups.edit', compact('group', 'permissions', 'selected_array', 'groupPermissions'));
+        if ((!is_array($groupPermissions)) || (!$groupPermissions)) {
+            $groupPermissions = [];
         }
-
-        return redirect()->route('groups.index')->with('error', trans('admin/groups/message.group_not_found', ['id' => $id]));
+        $selected_array = Helper::selectedPermissionsArray($permissions, $groupPermissions);
+        return view('groups.edit', compact('group', 'permissions', 'selected_array', 'groupPermissions'));
     }
 
     /**
@@ -104,15 +98,12 @@ class GroupsController extends Controller
      * @see GroupsController::getEdit()
      * @param int $id
      * @since [v1.0]
-     * @return \Illuminate\Http\RedirectResponse
      */
-    public function update(Request $request, $id = null)
+    public function update(Request $request, Group $group) : RedirectResponse
     {
-        if (! $group = Group::find($id)) {
-            return redirect()->route('groups.index')->with('error', trans('admin/groups/message.group_not_found', ['id' => $id]));
-        }
         $group->name = $request->input('name');
         $group->permissions = json_encode($request->input('permission'));
+        $group->notes = $request->input('notes');
 
         if (! config('app.lock_passwords')) {
             if ($group->save()) {
@@ -132,10 +123,8 @@ class GroupsController extends Controller
      * @see GroupsController::getEdit()
      * @param int $id
      * @since [v1.0]
-     * @return \Illuminate\Http\RedirectResponse
-     * @throws \Exception
      */
-    public function destroy($id)
+    public function destroy($id) : RedirectResponse
     {
         if (! config('app.lock_passwords')) {
             if (! $group = Group::find($id)) {
@@ -154,17 +143,10 @@ class GroupsController extends Controller
      *
      * @author [A. Gianotto] [<snipe@snipe.net>]
      * @param $id
-     * @return \Illuminate\Contracts\View\View
      * @since [v4.0.11]
      */
-    public function show($id)
+    public function show(Group $group) : View | RedirectResponse
     {
-        $group = Group::find($id);
-
-        if ($group) {
-            return view('groups/view', compact('group'));
-        }
-
-        return redirect()->route('groups.index')->with('error', trans('admin/groups/message.group_not_found', ['id' => $id]));
+      return view('groups/view', compact('group'));
     }
 }
diff --git a/app/Http/Controllers/HealthController.php b/app/Http/Controllers/HealthController.php
index 456f6b6f94..dac1f17bf4 100644
--- a/app/Http/Controllers/HealthController.php
+++ b/app/Http/Controllers/HealthController.php
@@ -3,22 +3,48 @@
 namespace App\Http\Controllers;
 
 use Illuminate\Routing\Controller as BaseController;
+use Illuminate\Support\Facades\DB;
 
 /**
- * This controller provide the healthz route  for
+ * This controller provide the health route  for
  * the Snipe-IT Asset Management application.
  *
- * @version    v1.0
+ * @version   v1.0
+ *
+ * @return \Illuminate\Http\JsonResponse
+
  */
 class HealthController extends BaseController
 {
+
+    public function __construct()
+    {
+        $this->middleware('health');
+    }
+
+
     /**
      * Returns a fixed JSON content ({ "status": "ok"}) which indicate the app is up and running
      */
     public function get()
     {
-        return response()->json([
-            'status' => 'ok',
-        ]);
+        try {
+
+            if (DB::select('select 2 + 2')) {
+                return response()->json([
+                    'status' => 'ok',
+                ]);
+            }
+
+        } catch (\Exception $e) {
+            \Log::error('Could not connect to database');
+            return response()->json([
+                'status' => 'database connection failed',
+            ], 500);
+
+        }
+
+
+
     }
 }
diff --git a/app/Http/Controllers/Kits/CheckoutKitController.php b/app/Http/Controllers/Kits/CheckoutKitController.php
index d806f7d170..f34dbdc2c0 100644
--- a/app/Http/Controllers/Kits/CheckoutKitController.php
+++ b/app/Http/Controllers/Kits/CheckoutKitController.php
@@ -4,10 +4,8 @@ namespace App\Http\Controllers\Kits;
 
 use App\Http\Controllers\CheckInOutRequest;
 use App\Http\Controllers\Controller;
-use App\Models\PredefinedKit;
 use App\Models\Asset;
-use App\Models\PredefinedLicence;
-use App\Models\PredefinedModel;
+use App\Models\PredefinedKit;
 use App\Models\User;
 use App\Services\PredefinedKitCheckoutService;
 use Illuminate\Http\Request;
@@ -33,14 +31,11 @@ class CheckoutKitController extends Controller
      * Show Bulk Checkout Page
      *
      * @author [D. Minaev.] [<dmitriy.minaev.v@gmail.com>]
-     * @return View View to checkout
+     * @return \Illuminate\Contracts\View\View View to checkout
      */
-    public function showCheckout($kit_id)
+    public function showCheckout(PredefinedKit $kit)
     {
         $this->authorize('checkout', Asset::class);
-
-        $kit = PredefinedKit::findOrFail($kit_id);
-
         return view('kits/checkout')->with('kit', $kit);
     }
 
@@ -62,10 +57,10 @@ class CheckoutKitController extends Controller
 
         $checkout_result = $this->kitService->checkout($request, $kit, $user);
         if (Arr::has($checkout_result, 'errors') && count($checkout_result['errors']) > 0) {
-            return redirect()->back()->with('error', trans('general.checkout_error'))->with('error_messages', $checkout_result['errors']);
+            return redirect()->back()->with('error', trans('admin/kits/general.checkout_error'))->with('error_messages', $checkout_result['errors']);
         }
 
-        return redirect()->back()->with('success', trans('general.checkout_success'))
+        return redirect()->back()->with('success', trans('admin/kits/general.checkout_success'))
             ->with('assets', Arr::get($checkout_result, 'assets', null))
             ->with('accessories', Arr::get($checkout_result, 'accessories', null))
             ->with('consumables', Arr::get($checkout_result, 'consumables', null));
diff --git a/app/Http/Controllers/Kits/PredefinedKitsController.php b/app/Http/Controllers/Kits/PredefinedKitsController.php
index 67d148b5ee..96e4ec4b0a 100644
--- a/app/Http/Controllers/Kits/PredefinedKitsController.php
+++ b/app/Http/Controllers/Kits/PredefinedKitsController.php
@@ -55,6 +55,7 @@ class PredefinedKitsController extends Controller
         // Create a new Predefined Kit
         $kit = new PredefinedKit;
         $kit->name = $request->input('name');
+        $kit->created_by = auth()->id();
 
         if (! $kit->save()) {
             return redirect()->back()->withInput()->withErrors($kit->getErrors());
@@ -73,19 +74,17 @@ class PredefinedKitsController extends Controller
      * @author [D. Minaev] [<dmitriy.minaev.v@gmail.com>]
      * @since [v1.0]
      * @param int $kit_id
-     * @return View
+     * @return \Illuminate\Contracts\View\View
      */
-    public function edit($kit_id = null)
+    public function edit(PredefinedKit $kit)
     {
         $this->authorize('update', PredefinedKit::class);
-        if ($kit = PredefinedKit::find($kit_id)) {
+
             return view('kits/edit')
                 ->with('item', $kit)
                 ->with('models', $kit->models)
                 ->with('licenses', $kit->licenses);
-        }
 
-        return redirect()->route('kits.index')->with('error', trans('admin/kits/general.kit_none'));
     }
 
     /**
@@ -97,15 +96,9 @@ class PredefinedKitsController extends Controller
      * @param int $kit_id
      * @return \Illuminate\Http\RedirectResponse
      */
-    public function update(ImageUploadRequest $request, $kit_id = null)
+    public function update(ImageUploadRequest $request, PredefinedKit $kit)
     {
         $this->authorize('update', PredefinedKit::class);
-        // Check if the kit exists
-        if (is_null($kit = PredefinedKit::find($kit_id))) {
-            // Redirect to the kits management page
-            return redirect()->route('kits.index')->with('error', trans('admin/kits/general.kit_none'));
-        }
-
         $kit->name = $request->input('name');
 
         if ($kit->save()) {
@@ -150,11 +143,11 @@ class PredefinedKitsController extends Controller
      * @author [D. Minaev] [<dmitriy.minaev.v@gmail.com>]
      * @since [v1.0]
      * @param int $modelId
-     * @return View
+     * @return \Illuminate\Contracts\View\View
      */
-    public function show($kit_id = null)
+    public function show(PredefinedKit $kit)
     {
-        return $this->edit($kit_id);
+        return $this->edit($kit);
     }
 
     /**
@@ -162,7 +155,7 @@ class PredefinedKitsController extends Controller
      *
      * @author [D. Minaev] [<dmitriy.minaev.v@gmail.com>]
      * @param int $kit_id
-     * @return View
+     * @return \Illuminate\Contracts\View\View
      */
     public function editModel($kit_id, $model_id)
     {
@@ -184,7 +177,7 @@ class PredefinedKitsController extends Controller
      *
      * @author [D. Minaev] [<dmitriy.minaev.v@gmail.com>]
      * @param int $modelId
-     * @return View
+     * @return \Illuminate\Contracts\View\View
      */
     public function updateModel(Request $request, $kit_id, $model_id)
     {
@@ -214,7 +207,7 @@ class PredefinedKitsController extends Controller
      *
      * @author [D. Minaev] [<dmitriy.minaev.v@gmail.com>]
      * @param int $modelId
-     * @return View
+     * @return \Illuminate\Contracts\View\View
      */
     public function detachModel($kit_id, $model_id)
     {
@@ -237,7 +230,7 @@ class PredefinedKitsController extends Controller
      * @author [D. Minaev] [<dmitriy.minaev.v@gmail.com>]
      * @param int $kit_id
      * @param int $license_id
-     * @return View
+     * @return \Illuminate\Contracts\View\View
      */
     public function editLicense($kit_id, $license_id)
     {
@@ -262,7 +255,7 @@ class PredefinedKitsController extends Controller
      * @author [D. Minaev] [<dmitriy.minaev.v@gmail.com>]
      * @param int $kit_id
      * @param int $license_id
-     * @return View
+     * @return \Illuminate\Contracts\View\View
      */
     public function updateLicense(Request $request, $kit_id, $license_id)
     {
@@ -293,7 +286,7 @@ class PredefinedKitsController extends Controller
      * @author [D. Minaev] [<dmitriy.minaev.v@gmail.com>]
      * @param int $kit_id
      * @param int $license_id
-     * @return View
+     * @return \Illuminate\Contracts\View\View
      */
     public function detachLicense($kit_id, $license_id)
     {
@@ -316,7 +309,7 @@ class PredefinedKitsController extends Controller
      * @author [D. Minaev] [<dmitriy.minaev.v@gmail.com>]
      * @param int $kit_id
      * @param int $accessoryId
-     * @return View
+     * @return \Illuminate\Contracts\View\View
      */
     public function editAccessory($kit_id, $accessory_id)
     {
@@ -341,7 +334,7 @@ class PredefinedKitsController extends Controller
      * @author [D. Minaev] [<dmitriy.minaev.v@gmail.com>]
      * @param int $kit_id
      * @param int $accessory_id
-     * @return View
+     * @return \Illuminate\Contracts\View\View
      */
     public function updateAccessory(Request $request, $kit_id, $accessory_id)
     {
@@ -371,7 +364,7 @@ class PredefinedKitsController extends Controller
      *
      * @author [D. Minaev] [<dmitriy.minaev.v@gmail.com>]
      * @param int $accessory_id
-     * @return View
+     * @return \Illuminate\Contracts\View\View
      */
     public function detachAccessory($kit_id, $accessory_id)
     {
@@ -394,7 +387,7 @@ class PredefinedKitsController extends Controller
      * @author [D. Minaev] [<dmitriy.minaev.v@gmail.com>]
      * @param int $kit_id
      * @param int $consumable_id
-     * @return View
+     * @return \Illuminate\Contracts\View\View
      */
     public function editConsumable($kit_id, $consumable_id)
     {
@@ -419,7 +412,7 @@ class PredefinedKitsController extends Controller
      * @author [D. Minaev] [<dmitriy.minaev.v@gmail.com>]
      * @param int $kit_id
      * @param int $consumableId
-     * @return View
+     * @return \Illuminate\Contracts\View\View
      */
     public function updateConsumable(Request $request, $kit_id, $consumable_id)
     {
@@ -449,7 +442,7 @@ class PredefinedKitsController extends Controller
      *
      * @author [D. Minaev] [<dmitriy.minaev.v@gmail.com>]
      * @param int $consumable_id
-     * @return View
+     * @return \Illuminate\Contracts\View\View
      */
     public function detachConsumable($kit_id, $consumable_id)
     {
diff --git a/app/Http/Controllers/LabelsController.php b/app/Http/Controllers/LabelsController.php
index 1c5715b35f..ce5bf7d249 100755
--- a/app/Http/Controllers/LabelsController.php
+++ b/app/Http/Controllers/LabelsController.php
@@ -14,8 +14,6 @@ use App\Models\Setting;
 use App\Models\Supplier;
 use App\Models\User;
 use App\View\Label as LabelView;
-use Illuminate\Support\Facades\DB;
-use Illuminate\Support\Facades\Storage;
 
 class LabelsController extends Controller
 {
@@ -23,7 +21,6 @@ class LabelsController extends Controller
      * Returns the Label view with test data
      *
      * @param string $labelName
-     * @return \Illuminate\Contracts\View\View
      * @author Grant Le Roux <grant.leroux+snipe-it@gmail.com>
      */
     public function show(string $labelName)
@@ -41,6 +38,7 @@ class LabelsController extends Controller
         $exampleAsset->order_number = '12345';
         $exampleAsset->purchase_date = '2023-01-01';
         $exampleAsset->status_id = 1;
+        $exampleAsset->location_id = 1;
 
         $exampleAsset->company = new Company([
             'name' => trans('admin/labels/table.example_company'),
@@ -96,6 +94,5 @@ class LabelsController extends Controller
             ->with('bulkedit', false)
             ->with('count', 0);
 
-        return redirect()->route('home')->with('error', trans('admin/labels/message.does_not_exist'));
     }
 }
diff --git a/app/Http/Controllers/Licenses/LicenseCheckinController.php b/app/Http/Controllers/Licenses/LicenseCheckinController.php
index be71dfc4d2..72a3d43d51 100644
--- a/app/Http/Controllers/Licenses/LicenseCheckinController.php
+++ b/app/Http/Controllers/Licenses/LicenseCheckinController.php
@@ -3,6 +3,7 @@
 namespace App\Http\Controllers\Licenses;
 
 use App\Events\CheckoutableCheckedIn;
+use App\Helpers\Helper;
 use App\Http\Controllers\Controller;
 use App\Models\License;
 use App\Models\LicenseSeat;
@@ -27,16 +28,11 @@ class LicenseCheckinController extends Controller
      * @return \Illuminate\Contracts\View\View
      * @throws \Illuminate\Auth\Access\AuthorizationException
      */
-    public function create($seatId = null, $backTo = null)
+    public function create(LicenseSeat $licenseSeat, $backTo = null)
     {
         // Check if the asset exists
-        if (is_null($licenseSeat = LicenseSeat::find($seatId)) || is_null($license = License::find($licenseSeat->license_id))) {
-            // Redirect to the asset management page with error
-            return redirect()->route('licenses.index')->with('error', trans('admin/licenses/message.not_found'));
-        }
-
+        $license = License::find($licenseSeat->license_id);
         $this->authorize('checkout', $license);
-
         return view('licenses/checkin', compact('licenseSeat'))->with('backto', $backTo);
     }
 
@@ -70,7 +66,7 @@ class LicenseCheckinController extends Controller
 
         if (! $license->reassignable) {
             // Not allowed to checkin
-            Session::flash('error', 'License not reassignable.');
+            Session::flash('error', trans('admin/licenses/message.checkin.not_reassignable') . '.');
 
             return redirect()->back()->withInput();
         }
@@ -91,6 +87,7 @@ class LicenseCheckinController extends Controller
 
         if($licenseSeat->assigned_to != null){
             $return_to = User::find($licenseSeat->assigned_to);
+            session()->put('checkedInFrom', $return_to->id);
         } else {
             $return_to = Asset::find($licenseSeat->asset_id);
         }
@@ -100,15 +97,15 @@ class LicenseCheckinController extends Controller
         $licenseSeat->asset_id = null;
         $licenseSeat->notes = $request->input('notes');
 
+        session()->put(['redirect_option' => $request->get('redirect_option')]);
+
+
         // Was the asset updated?
         if ($licenseSeat->save()) {
-            event(new CheckoutableCheckedIn($licenseSeat, $return_to, Auth::user(), $request->input('notes')));
+            event(new CheckoutableCheckedIn($licenseSeat, $return_to, auth()->user(), $request->input('notes')));
 
-            if ($backTo == 'user') {
-                return redirect()->route('users.show', $return_to->id)->with('success', trans('admin/licenses/message.checkin.success'));
-            }
 
-            return redirect()->route('licenses.show', $licenseSeat->license_id)->with('success', trans('admin/licenses/message.checkin.success'));
+            return redirect()->to(Helper::getRedirectOption($request, $license->id, 'Licenses'))->with('success', trans('admin/licenses/message.checkin.success'));
         }
 
         // Redirect to the license page with error
diff --git a/app/Http/Controllers/Licenses/LicenseCheckoutController.php b/app/Http/Controllers/Licenses/LicenseCheckoutController.php
index d3887d365c..564ce97a89 100644
--- a/app/Http/Controllers/Licenses/LicenseCheckoutController.php
+++ b/app/Http/Controllers/Licenses/LicenseCheckoutController.php
@@ -3,6 +3,7 @@
 namespace App\Http\Controllers\Licenses;
 
 use App\Events\CheckoutableCheckedOut;
+use App\Helpers\Helper;
 use App\Http\Controllers\Controller;
 use App\Http\Requests\LicenseCheckoutRequest;
 use App\Models\Accessory;
@@ -27,33 +28,24 @@ class LicenseCheckoutController extends Controller
      * @return \Illuminate\Contracts\View\View
      * @throws \Illuminate\Auth\Access\AuthorizationException
      */
-    public function create($id)
+    public function create(License $license)
     {
+        $this->authorize('checkout', $license);
 
-        if ($license = License::find($id)) {
+        if ($license->category) {
 
-            $this->authorize('checkout', $license);
-
-            if ($license->category) {
-
-                // Make sure there is at least one available to checkout
-                if ($license->availCount()->count() < 1){
-                    return redirect()->route('licenses.index')->with('error', trans('admin/licenses/message.checkout.not_enough_seats'));
-                }
-
-                // Return the checkout view
-                return view('licenses/checkout', compact('license'));
+            // Make sure there is at least one available to checkout
+            if ($license->availCount()->count() < 1) {
+                return redirect()->route('licenses.index')->with('error', trans('admin/licenses/message.checkout.not_enough_seats'));
             }
 
-            // Invalid category
-            return redirect()->route('licenses.edit', ['license' => $license->id])
-                ->with('error', trans('general.invalid_item_category_single', ['type' => trans('general.license')]));
-
+            // Return the checkout view
+            return view('licenses/checkout', compact('license'));
         }
 
-        // Not found
-        return redirect()->route('licenses.index')->with('error', trans('admin/licenses/message.not_found'));
-
+        // Invalid category
+        return redirect()->route('licenses.edit', ['license' => $license->id])
+            ->with('error', trans('general.invalid_item_category_single', ['type' => trans('general.license')]));
 
     }
 
@@ -76,15 +68,32 @@ class LicenseCheckoutController extends Controller
         $this->authorize('checkout', $license);
 
         $licenseSeat = $this->findLicenseSeatToCheckout($license, $seatId);
-        $licenseSeat->user_id = Auth::id();
+        $licenseSeat->created_by = auth()->id();
         $licenseSeat->notes = $request->input('notes');
         
 
         $checkoutMethod = 'checkoutTo'.ucwords(request('checkout_to_type'));
-        if ($this->$checkoutMethod($licenseSeat)) {
-            return redirect()->route('licenses.index')->with('success', trans('admin/licenses/message.checkout.success'));
+
+        if ($request->filled('asset_id')) {
+
+            $checkoutTarget = $this->checkoutToAsset($licenseSeat);
+            $request->request->add(['assigned_asset' => $checkoutTarget->id]);
+            session()->put(['redirect_option' => $request->get('redirect_option'), 'checkout_to_type' => 'asset']);
+
+        } elseif ($request->filled('assigned_to')) {
+            $checkoutTarget = $this->checkoutToUser($licenseSeat);
+            $request->request->add(['assigned_user' => $checkoutTarget->id]);
+            session()->put(['redirect_option' => $request->get('redirect_option'), 'checkout_to_type' => 'user']);
         }
 
+
+
+        if ($checkoutTarget) {
+            return redirect()->to(Helper::getRedirectOption($request, $license->id, 'Licenses'))->with('success', trans('admin/licenses/message.checkout.success'));
+        }
+
+
+
         return redirect()->route('licenses.index')->with('error', trans('Something went wrong handling this checkout.'));
     }
 
@@ -94,14 +103,14 @@ class LicenseCheckoutController extends Controller
 
         if (! $licenseSeat) {
             if ($seatId) {
-                throw new \Illuminate\Http\Exceptions\HttpResponseException(redirect()->route('licenses.index')->with('error', 'This Seat is not available for checkout.'));
+                throw new \Illuminate\Http\Exceptions\HttpResponseException(redirect()->route('licenses.index')->with('error', trans('admin/licenses/message.checkout.unavailable')));
             }
             
-            throw new \Illuminate\Http\Exceptions\HttpResponseException(redirect()->route('licenses.index')->with('error', 'There are no available seats for this license.'));
+            throw new \Illuminate\Http\Exceptions\HttpResponseException(redirect()->route('licenses.index')->with('error', trans('admin/licenses/message.checkout.not_enough_seats')));
         }
 
         if (! $licenseSeat->license->is($license)) {
-            throw new \Illuminate\Http\Exceptions\HttpResponseException(redirect()->route('licenses.index')->with('error', 'The license seat provided does not match the license.'));
+            throw new \Illuminate\Http\Exceptions\HttpResponseException(redirect()->route('licenses.index')->with('error', trans('admin/licenses/message.checkout.mismatch')));
         }
 
         return $licenseSeat;
@@ -119,9 +128,8 @@ class LicenseCheckoutController extends Controller
             $licenseSeat->assigned_to = $target->assigned_to;
         }
         if ($licenseSeat->save()) {
-            event(new CheckoutableCheckedOut($licenseSeat, $target, Auth::user(), request('notes')));
-
-            return true;
+            event(new CheckoutableCheckedOut($licenseSeat, $target, auth()->user(), request('notes')));
+            return $target;
         }
 
         return false;
@@ -136,9 +144,8 @@ class LicenseCheckoutController extends Controller
         $licenseSeat->assigned_to = request('assigned_to');
 
         if ($licenseSeat->save()) {
-            event(new CheckoutableCheckedOut($licenseSeat, $target, Auth::user(), request('notes')));
-
-            return true;
+            event(new CheckoutableCheckedOut($licenseSeat, $target, auth()->user(), request('notes')));
+            return $target;
         }
 
         return false;
diff --git a/app/Http/Controllers/Licenses/LicenseFilesController.php b/app/Http/Controllers/Licenses/LicenseFilesController.php
index fa18e8cf48..6ab3cb7703 100644
--- a/app/Http/Controllers/Licenses/LicenseFilesController.php
+++ b/app/Http/Controllers/Licenses/LicenseFilesController.php
@@ -112,37 +112,19 @@ class LicenseFilesController extends Controller
             $this->authorize('view', $license);
             $this->authorize('licenses.files', $license);
 
-            if (! $log = Actionlog::whereNotNull('filename')->where('item_id', $license->id)->find($fileId)) {
-                return response('No matching record for that asset/file', 500)
-                    ->header('Content-Type', 'text/plain');
-            }
-
-            $file = 'private_uploads/licenses/'.$log->filename;
-
-            if (Storage::missing($file)) {
-                Log::debug('NOT EXISTS for '.$file);
-                Log::debug('NOT EXISTS URL should be '.Storage::url($file));
-
-                return response('File '.$file.' ('.Storage::url($file).') not found on server', 404)
-                    ->header('Content-Type', 'text/plain');
-            } else {
-
-                if (request('inline') == 'true') {
-
-                    $headers = [
-                        'Content-Disposition' => 'inline',
-                    ];
-
-                    return Storage::download($file, $log->filename, $headers);
-                }
-
-                // We have to override the URL stuff here, since local defaults in Laravel's Flysystem
-                // won't work, as they're not accessible via the web
-                if (config('filesystems.default') == 'local') { // TODO - is there any way to fix this at the StorageHelper layer?
-                    return StorageHelper::downloader($file);
+            if ($log = Actionlog::whereNotNull('filename')->where('item_id', $license->id)->find($fileId)) {
+                $file = 'private_uploads/licenses/'.$log->filename;
 
+                try {
+                    return StorageHelper::showOrDownloadFile($file, $log->filename);
+                } catch (\Exception $e) {
+                    return redirect()->route('licenses.show', ['licenses' => $license])->with('error',  trans('general.file_not_found'));
                 }
             }
+
+            // The log record doesn't exist somehow
+            return redirect()->route('licenses.show', ['licenses' => $license])->with('error',  trans('general.log_record_not_found'));
+
         }
 
         return redirect()->route('licenses.index')->with('error', trans('admin/licenses/message.does_not_exist', ['id' => $fileId]));
diff --git a/app/Http/Controllers/Licenses/LicensesController.php b/app/Http/Controllers/Licenses/LicensesController.php
index 01de4b4d46..ab1e3868d2 100755
--- a/app/Http/Controllers/Licenses/LicensesController.php
+++ b/app/Http/Controllers/Licenses/LicensesController.php
@@ -99,11 +99,13 @@ class LicensesController extends Controller
         $license->supplier_id       = $request->input('supplier_id');
         $license->category_id       = $request->input('category_id');
         $license->termination_date  = $request->input('termination_date');
-        $license->user_id           = Auth::id();
+        $license->created_by           = auth()->id();
         $license->min_amt           = $request->input('min_amt');
 
+        session()->put(['redirect_option' => $request->get('redirect_option')]);
+
         if ($license->save()) {
-            return redirect()->route('licenses.index')->with('success', trans('admin/licenses/message.create.success'));
+            return redirect()->to(Helper::getRedirectOption($request, $license->id, 'Licenses'))->with('success', trans('admin/licenses/message.create.success'));
         }
 
         return redirect()->back()->withInput()->withErrors($license->getErrors());
@@ -119,13 +121,10 @@ class LicensesController extends Controller
      * @return \Illuminate\Contracts\View\View
      * @throws \Illuminate\Auth\Access\AuthorizationException
      */
-    public function edit($licenseId = null)
+    public function edit(License $license)
     {
-        if (is_null($item = License::find($licenseId))) {
-            return redirect()->route('licenses.index')->with('error', trans('admin/licenses/message.does_not_exist'));
-        }
 
-        $this->authorize('update', $item);
+        $this->authorize('update', $license);
 
         $maintained_list = [
             '' => 'Maintained',
@@ -133,7 +132,8 @@ class LicensesController extends Controller
             '0' => 'No',
         ];
 
-        return view('licenses/edit', compact('item'))
+        return view('licenses/edit')
+            ->with('item', $license)
             ->with('depreciation_list', Helper::depreciationList())
             ->with('maintained_list', $maintained_list);
     }
@@ -151,11 +151,9 @@ class LicensesController extends Controller
      * @return \Illuminate\Http\RedirectResponse
      * @throws \Illuminate\Auth\Access\AuthorizationException
      */
-    public function update(Request $request, $licenseId = null)
+    public function update(Request $request, License $license)
     {
-        if (is_null($license = License::find($licenseId))) {
-            return redirect()->route('licenses.index')->with('error', trans('admin/licenses/message.does_not_exist'));
-        }
+
 
         $this->authorize('update', $license);
 
@@ -180,8 +178,10 @@ class LicensesController extends Controller
         $license->category_id       = $request->input('category_id');
         $license->min_amt           = $request->input('min_amt');
 
+        session()->put(['redirect_option' => $request->get('redirect_option')]);
+
         if ($license->save()) {
-            return redirect()->route('licenses.show', ['license' => $licenseId])->with('success', trans('admin/licenses/message.update.success'));
+            return redirect()->to(Helper::getRedirectOption($request, $license->id, 'Licenses'))->with('success', trans('admin/licenses/message.update.success'));
         }
         // If we can't adjust the number of seats, the error is flashed to the session by the event handler in License.php
         return redirect()->back()->withInput()->withErrors($license->getErrors());
@@ -197,10 +197,10 @@ class LicensesController extends Controller
      * @return \Illuminate\Http\RedirectResponse
      * @throws \Illuminate\Auth\Access\AuthorizationException
      */
-    public function destroy($licenseId)
+    public function destroy(License $license)
     {
         // Check if the license exists
-        if (is_null($license = License::find($licenseId))) {
+        if (is_null($license = License::find($license->id))) {
             // Redirect to the license management page
             return redirect()->route('licenses.index')->with('error', trans('admin/licenses/message.not_found'));
         }
@@ -234,14 +234,9 @@ class LicensesController extends Controller
      * @return \Illuminate\Contracts\View\View
      * @throws \Illuminate\Auth\Access\AuthorizationException
      */
-    public function show($licenseId = null)
+    public function show(License $license)
     {
-        $license = License::with('assignedusers')->find($licenseId);
-
-        if (!$license) {
-            return redirect()->route('licenses.index')
-            ->with('error', trans('admin/licenses/message.does_not_exist'));
-        }
+        $license = License::with('assignedusers')->find($license->id);
 
         $users_count = User::where('autoassign_licenses', '1')->count();
         $total_seats_count = $license->totalSeatsByLicenseID();
@@ -263,10 +258,10 @@ class LicensesController extends Controller
      *
      * @author [A. Gianotto] [<snipe@snipe.net>]
      * @param int $licenseId
-     * @return \Illuminate\Http\RedirectResponse
+     * @return \Illuminate\Http\RedirectResponse | \Illuminate\Contracts\View\View
      * @throws \Illuminate\Auth\Access\AuthorizationException
      */
-    public function getClone($licenseId = null)
+    public function getClone($licenseId = null) : \Illuminate\Contracts\View\View | \Illuminate\Http\RedirectResponse
     {
         if (is_null($license_to_clone = License::find($licenseId))) {
             return redirect()->route('licenses.index')->with('error', trans('admin/licenses/message.does_not_exist'));
diff --git a/app/Http/Controllers/LocationsController.php b/app/Http/Controllers/LocationsController.php
index 938c76fe12..da4e6a7e44 100755
--- a/app/Http/Controllers/LocationsController.php
+++ b/app/Http/Controllers/LocationsController.php
@@ -2,15 +2,19 @@
 
 namespace App\Http\Controllers;
 
+use App\Helpers\Helper;
 use App\Http\Requests\ImageUploadRequest;
+use App\Models\Actionlog;
 use App\Models\Asset;
+use App\Models\Company;
 use App\Models\Location;
+use App\Models\Setting;
 use App\Models\User;
-use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\Storage;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Log;
-
+use Illuminate\Http\RedirectResponse;
+use \Illuminate\Contracts\View\View;
 /**
  * This controller handles all actions related to Locations for
  * the Snipe-IT Asset Management application.
@@ -26,10 +30,8 @@ class LocationsController extends Controller
      * @author [A. Gianotto] [<snipe@snipe.net>]
      * @see LocationsController::getDatatable() method that generates the JSON response
      * @since [v1.0]
-     * @return \Illuminate\Contracts\View\View
-     * @throws \Illuminate\Auth\Access\AuthorizationException
      */
-    public function index()
+    public function index() : View
     {
         // Grab all the locations
         $this->authorize('view', Location::class);
@@ -43,10 +45,8 @@ class LocationsController extends Controller
      * @author [A. Gianotto] [<snipe@snipe.net>]
      * @see LocationsController::postCreate() method that validates and stores the data
      * @since [v1.0]
-     * @return \Illuminate\Contracts\View\View
-     * @throws \Illuminate\Auth\Access\AuthorizationException
      */
-    public function create()
+    public function create() : View
     {
         $this->authorize('create', Location::class);
 
@@ -62,12 +62,11 @@ class LocationsController extends Controller
      * @see LocationsController::getCreate() method that makes the form
      * @since [v1.0]
      * @param ImageUploadRequest $request
-     * @return \Illuminate\Http\RedirectResponse
-     * @throws \Illuminate\Auth\Access\AuthorizationException
      */
-    public function store(ImageUploadRequest $request)
+    public function store(ImageUploadRequest $request) : RedirectResponse
     {
         $this->authorize('create', Location::class);
+        
         $location = new Location();
         $location->name = $request->input('name');
         $location->parent_id = $request->input('parent_id', null);
@@ -80,9 +79,22 @@ class LocationsController extends Controller
         $location->zip = $request->input('zip');
         $location->ldap_ou = $request->input('ldap_ou');
         $location->manager_id = $request->input('manager_id');
-        $location->user_id = Auth::id();
+        $location->created_by = auth()->id();
         $location->phone = request('phone');
         $location->fax = request('fax');
+        $location->notes = $request->input('notes');
+        $location->company_id = Company::getIdForCurrentUser($request->input('company_id'));
+
+        // Only scope the location if the setting is enabled
+        if (Setting::getSettings()->scope_locations_fmcs) {
+            $location->company_id = Company::getIdForCurrentUser($request->input('company_id'));
+            // check if parent is set and has a different company
+            if ($location->parent_id && Location::find($location->parent_id)->company_id != $location->company_id) {
+                return redirect()->back()->withInput()->withInput()->with('error', 'different company than parent');
+            }                
+        } else {
+            $location->company_id = $request->input('company_id');
+        }
 
         $location = $request->handleImages($location);
 
@@ -100,18 +112,11 @@ class LocationsController extends Controller
      * @see LocationsController::postCreate() method that validates and stores
      * @param int $locationId
      * @since [v1.0]
-     * @return \Illuminate\Contracts\View\View
-     * @throws \Illuminate\Auth\Access\AuthorizationException
      */
-    public function edit($locationId = null)
+    public function edit(Location $location) : View | RedirectResponse
     {
         $this->authorize('update', Location::class);
-        // Check if the location exists
-        if (is_null($item = Location::find($locationId))) {
-            return redirect()->route('locations.index')->with('error', trans('admin/locations/message.does_not_exist'));
-        }
-
-        return view('locations/edit', compact('item'));
+        return view('locations/edit')->with('item', $location);
     }
 
     /**
@@ -121,19 +126,12 @@ class LocationsController extends Controller
      * @see LocationsController::getEdit() method that makes the form view
      * @param ImageUploadRequest $request
      * @param int $locationId
-     * @return \Illuminate\Http\RedirectResponse
-     * @throws \Illuminate\Auth\Access\AuthorizationException
      * @since [v1.0]
      */
-    public function update(ImageUploadRequest $request, $locationId = null)
+    public function update(ImageUploadRequest $request, Location $location) : RedirectResponse
     {
         $this->authorize('update', Location::class);
-        // Check if the location exists
-        if (is_null($location = Location::find($locationId))) {
-            return redirect()->route('locations.index')->with('error', trans('admin/locations/message.does_not_exist'));
-        }
 
-        // Update the location data
         $location->name = $request->input('name');
         $location->parent_id = $request->input('parent_id', null);
         $location->currency = $request->input('currency', '$');
@@ -147,6 +145,18 @@ class LocationsController extends Controller
         $location->fax = request('fax');
         $location->ldap_ou = $request->input('ldap_ou');
         $location->manager_id = $request->input('manager_id');
+        $location->notes = $request->input('notes');
+
+        // Only scope the location if the setting is enabled
+        if (Setting::getSettings()->scope_locations_fmcs) {
+            $location->company_id = Company::getIdForCurrentUser($request->input('company_id'));
+            // check if there are related objects with different company
+            if (Helper::test_locations_fmcs(false, $location->id, $location->company_id)) {
+                return redirect()->back()->withInput()->withInput()->with('error', 'error scoped locations');
+            }            
+        } else {
+            $location->company_id = $request->input('company_id');
+        }
 
         $location = $request->handleImages($location);
 
@@ -163,12 +173,11 @@ class LocationsController extends Controller
      * @author [A. Gianotto] [<snipe@snipe.net>]
      * @param int $locationId
      * @since [v1.0]
-     * @return \Illuminate\Http\RedirectResponse
-     * @throws \Illuminate\Auth\Access\AuthorizationException
      */
-    public function destroy($locationId)
+    public function destroy($locationId) : RedirectResponse
     {
         $this->authorize('delete', Location::class);
+
         if (is_null($location = Location::find($locationId))) {
             return redirect()->to(route('locations.index'))->with('error', trans('admin/locations/message.does_not_exist'));
         }
@@ -202,11 +211,18 @@ class LocationsController extends Controller
      * @author [A. Gianotto] [<snipe@snipe.net>]
      * @param int $id
      * @since [v1.0]
-     * @return \Illuminate\Contracts\View\View
      */
-    public function show($id = null)
+    public function show(Location $location) : View | RedirectResponse
     {
-        $location = Location::find($id);
+        $this->authorize('view', Location::class);
+
+        $location = Location::withCount('assignedAssets as assigned_assets_count')
+            ->withCount('assets as assets_count')
+            ->withCount('rtd_assets as rtd_assets_count')
+            ->withCount('children as children_count')
+            ->withCount('users as users_count')
+            ->withTrashed()
+            ->find($location->id);
 
         if (isset($location->id)) {
             return view('locations/view', compact('location'));
@@ -215,22 +231,26 @@ class LocationsController extends Controller
         return redirect()->route('locations.index')->with('error', trans('admin/locations/message.does_not_exist'));
     }
 
-    public function print_assigned($id)
+    public function print_assigned($id) : View | RedirectResponse
     {
+        $this->authorize('view', Location::class);
 
         if ($location = Location::where('id', $id)->first()) {
             $parent = Location::where('id', $location->parent_id)->first();
             $manager = User::where('id', $location->manager_id)->first();
+            $company = Company::where('id', $location->company_id)->first();
             $users = User::where('location_id', $id)->with('company', 'department', 'location')->get();
             $assets = Asset::where('assigned_to', $id)->where('assigned_type', Location::class)->with('model', 'model.category')->get();
-            return view('locations/print')->with('assets', $assets)->with('users', $users)->with('location', $location)->with('parent', $parent)->with('manager', $manager);
-
+            return view('locations/print')
+                ->with('assets', $assets)
+                ->with('users',$users)
+                ->with('location', $location)
+                ->with('parent', $parent)
+                ->with('manager', $manager)
+                ->with('company', $company);
         }
 
         return redirect()->route('locations.index')->with('error', trans('admin/locations/message.does_not_exist'));
-
-
-
     }
 
 
@@ -240,9 +260,8 @@ class LocationsController extends Controller
      * @author [A. Gianotto] [<snipe@snipe.net>]
      * @param int $locationId
      * @since [v6.0.14]
-     * @return \Illuminate\Contracts\View\View
      */
-    public function getClone($locationId = null)
+    public function getClone($locationId = null) : View | RedirectResponse
     {
         $this->authorize('create', Location::class);
 
@@ -263,15 +282,57 @@ class LocationsController extends Controller
     }
 
 
-    public function print_all_assigned($id)
+    /**
+     * Restore a given Asset Model (mark as un-deleted)
+     *
+     * @author [A. Gianotto] [<snipe@snipe.net>]
+     * @since [v1.0]
+     * @param int $id
+     */
+    public function postRestore($id) : RedirectResponse
     {
+        $this->authorize('create', Location::class);
+
+        if ($location = Location::withTrashed()->find($id)) {
+
+            if ($location->deleted_at == '') {
+                return redirect()->back()->with('error', trans('general.not_deleted', ['item_type' => trans('general.location')]));
+            }
+
+            if ($location->restore()) {
+                $logaction = new Actionlog();
+                $logaction->item_type = Location::class;
+                $logaction->item_id = $location->id;
+                $logaction->created_at = date('Y-m-d H:i:s');
+                $logaction->created_by = auth()->id();
+                $logaction->logaction('restore');
+
+                return redirect()->route('locations.index')->with('success', trans('admin/locations/message.restore.success'));
+            }
+
+            // Check validation
+            return redirect()->back()->with('error', trans('general.could_not_restore', ['item_type' => trans('general.location'), 'error' => $location->getErrors()->first()]));
+        }
+
+        return redirect()->back()->with('error', trans('admin/models/message.does_not_exist'));
+
+    }
+    public function print_all_assigned($id) : View | RedirectResponse
+    {
+        $this->authorize('view', Location::class);
         if ($location = Location::where('id', $id)->first()) {
             $parent = Location::where('id', $location->parent_id)->first();
             $manager = User::where('id', $location->manager_id)->first();
+            $company = Company::where('id', $location->company_id)->first();
             $users = User::where('location_id', $id)->with('company', 'department', 'location')->get();
             $assets = Asset::where('location_id', $id)->with('model', 'model.category')->get();
-            return view('locations/print')->with('assets', $assets)->with('users', $users)->with('location', $location)->with('parent', $parent)->with('manager', $manager);
-
+            return view('locations/print')
+                ->with('assets', $assets)
+                ->with('users',$users)
+                ->with('location', $location)
+                ->with('parent', $parent)
+                ->with('manager', $manager)
+                ->with('company', $company);
         }
         return redirect()->route('locations.index')->with('error', trans('admin/locations/message.does_not_exist'));
     }
@@ -282,10 +343,11 @@ class LocationsController extends Controller
      *
      * @author [A. Gianotto] [<snipe@snipe.net>]
      * @since [v6.3.1]
-     * @return \Illuminate\Contracts\View\View
      */
-    public function postBulkDelete(Request $request)
+    public function postBulkDelete(Request $request) : View | RedirectResponse
     {
+        $this->authorize('update', Location::class);
+
         $locations_raw_array = $request->input('ids');
 
         // Make sure some IDs have been selected
@@ -315,9 +377,12 @@ class LocationsController extends Controller
      *
      * @author [A. Gianotto] [<snipe@snipe.net>]
      * @since [v6.3.1]
-     * @return \Illuminate\Http\RedirectResponse
+
      */
-    public function postBulkDeleteStore(Request $request) {
+    public function postBulkDeleteStore(Request $request) : RedirectResponse
+    {
+        $this->authorize('delete', Location::class);
+
         $locations_raw_array = $request->input('ids');
 
         if ((is_array($locations_raw_array)) && (count($locations_raw_array) > 0)) {
diff --git a/app/Http/Controllers/LocationsFilesController.php b/app/Http/Controllers/LocationsFilesController.php
new file mode 100644
index 0000000000..3aaec0e089
--- /dev/null
+++ b/app/Http/Controllers/LocationsFilesController.php
@@ -0,0 +1,111 @@
+<?php
+
+namespace App\Http\Controllers;
+
+use App\Helpers\StorageHelper;
+use App\Http\Requests\UploadFileRequest;
+use App\Models\Actionlog;
+use App\Models\Location;
+use Illuminate\Http\RedirectResponse;
+use Illuminate\Http\Response;
+use Illuminate\Support\Facades\Storage;
+use \Symfony\Component\HttpFoundation\StreamedResponse;
+use Symfony\Component\HttpFoundation\BinaryFileResponse;
+
+class LocationsFilesController extends Controller
+{
+    /**
+     * Upload a file to the server.
+     *
+     * @param UploadFileRequest $request
+     * @param int $modelId
+     * @return \Illuminate\Http\RedirectResponse
+     * @throws \Illuminate\Auth\Access\AuthorizationException
+     *@since [v1.0]
+     * @author [A. Gianotto] [<snipe@snipe.net>]
+     */
+    public function store(UploadFileRequest $request, Location $location) : RedirectResponse
+    {
+        $this->authorize('update', $location);
+
+        if ($request->hasFile('file')) {
+
+            if (! Storage::exists('private_uploads/locations')) {
+                Storage::makeDirectory('private_uploads/locations', 775);
+            }
+
+            foreach ($request->file('file') as $file) {
+                $file_name = $request->handleFile('private_uploads/locations/','location-'.$location->id, $file);
+                $location->logUpload($file_name, $request->get('notes'));
+            }
+
+            return redirect()->back()->withFragment('files')->with('success', trans('general.file_upload_success'));
+        }
+
+        return redirect()->back()->withFragment('files')->with('error', trans('admin/hardware/message.upload.nofiles'));
+    }
+
+    /**
+     * Check for permissions and display the file.
+     *
+     * @author [A. Gianotto] [<snipe@snipe.net>]
+     * @param  int $modelId
+     * @param  int $fileId
+     * @since [v1.0]
+     */
+    public function show(Location $location, $fileId = null) : StreamedResponse | Response | RedirectResponse | BinaryFileResponse
+    {
+
+        $this->authorize('view', $location);
+
+        if (! $log = Actionlog::find($fileId)) {
+            return redirect()->back()->withFragment('files')->with('error', 'No matching file record');
+        }
+
+        $file = 'private_uploads/locations/'.$log->filename;
+
+        if (! Storage::exists($file)) {
+            return redirect()->back()->withFragment('files')->with('error', 'No matching file on server');
+        }
+
+        if (request('inline') == 'true') {
+
+            $headers = [
+                'Content-Disposition' => 'inline',
+            ];
+
+            return Storage::download($file, $log->filename, $headers);
+        }
+
+        return StorageHelper::downloader($file);
+    }
+
+    /**
+     * Delete the associated file
+     *
+     * @author [A. Gianotto] [<snipe@snipe.net>]
+     * @param  int $modelId
+     * @param  int $fileId
+     * @since [v1.0]
+     */
+    public function destroy(Location $location, $fileId = null) : RedirectResponse
+    {
+        $rel_path = 'private_uploads/locations';
+        $this->authorize('update', $location);
+        $log = Actionlog::find($fileId);
+
+        if ($log) {
+
+            // This should be moved to purge
+//            if (Storage::exists($rel_path.'/'.$log->filename)) {
+//                Storage::delete($rel_path.'/'.$log->filename);
+//            }
+            $log->delete();
+
+            return redirect()->back()->withFragment('files')->with('success', trans('admin/hardware/message.deletefile.success'));
+        }
+
+        return redirect()->back()->withFragment('files')->with('success', trans('admin/hardware/message.deletefile.success'));
+
+    }
+}
diff --git a/app/Http/Controllers/ManufacturersController.php b/app/Http/Controllers/ManufacturersController.php
index 833c5b6977..cdc5fc1bb8 100755
--- a/app/Http/Controllers/ManufacturersController.php
+++ b/app/Http/Controllers/ManufacturersController.php
@@ -2,17 +2,16 @@
 
 namespace App\Http\Controllers;
 
-use App\Helpers\Helper;
 use App\Http\Requests\ImageUploadRequest;
 use App\Models\Actionlog;
-use App\Models\Asset;
 use App\Models\Manufacturer;
-use App\Models\User;
 use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Artisan;
 use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\Storage;
-use Redirect;
 use Illuminate\Support\Facades\Log;
+use Illuminate\Http\RedirectResponse;
+use \Illuminate\Contracts\View\View;
 
 /**
  * This controller handles all actions related to Manufacturers for
@@ -29,14 +28,34 @@ class ManufacturersController extends Controller
      * @author [A. Gianotto] [<snipe@snipe.net>]
      * @see Api\ManufacturersController::index() method that generates the JSON response
      * @since [v1.0]
-     * @return \Illuminate\Contracts\View\View
-     * @throws \Illuminate\Auth\Access\AuthorizationException
      */
-    public function index()
+    public function index() : View
+    {
+        $this->authorize('index', Manufacturer::class);
+        $manufacturer_count = Manufacturer::withTrashed()->count();
+        return view('manufacturers/index')->with('manufacturer_count', $manufacturer_count);
+    }
+
+    /**
+     * Returns a view that invokes the ajax tables which actually contains
+     * the content for the manufacturers listing, which is generated in getDatatable.
+     *
+     * @author [A. Gianotto] [<snipe@snipe.net>]
+     * @see Api\ManufacturersController::index() method that generates the JSON response
+     * @since [v1.0]
+     */
+    public function seed() : RedirectResponse
     {
         $this->authorize('index', Manufacturer::class);
 
-        return view('manufacturers/index');
+        $manufacturers_count = Manufacturer::withTrashed()->count();
+
+        if ($manufacturers_count == 0) {
+            Artisan::call('db:seed', ['--class' => 'ManufacturerSeeder']);
+            return redirect()->route('manufacturers.index')->with('success', trans('general.seeding.manufacturers.success'));
+        }
+
+        return redirect()->route('manufacturers.index')->with('error', trans_choice('general.seeding.manufacturers.error', ['count' => $manufacturers_count]));
     }
 
     /**
@@ -45,10 +64,8 @@ class ManufacturersController extends Controller
      * @author [A. Gianotto] [<snipe@snipe.net>]
      * @see ManufacturersController::store()
      * @since [v1.0]
-     * @return \Illuminate\Contracts\View\View
-     * @throws \Illuminate\Auth\Access\AuthorizationException
      */
-    public function create()
+    public function create() : View
     {
         $this->authorize('create', Manufacturer::class);
 
@@ -62,20 +79,19 @@ class ManufacturersController extends Controller
      * @see ManufacturersController::create()
      * @since [v1.0]
      * @param ImageUploadRequest $request
-     * @return \Illuminate\Http\RedirectResponse
-     * @throws \Illuminate\Auth\Access\AuthorizationException
      */
-    public function store(ImageUploadRequest $request)
+    public function store(ImageUploadRequest $request) : RedirectResponse
     {
         $this->authorize('create', Manufacturer::class);
         $manufacturer = new Manufacturer;
         $manufacturer->name = $request->input('name');
-        $manufacturer->user_id = Auth::id();
+        $manufacturer->created_by = auth()->id();
         $manufacturer->url = $request->input('url');
         $manufacturer->support_url = $request->input('support_url');
         $manufacturer->warranty_lookup_url = $request->input('warranty_lookup_url');
         $manufacturer->support_phone = $request->input('support_phone');
         $manufacturer->support_email = $request->input('support_email');
+        $manufacturer->notes = $request->input('notes');
         $manufacturer = $request->handleImages($manufacturer);
 
         if ($manufacturer->save()) {
@@ -92,21 +108,11 @@ class ManufacturersController extends Controller
      * @see ManufacturersController::update()
      * @param int $manufacturerId
      * @since [v1.0]
-     * @return \Illuminate\Contracts\View\View
-     * @throws \Illuminate\Auth\Access\AuthorizationException
      */
-    public function edit($manufacturerId = null)
+    public function edit(Manufacturer $manufacturer) : View | RedirectResponse
     {
-        // Handles manufacturer checks and permissions.
         $this->authorize('update', Manufacturer::class);
-
-        // Check if the manufacturer exists
-        if (! $item = Manufacturer::find($manufacturerId)) {
-            return redirect()->route('manufacturers.index')->with('error', trans('admin/manufacturers/message.does_not_exist'));
-        }
-
-        // Show the page
-        return view('manufacturers/edit', compact('item'));
+        return view('manufacturers/edit')->with('item', $manufacturer);
     }
 
     /**
@@ -116,26 +122,19 @@ class ManufacturersController extends Controller
      * @see ManufacturersController::getEdit()
      * @param Request $request
      * @param int $manufacturerId
-     * @return \Illuminate\Http\RedirectResponse
      * @since [v1.0]
-     * @throws \Illuminate\Auth\Access\AuthorizationException
      */
-    public function update(ImageUploadRequest $request, $manufacturerId = null)
+    public function update(ImageUploadRequest $request, Manufacturer $manufacturer) : RedirectResponse
     {
         $this->authorize('update', Manufacturer::class);
-        // Check if the manufacturer exists
-        if (is_null($manufacturer = Manufacturer::find($manufacturerId))) {
-            // Redirect to the manufacturer  page
-            return redirect()->route('manufacturers.index')->with('error', trans('admin/manufacturers/message.does_not_exist'));
-        }
 
-        // Save the data
         $manufacturer->name = $request->input('name');
         $manufacturer->url = $request->input('url');
         $manufacturer->support_url = $request->input('support_url');
         $manufacturer->warranty_lookup_url = $request->input('warranty_lookup_url');
         $manufacturer->support_phone = $request->input('support_phone');
         $manufacturer->support_email = $request->input('support_email');
+        $manufacturer->notes = $request->input('notes');
 
         // Set the model's image property to null if the image is being deleted
         if ($request->input('image_delete') == 1) {
@@ -157,10 +156,8 @@ class ManufacturersController extends Controller
      * @author [A. Gianotto] [<snipe@snipe.net>]
      * @param int $manufacturerId
      * @since [v1.0]
-     * @return \Illuminate\Http\RedirectResponse
-     * @throws \Illuminate\Auth\Access\AuthorizationException
      */
-    public function destroy($manufacturerId)
+    public function destroy($manufacturerId) : RedirectResponse
     {
         $this->authorize('delete', Manufacturer::class);
         if (is_null($manufacturer = Manufacturer::withTrashed()->withCount('models as models_count')->find($manufacturerId))) {
@@ -197,21 +194,11 @@ class ManufacturersController extends Controller
      * @author [A. Gianotto] [<snipe@snipe.net>]
      * @param int $manufacturerId
      * @since [v1.0]
-     * @return \Illuminate\Contracts\View\View
-     * @throws \Illuminate\Auth\Access\AuthorizationException
      */
-    public function show($manufacturerId = null)
+    public function show(Manufacturer $manufacturer) : View | RedirectResponse
     {
         $this->authorize('view', Manufacturer::class);
-        $manufacturer = Manufacturer::find($manufacturerId);
-
-        if (isset($manufacturer->id)) {
-            return view('manufacturers/view', compact('manufacturer'));
-        }
-
-        $error = trans('admin/manufacturers/message.does_not_exist');
-        // Redirect to the user management page
-        return redirect()->route('manufacturers.index')->with('error', $error);
+        return view('manufacturers/view', compact('manufacturer'));
     }
 
     /**
@@ -220,10 +207,8 @@ class ManufacturersController extends Controller
      * @author [A. Gianotto] [<snipe@snipe.net>]
      * @since [v4.1.15]
      * @param int $manufacturers_id
-     * @return \Illuminate\Http\RedirectResponse
-     * @throws \Illuminate\Auth\Access\AuthorizationException
      */
-    public function restore($id)
+    public function restore($id) : RedirectResponse
     {
         $this->authorize('delete', Manufacturer::class);
 
@@ -238,7 +223,7 @@ class ManufacturersController extends Controller
                 $logaction->item_type = Manufacturer::class;
                 $logaction->item_id = $manufacturer->id;
                 $logaction->created_at = date('Y-m-d H:i:s');
-                $logaction->user_id = Auth::user()->id;
+                $logaction->created_by = auth()->id();
                 $logaction->logaction('restore');
 
                 // Redirect them to the deleted page if there are more, otherwise the section index
diff --git a/app/Http/Controllers/ModalController.php b/app/Http/Controllers/ModalController.php
index 6f6b39dd12..10b17ec8e2 100644
--- a/app/Http/Controllers/ModalController.php
+++ b/app/Http/Controllers/ModalController.php
@@ -15,7 +15,7 @@ class ModalController extends Controller
      * @version    v5.3.7-pre
      * @author [Brady Wetherington] [<uberbrady@gmail.com>]
      * @author [A. Gianotto] [<snipe@snipe.net]
-     * @return View
+     * @return \Illuminate\Contracts\View\View
      */
     public function show ($type, $itemId = null) {
 
@@ -32,7 +32,8 @@ class ModalController extends Controller
             'statuslabel',
             'supplier',
             'upload-file',
-            'user',         
+            'user',
+            'add-note',
         ];
 
 
@@ -40,10 +41,11 @@ class ModalController extends Controller
         $view = view("modals.${type}");
 
             if ($type == "statuslabel") {
-            $view->with('statuslabel_types', Helper::statusTypeList());
-        }
-        if (in_array($type, ['kit-model', 'kit-license', 'kit-consumable', 'kit-accessory'])) {
-            $view->with('kitId', $itemId);
+                $view->with('statuslabel_types', Helper::statusTypeList());
+            }
+
+            if (in_array($type, ['kit-model', 'kit-license', 'kit-consumable', 'kit-accessory'])) {
+                $view->with('kitId', $itemId);
             }
             return $view;
         }
diff --git a/app/Http/Controllers/NotesController.php b/app/Http/Controllers/NotesController.php
new file mode 100644
index 0000000000..c5de66526e
--- /dev/null
+++ b/app/Http/Controllers/NotesController.php
@@ -0,0 +1,42 @@
+<?php
+
+namespace App\Http\Controllers;
+
+use App\Models\Actionlog;
+use App\Models\Asset;
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Auth;
+use Illuminate\Validation\Rule;
+
+class NotesController extends Controller
+{
+    public function store(Request $request)
+    {
+        $this->authorize('update', Asset::class);
+
+        $validated = $request->validate([
+            'id' => 'required',
+            'note' => 'required|string|max:50000',
+            'type' => [
+                'required',
+                Rule::in(['asset']),
+            ],
+        ]);
+
+        $item = Asset::findOrFail($validated['id']);
+
+        $this->authorize('update', $item);
+
+        $logaction = new Actionlog;
+        $logaction->item_id = $item->id;
+        $logaction->item_type = get_class($item);
+        $logaction->note = $validated['note'];
+        $logaction->created_by = Auth::id();
+        $logaction->logaction('note added');
+
+        return redirect()
+            ->route('hardware.show', $validated['id'])
+            ->withFragment('history')
+            ->with('success', trans('general.note_added'));
+    }
+}
diff --git a/app/Http/Controllers/ProfileController.php b/app/Http/Controllers/ProfileController.php
index 72179161f1..bbbc46da6f 100755
--- a/app/Http/Controllers/ProfileController.php
+++ b/app/Http/Controllers/ProfileController.php
@@ -10,7 +10,8 @@ use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\Gate;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Hash;
-
+use Illuminate\Http\RedirectResponse;
+use \Illuminate\Contracts\View\View;
 /**
  * This controller handles all actions related to User Profiles for
  * the Snipe-IT Asset Management application.
@@ -24,12 +25,11 @@ class ProfileController extends Controller
      *
      * @author [A. Gianotto] [<snipe@snipe.net>]
      * @since [v1.0]
-     * @return \Illuminate\Contracts\View\View
      */
-    public function getIndex()
+    public function getIndex() : View
     {
         $this->authorize('self.profile');
-        $user = Auth::user();
+        $user = auth()->user();
         return view('account/profile', compact('user'));
     }
 
@@ -38,21 +38,22 @@ class ProfileController extends Controller
      *
      * @author [A. Gianotto] [<snipe@snipe.net>]
      * @since [v1.0]
-     * @return \Illuminate\Http\RedirectResponse
      */
-    public function postIndex(ImageUploadRequest $request)
+    public function postIndex(ImageUploadRequest $request) : RedirectResponse
     {
         $this->authorize('self.profile');
-        $user = Auth::user();
+        $user = auth()->user();
         $user->first_name = $request->input('first_name');
         $user->last_name = $request->input('last_name');
         $user->website = $request->input('website');
         $user->gravatar = $request->input('gravatar');
         $user->skin = $request->input('skin');
         $user->phone = $request->input('phone');
+        $user->enable_sounds = $request->input('enable_sounds', false);
+        $user->enable_confetti = $request->input('enable_confetti', false);
 
         if (! config('app.lock_passwords')) {
-            $user->locale = $request->input('locale', 'en-US');
+            $user->locale = $request->input('locale');
         }
 
         if ((Gate::allows('self.two_factor')) && ((Setting::getSettings()->two_factor_enabled == '1') && (! config('app.lock_passwords')))) {
@@ -84,7 +85,7 @@ class ProfileController extends Controller
      * @author [A. Gianotto] [<snipe@snipe.net>]
      * @since [v4.0]
      */
-    public function api(): \Illuminate\Contracts\View\View
+    public function api(): View
     {
         // Make sure the self.api permission has been granted
         if (!Gate::allows('self.api')) {
@@ -97,29 +98,29 @@ class ProfileController extends Controller
     /**
      * User change email page.
      *
-     * @return View
      */
-    public function password()
+    public function password() : View | RedirectResponse
     {
-        $user = Auth::user();
-        
+
+        $user = auth()->user();
+        if ($user->ldap_import=='1') {
+            return redirect()->route('account')->with('error', trans('admin/users/message.error.password_ldap'));
+        }
         return view('account/change-password', compact('user'));
     }
 
     /**
      * Users change password form processing page.
-     *
-     * @return \Illuminate\Http\RedirectResponse
      */
-    public function passwordSave(Request $request)
+    public function passwordSave(Request $request) : RedirectResponse
     {
         if (config('app.lock_passwords')) {
             return redirect()->route('account.password.index')->with('error', trans('admin/users/table.lock_passwords'));
         }
 
-        $user = Auth::user();
+        $user = auth()->user();
         if ($user->ldap_import == '1') {
-            return redirect()->route('account.password.index')->with('error', trans('admin/users/message.error.password_ldap'));
+            return redirect()->route('account')->with('error', trans('admin/users/message.error.password_ldap'));
         }
 
         $rules = [
@@ -135,7 +136,7 @@ class ProfileController extends Controller
             }
 
             // This checks to make sure that the user's password isn't the same as their username,
-            // email address, first name or last name (see https://github.com/snipe/snipe-it/issues/8661)
+            // email address, first name or last name (see https://github.com/grokability/snipe-it/issues/8661)
             // While this is handled via SaveUserRequest form request in other places, we have to do this manually
             // here because we don't have the username, etc form fields available in the profile password change
             // form.
@@ -178,9 +179,8 @@ class ProfileController extends Controller
      *
      * @author [A. Gianotto] [<snipe@snipe.net>]
      * @since [v4.0]
-     * @return View
      */
-    public function getMenuState(Request $request)
+    public function getMenuState(Request $request) : void
     {
         if ($request->input('state') == 'open') {
             $request->session()->put('menu_state', 'open');
@@ -195,18 +195,17 @@ class ProfileController extends Controller
      *
      * @author A. Gianotto
      * @since [v6.0.12]
-     * @return Illuminate\View\View
      */
-    public function printInventory()
+    public function printInventory() : View
     {
-        $show_user = Auth::user();
+        $show_users = User::where('id',auth()->user()->id)->get();
 
         return view('users/print')
-            ->with('assets', Auth::user()->assets)
-            ->with('licenses', $show_user->licenses()->get())
-            ->with('accessories', $show_user->accessories()->get())
-            ->with('consumables', $show_user->consumables()->get())
-            ->with('show_user', $show_user)
+            ->with('assets', auth()->user()->assets())
+            ->with('licenses', auth()->user()->licenses()->get())
+            ->with('accessories', auth()->user()->accessories()->get())
+            ->with('consumables', auth()->user()->consumables()->get())
+            ->with('users', $show_users)
             ->with('settings', Setting::getSettings());
     }
 
@@ -215,12 +214,11 @@ class ProfileController extends Controller
      *
      * @author A. Gianotto
      * @since [v6.0.12]
-     * @return \Illuminate\Http\RedirectResponse
      */
-    public function emailAssetList()
+    public function emailAssetList() : RedirectResponse
     {
 
-        if (!$user = User::find(Auth::user()->id)) {
+        if (!$user = User::find(auth()->id())) {
             return redirect()->back()
                 ->with('error', trans('admin/users/message.user_not_found', ['id' => $id]));
         }
@@ -228,7 +226,12 @@ class ProfileController extends Controller
             return redirect()->back()->with('error', trans('admin/users/message.user_has_no_email'));
         }
 
-        $user->notify((new CurrentInventory($user)));
+        try {
+            $user->notify((new CurrentInventory($user)));
+        } catch (\Exception $e) {
+            \Log::error($e);
+        }
+
         return redirect()->back()->with('success', trans('admin/users/general.user_notified'));
     }
 }
diff --git a/app/Http/Controllers/ReportTemplatesController.php b/app/Http/Controllers/ReportTemplatesController.php
new file mode 100644
index 0000000000..2be1da99e0
--- /dev/null
+++ b/app/Http/Controllers/ReportTemplatesController.php
@@ -0,0 +1,80 @@
+<?php
+
+namespace App\Http\Controllers;
+
+use App\Models\CustomField;
+use App\Models\ReportTemplate;
+use Illuminate\Http\RedirectResponse;
+use Illuminate\Http\Request;
+use Illuminate\Support\Arr;
+
+class ReportTemplatesController extends Controller
+{
+    public function store(Request $request): RedirectResponse
+    {
+        $this->authorize('reports.view');
+
+        // Ignore "options" rules since data does not come in under that key...
+        $validated = $request->validate(Arr::except((new ReportTemplate)->getRules(), 'options'));
+
+        $report = $request->user()->reportTemplates()->create([
+            'name' => $validated['name'],
+            'options' => $request->except(['_token', 'name']),
+        ]);
+
+        session()->flash('success', trans('admin/reports/message.create.success'));
+
+        return redirect()->route('report-templates.show', $report->id);
+    }
+
+    public function show(ReportTemplate $reportTemplate)
+    {
+        $this->authorize('reports.view');
+
+        $customfields = CustomField::get();
+        $report_templates = ReportTemplate::orderBy('name')->get();
+
+        return view('reports/custom', [
+            'customfields' => $customfields,
+            'report_templates' => $report_templates,
+            'template' => $reportTemplate,
+        ]);
+    }
+
+    public function edit(ReportTemplate $reportTemplate)
+    {
+        $this->authorize('reports.view');
+
+        return view('reports/custom', [
+            'customfields' => CustomField::get(),
+            'template' => $reportTemplate,
+        ]);
+    }
+
+    public function update(Request $request, ReportTemplate $reportTemplate): RedirectResponse
+    {
+        $this->authorize('reports.view');
+
+        // Ignore "options" rules since data does not come in under that key...
+        $validated = $request->validate(Arr::except((new ReportTemplate)->getRules(), 'options'));
+
+        $reportTemplate->update([
+            'name' => $validated['name'],
+            'options' => $request->except(['_token', 'name']),
+        ]);
+
+        session()->flash('success', trans('admin/reports/message.update.success'));
+
+        return redirect()->route('report-templates.show', $reportTemplate->id);
+    }
+
+    public function destroy(ReportTemplate $reportTemplate): RedirectResponse
+    {
+        $this->authorize('reports.view');
+
+        $reportTemplate->delete();
+
+        return redirect()->route('reports/custom')
+            ->with('success', trans('admin/reports/message.delete.success'));
+    }
+}
diff --git a/app/Http/Controllers/ReportsController.php b/app/Http/Controllers/ReportsController.php
index 67a73d0dc0..031e0bbdb5 100644
--- a/app/Http/Controllers/ReportsController.php
+++ b/app/Http/Controllers/ReportsController.php
@@ -3,28 +3,34 @@
 namespace App\Http\Controllers;
 
 use App\Helpers\Helper;
+use App\Mail\CheckoutAssetMail;
 use App\Models\Accessory;
 use App\Models\Actionlog;
 use App\Models\Asset;
+use App\Models\AssetModel;
+use App\Models\Category;
 use App\Models\AssetMaintenance;
 use App\Models\CheckoutAcceptance;
+use App\Models\Company;
 use App\Models\CustomField;
 use App\Models\Depreciation;
 use App\Models\License;
+use App\Models\ReportTemplate;
 use App\Models\Setting;
 use App\Notifications\CheckoutAssetNotification;
 use Carbon\Carbon;
-use Illuminate\Auth\Access\AuthorizationException;
+use Illuminate\Database\Eloquent\Relations\MorphTo;
 use Illuminate\Http\Request;
+use Illuminate\Http\Response;
+use Illuminate\Support\Facades\Mail;
 use Illuminate\Support\Facades\Notification;
-use Illuminate\Support\Facades\Response;
-use Illuminate\Support\Facades\View;
+use \Illuminate\Contracts\View\View;
 use League\Csv\Reader;
 use Symfony\Component\HttpFoundation\StreamedResponse;
 use League\Csv\EscapeFormula;
 use App\Http\Requests\CustomAssetReportRequest;
 use Illuminate\Support\Facades\Log;
-
+use Illuminate\Http\RedirectResponse;
 
 /**
  * This controller handles all actions related to Reports for
@@ -47,9 +53,9 @@ class ReportsController extends Controller
     *
     * @author [A. Gianotto] [<snipe@snipe.net>]
     * @since [v1.0]
-    * @return View
+    * @return \Illuminate\Contracts\View\View
     */
-    public function getAccessoryReport()
+    public function getAccessoryReport() : View
     {
         $this->authorize('reports.view');
 
@@ -65,7 +71,7 @@ class ReportsController extends Controller
     * @since [v1.0]
     * @return \Illuminate\Http\Response
     */
-    public function exportAccessoryReport()
+    public function exportAccessoryReport() : Response
     {
         $this->authorize('reports.view');
         $accessories = Accessory::orderBy('created_at', 'DESC')->get();
@@ -92,7 +98,7 @@ class ReportsController extends Controller
         }
 
         $csv = implode("\n", $rows);
-        $response = Response::make($csv, 200);
+        $response = response()->make($csv, 200);
         $response->header('Content-Type', 'text/csv');
         $response->header('Content-disposition', 'attachment;filename=report.csv');
 
@@ -104,9 +110,8 @@ class ReportsController extends Controller
     *
     * @author [A. Gianotto] [<snipe@snipe.net>]
     * @since [v1.0]
-    * @return View
     */
-    public function getDeprecationReport()
+    public function getDeprecationReport() : View
     {
         $this->authorize('reports.view');
         $depreciations = Depreciation::get();
@@ -119,9 +124,8 @@ class ReportsController extends Controller
     * @deprecated Server-side exports have been replaced by datatables export since v2.
     * @author [A. Gianotto] [<snipe@snipe.net>]
     * @since [v1.0]
-    * @return \Illuminate\Http\Response
     */
-    public function exportDeprecationReport()
+    public function exportDeprecationReport() : Response
     {
         $this->authorize('reports.view');
         // Grab all the assets
@@ -180,7 +184,7 @@ class ReportsController extends Controller
                 $currency = e(Setting::getSettings()->default_currency);
             }
 
-            $row[] = $asset->purchase_date;
+            $row[] = Helper::getFormattedDateObject($asset->purchase_date, 'date', false);
             $row[] = $currency.Helper::formatCurrencyOutput($asset->purchase_cost);
             $row[] = $currency.Helper::formatCurrencyOutput($asset->getDepreciatedValue());
             $row[] = $currency.Helper::formatCurrencyOutput(($asset->purchase_cost - $asset->getDepreciatedValue()));
@@ -197,12 +201,10 @@ class ReportsController extends Controller
      *
      * @author [A. Gianotto] [<snipe@snipe.net>]
      * @since [v4.0]
-     * @return View
      */
-    public function audit()
+    public function audit() : View
     {
         $this->authorize('reports.view');
-
         return view('reports/audit');
     }
 
@@ -212,9 +214,8 @@ class ReportsController extends Controller
     *
     * @author [A. Gianotto] [<snipe@snipe.net>]
     * @since [v1.0]
-    * @return View
     */
-    public function getActivityReport()
+    public function getActivityReport() : View
     {
         $this->authorize('reports.view');
 
@@ -226,9 +227,8 @@ class ReportsController extends Controller
      *
      * @author [A. Gianotto] [<snipe@snipe.net>]
      * @since [v5.0.7]
-     * @return \Illuminate\Http\Response
      */
-    public function postActivityReport(Request $request)
+    public function postActivityReport(Request $request) : StreamedResponse
     {
         ini_set('max_execution_time', 12000);
         $this->authorize('reports.view');
@@ -243,7 +243,7 @@ class ReportsController extends Controller
 
             $header = [
                 trans('general.date'),
-                trans('general.admin'),
+                trans('general.created_by'),
                 trans('general.action'),
                 trans('general.type'),
                 trans('general.item'),
@@ -264,9 +264,9 @@ class ReportsController extends Controller
             $executionTime = microtime(true) - $_SERVER['REQUEST_TIME_FLOAT'];
             Log::debug('Added headers: '.$executionTime);
 
-            $actionlogs = Actionlog::with('item', 'user', 'target', 'location')
+            $actionlogs = Actionlog::with('item', 'user', 'target', 'location', 'adminuser')
                 ->orderBy('created_at', 'DESC')
-                ->chunk(20, function ($actionlogs) use ($handle) {
+                ->chunk(500, function ($actionlogs) use ($handle) {
                     $executionTime = microtime(true) - $_SERVER['REQUEST_TIME_FLOAT'];
                 Log::debug('Walking results: '.$executionTime);
                 $count = 0;
@@ -291,7 +291,7 @@ class ReportsController extends Controller
 
                     $row = [
                         $actionlog->created_at,
-                        ($actionlog->admin) ? e($actionlog->admin->getFullNameAttribute()) : '',
+                        ($actionlog->adminuser) ? e($actionlog->adminuser->getFullNameAttribute()) : '',
                         $actionlog->present()->actionType(),
                         e($actionlog->itemType()),
                         ($actionlog->itemType() == 'user') ? $actionlog->filename : $item_name,
@@ -328,9 +328,8 @@ class ReportsController extends Controller
      *
      * @author [A. Gianotto] [<snipe@snipe.net>]
      * @since [v1.0]
-     * @return View
      */
-    public function getLicenseReport()
+    public function getLicenseReport() : View
     {
         $this->authorize('reports.view');
         $licenses = License::with('depreciation')->orderBy('created_at', 'DESC')
@@ -346,9 +345,8 @@ class ReportsController extends Controller
     * @deprecated Server-side exports have been replaced by datatables export since v2.
     * @author [A. Gianotto] [<snipe@snipe.net>]
     * @since [v1.0]
-    * @return \Illuminate\Http\Response
     */
-    public function exportLicenseReport()
+    public function exportLicenseReport() : Response
     {
         $this->authorize('reports.view');
         $licenses = License::orderBy('created_at', 'DESC')->get();
@@ -385,7 +383,7 @@ class ReportsController extends Controller
 
 
         $csv      = implode("\n", $rows);
-        $response = Response::make($csv, 200);
+        $response = response()->make($csv, 200);
         $response->header('Content-Type', 'text/csv');
         $response->header('Content-disposition', 'attachment;filename=report.csv');
 
@@ -398,14 +396,28 @@ class ReportsController extends Controller
     * @author [A. Gianotto] [<snipe@snipe.net>]
     * @see ReportsController::postCustomReport() method that generates the CSV
     * @since [v1.0]
-    * @return \Illuminate\Http\Response
     */
-    public function getCustomReport()
+    public function getCustomReport(Request $request) : View
     {
         $this->authorize('reports.view');
         $customfields = CustomField::get();
+        $report_templates = ReportTemplate::orderBy('name')->get();
 
-        return view('reports/custom')->with('customfields', $customfields);
+        // The view needs a template to render correctly, even if it is empty...
+        $template = new ReportTemplate;
+
+        // Set the report's input values in the cases we were redirected back
+        // with validation errors so the report is populated as expected.
+        if ($request->old()) {
+            $template->name = $request->old('name');
+            $template->options = $request->old();
+        }
+
+        return view('reports/custom', [
+            'customfields' => $customfields,
+            'report_templates' => $report_templates,
+            'template' => $template,
+        ]);
     }
 
     /**
@@ -414,9 +426,8 @@ class ReportsController extends Controller
      * @author [A. Gianotto] [<snipe@snipe.net>]
      * @see ReportsController::getCustomReport() method that generates form view
      * @since [v1.0]
-     * @return \Illuminate\Http\Response
      */
-    public function postCustom(CustomAssetReportRequest $request)
+    public function postCustom(CustomAssetReportRequest $request) : StreamedResponse
     {
         ini_set('max_execution_time', env('REPORT_TIME_LIMIT', 12000)); //12000 seconds = 200 minutes
         $this->authorize('reports.view');
@@ -474,7 +485,7 @@ class ReportsController extends Controller
                 $header[] = trans('admin/hardware/table.purchase_date');
             }
 
-            if (($request->filled('purchase_cost')) || ($request->filled('depreciation'))) {
+            if ($request->filled('purchase_cost')) {
                 $header[] = trans('admin/hardware/table.purchase_cost');
             }
 
@@ -482,6 +493,17 @@ class ReportsController extends Controller
                 $header[] = trans('admin/hardware/table.eol');
             }
 
+            if ($request->filled('warranty')) {
+                $header[] = trans('admin/hardware/form.warranty');
+                $header[] = trans('admin/hardware/form.warranty_expires');
+            }
+
+            if ($request->filled('depreciation')) {
+                $header[] = trans('admin/hardware/table.book_value');
+                $header[] = trans('admin/hardware/table.diff');
+                $header[] = trans('admin/hardware/form.fully_depreciated');
+            }
+
             if ($request->filled('order')) {
                 $header[] = trans('admin/hardware/form.order');
             }
@@ -568,17 +590,6 @@ class ReportsController extends Controller
                 $header[] = trans('general.status');
             }
 
-            if ($request->filled('warranty')) {
-                $header[] = trans('admin/hardware/form.warranty');
-                $header[] = trans('admin/hardware/form.warranty_expires');
-            }
-
-            if ($request->filled('depreciation')) {
-                $header[] = trans('admin/hardware/table.book_value');
-                $header[] = trans('admin/hardware/table.diff');
-                $header[] = trans('admin/hardware/form.fully_depreciated');
-            }
-
             if ($request->filled('checkout_date')) {
                 $header[] = trans('admin/hardware/table.checkout_date');
             }
@@ -681,15 +692,15 @@ class ReportsController extends Controller
             }
 
             if (($request->filled('created_start')) && ($request->filled('created_end'))) {
-                $created_start = \Carbon::parse($request->input('created_start'))->startOfDay();
-                $created_end = \Carbon::parse($request->input('created_end'))->endOfDay();
+                $created_start = Carbon::parse($request->input('created_start'))->startOfDay();
+                $created_end = Carbon::parse($request->input('created_end'))->endOfDay();
 
                 $assets->whereBetween('assets.created_at', [$created_start, $created_end]);
             }
 
             if (($request->filled('checkout_date_start')) && ($request->filled('checkout_date_end'))) {
-                $checkout_start = \Carbon::parse($request->input('checkout_date_start'))->startOfDay();
-                $checkout_end = \Carbon::parse($request->input('checkout_date_end',now()))->endOfDay();
+                $checkout_start = Carbon::parse($request->input('checkout_date_start'))->startOfDay();
+                $checkout_end = Carbon::parse($request->input('checkout_date_end',now()))->endOfDay();
 
                 $actionlogassets = Actionlog::where('action_type','=', 'checkout')
                                               ->where('item_type', 'LIKE', '%Asset%',)
@@ -700,9 +711,9 @@ class ReportsController extends Controller
             }
 
             if (($request->filled('checkin_date_start'))) {
-                $checkin_start = \Carbon::parse($request->input('checkin_date_start'))->startOfDay();
+                $checkin_start = Carbon::parse($request->input('checkin_date_start'))->startOfDay();
                         // use today's date is `checkin_date_end` is not provided
-                $checkin_end = \Carbon::parse($request->input('checkin_date_end', now()))->endOfDay();
+                $checkin_end = Carbon::parse($request->input('checkin_date_end', now()))->endOfDay();
 
                 $assets->whereBetween('assets.last_checkin', [$checkin_start, $checkin_end ]);
             }
@@ -712,9 +723,13 @@ class ReportsController extends Controller
                     $assets->whereBetween('assets.expected_checkin', [$request->input('expected_checkin_start'), $request->input('expected_checkin_end')]);
             }
 
+            if (($request->filled('asset_eol_date_start')) && ($request->filled('asset_eol_date_end'))) {
+                $assets->whereBetween('assets.asset_eol_date', [$request->input('asset_eol_date_start'), $request->input('asset_eol_date_end')]);
+            }
+
             if (($request->filled('last_audit_start')) && ($request->filled('last_audit_end'))) {
-                    $last_audit_start = \Carbon::parse($request->input('last_audit_start'))->startOfDay();
-                    $last_audit_end = \Carbon::parse($request->input('last_audit_end'))->endOfDay();
+                    $last_audit_start = Carbon::parse($request->input('last_audit_start'))->startOfDay();
+                    $last_audit_end = Carbon::parse($request->input('last_audit_end'))->endOfDay();
 
                     $assets->whereBetween('assets.last_audit_date', [$last_audit_start, $last_audit_end]);
             }
@@ -722,6 +737,11 @@ class ReportsController extends Controller
             if (($request->filled('next_audit_start')) && ($request->filled('next_audit_end'))) {
                 $assets->whereBetween('assets.next_audit_date', [$request->input('next_audit_start'), $request->input('next_audit_end')]);
             }
+
+            if (($request->filled('last_updated_start')) && ($request->filled('last_updated_end'))) {
+                $assets->whereBetween('assets.updated_at', [$request->input('last_updated_start'), $request->input('last_updated_end')]);
+            }
+
             if ($request->filled('exclude_archived')) {
                 $assets->notArchived();
             }
@@ -733,7 +753,7 @@ class ReportsController extends Controller
             }
 
             Log::debug($assets->toSql());
-            $assets->orderBy('assets.id', 'ASC')->chunk(20, function ($assets) use ($handle, $customfields, $request) {
+            $assets->orderBy('assets.id', 'ASC')->chunk(500, function ($assets) use ($handle, $customfields, $request) {
             
                 $executionTime = microtime(true) - $_SERVER['REQUEST_TIME_FLOAT'];
                 Log::debug('Walking results: '.$executionTime);
@@ -787,7 +807,20 @@ class ReportsController extends Controller
                     }
 
                     if ($request->filled('eol')) {
-                            $row[] = ($asset->asset_eol_date) ? $asset->asset_eol_date : '';
+                        $row[] = ($asset->purchase_date != '') ? $asset->asset_eol_date : '';
+                    }
+
+                    if ($request->filled('warranty')) {
+                        $row[] = ($asset->warranty_months) ? $asset->warranty_months : '';
+                        $row[] = $asset->present()->warranty_expires();
+                    }
+
+                    if ($request->filled('depreciation')) {
+                        $depreciation = $asset->getDepreciatedValue();
+                        $diff = ($asset->purchase_cost - $depreciation);
+                        $row[] = Helper::formatCurrencyOutput($depreciation);
+                        $row[] = Helper::formatCurrencyOutput($diff);
+                        $row[] = (($asset->depreciation) && ($asset->depreciated_date())) ? $asset->depreciated_date()->format('Y-m-d') : '';
                     }
 
                     if ($request->filled('order')) {
@@ -923,19 +956,6 @@ class ReportsController extends Controller
                         $row[] = ($asset->assetstatus) ? $asset->assetstatus->name.' ('.$asset->present()->statusMeta.')' : '';
                     }
 
-                    if ($request->filled('warranty')) {
-                        $row[] = ($asset->warranty_months) ? $asset->warranty_months : '';
-                        $row[] = $asset->present()->warranty_expires();
-                    }
-
-                    if ($request->filled('depreciation')) {
-                            $depreciation = $asset->getDepreciatedValue();
-                            $diff = ($asset->purchase_cost - $depreciation);
-                        $row[] = Helper::formatCurrencyOutput($depreciation);
-                        $row[] = Helper::formatCurrencyOutput($diff);
-                        $row[] = (($asset->depreciation) && ($asset->depreciated_date())) ? $asset->depreciated_date()->format('Y-m-d') : '';
-                    }
-
                     if ($request->filled('checkout_date')) {
                         $row[] = ($asset->last_checkout) ? $asset->last_checkout : '';
                     }
@@ -1015,11 +1035,10 @@ class ReportsController extends Controller
     /**
      * getImprovementsReport
      *
-     * @return View
      * @author  Vincent Sposato <vincent.sposato@gmail.com>
      * @version v1.0
      */
-    public function getAssetMaintenancesReport()
+    public function getAssetMaintenancesReport() : View
     {
         $this->authorize('reports.view');
 
@@ -1029,11 +1048,10 @@ class ReportsController extends Controller
     /**
      * exportImprovementsReport
      *
-     * @return \Illuminate\Http\Response
      * @author  Vincent Sposato <vincent.sposato@gmail.com>
      * @version v1.0
      */
-    public function exportAssetMaintenancesReport()
+    public function exportAssetMaintenancesReport() : Response
     {
         $this->authorize('reports.view');
         // Grab all the improvements
@@ -1068,10 +1086,10 @@ class ReportsController extends Controller
             $row[] = e($assetMaintenance->start_date);
             $row[] = e($assetMaintenance->completion_date);
             if (is_null($assetMaintenance->asset_maintenance_time)) {
-                $improvementTime = intval(Carbon::now()
-                                                 ->diffInDays(Carbon::parse($assetMaintenance->start_date)));
+                $improvementTime = (int) Carbon::now()
+                    ->diffInDays(Carbon::parse($assetMaintenance->start_date), true);
             } else {
-                $improvementTime = intval($assetMaintenance->asset_maintenance_time);
+                $improvementTime = (int) $assetMaintenance->asset_maintenance_time;
             }
             $row[]  = $improvementTime;
             $row[]  = trans('general.currency') . Helper::formatCurrencyOutput($assetMaintenance->cost);
@@ -1080,7 +1098,7 @@ class ReportsController extends Controller
 
         // spit out a csv
         $csv      = implode("\n", $rows);
-        $response = Response::make($csv, 200);
+        $response = response()->make($csv, 200);
         $response->header('Content-Type', 'text/csv');
         $response->header('Content-disposition', 'attachment;filename=report.csv');
 
@@ -1090,39 +1108,39 @@ class ReportsController extends Controller
     /**
      * getAssetAcceptanceReport
      *
-     * @return mixed
-     * @throws \Illuminate\Auth\Access\AuthorizationException
-
      * @author  Vincent Sposato <vincent.sposato@gmail.com>
      * @version v1.0
      */
-    public function getAssetAcceptanceReport($deleted = false)
+    public function getAssetAcceptanceReport($deleted = false) : View
     {
         $this->authorize('reports.view');
         $showDeleted = $deleted == 'deleted';
 
-        /**
-         * Get all assets with pending checkout acceptances
-         */
-        if($showDeleted) {
-            $acceptances = CheckoutAcceptance::pending()->where('checkoutable_type', 'App\Models\Asset')->withTrashed()->with(['assignedTo' , 'checkoutable.assignedTo', 'checkoutable.model'])->get();
-        } else {
-            $acceptances = CheckoutAcceptance::pending()->where('checkoutable_type', 'App\Models\Asset')->with(['assignedTo' => function ($query) {
-                $query->withTrashed();
-            }, 'checkoutable.assignedTo', 'checkoutable.model'])->get();
+        $query = CheckoutAcceptance::pending()
+            ->where('checkoutable_type', 'App\Models\Asset')
+            ->with([
+                'checkoutable' => function (MorphTo $query) {
+                    $query->morphWith([
+                        AssetModel::class => ['model'],
+                        Company::class => ['company'],
+                        Asset::class => ['assignedTo'],
+                    ])->with('model.category');
+                },
+                'assignedTo' => function($query){
+                         $query->withTrashed();
+                    }
+            ]);
+
+        if ($showDeleted) {
+            $query->withTrashed();
         }
 
-        $assetsForReport = $acceptances
-            ->filter(function ($acceptance) {
-                $acceptance_checkoutable_flag = false;
-                if ($acceptance->checkoutable){
-                    $acceptance_checkoutable_flag = $acceptance->checkoutable->checkedOutToUser();
-                }
-                
-                return $acceptance->checkoutable_type == 'App\Models\Asset' && $acceptance_checkoutable_flag;
-            })
-            ->map(function($acceptance) {
-                return ['assetItem' => $acceptance->checkoutable, 'acceptance' => $acceptance];
+        $assetsForReport = $query->get()
+                ->map(function ($acceptance) {
+                    return [
+                        'assetItem' => $acceptance->checkoutable,
+                        'acceptance' => $acceptance,
+                    ];
             });
 
         return view('reports/unaccepted_assets', compact('assetsForReport','showDeleted' ));
@@ -1132,11 +1150,9 @@ class ReportsController extends Controller
      * sentAssetAcceptanceReminder
      *
      * @param integer|null $acceptanceId
-     * @return \Illuminate\Http\RedirectResponse
-     * @throws \Illuminate\Auth\Access\AuthorizationException
      * @version v1.0
      */
-    public function sentAssetAcceptanceReminder(Request $request)
+    public function sentAssetAcceptanceReminder(Request $request) : RedirectResponse
     {
         $this->authorize('reports.view');
 
@@ -1162,27 +1178,15 @@ class ReportsController extends Controller
             }
             $logItem = $logItem_res[0];
         }
+        $email = $assetItem->assignedTo?->email;
+        $locale = $assetItem->assignedTo?->locale;
 
-        // Only send notification if assigned
-        if ($assetItem->assignedTo) {
-
-            if (!$assetItem->assignedTo->locale) {
-                Notification::locale(Setting::getSettings()->locale)->send(
-                    $assetItem->assignedTo,
-                    new CheckoutAssetNotification($assetItem, $assetItem->assignedTo, $logItem->user, $acceptance, $logItem->note)
-                );
-            } else {
-                Notification::send(
-                    $assetItem->assignedTo,
-                    new CheckoutAssetNotification($assetItem, $assetItem->assignedTo, $logItem->user, $acceptance, $logItem->note)
-                );
-            }
-        }
-
-        if ($assetItem->assignedTo->email == ''){
+        if (is_null($email) || $email === '') {
             return redirect()->route('reports/unaccepted_assets')->with('error', trans('general.no_email'));
         }
 
+        Mail::to($email)->send((new CheckoutAssetMail($assetItem, $assetItem->assignedTo, $logItem->user, $acceptance, $logItem->note, firstTimeSending: false))->locale($locale));
+
         return redirect()->route('reports/unaccepted_assets')->with('success', trans('admin/reports/general.reminder_sent'));
     }
 
@@ -1190,11 +1194,9 @@ class ReportsController extends Controller
      * sentAssetAcceptanceReminder
      *
      * @param integer|null $acceptanceId
-     * @return \Illuminate\Http\RedirectResponse
-     * @throws \Illuminate\Auth\Access\AuthorizationException
      * @version v1.0
      */
-    public function deleteAssetAcceptance($acceptanceId = null)
+    public function deleteAssetAcceptance($acceptanceId = null) : RedirectResponse
     {
         $this->authorize('reports.view');
 
@@ -1213,11 +1215,10 @@ class ReportsController extends Controller
     /**
      * Exports the AssetAcceptance report to CSV
      *
-     * @return \Illuminate\Http\Response
      * @author  Vincent Sposato <vincent.sposato@gmail.com>
      * @version v1.0
      */
-    public function postAssetAcceptanceReport($deleted = false)
+    public function postAssetAcceptanceReport($deleted = false) : Response
     {
         $this->authorize('reports.view');
         $showDeleted = $deleted == 'deleted';
@@ -1268,7 +1269,7 @@ class ReportsController extends Controller
 
         // spit out a csv
         $csv      = implode("\n", $rows);
-        $response = Response::make($csv, 200);
+        $response = response()->make($csv, 200);
         $response->header('Content-Type', 'text/csv');
         $response->header('Content-disposition', 'attachment;filename=report.csv');
 
@@ -1284,7 +1285,7 @@ class ReportsController extends Controller
      * @author  Vincent Sposato <vincent.sposato@gmail.com>
      * @version v1.0
      */
-    protected function getCheckedOutAssetsRequiringAcceptance($modelsInCategoriesThatRequireAcceptance)
+    protected function getCheckedOutAssetsRequiringAcceptance($modelsInCategoriesThatRequireAcceptance) : View
     {
         $this->authorize('reports.view');
         $assets = Asset::deployed()
@@ -1304,11 +1305,11 @@ class ReportsController extends Controller
      * @author  Vincent Sposato <vincent.sposato@gmail.com>
      * @version v1.0
      */
-    protected function getModelsInCategoriesThatRequireAcceptance($assetCategoriesRequiringAcceptance)
+    protected function getModelsInCategoriesThatRequireAcceptance($assetCategoriesRequiringAcceptance) : array
     {
         $this->authorize('reports.view');
 
-        return array_pluck(Model::inCategory($assetCategoriesRequiringAcceptance)
+        return array_pluck(AssetModel::inCategory($assetCategoriesRequiringAcceptance)
                                  ->select('id')
                                  ->get()
                                  ->toArray(), 'id');
@@ -1321,7 +1322,7 @@ class ReportsController extends Controller
      * @author  Vincent Sposato <vincent.sposato@gmail.com>
      * @version v1.0
      */
-    protected function getCategoriesThatRequireAcceptance()
+    protected function getCategoriesThatRequireAcceptance() : array
     {
         $this->authorize('reports.view');
 
@@ -1334,11 +1335,10 @@ class ReportsController extends Controller
     /**
      * getAssetsCheckedOutRequiringAcceptance
      *
-     * @return array
      * @author  Vincent Sposato <vincent.sposato@gmail.com>
      * @version v1.0
      */
-    protected function getAssetsCheckedOutRequiringAcceptance()
+    protected function getAssetsCheckedOutRequiringAcceptance() : array
     {
         $this->authorize('reports.view');
 
diff --git a/app/Http/Controllers/SettingsController.php b/app/Http/Controllers/SettingsController.php
old mode 100755
new mode 100644
index a3c3cab8f7..b652455a57
--- a/app/Http/Controllers/SettingsController.php
+++ b/app/Http/Controllers/SettingsController.php
@@ -7,19 +7,26 @@ use App\Helpers\StorageHelper;
 use App\Http\Requests\ImageUploadRequest;
 use App\Http\Requests\SettingsSamlRequest;
 use App\Http\Requests\SetupUserRequest;
+use App\Http\Requests\StoreLdapSettings;
+use App\Http\Requests\StoreLocalizationSettings;
+use App\Http\Requests\StoreNotificationSettings;
+use App\Http\Requests\StoreLabelSettings;
+use App\Http\Requests\StoreSecuritySettings;
 use App\Models\CustomField;
 use App\Models\Group;
+use App\Models\Labels\Label as LabelModel;
 use App\Models\Setting;
 use App\Models\Asset;
 use App\Models\User;
 use App\Notifications\FirstAdminNotification;
 use App\Notifications\MailTest;
-use Illuminate\Http\Client\HttpClientException;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\App;
 use Illuminate\Support\Facades\Storage;
 use Illuminate\Validation\Rule;
-use Redirect;
+use Illuminate\Http\RedirectResponse;
+use Illuminate\Http\JsonResponse;
+use \Illuminate\Contracts\View\View;
 use Illuminate\Support\Str;
 use Illuminate\Support\Facades\Artisan;
 use Illuminate\Support\Facades\Auth;
@@ -30,6 +37,7 @@ use Illuminate\Support\Facades\Http;
 use Illuminate\Support\Facades\Log;
 use Illuminate\Support\Facades\URL;
 use Illuminate\Support\Facades\Validator;
+use Symfony\Component\HttpFoundation\BinaryFileResponse;
 
 /**
  * This controller handles all actions related to Settings for
@@ -47,9 +55,9 @@ class SettingsController extends Controller
      *
      * @since [v3.0]
      *
-     * @return View
+     * @return \Illuminate\Contracts\View\View | \Illuminate\Http\Response
      */
-    public function getSetupIndex()
+    public function getSetupIndex() : View
     {
         $start_settings['php_version_min'] = false;
 
@@ -123,14 +131,14 @@ class SettingsController extends Controller
      * @return bool This method will return true when exceptions (such as curl exception) is thrown.
      * Check the log files to see more details about the exception.
      */
-    protected function dotEnvFileIsExposed()
+    protected function dotEnvFileIsExposed() : bool
     {
         try {
-            return Http::timeout(10)
+            return Http::withoutVerifying()->timeout(10)
                 ->accept('*/*')
                 ->get(URL::to('.env'))
                 ->successful();
-        } catch (HttpClientException $e) {
+        } catch (\Exception $e) {
             Log::debug($e->getMessage());
             return true;
         }
@@ -153,13 +161,12 @@ class SettingsController extends Controller
      * Save the first admin user from Setup.
      *
      * @author [A. Gianotto] [<snipe@snipe.net>]
-     *
      * @since [v3.0]
      *
-     * @return \Illuminate\Http\RedirectResponse
      */
-    public function postSaveFirstAdmin(SetupUserRequest $request)
+    public function postSaveFirstAdmin(SetupUserRequest $request) : RedirectResponse
     {
+
         $user = new User();
         $user->first_name = $data['first_name'] = $request->input('first_name');
         $user->last_name = $request->input('last_name');
@@ -180,12 +187,13 @@ class SettingsController extends Controller
         $settings->brand = 1;
         $settings->locale = $request->input('locale', 'en-US');
         $settings->default_currency = $request->input('default_currency', 'USD');
-        $settings->user_id = 1;
+        $settings->created_by = 1;
         $settings->email_domain = $request->input('email_domain');
         $settings->email_format = $request->input('email_format');
         $settings->next_auto_tag_base = 1;
         $settings->auto_increment_assets = $request->input('auto_increment_assets', 0);
         $settings->auto_increment_prefix = $request->input('auto_increment_prefix');
+        $settings->zerofill_count = $request->input('zerofill_count') ?: 0;
 
         if ((! $user->isValid()) || (! $settings->isValid())) {
             return redirect()->back()->withInput()->withErrors($user->getErrors())->withErrors($settings->getErrors());
@@ -214,10 +222,8 @@ class SettingsController extends Controller
      * @author [A. Gianotto] [<snipe@snipe.net>]
      *
      * @since [v3.0]
-     *
-     * @return View
      */
-    public function getSetupUser()
+    public function getSetupUser() : View
     {
         return view('setup/user')
             ->with('step', 3)
@@ -230,10 +236,8 @@ class SettingsController extends Controller
      * @author [A. Gianotto] [<snipe@snipe.net>]
      *
      * @since [v3.0]
-     *
-     * @return View
      */
-    public function getSetupDone()
+    public function getSetupDone() : View
     {
         return view('setup/done')
             ->with('step', 4)
@@ -247,15 +251,13 @@ class SettingsController extends Controller
      * @author [A. Gianotto] [<snipe@snipe.net>]
      *
      * @since [v3.0]
-     *
-     * @return View
      */
-    public function getSetupMigrate()
+    public function getSetupMigrate() : View
     {
         Artisan::call('migrate', ['--force' => true]);
         if ((! file_exists(storage_path().'/oauth-private.key')) || (! file_exists(storage_path().'/oauth-public.key'))) {
             Artisan::call('migrate', ['--path' => 'vendor/laravel/passport/database/migrations', '--force' => true]);
-            Artisan::call('passport:install');
+            Artisan::call('passport:install', ['--no-interaction' => true]);
         }
 
         return view('setup/migrate')
@@ -270,29 +272,25 @@ class SettingsController extends Controller
      * @author [A. Gianotto] [<snipe@snipe.net>]
      *
      * @since [v1.0]
-     *
-     * @return View
      */
-    public function index()
+    public function index() : View
     {
         $settings = Setting::getSettings();
 
         return view('settings/index', compact('settings'));
     }
 
+
     /**
-     * Return the admin settings page.
+     * Return a form to allow a super admin to update settings.
      *
      * @author [A. Gianotto] [<snipe@snipe.net>]
      *
      * @since [v1.0]
-     *
-     * @return View
      */
-    public function getEdit()
+    public function getSettings() : View
     {
         $setting = Setting::getSettings();
-
         return view('settings/general', compact('setting'));
     }
 
@@ -302,26 +300,9 @@ class SettingsController extends Controller
      * @author [A. Gianotto] [<snipe@snipe.net>]
      *
      * @since [v1.0]
-     *
-     * @return View
      */
-    public function getSettings()
-    {
-        $setting = Setting::getSettings();
+    public function postSettings(Request $request) : RedirectResponse
 
-        return view('settings/general', compact('setting'));
-    }
-
-    /**
-     * Return a form to allow a super admin to update settings.
-     *
-     * @author [A. Gianotto] [<snipe@snipe.net>]
-     *
-     * @since [v1.0]
-     *
-     * @return View
-     */
-    public function postSettings(Request $request)
     {
         if (is_null($setting = Setting::getSettings())) {
             return redirect()->to('admin')->with('error', trans('admin/settings/message.update.error'));
@@ -333,8 +314,25 @@ class SettingsController extends Controller
             $setting->modellist_displays = implode(',', $request->input('show_in_model_list'));
         }
 
+        $old_locations_fmcs = $setting->scope_locations_fmcs;
         $setting->full_multiple_companies_support = $request->input('full_multiple_companies_support', '0');
+        $setting->scope_locations_fmcs = $request->input('scope_locations_fmcs', '0');
+
+        // Backward compatibility for locations makes no sense without FullMultipleCompanySupport
+        if (!$setting->full_multiple_companies_support) {
+            $setting->scope_locations_fmcs = '0';
+        }
+
+        // check for inconsistencies when activating scoped locations
+        if ($old_locations_fmcs == '0' && $setting->scope_locations_fmcs == '1') {
+            $mismatched = Helper::test_locations_fmcs(false);
+            if (count($mismatched) != 0) {
+                return redirect()->back()->withInput()->with('error', trans_choice('admin/settings/message.location_scoping.mismatch', count($mismatched)).' '.trans('admin/settings/message.location_scoping.not_saved'));
+            }
+        }
+
         $setting->unique_serial = $request->input('unique_serial', '0');
+        $setting->shortcuts_enabled = $request->input('shortcuts_enabled', '0');
         $setting->show_images_in_email = $request->input('show_images_in_email', '0');
         $setting->show_archived_in_list = $request->input('show_archived_in_list', '0');
         $setting->dashboard_message = $request->input('dashboard_message');
@@ -348,12 +346,13 @@ class SettingsController extends Controller
         }
 
         $setting->default_eula_text = $request->input('default_eula_text');
-        $setting->load_remote = $request->input('load_remote', 0);
         $setting->thumbnail_max_h = $request->input('thumbnail_max_h');
         $setting->privacy_policy_link = $request->input('privacy_policy_link');
         $setting->depreciation_method = $request->input('depreciation_method');
         $setting->dash_chart_type = $request->input('dash_chart_type');
         $setting->profile_edit = $request->input('profile_edit', 0);
+        $setting->require_checkinout_notes = $request->input('require_checkinout_notes', 0);
+
 
         if ($request->input('per_page') != '') {
             $setting->per_page = $request->input('per_page');
@@ -376,10 +375,8 @@ class SettingsController extends Controller
      * @author [A. Gianotto] [<snipe@snipe.net>]
      *
      * @since [v1.0]
-     *
-     * @return View
      */
-    public function getBranding()
+    public function getBranding() : View
     {
         $setting = Setting::getSettings();
 
@@ -392,11 +389,10 @@ class SettingsController extends Controller
      * @author [A. Gianotto] [<snipe@snipe.net>]
      *
      * @since [v1.0]
-     *
-     * @return View
      */
-    public function postBranding(ImageUploadRequest $request)
+    public function postBranding(ImageUploadRequest $request) : RedirectResponse
     {
+        // Something has gone horribly wrong - no settings record exists!
         if (is_null($setting = Setting::getSettings())) {
             return redirect()->to('admin')->with('error', trans('admin/settings/message.update.error'));
         }
@@ -407,51 +403,75 @@ class SettingsController extends Controller
         $setting->version_footer = $request->input('version_footer');
         $setting->footer_text = $request->input('footer_text');
         $setting->skin = $request->input('skin');
-        $setting->allow_user_skin = $request->input('allow_user_skin');
+        $setting->allow_user_skin = $request->input('allow_user_skin', '0');
         $setting->show_url_in_emails = $request->input('show_url_in_emails', '0');
         $setting->logo_print_assets = $request->input('logo_print_assets', '0');
+        $setting->load_remote = $request->input('load_remote', 0);
 
-        // Only allow the site name and CSS to be changed if lock_passwords is false
+        // Only allow the site name, images, and CSS to be changed if lock_passwords is false
         // Because public demos make people act like dicks
 
-        if (! config('app.lock_passwords')) {
-            $request->validate(['site_name' => 'required']);
-            $setting->site_name = $request->input('site_name');
+        if (!config('app.lock_passwords')) {
+
+            if ($request->has('site_name')) {
+                $request->validate(['site_name' => 'required']);
+            }
+
+            $setting->site_name = $request->input('site_name', 'Snipe-IT');
             $setting->custom_css = $request->input('custom_css');
+
+            // Logo upload
             $setting = $request->handleImages($setting, 600, 'logo', '', 'logo');
 
-            if ('1' == $request->input('clear_logo')) {
-                Storage::disk('public')->delete($setting->logo);
+            if ($request->input('clear_logo') == '1') {
+                $setting = $request->deleteExistingImage($setting, '', 'logo');
                 $setting->logo = null;
                 $setting->brand = 1;
             }
 
-
+            // Email logo upload
             $setting = $request->handleImages($setting, 600, 'email_logo', '', 'email_logo');
-
-
-            if ('1' == $request->input('clear_email_logo')) {
-                Storage::disk('public')->delete($setting->email_logo);
+            if ($request->input('clear_email_logo') == '1') {
+                $setting = $request->deleteExistingImage($setting, '', 'email_logo');
                 $setting->email_logo = null;
-                // If they are uploading an image, validate it and upload it
             }
 
-
+             // Label logo upload
             $setting = $request->handleImages($setting, 600, 'label_logo', '', 'label_logo');
 
-            if ('1' == $request->input('clear_label_logo')) {
-                Storage::disk('public')->delete($setting->label_logo);
+            if ($request->input('clear_label_logo') == '1') {
+                $setting = $request->deleteExistingImage($setting, '', 'label_logo');
                 $setting->label_logo = null;
             }
 
+            // Acceptance PDF upload
+            $setting = $request->handleImages($setting, 600, 'acceptance_pdf_logo', '', 'acceptance_pdf_logo');
+            if ('1' == $request->input('clear_acceptance_pdf_logo')) {
+                $setting = $request->deleteExistingImage($setting, '', 'acceptance_pdf_logo');
+                $setting->acceptance_pdf_logo = null;
+            }
 
-            $setting = $request->handleImages($setting, 600, 'favicon', '', 'favicon');
-
-            // If the user wants to clear the favicon...
+            // Favicon upload
+            $setting = $request->handleImages($setting, 100, 'favicon', '', 'favicon');
             if ('1' == $request->input('clear_favicon')) {
-                Storage::disk('public')->delete($setting->favicon);
+                $setting = $request->deleteExistingImage($setting, '', 'favicon');
                 $setting->favicon = null;
             }
+
+
+            // Default avatar upload
+            $setting = $request->handleImages($setting, 500, 'default_avatar', 'avatars', 'default_avatar');
+            if ($request->input('clear_default_avatar') == '1')  {
+                // Don't delete the file, just update the field if this is the default
+                if ($setting->default_avatar!='default.png') {
+                    $setting = $request->deleteExistingImage($setting, 'avatars', 'default_avatar');
+                }
+                $setting->default_avatar = null;
+            }
+
+            if ($request->input('restore_default_avatar') == '1')  {
+                $setting->default_avatar = 'default.png';
+            }
         }
 
         if ($setting->save()) {
@@ -469,10 +489,8 @@ class SettingsController extends Controller
      * @author [A. Gianotto] [<snipe@snipe.net>]
      *
      * @since [v1.0]
-     *
-     * @return View
      */
-    public function getSecurity()
+    public function getSecurity() : View
     {
         $setting = Setting::getSettings();
 
@@ -485,10 +503,8 @@ class SettingsController extends Controller
      * @author [A. Gianotto] [<snipe@snipe.net>]
      *
      * @since [v1.0]
-     *
-     * @return View
      */
-    public function postSecurity(Request $request)
+    public function postSecurity(StoreSecuritySettings $request) : RedirectResponse
     {
         $this->validate($request, [
             'pwd_secure_complexity' => 'array',
@@ -543,10 +559,8 @@ class SettingsController extends Controller
      * @author [A. Gianotto] [<snipe@snipe.net>]
      *
      * @since [v1.0]
-     *
-     * @return View
      */
-    public function getLocalization()
+    public function getLocalization() : View
     {
         $setting = Setting::getSettings();
 
@@ -559,10 +573,8 @@ class SettingsController extends Controller
      * @author [A. Gianotto] [<snipe@snipe.net>]
      *
      * @since [v1.0]
-     *
-     * @return View
      */
-    public function postLocalization(Request $request)
+    public function postLocalization(StoreLocalizationSettings $request) : RedirectResponse
     {
         if (is_null($setting = Setting::getSettings())) {
             return redirect()->to('admin')->with('error', trans('admin/settings/message.update.error'));
@@ -591,10 +603,8 @@ class SettingsController extends Controller
      * @author [A. Gianotto] [<snipe@snipe.net>]
      *
      * @since [v1.0]
-     *
-     * @return View
      */
-    public function getAlerts()
+    public function getAlerts() : View
     {
         $setting = Setting::getSettings();
 
@@ -605,12 +615,9 @@ class SettingsController extends Controller
      * Return a form to allow a super admin to update settings.
      *
      * @author [A. Gianotto] [<snipe@snipe.net>]
-     *
      * @since [v1.0]
-     *
-     * @return View
      */
-    public function postAlerts(Request $request)
+    public function postAlerts(StoreNotificationSettings $request) : RedirectResponse
     {
         if (is_null($setting = Setting::getSettings())) {
             return redirect()->to('admin')->with('error', trans('admin/settings/message.update.error'));
@@ -643,11 +650,13 @@ class SettingsController extends Controller
 
         $setting->alert_email = $alert_email;
         $setting->admin_cc_email = $admin_cc_email;
+        $setting->admin_cc_always = $request->validated('admin_cc_always');
         $setting->alerts_enabled = $request->input('alerts_enabled', '0');
         $setting->alert_interval = $request->input('alert_interval');
         $setting->alert_threshold = $request->input('alert_threshold');
         $setting->audit_interval = $request->input('audit_interval');
         $setting->audit_warning_days = $request->input('audit_warning_days');
+        $setting->due_checkin_days = $request->input('due_checkin_days');
         $setting->show_alerts_in_menu = $request->input('show_alerts_in_menu', '0');
 
         if ($setting->save()) {
@@ -664,10 +673,8 @@ class SettingsController extends Controller
      * @author [A. Gianotto] [<snipe@snipe.net>]
      *
      * @since [v1.0]
-     *
-     * @return View
      */
-    public function getSlack()
+    public function getSlack() : View
     {
         $setting = Setting::getSettings();
 
@@ -680,10 +687,8 @@ class SettingsController extends Controller
      * @author [A. Gianotto] [<snipe@snipe.net>]
      *
      * @since [v1.0]
-     *
-     * @return View
      */
-    public function getAssetTags()
+    public function getAssetTags() : View
     {
         $setting = Setting::getSettings();
 
@@ -696,10 +701,8 @@ class SettingsController extends Controller
      * @author [A. Gianotto] [<snipe@snipe.net>]
      *
      * @since [v1.0]
-     *
-     * @return View
      */
-    public function postAssetTags(Request $request)
+    public function postAssetTags(Request $request) : RedirectResponse
     {
         if (is_null($setting = Setting::getSettings())) {
             return redirect()->to('admin')->with('error', trans('admin/settings/message.update.error'));
@@ -718,62 +721,14 @@ class SettingsController extends Controller
         return redirect()->back()->withInput()->withErrors($setting->getErrors());
     }
 
-    /**
-     * Return a form to allow a super admin to update settings.
-     *
-     * @author [A. Gianotto] [<snipe@snipe.net>]
-     *
-     * @since [v1.0]
-     *
-     * @return View
-     */
-    public function getBarcodes()
-    {
-        $setting = Setting::getSettings();
-        $is_gd_installed = extension_loaded('gd');
-
-        return view('settings.barcodes', compact('setting'))->with('is_gd_installed', $is_gd_installed);
-    }
-
-    /**
-     * Saves settings from form.
-     *
-     * @author [A. Gianotto] [<snipe@snipe.net>]
-     *
-     * @since [v1.0]
-     *
-     * @return View
-     */
-    public function postBarcodes(Request $request)
-    {
-        if (is_null($setting = Setting::getSettings())) {
-            return redirect()->to('admin')->with('error', trans('admin/settings/message.update.error'));
-        }
-
-        $setting->qr_code = $request->input('qr_code', '0');
-        $setting->alt_barcode = $request->input('alt_barcode');
-        $setting->alt_barcode_enabled = $request->input('alt_barcode_enabled', '0');
-        $setting->barcode_type = $request->input('barcode_type');
-        $setting->qr_text = $request->input('qr_text');
-
-        if ($setting->save()) {
-            return redirect()->route('settings.index')
-                ->with('success', trans('admin/settings/message.update.success'));
-        }
-
-        return redirect()->back()->withInput()->withErrors($setting->getErrors());
-    }
-
     /**
      * Return a form to allow a super admin to update settings.
      *
      * @author [A. Gianotto] [<snipe@snipe.net>]
      *
      * @since [v4.0]
-     *
-     * @return View
      */
-    public function getPhpInfo()
+    public function getPhpInfo() : View | RedirectResponse
     {
         if (config('app.debug') === true) {
             return view('settings.phpinfo');
@@ -787,15 +742,15 @@ class SettingsController extends Controller
      * Return a form to allow a super admin to update settings.
      *
      * @author [A. Gianotto] [<snipe@snipe.net>]
-     *
      * @since [v4.0]
-     *
-     * @return View
      */
-    public function getLabels()
+    public function getLabels() : View
     {
+        $is_gd_installed = extension_loaded('gd');
+
         return view('settings.labels')
             ->with('setting', Setting::getSettings())
+            ->with('is_gd_installed', $is_gd_installed)
             ->with('customFields', CustomField::where('field_encrypted', '=', 0)->get());
     }
 
@@ -803,12 +758,9 @@ class SettingsController extends Controller
      * Saves settings from form.
      *
      * @author [A. Gianotto] [<snipe@snipe.net>]
-     *
      * @since [v4.0]
-     *
-     * @return View
      */
-    public function postLabels(Request $request)
+    public function postLabels(StoreLabelSettings $request) : RedirectResponse
     {
         if (is_null($setting = Setting::getSettings())) {
             return redirect()->to('admin')->with('error', trans('admin/settings/message.update.error'));
@@ -821,6 +773,7 @@ class SettingsController extends Controller
         $setting->label2_2d_type = $request->input('label2_2d_type');
         $setting->label2_2d_target = $request->input('label2_2d_target');
         $setting->label2_fields = $request->input('label2_fields');
+        $setting->label2_empty_row_count = $request->input('label2_empty_row_count');
         $setting->labels_per_page = $request->input('labels_per_page');
         $setting->labels_width = $request->input('labels_width');
         $setting->labels_height = $request->input('labels_height');
@@ -834,9 +787,13 @@ class SettingsController extends Controller
         $setting->labels_pagewidth = $request->input('labels_pagewidth');
         $setting->labels_pageheight = $request->input('labels_pageheight');
         $setting->labels_display_company_name = $request->input('labels_display_company_name', '0');
-        $setting->labels_display_company_name = $request->input('labels_display_company_name', '0');
-
 
+        //Barcodes
+        $setting->qr_code = $request->input('qr_code', '0');
+        //1D-Barcode
+        $setting->alt_barcode_enabled = $request->input('alt_barcode_enabled', '0');
+        //QR-Code
+        $setting->qr_text = $request->input('qr_text');
 
         if ($request->filled('labels_display_name')) {
             $setting->labels_display_name = 1;
@@ -869,6 +826,7 @@ class SettingsController extends Controller
         }
 
         if ($setting->save()) {
+
             return redirect()->route('settings.labels.index')
                 ->with('success', trans('admin/settings/message.update.success'));
         }
@@ -882,45 +840,21 @@ class SettingsController extends Controller
      * @author [A. Gianotto] [<snipe@snipe.net>]
      *
      * @since [v4.0]
-     *
-     * @return View
      */
-    public function getLdapSettings()
+    public function getLdapSettings() : View
     {
         $setting = Setting::getSettings();
         $groups = Group::pluck('name', 'id');
-
-
-        /**
-         * This validator is only temporary (famous last words.) - @snipe
-         */
-        $messages = [
-            'ldap_username_field.not_in' => '<code>sAMAccountName</code> (mixed case) will likely not work. You should use <code>samaccountname</code> (lowercase) instead. ',
-            'ldap_auth_filter_query.not_in' => '<code>uid=samaccountname</code> is probably not a valid auth filter. You probably want <code>uid=</code> ',
-            'ldap_filter.regex' => 'This value should probably not be wrapped in parentheses.',
-        ];
-
-        $validator = Validator::make($setting->toArray(), [
-            'ldap_username_field' => 'not_in:sAMAccountName',
-            'ldap_auth_filter_query' => 'not_in:uid=samaccountname|required_if:ldap_enabled,1',
-            'ldap_filter' => 'nullable|regex:"^[^(]"|required_if:ldap_enabled,1',
-        ],  $messages);
-
-
-
-        return view('settings.ldap', compact('setting', 'groups'))->withErrors($validator);
+        return view('settings.ldap', compact('setting', 'groups'));
     }
 
     /**
      * Saves settings from form.
      *
      * @author [A. Gianotto] [<snipe@snipe.net>]
-     *
      * @since [v4.0]
-     *
-     * @return View
      */
-    public function postLdapSettings(Request $request)
+    public function postLdapSettings(StoreLdapSettings $request) : RedirectResponse
     {
         if (is_null($setting = Setting::getSettings())) {
             return redirect()->to('admin')->with('error', trans('admin/settings/message.update.error'));
@@ -942,7 +876,8 @@ class SettingsController extends Controller
             $setting->ldap_fname_field = $request->input('ldap_fname_field');
             $setting->ldap_auth_filter_query = $request->input('ldap_auth_filter_query');
             $setting->ldap_version = $request->input('ldap_version', 3);
-            $setting->ldap_active_flag = $request->input('ldap_active_flag');
+            $setting->ldap_active_flag = $request->input('ldap_active_flag', 0);
+            $setting->ldap_invert_active_flag = $request->input('ldap_invert_active_flag', 0);
             $setting->ldap_emp_num = $request->input('ldap_emp_num');
             $setting->ldap_email = $request->input('ldap_email');
             $setting->ldap_manager = $request->input('ldap_manager');
@@ -962,7 +897,6 @@ class SettingsController extends Controller
         }
 
         if ($setting->save()) {
-            $setting->update_client_side_cert_files();
             return redirect()->route('settings.ldap.index')
                 ->with('success', trans('admin/settings/message.update.success'));
         }
@@ -974,15 +908,11 @@ class SettingsController extends Controller
      * Return a form to allow a super admin to update settings.
      *
      * @author Johnson Yi <jyi.dev@outlook.com>
-     *
      * @since v5.0.0
-     *
-     * @return View
      */
-    public function getSamlSettings()
+    public function getSamlSettings() : View
     {
         $setting = Setting::getSettings();
-
         return view('settings.saml', compact('setting'));
     }
 
@@ -990,12 +920,9 @@ class SettingsController extends Controller
      * Saves settings from form.
      *
      * @author Johnson Yi <jyi.dev@outlook.com>
-     *
      * @since v5.0.0
-     *
-     * @return View
      */
-    public function postSamlSettings(SettingsSamlRequest $request)
+    public function postSamlSettings(SettingsSamlRequest $request) : RedirectResponse
     {
         if (is_null($setting = Setting::getSettings())) {
             return redirect()->to('admin')->with('error', trans('admin/settings/message.update.error'));
@@ -1024,10 +951,13 @@ class SettingsController extends Controller
 
         return redirect()->back()->withInput()->withErrors($setting->getErrors());
     }
-    public static function getPDFBranding()
-    {
-        $pdf_branding= Setting::getSettings();
 
+    /**
+     * Do we need this? Can we not just call getSettings() directly?
+     */
+    public static function getPDFBranding() : Setting
+    {
+        $pdf_branding = Setting::getSettings();
         return $pdf_branding;
     }
 
@@ -1037,9 +967,8 @@ class SettingsController extends Controller
      *
      * @author [A. Gianotto] [<snipe@snipe.net>]
      * @since [v6.1.1]
-     * @return View
      */
-    public function getGoogleLoginSettings()
+    public function getGoogleLoginSettings() : View
     {
         $setting = Setting::getSettings();
         return view('settings.google', compact('setting'));
@@ -1050,9 +979,8 @@ class SettingsController extends Controller
      *
      * @author [A. Gianotto] [<snipe@snipe.net>]
      * @since [v6.1.1]
-     * @return View
      */
-    public function postGoogleLoginSettings(Request $request)
+    public function postGoogleLoginSettings(Request $request) : RedirectResponse
     {
         if (!config('app.lock_passwords')) {
             $setting = Setting::getSettings();
@@ -1079,10 +1007,8 @@ class SettingsController extends Controller
      * @author [A. Gianotto] [<snipe@snipe.net>]
      *
      * @since [v1.8]
-     *
-     * @return View
      */
-    public function getBackups()
+    public function getBackups() : View
     {
         $settings = Setting::getSettings();
         $path = 'app/backups';
@@ -1118,12 +1044,9 @@ class SettingsController extends Controller
      * Process the backup.
      *
      * @author [A. Gianotto] [<snipe@snipe.net>]
-     *
      * @since [v1.8]
-     *
-     * @return \Illuminate\Http\RedirectResponse
      */
-    public function postBackups()
+    public function postBackups() : RedirectResponse
     {
         if (! config('app.lock_passwords')) {
             Artisan::call('snipeit:backup', ['--filename' => 'manual-backup-'.date('Y-m-d-H-i-s')]);
@@ -1152,12 +1075,9 @@ class SettingsController extends Controller
      * Download the backup file.
      *
      * @author [A. Gianotto] [<snipe@snipe.net>]
-     *
      * @since [v1.8]
-     *
-     * @return Storage
      */
-    public function downloadFile($filename = null)
+    public function downloadFile($filename = null) : RedirectResponse | BinaryFileResponse
     {
         $path = 'app/backups';
 
@@ -1178,12 +1098,9 @@ class SettingsController extends Controller
      * Delete the backup file.
      *
      * @author [A. Gianotto] [<snipe@snipe.net>]
-     *
      * @since [v1.8]
-     *
-     * @return View
      */
-    public function deleteFile($filename = null)
+    public function deleteFile($filename = null) : RedirectResponse
     {
         if (config('app.allow_backup_delete')=='true') {
 
@@ -1207,7 +1124,7 @@ class SettingsController extends Controller
         }
 
         // Hell to the no
-        Log::warning('User ID '.Auth::user()->id.' is attempting to delete backup file '.$filename.' and is not authorized to.');
+        Log::warning('User ID '.auth()->id().' is attempting to delete backup file '.$filename.' and is not authorized to.');
         return redirect()->route('settings.backups.index')->with('error', trans('general.backup_delete_not_allowed'));
     }
 
@@ -1216,13 +1133,11 @@ class SettingsController extends Controller
      * Uploads a backup file
      *
      * @author [A. Gianotto] [<snipe@snipe.net>]
-     *
      * @since [v6.0]
-     *
-     * @return \Illuminate\Http\RedirectResponse
      */
 
-    public function postUploadBackup(Request $request) {
+    public function postUploadBackup(Request $request) : RedirectResponse
+    {
 
         if (! config('app.lock_passwords')) {
             if (!$request->hasFile('file')) {
@@ -1254,12 +1169,9 @@ class SettingsController extends Controller
      * Restore the backup file.
      *
      * @author [A. Gianotto] [<snipe@snipe.net>]
-     *
      * @since [v6.0]
-     *
-     * @return View
      */
-    public function postRestore($filename = null)
+    public function postRestore(Request $request, $filename = null): RedirectResponse
     {
 
         if (! config('app.lock_passwords')) {
@@ -1268,7 +1180,7 @@ class SettingsController extends Controller
             if (Storage::exists($path.'/'.$filename)) {
 
                 // grab the user's info so we can make sure they exist in the system
-                $user = User::find(Auth::user()->id);
+                $user = User::find(auth()->id());
 
                 // TODO: run a backup
 
@@ -1279,13 +1191,29 @@ class SettingsController extends Controller
 
                 Log::debug('Attempting to restore from: '. storage_path($path).'/'.$filename);
 
-                // run the restore command
-                Artisan::call('snipeit:restore',
-                [
+                $restore_params = [
                     '--force' => true,
                     '--no-progress' => true,
-                    'filename' => storage_path($path).'/'.$filename
-                ]);
+                    'filename' => storage_path($path) . '/' . $filename
+                ];
+
+                if ($request->input('clean')) {
+                    Log::debug("Attempting 'clean' - first, guessing prefix...");
+                    Artisan::call('snipeit:restore', [
+                        '--sanitize-guess-prefix' => true,
+                        'filename' => storage_path($path) . '/' . $filename
+                    ]);
+                    $guess_prefix_output = Artisan::output();
+                    Log::debug("Sanitize output is: $guess_prefix_output");
+                    list($prefix, $_output) = explode("\n", $guess_prefix_output);
+                    Log::debug("prefix is: '$prefix'");
+                    $restore_params['--sanitize-with-prefix'] = $prefix;
+                }
+
+                // run the restore command
+                Artisan::call('snipeit:restore',
+                    $restore_params
+                );
 
                 // If it's greater than 300, it probably worked
                 $output = Artisan::output();
@@ -1312,7 +1240,7 @@ class SettingsController extends Controller
                 DB::table('users')->update(['remember_token' => null]);
                 Auth::logout();
 
-                return redirect()->route('login')->with('success', 'Your system has been restored. Please login again.');
+                return redirect()->route('login')->with('success', trans('admin/settings/message.restore.success'));
             } else {
                 return redirect()->route('settings.backups.index')->with('error', trans('admin/settings/message.backup.file_not_found'));
             }
@@ -1327,13 +1255,11 @@ class SettingsController extends Controller
      * @author [A. Gianotto] [<snipe@snipe.net>]
      *
      * @since [v4.0]
-     *
-     * @return View
      */
-    public function getPurge()
+    public function getPurge() : View | RedirectResponse
     {
 
-        Log::warning('User '.Auth::user()->username.' (ID'.Auth::user()->id.') is attempting a PURGE');
+        Log::warning('User '.auth()->user()->username.' (ID: '.auth()->id().') is attempting a PURGE');
 
         if (config('app.allow_purge')=='true') {
             return view('settings.purge-form');
@@ -1346,14 +1272,11 @@ class SettingsController extends Controller
      * Purges soft-deletes.
      *
      * @author [A. Gianotto] [<snipe@snipe.net>]
-     *
      * @since [v3.0]
-     *
-     * @return View
      */
-    public function postPurge(Request $request)
+    public function postPurge(Request $request) : RedirectResponse
     {
-        Log::warning('User '.Auth::user()->username.' (ID'.Auth::user()->id.') is attempting a PURGE');
+        Log::warning('User '.auth()->user()->username.' (ID'.auth()->id().') is attempting a PURGE');
 
         if (config('app.allow_purge')=='true') {
             Log::debug('Purging is not allowed via the .env');
@@ -1362,7 +1285,7 @@ class SettingsController extends Controller
 
                 if ($request->input('confirm_purge')=='DELETE') {
 
-                    Log::warning('User ID ' . Auth::user()->id . ' initiated a PURGE!');
+                    Log::warning('User ID ' . auth()->id() . ' initiated a PURGE!');
                     // Run a backup immediately before processing
                     Artisan::call('backup:run');
                     Artisan::call('snipeit:purge', ['--force' => 'true', '--no-interaction' => true]);
@@ -1380,7 +1303,7 @@ class SettingsController extends Controller
             }
         }
 
-        Log::error('User '.Auth::user()->username.' (ID'.Auth::user()->id.') is attempting to purge deleted data and is not authorized to.');
+        Log::error('User '.auth()->user()->username.' (ID'.auth()->id().') is attempting to purge deleted data and is not authorized to.');
 
 
         // Nope.
@@ -1395,12 +1318,9 @@ class SettingsController extends Controller
      * in the routes file if you want to be able to cache the routes.
      *
      * @author [A. Gianotto] [<snipe@snipe.net>]
-     *
      * @since [v4.0]
-     *
-     * @return View
      */
-    public function api()
+    public function api() : View
     {
         return view('settings.api');
     }
@@ -1409,12 +1329,9 @@ class SettingsController extends Controller
      * Test the email configuration.
      *
      * @author [A. Gianotto] [<snipe@snipe.net>]
-     *
      * @since [v3.0]
-     *
-     * @return \Illuminate\Http\RedirectResponse
      */
-    public function ajaxTestEmail()
+    public function ajaxTestEmail() : JsonResponse
     {
         try {
             (new User())->forceFill([
@@ -1422,13 +1339,20 @@ class SettingsController extends Controller
                 'email' => config('mail.from.address'),
             ])->notify(new MailTest());
 
-            return response()->json(Helper::formatStandardApiResponse('success', null, 'Maiol sent!'));
+            return response()->json(Helper::formatStandardApiResponse('success', null, trans('mail_sent.mail_sent')));
         } catch (\Exception $e) {
             return response()->json(Helper::formatStandardApiResponse('success', null, $e->getMessage()));
         }
     }
 
-    public function getLoginAttempts()
+
+
+    /**
+     * Get login attempts view
+     *
+     * @author [A. Gianotto] [<snipe@snipe.net>]
+     */
+    public function getLoginAttempts() : View
     {
         return view('settings.logins');
     }
diff --git a/app/Http/Controllers/StatuslabelsController.php b/app/Http/Controllers/StatuslabelsController.php
index 0c559560e0..6fd261206c 100755
--- a/app/Http/Controllers/StatuslabelsController.php
+++ b/app/Http/Controllers/StatuslabelsController.php
@@ -6,6 +6,8 @@ use App\Helpers\Helper;
 use App\Models\Statuslabel;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Auth;
+use Illuminate\Http\RedirectResponse;
+use \Illuminate\Contracts\View\View;
 
 /**
  * This controller handles all actions related to Status Labels for
@@ -17,34 +19,24 @@ class StatuslabelsController extends Controller
 {
     /**
      * Show a list of all the statuslabels.
-     *
-     * @return \Illuminate\Contracts\View\View
-     * @throws \Illuminate\Auth\Access\AuthorizationException
      */
-    public function index()
+    public function index() : View
     {
         $this->authorize('view', Statuslabel::class);
-
         return view('statuslabels.index');
     }
 
-    public function show($id)
+    public function show(Statuslabel $statuslabel) : View | RedirectResponse
     {
         $this->authorize('view', Statuslabel::class);
-        if ($statuslabel = Statuslabel::find($id)) {
-            return view('statuslabels.view')->with('statuslabel', $statuslabel);
-        }
-
-        return redirect()->route('statuslabels.index')->with('error', trans('admin/statuslabels/message.does_not_exist'));
+        return view('statuslabels.view')->with('statuslabel', $statuslabel);
     }
 
     /**
      * Statuslabel create.
      *
-     * @return \Illuminate\Contracts\View\View
-     * @throws \Illuminate\Auth\Access\AuthorizationException
      */
-    public function create()
+    public function create() : View
     {
         // Show the page
         $this->authorize('create', Statuslabel::class);
@@ -58,10 +50,8 @@ class StatuslabelsController extends Controller
      * Statuslabel create form processing.
      *
      * @param Request $request
-     * @return \Illuminate\Http\RedirectResponse
-     * @throws \Illuminate\Auth\Access\AuthorizationException
      */
-    public function store(Request $request)
+    public function store(Request $request) : RedirectResponse
     {
         $this->authorize('create', Statuslabel::class);
         // create a new model instance
@@ -75,7 +65,7 @@ class StatuslabelsController extends Controller
 
         // Save the Statuslabel data
         $statusLabel->name = $request->input('name');
-        $statusLabel->user_id = Auth::id();
+        $statusLabel->created_by = auth()->id();
         $statusLabel->notes = $request->input('notes');
         $statusLabel->deployable = $statusType['deployable'];
         $statusLabel->pending = $statusType['pending'];
@@ -96,40 +86,26 @@ class StatuslabelsController extends Controller
      * Statuslabel update.
      *
      * @param  int $statuslabelId
-     * @return \Illuminate\Contracts\View\View
-     * @throws \Illuminate\Auth\Access\AuthorizationException
      */
-    public function edit($statuslabelId = null)
+    public function edit(Statuslabel $statuslabel) : View | RedirectResponse
     {
         $this->authorize('update', Statuslabel::class);
-        // Check if the Statuslabel exists
-        if (is_null($item = Statuslabel::find($statuslabelId))) {
-            // Redirect to the blogs management page
-            return redirect()->route('statuslabels.index')->with('error', trans('admin/statuslabels/message.does_not_exist'));
-        }
-
-        $use_statuslabel_type = $item->getStatuslabelType();
 
         $statuslabel_types = ['' => trans('admin/hardware/form.select_statustype')] + ['undeployable' => trans('admin/hardware/general.undeployable')] + ['pending' => trans('admin/hardware/general.pending')] + ['archived' => trans('admin/hardware/general.archived')] + ['deployable' => trans('admin/hardware/general.deployable')];
 
-        return view('statuslabels/edit', compact('item', 'statuslabel_types'))->with('use_statuslabel_type', $use_statuslabel_type);
+        return view('statuslabels/edit', compact('statuslabel_types'))
+            ->with('item', $statuslabel)
+            ->with('use_statuslabel_type', $statuslabel);
     }
 
     /**
      * Statuslabel update form processing page.
      *
      * @param  int $statuslabelId
-     * @return \Illuminate\Http\RedirectResponse
-     * @throws \Illuminate\Auth\Access\AuthorizationException
      */
-    public function update(Request $request, $statuslabelId = null)
+    public function update(Request $request, Statuslabel $statuslabel) : RedirectResponse
     {
         $this->authorize('update', Statuslabel::class);
-        // Check if the Statuslabel exists
-        if (is_null($statuslabel = Statuslabel::find($statuslabelId))) {
-            // Redirect to the blogs management page
-            return redirect()->route('statuslabels.index')->with('error', trans('admin/statuslabels/message.does_not_exist'));
-        }
 
         if (! $request->filled('statuslabel_types')) {
             return redirect()->back()->withInput()->withErrors(['statuslabel_types' => trans('validation.statuslabel_type')]);
@@ -159,10 +135,8 @@ class StatuslabelsController extends Controller
      * Delete the given Statuslabel.
      *
      * @param  int $statuslabelId
-     * @return \Illuminate\Http\RedirectResponse
-     * @throws \Illuminate\Auth\Access\AuthorizationException
      */
-    public function destroy($statuslabelId)
+    public function destroy($statuslabelId) : RedirectResponse
     {
         $this->authorize('delete', Statuslabel::class);
         // Check if the Statuslabel exists
diff --git a/app/Http/Controllers/SuppliersController.php b/app/Http/Controllers/SuppliersController.php
index b901224714..d96031a9aa 100755
--- a/app/Http/Controllers/SuppliersController.php
+++ b/app/Http/Controllers/SuppliersController.php
@@ -5,6 +5,8 @@ namespace App\Http\Controllers;
 use App\Http\Requests\ImageUploadRequest;
 use App\Models\Supplier;
 use Illuminate\Support\Facades\Auth;
+use Illuminate\Http\RedirectResponse;
+use \Illuminate\Contracts\View\View;
 
 /**
  * This controller handles all actions related to Suppliers for
@@ -20,25 +22,19 @@ class SuppliersController extends Controller
      * @return \Illuminate\Contracts\View\View
      * @throws \Illuminate\Auth\Access\AuthorizationException
      */
-    public function index()
+    public function index() : View
     {
-        // Grab all the suppliers
         $this->authorize('view', Supplier::class);
-
-        // Show the page
         return view('suppliers/index');
     }
 
     /**
      * Supplier create.
      *
-     * @return \Illuminate\Contracts\View\View
-     * @throws \Illuminate\Auth\Access\AuthorizationException
      */
-    public function create()
+    public function create() : View
     {
         $this->authorize('create', Supplier::class);
-
         return view('suppliers/edit')->with('item', new Supplier);
     }
 
@@ -46,10 +42,8 @@ class SuppliersController extends Controller
      * Supplier create form processing.
      *
      * @param ImageUploadRequest $request
-     * @return \Illuminate\Http\RedirectResponse
-     * @throws \Illuminate\Auth\Access\AuthorizationException
      */
-    public function store(ImageUploadRequest $request)
+    public function store(ImageUploadRequest $request) : RedirectResponse
     {
         $this->authorize('create', Supplier::class);
         // Create a new supplier
@@ -68,7 +62,7 @@ class SuppliersController extends Controller
         $supplier->email = request('email');
         $supplier->notes = request('notes');
         $supplier->url = $supplier->addhttp(request('url'));
-        $supplier->user_id = Auth::id();
+        $supplier->created_by = auth()->id();
         $supplier = $request->handleImages($supplier);
 
         if ($supplier->save()) {
@@ -82,38 +76,21 @@ class SuppliersController extends Controller
      * Supplier update.
      *
      * @param  int $supplierId
-     * @return \Illuminate\Contracts\View\View
-     * @throws \Illuminate\Auth\Access\AuthorizationException
      */
-    public function edit($supplierId = null)
+    public function edit(Supplier $supplier) : View | RedirectResponse
     {
         $this->authorize('update', Supplier::class);
-        // Check if the supplier exists
-        if (is_null($item = Supplier::find($supplierId))) {
-            // Redirect to the supplier  page
-            return redirect()->route('suppliers.index')->with('error', trans('admin/suppliers/message.does_not_exist'));
-        }
-
-        // Show the page
-        return view('suppliers/edit', compact('item'));
+        return view('suppliers/edit')->with('item',  $supplier);
     }
 
     /**
      * Supplier update form processing page.
      *
      * @param  int $supplierId
-     * @return \Illuminate\Http\RedirectResponse
-     * @throws \Illuminate\Auth\Access\AuthorizationException
      */
-    public function update($supplierId, ImageUploadRequest $request)
+    public function update(ImageUploadRequest $request, Supplier $supplier) : RedirectResponse
     {
         $this->authorize('update', Supplier::class);
-        // Check if the supplier exists
-        if (is_null($supplier = Supplier::find($supplierId))) {
-            // Redirect to the supplier  page
-            return redirect()->route('suppliers.index')->with('error', trans('admin/suppliers/message.does_not_exist'));
-        }
-
         // Save the  data
         $supplier->name = request('name');
         $supplier->address = request('address');
@@ -141,10 +118,8 @@ class SuppliersController extends Controller
      * Delete the given supplier.
      *
      * @param  int $supplierId
-     * @return \Illuminate\Http\RedirectResponse
-     * @throws \Illuminate\Auth\Access\AuthorizationException
      */
-    public function destroy($supplierId)
+    public function destroy($supplierId) : RedirectResponse
     {
         $this->authorize('delete', Supplier::class);
         if (is_null($supplier = Supplier::with('asset_maintenances', 'assets', 'licenses')->withCount('asset_maintenances as asset_maintenances_count', 'assets as assets_count', 'licenses as licenses_count')->find($supplierId))) {
@@ -174,18 +149,12 @@ class SuppliersController extends Controller
      *  Get the asset information to present to the supplier view page
      *
      * @param null $supplierId
-     * @return \Illuminate\Contracts\View\View
      * @internal param int $assetId
      */
-    public function show($supplierId = null)
+    public function show(Supplier $supplier) : View | RedirectResponse
     {
         $this->authorize('view', Supplier::class);
-        $supplier = Supplier::find($supplierId);
+        return view('suppliers/view', compact('supplier'));
 
-        if (isset($supplier->id)) {
-            return view('suppliers/view', compact('supplier'));
-        }
-
-        return redirect()->route('suppliers.index')->with('error', trans('admin/suppliers/message.does_not_exist'));
     }
 }
diff --git a/app/Http/Controllers/Users/BulkUsersController.php b/app/Http/Controllers/Users/BulkUsersController.php
index d028560607..0269f3fd0c 100644
--- a/app/Http/Controllers/Users/BulkUsersController.php
+++ b/app/Http/Controllers/Users/BulkUsersController.php
@@ -13,9 +13,12 @@ use App\Models\Group;
 use App\Models\LicenseSeat;
 use App\Models\ConsumableAssignment;
 use App\Models\Consumable;
+use App\Models\Setting;
 use App\Models\User;
+use App\Notifications\CurrentInventory;
 use Carbon\Carbon;
 use Illuminate\Http\Request;
+use Illuminate\Support\Collection;
 use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\Password;
@@ -29,12 +32,12 @@ class BulkUsersController extends Controller
      * @author [A. Gianotto] [<snipe@snipe.net>]
      * @since [v1.7]
      * @param Request $request
-     * @return \Illuminate\Contracts\View\View
+     * @return \Illuminate\Contracts\View\View | \Illuminate\Http\RedirectResponse
      * @throws \Illuminate\Auth\Access\AuthorizationException
      */
     public function edit(Request $request)
     {
-        $this->authorize('update', User::class);
+        $this->authorize('view', User::class);
 
         // Make sure there were users selected
         if (($request->filled('ids')) && (count($request->input('ids')) > 0)) {
@@ -42,20 +45,44 @@ class BulkUsersController extends Controller
             // Get the list of affected users
             $user_raw_array = request('ids');
             $users = User::whereIn('id', $user_raw_array)
-                ->with('groups', 'assets', 'licenses', 'accessories')->get();
+                ->with('assets', 'manager', 'userlog', 'licenses', 'consumables', 'accessories', 'managedLocations','uploads', 'acceptances')->get();
 
             // bulk edit, display the bulk edit form
             if ($request->input('bulk_actions') == 'edit') {
+                $this->authorize('update', User::class);
                 return view('users/bulk-edit', compact('users'))
                     ->with('groups', Group::pluck('name', 'id'));
 
+            // bulk send assigned inventory
+            } elseif ($request->input('bulk_actions') == 'send_assigned') {
+                    $this->authorize('update', User::class);
+
+                $users_without_email = 0;
+                foreach ($users as $user) {
+                    if (empty($user->email)) {
+                        $users_without_email++;
+                    } else {
+                        $user->notify((new CurrentInventory($user)));
+                    }
+                }
+
+                if ($users_without_email == 0) {
+                    return redirect()->back()->with('success', trans_choice('admin/users/general.users_notified', $users->count()));
+                } else {
+                    return redirect()->back()->with('warning', trans_choice('admin/users/general.users_notified_warning', $users->count(), ['no_email' => $users_without_email]));
+                }
+
+
+
+
             // bulk delete, display the bulk delete confirmation form
             } elseif ($request->input('bulk_actions') == 'delete') {
+                $this->authorize('delete', User::class);
                 return view('users/confirm-bulk-delete')->with('users', $users)->with('statuslabel_list', Helper::statusLabelList());
 
             // merge, confirm they have at least 2 users selected and display the merge screen
             } elseif ($request->input('bulk_actions') == 'merge') {
-
+                $this->authorize('delete', User::class);
                 if (($request->filled('ids')) && (count($request->input('ids')) > 1)) {
                     return view('users/confirm-merge')->with('users', $users);
                 // Not enough users selected, send them back
@@ -66,7 +93,7 @@ class BulkUsersController extends Controller
             // bulk password reset, just do the thing
             } elseif ($request->input('bulk_actions') == 'bulkpasswordreset') {
                 foreach ($users as $user) {
-                    if (($user->activated == '1') && ($user->email != '')) {
+                    if (($user->activated == '1') && ($user->email != '') && ($user->ldap_import != '1')) {
                         $credentials = ['email' => $user->email];
                         Password::sendResetLink($credentials/* , function (Message $message) {
                         $message->subject($this->getEmailSubject()); // TODO - I'm not sure if we still need this, but this second parameter is no longer accepted in later Laravel versions.
@@ -75,6 +102,33 @@ class BulkUsersController extends Controller
                 }
                 return redirect()->back()->with('success', trans('admin/users/message.password_resets_sent'));
 
+            } elseif ($request->input('bulk_actions') == 'print') {
+                $users = User::query()
+                    ->with([
+                        'assets.assetlog',
+                        'assets.assignedAssets.assetlog',
+                        'assets.assignedAssets.defaultLoc',
+                        'assets.assignedAssets.location',
+                        'assets.assignedAssets.model.category',
+                        'assets.defaultLoc',
+                        'assets.location',
+                        'assets.model.category',
+                        'accessories.assetlog',
+                        'accessories.category',
+                        'accessories.manufacturer',
+                        'consumables.assetlog',
+                        'consumables.category',
+                        'consumables.manufacturer',
+                        'licenses.category',
+                    ])
+                    ->withTrashed()
+                    ->findMany($request->input('ids'));
+
+                $users->each(fn($user) => $this->authorize('view', $user));
+
+                return view('users.print')
+                    ->with('users', $users)
+                    ->with('settings', Setting::getSettings());
             }
         }
 
@@ -100,9 +154,9 @@ class BulkUsersController extends Controller
         $user_raw_array = $request->input('ids');
 
         // Remove the user from any updates.
-        $user_raw_array = array_diff($user_raw_array, [Auth::id()]);
+        $user_raw_array = array_diff($user_raw_array, [auth()->id()]);
         $manager_conflict = false;
-        $users = User::whereIn('id', $user_raw_array)->where('id', '!=', Auth::user()->id)->get();
+        $users = User::whereIn('id', $user_raw_array)->where('id', '!=', auth()->id())->get();
 
         $return_array = [
             'success' => trans('admin/users/message.success.update_bulk'),
@@ -115,6 +169,9 @@ class BulkUsersController extends Controller
             ->conditionallyAddItem('remote')
             ->conditionallyAddItem('ldap_import')
             ->conditionallyAddItem('activated')
+            ->conditionallyAddItem('start_date')
+            ->conditionallyAddItem('end_date')
+            ->conditionallyAddItem('city')
             ->conditionallyAddItem('autoassign_licenses');
 
 
@@ -145,13 +202,24 @@ class BulkUsersController extends Controller
             $this->update_array['company_id'] = null;
         }
 
-        
+        if ($request->input('null_start_date')=='1') {
+            $this->update_array['start_date'] = null;
+        }
+
+        if ($request->input('null_end_date')=='1') {
+            $this->update_array['end_date'] = null;
+        }
+
+        if ($request->input('null_locale')=='1') {
+            $this->update_array['locale'] = null;
+        }
+
         if (! $manager_conflict) {
             $this->conditionallyAddItem('manager_id');
         }
         // Save the updated info
         User::whereIn('id', $user_raw_array)
-            ->where('id', '!=', Auth::id())->update($this->update_array);
+            ->where('id', '!=', auth()->id())->update($this->update_array);
 
         if (array_key_exists('location_id', $this->update_array)){
             Asset::where('assigned_type', User::class)
@@ -213,26 +281,23 @@ class BulkUsersController extends Controller
 
         $user_raw_array = request('ids');
 
-        if (($key = array_search(Auth::id(), $user_raw_array)) !== false) {
+        if (($key = array_search(auth()->id(), $user_raw_array)) !== false) {
             unset($user_raw_array[$key]);
         }
 
         $users = User::whereIn('id', $user_raw_array)->get();
-        $assets = Asset::whereIn('assigned_to', $user_raw_array)->where('assigned_type', \App\Models\User::class)->get();
-        $accessories = DB::table('accessories_users')->whereIn('assigned_to', $user_raw_array)->get();
+        $assets = Asset::whereIn('assigned_to', $user_raw_array)->where('assigned_type', User::class)->get();
+        $accessoryUserRows = DB::table('accessories_checkout')->where('assigned_type', User::class)->whereIn('assigned_to', $user_raw_array)->get();
         $licenses = DB::table('license_seats')->whereIn('assigned_to', $user_raw_array)->get();
-        $consumables = DB::table('consumables_users')->whereIn('assigned_to', $user_raw_array)->get();
+        $consumableUserRows = DB::table('consumables_users')->whereIn('assigned_to', $user_raw_array)->get();
 
         if ((($assets->count() > 0) && ((!$request->filled('status_id')) || ($request->input('status_id') == '')))) {
             return redirect()->route('users.index')->with('error', 'No status selected');
         }
 
-
         $this->logItemCheckinAndDelete($assets, Asset::class);
-        $this->logItemCheckinAndDelete($accessories, Accessory::class);
+        $this->logAccessoriesCheckin($accessoryUserRows);
         $this->logItemCheckinAndDelete($licenses, License::class);
-        $this->logItemCheckinAndDelete($consumables, Consumable::class);
-
 
         Asset::whereIn('id', $assets->pluck('id'))->update([
             'status_id'     => e(request('status_id')),
@@ -241,19 +306,14 @@ class BulkUsersController extends Controller
             'expected_checkin' => null,
         ]);
 
-
         LicenseSeat::whereIn('id', $licenses->pluck('id'))->update(['assigned_to' => null]);
-        ConsumableAssignment::whereIn('id', $consumables->pluck('id'))->delete();
-
+        ConsumableAssignment::whereIn('id', $consumableUserRows->pluck('id'))->delete();
 
         foreach ($users as $user) {
-
-            $user->consumables()->sync([]);
             $user->accessories()->sync([]);
             if ($request->input('delete_user')=='1') {
                 $user->delete();
             }
-
         }
 
         $msg = trans('general.bulk_checkin_success');
@@ -279,13 +339,27 @@ class BulkUsersController extends Controller
             if ($itemType == License::class){
                 $item_id = $item->license_id;
             }
-            
+
             $logAction->item_id = $item_id;
             // We can't rely on get_class here because the licenses/accessories fetched above are not eloquent models, but simply arrays.
             $logAction->item_type = $itemType;
             $logAction->target_id = $item->assigned_to;
             $logAction->target_type = User::class;
-            $logAction->user_id = Auth::id();
+            $logAction->created_by = auth()->id();
+            $logAction->note = 'Bulk checkin items';
+            $logAction->logaction('checkin from');
+        }
+    }
+
+    private function logAccessoriesCheckin(Collection $accessoryUserRows): void
+    {
+        foreach ($accessoryUserRows as $accessoryUserRow) {
+            $logAction = new Actionlog();
+            $logAction->item_id = $accessoryUserRow->accessory_id;
+            $logAction->item_type = Accessory::class;
+            $logAction->target_id = $accessoryUserRow->assigned_to;
+            $logAction->target_type = User::class;
+            $logAction->created_by = auth()->id();
             $logAction->note = 'Bulk checkin items';
             $logAction->logaction('checkin from');
         }
@@ -317,8 +391,8 @@ class BulkUsersController extends Controller
 
         // Get the users
         $merge_into_user = User::find($request->input('merge_into_id'));
-        $users_to_merge = User::whereIn('id', $user_ids_to_merge)->with('assets', 'licenses', 'consumables','accessories')->get();
-        $admin = User::find(Auth::user()->id);
+        $users_to_merge = User::whereIn('id', $user_ids_to_merge)->with('assets', 'manager', 'userlog', 'licenses', 'consumables', 'accessories', 'managedLocations','uploads', 'acceptances')->get();
+        $admin = User::find(auth()->id());
 
         // Walk users
         foreach ($users_to_merge as $user_to_merge) {
@@ -344,10 +418,20 @@ class BulkUsersController extends Controller
             }
 
             foreach ($user_to_merge->userlog as $log) {
-                $log->target_id = $user_to_merge->id;
+                $log->target_id = $merge_into_user->id;
                 $log->save();
             }
 
+            foreach ($user_to_merge->uploads as $upload) {
+                $upload->item_id = $merge_into_user->id;
+                $upload->save();
+            }
+
+            foreach ($user_to_merge->acceptances as $acceptance) {
+                $acceptance->item_id = $merge_into_user->id;
+                $acceptance->save();
+            }
+
             User::where('manager_id', '=', $user_to_merge->id)->update(['manager_id' => $merge_into_user->id]);
 
             foreach ($user_to_merge->managedLocations as $managedLocation) {
@@ -356,7 +440,6 @@ class BulkUsersController extends Controller
             }
 
             $user_to_merge->delete();
-            //$user_to_merge->save();
 
             event(new UserMerged($user_to_merge, $merge_into_user, $admin));
 
diff --git a/app/Http/Controllers/Users/UserFilesController.php b/app/Http/Controllers/Users/UserFilesController.php
index ded44f35f6..45bd0c6329 100644
--- a/app/Http/Controllers/Users/UserFilesController.php
+++ b/app/Http/Controllers/Users/UserFilesController.php
@@ -7,9 +7,6 @@ use App\Http\Controllers\Controller;
 use App\Http\Requests\UploadFileRequest;
 use App\Models\Actionlog;
 use App\Models\User;
-use Illuminate\Support\Facades\Auth;
-use Illuminate\Support\Facades\Input;
-use Illuminate\Support\Facades\Response;
 use Symfony\Component\HttpFoundation\JsonResponse;
 use Illuminate\Support\Facades\Storage;
 
@@ -25,43 +22,34 @@ class UserFilesController extends Controller
      *@author [A. Gianotto] [<snipe@snipe.net>]
      * @since [v1.6]
      */
-    public function store(UploadFileRequest $request, $userId = null)
+    public function store(UploadFileRequest $request, User $user)
     {
-        $user = User::find($userId);
-        $destinationPath = config('app.private_uploads').'/users';
+        $this->authorize('update', $user);
+        $files = $request->file('file');
 
-        if (isset($user->id)) {
-            $this->authorize('update', $user);
-
-            $logActions = [];
-            $files = $request->file('file');
-
-            if (is_null($files)) {
-                return redirect()->back()->with('error', trans('admin/users/message.upload.nofiles'));
-            }
-            foreach ($files as $file) {
-                $file_name = $request->handleFile('private_uploads/users/', 'user-'.$user->id, $file);
-
-                //Log the uploaded file to the log
-                $logAction = new Actionlog();
-                $logAction->item_id = $user->id;
-                $logAction->item_type = User::class;
-                $logAction->user_id = Auth::id();
-                $logAction->note = $request->input('notes');
-                $logAction->target_id = null;
-                $logAction->created_at = date("Y-m-d H:i:s");
-                $logAction->filename = $file_name;
-                $logAction->action_type = 'uploaded';
-
-                if (! $logAction->save()) {
-                    return JsonResponse::create(['error' => 'Failed validation: '.print_r($logAction->getErrors(), true)], 500);
-                }
-                $logActions[] = $logAction;
-            }
-            // dd($logActions);
-            return redirect()->back()->with('success', trans('admin/users/message.upload.success'));
+        if (is_null($files)) {
+            return redirect()->back()->with('error', trans('admin/users/message.upload.nofiles'));
+        }
+        foreach ($files as $file) {
+            $file_name = $request->handleFile('private_uploads/users/', 'user-'.$user->id, $file);
+
+            //Log the uploaded file to the log
+            $logAction = new Actionlog();
+            $logAction->item_id = $user->id;
+            $logAction->item_type = User::class;
+            $logAction->created_by = auth()->id();
+            $logAction->note = $request->input('notes');
+            $logAction->target_id = null;
+            $logAction->created_at = date("Y-m-d H:i:s");
+            $logAction->filename = $file_name;
+            $logAction->action_type = 'uploaded';
+
+            if (! $logAction->save()) {
+                return JsonResponse::create(['error' => 'Failed validation: '.print_r($logAction->getErrors(), true)], 500);
+            }
+
+        return redirect()->back()->withFragment('files')->with('success', trans('admin/users/message.upload.success'));
         }
-        return redirect()->back()->with('error', trans('admin/users/message.upload.nofiles'));
 
 
     }
@@ -90,7 +78,7 @@ class UserFilesController extends Controller
                 
                 if (Storage::exists($rel_path.'/'.$filename)) {
                     Storage::delete($rel_path.'/'.$filename);
-                    return redirect()->back()->with('success', trans('admin/users/message.deletefile.success'));
+                    return redirect()->back()->withFragment('files')->with('success', trans('admin/users/message.deletefile.success'));
                 }
 
             }
@@ -113,38 +101,29 @@ class UserFilesController extends Controller
      * @return mixed
      * @throws \Illuminate\Auth\Access\AuthorizationException
      */
-    public function show($userId = null, $fileId = null)
+    public function show(User $user, $fileId = null)
     {
 
+
         if (empty($fileId)) {
             return redirect()->route('users.show')->with('error', 'Invalid file request');
         }
 
-        $user = User::find($userId);
-
-        // the license is valid
-        if (isset($user->id)) {
-
             $this->authorize('view', $user);
 
-            if ($log = Actionlog::whereNotNull('filename')->where('item_id', $user->id)->find($fileId)) {
+        if ($log = Actionlog::whereNotNull('filename')->where('item_id', $user->id)->find($fileId)) {
+            $file = 'private_uploads/users/'.$log->filename;
 
-                // Display the file inline
-                if (request('inline') == 'true') {
-                    $headers = [
-                        'Content-Disposition' => 'inline',
-                    ];
-                    return Storage::download('private_uploads/users/'.$log->filename, $log->filename, $headers);
-                }
-
-                return Storage::download('private_uploads/users/'.$log->filename);
+            try {
+                return StorageHelper::showOrDownloadFile($file, $log->filename);
+            } catch (\Exception $e) {
+                return redirect()->route('users.show', ['user' => $user])->with('error',  trans('general.file_not_found'));
             }
-
-            return redirect()->route('users.index')->with('error',  trans('admin/users/message.log_record_not_found'));
         }
 
-        // Redirect to the user management page if the user doesn't exist
-        return redirect()->route('users.index')->with('error',  trans('admin/users/message.user_not_found', ['id' => $userId]));
+        // The log record doesn't exist somehow
+        return redirect()->route('users.show', ['user' => $user])->with('error',  trans('general.log_record_not_found'));
+
     }
 
 }
diff --git a/app/Http/Controllers/Users/UsersController.php b/app/Http/Controllers/Users/UsersController.php
index 0b16dd0a95..b18a7b6fff 100755
--- a/app/Http/Controllers/Users/UsersController.php
+++ b/app/Http/Controllers/Users/UsersController.php
@@ -117,7 +117,7 @@ class UsersController extends Controller
         $user->zip = $request->input('zip', null);
         $user->remote = $request->input('remote', 0);
         $user->website = $request->input('website', null);
-        $user->created_by = Auth::user()->id;
+        $user->created_by = auth()->id();
         $user->start_date = $request->input('start_date', null);
         $user->end_date = $request->input('end_date', null);
         $user->autoassign_licenses = $request->input('autoassign_licenses', 0);
@@ -125,7 +125,7 @@ class UsersController extends Controller
         // Strip out the superuser permission if the user isn't a superadmin
         $permissions_array = $request->input('permission');
 
-        if (! Auth::user()->isSuperUser()) {
+        if (! auth()->user()->isSuperUser()) {
             unset($permissions_array['superuser']);
         }
         $user->permissions = json_encode($permissions_array);
@@ -133,6 +133,8 @@ class UsersController extends Controller
         // we have to invoke the
         app(ImageUploadRequest::class)->handleImages($user, 600, 'avatar', 'avatars', 'avatar');
 
+        session()->put(['redirect_option' => $request->get('redirect_option')]);
+
         if ($user->save()) {
             if ($request->filled('groups')) {
                 $user->groups()->sync($request->input('groups'));
@@ -152,7 +154,7 @@ class UsersController extends Controller
                 $user->notify(new WelcomeNotification($data));
             }
 
-            return redirect()->route('users.index')->with('success', trans('admin/users/message.success.create'));
+            return redirect()->to(Helper::getRedirectOption($request, $user->id, 'Users'))->with('success', trans('admin/users/message.success.create'));
         }
 
         return redirect()->back()->withInput()->withErrors($user->getErrors());
@@ -176,18 +178,22 @@ class UsersController extends Controller
      * @author [A. Gianotto] [<snipe@snipe.net>]
      * @since [v1.0]
      * @param $permissions
-     * @return View
+     * @return \Illuminate\Contracts\View\View|\Illuminate\Http\RedirectResponse
      * @internal param int $id
      * @throws \Illuminate\Auth\Access\AuthorizationException
      */
-    public function edit($id)
+    public function edit(User $user)
     {
 
         $this->authorize('update', User::class);
-        $user = User::with('assets', 'assets.model', 'consumables', 'accessories', 'licenses', 'userloc')->withTrashed()->find($id);
+        $user = User::with(['assets', 'assets.model', 'consumables', 'accessories', 'licenses', 'userloc'])->withTrashed()->find($user->id);
 
         if ($user) {
 
+            if ($user->trashed()) {
+                return redirect()->route('users.show', $user->id);
+            }
+
             $permissions = config('permissions');
             $groups = Group::pluck('name', 'id');
 
@@ -199,7 +205,6 @@ class UsersController extends Controller
             return view('users/edit', compact('user', 'groups', 'userGroups', 'permissions', 'userPermissions'))->with('item', $user);
         }
 
-        return redirect()->route('users.index')->with('error', trans('admin/users/message.user_not_found', compact('id')));
     }
 
     /**
@@ -212,116 +217,105 @@ class UsersController extends Controller
      * @return \Illuminate\Http\RedirectResponse
      * @throws \Illuminate\Auth\Access\AuthorizationException
      */
-    public function update(SaveUserRequest $request, $id = null)
+    public function update(SaveUserRequest $request, User $user)
     {
         $this->authorize('update', User::class);
 
         // This is a janky hack to prevent people from changing admin demo user data on the public demo.
         // The $ids 1 and 2 are special since they are seeded as superadmins in the demo seeder.
         // Thanks, jerks. You are why we can't have nice things. - snipe
-
-        if ((($id == 1) || ($id == 2)) && (config('app.lock_passwords'))) {
+        if ((($user->id == 1) || ($user->id == 2)) && (config('app.lock_passwords'))) {
             return redirect()->route('users.index')->with('error', trans('general.permission_denied_superuser_demo'));
         }
 
-
         // We need to reverse the UI specific logic for our
         // permissions here before we update the user.
         $permissions = $request->input('permissions', []);
         app('request')->request->set('permissions', $permissions);
 
-        $user = User::with('assets', 'assets.model', 'consumables', 'accessories', 'licenses', 'userloc')->withTrashed()->find($id);
+        $user->load(['assets', 'assets.model', 'consumables', 'accessories', 'licenses', 'userloc'])->withTrashed();
 
-        // User is valid - continue...
-        if ($user) {
-            $this->authorize('update', $user);
+        $this->authorize('update', $user);
 
-            // Figure out of this user was an admin before this edit
-            $orig_permissions_array = $user->decodePermissions();
-            $orig_superuser = '0';
-            if (is_array($orig_permissions_array)) {
-                if (array_key_exists('superuser', $orig_permissions_array)) {
-                    $orig_superuser = $orig_permissions_array['superuser'];
-                }
+        // Figure out of this user was an admin before this edit
+        $orig_permissions_array = $user->decodePermissions();
+        $orig_superuser = '0';
+        if (is_array($orig_permissions_array)) {
+            if (array_key_exists('superuser', $orig_permissions_array)) {
+                $orig_superuser = $orig_permissions_array['superuser'];
             }
+        }
 
-            // Only save groups if the user is a superuser
-            if (Auth::user()->isSuperUser()) {
-                $user->groups()->sync($request->input('groups'));
-            }
+        // Only save groups if the user is a superuser
+        if (auth()->user()->isSuperUser()) {
+            $user->groups()->sync($request->input('groups'));
+        }
 
-            // Update the user fields
-            $user->username = trim($request->input('username'));
-            $user->email = trim($request->input('email'));
-            $user->first_name = $request->input('first_name');
-            $user->last_name = $request->input('last_name');
-            $user->two_factor_optin = $request->input('two_factor_optin') ?: 0;
-            $user->locale = $request->input('locale');
-            $user->employee_num = $request->input('employee_num');
-            $user->activated = $request->input('activated', 0);
-            $user->jobtitle = $request->input('jobtitle', null);
-            $user->phone = $request->input('phone');
-            $user->location_id = $request->input('location_id', null);
-            $user->company_id = Company::getIdForUser($request->input('company_id', null));
-            $user->manager_id = $request->input('manager_id', null);
-            $user->notes = $request->input('notes');
-            $user->department_id = $request->input('department_id', null);
-            $user->address = $request->input('address', null);
-            $user->city = $request->input('city', null);
-            $user->state = $request->input('state', null);
-            $user->country = $request->input('country', null);
-            // if a user is editing themselves we should always keep activated true
-            $user->activated = $request->input('activated', $request->user()->is($user) ? 1 : 0);
-            $user->zip = $request->input('zip', null);
-            $user->remote = $request->input('remote', 0);
-            $user->vip = $request->input('vip', 0);
-            $user->website = $request->input('website', null);
-            $user->start_date = $request->input('start_date', null);
-            $user->end_date = $request->input('end_date', null);
-            $user->autoassign_licenses = $request->input('autoassign_licenses', 0);
+        // Update the user fields
+        $user->username = trim($request->input('username'));
+        $user->email = trim($request->input('email'));
+        $user->first_name = $request->input('first_name');
+        $user->last_name = $request->input('last_name');
+        $user->two_factor_optin = $request->input('two_factor_optin') ?: 0;
+        $user->locale = $request->input('locale');
+        $user->employee_num = $request->input('employee_num');
+        $user->activated = $request->input('activated', 0);
+        $user->jobtitle = $request->input('jobtitle', null);
+        $user->phone = $request->input('phone');
+        $user->location_id = $request->input('location_id', null);
+        $user->company_id = Company::getIdForUser($request->input('company_id', null));
+        $user->manager_id = $request->input('manager_id', null);
+        $user->notes = $request->input('notes');
+        $user->department_id = $request->input('department_id', null);
+        $user->address = $request->input('address', null);
+        $user->city = $request->input('city', null);
+        $user->state = $request->input('state', null);
+        $user->country = $request->input('country', null);
+        // if a user is editing themselves we should always keep activated true
+        $user->activated = $request->input('activated', $request->user()->is($user) ? 1 : 0);
+        $user->zip = $request->input('zip', null);
+        $user->remote = $request->input('remote', 0);
+        $user->vip = $request->input('vip', 0);
+        $user->website = $request->input('website', null);
+        $user->start_date = $request->input('start_date', null);
+        $user->end_date = $request->input('end_date', null);
+        $user->autoassign_licenses = $request->input('autoassign_licenses', 0);
 
-            // Update the location of any assets checked out to this user
-            Asset::where('assigned_type', User::class)
-                ->where('assigned_to', $user->id)
-                ->update(['location_id' => $request->input('location_id', null)]);
-
-            // Do we want to update the user password?
-            if ($request->filled('password')) {
-                $user->password = bcrypt($request->input('password'));
-            }
+        // Update the location of any assets checked out to this user
+        Asset::where('assigned_type', User::class)
+            ->where('assigned_to', $user->id)
+            ->update(['location_id' => $request->input('location_id', null)]);
 
+        // Do we want to update the user password?
+        if ($request->filled('password')) {
+            $user->password = bcrypt($request->input('password'));
+        }
 
         // Update the location of any assets checked out to this user
         Asset::where('assigned_type', User::class)
             ->where('assigned_to', $user->id)
             ->update(['location_id' => $user->location_id]);
 
-            $permissions_array = $request->input('permission');
-
-
-            // Strip out the superuser permission if the user isn't a superadmin
-            if (! Auth::user()->isSuperUser()) {
-                unset($permissions_array['superuser']);
-                $permissions_array['superuser'] = $orig_superuser;
-            }
-
-            $user->permissions = json_encode($permissions_array);
-
-            // Handle uploaded avatar
-            app(ImageUploadRequest::class)->handleImages($user, 600, 'avatar', 'avatars', 'avatar');
-
-            if ($user->save()) {
-                // Redirect to the user page
-                return redirect()->route('users.index')
-                    ->with('success', trans('admin/users/message.success.update'));
-            }
-
-            return redirect()->back()->withInput()->withErrors($user->getErrors());
-
+        $permissions_array = $request->input('permission');
 
+        // Strip out the superuser permission if the user isn't a superadmin
+        if (! auth()->user()->isSuperUser()) {
+            unset($permissions_array['superuser']);
+            $permissions_array['superuser'] = $orig_superuser;
         }
 
-        return redirect()->route('users.index')->with('error', trans('admin/users/message.user_not_found', compact('id')));
+        $user->permissions = json_encode($permissions_array);
+
+        // Handle uploaded avatar
+        app(ImageUploadRequest::class)->handleImages($user, 600, 'avatar', 'avatars', 'avatar');
+        session()->put(['redirect_option' => $request->get('redirect_option')]);
+
+        if ($user->save()) {
+            // Redirect to the user page
+            return redirect()->to(Helper::getRedirectOption($request, $user->id, 'Users'))
+                ->with('success', trans('admin/users/message.success.update'));
+        }
+        return redirect()->back()->withInput()->withErrors($user->getErrors());
     }
 
     /**
@@ -333,7 +327,7 @@ class UsersController extends Controller
      * @return \Illuminate\Http\RedirectResponse
      * @throws \Illuminate\Auth\Access\AuthorizationException
      */
-    public function destroy(DeleteUserRequest $request, $id = null)
+    public function destroy(DeleteUserRequest $request, $id)
     {
         $this->authorize('delete', User::class);
 
@@ -342,13 +336,6 @@ class UsersController extends Controller
             $this->authorize('delete', $user);
 
             if ($user->delete()) {
-                if (Storage::disk('public')->exists('avatars/' . $user->avatar)) {
-                    try {
-                        Storage::disk('public')->delete('avatars/' . $user->avatar);
-                    } catch (\Exception $e) {
-                        Log::debug($e);
-                    }
-                }
                 return redirect()->route('users.index')->with('success', trans('admin/users/message.success.delete'));
             }
         }
@@ -379,7 +366,7 @@ class UsersController extends Controller
                 $logaction->item_type = User::class;
                 $logaction->item_id = $user->id;
                 $logaction->created_at = date('Y-m-d H:i:s');
-                $logaction->user_id = Auth::user()->id;
+                $logaction->created_by = auth()->id();
                 $logaction->logaction('restore');
 
                 // Redirect them to the deleted page if there are more, otherwise the section index
@@ -407,23 +394,27 @@ class UsersController extends Controller
      * @return \Illuminate\Contracts\View\View
      * @throws \Illuminate\Auth\Access\AuthorizationException
      */
-    public function show($userId = null)
+    public function show(User $user)
     {
         // Make sure the user can view users at all
         $this->authorize('view', User::class);
 
-        $user = User::with('assets', 'assets.model', 'consumables', 'accessories', 'licenses', 'userloc')->withTrashed()->find($userId);
+        $user = User::with([
+            'consumables',
+            'accessories',
+            'licenses',
+            'userloc',
+        ])
+            ->withTrashed()
+            ->find($user->id);
 
         // Make sure they can view this particular user
         $this->authorize('view', $user);
 
-        if ($user) {
-            $userlog = $user->userlog->load('item');
-            return view('users/view', compact('user', 'userlog'))->with('settings', Setting::getSettings());
-        }
-
-        return redirect()->route('users.index')->with('error', trans('admin/users/message.user_not_found', ['id' => $userId]));
-
+        return view('users/view', [
+            'user' => $user,
+            'settings' => Setting::getSettings(),
+        ]);
     }
 
 
@@ -437,7 +428,7 @@ class UsersController extends Controller
      * @return \Illuminate\Contracts\View\View
      * @throws \Illuminate\Auth\Access\AuthorizationException
      */
-    public function getClone(Request $request, $id = null)
+    public function getClone(Request $request, User $user)
     {
         $this->authorize('create', User::class);
 
@@ -447,7 +438,7 @@ class UsersController extends Controller
         app('request')->request->set('permissions', $permissions);
 
 
-        $user_to_clone = User::with('assets', 'assets.model', 'consumables', 'accessories', 'licenses', 'userloc')->withTrashed()->find($id);
+        $user_to_clone = User::with('assets', 'assets.model', 'consumables', 'accessories', 'licenses', 'userloc')->withTrashed()->find($user->id);
         // Make sure they can view this particular user
         $this->authorize('view', $user_to_clone);
 
@@ -477,10 +468,10 @@ class UsersController extends Controller
                 ->with('user', $user)
                 ->with('groups', Group::pluck('name', 'id'))
                 ->with('userGroups', $userGroups)
-                ->with('clone_user', $user_to_clone);
+                ->with('clone_user', $user_to_clone)
+                ->with('item', $user);
         }
 
-        return redirect()->route('users.index')->with('error', trans('admin/users/message.user_not_found', compact('id')));
 
     }
 
@@ -598,29 +589,43 @@ class UsersController extends Controller
     /**
      * Print inventory
      *
-     * @author Aladin Alaily
      * @since [v1.8]
-     * @return \Illuminate\Http\RedirectResponse
+     * @author Aladin Alaily
      */
     public function printInventory($id)
     {
         $this->authorize('view', User::class);
-        $user = User::where('id', $id)->withTrashed()->first();
-      
 
-        // Make sure they can view this particular user
-        $this->authorize('view', $user);
+        $user = User::where('id', $id)
+            ->with([
+                'assets.log' => fn($query) => $query->withTrashed()->where('target_type', User::class)->where('target_id', $id)->where('action_type', 'accepted'),
+                'assets.assignedAssets.log' => fn($query) => $query->withTrashed()->where('target_type', User::class)->where('target_id', $id)->where('action_type', 'accepted'),
+                'assets.assignedAssets.defaultLoc',
+                'assets.assignedAssets.location',
+                'assets.assignedAssets.model.category',
+                'assets.defaultLoc',
+                'assets.location',
+                'assets.model.category',
+                'accessories.log' => fn($query) => $query->withTrashed()->where('target_type', User::class)->where('target_id', $id)->where('action_type', 'accepted'),
+                'accessories.category',
+                'accessories.manufacturer',
+                'consumables.log' => fn($query) => $query->withTrashed()->where('target_type', User::class)->where('target_id', $id)->where('action_type', 'accepted'),
+                'consumables.category',
+                'consumables.manufacturer',
+                'licenses.category',
+            ])
+            ->withTrashed()
+            ->first();
 
-        $assets = Asset::where('assigned_to', $id)->where('assigned_type', User::class)->with('model', 'model.category')->get();
-        $accessories = $user->accessories()->get();
-        $consumables = $user->consumables()->get();
+        if ($user) {
+            $this->authorize('view', $user);
 
-        return view('users/print')->with('assets', $assets)
-            ->with('licenses', $user->licenses()->get())
-            ->with('accessories', $accessories)
-            ->with('consumables', $consumables)
-            ->with('show_user', $user)
-            ->with('settings', Setting::getSettings());
+            return view('users.print')
+                ->with('users', [$user])
+                ->with('settings', Setting::getSettings());
+        }
+
+        return redirect()->route('users.index')->with('error', trans('admin/users/message.user_not_found', compact('id')));
     }
 
     /**
diff --git a/app/Http/Controllers/ViewAssetsController.php b/app/Http/Controllers/ViewAssetsController.php
index cbff99937d..bbff6ba4f7 100755
--- a/app/Http/Controllers/ViewAssetsController.php
+++ b/app/Http/Controllers/ViewAssetsController.php
@@ -2,17 +2,21 @@
 
 namespace App\Http\Controllers;
 
+use App\Actions\CheckoutRequests\CancelCheckoutRequestAction;
+use App\Actions\CheckoutRequests\CreateCheckoutRequestAction;
+use App\Exceptions\AssetNotRequestable;
 use App\Models\Actionlog;
 use App\Models\Asset;
 use App\Models\AssetModel;
-use App\Models\Company;
 use App\Models\Setting;
 use App\Models\User;
-use App\Models\CustomField;
 use App\Notifications\RequestAssetCancelation;
 use App\Notifications\RequestAssetNotification;
+use Illuminate\Auth\Access\AuthorizationException;
 use Illuminate\Http\Request;
-use Illuminate\Support\Facades\Auth;
+use Illuminate\Http\RedirectResponse;
+use \Illuminate\Contracts\View\View;
+use Exception;
 
 /**
  * This controller handles all actions related to the ability for users
@@ -25,9 +29,8 @@ class ViewAssetsController extends Controller
     /**
      * Redirect to the profile page.
      *
-     * @return \Illuminate\Http\RedirectResponse
      */
-    public function getIndex()
+    public function getIndex() : View | RedirectResponse
     {
         $user = User::with(
             'assets',
@@ -36,7 +39,7 @@ class ViewAssetsController extends Controller
             'consumables',
             'accessories',
             'licenses',
-        )->find(Auth::user()->id);
+        )->find(auth()->id());
 
         $field_array = array();
 
@@ -72,9 +75,8 @@ class ViewAssetsController extends Controller
 
     /**
      * Returns view of requestable items for a user.
-     * @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
      */
-    public function getRequestableIndex()
+    public function getRequestableIndex() : View
     {
         $assets = Asset::with('model', 'defaultLoc', 'location', 'assignedTo', 'requests')->Hardware()->RequestableAssets();
         $models = AssetModel::with('category', 'requests', 'assets')->RequestableModels()->get();
@@ -82,7 +84,7 @@ class ViewAssetsController extends Controller
         return view('account/requestable-assets', compact('assets', 'models'));
     }
 
-    public function getRequestItem(Request $request, $itemType, $itemId = null, $cancel_by_admin = false, $requestingUser = null)
+    public function getRequestItem(Request $request, $itemType, $itemId = null, $cancel_by_admin = false, $requestingUser = null): RedirectResponse
     {
         $item = null;
         $fullItemType = 'App\\Models\\'.studly_case($itemType);
@@ -92,7 +94,7 @@ class ViewAssetsController extends Controller
         }
         $item = call_user_func([$fullItemType, 'find'], $itemId);
 
-        $user = Auth::user();
+        $user = auth()->user();
 
         $logaction = new Actionlog();
         $logaction->item_id = $data['asset_id'] = $item->id;
@@ -102,14 +104,15 @@ class ViewAssetsController extends Controller
         if ($user->location_id) {
             $logaction->location_id = $user->location_id;
         }
-        $logaction->target_id = $data['user_id'] = Auth::user()->id;
+
+        $logaction->target_id = $data['user_id'] = auth()->id();
         $logaction->target_type = User::class;
 
         $data['item_quantity'] = $request->has('request-quantity') ? e($request->input('request-quantity')) : 1;
         $data['requested_by'] = $user->present()->fullName();
         $data['item'] = $item;
         $data['item_type'] = $itemType;
-        $data['target'] = Auth::user();
+        $data['target'] = auth()->user();
 
         if ($fullItemType == Asset::class) {
             $data['item_url'] = route('hardware.show', $item->id);
@@ -143,59 +146,35 @@ class ViewAssetsController extends Controller
     /**
      * Process a specific requested asset
      * @param null $assetId
-     * @return \Illuminate\Http\RedirectResponse
      */
-    public function getRequestAsset($assetId = null)
+    public function store(Asset $asset): RedirectResponse
     {
-        $user = Auth::user();
-
-        // Check if the asset exists and is requestable
-        if (is_null($asset = Asset::RequestableAssets()->find($assetId))) {
-            return redirect()->route('requestable-assets')
-                ->with('error', trans('admin/hardware/message.does_not_exist_or_not_requestable'));
+        try {
+            CreateCheckoutRequestAction::run($asset, auth()->user());
+            return redirect()->route('requestable-assets')->with('success')->with('success', trans('admin/hardware/message.requests.success'));
+        } catch (AssetNotRequestable $e) {
+            return redirect()->back()->with('error', 'Asset is not requestable');
+        } catch (AuthorizationException $e) {
+            return redirect()->back()->with('error', trans('admin/hardware/message.requests.error'));
+        } catch (Exception $e) {
+            report($e);
+            return redirect()->back()->with('error', trans('general.something_went_wrong'));
         }
-        if (! Company::isCurrentUserHasAccess($asset)) {
-            return redirect()->route('requestable-assets')
-                ->with('error', trans('general.insufficient_permissions'));
-        }
-
-        $data['item'] = $asset;
-        $data['target'] = Auth::user();
-        $data['item_quantity'] = 1;
-        $settings = Setting::getSettings();
-
-        $logaction = new Actionlog();
-        $logaction->item_id = $data['asset_id'] = $asset->id;
-        $logaction->item_type = $data['item_type'] = Asset::class;
-        $logaction->created_at = $data['requested_date'] = date('Y-m-d H:i:s');
-
-        if ($user->location_id) {
-            $logaction->location_id = $user->location_id;
-        }
-        $logaction->target_id = $data['user_id'] = Auth::user()->id;
-        $logaction->target_type = User::class;
-
-        // If it's already requested, cancel the request.
-        if ($asset->isRequestedBy(Auth::user())) {
-            $asset->cancelRequest();
-            $asset->decrement('requests_counter', 1);
-
-            $logaction->logaction('request canceled');
-            $settings->notify(new RequestAssetCancelation($data));
-
-            return redirect()->route('requestable-assets')
-                ->with('success')->with('success', trans('admin/hardware/message.requests.canceled'));
-        }
-
-        $logaction->logaction('requested');
-        $asset->request();
-        $asset->increment('requests_counter', 1);
-        $settings->notify(new RequestAssetNotification($data));
-
-        return redirect()->route('requestable-assets')->with('success')->with('success', trans('admin/hardware/message.requests.success'));
     }
 
-    public function getRequestedAssets()
+    public function destroy(Asset $asset): RedirectResponse
+    {
+        try {
+            CancelCheckoutRequestAction::run($asset, auth()->user());
+            return redirect()->route('requestable-assets')->with('success')->with('success', trans('admin/hardware/message.requests.canceled'));
+        } catch (Exception $e) {
+            report($e);
+            return redirect()->back()->with('error', trans('general.something_went_wrong'));
+        }
+    }
+
+
+    public function getRequestedAssets() : View
     {
         return view('account/requested');
     }
diff --git a/app/Http/Kernel.php b/app/Http/Kernel.php
index e3419f247c..729fe75175 100644
--- a/app/Http/Kernel.php
+++ b/app/Http/Kernel.php
@@ -14,6 +14,7 @@ class Kernel extends HttpKernel
      * @var array
      */
     protected $middleware = [
+        \App\Http\Middleware\TrustProxies::class,
         \App\Http\Middleware\NoSessionStore::class,
         \Illuminate\Foundation\Http\Middleware\PreventRequestsDuringMaintenance::class,
         \Illuminate\Session\Middleware\StartSession::class,
@@ -21,6 +22,7 @@ class Kernel extends HttpKernel
         \App\Http\Middleware\CheckForSetup::class,
         \App\Http\Middleware\CheckForDebug::class,
         \Illuminate\Foundation\Http\Middleware\ConvertEmptyStringsToNull::class,
+        \App\Http\Middleware\TrimStrings::class,
         \App\Http\Middleware\SecurityHeaders::class,
         \App\Http\Middleware\PreventBackHistory::class,
         \Illuminate\Http\Middleware\HandleCors::class,
@@ -43,10 +45,17 @@ class Kernel extends HttpKernel
             \Laravel\Passport\Http\Middleware\CreateFreshApiToken::class,
             \App\Http\Middleware\AssetCountForSidebar::class,
             \Illuminate\Session\Middleware\AuthenticateSession::class,
+            \Illuminate\Routing\Middleware\SubstituteBindings::class,
         ],
 
         'api' => [
             'auth:api',
+            \App\Http\Middleware\CheckLocale::class,
+            \Illuminate\Routing\Middleware\SubstituteBindings::class,
+        ],
+
+        'health' => [
+
         ],
     ];
 
@@ -64,5 +73,7 @@ class Kernel extends HttpKernel
         'can' => \Illuminate\Auth\Middleware\Authorize::class,
         'guest' => \App\Http\Middleware\RedirectIfAuthenticated::class,
         'throttle' => \Illuminate\Routing\Middleware\ThrottleRequests::class,
+        'api-throttle' => \App\Http\Middleware\SetAPIResponseHeaders::class,
+        'health' => null,
     ];
 }
diff --git a/app/Http/Middleware/CheckForDebug.php b/app/Http/Middleware/CheckForDebug.php
index 85311cf539..3bf919f1f2 100644
--- a/app/Http/Middleware/CheckForDebug.php
+++ b/app/Http/Middleware/CheckForDebug.php
@@ -18,7 +18,7 @@ class CheckForDebug
     {
         view()->share('debug_in_production', false);
 
-        if (((Auth::check() && (Auth::user()->isSuperUser()))) && (app()->environment() == 'production') && (config('app.warn_debug') === true) && (config('app.debug') === true)) {
+        if (((Auth::check() && (auth()->user()->isSuperUser()))) && (app()->environment() == 'production') && (config('app.warn_debug') === true) && (config('app.debug') === true)) {
             view()->share('debug_in_production', true);
         }
 
diff --git a/app/Http/Middleware/CheckForSetup.php b/app/Http/Middleware/CheckForSetup.php
index 4e399ffcff..6cb593b5ff 100644
--- a/app/Http/Middleware/CheckForSetup.php
+++ b/app/Http/Middleware/CheckForSetup.php
@@ -7,14 +7,19 @@ use Closure;
 
 class CheckForSetup
 {
+
+    protected $except = [
+        '_debugbar*',
+        'health'
+    ];
+
     public function handle($request, Closure $next, $guard = null)
     {
 
         /**
-         * This is dumb
-         * @todo Check on removing this, not sure if it's still needed
+         * Skip this middleware for the debugbar and health check
          */
-        if ($request->is('_debugbar*')) {
+        if ($request->is($this->except))  {
             return $next($request);
         }
 
@@ -25,7 +30,7 @@ class CheckForSetup
                 return $next($request);
             }
         } else {
-            if (! ($request->is('setup*')) && ! ($request->is('.env')) && ! ($request->is('health'))) {
+            if (! ($request->is('setup*')) && ! ($request->is('.env'))) {
                 return redirect(config('app.url').'/setup');
             }
 
diff --git a/app/Http/Middleware/CheckForTwoFactor.php b/app/Http/Middleware/CheckForTwoFactor.php
index 7846d00ade..b94423d205 100644
--- a/app/Http/Middleware/CheckForTwoFactor.php
+++ b/app/Http/Middleware/CheckForTwoFactor.php
@@ -38,17 +38,17 @@ class CheckForTwoFactor
         if ($settings = Setting::getSettings()) {
             if (Auth::check() && ($settings->two_factor_enabled != '')) {
                 // This user is already 2fa-authed
-                if ($request->session()->get('2fa_authed')==Auth::user()->id) {
+                if ($request->session()->get('2fa_authed')==auth()->id()) {
                     return $next($request);
                 }
 
                 // Two-factor is optional and the user has NOT opted in, let them through
-                if (($settings->two_factor_enabled == '1') && (Auth::user()->two_factor_optin != '1')) {
+                if (($settings->two_factor_enabled == '1') && (auth()->user()->two_factor_optin != '1')) {
                     return $next($request);
                 }
 
                 // Otherwise make sure they're enrolled and show them the 2FA code screen
-                if ((Auth::user()->two_factor_secret != '') && (Auth::user()->two_factor_enrolled == '1')) {
+                if ((auth()->user()->two_factor_secret != '') && (auth()->user()->two_factor_enrolled == '1')) {
                     return redirect()->route('two-factor')->with('info', trans('auth/message.two_factor.enter_two_factor_code'));
                 }
 
diff --git a/app/Http/Middleware/CheckLocale.php b/app/Http/Middleware/CheckLocale.php
index 412a423f22..68a9c48c34 100644
--- a/app/Http/Middleware/CheckLocale.php
+++ b/app/Http/Middleware/CheckLocale.php
@@ -45,7 +45,7 @@ class CheckLocale
 
         }
         
-        \App::setLocale(Helper::mapLegacyLocale($language));
+        app()->setLocale(Helper::mapLegacyLocale($language));
         return $next($request);
     }
 }
diff --git a/app/Http/Middleware/CheckPermissions.php b/app/Http/Middleware/CheckPermissions.php
index a51484f283..3eda3e3144 100644
--- a/app/Http/Middleware/CheckPermissions.php
+++ b/app/Http/Middleware/CheckPermissions.php
@@ -26,6 +26,6 @@ class CheckPermissions
 
         return response()->view('layouts/basic', [
             'content' => view('errors/403'),
-        ]);
+        ], 403);
     }
 }
diff --git a/app/Http/Middleware/EncryptCookies.php b/app/Http/Middleware/EncryptCookies.php
index 5f4c62723a..0d5b37de77 100644
--- a/app/Http/Middleware/EncryptCookies.php
+++ b/app/Http/Middleware/EncryptCookies.php
@@ -20,5 +20,5 @@ class EncryptCookies extends BaseEncrypter
      *
      * @var bool
      */
-    protected static $serialize = true;
+    protected static $serialize = false;
 }
diff --git a/app/Http/Middleware/SetAPIResponseHeaders.php b/app/Http/Middleware/SetAPIResponseHeaders.php
new file mode 100644
index 0000000000..ac277e785c
--- /dev/null
+++ b/app/Http/Middleware/SetAPIResponseHeaders.php
@@ -0,0 +1,82 @@
+<?php
+
+namespace App\Http\Middleware;
+
+use Closure;
+use Illuminate\Routing\Middleware\ThrottleRequests;
+use Symfony\Component\HttpFoundation\Response;
+
+class SetAPIResponseHeaders extends ThrottleRequests
+{
+
+    /**
+     * Add the rate limit headers to the response.
+     *
+     * This extends the original ThrottleRequests middleware to add the 'X-RateLimit-Reset' and 'Retry-After' headers, even
+     * if the rate limit is not exceeded.
+     * @param $maxAttempts
+     * @param $remainingAttempts
+     * @param $retryAfter
+     * @param Response|null $response
+     * @return array|int[]
+     */
+    protected function getHeaders($maxAttempts,  $remainingAttempts, $retryAfter = null, ?Response $response = null)
+    {
+        if ($response &&
+            ! is_null($response->headers->get('X-RateLimit-Remaining')) &&
+            (int) $response->headers->get('X-RateLimit-Remaining') <= (int) $remainingAttempts) {
+            $headers = [];
+            $headers['Retry-After'] = $retryAfter; // this is the only line we changed
+            $headers['X-RateLimit-Reset'] = $retryAfter; // this is the only line we changed
+            $headers['X-RateLimit-Reset-Timestamp'] = $this->availableAt($retryAfter); // this is the only line we changed
+            return $headers;
+        }
+
+        $headers = [
+            'X-RateLimit-Limit' => $maxAttempts,
+            'X-RateLimit-Remaining' => $remainingAttempts,
+        ];
+
+        if (! is_null($retryAfter)) {
+            $headers['Retry-After'] = $retryAfter;
+            $headers['X-RateLimit-Reset'] = $retryAfter; // this is the only line we changed
+            $headers['X-RateLimit-Reset-Timestamp'] = $this->availableAt($retryAfter); // this is the only line we changed
+        }
+
+        return $headers;
+    }
+
+
+
+    /**
+     * Handle an incoming request.
+     *
+     * @param  \Illuminate\Http\Request  $request
+     * @param  \Closure  $next
+     * @return mixed
+     */
+    protected function handleRequest($request, Closure $next, array $limits)
+    {
+        foreach ($limits as $limit) {
+            if ($this->limiter->tooManyAttempts($limit->key, $limit->maxAttempts)) {
+                throw $this->buildException($request, $limit->key, $limit->maxAttempts, $limit->responseCallback);
+            }
+
+            $this->limiter->hit($limit->key, $limit->decaySeconds);
+        }
+
+        $response = $next($request);
+
+        foreach ($limits as $limit) {
+            $response = $this->addHeaders(
+                $response,
+                $limit->maxAttempts,
+                $this->calculateRemainingAttempts($limit->key, $limit->maxAttempts),
+                $this->getTimeUntilNextRetry($limit->key) // this is the only line we changed
+            );
+        }
+
+        return $response;
+    }
+
+}
\ No newline at end of file
diff --git a/app/Http/Requests/AccessoryCheckoutRequest.php b/app/Http/Requests/AccessoryCheckoutRequest.php
new file mode 100644
index 0000000000..deda07f8ff
--- /dev/null
+++ b/app/Http/Requests/AccessoryCheckoutRequest.php
@@ -0,0 +1,76 @@
+<?php
+
+namespace App\Http\Requests;
+
+use App\Models\Accessory;
+use Illuminate\Support\Facades\Gate;
+
+class AccessoryCheckoutRequest extends ImageUploadRequest
+{
+
+    /**
+     * Determine if the user is authorized to make this request.
+     */
+    public function authorize(): bool
+    {
+        return Gate::allows('checkout', new Accessory);
+    }
+
+    public function prepareForValidation(): void
+    {
+
+        if ($this->accessory) {
+
+            $this->diff = ($this->accessory->numRemaining() - $this->checkout_qty);
+            $this->merge([
+                'checkout_qty' => $this->checkout_qty ?? 1,
+                'number_remaining_after_checkout' =>  (int) ($this->accessory->numRemaining() - $this->checkout_qty),
+                'number_currently_remaining' =>  (int) $this->accessory->numRemaining(),
+                'checkout_difference' =>  (int) $this->diff,
+            ]);
+
+            \Log::debug('---------------------------------------------');
+        }
+
+    }
+
+    /**
+     * Get the validation rules that apply to the request.
+     *
+     * @return array<string, \Illuminate\Contracts\Validation\ValidationRule|array<mixed>|string>
+     */
+    public function rules(): array
+    {
+
+        return array_merge(
+            [
+                'assigned_user'         => 'required_without_all:assigned_asset,assigned_location',
+                'assigned_asset'        => 'required_without_all:assigned_user,assigned_location',
+                'assigned_location'     => 'required_without_all:assigned_user,assigned_asset',
+                
+                'number_remaining_after_checkout' => [
+                    'min:0',
+                    'required',
+                    'integer',
+                ],
+
+                'checkout_qty' => [
+                    'integer',
+                    'lte:number_currently_remaining',
+                    'min:1',
+                ],
+            ],
+        );
+    }
+
+    public function messages(): array
+    {
+        $messages = [
+            'checkout_qty.lte' => trans_choice('admin/accessories/message.checkout.checkout_qty.lte', $this->number_currently_remaining, [
+                'number_currently_remaining' => $this->number_currently_remaining,
+                'checkout_qty' => $this->checkout_qty,
+            ]),
+        ];
+        return $messages;
+    }
+}
diff --git a/app/Http/Requests/AssetCheckinRequest.php b/app/Http/Requests/AssetCheckinRequest.php
index 116b8b39f2..8980cea095 100644
--- a/app/Http/Requests/AssetCheckinRequest.php
+++ b/app/Http/Requests/AssetCheckinRequest.php
@@ -21,9 +21,14 @@ class AssetCheckinRequest extends Request
      */
     public function rules()
     {
-        return [
+        $settings = \App\Models\Setting::getSettings();
 
-        ];
+        $rules = [];
+
+            if($settings->require_checkinout_notes) {
+            $rules['note'] = 'string|required';
+        }
+        return $rules;
     }
 
     public function response(array $errors)
diff --git a/app/Http/Requests/AssetCheckoutRequest.php b/app/Http/Requests/AssetCheckoutRequest.php
index f48a7d5e53..004813c118 100644
--- a/app/Http/Requests/AssetCheckoutRequest.php
+++ b/app/Http/Requests/AssetCheckoutRequest.php
@@ -21,10 +21,12 @@ class AssetCheckoutRequest extends Request
      */
     public function rules()
     {
+        $settings = \App\Models\Setting::getSettings();
+
         $rules = [
-            'assigned_user'         => 'required_without_all:assigned_asset,assigned_location',
-            'assigned_asset'        => 'required_without_all:assigned_user,assigned_location',
-            'assigned_location'     => 'required_without_all:assigned_user,assigned_asset',
+            'assigned_user' => 'numeric|nullable|required_without_all:assigned_asset,assigned_location',
+            'assigned_asset' => 'numeric|nullable|required_without_all:assigned_user,assigned_location',
+            'assigned_location' => 'numeric|nullable|required_without_all:assigned_user,assigned_asset',
             'status_id'             => 'exists:status_labels,id,deployable,1',
             'checkout_to_type'      => 'required|in:asset,location,user',
             'checkout_at' => [
@@ -35,7 +37,11 @@ class AssetCheckoutRequest extends Request
                 'nullable',
                 'date'
             ],
-        ];
+            ];
+
+            if($settings->require_checkinout_notes) {
+                $rules['note'] = 'required|string';
+            }
 
         return $rules;
     }
diff --git a/app/Http/Requests/DeleteUserRequest.php b/app/Http/Requests/DeleteUserRequest.php
index 282919d7ae..6d387917c6 100644
--- a/app/Http/Requests/DeleteUserRequest.php
+++ b/app/Http/Requests/DeleteUserRequest.php
@@ -24,12 +24,12 @@ class DeleteUserRequest extends FormRequest
 
     public function prepareForValidation(): void
     {
-        $user_to_delete = User::withTrashed()->find(request()->route('user'));
+        $user_to_delete = User::withTrashed()->with('managesUsers')->find(request()->route('user'));
 
         if ($user_to_delete) {
             $this->merge([
                 'user' => request()->route('user'),
-                'admin_id' => Auth::user()->id,
+                'admin_id' => auth()->id(),
                 'managed_users' => $user_to_delete->managesUsers()->count(),
                 'managed_locations' => $user_to_delete->managedLocations()->count(),
                 'assigned_assets' => $user_to_delete->assets()->count(),
@@ -48,7 +48,7 @@ class DeleteUserRequest extends FormRequest
     public function rules(): array
     {
         return [
-            'user' =>  Rule::notIn([auth()->user()->id]),
+            'user' =>  Rule::notIn([auth()->id()]),
             'managed_users' =>  Rule::in([0]),
             'managed_locations' => Rule::in([0]),
             'assigned_assets' => Rule::in([0]),
@@ -61,7 +61,8 @@ class DeleteUserRequest extends FormRequest
     public function messages(): array
     {
 
-        $user_to_delete = User::withTrashed()->find(request()->route('user'));
+        $user_to_delete = User::withTrashed()->with('managesUsers')->find(request()->route('user'));
+
         $messages = [];
 
         if ($user_to_delete) {
diff --git a/app/Http/Requests/ImageUploadRequest.php b/app/Http/Requests/ImageUploadRequest.php
index c75454d0f3..abb0cee5f7 100644
--- a/app/Http/Requests/ImageUploadRequest.php
+++ b/app/Http/Requests/ImageUploadRequest.php
@@ -10,6 +10,7 @@ use Illuminate\Http\UploadedFile;
 use Illuminate\Support\Facades\Storage;
 use Intervention\Image\Exception\NotReadableException;
 use Illuminate\Support\Facades\Log;
+use Illuminate\Support\Facades\Validator;
 
 class ImageUploadRequest extends Request
 {
@@ -96,10 +97,7 @@ class ImageUploadRequest extends Request
 
                 $ext = $image->guessExtension();
                 $file_name = $type.'-'.$form_fieldname.'-'.$item->id.'-'.str_random(10).'.'.$ext;
-
-                Log::info('File name will be: '.$file_name);
-                Log::debug('File extension is: '.$ext);
-
+                
                 if (($image->getMimeType() == 'image/vnd.microsoft.icon') || ($image->getMimeType() == 'image/x-icon') || ($image->getMimeType() == 'image/avif') || ($image->getMimeType() == 'image/webp')) {
                     // If the file is an icon, webp or avif, we need to just move it since gd doesn't support resizing
                     // icons or avif, and webp support and needs to be compiled into gd for resizing to be available
@@ -126,7 +124,7 @@ class ImageUploadRequest extends Request
 
                     } catch(NotReadableException $e) {
                         Log::debug($e);
-                        $validator = \Validator::make([], []);
+                        $validator = Validator::make([], []);
                         $validator->errors()->add($form_fieldname, trans('general.unaccepted_image_type', ['mimetype' => $image->getClientMimeType()]));
 
                         throw new \Illuminate\Validation\ValidationException($validator);
@@ -138,28 +136,28 @@ class ImageUploadRequest extends Request
                 }
 
                  // Remove Current image if exists
-                if (($item->{$form_fieldname}!='') && (Storage::disk('public')->exists($path.'/'.$item->{$db_fieldname}))) {
-                    try {
-                         Storage::disk('public')->delete($path.'/'.$item->{$form_fieldname});
-                    } catch (\Exception $e) {
-                        Log::debug('Could not delete old file. '.$path.'/'.$file_name.' does not exist?');
-                    }
-                }
-
+                $item = $this->deleteExistingImage($item, $path, $db_fieldname);
                 $item->{$db_fieldname} = $file_name;
             }
 
 
         // If the user isn't uploading anything new but wants to delete their old image, do so
         } elseif ($this->input('image_delete') == '1') {
-            Log::debug('Deleting image');
+            $item = $this->deleteExistingImage($item, $path, $db_fieldname);
+        }
+
+        return $item;
+    }
+
+    public function deleteExistingImage($item, $path = null, $db_fieldname = 'image') {
+
+        if ($item->{$db_fieldname}!='') {
             try {
                 Storage::disk('public')->delete($path.'/'.$item->{$db_fieldname});
-                    $item->{$db_fieldname} = null;
+                $item->{$db_fieldname} = null;
             } catch (\Exception $e) {
                 Log::debug($e);
             }
-
         }
 
         return $item;
diff --git a/app/Http/Requests/ItemImportRequest.php b/app/Http/Requests/ItemImportRequest.php
index 2ea0839c93..59afdbe09f 100644
--- a/app/Http/Requests/ItemImportRequest.php
+++ b/app/Http/Requests/ItemImportRequest.php
@@ -38,10 +38,11 @@ class ItemImportRequest extends FormRequest
 
         $filename = config('app.private_uploads').'/imports/'.$import->file_path;
         $import->import_type = $this->input('import-type');
-        $class = title_case($import->import_type);
+        $class = ucfirst($import->import_type);
         $classString = "App\\Importer\\{$class}Importer";
         $importer = new $classString($filename);
         $import->field_map = request('column-mappings');
+        $import->created_by = auth()->id();
         $import->save();
         $fieldMappings = [];
 
@@ -60,7 +61,7 @@ class ItemImportRequest extends FormRequest
             $fieldMappings = array_change_key_case(array_flip($import->field_map), CASE_LOWER);
         }
         $importer->setCallbacks([$this, 'log'], [$this, 'progress'], [$this, 'errorCallback'])
-                 ->setUserId(Auth::id())
+                 ->setCreatedBy(auth()->id())
                  ->setUpdating($this->get('import-update'))
                  ->setShouldNotify($this->get('send-welcome'))
                  ->setUsernameFormat('firstname.lastname')
diff --git a/app/Http/Requests/SaveUserRequest.php b/app/Http/Requests/SaveUserRequest.php
index b38193c15a..4051e98043 100644
--- a/app/Http/Requests/SaveUserRequest.php
+++ b/app/Http/Requests/SaveUserRequest.php
@@ -6,6 +6,7 @@ use App\Models\Setting;
 use Illuminate\Contracts\Validation\Validator;
 use Illuminate\Foundation\Http\FormRequest;
 use Illuminate\Http\Exceptions\HttpResponseException;
+use App\Rules\UserCannotSwitchCompaniesIfItemsAssigned;
 
 class SaveUserRequest extends FormRequest
 {
@@ -32,8 +33,9 @@ class SaveUserRequest extends FormRequest
     public function rules()
     {
         $rules = [
-            'department_id' => 'nullable|exists:departments,id',
+            'department_id' => 'nullable|integer|exists:departments,id',
             'manager_id' => 'nullable|exists:users,id',
+            'company_id' => ['nullable', 'integer', 'exists:companies,id']
         ];
 
         switch ($this->method()) {
@@ -52,11 +54,13 @@ class SaveUserRequest extends FormRequest
                 $rules['first_name'] = 'required|string|min:1';
                 $rules['username'] = 'required_unless:ldap_import,1|string|min:1';
                 $rules['password'] = Setting::passwordComplexityRulesSaving('update').'|confirmed';
+                $rules['company_id'] = [new UserCannotSwitchCompaniesIfItemsAssigned()];
                 break;
 
             // Save only what's passed
             case 'PATCH':
                 $rules['password'] = Setting::passwordComplexityRulesSaving('update');
+                $rules['company_id'] = [new UserCannotSwitchCompaniesIfItemsAssigned()];
                 break;
 
             default:
diff --git a/app/Http/Requests/SettingsSamlRequest.php b/app/Http/Requests/SettingsSamlRequest.php
index 8f02d64f03..2ab876141a 100644
--- a/app/Http/Requests/SettingsSamlRequest.php
+++ b/app/Http/Requests/SettingsSamlRequest.php
@@ -62,7 +62,7 @@ class SettingsSamlRequest extends FormRequest
             $custom_privateKey = '';
             $custom_x509certNew = '';
             if (! empty($this->input('saml_custom_settings'))) {
-                $req_custom_settings = preg_split('/\r\n|\r|\n/', $this->input('saml_custom_settings'));
+                $req_custom_settings = preg_split('/\r\n|\r|\n/', $this->input('saml_custom_settings', ''));
                 $custom_settings = [];
 
                 foreach ($req_custom_settings as $custom_setting) {
diff --git a/app/Http/Requests/StoreAccessoryRequest.php b/app/Http/Requests/StoreAccessoryRequest.php
new file mode 100644
index 0000000000..c41bae7b40
--- /dev/null
+++ b/app/Http/Requests/StoreAccessoryRequest.php
@@ -0,0 +1,56 @@
+<?php
+
+namespace App\Http\Requests;
+
+use App\Models\Accessory;
+use App\Models\Category;
+use Illuminate\Support\Facades\Gate;
+
+class StoreAccessoryRequest extends ImageUploadRequest
+{
+
+    /**
+     * Determine if the user is authorized to make this request.
+     */
+    public function authorize(): bool
+    {
+        return Gate::allows('create', new Accessory);
+    }
+
+    public function prepareForValidation(): void
+    {
+
+        if ($this->category_id) {
+            if ($category = Category::find($this->category_id)) {
+                $this->merge([
+                    'category_type' => $category->category_type ?? null,
+                ]);
+            }
+        }
+
+    }
+
+    /**
+     * Get the validation rules that apply to the request.
+     *
+     * @return array<string, \Illuminate\Contracts\Validation\ValidationRule|array<mixed>|string>
+     */
+    public function rules(): array
+    {
+        return array_merge(
+            ['category_type' => 'in:accessory'],
+            parent::rules(),
+        );
+    }
+
+    public function messages(): array
+    {
+        $messages = ['category_type.in' => trans('admin/accessories/message.invalid_category_type')];
+        return $messages;
+    }
+
+    public function response(array $errors)
+    {
+        return $this->redirector->back()->withInput()->withErrors($errors, $this->errorBag);
+    }
+}
diff --git a/app/Http/Requests/StoreAssetModelRequest.php b/app/Http/Requests/StoreAssetModelRequest.php
new file mode 100644
index 0000000000..0da47b0c72
--- /dev/null
+++ b/app/Http/Requests/StoreAssetModelRequest.php
@@ -0,0 +1,57 @@
+<?php
+
+namespace App\Http\Requests;
+
+use App\Models\AssetModel;
+use App\Models\Category;
+use Illuminate\Support\Facades\Gate;
+
+class StoreAssetModelRequest extends ImageUploadRequest
+{
+
+    /**
+     * Determine if the user is authorized to make this request.
+     */
+    public function authorize(): bool
+    {
+        return Gate::allows('create', new AssetModel);
+    }
+
+    public function prepareForValidation(): void
+    {
+        parent::prepareForValidation();
+
+        if ($this->category_id) {
+            if ($category = Category::find($this->category_id)) {
+                $this->merge([
+                    'category_type' => $category->category_type ?? null,
+                ]);
+            }
+        }
+
+    }
+
+    /**
+     * Get the validation rules that apply to the request.
+     *
+     * @return array<string, \Illuminate\Contracts\Validation\ValidationRule|array<mixed>|string>
+     */
+    public function rules(): array
+    {
+        return array_merge(
+            ['category_type' => 'in:asset'],
+            parent::rules(),
+        );
+    }
+
+    public function messages(): array
+    {
+        $messages = ['category_type.in' => trans('admin/models/message.invalid_category_type')];
+        return $messages;
+    }
+
+    public function response(array $errors)
+    {
+        return $this->redirector->back()->withInput()->withErrors($errors, $this->errorBag);
+    }
+}
diff --git a/app/Http/Requests/StoreAssetRequest.php b/app/Http/Requests/StoreAssetRequest.php
index 007dd26843..66179ac739 100644
--- a/app/Http/Requests/StoreAssetRequest.php
+++ b/app/Http/Requests/StoreAssetRequest.php
@@ -2,15 +2,18 @@
 
 namespace App\Http\Requests;
 
+use App\Http\Requests\Traits\MayContainCustomFields;
 use App\Models\Asset;
 use App\Models\Company;
 use App\Models\Setting;
 use Carbon\Carbon;
 use Carbon\Exceptions\InvalidFormatException;
 use Illuminate\Support\Facades\Gate;
+use App\Rules\AssetCannotBeCheckedOutToNondeployableStatus;
 
 class StoreAssetRequest extends ImageUploadRequest
 {
+    use MayContainCustomFields;
     /**
      * Determine if the user is authorized to make this request.
      *
@@ -26,7 +29,8 @@ class StoreAssetRequest extends ImageUploadRequest
         // Guard against users passing in an array for company_id instead of an integer.
         // If the company_id is not an integer then we simply use what was
         // provided to be caught by model level validation later.
-        $idForCurrentUser = is_int($this->company_id)
+        // The use of is_numeric accounts for 1 and '1'.
+        $idForCurrentUser = is_numeric($this->company_id)
             ? Company::getIdForCurrentUser($this->company_id)
             : $this->company_id;
 
@@ -35,7 +39,6 @@ class StoreAssetRequest extends ImageUploadRequest
         $this->merge([
             'asset_tag' => $this->asset_tag ?? Asset::autoincrement_asset(),
             'company_id' => $idForCurrentUser,
-            'assigned_to' => $assigned_to ?? null,
         ]);
     }
 
@@ -59,6 +62,7 @@ class StoreAssetRequest extends ImageUploadRequest
 
         return array_merge(
             $modelRules,
+            ['status_id' => [new AssetCannotBeCheckedOutToNondeployableStatus()]],
             parent::rules(),
         );
     }
diff --git a/app/Http/Requests/StoreConsumableRequest.php b/app/Http/Requests/StoreConsumableRequest.php
new file mode 100644
index 0000000000..9062b07cc5
--- /dev/null
+++ b/app/Http/Requests/StoreConsumableRequest.php
@@ -0,0 +1,56 @@
+<?php
+
+namespace App\Http\Requests;
+
+use App\Models\Consumable;
+use App\Models\Category;
+use Illuminate\Support\Facades\Gate;
+
+class StoreConsumableRequest extends ImageUploadRequest
+{
+
+    /**
+     * Determine if the user is authorized to make this request.
+     */
+    public function authorize(): bool
+    {
+        return Gate::allows('create', new Consumable);
+    }
+
+    public function prepareForValidation(): void
+    {
+
+        if ($this->category_id) {
+            if ($category = Category::find($this->category_id)) {
+                $this->merge([
+                    'category_type' => $category->category_type ?? null,
+                ]);
+            }
+        }
+
+    }
+
+    /**
+     * Get the validation rules that apply to the request.
+     *
+     * @return array<string, \Illuminate\Contracts\Validation\ValidationRule|array<mixed>|string>
+     */
+    public function rules(): array
+    {
+        return array_merge(
+            ['category_type' => 'in:consumable'],
+            parent::rules(),
+        );
+    }
+
+    public function messages(): array
+    {
+        $messages = ['category_type.in' => trans('admin/consumables/message.invalid_category_type')];
+        return $messages;
+    }
+
+    public function response(array $errors)
+    {
+        return $this->redirector->back()->withInput()->withErrors($errors, $this->errorBag);
+    }
+}
diff --git a/app/Http/Requests/StoreLabelSettings.php b/app/Http/Requests/StoreLabelSettings.php
new file mode 100644
index 0000000000..2b6fd83c6f
--- /dev/null
+++ b/app/Http/Requests/StoreLabelSettings.php
@@ -0,0 +1,58 @@
+<?php
+
+namespace App\Http\Requests;
+
+
+use App\Models\Labels\Label;
+use Illuminate\Foundation\Http\FormRequest;
+use Illuminate\Support\Facades\Gate;
+use Illuminate\Validation\Rule;
+
+class StoreLabelSettings extends FormRequest
+{
+    /**
+     * Determine if the user is authorized to make this request.
+     */
+    public function authorize(): bool
+    {
+        return Gate::allows('superuser');
+    }
+
+    /**
+     * Get the validation rules that apply to the request.
+     *
+     * @return array<string, \Illuminate\Contracts\Validation\ValidationRule|array<mixed>|string>
+     */
+    public function rules(): array
+    {
+        $names = Label::find()?->map(function ($label) {
+            return $label->getName();
+        })->values()->toArray();
+
+        if (empty($this->input('label2_template'))) {
+            $this->merge([
+                'label2_template' => 'DefaultLabel',
+            ]);
+        }
+
+        return [
+            'labels_per_page'                     => 'numeric',
+            'labels_width'                        => 'numeric|min:0.1',
+            'labels_height'                       => 'numeric|min:0.1',
+            'labels_pmargin_left'                 => 'numeric|nullable',
+            'labels_pmargin_right'                => 'numeric|nullable',
+            'labels_pmargin_top'                  => 'numeric|nullable',
+            'labels_pmargin_bottom'               => 'numeric|nullable',
+            'labels_display_bgutter'              => 'numeric|nullable',
+            'labels_display_sgutter'              => 'numeric|nullable',
+            'labels_fontsize'                     => 'numeric|min:5',
+            'labels_pagewidth'                    => 'numeric|nullable',
+            'labels_pageheight'                   => 'numeric|nullable',
+            'qr_text'                             => 'max:31|nullable',
+            'label2_template'                     => [
+                'required',
+                Rule::in($names),
+            ],
+        ];
+    }
+}
diff --git a/app/Http/Requests/StoreLdapSettings.php b/app/Http/Requests/StoreLdapSettings.php
new file mode 100644
index 0000000000..ce0fa41bf5
--- /dev/null
+++ b/app/Http/Requests/StoreLdapSettings.php
@@ -0,0 +1,36 @@
+<?php
+
+namespace App\Http\Requests;
+
+use Illuminate\Foundation\Http\FormRequest;
+use Illuminate\Support\Facades\Gate;
+
+class StoreLdapSettings extends FormRequest
+{
+    /**
+     * Determine if the user is authorized to make this request.
+     */
+    public function authorize(): bool
+    {
+        return Gate::allows('superuser');
+    }
+
+    /**
+     * Get the validation rules that apply to the request.
+     *
+     * @return array<string, \Illuminate\Contracts\Validation\ValidationRule|array<mixed>|string>
+     */
+    public function rules(): array
+    {
+        return [
+            'ldap_username_field' => 'not_in:sAMAccountName|required_if:ldap_enabled,1',
+            'ldap_auth_filter_query' => 'not_in:uid=samaccountname|required_if:ldap_enabled,1',
+            'ldap_filter' => 'nullable|regex:"^[^(]"|required_if:ldap_enabled,1',
+            'ldap_server' => 'nullable|required_if:ldap_enabled,1|starts_with:ldap://,ldaps://',
+            'ldap_basedn' => 'nullable|required_if:ldap_enabled,1',
+            'ldap_fname_field' => 'nullable|required_if:ldap_enabled,1',
+            'custom_forgot_pass_url' => 'nullable|url',
+        ];
+    }
+
+}
diff --git a/app/Http/Requests/StoreLocalizationSettings.php b/app/Http/Requests/StoreLocalizationSettings.php
new file mode 100644
index 0000000000..4cea8826e8
--- /dev/null
+++ b/app/Http/Requests/StoreLocalizationSettings.php
@@ -0,0 +1,30 @@
+<?php
+
+namespace App\Http\Requests;
+
+use Illuminate\Foundation\Http\FormRequest;
+use Illuminate\Support\Facades\Gate;
+
+class StoreLocalizationSettings extends FormRequest
+{
+    /**
+     * Determine if the user is authorized to make this request.
+     */
+    public function authorize(): bool
+    {
+        return Gate::allows('superuser');
+    }
+
+    /**
+     * Get the validation rules that apply to the request.
+     *
+     * @return array<string, \Illuminate\Contracts\Validation\ValidationRule|array<mixed>|string>
+     */
+    public function rules(): array
+    {
+        return [
+            'default_currency'                    => 'required',
+            'locale'                              => 'required',
+        ];
+    }
+}
diff --git a/app/Http/Requests/StoreNotificationSettings.php b/app/Http/Requests/StoreNotificationSettings.php
new file mode 100644
index 0000000000..f58d014c76
--- /dev/null
+++ b/app/Http/Requests/StoreNotificationSettings.php
@@ -0,0 +1,41 @@
+<?php
+
+namespace App\Http\Requests;
+
+use App\Models\Accessory;
+use Illuminate\Foundation\Http\FormRequest;
+use Illuminate\Support\Facades\Gate;
+use Illuminate\Validation\Rule;
+
+class StoreNotificationSettings extends FormRequest
+{
+    /**
+     * Determine if the user is authorized to make this request.
+     */
+    public function authorize(): bool
+    {
+        return Gate::allows('superuser');
+    }
+
+    /**
+     * Get the validation rules that apply to the request.
+     *
+     * @return array<string, \Illuminate\Contracts\Validation\ValidationRule|array<mixed>|string>
+     */
+    public function rules(): array
+    {
+        return [
+            'alert_email'                         => 'email_array|nullable',
+            'admin_cc_email'                      => 'email_array|nullable',
+            'admin_cc_always' => [
+                Rule::in('0', '1'),
+            ],
+            'alert_threshold'                     => 'numeric|nullable',
+            'alert_interval'                      => 'numeric|nullable|gt:0',
+            'audit_warning_days'                  => 'numeric|nullable',
+            'due_checkin_days'                    => 'numeric|nullable|gt:0',
+            'audit_interval'                      => 'numeric|nullable|gt:0',
+        ];
+    }
+
+}
diff --git a/app/Http/Requests/StoreSecuritySettings.php b/app/Http/Requests/StoreSecuritySettings.php
new file mode 100644
index 0000000000..42a529aa57
--- /dev/null
+++ b/app/Http/Requests/StoreSecuritySettings.php
@@ -0,0 +1,35 @@
+<?php
+
+namespace App\Http\Requests;
+
+use Illuminate\Foundation\Http\FormRequest;
+use Illuminate\Support\Facades\Gate;
+
+class StoreSecuritySettings extends FormRequest
+{
+    /**
+     * Determine if the user is authorized to make this request.
+     */
+    public function authorize(): bool
+    {
+        return Gate::allows('superuser');
+    }
+
+    /**
+     * Get the validation rules that apply to the request.
+     *
+     * @return array<string, \Illuminate\Contracts\Validation\ValidationRule|array<mixed>|string>
+     */
+    public function rules(): array
+    {
+        return [
+            'pwd_secure_min'                      => 'numeric|required|min:8',
+            'custom_forgot_pass_url'              => 'url|nullable',
+            'privacy_policy_link'                 => 'nullable|url',
+            'login_remote_user_enabled'           => 'numeric|nullable',
+            'login_common_disabled'               => 'numeric|nullable',
+            'login_remote_user_custom_logout_url' => 'string|nullable',
+            'login_remote_user_header_name'       => 'string|nullable',
+        ];
+    }
+}
diff --git a/app/Http/Requests/Traits/MayContainCustomFields.php b/app/Http/Requests/Traits/MayContainCustomFields.php
new file mode 100644
index 0000000000..2b12ccff6e
--- /dev/null
+++ b/app/Http/Requests/Traits/MayContainCustomFields.php
@@ -0,0 +1,56 @@
+<?php
+
+namespace App\Http\Requests\Traits;
+
+use App\Models\AssetModel;
+use App\Models\CustomField;
+
+trait MayContainCustomFields
+{
+    // this gets called automatically on a form request
+    public function withValidator($validator)
+    {
+
+        // In case the model is being changed via form
+        if (request()->has('model_id')!='') {
+
+            $asset_model = AssetModel::find(request()->input('model_id'));
+
+        // or if we have it available to route-model-binding
+        } elseif ((request()->route('asset') && (request()->route('asset')->model_id))) {
+
+            $asset_model = AssetModel::find(request()->route('asset')->model_id);
+
+        } else {
+
+            if ($this->method() == 'POST') {
+                $asset_model = AssetModel::find($this->model_id);
+            }
+
+            if ($this->method() == 'PATCH' || $this->method() == 'PUT') {
+                $asset_model = $this->asset->model;
+            }
+        }
+
+
+        // collect the custom fields in the request
+        $validator->after(function ($validator) use ($asset_model) {
+            $request_fields = $this->collect()->keys()->filter(function ($attributes) {
+                return str_starts_with($attributes, '_snipeit_');
+            });
+
+            // if there are custom fields, find the ones that don't exist on the model's fieldset and add an error to the validator's error bag
+            if (count($request_fields) > 0 && $validator->errors()->isEmpty()) {
+                $request_fields->diff($asset_model?->fieldset?->fields?->pluck('db_column'))
+                        ->each(function ($request_field_name) use ($request_fields, $validator) {
+                            if (CustomField::where('db_column', $request_field_name)->exists()) {
+                                $validator->errors()->add($request_field_name, trans('validation.custom.custom_field_not_found_on_model'));
+                            } else {
+                                $validator->errors()->add($request_field_name, trans('validation.custom.custom_field_not_found'));
+                            }
+                        });
+            }
+        });
+    }
+}
+
diff --git a/app/Http/Requests/UpdateAssetRequest.php b/app/Http/Requests/UpdateAssetRequest.php
new file mode 100644
index 0000000000..1b379358f9
--- /dev/null
+++ b/app/Http/Requests/UpdateAssetRequest.php
@@ -0,0 +1,53 @@
+<?php
+
+namespace App\Http\Requests;
+
+use App\Http\Requests\Traits\MayContainCustomFields;
+use App\Models\Asset;
+use App\Models\Setting;
+use Illuminate\Support\Facades\Gate;
+use Illuminate\Validation\Rule;
+
+class UpdateAssetRequest extends ImageUploadRequest
+{
+    use MayContainCustomFields;
+    /**
+     * Determine if the user is authorized to make this request.
+     *
+     * @return bool
+     */
+    public function authorize()
+    {
+        return Gate::allows('update', $this->asset);
+    }
+
+    /**
+     * Get the validation rules that apply to the request.
+     *
+     * @return array
+     */
+    public function rules()
+    {
+        $rules = array_merge(
+            parent::rules(),
+            (new Asset)->getRules(),
+            // this is to overwrite rulesets that include required, and rewrite unique_undeleted
+            [
+                'model_id'  => ['integer', 'exists:models,id,deleted_at,NULL', 'not_array'],
+                'status_id' => ['integer', 'exists:status_labels,id'],
+                'asset_tag' => [
+                    'min:1', 'max:255', 'not_array',
+                    Rule::unique('assets', 'asset_tag')->ignore($this->asset)->withoutTrashed()
+                ],
+            ],
+        );
+
+        // if the purchase cost is passed in as a string **and** the digit_separator is ',' (as is common in the EU)
+        // then we tweak the purchase_cost rule to make it a string
+        if (Setting::getSettings()->digit_separator === '1.234,56' && is_string($this->input('purchase_cost'))) {
+            $rules['purchase_cost'] = ['nullable', 'string'];
+        }
+
+        return $rules;
+    }
+}
diff --git a/app/Http/Requests/UploadFileRequest.php b/app/Http/Requests/UploadFileRequest.php
index 4762e52b75..e58f1a1be3 100644
--- a/app/Http/Requests/UploadFileRequest.php
+++ b/app/Http/Requests/UploadFileRequest.php
@@ -46,8 +46,6 @@ class UploadFileRequest extends Request
         $extension = $file->getClientOriginalExtension();
         $file_name = $name_prefix.'-'.str_random(8).'-'.str_slug(basename($file->getClientOriginalName(), '.'.$extension)).'.'.$file->guessExtension();
 
-
-        Log::debug("Your filetype IS: ".$file->getMimeType());
         // Check for SVG and sanitize it
         if ($file->getMimeType() === 'image/svg+xml') {
             Log::debug('This is an SVG');
@@ -66,7 +64,6 @@ class UploadFileRequest extends Request
 
         } else {
             $put_results = Storage::put($dirname.$file_name, file_get_contents($file));
-            Log::debug("Here are the '$put_results' (should be 0 or 1 or true or false or something?)");
         }
         return $file_name;
     }
diff --git a/app/Http/Traits/TwoColumnUniqueUndeletedTrait.php b/app/Http/Traits/TwoColumnUniqueUndeletedTrait.php
index 4aae02bfbd..0cf0edb455 100644
--- a/app/Http/Traits/TwoColumnUniqueUndeletedTrait.php
+++ b/app/Http/Traits/TwoColumnUniqueUndeletedTrait.php
@@ -11,15 +11,17 @@ trait TwoColumnUniqueUndeletedTrait
      * @param  string $field
      * @return string
      */
-    protected function prepareTwoColumnUniqueUndeletedRule($parameters, $field)
+    protected function prepareTwoColumnUniqueUndeletedRule($parameters)
     {
         $column = $parameters[0];
         $value = $this->{$parameters[0]};
 
+        // This is an existing model we're updating so ignore the current ID ($this->getKey())
         if ($this->exists) {
             return 'two_column_unique_undeleted:'.$this->table.','.$this->getKey().','.$column.','.$value;
         }
 
+        // This is a new record, so we can ignore the current ID
         return 'two_column_unique_undeleted:'.$this->table.',0,'.$column.','.$value;
     }
 }
diff --git a/app/Http/Transformers/AccessoriesTransformer.php b/app/Http/Transformers/AccessoriesTransformer.php
index 7b79973a9a..b502490884 100644
--- a/app/Http/Transformers/AccessoriesTransformer.php
+++ b/app/Http/Transformers/AccessoriesTransformer.php
@@ -37,10 +37,15 @@ class AccessoriesTransformer
             'purchase_date' => ($accessory->purchase_date) ? Helper::getFormattedDateObject($accessory->purchase_date, 'date') : null,
             'purchase_cost' => Helper::formatCurrencyOutput($accessory->purchase_cost),
             'order_number' => ($accessory->order_number) ? e($accessory->order_number) : null,
-            'min_qty' => ($accessory->min_amt) ? (int) $accessory->min_amt : null,
-            'remaining_qty' => (int) $accessory->numRemaining(),
-            'users_count' =>  $accessory->users_count,
-
+            'min_qty' => ($accessory->min_amt) ? (int) $accessory->min_amt : null, // Legacy - should phase out - replaced by below, for the bootstrap table formatter
+            'min_amt' => ($accessory->min_amt) ? (int) $accessory->min_amt : null,
+            'remaining_qty' => (int) ($accessory->qty - $accessory->checkouts_count), // Legacy - should phase out - replaced by below, for the bootstrap table formatter
+            'remaining' => (int) ($accessory->qty - $accessory->checkouts_count),
+            'checkouts_count' =>  $accessory->checkouts_count,
+            'created_by' => ($accessory->adminuser) ? [
+                'id' => (int) $accessory->adminuser->id,
+                'name'=> e($accessory->adminuser->present()->fullName()),
+            ] : null,
             'created_at' => Helper::getFormattedDateObject($accessory->created_at, 'datetime'),
             'updated_at' => Helper::getFormattedDateObject($accessory->updated_at, 'datetime'),
 
@@ -50,14 +55,14 @@ class AccessoriesTransformer
             'checkout' => Gate::allows('checkout', Accessory::class),
             'checkin' =>  false,
             'update' => Gate::allows('update', Accessory::class),
-            'delete' => Gate::allows('delete', Accessory::class),
+            'delete' => $accessory->checkouts_count === 0 && Gate::allows('delete', Accessory::class),
             'clone' => Gate::allows('create', Accessory::class),
             
         ];
 
         $permissions_array['user_can_checkout'] = false;
 
-        if ($accessory->numRemaining() > 0) {
+        if (($accessory->qty - $accessory->checkouts_count) > 0) {
             $permissions_array['user_can_checkout'] = true;
         }
 
@@ -66,27 +71,39 @@ class AccessoriesTransformer
         return $array;
     }
 
-    public function transformCheckedoutAccessory($accessory, $accessory_users, $total)
+    public function transformCheckedoutAccessory($accessory_checkouts, $total)
     {
         $array = [];
 
-        foreach ($accessory_users as $user) {
+        foreach ($accessory_checkouts as $checkout) {
             $array[] = [
-
-                'assigned_pivot_id' => $user->pivot->id,
-                'id' => (int) $user->id,
-                'username' => e($user->username),
-                'name' => e($user->getFullNameAttribute()),
-                'first_name'=> e($user->first_name),
-                'last_name'=> e($user->last_name),
-                'employee_number' =>  e($user->employee_num),
-                'checkout_notes' => e($user->pivot->note),
-                'last_checkout' => Helper::getFormattedDateObject($user->pivot->created_at, 'datetime'),
-                'type' => 'user',
-                'available_actions' => ['checkin' => true],
+                'id' => $checkout->id,
+                'assigned_to' => $this->transformAssignedTo($checkout),
+                'note' => $checkout->note ? e($checkout->note) : null,
+                'created_by' => $checkout->adminuser ? [
+                    'id' => (int) $checkout->adminuser->id,
+                    'name'=> e($checkout->adminuser->present()->fullName),
+                ]: null,
+                'created_at' => Helper::getFormattedDateObject($checkout->created_at, 'datetime'),
+                'available_actions' => Gate::allows('checkout', Accessory::class) ? ['checkin' => true] : ['checkin' => false],
             ];
         }
 
         return (new DatatablesTransformer)->transformDatatables($array, $total);
     }
+
+    public function transformAssignedTo($accessoryCheckout)
+    {
+        if (is_null($accessoryCheckout->assigned)) {
+            return null;
+        }
+
+        if ($accessoryCheckout->checkedOutToUser()) {
+            return (new UsersTransformer)->transformUserCompact($accessoryCheckout->assigned);
+        } elseif ($accessoryCheckout->checkedOutToLocation()) {
+            return (new LocationsTransformer())->transformLocationCompact($accessoryCheckout->assigned);
+        } elseif ($accessoryCheckout->checkedOutToAsset()) {
+            return (new AssetsTransformer())->transformAssetCompact($accessoryCheckout->assigned);
+        }
+    }
 }
diff --git a/app/Http/Transformers/ActionlogsTransformer.php b/app/Http/Transformers/ActionlogsTransformer.php
index ef00c74471..702ea123d8 100644
--- a/app/Http/Transformers/ActionlogsTransformer.php
+++ b/app/Http/Transformers/ActionlogsTransformer.php
@@ -140,11 +140,13 @@ class ActionlogsTransformer
             } else {
                 if ($actionlog->item) {
                     if ($actionlog->itemType() == 'asset') {
-                        $file_url = route('show/assetfile', ['assetId' => $actionlog->item->id, 'fileId' => $actionlog->id]);
+                        $file_url = route('show/assetfile', ['asset' => $actionlog->item->id, 'fileId' => $actionlog->id]);
+                    } elseif ($actionlog->itemType() == 'accessory') {
+                        $file_url = route('show.accessoryfile', ['accessoryId' => $actionlog->item->id, 'fileId' => $actionlog->id]);
                     } elseif ($actionlog->itemType() == 'license') {
                         $file_url = route('show.licensefile', ['licenseId' => $actionlog->item->id, 'fileId' => $actionlog->id]);
                     } elseif ($actionlog->itemType() == 'user') {
-                        $file_url = route('show/userfile', ['userId' => $actionlog->item->id, 'fileId' => $actionlog->id]);
+                        $file_url = route('show/userfile', ['user' => $actionlog->item->id, 'fileId' => $actionlog->id]);
                     }
                 }
             }
@@ -158,7 +160,6 @@ class ActionlogsTransformer
                 [
                     'url' => $file_url,
                     'filename' => $actionlog->filename,
-                    'inlineable' => (bool) Helper::show_file_inline($actionlog->filename),
                 ] : null,
 
             'item' => ($actionlog->item) ? [
@@ -176,11 +177,17 @@ class ActionlogsTransformer
             'next_audit_date' => ($actionlog->itemType()=='asset') ? Helper::getFormattedDateObject($actionlog->calcNextAuditDate(null, $actionlog->item), 'date'): null,
             'days_to_next_audit' => $actionlog->daysUntilNextAudit($settings->audit_interval, $actionlog->item),
             'action_type'   => $actionlog->present()->actionType(),
-            'admin' => ($actionlog->admin) ? [
-                'id' => (int) $actionlog->admin->id,
-                'name' => e($actionlog->admin->getFullNameAttribute()),
-                'first_name'=> e($actionlog->admin->first_name),
-                'last_name'=> e($actionlog->admin->last_name)
+            'admin' => ($actionlog->adminuser) ? [
+                'id' => (int) $actionlog->adminuser->id,
+                'name' => e($actionlog->adminuser->getFullNameAttribute()),
+                'first_name'=> e($actionlog->adminuser->first_name),
+                'last_name'=> e($actionlog->adminuser->last_name)
+            ] : null,
+            'created_by' => ($actionlog->adminuser) ? [
+                'id' => (int) $actionlog->adminuser->id,
+                'name' => e($actionlog->adminuser->getFullNameAttribute()),
+                'first_name'=> e($actionlog->adminuser->first_name),
+                'last_name'=> e($actionlog->adminuser->last_name)
             ] : null,
             'target' => ($actionlog->target) ? [
                 'id' => (int) $actionlog->target->id,
@@ -205,11 +212,11 @@ class ActionlogsTransformer
 
 
 
-    public function transformCheckedoutActionlog (Collection $accessories_users, $total)
+    public function transformCheckedoutActionlog (Collection $accessories_checkout, $total)
     {
 
         $array = array();
-        foreach ($accessories_users as $user) {
+        foreach ($accessories_checkout as $user) {
             $array[] = (new UsersTransformer)->transformUser($user);
         }
         return (new DatatablesTransformer)->transformDatatables($array, $total);
@@ -256,7 +263,7 @@ class ActionlogsTransformer
 
             $clean_meta['rtd_location_id']['old'] = $clean_meta['rtd_location_id']['old'] ? "[id: ".$clean_meta['rtd_location_id']['old']."] ". $oldRtdName : '';
             $clean_meta['rtd_location_id']['new'] = $clean_meta['rtd_location_id']['new'] ? "[id: ".$clean_meta['rtd_location_id']['new']."] ". $newRtdName : '';
-            $clean_meta['Default Location'] = $clean_meta['rtd_location_id'];
+            $clean_meta[trans('admin/hardware/form.default_location')] = $clean_meta['rtd_location_id'];
             unset($clean_meta['rtd_location_id']);
         }
 
@@ -272,7 +279,7 @@ class ActionlogsTransformer
 
             $clean_meta['location_id']['old'] = $clean_meta['location_id']['old'] ? "[id: ".$clean_meta['location_id']['old']."] ". $oldLocationName : '';
             $clean_meta['location_id']['new'] = $clean_meta['location_id']['new'] ? "[id: ".$clean_meta['location_id']['new']."] ". $newLocationName : '';
-            $clean_meta['Current Location'] = $clean_meta['location_id'];
+            $clean_meta[trans('admin/locations/message.current_location')] = $clean_meta['location_id'];
             unset($clean_meta['location_id']);
         }
 
@@ -287,7 +294,7 @@ class ActionlogsTransformer
             $clean_meta['model_id']['old'] = "[id: ".$clean_meta['model_id']['old']."] ".$oldModelName;
             $clean_meta['model_id']['new'] = "[id: ".$clean_meta['model_id']['new']."] ".$newModelName; /** model is required at asset creation */
 
-            $clean_meta['Model'] = $clean_meta['model_id'];
+            $clean_meta[trans('admin/hardware/form.model')] = $clean_meta['model_id'];
             unset($clean_meta['model_id']);
         }
         if(array_key_exists('company_id', $clean_meta)) {
@@ -300,7 +307,7 @@ class ActionlogsTransformer
 
             $clean_meta['company_id']['old'] = $clean_meta['company_id']['old'] ? "[id: ".$clean_meta['company_id']['old']."] ". $oldCompanyName : trans('general.unassigned');
             $clean_meta['company_id']['new'] = $clean_meta['company_id']['new'] ? "[id: ".$clean_meta['company_id']['new']."] ". $newCompanyName : trans('general.unassigned');
-            $clean_meta['Company'] = $clean_meta['company_id'];
+            $clean_meta[trans('general.company')] = $clean_meta['company_id'];
             unset($clean_meta['company_id']);
         }
         if(array_key_exists('supplier_id', $clean_meta)) {
@@ -313,7 +320,7 @@ class ActionlogsTransformer
 
             $clean_meta['supplier_id']['old'] = $clean_meta['supplier_id']['old'] ? "[id: ".$clean_meta['supplier_id']['old']."] ". $oldSupplierName : trans('general.unassigned');
             $clean_meta['supplier_id']['new'] = $clean_meta['supplier_id']['new'] ? "[id: ".$clean_meta['supplier_id']['new']."] ". $newSupplierName : trans('general.unassigned');
-            $clean_meta['Supplier'] = $clean_meta['supplier_id'];
+            $clean_meta[trans('general.supplier')] = $clean_meta['supplier_id'];
             unset($clean_meta['supplier_id']);
         }
         if(array_key_exists('status_id', $clean_meta)) {
@@ -326,11 +333,11 @@ class ActionlogsTransformer
 
             $clean_meta['status_id']['old'] = $clean_meta['status_id']['old'] ? "[id: ".$clean_meta['status_id']['old']."] ". $oldStatusName : trans('general.unassigned');
             $clean_meta['status_id']['new'] = $clean_meta['status_id']['new'] ? "[id: ".$clean_meta['status_id']['new']."] ". $newStatusName : trans('general.unassigned');
-            $clean_meta['Status'] = $clean_meta['status_id'];
+            $clean_meta[trans('general.status_label')] = $clean_meta['status_id'];
             unset($clean_meta['status_id']);
         }
         if(array_key_exists('asset_eol_date', $clean_meta)) {
-            $clean_meta['EOL date'] = $clean_meta['asset_eol_date'];
+            $clean_meta[trans('admin/hardware/form.eol_date')] = $clean_meta['asset_eol_date'];
             unset($clean_meta['asset_eol_date']);
         }
 
@@ -340,4 +347,4 @@ class ActionlogsTransformer
 
 
 
-}
\ No newline at end of file
+}
diff --git a/app/Http/Transformers/AssetMaintenancesTransformer.php b/app/Http/Transformers/AssetMaintenancesTransformer.php
index 88ac447c25..ab4ca04cc6 100644
--- a/app/Http/Transformers/AssetMaintenancesTransformer.php
+++ b/app/Http/Transformers/AssetMaintenancesTransformer.php
@@ -29,14 +29,15 @@ class AssetMaintenancesTransformer
                 'name'=> ($assetmaintenance->asset->name) ? e($assetmaintenance->asset->name) : null,
                 'asset_tag'=> e($assetmaintenance->asset->asset_tag),
                 'serial'=> e($assetmaintenance->asset->serial),
-                'deleted_at'=> e($assetmaintenance->asset->deleted_at),
-                'created_at'=> e($assetmaintenance->asset->created_at),
+                'deleted_at'=> Helper::getFormattedDateObject($assetmaintenance->asset->deleted_at, 'datetime'),
+                'created_at' => Helper::getFormattedDateObject($assetmaintenance->asset->created_at, 'datetime'),
+                'updated_at' => Helper::getFormattedDateObject($assetmaintenance->asset->updated_at, 'datetime'),
             ] : null,
             'model' => (($assetmaintenance->asset) && ($assetmaintenance->asset->model)) ? [
                 'id' => (int) $assetmaintenance->asset->model->id,
                 'name'=> ($assetmaintenance->asset->model->name) ? e($assetmaintenance->asset->model->name).' '.e($assetmaintenance->asset->model->model_number) : null,
             ] : null,
-            'status_label' => ($assetmaintenance->asset->assetstatus) ? [
+            'status_label' => (($assetmaintenance->asset) && ($assetmaintenance->asset->assetstatus)) ? [
                 'id' => (int) $assetmaintenance->asset->assetstatus->id,
                 'name'=> e($assetmaintenance->asset->assetstatus->name),
                 'status_type'=> e($assetmaintenance->asset->assetstatus->getStatuslabelType()),
@@ -58,13 +59,23 @@ class AssetMaintenancesTransformer
                 'name'=> e($assetmaintenance->asset->defaultLoc->name),
             ] : null,
             'notes'         => ($assetmaintenance->notes) ? Helper::parseEscapedMarkedownInline($assetmaintenance->notes) : null,
-            'supplier'      => ($assetmaintenance->supplier) ? ['id' => $assetmaintenance->supplier->id, 'name'=> e($assetmaintenance->supplier->name)] : null,
+            'supplier'      => ($assetmaintenance->supplier) ?  [
+                    'id' => $assetmaintenance->supplier->id,
+                    'name'=> e($assetmaintenance->supplier->name)
+                    ] : null,
             'cost'          => Helper::formatCurrencyOutput($assetmaintenance->cost),
             'asset_maintenance_type'          => e($assetmaintenance->asset_maintenance_type),
             'start_date'         => Helper::getFormattedDateObject($assetmaintenance->start_date, 'date'),
             'asset_maintenance_time'          => $assetmaintenance->asset_maintenance_time,
             'completion_date'     => Helper::getFormattedDateObject($assetmaintenance->completion_date, 'date'),
-            'user_id'    => ($assetmaintenance->admin) ? ['id' => $assetmaintenance->admin->id, 'name'=> e($assetmaintenance->admin->getFullNameAttribute())] : null,
+            'user_id'    => ($assetmaintenance->adminuser) ? [
+                'id' => $assetmaintenance->adminuser->id,
+                'name'=> e($assetmaintenance->adminuser->present()->fullName())
+            ] : null, // legacy to not change the shape of the API
+            'created_by' => ($assetmaintenance->adminuser) ? [
+                'id' => (int) $assetmaintenance->adminuser->id,
+                'name'=> e($assetmaintenance->adminuser->present()->fullName()),
+            ] : null,
             'created_at' => Helper::getFormattedDateObject($assetmaintenance->created_at, 'datetime'),
             'updated_at' => Helper::getFormattedDateObject($assetmaintenance->updated_at, 'datetime'),
             'is_warranty'=> $assetmaintenance->is_warranty,
@@ -72,7 +83,7 @@ class AssetMaintenancesTransformer
         ];
 
         $permissions_array['available_actions'] = [
-            'update' => (Gate::allows('update', Asset::class) && ($assetmaintenance->asset->deleted_at=='')) ? true : false,
+            'update' => (Gate::allows('update', Asset::class) && ((($assetmaintenance->asset) && $assetmaintenance->asset->deleted_at==''))) ? true : false,
             'delete' => Gate::allows('delete', Asset::class),
         ];
 
diff --git a/app/Http/Transformers/AssetModelsTransformer.php b/app/Http/Transformers/AssetModelsTransformer.php
index a7b1c6a49f..2d47ca47db 100644
--- a/app/Http/Transformers/AssetModelsTransformer.php
+++ b/app/Http/Transformers/AssetModelsTransformer.php
@@ -46,8 +46,9 @@ class AssetModelsTransformer
                 'name'=> e($assetmodel->manufacturer->name),
             ] : null,
             'image' => ($assetmodel->image != '') ? Storage::disk('public')->url('models/'.e($assetmodel->image)) : null,
-            'model_number' => e($assetmodel->model_number),
+            'model_number' => ($assetmodel->model_number ? e($assetmodel->model_number): null),
             'min_amt'   => ($assetmodel->min_amt) ? (int) $assetmodel->min_amt : null,
+            'remaining' => (int) ($assetmodel->assets_count - $assetmodel->min_amt),
             'depreciation' => ($assetmodel->depreciation) ? [
                 'id' => (int) $assetmodel->depreciation->id,
                 'name'=> e($assetmodel->depreciation->name),
@@ -65,6 +66,10 @@ class AssetModelsTransformer
             'eol' => ($assetmodel->eol > 0) ? $assetmodel->eol.' months' : 'None',
             'requestable' => ($assetmodel->requestable == '1') ? true : false,
             'notes' => Helper::parseEscapedMarkedownInline($assetmodel->notes),
+            'created_by' => ($assetmodel->adminuser) ? [
+                'id' => (int) $assetmodel->adminuser->id,
+                'name'=> e($assetmodel->adminuser->present()->fullName()),
+            ] : null,
             'created_at' => Helper::getFormattedDateObject($assetmodel->created_at, 'datetime'),
             'updated_at' => Helper::getFormattedDateObject($assetmodel->updated_at, 'datetime'),
             'deleted_at' => Helper::getFormattedDateObject($assetmodel->deleted_at, 'datetime'),
@@ -83,6 +88,42 @@ class AssetModelsTransformer
         return $array;
     }
 
+    public function transformAssetModelFiles($assetmodel, $total)
+    {
+
+        $array = [];
+        foreach ($assetmodel->uploads as $file) {
+            $array[] = self::transformAssetModelFile($file, $assetmodel);
+        }
+
+        return (new DatatablesTransformer)->transformDatatables($array, $total);
+    }
+
+    public function transformAssetModelFile($file, $assetmodel)
+    {
+
+        $array = [
+            'id' => (int) $file->id,
+            'filename' => e($file->filename),
+            'note' => $file->note,
+            'url' => route('show/modelfile', [$assetmodel->id, $file->id]),
+            'created_by' => ($file->adminuser) ? [
+                'id' => (int) $file->adminuser->id,
+                'name'=> e($file->adminuser->present()->fullName),
+            ] : null,
+            'created_at' => Helper::getFormattedDateObject($file->created_at, 'datetime'),
+            'updated_at' => Helper::getFormattedDateObject($file->updated_at, 'datetime'),
+            'deleted_at' => Helper::getFormattedDateObject($file->deleted_at, 'datetime'),
+        ];
+
+        $permissions_array['available_actions'] = [
+            'delete' => (Gate::allows('update', AssetModel::class) && ($assetmodel->deleted_at == '')),
+        ];
+
+        $array += $permissions_array;
+        return $array;
+    }
+
     public function transformAssetModelsDatatable($assetmodels)
     {
         return (new DatatablesTransformer)->transformDatatables($assetmodels);
diff --git a/app/Http/Transformers/AssetsTransformer.php b/app/Http/Transformers/AssetsTransformer.php
index eeb10eb0d2..3f1e4ac8c2 100644
--- a/app/Http/Transformers/AssetsTransformer.php
+++ b/app/Http/Transformers/AssetsTransformer.php
@@ -3,12 +3,14 @@
 namespace App\Http\Transformers;
 
 use App\Helpers\Helper;
+use App\Models\Accessory;
+use App\Models\AccessoryCheckout;
 use App\Models\Asset;
 use App\Models\Setting;
 use Illuminate\Support\Facades\Gate;
 use Illuminate\Database\Eloquent\Collection;
 use Carbon\Carbon;
-use Illuminate\Support\Facades\Auth;
+use Illuminate\Support\Facades\Storage;
 
 class AssetsTransformer
 {
@@ -40,7 +42,7 @@ class AssetsTransformer
             'requestable' => ($asset->requestable ? true : false),
 
             'model_number' => (($asset->model) && ($asset->model->model_number)) ? e($asset->model->model_number) : null,
-            'eol' => (($asset->asset_eol_date != '') && ($asset->purchase_date != '')) ? Carbon::parse($asset->asset_eol_date)->diffInMonths($asset->purchase_date).' months' : null,
+            'eol' => (($asset->asset_eol_date != '') && ($asset->purchase_date != '')) ? (int) Carbon::parse($asset->asset_eol_date)->diffInMonths($asset->purchase_date, true) . ' months' : null,
             'asset_eol_date' => ($asset->asset_eol_date != '') ? Helper::getFormattedDateObject($asset->asset_eol_date, 'date') : null,
             'status_label' => ($asset->assetstatus) ? [
                 'id' => (int) $asset->assetstatus->id,
@@ -80,13 +82,17 @@ class AssetsTransformer
             'assigned_to' => $this->transformAssignedTo($asset),
             'warranty_months' =>  ($asset->warranty_months > 0) ? e($asset->warranty_months.' '.trans('admin/hardware/form.months')) : null,
             'warranty_expires' => ($asset->warranty_months > 0) ? Helper::getFormattedDateObject($asset->warranty_expires, 'date') : null,
+            'created_by' => ($asset->adminuser) ? [
+                'id' => (int) $asset->adminuser->id,
+                'name'=> e($asset->adminuser->present()->fullName()),
+            ] : null,
             'created_at' => Helper::getFormattedDateObject($asset->created_at, 'datetime'),
             'updated_at' => Helper::getFormattedDateObject($asset->updated_at, 'datetime'),
             'last_audit_date' => Helper::getFormattedDateObject($asset->last_audit_date, 'datetime'),
             'next_audit_date' => Helper::getFormattedDateObject($asset->next_audit_date, 'date'),
             'deleted_at' => Helper::getFormattedDateObject($asset->deleted_at, 'datetime'),
             'purchase_date' => Helper::getFormattedDateObject($asset->purchase_date, 'date'),
-            'age' => $asset->purchase_date ? $asset->purchase_date->diffForHumans() : '',
+            'age' => $asset->purchase_date ? $asset->purchase_date->locale(app()->getLocale())->diffForHumans() : '',
             'last_checkout' => Helper::getFormattedDateObject($asset->last_checkout, 'datetime'),
             'last_checkin' => Helper::getFormattedDateObject($asset->last_checkin, 'datetime'),
             'expected_checkin' => Helper::getFormattedDateObject($asset->expected_checkin, 'date'),
@@ -149,6 +155,7 @@ class AssetsTransformer
             'clone'         => Gate::allows('create', Asset::class) ? true : false,
             'restore'       => ($asset->deleted_at!='' && Gate::allows('create', Asset::class)) ? true : false,
             'update'        => ($asset->deleted_at=='' && Gate::allows('update', Asset::class)) ? true : false,
+            'audit'        => Gate::allows('audit', Asset::class) ? true : false,
             'delete'        => ($asset->deleted_at=='' && $asset->assigned_to =='' && Gate::allows('delete', Asset::class) && ($asset->deleted_at == '')) ? true : false,
         ];      
 
@@ -221,7 +228,7 @@ class AssetsTransformer
     public function transformRequestedAsset(Asset $asset)
     {
         $array = [
-            'id' => (int) $asset->id,
+            'id' => (int)$asset->id,
             'name' => e($asset->name),
             'asset_tag' => e($asset->asset_tag),
             'serial' => e($asset->serial),
@@ -230,8 +237,8 @@ class AssetsTransformer
             'model_number' => (($asset->model) && ($asset->model->model_number)) ? e($asset->model->model_number) : null,
             'expected_checkin' => Helper::getFormattedDateObject($asset->expected_checkin, 'date'),
             'location' => ($asset->location) ? e($asset->location->name) : null,
-            'status'=> ($asset->assetstatus) ? $asset->present()->statusMeta : null,
-            'assigned_to_self' => ($asset->assigned_to == \Auth::user()->id),
+            'status' => ($asset->assetstatus) ? $asset->present()->statusMeta : null,
+            'assigned_to_self' => ($asset->assigned_to == auth()->id()),
         ];
 
         if (($asset->model) && ($asset->model->fieldset) && ($asset->model->fieldset->fields->count() > 0)) {
@@ -240,7 +247,7 @@ class AssetsTransformer
             foreach ($asset->model->fieldset->fields as $field) {
 
                 // Only display this if it's allowed via the custom field setting
-                if (($field->field_encrypted=='0') && ($field->show_in_requestable_list=='1')) {
+                if (($field->field_encrypted == '0') && ($field->show_in_requestable_list == '1')) {
 
                     $value = $asset->{$field->db_column};
                     if (($field->format == 'DATE') && (!is_null($value)) && ($value != '')) {
@@ -258,13 +265,70 @@ class AssetsTransformer
 
 
         $permissions_array['available_actions'] = [
-            'cancel' => ($asset->isRequestedBy(\Auth::user())) ? true : false,
-            'request' => ($asset->isRequestedBy(\Auth::user())) ? false : true,
+            'cancel' => ($asset->isRequestedBy(auth()->user())) ? true : false,
+            'request' => ($asset->isRequestedBy(auth()->user())) ? false : true,
         ];
 
         $array += $permissions_array;
         return $array;
-
-
     }
+
+    public function transformAssetCompact(Asset $asset)
+    {
+        $array = [
+            'id' => (int) $asset->id,
+            'image' => ($asset->getImageUrl()) ? $asset->getImageUrl() : null,
+            'type' => 'asset',
+            'name' => e($asset->present()->fullName()),
+            'model' => ($asset->model) ? e($asset->model->name) : null,
+            'model_number' => (($asset->model) && ($asset->model->model_number)) ? e($asset->model->model_number) : null,
+            'asset_tag' => e($asset->asset_tag),
+            'serial' => e($asset->serial),
+        ];
+
+        return $array;
+    }
+
+    public function transformCheckedoutAccessories($accessory_checkouts, $total)
+    {
+
+        $array = [];
+        foreach ($accessory_checkouts as $checkout) {
+            $array[] = self::transformCheckedoutAccessory($checkout);
+        }
+
+        return (new DatatablesTransformer)->transformDatatables($array, $total);
+    }
+
+
+    public function transformCheckedoutAccessory(AccessoryCheckout $accessory_checkout)
+    {
+        if ($accessory_checkout->accessory) {
+            $array = [
+                'id' => $accessory_checkout->id,
+                'accessory' => [
+                    'id' => $accessory_checkout->accessory->id,
+                    'name' => $accessory_checkout->accessory->name,
+                ],
+                'assigned_to' => $accessory_checkout->assigned_to,
+                'image' => ($accessory_checkout->accessory->image) ? Storage::disk('public')->url('accessories/' . e($accessory_checkout->accessory->image)) : null,
+                'note' => $accessory_checkout->note ? e($accessory_checkout->note) : null,
+                'created_by' => $accessory_checkout->adminuser ? [
+                    'id' => (int)$accessory_checkout->adminuser->id,
+                    'name' => e($accessory_checkout->adminuser->present()->fullName),
+                ] : null,
+                'created_at' => Helper::getFormattedDateObject($accessory_checkout->created_at, 'datetime'),
+                'deleted_at' => Helper::getFormattedDateObject($accessory_checkout->deleted_at, 'datetime'),
+            ];
+
+            $permissions_array['available_actions'] = [
+                'checkout' => false,
+                'checkin' => Gate::allows('checkin', Accessory::class),
+            ];
+
+            $array += $permissions_array;
+            return $array;
+        }
+    }
+
 }
diff --git a/app/Http/Transformers/CategoriesTransformer.php b/app/Http/Transformers/CategoriesTransformer.php
index d5e1ceb51b..0d1834649d 100644
--- a/app/Http/Transformers/CategoriesTransformer.php
+++ b/app/Http/Transformers/CategoriesTransformer.php
@@ -62,6 +62,11 @@ class CategoriesTransformer
                 'consumables_count' => (int) $category->consumables_count,
                 'components_count' => (int) $category->components_count,
                 'licenses_count' => (int) $category->licenses_count,
+                'created_by' => ($category->adminuser) ? [
+                    'id' => (int) $category->adminuser->id,
+                    'name'=> e($category->adminuser->present()->fullName()),
+                ] : null,
+                'notes' => Helper::parseEscapedMarkedownInline($category->notes),
                 'created_at' => Helper::getFormattedDateObject($category->created_at, 'datetime'),
                 'updated_at' => Helper::getFormattedDateObject($category->updated_at, 'datetime'),
             ];
diff --git a/app/Http/Transformers/CompaniesTransformer.php b/app/Http/Transformers/CompaniesTransformer.php
index fe8befc27a..8ca5344de6 100644
--- a/app/Http/Transformers/CompaniesTransformer.php
+++ b/app/Http/Transformers/CompaniesTransformer.php
@@ -30,14 +30,19 @@ class CompaniesTransformer
                 'fax' => ($company->fax!='') ? e($company->fax): null,
                 'email' => ($company->email!='') ? e($company->email): null,
                 'image' =>   ($company->image) ? Storage::disk('public')->url('companies/'.e($company->image)) : null,
-                'created_at' => Helper::getFormattedDateObject($company->created_at, 'datetime'),
-                'updated_at' => Helper::getFormattedDateObject($company->updated_at, 'datetime'),
                 'assets_count' => (int) $company->assets_count,
                 'licenses_count' => (int) $company->licenses_count,
                 'accessories_count' => (int) $company->accessories_count,
                 'consumables_count' => (int) $company->consumables_count,
                 'components_count' => (int) $company->components_count,
                 'users_count' => (int) $company->users_count,
+                'created_by' => ($company->adminuser) ? [
+                    'id' => (int) $company->adminuser->id,
+                    'name'=> e($company->adminuser->present()->fullName()),
+                ] : null,
+                'notes' => Helper::parseEscapedMarkedownInline($company->notes),
+                'created_at' => Helper::getFormattedDateObject($company->created_at, 'datetime'),
+                'updated_at' => Helper::getFormattedDateObject($company->updated_at, 'datetime'),
             ];
 
             $permissions_array['available_actions'] = [
diff --git a/app/Http/Transformers/ComponentsTransformer.php b/app/Http/Transformers/ComponentsTransformer.php
index d18870bdc3..90d10ba9a5 100644
--- a/app/Http/Transformers/ComponentsTransformer.php
+++ b/app/Http/Transformers/ComponentsTransformer.php
@@ -38,6 +38,8 @@ class ComponentsTransformer
                 'name' => e($component->category->name),
             ] : null,
             'supplier' => ($component->supplier) ? ['id' => $component->supplier->id, 'name'=> e($component->supplier->name)] : null,
+            'manufacturer' => ($component->manufacturer) ? ['id' => $component->manufacturer->id, 'name'=> e($component->manufacturer->name)] : null,
+            'model_number' => ($component->model_number) ? e($component->model_number) : null,
             'order_number'  => e($component->order_number),
             'purchase_date' =>  Helper::getFormattedDateObject($component->purchase_date, 'date'),
             'purchase_cost' => Helper::formatCurrencyOutput($component->purchase_cost),
@@ -47,6 +49,10 @@ class ComponentsTransformer
                 'name' => e($component->company->name),
             ] : null,
             'notes' => ($component->notes) ? Helper::parseEscapedMarkedownInline($component->notes) : null,
+            'created_by' => ($component->adminuser) ? [
+                'id' => (int) $component->adminuser->id,
+                'name'=> e($component->adminuser->present()->fullName()),
+            ] : null,
             'created_at' => Helper::getFormattedDateObject($component->created_at, 'datetime'),
             'updated_at' => Helper::getFormattedDateObject($component->updated_at, 'datetime'),
             'user_can_checkout' =>  ($component->numRemaining() > 0) ? 1 : 0,
@@ -56,7 +62,7 @@ class ComponentsTransformer
             'checkout' => Gate::allows('checkout', Component::class),
             'checkin' => Gate::allows('checkin', Component::class),
             'update' => Gate::allows('update', Component::class),
-            'delete' => Gate::allows('delete', Component::class),
+            'delete' => $component->isDeletable(),
         ];
         $array += $permissions_array;
 
diff --git a/app/Http/Transformers/ConsumablesTransformer.php b/app/Http/Transformers/ConsumablesTransformer.php
index f23ebc0382..b31e31ac96 100644
--- a/app/Http/Transformers/ConsumablesTransformer.php
+++ b/app/Http/Transformers/ConsumablesTransformer.php
@@ -40,6 +40,10 @@ class ConsumablesTransformer
             'purchase_date'  => Helper::getFormattedDateObject($consumable->purchase_date, 'date'),
             'qty'           => (int) $consumable->qty,
             'notes'         => ($consumable->notes) ? Helper::parseEscapedMarkedownInline($consumable->notes) : null,
+            'created_by' => ($consumable->adminuser) ? [
+                'id' => (int) $consumable->adminuser->id,
+                'name'=> e($consumable->adminuser->present()->fullName()),
+            ] : null,
             'created_at' => Helper::getFormattedDateObject($consumable->created_at, 'datetime'),
             'updated_at' => Helper::getFormattedDateObject($consumable->updated_at, 'datetime'),
         ];
@@ -55,6 +59,7 @@ class ConsumablesTransformer
             'checkin' => Gate::allows('checkin', Consumable::class),
             'update' => Gate::allows('update', Consumable::class),
             'delete' => Gate::allows('delete', Consumable::class),
+            'clone' => (Gate::allows('create', Consumable::class) && ($consumable->deleted_at == '')),
         ];
         $array += $permissions_array;
 
diff --git a/app/Http/Transformers/CustomFieldsTransformer.php b/app/Http/Transformers/CustomFieldsTransformer.php
index d6401a3e5e..501d264b55 100644
--- a/app/Http/Transformers/CustomFieldsTransformer.php
+++ b/app/Http/Transformers/CustomFieldsTransformer.php
@@ -50,6 +50,9 @@ class CustomFieldsTransformer
             'display_in_user_view' =>  ($field->display_in_user_view =='1') ? true : false,
             'auto_add_to_fieldsets' =>  ($field->auto_add_to_fieldsets == '1') ? true : false,
             'show_in_listview'  => ($field->show_in_listview == '1') ? true : false,
+            'display_checkin'  => ($field->display_checkin == '1') ? true : false,
+            'display_checkout'  => ($field->display_checkout == '1') ? true : false,
+            'display_audit'  => ($field->display_audit == '1') ? true : false,
             'created_at' => Helper::getFormattedDateObject($field->created_at, 'datetime'),
             'updated_at' => Helper::getFormattedDateObject($field->updated_at, 'datetime'),
         ];
diff --git a/app/Http/Transformers/DepartmentsTransformer.php b/app/Http/Transformers/DepartmentsTransformer.php
index 546cedf04f..3d1e4c6f90 100644
--- a/app/Http/Transformers/DepartmentsTransformer.php
+++ b/app/Http/Transformers/DepartmentsTransformer.php
@@ -44,6 +44,7 @@ class DepartmentsTransformer
                     'name' => e($department->location->name),
                 ] : null,
                 'users_count' => e($department->users_count),
+                'notes' => Helper::parseEscapedMarkedownInline($department->notes),
                 'created_at' => Helper::getFormattedDateObject($department->created_at, 'datetime'),
                 'updated_at' => Helper::getFormattedDateObject($department->updated_at, 'datetime'),
             ];
diff --git a/app/Http/Transformers/DepreciationReportTransformer.php b/app/Http/Transformers/DepreciationReportTransformer.php
index 47d1cbc476..00eb984fa5 100644
--- a/app/Http/Transformers/DepreciationReportTransformer.php
+++ b/app/Http/Transformers/DepreciationReportTransformer.php
@@ -61,17 +61,14 @@ class DepreciationReportTransformer
         /**
          * Override the previously set null values if there is a valid model and associated depreciation
          */
-        if (($asset->model) && ($asset->model->depreciation)) {
+        if (($asset->model) && ($asset->model->depreciation) && ($asset->model->depreciation->months !== 0)) {
             $depreciated_value = Helper::formatCurrencyOutput($asset->getDepreciatedValue());
-            if($asset->model->eol==0 || $asset->model->eol==null ){
-                $monthly_depreciation = Helper::formatCurrencyOutput($asset->purchase_cost / $asset->model->depreciation->months);
-            }
-            else {
-                $monthly_depreciation = Helper::formatCurrencyOutput(($asset->model->eol > 0 ? ($asset->purchase_cost / $asset->model->eol) : 0));
-            }
+            $monthly_depreciation =Helper::formatCurrencyOutput($asset->purchase_cost / $asset->model->depreciation->months);
             $diff = Helper::formatCurrencyOutput(($asset->purchase_cost - $asset->getDepreciatedValue()));
         }
-
+        else if($asset->model->eol !== null) {
+            $monthly_depreciation = Helper::formatCurrencyOutput(($asset->model->eol > 0 ? ($asset->purchase_cost / $asset->model->eol) : 0));
+        }
 
         if ($asset->assigned) {
             $checkout_target = $asset->assigned->name;
diff --git a/app/Http/Transformers/DepreciationsTransformer.php b/app/Http/Transformers/DepreciationsTransformer.php
index 78a01b4c1e..64d4c88f7e 100644
--- a/app/Http/Transformers/DepreciationsTransformer.php
+++ b/app/Http/Transformers/DepreciationsTransformer.php
@@ -7,6 +7,7 @@ use App\Models\Depreciable;
 use App\Models\Depreciation;
 use Illuminate\Support\Facades\Gate;
 use Illuminate\Database\Eloquent\Collection;
+use Illuminate\Support\Facades\Log;
 
 class DepreciationsTransformer
 {
@@ -26,7 +27,14 @@ class DepreciationsTransformer
             'id' => (int) $depreciation->id,
             'name' => e($depreciation->name),
             'months' => $depreciation->months.' '.trans('general.months'),
-            'depreciation_min' => $depreciation->depreciation_min,
+            'depreciation_min' => $depreciation->depreciation_type === 'percent' ? $depreciation->depreciation_min.'%' : $depreciation->depreciation_min,
+            'assets_count' => $depreciation->assets_count,
+            'models_count' => $depreciation->models_count,
+            'licenses_count' => $depreciation->licenses_count,
+            'created_by' => ($depreciation->adminuser) ? [
+                'id' => (int) $depreciation->adminuser->id,
+                'name'=> e($depreciation->adminuser->present()->fullName()),
+            ] : null,
             'created_at' => Helper::getFormattedDateObject($depreciation->created_at, 'datetime'),
             'updated_at' => Helper::getFormattedDateObject($depreciation->updated_at, 'datetime')
         ];
diff --git a/app/Http/Transformers/GroupsTransformer.php b/app/Http/Transformers/GroupsTransformer.php
index bf7e2bfd70..9495aeeecc 100644
--- a/app/Http/Transformers/GroupsTransformer.php
+++ b/app/Http/Transformers/GroupsTransformer.php
@@ -24,9 +24,13 @@ class GroupsTransformer
         $array = [
             'id' => (int) $group->id,
             'name' => e($group->name),
-            'permissions' => json_decode($group->permissions),
+            'permissions' => $group->decodePermissions(),
             'users_count' => (int) $group->users_count,
-            'created_by' => ($group->admin) ? e($group->admin->present()->fullName) : null,
+            'notes' => Helper::parseEscapedMarkedownInline($group->notes),
+            'created_by' => ($group->adminuser) ? [
+                'id' => (int) $group->adminuser->id,
+                'name'=> e($group->adminuser->present()->fullName()),
+            ] : null,
             'created_at' => Helper::getFormattedDateObject($group->created_at, 'datetime'),
             'updated_at' => Helper::getFormattedDateObject($group->updated_at, 'datetime'),
         ];
diff --git a/app/Http/Transformers/LicenseSeatsTransformer.php b/app/Http/Transformers/LicenseSeatsTransformer.php
index 47133a9b95..57f4087e9f 100644
--- a/app/Http/Transformers/LicenseSeatsTransformer.php
+++ b/app/Http/Transformers/LicenseSeatsTransformer.php
@@ -2,6 +2,7 @@
 
 namespace App\Http\Transformers;
 
+use App\Helpers\Helper;
 use App\Models\License;
 use App\Models\LicenseSeat;
 use Illuminate\Support\Facades\Gate;
@@ -12,20 +13,20 @@ class LicenseSeatsTransformer
     public function transformLicenseSeats(Collection $seats, $total)
     {
         $array = [];
-        $seat_count = 0;
+
         foreach ($seats as $seat) {
-            $seat_count++;
-            $array[] = self::transformLicenseSeat($seat, $seat_count);
+            $array[] = self::transformLicenseSeat($seat);
         }
 
         return (new DatatablesTransformer)->transformDatatables($array, $total);
     }
 
-    public function transformLicenseSeat(LicenseSeat $seat, $seat_count = 0)
+    public function transformLicenseSeat(LicenseSeat $seat)
     {
         $array = [
             'id' => (int) $seat->id,
             'license_id' => (int) $seat->license->id,
+            'updated_at' => Helper::getFormattedDateObject($seat->updated_at, 'datetime'), // we use updated_at here because the record gets updated when it's checked in or out
             'assigned_user' => ($seat->user) ? [
                 'id' => (int) $seat->user->id,
                 'name'=> e($seat->user->present()->fullName),
@@ -36,24 +37,23 @@ class LicenseSeatsTransformer
                             'name' => e($seat->user->department->name),
 
                         ] : null,
+                'created_at' => Helper::getFormattedDateObject($seat->created_at, 'datetime'),
             ] : null,
             'assigned_asset' => ($seat->asset) ? [
                 'id' => (int) $seat->asset->id,
                 'name'=> e($seat->asset->present()->fullName),
+                'created_at' => Helper::getFormattedDateObject($seat->created_at, 'datetime'),
             ] : null,
             'location' => ($seat->location()) ? [
                 'id' => (int) $seat->location()->id,
                 'name'=> e($seat->location()->name),
+                'created_at' => Helper::getFormattedDateObject($seat->created_at, 'datetime'),
             ] : null,
             'reassignable' => (bool) $seat->license->reassignable,
             'notes' => e($seat->notes),
             'user_can_checkout' => (($seat->assigned_to == '') && ($seat->asset_id == '')),
         ];
 
-        if ($seat_count != 0) {
-            $array['name'] = 'Seat '.$seat_count;
-        }
-
         $permissions_array['available_actions'] = [
             'checkout' => Gate::allows('checkout', License::class),
             'checkin' => Gate::allows('checkin', License::class),
diff --git a/app/Http/Transformers/LicensesTransformer.php b/app/Http/Transformers/LicensesTransformer.php
index fa218da4d1..b63a5725a4 100644
--- a/app/Http/Transformers/LicensesTransformer.php
+++ b/app/Http/Transformers/LicensesTransformer.php
@@ -38,6 +38,7 @@ class LicensesTransformer
             'expiration_date' => Helper::getFormattedDateObject($license->expiration_date, 'date'),
             'seats' => (int) $license->seats,
             'free_seats_count' => (int) $license->free_seats_count,
+            'remaining' => (int) $license->free_seats_count,
             'min_amt' => ($license->min_amt) ? (int) ($license->min_amt) : null,
             'license_name' =>  ($license->license_name) ? e($license->license_name) : null,
             'license_email' => ($license->license_email) ? e($license->license_email) : null,
@@ -45,6 +46,10 @@ class LicensesTransformer
             'maintained' => ($license->maintained == 1) ? true : false,
             'supplier' =>  ($license->supplier) ? ['id' => (int) $license->supplier->id, 'name'=> e($license->supplier->name)] : null,
             'category' =>  ($license->category) ? ['id' => (int) $license->category->id, 'name'=> e($license->category->name)] : null,
+            'created_by' => ($license->adminuser) ? [
+                'id' => (int) $license->adminuser->id,
+                'name'=> e($license->adminuser->present()->fullName()),
+            ] : null,
             'created_at' => Helper::getFormattedDateObject($license->created_at, 'datetime'),
             'updated_at' => Helper::getFormattedDateObject($license->updated_at, 'datetime'),
             'deleted_at' => Helper::getFormattedDateObject($license->deleted_at, 'datetime'),
@@ -57,7 +62,7 @@ class LicensesTransformer
             'checkin' => Gate::allows('checkin', License::class),
             'clone' => Gate::allows('create', License::class),
             'update' => Gate::allows('update', License::class),
-            'delete' => (Gate::allows('delete', License::class) && ($license->seats == $license->availCount()->count())) ? true : false,
+            'delete' => (Gate::allows('delete', License::class) && ($license->free_seats_count > 0)) ? true : false,
         ];
 
         $array += $permissions_array;
diff --git a/app/Http/Transformers/LocationsTransformer.php b/app/Http/Transformers/LocationsTransformer.php
index 513b967f42..4965ff99d5 100644
--- a/app/Http/Transformers/LocationsTransformer.php
+++ b/app/Http/Transformers/LocationsTransformer.php
@@ -3,6 +3,8 @@
 namespace App\Http\Transformers;
 
 use App\Helpers\Helper;
+use App\Models\Accessory;
+use App\Models\AccessoryCheckout;
 use App\Models\Location;
 use Illuminate\Support\Facades\Gate;
 use Illuminate\Database\Eloquent\Collection;
@@ -45,19 +47,30 @@ class LocationsTransformer
                 'zip' => ($location->zip) ? e($location->zip) : null,
                 'phone' => ($location->phone!='') ? e($location->phone): null,
                 'fax' => ($location->fax!='') ? e($location->fax): null,
+                'accessories_count' => (int) $location->accessories_count,
+                'assigned_accessories_count' => (int) $location->assigned_accessories_count,
                 'assigned_assets_count' => (int) $location->assigned_assets_count,
                 'assets_count'    => (int) $location->assets_count,
                 'rtd_assets_count'    => (int) $location->rtd_assets_count,
                 'users_count'    => (int) $location->users_count,
                 'currency' =>  ($location->currency) ? e($location->currency) : null,
                 'ldap_ou' =>  ($location->ldap_ou) ? e($location->ldap_ou) : null,
+                'notes' => Helper::parseEscapedMarkedownInline($location->notes),
                 'created_at' => Helper::getFormattedDateObject($location->created_at, 'datetime'),
+                'created_by' => $location->adminuser ? [
+                    'id' => (int) $location->adminuser->id,
+                    'name'=> e($location->adminuser->present()->fullName),
+                ]: null,
                 'updated_at' => Helper::getFormattedDateObject($location->updated_at, 'datetime'),
                 'parent' => ($location->parent) ? [
                     'id' => (int) $location->parent->id,
                     'name'=> e($location->parent->name),
                 ] : null,
                 'manager' => ($location->manager) ? (new UsersTransformer)->transformUser($location->manager) : null,
+                'company' => ($location->company) ? [
+                    'id' => (int) $location->company->id,
+                    'name'=> e($location->company->name)
+                ] : null,
 
                 'children' => $children_arr,
             ];
@@ -76,4 +89,85 @@ class LocationsTransformer
             return $array;
         }
     }
+
+
+    public function transformCheckedoutAccessories($accessory_checkouts, $total)
+    {
+
+        $array = [];
+        foreach ($accessory_checkouts as $checkout) {
+            $array[] = self::transformCheckedoutAccessory($checkout);
+        }
+
+        return (new DatatablesTransformer)->transformDatatables($array, $total);
+    }
+
+
+    public function transformCheckedoutAccessory(AccessoryCheckout $accessory_checkout)
+    {
+
+            $array = [
+                'id' => $accessory_checkout->id,
+                'assigned_to' => $accessory_checkout->assigned_to,
+                'accessory' => $this->transformAccessory($accessory_checkout->accessory),
+                'image' => ($accessory_checkout?->accessory?->image) ? Storage::disk('public')->url('accessories/' . e($accessory_checkout->accessory->image)) : null,
+                'note' => $accessory_checkout->note ? e($accessory_checkout->note) : null,
+                'created_by' => $accessory_checkout->adminuser ? [
+                    'id' => (int) $accessory_checkout->adminuser->id,
+                    'name'=> e($accessory_checkout->adminuser->present()->fullName),
+                ]: null,
+                'created_at' => Helper::getFormattedDateObject($accessory_checkout->created_at, 'datetime'),
+            ];
+
+            $permissions_array['available_actions'] = [
+                'checkout' => false,
+                'checkin' => Gate::allows('checkin', Accessory::class),
+            ];
+
+            $array += $permissions_array;
+        return $array;
+    }
+
+
+
+    /**
+     * This gives a compact view of the location data without any additional relational queries,
+     * allowing us to 1) deliver a smaller payload and 2) avoid additional queries on relations that
+     * have not been easy/lazy loaded already
+     *
+     * @param Location $location
+     * @return array
+     * @throws \Exception
+     */
+    public function transformLocationCompact(Location $location = null)
+    {
+        if ($location) {
+
+            $array = [
+                'id' => (int) $location->id,
+                'image' =>   ($location->image) ? Storage::disk('public')->url('locations/'.e($location->image)) : null,
+                'type' => "location",
+                'name' => e($location->name),
+                'created_by' => $location->adminuser ? [
+                    'id' => (int) $location->adminuser->id,
+                    'name'=> e($location->adminuser->present()->fullName),
+                ]: null,
+                'created_at' => Helper::getFormattedDateObject($location->created_at, 'datetime'),
+            ];
+
+            return $array;
+        }
+    }
+
+    private function transformAccessory(?Accessory $accessory): ?array
+    {
+        if ($accessory) {
+            return [
+                'id' => $accessory->id,
+                'name' => $accessory->name,
+            ];
+        }
+
+        return null;
+    }
 }
diff --git a/app/Http/Transformers/ManufacturersTransformer.php b/app/Http/Transformers/ManufacturersTransformer.php
index 9c84fd50fe..cf17eb7764 100644
--- a/app/Http/Transformers/ManufacturersTransformer.php
+++ b/app/Http/Transformers/ManufacturersTransformer.php
@@ -36,6 +36,12 @@ class ManufacturersTransformer
                 'licenses_count' => (int) $manufacturer->licenses_count,
                 'consumables_count' => (int) $manufacturer->consumables_count,
                 'accessories_count' => (int) $manufacturer->accessories_count,
+                'components_count' => (int) $manufacturer->components_count,
+                'notes' => Helper::parseEscapedMarkedownInline($manufacturer->notes),
+                'created_by' => ($manufacturer->adminuser) ? [
+                    'id' => (int) $manufacturer->adminuser->id,
+                    'name'=> e($manufacturer->adminuser->present()->fullName()),
+                ] : null,
                 'created_at' => Helper::getFormattedDateObject($manufacturer->created_at, 'datetime'),
                 'updated_at' => Helper::getFormattedDateObject($manufacturer->updated_at, 'datetime'),
                 'deleted_at' => Helper::getFormattedDateObject($manufacturer->deleted_at, 'datetime'),
diff --git a/app/Http/Transformers/PredefinedKitsTransformer.php b/app/Http/Transformers/PredefinedKitsTransformer.php
index a5d37e5c72..61c9e476a9 100644
--- a/app/Http/Transformers/PredefinedKitsTransformer.php
+++ b/app/Http/Transformers/PredefinedKitsTransformer.php
@@ -2,6 +2,8 @@
 
 namespace App\Http\Transformers;
 
+use App\Helpers\Helper;
+use App\Models\Asset;
 use App\Models\PredefinedKit;
 use App\Models\SnipeModel;
 use Illuminate\Support\Facades\Gate;
@@ -30,12 +32,18 @@ class PredefinedKitsTransformer
         $array = [
             'id' => (int) $kit->id,
             'name' => e($kit->name),
+            'created_by' => ($kit->adminuser) ? [
+                'id' => (int) $kit->adminuser->id,
+                'name'=> e($kit->adminuser->present()->fullName()),
+            ] : null,
+            'created_at' => Helper::getFormattedDateObject($kit->created_at, 'datetime'),
+            'updated_at' => Helper::getFormattedDateObject($kit->updated_at, 'datetime'),
         ];
 
         $permissions_array['available_actions'] = [
             'update' => Gate::allows('update', PredefinedKit::class),
             'delete' => Gate::allows('delete', PredefinedKit::class),
-            'checkout' => Gate::allows('checkout', PredefinedKit::class),
+            'checkout' => Gate::allows('checkout', Asset::class),
             // 'clone' => Gate::allows('create', PredefinedKit::class),
             // 'restore' => Gate::allows('create', PredefinedKit::class),
         ];
diff --git a/app/Http/Transformers/StatuslabelsTransformer.php b/app/Http/Transformers/StatuslabelsTransformer.php
index 41dd336068..751edb7016 100644
--- a/app/Http/Transformers/StatuslabelsTransformer.php
+++ b/app/Http/Transformers/StatuslabelsTransformer.php
@@ -30,6 +30,10 @@ class StatuslabelsTransformer
             'default_label' => ($statuslabel->default_label == '1') ? true : false,
             'assets_count' => (int) $statuslabel->assets_count,
             'notes' => e($statuslabel->notes),
+            'created_by' => ($statuslabel->adminuser) ? [
+                'id' => (int) $statuslabel->adminuser->id,
+                'name'=> e($statuslabel->adminuser->present()->fullName()),
+            ] : null,
             'created_at' => Helper::getFormattedDateObject($statuslabel->created_at, 'datetime'),
             'updated_at' => Helper::getFormattedDateObject($statuslabel->updated_at, 'datetime'),
         ];
diff --git a/app/Http/Transformers/SuppliersTransformer.php b/app/Http/Transformers/SuppliersTransformer.php
index 1fdc93c193..750c969c63 100644
--- a/app/Http/Transformers/SuppliersTransformer.php
+++ b/app/Http/Transformers/SuppliersTransformer.php
@@ -45,6 +45,10 @@ class SuppliersTransformer
                 'components_count' => (int) $supplier->components_count,
                 'notes' => ($supplier->notes) ? Helper::parseEscapedMarkedownInline($supplier->notes) : null,
                 'created_at' => Helper::getFormattedDateObject($supplier->created_at, 'datetime'),
+                'created_by' => $supplier->adminuser ? [
+                    'id' => (int) $supplier->adminuser->id,
+                    'name'=> e($supplier->adminuser->present()->fullName),
+                ]: null,
                 'updated_at' => Helper::getFormattedDateObject($supplier->updated_at, 'datetime'),
 
             ];
diff --git a/app/Http/Transformers/UploadedFilesTransformer.php b/app/Http/Transformers/UploadedFilesTransformer.php
new file mode 100644
index 0000000000..a18c9f9b65
--- /dev/null
+++ b/app/Http/Transformers/UploadedFilesTransformer.php
@@ -0,0 +1,56 @@
+<?php
+
+namespace App\Http\Transformers;
+
+use App\Helpers\Helper;
+use App\Models\Actionlog;
+use App\Models\Asset;
+use Illuminate\Support\Facades\Gate;
+use Illuminate\Database\Eloquent\Collection;
+use Illuminate\Support\Facades\Storage;
+
+class UploadedFilesTransformer
+{
+    public function transformFiles(Collection $files, $total)
+    {
+        $array = [];
+        foreach ($files as $file) {
+            $array[] = self::transformFile($file);
+        }
+
+        return (new DatatablesTransformer)->transformDatatables($array, $total);
+    }
+
+
+    public function transformFile(Actionlog $file)
+    {
+        $snipeModel = $file->item_type;
+
+
+        // This will be used later as we extend out this transformer to handle more types of uploads
+        if ($file->item_type == Asset::class) {
+            $file_url = route('show/assetfile', [$file->item_id, $file->id]);
+        }
+
+        $array = [
+            'id' => (int) $file->id,
+            'filename' => e($file->filename),
+            'url' => $file_url,
+            'created_by' => ($file->adminuser) ? [
+                'id' => (int) $file->adminuser->id,
+                'name'=> e($file->adminuser->present()->fullName),
+            ] : null,
+            'created_at' => Helper::getFormattedDateObject($file->created_at, 'datetime'),
+            'updated_at' => Helper::getFormattedDateObject($file->updated_at, 'datetime'),
+            'deleted_at' => Helper::getFormattedDateObject($file->deleted_at, 'datetime'),
+        ];
+
+        $permissions_array['available_actions'] = [
+            'delete' => (Gate::allows('update', $snipeModel) && ($file->deleted_at == '')),
+        ];
+
+        $array += $permissions_array;
+        return $array;
+    }
+
+}
diff --git a/app/Http/Transformers/UsersTransformer.php b/app/Http/Transformers/UsersTransformer.php
index 8b3b94b64d..7f05fa5248 100644
--- a/app/Http/Transformers/UsersTransformer.php
+++ b/app/Http/Transformers/UsersTransformer.php
@@ -4,8 +4,8 @@ namespace App\Http\Transformers;
 
 use App\Helpers\Helper;
 use App\Models\User;
-use Illuminate\Support\Facades\Gate;
 use Illuminate\Database\Eloquent\Collection;
+use Illuminate\Support\Facades\Gate;
 
 class UsersTransformer
 {
@@ -24,7 +24,7 @@ class UsersTransformer
 
         $array = [
                 'id' => (int) $user->id,
-                'avatar' => e($user->present()->gravatar),
+                'avatar' => e($user->present()->gravatar) ?? null,
                 'name' => e($user->getFullNameAttribute()),
                 'first_name' => e($user->first_name),
                 'last_name' => e($user->last_name),
@@ -110,6 +110,37 @@ class UsersTransformer
         return $array;
     }
 
+    /**
+     * This gives a compact view of the user data without any additional relational queries,
+     * allowing us to 1) deliver a smaller payload and 2) avoid additional queries on relations that
+     * have not been easy/lazy loaded already
+     *
+     * @param User $user
+     * @return array
+     * @throws \Exception
+     */
+    public function transformUserCompact(User $user) : array
+    {
+
+        $array = [
+            'id' => (int) $user->id,
+            'image' => e($user->present()->gravatar) ?? null,
+            'type' => 'user',
+            'name' => e($user->getFullNameAttribute()),
+            'first_name' => e($user->first_name),
+            'last_name' => e($user->last_name),
+            'username' => e($user->username),
+            'created_by' => $user->adminuser ? [
+                'id' => (int) $user->adminuser->id,
+                'name'=> e($user->adminuser->present()->fullName),
+            ]: null,
+            'created_at' => Helper::getFormattedDateObject($user->created_at, 'datetime'),
+            'deleted_at' => ($user->deleted_at) ? Helper::getFormattedDateObject($user->deleted_at, 'datetime') : null,
+        ];
+
+        return $array;
+    }
+
     public function transformUsersDatatable($users)
     {
         return (new DatatablesTransformer)->transformDatatables($users);
diff --git a/app/Importer/AccessoryImporter.php b/app/Importer/AccessoryImporter.php
index eb17c5acad..bc9c1909ff 100644
--- a/app/Importer/AccessoryImporter.php
+++ b/app/Importer/AccessoryImporter.php
@@ -42,6 +42,7 @@ class AccessoryImporter extends ItemImporter
         }
         $this->log('No Matching Accessory, Creating a new one');
         $accessory = new Accessory();
+        $accessory->created_by = auth()->id();
         $this->item['model_number'] = $this->findCsvMatch($row, "model_number");
         $this->item['min_amt'] = $this->findCsvMatch($row, "min_amt");
         $accessory->fill($this->sanitizeItemForStoring($accessory));
diff --git a/app/Importer/AssetImporter.php b/app/Importer/AssetImporter.php
index 02ffa2077c..1d03d6f95b 100644
--- a/app/Importer/AssetImporter.php
+++ b/app/Importer/AssetImporter.php
@@ -3,14 +3,10 @@
 namespace App\Importer;
 
 use App\Models\Asset;
-use App\Models\AssetModel;
 use App\Models\Statuslabel;
 use App\Models\User;
 use App\Events\CheckoutableCheckedIn;
-use Carbon\CarbonImmutable;
-use Illuminate\Support\Facades\Auth;
-use Carbon\Carbon;
-use Illuminate\Support\Facades\Log;
+use Illuminate\Support\Facades\Crypt;
 
 class AssetImporter extends ItemImporter
 {
@@ -20,10 +16,22 @@ class AssetImporter extends ItemImporter
     {
         parent::__construct($filename);
 
-        $this->defaultStatusLabelId = Statuslabel::first()->id;
-        
+        $this->defaultStatusLabelId = Statuslabel::first()?->id;
+
         if (!is_null(Statuslabel::deployable()->first())) {
-            $this->defaultStatusLabelId = Statuslabel::deployable()->first()->id;
+            $this->defaultStatusLabelId = Statuslabel::deployable()->first()?->id;
+        }
+
+        if (is_null($this->defaultStatusLabelId)) {
+            $defaultLabel = Statuslabel::create([
+                'name' => 'Default Status',
+                'deployable' => 0,
+                'pending' => 1,
+                'archived' => 0,
+                'notes' => 'Default status label created by AssetImporter',
+            ]);
+
+            $this->defaultStatusLabelId = $defaultLabel->id;
         }
     }
 
@@ -72,11 +80,22 @@ class AssetImporter extends ItemImporter
             $asset_tag = Asset::autoincrement_asset();
         }
 
-        $asset = Asset::where(['asset_tag'=> (string) $asset_tag])->first();
+
+
+        if ($this->findCsvMatch($row, 'id')!='') {
+            // Override asset if an ID was given
+            \Log::debug('Finding asset by ID: '.$this->findCsvMatch($row, 'id'));
+            $asset = Asset::find($this->findCsvMatch($row, 'id'));
+        } else {
+            $asset = Asset::where(['asset_tag'=> (string) $asset_tag])->first();
+        }
+        
         if ($asset) {
             if (! $this->updating) {
-                $this->log('A matching Asset '.$asset_tag.' already exists');
-                return;
+                $exists_error = trans('general.import_asset_tag_exists', ['asset_tag' => $asset_tag]);
+                $this->log($exists_error);
+                $this->addErrorToBag($asset, 'asset_tag', $exists_error);
+                return $exists_error;
             }
 
             $this->log('Updating Asset');
@@ -179,16 +198,16 @@ class AssetImporter extends ItemImporter
             $this->log('Asset '.$this->item['name'].' with serial number '.$this->item['serial'].' was created');
 
             // If we have a target to checkout to, lets do so.
-            //-- user_id is a property of the abstract class Importer, which this class inherits from and it's set by
+            //-- created_by is a property of the abstract class Importer, which this class inherits from and it's set by
             //-- the class that needs to use it (command importer or GUI importer inside the project).
             if (isset($target) && ($target !== false)) {
                 if (!is_null($asset->assigned_to)){
                     if ($asset->assigned_to != $target->id) {
-                        event(new CheckoutableCheckedIn($asset, User::find($asset->assigned_to), Auth::user(), 'Checkin from CSV Importer', $checkin_date));
+                        event(new CheckoutableCheckedIn($asset, User::find($asset->assigned_to), auth()->user(), 'Checkin from CSV Importer', $checkin_date));
                     }
                 }
 
-                $asset->fresh()->checkOut($target, $this->user_id, $checkout_date, null, 'Checkout from CSV Importer',  $asset->name);
+                $asset->fresh()->checkOut($target, $this->created_by, $checkout_date, null, 'Checkout from CSV Importer',  $asset->name);
             }
 
             return;
diff --git a/app/Importer/AssetModelImporter.php b/app/Importer/AssetModelImporter.php
new file mode 100644
index 0000000000..7cfd8a530d
--- /dev/null
+++ b/app/Importer/AssetModelImporter.php
@@ -0,0 +1,174 @@
+<?php
+
+namespace App\Importer;
+
+use App\Models\AssetModel;
+use App\Models\Depreciation;
+use App\Models\CustomFieldset;
+use Illuminate\Support\Facades\Log;
+
+/**
+ * When we are importing users via an Asset/etc import, we use createOrFetchUser() in
+ * Importer\Importer.php. [ALG]
+ *
+ * Class LocationImporter
+ */
+class AssetModelImporter extends ItemImporter
+{
+    protected $models;
+
+    public function __construct($filename)
+    {
+        parent::__construct($filename);
+    }
+
+    protected function handle($row)
+    {
+        parent::handle($row);
+        $this->createAssetModelIfNotExists($row);
+    }
+
+    /**
+     * Create a model if a duplicate does not exist.
+     * @todo Investigate how this should interact with Importer::createModelIfNotExists
+     *
+     * @author A. Gianotto
+     * @since 6.1.0
+     * @param array $row
+     */
+    public function createAssetModelIfNotExists(array $row)
+    {
+
+        $editingAssetModel = false;
+        $assetModel = AssetModel::where('name', '=', $this->findCsvMatch($row, 'name'))->first();
+
+        if ($assetModel) {
+            if (! $this->updating) {
+                $this->log('A matching Model '.$this->item['name'].' already exists');
+                return;
+            }
+
+            $this->log('Updating Model');
+            $editingAssetModel = true;
+        } else {
+            $this->log('No Matching Model, Create a new one');
+            $assetModel = new AssetModel();
+        }
+
+        // Pull the records from the CSV to determine their values
+        $this->item['name'] = trim($this->findCsvMatch($row, 'name'));
+        $this->item['category'] = trim($this->findCsvMatch($row, 'category'));
+        $this->item['manufacturer'] = trim($this->findCsvMatch($row, 'manufacturer'));
+        $this->item['min_amt'] = trim($this->findCsvMatch($row, 'min_amt'));
+        $this->item['model_number'] = trim($this->findCsvMatch($row, 'model_number'));
+        $this->item['eol'] = trim($this->findCsvMatch($row, 'eol'));
+        $this->item['notes'] = trim($this->findCsvMatch($row, 'notes'));
+        $this->item['fieldset'] = trim($this->findCsvMatch($row, 'fieldset'));
+        $this->item['depreciation'] = trim($this->findCsvMatch($row, 'depreciation'));
+        $this->item['requestable'] = trim(($this->fetchHumanBoolean($this->findCsvMatch($row, 'requestable'))) == 1) ? 1 : 0;
+
+        if (!empty($this->item['category'])) {
+            if ($category = $this->createOrFetchCategory($this->item['category'])) {
+                $this->item['category_id'] = $category;
+            }
+        }
+        if (!empty($this->item['manufacturer'])) {
+            if ($manufacturer = $this->createOrFetchManufacturer($this->item['manufacturer'])) {
+                $this->item['manufacturer_id'] = $manufacturer;
+            }
+        }
+
+        if (!empty($this->item['depreciation'])) {
+            if ($depreciation = $this->fetchDepreciation($this->item['depreciation'])) {
+                $this->item['depreciation_id'] = $depreciation;
+            }
+        }
+
+        if (!empty($this->item['fieldset'])) {
+            if ($fieldset = $this->createOrFetchCustomFieldset($this->item['fieldset'])) {
+                $this->item['fieldset_id'] = $fieldset;
+            }
+        }
+
+        Log::debug('Item array is: ');
+        Log::debug(print_r($this->item, true));
+
+
+        if ($editingAssetModel) {
+            Log::debug('Updating existing model');
+            $assetModel->update($this->sanitizeItemForUpdating($assetModel));
+        } else {
+            Log::debug('Creating model');
+            $assetModel->fill($this->sanitizeItemForStoring($assetModel));
+            $assetModel->created_by = auth()->id();
+        }
+
+        if ($assetModel->save()) {
+            $this->log('AssetModel '.$assetModel->name.' created or updated from CSV import');
+            return $assetModel;
+
+        } else {
+            $this->log($assetModel->getErrors()->first());
+            $this->addErrorToBag($assetModel,  $assetModel->getErrors()->keys()[0], $assetModel->getErrors()->first());
+            return $assetModel->getErrors();
+        }
+
+    }
+
+
+    /**
+     * Fetch an existing depreciation, or create new if it doesn't exist.
+     *
+     * We only do a fetch vs create here since Depreciations have additional fields required
+     * and cannot be created without them (months, for example.))
+     *
+     * @author A. Gianotto
+     * @since 7.1.3
+     * @param $depreciation_name string
+     * @return int id of depreciation created/found
+     */
+    public function fetchDepreciation($depreciation_name) : ?int
+    {
+        if ($depreciation_name != '') {
+
+            if ($depreciation = Depreciation::where('name', '=', $depreciation_name)->first()) {
+                $this->log('A matching Depreciation '.$depreciation_name.' already exists');
+                return $depreciation->id;
+            }
+        }
+
+        return null;
+    }
+
+    /**
+     * Fetch an existing fieldset, or create new if it doesn't exist
+     *
+     * @author A. Gianotto
+     * @since 7.1.3
+     * @param $fieldset_name string
+     * @return int id of fieldset created/found
+     */
+    public function createOrFetchCustomFieldset($fieldset_name) : ?int
+    {
+        if ($fieldset_name != '') {
+            $fieldset = CustomFieldset::where('name', '=', $fieldset_name)->first();
+
+            if ($fieldset) {
+                $this->log('A matching fieldset '.$fieldset_name.' already exists');
+                return $fieldset->id;
+            }
+
+            $fieldset = new CustomFieldset();
+            $fieldset->name = $fieldset_name;
+
+            if ($fieldset->save()) {
+                $this->log('Fieldset '.$fieldset_name.' was created');
+
+                return $fieldset->id;
+            }
+            $this->logError($fieldset, 'Fieldset');
+        }
+
+        return null;
+    }
+}
\ No newline at end of file
diff --git a/app/Importer/CategoryImporter.php b/app/Importer/CategoryImporter.php
new file mode 100644
index 0000000000..39b477c96a
--- /dev/null
+++ b/app/Importer/CategoryImporter.php
@@ -0,0 +1,99 @@
+<?php
+
+namespace App\Importer;
+
+use App\Models\Category;
+use Illuminate\Support\Facades\Log;
+
+/**
+ * When we are importing users via an Asset/etc import, we use createOrFetchUser() in
+ * Importer\Importer.php. [ALG]
+ *
+ * Class CategoryImporter
+ */
+class CategoryImporter extends ItemImporter
+{
+    protected $categories;
+
+    public function __construct($filename)
+    {
+        parent::__construct($filename);
+    }
+
+    protected function handle($row)
+    {
+        parent::handle($row);
+        $this->createCategoryIfNotExists($row);
+    }
+
+    /**
+     * Create a category if a duplicate does not exist.
+     * @todo Investigate how this should interact with Importer::createCategoryIfNotExists
+     *
+     * @author A. Gianotto
+     * @since 6.1.0
+     * @param array $row
+     */
+    public function createCategoryIfNotExists(array $row)
+    {
+
+        $editingCategory = false;
+
+        $category = Category::where('name', '=', $this->findCsvMatch($row, 'name'))->first();
+
+        if ($this->findCsvMatch($row, 'id')!='') {
+            // Override category if an ID was given
+            \Log::debug('Finding category by ID: '.$this->findCsvMatch($row, 'id'));
+            $category = Category::find($this->findCsvMatch($row, 'id'));
+        }
+
+
+        if ($category) {
+            if (! $this->updating) {
+                $this->log('A matching Category '.$this->item['name'].' already exists');
+                return;
+            }
+
+            $this->log('Updating Category');
+            $editingCategory = true;
+        } else {
+            $this->log('No Matching Category, Create a new one');
+            $category = new Category;
+            $category->created_by = auth()->id();
+        }
+
+        // Pull the records from the CSV to determine their values
+        $this->item['name'] = trim($this->findCsvMatch($row, 'name'));
+        $this->item['notes'] = trim($this->findCsvMatch($row, 'notes'));
+        $this->item['eula_text'] = trim($this->findCsvMatch($row, 'eula_text'));
+        $this->item['category_type'] = trim(strtolower($this->findCsvMatch($row, 'category_type')));
+        $this->item['use_default_eula'] = trim(($this->fetchHumanBoolean($this->findCsvMatch($row, 'use_default_eula'))) == 1) ? 1 : 0;
+        $this->item['require_acceptance'] = trim(($this->fetchHumanBoolean($this->findCsvMatch($row, 'require_acceptance'))) == 1) ? 1 : 0;
+        $this->item['checkin_email'] = trim(($this->fetchHumanBoolean($this->findCsvMatch($row, 'checkin_email'))) == 1) ? 1 : 0;
+
+
+        Log::debug('Item array is: ');
+        Log::debug(print_r($this->item, true));
+
+
+        if ($editingCategory) {
+            Log::debug('Updating existing category');
+            $category->update($this->sanitizeItemForUpdating($category));
+        } else {
+            Log::debug('Creating category');
+            $category->fill($this->sanitizeItemForStoring($category));
+        }
+
+        if ($category->save()) {
+            $this->log('Category '.$category->name.' created or updated from CSV import');
+            return $category;
+
+        } else {
+            Log::debug($category->getErrors());
+            $this->logError($category, 'Category "'.$this->item['name'].'"');
+            return $category->errors;
+        }
+
+
+    }
+}
\ No newline at end of file
diff --git a/app/Importer/ComponentImporter.php b/app/Importer/ComponentImporter.php
index f72d4cbfd7..3979ba499d 100644
--- a/app/Importer/ComponentImporter.php
+++ b/app/Importer/ComponentImporter.php
@@ -47,6 +47,7 @@ class ComponentImporter extends ItemImporter
         }
         $this->log('No matching component, creating one');
         $component = new Component;
+        $component->created_by = auth()->id();
         $component->fill($this->sanitizeItemForStoring($component));
 
         // This sets an attribute on the Loggable trait for the action log
@@ -58,7 +59,7 @@ class ComponentImporter extends ItemImporter
             if (isset($this->item['asset_tag']) && ($asset = Asset::where('asset_tag', $this->item['asset_tag'])->first())) {
                 $component->assets()->attach($component->id, [
                     'component_id' => $component->id,
-                    'user_id' => $this->user_id,
+                    'created_by' => auth()->id(),
                     'created_at' => date('Y-m-d H:i:s'),
                     'assigned_qty' => 1, // Only assign the first one to the asset
                     'asset_id' => $asset->id,
diff --git a/app/Importer/ConsumableImporter.php b/app/Importer/ConsumableImporter.php
index 9e7019b086..40c597e896 100644
--- a/app/Importer/ConsumableImporter.php
+++ b/app/Importer/ConsumableImporter.php
@@ -28,9 +28,9 @@ class ConsumableImporter extends ItemImporter
     {
         $consumable = Consumable::where('name', trim($this->item['name']))->first();
         if ($consumable) {
+
             if (! $this->updating) {
                 $this->log('A matching Consumable '.$this->item['name'].' already exists.  ');
-
                 return;
             }
             $this->log('Updating Consumable');
@@ -39,11 +39,10 @@ class ConsumableImporter extends ItemImporter
 
             return;
         }
+
         $this->log('No matching consumable, creating one');
         $consumable = new Consumable();
-        $this->item['model_number'] = trim($this->findCsvMatch($row, 'model_number'));
-        $this->item['item_no'] = trim($this->findCsvMatch($row, 'item_number'));
-        $this->item['min_amt'] = trim($this->findCsvMatch($row, "min_amt"));
+        $consumable->created_by = auth()->id();
         $consumable->fill($this->sanitizeItemForStoring($consumable));
 
         // This sets an attribute on the Loggable trait for the action log
diff --git a/app/Importer/Importer.php b/app/Importer/Importer.php
index 9738723509..0d4b8d4932 100644
--- a/app/Importer/Importer.php
+++ b/app/Importer/Importer.php
@@ -21,8 +21,7 @@ abstract class Importer
      * Id of User performing import
      * @var
      */
-    
-    protected $user_id;
+    protected $created_by;
     /**
      * Are we updating items in the import
      * @var bool
@@ -40,6 +39,7 @@ abstract class Importer
      * @var array
      */
     private $defaultFieldMap = [
+        'id' => 'id',
         'asset_tag' => 'asset tag',
         'activated' => 'activated',
         'category' => 'category',
@@ -149,21 +149,28 @@ abstract class Importer
     {
         $headerRow = $this->csv->fetchOne();
         $this->csv->setHeaderOffset(0); //explicitly sets the CSV document header record
-        $results = $this->normalizeInputArray($this->csv->getRecords($headerRow));
 
         $this->populateCustomFields($headerRow);
 
-        DB::transaction(function () use (&$results) {
+        DB::transaction(function () use ($headerRow) {
+            $importedItemsCount = 0;
             Model::unguard();
-            $resultsCount = count($results);
-            foreach ($results as $row) {
+
+            foreach ($this->csv->getRecords($headerRow) as $row) {
+                //Lowercase header values to ensure we're comparing values properly.
+                $row = array_change_key_case($row, CASE_LOWER);
+
                 $this->handle($row);
+
+                $importedItemsCount++;
+
                 if ($this->progressCallback) {
-                    call_user_func($this->progressCallback, $resultsCount);
+                    call_user_func($this->progressCallback, $importedItemsCount);
                 }
 
                 $this->log('------------- Action Summary ----------------');
             }
+            Model::reguard();
         });
     }
 
@@ -236,22 +243,6 @@ abstract class Importer
         return $key;
     }
 
-    /**
-     * Used to lowercase header values to ensure we're comparing values properly.
-     *
-     * @param $results
-     * @return array
-     */
-    public function normalizeInputArray($results)
-    {
-        $newArray = [];
-        foreach ($results as $index => $arrayToNormalize) {
-            $newArray[$index] = array_change_key_case($arrayToNormalize);
-        }
-
-        return $newArray;
-    }
-
     /**
      * Figure out the fieldname of the custom field
      *
@@ -281,6 +272,13 @@ abstract class Importer
         }
     }
 
+    protected function addErrorToBag($item, $field,  $error_message)
+    {
+        if ($this->errorCallback) {
+            call_user_func($this->errorCallback, $item, $field, [$field => [$error_message]]);
+        }
+    }
+
     /**
      * Finds the user matching given data, or creates a new one if there is no match.
      * This is NOT used by the User Import, only for Asset/Accessory/etc where
@@ -366,6 +364,7 @@ abstract class Importer
 
         // No luck finding a user on username or first name, let's create one.
         $user = new User;
+
         $user->first_name = $user_array['first_name'];
         $user->last_name = $user_array['last_name'];
         $user->username = $user_array['username'];
@@ -388,7 +387,7 @@ abstract class Importer
     }
 
     /**
-     * Matches a user by user_id if user_name provided is a number
+     * Matches a user by created_by if user_name provided is a number
      * @param  string $user_name users full name from csv
      * @return User           User Matching ID
      */
@@ -405,13 +404,13 @@ abstract class Importer
     /**
      * Sets the Id of User performing import.
      *
-     * @param mixed $user_id the user id
+     * @param mixed $created_by the user id
      *
      * @return self
      */
-    public function setUserId($user_id)
+    public function setCreatedBy($created_by)
     {
-        $this->user_id = $user_id;
+        $this->created_by = $created_by;
 
         return $this;
     }
@@ -495,6 +494,16 @@ abstract class Importer
 
     public function fetchHumanBoolean($value)
     {
+        $true = [
+            'yes',
+            'y',
+            'true',
+        ];
+
+        if (in_array(strtolower($value), $true)) {
+            return 1;
+        }
+
         return (int) filter_var($value, FILTER_VALIDATE_BOOLEAN);
     }
 
@@ -531,6 +540,7 @@ abstract class Importer
         return null;
     }
 
+
     /**
      * Fetch an existing manager
      *
diff --git a/app/Importer/ItemImporter.php b/app/Importer/ItemImporter.php
index ee680413d8..9283e79ab9 100644
--- a/app/Importer/ItemImporter.php
+++ b/app/Importer/ItemImporter.php
@@ -24,6 +24,12 @@ class ItemImporter extends Importer
 
     protected function handle($row)
     {
+
+        /**
+         * This section adds the most common fields into the $item array so we don't have to manually add them to
+         * things like accessories, consumables, etc.
+         */
+
         // Need to reset this between iterations or we'll have stale data.
         $this->item = [];
 
@@ -73,29 +79,20 @@ class ItemImporter extends Importer
         $this->item['notes'] = $this->findCsvMatch($row, 'notes');
         $this->item['order_number'] = $this->findCsvMatch($row, 'order_number');
         $this->item['purchase_cost'] = $this->findCsvMatch($row, 'purchase_cost');
+        $this->item['model_number'] = trim($this->findCsvMatch($row, 'model_number'));
+        $this->item['min_amt'] = $this->findCsvMatch($row, 'min_amt');
+        $this->item['qty'] = $this->findCsvMatch($row, 'quantity');
+        $this->item['requestable'] = $this->findCsvMatch($row, 'requestable');
+        $this->item['created_by'] = auth()->id();
+        $this->item['serial'] = $this->findCsvMatch($row, 'serial');
+        $this->item['item_no'] = trim($this->findCsvMatch($row, 'item_no'));
+
 
         $this->item['purchase_date'] = null;
         if ($this->findCsvMatch($row, 'purchase_date') != '') {
             $this->item['purchase_date'] = date('Y-m-d', strtotime($this->findCsvMatch($row, 'purchase_date')));
         }
 
-//        $this->item['asset_eol_date'] = null;
-//        if ($this->findCsvMatch($row, 'asset_eol_date') != '') {
-//            $csvMatch = $this->findCsvMatch($row, 'asset_eol_date');
-//            \Log::warning('EOL Date for $csvMatch is '.$csvMatch);
-//            try {
-//                $this->item['asset_eol_date'] = CarbonImmutable::parse($csvMatch)->format('Y-m-d');
-//            } catch (\Exception $e) {
-//                Log::info($e->getMessage());
-//                $this->log('Unable to parse date: '.$csvMatch);
-//            }
-//        }
-
-
-        $this->item['qty'] = $this->findCsvMatch($row, 'quantity');
-        $this->item['requestable'] = $this->findCsvMatch($row, 'requestable');
-        $this->item['user_id'] = $this->user_id;
-        $this->item['serial'] = $this->findCsvMatch($row, 'serial');
         // NO need to call this method if we're running the user import.
         // TODO: Merge these methods.
         $this->item['checkout_class'] = $this->findCsvMatch($row, 'checkout_class');
@@ -113,7 +110,7 @@ class ItemImporter extends Importer
     protected function determineCheckout($row)
     {
         // Locations don't get checked out to anyone/anything
-        if (get_class($this) == LocationImporter::class) {
+        if ((get_class($this) == LocationImporter::class) || (get_class($this) == AssetModelImporter::class) || (get_class($this) == SupplierImporter::class) || (get_class($this) == ManufacturerImporter::class)  || (get_class($this) == CategoryImporter::class)) {
             return;
         }
 
@@ -196,55 +193,65 @@ class ItemImporter extends Importer
     {
         $condition = array();
         $asset_model_name = $this->findCsvMatch($row, 'asset_model');
+        $asset_model_category = $this->findCsvMatch($row, 'category');
         $asset_modelNumber = $this->findCsvMatch($row, 'model_number');
+
         // TODO: At the moment, this means  we can't update the model number if the model name stays the same.
         if (! $this->shouldUpdateField($asset_model_name)) {
             return;
         }
+
         if ((empty($asset_model_name)) && (! empty($asset_modelNumber))) {
             $asset_model_name = $asset_modelNumber;
         } elseif ((empty($asset_model_name)) && (empty($asset_modelNumber))) {
             $asset_model_name = 'Unknown';
         }
 
-        if ((!empty($asset_model_name)) && (empty($asset_modelNumber))) {
-            $condition[] = ['name', '=', $asset_model_name];
-        } elseif ((!empty($asset_model_name)) && (!empty($asset_modelNumber))) {
-            $condition[] = ['name', '=', $asset_model_name];
-            $condition[] = ['model_number', '=', $asset_modelNumber];
+        $asset_model = AssetModel::select('id');
+
+        if (!empty($asset_model_name)) {
+            $asset_model = $asset_model->where('name', '=', $asset_model_name);
+
+            if (!empty($asset_modelNumber)) {
+                $asset_model = $asset_model->where('model_number', '=', $asset_modelNumber);
+            }
         }
 
         $editingModel = $this->updating;
-        $asset_model = AssetModel::where($condition)->first();
+        $asset_model = $asset_model->first();
 
         if ($asset_model) {
+
             if (! $this->updating) {
                 $this->log('A matching model already exists, returning it.');
-
                 return $asset_model->id;
             }
+
             $this->log('Matching Model found, updating it.');
             $item = $this->sanitizeItemForStoring($asset_model, $editingModel);
             $item['name'] = $asset_model_name;
             $item['notes'] = $this->findCsvMatch($row, 'model_notes');
 
-            if(!empty($asset_modelNumber)){
+            if (!empty($asset_modelNumber)){
                 $item['model_number'] = $asset_modelNumber;
             }
 
             $asset_model->update($item);
             $asset_model->save();
             $this->log('Asset Model Updated');
-
+            
             return $asset_model->id;
-        }
-        $this->log('No Matching Model, Creating a new one');
 
+        }
+
+        $this->log('No Matching Model, Creating a new one');
         $asset_model = new AssetModel();
+        $asset_model->created_by = auth()->id();
         $item = $this->sanitizeItemForStoring($asset_model, $editingModel);
         $item['name'] = $asset_model_name;
         $item['model_number'] = $asset_modelNumber;
         $item['notes'] = $this->findCsvMatch($row, 'model_notes');
+        $item['category_id'] = $this->createOrFetchCategory($asset_model_category);
 
         $asset_model->fill($item);
         $item = null;
@@ -254,6 +261,7 @@ class ItemImporter extends Importer
 
             return $asset_model->id;
         }
+        $this->log('Asset Model Errors: '.$asset_model->getErrors());
         $this->logError($asset_model, 'Asset Model "'.$asset_model_name.'"');
 
         return null;
@@ -274,21 +282,28 @@ class ItemImporter extends Importer
         $classname = class_basename(get_class($this));
         $item_type = strtolower(substr($classname, 0, strpos($classname, 'Importer')));
 
+        // If we're importing asset models only (without attached assets), override the category type to asset
+        if ($item_type == 'assetmodel') {
+            $item_type = 'asset';
+        }
+
         if (empty($asset_category)) {
             $asset_category = 'Unnamed Category';
         }
+
+
         $category = Category::where(['name' => $asset_category, 'category_type' => $item_type])->first();
 
-        if ($category) {
-            $this->log('A matching category: '.$asset_category.' already exists');
 
+        if ($category) {
+            $this->log('A matching category: '.$category->name.' already exists');
             return $category->id;
         }
 
         $category = new Category();
+        $category->created_by = auth()->id();
         $category->name = $asset_category;
         $category->category_type = $item_type;
-        $category->user_id = $this->user_id;
 
         if ($category->save()) {
             $this->log('Category '.$asset_category.' was created');
@@ -317,6 +332,7 @@ class ItemImporter extends Importer
             return $company->id;
         }
         $company = new Company();
+        $company->created_by = auth()->id();
         $company->name = $asset_company_name;
 
         if ($company->save()) {
@@ -373,6 +389,7 @@ class ItemImporter extends Importer
         }
         $this->log('Creating a new status');
         $status = new Statuslabel();
+        $status->created_by = auth()->id();
         $status->name = trim($asset_statuslabel_name);
 
         $status->deployable = 1;
@@ -412,7 +429,7 @@ class ItemImporter extends Importer
         //Otherwise create a manufacturer.
         $manufacturer = new Manufacturer();
         $manufacturer->name = trim($item_manufacturer);
-        $manufacturer->user_id = $this->user_id;
+        $manufacturer->created_by = auth()->id();
 
         if ($manufacturer->save()) {
             $this->log('Manufacturer '.$manufacturer->name.' was created');
@@ -436,14 +453,13 @@ class ItemImporter extends Importer
     {
         if (empty($asset_location)) {
             $this->log('No location given, so none created.');
-
             return null;
         }
+
         $location = Location::where(['name' => $asset_location])->first();
 
         if ($location) {
             $this->log('Location '.$asset_location.' already exists');
-
             return $location->id;
         }
         // No matching locations in the collection, create a new one.
@@ -453,7 +469,7 @@ class ItemImporter extends Importer
         $location->city = '';
         $location->state = '';
         $location->country = '';
-        $location->user_id = $this->user_id;
+        $location->created_by = auth()->id();
 
         if ($location->save()) {
             $this->log('Location '.$asset_location.' was created');
@@ -489,11 +505,10 @@ class ItemImporter extends Importer
 
         $supplier = new Supplier();
         $supplier->name = $item_supplier;
-        $supplier->user_id = $this->user_id;
+        $supplier->created_by = auth()->id();
 
         if ($supplier->save()) {
             $this->log('Supplier '.$item_supplier.' was created');
-
             return $supplier->id;
         }
         $this->logError($supplier, 'Supplier');
diff --git a/app/Importer/LicenseImporter.php b/app/Importer/LicenseImporter.php
index b7c55cdba6..d5df4aba3c 100644
--- a/app/Importer/LicenseImporter.php
+++ b/app/Importer/LicenseImporter.php
@@ -68,6 +68,7 @@ class LicenseImporter extends ItemImporter
         $this->item['order_number'] = trim($this->findCsvMatch($row, 'order_number'));
         $this->item['reassignable'] = trim($this->findCsvMatch($row, 'reassignable'));
         $this->item['manufacturer'] = $this->createOrFetchManufacturer(trim($this->findCsvMatch($row, 'manufacturer')));
+        $this->item['min_amt'] = trim($this->findCsvMatch($row, 'min_amt'));
 
         if($this->item['reassignable'] == "")
         {
@@ -84,6 +85,7 @@ class LicenseImporter extends ItemImporter
             $license->update($this->sanitizeItemForUpdating($license));
         } else {
             $license->fill($this->sanitizeItemForStoring($license));
+            $license->created_by = auth()->id();
         }
 
         // This sets an attribute on the Loggable trait for the action log
@@ -103,13 +105,13 @@ class LicenseImporter extends ItemImporter
 
                 if ($checkout_target) {
                     $targetLicense->assigned_to = $checkout_target->id;
-                    $targetLicense->user_id = Auth::id();
+                    $targetLicense->created_by = auth()->id();
                     if ($asset) {
                         $targetLicense->asset_id = $asset->id;
                     }
                     $targetLicense->save();
                 } elseif ($asset) {
-                    $targetLicense->user_id = Auth::id();
+                    $targetLicense->created_by = auth()->id();
                     $targetLicense->asset_id = $asset->id;
                     $targetLicense->save();
                 }
diff --git a/app/Importer/LocationImporter.php b/app/Importer/LocationImporter.php
index 3b1b65b08f..1fcef6625d 100644
--- a/app/Importer/LocationImporter.php
+++ b/app/Importer/LocationImporter.php
@@ -38,8 +38,16 @@ class LocationImporter extends ItemImporter
     {
 
         $editingLocation = false;
+
         $location = Location::where('name', '=', $this->findCsvMatch($row, 'name'))->first();
 
+        if ($this->findCsvMatch($row, 'id')!='') {
+            // Override location if an ID was given
+            \Log::debug('Finding location by ID: '.$this->findCsvMatch($row, 'id'));
+            $location = Location::find($this->findCsvMatch($row, 'id'));
+        }
+
+
         if ($location) {
             if (! $this->updating) {
                 $this->log('A matching Location '.$this->item['name'].' already exists');
@@ -51,6 +59,7 @@ class LocationImporter extends ItemImporter
         } else {
             $this->log('No Matching Location, Create a new one');
             $location = new Location;
+            $location->created_by = auth()->id();
         }
 
         // Pull the records from the CSV to determine their values
@@ -65,7 +74,8 @@ class LocationImporter extends ItemImporter
         $this->item['ldap_ou'] = trim($this->findCsvMatch($row, 'ldap_ou'));
         $this->item['manager'] = trim($this->findCsvMatch($row, 'manager'));
         $this->item['manager_username'] = trim($this->findCsvMatch($row, 'manager_username'));
-        $this->item['user_id'] = \Auth::user()->id;
+        $this->item['notes'] = trim($this->findCsvMatch($row, 'notes'));
+
 
         if ($this->findCsvMatch($row, 'parent_location')) {
             $this->item['parent_id'] = $this->createOrFetchLocation(trim($this->findCsvMatch($row, 'parent_location')));
@@ -95,6 +105,7 @@ class LocationImporter extends ItemImporter
 
         } else {
             Log::debug($location->getErrors());
+            $this->logError($location, 'Location "'.$this->item['name'].'"');
             return $location->errors;
         }
 
diff --git a/app/Importer/ManufacturerImporter.php b/app/Importer/ManufacturerImporter.php
new file mode 100644
index 0000000000..5272bf698a
--- /dev/null
+++ b/app/Importer/ManufacturerImporter.php
@@ -0,0 +1,101 @@
+<?php
+
+namespace App\Importer;
+
+use App\Models\Manufacturer;
+use Illuminate\Support\Facades\Log;
+
+/**
+ * When we are importing users via an Asset/etc import, we use createOrFetchUser() in
+ * Importer\Importer.php. [ALG]
+ *
+ * Class ManufacturerImporter
+ */
+class ManufacturerImporter extends ItemImporter
+{
+    protected $manufacturers;
+
+    public function __construct($filename)
+    {
+        parent::__construct($filename);
+    }
+
+    protected function handle($row)
+    {
+        parent::handle($row);
+        $this->createManufacturerIfNotExists($row);
+    }
+
+    /**
+     * Create a supplier if a duplicate does not exist.
+     * @todo Investigate how this should interact with Importer::createManufacturerIfNotExists
+     *
+     * @author A. Gianotto
+     * @since 6.1.0
+     * @param array $row
+     */
+    public function createManufacturerIfNotExists(array $row)
+    {
+
+        $editingManufacturer = false;
+
+        $supplier = Manufacturer::where('name', '=', $this->findCsvMatch($row, 'name'))->first();
+
+        if ($this->findCsvMatch($row, 'id')!='') {
+            // Override supplier if an ID was given
+            \Log::debug('Finding supplier by ID: '.$this->findCsvMatch($row, 'id'));
+            $supplier = Manufacturer::find($this->findCsvMatch($row, 'id'));
+        }
+
+
+        if ($supplier) {
+            if (! $this->updating) {
+                $this->log('A matching Manufacturer '.$this->item['name'].' already exists');
+                return;
+            }
+
+            $this->log('Updating Manufacturer');
+            $editingManufacturer = true;
+        } else {
+            $this->log('No Matching Manufacturer, Create a new one');
+            $supplier = new Manufacturer;
+            $supplier->created_by = auth()->id();
+        }
+
+        // Pull the records from the CSV to determine their values
+        $this->item['name'] = trim($this->findCsvMatch($row, 'name'));
+        $this->item['support_phone'] = trim($this->findCsvMatch($row, 'support_phone'));
+        $this->item['fax'] = trim($this->findCsvMatch($row, 'fax'));
+        $this->item['support_email'] = trim($this->findCsvMatch($row, 'support_email'));
+        $this->item['contact'] = trim($this->findCsvMatch($row, 'contact'));
+        $this->item['url'] = trim($this->findCsvMatch($row, 'url'));
+        $this->item['support_url'] = trim($this->findCsvMatch($row, 'support_url'));
+        $this->item['warranty_lookup_url'] = trim($this->findCsvMatch($row, 'warranty_lookup_url'));
+        $this->item['notes'] = trim($this->findCsvMatch($row, 'notes'));
+
+
+        Log::debug('Item array is: ');
+        Log::debug(print_r($this->item, true));
+
+
+        if ($editingManufacturer) {
+            Log::debug('Updating existing supplier');
+            $supplier->update($this->sanitizeItemForUpdating($supplier));
+        } else {
+            Log::debug('Creating supplier');
+            $supplier->fill($this->sanitizeItemForStoring($supplier));
+        }
+
+        if ($supplier->save()) {
+            $this->log('Manufacturer '.$supplier->name.' created or updated from CSV import');
+            return $supplier;
+
+        } else {
+            Log::debug($supplier->getErrors());
+            $this->logError($supplier, 'Manufacturer "'.$this->item['name'].'"');
+            return $supplier->errors;
+        }
+
+
+    }
+}
\ No newline at end of file
diff --git a/app/Importer/SupplierImporter.php b/app/Importer/SupplierImporter.php
new file mode 100644
index 0000000000..7878aff835
--- /dev/null
+++ b/app/Importer/SupplierImporter.php
@@ -0,0 +1,105 @@
+<?php
+
+namespace App\Importer;
+
+use App\Models\Supplier;
+use Illuminate\Support\Facades\Log;
+
+/**
+ * When we are importing users via an Asset/etc import, we use createOrFetchUser() in
+ * Importer\Importer.php. [ALG]
+ *
+ * Class SupplierImporter
+ */
+class SupplierImporter extends ItemImporter
+{
+    protected $suppliers;
+
+    public function __construct($filename)
+    {
+        parent::__construct($filename);
+    }
+
+    protected function handle($row)
+    {
+        parent::handle($row);
+        $this->createSupplierIfNotExists($row);
+    }
+
+    /**
+     * Create a supplier if a duplicate does not exist.
+     * @todo Investigate how this should interact with Importer::createSupplierIfNotExists
+     *
+     * @author A. Gianotto
+     * @since 6.1.0
+     * @param array $row
+     */
+    public function createSupplierIfNotExists(array $row)
+    {
+
+        $editingSupplier = false;
+
+        $supplier = Supplier::where('name', '=', $this->findCsvMatch($row, 'name'))->first();
+
+        if ($this->findCsvMatch($row, 'id')!='') {
+            // Override supplier if an ID was given
+            \Log::debug('Finding supplier by ID: '.$this->findCsvMatch($row, 'id'));
+            $supplier = Supplier::find($this->findCsvMatch($row, 'id'));
+        }
+
+
+        if ($supplier) {
+            if (! $this->updating) {
+                $this->log('A matching Supplier '.$this->item['name'].' already exists');
+                return;
+            }
+
+            $this->log('Updating Supplier');
+            $editingSupplier = true;
+        } else {
+            $this->log('No Matching Supplier, Create a new one');
+            $supplier = new Supplier;
+            $supplier->created_by = auth()->id();
+        }
+
+        // Pull the records from the CSV to determine their values
+        $this->item['name'] = trim($this->findCsvMatch($row, 'name'));
+        $this->item['address'] = trim($this->findCsvMatch($row, 'address'));
+        $this->item['address2'] = trim($this->findCsvMatch($row, 'address2'));
+        $this->item['city'] = trim($this->findCsvMatch($row, 'city'));
+        $this->item['state'] = trim($this->findCsvMatch($row, 'state'));
+        $this->item['country'] = trim($this->findCsvMatch($row, 'country'));
+        $this->item['zip'] = trim($this->findCsvMatch($row, 'zip'));
+        $this->item['phone'] = trim($this->findCsvMatch($row, 'phone'));
+        $this->item['fax'] = trim($this->findCsvMatch($row, 'fax'));
+        $this->item['email'] = trim($this->findCsvMatch($row, 'email'));
+        $this->item['contact'] = trim($this->findCsvMatch($row, 'contact'));
+        $this->item['url'] = trim($this->findCsvMatch($row, 'url'));
+        $this->item['notes'] = trim($this->findCsvMatch($row, 'notes'));
+
+
+        Log::debug('Item array is: ');
+        Log::debug(print_r($this->item, true));
+
+
+        if ($editingSupplier) {
+            Log::debug('Updating existing supplier');
+            $supplier->update($this->sanitizeItemForUpdating($supplier));
+        } else {
+            Log::debug('Creating supplier');
+            $supplier->fill($this->sanitizeItemForStoring($supplier));
+        }
+
+        if ($supplier->save()) {
+            $this->log('Supplier '.$supplier->name.' created or updated from CSV import');
+            return $supplier;
+
+        } else {
+            Log::debug($supplier->getErrors());
+            $this->logError($supplier, 'Supplier "'.$this->item['name'].'"');
+            return $supplier->errors;
+        }
+
+
+    }
+}
\ No newline at end of file
diff --git a/app/Importer/UserImporter.php b/app/Importer/UserImporter.php
index 2cb6abd659..77317b3d09 100644
--- a/app/Importer/UserImporter.php
+++ b/app/Importer/UserImporter.php
@@ -67,6 +67,7 @@ class UserImporter extends ItemImporter
         $this->item['vip'] = ($this->fetchHumanBoolean(trim($this->findCsvMatch($row, 'vip'))) ==1 ) ? '1' : 0;
         $this->item['autoassign_licenses'] = ($this->fetchHumanBoolean(trim($this->findCsvMatch($row, 'autoassign_licenses'))) ==1 ) ? '1' : 0;
 
+        $this->handleEmptyStringsForDates();
 
         $user_department = trim($this->findCsvMatch($row, 'department'));
         if ($this->shouldUpdateField($user_department)) {
@@ -113,6 +114,7 @@ class UserImporter extends ItemImporter
 
         $this->log('No matching user, creating one');
         $user = new User();
+        $user->created_by = auth()->id();
         $user->fill($this->sanitizeItemForStoring($user));
 
         if ($user->save()) {
@@ -164,7 +166,7 @@ class UserImporter extends ItemImporter
 
         $department = new department();
         $department->name = $department_name;
-        $department->user_id = $this->user_id;
+        $department->created_by = $this->created_by;
 
         if ($department->save()) {
             $this->log('department ' . $department_name . ' was created');
@@ -179,4 +181,22 @@ class UserImporter extends ItemImporter
     {
         $this->send_welcome = $send;
     }
+
+    /**
+     * Since the findCsvMatch() method will set '' for columns that are present but empty,
+     * we need to set those empty strings to null to avoid passing bad data to the database
+     * (ie ending up with 0000-00-00 instead of the intended null).
+     *
+     * @return void
+     */
+    private function handleEmptyStringsForDates(): void
+    {
+        if ($this->item['start_date'] === '') {
+            $this->item['start_date'] = null;
+        }
+
+        if ($this->item['end_date'] === '') {
+            $this->item['end_date'] = null;
+        }
+    }
 }
diff --git a/app/LegacyEncrypter/BaseEncrypter.php b/app/LegacyEncrypter/BaseEncrypter.php
deleted file mode 100644
index adc1e451d4..0000000000
--- a/app/LegacyEncrypter/BaseEncrypter.php
+++ /dev/null
@@ -1,81 +0,0 @@
-<?php
-
-namespace App\LegacyEncrypter;
-
-use Illuminate\Contracts\Encryption\DecryptException;
-
-abstract class BaseEncrypter
-{
-    /**
-     * The encryption key.
-     *
-     * @var string
-     */
-    protected $key;
-
-    /**
-     * Create a MAC for the given value.
-     *
-     * @param  string  $iv
-     * @param  string  $value
-     * @return string
-     */
-    protected function hash($iv, $value)
-    {
-        return hash_hmac('sha256', $iv.$value, $this->key);
-    }
-
-    /**
-     * Get the JSON array from the given payload.
-     *
-     * @param  string  $payload
-     * @return array
-     *
-     * @throws \Illuminate\Contracts\Encryption\DecryptException
-     */
-    protected function getJsonPayload($payload)
-    {
-        $payload = json_decode(base64_decode($payload), true);
-
-        // If the payload is not valid JSON or does not have the proper keys set we will
-        // assume it is invalid and bail out of the routine since we will not be able
-        // to decrypt the given value. We'll also check the MAC for this encryption.
-        if (! $payload || $this->invalidPayload($payload)) {
-            throw new DecryptException('The payload is invalid.');
-        }
-
-        if (! $this->validMac($payload)) {
-            throw new DecryptException('The MAC is invalid.');
-        }
-
-        return $payload;
-    }
-
-    /**
-     * Verify that the encryption payload is valid.
-     *
-     * @param  array|mixed  $data
-     * @return bool
-     */
-    protected function invalidPayload($data)
-    {
-        return ! is_array($data) || ! isset($data['iv']) || ! isset($data['value']) || ! isset($data['mac']);
-    }
-
-    /**
-     * Determine if the MAC for the given payload is valid.
-     *
-     * @param  array  $payload
-     * @return bool
-     *
-     * @throws \RuntimeException
-     */
-    protected function validMac(array $payload)
-    {
-        $bytes = random_bytes(16);
-
-        $calcMac = hash_hmac('sha256', $this->hash($payload['iv'], $payload['value']), $bytes, true);
-
-        return hash_equals(hash_hmac('sha256', $payload['mac'], $bytes, true), $calcMac);
-    }
-}
diff --git a/app/LegacyEncrypter/McryptEncrypter.php b/app/LegacyEncrypter/McryptEncrypter.php
deleted file mode 100644
index ac0a49fc58..0000000000
--- a/app/LegacyEncrypter/McryptEncrypter.php
+++ /dev/null
@@ -1,214 +0,0 @@
-<?php
-
-namespace App\LegacyEncrypter;
-
-use Exception;
-use Illuminate\Contracts\Encryption\DecryptException;
-use Illuminate\Contracts\Encryption\Encrypter as EncrypterContract;
-use Illuminate\Contracts\Encryption\EncryptException;
-use RuntimeException;
-
-/**
- * @deprecated since version 5.1. Use Illuminate\Encryption\Encrypter.
- */
-class McryptEncrypter extends BaseEncrypter implements EncrypterContract
-{
-    /**
-     * The algorithm used for encryption.
-     *
-     * @var string
-     */
-    protected $cipher;
-
-    /**
-     * The block size of the cipher.
-     *
-     * @var int
-     */
-    protected $block;
-
-    /**
-     * Create a new encrypter instance.
-     *
-     * @param  string  $key
-     * @param  string  $cipher
-     * @return void
-     *
-     * @throws \RuntimeException
-     */
-    public function __construct($key, $cipher = MCRYPT_RIJNDAEL_128)
-    {
-        $key = (string) $key;
-
-        if (static::supported($key, $cipher)) {
-            $this->key = $key;
-            $this->cipher = $cipher;
-            $this->block = mcrypt_get_iv_size($this->cipher, MCRYPT_MODE_CBC);
-        } else {
-            throw new RuntimeException('The only supported ciphers are MCRYPT_RIJNDAEL_128 and MCRYPT_RIJNDAEL_256.');
-        }
-    }
-
-    /**
-     * Determine if the given key and cipher combination is valid.
-     *
-     * @param  string  $key
-     * @param  string  $cipher
-     * @return bool
-     */
-    public static function supported($key, $cipher)
-    {
-        return defined('MCRYPT_RIJNDAEL_128') &&
-                ($cipher === MCRYPT_RIJNDAEL_128 || $cipher === MCRYPT_RIJNDAEL_256);
-    }
-
-    /**
-     * Encrypt the given value.
-     *
-     * @param  string  $value
-     * @return string
-     *
-     * @throws \Illuminate\Contracts\Encryption\EncryptException
-     */
-    public function encrypt($value, $serialize = true)
-    {
-        $iv = mcrypt_create_iv($this->getIvSize(), $this->getRandomizer());
-
-        $value = base64_encode($this->padAndMcrypt($value, $iv));
-
-        // Once we have the encrypted value we will go ahead base64_encode the input
-        // vector and create the MAC for the encrypted value so we can verify its
-        // authenticity. Then, we'll JSON encode the data in a "payload" array.
-        $mac = $this->hash($iv = base64_encode($iv), $value);
-
-        $json = json_encode(compact('iv', 'value', 'mac'));
-
-        if (! is_string($json)) {
-            throw new EncryptException('Could not encrypt the data.');
-        }
-
-        return base64_encode($json);
-    }
-
-    /**
-     * Pad and use mcrypt on the given value and input vector.
-     *
-     * @param  string  $value
-     * @param  string  $iv
-     * @return string
-     */
-    protected function padAndMcrypt($value, $iv)
-    {
-        $value = $this->addPadding(serialize($value));
-
-        return mcrypt_encrypt($this->cipher, $this->key, $value, MCRYPT_MODE_CBC, $iv);
-    }
-
-    /**
-     * Decrypt the given value.
-     *
-     * @param  string  $payload
-     * @return string
-     */
-    public function decrypt($payload, $unserialize = true)
-    {
-        $payload = $this->getJsonPayload($payload);
-
-        // We'll go ahead and remove the PKCS7 padding from the encrypted value before
-        // we decrypt it. Once we have the de-padded value, we will grab the vector
-        // and decrypt the data, passing back the unserialized from of the value.
-        $value = base64_decode($payload['value']);
-
-        $iv = base64_decode($payload['iv']);
-
-        return unserialize($this->stripPadding($this->mcryptDecrypt($value, $iv)));
-    }
-
-    /**
-     * Run the mcrypt decryption routine for the value.
-     *
-     * @param  string  $value
-     * @param  string  $iv
-     * @return string
-     *
-     * @throws \Illuminate\Contracts\Encryption\DecryptException
-     */
-    protected function mcryptDecrypt($value, $iv)
-    {
-        try {
-            return mcrypt_decrypt($this->cipher, $this->key, $value, MCRYPT_MODE_CBC, $iv);
-        } catch (Exception $e) {
-            throw new DecryptException($e->getMessage());
-        }
-    }
-
-    /**
-     * Add PKCS7 padding to a given value.
-     *
-     * @param  string  $value
-     * @return string
-     */
-    protected function addPadding($value)
-    {
-        $pad = $this->block - (strlen($value) % $this->block);
-
-        return $value.str_repeat(chr($pad), $pad);
-    }
-
-    /**
-     * Remove the padding from the given value.
-     *
-     * @param  string  $value
-     * @return string
-     */
-    protected function stripPadding($value)
-    {
-        $pad = ord($value[($len = strlen($value)) - 1]);
-
-        return $this->paddingIsValid($pad, $value) ? substr($value, 0, $len - $pad) : $value;
-    }
-
-    /**
-     * Determine if the given padding for a value is valid.
-     *
-     * @param  string  $pad
-     * @param  string  $value
-     * @return bool
-     */
-    protected function paddingIsValid($pad, $value)
-    {
-        $beforePad = strlen($value) - $pad;
-
-        return substr($value, $beforePad) == str_repeat(substr($value, -1), $pad);
-    }
-
-    /**
-     * Get the IV size for the cipher.
-     *
-     * @return int
-     */
-    protected function getIvSize()
-    {
-        return mcrypt_get_iv_size($this->cipher, MCRYPT_MODE_CBC);
-    }
-
-    /**
-     * Get the random data source available for the OS.
-     *
-     * @return int
-     */
-    protected function getRandomizer()
-    {
-        if (defined('MCRYPT_DEV_URANDOM')) {
-            return MCRYPT_DEV_URANDOM;
-        }
-
-        if (defined('MCRYPT_DEV_RANDOM')) {
-            return MCRYPT_DEV_RANDOM;
-        }
-
-        mt_srand();
-
-        return MCRYPT_RAND;
-    }
-}
diff --git a/app/Listeners/CheckoutableListener.php b/app/Listeners/CheckoutableListener.php
index 4bc367f025..ec843b980b 100644
--- a/app/Listeners/CheckoutableListener.php
+++ b/app/Listeners/CheckoutableListener.php
@@ -3,14 +3,22 @@
 namespace App\Listeners;
 
 use App\Events\CheckoutableCheckedOut;
+use App\Mail\CheckinAccessoryMail;
+use App\Mail\CheckinLicenseMail;
+use App\Mail\CheckoutAccessoryMail;
+use App\Mail\CheckoutAssetMail;
+use App\Mail\CheckinAssetMail;
+use App\Mail\CheckoutConsumableMail;
+use App\Mail\CheckoutLicenseMail;
 use App\Models\Accessory;
 use App\Models\Asset;
 use App\Models\CheckoutAcceptance;
 use App\Models\Component;
 use App\Models\Consumable;
 use App\Models\LicenseSeat;
-use App\Models\Recipients\AdminRecipient;
+use App\Models\Location;
 use App\Models\Setting;
+use App\Models\User;
 use App\Notifications\CheckinAccessoryNotification;
 use App\Notifications\CheckinAssetNotification;
 use App\Notifications\CheckinLicenseSeatNotification;
@@ -19,9 +27,13 @@ use App\Notifications\CheckoutAssetNotification;
 use App\Notifications\CheckoutConsumableNotification;
 use App\Notifications\CheckoutLicenseSeatNotification;
 use GuzzleHttp\Exception\ClientException;
+use Illuminate\Database\Eloquent\Model;
+use Illuminate\Support\Facades\Mail;
 use Illuminate\Support\Facades\Notification;
 use Exception;
 use Illuminate\Support\Facades\Log;
+use Illuminate\Support\Str;
+use Osama\LaravelTeamsNotification\TeamsNotification;
 
 class CheckoutableListener
 {
@@ -29,55 +41,98 @@ class CheckoutableListener
         Component::class,
     ];
 
+    /**
+     * Register the listeners for the subscriber.
+     *
+     * @param  Illuminate\Events\Dispatcher  $events
+     */
+    public function subscribe($events)
+    {
+        $events->listen(
+            \App\Events\CheckoutableCheckedIn::class,
+            'App\Listeners\CheckoutableListener@onCheckedIn'
+        );
+
+        $events->listen(
+            \App\Events\CheckoutableCheckedOut::class,
+            'App\Listeners\CheckoutableListener@onCheckedOut'
+        );
+    }
+
     /**
      * Notify the user and post to webhook about the checked out checkoutable
      * and add a record to the checkout_requests table.
      */
     public function onCheckedOut($event)
     {
-        if ($this->shouldNotSendAnyNotifications($event->checkoutable)){
+        if ($this->shouldNotSendAnyNotifications($event->checkoutable)) {
             return;
         }
 
-        /**
-         * Make a checkout acceptance and attach it in the notification
-         */
         $acceptance = $this->getCheckoutAcceptance($event);
 
-        try {
-            if (! $event->checkedOutTo->locale) {
-                Notification::locale(Setting::getSettings()->locale)->send(
-                    $this->getNotifiables($event),
-                    $this->getCheckoutNotification($event, $acceptance)
-                );
-            } else {
-                Notification::send(
-                    $this->getNotifiables($event),
-                    $this->getCheckoutNotification($event, $acceptance)
-                );
+        $shouldSendEmailToUser = $this->shouldSendCheckoutEmailToUser($event->checkoutable);
+        $shouldSendEmailToAlertAddress = $this->shouldSendEmailToAlertAddress($acceptance);
+        $shouldSendWebhookNotification = $this->shouldSendWebhookNotification();
+
+        if (!$shouldSendEmailToUser && !$shouldSendEmailToAlertAddress && !$shouldSendWebhookNotification) {
+            return;
+        }
+
+        if ($shouldSendEmailToUser || $shouldSendEmailToAlertAddress) {
+            $mailable = $this->getCheckoutMailType($event, $acceptance);
+            $notifiable = $this->getNotifiableUser($event);
+
+            $notifiableHasEmail = $notifiable instanceof User && $notifiable->email;
+
+            $shouldSendEmailToUser = $shouldSendEmailToUser && $notifiableHasEmail;
+
+            [$to, $cc] = $this->generateEmailRecipients($shouldSendEmailToUser, $shouldSendEmailToAlertAddress, $notifiable);
+
+            if (!empty($to)) {
+                try {
+                    Mail::to(array_flatten($to))->cc(array_flatten($cc))->send($mailable);
+                    Log::info('Checkout Mail sent to checkout target');
+                } catch (ClientException $e) {
+                    Log::debug("Exception caught during checkout email: " . $e->getMessage());
+                } catch (Exception $e) {
+                    Log::debug("Exception caught during checkout email: " . $e->getMessage());
+                }
             }
+        }
 
-            if ($this->shouldSendWebhookNotification()) {
-
-            //slack doesn't include the url in its messaging format so this is needed to hit the endpoint
-
-              if(Setting::getSettings()->webhook_selected =='slack' || Setting::getSettings()->webhook_selected =='general') {
-
-
-                  Notification::route('slack', Setting::getSettings()->webhook_endpoint)
-                      ->notify($this->getCheckoutNotification($event));
-              }
+        if ($shouldSendWebhookNotification) {
+            try {
+                if ($this->newMicrosoftTeamsWebhookEnabled()) {
+                    $message = $this->getCheckoutNotification($event)->toMicrosoftTeams();
+                    $notification = new TeamsNotification(Setting::getSettings()->webhook_endpoint);
+                    $notification->success()->sendMessage($message[0], $message[1]);  // Send the message to Microsoft Teams
+                } else {
+                    Notification::route($this->webhookSelected(), Setting::getSettings()->webhook_endpoint)
+                        ->notify($this->getCheckoutNotification($event, $acceptance));
+                }
+            } catch (ClientException $e) {
+                if (strpos($e->getMessage(), 'channel_not_found') !== false) {
+                    Log::warning(Setting::getSettings()->webhook_selected . " notification failed: " . $e->getMessage());
+                    return redirect()->back()->with('warning', ucfirst(Setting::getSettings()->webhook_selected) . trans('admin/settings/message.webhook.webhook_channel_not_found'));
+                } else {
+                    Log::error("ClientException caught during checkin notification: " . $e->getMessage());
+                }
+                return redirect()->back()->with('warning', ucfirst(Setting::getSettings()->webhook_selected) . trans('admin/settings/message.webhook.webhook_fail'));
+            } catch (Exception $e) {
+                Log::warning(ucfirst(Setting::getSettings()->webhook_selected) . ' webhook notification failed:', [
+                    'error' => $e->getMessage(),
+                    'webhook_endpoint' => Setting::getSettings()->webhook_endpoint,
+                    'event' => $event,
+                ]);
+                return redirect()->back()->with('warning', ucfirst(Setting::getSettings()->webhook_selected) . trans('admin/settings/message.webhook.webhook_fail'));
             }
-        } catch (ClientException $e) {
-            Log::warning("Exception caught during checkout notification: " . $e->getMessage());
-        } catch (Exception $e) {
-            Log::warning("Exception caught during checkout notification: " . $e->getMessage());
         }
     }
 
     /**
      * Notify the user and post to webhook about the checked in checkoutable
-     */    
+     */
     public function onCheckedIn($event)
     {
         Log::debug('onCheckedIn in the Checkoutable listener fired');
@@ -86,49 +141,80 @@ class CheckoutableListener
             return;
         }
 
-        /**
-         * Send the appropriate notification
-         */
-        if ($event->checkedOutTo && $event->checkoutable){
-            $acceptances = CheckoutAcceptance::where('checkoutable_id', $event->checkoutable->id)
-                                            ->where('assigned_to_id', $event->checkedOutTo->id)
-                                            ->get();
+        $shouldSendEmailToUser = $this->checkoutableCategoryShouldSendEmail($event->checkoutable);
+        $shouldSendEmailToAlertAddress = $this->shouldSendEmailToAlertAddress();
+        $shouldSendWebhookNotification = $this->shouldSendWebhookNotification();
 
-            foreach($acceptances as $acceptance){
-                if($acceptance->isPending()){
-                    $acceptance->delete();
+        if (!$shouldSendEmailToUser && !$shouldSendEmailToAlertAddress && !$shouldSendWebhookNotification) {
+            return;
+        }
+
+        if ($shouldSendEmailToUser || $shouldSendEmailToAlertAddress) {
+            /**
+             * Send the appropriate notification
+             */
+            if ($event->checkedOutTo && $event->checkoutable) {
+                $acceptances = CheckoutAcceptance::where('checkoutable_id', $event->checkoutable->id)
+                    ->where('assigned_to_id', $event->checkedOutTo->id)
+                    ->get();
+
+                foreach ($acceptances as $acceptance) {
+                    if ($acceptance->isPending()) {
+                        $acceptance->delete();
+                    }
                 }
             }
+
+            $mailable = $this->getCheckinMailType($event);
+            $notifiable = $this->getNotifiableUser($event);
+
+            $notifiableHasEmail = $notifiable instanceof User && $notifiable->email;
+
+            $shouldSendEmailToUser = $shouldSendEmailToUser && $notifiableHasEmail;
+
+            [$to, $cc] = $this->generateEmailRecipients($shouldSendEmailToUser, $shouldSendEmailToAlertAddress, $notifiable);
+
+            try {
+                if (!empty($to)) {
+                    Mail::to(array_flatten($to))->cc(array_flatten($cc))->send($mailable);
+                    Log::info('Checkin Mail sent to CC addresses');
+                }
+            } catch (ClientException $e) {
+                Log::debug("Exception caught during checkin email: " . $e->getMessage());
+            } catch (Exception $e) {
+                Log::debug("Exception caught during checkin email: " . $e->getMessage());
+            }
         }
 
-        try {
-            // Use default locale
-            if (! $event->checkedOutTo->locale) {
-                Notification::locale(Setting::getSettings()->locale)->send(
-                    $this->getNotifiables($event),
-                    $this->getCheckinNotification($event)
-                );
-            } else {
-                Notification::send(
-                    $this->getNotifiables($event),
-                    $this->getCheckinNotification($event)
-                );
-            }
-            //slack doesn't include the url in its messaging format so this is needed to hit the endpoint
-            if(Setting::getSettings()->webhook_selected =='slack' || Setting::getSettings()->webhook_selected =='general') {
-
-                if ($this->shouldSendWebhookNotification()) {
-                    Notification::route('slack', Setting::getSettings()->webhook_endpoint)
+        if ($shouldSendWebhookNotification) {
+            // Send Webhook notification
+            try {
+                if ($this->newMicrosoftTeamsWebhookEnabled()) {
+                    $message = $this->getCheckinNotification($event)->toMicrosoftTeams();
+                    $notification = new TeamsNotification(Setting::getSettings()->webhook_endpoint);
+                    $notification->success()->sendMessage($message[0], $message[1]); // Send the message to Microsoft Teams
+                } else {
+                    Notification::route($this->webhookSelected(), Setting::getSettings()->webhook_endpoint)
                         ->notify($this->getCheckinNotification($event));
                 }
+            } catch (ClientException $e) {
+                if (strpos($e->getMessage(), 'channel_not_found') !== false) {
+                    Log::warning(Setting::getSettings()->webhook_selected . " notification failed: " . $e->getMessage());
+                    return redirect()->back()->with('warning', ucfirst(Setting::getSettings()->webhook_selected) . trans('admin/settings/message.webhook.webhook_channel_not_found'));
+                } else {
+                    Log::error("ClientException caught during checkin notification: " . $e->getMessage());
+                    return redirect()->back()->with('warning', ucfirst(Setting::getSettings()->webhook_selected) . trans('admin/settings/message.webhook.webhook_fail'));
+                }
+            } catch (Exception $e) {
+                Log::warning(ucfirst(Setting::getSettings()->webhook_selected) . ' webhook notification failed:', [
+                    'error' => $e->getMessage(),
+                    'webhook_endpoint' => Setting::getSettings()->webhook_endpoint,
+                    'event' => $event,
+                ]);
+                return redirect()->back()->with('warning', ucfirst(Setting::getSettings()->webhook_selected) . trans('admin/settings/message.webhook.webhook_fail'));
             }
-
-        } catch (ClientException $e) {
-            Log::warning("Exception caught during checkout notification: " . $e->getMessage());
-        } catch (Exception $e) {
-            Log::warning("Exception caught during checkin notification: " . $e->getMessage());
         }
-    }      
+    }
 
     /**
      * Generates a checkout acceptance
@@ -137,7 +223,11 @@ class CheckoutableListener
      */
     private function getCheckoutAcceptance($event)
     {
-        if (! $event->checkoutable->requireAcceptance()) {
+        $checkedOutToType = get_class($event->checkedOutTo);
+        if ($checkedOutToType != "App\Models\User") {
+            return null;
+        }
+        if (!$event->checkoutable->requireAcceptance()) {
             return null;
         }
 
@@ -146,40 +236,13 @@ class CheckoutableListener
         $acceptance->assignedTo()->associate($event->checkedOutTo);
         $acceptance->save();
 
-        return $acceptance;      
-    }
-
-    /**
-     * Gets the entities to be notified of the passed event
-     * 
-     * @param  Event $event
-     * @return Collection
-     */
-    private function getNotifiables($event)
-    {
-        $notifiables = collect();
-
-        /**
-         * Notify who checked out the item as long as the model can route notifications
-         */
-        if (method_exists($event->checkedOutTo, 'routeNotificationFor')) {
-            $notifiables->push($event->checkedOutTo);
-        }
-
-        /**
-         * Notify Admin users if the settings is activated
-         */
-        if ((Setting::getSettings()) && (Setting::getSettings()->admin_cc_email != '')) {
-            $notifiables->push(new AdminRecipient());
-        }
-
-        return $notifiables;       
+        return $acceptance;
     }
 
     /**
      * Get the appropriate notification for the event
-     * 
-     * @param  CheckoutableCheckedIn $event 
+     *
+     * @param  CheckoutableCheckedIn  $event
      * @return Notification
      */
     private function getCheckinNotification($event)
@@ -193,7 +256,7 @@ class CheckoutableListener
                 break;
             case Asset::class:
                 $notificationClass = CheckinAssetNotification::class;
-                break;    
+                break;
             case LicenseSeat::class:
                 $notificationClass = CheckinLicenseSeatNotification::class;
                 break;
@@ -201,9 +264,8 @@ class CheckoutableListener
 
         Log::debug('Notification class: '.$notificationClass);
 
-        return new $notificationClass($event->checkoutable, $event->checkedOutTo, $event->checkedInBy, $event->note);  
+        return new $notificationClass($event->checkoutable, $event->checkedOutTo, $event->checkedInBy, $event->note);
     }
-
     /**
      * Get the appropriate notification for the event
      * 
@@ -224,7 +286,7 @@ class CheckoutableListener
                 break;
             case Consumable::class:
                 $notificationClass = CheckoutConsumableNotification::class;
-                break;    
+                break;
             case LicenseSeat::class:
                 $notificationClass = CheckoutLicenseSeatNotification::class;
                 break;
@@ -233,23 +295,64 @@ class CheckoutableListener
 
         return new $notificationClass($event->checkoutable, $event->checkedOutTo, $event->checkedOutBy, $acceptance, $event->note);
     }
+    private function getCheckoutMailType($event, $acceptance){
+        $lookup = [
+            Accessory::class => CheckoutAccessoryMail::class,
+            Asset::class => CheckoutAssetMail::class,
+            LicenseSeat::class => CheckoutLicenseMail::class,
+            Consumable::class => CheckoutConsumableMail::class,
+        ];
+        $mailable= $lookup[get_class($event->checkoutable)];
+
+        return new $mailable($event->checkoutable, $event->checkedOutTo, $event->checkedOutBy, $acceptance, $event->note);
+
+    }
+
+    private function getCheckinMailType($event){
+        $lookup = [
+            Accessory::class => CheckinAccessoryMail::class,
+            Asset::class => CheckinAssetMail::class,
+            LicenseSeat::class => CheckinLicenseMail::class,
+        ];
+
+        $mailable= $lookup[get_class($event->checkoutable)];
+
+        return new $mailable($event->checkoutable, $event->checkedOutTo, $event->checkedInBy, $event->note);
+
+    }
 
     /**
-     * Register the listeners for the subscriber.
+     * This gets the recipient objects based on the type of checkoutable.
+     * The 'name' property for users is set in the boot method in the User model.
      *
-     * @param  Illuminate\Events\Dispatcher  $events
+     * @see \App\Models\User::boot()
+     * @param $event
+     * @return mixed
      */
-    public function subscribe($events)
+    private function getNotifiableUser($event)
     {
-        $events->listen(
-            \App\Events\CheckoutableCheckedIn::class,
-            'App\Listeners\CheckoutableListener@onCheckedIn'
-        ); 
 
-        $events->listen(
-            \App\Events\CheckoutableCheckedOut::class,
-            'App\Listeners\CheckoutableListener@onCheckedOut'
-        ); 
+        // If it's assigned to an asset, get that asset's assignedTo object
+        if ($event->checkedOutTo instanceof Asset){
+            $event->checkedOutTo->load('assignedTo');
+            return $event->checkedOutTo->assignedto;
+
+        // If it's assigned to a location, get that location's manager object
+        } elseif ($event->checkedOutTo instanceof Location) {
+            return $event->checkedOutTo->manager;
+
+        // Otherwise just return the assigned to object
+        } else {
+            return $event->checkedOutTo;
+        }
+    }
+
+    private function webhookSelected(){
+        if(Setting::getSettings()->webhook_selected === 'slack' || Setting::getSettings()->webhook_selected === 'general'){
+            return 'slack';
+        }
+
+        return Setting::getSettings()->webhook_selected;
     }
 
     private function shouldNotSendAnyNotifications($checkoutable): bool
@@ -257,8 +360,115 @@ class CheckoutableListener
         return in_array(get_class($checkoutable), $this->skipNotificationsFor);
     }
 
+    private function shouldSendEmailNotifications(Model $checkoutable): bool
+    {
+        //runs a check if the category wants to send checkin/checkout emails to users
+        $category = match (true) {
+            $checkoutable instanceof Asset => $checkoutable->model->category,
+            $checkoutable instanceof Accessory,
+            $checkoutable instanceof Consumable => $checkoutable->category,
+            $checkoutable instanceof LicenseSeat => $checkoutable->license->category,
+            default => null,
+        };
+
+        if (!$category?->checkin_email) {
+            return false;
+        }
+        return true;
+    }
+
     private function shouldSendWebhookNotification(): bool
     {
         return Setting::getSettings() && Setting::getSettings()->webhook_endpoint;
     }
+
+    private function checkoutableCategoryShouldSendEmail(Model $checkoutable): bool
+    {
+        if ($checkoutable instanceof LicenseSeat) {
+            return $checkoutable->license->checkin_email();
+        }
+        return (method_exists($checkoutable, 'checkin_email') && $checkoutable->checkin_email());
+    }
+
+    private function newMicrosoftTeamsWebhookEnabled(): bool
+    {
+        return Setting::getSettings()->webhook_selected === 'microsoft' && Str::contains(Setting::getSettings()->webhook_endpoint, 'workflows');
+    }
+
+    private function shouldSendCheckoutEmailToUser(Model $checkoutable): bool
+    {
+        /**
+         * Send an email if any of the following conditions are met:
+         * 1. The asset requires acceptance
+         * 2. The item has a EULA
+         * 3. The item should send an email at check-in/check-out
+         */
+
+        if ($checkoutable->requireAcceptance()) {
+            return true;
+        }
+
+        if ($checkoutable->getEula()) {
+            return true;
+        }
+
+        if ($this->checkoutableCategoryShouldSendEmail($checkoutable)) {
+            return true;
+        }
+
+        return false;
+    }
+
+    private function shouldSendEmailToAlertAddress($acceptance = null): bool
+    {
+        $setting = Setting::getSettings();
+
+        if (!$setting) {
+            return false;
+        }
+
+        if (is_null($acceptance) && !$setting->admin_cc_always) {
+            return false;
+        }
+
+        return (bool) $setting->admin_cc_email;
+    }
+
+    private function getFormattedAlertAddresses(): array
+    {
+        $alertAddresses = Setting::getSettings()->admin_cc_email;
+
+        if ($alertAddresses !== '') {
+            return array_filter(array_map('trim', explode(',', $alertAddresses)));
+        }
+
+        return [];
+    }
+
+    private function generateEmailRecipients(
+        bool $shouldSendEmailToUser,
+        bool $shouldSendEmailToAlertAddress,
+        mixed $notifiable
+    ): array {
+        $to = [];
+        $cc = [];
+
+        // if user && cc: to user, cc admin
+        if ($shouldSendEmailToUser && $shouldSendEmailToAlertAddress) {
+            $to[] = $notifiable;
+            $cc[] = $this->getFormattedAlertAddresses();
+        }
+
+        // if user && no cc: to user
+        if ($shouldSendEmailToUser && !$shouldSendEmailToAlertAddress) {
+            $to[] = $notifiable;
+        }
+
+        // if no user && cc: to admin
+        if (!$shouldSendEmailToUser && $shouldSendEmailToAlertAddress) {
+            $to[] = $this->getFormattedAlertAddresses();
+        }
+
+        return array($to, $cc);
+    }
 }
diff --git a/app/Listeners/LogListener.php b/app/Listeners/LogListener.php
index 57eee03f17..d7973e2103 100644
--- a/app/Listeners/LogListener.php
+++ b/app/Listeners/LogListener.php
@@ -65,6 +65,7 @@ class LogListener
         $logaction->filename = $event->acceptance->stored_eula_file;
         $logaction->note = $event->acceptance->note;
         $logaction->action_type = 'accepted';
+        $logaction->action_date = $event->acceptance->accepted_at;
 
         // TODO: log the actual license seat that was checked out
         if ($event->acceptance->checkoutable instanceof LicenseSeat) {
@@ -82,6 +83,7 @@ class LogListener
         $logaction->accept_signature = $event->acceptance->signature_filename;
         $logaction->note = $event->acceptance->note;
         $logaction->action_type = 'declined';
+        $logaction->action_date = $event->acceptance->declined_at;
 
         // TODO: log the actual license seat that was checked out
         if ($event->acceptance->checkoutable instanceof LicenseSeat) {
@@ -111,7 +113,7 @@ class LogListener
         $logaction->target_type = User::class;
         $logaction->action_type = 'merged';
         $logaction->note = trans('general.merged_log_this_user_from', $to_from_array);
-        $logaction->user_id = $event->admin->id;
+        $logaction->created_by = $event->admin->id ?? null;
         $logaction->save();
 
         // Add a record to the users being merged TO
@@ -122,7 +124,7 @@ class LogListener
         $logaction->item_type = User::class;
         $logaction->action_type = 'merged';
         $logaction->note = trans('general.merged_log_this_user_into', $to_from_array);
-        $logaction->user_id = $event->admin->id;
+        $logaction->created_by = $event->admin->id ?? null;
         $logaction->save();
 
 
@@ -141,6 +143,7 @@ class LogListener
             'CheckoutAccepted',
             'CheckoutDeclined',
             'UserMerged',
+            'NoteAdded',
         ];
 
         foreach ($list as $event) {
diff --git a/app/Livewire/CategoryEditForm.php b/app/Livewire/CategoryEditForm.php
index 28a06657c1..fd8bef6489 100644
--- a/app/Livewire/CategoryEditForm.php
+++ b/app/Livewire/CategoryEditForm.php
@@ -12,11 +12,11 @@ class CategoryEditForm extends Component
 
     public $originalSendCheckInEmailValue;
 
-    public $requireAcceptance;
+    public bool $requireAcceptance;
 
-    public $sendCheckInEmail;
+    public bool $sendCheckInEmail;
 
-    public $useDefaultEula;
+    public bool $useDefaultEula;
 
     public function mount()
     {
diff --git a/app/Livewire/CustomFieldSetDefaultValuesForModel.php b/app/Livewire/CustomFieldSetDefaultValuesForModel.php
index a4a9f9fe71..a5f179b1cb 100644
--- a/app/Livewire/CustomFieldSetDefaultValuesForModel.php
+++ b/app/Livewire/CustomFieldSetDefaultValuesForModel.php
@@ -2,6 +2,8 @@
 
 namespace App\Livewire;
 
+use App\Models\CustomField;
+use Livewire\Attributes\Computed;
 use Livewire\Component;
 
 use App\Models\CustomFieldset;
@@ -12,37 +14,109 @@ class CustomFieldSetDefaultValuesForModel extends Component
     public $add_default_values;
 
     public $fieldset_id;
-    public $fields;
     public $model_id;
 
-    public function mount()
+    public array $selectedValues = [];
+
+    public function mount($model_id = null)
     {
-        if(is_null($this->model_id)){
-            return;
+        $this->model_id = $model_id;
+        $this->fieldset_id = $this->model?->fieldset_id;
+        $this->add_default_values = ($this->model?->defaultValues->count() > 0);
+
+
+        $this->initializeSelectedValuesArray();
+        if (session()->has('errors')) {
+            $errors = session('errors')->keys();
+            $selectedValuesKeys = array_keys($this->selectedValues);
+            if (count(array_intersect($selectedValuesKeys, $errors)) > 0) {
+                $this->add_default_values = true;
+            };
         }
-            
-        $this->model = AssetModel::find($this->model_id); // It's possible to do some clever route-model binding here, but let's keep it simple, shall we?
-        $this->fieldset_id = $this->model->fieldset_id;
-
-        $this->fields = null;
-
-        if ($fieldset = CustomFieldset::find($this->fieldset_id)) {
-            $this->fields = CustomFieldset::find($this->fieldset_id)->fields;
-        } 
-
-        $this->add_default_values = ($this->model->defaultValues->count() > 0);
+        $this->populatedSelectedValuesArray();
     }
 
-    public function updatedFieldsetId()
+    #[Computed]
+    public function model()
     {
-        if (CustomFieldset::find($this->fieldset_id)) {
-            $this->fields = CustomFieldset::find($this->fieldset_id)->fields;
+        return AssetModel::find($this->model_id);
+    }
+
+    #[Computed]
+    public function fields()
+    {
+        $customFieldset = CustomFieldset::find($this->fieldset_id);
+
+        if ($customFieldset) {
+            return $customFieldset?->fields;
         }
-        
+
+        return collect();
     }
 
     public function render()
     {
         return view('livewire.custom-field-set-default-values-for-model');
     }
+
+    /**
+     * Livewire property binding plays nicer with arrays when it knows
+     * which keys will be present instead of them being
+     * dynamically added (this is especially true for checkboxes).
+     *
+     * Let's go ahead and initialize selectedValues with all the potential keys (custom field db_columns).
+     *
+     * @return void
+     */
+    private function initializeSelectedValuesArray(): void
+    {
+        CustomField::all()->each(function ($field) {
+            $this->selectedValues[$field->db_column] = null;
+
+            if ($field->element === 'checkbox') {
+                $this->selectedValues[$field->db_column] = [];
+            }
+        });
+    }
+
+    /**
+     * Populate the selectedValues array with the
+     * default values or old input for each field.
+     *
+     * @return void
+     */
+    private function populatedSelectedValuesArray(): void
+    {
+        $this->fields->each(function ($field) {
+            $this->selectedValues[$field->db_column] = $this->getSelectedValueForField($field);
+
+            // if the element is a checkbox and the value was just sent to null, make it
+            // an array since Livewire can't bind to non-array values for checkboxes.
+            if ($field->element === 'checkbox' && is_null($this->selectedValues[$field->db_column])) {
+                $this->selectedValues[$field->db_column] = [];
+            }
+        });
+    }
+
+    private function getSelectedValueForField(CustomField $field)
+    {
+        $defaultValue = $field->defaultValue($this->model_id);
+
+        // if old() contains a value for default_values that means
+        // the user has submitted the form and we were redirected
+        // back with the old input.
+        // Let's use what they had previously set.
+        if (old('default_values')) {
+            $defaultValue = old('default_values.' . $field->id);
+        }
+
+        // on first load the default value for checkboxes will be
+        // a comma-separated string but if we're loading the page
+        // with old input then it was already parsed into an array.
+        if ($field->element === 'checkbox' && is_string($defaultValue)) {
+            $defaultValue = explode(', ', $defaultValue);
+        }
+
+        return $defaultValue;
+    }
 }
diff --git a/app/Livewire/Importer.php b/app/Livewire/Importer.php
index e164af36d6..4802eb8125 100644
--- a/app/Livewire/Importer.php
+++ b/app/Livewire/Importer.php
@@ -3,30 +3,25 @@
 namespace App\Livewire;
 
 use App\Models\CustomField;
-use Livewire\Component;
-
 use App\Models\Import;
 use Illuminate\Support\Facades\Storage;
-
-use Illuminate\Foundation\Auth\Access\AuthorizesRequests;
-
+use Livewire\Attributes\Computed;
+use Livewire\Component;
 
 class Importer extends Component
 {
-    use AuthorizesRequests;
-
-    public $files;
-
-    public $progress; //upload progress - '-1' means don't show
+    public $progress = -1; //upload progress - '-1' means don't show
     public $progress_message;
-    public $progress_bar_class;
+    public $progress_bar_class = 'progress-bar-warning';
 
     public $message; //status/error message?
     public $message_type; //success/error?
 
     //originally from ImporterFile
     public $import_errors; //
-    public ?Import $activeFile = null;
+    public $activeFileId;
+    public $headerRow = [];
+    public $typeOfImport;
     public $importTypes;
     public $columnOptions;
     public $statusType;
@@ -35,26 +30,27 @@ class Importer extends Component
     public $send_welcome;
     public $run_backup;
     public $field_map; // we need a separate variable for the field-mapping, because the keys in the normal array are too complicated for Livewire to understand
-    public $file_id; // TODO: I can't figure out *why* we need this, but it really seems like we do. I can't seem to pull the id from the activeFile for some reason?
 
     // Make these variables public - we set the properties in the constructor so we can localize them (versus the old static arrays)
     public $accessories_fields;
     public $assets_fields;
     public $users_fields;
+    public $assetmodels_fields;
+    public $suppliers_fields;
     public $licenses_fields;
     public $locations_fields;
     public $consumables_fields;
     public $components_fields;
+    public $manufacturers_fields;
+    public $categories_fields;
     public $aliases_fields;
 
     protected $rules = [
         'files.*.file_path' => 'required|string',
         'files.*.created_at' => 'required|string',
         'files.*.filesize' => 'required|integer',
-        'activeFile' => 'Import',
-        'activeFile.import_type' => 'string',
-        'activeFile.field_map' => 'array',
-        'activeFile.header_row' => 'array',
+        'headerRow' => 'array',
+        'typeOfImport' => 'string',
         'field_map' => 'array'
     ];
 
@@ -68,21 +64,22 @@ class Importer extends Component
     {
         $tmp = array();
         if ($this->activeFile) {
-            $tmp = array_combine($this->activeFile->header_row, $this->field_map);
+            $tmp = array_combine($this->headerRow, $this->field_map);
             $tmp = array_filter($tmp);
         }
         return json_encode($tmp);
 
     }
 
-
-
     private function getColumns($type)
     {
         switch ($type) {
             case 'asset':
                 $results = $this->assets_fields;
                 break;
+            case 'assetModel':
+                $results = $this->assetmodels_fields;
+                break;
             case 'accessory':
                 $results = $this->accessories_fields;
                 break;
@@ -101,10 +98,20 @@ class Importer extends Component
             case 'location':
                 $results = $this->locations_fields;
                 break;
+            case 'supplier':
+                $results = $this->suppliers_fields;
+                break;
+            case 'manufacturer':
+                $results = $this->manufacturers_fields;
+                break;
+            case 'category':
+                $results = $this->categories_fields;
+                break;
             default:
                 $results = [];
         }
         asort($results, SORT_FLAG_CASE | SORT_STRING);
+
         if ($type == "asset") {
             // add Custom Fields after a horizontal line
             $results['-'] = "———" . trans('admin/custom_fields/general.custom_fields') . "———’";
@@ -115,114 +122,109 @@ class Importer extends Component
         return $results;
     }
 
-    public function updating($name, $new_import_type)
+    public function updatingTypeOfImport($type)
     {
-        if ($name == "activeFile.import_type") {
 
-            // go through each header, find a matching field to try and map it to.
-            foreach ($this->activeFile->header_row as $i => $header) {
-                // do we have something mapped already?
-                if (array_key_exists($i, $this->field_map)) {
-                    // yes, we do. Is it valid for this type of import?
-                    // (e.g. the import type might have been changed...?)
-                    if (array_key_exists($this->field_map[$i], $this->columnOptions[$new_import_type])) {
-                        //yes, this key *is* valid. Continue on to the next field.
-                        continue;
-                    } else {
-                        //no, this key is *INVALID* for this import type. Better set it to null
-                        // and we'll hope that the $aliases_fields or something else picks it up.
-                        $this->field_map[$i] = null; // fingers crossed! But it's not likely, tbh.
-                    } // TODO - strictly speaking, this isn't necessary here I don't think.
+        // go through each header, find a matching field to try and map it to.
+        foreach ($this->headerRow as $i => $header) {
+            // do we have something mapped already?
+            if (array_key_exists($i, $this->field_map)) {
+                // yes, we do. Is it valid for this type of import?
+                // (e.g. the import type might have been changed...?)
+                if (array_key_exists($this->field_map[$i], $this->columnOptions[$type])) {
+                    //yes, this key *is* valid. Continue on to the next field.
+                    continue;
+                } else {
+                    //no, this key is *INVALID* for this import type. Better set it to null,
+                    // and we'll hope that the $aliases_fields or something else picks it up.
+                    $this->field_map[$i] = null; // fingers crossed! But it's not likely, tbh.
+                } // TODO - strictly speaking, this isn't necessary here I don't think.
+            }
+            // first, check for exact matches
+            foreach ($this->columnOptions[$type] as $v => $text) {
+                if (strcasecmp($text, $header) === 0) { // case-INSENSITIVe on purpose!
+                    $this->field_map[$i] = $v;
+                    continue 2; //don't bother with the alias check, go to the next header
                 }
-                // first, check for exact matches
-                foreach ($this->columnOptions[$new_import_type] as $value => $text) {
-                    if (strcasecmp($text, $header) === 0) { // case-INSENSITIVe on purpose!
-                        $this->field_map[$i] = $value;
-                        continue 2; //don't bother with the alias check, go to the next header
-                    }
-                }
-                // if you got here, we didn't find a match. Try the $aliases_fields
-                foreach ($this->aliases_fields as $key => $alias_values) {
-                    foreach ($alias_values as $alias_value) {
-                        if (strcasecmp($alias_value, $header) === 0) { // aLsO CaSe-INSENSitiVE!
-                            // Make *absolutely* sure that this key actually _exists_ in this import type -
-                            // you can trigger this by importing accessories with a 'Warranty' column (which don't exist
-                            // in "Accessories"!)
-                            if (array_key_exists($key, $this->columnOptions[$new_import_type])) {
-                                $this->field_map[$i] = $key;
-                                continue 3; // bust out of both of these loops; as well as the surrounding one - e.g. move on to the next header
-                            }
+            }
+            // if you got here, we didn't find a match. Try the $aliases_fields
+            foreach ($this->aliases_fields as $key => $alias_values) {
+                foreach ($alias_values as $alias_value) {
+                    if (strcasecmp($alias_value, $header) === 0) { // aLsO CaSe-INSENSitiVE!
+                        // Make *absolutely* sure that this key actually _exists_ in this import type -
+                        // you can trigger this by importing accessories with a 'Warranty' column (which don't exist
+                        // in "Accessories"!)
+                        if (array_key_exists($key, $this->columnOptions[$type])) {
+                            $this->field_map[$i] = $key;
+                            continue 3; // bust out of both of these loops and the surrounding one - e.g. move on to the next header
                         }
                     }
                 }
-                // and if you got here, we got nothing. Let's recommend 'null'
-                $this->field_map[$i] = null; // Booooo :(
             }
+            // and if you got here, we got nothing. Let's recommend 'null'
+            $this->field_map[$i] = null; // Booooo :(
         }
     }
 
-    public function boot() { // FIXME - delete or undelete.
-        ///////$this->activeFile = null; // I do *not* understand why I have to do this, but, well, whatever.
-    }
-
-
     public function mount()
     {
         $this->authorize('import');
-        $this->progress = -1; // '-1' means 'don't show the progressbar'
-        $this->progress_bar_class = 'progress-bar-warning';
         $this->importTypes = [
-            'asset' =>      trans('general.assets'),
-            'accessory' =>  trans('general.accessories'),
-            'consumable' => trans('general.consumables'),
-            'component' =>  trans('general.components'),
-            'license' =>    trans('general.licenses'),
-            'user' =>       trans('general.users'),
-            'location' =>    trans('general.locations'),
+            'accessory'     =>  trans('general.accessories'),
+            'asset'         =>      trans('general.assets'),
+            'assetModel'    =>      trans('general.asset_models'),
+            'component'     =>  trans('general.components'),
+            'consumable'    => trans('general.consumables'),
+            'license'       =>    trans('general.licenses'),
+            'location'      =>   trans('general.locations'),
+            'user'          =>       trans('general.users'),
+            'supplier'      =>       trans('general.suppliers'),
+            'manufacturer'  =>       trans('general.manufacturers'),
+            'category'      =>       trans('general.categories'),
         ];
 
         /**
          * These are the item-type specific columns
          */
-        $this->accessories_fields  = [
+        $this->accessories_fields = [
+            'category' => trans('general.category'),
             'company' => trans('general.company'),
-            'location' => trans('general.location'),
-            'quantity' => trans('general.qty'),
             'item_name' => trans('general.item_name_var', ['item' => trans('general.accessory')]),
+            'location' => trans('general.location'),
+            'manufacturer' => trans('general.manufacturer'),
+            'min_amt' => trans('mail.min_QTY'),
             'model_number' => trans('general.model_no'),
             'notes' => trans('general.notes'),
-            'category' => trans('general.category'),
-            'supplier' => trans('general.supplier'),
-            'min_amt' => trans('mail.min_QTY'),
+            'order_number' => trans('general.order_number'),
             'purchase_cost' => trans('general.purchase_cost'),
             'purchase_date' => trans('general.purchase_date'),
-            'manufacturer' => trans('general.manufacturer'),
-            'order_number' => trans('general.order_number'),
+            'quantity' => trans('general.qty'),
+            'supplier' => trans('general.supplier'),
         ];
 
         $this->assets_fields = [
-            'company' => trans('general.company'),
-            'location' => trans('general.location'),
-            'item_name' => trans('general.item_name_var', ['item' => trans('general.asset')]),
-            'asset_tag' => trans('general.asset_tag'),
+            'id' => trans('general.id'),
+            'asset_eol_date' => trans('admin/hardware/form.eol_date'),
             'asset_model' => trans('general.model_name'),
+            'asset_notes' => trans('general.item_notes', ['item' => trans('admin/hardware/general.asset')]),
+            'asset_tag' => trans('general.asset_tag'),
             'byod' => trans('general.byod'),
-            'model_number' => trans('general.model_no'),
-            'status' => trans('general.status'),
-            'warranty_months' => trans('admin/hardware/form.warranty'),
             'category' => trans('general.category'),
-            'requestable' => trans('admin/hardware/general.requestable'),
-            'serial' => trans('general.serial_number'),
-            'supplier' => trans('general.supplier'),
+            'company' => trans('general.company'),
+            'image' => trans('general.importer.image_filename'),
+            'item_name' => trans('general.item_name_var', ['item' => trans('general.asset')]),
+            'location' => trans('general.location'),
+            'manufacturer' => trans('general.manufacturer'),
+            'model_notes' => trans('general.item_notes', ['item' => trans('admin/hardware/form.model')]),
+            'model_number' => trans('general.model_no'),
+            'order_number' => trans('general.order_number'),
             'purchase_cost' => trans('general.purchase_cost'),
             'purchase_date' => trans('general.purchase_date'),
-            'purchase_order' => trans('admin/licenses/form.purchase_order'),
-            'asset_notes' => trans('general.item_notes', ['item' => trans('admin/hardware/general.asset')]),
-            'model_notes' => trans('general.item_notes', ['item' => trans('admin/hardware/form.model')]),
-            'manufacturer' => trans('general.manufacturer'),
-            'order_number' => trans('general.order_number'),
-            'image' => trans('general.importer.image_filename'),
-            'asset_eol_date' => trans('admin/hardware/form.eol_date'),
+            'requestable' => trans('admin/hardware/general.requestable'),
+            'serial' => trans('general.serial_number'),
+            'status' => trans('general.status'),
+            'supplier' => trans('general.supplier'),
+            'warranty_months' => trans('admin/hardware/form.warranty'),
             /**
              * Checkout fields:
              * Assets can be checked out to other assets, people, or locations, but we currently
@@ -247,109 +249,166 @@ class Importer extends Component
         ];
 
         $this->consumables_fields = [
+            'category' => trans('general.category'),
+            'checkout_class' => trans('general.importer.checkout_type'),
             'company' => trans('general.company'),
-            'location' => trans('general.location'),
-            'quantity' => trans('general.qty'),
             'item_name' => trans('general.item_name_var', ['item' => trans('general.consumable')]),
+            'item_no' => trans('admin/consumables/general.item_no'),
+            'location' => trans('general.location'),
+            'manufacturer' => trans('general.manufacturer'),
+            'min_amt' => trans('general.min_amt'),
             'model_number' => trans('general.model_no'),
             'notes' => trans('general.notes'),
-            'min_amt' => trans('mail.min_QTY'),
-            'category' => trans('general.category'),
+            'order_number' => trans('general.order_number'),
             'purchase_cost' => trans('general.purchase_cost'),
             'purchase_date' => trans('general.purchase_date'),
-            'checkout_class' => trans('general.importer.checkout_type'),
+            'quantity' => trans('general.qty'),
             'supplier' => trans('general.supplier'),
-            'manufacturer' => trans('general.manufacturer'),
-            'order_number' => trans('general.order_number'),
-            'item_no' => trans('admin/consumables/general.item_no'),
         ];
 
         $this->components_fields = [
+            'category' => trans('general.category'),
             'company' => trans('general.company'),
-            'location' => trans('general.location'),
-            'quantity' => trans('general.qty'),
             'item_name' => trans('general.item_name_var', ['item' => trans('general.component')]),
+            'location' => trans('general.location'),
+            'manufacturer' => trans('general.manufacturer'),
+            'min_amt' => trans('mail.min_QTY'),
             'model_number' => trans('general.model_no'),
             'notes' => trans('general.notes'),
-            'category' => trans('general.category'),
-            'supplier' => trans('general.supplier'),
-            'min_amt' => trans('mail.min_QTY'),
+            'order_number' => trans('general.order_number'),
             'purchase_cost' => trans('general.purchase_cost'),
             'purchase_date' => trans('general.purchase_date'),
-            'manufacturer' => trans('general.manufacturer'),
-            'order_number' => trans('general.order_number'),
+            'quantity' => trans('general.qty'),
             'serial' => trans('general.serial_number'),
+            'supplier' => trans('general.supplier'),
         ];
 
         $this->licenses_fields = [
-            'company' => trans('general.company'),
-            'location' => trans('general.location'),
-            'item_name' => trans('general.item_name_var', ['item' => trans('general.license')]),
             'asset_tag' => trans('general.importer.checked_out_to_tag'),
+            'category' => trans('general.category'),
+            'checkout_class' => trans('general.importer.checkout_type'),
+            'company' => trans('general.company'),
+            'email' => trans('general.importer.checked_out_to_email'),
             'expiration_date' => trans('admin/licenses/form.expiration'),
             'full_name' => trans('general.importer.checked_out_to_fullname'),
+            'item_name' => trans('general.item_name_var', ['item' => trans('general.license')]),
             'license_email' => trans('admin/licenses/form.to_email'),
             'license_name' => trans('admin/licenses/form.to_name'),
-            'purchase_order' => trans('admin/licenses/form.purchase_order'),
-            'order_number' => trans('general.order_number'),
-            'reassignable' => trans('admin/licenses/form.reassignable'),
-            'seats' => trans('admin/licenses/form.seats'),
+            'location' => trans('general.location'),
+            'maintained' => trans('admin/licenses/form.maintained'),
+            'manufacturer' => trans('general.manufacturer'),
+            'min_amt' => trans('general.min_amt'),
             'notes' => trans('general.notes'),
-            'category' => trans('general.category'),
-            'supplier' => trans('general.supplier'),
+            'order_number' => trans('general.order_number'),
             'purchase_cost' => trans('general.purchase_cost'),
             'purchase_date' => trans('general.purchase_date'),
-            'maintained' => trans('admin/licenses/form.maintained'),
-            'checkout_class' => trans('general.importer.checkout_type'),
+            'purchase_order' => trans('admin/licenses/form.purchase_order'),
+            'reassignable' => trans('admin/licenses/form.reassignable'),
+            'seats' => trans('admin/licenses/form.seats'),
             'serial' => trans('general.license_serial'),
-            'email' => trans('general.importer.checked_out_to_email'),
+            'supplier' => trans('general.supplier'),
+            'termination_date' => trans('admin/licenses/form.termination_date'),
             'username' => trans('general.importer.checked_out_to_username'),
-            'manufacturer' => trans('general.manufacturer'),
         ];
 
-        $this->users_fields  = [
+        $this->users_fields = [
             'id' => trans('general.id'),
-            'company' => trans('general.company'),
-            'location' => trans('general.location'),
-            'department' => trans('general.department'),
-            'first_name' => trans('general.first_name'),
-            'last_name' => trans('general.last_name'),
-            'notes' => trans('general.notes'),
-            'username' => trans('admin/users/table.username'),
-            'jobtitle' => trans('admin/users/table.title'),
-            'phone_number' => trans('admin/users/table.phone'),
-            'manager_first_name' => trans('general.importer.manager_first_name'),
-            'manager_last_name' => trans('general.importer.manager_last_name'),
             'activated' => trans('general.activated'),
             'address' => trans('general.address'),
-            'city' => trans('general.city'),
-            'state' => trans('general.state'),
-            'country' => trans('general.country'),
-            'zip' => trans('general.zip'),
-            'vip' => trans('general.importer.vip'),
-            'remote' => trans('admin/users/general.remote'),
-            'email' => trans('admin/users/table.email'),
-            'website' => trans('general.website'),
             'avatar' => trans('general.image'),
+            'city' => trans('general.city'),
+            'company' => trans('general.company'),
+            'country' => trans('general.country'),
+            'department' => trans('general.department'),
+            'email' => trans('admin/users/table.email'),
+            'employee_num' => trans('general.employee_number'),
+            'end_date' => trans('general.end_date'),
+            'first_name' => trans('general.first_name'),
             'gravatar' => trans('general.importer.gravatar'),
-            'start_date'    => trans('general.start_date'),
-            'end_date'   => trans('general.end_date'),
-            'employee_num'   => trans('general.employee_number'),
+            'jobtitle' => trans('admin/users/table.title'),
+            'last_name' => trans('general.last_name'),
+            'location' => trans('general.location'),
+            'manager_first_name' => trans('general.importer.manager_first_name'),
+            'manager_last_name' => trans('general.importer.manager_last_name'),
+            'notes' => trans('general.notes'),
+            'phone_number' => trans('admin/users/table.phone'),
+            'remote' => trans('admin/users/general.remote'),
+            'start_date' => trans('general.start_date'),
+            'state' => trans('general.state'),
+            'username' => trans('admin/users/table.username'),
+            'vip' => trans('general.importer.vip'),
+            'website' => trans('general.website'),
+            'zip' => trans('general.zip'),
         ];
 
-        $this->locations_fields  = [
-            'name' => trans('general.item_name_var', ['item' => trans('general.location')]),
+        $this->locations_fields = [
+            'id' => trans('general.id'),
+            'name' => trans('general.name'),
             'address' => trans('general.address'),
             'address2' => trans('general.importer.address2'),
             'city' => trans('general.city'),
-            'state' => trans('general.state'),
             'country' => trans('general.country'),
-            'zip' => trans('general.zip'),
             'currency' => trans('general.importer.currency'),
             'ldap_ou' => trans('admin/locations/table.ldap_ou'),
-            'manager_username' => trans('general.importer.manager_username'),
             'manager' => trans('general.importer.manager_full_name'),
+            'manager_username' => trans('general.importer.manager_username'),
+            'notes' => trans('general.notes'),
             'parent_location' => trans('admin/locations/table.parent'),
+            'state' => trans('general.state'),
+            'zip' => trans('general.zip'),
+        ];
+
+        $this->suppliers_fields = [
+            'id' => trans('general.id'),
+            'name' => trans('general.name'),
+            'address' => trans('general.address'),
+            'address2' => trans('general.importer.address2'),
+            'city' => trans('general.city'),
+            'notes' => trans('general.notes'),
+            'state' => trans('general.state'),
+            'zip' => trans('general.zip'),
+            'phone' => trans('general.phone'),
+            'fax' => trans('general.fax'),
+            'url' => trans('general.url'),
+            'contact' => trans('general.contact'),
+            'email' => trans('general.email'),
+        ];
+
+        $this->manufacturers_fields = [
+            'id' => trans('general.id'),
+            'name' => trans('general.name'),
+            'notes' => trans('general.notes'),
+            'support_phone' =>  trans('admin/manufacturers/table.support_phone'),
+            'support_url' =>  trans('admin/manufacturers/table.support_url'),
+            'support_email' =>  trans('admin/manufacturers/table.support_email'),
+            'warranty_lookup_url' =>  trans('admin/manufacturers/table.warranty_lookup_url'),
+            'url' =>  trans('general.url'),
+        ];
+
+        $this->categories_fields = [
+            'id' => trans('general.id'),
+            'name' => trans('general.name'),
+            'notes' => trans('general.notes'),
+            'category_type' => trans('admin/categories/general.import_category_type'),
+            'eula_text' => trans('admin/categories/general.import_eula_text'),
+            'use_default_eula' => trans('admin/categories/general.use_default_eula_column'),
+            'require_acceptance' => trans('admin/categories/general.import_require_acceptance'),
+            'checkin_email' => trans('admin/categories/general.import_checkin_email'),
+        ];
+
+
+
+        $this->assetmodels_fields  = [
+            'category' => trans('general.category'),
+            'eol' => trans('general.eol'),
+            'fieldset' => trans('admin/models/general.fieldset'),
+            'item_name' => trans('general.item_name_var', ['item' => trans('general.asset_model')]),
+            'manufacturer' => trans('general.manufacturer'),
+            'min_amt' => trans('mail.min_QTY'),
+            'model_number' => trans('general.model_no'),
+            'notes' => trans('general.item_notes', ['item' => trans('admin/hardware/form.model')]),
+            'requestable' => trans('admin/models/general.requestable'),
+
         ];
 
         // "real fieldnames" to a list of aliases for that field
@@ -363,6 +422,8 @@ class Importer extends Component
                     'consumable name',
                     'component name',
                     'name',
+                    'supplier name',
+                    'location name',
                 ],
             'item_no' => [
                 'item number',
@@ -374,6 +435,28 @@ class Importer extends Component
                     'model name',
                     'model',
                 ],
+            'eol_date' =>
+                [
+                    'eol',
+                    'eol date',
+                    'asset eol date',
+                ],
+            'eol' =>
+                [
+                    'eol',
+                    'EOL',
+                    'eol months',
+                ],
+            'depreciation' =>
+                [
+                    'Depreciation',
+                    'depreciation',
+                ],
+            'requestable' =>
+                [
+                    'requestable',
+                    'Requestable',
+                ],
             'gravatar' =>
                 [
                     'gravatar',
@@ -504,35 +587,35 @@ class Importer extends Component
         ];
 
         $this->columnOptions[''] = $this->getColumns(''); //blank mode? I don't know what this is supposed to mean
-        foreach($this->importTypes AS $type => $name) {
+        foreach ($this->importTypes as $type => $name) {
             $this->columnOptions[$type] = $this->getColumns($type);
         }
-        if ($this->activeFile) {
-            $this->field_map = $this->activeFile->field_map ? array_values($this->activeFile->field_map) : [];
-        }
     }
 
     public function selectFile($id)
     {
         $this->clearMessage();
 
-        $this->activeFile = Import::find($id);
+        $this->activeFileId = $id;
 
         if (!$this->activeFile) {
             $this->message = trans('admin/hardware/message.import.file_missing');
             $this->message_type = 'danger';
-
             return;
         }
 
+        $this->headerRow = $this->activeFile->header_row;
+        $this->typeOfImport = $this->activeFile->import_type;
+
         $this->field_map = null;
-        foreach($this->activeFile->header_row as $element) {
-            if(isset($this->activeFile->field_map[$element])) {
+        foreach ($this->headerRow as $element) {
+            if (isset($this->activeFile->field_map[$element])) {
                 $this->field_map[] = $this->activeFile->field_map[$element];
             } else {
                 $this->field_map[] = null; // re-inject the 'nulls' if a file was imported with some 'Do Not Import' settings
             }
         }
+
         $this->file_id = $id;
         $this->import_errors = null;
         $this->statusText = null;
@@ -541,21 +624,33 @@ class Importer extends Component
 
     public function destroy($id)
     {
-        // TODO: why don't we just do File::find($id)? This seems dumb.
-        foreach($this->files as $file) {
-            if ($id == $file->id) {
-                if (Storage::delete('private_uploads/imports/'.$file->file_path)) {
-                    $file->delete();
+        $this->authorize('import');
 
-                    $this->message = trans('admin/hardware/message.import.file_delete_success');
-                    $this->message_type = 'success';
-                    return;
-                } else {
-                    $this->message = trans('admin/hardware/message.import.file_delete_error');
-                    $this->message_type = 'danger';
-                }
-            }
+        $import = Import::find($id);
+
+        // Check that the import wasn't deleted after while page was already loaded...
+        // @todo: next up...handle the file being missing for other interactions...
+        // for example having an import open in two tabs, deleting it, and then changing
+        // the import type in the other tab. The error message below wouldn't display in that case.
+        if (!$import) {
+            $this->message = trans('admin/hardware/message.import.file_already_deleted');
+            $this->message_type = 'danger';
+
+            return;
         }
+
+        if (Storage::delete('private_uploads/imports/' . $import->file_path)) {
+            $import->delete();
+            $this->message = trans('admin/hardware/message.import.file_delete_success');
+            $this->message_type = 'success';
+
+            unset($this->files);
+
+            return;
+        }
+
+        $this->message = trans('admin/hardware/message.import.file_delete_error');
+        $this->message_type = 'danger';
     }
 
     public function clearMessage()
@@ -564,11 +659,22 @@ class Importer extends Component
         $this->message_type = null;
     }
 
+    #[Computed]
+    public function files()
+    {
+        return Import::orderBy('id', 'desc')->get();
+    }
+
+    #[Computed]
+    public function activeFile()
+    {
+        return Import::find($this->activeFileId);
+    }
+
     public function render()
     {
-        $this->files = Import::orderBy('id','desc')->get(); //HACK - slows down renders.
         return view('livewire.importer')
-                ->extends('layouts.default')
-                ->section('content');
+            ->extends('layouts.default')
+            ->section('content');
     }
 }
diff --git a/app/Livewire/LocationScopeCheck.php b/app/Livewire/LocationScopeCheck.php
new file mode 100644
index 0000000000..e176d41f0a
--- /dev/null
+++ b/app/Livewire/LocationScopeCheck.php
@@ -0,0 +1,28 @@
+<?php
+
+namespace App\Livewire;
+
+use App\Helpers\Helper;
+use App\Models\Setting;
+use Livewire\Component;
+
+class LocationScopeCheck extends Component
+{
+    public $mismatched = [];
+    public $setting;
+
+    public function check_locations()
+    {
+        $this->mismatched = Helper::test_locations_fmcs(false);
+    }
+
+    public function mount() {
+        $this->setting = Setting::getSettings();
+        $this->mismatched = Helper::test_locations_fmcs(false);
+    }
+
+    public function render()
+    {
+        return view('livewire.location-scope-check');
+    }
+}
diff --git a/app/Livewire/OauthClients.php b/app/Livewire/OauthClients.php
index 02fc77848b..e114c2278e 100644
--- a/app/Livewire/OauthClients.php
+++ b/app/Livewire/OauthClients.php
@@ -22,8 +22,8 @@ class OauthClients extends Component
     public function render()
     {
         return view('livewire.oauth-clients', [
-            'clients' => app(ClientRepository::class)->activeForUser(auth()->user()->id),
-            'authorized_tokens' => app(TokenRepository::class)->forUser(auth()->user()->id)->where('revoked', false),
+            'clients' => app(ClientRepository::class)->activeForUser(auth()->id()),
+            'authorized_tokens' => app(TokenRepository::class)->forUser(auth()->id())->where('revoked', false),
         ]);
     }
 
@@ -35,7 +35,7 @@ class OauthClients extends Component
         ]);
 
         app(ClientRepository::class)->create(
-            auth()->user()->id,
+            auth()->id(),
             $this->name,
             $this->redirect,
         );
@@ -47,10 +47,10 @@ class OauthClients extends Component
     {
         // test for safety
         // ->delete must be of type Client - thus the model binding
-        if ($clientId->user_id == auth()->user()->id) {
+        if ($clientId->user_id == auth()->id()) {
             app(ClientRepository::class)->delete($clientId);
         } else {
-            Log::warning('User ' . auth()->user()->id . ' attempted to delete client ' . $clientId->id . ' which belongs to user ' . $clientId->user_id);
+            Log::warning('User ' . auth()->id() . ' attempted to delete client ' . $clientId->id . ' which belongs to user ' . $clientId->created_by);
             $this->authorizationError = 'You are not authorized to delete this client.';
         }
     }
@@ -58,10 +58,10 @@ class OauthClients extends Component
     public function deleteToken($tokenId): void
     {
         $token = app(TokenRepository::class)->find($tokenId);
-        if ($token->user_id == auth()->user()->id) {
+        if ($token->created_by == auth()->id()) {
             app(TokenRepository::class)->revokeAccessToken($tokenId);
         } else {
-            Log::warning('User ' . auth()->user()->id . ' attempted to delete token ' . $tokenId . ' which belongs to user ' . $token->user_id);
+            Log::warning('User ' . auth()->id() . ' attempted to delete token ' . $tokenId . ' which belongs to user ' . $token->created_by);
             $this->authorizationError = 'You are not authorized to delete this token.';
         }
     }
@@ -84,12 +84,12 @@ class OauthClients extends Component
         ]);
 
         $client = app(ClientRepository::class)->find($editClientId->id);
-        if ($client->user_id == auth()->user()->id) {
+        if ($client->created_by == auth()->id()) {
             $client->name = $this->editName;
             $client->redirect = $this->editRedirect;
             $client->save();
         } else {
-            Log::warning('User ' . auth()->user()->id . ' attempted to edit client ' . $editClientId->id . ' which belongs to user ' . $client->user_id);
+            Log::warning('User ' . auth()->id() . ' attempted to edit client ' . $editClientId->id . ' which belongs to user ' . $client->created_by);
             $this->authorizationError = 'You are not authorized to edit this client.';
         }
 
diff --git a/app/Livewire/PersonalAccessTokens.php b/app/Livewire/PersonalAccessTokens.php
index 2d2f56662a..79543a609e 100644
--- a/app/Livewire/PersonalAccessTokens.php
+++ b/app/Livewire/PersonalAccessTokens.php
@@ -23,7 +23,7 @@ class PersonalAccessTokens extends Component
     public function render()
     {
         return view('livewire.personal-access-tokens', [
-            'tokens' => Auth::user()->tokens,
+            'tokens' => auth()->user()->tokens,
         ]);
     }
 
@@ -38,7 +38,7 @@ class PersonalAccessTokens extends Component
     {
        $this->validate();
 
-       $newToken = Auth::user()->createToken($this->name);
+       $newToken = auth()->user()->createToken($this->name);
 
        $this->newTokenString = $newToken->accessToken;
 
@@ -49,6 +49,6 @@ class PersonalAccessTokens extends Component
     {
         //this needs safety (though the scope of auth::user might kind of do it...)
         //seems like it does, test more
-        Auth::user()->tokens()->find($tokenId)->delete();
+        auth()->user()->tokens()->find($tokenId)?->delete();
     }
 }
diff --git a/app/Livewire/SlackSettingsForm.php b/app/Livewire/SlackSettingsForm.php
index 45b8b7b41e..535a83413f 100644
--- a/app/Livewire/SlackSettingsForm.php
+++ b/app/Livewire/SlackSettingsForm.php
@@ -4,10 +4,11 @@ namespace App\Livewire;
 
 use GuzzleHttp\Client;
 use Illuminate\Support\Facades\Http;
+use Illuminate\Support\Str;
 use Livewire\Component;
 use App\Models\Setting;
 use App\Helpers\Helper;
-
+use Osama\LaravelTeamsNotification\TeamsNotification;
 class SlackSettingsForm extends Component
 {
     public $webhook_endpoint;
@@ -19,6 +20,7 @@ class SlackSettingsForm extends Component
     public $webhook_placeholder;
     public $webhook_icon;
     public $webhook_selected;
+    public $teams_webhook_deprecated;
     public array $webhook_text;
 
     public Setting $setting;
@@ -62,32 +64,34 @@ class SlackSettingsForm extends Component
                 "name" => trans('admin/settings/general.ms_teams'),
                 "icon" => "fa-brands fa-microsoft",
                 "placeholder" => "https://abcd.webhook.office.com/webhookb2/XXXXXXX",
-                "link" => "https://learn.microsoft.com/en-us/microsoftteams/platform/webhooks-and-connectors/how-to/add-incoming-webhook?tabs=dotnet#create-incoming-webhooks-1",
+                "link" => "https://support.microsoft.com/en-us/office/create-incoming-webhooks-with-workflows-for-microsoft-teams-8ae491c7-0394-4861-ba59-055e33f75498",
                 "test" => "msTeamTestWebhook"
             ),
         ];
 
         $this->setting = Setting::getSettings();
         $this->save_button = trans('general.save');
-        $this->webhook_selected = $this->setting->webhook_selected;
-        $this->webhook_name = $this->webhook_text[$this->setting->webhook_selected]["name"];
-        $this->webhook_icon = $this->webhook_text[$this->setting->webhook_selected]["icon"];
-        $this->webhook_placeholder = $this->webhook_text[$this->setting->webhook_selected]["placeholder"];
-        $this->webhook_link = $this->webhook_text[$this->setting->webhook_selected]["link"];
-        $this->webhook_test = $this->webhook_text[$this->setting->webhook_selected]["test"];
+        $this->webhook_selected = ($this->setting->webhook_selected !== '') ? $this->setting->webhook_selected : 'slack';
+        $this->webhook_name = $this->webhook_text[$this->setting->webhook_selected]["name"] ?? $this->webhook_text['slack']["name"];
+        $this->webhook_icon = $this->webhook_text[$this->setting->webhook_selected]["icon"] ?? $this->webhook_text['slack']["icon"];
+        $this->webhook_placeholder = $this->webhook_text[$this->setting->webhook_selected]["placeholder"] ?? $this->webhook_text['slack']["placeholder"];
+        $this->webhook_link = $this->webhook_text[$this->setting->webhook_selected]["link"] ?? $this->webhook_text['slack']["link"];
+        $this->webhook_test = $this->webhook_text[$this->setting->webhook_selected]["test"] ?? $this->webhook_text['slack']["test"];
         $this->webhook_endpoint = $this->setting->webhook_endpoint;
         $this->webhook_channel = $this->setting->webhook_channel;
         $this->webhook_botname = $this->setting->webhook_botname;
         $this->webhook_options = $this->setting->webhook_selected;
-        if($this->webhook_selected == 'microsoft' || $this->webhook_selected == 'google'){
+        $this->teams_webhook_deprecated = !Str::contains($this->webhook_endpoint, 'workflows');
+        if($this->webhook_selected === 'microsoft' || $this->webhook_selected === 'google'){
             $this->webhook_channel = '#NA';
         }
 
-
         if($this->setting->webhook_endpoint != null && $this->setting->webhook_channel != null){
             $this->isDisabled= '';
         }
-
+        if($this->webhook_selected === 'microsoft' && $this->teams_webhook_deprecated) {
+            session()->flash('warning', trans('admin/settings/message.webhook.ms_teams_deprecation'));
+        }
     }
     public function updated($field) {
 
@@ -109,7 +113,11 @@ class SlackSettingsForm extends Component
         if($this->webhook_selected == 'microsoft' || $this->webhook_selected == 'google'){
             $this->webhook_channel = '#NA';
         }
+    }
 
+    public function updatedwebhookEndpoint()
+    {
+        $this->teams_webhook_deprecated = !Str::contains($this->webhook_endpoint, 'workflows');
     }
 
     private function isButtonDisabled() {
@@ -126,7 +134,9 @@ class SlackSettingsForm extends Component
     public function render()
     {
         $this->isButtonDisabled();
+
         return view('livewire.slack-settings-form');
+
     }
 
     public function testWebhook(){
@@ -149,7 +159,7 @@ class SlackSettingsForm extends Component
             ]);
 
         try {
-            $test = $webhook->post($this->webhook_endpoint, ['body' => $payload]);
+            $test = $webhook->post($this->webhook_endpoint, ['body' => $payload, ['headers' => ['Content-Type' => 'application/json']]]);
 
             if(($test->getStatusCode() == 302)||($test->getStatusCode() == 301)){
                 return session()->flash('error' , trans('admin/settings/message.webhook.error_redirect', ['endpoint' => $this->webhook_endpoint]));
@@ -214,7 +224,7 @@ class SlackSettingsForm extends Component
 
         try {
             $response = Http::withHeaders([
-                'content-type' => 'applications/json',
+                'content-type' => 'application/json',
             ])->post($this->webhook_endpoint,
                 $payload)->throw();
 
@@ -236,20 +246,32 @@ class SlackSettingsForm extends Component
     }
     public function msTeamTestWebhook(){
 
-     $payload =
-        [
-            "@type" => "MessageCard",
-            "@context" => "http://schema.org/extensions",
-            "summary" => trans('mail.snipe_webhook_summary'),
-            "title" => trans('mail.snipe_webhook_test'),
-            "text" => trans('general.webhook_test_msg', ['app' => $this->webhook_name]),
-        ];
+        try {
 
-         try {
-         $response = Http::withHeaders([
-             'content-type' => 'applications/json',
-         ])->post($this->webhook_endpoint,
-            $payload)->throw();
+            if($this->teams_webhook_deprecated){
+                //will use the deprecated webhook format
+                $payload =
+                    [
+                        "@type" => "MessageCard",
+                        "@context" => "http://schema.org/extensions",
+                        "summary" => trans('mail.snipe_webhook_summary'),
+                        "title" => trans('mail.snipe_webhook_test'),
+                        "text" => trans('general.webhook_test_msg', ['app' => $this->webhook_name]),
+                    ];
+                $response = Http::withHeaders([
+                    'content-type' => 'application/json',
+                ])->post($this->webhook_endpoint,
+                    $payload)->throw();
+            }
+             else {
+                 $notification = new TeamsNotification($this->webhook_endpoint);
+                 $message = trans('general.webhook_test_msg', ['app' => $this->webhook_name]);
+                 $notification->success()->sendMessage($message);
+
+                 $response = Http::withHeaders([
+                     'content-type' => 'application/json',
+                 ])->post($this->webhook_endpoint);
+             }
 
          if(($response->getStatusCode() == 302)||($response->getStatusCode() == 301)){
              return session()->flash('error' , trans('admin/settings/message.webhook.error_redirect', ['endpoint' => $this->webhook_endpoint]));
diff --git a/app/Mail/CheckinAccessoryMail.php b/app/Mail/CheckinAccessoryMail.php
new file mode 100644
index 0000000000..311ee87a25
--- /dev/null
+++ b/app/Mail/CheckinAccessoryMail.php
@@ -0,0 +1,70 @@
+<?php
+
+namespace App\Mail;
+
+use App\Models\Accessory;
+use App\Models\Setting;
+use App\Models\User;
+use Illuminate\Bus\Queueable;
+use Illuminate\Contracts\Queue\ShouldQueue;
+use Illuminate\Mail\Mailable;
+use Illuminate\Mail\Mailables\Address;
+use Illuminate\Mail\Mailables\Content;
+use Illuminate\Mail\Mailables\Envelope;
+use Illuminate\Queue\SerializesModels;
+
+class CheckinAccessoryMail extends Mailable
+{
+    use Queueable, SerializesModels;
+
+    /**
+     * Create a new message instance.
+     */
+    public function __construct(Accessory $accessory, $checkedOutTo, User $checkedInby, $note)
+    {
+        $this->item = $accessory;
+        $this->target = $checkedOutTo;
+        $this->admin = $checkedInby;
+        $this->note = $note;
+        $this->settings = Setting::getSettings();
+    }
+
+    /**
+     * Get the message envelope.
+     */
+    public function envelope(): Envelope
+    {
+        $from = new Address(config('mail.from.address'), config('mail.from.name'));
+
+        return new Envelope(
+            from: $from,
+            subject: trans('mail.Accessory_Checkin_Notification'),
+        );
+    }
+
+    /**
+     * Get the message content definition.
+     */
+    public function content(): Content
+    {
+        return new Content(
+            markdown: 'mail.markdown.checkin-accessory',
+            with:   [
+                'item'          => $this->item,
+                'admin'         => $this->admin,
+                'note'          => $this->note,
+                'target'        => $this->target,
+            ]
+        );
+    }
+
+    /**
+     * Get the attachments for the message.
+     *
+     * @return array<int, \Illuminate\Mail\Mailables\Attachment>
+     */
+    public function attachments(): array
+    {
+        return [];
+    }
+}
diff --git a/app/Mail/CheckinAssetMail.php b/app/Mail/CheckinAssetMail.php
new file mode 100644
index 0000000000..355c2f9f13
--- /dev/null
+++ b/app/Mail/CheckinAssetMail.php
@@ -0,0 +1,93 @@
+<?php
+
+namespace App\Mail;
+
+use App\Helpers\Helper;
+use App\Models\Asset;
+use App\Models\Setting;
+use App\Models\User;
+use Illuminate\Bus\Queueable;
+use Illuminate\Contracts\Queue\ShouldQueue;
+use Illuminate\Mail\Mailable;
+use Illuminate\Mail\Mailables\Address;
+use Illuminate\Mail\Mailables\Content;
+use Illuminate\Mail\Mailables\Envelope;
+use Illuminate\Notifications\Messages\MailMessage;
+use Illuminate\Queue\SerializesModels;
+
+class CheckinAssetMail extends Mailable
+{
+    use Queueable, SerializesModels;
+
+    /**
+     * Create a new message instance.
+     */
+    public function __construct(Asset $asset, $checkedOutTo, User $checkedInBy, $note)
+    {
+        $this->target = $checkedOutTo;
+        $this->item = $asset;
+        $this->admin = $checkedInBy;
+        $this->note = $note;
+
+        $this->settings = Setting::getSettings();
+        $this->expected_checkin = '';
+
+        if ($this->item->expected_checkin) {
+            $this->expected_checkin = Helper::getFormattedDateObject($this->item->expected_checkin, 'date',
+                false);
+        }
+    }
+
+    /**
+     * Get the message envelope.
+     */
+    public function envelope(): Envelope
+    {
+        $from = new Address(config('mail.from.address'), config('mail.from.name'));
+
+        return new Envelope(
+            from: $from,
+            subject: trans('mail.Asset_Checkin_Notification'),
+        );
+    }
+
+    /**
+     * Get the mail representation of the notification.
+     *
+     * @param  mixed  $notifiable
+     * @return Content
+     */
+    public function content(): Content
+    {
+        $this->item->load('assetstatus');
+        $fields = [];
+
+        // Check if the item has custom fields associated with it
+        if (($this->item->model) && ($this->item->model->fieldset)) {
+            $fields = $this->item->model->fieldset->fields;
+        }
+
+        return new Content(
+            markdown: 'mail.markdown.checkin-asset',
+            with:  [
+                'item'          => $this->item,
+                'status'        => $this->item->assetstatus?->name,
+                'admin'         => $this->admin,
+                'note'          => $this->note,
+                'target'        => $this->target,
+                'fields'        => $fields,
+                'expected_checkin'  => $this->expected_checkin,
+            ],
+        );
+    }
+
+    /**
+     * Get the attachments for the message.
+     *
+     * @return array<int, \Illuminate\Mail\Mailables\Attachment>
+     */
+    public function attachments(): array
+    {
+        return [];
+    }
+}
diff --git a/app/Mail/CheckinLicenseMail.php b/app/Mail/CheckinLicenseMail.php
new file mode 100644
index 0000000000..6895fb9695
--- /dev/null
+++ b/app/Mail/CheckinLicenseMail.php
@@ -0,0 +1,71 @@
+<?php
+
+namespace App\Mail;
+
+use App\Models\LicenseSeat;
+use App\Models\Setting;
+use App\Models\User;
+use Illuminate\Bus\Queueable;
+use Illuminate\Contracts\Queue\ShouldQueue;
+use Illuminate\Mail\Mailable;
+use Illuminate\Mail\Mailables\Address;
+use Illuminate\Mail\Mailables\Content;
+use Illuminate\Mail\Mailables\Envelope;
+use Illuminate\Queue\SerializesModels;
+
+class CheckinLicenseMail extends Mailable
+{
+    use Queueable, SerializesModels;
+
+    /**
+     * Create a new message instance.
+     */
+    public function __construct(LicenseSeat $licenseSeat, $checkedOutTo, User $checkedInBy, $note)
+    {
+        $this->target = $checkedOutTo;
+        $this->item = $licenseSeat;
+        $this->admin = $checkedInBy;
+        $this->note = $note;
+        $this->settings = Setting::getSettings();
+    }
+
+    /**
+     * Get the message envelope.
+     */
+    public function envelope(): Envelope
+    {
+        $from = new Address(config('mail.from.address'), config('mail.from.name'));
+
+        return new Envelope(
+            from: $from,
+            subject: trans('mail.License_Checkin_Notification'),
+        );
+    }
+
+    /**
+     * Get the message content definition.
+     */
+    public function content(): Content
+    {
+        return new Content(
+            markdown: 'mail.markdown.checkin-license',
+            with:   [
+                'license_seat'  => $this->item,
+                'license'       => $this->item->license,
+                'admin'         => $this->admin,
+                'note'          => $this->note,
+                'target'        => $this->target,
+            ]
+        );
+    }
+
+    /**
+     * Get the attachments for the message.
+     *
+     * @return array<int, \Illuminate\Mail\Mailables\Attachment>
+     */
+    public function attachments(): array
+    {
+        return [];
+    }
+}
diff --git a/app/Mail/CheckoutAccessoryMail.php b/app/Mail/CheckoutAccessoryMail.php
new file mode 100644
index 0000000000..64c02e31ed
--- /dev/null
+++ b/app/Mail/CheckoutAccessoryMail.php
@@ -0,0 +1,82 @@
+<?php
+
+namespace App\Mail;
+
+use App\Models\Accessory;
+use App\Models\Setting;
+use App\Models\User;
+use Illuminate\Bus\Queueable;
+use Illuminate\Contracts\Queue\ShouldQueue;
+use Illuminate\Mail\Mailable;
+use Illuminate\Mail\Mailables\Address;
+use Illuminate\Mail\Mailables\Content;
+use Illuminate\Mail\Mailables\Envelope;
+use Illuminate\Queue\SerializesModels;
+use Illuminate\Support\Facades\Log;
+
+class CheckoutAccessoryMail extends Mailable
+{
+    use Queueable, SerializesModels;
+
+    /**
+     * Create a new message instance.
+     */
+    public function __construct(Accessory $accessory, $checkedOutTo, User $checkedOutBy, $acceptance, $note)
+    {
+        $this->item = $accessory;
+        $this->admin = $checkedOutBy;
+        $this->note = $note;
+        $this->checkout_qty = $accessory->checkout_qty;
+        $this->target = $checkedOutTo;
+        $this->acceptance = $acceptance;
+        $this->settings = Setting::getSettings();
+    }
+
+    /**
+     * Get the message envelope.
+     */
+    public function envelope(): Envelope
+    {
+        $from = new Address(config('mail.from.address'), config('mail.from.name'));
+
+        return new Envelope(
+            from: $from,
+            subject: (trans('mail.Accessory_Checkout_Notification')),
+        );
+    }
+
+    /**
+     * Get the message content definition.
+     */
+    public function content(): Content
+    {
+        Log::debug($this->item->getImageUrl());
+        $eula = $this->item->getEula();
+        $req_accept = $this->item->requireAcceptance();
+        $accept_url = is_null($this->acceptance) ? null : route('account.accept.item', $this->acceptance);
+
+        return new Content(
+            markdown: 'mail.markdown.checkout-accessory',
+            with:   [
+                'item'          => $this->item,
+                'admin'         => $this->admin,
+                'note'          => $this->note,
+                'target'        => $this->target,
+                'eula'          => $eula,
+                'req_accept'    => $req_accept,
+                'accept_url'    => $accept_url,
+                'checkout_qty'  => $this->checkout_qty,
+            ],
+        );
+    }
+
+    /**
+     * Get the attachments for the message.
+     *
+     * @return array<int, \Illuminate\Mail\Mailables\Attachment>
+     */
+    public function attachments(): array
+    {
+        return [];
+    }
+}
diff --git a/app/Mail/CheckoutAssetMail.php b/app/Mail/CheckoutAssetMail.php
new file mode 100644
index 0000000000..7ac20861ed
--- /dev/null
+++ b/app/Mail/CheckoutAssetMail.php
@@ -0,0 +1,147 @@
+<?php
+
+namespace App\Mail;
+
+use App\Helpers\Helper;
+use App\Models\Asset;
+use App\Models\Setting;
+use App\Models\User;
+use Illuminate\Bus\Queueable;
+use Illuminate\Contracts\Queue\ShouldQueue;
+use Illuminate\Mail\Mailable;
+use Illuminate\Mail\Mailables\Address;
+use Illuminate\Mail\Mailables\Attachment;
+use Illuminate\Mail\Mailables\Content;
+use Illuminate\Mail\Mailables\Envelope;
+use Illuminate\Notifications\Messages\MailMessage;
+use Illuminate\Queue\SerializesModels;
+
+class CheckoutAssetMail extends Mailable
+{
+    use Queueable, SerializesModels;
+
+    private bool $firstTimeSending;
+
+    /**
+     * Create a new message instance.
+     */
+    public function __construct(Asset $asset, $checkedOutTo, User $checkedOutBy, $acceptance, $note, bool $firstTimeSending = true)
+    {
+        $this->item = $asset;
+        $this->admin = $checkedOutBy;
+        $this->note = $note;
+        $this->target = $checkedOutTo;
+        $this->acceptance = $acceptance;
+
+        $this->settings = Setting::getSettings();
+
+        $this->last_checkout = '';
+        $this->expected_checkin = '';
+
+        $this->firstTimeSending = $firstTimeSending;
+
+        if ($this->item->last_checkout) {
+            $this->last_checkout = Helper::getFormattedDateObject($this->item->last_checkout, 'date',
+                false);
+        }
+
+        if ($this->item->expected_checkin) {
+            $this->expected_checkin = Helper::getFormattedDateObject($this->item->expected_checkin, 'date',
+                false);
+        }
+    }
+
+    /**
+     * Get the message envelope.
+     */
+    public function envelope(): Envelope
+    {
+        $from = new Address(config('mail.from.address'), config('mail.from.name'));
+
+        return new Envelope(
+            from: $from,
+            subject: $this->getSubject(),
+        );
+    }
+
+    /**
+     * Get the mail representation of the notification.
+     *
+     * @param  mixed  $notifiable
+     * @return Content
+     */
+    public function content(): Content
+    {
+        $this->item->load('assetstatus');
+        $eula = method_exists($this->item, 'getEula') ? $this->item->getEula() : '';
+        $req_accept = $this->requiresAcceptance();
+        $fields = [];
+
+        // Check if the item has custom fields associated with it
+        if (($this->item->model) && ($this->item->model->fieldset)) {
+            $fields = $this->item->model->fieldset->fields;
+        }
+
+        $accept_url = is_null($this->acceptance) ? null : route('account.accept.item', $this->acceptance);
+
+        return new Content(
+            markdown: 'mail.markdown.checkout-asset',
+            with:  [
+                'item'          => $this->item,
+                'admin'         => $this->admin,
+                'status'        => $this->item->assetstatus?->name,
+                'note'          => $this->note,
+                'target'        => $this->target,
+                'fields'        => $fields,
+                'eula'          => $eula,
+                'req_accept'    => $req_accept,
+                'accept_url'    => $accept_url,
+                'last_checkout' => $this->last_checkout,
+                'expected_checkin'  => $this->expected_checkin,
+                'introduction_line' => $this->introductionLine(),
+            ],
+        );
+    }
+
+    /**
+     * Get the attachments for the message.
+     *
+     * @return array<int, Attachment>
+     */
+    public function attachments(): array
+    {
+        return [];
+    }
+
+    private function getSubject(): string
+    {
+        if ($this->firstTimeSending) {
+            return trans('mail.Asset_Checkout_Notification');
+        }
+
+        return trans('mail.unaccepted_asset_reminder');
+    }
+
+    private function introductionLine(): string
+    {
+        if ($this->firstTimeSending && $this->requiresAcceptance()) {
+            return trans('mail.new_item_checked_with_acceptance');
+        }
+
+        if ($this->firstTimeSending && !$this->requiresAcceptance()) {
+            return trans('mail.new_item_checked');
+        }
+
+        if (!$this->firstTimeSending && $this->requiresAcceptance()) {
+            return trans('mail.recent_item_checked');
+        }
+
+        // we shouldn't get here but let's send a default message just in case
+        return trans('new_item_checked');
+    }
+
+    private function requiresAcceptance(): int|bool
+    {
+        return method_exists($this->item, 'requireAcceptance') ? $this->item->requireAcceptance() : 0;
+    }
+}
diff --git a/app/Mail/CheckoutConsumableMail.php b/app/Mail/CheckoutConsumableMail.php
new file mode 100644
index 0000000000..6a3d806790
--- /dev/null
+++ b/app/Mail/CheckoutConsumableMail.php
@@ -0,0 +1,84 @@
+<?php
+
+namespace App\Mail;
+
+use App\Models\Consumable;
+use App\Models\Setting;
+use App\Models\User;
+use Illuminate\Bus\Queueable;
+use Illuminate\Contracts\Queue\ShouldQueue;
+use Illuminate\Mail\Mailable;
+use Illuminate\Mail\Mailables\Address;
+use Illuminate\Mail\Mailables\Content;
+use Illuminate\Mail\Mailables\Envelope;
+use Illuminate\Queue\SerializesModels;
+use Illuminate\Support\Facades\Log;
+
+class CheckoutConsumableMail extends Mailable
+{
+    use Queueable, SerializesModels;
+
+    /**
+     * Create a new message instance.
+     */
+    public function __construct(Consumable $consumable, $checkedOutTo, User $checkedOutBy, $acceptance, $note)
+    {
+        $this->item = $consumable;
+        $this->admin = $checkedOutBy;
+        $this->note = $note;
+        $this->target = $checkedOutTo;
+        $this->acceptance = $acceptance;
+        $this->qty = $consumable->checkout_qty;
+
+        $this->settings = Setting::getSettings();
+    }
+
+    /**
+     * Get the message envelope.
+     */
+    public function envelope(): Envelope
+    {
+        $from = new Address(config('mail.from.address'), config('mail.from.name'));
+
+        return new Envelope(
+            from: $from,
+            subject: trans('mail.Confirm_consumable_delivery'),
+        );
+    }
+
+    /**
+     * Get the message content definition.
+     */
+    public function content(): Content
+    {
+
+        $eula = $this->item->getEula();
+        $req_accept = $this->item->requireAcceptance();
+
+        $accept_url = is_null($this->acceptance) ? null : route('account.accept.item', $this->acceptance);
+
+        return new Content(
+            markdown: 'mail.markdown.checkout-consumable',
+            with:   [
+                'item'          => $this->item,
+                'admin'         => $this->admin,
+                'note'          => $this->note,
+                'target'        => $this->target,
+                'eula'          => $eula,
+                'req_accept'    => $req_accept,
+                'accept_url'    => $accept_url,
+                'qty'           => $this->qty,
+            ]
+        );
+    }
+
+    /**
+     * Get the attachments for the message.
+     *
+     * @return array<int, \Illuminate\Mail\Mailables\Attachment>
+     */
+    public function attachments(): array
+    {
+        return [];
+    }
+}
diff --git a/app/Mail/CheckoutLicenseMail.php b/app/Mail/CheckoutLicenseMail.php
new file mode 100644
index 0000000000..9462c6c332
--- /dev/null
+++ b/app/Mail/CheckoutLicenseMail.php
@@ -0,0 +1,79 @@
+<?php
+
+namespace App\Mail;
+
+use App\Models\LicenseSeat;
+use App\Models\Setting;
+use App\Models\User;
+use Illuminate\Bus\Queueable;
+use Illuminate\Contracts\Queue\ShouldQueue;
+use Illuminate\Mail\Mailable;
+use Illuminate\Mail\Mailables\Address;
+use Illuminate\Mail\Mailables\Content;
+use Illuminate\Mail\Mailables\Envelope;
+use Illuminate\Queue\SerializesModels;
+
+class CheckoutLicenseMail extends Mailable
+{
+    use Queueable, SerializesModels;
+
+    /**
+     * Create a new message instance.
+     */
+    public function __construct(LicenseSeat $licenseSeat, $checkedOutTo, User $checkedOutBy, $acceptance, $note)
+    {
+        $this->item = $licenseSeat;
+        $this->admin = $checkedOutBy;
+        $this->note = $note;
+        $this->target = $checkedOutTo;
+        $this->acceptance = $acceptance;
+        $this->settings = Setting::getSettings();
+    }
+
+    /**
+     * Get the message envelope.
+     */
+    public function envelope(): Envelope
+    {
+        $from = new Address(config('mail.from.address'), config('mail.from.name'));
+
+        return new Envelope(
+            from: $from,
+            subject: trans('mail.Confirm_license_delivery'),
+        );
+    }
+
+    /**
+     * Get the message content definition.
+     */
+    public function content(): Content
+    {
+        $eula = method_exists($this->item, 'getEula') ? $this->item->getEula() : '';
+        $req_accept = method_exists($this->item, 'requireAcceptance') ? $this->item->requireAcceptance() : 0;
+
+        $accept_url = is_null($this->acceptance) ? null : route('account.accept.item', $this->acceptance);
+        return new Content(
+            markdown: 'mail.markdown.checkout-license',
+            with:   [
+                'license_seat'  => $this->item,
+                'license'       => $this->item->license,
+                'admin'         => $this->admin,
+                'note'          => $this->note,
+                'target'        => $this->target,
+                'eula'          => $eula,
+                'req_accept'    => $req_accept,
+                'accept_url'    => $accept_url,
+            ]
+        );
+    }
+
+    /**
+     * Get the attachments for the message.
+     *
+     * @return array<int, \Illuminate\Mail\Mailables\Attachment>
+     */
+    public function attachments(): array
+    {
+        return [];
+    }
+}
diff --git a/app/Mail/ExpiringAssetsMail.php b/app/Mail/ExpiringAssetsMail.php
new file mode 100644
index 0000000000..13d322f060
--- /dev/null
+++ b/app/Mail/ExpiringAssetsMail.php
@@ -0,0 +1,62 @@
+<?php
+
+namespace App\Mail;
+
+use Illuminate\Bus\Queueable;
+use Illuminate\Contracts\Queue\ShouldQueue;
+use Illuminate\Mail\Mailable;
+use Illuminate\Mail\Mailables\Address;
+use Illuminate\Mail\Mailables\Content;
+use Illuminate\Mail\Mailables\Envelope;
+use Illuminate\Queue\SerializesModels;
+
+class ExpiringAssetsMail extends Mailable
+{
+    use Queueable, SerializesModels;
+
+    /**
+     * Create a new message instance.
+     */
+    public function __construct($params, $threshold)
+    {
+        $this->assets = $params;
+        $this->threshold = $threshold;
+    }
+
+    /**
+     * Get the message envelope.
+     */
+    public function envelope(): Envelope
+    {
+        $from = new Address(config('mail.from.address'), config('mail.from.name'));
+
+        return new Envelope(
+            from: $from,
+            subject: trans('mail.Expiring_Assets_Report'),
+        );
+    }
+
+    /**
+     * Get the message content definition.
+     */
+    public function content(): Content
+    {
+        return new Content(
+            markdown: 'notifications.markdown.report-expiring-assets',
+            with: [
+                'assets'  => $this->assets,
+                'threshold'  => $this->threshold,
+            ]
+        );
+    }
+
+    /**
+     * Get the attachments for the message.
+     *
+     * @return array<int, \Illuminate\Mail\Mailables\Attachment>
+     */
+    public function attachments(): array
+    {
+        return [];
+    }
+}
diff --git a/app/Mail/ExpiringLicenseMail.php b/app/Mail/ExpiringLicenseMail.php
new file mode 100644
index 0000000000..77d94df637
--- /dev/null
+++ b/app/Mail/ExpiringLicenseMail.php
@@ -0,0 +1,62 @@
+<?php
+
+namespace App\Mail;
+
+use Illuminate\Bus\Queueable;
+use Illuminate\Contracts\Queue\ShouldQueue;
+use Illuminate\Mail\Mailable;
+use Illuminate\Mail\Mailables\Address;
+use Illuminate\Mail\Mailables\Content;
+use Illuminate\Mail\Mailables\Envelope;
+use Illuminate\Queue\SerializesModels;
+
+class ExpiringLicenseMail extends Mailable
+{
+    use Queueable, SerializesModels;
+
+    /**
+     * Create a new message instance.
+     */
+    public function __construct($params, $threshold)
+    {
+        $this->licenses = $params;
+        $this->threshold = $threshold;
+    }
+
+    /**
+     * Get the message envelope.
+     */
+    public function envelope(): Envelope
+    {
+        $from = new Address(config('mail.from.address'), config('mail.from.name'));
+
+        return new Envelope(
+            from: $from,
+            subject: trans('mail.Expiring_Licenses_Report'),
+        );
+    }
+
+    /**
+     * Get the message content definition.
+     */
+    public function content(): Content
+    {
+        return new Content(
+            markdown: 'notifications.markdown.report-expiring-licenses',
+            with: [
+                'licenses'  => $this->licenses,
+                'threshold'  => $this->threshold,
+            ]
+        );
+    }
+
+    /**
+     * Get the attachments for the message.
+     *
+     * @return array<int, \Illuminate\Mail\Mailables\Attachment>
+     */
+    public function attachments(): array
+    {
+        return [];
+    }
+}
diff --git a/app/Mail/SendUpcomingAuditMail.php b/app/Mail/SendUpcomingAuditMail.php
new file mode 100644
index 0000000000..03faa081eb
--- /dev/null
+++ b/app/Mail/SendUpcomingAuditMail.php
@@ -0,0 +1,65 @@
+<?php
+
+namespace App\Mail;
+
+use Illuminate\Bus\Queueable;
+use Illuminate\Contracts\Queue\ShouldQueue;
+use Illuminate\Mail\Mailable;
+use Illuminate\Mail\Mailables\Address;
+use Illuminate\Mail\Mailables\Content;
+use Illuminate\Mail\Mailables\Envelope;
+use Illuminate\Queue\SerializesModels;
+
+class SendUpcomingAuditMail extends Mailable
+{
+    use Queueable, SerializesModels;
+
+    /**
+     * Create a new message instance.
+     */
+    public function __construct($params, $threshold)
+    {
+        $this->assets = $params;
+        $this->threshold = $threshold;
+    }
+
+    /**
+     * Get the message envelope.
+     */
+    public function envelope(): Envelope
+    {
+        $from = new Address(config('mail.from.address'), config('mail.from.name'));
+
+        return new Envelope(
+            from: $from,
+            subject: trans_choice('mail.upcoming-audits', $this->assets->count(), ['count' => $this->assets->count(), 'threshold' => $this->threshold]),
+        );
+    }
+
+    /**
+     * Get the message content definition.
+     */
+    public function content(): Content
+    {
+
+
+        return new Content(
+
+            markdown: 'notifications.markdown.upcoming-audits',
+            with:  [
+                'assets'  => $this->assets,
+                'threshold'  => $this->threshold,
+            ],
+        );
+    }
+
+    /**
+     * Get the attachments for the message.
+     *
+     * @return array<int, \Illuminate\Mail\Mailables\Attachment>
+     */
+    public function attachments(): array
+    {
+        return [];
+    }
+}
diff --git a/app/Mail/UnacceptedAssetReminderMail.php b/app/Mail/UnacceptedAssetReminderMail.php
new file mode 100644
index 0000000000..0e4473aaad
--- /dev/null
+++ b/app/Mail/UnacceptedAssetReminderMail.php
@@ -0,0 +1,68 @@
+<?php
+
+namespace App\Mail;
+
+use Illuminate\Bus\Queueable;
+use Illuminate\Contracts\Queue\ShouldQueue;
+use Illuminate\Mail\Mailable;
+use Illuminate\Mail\Mailables\Address;
+use Illuminate\Mail\Mailables\Content;
+use Illuminate\Mail\Mailables\Envelope;
+use Illuminate\Queue\SerializesModels;
+
+class UnacceptedAssetReminderMail extends Mailable
+{
+    use Queueable, SerializesModels;
+
+    /**
+     * Create a new message instance.
+     */
+    public function __construct($checkout_info, $count)
+    {
+
+        $this->count = $count;
+        $this->target = $checkout_info?->assignedTo;
+        $this->acceptance = $checkout_info;
+    }
+
+    /**
+     * Get the message envelope.
+     */
+    public function envelope(): Envelope
+    {
+        $from = new Address(config('mail.from.address'), config('mail.from.name'));
+
+        return new Envelope(
+            from: $from,
+            subject: trans('mail.unaccepted_asset_reminder'),
+        );
+    }
+
+    /**
+     * Get the message content definition.
+     */
+    public function content(): Content
+    {
+        $accept_url = route('account.accept');
+
+        return new Content(
+            markdown: 'notifications.markdown.asset-reminder',
+            with: [
+                'count'        => $this->count,
+                'assigned_to'  => $this->target?->present()->fullName,
+                'link'         => route('account.accept'),
+                'accept_url'   => $accept_url,
+            ]
+        );
+    }
+
+    /**
+     * Get the attachments for the message.
+     *
+     * @return array<int, \Illuminate\Mail\Mailables\Attachment>
+     */
+    public function attachments(): array
+    {
+        return [];
+    }
+}
diff --git a/app/Models/Accessory.php b/app/Models/Accessory.php
index a234b1e570..2f13a130d3 100755
--- a/app/Models/Accessory.php
+++ b/app/Models/Accessory.php
@@ -61,9 +61,10 @@ class Accessory extends SnipeModel
         'qty'               => 'required|integer|min:1',
         'category_id'       => 'required|integer|exists:categories,id',
         'company_id'        => 'integer|nullable',
+        'location_id'       => 'exists:locations,id|nullable|fmcs_location',
         'min_amt'           => 'integer|min:0|nullable',
-        'purchase_cost'     => 'numeric|nullable|gte:0',
-        'purchase_date'   => 'date_format:Y-m-d|nullable',
+        'purchase_cost'     => 'numeric|nullable|gte:0|max:9999999999999',
+        'purchase_date'     => 'date_format:Y-m-d|nullable',
     ];
 
 
@@ -253,9 +254,22 @@ class Accessory extends SnipeModel
      * @since [v3.0]
      * @return \Illuminate\Database\Eloquent\Relations\Relation
      */
-    public function users()
+    public function checkouts()
     {
-        return $this->belongsToMany(\App\Models\User::class, 'accessories_users', 'accessory_id', 'assigned_to')->withPivot('id', 'created_at', 'note')->withTrashed();
+        return $this->hasMany(\App\Models\AccessoryCheckout::class, 'accessory_id')
+            ->with('assignedTo');
+    }
+
+    /**
+     * Establishes the accessory -> admin user relationship
+     *
+     * @author A. Gianotto <snipe@snipe.net>
+     * @since [v7.0.13]
+     * @return \Illuminate\Database\Eloquent\Relations\Relation
+     */
+    public function adminuser()
+    {
+        return $this->belongsTo(\App\Models\User::class, 'created_by');
     }
 
     /**
@@ -267,7 +281,9 @@ class Accessory extends SnipeModel
      */
     public function hasUsers()
     {
-        return $this->belongsToMany(\App\Models\User::class, 'accessories_users', 'accessory_id', 'assigned_to')->count();
+        return $this->hasMany(\App\Models\AccessoryCheckout::class, 'accessory_id')
+            ->where('assigned_type', User::class)
+            ->count();
     }
 
     /**
@@ -292,7 +308,7 @@ class Accessory extends SnipeModel
      */
     public function checkin_email()
     {
-        return $this->category->checkin_email;
+        return $this->category?->checkin_email;
     }
 
     /**
@@ -329,11 +345,24 @@ class Accessory extends SnipeModel
     }
 
 
+    /**
+     * Check how many items within an accessory are checked out
+     *
+     * @author [A. Gianotto] [<snipe@snipe.net>]
+     * @since [v5.0]
+     * @return int
+     */
+    public function numCheckedOut()
+    {
+        return $this->checkouts_count ?? $this->checkouts()->count();
+    }
+
+
     /**
      * Check how many items of an accessory remain.
      *
-     * In order to use this model method, you MUST call withCount('users as users_count')
-     * on the eloquent query in the controller, otherwise $this->>users_count will be null and
+     * In order to use this model method, you MUST call withCount('checkouts as checkouts_count')
+     * on the eloquent query in the controller, otherwise $this->checkouts_count will be null and
      * bad things happen.
      *
      * @author [A. Gianotto] [<snipe@snipe.net>]
@@ -342,11 +371,11 @@ class Accessory extends SnipeModel
      */
     public function numRemaining()
     {
-        $checkedout = $this->users_count;
+        $checkedout = $this->numCheckedOut();
         $total = $this->qty;
         $remaining = $total - $checkedout;
 
-        return (int) $remaining;
+        return  $remaining;
     }
 
     /**
@@ -357,12 +386,12 @@ class Accessory extends SnipeModel
      */
     public function declinedCheckout(User $declinedBy, $signature)
     {
-        if (is_null($accessory_user = \DB::table('accessories_users')->where('assigned_to', $declinedBy->id)->where('accessory_id', $this->id)->latest('created_at'))) {
+        if (is_null($accessory_checkout = AccessoryCheckout::userAssigned()->where('assigned_to', $declinedBy->id)->where('accessory_id', $this->id)->latest('created_at'))) {
             // Redirect to the accessory management page with error
             return redirect()->route('accessories.index')->with('error', trans('admin/accessories/message.does_not_exist'));
         }
 
-        $accessory_user->limit(1)->delete();
+        $accessory_checkout->limit(1)->delete();
     }
 
     /**
@@ -394,6 +423,16 @@ class Accessory extends SnipeModel
      * -----------------------------------------------
      **/
 
+
+    /**
+     * Query builder scope to order on created_by name
+     *
+     */
+    public function scopeOrderByCreatedByName($query, $order)
+    {
+        return $query->leftJoin('users as admin_sort', 'accessories.created_by', '=', 'admin_sort.id')->select('accessories.*')->orderBy('admin_sort.first_name', $order)->orderBy('admin_sort.last_name', $order);
+    }
+
     /**
     * Query builder scope to order on company
     *
diff --git a/app/Models/AccessoryCheckout.php b/app/Models/AccessoryCheckout.php
new file mode 100755
index 0000000000..61ffcd08e5
--- /dev/null
+++ b/app/Models/AccessoryCheckout.php
@@ -0,0 +1,179 @@
+<?php
+
+namespace App\Models;
+
+use App\Helpers\Helper;
+use App\Models\Traits\Acceptable;
+use App\Models\Traits\Searchable;
+use App\Presenters\Presentable;
+use Illuminate\Database\Eloquent\Builder;
+use Illuminate\Database\Eloquent\Factories\HasFactory;
+use Illuminate\Database\Eloquent\Model;
+use Illuminate\Database\Eloquent\SoftDeletes;
+use Illuminate\Support\Facades\Storage;
+use Watson\Validating\ValidatingTrait;
+
+/**
+ * Model for Accessories.
+ *
+ * @version    v1.0
+ */
+class AccessoryCheckout extends Model
+{
+    use Searchable;
+
+    protected $fillable = [
+        'accessory_id',
+        'assigned_to',
+        'assigned_type',
+        'note'
+    ];
+
+    protected $presenter = \App\Presenters\AccessoryPresenter::class;
+    protected $table = 'accessories_checkout';
+    
+    /**
+     * Establishes the accessory checkout -> accessory relationship
+     *
+     * @author [A. Kroeger]
+     * @since [v7.0.9]
+     * @return \Illuminate\Database\Eloquent\Relations\Relation
+     */
+    public function accessory()
+    {
+        return $this->hasOne(Accessory::class, 'id', 'accessory_id');
+    }
+
+    public function accessories()
+    {
+        return $this->hasMany(Accessory::class, 'id', 'accessory_id');
+    }
+    /**
+     * Establishes the accessory checkout -> user relationship
+     *
+     * @author [A. Kroeger]
+     * @since [v7.0.9]
+     * @return \Illuminate\Database\Eloquent\Relations\Relation
+     */
+    public function adminuser()
+    {
+        return $this->hasOne(\App\Models\User::class, 'id', 'created_by');
+    }
+
+    /**
+     * Get the target this asset is checked out to
+     *
+     * @author [A. Kroeger]
+     * @since [v7.0]
+     * @return \Illuminate\Database\Eloquent\Relations\Relation
+     */
+    public function assignedTo()
+    {
+        return $this->morphTo('assigned', 'assigned_type', 'assigned_to')->withTrashed();
+    }
+
+    /**
+     * Gets the lowercased name of the type of target the asset is assigned to
+     *
+     * @author [A. Gianotto] [<snipe@snipe.net>]
+     * @since [v4.0]
+     * @return string
+     */
+    public function assignedType()
+    {
+        return $this->assigned_type ? strtolower(class_basename($this->assigned_type)) : null;
+    }
+
+    /**
+     * Determines whether the accessory is checked out to a user
+     *
+     * Even though we allow for checkout to things beyond users
+     * this method is an easy way of seeing if we are checked out to a user.
+     *
+     * @author [A. Kroeger]
+     * @since [v7.0]
+     */
+    public function checkedOutToUser(): bool
+    {
+        return $this->assigned_type == User::class;
+    }
+
+    public function checkedOutToLocation(): bool
+    {
+        return $this->assigned_type == Location::class;
+    }
+
+    public function checkedOutToAsset(): bool
+    {
+        return $this->assigned_type == Asset::class;
+    }
+
+    public function scopeUserAssigned(Builder $query): void
+    {
+        $query->where('assigned_type', '=', User::class);
+    }
+
+    public function scopeLocationAssigned(Builder $query): void
+    {
+        $query->where('assigned_type', '=', Location::class);
+    }
+
+    public function scopeAssetsAssigned(Builder $query): void
+    {
+        $query->where('assigned_type', '=', Asset::class);
+    }
+
+    /**
+     * Run additional, advanced searches.
+     *
+     * @param  \Illuminate\Database\Eloquent\Builder $query
+     * @param  array  $terms The search terms
+     * @return \Illuminate\Database\Eloquent\Builder
+     */
+    public function advancedTextSearch(Builder $query, array $terms)
+    {
+
+        $userQuery = User::where(function ($query) use ($terms) {
+            foreach ($terms as $term) {
+                $search_str = '%' . $term . '%';
+                $query->where('first_name', 'like', $search_str)
+                    ->orWhere('last_name', 'like', $search_str)
+                    ->orWhere('note', 'like', $search_str);
+            }
+        })->select('id');
+
+        $locationQuery = Location::where(function ($query) use ($terms) {
+            foreach ($terms as $term) {
+                $search_str = '%' . $term . '%';
+                $query->where('name', 'like', $search_str);
+            }
+        })->select('id');
+
+        $assetQuery = Asset::where(function ($query) use ($terms) {
+            foreach ($terms as $term) {
+                $search_str = '%' . $term . '%';
+                $query->where('name', 'like', $search_str);
+            }
+        })->select('id');
+
+        $query->where(function ($query) use ($userQuery) {
+            $query->where('assigned_type', User::class)
+            ->whereIn('assigned_to', $userQuery);
+        })->orWhere(function($query) use ($locationQuery) {
+            $query->where('assigned_type', Location::class)
+            ->whereIn('assigned_to', $locationQuery);
+        })->orWhere(function($query) use ($assetQuery) {
+            $query->where('assigned_type', Asset::class)
+            ->whereIn('assigned_to', $assetQuery);
+        })->orWhere(function($query) use ($terms) {
+            foreach ($terms as $term) {
+                $search_str = '%' . $term . '%';
+                $query->where('note', 'like', $search_str);
+            }
+        });
+
+        return $query;
+    }
+
+
+}
diff --git a/app/Models/Actionlog.php b/app/Models/Actionlog.php
index 90e0e884f8..ea80a21bfa 100755
--- a/app/Models/Actionlog.php
+++ b/app/Models/Actionlog.php
@@ -4,10 +4,9 @@ namespace App\Models;
 
 use App\Models\Traits\Searchable;
 use App\Presenters\Presentable;
-use Carbon;
+use Carbon\Carbon;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\SoftDeletes;
-use Illuminate\Support\Facades\Auth;
 
 /**
  * Model for the Actionlog (the table that keeps a historical log of
@@ -17,10 +16,12 @@ use Illuminate\Support\Facades\Auth;
  */
 class Actionlog extends SnipeModel
 {
+    use CompanyableTrait;
     use HasFactory;
 
     // This is to manually set the source (via setActionSource()) for determineActionSource()
     protected ?string $source = null;
+    protected $with = ['adminuser'];
 
     protected $presenter = \App\Presenters\ActionlogPresenter::class;
     use SoftDeletes;
@@ -31,7 +32,7 @@ class Actionlog extends SnipeModel
     protected $fillable = [
         'created_at',
         'item_type',
-        'user_id',
+        'created_by',
         'item_id',
         'action_type',
         'note',
@@ -51,10 +52,14 @@ class Actionlog extends SnipeModel
         'action_type',
         'note',
         'log_meta',
-        'user_id',
+        'created_by',
         'remote_ip',
         'user_agent',
-        'action_source'
+        'item_type',
+        'target_type',
+        'action_source',
+        'created_at',
+        'action_date',
     ];
 
     /**
@@ -63,10 +68,28 @@ class Actionlog extends SnipeModel
      * @var array
      */
     protected $searchableRelations = [
-        'company' => ['name'],
-        'admin' => ['first_name','last_name','username', 'email'],
-        'user'  => ['first_name','last_name','username', 'email'],
-        'assets'  => ['asset_tag','name'],
+        'company'     => ['name'],
+        'adminuser'   => ['first_name','last_name','username', 'email'],
+        'user'        => ['first_name','last_name','username', 'email'],
+        'assets'      => ['asset_tag','name', 'serial', 'order_number', 'notes', 'purchase_date'],
+        'assets.model'              => ['name', 'model_number', 'eol', 'notes'],
+        'assets.model.category'     => ['name', 'notes'],
+        'assets.model.manufacturer' => ['name', 'notes'],
+        'licenses'    => ['name', 'serial', 'notes', 'order_number', 'license_email', 'license_name', 'purchase_order', 'purchase_date'],
+        'licenses.category'     => ['name', 'notes'],
+        'licenses.supplier'     => ['name'],
+        'consumables'    => ['name', 'notes', 'order_number', 'model_number', 'item_no', 'purchase_date'],
+        'consumables.category'     => ['name', 'notes'],
+        'consumables.location'     => ['name', 'notes'],
+        'consumables.supplier'     => ['name', 'notes'],
+        'components'     => ['name', 'notes', 'purchase_date'],
+        'components.category'     => ['name', 'notes'],
+        'components.location'     => ['name', 'notes'],
+        'components.supplier'     => ['name', 'notes'],
+        'accessories'     => ['name', 'purchase_date'],
+        'accessories.category'     => ['name'],
+        'accessories.location'     => ['name', 'notes'],
+        'accessories.supplier'     => ['name', 'notes'],
     ];
 
     /**
@@ -81,16 +104,22 @@ class Actionlog extends SnipeModel
         parent::boot();
         static::creating(function (self $actionlog) {
             // If the admin is a superadmin, let's see if the target instead has a company.
-            if (Auth::user() && Auth::user()->isSuperUser()) {
+            if (auth()->user() && auth()->user()->isSuperUser()) {
                 if ($actionlog->target) {
                     $actionlog->company_id = $actionlog->target->company_id;
                 } elseif ($actionlog->item) {
                     $actionlog->company_id = $actionlog->item->company_id;
                 }
-            } elseif (Auth::user() && Auth::user()->company) {
-                $actionlog->company_id = Auth::user()->company_id;
+            } elseif (auth()->user() && auth()->user()->company) {
+                $actionlog->company_id = auth()->user()->company_id;
             }
+
+            if ($actionlog->action_date == '') {
+                $actionlog->action_date = Carbon::now();
+            }
+
         });
+
     }
 
 
@@ -131,6 +160,54 @@ class Actionlog extends SnipeModel
         return $this->hasMany(\App\Models\Asset::class, 'id', 'item_id');
     }
 
+    /**
+     * Establishes the actionlog -> license relationship
+     *
+     * @author [A. Gianotto] [<snipe@snipe.net>]
+     * @since [v3.0]
+     * @return \Illuminate\Database\Eloquent\Relations\Relation
+     */
+    public function licenses()
+    {
+        return $this->hasMany(\App\Models\License::class, 'id', 'item_id');
+    }
+
+    /**
+     * Establishes the actionlog -> consumable relationship
+     *
+     * @author [A. Gianotto] [<snipe@snipe.net>]
+     * @since [v3.0]
+     * @return \Illuminate\Database\Eloquent\Relations\Relation
+     */
+    public function consumables()
+    {
+        return $this->hasMany(\App\Models\Consumable::class, 'id', 'item_id');
+    }
+
+    /**
+     * Establishes the actionlog -> consumable relationship
+     *
+     * @author [A. Gianotto] [<snipe@snipe.net>]
+     * @since [v3.0]
+     * @return \Illuminate\Database\Eloquent\Relations\Relation
+     */
+    public function accessories()
+    {
+        return $this->hasMany(\App\Models\Accessory::class, 'id', 'item_id');
+    }
+
+    /**
+     * Establishes the actionlog -> components relationship
+     *
+     * @author [A. Gianotto] [<snipe@snipe.net>]
+     * @since [v3.0]
+     * @return \Illuminate\Database\Eloquent\Relations\Relation
+     */
+    public function components()
+    {
+        return $this->hasMany(\App\Models\Component::class, 'id', 'item_id');
+    }
+
     /**
      * Establishes the actionlog -> item type relationship
      *
@@ -197,9 +274,9 @@ class Actionlog extends SnipeModel
      * @since [v3.0]
      * @return \Illuminate\Database\Eloquent\Relations\Relation
      */
-    public function admin()
+    public function adminuser()
     {
-        return $this->belongsTo(User::class, 'user_id')
+        return $this->belongsTo(User::class, 'created_by')
                     ->withTrashed();
     }
 
@@ -290,16 +367,22 @@ class Actionlog extends SnipeModel
     public function daysUntilNextAudit($monthInterval = 12, $asset = null)
     {
         $now = Carbon::now();
-        $last_audit_date = $this->created_at;
-        $next_audit = $last_audit_date->addMonth($monthInterval);
-        $next_audit_days = $now->diffInDays($next_audit);
+        $last_audit_date = $this->created_at; // this is the action log's created at, not the asset itself
+        $next_audit = $last_audit_date->addMonth($monthInterval); // this actually *modifies* the $last_audit_date
+        $next_audit_days = (int) round($now->diffInDays($next_audit, true));
+        $override_default_next = $next_audit;
 
         // Override the default setting for interval if the asset has its own next audit date
         if (($asset) && ($asset->next_audit_date)) {
-            $override_default_next = \Carbon::parse($asset->next_audit_date);
-            $next_audit_days = $override_default_next->diffInDays($now);
+            $override_default_next = Carbon::parse($asset->next_audit_date);
+            $next_audit_days = (int) round($override_default_next->diffInDays($now, true));
         }
 
+        // Show as negative number if the next audit date is before the audit date we're looking at
+        if ($this->created_at > $override_default_next) {
+            $next_audit_days = '-'.$next_audit_days;
+        }
+        
         return $next_audit_days;
     }
 
@@ -372,4 +455,9 @@ class Actionlog extends SnipeModel
     {
         $this->source = $source;
     }
+
+    public function scopeOrderByCreatedBy($query, $order)
+    {
+        return $query->leftJoin('users as admin_sort', 'action_logs.created_by', '=', 'admin_sort.id')->select('action_logs.*')->orderBy('admin_sort.first_name', $order)->orderBy('admin_sort.last_name', $order);
+    }
 }
diff --git a/app/Models/Asset.php b/app/Models/Asset.php
index a3d603551f..28b3a90337 100644
--- a/app/Models/Asset.php
+++ b/app/Models/Asset.php
@@ -2,7 +2,6 @@
 
 namespace App\Models;
 
-use App\Events\AssetCheckedOut;
 use App\Events\CheckoutableCheckedOut;
 use App\Exceptions\CheckoutNotAllowed;
 use App\Helpers\Helper;
@@ -31,6 +30,7 @@ class Asset extends Depreciable
 {
 
     protected $presenter = AssetPresenter::class;
+    protected $with = ['model', 'adminuser'];
 
     use CompanyableTrait;
     use HasFactory, Loggable, Requestable, Presentable, SoftDeletes, ValidatingTrait, UniqueUndeletedTrait;
@@ -43,16 +43,16 @@ class Asset extends Depreciable
 
     /**
      * Run after the checkout acceptance was declined by the user
-     * 
+     *
      * @param  User   $acceptedBy
      * @param  string $signature
-     */ 
+     */
     public function declinedCheckout(User $declinedBy, $signature)
     {
       $this->assigned_to = null;
       $this->assigned_type = null;
-      $this->accepted = null;      
-      $this->save();        
+      $this->accepted = null;
+      $this->save();
     }
 
     /**
@@ -97,35 +97,38 @@ class Asset extends Depreciable
     ];
 
     protected $rules = [
-        'model_id'         => 'required|integer|exists:models,id,deleted_at,NULL|not_array',
-        'status_id'        => 'required|integer|exists:status_labels,id',
-        'asset_tag'        => 'required|min:1|max:255|unique_undeleted:assets,asset_tag|not_array',
-        'name'             => 'nullable|max:255',
-        'company_id'       => 'nullable|integer|exists:companies,id',
-        'warranty_months'  => 'nullable|numeric|digits_between:0,240',
-        'last_checkout'    => 'nullable|date_format:Y-m-d H:i:s',
-        'last_checkin'     => 'nullable|date_format:Y-m-d H:i:s',
-        'expected_checkin' => 'nullable|date',
-        'last_audit_date'  => 'nullable|date_format:Y-m-d H:i:s',
-        // 'next_audit_date'  => 'nullable|date|after:last_audit_date',
-        'next_audit_date'  => 'nullable|date',
-        'location_id'      => 'nullable|exists:locations,id',
-        'rtd_location_id'  => 'nullable|exists:locations,id',
-        'purchase_date'    => 'nullable|date|date_format:Y-m-d',
-        'serial'           => 'nullable|unique_undeleted:assets,serial',
-        'purchase_cost'    => 'nullable|numeric|gte:0',
-        'supplier_id'      => 'nullable|exists:suppliers,id',
-        'asset_eol_date'   => 'nullable|date',
-        'eol_explicit'     => 'nullable|boolean',
-        'byod'             => 'nullable|boolean',
-        'order_number'     => 'nullable|string|max:191',
-        'notes'            => 'nullable|string|max:65535',
-        'assigned_to'      => 'nullable|integer',
-        'requestable'      => 'nullable|boolean',
+        'model_id'          => ['required', 'integer', 'exists:models,id,deleted_at,NULL', 'not_array'],
+        'status_id'         => ['required', 'integer', 'exists:status_labels,id'],
+        'asset_tag'         => ['required', 'min:1', 'max:255', 'unique_undeleted:assets,asset_tag', 'not_array'],
+        'name'              => ['nullable', 'max:255'],
+        'company_id'        => ['nullable', 'integer', 'exists:companies,id'],
+        'warranty_months'   => ['nullable', 'numeric', 'digits_between:0,240'],
+        'last_checkout'     => ['nullable', 'date_format:Y-m-d H:i:s'],
+        'last_checkin'      => ['nullable', 'date_format:Y-m-d H:i:s'],
+        'expected_checkin'  => ['nullable', 'date'],
+        'last_audit_date'   => ['nullable', 'date_format:Y-m-d H:i:s'],
+        'next_audit_date'   => ['nullable', 'date'],
+        'location_id'       => ['nullable', 'exists:locations,id', 'fmcs_location'],
+        'rtd_location_id'   => ['nullable', 'exists:locations,id', 'fmcs_location'],
+        'purchase_date'     => ['nullable', 'date', 'date_format:Y-m-d'],
+        'serial'            => ['nullable', 'unique_undeleted:assets,serial'],
+        'purchase_cost'     => ['nullable', 'numeric', 'gte:0', 'max:9999999999999'],
+        'supplier_id'       => ['nullable', 'exists:suppliers,id'],
+        'asset_eol_date'    => ['nullable', 'date'],
+        'eol_explicit'      => ['nullable', 'boolean'],
+        'byod'              => ['nullable', 'boolean'],
+        'order_number'      => ['nullable', 'string', 'max:191'],
+        'notes'             => ['nullable', 'string', 'max:65535'],
+        'assigned_to'   => ['nullable', 'integer', 'required_with:assigned_type'],
+        'assigned_type' => ['nullable', 'required_with:assigned_to', 'in:'.User::class.",".Location::class.",".Asset::class],
+        'requestable'       => ['nullable', 'boolean'],
+        'assigned_user'     => ['integer', 'nullable', 'exists:users,id,deleted_at,NULL'],
+        'assigned_location' => ['integer', 'nullable', 'exists:locations,id,deleted_at,NULL', 'fmcs_location'],
+        'assigned_asset'    => ['integer', 'nullable', 'exists:assets,id,deleted_at,NULL']
     ];
 
 
-  /**
+    /**
    * The attributes that are mass assignable.
    *
    * @var array
@@ -211,6 +214,31 @@ class Asset extends Depreciable
         $this->attributes['expected_checkin'] = $value;
     }
 
+
+
+    public function customFieldValidationRules()
+    {
+
+        $customFieldValidationRules = [];
+
+            if (($this->model) && ($this->model->fieldset)) {
+
+                foreach ($this->model->fieldset->fields as $field) {
+
+                    if ($field->format == 'BOOLEAN'){
+                        $this->{$field->db_column} = filter_var($this->{$field->db_column}, FILTER_VALIDATE_BOOLEAN);
+                    }
+                }
+
+                $customFieldValidationRules += $this->model->fieldset->validation_rules();
+            }
+
+        return $customFieldValidationRules;
+
+    }
+
+
+
     /**
      * This handles the custom field validation for assets
      *
@@ -218,29 +246,7 @@ class Asset extends Depreciable
      */
     public function save(array $params = [])
     {
-        if ($this->model_id != '') {
-            $model = AssetModel::find($this->model_id);
-
-            if (($model) && ($model->fieldset)) {
-
-                foreach ($model->fieldset->fields as $field){
-                    if($field->format == 'BOOLEAN'){
-                        $this->{$field->db_column} = filter_var($this->{$field->db_column}, FILTER_VALIDATE_BOOLEAN);
-                    }
-                }
-
-                $this->rules += $model->fieldset->validation_rules();
-
-                if ($this->model->fieldset){
-                    foreach ($this->model->fieldset->fields as $field){
-                        if($field->format == 'BOOLEAN'){
-                            $this->{$field->db_column} = filter_var($this->{$field->db_column}, FILTER_VALIDATE_BOOLEAN);
-                        }
-                    }
-                }
-            }
-        }
-
+        $this->rules += $this->customFieldValidationRules();
         return parent::save($params);
     }
 
@@ -252,7 +258,7 @@ class Asset extends Depreciable
 
     /**
      * Returns the warranty expiration date as Carbon object
-     * @return \Carbon|null
+     * @return \Carbon\Carbon|null
      */
     public function getWarrantyExpiresAttribute()
     {
@@ -366,10 +372,10 @@ class Asset extends Depreciable
         if ($this->save()) {
             if (is_int($admin)) {
                 $checkedOutBy = User::findOrFail($admin);
-            } elseif (get_class($admin) === \App\Models\User::class) {
+            } elseif ($admin && get_class($admin) === \App\Models\User::class) {
                 $checkedOutBy = $admin;
             } else {
-                $checkedOutBy = Auth::user();
+                $checkedOutBy = auth()->user();
             }
             event(new CheckoutableCheckedOut($this, $target, $checkedOutBy, $note, $originalValues));
 
@@ -411,6 +417,17 @@ class Asset extends Depreciable
         return $this->rules;
     }
 
+    public function customFieldsForCheckinCheckout($checkin_checkout) {
+        // Check to see if any of the custom fields were included on the form and if they have any values
+        if (($this->model) && ($this->model->fieldset) && ($this->model->fieldset->fields)) {
+            foreach ($this->model->fieldset->fields as $field) {
+                if (($field->{$checkin_checkout} == 1) && (request()->has($field->db_column))){
+                    $this->{$field->db_column} = request()->get($field->db_column);
+                }
+            }
+        }
+    }
+
 
     /**
      * Establishes the asset -> depreciation relationship
@@ -521,6 +538,18 @@ class Asset extends Depreciable
         return $this->morphMany(self::class, 'assigned', 'assigned_type', 'assigned_to')->withTrashed();
     }
 
+    /**
+     * Establishes the accessory -> asset assignment relationship
+     *
+     * @author A. Gianotto <snipe@snipe.net>
+     * @since [v3.0]
+     * @return \Illuminate\Database\Eloquent\Relations\Relation
+     */
+    public function assignedAccessories()
+    {
+        return $this->morphMany(\App\Models\AccessoryCheckout::class, 'assigned', 'assigned_type', 'assigned_to');
+    }
+
 
     /**
      * Get the asset's location based on the assigned user
@@ -627,6 +656,8 @@ class Asset extends Depreciable
             return Storage::disk('public')->url(app('assets_upload_path').e($this->image));
         } elseif ($this->model && ! empty($this->model->image)) {
             return Storage::disk('public')->url(app('models_upload_path').e($this->model->image));
+        } elseif ($this->model?->category && ! empty($this->model->category->image)) {
+            return Storage::disk('public')->url(app('categories_upload_path').e($this->model->category->image));
         }
 
         return false;
@@ -662,6 +693,21 @@ class Asset extends Depreciable
             ->withTrashed();
     }
 
+
+    /**
+     * Get the list of audits for this asset
+     *
+     * @author [A. Gianotto] [<snipe@snipe.net>]
+     * @since [v2.0]
+     * @return \Illuminate\Database\Eloquent\Relations\Relation
+     */
+    public function audits()
+    {
+        return $this->assetlog()->where('action_type', '=', 'audit')
+            ->orderBy('created_at', 'desc')
+            ->withTrashed();
+    }
+
     /**
      * Get the list of checkins for this asset
      *
@@ -707,7 +753,7 @@ class Asset extends Depreciable
     }
 
     /**
-     * Get action logs history for this asset
+     * Get user who created the item
      *
      * @author [A. Gianotto] [<snipe@snipe.net>]
      * @since [v1.0]
@@ -715,7 +761,7 @@ class Asset extends Depreciable
      */
     public function adminuser()
     {
-        return $this->belongsTo(\App\Models\User::class, 'user_id');
+        return $this->belongsTo(\App\Models\User::class, 'created_by');
     }
 
 
@@ -760,7 +806,8 @@ class Asset extends Depreciable
             ->whereNotNull('warranty_months')
             ->whereNotNull('purchase_date')
             ->whereNull('deleted_at')
-            ->whereRaw('DATE_ADD(`purchase_date`,INTERVAL `warranty_months` MONTH) <= DATE(NOW() + INTERVAL '
+            ->NotArchived()
+            ->whereRaw('DATE_ADD(`purchase_date`, INTERVAL `warranty_months` MONTH) <= DATE_ADD(NOW(), INTERVAL '
                                  . $days
                                  . ' DAY) AND DATE_ADD(`purchase_date`, INTERVAL `warranty_months` MONTH) > NOW()')
             ->orderByRaw('DATE_ADD(`purchase_date`,INTERVAL `warranty_months` MONTH)')
@@ -916,6 +963,7 @@ class Asset extends Depreciable
             return $this->model->category->require_acceptance;
         }
 
+        return false;
     }
 
 
@@ -928,9 +976,20 @@ class Asset extends Depreciable
      * */
     public function checkInvalidNextAuditDate()
     {
-        if (($this->last_audit_date) && ($this->next_audit_date) && ($this->last_audit_date > $this->next_audit_date)) {
+
+        // Deliberately parse the dates as Y-m-d (without H:i:s) to compare them
+        if ($this->last_audit_date) {
+            $last = Carbon::parse($this->last_audit_date)->format('Y-m-d');
+        }
+
+        if ($this->next_audit_date) {
+            $next = Carbon::parse($this->next_audit_date)->format('Y-m-d');
+        }
+
+        if ((isset($last) && (isset($next))) && ($last > $next)) {
             return true;
         }
+
         return false;
     }
 
@@ -947,11 +1006,12 @@ class Asset extends Depreciable
     {
 
         if (($this->model) && ($this->model->category)) {
-            if ($this->model->category->eula_text) {
+            if (($this->model->category->eula_text) && ($this->model->category->use_default_eula === 0)) {
                 return Helper::parseEscapedMarkedown($this->model->category->eula_text);
-            } elseif ($this->model->category->use_default_eula == '1') {
+            } elseif ($this->model->category->use_default_eula === 1) {
                 return Helper::parseEscapedMarkedown(Setting::getSettings()->default_eula_text);
             } else {
+
                 return false;
             }
         }
@@ -1244,7 +1304,7 @@ class Asset extends Depreciable
 
     public function scopeDueForAudit($query, $settings)
     {
-        $interval = $settings->audit_warning_days ?? 0;
+        $interval = (int) $settings->audit_warning_days ?? 0;
         $today = Carbon::now();
         $interval_date = $today->copy()->addDays($interval)->format('Y-m-d');
 
@@ -1312,7 +1372,7 @@ class Asset extends Depreciable
 
     public function scopeDueForCheckin($query, $settings)
     {
-        $interval = $settings->audit_warning_days ?? 0;
+        $interval = (int) $settings->due_checkin_days ?? 0;
         $today = Carbon::now();
         $interval_date = $today->copy()->addDays($interval)->format('Y-m-d');
 
@@ -1419,7 +1479,7 @@ class Asset extends Depreciable
    * @return \Illuminate\Database\Query\Builder          Modified query builder
    */
 
-    public function scopeRequestableAssets($query)
+    public function scopeRequestableAssets($query): Builder
     {
         $table = $query->getModel()->getTable();
 
@@ -1558,7 +1618,7 @@ class Asset extends Depreciable
             $leftJoin->on('assets_dept_users.id', '=', 'assets.assigned_to')
                 ->where('assets.assigned_type', '=', User::class);
         })->where(function ($query) use ($search) {
-                    $query->where('assets_dept_users.department_id', '=', $search);
+                    $query->whereIn('assets_dept_users.department_id', $search);
 
         })->withTrashed()->whereNull('assets.deleted_at'); //workaround for laravel bug
     }
@@ -1691,7 +1751,7 @@ class Asset extends Depreciable
                         });
                     });
                 }
-            
+
 
             /**
              * THIS CLUNKY BIT IS VERY IMPORTANT
@@ -1712,7 +1772,7 @@ class Asset extends Depreciable
              * assets.location would fail, as that field doesn't exist -- plus we're already searching
              * against those relationships earlier in this method.
              *
-             * - snipe 
+             * - snipe
              *
              */
 
@@ -1757,6 +1817,20 @@ class Asset extends Depreciable
     }
 
 
+    /**
+     * Query builder scope to order on created_by name
+     *
+     * @param  \Illuminate\Database\Query\Builder  $query  Query builder instance
+     * @param  text                              $order       Order
+     *
+     * @return \Illuminate\Database\Query\Builder          Modified query builder
+     */
+    public function scopeOrderByCreatedByName($query, $order)
+    {
+        return $query->leftJoin('users as admin_sort', 'assets.created_by', '=', 'admin_sort.id')->select('assets.*')->orderBy('admin_sort.first_name', $order)->orderBy('admin_sort.last_name', $order);
+    }
+
+
     /**
     * Query builder scope to order on assigned user
     *
@@ -1808,7 +1882,9 @@ class Asset extends Depreciable
     public function scopeInCategory($query, $category_id)
     {
         return $query->join('models as category_models', 'assets.model_id', '=', 'category_models.id')
-            ->join('categories', 'category_models.category_id', '=', 'categories.id')->where('category_models.category_id', '=', $category_id);
+            ->join('categories', 'category_models.category_id', '=', 'categories.id')
+            ->whereIn('category_models.category_id', (!is_array($category_id) ? explode(',',$category_id): $category_id));
+            //->whereIn('category_models.category_id', $category_id);
     }
 
     /**
@@ -1822,7 +1898,7 @@ class Asset extends Depreciable
     public function scopeByManufacturer($query, $manufacturer_id)
     {
         return $query->join('models', 'assets.model_id', '=', 'models.id')
-            ->join('manufacturers', 'models.manufacturer_id', '=', 'manufacturers.id')->where('models.manufacturer_id', '=', $manufacturer_id);
+            ->join('manufacturers', 'models.manufacturer_id', '=', 'manufacturers.id')->whereIn('models.manufacturer_id', (!is_array($manufacturer_id) ? explode(',',$manufacturer_id): $manufacturer_id));
     }
 
 
diff --git a/app/Models/AssetMaintenance.php b/app/Models/AssetMaintenance.php
index 5f66783cbb..1c07496225 100644
--- a/app/Models/AssetMaintenance.php
+++ b/app/Models/AssetMaintenance.php
@@ -26,12 +26,12 @@ class AssetMaintenance extends Model implements ICompanyableChild
     protected $table = 'asset_maintenances';
     protected $rules = [
         'asset_id'               => 'required|integer',
-        'supplier_id'            => 'required|integer',
+        'supplier_id'            => 'nullable|integer',
         'asset_maintenance_type' => 'required',
         'title'                  => 'required|max:100',
         'is_warranty'            => 'boolean',
         'start_date'             => 'required|date_format:Y-m-d',
-        'completion_date'        => 'date_format:Y-m-d|nullable',
+        'completion_date'        => 'date_format:Y-m-d|nullable|after_or_equal:start_date',
         'notes'                  => 'string|nullable',
         'cost'                   => 'numeric|nullable',
     ];
@@ -166,6 +166,7 @@ class AssetMaintenance extends Model implements ICompanyableChild
         return $this->belongsTo(\App\Models\Asset::class, 'asset_id')
                     ->withTrashed();
     }
+    
 
     /**
      * Get the admin who created the maintenance
@@ -174,9 +175,9 @@ class AssetMaintenance extends Model implements ICompanyableChild
      * @author  A. Gianotto <snipe@snipe.net>
      * @version v3.0
      */
-    public function admin()
+    public function adminuser()
     {
-        return $this->belongsTo(\App\Models\User::class, 'user_id')
+        return $this->belongsTo(\App\Models\User::class, 'created_by')
             ->withTrashed();
     }
 
@@ -207,20 +208,6 @@ class AssetMaintenance extends Model implements ICompanyableChild
     }
 
 
-    /**
-     * Query builder scope to order on admin user
-     *
-     * @param  \Illuminate\Database\Query\Builder  $query  Query builder instance
-     * @param  string                              $order       Order
-     *
-     * @return \Illuminate\Database\Query\Builder          Modified query builder
-     */
-    public function scopeOrderAdmin($query, $order)
-    {
-        return $query->leftJoin('users', 'asset_maintenances.user_id', '=', 'users.id')
-            ->orderBy('users.first_name', $order)
-            ->orderBy('users.last_name', $order);
-    }
 
     /**
      * Query builder scope to order on asset tag
@@ -278,4 +265,12 @@ class AssetMaintenance extends Model implements ICompanyableChild
             ->leftjoin('status_labels as maintained_asset_status', 'maintained_asset_status.id', '=', 'maintained_asset.status_id')
             ->orderBy('maintained_asset_status.name', $order);
     }
+
+    /**
+     * Query builder scope to order on the user that created it
+     */
+    public function scopeOrderByCreatedBy($query, $order)
+    {
+        return $query->leftJoin('users as admin_sort', 'asset_maintenances.created_by', '=', 'admin_sort.id')->select('asset_maintenances.*')->orderBy('admin_sort.first_name', $order)->orderBy('admin_sort.last_name', $order);
+    }
 }
diff --git a/app/Models/AssetModel.php b/app/Models/AssetModel.php
index c5fb9284aa..8d60474b96 100755
--- a/app/Models/AssetModel.php
+++ b/app/Models/AssetModel.php
@@ -9,6 +9,8 @@ use Illuminate\Database\Eloquent\SoftDeletes;
 use Illuminate\Support\Facades\Gate;
 use Illuminate\Support\Facades\Storage;
 use Watson\Validating\ValidatingTrait;
+use \App\Presenters\AssetModelPresenter;
+use App\Http\Traits\TwoColumnUniqueUndeletedTrait;
 
 /**
  * Model for Asset Models. Asset Models contain higher level
@@ -20,31 +22,35 @@ class AssetModel extends SnipeModel
 {
     use HasFactory;
     use SoftDeletes;
-    protected $presenter = \App\Presenters\AssetModelPresenter::class;
     use Loggable, Requestable, Presentable;
+    use TwoColumnUniqueUndeletedTrait;
 
+    /**
+     * Whether the model should inject its identifier to the unique
+     * validation rules before attempting validation. If this property
+     * is not set in the model it will default to true.
+     *
+     * @var bool
+     */
+
+    protected $injectUniqueIdentifier = true;
+    use ValidatingTrait;
     protected $table = 'models';
-    protected $hidden = ['user_id', 'deleted_at'];
+    protected $presenter = AssetModelPresenter::class;
 
     // Declare the rules for the model validation
+
+
     protected $rules = [
-        'name'              => 'required|min:1|max:255',
-        'model_number'      => 'max:255|nullable',
+        'name'              => 'string|required|min:1|max:255|two_column_unique_undeleted:model_number',
+        'model_number'      => 'string|max:255|nullable|two_column_unique_undeleted:name',
         'min_amt'           => 'integer|min:0|nullable',
         'category_id'       => 'required|integer|exists:categories,id',
         'manufacturer_id'   => 'integer|exists:manufacturers,id|nullable',
         'eol'               => 'integer:min:0|max:240|nullable',
     ];
 
-    /**
-     * Whether the model should inject it's identifier to the unique
-     * validation rules before attempting validation. If this property
-     * is not set in the model it will default to true.
-     *
-     * @var bool
-     */
-    protected $injectUniqueIdentifier = true;
-    use ValidatingTrait;
+
 
     /**
      * The attributes that are mass assignable.
@@ -62,7 +68,7 @@ class AssetModel extends SnipeModel
         'model_number',
         'name',
         'notes',
-        'user_id',
+        'requestable',
     ];
 
     use Searchable;
@@ -72,7 +78,12 @@ class AssetModel extends SnipeModel
      *
      * @var array
      */
-    protected $searchableAttributes = ['name', 'model_number', 'notes', 'eol'];
+    protected $searchableAttributes = [
+        'name',
+        'model_number',
+        'notes',
+        'eol'
+    ];
 
     /**
      * The relations and their attributes that should be included when searching the model.
@@ -85,6 +96,9 @@ class AssetModel extends SnipeModel
         'manufacturer' => ['name'],
     ];
 
+
+
+
     /**
      * Establishes the model -> assets relationship
      *
@@ -211,6 +225,18 @@ class AssetModel extends SnipeModel
             ->orderBy('created_at', 'desc');
     }
 
+    /**
+     * Get user who created the item
+     *
+     * @author [A. Gianotto] [<snipe@snipe.net>]
+     * @since [v1.0]
+     * @return \Illuminate\Database\Eloquent\Relations\Relation
+     */
+    public function adminuser()
+    {
+        return $this->belongsTo(\App\Models\User::class, 'created_by')->withTrashed();
+    }
+
 
     /**
      * -----------------------------------------------
@@ -303,4 +329,14 @@ class AssetModel extends SnipeModel
     {
         return $query->leftJoin('custom_fieldsets', 'models.fieldset_id', '=', 'custom_fieldsets.id')->orderBy('custom_fieldsets.name', $order);
     }
+
+    /**
+     * Query builder scope to order on created_by name
+     *
+     */
+    public function scopeOrderByCreatedByName($query, $order)
+    {
+        return $query->leftJoin('users as admin_sort', 'models.created_by', '=', 'admin_sort.id')->select('models.*')->orderBy('admin_sort.first_name', $order)->orderBy('admin_sort.last_name', $order);
+    }
+
 }
diff --git a/app/Models/Category.php b/app/Models/Category.php
index 17e41da1fc..0321dfdb26 100755
--- a/app/Models/Category.php
+++ b/app/Models/Category.php
@@ -29,17 +29,17 @@ class Category extends SnipeModel
     use SoftDeletes;
 
     protected $table = 'categories';
-    protected $hidden = ['user_id', 'deleted_at'];
+    protected $hidden = ['created_by', 'deleted_at'];
 
     protected $casts = [
-        'user_id'      => 'integer',
+        'created_by'      => 'integer',
     ];
 
     /**
      * Category validation rules
      */
     public $rules = [
-        'user_id' => 'numeric|nullable',
+        'created_by' => 'numeric|nullable',
         'name'   => 'required|min:1|max:255|two_column_unique_undeleted:category_type',
         'require_acceptance'   => 'boolean',
         'use_default_eula'   => 'boolean',
@@ -70,7 +70,8 @@ class Category extends SnipeModel
         'name',
         'require_acceptance',
         'use_default_eula',
-        'user_id',
+        'created_by',
+        'notes',
     ];
 
     use Searchable;
@@ -80,7 +81,7 @@ class Category extends SnipeModel
      *
      * @var array
      */
-    protected $searchableAttributes = ['name', 'category_type'];
+    protected $searchableAttributes = ['name', 'category_type', 'notes'];
 
     /**
      * The relations and their attributes that should be included when searching the model.
@@ -99,6 +100,14 @@ class Category extends SnipeModel
     public function isDeletable()
     {
 
+        // We have to check for models as well if the category type is asset
+        if ($this->category_type == 'asset') {
+            return Gate::allows('delete', $this)
+                && ($this->itemCount() == 0)
+                && ($this->models_count == 0)
+                && ($this->deleted_at == '');
+        }
+
         return Gate::allows('delete', $this)
                 && ($this->itemCount() == 0)
                 && ($this->deleted_at == '');
@@ -171,15 +180,15 @@ class Category extends SnipeModel
 
         switch ($this->category_type) {
             case 'asset':
-                return $this->assets()->count();
+                return $this->assets->count();
             case 'accessory':
-                return $this->accessories()->count();
+                return $this->accessories->count();
             case 'component':
-                return $this->components()->count();
+                return $this->components->count();
             case 'consumable':
-                return $this->consumables()->count();
+                return $this->consumables->count();
             case 'license':
-                return $this->licenses()->count();
+                return $this->licenses->count();
             default:
                 return 0;
         }
@@ -228,6 +237,11 @@ class Category extends SnipeModel
         return $this->hasMany(\App\Models\AssetModel::class, 'category_id');
     }
 
+    public function adminuser()
+    {
+        return $this->belongsTo(\App\Models\User::class, 'created_by');
+    }
+
     /**
      * Checks for a category-specific EULA, and if that doesn't exist,
      * checks for a settings level EULA
@@ -286,4 +300,9 @@ class Category extends SnipeModel
     {
         return $query->where('require_acceptance', '=', true);
     }
+
+    public function scopeOrderByCreatedBy($query, $order)
+    {
+        return $query->leftJoin('users as admin_sort', 'categories.created_by', '=', 'admin_sort.id')->select('categories.*')->orderBy('admin_sort.first_name', $order)->orderBy('admin_sort.last_name', $order);
+    }
 }
diff --git a/app/Models/CheckoutAcceptance.php b/app/Models/CheckoutAcceptance.php
index 9c501aaf63..e44a330ebc 100644
--- a/app/Models/CheckoutAcceptance.php
+++ b/app/Models/CheckoutAcceptance.php
@@ -35,7 +35,7 @@ class CheckoutAcceptance extends Model
     /**
      * The resource that was is out
      *
-     * @return Illuminate\Database\Eloquent\Relations\MorphTo
+     * @return \Illuminate\Database\Eloquent\Relations\MorphTo
      */
     public function checkoutable()
     {
@@ -70,7 +70,7 @@ class CheckoutAcceptance extends Model
      */
     public function isCheckedOutTo(User $user)
     {
-        return $this->assignedTo->is($user);
+        return $this->assignedTo?->is($user);
     }
 
     /**
diff --git a/app/Models/CheckoutRequest.php b/app/Models/CheckoutRequest.php
index b717a332aa..d6a85f2972 100644
--- a/app/Models/CheckoutRequest.php
+++ b/app/Models/CheckoutRequest.php
@@ -13,7 +13,7 @@ class CheckoutRequest extends Model
 
     public function user()
     {
-        return $this->belongsTo(User::class);
+        return $this->belongsTo(User::class, 'user_id', 'id');
     }
 
     public function requestingUser()
diff --git a/app/Models/Company.php b/app/Models/Company.php
index ea8a28b7e1..29fa99a4b9 100644
--- a/app/Models/Company.php
+++ b/app/Models/Company.php
@@ -67,6 +67,8 @@ final class Company extends SnipeModel
         'phone',
         'fax',
         'email',
+        'created_by',
+        'notes',
     ];
 
     private static function isFullMultipleCompanySupportEnabled()
@@ -106,7 +108,7 @@ final class Company extends SnipeModel
         if (! static::isFullMultipleCompanySupportEnabled()) {
             return static::getIdFromInput($unescaped_input);
         } else {
-            $current_user = Auth::user();
+            $current_user = auth()->user();
 
             // Super users should be able to set a company to whatever they need
             if ($current_user->isSuperUser()) {
@@ -115,7 +117,7 @@ final class Company extends SnipeModel
                 if ($current_user->company_id != null) {
                     return $current_user->company_id;
                 } else {
-                    return static::getIdFromInput($unescaped_input);
+                    return null;
                 }
             }
         }
@@ -157,24 +159,24 @@ final class Company extends SnipeModel
         }
 
 
-        if (Auth::user()) {
-            Log::warning('Companyable is '.$companyable);
-            $current_user_company_id = Auth::user()->company_id;
+        if (auth()->user()) {
+            // Log::warning('Companyable is '.$companyable);
+            $current_user_company_id = auth()->user()->company_id;
             $companyable_company_id = $companyable->company_id;
-            return $current_user_company_id == null || $current_user_company_id == $companyable_company_id || Auth::user()->isSuperUser();
+            return $current_user_company_id == null || $current_user_company_id == $companyable_company_id || auth()->user()->isSuperUser();
         }
 
     }
 
     public static function isCurrentUserAuthorized()
     {
-        return (! static::isFullMultipleCompanySupportEnabled()) || (Auth::user()->isSuperUser());
+        return (! static::isFullMultipleCompanySupportEnabled()) || (auth()->user()->isSuperUser());
     }
 
     public static function canManageUsersCompanies()
     {
-        return ! static::isFullMultipleCompanySupportEnabled() || Auth::user()->isSuperUser() ||
-                Auth::user()->company_id == null;
+        return ! static::isFullMultipleCompanySupportEnabled() || auth()->user()->isSuperUser() ||
+                auth()->user()->company_id == null;
     }
 
     /**
@@ -186,12 +188,15 @@ final class Company extends SnipeModel
      */
     public function isDeletable()
     {
+
         return Gate::allows('delete', $this)
-                && ($this->assets()->count() === 0)
-                && ($this->accessories()->count() === 0)
-                && ($this->consumables()->count() === 0)
-                && ($this->components()->count() === 0)
-                && ($this->users()->count() === 0);
+            && (($this->assets_count ?? $this->assets()->count()) === 0)
+            && (($this->accessories_count ?? $this->accessories()->count()) === 0)
+            && (($this->licenses_count ?? $this->licenses()->count()) === 0)
+            && (($this->components_count ?? $this->components()->count()) === 0)
+            && (($this->consumables_count ?? $this->consumables()->count()) === 0)
+            && (($this->accessories_count ?? $this->accessories()->count()) === 0)
+            && (($this->users_count ?? $this->users()->count()) === 0);
     }
 
     /**
@@ -200,7 +205,7 @@ final class Company extends SnipeModel
      */
     public static function getIdForUser($unescaped_input)
     {
-        if (! static::isFullMultipleCompanySupportEnabled() || Auth::user()->isSuperUser()) {
+        if (! static::isFullMultipleCompanySupportEnabled() || auth()->user()->isSuperUser()) {
             return static::getIdFromInput($unescaped_input);
         } else {
             return static::getIdForCurrentUser($unescaped_input);
@@ -259,7 +264,7 @@ final class Company extends SnipeModel
     public static function scopeCompanyables($query, $column = 'company_id', $table_name = null)
     {
         // If not logged in and hitting this, assume we are on the command line and don't scope?'
-        if (! static::isFullMultipleCompanySupportEnabled() || (Auth::hasUser() && Auth::user()->isSuperUser()) || (! Auth::hasUser())) {
+        if (! static::isFullMultipleCompanySupportEnabled() || (Auth::hasUser() && auth()->user()->isSuperUser()) || (! Auth::hasUser())) {
             return $query;
         } else {
             return static::scopeCompanyablesDirectly($query, $column, $table_name);
@@ -277,7 +282,7 @@ final class Company extends SnipeModel
 
         // Get the company ID of the logged-in user, or set it to null if there is no company associated with the user
         if (Auth::hasUser()) {
-            $company_id = Auth::user()->company_id;
+            $company_id = auth()->user()->company_id;
         } else {
             $company_id = null;
         }
@@ -294,6 +299,12 @@ final class Company extends SnipeModel
 
     }
 
+    public function adminuser()
+    {
+        return $this->belongsTo(\App\Models\User::class, 'created_by');
+    }
+
+
     /**
      * I legit do not know what this method does, but we can't remove it (yet).
      *
@@ -309,7 +320,7 @@ final class Company extends SnipeModel
 
         if (count($companyable_names) == 0) {
             throw new Exception('No Companyable Children to scope');
-        } elseif (! static::isFullMultipleCompanySupportEnabled() || (Auth::hasUser() && Auth::user()->isSuperUser())) {
+        } elseif (! static::isFullMultipleCompanySupportEnabled() || (Auth::hasUser() && auth()->user()->isSuperUser())) {
             return $query;
         } else {
             $f = function ($q) {
@@ -329,4 +340,13 @@ final class Company extends SnipeModel
         }
     }
 
+
+    /**
+     * Query builder scope to order on the user that created it
+     */
+    public function scopeOrderByCreatedBy($query, $order)
+    {
+        return $query->leftJoin('users as admin_sort', 'companies.created_by', '=', 'admin_sort.id')->select('companies.*')->orderBy('admin_sort.first_name', $order)->orderBy('admin_sort.last_name', $order);
+    }
+
 }
diff --git a/app/Models/CompanyableTrait.php b/app/Models/CompanyableTrait.php
index df67f2be4f..c4b9b89fbf 100644
--- a/app/Models/CompanyableTrait.php
+++ b/app/Models/CompanyableTrait.php
@@ -8,14 +8,18 @@ trait CompanyableTrait
      * This trait is used to scope models to the current company. To use this scope on companyable models,
      * we use the "use Companyable;" statement at the top of the mode.
      *
-     * We CANNOT USE THIS ON USERS, as it causes an infinite loop and prevents users from logging in, since this scope will be
-     * applied to the currently logged in (or logging in) user in addition to the user model for viewing lists of users.
-     *
      * @see \App\Models\Company\Company::scopeCompanyables()
      * @return void
      */
     public static function bootCompanyableTrait()
     {
-        static::addGlobalScope(new CompanyableScope);
+        // In Version 7.0 and before locations weren't scoped by companies, so add a check for the backward compatibility setting
+        if (__CLASS__ != 'App\Models\Location') {
+            static::addGlobalScope(new CompanyableScope);
+        } else {
+            if (Setting::getSettings()->scope_locations_fmcs == 1) {
+                static::addGlobalScope(new CompanyableScope);
+            }
+        }
     }
 }
diff --git a/app/Models/Component.php b/app/Models/Component.php
index 671b0101c4..0208fb9f68 100644
--- a/app/Models/Component.php
+++ b/app/Models/Component.php
@@ -6,6 +6,7 @@ use App\Models\Traits\Searchable;
 use App\Presenters\Presentable;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\SoftDeletes;
+use Illuminate\Support\Facades\Gate;
 use Watson\Validating\ValidatingTrait;
 
 /**
@@ -30,14 +31,16 @@ class Component extends SnipeModel
      * Category validation rules
      */
     public $rules = [
-        'name'           => 'required|min:3|max:255',
+        'name'           => 'required|min:3|max:191',
         'qty'            => 'required|integer|min:1',
         'category_id'    => 'required|integer|exists:categories,id',
         'supplier_id'    => 'nullable|integer|exists:suppliers,id',
         'company_id'     => 'integer|nullable|exists:companies,id',
+        'location_id'    => 'exists:locations,id|nullable|fmcs_location',
         'min_amt'        => 'integer|min:0|nullable',
         'purchase_date'   => 'date_format:Y-m-d|nullable',
-        'purchase_cost'  => 'numeric|nullable|gte:0',
+        'purchase_cost'  => 'numeric|nullable|gte:0|max:9999999999999',
+        'manufacturer_id'   => 'integer|exists:manufacturers,id|nullable',
     ];
 
     /**
@@ -60,6 +63,8 @@ class Component extends SnipeModel
         'company_id',
         'supplier_id',
         'location_id',
+        'manufacturer_id',
+        'model_number',
         'name',
         'purchase_cost',
         'purchase_date',
@@ -77,7 +82,15 @@ class Component extends SnipeModel
      *
      * @var array
      */
-    protected $searchableAttributes = ['name', 'order_number', 'serial', 'purchase_cost', 'purchase_date', 'notes'];
+    protected $searchableAttributes = [
+        'name',
+        'order_number',
+        'serial',
+        'purchase_cost',
+        'purchase_date',
+        'notes',
+        'model_number',
+    ];
 
     /**
      * The relations and their attributes that should be included when searching the model.
@@ -89,9 +102,17 @@ class Component extends SnipeModel
         'company'      => ['name'],
         'location'     => ['name'],
         'supplier'     => ['name'],
+        'manufacturer' => ['name'],
     ];
 
 
+    public function isDeletable()
+    {
+        return Gate::allows('delete', $this)
+            && ($this->numCheckedOut() === 0)
+            && ($this->deleted_at == '');
+    }
+
     /**
      * Establishes the components -> action logs -> uploads relationship
      *
@@ -130,7 +151,7 @@ class Component extends SnipeModel
      */
     public function assets()
     {
-        return $this->belongsToMany(\App\Models\Asset::class, 'components_assets')->withPivot('id', 'assigned_qty', 'created_at', 'user_id', 'note');
+        return $this->belongsToMany(\App\Models\Asset::class, 'components_assets')->withPivot('id', 'assigned_qty', 'created_at', 'created_by', 'note');
     }
 
     /**
@@ -142,9 +163,9 @@ class Component extends SnipeModel
      * @since [v3.0]
      * @return \Illuminate\Database\Eloquent\Relations\Relation
      */
-    public function admin()
+    public function adminuser()
     {
-        return $this->belongsTo(\App\Models\User::class, 'user_id');
+        return $this->belongsTo(\App\Models\User::class, 'created_by');
     }
 
     /**
@@ -183,6 +204,19 @@ class Component extends SnipeModel
         return $this->belongsTo(\App\Models\Supplier::class, 'supplier_id');
     }
 
+
+    /**
+     * Establishes the item -> manufacturer relationship
+     *
+     * @author [A. Gianotto] [<snipe@snipe.net>]
+     * @since [v3.0]
+     * @return \Illuminate\Database\Eloquent\Relations\Relation
+     */
+    public function manufacturer()
+    {
+        return $this->belongsTo(\App\Models\Manufacturer::class, 'manufacturer_id');
+    }
+
     /**
      * Establishes the component -> action logs relationship
      *
@@ -205,13 +239,28 @@ class Component extends SnipeModel
     public function numCheckedOut()
     {
         $checkedout = 0;
-        foreach ($this->assets as $checkout) {
-            $checkedout += $checkout->pivot->assigned_qty;
-        }
 
-        return $checkedout;
+        // In case there are elements checked out to assets that belong to a different company
+        // than this asset and full multiple company support is on we'll remove the global scope,
+        // so they are included in the count.
+        return $this->uncontrainedAssets->sum('pivot.assigned_qty');
     }
 
+
+    /**
+     * @return \Illuminate\Database\Eloquent\Relations\BelongsToMany
+     *
+     * This allows us to get the assets with assigned components without the company restriction
+     */
+    public function uncontrainedAssets() {
+
+        return $this->belongsToMany(\App\Models\Asset::class, 'components_assets')
+                ->withPivot('id', 'assigned_qty', 'created_at', 'created_by', 'note')
+                ->withoutGlobalScope(new CompanyableScope);
+
+    }
+
+
     /**
      * Check how many items within a component are remaining
      *
@@ -306,4 +355,22 @@ class Component extends SnipeModel
     {
         return $query->leftJoin('suppliers', 'components.supplier_id', '=', 'suppliers.id')->orderBy('suppliers.name', $order);
     }
+
+    /**
+     * Query builder scope to order on manufacturer
+     *
+     * @param  \Illuminate\Database\Query\Builder  $query  Query builder instance
+     * @param  text                              $order       Order
+     *
+     * @return \Illuminate\Database\Query\Builder          Modified query builder
+     */
+    public function scopeOrderManufacturer($query, $order)
+    {
+        return $query->leftJoin('manufacturers', 'components.manufacturer_id', '=', 'manufacturers.id')->orderBy('manufacturers.name', $order);
+    }
+
+    public function scopeOrderByCreatedBy($query, $order)
+    {
+        return $query->leftJoin('users as admin_sort', 'components.created_by', '=', 'admin_sort.id')->select('components.*')->orderBy('admin_sort.first_name', $order)->orderBy('admin_sort.last_name', $order);
+    }
 }
diff --git a/app/Models/Consumable.php b/app/Models/Consumable.php
index 008dffa4ca..b881ec65f3 100644
--- a/app/Models/Consumable.php
+++ b/app/Models/Consumable.php
@@ -10,12 +10,21 @@ use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\SoftDeletes;
 use Illuminate\Support\Facades\Storage;
 use Watson\Validating\ValidatingTrait;
+use Illuminate\Database\Eloquent\Relations\Relation;
+use App\Presenters\ConsumablePresenter;
+use App\Models\Actionlog;
+use App\Models\ConsumableAssignment;
+use App\Models\User;
+use App\Models\Location;
+use App\Models\Manufacturer;
+use App\Models\Supplier;
+use App\Models\Category;
 
 class Consumable extends SnipeModel
 {
     use HasFactory;
 
-    protected $presenter = \App\Presenters\ConsumablePresenter::class;
+    protected $presenter = ConsumablePresenter::class;
     use CompanyableTrait;
     use Loggable, Presentable;
     use SoftDeletes;
@@ -37,11 +46,12 @@ class Consumable extends SnipeModel
      */
     public $rules = [
         'name'        => 'required|min:3|max:255',
-        'qty'         => 'required|integer|min:0',
+        'qty'         => 'required|integer|min:0|max:99999',
         'category_id' => 'required|integer',
         'company_id'  => 'integer|nullable',
-        'min_amt'     => 'integer|min:0|nullable',
-        'purchase_cost'   => 'numeric|nullable|gte:0',
+        'location_id' => 'exists:locations,id|nullable|fmcs_location',
+        'min_amt'     => 'integer|min:0|max:99999|nullable',
+        'purchase_cost'   => 'numeric|nullable|gte:0|max:9999999999999',
         'purchase_date'   => 'date_format:Y-m-d|nullable',
     ];
 
@@ -66,6 +76,7 @@ class Consumable extends SnipeModel
         'item_no',
         'location_id',
         'manufacturer_id',
+        'supplier_id',
         'name',
         'order_number',
         'model_number',
@@ -109,7 +120,7 @@ class Consumable extends SnipeModel
      */
     public function uploads()
     {
-        return $this->hasMany(\App\Models\Actionlog::class, 'item_id')
+        return $this->hasMany(Actionlog::class, 'item_id')
             ->where('item_type', '=', self::class)
             ->where('action_type', '=', 'uploaded')
             ->whereNotNull('filename')
@@ -145,9 +156,9 @@ class Consumable extends SnipeModel
      * @since [v3.0]
      * @return \Illuminate\Database\Eloquent\Relations\Relation
      */
-    public function admin()
+    public function adminuser()
     {
-        return $this->belongsTo(\App\Models\User::class, 'user_id');
+        return $this->belongsTo(User::class, 'created_by');
     }
 
     /**
@@ -159,7 +170,7 @@ class Consumable extends SnipeModel
      */
     public function consumableAssignments()
     {
-        return $this->hasMany(\App\Models\ConsumableAssignment::class);
+        return $this->hasMany(ConsumableAssignment::class);
     }
 
     /**
@@ -183,7 +194,7 @@ class Consumable extends SnipeModel
      */
     public function manufacturer()
     {
-        return $this->belongsTo(\App\Models\Manufacturer::class, 'manufacturer_id');
+        return $this->belongsTo(Manufacturer::class, 'manufacturer_id');
     }
 
     /**
@@ -195,7 +206,7 @@ class Consumable extends SnipeModel
      */
     public function location()
     {
-        return $this->belongsTo(\App\Models\Location::class, 'location_id');
+        return $this->belongsTo(Location::class, 'location_id');
     }
 
     /**
@@ -207,7 +218,7 @@ class Consumable extends SnipeModel
      */
     public function category()
     {
-        return $this->belongsTo(\App\Models\Category::class, 'category_id');
+        return $this->belongsTo(Category::class, 'category_id');
     }
 
 
@@ -220,7 +231,7 @@ class Consumable extends SnipeModel
      */
     public function assetlog()
     {
-        return $this->hasMany(\App\Models\Actionlog::class, 'item_id')->where('item_type', self::class)->orderBy('created_at', 'desc')->withTrashed();
+        return $this->hasMany(Actionlog::class, 'item_id')->where('item_type', self::class)->orderBy('created_at', 'desc')->withTrashed();
     }
 
     /**
@@ -244,11 +255,10 @@ class Consumable extends SnipeModel
      *
      * @author [A. Gianotto] [<snipe@snipe.net>]
      * @since [v3.0]
-     * @return \Illuminate\Database\Eloquent\Relations\Relation
      */
-    public function users()
+    public function users() : Relation
     {
-        return $this->belongsToMany(\App\Models\User::class, 'consumables_users', 'consumable_id', 'assigned_to')->withPivot('user_id')->withTrashed()->withTimestamps();
+        return $this->belongsToMany(User::class, 'consumables_users', 'consumable_id', 'assigned_to')->withPivot('created_by')->withTrashed()->withTimestamps();
     }
 
     /**
@@ -260,7 +270,7 @@ class Consumable extends SnipeModel
      */
     public function supplier()
     {
-        return $this->belongsTo(\App\Models\Supplier::class, 'supplier_id');
+        return $this->belongsTo(Supplier::class, 'supplier_id');
     }
 
 
@@ -274,7 +284,7 @@ class Consumable extends SnipeModel
      */
     public function checkin_email()
     {
-        return $this->category->checkin_email;
+        return $this->category?->checkin_email;
     }
 
     /**
@@ -317,10 +327,7 @@ class Consumable extends SnipeModel
      */
     public function numCheckedOut()
     {
-        $checkedout = 0;
-        $checkedout = $this->users->count();
-
-        return $checkedout;
+        return $this->consumables_users_count ?? $this->users()->count();
     }
 
     /**
@@ -332,7 +339,7 @@ class Consumable extends SnipeModel
      */
     public function numRemaining()
     {
-        $checkedout = $this->users->count();
+        $checkedout = $this->numCheckedOut();
         $total = $this->qty;
         $remaining = $total - $checkedout;
 
@@ -420,6 +427,20 @@ class Consumable extends SnipeModel
         return $query->leftJoin('companies', 'consumables.company_id', '=', 'companies.id')->orderBy('companies.name', $order);
     }
 
+    /**
+     * Query builder scope to order on remaining
+     *
+     * @param  \Illuminate\Database\Query\Builder  $query  Query builder instance
+     * @param  string                              $order       Order
+     *
+     * @return \Illuminate\Database\Query\Builder          Modified query builder
+     */
+    public function scopeOrderRemaining($query, $order)
+    {
+        $order_by = 'consumables.qty - consumables_users_count ' . $order;
+        return $query->orderByRaw($order_by);
+    }
+
     /**
      * Query builder scope to order on supplier
      *
@@ -432,4 +453,9 @@ class Consumable extends SnipeModel
     {
         return $query->leftJoin('suppliers', 'consumables.supplier_id', '=', 'suppliers.id')->orderBy('suppliers.name', $order);
     }
+
+    public function scopeOrderByCreatedBy($query, $order)
+    {
+        return $query->leftJoin('users as users_sort', 'consumables.created_by', '=', 'users_sort.id')->select('consumables.*')->orderBy('users_sort.first_name', $order)->orderBy('users_sort.last_name', $order);
+    }
 }
diff --git a/app/Models/ConsumableAssignment.php b/app/Models/ConsumableAssignment.php
index 1e21a7f7d2..4c9a19703e 100644
--- a/app/Models/ConsumableAssignment.php
+++ b/app/Models/ConsumableAssignment.php
@@ -3,13 +3,19 @@
 namespace App\Models;
 
 use Illuminate\Database\Eloquent\Model;
+use Watson\Validating\ValidatingTrait;
 
 class ConsumableAssignment extends Model
 {
     use CompanyableTrait;
+    use ValidatingTrait;
 
     protected $table = 'consumables_users';
 
+    public $rules = [
+        'assigned_to'        => 'required|exists:users,id',
+    ];
+
     public function consumable()
     {
         return $this->belongsTo(\App\Models\Consumable::class);
@@ -20,8 +26,8 @@ class ConsumableAssignment extends Model
         return $this->belongsTo(\App\Models\User::class, 'assigned_to');
     }
 
-    public function admin()
+    public function adminuser()
     {
-        return $this->belongsTo(\App\Models\User::class, 'user_id');
+        return $this->belongsTo(\App\Models\User::class, 'created_by');
     }
 }
diff --git a/app/Models/CustomField.php b/app/Models/CustomField.php
index c1826a94d8..b3742882a2 100644
--- a/app/Models/CustomField.php
+++ b/app/Models/CustomField.php
@@ -7,7 +7,7 @@ use EasySlugger\Utf8Slugger;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Validation\Rule;
-use Schema;
+use Illuminate\Support\Facades\Schema;
 use Watson\Validating\ValidatingTrait;
 class CustomField extends Model
 {
@@ -79,6 +79,9 @@ class CustomField extends Model
         'auto_add_to_fieldsets',
         'show_in_listview',
         'show_in_email',
+        'display_checkout',
+        'display_checkin',
+        'display_audit',
         'show_in_requestable_list',
     ];
 
@@ -149,11 +152,6 @@ class CustomField extends Model
                     return true;
                 }
 
-                // This is just a dumb thing we have to include because Laraval/Doctrine doesn't
-                // play well with enums or a table that EVER had enums. :(
-                $platform = Schema::getConnection()->getDoctrineSchemaManager()->getDatabasePlatform();
-                $platform->registerDoctrineTypeMapping('enum', 'string');
-
                 // Rename the field if the name has changed
                 Schema::table(self::$table_name, function ($table) use ($custom_field) {
                     $table->renameColumn($custom_field->convertUnicodeDbSlug($custom_field->getOriginal('name')), $custom_field->convertUnicodeDbSlug());
@@ -188,7 +186,44 @@ class CustomField extends Model
     {
         return $this->belongsToMany(\App\Models\CustomFieldset::class);
     }
-   
+
+    public function displayFieldInCheckinForm()
+    {
+        if ($this->display_checkin == '1') {
+            return true;
+        }
+        return false;
+    }
+
+    public function displayFieldInCheckoutForm()
+    {
+        if ($this->display_checkout == '1') {
+            return true;
+        }
+        return false;
+    }
+
+    public function displayFieldInAuditForm()
+    {
+        if ($this->display_audit == '1') {
+            return true;
+        }
+        return false;
+    }
+
+    public function displayFieldInCurrentForm($form_type = null)
+    {
+        switch ($form_type) {
+            case 'audit':
+                return $this->displayFieldInAuditForm();
+            case 'checkin':
+                return $this->displayFieldInCheckinForm();
+            case 'checkout':
+                return $this->displayFieldInCheckoutForm();
+        }
+    }
+
+
     public function assetModels()
     {
        return $this->fieldset()->with('models')->get()->pluck('models')->flatten()->unique('id'); 
@@ -307,7 +342,7 @@ class CustomField extends Model
     public function formatFieldValuesAsArray()
     {
         $result = [];
-        $arr = preg_split('/\\r\\n|\\r|\\n/', $this->field_values);
+        $arr = preg_split('/\\r\\n|\\r|\\n/', $this->field_values ?? '');
 
         if (($this->element != 'checkbox') && ($this->element != 'radio')) {
             $result[''] = 'Select '.strtolower($this->format);
@@ -383,7 +418,7 @@ class CustomField extends Model
 
     /**
      * Check to see if there is a custom regex format type
-     * @see https://github.com/snipe/snipe-it/issues/5896
+     * @see https://github.com/grokability/snipe-it/issues/5896
      *
      * @author Wes Hulette <jwhulette@gmail.com>
      *
diff --git a/app/Models/CustomFieldset.php b/app/Models/CustomFieldset.php
index 71be28e8a3..e5490b49b3 100644
--- a/app/Models/CustomFieldset.php
+++ b/app/Models/CustomFieldset.php
@@ -2,6 +2,8 @@
 
 namespace App\Models;
 
+use App\Rules\AlphaEncrypted;
+use App\Rules\NumericEncrypted;
 use Gate;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
@@ -69,6 +71,25 @@ class CustomFieldset extends Model
         return $this->belongsTo(\App\Models\User::class); //WARNING - not all CustomFieldsets have a User!!
     }
 
+    public function displayAnyFieldsInForm($form_type = null)
+    {
+        if ($this->fields) {
+
+            switch ($form_type) {
+                case 'audit':
+                    return $this->fields->where('display_audit', '1')->count() > 0;
+                case 'checkin':
+                    return $this->fields->where('display_checkin', '1')->count() > 0;
+                case 'checkout':
+                    return $this->fields->where('display_checkout', '1')->count() > 0;
+                default:
+                    return true;
+            }
+        }
+
+        return false;
+    }
+
     /**
      * Determine the validation rules we should apply based on the
      * custom field format
@@ -92,9 +113,25 @@ class CustomFieldset extends Model
                     $rule[] = 'unique_undeleted';
             }
 
-            array_push($rule, $field->attributes['format']);
+            if ($field->attributes['format']!='') {
+                array_push($rule, $field->attributes['format']);
+            }
+
             $rules[$field->db_column_name()] = $rule;
 
+
+            // these are to replace the standard 'numeric' and 'alpha' rules if the custom field is also encrypted.
+            // the values need to be decrypted first, because encrypted strings are alphanumeric
+            if ($field->format === 'NUMERIC' && $field->field_encrypted) {
+                $numericKey = array_search('numeric', $rules[$field->db_column_name()]);
+                $rules[$field->db_column_name()][$numericKey] = new NumericEncrypted;
+            }
+
+            if ($field->format === 'ALPHA' && $field->field_encrypted) {
+                $alphaKey = array_search('alpha', $rules[$field->db_column_name()]);
+                $rules[$field->db_column_name()][$alphaKey] = new AlphaEncrypted;
+            }
+
             // add not_array to rules for all fields but checkboxes
             if ($field->element != 'checkbox') {
                 $rules[$field->db_column_name()][] = 'not_array';
diff --git a/app/Models/Department.php b/app/Models/Department.php
index 62755d2aa0..592fd840b1 100644
--- a/app/Models/Department.php
+++ b/app/Models/Department.php
@@ -42,7 +42,7 @@ class Department extends SnipeModel
      * @var array
      */
     protected $fillable = [
-        'user_id',
+        'created_by',
         'name',
         'phone',
         'fax',
@@ -141,4 +141,17 @@ class Department extends SnipeModel
     {
         return $query->leftJoin('users as department_user', 'departments.manager_id', '=', 'department_user.id')->orderBy('department_user.first_name', $order)->orderBy('department_user.last_name', $order);
     }
+
+    /**
+     * Query builder scope to order on company
+     *
+     * @param  \Illuminate\Database\Query\Builder  $query  Query builder instance
+     * @param  text                              $order       Order
+     *
+     * @return \Illuminate\Database\Query\Builder          Modified query builder
+     */
+    public function scopeOrderCompany($query, $order)
+    {
+        return $query->leftJoin('companies as company_sort', 'departments.company_id', '=', 'company_sort.id')->orderBy('company_sort.name', $order);
+    }
 }
diff --git a/app/Models/Depreciable.php b/app/Models/Depreciable.php
index 7211358739..0c513a3d33 100644
--- a/app/Models/Depreciable.php
+++ b/app/Models/Depreciable.php
@@ -76,9 +76,9 @@ class Depreciable extends SnipeModel
 
         if ($months_passed >= $this->get_depreciation()->months){
             //if there is a floor use it
-            if(!$this->get_depreciation()->depreciation_min == null) {
+            if($this->get_depreciation()->depreciation_min) {
 
-                $current_value = $this->get_depreciation()->depreciation_min;
+                $current_value = $this->calculateDepreciation();
 
             }else{
                 $current_value = 0;
@@ -86,7 +86,7 @@ class Depreciable extends SnipeModel
         }
         else {
             // The equation here is (Purchase_Cost-Floor_min)*(Months_passed/Months_til_depreciated)
-            $current_value = round(($this->purchase_cost-($this->purchase_cost - ($this->get_depreciation()->depreciation_min)) * ($months_passed / $this->get_depreciation()->months)), 2);
+            $current_value = round(($this->purchase_cost-($this->purchase_cost - ($this->calculateDepreciation())) * ($months_passed / $this->get_depreciation()->months)), 2);
 
         }
 
@@ -95,7 +95,7 @@ class Depreciable extends SnipeModel
 
     public function getMonthlyDepreciation(){
 
-        return ($this->purchase_cost-$this->get_depreciation()->depreciation_min)/$this->get_depreciation()->months;
+        return ($this->purchase_cost-$this->calculateDepreciation())/$this->get_depreciation()->months;
 
     }
 
@@ -158,17 +158,20 @@ class Depreciable extends SnipeModel
 
     public function time_until_depreciated()
     {
-        // @link http://www.php.net/manual/en/class.datetime.php
-        $d1 = new \DateTime();
-        $d2 = $this->depreciated_date();
+        if ($this->depreciated_date()) {
+            // @link http://www.php.net/manual/en/class.datetime.php
+            $d1 = new \DateTime();
+            $d2 = $this->depreciated_date();
 
-        // @link http://www.php.net/manual/en/class.dateinterval.php
-        $interval = $d1->diff($d2);
-        if (! $interval->invert) {
-            return $interval;
-        } else {
-            return new \DateInterval('PT0S'); //null interval (zero seconds from now)
+            // @link http://www.php.net/manual/en/class.dateinterval.php
+            $interval = $d1->diff($d2);
+            if (! $interval->invert) {
+                return $interval;
+            } else {
+                return new \DateInterval('PT0S'); //null interval (zero seconds from now)
+            }
         }
+        return false;
     }
 
     public function depreciated_date()
@@ -188,4 +191,16 @@ class Depreciable extends SnipeModel
     {
         return new \DateTime($time);
     }
+
+    private function calculateDepreciation()
+    {
+        if($this->get_depreciation()->depreciation_type === 'percent') {
+            $depreciation_percent= $this->get_depreciation()->depreciation_min / 100;
+            $depreciation_min= $this->purchase_cost * $depreciation_percent;
+            return $depreciation_min;
+        }
+
+        $depreciation_min = $this->get_depreciation()->depreciation_min;
+        return $depreciation_min;
+    }
 }
diff --git a/app/Models/Depreciation.php b/app/Models/Depreciation.php
index 9faa1b86e2..11ee82c16a 100755
--- a/app/Models/Depreciation.php
+++ b/app/Models/Depreciation.php
@@ -75,4 +75,40 @@ class Depreciation extends SnipeModel
     {
         return $this->hasMany(\App\Models\License::class, 'depreciation_id');
     }
+
+    /**
+     * Establishes the depreciation -> assets relationship
+     *
+     * @author A. Gianotto <snipe@snipe.net>
+     * @since [v5.0]
+     * @return \Illuminate\Database\Eloquent\Relations\Relation
+     */
+    public function assets()
+    {
+        return $this->hasManyThrough(\App\Models\Asset::class, \App\Models\AssetModel::class, 'depreciation_id', 'model_id');
+    }
+
+    /**
+     * Get the user that created the depreciation
+     *
+     * @author A. Gianotto <snipe@snipe.net>
+     * @since [v7.0.13]
+     * @return \Illuminate\Database\Eloquent\Relations\Relation
+     */
+    public function adminuser()
+    {
+        return $this->belongsTo(\App\Models\User::class, 'created_by');
+    }
+
+
+    /**
+     * -----------------------------------------------
+     * BEGIN QUERY SCOPES
+     * -----------------------------------------------
+     **/
+
+    public function scopeOrderByCreatedBy($query, $order)
+    {
+        return $query->leftJoin('users as admin_sort', 'depreciations.created_by', '=', 'admin_sort.id')->select('depreciations.*')->orderBy('admin_sort.first_name', $order)->orderBy('admin_sort.last_name', $order);
+    }
 }
diff --git a/app/Models/Group.php b/app/Models/Group.php
index c6e6e56039..6dae273998 100755
--- a/app/Models/Group.php
+++ b/app/Models/Group.php
@@ -18,7 +18,8 @@ class Group extends SnipeModel
 
     protected $fillable = [
         'name',
-        'permissions'
+        'permissions',
+        'notes',
     ];
 
     /**
@@ -37,7 +38,7 @@ class Group extends SnipeModel
      *
      * @var array
      */
-    protected $searchableAttributes = ['name', 'created_at'];
+    protected $searchableAttributes = ['name', 'created_at', 'notes'];
 
     /**
      * The relations and their attributes that should be included when searching the model.
@@ -65,7 +66,7 @@ class Group extends SnipeModel
      * @since [v6.3.0]
      * @return \Illuminate\Database\Eloquent\Relations\Relation
      */
-    public function admin()
+    public function adminuser()
     {
         return $this->belongsTo(\App\Models\User::class, 'created_by');
     }
@@ -75,10 +76,43 @@ class Group extends SnipeModel
      *
      * @author A. Gianotto <snipe@snipe.net>
      * @since [v1.0]
-     * @return array
+     * @return array | \stdClass
      */
     public function decodePermissions()
     {
-        return json_decode($this->permissions, true);
+        // If the permissions are an array, convert it to JSON
+        if (is_array($this->permissions)) {
+            $this->permissions = json_encode($this->permissions);
+        }
+
+        $permissions = json_decode($this->permissions ?? '{}', JSON_OBJECT_AS_ARRAY);
+
+        // Otherwise, loop through the permissions and cast the values as integers
+        if ((is_array($permissions)) && ($permissions)) {
+            foreach ($permissions as $permission => $value) {
+
+                if (!is_integer($permission)) {
+                    $permissions[$permission] = (int) $value;
+                } else {
+                    \Log::info('Weird data here - skipping it');
+                    unset($permissions[$permission]);
+                }
+            }
+            return $permissions ?: new \stdClass;
+        }
+        return new \stdClass;
+
+    }
+
+    /**
+     * -----------------------------------------------
+     * BEGIN QUERY SCOPES
+     * -----------------------------------------------
+     **/
+
+
+    public function scopeOrderByCreatedBy($query, $order)
+    {
+        return $query->leftJoin('users as admin_sort', 'permission_groups.created_by', '=', 'admin_sort.id')->select('permission_groups.*')->orderBy('admin_sort.first_name', $order)->orderBy('admin_sort.last_name', $order);
     }
 }
diff --git a/app/Models/Import.php b/app/Models/Import.php
index 81728c8a5e..d824a3840c 100644
--- a/app/Models/Import.php
+++ b/app/Models/Import.php
@@ -2,13 +2,28 @@
 
 namespace App\Models;
 
+use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
 
 class Import extends Model
 {
+    use HasFactory;
+
     protected $casts = [
         'header_row' => 'array',
         'first_row' => 'array',
         'field_map' => 'json',
     ];
+
+    /**
+     * Establishes the license -> admin user relationship
+     *
+     * @author A. Gianotto <snipe@snipe.net>
+     * @since [v2.0]
+     * @return \Illuminate\Database\Eloquent\Relations\Relation
+     */
+    public function adminuser()
+    {
+        return $this->belongsTo(\App\Models\User::class, 'created_by');
+    }
 }
diff --git a/app/Models/Labels/DefaultLabel.php b/app/Models/Labels/DefaultLabel.php
index 9f7059bcd5..f869110138 100644
--- a/app/Models/Labels/DefaultLabel.php
+++ b/app/Models/Labels/DefaultLabel.php
@@ -43,8 +43,8 @@ class DefaultLabel extends RectangleSheet
 
         $this->textSize = Helper::convertUnit($settings->labels_fontsize, 'pt', 'in');
 
-        $this->labelWidth  = $settings->labels_width;
-        $this->labelHeight = $settings->labels_height;
+        $this->labelWidth = $this->setLabelWidth($settings);
+        $this->labelHeight = $this->setLabelHeight($settings);
 
         $this->labelSpacingH = $settings->labels_display_sgutter;
         $this->labelSpacingV = $settings->labels_display_bgutter;
@@ -181,6 +181,25 @@ class DefaultLabel extends RectangleSheet
         }
     }
 
-}
+    private function setLabelWidth(Setting $settings)
+    {
+        $labelWidth = $settings->labels_width;
 
-?>
\ No newline at end of file
+        if ($labelWidth == 0) {
+            $labelWidth = 0.1;
+        }
+
+        return $labelWidth;
+    }
+
+    private function setLabelHeight(?Setting $settings)
+    {
+        $labelHeight = $settings->labels_height;
+
+        if ($labelHeight == 0) {
+            $labelHeight = 0.1;
+        }
+
+        return $labelHeight;
+    }
+}
diff --git a/app/Models/Labels/Label.php b/app/Models/Labels/Label.php
index 8ea92d2e42..2405da5401 100644
--- a/app/Models/Labels/Label.php
+++ b/app/Models/Labels/Label.php
@@ -25,6 +25,17 @@ abstract class Label
      */
     public abstract function getUnit();
 
+    /**
+     * Returns the PDF rotation.
+     * 0, 90, 180, 270
+     * 0 is a sane default. Override when necessary.
+     *
+     * @return int
+     */
+    public function getRotation() {
+        return 0;
+    }
+
     /**
      * Returns the label's width in getUnit() units
      * 
@@ -400,14 +411,14 @@ abstract class Label
     /**
      * Checks the template is internally valid
      */
-    public final function validate() {
+    public final function validate() : void {
         $this->validateUnits();
         $this->validateSize();
         $this->validateMargins();
         $this->validateSupport();
     }
 
-    private function validateUnits() {
+    private function validateUnits() : void {
         $validUnits = [ 'pt', 'mm', 'cm', 'in' ];
         $unit = $this->getUnit();
         if (!in_array(strtolower($unit), $validUnits)) {
@@ -419,7 +430,7 @@ abstract class Label
         }
     }
 
-    private function validateSize() {
+    private function validateSize() : void {
         $width = $this->getWidth();
         if (!is_numeric($width) || is_string($width)) {
             throw new \UnexpectedValueException(trans('admin/labels/message.invalid_return_type', [
@@ -439,7 +450,7 @@ abstract class Label
         }
     }
 
-    private function validateMargins() {
+    private function validateMargins() : void {
         $marginTop = $this->getMarginTop();
         if (!is_numeric($marginTop) || is_string($marginTop)) {
             throw new \UnexpectedValueException(trans('admin/labels/message.invalid_return_type', [
@@ -477,7 +488,7 @@ abstract class Label
         }
     }
 
-    private function validateSupport() {
+    private function validateSupport() : void {
         $support1D = $this->getSupport1DBarcode();
         if (!is_bool($support1D)) {
             throw new \UnexpectedValueException(trans('admin/labels/message.invalid_return_type', [
diff --git a/app/Models/Labels/Sheets/Avery/L7162_B.php b/app/Models/Labels/Sheets/Avery/L7162_B.php
index 268754e04f..9f24d58c2f 100644
--- a/app/Models/Labels/Sheets/Avery/L7162_B.php
+++ b/app/Models/Labels/Sheets/Avery/L7162_B.php
@@ -55,7 +55,7 @@ class L7162_B extends L7162
                 $pdf, $record->get('logo'),
                 $pa->x1, $pa->y1,
                 self::LOGO_MAX_WIDTH, $usableHeight,
-                'L', 'T', 300, true, false, 0.1
+                'L', 'T', 300, true, false, 0
             );
             $currentX += $logoSize[0] + self::LOGO_MARGIN;
             $usableWidth -= $logoSize[0] + self::LOGO_MARGIN;
@@ -100,4 +100,4 @@ class L7162_B extends L7162
 }
 
 
-?>
\ No newline at end of file
+?>
diff --git a/app/Models/Labels/Sheets/Avery/_3490.php b/app/Models/Labels/Sheets/Avery/_3490.php
new file mode 100644
index 0000000000..2782549fd3
--- /dev/null
+++ b/app/Models/Labels/Sheets/Avery/_3490.php
@@ -0,0 +1,71 @@
+<?php
+
+namespace App\Models\Labels\Sheets\Avery;
+
+use App\Helpers\Helper;
+use App\Models\Labels\RectangleSheet;
+
+abstract class _3490 extends RectangleSheet
+{
+
+    private const PAPER_FORMAT      = 'A4';
+    private const PAPER_ORIENTATION = 'P';
+
+    /* Data in pt from Word Template */
+    private const COLUMN1_X = 5.00;
+    private const COLUMN2_X = 198.4;
+    private const ROW1_Y    = 10.00;
+    private const ROW2_Y    = 112.00;
+    private const LABEL_W   = 193.4;
+    private const LABEL_H   = 102.00;
+
+
+    private float $pageWidth;
+    private float $pageHeight;
+    private float $pageMarginLeft;
+    private float $pageMarginTop;
+
+    private float $columnSpacing;
+    private float $rowSpacing;
+
+    private float $labelWidth;
+    private float $labelHeight;
+
+    public function __construct() {
+        $paperSize = static::fromFormat(self::PAPER_FORMAT, self::PAPER_ORIENTATION, $this->getUnit(), 2);
+        $this->pageWidth = $paperSize->width;
+        $this->pageHeight = $paperSize->height;
+
+        $this->pageMarginLeft = Helper::convertUnit(self::COLUMN1_X, 'pt', $this->getUnit());
+        $this->pageMarginTop = Helper::convertUnit(self::ROW1_Y, 'pt', $this->getUnit());
+
+        $columnSpacingPt = self::COLUMN2_X - self::COLUMN1_X - self::LABEL_W;
+        $this->columnSpacing = Helper::convertUnit($columnSpacingPt, 'pt', $this->getUnit());
+        $rowSpacingPt = self::ROW2_Y - self::ROW1_Y - self::LABEL_H;
+        $this->rowSpacing = Helper::convertUnit($rowSpacingPt, 'pt', $this->getUnit());
+
+        $this->labelWidth = Helper::convertUnit(self::LABEL_W, 'pt', $this->getUnit());
+        $this->labelHeight = Helper::convertUnit(self::LABEL_H, 'pt', $this->getUnit());
+    }
+
+    public function getPageWidth()  { return $this->pageWidth; }
+    public function getPageHeight() { return $this->pageHeight; }
+
+    public function getPageMarginTop()    { return $this->pageMarginTop; }
+    public function getPageMarginBottom() { return $this->pageMarginTop; }
+    public function getPageMarginLeft()   { return $this->pageMarginLeft; }
+    public function getPageMarginRight()  { return $this->pageMarginLeft; }
+
+    public function getColumns() { return 3; }
+    public function getRows()    { return 10; }
+
+    public function getLabelColumnSpacing() { return $this->columnSpacing; }
+    public function getLabelRowSpacing()    { return $this->rowSpacing; }
+
+    public function getLabelWidth()  { return $this->labelWidth; }
+    public function getLabelHeight() { return $this->labelHeight; }
+
+    public function getLabelBorder() { return 0; }
+}
+
+?>
\ No newline at end of file
diff --git a/app/Models/Labels/Sheets/Avery/_3490_A.php b/app/Models/Labels/Sheets/Avery/_3490_A.php
new file mode 100644
index 0000000000..c558e22292
--- /dev/null
+++ b/app/Models/Labels/Sheets/Avery/_3490_A.php
@@ -0,0 +1,85 @@
+<?php
+
+namespace App\Models\Labels\Sheets\Avery;
+
+
+class _3490_A extends _3490
+{
+    private const BARCODE_MARGIN =   0.075;
+    private const TAG_SIZE       =   0.125;
+    private const TITLE_SIZE     =   0.140;
+    private const TITLE_MARGIN   =   0.040;
+    private const LABEL_SIZE     =   0.090;
+    private const LABEL_MARGIN   =  -0.015;
+    private const FIELD_SIZE     =   0.150;
+    private const FIELD_MARGIN   =   0.012;
+
+    public function getUnit() { return 'in'; }
+
+    public function getLabelMarginTop()    { return 0.06; }
+    public function getLabelMarginBottom() { return 0.06; }
+    public function getLabelMarginLeft()   { return 0.06; }
+    public function getLabelMarginRight()  { return 0.06; }
+
+    public function getSupportAssetTag()  { return false; }
+    public function getSupport1DBarcode() { return false; }
+    public function getSupport2DBarcode() { return true; }
+    public function getSupportFields()    { return 3; }
+    public function getSupportLogo()      { return false; }
+    public function getSupportTitle()     { return true; }
+
+    public function preparePDF($pdf) {}
+
+    public function write($pdf, $record) {
+        $pa = $this->getLabelPrintableArea();
+
+        $currentX = $pa->x1;
+        $currentY = $pa->y1;
+        $usableWidth = $pa->w;
+        $usableHeight = $pa->h;
+
+        if ($record->has('title')) {
+            static::writeText(
+                $pdf, $record->get('title'),
+                $pa->x1, $pa->y1,
+                'freesans', '', self::TITLE_SIZE, 'C',
+                $pa->w, self::TITLE_SIZE, true, 0
+            );
+            $currentY += self::TITLE_SIZE + self::TITLE_MARGIN;
+            $usableHeight -= self::TITLE_SIZE + self::TITLE_MARGIN;
+        }
+
+        $barcodeSize = $usableHeight;
+        if ($record->has('barcode2d')) {
+            static::write2DBarcode(
+                $pdf, $record->get('barcode2d')->content, $record->get('barcode2d')->type,
+                $currentX, $currentY,
+                $barcodeSize, $barcodeSize
+            );
+            $currentX += $barcodeSize + self::BARCODE_MARGIN;
+            $usableWidth -= $barcodeSize + self::BARCODE_MARGIN;
+        }
+
+        foreach ($record->get('fields') as $field) {
+            static::writeText(
+                $pdf, $field['label'],
+                $currentX, $currentY,
+                'freesans', '', self::LABEL_SIZE, 'L',
+                $usableWidth, self::LABEL_SIZE, true, 0
+            );
+            $currentY += self::LABEL_SIZE + self::LABEL_MARGIN;
+
+            static::writeText(
+                $pdf, $field['value'],
+                $currentX, $currentY,
+                'freemono', 'B', self::FIELD_SIZE, 'L',
+                $usableWidth, self::FIELD_SIZE, true, 0, 0.01
+            );
+            $currentY += self::FIELD_SIZE + self::FIELD_MARGIN;
+        }
+
+    }
+}
+
+
+?>
\ No newline at end of file
diff --git a/app/Models/Labels/Sheets/Avery/_5520_B.php b/app/Models/Labels/Sheets/Avery/_5520_B.php
new file mode 100644
index 0000000000..eb6494e0aa
--- /dev/null
+++ b/app/Models/Labels/Sheets/Avery/_5520_B.php
@@ -0,0 +1,84 @@
+<?php
+
+namespace App\Models\Labels\Sheets\Avery;
+
+
+class _5520_B extends _5520
+{
+    private const BARCODE_SIZE   =   0.20;
+    private const BARCODE_MARGIN =   1.40;
+    private const TAG_SIZE       =   0.125;
+    private const TITLE_SIZE     =   0.140;
+    private const TITLE_MARGIN   =   0.025;
+    private const LABEL_SIZE     =   0.090;
+    private const LABEL_MARGIN   =  -0.015;
+    private const FIELD_SIZE     =   0.150;
+    private const FIELD_MARGIN   =   0.012;
+
+    public function getUnit() { return 'in'; }
+
+    public function getLabelMarginTop()    { return 0.06; }
+    public function getLabelMarginBottom() { return 0.06; }
+    public function getLabelMarginLeft()   { return 0.06; }
+    public function getLabelMarginRight()  { return 0.06; }
+
+    public function getSupportAssetTag()  { return false; }
+    public function getSupport1DBarcode() { return true; }
+    public function getSupport2DBarcode() { return false; }
+    public function getSupportFields()    { return 2; }
+    public function getSupportLogo()      { return false; }
+    public function getSupportTitle()     { return true; }
+
+    public function preparePDF($pdf) {}
+
+    public function write($pdf, $record) {
+        $pa = $this->getLabelPrintableArea();
+
+        $currentX = $pa->x1;
+        $currentY = $pa->y1;
+        $usableWidth = $pa->w;
+        $usableHeight = $pa->h;
+
+        if ($record->has('title')) {
+            static::writeText(
+                $pdf, $record->get('title'),
+                $pa->x1, $pa->y1,
+                'freesans', '', self::TITLE_SIZE, 'C',
+                $pa->w, self::TITLE_SIZE, true, 0
+            );
+            $currentY += self::TITLE_SIZE + self::TITLE_MARGIN;
+            $usableHeight -= self::TITLE_SIZE + self::TITLE_MARGIN;
+        }
+
+        if ($record->has('barcode1d')) {
+            static::write1DBarcode(
+                $pdf, $record->get('barcode1d')->content, $record->get('barcode1d')->type,
+                $pa->x1, $pa->y2 - self::BARCODE_SIZE, 
+                $usableWidth, self::BARCODE_SIZE
+            );
+            $usableHeight -= self::BARCODE_SIZE + self::BARCODE_MARGIN;
+        }
+
+        foreach ($record->get('fields') as $field) {
+            static::writeText(
+                $pdf, $field['label'],
+                $currentX, $currentY,
+                'freesans', '', self::LABEL_SIZE, 'L',
+                $usableWidth, self::LABEL_SIZE, true, 0
+            );
+            $currentY += self::LABEL_SIZE + self::LABEL_MARGIN;
+
+            static::writeText(
+                $pdf, $field['value'],
+                $currentX, $currentY,
+                'freemono', 'B', self::FIELD_SIZE, 'L',
+                $usableWidth, self::FIELD_SIZE, true, 0, 0.01
+            );
+            $currentY += self::FIELD_SIZE + self::FIELD_MARGIN;
+        }
+
+    }
+}
+
+
+?>
\ No newline at end of file
diff --git a/app/Models/Labels/Tapes/Brother/TZe_24mm_D.php b/app/Models/Labels/Tapes/Brother/TZe_24mm_D.php
new file mode 100644
index 0000000000..990a615e53
--- /dev/null
+++ b/app/Models/Labels/Tapes/Brother/TZe_24mm_D.php
@@ -0,0 +1,118 @@
+<?php
+
+namespace App\Models\Labels\Tapes\Brother;
+
+class TZe_24mm_D extends TZe_24mm
+{
+    private const BARCODE_MARGIN =   1.40;
+    private const TAG_SIZE       =   2.80;
+    private const TITLE_SIZE     =   2.80;
+    private const TITLE_MARGIN   =   0.50;
+    private const LABEL_SIZE     =   2.50;
+    private const LABEL_MARGIN   = - 0.35;
+    private const FIELD_SIZE     =   2.50;
+    private const FIELD_MARGIN   =   0.35;
+    private const BARCODE1D_SIZE =   3.00;  // Size for the C128 barcode at bottom
+
+    public function getUnit()  { return 'mm'; }
+    public function getWidth() { return 65.0; }
+    public function getSupportAssetTag()  { return true; }
+    public function getSupport1DBarcode() { return true; }
+    public function getSupport2DBarcode() { return true; }
+    public function getSupportFields()    { return 3; }
+    public function getSupportLogo()      { return false; }
+    public function getSupportTitle()     { return true; }
+
+    public function preparePDF($pdf) {}
+
+    public function write($pdf, $record) {
+        $pa = $this->getPrintableArea();
+
+        $currentX = $pa->x1;
+        $currentY = $pa->y1;
+        $usableWidth = $pa->w;
+
+        // Reserve space at bottom for 1D barcode
+        $usableHeight = $pa->h - self::BARCODE1D_SIZE;
+        $barcodeSize = $usableHeight - self::TAG_SIZE;
+
+        if ($record->has('barcode2d')) {
+            static::writeText(
+                $pdf, $record->get('tag'),
+                $pa->x1, $pa->y2 - self::TAG_SIZE - self::BARCODE1D_SIZE,
+                'freemono', 'b', self::TAG_SIZE, 'C',
+                $barcodeSize, self::TAG_SIZE, true, 0
+            );
+            static::write2DBarcode(
+                $pdf, $record->get('barcode2d')->content, $record->get('barcode2d')->type,
+                $currentX, $currentY,
+                $barcodeSize, $barcodeSize
+            );
+            $currentX += $barcodeSize + self::BARCODE_MARGIN;
+            $usableWidth -= $barcodeSize + self::BARCODE_MARGIN;
+        } else {
+            static::writeText(
+                $pdf, $record->get('tag'),
+                $pa->x1, $pa->y2 - self::TAG_SIZE - self::BARCODE1D_SIZE,
+                'freemono', 'b', self::TAG_SIZE, 'R',
+                $usableWidth, self::TAG_SIZE, true, 0
+            );
+        }
+
+        if ($record->has('title')) {
+            static::writeText(
+                $pdf, $record->get('title'),
+                $currentX, $currentY,
+                'freesans', '', self::TITLE_SIZE, 'L',
+                $usableWidth, self::TITLE_SIZE, true, 0
+            );
+            $currentY += self::TITLE_SIZE + self::TITLE_MARGIN;
+        }
+
+        foreach ($record->get('fields') as $field) {
+            if (!empty($field['label']) && $field['label'] !== "\u{200B}") {
+                // Write label and value on the same line
+                // Calculate label width with proportional character spacing
+                $labelWidth = $pdf->GetStringWidth($field['label'], 'freemono', '', self::LABEL_SIZE);
+                $charCount = strlen($field['label']);
+                $spacingPerChar = 0.5;
+                $totalSpacing = $charCount * $spacingPerChar;
+                $adjustedWidth = $labelWidth + $totalSpacing;
+
+                static::writeText(
+                    $pdf, $field['label'],
+                    $currentX, $currentY,
+                    'freemono', 'B', self::LABEL_SIZE, 'L',
+                    $adjustedWidth, self::LABEL_SIZE, true, 0, $spacingPerChar
+                );
+
+                static::writeText(
+                    $pdf, $field['value'],
+                    $currentX + $adjustedWidth + 2, $currentY,
+                    'freemono', 'B', self::FIELD_SIZE, 'L',
+                    $usableWidth - $adjustedWidth - 2, self::FIELD_SIZE, true, 0, 0.3
+                );
+            } else {
+
+                // Label is empty, so write value only.
+                static::writeText(
+                    $pdf, $field['value'],
+                    $currentX, $currentY, // No offset
+                    'freemono', 'B', self::FIELD_SIZE, 'L',
+                    $usableWidth, self::FIELD_SIZE, true, 0, 0.3
+                );
+            }
+
+            $currentY += max(self::LABEL_SIZE, self::FIELD_SIZE) + self::FIELD_MARGIN;
+        }
+
+        // Add C128 barcode at the bottom
+        if ($record->has('barcode1d')) {
+            static::write1DBarcode(
+                $pdf, $record->get('barcode1d')->content, $record->get('barcode1d')->type,
+                $pa->x1, $pa->y2 - self::BARCODE1D_SIZE,
+                $pa->w, self::BARCODE1D_SIZE
+            );
+        }
+    }
+}
diff --git a/app/Models/Labels/Tapes/Brother/TZe_62mm_Landscape.php b/app/Models/Labels/Tapes/Brother/TZe_62mm_Landscape.php
new file mode 100644
index 0000000000..2069927a34
--- /dev/null
+++ b/app/Models/Labels/Tapes/Brother/TZe_62mm_Landscape.php
@@ -0,0 +1,23 @@
+<?php
+
+namespace App\Models\Labels\Tapes\Brother;
+
+use App\Helpers\Helper;
+use App\Models\Labels\Label;
+
+/*
+ * Rotated Label (print direction = landscape) for 62mm wide labels
+ */
+abstract class TZe_62mm_Landscape extends Label
+{
+    private const WIDTH        = 62.00;
+    private const MARGIN_SIDES =  1.50;
+    private const MARGIN_ENDS  =  1.50;
+
+    public function getWidth()        { return Helper::convertUnit(self::WIDTH, 'mm', $this->getUnit()); }
+    public function getMarginTop()    { return Helper::convertUnit(self::MARGIN_SIDES, 'mm', $this->getUnit()); }
+    public function getMarginBottom() { return Helper::convertUnit(self::MARGIN_SIDES, 'mm', $this->getUnit());}
+    public function getMarginLeft()   { return Helper::convertUnit(self::MARGIN_ENDS, 'mm', $this->getUnit()); }
+    public function getMarginRight()  { return Helper::convertUnit(self::MARGIN_ENDS, 'mm', $this->getUnit()); }
+    public function getRotation()     { return 90; }
+}
diff --git a/app/Models/Labels/Tapes/Brother/TZe_62mm_Landscape_A.php b/app/Models/Labels/Tapes/Brother/TZe_62mm_Landscape_A.php
new file mode 100644
index 0000000000..3a4d6da2c7
--- /dev/null
+++ b/app/Models/Labels/Tapes/Brother/TZe_62mm_Landscape_A.php
@@ -0,0 +1,106 @@
+<?php
+
+namespace App\Models\Labels\Tapes\Brother;
+
+class TZe_62mm_Landscape_A extends TZe_62mm_Landscape
+{
+    public function getUnit()             { return 'mm'; }
+    public function getHeight()           { return 31.50; }
+    public function getSupportAssetTag()  { return true; }
+    public function getSupport1DBarcode() { return true; }
+    public function getSupport2DBarcode() { return true; }
+    public function getSupportFields()    { return 2; }
+    public function getSupportLogo()      { return true; }
+    public function getSupportTitle()     { return true; }
+
+    private const BARCODE1D_HEIGHT =   3.00;
+    private const BARCODE1D_MARGIN =   3.00;
+    private const BARCODE2D_SIZE   =  20.00;
+    private const BARCODE2D_MARGIN =   1.50;
+    private const TAG_SIZE         =   3.00;
+    private const LOGO_HEIGHT      =  10.00;
+    private const LOGO_MARGIN      =   1.50;
+    private const TITLE_SIZE       =   3.00;
+    private const TITLE_MARGIN     =   0.50;
+    private const LABEL_SIZE       =   2.00;
+    private const LABEL_MARGIN     = - 0.35;
+    private const FIELD_SIZE       =   3.00;
+    private const FIELD_MARGIN     =   0.10;
+
+    public function preparePDF($pdf) {}
+
+    public function write($pdf, $record) {
+        $pa = $this->getPrintableArea();
+
+        $currentX = $pa->x1;
+        $currentY = $pa->y1;
+
+        // Wide 1D barcode on top
+
+        if ($record->has('barcode1d')) {
+            static::write1DBarcode(
+                $pdf, $record->get('barcode1d')->content, $record->get('barcode1d')->type,
+                $currentX, $currentY, $pa->w, self::BARCODE1D_HEIGHT
+            );
+            $currentY = self::BARCODE1D_HEIGHT + self::BARCODE1D_MARGIN;
+        }
+
+        // Left column
+
+        if ($record->has('barcode2d')) {
+            $columnY = $currentY;
+            static::write2DBarcode(
+                $pdf, $record->get('barcode2d')->content, $record->get('barcode2d')->type,
+                $currentX, $columnY,
+                self::BARCODE2D_SIZE, self::BARCODE2D_SIZE
+            );
+            $columnY += self::BARCODE2D_SIZE + self::BARCODE2D_MARGIN;
+            static::writeText(
+                $pdf, $record->get('tag'),
+                $currentX, $columnY,
+                'freemono', 'b', self::TAG_SIZE, 'C',
+                self::BARCODE2D_SIZE, self::TAG_SIZE, true, 0
+            );
+            $currentX += self::BARCODE2D_SIZE + self::BARCODE2D_MARGIN;
+        }
+
+        // Right column
+        if ($record->get('logo')) {
+            static::writeImage(
+                $pdf, $record->get('logo'),
+                $currentX, $currentY,
+                $pa->w - $currentX, self::LOGO_HEIGHT,
+                'L', 'T', 300, true, false, 0
+            );
+            $currentY += self::LOGO_HEIGHT + self::LOGO_MARGIN;
+        }
+
+        if ($record->has('title')) {
+            static::writeText(
+                $pdf, $record->get('title'),
+                $currentX, $currentY,
+                'freesans', '', self::TITLE_SIZE, 'L',
+                $pa->w - $currentX, self::TITLE_SIZE, true, 0
+            );
+            $currentY += self::TITLE_SIZE + self::TITLE_MARGIN;
+        }
+
+        foreach ($record->get('fields') as $field) {
+            static::writeText(
+                $pdf, $field['label'],
+                $currentX, $currentY,
+                'freesans', '', self::LABEL_SIZE, 'L',
+                $pa->w - $currentX, self::LABEL_SIZE, true, 0, 0
+            );
+            $currentY += self::LABEL_SIZE + self::LABEL_MARGIN;
+
+            static::writeText(
+                $pdf, $field['value'],
+                $currentX, $currentY,
+                'freemono', 'B', self::FIELD_SIZE, 'L',
+                $pa->w - $currentX, self::FIELD_SIZE, true, 0, 0.3
+            );
+            $currentY += self::FIELD_SIZE + self::FIELD_MARGIN;
+        }
+    }
+}
diff --git a/app/Models/Labels/Tapes/Dymo/LabelWriter_1933081.php b/app/Models/Labels/Tapes/Dymo/LabelWriter_1933081.php
index 9b56012f7a..9f5fa735e4 100644
--- a/app/Models/Labels/Tapes/Dymo/LabelWriter_1933081.php
+++ b/app/Models/Labels/Tapes/Dymo/LabelWriter_1933081.php
@@ -49,14 +49,7 @@ class LabelWriter_1933081 extends LabelWriter
             );
             $currentX += $barcodeSize + self::BARCODE_MARGIN;
             $usableWidth -= $barcodeSize + self::BARCODE_MARGIN;
-        } else {
-            static::writeText(
-                $pdf, $record->get('tag'),
-                $pa->x1, $pa->y2 - self::TAG_SIZE,
-                'freesans', 'b', self::TAG_SIZE, 'R',
-                $usableWidth, self::TAG_SIZE, true, 0
-            );
-        }
+        } 
 
         if ($record->has('title')) {
             static::writeText(
diff --git a/app/Models/Labels/Tapes/Dymo/LabelWriter_2112283.php b/app/Models/Labels/Tapes/Dymo/LabelWriter_2112283.php
index e1305bd068..117486a8e5 100644
--- a/app/Models/Labels/Tapes/Dymo/LabelWriter_2112283.php
+++ b/app/Models/Labels/Tapes/Dymo/LabelWriter_2112283.php
@@ -49,13 +49,6 @@ class LabelWriter_2112283 extends LabelWriter
             );
             $currentX += $barcodeSize + self::BARCODE_MARGIN;
             $usableWidth -= $barcodeSize + self::BARCODE_MARGIN;
-        } else {
-            static::writeText(
-                $pdf, $record->get('tag'),
-                $pa->x1, $pa->y2 - self::TAG_SIZE,
-                'freesans', 'b', self::TAG_SIZE, 'R',
-                $usableWidth, self::TAG_SIZE, true, 0
-            );
         }
 
         if ($record->has('title')) {
diff --git a/app/Models/Labels/Tapes/Dymo/LabelWriter_30252.php b/app/Models/Labels/Tapes/Dymo/LabelWriter_30252.php
index d5f0e8d122..ed8074547b 100644
--- a/app/Models/Labels/Tapes/Dymo/LabelWriter_30252.php
+++ b/app/Models/Labels/Tapes/Dymo/LabelWriter_30252.php
@@ -50,13 +50,6 @@ class LabelWriter_30252 extends LabelWriter
             );
             $currentX += $barcodeSize + self::BARCODE_MARGIN;
             $usableWidth -= $barcodeSize + self::BARCODE_MARGIN;
-        } else {
-            static::writeText(
-                $pdf, $record->get('tag'),
-                $pa->x1, $pa->y2 - self::TAG_SIZE,
-                'freemono', 'b', self::TAG_SIZE, 'R',
-                $usableWidth, self::TAG_SIZE, true, 0
-            );
         }
 
         if ($record->has('title')) {
diff --git a/app/Models/Ldap.php b/app/Models/Ldap.php
index dd3920b56a..f71f926a93 100644
--- a/app/Models/Ldap.php
+++ b/app/Models/Ldap.php
@@ -229,6 +229,7 @@ class Ldap extends Model
         $item['department'] = $ldapattributes[$ldap_result_dept][0] ?? '';
         $item['manager'] = $ldapattributes[$ldap_result_manager][0] ?? '';
         $item['location'] = $ldapattributes[$ldap_result_location][0] ?? '';
+        $item['locale'] = app()->getLocale();
 
         return $item;
     }
@@ -239,7 +240,7 @@ class Ldap extends Model
      * @author [A. Gianotto] [<snipe@snipe.net>]
      * @since [v3.0]
      * @param $ldapatttibutes
-     * @return array|bool
+     * @return User | bool
      */
     public static function createUserFromLdap($ldapatttibutes, $password)
     {
@@ -252,6 +253,7 @@ class Ldap extends Model
             $user->last_name = $item['lastname'];
             $user->username = $item['username'];
             $user->email = $item['email'];
+            $user->locale = $item['locale'];
             $user->password = $user->noPassword();
 
             if (Setting::getSettings()->ldap_pw_sync == '1') {
@@ -281,9 +283,10 @@ class Ldap extends Model
      * @param $base_dn
      * @param $count
      * @param $filter
+     * @param $attributes
      * @return array|bool
      */
-    public static function findLdapUsers($base_dn = null, $count = -1, $filter = null)
+    public static function findLdapUsers($base_dn = null, $count = -1, $filter = null, $attributes = [])
     {
         $ldapconn = self::connectToLdap();
         self::bindAdminToLdap($ldapconn);
@@ -317,7 +320,7 @@ class Ldap extends Model
             //if($count == -1) { //count is -1 means we have to employ paging to query the entire directory
                 $ldap_controls = [['oid' => LDAP_CONTROL_PAGEDRESULTS, 'iscritical' => false, 'value' => ['size'=> $count == -1||$count>$page_size ? $page_size : $count, 'cookie' => $cookie]]];
             //}
-            $search_results = ldap_search($ldapconn, $base_dn, $filter, [], 0, /* $page_size */ -1, -1, LDAP_DEREF_NEVER, $ldap_controls); // TODO - I hate the @, and I hate that we get a full page even if we ask for 10 records. Can we use an ldap_control?
+            $search_results = ldap_search($ldapconn, $base_dn, $filter, $attributes, 0, /* $page_size */ -1, -1, LDAP_DEREF_NEVER, $ldap_controls); // TODO - I hate the @, and I hate that we get a full page even if we ask for 10 records. Can we use an ldap_control?
             Log::debug("LDAP search executed successfully.");
             if (! $search_results) {
                 return redirect()->route('users.index')->with('error', trans('admin/users/message.error.ldap_could_not_search').ldap_error($ldapconn)); // TODO this is never called in any routed context - only from the Artisan command. So this redirect will never work.
@@ -338,7 +341,7 @@ class Ldap extends Model
                 $cookie = '';
             }
             // Empty cookie means last page
-        
+
             // Get results from page
             $results = ldap_get_entries($ldapconn, $search_results);
             if (! $results) {
diff --git a/app/Models/License.php b/app/Models/License.php
index d8bc3f03b1..0997c1e57b 100755
--- a/app/Models/License.php
+++ b/app/Models/License.php
@@ -50,7 +50,7 @@ class License extends Depreciable
         'category_id' => 'required|exists:categories,id',
         'company_id' => 'integer|nullable',
         'purchase_cost'=> 'numeric|nullable|gte:0',
-        'purchase_date'   => 'date_format:Y-m-d|nullable|max:10',
+        'purchase_date'   => 'date_format:Y-m-d|nullable|max:10|required_with:depreciation_id',
         'expiration_date'   => 'date_format:Y-m-d|nullable|max:10',
         'termination_date'   => 'date_format:Y-m-d|nullable|max:10',
         'min_amt'   => 'numeric|nullable|gte:0',
@@ -81,8 +81,7 @@ class License extends Depreciable
         'serial',
         'supplier_id',
         'termination_date',
-        'free_seat_count',
-        'user_id',
+        'created_by',
         'min_amt',
     ];
 
@@ -184,8 +183,8 @@ class License extends Depreciable
             $logAction = new Actionlog;
             $logAction->item_type = self::class;
             $logAction->item_id = $license->id;
-            $logAction->user_id = Auth::id() ?: 1; // We don't have an id while running the importer from CLI.
-            $logAction->note = "deleted ${change} seats";
+            $logAction->created_by = auth()->id() ?: 1; // We don't have an id while running the importer from CLI.
+            $logAction->note = "deleted {$change} seats";
             $logAction->target_id = null;
             $logAction->logaction('delete seats');
 
@@ -196,7 +195,7 @@ class License extends Depreciable
         $licenseInsert = [];
         for ($i = $oldSeats; $i < $newSeats; $i++) {
             $licenseInsert[] = [
-                'user_id' => Auth::id(),
+                'created_by' => auth()->id(),
                 'license_id' => $license->id,
                 'created_at' => now(),
                 'updated_at' => now()
@@ -216,8 +215,8 @@ class License extends Depreciable
             $logAction = new Actionlog();
             $logAction->item_type = self::class;
             $logAction->item_id = $license->id;
-            $logAction->user_id = Auth::id() ?: 1; // Importer.
-            $logAction->note = "added ${change} seats";
+            $logAction->created_by = auth()->id() ?: 1; // Importer.
+            $logAction->note = "added {$change} seats";
             $logAction->target_id = null;
             $logAction->logaction('add seats');
         }
@@ -434,7 +433,7 @@ class License extends Depreciable
      */
     public function adminuser()
     {
-        return $this->belongsTo(\App\Models\User::class, 'user_id');
+        return $this->belongsTo(\App\Models\User::class, 'created_by');
     }
 
     /**
@@ -736,4 +735,12 @@ class License extends Depreciable
         return $query->leftJoin('companies as companies', 'licenses.company_id', '=', 'companies.id')->select('licenses.*')
             ->orderBy('companies.name', $order);
     }
-}
\ No newline at end of file
+
+    /**
+     * Query builder scope to order on the user that created it
+     */
+    public function scopeOrderByCreatedBy($query, $order)
+    {
+        return $query->leftJoin('users as admin_sort', 'licenses.created_by', '=', 'admin_sort.id')->select('licenses.*')->orderBy('admin_sort.first_name', $order)->orderBy('admin_sort.last_name', $order);
+    }
+}
diff --git a/app/Models/LicenseSeat.php b/app/Models/LicenseSeat.php
index 397a141468..d4f2b13ad5 100755
--- a/app/Models/LicenseSeat.php
+++ b/app/Models/LicenseSeat.php
@@ -30,6 +30,7 @@ class LicenseSeat extends SnipeModel implements ICompanyableChild
     protected $fillable = [
         'assigned_to',
         'asset_id',
+        'notes',
     ];
 
     use Acceptable;
diff --git a/app/Models/Location.php b/app/Models/Location.php
index 67131902a1..52236092d3 100755
--- a/app/Models/Location.php
+++ b/app/Models/Location.php
@@ -4,6 +4,7 @@ namespace App\Models;
 
 use App\Http\Traits\UniqueUndeletedTrait;
 use App\Models\Asset;
+use App\Models\Setting;
 use App\Models\SnipeModel;
 use App\Models\Traits\Searchable;
 use App\Models\User;
@@ -18,6 +19,8 @@ use Watson\Validating\ValidatingTrait;
 class Location extends SnipeModel
 {
     use HasFactory;
+    use CompanyableTrait;
+    use Loggable;
 
     protected $presenter = \App\Presenters\LocationPresenter::class;
     use Presentable;
@@ -33,16 +36,18 @@ class Location extends SnipeModel
         'country'       => 'min:2|max:191|nullable',
         'zip'           => 'max:10|nullable',
         'manager_id'    => 'exists:users,id|nullable',
-        'parent_id'     => 'non_circular:locations,id',
+        'parent_id'     => 'nullable|exists:locations,id|non_circular:locations,id',
+        'company_id'    => 'integer|nullable|exists:companies,id',
     ];
 
     protected $casts = [
         'parent_id'     => 'integer',
         'manager_id'    => 'integer',
+        'company_id'    => 'integer',
     ];
 
     /**
-     * Whether the model should inject it's identifier to the unique
+     * Whether the model should inject its identifier to the unique
      * validation rules before attempting validation. If this property
      * is not set in the model it will default to true.
      *
@@ -72,6 +77,8 @@ class Location extends SnipeModel
         'currency',
         'manager_id',
         'image',
+        'company_id',
+        'notes',
     ];
     protected $hidden = ['user_id'];
 
@@ -82,7 +89,7 @@ class Location extends SnipeModel
      *
      * @var array
      */
-    protected $searchableAttributes = ['name', 'address', 'city', 'state', 'zip', 'created_at', 'ldap_ou', 'phone', 'fax'];
+    protected $searchableAttributes = ['name', 'address', 'city', 'state', 'zip', 'created_at', 'ldap_ou', 'phone', 'fax', 'notes'];
 
     /**
      * The relations and their attributes that should be included when searching the model.
@@ -90,7 +97,8 @@ class Location extends SnipeModel
      * @var array
      */
     protected $searchableRelations = [
-      'parent' => ['name'],
+      'parent'  => ['name'],
+      'company' => ['name']
     ];
 
 
@@ -108,10 +116,11 @@ class Location extends SnipeModel
     {
 
         return Gate::allows('delete', $this)
-                && ($this->assets_count === 0)
-                && ($this->assigned_assets_count === 0)
-                && ($this->children_count === 0)
-                && ($this->users_count === 0);
+                && ($this->assets_count == 0)
+                && ($this->assigned_assets_count == 0)
+                && ($this->children_count == 0)
+                && ($this->accessories_count == 0)
+                && ($this->users_count == 0);
     }
 
     /**
@@ -126,6 +135,17 @@ class Location extends SnipeModel
         return $this->hasMany(\App\Models\User::class, 'location_id');
     }
 
+    /**
+     * Establishes the location -> admin user relationship
+     *
+     * @author A. Gianotto <snipe@snipe.net>
+     * @return \Illuminate\Database\Eloquent\Relations\Relation
+     */
+    public function adminuser()
+    {
+        return $this->belongsTo(\App\Models\User::class, 'created_by');
+    }
+
     /**
      * Find assets with this location as their location_id
      *
@@ -213,6 +233,17 @@ class Location extends SnipeModel
             ->with('parent');
     }
 
+    /**
+    * Establishes the locations -> company relationship
+    *
+    * @author [T. Regnery] [<tobias.regnery@gmail.com>]
+    * @since [v7.0]
+    * @return \Illuminate\Database\Eloquent\Relations\Relation
+    */
+    public function company()
+    {
+        return $this->belongsTo(\App\Models\Company::class, 'company_id');
+    }
 
     /**
      * Find the manager of a location
@@ -252,11 +283,40 @@ class Location extends SnipeModel
         return $this->morphMany(\App\Models\Asset::class, 'assigned', 'assigned_type', 'assigned_to')->withTrashed();
     }
 
+    /**
+     * Establishes the accessory -> location assignment relationship
+     *
+     * @author A. Gianotto <snipe@snipe.net>
+     * @since [v3.0]
+     * @return \Illuminate\Database\Eloquent\Relations\Relation
+     */
+    public function assignedAccessories()
+    {
+        return $this->morphMany(\App\Models\AccessoryCheckout::class, 'assigned', 'assigned_type', 'assigned_to');
+    }
+
     public function setLdapOuAttribute($ldap_ou)
     {
         return $this->attributes['ldap_ou'] = empty($ldap_ou) ? null : $ldap_ou;
     }
 
+    /**
+     * Get uploads for this location
+     *
+     * @author [A. Gianotto] [<snipe@snipe.net>]
+     * @since [v4.0]
+     * @return \Illuminate\Database\Eloquent\Relations\Relation
+     */
+    public function uploads()
+    {
+        return $this->hasMany('\App\Models\Actionlog', 'item_id')
+            ->where('item_type', '=', Location::class)
+            ->where('action_type', '=', 'uploaded')
+            ->whereNotNull('filename')
+            ->orderBy('created_at', 'desc');
+    }
+
+
     /**
      * Query builder scope to order on parent
      *
@@ -312,4 +372,26 @@ class Location extends SnipeModel
     {
         return $query->leftJoin('users as location_user', 'locations.manager_id', '=', 'location_user.id')->orderBy('location_user.first_name', $order)->orderBy('location_user.last_name', $order);
     }
+
+   /**
+    * Query builder scope to order on company
+    *
+    * @param  \Illuminate\Database\Query\Builder  $query  Query builder instance
+    * @param  text                              $order       Order
+    *
+    * @return \Illuminate\Database\Query\Builder          Modified query builder
+    */
+    public function scopeOrderCompany($query, $order)
+    {
+        return $query->leftJoin('companies as company_sort', 'locations.company_id', '=', 'company_sort.id')->orderBy('company_sort.name', $order);
+    }
+
+    /**
+     * Query builder scope to order on the user that created it
+     */
+    public function scopeOrderByCreatedByName($query, $order)
+    {
+        return $query->leftJoin('users as admin_sort', 'locations.created_by', '=', 'admin_sort.id')->select('locations.*')->orderBy('admin_sort.first_name', $order)->orderBy('admin_sort.last_name', $order);
+    }
+
 }
diff --git a/app/Models/Loggable.php b/app/Models/Loggable.php
index f855b41253..54aeac5a44 100644
--- a/app/Models/Loggable.php
+++ b/app/Models/Loggable.php
@@ -6,6 +6,8 @@ use App\Models\Setting;
 use App\Notifications\AuditNotification;
 use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\Log;
+use Illuminate\Support\Str;
+use Osama\LaravelTeamsNotification\TeamsNotification;
 
 trait Loggable
 {
@@ -34,10 +36,14 @@ trait Loggable
      */
     public function logCheckout($note, $target, $action_date = null, $originalValues = [])
     {
+
         $log = new Actionlog;
+
+        $fields_array = [];
+
         $log = $this->determineLogItemType($log);
-        if (Auth::user()) {
-            $log->user_id = Auth::user()->id;
+        if (auth()->user()) {
+            $log->created_by = auth()->id();
         }
 
         if (! isset($target)) {
@@ -55,6 +61,7 @@ trait Loggable
         $log->target_type = get_class($target);
         $log->target_id = $target->id;
 
+
         // Figure out what the target is
         if ($log->target_type == Location::class) {
             $log->location_id = $target->id;
@@ -64,24 +71,41 @@ trait Loggable
             $log->location_id = $target->location_id;
         }
 
+        if (static::class == Asset::class) {
+            if ($asset = Asset::find($log->item_id)) {
+
+                // add the custom fields that were changed
+                if ($asset->model->fieldset) {
+                    $fields_array = [];
+                    foreach ($asset->model->fieldset->fields as $field) {
+                        if ($field->display_checkout == 1) {
+                            $fields_array[$field->db_column] = $asset->{$field->db_column};
+                        }
+                    }
+                }
+            }
+        }
+
         $log->note = $note;
         $log->action_date = $action_date;
 
-        if (! $log->action_date) {
-            $log->action_date = date('Y-m-d H:i:s');
-        }
 
         $changed = [];
-        $originalValues = array_intersect_key($originalValues, array_flip(['action_date','name','status_id','location_id','expected_checkin']));
+        $array_to_flip = array_keys($fields_array);
+        $array_to_flip = array_merge($array_to_flip, ['name','status_id','location_id','expected_checkin']);
+        $originalValues = array_intersect_key($originalValues, array_flip($array_to_flip));
+
 
         foreach ($originalValues as $key => $value) {
+            // TODO - action_date isn't a valid attribute of any first-class object, so we might want to remove this?
             if ($key == 'action_date' && $value != $action_date) {
                 $changed[$key]['old'] = $value;
                 $changed[$key]['new'] = is_string($action_date) ? $action_date : $action_date->format('Y-m-d H:i:s');
-            } elseif ($value != $this->getAttributes()[$key]) {
+            } elseif (array_key_exists($key, $this->getAttributes()) && $value != $this->getAttributes()[$key]) {
                 $changed[$key]['old'] = $value;
                 $changed[$key]['new'] = $this->getAttributes()[$key];
             }
+            // NOTE - if the attribute exists in $originalValues, but *not* in ->getAttributes(), it isn't added to $changed
         }
 
         if (!empty($changed)){
@@ -117,9 +141,10 @@ trait Loggable
      */
     public function logCheckin($target, $note, $action_date = null, $originalValues = [])
     {
-        $settings = Setting::getSettings();
         $log = new Actionlog;
 
+        $fields_array = [];
+
         if($target != null){
             $log->target_type = get_class($target);
             $log->target_id = $target->id;
@@ -136,6 +161,16 @@ trait Loggable
             if (static::class == Asset::class) {
                 if ($asset = Asset::find($log->item_id)) {
                     $asset->increment('checkin_counter', 1);
+
+                    // add the custom fields that were changed
+                    if ($asset->model->fieldset) {
+                        $fields_array = [];
+                        foreach ($asset->model->fieldset->fields as $field) {
+                            if ($field->display_checkin == 1) {
+                                $fields_array[$field->db_column] = $asset->{$field->db_column};
+                            }
+                        }
+                    }
                 }
             }
         }
@@ -144,18 +179,23 @@ trait Loggable
         $log->note = $note;
         $log->action_date = $action_date;
 
-        if (! $log->action_date) {
+        if (!$action_date) {
             $log->action_date = date('Y-m-d H:i:s');
         }
 
-        if (Auth::user()) {
-            $log->user_id = Auth::user()->id;
+        if (auth()->user()) {
+            $log->created_by = auth()->id();
         }
 
         $changed = [];
-        $originalValues = array_intersect_key($originalValues, array_flip(['action_date','name','status_id','location_id','rtd_location_id','expected_checkin']));
+
+        $array_to_flip = array_keys($fields_array);
+        $array_to_flip = array_merge($array_to_flip, ['name','status_id','location_id','expected_checkin']);
+
+        $originalValues = array_intersect_key($originalValues, array_flip($array_to_flip));
 
         foreach ($originalValues as $key => $value) {
+
             if ($key == 'action_date' && $value != $action_date) {
                 $changed[$key]['old'] = $value;
                 $changed[$key]['new'] = is_string($action_date) ? $action_date : $action_date->format('Y-m-d H:i:s');
@@ -171,39 +211,6 @@ trait Loggable
 
         $log->logaction('checkin from');
 
-//        $params = [
-//            'target' => $target,
-//            'item' => $log->item,
-//            'admin' => $log->user,
-//            'note' => $note,
-//            'target_type' => $log->target_type,
-//            'settings' => $settings,
-//        ];
-//
-//
-//        $checkinClass = null;
-//
-//        if (method_exists($target, 'notify')) {
-//            try {
-//                $target->notify(new static::$checkinClass($params));
-//            } catch (\Exception $e) {
-//                Log::debug($e);
-//            }
-//
-//        }
-//
-//        // Send to the admin, if settings dictate
-//        $recipient = new \App\Models\Recipients\AdminRecipient();
-//
-//        if (($settings->admin_cc_email!='') && (static::$checkinClass!='')) {
-//            try {
-//                $recipient->notify(new static::$checkinClass($params));
-//            } catch (\Exception $e) {
-//                Log::debug($e);
-//            }
-//
-//        }
-
         return $log;
     }
 
@@ -212,9 +219,41 @@ trait Loggable
      * @since [v4.0]
      * @return \App\Models\Actionlog
      */
-    public function logAudit($note, $location_id, $filename = null)
+    public function logAudit($note, $location_id, $filename = null, $originalValues = [])
     {
+
         $log = new Actionlog;
+
+        if (static::class == Asset::class) {
+            if ($asset = Asset::find($log->item_id)) {
+                // add the custom fields that were changed
+                if ($asset->model->fieldset) {
+                    $fields_array = [];
+                    foreach ($asset->model->fieldset->fields as $field) {
+                        if ($field->display_audit == 1) {
+                            $fields_array[$field->db_column] = $asset->{$field->db_column};
+                        }
+                    }
+                }
+            }
+        }
+
+        $changed = [];
+
+        unset($originalValues['updated_at'], $originalValues['last_audit_date']);
+        foreach ($originalValues as $key => $value) {
+
+            if ($value != $this->getAttributes()[$key]) {
+                $changed[$key]['old'] = $value;
+                $changed[$key]['new'] = $this->getAttributes()[$key];
+            }
+        }
+
+        if (!empty($changed)){
+            $log->log_meta = json_encode($changed);
+        }
+
+
         $location = Location::find($location_id);
         if (static::class == LicenseSeat::class) {
             $log->item_type = License::class;
@@ -225,18 +264,26 @@ trait Loggable
         }
         $log->location_id = ($location_id) ? $location_id : null;
         $log->note = $note;
-        $log->user_id = Auth::user()->id;
+        $log->created_by = auth()->id();
         $log->filename = $filename;
+        $log->action_date = date('Y-m-d H:i:s');
         $log->logaction('audit');
 
         $params = [
             'item' => $log->item,
             'filename' => $log->filename,
-            'admin' => $log->admin,
+            'admin' => $log->adminuser,
             'location' => ($location) ? $location->name : '',
             'note' => $note,
         ];
-        Setting::getSettings()->notify(new AuditNotification($params));
+        if(Setting::getSettings()->webhook_selected === 'microsoft' && Str::contains(Setting::getSettings()->webhook_endpoint, 'workflows')){
+            $message = AuditNotification::toMicrosoftTeams($params);
+            $notification = new TeamsNotification(Setting::getSettings()->webhook_endpoint);
+            $notification->success()->sendMessage($message[0], $message[1]);
+        }
+        else {
+            Setting::getSettings()->notify(new AuditNotification($params));
+        }
 
         return $log;
     }
@@ -248,9 +295,9 @@ trait Loggable
      */
     public function logCreate($note = null)
     {
-        $user_id = -1;
-        if (Auth::user()) {
-            $user_id = Auth::user()->id;
+        $created_by = -1;
+        if (auth()->user()) {
+            $created_by = auth()->id();
         }
         $log = new Actionlog;
         if (static::class == LicenseSeat::class) {
@@ -261,8 +308,9 @@ trait Loggable
             $log->item_id = $this->id;
         }
         $log->location_id = null;
+        $log->action_date = date('Y-m-d H:i:s');
         $log->note = $note;
-        $log->user_id = $user_id;
+        $log->created_by = $created_by;
         $log->logaction('create');
         $log->save();
 
@@ -284,13 +332,34 @@ trait Loggable
             $log->item_type = static::class;
             $log->item_id = $this->id;
         }
-        $log->user_id = Auth::user()->id;
+        $log->created_by = auth()->id();
         $log->note = $note;
         $log->target_id = null;
         $log->created_at = date('Y-m-d H:i:s');
+        $log->action_date = date('Y-m-d H:i:s');
         $log->filename = $filename;
         $log->logaction('uploaded');
 
         return $log;
     }
+
+    /**
+     * Get latest signature from a specific user
+     *
+     * This just makes the print view a bit cleaner
+     * Returns the latest acceptance ActionLog that contains a signature
+     * from $user or null if there is none
+     *
+     * @param User $user
+     * @return null|Actionlog
+     **/
+    public function getLatestSignedAcceptance(User $user)
+    {
+        return $this->log->where('target_type', User::class)
+            ->where('target_id', $user->id)
+            ->where('action_type', 'accepted')
+            ->where('accept_signature', '!=', null)
+            ->sortByDesc('created_at')
+            ->first();
+    }
 }
diff --git a/app/Models/Manufacturer.php b/app/Models/Manufacturer.php
index 5408d50c36..6d7b010677 100755
--- a/app/Models/Manufacturer.php
+++ b/app/Models/Manufacturer.php
@@ -22,9 +22,9 @@ class Manufacturer extends SnipeModel
     // Declare the rules for the form validation
     protected $rules = [
         'name'   => 'required|min:2|max:255|unique:manufacturers,name,NULL,id,deleted_at,NULL',
-        'url'   => 'url|nullable',
+        'url'   => 'nullable|starts_with:http://,https://,afp://,facetime://,file://,irc://',
         'support_email'   => 'email|nullable',
-        'support_url'   => 'nullable|url',
+        'support_url'   => 'nullable|starts_with:http://,https://,afp://,facetime://,file://,irc://',
         'warranty_lookup_url' => 'nullable|starts_with:http://,https://,afp://,facetime://,file://,irc://'
     ];
 
@@ -53,6 +53,7 @@ class Manufacturer extends SnipeModel
         'support_url',
         'url',
         'warranty_lookup_url',
+        'notes',
     ];
 
     use Searchable;
@@ -62,7 +63,7 @@ class Manufacturer extends SnipeModel
      *
      * @var array
      */
-    protected $searchableAttributes = ['name', 'created_at'];
+    protected $searchableAttributes = ['name', 'created_at', 'notes'];
 
     /**
      * The relations and their attributes that should be included when searching the model.
@@ -74,10 +75,11 @@ class Manufacturer extends SnipeModel
     public function isDeletable()
     {
         return Gate::allows('delete', $this)
-            && ($this->assets()->count() === 0)
-            && ($this->licenses()->count() === 0)
-            && ($this->consumables()->count() === 0)
-            && ($this->accessories()->count() === 0)
+            && (($this->assets_count ?? $this->assets()->count()) === 0)
+            && (($this->licenses_count ?? $this->licenses()->count()) === 0)
+            && (($this->consumables_count ?? $this->consumables()->count()) === 0)
+            && (($this->accessories_count ?? $this->accessories()->count()) === 0)
+            && (($this->components_count ?? $this->components()->count()) === 0)
             && ($this->deleted_at == '');
     }
 
@@ -105,4 +107,23 @@ class Manufacturer extends SnipeModel
     {
         return $this->hasMany(\App\Models\Consumable::class, 'manufacturer_id');
     }
+
+    public function components()
+    {
+        return $this->hasMany(\App\Models\Component::class, 'manufacturer_id');
+    }
+
+    public function adminuser()
+    {
+        return $this->belongsTo(\App\Models\User::class, 'created_by');
+    }
+
+
+    /**
+     * Query builder scope to order on the user that created it
+     */
+    public function scopeOrderByCreatedBy($query, $order)
+    {
+        return $query->leftJoin('users as admin_sort', 'manufacturers.created_by', '=', 'admin_sort.id')->select('manufacturers.*')->orderBy('admin_sort.first_name', $order)->orderBy('admin_sort.last_name', $order);
+    }
 }
diff --git a/app/Models/PredefinedKit.php b/app/Models/PredefinedKit.php
index 1bf6cb098b..36790a1fc7 100644
--- a/app/Models/PredefinedKit.php
+++ b/app/Models/PredefinedKit.php
@@ -4,6 +4,7 @@ namespace App\Models;
 
 use App\Models\Traits\Searchable;
 use App\Presenters\Presentable;
+use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Validation\Rule;
 use Watson\Validating\ValidatingTrait;
 
@@ -16,6 +17,7 @@ use Watson\Validating\ValidatingTrait;
 class PredefinedKit extends SnipeModel
 {
     protected $presenter = \App\Presenters\PredefinedKitPresenter::class;
+    use HasFactory;
     use Presentable;
     protected $table = 'kits';
 
@@ -133,6 +135,13 @@ class PredefinedKit extends SnipeModel
      */
     protected $searchableRelations = [];
 
+
+    public function adminuser()
+    {
+        return $this->belongsTo(\App\Models\User::class, 'created_by');
+    }
+
+
     /**
      * Establishes the kits -> models relationship
      * @return \Illuminate\Database\Eloquent\Relations\Relation
@@ -179,4 +188,9 @@ class PredefinedKit extends SnipeModel
      * BEGIN QUERY SCOPES
      * -----------------------------------------------
      **/
+
+    public function scopeOrderByCreatedBy($query, $order)
+    {
+        return $query->leftJoin('users as admin_sort', 'kits.created_by', '=', 'admin_sort.id')->select('kits.*')->orderBy('admin_sort.first_name', $order)->orderBy('admin_sort.last_name', $order);
+    }
 }
diff --git a/app/Models/Recipients/AdminRecipient.php b/app/Models/Recipients/AdminRecipient.php
index 433bd00209..90e39d4ee5 100644
--- a/app/Models/Recipients/AdminRecipient.php
+++ b/app/Models/Recipients/AdminRecipient.php
@@ -6,9 +6,15 @@ use App\Models\Setting;
 
 class AdminRecipient extends Recipient
 {
+
+    protected $email;
     public function __construct()
     {
         $settings = Setting::getSettings();
         $this->email = trim($settings->admin_cc_email);
     }
+    
+    public function getEmail(){
+        return $this->email;
+    }
 }
diff --git a/app/Models/ReportTemplate.php b/app/Models/ReportTemplate.php
new file mode 100644
index 0000000000..cdd05b6f50
--- /dev/null
+++ b/app/Models/ReportTemplate.php
@@ -0,0 +1,203 @@
+<?php
+
+namespace App\Models;
+
+use Illuminate\Database\Eloquent\Builder;
+use Illuminate\Database\Eloquent\Factories\HasFactory;
+use Illuminate\Database\Eloquent\Model;
+use Illuminate\Database\Eloquent\Relations\BelongsTo;
+use Illuminate\Database\Eloquent\SoftDeletes;
+use Watson\Validating\ValidatingTrait;
+
+class ReportTemplate extends Model
+{
+    use HasFactory;
+    use SoftDeletes;
+    use ValidatingTrait;
+
+    protected $casts = [
+        'options' => 'array',
+    ];
+
+    protected $fillable = [
+        'created_by',
+        'name',
+        'options',
+    ];
+
+    protected $rules = [
+        'name' => [
+            'required',
+            'string',
+        ],
+        'options' => [
+            'required',
+            'array',
+        ],
+    ];
+
+    protected static function booted()
+    {
+        // Scope to current user
+        static::addGlobalScope('current_user', function (Builder $builder) {
+            if (auth()->check()) {
+                $builder->where('created_by', auth()->id());
+            }
+        });
+    }
+
+    /**
+     * Establishes the report template -> creator relationship.
+     *
+     */
+    public function creator(): BelongsTo
+    {
+        return $this->belongsTo(User::class, 'created_by');
+    }
+
+    /**
+     * Get the value of a checkbox field for the given field name.
+     *
+     * @param string $fieldName
+     * @param string $fallbackValue The value to return if the report template is not saved yet.
+     *
+     */
+    public function checkmarkValue(string $fieldName, string $fallbackValue = '1'): string
+    {
+        // Assuming we're using the null object pattern, and an empty model
+        // was passed to the view when showing the default report page,
+        // return the fallback value so that checkboxes are checked by default.
+        if (is_null($this->id)) {
+            return $fallbackValue;
+        }
+
+        // If the model does exist then return the value of the field
+        // or return 0 so the checkbox is unchecked.
+        // Falling back to 0 here is because checkboxes are not sent
+        // in the request when unchecked so they are not
+        // actually saved in the model's options.
+        return $this->options[$fieldName] ?? '0';
+    }
+
+    /**
+     * Get the value of a radio field for the given field name.
+     *
+     * @param string $fieldName
+     * @param string $value The value to check against.
+     * @param bool $isDefault Whether the radio input being checked is the default.
+     *
+     */
+    public function radioValue(string $fieldName, string $value, bool $isDefault = false): bool
+    {
+        $fieldExists = array_has($this->options, $fieldName);
+
+        // If the field doesn't exist but the radio input
+        // being checked is the default then return true.
+        if (!$fieldExists && $isDefault) {
+            return true;
+        }
+
+        // If the field exists and matches what we're checking then return true.
+        if ($fieldExists && $this->options[$fieldName] === $value) {
+            return true;
+        }
+
+        // Otherwise return false.
+        return false;
+    }
+
+    /**
+     * Get the value of a select field for the given field name.
+     *
+     * @param string $fieldName
+     * @param string|null $model The Eloquent model to check against.
+     *
+     * @return mixed|null
+     *
+     */
+    public function selectValue(string $fieldName, string $model = null)
+    {
+        // If the field does not exist then return null.
+        if (!isset($this->options[$fieldName])) {
+            return null;
+        }
+
+        $value = $this->options[$fieldName];
+
+        // If the value was stored as an array, most likely
+        // due to a previously being a multi-select,
+        // then return the first value.
+        if (is_array($value)) {
+            $value = $value[0];
+        }
+
+        // If a model is provided then we should ensure we only return
+        // the value if the model still exists.
+        // Note: It is possible $value is an id that no longer exists and this will return null.
+        if ($model) {
+            $foundModel = $model::find($value);
+
+            return $foundModel ? $foundModel->id : null;
+        }
+
+        return $value;
+    }
+
+    /**
+     * Get the values of a multi-select field for the given field name.
+     *
+     * @param string $fieldName
+     * @param string|null $model The Eloquent model to check against.
+     *
+     * @return iterable
+     *
+     */
+    public function selectValues(string $fieldName, string $model = null): iterable
+    {
+        // If the field does not exist then return an empty array.
+        if (!isset($this->options[$fieldName])) {
+            return [];
+        }
+
+        // If a model is provided then we should ensure we only return
+        // the ids of models that exist and are not deleted.
+        if ($model) {
+            return $model::findMany($this->options[$fieldName])->pluck('id');
+        }
+
+        // Wrap the value in an array if needed. This is to ensure
+        // values previously stored as a single value,
+        // most likely from a single select, are returned as an array.
+        if (!is_array($this->options[$fieldName])) {
+            return [$this->options[$fieldName]];
+        }
+
+        return $this->options[$fieldName];
+    }
+
+    /**
+     * Get the value of a text field for the given field name.
+     *
+     * @param  string  $fieldName
+     * @param  string|null  $fallbackValue
+     *
+     * @return string
+     */
+    public function textValue(string $fieldName, string|null $fallbackValue = ''): string
+    {
+        // Assuming we're using the null object pattern,
+        // return the default value if the object is not saved yet.
+        if (is_null($this->id)) {
+            return (string) $fallbackValue;
+        }
+
+        // Return the field's value if it exists
+        // and return the default value if not.
+        return $this->options[$fieldName] ?? '';
+    }
+
+    public function getDisplayNameAttribute()
+    {
+        return $this->name;
+    }
+}
diff --git a/app/Models/Requestable.php b/app/Models/Requestable.php
index bf5c9c427b..4dead82bb3 100644
--- a/app/Models/Requestable.php
+++ b/app/Models/Requestable.php
@@ -29,19 +29,19 @@ trait Requestable
     public function request($qty = 1)
     {
         $this->requests()->save(
-            new CheckoutRequest(['user_id' => Auth::id(), 'qty' => $qty])
+            new CheckoutRequest(['user_id' => auth()->id(), 'qty' => $qty])
         );
     }
 
     public function deleteRequest()
     {
-        $this->requests()->where('user_id', Auth::id())->delete();
+        $this->requests()->where('user_id', auth()->id())->delete();
     }
 
     public function cancelRequest($user_id = null)
     {
         if (!$user_id){
-            $user_id = Auth::id();
+            $user_id = auth()->id();
         }
 
         $this->requests()->where('user_id', $user_id)->update(['canceled_at' => \Carbon\Carbon::now()]);
diff --git a/app/Models/Setting.php b/app/Models/Setting.php
index 30600aea56..199aee33dc 100755
--- a/app/Models/Setting.php
+++ b/app/Models/Setting.php
@@ -2,6 +2,7 @@
 
 namespace App\Models;
 
+use Carbon\Carbon;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Notifications\Notifiable;
@@ -9,6 +10,7 @@ use Illuminate\Support\Collection;
 use Illuminate\Support\Facades\App;
 use Illuminate\Support\Facades\Cache;
 use App\Helpers\Helper;
+use Illuminate\Support\Facades\Storage;
 use Watson\Validating\ValidatingTrait;
 use Illuminate\Support\Facades\Log;
 
@@ -50,33 +52,7 @@ class Setting extends Model
      */
     protected $rules = [
           'brand'                               => 'required|min:1|numeric',
-          'qr_text'                             => 'max:31|nullable',
-          'alert_email'                         => 'email_array|nullable',
-          'admin_cc_email'                      => 'email|nullable',
-          'default_currency'                    => 'required',
-          'locale'                              => 'required',
-          'labels_per_page'                     => 'numeric',
-          'labels_width'                        => 'numeric',
-          'labels_height'                       => 'numeric',
-          'labels_pmargin_left'                 => 'numeric|nullable',
-          'labels_pmargin_right'                => 'numeric|nullable',
-          'labels_pmargin_top'                  => 'numeric|nullable',
-          'labels_pmargin_bottom'               => 'numeric|nullable',
-          'labels_display_bgutter'              => 'numeric|nullable',
-          'labels_display_sgutter'              => 'numeric|nullable',
-          'labels_fontsize'                     => 'numeric|min:5',
-          'labels_pagewidth'                    => 'numeric|nullable',
-          'labels_pageheight'                   => 'numeric|nullable',
-          'login_remote_user_enabled'           => 'numeric|nullable',
-          'login_common_disabled'               => 'numeric|nullable',
-          'login_remote_user_custom_logout_url' => 'string|nullable',
-          'login_remote_user_header_name'       => 'string|nullable',
           'thumbnail_max_h'                     => 'numeric|max:500|min:25',
-          'pwd_secure_min'                      => 'numeric|required|min:8',
-          'audit_warning_days'                  => 'numeric|nullable',
-          'audit_interval'                      => 'numeric|nullable',
-          'custom_forgot_pass_url'              => 'url|nullable',
-          'privacy_policy_link'                 => 'nullable|url',
           'google_client_id'                    => 'nullable|ends_with:apps.googleusercontent.com'
     ];
 
@@ -95,6 +71,7 @@ class Setting extends Model
 
     protected $casts = [
         'label2_asset_logo' => 'boolean',
+        'require_checkinout_notes' => 'boolean',
     ];
 
     /**
@@ -270,7 +247,7 @@ class Setting extends Model
      *
      * @return string
      */
-    public function routeNotificationForSlack(): string
+    public function routeNotificationForSlack(): ?string
     {
         // At this point the endpoint is the same for everything.
         //  In the future this may want to be adapted for individual notifications.
@@ -282,7 +259,7 @@ class Setting extends Model
      *
      * @return string
      */
-    public function routeNotificationForMail(): string
+    public function routeNotificationForMail(): ?string
     {
         // At this point the endpoint is the same for everything.
         //  In the future this may want to be adapted for individual notifications.
@@ -363,6 +340,33 @@ class Setting extends Model
         return collect($ldapSettings);
     }
 
+    /**
+     * For a particular cache-file, refresh it if the settings have
+     * been updated more recently than the file. Then return the
+     * full filepath
+     */
+    public static function get_fresh_file_path($attribute, $path)
+    {
+        $full_path = storage_path().'/'.$path;
+        $file_exists = file_exists($full_path);
+        if ($file_exists) {
+            $statblock = stat($full_path);
+        }
+        if (!$file_exists || Carbon::createFromTimestamp($statblock['mtime']) < Setting::getSettings()->updated_at) {
+            if (Setting::getSettings()->{$attribute}) {
+                file_put_contents($full_path, Setting::getSettings()->{$attribute});
+            } else {
+                //this doesn't fire when you might expect it to because a lot of the time we do something like:
+                // if ($settings->ldap_client_tls_cert && ...
+                // so we never get a chance to 'uncache' the file.
+                if ($file_exists) {
+                    unlink($full_path);
+                }
+            }
+        }
+        return $full_path;
+    }
+
     /**
      * Return the filename for the client-side SSL cert
      *
@@ -370,7 +374,7 @@ class Setting extends Model
      */
     public static function get_client_side_cert_path()
     {
-        return storage_path().'/ldap_client_tls.cert';
+        return self::get_fresh_file_path('ldap_client_tls_cert', 'ldap_client_tls.cert');
     }
 
     /**
@@ -380,36 +384,7 @@ class Setting extends Model
      */
     public static function get_client_side_key_path()
     {
-        return storage_path().'/ldap_client_tls.key';
+        return self::get_fresh_file_path('ldap_client_tls_key', 'ldap_client_tls.key');
     }
 
-    public function update_client_side_cert_files()
-    {
-        /**
-         * I'm not sure if it makes sense to have a cert but no key
-         * nor vice versa, but for now I'm just leaving it like this.
-         *
-         * Also, we could easily set this up with an event handler and
-         * self::saved() or something like that but there's literally only
-         * one place where we will do that, so I'll just explicitly call
-         * this method at that spot instead. It'll be easier to debug and understand.
-         */
-        if ($this->ldap_client_tls_cert) {
-            file_put_contents(self::get_client_side_cert_path(), $this->ldap_client_tls_cert);
-        } else {
-            if (file_exists(self::get_client_side_cert_path())) {
-                unlink(self::get_client_side_cert_path());
-            }
-        }
-
-        if ($this->ldap_client_tls_key) {
-            file_put_contents(self::get_client_side_key_path(), $this->ldap_client_tls_key);
-        } else {
-            if (file_exists(self::get_client_side_key_path())) {
-                unlink(self::get_client_side_key_path());
-            }
-        }
-    }
-
-
 }
diff --git a/app/Models/SnipeModel.php b/app/Models/SnipeModel.php
index af12c3d29b..f26946d22a 100644
--- a/app/Models/SnipeModel.php
+++ b/app/Models/SnipeModel.php
@@ -21,6 +21,11 @@ class SnipeModel extends Model
      */
     public function setPurchaseCostAttribute($value)
     {
+        if (is_float($value)) {
+            //value is *already* a floating-point number. Just assign it directly
+            $this->attributes['purchase_cost'] = $value;
+            return;
+        }
         $value = Helper::ParseCurrency($value);
 
         if ($value == 0) {
diff --git a/app/Models/Statuslabel.php b/app/Models/Statuslabel.php
index 0f8a0b6075..c1bcc3042d 100755
--- a/app/Models/Statuslabel.php
+++ b/app/Models/Statuslabel.php
@@ -64,6 +64,11 @@ class Statuslabel extends SnipeModel
         return $this->hasMany(\App\Models\Asset::class, 'status_id');
     }
 
+    public function adminuser()
+    {
+        return $this->belongsTo(\App\Models\User::class, 'created_by');
+    }
+
     /**
      * Gets the status label type
      *
@@ -161,4 +166,9 @@ class Statuslabel extends SnipeModel
 
         return $statustype;
     }
+
+    public function scopeOrderByCreatedBy($query, $order)
+    {
+        return $query->leftJoin('users as admin_sort', 'status_labels.created_by', '=', 'admin_sort.id')->select('status_labels.*')->orderBy('admin_sort.first_name', $order)->orderBy('admin_sort.last_name', $order);
+    }
 }
diff --git a/app/Models/Supplier.php b/app/Models/Supplier.php
index e198d10c10..0166229f89 100755
--- a/app/Models/Supplier.php
+++ b/app/Models/Supplier.php
@@ -48,7 +48,7 @@ class Supplier extends SnipeModel
      *
      * @var array
      */
-    protected $searchableAttributes = ['name'];
+    protected $searchableAttributes = ['name', 'notes', 'phone', 'fax', 'url', 'email', 'contact', 'address', 'address2', 'city', 'state', 'country', 'zip'];
 
     /**
      * The relations and their attributes that should be included when searching the model.
@@ -128,6 +128,18 @@ class Supplier extends SnipeModel
         return $this->hasMany(\App\Models\Consumable::class, 'supplier_id');
     }
 
+
+    /**
+     * Establishes the supplier -> admin user relationship
+     *
+     * @author A. Gianotto <snipe@snipe.net>
+     * @return \Illuminate\Database\Eloquent\Relations\Relation
+     */
+    public function adminuser()
+    {
+        return $this->belongsTo(\App\Models\User::class, 'created_by');
+    }
+
     /**
      * Establishes the supplier -> asset maintenances relationship
      *
@@ -197,4 +209,13 @@ class Supplier extends SnipeModel
 
         return $url;
     }
+
+    /**
+     * Query builder scope to order on the user that created it
+     */
+    public function scopeOrderByCreatedByName($query, $order)
+    {
+        return $query->leftJoin('users as admin_sort', 'suppliers.created_by', '=', 'admin_sort.id')->select('suppliers.*')->orderBy('admin_sort.first_name', $order)->orderBy('admin_sort.last_name', $order);
+    }
+
 }
diff --git a/app/Models/Traits/Searchable.php b/app/Models/Traits/Searchable.php
index 06e05348fb..1430ce649a 100644
--- a/app/Models/Traits/Searchable.php
+++ b/app/Models/Traits/Searchable.php
@@ -77,7 +77,7 @@ trait Searchable
                 /**
                  * Making sure to only search in date columns if the search term consists of characters that can make up a MySQL timestamp!
                  *
-                 * @see https://github.com/snipe/snipe-it/issues/4590
+                 * @see https://github.com/grokability/snipe-it/issues/4590
                  */
                 if (! preg_match('/^[0-9 :-]++$/', $term) && in_array($column, $this->getDates())) {
                     continue;
diff --git a/app/Models/User.php b/app/Models/User.php
index 30e32061ed..278c801bed 100644
--- a/app/Models/User.php
+++ b/app/Models/User.php
@@ -13,12 +13,14 @@ use Illuminate\Contracts\Auth\CanResetPassword as CanResetPasswordContract;
 use Illuminate\Contracts\Translation\HasLocalePreference;
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
+use Illuminate\Database\Eloquent\Relations\HasMany;
 use Illuminate\Database\Eloquent\SoftDeletes;
 use Illuminate\Foundation\Auth\Access\Authorizable;
 use Illuminate\Notifications\Notifiable;
 use Illuminate\Support\Facades\Gate;
 use Laravel\Passport\HasApiTokens;
 use Watson\Validating\ValidatingTrait;
+use Illuminate\Database\Eloquent\Casts\Attribute;
 
 class User extends SnipeModel implements AuthenticatableContract, AuthorizableContract, CanResetPasswordContract, HasLocalePreference
 {
@@ -93,7 +95,7 @@ class User extends SnipeModel implements AuthenticatableContract, AuthorizableCo
         'locale'                  => 'max:10|nullable',
         'website'                 => 'url|nullable|max:191',
         'manager_id'              => 'nullable|exists:users,id|cant_manage_self',
-        'location_id'             => 'exists:locations,id|nullable',
+        'location_id'             => 'exists:locations,id|nullable|fmcs_location',
         'start_date'              => 'nullable|date_format:Y-m-d',
         'end_date'                => 'nullable|date_format:Y-m-d|after_or_equal:start_date',
         'autoassign_licenses'     => 'boolean',
@@ -113,15 +115,21 @@ class User extends SnipeModel implements AuthenticatableContract, AuthorizableCo
      * @var array
      */
     protected $searchableAttributes = [
-        'first_name',
-        'last_name',
+        'address',
+        'city',
+        'country',
         'email',
-        'username',
+        'employee_num',
+        'first_name',
+        'jobtitle',
+        'last_name',
+        'locale',
         'notes',
         'phone',
-        'jobtitle',
-        'employee_num',
+        'state',
+        'username',
         'website',
+        'zip',
     ];
 
     /**
@@ -130,13 +138,36 @@ class User extends SnipeModel implements AuthenticatableContract, AuthorizableCo
      * @var array
      */
     protected $searchableRelations = [
-        'userloc'    => ['name'],
+        'userloc'    => ['name', 'address', 'address2', 'city', 'state', 'zip'],
         'department' => ['name'],
         'groups'     => ['name'],
         'company'    => ['name'],
         'manager'    => ['first_name', 'last_name', 'username'],
     ];
 
+
+    /**
+     * This sets the name property on the user. It's not a real field in the database
+     * (since we use first_name and last_name), but the Laravel mailable method
+     * uses this to determine the name of the user to send emails to.
+     *
+     * We only have to do this on the User model and no other models because other
+     * first-class objects have a name field.
+     * @return void
+     */
+
+    public $name;
+
+    protected static function boot()
+    {
+        parent::boot();
+
+        static::retrieved(function($user){
+            $user->name = $user->getFullNameAttribute();
+        });
+    }
+
+
     /**
      * Internally check the user permission for the given section
      *
@@ -277,6 +308,7 @@ class User extends SnipeModel implements AuthenticatableContract, AuthorizableCo
         return $this->activated == 1;
     }
 
+
     /**
      * Returns the full name attribute
      *
@@ -288,7 +320,7 @@ class User extends SnipeModel implements AuthenticatableContract, AuthorizableCo
     {
         $setting = Setting::getSettings();
 
-        if ($setting->name_display_format=='last_first') {
+        if ($setting?->name_display_format == 'last_first') {
             return ($this->last_name) ? $this->last_name.' '.$this->first_name : $this->first_name;
         }
         return $this->last_name ? $this->first_name.' '.$this->last_name : $this->first_name;
@@ -331,7 +363,8 @@ class User extends SnipeModel implements AuthenticatableContract, AuthorizableCo
      */
     public function accessories()
     {
-        return $this->belongsToMany(\App\Models\Accessory::class, 'accessories_users', 'assigned_to', 'accessory_id')
+        return $this->belongsToMany(\App\Models\Accessory::class, 'accessories_checkout', 'assigned_to', 'accessory_id')
+            ->where('assigned_type', '=', 'App\Models\User')
             ->withPivot('id', 'created_at', 'note')->withTrashed()->orderBy('accessory_id');
     }
 
@@ -359,6 +392,15 @@ class User extends SnipeModel implements AuthenticatableContract, AuthorizableCo
         return $this->belongsToMany(\App\Models\License::class, 'license_seats', 'assigned_to', 'license_id')->withPivot('id', 'created_at', 'updated_at');
     }
 
+    /**
+     * Establishes the user -> reportTemplates relationship
+     *
+     */
+    public function reportTemplates(): HasMany
+    {
+        return $this->hasMany(ReportTemplate::class, 'created_by');
+    }
+
     /**
      * Establishes a count of all items assigned
      *
@@ -481,8 +523,6 @@ class User extends SnipeModel implements AuthenticatableContract, AuthorizableCo
     /**
      * Establishes the user -> uploads relationship
      *
-     * @todo I don't think we use this?
-     *
      * @author A. Gianotto <snipe@snipe.net>
      * @since [v3.0]
      * @return \Illuminate\Database\Eloquent\Relations\Relation
@@ -496,6 +536,40 @@ class User extends SnipeModel implements AuthenticatableContract, AuthorizableCo
             ->orderBy('created_at', 'desc');
     }
 
+    /**
+     * Establishes the user -> acceptances relationship
+     *
+     * @author A. Gianotto <snipe@snipe.net>
+     * @since [v7.0.7]
+     * @return \Illuminate\Database\Eloquent\Relations\Relation
+     */
+    public function acceptances()
+    {
+        return $this->hasMany(\App\Models\Actionlog::class, 'target_id')
+            ->where('target_type', self::class)
+            ->where('action_type', '=', 'accepted')
+            ->orderBy('created_at', 'desc');
+    }
+
+    /**
+     * Establishes the user -> eula relationship
+     *
+     * @return \Illuminate\Database\Eloquent\Relations\Relation
+     * @since [v8.1.16]
+     * @author [Godfrey Martinez] [<gmartinez@grokability.com>]
+ */
+    public function eulas()
+    {
+        return $this->hasMany(Actionlog::class, 'target_id')
+            ->with('item')
+            ->select(['id', 'target_id', 'target_type', 'action_type', 'filename', 'accept_signature', 'created_at', 'note', 'item_id', 'item_type'])
+            ->where('target_type', self::class)
+            ->where('action_type', 'accepted')
+            ->whereNotNull('filename')
+            ->whereNotNull('accept_signature')
+            ->orderBy('created_at', 'desc');
+    }
+
     /**
      * Establishes the user -> requested assets relationship
      *
@@ -597,10 +671,14 @@ class User extends SnipeModel implements AuthenticatableContract, AuthorizableCo
                 $username = str_slug($first_name).'_'.str_slug($last_name);
             } elseif ($format == 'firstname') {
                 $username = str_slug($first_name);
+            } elseif ($format == 'lastname') {
+                $username = str_slug($last_name);
             } elseif ($format == 'firstinitial.lastname') {
                 $username = str_slug(substr($first_name, 0, 1).'.'.str_slug($last_name));
             } elseif ($format == 'lastname_firstinitial') {
                 $username = str_slug($last_name).'_'.str_slug(substr($first_name, 0, 1));
+            } elseif ($format == 'lastname.firstinitial') {
+                $username = str_slug($last_name).'.'.str_slug(substr($first_name, 0, 1));
             } elseif ($format == 'firstnamelastname') {
                 $username = str_slug($first_name).str_slug($last_name);
             } elseif ($format == 'firstnamelastinitial') {
@@ -687,10 +765,36 @@ class User extends SnipeModel implements AuthenticatableContract, AuthorizableCo
     }
 
 
-
+    /**
+     * Decode JSON permissions into array
+     *
+     * @author A. Gianotto <snipe@snipe.net>
+     * @since [v1.0]
+     * @return array | \stdClass
+     */
     public function decodePermissions()
     {
-        return json_decode($this->permissions, true);
+        // If the permissions are an array, convert it to JSON
+        if (is_array($this->permissions)) {
+            $this->permissions = json_encode($this->permissions);
+        }
+
+        $permissions = json_decode($this->permissions ?? '{}', JSON_OBJECT_AS_ARRAY);
+
+        // Otherwise, loop through the permissions and cast the values as integers
+        if ((is_array($permissions)) && ($permissions)) {
+            foreach ($permissions as $permission => $value) {
+
+                if (!is_integer($permission)) {
+                    $permissions[$permission] = (int) $value;
+                } else {
+                    \Log::info('Weird data here - skipping it');
+                    unset($permissions[$permission]);
+                }
+            }
+            return $permissions ?: new \stdClass;
+        }
+        return new \stdClass;
     }
 
     /**
@@ -815,10 +919,22 @@ class User extends SnipeModel implements AuthenticatableContract, AuthorizableCo
         return $query->leftJoin('companies as companies_user', 'users.company_id', '=', 'companies_user.id')->orderBy('companies_user.name', $order);
     }
 
-    public function preferredLocale()
+
+
+
+    /**
+     * Get the preferred locale for the user.
+     *
+     * This uses the HasLocalePreference contract to determine the user's preferred locale,
+     * used by Laravel's mail system to determine the locale for sending emails.
+     * https://laravel.com/docs/11.x/mail#user-preferred-locales
+     *
+     */
+    public function preferredLocale(): string
     {
-        return $this->locale;
+        return $this->locale ?? Setting::getSettings()->locale ?? config('app.locale');
     }
+
     public function getUserTotalCost(){
         $asset_cost= 0;
         $license_cost= 0;
diff --git a/app/Notifications/AcceptanceAssetAcceptedNotification.php b/app/Notifications/AcceptanceAssetAcceptedNotification.php
index db1555b574..7798dbc0d5 100644
--- a/app/Notifications/AcceptanceAssetAcceptedNotification.php
+++ b/app/Notifications/AcceptanceAssetAcceptedNotification.php
@@ -24,6 +24,7 @@ class AcceptanceAssetAcceptedNotification extends Notification
         $this->item_tag = $params['item_tag'];
         $this->item_model = $params['item_model'];
         $this->item_serial = $params['item_serial'];
+        $this->item_status = $params['item_status'];
         $this->accepted_date = Helper::getFormattedDateObject($params['accepted_date'], 'date', false);
         $this->assigned_to = $params['assigned_to'];
         $this->note = $params['note'];
@@ -65,6 +66,7 @@ class AcceptanceAssetAcceptedNotification extends Notification
                 'item_tag'      => $this->item_tag,
                 'item_model'    => $this->item_model,
                 'item_serial'   => $this->item_serial,
+                'item_status'   => $this->item_status,
                 'note'          => $this->note,
                 'accepted_date' => $this->accepted_date,
                 'assigned_to'   => $this->assigned_to,
diff --git a/app/Notifications/AcceptanceAssetDeclinedNotification.php b/app/Notifications/AcceptanceAssetDeclinedNotification.php
index abdfbbf0c0..0a9d6c211f 100644
--- a/app/Notifications/AcceptanceAssetDeclinedNotification.php
+++ b/app/Notifications/AcceptanceAssetDeclinedNotification.php
@@ -24,6 +24,7 @@ class AcceptanceAssetDeclinedNotification extends Notification
         $this->item_tag = $params['item_tag'];
         $this->item_model = $params['item_model'];
         $this->item_serial = $params['item_serial'];
+        $this->item_status = $params['item_status'];
         $this->declined_date = Helper::getFormattedDateObject($params['declined_date'], 'date', false);
         $this->note = $params['note'];
         $this->assigned_to = $params['assigned_to'];
@@ -63,6 +64,7 @@ class AcceptanceAssetDeclinedNotification extends Notification
                 'item_tag'      => $this->item_tag,
                 'item_model'    => $this->item_model,
                 'item_serial'   => $this->item_serial,
+                'item_status'   => $this->item_status,
                 'note'          => $this->note,
                 'declined_date' => $this->declined_date,
                 'assigned_to'   => $this->assigned_to,
diff --git a/app/Notifications/AuditNotification.php b/app/Notifications/AuditNotification.php
index 1377c29e7e..a7056e8cbd 100644
--- a/app/Notifications/AuditNotification.php
+++ b/app/Notifications/AuditNotification.php
@@ -2,12 +2,18 @@
 
 namespace App\Notifications;
 
+use AllowDynamicProperties;
 use App\Models\Setting;
 use Illuminate\Bus\Queueable;
+use Illuminate\Notifications\Channels\SlackWebhookChannel;
 use Illuminate\Notifications\Messages\SlackMessage;
 use Illuminate\Notifications\Notification;
+use Illuminate\Support\Facades\Log;
+use Illuminate\Support\Str;
+use NotificationChannels\MicrosoftTeams\MicrosoftTeamsChannel;
+use NotificationChannels\MicrosoftTeams\MicrosoftTeamsMessage;
 
-class AuditNotification extends Notification
+#[AllowDynamicProperties] class AuditNotification extends Notification
 {
     use Queueable;
     /**
@@ -35,10 +41,14 @@ class AuditNotification extends Notification
     public function via()
     {
         $notifyBy = [];
-        if (Setting::getSettings()->webhook_endpoint) {
-            $notifyBy[] = 'slack';
+        if (Setting::getSettings()->webhook_selected == 'slack' || Setting::getSettings()->webhook_selected == 'general' ) {
+            Log::debug('use webhook');
+            $notifyBy[] = SlackWebhookChannel::class;
         }
+        if (Setting::getSettings()->webhook_selected == 'microsoft' && Setting::getSettings()->webhook_endpoint) {
 
+            $notifyBy[] = MicrosoftTeamsChannel::class;
+        }
         return $notifyBy;
     }
 
@@ -63,4 +73,30 @@ class AuditNotification extends Notification
                     ->fields($fields);
             });
     }
+
+    public static function toMicrosoftTeams($params)
+    {
+        $item = $params['item'];
+        $admin_user = $params['admin'];
+        $note = $params['note'];
+        $location = $params['location'];
+        $setting = Setting::getSettings();
+
+        if(!Str::contains($setting->webhook_endpoint, 'workflows')) {
+            return MicrosoftTeamsMessage::create()
+                ->to($setting->webhook_endpoint)
+                ->type('success')
+                ->title(class_basename(get_class($params['item'])) . ' Audited')
+                ->addStartGroupToSection('activityText')
+                ->fact(trans('mail.asset'), $item)
+                ->fact(trans('general.administrator'), $admin_user->present()->viewUrl() . '|' . $admin_user->present()->fullName());
+        }
+            $message = class_basename(get_class($params['item'])) . ' Audited By '.$admin_user->present()->fullName();
+            $details = [
+                trans('mail.asset') => htmlspecialchars_decode($item->present()->name),
+                trans('mail.notes') => $note ?: '',
+                trans('general.location') => $location ?: '',
+                ];
+            return [$message, $details];
+    }
 }
diff --git a/app/Notifications/CheckinAccessoryNotification.php b/app/Notifications/CheckinAccessoryNotification.php
index 7e033f1870..5354775d7e 100644
--- a/app/Notifications/CheckinAccessoryNotification.php
+++ b/app/Notifications/CheckinAccessoryNotification.php
@@ -6,9 +6,11 @@ use App\Models\Accessory;
 use App\Models\Setting;
 use App\Models\User;
 use Illuminate\Bus\Queueable;
+use Illuminate\Notifications\Channels\SlackWebhookChannel;
 use Illuminate\Notifications\Messages\MailMessage;
 use Illuminate\Notifications\Messages\SlackMessage;
 use Illuminate\Notifications\Notification;
+use Illuminate\Support\Str;
 use NotificationChannels\GoogleChat\Card;
 use NotificationChannels\GoogleChat\GoogleChatChannel;
 use NotificationChannels\GoogleChat\GoogleChatMessage;
@@ -55,22 +57,9 @@ class CheckinAccessoryNotification extends Notification
         }
 
         if (Setting::getSettings()->webhook_selected == 'slack' || Setting::getSettings()->webhook_selected == 'general' ) {
-            $notifyBy[] = 'slack';
+            $notifyBy[] = SlackWebhookChannel::class;
         }
 
-        /**
-         * Only send notifications to users that have email addresses
-         */
-        if ($this->target instanceof User && $this->target->email != '') {
-            Log::debug('The target is a user');
-
-            if ($this->item->checkin_email()) {
-                $notifyBy[] = 'mail';
-            }
-        }
-
-        Log::debug('checkin_email on this category is '.$this->item->checkin_email());
-
         return $notifyBy;
     }
 
@@ -84,10 +73,18 @@ class CheckinAccessoryNotification extends Notification
         $channel = ($this->settings->webhook_channel) ? $this->settings->webhook_channel : '';
 
         $fields = [
-            'To' => '<'.$target->present()->viewUrl().'|'.$target->present()->fullName().'>',
-            'By' => '<'.$admin->present()->viewUrl().'|'.$admin->present()->fullName().'>',
+            trans('general.from') => '<'.$target->present()->viewUrl().'|'.$target->present()->fullName().'>',
+            trans('general.by') => '<'.$admin->present()->viewUrl().'|'.$admin->present()->fullName().'>',
         ];
 
+        if ($item->location) {
+            $fields[trans('general.location')] = $item->location->name;
+        }
+
+        if ($item->company) {
+            $fields[trans('general.company')] = $item->company->name;
+        }
+
         return (new SlackMessage)
             ->content(':arrow_down: :keyboard: '.trans('mail.Accessory_Checkin_Notification'))
             ->from($botname)
@@ -103,18 +100,29 @@ class CheckinAccessoryNotification extends Notification
         $admin = $this->admin;
         $item = $this->item;
         $note = $this->note;
+        if(!Str::contains(Setting::getSettings()->webhook_endpoint, 'workflows')) {
+            return MicrosoftTeamsMessage::create()
+                ->to($this->settings->webhook_endpoint)
+                ->type('success')
+                ->addStartGroupToSection('activityTitle')
+                ->title(trans('Accessory_Checkin_Notification'))
+                ->addStartGroupToSection('activityText')
+                ->fact(htmlspecialchars_decode($item->present()->name), '', 'activityTitle')
+                ->fact(trans('mail.checked_into'), $item->location->name ? $item->location->name : '')
+                ->fact(trans('mail.Accessory_Checkin_Notification')." by ", $admin->present()->fullName())
+                ->fact(trans('admin/consumables/general.remaining'), $item->numRemaining())
+                ->fact(trans('mail.notes'), $note ?: '');
+        }
 
-        return MicrosoftTeamsMessage::create()
-            ->to($this->settings->webhook_endpoint)
-            ->type('success')
-            ->addStartGroupToSection('activityTitle')
-            ->title(trans('Accessory_Checkin_Notification'))
-            ->addStartGroupToSection('activityText')
-            ->fact(htmlspecialchars_decode($item->present()->name), '', 'activityTitle')
-            ->fact(trans('mail.checked_into'), $item->location->name ? $item->location->name : '')
-            ->fact(trans('mail.Accessory_Checkin_Notification')." by ", $admin->present()->fullName())
-            ->fact(trans('admin/consumables/general.remaining'), $item->numRemaining())
-            ->fact(trans('mail.notes'), $note ?: '');
+        $message = trans('mail.Accessory_Checkin_Notification');
+        $details = [
+            trans('mail.accessory_name') => htmlspecialchars_decode($item->present()->name),
+            trans('mail.checked_into') => $item->location->name ? $item->location->name : '',
+            trans('mail.Accessory_Checkin_Notification'). ' by' => $admin->present()->fullName(),
+            trans('admin/consumables/general.remaining')=> $item->numRemaining(),
+            trans('mail.notes') => $note ?: '',
+        ];
+        return  array($message, $details);
     }
     public function toGoogleChat()
     {
@@ -142,24 +150,4 @@ class CheckinAccessoryNotification extends Notification
             );
 
     }
-
-    /**
-     * Get the mail representation of the notification.
-     *
-     * @param  mixed  $notifiable
-     * @return \Illuminate\Notifications\Messages\MailMessage
-     */
-    public function toMail()
-    {
-        Log::debug('to email called');
-
-        return (new MailMessage)->markdown('notifications.markdown.checkin-accessory',
-            [
-                'item'          => $this->item,
-                'admin'         => $this->admin,
-                'note'          => $this->note,
-                'target'        => $this->target,
-            ])
-            ->subject(trans('mail.Accessory_Checkin_Notification'));
-    }
 }
diff --git a/app/Notifications/CheckinAssetNotification.php b/app/Notifications/CheckinAssetNotification.php
index 54b96777fe..5de3ff1be8 100644
--- a/app/Notifications/CheckinAssetNotification.php
+++ b/app/Notifications/CheckinAssetNotification.php
@@ -7,9 +7,11 @@ use App\Models\Asset;
 use App\Models\Setting;
 use App\Models\User;
 use Illuminate\Bus\Queueable;
+use Illuminate\Notifications\Channels\SlackWebhookChannel;
 use Illuminate\Notifications\Messages\MailMessage;
 use Illuminate\Notifications\Messages\SlackMessage;
 use Illuminate\Notifications\Notification;
+use Illuminate\Support\Str;
 use NotificationChannels\GoogleChat\Card;
 use NotificationChannels\GoogleChat\GoogleChatChannel;
 use NotificationChannels\GoogleChat\GoogleChatMessage;
@@ -50,7 +52,6 @@ class CheckinAssetNotification extends Notification
      */
     public function via()
     {
-        $notifyBy = [];
         if (Setting::getSettings()->webhook_selected == 'google' && Setting::getSettings()->webhook_endpoint) {
 
             $notifyBy[] = GoogleChatChannel::class;
@@ -62,15 +63,7 @@ class CheckinAssetNotification extends Notification
         }
         if (Setting::getSettings()->webhook_selected == 'slack' || Setting::getSettings()->webhook_selected == 'general' ) {
             Log::debug('use webhook');
-            $notifyBy[] = 'slack';
-        }
-
-        /**
-         * Only send checkin notifications to users if the category
-         * has the corresponding checkbox checked.
-         */
-        if ($this->item->checkin_email() && $this->target instanceof User && $this->target->email != '') {
-            $notifyBy[] = 'mail';
+            $notifyBy[] = SlackWebhookChannel::class;
         }
 
         return $notifyBy;
@@ -86,10 +79,19 @@ class CheckinAssetNotification extends Notification
 
         $fields = [
             trans('general.administrator') => '<'.$admin->present()->viewUrl().'|'.$admin->present()->fullName().'>',
-            trans('general.status') => $item->assetstatus->name,
+            trans('general.status') => $item->assetstatus?->name,
             trans('general.location') => ($item->location) ? $item->location->name : '',
         ];
 
+        if ($item->location) {
+            $fields[trans('general.location')] = $item->location->name;
+        }
+
+        if ($item->company) {
+            $fields[trans('general.company')] = $item->company->name;
+        }
+
+
         return (new SlackMessage)
             ->content(':arrow_down: :computer: '.trans('mail.Asset_Checkin_Notification'))
             ->from($botname)
@@ -106,16 +108,30 @@ class CheckinAssetNotification extends Notification
         $item = $this->item;
         $note = $this->note;
 
-        return MicrosoftTeamsMessage::create()
-            ->to($this->settings->webhook_endpoint)
-            ->type('success')
-            ->title(trans('mail.Asset_Checkin_Notification'))
-            ->addStartGroupToSection('activityText')
-            ->fact(htmlspecialchars_decode($item->present()->name), '', 'activityText')
-            ->fact(trans('mail.checked_into'), $item->location->name ? $item->location->name : '')
-            ->fact(trans('mail.Asset_Checkin_Notification')." by ", $admin->present()->fullName())
-            ->fact(trans('admin/hardware/form.status'), $item->assetstatus->name)
-            ->fact(trans('mail.notes'), $note ?: '');
+        if(!Str::contains(Setting::getSettings()->webhook_endpoint, 'workflows')) {
+            return MicrosoftTeamsMessage::create()
+                ->to($this->settings->webhook_endpoint)
+                ->type('success')
+                ->title(trans('mail.Asset_Checkin_Notification'))
+                ->addStartGroupToSection('activityText')
+                ->fact(htmlspecialchars_decode($item->present()->name), '', 'activityText')
+                ->fact(trans('mail.checked_into'), ($item->location) ? $item->location->name : '')
+                ->fact(trans('mail.Asset_Checkin_Notification') . " by ", $admin->present()->fullName())
+                ->fact(trans('admin/hardware/form.status'), $item->assetstatus?->name)
+                ->fact(trans('mail.notes'), $note ?: '');
+        }
+
+
+        $message = trans('mail.Asset_Checkin_Notification');
+        $details = [
+            trans('mail.asset') => htmlspecialchars_decode($item->present()->name),
+            trans('mail.checked_into') => ($item->location) ? $item->location->name : '',
+            trans('mail.Asset_Checkin_Notification')." by " => $admin->present()->fullName(),
+            trans('admin/hardware/form.status') => $item->assetstatus?->name,
+            trans('mail.notes') => $note ?: '',
+        ];
+
+        return  array($message, $details);
     }
     public function toGoogleChat()
     {
@@ -135,41 +151,12 @@ class CheckinAssetNotification extends Notification
                         Section::create(
                             KeyValue::create(
                                 trans('mail.checked_into') ?: '',
-                                $item->location->name ? $item->location->name : '',
-                                trans('admin/hardware/form.status').": ".$item->assetstatus->name,
+                                ($item->location) ? $item->location->name : '',
+                                trans('admin/hardware/form.status').": ".$item->assetstatus?->name,
                             )
                                 ->onClick(route('hardware.show', $item->id))
                         )
                     )
             );
-
-    }
-
-    /**
-     * Get the mail representation of the notification.
-     *
-     * @return \Illuminate\Notifications\Messages\MailMessage
-     */
-    public function toMail()
-    {
-        $fields = [];
-
-        // Check if the item has custom fields associated with it
-        if (($this->item->model) && ($this->item->model->fieldset)) {
-            $fields = $this->item->model->fieldset->fields;
-        }
-
-        $message = (new MailMessage)->markdown('notifications.markdown.checkin-asset',
-            [
-                'item'          => $this->item,
-                'admin'         => $this->admin,
-                'note'          => $this->note,
-                'target'        => $this->target,
-                'fields'        => $fields,
-                'expected_checkin'  => $this->expected_checkin,
-            ])
-            ->subject(trans('mail.Asset_Checkin_Notification'));
-
-        return $message;
     }
 }
diff --git a/app/Notifications/CheckinLicenseSeatNotification.php b/app/Notifications/CheckinLicenseSeatNotification.php
index 289e63a162..07c3308dbc 100644
--- a/app/Notifications/CheckinLicenseSeatNotification.php
+++ b/app/Notifications/CheckinLicenseSeatNotification.php
@@ -6,9 +6,11 @@ use App\Models\LicenseSeat;
 use App\Models\Setting;
 use App\Models\User;
 use Illuminate\Bus\Queueable;
+use Illuminate\Notifications\Channels\SlackWebhookChannel;
 use Illuminate\Notifications\Messages\MailMessage;
 use Illuminate\Notifications\Messages\SlackMessage;
 use Illuminate\Notifications\Notification;
+use Illuminate\Support\Str;
 use NotificationChannels\GoogleChat\Card;
 use NotificationChannels\GoogleChat\GoogleChatChannel;
 use NotificationChannels\GoogleChat\GoogleChatMessage;
@@ -58,15 +60,7 @@ class CheckinLicenseSeatNotification extends Notification
         }
 
         if (Setting::getSettings()->webhook_selected == 'slack' || Setting::getSettings()->webhook_selected == 'general' ) {
-            $notifyBy[] = 'slack';
-        }
-
-        /**
-         * Only send checkin notifications to users if the category
-         * has the corresponding checkbox checked.
-         */
-        if ($this->item->checkin_email() && $this->target instanceof User && $this->target->email != '') {
-            $notifyBy[] = 'mail';
+            $notifyBy[] = SlackWebhookChannel::class;
         }
 
         return $notifyBy;
@@ -83,9 +77,18 @@ class CheckinLicenseSeatNotification extends Notification
 
         if ($admin) {
             $fields = [
-                'To' => '<'.$target->present()->viewUrl().'|'.$target->present()->fullName().'>',
-                'By' => '<'.$admin->present()->viewUrl().'|'.$admin->present()->fullName().'>',
+                trans('general.from')  => '<'.$target->present()->viewUrl().'|'.$target->present()->fullName().'>',
+                trans('general.by') => '<'.$admin->present()->viewUrl().'|'.$admin->present()->fullName().'>',
             ];
+
+            if ($item->location) {
+                $fields[trans('general.location')] = $item->location->name;
+            }
+
+            if ($item->company) {
+                $fields[trans('general.company')] = $item->company->name;
+            }
+
         } else {
             $fields = [
                 'To' => '<'.$target->present()->viewUrl().'|'.$target->present()->fullName().'>',
@@ -109,18 +112,30 @@ class CheckinLicenseSeatNotification extends Notification
         $admin = $this->admin;
         $item = $this->item;
         $note = $this->note;
+        if(!Str::contains(Setting::getSettings()->webhook_endpoint, 'workflows')) {
+            return MicrosoftTeamsMessage::create()
+                ->to($this->settings->webhook_endpoint)
+                ->type('success')
+                ->addStartGroupToSection('activityTitle')
+                ->title(trans('mail.License_Checkin_Notification'))
+                ->addStartGroupToSection('activityText')
+                ->fact(htmlspecialchars_decode($item->present()->name), '', 'header')
+                ->fact(trans('mail.License_Checkin_Notification')." by ", $admin->present()->fullName() ?: 'CLI tool')
+                ->fact(trans('mail.checkedin_from'), $target->present()->fullName())
+                ->fact(trans('admin/consumables/general.remaining'), $item->availCount()->count())
+                ->fact(trans('mail.notes'), $note ?: '');
+        }
 
-        return MicrosoftTeamsMessage::create()
-            ->to($this->settings->webhook_endpoint)
-            ->type('success')
-            ->addStartGroupToSection('activityTitle')
-            ->title(trans('mail.License_Checkin_Notification'))
-            ->addStartGroupToSection('activityText')
-            ->fact(htmlspecialchars_decode($item->present()->name), '', 'header')
-            ->fact(trans('mail.License_Checkin_Notification')." by ", $admin->present()->fullName() ?: 'CLI tool')
-            ->fact(trans('mail.checkedin_from'), $target->present()->fullName())
-            ->fact(trans('admin/consumables/general.remaining'), $item->availCount()->count())
-            ->fact(trans('mail.notes'), $note ?: '');
+        $message = trans('mail.License_Checkin_Notification');
+        $details = [
+            trans('mail.checkedin_from')=> $target->present()->fullName(),
+            trans('mail.license_for') => htmlspecialchars_decode($item->present()->name),
+            trans('mail.License_Checkin_Notification')." by " => $admin->present()->fullName() ?: 'CLI tool',
+            trans('admin/consumables/general.remaining') => $item->availCount()->count(),
+            trans('mail.notes') => $note ?: '',
+        ];
+
+        return  array($message, $details);
     }
     public function toGoogleChat()
     {
@@ -149,23 +164,4 @@ class CheckinLicenseSeatNotification extends Notification
             );
 
     }
-
-
-    /**
-     * Get the mail representation of the notification.
-     *
-     * @param  mixed  $notifiable
-     * @return \Illuminate\Notifications\Messages\MailMessage
-     */
-    public function toMail()
-    {
-        return (new MailMessage)->markdown('notifications.markdown.checkin-license',
-            [
-                'item'          => $this->item,
-                'admin'         => $this->admin,
-                'note'          => $this->note,
-                'target'        => $this->target,
-            ])
-            ->subject(trans('mail.License_Checkin_Notification'));
-    }
 }
diff --git a/app/Notifications/CheckoutAccessoryNotification.php b/app/Notifications/CheckoutAccessoryNotification.php
index 803b697e86..016bfc526c 100644
--- a/app/Notifications/CheckoutAccessoryNotification.php
+++ b/app/Notifications/CheckoutAccessoryNotification.php
@@ -9,6 +9,7 @@ use Illuminate\Bus\Queueable;
 use Illuminate\Notifications\Messages\MailMessage;
 use Illuminate\Notifications\Messages\SlackMessage;
 use Illuminate\Notifications\Notification;
+use Illuminate\Support\Str;
 use NotificationChannels\GoogleChat\Card;
 use NotificationChannels\GoogleChat\GoogleChatChannel;
 use NotificationChannels\GoogleChat\GoogleChatMessage;
@@ -30,6 +31,7 @@ class CheckoutAccessoryNotification extends Notification
         $this->item = $accessory;
         $this->admin = $checkedOutBy;
         $this->note = $note;
+        $this->checkout_qty = $accessory->checkout_qty;
         $this->target = $checkedOutTo;
         $this->acceptance = $acceptance;
         $this->settings = Setting::getSettings();
@@ -98,16 +100,24 @@ class CheckoutAccessoryNotification extends Notification
         $channel = ($this->settings->webhook_channel) ? $this->settings->webhook_channel : '';
 
         $fields = [
-            'To' => '<'.$target->present()->viewUrl().'|'.$target->present()->fullName().'>',
-            'By' => '<'.$admin->present()->viewUrl().'|'.$admin->present()->fullName().'>',
+            trans('general.to') => '<'.$target->present()->viewUrl().'|'.$target->present()->fullName().'>',
+            trans('general.by') => '<'.$admin->present()->viewUrl().'|'.$admin->present()->fullName().'>',
         ];
 
+        if ($item->location) {
+            $fields[trans('general.location')] = $item->location->name;
+        }
+
+        if ($item->company) {
+            $fields[trans('general.company')] = $item->company->name;
+        }
+
         return (new SlackMessage)
             ->content(':arrow_up: :keyboard: Accessory Checked Out')
             ->from($botname)
             ->to($channel)
             ->attachment(function ($attachment) use ($item, $note, $admin, $fields) {
-                $attachment->title(htmlspecialchars_decode($item->present()->name), $item->present()->viewUrl())
+                $attachment->title(htmlspecialchars_decode($this->checkout_qty.' x '.$item->present()->name), $item->present()->viewUrl())
                     ->fields($fields)
                     ->content($note);
             });
@@ -119,6 +129,7 @@ class CheckoutAccessoryNotification extends Notification
         $item = $this->item;
         $note = $this->note;
 
+        if(!Str::contains(Setting::getSettings()->webhook_endpoint, 'workflows')) {
             return MicrosoftTeamsMessage::create()
                 ->to($this->settings->webhook_endpoint)
                 ->type('success')
@@ -127,11 +138,24 @@ class CheckoutAccessoryNotification extends Notification
                 ->addStartGroupToSection('activityText')
                 ->fact(htmlspecialchars_decode($item->present()->name), '', 'activityTitle')
                 ->fact(trans('mail.assigned_to'), $target->present()->name)
+                ->fact(trans('general.qty'), $this->checkout_qty)
                 ->fact(trans('mail.checkedout_from'), $item->location->name ? $item->location->name : '')
                 ->fact(trans('mail.Accessory_Checkout_Notification') . " by ", $admin->present()->fullName())
                 ->fact(trans('admin/consumables/general.remaining'), $item->numRemaining())
                 ->fact(trans('mail.notes'), $note ?: '');
+        }
 
+        $message = trans('mail.Accessory_Checkout_Notification');
+        $details = [
+            trans('mail.assigned_to') => $target->present()->name,
+            trans('mail.accessory_name') => htmlspecialchars_decode($item->present()->name),
+            trans('general.qty') => $this->checkout_qty,
+            trans('mail.checkedout_from') => $item->location->name ? $item->location->name : '',
+            trans('mail.Accessory_Checkout_Notification'). ' by' => $admin->present()->fullName(),
+            trans('admin/consumables/general.remaining')=> $item->numRemaining(),
+            trans('mail.notes') => $note ?: '',
+        ];
+        return  array($message, $details);
     }
     public function toGoogleChat()
     {
@@ -184,6 +208,7 @@ class CheckoutAccessoryNotification extends Notification
                 'eula'          => $eula,
                 'req_accept'    => $req_accept,
                 'accept_url'    => $accept_url,
+                'checkout_qty'  => $this->checkout_qty,
             ])
             ->subject(trans('mail.Confirm_accessory_delivery'));
     }
diff --git a/app/Notifications/CheckoutAssetNotification.php b/app/Notifications/CheckoutAssetNotification.php
index 1c8c901b52..8cdfbdd046 100644
--- a/app/Notifications/CheckoutAssetNotification.php
+++ b/app/Notifications/CheckoutAssetNotification.php
@@ -8,9 +8,10 @@ use App\Models\Setting;
 use App\Models\User;
 use Exception;
 use Illuminate\Bus\Queueable;
-use Illuminate\Notifications\Messages\MailMessage;
+use Illuminate\Notifications\Channels\SlackWebhookChannel;
 use Illuminate\Notifications\Messages\SlackMessage;
 use Illuminate\Notifications\Notification;
+use Illuminate\Support\Str;
 use NotificationChannels\GoogleChat\Card;
 use NotificationChannels\GoogleChat\Enums\Icon;
 use NotificationChannels\GoogleChat\Enums\ImageStyle;
@@ -21,6 +22,9 @@ use NotificationChannels\GoogleChat\Widgets\KeyValue;
 use NotificationChannels\MicrosoftTeams\MicrosoftTeamsChannel;
 use NotificationChannels\MicrosoftTeams\MicrosoftTeamsMessage;
 use Illuminate\Support\Facades\Log;
+use Osama\LaravelTeamsNotification\Logging\TeamsLoggingChannel;
+use Osama\LaravelTeamsNotification\TeamsNotification;
+
 class CheckoutAssetNotification extends Notification
 {
     use Queueable;
@@ -32,14 +36,11 @@ class CheckoutAssetNotification extends Notification
      */
     public function __construct(Asset $asset, $checkedOutTo, User $checkedOutBy, $acceptance, $note)
     {
+        $this->settings = Setting::getSettings();
         $this->item = $asset;
         $this->admin = $checkedOutBy;
         $this->note = $note;
         $this->target = $checkedOutTo;
-        $this->acceptance = $acceptance;
-
-        $this->settings = Setting::getSettings();
-
         $this->last_checkout = '';
         $this->expected_checkin = '';
 
@@ -53,7 +54,6 @@ class CheckoutAssetNotification extends Notification
                 false);
         }
     }
-
     /**
      * Get the notification's delivery channels.
      *
@@ -62,70 +62,51 @@ class CheckoutAssetNotification extends Notification
     public function via()
     {
         $notifyBy = [];
-        if (Setting::getSettings()->webhook_selected == 'google' && Setting::getSettings()->webhook_endpoint) {
+
+        if (Setting::getSettings()->webhook_selected === 'google' && Setting::getSettings()->webhook_endpoint) {
 
             $notifyBy[] = GoogleChatChannel::class;
         }
 
-        if (Setting::getSettings()->webhook_selected == 'microsoft' && Setting::getSettings()->webhook_endpoint) {
+        if (Setting::getSettings()->webhook_selected === 'microsoft' && Setting::getSettings()->webhook_endpoint) {
 
             $notifyBy[] = MicrosoftTeamsChannel::class;
         }
 
 
-        if (Setting::getSettings()->webhook_selected == 'slack' || Setting::getSettings()->webhook_selected == 'general' ) {
+        if (Setting::getSettings()->webhook_selected === 'slack' || Setting::getSettings()->webhook_selected === 'general' ) {
 
             Log::debug('use webhook');
-            $notifyBy[] = 'slack';
-        }
-
-        /**
-         * Only send notifications to users that have email addresses
-         */
-        if ($this->target instanceof User && $this->target->email != '') {
-
-            /**
-             * Send an email if the asset requires acceptance,
-             * so the user can accept or decline the asset
-             */
-            if ($this->item->requireAcceptance()) {
-                $notifyBy[1] = 'mail';
-            }
-
-            /**
-             * Send an email if the item has a EULA, since the user should always receive it
-             */
-            if ($this->item->getEula()) {
-                $notifyBy[1] = 'mail';
-            }
-
-            /**
-             * Send an email if an email should be sent at checkin/checkout
-             */
-            if ($this->item->checkin_email()) {
-                $notifyBy[1] = 'mail';
-            }
+            $notifyBy[] = SlackWebhookChannel::class;
         }
 
         return $notifyBy;
     }
 
-    public function toSlack()
+    public function toSlack() :SlackMessage
     {
         $target = $this->target;
         $admin = $this->admin;
         $item = $this->item;
         $note = $this->note;
-        $botname = ($this->settings->webhook_botname) ? $this->settings->webhook_botname : 'Snipe-Bot';
+        $botname = ($this->settings->webhook_botname) ?: 'Snipe-Bot';
         $channel = ($this->settings->webhook_channel) ? $this->settings->webhook_channel : '';
 
         $fields = [
-            'To' => '<'.$target->present()->viewUrl().'|'.$target->present()->fullName().'>',
-            'By' => '<'.$admin->present()->viewUrl().'|'.$admin->present()->fullName().'>',
+            trans('general.to') => '<'.$target->present()->viewUrl().'|'.$target->present()->fullName().'>',
+            trans('general.by') => '<'.$admin->present()->viewUrl().'|'.$admin->present()->fullName().'>',
         ];
 
-        if (($this->expected_checkin) && ($this->expected_checkin != '')) {
-            $fields['Expected Checkin'] = $this->expected_checkin;
+        if ($item->location) {
+            $fields[trans('general.location')] = $item->location->name;
+        }
+
+        if ($item->company) {
+            $fields[trans('general.company')] = $item->company->name;
+        }
+
+        if (($this->expected_checkin) && ($this->expected_checkin !== '')) {
+            $fields[trans('general.expected_checkin')] = $this->expected_checkin;
         }
 
         return (new SlackMessage)
@@ -138,6 +119,7 @@ class CheckoutAssetNotification extends Notification
                     ->content($note);
             });
     }
+
     public function toMicrosoftTeams()
     {
         $target = $this->target;
@@ -145,17 +127,26 @@ class CheckoutAssetNotification extends Notification
         $item = $this->item;
         $note = $this->note;
 
-        return MicrosoftTeamsMessage::create()
-            ->to($this->settings->webhook_endpoint)
-            ->type('success')
-            ->title(trans('mail.Asset_Checkout_Notification'))
-            ->addStartGroupToSection('activityText')
-            ->fact(trans('mail.assigned_to'), $target->present()->name)
-            ->fact(htmlspecialchars_decode($item->present()->name), '', 'activityText')
-            ->fact(trans('mail.Asset_Checkout_Notification') . " by ", $admin->present()->fullName())
-            ->fact(trans('mail.notes'), $note ?: '');
-
+        if(!Str::contains(Setting::getSettings()->webhook_endpoint, 'workflows')) {
+            return MicrosoftTeamsMessage::create()
+                ->to($this->settings->webhook_endpoint)
+                ->type('success')
+                ->title(trans('mail.Asset_Checkout_Notification'))
+                ->addStartGroupToSection('activityText')
+                ->fact(trans('mail.assigned_to'), $target->present()->name)
+                ->fact(htmlspecialchars_decode($item->present()->name), '', 'activityText')
+                ->fact(trans('mail.Asset_Checkout_Notification') . " by ", $admin->present()->fullName())
+                ->fact(trans('mail.notes'), $note ?: '');
+        }
 
+        $message = trans('mail.Asset_Checkout_Notification');
+        $details = [
+            trans('mail.assigned_to') => $target->present()->name,
+            trans('mail.asset') => htmlspecialchars_decode($item->present()->name),
+            trans('mail.Asset_Checkout_Notification'). ' by' => $admin->present()->fullName(),
+            trans('mail.notes') => $note ?: '',
+        ];
+       return  array($message, $details);
     }
 public function toGoogleChat()
     {
@@ -184,42 +175,4 @@ public function toGoogleChat()
             );
 
     }
-
-    /**
-     * Get the mail representation of the notification.
-     *
-     * @param  mixed  $notifiable
-     * @return \Illuminate\Notifications\Messages\MailMessage
-     */
-    public function toMail()
-    {
-        $eula = method_exists($this->item, 'getEula') ? $this->item->getEula() : '';
-        $req_accept = method_exists($this->item, 'requireAcceptance') ? $this->item->requireAcceptance() : 0;
-
-        $fields = [];
-
-        // Check if the item has custom fields associated with it
-        if (($this->item->model) && ($this->item->model->fieldset)) {
-            $fields = $this->item->model->fieldset->fields;
-        }
-
-        $accept_url = is_null($this->acceptance) ? null : route('account.accept.item', $this->acceptance);
-
-        $message = (new MailMessage)->markdown('notifications.markdown.checkout-asset',
-            [
-                'item'          => $this->item,
-                'admin'         => $this->admin,
-                'note'          => $this->note,
-                'target'        => $this->target,
-                'fields'        => $fields,
-                'eula'          => $eula,
-                'req_accept'    => $req_accept,
-                'accept_url'    => $accept_url,
-                'last_checkout' => $this->last_checkout,
-                'expected_checkin'  => $this->expected_checkin,
-            ])
-            ->subject(trans('mail.Confirm_asset_delivery'));
-
-        return $message;
-    }
 }
diff --git a/app/Notifications/CheckoutConsumableNotification.php b/app/Notifications/CheckoutConsumableNotification.php
index 6746795f2c..e8db8b8bd1 100644
--- a/app/Notifications/CheckoutConsumableNotification.php
+++ b/app/Notifications/CheckoutConsumableNotification.php
@@ -6,9 +6,11 @@ use App\Models\Consumable;
 use App\Models\Setting;
 use App\Models\User;
 use Illuminate\Bus\Queueable;
+use Illuminate\Notifications\Channels\SlackWebhookChannel;
 use Illuminate\Notifications\Messages\MailMessage;
 use Illuminate\Notifications\Messages\SlackMessage;
 use Illuminate\Notifications\Notification;
+use Illuminate\Support\Str;
 use NotificationChannels\GoogleChat\Card;
 use NotificationChannels\GoogleChat\GoogleChatChannel;
 use NotificationChannels\GoogleChat\GoogleChatMessage;
@@ -38,6 +40,7 @@ class CheckoutConsumableNotification extends Notification
         $this->note = $note;
         $this->target = $checkedOutTo;
         $this->acceptance = $acceptance;
+        $this->qty = $consumable->checkout_qty;
 
         $this->settings = Setting::getSettings();
     }
@@ -61,35 +64,7 @@ class CheckoutConsumableNotification extends Notification
         }
 
         if (Setting::getSettings()->webhook_selected == 'slack' || Setting::getSettings()->webhook_selected == 'general' ) {
-            $notifyBy[] = 'slack';
-        }
-
-        /**
-         * Only send notifications to users that have email addresses
-         */
-        if ($this->target instanceof User && $this->target->email != '') {
-
-            /**
-             * Send an email if the asset requires acceptance,
-             * so the user can accept or decline the asset
-             */
-            if ($this->item->requireAcceptance()) {
-                $notifyBy[1] = 'mail';
-            }
-
-            /**
-             * Send an email if the item has a EULA, since the user should always receive it
-             */
-            if ($this->item->getEula()) {
-                $notifyBy[1] = 'mail';
-            }
-
-            /**
-             * Send an email if an email should be sent at checkin/checkout
-             */
-            if ((method_exists($this->item, 'checkin_email')) && ($this->item->checkin_email())) {
-                $notifyBy[1] = 'mail';
-            }
+            $notifyBy[] = SlackWebhookChannel::class;
         }
 
         return $notifyBy;
@@ -105,10 +80,18 @@ class CheckoutConsumableNotification extends Notification
         $channel = ($this->settings->webhook_channel) ? $this->settings->webhook_channel : '';
 
         $fields = [
-            'To' => '<'.$target->present()->viewUrl().'|'.$target->present()->fullName().'>',
-            'By' => '<'.$admin->present()->viewUrl().'|'.$admin->present()->fullName().'>',
+            trans('general.to') => '<'.$target->present()->viewUrl().'|'.$target->present()->fullName().'>',
+            trans('general.by') => '<'.$admin->present()->viewUrl().'|'.$admin->present()->fullName().'>',
         ];
 
+        if ($item->location) {
+            $fields[trans('general.location')] = $item->location->name;
+        }
+
+        if ($item->company) {
+            $fields[trans('general.company')] = $item->company->name;
+        }
+
         return (new SlackMessage)
             ->content(':arrow_up: :paperclip: Consumable Checked Out')
             ->from($botname)
@@ -126,17 +109,30 @@ class CheckoutConsumableNotification extends Notification
         $item = $this->item;
         $note = $this->note;
 
-        return MicrosoftTeamsMessage::create()
-            ->to($this->settings->webhook_endpoint)
-            ->type('success')
-            ->addStartGroupToSection('activityTitle')
-            ->title(trans('mail.Consumable_checkout_notification'))
-            ->addStartGroupToSection('activityText')
-            ->fact(htmlspecialchars_decode($item->present()->name), '', 'activityTitle')
-            ->fact(trans('mail.Consumable_checkout_notification')." by ", $admin->present()->fullName())
-            ->fact(trans('mail.assigned_to'), $target->present()->fullName())
-            ->fact(trans('admin/consumables/general.remaining'), $item->numRemaining())
-            ->fact(trans('mail.notes'), $note ?: '');
+        if(!Str::contains(Setting::getSettings()->webhook_endpoint, 'workflows')) {
+            return MicrosoftTeamsMessage::create()
+                ->to($this->settings->webhook_endpoint)
+                ->type('success')
+                ->addStartGroupToSection('activityTitle')
+                ->title(trans('mail.Consumable_checkout_notification'))
+                ->addStartGroupToSection('activityText')
+                ->fact(htmlspecialchars_decode($item->present()->name), '', 'activityTitle')
+                ->fact(trans('mail.Consumable_checkout_notification')." by ", $admin->present()->fullName())
+                ->fact(trans('mail.assigned_to'), $target->present()->fullName())
+                ->fact(trans('admin/consumables/general.remaining'), $item->numRemaining())
+                ->fact(trans('mail.notes'), $note ?: '');
+        }
+
+        $message = trans('mail.Consumable_checkout_notification');
+        $details = [
+            trans('mail.assigned_to') => $target->present()->fullName(),
+            trans('mail.item') => htmlspecialchars_decode($item->present()->name),
+            trans('mail.Consumable_checkout_notification').' by' => $admin->present()->fullName(),
+            trans('admin/consumables/general.remaining') => $item->numRemaining(),
+            trans('mail.notes') => $note ?: '',
+        ];
+
+        return  array($message, $details);
     }
     public function toGoogleChat()
     {
@@ -165,30 +161,4 @@ class CheckoutConsumableNotification extends Notification
             );
 
     }
-
-    /**
-     * Get the mail representation of the notification.
-     *
-     * @return \Illuminate\Notifications\Messages\MailMessage
-     */
-    public function toMail()
-    {
-        Log::debug($this->item->getImageUrl());
-        $eula = $this->item->getEula();
-        $req_accept = $this->item->requireAcceptance();
-
-        $accept_url = is_null($this->acceptance) ? null : route('account.accept.item', $this->acceptance);
-
-        return (new MailMessage)->markdown('notifications.markdown.checkout-consumable',
-            [
-                'item'          => $this->item,
-                'admin'         => $this->admin,
-                'note'          => $this->note,
-                'target'        => $this->target,
-                'eula'          => $eula,
-                'req_accept'    => $req_accept,
-                'accept_url'    => $accept_url,
-            ])
-            ->subject(trans('mail.Confirm_consumable_delivery'));
-    }
 }
diff --git a/app/Notifications/CheckoutLicenseSeatNotification.php b/app/Notifications/CheckoutLicenseSeatNotification.php
index 8e0273c66e..fa00421885 100644
--- a/app/Notifications/CheckoutLicenseSeatNotification.php
+++ b/app/Notifications/CheckoutLicenseSeatNotification.php
@@ -6,9 +6,11 @@ use App\Models\LicenseSeat;
 use App\Models\Setting;
 use App\Models\User;
 use Illuminate\Bus\Queueable;
+use Illuminate\Notifications\Channels\SlackWebhookChannel;
 use Illuminate\Notifications\Messages\MailMessage;
 use Illuminate\Notifications\Messages\SlackMessage;
 use Illuminate\Notifications\Notification;
+use Illuminate\Support\Str;
 use NotificationChannels\GoogleChat\Card;
 use NotificationChannels\GoogleChat\GoogleChatChannel;
 use NotificationChannels\GoogleChat\GoogleChatMessage;
@@ -60,35 +62,7 @@ class CheckoutLicenseSeatNotification extends Notification
         }
 
         if (Setting::getSettings()->webhook_selected == 'slack' || Setting::getSettings()->webhook_selected == 'general' ) {
-            $notifyBy[] = 'slack';
-        }
-
-        /**
-         * Only send notifications to users that have email addresses
-         */
-        if ($this->target instanceof User && $this->target->email != '') {
-
-            /**
-             * Send an email if the asset requires acceptance,
-             * so the user can accept or decline the asset
-             */
-            if ($this->item->requireAcceptance()) {
-                $notifyBy[1] = 'mail';
-            }
-
-            /**
-             * Send an email if the item has a EULA, since the user should always receive it
-             */
-            if ($this->item->getEula()) {
-                $notifyBy[1] = 'mail';
-            }
-
-            /**
-             * Send an email if an email should be sent at checkin/checkout
-             */
-            if ($this->item->checkin_email()) {
-                $notifyBy[1] = 'mail';
-            }
+            $notifyBy[] = SlackWebhookChannel::class;
         }
 
         return $notifyBy;
@@ -104,10 +78,18 @@ class CheckoutLicenseSeatNotification extends Notification
         $channel = ($this->settings->webhook_channel) ? $this->settings->webhook_channel : '';
 
         $fields = [
-            'To' => '<'.$target->present()->viewUrl().'|'.$target->present()->fullName().'>',
-            'By' => '<'.$admin->present()->viewUrl().'|'.$admin->present()->fullName().'>',
+            trans('general.to') => '<'.$target->present()->viewUrl().'|'.$target->present()->fullName().'>',
+            trans('general.by') => '<'.$admin->present()->viewUrl().'|'.$admin->present()->fullName().'>',
         ];
 
+        if ($item->location) {
+            $fields[trans('general.location')] = $item->location->name;
+        }
+
+        if ($item->company) {
+            $fields[trans('general.company')] = $item->company->name;
+        }
+
         return (new SlackMessage)
             ->content(':arrow_up: :floppy_disk: License Checked Out')
             ->from($botname)
@@ -125,17 +107,29 @@ class CheckoutLicenseSeatNotification extends Notification
         $item = $this->item;
         $note = $this->note;
 
-        return MicrosoftTeamsMessage::create()
-            ->to($this->settings->webhook_endpoint)
-            ->type('success')
-            ->addStartGroupToSection('activityTitle')
-            ->title(trans('mail.License_Checkout_Notification'))
-            ->addStartGroupToSection('activityText')
-            ->fact(htmlspecialchars_decode($item->present()->name), '', 'activityTitle')
-            ->fact(trans('mail.License_Checkout_Notification')." by ", $admin->present()->fullName())
-            ->fact(trans('mail.assigned_to'), $target->present()->fullName())
-            ->fact(trans('admin/consumables/general.remaining'), $item->availCount()->count())
-            ->fact(trans('mail.notes'), $note ?: '');
+        if(!Str::contains(Setting::getSettings()->webhook_endpoint, 'workflows')) {
+            return MicrosoftTeamsMessage::create()
+                ->to($this->settings->webhook_endpoint)
+                ->type('success')
+                ->addStartGroupToSection('activityTitle')
+                ->title(trans('mail.License_Checkout_Notification'))
+                ->addStartGroupToSection('activityText')
+                ->fact(htmlspecialchars_decode($item->present()->name), '', 'activityTitle')
+                ->fact(trans('mail.License_Checkout_Notification')." by ", $admin->present()->fullName())
+                ->fact(trans('mail.assigned_to'), $target->present()->fullName())
+                ->fact(trans('admin/consumables/general.remaining'), $item->availCount()->count())
+                ->fact(trans('mail.notes'), $note ?: '');
+        }
+
+        $message = trans('mail.License_Checkout_Notification');
+        $details = [
+            trans('mail.assigned_to') => $target->present()->fullName(),
+            trans('mail.license_for') => htmlspecialchars_decode($item->present()->name),
+            trans('mail.License_Checkout_Notification').' by' => $admin->present()->fullName(),
+            trans('admin/consumables/general.remaining') => $item->availCount()->count(),
+            trans('mail.notes') => $note ?: '',
+        ];
+        return  array($message, $details);
     }
     public function toGoogleChat()
     {
@@ -164,29 +158,4 @@ class CheckoutLicenseSeatNotification extends Notification
             );
 
     }
-
-    /**
-     * Get the mail representation of the notification.
-     *
-     * @return \Illuminate\Notifications\Messages\MailMessage
-     */
-    public function toMail()
-    {
-        $eula = method_exists($this->item, 'getEula') ? $this->item->getEula() : '';
-        $req_accept = method_exists($this->item, 'requireAcceptance') ? $this->item->requireAcceptance() : 0;
-
-        $accept_url = is_null($this->acceptance) ? null : route('account.accept.item', $this->acceptance);
-
-        return (new MailMessage)->markdown('notifications.markdown.checkout-license',
-            [
-                'item'          => $this->item,
-                'admin'         => $this->admin,
-                'note'          => $this->note,
-                'target'        => $this->target,
-                'eula'          => $eula,
-                'req_accept'    => $req_accept,
-                'accept_url'    => $accept_url,
-            ])
-            ->subject(trans('mail.Confirm_license_delivery'));
-    }
 }
diff --git a/app/Observers/AccessoryObserver.php b/app/Observers/AccessoryObserver.php
index 661d00b4c2..0f8b2492cd 100644
--- a/app/Observers/AccessoryObserver.php
+++ b/app/Observers/AccessoryObserver.php
@@ -20,7 +20,7 @@ class AccessoryObserver
         $logAction->item_type = Accessory::class;
         $logAction->item_id = $accessory->id;
         $logAction->created_at = date('Y-m-d H:i:s');
-        $logAction->user_id = Auth::id();
+        $logAction->created_by = auth()->id();
         $logAction->logaction('update');
     }
 
@@ -37,7 +37,7 @@ class AccessoryObserver
         $logAction->item_type = Accessory::class;
         $logAction->item_id = $accessory->id;
         $logAction->created_at = date('Y-m-d H:i:s');
-        $logAction->user_id = Auth::id();
+        $logAction->created_by = auth()->id();
         if($accessory->imported) {
             $logAction->setActionSource('importer');
         }
@@ -56,7 +56,7 @@ class AccessoryObserver
         $logAction->item_type = Accessory::class;
         $logAction->item_id = $accessory->id;
         $logAction->created_at = date('Y-m-d H:i:s');
-        $logAction->user_id = Auth::id();
+        $logAction->created_by = auth()->id();
         $logAction->logaction('delete');
     }
 }
diff --git a/app/Observers/AssetObserver.php b/app/Observers/AssetObserver.php
index f77c4cc00f..6c07a355ff 100644
--- a/app/Observers/AssetObserver.php
+++ b/app/Observers/AssetObserver.php
@@ -40,15 +40,16 @@ class AssetObserver
 
         // If the asset isn't being checked out or audited, log the update.
         // (Those other actions already create log entries.)
-	    if (($attributes['assigned_to'] == $attributesOriginal['assigned_to'])
-	    && ($same_checkout_counter) && ($same_checkin_counter)
+        if (array_key_exists('assigned_to', $attributes) && array_key_exists('assigned_to', $attributesOriginal)
+            && ($attributes['assigned_to'] == $attributesOriginal['assigned_to'])
+            && ($same_checkout_counter) && ($same_checkin_counter)
             && ((isset( $attributes['next_audit_date']) ? $attributes['next_audit_date'] : null) == (isset($attributesOriginal['next_audit_date']) ? $attributesOriginal['next_audit_date']: null))
             && ($attributes['last_checkout'] == $attributesOriginal['last_checkout']) && (!$restoring_or_deleting))
         {
             $changed = [];
 
             foreach ($asset->getRawOriginal() as $key => $value) {
-                if ($asset->getRawOriginal()[$key] != $asset->getAttributes()[$key]) {
+                if ((array_key_exists($key, $asset->getAttributes())) && ($asset->getRawOriginal()[$key] != $asset->getAttributes()[$key])) {
                     $changed[$key]['old'] = $asset->getRawOriginal()[$key];
                     $changed[$key]['new'] = $asset->getAttributes()[$key];
                 }
@@ -61,8 +62,9 @@ class AssetObserver
             $logAction = new Actionlog();
             $logAction->item_type = Asset::class;
             $logAction->item_id = $asset->id;
+            $logAction->action_date = date('Y-m-d H:i:s');
             $logAction->created_at = date('Y-m-d H:i:s');
-            $logAction->user_id = Auth::id();
+            $logAction->created_by = auth()->id();
             $logAction->log_meta = json_encode($changed);
             $logAction->logaction('update');
         }
@@ -80,7 +82,7 @@ class AssetObserver
     {
         if ($settings = Setting::getSettings()) {
             $tag = $asset->asset_tag;
-            $prefix = $settings->auto_increment_prefix;
+            $prefix = (string)($settings->auto_increment_prefix ?? '');
             $number = substr($tag, strlen($prefix));
             // IF - auto_increment_assets is on, AND (there is no prefix OR the prefix matches the start of the tag)
             //      AND the rest of the string after the prefix is all digits, THEN...
@@ -107,8 +109,9 @@ class AssetObserver
         $logAction = new Actionlog();
         $logAction->item_type = Asset::class; // can we instead say $logAction->item = $asset ?
         $logAction->item_id = $asset->id;
+        $logAction->action_date = date('Y-m-d H:i:s');
         $logAction->created_at = date('Y-m-d H:i:s');
-        $logAction->user_id = Auth::id();
+        $logAction->created_by = auth()->id();
         if($asset->imported) {
             $logAction->setActionSource('importer');
         }
@@ -127,7 +130,8 @@ class AssetObserver
         $logAction->item_type = Asset::class;
         $logAction->item_id = $asset->id;
         $logAction->created_at = date('Y-m-d H:i:s');
-        $logAction->user_id = Auth::id();
+        $logAction->action_date = date('Y-m-d H:i:s');
+        $logAction->created_by = auth()->id();
         $logAction->logaction('delete');
     }
 
@@ -142,8 +146,9 @@ class AssetObserver
         $logAction = new Actionlog();
         $logAction->item_type = Asset::class;
         $logAction->item_id = $asset->id;
+        $logAction->action_date = date('Y-m-d H:i:s');
         $logAction->created_at = date('Y-m-d H:i:s');
-        $logAction->user_id = Auth::id();
+        $logAction->created_by = auth()->id();
         $logAction->logaction('restore');
     }
 
@@ -158,7 +163,7 @@ class AssetObserver
      * is used in this observer, it doesn't actually exist yet and the migration will break unless we
      * use saveQuietly() in the migration which skips this observer.
      *
-     * @see https://github.com/snipe/snipe-it/issues/13723#issuecomment-1761315938
+     * @see https://github.com/grokability/snipe-it/issues/13723#issuecomment-1761315938
      */
     public function saving(Asset $asset)
     {
@@ -171,7 +176,7 @@ class AssetObserver
        // determine if explicit and set eol_explicit to true
        if (!is_null($asset->asset_eol_date) && !is_null($asset->purchase_date)) {
             if($asset->model->eol > 0) {
-                $months = Carbon::parse($asset->asset_eol_date)->diffInMonths($asset->purchase_date); 
+                $months = (int) Carbon::parse($asset->asset_eol_date)->diffInMonths($asset->purchase_date, true);
                 if($months != $asset->model->eol) {
                     $asset->eol_explicit = true;
                 }
diff --git a/app/Observers/ComponentObserver.php b/app/Observers/ComponentObserver.php
index 44bf819353..cd2c58c367 100644
--- a/app/Observers/ComponentObserver.php
+++ b/app/Observers/ComponentObserver.php
@@ -20,7 +20,7 @@ class ComponentObserver
         $logAction->item_type = Component::class;
         $logAction->item_id = $component->id;
         $logAction->created_at = date('Y-m-d H:i:s');
-        $logAction->user_id = Auth::id();
+        $logAction->created_by = auth()->id();
         $logAction->logaction('update');
     }
 
@@ -37,7 +37,7 @@ class ComponentObserver
         $logAction->item_type = Component::class;
         $logAction->item_id = $component->id;
         $logAction->created_at = date('Y-m-d H:i:s');
-        $logAction->user_id = Auth::id();
+        $logAction->created_by = auth()->id();
         if($component->imported) {
             $logAction->setActionSource('importer');
         }
@@ -56,7 +56,7 @@ class ComponentObserver
         $logAction->item_type = Component::class;
         $logAction->item_id = $component->id;
         $logAction->created_at = date('Y-m-d H:i:s');
-        $logAction->user_id = Auth::id();
+        $logAction->created_by = auth()->id();
         $logAction->logaction('delete');
     }
 }
diff --git a/app/Observers/ConsumableObserver.php b/app/Observers/ConsumableObserver.php
index 08c56d2ee2..57471cee9c 100644
--- a/app/Observers/ConsumableObserver.php
+++ b/app/Observers/ConsumableObserver.php
@@ -5,6 +5,8 @@ namespace App\Observers;
 use App\Models\Actionlog;
 use App\Models\Consumable;
 use Illuminate\Support\Facades\Auth;
+use Illuminate\Support\Facades\Log;
+use Illuminate\Support\Facades\Storage;
 
 class ConsumableObserver
 {
@@ -16,12 +18,26 @@ class ConsumableObserver
      */
     public function updated(Consumable $consumable)
     {
-        $logAction = new Actionlog();
-        $logAction->item_type = Consumable::class;
-        $logAction->item_id = $consumable->id;
-        $logAction->created_at = date('Y-m-d H:i:s');
-        $logAction->user_id = Auth::id();
-        $logAction->logaction('update');
+
+        $changed = [];
+        
+        foreach ($consumable->getRawOriginal() as $key => $value) {
+            // Check and see if the value changed
+            if ($consumable->getRawOriginal()[$key] != $consumable->getAttributes()[$key]) {
+                $changed[$key]['old'] = $consumable->getRawOriginal()[$key];
+                $changed[$key]['new'] = $consumable->getAttributes()[$key];
+            }
+        }
+
+        if (count($changed) > 0) {
+            $logAction = new Actionlog();
+            $logAction->item_type = Consumable::class;
+            $logAction->item_id = $consumable->id;
+            $logAction->created_at = date('Y-m-d H:i:s');
+            $logAction->created_by = auth()->id();
+            $logAction->log_meta = json_encode($changed);
+            $logAction->logaction('update');
+        }
     }
 
     /**
@@ -37,7 +53,7 @@ class ConsumableObserver
         $logAction->item_type = Consumable::class;
         $logAction->item_id = $consumable->id;
         $logAction->created_at = date('Y-m-d H:i:s');
-        $logAction->user_id = Auth::id();
+        $logAction->created_by = auth()->id();
         if($consumable->imported) {
             $logAction->setActionSource('importer');
         }
@@ -52,11 +68,37 @@ class ConsumableObserver
      */
     public function deleting(Consumable $consumable)
     {
+
+        $consumable->users()->detach();
+        $uploads = $consumable->uploads;
+
+        foreach ($uploads as $file) {
+            try {
+                Storage::delete('private_uploads/consumables/'.$file->filename);
+                $file->delete();
+            } catch (\Exception $e) {
+                Log::info($e);
+            }
+        }
+
+
+
+        try {
+            Storage::disk('public')->delete('consumables/'.$consumable->image);
+        } catch (\Exception $e) {
+            Log::info($e);
+        }
+
+        $consumable->image = null;
+        $consumable->save();
+
+
+
         $logAction = new Actionlog();
         $logAction->item_type = Consumable::class;
         $logAction->item_id = $consumable->id;
         $logAction->created_at = date('Y-m-d H:i:s');
-        $logAction->user_id = Auth::id();
+        $logAction->created_by = auth()->id();
         $logAction->logaction('delete');
     }
 }
diff --git a/app/Observers/LicenseObserver.php b/app/Observers/LicenseObserver.php
index de4863fafa..4e355bf639 100644
--- a/app/Observers/LicenseObserver.php
+++ b/app/Observers/LicenseObserver.php
@@ -20,7 +20,7 @@ class LicenseObserver
         $logAction->item_type = License::class;
         $logAction->item_id = $license->id;
         $logAction->created_at = date('Y-m-d H:i:s');
-        $logAction->user_id = Auth::id();
+        $logAction->created_by = auth()->id();
         $logAction->logaction('update');
     }
 
@@ -37,7 +37,7 @@ class LicenseObserver
         $logAction->item_type = License::class;
         $logAction->item_id = $license->id;
         $logAction->created_at = date('Y-m-d H:i:s');
-        $logAction->user_id = Auth::id();
+        $logAction->created_by = auth()->id();
         if($license->imported) {
             $logAction->setActionSource('importer');
         }
@@ -56,7 +56,7 @@ class LicenseObserver
         $logAction->item_type = License::class;
         $logAction->item_id = $license->id;
         $logAction->created_at = date('Y-m-d H:i:s');
-        $logAction->user_id = Auth::id();
+        $logAction->created_by = auth()->id();
         $logAction->logaction('delete');
     }
 }
diff --git a/app/Observers/UserObserver.php b/app/Observers/UserObserver.php
index c7c2a460cb..acde9ceaed 100644
--- a/app/Observers/UserObserver.php
+++ b/app/Observers/UserObserver.php
@@ -83,7 +83,7 @@ class UserObserver
             $logAction->target_type = User::class; // can we instead say $logAction->item = $asset ?
             $logAction->target_id = $user->id;
             $logAction->created_at = date('Y-m-d H:i:s');
-            $logAction->user_id = Auth::id();
+            $logAction->created_by = auth()->id();
             $logAction->log_meta = json_encode($changed);
             $logAction->logaction('update');
         }
@@ -105,7 +105,7 @@ class UserObserver
         $logAction->item_type = User::class; // can we instead say $logAction->item = $asset ?
         $logAction->item_id = $user->id;
         $logAction->created_at = date('Y-m-d H:i:s');
-        $logAction->user_id = Auth::id();
+        $logAction->created_by = auth()->id();
         $logAction->logaction('create');
     }
 
@@ -123,7 +123,7 @@ class UserObserver
         $logAction->target_type = User::class; // can we instead say $logAction->item = $asset ?
         $logAction->target_id = $user->id;
         $logAction->created_at = date('Y-m-d H:i:s');
-        $logAction->user_id = Auth::id();
+        $logAction->created_by = auth()->id();
         $logAction->logaction('delete');
     }
 
@@ -141,7 +141,7 @@ class UserObserver
         $logAction->target_type = User::class; // can we instead say $logAction->item = $asset ?
         $logAction->target_id = $user->id;
         $logAction->created_at = date('Y-m-d H:i:s');
-        $logAction->user_id = Auth::id();
+        $logAction->created_by = auth()->id();
         $logAction->logaction('restore');
     }
 
diff --git a/app/Policies/CustomFieldsetPolicy.php b/app/Policies/CustomFieldsetPolicy.php
index a6c06a7007..4bb7e2dab6 100644
--- a/app/Policies/CustomFieldsetPolicy.php
+++ b/app/Policies/CustomFieldsetPolicy.php
@@ -11,7 +11,7 @@ class CustomFieldsetPolicy extends SnipePermissionsPolicy
          * This allows us to use the existing permissions in use and have more
          * semantically correct authorization checks for custom fieldsets.
          *
-         * See: https://github.com/snipe/snipe-it/pull/5795
+         * See: https://github.com/grokability/snipe-it/pull/5795
          */
         return 'customfields';
     }
diff --git a/app/Policies/LicensePolicy.php b/app/Policies/LicensePolicy.php
index 544835c3b8..38f5700ad1 100644
--- a/app/Policies/LicensePolicy.php
+++ b/app/Policies/LicensePolicy.php
@@ -22,7 +22,7 @@ class LicensePolicy extends CheckoutablePermissionsPolicy
      * something (maybe I got the product key wrong), and now I can never
      * see/edit that product key.
      *
-     * @see https://github.com/snipe/snipe-it/issues/6956
+     * @see https://github.com/grokability/snipe-it/issues/6956
      * @param  \App\Models\User  $user
      * @param  \App\Models\License  $license
      * @return mixed
diff --git a/app/Presenters/AccessoryPresenter.php b/app/Presenters/AccessoryPresenter.php
index fd6122cab7..86b4d1bc0f 100644
--- a/app/Presenters/AccessoryPresenter.php
+++ b/app/Presenters/AccessoryPresenter.php
@@ -78,28 +78,36 @@ class AccessoryPresenter extends Presenter
                 'sortable' => true,
                 'title' => trans('general.location'),
                 'formatter' => 'locationsLinkObjFormatter',
+            ], [
+                'field' => 'min_amt',
+                'searchable' => false,
+                'sortable' => true,
+                'title' => trans('general.min_amt'),
+                'formatter' => 'minAmtFormatter',
+                'class' => 'text-right text-padding-number-cell',
             ], [
                 'field' => 'qty',
                 'searchable' => false,
                 'sortable' => true,
                 'title' => trans('admin/accessories/general.total'),
+                'footerFormatter' => 'qtySumFormatter',
+                'class' => 'text-right text-padding-number-cell',
             ], [
-                'field' => 'remaining_qty',
+                'field' => 'remaining',
                 'searchable' => false,
                 'sortable' => false,
                 'visible' => false,
                 'title' => trans('admin/accessories/general.remaining'),
+                'footerFormatter' => 'qtySumFormatter',
+                'class' => 'text-right text-padding-number-cell',
             ],[
-                'field' => 'users_count',
+                'field' => 'checkouts_count',
                 'searchable' => false,
                 'sortable' => true,
                 'visible' => true,
                 'title' => trans('general.checked_out'),
-            ], [
-                'field' => 'min_qty',
-                'searchable' => false,
-                'sortable' => true,
-                'title' => trans('general.min_amt'),
+                'footerFormatter' => 'qtySumFormatter',
+                'class' => 'text-right text-padding-number-cell',
             ], [
                 'field' => 'purchase_date',
                 'searchable' => true,
@@ -113,7 +121,7 @@ class AccessoryPresenter extends Presenter
                 'sortable' => true,
                 'title' => trans('general.purchase_cost'),
                 'footerFormatter' => 'sumFormatterQuantity',
-                'class' => 'text-right',
+                'class' => 'text-right text-padding-number-cell',
             ], [
                 'field' => 'order_number',
                 'searchable' => true,
@@ -127,6 +135,29 @@ class AccessoryPresenter extends Presenter
                 'visible' => false,
                 'title' => trans('general.notes'),
                 'formatter' => 'notesFormatter'
+            ], [
+                'field' => 'created_by',
+                'searchable' => false,
+                'sortable' => true,
+                'title' => trans('general.created_by'),
+                'visible' => false,
+                'formatter' => 'usersLinkObjFormatter',
+            ], [
+                'field' => 'created_at',
+                'searchable' => true,
+                'sortable' => true,
+                'switchable' => true,
+                'title' => trans('general.created_at'),
+                'visible' => false,
+                'formatter' => 'dateDisplayFormatter',
+            ], [
+                'field' => 'updated_at',
+                'searchable' => true,
+                'sortable' => true,
+                'switchable' => true,
+                'title' => trans('general.updated_at'),
+                'visible' => false,
+                'formatter' => 'dateDisplayFormatter',
             ], [
                 'field' => 'change',
                 'searchable' => false,
@@ -135,7 +166,7 @@ class AccessoryPresenter extends Presenter
                 'title' => trans('general.change'),
                 'formatter' => 'accessoriesInOutFormatter',
             ], [
-                'field' => 'actions',
+                'field' => 'available_actions',
                 'searchable' => false,
                 'sortable' => false,
                 'switchable' => false,
@@ -147,6 +178,74 @@ class AccessoryPresenter extends Presenter
         return json_encode($layout);
     }
 
+
+    public static function assignedDataTableLayout()
+    {
+        $layout = [
+            [
+                'field' => 'id',
+                'searchable' => false,
+                'sortable' => false,
+                'switchable' => true,
+                'title' => trans('general.id'),
+                'visible' => false,
+            ],
+            [
+                'field' => 'assigned_to.image',
+                'searchable' => false,
+                'sortable' => false,
+                'switchable' => true,
+                'title' => trans('general.image'),
+                'visible' => true,
+                'formatter' => 'imageFormatter',
+            ],
+            [
+                'field' => 'assigned_to',
+                'searchable' => false,
+                'sortable' => false,
+                'switchable' => true,
+                'title' => trans('general.checked_out_to'),
+                'visible' => true,
+                'formatter' => 'polymorphicItemFormatter',
+            ],
+            [
+                'field' => 'note',
+                'searchable' => false,
+                'sortable' => false,
+                'switchable' => true,
+                'title' => trans('general.notes'),
+                'visible' => true,
+            ],
+            [
+                'field' => 'created_at',
+                'searchable' => false,
+                'sortable' => false,
+                'switchable' => true,
+                'title' => trans('admin/hardware/table.checkout_date'),
+                'visible' => true,
+                'formatter' => 'dateDisplayFormatter',
+            ],
+            [
+                'field' => 'created_by',
+                'searchable' => false,
+                'sortable' => false,
+                'title' => trans('general.created_by'),
+                'visible' => false,
+                'formatter' => 'usersLinkObjFormatter',
+            ],
+            [
+                'field' => 'available_actions',
+                'searchable' => false,
+                'sortable' => false,
+                'switchable' => false,
+                'title' => trans('table.actions'),
+                'formatter' => 'accessoriesInOutFormatter',
+            ],
+        ];
+
+        return json_encode($layout);
+    }
+
     /**
      * Pregenerated link to this accessories view page.
      * @return string
diff --git a/app/Presenters/ActionlogPresenter.php b/app/Presenters/ActionlogPresenter.php
index 2794b6c5fb..4b7aefc87a 100644
--- a/app/Presenters/ActionlogPresenter.php
+++ b/app/Presenters/ActionlogPresenter.php
@@ -7,7 +7,7 @@ namespace App\Presenters;
  */
 class ActionlogPresenter extends Presenter
 {
-    public function admin()
+    public function adminuser()
     {
         if ($user = $this->model->user) {
             if (empty($user->deleted_at)) {
@@ -42,27 +42,27 @@ class ActionlogPresenter extends Presenter
         // User related icons
         if ($this->itemType() == 'user') {
 
-            if ($this->actionType()=='2fa reset') {
+            if ($this->action_type == '2fa reset') {
                 return 'fa-solid fa-mobile-screen';
             }
 
-            if ($this->actionType()=='create new') {
+            if ($this->action_type == 'create') {
                 return 'fa-solid fa-user-plus';
             }
 
-            if ($this->actionType()=='merged') {
+            if ($this->action_type == 'merged') {
                 return 'fa-solid fa-people-arrows';
             }
 
-            if ($this->actionType()=='delete') {
+            if ($this->action_type == 'delete') {
                 return 'fa-solid fa-user-minus';
             }
 
-            if ($this->actionType()=='delete') {
+            if ($this->action_type == 'delete') {
                 return 'fa-solid fa-user-minus';
             }
 
-            if ($this->actionType()=='update') {
+            if ($this->action_type == 'update') {
                 return 'fa-solid fa-user-pen';
             }
 
@@ -70,34 +70,42 @@ class ActionlogPresenter extends Presenter
         }
 
         // Everything else
-        if ($this->actionType()=='create new') {
+        if ($this->action_type == 'create') {
             return 'fa-solid fa-plus';
         }
 
-        if ($this->actionType()=='delete') {
-            return 'fa-solid fa-user-xmark';
+        if ($this->action_type == 'delete') {
+            return 'fa-solid fa-trash';
         }
 
-        if ($this->actionType()=='update') {
+        if ($this->action_type == 'update') {
             return 'fa-solid fa-pen';
         }
 
-        if ($this->actionType()=='restore') {
+        if ($this->action_type == 'restore') {
             return 'fa-solid fa-trash-arrow-up';
         }
 
-        if ($this->actionType()=='upload') {
+        if ($this->action_type == 'upload') {
             return 'fas fa-paperclip';
         }
 
-        if ($this->actionType()=='checkout') {
+        if ($this->action_type == 'checkout') {
             return 'fa-solid fa-rotate-left';
         }
 
-        if ($this->actionType()=='checkin from') {
+        if ($this->action_type == 'checkin from') {
             return 'fa-solid fa-rotate-right';
         }
 
+        if ($this->action_type == 'note_added') {
+            return 'fas fa-sticky-note';
+        }
+
+        if ($this->action_type == 'audit') {
+            return 'fas fa-clipboard-check';
+        }
+
         return 'fa-solid fa-rotate-right';
 
     }
diff --git a/app/Presenters/AssetAuditPresenter.php b/app/Presenters/AssetAuditPresenter.php
index a332950de1..a4d208fc0e 100644
--- a/app/Presenters/AssetAuditPresenter.php
+++ b/app/Presenters/AssetAuditPresenter.php
@@ -20,6 +20,7 @@ class AssetAuditPresenter extends Presenter
              [
                 'field' => 'checkbox',
                 'checkbox' => true,
+                'titleTooltip' => trans('general.select_all_none'),
              ],
              [
                 'field' => 'id',
diff --git a/app/Presenters/AssetMaintenancesPresenter.php b/app/Presenters/AssetMaintenancesPresenter.php
index 3908720dc3..0648613adb 100644
--- a/app/Presenters/AssetMaintenancesPresenter.php
+++ b/app/Presenters/AssetMaintenancesPresenter.php
@@ -22,6 +22,15 @@ class AssetMaintenancesPresenter extends Presenter
                 'title' => trans('general.id'),
                 'visible' => false,
             ], [
+                'field' => 'title',
+                'searchable' => true,
+                'sortable' => true,
+                'switchable' => true,
+                'title' => trans('general.name'),
+                'visible' => true,
+                'formatter' => 'maintenancesLinkFormatter',
+            ],
+            [
                 'field' => 'company',
                 'searchable' => true,
                 'sortable' => true,
@@ -81,12 +90,6 @@ class AssetMaintenancesPresenter extends Presenter
                 'searchable' => true,
                 'sortable' => true,
                 'title' => trans('admin/asset_maintenances/form.asset_maintenance_type'),
-            ], [
-                'field' => 'title',
-                'searchable' => true,
-                'sortable' => true,
-                'switchable' => false,
-                'title' => trans('admin/asset_maintenances/form.title'),
             ], [
                 'field' => 'start_date',
                 'searchable' => true,
@@ -117,12 +120,29 @@ class AssetMaintenancesPresenter extends Presenter
                 'title' => trans('admin/asset_maintenances/form.cost'),
                 'class' => 'text-right',
             ], [
-                'field' => 'user_id',
-                'searchable' => true,
+                'field' => 'created_by',
+                'searchable' => false,
                 'sortable' => true,
-                'title' => trans('general.admin'),
+                'title' => trans('general.created_by'),
+                'visible' => false,
                 'formatter' => 'usersLinkObjFormatter',
             ], [
+                'field' => 'created_at',
+                'searchable' => true,
+                'sortable' => true,
+                'switchable' => true,
+                'title' => trans('general.created_at'),
+                'visible' => false,
+                'formatter' => 'dateDisplayFormatter',
+            ], [
+                'field' => 'updated_at',
+                'searchable' => true,
+                'sortable' => true,
+                'switchable' => true,
+                'title' => trans('general.updated_at'),
+                'visible' => false,
+                'formatter' => 'dateDisplayFormatter',
+            ],[
                 'field' => 'actions',
                 'searchable' => false,
                 'sortable' => false,
diff --git a/app/Presenters/AssetModelPresenter.php b/app/Presenters/AssetModelPresenter.php
index da93092b91..2ed019eaea 100644
--- a/app/Presenters/AssetModelPresenter.php
+++ b/app/Presenters/AssetModelPresenter.php
@@ -15,6 +15,7 @@ class AssetModelPresenter extends Presenter
             [
                 'field' => 'checkbox',
                 'checkbox' => true,
+                'titleTooltip' => trans('general.select_all_none'),
             ],
             [
                 'field' => 'id',
@@ -73,7 +74,10 @@ class AssetModelPresenter extends Presenter
                 'switchable' => true,
                 'title' => trans('mail.min_QTY'),
                 'visible' => true,
+                'formatter' => 'minAmtFormatter',
+                'class' => 'text-right text-padding-number-cell',
             ],
+
             [
                 'field' => 'assets_count',
                 'searchable' => false,
@@ -81,6 +85,19 @@ class AssetModelPresenter extends Presenter
                 'switchable' => true,
                 'title' => trans('admin/models/table.numassets'),
                 'visible' => true,
+                'class' => 'text-right text-padding-number-cell',
+                'footerFormatter' => 'qtySumFormatter',
+            ],
+
+            [
+                'field' => 'remaining',
+                'searchable' => false,
+                'sortable' => false,
+                'switchable' => true,
+                'title' => trans('general.remaining'),
+                'visible' => true,
+                'class' => 'text-right text-padding-number-cell',
+                'footerFormatter' => 'qtySumFormatter',
             ],
             [
                 'field' => 'depreciation',
@@ -135,19 +152,27 @@ class AssetModelPresenter extends Presenter
                 'formatter' => 'notesFormatter',
             ],
             [
+                'field' => 'created_by',
+                'searchable' => false,
+                'sortable' => true,
+                'title' => trans('general.created_by'),
+                'visible' => false,
+                'formatter' => 'usersLinkObjFormatter',
+            ], [
                 'field' => 'created_at',
                 'searchable' => true,
                 'sortable' => true,
-                'visible' => false,
+                'switchable' => true,
                 'title' => trans('general.created_at'),
+                'visible' => false,
                 'formatter' => 'dateDisplayFormatter',
-            ],
-            [
+            ], [
                 'field' => 'updated_at',
                 'searchable' => true,
                 'sortable' => true,
-                'visible' => false,
+                'switchable' => true,
                 'title' => trans('general.updated_at'),
+                'visible' => false,
                 'formatter' => 'dateDisplayFormatter',
             ],
 
diff --git a/app/Presenters/AssetPresenter.php b/app/Presenters/AssetPresenter.php
index 163ee1b606..f4310b3a1a 100644
--- a/app/Presenters/AssetPresenter.php
+++ b/app/Presenters/AssetPresenter.php
@@ -21,6 +21,7 @@ class AssetPresenter extends Presenter
             [
                 'field' => 'checkbox',
                 'checkbox' => true,
+                'titleTooltip' => trans('general.select_all_none'),
             ], [
                 'field' => 'id',
                 'searchable' => false,
@@ -35,7 +36,7 @@ class AssetPresenter extends Presenter
                 'switchable' => true,
                 'title' => trans('general.company'),
                 'visible' => false,
-                'formatter' => 'assetCompanyObjFilterFormatter',
+                'formatter' => 'companiesLinkObjFormatter',
             ], [
                 'field' => 'name',
                 'searchable' => true,
@@ -233,18 +234,28 @@ class AssetPresenter extends Presenter
                 'title' => trans('general.user_requests_count'),
 
             ], [
-                'field' => 'created_at',
+                'field' => 'created_by',
                 'searchable' => false,
                 'sortable' => true,
+                'title' => trans('general.created_by'),
                 'visible' => false,
+                'formatter' => 'usersLinkObjFormatter',
+            ],
+            [
+                'field' => 'created_at',
+                'searchable' => true,
+                'sortable' => true,
+                'switchable' => true,
                 'title' => trans('general.created_at'),
+                'visible' => false,
                 'formatter' => 'dateDisplayFormatter',
             ], [
                 'field' => 'updated_at',
-                'searchable' => false,
+                'searchable' => true,
                 'sortable' => true,
-                'visible' => false,
+                'switchable' => true,
                 'title' => trans('general.updated_at'),
+                'visible' => false,
                 'formatter' => 'dateDisplayFormatter',
             ], [
                 'field' => 'last_checkout',
@@ -287,6 +298,7 @@ class AssetPresenter extends Presenter
                 'sortable' => true,
                 'visible' => false,
                 'title' => trans('general.byod'),
+                'class' => 'byod',
                 'formatter' => 'trueFalseFormatter',
 
             ],
@@ -342,6 +354,74 @@ class AssetPresenter extends Presenter
         return json_encode($layout);
     }
 
+
+    public static function assignedAccessoriesDataTableLayout()
+    {
+        $layout = [
+            [
+                'field' => 'id',
+                'searchable' => false,
+                'sortable' => false,
+                'switchable' => true,
+                'title' => trans('general.id'),
+                'visible' => false,
+            ],
+            [
+                'field' => 'accessory',
+                'searchable' => false,
+                'sortable' => false,
+                'switchable' => true,
+                'title' => trans('general.accessory'),
+                'visible' => true,
+                'formatter' => 'accessoriesLinkObjFormatter',
+            ],
+            [
+                'field' => 'image',
+                'searchable' => false,
+                'sortable' => false,
+                'switchable' => true,
+                'title' => trans('general.image'),
+                'visible' => true,
+                'formatter' => 'imageFormatter',
+            ],
+            [
+                'field' => 'note',
+                'searchable' => false,
+                'sortable' => false,
+                'switchable' => true,
+                'title' => trans('general.notes'),
+                'visible' => true,
+            ],
+            [
+                'field' => 'created_at',
+                'searchable' => false,
+                'sortable' => false,
+                'switchable' => true,
+                'title' => trans('admin/hardware/table.checkout_date'),
+                'visible' => true,
+                'formatter' => 'dateDisplayFormatter',
+            ],
+            [
+                'field' => 'created_by',
+                'searchable' => false,
+                'sortable' => false,
+                'title' => trans('general.created_by'),
+                'visible' => false,
+                'formatter' => 'usersLinkObjFormatter',
+            ],
+            [
+                'field' => 'available_actions',
+                'searchable' => false,
+                'sortable' => false,
+                'switchable' => false,
+                'title' => trans('table.actions'),
+                'formatter' => 'accessoriesInOutFormatter',
+            ],
+        ];
+
+        return json_encode($layout);
+    }
+
     /**
      * Generate html link to this items name.
      * @return string
@@ -476,7 +556,7 @@ class AssetPresenter extends Presenter
      */
     public function statusMeta()
     {
-        if ($this->model->assigned) {
+        if ($this->model->assigned_to) {
             return 'deployed';
         }
 
@@ -556,13 +636,12 @@ class AssetPresenter extends Presenter
     }
 
     /**
-     * Used to take user created warranty URL and dynamically fill in the needed values per asset
+     * Used to take user created URL and dynamically fill in the needed values per asset
      * @return string
      */
-    public function dynamicWarrantyUrl()
+    public function dynamicUrl($dynamic_url)
     {
-        $warranty_lookup_url = $this->model->model->manufacturer->warranty_lookup_url;
-        $url = (str_replace('{LOCALE}',\App\Models\Setting::getSettings()->locale, $warranty_lookup_url));
+        $url = (str_replace('{LOCALE}',\App\Models\Setting::getSettings()->locale, $dynamic_url));
         $url = (str_replace('{SERIAL}', urlencode($this->model->serial), $url));
         $url = (str_replace('{MODEL_NAME}', urlencode($this->model->model->name), $url));
         $url = (str_replace('{MODEL_NUMBER}', urlencode($this->model->model->model_number), $url));
@@ -580,6 +659,6 @@ class AssetPresenter extends Presenter
 
     public function glyph()
     {
-        return '<i class="fas fa-barcode" aria-hidden="true"></i>';
+        return '<x-icon type="assets" />';
     }
 }
diff --git a/app/Presenters/CategoryPresenter.php b/app/Presenters/CategoryPresenter.php
index fbf431637c..d4a9f01a05 100644
--- a/app/Presenters/CategoryPresenter.php
+++ b/app/Presenters/CategoryPresenter.php
@@ -78,18 +78,33 @@ class CategoryPresenter extends Presenter
                 'visible' => true,
                 "formatter" => 'trueFalseFormatter',
             ], [
-                'field' => 'created_at',
+                'field' => 'notes',
                 'searchable' => true,
                 'sortable' => true,
                 'visible' => false,
+                'title' => trans('general.notes'),
+            ], [
+                'field' => 'created_by',
+                'searchable' => false,
+                'sortable' => true,
+                'title' => trans('general.created_by'),
+                'visible' => false,
+                'formatter' => 'usersLinkObjFormatter',
+            ], [
+                'field' => 'created_at',
+                'searchable' => true,
+                'sortable' => true,
+                'switchable' => true,
                 'title' => trans('general.created_at'),
+                'visible' => false,
                 'formatter' => 'dateDisplayFormatter',
             ], [
                 'field' => 'updated_at',
                 'searchable' => true,
                 'sortable' => true,
-                'visible' => false,
+                'switchable' => true,
                 'title' => trans('general.updated_at'),
+                'visible' => false,
                 'formatter' => 'dateDisplayFormatter',
             ], [
                 'field' => 'actions',
diff --git a/app/Presenters/CompanyPresenter.php b/app/Presenters/CompanyPresenter.php
index 7603191fc1..fb86166092 100644
--- a/app/Presenters/CompanyPresenter.php
+++ b/app/Presenters/CompanyPresenter.php
@@ -65,54 +65,75 @@ class CompanyPresenter extends Presenter
                 'field' => 'users_count',
                 'searchable' => false,
                 'sortable' => true,
-                'title' => '<span class="hidden-xs"><i class="fas fa-users"></i></span><span class="hidden-md hidden-lg">'.trans('general.users').'</span></th>',
+                'title' => trans('general.users'),
                 'visible' => true,
+                'class' => 'css-users',
 
             ], [
                 'field' => 'assets_count',
                 'searchable' => false,
                 'sortable' => true,
-                'title' => '<span class="hidden-xs"><i class="fas fa-barcode" aria-hidden="true"></i></span><span class="hidden-md hidden-lg">'.trans('general.assets').'</span>',
+                'title' => trans('general.assets'),
                 'visible' => true,
+                'class' => 'css-barcode',
 
             ], [
                 'field' => 'licenses_count',
                 'searchable' => false,
                 'sortable' => true,
+                'title' => trans('general.licenses'),
                 'visible' => true,
-                'title' => ' <span class="hidden-xs"><i class="far fa-save"></i></span><span class="hidden-md hidden-lg">'.trans('general.licenses').'</span>',
+                'class' => 'css-license',
             ], [
                 'field' => 'accessories_count',
                 'searchable' => false,
                 'sortable' => true,
+                'title' => trans('general.accessories'),
                 'visible' => true,
-                'title' => ' <span class="hidden-xs"><i class="far fa-keyboard"></i></span><span class="hidden-md hidden-lg">'.trans('general.accessories').'</span>',
+                'class' => 'css-accessory',
             ], [
                 'field' => 'consumables_count',
                 'searchable' => false,
                 'sortable' => true,
+                'title' => trans('general.consumables'),
                 'visible' => true,
-                'title' => ' <span class="hidden-xs"><i class="fas fa-tint"></i></span><span class="hidden-md hidden-lg">'.trans('general.consumables').'</span>',
+                'class' => 'css-consumable',
             ], [
                 'field' => 'components_count',
                 'searchable' => false,
                 'sortable' => true,
+                'title' => trans('general.components'),
                 'visible' => true,
-                'title' => ' <span class="hidden-xs"><i class="far fa-hdd"></i></span><span class="hidden-md hidden-lg">'.trans('general.components').'</span>',
+                'class' => 'css-component',
             ], [
-                'field' => 'updated_at',
-                'searchable' => false,
+                'field' => 'notes',
+                'searchable' => true,
                 'sortable' => true,
                 'visible' => false,
-                'title' => trans('general.updated_at'),
-                'formatter' => 'createdAtFormatter',
+                'title' => trans('general.notes'),
+            ], [
+                'field' => 'created_by',
+                'searchable' => false,
+                'sortable' => true,
+                'title' => trans('general.created_by'),
+                'visible' => false,
+                'formatter' => 'usersLinkObjFormatter',
             ], [
                 'field' => 'created_at',
-                'searchable' => false,
+                'searchable' => true,
                 'sortable' => true,
-                'visible' => false,
+                'switchable' => true,
                 'title' => trans('general.created_at'),
-                'formatter' => 'createdAtFormatter',
+                'visible' => false,
+                'formatter' => 'dateDisplayFormatter',
+            ], [
+                'field' => 'updated_at',
+                'searchable' => true,
+                'sortable' => true,
+                'switchable' => true,
+                'title' => trans('general.updated_at'),
+                'visible' => false,
+                'formatter' => 'dateDisplayFormatter',
             ], [
                 'field' => 'actions',
                 'searchable' => false,
diff --git a/app/Presenters/ComponentPresenter.php b/app/Presenters/ComponentPresenter.php
index d142d7abc2..61f7a0ef4b 100644
--- a/app/Presenters/ComponentPresenter.php
+++ b/app/Presenters/ComponentPresenter.php
@@ -66,25 +66,43 @@ class ComponentPresenter extends Presenter
                 'title' => trans('general.supplier'),
                 'visible' => false,
                 'formatter' => 'suppliersLinkObjFormatter',
-            ],
-            [
+            ], [
+                'field' => 'model_number',
+                'searchable' => true,
+                'sortable' => true,
+                'title' => trans('admin/models/table.modelnumber'),
+            ], [
+                'field' => 'manufacturer',
+                'searchable' => true,
+                'sortable' => true,
+                'switchable' => true,
+                'title' => trans('general.manufacturer'),
+                'visible' => false,
+                'formatter' => 'manufacturersLinkObjFormatter',
+            ], [
+                'field' => 'min_amt',
+                'searchable' => false,
+                'sortable' => true,
+                'title' => trans('general.min_amt'),
+                'visible' => true,
+                'class' => 'text-right text-padding-number-cell',
+                'formatter' => 'minAmtFormatter',
+            ], [
                 'field' => 'qty',
                 'searchable' => false,
                 'sortable' => true,
                 'title' => trans('admin/components/general.total'),
                 'visible' => true,
+                'class' => 'text-right text-padding-number-cell',
+                'footerFormatter' => 'qtySumFormatter',
             ], [
                 'field' => 'remaining',
                 'searchable' => false,
                 'sortable' => false,
                 'title' => trans('admin/components/general.remaining'),
                 'visible' => true,
-            ], [
-                'field' => 'min_amt',
-                'searchable' => false,
-                'sortable' => false,
-                'title' => trans('general.min_amt'),
-                'visible' => true,
+                'class' => 'text-right text-padding-number-cell',
+                'footerFormatter' => 'qtySumFormatter',
             ], [
                 'field' => 'location',
                 'searchable' => true,
@@ -119,6 +137,27 @@ class ComponentPresenter extends Presenter
                 'visible' => false,
                 'title' => trans('general.notes'),
                 'formatter' => 'notesFormatter',
+            ],[
+                'field' => 'created_by',
+                'searchable' => false,
+                'sortable' => true,
+                'title' => trans('general.created_by'),
+                'visible' => false,
+                'formatter' => 'usersLinkObjFormatter',
+            ],[
+                'field' => 'created_at',
+                'searchable' => false,
+                'sortable' => true,
+                'visible' => false,
+                'title' => trans('general.created_at'),
+                'formatter' => 'dateDisplayFormatter',
+            ], [
+                'field' => 'updated_at',
+                'searchable' => false,
+                'sortable' => true,
+                'visible' => false,
+                'title' => trans('general.updated_at'),
+                'formatter' => 'dateDisplayFormatter',
             ],
         ];
 
diff --git a/app/Presenters/ConsumablePresenter.php b/app/Presenters/ConsumablePresenter.php
index d3e73de1cf..e777cfe26b 100644
--- a/app/Presenters/ConsumablePresenter.php
+++ b/app/Presenters/ConsumablePresenter.php
@@ -75,22 +75,28 @@ class ConsumablePresenter extends Presenter
             ], [
                 'field' => 'qty',
                 'searchable' => false,
-                'sortable' => false,
+                'sortable' => true,
                 'title' => trans('admin/components/general.total'),
                 'visible' => true,
+                'class' => 'text-right text-padding-number-cell',
+                'footerFormatter' => 'qtySumFormatter',
             ], [
                 'field' => 'remaining',
                 'searchable' => false,
-                'sortable' => false,
+                'sortable' => true,
                 'title' => trans('admin/components/general.remaining'),
                 'visible' => true,
+                'class' => 'text-right text-padding-number-cell',
+                'footerFormatter' => 'qtySumFormatter',
             ], [
                 'field' => 'min_amt',
                 'searchable' => false,
-                'sortable' => false,
+                'sortable' => true,
                 'title' => trans('general.min_amt'),
                 'visible' => true,
-            ],  [
+                'formatter' => 'minAmtFormatter',
+                'class' => 'text-right text-padding-number-cell',
+            ], [
                 'field' => 'location',
                 'searchable' => true,
                 'sortable' => true,
@@ -123,7 +129,7 @@ class ConsumablePresenter extends Presenter
                 'title' => trans('general.purchase_cost'),
                 'visible' => true,
                 'footerFormatter' => 'sumFormatterQuantity',
-                'class' => 'text-right',
+                'class' => 'text-right text-padding-number-cell',
             ], [
                 'field' => 'notes',
                 'searchable' => true,
@@ -131,6 +137,27 @@ class ConsumablePresenter extends Presenter
                 'visible' => false,
                 'title' => trans('general.notes'),
                 'formatter' => 'notesFormatter',
+            ], [
+                'field' => 'created_by',
+                'searchable' => false,
+                'sortable' => true,
+                'title' => trans('general.created_by'),
+                'visible' => false,
+                'formatter' => 'usersLinkObjFormatter',
+            ],[
+                'field' => 'created_at',
+                'searchable' => false,
+                'sortable' => true,
+                'visible' => false,
+                'title' => trans('general.created_at'),
+                'formatter' => 'dateDisplayFormatter',
+            ], [
+                'field' => 'updated_at',
+                'searchable' => false,
+                'sortable' => true,
+                'visible' => false,
+                'title' => trans('general.updated_at'),
+                'formatter' => 'dateDisplayFormatter',
             ], [
                 'field' => 'change',
                 'searchable' => false,
diff --git a/app/Presenters/DepreciationPresenter.php b/app/Presenters/DepreciationPresenter.php
index 9df1fe1322..3f240fcc53 100644
--- a/app/Presenters/DepreciationPresenter.php
+++ b/app/Presenters/DepreciationPresenter.php
@@ -47,6 +47,48 @@ class DepreciationPresenter extends Presenter
                 "visible" => true,
             ],
             [
+                'field' => 'assets_count',
+                'searchable' => false,
+                'sortable' => true,
+                'title' =>  trans('general.assets'),
+                'visible' => true,
+            ],
+            [
+                'field' => 'models_count',
+                'searchable' => false,
+                'sortable' => true,
+                'title' =>  trans('general.asset_models'),
+                'visible' => true,
+            ], [
+                'field' => 'licenses_count',
+                'searchable' => false,
+                'sortable' => true,
+                'title' =>  trans('general.licenses'),
+                'visible' => true,
+            ],[
+                'field' => 'created_by',
+                'searchable' => false,
+                'sortable' => true,
+                'title' => trans('general.created_by'),
+                'visible' => false,
+                'formatter' => 'usersLinkObjFormatter',
+            ], [
+                'field' => 'created_at',
+                'searchable' => true,
+                'sortable' => true,
+                'switchable' => true,
+                'title' => trans('general.created_at'),
+                'visible' => false,
+                'formatter' => 'dateDisplayFormatter',
+            ], [
+                'field' => 'updated_at',
+                'searchable' => true,
+                'sortable' => true,
+                'switchable' => true,
+                'title' => trans('general.updated_at'),
+                'visible' => false,
+                'formatter' => 'dateDisplayFormatter',
+            ], [
                 'field' => 'actions',
                 'searchable' => false,
                 'sortable' => false,
diff --git a/app/Presenters/DepreciationReportPresenter.php b/app/Presenters/DepreciationReportPresenter.php
index 50a8b73b54..1d4c459614 100644
--- a/app/Presenters/DepreciationReportPresenter.php
+++ b/app/Presenters/DepreciationReportPresenter.php
@@ -140,7 +140,7 @@ class DepreciationReportPresenter extends Presenter
             ], [
                 "field" => "book_value",
                 "searchable" => true,
-                "sortable" => true,
+                "sortable" => false,
                 "visible" => true,
                 "title" => trans('admin/hardware/table.book_value'),
                 "footerFormatter" => 'sumFormatter',
@@ -394,6 +394,6 @@ class DepreciationReportPresenter extends Presenter
 
     public function glyph()
     {
-        return '<i class="fas fa-barcode" aria-hidden="true"></i>';
+        return '<x-icon type="reports" class="text-orange" />';
     }
 }
diff --git a/app/Presenters/HistoryPresenter.php b/app/Presenters/HistoryPresenter.php
new file mode 100644
index 0000000000..4b5d7d1f2b
--- /dev/null
+++ b/app/Presenters/HistoryPresenter.php
@@ -0,0 +1,172 @@
+<?php
+
+namespace App\Presenters;
+
+/**
+ * Class AccessoryPresenter
+ */
+class HistoryPresenter extends Presenter
+{
+    /**
+     * Json Column Layout for bootstrap table
+     * @return string
+     */
+    public static function dataTableLayout($serial = false)
+    {
+        $extra = [];
+        $layout_start = [
+            [
+                'id' => 'id',
+                'searchable' => false,
+                'sortable' => true,
+                'switchable' => true,
+                'title' => trans('general.id'),
+                'visible' => false,
+                'class' => 'hidden-xs',
+            ],
+            [
+                'field' => 'icon',
+                'searchable' => false,
+                'sortable' => true,
+                'switchable' => true,
+                'title' => trans('admin/hardware/table.icon'),
+                'visible' => true,
+                'class' => 'hidden-xs',
+                'formatter' => 'iconFormatter',
+            ],
+            [
+                'field' => 'created_at',
+                'searchable' => true,
+                'sortable' => true,
+                'switchable' => true,
+                'title' => trans('general.created_at'),
+                'visible' => true,
+                'formatter' => 'dateDisplayFormatter',
+            ],
+            [
+                'field' => 'created_by',
+                'searchable' => false,
+                'sortable' => true,
+                'title' => trans('general.created_by'),
+                'visible' => true,
+                'formatter' => 'usersLinkObjFormatter',
+            ],
+            [
+                'field' => 'action_date',
+                'searchable' => false,
+                'sortable' => true,
+                'title' => trans('general.action_date'),
+                'visible' => false,
+                'formatter' => 'dateDisplayFormatter',
+            ],
+            [
+                'field' => 'action_type',
+                'searchable' => true,
+                'sortable' => true,
+                'switchable' => true,
+                'title' => trans('general.action'),
+                'visible' => true,
+            ],
+            [
+                'field' => 'item',
+                'searchable' => true,
+                'sortable' => true,
+                'switchable' => true,
+                'title' => trans('general.item'),
+                'visible' => true,
+                'formatter' => 'polymorphicItemFormatter',
+            ],
+        ];
+
+
+        if ($serial) {
+            $extra =  [
+                [
+                'field' => 'item.serial',
+                'title' => trans('admin/hardware/table.serial'),
+                'visible' => false,
+            ]
+            ];
+        }
+
+        $layout_end = [
+            [
+                'field' => 'target',
+                'searchable' => true,
+                'sortable' => true,
+                'switchable' => true,
+                'title' => trans('general.target'),
+                'visible' => true,
+                'formatter' => 'polymorphicItemFormatter',
+            ],
+            [
+                'field' => 'file',
+                'searchable' => true,
+                'sortable' => true,
+                'switchable' => true,
+                'title' => trans('general.file_name'),
+                'visible' => true,
+                'formatter' => 'fileUploadNameFormatter',
+            ],
+            [
+                'field' => 'file_download',
+                'searchable' => true,
+                'sortable' => true,
+                'switchable' => true,
+                'title' => trans('general.download'),
+                'visible' => true,
+                'formatter' => 'fileUploadFormatter',
+            ],
+            [
+                'field' => 'note',
+                'searchable' => true,
+                'sortable' => true,
+                'visible' => true,
+                'title' => trans('general.notes'),
+                'formatter' => 'notesFormatter'
+            ],
+            [
+                'field' => 'signature_file',
+                'searchable' => true,
+                'sortable' => true,
+                'switchable' => true,
+                'title' => trans('general.signature'),
+                'visible' => false,
+                'formatter' => 'imageFormatter',
+            ],
+            [
+                'field' => 'log_meta',
+                'searchable' => false,
+                'sortable' => false,
+                'visible' => true,
+                'title' => trans('admin/hardware/table.changed'),
+                'formatter' => 'changeLogFormatter',
+            ],
+            [
+                'field' => 'remote_ip',
+                'searchable' => false,
+                'sortable' => false,
+                'visible' => false,
+                'title' => trans('admin/settings/general.login_ip'),
+            ],
+            [
+                'field' => 'user_agent',
+                'searchable' => false,
+                'sortable' => false,
+                'visible' => false,
+                'title' => trans('admin/settings/general.login_user_agent'),
+            ],
+            [
+                'field' => 'action_source',
+                'searchable' => false,
+                'sortable' => false,
+                'visible' => false,
+                'title' => trans('general.action_source'),
+            ],
+        ];
+
+        $merged = array_merge($layout_start, $extra, $layout_end);
+        return json_encode($merged);
+    }
+
+}
\ No newline at end of file
diff --git a/app/Presenters/LicensePresenter.php b/app/Presenters/LicensePresenter.php
index 8ca8e120f2..e2a21a8bcf 100644
--- a/app/Presenters/LicensePresenter.php
+++ b/app/Presenters/LicensePresenter.php
@@ -41,7 +41,7 @@ class LicensePresenter extends Presenter
                 'searchable' => true,
                 'sortable' => true,
                 'title' => trans('admin/licenses/form.license_key'),
-                'formatter' => 'licensesLinkFormatter',
+                'formatter' => 'licenseKeyFormatter',
             ], [
                 'field' => 'expiration_date',
                 'searchable' => true,
@@ -80,24 +80,28 @@ class LicensePresenter extends Presenter
                 'sortable' => true,
                 'title' => trans('general.manufacturer'),
                 'formatter' => 'manufacturersLinkObjFormatter',
-            ], [
-                'field' => 'seats',
-                'searchable' => false,
-                'sortable' => true,
-                'title' => trans('admin/accessories/general.total'),
-            ], [
-                'field' => 'free_seats_count',
-                'searchable' => false,
-                'sortable' => true,
-                'title' => trans('admin/accessories/general.remaining'),
-            ],
-            [
+            ],  [
                 'field' => 'min_amt',
                 'searchable' => false,
                 'sortable' => true,
                 'title' => trans('mail.min_QTY'),
                 'formatter' => 'minAmtFormatter',
-            ],[
+                'class' => 'text-right text-padding-number-cell',
+            ], [
+                'field' => 'seats',
+                'searchable' => false,
+                'sortable' => true,
+                'title' => trans('admin/accessories/general.total'),
+                'class' => 'text-right text-padding-number-cell',
+                'footerFormatter' => 'qtySumFormatter',
+            ], [
+                'field' => 'free_seats_count',
+                'searchable' => false,
+                'sortable' => true,
+                'title' => trans('admin/accessories/general.remaining'),
+                'class' => 'text-right text-padding-number-cell',
+                'footerFormatter' => 'qtySumFormatter',
+            ], [
                 'field' => 'purchase_date',
                 'searchable' => true,
                 'sortable' => true,
@@ -158,6 +162,13 @@ class LicensePresenter extends Presenter
                 'sortable' => true,
                 'visible' => false,
                 'title' => trans('general.order_number'),
+            ], [
+                'field' => 'created_by',
+                'searchable' => false,
+                'sortable' => true,
+                'title' => trans('general.created_by'),
+                'visible' => false,
+                'formatter' => 'usersLinkObjFormatter',
             ], [
                 'field' => 'created_at',
                 'searchable' => false,
@@ -219,16 +230,7 @@ class LicensePresenter extends Presenter
                 'switchable' => true,
                 'title' => trans('general.id'),
                 'visible' => false,
-           ],
-           [
-                'field' => 'name',
-                'searchable' => false,
-                'sortable' => false,
-                'sorter'   => 'numericOnly',
-                'switchable' => true,
-                'title' => trans('admin/licenses/general.seat'),
-                'visible' => true,
-            ], [
+           ],[
                 'field' => 'assigned_user',
                 'searchable' => false,
                 'sortable' => false,
@@ -269,6 +271,14 @@ class LicensePresenter extends Presenter
                 'visible' => true,
                 'formatter' => 'locationsLinkObjFormatter',
             ],
+            [
+                'field' => 'updated_at',
+                'searchable' => false,
+                'sortable' => true,
+                'visible' => false,
+                'title' => trans('general.updated_at'),
+                'formatter' => 'dateDisplayFormatter',
+            ],
             [
                 'field' => 'notes',
                 'searchable' => false,
diff --git a/app/Presenters/LocationPresenter.php b/app/Presenters/LocationPresenter.php
index 56d710ac96..52076e06c1 100644
--- a/app/Presenters/LocationPresenter.php
+++ b/app/Presenters/LocationPresenter.php
@@ -18,8 +18,7 @@ class LocationPresenter extends Presenter
                 'field' => 'bulk_selectable',
                 'checkbox' => true,
                 'formatter' => 'checkboxEnabledFormatter',
-            ],
-            [
+            ], [
                 'field' => 'id',
                 'searchable' => false,
                 'sortable' => true,
@@ -27,6 +26,15 @@ class LocationPresenter extends Presenter
                 'title' => trans('general.id'),
                 'visible' => false,
             ],
+            [
+                'field' => 'company',
+                'searchable' => true,
+                'sortable' => true,
+                'switchable' => true,
+                'title' => trans('general.company'),
+                'visible' => false,
+                'formatter' => 'companiesLinkObjFormatter'
+            ],
             [
                 'field' => 'name',
                 'searchable' => true,
@@ -35,8 +43,7 @@ class LocationPresenter extends Presenter
                 'title' => trans('admin/locations/table.name'),
                 'visible' => true,
                 'formatter' => 'locationsLinkFormatter',
-            ],
-            [
+            ], [
                 'field' => 'image',
                 'searchable' => false,
                 'sortable' => true,
@@ -44,8 +51,7 @@ class LocationPresenter extends Presenter
                 'title' => trans('general.image'),
                 'visible' => true,
                 'formatter' => 'imageFormatter',
-            ],
-            [
+            ], [
                 'field' => 'parent',
                 'searchable' => false,
                 'sortable' => true,
@@ -53,100 +59,111 @@ class LocationPresenter extends Presenter
                 'title' => trans('admin/locations/table.parent'),
                 'visible' => true,
                 'formatter' => 'locationsLinkObjFormatter',
-            ],
-
-            [
+            ], [
                 'field' => 'assets_count',
                 'searchable' => false,
                 'sortable' => true,
                 'switchable' => true,
                 'title' =>  trans('admin/locations/message.current_location'),
                 'visible' => true,
-            ],
-
-            [
+            ], [
                 'field' => 'rtd_assets_count',
                 'searchable' => false,
                 'sortable' => true,
                 'switchable' => true,
                 'title' =>  trans('admin/hardware/form.default_location'),
+                'titleTooltip' => trans('admin/hardware/form.default_location'),
+                'tooltip' => 'true',
                 'visible' => false,
-            ],
-
-            [
+                'class' => 'css-house-flag',
+            ], [
                 'field' => 'assigned_assets_count',
                 'searchable' => false,
                 'sortable' => true,
                 'switchable' => true,
                 'title' =>  trans('admin/locations/message.assigned_assets'),
+                'titleTooltip' =>  trans('admin/locations/message.assigned_assets'),
                 'visible' => true,
-            ],
-
-            [
+                'class' => 'css-house-laptop',
+            ], [
+                'field' => 'accessories_count',
+                'searchable' => false,
+                'sortable' => true,
+                'switchable' => true,
+                'title' =>  trans('general.accessories'),
+                'titleTooltip' =>  trans('general.accessories'),
+                'visible' => true,
+                'class' => 'css-accessory',
+            ], [
+                'field' => 'assigned_accessories_count',
+                'searchable' => false,
+                'sortable' => true,
+                'switchable' => true,
+                'title' =>  trans('general.accessories_assigned'),
+                'titleTooltip' =>  trans('general.accessories_assigned'),
+                'visible' => true,
+                'class' => 'css-accessory-alt',
+            ], [
                 'field' => 'users_count',
                 'searchable' => false,
                 'sortable' => true,
                 'switchable' => true,
                 'title' =>  trans('general.people'),
+                'titleTooltip' =>  trans('general.people'),
                 'visible' => true,
-            ],
-            [
+                'class' => 'css-house-user',
+            ], [
                 'field' => 'currency',
                 'searchable' => true,
                 'sortable' => true,
                 'switchable' => true,
-                'title' =>  trans('general.currency'),
+                'title' =>  trans('general.currency_text'),
+                'titleTooltip' =>  trans('general.currency_text'),
                 'visible' => true,
-            ],
-            [
+                'class' => 'css-currency',
+            ], [
                 'field' => 'address',
                 'searchable' => true,
                 'sortable' => true,
                 'switchable' => true,
                 'title' =>  trans('admin/locations/table.address'),
                 'visible' => true,
-            ],
-            [
+            ], [
                 'field' => 'address2',
                 'searchable' => true,
                 'sortable' => true,
                 'switchable' => true,
                 'title' =>  trans('admin/locations/table.address2'),
                 'visible' => false,
-            ],
-            [
+            ], [
                 'field' => 'city',
                 'searchable' => true,
                 'sortable' => true,
                 'switchable' => true,
                 'title' =>  trans('admin/locations/table.city'),
                 'visible' => true,
-            ],
-            [
+            ], [
                 'field' => 'state',
                 'searchable' => true,
                 'sortable' => true,
                 'switchable' => true,
                 'title' =>  trans('admin/locations/table.state'),
                 'visible' => true,
-            ],
-            [
+            ], [
                 'field' => 'zip',
                 'searchable' => true,
                 'sortable' => true,
                 'switchable' => true,
                 'title' =>  trans('admin/locations/table.zip'),
                 'visible' => false,
-            ],
-            [
+            ], [
                 'field' => 'country',
                 'searchable' => true,
                 'sortable' => true,
                 'switchable' => true,
                 'title' =>  trans('admin/locations/table.country'),
                 'visible' => false,
-            ],
-            [
+            ], [
                 'field' => 'phone',
                 'searchable' => true,
                 'sortable' => true,
@@ -154,8 +171,7 @@ class LocationPresenter extends Presenter
                 'title' => trans('admin/users/table.phone'),
                 'visible' => false,
                 'formatter'    => 'phoneFormatter',
-            ],
-            [
+            ], [
                 'field' => 'fax',
                 'searchable' => true,
                 'sortable' => true,
@@ -163,16 +179,14 @@ class LocationPresenter extends Presenter
                 'title' => trans('admin/suppliers/table.fax'),
                 'visible' => false,
                 'formatter'    => 'phoneFormatter',
-            ],
-            [
+            ], [
                 'field' => 'ldap_ou',
                 'searchable' => true,
                 'sortable' => true,
                 'switchable' => true,
                 'title' =>  trans('admin/locations/table.ldap_ou'),
                 'visible' => false,
-            ],
-            [
+            ], [
                 'field' => 'manager',
                 'searchable' => false,
                 'sortable' => true,
@@ -180,9 +194,13 @@ class LocationPresenter extends Presenter
                 'title' =>  trans('admin/users/table.manager'),
                 'visible' => false,
                 'formatter' => 'usersLinkObjFormatter',
-            ],
-
-            [
+            ],  [
+                'field' => 'notes',
+                'searchable' => true,
+                'sortable' => true,
+                'visible' => false,
+                'title' => trans('general.notes'),
+            ], [
                 'field' => 'created_at',
                 'searchable' => true,
                 'sortable' => true,
@@ -191,8 +209,15 @@ class LocationPresenter extends Presenter
                 'visible' => false,
                 'formatter' => 'dateDisplayFormatter',
             ],
-
             [
+                'field' => 'created_by',
+                'searchable' => true,
+                'sortable' => true,
+                'switchable' => true,
+                'title' => trans('general.created_by'),
+                'visible' => false,
+                'formatter' => 'usersLinkObjFormatter',
+            ],[
                 'field' => 'actions',
                 'searchable' => false,
                 'sortable' => false,
@@ -206,6 +231,73 @@ class LocationPresenter extends Presenter
         return json_encode($layout);
     }
 
+    public static function assignedAccessoriesDataTableLayout()
+    {
+        $layout = [
+            [
+                'field' => 'id',
+                'searchable' => false,
+                'sortable' => false,
+                'switchable' => true,
+                'title' => trans('general.id'),
+                'visible' => false,
+            ],
+            [
+                'field' => 'accessory',
+                'searchable' => false,
+                'sortable' => false,
+                'switchable' => true,
+                'title' => trans('general.accessory'),
+                'visible' => true,
+                'formatter' => 'accessoriesLinkObjFormatter',
+            ],
+            [
+                'field' => 'image',
+                'searchable' => false,
+                'sortable' => false,
+                'switchable' => true,
+                'title' => trans('general.image'),
+                'visible' => true,
+                'formatter' => 'imageFormatter',
+            ],
+            [
+                'field' => 'note',
+                'searchable' => false,
+                'sortable' => false,
+                'switchable' => true,
+                'title' => trans('general.notes'),
+                'visible' => true,
+            ],
+            [
+                'field' => 'created_at',
+                'searchable' => false,
+                'sortable' => false,
+                'switchable' => true,
+                'title' => trans('admin/hardware/table.checkout_date'),
+                'visible' => true,
+                'formatter' => 'dateDisplayFormatter',
+            ],
+            [
+                'field' => 'created_by',
+                'searchable' => false,
+                'sortable' => false,
+                'title' => trans('general.created_by'),
+                'visible' => false,
+                'formatter' => 'usersLinkObjFormatter',
+            ],
+            [
+                'field' => 'available_actions',
+                'searchable' => false,
+                'sortable' => false,
+                'switchable' => false,
+                'title' => trans('table.actions'),
+                'formatter' => 'accessoriesInOutFormatter',
+            ],
+        ];
+
+        return json_encode($layout);
+    }
+
     /**
      * Link to this locations name
      * @return string
@@ -235,7 +327,7 @@ class LocationPresenter extends Presenter
 
     public function glyph()
     {
-        return '<i class="fas fa-map-marker-alt" aria-hidden="true"></i>';
+        return '<x-icon type="locations" />';
     }
 
     public function fullName()
diff --git a/app/Presenters/ManufacturerPresenter.php b/app/Presenters/ManufacturerPresenter.php
index 3e36cbcde0..dfefec2998 100644
--- a/app/Presenters/ManufacturerPresenter.php
+++ b/app/Presenters/ManufacturerPresenter.php
@@ -94,38 +94,52 @@ class ManufacturerPresenter extends Presenter
                 'searchable' => false,
                 'sortable' => true,
                 'switchable' => true,
-                'title' => ' <span class="hidden-md hidden-lg">Assets</span>'
-                    .'<span class="hidden-xs"><i class="fas fa-barcode fa-lg"></i></span>',
+                'title' => trans('general.assets'),
                 'visible' => true,
+                'class' => 'css-barcode',
             ],
             [
                 'field' => 'licenses_count',
                 'searchable' => false,
                 'sortable' => true,
                 'switchable' => true,
-                'title' => ' <span class="hidden-md hidden-lg">Licenses</span>'
-                    .'<span class="hidden-xs"><i class="far fa-save fa-lg"></i></span>',
+                'title' => trans('general.licenses'),
                 'visible' => true,
+                'class' => 'css-license',
             ],
             [
                 'field' => 'consumables_count',
                 'searchable' => false,
                 'sortable' => true,
                 'switchable' => true,
-                'title' => ' <span class="hidden-md hidden-lg">Consumables</span>'
-                    .'<span class="hidden-xs"><i class="fas fa-tint fa-lg"></i></span>',
+                'title' => trans('general.consumables'),
                 'visible' => true,
+                'class' => 'css-consumable',
             ],
             [
                 'field' => 'accessories_count',
                 'searchable' => false,
                 'sortable' => true,
                 'switchable' => true,
-                'title' => ' <span class="hidden-md hidden-lg">Accessories</span>'
-                    .'<span class="hidden-xs"><i class="far fa-keyboard fa-lg"></i></span>',
+                'title' => trans('general.accessories'),
                 'visible' => true,
-            ],
-            [
+                'class' => 'css-accessory',
+            ], [
+                'field' => 'components_count',
+                'searchable' => false,
+                'sortable' => true,
+                'switchable' => true,
+                'title' => trans('general.components'),
+                'visible' => true,
+                'class' => 'css-component',
+            ], [
+                'field' => 'created_by',
+                'searchable' => false,
+                'sortable' => true,
+                'title' => trans('general.created_by'),
+                'visible' => false,
+                'formatter' => 'usersLinkObjFormatter',
+            ], [
                 'field' => 'created_at',
                 'searchable' => true,
                 'sortable' => true,
@@ -133,9 +147,15 @@ class ManufacturerPresenter extends Presenter
                 'title' => trans('general.created_at'),
                 'visible' => false,
                 'formatter' => 'dateDisplayFormatter',
-            ],
-
-            [
+            ], [
+                'field' => 'updated_at',
+                'searchable' => true,
+                'sortable' => true,
+                'switchable' => true,
+                'title' => trans('general.updated_at'),
+                'visible' => false,
+                'formatter' => 'dateDisplayFormatter',
+            ], [
                 'field' => 'actions',
                 'searchable' => false,
                 'sortable' => false,
diff --git a/app/Presenters/PredefinedKitPresenter.php b/app/Presenters/PredefinedKitPresenter.php
index b234653adf..7ce7d8c23d 100644
--- a/app/Presenters/PredefinedKitPresenter.php
+++ b/app/Presenters/PredefinedKitPresenter.php
@@ -27,6 +27,29 @@ class PredefinedKitPresenter extends Presenter
                 'sortable' => true,
                 'title' => trans('general.name'),
                 'formatter' => 'kitsLinkFormatter',
+            ], [
+                'field' => 'created_by',
+                'searchable' => false,
+                'sortable' => true,
+                'title' => trans('general.created_by'),
+                'visible' => false,
+                'formatter' => 'usersLinkObjFormatter',
+            ], [
+                'field' => 'created_at',
+                'searchable' => true,
+                'sortable' => true,
+                'switchable' => true,
+                'title' => trans('general.created_at'),
+                'visible' => false,
+                'formatter' => 'dateDisplayFormatter',
+            ], [
+                'field' => 'updated_at',
+                'searchable' => true,
+                'sortable' => true,
+                'switchable' => true,
+                'title' => trans('general.updated_at'),
+                'visible' => false,
+                'formatter' => 'dateDisplayFormatter',
             ],
         ];
 
diff --git a/app/Presenters/StatusLabelPresenter.php b/app/Presenters/StatusLabelPresenter.php
new file mode 100644
index 0000000000..5bc4bd8831
--- /dev/null
+++ b/app/Presenters/StatusLabelPresenter.php
@@ -0,0 +1,115 @@
+<?php
+
+namespace App\Presenters;
+
+/**
+ * Class StatusLabelPresenter
+ */
+class StatusLabelPresenter extends Presenter
+{
+    /**
+     * Json Column Layout for bootstrap table
+     * @return string
+     */
+    public static function dataTableLayout()
+    {
+        $layout = [
+            [
+                'field' => 'id',
+                'searchable' => false,
+                'sortable' => true,
+                'switchable' => true,
+                'title' => trans('general.id'),
+                'visible' => false,
+            ], [
+                'field' => 'name',
+                'searchable' => true,
+                'sortable' => true,
+                'switchable' => false,
+                'title' => trans('general.name'),
+                'visible' => true,
+                'formatter' => 'statuslabelsLinkFormatter',
+            ],[
+                'field' => 'type',
+                'searchable' => false,
+                'sortable' => false,
+                'switchable' => false,
+                'title' => trans('admin/statuslabels/table.status_type'),
+                'visible' => true,
+                'formatter' => 'statusLabelTypeFormatter',
+            ], [
+                'field' => 'assets_count',
+                'searchable' => false,
+                'sortable' => true,
+                'switchable' => false,
+                'title' => trans('general.assets'),
+                'visible' => true,
+            ], [
+                'field' => 'color',
+                'searchable' => false,
+                'sortable' => true,
+                'switchable' => true,
+                'title' => trans('admin/statuslabels/table.color'),
+                'visible' => true,
+                'formatter' => 'colorSqFormatter',
+            ],  [
+                'field' => 'show_in_nav',
+                'searchable' => false,
+                'sortable' => true,
+                'switchable' => true,
+                'title' => trans('admin/statuslabels/table.show_in_nav'),
+                'visible' => true,
+                'formatter' => 'trueFalseFormatter',
+            ], [
+                'field' => 'default_label',
+                'searchable' => false,
+                'sortable' => true,
+                'switchable' => true,
+                'title' => trans('admin/statuslabels/table.default_label'),
+                'visible' => true,
+                'formatter' => 'trueFalseFormatter',
+            ],[
+                'field' => 'notes',
+                'searchable' => true,
+                'sortable' => true,
+                'switchable' => true,
+                'title' => trans('general.notes'),
+                'visible' => false,
+            ], [
+                'field' => 'created_by',
+                'searchable' => false,
+                'sortable' => true,
+                'title' => trans('general.created_by'),
+                'visible' => false,
+                'formatter' => 'usersLinkObjFormatter',
+            ], [
+                'field' => 'created_at',
+                'searchable' => true,
+                'sortable' => true,
+                'switchable' => true,
+                'title' => trans('general.created_at'),
+                'visible' => false,
+                'formatter' => 'dateDisplayFormatter',
+            ], [
+                'field' => 'updated_at',
+                'searchable' => true,
+                'sortable' => true,
+                'switchable' => true,
+                'title' => trans('general.updated_at'),
+                'visible' => false,
+                'formatter' => 'dateDisplayFormatter',
+            ], [
+                'field' => 'actions',
+                'searchable' => false,
+                'sortable' => false,
+                'switchable' => false,
+                'title' => trans('table.actions'),
+                'formatter' => 'statuslabelsActionsFormatter',
+            ],
+        ];
+
+        return json_encode($layout);
+    }
+
+
+}
diff --git a/app/Presenters/SupplierPresenter.php b/app/Presenters/SupplierPresenter.php
new file mode 100644
index 0000000000..20957cc648
--- /dev/null
+++ b/app/Presenters/SupplierPresenter.php
@@ -0,0 +1,226 @@
+<?php
+
+namespace App\Presenters;
+
+/**
+ * Class LocationPresenter
+ */
+class SupplierPresenter extends Presenter
+{
+    /**
+     * Json Column Layout for bootstrap table
+     */
+    public static function dataTableLayout()
+    {
+        $layout = [
+             [
+                'field' => 'id',
+                'searchable' => false,
+                'sortable' => true,
+                'switchable' => true,
+                'title' => trans('general.id'),
+                'visible' => false,
+            ],
+            [
+                'field' => 'name',
+                'searchable' => true,
+                'sortable' => true,
+                'switchable' => false,
+                'title' => trans('general.name'),
+                'visible' => true,
+                'formatter' => 'suppliersLinkFormatter',
+            ], [
+                'field' => 'image',
+                'searchable' => false,
+                'sortable' => true,
+                'switchable' => true,
+                'title' => trans('general.image'),
+                'visible' => true,
+                'formatter' => 'imageFormatter',
+            ],
+            [
+                'field' => 'assets_count',
+                'searchable' => false,
+                'sortable' => true,
+                'switchable' => true,
+                'title' =>  trans('general.assets'),
+                'titleTooltip' =>  trans('general.assets'),
+                'visible' => true,
+                'class' => 'css-barcode',
+            ],  [
+                'field' => 'accessories_count',
+                'searchable' => false,
+                'sortable' => true,
+                'switchable' => true,
+                'title' =>  trans('general.accessories'),
+                'titleTooltip' =>  trans('general.accessories'),
+                'visible' => true,
+                'class' => 'css-accessory',
+            ],
+            [
+                'field' => 'licenses_count',
+                'searchable' => false,
+                'sortable' => true,
+                'switchable' => true,
+                'title' =>  trans('general.licenses'),
+                'titleTooltip' =>  trans('general.licenses'),
+                'visible' => true,
+                'class' => 'css-license',
+            ], [
+                'field' => 'components_count',
+                'searchable' => false,
+                'sortable' => true,
+                'switchable' => true,
+                'title' =>  trans('general.components'),
+                'titleTooltip' =>  trans('general.components'),
+                'visible' => true,
+                'class' => 'css-component',
+            ], [
+                'field' => 'consumables_count',
+                'searchable' => false,
+                'sortable' => true,
+                'switchable' => true,
+                'title' =>  trans('general.consumables'),
+                'titleTooltip' =>  trans('general.consumables'),
+                'visible' => true,
+                'class' => 'css-consumable',
+            ], [
+                'field' => 'url',
+                'searchable' => false,
+                'sortable' => true,
+                'switchable' => true,
+                'title' => trans('general.url'),
+                'visible' => true,
+                'formatter' => 'externalLinkFormatter',
+            ], [
+                'field' => 'address',
+                'searchable' => true,
+                'sortable' => true,
+                'switchable' => true,
+                'title' =>  trans('admin/locations/table.address'),
+                'visible' => true,
+            ], [
+                'field' => 'address2',
+                'searchable' => true,
+                'sortable' => true,
+                'switchable' => true,
+                'title' =>  trans('admin/locations/table.address2'),
+                'visible' => false,
+            ], [
+                'field' => 'city',
+                'searchable' => true,
+                'sortable' => true,
+                'switchable' => true,
+                'title' =>  trans('admin/locations/table.city'),
+                'visible' => true,
+            ], [
+                'field' => 'state',
+                'searchable' => true,
+                'sortable' => true,
+                'switchable' => true,
+                'title' =>  trans('admin/locations/table.state'),
+                'visible' => true,
+            ], [
+                'field' => 'zip',
+                'searchable' => true,
+                'sortable' => true,
+                'switchable' => true,
+                'title' =>  trans('admin/locations/table.zip'),
+                'visible' => false,
+            ], [
+                'field' => 'country',
+                'searchable' => true,
+                'sortable' => true,
+                'switchable' => true,
+                'title' =>  trans('admin/locations/table.country'),
+                'visible' => false,
+            ], [
+                'field' => 'phone',
+                'searchable' => true,
+                'sortable' => true,
+                'switchable' => true,
+                'title' => trans('admin/users/table.phone'),
+                'visible' => false,
+                'formatter'    => 'phoneFormatter',
+            ], [
+                'field' => 'fax',
+                'searchable' => true,
+                'sortable' => true,
+                'switchable' => true,
+                'title' => trans('admin/suppliers/table.fax'),
+                'visible' => false,
+                'formatter'    => 'phoneFormatter',
+            ], [
+                'field' => 'notes',
+                'searchable' => true,
+                'sortable' => true,
+                'visible' => false,
+                'title' => trans('general.notes'),
+            ], [
+                'field' => 'created_at',
+                'searchable' => true,
+                'sortable' => true,
+                'switchable' => true,
+                'title' => trans('general.created_at'),
+                'visible' => false,
+                'formatter' => 'dateDisplayFormatter',
+            ],  [
+                'field' => 'created_by',
+                'searchable' => true,
+                'sortable' => true,
+                'switchable' => true,
+                'title' => trans('general.created_by'),
+                'visible' => false,
+                'formatter' => 'usersLinkObjFormatter',
+            ], [
+                'field' => 'actions',
+                'searchable' => false,
+                'sortable' => false,
+                'switchable' => false,
+                'title' => trans('table.actions'),
+                'visible' => true,
+                'formatter' => 'suppliersActionsFormatter',
+            ],
+        ];
+
+        return json_encode($layout);
+    }
+    
+
+    /**
+     * Link to this supplier name
+     * @return string
+     */
+    public function nameUrl()
+    {
+        return (string) link_to_route('suppliers.show', $this->name, $this->id);
+    }
+
+    /**
+     * Getter for Polymorphism.
+     * @return mixed
+     */
+    public function name()
+    {
+        return $this->model->name;
+    }
+
+    /**
+     * Url to view this item.
+     * @return string
+     */
+    public function viewUrl()
+    {
+        return route('suppliers.show', $this->id);
+    }
+
+    public function glyph()
+    {
+        return '<x-icon type="suppliers" />';
+    }
+
+    public function fullName()
+    {
+        return $this->name;
+    }
+}
diff --git a/app/Presenters/UserPresenter.php b/app/Presenters/UserPresenter.php
index 4b26f95f40..dd64212c34 100644
--- a/app/Presenters/UserPresenter.php
+++ b/app/Presenters/UserPresenter.php
@@ -24,6 +24,7 @@ class UserPresenter extends Presenter
             [
                 'field' => 'checkbox',
                 'checkbox' => true,
+                'titleTooltip' => trans('general.select_all_none'),
             ],
             [
                 'field' => 'id',
@@ -188,6 +189,14 @@ class UserPresenter extends Presenter
                 'title' => trans('general.employee_number'),
                 'visible' => false,
             ],
+            [
+                'field' => 'locale',
+                'searchable' => true,
+                'sortable' => true,
+                'switchable' => true,
+                'title' => trans('general.language'),
+                'visible' => false,
+            ],
             [
                 'field' => 'department',
                 'searchable' => true,
@@ -232,6 +241,7 @@ class UserPresenter extends Presenter
                 'class' => 'css-barcode',
                 'title' => trans('general.assets'),
                 'visible' => true,
+                'formatter' => 'linkNumberToUserAssetsFormatter',
             ],
             [
                 'field' => 'licenses_count',
@@ -241,6 +251,7 @@ class UserPresenter extends Presenter
                 'class' => 'css-license',
                 'title' => trans('general.licenses'),
                 'visible' => true,
+                'formatter' => 'linkNumberToUserLicensesFormatter',
             ],
             [
                 'field' => 'consumables_count',
@@ -250,6 +261,7 @@ class UserPresenter extends Presenter
                 'class' => 'css-consumable',
                 'title' => trans('general.consumables'),
                 'visible' => true,
+                'formatter' => 'linkNumberToUserConsumablesFormatter',
             ],
             [
                 'field' => 'accessories_count',
@@ -259,6 +271,7 @@ class UserPresenter extends Presenter
                 'class' => 'css-accessory',
                 'title' => trans('general.accessories'),
                 'visible' => true,
+                'formatter' => 'linkNumberToUserAccessoriesFormatter',
             ],
             [
                 'field' => 'manages_users_count',
@@ -268,6 +281,7 @@ class UserPresenter extends Presenter
                 'class' => 'css-users',
                 'title' => trans('admin/users/table.managed_users'),
                 'visible' => true,
+                'formatter' => 'linkNumberToUserManagedUsersFormatter',
             ],
             [
                 'field' => 'manages_locations_count',
@@ -277,6 +291,7 @@ class UserPresenter extends Presenter
                 'class' => 'css-location',
                 'title' => trans('admin/users/table.managed_locations'),
                 'visible' => true,
+                'formatter' => 'linkNumberToUserManagedLocationsFormatter',
             ],
             [
                 'field' => 'notes',
@@ -356,6 +371,14 @@ class UserPresenter extends Presenter
                 'title' => trans('general.created_at'),
                 'visible' => false,
                 'formatter' => 'dateDisplayFormatter',
+            ], [
+                'field' => 'updated_at',
+                'searchable' => true,
+                'sortable' => true,
+                'switchable' => true,
+                'title' => trans('general.updated_at'),
+                'visible' => false,
+                'formatter' => 'dateDisplayFormatter',
             ],
             [
                 'field' => 'start_date',
@@ -435,6 +458,8 @@ class UserPresenter extends Presenter
      */
     public function gravatar()
     {
+
+        // User's specific avatar
         if ($this->avatar) {
 
             // Check if it's a google avatar or some external avatar
@@ -446,21 +471,31 @@ class UserPresenter extends Presenter
             return Storage::disk('public')->url('avatars/'.e($this->avatar));
         }
 
-        if (Setting::getSettings()->load_remote == '1') {
-            if ($this->model->gravatar != '') {
 
+        // If the default is system default
+        if (Setting::getSettings()->default_avatar == 'default.png') {
+            return Storage::disk('public')->url('default.png');
+        }
+
+        // If there is a custom default avatar
+        if (Setting::getSettings()->default_avatar != '') {
+            return Storage::disk('public')->url('avatars/'.e(Setting::getSettings()->default_avatar));
+        }
+
+        // If there is no default and no custom avatar, check for gravatar
+        if ((Setting::getSettings()->load_remote == '1') && (Setting::getSettings()->default_avatar == '')) {
+
+            if ($this->model->gravatar != '') {
                 $gravatar = md5(strtolower(trim($this->model->gravatar)));
                 return '//gravatar.com/avatar/'.$gravatar;
 
             } elseif ($this->email != '') {
-
                 $gravatar = md5(strtolower(trim($this->email)));
                 return '//gravatar.com/avatar/'.$gravatar;
             }
         }
 
-        // Set a fun, gender-neutral default icon
-        return config('app.url').'/img/default-sm.png';
+        return false;
     }
 
     /**
@@ -483,6 +518,6 @@ class UserPresenter extends Presenter
 
     public function glyph()
     {
-        return '<i class="fas fa-user" aria-hidden="true"></i>';
+        return '<x-icon type="user"/>';
     }
 }
diff --git a/app/Providers/AuthServiceProvider.php b/app/Providers/AuthServiceProvider.php
index e17d667845..899df2ef14 100644
--- a/app/Providers/AuthServiceProvider.php
+++ b/app/Providers/AuthServiceProvider.php
@@ -87,11 +87,11 @@ class AuthServiceProvider extends ServiceProvider
         ]);
 
         $this->registerPolicies();
-        //Passport::routes(); //this is no longer required in newer passport versions
-        Passport::tokensExpireIn(Carbon::now()->addYears(config('passport.expiration_years')));
-        Passport::refreshTokensExpireIn(Carbon::now()->addYears(config('passport.expiration_years')));
-        Passport::personalAccessTokensExpireIn(Carbon::now()->addYears(config('passport.expiration_years')));
-        Passport::withCookieSerialization();
+        Passport::tokensExpireIn(Carbon::now()->addYears((int)config('passport.expiration_years')));
+        Passport::refreshTokensExpireIn(Carbon::now()->addYears((int)config('passport.expiration_years')));
+        Passport::personalAccessTokensExpireIn(Carbon::now()->addYears((int)config('passport.expiration_years')));
+
+        Passport::cookie(config('passport.cookie_name'));
 
 
         /**
@@ -168,6 +168,15 @@ class AuthServiceProvider extends ServiceProvider
             }
         });
 
+        // -----------------------------------------
+        // Activity
+        // -----------------------------------------
+        Gate::define('activity.view', function ($user) {
+            if (($user->hasAccess('reports.view')) || ($user->hasAccess('admin'))) {
+                return true;
+            }
+        });
+
         // -----------------------------------------
         // Self
         // -----------------------------------------
@@ -230,7 +239,8 @@ class AuthServiceProvider extends ServiceProvider
                 || $user->can('update', Accessory::class)
                 || $user->can('create', Accessory::class)   
                 || $user->can('update', User::class)
-                || $user->can('create', User::class);  
+                || $user->can('create', User::class)
+                || ($user->hasAccess('reports.view'));
         });
 
 
diff --git a/app/Providers/BladeServiceProvider.php b/app/Providers/BladeServiceProvider.php
new file mode 100644
index 0000000000..024ee9d3dc
--- /dev/null
+++ b/app/Providers/BladeServiceProvider.php
@@ -0,0 +1,25 @@
+<?php
+
+namespace App\Providers;
+
+use Illuminate\Support\Facades\Blade;
+use Illuminate\Support\ServiceProvider;
+
+class BladeServiceProvider extends ServiceProvider
+{
+    /**
+     * Register services.
+     */
+    public function register(): void
+    {
+        //
+    }
+
+    /**
+     * Bootstrap services.
+     */
+    public function boot(): void
+    {
+        Blade::anonymousComponentPath(__DIR__ . '/../../resources/views/blade');
+    }
+}
diff --git a/app/Providers/BreadcrumbsServiceProvider.php b/app/Providers/BreadcrumbsServiceProvider.php
new file mode 100644
index 0000000000..eda242fbe5
--- /dev/null
+++ b/app/Providers/BreadcrumbsServiceProvider.php
@@ -0,0 +1,575 @@
+<?php namespace App\Providers;
+
+use App\Models\Accessory;
+use App\Models\Asset;
+use App\Models\AssetMaintenance;
+use App\Models\AssetModel;
+use App\Models\Category;
+use App\Models\Company;
+use App\Models\Component;
+use App\Models\Consumable;
+use App\Models\CustomField;
+use App\Models\CustomFieldset;
+use App\Models\Department;
+use App\Models\Depreciation;
+use App\Models\Group;
+use App\Models\License;
+use App\Models\LicenseSeat;
+use App\Models\Location;
+use App\Models\Manufacturer;
+use App\Models\PredefinedKit;
+use App\Models\Statuslabel;
+use App\Models\Supplier;
+use App\Models\User;
+use Illuminate\Support\ServiceProvider;
+use Tabuna\Breadcrumbs\Breadcrumbs;
+use Tabuna\Breadcrumbs\Trail;
+
+class BreadcrumbsServiceProvider extends ServiceProvider
+{
+/**
+* Handles the resource routes for first-class objects
+*
+* @return void
+*/
+    public function boot()
+    {
+
+        // Default home
+        Breadcrumbs::for('home', fn (Trail $trail) =>
+        $trail->push('<x-icon type="home" /><span class="sr-only">'.trans('general.dashboard').'</span>', route('home'))
+        );
+
+        /**
+         * Asset Breadcrumbs
+         */
+
+
+            if ((request()->is('hardware*')) && (request()->status!='')) {
+                Breadcrumbs::for('hardware.index', fn (Trail $trail) =>
+                $trail->parent('home', route('home'))
+                    ->push(trans('general.assets'), route('hardware.index'))
+                    ->push(request()->status.' '.trans('general.assets'), route('hardware.index', ['status' => request()->status]))
+                );
+
+            } else {
+                Breadcrumbs::for('hardware.index', fn (Trail $trail) =>
+                $trail->parent('home', route('home'))
+                    ->push(trans('general.assets'), route('hardware.index'))
+                );
+            }
+
+
+
+
+        Breadcrumbs::for('hardware.create', fn (Trail $trail) =>
+        $trail->parent('hardware.index', route('hardware.index'))
+        ->push(trans('general.create'), route('hardware.create'))
+        );
+
+        Breadcrumbs::for('clone/hardware', fn (Trail $trail) =>
+        $trail->parent('hardware.index', route('hardware.index'))
+            ->push(trans('admin/hardware/general.clone'), route('hardware.create'))
+        );
+
+        Breadcrumbs::for('hardware.show', fn (Trail $trail, Asset $asset) =>
+        $trail->parent('hardware.index', route('hardware.index'))
+            ->push($asset->present()->fullName(), route('hardware.show', $asset))
+        );
+
+        Breadcrumbs::for('hardware.edit', fn (Trail $trail, Asset $asset) =>
+        $trail->parent('hardware.index', route('hardware.index'))
+            ->push($asset->present()->fullName(), route('hardware.show', $asset))
+            ->push(trans('admin/hardware/general.edit'))
+        );
+
+
+        /**
+         * Asset Model Breadcrumbs
+         */
+
+        if ((request()->is('models*')) && (request()->status=='deleted')) {
+            Breadcrumbs::for('models.index', fn (Trail $trail) =>
+            $trail->parent('hardware.index', route('hardware.index'))
+                ->push(trans('general.asset_models'), route('models.index'))
+                ->push(trans('general.deleted_models'), route('models.index', ['status' => request()->status]))
+            );
+        } else {
+            Breadcrumbs::for('models.index', fn (Trail $trail) =>
+            $trail->parent('hardware.index', route('hardware.index'))
+                ->push(trans('general.asset_models'), route('models.index'))
+            );
+        }
+
+
+        Breadcrumbs::for('models.create', fn (Trail $trail) =>
+        $trail->parent('models.index', route('models.index'))
+            ->push(trans('general.create'), route('models.create'))
+        );
+
+        Breadcrumbs::for('models.show', fn (Trail $trail, AssetModel $model) =>
+        $trail->parent('models.index', route('models.index'))
+            ->push($model->name, route('models.show', $model))
+        );
+
+        Breadcrumbs::for('models.edit', fn (Trail $trail, AssetModel $model) =>
+        $trail->parent('models.index', route('models.index'))
+            ->push(trans('general.breadcrumb_button_actions.edit_item', ['name' => $model->name]), route('models.edit', $model))
+        );
+
+
+        /**
+         * Accessories Breadcrumbs
+         */
+        Breadcrumbs::for('accessories.index', fn (Trail $trail) =>
+        $trail->parent('home', route('home'))
+            ->push(trans('general.accessories'), route('accessories.index'))
+        );
+
+        Breadcrumbs::for('accessories.create', fn (Trail $trail) =>
+        $trail->parent('accessories.index', route('accessories.index'))
+            ->push(trans('general.create'), route('accessories.create'))
+        );
+
+        Breadcrumbs::for('accessories.show', fn (Trail $trail, Accessory $accessory) =>
+        $trail->parent('accessories.index', route('accessories.index'))
+            ->push($accessory->name, route('accessories.show', $accessory))
+        );
+
+        Breadcrumbs::for('accessories.edit', fn (Trail $trail, Accessory $accessory) =>
+        $trail->parent('accessories.index', route('accessories.index'))
+            ->push(trans('general.breadcrumb_button_actions.edit_item', ['name' => $accessory->name]), route('accessories.edit', $accessory))
+        );
+
+
+        /**
+         * Categories Breadcrumbs
+         */
+        Breadcrumbs::for('categories.index', fn (Trail $trail) =>
+        $trail->parent('home', route('home'))
+            ->push(trans('general.categories'), route('categories.index'))
+        );
+
+        Breadcrumbs::for('categories.create', fn (Trail $trail) =>
+        $trail->parent('categories.index', route('categories.index'))
+            ->push(trans('general.create'), route('categories.create'))
+        );
+
+        Breadcrumbs::for('categories.show', fn (Trail $trail, Category $category) =>
+        $trail->parent('categories.index', route('categories.index'))
+            ->push($category->name, route('categories.show', $category))
+        );
+
+        Breadcrumbs::for('categories.edit', fn (Trail $trail, Category $category) =>
+        $trail->parent('categories.index', route('categories.index'))
+            ->push(trans('general.breadcrumb_button_actions.edit_item', ['name' => $category->name]), route('categories.edit', $category))
+        );
+
+
+
+        /**
+         * Company Breadcrumbs
+         */
+        Breadcrumbs::for('companies.index', fn (Trail $trail) =>
+        $trail->parent('home', route('home'))
+            ->push(trans('general.companies'), route('companies.index'))
+        );
+
+        Breadcrumbs::for('companies.create', fn (Trail $trail) =>
+        $trail->parent('companies.index', route('companies.index'))
+            ->push(trans('general.create'), route('companies.create'))
+        );
+
+        Breadcrumbs::for('companies.show', fn (Trail $trail, Company $company) =>
+        $trail->parent('companies.index', route('companies.index'))
+            ->push($company->name, route('companies.show', $company))
+        );
+
+        Breadcrumbs::for('companies.edit', fn (Trail $trail, Company $company) =>
+        $trail->parent('companies.index', route('companies.index'))
+            ->push(trans('general.breadcrumb_button_actions.edit_item', ['name' => $company->name]), route('companies.edit', $company))
+        );
+
+
+        /**
+         * Components Breadcrumbs
+         */
+        Breadcrumbs::for('components.index', fn (Trail $trail) =>
+        $trail->parent('home', route('home'))
+            ->push(trans('general.components'), route('components.index'))
+        );
+
+        Breadcrumbs::for('components.create', fn (Trail $trail) =>
+        $trail->parent('components.index', route('components.index'))
+            ->push(trans('general.create'), route('components.create'))
+        );
+
+        Breadcrumbs::for('components.show', fn (Trail $trail, Component $component) =>
+        $trail->parent('components.index', route('components.index'))
+            ->push($component->name, route('components.show', $component))
+        );
+
+        Breadcrumbs::for('components.edit', fn (Trail $trail, Component $component) =>
+        $trail->parent('components.index', route('components.index'))
+            ->push(trans('general.breadcrumb_button_actions.edit_item', ['name' => $component->name]), route('components.edit', $component))
+        );
+
+
+        /**
+         * Consumables Breadcrumbs
+         */
+        Breadcrumbs::for('consumables.index', fn (Trail $trail) =>
+        $trail->parent('home', route('home'))
+            ->push(trans('general.consumables'), route('consumables.index'))
+        );
+
+        Breadcrumbs::for('consumables.create', fn (Trail $trail) =>
+        $trail->parent('consumables.index', route('consumables.index'))
+            ->push(trans('general.create'), route('consumables.create'))
+        );
+
+        Breadcrumbs::for('consumables.show', fn (Trail $trail, Consumable $consumable) =>
+        $trail->parent('consumables.index', route('consumables.index'))
+            ->push($consumable->name, route('consumables.show', $consumable))
+        );
+
+        Breadcrumbs::for('consumables.edit', fn (Trail $trail, Consumable $consumable) =>
+        $trail->parent('consumables.index', route('consumables.index'))
+            ->push(trans('general.breadcrumb_button_actions.edit_item', ['name' => $consumable->name]), route('consumables.edit', $consumable))
+        );
+
+        /**
+         * Custom fields Breadcrumbs
+         */
+        Breadcrumbs::for('fields.index', fn (Trail $trail) =>
+        $trail->parent('models.index', route('models.index'))
+            ->push(trans('admin/custom_fields/general.custom_fields'), route('fields.index'))
+        );
+
+        Breadcrumbs::for('fields.create', fn (Trail $trail) =>
+        $trail->parent('fields.index', route('fields.index'))
+            ->push(trans('general.create'), route('fields.create'))
+        );
+
+        Breadcrumbs::for('fields.edit', fn (Trail $trail, CustomField $field) =>
+        $trail->parent('fields.index', route('fields.index'))
+            ->push($field->name, route('fields.edit', $field))
+        );
+
+        /**
+         * Custom fieldsets Breadcrumbs
+         */
+
+        Breadcrumbs::for('fieldsets.create', fn (Trail $trail) =>
+        $trail->parent('fields.index', route('fields.index'))
+            ->push(trans('general.create'), route('fieldsets.create'))
+        );
+
+        Breadcrumbs::for('fieldsets.show', fn (Trail $trail, CustomFieldset $fieldset) =>
+        $trail->parent('fields.index', route('fields.index'))
+            ->push($fieldset->name, route('fields.index'))
+        );
+
+        Breadcrumbs::for('fieldsets.edit', fn (Trail $trail, CustomFieldset $fieldset) =>
+        $trail->parent('fields.index', route('fields.index'))
+            ->push($fieldset->name, route('fieldsets.edit', $fieldset))
+        );
+
+        /**
+         * Department Breadcrumbs
+         */
+        Breadcrumbs::for('departments.index', fn (Trail $trail) =>
+        $trail->parent('home', route('home'))
+            ->push(trans('general.departments'), route('departments.index'))
+        );
+
+        Breadcrumbs::for('departments.create', fn (Trail $trail) =>
+        $trail->parent('departments.index', route('departments.index'))
+            ->push(trans('general.create'), route('departments.create'))
+        );
+
+        Breadcrumbs::for('departments.show', fn (Trail $trail, Department $department) =>
+        $trail->parent('departments.index', route('departments.index'))
+            ->push($department->name, route('home'))
+        );
+
+        Breadcrumbs::for('departments.edit', fn (Trail $trail, Department $department) =>
+        $trail->parent('departments.index', route('departments.index'))
+            ->push(trans('general.breadcrumb_button_actions.edit_item', ['name' => $department->name]), route('departments.edit', $department))
+        );
+
+
+        /**
+         * Department Breadcrumbs
+         */
+        Breadcrumbs::for('depreciations.index', fn (Trail $trail) =>
+        $trail->parent('home', route('home'))
+            ->push(trans('general.depreciations'), route('depreciations.index'))
+        );
+
+        Breadcrumbs::for('depreciations.create', fn (Trail $trail) =>
+        $trail->parent('depreciations.index', route('depreciations.index'))
+            ->push(trans('general.create'), route('depreciations.create'))
+        );
+
+        Breadcrumbs::for('depreciations.show', fn (Trail $trail, Depreciation $depreciation) =>
+        $trail->parent('depreciations.index', route('depreciations.index'))
+            ->push($depreciation->name, route('depreciations.show', $depreciation))
+        );
+
+        Breadcrumbs::for('depreciations.edit', fn (Trail $trail, Depreciation $depreciation) =>
+        $trail->parent('depreciations.index', route('depreciations.index'))
+            ->push(trans('general.breadcrumb_button_actions.edit_item', ['name' => $depreciation->name]), route('depreciations.edit', $depreciation))
+        );
+
+        /**
+         * Groups Breadcrumbs
+         */
+        Breadcrumbs::for('groups.index', fn (Trail $trail) =>
+        $trail->parent('settings.index', route('settings.index'))
+            ->push(trans('general.groups'), route('groups.index'))
+        );
+
+        Breadcrumbs::for('groups.create', fn (Trail $trail) =>
+        $trail->parent('groups.index', route('groups.index'))
+            ->push(trans('general.create'), route('groups.create'))
+        );
+
+        Breadcrumbs::for('groups.show', fn (Trail $trail, Group $group) =>
+        $trail->parent('groups.index', route('groups.index'))
+            ->push($group->name, route('groups.show', $group))
+        );
+
+        Breadcrumbs::for('groups.edit', fn (Trail $trail, Group $group) =>
+        $trail->parent('groups.index', route('groups.index'))
+            ->push(trans('general.breadcrumb_button_actions.edit_item', ['name' => $group->name]), route('groups.edit', $group))
+        );
+
+
+        /**
+         * Licenses Breadcrumbs
+         */
+        Breadcrumbs::for('licenses.index', fn (Trail $trail) =>
+        $trail->parent('home', route('home'))
+            ->push(trans('general.licenses'), route('licenses.index'))
+        );
+
+        Breadcrumbs::for('licenses.create', fn (Trail $trail) =>
+        $trail->parent('licenses.index', route('licenses.index'))
+            ->push(trans('general.create'), route('licenses.create'))
+        );
+
+        Breadcrumbs::for('licenses.show', fn (Trail $trail, License $license) =>
+        $trail->parent('licenses.index', route('licenses.index'))
+            ->push($license->name, route('licenses.show', $license))
+        );
+
+        Breadcrumbs::for('licenses.edit', fn (Trail $trail, License $license) =>
+        $trail->parent('licenses.index', route('licenses.index'))
+            ->push(trans('general.breadcrumb_button_actions.edit_item', ['name' => $license->name]), route('licenses.edit', $license))
+        );
+
+
+        /**
+         * Locations Breadcrumbs
+         */
+        Breadcrumbs::for('locations.index', fn (Trail $trail) =>
+        $trail->parent('home', route('home'))
+            ->push(trans('general.locations'), route('locations.index'))
+        );
+
+        Breadcrumbs::for('locations.create', fn (Trail $trail) =>
+        $trail->parent('locations.index', route('locations.index'))
+            ->push(trans('general.create'), route('locations.create'))
+        );
+
+        Breadcrumbs::for('clone/location', fn (Trail $trail) =>
+        $trail->parent('locations.index', route('locations.index'))
+            ->push(trans('admin/locations/table.clone'), route('locations.create'))
+        );
+
+
+        Breadcrumbs::for('locations.show', fn (Trail $trail, Location $location) =>
+        $trail->parent('locations.index', route('locations.index'))
+            ->push($location->name, route('locations.show', $location))
+        );
+
+        Breadcrumbs::for('locations.edit', fn (Trail $trail, Location $location) =>
+        $trail->parent('locations.index', route('locations.index'))
+            ->push($location->name, route('locations.show', $location))
+            ->push(trans('general.breadcrumb_button_actions.edit_item', ['name' => $location->name]), route('locations.edit', $location))
+        );
+
+        /**
+         * Maintenances Breadcrumbs
+         */
+        Breadcrumbs::for('maintenances.index', fn (Trail $trail) =>
+        $trail->parent('hardware.index', route('hardware.index'))
+            ->push(trans('general.maintenances'), route('maintenances.index'))
+        );
+
+        Breadcrumbs::for('maintenances.create', fn (Trail $trail) =>
+        $trail->parent('maintenances.index', route('maintenances.index'))
+            ->push(trans('general.create'), route('maintenances.create'))
+        );
+
+        Breadcrumbs::for('maintenances.show', fn (Trail $trail, AssetMaintenance $maintenance) =>
+        $trail->parent('maintenances.index', route('maintenances.index'))
+            ->push($maintenance->title, route('maintenances.show', $maintenance))
+        );
+
+        Breadcrumbs::for('maintenances.edit', fn (Trail $trail, AssetMaintenance $maintenance) =>
+        $trail->parent('maintenances.index', route('maintenances.index'))
+            ->push(trans('general.breadcrumb_button_actions.edit_item', ['name' => $maintenance->title]), route('maintenances.edit', $maintenance))
+        );
+
+
+        /**
+         * Manufacturers Breadcrumbs
+         */
+        Breadcrumbs::for('manufacturers.index', fn (Trail $trail) =>
+        $trail->parent('home', route('home'))
+            ->push(trans('general.manufacturers'), route('manufacturers.index'))
+        );
+
+        Breadcrumbs::for('manufacturers.create', fn (Trail $trail) =>
+        $trail->parent('manufacturers.index', route('manufacturers.index'))
+            ->push(trans('general.create'), route('manufacturers.create'))
+        );
+
+        Breadcrumbs::for('manufacturers.show', fn (Trail $trail, Manufacturer $manufacturer) =>
+        $trail->parent('manufacturers.index', route('manufacturers.index'))
+            ->push($manufacturer->name, route('home'))
+        );
+
+        Breadcrumbs::for('manufacturers.edit', fn (Trail $trail, Manufacturer $manufacturer) =>
+        $trail->parent('manufacturers.index', route('manufacturers.index'))
+            ->push(trans('general.breadcrumb_button_actions.edit_item', ['name' => $manufacturer->name]), route('manufacturers.edit', $manufacturer))
+        );
+
+
+        /**
+         * Predefined Kits Breadcrumbs
+         */
+        Breadcrumbs::for('kits.index', fn (Trail $trail) =>
+        $trail->parent('home', route('home'))
+            ->push(trans('general.kits'), route('kits.index'))
+        );
+
+        Breadcrumbs::for('kits.create', fn (Trail $trail) =>
+        $trail->parent('kits.index', route('kits.index'))
+            ->push(trans('general.create'), route('kits.create'))
+        );
+
+        Breadcrumbs::for('kits.show', fn (Trail $trail, PredefinedKit $kit) =>
+        $trail->parent('kits.index', route('kits.index'))
+            ->push($kit->name, route('kits.show', $kit))
+        );
+
+        Breadcrumbs::for('kits.edit', fn (Trail $trail, PredefinedKit $kit) =>
+        $trail->parent('kits.index', route('kits.index'))
+            ->push(trans('general.breadcrumb_button_actions.edit_item', ['name' => $kit->name]), route('kits.edit', $kit))
+        );
+
+
+        /**
+         * Status Labels Breadcrumbs
+         */
+        Breadcrumbs::for('statuslabels.index', fn (Trail $trail) =>
+        $trail->parent('home', route('home'))
+            ->push(trans('general.status_labels'), route('statuslabels.index'))
+        );
+
+        Breadcrumbs::for('statuslabels.create', fn (Trail $trail) =>
+        $trail->parent('statuslabels.index', route('statuslabels.index'))
+            ->push(trans('general.create'), route('statuslabels.create'))
+        );
+
+        Breadcrumbs::for('statuslabels.show', fn (Trail $trail, Statuslabel $statuslabel) =>
+        $trail->parent('statuslabels.index', route('statuslabels.index'))
+            ->push($statuslabel->name, route('statuslabels.show', $statuslabel))
+        );
+
+        Breadcrumbs::for('statuslabels.edit', fn (Trail $trail, Statuslabel $statuslabel) =>
+        $trail->parent('statuslabels.index', route('statuslabels.index'))
+            ->push(trans('general.breadcrumb_button_actions.edit_item', ['name' => $statuslabel->name]), route('statuslabels.edit', $statuslabel))
+        );
+
+
+        /**
+         * Settings Breadcrumbs
+         */
+        Breadcrumbs::for('settings.index', fn (Trail $trail) =>
+        $trail->parent('home', route('home'))
+            ->push(trans('general.admin'), route('settings.index'))
+        );
+
+
+
+        /**
+         * Suppliers Breadcrumbs
+         */
+        Breadcrumbs::for('suppliers.index', fn (Trail $trail) =>
+        $trail->parent('home', route('home'))
+            ->push(trans('general.suppliers'), route('suppliers.index'))
+        );
+
+        Breadcrumbs::for('suppliers.create', fn (Trail $trail) =>
+        $trail->parent('suppliers.index', route('suppliers.index'))
+            ->push(trans('general.create'), route('suppliers.create'))
+        );
+
+        Breadcrumbs::for('suppliers.show', fn (Trail $trail, Supplier $supplier) =>
+        $trail->parent('suppliers.index', route('suppliers.index'))
+            ->push($supplier->name, route('home'))
+        );
+
+        Breadcrumbs::for('suppliers.edit', fn (Trail $trail, Supplier $supplier) =>
+        $trail->parent('suppliers.index', route('suppliers.index'))
+            ->push(trans('general.breadcrumb_button_actions.edit_item', ['name' => $supplier->name]), route('suppliers.edit', $supplier))
+        );
+
+
+
+        /**
+         * Users Breadcrumbs
+         */
+        if ((request()->is('users*')) && (request()->status=='deleted')) {
+            Breadcrumbs::for('users.index', fn(Trail $trail) => $trail->parent('home', route('home'))
+                ->push(trans('general.users'), route('users.index'))
+                ->push(trans('general.deleted_users'), route('users.index'))
+            );
+        } else {
+            Breadcrumbs::for('users.index', fn(Trail $trail) => $trail->parent('home', route('home'))
+                ->push(trans('general.users'), route('users.index'))
+            );
+        }
+
+        Breadcrumbs::for('users.create', fn (Trail $trail) =>
+        $trail->parent('users.index', route('users.index'))
+            ->push(trans('general.create'), route('users.create'))
+        );
+
+        Breadcrumbs::for('users.clone.show', fn (Trail $trail) =>
+        $trail->parent('users.index', route('users.index'))
+            ->push(trans('admin/users/general.clone'), route('users.create'))
+        );
+
+
+
+        Breadcrumbs::for('users.show', fn (Trail $trail, User $user) =>
+        $trail->parent('users.index', route('users.index'))
+            ->push($user->getFullNameAttribute() ?? 'Missing Username!', route('users.show', $user))
+        );
+
+        Breadcrumbs::for('users.edit', fn (Trail $trail, User $user) =>
+        $trail->parent('users.index', route('users.index'))
+            ->push(trans('general.breadcrumb_button_actions.edit_item', ['name' => $user->name]), route('users.edit', $user))
+        );
+
+
+
+    }
+
+
+}
\ No newline at end of file
diff --git a/app/Providers/LivewireServiceProvider.php b/app/Providers/LivewireServiceProvider.php
new file mode 100644
index 0000000000..9fd0fd561f
--- /dev/null
+++ b/app/Providers/LivewireServiceProvider.php
@@ -0,0 +1,32 @@
+<?php
+
+namespace App\Providers;
+
+use Illuminate\Support\Facades\Route;
+use Illuminate\Support\ServiceProvider;
+use Livewire\Livewire;
+
+class LivewireServiceProvider extends ServiceProvider
+{
+    /**
+     * Register services.
+     */
+    public function register(): void
+    {
+        //
+    }
+
+    /**
+     * Bootstrap services.
+     */
+    public function boot(): void
+    {
+        Livewire::setUpdateRoute(function ($handle) {
+            return Route::post('/' . config('livewire.url_prefix') . '/livewire/update', $handle);
+        });
+
+        Livewire::setScriptRoute(function ($handle) {
+            return Route::get('/' . config('livewire.url_prefix') . '/livewire/livewire.js', $handle);
+        });
+    }
+}
diff --git a/app/Providers/RouteServiceProvider.php b/app/Providers/RouteServiceProvider.php
index d5b10bde3a..054ffabe3e 100644
--- a/app/Providers/RouteServiceProvider.php
+++ b/app/Providers/RouteServiceProvider.php
@@ -45,6 +45,7 @@ class RouteServiceProvider extends ServiceProvider
             require base_path('routes/web/models.php');
             require base_path('routes/web/accessories.php');
             require base_path('routes/web/licenses.php');
+            require base_path('routes/web/locations.php');
             require base_path('routes/web/consumables.php');
             require base_path('routes/web/fields.php');
             require base_path('routes/web/components.php');
@@ -75,6 +76,8 @@ class RouteServiceProvider extends ServiceProvider
     /**
      * Configure the rate limiters for the application.
      *
+     * This ONLY fires on 429 responses.
+     *
      * https://laravel.com/docs/8.x/routing#rate-limiting
      *
      * @return void
@@ -82,9 +85,17 @@ class RouteServiceProvider extends ServiceProvider
     protected function configureRateLimiting()
     {
 
-        // Rate limiter for API calls
+        // Rate limiter for API calls - this sends the correct API headers to show the user the remaining time they have to wait and gives them the 429 status code if they are throttled
         RateLimiter::for('api', function (Request $request) {
-            return Limit::perMinute(config('app.api_throttle_per_minute'))->by(optional($request->user())->id ?: $request->ip());
+            return Limit::perMinute(config('app.api_throttle_per_minute'))->by(optional($request->user())->id ?: $request->ip())
+                ->response(function ($request, $headers) {
+                    return response()->json([
+                        'status' => 'error',
+                        'messages' => 'Too many requests. Try again in '.$headers['Retry-After'].' seconds.',
+                        'status_code' => 429,
+                        'retryAfter' => $headers['Retry-After'] ?? 60,
+                    ], 429, $headers);
+                });
         });
 
         // Rate limiter for forgotten password requests
diff --git a/app/Providers/SamlServiceProvider.php b/app/Providers/SamlServiceProvider.php
index 18b93cf56f..c9e50dafe2 100644
--- a/app/Providers/SamlServiceProvider.php
+++ b/app/Providers/SamlServiceProvider.php
@@ -49,10 +49,6 @@ class SamlServiceProvider extends ServiceProvider
                     'uses' => 'Auth\SamlController@login', ]
             );
 
-            Route::group(['prefix' => 'admin', 'middleware' => ['web', 'auth', 'authorize:superuser']], function () {
-                Route::get('saml', ['as' => 'settings.saml.index', 'uses' => 'SettingsController@getSamlSettings']);
-                Route::post('saml', ['as' => 'settings.saml.save', 'uses' => 'SettingsController@postSamlSettings']);
-            });
         });
     }
 
diff --git a/app/Providers/SettingsServiceProvider.php b/app/Providers/SettingsServiceProvider.php
index 1c89dc2b8c..9a533b9fb3 100644
--- a/app/Providers/SettingsServiceProvider.php
+++ b/app/Providers/SettingsServiceProvider.php
@@ -65,6 +65,10 @@ class SettingsServiceProvider extends ServiceProvider
             return 'assets/';
         });
 
+        \App::singleton('audits_upload_path', function () {
+            return 'audits/';
+        });
+
         \App::singleton('accessories_upload_path', function () {
             return 'public/uploads/accessories/';
         });
diff --git a/app/Providers/ValidationServiceProvider.php b/app/Providers/ValidationServiceProvider.php
index 690af759c7..a08a035fbb 100644
--- a/app/Providers/ValidationServiceProvider.php
+++ b/app/Providers/ValidationServiceProvider.php
@@ -4,13 +4,11 @@ namespace App\Providers;
 
 use App\Models\CustomField;
 use App\Models\Department;
+use App\Models\Location;
 use App\Models\Setting;
 use Illuminate\Support\Facades\DB;
-use Illuminate\Support\Facades\Crypt;
-use Illuminate\Support\Facades\Log;
 use Illuminate\Support\ServiceProvider;
-use Illuminate\Validation\Rule;
-use Validator;
+use Illuminate\Support\Facades\Validator;
 
 /**
  * This service provider handles a few custom validation rules.
@@ -34,6 +32,7 @@ class ValidationServiceProvider extends ServiceProvider
         Validator::extend('email_array', function ($attribute, $value, $parameters, $validator) {
             $value = str_replace(' ', '', $value);
             $array = explode(',', $value);
+            $email_to_validate = [];
 
             foreach ($array as $email) { //loop over values
                 $email_to_validate['alert_email'][] = $email;
@@ -41,7 +40,7 @@ class ValidationServiceProvider extends ServiceProvider
 
             $rules = ['alert_email.*'=>'email'];
             $messages = [
-                'alert_email.*'=>trans('validation.email_array'),
+                'alert_email.*' => trans('validation.custom.email_array'),
             ];
 
             $validator = Validator::make($email_to_validate, $rules, $messages);
@@ -66,7 +65,6 @@ class ValidationServiceProvider extends ServiceProvider
          * `unique_undeleted:table,fieldname` in your rules out of the box
          */
         Validator::extend('unique_undeleted', function ($attribute, $value, $parameters, $validator) {
-
             if (count($parameters)) {
 
                 // This is a bit of a shim, but serial doesn't have any other rules around it other than that it's nullable
@@ -92,18 +90,26 @@ class ValidationServiceProvider extends ServiceProvider
          *
          * $parameters[0] - the name of the first table we're looking at
          * $parameters[1] - the ID (this will be 0 on new creations)
-         * $parameters[2] - the name of the second table we're looking at
+         * $parameters[2] - the name of the second field we're looking at
          * $parameters[3] - the value that the request is passing for the second table we're
          *                  checking for uniqueness across
          *
          */
         Validator::extend('two_column_unique_undeleted', function ($attribute, $value, $parameters, $validator) {
+
             if (count($parameters)) {
+                
                 $count = DB::table($parameters[0])
-                         ->select('id')->where($attribute, '=', $value)
-                         ->whereNull('deleted_at')
-                         ->where('id', '!=', $parameters[1])
-                         ->where($parameters[2], $parameters[3])->count();
+                    ->select('id')
+                    ->where($attribute, '=', $value)
+                    ->where('id', '!=', $parameters[1]);
+
+                if ($parameters[3]!='') {
+                    $count = $count->where($parameters[2], $parameters[3]);
+                }
+
+                $count = $count->whereNull('deleted_at')
+                    ->count();
 
                 return $count < 1;
             }
@@ -348,6 +354,20 @@ class ValidationServiceProvider extends ServiceProvider
 
             return in_array($value, $options);
         });
+
+        // Validates that the company of the validated object matches the company of the location in case of scoped locations
+        Validator::extend('fmcs_location', function ($attribute, $value, $parameters, $validator){
+            $settings = Setting::getSettings();
+            if ($settings->full_multiple_companies_support == '1' && $settings->scope_locations_fmcs == '1') {
+                $company_id = array_get($validator->getData(), 'company_id');
+                $location = Location::find($value);
+
+                if ($company_id != $location->company_id) {
+                    return false;
+                }
+            }
+            return true;
+        });
     }
 
     /**
diff --git a/app/Rules/AlphaEncrypted.php b/app/Rules/AlphaEncrypted.php
new file mode 100644
index 0000000000..f4ed1d6c32
--- /dev/null
+++ b/app/Rules/AlphaEncrypted.php
@@ -0,0 +1,29 @@
+<?php
+
+namespace App\Rules;
+
+use Closure;
+use Illuminate\Contracts\Validation\ValidationRule;
+use Illuminate\Support\Facades\Crypt;
+
+class AlphaEncrypted implements ValidationRule
+{
+    /**
+     * Run the validation rule.
+     *
+     * @param  \Closure(string): \Illuminate\Translation\PotentiallyTranslatedString  $fail
+     */
+    public function validate(string $attribute, mixed $value, Closure $fail): void
+    {
+        try {
+            $attributeName = trim(preg_replace('/_+|snipeit|\d+/', ' ', $attribute));
+            $decrypted = Crypt::decrypt($value);
+            if (!ctype_alpha($decrypted) && !is_null($decrypted)) {
+                $fail(trans('validation.alpha', ['attribute' => $attributeName]));
+            }
+        } catch (\Exception $e) {
+            report($e);
+            $fail(trans('general.something_went_wrong'));
+        }
+    }
+}
diff --git a/app/Rules/AssetCannotBeCheckedOutToNondeployableStatus.php b/app/Rules/AssetCannotBeCheckedOutToNondeployableStatus.php
new file mode 100644
index 0000000000..c2c451b82b
--- /dev/null
+++ b/app/Rules/AssetCannotBeCheckedOutToNondeployableStatus.php
@@ -0,0 +1,51 @@
+<?php
+
+namespace App\Rules;
+
+use App\Models\Statuslabel;
+use Closure;
+use Illuminate\Contracts\Validation\ValidationRule;
+use Illuminate\Contracts\Validation\DataAwareRule;
+
+
+class AssetCannotBeCheckedOutToNondeployableStatus implements DataAwareRule, ValidationRule
+{
+
+    /**
+     * All of the data under validation.
+     *
+     * @var array<string, mixed>
+     */
+    protected $data = [];
+
+
+    /**
+     * Set the data under validation.
+     *
+     * @param  array<string, mixed>  $data
+     */
+    public function setData(array $data): static
+    {
+        $this->data = $data;
+        return $this;
+    }
+
+    /**
+     * Run the validation rule.
+     *
+     * @param  \Closure(string): \Illuminate\Translation\PotentiallyTranslatedString  $fail
+     */
+    public function validate(string $attribute, mixed $value, Closure $fail): void
+    {
+        // Check to see if any of the assign-ish fields are set
+        if ((isset($this->data['assigned_to'])) || (isset($this->data['assigned_user'])) || (isset($this->data['assigned_location']))  || (isset($this->data['assigned_asset'])) || (isset($this->data['assigned_type']))) {
+
+            if (($value) && ($label = Statuslabel::find($value)) && ($label->getStatuslabelType()!='deployable')) {
+                $fail(trans('admin/hardware/form.asset_not_deployable'));
+            }
+
+        }
+
+
+    }
+}
diff --git a/app/Rules/NumericEncrypted.php b/app/Rules/NumericEncrypted.php
new file mode 100644
index 0000000000..f3cb3ba76e
--- /dev/null
+++ b/app/Rules/NumericEncrypted.php
@@ -0,0 +1,31 @@
+<?php
+
+namespace App\Rules;
+
+use Closure;
+use Illuminate\Contracts\Encryption\DecryptException;
+use Illuminate\Contracts\Validation\ValidationRule;
+use Illuminate\Support\Facades\Crypt;
+
+class NumericEncrypted implements ValidationRule
+{
+    /**
+     * Run the validation rule.
+     *
+     * @param  \Closure(string): \Illuminate\Translation\PotentiallyTranslatedString  $fail
+     */
+    public function validate(string $attribute, mixed $value, Closure $fail): void
+    {
+
+        try {
+            $attributeName = trim(preg_replace('/_+|snipeit|\d+/', ' ', $attribute));
+            $decrypted = Crypt::decrypt($value);
+            if (!is_numeric($decrypted) && !is_null($decrypted)) {
+                $fail(trans('validation.numeric', ['attribute' => $attributeName]));
+            }
+        } catch (\Exception $e) {
+            report($e->getMessage());
+            $fail(trans('general.something_went_wrong'));
+        }
+    }
+}
diff --git a/app/Rules/UserCannotSwitchCompaniesIfItemsAssigned.php b/app/Rules/UserCannotSwitchCompaniesIfItemsAssigned.php
new file mode 100644
index 0000000000..b31bc91d1b
--- /dev/null
+++ b/app/Rules/UserCannotSwitchCompaniesIfItemsAssigned.php
@@ -0,0 +1,29 @@
+<?php
+
+namespace App\Rules;
+use App\Models\Setting;
+use App\Models\User;
+use Closure;
+use Illuminate\Contracts\Validation\ValidationRule;
+
+class UserCannotSwitchCompaniesIfItemsAssigned implements ValidationRule
+{
+    /**
+     * Run the validation rule.
+     *
+     * @param  \Closure(string): \Illuminate\Translation\PotentiallyTranslatedString  $fail
+     */
+    public function validate(string $attribute, mixed $value, Closure $fail): void
+    {
+        $user = request()->route('user');
+
+        if (($value) && ($user->allAssignedCount() > 0) && (Setting::getSettings()->full_multiple_companies_support=='1')) {
+
+            // Check for assets with a different company_id than the selected company_id
+            $user_assets = $user->assets()->where('assets.company_id', '!=', $value)->count();
+            if ($user_assets > 0) {
+                $fail(trans('admin/users/message.error.multi_company_items_assigned'));
+            }
+        }
+    }
+}
diff --git a/app/Services/PredefinedKitCheckoutService.php b/app/Services/PredefinedKitCheckoutService.php
index 7ef28c9ee0..2cf4593687 100644
--- a/app/Services/PredefinedKitCheckoutService.php
+++ b/app/Services/PredefinedKitCheckoutService.php
@@ -54,7 +54,7 @@ class PredefinedKitCheckoutService
                 $expected_checkin = $request->get('expected_checkin');
             }
 
-            $admin = Auth::user();
+            $admin = auth()->user();
 
             $note = e($request->get('note'));
 
@@ -157,7 +157,7 @@ class PredefinedKitCheckoutService
                 }
                 // licenses
                 foreach ($license_seats_to_add as $licenseSeat) {
-                    $licenseSeat->user_id = $admin->id;
+                    $licenseSeat->created_by = $admin->id;
                     $licenseSeat->assigned_to = $user->id;
                     if ($licenseSeat->save()) {
                         event(new CheckoutableCheckedOut($licenseSeat, $user, $admin, $note));
diff --git a/app/Services/Saml.php b/app/Services/Saml.php
index 8202868013..222c2c2ea3 100644
--- a/app/Services/Saml.php
+++ b/app/Services/Saml.php
@@ -209,7 +209,7 @@ class Saml
                 }
             }
 
-            $custom_settings = preg_split('/\r\n|\r|\n/', $setting->saml_custom_settings);
+            $custom_settings = preg_split('/\r\n|\r|\n/', $setting->saml_custom_settings ?? '');
             if ($custom_settings) {
                 foreach ($custom_settings as $custom_setting) {
                     $split = explode('=', $custom_setting, 2);
@@ -337,12 +337,12 @@ class Saml
     /**
      * Get a setting.
      *
-     * @author Johnson Yi <jyi.dev@outlook.com>
-     *
      * @param string|array|int $key
      * @param mixed $default
      *
-     * @return void
+     * @return mixed
+     * @author Johnson Yi <jyi.dev@outlook.com>
+     *
      */
     public function getSetting($key, $default = null)
     {
diff --git a/app/Services/SnipeTranslator.php b/app/Services/SnipeTranslator.php
index 8a3552a343..eb7a9eb044 100644
--- a/app/Services/SnipeTranslator.php
+++ b/app/Services/SnipeTranslator.php
@@ -26,17 +26,19 @@ class SnipeTranslator extends Translator {
     public function choice($key, $number, array $replace = [], $locale = null)
     {
         $line = $this->get(
-            $key, $replace, $locale = $this->localeForChoice($locale)
+            $key, [], $locale = $this->localeForChoice($key, $locale)
         );
 
         // If the given "number" is actually an array or countable we will simply count the
         // number of elements in an instance. This allows developers to pass an array of
         // items without having to count it on their end first which gives bad syntax.
-        if (is_array($number) || $number instanceof Countable) {
+        if (is_countable($number)) {
             $number = count($number);
         }
 
-        $replace['count'] = $number;
+        if (!isset($replace['count'])) {
+            $replace['count'] = $number;
+        }
 
         $underscored_locale = str_replace("-","_",$locale); // OUR CHANGE.
         return $this->makeReplacements( // BELOW - that $underscored_locale is the *ONLY* modified part
diff --git a/app/View/Label.php b/app/View/Label.php
index 3ec3a4099c..ee9a1ae2fd 100644
--- a/app/View/Label.php
+++ b/app/View/Label.php
@@ -7,6 +7,7 @@ use App\Models\Labels\Label as LabelModel;
 use App\Models\Labels\Sheet;
 use Illuminate\Contracts\View\View;
 use Illuminate\Support\Collection;
+use Illuminate\Support\Facades\Log;
 use Illuminate\Support\Facades\Storage;
 use Illuminate\Support\Traits\Macroable;
 use TCPDF;
@@ -24,6 +25,16 @@ class Label implements View
      */
     protected $data;
 
+
+    /**
+     * TCPDF output destination.
+     * "I" - inline by default.
+     * See TCPDF's Output method for details.
+     *
+     * @var string
+     */
+    private string $destination = 'I';
+
     public function __construct() {
         $this->data = new Collection();
     }
@@ -38,7 +49,7 @@ class Label implements View
         $settings = $this->data->get('settings');
         $assets = $this->data->get('assets');
         $offset = $this->data->get('offset');
-        $template = LabelModel::find($settings->label2_template);
+
 
         // If disabled, pass to legacy view
         if ((!$settings->label2_enable)) {
@@ -49,12 +60,18 @@ class Label implements View
                 ->with('count', $this->data->get('count'));
         }
 
+            $template = LabelModel::find($settings->label2_template);
+
+        if ($template === null) {
+            return redirect()->route('settings.labels.index')->with('error', trans('admin/settings/message.labels.null_template'));
+        }
+
         $template->validate();
 
         $pdf = new TCPDF(
             $template->getOrientation(),
             $template->getUnit(),
-            [ $template->getWidth(), $template->getHeight() ]
+            [0 => $template->getWidth(), 1 => $template->getHeight(), 'Rotate' => $template->getRotation()]
         );
 
         // Reset parameters
@@ -105,9 +122,9 @@ class Label implements View
                     }
                 }
 
-                if ($settings->alt_barcode_enabled) {
+
                     if ($template->getSupport1DBarcode()) {
-                        $barcode1DType = $settings->alt_barcode;
+                        $barcode1DType = $settings->label2_1d_type;
                         if ($barcode1DType != 'none') {
                             $assetData->put('barcode1d', (object)[
                                 'type' => $barcode1DType,
@@ -115,25 +132,39 @@ class Label implements View
                             ]);
                         }
                     }
-                }
-
-                if ($template->getSupport2DBarcode()) {
+              
+            if ($template->getSupport2DBarcode()) {
                     $barcode2DType = $settings->label2_2d_type;
-                    $barcode2DType = ($barcode2DType == 'default') ? 
-                        $settings->barcode_type :
-                        $barcode2DType;
-                    if (($barcode2DType != 'none') && (!is_null($barcode2DType))) {
+                if (($barcode2DType != 'none') && (!is_null($barcode2DType))) {
                         switch ($settings->label2_2d_target) {
-                            case 'ht_tag': $barcode2DTarget = route('ht/assetTag', $asset->asset_tag); break;
+                            case 'ht_tag': 
+                                $barcode2DTarget = route('ht/assetTag', $asset->asset_tag); 
+                                break;
+                            case 'plain_asset_id': 
+                                $barcode2DTarget = (string) $asset->id; 
+                                break;
+                            case 'plain_asset_tag': 
+                                $barcode2DTarget = $asset->asset_tag; 
+                                break;
+                            case 'plain_serial_number': 
+                                $barcode2DTarget = $asset->serial; 
+                                break;
+                            case 'location':
+                                $barcode2DTarget = $asset->location_id
+                                    ? route('locations.show', $asset->location_id)
+                                    : null;
+                                break;
                             case 'hardware_id':
-                            default: $barcode2DTarget = route('hardware.show', ['hardware' => $asset->id]); break;
+                            default:
+                                $barcode2DTarget = route('hardware.show', $asset);
+                                break;
+                            }
+                            $assetData->put('barcode2d', (object)[
+                                'type' => $barcode2DType,
+                                'content' => $barcode2DTarget,
+                            ]);
                         }
-                        $assetData->put('barcode2d', (object)[
-                            'type' => $barcode2DType,
-                            'content' => $barcode2DTarget,
-                        ]);
                     }
-                }
 
                 $fields = $fieldDefinitions
                     ->map(fn($field) => $field->toArray($asset))
@@ -165,16 +196,34 @@ class Label implements View
                                 // We'll set the label to an empty string since we
                                 // injected the label into the value field above.
                                 $previous['label'] = '';
-
                                 return $previous;
                             });
 
                         return $toAdd ? $myFields->push($toAdd) : $myFields;
                     }, new Collection());
 
-                $assetData->put('fields', $fields->take($template->getSupportFields()));
+                $emptyRowsCount = $settings->label2_empty_row_count;
+                if($emptyRowsCount) {
+                    // Create empty rows
+                    $emptyRows = collect(range(1, $emptyRowsCount))->map(function () {
+                        return [
+                            'label' => '',
+                            'value' => '',
+                            'dataSource' => null,
+                        ];
+                    });
+
+                    // Prepend empty rows to the existing fields
+                    $fieldsWithEmpty = $emptyRows->merge($fields);
+
+                    $assetData->put('fields', $fieldsWithEmpty->take($template->getSupportFields()));
+                    return $assetData;
+                }
+               else{
+                   $assetData->put('fields', $fields->take($template->getSupportFields()));
+                   return $assetData;
+               }
 
-                return $assetData;
             });
         
         if ($template instanceof Sheet) {
@@ -183,7 +232,7 @@ class Label implements View
         $template->writeAll($pdf, $data);
 
         $filename = $assets->count() > 1 ? 'assets.pdf' : $assets->first()->asset_tag.'.pdf';
-        $pdf->Output($filename, 'I');
+        $pdf->Output($filename, $this->destination);
     }
 
     /**
diff --git a/composer.json b/composer.json
index 9a76301e24..8e4110b936 100644
--- a/composer.json
+++ b/composer.json
@@ -1,5 +1,5 @@
 {
-  "name": "snipe/snipe-it",
+  "name": "grokability/snipe-it",
   "description": "Open source asset management system built on Laravel.",
   "keywords": [
     "assets",
@@ -14,17 +14,22 @@
     {
       "type": "vcs",
       "url": "https://github.com/grokability/laravel-scim-server"
+    },
+    {
+      "type": "vcs",
+      "url": "https://github.com/grokability/html"
     }
   ],
   "require": {
-    "php": "^8.1",
+    "php": "^8.2",
     "ext-curl": "*",
     "ext-fileinfo": "*",
+    "ext-iconv": "*",
     "ext-json": "*",
     "ext-mbstring": "*",
     "ext-pdo": "*",
     "alek13/slack": "^2.0",
-    "arietimmerman/laravel-scim-server": "dev-master",
+    "arietimmerman/laravel-scim-server": "dev-laravel_11_compatibility",
     "bacon/bacon-qr-code": "^2.0",
     "barryvdh/laravel-debugbar": "^3.13",
     "barryvdh/laravel-dompdf": "^2.0",
@@ -34,27 +39,30 @@
     "eduardokum/laravel-mail-auto-embed": "^2.0",
     "enshrined/svg-sanitize": "^0.15.0",
     "erusev/parsedown": "^1.7",
+    "fakerphp/faker": "^1.24",
     "guzzlehttp/guzzle": "^7.0.1",
     "intervention/image": "^2.5",
     "javiereguiluz/easyslugger": "^1.0",
     "laravel-notification-channels/google-chat": "^3.0",
-    "laravel-notification-channels/microsoft-teams": "^1.1",
-    "laravel/framework": "^10.0",
+    "laravel-notification-channels/microsoft-teams": "^1.2",
+    "laravel/framework": "^11.0",
     "laravel/helpers": "^1.4",
-    "laravel/passport": "^11.0",
-    "laravel/slack-notification-channel": "^2.3",
+    "laravel/passport": "^12.0",
+    "laravel/slack-notification-channel": "^3.4",
     "laravel/socialite": "^5.6",
     "laravel/tinker": "^2.6",
     "laravel/ui": "^4.0",
-    "laravelcollective/html": "^6.2",
+    "laravelcollective/html": "6.x-dev",
     "league/csv": "^9.7",
     "league/flysystem-aws-s3-v3": "^3.0",
     "livewire/livewire": "^3.5",
     "neitanod/forceutf8": "^2.0",
-    "nesbot/carbon": "^2.32",
-    "nunomaduro/collision": "^6.1",
+    "nesbot/carbon": "^3.0",
+    "nunomaduro/collision": "^8.1",
     "okvpn/clock-lts": "^1.0",
     "onelogin/php-saml": "^3.4",
+    "onnov/detect-encoding": "^2.0",
+    "osa-eg/laravel-teams-notification": "^2.1",
     "paragonie/constant_time_encoding": "^2.3",
     "paragonie/sodium_compat": "^1.19",
     "phpdocumentor/reflection-docblock": "^5.1",
@@ -63,6 +71,7 @@
     "rollbar/rollbar-laravel": "^8.0",
     "spatie/laravel-backup": "^8.8",
     "spatie/laravel-ignition": "^2.0",
+    "tabuna/breadcrumbs": "^4.2",
     "tecnickcom/tc-lib-barcode": "^1.15",
     "tecnickcom/tcpdf": "^6.5",
     "unicodeveloper/laravel-password": "^1.0",
@@ -74,17 +83,14 @@
     "ext-exif": "*"
   },
   "require-dev": {
-    "brianium/paratest": "^v6.4.4",
-    "fakerphp/faker": "^1.16",
     "larastan/larastan": "^2.9",
     "mockery/mockery": "^1.4",
-    "nunomaduro/phpinsights": "^2.7",
+    "nunomaduro/phpinsights": "^2.11",
     "php-mock/php-mock-phpunit": "^2.10",
-    "phpunit/phpunit": "^9.6.19",
+    "phpunit/phpunit": "^10.0",
     "squizlabs/php_codesniffer": "^3.5",
     "symfony/css-selector": "^4.4",
-    "symfony/dom-crawler": "^4.4",
-    "vimeo/psalm": "^5.13"
+    "symfony/dom-crawler": "^4.4"
   },
   "extra": {
     "laravel": {
@@ -120,7 +126,9 @@
     ],
     "post-create-project-cmd": [
       "php artisan key:generate"
-    ]
+    ],
+    "coverage:herd:clover": "herd coverage vendor/bin/phpunit --coverage-clover tests/coverage/clover.xml",
+    "coverage:herd:html": "herd coverage vendor/bin/phpunit --coverage-html tests/coverage/html"
   },
   "config": {
     "preferred-install": "dist",
diff --git a/composer.lock b/composer.lock
index ae6675b718..e88ef1f841 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,20 +4,20 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "51e716db4ccd70bf942062789f7303ad",
+    "content-hash": "089c4016869fc4c657d80bdd4b100ec2",
     "packages": [
         {
             "name": "alek13/slack",
-            "version": "2.2.1",
+            "version": "2.3.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/php-slack/slack.git",
-                "reference": "9222449402df4e1e57d7850be87898b2c99803bd"
+                "reference": "9b50bae7a8149a3afb96cb11674972e3adcdf103"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/php-slack/slack/zipball/9222449402df4e1e57d7850be87898b2c99803bd",
-                "reference": "9222449402df4e1e57d7850be87898b2c99803bd",
+                "url": "https://api.github.com/repos/php-slack/slack/zipball/9b50bae7a8149a3afb96cb11674972e3adcdf103",
+                "reference": "9b50bae7a8149a3afb96cb11674972e3adcdf103",
                 "shasum": ""
             },
             "require": {
@@ -62,7 +62,7 @@
             ],
             "support": {
                 "issues": "https://github.com/php-slack/slack/issues",
-                "source": "https://github.com/php-slack/slack/tree/2.2.1"
+                "source": "https://github.com/php-slack/slack/tree/2.3.0"
             },
             "funding": [
                 {
@@ -70,26 +70,26 @@
                     "type": "custom"
                 }
             ],
-            "time": "2021-10-20T22:52:32+00:00"
+            "time": "2024-12-20T13:50:33+00:00"
         },
         {
             "name": "arietimmerman/laravel-scim-server",
-            "version": "dev-master",
+            "version": "dev-laravel_11_compatibility",
             "source": {
                 "type": "git",
                 "url": "https://github.com/grokability/laravel-scim-server.git",
-                "reference": "dda6dfb60d70fb6cca4b8d4ce1c5f4c19deaab2d"
+                "reference": "6c771799090bfe04dcee94a1dc9f82870aed4dbe"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/grokability/laravel-scim-server/zipball/dda6dfb60d70fb6cca4b8d4ce1c5f4c19deaab2d",
-                "reference": "dda6dfb60d70fb6cca4b8d4ce1c5f4c19deaab2d",
+                "url": "https://api.github.com/repos/grokability/laravel-scim-server/zipball/6c771799090bfe04dcee94a1dc9f82870aed4dbe",
+                "reference": "6c771799090bfe04dcee94a1dc9f82870aed4dbe",
                 "shasum": ""
             },
             "require": {
-                "illuminate/console": "^6.0|^7.0|^8.0|^9.0|^10.0",
-                "illuminate/database": "^6.0|^7.0|^8.0|^9.0|^10.0",
-                "illuminate/support": "^6.0|^7.0|^8.0|^9.0|^10.0",
+                "illuminate/console": "^6.0|^7.0|^8.0|^9.0|^10.0|^11.0",
+                "illuminate/database": "^6.0|^7.0|^8.0|^9.0|^10.0|^11.0",
+                "illuminate/support": "^6.0|^7.0|^8.0|^9.0|^10.0|^11.0",
                 "php": "^7.0|^8.0",
                 "tmilos/scim-filter-parser": "^1.3",
                 "tmilos/scim-schema": "^0.1.0"
@@ -98,7 +98,6 @@
                 "laravel/legacy-factories": "*",
                 "orchestra/testbench": "^4.0|^5.0|^6.0|^7.0|^8.0"
             },
-            "default-branch": true,
             "type": "library",
             "extra": {
                 "laravel": {
@@ -131,22 +130,22 @@
             ],
             "description": "Laravel Package for creating a SCIM server",
             "support": {
-                "source": "https://github.com/grokability/laravel-scim-server/tree/master"
+                "source": "https://github.com/grokability/laravel-scim-server/tree/laravel_11_compatibility"
             },
-            "time": "2023-09-07T16:45:26+00:00"
+            "time": "2025-01-20T14:49:28+00:00"
         },
         {
             "name": "aws/aws-crt-php",
-            "version": "v1.2.5",
+            "version": "v1.2.7",
             "source": {
                 "type": "git",
                 "url": "https://github.com/awslabs/aws-crt-php.git",
-                "reference": "0ea1f04ec5aa9f049f97e012d1ed63b76834a31b"
+                "reference": "d71d9906c7bb63a28295447ba12e74723bd3730e"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/awslabs/aws-crt-php/zipball/0ea1f04ec5aa9f049f97e012d1ed63b76834a31b",
-                "reference": "0ea1f04ec5aa9f049f97e012d1ed63b76834a31b",
+                "url": "https://api.github.com/repos/awslabs/aws-crt-php/zipball/d71d9906c7bb63a28295447ba12e74723bd3730e",
+                "reference": "d71d9906c7bb63a28295447ba12e74723bd3730e",
                 "shasum": ""
             },
             "require": {
@@ -185,22 +184,22 @@
             ],
             "support": {
                 "issues": "https://github.com/awslabs/aws-crt-php/issues",
-                "source": "https://github.com/awslabs/aws-crt-php/tree/v1.2.5"
+                "source": "https://github.com/awslabs/aws-crt-php/tree/v1.2.7"
             },
-            "time": "2024-04-19T21:30:56+00:00"
+            "time": "2024-10-18T22:15:13+00:00"
         },
         {
             "name": "aws/aws-sdk-php",
-            "version": "3.314.6",
+            "version": "3.337.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/aws/aws-sdk-php.git",
-                "reference": "d04da330b0201edab71edd33a03b8d5ad6e4a313"
+                "reference": "f885dd803a257da9d54e72a4750bba73e1196aee"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/d04da330b0201edab71edd33a03b8d5ad6e4a313",
-                "reference": "d04da330b0201edab71edd33a03b8d5ad6e4a313",
+                "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/f885dd803a257da9d54e72a4750bba73e1196aee",
+                "reference": "f885dd803a257da9d54e72a4750bba73e1196aee",
                 "shasum": ""
             },
             "require": {
@@ -229,8 +228,8 @@
                 "nette/neon": "^2.3",
                 "paragonie/random_compat": ">= 2",
                 "phpunit/phpunit": "^5.6.3 || ^8.5 || ^9.5",
-                "psr/cache": "^1.0",
-                "psr/simple-cache": "^1.0",
+                "psr/cache": "^1.0 || ^2.0 || ^3.0",
+                "psr/simple-cache": "^1.0 || ^2.0 || ^3.0",
                 "sebastian/comparator": "^1.2.3 || ^4.0",
                 "yoast/phpunit-polyfills": "^1.0"
             },
@@ -253,7 +252,10 @@
                 ],
                 "psr-4": {
                     "Aws\\": "src/"
-                }
+                },
+                "exclude-from-classmap": [
+                    "src/data/"
+                ]
             },
             "notification-url": "https://packagist.org/downloads/",
             "license": [
@@ -280,9 +282,9 @@
             "support": {
                 "forum": "https://forums.aws.amazon.com/forum.jspa?forumID=80",
                 "issues": "https://github.com/aws/aws-sdk-php/issues",
-                "source": "https://github.com/aws/aws-sdk-php/tree/3.314.6"
+                "source": "https://github.com/aws/aws-sdk-php/tree/3.337.2"
             },
-            "time": "2024-06-20T18:09:51+00:00"
+            "time": "2025-01-17T19:10:04+00:00"
         },
         {
             "name": "bacon/bacon-qr-code",
@@ -340,44 +342,44 @@
         },
         {
             "name": "barryvdh/laravel-debugbar",
-            "version": "v3.13.5",
+            "version": "v3.15.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/barryvdh/laravel-debugbar.git",
-                "reference": "92d86be45ee54edff735e46856f64f14b6a8bb07"
+                "reference": "c0667ea91f7185f1e074402c5788195e96bf8106"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/barryvdh/laravel-debugbar/zipball/92d86be45ee54edff735e46856f64f14b6a8bb07",
-                "reference": "92d86be45ee54edff735e46856f64f14b6a8bb07",
+                "url": "https://api.github.com/repos/barryvdh/laravel-debugbar/zipball/c0667ea91f7185f1e074402c5788195e96bf8106",
+                "reference": "c0667ea91f7185f1e074402c5788195e96bf8106",
                 "shasum": ""
             },
             "require": {
-                "illuminate/routing": "^9|^10|^11",
-                "illuminate/session": "^9|^10|^11",
-                "illuminate/support": "^9|^10|^11",
-                "maximebf/debugbar": "~1.22.0",
-                "php": "^8.0",
+                "illuminate/routing": "^9|^10|^11|^12",
+                "illuminate/session": "^9|^10|^11|^12",
+                "illuminate/support": "^9|^10|^11|^12",
+                "php": "^8.1",
+                "php-debugbar/php-debugbar": "~2.1.1",
                 "symfony/finder": "^6|^7"
             },
             "require-dev": {
                 "mockery/mockery": "^1.3.3",
-                "orchestra/testbench-dusk": "^5|^6|^7|^8|^9",
-                "phpunit/phpunit": "^9.6|^10.5",
+                "orchestra/testbench-dusk": "^7|^8|^9|^10",
+                "phpunit/phpunit": "^9.5.10|^10|^11",
                 "squizlabs/php_codesniffer": "^3.5"
             },
             "type": "library",
             "extra": {
-                "branch-alias": {
-                    "dev-master": "3.13-dev"
-                },
                 "laravel": {
-                    "providers": [
-                        "Barryvdh\\Debugbar\\ServiceProvider"
-                    ],
                     "aliases": {
                         "Debugbar": "Barryvdh\\Debugbar\\Facades\\Debugbar"
-                    }
+                    },
+                    "providers": [
+                        "Barryvdh\\Debugbar\\ServiceProvider"
+                    ]
+                },
+                "branch-alias": {
+                    "dev-master": "3.15-dev"
                 }
             },
             "autoload": {
@@ -402,13 +404,14 @@
             "keywords": [
                 "debug",
                 "debugbar",
+                "dev",
                 "laravel",
                 "profiler",
                 "webprofiler"
             ],
             "support": {
                 "issues": "https://github.com/barryvdh/laravel-debugbar/issues",
-                "source": "https://github.com/barryvdh/laravel-debugbar/tree/v3.13.5"
+                "source": "https://github.com/barryvdh/laravel-debugbar/tree/v3.15.4"
             },
             "funding": [
                 {
@@ -420,7 +423,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2024-04-12T11:20:37+00:00"
+            "time": "2025-04-16T06:32:06+00:00"
         },
         {
             "name": "barryvdh/laravel-dompdf",
@@ -449,17 +452,17 @@
             },
             "type": "library",
             "extra": {
-                "branch-alias": {
-                    "dev-master": "2.0-dev"
-                },
                 "laravel": {
+                    "aliases": {
+                        "PDF": "Barryvdh\\DomPDF\\Facade\\Pdf",
+                        "Pdf": "Barryvdh\\DomPDF\\Facade\\Pdf"
+                    },
                     "providers": [
                         "Barryvdh\\DomPDF\\ServiceProvider"
-                    ],
-                    "aliases": {
-                        "Pdf": "Barryvdh\\DomPDF\\Facade\\Pdf",
-                        "PDF": "Barryvdh\\DomPDF\\Facade\\Pdf"
-                    }
+                    ]
+                },
+                "branch-alias": {
+                    "dev-master": "2.0-dev"
                 }
             },
             "autoload": {
@@ -630,23 +633,23 @@
         },
         {
             "name": "dasprid/enum",
-            "version": "1.0.5",
+            "version": "1.0.6",
             "source": {
                 "type": "git",
                 "url": "https://github.com/DASPRiD/Enum.git",
-                "reference": "6faf451159fb8ba4126b925ed2d78acfce0dc016"
+                "reference": "8dfd07c6d2cf31c8da90c53b83c026c7696dda90"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/DASPRiD/Enum/zipball/6faf451159fb8ba4126b925ed2d78acfce0dc016",
-                "reference": "6faf451159fb8ba4126b925ed2d78acfce0dc016",
+                "url": "https://api.github.com/repos/DASPRiD/Enum/zipball/8dfd07c6d2cf31c8da90c53b83c026c7696dda90",
+                "reference": "8dfd07c6d2cf31c8da90c53b83c026c7696dda90",
                 "shasum": ""
             },
             "require": {
                 "php": ">=7.1 <9.0"
             },
             "require-dev": {
-                "phpunit/phpunit": "^7 | ^8 | ^9",
+                "phpunit/phpunit": "^7 || ^8 || ^9 || ^10 || ^11",
                 "squizlabs/php_codesniffer": "*"
             },
             "type": "library",
@@ -674,9 +677,9 @@
             ],
             "support": {
                 "issues": "https://github.com/DASPRiD/Enum/issues",
-                "source": "https://github.com/DASPRiD/Enum/tree/1.0.5"
+                "source": "https://github.com/DASPRiD/Enum/tree/1.0.6"
             },
-            "time": "2023-08-25T16:18:39+00:00"
+            "time": "2024-08-09T14:30:48+00:00"
         },
         {
             "name": "defuse/php-encryption",
@@ -747,16 +750,16 @@
         },
         {
             "name": "dflydev/dot-access-data",
-            "version": "v3.0.2",
+            "version": "v3.0.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/dflydev/dflydev-dot-access-data.git",
-                "reference": "f41715465d65213d644d3141a6a93081be5d3549"
+                "reference": "a23a2bf4f31d3518f3ecb38660c95715dfead60f"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/dflydev/dflydev-dot-access-data/zipball/f41715465d65213d644d3141a6a93081be5d3549",
-                "reference": "f41715465d65213d644d3141a6a93081be5d3549",
+                "url": "https://api.github.com/repos/dflydev/dflydev-dot-access-data/zipball/a23a2bf4f31d3518f3ecb38660c95715dfead60f",
+                "reference": "a23a2bf4f31d3518f3ecb38660c95715dfead60f",
                 "shasum": ""
             },
             "require": {
@@ -816,9 +819,9 @@
             ],
             "support": {
                 "issues": "https://github.com/dflydev/dflydev-dot-access-data/issues",
-                "source": "https://github.com/dflydev/dflydev-dot-access-data/tree/v3.0.2"
+                "source": "https://github.com/dflydev/dflydev-dot-access-data/tree/v3.0.3"
             },
-            "time": "2022-10-27T11:44:00+00:00"
+            "time": "2024-07-08T12:26:09+00:00"
         },
         {
             "name": "doctrine/cache",
@@ -921,16 +924,16 @@
         },
         {
             "name": "doctrine/dbal",
-            "version": "3.8.6",
+            "version": "3.9.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/doctrine/dbal.git",
-                "reference": "b7411825cf7efb7e51f9791dea19d86e43b399a1"
+                "reference": "ec16c82f20be1a7224e65ac67144a29199f87959"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/doctrine/dbal/zipball/b7411825cf7efb7e51f9791dea19d86e43b399a1",
-                "reference": "b7411825cf7efb7e51f9791dea19d86e43b399a1",
+                "url": "https://api.github.com/repos/doctrine/dbal/zipball/ec16c82f20be1a7224e65ac67144a29199f87959",
+                "reference": "ec16c82f20be1a7224e65ac67144a29199f87959",
                 "shasum": ""
             },
             "require": {
@@ -946,15 +949,13 @@
                 "doctrine/coding-standard": "12.0.0",
                 "fig/log-test": "^1",
                 "jetbrains/phpstorm-stubs": "2023.1",
-                "phpstan/phpstan": "1.11.5",
-                "phpstan/phpstan-strict-rules": "^1.6",
-                "phpunit/phpunit": "9.6.19",
-                "psalm/plugin-phpunit": "0.18.4",
+                "phpstan/phpstan": "2.1.1",
+                "phpstan/phpstan-strict-rules": "^2",
+                "phpunit/phpunit": "9.6.22",
                 "slevomat/coding-standard": "8.13.1",
-                "squizlabs/php_codesniffer": "3.10.1",
+                "squizlabs/php_codesniffer": "3.10.2",
                 "symfony/cache": "^5.4|^6.0|^7.0",
-                "symfony/console": "^4.4|^5.4|^6.0|^7.0",
-                "vimeo/psalm": "4.30.0"
+                "symfony/console": "^4.4|^5.4|^6.0|^7.0"
             },
             "suggest": {
                 "symfony/console": "For helpful console commands such as SQL execution and import of files."
@@ -1014,7 +1015,7 @@
             ],
             "support": {
                 "issues": "https://github.com/doctrine/dbal/issues",
-                "source": "https://github.com/doctrine/dbal/tree/3.8.6"
+                "source": "https://github.com/doctrine/dbal/tree/3.9.4"
             },
             "funding": [
                 {
@@ -1030,33 +1031,31 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-06-19T10:38:17+00:00"
+            "time": "2025-01-16T08:28:55+00:00"
         },
         {
             "name": "doctrine/deprecations",
-            "version": "1.1.3",
+            "version": "1.1.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/doctrine/deprecations.git",
-                "reference": "dfbaa3c2d2e9a9df1118213f3b8b0c597bb99fab"
+                "reference": "31610dbb31faa98e6b5447b62340826f54fbc4e9"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/doctrine/deprecations/zipball/dfbaa3c2d2e9a9df1118213f3b8b0c597bb99fab",
-                "reference": "dfbaa3c2d2e9a9df1118213f3b8b0c597bb99fab",
+                "url": "https://api.github.com/repos/doctrine/deprecations/zipball/31610dbb31faa98e6b5447b62340826f54fbc4e9",
+                "reference": "31610dbb31faa98e6b5447b62340826f54fbc4e9",
                 "shasum": ""
             },
             "require": {
                 "php": "^7.1 || ^8.0"
             },
             "require-dev": {
-                "doctrine/coding-standard": "^9",
-                "phpstan/phpstan": "1.4.10 || 1.10.15",
-                "phpstan/phpstan-phpunit": "^1.0",
+                "doctrine/coding-standard": "^9 || ^12",
+                "phpstan/phpstan": "1.4.10 || 2.0.3",
+                "phpstan/phpstan-phpunit": "^1.0 || ^2",
                 "phpunit/phpunit": "^7.5 || ^8.5 || ^9.5",
-                "psalm/plugin-phpunit": "0.18.4",
-                "psr/log": "^1 || ^2 || ^3",
-                "vimeo/psalm": "4.30.0 || 5.12.0"
+                "psr/log": "^1 || ^2 || ^3"
             },
             "suggest": {
                 "psr/log": "Allows logging deprecations via PSR-3 logger implementation"
@@ -1064,7 +1063,7 @@
             "type": "library",
             "autoload": {
                 "psr-4": {
-                    "Doctrine\\Deprecations\\": "lib/Doctrine/Deprecations"
+                    "Doctrine\\Deprecations\\": "src"
                 }
             },
             "notification-url": "https://packagist.org/downloads/",
@@ -1075,9 +1074,9 @@
             "homepage": "https://www.doctrine-project.org/",
             "support": {
                 "issues": "https://github.com/doctrine/deprecations/issues",
-                "source": "https://github.com/doctrine/deprecations/tree/1.1.3"
+                "source": "https://github.com/doctrine/deprecations/tree/1.1.4"
             },
-            "time": "2024-01-30T19:34:25+00:00"
+            "time": "2024-12-07T21:18:45+00:00"
         },
         {
             "name": "doctrine/event-manager",
@@ -1472,16 +1471,16 @@
         },
         {
             "name": "dragonmantank/cron-expression",
-            "version": "v3.3.3",
+            "version": "v3.4.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/dragonmantank/cron-expression.git",
-                "reference": "adfb1f505deb6384dc8b39804c5065dd3c8c8c0a"
+                "reference": "8c784d071debd117328803d86b2097615b457500"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/dragonmantank/cron-expression/zipball/adfb1f505deb6384dc8b39804c5065dd3c8c8c0a",
-                "reference": "adfb1f505deb6384dc8b39804c5065dd3c8c8c0a",
+                "url": "https://api.github.com/repos/dragonmantank/cron-expression/zipball/8c784d071debd117328803d86b2097615b457500",
+                "reference": "8c784d071debd117328803d86b2097615b457500",
                 "shasum": ""
             },
             "require": {
@@ -1494,10 +1493,14 @@
             "require-dev": {
                 "phpstan/extension-installer": "^1.0",
                 "phpstan/phpstan": "^1.0",
-                "phpstan/phpstan-webmozart-assert": "^1.0",
                 "phpunit/phpunit": "^7.0|^8.0|^9.0"
             },
             "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "3.x-dev"
+                }
+            },
             "autoload": {
                 "psr-4": {
                     "Cron\\": "src/Cron/"
@@ -1521,7 +1524,7 @@
             ],
             "support": {
                 "issues": "https://github.com/dragonmantank/cron-expression/issues",
-                "source": "https://github.com/dragonmantank/cron-expression/tree/v3.3.3"
+                "source": "https://github.com/dragonmantank/cron-expression/tree/v3.4.0"
             },
             "funding": [
                 {
@@ -1529,7 +1532,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2023-08-10T19:36:49+00:00"
+            "time": "2024-10-09T13:47:03+00:00"
         },
         {
             "name": "eduardokum/laravel-mail-auto-embed",
@@ -1603,16 +1606,16 @@
         },
         {
             "name": "egulias/email-validator",
-            "version": "4.0.2",
+            "version": "4.0.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/egulias/EmailValidator.git",
-                "reference": "ebaaf5be6c0286928352e054f2d5125608e5405e"
+                "reference": "b115554301161fa21467629f1e1391c1936de517"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/egulias/EmailValidator/zipball/ebaaf5be6c0286928352e054f2d5125608e5405e",
-                "reference": "ebaaf5be6c0286928352e054f2d5125608e5405e",
+                "url": "https://api.github.com/repos/egulias/EmailValidator/zipball/b115554301161fa21467629f1e1391c1936de517",
+                "reference": "b115554301161fa21467629f1e1391c1936de517",
                 "shasum": ""
             },
             "require": {
@@ -1658,7 +1661,7 @@
             ],
             "support": {
                 "issues": "https://github.com/egulias/EmailValidator/issues",
-                "source": "https://github.com/egulias/EmailValidator/tree/4.0.2"
+                "source": "https://github.com/egulias/EmailValidator/tree/4.0.3"
             },
             "funding": [
                 {
@@ -1666,7 +1669,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2023-10-06T06:47:41+00:00"
+            "time": "2024-12-27T00:36:43+00:00"
         },
         {
             "name": "enshrined/svg-sanitize",
@@ -1764,27 +1767,90 @@
             "time": "2019-12-30T22:54:17+00:00"
         },
         {
-            "name": "filp/whoops",
-            "version": "2.15.4",
+            "name": "fakerphp/faker",
+            "version": "v1.24.1",
             "source": {
                 "type": "git",
-                "url": "https://github.com/filp/whoops.git",
-                "reference": "a139776fa3f5985a50b509f2a02ff0f709d2a546"
+                "url": "https://github.com/FakerPHP/Faker.git",
+                "reference": "e0ee18eb1e6dc3cda3ce9fd97e5a0689a88a64b5"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/filp/whoops/zipball/a139776fa3f5985a50b509f2a02ff0f709d2a546",
-                "reference": "a139776fa3f5985a50b509f2a02ff0f709d2a546",
+                "url": "https://api.github.com/repos/FakerPHP/Faker/zipball/e0ee18eb1e6dc3cda3ce9fd97e5a0689a88a64b5",
+                "reference": "e0ee18eb1e6dc3cda3ce9fd97e5a0689a88a64b5",
                 "shasum": ""
             },
             "require": {
-                "php": "^5.5.9 || ^7.0 || ^8.0",
+                "php": "^7.4 || ^8.0",
+                "psr/container": "^1.0 || ^2.0",
+                "symfony/deprecation-contracts": "^2.2 || ^3.0"
+            },
+            "conflict": {
+                "fzaninotto/faker": "*"
+            },
+            "require-dev": {
+                "bamarni/composer-bin-plugin": "^1.4.1",
+                "doctrine/persistence": "^1.3 || ^2.0",
+                "ext-intl": "*",
+                "phpunit/phpunit": "^9.5.26",
+                "symfony/phpunit-bridge": "^5.4.16"
+            },
+            "suggest": {
+                "doctrine/orm": "Required to use Faker\\ORM\\Doctrine",
+                "ext-curl": "Required by Faker\\Provider\\Image to download images.",
+                "ext-dom": "Required by Faker\\Provider\\HtmlLorem for generating random HTML.",
+                "ext-iconv": "Required by Faker\\Provider\\ru_RU\\Text::realText() for generating real Russian text.",
+                "ext-mbstring": "Required for multibyte Unicode string functionality."
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "Faker\\": "src/Faker/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "François Zaninotto"
+                }
+            ],
+            "description": "Faker is a PHP library that generates fake data for you.",
+            "keywords": [
+                "data",
+                "faker",
+                "fixtures"
+            ],
+            "support": {
+                "issues": "https://github.com/FakerPHP/Faker/issues",
+                "source": "https://github.com/FakerPHP/Faker/tree/v1.24.1"
+            },
+            "time": "2024-11-21T13:46:39+00:00"
+        },
+        {
+            "name": "filp/whoops",
+            "version": "2.16.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/filp/whoops.git",
+                "reference": "befcdc0e5dce67252aa6322d82424be928214fa2"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/filp/whoops/zipball/befcdc0e5dce67252aa6322d82424be928214fa2",
+                "reference": "befcdc0e5dce67252aa6322d82424be928214fa2",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^7.1 || ^8.0",
                 "psr/log": "^1.0.1 || ^2.0 || ^3.0"
             },
             "require-dev": {
-                "mockery/mockery": "^0.9 || ^1.0",
-                "phpunit/phpunit": "^4.8.36 || ^5.7.27 || ^6.5.14 || ^7.5.20 || ^8.5.8 || ^9.3.3",
-                "symfony/var-dumper": "^2.6 || ^3.0 || ^4.0 || ^5.0"
+                "mockery/mockery": "^1.0",
+                "phpunit/phpunit": "^7.5.20 || ^8.5.8 || ^9.3.3",
+                "symfony/var-dumper": "^4.0 || ^5.0"
             },
             "suggest": {
                 "symfony/var-dumper": "Pretty print complex values better with var-dumper available",
@@ -1824,7 +1890,7 @@
             ],
             "support": {
                 "issues": "https://github.com/filp/whoops/issues",
-                "source": "https://github.com/filp/whoops/tree/2.15.4"
+                "source": "https://github.com/filp/whoops/tree/2.16.0"
             },
             "funding": [
                 {
@@ -1832,20 +1898,20 @@
                     "type": "github"
                 }
             ],
-            "time": "2023-11-03T12:00:00+00:00"
+            "time": "2024-09-25T12:00:00+00:00"
         },
         {
             "name": "firebase/php-jwt",
-            "version": "v6.10.1",
+            "version": "v6.10.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/firebase/php-jwt.git",
-                "reference": "500501c2ce893c824c801da135d02661199f60c5"
+                "reference": "30c19ed0f3264cb660ea496895cfb6ef7ee3653b"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/firebase/php-jwt/zipball/500501c2ce893c824c801da135d02661199f60c5",
-                "reference": "500501c2ce893c824c801da135d02661199f60c5",
+                "url": "https://api.github.com/repos/firebase/php-jwt/zipball/30c19ed0f3264cb660ea496895cfb6ef7ee3653b",
+                "reference": "30c19ed0f3264cb660ea496895cfb6ef7ee3653b",
                 "shasum": ""
             },
             "require": {
@@ -1893,9 +1959,9 @@
             ],
             "support": {
                 "issues": "https://github.com/firebase/php-jwt/issues",
-                "source": "https://github.com/firebase/php-jwt/tree/v6.10.1"
+                "source": "https://github.com/firebase/php-jwt/tree/v6.10.2"
             },
-            "time": "2024-05-18T18:05:11+00:00"
+            "time": "2024-11-24T11:22:49+00:00"
         },
         {
             "name": "fruitcake/php-cors",
@@ -1970,24 +2036,24 @@
         },
         {
             "name": "graham-campbell/result-type",
-            "version": "v1.1.2",
+            "version": "v1.1.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/GrahamCampbell/Result-Type.git",
-                "reference": "fbd48bce38f73f8a4ec8583362e732e4095e5862"
+                "reference": "3ba905c11371512af9d9bdd27d99b782216b6945"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/GrahamCampbell/Result-Type/zipball/fbd48bce38f73f8a4ec8583362e732e4095e5862",
-                "reference": "fbd48bce38f73f8a4ec8583362e732e4095e5862",
+                "url": "https://api.github.com/repos/GrahamCampbell/Result-Type/zipball/3ba905c11371512af9d9bdd27d99b782216b6945",
+                "reference": "3ba905c11371512af9d9bdd27d99b782216b6945",
                 "shasum": ""
             },
             "require": {
                 "php": "^7.2.5 || ^8.0",
-                "phpoption/phpoption": "^1.9.2"
+                "phpoption/phpoption": "^1.9.3"
             },
             "require-dev": {
-                "phpunit/phpunit": "^8.5.34 || ^9.6.13 || ^10.4.2"
+                "phpunit/phpunit": "^8.5.39 || ^9.6.20 || ^10.5.28"
             },
             "type": "library",
             "autoload": {
@@ -2016,7 +2082,7 @@
             ],
             "support": {
                 "issues": "https://github.com/GrahamCampbell/Result-Type/issues",
-                "source": "https://github.com/GrahamCampbell/Result-Type/tree/v1.1.2"
+                "source": "https://github.com/GrahamCampbell/Result-Type/tree/v1.1.3"
             },
             "funding": [
                 {
@@ -2028,26 +2094,26 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2023-11-12T22:16:48+00:00"
+            "time": "2024-07-20T21:45:45+00:00"
         },
         {
             "name": "guzzlehttp/guzzle",
-            "version": "7.8.1",
+            "version": "7.9.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/guzzle/guzzle.git",
-                "reference": "41042bc7ab002487b876a0683fc8dce04ddce104"
+                "reference": "d281ed313b989f213357e3be1a179f02196ac99b"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/guzzle/guzzle/zipball/41042bc7ab002487b876a0683fc8dce04ddce104",
-                "reference": "41042bc7ab002487b876a0683fc8dce04ddce104",
+                "url": "https://api.github.com/repos/guzzle/guzzle/zipball/d281ed313b989f213357e3be1a179f02196ac99b",
+                "reference": "d281ed313b989f213357e3be1a179f02196ac99b",
                 "shasum": ""
             },
             "require": {
                 "ext-json": "*",
-                "guzzlehttp/promises": "^1.5.3 || ^2.0.1",
-                "guzzlehttp/psr7": "^1.9.1 || ^2.5.1",
+                "guzzlehttp/promises": "^1.5.3 || ^2.0.3",
+                "guzzlehttp/psr7": "^2.7.0",
                 "php": "^7.2.5 || ^8.0",
                 "psr/http-client": "^1.0",
                 "symfony/deprecation-contracts": "^2.2 || ^3.0"
@@ -2058,9 +2124,9 @@
             "require-dev": {
                 "bamarni/composer-bin-plugin": "^1.8.2",
                 "ext-curl": "*",
-                "php-http/client-integration-tests": "dev-master#2c025848417c1135031fdf9c728ee53d0a7ceaee as 3.0.999",
+                "guzzle/client-integration-tests": "3.0.2",
                 "php-http/message-factory": "^1.1",
-                "phpunit/phpunit": "^8.5.36 || ^9.6.15",
+                "phpunit/phpunit": "^8.5.39 || ^9.6.20",
                 "psr/log": "^1.1 || ^2.0 || ^3.0"
             },
             "suggest": {
@@ -2138,7 +2204,7 @@
             ],
             "support": {
                 "issues": "https://github.com/guzzle/guzzle/issues",
-                "source": "https://github.com/guzzle/guzzle/tree/7.8.1"
+                "source": "https://github.com/guzzle/guzzle/tree/7.9.2"
             },
             "funding": [
                 {
@@ -2154,20 +2220,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2023-12-03T20:35:24+00:00"
+            "time": "2024-07-24T11:22:20+00:00"
         },
         {
             "name": "guzzlehttp/promises",
-            "version": "2.0.2",
+            "version": "2.0.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/guzzle/promises.git",
-                "reference": "bbff78d96034045e58e13dedd6ad91b5d1253223"
+                "reference": "f9c436286ab2892c7db7be8c8da4ef61ccf7b455"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/guzzle/promises/zipball/bbff78d96034045e58e13dedd6ad91b5d1253223",
-                "reference": "bbff78d96034045e58e13dedd6ad91b5d1253223",
+                "url": "https://api.github.com/repos/guzzle/promises/zipball/f9c436286ab2892c7db7be8c8da4ef61ccf7b455",
+                "reference": "f9c436286ab2892c7db7be8c8da4ef61ccf7b455",
                 "shasum": ""
             },
             "require": {
@@ -2175,7 +2241,7 @@
             },
             "require-dev": {
                 "bamarni/composer-bin-plugin": "^1.8.2",
-                "phpunit/phpunit": "^8.5.36 || ^9.6.15"
+                "phpunit/phpunit": "^8.5.39 || ^9.6.20"
             },
             "type": "library",
             "extra": {
@@ -2221,7 +2287,7 @@
             ],
             "support": {
                 "issues": "https://github.com/guzzle/promises/issues",
-                "source": "https://github.com/guzzle/promises/tree/2.0.2"
+                "source": "https://github.com/guzzle/promises/tree/2.0.4"
             },
             "funding": [
                 {
@@ -2237,20 +2303,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2023-12-03T20:19:20+00:00"
+            "time": "2024-10-17T10:06:22+00:00"
         },
         {
             "name": "guzzlehttp/psr7",
-            "version": "2.6.2",
+            "version": "2.7.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/guzzle/psr7.git",
-                "reference": "45b30f99ac27b5ca93cb4831afe16285f57b8221"
+                "reference": "a70f5c95fb43bc83f07c9c948baa0dc1829bf201"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/guzzle/psr7/zipball/45b30f99ac27b5ca93cb4831afe16285f57b8221",
-                "reference": "45b30f99ac27b5ca93cb4831afe16285f57b8221",
+                "url": "https://api.github.com/repos/guzzle/psr7/zipball/a70f5c95fb43bc83f07c9c948baa0dc1829bf201",
+                "reference": "a70f5c95fb43bc83f07c9c948baa0dc1829bf201",
                 "shasum": ""
             },
             "require": {
@@ -2265,8 +2331,8 @@
             },
             "require-dev": {
                 "bamarni/composer-bin-plugin": "^1.8.2",
-                "http-interop/http-factory-tests": "^0.9",
-                "phpunit/phpunit": "^8.5.36 || ^9.6.15"
+                "http-interop/http-factory-tests": "0.9.0",
+                "phpunit/phpunit": "^8.5.39 || ^9.6.20"
             },
             "suggest": {
                 "laminas/laminas-httphandlerrunner": "Emit PSR-7 responses"
@@ -2337,7 +2403,7 @@
             ],
             "support": {
                 "issues": "https://github.com/guzzle/psr7/issues",
-                "source": "https://github.com/guzzle/psr7/tree/2.6.2"
+                "source": "https://github.com/guzzle/psr7/tree/2.7.0"
             },
             "funding": [
                 {
@@ -2353,7 +2419,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2023-12-03T20:05:35+00:00"
+            "time": "2024-07-18T11:15:46+00:00"
         },
         {
             "name": "guzzlehttp/uri-template",
@@ -2471,16 +2537,16 @@
             },
             "type": "library",
             "extra": {
-                "branch-alias": {
-                    "dev-master": "2.4-dev"
-                },
                 "laravel": {
-                    "providers": [
-                        "Intervention\\Image\\ImageServiceProvider"
-                    ],
                     "aliases": {
                         "Image": "Intervention\\Image\\Facades\\Image"
-                    }
+                    },
+                    "providers": [
+                        "Intervention\\Image\\ImageServiceProvider"
+                    ]
+                },
+                "branch-alias": {
+                    "dev-master": "2.4-dev"
                 }
             },
             "autoload": {
@@ -2675,23 +2741,23 @@
         },
         {
             "name": "laravel/framework",
-            "version": "v10.48.14",
+            "version": "v11.44.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/laravel/framework.git",
-                "reference": "27cb4736bb7e60a5311ec73160068dfbcf98336b"
+                "reference": "0883d4175f4e2b5c299e7087ad3c74f2ce195c6d"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/laravel/framework/zipball/27cb4736bb7e60a5311ec73160068dfbcf98336b",
-                "reference": "27cb4736bb7e60a5311ec73160068dfbcf98336b",
+                "url": "https://api.github.com/repos/laravel/framework/zipball/0883d4175f4e2b5c299e7087ad3c74f2ce195c6d",
+                "reference": "0883d4175f4e2b5c299e7087ad3c74f2ce195c6d",
                 "shasum": ""
             },
             "require": {
                 "brick/math": "^0.9.3|^0.10.2|^0.11|^0.12",
                 "composer-runtime-api": "^2.2",
                 "doctrine/inflector": "^2.0.5",
-                "dragonmantank/cron-expression": "^3.3.2",
+                "dragonmantank/cron-expression": "^3.4",
                 "egulias/email-validator": "^3.2.1|^4.0",
                 "ext-ctype": "*",
                 "ext-filter": "*",
@@ -2700,44 +2766,45 @@
                 "ext-openssl": "*",
                 "ext-session": "*",
                 "ext-tokenizer": "*",
-                "fruitcake/php-cors": "^1.2",
+                "fruitcake/php-cors": "^1.3",
+                "guzzlehttp/guzzle": "^7.8.2",
                 "guzzlehttp/uri-template": "^1.0",
-                "laravel/prompts": "^0.1.9",
-                "laravel/serializable-closure": "^1.3",
-                "league/commonmark": "^2.2.1",
-                "league/flysystem": "^3.8.0",
+                "laravel/prompts": "^0.1.18|^0.2.0|^0.3.0",
+                "laravel/serializable-closure": "^1.3|^2.0",
+                "league/commonmark": "^2.6",
+                "league/flysystem": "^3.25.1",
+                "league/flysystem-local": "^3.25.1",
+                "league/uri": "^7.5.1",
                 "monolog/monolog": "^3.0",
-                "nesbot/carbon": "^2.67",
-                "nunomaduro/termwind": "^1.13",
-                "php": "^8.1",
+                "nesbot/carbon": "^2.72.6|^3.8.4",
+                "nunomaduro/termwind": "^2.0",
+                "php": "^8.2",
                 "psr/container": "^1.1.1|^2.0.1",
                 "psr/log": "^1.0|^2.0|^3.0",
                 "psr/simple-cache": "^1.0|^2.0|^3.0",
                 "ramsey/uuid": "^4.7",
-                "symfony/console": "^6.2",
-                "symfony/error-handler": "^6.2",
-                "symfony/finder": "^6.2",
-                "symfony/http-foundation": "^6.4",
-                "symfony/http-kernel": "^6.2",
-                "symfony/mailer": "^6.2",
-                "symfony/mime": "^6.2",
-                "symfony/process": "^6.2",
-                "symfony/routing": "^6.2",
-                "symfony/uid": "^6.2",
-                "symfony/var-dumper": "^6.2",
+                "symfony/console": "^7.0.3",
+                "symfony/error-handler": "^7.0.3",
+                "symfony/finder": "^7.0.3",
+                "symfony/http-foundation": "^7.2.0",
+                "symfony/http-kernel": "^7.0.3",
+                "symfony/mailer": "^7.0.3",
+                "symfony/mime": "^7.0.3",
+                "symfony/polyfill-php83": "^1.31",
+                "symfony/process": "^7.0.3",
+                "symfony/routing": "^7.0.3",
+                "symfony/uid": "^7.0.3",
+                "symfony/var-dumper": "^7.0.3",
                 "tijsverkoyen/css-to-inline-styles": "^2.2.5",
-                "vlucas/phpdotenv": "^5.4.1",
-                "voku/portable-ascii": "^2.0"
+                "vlucas/phpdotenv": "^5.6.1",
+                "voku/portable-ascii": "^2.0.2"
             },
             "conflict": {
-                "carbonphp/carbon-doctrine-types": ">=3.0",
-                "doctrine/dbal": ">=4.0",
-                "mockery/mockery": "1.6.8",
-                "phpunit/phpunit": ">=11.0.0",
                 "tightenco/collect": "<5.5.33"
             },
             "provide": {
                 "psr/container-implementation": "1.1|2.0",
+                "psr/log-implementation": "1.0|2.0|3.0",
                 "psr/simple-cache-implementation": "1.0|2.0|3.0"
             },
             "replace": {
@@ -2746,6 +2813,7 @@
                 "illuminate/bus": "self.version",
                 "illuminate/cache": "self.version",
                 "illuminate/collections": "self.version",
+                "illuminate/concurrency": "self.version",
                 "illuminate/conditionable": "self.version",
                 "illuminate/config": "self.version",
                 "illuminate/console": "self.version",
@@ -2773,36 +2841,39 @@
                 "illuminate/testing": "self.version",
                 "illuminate/translation": "self.version",
                 "illuminate/validation": "self.version",
-                "illuminate/view": "self.version"
+                "illuminate/view": "self.version",
+                "spatie/once": "*"
             },
             "require-dev": {
                 "ably/ably-php": "^1.0",
-                "aws/aws-sdk-php": "^3.235.5",
-                "doctrine/dbal": "^3.5.1",
+                "aws/aws-sdk-php": "^3.322.9",
                 "ext-gmp": "*",
-                "fakerphp/faker": "^1.21",
-                "guzzlehttp/guzzle": "^7.5",
-                "league/flysystem-aws-s3-v3": "^3.0",
-                "league/flysystem-ftp": "^3.0",
-                "league/flysystem-path-prefixing": "^3.3",
-                "league/flysystem-read-only": "^3.3",
-                "league/flysystem-sftp-v3": "^3.0",
-                "mockery/mockery": "^1.5.1",
-                "nyholm/psr7": "^1.2",
-                "orchestra/testbench-core": "^8.23.4",
-                "pda/pheanstalk": "^4.0",
-                "phpstan/phpstan": "^1.4.7",
-                "phpunit/phpunit": "^10.0.7",
-                "predis/predis": "^2.0.2",
-                "symfony/cache": "^6.2",
-                "symfony/http-client": "^6.2.4",
-                "symfony/psr-http-message-bridge": "^2.0"
+                "fakerphp/faker": "^1.24",
+                "guzzlehttp/promises": "^2.0.3",
+                "guzzlehttp/psr7": "^2.4",
+                "laravel/pint": "^1.18",
+                "league/flysystem-aws-s3-v3": "^3.25.1",
+                "league/flysystem-ftp": "^3.25.1",
+                "league/flysystem-path-prefixing": "^3.25.1",
+                "league/flysystem-read-only": "^3.25.1",
+                "league/flysystem-sftp-v3": "^3.25.1",
+                "mockery/mockery": "^1.6.10",
+                "orchestra/testbench-core": "^9.11.2",
+                "pda/pheanstalk": "^5.0.6",
+                "php-http/discovery": "^1.15",
+                "phpstan/phpstan": "^2.0",
+                "phpunit/phpunit": "^10.5.35|^11.3.6|^12.0.1",
+                "predis/predis": "^2.3",
+                "resend/resend-php": "^0.10.0",
+                "symfony/cache": "^7.0.3",
+                "symfony/http-client": "^7.0.3",
+                "symfony/psr-http-message-bridge": "^7.0.3",
+                "symfony/translation": "^7.0.3"
             },
             "suggest": {
                 "ably/ably-php": "Required to use the Ably broadcast driver (^1.0).",
-                "aws/aws-sdk-php": "Required to use the SQS queue driver, DynamoDb failed job storage, and SES mail driver (^3.235.5).",
-                "brianium/paratest": "Required to run tests in parallel (^6.0).",
-                "doctrine/dbal": "Required to rename columns and drop SQLite columns (^3.5.1).",
+                "aws/aws-sdk-php": "Required to use the SQS queue driver, DynamoDb failed job storage, and SES mail driver (^3.322.9).",
+                "brianium/paratest": "Required to run tests in parallel (^7.0|^8.0).",
                 "ext-apcu": "Required to use the APC cache driver.",
                 "ext-fileinfo": "Required to use the Filesystem class.",
                 "ext-ftp": "Required to use the Flysystem FTP driver.",
@@ -2811,42 +2882,45 @@
                 "ext-pcntl": "Required to use all features of the queue worker and console signal trapping.",
                 "ext-pdo": "Required to use all database features.",
                 "ext-posix": "Required to use all features of the queue worker.",
-                "ext-redis": "Required to use the Redis cache and queue drivers (^4.0|^5.0).",
+                "ext-redis": "Required to use the Redis cache and queue drivers (^4.0|^5.0|^6.0).",
                 "fakerphp/faker": "Required to use the eloquent factory builder (^1.9.1).",
                 "filp/whoops": "Required for friendly error pages in development (^2.14.3).",
-                "guzzlehttp/guzzle": "Required to use the HTTP Client and the ping methods on schedules (^7.5).",
                 "laravel/tinker": "Required to use the tinker console command (^2.0).",
-                "league/flysystem-aws-s3-v3": "Required to use the Flysystem S3 driver (^3.0).",
-                "league/flysystem-ftp": "Required to use the Flysystem FTP driver (^3.0).",
-                "league/flysystem-path-prefixing": "Required to use the scoped driver (^3.3).",
-                "league/flysystem-read-only": "Required to use read-only disks (^3.3)",
-                "league/flysystem-sftp-v3": "Required to use the Flysystem SFTP driver (^3.0).",
-                "mockery/mockery": "Required to use mocking (^1.5.1).",
-                "nyholm/psr7": "Required to use PSR-7 bridging features (^1.2).",
-                "pda/pheanstalk": "Required to use the beanstalk queue driver (^4.0).",
-                "phpunit/phpunit": "Required to use assertions and run tests (^9.5.8|^10.0.7).",
-                "predis/predis": "Required to use the predis connector (^2.0.2).",
+                "league/flysystem-aws-s3-v3": "Required to use the Flysystem S3 driver (^3.25.1).",
+                "league/flysystem-ftp": "Required to use the Flysystem FTP driver (^3.25.1).",
+                "league/flysystem-path-prefixing": "Required to use the scoped driver (^3.25.1).",
+                "league/flysystem-read-only": "Required to use read-only disks (^3.25.1)",
+                "league/flysystem-sftp-v3": "Required to use the Flysystem SFTP driver (^3.25.1).",
+                "mockery/mockery": "Required to use mocking (^1.6).",
+                "pda/pheanstalk": "Required to use the beanstalk queue driver (^5.0).",
+                "php-http/discovery": "Required to use PSR-7 bridging features (^1.15).",
+                "phpunit/phpunit": "Required to use assertions and run tests (^10.5.35|^11.3.6|^12.0.1).",
+                "predis/predis": "Required to use the predis connector (^2.3).",
                 "psr/http-message": "Required to allow Storage::put to accept a StreamInterface (^1.0).",
                 "pusher/pusher-php-server": "Required to use the Pusher broadcast driver (^6.0|^7.0).",
-                "symfony/cache": "Required to PSR-6 cache bridge (^6.2).",
-                "symfony/filesystem": "Required to enable support for relative symbolic links (^6.2).",
-                "symfony/http-client": "Required to enable support for the Symfony API mail transports (^6.2).",
-                "symfony/mailgun-mailer": "Required to enable support for the Mailgun mail transport (^6.2).",
-                "symfony/postmark-mailer": "Required to enable support for the Postmark mail transport (^6.2).",
-                "symfony/psr-http-message-bridge": "Required to use PSR-7 bridging features (^2.0)."
+                "resend/resend-php": "Required to enable support for the Resend mail transport (^0.10.0).",
+                "symfony/cache": "Required to PSR-6 cache bridge (^7.0).",
+                "symfony/filesystem": "Required to enable support for relative symbolic links (^7.0).",
+                "symfony/http-client": "Required to enable support for the Symfony API mail transports (^7.0).",
+                "symfony/mailgun-mailer": "Required to enable support for the Mailgun mail transport (^7.0).",
+                "symfony/postmark-mailer": "Required to enable support for the Postmark mail transport (^7.0).",
+                "symfony/psr-http-message-bridge": "Required to use PSR-7 bridging features (^7.0)."
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "10.x-dev"
+                    "dev-master": "11.x-dev"
                 }
             },
             "autoload": {
                 "files": [
+                    "src/Illuminate/Collections/functions.php",
                     "src/Illuminate/Collections/helpers.php",
                     "src/Illuminate/Events/functions.php",
                     "src/Illuminate/Filesystem/functions.php",
                     "src/Illuminate/Foundation/helpers.php",
+                    "src/Illuminate/Log/functions.php",
+                    "src/Illuminate/Support/functions.php",
                     "src/Illuminate/Support/helpers.php"
                 ],
                 "psr-4": {
@@ -2878,20 +2952,20 @@
                 "issues": "https://github.com/laravel/framework/issues",
                 "source": "https://github.com/laravel/framework"
             },
-            "time": "2024-06-21T10:06:42+00:00"
+            "time": "2025-03-05T15:34:10+00:00"
         },
         {
             "name": "laravel/helpers",
-            "version": "v1.7.0",
+            "version": "v1.7.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/laravel/helpers.git",
-                "reference": "6caaa242a23bc39b4e3cf57304b5409260a7a346"
+                "reference": "f28907033d7edf8a0525cfb781ab30ce6d531c35"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/laravel/helpers/zipball/6caaa242a23bc39b4e3cf57304b5409260a7a346",
-                "reference": "6caaa242a23bc39b4e3cf57304b5409260a7a346",
+                "url": "https://api.github.com/repos/laravel/helpers/zipball/f28907033d7edf8a0525cfb781ab30ce6d531c35",
+                "reference": "f28907033d7edf8a0525cfb781ab30ce6d531c35",
                 "shasum": ""
             },
             "require": {
@@ -2933,54 +3007,52 @@
                 "laravel"
             ],
             "support": {
-                "source": "https://github.com/laravel/helpers/tree/v1.7.0"
+                "source": "https://github.com/laravel/helpers/tree/v1.7.1"
             },
-            "time": "2023-11-30T14:09:05+00:00"
+            "time": "2024-11-26T14:56:25+00:00"
         },
         {
             "name": "laravel/passport",
-            "version": "v11.10.6",
+            "version": "v12.4.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/laravel/passport.git",
-                "reference": "2642f360c51dfde3a6ea60f86ae5d9a8c0caf3cf"
+                "reference": "b06a413cb18d07123ced88ba8caa432d40e3bb8c"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/laravel/passport/zipball/2642f360c51dfde3a6ea60f86ae5d9a8c0caf3cf",
-                "reference": "2642f360c51dfde3a6ea60f86ae5d9a8c0caf3cf",
+                "url": "https://api.github.com/repos/laravel/passport/zipball/b06a413cb18d07123ced88ba8caa432d40e3bb8c",
+                "reference": "b06a413cb18d07123ced88ba8caa432d40e3bb8c",
                 "shasum": ""
             },
             "require": {
                 "ext-json": "*",
                 "firebase/php-jwt": "^6.4",
-                "illuminate/auth": "^9.0|^10.0",
-                "illuminate/console": "^9.0|^10.0",
-                "illuminate/container": "^9.0|^10.0",
-                "illuminate/contracts": "^9.0|^10.0",
-                "illuminate/cookie": "^9.0|^10.0",
-                "illuminate/database": "^9.0|^10.0",
-                "illuminate/encryption": "^9.0|^10.0",
-                "illuminate/http": "^9.0|^10.0",
-                "illuminate/support": "^9.0|^10.0",
+                "illuminate/auth": "^9.21|^10.0|^11.0",
+                "illuminate/console": "^9.21|^10.0|^11.0",
+                "illuminate/container": "^9.21|^10.0|^11.0",
+                "illuminate/contracts": "^9.21|^10.0|^11.0",
+                "illuminate/cookie": "^9.21|^10.0|^11.0",
+                "illuminate/database": "^9.21|^10.0|^11.0",
+                "illuminate/encryption": "^9.21|^10.0|^11.0",
+                "illuminate/http": "^9.21|^10.0|^11.0",
+                "illuminate/support": "^9.21|^10.0|^11.0",
                 "lcobucci/jwt": "^4.3|^5.0",
                 "league/oauth2-server": "^8.5.3",
                 "nyholm/psr7": "^1.5",
                 "php": "^8.0",
                 "phpseclib/phpseclib": "^2.0|^3.0",
-                "symfony/psr-http-message-bridge": "^2.1"
+                "symfony/console": "^6.0|^7.0",
+                "symfony/psr-http-message-bridge": "^2.1|^6.0|^7.0"
             },
             "require-dev": {
                 "mockery/mockery": "^1.0",
-                "orchestra/testbench": "^7.31|^8.11",
+                "orchestra/testbench": "^7.35|^8.14|^9.0",
                 "phpstan/phpstan": "^1.10",
-                "phpunit/phpunit": "^9.3"
+                "phpunit/phpunit": "^9.3|^10.5"
             },
             "type": "library",
             "extra": {
-                "branch-alias": {
-                    "dev-master": "11.x-dev"
-                },
                 "laravel": {
                     "providers": [
                         "Laravel\\Passport\\PassportServiceProvider"
@@ -3013,25 +3085,25 @@
                 "issues": "https://github.com/laravel/passport/issues",
                 "source": "https://github.com/laravel/passport"
             },
-            "time": "2024-03-01T11:11:18+00:00"
+            "time": "2025-01-13T17:40:20+00:00"
         },
         {
             "name": "laravel/prompts",
-            "version": "v0.1.24",
+            "version": "v0.3.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/laravel/prompts.git",
-                "reference": "409b0b4305273472f3754826e68f4edbd0150149"
+                "reference": "749395fcd5f8f7530fe1f00dfa84eb22c83d94ea"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/laravel/prompts/zipball/409b0b4305273472f3754826e68f4edbd0150149",
-                "reference": "409b0b4305273472f3754826e68f4edbd0150149",
+                "url": "https://api.github.com/repos/laravel/prompts/zipball/749395fcd5f8f7530fe1f00dfa84eb22c83d94ea",
+                "reference": "749395fcd5f8f7530fe1f00dfa84eb22c83d94ea",
                 "shasum": ""
             },
             "require": {
+                "composer-runtime-api": "^2.2",
                 "ext-mbstring": "*",
-                "illuminate/collections": "^10.0|^11.0",
                 "php": "^8.1",
                 "symfony/console": "^6.2|^7.0"
             },
@@ -3040,8 +3112,9 @@
                 "laravel/framework": ">=10.17.0 <10.25.0"
             },
             "require-dev": {
+                "illuminate/collections": "^10.0|^11.0",
                 "mockery/mockery": "^1.5",
-                "pestphp/pest": "^2.3",
+                "pestphp/pest": "^2.3|^3.4",
                 "phpstan/phpstan": "^1.11",
                 "phpstan/phpstan-mockery": "^1.1"
             },
@@ -3051,7 +3124,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-main": "0.1.x-dev"
+                    "dev-main": "0.3.x-dev"
                 }
             },
             "autoload": {
@@ -3069,37 +3142,38 @@
             "description": "Add beautiful and user-friendly forms to your command-line applications.",
             "support": {
                 "issues": "https://github.com/laravel/prompts/issues",
-                "source": "https://github.com/laravel/prompts/tree/v0.1.24"
+                "source": "https://github.com/laravel/prompts/tree/v0.3.3"
             },
-            "time": "2024-06-17T13:58:22+00:00"
+            "time": "2024-12-30T15:53:31+00:00"
         },
         {
             "name": "laravel/serializable-closure",
-            "version": "v1.3.3",
+            "version": "v2.0.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/laravel/serializable-closure.git",
-                "reference": "3dbf8a8e914634c48d389c1234552666b3d43754"
+                "reference": "613b2d4998f85564d40497e05e89cb6d9bd1cbe8"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/laravel/serializable-closure/zipball/3dbf8a8e914634c48d389c1234552666b3d43754",
-                "reference": "3dbf8a8e914634c48d389c1234552666b3d43754",
+                "url": "https://api.github.com/repos/laravel/serializable-closure/zipball/613b2d4998f85564d40497e05e89cb6d9bd1cbe8",
+                "reference": "613b2d4998f85564d40497e05e89cb6d9bd1cbe8",
                 "shasum": ""
             },
             "require": {
-                "php": "^7.3|^8.0"
+                "php": "^8.1"
             },
             "require-dev": {
-                "nesbot/carbon": "^2.61",
-                "pestphp/pest": "^1.21.3",
-                "phpstan/phpstan": "^1.8.2",
-                "symfony/var-dumper": "^5.4.11"
+                "illuminate/support": "^10.0|^11.0",
+                "nesbot/carbon": "^2.67|^3.0",
+                "pestphp/pest": "^2.36",
+                "phpstan/phpstan": "^2.0",
+                "symfony/var-dumper": "^6.2.0|^7.0.0"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.x-dev"
+                    "dev-master": "2.x-dev"
                 }
             },
             "autoload": {
@@ -3131,40 +3205,44 @@
                 "issues": "https://github.com/laravel/serializable-closure/issues",
                 "source": "https://github.com/laravel/serializable-closure"
             },
-            "time": "2023-11-08T14:08:06+00:00"
+            "time": "2024-12-16T15:26:28+00:00"
         },
         {
             "name": "laravel/slack-notification-channel",
-            "version": "v2.5.0",
+            "version": "v3.4.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/laravel/slack-notification-channel.git",
-                "reference": "e0d4be5e01d443a69fa89f0a4cac6bd2eda2be8f"
+                "reference": "282d52d70195283eb1b92e59d7bdc2d525361f4b"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/laravel/slack-notification-channel/zipball/e0d4be5e01d443a69fa89f0a4cac6bd2eda2be8f",
-                "reference": "e0d4be5e01d443a69fa89f0a4cac6bd2eda2be8f",
+                "url": "https://api.github.com/repos/laravel/slack-notification-channel/zipball/282d52d70195283eb1b92e59d7bdc2d525361f4b",
+                "reference": "282d52d70195283eb1b92e59d7bdc2d525361f4b",
                 "shasum": ""
             },
             "require": {
-                "guzzlehttp/guzzle": "^6.0|^7.0",
-                "illuminate/notifications": "~5.8.0|^6.0|^7.0|^8.0|^9.0|^10.0",
-                "php": "^7.1.3|^8.0"
+                "guzzlehttp/guzzle": "^7.0",
+                "illuminate/http": "^9.0|^10.0|^11.0",
+                "illuminate/notifications": "^9.0|^10.0|^11.0",
+                "illuminate/support": "^9.0|^10.0|^11.0",
+                "php": "^8.0"
             },
             "require-dev": {
                 "mockery/mockery": "^1.0",
-                "phpunit/phpunit": "^7.0|^8.0|^9.0"
+                "orchestra/testbench": "^7.0|^8.0|^9.0",
+                "phpstan/phpstan": "^1.10",
+                "phpunit/phpunit": "^9.0|^10.4"
             },
             "type": "library",
             "extra": {
-                "branch-alias": {
-                    "dev-master": "2.x-dev"
-                },
                 "laravel": {
                     "providers": [
                         "Illuminate\\Notifications\\SlackChannelServiceProvider"
                     ]
+                },
+                "branch-alias": {
+                    "dev-master": "3.x-dev"
                 }
             },
             "autoload": {
@@ -3190,22 +3268,22 @@
             ],
             "support": {
                 "issues": "https://github.com/laravel/slack-notification-channel/issues",
-                "source": "https://github.com/laravel/slack-notification-channel/tree/v2.5.0"
+                "source": "https://github.com/laravel/slack-notification-channel/tree/v3.4.2"
             },
-            "time": "2023-01-12T16:21:26+00:00"
+            "time": "2024-11-29T14:59:32+00:00"
         },
         {
             "name": "laravel/socialite",
-            "version": "v5.15.0",
+            "version": "v5.16.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/laravel/socialite.git",
-                "reference": "c8234bfb286a8210df8d62f94562c71bfda4a446"
+                "reference": "4e5be83c0b3ecf81b2ffa47092e917d1f79dce71"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/laravel/socialite/zipball/c8234bfb286a8210df8d62f94562c71bfda4a446",
-                "reference": "c8234bfb286a8210df8d62f94562c71bfda4a446",
+                "url": "https://api.github.com/repos/laravel/socialite/zipball/4e5be83c0b3ecf81b2ffa47092e917d1f79dce71",
+                "reference": "4e5be83c0b3ecf81b2ffa47092e917d1f79dce71",
                 "shasum": ""
             },
             "require": {
@@ -3215,7 +3293,7 @@
                 "illuminate/contracts": "^6.0|^7.0|^8.0|^9.0|^10.0|^11.0",
                 "illuminate/http": "^6.0|^7.0|^8.0|^9.0|^10.0|^11.0",
                 "illuminate/support": "^6.0|^7.0|^8.0|^9.0|^10.0|^11.0",
-                "league/oauth1-client": "^1.10.1",
+                "league/oauth1-client": "^1.11",
                 "php": "^7.2|^8.0",
                 "phpseclib/phpseclib": "^3.0"
             },
@@ -3227,16 +3305,16 @@
             },
             "type": "library",
             "extra": {
-                "branch-alias": {
-                    "dev-master": "5.x-dev"
-                },
                 "laravel": {
-                    "providers": [
-                        "Laravel\\Socialite\\SocialiteServiceProvider"
-                    ],
                     "aliases": {
                         "Socialite": "Laravel\\Socialite\\Facades\\Socialite"
-                    }
+                    },
+                    "providers": [
+                        "Laravel\\Socialite\\SocialiteServiceProvider"
+                    ]
+                },
+                "branch-alias": {
+                    "dev-master": "5.x-dev"
                 }
             },
             "autoload": {
@@ -3264,20 +3342,20 @@
                 "issues": "https://github.com/laravel/socialite/issues",
                 "source": "https://github.com/laravel/socialite"
             },
-            "time": "2024-06-11T13:33:20+00:00"
+            "time": "2024-12-11T16:43:51+00:00"
         },
         {
             "name": "laravel/tinker",
-            "version": "v2.9.0",
+            "version": "v2.10.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/laravel/tinker.git",
-                "reference": "502e0fe3f0415d06d5db1f83a472f0f3b754bafe"
+                "reference": "ba4d51eb56de7711b3a37d63aa0643e99a339ae5"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/laravel/tinker/zipball/502e0fe3f0415d06d5db1f83a472f0f3b754bafe",
-                "reference": "502e0fe3f0415d06d5db1f83a472f0f3b754bafe",
+                "url": "https://api.github.com/repos/laravel/tinker/zipball/ba4d51eb56de7711b3a37d63aa0643e99a339ae5",
+                "reference": "ba4d51eb56de7711b3a37d63aa0643e99a339ae5",
                 "shasum": ""
             },
             "require": {
@@ -3328,22 +3406,22 @@
             ],
             "support": {
                 "issues": "https://github.com/laravel/tinker/issues",
-                "source": "https://github.com/laravel/tinker/tree/v2.9.0"
+                "source": "https://github.com/laravel/tinker/tree/v2.10.0"
             },
-            "time": "2024-01-04T16:10:04+00:00"
+            "time": "2024-09-23T13:32:56+00:00"
         },
         {
             "name": "laravel/ui",
-            "version": "v4.5.2",
+            "version": "v4.6.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/laravel/ui.git",
-                "reference": "c75396f63268c95b053c8e4814eb70e0875e9628"
+                "reference": "a34609b15ae0c0512a0cf47a21695a2729cb7f93"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/laravel/ui/zipball/c75396f63268c95b053c8e4814eb70e0875e9628",
-                "reference": "c75396f63268c95b053c8e4814eb70e0875e9628",
+                "url": "https://api.github.com/repos/laravel/ui/zipball/a34609b15ae0c0512a0cf47a21695a2729cb7f93",
+                "reference": "a34609b15ae0c0512a0cf47a21695a2729cb7f93",
                 "shasum": ""
             },
             "require": {
@@ -3360,13 +3438,13 @@
             },
             "type": "library",
             "extra": {
-                "branch-alias": {
-                    "dev-master": "4.x-dev"
-                },
                 "laravel": {
                     "providers": [
                         "Laravel\\Ui\\UiServiceProvider"
                     ]
+                },
+                "branch-alias": {
+                    "dev-master": "4.x-dev"
                 }
             },
             "autoload": {
@@ -3391,37 +3469,38 @@
                 "ui"
             ],
             "support": {
-                "source": "https://github.com/laravel/ui/tree/v4.5.2"
+                "source": "https://github.com/laravel/ui/tree/v4.6.0"
             },
-            "time": "2024-05-08T18:07:10+00:00"
+            "time": "2024-11-21T15:06:41+00:00"
         },
         {
             "name": "laravelcollective/html",
-            "version": "v6.4.1",
+            "version": "6.x-dev",
             "source": {
                 "type": "git",
-                "url": "https://github.com/LaravelCollective/html.git",
-                "reference": "64ddfdcaeeb8d332bd98bef442bef81e39c3910b"
+                "url": "https://github.com/grokability/html.git",
+                "reference": "944b7029c207914ecec437c0141b7a0e32d9e1a1"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/LaravelCollective/html/zipball/64ddfdcaeeb8d332bd98bef442bef81e39c3910b",
-                "reference": "64ddfdcaeeb8d332bd98bef442bef81e39c3910b",
+                "url": "https://api.github.com/repos/grokability/html/zipball/944b7029c207914ecec437c0141b7a0e32d9e1a1",
+                "reference": "944b7029c207914ecec437c0141b7a0e32d9e1a1",
                 "shasum": ""
             },
             "require": {
-                "illuminate/http": "^6.0|^7.0|^8.0|^9.0|^10.0",
-                "illuminate/routing": "^6.0|^7.0|^8.0|^9.0|^10.0",
-                "illuminate/session": "^6.0|^7.0|^8.0|^9.0|^10.0",
-                "illuminate/support": "^6.0|^7.0|^8.0|^9.0|^10.0",
-                "illuminate/view": "^6.0|^7.0|^8.0|^9.0|^10.0",
+                "illuminate/http": "^6.0|^7.0|^8.0|^9.0|^10.0|^11.0",
+                "illuminate/routing": "^6.0|^7.0|^8.0|^9.0|^10.0|^11.0",
+                "illuminate/session": "^6.0|^7.0|^8.0|^9.0|^10.0|^11.0",
+                "illuminate/support": "^6.0|^7.0|^8.0|^9.0|^10.0|^11.0",
+                "illuminate/view": "^6.0|^7.0|^8.0|^9.0|^10.0|^11.0",
                 "php": ">=7.2.5"
             },
             "require-dev": {
-                "illuminate/database": "^6.0|^7.0|^8.0|^9.0|^10.0",
+                "illuminate/database": "^6.0|^7.0|^8.0|^9.0|^10.0|^11.0",
                 "mockery/mockery": "~1.0",
                 "phpunit/phpunit": "~8.5|^9.5.10"
             },
+            "default-branch": true,
             "type": "library",
             "extra": {
                 "branch-alias": {
@@ -3438,14 +3517,13 @@
                 }
             },
             "autoload": {
-                "files": [
-                    "src/helpers.php"
-                ],
                 "psr-4": {
                     "Collective\\Html\\": "src/"
-                }
+                },
+                "files": [
+                    "src/helpers.php"
+                ]
             },
-            "notification-url": "https://packagist.org/downloads/",
             "license": [
                 "MIT"
             ],
@@ -3466,42 +3544,42 @@
                 "source": "https://github.com/LaravelCollective/html"
             },
             "abandoned": "spatie/laravel-html",
-            "time": "2023-04-25T02:46:11+00:00"
+            "time": "2025-01-20T14:37:14+00:00"
         },
         {
             "name": "lcobucci/jwt",
-            "version": "5.3.0",
+            "version": "5.4.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/lcobucci/jwt.git",
-                "reference": "08071d8d2c7f4b00222cc4b1fb6aa46990a80f83"
+                "reference": "ea1ce71cbf9741e445a5914e2f67cdbb484ff712"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/lcobucci/jwt/zipball/08071d8d2c7f4b00222cc4b1fb6aa46990a80f83",
-                "reference": "08071d8d2c7f4b00222cc4b1fb6aa46990a80f83",
+                "url": "https://api.github.com/repos/lcobucci/jwt/zipball/ea1ce71cbf9741e445a5914e2f67cdbb484ff712",
+                "reference": "ea1ce71cbf9741e445a5914e2f67cdbb484ff712",
                 "shasum": ""
             },
             "require": {
                 "ext-openssl": "*",
                 "ext-sodium": "*",
-                "php": "~8.1.0 || ~8.2.0 || ~8.3.0",
+                "php": "~8.2.0 || ~8.3.0 || ~8.4.0",
                 "psr/clock": "^1.0"
             },
             "require-dev": {
-                "infection/infection": "^0.27.0",
-                "lcobucci/clock": "^3.0",
+                "infection/infection": "^0.29",
+                "lcobucci/clock": "^3.2",
                 "lcobucci/coding-standard": "^11.0",
-                "phpbench/phpbench": "^1.2.9",
+                "phpbench/phpbench": "^1.2",
                 "phpstan/extension-installer": "^1.2",
                 "phpstan/phpstan": "^1.10.7",
                 "phpstan/phpstan-deprecation-rules": "^1.1.3",
                 "phpstan/phpstan-phpunit": "^1.3.10",
                 "phpstan/phpstan-strict-rules": "^1.5.0",
-                "phpunit/phpunit": "^10.2.6"
+                "phpunit/phpunit": "^11.1"
             },
             "suggest": {
-                "lcobucci/clock": ">= 3.0"
+                "lcobucci/clock": ">= 3.2"
             },
             "type": "library",
             "autoload": {
@@ -3527,7 +3605,7 @@
             ],
             "support": {
                 "issues": "https://github.com/lcobucci/jwt/issues",
-                "source": "https://github.com/lcobucci/jwt/tree/5.3.0"
+                "source": "https://github.com/lcobucci/jwt/tree/5.4.2"
             },
             "funding": [
                 {
@@ -3539,20 +3617,20 @@
                     "type": "patreon"
                 }
             ],
-            "time": "2024-04-11T23:07:54+00:00"
+            "time": "2024-11-07T12:54:35+00:00"
         },
         {
             "name": "league/commonmark",
-            "version": "2.4.2",
+            "version": "2.7.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/thephpleague/commonmark.git",
-                "reference": "91c24291965bd6d7c46c46a12ba7492f83b1cadf"
+                "reference": "6fbb36d44824ed4091adbcf4c7d4a3923cdb3405"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/thephpleague/commonmark/zipball/91c24291965bd6d7c46c46a12ba7492f83b1cadf",
-                "reference": "91c24291965bd6d7c46c46a12ba7492f83b1cadf",
+                "url": "https://api.github.com/repos/thephpleague/commonmark/zipball/6fbb36d44824ed4091adbcf4c7d4a3923cdb3405",
+                "reference": "6fbb36d44824ed4091adbcf4c7d4a3923cdb3405",
                 "shasum": ""
             },
             "require": {
@@ -3565,8 +3643,8 @@
             },
             "require-dev": {
                 "cebe/markdown": "^1.0",
-                "commonmark/cmark": "0.30.3",
-                "commonmark/commonmark.js": "0.30.0",
+                "commonmark/cmark": "0.31.1",
+                "commonmark/commonmark.js": "0.31.1",
                 "composer/package-versions-deprecated": "^1.8",
                 "embed/embed": "^4.4",
                 "erusev/parsedown": "^1.0",
@@ -3577,8 +3655,9 @@
                 "phpstan/phpstan": "^1.8.2",
                 "phpunit/phpunit": "^9.5.21 || ^10.5.9 || ^11.0.0",
                 "scrutinizer/ocular": "^1.8.1",
-                "symfony/finder": "^5.3 | ^6.0 || ^7.0",
-                "symfony/yaml": "^2.3 | ^3.0 | ^4.0 | ^5.0 | ^6.0 || ^7.0",
+                "symfony/finder": "^5.3 | ^6.0 | ^7.0",
+                "symfony/process": "^5.4 | ^6.0 | ^7.0",
+                "symfony/yaml": "^2.3 | ^3.0 | ^4.0 | ^5.0 | ^6.0 | ^7.0",
                 "unleashedtech/php-coding-standard": "^3.1.1",
                 "vimeo/psalm": "^4.24.0 || ^5.0.0"
             },
@@ -3588,7 +3667,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-main": "2.5-dev"
+                    "dev-main": "2.8-dev"
                 }
             },
             "autoload": {
@@ -3645,7 +3724,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-02-02T11:59:32+00:00"
+            "time": "2025-05-05T12:20:28+00:00"
         },
         {
             "name": "league/config",
@@ -3731,16 +3810,16 @@
         },
         {
             "name": "league/csv",
-            "version": "9.16.0",
+            "version": "9.21.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/thephpleague/csv.git",
-                "reference": "998280c6c34bd67d8125fdc8b45bae28d761b440"
+                "reference": "72196d11ebba22d868954cb39c0c7346207430cc"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/thephpleague/csv/zipball/998280c6c34bd67d8125fdc8b45bae28d761b440",
-                "reference": "998280c6c34bd67d8125fdc8b45bae28d761b440",
+                "url": "https://api.github.com/repos/thephpleague/csv/zipball/72196d11ebba22d868954cb39c0c7346207430cc",
+                "reference": "72196d11ebba22d868954cb39c0c7346207430cc",
                 "shasum": ""
             },
             "require": {
@@ -3748,17 +3827,16 @@
                 "php": "^8.1.2"
             },
             "require-dev": {
-                "doctrine/collections": "^2.2.2",
                 "ext-dom": "*",
                 "ext-xdebug": "*",
-                "friendsofphp/php-cs-fixer": "^3.57.1",
-                "phpbench/phpbench": "^1.2.15",
-                "phpstan/phpstan": "^1.11.1",
-                "phpstan/phpstan-deprecation-rules": "^1.2.0",
-                "phpstan/phpstan-phpunit": "^1.4.0",
-                "phpstan/phpstan-strict-rules": "^1.6.0",
-                "phpunit/phpunit": "^10.5.16 || ^11.1.3",
-                "symfony/var-dumper": "^6.4.6 || ^7.0.7"
+                "friendsofphp/php-cs-fixer": "^3.64.0",
+                "phpbench/phpbench": "^1.3.1",
+                "phpstan/phpstan": "^1.12.11",
+                "phpstan/phpstan-deprecation-rules": "^1.2.1",
+                "phpstan/phpstan-phpunit": "^1.4.1",
+                "phpstan/phpstan-strict-rules": "^1.6.1",
+                "phpunit/phpunit": "^10.5.16 || ^11.4.3",
+                "symfony/var-dumper": "^6.4.8 || ^7.1.8"
             },
             "suggest": {
                 "ext-dom": "Required to use the XMLConverter and the HTMLConverter classes",
@@ -3776,7 +3854,7 @@
                     "src/functions_include.php"
                 ],
                 "psr-4": {
-                    "League\\Csv\\": "src"
+                    "League\\Csv\\": "src/"
                 }
             },
             "notification-url": "https://packagist.org/downloads/",
@@ -3815,7 +3893,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2024-05-24T11:04:54+00:00"
+            "time": "2025-01-08T19:27:58+00:00"
         },
         {
             "name": "league/event",
@@ -3873,16 +3951,16 @@
         },
         {
             "name": "league/flysystem",
-            "version": "3.28.0",
+            "version": "3.29.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/thephpleague/flysystem.git",
-                "reference": "e611adab2b1ae2e3072fa72d62c62f52c2bf1f0c"
+                "reference": "edc1bb7c86fab0776c3287dbd19b5fa278347319"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/thephpleague/flysystem/zipball/e611adab2b1ae2e3072fa72d62c62f52c2bf1f0c",
-                "reference": "e611adab2b1ae2e3072fa72d62c62f52c2bf1f0c",
+                "url": "https://api.github.com/repos/thephpleague/flysystem/zipball/edc1bb7c86fab0776c3287dbd19b5fa278347319",
+                "reference": "edc1bb7c86fab0776c3287dbd19b5fa278347319",
                 "shasum": ""
             },
             "require": {
@@ -3950,22 +4028,22 @@
             ],
             "support": {
                 "issues": "https://github.com/thephpleague/flysystem/issues",
-                "source": "https://github.com/thephpleague/flysystem/tree/3.28.0"
+                "source": "https://github.com/thephpleague/flysystem/tree/3.29.1"
             },
-            "time": "2024-05-22T10:09:12+00:00"
+            "time": "2024-10-08T08:58:34+00:00"
         },
         {
             "name": "league/flysystem-aws-s3-v3",
-            "version": "3.28.0",
+            "version": "3.29.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/thephpleague/flysystem-aws-s3-v3.git",
-                "reference": "22071ef1604bc776f5ff2468ac27a752514665c8"
+                "reference": "c6ff6d4606e48249b63f269eba7fabdb584e76a9"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/thephpleague/flysystem-aws-s3-v3/zipball/22071ef1604bc776f5ff2468ac27a752514665c8",
-                "reference": "22071ef1604bc776f5ff2468ac27a752514665c8",
+                "url": "https://api.github.com/repos/thephpleague/flysystem-aws-s3-v3/zipball/c6ff6d4606e48249b63f269eba7fabdb584e76a9",
+                "reference": "c6ff6d4606e48249b63f269eba7fabdb584e76a9",
                 "shasum": ""
             },
             "require": {
@@ -4005,22 +4083,22 @@
                 "storage"
             ],
             "support": {
-                "source": "https://github.com/thephpleague/flysystem-aws-s3-v3/tree/3.28.0"
+                "source": "https://github.com/thephpleague/flysystem-aws-s3-v3/tree/3.29.0"
             },
-            "time": "2024-05-06T20:05:52+00:00"
+            "time": "2024-08-17T13:10:48+00:00"
         },
         {
             "name": "league/flysystem-local",
-            "version": "3.28.0",
+            "version": "3.29.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/thephpleague/flysystem-local.git",
-                "reference": "13f22ea8be526ea58c2ddff9e158ef7c296e4f40"
+                "reference": "e0e8d52ce4b2ed154148453d321e97c8e931bd27"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/thephpleague/flysystem-local/zipball/13f22ea8be526ea58c2ddff9e158ef7c296e4f40",
-                "reference": "13f22ea8be526ea58c2ddff9e158ef7c296e4f40",
+                "url": "https://api.github.com/repos/thephpleague/flysystem-local/zipball/e0e8d52ce4b2ed154148453d321e97c8e931bd27",
+                "reference": "e0e8d52ce4b2ed154148453d321e97c8e931bd27",
                 "shasum": ""
             },
             "require": {
@@ -4054,22 +4132,22 @@
                 "local"
             ],
             "support": {
-                "source": "https://github.com/thephpleague/flysystem-local/tree/3.28.0"
+                "source": "https://github.com/thephpleague/flysystem-local/tree/3.29.0"
             },
-            "time": "2024-05-06T20:05:52+00:00"
+            "time": "2024-08-09T21:24:39+00:00"
         },
         {
             "name": "league/mime-type-detection",
-            "version": "1.15.0",
+            "version": "1.16.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/thephpleague/mime-type-detection.git",
-                "reference": "ce0f4d1e8a6f4eb0ddff33f57c69c50fd09f4301"
+                "reference": "2d6702ff215bf922936ccc1ad31007edc76451b9"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/thephpleague/mime-type-detection/zipball/ce0f4d1e8a6f4eb0ddff33f57c69c50fd09f4301",
-                "reference": "ce0f4d1e8a6f4eb0ddff33f57c69c50fd09f4301",
+                "url": "https://api.github.com/repos/thephpleague/mime-type-detection/zipball/2d6702ff215bf922936ccc1ad31007edc76451b9",
+                "reference": "2d6702ff215bf922936ccc1ad31007edc76451b9",
                 "shasum": ""
             },
             "require": {
@@ -4100,7 +4178,7 @@
             "description": "Mime-type detection for Flysystem",
             "support": {
                 "issues": "https://github.com/thephpleague/mime-type-detection/issues",
-                "source": "https://github.com/thephpleague/mime-type-detection/tree/1.15.0"
+                "source": "https://github.com/thephpleague/mime-type-detection/tree/1.16.0"
             },
             "funding": [
                 {
@@ -4112,20 +4190,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-01-28T23:22:08+00:00"
+            "time": "2024-09-21T08:32:55+00:00"
         },
         {
             "name": "league/oauth1-client",
-            "version": "v1.10.1",
+            "version": "v1.11.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/thephpleague/oauth1-client.git",
-                "reference": "d6365b901b5c287dd41f143033315e2f777e1167"
+                "reference": "f9c94b088837eb1aae1ad7c4f23eb65cc6993055"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/thephpleague/oauth1-client/zipball/d6365b901b5c287dd41f143033315e2f777e1167",
-                "reference": "d6365b901b5c287dd41f143033315e2f777e1167",
+                "url": "https://api.github.com/repos/thephpleague/oauth1-client/zipball/f9c94b088837eb1aae1ad7c4f23eb65cc6993055",
+                "reference": "f9c94b088837eb1aae1ad7c4f23eb65cc6993055",
                 "shasum": ""
             },
             "require": {
@@ -4186,22 +4264,22 @@
             ],
             "support": {
                 "issues": "https://github.com/thephpleague/oauth1-client/issues",
-                "source": "https://github.com/thephpleague/oauth1-client/tree/v1.10.1"
+                "source": "https://github.com/thephpleague/oauth1-client/tree/v1.11.0"
             },
-            "time": "2022-04-15T14:02:14+00:00"
+            "time": "2024-12-10T19:59:05+00:00"
         },
         {
             "name": "league/oauth2-server",
-            "version": "8.5.4",
+            "version": "8.5.5",
             "source": {
                 "type": "git",
                 "url": "https://github.com/thephpleague/oauth2-server.git",
-                "reference": "ab7714d073844497fd222d5d0a217629089936bc"
+                "reference": "cc8778350f905667e796b3c2364a9d3bd7a73518"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/thephpleague/oauth2-server/zipball/ab7714d073844497fd222d5d0a217629089936bc",
-                "reference": "ab7714d073844497fd222d5d0a217629089936bc",
+                "url": "https://api.github.com/repos/thephpleague/oauth2-server/zipball/cc8778350f905667e796b3c2364a9d3bd7a73518",
+                "reference": "cc8778350f905667e796b3c2364a9d3bd7a73518",
                 "shasum": ""
             },
             "require": {
@@ -4268,7 +4346,7 @@
             ],
             "support": {
                 "issues": "https://github.com/thephpleague/oauth2-server/issues",
-                "source": "https://github.com/thephpleague/oauth2-server/tree/8.5.4"
+                "source": "https://github.com/thephpleague/oauth2-server/tree/8.5.5"
             },
             "funding": [
                 {
@@ -4276,24 +4354,24 @@
                     "type": "github"
                 }
             ],
-            "time": "2023-08-25T22:35:12+00:00"
+            "time": "2024-12-20T23:06:10+00:00"
         },
         {
             "name": "league/uri",
-            "version": "7.4.1",
+            "version": "7.5.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/thephpleague/uri.git",
-                "reference": "bedb6e55eff0c933668addaa7efa1e1f2c417cc4"
+                "reference": "81fb5145d2644324614cc532b28efd0215bda430"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/thephpleague/uri/zipball/bedb6e55eff0c933668addaa7efa1e1f2c417cc4",
-                "reference": "bedb6e55eff0c933668addaa7efa1e1f2c417cc4",
+                "url": "https://api.github.com/repos/thephpleague/uri/zipball/81fb5145d2644324614cc532b28efd0215bda430",
+                "reference": "81fb5145d2644324614cc532b28efd0215bda430",
                 "shasum": ""
             },
             "require": {
-                "league/uri-interfaces": "^7.3",
+                "league/uri-interfaces": "^7.5",
                 "php": "^8.1"
             },
             "conflict": {
@@ -4358,7 +4436,7 @@
                 "docs": "https://uri.thephpleague.com",
                 "forum": "https://thephpleague.slack.com",
                 "issues": "https://github.com/thephpleague/uri-src/issues",
-                "source": "https://github.com/thephpleague/uri/tree/7.4.1"
+                "source": "https://github.com/thephpleague/uri/tree/7.5.1"
             },
             "funding": [
                 {
@@ -4366,20 +4444,20 @@
                     "type": "github"
                 }
             ],
-            "time": "2024-03-23T07:42:40+00:00"
+            "time": "2024-12-08T08:40:02+00:00"
         },
         {
             "name": "league/uri-interfaces",
-            "version": "7.4.1",
+            "version": "7.5.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/thephpleague/uri-interfaces.git",
-                "reference": "8d43ef5c841032c87e2de015972c06f3865ef718"
+                "reference": "08cfc6c4f3d811584fb09c37e2849e6a7f9b0742"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/thephpleague/uri-interfaces/zipball/8d43ef5c841032c87e2de015972c06f3865ef718",
-                "reference": "8d43ef5c841032c87e2de015972c06f3865ef718",
+                "url": "https://api.github.com/repos/thephpleague/uri-interfaces/zipball/08cfc6c4f3d811584fb09c37e2849e6a7f9b0742",
+                "reference": "08cfc6c4f3d811584fb09c37e2849e6a7f9b0742",
                 "shasum": ""
             },
             "require": {
@@ -4442,7 +4520,7 @@
                 "docs": "https://uri.thephpleague.com",
                 "forum": "https://thephpleague.slack.com",
                 "issues": "https://github.com/thephpleague/uri-src/issues",
-                "source": "https://github.com/thephpleague/uri-interfaces/tree/7.4.1"
+                "source": "https://github.com/thephpleague/uri-interfaces/tree/7.5.0"
             },
             "funding": [
                 {
@@ -4450,20 +4528,20 @@
                     "type": "github"
                 }
             ],
-            "time": "2024-03-23T07:42:40+00:00"
+            "time": "2024-12-08T08:18:47+00:00"
         },
         {
             "name": "livewire/livewire",
-            "version": "v3.5.1",
+            "version": "v3.5.18",
             "source": {
                 "type": "git",
                 "url": "https://github.com/livewire/livewire.git",
-                "reference": "da044261bb5c5449397f18fda3409f14acf47c0a"
+                "reference": "62f0fa6b340a467c25baa590a567d9a134b357da"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/livewire/livewire/zipball/da044261bb5c5449397f18fda3409f14acf47c0a",
-                "reference": "da044261bb5c5449397f18fda3409f14acf47c0a",
+                "url": "https://api.github.com/repos/livewire/livewire/zipball/62f0fa6b340a467c25baa590a567d9a134b357da",
+                "reference": "62f0fa6b340a467c25baa590a567d9a134b357da",
                 "shasum": ""
             },
             "require": {
@@ -4471,6 +4549,7 @@
                 "illuminate/routing": "^10.0|^11.0",
                 "illuminate/support": "^10.0|^11.0",
                 "illuminate/validation": "^10.0|^11.0",
+                "laravel/prompts": "^0.1.24|^0.2|^0.3",
                 "league/mime-type-detection": "^1.9",
                 "php": "^8.1",
                 "symfony/console": "^6.0|^7.0",
@@ -4479,7 +4558,6 @@
             "require-dev": {
                 "calebporzio/sushi": "^2.1",
                 "laravel/framework": "^10.15.0|^11.0",
-                "laravel/prompts": "^0.1.6",
                 "mockery/mockery": "^1.3.1",
                 "orchestra/testbench": "^8.21.0|^9.0",
                 "orchestra/testbench-dusk": "^8.24|^9.1",
@@ -4489,12 +4567,12 @@
             "type": "library",
             "extra": {
                 "laravel": {
-                    "providers": [
-                        "Livewire\\LivewireServiceProvider"
-                    ],
                     "aliases": {
                         "Livewire": "Livewire\\Livewire"
-                    }
+                    },
+                    "providers": [
+                        "Livewire\\LivewireServiceProvider"
+                    ]
                 }
             },
             "autoload": {
@@ -4518,7 +4596,7 @@
             "description": "A front-end framework for Laravel.",
             "support": {
                 "issues": "https://github.com/livewire/livewire/issues",
-                "source": "https://github.com/livewire/livewire/tree/v3.5.1"
+                "source": "https://github.com/livewire/livewire/tree/v3.5.18"
             },
             "funding": [
                 {
@@ -4526,7 +4604,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2024-06-18T11:10:42+00:00"
+            "time": "2024-12-23T15:05:02+00:00"
         },
         {
             "name": "masterminds/html5",
@@ -4595,86 +4673,18 @@
             },
             "time": "2024-03-31T07:05:07+00:00"
         },
-        {
-            "name": "maximebf/debugbar",
-            "version": "v1.22.3",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/maximebf/php-debugbar.git",
-                "reference": "7aa9a27a0b1158ed5ad4e7175e8d3aee9a818b96"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/maximebf/php-debugbar/zipball/7aa9a27a0b1158ed5ad4e7175e8d3aee9a818b96",
-                "reference": "7aa9a27a0b1158ed5ad4e7175e8d3aee9a818b96",
-                "shasum": ""
-            },
-            "require": {
-                "php": "^7.2|^8",
-                "psr/log": "^1|^2|^3",
-                "symfony/var-dumper": "^4|^5|^6|^7"
-            },
-            "require-dev": {
-                "dbrekelmans/bdi": "^1",
-                "phpunit/phpunit": "^8|^9",
-                "symfony/panther": "^1|^2.1",
-                "twig/twig": "^1.38|^2.7|^3.0"
-            },
-            "suggest": {
-                "kriswallsmith/assetic": "The best way to manage assets",
-                "monolog/monolog": "Log using Monolog",
-                "predis/predis": "Redis storage"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.22-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "DebugBar\\": "src/DebugBar/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Maxime Bouroumeau-Fuseau",
-                    "email": "maxime.bouroumeau@gmail.com",
-                    "homepage": "http://maximebf.com"
-                },
-                {
-                    "name": "Barry vd. Heuvel",
-                    "email": "barryvdh@gmail.com"
-                }
-            ],
-            "description": "Debug bar in the browser for php application",
-            "homepage": "https://github.com/maximebf/php-debugbar",
-            "keywords": [
-                "debug",
-                "debugbar"
-            ],
-            "support": {
-                "issues": "https://github.com/maximebf/php-debugbar/issues",
-                "source": "https://github.com/maximebf/php-debugbar/tree/v1.22.3"
-            },
-            "time": "2024-04-03T19:39:26+00:00"
-        },
         {
             "name": "monolog/monolog",
-            "version": "3.6.0",
+            "version": "3.9.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/Seldaek/monolog.git",
-                "reference": "4b18b21a5527a3d5ffdac2fd35d3ab25a9597654"
+                "reference": "10d85740180ecba7896c87e06a166e0c95a0e3b6"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/Seldaek/monolog/zipball/4b18b21a5527a3d5ffdac2fd35d3ab25a9597654",
-                "reference": "4b18b21a5527a3d5ffdac2fd35d3ab25a9597654",
+                "url": "https://api.github.com/repos/Seldaek/monolog/zipball/10d85740180ecba7896c87e06a166e0c95a0e3b6",
+                "reference": "10d85740180ecba7896c87e06a166e0c95a0e3b6",
                 "shasum": ""
             },
             "require": {
@@ -4694,12 +4704,14 @@
                 "guzzlehttp/psr7": "^2.2",
                 "mongodb/mongodb": "^1.8",
                 "php-amqplib/php-amqplib": "~2.4 || ^3",
-                "phpstan/phpstan": "^1.9",
-                "phpstan/phpstan-deprecation-rules": "^1.0",
-                "phpstan/phpstan-strict-rules": "^1.4",
-                "phpunit/phpunit": "^10.5.17",
+                "php-console/php-console": "^3.1.8",
+                "phpstan/phpstan": "^2",
+                "phpstan/phpstan-deprecation-rules": "^2",
+                "phpstan/phpstan-strict-rules": "^2",
+                "phpunit/phpunit": "^10.5.17 || ^11.0.7",
                 "predis/predis": "^1.1 || ^2",
-                "ruflin/elastica": "^7",
+                "rollbar/rollbar": "^4.0",
+                "ruflin/elastica": "^7 || ^8",
                 "symfony/mailer": "^5.4 || ^6",
                 "symfony/mime": "^5.4 || ^6"
             },
@@ -4750,7 +4762,7 @@
             ],
             "support": {
                 "issues": "https://github.com/Seldaek/monolog/issues",
-                "source": "https://github.com/Seldaek/monolog/tree/3.6.0"
+                "source": "https://github.com/Seldaek/monolog/tree/3.9.0"
             },
             "funding": [
                 {
@@ -4762,20 +4774,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-04-12T21:02:21+00:00"
+            "time": "2025-03-24T10:02:05+00:00"
         },
         {
             "name": "mtdowling/jmespath.php",
-            "version": "2.7.0",
+            "version": "2.8.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/jmespath/jmespath.php.git",
-                "reference": "bbb69a935c2cbb0c03d7f481a238027430f6440b"
+                "reference": "a2a865e05d5f420b50cc2f85bb78d565db12a6bc"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/jmespath/jmespath.php/zipball/bbb69a935c2cbb0c03d7f481a238027430f6440b",
-                "reference": "bbb69a935c2cbb0c03d7f481a238027430f6440b",
+                "url": "https://api.github.com/repos/jmespath/jmespath.php/zipball/a2a865e05d5f420b50cc2f85bb78d565db12a6bc",
+                "reference": "a2a865e05d5f420b50cc2f85bb78d565db12a6bc",
                 "shasum": ""
             },
             "require": {
@@ -4792,7 +4804,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "2.7-dev"
+                    "dev-master": "2.8-dev"
                 }
             },
             "autoload": {
@@ -4826,9 +4838,9 @@
             ],
             "support": {
                 "issues": "https://github.com/jmespath/jmespath.php/issues",
-                "source": "https://github.com/jmespath/jmespath.php/tree/2.7.0"
+                "source": "https://github.com/jmespath/jmespath.php/tree/2.8.0"
             },
-            "time": "2023-08-25T10:54:48+00:00"
+            "time": "2024-09-04T18:46:31+00:00"
         },
         {
             "name": "neitanod/forceutf8",
@@ -4873,52 +4885,47 @@
         },
         {
             "name": "nesbot/carbon",
-            "version": "2.72.5",
+            "version": "3.8.4",
             "source": {
                 "type": "git",
-                "url": "https://github.com/briannesbitt/Carbon.git",
-                "reference": "afd46589c216118ecd48ff2b95d77596af1e57ed"
+                "url": "https://github.com/CarbonPHP/carbon.git",
+                "reference": "129700ed449b1f02d70272d2ac802357c8c30c58"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/afd46589c216118ecd48ff2b95d77596af1e57ed",
-                "reference": "afd46589c216118ecd48ff2b95d77596af1e57ed",
+                "url": "https://api.github.com/repos/CarbonPHP/carbon/zipball/129700ed449b1f02d70272d2ac802357c8c30c58",
+                "reference": "129700ed449b1f02d70272d2ac802357c8c30c58",
                 "shasum": ""
             },
             "require": {
-                "carbonphp/carbon-doctrine-types": "*",
+                "carbonphp/carbon-doctrine-types": "<100.0",
                 "ext-json": "*",
-                "php": "^7.1.8 || ^8.0",
+                "php": "^8.1",
                 "psr/clock": "^1.0",
+                "symfony/clock": "^6.3 || ^7.0",
                 "symfony/polyfill-mbstring": "^1.0",
-                "symfony/polyfill-php80": "^1.16",
-                "symfony/translation": "^3.4 || ^4.0 || ^5.0 || ^6.0"
+                "symfony/translation": "^4.4.18 || ^5.2.1|| ^6.0 || ^7.0"
             },
             "provide": {
                 "psr/clock-implementation": "1.0"
             },
             "require-dev": {
-                "doctrine/dbal": "^2.0 || ^3.1.4 || ^4.0",
-                "doctrine/orm": "^2.7 || ^3.0",
-                "friendsofphp/php-cs-fixer": "^3.0",
-                "kylekatarnls/multi-tester": "^2.0",
-                "ondrejmirtes/better-reflection": "*",
-                "phpmd/phpmd": "^2.9",
-                "phpstan/extension-installer": "^1.0",
-                "phpstan/phpstan": "^0.12.99 || ^1.7.14",
-                "phpunit/php-file-iterator": "^2.0.5 || ^3.0.6",
-                "phpunit/phpunit": "^7.5.20 || ^8.5.26 || ^9.5.20",
-                "squizlabs/php_codesniffer": "^3.4"
+                "doctrine/dbal": "^3.6.3 || ^4.0",
+                "doctrine/orm": "^2.15.2 || ^3.0",
+                "friendsofphp/php-cs-fixer": "^3.57.2",
+                "kylekatarnls/multi-tester": "^2.5.3",
+                "ondrejmirtes/better-reflection": "^6.25.0.4",
+                "phpmd/phpmd": "^2.15.0",
+                "phpstan/extension-installer": "^1.3.1",
+                "phpstan/phpstan": "^1.11.2",
+                "phpunit/phpunit": "^10.5.20",
+                "squizlabs/php_codesniffer": "^3.9.0"
             },
             "bin": [
                 "bin/carbon"
             ],
             "type": "library",
             "extra": {
-                "branch-alias": {
-                    "dev-master": "3.x-dev",
-                    "dev-2.x": "2.x-dev"
-                },
                 "laravel": {
                     "providers": [
                         "Carbon\\Laravel\\ServiceProvider"
@@ -4928,6 +4935,10 @@
                     "includes": [
                         "extension.neon"
                     ]
+                },
+                "branch-alias": {
+                    "dev-2.x": "2.x-dev",
+                    "dev-master": "3.x-dev"
                 }
             },
             "autoload": {
@@ -4976,28 +4987,28 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-06-03T19:18:41+00:00"
+            "time": "2024-12-27T09:25:35+00:00"
         },
         {
             "name": "nette/schema",
-            "version": "v1.3.0",
+            "version": "v1.3.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/nette/schema.git",
-                "reference": "a6d3a6d1f545f01ef38e60f375d1cf1f4de98188"
+                "reference": "da801d52f0354f70a638673c4a0f04e16529431d"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/nette/schema/zipball/a6d3a6d1f545f01ef38e60f375d1cf1f4de98188",
-                "reference": "a6d3a6d1f545f01ef38e60f375d1cf1f4de98188",
+                "url": "https://api.github.com/repos/nette/schema/zipball/da801d52f0354f70a638673c4a0f04e16529431d",
+                "reference": "da801d52f0354f70a638673c4a0f04e16529431d",
                 "shasum": ""
             },
             "require": {
                 "nette/utils": "^4.0",
-                "php": "8.1 - 8.3"
+                "php": "8.1 - 8.4"
             },
             "require-dev": {
-                "nette/tester": "^2.4",
+                "nette/tester": "^2.5.2",
                 "phpstan/phpstan-nette": "^1.0",
                 "tracy/tracy": "^2.8"
             },
@@ -5036,26 +5047,26 @@
             ],
             "support": {
                 "issues": "https://github.com/nette/schema/issues",
-                "source": "https://github.com/nette/schema/tree/v1.3.0"
+                "source": "https://github.com/nette/schema/tree/v1.3.2"
             },
-            "time": "2023-12-11T11:54:22+00:00"
+            "time": "2024-10-06T23:10:23+00:00"
         },
         {
             "name": "nette/utils",
-            "version": "v4.0.4",
+            "version": "v4.0.5",
             "source": {
                 "type": "git",
                 "url": "https://github.com/nette/utils.git",
-                "reference": "d3ad0aa3b9f934602cb3e3902ebccf10be34d218"
+                "reference": "736c567e257dbe0fcf6ce81b4d6dbe05c6899f96"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/nette/utils/zipball/d3ad0aa3b9f934602cb3e3902ebccf10be34d218",
-                "reference": "d3ad0aa3b9f934602cb3e3902ebccf10be34d218",
+                "url": "https://api.github.com/repos/nette/utils/zipball/736c567e257dbe0fcf6ce81b4d6dbe05c6899f96",
+                "reference": "736c567e257dbe0fcf6ce81b4d6dbe05c6899f96",
                 "shasum": ""
             },
             "require": {
-                "php": ">=8.0 <8.4"
+                "php": "8.0 - 8.4"
             },
             "conflict": {
                 "nette/finder": "<3",
@@ -5122,22 +5133,22 @@
             ],
             "support": {
                 "issues": "https://github.com/nette/utils/issues",
-                "source": "https://github.com/nette/utils/tree/v4.0.4"
+                "source": "https://github.com/nette/utils/tree/v4.0.5"
             },
-            "time": "2024-01-17T16:50:36+00:00"
+            "time": "2024-08-07T15:39:19+00:00"
         },
         {
             "name": "nikic/php-parser",
-            "version": "v4.19.1",
+            "version": "v4.19.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/nikic/PHP-Parser.git",
-                "reference": "4e1b88d21c69391150ace211e9eaf05810858d0b"
+                "reference": "715f4d25e225bc47b293a8b997fe6ce99bf987d2"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/4e1b88d21c69391150ace211e9eaf05810858d0b",
-                "reference": "4e1b88d21c69391150ace211e9eaf05810858d0b",
+                "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/715f4d25e225bc47b293a8b997fe6ce99bf987d2",
+                "reference": "715f4d25e225bc47b293a8b997fe6ce99bf987d2",
                 "shasum": ""
             },
             "require": {
@@ -5146,7 +5157,7 @@
             },
             "require-dev": {
                 "ircmaxell/php-yacc": "^0.0.7",
-                "phpunit/phpunit": "^6.5 || ^7.0 || ^8.0 || ^9.0"
+                "phpunit/phpunit": "^7.0 || ^8.0 || ^9.0"
             },
             "bin": [
                 "bin/php-parse"
@@ -5178,51 +5189,60 @@
             ],
             "support": {
                 "issues": "https://github.com/nikic/PHP-Parser/issues",
-                "source": "https://github.com/nikic/PHP-Parser/tree/v4.19.1"
+                "source": "https://github.com/nikic/PHP-Parser/tree/v4.19.4"
             },
-            "time": "2024-03-17T08:10:35+00:00"
+            "time": "2024-09-29T15:01:53+00:00"
         },
         {
             "name": "nunomaduro/collision",
-            "version": "v6.4.0",
+            "version": "v8.5.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/nunomaduro/collision.git",
-                "reference": "f05978827b9343cba381ca05b8c7deee346b6015"
+                "reference": "f5c101b929c958e849a633283adff296ed5f38f5"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/nunomaduro/collision/zipball/f05978827b9343cba381ca05b8c7deee346b6015",
-                "reference": "f05978827b9343cba381ca05b8c7deee346b6015",
+                "url": "https://api.github.com/repos/nunomaduro/collision/zipball/f5c101b929c958e849a633283adff296ed5f38f5",
+                "reference": "f5c101b929c958e849a633283adff296ed5f38f5",
                 "shasum": ""
             },
             "require": {
-                "filp/whoops": "^2.14.5",
-                "php": "^8.0.0",
-                "symfony/console": "^6.0.2"
+                "filp/whoops": "^2.16.0",
+                "nunomaduro/termwind": "^2.1.0",
+                "php": "^8.2.0",
+                "symfony/console": "^7.1.5"
+            },
+            "conflict": {
+                "laravel/framework": "<11.0.0 || >=12.0.0",
+                "phpunit/phpunit": "<10.5.1 || >=12.0.0"
             },
             "require-dev": {
-                "brianium/paratest": "^6.4.1",
-                "laravel/framework": "^9.26.1",
-                "laravel/pint": "^1.1.1",
-                "nunomaduro/larastan": "^1.0.3",
-                "nunomaduro/mock-final-classes": "^1.1.0",
-                "orchestra/testbench": "^7.7",
-                "phpunit/phpunit": "^9.5.23",
-                "spatie/ignition": "^1.4.1"
+                "larastan/larastan": "^2.9.8",
+                "laravel/framework": "^11.28.0",
+                "laravel/pint": "^1.18.1",
+                "laravel/sail": "^1.36.0",
+                "laravel/sanctum": "^4.0.3",
+                "laravel/tinker": "^2.10.0",
+                "orchestra/testbench-core": "^9.5.3",
+                "pestphp/pest": "^2.36.0 || ^3.4.0",
+                "sebastian/environment": "^6.1.0 || ^7.2.0"
             },
             "type": "library",
             "extra": {
-                "branch-alias": {
-                    "dev-develop": "6.x-dev"
-                },
                 "laravel": {
                     "providers": [
                         "NunoMaduro\\Collision\\Adapters\\Laravel\\CollisionServiceProvider"
                     ]
+                },
+                "branch-alias": {
+                    "dev-8.x": "8.x-dev"
                 }
             },
             "autoload": {
+                "files": [
+                    "./src/Adapters/Phpunit/Autoload.php"
+                ],
                 "psr-4": {
                     "NunoMaduro\\Collision\\": "src/"
                 }
@@ -5268,37 +5288,35 @@
                     "type": "patreon"
                 }
             ],
-            "time": "2023-01-03T12:54:54+00:00"
+            "time": "2024-10-15T16:06:32+00:00"
         },
         {
             "name": "nunomaduro/termwind",
-            "version": "v1.15.1",
+            "version": "v2.3.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/nunomaduro/termwind.git",
-                "reference": "8ab0b32c8caa4a2e09700ea32925441385e4a5dc"
+                "reference": "52915afe6a1044e8b9cee1bcff836fb63acf9cda"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/nunomaduro/termwind/zipball/8ab0b32c8caa4a2e09700ea32925441385e4a5dc",
-                "reference": "8ab0b32c8caa4a2e09700ea32925441385e4a5dc",
+                "url": "https://api.github.com/repos/nunomaduro/termwind/zipball/52915afe6a1044e8b9cee1bcff836fb63acf9cda",
+                "reference": "52915afe6a1044e8b9cee1bcff836fb63acf9cda",
                 "shasum": ""
             },
             "require": {
                 "ext-mbstring": "*",
-                "php": "^8.0",
-                "symfony/console": "^5.3.0|^6.0.0"
+                "php": "^8.2",
+                "symfony/console": "^7.1.8"
             },
             "require-dev": {
-                "ergebnis/phpstan-rules": "^1.0.",
-                "illuminate/console": "^8.0|^9.0",
-                "illuminate/support": "^8.0|^9.0",
-                "laravel/pint": "^1.0.0",
-                "pestphp/pest": "^1.21.0",
-                "pestphp/pest-plugin-mock": "^1.0",
-                "phpstan/phpstan": "^1.4.6",
-                "phpstan/phpstan-strict-rules": "^1.1.0",
-                "symfony/var-dumper": "^5.2.7|^6.0.0",
+                "illuminate/console": "^11.33.2",
+                "laravel/pint": "^1.18.2",
+                "mockery/mockery": "^1.6.12",
+                "pestphp/pest": "^2.36.0",
+                "phpstan/phpstan": "^1.12.11",
+                "phpstan/phpstan-strict-rules": "^1.6.1",
+                "symfony/var-dumper": "^7.1.8",
                 "thecodingmachine/phpstan-strict-rules": "^1.0.0"
             },
             "type": "library",
@@ -5307,6 +5325,9 @@
                     "providers": [
                         "Termwind\\Laravel\\TermwindServiceProvider"
                     ]
+                },
+                "branch-alias": {
+                    "dev-2.x": "2.x-dev"
                 }
             },
             "autoload": {
@@ -5338,7 +5359,7 @@
             ],
             "support": {
                 "issues": "https://github.com/nunomaduro/termwind/issues",
-                "source": "https://github.com/nunomaduro/termwind/tree/v1.15.1"
+                "source": "https://github.com/nunomaduro/termwind/tree/v2.3.0"
             },
             "funding": [
                 {
@@ -5354,20 +5375,20 @@
                     "type": "github"
                 }
             ],
-            "time": "2023-02-08T01:06:31+00:00"
+            "time": "2024-11-21T10:39:51+00:00"
         },
         {
             "name": "nyholm/psr7",
-            "version": "1.8.1",
+            "version": "1.8.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/Nyholm/psr7.git",
-                "reference": "aa5fc277a4f5508013d571341ade0c3886d4d00e"
+                "reference": "a71f2b11690f4b24d099d6b16690a90ae14fc6f3"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/Nyholm/psr7/zipball/aa5fc277a4f5508013d571341ade0c3886d4d00e",
-                "reference": "aa5fc277a4f5508013d571341ade0c3886d4d00e",
+                "url": "https://api.github.com/repos/Nyholm/psr7/zipball/a71f2b11690f4b24d099d6b16690a90ae14fc6f3",
+                "reference": "a71f2b11690f4b24d099d6b16690a90ae14fc6f3",
                 "shasum": ""
             },
             "require": {
@@ -5420,7 +5441,7 @@
             ],
             "support": {
                 "issues": "https://github.com/Nyholm/psr7/issues",
-                "source": "https://github.com/Nyholm/psr7/tree/1.8.1"
+                "source": "https://github.com/Nyholm/psr7/tree/1.8.2"
             },
             "funding": [
                 {
@@ -5432,7 +5453,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2023-11-13T09:31:12+00:00"
+            "time": "2024-09-09T07:06:30+00:00"
         },
         {
             "name": "okvpn/clock-lts",
@@ -5557,6 +5578,135 @@
             ],
             "time": "2024-05-30T15:14:26+00:00"
         },
+        {
+            "name": "onnov/detect-encoding",
+            "version": "v2.0.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/onnov/detect-encoding.git",
+                "reference": "6a8159ac3e6178ae043244b9d66a9b2701121e07"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/onnov/detect-encoding/zipball/6a8159ac3e6178ae043244b9d66a9b2701121e07",
+                "reference": "6a8159ac3e6178ae043244b9d66a9b2701121e07",
+                "shasum": ""
+            },
+            "require": {
+                "ext-iconv": "*",
+                "php": ">=7.3"
+            },
+            "require-dev": {
+                "infection/infection": "*",
+                "phpbench/phpbench": "*",
+                "phpcompatibility/php-compatibility": "*",
+                "phpmd/phpmd": "*",
+                "phpstan/phpstan": "*",
+                "phpstan/phpstan-strict-rules": "*",
+                "phpunit/phpunit": "*",
+                "roave/backward-compatibility-check": "*",
+                "squizlabs/php_codesniffer": "*"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "Onnov\\DetectEncoding\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "onnov",
+                    "email": "oblnn@yandex.ru"
+                }
+            ],
+            "description": "Text encoding definition class instead of mb_detect_encoding. Defines: utf-8, windows-1251, koi8-r, iso-8859-5, ibm866, .....",
+            "homepage": "https://github.com/onnov/detect-encoding",
+            "keywords": [
+                "cyrillic",
+                "encoding",
+                "ibm866",
+                "iconv",
+                "iso-8859-5",
+                "koi8-r",
+                "mb_detect_encoding",
+                "utf-8",
+                "windows-1251"
+            ],
+            "support": {
+                "issues": "https://github.com/onnov/detect-encoding/issues",
+                "source": "https://github.com/onnov/detect-encoding/tree/v2.0.0"
+            },
+            "time": "2021-01-04T14:29:34+00:00"
+        },
+        {
+            "name": "osa-eg/laravel-teams-notification",
+            "version": "v2.1.2",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/osa-eg/laravel-teams-notification.git",
+                "reference": "76173689930aca92b5174a3b102e705279192c0f"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/osa-eg/laravel-teams-notification/zipball/76173689930aca92b5174a3b102e705279192c0f",
+                "reference": "76173689930aca92b5174a3b102e705279192c0f",
+                "shasum": ""
+            },
+            "require": {
+                "guzzlehttp/guzzle": ">=6.5",
+                "illuminate/support": "^5.5 || ^6.0 || ^7.0 || ^8.0 || ^9.0 || ^10.0 || ^11.0",
+                "monolog/monolog": ">=1.0",
+                "php": ">=7.0"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^8.5"
+            },
+            "type": "library",
+            "extra": {
+                "laravel": {
+                    "providers": [
+                        "Osama\\LaravelTeamsNotification\\LaravelTeamsNotificationServiceProvider"
+                    ]
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Osama\\LaravelTeamsNotification\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Osama Saad",
+                    "email": "osaad96eg@gmail.com"
+                }
+            ],
+            "description": "A Laravel package to send notifications to Microsoft Teams",
+            "keywords": [
+                "Teams",
+                "adaptive-card",
+                "laravel",
+                "logging",
+                "microsoft-teams-workflow",
+                "notification",
+                "teams-connector",
+                "teams-webhock",
+                "teams-workflow",
+                "teams_logging"
+            ],
+            "support": {
+                "issues": "https://github.com/osa-eg/laravel-teams-notification/issues",
+                "source": "https://github.com/osa-eg/laravel-teams-notification/tree/v2.1.2"
+            },
+            "time": "2024-09-23T05:24:48+00:00"
+        },
         {
             "name": "paragonie/constant_time_encoding",
             "version": "v2.7.0",
@@ -5850,6 +6000,76 @@
             },
             "time": "2024-04-08T12:52:34+00:00"
         },
+        {
+            "name": "php-debugbar/php-debugbar",
+            "version": "v2.1.6",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/php-debugbar/php-debugbar.git",
+                "reference": "16fa68da5617220594aa5e33fa9de415f94784a0"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/php-debugbar/php-debugbar/zipball/16fa68da5617220594aa5e33fa9de415f94784a0",
+                "reference": "16fa68da5617220594aa5e33fa9de415f94784a0",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^8",
+                "psr/log": "^1|^2|^3",
+                "symfony/var-dumper": "^4|^5|^6|^7"
+            },
+            "require-dev": {
+                "dbrekelmans/bdi": "^1",
+                "phpunit/phpunit": "^8|^9",
+                "symfony/panther": "^1|^2.1",
+                "twig/twig": "^1.38|^2.7|^3.0"
+            },
+            "suggest": {
+                "kriswallsmith/assetic": "The best way to manage assets",
+                "monolog/monolog": "Log using Monolog",
+                "predis/predis": "Redis storage"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.0-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "DebugBar\\": "src/DebugBar/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Maxime Bouroumeau-Fuseau",
+                    "email": "maxime.bouroumeau@gmail.com",
+                    "homepage": "http://maximebf.com"
+                },
+                {
+                    "name": "Barry vd. Heuvel",
+                    "email": "barryvdh@gmail.com"
+                }
+            ],
+            "description": "Debug bar in the browser for php application",
+            "homepage": "https://github.com/php-debugbar/php-debugbar",
+            "keywords": [
+                "debug",
+                "debug bar",
+                "debugbar",
+                "dev"
+            ],
+            "support": {
+                "issues": "https://github.com/php-debugbar/php-debugbar/issues",
+                "source": "https://github.com/php-debugbar/php-debugbar/tree/v2.1.6"
+            },
+            "time": "2025-02-21T17:47:03+00:00"
+        },
         {
             "name": "phpdocumentor/reflection-common",
             "version": "2.2.0",
@@ -5905,16 +6125,16 @@
         },
         {
             "name": "phpdocumentor/reflection-docblock",
-            "version": "5.4.1",
+            "version": "5.6.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phpDocumentor/ReflectionDocBlock.git",
-                "reference": "9d07b3f7fdcf5efec5d1609cba3c19c5ea2bdc9c"
+                "reference": "e5e784149a09bd69d9a5e3b01c5cbd2e2bd653d8"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/9d07b3f7fdcf5efec5d1609cba3c19c5ea2bdc9c",
-                "reference": "9d07b3f7fdcf5efec5d1609cba3c19c5ea2bdc9c",
+                "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/e5e784149a09bd69d9a5e3b01c5cbd2e2bd653d8",
+                "reference": "e5e784149a09bd69d9a5e3b01c5cbd2e2bd653d8",
                 "shasum": ""
             },
             "require": {
@@ -5923,17 +6143,17 @@
                 "php": "^7.4 || ^8.0",
                 "phpdocumentor/reflection-common": "^2.2",
                 "phpdocumentor/type-resolver": "^1.7",
-                "phpstan/phpdoc-parser": "^1.7",
+                "phpstan/phpdoc-parser": "^1.7|^2.0",
                 "webmozart/assert": "^1.9.1"
             },
             "require-dev": {
-                "mockery/mockery": "~1.3.5",
+                "mockery/mockery": "~1.3.5 || ~1.6.0",
                 "phpstan/extension-installer": "^1.1",
                 "phpstan/phpstan": "^1.8",
                 "phpstan/phpstan-mockery": "^1.1",
                 "phpstan/phpstan-webmozart-assert": "^1.2",
                 "phpunit/phpunit": "^9.5",
-                "vimeo/psalm": "^5.13"
+                "psalm/phar": "^5.26"
             },
             "type": "library",
             "extra": {
@@ -5963,29 +6183,29 @@
             "description": "With this component, a library can provide support for annotations via DocBlocks or otherwise retrieve information that is embedded in a DocBlock.",
             "support": {
                 "issues": "https://github.com/phpDocumentor/ReflectionDocBlock/issues",
-                "source": "https://github.com/phpDocumentor/ReflectionDocBlock/tree/5.4.1"
+                "source": "https://github.com/phpDocumentor/ReflectionDocBlock/tree/5.6.1"
             },
-            "time": "2024-05-21T05:55:05+00:00"
+            "time": "2024-12-07T09:39:29+00:00"
         },
         {
             "name": "phpdocumentor/type-resolver",
-            "version": "1.8.2",
+            "version": "1.10.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phpDocumentor/TypeResolver.git",
-                "reference": "153ae662783729388a584b4361f2545e4d841e3c"
+                "reference": "679e3ce485b99e84c775d28e2e96fade9a7fb50a"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/153ae662783729388a584b4361f2545e4d841e3c",
-                "reference": "153ae662783729388a584b4361f2545e4d841e3c",
+                "url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/679e3ce485b99e84c775d28e2e96fade9a7fb50a",
+                "reference": "679e3ce485b99e84c775d28e2e96fade9a7fb50a",
                 "shasum": ""
             },
             "require": {
                 "doctrine/deprecations": "^1.0",
                 "php": "^7.3 || ^8.0",
                 "phpdocumentor/reflection-common": "^2.0",
-                "phpstan/phpdoc-parser": "^1.13"
+                "phpstan/phpdoc-parser": "^1.18|^2.0"
             },
             "require-dev": {
                 "ext-tokenizer": "*",
@@ -6021,22 +6241,22 @@
             "description": "A PSR-5 based resolver of Class names, Types and Structural Element Names",
             "support": {
                 "issues": "https://github.com/phpDocumentor/TypeResolver/issues",
-                "source": "https://github.com/phpDocumentor/TypeResolver/tree/1.8.2"
+                "source": "https://github.com/phpDocumentor/TypeResolver/tree/1.10.0"
             },
-            "time": "2024-02-23T11:10:43+00:00"
+            "time": "2024-11-09T15:12:26+00:00"
         },
         {
             "name": "phpoption/phpoption",
-            "version": "1.9.2",
+            "version": "1.9.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/schmittjoh/php-option.git",
-                "reference": "80735db690fe4fc5c76dfa7f9b770634285fa820"
+                "reference": "e3fac8b24f56113f7cb96af14958c0dd16330f54"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/schmittjoh/php-option/zipball/80735db690fe4fc5c76dfa7f9b770634285fa820",
-                "reference": "80735db690fe4fc5c76dfa7f9b770634285fa820",
+                "url": "https://api.github.com/repos/schmittjoh/php-option/zipball/e3fac8b24f56113f7cb96af14958c0dd16330f54",
+                "reference": "e3fac8b24f56113f7cb96af14958c0dd16330f54",
                 "shasum": ""
             },
             "require": {
@@ -6044,13 +6264,13 @@
             },
             "require-dev": {
                 "bamarni/composer-bin-plugin": "^1.8.2",
-                "phpunit/phpunit": "^8.5.34 || ^9.6.13 || ^10.4.2"
+                "phpunit/phpunit": "^8.5.39 || ^9.6.20 || ^10.5.28"
             },
             "type": "library",
             "extra": {
                 "bamarni-bin": {
                     "bin-links": true,
-                    "forward-command": true
+                    "forward-command": false
                 },
                 "branch-alias": {
                     "dev-master": "1.9-dev"
@@ -6086,7 +6306,7 @@
             ],
             "support": {
                 "issues": "https://github.com/schmittjoh/php-option/issues",
-                "source": "https://github.com/schmittjoh/php-option/tree/1.9.2"
+                "source": "https://github.com/schmittjoh/php-option/tree/1.9.3"
             },
             "funding": [
                 {
@@ -6098,20 +6318,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2023-11-12T21:59:55+00:00"
+            "time": "2024-07-20T21:41:07+00:00"
         },
         {
             "name": "phpseclib/phpseclib",
-            "version": "3.0.38",
+            "version": "3.0.43",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phpseclib/phpseclib.git",
-                "reference": "b18b8788e51156c4dd97b7f220a31149a0052067"
+                "reference": "709ec107af3cb2f385b9617be72af8cf62441d02"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpseclib/phpseclib/zipball/b18b8788e51156c4dd97b7f220a31149a0052067",
-                "reference": "b18b8788e51156c4dd97b7f220a31149a0052067",
+                "url": "https://api.github.com/repos/phpseclib/phpseclib/zipball/709ec107af3cb2f385b9617be72af8cf62441d02",
+                "reference": "709ec107af3cb2f385b9617be72af8cf62441d02",
                 "shasum": ""
             },
             "require": {
@@ -6192,7 +6412,7 @@
             ],
             "support": {
                 "issues": "https://github.com/phpseclib/phpseclib/issues",
-                "source": "https://github.com/phpseclib/phpseclib/tree/3.0.38"
+                "source": "https://github.com/phpseclib/phpseclib/tree/3.0.43"
             },
             "funding": [
                 {
@@ -6208,30 +6428,31 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-06-17T10:11:32+00:00"
+            "time": "2024-12-14T21:12:59+00:00"
         },
         {
             "name": "phpspec/prophecy",
-            "version": "v1.19.0",
+            "version": "v1.20.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phpspec/prophecy.git",
-                "reference": "67a759e7d8746d501c41536ba40cd9c0a07d6a87"
+                "reference": "a0165c648cab6a80311c74ffc708a07bb53ecc93"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpspec/prophecy/zipball/67a759e7d8746d501c41536ba40cd9c0a07d6a87",
-                "reference": "67a759e7d8746d501c41536ba40cd9c0a07d6a87",
+                "url": "https://api.github.com/repos/phpspec/prophecy/zipball/a0165c648cab6a80311c74ffc708a07bb53ecc93",
+                "reference": "a0165c648cab6a80311c74ffc708a07bb53ecc93",
                 "shasum": ""
             },
             "require": {
                 "doctrine/instantiator": "^1.2 || ^2.0",
-                "php": "^7.2 || 8.0.* || 8.1.* || 8.2.* || 8.3.*",
+                "php": "^7.2 || 8.0.* || 8.1.* || 8.2.* || 8.3.* || 8.4.*",
                 "phpdocumentor/reflection-docblock": "^5.2",
                 "sebastian/comparator": "^3.0 || ^4.0 || ^5.0 || ^6.0",
                 "sebastian/recursion-context": "^3.0 || ^4.0 || ^5.0 || ^6.0"
             },
             "require-dev": {
+                "friendsofphp/php-cs-fixer": "^3.40",
                 "phpspec/phpspec": "^6.0 || ^7.0",
                 "phpstan/phpstan": "^1.9",
                 "phpunit/phpunit": "^8.0 || ^9.0 || ^10.0"
@@ -6275,22 +6496,22 @@
             ],
             "support": {
                 "issues": "https://github.com/phpspec/prophecy/issues",
-                "source": "https://github.com/phpspec/prophecy/tree/v1.19.0"
+                "source": "https://github.com/phpspec/prophecy/tree/v1.20.0"
             },
-            "time": "2024-02-29T11:52:51+00:00"
+            "time": "2024-11-19T13:12:41+00:00"
         },
         {
             "name": "phpstan/phpdoc-parser",
-            "version": "1.29.1",
+            "version": "1.33.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phpstan/phpdoc-parser.git",
-                "reference": "fcaefacf2d5c417e928405b71b400d4ce10daaf4"
+                "reference": "82a311fd3690fb2bf7b64d5c98f912b3dd746140"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpstan/phpdoc-parser/zipball/fcaefacf2d5c417e928405b71b400d4ce10daaf4",
-                "reference": "fcaefacf2d5c417e928405b71b400d4ce10daaf4",
+                "url": "https://api.github.com/repos/phpstan/phpdoc-parser/zipball/82a311fd3690fb2bf7b64d5c98f912b3dd746140",
+                "reference": "82a311fd3690fb2bf7b64d5c98f912b3dd746140",
                 "shasum": ""
             },
             "require": {
@@ -6322,30 +6543,30 @@
             "description": "PHPDoc parser with support for nullable, intersection and generic types",
             "support": {
                 "issues": "https://github.com/phpstan/phpdoc-parser/issues",
-                "source": "https://github.com/phpstan/phpdoc-parser/tree/1.29.1"
+                "source": "https://github.com/phpstan/phpdoc-parser/tree/1.33.0"
             },
-            "time": "2024-05-31T08:52:43+00:00"
+            "time": "2024-10-13T11:25:22+00:00"
         },
         {
             "name": "pragmarx/google2fa",
-            "version": "v8.0.1",
+            "version": "v8.0.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/antonioribeiro/google2fa.git",
-                "reference": "80c3d801b31fe165f8fe99ea085e0a37834e1be3"
+                "reference": "6f8d87ebd5afbf7790bde1ffc7579c7c705e0fad"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/antonioribeiro/google2fa/zipball/80c3d801b31fe165f8fe99ea085e0a37834e1be3",
-                "reference": "80c3d801b31fe165f8fe99ea085e0a37834e1be3",
+                "url": "https://api.github.com/repos/antonioribeiro/google2fa/zipball/6f8d87ebd5afbf7790bde1ffc7579c7c705e0fad",
+                "reference": "6f8d87ebd5afbf7790bde1ffc7579c7c705e0fad",
                 "shasum": ""
             },
             "require": {
-                "paragonie/constant_time_encoding": "^1.0|^2.0",
+                "paragonie/constant_time_encoding": "^1.0|^2.0|^3.0",
                 "php": "^7.1|^8.0"
             },
             "require-dev": {
-                "phpstan/phpstan": "^0.12.18",
+                "phpstan/phpstan": "^1.9",
                 "phpunit/phpunit": "^7.5.15|^8.5|^9.0"
             },
             "type": "library",
@@ -6374,9 +6595,9 @@
             ],
             "support": {
                 "issues": "https://github.com/antonioribeiro/google2fa/issues",
-                "source": "https://github.com/antonioribeiro/google2fa/tree/v8.0.1"
+                "source": "https://github.com/antonioribeiro/google2fa/tree/v8.0.3"
             },
-            "time": "2022-06-13T21:57:56+00:00"
+            "time": "2024-09-05T11:56:40+00:00"
         },
         {
             "name": "pragmarx/google2fa-laravel",
@@ -6407,20 +6628,20 @@
             },
             "type": "library",
             "extra": {
+                "laravel": {
+                    "aliases": {
+                        "Google2FA": "PragmaRX\\Google2FALaravel\\Facade"
+                    },
+                    "providers": [
+                        "PragmaRX\\Google2FALaravel\\ServiceProvider"
+                    ]
+                },
                 "component": "package",
                 "frameworks": [
                     "Laravel"
                 ],
                 "branch-alias": {
                     "dev-master": "0.2-dev"
-                },
-                "laravel": {
-                    "providers": [
-                        "PragmaRX\\Google2FALaravel\\ServiceProvider"
-                    ],
-                    "aliases": {
-                        "Google2FA": "PragmaRX\\Google2FALaravel\\Facade"
-                    }
                 }
             },
             "autoload": {
@@ -6877,16 +7098,16 @@
         },
         {
             "name": "psr/log",
-            "version": "3.0.0",
+            "version": "3.0.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/php-fig/log.git",
-                "reference": "fe5ea303b0887d5caefd3d431c3e61ad47037001"
+                "reference": "f16e1d5863e37f8d8c2a01719f5b34baa2b714d3"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/php-fig/log/zipball/fe5ea303b0887d5caefd3d431c3e61ad47037001",
-                "reference": "fe5ea303b0887d5caefd3d431c3e61ad47037001",
+                "url": "https://api.github.com/repos/php-fig/log/zipball/f16e1d5863e37f8d8c2a01719f5b34baa2b714d3",
+                "reference": "f16e1d5863e37f8d8c2a01719f5b34baa2b714d3",
                 "shasum": ""
             },
             "require": {
@@ -6921,9 +7142,9 @@
                 "psr-3"
             ],
             "support": {
-                "source": "https://github.com/php-fig/log/tree/3.0.0"
+                "source": "https://github.com/php-fig/log/tree/3.0.2"
             },
-            "time": "2021-07-14T16:46:02+00:00"
+            "time": "2024-09-11T13:17:53+00:00"
         },
         {
             "name": "psr/simple-cache",
@@ -6978,16 +7199,16 @@
         },
         {
             "name": "psy/psysh",
-            "version": "v0.12.4",
+            "version": "v0.12.7",
             "source": {
                 "type": "git",
                 "url": "https://github.com/bobthecow/psysh.git",
-                "reference": "2fd717afa05341b4f8152547f142cd2f130f6818"
+                "reference": "d73fa3c74918ef4522bb8a3bf9cab39161c4b57c"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/bobthecow/psysh/zipball/2fd717afa05341b4f8152547f142cd2f130f6818",
-                "reference": "2fd717afa05341b4f8152547f142cd2f130f6818",
+                "url": "https://api.github.com/repos/bobthecow/psysh/zipball/d73fa3c74918ef4522bb8a3bf9cab39161c4b57c",
+                "reference": "d73fa3c74918ef4522bb8a3bf9cab39161c4b57c",
                 "shasum": ""
             },
             "require": {
@@ -7014,12 +7235,12 @@
             ],
             "type": "library",
             "extra": {
-                "branch-alias": {
-                    "dev-main": "0.12.x-dev"
-                },
                 "bamarni-bin": {
                     "bin-links": false,
                     "forward-command": false
+                },
+                "branch-alias": {
+                    "dev-main": "0.12.x-dev"
                 }
             },
             "autoload": {
@@ -7051,9 +7272,9 @@
             ],
             "support": {
                 "issues": "https://github.com/bobthecow/psysh/issues",
-                "source": "https://github.com/bobthecow/psysh/tree/v0.12.4"
+                "source": "https://github.com/bobthecow/psysh/tree/v0.12.7"
             },
-            "time": "2024-06-10T01:18:23+00:00"
+            "time": "2024-12-10T01:58:33+00:00"
         },
         {
             "name": "ralouphie/getallheaders",
@@ -7282,16 +7503,16 @@
         },
         {
             "name": "robrichards/xmlseclibs",
-            "version": "3.1.1",
+            "version": "3.1.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/robrichards/xmlseclibs.git",
-                "reference": "f8f19e58f26cdb42c54b214ff8a820760292f8df"
+                "reference": "2bdfd742624d739dfadbd415f00181b4a77aaf07"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/robrichards/xmlseclibs/zipball/f8f19e58f26cdb42c54b214ff8a820760292f8df",
-                "reference": "f8f19e58f26cdb42c54b214ff8a820760292f8df",
+                "url": "https://api.github.com/repos/robrichards/xmlseclibs/zipball/2bdfd742624d739dfadbd415f00181b4a77aaf07",
+                "reference": "2bdfd742624d739dfadbd415f00181b4a77aaf07",
                 "shasum": ""
             },
             "require": {
@@ -7318,28 +7539,28 @@
             ],
             "support": {
                 "issues": "https://github.com/robrichards/xmlseclibs/issues",
-                "source": "https://github.com/robrichards/xmlseclibs/tree/3.1.1"
+                "source": "https://github.com/robrichards/xmlseclibs/tree/3.1.3"
             },
-            "time": "2020-09-05T13:00:25+00:00"
+            "time": "2024-11-20T21:13:56+00:00"
         },
         {
             "name": "rollbar/rollbar",
-            "version": "v4.0.2",
+            "version": "v4.1.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/rollbar/rollbar-php.git",
-                "reference": "6966a4c97c170298108f5e5b543c2710658f8fe0"
+                "reference": "146216bbfde503632c6969a7c334c8a63c98f50e"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/rollbar/rollbar-php/zipball/6966a4c97c170298108f5e5b543c2710658f8fe0",
-                "reference": "6966a4c97c170298108f5e5b543c2710658f8fe0",
+                "url": "https://api.github.com/repos/rollbar/rollbar-php/zipball/146216bbfde503632c6969a7c334c8a63c98f50e",
+                "reference": "146216bbfde503632c6969a7c334c8a63c98f50e",
                 "shasum": ""
             },
             "require": {
                 "ext-curl": "*",
                 "monolog/monolog": "^2 || ^3",
-                "php": ">=8.0.0 <9.0",
+                "php": ">=8.1.0 <9.0",
                 "psr/log": "^1 || ^2 || ^3"
             },
             "require-dev": {
@@ -7381,28 +7602,28 @@
             "support": {
                 "email": "support@rollbar.com",
                 "issues": "https://github.com/rollbar/rollbar-php/issues",
-                "source": "https://github.com/rollbar/rollbar-php/tree/v4.0.2"
+                "source": "https://github.com/rollbar/rollbar-php/tree/v4.1.1"
             },
-            "time": "2023-12-22T21:40:31+00:00"
+            "time": "2025-03-21T19:07:30+00:00"
         },
         {
             "name": "rollbar/rollbar-laravel",
-            "version": "v8.0.1",
+            "version": "v8.1.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/rollbar/rollbar-php-laravel.git",
-                "reference": "69ecc7c19b54b1d88bf8a2bdfa56277500cc41f6"
+                "reference": "fbe96ea28601294aa7dc41cd16db62cddddeb0c2"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/rollbar/rollbar-php-laravel/zipball/69ecc7c19b54b1d88bf8a2bdfa56277500cc41f6",
-                "reference": "69ecc7c19b54b1d88bf8a2bdfa56277500cc41f6",
+                "url": "https://api.github.com/repos/rollbar/rollbar-php-laravel/zipball/fbe96ea28601294aa7dc41cd16db62cddddeb0c2",
+                "reference": "fbe96ea28601294aa7dc41cd16db62cddddeb0c2",
                 "shasum": ""
             },
             "require": {
-                "illuminate/support": "^10.0|^11.0",
+                "illuminate/support": "^10.0|^11.0|^12.0",
                 "php": "^8.1",
-                "rollbar/rollbar": "^4.0"
+                "rollbar/rollbar": "v4.1.1"
             },
             "require-dev": {
                 "mockery/mockery": "^1",
@@ -7414,12 +7635,12 @@
             "type": "library",
             "extra": {
                 "laravel": {
-                    "providers": [
-                        "Rollbar\\Laravel\\RollbarServiceProvider"
-                    ],
                     "aliases": {
                         "Rollbar": "Rollbar\\Laravel\\Facades\\Rollbar"
-                    }
+                    },
+                    "providers": [
+                        "Rollbar\\Laravel\\RollbarServiceProvider"
+                    ]
                 }
             },
             "autoload": {
@@ -7453,30 +7674,30 @@
             ],
             "support": {
                 "issues": "https://github.com/rollbar/rollbar-php-laravel/issues",
-                "source": "https://github.com/rollbar/rollbar-php-laravel/tree/v8.0.1"
+                "source": "https://github.com/rollbar/rollbar-php-laravel/tree/v8.1.2"
             },
-            "time": "2024-02-13T21:58:17+00:00"
+            "time": "2025-03-21T19:26:39+00:00"
         },
         {
             "name": "sabberworm/php-css-parser",
-            "version": "v8.5.1",
+            "version": "v8.7.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/MyIntervals/PHP-CSS-Parser.git",
-                "reference": "4a3d572b0f8b28bb6fd016ae8bbfc445facef152"
+                "reference": "f414ff953002a9b18e3a116f5e462c56f21237cf"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/MyIntervals/PHP-CSS-Parser/zipball/4a3d572b0f8b28bb6fd016ae8bbfc445facef152",
-                "reference": "4a3d572b0f8b28bb6fd016ae8bbfc445facef152",
+                "url": "https://api.github.com/repos/MyIntervals/PHP-CSS-Parser/zipball/f414ff953002a9b18e3a116f5e462c56f21237cf",
+                "reference": "f414ff953002a9b18e3a116f5e462c56f21237cf",
                 "shasum": ""
             },
             "require": {
                 "ext-iconv": "*",
-                "php": ">=5.6.20"
+                "php": "^5.6.20 || ^7.0.0 || ~8.0.0 || ~8.1.0 || ~8.2.0 || ~8.3.0 || ~8.4.0"
             },
             "require-dev": {
-                "phpunit/phpunit": "^5.7.27"
+                "phpunit/phpunit": "5.7.27 || 6.5.14 || 7.5.20 || 8.5.40"
             },
             "suggest": {
                 "ext-mbstring": "for parsing UTF-8 CSS"
@@ -7518,36 +7739,38 @@
             ],
             "support": {
                 "issues": "https://github.com/MyIntervals/PHP-CSS-Parser/issues",
-                "source": "https://github.com/MyIntervals/PHP-CSS-Parser/tree/v8.5.1"
+                "source": "https://github.com/MyIntervals/PHP-CSS-Parser/tree/v8.7.0"
             },
-            "time": "2024-02-15T16:41:13+00:00"
+            "time": "2024-10-27T17:38:32+00:00"
         },
         {
             "name": "sebastian/comparator",
-            "version": "4.0.8",
+            "version": "5.0.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/comparator.git",
-                "reference": "fa0f136dd2334583309d32b62544682ee972b51a"
+                "reference": "a18251eb0b7a2dcd2f7aa3d6078b18545ef0558e"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/fa0f136dd2334583309d32b62544682ee972b51a",
-                "reference": "fa0f136dd2334583309d32b62544682ee972b51a",
+                "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/a18251eb0b7a2dcd2f7aa3d6078b18545ef0558e",
+                "reference": "a18251eb0b7a2dcd2f7aa3d6078b18545ef0558e",
                 "shasum": ""
             },
             "require": {
-                "php": ">=7.3",
-                "sebastian/diff": "^4.0",
-                "sebastian/exporter": "^4.0"
+                "ext-dom": "*",
+                "ext-mbstring": "*",
+                "php": ">=8.1",
+                "sebastian/diff": "^5.0",
+                "sebastian/exporter": "^5.0"
             },
             "require-dev": {
-                "phpunit/phpunit": "^9.3"
+                "phpunit/phpunit": "^10.5"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "4.0-dev"
+                    "dev-main": "5.0-dev"
                 }
             },
             "autoload": {
@@ -7586,7 +7809,8 @@
             ],
             "support": {
                 "issues": "https://github.com/sebastianbergmann/comparator/issues",
-                "source": "https://github.com/sebastianbergmann/comparator/tree/4.0.8"
+                "security": "https://github.com/sebastianbergmann/comparator/security/policy",
+                "source": "https://github.com/sebastianbergmann/comparator/tree/5.0.3"
             },
             "funding": [
                 {
@@ -7594,33 +7818,33 @@
                     "type": "github"
                 }
             ],
-            "time": "2022-09-14T12:41:17+00:00"
+            "time": "2024-10-18T14:56:07+00:00"
         },
         {
             "name": "sebastian/diff",
-            "version": "4.0.6",
+            "version": "5.1.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/diff.git",
-                "reference": "ba01945089c3a293b01ba9badc29ad55b106b0bc"
+                "reference": "c41e007b4b62af48218231d6c2275e4c9b975b2e"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/ba01945089c3a293b01ba9badc29ad55b106b0bc",
-                "reference": "ba01945089c3a293b01ba9badc29ad55b106b0bc",
+                "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/c41e007b4b62af48218231d6c2275e4c9b975b2e",
+                "reference": "c41e007b4b62af48218231d6c2275e4c9b975b2e",
                 "shasum": ""
             },
             "require": {
-                "php": ">=7.3"
+                "php": ">=8.1"
             },
             "require-dev": {
-                "phpunit/phpunit": "^9.3",
-                "symfony/process": "^4.2 || ^5"
+                "phpunit/phpunit": "^10.0",
+                "symfony/process": "^6.4"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "4.0-dev"
+                    "dev-main": "5.1-dev"
                 }
             },
             "autoload": {
@@ -7652,7 +7876,8 @@
             ],
             "support": {
                 "issues": "https://github.com/sebastianbergmann/diff/issues",
-                "source": "https://github.com/sebastianbergmann/diff/tree/4.0.6"
+                "security": "https://github.com/sebastianbergmann/diff/security/policy",
+                "source": "https://github.com/sebastianbergmann/diff/tree/5.1.1"
             },
             "funding": [
                 {
@@ -7660,34 +7885,34 @@
                     "type": "github"
                 }
             ],
-            "time": "2024-03-02T06:30:58+00:00"
+            "time": "2024-03-02T07:15:17+00:00"
         },
         {
             "name": "sebastian/exporter",
-            "version": "4.0.6",
+            "version": "5.1.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/exporter.git",
-                "reference": "78c00df8f170e02473b682df15bfcdacc3d32d72"
+                "reference": "955288482d97c19a372d3f31006ab3f37da47adf"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/78c00df8f170e02473b682df15bfcdacc3d32d72",
-                "reference": "78c00df8f170e02473b682df15bfcdacc3d32d72",
+                "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/955288482d97c19a372d3f31006ab3f37da47adf",
+                "reference": "955288482d97c19a372d3f31006ab3f37da47adf",
                 "shasum": ""
             },
             "require": {
-                "php": ">=7.3",
-                "sebastian/recursion-context": "^4.0"
+                "ext-mbstring": "*",
+                "php": ">=8.1",
+                "sebastian/recursion-context": "^5.0"
             },
             "require-dev": {
-                "ext-mbstring": "*",
-                "phpunit/phpunit": "^9.3"
+                "phpunit/phpunit": "^10.0"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "4.0-dev"
+                    "dev-main": "5.1-dev"
                 }
             },
             "autoload": {
@@ -7729,7 +7954,8 @@
             ],
             "support": {
                 "issues": "https://github.com/sebastianbergmann/exporter/issues",
-                "source": "https://github.com/sebastianbergmann/exporter/tree/4.0.6"
+                "security": "https://github.com/sebastianbergmann/exporter/security/policy",
+                "source": "https://github.com/sebastianbergmann/exporter/tree/5.1.2"
             },
             "funding": [
                 {
@@ -7737,32 +7963,32 @@
                     "type": "github"
                 }
             ],
-            "time": "2024-03-02T06:33:00+00:00"
+            "time": "2024-03-02T07:17:12+00:00"
         },
         {
             "name": "sebastian/recursion-context",
-            "version": "4.0.5",
+            "version": "5.0.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/recursion-context.git",
-                "reference": "e75bd0f07204fec2a0af9b0f3cfe97d05f92efc1"
+                "reference": "05909fb5bc7df4c52992396d0116aed689f93712"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/recursion-context/zipball/e75bd0f07204fec2a0af9b0f3cfe97d05f92efc1",
-                "reference": "e75bd0f07204fec2a0af9b0f3cfe97d05f92efc1",
+                "url": "https://api.github.com/repos/sebastianbergmann/recursion-context/zipball/05909fb5bc7df4c52992396d0116aed689f93712",
+                "reference": "05909fb5bc7df4c52992396d0116aed689f93712",
                 "shasum": ""
             },
             "require": {
-                "php": ">=7.3"
+                "php": ">=8.1"
             },
             "require-dev": {
-                "phpunit/phpunit": "^9.3"
+                "phpunit/phpunit": "^10.0"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "4.0-dev"
+                    "dev-main": "5.0-dev"
                 }
             },
             "autoload": {
@@ -7792,7 +8018,7 @@
             "homepage": "https://github.com/sebastianbergmann/recursion-context",
             "support": {
                 "issues": "https://github.com/sebastianbergmann/recursion-context/issues",
-                "source": "https://github.com/sebastianbergmann/recursion-context/tree/4.0.5"
+                "source": "https://github.com/sebastianbergmann/recursion-context/tree/5.0.0"
             },
             "funding": [
                 {
@@ -7800,31 +8026,31 @@
                     "type": "github"
                 }
             ],
-            "time": "2023-02-03T06:07:39+00:00"
+            "time": "2023-02-03T07:05:40+00:00"
         },
         {
             "name": "spatie/backtrace",
-            "version": "1.6.1",
+            "version": "1.7.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/spatie/backtrace.git",
-                "reference": "8373b9d51638292e3bfd736a9c19a654111b4a23"
+                "reference": "0f2477c520e3729de58e061b8192f161c99f770b"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/spatie/backtrace/zipball/8373b9d51638292e3bfd736a9c19a654111b4a23",
-                "reference": "8373b9d51638292e3bfd736a9c19a654111b4a23",
+                "url": "https://api.github.com/repos/spatie/backtrace/zipball/0f2477c520e3729de58e061b8192f161c99f770b",
+                "reference": "0f2477c520e3729de58e061b8192f161c99f770b",
                 "shasum": ""
             },
             "require": {
-                "php": "^7.3|^8.0"
+                "php": "^7.3 || ^8.0"
             },
             "require-dev": {
                 "ext-json": "*",
-                "laravel/serializable-closure": "^1.3",
-                "phpunit/phpunit": "^9.3",
-                "spatie/phpunit-snapshot-assertions": "^4.2",
-                "symfony/var-dumper": "^5.1"
+                "laravel/serializable-closure": "^1.3 || ^2.0",
+                "phpunit/phpunit": "^9.3 || ^11.4.3",
+                "spatie/phpunit-snapshot-assertions": "^4.2 || ^5.1.6",
+                "symfony/var-dumper": "^5.1 || ^6.0 || ^7.0"
             },
             "type": "library",
             "autoload": {
@@ -7851,7 +8077,7 @@
                 "spatie"
             ],
             "support": {
-                "source": "https://github.com/spatie/backtrace/tree/1.6.1"
+                "source": "https://github.com/spatie/backtrace/tree/1.7.1"
             },
             "funding": [
                 {
@@ -7863,20 +8089,20 @@
                     "type": "other"
                 }
             ],
-            "time": "2024-04-24T13:22:11+00:00"
+            "time": "2024-12-02T13:28:15+00:00"
         },
         {
             "name": "spatie/db-dumper",
-            "version": "3.6.0",
+            "version": "3.7.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/spatie/db-dumper.git",
-                "reference": "faca5056830bccea04eadf07e8074669cb9e905e"
+                "reference": "55d4d6710e1ab18c1e7ce2b22b8ad4bea2a30016"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/spatie/db-dumper/zipball/faca5056830bccea04eadf07e8074669cb9e905e",
-                "reference": "faca5056830bccea04eadf07e8074669cb9e905e",
+                "url": "https://api.github.com/repos/spatie/db-dumper/zipball/55d4d6710e1ab18c1e7ce2b22b8ad4bea2a30016",
+                "reference": "55d4d6710e1ab18c1e7ce2b22b8ad4bea2a30016",
                 "shasum": ""
             },
             "require": {
@@ -7914,7 +8140,7 @@
                 "spatie"
             ],
             "support": {
-                "source": "https://github.com/spatie/db-dumper/tree/3.6.0"
+                "source": "https://github.com/spatie/db-dumper/tree/3.7.1"
             },
             "funding": [
                 {
@@ -7926,20 +8152,20 @@
                     "type": "github"
                 }
             ],
-            "time": "2024-04-24T14:54:13+00:00"
+            "time": "2024-11-18T14:54:31+00:00"
         },
         {
             "name": "spatie/error-solutions",
-            "version": "1.0.1",
+            "version": "1.1.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/spatie/error-solutions.git",
-                "reference": "d60d4d2ef4b7701c86134ded959667cac6215233"
+                "reference": "d239a65235a1eb128dfa0a4e4c4ef032ea11b541"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/spatie/error-solutions/zipball/d60d4d2ef4b7701c86134ded959667cac6215233",
-                "reference": "d60d4d2ef4b7701c86134ded959667cac6215233",
+                "url": "https://api.github.com/repos/spatie/error-solutions/zipball/d239a65235a1eb128dfa0a4e4c4ef032ea11b541",
+                "reference": "d239a65235a1eb128dfa0a4e4c4ef032ea11b541",
                 "shasum": ""
             },
             "require": {
@@ -7992,7 +8218,7 @@
             ],
             "support": {
                 "issues": "https://github.com/spatie/error-solutions/issues",
-                "source": "https://github.com/spatie/error-solutions/tree/1.0.1"
+                "source": "https://github.com/spatie/error-solutions/tree/1.1.2"
             },
             "funding": [
                 {
@@ -8000,20 +8226,20 @@
                     "type": "github"
                 }
             ],
-            "time": "2024-06-21T10:09:00+00:00"
+            "time": "2024-12-11T09:51:56+00:00"
         },
         {
             "name": "spatie/flare-client-php",
-            "version": "1.7.0",
+            "version": "1.10.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/spatie/flare-client-php.git",
-                "reference": "097040ff51e660e0f6fc863684ac4b02c93fa234"
+                "reference": "140a42b2c5d59ac4ecf8f5b493386a4f2eb28272"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/spatie/flare-client-php/zipball/097040ff51e660e0f6fc863684ac4b02c93fa234",
-                "reference": "097040ff51e660e0f6fc863684ac4b02c93fa234",
+                "url": "https://api.github.com/repos/spatie/flare-client-php/zipball/140a42b2c5d59ac4ecf8f5b493386a4f2eb28272",
+                "reference": "140a42b2c5d59ac4ecf8f5b493386a4f2eb28272",
                 "shasum": ""
             },
             "require": {
@@ -8031,7 +8257,7 @@
                 "phpstan/extension-installer": "^1.1",
                 "phpstan/phpstan-deprecation-rules": "^1.0",
                 "phpstan/phpstan-phpunit": "^1.0",
-                "spatie/phpunit-snapshot-assertions": "^4.0|^5.0"
+                "spatie/pest-plugin-snapshots": "^1.0|^2.0"
             },
             "type": "library",
             "extra": {
@@ -8061,7 +8287,7 @@
             ],
             "support": {
                 "issues": "https://github.com/spatie/flare-client-php/issues",
-                "source": "https://github.com/spatie/flare-client-php/tree/1.7.0"
+                "source": "https://github.com/spatie/flare-client-php/tree/1.10.0"
             },
             "funding": [
                 {
@@ -8069,7 +8295,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2024-06-12T14:39:14+00:00"
+            "time": "2024-12-02T14:30:06+00:00"
         },
         {
             "name": "spatie/ignition",
@@ -8156,16 +8382,16 @@
         },
         {
             "name": "spatie/laravel-backup",
-            "version": "8.8.1",
+            "version": "8.8.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/spatie/laravel-backup.git",
-                "reference": "a9c2d2f726f4c60c2dc5d7c0c8380f72492638c2"
+                "reference": "5b672713283703a74c629ccd67b1d77eb57e24b9"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/spatie/laravel-backup/zipball/a9c2d2f726f4c60c2dc5d7c0c8380f72492638c2",
-                "reference": "a9c2d2f726f4c60c2dc5d7c0c8380f72492638c2",
+                "url": "https://api.github.com/repos/spatie/laravel-backup/zipball/5b672713283703a74c629ccd67b1d77eb57e24b9",
+                "reference": "5b672713283703a74c629ccd67b1d77eb57e24b9",
                 "shasum": ""
             },
             "require": {
@@ -8239,7 +8465,7 @@
             ],
             "support": {
                 "issues": "https://github.com/spatie/laravel-backup/issues",
-                "source": "https://github.com/spatie/laravel-backup/tree/8.8.1"
+                "source": "https://github.com/spatie/laravel-backup/tree/8.8.2"
             },
             "funding": [
                 {
@@ -8251,20 +8477,20 @@
                     "type": "other"
                 }
             ],
-            "time": "2024-06-04T11:31:33+00:00"
+            "time": "2024-08-07T11:07:52+00:00"
         },
         {
             "name": "spatie/laravel-ignition",
-            "version": "2.8.0",
+            "version": "2.9.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/spatie/laravel-ignition.git",
-                "reference": "3c067b75bfb50574db8f7e2c3978c65eed71126c"
+                "reference": "62042df15314b829d0f26e02108f559018e2aad0"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/spatie/laravel-ignition/zipball/3c067b75bfb50574db8f7e2c3978c65eed71126c",
-                "reference": "3c067b75bfb50574db8f7e2c3978c65eed71126c",
+                "url": "https://api.github.com/repos/spatie/laravel-ignition/zipball/62042df15314b829d0f26e02108f559018e2aad0",
+                "reference": "62042df15314b829d0f26e02108f559018e2aad0",
                 "shasum": ""
             },
             "require": {
@@ -8295,12 +8521,12 @@
             "type": "library",
             "extra": {
                 "laravel": {
-                    "providers": [
-                        "Spatie\\LaravelIgnition\\IgnitionServiceProvider"
-                    ],
                     "aliases": {
                         "Flare": "Spatie\\LaravelIgnition\\Facades\\Flare"
-                    }
+                    },
+                    "providers": [
+                        "Spatie\\LaravelIgnition\\IgnitionServiceProvider"
+                    ]
                 }
             },
             "autoload": {
@@ -8342,20 +8568,20 @@
                     "type": "github"
                 }
             ],
-            "time": "2024-06-12T15:01:18+00:00"
+            "time": "2024-12-02T08:43:31+00:00"
         },
         {
             "name": "spatie/laravel-package-tools",
-            "version": "1.16.4",
+            "version": "1.18.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/spatie/laravel-package-tools.git",
-                "reference": "ddf678e78d7f8b17e5cdd99c0c3413a4a6592e53"
+                "reference": "d41c44a7eab604c3eb0cad93210612d4c1429c20"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/spatie/laravel-package-tools/zipball/ddf678e78d7f8b17e5cdd99c0c3413a4a6592e53",
-                "reference": "ddf678e78d7f8b17e5cdd99c0c3413a4a6592e53",
+                "url": "https://api.github.com/repos/spatie/laravel-package-tools/zipball/d41c44a7eab604c3eb0cad93210612d4c1429c20",
+                "reference": "d41c44a7eab604c3eb0cad93210612d4c1429c20",
                 "shasum": ""
             },
             "require": {
@@ -8364,10 +8590,10 @@
             },
             "require-dev": {
                 "mockery/mockery": "^1.5",
-                "orchestra/testbench": "^7.7|^8.0",
-                "pestphp/pest": "^1.22",
-                "phpunit/phpunit": "^9.5.24",
-                "spatie/pest-plugin-test-time": "^1.1"
+                "orchestra/testbench": "^7.7|^8.0|^9.0",
+                "pestphp/pest": "^1.22|^2",
+                "phpunit/phpunit": "^9.5.24|^10.5",
+                "spatie/pest-plugin-test-time": "^1.1|^2.2"
             },
             "type": "library",
             "autoload": {
@@ -8394,7 +8620,7 @@
             ],
             "support": {
                 "issues": "https://github.com/spatie/laravel-package-tools/issues",
-                "source": "https://github.com/spatie/laravel-package-tools/tree/1.16.4"
+                "source": "https://github.com/spatie/laravel-package-tools/tree/1.18.2"
             },
             "funding": [
                 {
@@ -8402,45 +8628,46 @@
                     "type": "github"
                 }
             ],
-            "time": "2024-03-20T07:29:11+00:00"
+            "time": "2025-01-20T14:14:17+00:00"
         },
         {
             "name": "spatie/laravel-signal-aware-command",
-            "version": "1.3.0",
+            "version": "2.0.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/spatie/laravel-signal-aware-command.git",
-                "reference": "46cda09a85aef3fd47fb73ddc7081f963e255571"
+                "reference": "49a5e671c3a3fd992187a777d01385fc6a84759d"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/spatie/laravel-signal-aware-command/zipball/46cda09a85aef3fd47fb73ddc7081f963e255571",
-                "reference": "46cda09a85aef3fd47fb73ddc7081f963e255571",
+                "url": "https://api.github.com/repos/spatie/laravel-signal-aware-command/zipball/49a5e671c3a3fd992187a777d01385fc6a84759d",
+                "reference": "49a5e671c3a3fd992187a777d01385fc6a84759d",
                 "shasum": ""
             },
             "require": {
-                "illuminate/contracts": "^8.35|^9.0|^10.0",
-                "php": "^8.0",
-                "spatie/laravel-package-tools": "^1.4.3"
+                "illuminate/contracts": "^11.0",
+                "php": "^8.2",
+                "spatie/laravel-package-tools": "^1.4.3",
+                "symfony/console": "^7.0"
             },
             "require-dev": {
-                "brianium/paratest": "^6.2",
+                "brianium/paratest": "^6.2|^7.0",
                 "ext-pcntl": "*",
-                "nunomaduro/collision": "^5.3|^6.0",
-                "orchestra/testbench": "^6.16|^7.0|^8.0",
-                "pestphp/pest-plugin-laravel": "^1.3",
-                "phpunit/phpunit": "^9.5",
+                "nunomaduro/collision": "^5.3|^6.0|^7.0|^8.0",
+                "orchestra/testbench": "^9.0",
+                "pestphp/pest-plugin-laravel": "^1.3|^2.0",
+                "phpunit/phpunit": "^9.5|^10|^11",
                 "spatie/laravel-ray": "^1.17"
             },
             "type": "library",
             "extra": {
                 "laravel": {
-                    "providers": [
-                        "Spatie\\SignalAwareCommand\\SignalAwareCommandServiceProvider"
-                    ],
                     "aliases": {
                         "Signal": "Spatie\\SignalAwareCommand\\Facades\\Signal"
-                    }
+                    },
+                    "providers": [
+                        "Spatie\\SignalAwareCommand\\SignalAwareCommandServiceProvider"
+                    ]
                 }
             },
             "autoload": {
@@ -8468,7 +8695,7 @@
             ],
             "support": {
                 "issues": "https://github.com/spatie/laravel-signal-aware-command/issues",
-                "source": "https://github.com/spatie/laravel-signal-aware-command/tree/1.3.0"
+                "source": "https://github.com/spatie/laravel-signal-aware-command/tree/2.0.0"
             },
             "funding": [
                 {
@@ -8476,20 +8703,20 @@
                     "type": "github"
                 }
             ],
-            "time": "2023-01-14T21:10:59+00:00"
+            "time": "2024-02-05T13:37:25+00:00"
         },
         {
             "name": "spatie/temporary-directory",
-            "version": "2.2.1",
+            "version": "2.3.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/spatie/temporary-directory.git",
-                "reference": "76949fa18f8e1a7f663fd2eaa1d00e0bcea0752a"
+                "reference": "580eddfe9a0a41a902cac6eeb8f066b42e65a32b"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/spatie/temporary-directory/zipball/76949fa18f8e1a7f663fd2eaa1d00e0bcea0752a",
-                "reference": "76949fa18f8e1a7f663fd2eaa1d00e0bcea0752a",
+                "url": "https://api.github.com/repos/spatie/temporary-directory/zipball/580eddfe9a0a41a902cac6eeb8f066b42e65a32b",
+                "reference": "580eddfe9a0a41a902cac6eeb8f066b42e65a32b",
                 "shasum": ""
             },
             "require": {
@@ -8525,7 +8752,7 @@
             ],
             "support": {
                 "issues": "https://github.com/spatie/temporary-directory/issues",
-                "source": "https://github.com/spatie/temporary-directory/tree/2.2.1"
+                "source": "https://github.com/spatie/temporary-directory/tree/2.3.0"
             },
             "funding": [
                 {
@@ -8537,51 +8764,124 @@
                     "type": "github"
                 }
             ],
-            "time": "2023-12-25T11:46:58+00:00"
+            "time": "2025-01-13T13:04:43+00:00"
         },
         {
-            "name": "symfony/console",
-            "version": "v6.4.8",
+            "name": "symfony/clock",
+            "version": "v7.2.0",
             "source": {
                 "type": "git",
-                "url": "https://github.com/symfony/console.git",
-                "reference": "be5854cee0e8c7b110f00d695d11debdfa1a2a91"
+                "url": "https://github.com/symfony/clock.git",
+                "reference": "b81435fbd6648ea425d1ee96a2d8e68f4ceacd24"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/console/zipball/be5854cee0e8c7b110f00d695d11debdfa1a2a91",
-                "reference": "be5854cee0e8c7b110f00d695d11debdfa1a2a91",
+                "url": "https://api.github.com/repos/symfony/clock/zipball/b81435fbd6648ea425d1ee96a2d8e68f4ceacd24",
+                "reference": "b81435fbd6648ea425d1ee96a2d8e68f4ceacd24",
                 "shasum": ""
             },
             "require": {
-                "php": ">=8.1",
-                "symfony/deprecation-contracts": "^2.5|^3",
+                "php": ">=8.2",
+                "psr/clock": "^1.0",
+                "symfony/polyfill-php83": "^1.28"
+            },
+            "provide": {
+                "psr/clock-implementation": "1.0"
+            },
+            "type": "library",
+            "autoload": {
+                "files": [
+                    "Resources/now.php"
+                ],
+                "psr-4": {
+                    "Symfony\\Component\\Clock\\": ""
+                },
+                "exclude-from-classmap": [
+                    "/Tests/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Nicolas Grekas",
+                    "email": "p@tchwork.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
+            ],
+            "description": "Decouples applications from the system clock",
+            "homepage": "https://symfony.com",
+            "keywords": [
+                "clock",
+                "psr20",
+                "time"
+            ],
+            "support": {
+                "source": "https://github.com/symfony/clock/tree/v7.2.0"
+            },
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2024-09-25T14:21:43+00:00"
+        },
+        {
+            "name": "symfony/console",
+            "version": "v7.2.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/console.git",
+                "reference": "fefcc18c0f5d0efe3ab3152f15857298868dc2c3"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/console/zipball/fefcc18c0f5d0efe3ab3152f15857298868dc2c3",
+                "reference": "fefcc18c0f5d0efe3ab3152f15857298868dc2c3",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=8.2",
                 "symfony/polyfill-mbstring": "~1.0",
                 "symfony/service-contracts": "^2.5|^3",
-                "symfony/string": "^5.4|^6.0|^7.0"
+                "symfony/string": "^6.4|^7.0"
             },
             "conflict": {
-                "symfony/dependency-injection": "<5.4",
-                "symfony/dotenv": "<5.4",
-                "symfony/event-dispatcher": "<5.4",
-                "symfony/lock": "<5.4",
-                "symfony/process": "<5.4"
+                "symfony/dependency-injection": "<6.4",
+                "symfony/dotenv": "<6.4",
+                "symfony/event-dispatcher": "<6.4",
+                "symfony/lock": "<6.4",
+                "symfony/process": "<6.4"
             },
             "provide": {
                 "psr/log-implementation": "1.0|2.0|3.0"
             },
             "require-dev": {
                 "psr/log": "^1|^2|^3",
-                "symfony/config": "^5.4|^6.0|^7.0",
-                "symfony/dependency-injection": "^5.4|^6.0|^7.0",
-                "symfony/event-dispatcher": "^5.4|^6.0|^7.0",
+                "symfony/config": "^6.4|^7.0",
+                "symfony/dependency-injection": "^6.4|^7.0",
+                "symfony/event-dispatcher": "^6.4|^7.0",
                 "symfony/http-foundation": "^6.4|^7.0",
                 "symfony/http-kernel": "^6.4|^7.0",
-                "symfony/lock": "^5.4|^6.0|^7.0",
-                "symfony/messenger": "^5.4|^6.0|^7.0",
-                "symfony/process": "^5.4|^6.0|^7.0",
-                "symfony/stopwatch": "^5.4|^6.0|^7.0",
-                "symfony/var-dumper": "^5.4|^6.0|^7.0"
+                "symfony/lock": "^6.4|^7.0",
+                "symfony/messenger": "^6.4|^7.0",
+                "symfony/process": "^6.4|^7.0",
+                "symfony/stopwatch": "^6.4|^7.0",
+                "symfony/var-dumper": "^6.4|^7.0"
             },
             "type": "library",
             "autoload": {
@@ -8615,7 +8915,7 @@
                 "terminal"
             ],
             "support": {
-                "source": "https://github.com/symfony/console/tree/v6.4.8"
+                "source": "https://github.com/symfony/console/tree/v7.2.1"
             },
             "funding": [
                 {
@@ -8631,7 +8931,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-05-31T14:49:08+00:00"
+            "time": "2024-12-11T03:49:26+00:00"
         },
         {
             "name": "symfony/css-selector",
@@ -8701,16 +9001,16 @@
         },
         {
             "name": "symfony/deprecation-contracts",
-            "version": "v3.5.0",
+            "version": "v3.5.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/deprecation-contracts.git",
-                "reference": "0e0d29ce1f20deffb4ab1b016a7257c4f1e789a1"
+                "reference": "74c71c939a79f7d5bf3c1ce9f5ea37ba0114c6f6"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/deprecation-contracts/zipball/0e0d29ce1f20deffb4ab1b016a7257c4f1e789a1",
-                "reference": "0e0d29ce1f20deffb4ab1b016a7257c4f1e789a1",
+                "url": "https://api.github.com/repos/symfony/deprecation-contracts/zipball/74c71c939a79f7d5bf3c1ce9f5ea37ba0114c6f6",
+                "reference": "74c71c939a79f7d5bf3c1ce9f5ea37ba0114c6f6",
                 "shasum": ""
             },
             "require": {
@@ -8718,12 +9018,12 @@
             },
             "type": "library",
             "extra": {
+                "thanks": {
+                    "url": "https://github.com/symfony/contracts",
+                    "name": "symfony/contracts"
+                },
                 "branch-alias": {
                     "dev-main": "3.5-dev"
-                },
-                "thanks": {
-                    "name": "symfony/contracts",
-                    "url": "https://github.com/symfony/contracts"
                 }
             },
             "autoload": {
@@ -8748,7 +9048,7 @@
             "description": "A generic function and convention to trigger deprecation notices",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/deprecation-contracts/tree/v3.5.0"
+                "source": "https://github.com/symfony/deprecation-contracts/tree/v3.5.1"
             },
             "funding": [
                 {
@@ -8764,26 +9064,26 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-04-18T09:32:20+00:00"
+            "time": "2024-09-25T14:20:29+00:00"
         },
         {
             "name": "symfony/error-handler",
-            "version": "v6.4.8",
+            "version": "v7.2.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/error-handler.git",
-                "reference": "ef836152bf13472dc5fb5b08b0c0c4cfeddc0fcc"
+                "reference": "6150b89186573046167796fa5f3f76601d5145f8"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/error-handler/zipball/ef836152bf13472dc5fb5b08b0c0c4cfeddc0fcc",
-                "reference": "ef836152bf13472dc5fb5b08b0c0c4cfeddc0fcc",
+                "url": "https://api.github.com/repos/symfony/error-handler/zipball/6150b89186573046167796fa5f3f76601d5145f8",
+                "reference": "6150b89186573046167796fa5f3f76601d5145f8",
                 "shasum": ""
             },
             "require": {
-                "php": ">=8.1",
+                "php": ">=8.2",
                 "psr/log": "^1|^2|^3",
-                "symfony/var-dumper": "^5.4|^6.0|^7.0"
+                "symfony/var-dumper": "^6.4|^7.0"
             },
             "conflict": {
                 "symfony/deprecation-contracts": "<2.5",
@@ -8792,7 +9092,7 @@
             "require-dev": {
                 "symfony/deprecation-contracts": "^2.5|^3",
                 "symfony/http-kernel": "^6.4|^7.0",
-                "symfony/serializer": "^5.4|^6.0|^7.0"
+                "symfony/serializer": "^6.4|^7.0"
             },
             "bin": [
                 "Resources/bin/patch-type-declarations"
@@ -8823,7 +9123,7 @@
             "description": "Provides tools to manage errors and ease debugging PHP code",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/error-handler/tree/v6.4.8"
+                "source": "https://github.com/symfony/error-handler/tree/v7.2.1"
             },
             "funding": [
                 {
@@ -8839,28 +9139,28 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-05-31T14:49:08+00:00"
+            "time": "2024-12-07T08:50:44+00:00"
         },
         {
             "name": "symfony/event-dispatcher",
-            "version": "v6.4.8",
+            "version": "v7.2.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/event-dispatcher.git",
-                "reference": "8d7507f02b06e06815e56bb39aa0128e3806208b"
+                "reference": "910c5db85a5356d0fea57680defec4e99eb9c8c1"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/8d7507f02b06e06815e56bb39aa0128e3806208b",
-                "reference": "8d7507f02b06e06815e56bb39aa0128e3806208b",
+                "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/910c5db85a5356d0fea57680defec4e99eb9c8c1",
+                "reference": "910c5db85a5356d0fea57680defec4e99eb9c8c1",
                 "shasum": ""
             },
             "require": {
-                "php": ">=8.1",
+                "php": ">=8.2",
                 "symfony/event-dispatcher-contracts": "^2.5|^3"
             },
             "conflict": {
-                "symfony/dependency-injection": "<5.4",
+                "symfony/dependency-injection": "<6.4",
                 "symfony/service-contracts": "<2.5"
             },
             "provide": {
@@ -8869,13 +9169,13 @@
             },
             "require-dev": {
                 "psr/log": "^1|^2|^3",
-                "symfony/config": "^5.4|^6.0|^7.0",
-                "symfony/dependency-injection": "^5.4|^6.0|^7.0",
-                "symfony/error-handler": "^5.4|^6.0|^7.0",
-                "symfony/expression-language": "^5.4|^6.0|^7.0",
-                "symfony/http-foundation": "^5.4|^6.0|^7.0",
+                "symfony/config": "^6.4|^7.0",
+                "symfony/dependency-injection": "^6.4|^7.0",
+                "symfony/error-handler": "^6.4|^7.0",
+                "symfony/expression-language": "^6.4|^7.0",
+                "symfony/http-foundation": "^6.4|^7.0",
                 "symfony/service-contracts": "^2.5|^3",
-                "symfony/stopwatch": "^5.4|^6.0|^7.0"
+                "symfony/stopwatch": "^6.4|^7.0"
             },
             "type": "library",
             "autoload": {
@@ -8903,7 +9203,7 @@
             "description": "Provides tools that allow your application components to communicate with each other by dispatching events and listening to them",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/event-dispatcher/tree/v6.4.8"
+                "source": "https://github.com/symfony/event-dispatcher/tree/v7.2.0"
             },
             "funding": [
                 {
@@ -8919,20 +9219,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-05-31T14:49:08+00:00"
+            "time": "2024-09-25T14:21:43+00:00"
         },
         {
             "name": "symfony/event-dispatcher-contracts",
-            "version": "v3.5.0",
+            "version": "v3.5.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/event-dispatcher-contracts.git",
-                "reference": "8f93aec25d41b72493c6ddff14e916177c9efc50"
+                "reference": "7642f5e970b672283b7823222ae8ef8bbc160b9f"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/event-dispatcher-contracts/zipball/8f93aec25d41b72493c6ddff14e916177c9efc50",
-                "reference": "8f93aec25d41b72493c6ddff14e916177c9efc50",
+                "url": "https://api.github.com/repos/symfony/event-dispatcher-contracts/zipball/7642f5e970b672283b7823222ae8ef8bbc160b9f",
+                "reference": "7642f5e970b672283b7823222ae8ef8bbc160b9f",
                 "shasum": ""
             },
             "require": {
@@ -8941,12 +9241,12 @@
             },
             "type": "library",
             "extra": {
+                "thanks": {
+                    "url": "https://github.com/symfony/contracts",
+                    "name": "symfony/contracts"
+                },
                 "branch-alias": {
                     "dev-main": "3.5-dev"
-                },
-                "thanks": {
-                    "name": "symfony/contracts",
-                    "url": "https://github.com/symfony/contracts"
                 }
             },
             "autoload": {
@@ -8979,7 +9279,7 @@
                 "standards"
             ],
             "support": {
-                "source": "https://github.com/symfony/event-dispatcher-contracts/tree/v3.5.0"
+                "source": "https://github.com/symfony/event-dispatcher-contracts/tree/v3.5.1"
             },
             "funding": [
                 {
@@ -8995,27 +9295,27 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-04-18T09:32:20+00:00"
+            "time": "2024-09-25T14:20:29+00:00"
         },
         {
             "name": "symfony/finder",
-            "version": "v6.4.8",
+            "version": "v7.2.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/finder.git",
-                "reference": "3ef977a43883215d560a2cecb82ec8e62131471c"
+                "reference": "87a71856f2f56e4100373e92529eed3171695cfb"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/finder/zipball/3ef977a43883215d560a2cecb82ec8e62131471c",
-                "reference": "3ef977a43883215d560a2cecb82ec8e62131471c",
+                "url": "https://api.github.com/repos/symfony/finder/zipball/87a71856f2f56e4100373e92529eed3171695cfb",
+                "reference": "87a71856f2f56e4100373e92529eed3171695cfb",
                 "shasum": ""
             },
             "require": {
-                "php": ">=8.1"
+                "php": ">=8.2"
             },
             "require-dev": {
-                "symfony/filesystem": "^6.0|^7.0"
+                "symfony/filesystem": "^6.4|^7.0"
             },
             "type": "library",
             "autoload": {
@@ -9043,7 +9343,7 @@
             "description": "Finds files and directories via an intuitive fluent interface",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/finder/tree/v6.4.8"
+                "source": "https://github.com/symfony/finder/tree/v7.2.2"
             },
             "funding": [
                 {
@@ -9059,40 +9359,41 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-05-31T14:49:08+00:00"
+            "time": "2024-12-30T19:00:17+00:00"
         },
         {
             "name": "symfony/http-foundation",
-            "version": "v6.4.8",
+            "version": "v7.2.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/http-foundation.git",
-                "reference": "27de8cc95e11db7a50b027e71caaab9024545947"
+                "reference": "62d1a43796ca3fea3f83a8470dfe63a4af3bc588"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/http-foundation/zipball/27de8cc95e11db7a50b027e71caaab9024545947",
-                "reference": "27de8cc95e11db7a50b027e71caaab9024545947",
+                "url": "https://api.github.com/repos/symfony/http-foundation/zipball/62d1a43796ca3fea3f83a8470dfe63a4af3bc588",
+                "reference": "62d1a43796ca3fea3f83a8470dfe63a4af3bc588",
                 "shasum": ""
             },
             "require": {
-                "php": ">=8.1",
-                "symfony/deprecation-contracts": "^2.5|^3",
+                "php": ">=8.2",
+                "symfony/deprecation-contracts": "^2.5|^3.0",
                 "symfony/polyfill-mbstring": "~1.1",
                 "symfony/polyfill-php83": "^1.27"
             },
             "conflict": {
-                "symfony/cache": "<6.3"
+                "doctrine/dbal": "<3.6",
+                "symfony/cache": "<6.4.12|>=7.0,<7.1.5"
             },
             "require-dev": {
-                "doctrine/dbal": "^2.13.1|^3|^4",
+                "doctrine/dbal": "^3.6|^4",
                 "predis/predis": "^1.1|^2.0",
-                "symfony/cache": "^6.3|^7.0",
-                "symfony/dependency-injection": "^5.4|^6.0|^7.0",
-                "symfony/expression-language": "^5.4|^6.0|^7.0",
-                "symfony/http-kernel": "^5.4.12|^6.0.12|^6.1.4|^7.0",
-                "symfony/mime": "^5.4|^6.0|^7.0",
-                "symfony/rate-limiter": "^5.4|^6.0|^7.0"
+                "symfony/cache": "^6.4.12|^7.1.5",
+                "symfony/dependency-injection": "^6.4|^7.0",
+                "symfony/expression-language": "^6.4|^7.0",
+                "symfony/http-kernel": "^6.4|^7.0",
+                "symfony/mime": "^6.4|^7.0",
+                "symfony/rate-limiter": "^6.4|^7.0"
             },
             "type": "library",
             "autoload": {
@@ -9120,7 +9421,7 @@
             "description": "Defines an object-oriented layer for the HTTP specification",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/http-foundation/tree/v6.4.8"
+                "source": "https://github.com/symfony/http-foundation/tree/v7.2.2"
             },
             "funding": [
                 {
@@ -9136,77 +9437,77 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-05-31T14:49:08+00:00"
+            "time": "2024-12-30T19:00:17+00:00"
         },
         {
             "name": "symfony/http-kernel",
-            "version": "v6.4.8",
+            "version": "v7.2.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/http-kernel.git",
-                "reference": "6c519aa3f32adcfd1d1f18d923f6b227d9acf3c1"
+                "reference": "3c432966bd8c7ec7429663105f5a02d7e75b4306"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/http-kernel/zipball/6c519aa3f32adcfd1d1f18d923f6b227d9acf3c1",
-                "reference": "6c519aa3f32adcfd1d1f18d923f6b227d9acf3c1",
+                "url": "https://api.github.com/repos/symfony/http-kernel/zipball/3c432966bd8c7ec7429663105f5a02d7e75b4306",
+                "reference": "3c432966bd8c7ec7429663105f5a02d7e75b4306",
                 "shasum": ""
             },
             "require": {
-                "php": ">=8.1",
+                "php": ">=8.2",
                 "psr/log": "^1|^2|^3",
                 "symfony/deprecation-contracts": "^2.5|^3",
                 "symfony/error-handler": "^6.4|^7.0",
-                "symfony/event-dispatcher": "^5.4|^6.0|^7.0",
+                "symfony/event-dispatcher": "^6.4|^7.0",
                 "symfony/http-foundation": "^6.4|^7.0",
                 "symfony/polyfill-ctype": "^1.8"
             },
             "conflict": {
-                "symfony/browser-kit": "<5.4",
-                "symfony/cache": "<5.4",
-                "symfony/config": "<6.1",
-                "symfony/console": "<5.4",
+                "symfony/browser-kit": "<6.4",
+                "symfony/cache": "<6.4",
+                "symfony/config": "<6.4",
+                "symfony/console": "<6.4",
                 "symfony/dependency-injection": "<6.4",
-                "symfony/doctrine-bridge": "<5.4",
-                "symfony/form": "<5.4",
-                "symfony/http-client": "<5.4",
+                "symfony/doctrine-bridge": "<6.4",
+                "symfony/form": "<6.4",
+                "symfony/http-client": "<6.4",
                 "symfony/http-client-contracts": "<2.5",
-                "symfony/mailer": "<5.4",
-                "symfony/messenger": "<5.4",
-                "symfony/translation": "<5.4",
+                "symfony/mailer": "<6.4",
+                "symfony/messenger": "<6.4",
+                "symfony/translation": "<6.4",
                 "symfony/translation-contracts": "<2.5",
-                "symfony/twig-bridge": "<5.4",
+                "symfony/twig-bridge": "<6.4",
                 "symfony/validator": "<6.4",
-                "symfony/var-dumper": "<6.3",
-                "twig/twig": "<2.13"
+                "symfony/var-dumper": "<6.4",
+                "twig/twig": "<3.12"
             },
             "provide": {
                 "psr/log-implementation": "1.0|2.0|3.0"
             },
             "require-dev": {
                 "psr/cache": "^1.0|^2.0|^3.0",
-                "symfony/browser-kit": "^5.4|^6.0|^7.0",
-                "symfony/clock": "^6.2|^7.0",
-                "symfony/config": "^6.1|^7.0",
-                "symfony/console": "^5.4|^6.0|^7.0",
-                "symfony/css-selector": "^5.4|^6.0|^7.0",
+                "symfony/browser-kit": "^6.4|^7.0",
+                "symfony/clock": "^6.4|^7.0",
+                "symfony/config": "^6.4|^7.0",
+                "symfony/console": "^6.4|^7.0",
+                "symfony/css-selector": "^6.4|^7.0",
                 "symfony/dependency-injection": "^6.4|^7.0",
-                "symfony/dom-crawler": "^5.4|^6.0|^7.0",
-                "symfony/expression-language": "^5.4|^6.0|^7.0",
-                "symfony/finder": "^5.4|^6.0|^7.0",
+                "symfony/dom-crawler": "^6.4|^7.0",
+                "symfony/expression-language": "^6.4|^7.0",
+                "symfony/finder": "^6.4|^7.0",
                 "symfony/http-client-contracts": "^2.5|^3",
-                "symfony/process": "^5.4|^6.0|^7.0",
-                "symfony/property-access": "^5.4.5|^6.0.5|^7.0",
-                "symfony/routing": "^5.4|^6.0|^7.0",
-                "symfony/serializer": "^6.4.4|^7.0.4",
-                "symfony/stopwatch": "^5.4|^6.0|^7.0",
-                "symfony/translation": "^5.4|^6.0|^7.0",
+                "symfony/process": "^6.4|^7.0",
+                "symfony/property-access": "^7.1",
+                "symfony/routing": "^6.4|^7.0",
+                "symfony/serializer": "^7.1",
+                "symfony/stopwatch": "^6.4|^7.0",
+                "symfony/translation": "^6.4|^7.0",
                 "symfony/translation-contracts": "^2.5|^3",
-                "symfony/uid": "^5.4|^6.0|^7.0",
+                "symfony/uid": "^6.4|^7.0",
                 "symfony/validator": "^6.4|^7.0",
-                "symfony/var-dumper": "^5.4|^6.4|^7.0",
-                "symfony/var-exporter": "^6.2|^7.0",
-                "twig/twig": "^2.13|^3.0.4"
+                "symfony/var-dumper": "^6.4|^7.0",
+                "symfony/var-exporter": "^6.4|^7.0",
+                "twig/twig": "^3.12"
             },
             "type": "library",
             "autoload": {
@@ -9234,7 +9535,7 @@
             "description": "Provides a structured process for converting a Request into a Response",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/http-kernel/tree/v6.4.8"
+                "source": "https://github.com/symfony/http-kernel/tree/v7.2.2"
             },
             "funding": [
                 {
@@ -9250,43 +9551,43 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-06-02T16:06:25+00:00"
+            "time": "2024-12-31T14:59:40+00:00"
         },
         {
             "name": "symfony/mailer",
-            "version": "v6.4.8",
+            "version": "v7.2.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/mailer.git",
-                "reference": "76326421d44c07f7824b19487cfbf87870b37efc"
+                "reference": "e4d358702fb66e4c8a2af08e90e7271a62de39cc"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/mailer/zipball/76326421d44c07f7824b19487cfbf87870b37efc",
-                "reference": "76326421d44c07f7824b19487cfbf87870b37efc",
+                "url": "https://api.github.com/repos/symfony/mailer/zipball/e4d358702fb66e4c8a2af08e90e7271a62de39cc",
+                "reference": "e4d358702fb66e4c8a2af08e90e7271a62de39cc",
                 "shasum": ""
             },
             "require": {
                 "egulias/email-validator": "^2.1.10|^3|^4",
-                "php": ">=8.1",
+                "php": ">=8.2",
                 "psr/event-dispatcher": "^1",
                 "psr/log": "^1|^2|^3",
-                "symfony/event-dispatcher": "^5.4|^6.0|^7.0",
-                "symfony/mime": "^6.2|^7.0",
+                "symfony/event-dispatcher": "^6.4|^7.0",
+                "symfony/mime": "^7.2",
                 "symfony/service-contracts": "^2.5|^3"
             },
             "conflict": {
                 "symfony/http-client-contracts": "<2.5",
-                "symfony/http-kernel": "<5.4",
-                "symfony/messenger": "<6.2",
-                "symfony/mime": "<6.2",
-                "symfony/twig-bridge": "<6.2.1"
+                "symfony/http-kernel": "<6.4",
+                "symfony/messenger": "<6.4",
+                "symfony/mime": "<6.4",
+                "symfony/twig-bridge": "<6.4"
             },
             "require-dev": {
-                "symfony/console": "^5.4|^6.0|^7.0",
-                "symfony/http-client": "^5.4|^6.0|^7.0",
-                "symfony/messenger": "^6.2|^7.0",
-                "symfony/twig-bridge": "^6.2|^7.0"
+                "symfony/console": "^6.4|^7.0",
+                "symfony/http-client": "^6.4|^7.0",
+                "symfony/messenger": "^6.4|^7.0",
+                "symfony/twig-bridge": "^6.4|^7.0"
             },
             "type": "library",
             "autoload": {
@@ -9314,7 +9615,7 @@
             "description": "Helps sending emails",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/mailer/tree/v6.4.8"
+                "source": "https://github.com/symfony/mailer/tree/v7.2.0"
             },
             "funding": [
                 {
@@ -9330,25 +9631,24 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-05-31T14:49:08+00:00"
+            "time": "2024-11-25T15:21:05+00:00"
         },
         {
             "name": "symfony/mime",
-            "version": "v6.4.8",
+            "version": "v7.2.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/mime.git",
-                "reference": "618597ab8b78ac86d1c75a9d0b35540cda074f33"
+                "reference": "7f9617fcf15cb61be30f8b252695ed5e2bfac283"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/mime/zipball/618597ab8b78ac86d1c75a9d0b35540cda074f33",
-                "reference": "618597ab8b78ac86d1c75a9d0b35540cda074f33",
+                "url": "https://api.github.com/repos/symfony/mime/zipball/7f9617fcf15cb61be30f8b252695ed5e2bfac283",
+                "reference": "7f9617fcf15cb61be30f8b252695ed5e2bfac283",
                 "shasum": ""
             },
             "require": {
-                "php": ">=8.1",
-                "symfony/deprecation-contracts": "^2.5|^3",
+                "php": ">=8.2",
                 "symfony/polyfill-intl-idn": "^1.10",
                 "symfony/polyfill-mbstring": "^1.0"
             },
@@ -9356,18 +9656,18 @@
                 "egulias/email-validator": "~3.0.0",
                 "phpdocumentor/reflection-docblock": "<3.2.2",
                 "phpdocumentor/type-resolver": "<1.4.0",
-                "symfony/mailer": "<5.4",
-                "symfony/serializer": "<6.3.2"
+                "symfony/mailer": "<6.4",
+                "symfony/serializer": "<6.4.3|>7.0,<7.0.3"
             },
             "require-dev": {
                 "egulias/email-validator": "^2.1.10|^3.1|^4",
                 "league/html-to-markdown": "^5.0",
                 "phpdocumentor/reflection-docblock": "^3.0|^4.0|^5.0",
-                "symfony/dependency-injection": "^5.4|^6.0|^7.0",
-                "symfony/process": "^5.4|^6.4|^7.0",
-                "symfony/property-access": "^5.4|^6.0|^7.0",
-                "symfony/property-info": "^5.4|^6.0|^7.0",
-                "symfony/serializer": "^6.3.2|^7.0"
+                "symfony/dependency-injection": "^6.4|^7.0",
+                "symfony/process": "^6.4|^7.0",
+                "symfony/property-access": "^6.4|^7.0",
+                "symfony/property-info": "^6.4|^7.0",
+                "symfony/serializer": "^6.4.3|^7.0.3"
             },
             "type": "library",
             "autoload": {
@@ -9399,7 +9699,7 @@
                 "mime-type"
             ],
             "support": {
-                "source": "https://github.com/symfony/mime/tree/v6.4.8"
+                "source": "https://github.com/symfony/mime/tree/v7.2.1"
             },
             "funding": [
                 {
@@ -9415,24 +9715,24 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-06-01T07:50:16+00:00"
+            "time": "2024-12-07T08:50:44+00:00"
         },
         {
             "name": "symfony/polyfill-ctype",
-            "version": "v1.30.0",
+            "version": "v1.31.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-ctype.git",
-                "reference": "0424dff1c58f028c451efff2045f5d92410bd540"
+                "reference": "a3cc8b044a6ea513310cbd48ef7333b384945638"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/0424dff1c58f028c451efff2045f5d92410bd540",
-                "reference": "0424dff1c58f028c451efff2045f5d92410bd540",
+                "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/a3cc8b044a6ea513310cbd48ef7333b384945638",
+                "reference": "a3cc8b044a6ea513310cbd48ef7333b384945638",
                 "shasum": ""
             },
             "require": {
-                "php": ">=7.1"
+                "php": ">=7.2"
             },
             "provide": {
                 "ext-ctype": "*"
@@ -9443,8 +9743,8 @@
             "type": "library",
             "extra": {
                 "thanks": {
-                    "name": "symfony/polyfill",
-                    "url": "https://github.com/symfony/polyfill"
+                    "url": "https://github.com/symfony/polyfill",
+                    "name": "symfony/polyfill"
                 }
             },
             "autoload": {
@@ -9478,7 +9778,7 @@
                 "portable"
             ],
             "support": {
-                "source": "https://github.com/symfony/polyfill-ctype/tree/v1.30.0"
+                "source": "https://github.com/symfony/polyfill-ctype/tree/v1.31.0"
             },
             "funding": [
                 {
@@ -9494,24 +9794,24 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-05-31T15:07:36+00:00"
+            "time": "2024-09-09T11:45:10+00:00"
         },
         {
             "name": "symfony/polyfill-intl-grapheme",
-            "version": "v1.30.0",
+            "version": "v1.31.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-intl-grapheme.git",
-                "reference": "64647a7c30b2283f5d49b874d84a18fc22054b7a"
+                "reference": "b9123926e3b7bc2f98c02ad54f6a4b02b91a8abe"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-intl-grapheme/zipball/64647a7c30b2283f5d49b874d84a18fc22054b7a",
-                "reference": "64647a7c30b2283f5d49b874d84a18fc22054b7a",
+                "url": "https://api.github.com/repos/symfony/polyfill-intl-grapheme/zipball/b9123926e3b7bc2f98c02ad54f6a4b02b91a8abe",
+                "reference": "b9123926e3b7bc2f98c02ad54f6a4b02b91a8abe",
                 "shasum": ""
             },
             "require": {
-                "php": ">=7.1"
+                "php": ">=7.2"
             },
             "suggest": {
                 "ext-intl": "For best performance"
@@ -9519,8 +9819,8 @@
             "type": "library",
             "extra": {
                 "thanks": {
-                    "name": "symfony/polyfill",
-                    "url": "https://github.com/symfony/polyfill"
+                    "url": "https://github.com/symfony/polyfill",
+                    "name": "symfony/polyfill"
                 }
             },
             "autoload": {
@@ -9556,7 +9856,7 @@
                 "shim"
             ],
             "support": {
-                "source": "https://github.com/symfony/polyfill-intl-grapheme/tree/v1.30.0"
+                "source": "https://github.com/symfony/polyfill-intl-grapheme/tree/v1.31.0"
             },
             "funding": [
                 {
@@ -9572,26 +9872,25 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-05-31T15:07:36+00:00"
+            "time": "2024-09-09T11:45:10+00:00"
         },
         {
             "name": "symfony/polyfill-intl-idn",
-            "version": "v1.30.0",
+            "version": "v1.31.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-intl-idn.git",
-                "reference": "a6e83bdeb3c84391d1dfe16f42e40727ce524a5c"
+                "reference": "c36586dcf89a12315939e00ec9b4474adcb1d773"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-intl-idn/zipball/a6e83bdeb3c84391d1dfe16f42e40727ce524a5c",
-                "reference": "a6e83bdeb3c84391d1dfe16f42e40727ce524a5c",
+                "url": "https://api.github.com/repos/symfony/polyfill-intl-idn/zipball/c36586dcf89a12315939e00ec9b4474adcb1d773",
+                "reference": "c36586dcf89a12315939e00ec9b4474adcb1d773",
                 "shasum": ""
             },
             "require": {
-                "php": ">=7.1",
-                "symfony/polyfill-intl-normalizer": "^1.10",
-                "symfony/polyfill-php72": "^1.10"
+                "php": ">=7.2",
+                "symfony/polyfill-intl-normalizer": "^1.10"
             },
             "suggest": {
                 "ext-intl": "For best performance"
@@ -9599,8 +9898,8 @@
             "type": "library",
             "extra": {
                 "thanks": {
-                    "name": "symfony/polyfill",
-                    "url": "https://github.com/symfony/polyfill"
+                    "url": "https://github.com/symfony/polyfill",
+                    "name": "symfony/polyfill"
                 }
             },
             "autoload": {
@@ -9640,7 +9939,7 @@
                 "shim"
             ],
             "support": {
-                "source": "https://github.com/symfony/polyfill-intl-idn/tree/v1.30.0"
+                "source": "https://github.com/symfony/polyfill-intl-idn/tree/v1.31.0"
             },
             "funding": [
                 {
@@ -9656,24 +9955,24 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-05-31T15:07:36+00:00"
+            "time": "2024-09-09T11:45:10+00:00"
         },
         {
             "name": "symfony/polyfill-intl-normalizer",
-            "version": "v1.30.0",
+            "version": "v1.31.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-intl-normalizer.git",
-                "reference": "a95281b0be0d9ab48050ebd988b967875cdb9fdb"
+                "reference": "3833d7255cc303546435cb650316bff708a1c75c"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-intl-normalizer/zipball/a95281b0be0d9ab48050ebd988b967875cdb9fdb",
-                "reference": "a95281b0be0d9ab48050ebd988b967875cdb9fdb",
+                "url": "https://api.github.com/repos/symfony/polyfill-intl-normalizer/zipball/3833d7255cc303546435cb650316bff708a1c75c",
+                "reference": "3833d7255cc303546435cb650316bff708a1c75c",
                 "shasum": ""
             },
             "require": {
-                "php": ">=7.1"
+                "php": ">=7.2"
             },
             "suggest": {
                 "ext-intl": "For best performance"
@@ -9681,8 +9980,8 @@
             "type": "library",
             "extra": {
                 "thanks": {
-                    "name": "symfony/polyfill",
-                    "url": "https://github.com/symfony/polyfill"
+                    "url": "https://github.com/symfony/polyfill",
+                    "name": "symfony/polyfill"
                 }
             },
             "autoload": {
@@ -9721,7 +10020,7 @@
                 "shim"
             ],
             "support": {
-                "source": "https://github.com/symfony/polyfill-intl-normalizer/tree/v1.30.0"
+                "source": "https://github.com/symfony/polyfill-intl-normalizer/tree/v1.31.0"
             },
             "funding": [
                 {
@@ -9737,24 +10036,24 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-05-31T15:07:36+00:00"
+            "time": "2024-09-09T11:45:10+00:00"
         },
         {
             "name": "symfony/polyfill-mbstring",
-            "version": "v1.30.0",
+            "version": "v1.31.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-mbstring.git",
-                "reference": "fd22ab50000ef01661e2a31d850ebaa297f8e03c"
+                "reference": "85181ba99b2345b0ef10ce42ecac37612d9fd341"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/fd22ab50000ef01661e2a31d850ebaa297f8e03c",
-                "reference": "fd22ab50000ef01661e2a31d850ebaa297f8e03c",
+                "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/85181ba99b2345b0ef10ce42ecac37612d9fd341",
+                "reference": "85181ba99b2345b0ef10ce42ecac37612d9fd341",
                 "shasum": ""
             },
             "require": {
-                "php": ">=7.1"
+                "php": ">=7.2"
             },
             "provide": {
                 "ext-mbstring": "*"
@@ -9765,8 +10064,8 @@
             "type": "library",
             "extra": {
                 "thanks": {
-                    "name": "symfony/polyfill",
-                    "url": "https://github.com/symfony/polyfill"
+                    "url": "https://github.com/symfony/polyfill",
+                    "name": "symfony/polyfill"
                 }
             },
             "autoload": {
@@ -9801,7 +10100,7 @@
                 "shim"
             ],
             "support": {
-                "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.30.0"
+                "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.31.0"
             },
             "funding": [
                 {
@@ -9817,103 +10116,30 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-06-19T12:30:46+00:00"
-        },
-        {
-            "name": "symfony/polyfill-php72",
-            "version": "v1.30.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/symfony/polyfill-php72.git",
-                "reference": "10112722600777e02d2745716b70c5db4ca70442"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-php72/zipball/10112722600777e02d2745716b70c5db4ca70442",
-                "reference": "10112722600777e02d2745716b70c5db4ca70442",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=7.1"
-            },
-            "type": "library",
-            "extra": {
-                "thanks": {
-                    "name": "symfony/polyfill",
-                    "url": "https://github.com/symfony/polyfill"
-                }
-            },
-            "autoload": {
-                "files": [
-                    "bootstrap.php"
-                ],
-                "psr-4": {
-                    "Symfony\\Polyfill\\Php72\\": ""
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Nicolas Grekas",
-                    "email": "p@tchwork.com"
-                },
-                {
-                    "name": "Symfony Community",
-                    "homepage": "https://symfony.com/contributors"
-                }
-            ],
-            "description": "Symfony polyfill backporting some PHP 7.2+ features to lower PHP versions",
-            "homepage": "https://symfony.com",
-            "keywords": [
-                "compatibility",
-                "polyfill",
-                "portable",
-                "shim"
-            ],
-            "support": {
-                "source": "https://github.com/symfony/polyfill-php72/tree/v1.30.0"
-            },
-            "funding": [
-                {
-                    "url": "https://symfony.com/sponsor",
-                    "type": "custom"
-                },
-                {
-                    "url": "https://github.com/fabpot",
-                    "type": "github"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
-                    "type": "tidelift"
-                }
-            ],
-            "time": "2024-06-19T12:30:46+00:00"
+            "time": "2024-09-09T11:45:10+00:00"
         },
         {
             "name": "symfony/polyfill-php80",
-            "version": "v1.30.0",
+            "version": "v1.31.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-php80.git",
-                "reference": "77fa7995ac1b21ab60769b7323d600a991a90433"
+                "reference": "60328e362d4c2c802a54fcbf04f9d3fb892b4cf8"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/77fa7995ac1b21ab60769b7323d600a991a90433",
-                "reference": "77fa7995ac1b21ab60769b7323d600a991a90433",
+                "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/60328e362d4c2c802a54fcbf04f9d3fb892b4cf8",
+                "reference": "60328e362d4c2c802a54fcbf04f9d3fb892b4cf8",
                 "shasum": ""
             },
             "require": {
-                "php": ">=7.1"
+                "php": ">=7.2"
             },
             "type": "library",
             "extra": {
                 "thanks": {
-                    "name": "symfony/polyfill",
-                    "url": "https://github.com/symfony/polyfill"
+                    "url": "https://github.com/symfony/polyfill",
+                    "name": "symfony/polyfill"
                 }
             },
             "autoload": {
@@ -9954,7 +10180,7 @@
                 "shim"
             ],
             "support": {
-                "source": "https://github.com/symfony/polyfill-php80/tree/v1.30.0"
+                "source": "https://github.com/symfony/polyfill-php80/tree/v1.31.0"
             },
             "funding": [
                 {
@@ -9970,30 +10196,30 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-05-31T15:07:36+00:00"
+            "time": "2024-09-09T11:45:10+00:00"
         },
         {
             "name": "symfony/polyfill-php83",
-            "version": "v1.30.0",
+            "version": "v1.31.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-php83.git",
-                "reference": "dbdcdf1a4dcc2743591f1079d0c35ab1e2dcbbc9"
+                "reference": "2fb86d65e2d424369ad2905e83b236a8805ba491"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-php83/zipball/dbdcdf1a4dcc2743591f1079d0c35ab1e2dcbbc9",
-                "reference": "dbdcdf1a4dcc2743591f1079d0c35ab1e2dcbbc9",
+                "url": "https://api.github.com/repos/symfony/polyfill-php83/zipball/2fb86d65e2d424369ad2905e83b236a8805ba491",
+                "reference": "2fb86d65e2d424369ad2905e83b236a8805ba491",
                 "shasum": ""
             },
             "require": {
-                "php": ">=7.1"
+                "php": ">=7.2"
             },
             "type": "library",
             "extra": {
                 "thanks": {
-                    "name": "symfony/polyfill",
-                    "url": "https://github.com/symfony/polyfill"
+                    "url": "https://github.com/symfony/polyfill",
+                    "name": "symfony/polyfill"
                 }
             },
             "autoload": {
@@ -10030,7 +10256,7 @@
                 "shim"
             ],
             "support": {
-                "source": "https://github.com/symfony/polyfill-php83/tree/v1.30.0"
+                "source": "https://github.com/symfony/polyfill-php83/tree/v1.31.0"
             },
             "funding": [
                 {
@@ -10046,24 +10272,24 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-06-19T12:35:24+00:00"
+            "time": "2024-09-09T11:45:10+00:00"
         },
         {
             "name": "symfony/polyfill-uuid",
-            "version": "v1.30.0",
+            "version": "v1.31.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-uuid.git",
-                "reference": "2ba1f33797470debcda07fe9dce20a0003df18e9"
+                "reference": "21533be36c24be3f4b1669c4725c7d1d2bab4ae2"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-uuid/zipball/2ba1f33797470debcda07fe9dce20a0003df18e9",
-                "reference": "2ba1f33797470debcda07fe9dce20a0003df18e9",
+                "url": "https://api.github.com/repos/symfony/polyfill-uuid/zipball/21533be36c24be3f4b1669c4725c7d1d2bab4ae2",
+                "reference": "21533be36c24be3f4b1669c4725c7d1d2bab4ae2",
                 "shasum": ""
             },
             "require": {
-                "php": ">=7.1"
+                "php": ">=7.2"
             },
             "provide": {
                 "ext-uuid": "*"
@@ -10074,8 +10300,8 @@
             "type": "library",
             "extra": {
                 "thanks": {
-                    "name": "symfony/polyfill",
-                    "url": "https://github.com/symfony/polyfill"
+                    "url": "https://github.com/symfony/polyfill",
+                    "name": "symfony/polyfill"
                 }
             },
             "autoload": {
@@ -10109,7 +10335,7 @@
                 "uuid"
             ],
             "support": {
-                "source": "https://github.com/symfony/polyfill-uuid/tree/v1.30.0"
+                "source": "https://github.com/symfony/polyfill-uuid/tree/v1.31.0"
             },
             "funding": [
                 {
@@ -10125,24 +10351,24 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-05-31T15:07:36+00:00"
+            "time": "2024-09-09T11:45:10+00:00"
         },
         {
             "name": "symfony/process",
-            "version": "v6.4.8",
+            "version": "v7.2.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/process.git",
-                "reference": "8d92dd79149f29e89ee0f480254db595f6a6a2c5"
+                "reference": "d34b22ba9390ec19d2dd966c40aa9e8462f27a7e"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/process/zipball/8d92dd79149f29e89ee0f480254db595f6a6a2c5",
-                "reference": "8d92dd79149f29e89ee0f480254db595f6a6a2c5",
+                "url": "https://api.github.com/repos/symfony/process/zipball/d34b22ba9390ec19d2dd966c40aa9e8462f27a7e",
+                "reference": "d34b22ba9390ec19d2dd966c40aa9e8462f27a7e",
                 "shasum": ""
             },
             "require": {
-                "php": ">=8.1"
+                "php": ">=8.2"
             },
             "type": "library",
             "autoload": {
@@ -10170,7 +10396,7 @@
             "description": "Executes commands in sub-processes",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/process/tree/v6.4.8"
+                "source": "https://github.com/symfony/process/tree/v7.2.0"
             },
             "funding": [
                 {
@@ -10186,47 +10412,42 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-05-31T14:49:08+00:00"
+            "time": "2024-11-06T14:24:19+00:00"
         },
         {
             "name": "symfony/psr-http-message-bridge",
-            "version": "v2.3.1",
+            "version": "v7.2.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/psr-http-message-bridge.git",
-                "reference": "581ca6067eb62640de5ff08ee1ba6850a0ee472e"
+                "reference": "03f2f72319e7acaf2a9f6fcbe30ef17eec51594f"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/psr-http-message-bridge/zipball/581ca6067eb62640de5ff08ee1ba6850a0ee472e",
-                "reference": "581ca6067eb62640de5ff08ee1ba6850a0ee472e",
+                "url": "https://api.github.com/repos/symfony/psr-http-message-bridge/zipball/03f2f72319e7acaf2a9f6fcbe30ef17eec51594f",
+                "reference": "03f2f72319e7acaf2a9f6fcbe30ef17eec51594f",
                 "shasum": ""
             },
             "require": {
-                "php": ">=7.2.5",
-                "psr/http-message": "^1.0 || ^2.0",
-                "symfony/deprecation-contracts": "^2.5 || ^3.0",
-                "symfony/http-foundation": "^5.4 || ^6.0"
+                "php": ">=8.2",
+                "psr/http-message": "^1.0|^2.0",
+                "symfony/http-foundation": "^6.4|^7.0"
+            },
+            "conflict": {
+                "php-http/discovery": "<1.15",
+                "symfony/http-kernel": "<6.4"
             },
             "require-dev": {
                 "nyholm/psr7": "^1.1",
-                "psr/log": "^1.1 || ^2 || ^3",
-                "symfony/browser-kit": "^5.4 || ^6.0",
-                "symfony/config": "^5.4 || ^6.0",
-                "symfony/event-dispatcher": "^5.4 || ^6.0",
-                "symfony/framework-bundle": "^5.4 || ^6.0",
-                "symfony/http-kernel": "^5.4 || ^6.0",
-                "symfony/phpunit-bridge": "^6.2"
-            },
-            "suggest": {
-                "nyholm/psr7": "For a super lightweight PSR-7/17 implementation"
+                "php-http/discovery": "^1.15",
+                "psr/log": "^1.1.4|^2|^3",
+                "symfony/browser-kit": "^6.4|^7.0",
+                "symfony/config": "^6.4|^7.0",
+                "symfony/event-dispatcher": "^6.4|^7.0",
+                "symfony/framework-bundle": "^6.4|^7.0",
+                "symfony/http-kernel": "^6.4|^7.0"
             },
             "type": "symfony-bridge",
-            "extra": {
-                "branch-alias": {
-                    "dev-main": "2.3-dev"
-                }
-            },
             "autoload": {
                 "psr-4": {
                     "Symfony\\Bridge\\PsrHttpMessage\\": ""
@@ -10246,11 +10467,11 @@
                 },
                 {
                     "name": "Symfony Community",
-                    "homepage": "http://symfony.com/contributors"
+                    "homepage": "https://symfony.com/contributors"
                 }
             ],
             "description": "PSR HTTP message bridge",
-            "homepage": "http://symfony.com",
+            "homepage": "https://symfony.com",
             "keywords": [
                 "http",
                 "http-message",
@@ -10258,8 +10479,7 @@
                 "psr-7"
             ],
             "support": {
-                "issues": "https://github.com/symfony/psr-http-message-bridge/issues",
-                "source": "https://github.com/symfony/psr-http-message-bridge/tree/v2.3.1"
+                "source": "https://github.com/symfony/psr-http-message-bridge/tree/v7.2.0"
             },
             "funding": [
                 {
@@ -10275,40 +10495,38 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2023-07-26T11:53:26+00:00"
+            "time": "2024-09-26T08:57:56+00:00"
         },
         {
             "name": "symfony/routing",
-            "version": "v6.4.8",
+            "version": "v7.2.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/routing.git",
-                "reference": "8a40d0f9b01f0fbb80885d3ce0ad6714fb603a58"
+                "reference": "e10a2450fa957af6c448b9b93c9010a4e4c0725e"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/routing/zipball/8a40d0f9b01f0fbb80885d3ce0ad6714fb603a58",
-                "reference": "8a40d0f9b01f0fbb80885d3ce0ad6714fb603a58",
+                "url": "https://api.github.com/repos/symfony/routing/zipball/e10a2450fa957af6c448b9b93c9010a4e4c0725e",
+                "reference": "e10a2450fa957af6c448b9b93c9010a4e4c0725e",
                 "shasum": ""
             },
             "require": {
-                "php": ">=8.1",
+                "php": ">=8.2",
                 "symfony/deprecation-contracts": "^2.5|^3"
             },
             "conflict": {
-                "doctrine/annotations": "<1.12",
-                "symfony/config": "<6.2",
-                "symfony/dependency-injection": "<5.4",
-                "symfony/yaml": "<5.4"
+                "symfony/config": "<6.4",
+                "symfony/dependency-injection": "<6.4",
+                "symfony/yaml": "<6.4"
             },
             "require-dev": {
-                "doctrine/annotations": "^1.12|^2",
                 "psr/log": "^1|^2|^3",
-                "symfony/config": "^6.2|^7.0",
-                "symfony/dependency-injection": "^5.4|^6.0|^7.0",
-                "symfony/expression-language": "^5.4|^6.0|^7.0",
-                "symfony/http-foundation": "^5.4|^6.0|^7.0",
-                "symfony/yaml": "^5.4|^6.0|^7.0"
+                "symfony/config": "^6.4|^7.0",
+                "symfony/dependency-injection": "^6.4|^7.0",
+                "symfony/expression-language": "^6.4|^7.0",
+                "symfony/http-foundation": "^6.4|^7.0",
+                "symfony/yaml": "^6.4|^7.0"
             },
             "type": "library",
             "autoload": {
@@ -10342,7 +10560,7 @@
                 "url"
             ],
             "support": {
-                "source": "https://github.com/symfony/routing/tree/v6.4.8"
+                "source": "https://github.com/symfony/routing/tree/v7.2.0"
             },
             "funding": [
                 {
@@ -10358,20 +10576,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-05-31T14:49:08+00:00"
+            "time": "2024-11-25T11:08:51+00:00"
         },
         {
             "name": "symfony/service-contracts",
-            "version": "v3.5.0",
+            "version": "v3.5.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/service-contracts.git",
-                "reference": "bd1d9e59a81d8fa4acdcea3f617c581f7475a80f"
+                "reference": "e53260aabf78fb3d63f8d79d69ece59f80d5eda0"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/service-contracts/zipball/bd1d9e59a81d8fa4acdcea3f617c581f7475a80f",
-                "reference": "bd1d9e59a81d8fa4acdcea3f617c581f7475a80f",
+                "url": "https://api.github.com/repos/symfony/service-contracts/zipball/e53260aabf78fb3d63f8d79d69ece59f80d5eda0",
+                "reference": "e53260aabf78fb3d63f8d79d69ece59f80d5eda0",
                 "shasum": ""
             },
             "require": {
@@ -10384,12 +10602,12 @@
             },
             "type": "library",
             "extra": {
+                "thanks": {
+                    "url": "https://github.com/symfony/contracts",
+                    "name": "symfony/contracts"
+                },
                 "branch-alias": {
                     "dev-main": "3.5-dev"
-                },
-                "thanks": {
-                    "name": "symfony/contracts",
-                    "url": "https://github.com/symfony/contracts"
                 }
             },
             "autoload": {
@@ -10425,7 +10643,7 @@
                 "standards"
             ],
             "support": {
-                "source": "https://github.com/symfony/service-contracts/tree/v3.5.0"
+                "source": "https://github.com/symfony/service-contracts/tree/v3.5.1"
             },
             "funding": [
                 {
@@ -10441,24 +10659,24 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-04-18T09:32:20+00:00"
+            "time": "2024-09-25T14:20:29+00:00"
         },
         {
             "name": "symfony/string",
-            "version": "v6.4.8",
+            "version": "v7.2.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/string.git",
-                "reference": "a147c0f826c4a1f3afb763ab8e009e37c877a44d"
+                "reference": "446e0d146f991dde3e73f45f2c97a9faad773c82"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/string/zipball/a147c0f826c4a1f3afb763ab8e009e37c877a44d",
-                "reference": "a147c0f826c4a1f3afb763ab8e009e37c877a44d",
+                "url": "https://api.github.com/repos/symfony/string/zipball/446e0d146f991dde3e73f45f2c97a9faad773c82",
+                "reference": "446e0d146f991dde3e73f45f2c97a9faad773c82",
                 "shasum": ""
             },
             "require": {
-                "php": ">=8.1",
+                "php": ">=8.2",
                 "symfony/polyfill-ctype": "~1.8",
                 "symfony/polyfill-intl-grapheme": "~1.0",
                 "symfony/polyfill-intl-normalizer": "~1.0",
@@ -10468,11 +10686,12 @@
                 "symfony/translation-contracts": "<2.5"
             },
             "require-dev": {
-                "symfony/error-handler": "^5.4|^6.0|^7.0",
-                "symfony/http-client": "^5.4|^6.0|^7.0",
-                "symfony/intl": "^6.2|^7.0",
+                "symfony/emoji": "^7.1",
+                "symfony/error-handler": "^6.4|^7.0",
+                "symfony/http-client": "^6.4|^7.0",
+                "symfony/intl": "^6.4|^7.0",
                 "symfony/translation-contracts": "^2.5|^3.0",
-                "symfony/var-exporter": "^5.4|^6.0|^7.0"
+                "symfony/var-exporter": "^6.4|^7.0"
             },
             "type": "library",
             "autoload": {
@@ -10511,7 +10730,7 @@
                 "utf8"
             ],
             "support": {
-                "source": "https://github.com/symfony/string/tree/v6.4.8"
+                "source": "https://github.com/symfony/string/tree/v7.2.0"
             },
             "funding": [
                 {
@@ -10527,20 +10746,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-05-31T14:49:08+00:00"
+            "time": "2024-11-13T13:31:26+00:00"
         },
         {
             "name": "symfony/translation",
-            "version": "v6.4.8",
+            "version": "v6.4.13",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/translation.git",
-                "reference": "a002933b13989fc4bd0b58e04bf7eec5210e438a"
+                "reference": "bee9bfabfa8b4045a66bf82520e492cddbaffa66"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/translation/zipball/a002933b13989fc4bd0b58e04bf7eec5210e438a",
-                "reference": "a002933b13989fc4bd0b58e04bf7eec5210e438a",
+                "url": "https://api.github.com/repos/symfony/translation/zipball/bee9bfabfa8b4045a66bf82520e492cddbaffa66",
+                "reference": "bee9bfabfa8b4045a66bf82520e492cddbaffa66",
                 "shasum": ""
             },
             "require": {
@@ -10606,7 +10825,7 @@
             "description": "Provides tools to internationalize your application",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/translation/tree/v6.4.8"
+                "source": "https://github.com/symfony/translation/tree/v6.4.13"
             },
             "funding": [
                 {
@@ -10622,20 +10841,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-05-31T14:49:08+00:00"
+            "time": "2024-09-27T18:14:25+00:00"
         },
         {
             "name": "symfony/translation-contracts",
-            "version": "v3.5.0",
+            "version": "v3.5.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/translation-contracts.git",
-                "reference": "b9d2189887bb6b2e0367a9fc7136c5239ab9b05a"
+                "reference": "4667ff3bd513750603a09c8dedbea942487fb07c"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/translation-contracts/zipball/b9d2189887bb6b2e0367a9fc7136c5239ab9b05a",
-                "reference": "b9d2189887bb6b2e0367a9fc7136c5239ab9b05a",
+                "url": "https://api.github.com/repos/symfony/translation-contracts/zipball/4667ff3bd513750603a09c8dedbea942487fb07c",
+                "reference": "4667ff3bd513750603a09c8dedbea942487fb07c",
                 "shasum": ""
             },
             "require": {
@@ -10643,12 +10862,12 @@
             },
             "type": "library",
             "extra": {
+                "thanks": {
+                    "url": "https://github.com/symfony/contracts",
+                    "name": "symfony/contracts"
+                },
                 "branch-alias": {
                     "dev-main": "3.5-dev"
-                },
-                "thanks": {
-                    "name": "symfony/contracts",
-                    "url": "https://github.com/symfony/contracts"
                 }
             },
             "autoload": {
@@ -10684,7 +10903,7 @@
                 "standards"
             ],
             "support": {
-                "source": "https://github.com/symfony/translation-contracts/tree/v3.5.0"
+                "source": "https://github.com/symfony/translation-contracts/tree/v3.5.1"
             },
             "funding": [
                 {
@@ -10700,28 +10919,28 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-04-18T09:32:20+00:00"
+            "time": "2024-09-25T14:20:29+00:00"
         },
         {
             "name": "symfony/uid",
-            "version": "v6.4.8",
+            "version": "v7.2.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/uid.git",
-                "reference": "35904eca37a84bb764c560cbfcac9f0ac2bcdbdf"
+                "reference": "2d294d0c48df244c71c105a169d0190bfb080426"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/uid/zipball/35904eca37a84bb764c560cbfcac9f0ac2bcdbdf",
-                "reference": "35904eca37a84bb764c560cbfcac9f0ac2bcdbdf",
+                "url": "https://api.github.com/repos/symfony/uid/zipball/2d294d0c48df244c71c105a169d0190bfb080426",
+                "reference": "2d294d0c48df244c71c105a169d0190bfb080426",
                 "shasum": ""
             },
             "require": {
-                "php": ">=8.1",
+                "php": ">=8.2",
                 "symfony/polyfill-uuid": "^1.15"
             },
             "require-dev": {
-                "symfony/console": "^5.4|^6.0|^7.0"
+                "symfony/console": "^6.4|^7.0"
             },
             "type": "library",
             "autoload": {
@@ -10758,7 +10977,7 @@
                 "uuid"
             ],
             "support": {
-                "source": "https://github.com/symfony/uid/tree/v6.4.8"
+                "source": "https://github.com/symfony/uid/tree/v7.2.0"
             },
             "funding": [
                 {
@@ -10774,38 +10993,36 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-05-31T14:49:08+00:00"
+            "time": "2024-09-25T14:21:43+00:00"
         },
         {
             "name": "symfony/var-dumper",
-            "version": "v6.4.8",
+            "version": "v7.2.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/var-dumper.git",
-                "reference": "ad23ca4312395f0a8a8633c831ef4c4ee542ed25"
+                "reference": "c6a22929407dec8765d6e2b6ff85b800b245879c"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/var-dumper/zipball/ad23ca4312395f0a8a8633c831ef4c4ee542ed25",
-                "reference": "ad23ca4312395f0a8a8633c831ef4c4ee542ed25",
+                "url": "https://api.github.com/repos/symfony/var-dumper/zipball/c6a22929407dec8765d6e2b6ff85b800b245879c",
+                "reference": "c6a22929407dec8765d6e2b6ff85b800b245879c",
                 "shasum": ""
             },
             "require": {
-                "php": ">=8.1",
-                "symfony/deprecation-contracts": "^2.5|^3",
+                "php": ">=8.2",
                 "symfony/polyfill-mbstring": "~1.0"
             },
             "conflict": {
-                "symfony/console": "<5.4"
+                "symfony/console": "<6.4"
             },
             "require-dev": {
                 "ext-iconv": "*",
-                "symfony/console": "^5.4|^6.0|^7.0",
-                "symfony/error-handler": "^6.3|^7.0",
-                "symfony/http-kernel": "^5.4|^6.0|^7.0",
-                "symfony/process": "^5.4|^6.0|^7.0",
-                "symfony/uid": "^5.4|^6.0|^7.0",
-                "twig/twig": "^2.13|^3.0.4"
+                "symfony/console": "^6.4|^7.0",
+                "symfony/http-kernel": "^6.4|^7.0",
+                "symfony/process": "^6.4|^7.0",
+                "symfony/uid": "^6.4|^7.0",
+                "twig/twig": "^3.12"
             },
             "bin": [
                 "Resources/bin/var-dump-server"
@@ -10843,7 +11060,7 @@
                 "dump"
             ],
             "support": {
-                "source": "https://github.com/symfony/var-dumper/tree/v6.4.8"
+                "source": "https://github.com/symfony/var-dumper/tree/v7.2.0"
             },
             "funding": [
                 {
@@ -10859,7 +11076,73 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-05-31T14:49:08+00:00"
+            "time": "2024-11-08T15:48:14+00:00"
+        },
+        {
+            "name": "tabuna/breadcrumbs",
+            "version": "4.2.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/tabuna/breadcrumbs.git",
+                "reference": "1d9047306f67e7fcc86fc7e608f1432f247636da"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/tabuna/breadcrumbs/zipball/1d9047306f67e7fcc86fc7e608f1432f247636da",
+                "reference": "1d9047306f67e7fcc86fc7e608f1432f247636da",
+                "shasum": ""
+            },
+            "require": {
+                "ext-json": "*",
+                "laravel/framework": "^10.0|^11.0",
+                "laravel/serializable-closure": "^1.0|^2.0",
+                "php": "^8.1"
+            },
+            "require-dev": {
+                "orchestra/testbench": "^8.0|^9.0",
+                "phpunit/php-code-coverage": "^10.|^11.0",
+                "phpunit/phpunit": "^10.5|^11.0"
+            },
+            "type": "library",
+            "extra": {
+                "laravel": {
+                    "aliases": {
+                        "Breadcrumbs": "Tabuna\\Breadcrumbs\\Breadcrumbs"
+                    },
+                    "providers": [
+                        "Tabuna\\Breadcrumbs\\BreadcrumbsServiceProvider"
+                    ]
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Tabuna\\Breadcrumbs\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Alexandr Chernyaev",
+                    "email": "bliz48rus@gmail.com"
+                },
+                {
+                    "name": "Dwight Watson",
+                    "email": "dwight@studentservices.com.au"
+                },
+                {
+                    "name": "Dave James Miller",
+                    "email": "dave@davejamesmiller.com"
+                }
+            ],
+            "description": "An easy way to add breadcrumbs to your Laravel app.",
+            "support": {
+                "issues": "https://github.com/tabuna/breadcrumbs/issues",
+                "source": "https://github.com/tabuna/breadcrumbs/tree/4.2.1"
+            },
+            "time": "2024-11-26T12:21:27+00:00"
         },
         {
             "name": "tecnickcom/tc-lib-barcode",
@@ -11032,20 +11315,21 @@
         },
         {
             "name": "tecnickcom/tcpdf",
-            "version": "6.7.5",
+            "version": "6.8.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/tecnickcom/TCPDF.git",
-                "reference": "951eabf0338ec2522bd0d5d9c79b08a3a3d36b36"
+                "reference": "14ffa0e308f5634aa2489568b4b90b24073b6731"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/tecnickcom/TCPDF/zipball/951eabf0338ec2522bd0d5d9c79b08a3a3d36b36",
-                "reference": "951eabf0338ec2522bd0d5d9c79b08a3a3d36b36",
+                "url": "https://api.github.com/repos/tecnickcom/TCPDF/zipball/14ffa0e308f5634aa2489568b4b90b24073b6731",
+                "reference": "14ffa0e308f5634aa2489568b4b90b24073b6731",
                 "shasum": ""
             },
             "require": {
-                "php": ">=5.5.0"
+                "ext-curl": "*",
+                "php": ">=7.1.0"
             },
             "type": "library",
             "autoload": {
@@ -11092,7 +11376,7 @@
             ],
             "support": {
                 "issues": "https://github.com/tecnickcom/TCPDF/issues",
-                "source": "https://github.com/tecnickcom/TCPDF/tree/6.7.5"
+                "source": "https://github.com/tecnickcom/TCPDF/tree/6.8.0"
             },
             "funding": [
                 {
@@ -11100,7 +11384,7 @@
                     "type": "custom"
                 }
             ],
-            "time": "2024-04-20T17:25:10+00:00"
+            "time": "2024-12-23T13:34:57+00:00"
         },
         {
             "name": "tijsverkoyen/css-to-inline-styles",
@@ -11372,13 +11656,13 @@
             },
             "type": "library",
             "extra": {
-                "branch-alias": {
-                    "dev-master": "1.0-dev"
-                },
                 "laravel": {
                     "providers": [
                         "Unicodeveloper\\DumbPassword\\DumbPasswordServiceProvider"
                     ]
+                },
+                "branch-alias": {
+                    "dev-master": "1.0-dev"
                 }
             },
             "autoload": {
@@ -11414,23 +11698,23 @@
         },
         {
             "name": "vlucas/phpdotenv",
-            "version": "v5.6.0",
+            "version": "v5.6.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/vlucas/phpdotenv.git",
-                "reference": "2cf9fb6054c2bb1d59d1f3817706ecdb9d2934c4"
+                "reference": "a59a13791077fe3d44f90e7133eb68e7d22eaff2"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/vlucas/phpdotenv/zipball/2cf9fb6054c2bb1d59d1f3817706ecdb9d2934c4",
-                "reference": "2cf9fb6054c2bb1d59d1f3817706ecdb9d2934c4",
+                "url": "https://api.github.com/repos/vlucas/phpdotenv/zipball/a59a13791077fe3d44f90e7133eb68e7d22eaff2",
+                "reference": "a59a13791077fe3d44f90e7133eb68e7d22eaff2",
                 "shasum": ""
             },
             "require": {
                 "ext-pcre": "*",
-                "graham-campbell/result-type": "^1.1.2",
+                "graham-campbell/result-type": "^1.1.3",
                 "php": "^7.2.5 || ^8.0",
-                "phpoption/phpoption": "^1.9.2",
+                "phpoption/phpoption": "^1.9.3",
                 "symfony/polyfill-ctype": "^1.24",
                 "symfony/polyfill-mbstring": "^1.24",
                 "symfony/polyfill-php80": "^1.24"
@@ -11447,7 +11731,7 @@
             "extra": {
                 "bamarni-bin": {
                     "bin-links": true,
-                    "forward-command": true
+                    "forward-command": false
                 },
                 "branch-alias": {
                     "dev-master": "5.6-dev"
@@ -11482,7 +11766,7 @@
             ],
             "support": {
                 "issues": "https://github.com/vlucas/phpdotenv/issues",
-                "source": "https://github.com/vlucas/phpdotenv/tree/v5.6.0"
+                "source": "https://github.com/vlucas/phpdotenv/tree/v5.6.1"
             },
             "funding": [
                 {
@@ -11494,20 +11778,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2023-11-12T22:43:29+00:00"
+            "time": "2024-07-20T21:52:34+00:00"
         },
         {
             "name": "voku/portable-ascii",
-            "version": "2.0.1",
+            "version": "2.0.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/voku/portable-ascii.git",
-                "reference": "b56450eed252f6801410d810c8e1727224ae0743"
+                "reference": "b1d923f88091c6bf09699efcd7c8a1b1bfd7351d"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/voku/portable-ascii/zipball/b56450eed252f6801410d810c8e1727224ae0743",
-                "reference": "b56450eed252f6801410d810c8e1727224ae0743",
+                "url": "https://api.github.com/repos/voku/portable-ascii/zipball/b1d923f88091c6bf09699efcd7c8a1b1bfd7351d",
+                "reference": "b1d923f88091c6bf09699efcd7c8a1b1bfd7351d",
                 "shasum": ""
             },
             "require": {
@@ -11532,7 +11816,7 @@
             "authors": [
                 {
                     "name": "Lars Moelleken",
-                    "homepage": "http://www.moelleken.org/"
+                    "homepage": "https://www.moelleken.org/"
                 }
             ],
             "description": "Portable ASCII library - performance optimized (ascii) string functions for php.",
@@ -11544,7 +11828,7 @@
             ],
             "support": {
                 "issues": "https://github.com/voku/portable-ascii/issues",
-                "source": "https://github.com/voku/portable-ascii/tree/2.0.1"
+                "source": "https://github.com/voku/portable-ascii/tree/2.0.3"
             },
             "funding": [
                 {
@@ -11568,7 +11852,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2022-03-08T17:03:00+00:00"
+            "time": "2024-11-21T01:49:47+00:00"
         },
         {
             "name": "watson/validating",
@@ -11684,258 +11968,6 @@
         }
     ],
     "packages-dev": [
-        {
-            "name": "amphp/amp",
-            "version": "v2.6.4",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/amphp/amp.git",
-                "reference": "ded3d9be08f526089eb7ee8d9f16a9768f9dec2d"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/amphp/amp/zipball/ded3d9be08f526089eb7ee8d9f16a9768f9dec2d",
-                "reference": "ded3d9be08f526089eb7ee8d9f16a9768f9dec2d",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=7.1"
-            },
-            "require-dev": {
-                "amphp/php-cs-fixer-config": "dev-master",
-                "amphp/phpunit-util": "^1",
-                "ext-json": "*",
-                "jetbrains/phpstorm-stubs": "^2019.3",
-                "phpunit/phpunit": "^7 | ^8 | ^9",
-                "react/promise": "^2",
-                "vimeo/psalm": "^3.12"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "2.x-dev"
-                }
-            },
-            "autoload": {
-                "files": [
-                    "lib/functions.php",
-                    "lib/Internal/functions.php"
-                ],
-                "psr-4": {
-                    "Amp\\": "lib"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Daniel Lowrey",
-                    "email": "rdlowrey@php.net"
-                },
-                {
-                    "name": "Aaron Piotrowski",
-                    "email": "aaron@trowski.com"
-                },
-                {
-                    "name": "Bob Weinand",
-                    "email": "bobwei9@hotmail.com"
-                },
-                {
-                    "name": "Niklas Keller",
-                    "email": "me@kelunik.com"
-                }
-            ],
-            "description": "A non-blocking concurrency framework for PHP applications.",
-            "homepage": "https://amphp.org/amp",
-            "keywords": [
-                "async",
-                "asynchronous",
-                "awaitable",
-                "concurrency",
-                "event",
-                "event-loop",
-                "future",
-                "non-blocking",
-                "promise"
-            ],
-            "support": {
-                "irc": "irc://irc.freenode.org/amphp",
-                "issues": "https://github.com/amphp/amp/issues",
-                "source": "https://github.com/amphp/amp/tree/v2.6.4"
-            },
-            "funding": [
-                {
-                    "url": "https://github.com/amphp",
-                    "type": "github"
-                }
-            ],
-            "time": "2024-03-21T18:52:26+00:00"
-        },
-        {
-            "name": "amphp/byte-stream",
-            "version": "v1.8.2",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/amphp/byte-stream.git",
-                "reference": "4f0e968ba3798a423730f567b1b50d3441c16ddc"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/amphp/byte-stream/zipball/4f0e968ba3798a423730f567b1b50d3441c16ddc",
-                "reference": "4f0e968ba3798a423730f567b1b50d3441c16ddc",
-                "shasum": ""
-            },
-            "require": {
-                "amphp/amp": "^2",
-                "php": ">=7.1"
-            },
-            "require-dev": {
-                "amphp/php-cs-fixer-config": "dev-master",
-                "amphp/phpunit-util": "^1.4",
-                "friendsofphp/php-cs-fixer": "^2.3",
-                "jetbrains/phpstorm-stubs": "^2019.3",
-                "phpunit/phpunit": "^6 || ^7 || ^8",
-                "psalm/phar": "^3.11.4"
-            },
-            "type": "library",
-            "autoload": {
-                "files": [
-                    "lib/functions.php"
-                ],
-                "psr-4": {
-                    "Amp\\ByteStream\\": "lib"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Aaron Piotrowski",
-                    "email": "aaron@trowski.com"
-                },
-                {
-                    "name": "Niklas Keller",
-                    "email": "me@kelunik.com"
-                }
-            ],
-            "description": "A stream abstraction to make working with non-blocking I/O simple.",
-            "homepage": "https://amphp.org/byte-stream",
-            "keywords": [
-                "amp",
-                "amphp",
-                "async",
-                "io",
-                "non-blocking",
-                "stream"
-            ],
-            "support": {
-                "issues": "https://github.com/amphp/byte-stream/issues",
-                "source": "https://github.com/amphp/byte-stream/tree/v1.8.2"
-            },
-            "funding": [
-                {
-                    "url": "https://github.com/amphp",
-                    "type": "github"
-                }
-            ],
-            "time": "2024-04-13T18:00:56+00:00"
-        },
-        {
-            "name": "brianium/paratest",
-            "version": "v6.11.1",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/paratestphp/paratest.git",
-                "reference": "78e297a969049ca7cc370e80ff5e102921ef39a3"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/paratestphp/paratest/zipball/78e297a969049ca7cc370e80ff5e102921ef39a3",
-                "reference": "78e297a969049ca7cc370e80ff5e102921ef39a3",
-                "shasum": ""
-            },
-            "require": {
-                "ext-dom": "*",
-                "ext-pcre": "*",
-                "ext-reflection": "*",
-                "ext-simplexml": "*",
-                "fidry/cpu-core-counter": "^0.4.1 || ^0.5.1 || ^1.0.0",
-                "jean85/pretty-package-versions": "^2.0.5",
-                "php": "^7.3 || ^8.0",
-                "phpunit/php-code-coverage": "^9.2.25",
-                "phpunit/php-file-iterator": "^3.0.6",
-                "phpunit/php-timer": "^5.0.3",
-                "phpunit/phpunit": "^9.6.4",
-                "sebastian/environment": "^5.1.5",
-                "symfony/console": "^5.4.28 || ^6.3.4 || ^7.0.0",
-                "symfony/process": "^5.4.28 || ^6.3.4 || ^7.0.0"
-            },
-            "require-dev": {
-                "doctrine/coding-standard": "^12.0.0",
-                "ext-pcov": "*",
-                "ext-posix": "*",
-                "infection/infection": "^0.27.6",
-                "squizlabs/php_codesniffer": "^3.7.2",
-                "symfony/filesystem": "^5.4.25 || ^6.3.1 || ^7.0.0",
-                "vimeo/psalm": "^5.7.7"
-            },
-            "bin": [
-                "bin/paratest",
-                "bin/paratest.bat",
-                "bin/paratest_for_phpstorm"
-            ],
-            "type": "library",
-            "autoload": {
-                "psr-4": {
-                    "ParaTest\\": [
-                        "src/"
-                    ]
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Brian Scaturro",
-                    "email": "scaturrob@gmail.com",
-                    "role": "Developer"
-                },
-                {
-                    "name": "Filippo Tessarotto",
-                    "email": "zoeslam@gmail.com",
-                    "role": "Developer"
-                }
-            ],
-            "description": "Parallel testing for PHP",
-            "homepage": "https://github.com/paratestphp/paratest",
-            "keywords": [
-                "concurrent",
-                "parallel",
-                "phpunit",
-                "testing"
-            ],
-            "support": {
-                "issues": "https://github.com/paratestphp/paratest/issues",
-                "source": "https://github.com/paratestphp/paratest/tree/v6.11.1"
-            },
-            "funding": [
-                {
-                    "url": "https://github.com/sponsors/Slamdunk",
-                    "type": "github"
-                },
-                {
-                    "url": "https://paypal.me/filippotessarotto",
-                    "type": "paypal"
-                }
-            ],
-            "time": "2024-03-13T06:54:29+00:00"
-        },
         {
             "name": "clue/ndjson-react",
             "version": "v1.3.0",
@@ -12002,24 +12034,24 @@
         },
         {
             "name": "cmgmyr/phploc",
-            "version": "8.0.3",
+            "version": "8.0.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/cmgmyr/phploc.git",
-                "reference": "e61d4729df46c5920ab61973bfa3f70f81a70b5f"
+                "reference": "b0c4ec71f40ef84c9893e1a7212a72e1098b90f7"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/cmgmyr/phploc/zipball/e61d4729df46c5920ab61973bfa3f70f81a70b5f",
-                "reference": "e61d4729df46c5920ab61973bfa3f70f81a70b5f",
+                "url": "https://api.github.com/repos/cmgmyr/phploc/zipball/b0c4ec71f40ef84c9893e1a7212a72e1098b90f7",
+                "reference": "b0c4ec71f40ef84c9893e1a7212a72e1098b90f7",
                 "shasum": ""
             },
             "require": {
                 "ext-dom": "*",
                 "ext-json": "*",
                 "php": "^7.4 || ^8.0",
-                "phpunit/php-file-iterator": "^3.0|^4.0",
-                "sebastian/cli-parser": "^1.0|^2.0"
+                "phpunit/php-file-iterator": "^3.0|^4.0|^5.0",
+                "sebastian/cli-parser": "^1.0|^2.0|^3.0"
             },
             "require-dev": {
                 "friendsofphp/php-cs-fixer": "^3.2",
@@ -12055,7 +12087,7 @@
             "homepage": "https://github.com/cmgmyr/phploc",
             "support": {
                 "issues": "https://github.com/cmgmyr/phploc/issues",
-                "source": "https://github.com/cmgmyr/phploc/tree/8.0.3"
+                "source": "https://github.com/cmgmyr/phploc/tree/8.0.4"
             },
             "funding": [
                 {
@@ -12063,32 +12095,40 @@
                     "type": "github"
                 }
             ],
-            "time": "2023-08-05T16:49:39+00:00"
+            "time": "2024-10-31T19:26:53+00:00"
         },
         {
             "name": "composer/pcre",
-            "version": "3.1.4",
+            "version": "3.3.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/composer/pcre.git",
-                "reference": "04229f163664973f68f38f6f73d917799168ef24"
+                "reference": "b2bed4734f0cc156ee1fe9c0da2550420d99a21e"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/composer/pcre/zipball/04229f163664973f68f38f6f73d917799168ef24",
-                "reference": "04229f163664973f68f38f6f73d917799168ef24",
+                "url": "https://api.github.com/repos/composer/pcre/zipball/b2bed4734f0cc156ee1fe9c0da2550420d99a21e",
+                "reference": "b2bed4734f0cc156ee1fe9c0da2550420d99a21e",
                 "shasum": ""
             },
             "require": {
                 "php": "^7.4 || ^8.0"
             },
+            "conflict": {
+                "phpstan/phpstan": "<1.11.10"
+            },
             "require-dev": {
-                "phpstan/phpstan": "^1.3",
-                "phpstan/phpstan-strict-rules": "^1.1",
-                "symfony/phpunit-bridge": "^5"
+                "phpstan/phpstan": "^1.12 || ^2",
+                "phpstan/phpstan-strict-rules": "^1 || ^2",
+                "phpunit/phpunit": "^8 || ^9"
             },
             "type": "library",
             "extra": {
+                "phpstan": {
+                    "includes": [
+                        "extension.neon"
+                    ]
+                },
                 "branch-alias": {
                     "dev-main": "3.x-dev"
                 }
@@ -12118,7 +12158,7 @@
             ],
             "support": {
                 "issues": "https://github.com/composer/pcre/issues",
-                "source": "https://github.com/composer/pcre/tree/3.1.4"
+                "source": "https://github.com/composer/pcre/tree/3.3.2"
             },
             "funding": [
                 {
@@ -12134,28 +12174,28 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-05-27T13:40:54+00:00"
+            "time": "2024-11-12T16:29:46+00:00"
         },
         {
             "name": "composer/semver",
-            "version": "3.4.0",
+            "version": "3.4.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/composer/semver.git",
-                "reference": "35e8d0af4486141bc745f23a29cc2091eb624a32"
+                "reference": "4313d26ada5e0c4edfbd1dc481a92ff7bff91f12"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/composer/semver/zipball/35e8d0af4486141bc745f23a29cc2091eb624a32",
-                "reference": "35e8d0af4486141bc745f23a29cc2091eb624a32",
+                "url": "https://api.github.com/repos/composer/semver/zipball/4313d26ada5e0c4edfbd1dc481a92ff7bff91f12",
+                "reference": "4313d26ada5e0c4edfbd1dc481a92ff7bff91f12",
                 "shasum": ""
             },
             "require": {
                 "php": "^5.3.2 || ^7.0 || ^8.0"
             },
             "require-dev": {
-                "phpstan/phpstan": "^1.4",
-                "symfony/phpunit-bridge": "^4.2 || ^5"
+                "phpstan/phpstan": "^1.11",
+                "symfony/phpunit-bridge": "^3 || ^7"
             },
             "type": "library",
             "extra": {
@@ -12199,7 +12239,7 @@
             "support": {
                 "irc": "ircs://irc.libera.chat:6697/composer",
                 "issues": "https://github.com/composer/semver/issues",
-                "source": "https://github.com/composer/semver/tree/3.4.0"
+                "source": "https://github.com/composer/semver/tree/3.4.3"
             },
             "funding": [
                 {
@@ -12215,7 +12255,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2023-08-31T09:50:34+00:00"
+            "time": "2024-09-19T14:15:21+00:00"
         },
         {
             "name": "composer/xdebug-handler",
@@ -12361,43 +12401,6 @@
             },
             "time": "2023-01-05T11:28:13+00:00"
         },
-        {
-            "name": "dnoegel/php-xdg-base-dir",
-            "version": "v0.1.1",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/dnoegel/php-xdg-base-dir.git",
-                "reference": "8f8a6e48c5ecb0f991c2fdcf5f154a47d85f9ffd"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/dnoegel/php-xdg-base-dir/zipball/8f8a6e48c5ecb0f991c2fdcf5f154a47d85f9ffd",
-                "reference": "8f8a6e48c5ecb0f991c2fdcf5f154a47d85f9ffd",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.2"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "~7.0|~6.0|~5.0|~4.8.35"
-            },
-            "type": "library",
-            "autoload": {
-                "psr-4": {
-                    "XdgBaseDir\\": "src/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "description": "implementation of xdg base directory specification for php",
-            "support": {
-                "issues": "https://github.com/dnoegel/php-xdg-base-dir/issues",
-                "source": "https://github.com/dnoegel/php-xdg-base-dir/tree/v0.1.1"
-            },
-            "time": "2019-12-04T15:06:13+00:00"
-        },
         {
             "name": "evenement/evenement",
             "version": "v3.0.2",
@@ -12445,182 +12448,18 @@
             },
             "time": "2023-08-08T05:53:35+00:00"
         },
-        {
-            "name": "fakerphp/faker",
-            "version": "v1.23.1",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/FakerPHP/Faker.git",
-                "reference": "bfb4fe148adbf78eff521199619b93a52ae3554b"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/FakerPHP/Faker/zipball/bfb4fe148adbf78eff521199619b93a52ae3554b",
-                "reference": "bfb4fe148adbf78eff521199619b93a52ae3554b",
-                "shasum": ""
-            },
-            "require": {
-                "php": "^7.4 || ^8.0",
-                "psr/container": "^1.0 || ^2.0",
-                "symfony/deprecation-contracts": "^2.2 || ^3.0"
-            },
-            "conflict": {
-                "fzaninotto/faker": "*"
-            },
-            "require-dev": {
-                "bamarni/composer-bin-plugin": "^1.4.1",
-                "doctrine/persistence": "^1.3 || ^2.0",
-                "ext-intl": "*",
-                "phpunit/phpunit": "^9.5.26",
-                "symfony/phpunit-bridge": "^5.4.16"
-            },
-            "suggest": {
-                "doctrine/orm": "Required to use Faker\\ORM\\Doctrine",
-                "ext-curl": "Required by Faker\\Provider\\Image to download images.",
-                "ext-dom": "Required by Faker\\Provider\\HtmlLorem for generating random HTML.",
-                "ext-iconv": "Required by Faker\\Provider\\ru_RU\\Text::realText() for generating real Russian text.",
-                "ext-mbstring": "Required for multibyte Unicode string functionality."
-            },
-            "type": "library",
-            "autoload": {
-                "psr-4": {
-                    "Faker\\": "src/Faker/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "François Zaninotto"
-                }
-            ],
-            "description": "Faker is a PHP library that generates fake data for you.",
-            "keywords": [
-                "data",
-                "faker",
-                "fixtures"
-            ],
-            "support": {
-                "issues": "https://github.com/FakerPHP/Faker/issues",
-                "source": "https://github.com/FakerPHP/Faker/tree/v1.23.1"
-            },
-            "time": "2024-01-02T13:46:09+00:00"
-        },
-        {
-            "name": "felixfbecker/advanced-json-rpc",
-            "version": "v3.2.1",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/felixfbecker/php-advanced-json-rpc.git",
-                "reference": "b5f37dbff9a8ad360ca341f3240dc1c168b45447"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/felixfbecker/php-advanced-json-rpc/zipball/b5f37dbff9a8ad360ca341f3240dc1c168b45447",
-                "reference": "b5f37dbff9a8ad360ca341f3240dc1c168b45447",
-                "shasum": ""
-            },
-            "require": {
-                "netresearch/jsonmapper": "^1.0 || ^2.0 || ^3.0 || ^4.0",
-                "php": "^7.1 || ^8.0",
-                "phpdocumentor/reflection-docblock": "^4.3.4 || ^5.0.0"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "^7.0 || ^8.0"
-            },
-            "type": "library",
-            "autoload": {
-                "psr-4": {
-                    "AdvancedJsonRpc\\": "lib/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "ISC"
-            ],
-            "authors": [
-                {
-                    "name": "Felix Becker",
-                    "email": "felix.b@outlook.com"
-                }
-            ],
-            "description": "A more advanced JSONRPC implementation",
-            "support": {
-                "issues": "https://github.com/felixfbecker/php-advanced-json-rpc/issues",
-                "source": "https://github.com/felixfbecker/php-advanced-json-rpc/tree/v3.2.1"
-            },
-            "time": "2021-06-11T22:34:44+00:00"
-        },
-        {
-            "name": "felixfbecker/language-server-protocol",
-            "version": "v1.5.2",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/felixfbecker/php-language-server-protocol.git",
-                "reference": "6e82196ffd7c62f7794d778ca52b69feec9f2842"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/felixfbecker/php-language-server-protocol/zipball/6e82196ffd7c62f7794d778ca52b69feec9f2842",
-                "reference": "6e82196ffd7c62f7794d778ca52b69feec9f2842",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=7.1"
-            },
-            "require-dev": {
-                "phpstan/phpstan": "*",
-                "squizlabs/php_codesniffer": "^3.1",
-                "vimeo/psalm": "^4.0"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.x-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "LanguageServerProtocol\\": "src/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "ISC"
-            ],
-            "authors": [
-                {
-                    "name": "Felix Becker",
-                    "email": "felix.b@outlook.com"
-                }
-            ],
-            "description": "PHP classes for the Language Server Protocol",
-            "keywords": [
-                "language",
-                "microsoft",
-                "php",
-                "server"
-            ],
-            "support": {
-                "issues": "https://github.com/felixfbecker/php-language-server-protocol/issues",
-                "source": "https://github.com/felixfbecker/php-language-server-protocol/tree/v1.5.2"
-            },
-            "time": "2022-03-02T22:36:06+00:00"
-        },
         {
             "name": "fidry/cpu-core-counter",
-            "version": "1.1.0",
+            "version": "1.2.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/theofidry/cpu-core-counter.git",
-                "reference": "f92996c4d5c1a696a6a970e20f7c4216200fcc42"
+                "reference": "8520451a140d3f46ac33042715115e290cf5785f"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/theofidry/cpu-core-counter/zipball/f92996c4d5c1a696a6a970e20f7c4216200fcc42",
-                "reference": "f92996c4d5c1a696a6a970e20f7c4216200fcc42",
+                "url": "https://api.github.com/repos/theofidry/cpu-core-counter/zipball/8520451a140d3f46ac33042715115e290cf5785f",
+                "reference": "8520451a140d3f46ac33042715115e290cf5785f",
                 "shasum": ""
             },
             "require": {
@@ -12660,7 +12499,7 @@
             ],
             "support": {
                 "issues": "https://github.com/theofidry/cpu-core-counter/issues",
-                "source": "https://github.com/theofidry/cpu-core-counter/tree/1.1.0"
+                "source": "https://github.com/theofidry/cpu-core-counter/tree/1.2.0"
             },
             "funding": [
                 {
@@ -12668,20 +12507,20 @@
                     "type": "github"
                 }
             ],
-            "time": "2024-02-07T09:43:46+00:00"
+            "time": "2024-08-06T10:04:20+00:00"
         },
         {
             "name": "friendsofphp/php-cs-fixer",
-            "version": "v3.59.3",
+            "version": "v3.68.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer.git",
-                "reference": "30ba9ecc2b0e5205e578fe29973c15653d9bfd29"
+                "reference": "b9db2b2ea3cdba7201067acee46f984ef2397cff"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/PHP-CS-Fixer/PHP-CS-Fixer/zipball/30ba9ecc2b0e5205e578fe29973c15653d9bfd29",
-                "reference": "30ba9ecc2b0e5205e578fe29973c15653d9bfd29",
+                "url": "https://api.github.com/repos/PHP-CS-Fixer/PHP-CS-Fixer/zipball/b9db2b2ea3cdba7201067acee46f984ef2397cff",
+                "reference": "b9db2b2ea3cdba7201067acee46f984ef2397cff",
                 "shasum": ""
             },
             "require": {
@@ -12691,38 +12530,38 @@
                 "ext-filter": "*",
                 "ext-json": "*",
                 "ext-tokenizer": "*",
-                "fidry/cpu-core-counter": "^1.0",
+                "fidry/cpu-core-counter": "^1.2",
                 "php": "^7.4 || ^8.0",
                 "react/child-process": "^0.6.5",
                 "react/event-loop": "^1.0",
                 "react/promise": "^2.0 || ^3.0",
                 "react/socket": "^1.0",
                 "react/stream": "^1.0",
-                "sebastian/diff": "^4.0 || ^5.0 || ^6.0",
-                "symfony/console": "^5.4 || ^6.0 || ^7.0",
-                "symfony/event-dispatcher": "^5.4 || ^6.0 || ^7.0",
-                "symfony/filesystem": "^5.4 || ^6.0 || ^7.0",
-                "symfony/finder": "^5.4 || ^6.0 || ^7.0",
-                "symfony/options-resolver": "^5.4 || ^6.0 || ^7.0",
-                "symfony/polyfill-mbstring": "^1.28",
-                "symfony/polyfill-php80": "^1.28",
-                "symfony/polyfill-php81": "^1.28",
-                "symfony/process": "^5.4 || ^6.0 || ^7.0",
-                "symfony/stopwatch": "^5.4 || ^6.0 || ^7.0"
+                "sebastian/diff": "^4.0 || ^5.1 || ^6.0",
+                "symfony/console": "^5.4 || ^6.4 || ^7.0",
+                "symfony/event-dispatcher": "^5.4 || ^6.4 || ^7.0",
+                "symfony/filesystem": "^5.4 || ^6.4 || ^7.0",
+                "symfony/finder": "^5.4 || ^6.4 || ^7.0",
+                "symfony/options-resolver": "^5.4 || ^6.4 || ^7.0",
+                "symfony/polyfill-mbstring": "^1.31",
+                "symfony/polyfill-php80": "^1.31",
+                "symfony/polyfill-php81": "^1.31",
+                "symfony/process": "^5.4 || ^6.4 || ^7.2",
+                "symfony/stopwatch": "^5.4 || ^6.4 || ^7.0"
             },
             "require-dev": {
-                "facile-it/paraunit": "^1.3 || ^2.3",
-                "infection/infection": "^0.29.5",
-                "justinrainbow/json-schema": "^5.2",
+                "facile-it/paraunit": "^1.3.1 || ^2.4",
+                "infection/infection": "^0.29.8",
+                "justinrainbow/json-schema": "^5.3 || ^6.0",
                 "keradus/cli-executor": "^2.1",
-                "mikey179/vfsstream": "^1.6.11",
+                "mikey179/vfsstream": "^1.6.12",
                 "php-coveralls/php-coveralls": "^2.7",
                 "php-cs-fixer/accessible-object": "^1.1",
                 "php-cs-fixer/phpunit-constraint-isidenticalstring": "^1.5",
                 "php-cs-fixer/phpunit-constraint-xmlmatchesxsd": "^1.5",
-                "phpunit/phpunit": "^9.6.19 || ^10.5.21 || ^11.2",
-                "symfony/var-dumper": "^5.4 || ^6.0 || ^7.0",
-                "symfony/yaml": "^5.4 || ^6.0 || ^7.0"
+                "phpunit/phpunit": "^9.6.22 || ^10.5.40 || ^11.5.2",
+                "symfony/var-dumper": "^5.4.48 || ^6.4.15 || ^7.2.0",
+                "symfony/yaml": "^5.4.45 || ^6.4.13 || ^7.2.0"
             },
             "suggest": {
                 "ext-dom": "For handling output formats in XML",
@@ -12763,7 +12602,7 @@
             ],
             "support": {
                 "issues": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues",
-                "source": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/tree/v3.59.3"
+                "source": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/tree/v3.68.1"
             },
             "funding": [
                 {
@@ -12771,7 +12610,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2024-06-16T14:17:03+00:00"
+            "time": "2025-01-17T09:20:36+00:00"
         },
         {
             "name": "hamcrest/hamcrest-php",
@@ -12824,81 +12663,22 @@
             },
             "time": "2020-07-09T08:09:16+00:00"
         },
-        {
-            "name": "jean85/pretty-package-versions",
-            "version": "2.0.6",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/Jean85/pretty-package-versions.git",
-                "reference": "f9fdd29ad8e6d024f52678b570e5593759b550b4"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/Jean85/pretty-package-versions/zipball/f9fdd29ad8e6d024f52678b570e5593759b550b4",
-                "reference": "f9fdd29ad8e6d024f52678b570e5593759b550b4",
-                "shasum": ""
-            },
-            "require": {
-                "composer-runtime-api": "^2.0.0",
-                "php": "^7.1|^8.0"
-            },
-            "require-dev": {
-                "friendsofphp/php-cs-fixer": "^3.2",
-                "jean85/composer-provided-replaced-stub-package": "^1.0",
-                "phpstan/phpstan": "^1.4",
-                "phpunit/phpunit": "^7.5|^8.5|^9.4",
-                "vimeo/psalm": "^4.3"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.x-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Jean85\\": "src/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Alessandro Lai",
-                    "email": "alessandro.lai85@gmail.com"
-                }
-            ],
-            "description": "A library to get pretty versions strings of installed dependencies",
-            "keywords": [
-                "composer",
-                "package",
-                "release",
-                "versions"
-            ],
-            "support": {
-                "issues": "https://github.com/Jean85/pretty-package-versions/issues",
-                "source": "https://github.com/Jean85/pretty-package-versions/tree/2.0.6"
-            },
-            "time": "2024-03-08T09:58:59+00:00"
-        },
         {
             "name": "justinrainbow/json-schema",
-            "version": "v5.2.13",
+            "version": "5.3.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/jsonrainbow/json-schema.git",
-                "reference": "fbbe7e5d79f618997bc3332a6f49246036c45793"
+                "reference": "feb2ca6dd1cebdaf1ed60a4c8de2e53ce11c4fd8"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/jsonrainbow/json-schema/zipball/fbbe7e5d79f618997bc3332a6f49246036c45793",
-                "reference": "fbbe7e5d79f618997bc3332a6f49246036c45793",
+                "url": "https://api.github.com/repos/jsonrainbow/json-schema/zipball/feb2ca6dd1cebdaf1ed60a4c8de2e53ce11c4fd8",
+                "reference": "feb2ca6dd1cebdaf1ed60a4c8de2e53ce11c4fd8",
                 "shasum": ""
             },
             "require": {
-                "php": ">=5.3.3"
+                "php": ">=7.1"
             },
             "require-dev": {
                 "friendsofphp/php-cs-fixer": "~2.2.20||~2.15.1",
@@ -12909,11 +12689,6 @@
                 "bin/validate-json"
             ],
             "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "5.0.x-dev"
-                }
-            },
             "autoload": {
                 "psr-4": {
                     "JsonSchema\\": "src/JsonSchema/"
@@ -12949,42 +12724,45 @@
             ],
             "support": {
                 "issues": "https://github.com/jsonrainbow/json-schema/issues",
-                "source": "https://github.com/jsonrainbow/json-schema/tree/v5.2.13"
+                "source": "https://github.com/jsonrainbow/json-schema/tree/5.3.0"
             },
-            "time": "2023-09-26T02:20:38+00:00"
+            "time": "2024-07-06T21:00:26+00:00"
         },
         {
             "name": "larastan/larastan",
-            "version": "v2.9.7",
+            "version": "v2.9.12",
             "source": {
                 "type": "git",
                 "url": "https://github.com/larastan/larastan.git",
-                "reference": "5c805f636095cc2e0b659e3954775cf8f1dad1bb"
+                "reference": "19012b39fbe4dede43dbe0c126d9681827a5e908"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/larastan/larastan/zipball/5c805f636095cc2e0b659e3954775cf8f1dad1bb",
-                "reference": "5c805f636095cc2e0b659e3954775cf8f1dad1bb",
+                "url": "https://api.github.com/repos/larastan/larastan/zipball/19012b39fbe4dede43dbe0c126d9681827a5e908",
+                "reference": "19012b39fbe4dede43dbe0c126d9681827a5e908",
                 "shasum": ""
             },
             "require": {
                 "ext-json": "*",
-                "illuminate/console": "^9.52.16 || ^10.28.0 || ^11.0",
-                "illuminate/container": "^9.52.16 || ^10.28.0 || ^11.0",
-                "illuminate/contracts": "^9.52.16 || ^10.28.0 || ^11.0",
-                "illuminate/database": "^9.52.16 || ^10.28.0 || ^11.0",
-                "illuminate/http": "^9.52.16 || ^10.28.0 || ^11.0",
-                "illuminate/pipeline": "^9.52.16 || ^10.28.0 || ^11.0",
-                "illuminate/support": "^9.52.16 || ^10.28.0 || ^11.0",
+                "illuminate/console": "^9.52.16 || ^10.28.0 || ^11.16",
+                "illuminate/container": "^9.52.16 || ^10.28.0 || ^11.16",
+                "illuminate/contracts": "^9.52.16 || ^10.28.0 || ^11.16",
+                "illuminate/database": "^9.52.16 || ^10.28.0 || ^11.16",
+                "illuminate/http": "^9.52.16 || ^10.28.0 || ^11.16",
+                "illuminate/pipeline": "^9.52.16 || ^10.28.0 || ^11.16",
+                "illuminate/support": "^9.52.16 || ^10.28.0 || ^11.16",
                 "php": "^8.0.2",
                 "phpmyadmin/sql-parser": "^5.9.0",
-                "phpstan/phpstan": "^1.11.1"
+                "phpstan/phpstan": "^1.12.11"
             },
             "require-dev": {
                 "doctrine/coding-standard": "^12.0",
+                "laravel/framework": "^9.52.16 || ^10.28.0 || ^11.16",
+                "mockery/mockery": "^1.5.1",
                 "nikic/php-parser": "^4.19.1",
                 "orchestra/canvas": "^7.11.1 || ^8.11.0 || ^9.0.2",
-                "orchestra/testbench": "^7.33.0 || ^8.13.0 || ^9.0.3",
+                "orchestra/testbench-core": "^7.33.0 || ^8.13.0 || ^9.0.9",
+                "phpstan/phpstan-deprecation-rules": "^1.2",
                 "phpunit/phpunit": "^9.6.13 || ^10.5.16"
             },
             "suggest": {
@@ -12992,13 +12770,13 @@
             },
             "type": "phpstan-extension",
             "extra": {
-                "branch-alias": {
-                    "dev-master": "2.0-dev"
-                },
                 "phpstan": {
                     "includes": [
                         "extension.neon"
                     ]
+                },
+                "branch-alias": {
+                    "dev-master": "2.0-dev"
                 }
             },
             "autoload": {
@@ -13020,7 +12798,7 @@
                     "email": "enunomaduro@gmail.com"
                 }
             ],
-            "description": "Larastan - Discover bugs in your code without running it. A phpstan/phpstan wrapper for Laravel",
+            "description": "Larastan - Discover bugs in your code without running it. A phpstan/phpstan extension for Laravel",
             "keywords": [
                 "PHPStan",
                 "code analyse",
@@ -13033,40 +12811,28 @@
             ],
             "support": {
                 "issues": "https://github.com/larastan/larastan/issues",
-                "source": "https://github.com/larastan/larastan/tree/v2.9.7"
+                "source": "https://github.com/larastan/larastan/tree/v2.9.12"
             },
             "funding": [
-                {
-                    "url": "https://www.paypal.com/paypalme/enunomaduro",
-                    "type": "custom"
-                },
                 {
                     "url": "https://github.com/canvural",
                     "type": "github"
-                },
-                {
-                    "url": "https://github.com/nunomaduro",
-                    "type": "github"
-                },
-                {
-                    "url": "https://www.patreon.com/nunomaduro",
-                    "type": "patreon"
                 }
             ],
-            "time": "2024-05-27T18:33:26+00:00"
+            "time": "2024-11-26T23:09:02+00:00"
         },
         {
             "name": "league/container",
-            "version": "4.2.2",
+            "version": "4.2.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/thephpleague/container.git",
-                "reference": "ff346319ca1ff0e78277dc2311a42107cc1aab88"
+                "reference": "7ea728b013b9a156c409c6f0fc3624071b742dec"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/thephpleague/container/zipball/ff346319ca1ff0e78277dc2311a42107cc1aab88",
-                "reference": "ff346319ca1ff0e78277dc2311a42107cc1aab88",
+                "url": "https://api.github.com/repos/thephpleague/container/zipball/7ea728b013b9a156c409c6f0fc3624071b742dec",
+                "reference": "7ea728b013b9a156c409c6f0fc3624071b742dec",
                 "shasum": ""
             },
             "require": {
@@ -13091,11 +12857,11 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "4.x-dev",
-                    "dev-4.x": "4.x-dev",
-                    "dev-3.x": "3.x-dev",
+                    "dev-1.x": "1.x-dev",
                     "dev-2.x": "2.x-dev",
-                    "dev-1.x": "1.x-dev"
+                    "dev-3.x": "3.x-dev",
+                    "dev-4.x": "4.x-dev",
+                    "dev-master": "4.x-dev"
                 }
             },
             "autoload": {
@@ -13127,7 +12893,7 @@
             ],
             "support": {
                 "issues": "https://github.com/thephpleague/container/issues",
-                "source": "https://github.com/thephpleague/container/tree/4.2.2"
+                "source": "https://github.com/thephpleague/container/tree/4.2.4"
             },
             "funding": [
                 {
@@ -13135,7 +12901,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2024-03-13T13:12:53+00:00"
+            "time": "2024-11-10T12:42:13+00:00"
         },
         {
             "name": "mockery/mockery",
@@ -13222,16 +12988,16 @@
         },
         {
             "name": "myclabs/deep-copy",
-            "version": "1.12.0",
+            "version": "1.12.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/myclabs/DeepCopy.git",
-                "reference": "3a6b9a42cd8f8771bd4295d13e1423fa7f3d942c"
+                "reference": "123267b2c49fbf30d78a7b2d333f6be754b94845"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/3a6b9a42cd8f8771bd4295d13e1423fa7f3d942c",
-                "reference": "3a6b9a42cd8f8771bd4295d13e1423fa7f3d942c",
+                "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/123267b2c49fbf30d78a7b2d333f6be754b94845",
+                "reference": "123267b2c49fbf30d78a7b2d333f6be754b94845",
                 "shasum": ""
             },
             "require": {
@@ -13270,7 +13036,7 @@
             ],
             "support": {
                 "issues": "https://github.com/myclabs/DeepCopy/issues",
-                "source": "https://github.com/myclabs/DeepCopy/tree/1.12.0"
+                "source": "https://github.com/myclabs/DeepCopy/tree/1.12.1"
             },
             "funding": [
                 {
@@ -13278,71 +13044,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-06-12T14:39:25+00:00"
-        },
-        {
-            "name": "netresearch/jsonmapper",
-            "version": "v4.4.1",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/cweiske/jsonmapper.git",
-                "reference": "132c75c7dd83e45353ebb9c6c9f591952995bbf0"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/cweiske/jsonmapper/zipball/132c75c7dd83e45353ebb9c6c9f591952995bbf0",
-                "reference": "132c75c7dd83e45353ebb9c6c9f591952995bbf0",
-                "shasum": ""
-            },
-            "require": {
-                "ext-json": "*",
-                "ext-pcre": "*",
-                "ext-reflection": "*",
-                "ext-spl": "*",
-                "php": ">=7.1"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "~7.5 || ~8.0 || ~9.0 || ~10.0",
-                "squizlabs/php_codesniffer": "~3.5"
-            },
-            "type": "library",
-            "autoload": {
-                "psr-0": {
-                    "JsonMapper": "src/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "OSL-3.0"
-            ],
-            "authors": [
-                {
-                    "name": "Christian Weiske",
-                    "email": "cweiske@cweiske.de",
-                    "homepage": "http://github.com/cweiske/jsonmapper/",
-                    "role": "Developer"
-                }
-            ],
-            "description": "Map nested JSON structures onto PHP classes",
-            "support": {
-                "email": "cweiske@cweiske.de",
-                "issues": "https://github.com/cweiske/jsonmapper/issues",
-                "source": "https://github.com/cweiske/jsonmapper/tree/v4.4.1"
-            },
-            "time": "2024-01-31T06:18:54+00:00"
+            "time": "2024-11-08T17:47:46+00:00"
         },
         {
             "name": "nunomaduro/phpinsights",
-            "version": "v2.11.0",
+            "version": "v2.12.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/nunomaduro/phpinsights.git",
-                "reference": "f476219759a61aad988641476259465c77203383"
+                "reference": "5c12a8d626712de6db5e6d2db52b1eb4e9596650"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/nunomaduro/phpinsights/zipball/f476219759a61aad988641476259465c77203383",
-                "reference": "f476219759a61aad988641476259465c77203383",
+                "url": "https://api.github.com/repos/nunomaduro/phpinsights/zipball/5c12a8d626712de6db5e6d2db52b1eb4e9596650",
+                "reference": "5c12a8d626712de6db5e6d2db52b1eb4e9596650",
                 "shasum": ""
             },
             "require": {
@@ -13359,7 +13074,7 @@
                 "php-parallel-lint/php-parallel-lint": "^1.3.2",
                 "psr/container": "^1.0|^2.0.2",
                 "psr/simple-cache": "^1.0|^2.0|^3.0",
-                "sebastian/diff": "^4.0|^5.0.3",
+                "sebastian/diff": "^4.0|^5.0.3|^6.0",
                 "slevomat/coding-standard": "^8.14.1",
                 "squizlabs/php_codesniffer": "^3.7.2",
                 "symfony/cache": "^5.4|^6.0|^7.0",
@@ -13419,7 +13134,7 @@
             ],
             "support": {
                 "issues": "https://github.com/nunomaduro/phpinsights/issues",
-                "source": "https://github.com/nunomaduro/phpinsights/tree/v2.11.0"
+                "source": "https://github.com/nunomaduro/phpinsights/tree/v2.12.0"
             },
             "funding": [
                 {
@@ -13435,7 +13150,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2023-11-30T10:54:50+00:00"
+            "time": "2024-11-11T14:42:55+00:00"
         },
         {
             "name": "phar-io/manifest",
@@ -13557,16 +13272,16 @@
         },
         {
             "name": "php-mock/php-mock",
-            "version": "2.5.0",
+            "version": "2.5.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/php-mock/php-mock.git",
-                "reference": "fff1a621ebe54100fa3bd852e7be57773a0c0127"
+                "reference": "8f58972dce4de5a804dc0459383a11bc651416cf"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/php-mock/php-mock/zipball/fff1a621ebe54100fa3bd852e7be57773a0c0127",
-                "reference": "fff1a621ebe54100fa3bd852e7be57773a0c0127",
+                "url": "https://api.github.com/repos/php-mock/php-mock/zipball/8f58972dce4de5a804dc0459383a11bc651416cf",
+                "reference": "8f58972dce4de5a804dc0459383a11bc651416cf",
                 "shasum": ""
             },
             "require": {
@@ -13621,7 +13336,7 @@
             ],
             "support": {
                 "issues": "https://github.com/php-mock/php-mock/issues",
-                "source": "https://github.com/php-mock/php-mock/tree/2.5.0"
+                "source": "https://github.com/php-mock/php-mock/tree/2.5.1"
             },
             "funding": [
                 {
@@ -13629,7 +13344,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2024-02-10T21:07:01+00:00"
+            "time": "2024-12-07T20:52:37+00:00"
         },
         {
             "name": "php-mock/php-mock-integration",
@@ -13825,16 +13540,16 @@
         },
         {
             "name": "phpmyadmin/sql-parser",
-            "version": "5.9.0",
+            "version": "5.10.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phpmyadmin/sql-parser.git",
-                "reference": "011fa18a4e55591fac6545a821921dd1d61c6984"
+                "reference": "5346664973d10cf1abff20837fb1183f3c11a055"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpmyadmin/sql-parser/zipball/011fa18a4e55591fac6545a821921dd1d61c6984",
-                "reference": "011fa18a4e55591fac6545a821921dd1d61c6984",
+                "url": "https://api.github.com/repos/phpmyadmin/sql-parser/zipball/5346664973d10cf1abff20837fb1183f3c11a055",
+                "reference": "5346664973d10cf1abff20837fb1183f3c11a055",
                 "shasum": ""
             },
             "require": {
@@ -13852,8 +13567,7 @@
                 "phpstan/extension-installer": "^1.1",
                 "phpstan/phpstan": "^1.9.12",
                 "phpstan/phpstan-phpunit": "^1.3.3",
-                "phpunit/php-code-coverage": "*",
-                "phpunit/phpunit": "^7.5 || ^8.5 || ^9.5",
+                "phpunit/phpunit": "^8.5 || ^9.6",
                 "psalm/plugin-phpunit": "^0.16.1",
                 "vimeo/psalm": "^4.11",
                 "zumba/json-serializer": "~3.0.2"
@@ -13909,20 +13623,20 @@
                     "type": "other"
                 }
             ],
-            "time": "2024-01-20T20:34:02+00:00"
+            "time": "2025-01-19T04:14:02+00:00"
         },
         {
             "name": "phpstan/phpstan",
-            "version": "1.11.5",
+            "version": "1.12.15",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phpstan/phpstan.git",
-                "reference": "490f0ae1c92b082f154681d7849aee776a7c1443"
+                "reference": "c91d4e8bc056f46cf653656e6f71004b254574d1"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpstan/phpstan/zipball/490f0ae1c92b082f154681d7849aee776a7c1443",
-                "reference": "490f0ae1c92b082f154681d7849aee776a7c1443",
+                "url": "https://api.github.com/repos/phpstan/phpstan/zipball/c91d4e8bc056f46cf653656e6f71004b254574d1",
+                "reference": "c91d4e8bc056f46cf653656e6f71004b254574d1",
                 "shasum": ""
             },
             "require": {
@@ -13967,39 +13681,39 @@
                     "type": "github"
                 }
             ],
-            "time": "2024-06-17T15:10:54+00:00"
+            "time": "2025-01-05T16:40:22+00:00"
         },
         {
             "name": "phpunit/php-code-coverage",
-            "version": "9.2.31",
+            "version": "10.1.16",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/php-code-coverage.git",
-                "reference": "48c34b5d8d983006bd2adc2d0de92963b9155965"
+                "reference": "7e308268858ed6baedc8704a304727d20bc07c77"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/48c34b5d8d983006bd2adc2d0de92963b9155965",
-                "reference": "48c34b5d8d983006bd2adc2d0de92963b9155965",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/7e308268858ed6baedc8704a304727d20bc07c77",
+                "reference": "7e308268858ed6baedc8704a304727d20bc07c77",
                 "shasum": ""
             },
             "require": {
                 "ext-dom": "*",
                 "ext-libxml": "*",
                 "ext-xmlwriter": "*",
-                "nikic/php-parser": "^4.18 || ^5.0",
-                "php": ">=7.3",
-                "phpunit/php-file-iterator": "^3.0.3",
-                "phpunit/php-text-template": "^2.0.2",
-                "sebastian/code-unit-reverse-lookup": "^2.0.2",
-                "sebastian/complexity": "^2.0",
-                "sebastian/environment": "^5.1.2",
-                "sebastian/lines-of-code": "^1.0.3",
-                "sebastian/version": "^3.0.1",
-                "theseer/tokenizer": "^1.2.0"
+                "nikic/php-parser": "^4.19.1 || ^5.1.0",
+                "php": ">=8.1",
+                "phpunit/php-file-iterator": "^4.1.0",
+                "phpunit/php-text-template": "^3.0.1",
+                "sebastian/code-unit-reverse-lookup": "^3.0.0",
+                "sebastian/complexity": "^3.2.0",
+                "sebastian/environment": "^6.1.0",
+                "sebastian/lines-of-code": "^2.0.2",
+                "sebastian/version": "^4.0.1",
+                "theseer/tokenizer": "^1.2.3"
             },
             "require-dev": {
-                "phpunit/phpunit": "^9.3"
+                "phpunit/phpunit": "^10.1"
             },
             "suggest": {
                 "ext-pcov": "PHP extension that provides line coverage",
@@ -14008,7 +13722,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "9.2-dev"
+                    "dev-main": "10.1.x-dev"
                 }
             },
             "autoload": {
@@ -14037,7 +13751,7 @@
             "support": {
                 "issues": "https://github.com/sebastianbergmann/php-code-coverage/issues",
                 "security": "https://github.com/sebastianbergmann/php-code-coverage/security/policy",
-                "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/9.2.31"
+                "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/10.1.16"
             },
             "funding": [
                 {
@@ -14045,32 +13759,32 @@
                     "type": "github"
                 }
             ],
-            "time": "2024-03-02T06:37:42+00:00"
+            "time": "2024-08-22T04:31:57+00:00"
         },
         {
             "name": "phpunit/php-file-iterator",
-            "version": "3.0.6",
+            "version": "4.1.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/php-file-iterator.git",
-                "reference": "cf1c2e7c203ac650e352f4cc675a7021e7d1b3cf"
+                "reference": "a95037b6d9e608ba092da1b23931e537cadc3c3c"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-file-iterator/zipball/cf1c2e7c203ac650e352f4cc675a7021e7d1b3cf",
-                "reference": "cf1c2e7c203ac650e352f4cc675a7021e7d1b3cf",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-file-iterator/zipball/a95037b6d9e608ba092da1b23931e537cadc3c3c",
+                "reference": "a95037b6d9e608ba092da1b23931e537cadc3c3c",
                 "shasum": ""
             },
             "require": {
-                "php": ">=7.3"
+                "php": ">=8.1"
             },
             "require-dev": {
-                "phpunit/phpunit": "^9.3"
+                "phpunit/phpunit": "^10.0"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "3.0-dev"
+                    "dev-main": "4.0-dev"
                 }
             },
             "autoload": {
@@ -14097,7 +13811,8 @@
             ],
             "support": {
                 "issues": "https://github.com/sebastianbergmann/php-file-iterator/issues",
-                "source": "https://github.com/sebastianbergmann/php-file-iterator/tree/3.0.6"
+                "security": "https://github.com/sebastianbergmann/php-file-iterator/security/policy",
+                "source": "https://github.com/sebastianbergmann/php-file-iterator/tree/4.1.0"
             },
             "funding": [
                 {
@@ -14105,28 +13820,28 @@
                     "type": "github"
                 }
             ],
-            "time": "2021-12-02T12:48:52+00:00"
+            "time": "2023-08-31T06:24:48+00:00"
         },
         {
             "name": "phpunit/php-invoker",
-            "version": "3.1.1",
+            "version": "4.0.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/php-invoker.git",
-                "reference": "5a10147d0aaf65b58940a0b72f71c9ac0423cc67"
+                "reference": "f5e568ba02fa5ba0ddd0f618391d5a9ea50b06d7"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-invoker/zipball/5a10147d0aaf65b58940a0b72f71c9ac0423cc67",
-                "reference": "5a10147d0aaf65b58940a0b72f71c9ac0423cc67",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-invoker/zipball/f5e568ba02fa5ba0ddd0f618391d5a9ea50b06d7",
+                "reference": "f5e568ba02fa5ba0ddd0f618391d5a9ea50b06d7",
                 "shasum": ""
             },
             "require": {
-                "php": ">=7.3"
+                "php": ">=8.1"
             },
             "require-dev": {
                 "ext-pcntl": "*",
-                "phpunit/phpunit": "^9.3"
+                "phpunit/phpunit": "^10.0"
             },
             "suggest": {
                 "ext-pcntl": "*"
@@ -14134,7 +13849,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "3.1-dev"
+                    "dev-main": "4.0-dev"
                 }
             },
             "autoload": {
@@ -14160,7 +13875,7 @@
             ],
             "support": {
                 "issues": "https://github.com/sebastianbergmann/php-invoker/issues",
-                "source": "https://github.com/sebastianbergmann/php-invoker/tree/3.1.1"
+                "source": "https://github.com/sebastianbergmann/php-invoker/tree/4.0.0"
             },
             "funding": [
                 {
@@ -14168,32 +13883,32 @@
                     "type": "github"
                 }
             ],
-            "time": "2020-09-28T05:58:55+00:00"
+            "time": "2023-02-03T06:56:09+00:00"
         },
         {
             "name": "phpunit/php-text-template",
-            "version": "2.0.4",
+            "version": "3.0.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/php-text-template.git",
-                "reference": "5da5f67fc95621df9ff4c4e5a84d6a8a2acf7c28"
+                "reference": "0c7b06ff49e3d5072f057eb1fa59258bf287a748"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-text-template/zipball/5da5f67fc95621df9ff4c4e5a84d6a8a2acf7c28",
-                "reference": "5da5f67fc95621df9ff4c4e5a84d6a8a2acf7c28",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-text-template/zipball/0c7b06ff49e3d5072f057eb1fa59258bf287a748",
+                "reference": "0c7b06ff49e3d5072f057eb1fa59258bf287a748",
                 "shasum": ""
             },
             "require": {
-                "php": ">=7.3"
+                "php": ">=8.1"
             },
             "require-dev": {
-                "phpunit/phpunit": "^9.3"
+                "phpunit/phpunit": "^10.0"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "2.0-dev"
+                    "dev-main": "3.0-dev"
                 }
             },
             "autoload": {
@@ -14219,7 +13934,8 @@
             ],
             "support": {
                 "issues": "https://github.com/sebastianbergmann/php-text-template/issues",
-                "source": "https://github.com/sebastianbergmann/php-text-template/tree/2.0.4"
+                "security": "https://github.com/sebastianbergmann/php-text-template/security/policy",
+                "source": "https://github.com/sebastianbergmann/php-text-template/tree/3.0.1"
             },
             "funding": [
                 {
@@ -14227,32 +13943,32 @@
                     "type": "github"
                 }
             ],
-            "time": "2020-10-26T05:33:50+00:00"
+            "time": "2023-08-31T14:07:24+00:00"
         },
         {
             "name": "phpunit/php-timer",
-            "version": "5.0.3",
+            "version": "6.0.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/php-timer.git",
-                "reference": "5a63ce20ed1b5bf577850e2c4e87f4aa902afbd2"
+                "reference": "e2a2d67966e740530f4a3343fe2e030ffdc1161d"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-timer/zipball/5a63ce20ed1b5bf577850e2c4e87f4aa902afbd2",
-                "reference": "5a63ce20ed1b5bf577850e2c4e87f4aa902afbd2",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-timer/zipball/e2a2d67966e740530f4a3343fe2e030ffdc1161d",
+                "reference": "e2a2d67966e740530f4a3343fe2e030ffdc1161d",
                 "shasum": ""
             },
             "require": {
-                "php": ">=7.3"
+                "php": ">=8.1"
             },
             "require-dev": {
-                "phpunit/phpunit": "^9.3"
+                "phpunit/phpunit": "^10.0"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "5.0-dev"
+                    "dev-main": "6.0-dev"
                 }
             },
             "autoload": {
@@ -14278,7 +13994,7 @@
             ],
             "support": {
                 "issues": "https://github.com/sebastianbergmann/php-timer/issues",
-                "source": "https://github.com/sebastianbergmann/php-timer/tree/5.0.3"
+                "source": "https://github.com/sebastianbergmann/php-timer/tree/6.0.0"
             },
             "funding": [
                 {
@@ -14286,54 +14002,52 @@
                     "type": "github"
                 }
             ],
-            "time": "2020-10-26T13:16:10+00:00"
+            "time": "2023-02-03T06:57:52+00:00"
         },
         {
             "name": "phpunit/phpunit",
-            "version": "9.6.19",
+            "version": "10.5.41",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/phpunit.git",
-                "reference": "a1a54a473501ef4cdeaae4e06891674114d79db8"
+                "reference": "e76586fa3d49714f230221734b44892e384109d7"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/a1a54a473501ef4cdeaae4e06891674114d79db8",
-                "reference": "a1a54a473501ef4cdeaae4e06891674114d79db8",
+                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/e76586fa3d49714f230221734b44892e384109d7",
+                "reference": "e76586fa3d49714f230221734b44892e384109d7",
                 "shasum": ""
             },
             "require": {
-                "doctrine/instantiator": "^1.3.1 || ^2",
                 "ext-dom": "*",
                 "ext-json": "*",
                 "ext-libxml": "*",
                 "ext-mbstring": "*",
                 "ext-xml": "*",
                 "ext-xmlwriter": "*",
-                "myclabs/deep-copy": "^1.10.1",
-                "phar-io/manifest": "^2.0.3",
-                "phar-io/version": "^3.0.2",
-                "php": ">=7.3",
-                "phpunit/php-code-coverage": "^9.2.28",
-                "phpunit/php-file-iterator": "^3.0.5",
-                "phpunit/php-invoker": "^3.1.1",
-                "phpunit/php-text-template": "^2.0.3",
-                "phpunit/php-timer": "^5.0.2",
-                "sebastian/cli-parser": "^1.0.1",
-                "sebastian/code-unit": "^1.0.6",
-                "sebastian/comparator": "^4.0.8",
-                "sebastian/diff": "^4.0.3",
-                "sebastian/environment": "^5.1.3",
-                "sebastian/exporter": "^4.0.5",
-                "sebastian/global-state": "^5.0.1",
-                "sebastian/object-enumerator": "^4.0.3",
-                "sebastian/resource-operations": "^3.0.3",
-                "sebastian/type": "^3.2",
-                "sebastian/version": "^3.0.2"
+                "myclabs/deep-copy": "^1.12.1",
+                "phar-io/manifest": "^2.0.4",
+                "phar-io/version": "^3.2.1",
+                "php": ">=8.1",
+                "phpunit/php-code-coverage": "^10.1.16",
+                "phpunit/php-file-iterator": "^4.1.0",
+                "phpunit/php-invoker": "^4.0.0",
+                "phpunit/php-text-template": "^3.0.1",
+                "phpunit/php-timer": "^6.0.0",
+                "sebastian/cli-parser": "^2.0.1",
+                "sebastian/code-unit": "^2.0.0",
+                "sebastian/comparator": "^5.0.3",
+                "sebastian/diff": "^5.1.1",
+                "sebastian/environment": "^6.1.0",
+                "sebastian/exporter": "^5.1.2",
+                "sebastian/global-state": "^6.0.2",
+                "sebastian/object-enumerator": "^5.0.0",
+                "sebastian/recursion-context": "^5.0.0",
+                "sebastian/type": "^4.0.0",
+                "sebastian/version": "^4.0.1"
             },
             "suggest": {
-                "ext-soap": "To be able to generate mocks based on WSDL files",
-                "ext-xdebug": "PHP extension that provides line coverage as well as branch and path coverage"
+                "ext-soap": "To be able to generate mocks based on WSDL files"
             },
             "bin": [
                 "phpunit"
@@ -14341,7 +14055,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "9.6-dev"
+                    "dev-main": "10.5-dev"
                 }
             },
             "autoload": {
@@ -14373,7 +14087,7 @@
             "support": {
                 "issues": "https://github.com/sebastianbergmann/phpunit/issues",
                 "security": "https://github.com/sebastianbergmann/phpunit/security/policy",
-                "source": "https://github.com/sebastianbergmann/phpunit/tree/9.6.19"
+                "source": "https://github.com/sebastianbergmann/phpunit/tree/10.5.41"
             },
             "funding": [
                 {
@@ -14389,7 +14103,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-04-05T04:35:58+00:00"
+            "time": "2025-01-13T09:33:05+00:00"
         },
         {
             "name": "react/cache",
@@ -14465,33 +14179,33 @@
         },
         {
             "name": "react/child-process",
-            "version": "v0.6.5",
+            "version": "v0.6.6",
             "source": {
                 "type": "git",
                 "url": "https://github.com/reactphp/child-process.git",
-                "reference": "e71eb1aa55f057c7a4a0d08d06b0b0a484bead43"
+                "reference": "1721e2b93d89b745664353b9cfc8f155ba8a6159"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/reactphp/child-process/zipball/e71eb1aa55f057c7a4a0d08d06b0b0a484bead43",
-                "reference": "e71eb1aa55f057c7a4a0d08d06b0b0a484bead43",
+                "url": "https://api.github.com/repos/reactphp/child-process/zipball/1721e2b93d89b745664353b9cfc8f155ba8a6159",
+                "reference": "1721e2b93d89b745664353b9cfc8f155ba8a6159",
                 "shasum": ""
             },
             "require": {
                 "evenement/evenement": "^3.0 || ^2.0 || ^1.0",
                 "php": ">=5.3.0",
                 "react/event-loop": "^1.2",
-                "react/stream": "^1.2"
+                "react/stream": "^1.4"
             },
             "require-dev": {
-                "phpunit/phpunit": "^9.3 || ^5.7 || ^4.8.35",
-                "react/socket": "^1.8",
+                "phpunit/phpunit": "^9.6 || ^5.7 || ^4.8.36",
+                "react/socket": "^1.16",
                 "sebastian/environment": "^5.0 || ^3.0 || ^2.0 || ^1.0"
             },
             "type": "library",
             "autoload": {
                 "psr-4": {
-                    "React\\ChildProcess\\": "src"
+                    "React\\ChildProcess\\": "src/"
                 }
             },
             "notification-url": "https://packagist.org/downloads/",
@@ -14528,19 +14242,15 @@
             ],
             "support": {
                 "issues": "https://github.com/reactphp/child-process/issues",
-                "source": "https://github.com/reactphp/child-process/tree/v0.6.5"
+                "source": "https://github.com/reactphp/child-process/tree/v0.6.6"
             },
             "funding": [
                 {
-                    "url": "https://github.com/WyriHaximus",
-                    "type": "github"
-                },
-                {
-                    "url": "https://github.com/clue",
-                    "type": "github"
+                    "url": "https://opencollective.com/reactphp",
+                    "type": "open_collective"
                 }
             ],
-            "time": "2022-09-16T13:41:56+00:00"
+            "time": "2025-01-01T16:37:48+00:00"
         },
         {
             "name": "react/dns",
@@ -14765,31 +14475,31 @@
         },
         {
             "name": "react/socket",
-            "version": "v1.15.0",
+            "version": "v1.16.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/reactphp/socket.git",
-                "reference": "216d3aec0b87f04a40ca04f481e6af01bdd1d038"
+                "reference": "23e4ff33ea3e160d2d1f59a0e6050e4b0fb0eac1"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/reactphp/socket/zipball/216d3aec0b87f04a40ca04f481e6af01bdd1d038",
-                "reference": "216d3aec0b87f04a40ca04f481e6af01bdd1d038",
+                "url": "https://api.github.com/repos/reactphp/socket/zipball/23e4ff33ea3e160d2d1f59a0e6050e4b0fb0eac1",
+                "reference": "23e4ff33ea3e160d2d1f59a0e6050e4b0fb0eac1",
                 "shasum": ""
             },
             "require": {
                 "evenement/evenement": "^3.0 || ^2.0 || ^1.0",
                 "php": ">=5.3.0",
-                "react/dns": "^1.11",
+                "react/dns": "^1.13",
                 "react/event-loop": "^1.2",
-                "react/promise": "^3 || ^2.6 || ^1.2.1",
-                "react/stream": "^1.2"
+                "react/promise": "^3.2 || ^2.6 || ^1.2.1",
+                "react/stream": "^1.4"
             },
             "require-dev": {
                 "phpunit/phpunit": "^9.6 || ^5.7 || ^4.8.36",
-                "react/async": "^4 || ^3 || ^2",
+                "react/async": "^4.3 || ^3.3 || ^2",
                 "react/promise-stream": "^1.4",
-                "react/promise-timer": "^1.10"
+                "react/promise-timer": "^1.11"
             },
             "type": "library",
             "autoload": {
@@ -14833,7 +14543,7 @@
             ],
             "support": {
                 "issues": "https://github.com/reactphp/socket/issues",
-                "source": "https://github.com/reactphp/socket/tree/v1.15.0"
+                "source": "https://github.com/reactphp/socket/tree/v1.16.0"
             },
             "funding": [
                 {
@@ -14841,7 +14551,7 @@
                     "type": "open_collective"
                 }
             ],
-            "time": "2023-12-15T11:02:10+00:00"
+            "time": "2024-07-26T10:38:09+00:00"
         },
         {
             "name": "react/stream",
@@ -14923,28 +14633,28 @@
         },
         {
             "name": "sebastian/cli-parser",
-            "version": "1.0.2",
+            "version": "2.0.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/cli-parser.git",
-                "reference": "2b56bea83a09de3ac06bb18b92f068e60cc6f50b"
+                "reference": "c34583b87e7b7a8055bf6c450c2c77ce32a24084"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/cli-parser/zipball/2b56bea83a09de3ac06bb18b92f068e60cc6f50b",
-                "reference": "2b56bea83a09de3ac06bb18b92f068e60cc6f50b",
+                "url": "https://api.github.com/repos/sebastianbergmann/cli-parser/zipball/c34583b87e7b7a8055bf6c450c2c77ce32a24084",
+                "reference": "c34583b87e7b7a8055bf6c450c2c77ce32a24084",
                 "shasum": ""
             },
             "require": {
-                "php": ">=7.3"
+                "php": ">=8.1"
             },
             "require-dev": {
-                "phpunit/phpunit": "^9.3"
+                "phpunit/phpunit": "^10.0"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.0-dev"
+                    "dev-main": "2.0-dev"
                 }
             },
             "autoload": {
@@ -14967,7 +14677,8 @@
             "homepage": "https://github.com/sebastianbergmann/cli-parser",
             "support": {
                 "issues": "https://github.com/sebastianbergmann/cli-parser/issues",
-                "source": "https://github.com/sebastianbergmann/cli-parser/tree/1.0.2"
+                "security": "https://github.com/sebastianbergmann/cli-parser/security/policy",
+                "source": "https://github.com/sebastianbergmann/cli-parser/tree/2.0.1"
             },
             "funding": [
                 {
@@ -14975,32 +14686,32 @@
                     "type": "github"
                 }
             ],
-            "time": "2024-03-02T06:27:43+00:00"
+            "time": "2024-03-02T07:12:49+00:00"
         },
         {
             "name": "sebastian/code-unit",
-            "version": "1.0.8",
+            "version": "2.0.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/code-unit.git",
-                "reference": "1fc9f64c0927627ef78ba436c9b17d967e68e120"
+                "reference": "a81fee9eef0b7a76af11d121767abc44c104e503"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/code-unit/zipball/1fc9f64c0927627ef78ba436c9b17d967e68e120",
-                "reference": "1fc9f64c0927627ef78ba436c9b17d967e68e120",
+                "url": "https://api.github.com/repos/sebastianbergmann/code-unit/zipball/a81fee9eef0b7a76af11d121767abc44c104e503",
+                "reference": "a81fee9eef0b7a76af11d121767abc44c104e503",
                 "shasum": ""
             },
             "require": {
-                "php": ">=7.3"
+                "php": ">=8.1"
             },
             "require-dev": {
-                "phpunit/phpunit": "^9.3"
+                "phpunit/phpunit": "^10.0"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.0-dev"
+                    "dev-main": "2.0-dev"
                 }
             },
             "autoload": {
@@ -15023,7 +14734,7 @@
             "homepage": "https://github.com/sebastianbergmann/code-unit",
             "support": {
                 "issues": "https://github.com/sebastianbergmann/code-unit/issues",
-                "source": "https://github.com/sebastianbergmann/code-unit/tree/1.0.8"
+                "source": "https://github.com/sebastianbergmann/code-unit/tree/2.0.0"
             },
             "funding": [
                 {
@@ -15031,435 +14742,27 @@
                     "type": "github"
                 }
             ],
-            "time": "2020-10-26T13:08:54+00:00"
+            "time": "2023-02-03T06:58:43+00:00"
         },
         {
             "name": "sebastian/code-unit-reverse-lookup",
-            "version": "2.0.3",
+            "version": "3.0.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/code-unit-reverse-lookup.git",
-                "reference": "ac91f01ccec49fb77bdc6fd1e548bc70f7faa3e5"
+                "reference": "5e3a687f7d8ae33fb362c5c0743794bbb2420a1d"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/code-unit-reverse-lookup/zipball/ac91f01ccec49fb77bdc6fd1e548bc70f7faa3e5",
-                "reference": "ac91f01ccec49fb77bdc6fd1e548bc70f7faa3e5",
+                "url": "https://api.github.com/repos/sebastianbergmann/code-unit-reverse-lookup/zipball/5e3a687f7d8ae33fb362c5c0743794bbb2420a1d",
+                "reference": "5e3a687f7d8ae33fb362c5c0743794bbb2420a1d",
                 "shasum": ""
             },
             "require": {
-                "php": ">=7.3"
+                "php": ">=8.1"
             },
             "require-dev": {
-                "phpunit/phpunit": "^9.3"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "2.0-dev"
-                }
-            },
-            "autoload": {
-                "classmap": [
-                    "src/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "sebastian@phpunit.de"
-                }
-            ],
-            "description": "Looks up which function or method a line of code belongs to",
-            "homepage": "https://github.com/sebastianbergmann/code-unit-reverse-lookup/",
-            "support": {
-                "issues": "https://github.com/sebastianbergmann/code-unit-reverse-lookup/issues",
-                "source": "https://github.com/sebastianbergmann/code-unit-reverse-lookup/tree/2.0.3"
-            },
-            "funding": [
-                {
-                    "url": "https://github.com/sebastianbergmann",
-                    "type": "github"
-                }
-            ],
-            "time": "2020-09-28T05:30:19+00:00"
-        },
-        {
-            "name": "sebastian/complexity",
-            "version": "2.0.3",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/sebastianbergmann/complexity.git",
-                "reference": "25f207c40d62b8b7aa32f5ab026c53561964053a"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/complexity/zipball/25f207c40d62b8b7aa32f5ab026c53561964053a",
-                "reference": "25f207c40d62b8b7aa32f5ab026c53561964053a",
-                "shasum": ""
-            },
-            "require": {
-                "nikic/php-parser": "^4.18 || ^5.0",
-                "php": ">=7.3"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "^9.3"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "2.0-dev"
-                }
-            },
-            "autoload": {
-                "classmap": [
-                    "src/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "sebastian@phpunit.de",
-                    "role": "lead"
-                }
-            ],
-            "description": "Library for calculating the complexity of PHP code units",
-            "homepage": "https://github.com/sebastianbergmann/complexity",
-            "support": {
-                "issues": "https://github.com/sebastianbergmann/complexity/issues",
-                "source": "https://github.com/sebastianbergmann/complexity/tree/2.0.3"
-            },
-            "funding": [
-                {
-                    "url": "https://github.com/sebastianbergmann",
-                    "type": "github"
-                }
-            ],
-            "time": "2023-12-22T06:19:30+00:00"
-        },
-        {
-            "name": "sebastian/environment",
-            "version": "5.1.5",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/sebastianbergmann/environment.git",
-                "reference": "830c43a844f1f8d5b7a1f6d6076b784454d8b7ed"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/830c43a844f1f8d5b7a1f6d6076b784454d8b7ed",
-                "reference": "830c43a844f1f8d5b7a1f6d6076b784454d8b7ed",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=7.3"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "^9.3"
-            },
-            "suggest": {
-                "ext-posix": "*"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "5.1-dev"
-                }
-            },
-            "autoload": {
-                "classmap": [
-                    "src/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "sebastian@phpunit.de"
-                }
-            ],
-            "description": "Provides functionality to handle HHVM/PHP environments",
-            "homepage": "http://www.github.com/sebastianbergmann/environment",
-            "keywords": [
-                "Xdebug",
-                "environment",
-                "hhvm"
-            ],
-            "support": {
-                "issues": "https://github.com/sebastianbergmann/environment/issues",
-                "source": "https://github.com/sebastianbergmann/environment/tree/5.1.5"
-            },
-            "funding": [
-                {
-                    "url": "https://github.com/sebastianbergmann",
-                    "type": "github"
-                }
-            ],
-            "time": "2023-02-03T06:03:51+00:00"
-        },
-        {
-            "name": "sebastian/global-state",
-            "version": "5.0.7",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/sebastianbergmann/global-state.git",
-                "reference": "bca7df1f32ee6fe93b4d4a9abbf69e13a4ada2c9"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/global-state/zipball/bca7df1f32ee6fe93b4d4a9abbf69e13a4ada2c9",
-                "reference": "bca7df1f32ee6fe93b4d4a9abbf69e13a4ada2c9",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=7.3",
-                "sebastian/object-reflector": "^2.0",
-                "sebastian/recursion-context": "^4.0"
-            },
-            "require-dev": {
-                "ext-dom": "*",
-                "phpunit/phpunit": "^9.3"
-            },
-            "suggest": {
-                "ext-uopz": "*"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "5.0-dev"
-                }
-            },
-            "autoload": {
-                "classmap": [
-                    "src/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "sebastian@phpunit.de"
-                }
-            ],
-            "description": "Snapshotting of global state",
-            "homepage": "http://www.github.com/sebastianbergmann/global-state",
-            "keywords": [
-                "global state"
-            ],
-            "support": {
-                "issues": "https://github.com/sebastianbergmann/global-state/issues",
-                "source": "https://github.com/sebastianbergmann/global-state/tree/5.0.7"
-            },
-            "funding": [
-                {
-                    "url": "https://github.com/sebastianbergmann",
-                    "type": "github"
-                }
-            ],
-            "time": "2024-03-02T06:35:11+00:00"
-        },
-        {
-            "name": "sebastian/lines-of-code",
-            "version": "1.0.4",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/sebastianbergmann/lines-of-code.git",
-                "reference": "e1e4a170560925c26d424b6a03aed157e7dcc5c5"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/lines-of-code/zipball/e1e4a170560925c26d424b6a03aed157e7dcc5c5",
-                "reference": "e1e4a170560925c26d424b6a03aed157e7dcc5c5",
-                "shasum": ""
-            },
-            "require": {
-                "nikic/php-parser": "^4.18 || ^5.0",
-                "php": ">=7.3"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "^9.3"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.0-dev"
-                }
-            },
-            "autoload": {
-                "classmap": [
-                    "src/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "sebastian@phpunit.de",
-                    "role": "lead"
-                }
-            ],
-            "description": "Library for counting the lines of code in PHP source code",
-            "homepage": "https://github.com/sebastianbergmann/lines-of-code",
-            "support": {
-                "issues": "https://github.com/sebastianbergmann/lines-of-code/issues",
-                "source": "https://github.com/sebastianbergmann/lines-of-code/tree/1.0.4"
-            },
-            "funding": [
-                {
-                    "url": "https://github.com/sebastianbergmann",
-                    "type": "github"
-                }
-            ],
-            "time": "2023-12-22T06:20:34+00:00"
-        },
-        {
-            "name": "sebastian/object-enumerator",
-            "version": "4.0.4",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/sebastianbergmann/object-enumerator.git",
-                "reference": "5c9eeac41b290a3712d88851518825ad78f45c71"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/object-enumerator/zipball/5c9eeac41b290a3712d88851518825ad78f45c71",
-                "reference": "5c9eeac41b290a3712d88851518825ad78f45c71",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=7.3",
-                "sebastian/object-reflector": "^2.0",
-                "sebastian/recursion-context": "^4.0"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "^9.3"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "4.0-dev"
-                }
-            },
-            "autoload": {
-                "classmap": [
-                    "src/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "sebastian@phpunit.de"
-                }
-            ],
-            "description": "Traverses array structures and object graphs to enumerate all referenced objects",
-            "homepage": "https://github.com/sebastianbergmann/object-enumerator/",
-            "support": {
-                "issues": "https://github.com/sebastianbergmann/object-enumerator/issues",
-                "source": "https://github.com/sebastianbergmann/object-enumerator/tree/4.0.4"
-            },
-            "funding": [
-                {
-                    "url": "https://github.com/sebastianbergmann",
-                    "type": "github"
-                }
-            ],
-            "time": "2020-10-26T13:12:34+00:00"
-        },
-        {
-            "name": "sebastian/object-reflector",
-            "version": "2.0.4",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/sebastianbergmann/object-reflector.git",
-                "reference": "b4f479ebdbf63ac605d183ece17d8d7fe49c15c7"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/object-reflector/zipball/b4f479ebdbf63ac605d183ece17d8d7fe49c15c7",
-                "reference": "b4f479ebdbf63ac605d183ece17d8d7fe49c15c7",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=7.3"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "^9.3"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "2.0-dev"
-                }
-            },
-            "autoload": {
-                "classmap": [
-                    "src/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "sebastian@phpunit.de"
-                }
-            ],
-            "description": "Allows reflection of object attributes, including inherited and non-public ones",
-            "homepage": "https://github.com/sebastianbergmann/object-reflector/",
-            "support": {
-                "issues": "https://github.com/sebastianbergmann/object-reflector/issues",
-                "source": "https://github.com/sebastianbergmann/object-reflector/tree/2.0.4"
-            },
-            "funding": [
-                {
-                    "url": "https://github.com/sebastianbergmann",
-                    "type": "github"
-                }
-            ],
-            "time": "2020-10-26T13:14:26+00:00"
-        },
-        {
-            "name": "sebastian/resource-operations",
-            "version": "3.0.4",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/sebastianbergmann/resource-operations.git",
-                "reference": "05d5692a7993ecccd56a03e40cd7e5b09b1d404e"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/resource-operations/zipball/05d5692a7993ecccd56a03e40cd7e5b09b1d404e",
-                "reference": "05d5692a7993ecccd56a03e40cd7e5b09b1d404e",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=7.3"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "^9.0"
+                "phpunit/phpunit": "^10.0"
             },
             "type": "library",
             "extra": {
@@ -15482,10 +14785,11 @@
                     "email": "sebastian@phpunit.de"
                 }
             ],
-            "description": "Provides a list of PHP built-in functions that operate on resources",
-            "homepage": "https://www.github.com/sebastianbergmann/resource-operations",
+            "description": "Looks up which function or method a line of code belongs to",
+            "homepage": "https://github.com/sebastianbergmann/code-unit-reverse-lookup/",
             "support": {
-                "source": "https://github.com/sebastianbergmann/resource-operations/tree/3.0.4"
+                "issues": "https://github.com/sebastianbergmann/code-unit-reverse-lookup/issues",
+                "source": "https://github.com/sebastianbergmann/code-unit-reverse-lookup/tree/3.0.0"
             },
             "funding": [
                 {
@@ -15493,32 +14797,386 @@
                     "type": "github"
                 }
             ],
-            "time": "2024-03-14T16:00:52+00:00"
+            "time": "2023-02-03T06:59:15+00:00"
         },
         {
-            "name": "sebastian/type",
-            "version": "3.2.1",
+            "name": "sebastian/complexity",
+            "version": "3.2.0",
             "source": {
                 "type": "git",
-                "url": "https://github.com/sebastianbergmann/type.git",
-                "reference": "75e2c2a32f5e0b3aef905b9ed0b179b953b3d7c7"
+                "url": "https://github.com/sebastianbergmann/complexity.git",
+                "reference": "68ff824baeae169ec9f2137158ee529584553799"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/type/zipball/75e2c2a32f5e0b3aef905b9ed0b179b953b3d7c7",
-                "reference": "75e2c2a32f5e0b3aef905b9ed0b179b953b3d7c7",
+                "url": "https://api.github.com/repos/sebastianbergmann/complexity/zipball/68ff824baeae169ec9f2137158ee529584553799",
+                "reference": "68ff824baeae169ec9f2137158ee529584553799",
                 "shasum": ""
             },
             "require": {
-                "php": ">=7.3"
+                "nikic/php-parser": "^4.18 || ^5.0",
+                "php": ">=8.1"
             },
             "require-dev": {
-                "phpunit/phpunit": "^9.5"
+                "phpunit/phpunit": "^10.0"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "3.2-dev"
+                    "dev-main": "3.2-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de",
+                    "role": "lead"
+                }
+            ],
+            "description": "Library for calculating the complexity of PHP code units",
+            "homepage": "https://github.com/sebastianbergmann/complexity",
+            "support": {
+                "issues": "https://github.com/sebastianbergmann/complexity/issues",
+                "security": "https://github.com/sebastianbergmann/complexity/security/policy",
+                "source": "https://github.com/sebastianbergmann/complexity/tree/3.2.0"
+            },
+            "funding": [
+                {
+                    "url": "https://github.com/sebastianbergmann",
+                    "type": "github"
+                }
+            ],
+            "time": "2023-12-21T08:37:17+00:00"
+        },
+        {
+            "name": "sebastian/environment",
+            "version": "6.1.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/environment.git",
+                "reference": "8074dbcd93529b357029f5cc5058fd3e43666984"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/8074dbcd93529b357029f5cc5058fd3e43666984",
+                "reference": "8074dbcd93529b357029f5cc5058fd3e43666984",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=8.1"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^10.0"
+            },
+            "suggest": {
+                "ext-posix": "*"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-main": "6.1-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de"
+                }
+            ],
+            "description": "Provides functionality to handle HHVM/PHP environments",
+            "homepage": "https://github.com/sebastianbergmann/environment",
+            "keywords": [
+                "Xdebug",
+                "environment",
+                "hhvm"
+            ],
+            "support": {
+                "issues": "https://github.com/sebastianbergmann/environment/issues",
+                "security": "https://github.com/sebastianbergmann/environment/security/policy",
+                "source": "https://github.com/sebastianbergmann/environment/tree/6.1.0"
+            },
+            "funding": [
+                {
+                    "url": "https://github.com/sebastianbergmann",
+                    "type": "github"
+                }
+            ],
+            "time": "2024-03-23T08:47:14+00:00"
+        },
+        {
+            "name": "sebastian/global-state",
+            "version": "6.0.2",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/global-state.git",
+                "reference": "987bafff24ecc4c9ac418cab1145b96dd6e9cbd9"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/global-state/zipball/987bafff24ecc4c9ac418cab1145b96dd6e9cbd9",
+                "reference": "987bafff24ecc4c9ac418cab1145b96dd6e9cbd9",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=8.1",
+                "sebastian/object-reflector": "^3.0",
+                "sebastian/recursion-context": "^5.0"
+            },
+            "require-dev": {
+                "ext-dom": "*",
+                "phpunit/phpunit": "^10.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-main": "6.0-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de"
+                }
+            ],
+            "description": "Snapshotting of global state",
+            "homepage": "https://www.github.com/sebastianbergmann/global-state",
+            "keywords": [
+                "global state"
+            ],
+            "support": {
+                "issues": "https://github.com/sebastianbergmann/global-state/issues",
+                "security": "https://github.com/sebastianbergmann/global-state/security/policy",
+                "source": "https://github.com/sebastianbergmann/global-state/tree/6.0.2"
+            },
+            "funding": [
+                {
+                    "url": "https://github.com/sebastianbergmann",
+                    "type": "github"
+                }
+            ],
+            "time": "2024-03-02T07:19:19+00:00"
+        },
+        {
+            "name": "sebastian/lines-of-code",
+            "version": "2.0.2",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/lines-of-code.git",
+                "reference": "856e7f6a75a84e339195d48c556f23be2ebf75d0"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/lines-of-code/zipball/856e7f6a75a84e339195d48c556f23be2ebf75d0",
+                "reference": "856e7f6a75a84e339195d48c556f23be2ebf75d0",
+                "shasum": ""
+            },
+            "require": {
+                "nikic/php-parser": "^4.18 || ^5.0",
+                "php": ">=8.1"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^10.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-main": "2.0-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de",
+                    "role": "lead"
+                }
+            ],
+            "description": "Library for counting the lines of code in PHP source code",
+            "homepage": "https://github.com/sebastianbergmann/lines-of-code",
+            "support": {
+                "issues": "https://github.com/sebastianbergmann/lines-of-code/issues",
+                "security": "https://github.com/sebastianbergmann/lines-of-code/security/policy",
+                "source": "https://github.com/sebastianbergmann/lines-of-code/tree/2.0.2"
+            },
+            "funding": [
+                {
+                    "url": "https://github.com/sebastianbergmann",
+                    "type": "github"
+                }
+            ],
+            "time": "2023-12-21T08:38:20+00:00"
+        },
+        {
+            "name": "sebastian/object-enumerator",
+            "version": "5.0.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/object-enumerator.git",
+                "reference": "202d0e344a580d7f7d04b3fafce6933e59dae906"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/object-enumerator/zipball/202d0e344a580d7f7d04b3fafce6933e59dae906",
+                "reference": "202d0e344a580d7f7d04b3fafce6933e59dae906",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=8.1",
+                "sebastian/object-reflector": "^3.0",
+                "sebastian/recursion-context": "^5.0"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^10.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-main": "5.0-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de"
+                }
+            ],
+            "description": "Traverses array structures and object graphs to enumerate all referenced objects",
+            "homepage": "https://github.com/sebastianbergmann/object-enumerator/",
+            "support": {
+                "issues": "https://github.com/sebastianbergmann/object-enumerator/issues",
+                "source": "https://github.com/sebastianbergmann/object-enumerator/tree/5.0.0"
+            },
+            "funding": [
+                {
+                    "url": "https://github.com/sebastianbergmann",
+                    "type": "github"
+                }
+            ],
+            "time": "2023-02-03T07:08:32+00:00"
+        },
+        {
+            "name": "sebastian/object-reflector",
+            "version": "3.0.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/object-reflector.git",
+                "reference": "24ed13d98130f0e7122df55d06c5c4942a577957"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/object-reflector/zipball/24ed13d98130f0e7122df55d06c5c4942a577957",
+                "reference": "24ed13d98130f0e7122df55d06c5c4942a577957",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=8.1"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^10.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-main": "3.0-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de"
+                }
+            ],
+            "description": "Allows reflection of object attributes, including inherited and non-public ones",
+            "homepage": "https://github.com/sebastianbergmann/object-reflector/",
+            "support": {
+                "issues": "https://github.com/sebastianbergmann/object-reflector/issues",
+                "source": "https://github.com/sebastianbergmann/object-reflector/tree/3.0.0"
+            },
+            "funding": [
+                {
+                    "url": "https://github.com/sebastianbergmann",
+                    "type": "github"
+                }
+            ],
+            "time": "2023-02-03T07:06:18+00:00"
+        },
+        {
+            "name": "sebastian/type",
+            "version": "4.0.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/type.git",
+                "reference": "462699a16464c3944eefc02ebdd77882bd3925bf"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/type/zipball/462699a16464c3944eefc02ebdd77882bd3925bf",
+                "reference": "462699a16464c3944eefc02ebdd77882bd3925bf",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=8.1"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^10.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-main": "4.0-dev"
                 }
             },
             "autoload": {
@@ -15541,7 +15199,7 @@
             "homepage": "https://github.com/sebastianbergmann/type",
             "support": {
                 "issues": "https://github.com/sebastianbergmann/type/issues",
-                "source": "https://github.com/sebastianbergmann/type/tree/3.2.1"
+                "source": "https://github.com/sebastianbergmann/type/tree/4.0.0"
             },
             "funding": [
                 {
@@ -15549,29 +15207,29 @@
                     "type": "github"
                 }
             ],
-            "time": "2023-02-03T06:13:03+00:00"
+            "time": "2023-02-03T07:10:45+00:00"
         },
         {
             "name": "sebastian/version",
-            "version": "3.0.2",
+            "version": "4.0.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/version.git",
-                "reference": "c6c1022351a901512170118436c764e473f6de8c"
+                "reference": "c51fa83a5d8f43f1402e3f32a005e6262244ef17"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/version/zipball/c6c1022351a901512170118436c764e473f6de8c",
-                "reference": "c6c1022351a901512170118436c764e473f6de8c",
+                "url": "https://api.github.com/repos/sebastianbergmann/version/zipball/c51fa83a5d8f43f1402e3f32a005e6262244ef17",
+                "reference": "c51fa83a5d8f43f1402e3f32a005e6262244ef17",
                 "shasum": ""
             },
             "require": {
-                "php": ">=7.3"
+                "php": ">=8.1"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "3.0-dev"
+                    "dev-main": "4.0-dev"
                 }
             },
             "autoload": {
@@ -15594,7 +15252,7 @@
             "homepage": "https://github.com/sebastianbergmann/version",
             "support": {
                 "issues": "https://github.com/sebastianbergmann/version/issues",
-                "source": "https://github.com/sebastianbergmann/version/tree/3.0.2"
+                "source": "https://github.com/sebastianbergmann/version/tree/4.0.1"
             },
             "funding": [
                 {
@@ -15602,7 +15260,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2020-09-28T06:39:44+00:00"
+            "time": "2023-02-07T11:34:05+00:00"
         },
         {
             "name": "slevomat/coding-standard",
@@ -15669,86 +15327,18 @@
             ],
             "time": "2024-03-09T15:20:58+00:00"
         },
-        {
-            "name": "spatie/array-to-xml",
-            "version": "3.3.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/spatie/array-to-xml.git",
-                "reference": "f56b220fe2db1ade4c88098d83413ebdfc3bf876"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/spatie/array-to-xml/zipball/f56b220fe2db1ade4c88098d83413ebdfc3bf876",
-                "reference": "f56b220fe2db1ade4c88098d83413ebdfc3bf876",
-                "shasum": ""
-            },
-            "require": {
-                "ext-dom": "*",
-                "php": "^8.0"
-            },
-            "require-dev": {
-                "mockery/mockery": "^1.2",
-                "pestphp/pest": "^1.21",
-                "spatie/pest-plugin-snapshots": "^1.1"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-main": "3.x-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Spatie\\ArrayToXml\\": "src"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Freek Van der Herten",
-                    "email": "freek@spatie.be",
-                    "homepage": "https://freek.dev",
-                    "role": "Developer"
-                }
-            ],
-            "description": "Convert an array to xml",
-            "homepage": "https://github.com/spatie/array-to-xml",
-            "keywords": [
-                "array",
-                "convert",
-                "xml"
-            ],
-            "support": {
-                "source": "https://github.com/spatie/array-to-xml/tree/3.3.0"
-            },
-            "funding": [
-                {
-                    "url": "https://spatie.be/open-source/support-us",
-                    "type": "custom"
-                },
-                {
-                    "url": "https://github.com/spatie",
-                    "type": "github"
-                }
-            ],
-            "time": "2024-05-01T10:20:27+00:00"
-        },
         {
             "name": "squizlabs/php_codesniffer",
-            "version": "3.10.1",
+            "version": "3.11.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/PHPCSStandards/PHP_CodeSniffer.git",
-                "reference": "8f90f7a53ce271935282967f53d0894f8f1ff877"
+                "reference": "1368f4a58c3c52114b86b1abe8f4098869cb0079"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/PHPCSStandards/PHP_CodeSniffer/zipball/8f90f7a53ce271935282967f53d0894f8f1ff877",
-                "reference": "8f90f7a53ce271935282967f53d0894f8f1ff877",
+                "url": "https://api.github.com/repos/PHPCSStandards/PHP_CodeSniffer/zipball/1368f4a58c3c52114b86b1abe8f4098869cb0079",
+                "reference": "1368f4a58c3c52114b86b1abe8f4098869cb0079",
                 "shasum": ""
             },
             "require": {
@@ -15815,35 +15405,36 @@
                     "type": "open_collective"
                 }
             ],
-            "time": "2024-05-22T21:24:41+00:00"
+            "time": "2024-12-11T16:04:26+00:00"
         },
         {
             "name": "symfony/cache",
-            "version": "v6.4.8",
+            "version": "v7.2.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/cache.git",
-                "reference": "287142df5579ce223c485b3872df3efae8390984"
+                "reference": "e7e983596b744c4539f31e79b0350a6cf5878a20"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/cache/zipball/287142df5579ce223c485b3872df3efae8390984",
-                "reference": "287142df5579ce223c485b3872df3efae8390984",
+                "url": "https://api.github.com/repos/symfony/cache/zipball/e7e983596b744c4539f31e79b0350a6cf5878a20",
+                "reference": "e7e983596b744c4539f31e79b0350a6cf5878a20",
                 "shasum": ""
             },
             "require": {
-                "php": ">=8.1",
+                "php": ">=8.2",
                 "psr/cache": "^2.0|^3.0",
                 "psr/log": "^1.1|^2|^3",
                 "symfony/cache-contracts": "^2.5|^3",
+                "symfony/deprecation-contracts": "^2.5|^3.0",
                 "symfony/service-contracts": "^2.5|^3",
-                "symfony/var-exporter": "^6.3.6|^7.0"
+                "symfony/var-exporter": "^6.4|^7.0"
             },
             "conflict": {
-                "doctrine/dbal": "<2.13.1",
-                "symfony/dependency-injection": "<5.4",
-                "symfony/http-kernel": "<5.4",
-                "symfony/var-dumper": "<5.4"
+                "doctrine/dbal": "<3.6",
+                "symfony/dependency-injection": "<6.4",
+                "symfony/http-kernel": "<6.4",
+                "symfony/var-dumper": "<6.4"
             },
             "provide": {
                 "psr/cache-implementation": "2.0|3.0",
@@ -15852,15 +15443,16 @@
             },
             "require-dev": {
                 "cache/integration-tests": "dev-master",
-                "doctrine/dbal": "^2.13.1|^3|^4",
+                "doctrine/dbal": "^3.6|^4",
                 "predis/predis": "^1.1|^2.0",
                 "psr/simple-cache": "^1.0|^2.0|^3.0",
-                "symfony/config": "^5.4|^6.0|^7.0",
-                "symfony/dependency-injection": "^5.4|^6.0|^7.0",
-                "symfony/filesystem": "^5.4|^6.0|^7.0",
-                "symfony/http-kernel": "^5.4|^6.0|^7.0",
-                "symfony/messenger": "^5.4|^6.0|^7.0",
-                "symfony/var-dumper": "^5.4|^6.0|^7.0"
+                "symfony/clock": "^6.4|^7.0",
+                "symfony/config": "^6.4|^7.0",
+                "symfony/dependency-injection": "^6.4|^7.0",
+                "symfony/filesystem": "^6.4|^7.0",
+                "symfony/http-kernel": "^6.4|^7.0",
+                "symfony/messenger": "^6.4|^7.0",
+                "symfony/var-dumper": "^6.4|^7.0"
             },
             "type": "library",
             "autoload": {
@@ -15895,7 +15487,7 @@
                 "psr6"
             ],
             "support": {
-                "source": "https://github.com/symfony/cache/tree/v6.4.8"
+                "source": "https://github.com/symfony/cache/tree/v7.2.1"
             },
             "funding": [
                 {
@@ -15911,20 +15503,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-05-31T14:49:08+00:00"
+            "time": "2024-12-07T08:08:50+00:00"
         },
         {
             "name": "symfony/cache-contracts",
-            "version": "v3.5.0",
+            "version": "v3.5.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/cache-contracts.git",
-                "reference": "df6a1a44c890faded49a5fca33c2d5c5fd3c2197"
+                "reference": "15a4f8e5cd3bce9aeafc882b1acab39ec8de2c1b"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/cache-contracts/zipball/df6a1a44c890faded49a5fca33c2d5c5fd3c2197",
-                "reference": "df6a1a44c890faded49a5fca33c2d5c5fd3c2197",
+                "url": "https://api.github.com/repos/symfony/cache-contracts/zipball/15a4f8e5cd3bce9aeafc882b1acab39ec8de2c1b",
+                "reference": "15a4f8e5cd3bce9aeafc882b1acab39ec8de2c1b",
                 "shasum": ""
             },
             "require": {
@@ -15933,12 +15525,12 @@
             },
             "type": "library",
             "extra": {
+                "thanks": {
+                    "url": "https://github.com/symfony/contracts",
+                    "name": "symfony/contracts"
+                },
                 "branch-alias": {
                     "dev-main": "3.5-dev"
-                },
-                "thanks": {
-                    "name": "symfony/contracts",
-                    "url": "https://github.com/symfony/contracts"
                 }
             },
             "autoload": {
@@ -15971,7 +15563,7 @@
                 "standards"
             ],
             "support": {
-                "source": "https://github.com/symfony/cache-contracts/tree/v3.5.0"
+                "source": "https://github.com/symfony/cache-contracts/tree/v3.5.1"
             },
             "funding": [
                 {
@@ -15987,7 +15579,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-04-18T09:32:20+00:00"
+            "time": "2024-09-25T14:20:29+00:00"
         },
         {
             "name": "symfony/dom-crawler",
@@ -16065,25 +15657,25 @@
         },
         {
             "name": "symfony/filesystem",
-            "version": "v6.4.8",
+            "version": "v7.2.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/filesystem.git",
-                "reference": "4d37529150e7081c51b3c5d5718c55a04a9503f3"
+                "reference": "b8dce482de9d7c9fe2891155035a7248ab5c7fdb"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/filesystem/zipball/4d37529150e7081c51b3c5d5718c55a04a9503f3",
-                "reference": "4d37529150e7081c51b3c5d5718c55a04a9503f3",
+                "url": "https://api.github.com/repos/symfony/filesystem/zipball/b8dce482de9d7c9fe2891155035a7248ab5c7fdb",
+                "reference": "b8dce482de9d7c9fe2891155035a7248ab5c7fdb",
                 "shasum": ""
             },
             "require": {
-                "php": ">=8.1",
+                "php": ">=8.2",
                 "symfony/polyfill-ctype": "~1.8",
                 "symfony/polyfill-mbstring": "~1.8"
             },
             "require-dev": {
-                "symfony/process": "^5.4|^6.4|^7.0"
+                "symfony/process": "^6.4|^7.0"
             },
             "type": "library",
             "autoload": {
@@ -16111,7 +15703,7 @@
             "description": "Provides basic utilities for the filesystem",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/filesystem/tree/v6.4.8"
+                "source": "https://github.com/symfony/filesystem/tree/v7.2.0"
             },
             "funding": [
                 {
@@ -16127,32 +15719,33 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-05-31T14:49:08+00:00"
+            "time": "2024-10-25T15:15:23+00:00"
         },
         {
             "name": "symfony/http-client",
-            "version": "v6.4.8",
+            "version": "v7.2.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/http-client.git",
-                "reference": "61faba993e620fc22d4f0ab3b6bcf8fbb0d44b05"
+                "reference": "339ba21476eb184290361542f732ad12c97591ec"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/http-client/zipball/61faba993e620fc22d4f0ab3b6bcf8fbb0d44b05",
-                "reference": "61faba993e620fc22d4f0ab3b6bcf8fbb0d44b05",
+                "url": "https://api.github.com/repos/symfony/http-client/zipball/339ba21476eb184290361542f732ad12c97591ec",
+                "reference": "339ba21476eb184290361542f732ad12c97591ec",
                 "shasum": ""
             },
             "require": {
-                "php": ">=8.1",
+                "php": ">=8.2",
                 "psr/log": "^1|^2|^3",
                 "symfony/deprecation-contracts": "^2.5|^3",
-                "symfony/http-client-contracts": "^3.4.1",
+                "symfony/http-client-contracts": "~3.4.4|^3.5.2",
                 "symfony/service-contracts": "^2.5|^3"
             },
             "conflict": {
+                "amphp/amp": "<2.5",
                 "php-http/discovery": "<1.15",
-                "symfony/http-foundation": "<6.3"
+                "symfony/http-foundation": "<6.4"
             },
             "provide": {
                 "php-http/async-client-implementation": "*",
@@ -16161,19 +15754,20 @@
                 "symfony/http-client-implementation": "3.0"
             },
             "require-dev": {
-                "amphp/amp": "^2.5",
-                "amphp/http-client": "^4.2.1",
-                "amphp/http-tunnel": "^1.0",
+                "amphp/http-client": "^4.2.1|^5.0",
+                "amphp/http-tunnel": "^1.0|^2.0",
                 "amphp/socket": "^1.1",
                 "guzzlehttp/promises": "^1.4|^2.0",
                 "nyholm/psr7": "^1.0",
                 "php-http/httplug": "^1.0|^2.0",
                 "psr/http-client": "^1.0",
-                "symfony/dependency-injection": "^5.4|^6.0|^7.0",
-                "symfony/http-kernel": "^5.4|^6.0|^7.0",
-                "symfony/messenger": "^5.4|^6.0|^7.0",
-                "symfony/process": "^5.4|^6.0|^7.0",
-                "symfony/stopwatch": "^5.4|^6.0|^7.0"
+                "symfony/amphp-http-client-meta": "^1.0|^2.0",
+                "symfony/dependency-injection": "^6.4|^7.0",
+                "symfony/http-kernel": "^6.4|^7.0",
+                "symfony/messenger": "^6.4|^7.0",
+                "symfony/process": "^6.4|^7.0",
+                "symfony/rate-limiter": "^6.4|^7.0",
+                "symfony/stopwatch": "^6.4|^7.0"
             },
             "type": "library",
             "autoload": {
@@ -16204,7 +15798,7 @@
                 "http"
             ],
             "support": {
-                "source": "https://github.com/symfony/http-client/tree/v6.4.8"
+                "source": "https://github.com/symfony/http-client/tree/v7.2.2"
             },
             "funding": [
                 {
@@ -16220,20 +15814,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-05-31T14:49:08+00:00"
+            "time": "2024-12-30T18:35:15+00:00"
         },
         {
             "name": "symfony/http-client-contracts",
-            "version": "v3.5.0",
+            "version": "v3.5.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/http-client-contracts.git",
-                "reference": "20414d96f391677bf80078aa55baece78b82647d"
+                "reference": "ee8d807ab20fcb51267fdace50fbe3494c31e645"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/http-client-contracts/zipball/20414d96f391677bf80078aa55baece78b82647d",
-                "reference": "20414d96f391677bf80078aa55baece78b82647d",
+                "url": "https://api.github.com/repos/symfony/http-client-contracts/zipball/ee8d807ab20fcb51267fdace50fbe3494c31e645",
+                "reference": "ee8d807ab20fcb51267fdace50fbe3494c31e645",
                 "shasum": ""
             },
             "require": {
@@ -16241,12 +15835,12 @@
             },
             "type": "library",
             "extra": {
+                "thanks": {
+                    "url": "https://github.com/symfony/contracts",
+                    "name": "symfony/contracts"
+                },
                 "branch-alias": {
                     "dev-main": "3.5-dev"
-                },
-                "thanks": {
-                    "name": "symfony/contracts",
-                    "url": "https://github.com/symfony/contracts"
                 }
             },
             "autoload": {
@@ -16282,7 +15876,7 @@
                 "standards"
             ],
             "support": {
-                "source": "https://github.com/symfony/http-client-contracts/tree/v3.5.0"
+                "source": "https://github.com/symfony/http-client-contracts/tree/v3.5.2"
             },
             "funding": [
                 {
@@ -16298,24 +15892,24 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-04-18T09:32:20+00:00"
+            "time": "2024-12-07T08:49:48+00:00"
         },
         {
             "name": "symfony/options-resolver",
-            "version": "v6.4.8",
+            "version": "v7.2.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/options-resolver.git",
-                "reference": "22ab9e9101ab18de37839074f8a1197f55590c1b"
+                "reference": "7da8fbac9dcfef75ffc212235d76b2754ce0cf50"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/options-resolver/zipball/22ab9e9101ab18de37839074f8a1197f55590c1b",
-                "reference": "22ab9e9101ab18de37839074f8a1197f55590c1b",
+                "url": "https://api.github.com/repos/symfony/options-resolver/zipball/7da8fbac9dcfef75ffc212235d76b2754ce0cf50",
+                "reference": "7da8fbac9dcfef75ffc212235d76b2754ce0cf50",
                 "shasum": ""
             },
             "require": {
-                "php": ">=8.1",
+                "php": ">=8.2",
                 "symfony/deprecation-contracts": "^2.5|^3"
             },
             "type": "library",
@@ -16349,7 +15943,7 @@
                 "options"
             ],
             "support": {
-                "source": "https://github.com/symfony/options-resolver/tree/v6.4.8"
+                "source": "https://github.com/symfony/options-resolver/tree/v7.2.0"
             },
             "funding": [
                 {
@@ -16365,30 +15959,30 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-05-31T14:49:08+00:00"
+            "time": "2024-11-20T11:17:29+00:00"
         },
         {
             "name": "symfony/polyfill-php81",
-            "version": "v1.30.0",
+            "version": "v1.31.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-php81.git",
-                "reference": "3fb075789fb91f9ad9af537c4012d523085bd5af"
+                "reference": "4a4cfc2d253c21a5ad0e53071df248ed48c6ce5c"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-php81/zipball/3fb075789fb91f9ad9af537c4012d523085bd5af",
-                "reference": "3fb075789fb91f9ad9af537c4012d523085bd5af",
+                "url": "https://api.github.com/repos/symfony/polyfill-php81/zipball/4a4cfc2d253c21a5ad0e53071df248ed48c6ce5c",
+                "reference": "4a4cfc2d253c21a5ad0e53071df248ed48c6ce5c",
                 "shasum": ""
             },
             "require": {
-                "php": ">=7.1"
+                "php": ">=7.2"
             },
             "type": "library",
             "extra": {
                 "thanks": {
-                    "name": "symfony/polyfill",
-                    "url": "https://github.com/symfony/polyfill"
+                    "url": "https://github.com/symfony/polyfill",
+                    "name": "symfony/polyfill"
                 }
             },
             "autoload": {
@@ -16425,7 +16019,7 @@
                 "shim"
             ],
             "support": {
-                "source": "https://github.com/symfony/polyfill-php81/tree/v1.30.0"
+                "source": "https://github.com/symfony/polyfill-php81/tree/v1.31.0"
             },
             "funding": [
                 {
@@ -16441,24 +16035,24 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-06-19T12:30:46+00:00"
+            "time": "2024-09-09T11:45:10+00:00"
         },
         {
             "name": "symfony/stopwatch",
-            "version": "v6.4.8",
+            "version": "v7.2.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/stopwatch.git",
-                "reference": "63e069eb616049632cde9674c46957819454b8aa"
+                "reference": "e46690d5b9d7164a6d061cab1e8d46141b9f49df"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/stopwatch/zipball/63e069eb616049632cde9674c46957819454b8aa",
-                "reference": "63e069eb616049632cde9674c46957819454b8aa",
+                "url": "https://api.github.com/repos/symfony/stopwatch/zipball/e46690d5b9d7164a6d061cab1e8d46141b9f49df",
+                "reference": "e46690d5b9d7164a6d061cab1e8d46141b9f49df",
                 "shasum": ""
             },
             "require": {
-                "php": ">=8.1",
+                "php": ">=8.2",
                 "symfony/service-contracts": "^2.5|^3"
             },
             "type": "library",
@@ -16487,7 +16081,7 @@
             "description": "Provides a way to profile code",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/stopwatch/tree/v6.4.8"
+                "source": "https://github.com/symfony/stopwatch/tree/v7.2.2"
             },
             "funding": [
                 {
@@ -16503,30 +16097,29 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-05-31T14:49:08+00:00"
+            "time": "2024-12-18T14:28:33+00:00"
         },
         {
             "name": "symfony/var-exporter",
-            "version": "v6.4.8",
+            "version": "v7.2.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/var-exporter.git",
-                "reference": "792ca836f99b340f2e9ca9497c7953948c49a504"
+                "reference": "1a6a89f95a46af0f142874c9d650a6358d13070d"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/var-exporter/zipball/792ca836f99b340f2e9ca9497c7953948c49a504",
-                "reference": "792ca836f99b340f2e9ca9497c7953948c49a504",
+                "url": "https://api.github.com/repos/symfony/var-exporter/zipball/1a6a89f95a46af0f142874c9d650a6358d13070d",
+                "reference": "1a6a89f95a46af0f142874c9d650a6358d13070d",
                 "shasum": ""
             },
             "require": {
-                "php": ">=8.1",
-                "symfony/deprecation-contracts": "^2.5|^3"
+                "php": ">=8.2"
             },
             "require-dev": {
                 "symfony/property-access": "^6.4|^7.0",
                 "symfony/serializer": "^6.4|^7.0",
-                "symfony/var-dumper": "^5.4|^6.0|^7.0"
+                "symfony/var-dumper": "^6.4|^7.0"
             },
             "type": "library",
             "autoload": {
@@ -16564,7 +16157,7 @@
                 "serialize"
             ],
             "support": {
-                "source": "https://github.com/symfony/var-exporter/tree/v6.4.8"
+                "source": "https://github.com/symfony/var-exporter/tree/v7.2.0"
             },
             "funding": [
                 {
@@ -16580,7 +16173,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-05-31T14:49:08+00:00"
+            "time": "2024-10-18T07:58:17+00:00"
         },
         {
             "name": "theseer/tokenizer",
@@ -16631,133 +16224,25 @@
                 }
             ],
             "time": "2024-03-03T12:36:25+00:00"
-        },
-        {
-            "name": "vimeo/psalm",
-            "version": "5.25.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/vimeo/psalm.git",
-                "reference": "01a8eb06b9e9cc6cfb6a320bf9fb14331919d505"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/vimeo/psalm/zipball/01a8eb06b9e9cc6cfb6a320bf9fb14331919d505",
-                "reference": "01a8eb06b9e9cc6cfb6a320bf9fb14331919d505",
-                "shasum": ""
-            },
-            "require": {
-                "amphp/amp": "^2.4.2",
-                "amphp/byte-stream": "^1.5",
-                "composer-runtime-api": "^2",
-                "composer/semver": "^1.4 || ^2.0 || ^3.0",
-                "composer/xdebug-handler": "^2.0 || ^3.0",
-                "dnoegel/php-xdg-base-dir": "^0.1.1",
-                "ext-ctype": "*",
-                "ext-dom": "*",
-                "ext-json": "*",
-                "ext-libxml": "*",
-                "ext-mbstring": "*",
-                "ext-simplexml": "*",
-                "ext-tokenizer": "*",
-                "felixfbecker/advanced-json-rpc": "^3.1",
-                "felixfbecker/language-server-protocol": "^1.5.2",
-                "fidry/cpu-core-counter": "^0.4.1 || ^0.5.1 || ^1.0.0",
-                "netresearch/jsonmapper": "^1.0 || ^2.0 || ^3.0 || ^4.0",
-                "nikic/php-parser": "^4.16",
-                "php": "^7.4 || ~8.0.0 || ~8.1.0 || ~8.2.0 || ~8.3.0",
-                "sebastian/diff": "^4.0 || ^5.0 || ^6.0",
-                "spatie/array-to-xml": "^2.17.0 || ^3.0",
-                "symfony/console": "^4.1.6 || ^5.0 || ^6.0 || ^7.0",
-                "symfony/filesystem": "^5.4 || ^6.0 || ^7.0"
-            },
-            "conflict": {
-                "nikic/php-parser": "4.17.0"
-            },
-            "provide": {
-                "psalm/psalm": "self.version"
-            },
-            "require-dev": {
-                "amphp/phpunit-util": "^2.0",
-                "bamarni/composer-bin-plugin": "^1.4",
-                "brianium/paratest": "^6.9",
-                "ext-curl": "*",
-                "mockery/mockery": "^1.5",
-                "nunomaduro/mock-final-classes": "^1.1",
-                "php-parallel-lint/php-parallel-lint": "^1.2",
-                "phpstan/phpdoc-parser": "^1.6",
-                "phpunit/phpunit": "^9.6",
-                "psalm/plugin-mockery": "^1.1",
-                "psalm/plugin-phpunit": "^0.18",
-                "slevomat/coding-standard": "^8.4",
-                "squizlabs/php_codesniffer": "^3.6",
-                "symfony/process": "^4.4 || ^5.0 || ^6.0 || ^7.0"
-            },
-            "suggest": {
-                "ext-curl": "In order to send data to shepherd",
-                "ext-igbinary": "^2.0.5 is required, used to serialize caching data"
-            },
-            "bin": [
-                "psalm",
-                "psalm-language-server",
-                "psalm-plugin",
-                "psalm-refactor",
-                "psalter"
-            ],
-            "type": "project",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "5.x-dev",
-                    "dev-4.x": "4.x-dev",
-                    "dev-3.x": "3.x-dev",
-                    "dev-2.x": "2.x-dev",
-                    "dev-1.x": "1.x-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Psalm\\": "src/Psalm/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Matthew Brown"
-                }
-            ],
-            "description": "A static analysis tool for finding errors in PHP applications",
-            "keywords": [
-                "code",
-                "inspection",
-                "php",
-                "static analysis"
-            ],
-            "support": {
-                "docs": "https://psalm.dev/docs",
-                "issues": "https://github.com/vimeo/psalm/issues",
-                "source": "https://github.com/vimeo/psalm"
-            },
-            "time": "2024-06-16T15:08:35+00:00"
         }
     ],
     "aliases": [],
     "minimum-stability": "stable",
     "stability-flags": {
-        "arietimmerman/laravel-scim-server": 20
+        "arietimmerman/laravel-scim-server": 20,
+        "laravelcollective/html": 20
     },
     "prefer-stable": false,
     "prefer-lowest": false,
     "platform": {
-        "php": "^8.1",
+        "php": "^8.2",
         "ext-curl": "*",
         "ext-fileinfo": "*",
+        "ext-iconv": "*",
         "ext-json": "*",
         "ext-mbstring": "*",
         "ext-pdo": "*"
     },
-    "platform-dev": [],
+    "platform-dev": {},
     "plugin-api-version": "2.6.0"
 }
diff --git a/config/app.php b/config/app.php
index f17b856d05..9de088089f 100755
--- a/config/app.php
+++ b/config/app.php
@@ -242,7 +242,7 @@ return [
     |
     */
 
-    'min_php' => '7.4.0',
+    'min_php' => '8.2.0',
 
 
     /*
@@ -280,7 +280,6 @@ return [
         Illuminate\Redis\RedisServiceProvider::class,
         Illuminate\Auth\Passwords\PasswordResetServiceProvider::class,
         Illuminate\Session\SessionServiceProvider::class,
-//        Illuminate\Translation\TranslationServiceProvider::class, //replaced on next line
         App\Providers\SnipeTranslationServiceProvider::class, //we REPLACE the default Laravel translator with our own
         Illuminate\Validation\ValidationServiceProvider::class,
         Illuminate\View\ViewServiceProvider::class,
@@ -311,10 +310,13 @@ return [
         App\Providers\ValidationServiceProvider::class,
 
         /*
-        * Custom service provider
+        * Custom Service Providers...
         */
+        App\Providers\BladeServiceProvider::class,
+        App\Providers\LivewireServiceProvider::class,
         App\Providers\MacroServiceProvider::class,
         App\Providers\SamlServiceProvider::class,
+        App\Providers\BreadcrumbsServiceProvider::class,
 
     ],
 
@@ -339,7 +341,7 @@ return [
         'Cache' => Illuminate\Support\Facades\Cache::class,
         'Config' => Illuminate\Support\Facades\Config::class,
         'Cookie' => Illuminate\Support\Facades\Cookie::class,
-        'Crypt' => Illuminate\Support\FacadesCrypt::class,
+        'Crypt' => Illuminate\Support\Facades\Crypt::class,
         'Date' => Illuminate\Support\Facades\Date::class,
         'DB' => Illuminate\Support\Facades\DB::class,
         'Eloquent' => Illuminate\Database\Eloquent\Model::class,
@@ -370,7 +372,9 @@ return [
         'Google2FA' => PragmaRX\Google2FALaravel\Facade::class,
         'Image'     => Intervention\Image\ImageServiceProvider::class,
         'Carbon' => Carbon\Carbon::class,
-        'Helper' => App\Helpers\Helper::class, // makes it much easier to use 'Helper::blah' in blades (which is where we usually use this)
+        'Helper' => App\Helpers\Helper::class,
+        'StorageHelper' => App\Helpers\StorageHelper::class,
+        'Icon' => App\Helpers\IconHelper::class,
         'Socialite' => Laravel\Socialite\Facades\Socialite::class,
 
 
@@ -426,5 +430,5 @@ return [
   */
 
     'escape_formulas' => env('CSV_ESCAPE_FORMULAS', true),
-
+    
 ];
diff --git a/config/backup.php b/config/backup.php
index 10ebdde038..5641134be8 100644
--- a/config/backup.php
+++ b/config/backup.php
@@ -139,7 +139,7 @@ return [
             'to' => env('MAIL_BACKUP_NOTIFICATION_ADDRESS', null),
 
             'from' => [
-                'address' => env('MAIL_FROM_ADDRESS', 'hello@example.com'),
+                'address' => env('MAIL_FROM_ADDR', 'hello@example.com'),
                 'name' => env('MAIL_FROM_NAME', 'Example'),
             ],
         ],
@@ -207,34 +207,36 @@ return [
             /*
              * The number of days for which backups must be kept.
              */
-            'keep_all_backups_for_days' => 7,
+            'keep_all_backups_for_days' => env('ALL_BACKUP_KEEP_DAYS', 7),
 
             /*
              * The number of days for which daily backups must be kept.
              */
-            'keep_daily_backups_for_days' => 16,
+            'keep_daily_backups_for_days' => env('DAILY_BACKUP_KEEP_DAYS', 16),
 
             /*
              * The number of weeks for which one weekly backup must be kept.
              */
-            'keep_weekly_backups_for_weeks' => 8,
+            'keep_weekly_backups_for_weeks' => env('WEEKLY_BACKUP_KEEP_WEEKS', 8),
 
             /*
              * The number of months for which one monthly backup must be kept.
              */
-            'keep_monthly_backups_for_months' => 4,
+            'keep_monthly_backups_for_months' => env('MONTHLY_BACKUP_KEEP_MONTHS', 4),
 
             /*
              * The number of years for which one yearly backup must be kept.
              */
-            'keep_yearly_backups_for_years' => 2,
+            'keep_yearly_backups_for_years' => env('YEARLY_BACKUP_KEEP_YEARS', 2),
 
             /*
              * After cleaning up the backups remove the oldest backup until
              * this amount of megabytes has been reached.
              */
-            'delete_oldest_backups_when_using_more_megabytes_than' => 5000,
+            'delete_oldest_backups_when_using_more_megabytes_than' => env('BACKUP_PURGE_OLDEST_AT_MEGS', 5000),
         ],
     ],
 
+    'sanitize_by_default' => env('DB_SANITIZE_BY_DEFAULT', false),
+
 ];
diff --git a/config/database.php b/config/database.php
index de3c40bb25..fd7ff6aa0f 100755
--- a/config/database.php
+++ b/config/database.php
@@ -8,6 +8,22 @@
  | be modified directly.
 */
 
+
+// This is used by the mysql dump options in spatie backup
+$dump_options = [
+    'dump_binary_path' => env('DB_DUMP_PATH', '/usr/local/bin'),  // only the path, so without 'mysqldump'
+    'use_single_transaction' => false,
+    'timeout' => 60 * 5, // 5 minute timeout
+    //'exclude_tables' => ['table1', 'table2'],
+    //'add_extra_option' => '--optionname=optionvalue',
+];
+
+// Some versions of mysql do not support the --skip-ssl option and will fail if it is
+if (env('DB_DUMP_SKIP_SSL') == 'true') {
+    $dump_options['skip_ssl'] = true;
+}
+
+
 return [
 
     /*
@@ -79,14 +95,7 @@ return [
             'strict'    => false,
             'engine'    => 'InnoDB',
             'unix_socket' => env('DB_SOCKET', ''),
-            'dump' => [
-                'dump_binary_path' => env('DB_DUMP_PATH', '/usr/local/bin'),  // only the path, so without 'mysqldump'
-                'use_single_transaction' => false,
-                'timeout' => 60 * 5, // 5 minute timeout
-                //'exclude_tables' => ['table1', 'table2'],
-                //'add_extra_option' => '--optionname=optionvalue',
-            ],
-
+            'dump' => $dump_options,
             'dump_command_timeout' => 60 * 5, // 5 minute timeout
             'dump_using_single_transaction' => true, // perform dump using a single transaction
             'options' => (env('DB_SSL')) ? ((env('DB_SSL_IS_PAAS')) ? [
diff --git a/config/livewire.php b/config/livewire.php
index 8cc482183b..d9db384bd6 100644
--- a/config/livewire.php
+++ b/config/livewire.php
@@ -157,4 +157,21 @@ return [
     */
 
     'pagination_theme' => 'tailwind',
+
+    /*
+    |---------------------------------------------------------------------------
+    | URL Prefix
+    |---------------------------------------------------------------------------
+    |
+    | By default, Livewire sends network requests to {app.com}/livewire/update
+    | while javascript assets are served via {app.com}/livewire/livewire.js
+    | If you need to adjust the prefix of those urls you can do it below.
+    |
+    | Defining a prefix will result in the following url
+    | {app.com}/{prefix}/livewire/{update|livewire.js}
+    | Note: do not include the leading or trailing /
+    |
+    */
+
+    'url_prefix' => env('LIVEWIRE_URL_PREFIX', null),
 ];
diff --git a/config/logging.php b/config/logging.php
index afaf09ed27..c5991145a3 100644
--- a/config/logging.php
+++ b/config/logging.php
@@ -140,5 +140,11 @@ if ((env('APP_ENV')=='production') && (env('ROLLBAR_TOKEN'))) {
 
 }
 
+if (env('LOG_DEPRECATIONS')=='true') {
+    $config['channels']['deprecations'] = [
+        'driver' => 'single',
+        'path' => storage_path('logs/deprecations.log')
+    ];
+}
 
 return $config;
\ No newline at end of file
diff --git a/config/passport.php b/config/passport.php
index d410cfe20e..8de731b49a 100644
--- a/config/passport.php
+++ b/config/passport.php
@@ -14,4 +14,5 @@ return [
     'private_key' => env('PASSPORT_PRIVATE_KEY'),
     'public_key' => env('PASSPORT_PUBLIC_KEY'),
     'expiration_years' => env('API_TOKEN_EXPIRATION_YEARS', 20),
+    'cookie_name' => env('PASSPORT_COOKIE_NAME', 'snipeit_passport_token'),
 ];
diff --git a/config/services.php b/config/services.php
index 21acb6778a..07b1c1069f 100644
--- a/config/services.php
+++ b/config/services.php
@@ -44,12 +44,6 @@ return [
         'secret' => env('STRIPE_SECRET'),
     ],
 
-    'baremetrics' => [
-        'enabled' => env('ENABLE_BMPAY', false),
-        'app_key'  => env('BMPAY_PUBLIC_KEY',  null),
-        'stripe_id'    => env('BMPAY_STRIPE_ID', null),
-    ],
-
     'google' => [
         'maps_api_key' => env('GOOGLE_MAPS_API'),
     ],
diff --git a/config/session.php b/config/session.php
index 5c6cb27a9f..10d0d1acfb 100644
--- a/config/session.php
+++ b/config/session.php
@@ -172,7 +172,7 @@ return [
     | More info: https://bootstrap-table.com/docs/extensions/cookie/#cookiestorage
     */
 
-    'bs_table_storage' => env('BS_TABLE_STORAGE', 'cookieStorage'),
+    'bs_table_storage' => env('BS_TABLE_STORAGE', 'localStorage'),
 
 
     /*
diff --git a/config/version.php b/config/version.php
index efa17069ea..9d0b165893 100644
--- a/config/version.php
+++ b/config/version.php
@@ -1,10 +1,10 @@
 <?php
 return array (
-  'app_version' => 'v7.0.6',
-  'full_app_version' => 'v7.0.6 - build 14112-ge1a6b441d',
-  'build_version' => '14112',
+  'app_version' => 'v8.1.15',
+  'full_app_version' => 'v8.1.15 - build 18405-ge4314cf42',
+  'build_version' => '18405',
   'prerelease_version' => '',
-  'hash_version' => 'ge1a6b441d',
-  'full_hash' => 'v7.0.6-6-ge1a6b441d',
+  'hash_version' => 'ge4314cf42',
+  'full_hash' => 'v8.1.15-13-ge4314cf42',
   'branch' => 'develop',
 );
\ No newline at end of file
diff --git a/database/factories/AccessoryFactory.php b/database/factories/AccessoryFactory.php
index ce0d60cc18..f2c01dc8fb 100644
--- a/database/factories/AccessoryFactory.php
+++ b/database/factories/AccessoryFactory.php
@@ -3,6 +3,7 @@
 namespace Database\Factories;
 
 use App\Models\Accessory;
+use App\Models\Asset;
 use App\Models\Category;
 use App\Models\Location;
 use App\Models\Manufacturer;
@@ -33,7 +34,7 @@ class AccessoryFactory extends Factory
                 $this->faker->randomElement(['Bluetooth', 'Wired']),
                 $this->faker->randomElement(['Keyboard', 'Wired'])
             ),
-            'user_id' => User::factory()->superuser(),
+            'created_by' => User::factory()->superuser(),
             'category_id' => Category::factory()->forAccessories(),
             'model_number' => $this->faker->numberBetween(1000000, 50000000),
             'location_id' => Location::factory(),
@@ -125,11 +126,12 @@ class AccessoryFactory extends Factory
         })->afterCreating(function ($accessory) {
             $user = User::factory()->create();
 
-            $accessory->users()->attach($accessory->id, [
+            $accessory->checkouts()->create([
                 'accessory_id' => $accessory->id,
-                'created_at' => now(),
-                'user_id' => $user->id,
+                'created_at' => Carbon::now(),
+                'created_by' => $user->id,
                 'assigned_to' => $user->id,
+                'assigned_type' => User::class,
                 'note' => '',
             ]);
         });
@@ -145,11 +147,53 @@ class AccessoryFactory extends Factory
     public function checkedOutToUser(User $user = null)
     {
         return $this->afterCreating(function (Accessory $accessory) use ($user) {
-            $accessory->users()->attach($accessory->id, [
+            $accessory->checkouts()->create([
                 'accessory_id' => $accessory->id,
                 'created_at' => Carbon::now(),
-                'user_id' => 1,
+                'created_by' => 1,
                 'assigned_to' => $user->id ?? User::factory()->create()->id,
+                'assigned_type' => User::class,
+            ]);
+        });
+    }
+
+    public function checkedOutToUsers(array $users)
+    {
+        return $this->afterCreating(function (Accessory $accessory) use ($users) {
+            foreach ($users as $user) {
+                $accessory->checkouts()->create([
+                    'accessory_id' => $accessory->id,
+                    'created_at' => Carbon::now(),
+                    'created_by' => 1,
+                    'assigned_to' => $user->id,
+                    'assigned_type' => User::class,
+                ]);
+            }
+        });
+    }
+
+    public function checkedOutToAsset(Asset $asset = null)
+    {
+        return $this->afterCreating(function (Accessory $accessory) use ($asset) {
+            $accessory->checkouts()->create([
+                'accessory_id' => $accessory->id,
+                'created_at' => Carbon::now(),
+                'created_by' => 1,
+                'assigned_to' => $asset->id ?? Asset::factory()->create()->id,
+                'assigned_type' => Asset::class,
+            ]);
+        });
+    }
+
+    public function checkedOutToLocation(Location $location = null)
+    {
+        return $this->afterCreating(function (Accessory $accessory) use ($location) {
+            $accessory->checkouts()->create([
+                'accessory_id' => $accessory->id,
+                'created_at' => Carbon::now(),
+                'created_by' => 1,
+                'assigned_to' => $location->id ?? Location::factory()->create()->id,
+                'assigned_type' => Location::class,
             ]);
         });
     }
diff --git a/database/factories/ActionlogFactory.php b/database/factories/ActionlogFactory.php
index 1a4007888c..ad07f7082b 100644
--- a/database/factories/ActionlogFactory.php
+++ b/database/factories/ActionlogFactory.php
@@ -29,7 +29,7 @@ class ActionlogFactory extends Factory
         return [
             'item_id' => Asset::factory(),
             'item_type' => Asset::class,
-            'user_id' => User::factory()->superuser(),
+            'created_by' => User::factory()->superuser(),
             'action_type' => 'uploaded',
         ];
     }
@@ -92,7 +92,7 @@ class ActionlogFactory extends Factory
 
             $licenseSeat->update([
                 'assigned_to' => $target->id,
-                'user_id' => 1, // not ideal but works
+                'created_by' => 1, // not ideal but works
             ]);
 
             return [
@@ -105,4 +105,64 @@ class ActionlogFactory extends Factory
             ];
         });
     }
+
+    public function filesUploaded()
+    {
+        return $this->state(function () {
+
+            return [
+                'created_at'  => $this->faker->dateTimeBetween('-1 years', 'now', date_default_timezone_get()),
+                'action_type' => 'uploaded',
+                'item_type'  => User::class,
+                'filename'  => $this->faker->unixTime('now'),
+            ];
+        });
+    }
+
+    public function acceptedSignature()
+    {
+        return $this->state(function () {
+
+            $asset = Asset::factory()->create();
+
+            return [
+                'created_at'  => $this->faker->dateTimeBetween('-1 years', 'now', date_default_timezone_get()),
+                'action_type' => 'accepted',
+                'item_id' => $asset->id,
+                'item_type'  => Asset::class,
+                'target_type'  => User::class,
+                'accept_signature'  => $this->faker->unixTime('now'),
+            ];
+        });
+    }
+
+    public function acceptedEula()
+    {
+        return $this->state(function () {
+
+            $asset = Asset::factory()->create();
+
+            return [
+                'created_at'  => $this->faker->dateTimeBetween('-1 years', 'now', date_default_timezone_get()),
+                'action_type' => 'accepted',
+                'item_id' => $asset->id,
+                'item_type'  => Asset::class,
+                'target_type'  => User::class,
+                'filename'  => $this->faker->unixTime('now'),
+            ];
+        });
+    }
+
+    public function userUpdated()
+    {
+        return $this->state(function () {
+
+            return [
+                'created_at'  => $this->faker->dateTimeBetween('-1 years', 'now', date_default_timezone_get()),
+                'action_type' => 'update',
+                'target_type'  => User::class,
+                'item_type'  => User::class,
+            ];
+        });
+    }
 }
diff --git a/database/factories/AssetFactory.php b/database/factories/AssetFactory.php
index 43845c3075..ca85c23584 100644
--- a/database/factories/AssetFactory.php
+++ b/database/factories/AssetFactory.php
@@ -4,6 +4,7 @@ namespace Database\Factories;
 
 use App\Models\Asset;
 use App\Models\AssetModel;
+use App\Models\Category;
 use App\Models\CustomField;
 use App\Models\Location;
 use App\Models\Statuslabel;
@@ -36,7 +37,7 @@ class AssetFactory extends Factory
             'status_id' => function () {
                 return Statuslabel::where('name', 'Ready to Deploy')->first() ?? Statuslabel::factory()->rtd()->create(['name' => 'Ready to Deploy']);
             },
-            'user_id' => User::factory()->superuser(),
+            'created_by' => User::factory()->superuser(),
             'asset_tag' => $this->faker->unixTime('now'),
             'notes'   => 'Created by DB seeder',
             'purchase_date' => $this->faker->dateTimeBetween('-1 years', 'now', date_default_timezone_get())->format('Y-m-d'),
@@ -48,6 +49,7 @@ class AssetFactory extends Factory
             'assigned_type' => null,
             'next_audit_date' => null,
             'last_checkout' => null,
+            'asset_eol_date' => null
         ];
     }
    
@@ -300,11 +302,11 @@ class AssetFactory extends Factory
         });
     }
 
-    public function assignedToLocation()
+    public function assignedToLocation(Location $location = null)
     {
-        return $this->state(function () {
+        return $this->state(function () use ($location) {
             return [
-                'assigned_to' => Location::factory(),
+                'assigned_to' => $location->id ?? Location::factory(),
                 'assigned_type' => Location::class,
             ];
         });
@@ -332,6 +334,15 @@ class AssetFactory extends Factory
         });
     }
 
+    public function doesNotRequireAcceptance()
+    {
+        return $this->state(function () {
+            return [
+                'model_id' => AssetModel::factory()->doesNotRequireAcceptance(),
+            ];
+        });
+    }
+
     public function deleted()
     {
         return $this->state(function () {
@@ -346,14 +357,35 @@ class AssetFactory extends Factory
 
     public function requestable()
     {
-        return $this->state(['requestable' => true]);
+        $id = Statuslabel::factory()->create([
+            'archived'   => false,
+            'deployable' => true,
+            'pending'    => true,
+        ])->id;
+        return $this->state(['status_id' => $id, 'requestable' => true]);
     }
 
     public function nonrequestable()
     {
-        return $this->state(['requestable' => false]);
+        $id = Statuslabel::factory()->create([
+            'archived'   => true,
+            'deployable' => false,
+            'pending'    => false,
+        ])->id;
+        return $this->state(['status_id' => $id, 'requestable' => false]);
     }
 
+    public function noPurchaseOrEolDate()
+    {
+        return $this->afterCreating(function (Asset $asset) {
+            $asset->update([
+                'purchase_date' => null,
+                'asset_eol_date' => null
+            ]);
+        });
+    }
+
+  
     public function hasEncryptedCustomField(CustomField $field = null)
     {
         return $this->state(function () use ($field) {
@@ -372,7 +404,6 @@ class AssetFactory extends Factory
         });
     }
 
-
     /**
      * This allows bypassing model level validation if you want to purposefully
      * create an asset in an invalid state. Validation is turned back on
diff --git a/database/factories/AssetModelFactory.php b/database/factories/AssetModelFactory.php
index 6790897567..3adb933e3e 100644
--- a/database/factories/AssetModelFactory.php
+++ b/database/factories/AssetModelFactory.php
@@ -28,7 +28,7 @@ class AssetModelFactory extends Factory
     public function definition()
     {
         return [
-            'user_id' => User::factory()->superuser(),
+            'created_by' => User::factory()->superuser(),
             'name' => $this->faker->catchPhrase(),
             'category_id' => Category::factory(),
             'model_number' => $this->faker->creditCardNumber(),
@@ -448,4 +448,13 @@ class AssetModelFactory extends Factory
             ];
         });
     }
+
+    public function doesNotRequireAcceptance()
+    {
+        return $this->state(function () {
+            return [
+                'category_id' => Category::factory()->doesNotRequireAcceptance(),
+            ];
+        });
+    }
 }
diff --git a/database/factories/CategoryFactory.php b/database/factories/CategoryFactory.php
index fe6bc255b7..733c52668e 100644
--- a/database/factories/CategoryFactory.php
+++ b/database/factories/CategoryFactory.php
@@ -25,11 +25,12 @@ class CategoryFactory extends Factory
         return [
             'name' => $this->faker->catchPhrase(),
             'category_type' => 'asset',
-            'checkin_email' => $this->faker->boolean(),
+            'checkin_email' => true,
             'eula_text' => $this->faker->paragraph(),
             'require_acceptance' => false,
-            'use_default_eula' => $this->faker->boolean(),
-            'user_id' => User::factory()->superuser(),
+            'use_default_eula' => false,
+            'created_by' => User::factory()->superuser(),
+            'notes'   => 'Created by DB seeder',
         ];
     }
 
@@ -178,4 +179,39 @@ class CategoryFactory extends Factory
             'category_type' => 'accessory',
         ]);
     }
+
+    public function forAssets()
+    {
+        return $this->state([
+            'category_type' => 'asset',
+        ]);
+    }
+
+    public function forLicenses()
+    {
+        return $this->state([
+            'category_type' => 'license',
+        ]);
+    }
+
+    public function forComponents()
+    {
+        return $this->state([
+            'category_type' => 'component',
+        ]);
+    }
+
+    public function forConsumables()
+    {
+        return $this->state([
+            'category_type' => 'consumable',
+        ]);
+    }
+
+    public function doesNotRequireAcceptance()
+    {
+        return $this->state([
+            'require_acceptance' => false,
+        ]);
+    }
 }
diff --git a/database/factories/CheckoutAcceptanceFactory.php b/database/factories/CheckoutAcceptanceFactory.php
index b5744527f8..a15e942a84 100644
--- a/database/factories/CheckoutAcceptanceFactory.php
+++ b/database/factories/CheckoutAcceptanceFactory.php
@@ -4,6 +4,7 @@ namespace Database\Factories;
 
 use App\Models\Accessory;
 use App\Models\Asset;
+use App\Models\CheckoutAcceptance;
 use App\Models\User;
 use Illuminate\Database\Eloquent\Factories\Factory;
 
@@ -23,6 +24,22 @@ class CheckoutAcceptanceFactory extends Factory
         ];
     }
 
+    public function configure(): static
+    {
+        return $this->afterCreating(function (CheckoutAcceptance $acceptance) {
+            if ($acceptance->checkoutable instanceof Asset) {
+                $this->createdAssociatedActionLogEntry($acceptance);
+            }
+
+            if ($acceptance->checkoutable instanceof Asset && $acceptance->assignedTo instanceof User) {
+                $acceptance->checkoutable->update([
+                    'assigned_to' => $acceptance->assigned_to_id,
+                    'assigned_type' => get_class($acceptance->assignedTo),
+                ]);
+            }
+        });
+    }
+
     public function forAccessory()
     {
         return $this->state([
@@ -38,4 +55,23 @@ class CheckoutAcceptanceFactory extends Factory
             'declined_at' => null,
         ]);
     }
+
+    public function accepted()
+    {
+        return $this->state([
+            'accepted_at' => now()->subDay(),
+            'declined_at' => null,
+        ]);
+    }
+
+    private function createdAssociatedActionLogEntry(CheckoutAcceptance $acceptance): void
+    {
+        $acceptance->checkoutable->assetlog()->create([
+            'action_type' => 'checkout',
+            'target_id' => $acceptance->assigned_to_id,
+            'target_type' => get_class($acceptance->assignedTo),
+            'item_id' => $acceptance->checkoutable_id,
+            'item_type' => $acceptance->checkoutable_type,
+        ]);
+    }
 }
diff --git a/database/factories/CompanyFactory.php b/database/factories/CompanyFactory.php
index 607822fef1..12195d78a5 100644
--- a/database/factories/CompanyFactory.php
+++ b/database/factories/CompanyFactory.php
@@ -23,6 +23,8 @@ class CompanyFactory extends Factory
     {
         return [
             'name' => $this->faker->unique()->company(),
+            'created_by' => 1,
+            'notes'   => 'Created by DB seeder',
         ];
     }
 }
diff --git a/database/factories/ComponentFactory.php b/database/factories/ComponentFactory.php
index caac70078f..786e780895 100644
--- a/database/factories/ComponentFactory.php
+++ b/database/factories/ComponentFactory.php
@@ -2,10 +2,16 @@
 
 namespace Database\Factories;
 
+use App\Models\Accessory;
+use App\Models\Asset;
 use App\Models\Category;
 use App\Models\Company;
 use App\Models\Component;
+use App\Models\Manufacturer;
+use App\Models\Consumable;
 use App\Models\Location;
+use App\Models\User;
+use Carbon\Carbon;
 use Illuminate\Database\Eloquent\Factories\Factory;
 use App\Models\Supplier;
 
@@ -25,6 +31,7 @@ class ComponentFactory extends Factory
      */
     public function definition()
     {
+
         return [
             'name' => $this->faker->text(20),
             'category_id' => Category::factory(),
@@ -37,12 +44,14 @@ class ComponentFactory extends Factory
             'min_amt' => $this->faker->numberBetween($min = 1, $max = 2),
             'company_id' => Company::factory(),
             'supplier_id' => Supplier::factory(),
+            'model_number' => $this->faker->numberBetween(1000000, 50000000),
         ];
     }
 
     public function ramCrucial4()
     {
-        return $this->state(function () {
+        $manufacturer = Manufacturer::where('name', 'Crucial')->first() ?? Manufacturer::factory()->create(['name' => 'Crucial']);
+        return $this->state(function () use ($manufacturer) {
             return [
                 'name' => 'Crucial 4GB DDR3L-1600 SODIMM',
                 'category_id' => function () {
@@ -50,6 +59,7 @@ class ComponentFactory extends Factory
                 },
                 'qty' => 10,
                 'min_amt' => 2,
+                'manufacturer_id' => $manufacturer->id,
                 'location_id' => Location::factory(),
             ];
         });
@@ -57,7 +67,8 @@ class ComponentFactory extends Factory
 
     public function ramCrucial8()
     {
-        return $this->state(function () {
+        $manufacturer = Manufacturer::where('name', 'Crucial')->first() ?? Manufacturer::factory()->create(['name' => 'Crucial']);
+        return $this->state(function () use ($manufacturer) {
             return [
                 'name' => 'Crucial 8GB DDR3L-1600 SODIMM Memory for Mac',
                 'category_id' => function () {
@@ -65,13 +76,15 @@ class ComponentFactory extends Factory
                 },
                 'qty' => 10,
                 'min_amt' => 2,
+                'manufacturer_id' => $manufacturer->id,
             ];
         });
     }
 
     public function ssdCrucial120()
     {
-        return $this->state(function () {
+        $manufacturer = Manufacturer::where('name', 'Crucial')->first() ?? Manufacturer::factory()->create(['name' => 'Crucial']);
+        return $this->state(function () use ($manufacturer) {
             return [
                 'name' => 'Crucial BX300 120GB SATA Internal SSD',
                 'category_id' => function () {
@@ -79,13 +92,15 @@ class ComponentFactory extends Factory
                 },
                 'qty' => 10,
                 'min_amt' => 2,
+                'manufacturer_id' => $manufacturer->id,
             ];
         });
     }
 
     public function ssdCrucial240()
     {
-        return $this->state(function () {
+        $manufacturer = Manufacturer::where('name', 'Crucial')->first() ?? Manufacturer::factory()->create(['name' => 'Crucial']);
+        return $this->state(function () use ($manufacturer) {
             return [
                 'name' => 'Crucial BX300 240GB SATA Internal SSD',
                 'category_id' => function () {
@@ -93,9 +108,21 @@ class ComponentFactory extends Factory
                 },
                 'qty' => 10,
                 'min_amt' => 2,
+                'manufacturer_id' => $manufacturer->id,
             ];
         });
     }
 
+    public function checkedOutToAsset(Asset $asset = null)
+    {
+        return $this->afterCreating(function (Component $component) use ($asset) {
+            $component->assets()->attach($component->id, [
+                'component_id' => $component->id,
+                'created_at' => Carbon::now(),
+                'created_by' => 1,
+                'asset_id' => $asset->id ?? Asset::factory()->create()->id,
+            ]);
+        });
+    }
 
 }
diff --git a/database/factories/ConsumableFactory.php b/database/factories/ConsumableFactory.php
index d9aec36afa..4a4b3ef872 100644
--- a/database/factories/ConsumableFactory.php
+++ b/database/factories/ConsumableFactory.php
@@ -7,6 +7,7 @@ use App\Models\Company;
 use App\Models\Consumable;
 use App\Models\Manufacturer;
 use App\Models\User;
+use Carbon\Carbon;
 use Illuminate\Database\Eloquent\Factories\Factory;
 use App\Models\Supplier;
 
@@ -29,7 +30,7 @@ class ConsumableFactory extends Factory
         return [
             'name' => $this->faker->words(3, true),
             'category_id' => Category::factory(),
-            'user_id' => User::factory()->superuser(),
+            'created_by' => User::factory()->superuser(),
             'item_no' => $this->faker->numberBetween(1000000, 50000000),
             'order_number' => $this->faker->numberBetween(1000000, 50000000),
             'purchase_date' => $this->faker->dateTimeBetween('-1 years', 'now', date_default_timezone_get())->format('Y-m-d'),
@@ -103,7 +104,7 @@ class ConsumableFactory extends Factory
 
             $consumable->users()->attach($consumable->id, [
                 'consumable_id' => $consumable->id,
-                'user_id' => $user->id,
+                'created_by' => $user->id,
                 'assigned_to' => $user->id,
                 'note' => '',
             ]);
@@ -116,4 +117,16 @@ class ConsumableFactory extends Factory
             $consumable->category->update(['require_acceptance' => 1]);
         });
     }
+
+    public function checkedOutToUser(User $user = null)
+    {
+        return $this->afterCreating(function (Consumable $consumable) use ($user) {
+            $consumable->users()->attach($consumable->id, [
+                'consumable_id' => $consumable->id,
+                'created_at' => Carbon::now(),
+                'created_by' => User::factory()->create()->id,
+                'assigned_to' => $user->id ?? User::factory()->create()->id,
+            ]);
+        });
+    }
 }
diff --git a/database/factories/DepartmentFactory.php b/database/factories/DepartmentFactory.php
index afcc9cbd33..7e6c2f0025 100644
--- a/database/factories/DepartmentFactory.php
+++ b/database/factories/DepartmentFactory.php
@@ -25,8 +25,9 @@ class DepartmentFactory extends Factory
     {
         return [
             'name' => $this->faker->unique()->word() . ' Department',
-            'user_id' => User::factory()->superuser(),
+            'created_by' => User::factory()->superuser(),
             'location_id' => Location::factory(),
+            'notes'   => 'Created by DB seeder',
         ];
     }
 
diff --git a/database/factories/DepreciationFactory.php b/database/factories/DepreciationFactory.php
index 6359e2326b..52258e784b 100644
--- a/database/factories/DepreciationFactory.php
+++ b/database/factories/DepreciationFactory.php
@@ -24,7 +24,7 @@ class DepreciationFactory extends Factory
     {
         return [
             'name' => $this->faker->unique()->catchPhrase(),
-            'user_id' => User::factory()->superuser(),
+            'created_by' => User::factory()->superuser(),
             'months' => 36,
         ];
     }
diff --git a/database/factories/GroupFactory.php b/database/factories/GroupFactory.php
index 9dee88a965..fecf8239bb 100644
--- a/database/factories/GroupFactory.php
+++ b/database/factories/GroupFactory.php
@@ -23,6 +23,8 @@ class GroupFactory extends Factory
     {
         return [
             'name' => $this->faker->name(),
+            'permissions' => json_encode([]),
+            'notes'   => 'Created by DB seeder',
         ];
     }
 }
diff --git a/database/factories/ImportFactory.php b/database/factories/ImportFactory.php
new file mode 100644
index 0000000000..5355cac834
--- /dev/null
+++ b/database/factories/ImportFactory.php
@@ -0,0 +1,236 @@
+<?php
+
+namespace Database\Factories;
+
+use App\Models\Import;
+use Illuminate\Support\Str;
+use Illuminate\Database\Eloquent\Factories\Factory;
+use Tests\Support\Importing;
+
+/**
+ * @extends Factory<Import>
+ */
+class ImportFactory extends Factory
+{
+    /**
+     * @inheritdoc
+     */
+    protected $model = Import::class;
+
+    /**
+     * @inheritdoc
+     */
+    public function definition()
+    {
+        return [
+            'name'     => $this->faker->company,
+            'file_path' => Str::random().'.csv',
+            'filesize'  => $this->faker->randomDigitNotNull(),
+            'field_map' => null,
+        ];
+    }
+
+    /**
+     * Create an accessory import type.
+     *
+     * @return static
+     */
+    public function accessory()
+    {
+        return $this->state(function (array $attributes) {
+            $fileBuilder = Importing\AccessoriesImportFileBuilder::new();
+
+            $attributes['name'] = "{$attributes['name']} Accessories";
+            $attributes['import_type'] = 'accessory';
+            $attributes['header_row'] = $fileBuilder->toCsv()[0];
+            $attributes['first_row'] = $fileBuilder->firstRow();
+
+            return $attributes;
+        });
+    }
+
+    /**
+     * Create an asset import type.
+     *
+     * @return static
+     */
+    public function asset()
+    {
+        return $this->state(function (array $attributes) {
+            $fileBuilder = Importing\AssetsImportFileBuilder::new();
+
+            $attributes['name'] = "{$attributes['name']} Assets";
+            $attributes['import_type'] = 'asset';
+            $attributes['header_row'] = $fileBuilder->toCsv()[0];
+            $attributes['first_row'] = $fileBuilder->firstRow();
+
+            return $attributes;
+        });
+    }
+
+    /**
+     * Create a component import type.
+     *
+     * @return static
+     */
+    public function component()
+    {
+        return $this->state(function (array $attributes) {
+            $fileBuilder = Importing\ComponentsImportFileBuilder::new();
+
+            $attributes['name'] = "{$attributes['name']} Components";
+            $attributes['import_type'] = 'component';
+            $attributes['header_row'] = $fileBuilder->toCsv()[0];
+            $attributes['first_row'] = $fileBuilder->firstRow();
+
+            return $attributes;
+        });
+    }
+
+    /**
+     * Create a consumable import type.
+     *
+     * @return static
+     */
+    public function consumable()
+    {
+        return $this->state(function (array $attributes) {
+            $fileBuilder = Importing\ConsumablesImportFileBuilder::new();
+
+            $attributes['name'] = "{$attributes['name']} Consumables";
+            $attributes['import_type'] = 'consumable';
+            $attributes['header_row'] = $fileBuilder->toCsv()[0];
+            $attributes['first_row'] = $fileBuilder->firstRow();
+
+            return $attributes;
+        });
+    }
+
+     /**
+     * Create a license import type.
+     *
+     * @return static
+     */
+    public function license()
+    {
+        return $this->state(function (array $attributes) {
+            $fileBuilder = Importing\LicensesImportFileBuilder::new();
+
+            $attributes['name'] = "{$attributes['name']} Licenses";
+            $attributes['import_type'] = 'license';
+            $attributes['header_row'] = $fileBuilder->toCsv()[0];
+            $attributes['first_row'] = $fileBuilder->firstRow();
+
+            return $attributes;
+        });
+    }
+
+    /**
+     * Create a users import type.
+     *
+     * @return static
+     */
+    public function users()
+    {
+        return $this->state(function (array $attributes) {
+            $fileBuilder = Importing\UsersImportFileBuilder::new();
+
+            $attributes['name'] = "{$attributes['name']} Employees";
+            $attributes['import_type'] = 'user';
+            $attributes['header_row'] = $fileBuilder->toCsv()[0];
+            $attributes['first_row'] = $fileBuilder->firstRow();
+
+            return $attributes;
+        });
+    }
+
+
+
+    /**
+     * Create an asset model import type.
+     *
+     * @return static
+     */
+    public function assetmodel()
+    {
+        return $this->state(function (array $attributes) {
+            $fileBuilder = Importing\AssetModelsImportFileBuilder::new();
+
+            $attributes['name'] = "{$attributes['name']} Asset Model";
+            $attributes['import_type'] = 'assetModel';
+            $attributes['header_row'] = $fileBuilder->toCsv()[0];
+            $attributes['first_row'] = $fileBuilder->firstRow();
+
+            return $attributes;
+        });
+    }
+
+    /**
+     * Create a supplier import type.
+     *
+     * @return static
+     */
+    public function suppliers()
+    {
+        return $this->state(function (array $attributes) {
+            $fileBuilder = Importing\SuppliersImportFileBuilder::new();
+            $attributes['name'] = "Supplier {$attributes['name']}";
+            $attributes['import_type'] = 'supplier';
+            $attributes['header_row'] = $fileBuilder->toCsv()[0];
+            $attributes['first_row'] = $fileBuilder->firstRow();
+
+            return $attributes;
+        });
+    }
+
+    /**
+     * Create an supplier import type.
+     *
+     * @return static
+     */
+    public function locations()
+    {
+        return $this->state(function (array $attributes) {
+            $fileBuilder = Importing\SuppliersImportFileBuilder::new();
+            $attributes['name'] = "Location {$attributes['name']}";
+            $attributes['import_type'] = 'location';
+            $attributes['header_row'] = $fileBuilder->toCsv()[0];
+            $attributes['first_row'] = $fileBuilder->firstRow();
+
+            return $attributes;
+        });
+    }
+
+    /**
+     * Create a supplier import type.
+     *
+     * @return static
+     */
+    public function manufacturers()
+    {
+        return $this->state(function (array $attributes) {
+            $fileBuilder = Importing\ManufacturersImportFileBuilder::new();
+            $attributes['name'] = "Manufacturer {$attributes['name']}";
+            $attributes['import_type'] = 'manufacturer';
+            $attributes['header_row'] = $fileBuilder->toCsv()[0];
+            $attributes['first_row'] = $fileBuilder->firstRow();
+
+            return $attributes;
+        });
+    }
+
+    public function categories()
+    {
+        return $this->state(function (array $attributes) {
+            $fileBuilder = Importing\CategoriesImportFileBuilder::new();
+            $attributes['name'] = "Category {$attributes['name']}";
+            $attributes['import_type'] = 'category';
+            $attributes['header_row'] = $fileBuilder->toCsv()[0];
+            $attributes['first_row'] = $fileBuilder->firstRow();
+
+            return $attributes;
+        });
+    }
+
+
+}
diff --git a/database/factories/LicenseFactory.php b/database/factories/LicenseFactory.php
index 6360735c5f..1f5b105f42 100644
--- a/database/factories/LicenseFactory.php
+++ b/database/factories/LicenseFactory.php
@@ -25,7 +25,7 @@ class LicenseFactory extends Factory
     public function definition()
     {
         return [
-            'user_id' => User::factory()->superuser(),
+            'created_by' => User::factory()->superuser(),
             'name' => $this->faker->name(),
             'license_email' => $this->faker->safeEmail(),
             'serial' => $this->faker->uuid(),
diff --git a/database/factories/LicenseSeatFactory.php b/database/factories/LicenseSeatFactory.php
index f9560af472..aaf75bdc2d 100644
--- a/database/factories/LicenseSeatFactory.php
+++ b/database/factories/LicenseSeatFactory.php
@@ -4,6 +4,7 @@ namespace Database\Factories;
 
 use App\Models\Asset;
 use App\Models\License;
+use App\Models\LicenseSeat;
 use App\Models\User;
 use Illuminate\Database\Eloquent\Factories\Factory;
 
@@ -33,4 +34,18 @@ class LicenseSeatFactory extends Factory
             ];
         });
     }
+
+    public function reassignable()
+    {
+        return $this->afterMaking(function (LicenseSeat $seat) {
+            $seat->license->update(['reassignable' => true]);
+        });
+    }
+
+    public function notReassignable()
+    {
+        return $this->afterMaking(function (LicenseSeat $seat) {
+            $seat->license->update(['reassignable' => false]);
+        });
+    }
 }
diff --git a/database/factories/LocationFactory.php b/database/factories/LocationFactory.php
index 6db268e8c1..3d0b444f70 100644
--- a/database/factories/LocationFactory.php
+++ b/database/factories/LocationFactory.php
@@ -23,6 +23,22 @@ class LocationFactory extends Factory
             'currency' => $this->faker->currencyCode(),
             'zip' => $this->faker->postcode(),
             'image' => rand(1, 9).'.jpg',
+            'notes'   => 'Created by DB seeder',
         ];
     }
+  
+    // one of these can eventuall go away - left temporarily for conflict resolution
+    public function deleted(): self
+    {
+        return $this->state(['deleted_at' => $this->faker->dateTime()]);
+    }
+  
+    public function deletedLocation()
+    {
+        return $this->state(function () {
+            return [
+                'deleted_at' => $this->faker->dateTime(),
+            ];
+        });
+    }
 }
diff --git a/database/factories/ManufacturerFactory.php b/database/factories/ManufacturerFactory.php
index 7d6892426d..0a8a0a543e 100644
--- a/database/factories/ManufacturerFactory.php
+++ b/database/factories/ManufacturerFactory.php
@@ -24,10 +24,11 @@ class ManufacturerFactory extends Factory
     {
         return [
             'name' => $this->faker->unique()->company(),
-            'user_id' => User::factory()->superuser(),
+            'created_by' => User::factory()->superuser(),
             'support_phone' => $this->faker->phoneNumber(),
             'url' => $this->faker->url(),
             'support_email' => $this->faker->safeEmail(),
+            'notes'   => 'Created by DB seeder',
         ];
     }
 
@@ -165,4 +166,49 @@ class ManufacturerFactory extends Factory
             ];
         });
     }
+
+    public function samsung()
+    {
+        return $this->state(function () {
+            return [
+                'name' => 'Samsung',
+                'url' => 'https://www.samsung.com',
+                'support_url' => 'https://www.samsung.com/support/',
+                'image' => 'samsung.png',
+            ];
+        });
+    }
+
+    public function google()
+    {
+        return $this->state(function () {
+            return [
+                'name' => 'Google',
+                'url' => 'https://www.google.com',
+                'image' => 'google.webp',
+            ];
+        });
+    }
+
+    public function huawei()
+    {
+        return $this->state(function () {
+            return [
+                'name' => 'Huawei',
+                'url' => 'https://consumer.huawei.com/',
+                'image' => 'huawei.webp',
+            ];
+        });
+    }
+
+    public function sony()
+    {
+        return $this->state(function () {
+            return [
+                'name' => 'Sony',
+                'url' => 'https://electronics.sony.com',
+                'image' => 'sony.png',
+            ];
+        });
+    }
 }
diff --git a/database/factories/PredefinedKitFactory.php b/database/factories/PredefinedKitFactory.php
new file mode 100644
index 0000000000..32e192655f
--- /dev/null
+++ b/database/factories/PredefinedKitFactory.php
@@ -0,0 +1,23 @@
+<?php
+
+namespace Database\Factories;
+
+use Illuminate\Database\Eloquent\Factories\Factory;
+
+/**
+ * @extends \Illuminate\Database\Eloquent\Factories\Factory<\App\Models\PredefinedKit>
+ */
+class PredefinedKitFactory extends Factory
+{
+    /**
+     * Define the model's default state.
+     *
+     * @return array<string, mixed>
+     */
+    public function definition(): array
+    {
+        return [
+            'name' => $this->faker->words(3, true),
+        ];
+    }
+}
diff --git a/database/factories/ReportTemplateFactory.php b/database/factories/ReportTemplateFactory.php
new file mode 100644
index 0000000000..7044af6342
--- /dev/null
+++ b/database/factories/ReportTemplateFactory.php
@@ -0,0 +1,25 @@
+<?php
+
+namespace Database\Factories;
+
+use App\Models\User;
+use Illuminate\Database\Eloquent\Factories\Factory;
+
+class ReportTemplateFactory extends Factory
+{
+    /**
+     * Define the model's default state.
+     *
+     * @return array
+     */
+    public function definition()
+    {
+        return [
+            'name' => $this->faker->word(),
+            'options' => [
+                'id' => '1',
+            ],
+            'created_by' => User::factory(),
+        ];
+    }
+}
diff --git a/database/factories/StatuslabelFactory.php b/database/factories/StatuslabelFactory.php
index fa2e5d5e1a..1f04f4564e 100644
--- a/database/factories/StatuslabelFactory.php
+++ b/database/factories/StatuslabelFactory.php
@@ -26,7 +26,7 @@ class StatuslabelFactory extends Factory
             'name'      => $this->faker->sentence(),
             'created_at' => $this->faker->dateTime(),
             'updated_at' => $this->faker->dateTime(),
-            'user_id' => User::factory()->superuser(),
+            'created_by' => User::factory()->superuser(),
             'deleted_at' => null,
             'deployable' => 0,
             'pending' => 0,
diff --git a/database/factories/UserFactory.php b/database/factories/UserFactory.php
index 5c885666df..d8b1ac141c 100644
--- a/database/factories/UserFactory.php
+++ b/database/factories/UserFactory.php
@@ -7,6 +7,9 @@ use App\Models\User;
 use Illuminate\Database\Eloquent\Factories\Factory;
 use \Auth;
 
+/**
+ * @extends Factory<User>
+ */
 class UserFactory extends Factory
 {
     /**
@@ -35,6 +38,7 @@ class UserFactory extends Factory
             'state' => $this->faker->stateAbbr(),
             'username' => $this->faker->unique()->username(),
             'zip' => $this->faker->postcode(),
+            'created_by' => 1,
         ];
     }
 
@@ -141,6 +145,16 @@ class UserFactory extends Factory
         return $this->appendPermission(['assets.view.requestable' => '1']);
     }
 
+    public function deleteAssetModels()
+    {
+        return $this->appendPermission(['models.delete' => '1']);
+    }
+
+    public function viewAssetModels()
+    {
+        return $this->appendPermission(['models.view' => '1']);
+    }
+
     public function viewAccessories()
     {
         return $this->appendPermission(['accessories.view' => '1']);
@@ -201,6 +215,11 @@ class UserFactory extends Factory
         return $this->appendPermission(['consumables.checkout' => '1']);
     }
 
+    public function deleteDepartments()
+    {
+        return $this->appendPermission(['departments.delete' => '1']);
+    }
+
     public function viewDepartments()
     {
         return $this->appendPermission(['departments.view' => '1']);
@@ -266,6 +285,21 @@ class UserFactory extends Factory
         return $this->appendPermission(['components.checkout' => '1']);
     }
 
+    public function createCompanies()
+    {
+        return $this->appendPermission(['companies.create' => '1']);
+    }
+
+    public function deleteCompanies()
+    {
+        return $this->appendPermission(['companies.delete' => '1']);
+    }
+
+    public function editCompanies()
+    {
+        return $this->appendPermission(['companies.edit' => '1']);
+    }
+
     public function viewUsers()
     {
         return $this->appendPermission(['users.view' => '1']);
@@ -286,6 +320,16 @@ class UserFactory extends Factory
         return $this->appendPermission(['users.delete' => '1']);
     }
 
+    public function deleteCategories()
+    {
+        return $this->appendPermission(['categories.delete' => '1']);
+    }
+
+    public function deleteLocations()
+    {
+        return $this->appendPermission(['locations.delete' => '1']);
+    }
+
     public function canEditOwnLocation()
     {
         return $this->appendPermission(['self.edit_location' => '1']);
@@ -296,6 +340,57 @@ class UserFactory extends Factory
         return $this->appendPermission(['reports.view' => '1']);
     }
 
+    public function canImport()
+    {
+        return $this->appendPermission(['import' => '1']);
+    }
+
+    public function deleteCustomFields()
+    {
+        return $this->appendPermission(['customfields.delete' => '1']);
+    }
+
+    public function deleteCustomFieldsets()
+    {
+        return $this->appendPermission(['customfields.delete' => '1']);
+    }
+
+    public function deleteDepreciations()
+    {
+        return $this->appendPermission(['depreciations.delete' => '1']);
+    }
+
+    public function deleteManufacturers()
+    {
+        return $this->appendPermission(['manufacturers.delete' => '1']);
+    }
+
+    public function deletePredefinedKits()
+    {
+        return $this->appendPermission(['kits.delete' => '1']);
+    }
+
+    public function viewPredefinedKits()
+    {
+        return $this->appendPermission(['kits.view' => '1']);
+    }
+
+    public function deleteStatusLabels()
+    {
+        return $this->appendPermission(['statuslabels.delete' => '1']);
+    }
+
+    public function deleteSuppliers()
+    {
+        return $this->appendPermission(['suppliers.delete' => '1']);
+    }
+
+    public function auditAssets()
+    {
+        return $this->appendPermission(['assets.audit' => '1']);
+    }
+
+
     private function appendPermission(array $permission)
     {
         return $this->state(function ($currentState) use ($permission) {
@@ -309,4 +404,9 @@ class UserFactory extends Factory
             ];
         });
     }
+
+    public function deleted(): self
+    {
+        return $this->state(['deleted_at' => $this->faker->dateTime()]);
+    }
 }
diff --git a/database/migrations/2015_02_07_013537_add_soft_deleted_to_log.php b/database/migrations/2015_02_07_013537_add_soft_deleted_to_log.php
index 7040550e60..160e680761 100644
--- a/database/migrations/2015_02_07_013537_add_soft_deleted_to_log.php
+++ b/database/migrations/2015_02_07_013537_add_soft_deleted_to_log.php
@@ -12,8 +12,8 @@ class AddSoftDeletedToLog extends Migration
      */
     public function up()
     {
-        $platform = Schema::getConnection()->getDoctrineSchemaManager()->getDatabasePlatform();
-        $platform->registerDoctrineTypeMapping('enum', 'string');
+        //$platform = Schema::getConnection()->getDoctrineSchemaManager()->getDatabasePlatform();
+        //$platform->registerDoctrineTypeMapping('enum', 'string');
 
         Schema::table('asset_logs', function ($table) {
             $table->string('asset_type', 100)->nullable()->change();
diff --git a/database/migrations/2015_02_12_024100_change_license_notes_type.php b/database/migrations/2015_02_12_024100_change_license_notes_type.php
index ba2f4b3188..7389dc8087 100644
--- a/database/migrations/2015_02_12_024100_change_license_notes_type.php
+++ b/database/migrations/2015_02_12_024100_change_license_notes_type.php
@@ -14,7 +14,7 @@ class ChangeLicenseNotesType extends Migration
     {
         //
         Schema::table('licenses', function ($table) {
-            $table->text('notes')->change();
+            $table->text('notes')->nullable()->change();
         });
     }
 
diff --git a/database/migrations/2015_09_22_003413_migrate_mac_address.php b/database/migrations/2015_09_22_003413_migrate_mac_address.php
index 3c4bf93e15..4c65c29736 100644
--- a/database/migrations/2015_09_22_003413_migrate_mac_address.php
+++ b/database/migrations/2015_09_22_003413_migrate_mac_address.php
@@ -12,7 +12,7 @@ class MigrateMacAddress extends Migration
      */
     public function up()
     {
-        DB::getDoctrineSchemaManager()->getDatabasePlatform()->registerDoctrineTypeMapping('enum', 'string');
+        //DB::getDoctrineSchemaManager()->getDatabasePlatform()->registerDoctrineTypeMapping('enum', 'string');
 
         $f2 = new \App\Models\CustomFieldset(['name' => 'Asset with MAC Address']);
         $f2->timestamps = false; //when this model was first created, it had no timestamps. But later on it gets them.
diff --git a/database/migrations/2016_03_02_220517_update_ldap_filter_to_longer_field.php b/database/migrations/2016_03_02_220517_update_ldap_filter_to_longer_field.php
index a17830f114..bc2b17f1b8 100644
--- a/database/migrations/2016_03_02_220517_update_ldap_filter_to_longer_field.php
+++ b/database/migrations/2016_03_02_220517_update_ldap_filter_to_longer_field.php
@@ -13,7 +13,7 @@ class UpdateLdapFilterToLongerField extends Migration
     public function up()
     {
         Schema::table('settings', function (Blueprint $table) {
-            $table->text('ldap_filter')->default(null)->change();
+            $table->text('ldap_filter')->nullable()->default(null)->change();
         });
     }
 
diff --git a/database/migrations/2016_08_30_084634_make_purchase_cost_nullable.php b/database/migrations/2016_08_30_084634_make_purchase_cost_nullable.php
index 525242c647..742885b245 100644
--- a/database/migrations/2016_08_30_084634_make_purchase_cost_nullable.php
+++ b/database/migrations/2016_08_30_084634_make_purchase_cost_nullable.php
@@ -12,8 +12,8 @@ class MakePurchaseCostNullable extends Migration
      */
     public function up()
     {
-        $platform = Schema::getConnection()->getDoctrineSchemaManager()->getDatabasePlatform();
-        $platform->registerDoctrineTypeMapping('enum', 'string');
+        //$platform = Schema::getConnection()->getDoctrineSchemaManager()->getDatabasePlatform();
+        //$platform->registerDoctrineTypeMapping('enum', 'string');
 
         Schema::table('assets', function ($table) {
             $table->decimal('purchase_cost', 8, 2)->nullable()->default(null)->change();
diff --git a/database/migrations/2016_11_16_172119_increase_purchase_cost_size.php b/database/migrations/2016_11_16_172119_increase_purchase_cost_size.php
index 37036da601..d463a97eb6 100644
--- a/database/migrations/2016_11_16_172119_increase_purchase_cost_size.php
+++ b/database/migrations/2016_11_16_172119_increase_purchase_cost_size.php
@@ -12,8 +12,8 @@ class IncreasePurchaseCostSize extends Migration
      */
     public function up()
     {
-        $platform = Schema::getConnection()->getDoctrineSchemaManager()->getDatabasePlatform();
-        $platform->registerDoctrineTypeMapping('enum', 'string');
+        //$platform = Schema::getConnection()->getDoctrineSchemaManager()->getDatabasePlatform();
+        //$platform->registerDoctrineTypeMapping('enum', 'string');
 
         Schema::table('assets', function ($table) {
             $table->decimal('purchase_cost', 20, 2)->nullable()->default(null)->change();
@@ -47,8 +47,8 @@ class IncreasePurchaseCostSize extends Migration
      */
     public function down()
     {
-        $platform = Schema::getConnection()->getDoctrineSchemaManager()->getDatabasePlatform();
-        $platform->registerDoctrineTypeMapping('enum', 'string');
+        //$platform = Schema::getConnection()->getDoctrineSchemaManager()->getDatabasePlatform();
+        //$platform->registerDoctrineTypeMapping('enum', 'string');
 
         Schema::table('assets', function ($table) {
             $table->decimal('purchase_cost', 8, 2)->nullable()->default(null)->change();
diff --git a/database/migrations/2017_01_25_063357_fix_utf8_custom_field_column_names.php b/database/migrations/2017_01_25_063357_fix_utf8_custom_field_column_names.php
index 4725cccfe1..0df09864a5 100644
--- a/database/migrations/2017_01_25_063357_fix_utf8_custom_field_column_names.php
+++ b/database/migrations/2017_01_25_063357_fix_utf8_custom_field_column_names.php
@@ -43,8 +43,8 @@ class FixUtf8CustomFieldColumnNames extends Migration
      */
     public function up()
     {
-        $platform = Schema::getConnection()->getDoctrineSchemaManager()->getDatabasePlatform();
-        $platform->registerDoctrineTypeMapping('enum', 'string');
+        //$platform = Schema::getConnection()->getDoctrineSchemaManager()->getDatabasePlatform();
+        //$platform->registerDoctrineTypeMapping('enum', 'string');
 
         if (! Schema::hasColumn('custom_fields', 'db_column')) {
             Schema::table('custom_fields', function ($table) {
diff --git a/database/migrations/2017_08_03_160105_set_asset_archived_to_zero_default.php b/database/migrations/2017_08_03_160105_set_asset_archived_to_zero_default.php
index f60b9856de..1e794ef695 100644
--- a/database/migrations/2017_08_03_160105_set_asset_archived_to_zero_default.php
+++ b/database/migrations/2017_08_03_160105_set_asset_archived_to_zero_default.php
@@ -13,11 +13,11 @@ class SetAssetArchivedToZeroDefault extends Migration
      */
     public function up()
     {
-        $platform = Schema::getConnection()->getDoctrineSchemaManager()->getDatabasePlatform();
-        $platform->registerDoctrineTypeMapping('enum', 'string');
+        //$platform = Schema::getConnection()->getDoctrineSchemaManager()->getDatabasePlatform();
+        //$platform->registerDoctrineTypeMapping('enum', 'string');
 
         Schema::table('assets', function (Blueprint $table) {
-            $table->boolean('archived')->default(0)->change();
+            $table->boolean('archived')->default(0)->nullable()->change();
         });
     }
 
diff --git a/database/migrations/2019_02_20_234421_make_serial_nullable.php b/database/migrations/2019_02_20_234421_make_serial_nullable.php
index f1419009cc..295e66f27c 100644
--- a/database/migrations/2019_02_20_234421_make_serial_nullable.php
+++ b/database/migrations/2019_02_20_234421_make_serial_nullable.php
@@ -13,8 +13,8 @@ class MakeSerialNullable extends Migration
      */
     public function up()
     {
-        $platform = Schema::getConnection()->getDoctrineSchemaManager()->getDatabasePlatform();
-        $platform->registerDoctrineTypeMapping('enum', 'string');
+        //$platform = Schema::getConnection()->getDoctrineSchemaManager()->getDatabasePlatform();
+        //$platform->registerDoctrineTypeMapping('enum', 'string');
 
         Schema::table('assets', function (Blueprint $table) {
             $table->string('serial')->nullable()->default(null)->change();
diff --git a/database/migrations/2019_12_04_223111_passport_upgrade.php b/database/migrations/2019_12_04_223111_passport_upgrade.php
index 02cbe56dec..3abeca4703 100644
--- a/database/migrations/2019_12_04_223111_passport_upgrade.php
+++ b/database/migrations/2019_12_04_223111_passport_upgrade.php
@@ -29,7 +29,7 @@ class PassportUpgrade extends Migration
     {
         if (Schema::hasTable('oauth_clients')) {
             Schema::table('oauth_clients', function (Blueprint $table) {
-                $table->string('secret', 100)->change();
+                $table->string('secret', 100)->nullable(false)->change();
             });
         }
     }
diff --git a/database/migrations/2022_02_10_110210_add_company_id_to_locations.php b/database/migrations/2022_02_10_110210_add_company_id_to_locations.php
new file mode 100644
index 0000000000..8ef5822812
--- /dev/null
+++ b/database/migrations/2022_02_10_110210_add_company_id_to_locations.php
@@ -0,0 +1,35 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class AddCompanyIdToLocations extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table('locations', function (Blueprint $table) {
+            $table->integer('company_id')->unsigned()->nullable();
+            $table->index(['company_id']);
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::table('locations', function (Blueprint $table) {
+            $table->dropIndex(['company_id']);
+            $table->dropColumn('company_id');
+        });
+    }
+}
+
diff --git a/database/migrations/2023_02_27_092130_add_scope_locations_setting.php b/database/migrations/2023_02_27_092130_add_scope_locations_setting.php
new file mode 100644
index 0000000000..c1e2ff83e9
--- /dev/null
+++ b/database/migrations/2023_02_27_092130_add_scope_locations_setting.php
@@ -0,0 +1,32 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class AddScopeLocationsSetting extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table('settings', function (Blueprint $table) {
+            $table->boolean('scope_locations_fmcs')->default('0')->after('full_multiple_companies_support');
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::table('settings', function (Blueprint $table) {
+            $table->dropColumn('scope_locations_fmcs');
+        });
+    }
+}
\ No newline at end of file
diff --git a/database/migrations/2023_08_01_174150_change_webhook_settings_variable_type.php b/database/migrations/2023_08_01_174150_change_webhook_settings_variable_type.php
index 59c9728e2e..1b84ce7211 100644
--- a/database/migrations/2023_08_01_174150_change_webhook_settings_variable_type.php
+++ b/database/migrations/2023_08_01_174150_change_webhook_settings_variable_type.php
@@ -14,7 +14,7 @@ class ChangeWebhookSettingsVariableType extends Migration
     public function up()
     {
         Schema::table('settings', function (Blueprint $table) {
-            $table->text('webhook_endpoint')->change();
+            $table->text('webhook_endpoint')->nullable()->change();
         });
     }
 
@@ -26,7 +26,7 @@ class ChangeWebhookSettingsVariableType extends Migration
     public function down()
     {
         Schema::table('settings', function (Blueprint $table) {
-            $table->varchar('webhook_endpoint')->change();
+            $table->string('webhook_endpoint')->nullable()->change();
         });
 
     }
diff --git a/database/migrations/2023_08_23_232739_create_report_templates_table.php b/database/migrations/2023_08_23_232739_create_report_templates_table.php
new file mode 100644
index 0000000000..e2537594a5
--- /dev/null
+++ b/database/migrations/2023_08_23_232739_create_report_templates_table.php
@@ -0,0 +1,48 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class CreateReportTemplatesTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::create('report_templates', function (Blueprint $table) {
+            $table->id();
+            $table->integer('created_by')->nullable();
+            $table->string('name');
+
+            /*
+             * The "options" column was originally json but this causes issues
+             * with older versions of mariadb so it was changed text.
+             *
+             * A follow-up migration definitively changes it to a text column
+             * for the systems that had successfully run the migration:
+             * 2025_01_06_210534_change_report_templates_options_to_column_text_field.
+             *
+             * https://github.com/grokability/snipe-it/issues/16015
+             */
+            $table->text('options');
+
+            $table->softDeletes();
+            $table->timestamps();
+            $table->index('created_by');
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::dropIfExists('report_templates');
+    }
+}
diff --git a/database/migrations/2024_07_04_103729_add_default_avatar_to_settings.php b/database/migrations/2024_07_04_103729_add_default_avatar_to_settings.php
new file mode 100644
index 0000000000..423f45e9ee
--- /dev/null
+++ b/database/migrations/2024_07_04_103729_add_default_avatar_to_settings.php
@@ -0,0 +1,28 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    /**
+     * Run the migrations.
+     */
+    public function up(): void
+    {
+        Schema::table('settings', function (Blueprint $table) {
+            $table->string('default_avatar')->after('favicon')->default('default.png')->nullable();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+        Schema::table('settings', function (Blueprint $table) {
+            $table->dropColumn('default_avatar');
+        });
+    }
+};
diff --git a/database/migrations/2024_07_16_184145_add_deprecitation_type_to_depreciations_table.php b/database/migrations/2024_07_16_184145_add_deprecitation_type_to_depreciations_table.php
new file mode 100644
index 0000000000..1a5355f739
--- /dev/null
+++ b/database/migrations/2024_07_16_184145_add_deprecitation_type_to_depreciations_table.php
@@ -0,0 +1,28 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    /**
+     * Run the migrations.
+     */
+    public function up(): void
+    {
+        Schema::table('depreciations', function (Blueprint $table) {
+            $table->string('depreciation_type')->after('depreciation_min')->default('amount');
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+        Schema::table('depreciations', function (Blueprint $table) {
+            $table->dropColumn('depreciation_type');
+        });
+    }
+};
diff --git a/database/migrations/2024_07_23_172032_change_no__n_o_to_nb__n_o.php b/database/migrations/2024_07_23_172032_change_no__n_o_to_nb__n_o.php
new file mode 100644
index 0000000000..6ed7e2b3a1
--- /dev/null
+++ b/database/migrations/2024_07_23_172032_change_no__n_o_to_nb__n_o.php
@@ -0,0 +1,28 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+use App\Models\Setting;
+use App\Models\User;
+
+return new class extends Migration
+{
+    /**
+     * Run the migrations.
+     */
+    public function up(): void
+    {
+        Setting::where('locale', 'no-NO')->update(['locale' => 'nb-NO']);
+        User::where('locale', 'no-NO')->update(['locale' => 'nb-NO']);
+
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+
+    }
+};
diff --git a/database/migrations/2024_07_26_143301_add_checkout_for_all_types_to_accessories.php b/database/migrations/2024_07_26_143301_add_checkout_for_all_types_to_accessories.php
new file mode 100644
index 0000000000..bde3bc2c28
--- /dev/null
+++ b/database/migrations/2024_07_26_143301_add_checkout_for_all_types_to_accessories.php
@@ -0,0 +1,43 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+use App\Models\Setting;
+use App\Models\User;
+use Illuminate\Support\Facades\DB;
+
+return new class extends Migration
+{
+    /**
+     * Run the migrations.
+     */
+    public function up(): void
+    {
+        if (Schema::hasTable('accessories_users')) {
+            Schema::rename('accessories_users', 'accessories_checkout');
+
+            Schema::table('accessories_checkout', function (Blueprint $table) {
+                if (!Schema::hasColumn('accessories_checkout', 'assigned_type')) {
+                    $table->string('assigned_type')->nullable();
+                }
+            });
+        }
+        
+        DB::update('update '.DB::getTablePrefix().'accessories_checkout set assigned_type = \'App\\\\Models\\\\User\' where assigned_type is null', []);
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+        if (Schema::hasTable('accessories_checkout')) {
+            Schema::table('accessories_checkout', function (Blueprint $table) {
+                $table->dropColumn('assigned_type');   
+            });
+
+            Schema::rename('accessories_checkout', 'accessories_users');
+        }
+    }
+};
diff --git a/database/migrations/2024_08_01_201721_add_required_notes_setting.php b/database/migrations/2024_08_01_201721_add_required_notes_setting.php
new file mode 100644
index 0000000000..38fdd38c11
--- /dev/null
+++ b/database/migrations/2024_08_01_201721_add_required_notes_setting.php
@@ -0,0 +1,30 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    /**
+     * Run the migrations.
+     */
+    public function up(): void
+    {
+        Schema::table('settings', function (Blueprint $table) {
+            $table->boolean('require_checkinout_notes')->nullable()->default(0);
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+        Schema::table('settings', function (Blueprint $table) {
+            if (Schema::hasColumn('settings', 'require_checkinout_notes')) {
+                $table->dropColumn('require_checkinout_notes');
+            }
+        });
+    }
+};
diff --git a/database/migrations/2024_08_06_175114_add_shortcuts_enabled_to_settings_table.php b/database/migrations/2024_08_06_175114_add_shortcuts_enabled_to_settings_table.php
new file mode 100644
index 0000000000..1d38c6b891
--- /dev/null
+++ b/database/migrations/2024_08_06_175114_add_shortcuts_enabled_to_settings_table.php
@@ -0,0 +1,27 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration {
+    /**
+     * Run the migrations.
+     */
+    public function up(): void
+    {
+        Schema::table('settings', function (Blueprint $table) {
+            $table->boolean('shortcuts_enabled')->default(false);
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+        Schema::table('settings', function (Blueprint $table) {
+            $table->dropColumn('shortcuts_enabled');
+        });
+    }
+};
diff --git a/database/migrations/2024_08_07_204014_add_play_sounds_to_profile.php b/database/migrations/2024_08_07_204014_add_play_sounds_to_profile.php
new file mode 100644
index 0000000000..a6e03fd697
--- /dev/null
+++ b/database/migrations/2024_08_07_204014_add_play_sounds_to_profile.php
@@ -0,0 +1,28 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    /**
+     * Run the migrations.
+     */
+    public function up(): void
+    {
+        Schema::table('users', function (Blueprint $table) {
+            $table->boolean('enable_sounds')->default(false);
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+        Schema::table('users', function (Blueprint $table) {
+            $table->dropColumn('enable_sounds');
+        });
+    }
+};
diff --git a/database/migrations/2024_08_15_111816_add_confetti_to_users.php b/database/migrations/2024_08_15_111816_add_confetti_to_users.php
new file mode 100644
index 0000000000..a3aa85d4f4
--- /dev/null
+++ b/database/migrations/2024_08_15_111816_add_confetti_to_users.php
@@ -0,0 +1,28 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    /**
+     * Run the migrations.
+     */
+    public function up(): void
+    {
+        Schema::table('users', function (Blueprint $table) {
+            $table->boolean('enable_confetti')->default(false);
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+        Schema::table('users', function (Blueprint $table) {
+            $table->dropColumn('enable_confetti');
+        });
+    }
+};
diff --git a/database/migrations/2024_08_16_104137_add_due_checkin_days_to_settings.php b/database/migrations/2024_08_16_104137_add_due_checkin_days_to_settings.php
new file mode 100644
index 0000000000..09314b88fe
--- /dev/null
+++ b/database/migrations/2024_08_16_104137_add_due_checkin_days_to_settings.php
@@ -0,0 +1,28 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    /**
+     * Run the migrations.
+     */
+    public function up(): void
+    {
+        Schema::table('settings', function (Blueprint $table) {
+            $table->integer('due_checkin_days')->nullable()->default(null);
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+        Schema::table('settings', function (Blueprint $table) {
+            $table->dropColumn('due_checkin_days');
+        });
+    }
+};
diff --git a/database/migrations/2024_09_17_204302_change_user_id_to_created_by.php b/database/migrations/2024_09_17_204302_change_user_id_to_created_by.php
new file mode 100644
index 0000000000..3bef5948b6
--- /dev/null
+++ b/database/migrations/2024_09_17_204302_change_user_id_to_created_by.php
@@ -0,0 +1,93 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    /**
+     * Run the migrations.
+     */
+    public function up(): void
+    {
+        foreach ($this->add_to_table_list() as $add_table) {
+            if (!Schema::hasColumn($add_table, 'created_by')) {
+                Schema::table($add_table, function (Blueprint $add_table) {
+                    $add_table->unsignedBigInteger('created_by')->nullable()->before('created_at');
+                });
+            }
+        }
+
+        foreach ($this->existing_table_list() as $table) {
+            if (Schema::hasColumn($table, 'user_id')) {
+                Schema::table($table, function (Blueprint $table) {
+                    $table->renameColumn('user_id', 'created_by');
+                });
+            }
+        }
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+        foreach ($this->add_to_table_list() as $add_table) {
+            if (Schema::hasColumn($add_table, 'created_by')) {
+                Schema::table($add_table, function (Blueprint $add_table) {
+                    $add_table->dropColumn('created_by');
+                });
+            }
+        }
+
+        foreach ($this->existing_table_list() as $table) {
+            if (Schema::hasColumn($table, 'created_by')) {
+                Schema::table($table, function (Blueprint $table) {
+                    $table->renameColumn('created_by', 'user_id');
+                });
+            }
+        }
+    }
+
+    public function existing_table_list() {
+        return [
+            'accessories',
+            'accessories_checkout',
+            'action_logs',
+            'asset_maintenances',
+            'assets',
+            'categories',
+            'components',
+            'components_assets',
+            'consumables',
+            'consumables_users',
+            'custom_fields',
+            'custom_fieldsets',
+            'departments',
+            'depreciations',
+            'license_seats',
+            'licenses',
+            'locations',
+            'manufacturers',
+            'models',
+            'settings',
+            'status_labels',
+            'suppliers',
+            'users',
+        ];
+    }
+
+    public function add_to_table_list() {
+        return [
+            'companies',
+            'imports',
+            'kits',
+            'kits_accessories',
+            'kits_consumables',
+            'kits_licenses',
+            'kits_models',
+            'users_groups',
+        ];
+    }
+};
diff --git a/database/migrations/2024_10_23_162301_add_manufacturer_id_model_number_to_consumables.php b/database/migrations/2024_10_23_162301_add_manufacturer_id_model_number_to_consumables.php
new file mode 100644
index 0000000000..0180ac0edd
--- /dev/null
+++ b/database/migrations/2024_10_23_162301_add_manufacturer_id_model_number_to_consumables.php
@@ -0,0 +1,30 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    /**
+     * Run the migrations.
+     */
+    public function up(): void
+    {
+        Schema::table('components', function (Blueprint $table) {
+            $table->integer('manufacturer_id')->after('purchase_cost')->nullable()->default(null);
+            $table->string('model_number')->after('purchase_cost')->nullable()->default(null);
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+        Schema::table('components', function (Blueprint $table) {
+            $table->dropColumn('manufacturer_id');
+            $table->dropColumn('model_number');
+        });
+    }
+};
diff --git a/database/migrations/2024_10_31_212512_update_new_and_drop_old_barcode_settings.php b/database/migrations/2024_10_31_212512_update_new_and_drop_old_barcode_settings.php
new file mode 100644
index 0000000000..a802f04290
--- /dev/null
+++ b/database/migrations/2024_10_31_212512_update_new_and_drop_old_barcode_settings.php
@@ -0,0 +1,46 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+use Illuminate\Support\Facades\DB;
+
+return new class extends Migration
+{
+    /**
+     * Run the migrations.
+     */
+    public function up()
+    {
+        // Copy values if target columns are blank
+        DB::table('settings')->whereNull('label2_2d_type')->orWhere('label2_2d_type', '')->update([
+            'label2_2d_type' => DB::raw('barcode_type')
+        ]);
+
+        DB::table('settings')->whereNull('label2_1d_type')->orWhere('label2_1d_type', '')->update([
+            'label2_1d_type' => DB::raw('alt_barcode')
+        ]);
+
+
+        Schema::table('settings', function (Blueprint $table) {
+            $table->dropColumn(['barcode_type', 'alt_barcode']);
+        });
+    }
+
+    public function down()
+    {
+        Schema::table('settings', function (Blueprint $table) {
+            // Re-add the columns that were dropped in case of rollback
+            $table->string('barcode_type')->nullable();
+            $table->string('alt_barcode')->nullable();
+        });
+
+        DB::table('settings')->whereNull('barcode_type')->orWhere('barcode_type', '')->update([
+            'barcode_type' => DB::raw('label2_2d_type')
+        ]);
+
+        DB::table('settings')->whereNull('alt_barcode')->orWhere('alt_barcode', '')->update([
+            'alt_barcode' => DB::raw('label2_1d_type')
+        ]);
+    }
+};
diff --git a/database/migrations/2024_11_06_211457_add_manager_indexes_to_location_and_user.php b/database/migrations/2024_11_06_211457_add_manager_indexes_to_location_and_user.php
new file mode 100644
index 0000000000..d1a151c126
--- /dev/null
+++ b/database/migrations/2024_11_06_211457_add_manager_indexes_to_location_and_user.php
@@ -0,0 +1,34 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    /**
+     * Run the migrations.
+     */
+    public function up(): void
+    {
+        Schema::table('locations', function (Blueprint $table) {
+            $table->index('manager_id');
+        });
+        Schema::table('users', function (Blueprint $table) {
+            $table->index('manager_id');
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+        Schema::table('locations', function (Blueprint $table) {
+            $table->dropIndex(['manager_id']);
+        });
+        Schema::table('users', function (Blueprint $table) {
+            $table->dropIndex(['manager_id']);
+        });
+    }
+};
diff --git a/database/migrations/2024_11_07_113631_improve_manager_indexes_on_users_and_locations.php b/database/migrations/2024_11_07_113631_improve_manager_indexes_on_users_and_locations.php
new file mode 100644
index 0000000000..cc2963fecc
--- /dev/null
+++ b/database/migrations/2024_11_07_113631_improve_manager_indexes_on_users_and_locations.php
@@ -0,0 +1,39 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    /**
+     * Run the migrations.
+     */
+    public function up(): void
+    {
+        Schema::table('locations', function (Blueprint $table) {
+            $table->dropIndex(['manager_id']);
+            $table->index(['manager_id','deleted_at']);
+        });
+        Schema::table('users', function (Blueprint $table) {
+            $table->dropIndex(['manager_id']);
+            $table->index(['manager_id','deleted_at']);
+        });
+
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+        Schema::table('locations', function (Blueprint $table) {
+            $table->dropIndex(['manager_id','deleted_at']);
+            $table->index(['manager_id']);
+        });
+        Schema::table('users', function (Blueprint $table) {
+            $table->dropIndex(['manager_id','deleted_at']);
+            $table->index(['manager_id']);
+        });
+    }
+};
diff --git a/database/migrations/2025_01_06_210534_change_report_templates_options_to_column_text_field.php b/database/migrations/2025_01_06_210534_change_report_templates_options_to_column_text_field.php
new file mode 100644
index 0000000000..024214ce3a
--- /dev/null
+++ b/database/migrations/2025_01_06_210534_change_report_templates_options_to_column_text_field.php
@@ -0,0 +1,39 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration {
+    /**
+     * Run the migrations.
+     */
+    public function up(): void
+    {
+        /*
+         * The "options" column was originally json but the migration was amended to change it to a text column
+         * since json columns cause issues with older versions of mariadb.
+         *
+         * This migration definitively changes it to a text column
+         * for the systems that had successfully run the migration.
+         *
+         * https://github.com/grokability/snipe-it/issues/16015
+         */
+        if (Schema::hasTable('report_templates') && Schema::hasColumn('report_templates', 'options')) {
+            Schema::table('report_templates', function (Blueprint $table) {
+                $table->text('options')->nullable(false)->change();
+            });
+        }
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+        Schema::table('report_templates', function (Blueprint $table) {
+            // Instead of attempting to roll this back to json let's just
+            // keep it as text since that works for mysql, mariadb, and sqlite.
+        });
+    }
+};
diff --git a/database/migrations/2025_01_07_172419_fix_label_types_on_settings_table.php b/database/migrations/2025_01_07_172419_fix_label_types_on_settings_table.php
new file mode 100644
index 0000000000..dbbde4f88e
--- /dev/null
+++ b/database/migrations/2025_01_07_172419_fix_label_types_on_settings_table.php
@@ -0,0 +1,43 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    /**
+     * Run the migrations.
+     */
+    public function up(): void
+    {
+        DB::table('settings')->where('label2_2d_type', 'default')->update([
+            'label2_2d_type' => 'QRCODE',
+        ]);
+
+        DB::table('settings')->where('label2_1d_type', 'default')->update([
+            'label2_1d_type' => 'C128',
+        ]);
+
+        DB::table('settings')->whereNull('label2_2d_type')->orWhere('label2_2d_type', '')->update([
+            'label2_2d_type' => 'none',
+        ]);
+
+        DB::table('settings')->whereNull('label2_1d_type')->orWhere('label2_1d_type', '')->update([
+            'label2_1d_type' => 'none',
+        ]);
+
+        Schema::table('settings', function (Blueprint $table) {
+            $table->string('label2_2d_type')->default('QRCODE')->nullable(false)->change();
+            $table->string('label2_1d_type')->default('C128')->nullable(false)->change();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+        //
+    }
+};
diff --git a/database/migrations/2025_02_10_230155_add_notes_to_locations_companies_categories_manufacturers_groups.php b/database/migrations/2025_02_10_230155_add_notes_to_locations_companies_categories_manufacturers_groups.php
new file mode 100644
index 0000000000..bbffc50305
--- /dev/null
+++ b/database/migrations/2025_02_10_230155_add_notes_to_locations_companies_categories_manufacturers_groups.php
@@ -0,0 +1,60 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    /**
+     * Run the migrations.
+     */
+    public function up(): void
+    {
+        Schema::table('locations', function (Blueprint $table) {
+            $table->text('notes')->nullable()->default(null);
+        });
+
+        Schema::table('companies', function (Blueprint $table) {
+            $table->text('notes')->nullable()->default(null);
+        });
+
+        Schema::table('categories', function (Blueprint $table) {
+            $table->text('notes')->nullable()->default(null);
+        });
+
+        Schema::table('manufacturers', function (Blueprint $table) {
+            $table->text('notes')->nullable()->default(null);
+        });
+
+        Schema::table('permission_groups', function (Blueprint $table) {
+            $table->text('notes')->nullable()->default(null);
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+        Schema::table('locations', function (Blueprint $table) {
+            $table->dropColumn('notes');
+        });
+
+        Schema::table('companies', function (Blueprint $table) {
+            $table->dropColumn('notes');
+        });
+
+        Schema::table('categories', function (Blueprint $table) {
+            $table->dropColumn('notes');
+        });
+
+        Schema::table('manufacturers', function (Blueprint $table) {
+            $table->dropColumn('notes');
+        });
+
+        Schema::table('permission_groups', function (Blueprint $table) {
+            $table->dropColumn('notes');
+        });
+    }
+};
diff --git a/database/migrations/2025_02_22_144518_add_checkin_checkout_to_customfields.php b/database/migrations/2025_02_22_144518_add_checkin_checkout_to_customfields.php
new file mode 100644
index 0000000000..28aceee43b
--- /dev/null
+++ b/database/migrations/2025_02_22_144518_add_checkin_checkout_to_customfields.php
@@ -0,0 +1,30 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    /**
+     * Run the migrations.
+     */
+    public function up(): void
+    {
+        Schema::table('custom_fields', function (Blueprint $table) {
+            $table->boolean('display_checkin')->default(0);
+            $table->boolean('display_checkout')->default(0);
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+        Schema::table('custom_fields', function (Blueprint $table) {
+            $table->dropColumn('display_checkin');
+            $table->dropColumn('display_checkout');
+        });
+    }
+};
diff --git a/database/migrations/2025_02_26_153413_add_ldap_invert_active_flag_to_setting_table.php b/database/migrations/2025_02_26_153413_add_ldap_invert_active_flag_to_setting_table.php
new file mode 100644
index 0000000000..7ca354bfea
--- /dev/null
+++ b/database/migrations/2025_02_26_153413_add_ldap_invert_active_flag_to_setting_table.php
@@ -0,0 +1,28 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    /**
+     * Run the migrations.
+     */
+    public function up(): void
+    {
+        Schema::table('settings', function (Blueprint $table) {
+            $table->boolean('ldap_invert_active_flag')->default(0);
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+        Schema::table('settings', function (Blueprint $table) {
+            $table->dropColumn('ldap_invert_active_flag');
+        });
+    }
+};
diff --git a/database/migrations/2025_03_04_231256_purge_action_logs_of_report_template_activity.php b/database/migrations/2025_03_04_231256_purge_action_logs_of_report_template_activity.php
new file mode 100644
index 0000000000..150df41a48
--- /dev/null
+++ b/database/migrations/2025_03_04_231256_purge_action_logs_of_report_template_activity.php
@@ -0,0 +1,26 @@
+<?php
+
+use App\Models\ReportTemplate;
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Support\Facades\DB;
+
+return new class extends Migration {
+    /**
+     * Run the migrations.
+     */
+    public function up(): void
+    {
+        DB::table("action_logs")
+            ->where("item_type", ReportTemplate::class)
+            ->whereIn("action_type", ["create", "update", "delete"])
+            ->delete();
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+        // nothing to do here...
+    }
+};
diff --git a/database/migrations/2025_03_06_152922_copy_created_at_to_action_date_in_action_logs.php b/database/migrations/2025_03_06_152922_copy_created_at_to_action_date_in_action_logs.php
new file mode 100644
index 0000000000..8ce7de13bd
--- /dev/null
+++ b/database/migrations/2025_03_06_152922_copy_created_at_to_action_date_in_action_logs.php
@@ -0,0 +1,31 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Support\Facades\DB;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    /**
+     * Run the migrations.
+     */
+    public function up(): void
+    {
+
+        Schema::table('action_logs', function (Blueprint $table) {
+            $table->index(['action_date']);
+        });
+
+        DB::update('update '.DB::getTablePrefix().'action_logs set action_date = created_at where created_at IS NOT NULL and action_date IS NULL');
+
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+
+    }
+};
diff --git a/database/migrations/2025_03_12_184851_purge_action_logs_table_of_consumable_checkin_entries.php b/database/migrations/2025_03_12_184851_purge_action_logs_table_of_consumable_checkin_entries.php
new file mode 100644
index 0000000000..6f2b1324bf
--- /dev/null
+++ b/database/migrations/2025_03_12_184851_purge_action_logs_table_of_consumable_checkin_entries.php
@@ -0,0 +1,30 @@
+<?php
+
+use App\Models\Consumable;
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Support\Facades\DB;
+
+return new class extends Migration
+{
+    /**
+     * Run the migrations.
+     */
+    public function up(): void
+    {
+        DB::table('action_logs')
+            ->where([
+                'action_type' => 'checkin from',
+                'note' => 'Bulk checkin items',
+                'item_type' => Consumable::class,
+            ])
+            ->delete();
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+        // nothing to do here...
+    }
+};
diff --git a/database/migrations/2025_04_02_113438_add_acceptance_pdf_logo_to_settings.php b/database/migrations/2025_04_02_113438_add_acceptance_pdf_logo_to_settings.php
new file mode 100644
index 0000000000..26ce894e58
--- /dev/null
+++ b/database/migrations/2025_04_02_113438_add_acceptance_pdf_logo_to_settings.php
@@ -0,0 +1,28 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    /**
+     * Run the migrations.
+     */
+    public function up(): void
+    {
+        Schema::table('settings', function (Blueprint $table) {
+            $table->char('acceptance_pdf_logo')->after('label_logo')->nullable()->default(null);
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+        Schema::table('settings', function (Blueprint $table) {
+            $table->dropColumn('acceptance_pdf_logo');
+        });
+    }
+};
diff --git a/database/migrations/2025_04_07_145418_add_custom_fields_to_audit.php b/database/migrations/2025_04_07_145418_add_custom_fields_to_audit.php
new file mode 100644
index 0000000000..d5594fc035
--- /dev/null
+++ b/database/migrations/2025_04_07_145418_add_custom_fields_to_audit.php
@@ -0,0 +1,28 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    /**
+     * Run the migrations.
+     */
+    public function up(): void
+    {
+        Schema::table('custom_fields', function (Blueprint $table) {
+            $table->boolean('display_audit')->default(0);
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+        Schema::table('custom_fields', function (Blueprint $table) {
+            $table->dropColumn('display_audit');
+        });
+    }
+};
diff --git a/database/migrations/2025_04_22_170731_add_empty_row_count_to_settings_table.php b/database/migrations/2025_04_22_170731_add_empty_row_count_to_settings_table.php
new file mode 100644
index 0000000000..49b228b42d
--- /dev/null
+++ b/database/migrations/2025_04_22_170731_add_empty_row_count_to_settings_table.php
@@ -0,0 +1,21 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration {
+    public function up(): void
+    {
+        Schema::table('settings', function (Blueprint $table) {
+            $table->unsignedInteger('label2_empty_row_count')->default(0)->after('label2_fields');
+        });
+    }
+
+    public function down(): void
+    {
+        Schema::table('settings', function (Blueprint $table) {
+            $table->dropColumn('label2_empty_row_count');
+        });
+    }
+};
diff --git a/database/migrations/2025_05_20_190317_repopulate_webhook_selected_setting.php b/database/migrations/2025_05_20_190317_repopulate_webhook_selected_setting.php
new file mode 100644
index 0000000000..be14ea04ea
--- /dev/null
+++ b/database/migrations/2025_05_20_190317_repopulate_webhook_selected_setting.php
@@ -0,0 +1,41 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Support\Facades\DB;
+
+return new class extends Migration {
+    /**
+     * Run the migrations.
+     */
+    public function up(): void
+    {
+        $settings = DB::table('settings')->first();
+
+        if ($settings) {
+            /** If webhook settings were cleared via the integration settings page,
+             * the webhook_selected was cleared as well when it should have reset to "slack".
+             */
+            if (
+                empty($settings->webhook_selected) &&
+                (empty($settings->webhook_botname) && empty($settings->webhook_channel) && empty($settings->webhook_endpoint))
+            ) {
+                DB::table('settings')->update(['webhook_selected' => 'slack']);
+            }
+
+            /** If webhook settings were cleared via the integration settings page,
+             * then slack settings were re-added; then webhook_selected was not being set to "slack" as needed.
+             */
+            if (str_contains($settings->webhook_endpoint, 'slack.com')) {
+                DB::table('settings')->update(['webhook_selected' => 'slack']);
+            }
+        }
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+        //
+    }
+};
diff --git a/database/migrations/2025_06_02_233556_add_admin_cc_always_to_settings_table.php b/database/migrations/2025_06_02_233556_add_admin_cc_always_to_settings_table.php
new file mode 100644
index 0000000000..d28115a6d2
--- /dev/null
+++ b/database/migrations/2025_06_02_233556_add_admin_cc_always_to_settings_table.php
@@ -0,0 +1,27 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration {
+    /**
+     * Run the migrations.
+     */
+    public function up(): void
+    {
+        Schema::table('settings', function (Blueprint $table) {
+            $table->boolean('admin_cc_always')->after('admin_cc_email')->default(1);
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+        Schema::table('settings', function (Blueprint $table) {
+            $table->dropColumn('admin_cc_always');
+        });
+    }
+};
diff --git a/database/migrations/2025_06_03_053438_fix_assigned_type_without_assigned_to.php b/database/migrations/2025_06_03_053438_fix_assigned_type_without_assigned_to.php
new file mode 100644
index 0000000000..9d6a1c8046
--- /dev/null
+++ b/database/migrations/2025_06_03_053438_fix_assigned_type_without_assigned_to.php
@@ -0,0 +1,23 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Support\Facades\DB;
+
+return new class extends Migration
+{
+    /**
+     * Run the migrations.
+     */
+    public function up(): void
+    {
+        DB::table('assets')->whereNotNull('assigned_type')->whereNull('assigned_to')->update(['assigned_type' => null]);
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+
+    }
+};
diff --git a/database/migrations/2025_06_04_101736_add_deleted_at_index_to_action_logs.php b/database/migrations/2025_06_04_101736_add_deleted_at_index_to_action_logs.php
new file mode 100644
index 0000000000..c9f853599b
--- /dev/null
+++ b/database/migrations/2025_06_04_101736_add_deleted_at_index_to_action_logs.php
@@ -0,0 +1,28 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    /**
+     * Run the migrations.
+     */
+    public function up(): void
+    {
+        Schema::table('action_logs', function (Blueprint $table) {
+            $table->index('deleted_at');
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+        Schema::table('action_logs', function (Blueprint $table) {
+            $table->dropIndex('deleted_at');
+        });
+    }
+};
diff --git a/database/migrations/2025_06_06_155058_make_supplier_id_nullable.php b/database/migrations/2025_06_06_155058_make_supplier_id_nullable.php
new file mode 100644
index 0000000000..f71eeb8d96
--- /dev/null
+++ b/database/migrations/2025_06_06_155058_make_supplier_id_nullable.php
@@ -0,0 +1,27 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    /**
+     * Run the migrations.
+     */
+    public function up(): void
+    {
+        Schema::table('asset_maintenances', function (Blueprint $table) {
+            $table->integer('supplier_id')->nullable()->default(null)->change();
+        });
+
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+        //
+    }
+};
diff --git a/database/seeders/AccessorySeeder.php b/database/seeders/AccessorySeeder.php
index 31f0c478d4..5f4cca8cf6 100644
--- a/database/seeders/AccessorySeeder.php
+++ b/database/seeders/AccessorySeeder.php
@@ -16,7 +16,7 @@ class AccessorySeeder extends Seeder
     public function run()
     {
         Accessory::truncate();
-        DB::table('accessories_users')->truncate();
+        DB::table('accessories_checkout')->truncate();
 
         if (! Location::count()) {
             $this->call(LocationSeeder::class);
@@ -35,25 +35,25 @@ class AccessorySeeder extends Seeder
         Accessory::factory()->appleUsbKeyboard()->create([
             'location_id' => $locationIds->random(),
             'supplier_id' => $supplierIds->random(),
-            'user_id' => $admin->id,
+            'created_by' => $admin->id,
         ]);
 
         Accessory::factory()->appleBtKeyboard()->create([
             'location_id' => $locationIds->random(),
             'supplier_id' => $supplierIds->random(),
-            'user_id' => $admin->id,
+            'created_by' => $admin->id,
         ]);
 
         Accessory::factory()->appleMouse()->create([
             'location_id' => $locationIds->random(),
             'supplier_id' => $supplierIds->random(),
-            'user_id' => $admin->id,
+            'created_by' => $admin->id,
         ]);
 
         Accessory::factory()->microsoftMouse()->create([
             'location_id' => $locationIds->random(),
             'supplier_id' => $supplierIds->random(),
-            'user_id' => $admin->id,
+            'created_by' => $admin->id,
         ]);
 
 
diff --git a/database/seeders/ActionlogSeeder.php b/database/seeders/ActionlogSeeder.php
index 28191d53b0..3903980007 100644
--- a/database/seeders/ActionlogSeeder.php
+++ b/database/seeders/ActionlogSeeder.php
@@ -27,16 +27,16 @@ class ActionlogSeeder extends Seeder
         Actionlog::factory()
             ->count(300)
             ->assetCheckoutToUser()
-            ->create(['user_id' => $admin->id]);
+            ->create(['created_by' => $admin->id]);
 
         Actionlog::factory()
             ->count(100)
             ->assetCheckoutToLocation()
-            ->create(['user_id' => $admin->id]);
+            ->create(['created_by' => $admin->id]);
 
         Actionlog::factory()
             ->count(20)
             ->licenseCheckoutToUser()
-            ->create(['user_id' => $admin->id]);
+            ->create(['created_by' => $admin->id]);
     }
 }
diff --git a/database/seeders/AssetModelSeeder.php b/database/seeders/AssetModelSeeder.php
index 1fc0b28cd3..f2902ffe7c 100755
--- a/database/seeders/AssetModelSeeder.php
+++ b/database/seeders/AssetModelSeeder.php
@@ -17,34 +17,34 @@ class AssetModelSeeder extends Seeder
         $admin = User::where('permissions->superuser', '1')->first() ?? User::factory()->firstAdmin()->create();
 
         // Laptops
-        AssetModel::factory()->count(1)->mbp13Model()->create(['user_id' => $admin->id]);
-        AssetModel::factory()->count(1)->mbpAirModel()->create(['user_id' => $admin->id]);
-        AssetModel::factory()->count(1)->surfaceModel()->create(['user_id' => $admin->id]);
-        AssetModel::factory()->count(1)->xps13Model()->create(['user_id' => $admin->id]);
-        AssetModel::factory()->count(1)->spectreModel()->create(['user_id' => $admin->id]);
-        AssetModel::factory()->count(1)->zenbookModel()->create(['user_id' => $admin->id]);
-        AssetModel::factory()->count(1)->yogaModel()->create(['user_id' => $admin->id]);
+        AssetModel::factory()->count(1)->mbp13Model()->create(['created_by' => $admin->id]);
+        AssetModel::factory()->count(1)->mbpAirModel()->create(['created_by' => $admin->id]);
+        AssetModel::factory()->count(1)->surfaceModel()->create(['created_by' => $admin->id]);
+        AssetModel::factory()->count(1)->xps13Model()->create(['created_by' => $admin->id]);
+        AssetModel::factory()->count(1)->spectreModel()->create(['created_by' => $admin->id]);
+        AssetModel::factory()->count(1)->zenbookModel()->create(['created_by' => $admin->id]);
+        AssetModel::factory()->count(1)->yogaModel()->create(['created_by' => $admin->id]);
 
         // Desktops
-        AssetModel::factory()->count(1)->macproModel()->create(['user_id' => $admin->id]);
-        AssetModel::factory()->count(1)->lenovoI5Model()->create(['user_id' => $admin->id]);
-        AssetModel::factory()->count(1)->optiplexModel()->create(['user_id' => $admin->id]);
+        AssetModel::factory()->count(1)->macproModel()->create(['created_by' => $admin->id]);
+        AssetModel::factory()->count(1)->lenovoI5Model()->create(['created_by' => $admin->id]);
+        AssetModel::factory()->count(1)->optiplexModel()->create(['created_by' => $admin->id]);
 
         // Conference Phones
-        AssetModel::factory()->count(1)->polycomModel()->create(['user_id' => $admin->id]);
-        AssetModel::factory()->count(1)->polycomcxModel()->create(['user_id' => $admin->id]);
+        AssetModel::factory()->count(1)->polycomModel()->create(['created_by' => $admin->id]);
+        AssetModel::factory()->count(1)->polycomcxModel()->create(['created_by' => $admin->id]);
 
         // Tablets
-        AssetModel::factory()->count(1)->ipadModel()->create(['user_id' => $admin->id]);
-        AssetModel::factory()->count(1)->tab3Model()->create(['user_id' => $admin->id]);
+        AssetModel::factory()->count(1)->ipadModel()->create(['created_by' => $admin->id]);
+        AssetModel::factory()->count(1)->tab3Model()->create(['created_by' => $admin->id]);
 
         // Phones
-        AssetModel::factory()->count(1)->iphone11Model()->create(['user_id' => $admin->id]);
-        AssetModel::factory()->count(1)->iphone12Model()->create(['user_id' => $admin->id]);
+        AssetModel::factory()->count(1)->iphone11Model()->create(['created_by' => $admin->id]);
+        AssetModel::factory()->count(1)->iphone12Model()->create(['created_by' => $admin->id]);
 
         // Displays
-        AssetModel::factory()->count(1)->ultrafine()->create(['user_id' => $admin->id]);
-        AssetModel::factory()->count(1)->ultrasharp()->create(['user_id' => $admin->id]);
+        AssetModel::factory()->count(1)->ultrafine()->create(['created_by' => $admin->id]);
+        AssetModel::factory()->count(1)->ultrasharp()->create(['created_by' => $admin->id]);
 
         $src = public_path('/img/demo/models/');
         $dst = 'models'.'/';
diff --git a/database/seeders/AssetSeeder.php b/database/seeders/AssetSeeder.php
index 5fdc09bdb3..9d21e7f9fa 100644
--- a/database/seeders/AssetSeeder.php
+++ b/database/seeders/AssetSeeder.php
@@ -25,7 +25,7 @@ class AssetSeeder extends Seeder
         $this->ensureLocationsSeeded();
         $this->ensureSuppliersSeeded();
 
-        $this->admin = User::where('permissions->superuser', '1')->first() ?? User::factory()->firstAdmin()->create();
+        $this->adminuser = User::where('permissions->superuser', '1')->first() ?? User::factory()->firstAdmin()->create();
         $this->locationIds = Location::all()->pluck('id');
         $this->supplierIds = Supplier::all()->pluck('id');
 
@@ -82,7 +82,7 @@ class AssetSeeder extends Seeder
         return fn($sequence) => [
             'rtd_location_id' => $this->locationIds->random(),
             'supplier_id' => $this->supplierIds->random(),
-            'user_id' => $this->admin->id,
+            'created_by' => $this->adminuser->id,
         ];
     }
 }
diff --git a/database/seeders/CategorySeeder.php b/database/seeders/CategorySeeder.php
index da542cff9e..137dea2aba 100755
--- a/database/seeders/CategorySeeder.php
+++ b/database/seeders/CategorySeeder.php
@@ -14,20 +14,20 @@ class CategorySeeder extends Seeder
 
         $admin = User::where('permissions->superuser', '1')->first() ?? User::factory()->firstAdmin()->create();
 
-        Category::factory()->count(1)->assetLaptopCategory()->create(['user_id' => $admin->id]);
-        Category::factory()->count(1)->assetDesktopCategory()->create(['user_id' => $admin->id]);
-        Category::factory()->count(1)->assetTabletCategory()->create(['user_id' => $admin->id]);
-        Category::factory()->count(1)->assetMobileCategory()->create(['user_id' => $admin->id]);
-        Category::factory()->count(1)->assetDisplayCategory()->create(['user_id' => $admin->id]);
-        Category::factory()->count(1)->assetVoipCategory()->create(['user_id' => $admin->id]);
-        Category::factory()->count(1)->assetConferenceCategory()->create(['user_id' => $admin->id]);
-        Category::factory()->count(1)->accessoryKeyboardCategory()->create(['user_id' => $admin->id]);
-        Category::factory()->count(1)->accessoryMouseCategory()->create(['user_id' => $admin->id]);
-        Category::factory()->count(1)->consumablePaperCategory()->create(['user_id' => $admin->id]);
-        Category::factory()->count(1)->consumableInkCategory()->create(['user_id' => $admin->id]);
-        Category::factory()->count(1)->componentHddCategory()->create(['user_id' => $admin->id]);
-        Category::factory()->count(1)->componentRamCategory()->create(['user_id' => $admin->id]);
-        Category::factory()->count(1)->licenseGraphicsCategory()->create(['user_id' => $admin->id]);
-        Category::factory()->count(1)->licenseOfficeCategory()->create(['user_id' => $admin->id]);
+        Category::factory()->count(1)->assetLaptopCategory()->create(['created_by' => $admin->id]);
+        Category::factory()->count(1)->assetDesktopCategory()->create(['created_by' => $admin->id]);
+        Category::factory()->count(1)->assetTabletCategory()->create(['created_by' => $admin->id]);
+        Category::factory()->count(1)->assetMobileCategory()->create(['created_by' => $admin->id]);
+        Category::factory()->count(1)->assetDisplayCategory()->create(['created_by' => $admin->id]);
+        Category::factory()->count(1)->assetVoipCategory()->create(['created_by' => $admin->id]);
+        Category::factory()->count(1)->assetConferenceCategory()->create(['created_by' => $admin->id]);
+        Category::factory()->count(1)->accessoryKeyboardCategory()->create(['created_by' => $admin->id]);
+        Category::factory()->count(1)->accessoryMouseCategory()->create(['created_by' => $admin->id]);
+        Category::factory()->count(1)->consumablePaperCategory()->create(['created_by' => $admin->id]);
+        Category::factory()->count(1)->consumableInkCategory()->create(['created_by' => $admin->id]);
+        Category::factory()->count(1)->componentHddCategory()->create(['created_by' => $admin->id]);
+        Category::factory()->count(1)->componentRamCategory()->create(['created_by' => $admin->id]);
+        Category::factory()->count(1)->licenseGraphicsCategory()->create(['created_by' => $admin->id]);
+        Category::factory()->count(1)->licenseOfficeCategory()->create(['created_by' => $admin->id]);
     }
 }
diff --git a/database/seeders/ConsumableSeeder.php b/database/seeders/ConsumableSeeder.php
index 42527e1df8..de20141c7a 100644
--- a/database/seeders/ConsumableSeeder.php
+++ b/database/seeders/ConsumableSeeder.php
@@ -16,8 +16,8 @@ class ConsumableSeeder extends Seeder
 
         $admin = User::where('permissions->superuser', '1')->first() ?? User::factory()->firstAdmin()->create();
 
-        Consumable::factory()->count(1)->cardstock()->create(['user_id' => $admin->id]);
-        Consumable::factory()->count(1)->paper()->create(['user_id' => $admin->id]);
-        Consumable::factory()->count(1)->ink()->create(['user_id' => $admin->id]);
+        Consumable::factory()->count(1)->cardstock()->create(['created_by' => $admin->id]);
+        Consumable::factory()->count(1)->paper()->create(['created_by' => $admin->id]);
+        Consumable::factory()->count(1)->ink()->create(['created_by' => $admin->id]);
     }
 }
diff --git a/database/seeders/DepartmentSeeder.php b/database/seeders/DepartmentSeeder.php
index 7406b97afb..7f20ee8cb9 100644
--- a/database/seeders/DepartmentSeeder.php
+++ b/database/seeders/DepartmentSeeder.php
@@ -23,32 +23,32 @@ class DepartmentSeeder extends Seeder
 
         Department::factory()->count(1)->hr()->create([
             'location_id' => $locationIds->random(),
-            'user_id' => $admin->id,
+            'created_by' => $admin->id,
         ]);
 
         Department::factory()->count(1)->engineering()->create([
             'location_id' => $locationIds->random(),
-            'user_id' => $admin->id,
+            'created_by' => $admin->id,
         ]);
 
         Department::factory()->count(1)->marketing()->create([
             'location_id' => $locationIds->random(),
-            'user_id' => $admin->id,
+            'created_by' => $admin->id,
         ]);
 
         Department::factory()->count(1)->client()->create([
             'location_id' => $locationIds->random(),
-            'user_id' => $admin->id,
+            'created_by' => $admin->id,
         ]);
 
         Department::factory()->count(1)->product()->create([
             'location_id' => $locationIds->random(),
-            'user_id' => $admin->id,
+            'created_by' => $admin->id,
         ]);
 
         Department::factory()->count(1)->silly()->create([
             'location_id' => $locationIds->random(),
-            'user_id' => $admin->id,
+            'created_by' => $admin->id,
         ]);
     }
 }
diff --git a/database/seeders/DepreciationSeeder.php b/database/seeders/DepreciationSeeder.php
index 349d8aff53..ed78c0b115 100644
--- a/database/seeders/DepreciationSeeder.php
+++ b/database/seeders/DepreciationSeeder.php
@@ -14,8 +14,8 @@ class DepreciationSeeder extends Seeder
 
         $admin = User::where('permissions->superuser', '1')->first() ?? User::factory()->firstAdmin()->create();
 
-        Depreciation::factory()->count(1)->computer()->create(['user_id' => $admin->id]);
-        Depreciation::factory()->count(1)->display()->create(['user_id' => $admin->id]);
-        Depreciation::factory()->count(1)->mobilePhones()->create(['user_id' => $admin->id]);
+        Depreciation::factory()->count(1)->computer()->create(['created_by' => $admin->id]);
+        Depreciation::factory()->count(1)->display()->create(['created_by' => $admin->id]);
+        Depreciation::factory()->count(1)->mobilePhones()->create(['created_by' => $admin->id]);
     }
 }
diff --git a/database/seeders/LicenseSeeder.php b/database/seeders/LicenseSeeder.php
index 4868dd41e1..94e1e05cc1 100644
--- a/database/seeders/LicenseSeeder.php
+++ b/database/seeders/LicenseSeeder.php
@@ -8,6 +8,7 @@ use App\Models\LicenseSeat;
 use App\Models\Supplier;
 use App\Models\User;
 use Illuminate\Database\Seeder;
+use Illuminate\Support\Facades\Log;
 
 class LicenseSeeder extends Seeder
 {
@@ -20,7 +21,20 @@ class LicenseSeeder extends Seeder
             $this->call(CategorySeeder::class);
         }
 
-        $categoryIds = Category::all()->pluck('id');
+        $categories = Category::where('category_type', 'license')->get();
+
+        $graphicsSoftwareCategory = $categories->first(fn($category) => $category->name === 'Graphics Software');
+        $officeSoftwareCategory = $categories->first(fn($category) => $category->name === 'Office Software');
+
+        if (!$graphicsSoftwareCategory) {
+            Log::info('Graphics Software category not created. Using random category for seeding.');
+            $graphicsSoftwareCategory = Category::inRandomOrder()->first();
+        }
+
+        if (!$officeSoftwareCategory) {
+            Log::info('Office Software category not created. Using random category for seeding.');
+            $officeSoftwareCategory = Category::inRandomOrder()->first();
+        }
 
         if (! Supplier::count()) {
             $this->call(SupplierSeeder::class);
@@ -31,27 +45,27 @@ class LicenseSeeder extends Seeder
         $admin = User::where('permissions->superuser', '1')->first() ?? User::factory()->firstAdmin()->create();
 
         License::factory()->count(1)->photoshop()->create([
-            'category_id' => $categoryIds->random(),
+            'category_id' => $graphicsSoftwareCategory->id,
             'supplier_id' => $supplierIds->random(),
-            'user_id' => $admin->id,
+            'created_by' => $admin->id,
         ]);
 
         License::factory()->count(1)->acrobat()->create([
-            'category_id' => $categoryIds->random(),
+            'category_id' => $officeSoftwareCategory->id,
             'supplier_id' => $supplierIds->random(),
-            'user_id' => $admin->id,
+            'created_by' => $admin->id,
         ]);
 
         License::factory()->count(1)->indesign()->create([
-            'category_id' => $categoryIds->random(),
+            'category_id' => $graphicsSoftwareCategory->id,
             'supplier_id' => $supplierIds->random(),
-            'user_id' => $admin->id,
+            'created_by' => $admin->id,
         ]);
 
         License::factory()->count(1)->office()->create([
-            'category_id' => $categoryIds->random(),
+            'category_id' => $officeSoftwareCategory->id,
             'supplier_id' => $supplierIds->random(),
-            'user_id' => $admin->id,
+            'created_by' => $admin->id,
         ]);
     }
 }
diff --git a/database/seeders/ManufacturerSeeder.php b/database/seeders/ManufacturerSeeder.php
index cbd70f4c3d..cdf7596d45 100644
--- a/database/seeders/ManufacturerSeeder.php
+++ b/database/seeders/ManufacturerSeeder.php
@@ -16,17 +16,21 @@ class ManufacturerSeeder extends Seeder
 
         $admin = User::where('permissions->superuser', '1')->first() ?? User::factory()->firstAdmin()->create();
 
-        Manufacturer::factory()->count(1)->apple()->create(['user_id' => $admin->id]);
-        Manufacturer::factory()->count(1)->microsoft()->create(['user_id' => $admin->id]);
-        Manufacturer::factory()->count(1)->dell()->create(['user_id' => $admin->id]);
-        Manufacturer::factory()->count(1)->asus()->create(['user_id' => $admin->id]);
-        Manufacturer::factory()->count(1)->hp()->create(['user_id' => $admin->id]);
-        Manufacturer::factory()->count(1)->lenovo()->create(['user_id' => $admin->id]);
-        Manufacturer::factory()->count(1)->lg()->create(['user_id' => $admin->id]);
-        Manufacturer::factory()->count(1)->polycom()->create(['user_id' => $admin->id]);
-        Manufacturer::factory()->count(1)->adobe()->create(['user_id' => $admin->id]);
-        Manufacturer::factory()->count(1)->avery()->create(['user_id' => $admin->id]);
-        Manufacturer::factory()->count(1)->crucial()->create(['user_id' => $admin->id]);
+        Manufacturer::factory()->count(1)->apple()->create(['created_by' => $admin->id]);
+        Manufacturer::factory()->count(1)->microsoft()->create(['created_by' => $admin->id]);
+        Manufacturer::factory()->count(1)->dell()->create(['created_by' => $admin->id]);
+        Manufacturer::factory()->count(1)->asus()->create(['created_by' => $admin->id]);
+        Manufacturer::factory()->count(1)->hp()->create(['created_by' => $admin->id]);
+        Manufacturer::factory()->count(1)->lenovo()->create(['created_by' => $admin->id]);
+        Manufacturer::factory()->count(1)->lg()->create(['created_by' => $admin->id]);
+        Manufacturer::factory()->count(1)->polycom()->create(['created_by' => $admin->id]);
+        Manufacturer::factory()->count(1)->adobe()->create(['created_by' => $admin->id]);
+        Manufacturer::factory()->count(1)->avery()->create(['created_by' => $admin->id]);
+        Manufacturer::factory()->count(1)->crucial()->create(['created_by' => $admin->id]);
+        Manufacturer::factory()->count(1)->samsung()->create(['created_by' => $admin->id]);
+        Manufacturer::factory()->count(1)->google()->create(['created_by' => $admin->id]);
+        Manufacturer::factory()->count(1)->huawei()->create(['created_by' => $admin->id]);
+        Manufacturer::factory()->count(1)->sony()->create(['created_by' => $admin->id]);
 
         $src = public_path('/img/demo/manufacturers/');
         $dst = 'manufacturers'.'/';
diff --git a/database/seeders/SettingsSeeder.php b/database/seeders/SettingsSeeder.php
index c90ce52d07..37069ce378 100644
--- a/database/seeders/SettingsSeeder.php
+++ b/database/seeders/SettingsSeeder.php
@@ -19,12 +19,12 @@ class SettingsSeeder extends Seeder
         $settings->logo = 'snipe-logo.png';
         $settings->alert_email = 'service@snipe-it.io';
         $settings->header_color = null;
-        $settings->barcode_type = 'QRCODE';
+        $settings->label2_2d_type = 'QRCODE';
         $settings->default_currency = 'USD';
         $settings->brand = 3;
         $settings->ldap_enabled = 0;
         $settings->full_multiple_companies_support = 0;
-        $settings->alt_barcode = 'C128';
+        $settings->label2_1d_type = 'C128';
         $settings->skin = '';
         $settings->email_domain = 'example.org';
         $settings->email_format = 'filastname';
@@ -36,6 +36,7 @@ class SettingsSeeder extends Seeder
         $settings->version_footer = 'on';
         $settings->support_footer = 'on';
         $settings->pwd_secure_min = '8';
+        $settings->default_avatar = 'default.png';
         $settings->save();
 
         if ($user = User::where('username', '=', 'admin')->first()) {
diff --git a/database/seeders/StatuslabelSeeder.php b/database/seeders/StatuslabelSeeder.php
index fbc6a9fb66..be36e7790d 100755
--- a/database/seeders/StatuslabelSeeder.php
+++ b/database/seeders/StatuslabelSeeder.php
@@ -16,22 +16,22 @@ class StatuslabelSeeder extends Seeder
 
         Statuslabel::factory()->rtd()->create([
             'name' => 'Ready to Deploy',
-            'user_id' => $admin->id,
+            'created_by' => $admin->id,
         ]);
 
         Statuslabel::factory()->pending()->create([
             'name' => 'Pending',
-            'user_id' => $admin->id,
+            'created_by' => $admin->id,
         ]);
 
         Statuslabel::factory()->archived()->create([
             'name' => 'Archived',
-            'user_id' => $admin->id,
+            'created_by' => $admin->id,
         ]);
 
-        Statuslabel::factory()->outForDiagnostics()->create(['user_id' => $admin->id]);
-        Statuslabel::factory()->outForRepair()->create(['user_id' => $admin->id]);
-        Statuslabel::factory()->broken()->create(['user_id' => $admin->id]);
-        Statuslabel::factory()->lost()->create(['user_id' => $admin->id]);
+        Statuslabel::factory()->outForDiagnostics()->create(['created_by' => $admin->id]);
+        Statuslabel::factory()->outForRepair()->create(['created_by' => $admin->id]);
+        Statuslabel::factory()->broken()->create(['created_by' => $admin->id]);
+        Statuslabel::factory()->lost()->create(['created_by' => $admin->id]);
     }
 }
diff --git a/dev.docker-compose.yml b/dev.docker-compose.yml
index 15272ce5c5..0cd8139c0e 100644
--- a/dev.docker-compose.yml
+++ b/dev.docker-compose.yml
@@ -1,3 +1,5 @@
+# Compose file to spin up a local Snipe-IT for development.
+
 version: '3'
 
 services:
@@ -7,44 +9,40 @@ services:
       dockerfile: Dockerfile.alpine
     container_name: snipeit
     ports:
-    - "8000:80"
-    volumes:
-    - ./storage/logs:/var/www/html/storage/logs
+      - "8000:80"
     depends_on:
-    - mariadb
-    - redis
+      redis:
+        # The default needs to be stated.
+        condition: service_started
+      mariadb:
+        condition: service_healthy
+        restart: true
     env_file:
-    - .env.docker
-    networks:
-    - snipeit-backend
+      - .env.dev.docker
 
   mariadb:
-    image: mariadb:10.6.4-focal
+    image: mariadb:11.4.7
     volumes:
-    - db:/var/lib/mysql
+      - db:/var/lib/mysql
     env_file:
-    - .env.docker
-    networks:
-    - snipeit-backend
+      - .env.dev.docker
     ports:
       - "3306:3306"
+    healthcheck:
+      # https://mariadb.com/kb/en/using-healthcheck-sh/#compose-file-example
+      test: ["CMD", "healthcheck.sh", "--connect", "--innodb_initialized"]
+      interval: 5s
+      timeout: 2s
+      retries: 5
 
   redis:
-    image: redis:6.2.5-buster
-    networks:
-    - snipeit-backend
+    image: redis:7.4.3
 
   mailhog:
     image: mailhog/mailhog:v1.0.1
     ports:
-    # - 1025:1025
-    - "8025:8025"
-    networks:
-    - snipeit-backend
-
+      # - 1025:1025
+      - "8025:8025"
 
 volumes:
   db: {}
-
-networks:
-  snipeit-backend: {}
diff --git a/docker-compose.yml b/docker-compose.yml
index c7c1983a4e..d874d2e008 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,11 +1,13 @@
+# Compose file for production.
+
 volumes:
   db_data:
   storage:
 
 services:
   app:
-    image: snipe/snipe-it:${APP_VERSION:-v6.4.1}
-    restart: always
+    image: snipe/snipe-it:${APP_VERSION:-latest}
+    restart: unless-stopped
     volumes:
       - storage:/var/lib/snipeit
     ports:
@@ -18,8 +20,8 @@ services:
       - .env
 
   db:
-    image: mariadb:10.6.4-focal
-    restart: always
+    image: mariadb:11.4.7
+    restart: unless-stopped
     volumes:
       - db_data:/var/lib/mysql
     environment:
@@ -28,7 +30,8 @@ services:
       MYSQL_PASSWORD: ${DB_PASSWORD}
       MYSQL_ROOT_PASSWORD: ${MYSQL_ROOT_PASSWORD}
     healthcheck:
-      test: mysqladmin ping -h 127.0.0.1 -u $$MYSQL_USER --password=$$MYSQL_PASSWORD
+      # https://mariadb.com/kb/en/using-healthcheck-sh/#compose-file-example
+      test: ["CMD", "healthcheck.sh", "--connect", "--innodb_initialized"]
       interval: 5s
       timeout: 1s
       retries: 5
diff --git a/docker/entrypoint_alpine.sh b/docker/entrypoint_alpine.sh
deleted file mode 100644
index 783b50b69c..0000000000
--- a/docker/entrypoint_alpine.sh
+++ /dev/null
@@ -1,60 +0,0 @@
-#!/bin/sh
-
-# fix key if needed
-if [ -z "$APP_KEY" ]
-then
-  echo "Please re-run this container with an environment variable \$APP_KEY"
-  echo "An example APP_KEY you could use is: "
-  php artisan key:generate --show
-  exit
-fi
-
-#if [ ! -f /var/lib/snipeit/ssl/snipeit-ssl.crt -o ! -f /var/lib/snipeit/ssl/snipeit-ssl.key ]
-#then
- # rm /etc/apache2/conf.d/ssl.conf && rm /etc/apache2/conf.d/default-ssl.conf
-#fi
-
-# create data directories
-for dir in \
-  'data/private_uploads' \
-  'data/uploads/accessories' \
-  'data/uploads/avatars' \
-  'data/uploads/barcodes' \
-  'data/uploads/categories' \
-  'data/uploads/companies' \
-  'data/uploads/components' \
-  'data/uploads/consumables' \
-  'data/uploads/departments' \
-  'data/uploads/locations' \
-  'data/uploads/manufacturers' \
-  'data/uploads/models' \
-  'data/uploads/suppliers' \
-  'dumps' \
-  'keys'
-do
-  [ ! -d "/var/lib/snipeit/$dir" ] && mkdir -p "/var/lib/snipeit/$dir"
-done
-
-chown -R apache:root /var/lib/snipeit/data/*
-chown -R apache:root /var/lib/snipeit/dumps
-chown -R apache:root /var/lib/snipeit/keys
-
-# If the Oauth DB files are not present copy the vendor files over to the db migrations
-if [ ! -f "/var/www/html/database/migrations/*create_oauth*" ]
-then
-  cp -a /var/www/html/vendor/laravel/passport/database/migrations/* /var/www/html/database/migrations/
-fi
-
-if [ "${SESSION_DRIVER}" == "database" ]
-then
-  cp -a /var/www/html/vendor/laravel/framework/src/Illuminate/Session/Console/stubs/database.stub /var/www/html/database/migrations/2021_05_06_0000_create_sessions_table.php
-fi
-
-php artisan migrate --force
-php artisan config:clear
-php artisan config:cache
-
-chown -R apache:root /var/www/html/storage/logs/laravel.log
-
-export APACHE_LOG_DIR=/var/log/apache2
-exec httpd -DNO_DETACH < /dev/null
diff --git a/docker/startup.sh b/docker/startup.sh
index 62002a2ba0..5329e37c2c 100644
--- a/docker/startup.sh
+++ b/docker/startup.sh
@@ -1,7 +1,48 @@
 #!/bin/bash
 
+# Cribbed from nextcloud docker official repo
+# https://github.com/nextcloud/docker/blob/master/docker-entrypoint.sh
+# usage: file_env VAR [DEFAULT]
+#    ie: file_env 'XYZ_DB_PASSWORD' 'example'
+# (will allow for "$XYZ_DB_PASSWORD_FILE" to fill in the value of
+#  "$XYZ_DB_PASSWORD" from a file, especially for Docker's secrets feature)
+file_env() {
+    local var="$1"
+    local fileVar="${var}_FILE"
+    local def="${2:-}"
+    local varValue=$(env | grep -E "^${var}=" | sed -E -e "s/^${var}=//")
+    local fileVarValue=$(env | grep -E "^${fileVar}=" | sed -E -e "s/^${fileVar}=//")
+    if [ -n "${varValue}" ] && [ -n "${fileVarValue}" ]; then
+        echo >&2 "error: both $var and $fileVar are set (but are exclusive)"
+        exit 1
+    fi
+    if [ -n "${varValue}" ]; then
+        export "$var"="${varValue}"
+    elif [ -n "${fileVarValue}" ]; then
+        export "$var"="$(cat "${fileVarValue}")"
+    elif [ -n "${def}" ]; then
+        export "$var"="$def"
+    fi
+    unset "$fileVar"
+}
+
+# Add docker secrets support for the variables below:
+file_env APP_KEY
+file_env DB_HOST
+file_env DB_PORT
+file_env DB_DATABASE
+file_env DB_USERNAME
+file_env DB_PASSWORD
+file_env REDIS_HOST
+file_env REDIS_PASSWORD
+file_env REDIS_PORT
+file_env MAIL_HOST
+file_env MAIL_PORT
+file_env MAIL_USERNAME
+file_env MAIL_PASSWORD
+
 # fix key if needed
-if [ -z "$APP_KEY" ]
+if [ -z "$APP_KEY" -a -z "$APP_KEY_FILE" ]
 then
   echo "Please re-run this container with an environment variable \$APP_KEY"
   echo "An example APP_KEY you could use is: "
@@ -18,7 +59,7 @@ fi
 
 # create data directories
 # Note: Keep in sync with expected directories by the app
-# https://github.com/snipe/snipe-it/blob/master/app/Console/Commands/RestoreFromBackup.php#L232
+# https://github.com/grokability/snipe-it/blob/master/app/Console/Commands/RestoreFromBackup.php#L232
 for dir in \
   'data/private_uploads' \
   'data/private_uploads/assets' \
@@ -59,9 +100,13 @@ chown -R docker:root /var/www/html/storage/framework/cache
 # Fix php settings
 if [ -v "PHP_UPLOAD_LIMIT" ]
 then
-    echo "Changing upload limit to ${PHP_UPLOAD_LIMIT}"
-    sed -i "s/^upload_max_filesize.*/upload_max_filesize = ${PHP_UPLOAD_LIMIT}M/" /etc/php/*/apache2/php.ini
-    sed -i "s/^post_max_size.*/post_max_size = ${PHP_UPLOAD_LIMIT}M/" /etc/php/*/apache2/php.ini
+    find /etc/php -type f -name php.ini | while IFS= read -r ini; do
+        echo "Changing upload limit to ${PHP_UPLOAD_LIMIT}M in $ini"
+        sed -i \
+            -e "s/^;\? *upload_max_filesize *=.*/upload_max_filesize = ${PHP_UPLOAD_LIMIT}M/" \
+            -e "s/^;\? *post_max_size *=.*/post_max_size = ${PHP_UPLOAD_LIMIT}M/" \
+            "$ini"
+    done
 fi
 
 # If the Oauth DB files are not present copy the vendor files over to the db migrations
@@ -79,4 +124,9 @@ php artisan migrate --force
 php artisan config:clear
 php artisan config:cache
 
+# we do this after the artisan commands to ensure that if the laravel
+# log got created by root, we set the permissions back
+touch /var/www/html/storage/logs/laravel.log
+chown -R docker:root /var/www/html/storage/logs/laravel.log
+
 exec supervisord -c /supervisord.conf
diff --git a/docker/startup_alpine.sh b/docker/startup_alpine.sh
new file mode 100644
index 0000000000..bb9574f387
--- /dev/null
+++ b/docker/startup_alpine.sh
@@ -0,0 +1,115 @@
+#!/bin/sh
+
+# Cribbed from nextcloud docker official repo
+# https://github.com/nextcloud/docker/blob/master/docker-entrypoint.sh
+# usage: file_env VAR [DEFAULT]
+#    ie: file_env 'XYZ_DB_PASSWORD' 'example'
+# (will allow for "$XYZ_DB_PASSWORD_FILE" to fill in the value of
+#  "$XYZ_DB_PASSWORD" from a file, especially for Docker's secrets feature)
+file_env() {
+    local var="$1"
+    local fileVar="${var}_FILE"
+    local def="${2:-}"
+    local varValue=$(env | grep -E "^${var}=" | sed -E -e "s/^${var}=//")
+    local fileVarValue=$(env | grep -E "^${fileVar}=" | sed -E -e "s/^${fileVar}=//")
+    if [ -n "${varValue}" ] && [ -n "${fileVarValue}" ]; then
+        echo >&2 "error: both $var and $fileVar are set (but are exclusive)"
+        exit 1
+    fi
+    if [ -n "${varValue}" ]; then
+        export "$var"="${varValue}"
+    elif [ -n "${fileVarValue}" ]; then
+        export "$var"="$(cat "${fileVarValue}")"
+    elif [ -n "${def}" ]; then
+        export "$var"="$def"
+    fi
+    unset "$fileVar"
+}
+
+# Add docker secrets support for the variables below:
+file_env APP_KEY
+file_env DB_HOST
+file_env DB_PORT
+file_env DB_DATABASE
+file_env DB_USERNAME
+file_env DB_PASSWORD
+file_env REDIS_HOST
+file_env REDIS_PASSWORD
+file_env REDIS_PORT
+file_env MAIL_HOST
+file_env MAIL_PORT
+file_env MAIL_USERNAME
+file_env MAIL_PASSWORD
+
+# fix key if needed
+if [ -z "$APP_KEY" -a -z "$APP_KEY_FILE" ]
+then
+  echo "Please re-run this container with an environment variable \$APP_KEY"
+  echo "An example APP_KEY you could use is: "
+  php artisan key:generate --show
+  exit
+fi
+
+#if [ ! -f /var/lib/snipeit/ssl/snipeit-ssl.crt -o ! -f /var/lib/snipeit/ssl/snipeit-ssl.key ]
+#then
+ # rm /etc/apache2/conf.d/ssl.conf && rm /etc/apache2/conf.d/default-ssl.conf
+#fi
+
+# create data directories
+for dir in \
+  'data/private_uploads' \
+  'data/uploads/accessories' \
+  'data/uploads/avatars' \
+  'data/uploads/barcodes' \
+  'data/uploads/categories' \
+  'data/uploads/companies' \
+  'data/uploads/components' \
+  'data/uploads/consumables' \
+  'data/uploads/departments' \
+  'data/uploads/locations' \
+  'data/uploads/manufacturers' \
+  'data/uploads/models' \
+  'data/uploads/suppliers' \
+  'dumps' \
+  'keys'
+do
+  [ ! -d "/var/lib/snipeit/$dir" ] && mkdir -p "/var/lib/snipeit/$dir"
+done
+
+chown -R apache:root /var/lib/snipeit/data/*
+chown -R apache:root /var/lib/snipeit/dumps
+chown -R apache:root /var/lib/snipeit/keys
+chown -R apache:root /var/www/html/storage/framework/cache
+
+# Fix php settings
+if [ ! -z "${PHP_UPLOAD_LIMIT}" ]
+then
+    find /etc -type f -name php.ini | while IFS= read -r ini; do
+        echo "Changing upload limit to ${PHP_UPLOAD_LIMIT}M in $ini"
+        sed -i \
+            -e "s/^;\? *upload_max_filesize *=.*/upload_max_filesize = ${PHP_UPLOAD_LIMIT}M/" \
+            -e "s/^;\? *post_max_size *=.*/post_max_size = ${PHP_UPLOAD_LIMIT}M/" \
+            "$ini"
+    done
+fi
+
+# If the Oauth DB files are not present copy the vendor files over to the db migrations
+if [ ! -f "/var/www/html/database/migrations/*create_oauth*" ]
+then
+  cp -a /var/www/html/vendor/laravel/passport/database/migrations/* /var/www/html/database/migrations/
+fi
+
+if [ "${SESSION_DRIVER}" == "database" ]
+then
+  cp -a /var/www/html/vendor/laravel/framework/src/Illuminate/Session/Console/stubs/database.stub /var/www/html/database/migrations/2021_05_06_0000_create_sessions_table.php
+fi
+
+php artisan migrate --force
+php artisan config:clear
+php artisan config:cache
+
+touch /var/www/html/storage/logs/laravel.log
+chown -R apache:root /var/www/html/storage/logs/laravel.log
+
+export APACHE_LOG_DIR=/var/log/apache2
+exec httpd -DNO_DETACH < /dev/null
diff --git a/docker/docker-entrypoint.sh b/docker/startup_alpine_fpm.sh
similarity index 97%
rename from docker/docker-entrypoint.sh
rename to docker/startup_alpine_fpm.sh
index 3b783419eb..981d8bb4f8 100755
--- a/docker/docker-entrypoint.sh
+++ b/docker/startup_alpine_fpm.sh
@@ -99,10 +99,7 @@ then
   cp -a /var/www/html/vendor/laravel/passport/database/migrations/* /var/www/html/database/migrations/
 fi
 
-# Create laravel log file
-touch /var/www/html/storage/logs/laravel.log
 # Add correct permissions for files and directories
-chown www-data:www-data /var/www/html/storage/logs/laravel.log
 chown -R www-data:www-data \
   /var/lib/snipeit/data \
   /var/lib/snipeit/dumps \
@@ -114,6 +111,11 @@ php artisan migrate --force
 php artisan config:clear
 php artisan config:cache
 
+# Create laravel log file
+touch /var/www/html/storage/logs/laravel.log
+# ensure it's owned by www:data in case it was created by root
+chown www-data:www-data /var/www/html/storage/logs/laravel.log
+
 echo [INFO docker entrypoint] End script execution
 
-exec "$@" 
\ No newline at end of file
+exec "$@"
diff --git a/install.sh b/install.sh
index 160c8c2ee1..601816ea5a 100755
--- a/install.sh
+++ b/install.sh
@@ -8,6 +8,6 @@ if [ "$(id -u)" != "0" ]; then
     fi
 fi
 
-wget https://raw.githubusercontent.com/snipe/snipe-it/master/snipeit.sh
+wget https://raw.githubusercontent.com/grokability/snipe-it/master/snipeit.sh
 chmod 744 snipeit.sh
-./snipeit.sh 2>&1 | tee -a /var/log/snipeit-install.log
\ No newline at end of file
+./snipeit.sh 2>&1 | tee -a /var/log/snipeit-install.log
diff --git a/pa11y.js b/pa11y.js
new file mode 100644
index 0000000000..4d5a1dbba9
--- /dev/null
+++ b/pa11y.js
@@ -0,0 +1,24 @@
+const pa11y = require('pa11y');
+
+pa11y('http://snipe-it.test', {
+    standard: "WCAG2AA",
+    level: "error",
+    defaults: {
+        "timeout": 500000,
+        "wait": 2000,
+        "ignore": [
+            "WCAG2AA.Principle1.Guideline1_4.1_4_3.G18",
+            "WCAG2AA.Principle1.Guideline1_4.1_4_3.G18.Fail",
+        ],
+        "viewport": {
+            "width": 1280,
+            "height": 1024
+        },
+    },
+    actions: [
+        'set field #username to admin',
+        'set field #password to password',
+        'click element #submit',
+        'wait for path to be /',
+    ]
+});
\ No newline at end of file
diff --git a/package-lock.json b/package-lock.json
index f8eddcc97b..8b6219adaa 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -5,8 +5,8 @@
     "packages": {
         "": {
             "dependencies": {
-                "@fortawesome/fontawesome-free": "^6.5.2",
-                "acorn": "^8.11.2",
+                "@fortawesome/fontawesome-free": "^6.7.2",
+                "acorn": "^8.14.1",
                 "acorn-import-assertions": "^1.9.0",
                 "admin-lte": "^2.4.18",
                 "ajv": "^6.12.6",
@@ -15,28 +15,29 @@
                 "bootstrap-colorpicker": "^2.5.3",
                 "bootstrap-datepicker": "^1.10.0",
                 "bootstrap-less": "^3.3.8",
-                "bootstrap-table": "1.22.5",
+                "bootstrap-table": "1.24.1",
+                "canvas-confetti": "^1.9.3",
                 "chart.js": "^2.9.4",
                 "clipboard": "^2.0.11",
                 "css-loader": "^5.0.0",
                 "ekko-lightbox": "^5.1.1",
                 "imagemin": "^8.0.1",
                 "jquery-slimscroll": "^1.3.8",
-                "jquery-ui": "^1.13.3",
-                "jquery-validation": "^1.20.0",
+                "jquery-ui": "^1.14.1",
+                "jquery-validation": "^1.21.0",
                 "jquery.iframe-transport": "^1.0.0",
-                "jspdf-autotable": "^3.8.2",
-                "less": "^4.2.0",
+                "jspdf-autotable": "^3.8.4",
+                "less": "^4.2.2",
                 "less-loader": "^6.0",
                 "list.js": "^1.5.0",
                 "morris.js": "github:morrisjs/morris.js",
-                "papaparse": "5.4.1",
+                "papaparse": "5.5.2",
                 "select2": "4.0.13",
                 "sheetjs": "^2.0.0",
                 "signature_pad": "^4.2.0",
-                "tableexport.jquery.plugin": "1.30.0",
+                "tableexport.jquery.plugin": "1.32.0",
                 "tether": "^1.4.0",
-                "webpack": "^5.90.2"
+                "webpack": "^5.98.0"
             },
             "devDependencies": {
                 "all-contributors-cli": "^6.26.1",
@@ -1918,9 +1919,9 @@
             }
         },
         "node_modules/@fortawesome/fontawesome-free": {
-            "version": "6.5.2",
-            "hasInstallScript": true,
-            "license": "(CC-BY-4.0 AND OFL-1.1 AND MIT)",
+            "version": "6.7.2",
+            "resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-free/-/fontawesome-free-6.7.2.tgz",
+            "integrity": "sha512-JUOtgFW6k9u4Y+xeIaEiLr3+cjoUPiAuLXoyKOJSia6Duzb7pq+A76P9ZdPDoAoxHdHzq6gE9/jKBGXlZT8FbA==",
             "engines": {
                 "node": ">=6"
             }
@@ -2105,8 +2106,9 @@
             }
         },
         "node_modules/@types/eslint": {
-            "version": "8.56.10",
-            "license": "MIT",
+            "version": "9.6.1",
+            "resolved": "https://registry.npmjs.org/@types/eslint/-/eslint-9.6.1.tgz",
+            "integrity": "sha512-FXx2pKgId/WyYo2jXw63kk7/+TY7u7AziEJxJAnSFzHlqTAS3Ync6SvgYAN/k4/PQpnnVuzoMuVnByKK2qp0ag==",
             "dependencies": {
                 "@types/estree": "*",
                 "@types/json-schema": "*"
@@ -2114,15 +2116,17 @@
         },
         "node_modules/@types/eslint-scope": {
             "version": "3.7.7",
-            "license": "MIT",
+            "resolved": "https://registry.npmjs.org/@types/eslint-scope/-/eslint-scope-3.7.7.tgz",
+            "integrity": "sha512-MzMFlSLBqNF2gcHWO0G1vP/YQyfvrxZ0bF+u7mzUdZ1/xK4A4sru+nraZz5i3iEIk1l1uyicaDVTB4QbbEkAYg==",
             "dependencies": {
                 "@types/eslint": "*",
                 "@types/estree": "*"
             }
         },
         "node_modules/@types/estree": {
-            "version": "1.0.5",
-            "license": "MIT"
+            "version": "1.0.6",
+            "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.6.tgz",
+            "integrity": "sha512-AYnb1nQyY49te+VRAVgmzfcgjYS91mY5P0TKUDCLEM+gNnA+3T6rWITXRLYCpahpqSQbN5cE+gHpnPyXjHWxcw=="
         },
         "node_modules/@types/express": {
             "version": "4.17.21",
@@ -2312,118 +2316,133 @@
             }
         },
         "node_modules/@webassemblyjs/ast": {
-            "version": "1.12.1",
-            "license": "MIT",
+            "version": "1.14.1",
+            "resolved": "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.14.1.tgz",
+            "integrity": "sha512-nuBEDgQfm1ccRp/8bCQrx1frohyufl4JlbMMZ4P1wpeOfDhF6FQkxZJ1b/e+PLwr6X1Nhw6OLme5usuBWYBvuQ==",
             "dependencies": {
-                "@webassemblyjs/helper-numbers": "1.11.6",
-                "@webassemblyjs/helper-wasm-bytecode": "1.11.6"
+                "@webassemblyjs/helper-numbers": "1.13.2",
+                "@webassemblyjs/helper-wasm-bytecode": "1.13.2"
             }
         },
         "node_modules/@webassemblyjs/floating-point-hex-parser": {
-            "version": "1.11.6",
-            "license": "MIT"
+            "version": "1.13.2",
+            "resolved": "https://registry.npmjs.org/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.13.2.tgz",
+            "integrity": "sha512-6oXyTOzbKxGH4steLbLNOu71Oj+C8Lg34n6CqRvqfS2O71BxY6ByfMDRhBytzknj9yGUPVJ1qIKhRlAwO1AovA=="
         },
         "node_modules/@webassemblyjs/helper-api-error": {
-            "version": "1.11.6",
-            "license": "MIT"
+            "version": "1.13.2",
+            "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-api-error/-/helper-api-error-1.13.2.tgz",
+            "integrity": "sha512-U56GMYxy4ZQCbDZd6JuvvNV/WFildOjsaWD3Tzzvmw/mas3cXzRJPMjP83JqEsgSbyrmaGjBfDtV7KDXV9UzFQ=="
         },
         "node_modules/@webassemblyjs/helper-buffer": {
-            "version": "1.12.1",
-            "license": "MIT"
+            "version": "1.14.1",
+            "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-buffer/-/helper-buffer-1.14.1.tgz",
+            "integrity": "sha512-jyH7wtcHiKssDtFPRB+iQdxlDf96m0E39yb0k5uJVhFGleZFoNw1c4aeIcVUPPbXUVJ94wwnMOAqUHyzoEPVMA=="
         },
         "node_modules/@webassemblyjs/helper-numbers": {
-            "version": "1.11.6",
-            "license": "MIT",
+            "version": "1.13.2",
+            "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-numbers/-/helper-numbers-1.13.2.tgz",
+            "integrity": "sha512-FE8aCmS5Q6eQYcV3gI35O4J789wlQA+7JrqTTpJqn5emA4U2hvwJmvFRC0HODS+3Ye6WioDklgd6scJ3+PLnEA==",
             "dependencies": {
-                "@webassemblyjs/floating-point-hex-parser": "1.11.6",
-                "@webassemblyjs/helper-api-error": "1.11.6",
+                "@webassemblyjs/floating-point-hex-parser": "1.13.2",
+                "@webassemblyjs/helper-api-error": "1.13.2",
                 "@xtuc/long": "4.2.2"
             }
         },
         "node_modules/@webassemblyjs/helper-wasm-bytecode": {
-            "version": "1.11.6",
-            "license": "MIT"
+            "version": "1.13.2",
+            "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.13.2.tgz",
+            "integrity": "sha512-3QbLKy93F0EAIXLh0ogEVR6rOubA9AoZ+WRYhNbFyuB70j3dRdwH9g+qXhLAO0kiYGlg3TxDV+I4rQTr/YNXkA=="
         },
         "node_modules/@webassemblyjs/helper-wasm-section": {
-            "version": "1.12.1",
-            "license": "MIT",
+            "version": "1.14.1",
+            "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.14.1.tgz",
+            "integrity": "sha512-ds5mXEqTJ6oxRoqjhWDU83OgzAYjwsCV8Lo/N+oRsNDmx/ZDpqalmrtgOMkHwxsG0iI//3BwWAErYRHtgn0dZw==",
             "dependencies": {
-                "@webassemblyjs/ast": "1.12.1",
-                "@webassemblyjs/helper-buffer": "1.12.1",
-                "@webassemblyjs/helper-wasm-bytecode": "1.11.6",
-                "@webassemblyjs/wasm-gen": "1.12.1"
+                "@webassemblyjs/ast": "1.14.1",
+                "@webassemblyjs/helper-buffer": "1.14.1",
+                "@webassemblyjs/helper-wasm-bytecode": "1.13.2",
+                "@webassemblyjs/wasm-gen": "1.14.1"
             }
         },
         "node_modules/@webassemblyjs/ieee754": {
-            "version": "1.11.6",
-            "license": "MIT",
+            "version": "1.13.2",
+            "resolved": "https://registry.npmjs.org/@webassemblyjs/ieee754/-/ieee754-1.13.2.tgz",
+            "integrity": "sha512-4LtOzh58S/5lX4ITKxnAK2USuNEvpdVV9AlgGQb8rJDHaLeHciwG4zlGr0j/SNWlr7x3vO1lDEsuePvtcDNCkw==",
             "dependencies": {
                 "@xtuc/ieee754": "^1.2.0"
             }
         },
         "node_modules/@webassemblyjs/leb128": {
-            "version": "1.11.6",
-            "license": "Apache-2.0",
+            "version": "1.13.2",
+            "resolved": "https://registry.npmjs.org/@webassemblyjs/leb128/-/leb128-1.13.2.tgz",
+            "integrity": "sha512-Lde1oNoIdzVzdkNEAWZ1dZ5orIbff80YPdHx20mrHwHrVNNTjNr8E3xz9BdpcGqRQbAEa+fkrCb+fRFTl/6sQw==",
             "dependencies": {
                 "@xtuc/long": "4.2.2"
             }
         },
         "node_modules/@webassemblyjs/utf8": {
-            "version": "1.11.6",
-            "license": "MIT"
+            "version": "1.13.2",
+            "resolved": "https://registry.npmjs.org/@webassemblyjs/utf8/-/utf8-1.13.2.tgz",
+            "integrity": "sha512-3NQWGjKTASY1xV5m7Hr0iPeXD9+RDobLll3T9d2AO+g3my8xy5peVyjSag4I50mR1bBSN/Ct12lo+R9tJk0NZQ=="
         },
         "node_modules/@webassemblyjs/wasm-edit": {
-            "version": "1.12.1",
-            "license": "MIT",
+            "version": "1.14.1",
+            "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-edit/-/wasm-edit-1.14.1.tgz",
+            "integrity": "sha512-RNJUIQH/J8iA/1NzlE4N7KtyZNHi3w7at7hDjvRNm5rcUXa00z1vRz3glZoULfJ5mpvYhLybmVcwcjGrC1pRrQ==",
             "dependencies": {
-                "@webassemblyjs/ast": "1.12.1",
-                "@webassemblyjs/helper-buffer": "1.12.1",
-                "@webassemblyjs/helper-wasm-bytecode": "1.11.6",
-                "@webassemblyjs/helper-wasm-section": "1.12.1",
-                "@webassemblyjs/wasm-gen": "1.12.1",
-                "@webassemblyjs/wasm-opt": "1.12.1",
-                "@webassemblyjs/wasm-parser": "1.12.1",
-                "@webassemblyjs/wast-printer": "1.12.1"
+                "@webassemblyjs/ast": "1.14.1",
+                "@webassemblyjs/helper-buffer": "1.14.1",
+                "@webassemblyjs/helper-wasm-bytecode": "1.13.2",
+                "@webassemblyjs/helper-wasm-section": "1.14.1",
+                "@webassemblyjs/wasm-gen": "1.14.1",
+                "@webassemblyjs/wasm-opt": "1.14.1",
+                "@webassemblyjs/wasm-parser": "1.14.1",
+                "@webassemblyjs/wast-printer": "1.14.1"
             }
         },
         "node_modules/@webassemblyjs/wasm-gen": {
-            "version": "1.12.1",
-            "license": "MIT",
+            "version": "1.14.1",
+            "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-gen/-/wasm-gen-1.14.1.tgz",
+            "integrity": "sha512-AmomSIjP8ZbfGQhumkNvgC33AY7qtMCXnN6bL2u2Js4gVCg8fp735aEiMSBbDR7UQIj90n4wKAFUSEd0QN2Ukg==",
             "dependencies": {
-                "@webassemblyjs/ast": "1.12.1",
-                "@webassemblyjs/helper-wasm-bytecode": "1.11.6",
-                "@webassemblyjs/ieee754": "1.11.6",
-                "@webassemblyjs/leb128": "1.11.6",
-                "@webassemblyjs/utf8": "1.11.6"
+                "@webassemblyjs/ast": "1.14.1",
+                "@webassemblyjs/helper-wasm-bytecode": "1.13.2",
+                "@webassemblyjs/ieee754": "1.13.2",
+                "@webassemblyjs/leb128": "1.13.2",
+                "@webassemblyjs/utf8": "1.13.2"
             }
         },
         "node_modules/@webassemblyjs/wasm-opt": {
-            "version": "1.12.1",
-            "license": "MIT",
+            "version": "1.14.1",
+            "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-opt/-/wasm-opt-1.14.1.tgz",
+            "integrity": "sha512-PTcKLUNvBqnY2U6E5bdOQcSM+oVP/PmrDY9NzowJjislEjwP/C4an2303MCVS2Mg9d3AJpIGdUFIQQWbPds0Sw==",
             "dependencies": {
-                "@webassemblyjs/ast": "1.12.1",
-                "@webassemblyjs/helper-buffer": "1.12.1",
-                "@webassemblyjs/wasm-gen": "1.12.1",
-                "@webassemblyjs/wasm-parser": "1.12.1"
+                "@webassemblyjs/ast": "1.14.1",
+                "@webassemblyjs/helper-buffer": "1.14.1",
+                "@webassemblyjs/wasm-gen": "1.14.1",
+                "@webassemblyjs/wasm-parser": "1.14.1"
             }
         },
         "node_modules/@webassemblyjs/wasm-parser": {
-            "version": "1.12.1",
-            "license": "MIT",
+            "version": "1.14.1",
+            "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-parser/-/wasm-parser-1.14.1.tgz",
+            "integrity": "sha512-JLBl+KZ0R5qB7mCnud/yyX08jWFw5MsoalJ1pQ4EdFlgj9VdXKGuENGsiCIjegI1W7p91rUlcB/LB5yRJKNTcQ==",
             "dependencies": {
-                "@webassemblyjs/ast": "1.12.1",
-                "@webassemblyjs/helper-api-error": "1.11.6",
-                "@webassemblyjs/helper-wasm-bytecode": "1.11.6",
-                "@webassemblyjs/ieee754": "1.11.6",
-                "@webassemblyjs/leb128": "1.11.6",
-                "@webassemblyjs/utf8": "1.11.6"
+                "@webassemblyjs/ast": "1.14.1",
+                "@webassemblyjs/helper-api-error": "1.13.2",
+                "@webassemblyjs/helper-wasm-bytecode": "1.13.2",
+                "@webassemblyjs/ieee754": "1.13.2",
+                "@webassemblyjs/leb128": "1.13.2",
+                "@webassemblyjs/utf8": "1.13.2"
             }
         },
         "node_modules/@webassemblyjs/wast-printer": {
-            "version": "1.12.1",
-            "license": "MIT",
+            "version": "1.14.1",
+            "resolved": "https://registry.npmjs.org/@webassemblyjs/wast-printer/-/wast-printer-1.14.1.tgz",
+            "integrity": "sha512-kPSSXE6De1XOR820C90RIo2ogvZG+c3KiHzqUoO/F34Y2shGzesfqv7o57xrxovZJH/MetF5UjroJ/R/3isoiw==",
             "dependencies": {
-                "@webassemblyjs/ast": "1.12.1",
+                "@webassemblyjs/ast": "1.14.1",
                 "@xtuc/long": "4.2.2"
             }
         },
@@ -2462,11 +2481,13 @@
         },
         "node_modules/@xtuc/ieee754": {
             "version": "1.2.0",
-            "license": "BSD-3-Clause"
+            "resolved": "https://registry.npmjs.org/@xtuc/ieee754/-/ieee754-1.2.0.tgz",
+            "integrity": "sha512-DX8nKgqcGwsc0eJSqYt5lwP4DH5FlHnmuWWBRy7X0NcaGR0ZtuyeESgMwTYVEtxmsNGY+qit4QYT/MIYTOTPeA=="
         },
         "node_modules/@xtuc/long": {
             "version": "4.2.2",
-            "license": "Apache-2.0"
+            "resolved": "https://registry.npmjs.org/@xtuc/long/-/long-4.2.2.tgz",
+            "integrity": "sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ=="
         },
         "node_modules/accepts": {
             "version": "1.3.8",
@@ -2481,8 +2502,9 @@
             }
         },
         "node_modules/acorn": {
-            "version": "8.11.3",
-            "license": "MIT",
+            "version": "8.14.1",
+            "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.14.1.tgz",
+            "integrity": "sha512-OvQ/2pUDKmgfCg++xsTX1wGxfTaszcHVcTctW4UJB4hibJx2HXxxO5UmVgyjMa+ZDsiaf5wWLXYpRWMmBI0QHg==",
             "bin": {
                 "acorn": "bin/acorn"
             },
@@ -2583,7 +2605,6 @@
         },
         "node_modules/ajv-formats": {
             "version": "2.1.1",
-            "dev": true,
             "license": "MIT",
             "dependencies": {
                 "ajv": "^8.0.0"
@@ -2599,7 +2620,6 @@
         },
         "node_modules/ajv-formats/node_modules/ajv": {
             "version": "8.13.0",
-            "dev": true,
             "license": "MIT",
             "dependencies": {
                 "fast-deep-equal": "^3.1.3",
@@ -2614,7 +2634,6 @@
         },
         "node_modules/ajv-formats/node_modules/json-schema-traverse": {
             "version": "1.0.0",
-            "dev": true,
             "license": "MIT"
         },
         "node_modules/ajv-keywords": {
@@ -3683,9 +3702,9 @@
             "license": "MIT"
         },
         "node_modules/bootstrap-table": {
-            "version": "1.22.5",
-            "resolved": "https://registry.npmjs.org/bootstrap-table/-/bootstrap-table-1.22.5.tgz",
-            "integrity": "sha512-iaQBfZzNuMRVughNYdonPGvgL6A7xfsruqYKaSuDuUWqQDTt8WvTBVwV61XiDv2aks7RaAQoZhoi2jo9nF6U7w==",
+            "version": "1.24.1",
+            "resolved": "https://registry.npmjs.org/bootstrap-table/-/bootstrap-table-1.24.1.tgz",
+            "integrity": "sha512-que7o2Z6R0I3cfwfm6qg4XnoUK9A/8162HUErFYg3fGtzjk5OjLJx6Ji9p3oKz+IAIVvBCr9sqMqujEG47k3zA==",
             "peerDependencies": {
                 "jquery": "3"
             }
@@ -3945,7 +3964,9 @@
             }
         },
         "node_modules/browserslist": {
-            "version": "4.23.0",
+            "version": "4.24.2",
+            "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.24.2.tgz",
+            "integrity": "sha512-ZIc+Q62revdMcqC6aChtW4jz3My3klmCO1fEmINZY/8J3EpBg5/A/D0AKmBveUh6pgoeycoMkVMko84tuYS+Gg==",
             "funding": [
                 {
                     "type": "opencollective",
@@ -3960,12 +3981,11 @@
                     "url": "https://github.com/sponsors/ai"
                 }
             ],
-            "license": "MIT",
             "dependencies": {
-                "caniuse-lite": "^1.0.30001587",
-                "electron-to-chromium": "^1.4.668",
-                "node-releases": "^2.0.14",
-                "update-browserslist-db": "^1.0.13"
+                "caniuse-lite": "^1.0.30001669",
+                "electron-to-chromium": "^1.5.41",
+                "node-releases": "^2.0.18",
+                "update-browserslist-db": "^1.1.1"
             },
             "bin": {
                 "browserslist": "cli.js"
@@ -4072,7 +4092,9 @@
             }
         },
         "node_modules/caniuse-lite": {
-            "version": "1.0.30001616",
+            "version": "1.0.30001677",
+            "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001677.tgz",
+            "integrity": "sha512-fmfjsOlJUpMWu+mAAtZZZHz7UEwsUxIIvu1TJfO1HqFQvB/B+ii0xr9B5HpbZY/mC4XZ8SvjHJqtAY6pDPQEog==",
             "funding": [
                 {
                     "type": "opencollective",
@@ -4086,8 +4108,16 @@
                     "type": "github",
                     "url": "https://github.com/sponsors/ai"
                 }
-            ],
-            "license": "CC-BY-4.0"
+            ]
+        },
+        "node_modules/canvas-confetti": {
+            "version": "1.9.3",
+            "resolved": "https://registry.npmjs.org/canvas-confetti/-/canvas-confetti-1.9.3.tgz",
+            "integrity": "sha512-rFfTURMvmVEX1gyXFgn5QMn81bYk70qa0HLzcIOSVEyl57n6o9ItHeBtUSWdvKAPY0xlvBHno4/v3QPrT83q9g==",
+            "funding": {
+                "type": "donate",
+                "url": "https://www.paypal.me/kirilvatev"
+            }
         },
         "node_modules/canvg": {
             "version": "3.0.10",
@@ -5250,8 +5280,9 @@
             "license": "MIT"
         },
         "node_modules/electron-to-chromium": {
-            "version": "1.4.756",
-            "license": "ISC"
+            "version": "1.5.52",
+            "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.52.tgz",
+            "integrity": "sha512-xtoijJTZ+qeucLBDNztDOuQBE1ksqjvNjvqFoST3nGC7fSpqJ+X6BdTBaY5BHG+IhWWmpc6b/KfpeuEDupEPOQ=="
         },
         "node_modules/elliptic": {
             "version": "6.5.5",
@@ -5291,8 +5322,9 @@
             }
         },
         "node_modules/enhanced-resolve": {
-            "version": "5.16.0",
-            "license": "MIT",
+            "version": "5.17.1",
+            "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.17.1.tgz",
+            "integrity": "sha512-LMHl3dXhTcfv8gM4kEzIUeTQ+7fpdA0l2tUf34BddXPkz2A5xJ5L/Pchd5BL6rdccM9QGvu0sWZzK1Z1t4wwyg==",
             "dependencies": {
                 "graceful-fs": "^4.2.4",
                 "tapable": "^2.2.0"
@@ -5383,8 +5415,9 @@
             "license": "MIT"
         },
         "node_modules/escalade": {
-            "version": "3.1.2",
-            "license": "MIT",
+            "version": "3.2.0",
+            "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.2.0.tgz",
+            "integrity": "sha512-WUj2qlxaQtO4g6Pq5c29GTcWGDyd8itL8zTlipgECz3JesAiiOKotd8JU6otB3PACgG6xkJUyVhboMS+bje/jA==",
             "engines": {
                 "node": ">=6"
             }
@@ -5592,6 +5625,21 @@
             "version": "2.1.1",
             "license": "MIT"
         },
+        "node_modules/fast-uri": {
+            "version": "3.0.6",
+            "resolved": "https://registry.npmjs.org/fast-uri/-/fast-uri-3.0.6.tgz",
+            "integrity": "sha512-Atfo14OibSv5wAp4VWNsFYE1AchQRTv9cBGWET4pZWHzYshFSS9NQI6I57rdKn9croWVMbYFbLhJ+yJvmZIIHw==",
+            "funding": [
+                {
+                    "type": "github",
+                    "url": "https://github.com/sponsors/fastify"
+                },
+                {
+                    "type": "opencollective",
+                    "url": "https://opencollective.com/fastify"
+                }
+            ]
+        },
         "node_modules/fastclick": {
             "version": "1.0.6"
         },
@@ -7047,15 +7095,17 @@
             "license": "BSD-2-Clause"
         },
         "node_modules/jquery-ui": {
-            "version": "1.13.3",
-            "license": "MIT",
+            "version": "1.14.1",
+            "resolved": "https://registry.npmjs.org/jquery-ui/-/jquery-ui-1.14.1.tgz",
+            "integrity": "sha512-DhzsYH8VeIvOaxwi+B/2BCsFFT5EGjShdzOcm5DssWjtcpGWIMsn66rJciDA6jBruzNiLf1q0KvwMoX1uGNvnQ==",
             "dependencies": {
-                "jquery": ">=1.8.0 <4.0.0"
+                "jquery": ">=1.12.0 <5.0.0"
             }
         },
         "node_modules/jquery-validation": {
-            "version": "1.20.0",
-            "license": "MIT",
+            "version": "1.21.0",
+            "resolved": "https://registry.npmjs.org/jquery-validation/-/jquery-validation-1.21.0.tgz",
+            "integrity": "sha512-xNot0rlUIgu7duMcQ5qb6MGkGL/Z1PQaRJQoZAURW9+a/2PGOUxY36o/WyNeP2T9R6jvWB8Z9lUVvvQWI/Zs5w==",
             "peerDependencies": {
                 "jquery": "^1.7 || ^2.0 || ^3.1"
             }
@@ -7160,8 +7210,9 @@
             }
         },
         "node_modules/jspdf-autotable": {
-            "version": "3.8.2",
-            "license": "MIT",
+            "version": "3.8.4",
+            "resolved": "https://registry.npmjs.org/jspdf-autotable/-/jspdf-autotable-3.8.4.tgz",
+            "integrity": "sha512-rSffGoBsJYX83iTRv8Ft7FhqfgEL2nLpGAIiqruEQQ3e4r0qdLFbPUB7N9HAle0I3XgpisvyW751VHCqKUVOgQ==",
             "peerDependencies": {
                 "jspdf": "^2.5.1"
             }
@@ -7429,8 +7480,9 @@
             }
         },
         "node_modules/less": {
-            "version": "4.2.0",
-            "license": "Apache-2.0",
+            "version": "4.2.2",
+            "resolved": "https://registry.npmjs.org/less/-/less-4.2.2.tgz",
+            "integrity": "sha512-tkuLHQlvWUTeQ3doAqnHbNn8T6WX1KA8yvbKG9x4VtKtIjHsVKQZCH11zRgAfbDAXC2UNIg/K9BYAAcEzUIrNg==",
             "dependencies": {
                 "copy-anything": "^2.0.1",
                 "parse-node-version": "^1.0.1",
@@ -8089,8 +8141,9 @@
             }
         },
         "node_modules/node-releases": {
-            "version": "2.0.14",
-            "license": "MIT"
+            "version": "2.0.18",
+            "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.18.tgz",
+            "integrity": "sha512-d9VeXT4SJ7ZeOqGX6R5EM022wpL+eWPooLI+5UpWn2jCT1aosUQEhQP214x33Wkwx3JQMvIm+tIoVOdodFS40g=="
         },
         "node_modules/normalize-path": {
             "version": "3.0.0",
@@ -8327,9 +8380,9 @@
             "license": "(MIT AND Zlib)"
         },
         "node_modules/papaparse": {
-            "version": "5.4.1",
-            "resolved": "https://registry.npmjs.org/papaparse/-/papaparse-5.4.1.tgz",
-            "integrity": "sha512-HipMsgJkZu8br23pW15uvo6sib6wne/4woLZPlFf3rpDyMe9ywEXUsuD7+6K9PRkJlVT51j/sCOYDKGGS3ZJrw=="
+            "version": "5.5.2",
+            "resolved": "https://registry.npmjs.org/papaparse/-/papaparse-5.5.2.tgz",
+            "integrity": "sha512-PZXg8UuAc4PcVwLosEEDYjPyfWnTEhOrUfdv+3Bx+NuAb+5NhDmXzg5fHWmdCh1mP5p7JAZfFr3IMQfcntNAdA=="
         },
         "node_modules/param-case": {
             "version": "3.0.4",
@@ -8541,8 +8594,9 @@
             "optional": true
         },
         "node_modules/picocolors": {
-            "version": "1.0.0",
-            "license": "ISC"
+            "version": "1.1.1",
+            "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.1.1.tgz",
+            "integrity": "sha512-xceH2snhtb5M9liqDsmEw56le376mTZkEX/jEb/RxNFyegNul7eNslCXP9FDj/Lcu0X8KEyMceP2ntpaHrDEVA=="
         },
         "node_modules/picomatch": {
             "version": "2.3.1",
@@ -9478,7 +9532,6 @@
         },
         "node_modules/require-from-string": {
             "version": "2.0.2",
-            "dev": true,
             "license": "MIT",
             "engines": {
                 "node": ">=0.10.0"
@@ -10381,8 +10434,9 @@
             }
         },
         "node_modules/tableexport.jquery.plugin": {
-            "version": "1.30.0",
-            "license": "MIT",
+            "version": "1.32.0",
+            "resolved": "https://registry.npmjs.org/tableexport.jquery.plugin/-/tableexport.jquery.plugin-1.32.0.tgz",
+            "integrity": "sha512-TiZpNFzazMv+gipe9u2JHgBL0guh/kloZDBA0vayWZp35nOSZkIq9XrqjxLc8oX57r7JP58QcM6qEfAgI3xEqw==",
             "dependencies": {
                 "file-saver": ">=2.0.4",
                 "html2canvas": ">=1.0.0",
@@ -10394,14 +10448,16 @@
         },
         "node_modules/tapable": {
             "version": "2.2.1",
-            "license": "MIT",
+            "resolved": "https://registry.npmjs.org/tapable/-/tapable-2.2.1.tgz",
+            "integrity": "sha512-GNzQvQTOIP6RyTfE2Qxb8ZVlNmw0n88vp1szwWRimP02mnTsx3Wtn5qRdqY9w2XduFNUgvOwhNnQsjwCp+kqaQ==",
             "engines": {
                 "node": ">=6"
             }
         },
         "node_modules/terser": {
-            "version": "5.31.0",
-            "license": "BSD-2-Clause",
+            "version": "5.39.0",
+            "resolved": "https://registry.npmjs.org/terser/-/terser-5.39.0.tgz",
+            "integrity": "sha512-LBAhFyLho16harJoWMg/nZsQYgTrg5jXOn2nCYjRUcZZEdE3qa2zb8QEDRUGVZBW4rlazf2fxkg8tztybTaqWw==",
             "dependencies": {
                 "@jridgewell/source-map": "^0.3.3",
                 "acorn": "^8.8.2",
@@ -10416,14 +10472,15 @@
             }
         },
         "node_modules/terser-webpack-plugin": {
-            "version": "5.3.10",
-            "license": "MIT",
+            "version": "5.3.14",
+            "resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-5.3.14.tgz",
+            "integrity": "sha512-vkZjpUjb6OMS7dhV+tILUW6BhpDR7P2L/aQSAv+Uwk+m8KATX9EccViHTJR2qDtACKPIYndLGCyl3FMo+r2LMw==",
             "dependencies": {
-                "@jridgewell/trace-mapping": "^0.3.20",
+                "@jridgewell/trace-mapping": "^0.3.25",
                 "jest-worker": "^27.4.5",
-                "schema-utils": "^3.1.1",
-                "serialize-javascript": "^6.0.1",
-                "terser": "^5.26.0"
+                "schema-utils": "^4.3.0",
+                "serialize-javascript": "^6.0.2",
+                "terser": "^5.31.1"
             },
             "engines": {
                 "node": ">= 10.13.0"
@@ -10447,6 +10504,55 @@
                 }
             }
         },
+        "node_modules/terser-webpack-plugin/node_modules/ajv": {
+            "version": "8.17.1",
+            "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.17.1.tgz",
+            "integrity": "sha512-B/gBuNg5SiMTrPkC+A2+cW0RszwxYmn6VYxB/inlBStS5nx6xHIt/ehKRhIMhqusl7a8LjQoZnjCs5vhwxOQ1g==",
+            "dependencies": {
+                "fast-deep-equal": "^3.1.3",
+                "fast-uri": "^3.0.1",
+                "json-schema-traverse": "^1.0.0",
+                "require-from-string": "^2.0.2"
+            },
+            "funding": {
+                "type": "github",
+                "url": "https://github.com/sponsors/epoberezkin"
+            }
+        },
+        "node_modules/terser-webpack-plugin/node_modules/ajv-keywords": {
+            "version": "5.1.0",
+            "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-5.1.0.tgz",
+            "integrity": "sha512-YCS/JNFAUyr5vAuhk1DWm1CBxRHW9LbJ2ozWeemrIqpbsqKjHVxYPyi5GC0rjZIT5JxJ3virVTS8wk4i/Z+krw==",
+            "dependencies": {
+                "fast-deep-equal": "^3.1.3"
+            },
+            "peerDependencies": {
+                "ajv": "^8.8.2"
+            }
+        },
+        "node_modules/terser-webpack-plugin/node_modules/json-schema-traverse": {
+            "version": "1.0.0",
+            "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",
+            "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug=="
+        },
+        "node_modules/terser-webpack-plugin/node_modules/schema-utils": {
+            "version": "4.3.0",
+            "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-4.3.0.tgz",
+            "integrity": "sha512-Gf9qqc58SpCA/xdziiHz35F4GNIWYWZrEshUc/G/r5BnLph6xpKuLeoJoQuj5WfBIx/eQLf+hmVPYHaxJu7V2g==",
+            "dependencies": {
+                "@types/json-schema": "^7.0.9",
+                "ajv": "^8.9.0",
+                "ajv-formats": "^2.1.1",
+                "ajv-keywords": "^5.1.0"
+            },
+            "engines": {
+                "node": ">= 10.13.0"
+            },
+            "funding": {
+                "type": "opencollective",
+                "url": "https://opencollective.com/webpack"
+            }
+        },
         "node_modules/terser/node_modules/commander": {
             "version": "2.20.3",
             "license": "MIT"
@@ -10694,7 +10800,9 @@
             }
         },
         "node_modules/update-browserslist-db": {
-            "version": "1.0.15",
+            "version": "1.1.1",
+            "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.1.1.tgz",
+            "integrity": "sha512-R8UzCaa9Az+38REPiJ1tXlImTJXlVfgHZsglwBD/k6nj76ctsH1E3q4doGrukiLQd3sGQYu56r5+lo5r94l29A==",
             "funding": [
                 {
                     "type": "opencollective",
@@ -10709,10 +10817,9 @@
                     "url": "https://github.com/sponsors/ai"
                 }
             ],
-            "license": "MIT",
             "dependencies": {
-                "escalade": "^3.1.2",
-                "picocolors": "^1.0.0"
+                "escalade": "^3.2.0",
+                "picocolors": "^1.1.0"
             },
             "bin": {
                 "update-browserslist-db": "cli.js"
@@ -10857,19 +10964,19 @@
             "license": "BSD-2-Clause"
         },
         "node_modules/webpack": {
-            "version": "5.91.0",
-            "license": "MIT",
+            "version": "5.98.0",
+            "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.98.0.tgz",
+            "integrity": "sha512-UFynvx+gM44Gv9qFgj0acCQK2VE1CtdfwFdimkapco3hlPCJ/zeq73n2yVKimVbtm+TnApIugGhLJnkU6gjYXA==",
             "dependencies": {
-                "@types/eslint-scope": "^3.7.3",
-                "@types/estree": "^1.0.5",
-                "@webassemblyjs/ast": "^1.12.1",
-                "@webassemblyjs/wasm-edit": "^1.12.1",
-                "@webassemblyjs/wasm-parser": "^1.12.1",
-                "acorn": "^8.7.1",
-                "acorn-import-assertions": "^1.9.0",
-                "browserslist": "^4.21.10",
+                "@types/eslint-scope": "^3.7.7",
+                "@types/estree": "^1.0.6",
+                "@webassemblyjs/ast": "^1.14.1",
+                "@webassemblyjs/wasm-edit": "^1.14.1",
+                "@webassemblyjs/wasm-parser": "^1.14.1",
+                "acorn": "^8.14.0",
+                "browserslist": "^4.24.0",
                 "chrome-trace-event": "^1.0.2",
-                "enhanced-resolve": "^5.16.0",
+                "enhanced-resolve": "^5.17.1",
                 "es-module-lexer": "^1.2.1",
                 "eslint-scope": "5.1.1",
                 "events": "^3.2.0",
@@ -10879,9 +10986,9 @@
                 "loader-runner": "^4.2.0",
                 "mime-types": "^2.1.27",
                 "neo-async": "^2.6.2",
-                "schema-utils": "^3.2.0",
+                "schema-utils": "^4.3.0",
                 "tapable": "^2.1.1",
-                "terser-webpack-plugin": "^5.3.10",
+                "terser-webpack-plugin": "^5.3.11",
                 "watchpack": "^2.4.1",
                 "webpack-sources": "^3.2.3"
             },
@@ -11164,6 +11271,55 @@
                 "source-map": "~0.6.1"
             }
         },
+        "node_modules/webpack/node_modules/ajv": {
+            "version": "8.17.1",
+            "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.17.1.tgz",
+            "integrity": "sha512-B/gBuNg5SiMTrPkC+A2+cW0RszwxYmn6VYxB/inlBStS5nx6xHIt/ehKRhIMhqusl7a8LjQoZnjCs5vhwxOQ1g==",
+            "dependencies": {
+                "fast-deep-equal": "^3.1.3",
+                "fast-uri": "^3.0.1",
+                "json-schema-traverse": "^1.0.0",
+                "require-from-string": "^2.0.2"
+            },
+            "funding": {
+                "type": "github",
+                "url": "https://github.com/sponsors/epoberezkin"
+            }
+        },
+        "node_modules/webpack/node_modules/ajv-keywords": {
+            "version": "5.1.0",
+            "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-5.1.0.tgz",
+            "integrity": "sha512-YCS/JNFAUyr5vAuhk1DWm1CBxRHW9LbJ2ozWeemrIqpbsqKjHVxYPyi5GC0rjZIT5JxJ3virVTS8wk4i/Z+krw==",
+            "dependencies": {
+                "fast-deep-equal": "^3.1.3"
+            },
+            "peerDependencies": {
+                "ajv": "^8.8.2"
+            }
+        },
+        "node_modules/webpack/node_modules/json-schema-traverse": {
+            "version": "1.0.0",
+            "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",
+            "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug=="
+        },
+        "node_modules/webpack/node_modules/schema-utils": {
+            "version": "4.3.0",
+            "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-4.3.0.tgz",
+            "integrity": "sha512-Gf9qqc58SpCA/xdziiHz35F4GNIWYWZrEshUc/G/r5BnLph6xpKuLeoJoQuj5WfBIx/eQLf+hmVPYHaxJu7V2g==",
+            "dependencies": {
+                "@types/json-schema": "^7.0.9",
+                "ajv": "^8.9.0",
+                "ajv-formats": "^2.1.1",
+                "ajv-keywords": "^5.1.0"
+            },
+            "engines": {
+                "node": ">= 10.13.0"
+            },
+            "funding": {
+                "type": "opencollective",
+                "url": "https://opencollective.com/webpack"
+            }
+        },
         "node_modules/webpack/node_modules/webpack-sources": {
             "version": "3.2.3",
             "license": "MIT",
diff --git a/package.json b/package.json
index 9f1ce36f2b..68687095c0 100644
--- a/package.json
+++ b/package.json
@@ -25,8 +25,8 @@
         "postcss": "^8.4.5"
     },
     "dependencies": {
-        "@fortawesome/fontawesome-free": "^6.5.2",
-        "acorn": "^8.11.2",
+        "@fortawesome/fontawesome-free": "^6.7.2",
+        "acorn": "^8.14.1",
         "acorn-import-assertions": "^1.9.0",
         "admin-lte": "^2.4.18",
         "ajv": "^6.12.6",
@@ -35,27 +35,28 @@
         "bootstrap-colorpicker": "^2.5.3",
         "bootstrap-datepicker": "^1.10.0",
         "bootstrap-less": "^3.3.8",
-        "bootstrap-table": "1.22.5",
+        "bootstrap-table": "1.24.1",
+        "canvas-confetti": "^1.9.3",
         "chart.js": "^2.9.4",
         "clipboard": "^2.0.11",
         "css-loader": "^5.0.0",
         "ekko-lightbox": "^5.1.1",
         "imagemin": "^8.0.1",
         "jquery-slimscroll": "^1.3.8",
-        "jquery-ui": "^1.13.3",
-        "jquery-validation": "^1.20.0",
+        "jquery-ui": "^1.14.1",
+        "jquery-validation": "^1.21.0",
         "jquery.iframe-transport": "^1.0.0",
-        "jspdf-autotable": "^3.8.2",
-        "less": "^4.2.0",
+        "jspdf-autotable": "^3.8.4",
+        "less": "^4.2.2",
         "less-loader": "^6.0",
         "list.js": "^1.5.0",
         "morris.js": "github:morrisjs/morris.js",
-        "papaparse": "5.4.1",
+        "papaparse": "5.5.2",
         "select2": "4.0.13",
         "sheetjs": "^2.0.0",
         "signature_pad": "^4.2.0",
-        "tableexport.jquery.plugin": "1.30.0",
+        "tableexport.jquery.plugin": "1.32.0",
         "tether": "^1.4.0",
-        "webpack": "^5.90.2"
+        "webpack": "^5.98.0"
     }
 }
diff --git a/phpunit.xml b/phpunit.xml
index 9d4fa91144..30a78b7a63 100644
--- a/phpunit.xml
+++ b/phpunit.xml
@@ -1,21 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          backupGlobals="false"
-         backupStaticAttributes="false"
+         backupStaticProperties="false"
          bootstrap="bootstrap/autoload.php"
+         cacheDirectory=".phpunit.cache"
          colors="true"
-         convertErrorsToExceptions="true"
-         convertNoticesToExceptions="true"
-         convertWarningsToExceptions="true"
          processIsolation="false"
          stopOnFailure="false"
-         xsi:noNamespaceSchemaLocation="./vendor/phpunit/phpunit/phpunit.xsd"
+         xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.5/phpunit.xsd"
 >
-  <coverage>
-    <include>
-      <directory suffix=".php">app/</directory>
-    </include>
-  </coverage>
   <testsuites>
     <testsuite name="Unit">
       <directory suffix="Test.php">./tests/Unit</directory>
@@ -28,9 +21,15 @@
     <env name="APP_ENV" value="testing"/>
     <env name="BCRYPT_ROUNDS" value="4"/>
     <env name="CACHE_DRIVER" value="array"/>
+    <env name="MAIL_FROM_ADDR" value="app@example.com"/>
     <env name="MAIL_MAILER" value="array"/>
     <env name="QUEUE_DRIVER" value="sync"/>
     <env name="SESSION_DRIVER" value="array"/>
     <ini name="display_errors" value="true"/>
   </php>
+  <source>
+    <include>
+      <directory suffix=".php">app/</directory>
+    </include>
+  </source>
 </phpunit>
diff --git a/public/.well-known/security.txt b/public/.well-known/security.txt
index 5b8d0c144a..4dddddbe71 100644
--- a/public/.well-known/security.txt
+++ b/public/.well-known/security.txt
@@ -2,6 +2,6 @@ Contact: mailto:security@snipeitapp.com
 Expires: 2025-05-16T11:30:00.000Z
 Acknowledgments: https://snipeitapp.com/thanks
 Preferred-Languages: en-US, pt-PT, de-DE
-Canonical: https://github.com/snipe/snipe-it/blob/master/public/.well-known/security.txt
+Canonical: https://github.com/grokability/snipe-it/blob/master/public/.well-known/security.txt
 Policy: https://snipeitapp.com/security
-Hiring: https://snipeitapp.com/company/careers
\ No newline at end of file
+Hiring: https://snipeitapp.com/company/careers
diff --git a/public/css/build/app.css b/public/css/build/app.css
index 2b8dc09873..f139c052cf 100644
--- a/public/css/build/app.css
+++ b/public/css/build/app.css
@@ -312,7 +312,19 @@ a.accordion-header {
 a.logo.no-hover a:hover {
   background-color: transparent;
 }
-.required {
+.index-block {
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+}
+.index-block:hover {
+  overflow: visible;
+  white-space: normal;
+  height: auto;
+}
+input:required,
+select:required,
+textarea:required {
   border-right: 6px solid orange;
 }
 .sidebar-menu {
@@ -395,7 +407,7 @@ img.navbar-brand-img,
   padding: 10px;
   background: #f4f4f4;
   margin-bottom: 3px;
-  border-left: 2px solid #e6e7e8;
+  border-inline: 2px solid #e6e7e8;
   color: #444;
   cursor: move;
 }
@@ -686,8 +698,13 @@ a.link-danger:hover {
 a.logo.no-hover a:hover {
   background-color: transparent;
 }
-.required {
-  border-right: 6px solid orange;
+input:required,
+select:required {
+  border-right: 5px solid orange;
+}
+select:required + .select2-container .select2-selection,
+select:required + .select2-container .select2-selection .select2-selection--multiple {
+  border-right: 5px solid orange !important;
 }
 body {
   font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", "Roboto", "Oxygen", "Ubuntu", "Cantarell", "Fira Sans", "Droid Sans", "Helvetica Neue", sans-serif;
@@ -697,18 +714,156 @@ body {
   font-size: 14px;
   white-space: normal;
 }
+.modal-warning .modal-help {
+  color: #fff8af;
+}
 .bootstrap-table .fixed-table-container .fixed-table-body .fixed-table-loading {
   z-index: 0 !important;
 }
 @media print {
-  a[href]:after {
-    content: none;
+  @page {
+    size: A4;
+    margin: 0mm;
   }
   .tab-content > .tab-pane {
     display: block !important;
     opacity: 1 !important;
     visibility: visible !important;
   }
+  .img-responsive {
+    width: 200px;
+  }
+  html,
+  body {
+    width: 1024px;
+  }
+  body {
+    margin: 0 auto;
+    line-height: 1em;
+    word-spacing: 1px;
+    letter-spacing: 0.2px;
+    font: 15px "Times New Roman", Times, serif;
+    background: white;
+    color: black;
+    width: 100%;
+    float: none;
+  }
+  /* avoid page-breaks inside a listingContainer*/
+  .listingContainer {
+    page-break-inside: avoid;
+  }
+  h1 {
+    font: 28px "Times New Roman", Times, serif;
+  }
+  h2 {
+    font: 24px "Times New Roman", Times, serif;
+  }
+  h3 {
+    font: 20px "Times New Roman", Times, serif;
+  }
+  /* Improve colour contrast of links */
+  a:link,
+  a:visited {
+    color: #781351;
+  }
+  /* URL */
+  a:link,
+  a:visited {
+    background: transparent;
+    color: #333;
+    text-decoration: none;
+  }
+  a[href]:after {
+    content: "" !important;
+  }
+  a[href^="http://"] {
+    color: #000;
+  }
+  #header {
+    height: 75px;
+    font-size: 24pt;
+    color: black;
+  }
+  div.row-new-striped {
+    margin: 0px;
+    padding: 0px;
+  }
+  .pagination-detail,
+  .fixed-table-toolbar {
+    visibility: hidden;
+  }
+  .col-sm-1,
+  .col-sm-2,
+  .col-sm-3,
+  .col-sm-4,
+  .col-sm-5,
+  .col-sm-6,
+  .col-sm-7,
+  .col-sm-8,
+  .col-sm-9,
+  .col-sm-10,
+  .col-sm-11,
+  .col-sm-12 .col-sm-pull-3 .col-sm-push-9 {
+    float: left;
+  }
+  .col-sm-12 {
+    width: 100%;
+  }
+  .col-sm-11 {
+    width: 91.66666667%;
+  }
+  .col-sm-10 {
+    width: 83.33333333%;
+  }
+  .col-sm-9 {
+    width: 75%;
+  }
+  .col-sm-8 {
+    width: 66.66666667%;
+  }
+  .col-sm-7 {
+    width: 58.33333333%;
+  }
+  .col-sm-6 {
+    width: 50%;
+  }
+  .col-sm-5 {
+    width: 41.66666667%;
+  }
+  .col-sm-4 {
+    width: 33.33333333%;
+  }
+  .col-sm-3 {
+    width: 25%;
+  }
+  .col-sm-2 {
+    width: 16.66666667%;
+  }
+  .col-sm-1 {
+    width: 8.33333333%;
+  }
+}
+.select2-selection__choice__remove {
+  color: white !important;
+}
+.select2-selection--multiple {
+  border-color: #d2d6de !important;
+  overflow-y: auto;
+}
+.select2-selection__choice {
+  border-radius: 0px !important;
+}
+.select2-search select2-search--inline {
+  height: 35px !important;
+  float: left;
+  margin: 0;
+}
+.select2-results__option {
+  padding: 5px;
+  -moz-user-select: none;
+       user-select: none;
+  -webkit-user-select: none;
+  margin: 0px;
 }
 img.navbar-brand-img,
 .navbar-brand > img {
@@ -716,8 +871,10 @@ img.navbar-brand-img,
   padding: 5px 5px 5px 0;
   max-height: 50px;
 }
-.input-daterange {
-  border-radius: 0px;
+.input-daterange,
+.input-daterange input:first-child,
+.input-daterange input:last-child {
+  border-radius: 0px !important;
 }
 .btn.bg-maroon,
 .btn.bg-purple {
@@ -796,20 +953,21 @@ h4 {
   background-color: #f9f9f9;
   border-top: 1px solid #dddddd;
   display: table-cell;
+  word-wrap: break-word;
 }
 .row-striped .row:nth-of-type(even) div {
   background: #FFFFFF;
   border-top: 1px solid #dddddd;
   display: table-cell;
+  word-wrap: break-word;
 }
 .row-new-striped {
   vertical-align: top;
-  line-height: 2.6;
-  padding: 0px;
-  margin-left: 20px;
+  padding: 3px;
   display: table;
   width: 100%;
-  padding-right: 20px;
+  word-wrap: break-word;
+  table-layout: fixed;
 }
 /**
 *  NEW STRIPING
@@ -819,20 +977,25 @@ h4 {
 .row-new-striped > .row:nth-of-type(even) {
   background: #FFFFFF;
   border-top: 1px solid #dddddd;
+  line-height: 1.9;
   display: table-row;
 }
 .row-new-striped > .row:nth-of-type(odd) {
   background-color: #F8F8F8;
   border-top: 1px solid #dddddd;
   display: table-row;
+  line-height: 1.9;
+  padding: 2px;
 }
 .row-new-striped div {
   display: table-cell;
   border-top: 1px solid #dddddd;
+  padding: 6px;
 }
 .row-new-striped div {
   display: table-cell;
   border-top: 1px solid #dddddd;
+  padding: 6px;
 }
 .row-new-striped div[class^="col"]:first-child {
   font-weight: bold;
@@ -872,18 +1035,24 @@ h4 {
  any HTML used in the UserPresenter "title" attribute breaks the column selector HTML.
 
  Instead, we use CSS to add the icon into the table header, which leaves the column selector
- "title" text as-is.
-
- See https://github.com/snipe/snipe-it/issues/7989
+ "title" text as-is and hides the icon.
 
+ See https://github.com/grokability/snipe-it/issues/7989
  */
+th.css-accessory > .th-inner,
+th.css-accessory-alt > .th-inner,
 th.css-barcode > .th-inner,
-th.css-license > .th-inner,
+th.css-component > .th-inner,
 th.css-consumable > .th-inner,
 th.css-envelope > .th-inner,
-th.css-users > .th-inner,
+th.css-house-flag > .th-inner,
+th.css-house-laptop > .th-inner,
+th.css-house-user > .th-inner,
+th.css-license > .th-inner,
 th.css-location > .th-inner,
-th.css-accessory > .th-inner {
+th.css-users > .th-inner,
+th.css-currency > .th-inner,
+th.css-history > .th-inner {
   font-size: 0px;
   line-height: 0.75 !important;
   text-align: left;
@@ -891,26 +1060,27 @@ th.css-accessory > .th-inner {
   -webkit-font-smoothing: antialiased;
   -moz-osx-font-smoothing: grayscale;
 }
-th.css-padlock > .th-inner::before,
+th.css-location > .th-inner::before,
+th.css-accessory > .th-inner::before,
+th.css-accessory-alt > .th-inner::before,
 th.css-barcode > .th-inner::before,
-th.css-license > .th-inner::before,
+th.css-component > .th-inner::before,
 th.css-consumable > .th-inner::before,
 th.css-envelope > .th-inner::before,
-th.css-users > .th-inner::before,
+th.css-house-flag > .th-inner::before,
+th.css-house-laptop > .th-inner::before,
+th.css-house-user > .th-inner::before,
+th.css-license > .th-inner::before,
 th.css-location > .th-inner::before,
-th.css-accessory > .th-inner::before {
+th.css-padlock > .th-inner::before,
+th.css-users > .th-inner::before,
+th.css-currency > .th-inner::before,
+th.css-history > .th-inner::before {
   display: inline-block;
   font-size: 20px;
   font-family: "Font Awesome 5 Free";
   font-weight: 900;
 }
-th.css-padlock > .th-inner::before {
-  content: "\f023";
-  font-family: "Font Awesome 5 Free";
-  font-weight: 900;
-  padding-right: 4px;
-  font-size: 12px;
-}
 /**
 BEGIN ICON TABLE HEADERS
 Set the font-weight css property as 900 (For Solid), 400 (Regular or Brands), 300 (Light for pro icons).
@@ -951,6 +1121,52 @@ th.css-location > .th-inner::before {
   font-size: 19px;
   margin-bottom: 0px;
 }
+th.css-component > .th-inner::before {
+  content: "\f0a0";
+  font-family: "Font Awesome 5 Free";
+  font-weight: 500;
+}
+th.css-padlock > .th-inner::before {
+  content: "\f023";
+  font-family: "Font Awesome 5 Free";
+  font-weight: 900;
+}
+th.css-house-user > .th-inner::before {
+  content: "\e1b0";
+  font-family: "Font Awesome 5 Free";
+  font-size: 19px;
+  margin-bottom: 0px;
+}
+th.css-house-flag > .th-inner::before {
+  content: "\e50d";
+  font-family: "Font Awesome 5 Free";
+  font-size: 19px;
+  margin-bottom: 0px;
+}
+th.css-house-laptop > .th-inner::before {
+  content: "\e066";
+  font-family: "Font Awesome 5 Free";
+  font-size: 19px;
+  margin-bottom: 0px;
+}
+th.css-accessory-alt > .th-inner::before {
+  content: "\f11c";
+  font-family: "Font Awesome 5 Free";
+  font-size: 19px;
+  margin-bottom: 0px;
+}
+th.css-currency > .th-inner::before {
+  content: "\24";
+  font-family: "Font Awesome 5 Free";
+  font-size: 19px;
+  margin-bottom: 0px;
+}
+th.css-history > .th-inner::before {
+  content: "\f1da";
+  font-family: "Font Awesome 5 Free";
+  font-size: 19px;
+  margin-bottom: 0px;
+}
 .small-box .inner {
   padding-left: 15px;
   padding-right: 15px;
@@ -969,7 +1185,8 @@ th.css-location > .th-inner::before {
   padding: 6px 12px;
   height: 34px;
 }
-.form-group.has-error label {
+.form-group.has-error label,
+.form-group.has-error .help-block {
   color: #a94442;
 }
 .select2-container--default .select2-selection--multiple {
@@ -999,10 +1216,41 @@ th.css-location > .th-inner::before {
     margin-top: 50px;
   }
 }
-.ellipsis {
-  overflow: hidden;
-  white-space: nowrap;
-  text-overflow: ellipsis;
+@media screen and (max-width: 992px) {
+  .info-stack-container {
+    flex-direction: column;
+  }
+  .col-md-3.col-xs-12.col-sm-push-9.info-stack {
+    left: auto;
+    order: 1;
+  }
+  .col-md-9.col-xs-12.col-sm-pull-3.info-stack {
+    right: auto;
+    order: 2;
+  }
+  .info-stack-container > .col-md-9.col-xs-12.col-sm-pull-3.info-stack > .row-new-striped > .row > .col-sm-2 {
+    width: auto;
+    float: none;
+  }
+}
+@media screen and (max-width: 992px) {
+  .row-new-striped div {
+    width: 100%;
+  }
+}
+@media screen and (max-width: 1318px) and (min-width: 1200px) {
+  .admin.box {
+    height: 170px;
+  }
+}
+@media screen and (max-width: 1494px) and (min-width: 1200px) {
+  .dashboard.small-box {
+    white-space: nowrap;
+    text-overflow: ellipsis;
+    max-width: 188px;
+    display: block;
+    overflow: hidden;
+  }
 }
 /** Form-stuff overrides for checkboxes and stuff **/
 label.form-control {
@@ -1140,6 +1388,9 @@ input[type="radio"]:checked::before {
 .select2-container .select2-search--inline .select2-search__field {
   padding-left: 15px;
 }
+.nav-tabs-custom > .nav-tabs > li.active {
+  font-weight: bold;
+}
 /** --------------------------------------- **/
 /** End checkbox styles to replace iCheck   **/
 /** --------------------------------------- **/
@@ -1174,4 +1425,45 @@ input[type="radio"]:checked::before {
   filter: brightness(70%);
   font-size: 70%;
 }
+/** this is needed to override ekko-lightboxes card view styles **/
+.bootstrap-table .fixed-table-container .table tbody tr .card-view {
+  display: table-row !important;
+}
+td.text-right.text-padding-number-cell {
+  padding-right: 30px !important;
+  white-space: nowrap;
+}
+th.text-right.text-padding-number-footer-cell {
+  padding-right: 20px !important;
+  white-space: nowrap;
+}
+code.single-line {
+  white-space: pre-wrap;
+  display: -webkit-box;
+  -webkit-box-orient: vertical;
+  -webkit-line-clamp: 1;
+  overflow: hidden;
+  max-width: 400px;
+}
+p.monospace,
+span.monospace {
+  font-family: monospace, monospace;
+}
+legend.highlight {
+  background: repeating-linear-gradient(45deg, #222d32, #222d32 10px, #444 10px, #444 11px);
+  color: #fff;
+  font-size: 18px;
+  padding: 6px 6px 6px 10px;
+}
+legend.highlight a {
+  color: #fff;
+  cursor: pointer;
+}
+fieldset.bottom-padded {
+  padding-bottom: 20px;
+}
+caption.tableCaption {
+  font-size: 18px;
+  padding-left: 8px;
+}
 
diff --git a/public/css/build/overrides.css b/public/css/build/overrides.css
index 24696882ae..aa8e28acbb 100644
--- a/public/css/build/overrides.css
+++ b/public/css/build/overrides.css
@@ -28,7 +28,7 @@
   padding: 10px;
   background: #f4f4f4;
   margin-bottom: 3px;
-  border-left: 2px solid #e6e7e8;
+  border-inline: 2px solid #e6e7e8;
   color: #444;
   cursor: move;
 }
@@ -319,8 +319,13 @@ a.link-danger:hover {
 a.logo.no-hover a:hover {
   background-color: transparent;
 }
-.required {
-  border-right: 6px solid orange;
+input:required,
+select:required {
+  border-right: 5px solid orange;
+}
+select:required + .select2-container .select2-selection,
+select:required + .select2-container .select2-selection .select2-selection--multiple {
+  border-right: 5px solid orange !important;
 }
 body {
   font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", "Roboto", "Oxygen", "Ubuntu", "Cantarell", "Fira Sans", "Droid Sans", "Helvetica Neue", sans-serif;
@@ -330,18 +335,156 @@ body {
   font-size: 14px;
   white-space: normal;
 }
+.modal-warning .modal-help {
+  color: #fff8af;
+}
 .bootstrap-table .fixed-table-container .fixed-table-body .fixed-table-loading {
   z-index: 0 !important;
 }
 @media print {
-  a[href]:after {
-    content: none;
+  @page {
+    size: A4;
+    margin: 0mm;
   }
   .tab-content > .tab-pane {
     display: block !important;
     opacity: 1 !important;
     visibility: visible !important;
   }
+  .img-responsive {
+    width: 200px;
+  }
+  html,
+  body {
+    width: 1024px;
+  }
+  body {
+    margin: 0 auto;
+    line-height: 1em;
+    word-spacing: 1px;
+    letter-spacing: 0.2px;
+    font: 15px "Times New Roman", Times, serif;
+    background: white;
+    color: black;
+    width: 100%;
+    float: none;
+  }
+  /* avoid page-breaks inside a listingContainer*/
+  .listingContainer {
+    page-break-inside: avoid;
+  }
+  h1 {
+    font: 28px "Times New Roman", Times, serif;
+  }
+  h2 {
+    font: 24px "Times New Roman", Times, serif;
+  }
+  h3 {
+    font: 20px "Times New Roman", Times, serif;
+  }
+  /* Improve colour contrast of links */
+  a:link,
+  a:visited {
+    color: #781351;
+  }
+  /* URL */
+  a:link,
+  a:visited {
+    background: transparent;
+    color: #333;
+    text-decoration: none;
+  }
+  a[href]:after {
+    content: "" !important;
+  }
+  a[href^="http://"] {
+    color: #000;
+  }
+  #header {
+    height: 75px;
+    font-size: 24pt;
+    color: black;
+  }
+  div.row-new-striped {
+    margin: 0px;
+    padding: 0px;
+  }
+  .pagination-detail,
+  .fixed-table-toolbar {
+    visibility: hidden;
+  }
+  .col-sm-1,
+  .col-sm-2,
+  .col-sm-3,
+  .col-sm-4,
+  .col-sm-5,
+  .col-sm-6,
+  .col-sm-7,
+  .col-sm-8,
+  .col-sm-9,
+  .col-sm-10,
+  .col-sm-11,
+  .col-sm-12 .col-sm-pull-3 .col-sm-push-9 {
+    float: left;
+  }
+  .col-sm-12 {
+    width: 100%;
+  }
+  .col-sm-11 {
+    width: 91.66666667%;
+  }
+  .col-sm-10 {
+    width: 83.33333333%;
+  }
+  .col-sm-9 {
+    width: 75%;
+  }
+  .col-sm-8 {
+    width: 66.66666667%;
+  }
+  .col-sm-7 {
+    width: 58.33333333%;
+  }
+  .col-sm-6 {
+    width: 50%;
+  }
+  .col-sm-5 {
+    width: 41.66666667%;
+  }
+  .col-sm-4 {
+    width: 33.33333333%;
+  }
+  .col-sm-3 {
+    width: 25%;
+  }
+  .col-sm-2 {
+    width: 16.66666667%;
+  }
+  .col-sm-1 {
+    width: 8.33333333%;
+  }
+}
+.select2-selection__choice__remove {
+  color: white !important;
+}
+.select2-selection--multiple {
+  border-color: #d2d6de !important;
+  overflow-y: auto;
+}
+.select2-selection__choice {
+  border-radius: 0px !important;
+}
+.select2-search select2-search--inline {
+  height: 35px !important;
+  float: left;
+  margin: 0;
+}
+.select2-results__option {
+  padding: 5px;
+  -moz-user-select: none;
+       user-select: none;
+  -webkit-user-select: none;
+  margin: 0px;
 }
 img.navbar-brand-img,
 .navbar-brand > img {
@@ -349,8 +492,10 @@ img.navbar-brand-img,
   padding: 5px 5px 5px 0;
   max-height: 50px;
 }
-.input-daterange {
-  border-radius: 0px;
+.input-daterange,
+.input-daterange input:first-child,
+.input-daterange input:last-child {
+  border-radius: 0px !important;
 }
 .btn.bg-maroon,
 .btn.bg-purple {
@@ -429,20 +574,21 @@ h4 {
   background-color: #f9f9f9;
   border-top: 1px solid #dddddd;
   display: table-cell;
+  word-wrap: break-word;
 }
 .row-striped .row:nth-of-type(even) div {
   background: #FFFFFF;
   border-top: 1px solid #dddddd;
   display: table-cell;
+  word-wrap: break-word;
 }
 .row-new-striped {
   vertical-align: top;
-  line-height: 2.6;
-  padding: 0px;
-  margin-left: 20px;
+  padding: 3px;
   display: table;
   width: 100%;
-  padding-right: 20px;
+  word-wrap: break-word;
+  table-layout: fixed;
 }
 /**
 *  NEW STRIPING
@@ -452,20 +598,25 @@ h4 {
 .row-new-striped > .row:nth-of-type(even) {
   background: #FFFFFF;
   border-top: 1px solid #dddddd;
+  line-height: 1.9;
   display: table-row;
 }
 .row-new-striped > .row:nth-of-type(odd) {
   background-color: #F8F8F8;
   border-top: 1px solid #dddddd;
   display: table-row;
+  line-height: 1.9;
+  padding: 2px;
 }
 .row-new-striped div {
   display: table-cell;
   border-top: 1px solid #dddddd;
+  padding: 6px;
 }
 .row-new-striped div {
   display: table-cell;
   border-top: 1px solid #dddddd;
+  padding: 6px;
 }
 .row-new-striped div[class^="col"]:first-child {
   font-weight: bold;
@@ -505,18 +656,24 @@ h4 {
  any HTML used in the UserPresenter "title" attribute breaks the column selector HTML.
 
  Instead, we use CSS to add the icon into the table header, which leaves the column selector
- "title" text as-is.
-
- See https://github.com/snipe/snipe-it/issues/7989
+ "title" text as-is and hides the icon.
 
+ See https://github.com/grokability/snipe-it/issues/7989
  */
+th.css-accessory > .th-inner,
+th.css-accessory-alt > .th-inner,
 th.css-barcode > .th-inner,
-th.css-license > .th-inner,
+th.css-component > .th-inner,
 th.css-consumable > .th-inner,
 th.css-envelope > .th-inner,
-th.css-users > .th-inner,
+th.css-house-flag > .th-inner,
+th.css-house-laptop > .th-inner,
+th.css-house-user > .th-inner,
+th.css-license > .th-inner,
 th.css-location > .th-inner,
-th.css-accessory > .th-inner {
+th.css-users > .th-inner,
+th.css-currency > .th-inner,
+th.css-history > .th-inner {
   font-size: 0px;
   line-height: 0.75 !important;
   text-align: left;
@@ -524,26 +681,27 @@ th.css-accessory > .th-inner {
   -webkit-font-smoothing: antialiased;
   -moz-osx-font-smoothing: grayscale;
 }
-th.css-padlock > .th-inner::before,
+th.css-location > .th-inner::before,
+th.css-accessory > .th-inner::before,
+th.css-accessory-alt > .th-inner::before,
 th.css-barcode > .th-inner::before,
-th.css-license > .th-inner::before,
+th.css-component > .th-inner::before,
 th.css-consumable > .th-inner::before,
 th.css-envelope > .th-inner::before,
-th.css-users > .th-inner::before,
+th.css-house-flag > .th-inner::before,
+th.css-house-laptop > .th-inner::before,
+th.css-house-user > .th-inner::before,
+th.css-license > .th-inner::before,
 th.css-location > .th-inner::before,
-th.css-accessory > .th-inner::before {
+th.css-padlock > .th-inner::before,
+th.css-users > .th-inner::before,
+th.css-currency > .th-inner::before,
+th.css-history > .th-inner::before {
   display: inline-block;
   font-size: 20px;
   font-family: "Font Awesome 5 Free";
   font-weight: 900;
 }
-th.css-padlock > .th-inner::before {
-  content: "\f023";
-  font-family: "Font Awesome 5 Free";
-  font-weight: 900;
-  padding-right: 4px;
-  font-size: 12px;
-}
 /**
 BEGIN ICON TABLE HEADERS
 Set the font-weight css property as 900 (For Solid), 400 (Regular or Brands), 300 (Light for pro icons).
@@ -584,6 +742,52 @@ th.css-location > .th-inner::before {
   font-size: 19px;
   margin-bottom: 0px;
 }
+th.css-component > .th-inner::before {
+  content: "\f0a0";
+  font-family: "Font Awesome 5 Free";
+  font-weight: 500;
+}
+th.css-padlock > .th-inner::before {
+  content: "\f023";
+  font-family: "Font Awesome 5 Free";
+  font-weight: 900;
+}
+th.css-house-user > .th-inner::before {
+  content: "\e1b0";
+  font-family: "Font Awesome 5 Free";
+  font-size: 19px;
+  margin-bottom: 0px;
+}
+th.css-house-flag > .th-inner::before {
+  content: "\e50d";
+  font-family: "Font Awesome 5 Free";
+  font-size: 19px;
+  margin-bottom: 0px;
+}
+th.css-house-laptop > .th-inner::before {
+  content: "\e066";
+  font-family: "Font Awesome 5 Free";
+  font-size: 19px;
+  margin-bottom: 0px;
+}
+th.css-accessory-alt > .th-inner::before {
+  content: "\f11c";
+  font-family: "Font Awesome 5 Free";
+  font-size: 19px;
+  margin-bottom: 0px;
+}
+th.css-currency > .th-inner::before {
+  content: "\24";
+  font-family: "Font Awesome 5 Free";
+  font-size: 19px;
+  margin-bottom: 0px;
+}
+th.css-history > .th-inner::before {
+  content: "\f1da";
+  font-family: "Font Awesome 5 Free";
+  font-size: 19px;
+  margin-bottom: 0px;
+}
 .small-box .inner {
   padding-left: 15px;
   padding-right: 15px;
@@ -602,7 +806,8 @@ th.css-location > .th-inner::before {
   padding: 6px 12px;
   height: 34px;
 }
-.form-group.has-error label {
+.form-group.has-error label,
+.form-group.has-error .help-block {
   color: #a94442;
 }
 .select2-container--default .select2-selection--multiple {
@@ -632,10 +837,41 @@ th.css-location > .th-inner::before {
     margin-top: 50px;
   }
 }
-.ellipsis {
-  overflow: hidden;
-  white-space: nowrap;
-  text-overflow: ellipsis;
+@media screen and (max-width: 992px) {
+  .info-stack-container {
+    flex-direction: column;
+  }
+  .col-md-3.col-xs-12.col-sm-push-9.info-stack {
+    left: auto;
+    order: 1;
+  }
+  .col-md-9.col-xs-12.col-sm-pull-3.info-stack {
+    right: auto;
+    order: 2;
+  }
+  .info-stack-container > .col-md-9.col-xs-12.col-sm-pull-3.info-stack > .row-new-striped > .row > .col-sm-2 {
+    width: auto;
+    float: none;
+  }
+}
+@media screen and (max-width: 992px) {
+  .row-new-striped div {
+    width: 100%;
+  }
+}
+@media screen and (max-width: 1318px) and (min-width: 1200px) {
+  .admin.box {
+    height: 170px;
+  }
+}
+@media screen and (max-width: 1494px) and (min-width: 1200px) {
+  .dashboard.small-box {
+    white-space: nowrap;
+    text-overflow: ellipsis;
+    max-width: 188px;
+    display: block;
+    overflow: hidden;
+  }
 }
 /** Form-stuff overrides for checkboxes and stuff **/
 label.form-control {
@@ -773,6 +1009,9 @@ input[type="radio"]:checked::before {
 .select2-container .select2-search--inline .select2-search__field {
   padding-left: 15px;
 }
+.nav-tabs-custom > .nav-tabs > li.active {
+  font-weight: bold;
+}
 /** --------------------------------------- **/
 /** End checkbox styles to replace iCheck   **/
 /** --------------------------------------- **/
@@ -807,4 +1046,45 @@ input[type="radio"]:checked::before {
   filter: brightness(70%);
   font-size: 70%;
 }
+/** this is needed to override ekko-lightboxes card view styles **/
+.bootstrap-table .fixed-table-container .table tbody tr .card-view {
+  display: table-row !important;
+}
+td.text-right.text-padding-number-cell {
+  padding-right: 30px !important;
+  white-space: nowrap;
+}
+th.text-right.text-padding-number-footer-cell {
+  padding-right: 20px !important;
+  white-space: nowrap;
+}
+code.single-line {
+  white-space: pre-wrap;
+  display: -webkit-box;
+  -webkit-box-orient: vertical;
+  -webkit-line-clamp: 1;
+  overflow: hidden;
+  max-width: 400px;
+}
+p.monospace,
+span.monospace {
+  font-family: monospace, monospace;
+}
+legend.highlight {
+  background: repeating-linear-gradient(45deg, #222d32, #222d32 10px, #444 10px, #444 11px);
+  color: #fff;
+  font-size: 18px;
+  padding: 6px 6px 6px 10px;
+}
+legend.highlight a {
+  color: #fff;
+  cursor: pointer;
+}
+fieldset.bottom-padded {
+  padding-bottom: 20px;
+}
+caption.tableCaption {
+  font-size: 18px;
+  padding-left: 8px;
+}
 
diff --git a/public/css/build/overrides.css.map b/public/css/build/overrides.css.map
new file mode 100644
index 0000000000..7fcc29bb45
--- /dev/null
+++ b/public/css/build/overrides.css.map
@@ -0,0 +1 @@
+{"version":3,"file":"css/build/overrides.css","mappings":"AAAA;EAkBE;AAhBF;AAkBA;EACE;EACA;EACA;EACA;EACA;AAhBF;AAiBE;;;EACE;AAbJ;AAgBA;EACE;AAdF;AAiBA;EACE;EACA;AAfF;AAkBA;EACE;AAhBF;AAoBA;EACE;EACA;EACA;EACA;EACA;EACA;EACA;AAlBF;AAqBA;EACE;EACA;EACA;EACA;EACA;AAnBF;AAsBA;EACE;AApBF;AAuBA;EACE;AArBF;AAwBA;EACE;EACA;AAtBF;AA0BA;EACE;AAxBF;AA2BA;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;AAzBF;AA2BA;EACE;AAzBF;AA2BA;EACE;AAzBF;AA6BA;EACE;AA3BF;AA6BA;EACE;AA3BF;AA+BA;EACE;EACA;EACA;AA7BF;AAgCA;EACE;EACA;EACA;AA9BF;AAqDA;EACE;AAnDF;AAsDA;EACE;EACA;EACA;AApDF;AAuDA;EACE;EACA;AArDF;AAyDA;EACE;AAvDF;AAyDA;EACE;EACA;AAvDF;AA0DA;;EACE;EACA;AAvDF;AA0DA;EACE;EACA;AAxDF;AA0DA;EACE;AAxDF;AA2DA;EACE;EACA;EACA;AAzDF;AA4DA;EACE;AA1DF;AA6DA;EACE;AA3DF;AA8DA;EACE;AA5DF;AA8DA;EACE;AA5DF;AA+DA;EACE;AA7DF;AAgEA;;;;EACE;AA3DF;AA8DA;;;;;EACE;AAxDF;AA2DA;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;AAzDF;AA2DA;EACE;EACA;EACA;EACA;EACA;EACA;AAzDF;AA2DA;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;AAzDF;AA2DA;EACE;AAzDF;AA2DA;EACE;EACA;EACA;EACA;AAzDF;AA2DA;EACE;EACA;AAzDF;AA2DA;EACE;EACA;EACA;EACA;EACA;AAzDF;AA2DA;EACE;EACA;AAzDF;AA2DA;EACE;EACA;EACA;EACA;AAzDF;AA4DA;EACE;EACA;AA1DF;AA+DA;EAAY;AA5DZ;AACA,cAAc;AA8Dd;EAAY;EAAkC;AA1D9C;AA2DA;EAA8B;EAAY;AAvD1C;AAyDA;EAAiD;EAAgB;EAAiB;AApDlF;AAqDA;EAA8C;EAAa;AAjD3D;AAkDA;EAA+C;EAAoB;EAAa;EAAc;EAAgB;EAAqB;EAAW;EAAW;EAAmB;EAAoB;AAtChM;AAuCA;EAAqD;EAAc;EAAa;EAAc;EAAqB;EAAqB;EAAoB;EAAU;AA7BtK;AA8BA;EAA0C;EAAoB;EAAoB;EAAa;EAAkB;AAvBjH;AAwBA;EAA0D;EAAW;EAAkB;AAnBvF;AAoBA;EAAmE;AAjBnE;AAkBA;EAAiE;AAfjE;AAgBA;EAA6E;AAb7E;AAcA;EAA4E;AAX5E;AAYA;EAAwD;AATxD;AAUA;EAA8D;AAP9D;AAQA;EAAuD;EAAW;AAJlE;AAKA;EAAsD;AAFtD;AAGA;EAAuD;AAAvD;AACA,kBAAkB;AAElB;EACE;EACA;EACA;EACA;EACA;EAAA,gCAAgC;AAClC;AAGA;EAkBE;AAlBF;AAqBA;EACE;AAnBF;AAuBA;EACE;AArBF;AAwBA;EACE;EAIA;AAzBF;AA4BA;EACE;EACA;AA1BF;AA6BA;EACE;AA3BF;AA8BA;EACE;AA5BF;AA+BA;EAEE;IACE;IACA;EA9BF;EAiCA;IACE;IACA;IACA;EA/BF;EAkCA;IACE;EAhCF;EAmCA;;IACE;EAhCF;EAmCA;IACE;IACA;IACA;IACA;IACA;IACA;IACA;IACA;IACA;EAjCF;EACA,+CAA+C;EAoC/C;IACE;EAlCF;EAqCA;IACE;EAnCF;EAsCA;IACE;EApCF;EAuCA;IACE;EArCF;EACA,qCAAqC;EAwCrC;;IACE;EArCF;EACA,QAAQ;EAwCR;;IACE;IACA;IACA;EArCF;EAwCA;IACE;EAtCF;EAyCA;IACE;EAvCF;EA0CA;IACE;IACA;IACA;EAxCF;EA2CA;IACE;IACA;EAzCF;EA4CA;;IACE;EAzCF;EA2CA;;;;;;;;;;;;IACE;EA9BF;EAiCA;IACE;EA/BF;EAiCA;IACE;EA/BF;EAiCA;IACE;EA/BF;EAiCA;IACE;EA/BF;EAiCA;IACE;EA/BF;EAiCA;IACE;EA/BF;EAiCA;IACE;EA/BF;EAiCA;IACE;EA/BF;EAiCA;IACE;EA/BF;EAiCA;IACE;EA/BF;EAiCA;IACE;EA/BF;EAiCA;IACE;EA/BF;AACF;AAoCA;EACE;AAlCF;AAqCA;EACI;EACA;AAnCJ;AAsCA;EACE;AApCF;AAuCA;EACE;EACA;EACA;AArCF;AA0CA;EACE;EACA;OAAA;EACA;EACA;AAxCF;AA2CA;;EACE;EACA;EACA;AAxCF;AA2CA;;;EACE;AAvCF;AA0CA;;EACE;AAvCF;AA0CA;EACE;AAxCF;AA2CA;EACE;AAzCF;AA4CA;EACE;EACA;EACA;AA1CF;AA6CA;EACE;EACA;AA3CF;AA8CA;EACE;EACA;EACA;AA5CF;AAgDA;EACE;EACA;EACA;EACA;EACA;EACA;EACA;AA9CF;AAgDA;;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;AA7CF;AAgDA;EACE;AA9CF;AAiDA;EACE;AA/CF;AAkDA;EACE;AAhDF;AAmDA;EACE;AAjDF;AAoDA;EACE;AAlDF;AAsDA;EACE;EACA;EACA;EACA;EACA;EAGA;AAtDF;AA0DA;EACE;EACA;EACA;AAxDF;AA4DA;EACE;EACA;EACA;AA1DF;AA8DA;EACE;EACA;EACA;EACA;EACA;EACA;EACA;AA5DF;AACA;;;;EAIE;AA+DF;EACE;EACA;EACA;AA7DF;AAiEA;EACE;EACA;EACA;AA/DF;AAmEA;EACE;EACA;AAjEF;AAoEA;EACE;EACA;AAlEF;AAsEA;EACE;AApEF;AACA;;EAEE;AAyEF;EACE;IACE;IACA;EAvEF;EA0EA;IACE;EAxEF;EA2EA;IACE;EAzEF;EA4EA;IACE;EA1EF;AACF;AA6EA;EACE;EACA;EACA;AA3EF;AA8EA;EACE;EACA;AA5EF;AACA;;;;;;;;;;;;EAYE;AAkFF;;;;;;;;EASE;EACA;EACA;EACA;EACA;EACA;AAjFF;AAqFA;;;;;;;;;EAWE;EACA;EACA;EACA;AArFF;AAwFA;EAEE;EACA;EACA;EACA;EACA;AAvFF;AACA;;;EAGE;AA0FF;EAEE;EAAkB;EAAoC;AAvFxD;AA0FA;EAEE;EAAkB;EAAoC;AAvFxD;AA0FA;EAEE;EAAkB;EAAoC;AAvFxD;AA0FA;EAEE;EAAkB;EAAoC;AAvFxD;AA0FA;EAEE;EAAkB;EAAoC;AAvFxD;AA0FA;EACE;EAAkB;EAAoC;AAtFxD;AAyFA;EACE;EAAkB;EAAoC;EAAiB;AApFzE;AAuFA;EAEE;EAAkB;EAAoC;AApFxD;AAwFA;EACE;EACA;EACA;EACA;AAtFF;AA0FA;;;EACE;AAtFF;AAyFA;;EACE;EACA;EACA;EACA;AAtFF;AAyFA;EACE;AAvFF;AA0FA;EACE;AAxFF;AA2FA;EACE;IACE;EAzFF;EA2FA;IACE;EAzFF;AACF;AA2FA;EACE;IACE;EAzFF;EA2FA;IACE;EAzFF;EA2FA;IACE;EAzFF;AACF;AA4FA;EACE;IACE;EA1FF;AACF;AA4FA;EACE;IACE;IACA;EA1FF;EA4FA;IACE;IACA;EA1FF;EA4FA;IACE;IACA;EA1FF;EA4FA;IACE;IACA;EA1FF;AACF;AA4FA;EACE;IACE;EA1FF;AACF;AA4FA;EACE;IACE;IACA;IACA;IACA;IACA;EA1FF;AACF;AACA,oDAAoD;AA8FpD;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;AA5FF;AA+FA;EACE;EACA;EACA;AA7FF;AACA,8CAA8C;AAC9C,8CAA8C;AAC9C,8CAA8C;AAgG9C;EA9FE,kCAAkC;EAgGlC;EACA;OAAA;EA9FA,+CAA+C;EAgG/C;EA9FA,+BAA+B;EAgG/B;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EA9FA,6BAA6B;AAC/B;AACA,yFAAyF;AAkGzF;EAhGE,2EAA2E;EAwG3E;EAEA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EAvGA,+BAA+B;EAyG/B;AAvGF;AACA,wEAAwE;AA0GxE;EACE;AAxGF;AACA,wEAAwE;AA2GxE;;EACE;EACA;EACA;EACA;EACA;AAxGF;AACA,6EAA6E;AA2G7E;;EACE;EACA;EACA;EACA;AAxGF;AACA,+EAA+E;AA2G/E;;EACE;EACA;EACA;EACA;AAxGF;AACA,qCAAqC;AA6GrC;EACE;KAAA;UAAA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;AA3GF;AA8GA;EACE;EACA;EACA;EACA;EACA;EACA;EACA;AA5GF;AA+GA;EACE;AA7GF;AACA;;;;EAIE;AAiHF;EACE;AA/GF;AAkHA;EACE;EACA;EACA;EACA;AAhHF;AAmHA;EACE;AAjHF;AAoHA;EACE;AAlHF;AAqHA;EACE;AAnHF;AAsHA;EACE;AApHF;AACA,8CAA8C;AAC9C,8CAA8C;AAC9C,8CAA8C;AAC9C;;;EAGE;AAyHF;EACE;EACA;EACA;EACA;EACA;AAvHF;AA0HA;;EAEE;EACA;EACA;AAxHF;AA2HA;EACE;AAzHF;AA4HA;EACE;AA1HF;AA4HA;EACE;AA1HF;AA6HA;EACE;EACA;EACA;AA3HF","sources":["webpack:///./resources/assets/less/overrides.less"],"sourcesContent":[".skin-red\n.skin-purple\n.skin-blue\n.skin-black\n.skin-orange\n.skin-yellow\n.skin-green\n.skin-red-dark\n.skin-purple-dark\n.skin-blue-dark\n.skin-black-dark\n.skin-orange-dark\n.skin-yellow-dark\n.skin-green-dark\n.skin-contrast\n.main-header\n\n.logo {\n  background-color: inherit;\n}\n.main-header .logo {\n  width: 100% !important;\n  white-space: nowrap;\n  text-align: left;\n  display: block;\n  clear: both;\n  &a:link, a:hover, a:visited   {\n    color: #fff\n  }\n}\n.huge {\n  font-size: 40px;\n}\n\n.btn-file {\n  position: relative;\n  overflow: hidden;\n}\n\n.dropdown-menu>li>a {\n  color: #354044;\n}\n\n\n#sort tr.cansort {\n  border-radius: 2px;\n  padding: 10px;\n  background: #f4f4f4;\n  margin-bottom: 3px;\n  border-left: 2px solid #e6e7e8;\n  color: #444;\n  cursor: move;\n}\n\n.user-image-inline {\n  float: left;\n  width: 25px;\n  height: 25px;\n  border-radius: 50%;\n  margin-right: 10px;\n}\n\n.input-group .input-group-addon {\n  background-color: #f4f4f4;\n}\n\na.accordion-header {\n  color: #333;\n}\n\n.dynamic-form-row {\n  padding: 10px;\n  margin: 20px;\n}\n\n\n.handle {\n  padding-left: 10px;\n}\n\n.btn-file input[type=file] {\n  position: absolute;\n  top: 0;\n  right: 0;\n  min-width: 100%;\n  min-height: 100%;\n  font-size: 100px;\n  text-align: right;\n  filter: alpha(opacity=0);\n  opacity: 0;\n  outline: none;\n  background: white;\n  cursor: inherit;\n  display: block;\n}\n.main-footer {\n  font-size: 13px;\n}\n.main-header {\n  max-height: 150px;\n}\n\n\n.navbar-nav>.user-menu>.dropdown-menu {\n  width: inherit;\n}\n.main-header .logo {\n  padding: 0px 5px 0px 15px;\n}\n\n\n.sidebar-toggle {\n  margin-left: -48px;\n  z-index: 100;\n  background-color: inherit;\n}\n\n.sidebar-toggle-mobile {\n  z-index: 100;\n  width: 50px;\n  padding-top: 10px;\n}\n\n.skin-red\n.skin-purple\n.skin-blue\n.skin-black\n.skin-orange\n.skin-yellow\n.skin-green\n.skin-red-dark\n.skin-purple-dark\n.skin-blue-dark\n.skin-black-dark\n.skin-orange-dark\n.skin-yellow-dark\n.skin-green-dark\n.skin-contrast\n.main-header\n.navbar\n.dropdown-menu li a {\n  //color: inherit;\n}\n.pull-text-right{\n  text-align: right !important;\n}\n\n.main-header .sidebar-toggle:before {\n  content: \"\\f0c9\";\n  font-weight: 900;\n  font-family: 'Font Awesome\\ 5 Free';\n}\n\n.direct-chat-contacts {\n  padding: 10px;\n  height: 150px;\n}\n\n\n.select2-container {\n  width: 100%;\n}\n.error input {\n  color: #a94442;\n  border: 2px solid #a94442 !important;\n}\n\n.error label, .alert-msg {\n  color: #a94442;\n  display: block;\n}\n\n.input-group[class*=\"col-\"] {\n  padding-right: 15px;\n  padding-left: 15px;\n}\n.control-label.multiline {\n  padding-top: 10px;\n}\n\n.btn-outline {\n  color: inherit;\n  background-color: transparent;\n  transition: all .5s;\n}\n\n.btn-primary.btn-outline {\n  color: #428bca;\n}\n\n.btn-success.btn-outline {\n  color: #5cb85c;\n}\n\n.btn-info.btn-outline {\n  color: #5bc0de;\n}\n.btn-warning{\n  background-color:#f39c12 !important;\n}\n\n.btn-warning.btn-outline {\n  color: #f0ad4e;\n}\n\n.btn-danger.btn-outline, a.link-danger:link, a.link-danger:visited, a.link-danger:hover {\n  color: #dd4b39;\n}\n\n.btn-primary.btn-outline:hover, .btn-success.btn-outline:hover, .btn-info.btn-outline:hover, .btn-warning.btn-outline:hover, .btn-danger.btn-outline:hover {\n  color: #fff;\n}\n\n.slideout-menu {\n  position: fixed;\n  top: 0;\n  right: -250px;\n  width: 250px;\n  height: 100%;\n  background: #333;\n  z-index: 100;\n  margin-top: 100px;\n  color: white;\n  padding: 10px;\n}\n.slideout-menu h3 {\n  position: relative;\n  padding: 5px 5px;\n  color: #fff;\n  font-size: 1.2em;\n  font-weight: 400;\n  border-bottom: 4px solid #222;\n}\n.slideout-menu .slideout-menu-toggle {\n  position: absolute;\n  top: 12px;\n  right: 10px;\n  display: inline-block;\n  padding: 6px 9px 5px;\n  font-family: Arial, sans-serif;\n  font-weight: bold;\n  line-height: 1;\n  background: #222;\n  color: #999;\n  text-decoration: none;\n  vertical-align: top;\n}\n.slideout-menu .slideout-menu-toggle:hover {\n  color: #fff;\n}\n.slideout-menu ul {\n  list-style: none;\n  font-weight: 300;\n  border-top: 1px solid #151515;\n  border-bottom: 1px solid #454545;\n}\n.slideout-menu ul li {\n  border-top: 1px solid #454545;\n  border-bottom: 1px solid #151515;\n}\n.slideout-menu ul li a {\n  position: relative;\n  display: block;\n  padding: 10px;\n  color: #999;\n  text-decoration: none;\n}\n.slideout-menu ul li a:hover {\n  background: #000;\n  color: #fff;\n}\n.slideout-menu ul li a i {\n  position: absolute;\n  top: 15px;\n  right: 10px;\n  opacity: .5;\n}\n\n.btn-box-tool-lg {\n  font-size: 16px;\n  color: orange;\n}\n\n\n\n.bs-wizard {margin-top: 20px;}\n\n/*Form Wizard*/\n.bs-wizard {border-bottom: solid 1px #e0e0e0; padding: 0 0 10px 0;}\n.bs-wizard > .bs-wizard-step {padding: 0; position: relative;}\n.bs-wizard > .bs-wizard-step + .bs-wizard-step {}\n.bs-wizard > .bs-wizard-step .bs-wizard-stepnum {color: #595959; font-size: 16px; margin-bottom: 5px;}\n.bs-wizard > .bs-wizard-step .bs-wizard-info {color: #999; font-size: 14px;}\n.bs-wizard > .bs-wizard-step > .bs-wizard-dot {position: absolute; width: 30px; height: 30px; display: block; background: #fbe8aa; top: 45px; left: 50%; margin-top: -15px; margin-left: -15px; border-radius: 50%;}\n.bs-wizard > .bs-wizard-step > .bs-wizard-dot:after {content: ' '; width: 14px; height: 14px; background: #fbbd19; border-radius: 50px; position: absolute; top: 8px; left: 8px; }\n.bs-wizard > .bs-wizard-step > .progress {position: relative; border-radius: 0px; height: 8px; box-shadow: none; margin: 20px 0;}\n.bs-wizard > .bs-wizard-step > .progress > .progress-bar {width:0px; box-shadow: none; background: #fbe8aa;}\n.bs-wizard > .bs-wizard-step.complete > .progress > .progress-bar {width:100%;}\n.bs-wizard > .bs-wizard-step.active > .progress > .progress-bar {width:50%;}\n.bs-wizard > .bs-wizard-step:first-child.active > .progress > .progress-bar {width:0%;}\n.bs-wizard > .bs-wizard-step:last-child.active > .progress > .progress-bar {width: 100%;}\n.bs-wizard > .bs-wizard-step.disabled > .bs-wizard-dot {background-color: #f5f5f5;}\n.bs-wizard > .bs-wizard-step.disabled > .bs-wizard-dot:after {opacity: 0;}\n.bs-wizard > .bs-wizard-step:first-child  > .progress {left: 50%; width: 50%;}\n.bs-wizard > .bs-wizard-step:last-child  > .progress {width: 50%;}\n.bs-wizard > .bs-wizard-step.disabled a.bs-wizard-dot{ pointer-events: none; }\n/*END Form Wizard*/\n\n.left-navblock {\n  display: inline-block;\n  float: left;\n  text-align: left;\n  color: white;\n  padding: 0px;\n  /* adjust based on your layout */\n\n}\n.skin-red\n.skin-purple\n.skin-blue\n.skin-black\n.skin-orange\n.skin-yellow\n.skin-green\n.skin-red-dark\n.skin-purple-dark\n.skin-blue-dark\n.skin-black-dark\n.skin-orange-dark\n.skin-yellow-dark\n.skin-green-dark\n.skin-contrast\n.main-header\n.navbar\n.dropdown-menu li a {\n  color: #333;\n}\n\na.logo.no-hover a:hover {\n  background-color: transparent;\n}\n\n\n.required {\n  border-right: 6px solid orange;\n}\n\nbody {\n  font-family: -apple-system, BlinkMacSystemFont,\n  \"Segoe UI\", \"Roboto\", \"Oxygen\", \"Ubuntu\", \"Cantarell\",\n  \"Fira Sans\", \"Droid Sans\", \"Helvetica Neue\",\n  sans-serif;\n  font-size: 13px;\n}\n\n.sidebar-menu {\n  font-size: 14px;\n  white-space: normal;\n}\n\n.modal-warning .modal-help {\n  color: #fff8af;\n}\n\n.bootstrap-table .fixed-table-container .fixed-table-body .fixed-table-loading {\n  z-index: 0 !important;\n}\n\n@media print {\n\n  @page {\n    size: A4;\n    margin: 0mm;\n  }\n\n  .tab-content > .tab-pane {\n    display: block !important;\n    opacity: 1 !important;\n    visibility: visible !important;\n  }\n\n  .img-responsive {\n    width: 200px;\n  }\n\n  html, body {\n    width: 1024px;\n  }\n\n  body {\n    margin: 0 auto;\n    line-height: 1em;\n    word-spacing:1px;\n    letter-spacing:0.2px;\n    font: 15px \"Times New Roman\", Times, serif;\n    background:white;\n    color:black;\n    width: 100%;\n    float: none;\n  }\n\n  /* avoid page-breaks inside a listingContainer*/\n  .listingContainer {\n    page-break-inside: avoid;\n  }\n\n  h1 {\n    font: 28px \"Times New Roman\", Times, serif;\n  }\n\n  h2 {\n    font: 24px \"Times New Roman\", Times, serif;\n  }\n\n  h3 {\n    font: 20px \"Times New Roman\", Times, serif;\n  }\n\n  /* Improve colour contrast of links */\n  a:link, a:visited {\n    color: #781351\n  }\n\n  /* URL */\n  a:link, a:visited {\n    background: transparent;\n    color:#333;\n    text-decoration:none;\n  }\n\n  a[href]:after {\n    content: \"\" !important;\n  }\n\n  a[href^=\"http://\"] {\n    color:#000;\n  }\n\n  #header {\n    height:75px;\n    font-size: 24pt;\n    color:black\n  }\n\n  div.row-new-striped {\n    margin: 0px;\n    padding: 0px;\n  }\n\n  .pagination-detail, .fixed-table-toolbar {\n    visibility: hidden;\n  }\n  .col-sm-1, .col-sm-2, .col-sm-3, .col-sm-4, .col-sm-5, .col-sm-6, .col-sm-7, .col-sm-8, .col-sm-9, .col-sm-10, .col-sm-11, .col-sm-12 .col-sm-pull-3 .col-sm-push-9 {\n    float: left;\n  }\n\n  .col-sm-12 {\n    width: 100%;\n  }\n  .col-sm-11 {\n    width: 91.66666666666666%;\n  }\n  .col-sm-10 {\n    width: 83.33333333333334%;\n  }\n  .col-sm-9 {\n    width: 75%;\n  }\n  .col-sm-8 {\n    width: 66.66666666666666%;\n  }\n  .col-sm-7 {\n    width: 58.333333333333336%;\n  }\n  .col-sm-6 {\n    width: 50%;\n  }\n  .col-sm-5 {\n    width: 41.66666666666667%;\n  }\n  .col-sm-4 {\n    width: 33.33333333333333%;\n  }\n  .col-sm-3 {\n    width: 25%;\n  }\n  .col-sm-2 {\n    width: 16.666666666666664%;\n  }\n  .col-sm-1 {\n    width: 8.333333333333332%;\n  }\n\n}\n\n\n.select2-selection__choice__remove {\n  color: white !important;\n}\n\n.select2-selection--multiple {\n    border-color: #d2d6de !important;\n    overflow-y: auto;\n}\n\n.select2-selection__choice {\n  border-radius: 0px !important;\n}\n\n.select2-search select2-search--inline {\n  height: 35px !important;\n  float: left;\n  margin: 0;\n}\n\n\n\n.select2-results__option {\n  padding: 5px;\n  user-select: none;\n  -webkit-user-select: none;\n  margin: 0px;\n}\n\nimg.navbar-brand-img, .navbar-brand>img {\n  float: left;\n  padding: 5px 5px 5px 0;\n  max-height: 50px;\n}\n\n.input-daterange, .input-daterange input:first-child, .input-daterange input:last-child {\n  border-radius: 0px !important;\n}\n\n.btn.bg-maroon, .btn.bg-purple{\n  min-width:90px;\n}\n\n[hidden] {\n  display: none !important;\n}\n\n#toolbar {\n  margin-top: 10px;\n}\n\n#uploadPreview {\n  border-color: grey;\n  border-width: 1px;\n  border-style: solid\n}\n\n.icon-med {\n  font-size: 14px;\n  color: #889195;\n}\n\n#login-logo {\n  padding-top: 20px;\n  padding-bottom: 10px;\n  max-width: 200px\n}\n\n// accessibility skip link\na.skip-main {\n  left:-999px;\n  position:absolute;\n  top:auto;\n  width:1px;\n  height:1px;\n  overflow:hidden;\n  z-index:-999;\n}\na.skip-main:focus, a.skip-main:active {\n  color: #fff;\n  background-color:#000;\n  left: auto;\n  top: auto;\n  width: 30%;\n  height: auto;\n  overflow:auto;\n  margin: 10px 35%;\n  padding:5px;\n  border-radius: 15px;\n  border:4px solid yellow;\n  text-align:center;\n  font-size:1.2em;\n  z-index:999;\n}\n\nh2 {\n  font-size: 22px;\n}\n\nh2.task_menu {\n  font-size: 14px;\n}\n\nh2 small {\n  font-size: 85%;\n}\n\nh3 {\n  font-size: 20px;\n}\n\nh4 {\n  font-size: 16px;\n}\n\n\n.row-striped {\n  vertical-align: top;\n  line-height: 2.6;\n  padding: 0px;\n  margin-left: 20px;\n  box-sizing: border-box;\n  //border-left: 1px solid #dddddd;\n  //border-right: 1px solid #dddddd;\n  display: table;\n\n}\n\n.row-striped .row:nth-of-type(odd) div {\n  background-color: #f9f9f9;\n  border-top: 1px solid #dddddd;\n  display: table-cell;\n\n}\n\n.row-striped .row:nth-of-type(even) div {\n  background: #FFFFFF;\n  border-top: 1px solid #dddddd;\n  display: table-cell;\n}\n\n\n.row-new-striped {\n  vertical-align: top;\n  line-height: 2.6;\n  padding: 0px;\n  margin-left: 20px;\n  display: table;\n  width: 100%;\n  padding-right: 20px;\n}\n\n/**\n*  NEW STRIPING\n*  This section is for the new row striping for nicer \n* display for non-table data as of v6\n**/\n.row-new-striped  > .row:nth-of-type(even) {\n  background: #FFFFFF;\n  border-top: 1px solid #dddddd;\n  display: table-row;\n\n}\n\n.row-new-striped > .row:nth-of-type(odd)  {\n  background-color: #F8F8F8;\n  border-top: 1px solid #dddddd;\n  display: table-row;\n\n}\n\n.row-new-striped div {\n  display: table-cell;\n  border-top: 1px solid #dddddd;\n}\n\n.row-new-striped div {\n  display: table-cell;\n  border-top: 1px solid #dddddd;\n}\n\n\n.row-new-striped div[class^=\"col\"]:first-child {\n  font-weight: bold;\n}\n\n\n\n/**\n* This just adds a little extra padding on mobile\n**/\n@media only screen and (max-width: 520px) {\n  h1.pagetitle {\n    padding-top: 15px;\n    padding-bottom: 15px;\n  }\n\n  .firstnav {\n    padding-top: 120px !important;\n  }\n\n  .product {\n    width: 400px;\n  }\n\n  .product img {\n    min-width: 400px;\n  }\n}\n\n.card-view-title {\n  min-width: 40% !important;\n  line-height: 3.0!important;\n  padding-right: 20px;\n}\n\n.card-view {\n  display: table-row;\n  flex-direction: column;\n}\n\n// ---------------\n\n/**\n\n COLUMN SELECTOR ICONS\n -----------------------------\n This is kind of weird, but it is necessary to prevent the column-selector code from barfing, since\n any HTML used in the UserPresenter \"title\" attribute breaks the column selector HTML.\n\n Instead, we use CSS to add the icon into the table header, which leaves the column selector\n \"title\" text as-is.\n\n See https://github.com/grokability/snipe-it/issues/7989\n\n */\n\nth.css-barcode > .th-inner,\nth.css-license > .th-inner,\nth.css-consumable > .th-inner,\nth.css-envelope > .th-inner,\nth.css-users > .th-inner,\nth.css-location > .th-inner,\nth.css-component > .th-inner,\nth.css-accessory > .th-inner\n{\n  font-size: 0px;\n  line-height: .75!important;\n  text-align: left;\n  text-rendering: auto;\n  -webkit-font-smoothing: antialiased;\n  -moz-osx-font-smoothing: grayscale;\n}\n\n\nth.css-padlock > .th-inner::before,\nth.css-barcode > .th-inner::before,\nth.css-license > .th-inner::before,\nth.css-consumable > .th-inner::before,\nth.css-envelope > .th-inner::before,\nth.css-users > .th-inner::before,\nth.css-location > .th-inner::before,\nth.css-component > .th-inner::before,\nth.css-accessory > .th-inner::before\n\n{\n  display: inline-block;\n  font-size: 20px;\n  font-family: \"Font Awesome 5 Free\";\n  font-weight: 900;\n}\n\nth.css-padlock > .th-inner::before\n{\n  content: \"\\f023\";\n  font-family: \"Font Awesome 5 Free\";\n  font-weight: 900;\n  padding-right: 4px;\n  font-size: 12px;\n}\n\n/**\nBEGIN ICON TABLE HEADERS\nSet the font-weight css property as 900 (For Solid), 400 (Regular or Brands), 300 (Light for pro icons).\n**/\nth.css-barcode > .th-inner::before\n{\n  content: \"\\f02a\"; font-family: \"Font Awesome 5 Free\"; font-weight: 900;\n}\n\nth.css-license > .th-inner::before\n{\n  content: \"\\f0c7\"; font-family: \"Font Awesome 5 Free\"; font-weight: 400;\n}\n\nth.css-consumable > .th-inner::before\n{\n  content: \"\\f043\"; font-family: \"Font Awesome 5 Free\"; font-weight: 900;\n}\n\nth.css-envelope > .th-inner::before\n{\n  content: \"\\f0e0\"; font-family: \"Font Awesome 5 Free\"; font-weight: 400;\n}\n\nth.css-accessory > .th-inner::before\n{\n  content: \"\\f11c\"; font-family: \"Font Awesome 5 Free\"; font-weight: 400;\n}\n\nth.css-users > .th-inner::before {\n  content: \"\\f0c0\"; font-family: \"Font Awesome 5 Free\"; font-size: 15px;\n}\n\nth.css-location > .th-inner::before {\n  content: \"\\f3c5\"; font-family: \"Font Awesome 5 Free\"; font-size: 19px; margin-bottom: 0px;\n}\n\nth.css-component > .th-inner::before\n{\n  content: \"\\f0a0\"; font-family: \"Font Awesome 5 Free\"; font-weight: 500;\n}\n\n\n.small-box .inner {\n  padding-left: 15px;\n  padding-right: 15px;\n  padding-top: 15px;\n  color: #fff;\n}\n\n\n.small-box > a:link, .small-box > a:visited, .small-box > a:hover {\n  color: #fff;\n}\n\n.select2-container--default .select2-selection--single, .select2-selection .select2-selection--single {\n  border: 1px solid #d2d6de;\n  border-radius: 0;\n  padding: 6px 12px;\n  height: 34px;\n}\n\n.form-group.has-error label {\n  color: #a94442;\n}\n\n.select2-container--default .select2-selection--multiple {\n  border-radius: 0px;\n}\n\n@media screen and (max-width: 511px){\n  .tab-content .tab-pane .alert-block {\n    margin-top: 120px\n  }\n  .sidebar-menu{\n    margin-top:160px;\n  }\n}\n@media screen and (max-width: 912px) and (min-width: 512px){\n  .sidebar-menu {\n    margin-top:100px\n  }\n  .navbar-custom-menu > .navbar-nav > li.dropdown.user.user-menu {\n    float:right;\n  }\n  .navbar-custom-menu > .navbar-nav > li > .dropdown-menu {\n    margin-right:-39px;\n  }\n}\n\n@media screen and (max-width: 1268px) and (min-width: 912px){\n  .sidebar-menu {\n    margin-top:50px\n  }\n}\n@media screen and (max-width: 992px){\n  .info-stack-container {\n    display: flex;\n    flex-direction: column;\n  }\n  .col-md-3.col-xs-12.col-sm-push-9.info-stack{\n    left:auto;\n    order:1;\n  }\n  .col-md-9.col-xs-12.col-sm-pull-3.info-stack{\n    right:auto;\n    order:2;\n  }\n  .info-stack-container > .col-md-9.col-xs-12.col-sm-pull-3.info-stack > .row-new-striped > .row > .col-sm-2{\n    width:auto;\n    float:none;\n  }\n}\n@media screen and (max-width: 1318px) and (min-width: 1200px){\n  .admin.box{\n    height:170px;\n  }\n}\n@media screen and (max-width: 1494px) and (min-width: 1200px){\n  .dashboard.small-box{\n    white-space: nowrap;\n    text-overflow: ellipsis;\n    max-width: 188px;\n    display: block;\n    overflow: hidden;\n  }\n}\n\n/** Form-stuff overrides for checkboxes and stuff **/\n\nlabel.form-control {\n  display: grid;\n  grid-template-columns: 1.8em auto;\n  gap: 0.5em;\n  border: 0px;\n  padding-left: 0px;\n  background-color: inherit;\n  color: inherit;\n  font-size: inherit;\n  font-weight: inherit;\n}\n\nlabel.form-control--disabled {\n  color: #959495;\n  pointer-events:none;\n  cursor: not-allowed;\n}\n\n/** --------------------------------------- **/\n/** Start checkbox styles to replace iCheck **/\n/** --------------------------------------- **/\ninput[type=\"checkbox\"] {\n  /* Add if not using autoprefixer */\n  -webkit-appearance: none;\n  appearance: none;\n  /* For iOS < 15 to remove gradient background */\n  background-color: #fff;\n  /* Not removed via appearance */\n  margin: 0;\n  font: inherit;\n  color: #959495;\n  width: 1.8em;\n  height: 1.8em;\n  border: 0.05em solid;\n  border-radius: 0em;\n  transform: translateY(-0.075em);\n  display: grid;\n  place-content: center;\n  /*Windows High Contrast Mode*/\n}\n\n/** This sets the display of a checkbox, and what the \"fill\" checkmark should look like */\n\ninput[type=\"checkbox\"]::before {\n\n  /** If you want to use the non-checkbox, filled square, use this instead **/\n  content: \"\";\n  width: 1em;\n  height: 1em;\n  transform: scale(0);\n  transition: 120ms transform ease-in-out;\n  box-shadow: inset 1em 1em rgb(211, 211, 211);\n\n  content: \"\";\n  width: 1em;\n  height: 1em;\n  clip-path: polygon(14% 44%, 0 65%, 50% 100%, 100% 16%, 80% 0%, 43% 62%);\n  transform: scale(0);\n  transform-origin: bottom left;\n  transition: 120ms transform ease-in-out;\n  box-shadow: inset 1em 1em #428bca;\n  /* Windows High Contrast Mode */\n  background-color: CanvasText;\n}\n\n/** This sets the size of the scale up for the shape we defined above **/\ninput[type=\"checkbox\"]:checked::before {\n  transform: scale(1);\n}\n\n/** This sets the scale and color of the DISABLED but CHECKED checkbox */\ninput[type=checkbox]:disabled::before, input[type=radio]:disabled::before {\n  content: \"\";\n  width: 1em;\n  height: 1em;\n  transform: scale(1);\n  box-shadow: inset 1em 1em rgb(211, 211, 211);\n}\n\n/* This sets the scale and style of a DISABLED checkbox that is NOT checked */\ninput[type=checkbox]:disabled:not(:checked)::before, input[type=radio]:disabled:not(:checked)::before {\n  content: \"\";\n  transform: scale(0);\n  cursor: not-allowed;\n  pointer-events:none;\n}\n\n/** this is the color of the checkbox and content on a disabled, checked box **/\ninput[type=checkbox]:disabled, input[type=radio]:disabled {\n  --form-control-color: rgb(211, 211, 211);\n  color: #959495;\n  cursor: not-allowed;\n  pointer-events:none;\n}\n\n\n/** Radio styles to replace iCheck **/\n\ninput[type=\"radio\"] {\n  appearance: none;\n  background-color: #fff;\n  margin: 0;\n  font: inherit;\n  color: #959495;\n  width: 1.8em;\n  height: 1.8em;\n  border: 0.05em solid;\n  border-radius: 50%;\n  transform: translateY(-0.075em);\n  display: grid;\n  place-content: center;\n}\n\ninput[type=\"radio\"]::before {\n  content: \"\";\n  width: 1em;\n  height: 1em;\n  border-radius: 50%;\n  transform: scale(0);\n  transition: 120ms transform ease-in-out;\n  box-shadow: inset 1em 1em #428bca;\n}\n\ninput[type=\"radio\"]:checked::before {\n  transform: scale(1);\n}\n\n\n/**\n* This addresses the column selector in bootstrap-table. Without these two lines, the\n* checkbox and the <span></span> with the label text that BS tables generates will\n* end up on two different lines and it looks assy.\n */\n.dropdown-item-marker input[type=checkbox] {\n  font-size: 10px;\n}\n\n.bootstrap-table .fixed-table-toolbar li.dropdown-item-marker label {\n  font-weight: normal;\n  display: grid;\n  grid-template-columns: .1em auto;\n  gap: 1.5em;\n}\n\n.container.row-striped .col-md-6 {\n  overflow-wrap:anywhere;\n}\n\n.nav-tabs-custom > .nav-tabs > li {\n  z-index: 1;\n}\n\n.select2-container .select2-search--inline .select2-search__field{\n  padding-left:15px;\n}\n\n.nav-tabs-custom > .nav-tabs > li.active {\n  font-weight: bold;\n}\n\n/** --------------------------------------- **/\n/** End checkbox styles to replace iCheck   **/\n/** --------------------------------------- **/\n\n/**\n/** Separator styles with text in the middle. Currently only used by the login page but\n/** could be used elsewhere.\n */\n\n.separator {\n  display: flex;\n  align-items: center;\n  text-align: center;\n  padding-top: 20px;\n  color: #959495;\n}\n\n.separator::before,\n.separator::after {\n  content: '';\n  flex: 1;\n  border-bottom: 1px solid #959495;\n}\n\n.separator:not(:empty)::before {\n  margin-right: .25em;\n}\n\n.separator:not(:empty)::after {\n  margin-left: .25em;\n}\n.datepicker.dropdown-menu {\n  z-index: 1030 !important;\n}\n\n.sidebar-menu > li .badge {\n  margin-top: 0px;\n  filter: brightness(70%);\n  font-size: 70%;\n}\n"],"names":[],"sourceRoot":""}
diff --git a/public/css/dist/all.css b/public/css/dist/all.css
index 48cf0fefe1..5d809f514e 100644
--- a/public/css/dist/all.css
+++ b/public/css/dist/all.css
@@ -6833,7 +6833,7 @@ button.close {
 }
 /*# sourceMappingURL=bootstrap.css.map */
 /*!
- * Font Awesome Free 6.5.2 by @fontawesome - https://fontawesome.com
+ * Font Awesome Free 6.7.2 by @fontawesome - https://fontawesome.com
  * License - https://fontawesome.com/license/free (Icons: CC BY 4.0, Fonts: SIL OFL 1.1, Code: MIT License)
  * Copyright 2024 Fonticons, Inc.
  */
@@ -6841,15 +6841,13 @@ button.close {
   font-family: var(--fa-style-family, "Font Awesome 6 Free");
   font-weight: var(--fa-style, 900); }
 
-.fa,
-.fa-classic,
-.fa-sharp,
 .fas,
-.fa-solid,
 .far,
-.fa-regular,
 .fab,
-.fa-brands {
+.fa-solid,
+.fa-regular,
+.fa-brands,
+.fa {
   -moz-osx-font-smoothing: grayscale;
   -webkit-font-smoothing: antialiased;
   display: var(--fa-display, inline-block);
@@ -6858,15 +6856,24 @@ button.close {
   line-height: 1;
   text-rendering: auto; }
 
-.fas,
+.fas::before,
+.far::before,
+.fab::before,
+.fa-solid::before,
+.fa-regular::before,
+.fa-brands::before,
+.fa::before {
+  content: var(--fa); }
+
 .fa-classic,
+.fas,
 .fa-solid,
 .far,
 .fa-regular {
   font-family: 'Font Awesome 6 Free'; }
 
-.fab,
-.fa-brands {
+.fa-brands,
+.fab {
   font-family: 'Font Awesome 6 Brands'; }
 
 .fa-1x {
@@ -6941,7 +6948,7 @@ button.close {
     position: relative; }
 
 .fa-li {
-  left: calc(var(--fa-li-width, 2em) * -1);
+  left: calc(-1 * var(--fa-li-width, 2em));
   position: absolute;
   text-align: center;
   width: var(--fa-li-width, 2em);
@@ -6963,118 +6970,71 @@ button.close {
   margin-left: var(--fa-pull-margin, 0.3em); }
 
 .fa-beat {
-  -webkit-animation-name: fa-beat;
-          animation-name: fa-beat;
-  -webkit-animation-delay: var(--fa-animation-delay, 0s);
-          animation-delay: var(--fa-animation-delay, 0s);
-  -webkit-animation-direction: var(--fa-animation-direction, normal);
-          animation-direction: var(--fa-animation-direction, normal);
-  -webkit-animation-duration: var(--fa-animation-duration, 1s);
-          animation-duration: var(--fa-animation-duration, 1s);
-  -webkit-animation-iteration-count: var(--fa-animation-iteration-count, infinite);
-          animation-iteration-count: var(--fa-animation-iteration-count, infinite);
-  -webkit-animation-timing-function: var(--fa-animation-timing, ease-in-out);
-          animation-timing-function: var(--fa-animation-timing, ease-in-out); }
+  animation-name: fa-beat;
+  animation-delay: var(--fa-animation-delay, 0s);
+  animation-direction: var(--fa-animation-direction, normal);
+  animation-duration: var(--fa-animation-duration, 1s);
+  animation-iteration-count: var(--fa-animation-iteration-count, infinite);
+  animation-timing-function: var(--fa-animation-timing, ease-in-out); }
 
 .fa-bounce {
-  -webkit-animation-name: fa-bounce;
-          animation-name: fa-bounce;
-  -webkit-animation-delay: var(--fa-animation-delay, 0s);
-          animation-delay: var(--fa-animation-delay, 0s);
-  -webkit-animation-direction: var(--fa-animation-direction, normal);
-          animation-direction: var(--fa-animation-direction, normal);
-  -webkit-animation-duration: var(--fa-animation-duration, 1s);
-          animation-duration: var(--fa-animation-duration, 1s);
-  -webkit-animation-iteration-count: var(--fa-animation-iteration-count, infinite);
-          animation-iteration-count: var(--fa-animation-iteration-count, infinite);
-  -webkit-animation-timing-function: var(--fa-animation-timing, cubic-bezier(0.28, 0.84, 0.42, 1));
-          animation-timing-function: var(--fa-animation-timing, cubic-bezier(0.28, 0.84, 0.42, 1)); }
+  animation-name: fa-bounce;
+  animation-delay: var(--fa-animation-delay, 0s);
+  animation-direction: var(--fa-animation-direction, normal);
+  animation-duration: var(--fa-animation-duration, 1s);
+  animation-iteration-count: var(--fa-animation-iteration-count, infinite);
+  animation-timing-function: var(--fa-animation-timing, cubic-bezier(0.28, 0.84, 0.42, 1)); }
 
 .fa-fade {
-  -webkit-animation-name: fa-fade;
-          animation-name: fa-fade;
-  -webkit-animation-delay: var(--fa-animation-delay, 0s);
-          animation-delay: var(--fa-animation-delay, 0s);
-  -webkit-animation-direction: var(--fa-animation-direction, normal);
-          animation-direction: var(--fa-animation-direction, normal);
-  -webkit-animation-duration: var(--fa-animation-duration, 1s);
-          animation-duration: var(--fa-animation-duration, 1s);
-  -webkit-animation-iteration-count: var(--fa-animation-iteration-count, infinite);
-          animation-iteration-count: var(--fa-animation-iteration-count, infinite);
-  -webkit-animation-timing-function: var(--fa-animation-timing, cubic-bezier(0.4, 0, 0.6, 1));
-          animation-timing-function: var(--fa-animation-timing, cubic-bezier(0.4, 0, 0.6, 1)); }
+  animation-name: fa-fade;
+  animation-delay: var(--fa-animation-delay, 0s);
+  animation-direction: var(--fa-animation-direction, normal);
+  animation-duration: var(--fa-animation-duration, 1s);
+  animation-iteration-count: var(--fa-animation-iteration-count, infinite);
+  animation-timing-function: var(--fa-animation-timing, cubic-bezier(0.4, 0, 0.6, 1)); }
 
 .fa-beat-fade {
-  -webkit-animation-name: fa-beat-fade;
-          animation-name: fa-beat-fade;
-  -webkit-animation-delay: var(--fa-animation-delay, 0s);
-          animation-delay: var(--fa-animation-delay, 0s);
-  -webkit-animation-direction: var(--fa-animation-direction, normal);
-          animation-direction: var(--fa-animation-direction, normal);
-  -webkit-animation-duration: var(--fa-animation-duration, 1s);
-          animation-duration: var(--fa-animation-duration, 1s);
-  -webkit-animation-iteration-count: var(--fa-animation-iteration-count, infinite);
-          animation-iteration-count: var(--fa-animation-iteration-count, infinite);
-  -webkit-animation-timing-function: var(--fa-animation-timing, cubic-bezier(0.4, 0, 0.6, 1));
-          animation-timing-function: var(--fa-animation-timing, cubic-bezier(0.4, 0, 0.6, 1)); }
+  animation-name: fa-beat-fade;
+  animation-delay: var(--fa-animation-delay, 0s);
+  animation-direction: var(--fa-animation-direction, normal);
+  animation-duration: var(--fa-animation-duration, 1s);
+  animation-iteration-count: var(--fa-animation-iteration-count, infinite);
+  animation-timing-function: var(--fa-animation-timing, cubic-bezier(0.4, 0, 0.6, 1)); }
 
 .fa-flip {
-  -webkit-animation-name: fa-flip;
-          animation-name: fa-flip;
-  -webkit-animation-delay: var(--fa-animation-delay, 0s);
-          animation-delay: var(--fa-animation-delay, 0s);
-  -webkit-animation-direction: var(--fa-animation-direction, normal);
-          animation-direction: var(--fa-animation-direction, normal);
-  -webkit-animation-duration: var(--fa-animation-duration, 1s);
-          animation-duration: var(--fa-animation-duration, 1s);
-  -webkit-animation-iteration-count: var(--fa-animation-iteration-count, infinite);
-          animation-iteration-count: var(--fa-animation-iteration-count, infinite);
-  -webkit-animation-timing-function: var(--fa-animation-timing, ease-in-out);
-          animation-timing-function: var(--fa-animation-timing, ease-in-out); }
+  animation-name: fa-flip;
+  animation-delay: var(--fa-animation-delay, 0s);
+  animation-direction: var(--fa-animation-direction, normal);
+  animation-duration: var(--fa-animation-duration, 1s);
+  animation-iteration-count: var(--fa-animation-iteration-count, infinite);
+  animation-timing-function: var(--fa-animation-timing, ease-in-out); }
 
 .fa-shake {
-  -webkit-animation-name: fa-shake;
-          animation-name: fa-shake;
-  -webkit-animation-delay: var(--fa-animation-delay, 0s);
-          animation-delay: var(--fa-animation-delay, 0s);
-  -webkit-animation-direction: var(--fa-animation-direction, normal);
-          animation-direction: var(--fa-animation-direction, normal);
-  -webkit-animation-duration: var(--fa-animation-duration, 1s);
-          animation-duration: var(--fa-animation-duration, 1s);
-  -webkit-animation-iteration-count: var(--fa-animation-iteration-count, infinite);
-          animation-iteration-count: var(--fa-animation-iteration-count, infinite);
-  -webkit-animation-timing-function: var(--fa-animation-timing, linear);
-          animation-timing-function: var(--fa-animation-timing, linear); }
+  animation-name: fa-shake;
+  animation-delay: var(--fa-animation-delay, 0s);
+  animation-direction: var(--fa-animation-direction, normal);
+  animation-duration: var(--fa-animation-duration, 1s);
+  animation-iteration-count: var(--fa-animation-iteration-count, infinite);
+  animation-timing-function: var(--fa-animation-timing, linear); }
 
 .fa-spin {
-  -webkit-animation-name: fa-spin;
-          animation-name: fa-spin;
-  -webkit-animation-delay: var(--fa-animation-delay, 0s);
-          animation-delay: var(--fa-animation-delay, 0s);
-  -webkit-animation-direction: var(--fa-animation-direction, normal);
-          animation-direction: var(--fa-animation-direction, normal);
-  -webkit-animation-duration: var(--fa-animation-duration, 2s);
-          animation-duration: var(--fa-animation-duration, 2s);
-  -webkit-animation-iteration-count: var(--fa-animation-iteration-count, infinite);
-          animation-iteration-count: var(--fa-animation-iteration-count, infinite);
-  -webkit-animation-timing-function: var(--fa-animation-timing, linear);
-          animation-timing-function: var(--fa-animation-timing, linear); }
+  animation-name: fa-spin;
+  animation-delay: var(--fa-animation-delay, 0s);
+  animation-direction: var(--fa-animation-direction, normal);
+  animation-duration: var(--fa-animation-duration, 2s);
+  animation-iteration-count: var(--fa-animation-iteration-count, infinite);
+  animation-timing-function: var(--fa-animation-timing, linear); }
 
 .fa-spin-reverse {
   --fa-animation-direction: reverse; }
 
 .fa-pulse,
 .fa-spin-pulse {
-  -webkit-animation-name: fa-spin;
-          animation-name: fa-spin;
-  -webkit-animation-direction: var(--fa-animation-direction, normal);
-          animation-direction: var(--fa-animation-direction, normal);
-  -webkit-animation-duration: var(--fa-animation-duration, 1s);
-          animation-duration: var(--fa-animation-duration, 1s);
-  -webkit-animation-iteration-count: var(--fa-animation-iteration-count, infinite);
-          animation-iteration-count: var(--fa-animation-iteration-count, infinite);
-  -webkit-animation-timing-function: var(--fa-animation-timing, steps(8));
-          animation-timing-function: var(--fa-animation-timing, steps(8)); }
+  animation-name: fa-spin;
+  animation-direction: var(--fa-animation-direction, normal);
+  animation-duration: var(--fa-animation-duration, 1s);
+  animation-iteration-count: var(--fa-animation-iteration-count, infinite);
+  animation-timing-function: var(--fa-animation-timing, steps(8)); }
 
 @media (prefers-reduced-motion: reduce) {
   .fa-beat,
@@ -7086,219 +7046,97 @@ button.close {
   .fa-shake,
   .fa-spin,
   .fa-spin-pulse {
-    -webkit-animation-delay: -1ms;
-            animation-delay: -1ms;
-    -webkit-animation-duration: 1ms;
-            animation-duration: 1ms;
-    -webkit-animation-iteration-count: 1;
-            animation-iteration-count: 1;
-    -webkit-transition-delay: 0s;
-            transition-delay: 0s;
-    -webkit-transition-duration: 0s;
-            transition-duration: 0s; } }
-
-@-webkit-keyframes fa-beat {
-  0%, 90% {
-    -webkit-transform: scale(1);
-            transform: scale(1); }
-  45% {
-    -webkit-transform: scale(var(--fa-beat-scale, 1.25));
-            transform: scale(var(--fa-beat-scale, 1.25)); } }
+    animation-delay: -1ms;
+    animation-duration: 1ms;
+    animation-iteration-count: 1;
+    transition-delay: 0s;
+    transition-duration: 0s; } }
 
 @keyframes fa-beat {
   0%, 90% {
-    -webkit-transform: scale(1);
-            transform: scale(1); }
+    transform: scale(1); }
   45% {
-    -webkit-transform: scale(var(--fa-beat-scale, 1.25));
-            transform: scale(var(--fa-beat-scale, 1.25)); } }
-
-@-webkit-keyframes fa-bounce {
-  0% {
-    -webkit-transform: scale(1, 1) translateY(0);
-            transform: scale(1, 1) translateY(0); }
-  10% {
-    -webkit-transform: scale(var(--fa-bounce-start-scale-x, 1.1), var(--fa-bounce-start-scale-y, 0.9)) translateY(0);
-            transform: scale(var(--fa-bounce-start-scale-x, 1.1), var(--fa-bounce-start-scale-y, 0.9)) translateY(0); }
-  30% {
-    -webkit-transform: scale(var(--fa-bounce-jump-scale-x, 0.9), var(--fa-bounce-jump-scale-y, 1.1)) translateY(var(--fa-bounce-height, -0.5em));
-            transform: scale(var(--fa-bounce-jump-scale-x, 0.9), var(--fa-bounce-jump-scale-y, 1.1)) translateY(var(--fa-bounce-height, -0.5em)); }
-  50% {
-    -webkit-transform: scale(var(--fa-bounce-land-scale-x, 1.05), var(--fa-bounce-land-scale-y, 0.95)) translateY(0);
-            transform: scale(var(--fa-bounce-land-scale-x, 1.05), var(--fa-bounce-land-scale-y, 0.95)) translateY(0); }
-  57% {
-    -webkit-transform: scale(1, 1) translateY(var(--fa-bounce-rebound, -0.125em));
-            transform: scale(1, 1) translateY(var(--fa-bounce-rebound, -0.125em)); }
-  64% {
-    -webkit-transform: scale(1, 1) translateY(0);
-            transform: scale(1, 1) translateY(0); }
-  100% {
-    -webkit-transform: scale(1, 1) translateY(0);
-            transform: scale(1, 1) translateY(0); } }
+    transform: scale(var(--fa-beat-scale, 1.25)); } }
 
 @keyframes fa-bounce {
   0% {
-    -webkit-transform: scale(1, 1) translateY(0);
-            transform: scale(1, 1) translateY(0); }
+    transform: scale(1, 1) translateY(0); }
   10% {
-    -webkit-transform: scale(var(--fa-bounce-start-scale-x, 1.1), var(--fa-bounce-start-scale-y, 0.9)) translateY(0);
-            transform: scale(var(--fa-bounce-start-scale-x, 1.1), var(--fa-bounce-start-scale-y, 0.9)) translateY(0); }
+    transform: scale(var(--fa-bounce-start-scale-x, 1.1), var(--fa-bounce-start-scale-y, 0.9)) translateY(0); }
   30% {
-    -webkit-transform: scale(var(--fa-bounce-jump-scale-x, 0.9), var(--fa-bounce-jump-scale-y, 1.1)) translateY(var(--fa-bounce-height, -0.5em));
-            transform: scale(var(--fa-bounce-jump-scale-x, 0.9), var(--fa-bounce-jump-scale-y, 1.1)) translateY(var(--fa-bounce-height, -0.5em)); }
+    transform: scale(var(--fa-bounce-jump-scale-x, 0.9), var(--fa-bounce-jump-scale-y, 1.1)) translateY(var(--fa-bounce-height, -0.5em)); }
   50% {
-    -webkit-transform: scale(var(--fa-bounce-land-scale-x, 1.05), var(--fa-bounce-land-scale-y, 0.95)) translateY(0);
-            transform: scale(var(--fa-bounce-land-scale-x, 1.05), var(--fa-bounce-land-scale-y, 0.95)) translateY(0); }
+    transform: scale(var(--fa-bounce-land-scale-x, 1.05), var(--fa-bounce-land-scale-y, 0.95)) translateY(0); }
   57% {
-    -webkit-transform: scale(1, 1) translateY(var(--fa-bounce-rebound, -0.125em));
-            transform: scale(1, 1) translateY(var(--fa-bounce-rebound, -0.125em)); }
+    transform: scale(1, 1) translateY(var(--fa-bounce-rebound, -0.125em)); }
   64% {
-    -webkit-transform: scale(1, 1) translateY(0);
-            transform: scale(1, 1) translateY(0); }
+    transform: scale(1, 1) translateY(0); }
   100% {
-    -webkit-transform: scale(1, 1) translateY(0);
-            transform: scale(1, 1) translateY(0); } }
-
-@-webkit-keyframes fa-fade {
-  50% {
-    opacity: var(--fa-fade-opacity, 0.4); } }
+    transform: scale(1, 1) translateY(0); } }
 
 @keyframes fa-fade {
   50% {
     opacity: var(--fa-fade-opacity, 0.4); } }
 
-@-webkit-keyframes fa-beat-fade {
-  0%, 100% {
-    opacity: var(--fa-beat-fade-opacity, 0.4);
-    -webkit-transform: scale(1);
-            transform: scale(1); }
-  50% {
-    opacity: 1;
-    -webkit-transform: scale(var(--fa-beat-fade-scale, 1.125));
-            transform: scale(var(--fa-beat-fade-scale, 1.125)); } }
-
 @keyframes fa-beat-fade {
   0%, 100% {
     opacity: var(--fa-beat-fade-opacity, 0.4);
-    -webkit-transform: scale(1);
-            transform: scale(1); }
+    transform: scale(1); }
   50% {
     opacity: 1;
-    -webkit-transform: scale(var(--fa-beat-fade-scale, 1.125));
-            transform: scale(var(--fa-beat-fade-scale, 1.125)); } }
-
-@-webkit-keyframes fa-flip {
-  50% {
-    -webkit-transform: rotate3d(var(--fa-flip-x, 0), var(--fa-flip-y, 1), var(--fa-flip-z, 0), var(--fa-flip-angle, -180deg));
-            transform: rotate3d(var(--fa-flip-x, 0), var(--fa-flip-y, 1), var(--fa-flip-z, 0), var(--fa-flip-angle, -180deg)); } }
+    transform: scale(var(--fa-beat-fade-scale, 1.125)); } }
 
 @keyframes fa-flip {
   50% {
-    -webkit-transform: rotate3d(var(--fa-flip-x, 0), var(--fa-flip-y, 1), var(--fa-flip-z, 0), var(--fa-flip-angle, -180deg));
-            transform: rotate3d(var(--fa-flip-x, 0), var(--fa-flip-y, 1), var(--fa-flip-z, 0), var(--fa-flip-angle, -180deg)); } }
-
-@-webkit-keyframes fa-shake {
-  0% {
-    -webkit-transform: rotate(-15deg);
-            transform: rotate(-15deg); }
-  4% {
-    -webkit-transform: rotate(15deg);
-            transform: rotate(15deg); }
-  8%, 24% {
-    -webkit-transform: rotate(-18deg);
-            transform: rotate(-18deg); }
-  12%, 28% {
-    -webkit-transform: rotate(18deg);
-            transform: rotate(18deg); }
-  16% {
-    -webkit-transform: rotate(-22deg);
-            transform: rotate(-22deg); }
-  20% {
-    -webkit-transform: rotate(22deg);
-            transform: rotate(22deg); }
-  32% {
-    -webkit-transform: rotate(-12deg);
-            transform: rotate(-12deg); }
-  36% {
-    -webkit-transform: rotate(12deg);
-            transform: rotate(12deg); }
-  40%, 100% {
-    -webkit-transform: rotate(0deg);
-            transform: rotate(0deg); } }
+    transform: rotate3d(var(--fa-flip-x, 0), var(--fa-flip-y, 1), var(--fa-flip-z, 0), var(--fa-flip-angle, -180deg)); } }
 
 @keyframes fa-shake {
   0% {
-    -webkit-transform: rotate(-15deg);
-            transform: rotate(-15deg); }
+    transform: rotate(-15deg); }
   4% {
-    -webkit-transform: rotate(15deg);
-            transform: rotate(15deg); }
+    transform: rotate(15deg); }
   8%, 24% {
-    -webkit-transform: rotate(-18deg);
-            transform: rotate(-18deg); }
+    transform: rotate(-18deg); }
   12%, 28% {
-    -webkit-transform: rotate(18deg);
-            transform: rotate(18deg); }
+    transform: rotate(18deg); }
   16% {
-    -webkit-transform: rotate(-22deg);
-            transform: rotate(-22deg); }
+    transform: rotate(-22deg); }
   20% {
-    -webkit-transform: rotate(22deg);
-            transform: rotate(22deg); }
+    transform: rotate(22deg); }
   32% {
-    -webkit-transform: rotate(-12deg);
-            transform: rotate(-12deg); }
+    transform: rotate(-12deg); }
   36% {
-    -webkit-transform: rotate(12deg);
-            transform: rotate(12deg); }
+    transform: rotate(12deg); }
   40%, 100% {
-    -webkit-transform: rotate(0deg);
-            transform: rotate(0deg); } }
-
-@-webkit-keyframes fa-spin {
-  0% {
-    -webkit-transform: rotate(0deg);
-            transform: rotate(0deg); }
-  100% {
-    -webkit-transform: rotate(360deg);
-            transform: rotate(360deg); } }
+    transform: rotate(0deg); } }
 
 @keyframes fa-spin {
   0% {
-    -webkit-transform: rotate(0deg);
-            transform: rotate(0deg); }
+    transform: rotate(0deg); }
   100% {
-    -webkit-transform: rotate(360deg);
-            transform: rotate(360deg); } }
+    transform: rotate(360deg); } }
 
 .fa-rotate-90 {
-  -webkit-transform: rotate(90deg);
-          transform: rotate(90deg); }
+  transform: rotate(90deg); }
 
 .fa-rotate-180 {
-  -webkit-transform: rotate(180deg);
-          transform: rotate(180deg); }
+  transform: rotate(180deg); }
 
 .fa-rotate-270 {
-  -webkit-transform: rotate(270deg);
-          transform: rotate(270deg); }
+  transform: rotate(270deg); }
 
 .fa-flip-horizontal {
-  -webkit-transform: scale(-1, 1);
-          transform: scale(-1, 1); }
+  transform: scale(-1, 1); }
 
 .fa-flip-vertical {
-  -webkit-transform: scale(1, -1);
-          transform: scale(1, -1); }
+  transform: scale(1, -1); }
 
 .fa-flip-both,
 .fa-flip-horizontal.fa-flip-vertical {
-  -webkit-transform: scale(-1, -1);
-          transform: scale(-1, -1); }
+  transform: scale(-1, -1); }
 
 .fa-rotate-by {
-  -webkit-transform: rotate(var(--fa-rotate-angle, 0));
-          transform: rotate(var(--fa-rotate-angle, 0)); }
+  transform: rotate(var(--fa-rotate-angle, 0)); }
 
 .fa-stack {
   display: inline-block;
@@ -7328,5861 +7166,5891 @@ button.close {
 /* Font Awesome uses the Unicode Private Use Area (PUA) to ensure screen
 readers do not read off random characters that represent icons */
 
-.fa-0::before {
-  content: "\30"; }
+.fa-0 {
+  --fa: "\30"; }
 
-.fa-1::before {
-  content: "\31"; }
+.fa-1 {
+  --fa: "\31"; }
 
-.fa-2::before {
-  content: "\32"; }
+.fa-2 {
+  --fa: "\32"; }
 
-.fa-3::before {
-  content: "\33"; }
+.fa-3 {
+  --fa: "\33"; }
 
-.fa-4::before {
-  content: "\34"; }
+.fa-4 {
+  --fa: "\34"; }
 
-.fa-5::before {
-  content: "\35"; }
+.fa-5 {
+  --fa: "\35"; }
 
-.fa-6::before {
-  content: "\36"; }
+.fa-6 {
+  --fa: "\36"; }
 
-.fa-7::before {
-  content: "\37"; }
+.fa-7 {
+  --fa: "\37"; }
 
-.fa-8::before {
-  content: "\38"; }
+.fa-8 {
+  --fa: "\38"; }
 
-.fa-9::before {
-  content: "\39"; }
+.fa-9 {
+  --fa: "\39"; }
 
-.fa-fill-drip::before {
-  content: "\f576"; }
+.fa-fill-drip {
+  --fa: "\f576"; }
 
-.fa-arrows-to-circle::before {
-  content: "\e4bd"; }
+.fa-arrows-to-circle {
+  --fa: "\e4bd"; }
 
-.fa-circle-chevron-right::before {
-  content: "\f138"; }
+.fa-circle-chevron-right {
+  --fa: "\f138"; }
 
-.fa-chevron-circle-right::before {
-  content: "\f138"; }
+.fa-chevron-circle-right {
+  --fa: "\f138"; }
 
-.fa-at::before {
-  content: "\40"; }
+.fa-at {
+  --fa: "\40"; }
 
-.fa-trash-can::before {
-  content: "\f2ed"; }
+.fa-trash-can {
+  --fa: "\f2ed"; }
 
-.fa-trash-alt::before {
-  content: "\f2ed"; }
+.fa-trash-alt {
+  --fa: "\f2ed"; }
 
-.fa-text-height::before {
-  content: "\f034"; }
+.fa-text-height {
+  --fa: "\f034"; }
 
-.fa-user-xmark::before {
-  content: "\f235"; }
+.fa-user-xmark {
+  --fa: "\f235"; }
 
-.fa-user-times::before {
-  content: "\f235"; }
+.fa-user-times {
+  --fa: "\f235"; }
 
-.fa-stethoscope::before {
-  content: "\f0f1"; }
+.fa-stethoscope {
+  --fa: "\f0f1"; }
 
-.fa-message::before {
-  content: "\f27a"; }
+.fa-message {
+  --fa: "\f27a"; }
 
-.fa-comment-alt::before {
-  content: "\f27a"; }
+.fa-comment-alt {
+  --fa: "\f27a"; }
 
-.fa-info::before {
-  content: "\f129"; }
+.fa-info {
+  --fa: "\f129"; }
 
-.fa-down-left-and-up-right-to-center::before {
-  content: "\f422"; }
+.fa-down-left-and-up-right-to-center {
+  --fa: "\f422"; }
 
-.fa-compress-alt::before {
-  content: "\f422"; }
+.fa-compress-alt {
+  --fa: "\f422"; }
 
-.fa-explosion::before {
-  content: "\e4e9"; }
+.fa-explosion {
+  --fa: "\e4e9"; }
 
-.fa-file-lines::before {
-  content: "\f15c"; }
+.fa-file-lines {
+  --fa: "\f15c"; }
 
-.fa-file-alt::before {
-  content: "\f15c"; }
+.fa-file-alt {
+  --fa: "\f15c"; }
 
-.fa-file-text::before {
-  content: "\f15c"; }
+.fa-file-text {
+  --fa: "\f15c"; }
 
-.fa-wave-square::before {
-  content: "\f83e"; }
+.fa-wave-square {
+  --fa: "\f83e"; }
 
-.fa-ring::before {
-  content: "\f70b"; }
+.fa-ring {
+  --fa: "\f70b"; }
 
-.fa-building-un::before {
-  content: "\e4d9"; }
+.fa-building-un {
+  --fa: "\e4d9"; }
 
-.fa-dice-three::before {
-  content: "\f527"; }
+.fa-dice-three {
+  --fa: "\f527"; }
 
-.fa-calendar-days::before {
-  content: "\f073"; }
+.fa-calendar-days {
+  --fa: "\f073"; }
 
-.fa-calendar-alt::before {
-  content: "\f073"; }
+.fa-calendar-alt {
+  --fa: "\f073"; }
 
-.fa-anchor-circle-check::before {
-  content: "\e4aa"; }
+.fa-anchor-circle-check {
+  --fa: "\e4aa"; }
 
-.fa-building-circle-arrow-right::before {
-  content: "\e4d1"; }
+.fa-building-circle-arrow-right {
+  --fa: "\e4d1"; }
 
-.fa-volleyball::before {
-  content: "\f45f"; }
+.fa-volleyball {
+  --fa: "\f45f"; }
 
-.fa-volleyball-ball::before {
-  content: "\f45f"; }
+.fa-volleyball-ball {
+  --fa: "\f45f"; }
 
-.fa-arrows-up-to-line::before {
-  content: "\e4c2"; }
+.fa-arrows-up-to-line {
+  --fa: "\e4c2"; }
 
-.fa-sort-down::before {
-  content: "\f0dd"; }
+.fa-sort-down {
+  --fa: "\f0dd"; }
 
-.fa-sort-desc::before {
-  content: "\f0dd"; }
+.fa-sort-desc {
+  --fa: "\f0dd"; }
 
-.fa-circle-minus::before {
-  content: "\f056"; }
+.fa-circle-minus {
+  --fa: "\f056"; }
 
-.fa-minus-circle::before {
-  content: "\f056"; }
+.fa-minus-circle {
+  --fa: "\f056"; }
 
-.fa-door-open::before {
-  content: "\f52b"; }
+.fa-door-open {
+  --fa: "\f52b"; }
 
-.fa-right-from-bracket::before {
-  content: "\f2f5"; }
+.fa-right-from-bracket {
+  --fa: "\f2f5"; }
 
-.fa-sign-out-alt::before {
-  content: "\f2f5"; }
+.fa-sign-out-alt {
+  --fa: "\f2f5"; }
 
-.fa-atom::before {
-  content: "\f5d2"; }
+.fa-atom {
+  --fa: "\f5d2"; }
 
-.fa-soap::before {
-  content: "\e06e"; }
+.fa-soap {
+  --fa: "\e06e"; }
 
-.fa-icons::before {
-  content: "\f86d"; }
+.fa-icons {
+  --fa: "\f86d"; }
 
-.fa-heart-music-camera-bolt::before {
-  content: "\f86d"; }
+.fa-heart-music-camera-bolt {
+  --fa: "\f86d"; }
 
-.fa-microphone-lines-slash::before {
-  content: "\f539"; }
+.fa-microphone-lines-slash {
+  --fa: "\f539"; }
 
-.fa-microphone-alt-slash::before {
-  content: "\f539"; }
+.fa-microphone-alt-slash {
+  --fa: "\f539"; }
 
-.fa-bridge-circle-check::before {
-  content: "\e4c9"; }
+.fa-bridge-circle-check {
+  --fa: "\e4c9"; }
 
-.fa-pump-medical::before {
-  content: "\e06a"; }
+.fa-pump-medical {
+  --fa: "\e06a"; }
 
-.fa-fingerprint::before {
-  content: "\f577"; }
+.fa-fingerprint {
+  --fa: "\f577"; }
 
-.fa-hand-point-right::before {
-  content: "\f0a4"; }
+.fa-hand-point-right {
+  --fa: "\f0a4"; }
 
-.fa-magnifying-glass-location::before {
-  content: "\f689"; }
+.fa-magnifying-glass-location {
+  --fa: "\f689"; }
 
-.fa-search-location::before {
-  content: "\f689"; }
+.fa-search-location {
+  --fa: "\f689"; }
 
-.fa-forward-step::before {
-  content: "\f051"; }
+.fa-forward-step {
+  --fa: "\f051"; }
 
-.fa-step-forward::before {
-  content: "\f051"; }
+.fa-step-forward {
+  --fa: "\f051"; }
 
-.fa-face-smile-beam::before {
-  content: "\f5b8"; }
+.fa-face-smile-beam {
+  --fa: "\f5b8"; }
 
-.fa-smile-beam::before {
-  content: "\f5b8"; }
+.fa-smile-beam {
+  --fa: "\f5b8"; }
 
-.fa-flag-checkered::before {
-  content: "\f11e"; }
+.fa-flag-checkered {
+  --fa: "\f11e"; }
 
-.fa-football::before {
-  content: "\f44e"; }
+.fa-football {
+  --fa: "\f44e"; }
 
-.fa-football-ball::before {
-  content: "\f44e"; }
+.fa-football-ball {
+  --fa: "\f44e"; }
 
-.fa-school-circle-exclamation::before {
-  content: "\e56c"; }
+.fa-school-circle-exclamation {
+  --fa: "\e56c"; }
 
-.fa-crop::before {
-  content: "\f125"; }
+.fa-crop {
+  --fa: "\f125"; }
 
-.fa-angles-down::before {
-  content: "\f103"; }
+.fa-angles-down {
+  --fa: "\f103"; }
 
-.fa-angle-double-down::before {
-  content: "\f103"; }
+.fa-angle-double-down {
+  --fa: "\f103"; }
 
-.fa-users-rectangle::before {
-  content: "\e594"; }
+.fa-users-rectangle {
+  --fa: "\e594"; }
 
-.fa-people-roof::before {
-  content: "\e537"; }
+.fa-people-roof {
+  --fa: "\e537"; }
 
-.fa-people-line::before {
-  content: "\e534"; }
+.fa-people-line {
+  --fa: "\e534"; }
 
-.fa-beer-mug-empty::before {
-  content: "\f0fc"; }
+.fa-beer-mug-empty {
+  --fa: "\f0fc"; }
 
-.fa-beer::before {
-  content: "\f0fc"; }
+.fa-beer {
+  --fa: "\f0fc"; }
 
-.fa-diagram-predecessor::before {
-  content: "\e477"; }
+.fa-diagram-predecessor {
+  --fa: "\e477"; }
 
-.fa-arrow-up-long::before {
-  content: "\f176"; }
+.fa-arrow-up-long {
+  --fa: "\f176"; }
 
-.fa-long-arrow-up::before {
-  content: "\f176"; }
+.fa-long-arrow-up {
+  --fa: "\f176"; }
 
-.fa-fire-flame-simple::before {
-  content: "\f46a"; }
+.fa-fire-flame-simple {
+  --fa: "\f46a"; }
 
-.fa-burn::before {
-  content: "\f46a"; }
+.fa-burn {
+  --fa: "\f46a"; }
 
-.fa-person::before {
-  content: "\f183"; }
+.fa-person {
+  --fa: "\f183"; }
 
-.fa-male::before {
-  content: "\f183"; }
+.fa-male {
+  --fa: "\f183"; }
 
-.fa-laptop::before {
-  content: "\f109"; }
+.fa-laptop {
+  --fa: "\f109"; }
 
-.fa-file-csv::before {
-  content: "\f6dd"; }
+.fa-file-csv {
+  --fa: "\f6dd"; }
 
-.fa-menorah::before {
-  content: "\f676"; }
+.fa-menorah {
+  --fa: "\f676"; }
 
-.fa-truck-plane::before {
-  content: "\e58f"; }
+.fa-truck-plane {
+  --fa: "\e58f"; }
 
-.fa-record-vinyl::before {
-  content: "\f8d9"; }
+.fa-record-vinyl {
+  --fa: "\f8d9"; }
 
-.fa-face-grin-stars::before {
-  content: "\f587"; }
+.fa-face-grin-stars {
+  --fa: "\f587"; }
 
-.fa-grin-stars::before {
-  content: "\f587"; }
+.fa-grin-stars {
+  --fa: "\f587"; }
 
-.fa-bong::before {
-  content: "\f55c"; }
+.fa-bong {
+  --fa: "\f55c"; }
 
-.fa-spaghetti-monster-flying::before {
-  content: "\f67b"; }
+.fa-spaghetti-monster-flying {
+  --fa: "\f67b"; }
 
-.fa-pastafarianism::before {
-  content: "\f67b"; }
+.fa-pastafarianism {
+  --fa: "\f67b"; }
 
-.fa-arrow-down-up-across-line::before {
-  content: "\e4af"; }
+.fa-arrow-down-up-across-line {
+  --fa: "\e4af"; }
 
-.fa-spoon::before {
-  content: "\f2e5"; }
+.fa-spoon {
+  --fa: "\f2e5"; }
 
-.fa-utensil-spoon::before {
-  content: "\f2e5"; }
+.fa-utensil-spoon {
+  --fa: "\f2e5"; }
 
-.fa-jar-wheat::before {
-  content: "\e517"; }
+.fa-jar-wheat {
+  --fa: "\e517"; }
 
-.fa-envelopes-bulk::before {
-  content: "\f674"; }
+.fa-envelopes-bulk {
+  --fa: "\f674"; }
 
-.fa-mail-bulk::before {
-  content: "\f674"; }
+.fa-mail-bulk {
+  --fa: "\f674"; }
 
-.fa-file-circle-exclamation::before {
-  content: "\e4eb"; }
+.fa-file-circle-exclamation {
+  --fa: "\e4eb"; }
 
-.fa-circle-h::before {
-  content: "\f47e"; }
+.fa-circle-h {
+  --fa: "\f47e"; }
 
-.fa-hospital-symbol::before {
-  content: "\f47e"; }
+.fa-hospital-symbol {
+  --fa: "\f47e"; }
 
-.fa-pager::before {
-  content: "\f815"; }
+.fa-pager {
+  --fa: "\f815"; }
 
-.fa-address-book::before {
-  content: "\f2b9"; }
+.fa-address-book {
+  --fa: "\f2b9"; }
 
-.fa-contact-book::before {
-  content: "\f2b9"; }
+.fa-contact-book {
+  --fa: "\f2b9"; }
 
-.fa-strikethrough::before {
-  content: "\f0cc"; }
+.fa-strikethrough {
+  --fa: "\f0cc"; }
 
-.fa-k::before {
-  content: "\4b"; }
+.fa-k {
+  --fa: "\4b"; }
 
-.fa-landmark-flag::before {
-  content: "\e51c"; }
+.fa-landmark-flag {
+  --fa: "\e51c"; }
 
-.fa-pencil::before {
-  content: "\f303"; }
+.fa-pencil {
+  --fa: "\f303"; }
 
-.fa-pencil-alt::before {
-  content: "\f303"; }
+.fa-pencil-alt {
+  --fa: "\f303"; }
 
-.fa-backward::before {
-  content: "\f04a"; }
+.fa-backward {
+  --fa: "\f04a"; }
 
-.fa-caret-right::before {
-  content: "\f0da"; }
+.fa-caret-right {
+  --fa: "\f0da"; }
 
-.fa-comments::before {
-  content: "\f086"; }
+.fa-comments {
+  --fa: "\f086"; }
 
-.fa-paste::before {
-  content: "\f0ea"; }
+.fa-paste {
+  --fa: "\f0ea"; }
 
-.fa-file-clipboard::before {
-  content: "\f0ea"; }
+.fa-file-clipboard {
+  --fa: "\f0ea"; }
 
-.fa-code-pull-request::before {
-  content: "\e13c"; }
+.fa-code-pull-request {
+  --fa: "\e13c"; }
 
-.fa-clipboard-list::before {
-  content: "\f46d"; }
+.fa-clipboard-list {
+  --fa: "\f46d"; }
 
-.fa-truck-ramp-box::before {
-  content: "\f4de"; }
+.fa-truck-ramp-box {
+  --fa: "\f4de"; }
 
-.fa-truck-loading::before {
-  content: "\f4de"; }
+.fa-truck-loading {
+  --fa: "\f4de"; }
 
-.fa-user-check::before {
-  content: "\f4fc"; }
+.fa-user-check {
+  --fa: "\f4fc"; }
 
-.fa-vial-virus::before {
-  content: "\e597"; }
+.fa-vial-virus {
+  --fa: "\e597"; }
 
-.fa-sheet-plastic::before {
-  content: "\e571"; }
+.fa-sheet-plastic {
+  --fa: "\e571"; }
 
-.fa-blog::before {
-  content: "\f781"; }
+.fa-blog {
+  --fa: "\f781"; }
 
-.fa-user-ninja::before {
-  content: "\f504"; }
+.fa-user-ninja {
+  --fa: "\f504"; }
 
-.fa-person-arrow-up-from-line::before {
-  content: "\e539"; }
+.fa-person-arrow-up-from-line {
+  --fa: "\e539"; }
 
-.fa-scroll-torah::before {
-  content: "\f6a0"; }
+.fa-scroll-torah {
+  --fa: "\f6a0"; }
 
-.fa-torah::before {
-  content: "\f6a0"; }
+.fa-torah {
+  --fa: "\f6a0"; }
 
-.fa-broom-ball::before {
-  content: "\f458"; }
+.fa-broom-ball {
+  --fa: "\f458"; }
 
-.fa-quidditch::before {
-  content: "\f458"; }
+.fa-quidditch {
+  --fa: "\f458"; }
 
-.fa-quidditch-broom-ball::before {
-  content: "\f458"; }
+.fa-quidditch-broom-ball {
+  --fa: "\f458"; }
 
-.fa-toggle-off::before {
-  content: "\f204"; }
+.fa-toggle-off {
+  --fa: "\f204"; }
 
-.fa-box-archive::before {
-  content: "\f187"; }
+.fa-box-archive {
+  --fa: "\f187"; }
 
-.fa-archive::before {
-  content: "\f187"; }
+.fa-archive {
+  --fa: "\f187"; }
 
-.fa-person-drowning::before {
-  content: "\e545"; }
+.fa-person-drowning {
+  --fa: "\e545"; }
 
-.fa-arrow-down-9-1::before {
-  content: "\f886"; }
+.fa-arrow-down-9-1 {
+  --fa: "\f886"; }
 
-.fa-sort-numeric-desc::before {
-  content: "\f886"; }
+.fa-sort-numeric-desc {
+  --fa: "\f886"; }
 
-.fa-sort-numeric-down-alt::before {
-  content: "\f886"; }
+.fa-sort-numeric-down-alt {
+  --fa: "\f886"; }
 
-.fa-face-grin-tongue-squint::before {
-  content: "\f58a"; }
+.fa-face-grin-tongue-squint {
+  --fa: "\f58a"; }
 
-.fa-grin-tongue-squint::before {
-  content: "\f58a"; }
+.fa-grin-tongue-squint {
+  --fa: "\f58a"; }
 
-.fa-spray-can::before {
-  content: "\f5bd"; }
+.fa-spray-can {
+  --fa: "\f5bd"; }
 
-.fa-truck-monster::before {
-  content: "\f63b"; }
+.fa-truck-monster {
+  --fa: "\f63b"; }
 
-.fa-w::before {
-  content: "\57"; }
+.fa-w {
+  --fa: "\57"; }
 
-.fa-earth-africa::before {
-  content: "\f57c"; }
+.fa-earth-africa {
+  --fa: "\f57c"; }
 
-.fa-globe-africa::before {
-  content: "\f57c"; }
+.fa-globe-africa {
+  --fa: "\f57c"; }
 
-.fa-rainbow::before {
-  content: "\f75b"; }
+.fa-rainbow {
+  --fa: "\f75b"; }
 
-.fa-circle-notch::before {
-  content: "\f1ce"; }
+.fa-circle-notch {
+  --fa: "\f1ce"; }
 
-.fa-tablet-screen-button::before {
-  content: "\f3fa"; }
+.fa-tablet-screen-button {
+  --fa: "\f3fa"; }
 
-.fa-tablet-alt::before {
-  content: "\f3fa"; }
+.fa-tablet-alt {
+  --fa: "\f3fa"; }
 
-.fa-paw::before {
-  content: "\f1b0"; }
+.fa-paw {
+  --fa: "\f1b0"; }
 
-.fa-cloud::before {
-  content: "\f0c2"; }
+.fa-cloud {
+  --fa: "\f0c2"; }
 
-.fa-trowel-bricks::before {
-  content: "\e58a"; }
+.fa-trowel-bricks {
+  --fa: "\e58a"; }
 
-.fa-face-flushed::before {
-  content: "\f579"; }
+.fa-face-flushed {
+  --fa: "\f579"; }
 
-.fa-flushed::before {
-  content: "\f579"; }
+.fa-flushed {
+  --fa: "\f579"; }
 
-.fa-hospital-user::before {
-  content: "\f80d"; }
+.fa-hospital-user {
+  --fa: "\f80d"; }
 
-.fa-tent-arrow-left-right::before {
-  content: "\e57f"; }
+.fa-tent-arrow-left-right {
+  --fa: "\e57f"; }
 
-.fa-gavel::before {
-  content: "\f0e3"; }
+.fa-gavel {
+  --fa: "\f0e3"; }
 
-.fa-legal::before {
-  content: "\f0e3"; }
+.fa-legal {
+  --fa: "\f0e3"; }
 
-.fa-binoculars::before {
-  content: "\f1e5"; }
+.fa-binoculars {
+  --fa: "\f1e5"; }
 
-.fa-microphone-slash::before {
-  content: "\f131"; }
+.fa-microphone-slash {
+  --fa: "\f131"; }
 
-.fa-box-tissue::before {
-  content: "\e05b"; }
+.fa-box-tissue {
+  --fa: "\e05b"; }
 
-.fa-motorcycle::before {
-  content: "\f21c"; }
+.fa-motorcycle {
+  --fa: "\f21c"; }
 
-.fa-bell-concierge::before {
-  content: "\f562"; }
+.fa-bell-concierge {
+  --fa: "\f562"; }
 
-.fa-concierge-bell::before {
-  content: "\f562"; }
+.fa-concierge-bell {
+  --fa: "\f562"; }
 
-.fa-pen-ruler::before {
-  content: "\f5ae"; }
+.fa-pen-ruler {
+  --fa: "\f5ae"; }
 
-.fa-pencil-ruler::before {
-  content: "\f5ae"; }
+.fa-pencil-ruler {
+  --fa: "\f5ae"; }
 
-.fa-people-arrows::before {
-  content: "\e068"; }
+.fa-people-arrows {
+  --fa: "\e068"; }
 
-.fa-people-arrows-left-right::before {
-  content: "\e068"; }
+.fa-people-arrows-left-right {
+  --fa: "\e068"; }
 
-.fa-mars-and-venus-burst::before {
-  content: "\e523"; }
+.fa-mars-and-venus-burst {
+  --fa: "\e523"; }
 
-.fa-square-caret-right::before {
-  content: "\f152"; }
+.fa-square-caret-right {
+  --fa: "\f152"; }
 
-.fa-caret-square-right::before {
-  content: "\f152"; }
+.fa-caret-square-right {
+  --fa: "\f152"; }
 
-.fa-scissors::before {
-  content: "\f0c4"; }
+.fa-scissors {
+  --fa: "\f0c4"; }
 
-.fa-cut::before {
-  content: "\f0c4"; }
+.fa-cut {
+  --fa: "\f0c4"; }
 
-.fa-sun-plant-wilt::before {
-  content: "\e57a"; }
+.fa-sun-plant-wilt {
+  --fa: "\e57a"; }
 
-.fa-toilets-portable::before {
-  content: "\e584"; }
+.fa-toilets-portable {
+  --fa: "\e584"; }
 
-.fa-hockey-puck::before {
-  content: "\f453"; }
+.fa-hockey-puck {
+  --fa: "\f453"; }
 
-.fa-table::before {
-  content: "\f0ce"; }
+.fa-table {
+  --fa: "\f0ce"; }
 
-.fa-magnifying-glass-arrow-right::before {
-  content: "\e521"; }
+.fa-magnifying-glass-arrow-right {
+  --fa: "\e521"; }
 
-.fa-tachograph-digital::before {
-  content: "\f566"; }
+.fa-tachograph-digital {
+  --fa: "\f566"; }
 
-.fa-digital-tachograph::before {
-  content: "\f566"; }
+.fa-digital-tachograph {
+  --fa: "\f566"; }
 
-.fa-users-slash::before {
-  content: "\e073"; }
+.fa-users-slash {
+  --fa: "\e073"; }
 
-.fa-clover::before {
-  content: "\e139"; }
+.fa-clover {
+  --fa: "\e139"; }
 
-.fa-reply::before {
-  content: "\f3e5"; }
+.fa-reply {
+  --fa: "\f3e5"; }
 
-.fa-mail-reply::before {
-  content: "\f3e5"; }
+.fa-mail-reply {
+  --fa: "\f3e5"; }
 
-.fa-star-and-crescent::before {
-  content: "\f699"; }
+.fa-star-and-crescent {
+  --fa: "\f699"; }
 
-.fa-house-fire::before {
-  content: "\e50c"; }
+.fa-house-fire {
+  --fa: "\e50c"; }
 
-.fa-square-minus::before {
-  content: "\f146"; }
+.fa-square-minus {
+  --fa: "\f146"; }
 
-.fa-minus-square::before {
-  content: "\f146"; }
+.fa-minus-square {
+  --fa: "\f146"; }
 
-.fa-helicopter::before {
-  content: "\f533"; }
+.fa-helicopter {
+  --fa: "\f533"; }
 
-.fa-compass::before {
-  content: "\f14e"; }
+.fa-compass {
+  --fa: "\f14e"; }
 
-.fa-square-caret-down::before {
-  content: "\f150"; }
+.fa-square-caret-down {
+  --fa: "\f150"; }
 
-.fa-caret-square-down::before {
-  content: "\f150"; }
+.fa-caret-square-down {
+  --fa: "\f150"; }
 
-.fa-file-circle-question::before {
-  content: "\e4ef"; }
+.fa-file-circle-question {
+  --fa: "\e4ef"; }
 
-.fa-laptop-code::before {
-  content: "\f5fc"; }
+.fa-laptop-code {
+  --fa: "\f5fc"; }
 
-.fa-swatchbook::before {
-  content: "\f5c3"; }
+.fa-swatchbook {
+  --fa: "\f5c3"; }
 
-.fa-prescription-bottle::before {
-  content: "\f485"; }
+.fa-prescription-bottle {
+  --fa: "\f485"; }
 
-.fa-bars::before {
-  content: "\f0c9"; }
+.fa-bars {
+  --fa: "\f0c9"; }
 
-.fa-navicon::before {
-  content: "\f0c9"; }
+.fa-navicon {
+  --fa: "\f0c9"; }
 
-.fa-people-group::before {
-  content: "\e533"; }
+.fa-people-group {
+  --fa: "\e533"; }
 
-.fa-hourglass-end::before {
-  content: "\f253"; }
+.fa-hourglass-end {
+  --fa: "\f253"; }
 
-.fa-hourglass-3::before {
-  content: "\f253"; }
+.fa-hourglass-3 {
+  --fa: "\f253"; }
 
-.fa-heart-crack::before {
-  content: "\f7a9"; }
+.fa-heart-crack {
+  --fa: "\f7a9"; }
 
-.fa-heart-broken::before {
-  content: "\f7a9"; }
+.fa-heart-broken {
+  --fa: "\f7a9"; }
 
-.fa-square-up-right::before {
-  content: "\f360"; }
+.fa-square-up-right {
+  --fa: "\f360"; }
 
-.fa-external-link-square-alt::before {
-  content: "\f360"; }
+.fa-external-link-square-alt {
+  --fa: "\f360"; }
 
-.fa-face-kiss-beam::before {
-  content: "\f597"; }
+.fa-face-kiss-beam {
+  --fa: "\f597"; }
 
-.fa-kiss-beam::before {
-  content: "\f597"; }
+.fa-kiss-beam {
+  --fa: "\f597"; }
 
-.fa-film::before {
-  content: "\f008"; }
+.fa-film {
+  --fa: "\f008"; }
 
-.fa-ruler-horizontal::before {
-  content: "\f547"; }
+.fa-ruler-horizontal {
+  --fa: "\f547"; }
 
-.fa-people-robbery::before {
-  content: "\e536"; }
+.fa-people-robbery {
+  --fa: "\e536"; }
 
-.fa-lightbulb::before {
-  content: "\f0eb"; }
+.fa-lightbulb {
+  --fa: "\f0eb"; }
 
-.fa-caret-left::before {
-  content: "\f0d9"; }
+.fa-caret-left {
+  --fa: "\f0d9"; }
 
-.fa-circle-exclamation::before {
-  content: "\f06a"; }
+.fa-circle-exclamation {
+  --fa: "\f06a"; }
 
-.fa-exclamation-circle::before {
-  content: "\f06a"; }
+.fa-exclamation-circle {
+  --fa: "\f06a"; }
 
-.fa-school-circle-xmark::before {
-  content: "\e56d"; }
+.fa-school-circle-xmark {
+  --fa: "\e56d"; }
 
-.fa-arrow-right-from-bracket::before {
-  content: "\f08b"; }
+.fa-arrow-right-from-bracket {
+  --fa: "\f08b"; }
 
-.fa-sign-out::before {
-  content: "\f08b"; }
+.fa-sign-out {
+  --fa: "\f08b"; }
 
-.fa-circle-chevron-down::before {
-  content: "\f13a"; }
+.fa-circle-chevron-down {
+  --fa: "\f13a"; }
 
-.fa-chevron-circle-down::before {
-  content: "\f13a"; }
+.fa-chevron-circle-down {
+  --fa: "\f13a"; }
 
-.fa-unlock-keyhole::before {
-  content: "\f13e"; }
+.fa-unlock-keyhole {
+  --fa: "\f13e"; }
 
-.fa-unlock-alt::before {
-  content: "\f13e"; }
+.fa-unlock-alt {
+  --fa: "\f13e"; }
 
-.fa-cloud-showers-heavy::before {
-  content: "\f740"; }
+.fa-cloud-showers-heavy {
+  --fa: "\f740"; }
 
-.fa-headphones-simple::before {
-  content: "\f58f"; }
+.fa-headphones-simple {
+  --fa: "\f58f"; }
 
-.fa-headphones-alt::before {
-  content: "\f58f"; }
+.fa-headphones-alt {
+  --fa: "\f58f"; }
 
-.fa-sitemap::before {
-  content: "\f0e8"; }
+.fa-sitemap {
+  --fa: "\f0e8"; }
 
-.fa-circle-dollar-to-slot::before {
-  content: "\f4b9"; }
+.fa-circle-dollar-to-slot {
+  --fa: "\f4b9"; }
 
-.fa-donate::before {
-  content: "\f4b9"; }
+.fa-donate {
+  --fa: "\f4b9"; }
 
-.fa-memory::before {
-  content: "\f538"; }
+.fa-memory {
+  --fa: "\f538"; }
 
-.fa-road-spikes::before {
-  content: "\e568"; }
+.fa-road-spikes {
+  --fa: "\e568"; }
 
-.fa-fire-burner::before {
-  content: "\e4f1"; }
+.fa-fire-burner {
+  --fa: "\e4f1"; }
 
-.fa-flag::before {
-  content: "\f024"; }
+.fa-flag {
+  --fa: "\f024"; }
 
-.fa-hanukiah::before {
-  content: "\f6e6"; }
+.fa-hanukiah {
+  --fa: "\f6e6"; }
 
-.fa-feather::before {
-  content: "\f52d"; }
+.fa-feather {
+  --fa: "\f52d"; }
 
-.fa-volume-low::before {
-  content: "\f027"; }
+.fa-volume-low {
+  --fa: "\f027"; }
 
-.fa-volume-down::before {
-  content: "\f027"; }
+.fa-volume-down {
+  --fa: "\f027"; }
 
-.fa-comment-slash::before {
-  content: "\f4b3"; }
+.fa-comment-slash {
+  --fa: "\f4b3"; }
 
-.fa-cloud-sun-rain::before {
-  content: "\f743"; }
+.fa-cloud-sun-rain {
+  --fa: "\f743"; }
 
-.fa-compress::before {
-  content: "\f066"; }
+.fa-compress {
+  --fa: "\f066"; }
 
-.fa-wheat-awn::before {
-  content: "\e2cd"; }
+.fa-wheat-awn {
+  --fa: "\e2cd"; }
 
-.fa-wheat-alt::before {
-  content: "\e2cd"; }
+.fa-wheat-alt {
+  --fa: "\e2cd"; }
 
-.fa-ankh::before {
-  content: "\f644"; }
+.fa-ankh {
+  --fa: "\f644"; }
 
-.fa-hands-holding-child::before {
-  content: "\e4fa"; }
+.fa-hands-holding-child {
+  --fa: "\e4fa"; }
 
-.fa-asterisk::before {
-  content: "\2a"; }
+.fa-asterisk {
+  --fa: "\2a"; }
 
-.fa-square-check::before {
-  content: "\f14a"; }
+.fa-square-check {
+  --fa: "\f14a"; }
 
-.fa-check-square::before {
-  content: "\f14a"; }
+.fa-check-square {
+  --fa: "\f14a"; }
 
-.fa-peseta-sign::before {
-  content: "\e221"; }
+.fa-peseta-sign {
+  --fa: "\e221"; }
 
-.fa-heading::before {
-  content: "\f1dc"; }
+.fa-heading {
+  --fa: "\f1dc"; }
 
-.fa-header::before {
-  content: "\f1dc"; }
+.fa-header {
+  --fa: "\f1dc"; }
 
-.fa-ghost::before {
-  content: "\f6e2"; }
+.fa-ghost {
+  --fa: "\f6e2"; }
 
-.fa-list::before {
-  content: "\f03a"; }
+.fa-list {
+  --fa: "\f03a"; }
 
-.fa-list-squares::before {
-  content: "\f03a"; }
+.fa-list-squares {
+  --fa: "\f03a"; }
 
-.fa-square-phone-flip::before {
-  content: "\f87b"; }
+.fa-square-phone-flip {
+  --fa: "\f87b"; }
 
-.fa-phone-square-alt::before {
-  content: "\f87b"; }
+.fa-phone-square-alt {
+  --fa: "\f87b"; }
 
-.fa-cart-plus::before {
-  content: "\f217"; }
+.fa-cart-plus {
+  --fa: "\f217"; }
 
-.fa-gamepad::before {
-  content: "\f11b"; }
+.fa-gamepad {
+  --fa: "\f11b"; }
 
-.fa-circle-dot::before {
-  content: "\f192"; }
+.fa-circle-dot {
+  --fa: "\f192"; }
 
-.fa-dot-circle::before {
-  content: "\f192"; }
+.fa-dot-circle {
+  --fa: "\f192"; }
 
-.fa-face-dizzy::before {
-  content: "\f567"; }
+.fa-face-dizzy {
+  --fa: "\f567"; }
 
-.fa-dizzy::before {
-  content: "\f567"; }
+.fa-dizzy {
+  --fa: "\f567"; }
 
-.fa-egg::before {
-  content: "\f7fb"; }
+.fa-egg {
+  --fa: "\f7fb"; }
 
-.fa-house-medical-circle-xmark::before {
-  content: "\e513"; }
+.fa-house-medical-circle-xmark {
+  --fa: "\e513"; }
 
-.fa-campground::before {
-  content: "\f6bb"; }
+.fa-campground {
+  --fa: "\f6bb"; }
 
-.fa-folder-plus::before {
-  content: "\f65e"; }
+.fa-folder-plus {
+  --fa: "\f65e"; }
 
-.fa-futbol::before {
-  content: "\f1e3"; }
+.fa-futbol {
+  --fa: "\f1e3"; }
 
-.fa-futbol-ball::before {
-  content: "\f1e3"; }
+.fa-futbol-ball {
+  --fa: "\f1e3"; }
 
-.fa-soccer-ball::before {
-  content: "\f1e3"; }
+.fa-soccer-ball {
+  --fa: "\f1e3"; }
 
-.fa-paintbrush::before {
-  content: "\f1fc"; }
+.fa-paintbrush {
+  --fa: "\f1fc"; }
 
-.fa-paint-brush::before {
-  content: "\f1fc"; }
+.fa-paint-brush {
+  --fa: "\f1fc"; }
 
-.fa-lock::before {
-  content: "\f023"; }
+.fa-lock {
+  --fa: "\f023"; }
 
-.fa-gas-pump::before {
-  content: "\f52f"; }
+.fa-gas-pump {
+  --fa: "\f52f"; }
 
-.fa-hot-tub-person::before {
-  content: "\f593"; }
+.fa-hot-tub-person {
+  --fa: "\f593"; }
 
-.fa-hot-tub::before {
-  content: "\f593"; }
+.fa-hot-tub {
+  --fa: "\f593"; }
 
-.fa-map-location::before {
-  content: "\f59f"; }
+.fa-map-location {
+  --fa: "\f59f"; }
 
-.fa-map-marked::before {
-  content: "\f59f"; }
+.fa-map-marked {
+  --fa: "\f59f"; }
 
-.fa-house-flood-water::before {
-  content: "\e50e"; }
+.fa-house-flood-water {
+  --fa: "\e50e"; }
 
-.fa-tree::before {
-  content: "\f1bb"; }
+.fa-tree {
+  --fa: "\f1bb"; }
 
-.fa-bridge-lock::before {
-  content: "\e4cc"; }
+.fa-bridge-lock {
+  --fa: "\e4cc"; }
 
-.fa-sack-dollar::before {
-  content: "\f81d"; }
+.fa-sack-dollar {
+  --fa: "\f81d"; }
 
-.fa-pen-to-square::before {
-  content: "\f044"; }
+.fa-pen-to-square {
+  --fa: "\f044"; }
 
-.fa-edit::before {
-  content: "\f044"; }
+.fa-edit {
+  --fa: "\f044"; }
 
-.fa-car-side::before {
-  content: "\f5e4"; }
+.fa-car-side {
+  --fa: "\f5e4"; }
 
-.fa-share-nodes::before {
-  content: "\f1e0"; }
+.fa-share-nodes {
+  --fa: "\f1e0"; }
 
-.fa-share-alt::before {
-  content: "\f1e0"; }
+.fa-share-alt {
+  --fa: "\f1e0"; }
 
-.fa-heart-circle-minus::before {
-  content: "\e4ff"; }
+.fa-heart-circle-minus {
+  --fa: "\e4ff"; }
 
-.fa-hourglass-half::before {
-  content: "\f252"; }
+.fa-hourglass-half {
+  --fa: "\f252"; }
 
-.fa-hourglass-2::before {
-  content: "\f252"; }
+.fa-hourglass-2 {
+  --fa: "\f252"; }
 
-.fa-microscope::before {
-  content: "\f610"; }
+.fa-microscope {
+  --fa: "\f610"; }
 
-.fa-sink::before {
-  content: "\e06d"; }
+.fa-sink {
+  --fa: "\e06d"; }
 
-.fa-bag-shopping::before {
-  content: "\f290"; }
+.fa-bag-shopping {
+  --fa: "\f290"; }
 
-.fa-shopping-bag::before {
-  content: "\f290"; }
+.fa-shopping-bag {
+  --fa: "\f290"; }
 
-.fa-arrow-down-z-a::before {
-  content: "\f881"; }
+.fa-arrow-down-z-a {
+  --fa: "\f881"; }
 
-.fa-sort-alpha-desc::before {
-  content: "\f881"; }
+.fa-sort-alpha-desc {
+  --fa: "\f881"; }
 
-.fa-sort-alpha-down-alt::before {
-  content: "\f881"; }
+.fa-sort-alpha-down-alt {
+  --fa: "\f881"; }
 
-.fa-mitten::before {
-  content: "\f7b5"; }
+.fa-mitten {
+  --fa: "\f7b5"; }
 
-.fa-person-rays::before {
-  content: "\e54d"; }
+.fa-person-rays {
+  --fa: "\e54d"; }
 
-.fa-users::before {
-  content: "\f0c0"; }
+.fa-users {
+  --fa: "\f0c0"; }
 
-.fa-eye-slash::before {
-  content: "\f070"; }
+.fa-eye-slash {
+  --fa: "\f070"; }
 
-.fa-flask-vial::before {
-  content: "\e4f3"; }
+.fa-flask-vial {
+  --fa: "\e4f3"; }
 
-.fa-hand::before {
-  content: "\f256"; }
+.fa-hand {
+  --fa: "\f256"; }
 
-.fa-hand-paper::before {
-  content: "\f256"; }
+.fa-hand-paper {
+  --fa: "\f256"; }
 
-.fa-om::before {
-  content: "\f679"; }
+.fa-om {
+  --fa: "\f679"; }
 
-.fa-worm::before {
-  content: "\e599"; }
+.fa-worm {
+  --fa: "\e599"; }
 
-.fa-house-circle-xmark::before {
-  content: "\e50b"; }
+.fa-house-circle-xmark {
+  --fa: "\e50b"; }
 
-.fa-plug::before {
-  content: "\f1e6"; }
+.fa-plug {
+  --fa: "\f1e6"; }
 
-.fa-chevron-up::before {
-  content: "\f077"; }
+.fa-chevron-up {
+  --fa: "\f077"; }
 
-.fa-hand-spock::before {
-  content: "\f259"; }
+.fa-hand-spock {
+  --fa: "\f259"; }
 
-.fa-stopwatch::before {
-  content: "\f2f2"; }
+.fa-stopwatch {
+  --fa: "\f2f2"; }
 
-.fa-face-kiss::before {
-  content: "\f596"; }
+.fa-face-kiss {
+  --fa: "\f596"; }
 
-.fa-kiss::before {
-  content: "\f596"; }
+.fa-kiss {
+  --fa: "\f596"; }
 
-.fa-bridge-circle-xmark::before {
-  content: "\e4cb"; }
+.fa-bridge-circle-xmark {
+  --fa: "\e4cb"; }
 
-.fa-face-grin-tongue::before {
-  content: "\f589"; }
+.fa-face-grin-tongue {
+  --fa: "\f589"; }
 
-.fa-grin-tongue::before {
-  content: "\f589"; }
+.fa-grin-tongue {
+  --fa: "\f589"; }
 
-.fa-chess-bishop::before {
-  content: "\f43a"; }
+.fa-chess-bishop {
+  --fa: "\f43a"; }
 
-.fa-face-grin-wink::before {
-  content: "\f58c"; }
+.fa-face-grin-wink {
+  --fa: "\f58c"; }
 
-.fa-grin-wink::before {
-  content: "\f58c"; }
+.fa-grin-wink {
+  --fa: "\f58c"; }
 
-.fa-ear-deaf::before {
-  content: "\f2a4"; }
+.fa-ear-deaf {
+  --fa: "\f2a4"; }
 
-.fa-deaf::before {
-  content: "\f2a4"; }
+.fa-deaf {
+  --fa: "\f2a4"; }
 
-.fa-deafness::before {
-  content: "\f2a4"; }
+.fa-deafness {
+  --fa: "\f2a4"; }
 
-.fa-hard-of-hearing::before {
-  content: "\f2a4"; }
+.fa-hard-of-hearing {
+  --fa: "\f2a4"; }
 
-.fa-road-circle-check::before {
-  content: "\e564"; }
+.fa-road-circle-check {
+  --fa: "\e564"; }
 
-.fa-dice-five::before {
-  content: "\f523"; }
+.fa-dice-five {
+  --fa: "\f523"; }
 
-.fa-square-rss::before {
-  content: "\f143"; }
+.fa-square-rss {
+  --fa: "\f143"; }
 
-.fa-rss-square::before {
-  content: "\f143"; }
+.fa-rss-square {
+  --fa: "\f143"; }
 
-.fa-land-mine-on::before {
-  content: "\e51b"; }
+.fa-land-mine-on {
+  --fa: "\e51b"; }
 
-.fa-i-cursor::before {
-  content: "\f246"; }
+.fa-i-cursor {
+  --fa: "\f246"; }
 
-.fa-stamp::before {
-  content: "\f5bf"; }
+.fa-stamp {
+  --fa: "\f5bf"; }
 
-.fa-stairs::before {
-  content: "\e289"; }
+.fa-stairs {
+  --fa: "\e289"; }
 
-.fa-i::before {
-  content: "\49"; }
+.fa-i {
+  --fa: "\49"; }
 
-.fa-hryvnia-sign::before {
-  content: "\f6f2"; }
+.fa-hryvnia-sign {
+  --fa: "\f6f2"; }
 
-.fa-hryvnia::before {
-  content: "\f6f2"; }
+.fa-hryvnia {
+  --fa: "\f6f2"; }
 
-.fa-pills::before {
-  content: "\f484"; }
+.fa-pills {
+  --fa: "\f484"; }
 
-.fa-face-grin-wide::before {
-  content: "\f581"; }
+.fa-face-grin-wide {
+  --fa: "\f581"; }
 
-.fa-grin-alt::before {
-  content: "\f581"; }
+.fa-grin-alt {
+  --fa: "\f581"; }
 
-.fa-tooth::before {
-  content: "\f5c9"; }
+.fa-tooth {
+  --fa: "\f5c9"; }
 
-.fa-v::before {
-  content: "\56"; }
+.fa-v {
+  --fa: "\56"; }
 
-.fa-bangladeshi-taka-sign::before {
-  content: "\e2e6"; }
+.fa-bangladeshi-taka-sign {
+  --fa: "\e2e6"; }
 
-.fa-bicycle::before {
-  content: "\f206"; }
+.fa-bicycle {
+  --fa: "\f206"; }
 
-.fa-staff-snake::before {
-  content: "\e579"; }
+.fa-staff-snake {
+  --fa: "\e579"; }
 
-.fa-rod-asclepius::before {
-  content: "\e579"; }
+.fa-rod-asclepius {
+  --fa: "\e579"; }
 
-.fa-rod-snake::before {
-  content: "\e579"; }
+.fa-rod-snake {
+  --fa: "\e579"; }
 
-.fa-staff-aesculapius::before {
-  content: "\e579"; }
+.fa-staff-aesculapius {
+  --fa: "\e579"; }
 
-.fa-head-side-cough-slash::before {
-  content: "\e062"; }
+.fa-head-side-cough-slash {
+  --fa: "\e062"; }
 
-.fa-truck-medical::before {
-  content: "\f0f9"; }
+.fa-truck-medical {
+  --fa: "\f0f9"; }
 
-.fa-ambulance::before {
-  content: "\f0f9"; }
+.fa-ambulance {
+  --fa: "\f0f9"; }
 
-.fa-wheat-awn-circle-exclamation::before {
-  content: "\e598"; }
+.fa-wheat-awn-circle-exclamation {
+  --fa: "\e598"; }
 
-.fa-snowman::before {
-  content: "\f7d0"; }
+.fa-snowman {
+  --fa: "\f7d0"; }
 
-.fa-mortar-pestle::before {
-  content: "\f5a7"; }
+.fa-mortar-pestle {
+  --fa: "\f5a7"; }
 
-.fa-road-barrier::before {
-  content: "\e562"; }
+.fa-road-barrier {
+  --fa: "\e562"; }
 
-.fa-school::before {
-  content: "\f549"; }
+.fa-school {
+  --fa: "\f549"; }
 
-.fa-igloo::before {
-  content: "\f7ae"; }
+.fa-igloo {
+  --fa: "\f7ae"; }
 
-.fa-joint::before {
-  content: "\f595"; }
+.fa-joint {
+  --fa: "\f595"; }
 
-.fa-angle-right::before {
-  content: "\f105"; }
+.fa-angle-right {
+  --fa: "\f105"; }
 
-.fa-horse::before {
-  content: "\f6f0"; }
+.fa-horse {
+  --fa: "\f6f0"; }
 
-.fa-q::before {
-  content: "\51"; }
+.fa-q {
+  --fa: "\51"; }
 
-.fa-g::before {
-  content: "\47"; }
+.fa-g {
+  --fa: "\47"; }
 
-.fa-notes-medical::before {
-  content: "\f481"; }
+.fa-notes-medical {
+  --fa: "\f481"; }
 
-.fa-temperature-half::before {
-  content: "\f2c9"; }
+.fa-temperature-half {
+  --fa: "\f2c9"; }
 
-.fa-temperature-2::before {
-  content: "\f2c9"; }
+.fa-temperature-2 {
+  --fa: "\f2c9"; }
 
-.fa-thermometer-2::before {
-  content: "\f2c9"; }
+.fa-thermometer-2 {
+  --fa: "\f2c9"; }
 
-.fa-thermometer-half::before {
-  content: "\f2c9"; }
+.fa-thermometer-half {
+  --fa: "\f2c9"; }
 
-.fa-dong-sign::before {
-  content: "\e169"; }
+.fa-dong-sign {
+  --fa: "\e169"; }
 
-.fa-capsules::before {
-  content: "\f46b"; }
+.fa-capsules {
+  --fa: "\f46b"; }
 
-.fa-poo-storm::before {
-  content: "\f75a"; }
+.fa-poo-storm {
+  --fa: "\f75a"; }
 
-.fa-poo-bolt::before {
-  content: "\f75a"; }
+.fa-poo-bolt {
+  --fa: "\f75a"; }
 
-.fa-face-frown-open::before {
-  content: "\f57a"; }
+.fa-face-frown-open {
+  --fa: "\f57a"; }
 
-.fa-frown-open::before {
-  content: "\f57a"; }
+.fa-frown-open {
+  --fa: "\f57a"; }
 
-.fa-hand-point-up::before {
-  content: "\f0a6"; }
+.fa-hand-point-up {
+  --fa: "\f0a6"; }
 
-.fa-money-bill::before {
-  content: "\f0d6"; }
+.fa-money-bill {
+  --fa: "\f0d6"; }
 
-.fa-bookmark::before {
-  content: "\f02e"; }
+.fa-bookmark {
+  --fa: "\f02e"; }
 
-.fa-align-justify::before {
-  content: "\f039"; }
+.fa-align-justify {
+  --fa: "\f039"; }
 
-.fa-umbrella-beach::before {
-  content: "\f5ca"; }
+.fa-umbrella-beach {
+  --fa: "\f5ca"; }
 
-.fa-helmet-un::before {
-  content: "\e503"; }
+.fa-helmet-un {
+  --fa: "\e503"; }
 
-.fa-bullseye::before {
-  content: "\f140"; }
+.fa-bullseye {
+  --fa: "\f140"; }
 
-.fa-bacon::before {
-  content: "\f7e5"; }
+.fa-bacon {
+  --fa: "\f7e5"; }
 
-.fa-hand-point-down::before {
-  content: "\f0a7"; }
+.fa-hand-point-down {
+  --fa: "\f0a7"; }
 
-.fa-arrow-up-from-bracket::before {
-  content: "\e09a"; }
+.fa-arrow-up-from-bracket {
+  --fa: "\e09a"; }
 
-.fa-folder::before {
-  content: "\f07b"; }
+.fa-folder {
+  --fa: "\f07b"; }
 
-.fa-folder-blank::before {
-  content: "\f07b"; }
+.fa-folder-blank {
+  --fa: "\f07b"; }
 
-.fa-file-waveform::before {
-  content: "\f478"; }
+.fa-file-waveform {
+  --fa: "\f478"; }
 
-.fa-file-medical-alt::before {
-  content: "\f478"; }
+.fa-file-medical-alt {
+  --fa: "\f478"; }
 
-.fa-radiation::before {
-  content: "\f7b9"; }
+.fa-radiation {
+  --fa: "\f7b9"; }
 
-.fa-chart-simple::before {
-  content: "\e473"; }
+.fa-chart-simple {
+  --fa: "\e473"; }
 
-.fa-mars-stroke::before {
-  content: "\f229"; }
+.fa-mars-stroke {
+  --fa: "\f229"; }
 
-.fa-vial::before {
-  content: "\f492"; }
+.fa-vial {
+  --fa: "\f492"; }
 
-.fa-gauge::before {
-  content: "\f624"; }
+.fa-gauge {
+  --fa: "\f624"; }
 
-.fa-dashboard::before {
-  content: "\f624"; }
+.fa-dashboard {
+  --fa: "\f624"; }
 
-.fa-gauge-med::before {
-  content: "\f624"; }
+.fa-gauge-med {
+  --fa: "\f624"; }
 
-.fa-tachometer-alt-average::before {
-  content: "\f624"; }
+.fa-tachometer-alt-average {
+  --fa: "\f624"; }
 
-.fa-wand-magic-sparkles::before {
-  content: "\e2ca"; }
+.fa-wand-magic-sparkles {
+  --fa: "\e2ca"; }
 
-.fa-magic-wand-sparkles::before {
-  content: "\e2ca"; }
+.fa-magic-wand-sparkles {
+  --fa: "\e2ca"; }
 
-.fa-e::before {
-  content: "\45"; }
+.fa-e {
+  --fa: "\45"; }
 
-.fa-pen-clip::before {
-  content: "\f305"; }
+.fa-pen-clip {
+  --fa: "\f305"; }
 
-.fa-pen-alt::before {
-  content: "\f305"; }
+.fa-pen-alt {
+  --fa: "\f305"; }
 
-.fa-bridge-circle-exclamation::before {
-  content: "\e4ca"; }
+.fa-bridge-circle-exclamation {
+  --fa: "\e4ca"; }
 
-.fa-user::before {
-  content: "\f007"; }
+.fa-user {
+  --fa: "\f007"; }
 
-.fa-school-circle-check::before {
-  content: "\e56b"; }
+.fa-school-circle-check {
+  --fa: "\e56b"; }
 
-.fa-dumpster::before {
-  content: "\f793"; }
+.fa-dumpster {
+  --fa: "\f793"; }
 
-.fa-van-shuttle::before {
-  content: "\f5b6"; }
+.fa-van-shuttle {
+  --fa: "\f5b6"; }
 
-.fa-shuttle-van::before {
-  content: "\f5b6"; }
+.fa-shuttle-van {
+  --fa: "\f5b6"; }
 
-.fa-building-user::before {
-  content: "\e4da"; }
+.fa-building-user {
+  --fa: "\e4da"; }
 
-.fa-square-caret-left::before {
-  content: "\f191"; }
+.fa-square-caret-left {
+  --fa: "\f191"; }
 
-.fa-caret-square-left::before {
-  content: "\f191"; }
+.fa-caret-square-left {
+  --fa: "\f191"; }
 
-.fa-highlighter::before {
-  content: "\f591"; }
+.fa-highlighter {
+  --fa: "\f591"; }
 
-.fa-key::before {
-  content: "\f084"; }
+.fa-key {
+  --fa: "\f084"; }
 
-.fa-bullhorn::before {
-  content: "\f0a1"; }
+.fa-bullhorn {
+  --fa: "\f0a1"; }
 
-.fa-globe::before {
-  content: "\f0ac"; }
+.fa-globe {
+  --fa: "\f0ac"; }
 
-.fa-synagogue::before {
-  content: "\f69b"; }
+.fa-synagogue {
+  --fa: "\f69b"; }
 
-.fa-person-half-dress::before {
-  content: "\e548"; }
+.fa-person-half-dress {
+  --fa: "\e548"; }
 
-.fa-road-bridge::before {
-  content: "\e563"; }
+.fa-road-bridge {
+  --fa: "\e563"; }
 
-.fa-location-arrow::before {
-  content: "\f124"; }
+.fa-location-arrow {
+  --fa: "\f124"; }
 
-.fa-c::before {
-  content: "\43"; }
+.fa-c {
+  --fa: "\43"; }
 
-.fa-tablet-button::before {
-  content: "\f10a"; }
+.fa-tablet-button {
+  --fa: "\f10a"; }
 
-.fa-building-lock::before {
-  content: "\e4d6"; }
+.fa-building-lock {
+  --fa: "\e4d6"; }
 
-.fa-pizza-slice::before {
-  content: "\f818"; }
+.fa-pizza-slice {
+  --fa: "\f818"; }
 
-.fa-money-bill-wave::before {
-  content: "\f53a"; }
+.fa-money-bill-wave {
+  --fa: "\f53a"; }
 
-.fa-chart-area::before {
-  content: "\f1fe"; }
+.fa-chart-area {
+  --fa: "\f1fe"; }
 
-.fa-area-chart::before {
-  content: "\f1fe"; }
+.fa-area-chart {
+  --fa: "\f1fe"; }
 
-.fa-house-flag::before {
-  content: "\e50d"; }
+.fa-house-flag {
+  --fa: "\e50d"; }
 
-.fa-person-circle-minus::before {
-  content: "\e540"; }
+.fa-person-circle-minus {
+  --fa: "\e540"; }
 
-.fa-ban::before {
-  content: "\f05e"; }
+.fa-ban {
+  --fa: "\f05e"; }
 
-.fa-cancel::before {
-  content: "\f05e"; }
+.fa-cancel {
+  --fa: "\f05e"; }
 
-.fa-camera-rotate::before {
-  content: "\e0d8"; }
+.fa-camera-rotate {
+  --fa: "\e0d8"; }
 
-.fa-spray-can-sparkles::before {
-  content: "\f5d0"; }
+.fa-spray-can-sparkles {
+  --fa: "\f5d0"; }
 
-.fa-air-freshener::before {
-  content: "\f5d0"; }
+.fa-air-freshener {
+  --fa: "\f5d0"; }
 
-.fa-star::before {
-  content: "\f005"; }
+.fa-star {
+  --fa: "\f005"; }
 
-.fa-repeat::before {
-  content: "\f363"; }
+.fa-repeat {
+  --fa: "\f363"; }
 
-.fa-cross::before {
-  content: "\f654"; }
+.fa-cross {
+  --fa: "\f654"; }
 
-.fa-box::before {
-  content: "\f466"; }
+.fa-box {
+  --fa: "\f466"; }
 
-.fa-venus-mars::before {
-  content: "\f228"; }
+.fa-venus-mars {
+  --fa: "\f228"; }
 
-.fa-arrow-pointer::before {
-  content: "\f245"; }
+.fa-arrow-pointer {
+  --fa: "\f245"; }
 
-.fa-mouse-pointer::before {
-  content: "\f245"; }
+.fa-mouse-pointer {
+  --fa: "\f245"; }
 
-.fa-maximize::before {
-  content: "\f31e"; }
+.fa-maximize {
+  --fa: "\f31e"; }
 
-.fa-expand-arrows-alt::before {
-  content: "\f31e"; }
+.fa-expand-arrows-alt {
+  --fa: "\f31e"; }
 
-.fa-charging-station::before {
-  content: "\f5e7"; }
+.fa-charging-station {
+  --fa: "\f5e7"; }
 
-.fa-shapes::before {
-  content: "\f61f"; }
+.fa-shapes {
+  --fa: "\f61f"; }
 
-.fa-triangle-circle-square::before {
-  content: "\f61f"; }
+.fa-triangle-circle-square {
+  --fa: "\f61f"; }
 
-.fa-shuffle::before {
-  content: "\f074"; }
+.fa-shuffle {
+  --fa: "\f074"; }
 
-.fa-random::before {
-  content: "\f074"; }
+.fa-random {
+  --fa: "\f074"; }
 
-.fa-person-running::before {
-  content: "\f70c"; }
+.fa-person-running {
+  --fa: "\f70c"; }
 
-.fa-running::before {
-  content: "\f70c"; }
+.fa-running {
+  --fa: "\f70c"; }
 
-.fa-mobile-retro::before {
-  content: "\e527"; }
+.fa-mobile-retro {
+  --fa: "\e527"; }
 
-.fa-grip-lines-vertical::before {
-  content: "\f7a5"; }
+.fa-grip-lines-vertical {
+  --fa: "\f7a5"; }
 
-.fa-spider::before {
-  content: "\f717"; }
+.fa-spider {
+  --fa: "\f717"; }
 
-.fa-hands-bound::before {
-  content: "\e4f9"; }
+.fa-hands-bound {
+  --fa: "\e4f9"; }
 
-.fa-file-invoice-dollar::before {
-  content: "\f571"; }
+.fa-file-invoice-dollar {
+  --fa: "\f571"; }
 
-.fa-plane-circle-exclamation::before {
-  content: "\e556"; }
+.fa-plane-circle-exclamation {
+  --fa: "\e556"; }
 
-.fa-x-ray::before {
-  content: "\f497"; }
+.fa-x-ray {
+  --fa: "\f497"; }
 
-.fa-spell-check::before {
-  content: "\f891"; }
+.fa-spell-check {
+  --fa: "\f891"; }
 
-.fa-slash::before {
-  content: "\f715"; }
+.fa-slash {
+  --fa: "\f715"; }
 
-.fa-computer-mouse::before {
-  content: "\f8cc"; }
+.fa-computer-mouse {
+  --fa: "\f8cc"; }
 
-.fa-mouse::before {
-  content: "\f8cc"; }
+.fa-mouse {
+  --fa: "\f8cc"; }
 
-.fa-arrow-right-to-bracket::before {
-  content: "\f090"; }
+.fa-arrow-right-to-bracket {
+  --fa: "\f090"; }
 
-.fa-sign-in::before {
-  content: "\f090"; }
+.fa-sign-in {
+  --fa: "\f090"; }
 
-.fa-shop-slash::before {
-  content: "\e070"; }
+.fa-shop-slash {
+  --fa: "\e070"; }
 
-.fa-store-alt-slash::before {
-  content: "\e070"; }
+.fa-store-alt-slash {
+  --fa: "\e070"; }
 
-.fa-server::before {
-  content: "\f233"; }
+.fa-server {
+  --fa: "\f233"; }
 
-.fa-virus-covid-slash::before {
-  content: "\e4a9"; }
+.fa-virus-covid-slash {
+  --fa: "\e4a9"; }
 
-.fa-shop-lock::before {
-  content: "\e4a5"; }
+.fa-shop-lock {
+  --fa: "\e4a5"; }
 
-.fa-hourglass-start::before {
-  content: "\f251"; }
+.fa-hourglass-start {
+  --fa: "\f251"; }
 
-.fa-hourglass-1::before {
-  content: "\f251"; }
+.fa-hourglass-1 {
+  --fa: "\f251"; }
 
-.fa-blender-phone::before {
-  content: "\f6b6"; }
+.fa-blender-phone {
+  --fa: "\f6b6"; }
 
-.fa-building-wheat::before {
-  content: "\e4db"; }
+.fa-building-wheat {
+  --fa: "\e4db"; }
 
-.fa-person-breastfeeding::before {
-  content: "\e53a"; }
+.fa-person-breastfeeding {
+  --fa: "\e53a"; }
 
-.fa-right-to-bracket::before {
-  content: "\f2f6"; }
+.fa-right-to-bracket {
+  --fa: "\f2f6"; }
 
-.fa-sign-in-alt::before {
-  content: "\f2f6"; }
+.fa-sign-in-alt {
+  --fa: "\f2f6"; }
 
-.fa-venus::before {
-  content: "\f221"; }
+.fa-venus {
+  --fa: "\f221"; }
 
-.fa-passport::before {
-  content: "\f5ab"; }
+.fa-passport {
+  --fa: "\f5ab"; }
 
-.fa-heart-pulse::before {
-  content: "\f21e"; }
+.fa-thumbtack-slash {
+  --fa: "\e68f"; }
 
-.fa-heartbeat::before {
-  content: "\f21e"; }
+.fa-thumb-tack-slash {
+  --fa: "\e68f"; }
 
-.fa-people-carry-box::before {
-  content: "\f4ce"; }
+.fa-heart-pulse {
+  --fa: "\f21e"; }
 
-.fa-people-carry::before {
-  content: "\f4ce"; }
+.fa-heartbeat {
+  --fa: "\f21e"; }
 
-.fa-temperature-high::before {
-  content: "\f769"; }
+.fa-people-carry-box {
+  --fa: "\f4ce"; }
 
-.fa-microchip::before {
-  content: "\f2db"; }
+.fa-people-carry {
+  --fa: "\f4ce"; }
 
-.fa-crown::before {
-  content: "\f521"; }
+.fa-temperature-high {
+  --fa: "\f769"; }
 
-.fa-weight-hanging::before {
-  content: "\f5cd"; }
+.fa-microchip {
+  --fa: "\f2db"; }
 
-.fa-xmarks-lines::before {
-  content: "\e59a"; }
+.fa-crown {
+  --fa: "\f521"; }
 
-.fa-file-prescription::before {
-  content: "\f572"; }
+.fa-weight-hanging {
+  --fa: "\f5cd"; }
 
-.fa-weight-scale::before {
-  content: "\f496"; }
+.fa-xmarks-lines {
+  --fa: "\e59a"; }
 
-.fa-weight::before {
-  content: "\f496"; }
+.fa-file-prescription {
+  --fa: "\f572"; }
 
-.fa-user-group::before {
-  content: "\f500"; }
+.fa-weight-scale {
+  --fa: "\f496"; }
 
-.fa-user-friends::before {
-  content: "\f500"; }
+.fa-weight {
+  --fa: "\f496"; }
 
-.fa-arrow-up-a-z::before {
-  content: "\f15e"; }
+.fa-user-group {
+  --fa: "\f500"; }
 
-.fa-sort-alpha-up::before {
-  content: "\f15e"; }
+.fa-user-friends {
+  --fa: "\f500"; }
 
-.fa-chess-knight::before {
-  content: "\f441"; }
+.fa-arrow-up-a-z {
+  --fa: "\f15e"; }
 
-.fa-face-laugh-squint::before {
-  content: "\f59b"; }
+.fa-sort-alpha-up {
+  --fa: "\f15e"; }
 
-.fa-laugh-squint::before {
-  content: "\f59b"; }
+.fa-chess-knight {
+  --fa: "\f441"; }
 
-.fa-wheelchair::before {
-  content: "\f193"; }
+.fa-face-laugh-squint {
+  --fa: "\f59b"; }
 
-.fa-circle-arrow-up::before {
-  content: "\f0aa"; }
+.fa-laugh-squint {
+  --fa: "\f59b"; }
 
-.fa-arrow-circle-up::before {
-  content: "\f0aa"; }
+.fa-wheelchair {
+  --fa: "\f193"; }
 
-.fa-toggle-on::before {
-  content: "\f205"; }
+.fa-circle-arrow-up {
+  --fa: "\f0aa"; }
 
-.fa-person-walking::before {
-  content: "\f554"; }
+.fa-arrow-circle-up {
+  --fa: "\f0aa"; }
 
-.fa-walking::before {
-  content: "\f554"; }
+.fa-toggle-on {
+  --fa: "\f205"; }
 
-.fa-l::before {
-  content: "\4c"; }
+.fa-person-walking {
+  --fa: "\f554"; }
 
-.fa-fire::before {
-  content: "\f06d"; }
+.fa-walking {
+  --fa: "\f554"; }
 
-.fa-bed-pulse::before {
-  content: "\f487"; }
+.fa-l {
+  --fa: "\4c"; }
 
-.fa-procedures::before {
-  content: "\f487"; }
+.fa-fire {
+  --fa: "\f06d"; }
 
-.fa-shuttle-space::before {
-  content: "\f197"; }
+.fa-bed-pulse {
+  --fa: "\f487"; }
 
-.fa-space-shuttle::before {
-  content: "\f197"; }
+.fa-procedures {
+  --fa: "\f487"; }
 
-.fa-face-laugh::before {
-  content: "\f599"; }
+.fa-shuttle-space {
+  --fa: "\f197"; }
 
-.fa-laugh::before {
-  content: "\f599"; }
+.fa-space-shuttle {
+  --fa: "\f197"; }
 
-.fa-folder-open::before {
-  content: "\f07c"; }
+.fa-face-laugh {
+  --fa: "\f599"; }
 
-.fa-heart-circle-plus::before {
-  content: "\e500"; }
+.fa-laugh {
+  --fa: "\f599"; }
 
-.fa-code-fork::before {
-  content: "\e13b"; }
+.fa-folder-open {
+  --fa: "\f07c"; }
 
-.fa-city::before {
-  content: "\f64f"; }
+.fa-heart-circle-plus {
+  --fa: "\e500"; }
 
-.fa-microphone-lines::before {
-  content: "\f3c9"; }
+.fa-code-fork {
+  --fa: "\e13b"; }
 
-.fa-microphone-alt::before {
-  content: "\f3c9"; }
+.fa-city {
+  --fa: "\f64f"; }
 
-.fa-pepper-hot::before {
-  content: "\f816"; }
+.fa-microphone-lines {
+  --fa: "\f3c9"; }
 
-.fa-unlock::before {
-  content: "\f09c"; }
+.fa-microphone-alt {
+  --fa: "\f3c9"; }
 
-.fa-colon-sign::before {
-  content: "\e140"; }
+.fa-pepper-hot {
+  --fa: "\f816"; }
 
-.fa-headset::before {
-  content: "\f590"; }
+.fa-unlock {
+  --fa: "\f09c"; }
 
-.fa-store-slash::before {
-  content: "\e071"; }
+.fa-colon-sign {
+  --fa: "\e140"; }
 
-.fa-road-circle-xmark::before {
-  content: "\e566"; }
+.fa-headset {
+  --fa: "\f590"; }
 
-.fa-user-minus::before {
-  content: "\f503"; }
+.fa-store-slash {
+  --fa: "\e071"; }
 
-.fa-mars-stroke-up::before {
-  content: "\f22a"; }
+.fa-road-circle-xmark {
+  --fa: "\e566"; }
 
-.fa-mars-stroke-v::before {
-  content: "\f22a"; }
+.fa-user-minus {
+  --fa: "\f503"; }
 
-.fa-champagne-glasses::before {
-  content: "\f79f"; }
+.fa-mars-stroke-up {
+  --fa: "\f22a"; }
 
-.fa-glass-cheers::before {
-  content: "\f79f"; }
+.fa-mars-stroke-v {
+  --fa: "\f22a"; }
 
-.fa-clipboard::before {
-  content: "\f328"; }
+.fa-champagne-glasses {
+  --fa: "\f79f"; }
 
-.fa-house-circle-exclamation::before {
-  content: "\e50a"; }
+.fa-glass-cheers {
+  --fa: "\f79f"; }
 
-.fa-file-arrow-up::before {
-  content: "\f574"; }
+.fa-clipboard {
+  --fa: "\f328"; }
 
-.fa-file-upload::before {
-  content: "\f574"; }
+.fa-house-circle-exclamation {
+  --fa: "\e50a"; }
 
-.fa-wifi::before {
-  content: "\f1eb"; }
+.fa-file-arrow-up {
+  --fa: "\f574"; }
 
-.fa-wifi-3::before {
-  content: "\f1eb"; }
+.fa-file-upload {
+  --fa: "\f574"; }
 
-.fa-wifi-strong::before {
-  content: "\f1eb"; }
+.fa-wifi {
+  --fa: "\f1eb"; }
 
-.fa-bath::before {
-  content: "\f2cd"; }
+.fa-wifi-3 {
+  --fa: "\f1eb"; }
 
-.fa-bathtub::before {
-  content: "\f2cd"; }
+.fa-wifi-strong {
+  --fa: "\f1eb"; }
 
-.fa-underline::before {
-  content: "\f0cd"; }
+.fa-bath {
+  --fa: "\f2cd"; }
 
-.fa-user-pen::before {
-  content: "\f4ff"; }
+.fa-bathtub {
+  --fa: "\f2cd"; }
 
-.fa-user-edit::before {
-  content: "\f4ff"; }
+.fa-underline {
+  --fa: "\f0cd"; }
 
-.fa-signature::before {
-  content: "\f5b7"; }
+.fa-user-pen {
+  --fa: "\f4ff"; }
 
-.fa-stroopwafel::before {
-  content: "\f551"; }
+.fa-user-edit {
+  --fa: "\f4ff"; }
 
-.fa-bold::before {
-  content: "\f032"; }
+.fa-signature {
+  --fa: "\f5b7"; }
 
-.fa-anchor-lock::before {
-  content: "\e4ad"; }
+.fa-stroopwafel {
+  --fa: "\f551"; }
 
-.fa-building-ngo::before {
-  content: "\e4d7"; }
+.fa-bold {
+  --fa: "\f032"; }
 
-.fa-manat-sign::before {
-  content: "\e1d5"; }
+.fa-anchor-lock {
+  --fa: "\e4ad"; }
 
-.fa-not-equal::before {
-  content: "\f53e"; }
+.fa-building-ngo {
+  --fa: "\e4d7"; }
 
-.fa-border-top-left::before {
-  content: "\f853"; }
+.fa-manat-sign {
+  --fa: "\e1d5"; }
 
-.fa-border-style::before {
-  content: "\f853"; }
+.fa-not-equal {
+  --fa: "\f53e"; }
 
-.fa-map-location-dot::before {
-  content: "\f5a0"; }
+.fa-border-top-left {
+  --fa: "\f853"; }
 
-.fa-map-marked-alt::before {
-  content: "\f5a0"; }
+.fa-border-style {
+  --fa: "\f853"; }
 
-.fa-jedi::before {
-  content: "\f669"; }
+.fa-map-location-dot {
+  --fa: "\f5a0"; }
 
-.fa-square-poll-vertical::before {
-  content: "\f681"; }
+.fa-map-marked-alt {
+  --fa: "\f5a0"; }
 
-.fa-poll::before {
-  content: "\f681"; }
+.fa-jedi {
+  --fa: "\f669"; }
 
-.fa-mug-hot::before {
-  content: "\f7b6"; }
+.fa-square-poll-vertical {
+  --fa: "\f681"; }
 
-.fa-car-battery::before {
-  content: "\f5df"; }
+.fa-poll {
+  --fa: "\f681"; }
 
-.fa-battery-car::before {
-  content: "\f5df"; }
+.fa-mug-hot {
+  --fa: "\f7b6"; }
 
-.fa-gift::before {
-  content: "\f06b"; }
+.fa-car-battery {
+  --fa: "\f5df"; }
 
-.fa-dice-two::before {
-  content: "\f528"; }
+.fa-battery-car {
+  --fa: "\f5df"; }
 
-.fa-chess-queen::before {
-  content: "\f445"; }
+.fa-gift {
+  --fa: "\f06b"; }
 
-.fa-glasses::before {
-  content: "\f530"; }
+.fa-dice-two {
+  --fa: "\f528"; }
 
-.fa-chess-board::before {
-  content: "\f43c"; }
+.fa-chess-queen {
+  --fa: "\f445"; }
 
-.fa-building-circle-check::before {
-  content: "\e4d2"; }
+.fa-glasses {
+  --fa: "\f530"; }
 
-.fa-person-chalkboard::before {
-  content: "\e53d"; }
+.fa-chess-board {
+  --fa: "\f43c"; }
 
-.fa-mars-stroke-right::before {
-  content: "\f22b"; }
+.fa-building-circle-check {
+  --fa: "\e4d2"; }
 
-.fa-mars-stroke-h::before {
-  content: "\f22b"; }
+.fa-person-chalkboard {
+  --fa: "\e53d"; }
 
-.fa-hand-back-fist::before {
-  content: "\f255"; }
+.fa-mars-stroke-right {
+  --fa: "\f22b"; }
 
-.fa-hand-rock::before {
-  content: "\f255"; }
+.fa-mars-stroke-h {
+  --fa: "\f22b"; }
 
-.fa-square-caret-up::before {
-  content: "\f151"; }
+.fa-hand-back-fist {
+  --fa: "\f255"; }
 
-.fa-caret-square-up::before {
-  content: "\f151"; }
+.fa-hand-rock {
+  --fa: "\f255"; }
 
-.fa-cloud-showers-water::before {
-  content: "\e4e4"; }
+.fa-square-caret-up {
+  --fa: "\f151"; }
 
-.fa-chart-bar::before {
-  content: "\f080"; }
+.fa-caret-square-up {
+  --fa: "\f151"; }
 
-.fa-bar-chart::before {
-  content: "\f080"; }
+.fa-cloud-showers-water {
+  --fa: "\e4e4"; }
 
-.fa-hands-bubbles::before {
-  content: "\e05e"; }
+.fa-chart-bar {
+  --fa: "\f080"; }
 
-.fa-hands-wash::before {
-  content: "\e05e"; }
+.fa-bar-chart {
+  --fa: "\f080"; }
 
-.fa-less-than-equal::before {
-  content: "\f537"; }
+.fa-hands-bubbles {
+  --fa: "\e05e"; }
 
-.fa-train::before {
-  content: "\f238"; }
+.fa-hands-wash {
+  --fa: "\e05e"; }
 
-.fa-eye-low-vision::before {
-  content: "\f2a8"; }
+.fa-less-than-equal {
+  --fa: "\f537"; }
 
-.fa-low-vision::before {
-  content: "\f2a8"; }
+.fa-train {
+  --fa: "\f238"; }
 
-.fa-crow::before {
-  content: "\f520"; }
+.fa-eye-low-vision {
+  --fa: "\f2a8"; }
 
-.fa-sailboat::before {
-  content: "\e445"; }
+.fa-low-vision {
+  --fa: "\f2a8"; }
 
-.fa-window-restore::before {
-  content: "\f2d2"; }
+.fa-crow {
+  --fa: "\f520"; }
 
-.fa-square-plus::before {
-  content: "\f0fe"; }
+.fa-sailboat {
+  --fa: "\e445"; }
 
-.fa-plus-square::before {
-  content: "\f0fe"; }
+.fa-window-restore {
+  --fa: "\f2d2"; }
 
-.fa-torii-gate::before {
-  content: "\f6a1"; }
+.fa-square-plus {
+  --fa: "\f0fe"; }
 
-.fa-frog::before {
-  content: "\f52e"; }
+.fa-plus-square {
+  --fa: "\f0fe"; }
 
-.fa-bucket::before {
-  content: "\e4cf"; }
+.fa-torii-gate {
+  --fa: "\f6a1"; }
 
-.fa-image::before {
-  content: "\f03e"; }
+.fa-frog {
+  --fa: "\f52e"; }
 
-.fa-microphone::before {
-  content: "\f130"; }
+.fa-bucket {
+  --fa: "\e4cf"; }
 
-.fa-cow::before {
-  content: "\f6c8"; }
+.fa-image {
+  --fa: "\f03e"; }
 
-.fa-caret-up::before {
-  content: "\f0d8"; }
+.fa-microphone {
+  --fa: "\f130"; }
 
-.fa-screwdriver::before {
-  content: "\f54a"; }
+.fa-cow {
+  --fa: "\f6c8"; }
 
-.fa-folder-closed::before {
-  content: "\e185"; }
+.fa-caret-up {
+  --fa: "\f0d8"; }
 
-.fa-house-tsunami::before {
-  content: "\e515"; }
+.fa-screwdriver {
+  --fa: "\f54a"; }
 
-.fa-square-nfi::before {
-  content: "\e576"; }
+.fa-folder-closed {
+  --fa: "\e185"; }
 
-.fa-arrow-up-from-ground-water::before {
-  content: "\e4b5"; }
+.fa-house-tsunami {
+  --fa: "\e515"; }
 
-.fa-martini-glass::before {
-  content: "\f57b"; }
+.fa-square-nfi {
+  --fa: "\e576"; }
 
-.fa-glass-martini-alt::before {
-  content: "\f57b"; }
+.fa-arrow-up-from-ground-water {
+  --fa: "\e4b5"; }
 
-.fa-rotate-left::before {
-  content: "\f2ea"; }
+.fa-martini-glass {
+  --fa: "\f57b"; }
 
-.fa-rotate-back::before {
-  content: "\f2ea"; }
+.fa-glass-martini-alt {
+  --fa: "\f57b"; }
 
-.fa-rotate-backward::before {
-  content: "\f2ea"; }
+.fa-square-binary {
+  --fa: "\e69b"; }
 
-.fa-undo-alt::before {
-  content: "\f2ea"; }
+.fa-rotate-left {
+  --fa: "\f2ea"; }
 
-.fa-table-columns::before {
-  content: "\f0db"; }
+.fa-rotate-back {
+  --fa: "\f2ea"; }
 
-.fa-columns::before {
-  content: "\f0db"; }
+.fa-rotate-backward {
+  --fa: "\f2ea"; }
 
-.fa-lemon::before {
-  content: "\f094"; }
+.fa-undo-alt {
+  --fa: "\f2ea"; }
 
-.fa-head-side-mask::before {
-  content: "\e063"; }
+.fa-table-columns {
+  --fa: "\f0db"; }
 
-.fa-handshake::before {
-  content: "\f2b5"; }
+.fa-columns {
+  --fa: "\f0db"; }
 
-.fa-gem::before {
-  content: "\f3a5"; }
+.fa-lemon {
+  --fa: "\f094"; }
 
-.fa-dolly::before {
-  content: "\f472"; }
+.fa-head-side-mask {
+  --fa: "\e063"; }
 
-.fa-dolly-box::before {
-  content: "\f472"; }
+.fa-handshake {
+  --fa: "\f2b5"; }
 
-.fa-smoking::before {
-  content: "\f48d"; }
+.fa-gem {
+  --fa: "\f3a5"; }
 
-.fa-minimize::before {
-  content: "\f78c"; }
+.fa-dolly {
+  --fa: "\f472"; }
 
-.fa-compress-arrows-alt::before {
-  content: "\f78c"; }
+.fa-dolly-box {
+  --fa: "\f472"; }
 
-.fa-monument::before {
-  content: "\f5a6"; }
+.fa-smoking {
+  --fa: "\f48d"; }
 
-.fa-snowplow::before {
-  content: "\f7d2"; }
+.fa-minimize {
+  --fa: "\f78c"; }
 
-.fa-angles-right::before {
-  content: "\f101"; }
+.fa-compress-arrows-alt {
+  --fa: "\f78c"; }
 
-.fa-angle-double-right::before {
-  content: "\f101"; }
+.fa-monument {
+  --fa: "\f5a6"; }
 
-.fa-cannabis::before {
-  content: "\f55f"; }
+.fa-snowplow {
+  --fa: "\f7d2"; }
 
-.fa-circle-play::before {
-  content: "\f144"; }
+.fa-angles-right {
+  --fa: "\f101"; }
 
-.fa-play-circle::before {
-  content: "\f144"; }
+.fa-angle-double-right {
+  --fa: "\f101"; }
 
-.fa-tablets::before {
-  content: "\f490"; }
+.fa-cannabis {
+  --fa: "\f55f"; }
 
-.fa-ethernet::before {
-  content: "\f796"; }
+.fa-circle-play {
+  --fa: "\f144"; }
 
-.fa-euro-sign::before {
-  content: "\f153"; }
+.fa-play-circle {
+  --fa: "\f144"; }
 
-.fa-eur::before {
-  content: "\f153"; }
+.fa-tablets {
+  --fa: "\f490"; }
 
-.fa-euro::before {
-  content: "\f153"; }
+.fa-ethernet {
+  --fa: "\f796"; }
 
-.fa-chair::before {
-  content: "\f6c0"; }
+.fa-euro-sign {
+  --fa: "\f153"; }
 
-.fa-circle-check::before {
-  content: "\f058"; }
+.fa-eur {
+  --fa: "\f153"; }
 
-.fa-check-circle::before {
-  content: "\f058"; }
+.fa-euro {
+  --fa: "\f153"; }
 
-.fa-circle-stop::before {
-  content: "\f28d"; }
+.fa-chair {
+  --fa: "\f6c0"; }
 
-.fa-stop-circle::before {
-  content: "\f28d"; }
+.fa-circle-check {
+  --fa: "\f058"; }
 
-.fa-compass-drafting::before {
-  content: "\f568"; }
+.fa-check-circle {
+  --fa: "\f058"; }
 
-.fa-drafting-compass::before {
-  content: "\f568"; }
+.fa-circle-stop {
+  --fa: "\f28d"; }
 
-.fa-plate-wheat::before {
-  content: "\e55a"; }
+.fa-stop-circle {
+  --fa: "\f28d"; }
 
-.fa-icicles::before {
-  content: "\f7ad"; }
+.fa-compass-drafting {
+  --fa: "\f568"; }
 
-.fa-person-shelter::before {
-  content: "\e54f"; }
+.fa-drafting-compass {
+  --fa: "\f568"; }
 
-.fa-neuter::before {
-  content: "\f22c"; }
+.fa-plate-wheat {
+  --fa: "\e55a"; }
 
-.fa-id-badge::before {
-  content: "\f2c1"; }
+.fa-icicles {
+  --fa: "\f7ad"; }
 
-.fa-marker::before {
-  content: "\f5a1"; }
+.fa-person-shelter {
+  --fa: "\e54f"; }
 
-.fa-face-laugh-beam::before {
-  content: "\f59a"; }
+.fa-neuter {
+  --fa: "\f22c"; }
 
-.fa-laugh-beam::before {
-  content: "\f59a"; }
+.fa-id-badge {
+  --fa: "\f2c1"; }
 
-.fa-helicopter-symbol::before {
-  content: "\e502"; }
+.fa-marker {
+  --fa: "\f5a1"; }
 
-.fa-universal-access::before {
-  content: "\f29a"; }
+.fa-face-laugh-beam {
+  --fa: "\f59a"; }
 
-.fa-circle-chevron-up::before {
-  content: "\f139"; }
+.fa-laugh-beam {
+  --fa: "\f59a"; }
 
-.fa-chevron-circle-up::before {
-  content: "\f139"; }
+.fa-helicopter-symbol {
+  --fa: "\e502"; }
 
-.fa-lari-sign::before {
-  content: "\e1c8"; }
+.fa-universal-access {
+  --fa: "\f29a"; }
 
-.fa-volcano::before {
-  content: "\f770"; }
+.fa-circle-chevron-up {
+  --fa: "\f139"; }
 
-.fa-person-walking-dashed-line-arrow-right::before {
-  content: "\e553"; }
+.fa-chevron-circle-up {
+  --fa: "\f139"; }
 
-.fa-sterling-sign::before {
-  content: "\f154"; }
+.fa-lari-sign {
+  --fa: "\e1c8"; }
 
-.fa-gbp::before {
-  content: "\f154"; }
+.fa-volcano {
+  --fa: "\f770"; }
 
-.fa-pound-sign::before {
-  content: "\f154"; }
+.fa-person-walking-dashed-line-arrow-right {
+  --fa: "\e553"; }
 
-.fa-viruses::before {
-  content: "\e076"; }
+.fa-sterling-sign {
+  --fa: "\f154"; }
 
-.fa-square-person-confined::before {
-  content: "\e577"; }
+.fa-gbp {
+  --fa: "\f154"; }
 
-.fa-user-tie::before {
-  content: "\f508"; }
+.fa-pound-sign {
+  --fa: "\f154"; }
 
-.fa-arrow-down-long::before {
-  content: "\f175"; }
+.fa-viruses {
+  --fa: "\e076"; }
 
-.fa-long-arrow-down::before {
-  content: "\f175"; }
+.fa-square-person-confined {
+  --fa: "\e577"; }
 
-.fa-tent-arrow-down-to-line::before {
-  content: "\e57e"; }
+.fa-user-tie {
+  --fa: "\f508"; }
 
-.fa-certificate::before {
-  content: "\f0a3"; }
+.fa-arrow-down-long {
+  --fa: "\f175"; }
 
-.fa-reply-all::before {
-  content: "\f122"; }
+.fa-long-arrow-down {
+  --fa: "\f175"; }
 
-.fa-mail-reply-all::before {
-  content: "\f122"; }
+.fa-tent-arrow-down-to-line {
+  --fa: "\e57e"; }
 
-.fa-suitcase::before {
-  content: "\f0f2"; }
+.fa-certificate {
+  --fa: "\f0a3"; }
 
-.fa-person-skating::before {
-  content: "\f7c5"; }
+.fa-reply-all {
+  --fa: "\f122"; }
 
-.fa-skating::before {
-  content: "\f7c5"; }
+.fa-mail-reply-all {
+  --fa: "\f122"; }
 
-.fa-filter-circle-dollar::before {
-  content: "\f662"; }
+.fa-suitcase {
+  --fa: "\f0f2"; }
 
-.fa-funnel-dollar::before {
-  content: "\f662"; }
+.fa-person-skating {
+  --fa: "\f7c5"; }
 
-.fa-camera-retro::before {
-  content: "\f083"; }
+.fa-skating {
+  --fa: "\f7c5"; }
 
-.fa-circle-arrow-down::before {
-  content: "\f0ab"; }
+.fa-filter-circle-dollar {
+  --fa: "\f662"; }
 
-.fa-arrow-circle-down::before {
-  content: "\f0ab"; }
+.fa-funnel-dollar {
+  --fa: "\f662"; }
 
-.fa-file-import::before {
-  content: "\f56f"; }
+.fa-camera-retro {
+  --fa: "\f083"; }
 
-.fa-arrow-right-to-file::before {
-  content: "\f56f"; }
+.fa-circle-arrow-down {
+  --fa: "\f0ab"; }
 
-.fa-square-arrow-up-right::before {
-  content: "\f14c"; }
+.fa-arrow-circle-down {
+  --fa: "\f0ab"; }
 
-.fa-external-link-square::before {
-  content: "\f14c"; }
+.fa-file-import {
+  --fa: "\f56f"; }
 
-.fa-box-open::before {
-  content: "\f49e"; }
+.fa-arrow-right-to-file {
+  --fa: "\f56f"; }
 
-.fa-scroll::before {
-  content: "\f70e"; }
+.fa-square-arrow-up-right {
+  --fa: "\f14c"; }
 
-.fa-spa::before {
-  content: "\f5bb"; }
+.fa-external-link-square {
+  --fa: "\f14c"; }
 
-.fa-location-pin-lock::before {
-  content: "\e51f"; }
+.fa-box-open {
+  --fa: "\f49e"; }
 
-.fa-pause::before {
-  content: "\f04c"; }
+.fa-scroll {
+  --fa: "\f70e"; }
 
-.fa-hill-avalanche::before {
-  content: "\e507"; }
+.fa-spa {
+  --fa: "\f5bb"; }
 
-.fa-temperature-empty::before {
-  content: "\f2cb"; }
+.fa-location-pin-lock {
+  --fa: "\e51f"; }
 
-.fa-temperature-0::before {
-  content: "\f2cb"; }
+.fa-pause {
+  --fa: "\f04c"; }
 
-.fa-thermometer-0::before {
-  content: "\f2cb"; }
+.fa-hill-avalanche {
+  --fa: "\e507"; }
 
-.fa-thermometer-empty::before {
-  content: "\f2cb"; }
+.fa-temperature-empty {
+  --fa: "\f2cb"; }
 
-.fa-bomb::before {
-  content: "\f1e2"; }
+.fa-temperature-0 {
+  --fa: "\f2cb"; }
 
-.fa-registered::before {
-  content: "\f25d"; }
+.fa-thermometer-0 {
+  --fa: "\f2cb"; }
 
-.fa-address-card::before {
-  content: "\f2bb"; }
+.fa-thermometer-empty {
+  --fa: "\f2cb"; }
 
-.fa-contact-card::before {
-  content: "\f2bb"; }
+.fa-bomb {
+  --fa: "\f1e2"; }
 
-.fa-vcard::before {
-  content: "\f2bb"; }
+.fa-registered {
+  --fa: "\f25d"; }
 
-.fa-scale-unbalanced-flip::before {
-  content: "\f516"; }
+.fa-address-card {
+  --fa: "\f2bb"; }
 
-.fa-balance-scale-right::before {
-  content: "\f516"; }
+.fa-contact-card {
+  --fa: "\f2bb"; }
 
-.fa-subscript::before {
-  content: "\f12c"; }
+.fa-vcard {
+  --fa: "\f2bb"; }
 
-.fa-diamond-turn-right::before {
-  content: "\f5eb"; }
+.fa-scale-unbalanced-flip {
+  --fa: "\f516"; }
 
-.fa-directions::before {
-  content: "\f5eb"; }
+.fa-balance-scale-right {
+  --fa: "\f516"; }
 
-.fa-burst::before {
-  content: "\e4dc"; }
+.fa-subscript {
+  --fa: "\f12c"; }
 
-.fa-house-laptop::before {
-  content: "\e066"; }
+.fa-diamond-turn-right {
+  --fa: "\f5eb"; }
 
-.fa-laptop-house::before {
-  content: "\e066"; }
+.fa-directions {
+  --fa: "\f5eb"; }
 
-.fa-face-tired::before {
-  content: "\f5c8"; }
+.fa-burst {
+  --fa: "\e4dc"; }
 
-.fa-tired::before {
-  content: "\f5c8"; }
+.fa-house-laptop {
+  --fa: "\e066"; }
 
-.fa-money-bills::before {
-  content: "\e1f3"; }
+.fa-laptop-house {
+  --fa: "\e066"; }
 
-.fa-smog::before {
-  content: "\f75f"; }
+.fa-face-tired {
+  --fa: "\f5c8"; }
 
-.fa-crutch::before {
-  content: "\f7f7"; }
+.fa-tired {
+  --fa: "\f5c8"; }
 
-.fa-cloud-arrow-up::before {
-  content: "\f0ee"; }
+.fa-money-bills {
+  --fa: "\e1f3"; }
 
-.fa-cloud-upload::before {
-  content: "\f0ee"; }
+.fa-smog {
+  --fa: "\f75f"; }
 
-.fa-cloud-upload-alt::before {
-  content: "\f0ee"; }
+.fa-crutch {
+  --fa: "\f7f7"; }
 
-.fa-palette::before {
-  content: "\f53f"; }
+.fa-cloud-arrow-up {
+  --fa: "\f0ee"; }
 
-.fa-arrows-turn-right::before {
-  content: "\e4c0"; }
+.fa-cloud-upload {
+  --fa: "\f0ee"; }
 
-.fa-vest::before {
-  content: "\e085"; }
+.fa-cloud-upload-alt {
+  --fa: "\f0ee"; }
 
-.fa-ferry::before {
-  content: "\e4ea"; }
+.fa-palette {
+  --fa: "\f53f"; }
 
-.fa-arrows-down-to-people::before {
-  content: "\e4b9"; }
+.fa-arrows-turn-right {
+  --fa: "\e4c0"; }
 
-.fa-seedling::before {
-  content: "\f4d8"; }
+.fa-vest {
+  --fa: "\e085"; }
 
-.fa-sprout::before {
-  content: "\f4d8"; }
+.fa-ferry {
+  --fa: "\e4ea"; }
 
-.fa-left-right::before {
-  content: "\f337"; }
+.fa-arrows-down-to-people {
+  --fa: "\e4b9"; }
 
-.fa-arrows-alt-h::before {
-  content: "\f337"; }
+.fa-seedling {
+  --fa: "\f4d8"; }
 
-.fa-boxes-packing::before {
-  content: "\e4c7"; }
+.fa-sprout {
+  --fa: "\f4d8"; }
 
-.fa-circle-arrow-left::before {
-  content: "\f0a8"; }
+.fa-left-right {
+  --fa: "\f337"; }
 
-.fa-arrow-circle-left::before {
-  content: "\f0a8"; }
+.fa-arrows-alt-h {
+  --fa: "\f337"; }
 
-.fa-group-arrows-rotate::before {
-  content: "\e4f6"; }
+.fa-boxes-packing {
+  --fa: "\e4c7"; }
 
-.fa-bowl-food::before {
-  content: "\e4c6"; }
+.fa-circle-arrow-left {
+  --fa: "\f0a8"; }
 
-.fa-candy-cane::before {
-  content: "\f786"; }
+.fa-arrow-circle-left {
+  --fa: "\f0a8"; }
 
-.fa-arrow-down-wide-short::before {
-  content: "\f160"; }
+.fa-group-arrows-rotate {
+  --fa: "\e4f6"; }
 
-.fa-sort-amount-asc::before {
-  content: "\f160"; }
+.fa-bowl-food {
+  --fa: "\e4c6"; }
 
-.fa-sort-amount-down::before {
-  content: "\f160"; }
+.fa-candy-cane {
+  --fa: "\f786"; }
 
-.fa-cloud-bolt::before {
-  content: "\f76c"; }
+.fa-arrow-down-wide-short {
+  --fa: "\f160"; }
 
-.fa-thunderstorm::before {
-  content: "\f76c"; }
+.fa-sort-amount-asc {
+  --fa: "\f160"; }
 
-.fa-text-slash::before {
-  content: "\f87d"; }
+.fa-sort-amount-down {
+  --fa: "\f160"; }
 
-.fa-remove-format::before {
-  content: "\f87d"; }
+.fa-cloud-bolt {
+  --fa: "\f76c"; }
 
-.fa-face-smile-wink::before {
-  content: "\f4da"; }
+.fa-thunderstorm {
+  --fa: "\f76c"; }
 
-.fa-smile-wink::before {
-  content: "\f4da"; }
+.fa-text-slash {
+  --fa: "\f87d"; }
 
-.fa-file-word::before {
-  content: "\f1c2"; }
+.fa-remove-format {
+  --fa: "\f87d"; }
 
-.fa-file-powerpoint::before {
-  content: "\f1c4"; }
+.fa-face-smile-wink {
+  --fa: "\f4da"; }
 
-.fa-arrows-left-right::before {
-  content: "\f07e"; }
+.fa-smile-wink {
+  --fa: "\f4da"; }
 
-.fa-arrows-h::before {
-  content: "\f07e"; }
+.fa-file-word {
+  --fa: "\f1c2"; }
 
-.fa-house-lock::before {
-  content: "\e510"; }
+.fa-file-powerpoint {
+  --fa: "\f1c4"; }
 
-.fa-cloud-arrow-down::before {
-  content: "\f0ed"; }
+.fa-arrows-left-right {
+  --fa: "\f07e"; }
 
-.fa-cloud-download::before {
-  content: "\f0ed"; }
+.fa-arrows-h {
+  --fa: "\f07e"; }
 
-.fa-cloud-download-alt::before {
-  content: "\f0ed"; }
+.fa-house-lock {
+  --fa: "\e510"; }
 
-.fa-children::before {
-  content: "\e4e1"; }
+.fa-cloud-arrow-down {
+  --fa: "\f0ed"; }
 
-.fa-chalkboard::before {
-  content: "\f51b"; }
+.fa-cloud-download {
+  --fa: "\f0ed"; }
 
-.fa-blackboard::before {
-  content: "\f51b"; }
+.fa-cloud-download-alt {
+  --fa: "\f0ed"; }
 
-.fa-user-large-slash::before {
-  content: "\f4fa"; }
+.fa-children {
+  --fa: "\e4e1"; }
 
-.fa-user-alt-slash::before {
-  content: "\f4fa"; }
+.fa-chalkboard {
+  --fa: "\f51b"; }
 
-.fa-envelope-open::before {
-  content: "\f2b6"; }
+.fa-blackboard {
+  --fa: "\f51b"; }
 
-.fa-handshake-simple-slash::before {
-  content: "\e05f"; }
+.fa-user-large-slash {
+  --fa: "\f4fa"; }
 
-.fa-handshake-alt-slash::before {
-  content: "\e05f"; }
+.fa-user-alt-slash {
+  --fa: "\f4fa"; }
 
-.fa-mattress-pillow::before {
-  content: "\e525"; }
+.fa-envelope-open {
+  --fa: "\f2b6"; }
 
-.fa-guarani-sign::before {
-  content: "\e19a"; }
+.fa-handshake-simple-slash {
+  --fa: "\e05f"; }
 
-.fa-arrows-rotate::before {
-  content: "\f021"; }
+.fa-handshake-alt-slash {
+  --fa: "\e05f"; }
 
-.fa-refresh::before {
-  content: "\f021"; }
+.fa-mattress-pillow {
+  --fa: "\e525"; }
 
-.fa-sync::before {
-  content: "\f021"; }
+.fa-guarani-sign {
+  --fa: "\e19a"; }
 
-.fa-fire-extinguisher::before {
-  content: "\f134"; }
+.fa-arrows-rotate {
+  --fa: "\f021"; }
 
-.fa-cruzeiro-sign::before {
-  content: "\e152"; }
+.fa-refresh {
+  --fa: "\f021"; }
 
-.fa-greater-than-equal::before {
-  content: "\f532"; }
+.fa-sync {
+  --fa: "\f021"; }
 
-.fa-shield-halved::before {
-  content: "\f3ed"; }
+.fa-fire-extinguisher {
+  --fa: "\f134"; }
 
-.fa-shield-alt::before {
-  content: "\f3ed"; }
+.fa-cruzeiro-sign {
+  --fa: "\e152"; }
 
-.fa-book-atlas::before {
-  content: "\f558"; }
+.fa-greater-than-equal {
+  --fa: "\f532"; }
 
-.fa-atlas::before {
-  content: "\f558"; }
+.fa-shield-halved {
+  --fa: "\f3ed"; }
 
-.fa-virus::before {
-  content: "\e074"; }
+.fa-shield-alt {
+  --fa: "\f3ed"; }
 
-.fa-envelope-circle-check::before {
-  content: "\e4e8"; }
+.fa-book-atlas {
+  --fa: "\f558"; }
 
-.fa-layer-group::before {
-  content: "\f5fd"; }
+.fa-atlas {
+  --fa: "\f558"; }
 
-.fa-arrows-to-dot::before {
-  content: "\e4be"; }
+.fa-virus {
+  --fa: "\e074"; }
 
-.fa-archway::before {
-  content: "\f557"; }
+.fa-envelope-circle-check {
+  --fa: "\e4e8"; }
 
-.fa-heart-circle-check::before {
-  content: "\e4fd"; }
+.fa-layer-group {
+  --fa: "\f5fd"; }
 
-.fa-house-chimney-crack::before {
-  content: "\f6f1"; }
+.fa-arrows-to-dot {
+  --fa: "\e4be"; }
 
-.fa-house-damage::before {
-  content: "\f6f1"; }
+.fa-archway {
+  --fa: "\f557"; }
 
-.fa-file-zipper::before {
-  content: "\f1c6"; }
+.fa-heart-circle-check {
+  --fa: "\e4fd"; }
 
-.fa-file-archive::before {
-  content: "\f1c6"; }
+.fa-house-chimney-crack {
+  --fa: "\f6f1"; }
 
-.fa-square::before {
-  content: "\f0c8"; }
+.fa-house-damage {
+  --fa: "\f6f1"; }
 
-.fa-martini-glass-empty::before {
-  content: "\f000"; }
+.fa-file-zipper {
+  --fa: "\f1c6"; }
 
-.fa-glass-martini::before {
-  content: "\f000"; }
+.fa-file-archive {
+  --fa: "\f1c6"; }
 
-.fa-couch::before {
-  content: "\f4b8"; }
+.fa-square {
+  --fa: "\f0c8"; }
 
-.fa-cedi-sign::before {
-  content: "\e0df"; }
+.fa-martini-glass-empty {
+  --fa: "\f000"; }
 
-.fa-italic::before {
-  content: "\f033"; }
+.fa-glass-martini {
+  --fa: "\f000"; }
 
-.fa-table-cells-column-lock::before {
-  content: "\e678"; }
+.fa-couch {
+  --fa: "\f4b8"; }
 
-.fa-church::before {
-  content: "\f51d"; }
+.fa-cedi-sign {
+  --fa: "\e0df"; }
 
-.fa-comments-dollar::before {
-  content: "\f653"; }
+.fa-italic {
+  --fa: "\f033"; }
 
-.fa-democrat::before {
-  content: "\f747"; }
+.fa-table-cells-column-lock {
+  --fa: "\e678"; }
 
-.fa-z::before {
-  content: "\5a"; }
+.fa-church {
+  --fa: "\f51d"; }
 
-.fa-person-skiing::before {
-  content: "\f7c9"; }
+.fa-comments-dollar {
+  --fa: "\f653"; }
 
-.fa-skiing::before {
-  content: "\f7c9"; }
+.fa-democrat {
+  --fa: "\f747"; }
 
-.fa-road-lock::before {
-  content: "\e567"; }
+.fa-z {
+  --fa: "\5a"; }
 
-.fa-a::before {
-  content: "\41"; }
+.fa-person-skiing {
+  --fa: "\f7c9"; }
 
-.fa-temperature-arrow-down::before {
-  content: "\e03f"; }
+.fa-skiing {
+  --fa: "\f7c9"; }
 
-.fa-temperature-down::before {
-  content: "\e03f"; }
+.fa-road-lock {
+  --fa: "\e567"; }
 
-.fa-feather-pointed::before {
-  content: "\f56b"; }
+.fa-a {
+  --fa: "\41"; }
 
-.fa-feather-alt::before {
-  content: "\f56b"; }
+.fa-temperature-arrow-down {
+  --fa: "\e03f"; }
 
-.fa-p::before {
-  content: "\50"; }
+.fa-temperature-down {
+  --fa: "\e03f"; }
 
-.fa-snowflake::before {
-  content: "\f2dc"; }
+.fa-feather-pointed {
+  --fa: "\f56b"; }
 
-.fa-newspaper::before {
-  content: "\f1ea"; }
+.fa-feather-alt {
+  --fa: "\f56b"; }
 
-.fa-rectangle-ad::before {
-  content: "\f641"; }
+.fa-p {
+  --fa: "\50"; }
 
-.fa-ad::before {
-  content: "\f641"; }
+.fa-snowflake {
+  --fa: "\f2dc"; }
 
-.fa-circle-arrow-right::before {
-  content: "\f0a9"; }
+.fa-newspaper {
+  --fa: "\f1ea"; }
 
-.fa-arrow-circle-right::before {
-  content: "\f0a9"; }
+.fa-rectangle-ad {
+  --fa: "\f641"; }
 
-.fa-filter-circle-xmark::before {
-  content: "\e17b"; }
+.fa-ad {
+  --fa: "\f641"; }
 
-.fa-locust::before {
-  content: "\e520"; }
+.fa-circle-arrow-right {
+  --fa: "\f0a9"; }
 
-.fa-sort::before {
-  content: "\f0dc"; }
+.fa-arrow-circle-right {
+  --fa: "\f0a9"; }
 
-.fa-unsorted::before {
-  content: "\f0dc"; }
+.fa-filter-circle-xmark {
+  --fa: "\e17b"; }
 
-.fa-list-ol::before {
-  content: "\f0cb"; }
+.fa-locust {
+  --fa: "\e520"; }
 
-.fa-list-1-2::before {
-  content: "\f0cb"; }
+.fa-sort {
+  --fa: "\f0dc"; }
 
-.fa-list-numeric::before {
-  content: "\f0cb"; }
+.fa-unsorted {
+  --fa: "\f0dc"; }
 
-.fa-person-dress-burst::before {
-  content: "\e544"; }
+.fa-list-ol {
+  --fa: "\f0cb"; }
 
-.fa-money-check-dollar::before {
-  content: "\f53d"; }
+.fa-list-1-2 {
+  --fa: "\f0cb"; }
 
-.fa-money-check-alt::before {
-  content: "\f53d"; }
+.fa-list-numeric {
+  --fa: "\f0cb"; }
 
-.fa-vector-square::before {
-  content: "\f5cb"; }
+.fa-person-dress-burst {
+  --fa: "\e544"; }
 
-.fa-bread-slice::before {
-  content: "\f7ec"; }
+.fa-money-check-dollar {
+  --fa: "\f53d"; }
 
-.fa-language::before {
-  content: "\f1ab"; }
+.fa-money-check-alt {
+  --fa: "\f53d"; }
 
-.fa-face-kiss-wink-heart::before {
-  content: "\f598"; }
+.fa-vector-square {
+  --fa: "\f5cb"; }
 
-.fa-kiss-wink-heart::before {
-  content: "\f598"; }
+.fa-bread-slice {
+  --fa: "\f7ec"; }
 
-.fa-filter::before {
-  content: "\f0b0"; }
+.fa-language {
+  --fa: "\f1ab"; }
 
-.fa-question::before {
-  content: "\3f"; }
+.fa-face-kiss-wink-heart {
+  --fa: "\f598"; }
 
-.fa-file-signature::before {
-  content: "\f573"; }
+.fa-kiss-wink-heart {
+  --fa: "\f598"; }
 
-.fa-up-down-left-right::before {
-  content: "\f0b2"; }
+.fa-filter {
+  --fa: "\f0b0"; }
 
-.fa-arrows-alt::before {
-  content: "\f0b2"; }
+.fa-question {
+  --fa: "\3f"; }
 
-.fa-house-chimney-user::before {
-  content: "\e065"; }
+.fa-file-signature {
+  --fa: "\f573"; }
 
-.fa-hand-holding-heart::before {
-  content: "\f4be"; }
+.fa-up-down-left-right {
+  --fa: "\f0b2"; }
 
-.fa-puzzle-piece::before {
-  content: "\f12e"; }
+.fa-arrows-alt {
+  --fa: "\f0b2"; }
 
-.fa-money-check::before {
-  content: "\f53c"; }
+.fa-house-chimney-user {
+  --fa: "\e065"; }
 
-.fa-star-half-stroke::before {
-  content: "\f5c0"; }
+.fa-hand-holding-heart {
+  --fa: "\f4be"; }
 
-.fa-star-half-alt::before {
-  content: "\f5c0"; }
+.fa-puzzle-piece {
+  --fa: "\f12e"; }
 
-.fa-code::before {
-  content: "\f121"; }
+.fa-money-check {
+  --fa: "\f53c"; }
 
-.fa-whiskey-glass::before {
-  content: "\f7a0"; }
+.fa-star-half-stroke {
+  --fa: "\f5c0"; }
 
-.fa-glass-whiskey::before {
-  content: "\f7a0"; }
+.fa-star-half-alt {
+  --fa: "\f5c0"; }
 
-.fa-building-circle-exclamation::before {
-  content: "\e4d3"; }
+.fa-code {
+  --fa: "\f121"; }
 
-.fa-magnifying-glass-chart::before {
-  content: "\e522"; }
+.fa-whiskey-glass {
+  --fa: "\f7a0"; }
 
-.fa-arrow-up-right-from-square::before {
-  content: "\f08e"; }
+.fa-glass-whiskey {
+  --fa: "\f7a0"; }
 
-.fa-external-link::before {
-  content: "\f08e"; }
+.fa-building-circle-exclamation {
+  --fa: "\e4d3"; }
 
-.fa-cubes-stacked::before {
-  content: "\e4e6"; }
+.fa-magnifying-glass-chart {
+  --fa: "\e522"; }
 
-.fa-won-sign::before {
-  content: "\f159"; }
+.fa-arrow-up-right-from-square {
+  --fa: "\f08e"; }
 
-.fa-krw::before {
-  content: "\f159"; }
+.fa-external-link {
+  --fa: "\f08e"; }
 
-.fa-won::before {
-  content: "\f159"; }
+.fa-cubes-stacked {
+  --fa: "\e4e6"; }
 
-.fa-virus-covid::before {
-  content: "\e4a8"; }
+.fa-won-sign {
+  --fa: "\f159"; }
 
-.fa-austral-sign::before {
-  content: "\e0a9"; }
+.fa-krw {
+  --fa: "\f159"; }
 
-.fa-f::before {
-  content: "\46"; }
+.fa-won {
+  --fa: "\f159"; }
 
-.fa-leaf::before {
-  content: "\f06c"; }
+.fa-virus-covid {
+  --fa: "\e4a8"; }
 
-.fa-road::before {
-  content: "\f018"; }
+.fa-austral-sign {
+  --fa: "\e0a9"; }
 
-.fa-taxi::before {
-  content: "\f1ba"; }
+.fa-f {
+  --fa: "\46"; }
 
-.fa-cab::before {
-  content: "\f1ba"; }
+.fa-leaf {
+  --fa: "\f06c"; }
 
-.fa-person-circle-plus::before {
-  content: "\e541"; }
+.fa-road {
+  --fa: "\f018"; }
 
-.fa-chart-pie::before {
-  content: "\f200"; }
+.fa-taxi {
+  --fa: "\f1ba"; }
 
-.fa-pie-chart::before {
-  content: "\f200"; }
+.fa-cab {
+  --fa: "\f1ba"; }
 
-.fa-bolt-lightning::before {
-  content: "\e0b7"; }
+.fa-person-circle-plus {
+  --fa: "\e541"; }
 
-.fa-sack-xmark::before {
-  content: "\e56a"; }
+.fa-chart-pie {
+  --fa: "\f200"; }
 
-.fa-file-excel::before {
-  content: "\f1c3"; }
+.fa-pie-chart {
+  --fa: "\f200"; }
 
-.fa-file-contract::before {
-  content: "\f56c"; }
+.fa-bolt-lightning {
+  --fa: "\e0b7"; }
 
-.fa-fish-fins::before {
-  content: "\e4f2"; }
+.fa-sack-xmark {
+  --fa: "\e56a"; }
 
-.fa-building-flag::before {
-  content: "\e4d5"; }
+.fa-file-excel {
+  --fa: "\f1c3"; }
 
-.fa-face-grin-beam::before {
-  content: "\f582"; }
+.fa-file-contract {
+  --fa: "\f56c"; }
 
-.fa-grin-beam::before {
-  content: "\f582"; }
+.fa-fish-fins {
+  --fa: "\e4f2"; }
 
-.fa-object-ungroup::before {
-  content: "\f248"; }
+.fa-building-flag {
+  --fa: "\e4d5"; }
 
-.fa-poop::before {
-  content: "\f619"; }
+.fa-face-grin-beam {
+  --fa: "\f582"; }
 
-.fa-location-pin::before {
-  content: "\f041"; }
+.fa-grin-beam {
+  --fa: "\f582"; }
 
-.fa-map-marker::before {
-  content: "\f041"; }
+.fa-object-ungroup {
+  --fa: "\f248"; }
 
-.fa-kaaba::before {
-  content: "\f66b"; }
+.fa-poop {
+  --fa: "\f619"; }
 
-.fa-toilet-paper::before {
-  content: "\f71e"; }
+.fa-location-pin {
+  --fa: "\f041"; }
 
-.fa-helmet-safety::before {
-  content: "\f807"; }
+.fa-map-marker {
+  --fa: "\f041"; }
 
-.fa-hard-hat::before {
-  content: "\f807"; }
+.fa-kaaba {
+  --fa: "\f66b"; }
 
-.fa-hat-hard::before {
-  content: "\f807"; }
+.fa-toilet-paper {
+  --fa: "\f71e"; }
 
-.fa-eject::before {
-  content: "\f052"; }
+.fa-helmet-safety {
+  --fa: "\f807"; }
 
-.fa-circle-right::before {
-  content: "\f35a"; }
+.fa-hard-hat {
+  --fa: "\f807"; }
 
-.fa-arrow-alt-circle-right::before {
-  content: "\f35a"; }
+.fa-hat-hard {
+  --fa: "\f807"; }
 
-.fa-plane-circle-check::before {
-  content: "\e555"; }
+.fa-eject {
+  --fa: "\f052"; }
 
-.fa-face-rolling-eyes::before {
-  content: "\f5a5"; }
+.fa-circle-right {
+  --fa: "\f35a"; }
 
-.fa-meh-rolling-eyes::before {
-  content: "\f5a5"; }
+.fa-arrow-alt-circle-right {
+  --fa: "\f35a"; }
 
-.fa-object-group::before {
-  content: "\f247"; }
+.fa-plane-circle-check {
+  --fa: "\e555"; }
 
-.fa-chart-line::before {
-  content: "\f201"; }
+.fa-face-rolling-eyes {
+  --fa: "\f5a5"; }
 
-.fa-line-chart::before {
-  content: "\f201"; }
+.fa-meh-rolling-eyes {
+  --fa: "\f5a5"; }
 
-.fa-mask-ventilator::before {
-  content: "\e524"; }
+.fa-object-group {
+  --fa: "\f247"; }
 
-.fa-arrow-right::before {
-  content: "\f061"; }
+.fa-chart-line {
+  --fa: "\f201"; }
 
-.fa-signs-post::before {
-  content: "\f277"; }
+.fa-line-chart {
+  --fa: "\f201"; }
 
-.fa-map-signs::before {
-  content: "\f277"; }
+.fa-mask-ventilator {
+  --fa: "\e524"; }
 
-.fa-cash-register::before {
-  content: "\f788"; }
+.fa-arrow-right {
+  --fa: "\f061"; }
 
-.fa-person-circle-question::before {
-  content: "\e542"; }
+.fa-signs-post {
+  --fa: "\f277"; }
 
-.fa-h::before {
-  content: "\48"; }
+.fa-map-signs {
+  --fa: "\f277"; }
 
-.fa-tarp::before {
-  content: "\e57b"; }
+.fa-cash-register {
+  --fa: "\f788"; }
 
-.fa-screwdriver-wrench::before {
-  content: "\f7d9"; }
+.fa-person-circle-question {
+  --fa: "\e542"; }
 
-.fa-tools::before {
-  content: "\f7d9"; }
+.fa-h {
+  --fa: "\48"; }
 
-.fa-arrows-to-eye::before {
-  content: "\e4bf"; }
+.fa-tarp {
+  --fa: "\e57b"; }
 
-.fa-plug-circle-bolt::before {
-  content: "\e55b"; }
+.fa-screwdriver-wrench {
+  --fa: "\f7d9"; }
 
-.fa-heart::before {
-  content: "\f004"; }
+.fa-tools {
+  --fa: "\f7d9"; }
 
-.fa-mars-and-venus::before {
-  content: "\f224"; }
+.fa-arrows-to-eye {
+  --fa: "\e4bf"; }
 
-.fa-house-user::before {
-  content: "\e1b0"; }
+.fa-plug-circle-bolt {
+  --fa: "\e55b"; }
 
-.fa-home-user::before {
-  content: "\e1b0"; }
+.fa-heart {
+  --fa: "\f004"; }
 
-.fa-dumpster-fire::before {
-  content: "\f794"; }
+.fa-mars-and-venus {
+  --fa: "\f224"; }
 
-.fa-house-crack::before {
-  content: "\e3b1"; }
+.fa-house-user {
+  --fa: "\e1b0"; }
 
-.fa-martini-glass-citrus::before {
-  content: "\f561"; }
+.fa-home-user {
+  --fa: "\e1b0"; }
 
-.fa-cocktail::before {
-  content: "\f561"; }
+.fa-dumpster-fire {
+  --fa: "\f794"; }
 
-.fa-face-surprise::before {
-  content: "\f5c2"; }
+.fa-house-crack {
+  --fa: "\e3b1"; }
 
-.fa-surprise::before {
-  content: "\f5c2"; }
+.fa-martini-glass-citrus {
+  --fa: "\f561"; }
 
-.fa-bottle-water::before {
-  content: "\e4c5"; }
+.fa-cocktail {
+  --fa: "\f561"; }
 
-.fa-circle-pause::before {
-  content: "\f28b"; }
+.fa-face-surprise {
+  --fa: "\f5c2"; }
 
-.fa-pause-circle::before {
-  content: "\f28b"; }
+.fa-surprise {
+  --fa: "\f5c2"; }
 
-.fa-toilet-paper-slash::before {
-  content: "\e072"; }
+.fa-bottle-water {
+  --fa: "\e4c5"; }
 
-.fa-apple-whole::before {
-  content: "\f5d1"; }
+.fa-circle-pause {
+  --fa: "\f28b"; }
 
-.fa-apple-alt::before {
-  content: "\f5d1"; }
+.fa-pause-circle {
+  --fa: "\f28b"; }
 
-.fa-kitchen-set::before {
-  content: "\e51a"; }
+.fa-toilet-paper-slash {
+  --fa: "\e072"; }
 
-.fa-r::before {
-  content: "\52"; }
+.fa-apple-whole {
+  --fa: "\f5d1"; }
 
-.fa-temperature-quarter::before {
-  content: "\f2ca"; }
+.fa-apple-alt {
+  --fa: "\f5d1"; }
 
-.fa-temperature-1::before {
-  content: "\f2ca"; }
+.fa-kitchen-set {
+  --fa: "\e51a"; }
 
-.fa-thermometer-1::before {
-  content: "\f2ca"; }
+.fa-r {
+  --fa: "\52"; }
 
-.fa-thermometer-quarter::before {
-  content: "\f2ca"; }
+.fa-temperature-quarter {
+  --fa: "\f2ca"; }
 
-.fa-cube::before {
-  content: "\f1b2"; }
+.fa-temperature-1 {
+  --fa: "\f2ca"; }
 
-.fa-bitcoin-sign::before {
-  content: "\e0b4"; }
+.fa-thermometer-1 {
+  --fa: "\f2ca"; }
 
-.fa-shield-dog::before {
-  content: "\e573"; }
+.fa-thermometer-quarter {
+  --fa: "\f2ca"; }
 
-.fa-solar-panel::before {
-  content: "\f5ba"; }
+.fa-cube {
+  --fa: "\f1b2"; }
 
-.fa-lock-open::before {
-  content: "\f3c1"; }
+.fa-bitcoin-sign {
+  --fa: "\e0b4"; }
 
-.fa-elevator::before {
-  content: "\e16d"; }
+.fa-shield-dog {
+  --fa: "\e573"; }
 
-.fa-money-bill-transfer::before {
-  content: "\e528"; }
+.fa-solar-panel {
+  --fa: "\f5ba"; }
 
-.fa-money-bill-trend-up::before {
-  content: "\e529"; }
+.fa-lock-open {
+  --fa: "\f3c1"; }
 
-.fa-house-flood-water-circle-arrow-right::before {
-  content: "\e50f"; }
+.fa-elevator {
+  --fa: "\e16d"; }
 
-.fa-square-poll-horizontal::before {
-  content: "\f682"; }
+.fa-money-bill-transfer {
+  --fa: "\e528"; }
 
-.fa-poll-h::before {
-  content: "\f682"; }
+.fa-money-bill-trend-up {
+  --fa: "\e529"; }
 
-.fa-circle::before {
-  content: "\f111"; }
+.fa-house-flood-water-circle-arrow-right {
+  --fa: "\e50f"; }
 
-.fa-backward-fast::before {
-  content: "\f049"; }
+.fa-square-poll-horizontal {
+  --fa: "\f682"; }
 
-.fa-fast-backward::before {
-  content: "\f049"; }
+.fa-poll-h {
+  --fa: "\f682"; }
 
-.fa-recycle::before {
-  content: "\f1b8"; }
+.fa-circle {
+  --fa: "\f111"; }
 
-.fa-user-astronaut::before {
-  content: "\f4fb"; }
+.fa-backward-fast {
+  --fa: "\f049"; }
 
-.fa-plane-slash::before {
-  content: "\e069"; }
+.fa-fast-backward {
+  --fa: "\f049"; }
 
-.fa-trademark::before {
-  content: "\f25c"; }
+.fa-recycle {
+  --fa: "\f1b8"; }
 
-.fa-basketball::before {
-  content: "\f434"; }
+.fa-user-astronaut {
+  --fa: "\f4fb"; }
 
-.fa-basketball-ball::before {
-  content: "\f434"; }
+.fa-plane-slash {
+  --fa: "\e069"; }
 
-.fa-satellite-dish::before {
-  content: "\f7c0"; }
+.fa-trademark {
+  --fa: "\f25c"; }
 
-.fa-circle-up::before {
-  content: "\f35b"; }
+.fa-basketball {
+  --fa: "\f434"; }
 
-.fa-arrow-alt-circle-up::before {
-  content: "\f35b"; }
+.fa-basketball-ball {
+  --fa: "\f434"; }
 
-.fa-mobile-screen-button::before {
-  content: "\f3cd"; }
+.fa-satellite-dish {
+  --fa: "\f7c0"; }
 
-.fa-mobile-alt::before {
-  content: "\f3cd"; }
+.fa-circle-up {
+  --fa: "\f35b"; }
 
-.fa-volume-high::before {
-  content: "\f028"; }
+.fa-arrow-alt-circle-up {
+  --fa: "\f35b"; }
 
-.fa-volume-up::before {
-  content: "\f028"; }
+.fa-mobile-screen-button {
+  --fa: "\f3cd"; }
 
-.fa-users-rays::before {
-  content: "\e593"; }
+.fa-mobile-alt {
+  --fa: "\f3cd"; }
 
-.fa-wallet::before {
-  content: "\f555"; }
+.fa-volume-high {
+  --fa: "\f028"; }
 
-.fa-clipboard-check::before {
-  content: "\f46c"; }
+.fa-volume-up {
+  --fa: "\f028"; }
 
-.fa-file-audio::before {
-  content: "\f1c7"; }
+.fa-users-rays {
+  --fa: "\e593"; }
 
-.fa-burger::before {
-  content: "\f805"; }
+.fa-wallet {
+  --fa: "\f555"; }
 
-.fa-hamburger::before {
-  content: "\f805"; }
+.fa-clipboard-check {
+  --fa: "\f46c"; }
 
-.fa-wrench::before {
-  content: "\f0ad"; }
+.fa-file-audio {
+  --fa: "\f1c7"; }
 
-.fa-bugs::before {
-  content: "\e4d0"; }
+.fa-burger {
+  --fa: "\f805"; }
 
-.fa-rupee-sign::before {
-  content: "\f156"; }
+.fa-hamburger {
+  --fa: "\f805"; }
 
-.fa-rupee::before {
-  content: "\f156"; }
+.fa-wrench {
+  --fa: "\f0ad"; }
 
-.fa-file-image::before {
-  content: "\f1c5"; }
+.fa-bugs {
+  --fa: "\e4d0"; }
 
-.fa-circle-question::before {
-  content: "\f059"; }
+.fa-rupee-sign {
+  --fa: "\f156"; }
 
-.fa-question-circle::before {
-  content: "\f059"; }
+.fa-rupee {
+  --fa: "\f156"; }
 
-.fa-plane-departure::before {
-  content: "\f5b0"; }
+.fa-file-image {
+  --fa: "\f1c5"; }
 
-.fa-handshake-slash::before {
-  content: "\e060"; }
+.fa-circle-question {
+  --fa: "\f059"; }
 
-.fa-book-bookmark::before {
-  content: "\e0bb"; }
+.fa-question-circle {
+  --fa: "\f059"; }
 
-.fa-code-branch::before {
-  content: "\f126"; }
+.fa-plane-departure {
+  --fa: "\f5b0"; }
 
-.fa-hat-cowboy::before {
-  content: "\f8c0"; }
+.fa-handshake-slash {
+  --fa: "\e060"; }
 
-.fa-bridge::before {
-  content: "\e4c8"; }
+.fa-book-bookmark {
+  --fa: "\e0bb"; }
 
-.fa-phone-flip::before {
-  content: "\f879"; }
+.fa-code-branch {
+  --fa: "\f126"; }
 
-.fa-phone-alt::before {
-  content: "\f879"; }
+.fa-hat-cowboy {
+  --fa: "\f8c0"; }
 
-.fa-truck-front::before {
-  content: "\e2b7"; }
+.fa-bridge {
+  --fa: "\e4c8"; }
 
-.fa-cat::before {
-  content: "\f6be"; }
+.fa-phone-flip {
+  --fa: "\f879"; }
 
-.fa-anchor-circle-exclamation::before {
-  content: "\e4ab"; }
+.fa-phone-alt {
+  --fa: "\f879"; }
 
-.fa-truck-field::before {
-  content: "\e58d"; }
+.fa-truck-front {
+  --fa: "\e2b7"; }
 
-.fa-route::before {
-  content: "\f4d7"; }
+.fa-cat {
+  --fa: "\f6be"; }
 
-.fa-clipboard-question::before {
-  content: "\e4e3"; }
+.fa-anchor-circle-exclamation {
+  --fa: "\e4ab"; }
 
-.fa-panorama::before {
-  content: "\e209"; }
+.fa-truck-field {
+  --fa: "\e58d"; }
 
-.fa-comment-medical::before {
-  content: "\f7f5"; }
+.fa-route {
+  --fa: "\f4d7"; }
 
-.fa-teeth-open::before {
-  content: "\f62f"; }
+.fa-clipboard-question {
+  --fa: "\e4e3"; }
 
-.fa-file-circle-minus::before {
-  content: "\e4ed"; }
+.fa-panorama {
+  --fa: "\e209"; }
 
-.fa-tags::before {
-  content: "\f02c"; }
+.fa-comment-medical {
+  --fa: "\f7f5"; }
 
-.fa-wine-glass::before {
-  content: "\f4e3"; }
+.fa-teeth-open {
+  --fa: "\f62f"; }
 
-.fa-forward-fast::before {
-  content: "\f050"; }
+.fa-file-circle-minus {
+  --fa: "\e4ed"; }
 
-.fa-fast-forward::before {
-  content: "\f050"; }
+.fa-tags {
+  --fa: "\f02c"; }
 
-.fa-face-meh-blank::before {
-  content: "\f5a4"; }
+.fa-wine-glass {
+  --fa: "\f4e3"; }
 
-.fa-meh-blank::before {
-  content: "\f5a4"; }
+.fa-forward-fast {
+  --fa: "\f050"; }
 
-.fa-square-parking::before {
-  content: "\f540"; }
+.fa-fast-forward {
+  --fa: "\f050"; }
 
-.fa-parking::before {
-  content: "\f540"; }
+.fa-face-meh-blank {
+  --fa: "\f5a4"; }
 
-.fa-house-signal::before {
-  content: "\e012"; }
+.fa-meh-blank {
+  --fa: "\f5a4"; }
 
-.fa-bars-progress::before {
-  content: "\f828"; }
+.fa-square-parking {
+  --fa: "\f540"; }
 
-.fa-tasks-alt::before {
-  content: "\f828"; }
+.fa-parking {
+  --fa: "\f540"; }
 
-.fa-faucet-drip::before {
-  content: "\e006"; }
+.fa-house-signal {
+  --fa: "\e012"; }
 
-.fa-cart-flatbed::before {
-  content: "\f474"; }
+.fa-bars-progress {
+  --fa: "\f828"; }
 
-.fa-dolly-flatbed::before {
-  content: "\f474"; }
+.fa-tasks-alt {
+  --fa: "\f828"; }
 
-.fa-ban-smoking::before {
-  content: "\f54d"; }
+.fa-faucet-drip {
+  --fa: "\e006"; }
 
-.fa-smoking-ban::before {
-  content: "\f54d"; }
+.fa-cart-flatbed {
+  --fa: "\f474"; }
 
-.fa-terminal::before {
-  content: "\f120"; }
+.fa-dolly-flatbed {
+  --fa: "\f474"; }
 
-.fa-mobile-button::before {
-  content: "\f10b"; }
+.fa-ban-smoking {
+  --fa: "\f54d"; }
 
-.fa-house-medical-flag::before {
-  content: "\e514"; }
+.fa-smoking-ban {
+  --fa: "\f54d"; }
 
-.fa-basket-shopping::before {
-  content: "\f291"; }
+.fa-terminal {
+  --fa: "\f120"; }
 
-.fa-shopping-basket::before {
-  content: "\f291"; }
+.fa-mobile-button {
+  --fa: "\f10b"; }
 
-.fa-tape::before {
-  content: "\f4db"; }
+.fa-house-medical-flag {
+  --fa: "\e514"; }
 
-.fa-bus-simple::before {
-  content: "\f55e"; }
+.fa-basket-shopping {
+  --fa: "\f291"; }
 
-.fa-bus-alt::before {
-  content: "\f55e"; }
+.fa-shopping-basket {
+  --fa: "\f291"; }
 
-.fa-eye::before {
-  content: "\f06e"; }
+.fa-tape {
+  --fa: "\f4db"; }
 
-.fa-face-sad-cry::before {
-  content: "\f5b3"; }
+.fa-bus-simple {
+  --fa: "\f55e"; }
 
-.fa-sad-cry::before {
-  content: "\f5b3"; }
+.fa-bus-alt {
+  --fa: "\f55e"; }
 
-.fa-audio-description::before {
-  content: "\f29e"; }
+.fa-eye {
+  --fa: "\f06e"; }
 
-.fa-person-military-to-person::before {
-  content: "\e54c"; }
+.fa-face-sad-cry {
+  --fa: "\f5b3"; }
 
-.fa-file-shield::before {
-  content: "\e4f0"; }
+.fa-sad-cry {
+  --fa: "\f5b3"; }
 
-.fa-user-slash::before {
-  content: "\f506"; }
+.fa-audio-description {
+  --fa: "\f29e"; }
 
-.fa-pen::before {
-  content: "\f304"; }
+.fa-person-military-to-person {
+  --fa: "\e54c"; }
 
-.fa-tower-observation::before {
-  content: "\e586"; }
+.fa-file-shield {
+  --fa: "\e4f0"; }
 
-.fa-file-code::before {
-  content: "\f1c9"; }
+.fa-user-slash {
+  --fa: "\f506"; }
 
-.fa-signal::before {
-  content: "\f012"; }
+.fa-pen {
+  --fa: "\f304"; }
 
-.fa-signal-5::before {
-  content: "\f012"; }
+.fa-tower-observation {
+  --fa: "\e586"; }
 
-.fa-signal-perfect::before {
-  content: "\f012"; }
+.fa-file-code {
+  --fa: "\f1c9"; }
 
-.fa-bus::before {
-  content: "\f207"; }
+.fa-signal {
+  --fa: "\f012"; }
 
-.fa-heart-circle-xmark::before {
-  content: "\e501"; }
+.fa-signal-5 {
+  --fa: "\f012"; }
 
-.fa-house-chimney::before {
-  content: "\e3af"; }
+.fa-signal-perfect {
+  --fa: "\f012"; }
 
-.fa-home-lg::before {
-  content: "\e3af"; }
+.fa-bus {
+  --fa: "\f207"; }
 
-.fa-window-maximize::before {
-  content: "\f2d0"; }
+.fa-heart-circle-xmark {
+  --fa: "\e501"; }
 
-.fa-face-frown::before {
-  content: "\f119"; }
+.fa-house-chimney {
+  --fa: "\e3af"; }
 
-.fa-frown::before {
-  content: "\f119"; }
+.fa-home-lg {
+  --fa: "\e3af"; }
 
-.fa-prescription::before {
-  content: "\f5b1"; }
+.fa-window-maximize {
+  --fa: "\f2d0"; }
 
-.fa-shop::before {
-  content: "\f54f"; }
+.fa-face-frown {
+  --fa: "\f119"; }
 
-.fa-store-alt::before {
-  content: "\f54f"; }
+.fa-frown {
+  --fa: "\f119"; }
 
-.fa-floppy-disk::before {
-  content: "\f0c7"; }
+.fa-prescription {
+  --fa: "\f5b1"; }
 
-.fa-save::before {
-  content: "\f0c7"; }
+.fa-shop {
+  --fa: "\f54f"; }
 
-.fa-vihara::before {
-  content: "\f6a7"; }
+.fa-store-alt {
+  --fa: "\f54f"; }
 
-.fa-scale-unbalanced::before {
-  content: "\f515"; }
+.fa-floppy-disk {
+  --fa: "\f0c7"; }
 
-.fa-balance-scale-left::before {
-  content: "\f515"; }
+.fa-save {
+  --fa: "\f0c7"; }
 
-.fa-sort-up::before {
-  content: "\f0de"; }
+.fa-vihara {
+  --fa: "\f6a7"; }
 
-.fa-sort-asc::before {
-  content: "\f0de"; }
+.fa-scale-unbalanced {
+  --fa: "\f515"; }
 
-.fa-comment-dots::before {
-  content: "\f4ad"; }
+.fa-balance-scale-left {
+  --fa: "\f515"; }
 
-.fa-commenting::before {
-  content: "\f4ad"; }
+.fa-sort-up {
+  --fa: "\f0de"; }
 
-.fa-plant-wilt::before {
-  content: "\e5aa"; }
+.fa-sort-asc {
+  --fa: "\f0de"; }
 
-.fa-diamond::before {
-  content: "\f219"; }
+.fa-comment-dots {
+  --fa: "\f4ad"; }
 
-.fa-face-grin-squint::before {
-  content: "\f585"; }
+.fa-commenting {
+  --fa: "\f4ad"; }
 
-.fa-grin-squint::before {
-  content: "\f585"; }
+.fa-plant-wilt {
+  --fa: "\e5aa"; }
 
-.fa-hand-holding-dollar::before {
-  content: "\f4c0"; }
+.fa-diamond {
+  --fa: "\f219"; }
 
-.fa-hand-holding-usd::before {
-  content: "\f4c0"; }
+.fa-face-grin-squint {
+  --fa: "\f585"; }
 
-.fa-bacterium::before {
-  content: "\e05a"; }
+.fa-grin-squint {
+  --fa: "\f585"; }
 
-.fa-hand-pointer::before {
-  content: "\f25a"; }
+.fa-hand-holding-dollar {
+  --fa: "\f4c0"; }
 
-.fa-drum-steelpan::before {
-  content: "\f56a"; }
+.fa-hand-holding-usd {
+  --fa: "\f4c0"; }
 
-.fa-hand-scissors::before {
-  content: "\f257"; }
+.fa-chart-diagram {
+  --fa: "\e695"; }
 
-.fa-hands-praying::before {
-  content: "\f684"; }
+.fa-bacterium {
+  --fa: "\e05a"; }
 
-.fa-praying-hands::before {
-  content: "\f684"; }
+.fa-hand-pointer {
+  --fa: "\f25a"; }
 
-.fa-arrow-rotate-right::before {
-  content: "\f01e"; }
+.fa-drum-steelpan {
+  --fa: "\f56a"; }
 
-.fa-arrow-right-rotate::before {
-  content: "\f01e"; }
+.fa-hand-scissors {
+  --fa: "\f257"; }
 
-.fa-arrow-rotate-forward::before {
-  content: "\f01e"; }
+.fa-hands-praying {
+  --fa: "\f684"; }
 
-.fa-redo::before {
-  content: "\f01e"; }
+.fa-praying-hands {
+  --fa: "\f684"; }
 
-.fa-biohazard::before {
-  content: "\f780"; }
+.fa-arrow-rotate-right {
+  --fa: "\f01e"; }
 
-.fa-location-crosshairs::before {
-  content: "\f601"; }
+.fa-arrow-right-rotate {
+  --fa: "\f01e"; }
 
-.fa-location::before {
-  content: "\f601"; }
+.fa-arrow-rotate-forward {
+  --fa: "\f01e"; }
 
-.fa-mars-double::before {
-  content: "\f227"; }
+.fa-redo {
+  --fa: "\f01e"; }
 
-.fa-child-dress::before {
-  content: "\e59c"; }
+.fa-biohazard {
+  --fa: "\f780"; }
 
-.fa-users-between-lines::before {
-  content: "\e591"; }
+.fa-location-crosshairs {
+  --fa: "\f601"; }
 
-.fa-lungs-virus::before {
-  content: "\e067"; }
+.fa-location {
+  --fa: "\f601"; }
 
-.fa-face-grin-tears::before {
-  content: "\f588"; }
+.fa-mars-double {
+  --fa: "\f227"; }
 
-.fa-grin-tears::before {
-  content: "\f588"; }
+.fa-child-dress {
+  --fa: "\e59c"; }
 
-.fa-phone::before {
-  content: "\f095"; }
+.fa-users-between-lines {
+  --fa: "\e591"; }
 
-.fa-calendar-xmark::before {
-  content: "\f273"; }
+.fa-lungs-virus {
+  --fa: "\e067"; }
 
-.fa-calendar-times::before {
-  content: "\f273"; }
+.fa-face-grin-tears {
+  --fa: "\f588"; }
 
-.fa-child-reaching::before {
-  content: "\e59d"; }
+.fa-grin-tears {
+  --fa: "\f588"; }
 
-.fa-head-side-virus::before {
-  content: "\e064"; }
+.fa-phone {
+  --fa: "\f095"; }
 
-.fa-user-gear::before {
-  content: "\f4fe"; }
+.fa-calendar-xmark {
+  --fa: "\f273"; }
 
-.fa-user-cog::before {
-  content: "\f4fe"; }
+.fa-calendar-times {
+  --fa: "\f273"; }
 
-.fa-arrow-up-1-9::before {
-  content: "\f163"; }
+.fa-child-reaching {
+  --fa: "\e59d"; }
 
-.fa-sort-numeric-up::before {
-  content: "\f163"; }
+.fa-head-side-virus {
+  --fa: "\e064"; }
 
-.fa-door-closed::before {
-  content: "\f52a"; }
+.fa-user-gear {
+  --fa: "\f4fe"; }
 
-.fa-shield-virus::before {
-  content: "\e06c"; }
+.fa-user-cog {
+  --fa: "\f4fe"; }
 
-.fa-dice-six::before {
-  content: "\f526"; }
+.fa-arrow-up-1-9 {
+  --fa: "\f163"; }
 
-.fa-mosquito-net::before {
-  content: "\e52c"; }
+.fa-sort-numeric-up {
+  --fa: "\f163"; }
 
-.fa-bridge-water::before {
-  content: "\e4ce"; }
+.fa-door-closed {
+  --fa: "\f52a"; }
 
-.fa-person-booth::before {
-  content: "\f756"; }
+.fa-shield-virus {
+  --fa: "\e06c"; }
 
-.fa-text-width::before {
-  content: "\f035"; }
+.fa-dice-six {
+  --fa: "\f526"; }
 
-.fa-hat-wizard::before {
-  content: "\f6e8"; }
+.fa-mosquito-net {
+  --fa: "\e52c"; }
 
-.fa-pen-fancy::before {
-  content: "\f5ac"; }
+.fa-file-fragment {
+  --fa: "\e697"; }
 
-.fa-person-digging::before {
-  content: "\f85e"; }
+.fa-bridge-water {
+  --fa: "\e4ce"; }
 
-.fa-digging::before {
-  content: "\f85e"; }
+.fa-person-booth {
+  --fa: "\f756"; }
 
-.fa-trash::before {
-  content: "\f1f8"; }
+.fa-text-width {
+  --fa: "\f035"; }
 
-.fa-gauge-simple::before {
-  content: "\f629"; }
+.fa-hat-wizard {
+  --fa: "\f6e8"; }
 
-.fa-gauge-simple-med::before {
-  content: "\f629"; }
+.fa-pen-fancy {
+  --fa: "\f5ac"; }
 
-.fa-tachometer-average::before {
-  content: "\f629"; }
+.fa-person-digging {
+  --fa: "\f85e"; }
 
-.fa-book-medical::before {
-  content: "\f7e6"; }
+.fa-digging {
+  --fa: "\f85e"; }
 
-.fa-poo::before {
-  content: "\f2fe"; }
+.fa-trash {
+  --fa: "\f1f8"; }
 
-.fa-quote-right::before {
-  content: "\f10e"; }
+.fa-gauge-simple {
+  --fa: "\f629"; }
 
-.fa-quote-right-alt::before {
-  content: "\f10e"; }
+.fa-gauge-simple-med {
+  --fa: "\f629"; }
 
-.fa-shirt::before {
-  content: "\f553"; }
+.fa-tachometer-average {
+  --fa: "\f629"; }
 
-.fa-t-shirt::before {
-  content: "\f553"; }
+.fa-book-medical {
+  --fa: "\f7e6"; }
 
-.fa-tshirt::before {
-  content: "\f553"; }
+.fa-poo {
+  --fa: "\f2fe"; }
 
-.fa-cubes::before {
-  content: "\f1b3"; }
+.fa-quote-right {
+  --fa: "\f10e"; }
 
-.fa-divide::before {
-  content: "\f529"; }
+.fa-quote-right-alt {
+  --fa: "\f10e"; }
 
-.fa-tenge-sign::before {
-  content: "\f7d7"; }
+.fa-shirt {
+  --fa: "\f553"; }
 
-.fa-tenge::before {
-  content: "\f7d7"; }
+.fa-t-shirt {
+  --fa: "\f553"; }
 
-.fa-headphones::before {
-  content: "\f025"; }
+.fa-tshirt {
+  --fa: "\f553"; }
 
-.fa-hands-holding::before {
-  content: "\f4c2"; }
+.fa-cubes {
+  --fa: "\f1b3"; }
 
-.fa-hands-clapping::before {
-  content: "\e1a8"; }
+.fa-divide {
+  --fa: "\f529"; }
 
-.fa-republican::before {
-  content: "\f75e"; }
+.fa-tenge-sign {
+  --fa: "\f7d7"; }
 
-.fa-arrow-left::before {
-  content: "\f060"; }
+.fa-tenge {
+  --fa: "\f7d7"; }
 
-.fa-person-circle-xmark::before {
-  content: "\e543"; }
+.fa-headphones {
+  --fa: "\f025"; }
 
-.fa-ruler::before {
-  content: "\f545"; }
+.fa-hands-holding {
+  --fa: "\f4c2"; }
 
-.fa-align-left::before {
-  content: "\f036"; }
+.fa-hands-clapping {
+  --fa: "\e1a8"; }
 
-.fa-dice-d6::before {
-  content: "\f6d1"; }
+.fa-republican {
+  --fa: "\f75e"; }
 
-.fa-restroom::before {
-  content: "\f7bd"; }
+.fa-arrow-left {
+  --fa: "\f060"; }
 
-.fa-j::before {
-  content: "\4a"; }
+.fa-person-circle-xmark {
+  --fa: "\e543"; }
 
-.fa-users-viewfinder::before {
-  content: "\e595"; }
+.fa-ruler {
+  --fa: "\f545"; }
 
-.fa-file-video::before {
-  content: "\f1c8"; }
+.fa-align-left {
+  --fa: "\f036"; }
 
-.fa-up-right-from-square::before {
-  content: "\f35d"; }
+.fa-dice-d6 {
+  --fa: "\f6d1"; }
 
-.fa-external-link-alt::before {
-  content: "\f35d"; }
+.fa-restroom {
+  --fa: "\f7bd"; }
 
-.fa-table-cells::before {
-  content: "\f00a"; }
+.fa-j {
+  --fa: "\4a"; }
 
-.fa-th::before {
-  content: "\f00a"; }
+.fa-users-viewfinder {
+  --fa: "\e595"; }
 
-.fa-file-pdf::before {
-  content: "\f1c1"; }
+.fa-file-video {
+  --fa: "\f1c8"; }
 
-.fa-book-bible::before {
-  content: "\f647"; }
+.fa-up-right-from-square {
+  --fa: "\f35d"; }
 
-.fa-bible::before {
-  content: "\f647"; }
+.fa-external-link-alt {
+  --fa: "\f35d"; }
 
-.fa-o::before {
-  content: "\4f"; }
+.fa-table-cells {
+  --fa: "\f00a"; }
 
-.fa-suitcase-medical::before {
-  content: "\f0fa"; }
+.fa-th {
+  --fa: "\f00a"; }
 
-.fa-medkit::before {
-  content: "\f0fa"; }
+.fa-file-pdf {
+  --fa: "\f1c1"; }
 
-.fa-user-secret::before {
-  content: "\f21b"; }
+.fa-book-bible {
+  --fa: "\f647"; }
 
-.fa-otter::before {
-  content: "\f700"; }
+.fa-bible {
+  --fa: "\f647"; }
 
-.fa-person-dress::before {
-  content: "\f182"; }
+.fa-o {
+  --fa: "\4f"; }
 
-.fa-female::before {
-  content: "\f182"; }
+.fa-suitcase-medical {
+  --fa: "\f0fa"; }
 
-.fa-comment-dollar::before {
-  content: "\f651"; }
+.fa-medkit {
+  --fa: "\f0fa"; }
 
-.fa-business-time::before {
-  content: "\f64a"; }
+.fa-user-secret {
+  --fa: "\f21b"; }
 
-.fa-briefcase-clock::before {
-  content: "\f64a"; }
+.fa-otter {
+  --fa: "\f700"; }
 
-.fa-table-cells-large::before {
-  content: "\f009"; }
+.fa-person-dress {
+  --fa: "\f182"; }
 
-.fa-th-large::before {
-  content: "\f009"; }
+.fa-female {
+  --fa: "\f182"; }
 
-.fa-book-tanakh::before {
-  content: "\f827"; }
+.fa-comment-dollar {
+  --fa: "\f651"; }
 
-.fa-tanakh::before {
-  content: "\f827"; }
+.fa-business-time {
+  --fa: "\f64a"; }
 
-.fa-phone-volume::before {
-  content: "\f2a0"; }
+.fa-briefcase-clock {
+  --fa: "\f64a"; }
 
-.fa-volume-control-phone::before {
-  content: "\f2a0"; }
+.fa-table-cells-large {
+  --fa: "\f009"; }
 
-.fa-hat-cowboy-side::before {
-  content: "\f8c1"; }
+.fa-th-large {
+  --fa: "\f009"; }
 
-.fa-clipboard-user::before {
-  content: "\f7f3"; }
+.fa-book-tanakh {
+  --fa: "\f827"; }
 
-.fa-child::before {
-  content: "\f1ae"; }
+.fa-tanakh {
+  --fa: "\f827"; }
 
-.fa-lira-sign::before {
-  content: "\f195"; }
+.fa-phone-volume {
+  --fa: "\f2a0"; }
 
-.fa-satellite::before {
-  content: "\f7bf"; }
+.fa-volume-control-phone {
+  --fa: "\f2a0"; }
 
-.fa-plane-lock::before {
-  content: "\e558"; }
+.fa-hat-cowboy-side {
+  --fa: "\f8c1"; }
 
-.fa-tag::before {
-  content: "\f02b"; }
+.fa-clipboard-user {
+  --fa: "\f7f3"; }
 
-.fa-comment::before {
-  content: "\f075"; }
+.fa-child {
+  --fa: "\f1ae"; }
 
-.fa-cake-candles::before {
-  content: "\f1fd"; }
+.fa-lira-sign {
+  --fa: "\f195"; }
 
-.fa-birthday-cake::before {
-  content: "\f1fd"; }
+.fa-satellite {
+  --fa: "\f7bf"; }
 
-.fa-cake::before {
-  content: "\f1fd"; }
+.fa-plane-lock {
+  --fa: "\e558"; }
 
-.fa-envelope::before {
-  content: "\f0e0"; }
+.fa-tag {
+  --fa: "\f02b"; }
 
-.fa-angles-up::before {
-  content: "\f102"; }
+.fa-comment {
+  --fa: "\f075"; }
 
-.fa-angle-double-up::before {
-  content: "\f102"; }
+.fa-cake-candles {
+  --fa: "\f1fd"; }
 
-.fa-paperclip::before {
-  content: "\f0c6"; }
+.fa-birthday-cake {
+  --fa: "\f1fd"; }
 
-.fa-arrow-right-to-city::before {
-  content: "\e4b3"; }
+.fa-cake {
+  --fa: "\f1fd"; }
 
-.fa-ribbon::before {
-  content: "\f4d6"; }
+.fa-envelope {
+  --fa: "\f0e0"; }
 
-.fa-lungs::before {
-  content: "\f604"; }
+.fa-angles-up {
+  --fa: "\f102"; }
 
-.fa-arrow-up-9-1::before {
-  content: "\f887"; }
+.fa-angle-double-up {
+  --fa: "\f102"; }
 
-.fa-sort-numeric-up-alt::before {
-  content: "\f887"; }
+.fa-paperclip {
+  --fa: "\f0c6"; }
 
-.fa-litecoin-sign::before {
-  content: "\e1d3"; }
+.fa-arrow-right-to-city {
+  --fa: "\e4b3"; }
 
-.fa-border-none::before {
-  content: "\f850"; }
+.fa-ribbon {
+  --fa: "\f4d6"; }
 
-.fa-circle-nodes::before {
-  content: "\e4e2"; }
+.fa-lungs {
+  --fa: "\f604"; }
 
-.fa-parachute-box::before {
-  content: "\f4cd"; }
+.fa-arrow-up-9-1 {
+  --fa: "\f887"; }
 
-.fa-indent::before {
-  content: "\f03c"; }
+.fa-sort-numeric-up-alt {
+  --fa: "\f887"; }
 
-.fa-truck-field-un::before {
-  content: "\e58e"; }
+.fa-litecoin-sign {
+  --fa: "\e1d3"; }
 
-.fa-hourglass::before {
-  content: "\f254"; }
+.fa-border-none {
+  --fa: "\f850"; }
 
-.fa-hourglass-empty::before {
-  content: "\f254"; }
+.fa-circle-nodes {
+  --fa: "\e4e2"; }
 
-.fa-mountain::before {
-  content: "\f6fc"; }
+.fa-parachute-box {
+  --fa: "\f4cd"; }
 
-.fa-user-doctor::before {
-  content: "\f0f0"; }
+.fa-indent {
+  --fa: "\f03c"; }
 
-.fa-user-md::before {
-  content: "\f0f0"; }
+.fa-truck-field-un {
+  --fa: "\e58e"; }
 
-.fa-circle-info::before {
-  content: "\f05a"; }
+.fa-hourglass {
+  --fa: "\f254"; }
 
-.fa-info-circle::before {
-  content: "\f05a"; }
+.fa-hourglass-empty {
+  --fa: "\f254"; }
 
-.fa-cloud-meatball::before {
-  content: "\f73b"; }
+.fa-mountain {
+  --fa: "\f6fc"; }
 
-.fa-camera::before {
-  content: "\f030"; }
+.fa-user-doctor {
+  --fa: "\f0f0"; }
 
-.fa-camera-alt::before {
-  content: "\f030"; }
+.fa-user-md {
+  --fa: "\f0f0"; }
 
-.fa-square-virus::before {
-  content: "\e578"; }
+.fa-circle-info {
+  --fa: "\f05a"; }
 
-.fa-meteor::before {
-  content: "\f753"; }
+.fa-info-circle {
+  --fa: "\f05a"; }
 
-.fa-car-on::before {
-  content: "\e4dd"; }
+.fa-cloud-meatball {
+  --fa: "\f73b"; }
 
-.fa-sleigh::before {
-  content: "\f7cc"; }
+.fa-camera {
+  --fa: "\f030"; }
 
-.fa-arrow-down-1-9::before {
-  content: "\f162"; }
+.fa-camera-alt {
+  --fa: "\f030"; }
 
-.fa-sort-numeric-asc::before {
-  content: "\f162"; }
+.fa-square-virus {
+  --fa: "\e578"; }
 
-.fa-sort-numeric-down::before {
-  content: "\f162"; }
+.fa-meteor {
+  --fa: "\f753"; }
 
-.fa-hand-holding-droplet::before {
-  content: "\f4c1"; }
+.fa-car-on {
+  --fa: "\e4dd"; }
 
-.fa-hand-holding-water::before {
-  content: "\f4c1"; }
+.fa-sleigh {
+  --fa: "\f7cc"; }
 
-.fa-water::before {
-  content: "\f773"; }
+.fa-arrow-down-1-9 {
+  --fa: "\f162"; }
 
-.fa-calendar-check::before {
-  content: "\f274"; }
+.fa-sort-numeric-asc {
+  --fa: "\f162"; }
 
-.fa-braille::before {
-  content: "\f2a1"; }
+.fa-sort-numeric-down {
+  --fa: "\f162"; }
 
-.fa-prescription-bottle-medical::before {
-  content: "\f486"; }
+.fa-hand-holding-droplet {
+  --fa: "\f4c1"; }
 
-.fa-prescription-bottle-alt::before {
-  content: "\f486"; }
+.fa-hand-holding-water {
+  --fa: "\f4c1"; }
 
-.fa-landmark::before {
-  content: "\f66f"; }
+.fa-water {
+  --fa: "\f773"; }
 
-.fa-truck::before {
-  content: "\f0d1"; }
+.fa-calendar-check {
+  --fa: "\f274"; }
 
-.fa-crosshairs::before {
-  content: "\f05b"; }
+.fa-braille {
+  --fa: "\f2a1"; }
 
-.fa-person-cane::before {
-  content: "\e53c"; }
+.fa-prescription-bottle-medical {
+  --fa: "\f486"; }
 
-.fa-tent::before {
-  content: "\e57d"; }
+.fa-prescription-bottle-alt {
+  --fa: "\f486"; }
 
-.fa-vest-patches::before {
-  content: "\e086"; }
+.fa-landmark {
+  --fa: "\f66f"; }
 
-.fa-check-double::before {
-  content: "\f560"; }
+.fa-truck {
+  --fa: "\f0d1"; }
 
-.fa-arrow-down-a-z::before {
-  content: "\f15d"; }
+.fa-crosshairs {
+  --fa: "\f05b"; }
 
-.fa-sort-alpha-asc::before {
-  content: "\f15d"; }
+.fa-person-cane {
+  --fa: "\e53c"; }
 
-.fa-sort-alpha-down::before {
-  content: "\f15d"; }
+.fa-tent {
+  --fa: "\e57d"; }
 
-.fa-money-bill-wheat::before {
-  content: "\e52a"; }
+.fa-vest-patches {
+  --fa: "\e086"; }
 
-.fa-cookie::before {
-  content: "\f563"; }
+.fa-check-double {
+  --fa: "\f560"; }
 
-.fa-arrow-rotate-left::before {
-  content: "\f0e2"; }
+.fa-arrow-down-a-z {
+  --fa: "\f15d"; }
 
-.fa-arrow-left-rotate::before {
-  content: "\f0e2"; }
+.fa-sort-alpha-asc {
+  --fa: "\f15d"; }
 
-.fa-arrow-rotate-back::before {
-  content: "\f0e2"; }
+.fa-sort-alpha-down {
+  --fa: "\f15d"; }
 
-.fa-arrow-rotate-backward::before {
-  content: "\f0e2"; }
+.fa-money-bill-wheat {
+  --fa: "\e52a"; }
 
-.fa-undo::before {
-  content: "\f0e2"; }
+.fa-cookie {
+  --fa: "\f563"; }
 
-.fa-hard-drive::before {
-  content: "\f0a0"; }
+.fa-arrow-rotate-left {
+  --fa: "\f0e2"; }
 
-.fa-hdd::before {
-  content: "\f0a0"; }
+.fa-arrow-left-rotate {
+  --fa: "\f0e2"; }
 
-.fa-face-grin-squint-tears::before {
-  content: "\f586"; }
+.fa-arrow-rotate-back {
+  --fa: "\f0e2"; }
 
-.fa-grin-squint-tears::before {
-  content: "\f586"; }
+.fa-arrow-rotate-backward {
+  --fa: "\f0e2"; }
 
-.fa-dumbbell::before {
-  content: "\f44b"; }
+.fa-undo {
+  --fa: "\f0e2"; }
 
-.fa-rectangle-list::before {
-  content: "\f022"; }
+.fa-hard-drive {
+  --fa: "\f0a0"; }
 
-.fa-list-alt::before {
-  content: "\f022"; }
+.fa-hdd {
+  --fa: "\f0a0"; }
 
-.fa-tarp-droplet::before {
-  content: "\e57c"; }
+.fa-face-grin-squint-tears {
+  --fa: "\f586"; }
 
-.fa-house-medical-circle-check::before {
-  content: "\e511"; }
+.fa-grin-squint-tears {
+  --fa: "\f586"; }
 
-.fa-person-skiing-nordic::before {
-  content: "\f7ca"; }
+.fa-dumbbell {
+  --fa: "\f44b"; }
 
-.fa-skiing-nordic::before {
-  content: "\f7ca"; }
+.fa-rectangle-list {
+  --fa: "\f022"; }
 
-.fa-calendar-plus::before {
-  content: "\f271"; }
+.fa-list-alt {
+  --fa: "\f022"; }
 
-.fa-plane-arrival::before {
-  content: "\f5af"; }
+.fa-tarp-droplet {
+  --fa: "\e57c"; }
 
-.fa-circle-left::before {
-  content: "\f359"; }
+.fa-house-medical-circle-check {
+  --fa: "\e511"; }
 
-.fa-arrow-alt-circle-left::before {
-  content: "\f359"; }
+.fa-person-skiing-nordic {
+  --fa: "\f7ca"; }
 
-.fa-train-subway::before {
-  content: "\f239"; }
+.fa-skiing-nordic {
+  --fa: "\f7ca"; }
 
-.fa-subway::before {
-  content: "\f239"; }
+.fa-calendar-plus {
+  --fa: "\f271"; }
 
-.fa-chart-gantt::before {
-  content: "\e0e4"; }
+.fa-plane-arrival {
+  --fa: "\f5af"; }
 
-.fa-indian-rupee-sign::before {
-  content: "\e1bc"; }
+.fa-circle-left {
+  --fa: "\f359"; }
 
-.fa-indian-rupee::before {
-  content: "\e1bc"; }
+.fa-arrow-alt-circle-left {
+  --fa: "\f359"; }
 
-.fa-inr::before {
-  content: "\e1bc"; }
+.fa-train-subway {
+  --fa: "\f239"; }
 
-.fa-crop-simple::before {
-  content: "\f565"; }
+.fa-subway {
+  --fa: "\f239"; }
 
-.fa-crop-alt::before {
-  content: "\f565"; }
+.fa-chart-gantt {
+  --fa: "\e0e4"; }
 
-.fa-money-bill-1::before {
-  content: "\f3d1"; }
+.fa-indian-rupee-sign {
+  --fa: "\e1bc"; }
 
-.fa-money-bill-alt::before {
-  content: "\f3d1"; }
+.fa-indian-rupee {
+  --fa: "\e1bc"; }
 
-.fa-left-long::before {
-  content: "\f30a"; }
+.fa-inr {
+  --fa: "\e1bc"; }
 
-.fa-long-arrow-alt-left::before {
-  content: "\f30a"; }
+.fa-crop-simple {
+  --fa: "\f565"; }
 
-.fa-dna::before {
-  content: "\f471"; }
+.fa-crop-alt {
+  --fa: "\f565"; }
 
-.fa-virus-slash::before {
-  content: "\e075"; }
+.fa-money-bill-1 {
+  --fa: "\f3d1"; }
 
-.fa-minus::before {
-  content: "\f068"; }
+.fa-money-bill-alt {
+  --fa: "\f3d1"; }
 
-.fa-subtract::before {
-  content: "\f068"; }
+.fa-left-long {
+  --fa: "\f30a"; }
 
-.fa-chess::before {
-  content: "\f439"; }
+.fa-long-arrow-alt-left {
+  --fa: "\f30a"; }
 
-.fa-arrow-left-long::before {
-  content: "\f177"; }
+.fa-dna {
+  --fa: "\f471"; }
 
-.fa-long-arrow-left::before {
-  content: "\f177"; }
+.fa-virus-slash {
+  --fa: "\e075"; }
 
-.fa-plug-circle-check::before {
-  content: "\e55c"; }
+.fa-minus {
+  --fa: "\f068"; }
 
-.fa-street-view::before {
-  content: "\f21d"; }
+.fa-subtract {
+  --fa: "\f068"; }
 
-.fa-franc-sign::before {
-  content: "\e18f"; }
+.fa-chess {
+  --fa: "\f439"; }
 
-.fa-volume-off::before {
-  content: "\f026"; }
+.fa-arrow-left-long {
+  --fa: "\f177"; }
 
-.fa-hands-asl-interpreting::before {
-  content: "\f2a3"; }
+.fa-long-arrow-left {
+  --fa: "\f177"; }
 
-.fa-american-sign-language-interpreting::before {
-  content: "\f2a3"; }
+.fa-plug-circle-check {
+  --fa: "\e55c"; }
 
-.fa-asl-interpreting::before {
-  content: "\f2a3"; }
+.fa-street-view {
+  --fa: "\f21d"; }
 
-.fa-hands-american-sign-language-interpreting::before {
-  content: "\f2a3"; }
+.fa-franc-sign {
+  --fa: "\e18f"; }
 
-.fa-gear::before {
-  content: "\f013"; }
+.fa-volume-off {
+  --fa: "\f026"; }
 
-.fa-cog::before {
-  content: "\f013"; }
+.fa-hands-asl-interpreting {
+  --fa: "\f2a3"; }
 
-.fa-droplet-slash::before {
-  content: "\f5c7"; }
+.fa-american-sign-language-interpreting {
+  --fa: "\f2a3"; }
 
-.fa-tint-slash::before {
-  content: "\f5c7"; }
+.fa-asl-interpreting {
+  --fa: "\f2a3"; }
 
-.fa-mosque::before {
-  content: "\f678"; }
+.fa-hands-american-sign-language-interpreting {
+  --fa: "\f2a3"; }
 
-.fa-mosquito::before {
-  content: "\e52b"; }
+.fa-gear {
+  --fa: "\f013"; }
 
-.fa-star-of-david::before {
-  content: "\f69a"; }
+.fa-cog {
+  --fa: "\f013"; }
 
-.fa-person-military-rifle::before {
-  content: "\e54b"; }
+.fa-droplet-slash {
+  --fa: "\f5c7"; }
 
-.fa-cart-shopping::before {
-  content: "\f07a"; }
+.fa-tint-slash {
+  --fa: "\f5c7"; }
 
-.fa-shopping-cart::before {
-  content: "\f07a"; }
+.fa-mosque {
+  --fa: "\f678"; }
 
-.fa-vials::before {
-  content: "\f493"; }
+.fa-mosquito {
+  --fa: "\e52b"; }
 
-.fa-plug-circle-plus::before {
-  content: "\e55f"; }
+.fa-star-of-david {
+  --fa: "\f69a"; }
 
-.fa-place-of-worship::before {
-  content: "\f67f"; }
+.fa-person-military-rifle {
+  --fa: "\e54b"; }
 
-.fa-grip-vertical::before {
-  content: "\f58e"; }
+.fa-cart-shopping {
+  --fa: "\f07a"; }
 
-.fa-arrow-turn-up::before {
-  content: "\f148"; }
+.fa-shopping-cart {
+  --fa: "\f07a"; }
 
-.fa-level-up::before {
-  content: "\f148"; }
+.fa-vials {
+  --fa: "\f493"; }
 
-.fa-u::before {
-  content: "\55"; }
+.fa-plug-circle-plus {
+  --fa: "\e55f"; }
 
-.fa-square-root-variable::before {
-  content: "\f698"; }
+.fa-place-of-worship {
+  --fa: "\f67f"; }
 
-.fa-square-root-alt::before {
-  content: "\f698"; }
+.fa-grip-vertical {
+  --fa: "\f58e"; }
 
-.fa-clock::before {
-  content: "\f017"; }
+.fa-hexagon-nodes {
+  --fa: "\e699"; }
 
-.fa-clock-four::before {
-  content: "\f017"; }
+.fa-arrow-turn-up {
+  --fa: "\f148"; }
 
-.fa-backward-step::before {
-  content: "\f048"; }
+.fa-level-up {
+  --fa: "\f148"; }
 
-.fa-step-backward::before {
-  content: "\f048"; }
+.fa-u {
+  --fa: "\55"; }
 
-.fa-pallet::before {
-  content: "\f482"; }
+.fa-square-root-variable {
+  --fa: "\f698"; }
 
-.fa-faucet::before {
-  content: "\e005"; }
+.fa-square-root-alt {
+  --fa: "\f698"; }
 
-.fa-baseball-bat-ball::before {
-  content: "\f432"; }
+.fa-clock {
+  --fa: "\f017"; }
 
-.fa-s::before {
-  content: "\53"; }
+.fa-clock-four {
+  --fa: "\f017"; }
 
-.fa-timeline::before {
-  content: "\e29c"; }
+.fa-backward-step {
+  --fa: "\f048"; }
 
-.fa-keyboard::before {
-  content: "\f11c"; }
+.fa-step-backward {
+  --fa: "\f048"; }
 
-.fa-caret-down::before {
-  content: "\f0d7"; }
+.fa-pallet {
+  --fa: "\f482"; }
 
-.fa-house-chimney-medical::before {
-  content: "\f7f2"; }
+.fa-faucet {
+  --fa: "\e005"; }
 
-.fa-clinic-medical::before {
-  content: "\f7f2"; }
+.fa-baseball-bat-ball {
+  --fa: "\f432"; }
 
-.fa-temperature-three-quarters::before {
-  content: "\f2c8"; }
+.fa-s {
+  --fa: "\53"; }
 
-.fa-temperature-3::before {
-  content: "\f2c8"; }
+.fa-timeline {
+  --fa: "\e29c"; }
 
-.fa-thermometer-3::before {
-  content: "\f2c8"; }
+.fa-keyboard {
+  --fa: "\f11c"; }
 
-.fa-thermometer-three-quarters::before {
-  content: "\f2c8"; }
+.fa-caret-down {
+  --fa: "\f0d7"; }
 
-.fa-mobile-screen::before {
-  content: "\f3cf"; }
+.fa-house-chimney-medical {
+  --fa: "\f7f2"; }
 
-.fa-mobile-android-alt::before {
-  content: "\f3cf"; }
+.fa-clinic-medical {
+  --fa: "\f7f2"; }
 
-.fa-plane-up::before {
-  content: "\e22d"; }
+.fa-temperature-three-quarters {
+  --fa: "\f2c8"; }
 
-.fa-piggy-bank::before {
-  content: "\f4d3"; }
+.fa-temperature-3 {
+  --fa: "\f2c8"; }
 
-.fa-battery-half::before {
-  content: "\f242"; }
+.fa-thermometer-3 {
+  --fa: "\f2c8"; }
 
-.fa-battery-3::before {
-  content: "\f242"; }
+.fa-thermometer-three-quarters {
+  --fa: "\f2c8"; }
 
-.fa-mountain-city::before {
-  content: "\e52e"; }
+.fa-mobile-screen {
+  --fa: "\f3cf"; }
 
-.fa-coins::before {
-  content: "\f51e"; }
+.fa-mobile-android-alt {
+  --fa: "\f3cf"; }
 
-.fa-khanda::before {
-  content: "\f66d"; }
+.fa-plane-up {
+  --fa: "\e22d"; }
 
-.fa-sliders::before {
-  content: "\f1de"; }
+.fa-piggy-bank {
+  --fa: "\f4d3"; }
 
-.fa-sliders-h::before {
-  content: "\f1de"; }
+.fa-battery-half {
+  --fa: "\f242"; }
 
-.fa-folder-tree::before {
-  content: "\f802"; }
+.fa-battery-3 {
+  --fa: "\f242"; }
 
-.fa-network-wired::before {
-  content: "\f6ff"; }
+.fa-mountain-city {
+  --fa: "\e52e"; }
 
-.fa-map-pin::before {
-  content: "\f276"; }
+.fa-coins {
+  --fa: "\f51e"; }
 
-.fa-hamsa::before {
-  content: "\f665"; }
+.fa-khanda {
+  --fa: "\f66d"; }
 
-.fa-cent-sign::before {
-  content: "\e3f5"; }
+.fa-sliders {
+  --fa: "\f1de"; }
 
-.fa-flask::before {
-  content: "\f0c3"; }
+.fa-sliders-h {
+  --fa: "\f1de"; }
 
-.fa-person-pregnant::before {
-  content: "\e31e"; }
+.fa-folder-tree {
+  --fa: "\f802"; }
 
-.fa-wand-sparkles::before {
-  content: "\f72b"; }
+.fa-network-wired {
+  --fa: "\f6ff"; }
 
-.fa-ellipsis-vertical::before {
-  content: "\f142"; }
+.fa-map-pin {
+  --fa: "\f276"; }
 
-.fa-ellipsis-v::before {
-  content: "\f142"; }
+.fa-hamsa {
+  --fa: "\f665"; }
 
-.fa-ticket::before {
-  content: "\f145"; }
+.fa-cent-sign {
+  --fa: "\e3f5"; }
 
-.fa-power-off::before {
-  content: "\f011"; }
+.fa-flask {
+  --fa: "\f0c3"; }
 
-.fa-right-long::before {
-  content: "\f30b"; }
+.fa-person-pregnant {
+  --fa: "\e31e"; }
 
-.fa-long-arrow-alt-right::before {
-  content: "\f30b"; }
+.fa-wand-sparkles {
+  --fa: "\f72b"; }
 
-.fa-flag-usa::before {
-  content: "\f74d"; }
+.fa-ellipsis-vertical {
+  --fa: "\f142"; }
 
-.fa-laptop-file::before {
-  content: "\e51d"; }
+.fa-ellipsis-v {
+  --fa: "\f142"; }
 
-.fa-tty::before {
-  content: "\f1e4"; }
+.fa-ticket {
+  --fa: "\f145"; }
 
-.fa-teletype::before {
-  content: "\f1e4"; }
+.fa-power-off {
+  --fa: "\f011"; }
 
-.fa-diagram-next::before {
-  content: "\e476"; }
+.fa-right-long {
+  --fa: "\f30b"; }
 
-.fa-person-rifle::before {
-  content: "\e54e"; }
+.fa-long-arrow-alt-right {
+  --fa: "\f30b"; }
 
-.fa-house-medical-circle-exclamation::before {
-  content: "\e512"; }
+.fa-flag-usa {
+  --fa: "\f74d"; }
 
-.fa-closed-captioning::before {
-  content: "\f20a"; }
+.fa-laptop-file {
+  --fa: "\e51d"; }
 
-.fa-person-hiking::before {
-  content: "\f6ec"; }
+.fa-tty {
+  --fa: "\f1e4"; }
 
-.fa-hiking::before {
-  content: "\f6ec"; }
+.fa-teletype {
+  --fa: "\f1e4"; }
 
-.fa-venus-double::before {
-  content: "\f226"; }
+.fa-diagram-next {
+  --fa: "\e476"; }
 
-.fa-images::before {
-  content: "\f302"; }
+.fa-person-rifle {
+  --fa: "\e54e"; }
 
-.fa-calculator::before {
-  content: "\f1ec"; }
+.fa-house-medical-circle-exclamation {
+  --fa: "\e512"; }
 
-.fa-people-pulling::before {
-  content: "\e535"; }
+.fa-closed-captioning {
+  --fa: "\f20a"; }
 
-.fa-n::before {
-  content: "\4e"; }
+.fa-person-hiking {
+  --fa: "\f6ec"; }
 
-.fa-cable-car::before {
-  content: "\f7da"; }
+.fa-hiking {
+  --fa: "\f6ec"; }
 
-.fa-tram::before {
-  content: "\f7da"; }
+.fa-venus-double {
+  --fa: "\f226"; }
 
-.fa-cloud-rain::before {
-  content: "\f73d"; }
+.fa-images {
+  --fa: "\f302"; }
 
-.fa-building-circle-xmark::before {
-  content: "\e4d4"; }
+.fa-calculator {
+  --fa: "\f1ec"; }
 
-.fa-ship::before {
-  content: "\f21a"; }
+.fa-people-pulling {
+  --fa: "\e535"; }
 
-.fa-arrows-down-to-line::before {
-  content: "\e4b8"; }
+.fa-n {
+  --fa: "\4e"; }
 
-.fa-download::before {
-  content: "\f019"; }
+.fa-cable-car {
+  --fa: "\f7da"; }
 
-.fa-face-grin::before {
-  content: "\f580"; }
+.fa-tram {
+  --fa: "\f7da"; }
 
-.fa-grin::before {
-  content: "\f580"; }
+.fa-cloud-rain {
+  --fa: "\f73d"; }
 
-.fa-delete-left::before {
-  content: "\f55a"; }
+.fa-building-circle-xmark {
+  --fa: "\e4d4"; }
 
-.fa-backspace::before {
-  content: "\f55a"; }
+.fa-ship {
+  --fa: "\f21a"; }
 
-.fa-eye-dropper::before {
-  content: "\f1fb"; }
+.fa-arrows-down-to-line {
+  --fa: "\e4b8"; }
 
-.fa-eye-dropper-empty::before {
-  content: "\f1fb"; }
+.fa-download {
+  --fa: "\f019"; }
 
-.fa-eyedropper::before {
-  content: "\f1fb"; }
+.fa-face-grin {
+  --fa: "\f580"; }
 
-.fa-file-circle-check::before {
-  content: "\e5a0"; }
+.fa-grin {
+  --fa: "\f580"; }
 
-.fa-forward::before {
-  content: "\f04e"; }
+.fa-delete-left {
+  --fa: "\f55a"; }
 
-.fa-mobile::before {
-  content: "\f3ce"; }
+.fa-backspace {
+  --fa: "\f55a"; }
 
-.fa-mobile-android::before {
-  content: "\f3ce"; }
+.fa-eye-dropper {
+  --fa: "\f1fb"; }
 
-.fa-mobile-phone::before {
-  content: "\f3ce"; }
+.fa-eye-dropper-empty {
+  --fa: "\f1fb"; }
 
-.fa-face-meh::before {
-  content: "\f11a"; }
+.fa-eyedropper {
+  --fa: "\f1fb"; }
 
-.fa-meh::before {
-  content: "\f11a"; }
+.fa-file-circle-check {
+  --fa: "\e5a0"; }
 
-.fa-align-center::before {
-  content: "\f037"; }
+.fa-forward {
+  --fa: "\f04e"; }
 
-.fa-book-skull::before {
-  content: "\f6b7"; }
+.fa-mobile {
+  --fa: "\f3ce"; }
 
-.fa-book-dead::before {
-  content: "\f6b7"; }
+.fa-mobile-android {
+  --fa: "\f3ce"; }
 
-.fa-id-card::before {
-  content: "\f2c2"; }
+.fa-mobile-phone {
+  --fa: "\f3ce"; }
 
-.fa-drivers-license::before {
-  content: "\f2c2"; }
+.fa-face-meh {
+  --fa: "\f11a"; }
 
-.fa-outdent::before {
-  content: "\f03b"; }
+.fa-meh {
+  --fa: "\f11a"; }
 
-.fa-dedent::before {
-  content: "\f03b"; }
+.fa-align-center {
+  --fa: "\f037"; }
 
-.fa-heart-circle-exclamation::before {
-  content: "\e4fe"; }
+.fa-book-skull {
+  --fa: "\f6b7"; }
 
-.fa-house::before {
-  content: "\f015"; }
+.fa-book-dead {
+  --fa: "\f6b7"; }
 
-.fa-home::before {
-  content: "\f015"; }
+.fa-id-card {
+  --fa: "\f2c2"; }
 
-.fa-home-alt::before {
-  content: "\f015"; }
+.fa-drivers-license {
+  --fa: "\f2c2"; }
 
-.fa-home-lg-alt::before {
-  content: "\f015"; }
+.fa-outdent {
+  --fa: "\f03b"; }
 
-.fa-calendar-week::before {
-  content: "\f784"; }
+.fa-dedent {
+  --fa: "\f03b"; }
 
-.fa-laptop-medical::before {
-  content: "\f812"; }
+.fa-heart-circle-exclamation {
+  --fa: "\e4fe"; }
 
-.fa-b::before {
-  content: "\42"; }
+.fa-house {
+  --fa: "\f015"; }
 
-.fa-file-medical::before {
-  content: "\f477"; }
+.fa-home {
+  --fa: "\f015"; }
 
-.fa-dice-one::before {
-  content: "\f525"; }
+.fa-home-alt {
+  --fa: "\f015"; }
 
-.fa-kiwi-bird::before {
-  content: "\f535"; }
+.fa-home-lg-alt {
+  --fa: "\f015"; }
 
-.fa-arrow-right-arrow-left::before {
-  content: "\f0ec"; }
+.fa-calendar-week {
+  --fa: "\f784"; }
 
-.fa-exchange::before {
-  content: "\f0ec"; }
+.fa-laptop-medical {
+  --fa: "\f812"; }
 
-.fa-rotate-right::before {
-  content: "\f2f9"; }
+.fa-b {
+  --fa: "\42"; }
 
-.fa-redo-alt::before {
-  content: "\f2f9"; }
+.fa-file-medical {
+  --fa: "\f477"; }
 
-.fa-rotate-forward::before {
-  content: "\f2f9"; }
+.fa-dice-one {
+  --fa: "\f525"; }
 
-.fa-utensils::before {
-  content: "\f2e7"; }
+.fa-kiwi-bird {
+  --fa: "\f535"; }
 
-.fa-cutlery::before {
-  content: "\f2e7"; }
+.fa-arrow-right-arrow-left {
+  --fa: "\f0ec"; }
 
-.fa-arrow-up-wide-short::before {
-  content: "\f161"; }
+.fa-exchange {
+  --fa: "\f0ec"; }
 
-.fa-sort-amount-up::before {
-  content: "\f161"; }
+.fa-rotate-right {
+  --fa: "\f2f9"; }
 
-.fa-mill-sign::before {
-  content: "\e1ed"; }
+.fa-redo-alt {
+  --fa: "\f2f9"; }
 
-.fa-bowl-rice::before {
-  content: "\e2eb"; }
+.fa-rotate-forward {
+  --fa: "\f2f9"; }
 
-.fa-skull::before {
-  content: "\f54c"; }
+.fa-utensils {
+  --fa: "\f2e7"; }
 
-.fa-tower-broadcast::before {
-  content: "\f519"; }
+.fa-cutlery {
+  --fa: "\f2e7"; }
 
-.fa-broadcast-tower::before {
-  content: "\f519"; }
+.fa-arrow-up-wide-short {
+  --fa: "\f161"; }
 
-.fa-truck-pickup::before {
-  content: "\f63c"; }
+.fa-sort-amount-up {
+  --fa: "\f161"; }
 
-.fa-up-long::before {
-  content: "\f30c"; }
+.fa-mill-sign {
+  --fa: "\e1ed"; }
 
-.fa-long-arrow-alt-up::before {
-  content: "\f30c"; }
+.fa-bowl-rice {
+  --fa: "\e2eb"; }
 
-.fa-stop::before {
-  content: "\f04d"; }
+.fa-skull {
+  --fa: "\f54c"; }
 
-.fa-code-merge::before {
-  content: "\f387"; }
+.fa-tower-broadcast {
+  --fa: "\f519"; }
 
-.fa-upload::before {
-  content: "\f093"; }
+.fa-broadcast-tower {
+  --fa: "\f519"; }
 
-.fa-hurricane::before {
-  content: "\f751"; }
+.fa-truck-pickup {
+  --fa: "\f63c"; }
 
-.fa-mound::before {
-  content: "\e52d"; }
+.fa-up-long {
+  --fa: "\f30c"; }
 
-.fa-toilet-portable::before {
-  content: "\e583"; }
+.fa-long-arrow-alt-up {
+  --fa: "\f30c"; }
 
-.fa-compact-disc::before {
-  content: "\f51f"; }
+.fa-stop {
+  --fa: "\f04d"; }
 
-.fa-file-arrow-down::before {
-  content: "\f56d"; }
+.fa-code-merge {
+  --fa: "\f387"; }
 
-.fa-file-download::before {
-  content: "\f56d"; }
+.fa-upload {
+  --fa: "\f093"; }
 
-.fa-caravan::before {
-  content: "\f8ff"; }
+.fa-hurricane {
+  --fa: "\f751"; }
 
-.fa-shield-cat::before {
-  content: "\e572"; }
+.fa-mound {
+  --fa: "\e52d"; }
 
-.fa-bolt::before {
-  content: "\f0e7"; }
+.fa-toilet-portable {
+  --fa: "\e583"; }
 
-.fa-zap::before {
-  content: "\f0e7"; }
+.fa-compact-disc {
+  --fa: "\f51f"; }
 
-.fa-glass-water::before {
-  content: "\e4f4"; }
+.fa-file-arrow-down {
+  --fa: "\f56d"; }
 
-.fa-oil-well::before {
-  content: "\e532"; }
+.fa-file-download {
+  --fa: "\f56d"; }
 
-.fa-vault::before {
-  content: "\e2c5"; }
+.fa-caravan {
+  --fa: "\f8ff"; }
 
-.fa-mars::before {
-  content: "\f222"; }
+.fa-shield-cat {
+  --fa: "\e572"; }
 
-.fa-toilet::before {
-  content: "\f7d8"; }
+.fa-bolt {
+  --fa: "\f0e7"; }
 
-.fa-plane-circle-xmark::before {
-  content: "\e557"; }
+.fa-zap {
+  --fa: "\f0e7"; }
 
-.fa-yen-sign::before {
-  content: "\f157"; }
+.fa-glass-water {
+  --fa: "\e4f4"; }
 
-.fa-cny::before {
-  content: "\f157"; }
+.fa-oil-well {
+  --fa: "\e532"; }
 
-.fa-jpy::before {
-  content: "\f157"; }
+.fa-vault {
+  --fa: "\e2c5"; }
 
-.fa-rmb::before {
-  content: "\f157"; }
+.fa-mars {
+  --fa: "\f222"; }
 
-.fa-yen::before {
-  content: "\f157"; }
+.fa-toilet {
+  --fa: "\f7d8"; }
 
-.fa-ruble-sign::before {
-  content: "\f158"; }
+.fa-plane-circle-xmark {
+  --fa: "\e557"; }
 
-.fa-rouble::before {
-  content: "\f158"; }
+.fa-yen-sign {
+  --fa: "\f157"; }
 
-.fa-rub::before {
-  content: "\f158"; }
+.fa-cny {
+  --fa: "\f157"; }
 
-.fa-ruble::before {
-  content: "\f158"; }
+.fa-jpy {
+  --fa: "\f157"; }
 
-.fa-sun::before {
-  content: "\f185"; }
+.fa-rmb {
+  --fa: "\f157"; }
 
-.fa-guitar::before {
-  content: "\f7a6"; }
+.fa-yen {
+  --fa: "\f157"; }
 
-.fa-face-laugh-wink::before {
-  content: "\f59c"; }
+.fa-ruble-sign {
+  --fa: "\f158"; }
 
-.fa-laugh-wink::before {
-  content: "\f59c"; }
+.fa-rouble {
+  --fa: "\f158"; }
 
-.fa-horse-head::before {
-  content: "\f7ab"; }
+.fa-rub {
+  --fa: "\f158"; }
 
-.fa-bore-hole::before {
-  content: "\e4c3"; }
+.fa-ruble {
+  --fa: "\f158"; }
 
-.fa-industry::before {
-  content: "\f275"; }
+.fa-sun {
+  --fa: "\f185"; }
 
-.fa-circle-down::before {
-  content: "\f358"; }
+.fa-guitar {
+  --fa: "\f7a6"; }
 
-.fa-arrow-alt-circle-down::before {
-  content: "\f358"; }
+.fa-face-laugh-wink {
+  --fa: "\f59c"; }
 
-.fa-arrows-turn-to-dots::before {
-  content: "\e4c1"; }
+.fa-laugh-wink {
+  --fa: "\f59c"; }
 
-.fa-florin-sign::before {
-  content: "\e184"; }
+.fa-horse-head {
+  --fa: "\f7ab"; }
 
-.fa-arrow-down-short-wide::before {
-  content: "\f884"; }
+.fa-bore-hole {
+  --fa: "\e4c3"; }
 
-.fa-sort-amount-desc::before {
-  content: "\f884"; }
+.fa-industry {
+  --fa: "\f275"; }
 
-.fa-sort-amount-down-alt::before {
-  content: "\f884"; }
+.fa-circle-down {
+  --fa: "\f358"; }
 
-.fa-less-than::before {
-  content: "\3c"; }
+.fa-arrow-alt-circle-down {
+  --fa: "\f358"; }
 
-.fa-angle-down::before {
-  content: "\f107"; }
+.fa-arrows-turn-to-dots {
+  --fa: "\e4c1"; }
 
-.fa-car-tunnel::before {
-  content: "\e4de"; }
+.fa-florin-sign {
+  --fa: "\e184"; }
 
-.fa-head-side-cough::before {
-  content: "\e061"; }
+.fa-arrow-down-short-wide {
+  --fa: "\f884"; }
 
-.fa-grip-lines::before {
-  content: "\f7a4"; }
+.fa-sort-amount-desc {
+  --fa: "\f884"; }
 
-.fa-thumbs-down::before {
-  content: "\f165"; }
+.fa-sort-amount-down-alt {
+  --fa: "\f884"; }
 
-.fa-user-lock::before {
-  content: "\f502"; }
+.fa-less-than {
+  --fa: "\3c"; }
 
-.fa-arrow-right-long::before {
-  content: "\f178"; }
+.fa-angle-down {
+  --fa: "\f107"; }
 
-.fa-long-arrow-right::before {
-  content: "\f178"; }
+.fa-car-tunnel {
+  --fa: "\e4de"; }
 
-.fa-anchor-circle-xmark::before {
-  content: "\e4ac"; }
+.fa-head-side-cough {
+  --fa: "\e061"; }
 
-.fa-ellipsis::before {
-  content: "\f141"; }
+.fa-grip-lines {
+  --fa: "\f7a4"; }
 
-.fa-ellipsis-h::before {
-  content: "\f141"; }
+.fa-thumbs-down {
+  --fa: "\f165"; }
 
-.fa-chess-pawn::before {
-  content: "\f443"; }
+.fa-user-lock {
+  --fa: "\f502"; }
 
-.fa-kit-medical::before {
-  content: "\f479"; }
+.fa-arrow-right-long {
+  --fa: "\f178"; }
 
-.fa-first-aid::before {
-  content: "\f479"; }
+.fa-long-arrow-right {
+  --fa: "\f178"; }
 
-.fa-person-through-window::before {
-  content: "\e5a9"; }
+.fa-anchor-circle-xmark {
+  --fa: "\e4ac"; }
 
-.fa-toolbox::before {
-  content: "\f552"; }
+.fa-ellipsis {
+  --fa: "\f141"; }
 
-.fa-hands-holding-circle::before {
-  content: "\e4fb"; }
+.fa-ellipsis-h {
+  --fa: "\f141"; }
 
-.fa-bug::before {
-  content: "\f188"; }
+.fa-chess-pawn {
+  --fa: "\f443"; }
 
-.fa-credit-card::before {
-  content: "\f09d"; }
+.fa-kit-medical {
+  --fa: "\f479"; }
 
-.fa-credit-card-alt::before {
-  content: "\f09d"; }
+.fa-first-aid {
+  --fa: "\f479"; }
 
-.fa-car::before {
-  content: "\f1b9"; }
+.fa-person-through-window {
+  --fa: "\e5a9"; }
 
-.fa-automobile::before {
-  content: "\f1b9"; }
+.fa-toolbox {
+  --fa: "\f552"; }
 
-.fa-hand-holding-hand::before {
-  content: "\e4f7"; }
+.fa-hands-holding-circle {
+  --fa: "\e4fb"; }
 
-.fa-book-open-reader::before {
-  content: "\f5da"; }
+.fa-bug {
+  --fa: "\f188"; }
 
-.fa-book-reader::before {
-  content: "\f5da"; }
+.fa-credit-card {
+  --fa: "\f09d"; }
 
-.fa-mountain-sun::before {
-  content: "\e52f"; }
+.fa-credit-card-alt {
+  --fa: "\f09d"; }
 
-.fa-arrows-left-right-to-line::before {
-  content: "\e4ba"; }
+.fa-car {
+  --fa: "\f1b9"; }
 
-.fa-dice-d20::before {
-  content: "\f6cf"; }
+.fa-automobile {
+  --fa: "\f1b9"; }
 
-.fa-truck-droplet::before {
-  content: "\e58c"; }
+.fa-hand-holding-hand {
+  --fa: "\e4f7"; }
 
-.fa-file-circle-xmark::before {
-  content: "\e5a1"; }
+.fa-book-open-reader {
+  --fa: "\f5da"; }
 
-.fa-temperature-arrow-up::before {
-  content: "\e040"; }
+.fa-book-reader {
+  --fa: "\f5da"; }
 
-.fa-temperature-up::before {
-  content: "\e040"; }
+.fa-mountain-sun {
+  --fa: "\e52f"; }
 
-.fa-medal::before {
-  content: "\f5a2"; }
+.fa-arrows-left-right-to-line {
+  --fa: "\e4ba"; }
 
-.fa-bed::before {
-  content: "\f236"; }
+.fa-dice-d20 {
+  --fa: "\f6cf"; }
 
-.fa-square-h::before {
-  content: "\f0fd"; }
+.fa-truck-droplet {
+  --fa: "\e58c"; }
 
-.fa-h-square::before {
-  content: "\f0fd"; }
+.fa-file-circle-xmark {
+  --fa: "\e5a1"; }
 
-.fa-podcast::before {
-  content: "\f2ce"; }
+.fa-temperature-arrow-up {
+  --fa: "\e040"; }
 
-.fa-temperature-full::before {
-  content: "\f2c7"; }
+.fa-temperature-up {
+  --fa: "\e040"; }
 
-.fa-temperature-4::before {
-  content: "\f2c7"; }
+.fa-medal {
+  --fa: "\f5a2"; }
 
-.fa-thermometer-4::before {
-  content: "\f2c7"; }
+.fa-bed {
+  --fa: "\f236"; }
 
-.fa-thermometer-full::before {
-  content: "\f2c7"; }
+.fa-square-h {
+  --fa: "\f0fd"; }
 
-.fa-bell::before {
-  content: "\f0f3"; }
+.fa-h-square {
+  --fa: "\f0fd"; }
 
-.fa-superscript::before {
-  content: "\f12b"; }
+.fa-podcast {
+  --fa: "\f2ce"; }
 
-.fa-plug-circle-xmark::before {
-  content: "\e560"; }
+.fa-temperature-full {
+  --fa: "\f2c7"; }
 
-.fa-star-of-life::before {
-  content: "\f621"; }
+.fa-temperature-4 {
+  --fa: "\f2c7"; }
 
-.fa-phone-slash::before {
-  content: "\f3dd"; }
+.fa-thermometer-4 {
+  --fa: "\f2c7"; }
 
-.fa-paint-roller::before {
-  content: "\f5aa"; }
+.fa-thermometer-full {
+  --fa: "\f2c7"; }
 
-.fa-handshake-angle::before {
-  content: "\f4c4"; }
+.fa-bell {
+  --fa: "\f0f3"; }
 
-.fa-hands-helping::before {
-  content: "\f4c4"; }
+.fa-superscript {
+  --fa: "\f12b"; }
 
-.fa-location-dot::before {
-  content: "\f3c5"; }
+.fa-plug-circle-xmark {
+  --fa: "\e560"; }
 
-.fa-map-marker-alt::before {
-  content: "\f3c5"; }
+.fa-star-of-life {
+  --fa: "\f621"; }
 
-.fa-file::before {
-  content: "\f15b"; }
+.fa-phone-slash {
+  --fa: "\f3dd"; }
 
-.fa-greater-than::before {
-  content: "\3e"; }
+.fa-paint-roller {
+  --fa: "\f5aa"; }
 
-.fa-person-swimming::before {
-  content: "\f5c4"; }
+.fa-handshake-angle {
+  --fa: "\f4c4"; }
 
-.fa-swimmer::before {
-  content: "\f5c4"; }
+.fa-hands-helping {
+  --fa: "\f4c4"; }
 
-.fa-arrow-down::before {
-  content: "\f063"; }
+.fa-location-dot {
+  --fa: "\f3c5"; }
 
-.fa-droplet::before {
-  content: "\f043"; }
+.fa-map-marker-alt {
+  --fa: "\f3c5"; }
 
-.fa-tint::before {
-  content: "\f043"; }
+.fa-file {
+  --fa: "\f15b"; }
 
-.fa-eraser::before {
-  content: "\f12d"; }
+.fa-greater-than {
+  --fa: "\3e"; }
 
-.fa-earth-americas::before {
-  content: "\f57d"; }
+.fa-person-swimming {
+  --fa: "\f5c4"; }
 
-.fa-earth::before {
-  content: "\f57d"; }
+.fa-swimmer {
+  --fa: "\f5c4"; }
 
-.fa-earth-america::before {
-  content: "\f57d"; }
+.fa-arrow-down {
+  --fa: "\f063"; }
 
-.fa-globe-americas::before {
-  content: "\f57d"; }
+.fa-droplet {
+  --fa: "\f043"; }
 
-.fa-person-burst::before {
-  content: "\e53b"; }
+.fa-tint {
+  --fa: "\f043"; }
 
-.fa-dove::before {
-  content: "\f4ba"; }
+.fa-eraser {
+  --fa: "\f12d"; }
 
-.fa-battery-empty::before {
-  content: "\f244"; }
+.fa-earth-americas {
+  --fa: "\f57d"; }
 
-.fa-battery-0::before {
-  content: "\f244"; }
+.fa-earth {
+  --fa: "\f57d"; }
 
-.fa-socks::before {
-  content: "\f696"; }
+.fa-earth-america {
+  --fa: "\f57d"; }
 
-.fa-inbox::before {
-  content: "\f01c"; }
+.fa-globe-americas {
+  --fa: "\f57d"; }
 
-.fa-section::before {
-  content: "\e447"; }
+.fa-person-burst {
+  --fa: "\e53b"; }
 
-.fa-gauge-high::before {
-  content: "\f625"; }
+.fa-dove {
+  --fa: "\f4ba"; }
 
-.fa-tachometer-alt::before {
-  content: "\f625"; }
+.fa-battery-empty {
+  --fa: "\f244"; }
 
-.fa-tachometer-alt-fast::before {
-  content: "\f625"; }
+.fa-battery-0 {
+  --fa: "\f244"; }
 
-.fa-envelope-open-text::before {
-  content: "\f658"; }
+.fa-socks {
+  --fa: "\f696"; }
 
-.fa-hospital::before {
-  content: "\f0f8"; }
+.fa-inbox {
+  --fa: "\f01c"; }
 
-.fa-hospital-alt::before {
-  content: "\f0f8"; }
+.fa-section {
+  --fa: "\e447"; }
 
-.fa-hospital-wide::before {
-  content: "\f0f8"; }
+.fa-gauge-high {
+  --fa: "\f625"; }
 
-.fa-wine-bottle::before {
-  content: "\f72f"; }
+.fa-tachometer-alt {
+  --fa: "\f625"; }
 
-.fa-chess-rook::before {
-  content: "\f447"; }
+.fa-tachometer-alt-fast {
+  --fa: "\f625"; }
 
-.fa-bars-staggered::before {
-  content: "\f550"; }
+.fa-envelope-open-text {
+  --fa: "\f658"; }
 
-.fa-reorder::before {
-  content: "\f550"; }
+.fa-hospital {
+  --fa: "\f0f8"; }
 
-.fa-stream::before {
-  content: "\f550"; }
+.fa-hospital-alt {
+  --fa: "\f0f8"; }
 
-.fa-dharmachakra::before {
-  content: "\f655"; }
+.fa-hospital-wide {
+  --fa: "\f0f8"; }
 
-.fa-hotdog::before {
-  content: "\f80f"; }
+.fa-wine-bottle {
+  --fa: "\f72f"; }
 
-.fa-person-walking-with-cane::before {
-  content: "\f29d"; }
+.fa-chess-rook {
+  --fa: "\f447"; }
 
-.fa-blind::before {
-  content: "\f29d"; }
+.fa-bars-staggered {
+  --fa: "\f550"; }
 
-.fa-drum::before {
-  content: "\f569"; }
+.fa-reorder {
+  --fa: "\f550"; }
 
-.fa-ice-cream::before {
-  content: "\f810"; }
+.fa-stream {
+  --fa: "\f550"; }
 
-.fa-heart-circle-bolt::before {
-  content: "\e4fc"; }
+.fa-dharmachakra {
+  --fa: "\f655"; }
 
-.fa-fax::before {
-  content: "\f1ac"; }
+.fa-hotdog {
+  --fa: "\f80f"; }
 
-.fa-paragraph::before {
-  content: "\f1dd"; }
+.fa-person-walking-with-cane {
+  --fa: "\f29d"; }
 
-.fa-check-to-slot::before {
-  content: "\f772"; }
+.fa-blind {
+  --fa: "\f29d"; }
 
-.fa-vote-yea::before {
-  content: "\f772"; }
+.fa-drum {
+  --fa: "\f569"; }
 
-.fa-star-half::before {
-  content: "\f089"; }
+.fa-ice-cream {
+  --fa: "\f810"; }
 
-.fa-boxes-stacked::before {
-  content: "\f468"; }
+.fa-heart-circle-bolt {
+  --fa: "\e4fc"; }
 
-.fa-boxes::before {
-  content: "\f468"; }
+.fa-fax {
+  --fa: "\f1ac"; }
 
-.fa-boxes-alt::before {
-  content: "\f468"; }
+.fa-paragraph {
+  --fa: "\f1dd"; }
 
-.fa-link::before {
-  content: "\f0c1"; }
+.fa-check-to-slot {
+  --fa: "\f772"; }
 
-.fa-chain::before {
-  content: "\f0c1"; }
+.fa-vote-yea {
+  --fa: "\f772"; }
 
-.fa-ear-listen::before {
-  content: "\f2a2"; }
+.fa-star-half {
+  --fa: "\f089"; }
 
-.fa-assistive-listening-systems::before {
-  content: "\f2a2"; }
+.fa-boxes-stacked {
+  --fa: "\f468"; }
 
-.fa-tree-city::before {
-  content: "\e587"; }
+.fa-boxes {
+  --fa: "\f468"; }
 
-.fa-play::before {
-  content: "\f04b"; }
+.fa-boxes-alt {
+  --fa: "\f468"; }
 
-.fa-font::before {
-  content: "\f031"; }
+.fa-link {
+  --fa: "\f0c1"; }
 
-.fa-table-cells-row-lock::before {
-  content: "\e67a"; }
+.fa-chain {
+  --fa: "\f0c1"; }
 
-.fa-rupiah-sign::before {
-  content: "\e23d"; }
+.fa-ear-listen {
+  --fa: "\f2a2"; }
 
-.fa-magnifying-glass::before {
-  content: "\f002"; }
+.fa-assistive-listening-systems {
+  --fa: "\f2a2"; }
 
-.fa-search::before {
-  content: "\f002"; }
+.fa-tree-city {
+  --fa: "\e587"; }
 
-.fa-table-tennis-paddle-ball::before {
-  content: "\f45d"; }
+.fa-play {
+  --fa: "\f04b"; }
 
-.fa-ping-pong-paddle-ball::before {
-  content: "\f45d"; }
+.fa-font {
+  --fa: "\f031"; }
 
-.fa-table-tennis::before {
-  content: "\f45d"; }
+.fa-table-cells-row-lock {
+  --fa: "\e67a"; }
 
-.fa-person-dots-from-line::before {
-  content: "\f470"; }
+.fa-rupiah-sign {
+  --fa: "\e23d"; }
 
-.fa-diagnoses::before {
-  content: "\f470"; }
+.fa-magnifying-glass {
+  --fa: "\f002"; }
 
-.fa-trash-can-arrow-up::before {
-  content: "\f82a"; }
+.fa-search {
+  --fa: "\f002"; }
 
-.fa-trash-restore-alt::before {
-  content: "\f82a"; }
+.fa-table-tennis-paddle-ball {
+  --fa: "\f45d"; }
 
-.fa-naira-sign::before {
-  content: "\e1f6"; }
+.fa-ping-pong-paddle-ball {
+  --fa: "\f45d"; }
 
-.fa-cart-arrow-down::before {
-  content: "\f218"; }
+.fa-table-tennis {
+  --fa: "\f45d"; }
 
-.fa-walkie-talkie::before {
-  content: "\f8ef"; }
+.fa-person-dots-from-line {
+  --fa: "\f470"; }
 
-.fa-file-pen::before {
-  content: "\f31c"; }
+.fa-diagnoses {
+  --fa: "\f470"; }
 
-.fa-file-edit::before {
-  content: "\f31c"; }
+.fa-trash-can-arrow-up {
+  --fa: "\f82a"; }
 
-.fa-receipt::before {
-  content: "\f543"; }
+.fa-trash-restore-alt {
+  --fa: "\f82a"; }
 
-.fa-square-pen::before {
-  content: "\f14b"; }
+.fa-naira-sign {
+  --fa: "\e1f6"; }
 
-.fa-pen-square::before {
-  content: "\f14b"; }
+.fa-cart-arrow-down {
+  --fa: "\f218"; }
 
-.fa-pencil-square::before {
-  content: "\f14b"; }
+.fa-walkie-talkie {
+  --fa: "\f8ef"; }
 
-.fa-suitcase-rolling::before {
-  content: "\f5c1"; }
+.fa-file-pen {
+  --fa: "\f31c"; }
 
-.fa-person-circle-exclamation::before {
-  content: "\e53f"; }
+.fa-file-edit {
+  --fa: "\f31c"; }
 
-.fa-chevron-down::before {
-  content: "\f078"; }
+.fa-receipt {
+  --fa: "\f543"; }
 
-.fa-battery-full::before {
-  content: "\f240"; }
+.fa-square-pen {
+  --fa: "\f14b"; }
 
-.fa-battery::before {
-  content: "\f240"; }
+.fa-pen-square {
+  --fa: "\f14b"; }
 
-.fa-battery-5::before {
-  content: "\f240"; }
+.fa-pencil-square {
+  --fa: "\f14b"; }
 
-.fa-skull-crossbones::before {
-  content: "\f714"; }
+.fa-suitcase-rolling {
+  --fa: "\f5c1"; }
 
-.fa-code-compare::before {
-  content: "\e13a"; }
+.fa-person-circle-exclamation {
+  --fa: "\e53f"; }
 
-.fa-list-ul::before {
-  content: "\f0ca"; }
+.fa-chevron-down {
+  --fa: "\f078"; }
 
-.fa-list-dots::before {
-  content: "\f0ca"; }
+.fa-battery-full {
+  --fa: "\f240"; }
 
-.fa-school-lock::before {
-  content: "\e56f"; }
+.fa-battery {
+  --fa: "\f240"; }
 
-.fa-tower-cell::before {
-  content: "\e585"; }
+.fa-battery-5 {
+  --fa: "\f240"; }
 
-.fa-down-long::before {
-  content: "\f309"; }
+.fa-skull-crossbones {
+  --fa: "\f714"; }
 
-.fa-long-arrow-alt-down::before {
-  content: "\f309"; }
+.fa-code-compare {
+  --fa: "\e13a"; }
 
-.fa-ranking-star::before {
-  content: "\e561"; }
+.fa-list-ul {
+  --fa: "\f0ca"; }
 
-.fa-chess-king::before {
-  content: "\f43f"; }
+.fa-list-dots {
+  --fa: "\f0ca"; }
 
-.fa-person-harassing::before {
-  content: "\e549"; }
+.fa-school-lock {
+  --fa: "\e56f"; }
 
-.fa-brazilian-real-sign::before {
-  content: "\e46c"; }
+.fa-tower-cell {
+  --fa: "\e585"; }
 
-.fa-landmark-dome::before {
-  content: "\f752"; }
+.fa-down-long {
+  --fa: "\f309"; }
 
-.fa-landmark-alt::before {
-  content: "\f752"; }
+.fa-long-arrow-alt-down {
+  --fa: "\f309"; }
 
-.fa-arrow-up::before {
-  content: "\f062"; }
+.fa-ranking-star {
+  --fa: "\e561"; }
 
-.fa-tv::before {
-  content: "\f26c"; }
+.fa-chess-king {
+  --fa: "\f43f"; }
 
-.fa-television::before {
-  content: "\f26c"; }
+.fa-person-harassing {
+  --fa: "\e549"; }
 
-.fa-tv-alt::before {
-  content: "\f26c"; }
+.fa-brazilian-real-sign {
+  --fa: "\e46c"; }
 
-.fa-shrimp::before {
-  content: "\e448"; }
+.fa-landmark-dome {
+  --fa: "\f752"; }
 
-.fa-list-check::before {
-  content: "\f0ae"; }
+.fa-landmark-alt {
+  --fa: "\f752"; }
 
-.fa-tasks::before {
-  content: "\f0ae"; }
+.fa-arrow-up {
+  --fa: "\f062"; }
 
-.fa-jug-detergent::before {
-  content: "\e519"; }
+.fa-tv {
+  --fa: "\f26c"; }
 
-.fa-circle-user::before {
-  content: "\f2bd"; }
+.fa-television {
+  --fa: "\f26c"; }
 
-.fa-user-circle::before {
-  content: "\f2bd"; }
+.fa-tv-alt {
+  --fa: "\f26c"; }
 
-.fa-user-shield::before {
-  content: "\f505"; }
+.fa-shrimp {
+  --fa: "\e448"; }
 
-.fa-wind::before {
-  content: "\f72e"; }
+.fa-list-check {
+  --fa: "\f0ae"; }
 
-.fa-car-burst::before {
-  content: "\f5e1"; }
+.fa-tasks {
+  --fa: "\f0ae"; }
 
-.fa-car-crash::before {
-  content: "\f5e1"; }
+.fa-jug-detergent {
+  --fa: "\e519"; }
 
-.fa-y::before {
-  content: "\59"; }
+.fa-circle-user {
+  --fa: "\f2bd"; }
 
-.fa-person-snowboarding::before {
-  content: "\f7ce"; }
+.fa-user-circle {
+  --fa: "\f2bd"; }
 
-.fa-snowboarding::before {
-  content: "\f7ce"; }
+.fa-user-shield {
+  --fa: "\f505"; }
 
-.fa-truck-fast::before {
-  content: "\f48b"; }
+.fa-wind {
+  --fa: "\f72e"; }
 
-.fa-shipping-fast::before {
-  content: "\f48b"; }
+.fa-car-burst {
+  --fa: "\f5e1"; }
 
-.fa-fish::before {
-  content: "\f578"; }
+.fa-car-crash {
+  --fa: "\f5e1"; }
 
-.fa-user-graduate::before {
-  content: "\f501"; }
+.fa-y {
+  --fa: "\59"; }
 
-.fa-circle-half-stroke::before {
-  content: "\f042"; }
+.fa-person-snowboarding {
+  --fa: "\f7ce"; }
 
-.fa-adjust::before {
-  content: "\f042"; }
+.fa-snowboarding {
+  --fa: "\f7ce"; }
 
-.fa-clapperboard::before {
-  content: "\e131"; }
+.fa-truck-fast {
+  --fa: "\f48b"; }
 
-.fa-circle-radiation::before {
-  content: "\f7ba"; }
+.fa-shipping-fast {
+  --fa: "\f48b"; }
 
-.fa-radiation-alt::before {
-  content: "\f7ba"; }
+.fa-fish {
+  --fa: "\f578"; }
 
-.fa-baseball::before {
-  content: "\f433"; }
+.fa-user-graduate {
+  --fa: "\f501"; }
 
-.fa-baseball-ball::before {
-  content: "\f433"; }
+.fa-circle-half-stroke {
+  --fa: "\f042"; }
 
-.fa-jet-fighter-up::before {
-  content: "\e518"; }
+.fa-adjust {
+  --fa: "\f042"; }
 
-.fa-diagram-project::before {
-  content: "\f542"; }
+.fa-clapperboard {
+  --fa: "\e131"; }
 
-.fa-project-diagram::before {
-  content: "\f542"; }
+.fa-circle-radiation {
+  --fa: "\f7ba"; }
 
-.fa-copy::before {
-  content: "\f0c5"; }
+.fa-radiation-alt {
+  --fa: "\f7ba"; }
 
-.fa-volume-xmark::before {
-  content: "\f6a9"; }
+.fa-baseball {
+  --fa: "\f433"; }
 
-.fa-volume-mute::before {
-  content: "\f6a9"; }
+.fa-baseball-ball {
+  --fa: "\f433"; }
 
-.fa-volume-times::before {
-  content: "\f6a9"; }
+.fa-jet-fighter-up {
+  --fa: "\e518"; }
 
-.fa-hand-sparkles::before {
-  content: "\e05d"; }
+.fa-diagram-project {
+  --fa: "\f542"; }
 
-.fa-grip::before {
-  content: "\f58d"; }
+.fa-project-diagram {
+  --fa: "\f542"; }
 
-.fa-grip-horizontal::before {
-  content: "\f58d"; }
+.fa-copy {
+  --fa: "\f0c5"; }
 
-.fa-share-from-square::before {
-  content: "\f14d"; }
+.fa-volume-xmark {
+  --fa: "\f6a9"; }
 
-.fa-share-square::before {
-  content: "\f14d"; }
+.fa-volume-mute {
+  --fa: "\f6a9"; }
 
-.fa-child-combatant::before {
-  content: "\e4e0"; }
+.fa-volume-times {
+  --fa: "\f6a9"; }
 
-.fa-child-rifle::before {
-  content: "\e4e0"; }
+.fa-hand-sparkles {
+  --fa: "\e05d"; }
 
-.fa-gun::before {
-  content: "\e19b"; }
+.fa-grip {
+  --fa: "\f58d"; }
 
-.fa-square-phone::before {
-  content: "\f098"; }
+.fa-grip-horizontal {
+  --fa: "\f58d"; }
 
-.fa-phone-square::before {
-  content: "\f098"; }
+.fa-share-from-square {
+  --fa: "\f14d"; }
 
-.fa-plus::before {
-  content: "\2b"; }
+.fa-share-square {
+  --fa: "\f14d"; }
 
-.fa-add::before {
-  content: "\2b"; }
+.fa-child-combatant {
+  --fa: "\e4e0"; }
 
-.fa-expand::before {
-  content: "\f065"; }
+.fa-child-rifle {
+  --fa: "\e4e0"; }
 
-.fa-computer::before {
-  content: "\e4e5"; }
+.fa-gun {
+  --fa: "\e19b"; }
 
-.fa-xmark::before {
-  content: "\f00d"; }
+.fa-square-phone {
+  --fa: "\f098"; }
 
-.fa-close::before {
-  content: "\f00d"; }
+.fa-phone-square {
+  --fa: "\f098"; }
 
-.fa-multiply::before {
-  content: "\f00d"; }
+.fa-plus {
+  --fa: "\2b"; }
 
-.fa-remove::before {
-  content: "\f00d"; }
+.fa-add {
+  --fa: "\2b"; }
 
-.fa-times::before {
-  content: "\f00d"; }
+.fa-expand {
+  --fa: "\f065"; }
 
-.fa-arrows-up-down-left-right::before {
-  content: "\f047"; }
+.fa-computer {
+  --fa: "\e4e5"; }
 
-.fa-arrows::before {
-  content: "\f047"; }
+.fa-xmark {
+  --fa: "\f00d"; }
 
-.fa-chalkboard-user::before {
-  content: "\f51c"; }
+.fa-close {
+  --fa: "\f00d"; }
 
-.fa-chalkboard-teacher::before {
-  content: "\f51c"; }
+.fa-multiply {
+  --fa: "\f00d"; }
 
-.fa-peso-sign::before {
-  content: "\e222"; }
+.fa-remove {
+  --fa: "\f00d"; }
 
-.fa-building-shield::before {
-  content: "\e4d8"; }
+.fa-times {
+  --fa: "\f00d"; }
 
-.fa-baby::before {
-  content: "\f77c"; }
+.fa-arrows-up-down-left-right {
+  --fa: "\f047"; }
 
-.fa-users-line::before {
-  content: "\e592"; }
+.fa-arrows {
+  --fa: "\f047"; }
 
-.fa-quote-left::before {
-  content: "\f10d"; }
+.fa-chalkboard-user {
+  --fa: "\f51c"; }
 
-.fa-quote-left-alt::before {
-  content: "\f10d"; }
+.fa-chalkboard-teacher {
+  --fa: "\f51c"; }
 
-.fa-tractor::before {
-  content: "\f722"; }
+.fa-peso-sign {
+  --fa: "\e222"; }
 
-.fa-trash-arrow-up::before {
-  content: "\f829"; }
+.fa-building-shield {
+  --fa: "\e4d8"; }
 
-.fa-trash-restore::before {
-  content: "\f829"; }
+.fa-baby {
+  --fa: "\f77c"; }
 
-.fa-arrow-down-up-lock::before {
-  content: "\e4b0"; }
+.fa-users-line {
+  --fa: "\e592"; }
 
-.fa-lines-leaning::before {
-  content: "\e51e"; }
+.fa-quote-left {
+  --fa: "\f10d"; }
 
-.fa-ruler-combined::before {
-  content: "\f546"; }
+.fa-quote-left-alt {
+  --fa: "\f10d"; }
 
-.fa-copyright::before {
-  content: "\f1f9"; }
+.fa-tractor {
+  --fa: "\f722"; }
 
-.fa-equals::before {
-  content: "\3d"; }
+.fa-trash-arrow-up {
+  --fa: "\f829"; }
 
-.fa-blender::before {
-  content: "\f517"; }
+.fa-trash-restore {
+  --fa: "\f829"; }
 
-.fa-teeth::before {
-  content: "\f62e"; }
+.fa-arrow-down-up-lock {
+  --fa: "\e4b0"; }
 
-.fa-shekel-sign::before {
-  content: "\f20b"; }
+.fa-lines-leaning {
+  --fa: "\e51e"; }
 
-.fa-ils::before {
-  content: "\f20b"; }
+.fa-ruler-combined {
+  --fa: "\f546"; }
 
-.fa-shekel::before {
-  content: "\f20b"; }
+.fa-copyright {
+  --fa: "\f1f9"; }
 
-.fa-sheqel::before {
-  content: "\f20b"; }
+.fa-equals {
+  --fa: "\3d"; }
 
-.fa-sheqel-sign::before {
-  content: "\f20b"; }
+.fa-blender {
+  --fa: "\f517"; }
 
-.fa-map::before {
-  content: "\f279"; }
+.fa-teeth {
+  --fa: "\f62e"; }
 
-.fa-rocket::before {
-  content: "\f135"; }
+.fa-shekel-sign {
+  --fa: "\f20b"; }
 
-.fa-photo-film::before {
-  content: "\f87c"; }
+.fa-ils {
+  --fa: "\f20b"; }
 
-.fa-photo-video::before {
-  content: "\f87c"; }
+.fa-shekel {
+  --fa: "\f20b"; }
 
-.fa-folder-minus::before {
-  content: "\f65d"; }
+.fa-sheqel {
+  --fa: "\f20b"; }
 
-.fa-store::before {
-  content: "\f54e"; }
+.fa-sheqel-sign {
+  --fa: "\f20b"; }
 
-.fa-arrow-trend-up::before {
-  content: "\e098"; }
+.fa-map {
+  --fa: "\f279"; }
 
-.fa-plug-circle-minus::before {
-  content: "\e55e"; }
+.fa-rocket {
+  --fa: "\f135"; }
 
-.fa-sign-hanging::before {
-  content: "\f4d9"; }
+.fa-photo-film {
+  --fa: "\f87c"; }
 
-.fa-sign::before {
-  content: "\f4d9"; }
+.fa-photo-video {
+  --fa: "\f87c"; }
 
-.fa-bezier-curve::before {
-  content: "\f55b"; }
+.fa-folder-minus {
+  --fa: "\f65d"; }
 
-.fa-bell-slash::before {
-  content: "\f1f6"; }
+.fa-hexagon-nodes-bolt {
+  --fa: "\e69a"; }
 
-.fa-tablet::before {
-  content: "\f3fb"; }
+.fa-store {
+  --fa: "\f54e"; }
 
-.fa-tablet-android::before {
-  content: "\f3fb"; }
+.fa-arrow-trend-up {
+  --fa: "\e098"; }
 
-.fa-school-flag::before {
-  content: "\e56e"; }
+.fa-plug-circle-minus {
+  --fa: "\e55e"; }
 
-.fa-fill::before {
-  content: "\f575"; }
+.fa-sign-hanging {
+  --fa: "\f4d9"; }
 
-.fa-angle-up::before {
-  content: "\f106"; }
+.fa-sign {
+  --fa: "\f4d9"; }
 
-.fa-drumstick-bite::before {
-  content: "\f6d7"; }
+.fa-bezier-curve {
+  --fa: "\f55b"; }
 
-.fa-holly-berry::before {
-  content: "\f7aa"; }
+.fa-bell-slash {
+  --fa: "\f1f6"; }
 
-.fa-chevron-left::before {
-  content: "\f053"; }
+.fa-tablet {
+  --fa: "\f3fb"; }
 
-.fa-bacteria::before {
-  content: "\e059"; }
+.fa-tablet-android {
+  --fa: "\f3fb"; }
 
-.fa-hand-lizard::before {
-  content: "\f258"; }
+.fa-school-flag {
+  --fa: "\e56e"; }
 
-.fa-notdef::before {
-  content: "\e1fe"; }
+.fa-fill {
+  --fa: "\f575"; }
 
-.fa-disease::before {
-  content: "\f7fa"; }
+.fa-angle-up {
+  --fa: "\f106"; }
 
-.fa-briefcase-medical::before {
-  content: "\f469"; }
+.fa-drumstick-bite {
+  --fa: "\f6d7"; }
 
-.fa-genderless::before {
-  content: "\f22d"; }
+.fa-holly-berry {
+  --fa: "\f7aa"; }
 
-.fa-chevron-right::before {
-  content: "\f054"; }
+.fa-chevron-left {
+  --fa: "\f053"; }
 
-.fa-retweet::before {
-  content: "\f079"; }
+.fa-bacteria {
+  --fa: "\e059"; }
 
-.fa-car-rear::before {
-  content: "\f5de"; }
+.fa-hand-lizard {
+  --fa: "\f258"; }
 
-.fa-car-alt::before {
-  content: "\f5de"; }
+.fa-notdef {
+  --fa: "\e1fe"; }
 
-.fa-pump-soap::before {
-  content: "\e06b"; }
+.fa-disease {
+  --fa: "\f7fa"; }
 
-.fa-video-slash::before {
-  content: "\f4e2"; }
+.fa-briefcase-medical {
+  --fa: "\f469"; }
 
-.fa-battery-quarter::before {
-  content: "\f243"; }
+.fa-genderless {
+  --fa: "\f22d"; }
 
-.fa-battery-2::before {
-  content: "\f243"; }
+.fa-chevron-right {
+  --fa: "\f054"; }
 
-.fa-radio::before {
-  content: "\f8d7"; }
+.fa-retweet {
+  --fa: "\f079"; }
 
-.fa-baby-carriage::before {
-  content: "\f77d"; }
+.fa-car-rear {
+  --fa: "\f5de"; }
 
-.fa-carriage-baby::before {
-  content: "\f77d"; }
+.fa-car-alt {
+  --fa: "\f5de"; }
 
-.fa-traffic-light::before {
-  content: "\f637"; }
+.fa-pump-soap {
+  --fa: "\e06b"; }
 
-.fa-thermometer::before {
-  content: "\f491"; }
+.fa-video-slash {
+  --fa: "\f4e2"; }
 
-.fa-vr-cardboard::before {
-  content: "\f729"; }
+.fa-battery-quarter {
+  --fa: "\f243"; }
 
-.fa-hand-middle-finger::before {
-  content: "\f806"; }
+.fa-battery-2 {
+  --fa: "\f243"; }
 
-.fa-percent::before {
-  content: "\25"; }
+.fa-radio {
+  --fa: "\f8d7"; }
 
-.fa-percentage::before {
-  content: "\25"; }
+.fa-baby-carriage {
+  --fa: "\f77d"; }
 
-.fa-truck-moving::before {
-  content: "\f4df"; }
+.fa-carriage-baby {
+  --fa: "\f77d"; }
 
-.fa-glass-water-droplet::before {
-  content: "\e4f5"; }
+.fa-traffic-light {
+  --fa: "\f637"; }
 
-.fa-display::before {
-  content: "\e163"; }
+.fa-thermometer {
+  --fa: "\f491"; }
 
-.fa-face-smile::before {
-  content: "\f118"; }
+.fa-vr-cardboard {
+  --fa: "\f729"; }
 
-.fa-smile::before {
-  content: "\f118"; }
+.fa-hand-middle-finger {
+  --fa: "\f806"; }
 
-.fa-thumbtack::before {
-  content: "\f08d"; }
+.fa-percent {
+  --fa: "\25"; }
 
-.fa-thumb-tack::before {
-  content: "\f08d"; }
+.fa-percentage {
+  --fa: "\25"; }
 
-.fa-trophy::before {
-  content: "\f091"; }
+.fa-truck-moving {
+  --fa: "\f4df"; }
 
-.fa-person-praying::before {
-  content: "\f683"; }
+.fa-glass-water-droplet {
+  --fa: "\e4f5"; }
 
-.fa-pray::before {
-  content: "\f683"; }
+.fa-display {
+  --fa: "\e163"; }
 
-.fa-hammer::before {
-  content: "\f6e3"; }
+.fa-face-smile {
+  --fa: "\f118"; }
 
-.fa-hand-peace::before {
-  content: "\f25b"; }
+.fa-smile {
+  --fa: "\f118"; }
 
-.fa-rotate::before {
-  content: "\f2f1"; }
+.fa-thumbtack {
+  --fa: "\f08d"; }
 
-.fa-sync-alt::before {
-  content: "\f2f1"; }
+.fa-thumb-tack {
+  --fa: "\f08d"; }
 
-.fa-spinner::before {
-  content: "\f110"; }
+.fa-trophy {
+  --fa: "\f091"; }
 
-.fa-robot::before {
-  content: "\f544"; }
+.fa-person-praying {
+  --fa: "\f683"; }
 
-.fa-peace::before {
-  content: "\f67c"; }
+.fa-pray {
+  --fa: "\f683"; }
 
-.fa-gears::before {
-  content: "\f085"; }
+.fa-hammer {
+  --fa: "\f6e3"; }
 
-.fa-cogs::before {
-  content: "\f085"; }
+.fa-hand-peace {
+  --fa: "\f25b"; }
 
-.fa-warehouse::before {
-  content: "\f494"; }
+.fa-rotate {
+  --fa: "\f2f1"; }
 
-.fa-arrow-up-right-dots::before {
-  content: "\e4b7"; }
+.fa-sync-alt {
+  --fa: "\f2f1"; }
 
-.fa-splotch::before {
-  content: "\f5bc"; }
+.fa-spinner {
+  --fa: "\f110"; }
 
-.fa-face-grin-hearts::before {
-  content: "\f584"; }
+.fa-robot {
+  --fa: "\f544"; }
 
-.fa-grin-hearts::before {
-  content: "\f584"; }
+.fa-peace {
+  --fa: "\f67c"; }
 
-.fa-dice-four::before {
-  content: "\f524"; }
+.fa-gears {
+  --fa: "\f085"; }
 
-.fa-sim-card::before {
-  content: "\f7c4"; }
+.fa-cogs {
+  --fa: "\f085"; }
 
-.fa-transgender::before {
-  content: "\f225"; }
+.fa-warehouse {
+  --fa: "\f494"; }
 
-.fa-transgender-alt::before {
-  content: "\f225"; }
+.fa-arrow-up-right-dots {
+  --fa: "\e4b7"; }
 
-.fa-mercury::before {
-  content: "\f223"; }
+.fa-splotch {
+  --fa: "\f5bc"; }
 
-.fa-arrow-turn-down::before {
-  content: "\f149"; }
+.fa-face-grin-hearts {
+  --fa: "\f584"; }
 
-.fa-level-down::before {
-  content: "\f149"; }
+.fa-grin-hearts {
+  --fa: "\f584"; }
 
-.fa-person-falling-burst::before {
-  content: "\e547"; }
+.fa-dice-four {
+  --fa: "\f524"; }
 
-.fa-award::before {
-  content: "\f559"; }
+.fa-sim-card {
+  --fa: "\f7c4"; }
 
-.fa-ticket-simple::before {
-  content: "\f3ff"; }
+.fa-transgender {
+  --fa: "\f225"; }
 
-.fa-ticket-alt::before {
-  content: "\f3ff"; }
+.fa-transgender-alt {
+  --fa: "\f225"; }
 
-.fa-building::before {
-  content: "\f1ad"; }
+.fa-mercury {
+  --fa: "\f223"; }
 
-.fa-angles-left::before {
-  content: "\f100"; }
+.fa-arrow-turn-down {
+  --fa: "\f149"; }
 
-.fa-angle-double-left::before {
-  content: "\f100"; }
+.fa-level-down {
+  --fa: "\f149"; }
 
-.fa-qrcode::before {
-  content: "\f029"; }
+.fa-person-falling-burst {
+  --fa: "\e547"; }
 
-.fa-clock-rotate-left::before {
-  content: "\f1da"; }
+.fa-award {
+  --fa: "\f559"; }
 
-.fa-history::before {
-  content: "\f1da"; }
+.fa-ticket-simple {
+  --fa: "\f3ff"; }
 
-.fa-face-grin-beam-sweat::before {
-  content: "\f583"; }
+.fa-ticket-alt {
+  --fa: "\f3ff"; }
 
-.fa-grin-beam-sweat::before {
-  content: "\f583"; }
+.fa-building {
+  --fa: "\f1ad"; }
 
-.fa-file-export::before {
-  content: "\f56e"; }
+.fa-angles-left {
+  --fa: "\f100"; }
 
-.fa-arrow-right-from-file::before {
-  content: "\f56e"; }
+.fa-angle-double-left {
+  --fa: "\f100"; }
 
-.fa-shield::before {
-  content: "\f132"; }
+.fa-qrcode {
+  --fa: "\f029"; }
 
-.fa-shield-blank::before {
-  content: "\f132"; }
+.fa-clock-rotate-left {
+  --fa: "\f1da"; }
 
-.fa-arrow-up-short-wide::before {
-  content: "\f885"; }
+.fa-history {
+  --fa: "\f1da"; }
 
-.fa-sort-amount-up-alt::before {
-  content: "\f885"; }
+.fa-face-grin-beam-sweat {
+  --fa: "\f583"; }
 
-.fa-house-medical::before {
-  content: "\e3b2"; }
+.fa-grin-beam-sweat {
+  --fa: "\f583"; }
 
-.fa-golf-ball-tee::before {
-  content: "\f450"; }
+.fa-file-export {
+  --fa: "\f56e"; }
 
-.fa-golf-ball::before {
-  content: "\f450"; }
+.fa-arrow-right-from-file {
+  --fa: "\f56e"; }
 
-.fa-circle-chevron-left::before {
-  content: "\f137"; }
+.fa-shield {
+  --fa: "\f132"; }
 
-.fa-chevron-circle-left::before {
-  content: "\f137"; }
+.fa-shield-blank {
+  --fa: "\f132"; }
 
-.fa-house-chimney-window::before {
-  content: "\e00d"; }
+.fa-arrow-up-short-wide {
+  --fa: "\f885"; }
 
-.fa-pen-nib::before {
-  content: "\f5ad"; }
+.fa-sort-amount-up-alt {
+  --fa: "\f885"; }
 
-.fa-tent-arrow-turn-left::before {
-  content: "\e580"; }
+.fa-comment-nodes {
+  --fa: "\e696"; }
 
-.fa-tents::before {
-  content: "\e582"; }
+.fa-house-medical {
+  --fa: "\e3b2"; }
 
-.fa-wand-magic::before {
-  content: "\f0d0"; }
+.fa-golf-ball-tee {
+  --fa: "\f450"; }
 
-.fa-magic::before {
-  content: "\f0d0"; }
+.fa-golf-ball {
+  --fa: "\f450"; }
 
-.fa-dog::before {
-  content: "\f6d3"; }
+.fa-circle-chevron-left {
+  --fa: "\f137"; }
 
-.fa-carrot::before {
-  content: "\f787"; }
+.fa-chevron-circle-left {
+  --fa: "\f137"; }
 
-.fa-moon::before {
-  content: "\f186"; }
+.fa-house-chimney-window {
+  --fa: "\e00d"; }
 
-.fa-wine-glass-empty::before {
-  content: "\f5ce"; }
+.fa-pen-nib {
+  --fa: "\f5ad"; }
 
-.fa-wine-glass-alt::before {
-  content: "\f5ce"; }
+.fa-tent-arrow-turn-left {
+  --fa: "\e580"; }
 
-.fa-cheese::before {
-  content: "\f7ef"; }
+.fa-tents {
+  --fa: "\e582"; }
 
-.fa-yin-yang::before {
-  content: "\f6ad"; }
+.fa-wand-magic {
+  --fa: "\f0d0"; }
 
-.fa-music::before {
-  content: "\f001"; }
+.fa-magic {
+  --fa: "\f0d0"; }
 
-.fa-code-commit::before {
-  content: "\f386"; }
+.fa-dog {
+  --fa: "\f6d3"; }
 
-.fa-temperature-low::before {
-  content: "\f76b"; }
+.fa-carrot {
+  --fa: "\f787"; }
 
-.fa-person-biking::before {
-  content: "\f84a"; }
+.fa-moon {
+  --fa: "\f186"; }
 
-.fa-biking::before {
-  content: "\f84a"; }
+.fa-wine-glass-empty {
+  --fa: "\f5ce"; }
 
-.fa-broom::before {
-  content: "\f51a"; }
+.fa-wine-glass-alt {
+  --fa: "\f5ce"; }
 
-.fa-shield-heart::before {
-  content: "\e574"; }
+.fa-cheese {
+  --fa: "\f7ef"; }
 
-.fa-gopuram::before {
-  content: "\f664"; }
+.fa-yin-yang {
+  --fa: "\f6ad"; }
 
-.fa-earth-oceania::before {
-  content: "\e47b"; }
+.fa-music {
+  --fa: "\f001"; }
 
-.fa-globe-oceania::before {
-  content: "\e47b"; }
+.fa-code-commit {
+  --fa: "\f386"; }
 
-.fa-square-xmark::before {
-  content: "\f2d3"; }
+.fa-temperature-low {
+  --fa: "\f76b"; }
 
-.fa-times-square::before {
-  content: "\f2d3"; }
+.fa-person-biking {
+  --fa: "\f84a"; }
 
-.fa-xmark-square::before {
-  content: "\f2d3"; }
+.fa-biking {
+  --fa: "\f84a"; }
 
-.fa-hashtag::before {
-  content: "\23"; }
+.fa-broom {
+  --fa: "\f51a"; }
 
-.fa-up-right-and-down-left-from-center::before {
-  content: "\f424"; }
+.fa-shield-heart {
+  --fa: "\e574"; }
 
-.fa-expand-alt::before {
-  content: "\f424"; }
+.fa-gopuram {
+  --fa: "\f664"; }
 
-.fa-oil-can::before {
-  content: "\f613"; }
+.fa-earth-oceania {
+  --fa: "\e47b"; }
 
-.fa-t::before {
-  content: "\54"; }
+.fa-globe-oceania {
+  --fa: "\e47b"; }
 
-.fa-hippo::before {
-  content: "\f6ed"; }
+.fa-square-xmark {
+  --fa: "\f2d3"; }
 
-.fa-chart-column::before {
-  content: "\e0e3"; }
+.fa-times-square {
+  --fa: "\f2d3"; }
 
-.fa-infinity::before {
-  content: "\f534"; }
+.fa-xmark-square {
+  --fa: "\f2d3"; }
 
-.fa-vial-circle-check::before {
-  content: "\e596"; }
+.fa-hashtag {
+  --fa: "\23"; }
 
-.fa-person-arrow-down-to-line::before {
-  content: "\e538"; }
+.fa-up-right-and-down-left-from-center {
+  --fa: "\f424"; }
 
-.fa-voicemail::before {
-  content: "\f897"; }
+.fa-expand-alt {
+  --fa: "\f424"; }
 
-.fa-fan::before {
-  content: "\f863"; }
+.fa-oil-can {
+  --fa: "\f613"; }
 
-.fa-person-walking-luggage::before {
-  content: "\e554"; }
+.fa-t {
+  --fa: "\54"; }
 
-.fa-up-down::before {
-  content: "\f338"; }
+.fa-hippo {
+  --fa: "\f6ed"; }
 
-.fa-arrows-alt-v::before {
-  content: "\f338"; }
+.fa-chart-column {
+  --fa: "\e0e3"; }
 
-.fa-cloud-moon-rain::before {
-  content: "\f73c"; }
+.fa-infinity {
+  --fa: "\f534"; }
 
-.fa-calendar::before {
-  content: "\f133"; }
+.fa-vial-circle-check {
+  --fa: "\e596"; }
 
-.fa-trailer::before {
-  content: "\e041"; }
+.fa-person-arrow-down-to-line {
+  --fa: "\e538"; }
 
-.fa-bahai::before {
-  content: "\f666"; }
+.fa-voicemail {
+  --fa: "\f897"; }
 
-.fa-haykal::before {
-  content: "\f666"; }
+.fa-fan {
+  --fa: "\f863"; }
 
-.fa-sd-card::before {
-  content: "\f7c2"; }
+.fa-person-walking-luggage {
+  --fa: "\e554"; }
 
-.fa-dragon::before {
-  content: "\f6d5"; }
+.fa-up-down {
+  --fa: "\f338"; }
 
-.fa-shoe-prints::before {
-  content: "\f54b"; }
+.fa-arrows-alt-v {
+  --fa: "\f338"; }
 
-.fa-circle-plus::before {
-  content: "\f055"; }
+.fa-cloud-moon-rain {
+  --fa: "\f73c"; }
 
-.fa-plus-circle::before {
-  content: "\f055"; }
+.fa-calendar {
+  --fa: "\f133"; }
 
-.fa-face-grin-tongue-wink::before {
-  content: "\f58b"; }
+.fa-trailer {
+  --fa: "\e041"; }
 
-.fa-grin-tongue-wink::before {
-  content: "\f58b"; }
+.fa-bahai {
+  --fa: "\f666"; }
 
-.fa-hand-holding::before {
-  content: "\f4bd"; }
+.fa-haykal {
+  --fa: "\f666"; }
 
-.fa-plug-circle-exclamation::before {
-  content: "\e55d"; }
+.fa-sd-card {
+  --fa: "\f7c2"; }
 
-.fa-link-slash::before {
-  content: "\f127"; }
+.fa-dragon {
+  --fa: "\f6d5"; }
 
-.fa-chain-broken::before {
-  content: "\f127"; }
+.fa-shoe-prints {
+  --fa: "\f54b"; }
 
-.fa-chain-slash::before {
-  content: "\f127"; }
+.fa-circle-plus {
+  --fa: "\f055"; }
 
-.fa-unlink::before {
-  content: "\f127"; }
+.fa-plus-circle {
+  --fa: "\f055"; }
 
-.fa-clone::before {
-  content: "\f24d"; }
+.fa-face-grin-tongue-wink {
+  --fa: "\f58b"; }
 
-.fa-person-walking-arrow-loop-left::before {
-  content: "\e551"; }
+.fa-grin-tongue-wink {
+  --fa: "\f58b"; }
 
-.fa-arrow-up-z-a::before {
-  content: "\f882"; }
+.fa-hand-holding {
+  --fa: "\f4bd"; }
 
-.fa-sort-alpha-up-alt::before {
-  content: "\f882"; }
+.fa-plug-circle-exclamation {
+  --fa: "\e55d"; }
 
-.fa-fire-flame-curved::before {
-  content: "\f7e4"; }
+.fa-link-slash {
+  --fa: "\f127"; }
 
-.fa-fire-alt::before {
-  content: "\f7e4"; }
+.fa-chain-broken {
+  --fa: "\f127"; }
 
-.fa-tornado::before {
-  content: "\f76f"; }
+.fa-chain-slash {
+  --fa: "\f127"; }
 
-.fa-file-circle-plus::before {
-  content: "\e494"; }
+.fa-unlink {
+  --fa: "\f127"; }
 
-.fa-book-quran::before {
-  content: "\f687"; }
+.fa-clone {
+  --fa: "\f24d"; }
 
-.fa-quran::before {
-  content: "\f687"; }
+.fa-person-walking-arrow-loop-left {
+  --fa: "\e551"; }
 
-.fa-anchor::before {
-  content: "\f13d"; }
+.fa-arrow-up-z-a {
+  --fa: "\f882"; }
 
-.fa-border-all::before {
-  content: "\f84c"; }
+.fa-sort-alpha-up-alt {
+  --fa: "\f882"; }
 
-.fa-face-angry::before {
-  content: "\f556"; }
+.fa-fire-flame-curved {
+  --fa: "\f7e4"; }
 
-.fa-angry::before {
-  content: "\f556"; }
+.fa-fire-alt {
+  --fa: "\f7e4"; }
 
-.fa-cookie-bite::before {
-  content: "\f564"; }
+.fa-tornado {
+  --fa: "\f76f"; }
 
-.fa-arrow-trend-down::before {
-  content: "\e097"; }
+.fa-file-circle-plus {
+  --fa: "\e494"; }
 
-.fa-rss::before {
-  content: "\f09e"; }
+.fa-book-quran {
+  --fa: "\f687"; }
 
-.fa-feed::before {
-  content: "\f09e"; }
+.fa-quran {
+  --fa: "\f687"; }
 
-.fa-draw-polygon::before {
-  content: "\f5ee"; }
+.fa-anchor {
+  --fa: "\f13d"; }
 
-.fa-scale-balanced::before {
-  content: "\f24e"; }
+.fa-border-all {
+  --fa: "\f84c"; }
 
-.fa-balance-scale::before {
-  content: "\f24e"; }
+.fa-face-angry {
+  --fa: "\f556"; }
 
-.fa-gauge-simple-high::before {
-  content: "\f62a"; }
+.fa-angry {
+  --fa: "\f556"; }
 
-.fa-tachometer::before {
-  content: "\f62a"; }
+.fa-cookie-bite {
+  --fa: "\f564"; }
 
-.fa-tachometer-fast::before {
-  content: "\f62a"; }
+.fa-arrow-trend-down {
+  --fa: "\e097"; }
 
-.fa-shower::before {
-  content: "\f2cc"; }
+.fa-rss {
+  --fa: "\f09e"; }
 
-.fa-desktop::before {
-  content: "\f390"; }
+.fa-feed {
+  --fa: "\f09e"; }
 
-.fa-desktop-alt::before {
-  content: "\f390"; }
+.fa-draw-polygon {
+  --fa: "\f5ee"; }
 
-.fa-m::before {
-  content: "\4d"; }
+.fa-scale-balanced {
+  --fa: "\f24e"; }
 
-.fa-table-list::before {
-  content: "\f00b"; }
+.fa-balance-scale {
+  --fa: "\f24e"; }
 
-.fa-th-list::before {
-  content: "\f00b"; }
+.fa-gauge-simple-high {
+  --fa: "\f62a"; }
 
-.fa-comment-sms::before {
-  content: "\f7cd"; }
+.fa-tachometer {
+  --fa: "\f62a"; }
 
-.fa-sms::before {
-  content: "\f7cd"; }
+.fa-tachometer-fast {
+  --fa: "\f62a"; }
 
-.fa-book::before {
-  content: "\f02d"; }
+.fa-shower {
+  --fa: "\f2cc"; }
 
-.fa-user-plus::before {
-  content: "\f234"; }
+.fa-desktop {
+  --fa: "\f390"; }
 
-.fa-check::before {
-  content: "\f00c"; }
+.fa-desktop-alt {
+  --fa: "\f390"; }
 
-.fa-battery-three-quarters::before {
-  content: "\f241"; }
+.fa-m {
+  --fa: "\4d"; }
 
-.fa-battery-4::before {
-  content: "\f241"; }
+.fa-table-list {
+  --fa: "\f00b"; }
 
-.fa-house-circle-check::before {
-  content: "\e509"; }
+.fa-th-list {
+  --fa: "\f00b"; }
 
-.fa-angle-left::before {
-  content: "\f104"; }
+.fa-comment-sms {
+  --fa: "\f7cd"; }
 
-.fa-diagram-successor::before {
-  content: "\e47a"; }
+.fa-sms {
+  --fa: "\f7cd"; }
 
-.fa-truck-arrow-right::before {
-  content: "\e58b"; }
+.fa-book {
+  --fa: "\f02d"; }
 
-.fa-arrows-split-up-and-left::before {
-  content: "\e4bc"; }
+.fa-user-plus {
+  --fa: "\f234"; }
 
-.fa-hand-fist::before {
-  content: "\f6de"; }
+.fa-check {
+  --fa: "\f00c"; }
 
-.fa-fist-raised::before {
-  content: "\f6de"; }
+.fa-battery-three-quarters {
+  --fa: "\f241"; }
 
-.fa-cloud-moon::before {
-  content: "\f6c3"; }
+.fa-battery-4 {
+  --fa: "\f241"; }
 
-.fa-briefcase::before {
-  content: "\f0b1"; }
+.fa-house-circle-check {
+  --fa: "\e509"; }
 
-.fa-person-falling::before {
-  content: "\e546"; }
+.fa-angle-left {
+  --fa: "\f104"; }
 
-.fa-image-portrait::before {
-  content: "\f3e0"; }
+.fa-diagram-successor {
+  --fa: "\e47a"; }
 
-.fa-portrait::before {
-  content: "\f3e0"; }
+.fa-truck-arrow-right {
+  --fa: "\e58b"; }
 
-.fa-user-tag::before {
-  content: "\f507"; }
+.fa-arrows-split-up-and-left {
+  --fa: "\e4bc"; }
 
-.fa-rug::before {
-  content: "\e569"; }
+.fa-hand-fist {
+  --fa: "\f6de"; }
 
-.fa-earth-europe::before {
-  content: "\f7a2"; }
+.fa-fist-raised {
+  --fa: "\f6de"; }
 
-.fa-globe-europe::before {
-  content: "\f7a2"; }
+.fa-cloud-moon {
+  --fa: "\f6c3"; }
 
-.fa-cart-flatbed-suitcase::before {
-  content: "\f59d"; }
+.fa-briefcase {
+  --fa: "\f0b1"; }
 
-.fa-luggage-cart::before {
-  content: "\f59d"; }
+.fa-person-falling {
+  --fa: "\e546"; }
 
-.fa-rectangle-xmark::before {
-  content: "\f410"; }
+.fa-image-portrait {
+  --fa: "\f3e0"; }
 
-.fa-rectangle-times::before {
-  content: "\f410"; }
+.fa-portrait {
+  --fa: "\f3e0"; }
 
-.fa-times-rectangle::before {
-  content: "\f410"; }
+.fa-user-tag {
+  --fa: "\f507"; }
 
-.fa-window-close::before {
-  content: "\f410"; }
+.fa-rug {
+  --fa: "\e569"; }
 
-.fa-baht-sign::before {
-  content: "\e0ac"; }
+.fa-earth-europe {
+  --fa: "\f7a2"; }
 
-.fa-book-open::before {
-  content: "\f518"; }
+.fa-globe-europe {
+  --fa: "\f7a2"; }
 
-.fa-book-journal-whills::before {
-  content: "\f66a"; }
+.fa-cart-flatbed-suitcase {
+  --fa: "\f59d"; }
 
-.fa-journal-whills::before {
-  content: "\f66a"; }
+.fa-luggage-cart {
+  --fa: "\f59d"; }
 
-.fa-handcuffs::before {
-  content: "\e4f8"; }
+.fa-rectangle-xmark {
+  --fa: "\f410"; }
 
-.fa-triangle-exclamation::before {
-  content: "\f071"; }
+.fa-rectangle-times {
+  --fa: "\f410"; }
 
-.fa-exclamation-triangle::before {
-  content: "\f071"; }
+.fa-times-rectangle {
+  --fa: "\f410"; }
 
-.fa-warning::before {
-  content: "\f071"; }
+.fa-window-close {
+  --fa: "\f410"; }
 
-.fa-database::before {
-  content: "\f1c0"; }
+.fa-baht-sign {
+  --fa: "\e0ac"; }
 
-.fa-share::before {
-  content: "\f064"; }
+.fa-book-open {
+  --fa: "\f518"; }
 
-.fa-mail-forward::before {
-  content: "\f064"; }
+.fa-book-journal-whills {
+  --fa: "\f66a"; }
 
-.fa-bottle-droplet::before {
-  content: "\e4c4"; }
+.fa-journal-whills {
+  --fa: "\f66a"; }
 
-.fa-mask-face::before {
-  content: "\e1d7"; }
+.fa-handcuffs {
+  --fa: "\e4f8"; }
 
-.fa-hill-rockslide::before {
-  content: "\e508"; }
+.fa-triangle-exclamation {
+  --fa: "\f071"; }
 
-.fa-right-left::before {
-  content: "\f362"; }
+.fa-exclamation-triangle {
+  --fa: "\f071"; }
 
-.fa-exchange-alt::before {
-  content: "\f362"; }
+.fa-warning {
+  --fa: "\f071"; }
 
-.fa-paper-plane::before {
-  content: "\f1d8"; }
+.fa-database {
+  --fa: "\f1c0"; }
 
-.fa-road-circle-exclamation::before {
-  content: "\e565"; }
+.fa-share {
+  --fa: "\f064"; }
 
-.fa-dungeon::before {
-  content: "\f6d9"; }
+.fa-mail-forward {
+  --fa: "\f064"; }
 
-.fa-align-right::before {
-  content: "\f038"; }
+.fa-bottle-droplet {
+  --fa: "\e4c4"; }
 
-.fa-money-bill-1-wave::before {
-  content: "\f53b"; }
+.fa-mask-face {
+  --fa: "\e1d7"; }
 
-.fa-money-bill-wave-alt::before {
-  content: "\f53b"; }
+.fa-hill-rockslide {
+  --fa: "\e508"; }
 
-.fa-life-ring::before {
-  content: "\f1cd"; }
+.fa-right-left {
+  --fa: "\f362"; }
 
-.fa-hands::before {
-  content: "\f2a7"; }
+.fa-exchange-alt {
+  --fa: "\f362"; }
 
-.fa-sign-language::before {
-  content: "\f2a7"; }
+.fa-paper-plane {
+  --fa: "\f1d8"; }
 
-.fa-signing::before {
-  content: "\f2a7"; }
+.fa-road-circle-exclamation {
+  --fa: "\e565"; }
 
-.fa-calendar-day::before {
-  content: "\f783"; }
+.fa-dungeon {
+  --fa: "\f6d9"; }
 
-.fa-water-ladder::before {
-  content: "\f5c5"; }
+.fa-align-right {
+  --fa: "\f038"; }
 
-.fa-ladder-water::before {
-  content: "\f5c5"; }
+.fa-money-bill-1-wave {
+  --fa: "\f53b"; }
 
-.fa-swimming-pool::before {
-  content: "\f5c5"; }
+.fa-money-bill-wave-alt {
+  --fa: "\f53b"; }
 
-.fa-arrows-up-down::before {
-  content: "\f07d"; }
+.fa-life-ring {
+  --fa: "\f1cd"; }
 
-.fa-arrows-v::before {
-  content: "\f07d"; }
+.fa-hands {
+  --fa: "\f2a7"; }
 
-.fa-face-grimace::before {
-  content: "\f57f"; }
+.fa-sign-language {
+  --fa: "\f2a7"; }
 
-.fa-grimace::before {
-  content: "\f57f"; }
+.fa-signing {
+  --fa: "\f2a7"; }
 
-.fa-wheelchair-move::before {
-  content: "\e2ce"; }
+.fa-calendar-day {
+  --fa: "\f783"; }
 
-.fa-wheelchair-alt::before {
-  content: "\e2ce"; }
+.fa-water-ladder {
+  --fa: "\f5c5"; }
 
-.fa-turn-down::before {
-  content: "\f3be"; }
+.fa-ladder-water {
+  --fa: "\f5c5"; }
 
-.fa-level-down-alt::before {
-  content: "\f3be"; }
+.fa-swimming-pool {
+  --fa: "\f5c5"; }
 
-.fa-person-walking-arrow-right::before {
-  content: "\e552"; }
+.fa-arrows-up-down {
+  --fa: "\f07d"; }
 
-.fa-square-envelope::before {
-  content: "\f199"; }
+.fa-arrows-v {
+  --fa: "\f07d"; }
 
-.fa-envelope-square::before {
-  content: "\f199"; }
+.fa-face-grimace {
+  --fa: "\f57f"; }
 
-.fa-dice::before {
-  content: "\f522"; }
+.fa-grimace {
+  --fa: "\f57f"; }
 
-.fa-bowling-ball::before {
-  content: "\f436"; }
+.fa-wheelchair-move {
+  --fa: "\e2ce"; }
 
-.fa-brain::before {
-  content: "\f5dc"; }
+.fa-wheelchair-alt {
+  --fa: "\e2ce"; }
 
-.fa-bandage::before {
-  content: "\f462"; }
+.fa-turn-down {
+  --fa: "\f3be"; }
 
-.fa-band-aid::before {
-  content: "\f462"; }
+.fa-level-down-alt {
+  --fa: "\f3be"; }
 
-.fa-calendar-minus::before {
-  content: "\f272"; }
+.fa-person-walking-arrow-right {
+  --fa: "\e552"; }
 
-.fa-circle-xmark::before {
-  content: "\f057"; }
+.fa-square-envelope {
+  --fa: "\f199"; }
 
-.fa-times-circle::before {
-  content: "\f057"; }
+.fa-envelope-square {
+  --fa: "\f199"; }
 
-.fa-xmark-circle::before {
-  content: "\f057"; }
+.fa-dice {
+  --fa: "\f522"; }
 
-.fa-gifts::before {
-  content: "\f79c"; }
+.fa-bowling-ball {
+  --fa: "\f436"; }
 
-.fa-hotel::before {
-  content: "\f594"; }
+.fa-brain {
+  --fa: "\f5dc"; }
 
-.fa-earth-asia::before {
-  content: "\f57e"; }
+.fa-bandage {
+  --fa: "\f462"; }
 
-.fa-globe-asia::before {
-  content: "\f57e"; }
+.fa-band-aid {
+  --fa: "\f462"; }
 
-.fa-id-card-clip::before {
-  content: "\f47f"; }
+.fa-calendar-minus {
+  --fa: "\f272"; }
 
-.fa-id-card-alt::before {
-  content: "\f47f"; }
+.fa-circle-xmark {
+  --fa: "\f057"; }
 
-.fa-magnifying-glass-plus::before {
-  content: "\f00e"; }
+.fa-times-circle {
+  --fa: "\f057"; }
 
-.fa-search-plus::before {
-  content: "\f00e"; }
+.fa-xmark-circle {
+  --fa: "\f057"; }
 
-.fa-thumbs-up::before {
-  content: "\f164"; }
+.fa-gifts {
+  --fa: "\f79c"; }
 
-.fa-user-clock::before {
-  content: "\f4fd"; }
+.fa-hotel {
+  --fa: "\f594"; }
 
-.fa-hand-dots::before {
-  content: "\f461"; }
+.fa-earth-asia {
+  --fa: "\f57e"; }
 
-.fa-allergies::before {
-  content: "\f461"; }
+.fa-globe-asia {
+  --fa: "\f57e"; }
 
-.fa-file-invoice::before {
-  content: "\f570"; }
+.fa-id-card-clip {
+  --fa: "\f47f"; }
 
-.fa-window-minimize::before {
-  content: "\f2d1"; }
+.fa-id-card-alt {
+  --fa: "\f47f"; }
 
-.fa-mug-saucer::before {
-  content: "\f0f4"; }
+.fa-magnifying-glass-plus {
+  --fa: "\f00e"; }
 
-.fa-coffee::before {
-  content: "\f0f4"; }
+.fa-search-plus {
+  --fa: "\f00e"; }
 
-.fa-brush::before {
-  content: "\f55d"; }
+.fa-thumbs-up {
+  --fa: "\f164"; }
 
-.fa-mask::before {
-  content: "\f6fa"; }
+.fa-user-clock {
+  --fa: "\f4fd"; }
 
-.fa-magnifying-glass-minus::before {
-  content: "\f010"; }
+.fa-hand-dots {
+  --fa: "\f461"; }
 
-.fa-search-minus::before {
-  content: "\f010"; }
+.fa-allergies {
+  --fa: "\f461"; }
 
-.fa-ruler-vertical::before {
-  content: "\f548"; }
+.fa-file-invoice {
+  --fa: "\f570"; }
 
-.fa-user-large::before {
-  content: "\f406"; }
+.fa-window-minimize {
+  --fa: "\f2d1"; }
 
-.fa-user-alt::before {
-  content: "\f406"; }
+.fa-mug-saucer {
+  --fa: "\f0f4"; }
 
-.fa-train-tram::before {
-  content: "\e5b4"; }
+.fa-coffee {
+  --fa: "\f0f4"; }
 
-.fa-user-nurse::before {
-  content: "\f82f"; }
+.fa-brush {
+  --fa: "\f55d"; }
 
-.fa-syringe::before {
-  content: "\f48e"; }
+.fa-file-half-dashed {
+  --fa: "\e698"; }
 
-.fa-cloud-sun::before {
-  content: "\f6c4"; }
+.fa-mask {
+  --fa: "\f6fa"; }
 
-.fa-stopwatch-20::before {
-  content: "\e06f"; }
+.fa-magnifying-glass-minus {
+  --fa: "\f010"; }
 
-.fa-square-full::before {
-  content: "\f45c"; }
+.fa-search-minus {
+  --fa: "\f010"; }
 
-.fa-magnet::before {
-  content: "\f076"; }
+.fa-ruler-vertical {
+  --fa: "\f548"; }
 
-.fa-jar::before {
-  content: "\e516"; }
+.fa-user-large {
+  --fa: "\f406"; }
 
-.fa-note-sticky::before {
-  content: "\f249"; }
+.fa-user-alt {
+  --fa: "\f406"; }
 
-.fa-sticky-note::before {
-  content: "\f249"; }
+.fa-train-tram {
+  --fa: "\e5b4"; }
 
-.fa-bug-slash::before {
-  content: "\e490"; }
+.fa-user-nurse {
+  --fa: "\f82f"; }
 
-.fa-arrow-up-from-water-pump::before {
-  content: "\e4b6"; }
+.fa-syringe {
+  --fa: "\f48e"; }
 
-.fa-bone::before {
-  content: "\f5d7"; }
+.fa-cloud-sun {
+  --fa: "\f6c4"; }
 
-.fa-user-injured::before {
-  content: "\f728"; }
+.fa-stopwatch-20 {
+  --fa: "\e06f"; }
 
-.fa-face-sad-tear::before {
-  content: "\f5b4"; }
+.fa-square-full {
+  --fa: "\f45c"; }
 
-.fa-sad-tear::before {
-  content: "\f5b4"; }
+.fa-magnet {
+  --fa: "\f076"; }
 
-.fa-plane::before {
-  content: "\f072"; }
+.fa-jar {
+  --fa: "\e516"; }
 
-.fa-tent-arrows-down::before {
-  content: "\e581"; }
+.fa-note-sticky {
+  --fa: "\f249"; }
 
-.fa-exclamation::before {
-  content: "\21"; }
+.fa-sticky-note {
+  --fa: "\f249"; }
 
-.fa-arrows-spin::before {
-  content: "\e4bb"; }
+.fa-bug-slash {
+  --fa: "\e490"; }
 
-.fa-print::before {
-  content: "\f02f"; }
+.fa-arrow-up-from-water-pump {
+  --fa: "\e4b6"; }
 
-.fa-turkish-lira-sign::before {
-  content: "\e2bb"; }
+.fa-bone {
+  --fa: "\f5d7"; }
 
-.fa-try::before {
-  content: "\e2bb"; }
+.fa-table-cells-row-unlock {
+  --fa: "\e691"; }
 
-.fa-turkish-lira::before {
-  content: "\e2bb"; }
+.fa-user-injured {
+  --fa: "\f728"; }
 
-.fa-dollar-sign::before {
-  content: "\24"; }
+.fa-face-sad-tear {
+  --fa: "\f5b4"; }
 
-.fa-dollar::before {
-  content: "\24"; }
+.fa-sad-tear {
+  --fa: "\f5b4"; }
 
-.fa-usd::before {
-  content: "\24"; }
+.fa-plane {
+  --fa: "\f072"; }
 
-.fa-x::before {
-  content: "\58"; }
+.fa-tent-arrows-down {
+  --fa: "\e581"; }
 
-.fa-magnifying-glass-dollar::before {
-  content: "\f688"; }
+.fa-exclamation {
+  --fa: "\21"; }
 
-.fa-search-dollar::before {
-  content: "\f688"; }
+.fa-arrows-spin {
+  --fa: "\e4bb"; }
 
-.fa-users-gear::before {
-  content: "\f509"; }
+.fa-print {
+  --fa: "\f02f"; }
 
-.fa-users-cog::before {
-  content: "\f509"; }
+.fa-turkish-lira-sign {
+  --fa: "\e2bb"; }
 
-.fa-person-military-pointing::before {
-  content: "\e54a"; }
+.fa-try {
+  --fa: "\e2bb"; }
 
-.fa-building-columns::before {
-  content: "\f19c"; }
+.fa-turkish-lira {
+  --fa: "\e2bb"; }
 
-.fa-bank::before {
-  content: "\f19c"; }
+.fa-dollar-sign {
+  --fa: "\24"; }
 
-.fa-institution::before {
-  content: "\f19c"; }
+.fa-dollar {
+  --fa: "\24"; }
 
-.fa-museum::before {
-  content: "\f19c"; }
+.fa-usd {
+  --fa: "\24"; }
 
-.fa-university::before {
-  content: "\f19c"; }
+.fa-x {
+  --fa: "\58"; }
 
-.fa-umbrella::before {
-  content: "\f0e9"; }
+.fa-magnifying-glass-dollar {
+  --fa: "\f688"; }
 
-.fa-trowel::before {
-  content: "\e589"; }
+.fa-search-dollar {
+  --fa: "\f688"; }
 
-.fa-d::before {
-  content: "\44"; }
+.fa-users-gear {
+  --fa: "\f509"; }
 
-.fa-stapler::before {
-  content: "\e5af"; }
+.fa-users-cog {
+  --fa: "\f509"; }
 
-.fa-masks-theater::before {
-  content: "\f630"; }
+.fa-person-military-pointing {
+  --fa: "\e54a"; }
 
-.fa-theater-masks::before {
-  content: "\f630"; }
+.fa-building-columns {
+  --fa: "\f19c"; }
 
-.fa-kip-sign::before {
-  content: "\e1c4"; }
+.fa-bank {
+  --fa: "\f19c"; }
 
-.fa-hand-point-left::before {
-  content: "\f0a5"; }
+.fa-institution {
+  --fa: "\f19c"; }
 
-.fa-handshake-simple::before {
-  content: "\f4c6"; }
+.fa-museum {
+  --fa: "\f19c"; }
 
-.fa-handshake-alt::before {
-  content: "\f4c6"; }
+.fa-university {
+  --fa: "\f19c"; }
 
-.fa-jet-fighter::before {
-  content: "\f0fb"; }
+.fa-umbrella {
+  --fa: "\f0e9"; }
 
-.fa-fighter-jet::before {
-  content: "\f0fb"; }
+.fa-trowel {
+  --fa: "\e589"; }
 
-.fa-square-share-nodes::before {
-  content: "\f1e1"; }
+.fa-d {
+  --fa: "\44"; }
 
-.fa-share-alt-square::before {
-  content: "\f1e1"; }
+.fa-stapler {
+  --fa: "\e5af"; }
 
-.fa-barcode::before {
-  content: "\f02a"; }
+.fa-masks-theater {
+  --fa: "\f630"; }
 
-.fa-plus-minus::before {
-  content: "\e43c"; }
+.fa-theater-masks {
+  --fa: "\f630"; }
 
-.fa-video::before {
-  content: "\f03d"; }
+.fa-kip-sign {
+  --fa: "\e1c4"; }
 
-.fa-video-camera::before {
-  content: "\f03d"; }
+.fa-hand-point-left {
+  --fa: "\f0a5"; }
 
-.fa-graduation-cap::before {
-  content: "\f19d"; }
+.fa-handshake-simple {
+  --fa: "\f4c6"; }
 
-.fa-mortar-board::before {
-  content: "\f19d"; }
+.fa-handshake-alt {
+  --fa: "\f4c6"; }
 
-.fa-hand-holding-medical::before {
-  content: "\e05c"; }
+.fa-jet-fighter {
+  --fa: "\f0fb"; }
 
-.fa-person-circle-check::before {
-  content: "\e53e"; }
+.fa-fighter-jet {
+  --fa: "\f0fb"; }
 
-.fa-turn-up::before {
-  content: "\f3bf"; }
+.fa-square-share-nodes {
+  --fa: "\f1e1"; }
 
-.fa-level-up-alt::before {
-  content: "\f3bf"; }
+.fa-share-alt-square {
+  --fa: "\f1e1"; }
+
+.fa-barcode {
+  --fa: "\f02a"; }
+
+.fa-plus-minus {
+  --fa: "\e43c"; }
+
+.fa-video {
+  --fa: "\f03d"; }
+
+.fa-video-camera {
+  --fa: "\f03d"; }
+
+.fa-graduation-cap {
+  --fa: "\f19d"; }
+
+.fa-mortar-board {
+  --fa: "\f19d"; }
+
+.fa-hand-holding-medical {
+  --fa: "\e05c"; }
+
+.fa-person-circle-check {
+  --fa: "\e53e"; }
+
+.fa-turn-up {
+  --fa: "\f3bf"; }
+
+.fa-level-up-alt {
+  --fa: "\f3bf"; }
 
 .sr-only,
 .fa-sr-only {
@@ -13222,1580 +13090,1595 @@ readers do not read off random characters that represent icons */
 .fa-brands {
   font-weight: 400; }
 
-.fa-monero:before {
-  content: "\f3d0"; }
+.fa-monero {
+  --fa: "\f3d0"; }
 
-.fa-hooli:before {
-  content: "\f427"; }
+.fa-hooli {
+  --fa: "\f427"; }
 
-.fa-yelp:before {
-  content: "\f1e9"; }
+.fa-yelp {
+  --fa: "\f1e9"; }
 
-.fa-cc-visa:before {
-  content: "\f1f0"; }
+.fa-cc-visa {
+  --fa: "\f1f0"; }
 
-.fa-lastfm:before {
-  content: "\f202"; }
+.fa-lastfm {
+  --fa: "\f202"; }
 
-.fa-shopware:before {
-  content: "\f5b5"; }
+.fa-shopware {
+  --fa: "\f5b5"; }
 
-.fa-creative-commons-nc:before {
-  content: "\f4e8"; }
+.fa-creative-commons-nc {
+  --fa: "\f4e8"; }
 
-.fa-aws:before {
-  content: "\f375"; }
+.fa-aws {
+  --fa: "\f375"; }
 
-.fa-redhat:before {
-  content: "\f7bc"; }
+.fa-redhat {
+  --fa: "\f7bc"; }
 
-.fa-yoast:before {
-  content: "\f2b1"; }
+.fa-yoast {
+  --fa: "\f2b1"; }
 
-.fa-cloudflare:before {
-  content: "\e07d"; }
+.fa-cloudflare {
+  --fa: "\e07d"; }
 
-.fa-ups:before {
-  content: "\f7e0"; }
+.fa-ups {
+  --fa: "\f7e0"; }
 
-.fa-pixiv:before {
-  content: "\e640"; }
+.fa-pixiv {
+  --fa: "\e640"; }
 
-.fa-wpexplorer:before {
-  content: "\f2de"; }
+.fa-wpexplorer {
+  --fa: "\f2de"; }
 
-.fa-dyalog:before {
-  content: "\f399"; }
+.fa-dyalog {
+  --fa: "\f399"; }
 
-.fa-bity:before {
-  content: "\f37a"; }
+.fa-bity {
+  --fa: "\f37a"; }
 
-.fa-stackpath:before {
-  content: "\f842"; }
+.fa-stackpath {
+  --fa: "\f842"; }
 
-.fa-buysellads:before {
-  content: "\f20d"; }
+.fa-buysellads {
+  --fa: "\f20d"; }
 
-.fa-first-order:before {
-  content: "\f2b0"; }
+.fa-first-order {
+  --fa: "\f2b0"; }
 
-.fa-modx:before {
-  content: "\f285"; }
+.fa-modx {
+  --fa: "\f285"; }
 
-.fa-guilded:before {
-  content: "\e07e"; }
+.fa-guilded {
+  --fa: "\e07e"; }
 
-.fa-vnv:before {
-  content: "\f40b"; }
+.fa-vnv {
+  --fa: "\f40b"; }
 
-.fa-square-js:before {
-  content: "\f3b9"; }
+.fa-square-js {
+  --fa: "\f3b9"; }
 
-.fa-js-square:before {
-  content: "\f3b9"; }
+.fa-js-square {
+  --fa: "\f3b9"; }
 
-.fa-microsoft:before {
-  content: "\f3ca"; }
+.fa-microsoft {
+  --fa: "\f3ca"; }
 
-.fa-qq:before {
-  content: "\f1d6"; }
+.fa-qq {
+  --fa: "\f1d6"; }
 
-.fa-orcid:before {
-  content: "\f8d2"; }
+.fa-orcid {
+  --fa: "\f8d2"; }
 
-.fa-java:before {
-  content: "\f4e4"; }
+.fa-java {
+  --fa: "\f4e4"; }
 
-.fa-invision:before {
-  content: "\f7b0"; }
+.fa-invision {
+  --fa: "\f7b0"; }
 
-.fa-creative-commons-pd-alt:before {
-  content: "\f4ed"; }
+.fa-creative-commons-pd-alt {
+  --fa: "\f4ed"; }
 
-.fa-centercode:before {
-  content: "\f380"; }
+.fa-centercode {
+  --fa: "\f380"; }
 
-.fa-glide-g:before {
-  content: "\f2a6"; }
+.fa-glide-g {
+  --fa: "\f2a6"; }
 
-.fa-drupal:before {
-  content: "\f1a9"; }
+.fa-drupal {
+  --fa: "\f1a9"; }
 
-.fa-jxl:before {
-  content: "\e67b"; }
+.fa-jxl {
+  --fa: "\e67b"; }
 
-.fa-hire-a-helper:before {
-  content: "\f3b0"; }
+.fa-dart-lang {
+  --fa: "\e693"; }
 
-.fa-creative-commons-by:before {
-  content: "\f4e7"; }
+.fa-hire-a-helper {
+  --fa: "\f3b0"; }
 
-.fa-unity:before {
-  content: "\e049"; }
+.fa-creative-commons-by {
+  --fa: "\f4e7"; }
 
-.fa-whmcs:before {
-  content: "\f40d"; }
+.fa-unity {
+  --fa: "\e049"; }
 
-.fa-rocketchat:before {
-  content: "\f3e8"; }
+.fa-whmcs {
+  --fa: "\f40d"; }
 
-.fa-vk:before {
-  content: "\f189"; }
+.fa-rocketchat {
+  --fa: "\f3e8"; }
 
-.fa-untappd:before {
-  content: "\f405"; }
+.fa-vk {
+  --fa: "\f189"; }
 
-.fa-mailchimp:before {
-  content: "\f59e"; }
+.fa-untappd {
+  --fa: "\f405"; }
 
-.fa-css3-alt:before {
-  content: "\f38b"; }
+.fa-mailchimp {
+  --fa: "\f59e"; }
 
-.fa-square-reddit:before {
-  content: "\f1a2"; }
+.fa-css3-alt {
+  --fa: "\f38b"; }
 
-.fa-reddit-square:before {
-  content: "\f1a2"; }
+.fa-square-reddit {
+  --fa: "\f1a2"; }
 
-.fa-vimeo-v:before {
-  content: "\f27d"; }
+.fa-reddit-square {
+  --fa: "\f1a2"; }
 
-.fa-contao:before {
-  content: "\f26d"; }
+.fa-vimeo-v {
+  --fa: "\f27d"; }
 
-.fa-square-font-awesome:before {
-  content: "\e5ad"; }
+.fa-contao {
+  --fa: "\f26d"; }
 
-.fa-deskpro:before {
-  content: "\f38f"; }
+.fa-square-font-awesome {
+  --fa: "\e5ad"; }
 
-.fa-brave:before {
-  content: "\e63c"; }
+.fa-deskpro {
+  --fa: "\f38f"; }
 
-.fa-sistrix:before {
-  content: "\f3ee"; }
+.fa-brave {
+  --fa: "\e63c"; }
 
-.fa-square-instagram:before {
-  content: "\e055"; }
+.fa-sistrix {
+  --fa: "\f3ee"; }
 
-.fa-instagram-square:before {
-  content: "\e055"; }
+.fa-square-instagram {
+  --fa: "\e055"; }
 
-.fa-battle-net:before {
-  content: "\f835"; }
+.fa-instagram-square {
+  --fa: "\e055"; }
 
-.fa-the-red-yeti:before {
-  content: "\f69d"; }
+.fa-battle-net {
+  --fa: "\f835"; }
 
-.fa-square-hacker-news:before {
-  content: "\f3af"; }
+.fa-the-red-yeti {
+  --fa: "\f69d"; }
 
-.fa-hacker-news-square:before {
-  content: "\f3af"; }
+.fa-square-hacker-news {
+  --fa: "\f3af"; }
 
-.fa-edge:before {
-  content: "\f282"; }
+.fa-hacker-news-square {
+  --fa: "\f3af"; }
 
-.fa-threads:before {
-  content: "\e618"; }
+.fa-edge {
+  --fa: "\f282"; }
 
-.fa-napster:before {
-  content: "\f3d2"; }
+.fa-threads {
+  --fa: "\e618"; }
 
-.fa-square-snapchat:before {
-  content: "\f2ad"; }
+.fa-napster {
+  --fa: "\f3d2"; }
 
-.fa-snapchat-square:before {
-  content: "\f2ad"; }
+.fa-square-snapchat {
+  --fa: "\f2ad"; }
 
-.fa-google-plus-g:before {
-  content: "\f0d5"; }
+.fa-snapchat-square {
+  --fa: "\f2ad"; }
 
-.fa-artstation:before {
-  content: "\f77a"; }
+.fa-google-plus-g {
+  --fa: "\f0d5"; }
 
-.fa-markdown:before {
-  content: "\f60f"; }
+.fa-artstation {
+  --fa: "\f77a"; }
 
-.fa-sourcetree:before {
-  content: "\f7d3"; }
+.fa-markdown {
+  --fa: "\f60f"; }
 
-.fa-google-plus:before {
-  content: "\f2b3"; }
+.fa-sourcetree {
+  --fa: "\f7d3"; }
 
-.fa-diaspora:before {
-  content: "\f791"; }
+.fa-google-plus {
+  --fa: "\f2b3"; }
 
-.fa-foursquare:before {
-  content: "\f180"; }
+.fa-diaspora {
+  --fa: "\f791"; }
 
-.fa-stack-overflow:before {
-  content: "\f16c"; }
+.fa-foursquare {
+  --fa: "\f180"; }
 
-.fa-github-alt:before {
-  content: "\f113"; }
+.fa-stack-overflow {
+  --fa: "\f16c"; }
 
-.fa-phoenix-squadron:before {
-  content: "\f511"; }
+.fa-github-alt {
+  --fa: "\f113"; }
 
-.fa-pagelines:before {
-  content: "\f18c"; }
+.fa-phoenix-squadron {
+  --fa: "\f511"; }
 
-.fa-algolia:before {
-  content: "\f36c"; }
+.fa-pagelines {
+  --fa: "\f18c"; }
 
-.fa-red-river:before {
-  content: "\f3e3"; }
+.fa-algolia {
+  --fa: "\f36c"; }
 
-.fa-creative-commons-sa:before {
-  content: "\f4ef"; }
+.fa-red-river {
+  --fa: "\f3e3"; }
 
-.fa-safari:before {
-  content: "\f267"; }
+.fa-creative-commons-sa {
+  --fa: "\f4ef"; }
 
-.fa-google:before {
-  content: "\f1a0"; }
+.fa-safari {
+  --fa: "\f267"; }
 
-.fa-square-font-awesome-stroke:before {
-  content: "\f35c"; }
+.fa-google {
+  --fa: "\f1a0"; }
 
-.fa-font-awesome-alt:before {
-  content: "\f35c"; }
+.fa-square-font-awesome-stroke {
+  --fa: "\f35c"; }
 
-.fa-atlassian:before {
-  content: "\f77b"; }
+.fa-font-awesome-alt {
+  --fa: "\f35c"; }
 
-.fa-linkedin-in:before {
-  content: "\f0e1"; }
+.fa-atlassian {
+  --fa: "\f77b"; }
 
-.fa-digital-ocean:before {
-  content: "\f391"; }
+.fa-linkedin-in {
+  --fa: "\f0e1"; }
 
-.fa-nimblr:before {
-  content: "\f5a8"; }
+.fa-digital-ocean {
+  --fa: "\f391"; }
 
-.fa-chromecast:before {
-  content: "\f838"; }
+.fa-nimblr {
+  --fa: "\f5a8"; }
 
-.fa-evernote:before {
-  content: "\f839"; }
+.fa-chromecast {
+  --fa: "\f838"; }
 
-.fa-hacker-news:before {
-  content: "\f1d4"; }
+.fa-evernote {
+  --fa: "\f839"; }
 
-.fa-creative-commons-sampling:before {
-  content: "\f4f0"; }
+.fa-hacker-news {
+  --fa: "\f1d4"; }
 
-.fa-adversal:before {
-  content: "\f36a"; }
+.fa-creative-commons-sampling {
+  --fa: "\f4f0"; }
 
-.fa-creative-commons:before {
-  content: "\f25e"; }
+.fa-adversal {
+  --fa: "\f36a"; }
 
-.fa-watchman-monitoring:before {
-  content: "\e087"; }
+.fa-creative-commons {
+  --fa: "\f25e"; }
 
-.fa-fonticons:before {
-  content: "\f280"; }
+.fa-watchman-monitoring {
+  --fa: "\e087"; }
 
-.fa-weixin:before {
-  content: "\f1d7"; }
+.fa-fonticons {
+  --fa: "\f280"; }
 
-.fa-shirtsinbulk:before {
-  content: "\f214"; }
+.fa-weixin {
+  --fa: "\f1d7"; }
 
-.fa-codepen:before {
-  content: "\f1cb"; }
+.fa-shirtsinbulk {
+  --fa: "\f214"; }
 
-.fa-git-alt:before {
-  content: "\f841"; }
+.fa-codepen {
+  --fa: "\f1cb"; }
 
-.fa-lyft:before {
-  content: "\f3c3"; }
+.fa-git-alt {
+  --fa: "\f841"; }
 
-.fa-rev:before {
-  content: "\f5b2"; }
+.fa-lyft {
+  --fa: "\f3c3"; }
 
-.fa-windows:before {
-  content: "\f17a"; }
+.fa-rev {
+  --fa: "\f5b2"; }
 
-.fa-wizards-of-the-coast:before {
-  content: "\f730"; }
+.fa-windows {
+  --fa: "\f17a"; }
 
-.fa-square-viadeo:before {
-  content: "\f2aa"; }
+.fa-wizards-of-the-coast {
+  --fa: "\f730"; }
 
-.fa-viadeo-square:before {
-  content: "\f2aa"; }
+.fa-square-viadeo {
+  --fa: "\f2aa"; }
 
-.fa-meetup:before {
-  content: "\f2e0"; }
+.fa-viadeo-square {
+  --fa: "\f2aa"; }
 
-.fa-centos:before {
-  content: "\f789"; }
+.fa-meetup {
+  --fa: "\f2e0"; }
 
-.fa-adn:before {
-  content: "\f170"; }
+.fa-centos {
+  --fa: "\f789"; }
 
-.fa-cloudsmith:before {
-  content: "\f384"; }
+.fa-adn {
+  --fa: "\f170"; }
 
-.fa-opensuse:before {
-  content: "\e62b"; }
+.fa-cloudsmith {
+  --fa: "\f384"; }
 
-.fa-pied-piper-alt:before {
-  content: "\f1a8"; }
+.fa-opensuse {
+  --fa: "\e62b"; }
 
-.fa-square-dribbble:before {
-  content: "\f397"; }
+.fa-pied-piper-alt {
+  --fa: "\f1a8"; }
 
-.fa-dribbble-square:before {
-  content: "\f397"; }
+.fa-square-dribbble {
+  --fa: "\f397"; }
 
-.fa-codiepie:before {
-  content: "\f284"; }
+.fa-dribbble-square {
+  --fa: "\f397"; }
 
-.fa-node:before {
-  content: "\f419"; }
+.fa-codiepie {
+  --fa: "\f284"; }
 
-.fa-mix:before {
-  content: "\f3cb"; }
+.fa-node {
+  --fa: "\f419"; }
 
-.fa-steam:before {
-  content: "\f1b6"; }
+.fa-mix {
+  --fa: "\f3cb"; }
 
-.fa-cc-apple-pay:before {
-  content: "\f416"; }
+.fa-steam {
+  --fa: "\f1b6"; }
 
-.fa-scribd:before {
-  content: "\f28a"; }
+.fa-cc-apple-pay {
+  --fa: "\f416"; }
 
-.fa-debian:before {
-  content: "\e60b"; }
+.fa-scribd {
+  --fa: "\f28a"; }
 
-.fa-openid:before {
-  content: "\f19b"; }
+.fa-debian {
+  --fa: "\e60b"; }
 
-.fa-instalod:before {
-  content: "\e081"; }
+.fa-openid {
+  --fa: "\f19b"; }
 
-.fa-expeditedssl:before {
-  content: "\f23e"; }
+.fa-instalod {
+  --fa: "\e081"; }
 
-.fa-sellcast:before {
-  content: "\f2da"; }
+.fa-files-pinwheel {
+  --fa: "\e69f"; }
 
-.fa-square-twitter:before {
-  content: "\f081"; }
+.fa-expeditedssl {
+  --fa: "\f23e"; }
 
-.fa-twitter-square:before {
-  content: "\f081"; }
+.fa-sellcast {
+  --fa: "\f2da"; }
 
-.fa-r-project:before {
-  content: "\f4f7"; }
+.fa-square-twitter {
+  --fa: "\f081"; }
 
-.fa-delicious:before {
-  content: "\f1a5"; }
+.fa-twitter-square {
+  --fa: "\f081"; }
 
-.fa-freebsd:before {
-  content: "\f3a4"; }
+.fa-r-project {
+  --fa: "\f4f7"; }
 
-.fa-vuejs:before {
-  content: "\f41f"; }
+.fa-delicious {
+  --fa: "\f1a5"; }
 
-.fa-accusoft:before {
-  content: "\f369"; }
+.fa-freebsd {
+  --fa: "\f3a4"; }
 
-.fa-ioxhost:before {
-  content: "\f208"; }
+.fa-vuejs {
+  --fa: "\f41f"; }
 
-.fa-fonticons-fi:before {
-  content: "\f3a2"; }
+.fa-accusoft {
+  --fa: "\f369"; }
 
-.fa-app-store:before {
-  content: "\f36f"; }
+.fa-ioxhost {
+  --fa: "\f208"; }
 
-.fa-cc-mastercard:before {
-  content: "\f1f1"; }
+.fa-fonticons-fi {
+  --fa: "\f3a2"; }
 
-.fa-itunes-note:before {
-  content: "\f3b5"; }
+.fa-app-store {
+  --fa: "\f36f"; }
 
-.fa-golang:before {
-  content: "\e40f"; }
+.fa-cc-mastercard {
+  --fa: "\f1f1"; }
 
-.fa-kickstarter:before {
-  content: "\f3bb"; }
+.fa-itunes-note {
+  --fa: "\f3b5"; }
 
-.fa-square-kickstarter:before {
-  content: "\f3bb"; }
+.fa-golang {
+  --fa: "\e40f"; }
 
-.fa-grav:before {
-  content: "\f2d6"; }
+.fa-kickstarter {
+  --fa: "\f3bb"; }
 
-.fa-weibo:before {
-  content: "\f18a"; }
+.fa-square-kickstarter {
+  --fa: "\f3bb"; }
 
-.fa-uncharted:before {
-  content: "\e084"; }
+.fa-grav {
+  --fa: "\f2d6"; }
 
-.fa-firstdraft:before {
-  content: "\f3a1"; }
+.fa-weibo {
+  --fa: "\f18a"; }
 
-.fa-square-youtube:before {
-  content: "\f431"; }
+.fa-uncharted {
+  --fa: "\e084"; }
 
-.fa-youtube-square:before {
-  content: "\f431"; }
+.fa-firstdraft {
+  --fa: "\f3a1"; }
 
-.fa-wikipedia-w:before {
-  content: "\f266"; }
+.fa-square-youtube {
+  --fa: "\f431"; }
 
-.fa-wpressr:before {
-  content: "\f3e4"; }
+.fa-youtube-square {
+  --fa: "\f431"; }
 
-.fa-rendact:before {
-  content: "\f3e4"; }
+.fa-wikipedia-w {
+  --fa: "\f266"; }
 
-.fa-angellist:before {
-  content: "\f209"; }
+.fa-wpressr {
+  --fa: "\f3e4"; }
 
-.fa-galactic-republic:before {
-  content: "\f50c"; }
+.fa-rendact {
+  --fa: "\f3e4"; }
 
-.fa-nfc-directional:before {
-  content: "\e530"; }
+.fa-angellist {
+  --fa: "\f209"; }
 
-.fa-skype:before {
-  content: "\f17e"; }
+.fa-galactic-republic {
+  --fa: "\f50c"; }
 
-.fa-joget:before {
-  content: "\f3b7"; }
+.fa-nfc-directional {
+  --fa: "\e530"; }
 
-.fa-fedora:before {
-  content: "\f798"; }
+.fa-skype {
+  --fa: "\f17e"; }
 
-.fa-stripe-s:before {
-  content: "\f42a"; }
+.fa-joget {
+  --fa: "\f3b7"; }
 
-.fa-meta:before {
-  content: "\e49b"; }
+.fa-fedora {
+  --fa: "\f798"; }
 
-.fa-laravel:before {
-  content: "\f3bd"; }
+.fa-stripe-s {
+  --fa: "\f42a"; }
 
-.fa-hotjar:before {
-  content: "\f3b1"; }
+.fa-meta {
+  --fa: "\e49b"; }
 
-.fa-bluetooth-b:before {
-  content: "\f294"; }
+.fa-laravel {
+  --fa: "\f3bd"; }
 
-.fa-square-letterboxd:before {
-  content: "\e62e"; }
+.fa-hotjar {
+  --fa: "\f3b1"; }
 
-.fa-sticker-mule:before {
-  content: "\f3f7"; }
+.fa-bluetooth-b {
+  --fa: "\f294"; }
 
-.fa-creative-commons-zero:before {
-  content: "\f4f3"; }
+.fa-square-letterboxd {
+  --fa: "\e62e"; }
 
-.fa-hips:before {
-  content: "\f452"; }
+.fa-sticker-mule {
+  --fa: "\f3f7"; }
 
-.fa-behance:before {
-  content: "\f1b4"; }
+.fa-creative-commons-zero {
+  --fa: "\f4f3"; }
 
-.fa-reddit:before {
-  content: "\f1a1"; }
+.fa-hips {
+  --fa: "\f452"; }
 
-.fa-discord:before {
-  content: "\f392"; }
+.fa-css {
+  --fa: "\e6a2"; }
 
-.fa-chrome:before {
-  content: "\f268"; }
+.fa-behance {
+  --fa: "\f1b4"; }
 
-.fa-app-store-ios:before {
-  content: "\f370"; }
+.fa-reddit {
+  --fa: "\f1a1"; }
 
-.fa-cc-discover:before {
-  content: "\f1f2"; }
+.fa-discord {
+  --fa: "\f392"; }
 
-.fa-wpbeginner:before {
-  content: "\f297"; }
+.fa-chrome {
+  --fa: "\f268"; }
 
-.fa-confluence:before {
-  content: "\f78d"; }
+.fa-app-store-ios {
+  --fa: "\f370"; }
 
-.fa-shoelace:before {
-  content: "\e60c"; }
+.fa-cc-discover {
+  --fa: "\f1f2"; }
 
-.fa-mdb:before {
-  content: "\f8ca"; }
+.fa-wpbeginner {
+  --fa: "\f297"; }
 
-.fa-dochub:before {
-  content: "\f394"; }
+.fa-confluence {
+  --fa: "\f78d"; }
 
-.fa-accessible-icon:before {
-  content: "\f368"; }
+.fa-shoelace {
+  --fa: "\e60c"; }
 
-.fa-ebay:before {
-  content: "\f4f4"; }
+.fa-mdb {
+  --fa: "\f8ca"; }
 
-.fa-amazon:before {
-  content: "\f270"; }
+.fa-dochub {
+  --fa: "\f394"; }
 
-.fa-unsplash:before {
-  content: "\e07c"; }
+.fa-accessible-icon {
+  --fa: "\f368"; }
 
-.fa-yarn:before {
-  content: "\f7e3"; }
+.fa-ebay {
+  --fa: "\f4f4"; }
 
-.fa-square-steam:before {
-  content: "\f1b7"; }
+.fa-amazon {
+  --fa: "\f270"; }
 
-.fa-steam-square:before {
-  content: "\f1b7"; }
+.fa-unsplash {
+  --fa: "\e07c"; }
 
-.fa-500px:before {
-  content: "\f26e"; }
+.fa-yarn {
+  --fa: "\f7e3"; }
 
-.fa-square-vimeo:before {
-  content: "\f194"; }
+.fa-square-steam {
+  --fa: "\f1b7"; }
 
-.fa-vimeo-square:before {
-  content: "\f194"; }
+.fa-steam-square {
+  --fa: "\f1b7"; }
 
-.fa-asymmetrik:before {
-  content: "\f372"; }
+.fa-500px {
+  --fa: "\f26e"; }
 
-.fa-font-awesome:before {
-  content: "\f2b4"; }
+.fa-square-vimeo {
+  --fa: "\f194"; }
 
-.fa-font-awesome-flag:before {
-  content: "\f2b4"; }
+.fa-vimeo-square {
+  --fa: "\f194"; }
 
-.fa-font-awesome-logo-full:before {
-  content: "\f2b4"; }
+.fa-asymmetrik {
+  --fa: "\f372"; }
 
-.fa-gratipay:before {
-  content: "\f184"; }
+.fa-font-awesome {
+  --fa: "\f2b4"; }
 
-.fa-apple:before {
-  content: "\f179"; }
+.fa-font-awesome-flag {
+  --fa: "\f2b4"; }
 
-.fa-hive:before {
-  content: "\e07f"; }
+.fa-font-awesome-logo-full {
+  --fa: "\f2b4"; }
 
-.fa-gitkraken:before {
-  content: "\f3a6"; }
+.fa-gratipay {
+  --fa: "\f184"; }
 
-.fa-keybase:before {
-  content: "\f4f5"; }
+.fa-apple {
+  --fa: "\f179"; }
 
-.fa-apple-pay:before {
-  content: "\f415"; }
+.fa-hive {
+  --fa: "\e07f"; }
 
-.fa-padlet:before {
-  content: "\e4a0"; }
+.fa-gitkraken {
+  --fa: "\f3a6"; }
 
-.fa-amazon-pay:before {
-  content: "\f42c"; }
+.fa-keybase {
+  --fa: "\f4f5"; }
 
-.fa-square-github:before {
-  content: "\f092"; }
+.fa-apple-pay {
+  --fa: "\f415"; }
 
-.fa-github-square:before {
-  content: "\f092"; }
+.fa-padlet {
+  --fa: "\e4a0"; }
 
-.fa-stumbleupon:before {
-  content: "\f1a4"; }
+.fa-amazon-pay {
+  --fa: "\f42c"; }
 
-.fa-fedex:before {
-  content: "\f797"; }
+.fa-square-github {
+  --fa: "\f092"; }
 
-.fa-phoenix-framework:before {
-  content: "\f3dc"; }
+.fa-github-square {
+  --fa: "\f092"; }
 
-.fa-shopify:before {
-  content: "\e057"; }
+.fa-stumbleupon {
+  --fa: "\f1a4"; }
 
-.fa-neos:before {
-  content: "\f612"; }
+.fa-fedex {
+  --fa: "\f797"; }
 
-.fa-square-threads:before {
-  content: "\e619"; }
+.fa-phoenix-framework {
+  --fa: "\f3dc"; }
 
-.fa-hackerrank:before {
-  content: "\f5f7"; }
+.fa-shopify {
+  --fa: "\e057"; }
 
-.fa-researchgate:before {
-  content: "\f4f8"; }
+.fa-neos {
+  --fa: "\f612"; }
 
-.fa-swift:before {
-  content: "\f8e1"; }
+.fa-square-threads {
+  --fa: "\e619"; }
 
-.fa-angular:before {
-  content: "\f420"; }
+.fa-hackerrank {
+  --fa: "\f5f7"; }
 
-.fa-speakap:before {
-  content: "\f3f3"; }
+.fa-researchgate {
+  --fa: "\f4f8"; }
 
-.fa-angrycreative:before {
-  content: "\f36e"; }
+.fa-swift {
+  --fa: "\f8e1"; }
 
-.fa-y-combinator:before {
-  content: "\f23b"; }
+.fa-angular {
+  --fa: "\f420"; }
 
-.fa-empire:before {
-  content: "\f1d1"; }
+.fa-speakap {
+  --fa: "\f3f3"; }
 
-.fa-envira:before {
-  content: "\f299"; }
+.fa-angrycreative {
+  --fa: "\f36e"; }
 
-.fa-google-scholar:before {
-  content: "\e63b"; }
+.fa-y-combinator {
+  --fa: "\f23b"; }
 
-.fa-square-gitlab:before {
-  content: "\e5ae"; }
+.fa-empire {
+  --fa: "\f1d1"; }
 
-.fa-gitlab-square:before {
-  content: "\e5ae"; }
+.fa-envira {
+  --fa: "\f299"; }
 
-.fa-studiovinari:before {
-  content: "\f3f8"; }
+.fa-google-scholar {
+  --fa: "\e63b"; }
 
-.fa-pied-piper:before {
-  content: "\f2ae"; }
+.fa-square-gitlab {
+  --fa: "\e5ae"; }
 
-.fa-wordpress:before {
-  content: "\f19a"; }
+.fa-gitlab-square {
+  --fa: "\e5ae"; }
 
-.fa-product-hunt:before {
-  content: "\f288"; }
+.fa-studiovinari {
+  --fa: "\f3f8"; }
 
-.fa-firefox:before {
-  content: "\f269"; }
+.fa-pied-piper {
+  --fa: "\f2ae"; }
 
-.fa-linode:before {
-  content: "\f2b8"; }
+.fa-wordpress {
+  --fa: "\f19a"; }
 
-.fa-goodreads:before {
-  content: "\f3a8"; }
+.fa-product-hunt {
+  --fa: "\f288"; }
 
-.fa-square-odnoklassniki:before {
-  content: "\f264"; }
+.fa-firefox {
+  --fa: "\f269"; }
 
-.fa-odnoklassniki-square:before {
-  content: "\f264"; }
+.fa-linode {
+  --fa: "\f2b8"; }
 
-.fa-jsfiddle:before {
-  content: "\f1cc"; }
+.fa-goodreads {
+  --fa: "\f3a8"; }
 
-.fa-sith:before {
-  content: "\f512"; }
+.fa-square-odnoklassniki {
+  --fa: "\f264"; }
 
-.fa-themeisle:before {
-  content: "\f2b2"; }
+.fa-odnoklassniki-square {
+  --fa: "\f264"; }
 
-.fa-page4:before {
-  content: "\f3d7"; }
+.fa-jsfiddle {
+  --fa: "\f1cc"; }
 
-.fa-hashnode:before {
-  content: "\e499"; }
+.fa-sith {
+  --fa: "\f512"; }
 
-.fa-react:before {
-  content: "\f41b"; }
+.fa-themeisle {
+  --fa: "\f2b2"; }
 
-.fa-cc-paypal:before {
-  content: "\f1f4"; }
+.fa-page4 {
+  --fa: "\f3d7"; }
 
-.fa-squarespace:before {
-  content: "\f5be"; }
+.fa-hashnode {
+  --fa: "\e499"; }
 
-.fa-cc-stripe:before {
-  content: "\f1f5"; }
+.fa-react {
+  --fa: "\f41b"; }
 
-.fa-creative-commons-share:before {
-  content: "\f4f2"; }
+.fa-cc-paypal {
+  --fa: "\f1f4"; }
 
-.fa-bitcoin:before {
-  content: "\f379"; }
+.fa-squarespace {
+  --fa: "\f5be"; }
 
-.fa-keycdn:before {
-  content: "\f3ba"; }
+.fa-cc-stripe {
+  --fa: "\f1f5"; }
 
-.fa-opera:before {
-  content: "\f26a"; }
+.fa-creative-commons-share {
+  --fa: "\f4f2"; }
 
-.fa-itch-io:before {
-  content: "\f83a"; }
+.fa-bitcoin {
+  --fa: "\f379"; }
 
-.fa-umbraco:before {
-  content: "\f8e8"; }
+.fa-keycdn {
+  --fa: "\f3ba"; }
 
-.fa-galactic-senate:before {
-  content: "\f50d"; }
+.fa-opera {
+  --fa: "\f26a"; }
 
-.fa-ubuntu:before {
-  content: "\f7df"; }
+.fa-itch-io {
+  --fa: "\f83a"; }
 
-.fa-draft2digital:before {
-  content: "\f396"; }
+.fa-umbraco {
+  --fa: "\f8e8"; }
 
-.fa-stripe:before {
-  content: "\f429"; }
+.fa-galactic-senate {
+  --fa: "\f50d"; }
 
-.fa-houzz:before {
-  content: "\f27c"; }
+.fa-ubuntu {
+  --fa: "\f7df"; }
 
-.fa-gg:before {
-  content: "\f260"; }
+.fa-draft2digital {
+  --fa: "\f396"; }
 
-.fa-dhl:before {
-  content: "\f790"; }
+.fa-stripe {
+  --fa: "\f429"; }
 
-.fa-square-pinterest:before {
-  content: "\f0d3"; }
+.fa-houzz {
+  --fa: "\f27c"; }
 
-.fa-pinterest-square:before {
-  content: "\f0d3"; }
+.fa-gg {
+  --fa: "\f260"; }
 
-.fa-xing:before {
-  content: "\f168"; }
+.fa-dhl {
+  --fa: "\f790"; }
 
-.fa-blackberry:before {
-  content: "\f37b"; }
+.fa-square-pinterest {
+  --fa: "\f0d3"; }
 
-.fa-creative-commons-pd:before {
-  content: "\f4ec"; }
+.fa-pinterest-square {
+  --fa: "\f0d3"; }
 
-.fa-playstation:before {
-  content: "\f3df"; }
+.fa-xing {
+  --fa: "\f168"; }
 
-.fa-quinscape:before {
-  content: "\f459"; }
+.fa-blackberry {
+  --fa: "\f37b"; }
 
-.fa-less:before {
-  content: "\f41d"; }
+.fa-creative-commons-pd {
+  --fa: "\f4ec"; }
 
-.fa-blogger-b:before {
-  content: "\f37d"; }
+.fa-playstation {
+  --fa: "\f3df"; }
 
-.fa-opencart:before {
-  content: "\f23d"; }
+.fa-quinscape {
+  --fa: "\f459"; }
 
-.fa-vine:before {
-  content: "\f1ca"; }
+.fa-less {
+  --fa: "\f41d"; }
 
-.fa-signal-messenger:before {
-  content: "\e663"; }
+.fa-blogger-b {
+  --fa: "\f37d"; }
 
-.fa-paypal:before {
-  content: "\f1ed"; }
+.fa-opencart {
+  --fa: "\f23d"; }
 
-.fa-gitlab:before {
-  content: "\f296"; }
+.fa-vine {
+  --fa: "\f1ca"; }
 
-.fa-typo3:before {
-  content: "\f42b"; }
+.fa-signal-messenger {
+  --fa: "\e663"; }
 
-.fa-reddit-alien:before {
-  content: "\f281"; }
+.fa-paypal {
+  --fa: "\f1ed"; }
 
-.fa-yahoo:before {
-  content: "\f19e"; }
+.fa-gitlab {
+  --fa: "\f296"; }
 
-.fa-dailymotion:before {
-  content: "\e052"; }
+.fa-typo3 {
+  --fa: "\f42b"; }
 
-.fa-affiliatetheme:before {
-  content: "\f36b"; }
+.fa-reddit-alien {
+  --fa: "\f281"; }
 
-.fa-pied-piper-pp:before {
-  content: "\f1a7"; }
+.fa-yahoo {
+  --fa: "\f19e"; }
 
-.fa-bootstrap:before {
-  content: "\f836"; }
+.fa-dailymotion {
+  --fa: "\e052"; }
 
-.fa-odnoklassniki:before {
-  content: "\f263"; }
+.fa-affiliatetheme {
+  --fa: "\f36b"; }
 
-.fa-nfc-symbol:before {
-  content: "\e531"; }
+.fa-pied-piper-pp {
+  --fa: "\f1a7"; }
 
-.fa-mintbit:before {
-  content: "\e62f"; }
+.fa-bootstrap {
+  --fa: "\f836"; }
 
-.fa-ethereum:before {
-  content: "\f42e"; }
+.fa-odnoklassniki {
+  --fa: "\f263"; }
 
-.fa-speaker-deck:before {
-  content: "\f83c"; }
+.fa-nfc-symbol {
+  --fa: "\e531"; }
 
-.fa-creative-commons-nc-eu:before {
-  content: "\f4e9"; }
+.fa-mintbit {
+  --fa: "\e62f"; }
 
-.fa-patreon:before {
-  content: "\f3d9"; }
+.fa-ethereum {
+  --fa: "\f42e"; }
 
-.fa-avianex:before {
-  content: "\f374"; }
+.fa-speaker-deck {
+  --fa: "\f83c"; }
 
-.fa-ello:before {
-  content: "\f5f1"; }
+.fa-creative-commons-nc-eu {
+  --fa: "\f4e9"; }
 
-.fa-gofore:before {
-  content: "\f3a7"; }
+.fa-patreon {
+  --fa: "\f3d9"; }
 
-.fa-bimobject:before {
-  content: "\f378"; }
+.fa-avianex {
+  --fa: "\f374"; }
 
-.fa-brave-reverse:before {
-  content: "\e63d"; }
+.fa-ello {
+  --fa: "\f5f1"; }
 
-.fa-facebook-f:before {
-  content: "\f39e"; }
+.fa-gofore {
+  --fa: "\f3a7"; }
 
-.fa-square-google-plus:before {
-  content: "\f0d4"; }
+.fa-bimobject {
+  --fa: "\f378"; }
 
-.fa-google-plus-square:before {
-  content: "\f0d4"; }
+.fa-brave-reverse {
+  --fa: "\e63d"; }
 
-.fa-web-awesome:before {
-  content: "\e682"; }
+.fa-facebook-f {
+  --fa: "\f39e"; }
 
-.fa-mandalorian:before {
-  content: "\f50f"; }
+.fa-square-google-plus {
+  --fa: "\f0d4"; }
 
-.fa-first-order-alt:before {
-  content: "\f50a"; }
+.fa-google-plus-square {
+  --fa: "\f0d4"; }
 
-.fa-osi:before {
-  content: "\f41a"; }
+.fa-web-awesome {
+  --fa: "\e682"; }
 
-.fa-google-wallet:before {
-  content: "\f1ee"; }
+.fa-mandalorian {
+  --fa: "\f50f"; }
 
-.fa-d-and-d-beyond:before {
-  content: "\f6ca"; }
+.fa-first-order-alt {
+  --fa: "\f50a"; }
 
-.fa-periscope:before {
-  content: "\f3da"; }
+.fa-osi {
+  --fa: "\f41a"; }
 
-.fa-fulcrum:before {
-  content: "\f50b"; }
+.fa-google-wallet {
+  --fa: "\f1ee"; }
 
-.fa-cloudscale:before {
-  content: "\f383"; }
+.fa-d-and-d-beyond {
+  --fa: "\f6ca"; }
 
-.fa-forumbee:before {
-  content: "\f211"; }
+.fa-periscope {
+  --fa: "\f3da"; }
 
-.fa-mizuni:before {
-  content: "\f3cc"; }
+.fa-fulcrum {
+  --fa: "\f50b"; }
 
-.fa-schlix:before {
-  content: "\f3ea"; }
+.fa-cloudscale {
+  --fa: "\f383"; }
 
-.fa-square-xing:before {
-  content: "\f169"; }
+.fa-forumbee {
+  --fa: "\f211"; }
 
-.fa-xing-square:before {
-  content: "\f169"; }
+.fa-mizuni {
+  --fa: "\f3cc"; }
 
-.fa-bandcamp:before {
-  content: "\f2d5"; }
+.fa-schlix {
+  --fa: "\f3ea"; }
 
-.fa-wpforms:before {
-  content: "\f298"; }
+.fa-square-xing {
+  --fa: "\f169"; }
 
-.fa-cloudversify:before {
-  content: "\f385"; }
+.fa-xing-square {
+  --fa: "\f169"; }
 
-.fa-usps:before {
-  content: "\f7e1"; }
+.fa-bandcamp {
+  --fa: "\f2d5"; }
 
-.fa-megaport:before {
-  content: "\f5a3"; }
+.fa-wpforms {
+  --fa: "\f298"; }
 
-.fa-magento:before {
-  content: "\f3c4"; }
+.fa-cloudversify {
+  --fa: "\f385"; }
 
-.fa-spotify:before {
-  content: "\f1bc"; }
+.fa-usps {
+  --fa: "\f7e1"; }
 
-.fa-optin-monster:before {
-  content: "\f23c"; }
+.fa-megaport {
+  --fa: "\f5a3"; }
 
-.fa-fly:before {
-  content: "\f417"; }
+.fa-magento {
+  --fa: "\f3c4"; }
 
-.fa-aviato:before {
-  content: "\f421"; }
+.fa-spotify {
+  --fa: "\f1bc"; }
 
-.fa-itunes:before {
-  content: "\f3b4"; }
+.fa-optin-monster {
+  --fa: "\f23c"; }
 
-.fa-cuttlefish:before {
-  content: "\f38c"; }
+.fa-fly {
+  --fa: "\f417"; }
 
-.fa-blogger:before {
-  content: "\f37c"; }
+.fa-square-bluesky {
+  --fa: "\e6a3"; }
 
-.fa-flickr:before {
-  content: "\f16e"; }
+.fa-aviato {
+  --fa: "\f421"; }
 
-.fa-viber:before {
-  content: "\f409"; }
+.fa-itunes {
+  --fa: "\f3b4"; }
 
-.fa-soundcloud:before {
-  content: "\f1be"; }
+.fa-cuttlefish {
+  --fa: "\f38c"; }
 
-.fa-digg:before {
-  content: "\f1a6"; }
+.fa-blogger {
+  --fa: "\f37c"; }
 
-.fa-tencent-weibo:before {
-  content: "\f1d5"; }
+.fa-flickr {
+  --fa: "\f16e"; }
 
-.fa-letterboxd:before {
-  content: "\e62d"; }
+.fa-viber {
+  --fa: "\f409"; }
 
-.fa-symfony:before {
-  content: "\f83d"; }
+.fa-soundcloud {
+  --fa: "\f1be"; }
 
-.fa-maxcdn:before {
-  content: "\f136"; }
+.fa-digg {
+  --fa: "\f1a6"; }
 
-.fa-etsy:before {
-  content: "\f2d7"; }
+.fa-tencent-weibo {
+  --fa: "\f1d5"; }
 
-.fa-facebook-messenger:before {
-  content: "\f39f"; }
+.fa-letterboxd {
+  --fa: "\e62d"; }
 
-.fa-audible:before {
-  content: "\f373"; }
+.fa-symfony {
+  --fa: "\f83d"; }
 
-.fa-think-peaks:before {
-  content: "\f731"; }
+.fa-maxcdn {
+  --fa: "\f136"; }
 
-.fa-bilibili:before {
-  content: "\e3d9"; }
+.fa-etsy {
+  --fa: "\f2d7"; }
 
-.fa-erlang:before {
-  content: "\f39d"; }
+.fa-facebook-messenger {
+  --fa: "\f39f"; }
 
-.fa-x-twitter:before {
-  content: "\e61b"; }
+.fa-audible {
+  --fa: "\f373"; }
 
-.fa-cotton-bureau:before {
-  content: "\f89e"; }
+.fa-think-peaks {
+  --fa: "\f731"; }
 
-.fa-dashcube:before {
-  content: "\f210"; }
+.fa-bilibili {
+  --fa: "\e3d9"; }
 
-.fa-42-group:before {
-  content: "\e080"; }
+.fa-erlang {
+  --fa: "\f39d"; }
 
-.fa-innosoft:before {
-  content: "\e080"; }
+.fa-x-twitter {
+  --fa: "\e61b"; }
 
-.fa-stack-exchange:before {
-  content: "\f18d"; }
+.fa-cotton-bureau {
+  --fa: "\f89e"; }
 
-.fa-elementor:before {
-  content: "\f430"; }
+.fa-dashcube {
+  --fa: "\f210"; }
 
-.fa-square-pied-piper:before {
-  content: "\e01e"; }
+.fa-42-group {
+  --fa: "\e080"; }
 
-.fa-pied-piper-square:before {
-  content: "\e01e"; }
+.fa-innosoft {
+  --fa: "\e080"; }
 
-.fa-creative-commons-nd:before {
-  content: "\f4eb"; }
+.fa-stack-exchange {
+  --fa: "\f18d"; }
 
-.fa-palfed:before {
-  content: "\f3d8"; }
+.fa-elementor {
+  --fa: "\f430"; }
 
-.fa-superpowers:before {
-  content: "\f2dd"; }
+.fa-square-pied-piper {
+  --fa: "\e01e"; }
 
-.fa-resolving:before {
-  content: "\f3e7"; }
+.fa-pied-piper-square {
+  --fa: "\e01e"; }
 
-.fa-xbox:before {
-  content: "\f412"; }
+.fa-creative-commons-nd {
+  --fa: "\f4eb"; }
 
-.fa-square-web-awesome-stroke:before {
-  content: "\e684"; }
+.fa-palfed {
+  --fa: "\f3d8"; }
 
-.fa-searchengin:before {
-  content: "\f3eb"; }
+.fa-superpowers {
+  --fa: "\f2dd"; }
 
-.fa-tiktok:before {
-  content: "\e07b"; }
+.fa-resolving {
+  --fa: "\f3e7"; }
 
-.fa-square-facebook:before {
-  content: "\f082"; }
+.fa-xbox {
+  --fa: "\f412"; }
 
-.fa-facebook-square:before {
-  content: "\f082"; }
+.fa-square-web-awesome-stroke {
+  --fa: "\e684"; }
 
-.fa-renren:before {
-  content: "\f18b"; }
+.fa-searchengin {
+  --fa: "\f3eb"; }
 
-.fa-linux:before {
-  content: "\f17c"; }
+.fa-tiktok {
+  --fa: "\e07b"; }
 
-.fa-glide:before {
-  content: "\f2a5"; }
+.fa-square-facebook {
+  --fa: "\f082"; }
 
-.fa-linkedin:before {
-  content: "\f08c"; }
+.fa-facebook-square {
+  --fa: "\f082"; }
 
-.fa-hubspot:before {
-  content: "\f3b2"; }
+.fa-renren {
+  --fa: "\f18b"; }
 
-.fa-deploydog:before {
-  content: "\f38e"; }
+.fa-linux {
+  --fa: "\f17c"; }
 
-.fa-twitch:before {
-  content: "\f1e8"; }
+.fa-glide {
+  --fa: "\f2a5"; }
 
-.fa-ravelry:before {
-  content: "\f2d9"; }
+.fa-linkedin {
+  --fa: "\f08c"; }
 
-.fa-mixer:before {
-  content: "\e056"; }
+.fa-hubspot {
+  --fa: "\f3b2"; }
 
-.fa-square-lastfm:before {
-  content: "\f203"; }
+.fa-deploydog {
+  --fa: "\f38e"; }
 
-.fa-lastfm-square:before {
-  content: "\f203"; }
+.fa-twitch {
+  --fa: "\f1e8"; }
 
-.fa-vimeo:before {
-  content: "\f40a"; }
+.fa-flutter {
+  --fa: "\e694"; }
 
-.fa-mendeley:before {
-  content: "\f7b3"; }
+.fa-ravelry {
+  --fa: "\f2d9"; }
 
-.fa-uniregistry:before {
-  content: "\f404"; }
+.fa-mixer {
+  --fa: "\e056"; }
 
-.fa-figma:before {
-  content: "\f799"; }
+.fa-square-lastfm {
+  --fa: "\f203"; }
 
-.fa-creative-commons-remix:before {
-  content: "\f4ee"; }
+.fa-lastfm-square {
+  --fa: "\f203"; }
 
-.fa-cc-amazon-pay:before {
-  content: "\f42d"; }
+.fa-vimeo {
+  --fa: "\f40a"; }
 
-.fa-dropbox:before {
-  content: "\f16b"; }
+.fa-mendeley {
+  --fa: "\f7b3"; }
 
-.fa-instagram:before {
-  content: "\f16d"; }
+.fa-uniregistry {
+  --fa: "\f404"; }
 
-.fa-cmplid:before {
-  content: "\e360"; }
+.fa-figma {
+  --fa: "\f799"; }
 
-.fa-upwork:before {
-  content: "\e641"; }
+.fa-creative-commons-remix {
+  --fa: "\f4ee"; }
 
-.fa-facebook:before {
-  content: "\f09a"; }
+.fa-cc-amazon-pay {
+  --fa: "\f42d"; }
 
-.fa-gripfire:before {
-  content: "\f3ac"; }
+.fa-dropbox {
+  --fa: "\f16b"; }
 
-.fa-jedi-order:before {
-  content: "\f50e"; }
+.fa-instagram {
+  --fa: "\f16d"; }
 
-.fa-uikit:before {
-  content: "\f403"; }
+.fa-cmplid {
+  --fa: "\e360"; }
 
-.fa-fort-awesome-alt:before {
-  content: "\f3a3"; }
+.fa-upwork {
+  --fa: "\e641"; }
 
-.fa-phabricator:before {
-  content: "\f3db"; }
+.fa-facebook {
+  --fa: "\f09a"; }
 
-.fa-ussunnah:before {
-  content: "\f407"; }
+.fa-gripfire {
+  --fa: "\f3ac"; }
 
-.fa-earlybirds:before {
-  content: "\f39a"; }
+.fa-jedi-order {
+  --fa: "\f50e"; }
 
-.fa-trade-federation:before {
-  content: "\f513"; }
+.fa-uikit {
+  --fa: "\f403"; }
 
-.fa-autoprefixer:before {
-  content: "\f41c"; }
+.fa-fort-awesome-alt {
+  --fa: "\f3a3"; }
 
-.fa-whatsapp:before {
-  content: "\f232"; }
+.fa-phabricator {
+  --fa: "\f3db"; }
 
-.fa-square-upwork:before {
-  content: "\e67c"; }
+.fa-ussunnah {
+  --fa: "\f407"; }
 
-.fa-slideshare:before {
-  content: "\f1e7"; }
+.fa-earlybirds {
+  --fa: "\f39a"; }
 
-.fa-google-play:before {
-  content: "\f3ab"; }
+.fa-trade-federation {
+  --fa: "\f513"; }
 
-.fa-viadeo:before {
-  content: "\f2a9"; }
+.fa-autoprefixer {
+  --fa: "\f41c"; }
 
-.fa-line:before {
-  content: "\f3c0"; }
+.fa-whatsapp {
+  --fa: "\f232"; }
 
-.fa-google-drive:before {
-  content: "\f3aa"; }
+.fa-square-upwork {
+  --fa: "\e67c"; }
 
-.fa-servicestack:before {
-  content: "\f3ec"; }
+.fa-slideshare {
+  --fa: "\f1e7"; }
 
-.fa-simplybuilt:before {
-  content: "\f215"; }
+.fa-google-play {
+  --fa: "\f3ab"; }
 
-.fa-bitbucket:before {
-  content: "\f171"; }
+.fa-viadeo {
+  --fa: "\f2a9"; }
 
-.fa-imdb:before {
-  content: "\f2d8"; }
+.fa-line {
+  --fa: "\f3c0"; }
 
-.fa-deezer:before {
-  content: "\e077"; }
+.fa-google-drive {
+  --fa: "\f3aa"; }
 
-.fa-raspberry-pi:before {
-  content: "\f7bb"; }
+.fa-servicestack {
+  --fa: "\f3ec"; }
 
-.fa-jira:before {
-  content: "\f7b1"; }
+.fa-simplybuilt {
+  --fa: "\f215"; }
 
-.fa-docker:before {
-  content: "\f395"; }
+.fa-bitbucket {
+  --fa: "\f171"; }
 
-.fa-screenpal:before {
-  content: "\e570"; }
+.fa-imdb {
+  --fa: "\f2d8"; }
 
-.fa-bluetooth:before {
-  content: "\f293"; }
+.fa-deezer {
+  --fa: "\e077"; }
 
-.fa-gitter:before {
-  content: "\f426"; }
+.fa-raspberry-pi {
+  --fa: "\f7bb"; }
 
-.fa-d-and-d:before {
-  content: "\f38d"; }
+.fa-jira {
+  --fa: "\f7b1"; }
 
-.fa-microblog:before {
-  content: "\e01a"; }
+.fa-docker {
+  --fa: "\f395"; }
 
-.fa-cc-diners-club:before {
-  content: "\f24c"; }
+.fa-screenpal {
+  --fa: "\e570"; }
 
-.fa-gg-circle:before {
-  content: "\f261"; }
+.fa-bluetooth {
+  --fa: "\f293"; }
 
-.fa-pied-piper-hat:before {
-  content: "\f4e5"; }
+.fa-gitter {
+  --fa: "\f426"; }
 
-.fa-kickstarter-k:before {
-  content: "\f3bc"; }
+.fa-d-and-d {
+  --fa: "\f38d"; }
 
-.fa-yandex:before {
-  content: "\f413"; }
+.fa-microblog {
+  --fa: "\e01a"; }
 
-.fa-readme:before {
-  content: "\f4d5"; }
+.fa-cc-diners-club {
+  --fa: "\f24c"; }
 
-.fa-html5:before {
-  content: "\f13b"; }
+.fa-gg-circle {
+  --fa: "\f261"; }
 
-.fa-sellsy:before {
-  content: "\f213"; }
+.fa-pied-piper-hat {
+  --fa: "\f4e5"; }
 
-.fa-square-web-awesome:before {
-  content: "\e683"; }
+.fa-kickstarter-k {
+  --fa: "\f3bc"; }
 
-.fa-sass:before {
-  content: "\f41e"; }
+.fa-yandex {
+  --fa: "\f413"; }
 
-.fa-wirsindhandwerk:before {
-  content: "\e2d0"; }
+.fa-readme {
+  --fa: "\f4d5"; }
 
-.fa-wsh:before {
-  content: "\e2d0"; }
+.fa-html5 {
+  --fa: "\f13b"; }
 
-.fa-buromobelexperte:before {
-  content: "\f37f"; }
+.fa-sellsy {
+  --fa: "\f213"; }
 
-.fa-salesforce:before {
-  content: "\f83b"; }
+.fa-square-web-awesome {
+  --fa: "\e683"; }
 
-.fa-octopus-deploy:before {
-  content: "\e082"; }
+.fa-sass {
+  --fa: "\f41e"; }
 
-.fa-medapps:before {
-  content: "\f3c6"; }
+.fa-wirsindhandwerk {
+  --fa: "\e2d0"; }
 
-.fa-ns8:before {
-  content: "\f3d5"; }
+.fa-wsh {
+  --fa: "\e2d0"; }
 
-.fa-pinterest-p:before {
-  content: "\f231"; }
+.fa-buromobelexperte {
+  --fa: "\f37f"; }
 
-.fa-apper:before {
-  content: "\f371"; }
+.fa-salesforce {
+  --fa: "\f83b"; }
 
-.fa-fort-awesome:before {
-  content: "\f286"; }
+.fa-octopus-deploy {
+  --fa: "\e082"; }
 
-.fa-waze:before {
-  content: "\f83f"; }
+.fa-medapps {
+  --fa: "\f3c6"; }
 
-.fa-bluesky:before {
-  content: "\e671"; }
+.fa-ns8 {
+  --fa: "\f3d5"; }
 
-.fa-cc-jcb:before {
-  content: "\f24b"; }
+.fa-pinterest-p {
+  --fa: "\f231"; }
 
-.fa-snapchat:before {
-  content: "\f2ab"; }
+.fa-apper {
+  --fa: "\f371"; }
 
-.fa-snapchat-ghost:before {
-  content: "\f2ab"; }
+.fa-fort-awesome {
+  --fa: "\f286"; }
 
-.fa-fantasy-flight-games:before {
-  content: "\f6dc"; }
+.fa-waze {
+  --fa: "\f83f"; }
 
-.fa-rust:before {
-  content: "\e07a"; }
+.fa-bluesky {
+  --fa: "\e671"; }
 
-.fa-wix:before {
-  content: "\f5cf"; }
+.fa-cc-jcb {
+  --fa: "\f24b"; }
 
-.fa-square-behance:before {
-  content: "\f1b5"; }
+.fa-snapchat {
+  --fa: "\f2ab"; }
 
-.fa-behance-square:before {
-  content: "\f1b5"; }
+.fa-snapchat-ghost {
+  --fa: "\f2ab"; }
 
-.fa-supple:before {
-  content: "\f3f9"; }
+.fa-fantasy-flight-games {
+  --fa: "\f6dc"; }
 
-.fa-webflow:before {
-  content: "\e65c"; }
+.fa-rust {
+  --fa: "\e07a"; }
 
-.fa-rebel:before {
-  content: "\f1d0"; }
+.fa-wix {
+  --fa: "\f5cf"; }
 
-.fa-css3:before {
-  content: "\f13c"; }
+.fa-square-behance {
+  --fa: "\f1b5"; }
 
-.fa-staylinked:before {
-  content: "\f3f5"; }
+.fa-behance-square {
+  --fa: "\f1b5"; }
 
-.fa-kaggle:before {
-  content: "\f5fa"; }
+.fa-supple {
+  --fa: "\f3f9"; }
 
-.fa-space-awesome:before {
-  content: "\e5ac"; }
+.fa-webflow {
+  --fa: "\e65c"; }
 
-.fa-deviantart:before {
-  content: "\f1bd"; }
+.fa-rebel {
+  --fa: "\f1d0"; }
 
-.fa-cpanel:before {
-  content: "\f388"; }
+.fa-css3 {
+  --fa: "\f13c"; }
 
-.fa-goodreads-g:before {
-  content: "\f3a9"; }
+.fa-staylinked {
+  --fa: "\f3f5"; }
 
-.fa-square-git:before {
-  content: "\f1d2"; }
+.fa-kaggle {
+  --fa: "\f5fa"; }
 
-.fa-git-square:before {
-  content: "\f1d2"; }
+.fa-space-awesome {
+  --fa: "\e5ac"; }
 
-.fa-square-tumblr:before {
-  content: "\f174"; }
+.fa-deviantart {
+  --fa: "\f1bd"; }
 
-.fa-tumblr-square:before {
-  content: "\f174"; }
+.fa-cpanel {
+  --fa: "\f388"; }
 
-.fa-trello:before {
-  content: "\f181"; }
+.fa-goodreads-g {
+  --fa: "\f3a9"; }
 
-.fa-creative-commons-nc-jp:before {
-  content: "\f4ea"; }
+.fa-square-git {
+  --fa: "\f1d2"; }
 
-.fa-get-pocket:before {
-  content: "\f265"; }
+.fa-git-square {
+  --fa: "\f1d2"; }
 
-.fa-perbyte:before {
-  content: "\e083"; }
+.fa-square-tumblr {
+  --fa: "\f174"; }
 
-.fa-grunt:before {
-  content: "\f3ad"; }
+.fa-tumblr-square {
+  --fa: "\f174"; }
 
-.fa-weebly:before {
-  content: "\f5cc"; }
+.fa-trello {
+  --fa: "\f181"; }
 
-.fa-connectdevelop:before {
-  content: "\f20e"; }
+.fa-creative-commons-nc-jp {
+  --fa: "\f4ea"; }
 
-.fa-leanpub:before {
-  content: "\f212"; }
+.fa-get-pocket {
+  --fa: "\f265"; }
 
-.fa-black-tie:before {
-  content: "\f27e"; }
+.fa-perbyte {
+  --fa: "\e083"; }
 
-.fa-themeco:before {
-  content: "\f5c6"; }
+.fa-grunt {
+  --fa: "\f3ad"; }
 
-.fa-python:before {
-  content: "\f3e2"; }
+.fa-weebly {
+  --fa: "\f5cc"; }
 
-.fa-android:before {
-  content: "\f17b"; }
+.fa-connectdevelop {
+  --fa: "\f20e"; }
 
-.fa-bots:before {
-  content: "\e340"; }
+.fa-leanpub {
+  --fa: "\f212"; }
 
-.fa-free-code-camp:before {
-  content: "\f2c5"; }
+.fa-black-tie {
+  --fa: "\f27e"; }
 
-.fa-hornbill:before {
-  content: "\f592"; }
+.fa-themeco {
+  --fa: "\f5c6"; }
 
-.fa-js:before {
-  content: "\f3b8"; }
+.fa-python {
+  --fa: "\f3e2"; }
 
-.fa-ideal:before {
-  content: "\e013"; }
+.fa-android {
+  --fa: "\f17b"; }
 
-.fa-git:before {
-  content: "\f1d3"; }
+.fa-bots {
+  --fa: "\e340"; }
 
-.fa-dev:before {
-  content: "\f6cc"; }
+.fa-free-code-camp {
+  --fa: "\f2c5"; }
 
-.fa-sketch:before {
-  content: "\f7c6"; }
+.fa-hornbill {
+  --fa: "\f592"; }
 
-.fa-yandex-international:before {
-  content: "\f414"; }
+.fa-js {
+  --fa: "\f3b8"; }
 
-.fa-cc-amex:before {
-  content: "\f1f3"; }
+.fa-ideal {
+  --fa: "\e013"; }
 
-.fa-uber:before {
-  content: "\f402"; }
+.fa-git {
+  --fa: "\f1d3"; }
 
-.fa-github:before {
-  content: "\f09b"; }
+.fa-dev {
+  --fa: "\f6cc"; }
 
-.fa-php:before {
-  content: "\f457"; }
+.fa-sketch {
+  --fa: "\f7c6"; }
 
-.fa-alipay:before {
-  content: "\f642"; }
+.fa-yandex-international {
+  --fa: "\f414"; }
 
-.fa-youtube:before {
-  content: "\f167"; }
+.fa-cc-amex {
+  --fa: "\f1f3"; }
 
-.fa-skyatlas:before {
-  content: "\f216"; }
+.fa-uber {
+  --fa: "\f402"; }
 
-.fa-firefox-browser:before {
-  content: "\e007"; }
+.fa-github {
+  --fa: "\f09b"; }
 
-.fa-replyd:before {
-  content: "\f3e6"; }
+.fa-php {
+  --fa: "\f457"; }
 
-.fa-suse:before {
-  content: "\f7d6"; }
+.fa-alipay {
+  --fa: "\f642"; }
 
-.fa-jenkins:before {
-  content: "\f3b6"; }
+.fa-youtube {
+  --fa: "\f167"; }
 
-.fa-twitter:before {
-  content: "\f099"; }
+.fa-skyatlas {
+  --fa: "\f216"; }
 
-.fa-rockrms:before {
-  content: "\f3e9"; }
+.fa-firefox-browser {
+  --fa: "\e007"; }
 
-.fa-pinterest:before {
-  content: "\f0d2"; }
+.fa-replyd {
+  --fa: "\f3e6"; }
 
-.fa-buffer:before {
-  content: "\f837"; }
+.fa-suse {
+  --fa: "\f7d6"; }
 
-.fa-npm:before {
-  content: "\f3d4"; }
+.fa-jenkins {
+  --fa: "\f3b6"; }
 
-.fa-yammer:before {
-  content: "\f840"; }
+.fa-twitter {
+  --fa: "\f099"; }
 
-.fa-btc:before {
-  content: "\f15a"; }
+.fa-rockrms {
+  --fa: "\f3e9"; }
 
-.fa-dribbble:before {
-  content: "\f17d"; }
+.fa-pinterest {
+  --fa: "\f0d2"; }
 
-.fa-stumbleupon-circle:before {
-  content: "\f1a3"; }
+.fa-buffer {
+  --fa: "\f837"; }
 
-.fa-internet-explorer:before {
-  content: "\f26b"; }
+.fa-npm {
+  --fa: "\f3d4"; }
 
-.fa-stubber:before {
-  content: "\e5c7"; }
+.fa-yammer {
+  --fa: "\f840"; }
 
-.fa-telegram:before {
-  content: "\f2c6"; }
+.fa-btc {
+  --fa: "\f15a"; }
 
-.fa-telegram-plane:before {
-  content: "\f2c6"; }
+.fa-dribbble {
+  --fa: "\f17d"; }
 
-.fa-old-republic:before {
-  content: "\f510"; }
+.fa-stumbleupon-circle {
+  --fa: "\f1a3"; }
 
-.fa-odysee:before {
-  content: "\e5c6"; }
+.fa-internet-explorer {
+  --fa: "\f26b"; }
 
-.fa-square-whatsapp:before {
-  content: "\f40c"; }
+.fa-stubber {
+  --fa: "\e5c7"; }
 
-.fa-whatsapp-square:before {
-  content: "\f40c"; }
+.fa-telegram {
+  --fa: "\f2c6"; }
 
-.fa-node-js:before {
-  content: "\f3d3"; }
+.fa-telegram-plane {
+  --fa: "\f2c6"; }
 
-.fa-edge-legacy:before {
-  content: "\e078"; }
+.fa-old-republic {
+  --fa: "\f510"; }
 
-.fa-slack:before {
-  content: "\f198"; }
+.fa-odysee {
+  --fa: "\e5c6"; }
 
-.fa-slack-hash:before {
-  content: "\f198"; }
+.fa-square-whatsapp {
+  --fa: "\f40c"; }
 
-.fa-medrt:before {
-  content: "\f3c8"; }
+.fa-whatsapp-square {
+  --fa: "\f40c"; }
 
-.fa-usb:before {
-  content: "\f287"; }
+.fa-node-js {
+  --fa: "\f3d3"; }
 
-.fa-tumblr:before {
-  content: "\f173"; }
+.fa-edge-legacy {
+  --fa: "\e078"; }
 
-.fa-vaadin:before {
-  content: "\f408"; }
+.fa-slack {
+  --fa: "\f198"; }
 
-.fa-quora:before {
-  content: "\f2c4"; }
+.fa-slack-hash {
+  --fa: "\f198"; }
 
-.fa-square-x-twitter:before {
-  content: "\e61a"; }
+.fa-medrt {
+  --fa: "\f3c8"; }
 
-.fa-reacteurope:before {
-  content: "\f75d"; }
+.fa-usb {
+  --fa: "\f287"; }
 
-.fa-medium:before {
-  content: "\f23a"; }
+.fa-tumblr {
+  --fa: "\f173"; }
 
-.fa-medium-m:before {
-  content: "\f23a"; }
+.fa-vaadin {
+  --fa: "\f408"; }
 
-.fa-amilia:before {
-  content: "\f36d"; }
+.fa-quora {
+  --fa: "\f2c4"; }
 
-.fa-mixcloud:before {
-  content: "\f289"; }
+.fa-square-x-twitter {
+  --fa: "\e61a"; }
 
-.fa-flipboard:before {
-  content: "\f44d"; }
+.fa-reacteurope {
+  --fa: "\f75d"; }
 
-.fa-viacoin:before {
-  content: "\f237"; }
+.fa-medium {
+  --fa: "\f23a"; }
 
-.fa-critical-role:before {
-  content: "\f6c9"; }
+.fa-medium-m {
+  --fa: "\f23a"; }
 
-.fa-sitrox:before {
-  content: "\e44a"; }
+.fa-amilia {
+  --fa: "\f36d"; }
 
-.fa-discourse:before {
-  content: "\f393"; }
+.fa-mixcloud {
+  --fa: "\f289"; }
 
-.fa-joomla:before {
-  content: "\f1aa"; }
+.fa-flipboard {
+  --fa: "\f44d"; }
 
-.fa-mastodon:before {
-  content: "\f4f6"; }
+.fa-viacoin {
+  --fa: "\f237"; }
 
-.fa-airbnb:before {
-  content: "\f834"; }
+.fa-critical-role {
+  --fa: "\f6c9"; }
 
-.fa-wolf-pack-battalion:before {
-  content: "\f514"; }
+.fa-sitrox {
+  --fa: "\e44a"; }
 
-.fa-buy-n-large:before {
-  content: "\f8a6"; }
+.fa-discourse {
+  --fa: "\f393"; }
 
-.fa-gulp:before {
-  content: "\f3ae"; }
+.fa-joomla {
+  --fa: "\f1aa"; }
 
-.fa-creative-commons-sampling-plus:before {
-  content: "\f4f1"; }
+.fa-mastodon {
+  --fa: "\f4f6"; }
 
-.fa-strava:before {
-  content: "\f428"; }
+.fa-airbnb {
+  --fa: "\f834"; }
 
-.fa-ember:before {
-  content: "\f423"; }
+.fa-wolf-pack-battalion {
+  --fa: "\f514"; }
 
-.fa-canadian-maple-leaf:before {
-  content: "\f785"; }
+.fa-buy-n-large {
+  --fa: "\f8a6"; }
 
-.fa-teamspeak:before {
-  content: "\f4f9"; }
+.fa-gulp {
+  --fa: "\f3ae"; }
 
-.fa-pushed:before {
-  content: "\f3e1"; }
+.fa-creative-commons-sampling-plus {
+  --fa: "\f4f1"; }
 
-.fa-wordpress-simple:before {
-  content: "\f411"; }
+.fa-strava {
+  --fa: "\f428"; }
 
-.fa-nutritionix:before {
-  content: "\f3d6"; }
+.fa-ember {
+  --fa: "\f423"; }
 
-.fa-wodu:before {
-  content: "\e088"; }
+.fa-canadian-maple-leaf {
+  --fa: "\f785"; }
 
-.fa-google-pay:before {
-  content: "\e079"; }
+.fa-teamspeak {
+  --fa: "\f4f9"; }
 
-.fa-intercom:before {
-  content: "\f7af"; }
+.fa-pushed {
+  --fa: "\f3e1"; }
 
-.fa-zhihu:before {
-  content: "\f63f"; }
+.fa-wordpress-simple {
+  --fa: "\f411"; }
 
-.fa-korvue:before {
-  content: "\f42f"; }
+.fa-nutritionix {
+  --fa: "\f3d6"; }
 
-.fa-pix:before {
-  content: "\e43a"; }
+.fa-wodu {
+  --fa: "\e088"; }
 
-.fa-steam-symbol:before {
-  content: "\f3f6"; }
+.fa-google-pay {
+  --fa: "\e079"; }
+
+.fa-intercom {
+  --fa: "\f7af"; }
+
+.fa-zhihu {
+  --fa: "\f63f"; }
+
+.fa-korvue {
+  --fa: "\f42f"; }
+
+.fa-pix {
+  --fa: "\e43a"; }
+
+.fa-steam-symbol {
+  --fa: "\f3f6"; }
 :root, :host {
   --fa-style-family-classic: 'Font Awesome 6 Free';
   --fa-font-regular: normal 400 1em/1 'Font Awesome 6 Free'; }
@@ -21122,9 +21005,10 @@ hr {
 
 .ekko-lightbox{display:-ms-flexbox!important;display:flex!important;-ms-flex-align:center;align-items:center;-ms-flex-pack:center;justify-content:center;padding-right:0!important}.ekko-lightbox-container{position:relative}.ekko-lightbox-container>div.ekko-lightbox-item{position:absolute;top:0;left:0;bottom:0;right:0;width:100%}.ekko-lightbox iframe{width:100%;height:100%}.ekko-lightbox-nav-overlay{z-index:1;position:absolute;top:0;left:0;width:100%;height:100%;display:-ms-flexbox;display:flex}.ekko-lightbox-nav-overlay a{-ms-flex:1;flex:1;display:-ms-flexbox;display:flex;-ms-flex-align:center;align-items:center;opacity:0;transition:opacity .5s;color:#fff;font-size:30px;z-index:1}.ekko-lightbox-nav-overlay a>*{-ms-flex-positive:1;flex-grow:1}.ekko-lightbox-nav-overlay a>:focus{outline:none}.ekko-lightbox-nav-overlay a span{padding:0 30px}.ekko-lightbox-nav-overlay a:last-child span{text-align:right}.ekko-lightbox-nav-overlay a:hover{text-decoration:none}.ekko-lightbox-nav-overlay a:focus{outline:none}.ekko-lightbox-nav-overlay a.disabled{cursor:default;visibility:hidden}.ekko-lightbox a:hover{opacity:1;text-decoration:none}.ekko-lightbox .modal-dialog{display:none}.ekko-lightbox .modal-footer{text-align:left}.ekko-lightbox-loader{position:absolute;top:0;left:0;bottom:0;right:0;width:100%;display:-ms-flexbox;display:flex;-ms-flex-direction:column;flex-direction:column;-ms-flex-pack:center;justify-content:center;-ms-flex-align:center;align-items:center}.ekko-lightbox-loader>div{width:40px;height:40px;position:relative;text-align:center}.ekko-lightbox-loader>div>div{width:100%;height:100%;border-radius:50%;background-color:#fff;opacity:.6;position:absolute;top:0;left:0;animation:a 2s infinite ease-in-out}.ekko-lightbox-loader>div>div:last-child{animation-delay:-1s}.modal-dialog .ekko-lightbox-loader>div>div{background-color:#333}@keyframes a{0%,to{transform:scale(0);-webkit-transform:scale(0)}50%{transform:scale(1);-webkit-transform:scale(1)}}
 /*# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbImVra28tbGlnaHRib3guY3NzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLGVBQ0UsOEJBQXlCLEFBQXpCLHVCQUF5QixBQUN6QixzQkFBb0IsQUFBcEIsbUJBQW9CLEFBQ3BCLHFCQUF3QixBQUF4Qix1QkFBd0IsQUFDeEIseUJBQTZCLENBQzlCLEFBQ0QseUJBQ0UsaUJBQW1CLENBQ3BCLEFBQ0QsZ0RBQ0Usa0JBQW1CLEFBQ25CLE1BQU8sQUFDUCxPQUFRLEFBQ1IsU0FBVSxBQUNWLFFBQVMsQUFDVCxVQUFZLENBQ2IsQUFDRCxzQkFDRSxXQUFZLEFBQ1osV0FBYSxDQUNkLEFBQ0QsMkJBQ0UsVUFBYSxBQUNiLGtCQUFtQixBQUNuQixNQUFPLEFBQ1AsT0FBUSxBQUNSLFdBQVksQUFDWixZQUFhLEFBQ2Isb0JBQWMsQUFBZCxZQUFjLENBQ2YsQUFDRCw2QkFDRSxXQUFRLEFBQVIsT0FBUSxBQUNSLG9CQUFjLEFBQWQsYUFBYyxBQUNkLHNCQUFvQixBQUFwQixtQkFBb0IsQUFDcEIsVUFBVyxBQUNYLHVCQUF5QixBQUN6QixXQUFZLEFBQ1osZUFBZ0IsQUFDaEIsU0FBYSxDQUNkLEFBQ0QsK0JBQ0Usb0JBQWEsQUFBYixXQUFhLENBQ2QsQUFDRCxvQ0FDRSxZQUFjLENBQ2YsQUFDRCxrQ0FDRSxjQUFnQixDQUNqQixBQUNELDZDQUNFLGdCQUFrQixDQUNuQixBQUNELG1DQUNFLG9CQUFzQixDQUN2QixBQUNELG1DQUNFLFlBQWMsQ0FDZixBQUNELHNDQUNFLGVBQWdCLEFBQ2hCLGlCQUFtQixDQUNwQixBQUNELHVCQUNFLFVBQVcsQUFDWCxvQkFBc0IsQ0FDdkIsQUFDRCw2QkFDRSxZQUFjLENBQ2YsQUFDRCw2QkFDRSxlQUFpQixDQUNsQixBQUNELHNCQUNFLGtCQUFtQixBQUNuQixNQUFPLEFBQ1AsT0FBUSxBQUNSLFNBQVUsQUFDVixRQUFTLEFBQ1QsV0FBWSxBQUNaLG9CQUFjLEFBQWQsYUFBYyxBQUVkLDBCQUF1QixBQUF2QixzQkFBdUIsQUFFdkIscUJBQXdCLEFBQXhCLHVCQUF3QixBQUV4QixzQkFBb0IsQUFBcEIsa0JBQW9CLENBQ3JCLEFBQ0QsMEJBQ0UsV0FBWSxBQUNaLFlBQWEsQUFDYixrQkFBbUIsQUFDbkIsaUJBQW1CLENBQ3BCLEFBQ0QsOEJBQ0UsV0FBWSxBQUNaLFlBQWEsQUFDYixrQkFBbUIsQUFDbkIsc0JBQXVCLEFBQ3ZCLFdBQWEsQUFDYixrQkFBbUIsQUFDbkIsTUFBTyxBQUNQLE9BQVEsQUFDUixtQ0FBNkMsQ0FDOUMsQUFDRCx5Q0FDRSxtQkFBcUIsQ0FDdEIsQUFDRCw0Q0FDRSxxQkFBdUIsQ0FDeEIsQUFVRCxhQUNFLE1BRUUsbUJBQW9CLEFBQ3BCLDBCQUE0QixDQUM3QixBQUNELElBQ0UsbUJBQW9CLEFBQ3BCLDBCQUE0QixDQUM3QixDQUNGIiwiZmlsZSI6ImVra28tbGlnaHRib3guY3NzIiwic291cmNlc0NvbnRlbnQiOlsiLmVra28tbGlnaHRib3gge1xuICBkaXNwbGF5OiBmbGV4ICFpbXBvcnRhbnQ7XG4gIGFsaWduLWl0ZW1zOiBjZW50ZXI7XG4gIGp1c3RpZnktY29udGVudDogY2VudGVyO1xuICBwYWRkaW5nLXJpZ2h0OiAwcHghaW1wb3J0YW50O1xufVxuLmVra28tbGlnaHRib3gtY29udGFpbmVyIHtcbiAgcG9zaXRpb246IHJlbGF0aXZlO1xufVxuLmVra28tbGlnaHRib3gtY29udGFpbmVyID4gZGl2LmVra28tbGlnaHRib3gtaXRlbSB7XG4gIHBvc2l0aW9uOiBhYnNvbHV0ZTtcbiAgdG9wOiAwO1xuICBsZWZ0OiAwO1xuICBib3R0b206IDA7XG4gIHJpZ2h0OiAwO1xuICB3aWR0aDogMTAwJTtcbn1cbi5la2tvLWxpZ2h0Ym94IGlmcmFtZSB7XG4gIHdpZHRoOiAxMDAlO1xuICBoZWlnaHQ6IDEwMCU7XG59XG4uZWtrby1saWdodGJveC1uYXYtb3ZlcmxheSB7XG4gIHotaW5kZXg6IDEwMDtcbiAgcG9zaXRpb246IGFic29sdXRlO1xuICB0b3A6IDA7XG4gIGxlZnQ6IDA7XG4gIHdpZHRoOiAxMDAlO1xuICBoZWlnaHQ6IDEwMCU7XG4gIGRpc3BsYXk6IGZsZXg7XG59XG4uZWtrby1saWdodGJveC1uYXYtb3ZlcmxheSBhIHtcbiAgZmxleDogMTtcbiAgZGlzcGxheTogZmxleDtcbiAgYWxpZ24taXRlbXM6IGNlbnRlcjtcbiAgb3BhY2l0eTogMDtcbiAgdHJhbnNpdGlvbjogb3BhY2l0eSAwLjVzO1xuICBjb2xvcjogI2ZmZjtcbiAgZm9udC1zaXplOiAzMHB4O1xuICB6LWluZGV4OiAxMDA7XG59XG4uZWtrby1saWdodGJveC1uYXYtb3ZlcmxheSBhID4gKiB7XG4gIGZsZXgtZ3JvdzogMTtcbn1cbi5la2tvLWxpZ2h0Ym94LW5hdi1vdmVybGF5IGEgPiAqOmZvY3VzIHtcbiAgb3V0bGluZTogbm9uZTtcbn1cbi5la2tvLWxpZ2h0Ym94LW5hdi1vdmVybGF5IGEgc3BhbiB7XG4gIHBhZGRpbmc6IDAgMzBweDtcbn1cbi5la2tvLWxpZ2h0Ym94LW5hdi1vdmVybGF5IGE6bGFzdC1jaGlsZCBzcGFuIHtcbiAgdGV4dC1hbGlnbjogcmlnaHQ7XG59XG4uZWtrby1saWdodGJveC1uYXYtb3ZlcmxheSBhOmhvdmVyIHtcbiAgdGV4dC1kZWNvcmF0aW9uOiBub25lO1xufVxuLmVra28tbGlnaHRib3gtbmF2LW92ZXJsYXkgYTpmb2N1cyB7XG4gIG91dGxpbmU6IG5vbmU7XG59XG4uZWtrby1saWdodGJveC1uYXYtb3ZlcmxheSBhLmRpc2FibGVkIHtcbiAgY3Vyc29yOiBkZWZhdWx0O1xuICB2aXNpYmlsaXR5OiBoaWRkZW47XG59XG4uZWtrby1saWdodGJveCBhOmhvdmVyIHtcbiAgb3BhY2l0eTogMTtcbiAgdGV4dC1kZWNvcmF0aW9uOiBub25lO1xufVxuLmVra28tbGlnaHRib3ggLm1vZGFsLWRpYWxvZyB7XG4gIGRpc3BsYXk6IG5vbmU7XG59XG4uZWtrby1saWdodGJveCAubW9kYWwtZm9vdGVyIHtcbiAgdGV4dC1hbGlnbjogbGVmdDtcbn1cbi5la2tvLWxpZ2h0Ym94LWxvYWRlciB7XG4gIHBvc2l0aW9uOiBhYnNvbHV0ZTtcbiAgdG9wOiAwO1xuICBsZWZ0OiAwO1xuICBib3R0b206IDA7XG4gIHJpZ2h0OiAwO1xuICB3aWR0aDogMTAwJTtcbiAgZGlzcGxheTogZmxleDtcbiAgLyogZXN0YWJsaXNoIGZsZXggY29udGFpbmVyICovXG4gIGZsZXgtZGlyZWN0aW9uOiBjb2x1bW47XG4gIC8qIG1ha2UgbWFpbiBheGlzIHZlcnRpY2FsICovXG4gIGp1c3RpZnktY29udGVudDogY2VudGVyO1xuICAvKiBjZW50ZXIgaXRlbXMgdmVydGljYWxseSwgaW4gdGhpcyBjYXNlICovXG4gIGFsaWduLWl0ZW1zOiBjZW50ZXI7XG59XG4uZWtrby1saWdodGJveC1sb2FkZXIgPiBkaXYge1xuICB3aWR0aDogNDBweDtcbiAgaGVpZ2h0OiA0MHB4O1xuICBwb3NpdGlvbjogcmVsYXRpdmU7XG4gIHRleHQtYWxpZ246IGNlbnRlcjtcbn1cbi5la2tvLWxpZ2h0Ym94LWxvYWRlciA+IGRpdiA+IGRpdiB7XG4gIHdpZHRoOiAxMDAlO1xuICBoZWlnaHQ6IDEwMCU7XG4gIGJvcmRlci1yYWRpdXM6IDUwJTtcbiAgYmFja2dyb3VuZC1jb2xvcjogI2ZmZjtcbiAgb3BhY2l0eTogMC42O1xuICBwb3NpdGlvbjogYWJzb2x1dGU7XG4gIHRvcDogMDtcbiAgbGVmdDogMDtcbiAgYW5pbWF0aW9uOiBzay1ib3VuY2UgMnMgaW5maW5pdGUgZWFzZS1pbi1vdXQ7XG59XG4uZWtrby1saWdodGJveC1sb2FkZXIgPiBkaXYgPiBkaXY6bGFzdC1jaGlsZCB7XG4gIGFuaW1hdGlvbi1kZWxheTogLTFzO1xufVxuLm1vZGFsLWRpYWxvZyAuZWtrby1saWdodGJveC1sb2FkZXIgPiBkaXYgPiBkaXYge1xuICBiYWNrZ3JvdW5kLWNvbG9yOiAjMzMzO1xufVxuQC13ZWJraXQta2V5ZnJhbWVzIHNrLWJvdW5jZSB7XG4gIDAlLFxuICAxMDAlIHtcbiAgICAtd2Via2l0LXRyYW5zZm9ybTogc2NhbGUoMCk7XG4gIH1cbiAgNTAlIHtcbiAgICAtd2Via2l0LXRyYW5zZm9ybTogc2NhbGUoMSk7XG4gIH1cbn1cbkBrZXlmcmFtZXMgc2stYm91bmNlIHtcbiAgMCUsXG4gIDEwMCUge1xuICAgIHRyYW5zZm9ybTogc2NhbGUoMCk7XG4gICAgLXdlYmtpdC10cmFuc2Zvcm06IHNjYWxlKDApO1xuICB9XG4gIDUwJSB7XG4gICAgdHJhbnNmb3JtOiBzY2FsZSgxKTtcbiAgICAtd2Via2l0LXRyYW5zZm9ybTogc2NhbGUoMSk7XG4gIH1cbn1cbiJdfQ== */
+@charset "UTF-8";
 /**
  * @author zhixin wen <wenzhixin2010@gmail.com>
- * version: 1.22.5
+ * version: 1.24.1
  * https://github.com/wenzhixin/bootstrap-table/
  */
 /* stylelint-disable annotation-no-unknown, max-line-length */
@@ -21134,7 +21018,6 @@ hr {
   display: block;
   clear: both;
 }
-
 .bootstrap-table .fixed-table-toolbar .bs-bars,
 .bootstrap-table .fixed-table-toolbar .search,
 .bootstrap-table .fixed-table-toolbar .columns {
@@ -21142,26 +21025,21 @@ hr {
   margin-top: 10px;
   margin-bottom: 10px;
 }
-
 .bootstrap-table .fixed-table-toolbar .columns .btn-group > .btn-group {
   display: inline-block;
   margin-left: -1px !important;
 }
-
 .bootstrap-table .fixed-table-toolbar .columns .btn-group > .btn-group > .btn {
   border-radius: 0;
 }
-
 .bootstrap-table .fixed-table-toolbar .columns .btn-group > .btn-group:first-child > .btn {
   border-top-left-radius: 4px;
   border-bottom-left-radius: 4px;
 }
-
 .bootstrap-table .fixed-table-toolbar .columns .btn-group > .btn-group:last-child > .btn {
   border-top-right-radius: 4px;
   border-bottom-right-radius: 4px;
 }
-
 .bootstrap-table .fixed-table-toolbar .columns .dropdown-menu {
   text-align: left;
   max-height: 300px;
@@ -21169,7 +21047,6 @@ hr {
   -ms-overflow-style: scrollbar;
   z-index: 1001;
 }
-
 .bootstrap-table .fixed-table-toolbar .columns label {
   display: block;
   padding: 3px 20px;
@@ -21177,53 +21054,43 @@ hr {
   font-weight: normal;
   line-height: 1.4286;
 }
-
 .bootstrap-table .fixed-table-toolbar .columns-left {
   margin-right: 5px;
 }
-
 .bootstrap-table .fixed-table-toolbar .columns-right {
   margin-left: 5px;
 }
-
 .bootstrap-table .fixed-table-toolbar .pull-right .dropdown-menu {
   right: 0;
   left: auto;
 }
-
 .bootstrap-table .fixed-table-container {
   position: relative;
   clear: both;
 }
-
 .bootstrap-table .fixed-table-container .table {
   width: 100%;
   margin-bottom: 0 !important;
 }
-
 .bootstrap-table .fixed-table-container .table th,
 .bootstrap-table .fixed-table-container .table td {
   vertical-align: middle;
   box-sizing: border-box;
 }
-
 .bootstrap-table .fixed-table-container .table thead th,
 .bootstrap-table .fixed-table-container .table tfoot th {
   vertical-align: bottom;
   padding: 0;
   margin: 0;
 }
-
 .bootstrap-table .fixed-table-container .table thead th:focus,
 .bootstrap-table .fixed-table-container .table tfoot th:focus {
   outline: 0 solid transparent;
 }
-
 .bootstrap-table .fixed-table-container .table thead th.detail,
 .bootstrap-table .fixed-table-container .table tfoot th.detail {
   width: 30px;
 }
-
 .bootstrap-table .fixed-table-container .table thead th .th-inner,
 .bootstrap-table .fixed-table-container .table tfoot th .th-inner {
   padding: 0.75rem;
@@ -21232,7 +21099,6 @@ hr {
   text-overflow: ellipsis;
   white-space: nowrap;
 }
-
 .bootstrap-table .fixed-table-container .table thead th .sortable,
 .bootstrap-table .fixed-table-container .table tfoot th .sortable {
   cursor: pointer;
@@ -21240,40 +21106,34 @@ hr {
   background-repeat: no-repeat;
   padding-right: 30px !important;
 }
-
 .bootstrap-table .fixed-table-container .table thead th .sortable.sortable-center,
 .bootstrap-table .fixed-table-container .table tfoot th .sortable.sortable-center {
   padding-left: 20px !important;
   padding-right: 20px !important;
 }
-
 .bootstrap-table .fixed-table-container .table thead th .both,
 .bootstrap-table .fixed-table-container .table tfoot th .both {
-  background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABMAAAATCAQAAADYWf5HAAAAkElEQVQoz7X QMQ5AQBCF4dWQSJxC5wwax1Cq1e7BAdxD5SL+Tq/QCM1oNiJidwox0355mXnG/DrEtIQ6azioNZQxI0ykPhTQIwhCR+BmBYtlK7kLJYwWCcJA9M4qdrZrd8pPjZWPtOqdRQy320YSV17OatFC4euts6z39GYMKRPCTKY9UnPQ6P+GtMRfGtPnBCiqhAeJPmkqAAAAAElFTkSuQmCC");
+  background-image: url('data:image/svg+xml;utf8,<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 320 512" fill="%23dcdcdc"><path d="m103.05877,41.4c9.37707,-12.5 24.60541,-12.5 33.98248,0l96.02113,128c6.90152,9.2 8.92696,22.9 5.17614,34.9s-12.45274,19.8 -22.20489,19.8l-192.04225,-0.1c-9.67713,0 -18.45406,-7.8 -22.20489,-19.8s-1.65036,-25.7 5.17614,-34.9l96.02113,-128l0.07501,0.1zm0,429.3l-96.02113,-128c-6.90152,-9.2 -8.92696,-22.9 -5.17614,-34.9s12.45274,-19.8 22.20489,-19.8l192.04225,0c9.67713,0 18.45406,7.8 22.20489,19.8s1.65036,25.7 -5.17614,34.9l-96.02113,128c-9.37707,12.5 -24.60541,12.5 -33.98248,0l-0.07501,0z"/></svg>');
+  background-size: 16px 16px;
+  background-position: center right 2px;
 }
-
 .bootstrap-table .fixed-table-container .table thead th .asc,
 .bootstrap-table .fixed-table-container .table tfoot th .asc {
-  background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABMAAAATCAYAAAByUDbMAAAAZ0lEQVQ4y2NgGLKgquEuFxBPAGI2ahhWCsS/gDibUoO0gPgxEP8H4ttArEyuQYxAPBdqEAxPBImTY5gjEL9DM+wTENuQahAvEO9DMwiGdwAxOymGJQLxTyD+jgWDxCMZRsEoGAVoAADeemwtPcZI2wAAAABJRU5ErkJggg==");
+  background-image: url('data:image/svg+xml;utf8,<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 320 512" fill="%237B83DB"><path d="m136.9496,41.4c-9.3763,-12.5 -24.60342,-12.5 -33.97972,0l-96.01334,128c-6.90096,9.2 -8.92624,22.9 -5.17572,34.9s12.45173,19.8 22.20309,19.8l192.02668,0c9.67634,0 18.45256,-7.8 22.20309,-19.8s1.65023,-25.7 -5.17572,-34.9l-96.01334,-128l-0.07501,0z"/></svg>');
 }
-
 .bootstrap-table .fixed-table-container .table thead th .desc,
 .bootstrap-table .fixed-table-container .table tfoot th .desc {
-  background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABMAAAATCAYAAAByUDbMAAAAZUlEQVQ4y2NgGAWjYBSggaqGu5FA/BOIv2PBIPFEUgxjB+IdQPwfC94HxLykus4GiD+hGfQOiB3J8SojEE9EM2wuSJzcsFMG4ttQgx4DsRalkZENxL+AuJQaMcsGxBOAmGvopk8AVz1sLZgg0bsAAAAASUVORK5CYII= ");
+  background-image: url('data:image/svg+xml;utf8,<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 320 512" fill="%237B83DB"><path d="m136.94959,471.6c-9.3763,12.5 -24.60342,12.5 -33.97972,0l-96.01334,-128c-6.90096,-9.2 -8.92624,-22.9 -5.17572,-34.9s12.45173,-19.8 22.20308,-19.8l192.02667,0c9.67634,0 18.45256,7.8 22.20308,19.8s1.65023,25.7 -5.17572,34.9l-96.01334,128l-0.07501,0z"/></svg>');
 }
-
 .bootstrap-table .fixed-table-container .table tbody tr.selected td {
   background-color: rgba(0, 0, 0, 0.075);
 }
-
 .bootstrap-table .fixed-table-container .table tbody tr.no-records-found td {
   text-align: center;
 }
-
 .bootstrap-table .fixed-table-container .table tbody tr .card-view {
   display: flex;
 }
-
 .bootstrap-table .fixed-table-container .table tbody tr .card-view .card-view-title {
   font-weight: bold;
   display: inline-block;
@@ -21281,60 +21141,47 @@ hr {
   width: auto !important;
   text-align: left !important;
 }
-
 .bootstrap-table .fixed-table-container .table tbody tr .card-view .card-view-value {
   width: 100% !important;
   text-align: left !important;
 }
-
 .bootstrap-table .fixed-table-container .table .bs-checkbox {
   text-align: center;
 }
-
 .bootstrap-table .fixed-table-container .table .bs-checkbox label {
   margin-bottom: 0;
 }
-
-.bootstrap-table .fixed-table-container .table .bs-checkbox label input[type="radio"],
-.bootstrap-table .fixed-table-container .table .bs-checkbox label input[type="checkbox"] {
+.bootstrap-table .fixed-table-container .table .bs-checkbox label input[type=radio],
+.bootstrap-table .fixed-table-container .table .bs-checkbox label input[type=checkbox] {
   margin: 0 auto !important;
 }
-
 .bootstrap-table .fixed-table-container .table.table-sm .th-inner {
   padding: 0.25rem;
 }
-
 .bootstrap-table .fixed-table-container.fixed-height:not(.has-footer) {
   border-bottom: 1px solid #dee2e6;
 }
-
 .bootstrap-table .fixed-table-container.fixed-height.has-card-view {
   border-top: 1px solid #dee2e6;
   border-bottom: 1px solid #dee2e6;
 }
-
 .bootstrap-table .fixed-table-container.fixed-height .fixed-table-border {
   border-left: 1px solid #dee2e6;
   border-right: 1px solid #dee2e6;
 }
-
 .bootstrap-table .fixed-table-container.fixed-height .table thead th {
   border-bottom: 1px solid #dee2e6;
 }
-
 .bootstrap-table .fixed-table-container.fixed-height .table-dark thead th {
   border-bottom: 1px solid #32383e;
 }
-
 .bootstrap-table .fixed-table-container .fixed-table-header {
   overflow: hidden;
 }
-
 .bootstrap-table .fixed-table-container .fixed-table-body {
-  overflow: auto auto;
+  overflow: auto;
   height: 100%;
 }
-
 .bootstrap-table .fixed-table-container .fixed-table-body .fixed-table-loading {
   align-items: center;
   background: #fff;
@@ -21349,28 +21196,23 @@ hr {
   opacity: 0;
   visibility: hidden;
 }
-
 .bootstrap-table .fixed-table-container .fixed-table-body .fixed-table-loading.open {
   visibility: visible;
   opacity: 1;
 }
-
 .bootstrap-table .fixed-table-container .fixed-table-body .fixed-table-loading .loading-wrap {
   align-items: baseline;
   display: flex;
   justify-content: center;
 }
-
 .bootstrap-table .fixed-table-container .fixed-table-body .fixed-table-loading .loading-wrap .loading-text {
   margin-right: 6px;
 }
-
 .bootstrap-table .fixed-table-container .fixed-table-body .fixed-table-loading .loading-wrap .animation-wrap {
   align-items: center;
   display: flex;
   justify-content: center;
 }
-
 .bootstrap-table .fixed-table-container .fixed-table-body .fixed-table-loading .loading-wrap .animation-dot,
 .bootstrap-table .fixed-table-container .fixed-table-body .fixed-table-loading .loading-wrap .animation-wrap::after,
 .bootstrap-table .fixed-table-container .fixed-table-body .fixed-table-loading .loading-wrap .animation-wrap::before {
@@ -21386,81 +21228,64 @@ hr {
   opacity: 0;
   width: 5px;
 }
-
 .bootstrap-table .fixed-table-container .fixed-table-body .fixed-table-loading .loading-wrap .animation-dot {
   animation-delay: 0.3s;
 }
-
 .bootstrap-table .fixed-table-container .fixed-table-body .fixed-table-loading .loading-wrap .animation-wrap::after {
   animation-delay: 0.6s;
 }
-
 .bootstrap-table .fixed-table-container .fixed-table-body .fixed-table-loading.table-dark {
   background: #212529;
 }
-
 .bootstrap-table .fixed-table-container .fixed-table-body .fixed-table-loading.table-dark .animation-dot,
 .bootstrap-table .fixed-table-container .fixed-table-body .fixed-table-loading.table-dark .animation-wrap::after,
 .bootstrap-table .fixed-table-container .fixed-table-body .fixed-table-loading.table-dark .animation-wrap::before {
   background: #fff;
 }
-
 .bootstrap-table .fixed-table-container .fixed-table-footer {
   overflow: hidden;
 }
-
 .bootstrap-table .fixed-table-pagination::after {
   content: "";
   display: block;
   clear: both;
 }
-
 .bootstrap-table .fixed-table-pagination > .pagination-detail,
 .bootstrap-table .fixed-table-pagination > .pagination {
   margin-top: 10px;
   margin-bottom: 10px;
 }
-
 .bootstrap-table .fixed-table-pagination > .pagination-detail .pagination-info {
   line-height: 34px;
   margin-right: 5px;
 }
-
 .bootstrap-table .fixed-table-pagination > .pagination-detail .page-list {
   display: inline-block;
 }
-
 .bootstrap-table .fixed-table-pagination > .pagination-detail .page-list .btn-group {
   position: relative;
   display: inline-block;
   vertical-align: middle;
 }
-
 .bootstrap-table .fixed-table-pagination > .pagination-detail .page-list .btn-group .dropdown-menu {
   margin-bottom: 0;
 }
-
 .bootstrap-table .fixed-table-pagination > .pagination ul.pagination {
   margin: 0;
 }
-
 .bootstrap-table .fixed-table-pagination > .pagination ul.pagination li.page-intermediate a {
   color: #c8c8c8;
 }
-
 .bootstrap-table .fixed-table-pagination > .pagination ul.pagination li.page-intermediate a::before {
-  content: "\2B05";
+  content: "⬅";
 }
-
 .bootstrap-table .fixed-table-pagination > .pagination ul.pagination li.page-intermediate a::after {
-  content: "\27A1";
+  content: "➡";
 }
-
 .bootstrap-table .fixed-table-pagination > .pagination ul.pagination li.disabled a {
   pointer-events: none;
   cursor: default;
 }
-
 .bootstrap-table.fullscreen {
   position: fixed;
   top: 0;
@@ -21468,18 +21293,15 @@ hr {
   z-index: 1050;
   width: 100% !important;
   background: #fff;
-  height: calc(100vh);
+  height: 100vh;
   overflow-y: scroll;
 }
-
 .bootstrap-table.bootstrap4 .pagination-lg .page-link, .bootstrap-table.bootstrap5 .pagination-lg .page-link {
   padding: 0.5rem 1rem;
 }
-
 .bootstrap-table.bootstrap5 .float-left {
   float: left;
 }
-
 .bootstrap-table.bootstrap5 .float-right {
   float: right;
 }
@@ -21825,7 +21647,19 @@ a.accordion-header {
 a.logo.no-hover a:hover {
   background-color: transparent;
 }
-.required {
+.index-block {
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+}
+.index-block:hover {
+  overflow: visible;
+  white-space: normal;
+  height: auto;
+}
+input:required,
+select:required,
+textarea:required {
   border-right: 6px solid orange;
 }
 .sidebar-menu {
@@ -21908,7 +21742,7 @@ img.navbar-brand-img,
   padding: 10px;
   background: #f4f4f4;
   margin-bottom: 3px;
-  border-left: 2px solid #e6e7e8;
+  border-inline: 2px solid #e6e7e8;
   color: #444;
   cursor: move;
 }
@@ -22199,8 +22033,13 @@ a.link-danger:hover {
 a.logo.no-hover a:hover {
   background-color: transparent;
 }
-.required {
-  border-right: 6px solid orange;
+input:required,
+select:required {
+  border-right: 5px solid orange;
+}
+select:required + .select2-container .select2-selection,
+select:required + .select2-container .select2-selection .select2-selection--multiple {
+  border-right: 5px solid orange !important;
 }
 body {
   font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", "Roboto", "Oxygen", "Ubuntu", "Cantarell", "Fira Sans", "Droid Sans", "Helvetica Neue", sans-serif;
@@ -22210,18 +22049,156 @@ body {
   font-size: 14px;
   white-space: normal;
 }
+.modal-warning .modal-help {
+  color: #fff8af;
+}
 .bootstrap-table .fixed-table-container .fixed-table-body .fixed-table-loading {
   z-index: 0 !important;
 }
 @media print {
-  a[href]:after {
-    content: none;
+  @page {
+    size: A4;
+    margin: 0mm;
   }
   .tab-content > .tab-pane {
     display: block !important;
     opacity: 1 !important;
     visibility: visible !important;
   }
+  .img-responsive {
+    width: 200px;
+  }
+  html,
+  body {
+    width: 1024px;
+  }
+  body {
+    margin: 0 auto;
+    line-height: 1em;
+    word-spacing: 1px;
+    letter-spacing: 0.2px;
+    font: 15px "Times New Roman", Times, serif;
+    background: white;
+    color: black;
+    width: 100%;
+    float: none;
+  }
+  /* avoid page-breaks inside a listingContainer*/
+  .listingContainer {
+    page-break-inside: avoid;
+  }
+  h1 {
+    font: 28px "Times New Roman", Times, serif;
+  }
+  h2 {
+    font: 24px "Times New Roman", Times, serif;
+  }
+  h3 {
+    font: 20px "Times New Roman", Times, serif;
+  }
+  /* Improve colour contrast of links */
+  a:link,
+  a:visited {
+    color: #781351;
+  }
+  /* URL */
+  a:link,
+  a:visited {
+    background: transparent;
+    color: #333;
+    text-decoration: none;
+  }
+  a[href]:after {
+    content: "" !important;
+  }
+  a[href^="http://"] {
+    color: #000;
+  }
+  #header {
+    height: 75px;
+    font-size: 24pt;
+    color: black;
+  }
+  div.row-new-striped {
+    margin: 0px;
+    padding: 0px;
+  }
+  .pagination-detail,
+  .fixed-table-toolbar {
+    visibility: hidden;
+  }
+  .col-sm-1,
+  .col-sm-2,
+  .col-sm-3,
+  .col-sm-4,
+  .col-sm-5,
+  .col-sm-6,
+  .col-sm-7,
+  .col-sm-8,
+  .col-sm-9,
+  .col-sm-10,
+  .col-sm-11,
+  .col-sm-12 .col-sm-pull-3 .col-sm-push-9 {
+    float: left;
+  }
+  .col-sm-12 {
+    width: 100%;
+  }
+  .col-sm-11 {
+    width: 91.66666667%;
+  }
+  .col-sm-10 {
+    width: 83.33333333%;
+  }
+  .col-sm-9 {
+    width: 75%;
+  }
+  .col-sm-8 {
+    width: 66.66666667%;
+  }
+  .col-sm-7 {
+    width: 58.33333333%;
+  }
+  .col-sm-6 {
+    width: 50%;
+  }
+  .col-sm-5 {
+    width: 41.66666667%;
+  }
+  .col-sm-4 {
+    width: 33.33333333%;
+  }
+  .col-sm-3 {
+    width: 25%;
+  }
+  .col-sm-2 {
+    width: 16.66666667%;
+  }
+  .col-sm-1 {
+    width: 8.33333333%;
+  }
+}
+.select2-selection__choice__remove {
+  color: white !important;
+}
+.select2-selection--multiple {
+  border-color: #d2d6de !important;
+  overflow-y: auto;
+}
+.select2-selection__choice {
+  border-radius: 0px !important;
+}
+.select2-search select2-search--inline {
+  height: 35px !important;
+  float: left;
+  margin: 0;
+}
+.select2-results__option {
+  padding: 5px;
+  -moz-user-select: none;
+       user-select: none;
+  -webkit-user-select: none;
+  margin: 0px;
 }
 img.navbar-brand-img,
 .navbar-brand > img {
@@ -22229,8 +22206,10 @@ img.navbar-brand-img,
   padding: 5px 5px 5px 0;
   max-height: 50px;
 }
-.input-daterange {
-  border-radius: 0px;
+.input-daterange,
+.input-daterange input:first-child,
+.input-daterange input:last-child {
+  border-radius: 0px !important;
 }
 .btn.bg-maroon,
 .btn.bg-purple {
@@ -22309,20 +22288,21 @@ h4 {
   background-color: #f9f9f9;
   border-top: 1px solid #dddddd;
   display: table-cell;
+  word-wrap: break-word;
 }
 .row-striped .row:nth-of-type(even) div {
   background: #FFFFFF;
   border-top: 1px solid #dddddd;
   display: table-cell;
+  word-wrap: break-word;
 }
 .row-new-striped {
   vertical-align: top;
-  line-height: 2.6;
-  padding: 0px;
-  margin-left: 20px;
+  padding: 3px;
   display: table;
   width: 100%;
-  padding-right: 20px;
+  word-wrap: break-word;
+  table-layout: fixed;
 }
 /**
 *  NEW STRIPING
@@ -22332,20 +22312,25 @@ h4 {
 .row-new-striped > .row:nth-of-type(even) {
   background: #FFFFFF;
   border-top: 1px solid #dddddd;
+  line-height: 1.9;
   display: table-row;
 }
 .row-new-striped > .row:nth-of-type(odd) {
   background-color: #F8F8F8;
   border-top: 1px solid #dddddd;
   display: table-row;
+  line-height: 1.9;
+  padding: 2px;
 }
 .row-new-striped div {
   display: table-cell;
   border-top: 1px solid #dddddd;
+  padding: 6px;
 }
 .row-new-striped div {
   display: table-cell;
   border-top: 1px solid #dddddd;
+  padding: 6px;
 }
 .row-new-striped div[class^="col"]:first-child {
   font-weight: bold;
@@ -22385,18 +22370,24 @@ h4 {
  any HTML used in the UserPresenter "title" attribute breaks the column selector HTML.
 
  Instead, we use CSS to add the icon into the table header, which leaves the column selector
- "title" text as-is.
-
- See https://github.com/snipe/snipe-it/issues/7989
+ "title" text as-is and hides the icon.
 
+ See https://github.com/grokability/snipe-it/issues/7989
  */
+th.css-accessory > .th-inner,
+th.css-accessory-alt > .th-inner,
 th.css-barcode > .th-inner,
-th.css-license > .th-inner,
+th.css-component > .th-inner,
 th.css-consumable > .th-inner,
 th.css-envelope > .th-inner,
-th.css-users > .th-inner,
+th.css-house-flag > .th-inner,
+th.css-house-laptop > .th-inner,
+th.css-house-user > .th-inner,
+th.css-license > .th-inner,
 th.css-location > .th-inner,
-th.css-accessory > .th-inner {
+th.css-users > .th-inner,
+th.css-currency > .th-inner,
+th.css-history > .th-inner {
   font-size: 0px;
   line-height: 0.75 !important;
   text-align: left;
@@ -22404,26 +22395,27 @@ th.css-accessory > .th-inner {
   -webkit-font-smoothing: antialiased;
   -moz-osx-font-smoothing: grayscale;
 }
-th.css-padlock > .th-inner::before,
+th.css-location > .th-inner::before,
+th.css-accessory > .th-inner::before,
+th.css-accessory-alt > .th-inner::before,
 th.css-barcode > .th-inner::before,
-th.css-license > .th-inner::before,
+th.css-component > .th-inner::before,
 th.css-consumable > .th-inner::before,
 th.css-envelope > .th-inner::before,
-th.css-users > .th-inner::before,
+th.css-house-flag > .th-inner::before,
+th.css-house-laptop > .th-inner::before,
+th.css-house-user > .th-inner::before,
+th.css-license > .th-inner::before,
 th.css-location > .th-inner::before,
-th.css-accessory > .th-inner::before {
+th.css-padlock > .th-inner::before,
+th.css-users > .th-inner::before,
+th.css-currency > .th-inner::before,
+th.css-history > .th-inner::before {
   display: inline-block;
   font-size: 20px;
   font-family: "Font Awesome 5 Free";
   font-weight: 900;
 }
-th.css-padlock > .th-inner::before {
-  content: "\f023";
-  font-family: "Font Awesome 5 Free";
-  font-weight: 900;
-  padding-right: 4px;
-  font-size: 12px;
-}
 /**
 BEGIN ICON TABLE HEADERS
 Set the font-weight css property as 900 (For Solid), 400 (Regular or Brands), 300 (Light for pro icons).
@@ -22464,6 +22456,52 @@ th.css-location > .th-inner::before {
   font-size: 19px;
   margin-bottom: 0px;
 }
+th.css-component > .th-inner::before {
+  content: "\f0a0";
+  font-family: "Font Awesome 5 Free";
+  font-weight: 500;
+}
+th.css-padlock > .th-inner::before {
+  content: "\f023";
+  font-family: "Font Awesome 5 Free";
+  font-weight: 900;
+}
+th.css-house-user > .th-inner::before {
+  content: "\e1b0";
+  font-family: "Font Awesome 5 Free";
+  font-size: 19px;
+  margin-bottom: 0px;
+}
+th.css-house-flag > .th-inner::before {
+  content: "\e50d";
+  font-family: "Font Awesome 5 Free";
+  font-size: 19px;
+  margin-bottom: 0px;
+}
+th.css-house-laptop > .th-inner::before {
+  content: "\e066";
+  font-family: "Font Awesome 5 Free";
+  font-size: 19px;
+  margin-bottom: 0px;
+}
+th.css-accessory-alt > .th-inner::before {
+  content: "\f11c";
+  font-family: "Font Awesome 5 Free";
+  font-size: 19px;
+  margin-bottom: 0px;
+}
+th.css-currency > .th-inner::before {
+  content: "\24";
+  font-family: "Font Awesome 5 Free";
+  font-size: 19px;
+  margin-bottom: 0px;
+}
+th.css-history > .th-inner::before {
+  content: "\f1da";
+  font-family: "Font Awesome 5 Free";
+  font-size: 19px;
+  margin-bottom: 0px;
+}
 .small-box .inner {
   padding-left: 15px;
   padding-right: 15px;
@@ -22482,7 +22520,8 @@ th.css-location > .th-inner::before {
   padding: 6px 12px;
   height: 34px;
 }
-.form-group.has-error label {
+.form-group.has-error label,
+.form-group.has-error .help-block {
   color: #a94442;
 }
 .select2-container--default .select2-selection--multiple {
@@ -22512,10 +22551,41 @@ th.css-location > .th-inner::before {
     margin-top: 50px;
   }
 }
-.ellipsis {
-  overflow: hidden;
-  white-space: nowrap;
-  text-overflow: ellipsis;
+@media screen and (max-width: 992px) {
+  .info-stack-container {
+    flex-direction: column;
+  }
+  .col-md-3.col-xs-12.col-sm-push-9.info-stack {
+    left: auto;
+    order: 1;
+  }
+  .col-md-9.col-xs-12.col-sm-pull-3.info-stack {
+    right: auto;
+    order: 2;
+  }
+  .info-stack-container > .col-md-9.col-xs-12.col-sm-pull-3.info-stack > .row-new-striped > .row > .col-sm-2 {
+    width: auto;
+    float: none;
+  }
+}
+@media screen and (max-width: 992px) {
+  .row-new-striped div {
+    width: 100%;
+  }
+}
+@media screen and (max-width: 1318px) and (min-width: 1200px) {
+  .admin.box {
+    height: 170px;
+  }
+}
+@media screen and (max-width: 1494px) and (min-width: 1200px) {
+  .dashboard.small-box {
+    white-space: nowrap;
+    text-overflow: ellipsis;
+    max-width: 188px;
+    display: block;
+    overflow: hidden;
+  }
 }
 /** Form-stuff overrides for checkboxes and stuff **/
 label.form-control {
@@ -22653,6 +22723,9 @@ input[type="radio"]:checked::before {
 .select2-container .select2-search--inline .select2-search__field {
   padding-left: 15px;
 }
+.nav-tabs-custom > .nav-tabs > li.active {
+  font-weight: bold;
+}
 /** --------------------------------------- **/
 /** End checkbox styles to replace iCheck   **/
 /** --------------------------------------- **/
@@ -22687,6 +22760,47 @@ input[type="radio"]:checked::before {
   filter: brightness(70%);
   font-size: 70%;
 }
+/** this is needed to override ekko-lightboxes card view styles **/
+.bootstrap-table .fixed-table-container .table tbody tr .card-view {
+  display: table-row !important;
+}
+td.text-right.text-padding-number-cell {
+  padding-right: 30px !important;
+  white-space: nowrap;
+}
+th.text-right.text-padding-number-footer-cell {
+  padding-right: 20px !important;
+  white-space: nowrap;
+}
+code.single-line {
+  white-space: pre-wrap;
+  display: -webkit-box;
+  -webkit-box-orient: vertical;
+  -webkit-line-clamp: 1;
+  overflow: hidden;
+  max-width: 400px;
+}
+p.monospace,
+span.monospace {
+  font-family: monospace, monospace;
+}
+legend.highlight {
+  background: repeating-linear-gradient(45deg, #222d32, #222d32 10px, #444 10px, #444 11px);
+  color: #fff;
+  font-size: 18px;
+  padding: 6px 6px 6px 10px;
+}
+legend.highlight a {
+  color: #fff;
+  cursor: pointer;
+}
+fieldset.bottom-padded {
+  padding-bottom: 20px;
+}
+caption.tableCaption {
+  font-size: 18px;
+  padding-left: 8px;
+}
 
 
 .select2-container {
@@ -23201,7 +23315,7 @@ input[type="radio"]:checked::before {
   padding: 10px;
   background: #f4f4f4;
   margin-bottom: 3px;
-  border-left: 2px solid #e6e7e8;
+  border-inline: 2px solid #e6e7e8;
   color: #444;
   cursor: move;
 }
@@ -23492,8 +23606,13 @@ a.link-danger:hover {
 a.logo.no-hover a:hover {
   background-color: transparent;
 }
-.required {
-  border-right: 6px solid orange;
+input:required,
+select:required {
+  border-right: 5px solid orange;
+}
+select:required + .select2-container .select2-selection,
+select:required + .select2-container .select2-selection .select2-selection--multiple {
+  border-right: 5px solid orange !important;
 }
 body {
   font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", "Roboto", "Oxygen", "Ubuntu", "Cantarell", "Fira Sans", "Droid Sans", "Helvetica Neue", sans-serif;
@@ -23503,18 +23622,156 @@ body {
   font-size: 14px;
   white-space: normal;
 }
+.modal-warning .modal-help {
+  color: #fff8af;
+}
 .bootstrap-table .fixed-table-container .fixed-table-body .fixed-table-loading {
   z-index: 0 !important;
 }
 @media print {
-  a[href]:after {
-    content: none;
+  @page {
+    size: A4;
+    margin: 0mm;
   }
   .tab-content > .tab-pane {
     display: block !important;
     opacity: 1 !important;
     visibility: visible !important;
   }
+  .img-responsive {
+    width: 200px;
+  }
+  html,
+  body {
+    width: 1024px;
+  }
+  body {
+    margin: 0 auto;
+    line-height: 1em;
+    word-spacing: 1px;
+    letter-spacing: 0.2px;
+    font: 15px "Times New Roman", Times, serif;
+    background: white;
+    color: black;
+    width: 100%;
+    float: none;
+  }
+  /* avoid page-breaks inside a listingContainer*/
+  .listingContainer {
+    page-break-inside: avoid;
+  }
+  h1 {
+    font: 28px "Times New Roman", Times, serif;
+  }
+  h2 {
+    font: 24px "Times New Roman", Times, serif;
+  }
+  h3 {
+    font: 20px "Times New Roman", Times, serif;
+  }
+  /* Improve colour contrast of links */
+  a:link,
+  a:visited {
+    color: #781351;
+  }
+  /* URL */
+  a:link,
+  a:visited {
+    background: transparent;
+    color: #333;
+    text-decoration: none;
+  }
+  a[href]:after {
+    content: "" !important;
+  }
+  a[href^="http://"] {
+    color: #000;
+  }
+  #header {
+    height: 75px;
+    font-size: 24pt;
+    color: black;
+  }
+  div.row-new-striped {
+    margin: 0px;
+    padding: 0px;
+  }
+  .pagination-detail,
+  .fixed-table-toolbar {
+    visibility: hidden;
+  }
+  .col-sm-1,
+  .col-sm-2,
+  .col-sm-3,
+  .col-sm-4,
+  .col-sm-5,
+  .col-sm-6,
+  .col-sm-7,
+  .col-sm-8,
+  .col-sm-9,
+  .col-sm-10,
+  .col-sm-11,
+  .col-sm-12 .col-sm-pull-3 .col-sm-push-9 {
+    float: left;
+  }
+  .col-sm-12 {
+    width: 100%;
+  }
+  .col-sm-11 {
+    width: 91.66666667%;
+  }
+  .col-sm-10 {
+    width: 83.33333333%;
+  }
+  .col-sm-9 {
+    width: 75%;
+  }
+  .col-sm-8 {
+    width: 66.66666667%;
+  }
+  .col-sm-7 {
+    width: 58.33333333%;
+  }
+  .col-sm-6 {
+    width: 50%;
+  }
+  .col-sm-5 {
+    width: 41.66666667%;
+  }
+  .col-sm-4 {
+    width: 33.33333333%;
+  }
+  .col-sm-3 {
+    width: 25%;
+  }
+  .col-sm-2 {
+    width: 16.66666667%;
+  }
+  .col-sm-1 {
+    width: 8.33333333%;
+  }
+}
+.select2-selection__choice__remove {
+  color: white !important;
+}
+.select2-selection--multiple {
+  border-color: #d2d6de !important;
+  overflow-y: auto;
+}
+.select2-selection__choice {
+  border-radius: 0px !important;
+}
+.select2-search select2-search--inline {
+  height: 35px !important;
+  float: left;
+  margin: 0;
+}
+.select2-results__option {
+  padding: 5px;
+  -moz-user-select: none;
+       user-select: none;
+  -webkit-user-select: none;
+  margin: 0px;
 }
 img.navbar-brand-img,
 .navbar-brand > img {
@@ -23522,8 +23779,10 @@ img.navbar-brand-img,
   padding: 5px 5px 5px 0;
   max-height: 50px;
 }
-.input-daterange {
-  border-radius: 0px;
+.input-daterange,
+.input-daterange input:first-child,
+.input-daterange input:last-child {
+  border-radius: 0px !important;
 }
 .btn.bg-maroon,
 .btn.bg-purple {
@@ -23602,20 +23861,21 @@ h4 {
   background-color: #f9f9f9;
   border-top: 1px solid #dddddd;
   display: table-cell;
+  word-wrap: break-word;
 }
 .row-striped .row:nth-of-type(even) div {
   background: #FFFFFF;
   border-top: 1px solid #dddddd;
   display: table-cell;
+  word-wrap: break-word;
 }
 .row-new-striped {
   vertical-align: top;
-  line-height: 2.6;
-  padding: 0px;
-  margin-left: 20px;
+  padding: 3px;
   display: table;
   width: 100%;
-  padding-right: 20px;
+  word-wrap: break-word;
+  table-layout: fixed;
 }
 /**
 *  NEW STRIPING
@@ -23625,20 +23885,25 @@ h4 {
 .row-new-striped > .row:nth-of-type(even) {
   background: #FFFFFF;
   border-top: 1px solid #dddddd;
+  line-height: 1.9;
   display: table-row;
 }
 .row-new-striped > .row:nth-of-type(odd) {
   background-color: #F8F8F8;
   border-top: 1px solid #dddddd;
   display: table-row;
+  line-height: 1.9;
+  padding: 2px;
 }
 .row-new-striped div {
   display: table-cell;
   border-top: 1px solid #dddddd;
+  padding: 6px;
 }
 .row-new-striped div {
   display: table-cell;
   border-top: 1px solid #dddddd;
+  padding: 6px;
 }
 .row-new-striped div[class^="col"]:first-child {
   font-weight: bold;
@@ -23678,18 +23943,24 @@ h4 {
  any HTML used in the UserPresenter "title" attribute breaks the column selector HTML.
 
  Instead, we use CSS to add the icon into the table header, which leaves the column selector
- "title" text as-is.
-
- See https://github.com/snipe/snipe-it/issues/7989
+ "title" text as-is and hides the icon.
 
+ See https://github.com/grokability/snipe-it/issues/7989
  */
+th.css-accessory > .th-inner,
+th.css-accessory-alt > .th-inner,
 th.css-barcode > .th-inner,
-th.css-license > .th-inner,
+th.css-component > .th-inner,
 th.css-consumable > .th-inner,
 th.css-envelope > .th-inner,
-th.css-users > .th-inner,
+th.css-house-flag > .th-inner,
+th.css-house-laptop > .th-inner,
+th.css-house-user > .th-inner,
+th.css-license > .th-inner,
 th.css-location > .th-inner,
-th.css-accessory > .th-inner {
+th.css-users > .th-inner,
+th.css-currency > .th-inner,
+th.css-history > .th-inner {
   font-size: 0px;
   line-height: 0.75 !important;
   text-align: left;
@@ -23697,26 +23968,27 @@ th.css-accessory > .th-inner {
   -webkit-font-smoothing: antialiased;
   -moz-osx-font-smoothing: grayscale;
 }
-th.css-padlock > .th-inner::before,
+th.css-location > .th-inner::before,
+th.css-accessory > .th-inner::before,
+th.css-accessory-alt > .th-inner::before,
 th.css-barcode > .th-inner::before,
-th.css-license > .th-inner::before,
+th.css-component > .th-inner::before,
 th.css-consumable > .th-inner::before,
 th.css-envelope > .th-inner::before,
-th.css-users > .th-inner::before,
+th.css-house-flag > .th-inner::before,
+th.css-house-laptop > .th-inner::before,
+th.css-house-user > .th-inner::before,
+th.css-license > .th-inner::before,
 th.css-location > .th-inner::before,
-th.css-accessory > .th-inner::before {
+th.css-padlock > .th-inner::before,
+th.css-users > .th-inner::before,
+th.css-currency > .th-inner::before,
+th.css-history > .th-inner::before {
   display: inline-block;
   font-size: 20px;
   font-family: "Font Awesome 5 Free";
   font-weight: 900;
 }
-th.css-padlock > .th-inner::before {
-  content: "\f023";
-  font-family: "Font Awesome 5 Free";
-  font-weight: 900;
-  padding-right: 4px;
-  font-size: 12px;
-}
 /**
 BEGIN ICON TABLE HEADERS
 Set the font-weight css property as 900 (For Solid), 400 (Regular or Brands), 300 (Light for pro icons).
@@ -23757,6 +24029,52 @@ th.css-location > .th-inner::before {
   font-size: 19px;
   margin-bottom: 0px;
 }
+th.css-component > .th-inner::before {
+  content: "\f0a0";
+  font-family: "Font Awesome 5 Free";
+  font-weight: 500;
+}
+th.css-padlock > .th-inner::before {
+  content: "\f023";
+  font-family: "Font Awesome 5 Free";
+  font-weight: 900;
+}
+th.css-house-user > .th-inner::before {
+  content: "\e1b0";
+  font-family: "Font Awesome 5 Free";
+  font-size: 19px;
+  margin-bottom: 0px;
+}
+th.css-house-flag > .th-inner::before {
+  content: "\e50d";
+  font-family: "Font Awesome 5 Free";
+  font-size: 19px;
+  margin-bottom: 0px;
+}
+th.css-house-laptop > .th-inner::before {
+  content: "\e066";
+  font-family: "Font Awesome 5 Free";
+  font-size: 19px;
+  margin-bottom: 0px;
+}
+th.css-accessory-alt > .th-inner::before {
+  content: "\f11c";
+  font-family: "Font Awesome 5 Free";
+  font-size: 19px;
+  margin-bottom: 0px;
+}
+th.css-currency > .th-inner::before {
+  content: "\24";
+  font-family: "Font Awesome 5 Free";
+  font-size: 19px;
+  margin-bottom: 0px;
+}
+th.css-history > .th-inner::before {
+  content: "\f1da";
+  font-family: "Font Awesome 5 Free";
+  font-size: 19px;
+  margin-bottom: 0px;
+}
 .small-box .inner {
   padding-left: 15px;
   padding-right: 15px;
@@ -23775,7 +24093,8 @@ th.css-location > .th-inner::before {
   padding: 6px 12px;
   height: 34px;
 }
-.form-group.has-error label {
+.form-group.has-error label,
+.form-group.has-error .help-block {
   color: #a94442;
 }
 .select2-container--default .select2-selection--multiple {
@@ -23805,10 +24124,41 @@ th.css-location > .th-inner::before {
     margin-top: 50px;
   }
 }
-.ellipsis {
-  overflow: hidden;
-  white-space: nowrap;
-  text-overflow: ellipsis;
+@media screen and (max-width: 992px) {
+  .info-stack-container {
+    flex-direction: column;
+  }
+  .col-md-3.col-xs-12.col-sm-push-9.info-stack {
+    left: auto;
+    order: 1;
+  }
+  .col-md-9.col-xs-12.col-sm-pull-3.info-stack {
+    right: auto;
+    order: 2;
+  }
+  .info-stack-container > .col-md-9.col-xs-12.col-sm-pull-3.info-stack > .row-new-striped > .row > .col-sm-2 {
+    width: auto;
+    float: none;
+  }
+}
+@media screen and (max-width: 992px) {
+  .row-new-striped div {
+    width: 100%;
+  }
+}
+@media screen and (max-width: 1318px) and (min-width: 1200px) {
+  .admin.box {
+    height: 170px;
+  }
+}
+@media screen and (max-width: 1494px) and (min-width: 1200px) {
+  .dashboard.small-box {
+    white-space: nowrap;
+    text-overflow: ellipsis;
+    max-width: 188px;
+    display: block;
+    overflow: hidden;
+  }
 }
 /** Form-stuff overrides for checkboxes and stuff **/
 label.form-control {
@@ -23946,6 +24296,9 @@ input[type="radio"]:checked::before {
 .select2-container .select2-search--inline .select2-search__field {
   padding-left: 15px;
 }
+.nav-tabs-custom > .nav-tabs > li.active {
+  font-weight: bold;
+}
 /** --------------------------------------- **/
 /** End checkbox styles to replace iCheck   **/
 /** --------------------------------------- **/
@@ -23980,4 +24333,45 @@ input[type="radio"]:checked::before {
   filter: brightness(70%);
   font-size: 70%;
 }
+/** this is needed to override ekko-lightboxes card view styles **/
+.bootstrap-table .fixed-table-container .table tbody tr .card-view {
+  display: table-row !important;
+}
+td.text-right.text-padding-number-cell {
+  padding-right: 30px !important;
+  white-space: nowrap;
+}
+th.text-right.text-padding-number-footer-cell {
+  padding-right: 20px !important;
+  white-space: nowrap;
+}
+code.single-line {
+  white-space: pre-wrap;
+  display: -webkit-box;
+  -webkit-box-orient: vertical;
+  -webkit-line-clamp: 1;
+  overflow: hidden;
+  max-width: 400px;
+}
+p.monospace,
+span.monospace {
+  font-family: monospace, monospace;
+}
+legend.highlight {
+  background: repeating-linear-gradient(45deg, #222d32, #222d32 10px, #444 10px, #444 11px);
+  color: #fff;
+  font-size: 18px;
+  padding: 6px 6px 6px 10px;
+}
+legend.highlight a {
+  color: #fff;
+  cursor: pointer;
+}
+fieldset.bottom-padded {
+  padding-bottom: 20px;
+}
+caption.tableCaption {
+  font-size: 18px;
+  padding-left: 8px;
+}
 
diff --git a/public/css/dist/bootstrap-table.css b/public/css/dist/bootstrap-table.css
index eb5b8c0b19..1204064366 100644
--- a/public/css/dist/bootstrap-table.css
+++ b/public/css/dist/bootstrap-table.css
@@ -1,6 +1,7 @@
+@charset "UTF-8";
 /**
  * @author zhixin wen <wenzhixin2010@gmail.com>
- * version: 1.22.5
+ * version: 1.24.1
  * https://github.com/wenzhixin/bootstrap-table/
  */
 /* stylelint-disable annotation-no-unknown, max-line-length */
@@ -10,7 +11,6 @@
   display: block;
   clear: both;
 }
-
 .bootstrap-table .fixed-table-toolbar .bs-bars,
 .bootstrap-table .fixed-table-toolbar .search,
 .bootstrap-table .fixed-table-toolbar .columns {
@@ -18,26 +18,21 @@
   margin-top: 10px;
   margin-bottom: 10px;
 }
-
 .bootstrap-table .fixed-table-toolbar .columns .btn-group > .btn-group {
   display: inline-block;
   margin-left: -1px !important;
 }
-
 .bootstrap-table .fixed-table-toolbar .columns .btn-group > .btn-group > .btn {
   border-radius: 0;
 }
-
 .bootstrap-table .fixed-table-toolbar .columns .btn-group > .btn-group:first-child > .btn {
   border-top-left-radius: 4px;
   border-bottom-left-radius: 4px;
 }
-
 .bootstrap-table .fixed-table-toolbar .columns .btn-group > .btn-group:last-child > .btn {
   border-top-right-radius: 4px;
   border-bottom-right-radius: 4px;
 }
-
 .bootstrap-table .fixed-table-toolbar .columns .dropdown-menu {
   text-align: left;
   max-height: 300px;
@@ -45,7 +40,6 @@
   -ms-overflow-style: scrollbar;
   z-index: 1001;
 }
-
 .bootstrap-table .fixed-table-toolbar .columns label {
   display: block;
   padding: 3px 20px;
@@ -53,53 +47,43 @@
   font-weight: normal;
   line-height: 1.4286;
 }
-
 .bootstrap-table .fixed-table-toolbar .columns-left {
   margin-right: 5px;
 }
-
 .bootstrap-table .fixed-table-toolbar .columns-right {
   margin-left: 5px;
 }
-
 .bootstrap-table .fixed-table-toolbar .pull-right .dropdown-menu {
   right: 0;
   left: auto;
 }
-
 .bootstrap-table .fixed-table-container {
   position: relative;
   clear: both;
 }
-
 .bootstrap-table .fixed-table-container .table {
   width: 100%;
   margin-bottom: 0 !important;
 }
-
 .bootstrap-table .fixed-table-container .table th,
 .bootstrap-table .fixed-table-container .table td {
   vertical-align: middle;
   box-sizing: border-box;
 }
-
 .bootstrap-table .fixed-table-container .table thead th,
 .bootstrap-table .fixed-table-container .table tfoot th {
   vertical-align: bottom;
   padding: 0;
   margin: 0;
 }
-
 .bootstrap-table .fixed-table-container .table thead th:focus,
 .bootstrap-table .fixed-table-container .table tfoot th:focus {
   outline: 0 solid transparent;
 }
-
 .bootstrap-table .fixed-table-container .table thead th.detail,
 .bootstrap-table .fixed-table-container .table tfoot th.detail {
   width: 30px;
 }
-
 .bootstrap-table .fixed-table-container .table thead th .th-inner,
 .bootstrap-table .fixed-table-container .table tfoot th .th-inner {
   padding: 0.75rem;
@@ -108,7 +92,6 @@
   text-overflow: ellipsis;
   white-space: nowrap;
 }
-
 .bootstrap-table .fixed-table-container .table thead th .sortable,
 .bootstrap-table .fixed-table-container .table tfoot th .sortable {
   cursor: pointer;
@@ -116,40 +99,34 @@
   background-repeat: no-repeat;
   padding-right: 30px !important;
 }
-
 .bootstrap-table .fixed-table-container .table thead th .sortable.sortable-center,
 .bootstrap-table .fixed-table-container .table tfoot th .sortable.sortable-center {
   padding-left: 20px !important;
   padding-right: 20px !important;
 }
-
 .bootstrap-table .fixed-table-container .table thead th .both,
 .bootstrap-table .fixed-table-container .table tfoot th .both {
-  background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABMAAAATCAQAAADYWf5HAAAAkElEQVQoz7X QMQ5AQBCF4dWQSJxC5wwax1Cq1e7BAdxD5SL+Tq/QCM1oNiJidwox0355mXnG/DrEtIQ6azioNZQxI0ykPhTQIwhCR+BmBYtlK7kLJYwWCcJA9M4qdrZrd8pPjZWPtOqdRQy320YSV17OatFC4euts6z39GYMKRPCTKY9UnPQ6P+GtMRfGtPnBCiqhAeJPmkqAAAAAElFTkSuQmCC");
+  background-image: url('data:image/svg+xml;utf8,<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 320 512" fill="%23dcdcdc"><path d="m103.05877,41.4c9.37707,-12.5 24.60541,-12.5 33.98248,0l96.02113,128c6.90152,9.2 8.92696,22.9 5.17614,34.9s-12.45274,19.8 -22.20489,19.8l-192.04225,-0.1c-9.67713,0 -18.45406,-7.8 -22.20489,-19.8s-1.65036,-25.7 5.17614,-34.9l96.02113,-128l0.07501,0.1zm0,429.3l-96.02113,-128c-6.90152,-9.2 -8.92696,-22.9 -5.17614,-34.9s12.45274,-19.8 22.20489,-19.8l192.04225,0c9.67713,0 18.45406,7.8 22.20489,19.8s1.65036,25.7 -5.17614,34.9l-96.02113,128c-9.37707,12.5 -24.60541,12.5 -33.98248,0l-0.07501,0z"/></svg>');
+  background-size: 16px 16px;
+  background-position: center right 2px;
 }
-
 .bootstrap-table .fixed-table-container .table thead th .asc,
 .bootstrap-table .fixed-table-container .table tfoot th .asc {
-  background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABMAAAATCAYAAAByUDbMAAAAZ0lEQVQ4y2NgGLKgquEuFxBPAGI2ahhWCsS/gDibUoO0gPgxEP8H4ttArEyuQYxAPBdqEAxPBImTY5gjEL9DM+wTENuQahAvEO9DMwiGdwAxOymGJQLxTyD+jgWDxCMZRsEoGAVoAADeemwtPcZI2wAAAABJRU5ErkJggg==");
+  background-image: url('data:image/svg+xml;utf8,<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 320 512" fill="%237B83DB"><path d="m136.9496,41.4c-9.3763,-12.5 -24.60342,-12.5 -33.97972,0l-96.01334,128c-6.90096,9.2 -8.92624,22.9 -5.17572,34.9s12.45173,19.8 22.20309,19.8l192.02668,0c9.67634,0 18.45256,-7.8 22.20309,-19.8s1.65023,-25.7 -5.17572,-34.9l-96.01334,-128l-0.07501,0z"/></svg>');
 }
-
 .bootstrap-table .fixed-table-container .table thead th .desc,
 .bootstrap-table .fixed-table-container .table tfoot th .desc {
-  background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABMAAAATCAYAAAByUDbMAAAAZUlEQVQ4y2NgGAWjYBSggaqGu5FA/BOIv2PBIPFEUgxjB+IdQPwfC94HxLykus4GiD+hGfQOiB3J8SojEE9EM2wuSJzcsFMG4ttQgx4DsRalkZENxL+AuJQaMcsGxBOAmGvopk8AVz1sLZgg0bsAAAAASUVORK5CYII= ");
+  background-image: url('data:image/svg+xml;utf8,<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 320 512" fill="%237B83DB"><path d="m136.94959,471.6c-9.3763,12.5 -24.60342,12.5 -33.97972,0l-96.01334,-128c-6.90096,-9.2 -8.92624,-22.9 -5.17572,-34.9s12.45173,-19.8 22.20308,-19.8l192.02667,0c9.67634,0 18.45256,7.8 22.20308,19.8s1.65023,25.7 -5.17572,34.9l-96.01334,128l-0.07501,0z"/></svg>');
 }
-
 .bootstrap-table .fixed-table-container .table tbody tr.selected td {
   background-color: rgba(0, 0, 0, 0.075);
 }
-
 .bootstrap-table .fixed-table-container .table tbody tr.no-records-found td {
   text-align: center;
 }
-
 .bootstrap-table .fixed-table-container .table tbody tr .card-view {
   display: flex;
 }
-
 .bootstrap-table .fixed-table-container .table tbody tr .card-view .card-view-title {
   font-weight: bold;
   display: inline-block;
@@ -157,60 +134,47 @@
   width: auto !important;
   text-align: left !important;
 }
-
 .bootstrap-table .fixed-table-container .table tbody tr .card-view .card-view-value {
   width: 100% !important;
   text-align: left !important;
 }
-
 .bootstrap-table .fixed-table-container .table .bs-checkbox {
   text-align: center;
 }
-
 .bootstrap-table .fixed-table-container .table .bs-checkbox label {
   margin-bottom: 0;
 }
-
-.bootstrap-table .fixed-table-container .table .bs-checkbox label input[type="radio"],
-.bootstrap-table .fixed-table-container .table .bs-checkbox label input[type="checkbox"] {
+.bootstrap-table .fixed-table-container .table .bs-checkbox label input[type=radio],
+.bootstrap-table .fixed-table-container .table .bs-checkbox label input[type=checkbox] {
   margin: 0 auto !important;
 }
-
 .bootstrap-table .fixed-table-container .table.table-sm .th-inner {
   padding: 0.25rem;
 }
-
 .bootstrap-table .fixed-table-container.fixed-height:not(.has-footer) {
   border-bottom: 1px solid #dee2e6;
 }
-
 .bootstrap-table .fixed-table-container.fixed-height.has-card-view {
   border-top: 1px solid #dee2e6;
   border-bottom: 1px solid #dee2e6;
 }
-
 .bootstrap-table .fixed-table-container.fixed-height .fixed-table-border {
   border-left: 1px solid #dee2e6;
   border-right: 1px solid #dee2e6;
 }
-
 .bootstrap-table .fixed-table-container.fixed-height .table thead th {
   border-bottom: 1px solid #dee2e6;
 }
-
 .bootstrap-table .fixed-table-container.fixed-height .table-dark thead th {
   border-bottom: 1px solid #32383e;
 }
-
 .bootstrap-table .fixed-table-container .fixed-table-header {
   overflow: hidden;
 }
-
 .bootstrap-table .fixed-table-container .fixed-table-body {
-  overflow: auto auto;
+  overflow: auto;
   height: 100%;
 }
-
 .bootstrap-table .fixed-table-container .fixed-table-body .fixed-table-loading {
   align-items: center;
   background: #fff;
@@ -225,28 +189,23 @@
   opacity: 0;
   visibility: hidden;
 }
-
 .bootstrap-table .fixed-table-container .fixed-table-body .fixed-table-loading.open {
   visibility: visible;
   opacity: 1;
 }
-
 .bootstrap-table .fixed-table-container .fixed-table-body .fixed-table-loading .loading-wrap {
   align-items: baseline;
   display: flex;
   justify-content: center;
 }
-
 .bootstrap-table .fixed-table-container .fixed-table-body .fixed-table-loading .loading-wrap .loading-text {
   margin-right: 6px;
 }
-
 .bootstrap-table .fixed-table-container .fixed-table-body .fixed-table-loading .loading-wrap .animation-wrap {
   align-items: center;
   display: flex;
   justify-content: center;
 }
-
 .bootstrap-table .fixed-table-container .fixed-table-body .fixed-table-loading .loading-wrap .animation-dot,
 .bootstrap-table .fixed-table-container .fixed-table-body .fixed-table-loading .loading-wrap .animation-wrap::after,
 .bootstrap-table .fixed-table-container .fixed-table-body .fixed-table-loading .loading-wrap .animation-wrap::before {
@@ -262,81 +221,64 @@
   opacity: 0;
   width: 5px;
 }
-
 .bootstrap-table .fixed-table-container .fixed-table-body .fixed-table-loading .loading-wrap .animation-dot {
   animation-delay: 0.3s;
 }
-
 .bootstrap-table .fixed-table-container .fixed-table-body .fixed-table-loading .loading-wrap .animation-wrap::after {
   animation-delay: 0.6s;
 }
-
 .bootstrap-table .fixed-table-container .fixed-table-body .fixed-table-loading.table-dark {
   background: #212529;
 }
-
 .bootstrap-table .fixed-table-container .fixed-table-body .fixed-table-loading.table-dark .animation-dot,
 .bootstrap-table .fixed-table-container .fixed-table-body .fixed-table-loading.table-dark .animation-wrap::after,
 .bootstrap-table .fixed-table-container .fixed-table-body .fixed-table-loading.table-dark .animation-wrap::before {
   background: #fff;
 }
-
 .bootstrap-table .fixed-table-container .fixed-table-footer {
   overflow: hidden;
 }
-
 .bootstrap-table .fixed-table-pagination::after {
   content: "";
   display: block;
   clear: both;
 }
-
 .bootstrap-table .fixed-table-pagination > .pagination-detail,
 .bootstrap-table .fixed-table-pagination > .pagination {
   margin-top: 10px;
   margin-bottom: 10px;
 }
-
 .bootstrap-table .fixed-table-pagination > .pagination-detail .pagination-info {
   line-height: 34px;
   margin-right: 5px;
 }
-
 .bootstrap-table .fixed-table-pagination > .pagination-detail .page-list {
   display: inline-block;
 }
-
 .bootstrap-table .fixed-table-pagination > .pagination-detail .page-list .btn-group {
   position: relative;
   display: inline-block;
   vertical-align: middle;
 }
-
 .bootstrap-table .fixed-table-pagination > .pagination-detail .page-list .btn-group .dropdown-menu {
   margin-bottom: 0;
 }
-
 .bootstrap-table .fixed-table-pagination > .pagination ul.pagination {
   margin: 0;
 }
-
 .bootstrap-table .fixed-table-pagination > .pagination ul.pagination li.page-intermediate a {
   color: #c8c8c8;
 }
-
 .bootstrap-table .fixed-table-pagination > .pagination ul.pagination li.page-intermediate a::before {
-  content: "\2B05";
+  content: "⬅";
 }
-
 .bootstrap-table .fixed-table-pagination > .pagination ul.pagination li.page-intermediate a::after {
-  content: "\27A1";
+  content: "➡";
 }
-
 .bootstrap-table .fixed-table-pagination > .pagination ul.pagination li.disabled a {
   pointer-events: none;
   cursor: default;
 }
-
 .bootstrap-table.fullscreen {
   position: fixed;
   top: 0;
@@ -344,18 +286,15 @@
   z-index: 1050;
   width: 100% !important;
   background: #fff;
-  height: calc(100vh);
+  height: 100vh;
   overflow-y: scroll;
 }
-
 .bootstrap-table.bootstrap4 .pagination-lg .page-link, .bootstrap-table.bootstrap5 .pagination-lg .page-link {
   padding: 0.5rem 1rem;
 }
-
 .bootstrap-table.bootstrap5 .float-left {
   float: left;
 }
-
 .bootstrap-table.bootstrap5 .float-right {
   float: right;
 }
diff --git a/public/css/dist/skins/_all-skins.css b/public/css/dist/skins/_all-skins.css
new file mode 100644
index 0000000000..6e7722f34b
--- /dev/null
+++ b/public/css/dist/skins/_all-skins.css
@@ -0,0 +1,5473 @@
+/*
+ * Skin: Black
+ * ----------
+ */
+.skin-black .main-header .navbar {
+  background-color: #111;
+}
+.skin-black .main-header .navbar .nav > li > a {
+  color: #fff;
+}
+.skin-black .main-header .navbar .nav > li > a:hover,
+.skin-black .main-header .navbar .nav > li > a:active,
+.skin-black .main-header .navbar .nav > li > a:focus,
+.skin-black .main-header .navbar .nav .open > a,
+.skin-black .main-header .navbar .nav .open > a:hover,
+.skin-black .main-header .navbar .nav .open > a:focus,
+.skin-black .main-header .navbar .nav > .active > a {
+  background: rgba(0, 0, 0, 0.1);
+  color: #f6f6f6;
+}
+.skin-black .main-header .navbar .sidebar-toggle {
+  color: #fff;
+}
+.skin-black .main-header .navbar .sidebar-toggle:hover {
+  color: #f6f6f6;
+  background: rgba(0, 0, 0, 0.1);
+}
+.skin-black .main-header .navbar .sidebar-toggle {
+  color: #fff;
+}
+.skin-black .main-header .navbar .sidebar-toggle:hover {
+  background-color: #040404;
+}
+@media (max-width: 767px) {
+  .skin-black .main-header .navbar .dropdown-menu li.divider {
+    background-color: rgba(255, 255, 255, 0.1);
+  }
+  .skin-black .main-header .navbar .dropdown-menu li a {
+    color: #333;
+  }
+  .skin-black .main-header .navbar .dropdown-menu li a:hover {
+    background: #040404;
+  }
+}
+.skin-black .main-header li.user-header {
+  background-color: #111;
+}
+.skin-black .content-header {
+  background: transparent;
+}
+.skin-black .wrapper,
+.skin-black .main-sidebar,
+.skin-black .left-side {
+  background-color: #222d32;
+}
+.skin-black .user-panel > .info,
+.skin-black .user-panel > .info > a {
+  color: #fff;
+}
+.skin-black .sidebar-menu > li.header {
+  color: #4b646f;
+  background: #1a2226;
+}
+.skin-black .sidebar-menu > li > a {
+  border-left: 3px solid transparent;
+}
+.skin-black .sidebar-menu > li:hover > a,
+.skin-black .sidebar-menu > li.active > a {
+  color: #fff;
+  background: #1e282c;
+  border-left-color: #111;
+}
+.skin-black .sidebar-menu > li > .treeview-menu {
+  margin: 0 1px;
+  background: #2c3b41;
+}
+.skin-black .sidebar a {
+  color: #b8c7ce;
+}
+.skin-black .sidebar a:hover {
+  text-decoration: none;
+}
+.skin-black .treeview-menu > li > a {
+  color: #8aa4af;
+}
+.skin-black .treeview-menu > li.active > a,
+.skin-black .treeview-menu > li > a:hover {
+  color: #fff;
+}
+.skin-black .sidebar-form {
+  border-radius: 3px;
+  border: 1px solid #374850;
+  margin: 10px 10px;
+}
+.skin-black .sidebar-form input[type="text"],
+.skin-black .sidebar-form .btn {
+  box-shadow: none;
+  background-color: #374850;
+  border: 1px solid transparent;
+  height: 35px;
+  transition: all 0.3s ease-in-out;
+}
+.skin-black .sidebar-form input[type="text"] {
+  color: #666;
+  border-top-left-radius: 2px;
+  border-top-right-radius: 0;
+  border-bottom-right-radius: 0;
+  border-bottom-left-radius: 2px;
+}
+.skin-black .sidebar-form input[type="text"]:focus,
+.skin-black .sidebar-form input[type="text"]:focus + .input-group-btn .btn {
+  background-color: #fff;
+  color: #666;
+}
+.skin-black .sidebar-form input[type="text"]:focus + .input-group-btn .btn {
+  border-left-color: #fff;
+}
+.skin-black .sidebar-form .btn {
+  color: #999;
+  border-top-left-radius: 0;
+  border-top-right-radius: 2px;
+  border-bottom-right-radius: 2px;
+  border-bottom-left-radius: 0;
+}
+.skin-black.layout-top-nav .main-header > .logo .logo-variant {
+  background-color: none;
+}
+.btn,
+.btn:hover {
+  color: #000;
+}
+.btn.btn-primary,
+.btn:hover.btn-primary,
+.btn .btn-primary:link,
+.btn:hover .btn-primary:link {
+  background-color: #505156;
+  border-color: #FFF;
+  color: #FFF;
+}
+.btna.btn-primary:hover,
+.btn:hovera.btn-primary:hover {
+  background-color: #111;
+  border-color: #1f1f21;
+  color: #fff;
+}
+.btn.btn-white:link,
+.btn:hover.btn-white:link {
+  color: #fff;
+}
+.btn.btn-white:hover,
+.btn:hover.btn-white:hover {
+  color: #fff;
+}
+.btn.btn-white:visited,
+.btn:hover.btn-white:visited {
+  color: #fff;
+}
+a {
+  color: var(--link);
+}
+a:hover {
+  color: var(--hover-link);
+}
+a:visited {
+  color: var(--visited-link);
+}
+.text-primary {
+  color: #000000;
+}
+:root {
+  --button-default: #000000;
+  --button-primary: #000000;
+  --button-hover: #000000;
+  --header: #111;
+  /* Use same as Header picker */
+  --text-main: #BBB;
+  --text-sub: #9b9b9b;
+  --link: #black;
+  /* Use same as Header picker, lighten by 70% */
+  --visited-link: #111;
+  /* Use same as Header picker, lighten by 70% */
+  --hover-link: #999999;
+  /* Use same as Header picker, lighten by 70% */
+  --nav-link: #FFF;
+  /* Use same as Header picker */
+  --light-link: #fff;
+  /* Use same as Header picker */
+}
+a.btn-info:link,
+a.btn-warning:link,
+a.btn-danger:link {
+  color: #FFF;
+}
+a.btn-info:visited,
+a.btn-warning:visited,
+a.btn-danger:visited {
+  color: #FFF;
+}
+.btn-danger.btn-sm.disabled {
+  color: #FFF;
+}
+.far fa-life-ring {
+  color: var(--link);
+}
+.sidebar-toggle-mobile {
+  color: #FFF !important;
+}
+.skin-black .main-header .navbar .nav > li > a,
+.skin-black .main-header .navbar .nav > li > a {
+  text-decoration: none;
+}
+.select2-container--default .select2-selection--multiple .select2-selection__choice {
+  background-color: #111;
+}
+.search-highlight,
+.search-highlight:hover {
+  background-color: #e9d15b;
+}
+/*
+ * Skin: black dark
+ * ----------
+ */
+.skin-black-dark .main-header .navbar {
+  background-color: #111;
+}
+.skin-black-dark .main-header .navbar .nav > li > a {
+  color: #fff;
+}
+.skin-black-dark .main-header .navbar .nav > li > a:hover,
+.skin-black-dark .main-header .navbar .nav > li > a:active,
+.skin-black-dark .main-header .navbar .nav > li > a:focus,
+.skin-black-dark .main-header .navbar .nav .open > a,
+.skin-black-dark .main-header .navbar .nav .open > a:hover,
+.skin-black-dark .main-header .navbar .nav .open > a:focus,
+.skin-black-dark .main-header .navbar .nav > .active > a {
+  background: rgba(0, 0, 0, 0.1);
+  color: #f6f6f6;
+}
+.skin-black-dark .main-header .navbar .sidebar-toggle {
+  color: #fff;
+}
+.skin-black-dark .main-header .navbar .sidebar-toggle:hover {
+  color: #f6f6f6;
+  background: rgba(0, 0, 0, 0.1);
+}
+.skin-black-dark .main-header .navbar .sidebar-toggle {
+  color: #fff;
+}
+.skin-black-dark .main-header .navbar .sidebar-toggle:hover {
+  background-color: #040404;
+}
+@media (max-width: 767px) {
+  .skin-black-dark .main-header .navbar .dropdown-menu li.divider {
+    background-color: rgba(255, 255, 255, 0.1);
+    color: #fff;
+  }
+  .skin-black-dark .main-header .navbar .dropdown-menu li a {
+    color: #333;
+  }
+  .skin-black-dark .main-header .navbar .dropdown-menu li a:hover {
+    background: #040404;
+    color: #fff;
+  }
+}
+@media (max-width: 991px) {
+  .skin-black-dark .main-header .navbar-custom-menu > .navbar-nav > li > .dropdown-menu {
+    background-color: var(--back-sub);
+  }
+}
+.skin-black-dark .main-header li.user-header {
+  background-color: #111;
+}
+.skin-black-dark .content-header {
+  background: transparent;
+}
+.skin-black-dark .wrapper,
+.skin-black-dark .main-sidebar,
+.skin-black-dark .left-side {
+  background-color: #222d32;
+}
+.skin-black-dark .user-panel > .info,
+.skin-black-dark .user-panel > .info > a {
+  color: #fff;
+}
+.skin-black-dark .sidebar-menu > li.header {
+  color: #4b646f;
+  background: #1a2226;
+}
+.skin-black-dark .sidebar-menu > li > a {
+  border-left: 3px solid transparent;
+}
+.skin-black-dark .sidebar-menu > li:hover > a,
+.skin-black-dark .sidebar-menu > li.active > a {
+  color: #fff;
+  background: #1e282c;
+  border-left-color: #111;
+}
+.skin-black-dark .sidebar-menu > li > .treeview-menu {
+  margin: 0 1px;
+  background: #2c3b41;
+}
+.skin-black-dark .sidebar a {
+  color: #b8c7ce;
+}
+.skin-black-dark .sidebar a:hover {
+  text-decoration: none;
+}
+.skin-black-dark .treeview-menu > li > a {
+  color: #8aa4af;
+}
+.skin-black-dark .treeview-menu > li.active > a,
+.skin-black-dark .treeview-menu > li > a:hover {
+  color: #fff;
+}
+.skin-black-dark .sidebar-form {
+  border-radius: 3px;
+  border: 1px solid #374850;
+  margin: 10px 10px;
+}
+.skin-black-dark .sidebar-form input[type="text"],
+.skin-black-dark .sidebar-form .btn {
+  box-shadow: none;
+  background-color: #374850;
+  border: 1px solid transparent;
+  height: 35px;
+  transition: all 0.3s ease-in-out;
+}
+.skin-black-dark .sidebar-form input[type="text"] {
+  color: #666;
+  border-top-left-radius: 2px;
+  border-top-right-radius: 0;
+  border-bottom-right-radius: 0;
+  border-bottom-left-radius: 2px;
+}
+.skin-black-dark .sidebar-form input[type="text"]:focus,
+.skin-black-dark .sidebar-form input[type="text"]:focus + .input-group-btn .btn {
+  background-color: #fff;
+  color: #666;
+}
+.skin-black-dark .sidebar-form input[type="text"]:focus + .input-group-btn .btn {
+  border-left-color: #fff;
+}
+.skin-black-dark .sidebar-form .btn {
+  color: #999;
+  border-top-left-radius: 0;
+  border-top-right-radius: 2px;
+  border-bottom-right-radius: 2px;
+  border-bottom-left-radius: 0;
+}
+.skin-black-dark.layout-top-nav .main-header > .logo .logo-variant {
+  background-color: none;
+}
+.btn,
+.btn:hover {
+  color: #fff;
+}
+.btn.btn-primary,
+.btn:hover.btn-primary,
+.btn .btn-primary:link,
+.btn:hover .btn-primary:link {
+  background-color: #000000;
+  border-color: #FFF;
+  color: #fff;
+}
+.btna.btn-primary:hover,
+.btn:hovera.btn-primary:hover {
+  background-color: #000000;
+  border-color: #000000;
+  color: #fff;
+}
+.btn.btn-white:link,
+.btn:hover.btn-white:link {
+  background-color: #000000;
+  color: #fff;
+}
+.btn.btn-white:hover,
+.btn:hover.btn-white:hover {
+  background-color: #000000;
+  color: #fff;
+}
+/**
+The dropdown is white, so use a darker color
+ */
+li.dropdown-item-marker {
+  color: var(--button-primary);
+}
+a:hover {
+  color: #fff;
+}
+a:visited {
+  color: #fff;
+}
+.text-primary {
+  color: #fff;
+}
+#sort tr.cansort {
+  background-color: var(--back-main);
+  color: var(--text-main);
+}
+:root {
+  --background: #222;
+  --back-main: #333;
+  --back-sub: #3d4144;
+  --back-sub-alt: rgba(0, 0, 0, 0.36);
+  --button-default: #000000;
+  --button-primary: #000000;
+  --button-hover: #000000;
+  --header: #111;
+  /* Use same as Header picker */
+  --text-main: #fff;
+  --text-sub: #9b9b9b;
+  --link: #fff;
+  /* Use same as Header picker, lighten by 70% */
+  --visited-link: #fff;
+  /* Use same as Header picker, lighten by 70% */
+  --hover-link: #949494;
+  /* Use same as Header picker, lighten by 70% */
+  --nav-link: #FFF;
+  /* Use same as Header picker */
+  --light-link: #fff;
+  /* Use same as Header picker */
+}
+#ldapad_test_results.well.well-sm {
+  color: var(--back-main);
+}
+a.actions {
+  color: #fff !important;
+}
+.pagination > li > a {
+  color: var(--light-link);
+  background-color: var(--back-main);
+}
+.pagination > .active > a {
+  background-color: var(--visited-link);
+  border-color: var(--light-link);
+}
+.pagination > .active > a:hover {
+  background-color: var(--hover-link);
+}
+.tasks-menu > .dropdown-menu > li .menu > li > a:hover .progress {
+  background-color: var(--background);
+}
+a:hover > h2.task_menu {
+  color: var(--header);
+}
+h2.task_menu {
+  color: var(--link);
+}
+.navbar-custom-menu > .navbar-nav > li > .dropdown-menu {
+  background-color: var(--back-main);
+  color: var(--link);
+}
+.navbar-custom-menu > .navbar-nav > li > .dropdown-menu > li.header {
+  background-color: var(--header);
+  color: var(--link);
+}
+.main-header .navbar,
+.main-header .logo {
+  background-color: var(--header);
+  background: linear-gradient(to bottom, var(--header) 0%, var(--header) 100%);
+  border-color: var(--header);
+}
+.bootstrap-table .fixed-table-container .table thead th .sortable {
+  color: var(--nav-link);
+}
+.bootstrap-table .fixed-table-toolbar .columns label {
+  color: #000;
+}
+.thead,
+.navbar-nav > li > a:link {
+  color: var(--nav-link);
+}
+.far fa-life-ring {
+  color: var(--link);
+}
+.modal-content {
+  background-color: var(--back-main);
+  color: var(--text-main);
+}
+.btn-primary.hover {
+  color: var(--nav-link);
+}
+.small-box h3,
+.small-box p {
+  color: var(--nav-link) !important;
+}
+.small-box h3 a:hover,
+.small-box p a:hover {
+  text-decoration: none;
+  color: var(--nav-link) !important;
+}
+a:link.btn-default {
+  color: var(--nav-link);
+}
+/* Trying to figure out a way of having links different shades based on what row they are on (even/odd).
+a unique challenge for this dark mode skin.
+Probably writing the specificity for this incorrectly. --Godfrey Martinez 02/04/21
+
+.table-striped>tbody>tr:nth-of-type(even)>a:link{
+  color:#000d07;
+}
+.table-striped>tbody>tr:nth-of-type(odd)>a:link{
+  color:#bfbfbf;
+
+}*/
+#accessoriesTable > tbody > tr > td > nobr > a > i.fa {
+  color: var(--text-main);
+}
+#assetsListingTable > tbody > tr > td > nobr > a > i.fa {
+  color: var(--text-main);
+}
+#assetsListingTable > tbody > tr.selected > td {
+  background-color: var(--back-main);
+}
+body {
+  color: var(--text-main);
+}
+.box,
+.box.box-default {
+  border-top: 3px solid var(--header);
+  border-top-color: var(--header);
+}
+.box-body,
+.box-footer,
+.box-header {
+  background-color: var(--back-sub);
+  color: var(--header);
+}
+.btn-default {
+  background-color: var(--button-default);
+  color: var(--nav-link);
+}
+.btn-default dropdown-toggle {
+  background-color: var(--button-default);
+  color: var(--nav-link);
+}
+.btn-default:active,
+.btn-default:focus,
+.btn-default:hover,
+.btn-default.active {
+  background-color: var(--button-hover);
+  color: var(--nav-link);
+}
+.btn-primary,
+.btn-primary.hover,
+.btn-primary:active,
+.text-black {
+  color: var(--nav-link) !important;
+}
+.btn-primary:hover {
+  background-color: var(--button-primary);
+  color: var(--link) !important;
+}
+#componentsTable > tbody > tr > td > nobr > a > i.fa {
+  color: var(--text-main);
+}
+#consumablesTable > tbody > tr > td > nobr > a > i.fa {
+  color: var(--text-main);
+}
+.content-wrapper {
+  background-color: var(--background);
+}
+#create-form > div > div > div > span > i.fa {
+  background-color: var(--back-sub);
+  color: var(--header);
+}
+.datepicker .datepicker-switch:hover,
+.datepicker .next:hover,
+.datepicker .prev:hover,
+.datepicker tfoot tr th:hover,
+.datepicker table tr td.day.focused,
+.datepicker table tr td.day:hover {
+  background-color: var(--header);
+}
+.datepicker.dropdown-menu {
+  background-color: var(--back-main);
+  color: var(--text-main);
+}
+#details > div > div > div > table {
+  background-color: transparent;
+}
+.dropdown-menu > li > a:hover {
+  background-color: var(--back-main);
+  color: var(--nav-link);
+}
+.form-control {
+  background-color: var(--back-main);
+  color: var(--text-main);
+}
+.form-control[disabled],
+.form-control[readonly],
+fieldset[disabled] .form-control {
+  background-color: var(--back-main);
+  color: var(--text-main);
+}
+h1,
+h2,
+h3,
+h4,
+h5,
+h6,
+p {
+  color: var(--text-main);
+}
+.help-block {
+  color: var(--text-sub);
+}
+input[type=text],
+input[type=search] {
+  background-color: var(--back-sub);
+  color: var(--text-main);
+}
+.search-highlight,
+.search-highlight:hover {
+  background-color: var(--back-sub) !important;
+}
+#licensesTable > tbody > tr > td > nobr > a > i.fa {
+  color: var(--text-main);
+}
+.main-footer {
+  background-color: var(--back-main);
+  color: var(--text-main);
+}
+.nav-tabs-custom > .nav-tabs > li > a,
+.nav-tabs-custom > .nav-tabs > li.active > a {
+  color: var(--text-main);
+}
+.nav-tabs-custom > .nav-tabs > li.active {
+  border-top-color: var(--header);
+}
+.nav-tabs-custom > .nav-tabs > li.active > a {
+  background-color: var(--back-main);
+}
+.nav-tabs-custom > .nav-tabs > li.active > a:hover {
+  background-color: var(--back-sub);
+  color: var(--text-main);
+}
+.nav-tabs-custom,
+.nav-tabs-custom > .tab-content {
+  background-color: var(--back-main);
+}
+.navbar-nav > .tasks-menu > .dropdown-menu > li.header {
+  background-color: var(--back-main);
+  color: var(--header);
+}
+.open > .dropdown-toggle.btn-default {
+  background-color: var(--back-sub);
+  color: var(--header);
+}
+.panel {
+  background-color: var(--back-sub);
+  color: var(--text-main);
+}
+.panel-default > .panel-heading {
+  background-color: var(--back-main);
+  color: var(--header);
+}
+.select2-container--default .select2-results__option[aria-selected=true],
+.select2-container--default .select2-results__option[aria-selected=true]:hover {
+  background-color: var(--back-sub);
+  color: var(--nav-link);
+}
+.select2-container--default .select2-results__option--highlighted[aria-selected] {
+  background-color: var(--back-sub);
+  color: var(--visited-link);
+}
+.select2-container--default .select2-selection--single .select2-selection__rendered {
+  color: var(--text-main);
+}
+.select2-container--default .select2-selection--multiple .select2-selection__choice {
+  background-color: var(--header);
+}
+.select2-selection--single {
+  background-color: var(--back-sub) !important;
+  color: var(--text-main) !important;
+}
+.select2-dropdown {
+  background-color: var(--back-main);
+  color: var(--text-main);
+}
+.skin-black-dark .main-header .navbar .dropdown-menu li a {
+  color: #FFFFFF;
+}
+.skin-black-dark .main-header .navbar .dropdown-menu li a:hover {
+  background-color: #000000;
+}
+.fixed-table-body thead th .th-inner,
+.skin-black-dark .sidebar-menu > li.active > a,
+.skin-black .sidebar-menu > li:hover > a,
+.sidebar-toggle:hover {
+  background-color: var(--header) !important;
+}
+.tab-content,
+.tab-pane {
+  background-color: var(--back-main);
+  color: var(--text-main);
+}
+.table-striped > tbody > tr:nth-of-type(odd) {
+  background-color: var(--back-sub);
+  color: var(--text-main);
+}
+.table-striped > tbody > tr:nth-of-type(even) {
+  background-color: var(--back-sub-alt);
+  color: var(--text-main);
+}
+.row-new-striped > .row:nth-of-type(odd) {
+  background-color: var(--back-sub);
+  color: var(--text-main);
+}
+.row-new-striped > .row:nth-of-type(even) {
+  background-color: var(--back-sub-alt);
+  color: var(--text-main);
+}
+#webui > div > div > div > div > div > table > tbody > tr > td > a > i.fa,
+.box-body,
+.box-footer,
+.box-header {
+  color: var(--text-main);
+}
+.box-header.with-border {
+  border-bottom: #000;
+}
+a {
+  color: var(--link);
+}
+a:link {
+  color: var(--link);
+}
+a:hover {
+  color: var(--hover-link);
+  text-decoration: underline;
+}
+.row-striped {
+  vertical-align: top;
+  line-height: 2.6;
+  padding: 0px;
+  margin-left: 20px;
+  box-sizing: border-box;
+  display: table;
+}
+.row-striped .row:nth-of-type(odd) div {
+  background-color: var(--back-sub);
+  color: var(--text-main);
+  border-top: 1px solid #dddddd;
+  display: table-cell;
+}
+.row-striped .row:nth-of-type(even) div {
+  background-color: var(--back-sub);
+  color: var(--text-main);
+  border-top: 1px solid #dddddd;
+  display: table-cell;
+}
+.search-highlight,
+.search-highlight:hover {
+  background-color: #e9d15b;
+}
+div.container.row-new-striped {
+  background-color: var(--back-sub);
+}
+.table > thead > tr > td.danger,
+.table > tbody > tr > td.danger,
+.table > tfoot > tr > td.danger,
+.table > thead > tr > th.danger,
+.table > tbody > tr > th.danger,
+.table > tfoot > tr > th.danger,
+.table > thead > tr.danger > td,
+.table > tbody > tr.danger > td,
+.table > tfoot > tr.danger > td,
+.table > thead > tr.danger > th,
+.table > tbody > tr.danger > th,
+.table > tfoot > tr.danger > th {
+  background-color: var(--back-sub);
+}
+.table > tbody > tr.warning > td {
+  background-color: var(--back-sub);
+}
+/*
+ * Skin: Blue
+ * ----------
+ */
+.skin-blue .main-header .navbar {
+  background-color: #3c8dbc;
+}
+.skin-blue .main-header .navbar .nav > li > a {
+  color: #fff;
+}
+.skin-blue .main-header .navbar .nav > li > a:hover,
+.skin-blue .main-header .navbar .nav > li > a:active,
+.skin-blue .main-header .navbar .nav > li > a:focus,
+.skin-blue .main-header .navbar .nav .open > a,
+.skin-blue .main-header .navbar .nav .open > a:hover,
+.skin-blue .main-header .navbar .nav .open > a:focus,
+.skin-blue .main-header .navbar .nav > .active > a {
+  background: rgba(0, 0, 0, 0.1);
+  color: #f6f6f6;
+}
+.skin-blue .main-header .navbar .sidebar-toggle {
+  color: #fff;
+}
+.skin-blue .main-header .navbar .sidebar-toggle:hover {
+  color: #f6f6f6;
+  background: rgba(0, 0, 0, 0.1);
+}
+.skin-blue .main-header .navbar .sidebar-toggle {
+  color: #fff;
+}
+.skin-blue .main-header .navbar .sidebar-toggle:hover {
+  background-color: #367fa9;
+}
+@media (max-width: 767px) {
+  .skin-blue .main-header .navbar .dropdown-menu li.divider {
+    background-color: rgba(255, 255, 255, 0.1);
+  }
+  .skin-blue .main-header .navbar .dropdown-menu li a {
+    color: #333;
+  }
+  .skin-blue .main-header .navbar .dropdown-menu li a:hover {
+    background: #367fa9;
+  }
+}
+.skin-blue .main-header li.user-header {
+  background-color: #3c8dbc;
+}
+.skin-blue .content-header {
+  background: transparent;
+}
+.skin-blue .wrapper,
+.skin-blue .main-sidebar,
+.skin-blue .left-side {
+  background-color: #222d32;
+}
+.skin-blue .user-panel > .info,
+.skin-blue .user-panel > .info > a {
+  color: #fff;
+}
+.skin-blue .sidebar-menu > li.header {
+  color: #4b646f;
+  background: #1a2226;
+}
+.skin-blue .sidebar-menu > li > a {
+  border-left: 3px solid transparent;
+}
+.skin-blue .sidebar-menu > li:hover > a,
+.skin-blue .sidebar-menu > li.active > a {
+  color: #fff;
+  background: #1e282c;
+  border-left-color: #3c8dbc;
+}
+.skin-blue .sidebar-menu > li > .treeview-menu {
+  margin: 0 1px;
+  background: #2c3b41;
+}
+.skin-blue .sidebar a {
+  color: #b8c7ce;
+}
+.skin-blue .sidebar a:hover {
+  text-decoration: none;
+}
+.skin-blue .treeview-menu > li > a {
+  color: #8aa4af;
+}
+.skin-blue .treeview-menu > li.active > a,
+.skin-blue .treeview-menu > li > a:hover {
+  color: #fff;
+}
+.skin-blue .sidebar-form {
+  border-radius: 3px;
+  border: 1px solid #374850;
+  margin: 10px 10px;
+}
+.skin-blue .sidebar-form input[type="text"],
+.skin-blue .sidebar-form .btn {
+  box-shadow: none;
+  background-color: #374850;
+  border: 1px solid transparent;
+  height: 35px;
+  transition: all 0.3s ease-in-out;
+}
+.skin-blue .sidebar-form input[type="text"] {
+  color: #666;
+  border-top-left-radius: 2px;
+  border-top-right-radius: 0;
+  border-bottom-right-radius: 0;
+  border-bottom-left-radius: 2px;
+}
+.skin-blue .sidebar-form input[type="text"]:focus,
+.skin-blue .sidebar-form input[type="text"]:focus + .input-group-btn .btn {
+  background-color: #fff;
+  color: #666;
+}
+.skin-blue .sidebar-form input[type="text"]:focus + .input-group-btn .btn {
+  border-left-color: #fff;
+}
+.skin-blue .sidebar-form .btn {
+  color: #999;
+  border-top-left-radius: 0;
+  border-top-right-radius: 2px;
+  border-bottom-right-radius: 2px;
+  border-bottom-left-radius: 0;
+}
+.skin-blue.layout-top-nav .main-header > .logo .logo-variant {
+  background-color: unset;
+}
+.btn.btn-primary,
+btn-sm.btn-primary,
+.btn:hover.btn-primary,
+.btn .btn-primary:link,
+btn-sm .btn-primary:link,
+.btn:hover .btn-primary:link {
+  background-color: #307095;
+  border-color: #23536f;
+  color: #fff !important;
+}
+.btna.btn-primary:hover,
+btn-sma.btn-primary:hover,
+.btn:hovera.btn-primary:hover {
+  background-color: #23536f;
+  border-color: #23536f;
+  color: #fff;
+}
+.btn.btn-white:link,
+btn-sm.btn-white:link,
+.btn:hover.btn-white:link {
+  background-color: #307095;
+  color: #fff;
+}
+.btn.btn-white:hover,
+btn-sm.btn-white:hover,
+.btn:hover.btn-white:hover {
+  background-color: #173648;
+  color: #fff;
+}
+.btn.btn-white:visited,
+btn-sm.btn-white:visited,
+.btn:hover.btn-white:visited {
+  background-color: #173648;
+  color: #fff;
+}
+.btn-warning,
+.btn-warning:link,
+a.btn-warning:hover,
+.btn-warning:link,
+.btn-warning:visited,
+.btn-danger,
+.btn-danger:link,
+a.btn-danger:hover,
+.btn-danger:link,
+.btn-danger:visited {
+  color: #fff;
+}
+.btn-default:link,
+a.btn-default:hover,
+.btn-default:visited {
+  color: #505156;
+}
+:root {
+  --button-default: #505156;
+  --button-primary: #1d455b;
+  --button-hover: #173648;
+  --header: #3c8dbc;
+  /* Use same as Header picker */
+  --text-main: #BBB;
+  --text-sub: #9b9b9b;
+  --link: #296282;
+  /* Use same as Header picker, lighten by 70% */
+  --visited-link: #5fa4cc;
+  /* Use same as Header picker, lighten by 70% */
+  --hover-link: #86bad8;
+  /* Use same as Header picker, lighten by 70% */
+  --nav-link: #FFF;
+  /* Use same as Header picker */
+  --light-link: #fff;
+  /* Use same as Header picker */
+}
+a.btn-info:link,
+a.btn-warning:link,
+a.btn-danger:link {
+  color: #FFF;
+}
+a.btn-info:visited,
+a.btn-warning:visited,
+a.btn-danger:visited {
+  color: #FFF;
+}
+a:link {
+  color: var(--link);
+}
+a:visited {
+  color: var(--visited-link);
+}
+a:hover {
+  color: var(--hover-link);
+}
+.text-primary {
+  color: #23536f;
+}
+.far fa-life-ring {
+  color: var(--link);
+}
+.fixed-table-container tbody .selected td {
+  background-color: #fff8af;
+}
+.select2-container--default .select2-selection--multiple .select2-selection__choice {
+  background-color: #3c8dbc;
+}
+.search-highlight,
+.search-highlight:hover {
+  background-color: #e9d15b;
+}
+a.settings_button:link,
+a.settings_button:visited,
+a.settings_button:hover {
+  color: #3c8dbc;
+}
+a.label.label-default:link {
+  color: #307095;
+  /* Use same as Header picker, lighten by 70% */
+}
+a.label.label-default:visited {
+  color: #23536f;
+  /* Use same as Header picker, lighten by 70% */
+}
+a.label.label-default:hover {
+  background-color: #BBB;
+  color: #296282;
+}
+/*
+ * Skin: blue dark
+ * ----------
+ */
+.skin-blue-dark .main-header .navbar {
+  background-color: #3c8dbc;
+}
+.skin-blue-dark .main-header .navbar .nav > li > a {
+  color: #fff;
+}
+.skin-blue-dark .main-header .navbar .nav > li > a:hover,
+.skin-blue-dark .main-header .navbar .nav > li > a:active,
+.skin-blue-dark .main-header .navbar .nav > li > a:focus,
+.skin-blue-dark .main-header .navbar .nav .open > a,
+.skin-blue-dark .main-header .navbar .nav .open > a:hover,
+.skin-blue-dark .main-header .navbar .nav .open > a:focus,
+.skin-blue-dark .main-header .navbar .nav > .active > a {
+  background: rgba(0, 0, 0, 0.1);
+  color: #f6f6f6;
+}
+.skin-blue-dark .main-header .navbar .sidebar-toggle {
+  color: #fff;
+}
+.skin-blue-dark .main-header .navbar .sidebar-toggle:hover {
+  color: #f6f6f6;
+  background: rgba(0, 0, 0, 0.1);
+}
+.skin-blue-dark .main-header .navbar .sidebar-toggle {
+  color: #fff;
+}
+.skin-blue-dark .main-header .navbar .sidebar-toggle:hover {
+  background-color: #367fa9;
+}
+@media (max-width: 767px) {
+  .skin-blue-dark .main-header .navbar .dropdown-menu li.divider {
+    background-color: rgba(255, 255, 255, 0.1);
+    color: #fff;
+  }
+  .skin-blue-dark .main-header .navbar .dropdown-menu li a {
+    color: #fff;
+  }
+  .skin-blue-dark .main-header .navbar .dropdown-menu li a:hover {
+    background: #367fa9;
+    color: #fff;
+  }
+}
+.skin-blue-dark .main-header li.user-header {
+  background-color: #3c8dbc;
+}
+.skin-blue-dark .content-header {
+  background: transparent;
+}
+.skin-blue-dark .wrapper,
+.skin-blue-dark .main-sidebar,
+.skin-blue-dark .left-side {
+  background-color: #222d32;
+}
+.skin-blue-dark .user-panel > .info,
+.skin-blue-dark .user-panel > .info > a {
+  color: #fff;
+}
+.skin-blue-dark .sidebar-menu > li.header {
+  color: #4b646f;
+  background: #1a2226;
+}
+.skin-blue-dark .sidebar-menu > li > a {
+  border-left: 3px solid transparent;
+}
+.skin-blue-dark .sidebar-menu > li:hover > a,
+.skin-blue-dark .sidebar-menu > li.active > a {
+  color: #fff;
+  background: #1e282c;
+  border-left-color: #3c8dbc;
+}
+.skin-blue-dark .sidebar-menu > li > .treeview-menu {
+  margin: 0 1px;
+  background: #2c3b41;
+}
+.skin-blue-dark .sidebar a {
+  color: #b8c7ce;
+}
+.skin-blue-dark .sidebar a:hover {
+  text-decoration: none;
+}
+.skin-blue-dark .treeview-menu > li > a {
+  color: #8aa4af;
+}
+.skin-blue-dark .treeview-menu > li.active > a,
+.skin-blue-dark .treeview-menu > li > a:hover {
+  color: #fff;
+}
+.skin-blue-dark .sidebar-form {
+  border-radius: 3px;
+  border: 1px solid #374850;
+  margin: 10px 10px;
+}
+.skin-blue-dark .sidebar-form input[type="text"],
+.skin-blue-dark .sidebar-form .btn {
+  box-shadow: none;
+  background-color: #374850;
+  border: 1px solid transparent;
+  height: 35px;
+  transition: all 0.3s ease-in-out;
+}
+.skin-blue-dark .sidebar-form input[type="text"] {
+  color: #666;
+  border-top-left-radius: 2px;
+  border-top-right-radius: 0;
+  border-bottom-right-radius: 0;
+  border-bottom-left-radius: 2px;
+}
+.skin-blue-dark .sidebar-form input[type="text"]:focus,
+.skin-blue-dark .sidebar-form input[type="text"]:focus + .input-group-btn .btn {
+  background-color: #fff;
+  color: #666;
+}
+.skin-blue-dark .sidebar-form input[type="text"]:focus + .input-group-btn .btn {
+  border-left-color: #fff;
+}
+.skin-blue-dark .sidebar-form .btn {
+  color: #999;
+  border-top-left-radius: 0;
+  border-top-right-radius: 2px;
+  border-bottom-right-radius: 2px;
+  border-bottom-left-radius: 0;
+}
+.skin-blue-dark.layout-top-nav .main-header > .logo .logo-variant {
+  background-color: none;
+}
+.btn,
+.btn:hover {
+  color: #fff !important;
+}
+.btn.btn-primary,
+.btn:hover.btn-primary,
+.btn .btn-primary:link,
+.btn:hover .btn-primary:link {
+  background-color: #307095;
+  border-color: #FFF;
+  color: #FFF;
+}
+.btna.btn-primary:hover,
+.btn:hovera.btn-primary:hover {
+  background-color: #23536f;
+  border-color: #23536f;
+  color: #fff;
+}
+.btn.btn-white:link,
+.btn:hover.btn-white:link {
+  background-color: #307095;
+  color: #fff;
+}
+.btn.btn-white:hover,
+.btn:hover.btn-white:hover {
+  background-color: #173648;
+  color: #fff;
+}
+/**
+The dropdown is white, so use a darker color
+ */
+li.dropdown-item-marker {
+  color: var(--button-primary);
+}
+a:hover {
+  color: var(--hover-link);
+}
+a:visited {
+  color: var(--visited-link);
+}
+.text-primary {
+  color: #fff;
+}
+#sort tr.cansort {
+  background-color: var(--back-main);
+  color: var(--text-main);
+}
+:root {
+  --background: #222;
+  --back-main: #333;
+  --back-sub: #272727;
+  --back-sub-alt: rgba(0, 0, 0, 0.36);
+  --button-default: #296282;
+  --button-primary: #1d455b;
+  --button-hover: #173648;
+  --header: #3c8dbc;
+  /* Use same as Header picker */
+  --text-main: #BBB;
+  --text-sub: #9b9b9b;
+  --link: #00BFFF;
+  /* Use same as Header picker, lighten by 70% */
+  --visited-link: #4dd2ff;
+  /* Use same as Header picker, lighten by 70% */
+  --hover-link: #99e5ff;
+  /* Use same as Header picker, lighten by 70% */
+  --nav-link: #FFF;
+  /* Use same as Header picker */
+  --light-link: #fff;
+  /* Use same as Header picker */
+}
+#ldapad_test_results.well.well-sm {
+  color: var(--back-main);
+}
+a.actions {
+  color: #fff !important;
+}
+.pagination > li > a {
+  color: var(--light-link);
+  background-color: var(--back-main);
+}
+.pagination > .active > a {
+  background-color: var(--visited-link);
+  border-color: var(--light-link);
+}
+.pagination > .active > a:hover {
+  background-color: var(--hover-link);
+}
+.tasks-menu > .dropdown-menu > li .menu {
+  background-color: var(--back-main);
+}
+.tasks-menu > .dropdown-menu > li .menu > li > a:hover .progress {
+  background-color: var(--background);
+}
+h2.task_menu {
+  color: var(--link);
+}
+.navbar-custom-menu > .navbar-nav > li > .dropdown-menu {
+  background-color: var(--back-main);
+  color: var(--link);
+}
+.main-header .navbar,
+.main-header .logo {
+  background-color: var(--header);
+  background: linear-gradient(to bottom, var(--header) 0%, var(--header) 100%);
+  border-color: var(--header);
+}
+.bootstrap-table .fixed-table-container .table thead th .sortable {
+  color: var(--nav-link);
+}
+.bootstrap-table .fixed-table-toolbar .columns label {
+  color: #000;
+}
+.thead,
+.navbar-nav > li > a:link {
+  color: var(--nav-link);
+}
+.far fa-life-ring {
+  color: var(--link);
+}
+.modal-content {
+  background-color: var(--back-main);
+  color: var(--text-main);
+}
+a:link {
+  color: var(--link);
+}
+.btn-primary.hover {
+  color: var(--nav-link);
+}
+.bootstrap-table .fixed-table-toolbar .columns label {
+  color: #000;
+}
+.small-box h3,
+.small-box p {
+  color: var(--nav-link) !important;
+}
+.small-box h3 a:hover,
+.small-box p a:hover {
+  text-decoration: none;
+  color: var(--nav-link) !important;
+}
+#accessoriesTable > tbody > tr > td > nobr > a > i.fa {
+  color: var(--text-main);
+}
+#assetsListingTable > tbody > tr > td > nobr > a > i.fa {
+  color: var(--text-main);
+}
+#assetsListingTable > tbody > tr.selected > td {
+  background-color: var(--back-main);
+}
+body {
+  color: var(--text-main);
+}
+.box,
+.box.box-default {
+  border-top: 3px solid var(--header);
+  border-top-color: var(--header);
+}
+.box-body,
+.box-footer,
+.box-header {
+  background-color: var(--back-sub);
+  color: var(--header);
+}
+.btn-default {
+  background-color: var(--button-default);
+  color: var(--link);
+}
+.btn-default dropdown-toggle {
+  background-color: var(--button-default);
+  color: var(--link);
+}
+.btn-default:active,
+.btn-default:focus,
+.btn-default:hover,
+.btn-default.active {
+  background-color: var(--button-hover);
+  color: var(--link);
+}
+.btn-primary,
+.btn-primary.hover,
+.btn-primary:active,
+.text-blue {
+  color: var(--text-main);
+}
+.btn-primary:hover {
+  background-color: var(--button-primary);
+}
+#componentsTable > tbody > tr > td > nobr > a > i.fa {
+  color: var(--text-main);
+}
+#consumablesTable > tbody > tr > td > nobr > a > i.fa {
+  color: var(--text-main);
+}
+.content-wrapper {
+  background-color: var(--background);
+}
+#create-form > div > div > div > span > i.fa {
+  background-color: var(--back-sub);
+  color: var(--header);
+}
+.datepicker .datepicker-switch:hover,
+.datepicker .next:hover,
+.datepicker .prev:hover,
+.datepicker tfoot tr th:hover,
+.datepicker table tr td.day.focused,
+.datepicker table tr td.day:hover {
+  background-color: var(--header);
+}
+.datepicker.dropdown-menu {
+  background-color: var(--back-main);
+  color: var(--text-main);
+}
+#details > div > div > div > table {
+  background-color: transparent;
+}
+.dropdown-menu > li > a:hover {
+  background-color: var(--back-main);
+  color: var(--nav-link);
+}
+.fixed-table-body thead th .th-inner {
+  color: var(--nav-link);
+}
+.form-control {
+  background-color: var(--back-main);
+  color: var(--text-main);
+}
+.form-control[disabled],
+.form-control[readonly],
+fieldset[disabled] .form-control {
+  background-color: var(--back-main);
+  color: var(--text-main);
+}
+h1,
+h2,
+h3,
+h4,
+h5,
+h6,
+p {
+  color: var(--text-main);
+}
+.help-block {
+  color: var(--text-sub);
+}
+input[type=text],
+input[type=search] {
+  background-color: var(--back-sub);
+  color: var(--text-main);
+}
+#licensesTable > tbody > tr > td > nobr > a > i.fa {
+  color: var(--text-main);
+}
+.main-footer {
+  background-color: var(--back-main);
+  color: var(--text-main);
+}
+.nav-tabs-custom > .nav-tabs > li > a,
+.nav-tabs-custom > .nav-tabs > li.active > a {
+  color: var(--text-main);
+}
+.nav-tabs-custom > .nav-tabs > li.active {
+  border-top-color: var(--header);
+}
+.nav-tabs-custom > .nav-tabs > li.active > a {
+  background-color: var(--back-main);
+}
+.nav-tabs-custom > .nav-tabs > li.active > a:hover {
+  background-color: var(--back-sub);
+  color: var(--text-main);
+}
+.nav-tabs-custom,
+.nav-tabs-custom > .tab-content {
+  background-color: var(--back-main);
+}
+.navbar-nav > .tasks-menu > .dropdown-menu > li.header {
+  background-color: var(--back-main);
+  color: var(--header);
+}
+.open > .dropdown-toggle.btn-default {
+  background-color: var(--back-sub);
+  color: var(--header);
+}
+.panel {
+  background-color: var(--back-sub);
+  color: var(--text-main);
+}
+.panel-default > .panel-heading {
+  background-color: var(--back-main);
+  color: var(--header);
+}
+.select2-container--default .select2-results__option[aria-selected=true],
+.select2-container--default .select2-results__option[aria-selected=true]:hover {
+  background-color: var(--back-sub);
+  color: var(--header);
+}
+.select2-container--default .select2-results__option--highlighted[aria-selected] {
+  background-color: var(--header);
+  color: var(--back-main);
+}
+.select2-container--default .select2-selection--single .select2-selection__rendered {
+  color: var(--text-main);
+}
+.select2-container--default .select2-selection--multiple .select2-selection__choice {
+  background-color: var(--header);
+}
+.select2-selection--single {
+  background-color: var(--back-sub) !important;
+  color: var(--text-main) !important;
+}
+.select2-dropdown {
+  background-color: var(--back-main);
+  color: var(--text-main);
+}
+.skin-blue-dark .main-header .navbar .dropdown-menu li a {
+  color: #FFFFFF;
+}
+.skin-blue-dark .main-header .navbar .dropdown-menu li a:hover {
+  background-color: #3c8dbc;
+}
+.fixed-table-body thead th .th-inner,
+.skin-blue-dark .sidebar-menu > li.active > a,
+.skin-blue .sidebar-menu > li:hover > a,
+.sidebar-toggle:hover {
+  background-color: var(--header) !important;
+}
+.tab-content,
+.tab-pane {
+  background-color: var(--back-main);
+  color: var(--text-main);
+}
+.table-striped > tbody > tr:nth-of-type(odd) {
+  background-color: var(--back-sub);
+}
+.table-striped > tbody > tr:nth-of-type(even) {
+  background-color: var(--back-main);
+}
+#webui > div > div > div > div > div > table > tbody > tr > td > a > i.fa,
+.box-body,
+.box-footer,
+.box-header {
+  color: var(--text-main);
+}
+.box-header.with-border {
+  border-bottom: #000;
+}
+a {
+  color: var(--link);
+}
+a:link {
+  color: var(--link);
+}
+a:hover {
+  color: var(--hover-link);
+  text-decoration: underline;
+}
+a:visited {
+  color: var(--visited-link);
+}
+#customFieldsTable a[href*='/models'] {
+  background-color: var(--back-sub-alt);
+  color: var(--link);
+}
+#customFieldsTable a[href*='/models']:hover {
+  background-color: var(--text-sub);
+  color: var(--button-hover);
+}
+#customFieldsTable a[href*='/models']:visited {
+  background-color: var(--background);
+  color: var(--visited-link);
+}
+#customFieldsTable a[href*='/fieldsets'] {
+  background-color: transparent;
+}
+.row-striped {
+  vertical-align: top;
+  line-height: 2.6;
+  padding: 0px;
+  margin-left: 20px;
+  box-sizing: border-box;
+  display: table;
+}
+.row-striped .row:nth-of-type(odd) div {
+  background-color: var(--back-sub);
+  color: var(--text-main);
+  border-top: 1px solid #dddddd;
+  display: table-cell;
+}
+.row-striped .row:nth-of-type(even) div {
+  background-color: var(--back-sub);
+  color: var(--text-main);
+  border-top: 1px solid #dddddd;
+  display: table-cell;
+}
+.row-new-striped > .row:nth-of-type(odd) {
+  background-color: var(--back-sub);
+  color: var(--text-main);
+}
+.row-new-striped > .row:nth-of-type(even) {
+  background-color: var(--back-sub-alt);
+  color: var(--text-main);
+}
+.search-highlight,
+.search-highlight:hover {
+  background-color: #e9d15b;
+}
+.table > tbody > tr.warning > td {
+  background-color: var(--back-sub);
+}
+/*
+ * Skin: Contrast
+ * ----------
+ */
+.skin-contrast .main-header .navbar {
+  background-color: #001F3F;
+}
+.skin-contrast .main-header .navbar .nav > li > a {
+  color: #fff;
+}
+.skin-contrast .main-header .navbar .nav > li > a:hover,
+.skin-contrast .main-header .navbar .nav > li > a:active,
+.skin-contrast .main-header .navbar .nav > li > a:focus,
+.skin-contrast .main-header .navbar .nav .open > a,
+.skin-contrast .main-header .navbar .nav .open > a:hover,
+.skin-contrast .main-header .navbar .nav .open > a:focus,
+.skin-contrast .main-header .navbar .nav > .active > a {
+  background: rgba(0, 0, 0, 0.1);
+  color: #f6f6f6;
+}
+.skin-contrast .main-header .navbar .sidebar-toggle {
+  color: #fff;
+}
+.skin-contrast .main-header .navbar .sidebar-toggle:hover {
+  color: #f6f6f6;
+  background: rgba(0, 0, 0, 0.1);
+}
+.skin-contrast .main-header .navbar .sidebar-toggle {
+  color: #fff;
+}
+.skin-contrast .main-header .navbar .sidebar-toggle:hover {
+  background-color: #001226;
+}
+@media (max-width: 767px) {
+  .skin-contrast .main-header .navbar .dropdown-menu li.divider {
+    background-color: rgba(255, 255, 255, 0.1);
+  }
+  .skin-contrast .main-header .navbar .dropdown-menu li a {
+    color: #fff;
+  }
+  .skin-contrast .main-header .navbar .dropdown-menu li a:hover {
+    background: #001226;
+  }
+}
+.skin-contrast .main-header li.user-header {
+  background-color: #001F3F;
+}
+.skin-contrast .content-header {
+  background: transparent;
+}
+.skin-contrast .wrapper,
+.skin-contrast .main-sidebar,
+.skin-contrast .left-side {
+  background-color: #222d32;
+}
+.skin-contrast .user-panel > .info,
+.skin-contrast .user-panel > .info > a {
+  color: #fff;
+}
+.skin-contrast .sidebar-menu > li.header {
+  color: #4b646f;
+  background: #1a2226;
+}
+.skin-contrast .sidebar-menu > li > a {
+  border-left: 3px solid transparent;
+}
+.skin-contrast .sidebar-menu > li:hover > a,
+.skin-contrast .sidebar-menu > li.active > a {
+  color: #fff;
+  background: #1e282c;
+  border-left-color: #001F3F;
+}
+.skin-contrast .sidebar-menu > li > .treeview-menu {
+  margin: 0 1px;
+  background: #2c3b41;
+}
+.skin-contrast .sidebar a {
+  color: #b8c7ce;
+}
+.skin-contrast .sidebar a:hover {
+  text-decoration: none;
+}
+.skin-contrast .treeview-menu > li > a {
+  color: #8aa4af;
+}
+.skin-contrast .treeview-menu > li.active > a,
+.skin-contrast .treeview-menu > li > a:hover {
+  color: #fff;
+}
+.skin-contrast .sidebar-form {
+  border-radius: 3px;
+  border: 1px solid #374850;
+  margin: 10px 10px;
+}
+.skin-contrast .sidebar-form input[type="text"],
+.skin-contrast .sidebar-form .btn {
+  box-shadow: none;
+  background-color: #374850;
+  border: 1px solid transparent;
+  height: 35px;
+  transition: all 0.3s ease-in-out;
+}
+.skin-contrast .sidebar-form input[type="text"] {
+  color: #666;
+  border-top-left-radius: 2px;
+  border-top-right-radius: 0;
+  border-bottom-right-radius: 0;
+  border-bottom-left-radius: 2px;
+}
+.skin-contrast .sidebar-form input[type="text"]:focus,
+.skin-contrast .sidebar-form input[type="text"]:focus + .input-group-btn .btn {
+  background-color: #fff;
+  color: #666;
+}
+.skin-contrast .sidebar-form input[type="text"]:focus + .input-group-btn .btn {
+  border-left-color: #fff;
+}
+.skin-contrast .sidebar-form .btn {
+  color: #999;
+  border-top-left-radius: 0;
+  border-top-right-radius: 2px;
+  border-bottom-right-radius: 2px;
+  border-bottom-left-radius: 0;
+}
+.skin-contrast.layout-top-nav .main-header > .logo .logo-variant {
+  background-color: none;
+}
+.btn.btn-primary,
+.btn:hover.btn-primary,
+.btn .btn-primary:link,
+.btn:hover .btn-primary:link {
+  background-color: #00060c;
+  border-color: #000000;
+  color: #fff;
+}
+.btna.btn-primary:hover,
+.btn:hovera.btn-primary:hover {
+  background-color: #000000;
+  border-color: #000000;
+  color: #fff;
+}
+.btn.btn-white:link,
+.btn:hover.btn-white:link {
+  background-color: #00060c;
+  color: #fff;
+}
+.btn.btn-white:hover,
+.btn:hover.btn-white:hover {
+  background-color: #000000;
+  color: #fff;
+}
+a.btn.btn-link.text-left {
+  color: #001F3F;
+  border: 1px solid #000;
+}
+a.btn.btn-link.text-left:hover {
+  color: #001F3F;
+}
+a {
+  color: #001F3F;
+}
+a:hover {
+  color: #001F3F;
+  text-decoration: underline;
+}
+a:visited {
+  color: #001F3F;
+}
+a.btn:hover {
+  color: #fff;
+  text-decoration: underline;
+}
+.text-primary {
+  color: #000000;
+}
+.skin-contrast .treeview-menu > li > a {
+  color: #FFF;
+}
+.bg-teal {
+  background-color: #1b6a6a !important;
+}
+.bg-orange {
+  background-color: #995400 !important;
+}
+.bg-purple {
+  background-color: #3a3767 !important;
+}
+.bg-maroon {
+  background-color: #7d1038 !important;
+}
+.pagination > li > a {
+  color: #00060c !important;
+}
+.pagination > .active > a {
+  background-color: #001F3F;
+  color: #FFF !important;
+}
+btn-success {
+  background-color: #000d07;
+}
+input::-webkit-input-placeholder {
+  /* Chrome/Opera/Safari */
+  color: #b5bbc8 !important;
+}
+input::-moz-placeholder {
+  /* Firefox 19+ */
+  color: #b5bbc8 !important;
+}
+input::-ms-input-placeholder {
+  /* IE 10+ */
+  color: #b5bbc8 !important;
+}
+.select2-default,
+.select2-selection__placeholder {
+  color: #37383c !important;
+}
+.callout.callout-info {
+  background-color: #23536f !important;
+}
+.fixed-table-container tbody .selected td {
+  background-color: #fff8af;
+}
+.search-highlight,
+.search-highlight:hover {
+  background-color: #e9d15b;
+}
+/*
+ * Skin: Green
+ * ----------
+ */
+:root {
+  --background: #222;
+  --back-main: #333;
+  --back-sub: #3d4144;
+  --back-sub-alt: rgba(0, 0, 0, 0.36);
+  --button-default: #005a31;
+  --button-primary: #002715;
+  --button-hover: #000d07;
+  --header: #00a65a;
+  /* Use same as Header picker */
+  --text-main: #BBB;
+  --text-sub: #9b9b9b;
+  --link: #00a65a;
+  /* Use same as Header picker, lighten by 70% */
+  --visited-link: #00f383;
+  /* Use same as Header picker, lighten by 70% */
+  --hover-link: #0dff90;
+}
+.skin-green .main-header .navbar {
+  background-color: #00a65a;
+}
+.skin-green .main-header .navbar .nav > li > a {
+  color: #fff;
+}
+.skin-green .main-header .navbar .nav > li > a:hover,
+.skin-green .main-header .navbar .nav > li > a:active,
+.skin-green .main-header .navbar .nav > li > a:focus,
+.skin-green .main-header .navbar .nav .open > a,
+.skin-green .main-header .navbar .nav .open > a:hover,
+.skin-green .main-header .navbar .nav .open > a:focus,
+.skin-green .main-header .navbar .nav > .active > a {
+  background: rgba(0, 0, 0, 0.1);
+  color: #f6f6f6;
+}
+.skin-green .main-header .navbar .sidebar-toggle {
+  color: #fff;
+}
+.skin-green .main-header .navbar .sidebar-toggle:hover {
+  color: #f6f6f6;
+  background: rgba(0, 0, 0, 0.1);
+}
+.skin-green .main-header .navbar .sidebar-toggle {
+  color: #fff;
+}
+.skin-green .main-header .navbar .sidebar-toggle:hover {
+  background-color: #008d4c;
+}
+@media (max-width: 767px) {
+  .skin-green .main-header .navbar .dropdown-menu li.divider {
+    background-color: rgba(255, 255, 255, 0.1);
+  }
+  .skin-green .main-header .navbar .dropdown-menu li a {
+    color: #333;
+  }
+  .skin-green .main-header .navbar .dropdown-menu li a:hover {
+    background: #008d4c;
+  }
+}
+.skin-green .main-header li.user-header {
+  background-color: #00a65a;
+}
+.skin-green .content-header {
+  background: transparent;
+}
+.skin-green .wrapper,
+.skin-green .main-sidebar,
+.skin-green .left-side {
+  background-color: #222d32;
+}
+.skin-green .user-panel > .info,
+.skin-green .user-panel > .info > a {
+  color: #fff;
+}
+.skin-green .sidebar-menu > li.header {
+  color: #4b646f;
+  background: #1a2226;
+}
+.skin-green .sidebar-menu > li > a {
+  border-left: 3px solid transparent;
+}
+.skin-green .sidebar-menu > li:hover > a,
+.skin-green .sidebar-menu > li.active > a {
+  color: #fff;
+  background: #1e282c;
+  border-left-color: #00a65a;
+}
+.skin-green .sidebar-menu > li > .treeview-menu {
+  margin: 0 1px;
+  background: #2c3b41;
+}
+.skin-green .sidebar a {
+  color: #b8c7ce;
+}
+.skin-green .sidebar a:hover {
+  text-decoration: none;
+}
+.skin-green .treeview-menu > li > a {
+  color: #8aa4af;
+}
+.skin-green .treeview-menu > li.active > a,
+.skin-green .treeview-menu > li > a:hover {
+  color: #fff;
+}
+.skin-green .sidebar-form {
+  border-radius: 3px;
+  border: 1px solid #374850;
+  margin: 10px 10px;
+}
+.skin-green .sidebar-form input[type="text"],
+.skin-green .sidebar-form .btn {
+  box-shadow: none;
+  background-color: #374850;
+  border: 1px solid transparent;
+  height: 35px;
+  transition: all 0.3s ease-in-out;
+}
+.skin-green .sidebar-form input[type="text"] {
+  color: #666;
+  border-top-left-radius: 2px;
+  border-top-right-radius: 0;
+  border-bottom-right-radius: 0;
+  border-bottom-left-radius: 2px;
+}
+.skin-green .sidebar-form input[type="text"]:focus,
+.skin-green .sidebar-form input[type="text"]:focus + .input-group-btn .btn {
+  background-color: #fff;
+  color: #666;
+}
+.skin-green .sidebar-form input[type="text"]:focus + .input-group-btn .btn {
+  border-left-color: #fff;
+}
+.skin-green .sidebar-form .btn {
+  color: #999;
+  border-top-left-radius: 0;
+  border-top-right-radius: 2px;
+  border-bottom-right-radius: 2px;
+  border-bottom-left-radius: 0;
+}
+.skin-green.layout-top-nav .main-header > .logo .logo-variant {
+  background-color: none;
+}
+.btn.btn-primary,
+.btn:hover.btn-primary,
+.btn .btn-primary:link,
+.btn:hover .btn-primary:link {
+  background-color: #00733e;
+  border-color: #004023;
+  color: #fff;
+}
+.btna.btn-primary:hover,
+.btn:hovera.btn-primary:hover {
+  background-color: #004023;
+  border-color: #004023;
+  color: #fff;
+}
+.btn.btn-white:link,
+.btn:hover.btn-white:link {
+  background-color: #00733e;
+  color: #fff;
+}
+.btn.btn-white:hover,
+.btn:hover.btn-white:hover {
+  background-color: #000d07;
+  color: #fff;
+}
+a.btn-info:link,
+a.btn-warning:link,
+a.btn-danger:link {
+  color: #FFF;
+}
+a.btn-info:visited,
+a.btn-warning:visited,
+a.btn-danger:visited {
+  color: #FFF;
+}
+a:link {
+  color: var(--link);
+}
+a:visited {
+  color: var(--visited-link);
+}
+a {
+  color: #00a65a;
+}
+a:hover {
+  color: #004023;
+}
+a:visited {
+  color: #00a65a;
+}
+.text-primary {
+  color: #004023;
+}
+.far fa-life-ring {
+  color: var(--link);
+}
+.fixed-table-container tbody .selected td {
+  background-color: #fff8af;
+}
+.select2-container--default .select2-selection--multiple .select2-selection__choice {
+  background-color: #00a65a;
+}
+.search-highlight,
+.search-highlight:hover {
+  background-color: #e9d15b;
+}
+/*
+ * Skin: green dark
+ * ----------
+ */
+.skin-green-dark .main-header .navbar {
+  background-color: #00a65a;
+}
+.skin-green-dark .main-header .navbar .nav > li > a {
+  color: #fff;
+}
+.skin-green-dark .main-header .navbar .nav > li > a:hover,
+.skin-green-dark .main-header .navbar .nav > li > a:active,
+.skin-green-dark .main-header .navbar .nav > li > a:focus,
+.skin-green-dark .main-header .navbar .nav .open > a,
+.skin-green-dark .main-header .navbar .nav .open > a:hover,
+.skin-green-dark .main-header .navbar .nav .open > a:focus,
+.skin-green-dark .main-header .navbar .nav > .active > a {
+  background: rgba(0, 0, 0, 0.1);
+  color: #f6f6f6;
+}
+.skin-green-dark .main-header .navbar .sidebar-toggle {
+  color: #fff;
+}
+.skin-green-dark .main-header .navbar .sidebar-toggle:hover {
+  color: #f6f6f6;
+  background: rgba(0, 0, 0, 0.1);
+}
+.skin-green-dark .main-header .navbar .sidebar-toggle {
+  color: #fff;
+}
+.skin-green-dark .main-header .navbar .sidebar-toggle:hover {
+  background-color: #008d4c;
+}
+@media (max-width: 767px) {
+  .skin-green-dark .main-header .navbar .dropdown-menu li.divider {
+    background-color: rgba(255, 255, 255, 0.1);
+    color: #fff;
+  }
+  .skin-green-dark .main-header .navbar .dropdown-menu li a {
+    color: #fff;
+  }
+  .skin-green-dark .main-header .navbar .dropdown-menu li a:hover {
+    background: #008d4c;
+    color: #fff;
+  }
+}
+.skin-green-dark .main-header li.user-header {
+  background-color: #00a65a;
+}
+.skin-green-dark .content-header {
+  background: transparent;
+}
+.skin-green-dark .wrapper,
+.skin-green-dark .main-sidebar,
+.skin-green-dark .left-side {
+  background-color: #222d32;
+}
+.skin-green-dark .user-panel > .info,
+.skin-green-dark .user-panel > .info > a {
+  color: #fff;
+}
+.skin-green-dark .sidebar-menu > li.header {
+  color: #4b646f;
+  background: #1a2226;
+}
+.skin-green-dark .sidebar-menu > li > a {
+  border-left: 3px solid transparent;
+}
+.skin-green-dark .sidebar-menu > li:hover > a,
+.skin-green-dark .sidebar-menu > li.active > a {
+  color: #fff;
+  background: #1e282c;
+  border-left-color: #00a65a;
+}
+.skin-green-dark .sidebar-menu > li > .treeview-menu {
+  margin: 0 1px;
+  background: #2c3b41;
+}
+.skin-green-dark .sidebar a {
+  color: #b8c7ce;
+}
+.skin-green-dark .sidebar a:hover {
+  text-decoration: none;
+}
+.skin-green-dark .treeview-menu > li > a {
+  color: #8aa4af;
+}
+.skin-green-dark .treeview-menu > li.active > a,
+.skin-green-dark .treeview-menu > li > a:hover {
+  color: #fff;
+}
+.skin-green-dark .sidebar-form {
+  border-radius: 3px;
+  border: 1px solid #374850;
+  margin: 10px 10px;
+}
+.skin-green-dark .sidebar-form input[type="text"],
+.skin-green-dark .sidebar-form .btn {
+  box-shadow: none;
+  background-color: #374850;
+  border: 1px solid transparent;
+  height: 35px;
+  transition: all 0.3s ease-in-out;
+}
+.skin-green-dark .sidebar-form input[type="text"] {
+  color: #666;
+  border-top-left-radius: 2px;
+  border-top-right-radius: 0;
+  border-bottom-right-radius: 0;
+  border-bottom-left-radius: 2px;
+}
+.skin-green-dark .sidebar-form input[type="text"]:focus,
+.skin-green-dark .sidebar-form input[type="text"]:focus + .input-group-btn .btn {
+  background-color: #fff;
+  color: #666;
+}
+.skin-green-dark .sidebar-form input[type="text"]:focus + .input-group-btn .btn {
+  border-left-color: #fff;
+}
+.skin-green-dark .sidebar-form .btn {
+  color: #999;
+  border-top-left-radius: 0;
+  border-top-right-radius: 2px;
+  border-bottom-right-radius: 2px;
+  border-bottom-left-radius: 0;
+}
+.skin-green-dark.layout-top-nav .main-header > .logo .logo-variant {
+  background-color: none;
+}
+.btn,
+.btn:hover {
+  color: #FFF !important;
+}
+.btn.btn-primary,
+.btn:hover.btn-primary,
+.btn .btn-primary:link,
+.btn:hover .btn-primary:link {
+  background-color: #00733e;
+  border-color: #FFF;
+  color: #FFF;
+}
+.btna.btn-primary:hover,
+.btn:hovera.btn-primary:hover {
+  background-color: #004023;
+  border-color: #004023;
+  color: #FFF;
+}
+.btn.btn-white:link,
+.btn:hover.btn-white:link {
+  background-color: #00733e;
+  color: #FFF;
+}
+.btn.btn-white:hover,
+.btn:hover.btn-white:hover {
+  background-color: #000d07;
+  color: #FFF;
+}
+/**
+The dropdown is white, so use a darker color
+ */
+li.dropdown-item-marker {
+  color: var(--button-primary);
+}
+a:hover {
+  color: var(--hover-link);
+}
+a:visited {
+  color: var(--visited-link);
+}
+.text-primary {
+  color: #fff;
+}
+#sort tr.cansort {
+  background-color: var(--back-main);
+  color: var(--text-main);
+}
+:root {
+  --background: #222;
+  --back-main: #333;
+  --back-sub: #312F2F;
+  --back-sub-alt: rgba(0, 0, 0, 0.36);
+  --button-default: #006400;
+  --button-primary: #003100;
+  --button-hover: #000000;
+  --header: #006400;
+  /* Use same as Header picker */
+  --text-main: #FFF;
+  --text-sub: #9b9b9b;
+  --link: #9ACD32;
+  /* Use same as Header picker, lighten by 70% */
+  --visited-link: #b8dc70;
+  /* Use same as Header picker, lighten by 70% */
+  --hover-link: #d7ebad;
+  /* Use same as Header picker, lighten by 70% */
+  --nav-link: #FFF;
+  /* Use same as Header picker */
+  --light-link: #fff;
+  /* Use same as Header picker */
+}
+#ldapad_test_results.well.well-sm {
+  color: var(--back-main);
+}
+a.actions {
+  color: #fff !important;
+}
+.pagination > li > a {
+  color: var(--light-link);
+  background-color: var(--back-main);
+}
+.pagination > .active > a {
+  background-color: var(--visited-link);
+  border-color: var(--light-link);
+}
+.pagination > .active > a:hover {
+  background-color: var(--hover-link);
+}
+.tasks-menu > .dropdown-menu > li .menu {
+  background-color: var(--back-main);
+}
+.tasks-menu > .dropdown-menu > li .menu > li > a:hover .progress {
+  background-color: var(--background);
+}
+h2.task_menu {
+  color: var(--link);
+}
+.navbar-custom-menu > .navbar-nav > li > .dropdown-menu {
+  background-color: var(--back-main);
+  color: var(--link);
+}
+.main-header .navbar,
+.main-header .logo {
+  background-color: var(--header);
+  background: linear-gradient(to bottom, var(--header) 0%, var(--header) 100%);
+  border-color: var(--header);
+}
+.bootstrap-table .fixed-table-container .table thead th .sortable {
+  color: var(--nav-link);
+}
+.far fa-life-ring {
+  color: var(--link);
+}
+.thead,
+.navbar-nav > li > a:link {
+  color: var(--nav-link);
+}
+.modal-content {
+  background-color: var(--back-main);
+  color: var(--text-main);
+}
+.btn-primary.hover {
+  color: var(--nav-link);
+}
+.small-box h3,
+.small-box p {
+  color: var(--nav-link) !important;
+}
+.small-box h3 a:hover,
+.small-box p a:hover {
+  text-decoration: none;
+  color: var(--nav-link) !important;
+}
+#accessoriesTable > tbody > tr > td > nobr > a > i.fa {
+  color: var(--text-main);
+}
+#assetsListingTable > tbody > tr > td > nobr > a > i.fa {
+  color: var(--text-main);
+}
+#assetsListingTable > tbody > tr.selected > td {
+  background-color: var(--back-main);
+}
+body {
+  color: var(--text-main);
+}
+.box,
+.box.box-default {
+  border-top: 3px solid var(--header);
+  border-top-color: var(--header);
+}
+.box-body,
+.box-footer,
+.box-header {
+  background-color: var(--back-sub);
+  color: var(--header);
+}
+.btn-default {
+  background-color: var(--button-default);
+  color: var(--link);
+}
+.btn-default dropdown-toggle {
+  background-color: var(--button-default);
+  color: var(--link);
+}
+.btn-default:active,
+.btn-default:focus,
+.btn-default:hover,
+.btn-default.active {
+  background-color: var(--button-hover);
+  color: var(--link);
+}
+.btn-primary,
+.btn-primary.hover,
+.btn-primary:active,
+.text-green {
+  color: var(--text-main);
+}
+.btn-primary:hover {
+  background-color: var(--button-primary);
+}
+#componentsTable > tbody > tr > td > nobr > a > i.fa {
+  color: var(--text-main);
+}
+#consumablesTable > tbody > tr > td > nobr > a > i.fa {
+  color: var(--text-main);
+}
+.content-wrapper {
+  background-color: var(--background);
+}
+#create-form > div > div > div > span > i.fa {
+  background-color: var(--back-sub);
+  color: var(--header);
+}
+.datepicker .datepicker-switch:hover,
+.datepicker .next:hover,
+.datepicker .prev:hover,
+.datepicker tfoot tr th:hover,
+.datepicker table tr td.day.focused,
+.datepicker table tr td.day:hover {
+  background-color: var(--header);
+}
+.datepicker.dropdown-menu {
+  background-color: var(--back-main);
+  color: var(--text-main);
+}
+#details > div > div > div > table {
+  background-color: transparent;
+}
+.dropdown-menu > li > a:hover {
+  background-color: var(--back-main);
+  color: var(--nav-link);
+}
+.fixed-table-body thead th .th-inner {
+  color: var(--nav-link);
+}
+.form-control {
+  background-color: var(--back-main);
+  color: var(--text-main);
+}
+.form-control[disabled],
+.form-control[readonly],
+fieldset[disabled] .form-control {
+  background-color: var(--back-main);
+  color: var(--text-main);
+}
+h1,
+h2,
+h3,
+h4,
+h5,
+h6,
+p {
+  color: var(--text-main);
+}
+.help-block {
+  color: var(--text-sub);
+}
+input[type=text],
+input[type=search] {
+  background-color: var(--back-sub);
+  color: var(--text-main);
+}
+#licensesTable > tbody > tr > td > nobr > a > i.fa {
+  color: var(--text-main);
+}
+.main-footer {
+  background-color: var(--back-main);
+  color: var(--text-main);
+}
+.nav-tabs-custom > .nav-tabs > li > a,
+.nav-tabs-custom > .nav-tabs > li.active > a {
+  color: var(--text-main);
+}
+.nav-tabs-custom > .nav-tabs > li.active {
+  border-top-color: var(--header);
+}
+.nav-tabs-custom > .nav-tabs > li.active > a {
+  background-color: var(--back-main);
+}
+.nav-tabs-custom > .nav-tabs > li.active > a:hover {
+  background-color: var(--back-sub);
+  color: var(--text-main);
+}
+.nav-tabs-custom,
+.nav-tabs-custom > .tab-content {
+  background-color: var(--back-main);
+}
+.open > .dropdown-toggle.btn-default {
+  background-color: var(--back-sub);
+  color: var(--header);
+}
+.panel {
+  background-color: var(--back-sub);
+  color: var(--text-main);
+}
+.panel-default > .panel-heading {
+  background-color: var(--back-main);
+  color: var(--header);
+}
+.select2-container--default .select2-results__option[aria-selected=true],
+.select2-container--default .select2-results__option[aria-selected=true]:hover {
+  background-color: var(--back-sub);
+  color: var(--header);
+}
+.select2-container--default .select2-results__option--highlighted[aria-selected] {
+  background-color: var(--header);
+  color: var(--back-main);
+}
+.select2-container--default .select2-selection--single .select2-selection__rendered {
+  color: var(--text-main);
+}
+.select2-container--default .select2-selection--multiple .select2-selection__choice {
+  background-color: var(--header);
+}
+.select2-selection--single {
+  background-color: var(--back-sub) !important;
+  color: var(--text-main) !important;
+}
+.select2-dropdown {
+  background-color: var(--back-main);
+  color: var(--text-main);
+}
+.skin-green-dark .main-header .navbar .dropdown-menu li a {
+  color: #FFFFFF;
+}
+.skin-green-dark .main-header .navbar .dropdown-menu li a:hover {
+  background-color: #006300;
+}
+.fixed-table-body thead th .th-inner,
+.skin-green-dark .sidebar-menu > li.active > a,
+.skin-green .sidebar-menu > li:hover > a,
+.sidebar-toggle:hover {
+  background-color: var(--header) !important;
+}
+.tab-content,
+.tab-pane {
+  background-color: var(--back-main);
+  color: var(--text-main);
+}
+.table-striped > tbody > tr:nth-of-type(odd) {
+  background-color: var(--back-sub);
+}
+.table-striped > tbody > tr:nth-of-type(even) {
+  background-color: var(--back-sub);
+}
+#webui > div > div > div > div > div > table > tbody > tr > td > a > i.fa,
+.box-body,
+.box-footer,
+.box-header {
+  color: var(--text-main);
+}
+.box-header.with-border {
+  border-bottom: #000;
+}
+a {
+  color: var(--link);
+}
+a:link {
+  color: var(--link);
+}
+a:hover {
+  color: var(--hover-link);
+  text-decoration: underline;
+}
+a:visited {
+  color: var(--visited-link);
+}
+#customFieldsTable a[href*='/models'] {
+  background-color: var(--back-sub-alt);
+  color: var(--link);
+}
+#customFieldsTable a[href*='/models']:hover {
+  background-color: var(--text-sub);
+  color: var(--button-hover);
+}
+#customFieldsTable a[href*='/models']:visited {
+  background-color: var(--background);
+  color: var(--visited-link);
+}
+#customFieldsTable a[href*='/fieldsets'] {
+  background-color: transparent;
+}
+.row-striped {
+  vertical-align: top;
+  line-height: 2.6;
+  padding: 0px;
+  margin-left: 20px;
+  box-sizing: border-box;
+  display: table;
+}
+.row-striped .row:nth-of-type(odd) div {
+  background-color: var(--back-sub);
+  color: var(--text-main);
+  border-top: 1px solid #dddddd;
+  display: table-cell;
+}
+.row-striped .row:nth-of-type(even) div {
+  background-color: var(--back-sub);
+  color: var(--text-main);
+  border-top: 1px solid #dddddd;
+  display: table-cell;
+}
+.row-new-striped > .row:nth-of-type(odd) {
+  background-color: var(--back-sub);
+  color: var(--text-main);
+}
+.row-new-striped > .row:nth-of-type(even) {
+  background-color: var(--back-sub-alt);
+  color: var(--text-main);
+}
+.search-highlight,
+.search-highlight:hover {
+  background-color: #e9d15b;
+}
+.table > tbody > tr.warning > td {
+  background-color: var(--back-sub);
+}
+/*
+ * Skin: orange dark
+ * ----------
+ */
+.skin-orange-dark .main-header .navbar {
+  background-color: #FF8C00;
+}
+.skin-orange-dark .main-header .navbar .nav > li > a {
+  color: #fff;
+}
+.skin-orange-dark .main-header .navbar .nav > li > a:hover,
+.skin-orange-dark .main-header .navbar .nav > li > a:active,
+.skin-orange-dark .main-header .navbar .nav > li > a:focus,
+.skin-orange-dark .main-header .navbar .nav .open > a,
+.skin-orange-dark .main-header .navbar .nav .open > a:hover,
+.skin-orange-dark .main-header .navbar .nav .open > a:focus,
+.skin-orange-dark .main-header .navbar .nav > .active > a {
+  background: rgba(0, 0, 0, 0.1);
+  color: #f6f6f6;
+}
+.skin-orange-dark .main-header .navbar .sidebar-toggle {
+  color: #fff;
+}
+.skin-orange-dark .main-header .navbar .sidebar-toggle:hover {
+  color: #f6f6f6;
+  background: rgba(0, 0, 0, 0.1);
+}
+.skin-orange-dark .main-header .navbar .sidebar-toggle {
+  color: #fff;
+}
+.skin-orange-dark .main-header .navbar .sidebar-toggle:hover {
+  background-color: #e67e00;
+}
+@media (max-width: 767px) {
+  .skin-orange-dark .main-header .navbar .dropdown-menu li.divider {
+    background-color: rgba(255, 255, 255, 0.1);
+    color: #fff;
+  }
+  .skin-orange-dark .main-header .navbar .dropdown-menu li a {
+    color: #fff;
+  }
+  .skin-orange-dark .main-header .navbar .dropdown-menu li a:hover {
+    background: #e67e00;
+    color: #fff;
+  }
+}
+.skin-orange-dark .main-header li.user-header {
+  background-color: #FF8C00;
+}
+.skin-orange-dark .content-header {
+  background: transparent;
+}
+.skin-orange-dark .wrapper,
+.skin-orange-dark .main-sidebar,
+.skin-orange-dark .left-side {
+  background-color: #222d32;
+}
+.skin-orange-dark .user-panel > .info,
+.skin-orange-dark .user-panel > .info > a {
+  color: #fff;
+}
+.skin-orange-dark .sidebar-menu > li.header {
+  color: #4b646f;
+  background: #1a2226;
+}
+.skin-orange-dark .sidebar-menu > li > a {
+  border-left: 3px solid transparent;
+}
+.skin-orange-dark .sidebar-menu > li:hover > a,
+.skin-orange-dark .sidebar-menu > li.active > a {
+  color: #fff;
+  background: #1e282c;
+  border-left-color: #FF8C00;
+}
+.skin-orange-dark .sidebar-menu > li > .treeview-menu {
+  margin: 0 1px;
+  background: #2c3b41;
+}
+.skin-orange-dark .sidebar a {
+  color: #b8c7ce;
+}
+.skin-orange-dark .sidebar a:hover {
+  text-decoration: none;
+}
+.skin-orange-dark .treeview-menu > li > a {
+  color: #8aa4af;
+}
+.skin-orange-dark .treeview-menu > li.active > a,
+.skin-orange-dark .treeview-menu > li > a:hover {
+  color: #fff;
+}
+.skin-orange-dark .sidebar-form {
+  border-radius: 3px;
+  border: 1px solid #374850;
+  margin: 10px 10px;
+}
+.skin-orange-dark .sidebar-form input[type="text"],
+.skin-orange-dark .sidebar-form .btn {
+  box-shadow: none;
+  background-color: #374850;
+  border: 1px solid transparent;
+  height: 35px;
+  transition: all 0.3s ease-in-out;
+}
+.skin-orange-dark .sidebar-form input[type="text"] {
+  color: #666;
+  border-top-left-radius: 2px;
+  border-top-right-radius: 0;
+  border-bottom-right-radius: 0;
+  border-bottom-left-radius: 2px;
+}
+.skin-orange-dark .sidebar-form input[type="text"]:focus,
+.skin-orange-dark .sidebar-form input[type="text"]:focus + .input-group-btn .btn {
+  background-color: #fff;
+  color: #666;
+}
+.skin-orange-dark .sidebar-form input[type="text"]:focus + .input-group-btn .btn {
+  border-left-color: #fff;
+}
+.skin-orange-dark .sidebar-form .btn {
+  color: #999;
+  border-top-left-radius: 0;
+  border-top-right-radius: 2px;
+  border-bottom-right-radius: 2px;
+  border-bottom-left-radius: 0;
+}
+.skin-orange-dark.layout-top-nav .main-header > .logo .logo-variant {
+  background-color: none;
+}
+.btn,
+.btn:hover {
+  color: #fff !important;
+}
+.btn.btn-primary,
+.btn:hover.btn-primary,
+.btn .btn-primary:link,
+.btn:hover .btn-primary:link {
+  background-color: #cc7000;
+  border-color: #fff;
+  color: #fff;
+}
+.btna.btn-primary:hover,
+.btn:hovera.btn-primary:hover {
+  background-color: #995400;
+  border-color: #995400;
+  color: #fff;
+}
+.btn.btn-white:link,
+.btn:hover.btn-white:link {
+  background-color: #cc7000;
+  color: #fff;
+}
+.btn.btn-white:hover,
+.btn:hover.btn-white:hover {
+  background-color: #663800;
+  color: #fff;
+}
+/**
+The dropdown is white, so use a darker color
+ */
+li.dropdown-item-marker {
+  color: var(--button-primary);
+}
+.text-primary {
+  color: #fff;
+}
+#sort tr.cansort {
+  background-color: var(--back-main);
+  color: var(--text-main);
+}
+:root {
+  --background: #222;
+  --back-main: #333;
+  --back-sub: #2E2C2C;
+  --back-sub-alt: rgba(0, 0, 0, 0.36);
+  --button-default: #b36200;
+  --button-primary: #804600;
+  --button-hover: #663800;
+  --header: #FF8C00;
+  /* Use same as Header picker */
+  --text-main: #BBB;
+  --text-sub: #9b9b9b;
+  --link: #FFA500;
+  /* Use same as Header picker, lighten by 70% */
+  --visited-link: #ffc04d;
+  /* Use same as Header picker, lighten by 70% */
+  --hover-link: #ffdb99;
+  /* Use same as Header picker, lighten by 70% */
+  --nav-link: #FFF;
+  /* Use same as Header picker */
+  --light-link: #fff;
+  /* Use same as Header picker */
+}
+#ldapad_test_results.well.well-sm {
+  color: var(--back-main);
+}
+a.actions {
+  color: #fff !important;
+}
+.pagination > li > a {
+  color: var(--light-link);
+  background-color: var(--back-main);
+}
+.pagination > .active > a {
+  background-color: var(--visited-link);
+  border-color: var(--light-link);
+}
+.pagination > .active > a:hover {
+  background-color: var(--hover-link);
+}
+.tasks-menu > .dropdown-menu > li .menu {
+  background-color: var(--back-main);
+}
+.tasks-menu > .dropdown-menu > li .menu > li > a:hover .progress {
+  background-color: var(--background);
+}
+h2.task_menu {
+  color: var(--link);
+}
+.navbar-custom-menu > .navbar-nav > li > .dropdown-menu {
+  background-color: var(--back-main);
+  color: var(--link);
+}
+.main-header .navbar,
+.main-header .logo {
+  background-color: var(--header);
+  background: linear-gradient(to bottom, var(--header) 0%, var(--header) 100%);
+  border-color: var(--header);
+}
+.far fa-life-ring {
+  color: var(--link);
+}
+.bootstrap-table .fixed-table-container .table thead th .sortable {
+  color: var(--nav-link);
+}
+.bootstrap-table .fixed-table-toolbar .columns label {
+  color: #000;
+}
+.thead,
+.navbar-nav > li > a:link {
+  color: var(--nav-link);
+}
+.modal-content {
+  background-color: var(--back-main);
+  color: var(--text-main);
+}
+a:link {
+  color: var(--link);
+}
+a:visited {
+  color: var(--visited-link);
+}
+a:hover {
+  color: var(--hover-link);
+}
+.btn-primary.hover {
+  color: var(--nav-link);
+}
+.small-box h3,
+.small-box p {
+  color: var(--nav-link) !important;
+}
+.small-box h3 a:hover,
+.small-box p a:hover {
+  text-decoration: none;
+  color: var(--nav-link) !important;
+}
+#accessoriesTable > tbody > tr > td > nobr > a > i.fa {
+  color: var(--text-main);
+}
+#assetsListingTable > tbody > tr > td > nobr > a > i.fa {
+  color: var(--text-main);
+}
+#assetsListingTable > tbody > tr.selected > td {
+  background-color: var(--back-main);
+}
+body {
+  color: var(--text-main);
+}
+.box,
+.box.box-default {
+  border-top: 3px solid var(--header);
+  border-top-color: var(--header);
+}
+.box-body,
+.box-footer,
+.box-header {
+  background-color: var(--back-sub);
+  color: var(--header);
+}
+.btn-default {
+  background-color: var(--button-default);
+  color: var(--nav-link);
+}
+a:link.btn-default {
+  color: var(--nav-link);
+}
+.btn-default dropdown-toggle {
+  background-color: var(--button-default);
+  color: var(--nav-link);
+}
+.btn-default:active,
+.btn-default:focus,
+.btn-default:hover,
+.btn-default.active {
+  background-color: var(--button-hover);
+  color: var(--background);
+}
+.btn-primary,
+.btn-primary.hover,
+.btn-primary:active,
+.text-orange {
+  color: var(--nav-link) !important;
+  border-color: var(--button-primary);
+}
+.btn-primary:hover {
+  background-color: var(--button-primary);
+}
+#componentsTable > tbody > tr > td > nobr > a > i.fa {
+  color: var(--text-main);
+}
+#consumablesTable > tbody > tr > td > nobr > a > i.fa {
+  color: var(--text-main);
+}
+.content-wrapper {
+  background-color: var(--background);
+}
+#create-form > div > div > div > span > i.fa {
+  background-color: var(--back-sub);
+  color: var(--header);
+}
+.datepicker .datepicker-switch:hover,
+.datepicker .next:hover,
+.datepicker .prev:hover,
+.datepicker tfoot tr th:hover,
+.datepicker table tr td.day.focused,
+.datepicker table tr td.day:hover {
+  background-color: var(--header);
+}
+.datepicker.dropdown-menu {
+  background-color: var(--back-main);
+  color: var(--text-main);
+}
+#details > div > div > div > table {
+  background-color: transparent;
+}
+.dropdown-menu > li > a:hover {
+  background-color: var(--back-main);
+  color: var(--nav-link);
+}
+.fixed-table-body thead th .th-inner {
+  color: var(--nav-link);
+}
+.form-control {
+  background-color: var(--back-main);
+  color: var(--text-main);
+}
+.form-control[disabled],
+.form-control[readonly],
+fieldset[disabled] .form-control {
+  background-color: var(--back-main);
+  color: var(--text-main);
+}
+h1,
+h2,
+h3,
+h4,
+h5,
+h6,
+p {
+  color: var(--text-main);
+}
+.help-block {
+  color: var(--text-sub);
+}
+input[type=text],
+input[type=search] {
+  background-color: var(--back-sub);
+  color: var(--text-main);
+}
+#licensesTable > tbody > tr > td > nobr > a > i.fa {
+  color: var(--text-main);
+}
+.main-footer {
+  background-color: var(--back-main);
+  color: var(--text-main);
+}
+.nav-tabs-custom > .nav-tabs > li > a,
+.nav-tabs-custom > .nav-tabs > li.active > a {
+  color: var(--text-main);
+}
+.nav-tabs-custom > .nav-tabs > li.active {
+  border-top-color: var(--header);
+}
+.nav-tabs-custom > .nav-tabs > li.active > a {
+  background-color: var(--back-main);
+}
+.nav-tabs-custom > .nav-tabs > li.active > a:hover {
+  background-color: var(--back-sub);
+  color: var(--text-main);
+}
+.nav-tabs-custom,
+.nav-tabs-custom > .tab-content {
+  background-color: var(--back-main);
+}
+.navbar-nav > .tasks-menu > .dropdown-menu > li.header {
+  background-color: var(--back-main);
+  color: var(--header);
+}
+.open > .dropdown-toggle.btn-default {
+  background-color: var(--back-sub);
+  color: var(--header);
+}
+.panel {
+  background-color: var(--back-sub);
+  color: var(--text-main);
+}
+.panel-default > .panel-heading {
+  background-color: var(--back-main);
+  color: var(--header);
+}
+.select2-container--default .select2-results__option[aria-selected=true],
+.select2-container--default .select2-results__option[aria-selected=true]:hover {
+  background-color: var(--back-sub);
+  color: var(--header);
+}
+.select2-container--default .select2-results__option--highlighted[aria-selected] {
+  background-color: var(--header);
+  color: var(--back-main);
+}
+.select2-container--default .select2-selection--single .select2-selection__rendered {
+  color: var(--text-main);
+}
+.select2-container--default .select2-selection--multiple .select2-selection__choice {
+  background-color: var(--header);
+}
+.select2-selection--single {
+  background-color: var(--back-sub) !important;
+  color: var(--text-main) !important;
+}
+.select2-dropdown {
+  background-color: var(--back-main);
+  color: var(--text-main);
+}
+.skin-orange-dark .main-header .navbar .dropdown-menu li a {
+  color: #FFFFFF;
+}
+.skin-orange-dark .main-header .navbar .dropdown-menu li a:hover {
+  background-color: #ff8c00;
+}
+.fixed-table-body thead th .th-inner,
+.skin-orange-dark .sidebar-menu > li.active > a,
+.skin-orange .sidebar-menu > li:hover > a,
+.sidebar-toggle:hover {
+  background-color: var(--header) !important;
+}
+.tab-content,
+.tab-pane {
+  background-color: var(--back-main);
+  color: var(--text-main);
+}
+.table-striped > tbody > tr:nth-of-type(odd) {
+  background-color: var(--back-sub);
+}
+.table-striped > tbody > tr:nth-of-type(even) {
+  background-color: var(--back-sub-alt);
+}
+#webui > div > div > div > div > div > table > tbody > tr > td > a > i.fa,
+.box-body,
+.box-footer,
+.box-header {
+  color: var(--text-main);
+}
+.box-header.with-border {
+  border-bottom: #000;
+}
+#customFieldsTable a[href*='/models'] {
+  background-color: var(--back-sub-alt);
+  color: var(--link);
+}
+#customFieldsTable a[href*='/models']:hover {
+  background-color: var(--text-sub);
+  color: var(--button-hover);
+}
+#customFieldsTable a[href*='/models']:visited {
+  background-color: var(--background);
+  color: var(--visited-link);
+}
+#customFieldsTable a[href*='/fieldsets'] {
+  background-color: transparent;
+}
+.row-striped {
+  vertical-align: top;
+  line-height: 2.6;
+  padding: 0px;
+  margin-left: 20px;
+  box-sizing: border-box;
+  display: table;
+}
+.row-striped .row:nth-of-type(odd) div {
+  background-color: var(--back-sub);
+  color: var(--text-main);
+  border-top: 1px solid #dddddd;
+  display: table-cell;
+}
+.row-striped .row:nth-of-type(even) div {
+  background-color: var(--back-sub);
+  color: var(--text-main);
+  border-top: 1px solid #dddddd;
+  display: table-cell;
+}
+.row-new-striped > .row:nth-of-type(odd) {
+  background-color: var(--back-sub);
+  color: var(--text-main);
+}
+.row-new-striped > .row:nth-of-type(even) {
+  background-color: var(--back-sub-alt);
+  color: var(--text-main);
+}
+.search-highlight,
+.search-highlight:hover {
+  background-color: #e9d15b;
+}
+.table > tbody > tr.warning > td {
+  background-color: var(--back-sub);
+}
+/*
+ * Skin: Purple
+ * ----------
+ */
+.skin-purple .main-header .navbar {
+  background-color: #605ca8;
+}
+.skin-purple .main-header .navbar .nav > li > a {
+  color: #fff;
+}
+.skin-purple .main-header .navbar .nav > li > a:hover,
+.skin-purple .main-header .navbar .nav > li > a:active,
+.skin-purple .main-header .navbar .nav > li > a:focus,
+.skin-purple .main-header .navbar .nav .open > a,
+.skin-purple .main-header .navbar .nav .open > a:hover,
+.skin-purple .main-header .navbar .nav .open > a:focus,
+.skin-purple .main-header .navbar .nav > .active > a {
+  background: rgba(0, 0, 0, 0.1);
+  color: #f6f6f6;
+}
+.skin-purple .main-header .navbar .sidebar-toggle {
+  color: #fff;
+}
+.skin-purple .main-header .navbar .sidebar-toggle:hover {
+  color: #f6f6f6;
+  background: rgba(0, 0, 0, 0.1);
+}
+.skin-purple .main-header .navbar .sidebar-toggle {
+  color: #fff;
+}
+.skin-purple .main-header .navbar .sidebar-toggle:hover {
+  background-color: #555299;
+}
+@media (max-width: 767px) {
+  .skin-purple .main-header .navbar .dropdown-menu li.divider {
+    background-color: rgba(255, 255, 255, 0.1);
+  }
+  .skin-purple .main-header .navbar .dropdown-menu li a {
+    color: #333;
+  }
+  .skin-purple .main-header .navbar .dropdown-menu li a:hover {
+    background: #555299;
+  }
+}
+.skin-purple .main-header li.user-header {
+  background-color: #605ca8;
+}
+.skin-purple .content-header {
+  background: transparent;
+}
+.skin-purple .wrapper,
+.skin-purple .main-sidebar,
+.skin-purple .left-side {
+  background-color: #222d32;
+}
+.skin-purple .user-panel > .info,
+.skin-purple .user-panel > .info > a {
+  color: #fff;
+}
+.skin-purple .sidebar-menu > li.header {
+  color: #4b646f;
+  background: #1a2226;
+}
+.skin-purple .sidebar-menu > li > a {
+  border-left: 3px solid transparent;
+}
+.skin-purple .sidebar-menu > li:hover > a,
+.skin-purple .sidebar-menu > li.active > a {
+  color: #fff;
+  background: #1e282c;
+  border-left-color: #605ca8;
+}
+.skin-purple .sidebar-menu > li > .treeview-menu {
+  margin: 0 1px;
+  background: #2c3b41;
+}
+.skin-purple .sidebar a {
+  color: #b8c7ce;
+}
+.skin-purple .sidebar a:hover {
+  text-decoration: none;
+}
+.skin-purple .treeview-menu > li > a {
+  color: #8aa4af;
+}
+.skin-purple .treeview-menu > li.active > a,
+.skin-purple .treeview-menu > li > a:hover {
+  color: #fff;
+}
+.skin-purple .sidebar-form {
+  border-radius: 3px;
+  border: 1px solid #374850;
+  margin: 10px 10px;
+}
+.skin-purple .sidebar-form input[type="text"],
+.skin-purple .sidebar-form .btn {
+  box-shadow: none;
+  background-color: #374850;
+  border: 1px solid transparent;
+  height: 35px;
+  transition: all 0.3s ease-in-out;
+}
+.skin-purple .sidebar-form input[type="text"] {
+  color: #666;
+  border-top-left-radius: 2px;
+  border-top-right-radius: 0;
+  border-bottom-right-radius: 0;
+  border-bottom-left-radius: 2px;
+}
+.skin-purple .sidebar-form input[type="text"]:focus,
+.skin-purple .sidebar-form input[type="text"]:focus + .input-group-btn .btn {
+  background-color: #fff;
+  color: #666;
+}
+.skin-purple .sidebar-form input[type="text"]:focus + .input-group-btn .btn {
+  border-left-color: #fff;
+}
+.skin-purple .sidebar-form .btn {
+  color: #999;
+  border-top-left-radius: 0;
+  border-top-right-radius: 2px;
+  border-bottom-right-radius: 2px;
+  border-bottom-left-radius: 0;
+}
+.skin-purple.layout-top-nav .main-header > .logo .logo-variant {
+  background-color: none;
+}
+.btn.btn-primary,
+.btn:hover.btn-primary,
+.btn .btn-primary:link,
+.btn:hover .btn-primary:link {
+  background-color: #4c4988;
+  border-color: #3a3767;
+  color: #fff;
+}
+.btna.btn-primary:hover,
+.btn:hovera.btn-primary:hover {
+  background-color: #3a3767;
+  border-color: #3a3767;
+  color: #fff;
+}
+.btn.btn-white:link,
+.btn:hover.btn-white:link {
+  background-color: #4c4988;
+  color: #fff;
+}
+.btn.btn-white:hover,
+.btn:hover.btn-white:hover {
+  background-color: #272546;
+  color: #fff;
+}
+a {
+  color: var(--link);
+}
+a:hover {
+  color: var(--hover-link);
+}
+a:visited {
+  color: var(--visited-link);
+}
+.text-primary {
+  color: #3a3767;
+}
+:root {
+  --button-default: #434078;
+  --button-primary: #302e56;
+  --button-hover: #272546;
+  --header: #605ca8;
+  /* Use same as Header picker */
+  --text-main: #BBB;
+  --text-sub: #9b9b9b;
+  --link: #605ca8;
+  /* Use same as Header picker, lighten by 70% */
+  --visited-link: #918ec3;
+  /* Use same as Header picker, lighten by 70% */
+  --hover-link: #c1c0dd;
+  /* Use same as Header picker, lighten by 70% */
+  --nav-link: #FFF;
+  /* Use same as Header picker */
+  --light-link: #fff;
+  /* Use same as Header picker */
+}
+a.btn-info:link,
+a.btn-warning:link,
+a.btn-danger:link {
+  color: #FFF;
+}
+a.btn-info:visited,
+a.btn-warning:visited,
+a.btn-danger:visited {
+  color: #FFF;
+}
+.fixed-table-container tbody .selected td {
+  background-color: #fff8af;
+}
+.select2-container--default .select2-selection--multiple .select2-selection__choice {
+  background-color: #605ca8;
+}
+.far fa-life-ring {
+  color: var(--link);
+}
+.search-highlight,
+.search-highlight:hover {
+  background-color: #e9d15b;
+}
+/*
+ * Skin: purple dark
+ * ----------
+ */
+.skin-purple-dark .main-header .navbar {
+  background-color: #605ca8;
+}
+.skin-purple-dark .main-header .navbar .nav > li > a {
+  color: #fff;
+}
+.skin-purple-dark .main-header .navbar .nav > li > a:hover,
+.skin-purple-dark .main-header .navbar .nav > li > a:active,
+.skin-purple-dark .main-header .navbar .nav > li > a:focus,
+.skin-purple-dark .main-header .navbar .nav .open > a,
+.skin-purple-dark .main-header .navbar .nav .open > a:hover,
+.skin-purple-dark .main-header .navbar .nav .open > a:focus,
+.skin-purple-dark .main-header .navbar .nav > .active > a {
+  background: rgba(0, 0, 0, 0.1);
+  color: #f6f6f6;
+}
+.skin-purple-dark .main-header .navbar .sidebar-toggle {
+  color: #fff;
+}
+.skin-purple-dark .main-header .navbar .sidebar-toggle:hover {
+  color: #f6f6f6;
+  background: rgba(0, 0, 0, 0.1);
+}
+.skin-purple-dark .main-header .navbar .sidebar-toggle {
+  color: #fff;
+}
+.skin-purple-dark .main-header .navbar .sidebar-toggle:hover {
+  background-color: #555299;
+}
+@media (max-width: 767px) {
+  .skin-purple-dark .main-header .navbar .dropdown-menu li.divider {
+    background-color: rgba(255, 255, 255, 0.1);
+    color: #fff;
+  }
+  .skin-purple-dark .main-header .navbar .dropdown-menu li a {
+    color: #fff;
+  }
+  .skin-purple-dark .main-header .navbar .dropdown-menu li a:hover {
+    background: #555299;
+    color: #fff;
+  }
+}
+.skin-purple-dark .main-header li.user-header {
+  background-color: #605ca8;
+}
+.skin-purple-dark .content-header {
+  background: transparent;
+}
+.skin-purple-dark .wrapper,
+.skin-purple-dark .main-sidebar,
+.skin-purple-dark .left-side {
+  background-color: #222d32;
+}
+.skin-purple-dark .user-panel > .info,
+.skin-purple-dark .user-panel > .info > a {
+  color: #fff;
+}
+.skin-purple-dark .sidebar-menu > li.header {
+  color: #4b646f;
+  background: #1a2226;
+}
+.skin-purple-dark .sidebar-menu > li > a {
+  border-left: 3px solid transparent;
+}
+.skin-purple-dark .sidebar-menu > li:hover > a,
+.skin-purple-dark .sidebar-menu > li.active > a {
+  color: #fff;
+  background: #1e282c;
+  border-left-color: #605ca8;
+}
+.skin-purple-dark .sidebar-menu > li > .treeview-menu {
+  margin: 0 1px;
+  background: #2c3b41;
+}
+.skin-purple-dark .sidebar a {
+  color: #b8c7ce;
+}
+.skin-purple-dark .sidebar a:hover {
+  text-decoration: none;
+}
+.skin-purple-dark .treeview-menu > li > a {
+  color: #8aa4af;
+}
+.skin-purple-dark .treeview-menu > li.active > a,
+.skin-purple-dark .treeview-menu > li > a:hover {
+  color: #fff;
+}
+.skin-purple-dark .sidebar-form {
+  border-radius: 3px;
+  border: 1px solid #374850;
+  margin: 10px 10px;
+}
+.skin-purple-dark .sidebar-form input[type="text"],
+.skin-purple-dark .sidebar-form .btn {
+  box-shadow: none;
+  background-color: #374850;
+  border: 1px solid transparent;
+  height: 35px;
+  transition: all 0.3s ease-in-out;
+}
+.skin-purple-dark .sidebar-form input[type="text"] {
+  color: #666;
+  border-top-left-radius: 2px;
+  border-top-right-radius: 0;
+  border-bottom-right-radius: 0;
+  border-bottom-left-radius: 2px;
+}
+.skin-purple-dark .sidebar-form input[type="text"]:focus,
+.skin-purple-dark .sidebar-form input[type="text"]:focus + .input-group-btn .btn {
+  background-color: #fff;
+  color: #666;
+}
+.skin-purple-dark .sidebar-form input[type="text"]:focus + .input-group-btn .btn {
+  border-left-color: #fff;
+}
+.skin-purple-dark .sidebar-form .btn {
+  color: #999;
+  border-top-left-radius: 0;
+  border-top-right-radius: 2px;
+  border-bottom-right-radius: 2px;
+  border-bottom-left-radius: 0;
+}
+.skin-purple-dark.layout-top-nav .main-header > .logo .logo-variant {
+  background-color: none;
+}
+.btn,
+.btn:hover {
+  color: #fff !important;
+}
+.btn.btn-primary,
+.btn:hover.btn-primary,
+.btn .btn-primary:link,
+.btn:hover .btn-primary:link {
+  background-color: #4c4988;
+  border-color: #FFF;
+  color: #fff;
+}
+.btna.btn-primary:hover,
+.btn:hovera.btn-primary:hover {
+  background-color: #3a3767;
+  border-color: #3a3767;
+  color: #fff;
+}
+.btn.btn-white:link,
+.btn:hover.btn-white:link {
+  background-color: #4c4988;
+  color: #fff;
+}
+.btn.btn-white:hover,
+.btn:hover.btn-white:hover {
+  background-color: #272546;
+  color: #fff;
+}
+/**
+The dropdown is white, so use a darker color
+ */
+li.dropdown-item-marker {
+  color: var(--button-primary);
+}
+a:hover {
+  color: var(--hover-link);
+}
+a:visited {
+  color: var(--visited-link);
+}
+.text-primary {
+  color: #fff;
+}
+#sort tr.cansort {
+  background-color: var(--back-main);
+  color: var(--text-main);
+}
+:root {
+  --background: #222;
+  --back-main: #333;
+  --back-sub: #080808;
+  --back-sub-alt: rgba(0, 0, 0, 0.36);
+  --button-default: #434078;
+  --button-primary: #302e56;
+  --button-hover: #272546;
+  --header: #605ca8;
+  /* Use same as Header picker */
+  --text-main: #BBB;
+  --text-sub: #9b9b9b;
+  --link: #AC83FF;
+  /* Use same as Header picker, lighten by 70% */
+  --visited-link: #dfd0ff;
+  /* Use same as Header picker, lighten by 70% */
+  --hover-link: #ffffff;
+  /* Use same as Header picker, lighten by 70% */
+  --nav-link: #FFF;
+  /* Use same as Header picker */
+  --light-link: #fff;
+  /* Use same as Header picker */
+}
+#ldapad_test_results.well.well-sm {
+  color: var(--back-main);
+}
+.pagination > li > a {
+  color: var(--light-link);
+  background-color: var(--back-main);
+}
+.pagination > .active > a {
+  background-color: var(--button-default);
+  border-color: var(--light-link);
+}
+.pagination > .active > a:hover {
+  background-color: var(--hover-link);
+}
+.tasks-menu > .dropdown-menu > li .menu {
+  background-color: var(--back-main);
+}
+.tasks-menu > .dropdown-menu > li .menu > li > a:hover .progress {
+  background-color: var(--background);
+}
+h2.task_menu {
+  color: var(--link);
+}
+.navbar-custom-menu > .navbar-nav > li > .dropdown-menu {
+  background-color: var(--back-main);
+  color: var(--link);
+}
+.main-header .navbar,
+.main-header .logo {
+  background-color: var(--header);
+  background: linear-gradient(to bottom, var(--header) 0%, var(--header) 100%);
+  border-color: var(--header);
+}
+.bootstrap-table .fixed-table-container .table thead th .sortable {
+  color: var(--nav-link);
+}
+.bootstrap-table .fixed-table-toolbar .columns label {
+  color: #000;
+}
+.thead,
+.navbar-nav > li > a:link {
+  color: var(--nav-link);
+}
+.label-default {
+  background-color: var(--back-sub);
+  color: #fff;
+}
+.modal-content {
+  background-color: var(--back-main);
+  color: var(--text-main);
+}
+a:link {
+  color: var(--link);
+}
+.far fa-life-ring {
+  color: var(--link);
+}
+.btn-primary.hover {
+  color: var(--nav-link);
+}
+.small-box h3,
+.small-box p {
+  color: var(--nav-link) !important;
+}
+.small-box h3 a:hover,
+.small-box p a:hover {
+  text-decoration: none;
+  color: var(--nav-link) !important;
+}
+a:link.btn-default {
+  color: var(--nav-link);
+}
+#accessoriesTable > tbody > tr > td > nobr > a > i.fa {
+  color: var(--text-main);
+}
+#assetsListingTable > tbody > tr > td > nobr > a > i.fa {
+  color: var(--text-main);
+}
+#assetsListingTable > tbody > tr.selected > td {
+  background-color: var(--back-main);
+}
+body {
+  color: var(--text-main);
+}
+.box,
+.box.box-default {
+  border-top: 3px solid var(--header);
+  border-top-color: var(--header);
+}
+.box-body,
+.box-footer,
+.box-header {
+  background-color: var(--back-sub);
+  color: var(--header);
+}
+.btn-default {
+  background-color: var(--button-default);
+  color: var(--nav-link);
+}
+.btn-default dropdown-toggle {
+  background-color: var(--button-default);
+  color: var(--nav-link);
+}
+.btn-default:active,
+.btn-default:focus,
+.btn-default:hover,
+.btn-default.active {
+  background-color: var(--button-hover);
+  color: var(--nav-link);
+}
+.btn-primary,
+.btn-primary.hover,
+.btn-primary:active,
+.text-purple {
+  color: var(--nav-link) !important;
+}
+.btn-primary:hover {
+  background-color: var(--button-primary);
+}
+#componentsTable > tbody > tr > td > nobr > a > i.fa {
+  color: var(--text-main);
+}
+#consumablesTable > tbody > tr > td > nobr > a > i.fa {
+  color: var(--text-main);
+}
+.content-wrapper {
+  background-color: var(--background);
+}
+#create-form > div > div > div > span > i.fa {
+  background-color: var(--back-sub);
+  color: var(--header);
+}
+.datepicker .datepicker-switch:hover,
+.datepicker .next:hover,
+.datepicker .prev:hover,
+.datepicker tfoot tr th:hover,
+.datepicker table tr td.day.focused,
+.datepicker table tr td.day:hover {
+  background-color: var(--header);
+}
+.datepicker.dropdown-menu {
+  background-color: var(--back-main);
+  color: var(--text-main);
+}
+#details > div > div > div > table {
+  background-color: transparent;
+}
+.dropdown-menu > li > a:hover {
+  background-color: var(--back-main);
+  color: var(--nav-link);
+}
+.fixed-table-body thead th .th-inner {
+  color: var(--nav-link);
+}
+.form-control {
+  background-color: var(--back-main);
+  color: var(--text-main);
+}
+.form-control[disabled],
+.form-control[readonly],
+fieldset[disabled] .form-control {
+  background-color: var(--back-main);
+  color: var(--text-main);
+}
+h1,
+h2,
+h3,
+h4,
+h5,
+h6,
+p {
+  color: var(--text-main);
+}
+.help-block {
+  color: var(--text-sub);
+}
+input[type=text],
+input[type=search] {
+  background-color: var(--back-sub);
+  color: var(--text-main);
+}
+#licensesTable > tbody > tr > td > nobr > a > i.fa {
+  color: var(--text-main);
+}
+.main-footer {
+  background-color: var(--back-main);
+  color: var(--text-main);
+}
+.nav-tabs-custom > .nav-tabs > li > a,
+.nav-tabs-custom > .nav-tabs > li.active > a {
+  color: var(--text-main);
+}
+.nav-tabs-custom > .nav-tabs > li.active {
+  border-top-color: var(--header);
+}
+.nav-tabs-custom > .nav-tabs > li.active > a {
+  background-color: var(--back-main);
+}
+.nav-tabs-custom > .nav-tabs > li.active > a:hover {
+  background-color: var(--back-sub);
+  color: var(--text-main);
+}
+.nav-tabs-custom,
+.nav-tabs-custom > .tab-content {
+  background-color: var(--back-main);
+}
+.navbar-nav > .tasks-menu > .dropdown-menu > li.header {
+  background-color: var(--back-main);
+  color: var(--link);
+}
+.open > .dropdown-toggle.btn-default {
+  background-color: var(--back-sub);
+  color: var(--header);
+}
+.panel {
+  background-color: var(--back-sub);
+  color: var(--text-main);
+}
+.panel-default > .panel-heading {
+  background-color: var(--back-main);
+  color: var(--header);
+}
+.select2-container--default .select2-results__option[aria-selected=true],
+.select2-container--default .select2-results__option[aria-selected=true]:hover {
+  background-color: var(--back-sub);
+  color: var(--header);
+}
+.select2-container--default .select2-results__option--highlighted[aria-selected] {
+  background-color: var(--header);
+  color: var(--back-main);
+}
+.select2-container--default .select2-selection--single .select2-selection__rendered {
+  color: var(--text-main);
+}
+.select2-container--default .select2-selection--multiple .select2-selection__choice {
+  background-color: var(--header);
+}
+.select2-selection--single {
+  background-color: var(--back-sub) !important;
+  color: var(--text-main) !important;
+}
+.select2-dropdown {
+  background-color: var(--back-main);
+  color: var(--text-main);
+}
+.skin-purple-dark .main-header .navbar .dropdown-menu li a {
+  color: #FFFFFF;
+}
+.skin-purple-dark .main-header .navbar .dropdown-menu li a:hover {
+  background-color: #5f5ca8;
+}
+.fixed-table-body thead th .th-inner,
+.skin-purple-dark .sidebar-menu > li.active > a,
+.skin-purple .sidebar-menu > li:hover > a,
+.sidebar-toggle:hover {
+  background-color: var(--header) !important;
+}
+.tab-content,
+.tab-pane {
+  background-color: var(--back-main);
+  color: var(--text-main);
+}
+.table-striped > tbody > tr:nth-of-type(odd) {
+  background-color: var(--back-sub);
+}
+.table-striped > tbody > tr:nth-of-type(even) {
+  background-color: var(--back-sub-alt);
+}
+#webui > div > div > div > div > div > table > tbody > tr > td > a > i.fa,
+.box-body,
+.box-footer,
+.box-header {
+  color: var(--text-main);
+}
+.box-header.with-border {
+  border-bottom: #000;
+}
+a {
+  color: var(--link);
+}
+a:link {
+  color: var(--link);
+}
+a:hover {
+  color: var(--hover-link);
+  text-decoration: underline;
+}
+a:visited {
+  color: var(--visited-link);
+}
+.row-striped {
+  vertical-align: top;
+  line-height: 2.6;
+  padding: 0px;
+  margin-left: 20px;
+  box-sizing: border-box;
+  display: table;
+}
+#customFieldsTable a[href*='/models'] {
+  background-color: var(--back-sub-alt);
+  color: var(--link);
+}
+#customFieldsTable a[href*='/models']:hover {
+  background-color: var(--text-sub);
+  color: var(--button-hover);
+}
+#customFieldsTable a[href*='/models']:visited {
+  background-color: var(--back-sub);
+  color: var(--visited-link);
+}
+.row-striped .row:nth-of-type(odd) div {
+  background-color: var(--back-sub);
+  color: var(--text-main);
+  border-top: 1px solid #dddddd;
+  display: table-cell;
+}
+.row-striped .row:nth-of-type(even) div {
+  background-color: var(--back-sub);
+  color: var(--text-main);
+  border-top: 1px solid #dddddd;
+  display: table-cell;
+}
+.row-new-striped > .row:nth-of-type(odd) {
+  background-color: var(--back-sub);
+  color: var(--text-main);
+}
+.row-new-striped > .row:nth-of-type(even) {
+  background-color: var(--back-sub-alt);
+  color: var(--text-main);
+}
+.search-highlight,
+.search-highlight:hover {
+  background-color: #e9d15b;
+}
+.table > tbody > tr.warning > td {
+  background-color: var(--back-sub);
+}
+/*
+ * Skin: Red
+ * ----------
+ */
+.skin-red .main-header .navbar {
+  background-color: #dd4b39;
+}
+.skin-red .main-header .navbar .nav > li > a {
+  color: #fff;
+}
+.skin-red .main-header .navbar .nav > li > a:hover,
+.skin-red .main-header .navbar .nav > li > a:active,
+.skin-red .main-header .navbar .nav > li > a:focus,
+.skin-red .main-header .navbar .nav .open > a,
+.skin-red .main-header .navbar .nav .open > a:hover,
+.skin-red .main-header .navbar .nav .open > a:focus,
+.skin-red .main-header .navbar .nav > .active > a {
+  background: rgba(0, 0, 0, 0.1);
+  color: #f6f6f6;
+}
+.skin-red .main-header .navbar .sidebar-toggle {
+  color: #fff;
+}
+.skin-red .main-header .navbar .sidebar-toggle:hover {
+  color: #f6f6f6;
+  background: rgba(0, 0, 0, 0.1);
+}
+.skin-red .main-header .navbar .sidebar-toggle {
+  color: #fff;
+}
+.skin-red .main-header .navbar .sidebar-toggle:hover {
+  background-color: #d73925;
+}
+@media (max-width: 767px) {
+  .skin-red .main-header .navbar .dropdown-menu li.divider {
+    background-color: rgba(255, 255, 255, 0.1);
+  }
+  .skin-red .main-header .navbar .dropdown-menu li a {
+    color: #333;
+  }
+  .skin-red .main-header .navbar .dropdown-menu li a:hover {
+    background: #d73925;
+  }
+}
+.skin-red .main-header li.user-header {
+  background-color: #dd4b39;
+}
+.skin-red .content-header {
+  background: transparent;
+}
+.skin-red .wrapper,
+.skin-red .main-sidebar,
+.skin-red .left-side {
+  background-color: #222d32;
+}
+.skin-red .user-panel > .info,
+.skin-red .user-panel > .info > a {
+  color: #fff;
+}
+.skin-red .sidebar-menu > li.header {
+  color: #4b646f;
+  background: #1a2226;
+}
+.skin-red .sidebar-menu > li > a {
+  border-left: 3px solid transparent;
+}
+.skin-red .sidebar-menu > li:hover > a,
+.skin-red .sidebar-menu > li.active > a {
+  color: #fff;
+  background: #1e282c;
+  border-left-color: #dd4b39;
+}
+.skin-red .sidebar-menu > li > .treeview-menu {
+  margin: 0 1px;
+  background: #2c3b41;
+}
+.skin-red .sidebar a {
+  color: #b8c7ce;
+}
+.skin-red .sidebar a:hover {
+  text-decoration: none;
+}
+.skin-red .treeview-menu > li > a {
+  color: #8aa4af;
+}
+.skin-red .treeview-menu > li.active > a,
+.skin-red .treeview-menu > li > a:hover {
+  color: #fff;
+}
+.skin-red .sidebar-form {
+  border-radius: 3px;
+  border: 1px solid #374850;
+  margin: 10px 10px;
+}
+.skin-red .sidebar-form input[type="text"],
+.skin-red .sidebar-form .btn {
+  box-shadow: none;
+  background-color: #374850;
+  border: 1px solid transparent;
+  height: 35px;
+  transition: all 0.3s ease-in-out;
+}
+.skin-red .sidebar-form input[type="text"] {
+  color: #666;
+  border-top-left-radius: 2px;
+  border-top-right-radius: 0;
+  border-bottom-right-radius: 0;
+  border-bottom-left-radius: 2px;
+}
+.skin-red .sidebar-form input[type="text"]:focus,
+.skin-red .sidebar-form input[type="text"]:focus + .input-group-btn .btn {
+  background-color: #fff;
+  color: #666;
+}
+.skin-red .sidebar-form input[type="text"]:focus + .input-group-btn .btn {
+  border-left-color: #fff;
+}
+.skin-red .sidebar-form .btn {
+  color: #999;
+  border-top-left-radius: 0;
+  border-top-right-radius: 2px;
+  border-bottom-right-radius: 2px;
+  border-bottom-left-radius: 0;
+}
+.skin-red.layout-top-nav .main-header > .logo .logo-variant {
+  background-color: none;
+}
+.btn.btn-primary,
+.btn:hover.btn-primary,
+.btn .btn-primary:link,
+.btn:hover .btn-primary:link {
+  background-color: #c23321;
+  border-color: #96271a;
+  color: #fff;
+}
+.btna.btn-primary:hover,
+.btn:hovera.btn-primary:hover {
+  background-color: #96271a;
+  border-color: #96271a;
+  color: #fff;
+}
+.btn.btn-white:link,
+.btn:hover.btn-white:link {
+  background-color: #c23321;
+  color: #fff;
+}
+.btn.btn-white:hover,
+.btn:hover.btn-white:hover {
+  background-color: #6b1c12;
+  color: #fff;
+}
+a {
+  color: #dd4b39;
+}
+a:hover {
+  color: #96271a;
+}
+a:visited {
+  color: #dd4b39;
+}
+.text-primary {
+  color: #96271a;
+}
+:root {
+  --button-default: #ac2d1e;
+  --button-primary: #802216;
+  --button-hover: #6b1c12;
+  --header: #dd4b39;
+  /* Use same as Header picker */
+  --text-main: #BBB;
+  --text-alt: #222;
+  --text-sub: #9b9b9b;
+  --link: #dd4b39;
+  /* Use same as Header picker, lighten by 70% */
+  --visited-link: #e8867a;
+  /* Use same as Header picker, lighten by 70% */
+  --hover-link: #f3c2bc;
+  /* Use same as Header picker, lighten by 70% */
+  --nav-link: #FFF;
+  /* Use same as Header picker */
+  --light-link: #fff;
+  /* Use same as Header picker */
+}
+a:link {
+  color: var(--link);
+}
+a:visited {
+  color: var(--visited-link);
+}
+a.btn-info:link,
+a.btn-warning:link,
+a.btn-danger:link {
+  color: #FFF;
+}
+a.btn-info:visited,
+a.btn-warning:visited,
+a.btn-danger:visited {
+  color: #FFF;
+}
+.fixed-table-container tbody .selected td {
+  background-color: #fff8af;
+}
+.select2-container--default .select2-selection--multiple .select2-selection__choice {
+  background-color: #dd4b39;
+}
+.search-highlight,
+.search-highlight:hover {
+  background-color: #e9d15b;
+}
+.far fa-life-ring {
+  color: var(--link);
+}
+/*
+ * Skin: red dark
+ * ----------
+ */
+.skin-red-dark .main-header .navbar {
+  background-color: #dd4b39;
+}
+.skin-red-dark .main-header .navbar .nav > li > a {
+  color: #fff;
+}
+.skin-red-dark .main-header .navbar .nav > li > a:hover,
+.skin-red-dark .main-header .navbar .nav > li > a:active,
+.skin-red-dark .main-header .navbar .nav > li > a:focus,
+.skin-red-dark .main-header .navbar .nav .open > a,
+.skin-red-dark .main-header .navbar .nav .open > a:hover,
+.skin-red-dark .main-header .navbar .nav .open > a:focus,
+.skin-red-dark .main-header .navbar .nav > .active > a {
+  background: rgba(0, 0, 0, 0.1);
+  color: #f6f6f6;
+}
+.skin-red-dark .main-header .navbar .sidebar-toggle {
+  color: #fff;
+}
+.skin-red-dark .main-header .navbar .sidebar-toggle:hover {
+  color: #f6f6f6;
+  background: rgba(0, 0, 0, 0.1);
+}
+.skin-red-dark .main-header .navbar .sidebar-toggle {
+  color: #fff;
+}
+.skin-red-dark .main-header .navbar .sidebar-toggle:hover {
+  background-color: #d73925;
+}
+@media (max-width: 767px) {
+  .skin-red-dark .main-header .navbar .dropdown-menu li.divider {
+    background-color: rgba(255, 255, 255, 0.1);
+    color: #fff;
+  }
+  .skin-red-dark .main-header .navbar .dropdown-menu li a {
+    color: #fff;
+  }
+  .skin-red-dark .main-header .navbar .dropdown-menu li a:hover {
+    background: #d73925;
+    color: #fff;
+  }
+}
+.skin-red-dark .main-header li.user-header {
+  background-color: #dd4b39;
+}
+.skin-red-dark .content-header {
+  background: transparent;
+}
+.skin-red-dark .wrapper,
+.skin-red-dark .main-sidebar,
+.skin-red-dark .left-side {
+  background-color: #222d32;
+}
+.skin-red-dark .user-panel > .info,
+.skin-red-dark .user-panel > .info > a {
+  color: #fff;
+}
+.skin-red-dark .sidebar-menu > li.header {
+  color: #4b646f;
+  background: #1a2226;
+}
+.skin-red-dark .sidebar-menu > li > a {
+  border-left: 3px solid transparent;
+}
+.skin-red-dark .sidebar-menu > li:hover > a,
+.skin-red-dark .sidebar-menu > li.active > a {
+  color: #fff;
+  background: #1e282c;
+  border-left-color: #dd4b39;
+}
+.skin-red-dark .sidebar-menu > li > .treeview-menu {
+  margin: 0 1px;
+  background: #2c3b41;
+}
+.skin-red-dark .sidebar a {
+  color: #b8c7ce;
+}
+.skin-red-dark .sidebar a:hover {
+  text-decoration: none;
+}
+.skin-red-dark .treeview-menu > li > a {
+  color: #8aa4af;
+}
+.skin-red-dark .treeview-menu > li.active > a,
+.skin-red-dark .treeview-menu > li > a:hover {
+  color: #fff;
+}
+.skin-red-dark .sidebar-form {
+  border-radius: 3px;
+  border: 1px solid #374850;
+  margin: 10px 10px;
+}
+.skin-red-dark .sidebar-form input[type="text"],
+.skin-red-dark .sidebar-form .btn {
+  box-shadow: none;
+  background-color: #374850;
+  border: 1px solid transparent;
+  height: 35px;
+  transition: all 0.3s ease-in-out;
+}
+.skin-red-dark .sidebar-form input[type="text"] {
+  color: #666;
+  border-top-left-radius: 2px;
+  border-top-right-radius: 0;
+  border-bottom-right-radius: 0;
+  border-bottom-left-radius: 2px;
+}
+.skin-red-dark .sidebar-form input[type="text"]:focus,
+.skin-red-dark .sidebar-form input[type="text"]:focus + .input-group-btn .btn {
+  background-color: #fff;
+  color: #666;
+}
+.skin-red-dark .sidebar-form input[type="text"]:focus + .input-group-btn .btn {
+  border-left-color: #fff;
+}
+.skin-red-dark .sidebar-form .btn {
+  color: #999;
+  border-top-left-radius: 0;
+  border-top-right-radius: 2px;
+  border-bottom-right-radius: 2px;
+  border-bottom-left-radius: 0;
+}
+.skin-red-dark.layout-top-nav .main-header > .logo .logo-variant {
+  background-color: none;
+}
+.btn,
+.btn:hover {
+  color: #fff;
+}
+.btn.btn-primary,
+.btn:hover.btn-primary,
+.btn .btn-primary:link,
+.btn:hover .btn-primary:link {
+  background-color: #c23321;
+  border-color: #FFF;
+  color: #fff;
+}
+.btna.btn-primary:hover,
+.btn:hovera.btn-primary:hover {
+  background-color: #96271a;
+  border-color: #96271a;
+  color: #fff;
+}
+.btn.btn-white:link,
+.btn:hover.btn-white:link {
+  background-color: #c23321;
+  color: #fff;
+}
+.btn.btn-white:hover,
+.btn:hover.btn-white:hover {
+  background-color: #6b1c12;
+  color: #fff;
+}
+/**
+The dropdown is white, so use a darker color
+ */
+li.dropdown-item-marker {
+  color: var(--button-primary);
+}
+a:hover {
+  color: #fff;
+}
+a:visited {
+  color: #fff;
+}
+.text-primary {
+  color: #fff;
+}
+#sort tr.cansort {
+  background-color: var(--back-main);
+  color: var(--text-main);
+}
+:root {
+  --background: #222;
+  --back-main: #333;
+  --back-sub: #3d4144;
+  --back-sub-alt: rgba(0, 0, 0, 0.36);
+  --button-default: #ac2d1e;
+  --button-primary: #802216;
+  --button-hover: #6b1c12;
+  --header: #dd4b39;
+  /* Use same as Header picker */
+  --text-main: #BBB;
+  --text-alt: #222;
+  --text-sub: #9b9b9b;
+  --link: #e00000;
+  /* Use same as Header picker, lighten by 70% */
+  --visited-link: #D24D57;
+  /* Use same as Header picker, lighten by 70% */
+  --hover-link: #D24D57;
+  /* Use same as Header picker, lighten by 70% */
+  --nav-link: #FFF;
+  /* Use same as Header picker */
+  --light-link: #fff;
+  /* Use same as Header picker */
+}
+#ldapad_test_results.well.well-sm {
+  color: var(--back-main);
+}
+.pagination > li > a {
+  color: var(--light-link);
+  background-color: var(--back-main);
+}
+.pagination > .active > a {
+  background-color: var(--visited-link);
+  border-color: var(--light-link);
+}
+.pagination > .active > a:hover {
+  background-color: var(--hover-link);
+}
+.tasks-menu > .dropdown-menu > li .menu {
+  background-color: var(--back-main);
+}
+.tasks-menu > .dropdown-menu > li .menu > li > a:hover .progress {
+  background-color: var(--background);
+}
+h2.task_menu {
+  color: var(--link);
+}
+.navbar-custom-menu > .navbar-nav > li > .dropdown-menu {
+  background-color: var(--back-main);
+  color: var(--link);
+}
+.main-header .navbar,
+.main-header .logo {
+  background-color: var(--header);
+  background: linear-gradient(to bottom, var(--header) 0%, var(--header) 100%);
+  border-color: var(--header);
+}
+.bootstrap-table .fixed-table-container .table thead th .sortable {
+  color: var(--nav-link);
+}
+.bootstrap-table .fixed-table-toolbar .columns label {
+  color: #000;
+}
+.thead,
+.navbar-nav > li > a:link {
+  color: var(--nav-link);
+}
+.modal-content {
+  background-color: var(--back-main);
+  color: var(--text-main);
+}
+a:link {
+  color: var(--link);
+}
+a:hover {
+  color: var(--hover-link);
+}
+a:visited {
+  color: var(--nav-link);
+}
+.far fa-life-ring {
+  color: var(--link);
+}
+.btn-primary.hover {
+  color: var(--nav-link);
+}
+.small-box h3,
+.small-box p {
+  color: var(--nav-link) !important;
+}
+.small-box h3 a:hover,
+.small-box p a:hover {
+  text-decoration: none;
+  color: var(--nav-link) !important;
+}
+#accessoriesTable > tbody > tr > td > nobr > a > i.fa {
+  color: var(--text-main);
+}
+#assetsListingTable > tbody > tr > td > nobr > a > i.fa {
+  color: var(--text-main);
+}
+#assetsListingTable > tbody > tr.selected > td {
+  background-color: var(--back-main);
+}
+body {
+  color: var(--text-main);
+}
+.box,
+.box.box-default {
+  border-top: 3px solid var(--header);
+  border-top-color: var(--header);
+}
+.box-body,
+.box-footer,
+.box-header {
+  background-color: var(--back-sub);
+  color: var(--header);
+}
+.btn-default {
+  background-color: var(--back-sub);
+}
+.btn-default dropdown-toggle {
+  background-color: var(--button-default);
+  color: var(--link);
+}
+.btn-default:active,
+.btn-default:focus,
+.btn-default:hover,
+.btn-default.active {
+  background-color: var(--button-hover);
+  color: var(--link);
+}
+.btn-primary,
+.btn-primary.hover,
+.btn-primary:active,
+.text-red {
+  color: var(--button-primary);
+}
+.btn-primary:hover {
+  background-color: var(--button-primary);
+}
+#componentsTable > tbody > tr > td > nobr > a > i.fa {
+  color: var(--text-main);
+}
+#consumablesTable > tbody > tr > td > nobr > a > i.fa {
+  color: var(--text-main);
+}
+.content-wrapper {
+  background-color: var(--background);
+}
+#create-form > div > div > div > span > i.fa {
+  background-color: var(--back-sub);
+  color: var(--header);
+}
+.datepicker .datepicker-switch:hover,
+.datepicker .next:hover,
+.datepicker .prev:hover,
+.datepicker tfoot tr th:hover,
+.datepicker table tr td.day.focused,
+.datepicker table tr td.day:hover {
+  background-color: var(--header);
+}
+.datepicker.dropdown-menu {
+  background-color: var(--back-main);
+  color: var(--text-main);
+}
+#details > div > div > div > table {
+  background-color: transparent;
+}
+.dropdown-menu > li > a:hover {
+  background-color: var(--back-main);
+  color: var(--nav-link);
+}
+.fixed-table-body thead th .th-inner {
+  color: var(--nav-link);
+}
+.form-control {
+  background-color: var(--back-main);
+  color: var(--text-main);
+}
+.form-control[disabled],
+.form-control[readonly],
+fieldset[disabled] .form-control {
+  background-color: var(--back-main);
+  color: var(--text-main);
+}
+h1,
+h2,
+h3,
+h4,
+h5,
+h6,
+p {
+  color: var(--text-main);
+}
+.help-block {
+  color: var(--text-sub);
+}
+input[type=text],
+input[type=search] {
+  background-color: var(--back-sub);
+  color: var(--text-main);
+}
+#licensesTable > tbody > tr > td > nobr > a > i.fa {
+  color: var(--text-main);
+}
+.main-footer {
+  background-color: var(--back-main);
+  color: var(--text-main);
+}
+.nav-tabs-custom > .nav-tabs > li > a,
+.nav-tabs-custom > .nav-tabs > li.active > a {
+  color: var(--text-main);
+}
+.nav-tabs-custom > .nav-tabs > li.active {
+  border-top-color: var(--header);
+}
+.nav-tabs-custom > .nav-tabs > li.active > a {
+  background-color: var(--back-main);
+}
+.nav-tabs-custom > .nav-tabs > li.active > a:hover {
+  background-color: var(--back-sub);
+  color: var(--text-main);
+}
+.nav-tabs-custom,
+.nav-tabs-custom > .tab-content {
+  background-color: var(--back-main);
+}
+.navbar-nav > .tasks-menu > .dropdown-menu > li.header {
+  background-color: var(--back-main);
+  color: var(--header);
+}
+.open > .dropdown-toggle.btn-default {
+  background-color: var(--back-sub);
+  color: var(--header);
+}
+.panel {
+  background-color: var(--back-sub);
+  color: var(--text-main);
+}
+.panel-default > .panel-heading {
+  background-color: var(--back-main);
+  color: var(--header);
+}
+.select2-container--default .select2-results__option[aria-selected=true],
+.select2-container--default .select2-results__option[aria-selected=true]:hover {
+  background-color: var(--back-sub);
+  color: var(--header);
+}
+.select2-container--default .select2-results__option--highlighted[aria-selected] {
+  background-color: var(--header);
+  color: var(--back-main);
+}
+.select2-container--default .select2-selection--single .select2-selection__rendered {
+  color: var(--text-main);
+}
+.select2-container--default .select2-selection--multiple .select2-selection__choice {
+  background-color: var(--header);
+}
+.select2-selection--single {
+  background-color: var(--back-sub) !important;
+  color: var(--text-main) !important;
+}
+.select2-dropdown {
+  background-color: var(--back-main);
+  color: var(--text-main);
+}
+.skin-red-dark .main-header .navbar .dropdown-menu li a {
+  color: #FFFFFF;
+}
+.skin-red-dark .main-header .navbar .dropdown-menu li a:hover {
+  background-color: #c23320;
+}
+.fixed-table-body thead th .th-inner,
+.skin-red-dark .sidebar-menu > li.active > a,
+.skin-red .sidebar-menu > li:hover > a,
+.sidebar-toggle:hover {
+  background-color: var(--header) !important;
+}
+.tab-content,
+.tab-pane {
+  background-color: var(--back-main);
+  color: var(--text-main);
+}
+.table-striped > tbody > tr:nth-of-type(odd) {
+  background-color: var(--back-sub);
+}
+.table-striped > tbody > tr:nth-of-type(even) {
+  background-color: var(--back-sub-alt);
+}
+#webui > div > div > div > div > div > table > tbody > tr > td > a > i.fa,
+.box-body,
+.box-footer,
+.box-header {
+  color: var(--text-main);
+}
+.box-header.with-border {
+  border-bottom: #000;
+}
+#upload-table tbody > tr.warning > td,
+#upload-table h3,
+#upload-table p {
+  background-color: #fcf8e3;
+  color: #000;
+}
+a {
+  color: var(--link);
+}
+a:link {
+  color: var(--nav-link);
+}
+a:hover {
+  color: var(--nav-link);
+  text-decoration: underline;
+}
+a:visited {
+  color: var(--nav-link);
+}
+#customFieldsTable a[href*='/models'] {
+  background-color: var(--back-sub-alt);
+  color: var(--link);
+}
+#customFieldsTable a[href*='/models']:hover {
+  background-color: var(--text-sub);
+  color: var(--button-hover);
+}
+#customFieldsTable a[href*='/models']:visited {
+  background-color: var(--back-sub);
+  color: var(--visited-link);
+}
+#customFieldsTable a[href*='/fieldsets'] {
+  background-color: transparent;
+}
+.row-striped {
+  vertical-align: top;
+  line-height: 2.6;
+  padding: 0px;
+  margin-left: 20px;
+  box-sizing: border-box;
+  display: table;
+}
+.row-striped .row:nth-of-type(odd) div {
+  background-color: var(--back-sub);
+  color: var(--text-main);
+  border-top: 1px solid #dddddd;
+  display: table-cell;
+}
+.row-striped .row:nth-of-type(even) div {
+  background-color: var(--back-sub);
+  color: var(--text-main);
+  border-top: 1px solid #dddddd;
+  display: table-cell;
+}
+.row-new-striped > .row:nth-of-type(odd) {
+  background-color: var(--back-sub);
+  color: var(--text-main);
+}
+.row-new-striped > .row:nth-of-type(even) {
+  background-color: var(--back-sub-alt);
+  color: var(--text-main);
+}
+.search-highlight,
+.search-highlight:hover {
+  background-color: #e9d15b;
+}
+.table > tbody > tr.warning > td {
+  background-color: var(--back-sub);
+}
+/*
+ * Skin: Orange
+ * ----------
+ */
+.skin-orange .main-header .navbar {
+  background-color: #FF8C00;
+}
+.skin-orange .main-header .navbar .nav > li > a {
+  color: #fff;
+}
+.skin-orange .main-header .navbar .nav > li > a:hover,
+.skin-orange .main-header .navbar .nav > li > a:active,
+.skin-orange .main-header .navbar .nav > li > a:focus,
+.skin-orange .main-header .navbar .nav .open > a,
+.skin-orange .main-header .navbar .nav .open > a:hover,
+.skin-orange .main-header .navbar .nav .open > a:focus,
+.skin-orange .main-header .navbar .nav > .active > a {
+  background: rgba(0, 0, 0, 0.1);
+  color: #f6f6f6;
+}
+.skin-orange .main-header .navbar .sidebar-toggle {
+  color: #fff;
+}
+.skin-orange .main-header .navbar .sidebar-toggle:hover {
+  color: #f6f6f6;
+  background: rgba(0, 0, 0, 0.1);
+}
+.skin-orange .main-header .navbar .sidebar-toggle {
+  color: #fff;
+}
+.skin-orange .main-header .navbar .sidebar-toggle:hover {
+  background-color: #e67e00;
+}
+@media (max-width: 767px) {
+  .skin-orange .main-header .navbar .dropdown-menu li.divider {
+    background-color: rgba(255, 255, 255, 0.1);
+  }
+  .skin-orange .main-header .navbar .dropdown-menu li a {
+    color: #333;
+  }
+  .skin-orange .main-header .navbar .dropdown-menu li a:hover {
+    background: #e67e00;
+  }
+}
+.skin-orange .main-header li.user-header {
+  background-color: #FF8C00;
+}
+.skin-orange .content-header {
+  background: transparent;
+}
+.skin-orange .wrapper,
+.skin-orange .main-sidebar,
+.skin-orange .left-side {
+  background-color: #222d32;
+}
+.skin-orange .user-panel > .info,
+.skin-orange .user-panel > .info > a {
+  color: #fff;
+}
+.skin-orange .sidebar-menu > li.header {
+  color: #4b646f;
+  background: #1a2226;
+}
+.skin-orange .sidebar-menu > li > a {
+  border-left: 3px solid transparent;
+}
+.skin-orange .sidebar-menu > li:hover > a,
+.skin-orange .sidebar-menu > li.active > a {
+  color: #fff;
+  background: #1e282c;
+  border-left-color: #FF8C00;
+}
+.skin-orange .sidebar-menu > li > .treeview-menu {
+  margin: 0 1px;
+  background: #2c3b41;
+}
+.skin-orange .sidebar a {
+  color: #b8c7ce;
+}
+.skin-orange .sidebar a:hover {
+  text-decoration: none;
+}
+.skin-orange .treeview-menu > li > a {
+  color: #8aa4af;
+}
+.skin-orange .treeview-menu > li.active > a,
+.skin-orange .treeview-menu > li > a:hover {
+  color: #fff;
+}
+.skin-orange .sidebar-form {
+  border-radius: 3px;
+  border: 1px solid #374850;
+  margin: 10px 10px;
+}
+.skin-orange .sidebar-form input[type="text"],
+.skin-orange .sidebar-form .btn {
+  box-shadow: none;
+  background-color: #374850;
+  border: 1px solid transparent;
+  height: 35px;
+  transition: all 0.3s ease-in-out;
+}
+.skin-orange .sidebar-form input[type="text"] {
+  color: #666;
+  border-top-left-radius: 2px;
+  border-top-right-radius: 0;
+  border-bottom-right-radius: 0;
+  border-bottom-left-radius: 2px;
+}
+.skin-orange .sidebar-form input[type="text"]:focus,
+.skin-orange .sidebar-form input[type="text"]:focus + .input-group-btn .btn {
+  background-color: #fff;
+  color: #666;
+}
+.skin-orange .sidebar-form input[type="text"]:focus + .input-group-btn .btn {
+  border-left-color: #fff;
+}
+.skin-orange .sidebar-form .btn {
+  color: #999;
+  border-top-left-radius: 0;
+  border-top-right-radius: 2px;
+  border-bottom-right-radius: 2px;
+  border-bottom-left-radius: 0;
+}
+.skin-orange.layout-top-nav .main-header > .logo .logo-variant {
+  background-color: none;
+}
+.btn.btn-primary,
+.btn:hover.btn-primary,
+.btn .btn-primary:link,
+.btn:hover .btn-primary:link {
+  background-color: #cc7000;
+  border-color: #995400;
+  color: #fff;
+}
+.btna.btn-primary:hover,
+.btn:hovera.btn-primary:hover {
+  background-color: #995400;
+  border-color: #995400;
+  color: #fff;
+}
+.btn.btn-white:link,
+.btn:hover.btn-white:link {
+  background-color: #cc7000;
+  color: #fff;
+}
+.btn.btn-white:hover,
+.btn:hover.btn-white:hover {
+  background-color: #663800;
+  color: #fff;
+}
+a {
+  color: var(--link);
+}
+a:hover {
+  color: var(--hover-link);
+}
+a:visited {
+  color: var(--visited-link);
+}
+.text-primary {
+  color: #995400;
+}
+:root {
+  --button-default: #b36200;
+  --button-primary: #804600;
+  --button-hover: #663800;
+  --header: #FF8C00;
+  /* Use same as Header picker */
+  --text-main: #BBB;
+  --text-sub: #9b9b9b;
+  --link: #FF8C00;
+  /* Use same as Header picker, lighten by 70% */
+  --visited-link: #ffa333;
+  /* Use same as Header picker, lighten by 70% */
+  --hover-link: #ffaf4d;
+  /* Use same as Header picker, lighten by 70% */
+  --nav-link: #FFF;
+  /* Use same as Header picker */
+  --light-link: #fff;
+  /* Use same as Header picker */
+}
+a.btn-info:link,
+a.btn-warning:link,
+a.btn-danger:link {
+  color: #FFF;
+}
+a.btn-info:visited,
+a.btn-warning:visited,
+a.btn-danger:visited {
+  color: #FFF;
+}
+.far fa-life-ring {
+  color: var(--link);
+}
+.fixed-table-container tbody .selected td {
+  background-color: #fff8af;
+}
+.select2-container--default .select2-selection--multiple .select2-selection__choice {
+  background-color: #FF8C00;
+}
+.search-highlight,
+.search-highlight:hover {
+  background-color: #e9d15b;
+}
+/*
+ * Skin: Yellow
+ * ----------
+ */
+.skin-yellow .main-header .navbar {
+  background-color: #FBCC34;
+}
+.skin-yellow .main-header .navbar .nav > li > a {
+  color: rgba(255, 255, 255, 0.8);
+}
+.skin-yellow .main-header .navbar .nav > li > a:hover,
+.skin-yellow .main-header .navbar .nav > li > a:active,
+.skin-yellow .main-header .navbar .nav > li > a:focus,
+.skin-yellow .main-header .navbar .nav .open > a,
+.skin-yellow .main-header .navbar .nav .open > a:hover,
+.skin-yellow .main-header .navbar .nav .open > a:focus,
+.skin-yellow .main-header .navbar .nav > .active > a {
+  background: rgba(0, 0, 0, 0.1);
+  color: #f6f6f6;
+}
+.skin-yellow .main-header .navbar .sidebar-toggle {
+  color: rgba(255, 255, 255, 0.8);
+}
+.skin-yellow .main-header .navbar .sidebar-toggle:hover {
+  color: #f6f6f6;
+  background: rgba(0, 0, 0, 0.1);
+}
+.skin-yellow .main-header .navbar .sidebar-toggle {
+  color: #000;
+}
+.skin-yellow .main-header .navbar .sidebar-toggle:hover {
+  background-color: #fbc61b;
+}
+@media (max-width: 767px) {
+  .skin-yellow .main-header .navbar .dropdown-menu li.divider {
+    background-color: rgba(255, 255, 255, 0.1);
+  }
+  .skin-yellow .main-header .navbar .dropdown-menu li a {
+    color: #333;
+  }
+  .skin-yellow .main-header .navbar .dropdown-menu li a:hover {
+    background: #fbc61b;
+  }
+}
+.skin-yellow .main-header li.user-header {
+  background-color: #FBCC34;
+}
+.skin-yellow .content-header {
+  background: transparent;
+}
+.skin-yellow .wrapper,
+.skin-yellow .main-sidebar,
+.skin-yellow .left-side {
+  background-color: #222d32;
+}
+.skin-yellow .user-panel > .info,
+.skin-yellow .user-panel > .info > a {
+  color: #fff;
+}
+.skin-yellow .sidebar-menu > li.header {
+  color: #4b646f;
+  background: #1a2226;
+}
+.skin-yellow .sidebar-menu > li > a {
+  border-left: 3px solid transparent;
+}
+.skin-yellow .sidebar-menu > li:hover > a,
+.skin-yellow .sidebar-menu > li.active > a {
+  color: #fff;
+  background: #1e282c;
+  border-left-color: #FBCC34;
+}
+.skin-yellow .sidebar-menu > li > .treeview-menu {
+  margin: 0 1px;
+  background: #2c3b41;
+}
+.skin-yellow .sidebar a {
+  color: #b8c7ce;
+}
+.skin-yellow .sidebar a:hover {
+  text-decoration: none;
+}
+.skin-yellow .treeview-menu > li > a {
+  color: #8aa4af;
+}
+.skin-yellow .treeview-menu > li.active > a,
+.skin-yellow .treeview-menu > li > a:hover {
+  color: #fff;
+}
+.skin-yellow .sidebar-form {
+  border-radius: 3px;
+  border: 1px solid #374850;
+  margin: 10px 10px;
+}
+.skin-yellow .sidebar-form input[type="text"],
+.skin-yellow .sidebar-form .btn {
+  box-shadow: none;
+  background-color: #374850;
+  border: 1px solid transparent;
+  height: 35px;
+  transition: all 0.3s ease-in-out;
+}
+.skin-yellow .sidebar-form input[type="text"] {
+  color: #666;
+  border-top-left-radius: 2px;
+  border-top-right-radius: 0;
+  border-bottom-right-radius: 0;
+  border-bottom-left-radius: 2px;
+}
+.skin-yellow .sidebar-form input[type="text"]:focus,
+.skin-yellow .sidebar-form input[type="text"]:focus + .input-group-btn .btn {
+  background-color: #fff;
+  color: #666;
+}
+.skin-yellow .sidebar-form input[type="text"]:focus + .input-group-btn .btn {
+  border-left-color: #fff;
+}
+.skin-yellow .sidebar-form .btn {
+  color: #999;
+  border-top-left-radius: 0;
+  border-top-right-radius: 2px;
+  border-bottom-right-radius: 2px;
+  border-bottom-left-radius: 0;
+}
+.skin-yellow.layout-top-nav .main-header > .logo .logo-variant {
+  color: #413F42;
+  background-color: none;
+}
+.btn.btn-primary,
+.btn:hover.btn-primary,
+.btn .btn-primary:link,
+.btn:hover .btn-primary:link {
+  background-color: #f7be05;
+  border-color: #c59704;
+  color: var(--nav-link);
+}
+.btna.btn-primary:hover,
+.btn:hovera.btn-primary:hover {
+  background-color: #c59704;
+  border-color: #c59704;
+  color: var(--nav-link);
+}
+.btn.btn-white:link,
+.btn:hover.btn-white:link {
+  background-color: #f7be05;
+  color: var(--nav-link);
+}
+.btn.btn-white:hover,
+.btn:hover.btn-white:hover {
+  background-color: #937103;
+  color: var(--nav-link);
+}
+a.btn-info:link,
+a.btn-warning:link,
+a.btn-danger:link {
+  color: #FFF;
+}
+a.btn-info:visited,
+a.btn-warning:visited,
+a.btn-danger:visited {
+  color: #FFF;
+}
+a {
+  color: var(--link);
+}
+a:hover {
+  color: var(--hover-link);
+}
+a:visited {
+  color: var(--visited-link);
+}
+.text-primary {
+  color: #c59704;
+}
+:root {
+  --button-default: #deab04;
+  --button-primary: #ac8403;
+  --button-hover: #937103;
+  --header: #FBCC34;
+  /* Use same as Header picker */
+  --text-main: #BBB;
+  --text-sub: #9b9b9b;
+  --link: #5b585c;
+  /* Use same as Header picker, lighten by 70% */
+  --visited-link: #747176;
+  /* Use same as Header picker, lighten by 70% */
+  --hover-link: #b4b1b5;
+  /* Use same as Header picker, lighten by 70% */
+  --nav-link: #222;
+  /* Use same as Header picker */
+  --light-link: #fff;
+  /* Use same as Header picker */
+}
+.fixed-table-container tbody .selected td {
+  background-color: #fff8af;
+}
+.select2-container--default .select2-selection--multiple .select2-selection__choice {
+  background-color: #FBCC34;
+}
+.search-highlight,
+.search-highlight:hover {
+  background-color: #e9d15b;
+}
+.thead,
+.navbar-nav > li > a:link {
+  color: var(--nav-link);
+}
+.navbar-nav > li > a:visited {
+  color: var(--nav-link);
+}
+:hover {
+  color: var(--nav-link);
+}
+.skin-yellow .main-header .navbar .nav > li > a {
+  color: #413F42;
+}
+.far fa-life-ring {
+  color: var(--link);
+}
+/*
+ * Skin: yellow dark
+ * ----------
+ */
+.skin-yellow-dark .main-header .navbar .sidebar-toggle {
+  color: #000 !important;
+}
+.skin-yellow-dark .main-header .navbar .sidebar-toggle:hover {
+  background-color: var(--link);
+}
+@media (max-width: 767px) {
+  .skin-yellow-dark .main-header .navbar .dropdown-menu li.divider {
+    background-color: rgba(255, 255, 255, 0.1);
+    color: #fff;
+  }
+  .skin-yellow-dark .main-header .navbar .dropdown-menu li a {
+    color: #fff;
+  }
+  .skin-yellow-dark .main-header .navbar .dropdown-menu li a:hover {
+    background: #e08e0b;
+    color: #fff;
+  }
+}
+.skin-yellow-dark .main-header li.user-header {
+  background-color: #f39c12;
+}
+.skin-yellow-dark .content-header {
+  background: transparent;
+}
+.skin-yellow-dark .wrapper,
+.skin-yellow-dark .main-sidebar,
+.skin-yellow-dark .left-side {
+  background-color: #222d32;
+}
+.skin-yellow-dark .user-panel > .info,
+.skin-yellow-dark .user-panel > .info > a {
+  color: #fff;
+}
+.skin-yellow-dark .sidebar-menu > li.header {
+  color: #4b646f;
+  background: #1a2226;
+}
+.skin-yellow-dark .sidebar-menu > li > a {
+  border-left: 3px solid transparent;
+}
+.skin-yellow-dark .sidebar-menu > li:hover > a,
+.skin-yellow-dark .sidebar-menu > li.active > a {
+  color: #fff;
+  background: #1e282c;
+  border-left-color: #f39c12;
+}
+.skin-yellow-dark .sidebar-menu > li > .treeview-menu {
+  margin: 0 1px;
+  background: #2c3b41;
+}
+.skin-yellow-dark .sidebar a {
+  color: #b8c7ce;
+}
+.skin-yellow-dark .sidebar a:hover {
+  text-decoration: none;
+}
+.skin-yellow-dark .treeview-menu > li > a {
+  color: #8aa4af;
+}
+.skin-yellow-dark .treeview-menu > li.active > a,
+.skin-yellow-dark .treeview-menu > li > a:hover {
+  color: #fff;
+}
+.skin-yellow-dark .sidebar-form {
+  border-radius: 3px;
+  border: 1px solid #374850;
+  margin: 10px 10px;
+}
+.skin-yellow-dark .sidebar-form input[type="text"],
+.skin-yellow-dark .sidebar-form .btn {
+  box-shadow: none;
+  background-color: #374850;
+  border: 1px solid transparent;
+  height: 35px;
+  transition: all 0.3s ease-in-out;
+}
+.skin-yellow-dark .sidebar-form input[type="text"] {
+  color: #666;
+  border-top-left-radius: 2px;
+  border-top-right-radius: 0;
+  border-bottom-right-radius: 0;
+  border-bottom-left-radius: 2px;
+}
+.skin-yellow-dark .sidebar-form input[type="text"]:focus,
+.skin-yellow-dark .sidebar-form input[type="text"]:focus + .input-group-btn .btn {
+  background-color: #fff;
+  color: #666;
+}
+.skin-yellow-dark .sidebar-form input[type="text"]:focus + .input-group-btn .btn {
+  border-left-color: #fff;
+}
+.skin-yellow-dark .sidebar-form .btn {
+  color: #999;
+  border-top-left-radius: 0;
+  border-top-right-radius: 2px;
+  border-bottom-right-radius: 2px;
+  border-bottom-left-radius: 0;
+}
+.btn.btn-primary,
+.btn:hover.btn-primary,
+.btn .btn-primary:link,
+.btn:hover .btn-primary:link {
+  background-color: var(--button-default);
+  border-color: #000000;
+  color: #545454;
+}
+.btna.btn-primary:hover,
+.btn:hovera.btn-primary:hover {
+  background-color: var(--button-hover);
+  border-color: var(--button-hover);
+  color: #545454;
+}
+.btn.btn-white:link,
+.btn:hover.btn-white:link {
+  background-color: var(--button-default);
+  color: #545454;
+}
+.btn.btn-white:hover,
+.btn:hover.btn-white:hover {
+  background-color: var(--hover-link);
+  color: #545454;
+}
+a.actions {
+  color: #fff !important;
+}
+a:visited.label-default,
+a:link.label-default {
+  color: #444;
+}
+/**
+The dropdown is white, so use a darker color
+ */
+li.dropdown-item-marker {
+  color: var(--button-primary);
+}
+a:link {
+  color: var(--link);
+}
+a:hover {
+  color: var(--hover-link);
+}
+a:visited {
+  color: var(--visited-link);
+}
+.text-primary {
+  color: #fff;
+}
+#sort tr.cansort {
+  background-color: var(--back-main);
+  color: var(--text-main);
+}
+:root {
+  --background: #222;
+  --back-main: #333;
+  --back-sub: #3d4144;
+  --back-sub-alt: rgba(0, 0, 0, 0.36);
+  --button-default: #FFCC32;
+  --button-primary: #b28500;
+  --button-hover: #987200;
+  --header: #FFCC32;
+  /* Use same as Header picker */
+  --text-main: #BBB;
+  --text-sub: #9b9b9b;
+  --link: #F0E68C;
+  /* Use same as Header picker, lighten by 70% */
+  --visited-link: #f9f5d0;
+  /* Use same as Header picker, lighten by 70% */
+  --hover-link: #ffffff;
+  /* Use same as Header picker, lighten by 70% */
+  --nav-link: #222;
+  /* Use same as Header picker */
+  --light-link: #545454;
+  /* Use same as Header picker */
+}
+#ldapad_test_results.well.well-sm {
+  color: var(--back-main);
+}
+.pagination > li > a {
+  color: var(--text-main);
+  background-color: var(--back-main);
+}
+.pagination > .active > a {
+  background-color: var(--button-default);
+  border-color: var(--light-link);
+  color: var(--nav-link);
+}
+.pagination > .active > a:hover {
+  background-color: var(--hover-link);
+}
+.tasks-menu > .dropdown-menu > li .menu {
+  background-color: var(--back-main);
+}
+.tasks-menu > .dropdown-menu > li .menu > li > a:hover .progress {
+  background-color: var(--background);
+}
+h2.task_menu {
+  color: var(--link);
+}
+.navbar-custom-menu > .navbar-nav > li > .dropdown-menu {
+  background-color: var(--back-main);
+  color: var(--link);
+}
+.main-header .navbar,
+.main-header .logo {
+  background-color: var(--header);
+  background: linear-gradient(to bottom, var(--header) 0%, var(--header) 100%);
+  border-color: var(--header);
+}
+a.btn.btn-default {
+  color: var(--nav-link);
+}
+.bootstrap-table .fixed-table-container .table thead th .sortable {
+  color: var(--text-main);
+}
+.bootstrap-table .fixed-table-toolbar .columns label {
+  color: #000;
+}
+.thead,
+.navbar-nav > li > a:link {
+  color: var(--nav-link);
+}
+.navbar-nav > li > a:visited {
+  color: var(--nav-link);
+}
+.modal-content {
+  background-color: var(--back-main);
+  color: var(--text-main);
+}
+a:link.btn-default {
+  color: var(--nav-link);
+}
+.btn-primary.hover {
+  color: var(--nav-link);
+}
+.small-box h3,
+.small-box p {
+  color: #fff !important;
+}
+.small-box h3 a:hover,
+.small-box p a:hover {
+  text-decoration: none;
+  color: var(--nav-link) !important;
+}
+.far fa-life-ring {
+  color: var(--link);
+}
+#accessoriesTable > tbody > tr > td > nobr > a > i.fa {
+  color: var(--text-main);
+}
+#assetsListingTable > tbody > tr > td > nobr > a > i.fa {
+  color: var(--text-main);
+}
+#assetsListingTable > tbody > tr.selected > td {
+  background-color: var(--back-main);
+}
+body {
+  color: var(--text-main);
+}
+.box,
+.box.box-default {
+  border-top: 3px solid var(--header);
+  border-top-color: var(--header);
+}
+.box-body,
+.box-footer,
+.box-header {
+  background-color: var(--back-sub);
+  color: var(--header);
+}
+.btn-default {
+  background-color: var(--button-default);
+}
+.btn-default dropdown-toggle {
+  background-color: var(--button-default);
+  color: var(--nav-link);
+}
+.btn-default:active,
+.btn-default:focus,
+.btn-default:hover,
+.btn-default.active {
+  background-color: var(--button-hover);
+  color: var(--nav-link);
+}
+.btn-primary,
+.btn-primary.hover,
+.btn-primary:active,
+.text-yellow {
+  color: var(--nav-link) !important;
+}
+.btn-primary:hover {
+  background-color: var(--button-primary);
+  color: var(--nav-link) !important;
+}
+#componentsTable > tbody > tr > td > nobr > a > i.fa {
+  color: var(--text-main);
+}
+#consumablesTable > tbody > tr > td > nobr > a > i.fa {
+  color: var(--text-main);
+}
+.content-wrapper {
+  background-color: var(--background);
+}
+#create-form > div > div > div > span > i.fa {
+  background-color: var(--back-sub);
+  color: var(--header);
+}
+.datepicker .datepicker-switch:hover,
+.datepicker .next:hover,
+.datepicker .prev:hover,
+.datepicker tfoot tr th:hover,
+.datepicker table tr td.day.focused,
+.datepicker table tr td.day:hover {
+  background-color: var(--header);
+}
+.datepicker.dropdown-menu {
+  background-color: var(--back-main);
+  color: var(--text-main);
+}
+#details > div > div > div > table {
+  background-color: transparent;
+}
+.dropdown-menu > li > a:hover {
+  background-color: var(--back-main);
+  color: var(--nav-link);
+}
+.form-control {
+  background-color: var(--back-main);
+  color: var(--text-main);
+}
+.form-control[disabled],
+.form-control[readonly],
+fieldset[disabled] .form-control {
+  background-color: var(--back-main);
+  color: var(--text-main);
+}
+h1,
+h2,
+h3,
+h4,
+h5,
+h6,
+p {
+  color: var(--text-main);
+}
+.help-block {
+  color: var(--text-sub);
+}
+input[type=text],
+input[type=search] {
+  background-color: var(--back-sub);
+  color: var(--text-main);
+}
+#licensesTable > tbody > tr > td > nobr > a > i.fa {
+  color: var(--text-main);
+}
+.main-footer {
+  background-color: var(--back-main);
+  color: var(--text-main);
+}
+.nav-tabs-custom > .nav-tabs > li > a,
+.nav-tabs-custom > .nav-tabs > li.active > a {
+  color: var(--text-main);
+}
+.nav-tabs-custom > .nav-tabs > li.active {
+  border-top-color: var(--header);
+}
+.nav-tabs-custom > .nav-tabs > li.active > a {
+  background-color: var(--back-main);
+}
+.nav-tabs-custom > .nav-tabs > li.active > a:hover {
+  background-color: var(--back-sub);
+  color: var(--text-main);
+}
+.nav-tabs-custom,
+.nav-tabs-custom > .tab-content {
+  background-color: var(--back-main);
+}
+.navbar-nav > .tasks-menu > .dropdown-menu > li.header {
+  background-color: var(--back-main);
+  color: var(--header);
+}
+.open > .dropdown-toggle.btn-default {
+  background-color: var(--back-sub);
+  color: var(--header);
+}
+.panel {
+  background-color: var(--back-sub);
+  color: var(--text-main);
+}
+.panel-default > .panel-heading {
+  background-color: var(--back-main);
+  color: var(--header);
+}
+.select2-container--default .select2-results__option[aria-selected=true],
+.select2-container--default .select2-results__option[aria-selected=true]:hover {
+  background-color: var(--back-sub);
+  color: var(--header);
+}
+.select2-container--default .select2-results__option--highlighted[aria-selected] {
+  background-color: var(--header);
+  color: var(--back-main);
+}
+.select2-container--default .select2-selection--single .select2-selection__rendered {
+  color: var(--text-main);
+}
+.select2-container--default .select2-selection--multiple .select2-selection__choice {
+  background-color: var(--header);
+}
+.select2-selection--single {
+  background-color: var(--back-sub) !important;
+  color: var(--text-main) !important;
+}
+.select2-dropdown {
+  background-color: var(--back-main);
+  color: var(--text-main);
+}
+.skin-yellow-dark .main-header .navbar .dropdown-menu li a {
+  color: var(--header);
+}
+.skin-yellow-dark .main-header .navbar .dropdown-menu li a:hover {
+  background-color: #000000;
+}
+tr th div.th-inner {
+  color: #FFFFFF;
+}
+.tab-content,
+.tab-pane {
+  background-color: var(--back-main);
+  color: var(--text-main);
+}
+.table-striped > tbody > tr:nth-of-type(odd) {
+  background-color: var(--back-sub);
+}
+.table-striped > tbody > tr:nth-of-type(even) {
+  background-color: var(--back-sub-alt);
+}
+.th-inner {
+  color: var(--nav-link);
+}
+#webui > div > div > div > div > div > table > tbody > tr > td > a > i.fa,
+.box-body,
+.box-footer,
+.box-header {
+  color: var(--text-main);
+}
+.box-header.with-border {
+  border-bottom: #000;
+}
+#customFieldsTable a[href*='/models'] {
+  background-color: var(--back-sub-alt);
+  color: var(--link);
+}
+#customFieldsTable a[href*='/models']:hover {
+  background-color: var(--text-sub);
+  color: var(--button-hover);
+}
+#customFieldsTable a[href*='/models']:visited {
+  background-color: var(--background);
+  color: var(--visited-link);
+}
+.row-striped {
+  vertical-align: top;
+  line-height: 2.6;
+  padding: 0px;
+  margin-left: 20px;
+  box-sizing: border-box;
+  display: table;
+}
+.row-striped .row:nth-of-type(odd) div {
+  background-color: var(--back-sub);
+  color: var(--text-main);
+  border-top: 1px solid #dddddd;
+  display: table-cell;
+}
+.row-striped .row:nth-of-type(even) div {
+  background-color: var(--back-sub);
+  color: var(--text-main);
+  border-top: 1px solid #dddddd;
+  display: table-cell;
+}
+.row-new-striped > .row:nth-of-type(odd) {
+  background-color: var(--back-sub);
+  color: var(--text-main);
+}
+.row-new-striped > .row:nth-of-type(even) {
+  background-color: var(--back-sub-alt);
+  color: var(--text-main);
+}
+.search-highlight,
+.search-highlight:hover {
+  background-color: #e9d15b;
+}
+.table > tbody > tr.warning > td {
+  background-color: var(--back-sub);
+}
+
diff --git a/public/css/dist/skins/_all-skins.css.map b/public/css/dist/skins/_all-skins.css.map
new file mode 100644
index 0000000000..d6c9525c71
--- /dev/null
+++ b/public/css/dist/skins/_all-skins.css.map
@@ -0,0 +1 @@
+{"version":3,"file":"css/dist/skins/_all-skins.css","mappings":"AAAA;;;EAGE;ACMF;ECHE;AFAF;ACGA;ECAI;AFAJ;ACAA;;;;;;;ECUI;EACA;AFDJ;ACVA;ECgBI;AFHJ;AEII;EACE;EACA;AFFN;ACjBA;EAMQ;ADcR;ACbQ;EACE;ADeV;ACZM;EAGM;IACE;EDYZ;EChBI;IAOQ;EDYZ;ECXY;IACE;EDad;AACF;AClCA;EA8BM;ADON;ACrCA;EAoCI;ADIJ;ACxCA;;;ECsGI;AFzDJ;AC7CA;;EC2GM;AF1DN;AEgEI;EACE;EACA;AF9DN;ACrDA;ECuHM;AF/DN;AEkEI;;EACE;EACA;EACA;AF/DN;AC9DA;ECiIM;EACA;AFhEN;AClEA;ECuII;AFlEJ;AEmEI;EACE;AFjEN;ACxEA;ECgJQ;AFrER;AEuEM;;EACE;AFpER;AC/EA;ECgEE;EA0FE;EACA;AFvEJ;ACpFA;;EC6JM;EACA;EACA;EACA;ECuBI;AHzFV;AC9FA;ECoKM;EAhGJ;EACA;EACA;EACA;AF8BF;AEiEM;;EACE;EACA;AF9DR;AEgEM;EACE;AF9DR;AC7GA;EC+KM;EA3GJ;EACA;EACA;EACA;AF6CF;ACzEA;EAEI;AD0EJ;ACpEA;;EACE;ADuEF;ACrEE;;;;EACE;EACA;EACA;AD0EJ;ACtEE;;EACE;EACA;EACA;ADyEJ;ACtEE;;EACE;ADyEJ;ACtEE;;EACE;ADyEJ;ACtEE;;EACE;ADyEJ;ACpEA;EACE;ADsEF;ACpEE;EACE;ADsEJ;ACpEE;EACE;ADsEJ;AClEA;EACE;ADoEF;AClEA;EACE;EACA;EACA;EACA;EDoEA,8BAA8B;ECnE9B;EACA;EACA;EDqEA,8CAA8C;ECpE9C;EDsEA,8CAA8C;ECrE9C;EDuEA,8CAA8C;ECtE9C;EDwEA,8BAA8B;ECvE9B;EDyEA,8BAA8B;AAChC;ACxEA;;;EACE;AD4EF;AC1EC;;;EACC;AD8EF;AC5EA;EACE;AD8EF;AC5EA;EACE;AD8EF;AC3EA;EACE;AD6EF;AC1EA;;EACE;AD6EF;AC3EA;EACE;AD6EF;AC1EA;;EACE;AD6EF;AACA;;;EAGE;AItNF;EFHE;AF4NF;AIzNA;EFAI;AF4NJ;AI5NA;;;;;;;EFUI;EACA;AF2NJ;AItOA;EFgBI;AFyNJ;AExNI;EACE;EACA;AF0NN;AI7OA;EAMQ;AJ0OR;AIzOQ;EACE;AJ2OV;AIxOM;EAGM;IACE;IACA;EJwOZ;EI7OI;IAQQ;EJwOZ;EIvOY;IACE;IACA;EJyOd;AACF;AInOI;EAAA;IAEI;EJqON;AACF;AIrQA;EAqCM;AJmON;AIxQA;EA2CI;AJgOJ;AI3QA;;;EFsGI;AF0KJ;AIhRA;;EF2GM;AFyKN;AEnKI;EACE;EACA;AFqKN;AIxRA;EFuHM;AFoKN;AEjKI;;EACE;EACA;EACA;AFoKN;AIjSA;EFiIM;EACA;AFmKN;AIrSA;EFuII;AFiKJ;AEhKI;EACE;AFkKN;AI3SA;EFgJQ;AF8JR;AE5JM;;EACE;AF+JR;AIlTA;EFgEE;EA0FE;EACA;AF4JJ;AIvTA;;EF6JM;EACA;EACA;EACA;ECuBI;AH0IV;AIjUA;EFoKM;EAhGJ;EACA;EACA;EACA;AFiQF;AElKM;;EACE;EACA;AFqKR;AEnKM;EACE;AFqKR;AIhVA;EF+KM;EA3GJ;EACA;EACA;EACA;AFgRF;AIrSA;EAEI;AJsSJ;AIhSA;;EACE;AJmSF;AIjSE;;;;EACE;EACA;EACA;AJsSJ;AIlSE;;EACE;EACA;EACA;AJqSJ;AIlSE;;EACE;EACA;AJqSJ;AIlSE;;EACE;EACA;AJqSJ;AACA;;EAEE;AIjSF;EACE;AJmSF;AI/RE;EACE;AJiSJ;AI/RE;EACE;AJiSJ;AI7RA;EACE;AJ+RF;AIzRA;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EJ2RA,8BAA8B;EI1R9B;EACA;EACA;EJ4RA,8CAA8C;EI3R9C;EJ6RA,8CAA8C;EI5R9C;EJ8RA,8CAA8C;EI7R9C;EJ+RA,8BAA8B;EI9R9B;EJgSA,8BAA8B;AAChC;AI/RA;EACE;AJiSF;AI/RA;EACE;AJiSF;AI9RA;EACE;EACA;AJgSF;AI9RA;EACE;EACA;AJgSF;AI9RA;EACE;AJgSF;AI9RA;EACE;AJgSF;AI9RA;EACE;AJgSF;AI9RA;EACE;AJgSF;AI9RA;EACE;EACA;AJgSF;AI9RA;EACE;EACA;AJgSF;AI7RA;;EACE;EAEA;EACA;AJgSF;AI7RA;EACE;AJ+RF;AI7RA;EACE;AJ+RF;AI7RA;;EACE;AJgSF;AI9RA;EACE;AJgSF;AI7RA;EACE;EACA;AJ+RF;AI5RA;EACE;AJ8RF;AI3RA;;EACE;AJ8RF;AI/RA;;EAGI;EACA;AJgSJ;AI7RA;EACE;AJ+RF;AACA;;;;;;;;;;EAUE;AI5RF;EACE;AJ8RF;AI5RA;EACE;AJ8RF;AI3RA;EACE;AJ6RF;AI3RA;EACE;AJ6RF;AI3RA;;EACE;EACA;AJ8RF;AI5RA;;;EACE;EACA;AJgSF;AI9RA;EACE;EACA;AJgSF;AI7RA;EACE;EACA;AJ+RF;AI5RA;;;;EACE;EACA;AJiSF;AI/RA;;;;EACE;AJoSF;AIlSA;EACE;EACA;AJoSF;AIlSA;EACE;AJoSF;AIlSA;EACE;AJoSF;AIlSA;EACE;AJoSF;AIlSA;EACE;EACA;AJoSF;AIlSA;;;;;;EACE;AJySF;AIvSA;EACE;EACA;AJySF;AIvSA;EACE;AJySF;AIvSA;EACE;EACA;AJySF;AIvSA;EACE;EACA;AJySF;AIvSA;;;EACE;EACA;AJ2SF;AIzSA;;;;;;;EACE;AJiTF;AI/SA;EACE;AJiTF;AI/SA;;EACE;EACA;AJkTF;AIhTA;;EACE;AJmTF;AIjTA;;EACE;EACA;AJoTF;AIlTA;EACE;AJoTF;AIlTA;EACE;EACA;AJoTF;AIlTA;;EACE;AJqTF;AInTA;EACE;AJqTF;AInTA;EACE;AJqTF;AInTA;EACE;EACA;AJqTF;AInTA;;EACE;AJsTF;AIpTA;EACE;EACA;AJsTF;AIpTA;EACE;EACA;AJsTF;AIpTA;EACE;EACA;AJsTF;AIpTA;EACE;EACA;AJsTF;AIpTA;;EACE;EACA;AJuTF;AIrTA;EACE;EACA;AJuTF;AIrTA;EACE;AJuTF;AIrTA;EACE;AJuTF;AIrTA;EACE;EACA;AJuTF;AIrTA;EACE;EACA;AJuTF;AIrTA;EACE;AJuTF;AIrTA;EACE;AJuTF;AIrTA;;;;EACE;AJ0TF;AIxTA;;EACE;EACA;AJ2TF;AIzTA;EACE;EACA;AJ2TF;AIzTA;EACE;EACA;AJ2TF;AIzTA;EACE;EACA;AJ2TF;AIzTA;EACE;EACA;AJ2TF;AIzTA;;;;EACE;AJ8TF;AI3TA;EACE;AJ6TF;AI1TA;EACE;AJ4TF;AI1TE;EACE;AJ4TJ;AI3TE;EACE;EACA;AJ6TJ;AIzTA;EACE;EACA;EACA;EACA;EACA;EAGA;AJyTF;AIrTA;EACE;EACA;EACA;EACA;AJuTF;AInTA;EACE;EACA;EACA;EACA;AJqTF;AIlTA;;EACE;AJqTF;AInTA;EACE;AJqTF;AInTA;;;;;;;;;;;;EACE;AJgUF;AI9TA;EACE;AJgUF;AACA;;;EAGE;AKxwBF;EHHE;AF8wBF;AK3wBA;EHAI;AF8wBJ;AK9wBA;;;;;;;EHUI;EACA;AF6wBJ;AKxxBA;EHgBI;AF2wBJ;AE1wBI;EACE;EACA;AF4wBN;AK/xBA;EAMQ;AL4xBR;AK3xBQ;EACE;AL6xBV;AK1xBM;EAGM;IACE;EL0xBZ;EK9xBI;IAOQ;EL0xBZ;EKzxBY;IACE;EL2xBd;AACF;AKhzBA;EA8BM;ALqxBN;AKnzBA;EAoCI;ALkxBJ;AKtzBA;;;EHsGI;AFqtBJ;AK3zBA;;EH2GM;AFotBN;AE9sBI;EACE;EACA;AFgtBN;AKn0BA;EHuHM;AF+sBN;AE5sBI;;EACE;EACA;EACA;AF+sBN;AK50BA;EHiIM;EACA;AF8sBN;AKh1BA;EHuII;AF4sBJ;AE3sBI;EACE;AF6sBN;AKt1BA;EHgJQ;AFysBR;AEvsBM;;EACE;AF0sBR;AK71BA;EHgEE;EA0FE;EACA;AFusBJ;AKl2BA;;EH6JM;EACA;EACA;EACA;ECuBI;AHqrBV;AK52BA;EHoKM;EAhGJ;EACA;EACA;EACA;AF4yBF;AE7sBM;;EACE;EACA;AFgtBR;AE9sBM;EACE;AFgtBR;AK33BA;EH+KM;EA3GJ;EACA;EACA;EACA;AF2zBF;AKv1BA;EAEI;ALw1BJ;AK/0BE;;;;;;EACE;EACA;EACA;ALs1BJ;AKl1BE;;;EACE;EACA;EACA;ALs1BJ;AKn1BE;;;EACE;EACA;ALu1BJ;AKp1BE;;;EACE;EACA;ALw1BJ;AKr1BE;;;EACE;EACA;ALy1BJ;AKn1BA;;;;;;;;;;EAGI;AL41BJ;AKz1BA;;;EAEE;AL41BF;AKx1BA;EACE;EACA;EACA;EACA;EL01BA,8BAA8B;EKz1B9B;EACA;EACA;EL21BA,8CAA8C;EK11B9C;EL41BA,8CAA8C;EK31B9C;EL61BA,8CAA8C;EK51B9C;EL81BA,8BAA8B;EK71B9B;EL+1BA,8BAA8B;AAChC;AK91BA;;;EACE;ALk2BF;AKh2BC;;;EACC;ALo2BF;AKl2BA;EACE;ALo2BF;AKj2BA;EACE;ALm2BF;AKh2BA;EACE;ALk2BF;AK/1BA;EACE;ALi2BF;AK/1BA;EACE;ALi2BF;AK91BA;EACE;ALg2BF;AK91BA;EACE;ALg2BF;AK71BA;;EACE;ALg2BF;AK51BA;;;EACE;ALg2BF;AACA;;;EAGE;AMx/BF;EJHE;AF8/BF;AM3/BA;EJAI;AF8/BJ;AM9/BA;;;;;;;EJUI;EACA;AF6/BJ;AMxgCA;EJgBI;AF2/BJ;AE1/BI;EACE;EACA;AF4/BN;AM/gCA;EAMQ;AN4gCR;AM3gCQ;EACE;AN6gCV;AM1gCM;EAGM;IACE;IACA;EN0gCZ;EM/gCI;IAQQ;EN0gCZ;EMzgCY;IACE;IACA;EN2gCd;AACF;AMliCA;EAgCM;ANqgCN;AMriCA;EAsCI;ANkgCJ;AMxiCA;;;EJsGI;AFu8BJ;AM7iCA;;EJ2GM;AFs8BN;AEh8BI;EACE;EACA;AFk8BN;AMrjCA;EJuHM;AFi8BN;AE97BI;;EACE;EACA;EACA;AFi8BN;AM9jCA;EJiIM;EACA;AFg8BN;AMlkCA;EJuII;AF87BJ;AE77BI;EACE;AF+7BN;AMxkCA;EJgJQ;AF27BR;AEz7BM;;EACE;AF47BR;AM/kCA;EJgEE;EA0FE;EACA;AFy7BJ;AMplCA;;EJ6JM;EACA;EACA;EACA;ECuBI;AHu6BV;AM9lCA;EJoKM;EAhGJ;EACA;EACA;EACA;AF8hCF;AE/7BM;;EACE;EACA;AFk8BR;AEh8BM;EACE;AFk8BR;AM7mCA;EJ+KM;EA3GJ;EACA;EACA;EACA;AF6iCF;AMvkCA;EAEI;ANwkCJ;AMlkCA;;EACE;ANqkCF;AMnkCE;;;;EACE;EACA;EACA;ANwkCJ;AMpkCE;;EACE;EACA;EACA;ANukCJ;AMpkCE;;EACE;EACA;ANukCJ;AMpkCE;;EACE;EACA;ANukCJ;AACA;;EAEE;AMnkCF;EACE;ANqkCF;AMhkCE;EACE;ANkkCJ;AMhkCE;EACE;ANkkCJ;AM9jCA;EACE;ANgkCF;AM1jCA;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EN4jCA,8BAA8B;EM3jC9B;EACA;EACA;EN6jCA,8CAA8C;EM5jC9C;EN8jCA,8CAA8C;EM7jC9C;EN+jCA,8CAA8C;EM9jC9C;ENgkCA,8BAA8B;EM/jC9B;ENikCA,8BAA8B;AAChC;AM/jCA;EACE;ANikCF;AM/jCA;EACE;ANikCF;AM9jCA;EACE;EACA;ANgkCF;AM9jCA;EACE;EACA;ANgkCF;AM9jCA;EACE;ANgkCF;AM9jCA;EACE;ANgkCF;AM7jCA;EACE;AN+jCF;AM7jCA;EACE;AN+jCF;AM7jCA;EACE;EACA;AN+jCF;AM5jCA;;EACE;EAEA;EACA;AN+jCF;AM5jCA;EACE;AN8jCF;AM5jCA;EACE;AN8jCF;AM5jCA;;EACE;AN+jCF;AM7jCA;EACE;AN+jCF;AM7jCA;EACE;EACA;AN+jCF;AM5jCA;EACE;AN8jCF;AM3jCA;EACE;AN6jCF;AM3jCA;EACE;AN6jCF;AM3jCA;;EACE;AN8jCF;AM/jCA;;EAGI;EACA;ANgkCJ;AM3jCA;EACE;AN6jCF;AM3jCA;EACE;AN6jCF;AM1jCA;EACE;AN4jCF;AM1jCA;EACE;AN4jCF;AM1jCA;;EACE;EACA;AN6jCF;AM3jCA;;;EACE;EACA;AN+jCF;AM7jCA;EACE;EACA;AN+jCF;AM5jCA;EACE;EACA;AN8jCF;AM3jCA;;;;EACE;EACA;ANgkCF;AM9jCA;;;;EACE;ANmkCF;AMjkCA;EACE;ANmkCF;AMjkCA;EACE;ANmkCF;AMjkCA;EACE;ANmkCF;AMjkCA;EACE;ANmkCF;AMjkCA;EACE;EACA;ANmkCF;AMjkCA;;;;;;EACE;ANwkCF;AMtkCA;EACE;EACA;ANwkCF;AMtkCA;EACE;ANwkCF;AMtkCA;EACE;EACA;ANwkCF;AMtkCA;EACE;ANwkCF;AMtkCA;EACE;EACA;ANwkCF;AMtkCA;;;EACE;EACA;AN0kCF;AMxkCA;;;;;;;EACE;ANglCF;AM9kCA;EACE;ANglCF;AM9kCA;;EACE;EACA;ANilCF;AM/kCA;;EACE;EACA;ANklCF;AMhlCA;EACE;ANklCF;AMhlCA;EACE;EACA;ANklCF;AMhlCA;;EACE;ANmlCF;AMjlCA;EACE;ANmlCF;AMjlCA;EACE;ANmlCF;AMjlCA;EACE;EACA;ANmlCF;AMjlCA;;EACE;ANolCF;AMllCA;EACE;EACA;ANolCF;AMllCA;EACE;EACA;ANolCF;AMllCA;EACE;EACA;ANolCF;AMllCA;EACE;EACA;ANolCF;AMllCA;;EACE;EACA;ANqlCF;AMnlCA;EACE;EACA;ANqlCF;AMnlCA;EACE;ANqlCF;AMnlCA;EACE;ANqlCF;AMnlCA;EACE;EACA;ANqlCF;AMnlCA;EACE;EACA;ANqlCF;AMnlCA;EACE;ANqlCF;AMnlCA;EACE;ANqlCF;AMnlCA;;;;EACE;ANwlCF;AMtlCA;;EACE;EACA;ANylCF;AMvlCA;EACE;ANylCF;AMvlCA;EACE;ANylCF;AMvlCA;;;;EACE;AN4lCF;AMzlCA;EACE;AN2lCF;AMxlCA;EACE;AN0lCF;AMxlCE;EACE;AN0lCJ;AMzlCE;EACE;EACA;AN2lCJ;AMzlCE;EACE;AN2lCJ;AMxlCA;EACE;AN0lCF;AMxlCA;EACE;AN0lCF;AMvlCA;EACE;EACA;EACA;EACA;EACA;EAGA;ANulCF;AMnlCA;EACE;EACA;EACA;EACA;ANqlCF;AMjlCA;EACE;EACA;EACA;EACA;ANmlCF;AMjlCA;EACE;EACA;ANmlCF;AMjlCA;EACE;EACA;ANmlCF;AMhlCA;;EACE;ANmlCF;AMjlCA;EACE;ANmlCF;AACA;;;EAGE;AO7gDF;ELHE;AFmhDF;AOhhDA;ELAI;AFmhDJ;AOnhDA;;;;;;;ELUI;EACA;AFkhDJ;AO7hDA;ELgBI;AFghDJ;AE/gDI;EACE;EACA;AFihDN;AOpiDA;EAMQ;APiiDR;AOhiDQ;EACE;APkiDV;AO/hDM;EAGM;IACE;EP+hDZ;EOniDI;IAOQ;EP+hDZ;EO9hDY;IACE;EPgiDd;AACF;AOrjDA;EA8BM;AP0hDN;AOxjDA;EAoCI;APuhDJ;AO3jDA;;;ELsGI;AF09CJ;AOhkDA;;EL2GM;AFy9CN;AEn9CI;EACE;EACA;AFq9CN;AOxkDA;ELuHM;AFo9CN;AEj9CI;;EACE;EACA;EACA;AFo9CN;AOjlDA;ELiIM;EACA;AFm9CN;AOrlDA;ELuII;AFi9CJ;AEh9CI;EACE;AFk9CN;AO3lDA;ELgJQ;AF88CR;AE58CM;;EACE;AF+8CR;AOlmDA;ELgEE;EA0FE;EACA;AF48CJ;AOvmDA;;EL6JM;EACA;EACA;EACA;ECuBI;AH07CV;AOjnDA;ELoKM;EAhGJ;EACA;EACA;EACA;AFijDF;AEl9CM;;EACE;EACA;AFq9CR;AEn9CM;EACE;AFq9CR;AOhoDA;EL+KM;EA3GJ;EACA;EACA;EACA;AFgkDF;AO5lDA;EAEI;AP6lDJ;AOplDE;;;;EACE;EACA;EACA;APylDJ;AOrlDE;;EACE;EACA;EACA;APwlDJ;AOrlDE;;EACE;EACA;APwlDJ;AOrlDE;;EACE;EACA;APwlDJ;AOrlDA;EACE;EACA;APulDF;AOrlDA;EACE;APulDF;AOplDA;EACE;APslDF;AOrlDE;EACE;EACA;APulDJ;AOplDE;EACE;APslDJ;AOjlDE;EACE;EACA;APmlDJ;AO/kDA;EACE;APilDF;AO9kDA;EACE;APglDF;AO7kDA;EACE;AP+kDF;AO5kDA;EACE;AP8kDF;AO3kDA;EACE;AP6kDF;AO1kDA;EACE;AP4kDF;AOzkDA;EACE;AP2kDF;AOxkDA;EACE;EACA;AP0kDF;AOvkDA;EACE;APykDF;AOpkDA;EPskDE,wBAAwB;EOrkDxB;APukDF;AOrkDA;EPukDE,gBAAgB;EOtkDhB;APwkDF;AOtkDA;EPwkDE,WAAW;EOvkDX;APykDF;AOtkDA;;EACE;APykDF;AOtkDA;EACE;APwkDF;AOrkDA;EACE;APukDF;AOpkDA;;EACE;APukDF;AACA;;;EAGE;AQlvDF;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;ERovDA,8BAA8B;EQnvD9B;EACA;EACA;ERqvDA,8CAA8C;EQpvD9C;ERsvDA,8CAA8C;EQrvD9C;ARuvDF;AQrvDA;ENjBE;AFywDF;AQxvDA;ENdI;AFywDJ;AQ3vDA;;;;;;;ENJI;EACA;AFwwDJ;AQrwDA;ENEI;AFswDJ;AErwDI;EACE;EACA;AFuwDN;AQ5wDA;EAMQ;ARywDR;AQxwDQ;EACE;AR0wDV;AQvwDM;EAGM;IACE;ERuwDZ;EQ3wDI;IAOQ;ERuwDZ;EQtwDY;IACE;ERwwDd;AACF;AQ7xDA;EA8BM;ARkwDN;AQhyDA;EAoCI;AR+vDJ;AQnyDA;;;ENwFI;AFgtDJ;AQxyDA;;EN6FM;AF+sDN;AEzsDI;EACE;EACA;AF2sDN;AQhzDA;ENyGM;AF0sDN;AEvsDI;;EACE;EACA;EACA;AF0sDN;AQzzDA;ENmHM;EACA;AFysDN;AQ7zDA;ENyHI;AFusDJ;AEtsDI;EACE;AFwsDN;AQn0DA;ENkIQ;AFosDR;AElsDM;;EACE;AFqsDR;AQ10DA;ENkDE;EA0FE;EACA;AFksDJ;AQ/0DA;;EN+IM;EACA;EACA;EACA;ECuBI;AHgrDV;AQz1DA;ENsJM;EAhGJ;EACA;EACA;EACA;AFuyDF;AExsDM;;EACE;EACA;AF2sDR;AEzsDM;EACE;AF2sDR;AQx2DA;ENiKM;EA3GJ;EACA;EACA;EACA;AFszDF;AQp0DA;EAEI;ARq0DJ;AQ5zDE;;;;EACE;EACA;EACA;ARi0DJ;AQ7zDE;;EACE;EACA;EACA;ARg0DJ;AQ7zDE;;EACE;EACA;ARg0DJ;AQ7zDE;;EACE;EACA;ARg0DJ;AQ7zDA;;;EACE;ARi0DF;AQ/zDC;;;EACC;ARm0DF;AQj0DA;EACE;ARm0DF;AQh0DA;EACE;ARk0DF;AQ/zDA;EACE;ARi0DF;AQh0DE;EACE;ARk0DJ;AQh0DE;EACE;ARk0DJ;AQ9zDA;EACE;ARg0DF;AQ9zDA;EACE;ARg0DF;AQ9zDA;EACE;ARg0DF;AQ9zDA;EACE;ARg0DF;AQ7zDA;;EACE;ARg0DF;AACA;;;EAGE;ASr8DF;EPHE;AF28DF;ASx8DA;EPAI;AF28DJ;AS38DA;;;;;;;EPUI;EACA;AF08DJ;ASr9DA;EPgBI;AFw8DJ;AEv8DI;EACE;EACA;AFy8DN;AS59DA;EAMQ;ATy9DR;ASx9DQ;EACE;AT09DV;ASv9DM;EAGM;IACE;IACA;ETu9DZ;ES59DI;IAQQ;ETu9DZ;ESt9DY;IACE;IACA;ETw9Dd;AACF;AS/+DA;EAgCM;ATk9DN;ASl/DA;EAsCI;AT+8DJ;ASr/DA;;;EPsGI;AFo5DJ;AS1/DA;;EP2GM;AFm5DN;AE74DI;EACE;EACA;AF+4DN;ASlgEA;EPuHM;AF84DN;AE34DI;;EACE;EACA;EACA;AF84DN;AS3gEA;EPiIM;EACA;AF64DN;AS/gEA;EPuII;AF24DJ;AE14DI;EACE;AF44DN;ASrhEA;EPgJQ;AFw4DR;AEt4DM;;EACE;AFy4DR;AS5hEA;EPgEE;EA0FE;EACA;AFs4DJ;ASjiEA;;EP6JM;EACA;EACA;EACA;ECuBI;AHo3DV;AS3iEA;EPoKM;EAhGJ;EACA;EACA;EACA;AF2+DF;AE54DM;;EACE;EACA;AF+4DR;AE74DM;EACE;AF+4DR;AS1jEA;EP+KM;EA3GJ;EACA;EACA;EACA;AF0/DF;ASphEA;EAEI;ATqhEJ;AS/gEA;;EACE;ATkhEF;AShhEE;;;;EACE;EACA;EACA;ATqhEJ;ASjhEE;;EACE;EACA;EACA;ATohEJ;ASjhEE;;EACE;EACA;ATohEJ;ASjhEE;;EACE;EACA;ATohEJ;AACA;;EAEE;AShhEF;EACE;ATkhEF;AS9gEE;EACE;ATghEJ;AS9gEE;EACE;ATghEJ;AS5gEA;EACE;AT8gEF;ASxgEA;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;ET0gEA,8BAA8B;ESzgE9B;EACA;EACA;ET2gEA,8CAA8C;ES1gE9C;ET4gEA,8CAA8C;ES3gE9C;ET6gEA,8CAA8C;ES5gE9C;ET8gEA,8BAA8B;ES7gE9B;ET+gEA,8BAA8B;AAChC;AS7gEA;EACE;AT+gEF;AS7gEA;EACE;AT+gEF;AS5gEA;EACE;EACA;AT8gEF;AS5gEA;EACE;EACA;AT8gEF;AS5gEA;EACE;AT8gEF;AS5gEA;EACE;AT8gEF;AS3gEA;EACE;AT6gEF;AS3gEA;EACE;AT6gEF;AS3gEA;EACE;EACA;AT6gEF;AS1gEA;;EACE;EAEA;EACA;AT6gEF;AS1gEA;EACE;AT4gEF;AS1gEA;EACE;AT4gEF;AS1gEA;;EACE;AT6gEF;AS1gEA;EACE;EACA;AT4gEF;ASzgEA;EACE;AT2gEF;ASxgEA;;EACE;AT2gEF;AS5gEA;;EAGI;EACA;AT6gEJ;ASxgEA;EACE;AT0gEF;ASxgEA;EACE;AT0gEF;ASvgEA;EACE;ATygEF;ASvgEA;EACE;ATygEF;ASvgEA;;EACE;EACA;AT0gEF;ASxgEA;;;EACE;EACA;AT4gEF;AS1gEA;EACE;EACA;AT4gEF;ASzgEA;EACE;EACA;AT2gEF;ASxgEA;;;;EACE;EACA;AT6gEF;AS3gEA;;;;EACE;ATghEF;AS9gEA;EACE;ATghEF;AS9gEA;EACE;ATghEF;AS9gEA;EACE;ATghEF;AS9gEA;EACE;ATghEF;AS9gEA;EACE;EACA;ATghEF;AS9gEA;;;;;;EACE;ATqhEF;ASnhEA;EACE;EACA;ATqhEF;ASnhEA;EACE;ATqhEF;ASnhEA;EACE;EACA;ATqhEF;ASnhEA;EACE;ATqhEF;ASnhEA;EACE;EACA;ATqhEF;ASnhEA;;;EACE;EACA;ATuhEF;ASrhEA;;;;;;;EACE;AT6hEF;AS3hEA;EACE;AT6hEF;AS3hEA;;EACE;EACA;AT8hEF;AS5hEA;;EACE;EACA;AT+hEF;AS7hEA;EACE;AT+hEF;AS7hEA;EACE;EACA;AT+hEF;AS7hEA;;EACE;ATgiEF;AS9hEA;EACE;ATgiEF;AS9hEA;EACE;ATgiEF;AS9hEA;EACE;EACA;ATgiEF;AS9hEA;;EACE;ATiiEF;AS/hEA;EACE;EACA;ATiiEF;AS/hEA;EACE;EACA;ATiiEF;AS/hEA;EACE;EACA;ATiiEF;AS/hEA;;EACE;EACA;ATkiEF;AShiEA;EACE;EACA;ATkiEF;AShiEA;EACE;ATkiEF;AShiEA;EACE;ATkiEF;AShiEA;EACE;EACA;ATkiEF;AShiEA;EACE;EACA;ATkiEF;AShiEA;EACE;ATkiEF;AShiEA;EACE;ATkiEF;AShiEA;;;;EACE;ATqiEF;ASniEA;;EACE;EACA;ATsiEF;ASpiEA;EACE;ATsiEF;ASpiEA;EACE;ATsiEF;ASpiEA;;;;EACE;ATyiEF;AStiEA;EACE;ATwiEF;ASriEA;EACE;ATuiEF;ASriEE;EACE;ATuiEJ;AStiEE;EACE;EACA;ATwiEJ;AStiEE;EACE;ATwiEJ;ASriEA;EACE;ATuiEF;ASriEA;EACE;ATuiEF;ASpiEA;EACE;EACA;EACA;EACA;EACA;EAGA;AToiEF;AShiEA;EACE;EACA;EACA;EACA;ATkiEF;AS9hEA;EACE;EACA;EACA;EACA;ATgiEF;AS9hEA;EACE;EACA;ATgiEF;AS9hEA;EACE;EACA;ATgiEF;AS5hEA;;EACE;AT+hEF;AS7hEA;EACE;AT+hEF;AACA;;;EAGE;AU78EF;ERHE;AFm9EF;AUh9EA;ERAI;AFm9EJ;AUn9EA;;;;;;;ERUI;EACA;AFk9EJ;AU79EA;ERgBI;AFg9EJ;AE/8EI;EACE;EACA;AFi9EN;AUp+EA;EAMQ;AVi+ER;AUh+EQ;EACE;AVk+EV;AU/9EM;EAGM;IACE;IACA;EV+9EZ;EUp+EI;IAQQ;EV+9EZ;EU99EY;IACE;IACA;EVg+Ed;AACF;AUv/EA;EAgCM;AV09EN;AU1/EA;EAsCI;AVu9EJ;AU7/EA;;;ERsGI;AF45EJ;AUlgFA;;ER2GM;AF25EN;AEr5EI;EACE;EACA;AFu5EN;AU1gFA;ERuHM;AFs5EN;AEn5EI;;EACE;EACA;EACA;AFs5EN;AUnhFA;ERiIM;EACA;AFq5EN;AUvhFA;ERuII;AFm5EJ;AEl5EI;EACE;AFo5EN;AU7hFA;ERgJQ;AFg5ER;AE94EM;;EACE;AFi5ER;AUpiFA;ERgEE;EA0FE;EACA;AF84EJ;AUziFA;;ER6JM;EACA;EACA;EACA;ECuBI;AH43EV;AUnjFA;ERoKM;EAhGJ;EACA;EACA;EACA;AFm/EF;AEp5EM;;EACE;EACA;AFu5ER;AEr5EM;EACE;AFu5ER;AUlkFA;ER+KM;EA3GJ;EACA;EACA;EACA;AFkgFF;AU5hFA;EAEI;AV6hFJ;AUvhFA;;EACE;AV0hFF;AUxhFE;;;;EACE;EACA;EACA;AV6hFJ;AUzhFE;;EACE;EACA;EACA;AV4hFJ;AUzhFE;;EACE;EACA;AV4hFJ;AUzhFE;;EACE;EACA;AV4hFJ;AACA;;EAEE;AUxhFF;EACE;AV0hFF;AUvhFA;EACE;AVyhFF;AUthFA;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EVwhFA,8BAA8B;EUvhF9B;EACA;EACA;EVyhFA,8CAA8C;EUxhF9C;EV0hFA,8CAA8C;EUzhF9C;EV2hFA,8CAA8C;EU1hF9C;EV4hFA,8BAA8B;EU3hF9B;EV6hFA,8BAA8B;AAChC;AU3hFA;EACE;AV6hFF;AU3hFA;EACE;AV6hFF;AU1hFA;EACE;EACA;AV4hFF;AU1hFA;EACE;EACA;AV4hFF;AU1hFA;EACE;AV4hFF;AU1hFA;EACE;AV4hFF;AUzhFA;EACE;AV2hFF;AUzhFA;EACE;AV2hFF;AUzhFA;EACE;EACA;AV2hFF;AUxhFA;;EACE;EAEA;EACA;AV2hFF;AUzhFA;EACE;AV2hFF;AUxhFA;EACE;AV0hFF;AUxhFA;EACE;AV0hFF;AUvhFA;;EACE;AV0hFF;AUvhFA;EACE;EACA;AVyhFF;AUthFA;EACE;AVwhFF;AUrhFA;EACE;AVuhFF;AUphFA;EACE;AVshFF;AUnhFA;EACE;AVqhFF;AUlhFA;;EACE;AVqhFF;AUthFA;;EAGI;EACA;AVuhFJ;AUlhFA;EACE;AVohFF;AUlhFA;EACE;AVohFF;AUjhFA;EACE;AVmhFF;AUjhFA;EACE;AVmhFF;AUjhFA;;EACE;EACA;AVohFF;AUlhFA;;;EACE;EACA;AVshFF;AUphFA;EACE;EACA;AVshFF;AUphFA;EACE;AVshFF;AUphFA;EACE;EACA;AVshFF;AUnhFA;;;;EACE;EACA;AVwhFF;AUthFA;;;;EACE;EACA;AV2hFF;AUzhFA;EACE;AV2hFF;AUzhFA;EACE;AV2hFF;AUzhFA;EACE;AV2hFF;AUzhFA;EACE;AV2hFF;AUzhFA;EACE;EACA;AV2hFF;AUzhFA;;;;;;EACE;AVgiFF;AU9hFA;EACE;EACA;AVgiFF;AU9hFA;EACE;AVgiFF;AU9hFA;EACE;EACA;AVgiFF;AU9hFA;EACE;AVgiFF;AU9hFA;EACE;EACA;AVgiFF;AU9hFA;;;EACE;EACA;AVkiFF;AUhiFA;;;;;;;EACE;AVwiFF;AUtiFA;EACE;AVwiFF;AUtiFA;;EACE;EACA;AVyiFF;AUviFA;;EACE;EACA;AV0iFF;AUxiFA;EACE;AV0iFF;AUxiFA;EACE;EACA;AV0iFF;AUxiFA;;EACE;AV2iFF;AUziFA;EACE;AV2iFF;AUziFA;EACE;AV2iFF;AUziFA;EACE;EACA;AV2iFF;AUziFA;;EACE;AV4iFF;AU1iFA;EACE;EACA;AV4iFF;AU1iFA;EACE;EACA;AV4iFF;AU1iFA;EACE;EACA;AV4iFF;AU1iFA;EACE;EACA;AV4iFF;AU1iFA;;EACE;EACA;AV6iFF;AU3iFA;EACE;EACA;AV6iFF;AU3iFA;EACE;AV6iFF;AU3iFA;EACE;AV6iFF;AU3iFA;EACE;EACA;AV6iFF;AU3iFA;EACE;EACA;AV6iFF;AU3iFA;EACE;AV6iFF;AU3iFA;EACE;AV6iFF;AU3iFA;;;;EACE;AVgjFF;AU9iFA;;EACE;EACA;AVijFF;AU/iFA;EACE;AVijFF;AU/iFA;EACE;AVijFF;AU/iFA;;;;EACE;AVojFF;AUjjFA;EACE;AVmjFF;AUjjFA;EACE;AVmjFF;AUjjFA;EACE;AVmjFF;AUhjFA;EACE;EACA;EACA;EACA;EACA;EAGA;AVgjFF;AU5iFA;EACE;EACA;EACA;EACA;AV8iFF;AU1iFA;EACE;EACA;EACA;EACA;AV4iFF;AU1iFA;EACE;EACA;AV4iFF;AU1iFA;EACE;EACA;AV4iFF;AU1iFA;;EACE;AV6iFF;AU3iFA;EACE;AV6iFF;AACA;;;EAGE;AWt9FF;ETHE;AF49FF;AWz9FA;ETAI;AF49FJ;AW59FA;;;;;;;ETUI;EACA;AF29FJ;AWt+FA;ETgBI;AFy9FJ;AEx9FI;EACE;EACA;AF09FN;AW7+FA;EAMQ;AX0+FR;AWz+FQ;EACE;AX2+FV;AWx+FM;EAGM;IACE;EXw+FZ;EW5+FI;IAOQ;EXw+FZ;EWv+FY;IACE;EXy+Fd;AACF;AW9/FA;EA8BM;AXm+FN;AWjgGA;EAoCI;AXg+FJ;AWpgGA;;;ETsGI;AFm6FJ;AWzgGA;;ET2GM;AFk6FN;AE55FI;EACE;EACA;AF85FN;AWjhGA;ETuHM;AF65FN;AE15FI;;EACE;EACA;EACA;AF65FN;AW1hGA;ETiIM;EACA;AF45FN;AW9hGA;ETuII;AF05FJ;AEz5FI;EACE;AF25FN;AWpiGA;ETgJQ;AFu5FR;AEr5FM;;EACE;AFw5FR;AW3iGA;ETgEE;EA0FE;EACA;AFq5FJ;AWhjGA;;ET6JM;EACA;EACA;EACA;ECuBI;AHm4FV;AW1jGA;EToKM;EAhGJ;EACA;EACA;EACA;AF0/FF;AE35FM;;EACE;EACA;AF85FR;AE55FM;EACE;AF85FR;AWzkGA;ET+KM;EA3GJ;EACA;EACA;EACA;AFygGF;AWriGA;EAEI;AXsiGJ;AW7hGE;;;;EACE;EACA;EACA;AXkiGJ;AW9hGE;;EACE;EACA;EACA;AXiiGJ;AW9hGE;;EACE;EACA;AXiiGJ;AW9hGE;;EACE;EACA;AXiiGJ;AW5hGA;EACE;AX8hGF;AW7hGE;EACE;AX+hGJ;AW7hGE;EACE;AX+hGJ;AW3hGA;EACE;AX6hGF;AW1hGA;EACE;EACA;EACA;EACA;EX4hGA,8BAA8B;EW3hG9B;EACA;EACA;EX6hGA,8CAA8C;EW5hG9C;EX8hGA,8CAA8C;EW7hG9C;EX+hGA,8CAA8C;EW9hG9C;EXgiGA,8BAA8B;EW/hG9B;EXiiGA,8BAA8B;AAChC;AW/hGA;;;EACE;AXmiGF;AWjiGC;;;EACC;AXqiGF;AWliGA;EACE;AXoiGF;AWjiGA;EACE;AXmiGF;AWjiGA;EACE;AXmiGF;AWjiGA;;EACE;AXoiGF;AACA;;;EAGE;AYrqGF;EVHE;AF2qGF;AYxqGA;EVAI;AF2qGJ;AY3qGA;;;;;;;EVUI;EACA;AF0qGJ;AYrrGA;EVgBI;AFwqGJ;AEvqGI;EACE;EACA;AFyqGN;AY5rGA;EAMQ;AZyrGR;AYxrGQ;EACE;AZ0rGV;AYvrGM;EAGM;IACE;IACA;EZurGZ;EY5rGI;IAQQ;EZurGZ;EYtrGY;IACE;IACA;EZwrGd;AACF;AY/sGA;EAgCM;AZkrGN;AYltGA;EAsCI;AZ+qGJ;AYrtGA;;;EVsGI;AFonGJ;AY1tGA;;EV2GM;AFmnGN;AE7mGI;EACE;EACA;AF+mGN;AYluGA;EVuHM;AF8mGN;AE3mGI;;EACE;EACA;EACA;AF8mGN;AY3uGA;EViIM;EACA;AF6mGN;AY/uGA;EVuII;AF2mGJ;AE1mGI;EACE;AF4mGN;AYrvGA;EVgJQ;AFwmGR;AEtmGM;;EACE;AFymGR;AY5vGA;EVgEE;EA0FE;EACA;AFsmGJ;AYjwGA;;EV6JM;EACA;EACA;EACA;ECuBI;AHolGV;AY3wGA;EVoKM;EAhGJ;EACA;EACA;EACA;AF2sGF;AE5mGM;;EACE;EACA;AF+mGR;AE7mGM;EACE;AF+mGR;AY1xGA;EV+KM;EA3GJ;EACA;EACA;EACA;AF0tGF;AYpvGA;EAEI;AZqvGJ;AY/uGA;;EACE;AZkvGF;AYhvGE;;;;EACE;EACA;EACA;AZqvGJ;AYjvGE;;EACE;EACA;EACA;AZovGJ;AYjvGE;;EACE;EACA;AZovGJ;AYjvGE;;EACE;EACA;AZovGJ;AACA;;EAEE;AY/uGF;EACE;AZivGF;AY7uGE;EACE;AZ+uGJ;AY7uGE;EACE;AZ+uGJ;AY3uGA;EACE;AZ6uGF;AYvuGA;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EZyuGA,8BAA8B;EYxuG9B;EACA;EACA;EZ0uGA,8CAA8C;EYzuG9C;EZ2uGA,8CAA8C;EY1uG9C;EZ4uGA,8CAA8C;EY3uG9C;EZ6uGA,8BAA8B;EY5uG9B;EZ8uGA,8BAA8B;AAChC;AY5uGA;EACE;AZ8uGF;AY3uGA;EACE;EACA;AZ6uGF;AY3uGA;EACE;EACA;AZ6uGF;AY3uGA;EACE;AZ6uGF;AY3uGA;EACE;AZ6uGF;AY1uGA;EACE;AZ4uGF;AY1uGA;EACE;AZ4uGF;AY1uGA;EACE;EACA;AZ4uGF;AYzuGA;;EACE;EAEA;EACA;AZ4uGF;AYzuGA;EACE;AZ2uGF;AYzuGA;EACE;AZ2uGF;AYzuGA;;EACE;AZ4uGF;AY1uGA;EACE;EACA;AZ4uGF;AYzuGA;EACE;EACA;AZ2uGF;AYxuGA;EACE;AZ0uGF;AYxuGA;EACE;AZ0uGF;AYxuGA;EACE;AZ0uGF;AYvuGA;;EACE;AZ0uGF;AY3uGA;;EAGI;EACA;AZ4uGJ;AYxuGA;EACE;AZ0uGF;AYxuGA;EACE;AZ0uGF;AYxuGA;EACE;AZ0uGF;AYvuGA;EACE;AZyuGF;AYvuGA;EACE;AZyuGF;AYvuGA;;EACE;EACA;AZ0uGF;AYxuGA;;;EACE;EACA;AZ4uGF;AY1uGA;EACE;EACA;AZ4uGF;AYzuGA;EACE;EACA;AZ2uGF;AYxuGA;;;;EACE;EACA;AZ6uGF;AY3uGA;;;;EACE;AZgvGF;AY9uGA;EACE;AZgvGF;AY9uGA;EACE;AZgvGF;AY9uGA;EACE;AZgvGF;AY9uGA;EACE;AZgvGF;AY9uGA;EACE;EACA;AZgvGF;AY9uGA;;;;;;EACE;AZqvGF;AYnvGA;EACE;EACA;AZqvGF;AYnvGA;EACE;AZqvGF;AYnvGA;EACE;EACA;AZqvGF;AYnvGA;EACE;AZqvGF;AYnvGA;EACE;EACA;AZqvGF;AYnvGA;;;EACE;EACA;AZuvGF;AYrvGA;;;;;;;EACE;AZ6vGF;AY3vGA;EACE;AZ6vGF;AY3vGA;;EACE;EACA;AZ8vGF;AY5vGA;;EACE;EACA;AZ+vGF;AY7vGA;EACE;AZ+vGF;AY7vGA;EACE;EACA;AZ+vGF;AY7vGA;;EACE;AZgwGF;AY9vGA;EACE;AZgwGF;AY9vGA;EACE;AZgwGF;AY9vGA;EACE;EACA;AZgwGF;AY9vGA;;EACE;AZiwGF;AY/vGA;EACE;EACA;AZiwGF;AY/vGA;EACE;EACA;AZiwGF;AY/vGA;EACE;EACA;AZiwGF;AY/vGA;EACE;EACA;AZiwGF;AY/vGA;;EACE;EACA;AZkwGF;AYhwGA;EACE;EACA;AZkwGF;AYhwGA;EACE;AZkwGF;AYhwGA;EACE;AZkwGF;AYhwGA;EACE;EACA;AZkwGF;AYhwGA;EACE;EACA;AZkwGF;AYhwGA;EACE;AZkwGF;AYhwGA;EACE;AZkwGF;AYhwGA;;;;EACE;AZqwGF;AYnwGA;;EACE;EACA;AZswGF;AYpwGA;EACE;AZswGF;AYpwGA;EACE;AZswGF;AYpwGA;;;;EACE;AZywGF;AYtwGA;EACE;AZwwGF;AYrwGA;EACE;AZuwGF;AYrwGE;EACE;AZuwGJ;AYtwGE;EACE;EACA;AZwwGJ;AYtwGE;EACE;AZwwGJ;AYpwGA;EACE;EACA;EACA;EACA;EACA;EAGA;AZowGF;AYhwGA;EACE;EACA;EACA;EACA;AZkwGF;AY9vGA;EACE;EACA;EACA;EACA;AZgwGF;AY9vGA;EACE;EACA;AZgwGF;AY9vGA;EACE;EACA;AZgwGF;AY7vGA;;EACE;AZgwGF;AY9vGA;EACE;AZgwGF;AACA;;;EAGE;AarrHF;EXHE;AF2rHF;AaxrHA;EXAI;AF2rHJ;Aa3rHA;;;;;;;EXUI;EACA;AF0rHJ;AarsHA;EXgBI;AFwrHJ;AEvrHI;EACE;EACA;AFyrHN;Aa5sHA;EAMQ;AbysHR;AaxsHQ;EACE;Ab0sHV;AavsHM;EAGM;IACE;EbusHZ;Ea3sHI;IAOQ;EbusHZ;EatsHY;IACE;EbwsHd;AACF;Aa7tHA;EA8BM;AbksHN;AahuHA;EAoCI;Ab+rHJ;AanuHA;;;EXsGI;AFkoHJ;AaxuHA;;EX2GM;AFioHN;AE3nHI;EACE;EACA;AF6nHN;AahvHA;EXuHM;AF4nHN;AEznHI;;EACE;EACA;EACA;AF4nHN;AazvHA;EXiIM;EACA;AF2nHN;Aa7vHA;EXuII;AFynHJ;AExnHI;EACE;AF0nHN;AanwHA;EXgJQ;AFsnHR;AEpnHM;;EACE;AFunHR;Aa1wHA;EXgEE;EA0FE;EACA;AFonHJ;Aa/wHA;;EX6JM;EACA;EACA;EACA;ECuBI;AHkmHV;AazxHA;EXoKM;EAhGJ;EACA;EACA;EACA;AFytHF;AE1nHM;;EACE;EACA;AF6nHR;AE3nHM;EACE;AF6nHR;AaxyHA;EX+KM;EA3GJ;EACA;EACA;EACA;AFwuHF;AapwHA;EAEI;AbqwHJ;Aa5vHE;;;;EACE;EACA;EACA;AbiwHJ;Aa7vHE;;EACE;EACA;EACA;AbgwHJ;Aa7vHE;;EACE;EACA;AbgwHJ;Aa7vHE;;EACE;EACA;AbgwHJ;Aa3vHA;EACE;Ab6vHF;Aa5vHE;EACE;Ab8vHJ;Aa5vHE;EACE;Ab8vHJ;Aa1vHA;EACE;Ab4vHF;AazvHA;EACE;EACA;EACA;EACA;Eb2vHA,8BAA8B;Ea1vH9B;EACA;EACA;EACA;Eb4vHA,8CAA8C;Ea3vH9C;Eb6vHA,8CAA8C;Ea5vH9C;Eb8vHA,8CAA8C;Ea7vH9C;Eb+vHA,8BAA8B;Ea9vH9B;EbgwHA,8BAA8B;AAChC;Aa/vHA;EACE;AbiwHF;Aa9vHA;EACE;AbgwHF;Aa9vHA;;;EACE;AbkwHF;AahwHC;;;EACC;AbowHF;AajwHA;EACE;AbmwHF;AajwHA;EACE;AbmwHF;AahwHA;;EACE;AbmwHF;AajwHA;EACE;AbmwHF;AACA;;;EAGE;Ac34HF;EZHE;AFi5HF;Ac94HA;EZAI;AFi5HJ;Acj5HA;;;;;;;EZUI;EACA;AFg5HJ;Ac35HA;EZgBI;AF84HJ;AE74HI;EACE;EACA;AF+4HN;Acl6HA;EAMQ;Ad+5HR;Ac95HQ;EACE;Adg6HV;Ac75HM;EAGM;IACE;IACA;Ed65HZ;Ecl6HI;IAQQ;Ed65HZ;Ec55HY;IACE;IACA;Ed85Hd;AACF;Acr7HA;EAgCM;Adw5HN;Acx7HA;EAsCI;Adq5HJ;Ac37HA;;;EZsGI;AF01HJ;Ach8HA;;EZ2GM;AFy1HN;AEn1HI;EACE;EACA;AFq1HN;Acx8HA;EZuHM;AFo1HN;AEj1HI;;EACE;EACA;EACA;AFo1HN;Acj9HA;EZiIM;EACA;AFm1HN;Acr9HA;EZuII;AFi1HJ;AEh1HI;EACE;AFk1HN;Ac39HA;EZgJQ;AF80HR;AE50HM;;EACE;AF+0HR;Acl+HA;EZgEE;EA0FE;EACA;AF40HJ;Acv+HA;;EZ6JM;EACA;EACA;EACA;ECuBI;AH0zHV;Acj/HA;EZoKM;EAhGJ;EACA;EACA;EACA;AFi7HF;AEl1HM;;EACE;EACA;AFq1HR;AEn1HM;EACE;AFq1HR;AchgIA;EZ+KM;EA3GJ;EACA;EACA;EACA;AFg8HF;Ac19HA;EAEI;Ad29HJ;Acv9HA;;EACE;Ad09HF;Acx9HE;;;;EACE;EACA;EACA;Ad69HJ;Acz9HE;;EACE;EACA;EACA;Ad49HJ;Acz9HE;;EACE;EACA;Ad49HJ;Acz9HE;;EACE;EACA;Ad49HJ;AACA;;EAEE;Acv9HF;EACE;Ady9HF;Acp9HE;EACE;Ads9HJ;Acp9HE;EACE;Ads9HJ;Acl9HA;EACE;Ado9HF;Ac98HA;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;Edg9HA,8BAA8B;Ec/8H9B;EACA;EACA;EACA;Edi9HA,8CAA8C;Ech9H9C;Edk9HA,8CAA8C;Ecj9H9C;Edm9HA,8CAA8C;Ecl9H9C;Edo9HA,8BAA8B;Ecn9H9B;Edq9HA,8BAA8B;AAChC;Acn9HA;EACE;Adq9HF;Acj9HA;EACE;EACA;Adm9HF;Acj9HA;EACE;EACA;Adm9HF;Acj9HA;EACE;Adm9HF;Acj9HA;EACE;Adm9HF;Ach9HA;EACE;Adk9HF;Ach9HA;EACE;Adk9HF;Ach9HA;EACE;EACA;Adk9HF;Ach9HA;;EACE;EAEA;EACA;Adm9HF;Ach9HA;EACE;Adk9HF;Ach9HA;EACE;Adk9HF;Ac/8HA;;EACE;Adk9HF;Ac/8HA;EACE;EACA;Adi9HF;Ac98HA;EACE;Adg9HF;Ac98HA;EACE;Adg9HF;Ac98HA;EACE;Adg9HF;Ac98HA;EACE;Adg9HF;Ac78HA;EACE;Ad+8HF;Ac58HA;;EACE;Ad+8HF;Ach9HA;;EAGI;EACA;Adi9HJ;Ac58HA;EACE;Ad88HF;Ac58HA;EACE;Ad88HF;Ac38HA;EACE;Ad68HF;Ac38HA;EACE;Ad68HF;Ac38HA;;EACE;EACA;Ad88HF;Ac58HA;;;EACE;EACA;Adg9HF;Ac98HA;EACE;Adg9HF;Ac78HA;EACE;EACA;Ad+8HF;Ac58HA;;;;EACE;EACA;Adi9HF;Ac/8HA;;;;EACE;Ado9HF;Acl9HA;EACE;Ado9HF;Acl9HA;EACE;Ado9HF;Acl9HA;EACE;Ado9HF;Acl9HA;EACE;Ado9HF;Acl9HA;EACE;EACA;Ado9HF;Acl9HA;;;;;;EACE;Ady9HF;Acv9HA;EACE;EACA;Ady9HF;Acv9HA;EACE;Ady9HF;Acv9HA;EACE;EACA;Ady9HF;Acv9HA;EACE;Ady9HF;Acv9HA;EACE;EACA;Ady9HF;Acv9HA;;;EACE;EACA;Ad29HF;Acz9HA;;;;;;;EACE;Adi+HF;Ac/9HA;EACE;Adi+HF;Ac/9HA;;EACE;EACA;Adk+HF;Ach+HA;;EACE;EACA;Adm+HF;Acj+HA;EACE;Adm+HF;Acj+HA;EACE;EACA;Adm+HF;Acj+HA;;EACE;Ado+HF;Acl+HA;EACE;Ado+HF;Acl+HA;EACE;Ado+HF;Acl+HA;EACE;EACA;Ado+HF;Acl+HA;;EACE;Adq+HF;Acn+HA;EACE;EACA;Adq+HF;Acn+HA;EACE;EACA;Adq+HF;Acn+HA;EACE;EACA;Adq+HF;Acn+HA;EACE;EACA;Adq+HF;Acn+HA;;EACE;EACA;Ads+HF;Acp+HA;EACE;EACA;Ads+HF;Acp+HA;EACE;Ads+HF;Acp+HA;EACE;Ads+HF;Acp+HA;EACE;EACA;Ads+HF;Acp+HA;EACE;EACA;Ads+HF;Acp+HA;EACE;Ads+HF;Acp+HA;EACE;Ads+HF;Acp+HA;;;;EACE;Ady+HF;Acv+HA;;EACE;EACA;Ad0+HF;Acx+HA;EACE;Ad0+HF;Acx+HA;EACE;Ad0+HF;Acx+HA;;;;EACE;Ad6+HF;Ac1+HA;EACE;Ad4+HF;Ac1+HA;;;EACE;EACA;Ad8+HF;Ac3+HA;EACE;Ad6+HF;Ac3+HE;EACE;Ad6+HJ;Ac3+HE;EACE;EACA;Ad6+HJ;Ac3+HE;EACE;Ad6+HJ;Ac1+HA;EACE;Ad4+HF;Ac1+HA;EACE;Ad4+HF;Ac1+HA;EACE;EACA;EACA;EACA;EACA;EAGA;Ad0+HF;Act+HA;EACE;EACA;EACA;EACA;Adw+HF;Acp+HA;EACE;EACA;EACA;EACA;Ads+HF;Acn+HA;EACE;EACA;Adq+HF;Acn+HA;EACE;EACA;Adq+HF;Acl+HA;;EACE;Adq+HF;Acn+HA;EACE;Adq+HF;AACA;;;EAGE;Aet6IF;EbHE;AF46IF;Aez6IA;EbAI;AF46IJ;Ae56IA;;;;;;;EbUI;EACA;AF26IJ;Aet7IA;EbgBI;AFy6IJ;AEx6II;EACE;EACA;AF06IN;Ae77IA;EAMQ;Af07IR;Aez7IQ;EACE;Af27IV;Aex7IM;EAGM;IACE;Efw7IZ;Ee57II;IAOQ;Efw7IZ;Eev7IY;IACE;Efy7Id;AACF;Ae98IA;EA8BM;Afm7IN;Aej9IA;EAoCI;Afg7IJ;Aep9IA;;;EbsGI;AFm3IJ;Aez9IA;;Eb2GM;AFk3IN;AE52II;EACE;EACA;AF82IN;Aej+IA;EbuHM;AF62IN;AE12II;;EACE;EACA;EACA;AF62IN;Ae1+IA;EbiIM;EACA;AF42IN;Ae9+IA;EbuII;AF02IJ;AEz2II;EACE;AF22IN;Aep/IA;EbgJQ;AFu2IR;AEr2IM;;EACE;AFw2IR;Ae3/IA;EbgEE;EA0FE;EACA;AFq2IJ;AehgJA;;Eb6JM;EACA;EACA;EACA;ECuBI;AHm1IV;Ae1gJA;EboKM;EAhGJ;EACA;EACA;EACA;AF08IF;AE32IM;;EACE;EACA;AF82IR;AE52IM;EACE;AF82IR;AezhJA;Eb+KM;EA3GJ;EACA;EACA;EACA;AFy9IF;Aer/IA;EAEI;Afs/IJ;Ae7+IE;;;;EACE;EACA;EACA;Afk/IJ;Ae9+IE;;EACE;EACA;EACA;Afi/IJ;Ae9+IE;;EACE;EACA;Afi/IJ;Ae9+IE;;EACE;EACA;Afi/IJ;Ae5+IA;EACE;Af8+IF;Ae7+IE;EACE;Af++IJ;Ae7+IE;EACE;Af++IJ;Ae3+IA;EACE;Af6+IF;Ae3+IA;EACE;EACA;EACA;EACA;Ef6+IA,8BAA8B;Ee5+I9B;EACA;EACA;Ef8+IA,8CAA8C;Ee7+I9C;Ef++IA,8CAA8C;Ee9+I9C;Efg/IA,8CAA8C;Ee/+I9C;Efi/IA,8BAA8B;Eeh/I9B;Efk/IA,8BAA8B;AAChC;Aeh/IA;;;EACE;Afo/IF;Ael/IC;;;EACC;Afs/IF;Aep/IA;EACE;Afs/IF;Aen/IA;EACE;Afq/IF;Aen/IA;EACE;Afq/IF;Ael/IA;;EACE;Afq/IF;AACA;;;EAGE;AgBrnJF;EdHE;AF2nJF;AgBxnJA;EdAI;AF2nJJ;AgB3nJA;;;;;;;EdUI;EACA;AF0nJJ;AgBroJA;EdgBI;AFwnJJ;AEvnJI;EACE;EACA;AFynJN;AgB5oJA;EAMQ;AhByoJR;AgBxoJQ;EACE;AhB0oJV;AgBvoJM;EAGM;IACE;EhBuoJZ;EgB3oJI;IAOQ;EhBuoJZ;EgBtoJY;IACE;EhBwoJd;AACF;AgB7pJA;EA8BM;AhBkoJN;AgBhqJA;EAoCI;AhB+nJJ;AgBnqJA;;;EdsGI;AFkkJJ;AgBxqJA;;Ed2GM;AFikJN;AE3jJI;EACE;EACA;AF6jJN;AgBhrJA;EduHM;AF4jJN;AEzjJI;;EACE;EACA;EACA;AF4jJN;AgBzrJA;EdiIM;EACA;AF2jJN;AgB7rJA;EduII;AFyjJJ;AExjJI;EACE;AF0jJN;AgBnsJA;EdgJQ;AFsjJR;AEpjJM;;EACE;AFujJR;AgB1sJA;EdgEE;EA0FE;EACA;AFojJJ;AgB/sJA;;Ed6JM;EACA;EACA;EACA;ECuBI;AHkiJV;AgBztJA;EdoKM;EAhGJ;EACA;EACA;EACA;AFypJF;AE1jJM;;EACE;EACA;AF6jJR;AE3jJM;EACE;AF6jJR;AgBxuJA;Ed+KM;EA3GJ;EACA;EACA;EACA;AFwqJF;AgBpsJA;EAEI;EACA;AhBqsJJ;AgB5rJE;;;;EACE;EACA;EACA;AhBisJJ;AgB7rJE;;EACE;EACA;EACA;AhBgsJJ;AgB7rJE;;EACE;EACA;AhBgsJJ;AgB7rJE;;EACE;EACA;AhBgsJJ;AgB7rJA;;;EACE;AhBisJF;AgB/rJC;;;EACC;AhBmsJF;AgBhsJA;EACE;AhBksJF;AgBjsJE;EACE;AhBmsJJ;AgBjsJE;EACE;AhBmsJJ;AgB/rJA;EACE;AhBisJF;AgB9rJA;EACE;EACA;EACA;EACA;EhBgsJA,8BAA8B;EgB/rJ9B;EACA;EACA;EhBisJA,8CAA8C;EgBhsJ9C;EhBksJA,8CAA8C;EgBjsJ9C;EhBmsJA,8CAA8C;EgBlsJ9C;EhBosJA,8BAA8B;EgBnsJ9B;EhBqsJA,8BAA8B;AAChC;AgBnsJA;EACE;AhBqsJF;AgBnsJA;EACE;AhBqsJF;AgBlsJA;;EACE;AhBqsJF;AgBnsJA;;EACE;AhBssJF;AgBpsJA;EACE;AhBssJF;AgBpsJC;EACC;AhBssJF;AgBpsJA;EACE;AhBssJF;AgBpsJA;EACE;AhBssJF;AACA;;;EAGE;AiBl1JF;EAKQ;AjBg1JR;AiB/0JQ;EACE;AjBi1JV;AiB90JM;EAGM;IACE;IACA;EjB80JZ;EiBn1JI;IAQQ;EjB80JZ;EiB70JY;IACE;IACA;EjB+0Jd;AACF;AiBr2JA;EA+BM;AjBy0JN;AiBx2JA;EAqCI;AjBs0JJ;AiB32JA;;;EfsGI;AF0wJJ;AiBh3JA;;Ef2GM;AFywJN;AEnwJI;EACE;EACA;AFqwJN;AiBx3JA;EfuHM;AFowJN;AEjwJI;;EACE;EACA;EACA;AFowJN;AiBj4JA;EfiIM;EACA;AFmwJN;AiBr4JA;EfuII;AFiwJJ;AEhwJI;EACE;AFkwJN;AiB34JA;EfgJQ;AF8vJR;AE5vJM;;EACE;AF+vJR;AiBl5JA;EfgEE;EA0FE;EACA;AF4vJJ;AiBv5JA;;Ef6JM;EACA;EACA;EACA;ECuBI;AH0uJV;AiBj6JA;EfoKM;EAhGJ;EACA;EACA;EACA;AFi2JF;AElwJM;;EACE;EACA;AFqwJR;AEnwJM;EACE;AFqwJR;AiBh7JA;Ef+KM;EA3GJ;EACA;EACA;EACA;AFg3JF;AiBz4JE;;;;EACE;EACA;EACA;AjB84JJ;AiB34JE;;EACE;EACA;EACA;AjB84JJ;AiB34JE;;EACE;EACA;AjB84JJ;AiB34JE;;EACE;EACA;AjB84JJ;AiB34JA;EACE;AjB64JF;AiB34JA;;EACE;AjB84JF;AACA;;EAEE;AiB54JF;EACE;AjB84JF;AiB14JE;EACE;AjB44JJ;AiB14JE;EACE;AjB44JJ;AiB14JE;EACE;AjB44JJ;AiBx4JA;EACE;AjB04JF;AiBp4JA;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EjBs4JA,8BAA8B;EiBr4J9B;EACA;EACA;EjBu4JA,8CAA8C;EiBt4J9C;EjBw4JA,8CAA8C;EiBv4J9C;EjBy4JA,8CAA8C;EiBx4J9C;EjB04JA,8BAA8B;EiBz4J9B;EjB24JA,8BAA8B;AAChC;AiBz4JA;EACE;AjB24JF;AiBx4JA;EACE;EACA;AjB04JF;AiBx4JA;EACE;EACA;EACA;AjB04JF;AiBx4JA;EACE;AjB04JF;AiBx4JA;EACE;AjB04JF;AiBv4JA;EACE;AjBy4JF;AiBv4JA;EACE;AjBy4JF;AiBv4JA;EACE;EACA;AjBy4JF;AiBv4JA;;EACE;EAEA;EACA;AjB04JF;AiBx4JA;EACE;AjB04JF;AiBx4JA;EACE;AjB04JF;AiBx4JA;EACE;AjB04JF;AiBx4JA;;EACE;AjB24JF;AiBz4JA;EACE;AjB24JF;AiBx4JA;EACE;EACA;AjB04JF;AiBv4JA;EACE;AjBy4JF;AiBv4JA;EACE;AjBy4JF;AiBt4JA;;EACE;AjBy4JF;AiB14JA;;EAGI;EACA;AjB24JJ;AiBx4JA;EACE;AjB04JF;AiBv4JA;EACE;AjBy4JF;AiBv4JA;EACE;AjBy4JF;AiBt4JA;EACE;AjBw4JF;AiBt4JA;EACE;AjBw4JF;AiBt4JA;;EACE;EACA;AjBy4JF;AiBv4JA;;;EACE;EACA;AjB24JF;AiBz4JA;EACE;AjB24JF;AiBv4JA;EACE;EACA;AjBy4JF;AiBt4JA;;;;EACE;EACA;AjB24JF;AiBz4JA;;;;EACE;AjB84JF;AiB54JA;EACE;EACA;AjB84JF;AiB54JA;EACE;AjB84JF;AiB54JA;EACE;AjB84JF;AiB54JA;EACE;AjB84JF;AiB54JA;EACE;EACA;AjB84JF;AiB54JA;;;;;;EACE;AjBm5JF;AiBj5JA;EACE;EACA;AjBm5JF;AiBj5JA;EACE;AjBm5JF;AiBj5JA;EACE;EACA;AjBm5JF;AiBj5JA;EACE;EACA;AjBm5JF;AiBj5JA;;;EACE;EACA;AjBq5JF;AiBn5JA;;;;;;;EACE;AjB25JF;AiBz5JA;EACE;AjB25JF;AiBz5JA;;EACE;EACA;AjB45JF;AiB15JA;;EACE;EACA;AjB65JF;AiB35JA;EACE;AjB65JF;AiB35JA;EACE;EACA;AjB65JF;AiB35JA;;EACE;AjB85JF;AiB55JA;EACE;AjB85JF;AiB55JA;EACE;AjB85JF;AiB55JA;EACE;EACA;AjB85JF;AiB55JA;;EACE;AjB+5JF;AiB75JA;EACE;EACA;AjB+5JF;AiB75JA;EACE;EACA;AjB+5JF;AiB75JA;EACE;EACA;AjB+5JF;AiB75JA;EACE;EACA;AjB+5JF;AiB75JA;;EACE;EACA;AjBg6JF;AiB95JA;EACE;EACA;AjBg6JF;AiB95JA;EACE;AjBg6JF;AiB95JA;EACE;AjBg6JF;AiB95JA;EACE;EACA;AjBg6JF;AiB95JA;EACE;EACA;AjBg6JF;AiB95JA;EACE;AjBg6JF;AiB95JA;EACE;AjBg6JF;AiB95JA;EACE;AjBg6JF;AiB95JA;;EACE;EACA;AjBi6JF;AiB/5JA;EACE;AjBi6JF;AiB/5JA;EACE;AjBi6JF;AiB/5JA;EACE;AjBi6JF;AiB/5JA;;;;EACE;AjBo6JF;AiBj6JA;EACE;AjBm6JF;AiBh6JA;EACE;EACA;EACA;EACA;EACA;EAGA;AjBg6JF;AiB75JA;EACE;EACA;EACA;EACA;AjB+5JF;AiB55JA;EACE;EACA;EACA;EACA;AjB85JF;AiB35JA;EACE;EACA;AjB65JF;AiB35JA;EACE;EACA;AjB65JF;AiB15JA;;EACE;AjB65JF;AiB35JA;EACE;AjB65JF","sources":["webpack:///./resources/assets/less/skins/_all-skins.less","webpack:///./resources/assets/less/skins/skin-black.less","webpack:///./resources/assets/less/mixins.less","webpack:///./resources/assets/less/bootstrap-less/mixins/vendor-prefixes.less","webpack:///./resources/assets/less/skins/skin-black-dark.less","webpack:///./resources/assets/less/skins/skin-blue.less","webpack:///./resources/assets/less/skins/skin-blue-dark.less","webpack:///./resources/assets/less/skins/skin-contrast.less","webpack:///./resources/assets/less/skins/skin-green.less","webpack:///./resources/assets/less/skins/skin-green-dark.less","webpack:///./resources/assets/less/skins/skin-orange-dark.less","webpack:///./resources/assets/less/skins/skin-purple.less","webpack:///./resources/assets/less/skins/skin-purple-dark.less","webpack:///./resources/assets/less/skins/skin-red.less","webpack:///./resources/assets/less/skins/skin-red-dark.less","webpack:///./resources/assets/less/skins/skin-orange.less","webpack:///./resources/assets/less/skins/skin-yellow.less","webpack:///./resources/assets/less/skins/skin-yellow-dark.less"],"sourcesContent":["/*\n * Skin: Black\n * ----------\n */\n.skin-black .main-header .navbar {\n  background-color: #111;\n}\n.skin-black .main-header .navbar .nav > li > a {\n  color: #fff;\n}\n.skin-black .main-header .navbar .nav > li > a:hover,\n.skin-black .main-header .navbar .nav > li > a:active,\n.skin-black .main-header .navbar .nav > li > a:focus,\n.skin-black .main-header .navbar .nav .open > a,\n.skin-black .main-header .navbar .nav .open > a:hover,\n.skin-black .main-header .navbar .nav .open > a:focus,\n.skin-black .main-header .navbar .nav > .active > a {\n  background: rgba(0, 0, 0, 0.1);\n  color: #f6f6f6;\n}\n.skin-black .main-header .navbar .sidebar-toggle {\n  color: #fff;\n}\n.skin-black .main-header .navbar .sidebar-toggle:hover {\n  color: #f6f6f6;\n  background: rgba(0, 0, 0, 0.1);\n}\n.skin-black .main-header .navbar .sidebar-toggle {\n  color: #fff;\n}\n.skin-black .main-header .navbar .sidebar-toggle:hover {\n  background-color: #040404;\n}\n@media (max-width: 767px) {\n  .skin-black .main-header .navbar .dropdown-menu li.divider {\n    background-color: rgba(255, 255, 255, 0.1);\n  }\n  .skin-black .main-header .navbar .dropdown-menu li a {\n    color: #333;\n  }\n  .skin-black .main-header .navbar .dropdown-menu li a:hover {\n    background: #040404;\n  }\n}\n.skin-black .main-header li.user-header {\n  background-color: #111;\n}\n.skin-black .content-header {\n  background: transparent;\n}\n.skin-black .wrapper,\n.skin-black .main-sidebar,\n.skin-black .left-side {\n  background-color: #222d32;\n}\n.skin-black .user-panel > .info,\n.skin-black .user-panel > .info > a {\n  color: #fff;\n}\n.skin-black .sidebar-menu > li.header {\n  color: #4b646f;\n  background: #1a2226;\n}\n.skin-black .sidebar-menu > li > a {\n  border-left: 3px solid transparent;\n}\n.skin-black .sidebar-menu > li:hover > a,\n.skin-black .sidebar-menu > li.active > a {\n  color: #fff;\n  background: #1e282c;\n  border-left-color: #111;\n}\n.skin-black .sidebar-menu > li > .treeview-menu {\n  margin: 0 1px;\n  background: #2c3b41;\n}\n.skin-black .sidebar a {\n  color: #b8c7ce;\n}\n.skin-black .sidebar a:hover {\n  text-decoration: none;\n}\n.skin-black .treeview-menu > li > a {\n  color: #8aa4af;\n}\n.skin-black .treeview-menu > li.active > a,\n.skin-black .treeview-menu > li > a:hover {\n  color: #fff;\n}\n.skin-black .sidebar-form {\n  border-radius: 3px;\n  border: 1px solid #374850;\n  margin: 10px 10px;\n}\n.skin-black .sidebar-form input[type=\"text\"],\n.skin-black .sidebar-form .btn {\n  box-shadow: none;\n  background-color: #374850;\n  border: 1px solid transparent;\n  height: 35px;\n  -webkit-transition: all 0.3s ease-in-out;\n  -o-transition: all 0.3s ease-in-out;\n  transition: all 0.3s ease-in-out;\n}\n.skin-black .sidebar-form input[type=\"text\"] {\n  color: #666;\n  border-top-left-radius: 2px;\n  border-top-right-radius: 0;\n  border-bottom-right-radius: 0;\n  border-bottom-left-radius: 2px;\n}\n.skin-black .sidebar-form input[type=\"text\"]:focus,\n.skin-black .sidebar-form input[type=\"text\"]:focus + .input-group-btn .btn {\n  background-color: #fff;\n  color: #666;\n}\n.skin-black .sidebar-form input[type=\"text\"]:focus + .input-group-btn .btn {\n  border-left-color: #fff;\n}\n.skin-black .sidebar-form .btn {\n  color: #999;\n  border-top-left-radius: 0;\n  border-top-right-radius: 2px;\n  border-bottom-right-radius: 2px;\n  border-bottom-left-radius: 0;\n}\n.skin-black.layout-top-nav .main-header > .logo .logo-variant {\n  background-color: none;\n}\n.btn,\n.btn:hover {\n  color: #000;\n}\n.btn.btn-primary,\n.btn:hover.btn-primary,\n.btn .btn-primary:link,\n.btn:hover .btn-primary:link {\n  background-color: #505156;\n  border-color: #FFF;\n  color: #FFF;\n}\n.btna.btn-primary:hover,\n.btn:hovera.btn-primary:hover {\n  background-color: #111;\n  border-color: #1f1f21;\n  color: #fff;\n}\n.btn.btn-white:link,\n.btn:hover.btn-white:link {\n  color: #fff;\n}\n.btn.btn-white:hover,\n.btn:hover.btn-white:hover {\n  color: #fff;\n}\n.btn.btn-white:visited,\n.btn:hover.btn-white:visited {\n  color: #fff;\n}\na {\n  color: var(--link);\n}\na:hover {\n  color: var(--hover-link);\n}\na:visited {\n  color: var(--visited-link);\n}\n.text-primary {\n  color: #000000;\n}\n:root {\n  --button-default: #000000;\n  --button-primary: #000000;\n  --button-hover: #000000;\n  --header: #111;\n  /* Use same as Header picker */\n  --text-main: #BBB;\n  --text-sub: #9b9b9b;\n  --link: #black;\n  /* Use same as Header picker, lighten by 70% */\n  --visited-link: #111;\n  /* Use same as Header picker, lighten by 70% */\n  --hover-link: #999999;\n  /* Use same as Header picker, lighten by 70% */\n  --nav-link: #FFF;\n  /* Use same as Header picker */\n  --light-link: #fff;\n  /* Use same as Header picker */\n}\na.btn-info:link,\na.btn-warning:link,\na.btn-danger:link {\n  color: #FFF;\n}\na.btn-info:visited,\na.btn-warning:visited,\na.btn-danger:visited {\n  color: #FFF;\n}\n.btn-danger.btn-sm.disabled {\n  color: #FFF;\n}\n.far fa-life-ring {\n  color: var(--link);\n}\n.sidebar-toggle-mobile {\n  color: #FFF !important;\n}\n.skin-black .main-header .navbar .nav > li > a,\n.skin-black .main-header .navbar .nav > li > a {\n  text-decoration: none;\n}\n.select2-container--default .select2-selection--multiple .select2-selection__choice {\n  background-color: #111;\n}\n.search-highlight,\n.search-highlight:hover {\n  background-color: #e9d15b;\n}\n/*\n * Skin: black dark\n * ----------\n */\n.skin-black-dark .main-header .navbar {\n  background-color: #111;\n}\n.skin-black-dark .main-header .navbar .nav > li > a {\n  color: #fff;\n}\n.skin-black-dark .main-header .navbar .nav > li > a:hover,\n.skin-black-dark .main-header .navbar .nav > li > a:active,\n.skin-black-dark .main-header .navbar .nav > li > a:focus,\n.skin-black-dark .main-header .navbar .nav .open > a,\n.skin-black-dark .main-header .navbar .nav .open > a:hover,\n.skin-black-dark .main-header .navbar .nav .open > a:focus,\n.skin-black-dark .main-header .navbar .nav > .active > a {\n  background: rgba(0, 0, 0, 0.1);\n  color: #f6f6f6;\n}\n.skin-black-dark .main-header .navbar .sidebar-toggle {\n  color: #fff;\n}\n.skin-black-dark .main-header .navbar .sidebar-toggle:hover {\n  color: #f6f6f6;\n  background: rgba(0, 0, 0, 0.1);\n}\n.skin-black-dark .main-header .navbar .sidebar-toggle {\n  color: #fff;\n}\n.skin-black-dark .main-header .navbar .sidebar-toggle:hover {\n  background-color: #040404;\n}\n@media (max-width: 767px) {\n  .skin-black-dark .main-header .navbar .dropdown-menu li.divider {\n    background-color: rgba(255, 255, 255, 0.1);\n    color: #fff;\n  }\n  .skin-black-dark .main-header .navbar .dropdown-menu li a {\n    color: #333;\n  }\n  .skin-black-dark .main-header .navbar .dropdown-menu li a:hover {\n    background: #040404;\n    color: #fff;\n  }\n}\n@media (max-width: 991px) {\n  .skin-black-dark .main-header .navbar-custom-menu > .navbar-nav > li > .dropdown-menu {\n    background-color: var(--back-sub);\n  }\n}\n.skin-black-dark .main-header li.user-header {\n  background-color: #111;\n}\n.skin-black-dark .content-header {\n  background: transparent;\n}\n.skin-black-dark .wrapper,\n.skin-black-dark .main-sidebar,\n.skin-black-dark .left-side {\n  background-color: #222d32;\n}\n.skin-black-dark .user-panel > .info,\n.skin-black-dark .user-panel > .info > a {\n  color: #fff;\n}\n.skin-black-dark .sidebar-menu > li.header {\n  color: #4b646f;\n  background: #1a2226;\n}\n.skin-black-dark .sidebar-menu > li > a {\n  border-left: 3px solid transparent;\n}\n.skin-black-dark .sidebar-menu > li:hover > a,\n.skin-black-dark .sidebar-menu > li.active > a {\n  color: #fff;\n  background: #1e282c;\n  border-left-color: #111;\n}\n.skin-black-dark .sidebar-menu > li > .treeview-menu {\n  margin: 0 1px;\n  background: #2c3b41;\n}\n.skin-black-dark .sidebar a {\n  color: #b8c7ce;\n}\n.skin-black-dark .sidebar a:hover {\n  text-decoration: none;\n}\n.skin-black-dark .treeview-menu > li > a {\n  color: #8aa4af;\n}\n.skin-black-dark .treeview-menu > li.active > a,\n.skin-black-dark .treeview-menu > li > a:hover {\n  color: #fff;\n}\n.skin-black-dark .sidebar-form {\n  border-radius: 3px;\n  border: 1px solid #374850;\n  margin: 10px 10px;\n}\n.skin-black-dark .sidebar-form input[type=\"text\"],\n.skin-black-dark .sidebar-form .btn {\n  box-shadow: none;\n  background-color: #374850;\n  border: 1px solid transparent;\n  height: 35px;\n  -webkit-transition: all 0.3s ease-in-out;\n  -o-transition: all 0.3s ease-in-out;\n  transition: all 0.3s ease-in-out;\n}\n.skin-black-dark .sidebar-form input[type=\"text\"] {\n  color: #666;\n  border-top-left-radius: 2px;\n  border-top-right-radius: 0;\n  border-bottom-right-radius: 0;\n  border-bottom-left-radius: 2px;\n}\n.skin-black-dark .sidebar-form input[type=\"text\"]:focus,\n.skin-black-dark .sidebar-form input[type=\"text\"]:focus + .input-group-btn .btn {\n  background-color: #fff;\n  color: #666;\n}\n.skin-black-dark .sidebar-form input[type=\"text\"]:focus + .input-group-btn .btn {\n  border-left-color: #fff;\n}\n.skin-black-dark .sidebar-form .btn {\n  color: #999;\n  border-top-left-radius: 0;\n  border-top-right-radius: 2px;\n  border-bottom-right-radius: 2px;\n  border-bottom-left-radius: 0;\n}\n.skin-black-dark.layout-top-nav .main-header > .logo .logo-variant {\n  background-color: none;\n}\n.btn,\n.btn:hover {\n  color: #fff;\n}\n.btn.btn-primary,\n.btn:hover.btn-primary,\n.btn .btn-primary:link,\n.btn:hover .btn-primary:link {\n  background-color: #000000;\n  border-color: #FFF;\n  color: #fff;\n}\n.btna.btn-primary:hover,\n.btn:hovera.btn-primary:hover {\n  background-color: #000000;\n  border-color: #000000;\n  color: #fff;\n}\n.btn.btn-white:link,\n.btn:hover.btn-white:link {\n  background-color: #000000;\n  color: #fff;\n}\n.btn.btn-white:hover,\n.btn:hover.btn-white:hover {\n  background-color: #000000;\n  color: #fff;\n}\n/**\nThe dropdown is white, so use a darker color\n */\nli.dropdown-item-marker {\n  color: var(--button-primary);\n}\na:hover {\n  color: #fff;\n}\na:visited {\n  color: #fff;\n}\n.text-primary {\n  color: #fff;\n}\n:root {\n  --background: #222;\n  --back-main: #333;\n  --back-sub: #3d4144;\n  --back-sub-alt: rgba(0, 0, 0, 0.36);\n  --button-default: #000000;\n  --button-primary: #000000;\n  --button-hover: #000000;\n  --header: #111;\n  /* Use same as Header picker */\n  --text-main: #fff;\n  --text-sub: #9b9b9b;\n  --link: #fff;\n  /* Use same as Header picker, lighten by 70% */\n  --visited-link: #fff;\n  /* Use same as Header picker, lighten by 70% */\n  --hover-link: #949494;\n  /* Use same as Header picker, lighten by 70% */\n  --nav-link: #FFF;\n  /* Use same as Header picker */\n  --light-link: #fff;\n  /* Use same as Header picker */\n}\n#ldapad_test_results.well.well-sm {\n  color: var(--back-main);\n}\na.actions {\n  color: #fff !important;\n}\n.pagination > li > a {\n  color: var(--light-link);\n  background-color: var(--back-main);\n}\n.pagination > .active > a {\n  background-color: var(--visited-link);\n  border-color: var(--light-link);\n}\n.pagination > .active > a:hover {\n  background-color: var(--hover-link);\n}\n.tasks-menu > .dropdown-menu > li .menu > li > a:hover .progress {\n  background-color: var(--background);\n}\na:hover > h2.task_menu {\n  color: var(--header);\n}\nh2.task_menu {\n  color: var(--link);\n}\n.navbar-custom-menu > .navbar-nav > li > .dropdown-menu {\n  background-color: var(--back-main);\n  color: var(--link);\n}\n.navbar-custom-menu > .navbar-nav > li > .dropdown-menu > li.header {\n  background-color: var(--header);\n  color: var(--link);\n}\n.main-header .navbar,\n.main-header .logo {\n  background-color: var(--header);\n  background: -webkit-linear-gradient(top, var(--header) 0%, var(--header) 100%);\n  background: linear-gradient(to bottom, var(--header) 0%, var(--header) 100%);\n  border-color: var(--header);\n}\n.bootstrap-table .fixed-table-container .table thead th .sortable {\n  color: var(--nav-link);\n}\n.bootstrap-table .fixed-table-toolbar .columns label {\n  color: #000;\n}\n.thead,\n.navbar-nav > li > a:link {\n  color: var(--nav-link);\n}\n.far fa-life-ring {\n  color: var(--link);\n}\n.modal-content {\n  background-color: var(--back-main);\n  color: var(--text-main);\n}\n.btn-primary.hover {\n  color: var(--nav-link);\n}\n.small-box h3,\n.small-box p {\n  color: var(--nav-link) !important;\n}\n.small-box h3 a:hover,\n.small-box p a:hover {\n  text-decoration: none;\n  color: var(--nav-link) !important;\n}\na:link.btn-default {\n  color: var(--nav-link);\n}\n/* Trying to figure out a way of having links different shades based on what row they are on (even/odd).\na unique challenge for this dark mode skin.\nProbably writing the specificity for this incorrectly. --Godfrey Martinez 02/04/21\n\n.table-striped>tbody>tr:nth-of-type(even)>a:link{\n  color:#000d07;\n}\n.table-striped>tbody>tr:nth-of-type(odd)>a:link{\n  color:#bfbfbf;\n\n}*/\n#accessoriesTable > tbody > tr > td > nobr > a > i.fa {\n  color: var(--text-main);\n}\n#assetsListingTable > tbody > tr > td > nobr > a > i.fa {\n  color: var(--text-main);\n}\n#assetsListingTable > tbody > tr.selected > td {\n  background-color: var(--back-main);\n}\nbody {\n  color: var(--text-main);\n}\n.box,\n.box.box-default {\n  border-top: 3px solid var(--header);\n  border-top-color: var(--header);\n}\n.box-body,\n.box-footer,\n.box-header {\n  background-color: var(--back-sub);\n  color: var(--header);\n}\n.btn-default {\n  background-color: var(--button-default);\n  color: var(--nav-link);\n}\n.btn-default dropdown-toggle {\n  background-color: var(--button-default);\n  color: var(--nav-link);\n}\n.btn-default:active,\n.btn-default:focus,\n.btn-default:hover,\n.btn-default.active {\n  background-color: var(--button-hover);\n  color: var(--nav-link);\n}\n.btn-primary,\n.btn-primary.hover,\n.btn-primary:active,\n.text-black {\n  color: var(--nav-link) !important;\n}\n.btn-primary:hover {\n  background-color: var(--button-primary);\n  color: var(--link) !important;\n}\n#componentsTable > tbody > tr > td > nobr > a > i.fa {\n  color: var(--text-main);\n}\n#consumablesTable > tbody > tr > td > nobr > a > i.fa {\n  color: var(--text-main);\n}\n.content-wrapper {\n  background-color: var(--background);\n}\n#create-form > div > div > div > span > i.fa {\n  background-color: var(--back-sub);\n  color: var(--header);\n}\n.datepicker .datepicker-switch:hover,\n.datepicker .next:hover,\n.datepicker .prev:hover,\n.datepicker tfoot tr th:hover,\n.datepicker table tr td.day.focused,\n.datepicker table tr td.day:hover {\n  background-color: var(--header);\n}\n.datepicker.dropdown-menu {\n  background-color: var(--back-main);\n  color: var(--text-main);\n}\n#details > div > div > div > table {\n  background-color: transparent;\n}\n.dropdown-menu > li > a:hover {\n  background-color: var(--back-main);\n  color: var(--nav-link);\n}\n.form-control {\n  background-color: var(--back-main);\n  color: var(--text-main);\n}\n.form-control[disabled],\n.form-control[readonly],\nfieldset[disabled] .form-control {\n  background-color: var(--back-main);\n  color: var(--text-main);\n}\nh1,\nh2,\nh3,\nh4,\nh5,\nh6,\np {\n  color: var(--text-main);\n}\n.help-block {\n  color: var(--text-sub);\n}\ninput[type=text],\ninput[type=search] {\n  background-color: var(--back-sub);\n  color: var(--text-main);\n}\n.search-highlight,\n.search-highlight:hover {\n  background-color: var(--back-sub) !important;\n}\n.input-group,\n.input-group-addon {\n  background-color: var(--back-sub);\n  color: var(--text-main);\n}\n#licensesTable > tbody > tr > td > nobr > a > i.fa {\n  color: var(--text-main);\n}\n.main-footer {\n  background-color: var(--back-main);\n  color: var(--text-main);\n}\n.nav-tabs-custom > .nav-tabs > li > a,\n.nav-tabs-custom > .nav-tabs > li.active > a {\n  color: var(--text-main);\n}\n.nav-tabs-custom > .nav-tabs > li.active {\n  border-top-color: var(--header);\n}\n.nav-tabs-custom > .nav-tabs > li.active > a {\n  background-color: var(--back-main);\n}\n.nav-tabs-custom > .nav-tabs > li.active > a:hover {\n  background-color: var(--back-sub);\n  color: var(--text-main);\n}\n.nav-tabs-custom,\n.nav-tabs-custom > .tab-content {\n  background-color: var(--back-main);\n}\n.navbar-nav > .tasks-menu > .dropdown-menu > li.header {\n  background-color: var(--back-main);\n  color: var(--header);\n}\n.open > .dropdown-toggle.btn-default {\n  background-color: var(--back-sub);\n  color: var(--header);\n}\n.panel {\n  background-color: var(--back-sub);\n  color: var(--text-main);\n}\n.panel-default > .panel-heading {\n  background-color: var(--back-main);\n  color: var(--header);\n}\n.select2-container--default .select2-results__option[aria-selected=true],\n.select2-container--default .select2-results__option[aria-selected=true]:hover {\n  background-color: var(--back-sub);\n  color: var(--nav-link);\n}\n.select2-container--default .select2-results__option--highlighted[aria-selected] {\n  background-color: var(--back-sub);\n  color: var(--visited-link);\n}\n.select2-container--default .select2-selection--single .select2-selection__rendered {\n  color: var(--text-main);\n}\n.select2-container--default .select2-selection--multiple .select2-selection__choice {\n  background-color: var(--header);\n}\n.select2-selection--single {\n  background-color: var(--back-sub) !important;\n  color: var(--text-main) !important;\n}\n.select2-dropdown {\n  background-color: var(--back-main);\n  color: var(--text-main);\n}\n.skin-black-dark .main-header .navbar .dropdown-menu li a {\n  color: #FFFFFF;\n}\n.skin-black-dark .main-header .navbar .dropdown-menu li a:hover {\n  background-color: #000000;\n}\n.fixed-table-body thead th .th-inner,\n.skin-black-dark .sidebar-menu > li.active > a,\n.skin-black .sidebar-menu > li:hover > a,\n.sidebar-toggle:hover {\n  background-color: var(--header) !important;\n}\n.tab-content,\n.tab-pane {\n  background-color: var(--back-main);\n  color: var(--text-main);\n}\n.table-striped > tbody > tr:nth-of-type(odd) {\n  background-color: var(--back-sub);\n  color: var(--text-main);\n}\n.table-striped > tbody > tr:nth-of-type(even) {\n  background-color: var(--back-sub-alt);\n  color: var(--text-main);\n}\n.row-new-striped > .row:nth-of-type(odd) {\n  background-color: var(--back-sub);\n  color: var(--text-main);\n}\n.row-new-striped > .row:nth-of-type(even) {\n  background-color: var(--back-sub-alt);\n  color: var(--text-main);\n}\n#webui > div > div > div > div > div > table > tbody > tr > td > a > i.fa,\n.box-body,\n.box-footer,\n.box-header {\n  color: var(--text-main);\n}\n.box-header.with-border {\n  border-bottom: #000;\n}\na {\n  color: var(--link);\n}\na:link {\n  color: var(--link);\n}\na:hover {\n  color: var(--hover-link);\n  text-decoration: underline;\n}\n.row-striped {\n  vertical-align: top;\n  line-height: 2.6;\n  padding: 0px;\n  margin-left: 20px;\n  box-sizing: border-box;\n  display: table;\n}\n.row-striped .row:nth-of-type(odd) div {\n  background-color: var(--back-sub);\n  color: var(--text-main);\n  border-top: 1px solid #dddddd;\n  display: table-cell;\n}\n.row-striped .row:nth-of-type(even) div {\n  background-color: var(--back-sub);\n  color: var(--text-main);\n  border-top: 1px solid #dddddd;\n  display: table-cell;\n}\n.search-highlight,\n.search-highlight:hover {\n  background-color: #e9d15b;\n}\ndiv.container.row-new-striped {\n  background-color: var(--back-sub);\n}\n.table > thead > tr > td.danger,\n.table > tbody > tr > td.danger,\n.table > tfoot > tr > td.danger,\n.table > thead > tr > th.danger,\n.table > tbody > tr > th.danger,\n.table > tfoot > tr > th.danger,\n.table > thead > tr.danger > td,\n.table > tbody > tr.danger > td,\n.table > tfoot > tr.danger > td,\n.table > thead > tr.danger > th,\n.table > tbody > tr.danger > th,\n.table > tfoot > tr.danger > th {\n  background-color: var(--back-sub);\n}\n.table > tbody > tr.warning > td {\n  background-color: var(--back-sub);\n}\n/*\n * Skin: Blue\n * ----------\n */\n.skin-blue .main-header .navbar {\n  background-color: #3c8dbc;\n}\n.skin-blue .main-header .navbar .nav > li > a {\n  color: #fff;\n}\n.skin-blue .main-header .navbar .nav > li > a:hover,\n.skin-blue .main-header .navbar .nav > li > a:active,\n.skin-blue .main-header .navbar .nav > li > a:focus,\n.skin-blue .main-header .navbar .nav .open > a,\n.skin-blue .main-header .navbar .nav .open > a:hover,\n.skin-blue .main-header .navbar .nav .open > a:focus,\n.skin-blue .main-header .navbar .nav > .active > a {\n  background: rgba(0, 0, 0, 0.1);\n  color: #f6f6f6;\n}\n.skin-blue .main-header .navbar .sidebar-toggle {\n  color: #fff;\n}\n.skin-blue .main-header .navbar .sidebar-toggle:hover {\n  color: #f6f6f6;\n  background: rgba(0, 0, 0, 0.1);\n}\n.skin-blue .main-header .navbar .sidebar-toggle {\n  color: #fff;\n}\n.skin-blue .main-header .navbar .sidebar-toggle:hover {\n  background-color: #367fa9;\n}\n@media (max-width: 767px) {\n  .skin-blue .main-header .navbar .dropdown-menu li.divider {\n    background-color: rgba(255, 255, 255, 0.1);\n  }\n  .skin-blue .main-header .navbar .dropdown-menu li a {\n    color: #333;\n  }\n  .skin-blue .main-header .navbar .dropdown-menu li a:hover {\n    background: #367fa9;\n  }\n}\n.skin-blue .main-header li.user-header {\n  background-color: #3c8dbc;\n}\n.skin-blue .content-header {\n  background: transparent;\n}\n.skin-blue .wrapper,\n.skin-blue .main-sidebar,\n.skin-blue .left-side {\n  background-color: #222d32;\n}\n.skin-blue .user-panel > .info,\n.skin-blue .user-panel > .info > a {\n  color: #fff;\n}\n.skin-blue .sidebar-menu > li.header {\n  color: #4b646f;\n  background: #1a2226;\n}\n.skin-blue .sidebar-menu > li > a {\n  border-left: 3px solid transparent;\n}\n.skin-blue .sidebar-menu > li:hover > a,\n.skin-blue .sidebar-menu > li.active > a {\n  color: #fff;\n  background: #1e282c;\n  border-left-color: #3c8dbc;\n}\n.skin-blue .sidebar-menu > li > .treeview-menu {\n  margin: 0 1px;\n  background: #2c3b41;\n}\n.skin-blue .sidebar a {\n  color: #b8c7ce;\n}\n.skin-blue .sidebar a:hover {\n  text-decoration: none;\n}\n.skin-blue .treeview-menu > li > a {\n  color: #8aa4af;\n}\n.skin-blue .treeview-menu > li.active > a,\n.skin-blue .treeview-menu > li > a:hover {\n  color: #fff;\n}\n.skin-blue .sidebar-form {\n  border-radius: 3px;\n  border: 1px solid #374850;\n  margin: 10px 10px;\n}\n.skin-blue .sidebar-form input[type=\"text\"],\n.skin-blue .sidebar-form .btn {\n  box-shadow: none;\n  background-color: #374850;\n  border: 1px solid transparent;\n  height: 35px;\n  -webkit-transition: all 0.3s ease-in-out;\n  -o-transition: all 0.3s ease-in-out;\n  transition: all 0.3s ease-in-out;\n}\n.skin-blue .sidebar-form input[type=\"text\"] {\n  color: #666;\n  border-top-left-radius: 2px;\n  border-top-right-radius: 0;\n  border-bottom-right-radius: 0;\n  border-bottom-left-radius: 2px;\n}\n.skin-blue .sidebar-form input[type=\"text\"]:focus,\n.skin-blue .sidebar-form input[type=\"text\"]:focus + .input-group-btn .btn {\n  background-color: #fff;\n  color: #666;\n}\n.skin-blue .sidebar-form input[type=\"text\"]:focus + .input-group-btn .btn {\n  border-left-color: #fff;\n}\n.skin-blue .sidebar-form .btn {\n  color: #999;\n  border-top-left-radius: 0;\n  border-top-right-radius: 2px;\n  border-bottom-right-radius: 2px;\n  border-bottom-left-radius: 0;\n}\n.skin-blue.layout-top-nav .main-header > .logo .logo-variant {\n  background-color: unset;\n}\n.btn.btn-primary,\nbtn-sm.btn-primary,\n.btn:hover.btn-primary,\n.btn .btn-primary:link,\nbtn-sm .btn-primary:link,\n.btn:hover .btn-primary:link {\n  background-color: #307095;\n  border-color: #23536f;\n  color: #fff !important;\n}\n.btna.btn-primary:hover,\nbtn-sma.btn-primary:hover,\n.btn:hovera.btn-primary:hover {\n  background-color: #23536f;\n  border-color: #23536f;\n  color: #fff;\n}\n.btn.btn-white:link,\nbtn-sm.btn-white:link,\n.btn:hover.btn-white:link {\n  background-color: #307095;\n  color: #fff;\n}\n.btn.btn-white:hover,\nbtn-sm.btn-white:hover,\n.btn:hover.btn-white:hover {\n  background-color: #173648;\n  color: #fff;\n}\n.btn.btn-white:visited,\nbtn-sm.btn-white:visited,\n.btn:hover.btn-white:visited {\n  background-color: #173648;\n  color: #fff;\n}\n.btn-warning,\n.btn-warning:link,\na.btn-warning:hover,\n.btn-warning:link,\n.btn-warning:visited,\n.btn-danger,\n.btn-danger:link,\na.btn-danger:hover,\n.btn-danger:link,\n.btn-danger:visited {\n  color: #fff;\n}\n.btn-default:link,\na.btn-default:hover,\n.btn-default:visited {\n  color: #505156;\n}\n:root {\n  --button-default: #505156;\n  --button-primary: #1d455b;\n  --button-hover: #173648;\n  --header: #3c8dbc;\n  /* Use same as Header picker */\n  --text-main: #BBB;\n  --text-sub: #9b9b9b;\n  --link: #296282;\n  /* Use same as Header picker, lighten by 70% */\n  --visited-link: #5fa4cc;\n  /* Use same as Header picker, lighten by 70% */\n  --hover-link: #86bad8;\n  /* Use same as Header picker, lighten by 70% */\n  --nav-link: #FFF;\n  /* Use same as Header picker */\n  --light-link: #fff;\n  /* Use same as Header picker */\n}\na.btn-info:link,\na.btn-warning:link,\na.btn-danger:link {\n  color: #FFF;\n}\na.btn-info:visited,\na.btn-warning:visited,\na.btn-danger:visited {\n  color: #FFF;\n}\na:link {\n  color: var(--link);\n}\na:visited {\n  color: var(--visited-link);\n}\na:hover {\n  color: var(--hover-link);\n}\n.text-primary {\n  color: #23536f;\n}\n.far fa-life-ring {\n  color: var(--link);\n}\n.fixed-table-container tbody .selected td {\n  background-color: #fff8af;\n}\n.select2-container--default .select2-selection--multiple .select2-selection__choice {\n  background-color: #3c8dbc;\n}\n.search-highlight,\n.search-highlight:hover {\n  background-color: #e9d15b;\n}\na.settings_button:link,\na.settings_button:visited,\na.settings_button:hover {\n  color: #3c8dbc;\n}\n/*\n * Skin: blue dark\n * ----------\n */\n.skin-blue-dark .main-header .navbar {\n  background-color: #3c8dbc;\n}\n.skin-blue-dark .main-header .navbar .nav > li > a {\n  color: #fff;\n}\n.skin-blue-dark .main-header .navbar .nav > li > a:hover,\n.skin-blue-dark .main-header .navbar .nav > li > a:active,\n.skin-blue-dark .main-header .navbar .nav > li > a:focus,\n.skin-blue-dark .main-header .navbar .nav .open > a,\n.skin-blue-dark .main-header .navbar .nav .open > a:hover,\n.skin-blue-dark .main-header .navbar .nav .open > a:focus,\n.skin-blue-dark .main-header .navbar .nav > .active > a {\n  background: rgba(0, 0, 0, 0.1);\n  color: #f6f6f6;\n}\n.skin-blue-dark .main-header .navbar .sidebar-toggle {\n  color: #fff;\n}\n.skin-blue-dark .main-header .navbar .sidebar-toggle:hover {\n  color: #f6f6f6;\n  background: rgba(0, 0, 0, 0.1);\n}\n.skin-blue-dark .main-header .navbar .sidebar-toggle {\n  color: #fff;\n}\n.skin-blue-dark .main-header .navbar .sidebar-toggle:hover {\n  background-color: #367fa9;\n}\n@media (max-width: 767px) {\n  .skin-blue-dark .main-header .navbar .dropdown-menu li.divider {\n    background-color: rgba(255, 255, 255, 0.1);\n    color: #fff;\n  }\n  .skin-blue-dark .main-header .navbar .dropdown-menu li a {\n    color: #fff;\n  }\n  .skin-blue-dark .main-header .navbar .dropdown-menu li a:hover {\n    background: #367fa9;\n    color: #fff;\n  }\n}\n.skin-blue-dark .main-header li.user-header {\n  background-color: #3c8dbc;\n}\n.skin-blue-dark .content-header {\n  background: transparent;\n}\n.skin-blue-dark .wrapper,\n.skin-blue-dark .main-sidebar,\n.skin-blue-dark .left-side {\n  background-color: #222d32;\n}\n.skin-blue-dark .user-panel > .info,\n.skin-blue-dark .user-panel > .info > a {\n  color: #fff;\n}\n.skin-blue-dark .sidebar-menu > li.header {\n  color: #4b646f;\n  background: #1a2226;\n}\n.skin-blue-dark .sidebar-menu > li > a {\n  border-left: 3px solid transparent;\n}\n.skin-blue-dark .sidebar-menu > li:hover > a,\n.skin-blue-dark .sidebar-menu > li.active > a {\n  color: #fff;\n  background: #1e282c;\n  border-left-color: #3c8dbc;\n}\n.skin-blue-dark .sidebar-menu > li > .treeview-menu {\n  margin: 0 1px;\n  background: #2c3b41;\n}\n.skin-blue-dark .sidebar a {\n  color: #b8c7ce;\n}\n.skin-blue-dark .sidebar a:hover {\n  text-decoration: none;\n}\n.skin-blue-dark .treeview-menu > li > a {\n  color: #8aa4af;\n}\n.skin-blue-dark .treeview-menu > li.active > a,\n.skin-blue-dark .treeview-menu > li > a:hover {\n  color: #fff;\n}\n.skin-blue-dark .sidebar-form {\n  border-radius: 3px;\n  border: 1px solid #374850;\n  margin: 10px 10px;\n}\n.skin-blue-dark .sidebar-form input[type=\"text\"],\n.skin-blue-dark .sidebar-form .btn {\n  box-shadow: none;\n  background-color: #374850;\n  border: 1px solid transparent;\n  height: 35px;\n  -webkit-transition: all 0.3s ease-in-out;\n  -o-transition: all 0.3s ease-in-out;\n  transition: all 0.3s ease-in-out;\n}\n.skin-blue-dark .sidebar-form input[type=\"text\"] {\n  color: #666;\n  border-top-left-radius: 2px;\n  border-top-right-radius: 0;\n  border-bottom-right-radius: 0;\n  border-bottom-left-radius: 2px;\n}\n.skin-blue-dark .sidebar-form input[type=\"text\"]:focus,\n.skin-blue-dark .sidebar-form input[type=\"text\"]:focus + .input-group-btn .btn {\n  background-color: #fff;\n  color: #666;\n}\n.skin-blue-dark .sidebar-form input[type=\"text\"]:focus + .input-group-btn .btn {\n  border-left-color: #fff;\n}\n.skin-blue-dark .sidebar-form .btn {\n  color: #999;\n  border-top-left-radius: 0;\n  border-top-right-radius: 2px;\n  border-bottom-right-radius: 2px;\n  border-bottom-left-radius: 0;\n}\n.skin-blue-dark.layout-top-nav .main-header > .logo .logo-variant {\n  background-color: none;\n}\n.btn,\n.btn:hover {\n  color: #fff !important;\n}\n.btn.btn-primary,\n.btn:hover.btn-primary,\n.btn .btn-primary:link,\n.btn:hover .btn-primary:link {\n  background-color: #307095;\n  border-color: #FFF;\n  color: #FFF;\n}\n.btna.btn-primary:hover,\n.btn:hovera.btn-primary:hover {\n  background-color: #23536f;\n  border-color: #23536f;\n  color: #fff;\n}\n.btn.btn-white:link,\n.btn:hover.btn-white:link {\n  background-color: #307095;\n  color: #fff;\n}\n.btn.btn-white:hover,\n.btn:hover.btn-white:hover {\n  background-color: #173648;\n  color: #fff;\n}\n/**\nThe dropdown is white, so use a darker color\n */\nli.dropdown-item-marker {\n  color: var(--button-primary);\n}\na:hover {\n  color: var(--hover-link);\n}\na:visited {\n  color: var(--visited-link);\n}\n.text-primary {\n  color: #fff;\n}\n:root {\n  --background: #222;\n  --back-main: #333;\n  --back-sub: #272727;\n  --back-sub-alt: rgba(0, 0, 0, 0.36);\n  --button-default: #296282;\n  --button-primary: #1d455b;\n  --button-hover: #173648;\n  --header: #3c8dbc;\n  /* Use same as Header picker */\n  --text-main: #BBB;\n  --text-sub: #9b9b9b;\n  --link: #00BFFF;\n  /* Use same as Header picker, lighten by 70% */\n  --visited-link: #4dd2ff;\n  /* Use same as Header picker, lighten by 70% */\n  --hover-link: #99e5ff;\n  /* Use same as Header picker, lighten by 70% */\n  --nav-link: #FFF;\n  /* Use same as Header picker */\n  --light-link: #fff;\n  /* Use same as Header picker */\n}\n#ldapad_test_results.well.well-sm {\n  color: var(--back-main);\n}\na.actions {\n  color: #fff !important;\n}\n.pagination > li > a {\n  color: var(--light-link);\n  background-color: var(--back-main);\n}\n.pagination > .active > a {\n  background-color: var(--visited-link);\n  border-color: var(--light-link);\n}\n.pagination > .active > a:hover {\n  background-color: var(--hover-link);\n}\n.tasks-menu > .dropdown-menu > li .menu {\n  background-color: var(--back-main);\n}\n.tasks-menu > .dropdown-menu > li .menu > li > a:hover .progress {\n  background-color: var(--background);\n}\nh2.task_menu {\n  color: var(--link);\n}\n.navbar-custom-menu > .navbar-nav > li > .dropdown-menu {\n  background-color: var(--back-main);\n  color: var(--link);\n}\n.main-header .navbar,\n.main-header .logo {\n  background-color: var(--header);\n  background: -webkit-linear-gradient(top, var(--header) 0%, var(--header) 100%);\n  background: linear-gradient(to bottom, var(--header) 0%, var(--header) 100%);\n  border-color: var(--header);\n}\n.bootstrap-table .fixed-table-container .table thead th .sortable {\n  color: var(--nav-link);\n}\n.bootstrap-table .fixed-table-toolbar .columns label {\n  color: #000;\n}\n.thead,\n.navbar-nav > li > a:link {\n  color: var(--nav-link);\n}\n.far fa-life-ring {\n  color: var(--link);\n}\n.modal-content {\n  background-color: var(--back-main);\n  color: var(--text-main);\n}\na:link {\n  color: var(--link);\n}\n.btn-primary.hover {\n  color: var(--nav-link);\n}\n.bootstrap-table .fixed-table-toolbar .columns label {\n  color: #000;\n}\n.small-box h3,\n.small-box p {\n  color: var(--nav-link) !important;\n}\n.small-box h3 a:hover,\n.small-box p a:hover {\n  text-decoration: none;\n  color: var(--nav-link) !important;\n}\n#accessoriesTable > tbody > tr > td > nobr > a > i.fa {\n  color: var(--text-main);\n}\n#assetsListingTable > tbody > tr > td > nobr > a > i.fa {\n  color: var(--text-main);\n}\n#assetsListingTable > tbody > tr.selected > td {\n  background-color: var(--back-main);\n}\nbody {\n  color: var(--text-main);\n}\n.box,\n.box.box-default {\n  border-top: 3px solid var(--header);\n  border-top-color: var(--header);\n}\n.box-body,\n.box-footer,\n.box-header {\n  background-color: var(--back-sub);\n  color: var(--header);\n}\n.btn-default {\n  background-color: var(--button-default);\n  color: var(--link);\n}\n.btn-default dropdown-toggle {\n  background-color: var(--button-default);\n  color: var(--link);\n}\n.btn-default:active,\n.btn-default:focus,\n.btn-default:hover,\n.btn-default.active {\n  background-color: var(--button-hover);\n  color: var(--link);\n}\n.btn-primary,\n.btn-primary.hover,\n.btn-primary:active,\n.text-blue {\n  color: var(--text-main);\n}\n.btn-primary:hover {\n  background-color: var(--button-primary);\n}\n#componentsTable > tbody > tr > td > nobr > a > i.fa {\n  color: var(--text-main);\n}\n#consumablesTable > tbody > tr > td > nobr > a > i.fa {\n  color: var(--text-main);\n}\n.content-wrapper {\n  background-color: var(--background);\n}\n#create-form > div > div > div > span > i.fa {\n  background-color: var(--back-sub);\n  color: var(--header);\n}\n.datepicker .datepicker-switch:hover,\n.datepicker .next:hover,\n.datepicker .prev:hover,\n.datepicker tfoot tr th:hover,\n.datepicker table tr td.day.focused,\n.datepicker table tr td.day:hover {\n  background-color: var(--header);\n}\n.datepicker.dropdown-menu {\n  background-color: var(--back-main);\n  color: var(--text-main);\n}\n#details > div > div > div > table {\n  background-color: transparent;\n}\n.dropdown-menu > li > a:hover {\n  background-color: var(--back-main);\n  color: var(--nav-link);\n}\n.fixed-table-body thead th .th-inner {\n  color: var(--nav-link);\n}\n.form-control {\n  background-color: var(--back-main);\n  color: var(--text-main);\n}\n.form-control[disabled],\n.form-control[readonly],\nfieldset[disabled] .form-control {\n  background-color: var(--back-main);\n  color: var(--text-main);\n}\nh1,\nh2,\nh3,\nh4,\nh5,\nh6,\np {\n  color: var(--text-main);\n}\n.help-block {\n  color: var(--text-sub);\n}\ninput[type=text],\ninput[type=search] {\n  background-color: var(--back-sub);\n  color: var(--text-main);\n}\n.input-group,\n.input-group-addon {\n  background-color: var(--back-sub) !important;\n  color: var(--text-main);\n}\n#licensesTable > tbody > tr > td > nobr > a > i.fa {\n  color: var(--text-main);\n}\n.main-footer {\n  background-color: var(--back-main);\n  color: var(--text-main);\n}\n.nav-tabs-custom > .nav-tabs > li > a,\n.nav-tabs-custom > .nav-tabs > li.active > a {\n  color: var(--text-main);\n}\n.nav-tabs-custom > .nav-tabs > li.active {\n  border-top-color: var(--header);\n}\n.nav-tabs-custom > .nav-tabs > li.active > a {\n  background-color: var(--back-main);\n}\n.nav-tabs-custom > .nav-tabs > li.active > a:hover {\n  background-color: var(--back-sub);\n  color: var(--text-main);\n}\n.nav-tabs-custom,\n.nav-tabs-custom > .tab-content {\n  background-color: var(--back-main);\n}\n.navbar-nav > .tasks-menu > .dropdown-menu > li.header {\n  background-color: var(--back-main);\n  color: var(--header);\n}\n.open > .dropdown-toggle.btn-default {\n  background-color: var(--back-sub);\n  color: var(--header);\n}\n.panel {\n  background-color: var(--back-sub);\n  color: var(--text-main);\n}\n.panel-default > .panel-heading {\n  background-color: var(--back-main);\n  color: var(--header);\n}\n.select2-container--default .select2-results__option[aria-selected=true],\n.select2-container--default .select2-results__option[aria-selected=true]:hover {\n  background-color: var(--back-sub);\n  color: var(--header);\n}\n.select2-container--default .select2-results__option--highlighted[aria-selected] {\n  background-color: var(--header);\n  color: var(--back-main);\n}\n.select2-container--default .select2-selection--single .select2-selection__rendered {\n  color: var(--text-main);\n}\n.select2-container--default .select2-selection--multiple .select2-selection__choice {\n  background-color: var(--header);\n}\n.select2-selection--single {\n  background-color: var(--back-sub) !important;\n  color: var(--text-main) !important;\n}\n.select2-dropdown {\n  background-color: var(--back-main);\n  color: var(--text-main);\n}\n.skin-blue-dark .main-header .navbar .dropdown-menu li a {\n  color: #FFFFFF;\n}\n.skin-blue-dark .main-header .navbar .dropdown-menu li a:hover {\n  background-color: #3c8dbc;\n}\n.fixed-table-body thead th .th-inner,\n.skin-blue-dark .sidebar-menu > li.active > a,\n.skin-blue .sidebar-menu > li:hover > a,\n.sidebar-toggle:hover {\n  background-color: var(--header) !important;\n}\n.tab-content,\n.tab-pane {\n  background-color: var(--back-main);\n  color: var(--text-main);\n}\n.table-striped > tbody > tr:nth-of-type(odd) {\n  background-color: var(--back-sub);\n}\n.table-striped > tbody > tr:nth-of-type(even) {\n  background-color: var(--back-sub-alt);\n}\n#webui > div > div > div > div > div > table > tbody > tr > td > a > i.fa,\n.box-body,\n.box-footer,\n.box-header {\n  color: var(--text-main);\n}\n.box-header.with-border {\n  border-bottom: #000;\n}\na {\n  color: var(--link);\n}\na:link {\n  color: var(--link);\n}\na:hover {\n  color: var(--hover-link);\n  text-decoration: underline;\n}\na:visited {\n  color: var(--visited-link);\n}\n#customFieldsTable a[href*='/models'] {\n  color: var(--back-sub);\n}\n#customFieldsTable a[href*='/fieldsets'] {\n  background-color: transparent;\n}\n.row-striped {\n  vertical-align: top;\n  line-height: 2.6;\n  padding: 0px;\n  margin-left: 20px;\n  box-sizing: border-box;\n  display: table;\n}\n.row-striped .row:nth-of-type(odd) div {\n  background-color: var(--back-sub);\n  color: var(--text-main);\n  border-top: 1px solid #dddddd;\n  display: table-cell;\n}\n.row-striped .row:nth-of-type(even) div {\n  background-color: var(--back-sub);\n  color: var(--text-main);\n  border-top: 1px solid #dddddd;\n  display: table-cell;\n}\n.row-new-striped > .row:nth-of-type(odd) {\n  background-color: var(--back-sub);\n  color: var(--text-main);\n}\n.row-new-striped > .row:nth-of-type(even) {\n  background-color: var(--back-sub-alt);\n  color: var(--text-main);\n}\n.search-highlight,\n.search-highlight:hover {\n  background-color: #e9d15b;\n}\n.table > tbody > tr.warning > td {\n  background-color: var(--back-sub);\n}\n/*\n * Skin: Contrast\n * ----------\n */\n.skin-contrast .main-header .navbar {\n  background-color: #001F3F;\n}\n.skin-contrast .main-header .navbar .nav > li > a {\n  color: #fff;\n}\n.skin-contrast .main-header .navbar .nav > li > a:hover,\n.skin-contrast .main-header .navbar .nav > li > a:active,\n.skin-contrast .main-header .navbar .nav > li > a:focus,\n.skin-contrast .main-header .navbar .nav .open > a,\n.skin-contrast .main-header .navbar .nav .open > a:hover,\n.skin-contrast .main-header .navbar .nav .open > a:focus,\n.skin-contrast .main-header .navbar .nav > .active > a {\n  background: rgba(0, 0, 0, 0.1);\n  color: #f6f6f6;\n}\n.skin-contrast .main-header .navbar .sidebar-toggle {\n  color: #fff;\n}\n.skin-contrast .main-header .navbar .sidebar-toggle:hover {\n  color: #f6f6f6;\n  background: rgba(0, 0, 0, 0.1);\n}\n.skin-contrast .main-header .navbar .sidebar-toggle {\n  color: #fff;\n}\n.skin-contrast .main-header .navbar .sidebar-toggle:hover {\n  background-color: #001226;\n}\n@media (max-width: 767px) {\n  .skin-contrast .main-header .navbar .dropdown-menu li.divider {\n    background-color: rgba(255, 255, 255, 0.1);\n  }\n  .skin-contrast .main-header .navbar .dropdown-menu li a {\n    color: #fff;\n  }\n  .skin-contrast .main-header .navbar .dropdown-menu li a:hover {\n    background: #001226;\n  }\n}\n.skin-contrast .main-header li.user-header {\n  background-color: #001F3F;\n}\n.skin-contrast .content-header {\n  background: transparent;\n}\n.skin-contrast .wrapper,\n.skin-contrast .main-sidebar,\n.skin-contrast .left-side {\n  background-color: #222d32;\n}\n.skin-contrast .user-panel > .info,\n.skin-contrast .user-panel > .info > a {\n  color: #fff;\n}\n.skin-contrast .sidebar-menu > li.header {\n  color: #4b646f;\n  background: #1a2226;\n}\n.skin-contrast .sidebar-menu > li > a {\n  border-left: 3px solid transparent;\n}\n.skin-contrast .sidebar-menu > li:hover > a,\n.skin-contrast .sidebar-menu > li.active > a {\n  color: #fff;\n  background: #1e282c;\n  border-left-color: #001F3F;\n}\n.skin-contrast .sidebar-menu > li > .treeview-menu {\n  margin: 0 1px;\n  background: #2c3b41;\n}\n.skin-contrast .sidebar a {\n  color: #b8c7ce;\n}\n.skin-contrast .sidebar a:hover {\n  text-decoration: none;\n}\n.skin-contrast .treeview-menu > li > a {\n  color: #8aa4af;\n}\n.skin-contrast .treeview-menu > li.active > a,\n.skin-contrast .treeview-menu > li > a:hover {\n  color: #fff;\n}\n.skin-contrast .sidebar-form {\n  border-radius: 3px;\n  border: 1px solid #374850;\n  margin: 10px 10px;\n}\n.skin-contrast .sidebar-form input[type=\"text\"],\n.skin-contrast .sidebar-form .btn {\n  box-shadow: none;\n  background-color: #374850;\n  border: 1px solid transparent;\n  height: 35px;\n  -webkit-transition: all 0.3s ease-in-out;\n  -o-transition: all 0.3s ease-in-out;\n  transition: all 0.3s ease-in-out;\n}\n.skin-contrast .sidebar-form input[type=\"text\"] {\n  color: #666;\n  border-top-left-radius: 2px;\n  border-top-right-radius: 0;\n  border-bottom-right-radius: 0;\n  border-bottom-left-radius: 2px;\n}\n.skin-contrast .sidebar-form input[type=\"text\"]:focus,\n.skin-contrast .sidebar-form input[type=\"text\"]:focus + .input-group-btn .btn {\n  background-color: #fff;\n  color: #666;\n}\n.skin-contrast .sidebar-form input[type=\"text\"]:focus + .input-group-btn .btn {\n  border-left-color: #fff;\n}\n.skin-contrast .sidebar-form .btn {\n  color: #999;\n  border-top-left-radius: 0;\n  border-top-right-radius: 2px;\n  border-bottom-right-radius: 2px;\n  border-bottom-left-radius: 0;\n}\n.skin-contrast.layout-top-nav .main-header > .logo .logo-variant {\n  background-color: none;\n}\n.btn.btn-primary,\n.btn:hover.btn-primary,\n.btn .btn-primary:link,\n.btn:hover .btn-primary:link {\n  background-color: #00060c;\n  border-color: #000000;\n  color: #fff;\n}\n.btna.btn-primary:hover,\n.btn:hovera.btn-primary:hover {\n  background-color: #000000;\n  border-color: #000000;\n  color: #fff;\n}\n.btn.btn-white:link,\n.btn:hover.btn-white:link {\n  background-color: #00060c;\n  color: #fff;\n}\n.btn.btn-white:hover,\n.btn:hover.btn-white:hover {\n  background-color: #000000;\n  color: #fff;\n}\na.btn.btn-link.text-left {\n  color: #001F3F;\n  border: 1px solid #000;\n}\na.btn.btn-link.text-left:hover {\n  color: #001F3F;\n}\na {\n  color: #001F3F;\n}\na:hover {\n  color: #001F3F;\n  text-decoration: underline;\n}\na:visited {\n  color: #001F3F;\n}\na.btn:hover {\n  color: #fff;\n  text-decoration: underline;\n}\n.text-primary {\n  color: #000000;\n}\n.skin-contrast .treeview-menu > li > a {\n  color: #FFF;\n}\n.bg-teal {\n  background-color: #1b6a6a !important;\n}\n.bg-orange {\n  background-color: #995400 !important;\n}\n.bg-purple {\n  background-color: #3a3767 !important;\n}\n.bg-maroon {\n  background-color: #7d1038 !important;\n}\n.pagination > li > a {\n  color: #00060c !important;\n}\n.pagination > .active > a {\n  background-color: #001F3F;\n  color: #FFF !important;\n}\nbtn-success {\n  background-color: #000d07;\n}\ninput::-webkit-input-placeholder {\n  /* Chrome/Opera/Safari */\n  color: #b5bbc8 !important;\n}\ninput::-moz-placeholder {\n  /* Firefox 19+ */\n  color: #b5bbc8 !important;\n}\ninput::-ms-input-placeholder {\n  /* IE 10+ */\n  color: #b5bbc8 !important;\n}\n.select2-default,\n.select2-selection__placeholder {\n  color: #37383c !important;\n}\n.callout.callout-info {\n  background-color: #23536f !important;\n}\n.fixed-table-container tbody .selected td {\n  background-color: #fff8af;\n}\n.search-highlight,\n.search-highlight:hover {\n  background-color: #e9d15b;\n}\n/*\n * Skin: Green\n * ----------\n */\n:root {\n  --background: #222;\n  --back-main: #333;\n  --back-sub: #3d4144;\n  --back-sub-alt: rgba(0, 0, 0, 0.36);\n  --button-default: #005a31;\n  --button-primary: #002715;\n  --button-hover: #000d07;\n  --header: #00a65a;\n  /* Use same as Header picker */\n  --text-main: #BBB;\n  --text-sub: #9b9b9b;\n  --link: #00a65a;\n  /* Use same as Header picker, lighten by 70% */\n  --visited-link: #00f383;\n  /* Use same as Header picker, lighten by 70% */\n  --hover-link: #0dff90;\n}\n.skin-green .main-header .navbar {\n  background-color: #00a65a;\n}\n.skin-green .main-header .navbar .nav > li > a {\n  color: #fff;\n}\n.skin-green .main-header .navbar .nav > li > a:hover,\n.skin-green .main-header .navbar .nav > li > a:active,\n.skin-green .main-header .navbar .nav > li > a:focus,\n.skin-green .main-header .navbar .nav .open > a,\n.skin-green .main-header .navbar .nav .open > a:hover,\n.skin-green .main-header .navbar .nav .open > a:focus,\n.skin-green .main-header .navbar .nav > .active > a {\n  background: rgba(0, 0, 0, 0.1);\n  color: #f6f6f6;\n}\n.skin-green .main-header .navbar .sidebar-toggle {\n  color: #fff;\n}\n.skin-green .main-header .navbar .sidebar-toggle:hover {\n  color: #f6f6f6;\n  background: rgba(0, 0, 0, 0.1);\n}\n.skin-green .main-header .navbar .sidebar-toggle {\n  color: #fff;\n}\n.skin-green .main-header .navbar .sidebar-toggle:hover {\n  background-color: #008d4c;\n}\n@media (max-width: 767px) {\n  .skin-green .main-header .navbar .dropdown-menu li.divider {\n    background-color: rgba(255, 255, 255, 0.1);\n  }\n  .skin-green .main-header .navbar .dropdown-menu li a {\n    color: #333;\n  }\n  .skin-green .main-header .navbar .dropdown-menu li a:hover {\n    background: #008d4c;\n  }\n}\n.skin-green .main-header li.user-header {\n  background-color: #00a65a;\n}\n.skin-green .content-header {\n  background: transparent;\n}\n.skin-green .wrapper,\n.skin-green .main-sidebar,\n.skin-green .left-side {\n  background-color: #222d32;\n}\n.skin-green .user-panel > .info,\n.skin-green .user-panel > .info > a {\n  color: #fff;\n}\n.skin-green .sidebar-menu > li.header {\n  color: #4b646f;\n  background: #1a2226;\n}\n.skin-green .sidebar-menu > li > a {\n  border-left: 3px solid transparent;\n}\n.skin-green .sidebar-menu > li:hover > a,\n.skin-green .sidebar-menu > li.active > a {\n  color: #fff;\n  background: #1e282c;\n  border-left-color: #00a65a;\n}\n.skin-green .sidebar-menu > li > .treeview-menu {\n  margin: 0 1px;\n  background: #2c3b41;\n}\n.skin-green .sidebar a {\n  color: #b8c7ce;\n}\n.skin-green .sidebar a:hover {\n  text-decoration: none;\n}\n.skin-green .treeview-menu > li > a {\n  color: #8aa4af;\n}\n.skin-green .treeview-menu > li.active > a,\n.skin-green .treeview-menu > li > a:hover {\n  color: #fff;\n}\n.skin-green .sidebar-form {\n  border-radius: 3px;\n  border: 1px solid #374850;\n  margin: 10px 10px;\n}\n.skin-green .sidebar-form input[type=\"text\"],\n.skin-green .sidebar-form .btn {\n  box-shadow: none;\n  background-color: #374850;\n  border: 1px solid transparent;\n  height: 35px;\n  -webkit-transition: all 0.3s ease-in-out;\n  -o-transition: all 0.3s ease-in-out;\n  transition: all 0.3s ease-in-out;\n}\n.skin-green .sidebar-form input[type=\"text\"] {\n  color: #666;\n  border-top-left-radius: 2px;\n  border-top-right-radius: 0;\n  border-bottom-right-radius: 0;\n  border-bottom-left-radius: 2px;\n}\n.skin-green .sidebar-form input[type=\"text\"]:focus,\n.skin-green .sidebar-form input[type=\"text\"]:focus + .input-group-btn .btn {\n  background-color: #fff;\n  color: #666;\n}\n.skin-green .sidebar-form input[type=\"text\"]:focus + .input-group-btn .btn {\n  border-left-color: #fff;\n}\n.skin-green .sidebar-form .btn {\n  color: #999;\n  border-top-left-radius: 0;\n  border-top-right-radius: 2px;\n  border-bottom-right-radius: 2px;\n  border-bottom-left-radius: 0;\n}\n.skin-green.layout-top-nav .main-header > .logo .logo-variant {\n  background-color: none;\n}\n.btn.btn-primary,\n.btn:hover.btn-primary,\n.btn .btn-primary:link,\n.btn:hover .btn-primary:link {\n  background-color: #00733e;\n  border-color: #004023;\n  color: #fff;\n}\n.btna.btn-primary:hover,\n.btn:hovera.btn-primary:hover {\n  background-color: #004023;\n  border-color: #004023;\n  color: #fff;\n}\n.btn.btn-white:link,\n.btn:hover.btn-white:link {\n  background-color: #00733e;\n  color: #fff;\n}\n.btn.btn-white:hover,\n.btn:hover.btn-white:hover {\n  background-color: #000d07;\n  color: #fff;\n}\na.btn-info:link,\na.btn-warning:link,\na.btn-danger:link {\n  color: #FFF;\n}\na.btn-info:visited,\na.btn-warning:visited,\na.btn-danger:visited {\n  color: #FFF;\n}\na:link {\n  color: var(--link);\n}\na:visited {\n  color: var(--visited-link);\n}\na {\n  color: #00a65a;\n}\na:hover {\n  color: #004023;\n}\na:visited {\n  color: #00a65a;\n}\n.text-primary {\n  color: #004023;\n}\n.far fa-life-ring {\n  color: var(--link);\n}\n.fixed-table-container tbody .selected td {\n  background-color: #fff8af;\n}\n.select2-container--default .select2-selection--multiple .select2-selection__choice {\n  background-color: #00a65a;\n}\n.search-highlight,\n.search-highlight:hover {\n  background-color: #e9d15b;\n}\n/*\n * Skin: green dark\n * ----------\n */\n.skin-green-dark .main-header .navbar {\n  background-color: #00a65a;\n}\n.skin-green-dark .main-header .navbar .nav > li > a {\n  color: #fff;\n}\n.skin-green-dark .main-header .navbar .nav > li > a:hover,\n.skin-green-dark .main-header .navbar .nav > li > a:active,\n.skin-green-dark .main-header .navbar .nav > li > a:focus,\n.skin-green-dark .main-header .navbar .nav .open > a,\n.skin-green-dark .main-header .navbar .nav .open > a:hover,\n.skin-green-dark .main-header .navbar .nav .open > a:focus,\n.skin-green-dark .main-header .navbar .nav > .active > a {\n  background: rgba(0, 0, 0, 0.1);\n  color: #f6f6f6;\n}\n.skin-green-dark .main-header .navbar .sidebar-toggle {\n  color: #fff;\n}\n.skin-green-dark .main-header .navbar .sidebar-toggle:hover {\n  color: #f6f6f6;\n  background: rgba(0, 0, 0, 0.1);\n}\n.skin-green-dark .main-header .navbar .sidebar-toggle {\n  color: #fff;\n}\n.skin-green-dark .main-header .navbar .sidebar-toggle:hover {\n  background-color: #008d4c;\n}\n@media (max-width: 767px) {\n  .skin-green-dark .main-header .navbar .dropdown-menu li.divider {\n    background-color: rgba(255, 255, 255, 0.1);\n    color: #fff;\n  }\n  .skin-green-dark .main-header .navbar .dropdown-menu li a {\n    color: #fff;\n  }\n  .skin-green-dark .main-header .navbar .dropdown-menu li a:hover {\n    background: #008d4c;\n    color: #fff;\n  }\n}\n.skin-green-dark .main-header li.user-header {\n  background-color: #00a65a;\n}\n.skin-green-dark .content-header {\n  background: transparent;\n}\n.skin-green-dark .wrapper,\n.skin-green-dark .main-sidebar,\n.skin-green-dark .left-side {\n  background-color: #222d32;\n}\n.skin-green-dark .user-panel > .info,\n.skin-green-dark .user-panel > .info > a {\n  color: #fff;\n}\n.skin-green-dark .sidebar-menu > li.header {\n  color: #4b646f;\n  background: #1a2226;\n}\n.skin-green-dark .sidebar-menu > li > a {\n  border-left: 3px solid transparent;\n}\n.skin-green-dark .sidebar-menu > li:hover > a,\n.skin-green-dark .sidebar-menu > li.active > a {\n  color: #fff;\n  background: #1e282c;\n  border-left-color: #00a65a;\n}\n.skin-green-dark .sidebar-menu > li > .treeview-menu {\n  margin: 0 1px;\n  background: #2c3b41;\n}\n.skin-green-dark .sidebar a {\n  color: #b8c7ce;\n}\n.skin-green-dark .sidebar a:hover {\n  text-decoration: none;\n}\n.skin-green-dark .treeview-menu > li > a {\n  color: #8aa4af;\n}\n.skin-green-dark .treeview-menu > li.active > a,\n.skin-green-dark .treeview-menu > li > a:hover {\n  color: #fff;\n}\n.skin-green-dark .sidebar-form {\n  border-radius: 3px;\n  border: 1px solid #374850;\n  margin: 10px 10px;\n}\n.skin-green-dark .sidebar-form input[type=\"text\"],\n.skin-green-dark .sidebar-form .btn {\n  box-shadow: none;\n  background-color: #374850;\n  border: 1px solid transparent;\n  height: 35px;\n  -webkit-transition: all 0.3s ease-in-out;\n  -o-transition: all 0.3s ease-in-out;\n  transition: all 0.3s ease-in-out;\n}\n.skin-green-dark .sidebar-form input[type=\"text\"] {\n  color: #666;\n  border-top-left-radius: 2px;\n  border-top-right-radius: 0;\n  border-bottom-right-radius: 0;\n  border-bottom-left-radius: 2px;\n}\n.skin-green-dark .sidebar-form input[type=\"text\"]:focus,\n.skin-green-dark .sidebar-form input[type=\"text\"]:focus + .input-group-btn .btn {\n  background-color: #fff;\n  color: #666;\n}\n.skin-green-dark .sidebar-form input[type=\"text\"]:focus + .input-group-btn .btn {\n  border-left-color: #fff;\n}\n.skin-green-dark .sidebar-form .btn {\n  color: #999;\n  border-top-left-radius: 0;\n  border-top-right-radius: 2px;\n  border-bottom-right-radius: 2px;\n  border-bottom-left-radius: 0;\n}\n.skin-green-dark.layout-top-nav .main-header > .logo .logo-variant {\n  background-color: none;\n}\n.btn,\n.btn:hover {\n  color: #FFF !important;\n}\n.btn.btn-primary,\n.btn:hover.btn-primary,\n.btn .btn-primary:link,\n.btn:hover .btn-primary:link {\n  background-color: #00733e;\n  border-color: #FFF;\n  color: #FFF;\n}\n.btna.btn-primary:hover,\n.btn:hovera.btn-primary:hover {\n  background-color: #004023;\n  border-color: #004023;\n  color: #FFF;\n}\n.btn.btn-white:link,\n.btn:hover.btn-white:link {\n  background-color: #00733e;\n  color: #FFF;\n}\n.btn.btn-white:hover,\n.btn:hover.btn-white:hover {\n  background-color: #000d07;\n  color: #FFF;\n}\n/**\nThe dropdown is white, so use a darker color\n */\nli.dropdown-item-marker {\n  color: var(--button-primary);\n}\na:hover {\n  color: var(--hover-link);\n}\na:visited {\n  color: var(--visited-link);\n}\n.text-primary {\n  color: #fff;\n}\n:root {\n  --background: #222;\n  --back-main: #333;\n  --back-sub: #312F2F;\n  --back-sub-alt: rgba(0, 0, 0, 0.36);\n  --button-default: #006400;\n  --button-primary: #003100;\n  --button-hover: #000000;\n  --header: #006400;\n  /* Use same as Header picker */\n  --text-main: #FFF;\n  --text-sub: #9b9b9b;\n  --link: #9ACD32;\n  /* Use same as Header picker, lighten by 70% */\n  --visited-link: #b8dc70;\n  /* Use same as Header picker, lighten by 70% */\n  --hover-link: #d7ebad;\n  /* Use same as Header picker, lighten by 70% */\n  --nav-link: #FFF;\n  /* Use same as Header picker */\n  --light-link: #fff;\n  /* Use same as Header picker */\n}\n#ldapad_test_results.well.well-sm {\n  color: var(--back-main);\n}\na.actions {\n  color: #fff !important;\n}\n.pagination > li > a {\n  color: var(--light-link);\n  background-color: var(--back-main);\n}\n.pagination > .active > a {\n  background-color: var(--visited-link);\n  border-color: var(--light-link);\n}\n.pagination > .active > a:hover {\n  background-color: var(--hover-link);\n}\n.tasks-menu > .dropdown-menu > li .menu {\n  background-color: var(--back-main);\n}\n.tasks-menu > .dropdown-menu > li .menu > li > a:hover .progress {\n  background-color: var(--background);\n}\nh2.task_menu {\n  color: var(--link);\n}\n.navbar-custom-menu > .navbar-nav > li > .dropdown-menu {\n  background-color: var(--back-main);\n  color: var(--link);\n}\n.main-header .navbar,\n.main-header .logo {\n  background-color: var(--header);\n  background: -webkit-linear-gradient(top, var(--header) 0%, var(--header) 100%);\n  background: linear-gradient(to bottom, var(--header) 0%, var(--header) 100%);\n  border-color: var(--header);\n}\n.bootstrap-table .fixed-table-container .table thead th .sortable {\n  color: var(--nav-link);\n}\n.far fa-life-ring {\n  color: var(--link);\n}\n.thead,\n.navbar-nav > li > a:link {\n  color: var(--nav-link);\n}\n.modal-content {\n  background-color: var(--back-main);\n  color: var(--text-main);\n}\n.btn-primary.hover {\n  color: var(--nav-link);\n}\n.small-box h3,\n.small-box p {\n  color: var(--nav-link) !important;\n}\n.small-box h3 a:hover,\n.small-box p a:hover {\n  text-decoration: none;\n  color: var(--nav-link) !important;\n}\n#accessoriesTable > tbody > tr > td > nobr > a > i.fa {\n  color: var(--text-main);\n}\n#assetsListingTable > tbody > tr > td > nobr > a > i.fa {\n  color: var(--text-main);\n}\n#assetsListingTable > tbody > tr.selected > td {\n  background-color: var(--back-main);\n}\nbody {\n  color: var(--text-main);\n}\n.box,\n.box.box-default {\n  border-top: 3px solid var(--header);\n  border-top-color: var(--header);\n}\n.box-body,\n.box-footer,\n.box-header {\n  background-color: var(--back-sub);\n  color: var(--header);\n}\n.btn-default {\n  background-color: var(--button-default);\n  color: var(--link);\n}\n.btn-default dropdown-toggle {\n  background-color: var(--button-default);\n  color: var(--link);\n}\n.btn-default:active,\n.btn-default:focus,\n.btn-default:hover,\n.btn-default.active {\n  background-color: var(--button-hover);\n  color: var(--link);\n}\n.btn-primary,\n.btn-primary.hover,\n.btn-primary:active,\n.text-green {\n  color: var(--text-main);\n}\n.btn-primary:hover {\n  background-color: var(--button-primary);\n}\n#componentsTable > tbody > tr > td > nobr > a > i.fa {\n  color: var(--text-main);\n}\n#consumablesTable > tbody > tr > td > nobr > a > i.fa {\n  color: var(--text-main);\n}\n.content-wrapper {\n  background-color: var(--background);\n}\n#create-form > div > div > div > span > i.fa {\n  background-color: var(--back-sub);\n  color: var(--header);\n}\n.datepicker .datepicker-switch:hover,\n.datepicker .next:hover,\n.datepicker .prev:hover,\n.datepicker tfoot tr th:hover,\n.datepicker table tr td.day.focused,\n.datepicker table tr td.day:hover {\n  background-color: var(--header);\n}\n.datepicker.dropdown-menu {\n  background-color: var(--back-main);\n  color: var(--text-main);\n}\n#details > div > div > div > table {\n  background-color: transparent;\n}\n.dropdown-menu > li > a:hover {\n  background-color: var(--back-main);\n  color: var(--nav-link);\n}\n.fixed-table-body thead th .th-inner {\n  color: var(--nav-link);\n}\n.form-control {\n  background-color: var(--back-main);\n  color: var(--text-main);\n}\n.form-control[disabled],\n.form-control[readonly],\nfieldset[disabled] .form-control {\n  background-color: var(--back-main);\n  color: var(--text-main);\n}\nh1,\nh2,\nh3,\nh4,\nh5,\nh6,\np {\n  color: var(--text-main);\n}\n.help-block {\n  color: var(--text-sub);\n}\ninput[type=text],\ninput[type=search] {\n  background-color: var(--back-sub);\n  color: var(--text-main);\n}\n.input-group,\n.input-group-addon {\n  background-color: var(--back-sub) !important;\n  color: var(--text-main);\n}\n#licensesTable > tbody > tr > td > nobr > a > i.fa {\n  color: var(--text-main);\n}\n.main-footer {\n  background-color: var(--back-main);\n  color: var(--text-main);\n}\n.nav-tabs-custom > .nav-tabs > li > a,\n.nav-tabs-custom > .nav-tabs > li.active > a {\n  color: var(--text-main);\n}\n.nav-tabs-custom > .nav-tabs > li.active {\n  border-top-color: var(--header);\n}\n.nav-tabs-custom > .nav-tabs > li.active > a {\n  background-color: var(--back-main);\n}\n.nav-tabs-custom > .nav-tabs > li.active > a:hover {\n  background-color: var(--back-sub);\n  color: var(--text-main);\n}\n.nav-tabs-custom,\n.nav-tabs-custom > .tab-content {\n  background-color: var(--back-main);\n}\n.open > .dropdown-toggle.btn-default {\n  background-color: var(--back-sub);\n  color: var(--header);\n}\n.panel {\n  background-color: var(--back-sub);\n  color: var(--text-main);\n}\n.panel-default > .panel-heading {\n  background-color: var(--back-main);\n  color: var(--header);\n}\n.select2-container--default .select2-results__option[aria-selected=true],\n.select2-container--default .select2-results__option[aria-selected=true]:hover {\n  background-color: var(--back-sub);\n  color: var(--header);\n}\n.select2-container--default .select2-results__option--highlighted[aria-selected] {\n  background-color: var(--header);\n  color: var(--back-main);\n}\n.select2-container--default .select2-selection--single .select2-selection__rendered {\n  color: var(--text-main);\n}\n.select2-container--default .select2-selection--multiple .select2-selection__choice {\n  background-color: var(--header);\n}\n.select2-selection--single {\n  background-color: var(--back-sub) !important;\n  color: var(--text-main) !important;\n}\n.select2-dropdown {\n  background-color: var(--back-main);\n  color: var(--text-main);\n}\n.skin-green-dark .main-header .navbar .dropdown-menu li a {\n  color: #FFFFFF;\n}\n.skin-green-dark .main-header .navbar .dropdown-menu li a:hover {\n  background-color: #006300;\n}\n.fixed-table-body thead th .th-inner,\n.skin-green-dark .sidebar-menu > li.active > a,\n.skin-green .sidebar-menu > li:hover > a,\n.sidebar-toggle:hover {\n  background-color: var(--header) !important;\n}\n.tab-content,\n.tab-pane {\n  background-color: var(--back-main);\n  color: var(--text-main);\n}\n.table-striped > tbody > tr:nth-of-type(odd) {\n  background-color: var(--back-sub);\n}\n.table-striped > tbody > tr:nth-of-type(even) {\n  background-color: var(--back-sub);\n}\n#webui > div > div > div > div > div > table > tbody > tr > td > a > i.fa,\n.box-body,\n.box-footer,\n.box-header {\n  color: var(--text-main);\n}\n.box-header.with-border {\n  border-bottom: #000;\n}\na {\n  color: var(--link);\n}\na:link {\n  color: var(--link);\n}\na:hover {\n  color: var(--hover-link);\n  text-decoration: underline;\n}\na:visited {\n  color: var(--visited-link);\n}\n#customFieldsTable a[href*='/models'] {\n  color: var(--back-sub);\n}\n#customFieldsTable a[href*='/fieldsets'] {\n  background-color: transparent;\n}\n.row-striped {\n  vertical-align: top;\n  line-height: 2.6;\n  padding: 0px;\n  margin-left: 20px;\n  box-sizing: border-box;\n  display: table;\n}\n.row-striped .row:nth-of-type(odd) div {\n  background-color: var(--back-sub);\n  color: var(--text-main);\n  border-top: 1px solid #dddddd;\n  display: table-cell;\n}\n.row-striped .row:nth-of-type(even) div {\n  background-color: var(--back-sub);\n  color: var(--text-main);\n  border-top: 1px solid #dddddd;\n  display: table-cell;\n}\n.row-new-striped > .row:nth-of-type(odd) {\n  background-color: var(--back-sub);\n  color: var(--text-main);\n}\n.row-new-striped > .row:nth-of-type(even) {\n  background-color: var(--back-sub-alt);\n  color: var(--text-main);\n}\n.search-highlight,\n.search-highlight:hover {\n  background-color: #e9d15b;\n}\n.table > tbody > tr.warning > td {\n  background-color: var(--back-sub);\n}\n/*\n * Skin: orange dark\n * ----------\n */\n.skin-orange-dark .main-header .navbar {\n  background-color: #FF8C00;\n}\n.skin-orange-dark .main-header .navbar .nav > li > a {\n  color: #fff;\n}\n.skin-orange-dark .main-header .navbar .nav > li > a:hover,\n.skin-orange-dark .main-header .navbar .nav > li > a:active,\n.skin-orange-dark .main-header .navbar .nav > li > a:focus,\n.skin-orange-dark .main-header .navbar .nav .open > a,\n.skin-orange-dark .main-header .navbar .nav .open > a:hover,\n.skin-orange-dark .main-header .navbar .nav .open > a:focus,\n.skin-orange-dark .main-header .navbar .nav > .active > a {\n  background: rgba(0, 0, 0, 0.1);\n  color: #f6f6f6;\n}\n.skin-orange-dark .main-header .navbar .sidebar-toggle {\n  color: #fff;\n}\n.skin-orange-dark .main-header .navbar .sidebar-toggle:hover {\n  color: #f6f6f6;\n  background: rgba(0, 0, 0, 0.1);\n}\n.skin-orange-dark .main-header .navbar .sidebar-toggle {\n  color: #fff;\n}\n.skin-orange-dark .main-header .navbar .sidebar-toggle:hover {\n  background-color: #e67e00;\n}\n@media (max-width: 767px) {\n  .skin-orange-dark .main-header .navbar .dropdown-menu li.divider {\n    background-color: rgba(255, 255, 255, 0.1);\n    color: #fff;\n  }\n  .skin-orange-dark .main-header .navbar .dropdown-menu li a {\n    color: #fff;\n  }\n  .skin-orange-dark .main-header .navbar .dropdown-menu li a:hover {\n    background: #e67e00;\n    color: #fff;\n  }\n}\n.skin-orange-dark .main-header li.user-header {\n  background-color: #FF8C00;\n}\n.skin-orange-dark .content-header {\n  background: transparent;\n}\n.skin-orange-dark .wrapper,\n.skin-orange-dark .main-sidebar,\n.skin-orange-dark .left-side {\n  background-color: #222d32;\n}\n.skin-orange-dark .user-panel > .info,\n.skin-orange-dark .user-panel > .info > a {\n  color: #fff;\n}\n.skin-orange-dark .sidebar-menu > li.header {\n  color: #4b646f;\n  background: #1a2226;\n}\n.skin-orange-dark .sidebar-menu > li > a {\n  border-left: 3px solid transparent;\n}\n.skin-orange-dark .sidebar-menu > li:hover > a,\n.skin-orange-dark .sidebar-menu > li.active > a {\n  color: #fff;\n  background: #1e282c;\n  border-left-color: #FF8C00;\n}\n.skin-orange-dark .sidebar-menu > li > .treeview-menu {\n  margin: 0 1px;\n  background: #2c3b41;\n}\n.skin-orange-dark .sidebar a {\n  color: #b8c7ce;\n}\n.skin-orange-dark .sidebar a:hover {\n  text-decoration: none;\n}\n.skin-orange-dark .treeview-menu > li > a {\n  color: #8aa4af;\n}\n.skin-orange-dark .treeview-menu > li.active > a,\n.skin-orange-dark .treeview-menu > li > a:hover {\n  color: #fff;\n}\n.skin-orange-dark .sidebar-form {\n  border-radius: 3px;\n  border: 1px solid #374850;\n  margin: 10px 10px;\n}\n.skin-orange-dark .sidebar-form input[type=\"text\"],\n.skin-orange-dark .sidebar-form .btn {\n  box-shadow: none;\n  background-color: #374850;\n  border: 1px solid transparent;\n  height: 35px;\n  -webkit-transition: all 0.3s ease-in-out;\n  -o-transition: all 0.3s ease-in-out;\n  transition: all 0.3s ease-in-out;\n}\n.skin-orange-dark .sidebar-form input[type=\"text\"] {\n  color: #666;\n  border-top-left-radius: 2px;\n  border-top-right-radius: 0;\n  border-bottom-right-radius: 0;\n  border-bottom-left-radius: 2px;\n}\n.skin-orange-dark .sidebar-form input[type=\"text\"]:focus,\n.skin-orange-dark .sidebar-form input[type=\"text\"]:focus + .input-group-btn .btn {\n  background-color: #fff;\n  color: #666;\n}\n.skin-orange-dark .sidebar-form input[type=\"text\"]:focus + .input-group-btn .btn {\n  border-left-color: #fff;\n}\n.skin-orange-dark .sidebar-form .btn {\n  color: #999;\n  border-top-left-radius: 0;\n  border-top-right-radius: 2px;\n  border-bottom-right-radius: 2px;\n  border-bottom-left-radius: 0;\n}\n.skin-orange-dark.layout-top-nav .main-header > .logo .logo-variant {\n  background-color: none;\n}\n.btn,\n.btn:hover {\n  color: #fff !important;\n}\n.btn.btn-primary,\n.btn:hover.btn-primary,\n.btn .btn-primary:link,\n.btn:hover .btn-primary:link {\n  background-color: #cc7000;\n  border-color: #fff;\n  color: #fff;\n}\n.btna.btn-primary:hover,\n.btn:hovera.btn-primary:hover {\n  background-color: #995400;\n  border-color: #995400;\n  color: #fff;\n}\n.btn.btn-white:link,\n.btn:hover.btn-white:link {\n  background-color: #cc7000;\n  color: #fff;\n}\n.btn.btn-white:hover,\n.btn:hover.btn-white:hover {\n  background-color: #663800;\n  color: #fff;\n}\n/**\nThe dropdown is white, so use a darker color\n */\nli.dropdown-item-marker {\n  color: var(--button-primary);\n}\n.text-primary {\n  color: #fff;\n}\n:root {\n  --background: #222;\n  --back-main: #333;\n  --back-sub: #2E2C2C;\n  --back-sub-alt: rgba(0, 0, 0, 0.36);\n  --button-default: #b36200;\n  --button-primary: #804600;\n  --button-hover: #663800;\n  --header: #FF8C00;\n  /* Use same as Header picker */\n  --text-main: #BBB;\n  --text-sub: #9b9b9b;\n  --link: #FFA500;\n  /* Use same as Header picker, lighten by 70% */\n  --visited-link: #ffc04d;\n  /* Use same as Header picker, lighten by 70% */\n  --hover-link: #ffdb99;\n  /* Use same as Header picker, lighten by 70% */\n  --nav-link: #FFF;\n  /* Use same as Header picker */\n  --light-link: #fff;\n  /* Use same as Header picker */\n}\n#ldapad_test_results.well.well-sm {\n  color: var(--back-main);\n}\na.actions {\n  color: #fff !important;\n}\n.pagination > li > a {\n  color: var(--light-link);\n  background-color: var(--back-main);\n}\n.pagination > .active > a {\n  background-color: var(--visited-link);\n  border-color: var(--light-link);\n}\n.pagination > .active > a:hover {\n  background-color: var(--hover-link);\n}\n.tasks-menu > .dropdown-menu > li .menu {\n  background-color: var(--back-main);\n}\n.tasks-menu > .dropdown-menu > li .menu > li > a:hover .progress {\n  background-color: var(--background);\n}\nh2.task_menu {\n  color: var(--link);\n}\n.navbar-custom-menu > .navbar-nav > li > .dropdown-menu {\n  background-color: var(--back-main);\n  color: var(--link);\n}\n.main-header .navbar,\n.main-header .logo {\n  background-color: var(--header);\n  background: -webkit-linear-gradient(top, var(--header) 0%, var(--header) 100%);\n  background: linear-gradient(to bottom, var(--header) 0%, var(--header) 100%);\n  border-color: var(--header);\n}\n.far fa-life-ring {\n  color: var(--link);\n}\n.bootstrap-table .fixed-table-container .table thead th .sortable {\n  color: var(--nav-link);\n}\n.bootstrap-table .fixed-table-toolbar .columns label {\n  color: #000;\n}\n.thead,\n.navbar-nav > li > a:link {\n  color: var(--nav-link);\n}\n.modal-content {\n  background-color: var(--back-main);\n  color: var(--text-main);\n}\na:link {\n  color: var(--link);\n}\na:visited {\n  color: var(--visited-link);\n}\na:hover {\n  color: var(--hover-link);\n}\n.btn-primary.hover {\n  color: var(--nav-link);\n}\n.small-box h3,\n.small-box p {\n  color: var(--nav-link) !important;\n}\n.small-box h3 a:hover,\n.small-box p a:hover {\n  text-decoration: none;\n  color: var(--nav-link) !important;\n}\n#accessoriesTable > tbody > tr > td > nobr > a > i.fa {\n  color: var(--text-main);\n}\n#assetsListingTable > tbody > tr > td > nobr > a > i.fa {\n  color: var(--text-main);\n}\n#assetsListingTable > tbody > tr.selected > td {\n  background-color: var(--back-main);\n}\nbody {\n  color: var(--text-main);\n}\n.box,\n.box.box-default {\n  border-top: 3px solid var(--header);\n  border-top-color: var(--header);\n}\n.box-body,\n.box-footer,\n.box-header {\n  background-color: var(--back-sub);\n  color: var(--header);\n}\n.btn-default {\n  background-color: var(--button-default);\n  color: var(--nav-link);\n}\na:link.btn-default {\n  color: var(--nav-link);\n}\n.btn-default dropdown-toggle {\n  background-color: var(--button-default);\n  color: var(--nav-link);\n}\n.btn-default:active,\n.btn-default:focus,\n.btn-default:hover,\n.btn-default.active {\n  background-color: var(--button-hover);\n  color: var(--background);\n}\n.btn-primary,\n.btn-primary.hover,\n.btn-primary:active,\n.text-orange {\n  color: var(--nav-link) !important;\n  border-color: var(--button-primary);\n}\n.btn-primary:hover {\n  background-color: var(--button-primary);\n}\n#componentsTable > tbody > tr > td > nobr > a > i.fa {\n  color: var(--text-main);\n}\n#consumablesTable > tbody > tr > td > nobr > a > i.fa {\n  color: var(--text-main);\n}\n.content-wrapper {\n  background-color: var(--background);\n}\n#create-form > div > div > div > span > i.fa {\n  background-color: var(--back-sub);\n  color: var(--header);\n}\n.datepicker .datepicker-switch:hover,\n.datepicker .next:hover,\n.datepicker .prev:hover,\n.datepicker tfoot tr th:hover,\n.datepicker table tr td.day.focused,\n.datepicker table tr td.day:hover {\n  background-color: var(--header);\n}\n.datepicker.dropdown-menu {\n  background-color: var(--back-main);\n  color: var(--text-main);\n}\n#details > div > div > div > table {\n  background-color: transparent;\n}\n.dropdown-menu > li > a:hover {\n  background-color: var(--back-main);\n  color: var(--nav-link);\n}\n.fixed-table-body thead th .th-inner {\n  color: var(--nav-link);\n}\n.form-control {\n  background-color: var(--back-main);\n  color: var(--text-main);\n}\n.form-control[disabled],\n.form-control[readonly],\nfieldset[disabled] .form-control {\n  background-color: var(--back-main);\n  color: var(--text-main);\n}\nh1,\nh2,\nh3,\nh4,\nh5,\nh6,\np {\n  color: var(--text-main);\n}\n.help-block {\n  color: var(--text-sub);\n}\ninput[type=text],\ninput[type=search] {\n  background-color: var(--back-sub);\n  color: var(--text-main);\n}\n.input-group,\n.input-group-addon {\n  background-color: var(--back-sub) !important;\n  color: var(--text-main);\n}\n#licensesTable > tbody > tr > td > nobr > a > i.fa {\n  color: var(--text-main);\n}\n.main-footer {\n  background-color: var(--back-main);\n  color: var(--text-main);\n}\n.nav-tabs-custom > .nav-tabs > li > a,\n.nav-tabs-custom > .nav-tabs > li.active > a {\n  color: var(--text-main);\n}\n.nav-tabs-custom > .nav-tabs > li.active {\n  border-top-color: var(--header);\n}\n.nav-tabs-custom > .nav-tabs > li.active > a {\n  background-color: var(--back-main);\n}\n.nav-tabs-custom > .nav-tabs > li.active > a:hover {\n  background-color: var(--back-sub);\n  color: var(--text-main);\n}\n.nav-tabs-custom,\n.nav-tabs-custom > .tab-content {\n  background-color: var(--back-main);\n}\n.navbar-nav > .tasks-menu > .dropdown-menu > li.header {\n  background-color: var(--back-main);\n  color: var(--header);\n}\n.open > .dropdown-toggle.btn-default {\n  background-color: var(--back-sub);\n  color: var(--header);\n}\n.panel {\n  background-color: var(--back-sub);\n  color: var(--text-main);\n}\n.panel-default > .panel-heading {\n  background-color: var(--back-main);\n  color: var(--header);\n}\n.select2-container--default .select2-results__option[aria-selected=true],\n.select2-container--default .select2-results__option[aria-selected=true]:hover {\n  background-color: var(--back-sub);\n  color: var(--header);\n}\n.select2-container--default .select2-results__option--highlighted[aria-selected] {\n  background-color: var(--header);\n  color: var(--back-main);\n}\n.select2-container--default .select2-selection--single .select2-selection__rendered {\n  color: var(--text-main);\n}\n.select2-container--default .select2-selection--multiple .select2-selection__choice {\n  background-color: var(--header);\n}\n.select2-selection--single {\n  background-color: var(--back-sub) !important;\n  color: var(--text-main) !important;\n}\n.select2-dropdown {\n  background-color: var(--back-main);\n  color: var(--text-main);\n}\n.skin-orange-dark .main-header .navbar .dropdown-menu li a {\n  color: #FFFFFF;\n}\n.skin-orange-dark .main-header .navbar .dropdown-menu li a:hover {\n  background-color: #ff8c00;\n}\n.fixed-table-body thead th .th-inner,\n.skin-orange-dark .sidebar-menu > li.active > a,\n.skin-orange .sidebar-menu > li:hover > a,\n.sidebar-toggle:hover {\n  background-color: var(--header) !important;\n}\n.tab-content,\n.tab-pane {\n  background-color: var(--back-main);\n  color: var(--text-main);\n}\n.table-striped > tbody > tr:nth-of-type(odd) {\n  background-color: var(--back-sub);\n}\n.table-striped > tbody > tr:nth-of-type(even) {\n  background-color: var(--back-sub-alt);\n}\n#webui > div > div > div > div > div > table > tbody > tr > td > a > i.fa,\n.box-body,\n.box-footer,\n.box-header {\n  color: var(--text-main);\n}\n.box-header.with-border {\n  border-bottom: #000;\n}\n#customFieldsTable a[href*='/models'] {\n  color: var(--back-sub);\n}\n#customFieldsTable a[href*='/fieldsets'] {\n  background-color: transparent;\n}\n.row-striped {\n  vertical-align: top;\n  line-height: 2.6;\n  padding: 0px;\n  margin-left: 20px;\n  box-sizing: border-box;\n  display: table;\n}\n.row-striped .row:nth-of-type(odd) div {\n  background-color: var(--back-sub);\n  color: var(--text-main);\n  border-top: 1px solid #dddddd;\n  display: table-cell;\n}\n.row-striped .row:nth-of-type(even) div {\n  background-color: var(--back-sub);\n  color: var(--text-main);\n  border-top: 1px solid #dddddd;\n  display: table-cell;\n}\n.row-new-striped > .row:nth-of-type(odd) {\n  background-color: var(--back-sub);\n  color: var(--text-main);\n}\n.row-new-striped > .row:nth-of-type(even) {\n  background-color: var(--back-sub-alt);\n  color: var(--text-main);\n}\n.search-highlight,\n.search-highlight:hover {\n  background-color: #e9d15b;\n}\n.table > tbody > tr.warning > td {\n  background-color: var(--back-sub);\n}\n/*\n * Skin: Purple\n * ----------\n */\n.skin-purple .main-header .navbar {\n  background-color: #605ca8;\n}\n.skin-purple .main-header .navbar .nav > li > a {\n  color: #fff;\n}\n.skin-purple .main-header .navbar .nav > li > a:hover,\n.skin-purple .main-header .navbar .nav > li > a:active,\n.skin-purple .main-header .navbar .nav > li > a:focus,\n.skin-purple .main-header .navbar .nav .open > a,\n.skin-purple .main-header .navbar .nav .open > a:hover,\n.skin-purple .main-header .navbar .nav .open > a:focus,\n.skin-purple .main-header .navbar .nav > .active > a {\n  background: rgba(0, 0, 0, 0.1);\n  color: #f6f6f6;\n}\n.skin-purple .main-header .navbar .sidebar-toggle {\n  color: #fff;\n}\n.skin-purple .main-header .navbar .sidebar-toggle:hover {\n  color: #f6f6f6;\n  background: rgba(0, 0, 0, 0.1);\n}\n.skin-purple .main-header .navbar .sidebar-toggle {\n  color: #fff;\n}\n.skin-purple .main-header .navbar .sidebar-toggle:hover {\n  background-color: #555299;\n}\n@media (max-width: 767px) {\n  .skin-purple .main-header .navbar .dropdown-menu li.divider {\n    background-color: rgba(255, 255, 255, 0.1);\n  }\n  .skin-purple .main-header .navbar .dropdown-menu li a {\n    color: #333;\n  }\n  .skin-purple .main-header .navbar .dropdown-menu li a:hover {\n    background: #555299;\n  }\n}\n.skin-purple .main-header li.user-header {\n  background-color: #605ca8;\n}\n.skin-purple .content-header {\n  background: transparent;\n}\n.skin-purple .wrapper,\n.skin-purple .main-sidebar,\n.skin-purple .left-side {\n  background-color: #222d32;\n}\n.skin-purple .user-panel > .info,\n.skin-purple .user-panel > .info > a {\n  color: #fff;\n}\n.skin-purple .sidebar-menu > li.header {\n  color: #4b646f;\n  background: #1a2226;\n}\n.skin-purple .sidebar-menu > li > a {\n  border-left: 3px solid transparent;\n}\n.skin-purple .sidebar-menu > li:hover > a,\n.skin-purple .sidebar-menu > li.active > a {\n  color: #fff;\n  background: #1e282c;\n  border-left-color: #605ca8;\n}\n.skin-purple .sidebar-menu > li > .treeview-menu {\n  margin: 0 1px;\n  background: #2c3b41;\n}\n.skin-purple .sidebar a {\n  color: #b8c7ce;\n}\n.skin-purple .sidebar a:hover {\n  text-decoration: none;\n}\n.skin-purple .treeview-menu > li > a {\n  color: #8aa4af;\n}\n.skin-purple .treeview-menu > li.active > a,\n.skin-purple .treeview-menu > li > a:hover {\n  color: #fff;\n}\n.skin-purple .sidebar-form {\n  border-radius: 3px;\n  border: 1px solid #374850;\n  margin: 10px 10px;\n}\n.skin-purple .sidebar-form input[type=\"text\"],\n.skin-purple .sidebar-form .btn {\n  box-shadow: none;\n  background-color: #374850;\n  border: 1px solid transparent;\n  height: 35px;\n  -webkit-transition: all 0.3s ease-in-out;\n  -o-transition: all 0.3s ease-in-out;\n  transition: all 0.3s ease-in-out;\n}\n.skin-purple .sidebar-form input[type=\"text\"] {\n  color: #666;\n  border-top-left-radius: 2px;\n  border-top-right-radius: 0;\n  border-bottom-right-radius: 0;\n  border-bottom-left-radius: 2px;\n}\n.skin-purple .sidebar-form input[type=\"text\"]:focus,\n.skin-purple .sidebar-form input[type=\"text\"]:focus + .input-group-btn .btn {\n  background-color: #fff;\n  color: #666;\n}\n.skin-purple .sidebar-form input[type=\"text\"]:focus + .input-group-btn .btn {\n  border-left-color: #fff;\n}\n.skin-purple .sidebar-form .btn {\n  color: #999;\n  border-top-left-radius: 0;\n  border-top-right-radius: 2px;\n  border-bottom-right-radius: 2px;\n  border-bottom-left-radius: 0;\n}\n.skin-purple.layout-top-nav .main-header > .logo .logo-variant {\n  background-color: none;\n}\n.btn.btn-primary,\n.btn:hover.btn-primary,\n.btn .btn-primary:link,\n.btn:hover .btn-primary:link {\n  background-color: #4c4988;\n  border-color: #3a3767;\n  color: #fff;\n}\n.btna.btn-primary:hover,\n.btn:hovera.btn-primary:hover {\n  background-color: #3a3767;\n  border-color: #3a3767;\n  color: #fff;\n}\n.btn.btn-white:link,\n.btn:hover.btn-white:link {\n  background-color: #4c4988;\n  color: #fff;\n}\n.btn.btn-white:hover,\n.btn:hover.btn-white:hover {\n  background-color: #272546;\n  color: #fff;\n}\na {\n  color: var(--link);\n}\na:hover {\n  color: var(--hover-link);\n}\na:visited {\n  color: var(--visited-link);\n}\n.text-primary {\n  color: #3a3767;\n}\n:root {\n  --button-default: #434078;\n  --button-primary: #302e56;\n  --button-hover: #272546;\n  --header: #605ca8;\n  /* Use same as Header picker */\n  --text-main: #BBB;\n  --text-sub: #9b9b9b;\n  --link: #605ca8;\n  /* Use same as Header picker, lighten by 70% */\n  --visited-link: #918ec3;\n  /* Use same as Header picker, lighten by 70% */\n  --hover-link: #c1c0dd;\n  /* Use same as Header picker, lighten by 70% */\n  --nav-link: #FFF;\n  /* Use same as Header picker */\n  --light-link: #fff;\n  /* Use same as Header picker */\n}\na.btn-info:link,\na.btn-warning:link,\na.btn-danger:link {\n  color: #FFF;\n}\na.btn-info:visited,\na.btn-warning:visited,\na.btn-danger:visited {\n  color: #FFF;\n}\n.fixed-table-container tbody .selected td {\n  background-color: #fff8af;\n}\n.select2-container--default .select2-selection--multiple .select2-selection__choice {\n  background-color: #605ca8;\n}\n.far fa-life-ring {\n  color: var(--link);\n}\n.search-highlight,\n.search-highlight:hover {\n  background-color: #e9d15b;\n}\n/*\n * Skin: purple dark\n * ----------\n */\n.skin-purple-dark .main-header .navbar {\n  background-color: #605ca8;\n}\n.skin-purple-dark .main-header .navbar .nav > li > a {\n  color: #fff;\n}\n.skin-purple-dark .main-header .navbar .nav > li > a:hover,\n.skin-purple-dark .main-header .navbar .nav > li > a:active,\n.skin-purple-dark .main-header .navbar .nav > li > a:focus,\n.skin-purple-dark .main-header .navbar .nav .open > a,\n.skin-purple-dark .main-header .navbar .nav .open > a:hover,\n.skin-purple-dark .main-header .navbar .nav .open > a:focus,\n.skin-purple-dark .main-header .navbar .nav > .active > a {\n  background: rgba(0, 0, 0, 0.1);\n  color: #f6f6f6;\n}\n.skin-purple-dark .main-header .navbar .sidebar-toggle {\n  color: #fff;\n}\n.skin-purple-dark .main-header .navbar .sidebar-toggle:hover {\n  color: #f6f6f6;\n  background: rgba(0, 0, 0, 0.1);\n}\n.skin-purple-dark .main-header .navbar .sidebar-toggle {\n  color: #fff;\n}\n.skin-purple-dark .main-header .navbar .sidebar-toggle:hover {\n  background-color: #555299;\n}\n@media (max-width: 767px) {\n  .skin-purple-dark .main-header .navbar .dropdown-menu li.divider {\n    background-color: rgba(255, 255, 255, 0.1);\n    color: #fff;\n  }\n  .skin-purple-dark .main-header .navbar .dropdown-menu li a {\n    color: #fff;\n  }\n  .skin-purple-dark .main-header .navbar .dropdown-menu li a:hover {\n    background: #555299;\n    color: #fff;\n  }\n}\n.skin-purple-dark .main-header li.user-header {\n  background-color: #605ca8;\n}\n.skin-purple-dark .content-header {\n  background: transparent;\n}\n.skin-purple-dark .wrapper,\n.skin-purple-dark .main-sidebar,\n.skin-purple-dark .left-side {\n  background-color: #222d32;\n}\n.skin-purple-dark .user-panel > .info,\n.skin-purple-dark .user-panel > .info > a {\n  color: #fff;\n}\n.skin-purple-dark .sidebar-menu > li.header {\n  color: #4b646f;\n  background: #1a2226;\n}\n.skin-purple-dark .sidebar-menu > li > a {\n  border-left: 3px solid transparent;\n}\n.skin-purple-dark .sidebar-menu > li:hover > a,\n.skin-purple-dark .sidebar-menu > li.active > a {\n  color: #fff;\n  background: #1e282c;\n  border-left-color: #605ca8;\n}\n.skin-purple-dark .sidebar-menu > li > .treeview-menu {\n  margin: 0 1px;\n  background: #2c3b41;\n}\n.skin-purple-dark .sidebar a {\n  color: #b8c7ce;\n}\n.skin-purple-dark .sidebar a:hover {\n  text-decoration: none;\n}\n.skin-purple-dark .treeview-menu > li > a {\n  color: #8aa4af;\n}\n.skin-purple-dark .treeview-menu > li.active > a,\n.skin-purple-dark .treeview-menu > li > a:hover {\n  color: #fff;\n}\n.skin-purple-dark .sidebar-form {\n  border-radius: 3px;\n  border: 1px solid #374850;\n  margin: 10px 10px;\n}\n.skin-purple-dark .sidebar-form input[type=\"text\"],\n.skin-purple-dark .sidebar-form .btn {\n  box-shadow: none;\n  background-color: #374850;\n  border: 1px solid transparent;\n  height: 35px;\n  -webkit-transition: all 0.3s ease-in-out;\n  -o-transition: all 0.3s ease-in-out;\n  transition: all 0.3s ease-in-out;\n}\n.skin-purple-dark .sidebar-form input[type=\"text\"] {\n  color: #666;\n  border-top-left-radius: 2px;\n  border-top-right-radius: 0;\n  border-bottom-right-radius: 0;\n  border-bottom-left-radius: 2px;\n}\n.skin-purple-dark .sidebar-form input[type=\"text\"]:focus,\n.skin-purple-dark .sidebar-form input[type=\"text\"]:focus + .input-group-btn .btn {\n  background-color: #fff;\n  color: #666;\n}\n.skin-purple-dark .sidebar-form input[type=\"text\"]:focus + .input-group-btn .btn {\n  border-left-color: #fff;\n}\n.skin-purple-dark .sidebar-form .btn {\n  color: #999;\n  border-top-left-radius: 0;\n  border-top-right-radius: 2px;\n  border-bottom-right-radius: 2px;\n  border-bottom-left-radius: 0;\n}\n.skin-purple-dark.layout-top-nav .main-header > .logo .logo-variant {\n  background-color: none;\n}\n.btn,\n.btn:hover {\n  color: #fff !important;\n}\n.btn.btn-primary,\n.btn:hover.btn-primary,\n.btn .btn-primary:link,\n.btn:hover .btn-primary:link {\n  background-color: #4c4988;\n  border-color: #FFF;\n  color: #fff;\n}\n.btna.btn-primary:hover,\n.btn:hovera.btn-primary:hover {\n  background-color: #3a3767;\n  border-color: #3a3767;\n  color: #fff;\n}\n.btn.btn-white:link,\n.btn:hover.btn-white:link {\n  background-color: #4c4988;\n  color: #fff;\n}\n.btn.btn-white:hover,\n.btn:hover.btn-white:hover {\n  background-color: #272546;\n  color: #fff;\n}\n/**\nThe dropdown is white, so use a darker color\n */\nli.dropdown-item-marker {\n  color: var(--button-primary);\n}\na:hover {\n  color: var(--hover-link);\n}\na:visited {\n  color: var(--visited-link);\n}\n.text-primary {\n  color: #fff;\n}\n:root {\n  --background: #222;\n  --back-main: #333;\n  --back-sub: #080808;\n  --back-sub-alt: rgba(0, 0, 0, 0.36);\n  --button-default: #434078;\n  --button-primary: #302e56;\n  --button-hover: #272546;\n  --header: #605ca8;\n  /* Use same as Header picker */\n  --text-main: #BBB;\n  --text-sub: #9b9b9b;\n  --link: #AC83FF;\n  /* Use same as Header picker, lighten by 70% */\n  --visited-link: #dfd0ff;\n  /* Use same as Header picker, lighten by 70% */\n  --hover-link: #ffffff;\n  /* Use same as Header picker, lighten by 70% */\n  --nav-link: #FFF;\n  /* Use same as Header picker */\n  --light-link: #fff;\n  /* Use same as Header picker */\n}\n#ldapad_test_results.well.well-sm {\n  color: var(--back-main);\n}\n.pagination > li > a {\n  color: var(--light-link);\n  background-color: var(--back-main);\n}\n.pagination > .active > a {\n  background-color: var(--button-default);\n  border-color: var(--light-link);\n}\n.pagination > .active > a:hover {\n  background-color: var(--hover-link);\n}\n.tasks-menu > .dropdown-menu > li .menu {\n  background-color: var(--back-main);\n}\n.tasks-menu > .dropdown-menu > li .menu > li > a:hover .progress {\n  background-color: var(--background);\n}\nh2.task_menu {\n  color: var(--link);\n}\n.navbar-custom-menu > .navbar-nav > li > .dropdown-menu {\n  background-color: var(--back-main);\n  color: var(--link);\n}\n.main-header .navbar,\n.main-header .logo {\n  background-color: var(--header);\n  background: -webkit-linear-gradient(top, var(--header) 0%, var(--header) 100%);\n  background: linear-gradient(to bottom, var(--header) 0%, var(--header) 100%);\n  border-color: var(--header);\n}\n.bootstrap-table .fixed-table-container .table thead th .sortable {\n  color: var(--nav-link);\n}\n.bootstrap-table .fixed-table-toolbar .columns label {\n  color: #000;\n}\n.thead,\n.navbar-nav > li > a:link {\n  color: var(--nav-link);\n}\n.label-default {\n  background-color: var(--back-sub);\n  color: #fff;\n}\n.modal-content {\n  background-color: var(--back-main);\n  color: var(--text-main);\n}\na:link {\n  color: var(--link);\n}\n.far fa-life-ring {\n  color: var(--link);\n}\n.btn-primary.hover {\n  color: var(--nav-link);\n}\n.small-box h3,\n.small-box p {\n  color: var(--nav-link) !important;\n}\n.small-box h3 a:hover,\n.small-box p a:hover {\n  text-decoration: none;\n  color: var(--nav-link) !important;\n}\na:link.btn-default {\n  color: var(--nav-link);\n}\n#accessoriesTable > tbody > tr > td > nobr > a > i.fa {\n  color: var(--text-main);\n}\n#assetsListingTable > tbody > tr > td > nobr > a > i.fa {\n  color: var(--text-main);\n}\n#assetsListingTable > tbody > tr.selected > td {\n  background-color: var(--back-main);\n}\nbody {\n  color: var(--text-main);\n}\n.box,\n.box.box-default {\n  border-top: 3px solid var(--header);\n  border-top-color: var(--header);\n}\n.box-body,\n.box-footer,\n.box-header {\n  background-color: var(--back-sub);\n  color: var(--header);\n}\n.btn-default {\n  background-color: var(--button-default);\n  color: var(--nav-link);\n}\n.btn-default dropdown-toggle {\n  background-color: var(--button-default);\n  color: var(--nav-link);\n}\n.btn-default:active,\n.btn-default:focus,\n.btn-default:hover,\n.btn-default.active {\n  background-color: var(--button-hover);\n  color: var(--nav-link);\n}\n.btn-primary,\n.btn-primary.hover,\n.btn-primary:active,\n.text-purple {\n  color: var(--nav-link) !important;\n}\n.btn-primary:hover {\n  background-color: var(--button-primary);\n}\n#componentsTable > tbody > tr > td > nobr > a > i.fa {\n  color: var(--text-main);\n}\n#consumablesTable > tbody > tr > td > nobr > a > i.fa {\n  color: var(--text-main);\n}\n.content-wrapper {\n  background-color: var(--background);\n}\n#create-form > div > div > div > span > i.fa {\n  background-color: var(--back-sub);\n  color: var(--header);\n}\n.datepicker .datepicker-switch:hover,\n.datepicker .next:hover,\n.datepicker .prev:hover,\n.datepicker tfoot tr th:hover,\n.datepicker table tr td.day.focused,\n.datepicker table tr td.day:hover {\n  background-color: var(--header);\n}\n.datepicker.dropdown-menu {\n  background-color: var(--back-main);\n  color: var(--text-main);\n}\n#details > div > div > div > table {\n  background-color: transparent;\n}\n.dropdown-menu > li > a:hover {\n  background-color: var(--back-main);\n  color: var(--nav-link);\n}\n.fixed-table-body thead th .th-inner {\n  color: var(--nav-link);\n}\n.form-control {\n  background-color: var(--back-main);\n  color: var(--text-main);\n}\n.form-control[disabled],\n.form-control[readonly],\nfieldset[disabled] .form-control {\n  background-color: var(--back-main);\n  color: var(--text-main);\n}\nh1,\nh2,\nh3,\nh4,\nh5,\nh6,\np {\n  color: var(--text-main);\n}\n.help-block {\n  color: var(--text-sub);\n}\ninput[type=text],\ninput[type=search] {\n  background-color: var(--back-sub);\n  color: var(--text-main);\n}\n.input-group,\n.input-group-addon {\n  background-color: var(--back-sub) !important;\n  color: var(--text-main);\n}\n#licensesTable > tbody > tr > td > nobr > a > i.fa {\n  color: var(--text-main);\n}\n.main-footer {\n  background-color: var(--back-main);\n  color: var(--text-main);\n}\n.nav-tabs-custom > .nav-tabs > li > a,\n.nav-tabs-custom > .nav-tabs > li.active > a {\n  color: var(--text-main);\n}\n.nav-tabs-custom > .nav-tabs > li.active {\n  border-top-color: var(--header);\n}\n.nav-tabs-custom > .nav-tabs > li.active > a {\n  background-color: var(--back-main);\n}\n.nav-tabs-custom > .nav-tabs > li.active > a:hover {\n  background-color: var(--back-sub);\n  color: var(--text-main);\n}\n.nav-tabs-custom,\n.nav-tabs-custom > .tab-content {\n  background-color: var(--back-main);\n}\n.navbar-nav > .tasks-menu > .dropdown-menu > li.header {\n  background-color: var(--back-main);\n  color: var(--link);\n}\n.open > .dropdown-toggle.btn-default {\n  background-color: var(--back-sub);\n  color: var(--header);\n}\n.panel {\n  background-color: var(--back-sub);\n  color: var(--text-main);\n}\n.panel-default > .panel-heading {\n  background-color: var(--back-main);\n  color: var(--header);\n}\n.select2-container--default .select2-results__option[aria-selected=true],\n.select2-container--default .select2-results__option[aria-selected=true]:hover {\n  background-color: var(--back-sub);\n  color: var(--header);\n}\n.select2-container--default .select2-results__option--highlighted[aria-selected] {\n  background-color: var(--header);\n  color: var(--back-main);\n}\n.select2-container--default .select2-selection--single .select2-selection__rendered {\n  color: var(--text-main);\n}\n.select2-container--default .select2-selection--multiple .select2-selection__choice {\n  background-color: var(--header);\n}\n.select2-selection--single {\n  background-color: var(--back-sub) !important;\n  color: var(--text-main) !important;\n}\n.select2-dropdown {\n  background-color: var(--back-main);\n  color: var(--text-main);\n}\n.skin-purple-dark .main-header .navbar .dropdown-menu li a {\n  color: #FFFFFF;\n}\n.skin-purple-dark .main-header .navbar .dropdown-menu li a:hover {\n  background-color: #5f5ca8;\n}\n.fixed-table-body thead th .th-inner,\n.skin-purple-dark .sidebar-menu > li.active > a,\n.skin-purple .sidebar-menu > li:hover > a,\n.sidebar-toggle:hover {\n  background-color: var(--header) !important;\n}\n.tab-content,\n.tab-pane {\n  background-color: var(--back-main);\n  color: var(--text-main);\n}\n.table-striped > tbody > tr:nth-of-type(odd) {\n  background-color: var(--back-sub);\n}\n.table-striped > tbody > tr:nth-of-type(even) {\n  background-color: var(--back-sub-alt);\n}\n#webui > div > div > div > div > div > table > tbody > tr > td > a > i.fa,\n.box-body,\n.box-footer,\n.box-header {\n  color: var(--text-main);\n}\n.box-header.with-border {\n  border-bottom: #000;\n}\na {\n  color: var(--link);\n}\na:link {\n  color: var(--link);\n}\na:hover {\n  color: var(--hover-link);\n  text-decoration: underline;\n}\na:visited {\n  color: var(--visited-link);\n}\n.row-striped {\n  vertical-align: top;\n  line-height: 2.6;\n  padding: 0px;\n  margin-left: 20px;\n  box-sizing: border-box;\n  display: table;\n}\n.row-striped .row:nth-of-type(odd) div {\n  background-color: var(--back-sub);\n  color: var(--text-main);\n  border-top: 1px solid #dddddd;\n  display: table-cell;\n}\n.row-striped .row:nth-of-type(even) div {\n  background-color: var(--back-sub);\n  color: var(--text-main);\n  border-top: 1px solid #dddddd;\n  display: table-cell;\n}\n.row-new-striped > .row:nth-of-type(odd) {\n  background-color: var(--back-sub);\n  color: var(--text-main);\n}\n.row-new-striped > .row:nth-of-type(even) {\n  background-color: var(--back-sub-alt);\n  color: var(--text-main);\n}\n.search-highlight,\n.search-highlight:hover {\n  background-color: #e9d15b;\n}\n.table > tbody > tr.warning > td {\n  background-color: var(--back-sub);\n}\n/*\n * Skin: Red\n * ----------\n */\n.skin-red .main-header .navbar {\n  background-color: #dd4b39;\n}\n.skin-red .main-header .navbar .nav > li > a {\n  color: #fff;\n}\n.skin-red .main-header .navbar .nav > li > a:hover,\n.skin-red .main-header .navbar .nav > li > a:active,\n.skin-red .main-header .navbar .nav > li > a:focus,\n.skin-red .main-header .navbar .nav .open > a,\n.skin-red .main-header .navbar .nav .open > a:hover,\n.skin-red .main-header .navbar .nav .open > a:focus,\n.skin-red .main-header .navbar .nav > .active > a {\n  background: rgba(0, 0, 0, 0.1);\n  color: #f6f6f6;\n}\n.skin-red .main-header .navbar .sidebar-toggle {\n  color: #fff;\n}\n.skin-red .main-header .navbar .sidebar-toggle:hover {\n  color: #f6f6f6;\n  background: rgba(0, 0, 0, 0.1);\n}\n.skin-red .main-header .navbar .sidebar-toggle {\n  color: #fff;\n}\n.skin-red .main-header .navbar .sidebar-toggle:hover {\n  background-color: #d73925;\n}\n@media (max-width: 767px) {\n  .skin-red .main-header .navbar .dropdown-menu li.divider {\n    background-color: rgba(255, 255, 255, 0.1);\n  }\n  .skin-red .main-header .navbar .dropdown-menu li a {\n    color: #333;\n  }\n  .skin-red .main-header .navbar .dropdown-menu li a:hover {\n    background: #d73925;\n  }\n}\n.skin-red .main-header li.user-header {\n  background-color: #dd4b39;\n}\n.skin-red .content-header {\n  background: transparent;\n}\n.skin-red .wrapper,\n.skin-red .main-sidebar,\n.skin-red .left-side {\n  background-color: #222d32;\n}\n.skin-red .user-panel > .info,\n.skin-red .user-panel > .info > a {\n  color: #fff;\n}\n.skin-red .sidebar-menu > li.header {\n  color: #4b646f;\n  background: #1a2226;\n}\n.skin-red .sidebar-menu > li > a {\n  border-left: 3px solid transparent;\n}\n.skin-red .sidebar-menu > li:hover > a,\n.skin-red .sidebar-menu > li.active > a {\n  color: #fff;\n  background: #1e282c;\n  border-left-color: #dd4b39;\n}\n.skin-red .sidebar-menu > li > .treeview-menu {\n  margin: 0 1px;\n  background: #2c3b41;\n}\n.skin-red .sidebar a {\n  color: #b8c7ce;\n}\n.skin-red .sidebar a:hover {\n  text-decoration: none;\n}\n.skin-red .treeview-menu > li > a {\n  color: #8aa4af;\n}\n.skin-red .treeview-menu > li.active > a,\n.skin-red .treeview-menu > li > a:hover {\n  color: #fff;\n}\n.skin-red .sidebar-form {\n  border-radius: 3px;\n  border: 1px solid #374850;\n  margin: 10px 10px;\n}\n.skin-red .sidebar-form input[type=\"text\"],\n.skin-red .sidebar-form .btn {\n  box-shadow: none;\n  background-color: #374850;\n  border: 1px solid transparent;\n  height: 35px;\n  -webkit-transition: all 0.3s ease-in-out;\n  -o-transition: all 0.3s ease-in-out;\n  transition: all 0.3s ease-in-out;\n}\n.skin-red .sidebar-form input[type=\"text\"] {\n  color: #666;\n  border-top-left-radius: 2px;\n  border-top-right-radius: 0;\n  border-bottom-right-radius: 0;\n  border-bottom-left-radius: 2px;\n}\n.skin-red .sidebar-form input[type=\"text\"]:focus,\n.skin-red .sidebar-form input[type=\"text\"]:focus + .input-group-btn .btn {\n  background-color: #fff;\n  color: #666;\n}\n.skin-red .sidebar-form input[type=\"text\"]:focus + .input-group-btn .btn {\n  border-left-color: #fff;\n}\n.skin-red .sidebar-form .btn {\n  color: #999;\n  border-top-left-radius: 0;\n  border-top-right-radius: 2px;\n  border-bottom-right-radius: 2px;\n  border-bottom-left-radius: 0;\n}\n.skin-red.layout-top-nav .main-header > .logo .logo-variant {\n  background-color: none;\n}\n.btn.btn-primary,\n.btn:hover.btn-primary,\n.btn .btn-primary:link,\n.btn:hover .btn-primary:link {\n  background-color: #c23321;\n  border-color: #96271a;\n  color: #fff;\n}\n.btna.btn-primary:hover,\n.btn:hovera.btn-primary:hover {\n  background-color: #96271a;\n  border-color: #96271a;\n  color: #fff;\n}\n.btn.btn-white:link,\n.btn:hover.btn-white:link {\n  background-color: #c23321;\n  color: #fff;\n}\n.btn.btn-white:hover,\n.btn:hover.btn-white:hover {\n  background-color: #6b1c12;\n  color: #fff;\n}\na {\n  color: #dd4b39;\n}\na:hover {\n  color: #96271a;\n}\na:visited {\n  color: #dd4b39;\n}\n.text-primary {\n  color: #96271a;\n}\n:root {\n  --button-default: #ac2d1e;\n  --button-primary: #802216;\n  --button-hover: #6b1c12;\n  --header: #dd4b39;\n  /* Use same as Header picker */\n  --text-main: #BBB;\n  --text-alt: #222;\n  --text-sub: #9b9b9b;\n  --link: #dd4b39;\n  /* Use same as Header picker, lighten by 70% */\n  --visited-link: #e8867a;\n  /* Use same as Header picker, lighten by 70% */\n  --hover-link: #f3c2bc;\n  /* Use same as Header picker, lighten by 70% */\n  --nav-link: #FFF;\n  /* Use same as Header picker */\n  --light-link: #fff;\n  /* Use same as Header picker */\n}\na:link {\n  color: var(--link);\n}\na:visited {\n  color: var(--visited-link);\n}\na.btn-info:link,\na.btn-warning:link,\na.btn-danger:link {\n  color: #FFF;\n}\na.btn-info:visited,\na.btn-warning:visited,\na.btn-danger:visited {\n  color: #FFF;\n}\n.fixed-table-container tbody .selected td {\n  background-color: #fff8af;\n}\n.select2-container--default .select2-selection--multiple .select2-selection__choice {\n  background-color: #dd4b39;\n}\n.search-highlight,\n.search-highlight:hover {\n  background-color: #e9d15b;\n}\n.far fa-life-ring {\n  color: var(--link);\n}\n/*\n * Skin: red dark\n * ----------\n */\n.skin-red-dark .main-header .navbar {\n  background-color: #dd4b39;\n}\n.skin-red-dark .main-header .navbar .nav > li > a {\n  color: #fff;\n}\n.skin-red-dark .main-header .navbar .nav > li > a:hover,\n.skin-red-dark .main-header .navbar .nav > li > a:active,\n.skin-red-dark .main-header .navbar .nav > li > a:focus,\n.skin-red-dark .main-header .navbar .nav .open > a,\n.skin-red-dark .main-header .navbar .nav .open > a:hover,\n.skin-red-dark .main-header .navbar .nav .open > a:focus,\n.skin-red-dark .main-header .navbar .nav > .active > a {\n  background: rgba(0, 0, 0, 0.1);\n  color: #f6f6f6;\n}\n.skin-red-dark .main-header .navbar .sidebar-toggle {\n  color: #fff;\n}\n.skin-red-dark .main-header .navbar .sidebar-toggle:hover {\n  color: #f6f6f6;\n  background: rgba(0, 0, 0, 0.1);\n}\n.skin-red-dark .main-header .navbar .sidebar-toggle {\n  color: #fff;\n}\n.skin-red-dark .main-header .navbar .sidebar-toggle:hover {\n  background-color: #d73925;\n}\n@media (max-width: 767px) {\n  .skin-red-dark .main-header .navbar .dropdown-menu li.divider {\n    background-color: rgba(255, 255, 255, 0.1);\n    color: #fff;\n  }\n  .skin-red-dark .main-header .navbar .dropdown-menu li a {\n    color: #fff;\n  }\n  .skin-red-dark .main-header .navbar .dropdown-menu li a:hover {\n    background: #d73925;\n    color: #fff;\n  }\n}\n.skin-red-dark .main-header li.user-header {\n  background-color: #dd4b39;\n}\n.skin-red-dark .content-header {\n  background: transparent;\n}\n.skin-red-dark .wrapper,\n.skin-red-dark .main-sidebar,\n.skin-red-dark .left-side {\n  background-color: #222d32;\n}\n.skin-red-dark .user-panel > .info,\n.skin-red-dark .user-panel > .info > a {\n  color: #fff;\n}\n.skin-red-dark .sidebar-menu > li.header {\n  color: #4b646f;\n  background: #1a2226;\n}\n.skin-red-dark .sidebar-menu > li > a {\n  border-left: 3px solid transparent;\n}\n.skin-red-dark .sidebar-menu > li:hover > a,\n.skin-red-dark .sidebar-menu > li.active > a {\n  color: #fff;\n  background: #1e282c;\n  border-left-color: #dd4b39;\n}\n.skin-red-dark .sidebar-menu > li > .treeview-menu {\n  margin: 0 1px;\n  background: #2c3b41;\n}\n.skin-red-dark .sidebar a {\n  color: #b8c7ce;\n}\n.skin-red-dark .sidebar a:hover {\n  text-decoration: none;\n}\n.skin-red-dark .treeview-menu > li > a {\n  color: #8aa4af;\n}\n.skin-red-dark .treeview-menu > li.active > a,\n.skin-red-dark .treeview-menu > li > a:hover {\n  color: #fff;\n}\n.skin-red-dark .sidebar-form {\n  border-radius: 3px;\n  border: 1px solid #374850;\n  margin: 10px 10px;\n}\n.skin-red-dark .sidebar-form input[type=\"text\"],\n.skin-red-dark .sidebar-form .btn {\n  box-shadow: none;\n  background-color: #374850;\n  border: 1px solid transparent;\n  height: 35px;\n  -webkit-transition: all 0.3s ease-in-out;\n  -o-transition: all 0.3s ease-in-out;\n  transition: all 0.3s ease-in-out;\n}\n.skin-red-dark .sidebar-form input[type=\"text\"] {\n  color: #666;\n  border-top-left-radius: 2px;\n  border-top-right-radius: 0;\n  border-bottom-right-radius: 0;\n  border-bottom-left-radius: 2px;\n}\n.skin-red-dark .sidebar-form input[type=\"text\"]:focus,\n.skin-red-dark .sidebar-form input[type=\"text\"]:focus + .input-group-btn .btn {\n  background-color: #fff;\n  color: #666;\n}\n.skin-red-dark .sidebar-form input[type=\"text\"]:focus + .input-group-btn .btn {\n  border-left-color: #fff;\n}\n.skin-red-dark .sidebar-form .btn {\n  color: #999;\n  border-top-left-radius: 0;\n  border-top-right-radius: 2px;\n  border-bottom-right-radius: 2px;\n  border-bottom-left-radius: 0;\n}\n.skin-red-dark.layout-top-nav .main-header > .logo .logo-variant {\n  background-color: none;\n}\n.btn,\n.btn:hover {\n  color: #fff;\n}\n.btn.btn-primary,\n.btn:hover.btn-primary,\n.btn .btn-primary:link,\n.btn:hover .btn-primary:link {\n  background-color: #c23321;\n  border-color: #FFF;\n  color: #fff;\n}\n.btna.btn-primary:hover,\n.btn:hovera.btn-primary:hover {\n  background-color: #96271a;\n  border-color: #96271a;\n  color: #fff;\n}\n.btn.btn-white:link,\n.btn:hover.btn-white:link {\n  background-color: #c23321;\n  color: #fff;\n}\n.btn.btn-white:hover,\n.btn:hover.btn-white:hover {\n  background-color: #6b1c12;\n  color: #fff;\n}\n/**\nThe dropdown is white, so use a darker color\n */\nli.dropdown-item-marker {\n  color: var(--button-primary);\n}\na:hover {\n  color: #fff;\n}\na:visited {\n  color: #fff;\n}\n.text-primary {\n  color: #fff;\n}\n:root {\n  --background: #222;\n  --back-main: #333;\n  --back-sub: #3d4144;\n  --back-sub-alt: rgba(0, 0, 0, 0.36);\n  --button-default: #ac2d1e;\n  --button-primary: #802216;\n  --button-hover: #6b1c12;\n  --header: #dd4b39;\n  /* Use same as Header picker */\n  --text-main: #BBB;\n  --text-alt: #222;\n  --text-sub: #9b9b9b;\n  --link: #e00000;\n  /* Use same as Header picker, lighten by 70% */\n  --visited-link: #D24D57;\n  /* Use same as Header picker, lighten by 70% */\n  --hover-link: #D24D57;\n  /* Use same as Header picker, lighten by 70% */\n  --nav-link: #FFF;\n  /* Use same as Header picker */\n  --light-link: #fff;\n  /* Use same as Header picker */\n}\n#ldapad_test_results.well.well-sm {\n  color: var(--back-main);\n}\n.pagination > li > a {\n  color: var(--light-link);\n  background-color: var(--back-main);\n}\n.pagination > .active > a {\n  background-color: var(--visited-link);\n  border-color: var(--light-link);\n}\n.pagination > .active > a:hover {\n  background-color: var(--hover-link);\n}\n.tasks-menu > .dropdown-menu > li .menu {\n  background-color: var(--back-main);\n}\n.tasks-menu > .dropdown-menu > li .menu > li > a:hover .progress {\n  background-color: var(--background);\n}\nh2.task_menu {\n  color: var(--link);\n}\n.navbar-custom-menu > .navbar-nav > li > .dropdown-menu {\n  background-color: var(--back-main);\n  color: var(--link);\n}\n.main-header .navbar,\n.main-header .logo {\n  background-color: var(--header);\n  background: -webkit-linear-gradient(top, var(--header) 0%, var(--header) 100%);\n  background: linear-gradient(to bottom, var(--header) 0%, var(--header) 100%);\n  border-color: var(--header);\n}\n.bootstrap-table .fixed-table-container .table thead th .sortable {\n  color: var(--nav-link);\n}\n.bootstrap-table .fixed-table-toolbar .columns label {\n  color: #000;\n}\n.thead,\n.navbar-nav > li > a:link {\n  color: var(--nav-link);\n}\n.modal-content {\n  background-color: var(--back-main);\n  color: var(--text-main);\n}\na:link {\n  color: var(--link);\n}\na:hover {\n  color: var(--hover-link);\n}\na:visited {\n  color: var(--nav-link);\n}\n.far fa-life-ring {\n  color: var(--link);\n}\n.btn-primary.hover {\n  color: var(--nav-link);\n}\n.small-box h3,\n.small-box p {\n  color: var(--nav-link) !important;\n}\n.small-box h3 a:hover,\n.small-box p a:hover {\n  text-decoration: none;\n  color: var(--nav-link) !important;\n}\n#accessoriesTable > tbody > tr > td > nobr > a > i.fa {\n  color: var(--text-main);\n}\n#assetsListingTable > tbody > tr > td > nobr > a > i.fa {\n  color: var(--text-main);\n}\n#assetsListingTable > tbody > tr.selected > td {\n  background-color: var(--back-main);\n}\nbody {\n  color: var(--text-main);\n}\n.box,\n.box.box-default {\n  border-top: 3px solid var(--header);\n  border-top-color: var(--header);\n}\n.box-body,\n.box-footer,\n.box-header {\n  background-color: var(--back-sub);\n  color: var(--header);\n}\n.btn-default {\n  background-color: var(--back-sub);\n}\n.btn-default dropdown-toggle {\n  background-color: var(--button-default);\n  color: var(--link);\n}\n.btn-default:active,\n.btn-default:focus,\n.btn-default:hover,\n.btn-default.active {\n  background-color: var(--button-hover);\n  color: var(--link);\n}\n.btn-primary,\n.btn-primary.hover,\n.btn-primary:active,\n.text-red {\n  color: var(--button-primary);\n}\n.btn-primary:hover {\n  background-color: var(--button-primary);\n}\n#componentsTable > tbody > tr > td > nobr > a > i.fa {\n  color: var(--text-main);\n}\n#consumablesTable > tbody > tr > td > nobr > a > i.fa {\n  color: var(--text-main);\n}\n.content-wrapper {\n  background-color: var(--background);\n}\n#create-form > div > div > div > span > i.fa {\n  background-color: var(--back-sub);\n  color: var(--header);\n}\n.datepicker .datepicker-switch:hover,\n.datepicker .next:hover,\n.datepicker .prev:hover,\n.datepicker tfoot tr th:hover,\n.datepicker table tr td.day.focused,\n.datepicker table tr td.day:hover {\n  background-color: var(--header);\n}\n.datepicker.dropdown-menu {\n  background-color: var(--back-main);\n  color: var(--text-main);\n}\n#details > div > div > div > table {\n  background-color: transparent;\n}\n.dropdown-menu > li > a:hover {\n  background-color: var(--back-main);\n  color: var(--nav-link);\n}\n.fixed-table-body thead th .th-inner {\n  color: var(--nav-link);\n}\n.form-control {\n  background-color: var(--back-main);\n  color: var(--text-main);\n}\n.form-control[disabled],\n.form-control[readonly],\nfieldset[disabled] .form-control {\n  background-color: var(--back-main);\n  color: var(--text-main);\n}\nh1,\nh2,\nh3,\nh4,\nh5,\nh6,\np {\n  color: var(--text-main);\n}\n.help-block {\n  color: var(--text-sub);\n}\ninput[type=text],\ninput[type=search] {\n  background-color: var(--back-sub);\n  color: var(--text-main);\n}\n.input-group,\n.input-group-addon {\n  background-color: var(--back-sub) !important;\n  color: var(--text-main);\n}\n#licensesTable > tbody > tr > td > nobr > a > i.fa {\n  color: var(--text-main);\n}\n.main-footer {\n  background-color: var(--back-main);\n  color: var(--text-main);\n}\n.nav-tabs-custom > .nav-tabs > li > a,\n.nav-tabs-custom > .nav-tabs > li.active > a {\n  color: var(--text-main);\n}\n.nav-tabs-custom > .nav-tabs > li.active {\n  border-top-color: var(--header);\n}\n.nav-tabs-custom > .nav-tabs > li.active > a {\n  background-color: var(--back-main);\n}\n.nav-tabs-custom > .nav-tabs > li.active > a:hover {\n  background-color: var(--back-sub);\n  color: var(--text-main);\n}\n.nav-tabs-custom,\n.nav-tabs-custom > .tab-content {\n  background-color: var(--back-main);\n}\n.navbar-nav > .tasks-menu > .dropdown-menu > li.header {\n  background-color: var(--back-main);\n  color: var(--header);\n}\n.open > .dropdown-toggle.btn-default {\n  background-color: var(--back-sub);\n  color: var(--header);\n}\n.panel {\n  background-color: var(--back-sub);\n  color: var(--text-main);\n}\n.panel-default > .panel-heading {\n  background-color: var(--back-main);\n  color: var(--header);\n}\n.select2-container--default .select2-results__option[aria-selected=true],\n.select2-container--default .select2-results__option[aria-selected=true]:hover {\n  background-color: var(--back-sub);\n  color: var(--header);\n}\n.select2-container--default .select2-results__option--highlighted[aria-selected] {\n  background-color: var(--header);\n  color: var(--back-main);\n}\n.select2-container--default .select2-selection--single .select2-selection__rendered {\n  color: var(--text-main);\n}\n.select2-container--default .select2-selection--multiple .select2-selection__choice {\n  background-color: var(--header);\n}\n.select2-selection--single {\n  background-color: var(--back-sub) !important;\n  color: var(--text-main) !important;\n}\n.select2-dropdown {\n  background-color: var(--back-main);\n  color: var(--text-main);\n}\n.skin-red-dark .main-header .navbar .dropdown-menu li a {\n  color: #FFFFFF;\n}\n.skin-red-dark .main-header .navbar .dropdown-menu li a:hover {\n  background-color: #c23320;\n}\n.fixed-table-body thead th .th-inner,\n.skin-red-dark .sidebar-menu > li.active > a,\n.skin-red .sidebar-menu > li:hover > a,\n.sidebar-toggle:hover {\n  background-color: var(--header) !important;\n}\n.tab-content,\n.tab-pane {\n  background-color: var(--back-main);\n  color: var(--text-main);\n}\n.table-striped > tbody > tr:nth-of-type(odd) {\n  background-color: var(--back-sub);\n}\n.table-striped > tbody > tr:nth-of-type(even) {\n  background-color: var(--back-sub-alt);\n}\n#webui > div > div > div > div > div > table > tbody > tr > td > a > i.fa,\n.box-body,\n.box-footer,\n.box-header {\n  color: var(--text-main);\n}\n.box-header.with-border {\n  border-bottom: #000;\n}\n#upload-table tbody > tr.warning > td,\n#upload-table h3,\n#upload-table p {\n  background-color: #fcf8e3;\n  color: #000;\n}\na {\n  color: var(--link);\n}\na:link {\n  color: var(--nav-link);\n}\na:hover {\n  color: var(--nav-link);\n  text-decoration: underline;\n}\na:visited {\n  color: var(--nav-link);\n}\n#customFieldsTable a[href*='/models'] {\n  color: var(--back-sub);\n}\n#customFieldsTable a[href*='/fieldsets'] {\n  background-color: transparent;\n}\n.row-striped {\n  vertical-align: top;\n  line-height: 2.6;\n  padding: 0px;\n  margin-left: 20px;\n  box-sizing: border-box;\n  display: table;\n}\n.row-striped .row:nth-of-type(odd) div {\n  background-color: var(--back-sub);\n  color: var(--text-main);\n  border-top: 1px solid #dddddd;\n  display: table-cell;\n}\n.row-striped .row:nth-of-type(even) div {\n  background-color: var(--back-sub);\n  color: var(--text-main);\n  border-top: 1px solid #dddddd;\n  display: table-cell;\n}\n.row-new-striped > .row:nth-of-type(odd) {\n  background-color: var(--back-sub);\n  color: var(--text-main);\n}\n.row-new-striped > .row:nth-of-type(even) {\n  background-color: var(--back-sub-alt);\n  color: var(--text-main);\n}\n.search-highlight,\n.search-highlight:hover {\n  background-color: #e9d15b;\n}\n.table > tbody > tr.warning > td {\n  background-color: var(--back-sub);\n}\n/*\n * Skin: Orange\n * ----------\n */\n.skin-orange .main-header .navbar {\n  background-color: #FF8C00;\n}\n.skin-orange .main-header .navbar .nav > li > a {\n  color: #fff;\n}\n.skin-orange .main-header .navbar .nav > li > a:hover,\n.skin-orange .main-header .navbar .nav > li > a:active,\n.skin-orange .main-header .navbar .nav > li > a:focus,\n.skin-orange .main-header .navbar .nav .open > a,\n.skin-orange .main-header .navbar .nav .open > a:hover,\n.skin-orange .main-header .navbar .nav .open > a:focus,\n.skin-orange .main-header .navbar .nav > .active > a {\n  background: rgba(0, 0, 0, 0.1);\n  color: #f6f6f6;\n}\n.skin-orange .main-header .navbar .sidebar-toggle {\n  color: #fff;\n}\n.skin-orange .main-header .navbar .sidebar-toggle:hover {\n  color: #f6f6f6;\n  background: rgba(0, 0, 0, 0.1);\n}\n.skin-orange .main-header .navbar .sidebar-toggle {\n  color: #fff;\n}\n.skin-orange .main-header .navbar .sidebar-toggle:hover {\n  background-color: #e67e00;\n}\n@media (max-width: 767px) {\n  .skin-orange .main-header .navbar .dropdown-menu li.divider {\n    background-color: rgba(255, 255, 255, 0.1);\n  }\n  .skin-orange .main-header .navbar .dropdown-menu li a {\n    color: #333;\n  }\n  .skin-orange .main-header .navbar .dropdown-menu li a:hover {\n    background: #e67e00;\n  }\n}\n.skin-orange .main-header li.user-header {\n  background-color: #FF8C00;\n}\n.skin-orange .content-header {\n  background: transparent;\n}\n.skin-orange .wrapper,\n.skin-orange .main-sidebar,\n.skin-orange .left-side {\n  background-color: #222d32;\n}\n.skin-orange .user-panel > .info,\n.skin-orange .user-panel > .info > a {\n  color: #fff;\n}\n.skin-orange .sidebar-menu > li.header {\n  color: #4b646f;\n  background: #1a2226;\n}\n.skin-orange .sidebar-menu > li > a {\n  border-left: 3px solid transparent;\n}\n.skin-orange .sidebar-menu > li:hover > a,\n.skin-orange .sidebar-menu > li.active > a {\n  color: #fff;\n  background: #1e282c;\n  border-left-color: #FF8C00;\n}\n.skin-orange .sidebar-menu > li > .treeview-menu {\n  margin: 0 1px;\n  background: #2c3b41;\n}\n.skin-orange .sidebar a {\n  color: #b8c7ce;\n}\n.skin-orange .sidebar a:hover {\n  text-decoration: none;\n}\n.skin-orange .treeview-menu > li > a {\n  color: #8aa4af;\n}\n.skin-orange .treeview-menu > li.active > a,\n.skin-orange .treeview-menu > li > a:hover {\n  color: #fff;\n}\n.skin-orange .sidebar-form {\n  border-radius: 3px;\n  border: 1px solid #374850;\n  margin: 10px 10px;\n}\n.skin-orange .sidebar-form input[type=\"text\"],\n.skin-orange .sidebar-form .btn {\n  box-shadow: none;\n  background-color: #374850;\n  border: 1px solid transparent;\n  height: 35px;\n  -webkit-transition: all 0.3s ease-in-out;\n  -o-transition: all 0.3s ease-in-out;\n  transition: all 0.3s ease-in-out;\n}\n.skin-orange .sidebar-form input[type=\"text\"] {\n  color: #666;\n  border-top-left-radius: 2px;\n  border-top-right-radius: 0;\n  border-bottom-right-radius: 0;\n  border-bottom-left-radius: 2px;\n}\n.skin-orange .sidebar-form input[type=\"text\"]:focus,\n.skin-orange .sidebar-form input[type=\"text\"]:focus + .input-group-btn .btn {\n  background-color: #fff;\n  color: #666;\n}\n.skin-orange .sidebar-form input[type=\"text\"]:focus + .input-group-btn .btn {\n  border-left-color: #fff;\n}\n.skin-orange .sidebar-form .btn {\n  color: #999;\n  border-top-left-radius: 0;\n  border-top-right-radius: 2px;\n  border-bottom-right-radius: 2px;\n  border-bottom-left-radius: 0;\n}\n.skin-orange.layout-top-nav .main-header > .logo .logo-variant {\n  background-color: none;\n}\n.btn.btn-primary,\n.btn:hover.btn-primary,\n.btn .btn-primary:link,\n.btn:hover .btn-primary:link {\n  background-color: #cc7000;\n  border-color: #995400;\n  color: #fff;\n}\n.btna.btn-primary:hover,\n.btn:hovera.btn-primary:hover {\n  background-color: #995400;\n  border-color: #995400;\n  color: #fff;\n}\n.btn.btn-white:link,\n.btn:hover.btn-white:link {\n  background-color: #cc7000;\n  color: #fff;\n}\n.btn.btn-white:hover,\n.btn:hover.btn-white:hover {\n  background-color: #663800;\n  color: #fff;\n}\na {\n  color: var(--link);\n}\na:hover {\n  color: var(--hover-link);\n}\na:visited {\n  color: var(--visited-link);\n}\n.text-primary {\n  color: #995400;\n}\n:root {\n  --button-default: #b36200;\n  --button-primary: #804600;\n  --button-hover: #663800;\n  --header: #FF8C00;\n  /* Use same as Header picker */\n  --text-main: #BBB;\n  --text-sub: #9b9b9b;\n  --link: #FF8C00;\n  /* Use same as Header picker, lighten by 70% */\n  --visited-link: #ffa333;\n  /* Use same as Header picker, lighten by 70% */\n  --hover-link: #ffaf4d;\n  /* Use same as Header picker, lighten by 70% */\n  --nav-link: #FFF;\n  /* Use same as Header picker */\n  --light-link: #fff;\n  /* Use same as Header picker */\n}\na.btn-info:link,\na.btn-warning:link,\na.btn-danger:link {\n  color: #FFF;\n}\na.btn-info:visited,\na.btn-warning:visited,\na.btn-danger:visited {\n  color: #FFF;\n}\n.far fa-life-ring {\n  color: var(--link);\n}\n.fixed-table-container tbody .selected td {\n  background-color: #fff8af;\n}\n.select2-container--default .select2-selection--multiple .select2-selection__choice {\n  background-color: #FF8C00;\n}\n.search-highlight,\n.search-highlight:hover {\n  background-color: #e9d15b;\n}\n/*\n * Skin: Yellow\n * ----------\n */\n.skin-yellow .main-header .navbar {\n  background-color: #FBCC34;\n}\n.skin-yellow .main-header .navbar .nav > li > a {\n  color: rgba(255, 255, 255, 0.8);\n}\n.skin-yellow .main-header .navbar .nav > li > a:hover,\n.skin-yellow .main-header .navbar .nav > li > a:active,\n.skin-yellow .main-header .navbar .nav > li > a:focus,\n.skin-yellow .main-header .navbar .nav .open > a,\n.skin-yellow .main-header .navbar .nav .open > a:hover,\n.skin-yellow .main-header .navbar .nav .open > a:focus,\n.skin-yellow .main-header .navbar .nav > .active > a {\n  background: rgba(0, 0, 0, 0.1);\n  color: #f6f6f6;\n}\n.skin-yellow .main-header .navbar .sidebar-toggle {\n  color: rgba(255, 255, 255, 0.8);\n}\n.skin-yellow .main-header .navbar .sidebar-toggle:hover {\n  color: #f6f6f6;\n  background: rgba(0, 0, 0, 0.1);\n}\n.skin-yellow .main-header .navbar .sidebar-toggle {\n  color: #000;\n}\n.skin-yellow .main-header .navbar .sidebar-toggle:hover {\n  background-color: #fbc61b;\n}\n@media (max-width: 767px) {\n  .skin-yellow .main-header .navbar .dropdown-menu li.divider {\n    background-color: rgba(255, 255, 255, 0.1);\n  }\n  .skin-yellow .main-header .navbar .dropdown-menu li a {\n    color: #333;\n  }\n  .skin-yellow .main-header .navbar .dropdown-menu li a:hover {\n    background: #fbc61b;\n  }\n}\n.skin-yellow .main-header li.user-header {\n  background-color: #FBCC34;\n}\n.skin-yellow .content-header {\n  background: transparent;\n}\n.skin-yellow .wrapper,\n.skin-yellow .main-sidebar,\n.skin-yellow .left-side {\n  background-color: #222d32;\n}\n.skin-yellow .user-panel > .info,\n.skin-yellow .user-panel > .info > a {\n  color: #fff;\n}\n.skin-yellow .sidebar-menu > li.header {\n  color: #4b646f;\n  background: #1a2226;\n}\n.skin-yellow .sidebar-menu > li > a {\n  border-left: 3px solid transparent;\n}\n.skin-yellow .sidebar-menu > li:hover > a,\n.skin-yellow .sidebar-menu > li.active > a {\n  color: #fff;\n  background: #1e282c;\n  border-left-color: #FBCC34;\n}\n.skin-yellow .sidebar-menu > li > .treeview-menu {\n  margin: 0 1px;\n  background: #2c3b41;\n}\n.skin-yellow .sidebar a {\n  color: #b8c7ce;\n}\n.skin-yellow .sidebar a:hover {\n  text-decoration: none;\n}\n.skin-yellow .treeview-menu > li > a {\n  color: #8aa4af;\n}\n.skin-yellow .treeview-menu > li.active > a,\n.skin-yellow .treeview-menu > li > a:hover {\n  color: #fff;\n}\n.skin-yellow .sidebar-form {\n  border-radius: 3px;\n  border: 1px solid #374850;\n  margin: 10px 10px;\n}\n.skin-yellow .sidebar-form input[type=\"text\"],\n.skin-yellow .sidebar-form .btn {\n  box-shadow: none;\n  background-color: #374850;\n  border: 1px solid transparent;\n  height: 35px;\n  -webkit-transition: all 0.3s ease-in-out;\n  -o-transition: all 0.3s ease-in-out;\n  transition: all 0.3s ease-in-out;\n}\n.skin-yellow .sidebar-form input[type=\"text\"] {\n  color: #666;\n  border-top-left-radius: 2px;\n  border-top-right-radius: 0;\n  border-bottom-right-radius: 0;\n  border-bottom-left-radius: 2px;\n}\n.skin-yellow .sidebar-form input[type=\"text\"]:focus,\n.skin-yellow .sidebar-form input[type=\"text\"]:focus + .input-group-btn .btn {\n  background-color: #fff;\n  color: #666;\n}\n.skin-yellow .sidebar-form input[type=\"text\"]:focus + .input-group-btn .btn {\n  border-left-color: #fff;\n}\n.skin-yellow .sidebar-form .btn {\n  color: #999;\n  border-top-left-radius: 0;\n  border-top-right-radius: 2px;\n  border-bottom-right-radius: 2px;\n  border-bottom-left-radius: 0;\n}\n.skin-yellow.layout-top-nav .main-header > .logo .logo-variant {\n  color: #413F42;\n  background-color: none;\n}\n.btn.btn-primary,\n.btn:hover.btn-primary,\n.btn .btn-primary:link,\n.btn:hover .btn-primary:link {\n  background-color: #f7be05;\n  border-color: #c59704;\n  color: var(--nav-link);\n}\n.btna.btn-primary:hover,\n.btn:hovera.btn-primary:hover {\n  background-color: #c59704;\n  border-color: #c59704;\n  color: var(--nav-link);\n}\n.btn.btn-white:link,\n.btn:hover.btn-white:link {\n  background-color: #f7be05;\n  color: var(--nav-link);\n}\n.btn.btn-white:hover,\n.btn:hover.btn-white:hover {\n  background-color: #937103;\n  color: var(--nav-link);\n}\na.btn-info:link,\na.btn-warning:link,\na.btn-danger:link {\n  color: #FFF;\n}\na.btn-info:visited,\na.btn-warning:visited,\na.btn-danger:visited {\n  color: #FFF;\n}\na {\n  color: var(--link);\n}\na:hover {\n  color: var(--hover-link);\n}\na:visited {\n  color: var(--visited-link);\n}\n.text-primary {\n  color: #c59704;\n}\n:root {\n  --button-default: #deab04;\n  --button-primary: #ac8403;\n  --button-hover: #937103;\n  --header: #FBCC34;\n  /* Use same as Header picker */\n  --text-main: #BBB;\n  --text-sub: #9b9b9b;\n  --link: #5b585c;\n  /* Use same as Header picker, lighten by 70% */\n  --visited-link: #747176;\n  /* Use same as Header picker, lighten by 70% */\n  --hover-link: #b4b1b5;\n  /* Use same as Header picker, lighten by 70% */\n  --nav-link: #222;\n  /* Use same as Header picker */\n  --light-link: #fff;\n  /* Use same as Header picker */\n}\n.fixed-table-container tbody .selected td {\n  background-color: #fff8af;\n}\n.select2-container--default .select2-selection--multiple .select2-selection__choice {\n  background-color: #FBCC34;\n}\n.search-highlight,\n.search-highlight:hover {\n  background-color: #e9d15b;\n}\n.thead,\n.navbar-nav > li > a:link {\n  color: var(--nav-link);\n}\n.navbar-nav > li > a:visited {\n  color: var(--nav-link);\n}\n:hover {\n  color: var(--nav-link);\n}\n.skin-yellow .main-header .navbar .nav > li > a {\n  color: #413F42;\n}\n.far fa-life-ring {\n  color: var(--link);\n}\n/*\n * Skin: yellow dark\n * ----------\n */\n.skin-yellow-dark .main-header .navbar .sidebar-toggle {\n  color: #000 !important;\n}\n.skin-yellow-dark .main-header .navbar .sidebar-toggle:hover {\n  background-color: var(--link);\n}\n@media (max-width: 767px) {\n  .skin-yellow-dark .main-header .navbar .dropdown-menu li.divider {\n    background-color: rgba(255, 255, 255, 0.1);\n    color: #fff;\n  }\n  .skin-yellow-dark .main-header .navbar .dropdown-menu li a {\n    color: #fff;\n  }\n  .skin-yellow-dark .main-header .navbar .dropdown-menu li a:hover {\n    background: #e08e0b;\n    color: #fff;\n  }\n}\n.skin-yellow-dark .main-header li.user-header {\n  background-color: #f39c12;\n}\n.skin-yellow-dark .content-header {\n  background: transparent;\n}\n.skin-yellow-dark .wrapper,\n.skin-yellow-dark .main-sidebar,\n.skin-yellow-dark .left-side {\n  background-color: #222d32;\n}\n.skin-yellow-dark .user-panel > .info,\n.skin-yellow-dark .user-panel > .info > a {\n  color: #fff;\n}\n.skin-yellow-dark .sidebar-menu > li.header {\n  color: #4b646f;\n  background: #1a2226;\n}\n.skin-yellow-dark .sidebar-menu > li > a {\n  border-left: 3px solid transparent;\n}\n.skin-yellow-dark .sidebar-menu > li:hover > a,\n.skin-yellow-dark .sidebar-menu > li.active > a {\n  color: #fff;\n  background: #1e282c;\n  border-left-color: #f39c12;\n}\n.skin-yellow-dark .sidebar-menu > li > .treeview-menu {\n  margin: 0 1px;\n  background: #2c3b41;\n}\n.skin-yellow-dark .sidebar a {\n  color: #b8c7ce;\n}\n.skin-yellow-dark .sidebar a:hover {\n  text-decoration: none;\n}\n.skin-yellow-dark .treeview-menu > li > a {\n  color: #8aa4af;\n}\n.skin-yellow-dark .treeview-menu > li.active > a,\n.skin-yellow-dark .treeview-menu > li > a:hover {\n  color: #fff;\n}\n.skin-yellow-dark .sidebar-form {\n  border-radius: 3px;\n  border: 1px solid #374850;\n  margin: 10px 10px;\n}\n.skin-yellow-dark .sidebar-form input[type=\"text\"],\n.skin-yellow-dark .sidebar-form .btn {\n  box-shadow: none;\n  background-color: #374850;\n  border: 1px solid transparent;\n  height: 35px;\n  -webkit-transition: all 0.3s ease-in-out;\n  -o-transition: all 0.3s ease-in-out;\n  transition: all 0.3s ease-in-out;\n}\n.skin-yellow-dark .sidebar-form input[type=\"text\"] {\n  color: #666;\n  border-top-left-radius: 2px;\n  border-top-right-radius: 0;\n  border-bottom-right-radius: 0;\n  border-bottom-left-radius: 2px;\n}\n.skin-yellow-dark .sidebar-form input[type=\"text\"]:focus,\n.skin-yellow-dark .sidebar-form input[type=\"text\"]:focus + .input-group-btn .btn {\n  background-color: #fff;\n  color: #666;\n}\n.skin-yellow-dark .sidebar-form input[type=\"text\"]:focus + .input-group-btn .btn {\n  border-left-color: #fff;\n}\n.skin-yellow-dark .sidebar-form .btn {\n  color: #999;\n  border-top-left-radius: 0;\n  border-top-right-radius: 2px;\n  border-bottom-right-radius: 2px;\n  border-bottom-left-radius: 0;\n}\n.btn.btn-primary,\n.btn:hover.btn-primary,\n.btn .btn-primary:link,\n.btn:hover .btn-primary:link {\n  background-color: var(--button-default);\n  border-color: #000000;\n  color: #545454;\n}\n.btna.btn-primary:hover,\n.btn:hovera.btn-primary:hover {\n  background-color: var(--button-hover);\n  border-color: var(--button-hover);\n  color: #545454;\n}\n.btn.btn-white:link,\n.btn:hover.btn-white:link {\n  background-color: var(--button-default);\n  color: #545454;\n}\n.btn.btn-white:hover,\n.btn:hover.btn-white:hover {\n  background-color: var(--hover-link);\n  color: #545454;\n}\na.actions {\n  color: #fff !important;\n}\na:visited.label-default,\na:link.label-default {\n  color: #444;\n}\n/**\nThe dropdown is white, so use a darker color\n */\nli.dropdown-item-marker {\n  color: var(--button-primary);\n}\na:link {\n  color: var(--link);\n}\na:hover {\n  color: var(--hover-link);\n}\na:visited {\n  color: var(--visited-link);\n}\n.text-primary {\n  color: #fff;\n}\n:root {\n  --background: #222;\n  --back-main: #333;\n  --back-sub: #3d4144;\n  --back-sub-alt: rgba(0, 0, 0, 0.36);\n  --button-default: #FFCC32;\n  --button-primary: #b28500;\n  --button-hover: #987200;\n  --header: #FFCC32;\n  /* Use same as Header picker */\n  --text-main: #BBB;\n  --text-sub: #9b9b9b;\n  --link: #F0E68C;\n  /* Use same as Header picker, lighten by 70% */\n  --visited-link: #f9f5d0;\n  /* Use same as Header picker, lighten by 70% */\n  --hover-link: #ffffff;\n  /* Use same as Header picker, lighten by 70% */\n  --nav-link: #222;\n  /* Use same as Header picker */\n  --light-link: #545454;\n  /* Use same as Header picker */\n}\n#ldapad_test_results.well.well-sm {\n  color: var(--back-main);\n}\n.pagination > li > a {\n  color: var(--text-main);\n  background-color: var(--back-main);\n}\n.pagination > .active > a {\n  background-color: var(--button-default);\n  border-color: var(--light-link);\n  color: var(--nav-link);\n}\n.pagination > .active > a:hover {\n  background-color: var(--hover-link);\n}\n.tasks-menu > .dropdown-menu > li .menu {\n  background-color: var(--back-main);\n}\n.tasks-menu > .dropdown-menu > li .menu > li > a:hover .progress {\n  background-color: var(--background);\n}\nh2.task_menu {\n  color: var(--link);\n}\n.navbar-custom-menu > .navbar-nav > li > .dropdown-menu {\n  background-color: var(--back-main);\n  color: var(--link);\n}\n.main-header .navbar,\n.main-header .logo {\n  background-color: var(--header);\n  background: -webkit-linear-gradient(top, var(--header) 0%, var(--header) 100%);\n  background: linear-gradient(to bottom, var(--header) 0%, var(--header) 100%);\n  border-color: var(--header);\n}\na.btn.btn-default {\n  color: var(--nav-link);\n}\n.bootstrap-table .fixed-table-container .table thead th .sortable {\n  color: var(--text-main);\n}\n.bootstrap-table .fixed-table-toolbar .columns label {\n  color: #000;\n}\n.thead,\n.navbar-nav > li > a:link {\n  color: var(--nav-link);\n}\n.navbar-nav > li > a:visited {\n  color: var(--nav-link);\n}\n.modal-content {\n  background-color: var(--back-main);\n  color: var(--text-main);\n}\na:link.btn-default {\n  color: var(--nav-link);\n}\n.btn-primary.hover {\n  color: var(--nav-link);\n}\n.small-box h3,\n.small-box p {\n  color: #fff !important;\n}\n.small-box h3 a:hover,\n.small-box p a:hover {\n  text-decoration: none;\n  color: var(--nav-link) !important;\n}\n.far fa-life-ring {\n  color: var(--link);\n}\n#accessoriesTable > tbody > tr > td > nobr > a > i.fa {\n  color: var(--text-main);\n}\n#assetsListingTable > tbody > tr > td > nobr > a > i.fa {\n  color: var(--text-main);\n}\n#assetsListingTable > tbody > tr.selected > td {\n  background-color: var(--back-main);\n}\nbody {\n  color: var(--text-main);\n}\n.box,\n.box.box-default {\n  border-top: 3px solid var(--header);\n  border-top-color: var(--header);\n}\n.box-body,\n.box-footer,\n.box-header {\n  background-color: var(--back-sub);\n  color: var(--header);\n}\n.btn-default {\n  background-color: var(--button-default);\n}\n.btn-default dropdown-toggle {\n  background-color: var(--button-default);\n  color: var(--nav-link);\n}\n.btn-default:active,\n.btn-default:focus,\n.btn-default:hover,\n.btn-default.active {\n  background-color: var(--button-hover);\n  color: var(--nav-link);\n}\n.btn-primary,\n.btn-primary.hover,\n.btn-primary:active,\n.text-yellow {\n  color: var(--nav-link) !important;\n}\n.btn-primary:hover {\n  background-color: var(--button-primary);\n  color: var(--nav-link) !important;\n}\n#componentsTable > tbody > tr > td > nobr > a > i.fa {\n  color: var(--text-main);\n}\n#consumablesTable > tbody > tr > td > nobr > a > i.fa {\n  color: var(--text-main);\n}\n.content-wrapper {\n  background-color: var(--background);\n}\n#create-form > div > div > div > span > i.fa {\n  background-color: var(--back-sub);\n  color: var(--header);\n}\n.datepicker .datepicker-switch:hover,\n.datepicker .next:hover,\n.datepicker .prev:hover,\n.datepicker tfoot tr th:hover,\n.datepicker table tr td.day.focused,\n.datepicker table tr td.day:hover {\n  background-color: var(--header);\n}\n.datepicker.dropdown-menu {\n  background-color: var(--back-main);\n  color: var(--text-main);\n}\n#details > div > div > div > table {\n  background-color: transparent;\n}\n.dropdown-menu > li > a:hover {\n  background-color: var(--back-main);\n  color: var(--nav-link);\n}\n.form-control {\n  background-color: var(--back-main);\n  color: var(--text-main);\n}\n.form-control[disabled],\n.form-control[readonly],\nfieldset[disabled] .form-control {\n  background-color: var(--back-main);\n  color: var(--text-main);\n}\nh1,\nh2,\nh3,\nh4,\nh5,\nh6,\np {\n  color: var(--text-main);\n}\n.help-block {\n  color: var(--text-sub);\n}\ninput[type=text],\ninput[type=search] {\n  background-color: var(--back-sub);\n  color: var(--text-main);\n}\n.input-group,\n.input-group-addon {\n  background-color: var(--back-sub) !important;\n  color: var(--text-main);\n}\n#licensesTable > tbody > tr > td > nobr > a > i.fa {\n  color: var(--text-main);\n}\n.main-footer {\n  background-color: var(--back-main);\n  color: var(--text-main);\n}\n.nav-tabs-custom > .nav-tabs > li > a,\n.nav-tabs-custom > .nav-tabs > li.active > a {\n  color: var(--text-main);\n}\n.nav-tabs-custom > .nav-tabs > li.active {\n  border-top-color: var(--header);\n}\n.nav-tabs-custom > .nav-tabs > li.active > a {\n  background-color: var(--back-main);\n}\n.nav-tabs-custom > .nav-tabs > li.active > a:hover {\n  background-color: var(--back-sub);\n  color: var(--text-main);\n}\n.nav-tabs-custom,\n.nav-tabs-custom > .tab-content {\n  background-color: var(--back-main);\n}\n.navbar-nav > .tasks-menu > .dropdown-menu > li.header {\n  background-color: var(--back-main);\n  color: var(--header);\n}\n.open > .dropdown-toggle.btn-default {\n  background-color: var(--back-sub);\n  color: var(--header);\n}\n.panel {\n  background-color: var(--back-sub);\n  color: var(--text-main);\n}\n.panel-default > .panel-heading {\n  background-color: var(--back-main);\n  color: var(--header);\n}\n.select2-container--default .select2-results__option[aria-selected=true],\n.select2-container--default .select2-results__option[aria-selected=true]:hover {\n  background-color: var(--back-sub);\n  color: var(--header);\n}\n.select2-container--default .select2-results__option--highlighted[aria-selected] {\n  background-color: var(--header);\n  color: var(--back-main);\n}\n.select2-container--default .select2-selection--single .select2-selection__rendered {\n  color: var(--text-main);\n}\n.select2-container--default .select2-selection--multiple .select2-selection__choice {\n  background-color: var(--header);\n}\n.select2-selection--single {\n  background-color: var(--back-sub) !important;\n  color: var(--text-main) !important;\n}\n.select2-dropdown {\n  background-color: var(--back-main);\n  color: var(--text-main);\n}\n.skin-yellow-dark .main-header .navbar .dropdown-menu li a {\n  color: var(--header);\n}\n.skin-yellow-dark .main-header .navbar .dropdown-menu li a:hover {\n  background-color: #000000;\n}\ntr th div.th-inner {\n  color: #FFFFFF;\n}\n.tab-content,\n.tab-pane {\n  background-color: var(--back-main);\n  color: var(--text-main);\n}\n.table-striped > tbody > tr:nth-of-type(odd) {\n  background-color: var(--back-sub);\n}\n.table-striped > tbody > tr:nth-of-type(even) {\n  background-color: var(--back-sub-alt);\n}\n.th-inner {\n  color: var(--nav-link);\n}\n#webui > div > div > div > div > div > table > tbody > tr > td > a > i.fa,\n.box-body,\n.box-footer,\n.box-header {\n  color: var(--text-main);\n}\n.box-header.with-border {\n  border-bottom: #000;\n}\n.row-striped {\n  vertical-align: top;\n  line-height: 2.6;\n  padding: 0px;\n  margin-left: 20px;\n  box-sizing: border-box;\n  display: table;\n}\n.row-striped .row:nth-of-type(odd) div {\n  background-color: var(--back-sub);\n  color: var(--text-main);\n  border-top: 1px solid #dddddd;\n  display: table-cell;\n}\n.row-striped .row:nth-of-type(even) div {\n  background-color: var(--back-sub);\n  color: var(--text-main);\n  border-top: 1px solid #dddddd;\n  display: table-cell;\n}\n.row-new-striped > .row:nth-of-type(odd) {\n  background-color: var(--back-sub);\n  color: var(--text-main);\n}\n.row-new-striped > .row:nth-of-type(even) {\n  background-color: var(--back-sub-alt);\n  color: var(--text-main);\n}\n.search-highlight,\n.search-highlight:hover {\n  background-color: #e9d15b;\n}\n.table > tbody > tr.warning > td {\n  background-color: var(--back-sub);\n}\n","/*\n * Skin: Black\n * ----------\n */\n@import \"../bootstrap-less/mixins.less\";\n@import \"../bootstrap-less/variables.less\";\n@import \"../variables.less\";\n@import \"../mixins.less\";\n\n.skin-black {\n  //Navbar\n  .main-header {\n    .navbar {\n      .navbar-variant(@black; #fff);\n      .sidebar-toggle {\n        color: #fff;\n        &:hover {\n          background-color: darken(@black, 5%);\n        }\n      }\n      @media (max-width: @screen-header-collapse) {\n        .dropdown-menu {\n          li {\n            &.divider {\n              background-color: rgba(255, 255, 255, 0.1);\n            }\n            a {\n              color: #333;\n              &:hover {\n                background: darken(@black, 5%);\n              }\n            }\n          }\n        }\n      }\n    }\n    //Logo\n\n    li.user-header {\n      background-color: @black;\n    }\n  }\n\n  //Content Header\n  .content-header {\n    background: transparent;\n  }\n\n  //Create the sidebar skin\n  .skin-dark-sidebar(@black);\n}\n\n.skin-black.layout-top-nav .main-header > .logo {\n  .logo-variant {\n    background-color: none;\n  }\n}\n\n\n\n.btn, .btn:hover {\n  color: #000 ;\n\n  &.btn-primary, .btn-primary:link {\n    background-color: @dark-gray;\n    border-color: #FFF;\n    color: #FFF;\n  }\n\n\n  &a.btn-primary:hover {\n    background-color: @black;\n    border-color: darken(@dark-gray, 20%);\n    color: #fff;\n  }\n\n  &.btn-white:link {\n    color: #fff;\n  }\n\n  &.btn-white:hover {\n    color: #fff;\n  }\n\n  &.btn-white:visited {\n    color: #fff;\n  }\n}\n\n\na {\n  color: var(--link);\n\n  &:hover {\n    color: var(--hover-link);\n  }\n  &:visited {\n    color: var(--visited-link);\n  }\n}\n\n.text-primary {\n  color: darken(@black, 20%);\n}\n:root {\n  --button-default: darken(@black, 15%);\n  --button-primary: darken(@black, 25%);\n  --button-hover: darken(@black, 30%);\n  --header: @black; /* Use same as Header picker */\n  --text-main: #BBB;\n  --text-sub: #9b9b9b;\n  --link: #black; /* Use same as Header picker, lighten by 70% */\n  --visited-link: @black; /* Use same as Header picker, lighten by 70% */\n  --hover-link: lighten(#000, 60%); /* Use same as Header picker, lighten by 70% */\n  --nav-link: #FFF; /* Use same as Header picker */\n  --light-link: #fff; /* Use same as Header picker */\n}\na.btn-info:link, a.btn-warning:link, a.btn-danger:link{\n  color: #FFF;\n}\n&a.btn-info:visited, a.btn-warning:visited, a.btn-danger:visited{\n  color: #FFF;\n}\n.btn-danger.btn-sm.disabled{\n  color: #FFF;\n}\n.far fa-life-ring{\n  color:var(--link);\n}\n\n.sidebar-toggle-mobile {\n  color: #FFF !important;\n}\n\n.skin-black .main-header .navbar .nav>li>a, .skin-black .main-header .navbar .nav>li>a {\n  text-decoration: none;\n}\n.select2-container--default .select2-selection--multiple .select2-selection__choice {\n  background-color: @black;\n}\n\n.search-highlight, .search-highlight:hover {\n  background-color: #e9d15b;\n}","//AdminLTE mixins\n//===============\n\n\n//Changes the color and the hovering properties of the navbar\n.navbar-variant(@color; @font-color: rgba(255, 255, 255, 0.8); @hover-color: #f6f6f6; @hover-bg: rgba(0, 0, 0, 0.1)) {\n  background-color: @color;\n  //Navbar links\n  .nav > li > a {\n    color: @font-color;\n  }\n\n  .nav > li > a:hover,\n    .nav > li > a:active,\n    .nav > li > a:focus,\n    .nav .open > a,\n    .nav .open > a:hover,\n    .nav .open > a:focus,\n    .nav > .active > a {\n    background: @hover-bg;\n    color: @hover-color;\n  }\n\n  //Add color to the sidebar toggle button\n  .sidebar-toggle {\n    color: @font-color;\n    &:hover {\n      color: @hover-color;\n      background: @hover-bg;\n    }\n  }\n}\n\n//Logo color variation\n.logo-variant(@bg-color; @color: #fff; @border-bottom-color: transparent; @border-bottom-width: 0) {\n  background-color: @bg-color;\n  color: @color;\n  border-bottom: @border-bottom-width solid @border-bottom-color;\n\n  &:hover {\n    background-color: darken(@bg-color, 1%);\n  }\n}\n\n//Box solid color variantion creator\n.box-solid-variant(@color; @text-color: #fff) {\n  border: 1px solid @color;\n  > .box-header {\n    color: @text-color;\n    background: @color;\n    background-color: @color;\n    a,\n    .btn {\n      color: @text-color;\n    }\n  }\n}\n\n//Direct Chat Variant\n.direct-chat-variant(@bg-color; @color: #fff) {\n  .right > .direct-chat-text {\n    background: @bg-color;\n    border-color: @bg-color;\n    color: @color;\n    &:after,\n      &:before {\n      border-left-color: @bg-color;\n    }\n  }\n}\n\n//border radius creator\n.border-radius(@radius) {\n  border-radius: @radius;\n}\n//Different radius each side\n.border-radius(@top-left; @top-right; @bottom-left; @bottom-right) {\n  border-top-left-radius: @top-left;\n  border-top-right-radius: @top-right;\n  border-bottom-right-radius: @bottom-right;\n  border-bottom-left-radius: @bottom-left;\n}\n\n//Gradient background\n.gradient(@color: #F5F5F5, @start: #EEE, @stop: #FFF) {\n  background: @color;\n  background: -webkit-gradient(linear,\n    left bottom,\n    left top,\n    color-stop(0, @start),\n    color-stop(1, @stop));\n  background: -ms-linear-gradient(bottom,\n    @start,\n    @stop);\n  background: -moz-linear-gradient(center bottom,\n    @start 0%,\n    @stop 100%);\n  background: -o-linear-gradient(@stop,\n    @start);\n  filter: e(%(\"progid:DXImageTransform.Microsoft.gradient(startColorstr='%d', endColorstr='%d', GradientType=0)\",@stop,@start));\n}\n\n//Added 2.1.0\n//Skins Mixins\n\n//Dark Sidebar Mixin\n.skin-dark-sidebar(@link-hover-border-color) {\n  // Sidebar background color (Both .wrapper and .left-side are responsible for sidebar bg color)\n  .wrapper,\n  .main-sidebar,\n  .left-side {\n    background-color: @sidebar-dark-bg;\n  }\n  //User Panel (resides in the sidebar)\n  .user-panel {\n    > .info, > .info > a {\n      color: #fff;\n    }\n  }\n  //Sidebar Menu. First level links\n  .sidebar-menu > li {\n    //Section Headning\n    &.header {\n      color: lighten(@sidebar-dark-bg, 20%);\n      background: darken(@sidebar-dark-bg, 4%);\n    }\n    //links\n    > a {\n      border-left: 3px solid transparent;\n    }\n    //Hover and active states\n    &:hover > a, &.active > a {\n      color: @sidebar-dark-hover-color;\n      background: @sidebar-dark-hover-bg;\n      border-left-color: @link-hover-border-color;\n    }\n    //First Level Submenu\n    > .treeview-menu {\n      margin: 0 1px;\n      background: @sidebar-dark-submenu-bg;\n    }\n  }\n  //All links within the sidebar menu\n  .sidebar a {\n    color: @sidebar-dark-color;\n    &:hover {\n      text-decoration: none;\n    }\n  }\n  //All submenus\n  .treeview-menu {\n    > li {\n      > a {\n        color: @sidebar-dark-submenu-color;\n      }\n      &.active > a, > a:hover {\n        color: @sidebar-dark-submenu-hover-color;\n      }\n    }\n  }\n  //The sidebar search form\n  .sidebar-form {\n    .border-radius(3px);\n    border: 1px solid lighten(@sidebar-dark-bg, 10%);\n    margin: 10px 10px;\n    input[type=\"text\"], .btn {\n      box-shadow: none;\n      background-color: lighten(@sidebar-dark-bg, 10%);\n      border: 1px solid transparent;\n      height: 35px;\n      .transition(all @transition-speed @transition-fn);\n    }\n    input[type=\"text\"] {\n      color: #666;\n      .border-radius(2px, 0, 2px, 0);\n      &:focus, &:focus + .input-group-btn .btn {\n        background-color: #fff;\n        color: #666;\n      }\n      &:focus + .input-group-btn .btn {\n        border-left-color: #fff;\n      }\n    }\n    .btn {\n      color: #999;\n      .border-radius(0, 2px, 0, 2px);\n    }\n  }\n}\n\n//Light Sidebar Mixin\n.skin-light-sidebar(@icon-active-color) {\n  // Sidebar background color (Both .wrapper and .left-side are responsible for sidebar bg color)\n  .wrapper,\n  .main-sidebar,\n  .left-side {\n    background-color: @sidebar-light-bg;\n  }\n  .content-wrapper,\n  .main-footer {\n    border-left: 1px solid @gray;\n  }\n  //User Panel (resides in the sidebar)\n  .user-panel {\n    > .info, > .info > a {\n      color: @sidebar-light-color;\n    }\n  }\n  //Sidebar Menu. First level links\n  .sidebar-menu > li {\n    .transition(border-left-color .3s ease);\n    //border-left: 3px solid transparent;\n    //Section Headning\n    &.header {\n      color: lighten(@sidebar-light-color, 25%);\n      background: @sidebar-light-bg;\n    }\n    //links\n    > a {\n      border-left: 3px solid transparent;\n      font-weight: 600;\n    }\n    //Hover and active states\n    &:hover > a,\n      &.active > a {\n      color: @sidebar-light-hover-color;\n      background: @sidebar-light-hover-bg;\n    }\n    &:hover > a {\n\n    }\n    &.active {\n      border-left-color: @icon-active-color;\n      > a {\n        font-weight: 600;\n      }\n    }\n    //First Level Submenu\n    > .treeview-menu {\n      background: @sidebar-light-submenu-bg;\n    }\n  }\n  //All links within the sidebar menu\n  .sidebar a {\n    color: @sidebar-light-color;\n    &:hover {\n      text-decoration: none;\n    }\n  }\n  //All submenus\n  .treeview-menu {\n    > li {\n      > a {\n        color: @sidebar-light-submenu-color;\n      }\n      &.active > a,\n      > a:hover {\n        color: @sidebar-light-submenu-hover-color;\n      }\n      &.active > a {\n        font-weight: 600;\n      }\n    }\n  }\n  //The sidebar search form\n  .sidebar-form {\n    .border-radius(3px);\n    border: 1px solid @gray;//darken(@sidebar-light-bg, 5%);\n    margin: 10px 10px;\n    input[type=\"text\"],\n    .btn {\n      box-shadow: none;\n      background-color: #fff;//darken(@sidebar-light-bg, 3%);\n      border: 1px solid transparent;\n      height: 35px;\n      .transition(all @transition-speed @transition-fn);\n    }\n    input[type=\"text\"] {\n      color: #666;\n      .border-radius(2px, 0, 2px, 0);\n      &:focus,\n        &:focus + .input-group-btn .btn {\n        background-color: #fff;\n        color: #666;\n      }\n      &:focus + .input-group-btn .btn {\n        border-left-color: #fff;\n      }\n    }\n    .btn {\n      color: #999;\n      .border-radius(0, 2px, 0, 2px);\n    }\n  }\n  @media(min-width: @screen-sm-min) {\n    &.sidebar-mini.sidebar-collapse {\n      .sidebar-menu > li > .treeview-menu {\n        border-left: 1px solid @gray;\n      }\n    }\n  }\n}\n","// Vendor Prefixes\n//\n// All vendor mixins are deprecated as of v3.2.0 due to the introduction of\n// Autoprefixer in our Gruntfile. They will be removed in v4.\n\n// - Animations\n// - Backface visibility\n// - Box shadow\n// - Box sizing\n// - Content columns\n// - Hyphens\n// - Placeholder text\n// - Transformations\n// - Transitions\n// - User Select\n\n\n// Animations\n.animation(@animation) {\n  -webkit-animation: @animation;\n       -o-animation: @animation;\n          animation: @animation;\n}\n.animation-name(@name) {\n  -webkit-animation-name: @name;\n          animation-name: @name;\n}\n.animation-duration(@duration) {\n  -webkit-animation-duration: @duration;\n          animation-duration: @duration;\n}\n.animation-timing-function(@timing-function) {\n  -webkit-animation-timing-function: @timing-function;\n          animation-timing-function: @timing-function;\n}\n.animation-delay(@delay) {\n  -webkit-animation-delay: @delay;\n          animation-delay: @delay;\n}\n.animation-iteration-count(@iteration-count) {\n  -webkit-animation-iteration-count: @iteration-count;\n          animation-iteration-count: @iteration-count;\n}\n.animation-direction(@direction) {\n  -webkit-animation-direction: @direction;\n          animation-direction: @direction;\n}\n.animation-fill-mode(@fill-mode) {\n  -webkit-animation-fill-mode: @fill-mode;\n          animation-fill-mode: @fill-mode;\n}\n\n// Backface visibility\n// Prevent browsers from flickering when using CSS 3D transforms.\n// Default value is `visible`, but can be changed to `hidden`\n\n.backface-visibility(@visibility){\n  -webkit-backface-visibility: @visibility;\n     -moz-backface-visibility: @visibility;\n          backface-visibility: @visibility;\n}\n\n// Drop shadows\n//\n// Note: Deprecated `.box-shadow()` as of v3.1.0 since all of Bootstrap's\n// supported browsers that have box shadow capabilities now support it.\n\n.box-shadow(@shadow) {\n  -webkit-box-shadow: @shadow; // iOS <4.3 & Android <4.1\n          box-shadow: @shadow;\n}\n\n// Box sizing\n.box-sizing(@boxmodel) {\n  -webkit-box-sizing: @boxmodel;\n     -moz-box-sizing: @boxmodel;\n          box-sizing: @boxmodel;\n}\n\n// CSS3 Content Columns\n.content-columns(@column-count; @column-gap: @grid-gutter-width) {\n  -webkit-column-count: @column-count;\n     -moz-column-count: @column-count;\n          column-count: @column-count;\n  -webkit-column-gap: @column-gap;\n     -moz-column-gap: @column-gap;\n          column-gap: @column-gap;\n}\n\n// Optional hyphenation\n.hyphens(@mode: auto) {\n  word-wrap: break-word;\n  -webkit-hyphens: @mode;\n     -moz-hyphens: @mode;\n      -ms-hyphens: @mode; // IE10+\n       -o-hyphens: @mode;\n          hyphens: @mode;\n}\n\n// Placeholder text\n.placeholder(@color: @input-color-placeholder) {\n  // Firefox\n  &::-moz-placeholder {\n    color: @color;\n    opacity: 1; // Override Firefox's unusual default opacity; see https://github.com/twbs/bootstrap/pull/11526\n  }\n  &:-ms-input-placeholder { color: @color; } // Internet Explorer 10+\n  &::-webkit-input-placeholder  { color: @color; } // Safari and Chrome\n}\n\n// Transformations\n.scale(@ratio) {\n  -webkit-transform: scale(@ratio);\n      -ms-transform: scale(@ratio); // IE9 only\n       -o-transform: scale(@ratio);\n          transform: scale(@ratio);\n}\n.scale(@ratioX; @ratioY) {\n  -webkit-transform: scale(@ratioX, @ratioY);\n      -ms-transform: scale(@ratioX, @ratioY); // IE9 only\n       -o-transform: scale(@ratioX, @ratioY);\n          transform: scale(@ratioX, @ratioY);\n}\n.scaleX(@ratio) {\n  -webkit-transform: scaleX(@ratio);\n      -ms-transform: scaleX(@ratio); // IE9 only\n       -o-transform: scaleX(@ratio);\n          transform: scaleX(@ratio);\n}\n.scaleY(@ratio) {\n  -webkit-transform: scaleY(@ratio);\n      -ms-transform: scaleY(@ratio); // IE9 only\n       -o-transform: scaleY(@ratio);\n          transform: scaleY(@ratio);\n}\n.skew(@x; @y) {\n  -webkit-transform: skewX(@x) skewY(@y);\n      -ms-transform: skewX(@x) skewY(@y); // See https://github.com/twbs/bootstrap/issues/4885; IE9+\n       -o-transform: skewX(@x) skewY(@y);\n          transform: skewX(@x) skewY(@y);\n}\n.translate(@x; @y) {\n  -webkit-transform: translate(@x, @y);\n      -ms-transform: translate(@x, @y); // IE9 only\n       -o-transform: translate(@x, @y);\n          transform: translate(@x, @y);\n}\n.translate3d(@x; @y; @z) {\n  -webkit-transform: translate3d(@x, @y, @z);\n          transform: translate3d(@x, @y, @z);\n}\n.rotate(@degrees) {\n  -webkit-transform: rotate(@degrees);\n      -ms-transform: rotate(@degrees); // IE9 only\n       -o-transform: rotate(@degrees);\n          transform: rotate(@degrees);\n}\n.rotateX(@degrees) {\n  -webkit-transform: rotateX(@degrees);\n      -ms-transform: rotateX(@degrees); // IE9 only\n       -o-transform: rotateX(@degrees);\n          transform: rotateX(@degrees);\n}\n.rotateY(@degrees) {\n  -webkit-transform: rotateY(@degrees);\n      -ms-transform: rotateY(@degrees); // IE9 only\n       -o-transform: rotateY(@degrees);\n          transform: rotateY(@degrees);\n}\n.perspective(@perspective) {\n  -webkit-perspective: @perspective;\n     -moz-perspective: @perspective;\n          perspective: @perspective;\n}\n.perspective-origin(@perspective) {\n  -webkit-perspective-origin: @perspective;\n     -moz-perspective-origin: @perspective;\n          perspective-origin: @perspective;\n}\n.transform-origin(@origin) {\n  -webkit-transform-origin: @origin;\n     -moz-transform-origin: @origin;\n      -ms-transform-origin: @origin; // IE9 only\n          transform-origin: @origin;\n}\n\n\n// Transitions\n\n.transition(@transition) {\n  -webkit-transition: @transition;\n       -o-transition: @transition;\n          transition: @transition;\n}\n.transition-property(@transition-property) {\n  -webkit-transition-property: @transition-property;\n          transition-property: @transition-property;\n}\n.transition-delay(@transition-delay) {\n  -webkit-transition-delay: @transition-delay;\n          transition-delay: @transition-delay;\n}\n.transition-duration(@transition-duration) {\n  -webkit-transition-duration: @transition-duration;\n          transition-duration: @transition-duration;\n}\n.transition-timing-function(@timing-function) {\n  -webkit-transition-timing-function: @timing-function;\n          transition-timing-function: @timing-function;\n}\n.transition-transform(@transition) {\n  -webkit-transition: -webkit-transform @transition;\n     -moz-transition: -moz-transform @transition;\n       -o-transition: -o-transform @transition;\n          transition: transform @transition;\n}\n\n\n// User select\n// For selecting text on the page\n\n.user-select(@select) {\n  -webkit-user-select: @select;\n     -moz-user-select: @select;\n      -ms-user-select: @select; // IE10+\n          user-select: @select;\n}\n","/*\n * Skin: black dark\n * ----------\n */\n@import \"../bootstrap-less/mixins.less\";\n@import \"../bootstrap-less/variables.less\";\n@import \"../variables.less\";\n@import \"../mixins.less\";\n\n.skin-black-dark {\n  //Navbar\n  .main-header {\n    .navbar {\n      .navbar-variant(@black; #fff);\n      .sidebar-toggle {\n        color: #fff;\n        &:hover {\n          background-color: darken(@black, 5%);\n        }\n      }\n      @media (max-width: @screen-header-collapse) {\n        .dropdown-menu {\n          li {\n            &.divider {\n              background-color: rgba(255, 255, 255, 0.1);\n              color: #fff;\n            }\n            a {\n              color: #333;\n              &:hover {\n                background: darken(@black, 5%);\n                color: #fff;\n              }\n            }\n          }\n        }\n      }\n    }\n    @media (max-width: 991px) {\n      .navbar-custom-menu > .navbar-nav > li > .dropdown-menu {\n        background-color: var(--back-sub);\n      }\n    }\n    //Logo\n\n    li.user-header {\n      background-color: @black;\n    }\n  }\n\n  //Content Header\n  .content-header {\n    background: transparent;\n  }\n\n  //Create the sidebar skin\n  .skin-dark-sidebar(@black);\n}\n\n.skin-black-dark.layout-top-nav .main-header > .logo {\n  .logo-variant {\n    background-color: none;\n  }\n}\n\n\n\n.btn, .btn:hover {\n  color: #fff;\n\n  &.btn-primary, .btn-primary:link {\n    background-color: darken(@black, 10%);\n    border-color: #FFF;\n    color: #fff;\n  }\n\n\n  &a.btn-primary:hover {\n    background-color: darken(@black, 20%);\n    border-color: darken(@black, 20%);\n    color: #fff;\n  }\n\n  &.btn-white:link {\n    background-color: darken(@black, 10%);\n    color: #fff;\n  }\n\n  &.btn-white:hover {\n    background-color: darken(@black, 30%);\n    color: #fff;\n  }\n}\n\n/**\nThe dropdown is white, so use a darker color\n */\nli.dropdown-item-marker {\n  color: var(--button-primary);\n}\n\na {\n  &:hover {\n    color: #fff;\n  }\n  &:visited {\n    color: #fff;\n  }\n}\n\n.text-primary {\n  color: #fff;\n}\n\n\n\n\n:root {\n  --background: #222;\n  --back-main: #333;\n  --back-sub: #3d4144;\n  --back-sub-alt: rgba(0, 0, 0, 0.36);\n  --button-default: darken(@black, 15%);\n  --button-primary: darken(@black, 25%);\n  --button-hover: darken(@black, 30%);\n  --header: @black; /* Use same as Header picker */\n  --text-main: #fff;\n  --text-sub: #9b9b9b;\n  --link: #fff; /* Use same as Header picker, lighten by 70% */\n  --visited-link: #fff; /* Use same as Header picker, lighten by 70% */\n  --hover-link: #949494; /* Use same as Header picker, lighten by 70% */\n  --nav-link: #FFF; /* Use same as Header picker */\n  --light-link: #fff; /* Use same as Header picker */\n}\n#ldapad_test_results.well.well-sm{\n  color: var(--back-main);\n}\na.actions {\n  color:#fff !important;\n}\n//pagination\n.pagination > li >a{\n  color: var(--light-link);\n  background-color: var(--back-main);\n}\n.pagination > .active > a {\n  background-color: var(--visited-link);\n  border-color: var(--light-link);\n}\n.pagination > .active > a:hover{\n  background-color: var(--hover-link);\n}\n.tasks-menu > .dropdown-menu > li .menu > li > a:hover .progress{\n  background-color: var(--background);\n}\na:hover > h2.task_menu{\n  color:var(--header);\n}\nh2.task_menu{\n  color:var(--link);\n}\n.navbar-custom-menu > .navbar-nav > li > .dropdown-menu{\n  background-color:var(--back-main);\n  color:var(--link);\n}\n.navbar-custom-menu > .navbar-nav > li > .dropdown-menu > li.header{\n  background-color:var(--header);\n  color:var(--link);\n}\n\n.main-header .navbar, .main-header .logo {\n  background-color: var(--header);\n  background: -webkit-linear-gradient(top,  var(--header) 0%,var(--header) 100%);\n  background: linear-gradient(to bottom, var(--header) 0%,var(--header) 100%);\n  border-color: var(--header);\n}\n\n.bootstrap-table .fixed-table-container .table thead th .sortable {\n  color: var(--nav-link);\n}\n.bootstrap-table .fixed-table-toolbar .columns label {\n  color:#000;\n}\n.thead, .navbar-nav>li>a:link {\n  color: var(--nav-link);\n}\n.far fa-life-ring{\n  color:var(--link);\n}\n\n.modal-content {\n  background-color: var(--back-main);\n  color: var(--text-main);\n}\n\n.btn-primary.hover {\n  color: var(--nav-link);\n}\n\n.small-box h3, .small-box p {\n  color: var(--nav-link) !important;\n  a:hover {\n    text-decoration: none;\n    color: var(--nav-link) !important;\n  }\n}\na:link.btn-default{\n  color: var(--nav-link);\n}\n/* Trying to figure out a way of having links different shades based on what row they are on (even/odd).\na unique challenge for this dark mode skin.\nProbably writing the specificity for this incorrectly. --Godfrey Martinez 02/04/21\n\n.table-striped>tbody>tr:nth-of-type(even)>a:link{\n  color:#000d07;\n}\n.table-striped>tbody>tr:nth-of-type(odd)>a:link{\n  color:#bfbfbf;\n\n}*/\n\n#accessoriesTable>tbody>tr>td>nobr>a>i.fa {\n  color: var(--text-main);\n}\n#assetsListingTable>tbody>tr>td>nobr>a>i.fa {\n  color: var(--text-main);\n}\n\n#assetsListingTable>tbody>tr.selected>td {\n  background-color: var(--back-main);\n}\nbody {\n  color: var(--text-main);\n}\n.box, .box.box-default {\n  border-top: 3px solid var(--header);\n  border-top-color: var(--header);\n}\n.box-body, .box-footer, .box-header {\n  background-color: var(--back-sub);\n  color: var(--header);\n}\n.btn-default{\n  background-color: var(--button-default);\n  color: var(--nav-link);\n}\n\n.btn-default dropdown-toggle {\n  background-color: var(--button-default);\n  color: var(--nav-link);\n}\n\n.btn-default:active, .btn-default:focus, .btn-default:hover, .btn-default.active {\n  background-color: var(--button-hover);\n  color: var(--nav-link);\n}\n.btn-primary, .btn-primary.hover, .btn-primary:active, .text-black {\n  color: var(--nav-link)!important;\n}\n.btn-primary:hover {\n  background-color: var(--button-primary);\n  color: var(--link)!important;\n}\n#componentsTable>tbody>tr>td>nobr>a>i.fa {\n  color: var(--text-main);\n}\n#consumablesTable>tbody>tr>td>nobr>a>i.fa {\n  color: var(--text-main);\n}\n.content-wrapper {\n  background-color: var(--background);\n}\n#create-form>div>div>div>span>i.fa {\n  background-color: var(--back-sub);\n  color: var(--header);\n}\n.datepicker .datepicker-switch:hover, .datepicker .next:hover, .datepicker .prev:hover, .datepicker tfoot tr th:hover, .datepicker table tr td.day.focused, .datepicker table tr td.day:hover {\n  background-color: var(--header);\n}\n.datepicker.dropdown-menu {\n  background-color: var(--back-main);\n  color: var(--text-main);\n}\n#details>div>div>div>table {\n  background-color: transparent;\n}\n.dropdown-menu>li>a:hover {\n  background-color: var(--back-main);\n  color: var(--nav-link);\n}\n.form-control {\n  background-color: var(--back-main);\n  color: var(--text-main);\n}\n.form-control[disabled], .form-control[readonly], fieldset[disabled] .form-control{\n  background-color: var(--back-main);\n  color: var(--text-main);\n}\nh1, h2, h3, h4, h5, h6, p {\n  color: var(--text-main);\n}\n.help-block {\n  color: var(--text-sub);\n}\ninput[type=text], input[type=search] {\n  background-color: var(--back-sub);\n  color: var(--text-main);\n}\n.search-highlight, .search-highlight:hover{\n  background-color: var(--back-sub) !important;\n}\n.input-group, .input-group-addon {\n  background-color: var(--back-sub);\n  color: var(--text-main);\n}\n#licensesTable>tbody>tr>td>nobr>a>i.fa {\n  color: var(--text-main);\n}\n.main-footer {\n  background-color: var(--back-main);\n  color: var(--text-main);\n}\n.nav-tabs-custom>.nav-tabs>li>a, .nav-tabs-custom>.nav-tabs>li.active>a {\n  color: var(--text-main);\n}\n.nav-tabs-custom>.nav-tabs>li.active {\n  border-top-color: var(--header);\n}\n.nav-tabs-custom>.nav-tabs>li.active>a {\n  background-color: var(--back-main);\n}\n.nav-tabs-custom>.nav-tabs>li.active>a:hover {\n  background-color: var(--back-sub);\n  color: var(--text-main);\n}\n.nav-tabs-custom, .nav-tabs-custom>.tab-content {\n  background-color: var(--back-main);\n}\n.navbar-nav>.tasks-menu>.dropdown-menu>li.header {\n  background-color: var(--back-main);\n  color: var(--header);\n}\n.open>.dropdown-toggle.btn-default {\n  background-color: var(--back-sub);\n  color: var(--header);\n}\n.panel {\n  background-color: var(--back-sub);\n  color: var(--text-main);\n}\n.panel-default>.panel-heading {\n  background-color: var(--back-main);\n  color: var(--header);\n}\n.select2-container--default .select2-results__option[aria-selected=true], .select2-container--default .select2-results__option[aria-selected=true]:hover {\n  background-color: var(--back-sub);\n  color: var(--nav-link);\n}\n.select2-container--default .select2-results__option--highlighted[aria-selected] {\n  background-color: var(--back-sub);\n  color: var(--visited-link);\n}\n.select2-container--default .select2-selection--single .select2-selection__rendered {\n  color: var(--text-main);\n}\n.select2-container--default .select2-selection--multiple .select2-selection__choice {\n  background-color: var(--header);\n}\n.select2-selection--single {\n  background-color: var(--back-sub)!important;\n  color: var(--text-main)!important;\n}\n.select2-dropdown {\n  background-color: var(--back-main);\n  color: var(--text-main);\n}\n.skin-black-dark .main-header .navbar .dropdown-menu li a {\n  color: #FFFFFF;\n}\n.skin-black-dark .main-header .navbar .dropdown-menu li a:hover {\n  background-color: #000000;\n}\n.fixed-table-body thead th .th-inner, .skin-black-dark .sidebar-menu>li.active>a, .skin-black .sidebar-menu>li:hover>a, .sidebar-toggle:hover {\n  background-color: var(--header)!important;\n}\n.tab-content, .tab-pane {\n  background-color: var(--back-main);\n  color: var(--text-main);\n}\n.table-striped>tbody>tr:nth-of-type(odd) {\n  background-color: var(--back-sub);\n  color: var(--text-main);\n}\n.table-striped>tbody>tr:nth-of-type(even){\n  background-color: var(--back-sub-alt);\n  color: var(--text-main);\n}\n.row-new-striped > .row:nth-of-type(odd){\n  background-color: var(--back-sub);\n  color: var(--text-main);\n}\n.row-new-striped > .row:nth-of-type(even){\n  background-color: var(--back-sub-alt);\n  color: var(--text-main);\n}\n#webui>div>div>div>div>div>table>tbody>tr>td>a>i.fa, .box-body, .box-footer, .box-header {\n  color: var(--text-main);\n}\n\n.box-header.with-border {\n  border-bottom: #000;\n}\n\na {\n  color: var(--link);\n\n  &:link {\n    color: var(--link)  }\n  &:hover {\n    color: var(--hover-link);\n    text-decoration: underline;\n  }\n}\n\n.row-striped {\n  vertical-align: top;\n  line-height: 2.6;\n  padding: 0px;\n  margin-left: 20px;\n  box-sizing: border-box;\n  //border-left: 1px solid #dddddd;\n  //border-right: 1px solid #dddddd;\n  display: table;\n\n}\n\n.row-striped .row:nth-of-type(odd) div {\n  background-color: var(--back-sub);\n  color: var(--text-main);\n  border-top: 1px solid #dddddd;\n  display: table-cell;\n\n}\n\n.row-striped .row:nth-of-type(even) div {\n  background-color: var(--back-sub);\n  color: var(--text-main);\n  border-top: 1px solid #dddddd;\n  display: table-cell;\n}\n\n.search-highlight, .search-highlight:hover {\n  background-color: #e9d15b;\n}\ndiv.container.row-new-striped{\n  background-color:  var(--back-sub);\n}\n.table > thead > tr > td.danger, .table > tbody > tr > td.danger, .table > tfoot > tr > td.danger, .table > thead > tr > th.danger, .table > tbody > tr > th.danger, .table > tfoot > tr > th.danger, .table > thead > tr.danger > td, .table > tbody > tr.danger > td, .table > tfoot > tr.danger > td, .table > thead > tr.danger > th, .table > tbody > tr.danger > th, .table > tfoot > tr.danger > th {\n  background-color: var(--back-sub);\n}\n.table > tbody > tr.warning > td{\n  background-color:var(--back-sub);\n}","/*\n * Skin: Blue\n * ----------\n */\n@import \"../bootstrap-less/mixins.less\";\n@import \"../bootstrap-less/variables.less\";\n@import \"../variables.less\";\n@import \"../mixins.less\";\n\n.skin-blue {\n  //Navbar\n  .main-header {\n    .navbar {\n      .navbar-variant(@light-blue; #fff);\n      .sidebar-toggle {\n        color: #fff;\n        &:hover {\n          background-color: darken(@light-blue, 5%);\n        }\n      }\n      @media (max-width: @screen-header-collapse) {\n        .dropdown-menu {\n          li {\n            &.divider {\n              background-color: rgba(255, 255, 255, 0.1);\n            }\n            a {\n              color: #333;\n              &:hover {\n                background: darken(@light-blue, 5%);\n              }\n            }\n          }\n        }\n      }\n    }\n    //Logo\n\n    li.user-header {\n      background-color: @light-blue;\n    }\n  }\n\n  //Content Header\n  .content-header {\n    background: transparent;\n  }\n\n  //Create the sidebar skin\n  .skin-dark-sidebar(@light-blue);\n}\n\n.skin-blue.layout-top-nav .main-header > .logo {\n  .logo-variant {\n    background-color: unset;\n  }\n}\n\n\n\n.btn, btn-sm, .btn:hover {\n\n\n  &.btn-primary, .btn-primary:link {\n    background-color: darken(@light-blue, 10%);\n    border-color: darken(@light-blue, 20%);\n    color: #fff !important;\n  }\n\n\n  &a.btn-primary:hover {\n    background-color: darken(@light-blue, 20%);\n    border-color: darken(@light-blue, 20%);\n    color: #fff;\n  }\n\n  &.btn-white:link {\n    background-color: darken(@light-blue, 10%);\n    color: #fff;\n  }\n\n  &.btn-white:hover {\n    background-color: darken(@light-blue, 30%);\n    color: #fff;\n  }\n\n  &.btn-white:visited {\n    background-color: darken(@light-blue, 30%);\n    color: #fff;\n  }\n}\n\n\n\n.btn-warning, .btn-warning:link, a.btn-warning:hover, .btn-warning:link, .btn-warning:visited,\n.btn-danger, .btn-danger:link, a.btn-danger:hover, .btn-danger:link, .btn-danger:visited\n{\n    color: #fff;\n}\n\n.btn-default:link, a.btn-default:hover, .btn-default:visited\n{\n  color: @dark-gray;\n}\n\n\n:root {\n  --button-default: @dark-gray;\n  --button-primary: darken(@blue, 25%);\n  --button-hover: darken(@blue, 30%);\n  --header: @blue; /* Use same as Header picker */\n  --text-main: #BBB;\n  --text-sub: #9b9b9b;\n  --link:darken(@blue, 15%); /* Use same as Header picker, lighten by 70% */\n  --visited-link: lighten(@blue,10%); /* Use same as Header picker, lighten by 70% */\n  --hover-link: lighten(@blue,20%); /* Use same as Header picker, lighten by 70% */\n  --nav-link: #FFF; /* Use same as Header picker */\n  --light-link: #fff; /* Use same as Header picker */\n}\na.btn-info:link, a.btn-warning:link, a.btn-danger:link{\n  color: #FFF;\n}\n&a.btn-info:visited, a.btn-warning:visited, a.btn-danger:visited{\n  color: #FFF;\n}\na:link {\n  color: var(--link);\n}\n\na:visited {\n  color: var(--visited-link);\n}\n\na:hover {\n  color: var(--hover-link);\n}\n\n.text-primary {\n  color: darken(@light-blue, 20%);\n}\n.far fa-life-ring{\n  color:var(--link);\n}\n\n.fixed-table-container tbody .selected td {\n  background-color: #fff8af;\n}\n.select2-container--default .select2-selection--multiple .select2-selection__choice {\n  background-color: #3c8dbc;\n}\n\n.search-highlight, .search-highlight:hover {\n  background-color: #e9d15b;\n}\n\n// Link colors for the settings page\na.settings_button:link, a.settings_button:visited, a.settings_button:hover {\n  color: @light-blue;\n}","/*\n * Skin: blue dark\n * ----------\n */\n@import \"../bootstrap-less/mixins.less\";\n@import \"../bootstrap-less/variables.less\";\n@import \"../variables.less\";\n@import \"../mixins.less\";\n\n.skin-blue-dark {\n  //Navbar\n  .main-header {\n    .navbar {\n      .navbar-variant(@blue; #fff);\n      .sidebar-toggle {\n        color: #fff;\n        &:hover {\n          background-color: darken(@blue, 5%);\n        }\n      }\n      @media (max-width: @screen-header-collapse) {\n        .dropdown-menu {\n          li {\n            &.divider {\n              background-color: rgba(255, 255, 255, 0.1);\n              color: #fff;\n            }\n            a {\n              color: #fff;\n              &:hover {\n                background: darken(@blue, 5%);\n                color: #fff;\n              }\n            }\n          }\n        }\n      }\n    }\n    //Logo\n\n    li.user-header {\n      background-color: @blue;\n    }\n  }\n\n  //Content Header\n  .content-header {\n    background: transparent;\n  }\n\n  //Create the sidebar skin\n  .skin-dark-sidebar(@blue);\n}\n\n.skin-blue-dark.layout-top-nav .main-header > .logo {\n  .logo-variant {\n    background-color: none;\n  }\n}\n\n\n\n.btn, .btn:hover {\n  color: #fff !important;\n\n  &.btn-primary, .btn-primary:link {\n    background-color: darken(@blue, 10%);\n    border-color: #FFF;\n    color: #FFF;\n  }\n\n\n  &a.btn-primary:hover {\n    background-color: darken(@blue, 20%);\n    border-color: darken(@blue, 20%);\n    color: #fff;\n  }\n\n  &.btn-white:link {\n    background-color: darken(@blue, 10%);\n    color: #fff;\n  }\n\n  &.btn-white:hover {\n    background-color: darken(@blue, 30%);\n    color: #fff;\n  }\n}\n\n/**\nThe dropdown is white, so use a darker color\n */\nli.dropdown-item-marker {\n  color: var(--button-primary);\n}\n\n\na {\n  &:hover {\n    color: var(--hover-link);\n  }\n  &:visited {\n    color: var(--visited-link);\n  }\n}\n\n.text-primary {\n  color: #fff;\n}\n\n\n\n\n:root {\n  --background: #222;\n  --back-main: #333;\n  --back-sub: #272727;\n  --back-sub-alt: rgba(0, 0, 0, 0.36);\n  --button-default: darken(@blue, 15%);\n  --button-primary: darken(@blue, 25%);\n  --button-hover: darken(@blue, 30%);\n  --header: @blue; /* Use same as Header picker */\n  --text-main: #BBB;\n  --text-sub: #9b9b9b;\n  --link: #00BFFF; /* Use same as Header picker, lighten by 70% */\n  --visited-link: lighten(#00BFFF,15%); /* Use same as Header picker, lighten by 70% */\n  --hover-link: lighten(#00BFFF,30%); /* Use same as Header picker, lighten by 70% */\n  --nav-link: #FFF; /* Use same as Header picker */\n  --light-link: #fff; /* Use same as Header picker */\n}\n\n#ldapad_test_results.well.well-sm{\n  color: var(--back-main);\n}\na.actions {\n  color:#fff !important;\n}\n//pagination\n.pagination > li >a{\n  color: var(--light-link);\n  background-color: var(--back-main);\n}\n.pagination > .active > a {\n  background-color: var(--visited-link);\n  border-color: var(--light-link);\n}\n.pagination > .active > a:hover{\n  background-color: var(--hover-link);\n}\n.tasks-menu > .dropdown-menu > li .menu{\n  background-color: var(--back-main);\n}\n\n.tasks-menu > .dropdown-menu > li .menu > li > a:hover .progress{\n  background-color: var(--background);\n}\nh2.task_menu{\n  color:var(--link);\n}\n.navbar-custom-menu > .navbar-nav > li > .dropdown-menu{\n  background-color:var(--back-main);\n  color:var(--link);\n}\n\n.main-header .navbar, .main-header .logo {\n  background-color: var(--header);\n  background: -webkit-linear-gradient(top,  var(--header) 0%,var(--header) 100%);\n  background: linear-gradient(to bottom, var(--header) 0%,var(--header) 100%);\n  border-color: var(--header);\n}\n\n.bootstrap-table .fixed-table-container .table thead th .sortable {\n  color: var(--nav-link);\n}\n.bootstrap-table .fixed-table-toolbar .columns label {\n  color:#000;\n}\n.thead, .navbar-nav>li>a:link {\n  color: var(--nav-link);\n}\n.far fa-life-ring{\n  color:var(--link);\n}\n.modal-content {\n  background-color: var(--back-main);\n  color: var(--text-main);\n}\n\na:link {\n  color: var(--link);\n}\n\n.btn-primary.hover {\n  color: var(--nav-link);\n}\n.bootstrap-table .fixed-table-toolbar .columns label {\n  color:#000;\n}\n.small-box h3, .small-box p {\n  color: var(--nav-link) !important;\n  a:hover {\n    text-decoration: none;\n    color: var(--nav-link) !important;\n  }\n}\n\n\n#accessoriesTable>tbody>tr>td>nobr>a>i.fa {\n  color: var(--text-main);\n}\n#assetsListingTable>tbody>tr>td>nobr>a>i.fa {\n  color: var(--text-main);\n}\n\n#assetsListingTable>tbody>tr.selected>td {\n  background-color: var(--back-main);\n}\nbody {\n  color: var(--text-main);\n}\n.box, .box.box-default {\n  border-top: 3px solid var(--header);\n  border-top-color: var(--header);\n}\n.box-body, .box-footer, .box-header {\n  background-color: var(--back-sub);\n  color: var(--header);\n}\n.btn-default{\n  background-color: var(--button-default);\n  color: var(--link);\n}\n\n.btn-default dropdown-toggle {\n  background-color: var(--button-default);\n  color: var(--link);\n}\n\n.btn-default:active, .btn-default:focus, .btn-default:hover, .btn-default.active {\n  background-color: var(--button-hover);\n  color: var(--link);\n}\n.btn-primary, .btn-primary.hover, .btn-primary:active, .text-blue {\n  color: var(--text-main);\n}\n.btn-primary:hover {\n  background-color: var(--button-primary);\n}\n#componentsTable>tbody>tr>td>nobr>a>i.fa {\n  color: var(--text-main);\n}\n#consumablesTable>tbody>tr>td>nobr>a>i.fa {\n  color: var(--text-main);\n}\n.content-wrapper {\n  background-color: var(--background);\n}\n#create-form>div>div>div>span>i.fa {\n  background-color: var(--back-sub);\n  color: var(--header);\n}\n.datepicker .datepicker-switch:hover, .datepicker .next:hover, .datepicker .prev:hover, .datepicker tfoot tr th:hover, .datepicker table tr td.day.focused, .datepicker table tr td.day:hover {\n  background-color: var(--header);\n}\n.datepicker.dropdown-menu {\n  background-color: var(--back-main);\n  color: var(--text-main);\n}\n#details>div>div>div>table {\n  background-color: transparent;\n}\n.dropdown-menu>li>a:hover {\n  background-color: var(--back-main);\n  color: var(--nav-link);\n}\n.fixed-table-body thead th .th-inner{\n  color: var(--nav-link);\n}\n.form-control {\n  background-color: var(--back-main);\n  color: var(--text-main);\n}\n.form-control[disabled], .form-control[readonly], fieldset[disabled] .form-control{\n  background-color: var(--back-main);\n  color: var(--text-main);\n}\nh1, h2, h3, h4, h5, h6, p {\n  color: var(--text-main);\n}\n.help-block {\n  color: var(--text-sub);\n}\ninput[type=text], input[type=search] {\n  background-color: var(--back-sub);\n  color: var(--text-main);\n}\n.input-group, .input-group-addon {\n  background-color: var(--back-sub)!important;\n  color: var(--text-main);\n}\n#licensesTable>tbody>tr>td>nobr>a>i.fa {\n  color: var(--text-main);\n}\n.main-footer {\n  background-color: var(--back-main);\n  color: var(--text-main);\n}\n.nav-tabs-custom>.nav-tabs>li>a, .nav-tabs-custom>.nav-tabs>li.active>a {\n  color: var(--text-main);\n}\n.nav-tabs-custom>.nav-tabs>li.active {\n  border-top-color: var(--header);\n}\n.nav-tabs-custom>.nav-tabs>li.active>a {\n  background-color: var(--back-main);\n}\n.nav-tabs-custom>.nav-tabs>li.active>a:hover {\n  background-color: var(--back-sub);\n  color: var(--text-main);\n}\n.nav-tabs-custom, .nav-tabs-custom>.tab-content {\n  background-color: var(--back-main);\n}\n.navbar-nav>.tasks-menu>.dropdown-menu>li.header {\n  background-color: var(--back-main);\n  color: var(--header);\n}\n.open>.dropdown-toggle.btn-default {\n  background-color: var(--back-sub);\n  color: var(--header);\n}\n.panel {\n  background-color: var(--back-sub);\n  color: var(--text-main);\n}\n.panel-default>.panel-heading {\n  background-color: var(--back-main);\n  color: var(--header);\n}\n.select2-container--default .select2-results__option[aria-selected=true], .select2-container--default .select2-results__option[aria-selected=true]:hover {\n  background-color: var(--back-sub);\n  color: var(--header);\n}\n.select2-container--default .select2-results__option--highlighted[aria-selected] {\n  background-color: var(--header);\n  color: var(--back-main);\n}\n.select2-container--default .select2-selection--single .select2-selection__rendered {\n  color: var(--text-main);\n}\n.select2-container--default .select2-selection--multiple .select2-selection__choice {\n  background-color: var(--header);\n}\n.select2-selection--single {\n  background-color: var(--back-sub)!important;\n  color: var(--text-main)!important;\n}\n.select2-dropdown {\n  background-color: var(--back-main);\n  color: var(--text-main);\n}\n.skin-blue-dark .main-header .navbar .dropdown-menu li a {\n  color: #FFFFFF;\n}\n.skin-blue-dark .main-header .navbar .dropdown-menu li a:hover {\n  background-color: #3c8dbc;\n}\n.fixed-table-body thead th .th-inner, .skin-blue-dark .sidebar-menu>li.active>a, .skin-blue .sidebar-menu>li:hover>a, .sidebar-toggle:hover {\n  background-color: var(--header)!important;\n}\n.tab-content, .tab-pane {\n  background-color: var(--back-main);\n  color: var(--text-main);\n}\n.table-striped>tbody>tr:nth-of-type(odd) {\n  background-color: var(--back-sub);\n}\n.table-striped>tbody>tr:nth-of-type(even){\n  background-color: var(--back-sub-alt);\n}\n#webui>div>div>div>div>div>table>tbody>tr>td>a>i.fa, .box-body, .box-footer, .box-header {\n  color: var(--text-main);\n}\n\n.box-header.with-border {\n  border-bottom: #000;\n}\n\na {\n  color: var(--link);\n\n  &:link {\n    color: var(--link)  }\n  &:hover {\n    color: var(--hover-link);\n    text-decoration: underline;\n  }\n  &:visited {\n    color: var(--visited-link)\n  }\n}\n#customFieldsTable a[href*='/models'] {\n  color: var(--back-sub);\n}\n#customFieldsTable a[href*='/fieldsets']{\n  background-color: transparent;\n}\n\n.row-striped {\n  vertical-align: top;\n  line-height: 2.6;\n  padding: 0px;\n  margin-left: 20px;\n  box-sizing: border-box;\n  //border-left: 1px solid #dddddd;\n  //border-right: 1px solid #dddddd;\n  display: table;\n\n}\n\n.row-striped .row:nth-of-type(odd) div {\n  background-color: var(--back-sub);\n  color: var(--text-main);\n  border-top: 1px solid #dddddd;\n  display: table-cell;\n\n}\n\n.row-striped .row:nth-of-type(even) div {\n  background-color: var(--back-sub);\n  color: var(--text-main);\n  border-top: 1px solid #dddddd;\n  display: table-cell;\n}\n.row-new-striped > .row:nth-of-type(odd){\n  background-color: var(--back-sub);\n  color: var(--text-main);\n}\n.row-new-striped > .row:nth-of-type(even){\n  background-color: var(--back-sub-alt);\n  color: var(--text-main);\n}\n\n.search-highlight, .search-highlight:hover {\n  background-color: #e9d15b;\n}\n.table > tbody > tr.warning > td{\n  background-color:var(--back-sub);\n}","/*\n * Skin: Contrast\n * ----------\n */\n@import \"../bootstrap-less/mixins.less\";\n@import \"../bootstrap-less/variables.less\";\n@import \"../variables.less\";\n@import \"../mixins.less\";\n\n.skin-contrast {\n  //Navbar\n  .main-header {\n    .navbar {\n      .navbar-variant(@navy; #fff);\n      .sidebar-toggle {\n        color: #fff;\n        &:hover {\n          background-color: darken(@navy, 5%);\n        }\n      }\n      @media (max-width: @screen-header-collapse) {\n        .dropdown-menu {\n          li {\n            &.divider {\n              background-color: rgba(255, 255, 255, 0.1);\n            }\n            a {\n              color: #fff;\n              &:hover {\n                background: darken(@navy, 5%);\n              }\n            }\n          }\n        }\n      }\n    }\n    //Logo\n\n    li.user-header {\n      background-color: @navy;\n    }\n  }\n\n  //Content Header\n  .content-header {\n    background: transparent;\n  }\n\n  //Create the sidebar skin\n  .skin-dark-sidebar(@navy);\n}\n\n.skin-contrast.layout-top-nav .main-header > .logo {\n  .logo-variant {\n    background-color: none;\n  }\n}\n\n\n\n.btn, .btn:hover {\n\n\n  &.btn-primary, .btn-primary:link {\n    background-color: darken(@navy, 10%);\n    border-color: darken(@navy, 20%);\n    color: #fff;\n  }\n\n\n  &a.btn-primary:hover {\n    background-color: darken(@navy, 20%);\n    border-color: darken(@navy, 20%);\n    color: #fff;\n  }\n\n  &.btn-white:link {\n    background-color: darken(@navy, 10%);\n    color: #fff;\n  }\n\n  &.btn-white:hover {\n    background-color: darken(@navy, 30%);\n    color: #fff;\n  }\n}\na.btn.btn-link.text-left{\n  color:@navy;\n  border: 1px solid #000;\n}\na.btn.btn-link.text-left:hover{\n  color:@navy;\n}\n\na {\n  color: @navy;\n  &:hover {\n    color: @navy;\n    text-decoration: underline;\n\n  }\n  &:visited {\n    color: @navy;\n  }\n}\n\na.btn {\n  &:hover {\n    color: #fff;\n    text-decoration: underline;\n  }\n}\n\n.text-primary {\n  color: darken(@navy, 20%);\n}\n\n.skin-contrast .treeview-menu>li>a {\n  color: #FFF;\n}\n\n.bg-teal {\n  background-color: darken(@teal, 25%)!important;\n}\n\n.bg-orange {\n  background-color: darken(@orange, 20%)!important;\n}\n\n.bg-purple {\n  background-color: darken(@purple, 20%)!important;\n}\n\n.bg-maroon {\n  background-color: darken(@maroon, 20%)!important;\n}\n\n.pagination>li>a  {\n  color: darken(@navy, 10%)!important;\n}\n\n.pagination>.active>a {\n  background-color: @navy;\n  color: #FFF!important;\n}\n\nbtn-success {\n  background-color: darken(@green, 30%);\n}\n\n\n\ninput::-webkit-input-placeholder { /* Chrome/Opera/Safari */\n  color: darken(@gray, 10%) !important;\n}\ninput::-moz-placeholder { /* Firefox 19+ */\n  color: darken(@gray, 10%) !important;\n}\ninput::-ms-input-placeholder { /* IE 10+ */\n  color: darken(@gray, 10%) !important;\n}\n\n.select2-default, .select2-selection__placeholder {\n  color: darken(@dark-gray, 10%) !important;\n}\n\n.callout.callout-info {\n  background-color: darken(@blue, 20%)!important;\n}\n\n.fixed-table-container tbody .selected td {\n  background-color: #fff8af;\n}\n\n.search-highlight, .search-highlight:hover {\n  background-color: #e9d15b;\n}","/*\n * Skin: Green\n * ----------\n */\n@import \"../bootstrap-less/mixins.less\";\n@import \"../bootstrap-less/variables.less\";\n@import \"../variables.less\";\n@import \"../mixins.less\";\n:root{\n  --background: #222;\n  --back-main: #333;\n  --back-sub: #3d4144;\n  --back-sub-alt: rgba(0, 0, 0, 0.36);\n  --button-default: darken(@green, 15%);\n  --button-primary: darken(@green, 25%);\n  --button-hover: darken(@green, 30%);\n  --header: @green; /* Use same as Header picker */\n  --text-main: #BBB;\n  --text-sub: #9b9b9b;\n  --link: @green; /* Use same as Header picker, lighten by 70% */\n  --visited-link: lighten(@green, 15%); /* Use same as Header picker, lighten by 70% */\n  --hover-link: lighten(@green, 20%);\n}\n.skin-green {\n  //Navbar\n  .main-header {\n    .navbar {\n      .navbar-variant(@green; #fff);\n      .sidebar-toggle {\n        color: #fff;\n        &:hover {\n          background-color: darken(@green, 5%);\n        }\n      }\n      @media (max-width: @screen-header-collapse) {\n        .dropdown-menu {\n          li {\n            &.divider {\n              background-color: rgba(255, 255, 255, 0.1);\n            }\n            a {\n              color: #333;\n              &:hover {\n                background: darken(@green, 5%);\n              }\n            }\n          }\n        }\n      }\n    }\n    //Logo\n\n    li.user-header {\n      background-color: @green;\n    }\n  }\n\n  //Content Header\n  .content-header {\n    background: transparent;\n  }\n\n  //Create the sidebar skin\n  .skin-dark-sidebar(@green);\n}\n\n.skin-green.layout-top-nav .main-header > .logo {\n  .logo-variant {\n    background-color: none;\n  }\n}\n\n\n\n.btn, .btn:hover {\n\n\n  &.btn-primary, .btn-primary:link {\n    background-color: darken(@green, 10%);\n    border-color: darken(@green, 20%);\n    color: #fff;\n  }\n\n\n  &a.btn-primary:hover {\n    background-color: darken(@green, 20%);\n    border-color: darken(@green, 20%);\n    color: #fff;\n  }\n\n  &.btn-white:link {\n    background-color: darken(@green, 10%);\n    color: #fff;\n  }\n\n  &.btn-white:hover {\n    background-color: darken(@green, 30%);\n    color: #fff;\n  }\n}\na.btn-info:link, a.btn-warning:link, a.btn-danger:link{\n  color: #FFF;\n}\n&a.btn-info:visited, a.btn-warning:visited, a.btn-danger:visited{\n  color: #FFF;\n}\na:link {\n  color: var(--link);\n}\n\na:visited {\n  color: var(--visited-link);\n}\n\na {\n  color: @green;\n  &:hover {\n    color: darken(@green, 20%);\n  }\n  &:visited {\n    color: @green;\n  }\n}\n\n.text-primary {\n  color: darken(@green, 20%);\n}\n.far fa-life-ring{\n  color:var(--link);\n}\n.fixed-table-container tbody .selected td {\n  background-color: #fff8af;\n}\n.select2-container--default .select2-selection--multiple .select2-selection__choice {\n  background-color: @green;\n}\n\n.search-highlight, .search-highlight:hover {\n  background-color: #e9d15b;\n}","/*\n * Skin: green dark\n * ----------\n */\n@import \"../bootstrap-less/mixins.less\";\n@import \"../bootstrap-less/variables.less\";\n@import \"../variables.less\";\n@import \"../mixins.less\";\n\n.skin-green-dark {\n  //Navbar\n  .main-header {\n    .navbar {\n      .navbar-variant(@green; #fff);\n      .sidebar-toggle {\n        color: #fff;\n        &:hover {\n          background-color: darken(@green, 5%);\n        }\n      }\n      @media (max-width: @screen-header-collapse) {\n        .dropdown-menu {\n          li {\n            &.divider {\n              background-color: rgba(255, 255, 255, 0.1);\n              color: #fff;\n            }\n            a {\n              color: #fff;\n              &:hover {\n                background: darken(@green, 5%);\n                color: #fff;\n              }\n            }\n          }\n        }\n      }\n    }\n    //Logo\n\n    li.user-header {\n      background-color: @green;\n    }\n  }\n\n  //Content Header\n  .content-header {\n    background: transparent;\n  }\n\n  //Create the sidebar skin\n  .skin-dark-sidebar(@green);\n}\n\n.skin-green-dark.layout-top-nav .main-header > .logo {\n  .logo-variant {\n    background-color: none;\n  }\n}\n\n\n\n.btn, .btn:hover {\n  color: #FFF !important;\n\n  &.btn-primary, .btn-primary:link {\n    background-color: darken(@green, 10%);\n    border-color: #FFF;\n    color: #FFF;\n  }\n\n\n  &a.btn-primary:hover {\n    background-color: darken(@green, 20%);\n    border-color: darken(@green, 20%);\n    color: #FFF;\n  }\n\n  &.btn-white:link {\n    background-color: darken(@green, 10%);\n    color: #FFF;\n  }\n\n  &.btn-white:hover {\n    background-color: darken(@green, 30%);\n    color: #FFF;\n  }\n}\n\n/**\nThe dropdown is white, so use a darker color\n */\nli.dropdown-item-marker {\n  color: var(--button-primary);\n}\n\na {\n  &:hover {\n    color: var(--hover-link);\n  }\n  &:visited {\n    color: var(--visited-link);\n  }\n}\n\n.text-primary {\n  color: #fff;\n}\n\n\n\n\n:root {\n  --background: #222;\n  --back-main: #333;\n  --back-sub: #312F2F;\n  --back-sub-alt: rgba(0, 0, 0, 0.36);\n  --button-default: #006400;\n  --button-primary: darken(#006400, 10%);\n  --button-hover: darken(#006400, 30%);\n  --header: #006400; /* Use same as Header picker */\n  --text-main: #FFF;\n  --text-sub: #9b9b9b;\n  --link: #9ACD32; /* Use same as Header picker, lighten by 70% */\n  --visited-link: lighten(#9ACD32, 15%); /* Use same as Header picker, lighten by 70% */\n  --hover-link: lighten(#9ACD32, 30%); /* Use same as Header picker, lighten by 70% */\n  --nav-link: #FFF; /* Use same as Header picker */\n  --light-link: #fff; /* Use same as Header picker */\n}\n\n#ldapad_test_results.well.well-sm{\n  color: var(--back-main);\n}\na.actions {\n  color:#fff !important;\n}\n//pagination\n.pagination > li >a{\n  color: var(--light-link);\n  background-color: var(--back-main);\n}\n.pagination > .active > a {\n  background-color: var(--visited-link);\n  border-color: var(--light-link);\n}\n.pagination > .active > a:hover{\n  background-color: var(--hover-link);\n}\n.tasks-menu > .dropdown-menu > li .menu{\n  background-color: var(--back-main);\n}\n\n.tasks-menu > .dropdown-menu > li .menu > li > a:hover .progress{\n  background-color: var(--background);\n}\nh2.task_menu{\n  color:var(--link);\n}\n.navbar-custom-menu > .navbar-nav > li > .dropdown-menu{\n  background-color:var(--back-main);\n  color:var(--link);\n}\n\n.main-header .navbar, .main-header .logo {\n  background-color: var(--header);\n  background: -webkit-linear-gradient(top,  var(--header) 0%,var(--header) 100%);\n  background: linear-gradient(to bottom, var(--header) 0%,var(--header) 100%);\n  border-color: var(--header);\n}\n\n.bootstrap-table .fixed-table-container .table thead th .sortable {\n  color: var(--nav-link);\n}\n.far fa-life-ring{\n  color:var(--link);\n}\n.thead, .navbar-nav>li>a:link {\n  color: var(--nav-link);\n}\n\n.modal-content {\n  background-color: var(--back-main);\n  color: var(--text-main);\n}\n\n.btn-primary.hover {\n  color: var(--nav-link);\n}\n\n.small-box h3, .small-box p {\n  color: var(--nav-link) !important;\n  a:hover {\n    text-decoration: none;\n    color: var(--nav-link) !important;\n  }\n}\n\n\n#accessoriesTable>tbody>tr>td>nobr>a>i.fa {\n  color: var(--text-main);\n}\n#assetsListingTable>tbody>tr>td>nobr>a>i.fa {\n  color: var(--text-main);\n}\n\n#assetsListingTable>tbody>tr.selected>td {\n  background-color: var(--back-main);\n}\nbody {\n  color: var(--text-main);\n}\n.box, .box.box-default {\n  border-top: 3px solid var(--header);\n  border-top-color: var(--header);\n}\n.box-body, .box-footer, .box-header {\n  background-color: var(--back-sub);\n  color: var(--header);\n}\n.btn-default{\n  background-color: var(--button-default);\n  color: var(--link);\n}\n\n.btn-default dropdown-toggle {\n  background-color: var(--button-default);\n  color: var(--link);\n}\n\n.btn-default:active, .btn-default:focus, .btn-default:hover, .btn-default.active {\n  background-color: var(--button-hover);\n  color: var(--link);\n}\n.btn-primary, .btn-primary.hover, .btn-primary:active, .text-green {\n  color: var(--text-main);\n}\n.btn-primary:hover {\n  background-color: var(--button-primary);\n}\n#componentsTable>tbody>tr>td>nobr>a>i.fa {\n  color: var(--text-main);\n}\n#consumablesTable>tbody>tr>td>nobr>a>i.fa {\n  color: var(--text-main);\n}\n.content-wrapper {\n  background-color: var(--background);\n}\n#create-form>div>div>div>span>i.fa {\n  background-color: var(--back-sub);\n  color: var(--header);\n}\n.datepicker .datepicker-switch:hover, .datepicker .next:hover, .datepicker .prev:hover, .datepicker tfoot tr th:hover, .datepicker table tr td.day.focused, .datepicker table tr td.day:hover {\n  background-color: var(--header);\n}\n.datepicker.dropdown-menu {\n  background-color: var(--back-main);\n  color: var(--text-main);\n}\n#details>div>div>div>table {\n  background-color: transparent;\n}\n.dropdown-menu>li>a:hover {\n  background-color: var(--back-main);\n  color: var(--nav-link);\n}\n.fixed-table-body thead th .th-inner{\n  color: var(--nav-link);\n}\n.form-control {\n  background-color: var(--back-main);\n  color: var(--text-main);\n}\n.form-control[disabled], .form-control[readonly], fieldset[disabled] .form-control{\n  background-color: var(--back-main);\n  color: var(--text-main);\n}\nh1, h2, h3, h4, h5, h6, p {\n  color: var(--text-main);\n}\n.help-block {\n  color: var(--text-sub);\n}\ninput[type=text], input[type=search] {\n  background-color: var(--back-sub);\n  color: var(--text-main);\n}\n.input-group, .input-group-addon {\n  background-color: var(--back-sub)!important;\n  color: var(--text-main);\n}\n#licensesTable>tbody>tr>td>nobr>a>i.fa {\n  color: var(--text-main);\n}\n.main-footer {\n  background-color: var(--back-main);\n  color: var(--text-main);\n}\n.nav-tabs-custom>.nav-tabs>li>a, .nav-tabs-custom>.nav-tabs>li.active>a {\n  color: var(--text-main);\n}\n.nav-tabs-custom>.nav-tabs>li.active {\n  border-top-color: var(--header);\n}\n.nav-tabs-custom>.nav-tabs>li.active>a {\n  background-color: var(--back-main);\n}\n.nav-tabs-custom>.nav-tabs>li.active>a:hover {\n  background-color: var(--back-sub);\n  color: var(--text-main);\n}\n.nav-tabs-custom, .nav-tabs-custom>.tab-content {\n  background-color: var(--back-main);\n}\n.open>.dropdown-toggle.btn-default {\n  background-color: var(--back-sub);\n  color: var(--header);\n}\n.panel {\n  background-color: var(--back-sub);\n  color: var(--text-main);\n}\n.panel-default>.panel-heading {\n  background-color: var(--back-main);\n  color: var(--header);\n}\n.select2-container--default .select2-results__option[aria-selected=true], .select2-container--default .select2-results__option[aria-selected=true]:hover {\n  background-color: var(--back-sub);\n  color: var(--header);\n}\n.select2-container--default .select2-results__option--highlighted[aria-selected] {\n  background-color: var(--header);\n  color: var(--back-main);\n}\n.select2-container--default .select2-selection--single .select2-selection__rendered {\n  color: var(--text-main);\n}\n.select2-container--default .select2-selection--multiple .select2-selection__choice {\n  background-color: var(--header);\n}\n.select2-selection--single {\n  background-color: var(--back-sub)!important;\n  color: var(--text-main)!important;\n}\n.select2-dropdown {\n  background-color: var(--back-main);\n  color: var(--text-main);\n}\n.skin-green-dark .main-header .navbar .dropdown-menu li a {\n  color: #FFFFFF;\n}\n.skin-green-dark .main-header .navbar .dropdown-menu li a:hover {\n  background-color: #006300;\n}\n.fixed-table-body thead th .th-inner, .skin-green-dark .sidebar-menu>li.active>a, .skin-green .sidebar-menu>li:hover>a, .sidebar-toggle:hover {\n  background-color: var(--header)!important;\n}\n.tab-content, .tab-pane {\n  background-color: var(--back-main);\n  color: var(--text-main);\n}\n.table-striped>tbody>tr:nth-of-type(odd) {\n  background-color: var(--back-sub);\n}\n.table-striped>tbody>tr:nth-of-type(even){\n  background-color: var(--back-sub);\n}\n#webui>div>div>div>div>div>table>tbody>tr>td>a>i.fa, .box-body, .box-footer, .box-header {\n  color: var(--text-main);\n}\n\n.box-header.with-border {\n  border-bottom: #000;\n}\n\na {\n  color: var(--link);\n\n  &:link {\n    color: var(--link)  }\n  &:hover {\n    color: var(--hover-link);\n    text-decoration: underline;\n  }\n  &:visited {\n    color: var(--visited-link)\n  }\n}\n#customFieldsTable a[href*='/models'] {\n  color: var(--back-sub);\n}\n#customFieldsTable a[href*='/fieldsets']{\n  background-color: transparent;\n}\n\n.row-striped {\n  vertical-align: top;\n  line-height: 2.6;\n  padding: 0px;\n  margin-left: 20px;\n  box-sizing: border-box;\n  //border-left: 1px solid #dddddd;\n  //border-right: 1px solid #dddddd;\n  display: table;\n\n}\n\n.row-striped .row:nth-of-type(odd) div {\n  background-color: var(--back-sub);\n  color: var(--text-main);\n  border-top: 1px solid #dddddd;\n  display: table-cell;\n\n}\n\n.row-striped .row:nth-of-type(even) div {\n  background-color: var(--back-sub);\n  color: var(--text-main);\n  border-top: 1px solid #dddddd;\n  display: table-cell;\n}\n.row-new-striped > .row:nth-of-type(odd){\n  background-color: var(--back-sub);\n  color: var(--text-main);\n}\n.row-new-striped > .row:nth-of-type(even){\n  background-color: var(--back-sub-alt);\n  color: var(--text-main);\n}\n\n\n.search-highlight, .search-highlight:hover {\n  background-color: #e9d15b;\n}\n.table > tbody > tr.warning > td{\n  background-color:var(--back-sub);\n}","/*\n * Skin: orange dark\n * ----------\n */\n@import \"../bootstrap-less/mixins.less\";\n@import \"../bootstrap-less/variables.less\";\n@import \"../variables.less\";\n@import \"../mixins.less\";\n\n.skin-orange-dark {\n  //Navbar\n  .main-header {\n    .navbar {\n      .navbar-variant(@orange; #fff);\n      .sidebar-toggle {\n        color: #fff;\n        &:hover {\n          background-color: darken(@orange, 5%);\n        }\n      }\n      @media (max-width: @screen-header-collapse) {\n        .dropdown-menu {\n          li {\n            &.divider {\n              background-color: rgba(255, 255, 255, 0.1);\n              color: #fff;\n            }\n            a {\n              color: #fff;\n              &:hover {\n                background: darken(@orange, 5%);\n                color: #fff;\n              }\n            }\n          }\n        }\n      }\n    }\n    //Logo\n\n    li.user-header {\n      background-color: @orange;\n    }\n  }\n\n  //Content Header\n  .content-header {\n    background: transparent;\n  }\n\n  //Create the sidebar skin\n  .skin-dark-sidebar(@orange);\n}\n\n.skin-orange-dark.layout-top-nav .main-header > .logo {\n  .logo-variant {\n    background-color: none;\n  }\n}\n\n\n\n.btn, .btn:hover {\n  color: #fff !important;\n\n  &.btn-primary, .btn-primary:link {\n    background-color: darken(@orange, 10%);\n    border-color: #fff;\n    color: #fff;\n  }\n\n\n  &a.btn-primary:hover {\n    background-color: darken(@orange, 20%);\n    border-color: darken(@orange, 20%);\n    color: #fff;\n  }\n\n  &.btn-white:link {\n    background-color: darken(@orange, 10%);\n    color: #fff;\n  }\n\n  &.btn-white:hover {\n    background-color: darken(@orange, 30%);\n    color: #fff;\n  }\n}\n\n/**\nThe dropdown is white, so use a darker color\n */\nli.dropdown-item-marker {\n  color: var(--button-primary);\n}\n\n.text-primary {\n  color: #fff;\n}\n\n:root {\n  --background: #222;\n  --back-main: #333;\n  --back-sub: #2E2C2C;\n  --back-sub-alt: rgba(0, 0, 0, 0.36);\n  --button-default: darken(@orange, 15%);\n  --button-primary: darken(@orange, 25%);\n  --button-hover: darken(@orange, 30%);\n  --header: @orange; /* Use same as Header picker */\n  --text-main: #BBB;\n  --text-sub: #9b9b9b;\n  --link: #FFA500; /* Use same as Header picker, lighten by 70% */\n  --visited-link: lighten(#FFA500, 15%); /* Use same as Header picker, lighten by 70% */\n  --hover-link: lighten(#FFA500, 30%); /* Use same as Header picker, lighten by 70% */\n  --nav-link: #FFF; /* Use same as Header picker */\n  --light-link: #fff; /* Use same as Header picker */\n}\n\n#ldapad_test_results.well.well-sm{\n  color: var(--back-main);\n}\na.actions {\n  color:#fff !important;\n}\n//pagination\n.pagination > li >a{\n  color: var(--light-link);\n  background-color: var(--back-main);\n}\n.pagination > .active > a {\n  background-color: var(--visited-link);\n  border-color: var(--light-link);\n}\n.pagination > .active > a:hover{\n  background-color: var(--hover-link);\n}\n.tasks-menu > .dropdown-menu > li .menu{\n  background-color: var(--back-main);\n}\n\n.tasks-menu > .dropdown-menu > li .menu > li > a:hover .progress{\n  background-color: var(--background);\n}\nh2.task_menu{\n  color:var(--link);\n}\n.navbar-custom-menu > .navbar-nav > li > .dropdown-menu{\n  background-color:var(--back-main);\n  color:var(--link);\n}\n\n.main-header .navbar, .main-header .logo {\n  background-color: var(--header);\n  background: -webkit-linear-gradient(top,  var(--header) 0%,var(--header) 100%);\n  background: linear-gradient(to bottom, var(--header) 0%,var(--header) 100%);\n  border-color: var(--header);\n}\n.far fa-life-ring{\n  color:var(--link);\n}\n\n.bootstrap-table .fixed-table-container .table thead th .sortable {\n  color: var(--nav-link);\n}\n.bootstrap-table .fixed-table-toolbar .columns label {\n  color:#000;\n}\n\n.thead, .navbar-nav>li>a:link {\n  color: var(--nav-link);\n}\n\n.modal-content {\n  background-color: var(--back-main);\n  color: var(--text-main);\n}\n\na:link {\n  color: var(--link);\n}\n\na:visited {\n  color: var(--visited-link);\n}\n\na:hover {\n  color: var(--hover-link);\n}\n\n.btn-primary.hover {\n  color: var(--nav-link);\n}\n\n.small-box h3, .small-box p {\n  color: var(--nav-link) !important;\n  a:hover {\n    text-decoration: none;\n    color: var(--nav-link) !important;\n  }\n}\n\n\n#accessoriesTable>tbody>tr>td>nobr>a>i.fa {\n  color: var(--text-main);\n}\n#assetsListingTable>tbody>tr>td>nobr>a>i.fa {\n  color: var(--text-main);\n}\n\n#assetsListingTable>tbody>tr.selected>td {\n  background-color: var(--back-main);\n}\nbody {\n  color: var(--text-main);\n}\n.box, .box.box-default {\n  border-top: 3px solid var(--header);\n  border-top-color: var(--header);\n}\n.box-body, .box-footer, .box-header {\n  background-color: var(--back-sub);\n  color: var(--header);\n}\n.btn-default{\n  background-color: var(--button-default);\n  color: var(--nav-link);\n}\na:link.btn-default{\n  color: var(--nav-link);\n}\n.btn-default dropdown-toggle {\n  background-color: var(--button-default);\n  color: var(--nav-link);\n}\n\n.btn-default:active, .btn-default:focus, .btn-default:hover, .btn-default.active {\n  background-color: var(--button-hover);\n  color: var(--background);\n}\n.btn-primary, .btn-primary.hover, .btn-primary:active, .text-orange {\n  color: var(--nav-link)!important;\n  border-color: var(--button-primary);\n}\n.btn-primary:hover {\n  background-color: var(--button-primary);\n}\n#componentsTable>tbody>tr>td>nobr>a>i.fa {\n  color: var(--text-main);\n}\n#consumablesTable>tbody>tr>td>nobr>a>i.fa {\n  color: var(--text-main);\n}\n.content-wrapper {\n  background-color: var(--background);\n}\n#create-form>div>div>div>span>i.fa {\n  background-color: var(--back-sub);\n  color: var(--header);\n}\n.datepicker .datepicker-switch:hover, .datepicker .next:hover, .datepicker .prev:hover, .datepicker tfoot tr th:hover, .datepicker table tr td.day.focused, .datepicker table tr td.day:hover {\n  background-color: var(--header);\n}\n.datepicker.dropdown-menu {\n  background-color: var(--back-main);\n  color: var(--text-main);\n}\n#details>div>div>div>table {\n  background-color: transparent;\n}\n.dropdown-menu>li>a:hover {\n  background-color: var(--back-main);\n  color: var(--nav-link);\n}\n.fixed-table-body thead th .th-inner{\n  color: var(--nav-link);\n}\n.form-control {\n  background-color: var(--back-main);\n  color: var(--text-main);\n}\n.form-control[disabled], .form-control[readonly], fieldset[disabled] .form-control{\n  background-color: var(--back-main);\n  color: var(--text-main);\n}\nh1, h2, h3, h4, h5, h6, p {\n  color: var(--text-main);\n}\n.help-block {\n  color: var(--text-sub);\n}\ninput[type=text], input[type=search] {\n  background-color: var(--back-sub);\n  color: var(--text-main);\n}\n.input-group, .input-group-addon {\n  background-color: var(--back-sub)!important;\n  color: var(--text-main);\n}\n#licensesTable>tbody>tr>td>nobr>a>i.fa {\n  color: var(--text-main);\n}\n.main-footer {\n  background-color: var(--back-main);\n  color: var(--text-main);\n}\n.nav-tabs-custom>.nav-tabs>li>a, .nav-tabs-custom>.nav-tabs>li.active>a {\n  color: var(--text-main);\n}\n.nav-tabs-custom>.nav-tabs>li.active {\n  border-top-color: var(--header);\n}\n.nav-tabs-custom>.nav-tabs>li.active>a {\n  background-color: var(--back-main);\n}\n.nav-tabs-custom>.nav-tabs>li.active>a:hover {\n  background-color: var(--back-sub);\n  color: var(--text-main);\n}\n.nav-tabs-custom, .nav-tabs-custom>.tab-content {\n  background-color: var(--back-main);\n}\n.navbar-nav>.tasks-menu>.dropdown-menu>li.header {\n  background-color: var(--back-main);\n  color: var(--header);\n}\n.open>.dropdown-toggle.btn-default {\n  background-color: var(--back-sub);\n  color: var(--header);\n}\n.panel {\n  background-color: var(--back-sub);\n  color: var(--text-main);\n}\n.panel-default>.panel-heading {\n  background-color: var(--back-main);\n  color: var(--header);\n}\n.select2-container--default .select2-results__option[aria-selected=true], .select2-container--default .select2-results__option[aria-selected=true]:hover {\n  background-color: var(--back-sub);\n  color: var(--header);\n}\n.select2-container--default .select2-results__option--highlighted[aria-selected] {\n  background-color: var(--header);\n  color: var(--back-main);\n}\n.select2-container--default .select2-selection--single .select2-selection__rendered {\n  color: var(--text-main);\n}\n.select2-container--default .select2-selection--multiple .select2-selection__choice {\n  background-color: var(--header);\n}\n.select2-selection--single {\n  background-color: var(--back-sub)!important;\n  color: var(--text-main)!important;\n}\n.select2-dropdown {\n  background-color: var(--back-main);\n  color: var(--text-main);\n}\n.skin-orange-dark .main-header .navbar .dropdown-menu li a {\n  color: #FFFFFF;\n}\n.skin-orange-dark .main-header .navbar .dropdown-menu li a:hover {\n  background-color: #ff8c00;\n}\n.fixed-table-body thead th .th-inner, .skin-orange-dark .sidebar-menu>li.active>a, .skin-orange .sidebar-menu>li:hover>a, .sidebar-toggle:hover {\n  background-color: var(--header)!important;\n}\n.tab-content, .tab-pane {\n  background-color: var(--back-main);\n  color: var(--text-main);\n}\n.table-striped>tbody>tr:nth-of-type(odd) {\n  background-color: var(--back-sub);\n}\n.table-striped>tbody>tr:nth-of-type(even){\n  background-color: var(--back-sub-alt);\n}\n#webui>div>div>div>div>div>table>tbody>tr>td>a>i.fa, .box-body, .box-footer, .box-header {\n  color: var(--text-main);\n}\n\n.box-header.with-border {\n  border-bottom: #000;\n}\n#customFieldsTable a[href*='/models'] {\n  color: var(--back-sub);\n}\n#customFieldsTable a[href*='/fieldsets']{\n  background-color: transparent;\n}\n\n.row-striped {\n  vertical-align: top;\n  line-height: 2.6;\n  padding: 0px;\n  margin-left: 20px;\n  box-sizing: border-box;\n  //border-left: 1px solid #dddddd;\n  //border-right: 1px solid #dddddd;\n  display: table;\n\n}\n\n.row-striped .row:nth-of-type(odd) div {\n  background-color: var(--back-sub);\n  color: var(--text-main);\n  border-top: 1px solid #dddddd;\n  display: table-cell;\n\n}\n\n.row-striped .row:nth-of-type(even) div {\n  background-color: var(--back-sub);\n  color: var(--text-main);\n  border-top: 1px solid #dddddd;\n  display: table-cell;\n}\n.row-new-striped > .row:nth-of-type(odd){\n  background-color: var(--back-sub);\n  color: var(--text-main);\n}\n.row-new-striped > .row:nth-of-type(even){\n  background-color: var(--back-sub-alt);\n  color: var(--text-main);\n}\n.search-highlight, .search-highlight:hover {\n  background-color: #e9d15b;\n}\n.table > tbody > tr.warning > td{\n  background-color:var(--back-sub);\n}","/*\n * Skin: Purple\n * ----------\n */\n@import \"../bootstrap-less/mixins.less\";\n@import \"../bootstrap-less/variables.less\";\n@import \"../variables.less\";\n@import \"../mixins.less\";\n\n.skin-purple {\n  //Navbar\n  .main-header {\n    .navbar {\n      .navbar-variant(@purple; #fff);\n      .sidebar-toggle {\n        color: #fff;\n        &:hover {\n          background-color: darken(@purple, 5%);\n        }\n      }\n      @media (max-width: @screen-header-collapse) {\n        .dropdown-menu {\n          li {\n            &.divider {\n              background-color: rgba(255, 255, 255, 0.1);\n            }\n            a {\n              color: #333;\n              &:hover {\n                background: darken(@purple, 5%);\n              }\n            }\n          }\n        }\n      }\n    }\n    //Logo\n\n    li.user-header {\n      background-color: @purple;\n    }\n  }\n\n  //Content Header\n  .content-header {\n    background: transparent;\n  }\n\n  //Create the sidebar skin\n  .skin-dark-sidebar(@purple);\n}\n\n.skin-purple.layout-top-nav .main-header > .logo {\n  .logo-variant {\n    background-color: none;\n  }\n}\n\n\n\n.btn, .btn:hover {\n\n\n  &.btn-primary, .btn-primary:link {\n    background-color: darken(@purple, 10%);\n    border-color: darken(@purple, 20%);\n    color: #fff;\n  }\n\n\n  &a.btn-primary:hover {\n    background-color: darken(@purple, 20%);\n    border-color: darken(@purple, 20%);\n    color: #fff;\n  }\n\n  &.btn-white:link {\n    background-color: darken(@purple, 10%);\n    color: #fff;\n  }\n\n  &.btn-white:hover {\n    background-color: darken(@purple, 30%);\n    color: #fff;\n  }\n}\n\n\na {\n  color: var(--link);\n  &:hover {\n    color: var(--hover-link);\n  }\n  &:visited {\n    color: var(--visited-link);\n  }\n}\n\n.text-primary {\n  color: darken(@purple, 20%);\n}\n\n:root {\n  --button-default: darken(@purple, 15%);\n  --button-primary: darken(@purple, 25%);\n  --button-hover: darken(@purple, 30%);\n  --header: @purple; /* Use same as Header picker */\n  --text-main: #BBB;\n  --text-sub: #9b9b9b;\n  --link: @purple; /* Use same as Header picker, lighten by 70% */\n  --visited-link: lighten(@purple, 15%); /* Use same as Header picker, lighten by 70% */\n  --hover-link: lighten(@purple, 30%); /* Use same as Header picker, lighten by 70% */\n  --nav-link: #FFF; /* Use same as Header picker */\n  --light-link: #fff; /* Use same as Header picker */\n}\n\na.btn-info:link, a.btn-warning:link, a.btn-danger:link{\n  color: #FFF;\n}\n&a.btn-info:visited, a.btn-warning:visited, a.btn-danger:visited{\n  color: #FFF;\n}\n\n.fixed-table-container tbody .selected td {\n  background-color: #fff8af;\n}\n\n.select2-container--default .select2-selection--multiple .select2-selection__choice {\n  background-color: @purple;\n}\n.far fa-life-ring{\n  color:var(--link);\n}\n.search-highlight, .search-highlight:hover {\n  background-color: #e9d15b;\n}","/*\n * Skin: purple dark\n * ----------\n */\n@import \"../bootstrap-less/mixins.less\";\n@import \"../bootstrap-less/variables.less\";\n@import \"../variables.less\";\n@import \"../mixins.less\";\n\n.skin-purple-dark {\n  //Navbar\n  .main-header {\n    .navbar {\n      .navbar-variant(@purple; #fff);\n      .sidebar-toggle {\n        color: #fff;\n        &:hover {\n          background-color: darken(@purple, 5%);\n        }\n      }\n      @media (max-width: @screen-header-collapse) {\n        .dropdown-menu {\n          li {\n            &.divider {\n              background-color: rgba(255, 255, 255, 0.1);\n              color: #fff;\n            }\n            a {\n              color: #fff;\n              &:hover {\n                background: darken(@purple, 5%);\n                color: #fff;\n              }\n            }\n          }\n        }\n      }\n    }\n    //Logo\n\n    li.user-header {\n      background-color: @purple;\n    }\n  }\n\n  //Content Header\n  .content-header {\n    background: transparent;\n  }\n\n  //Create the sidebar skin\n  .skin-dark-sidebar(@purple);\n}\n\n.skin-purple-dark.layout-top-nav .main-header > .logo {\n  .logo-variant {\n    background-color: none;\n  }\n}\n\n\n\n.btn, .btn:hover {\n  color: #fff !important;\n\n  &.btn-primary, .btn-primary:link {\n    background-color: darken(@purple, 10%);\n    border-color: #FFF;\n    color: #fff;\n  }\n\n\n  &a.btn-primary:hover {\n    background-color: darken(@purple, 20%);\n    border-color: darken(@purple, 20%);\n    color: #fff;\n  }\n\n  &.btn-white:link {\n    background-color: darken(@purple, 10%);\n    color: #fff;\n  }\n\n  &.btn-white:hover {\n    background-color: darken(@purple, 30%);\n    color: #fff;\n  }\n}\n\n\n/**\nThe dropdown is white, so use a darker color\n */\nli.dropdown-item-marker {\n  color: var(--button-primary);\n}\n\na {\n  &:hover {\n    color: var(--hover-link);\n  }\n  &:visited {\n    color: var(--visited-link);\n  }\n}\n\n.text-primary {\n  color: #fff;\n}\n\n\n\n\n:root {\n  --background: #222;\n  --back-main: #333;\n  --back-sub: #080808;\n  --back-sub-alt: rgba(0, 0, 0, 0.36);\n  --button-default: darken(@purple, 15%);\n  --button-primary: darken(@purple, 25%);\n  --button-hover: darken(@purple, 30%);\n  --header: @purple; /* Use same as Header picker */\n  --text-main: #BBB;\n  --text-sub: #9b9b9b;\n  --link: #AC83FF; /* Use same as Header picker, lighten by 70% */\n  --visited-link: lighten(#AC83FF, 15%); /* Use same as Header picker, lighten by 70% */\n  --hover-link: lighten(#AC83FF, 30%); /* Use same as Header picker, lighten by 70% */\n  --nav-link: #FFF; /* Use same as Header picker */\n  --light-link: #fff; /* Use same as Header picker */\n}\n\n#ldapad_test_results.well.well-sm{\n  color: var(--back-main);\n}\n//pagination\n.pagination > li >a{\n  color: var(--light-link);\n  background-color: var(--back-main);\n}\n.pagination > .active > a {\n  background-color: var(--button-default);\n  border-color: var(--light-link);\n}\n.pagination > .active > a:hover{\n  background-color: var(--hover-link);\n}\n.tasks-menu > .dropdown-menu > li .menu{\n  background-color: var(--back-main);\n}\n\n.tasks-menu > .dropdown-menu > li .menu > li > a:hover .progress{\n  background-color: var(--background);\n}\nh2.task_menu{\n  color:var(--link);\n}\n.navbar-custom-menu > .navbar-nav > li > .dropdown-menu{\n  background-color:var(--back-main);\n  color:var(--link);\n}\n\n.main-header .navbar, .main-header .logo {\n  background-color: var(--header);\n  background: -webkit-linear-gradient(top,  var(--header) 0%,var(--header) 100%);\n  background: linear-gradient(to bottom, var(--header) 0%,var(--header) 100%);\n  border-color: var(--header);\n}\n\n.bootstrap-table .fixed-table-container .table thead th .sortable {\n  color: var(--nav-link);\n}\n.bootstrap-table .fixed-table-toolbar .columns label {\n  color:#000;\n}\n.thead, .navbar-nav>li>a:link {\n  color: var(--nav-link);\n}\n.label-default{\n  background-color:var(--back-sub);\n  color:#fff;\n}\n\n.modal-content {\n  background-color: var(--back-main);\n  color: var(--text-main);\n}\n\na:link {\n  color: var(--link);\n}\n.far fa-life-ring{\n  color:var(--link);\n}\n.btn-primary.hover {\n  color: var(--nav-link);\n}\n\n.small-box h3, .small-box p {\n  color: var(--nav-link) !important;\n  a:hover {\n    text-decoration: none;\n    color: var(--nav-link) !important;\n  }\n}\n\na:link.btn-default{\n  color: var(--nav-link);\n}\n#accessoriesTable>tbody>tr>td>nobr>a>i.fa {\n  color: var(--text-main);\n}\n#assetsListingTable>tbody>tr>td>nobr>a>i.fa {\n  color: var(--text-main);\n}\n\n#assetsListingTable>tbody>tr.selected>td {\n  background-color: var(--back-main);\n}\nbody {\n  color: var(--text-main);\n}\n.box, .box.box-default {\n  border-top: 3px solid var(--header);\n  border-top-color: var(--header);\n}\n.box-body, .box-footer, .box-header {\n  background-color: var(--back-sub);\n  color: var(--header);\n}\n.btn-default{\n  background-color: var(--button-default);\n  color: var(--nav-link);\n}\n\n.btn-default dropdown-toggle {\n  background-color: var(--button-default);\n  color: var(--nav-link);\n}\n\n.btn-default:active, .btn-default:focus, .btn-default:hover, .btn-default.active {\n  background-color: var(--button-hover);\n  color: var(--nav-link);\n}\n.btn-primary, .btn-primary.hover, .btn-primary:active, .text-purple {\n  color: var(--nav-link)!important;\n}\n.btn-primary:hover {\n  background-color: var(--button-primary);\n}\n#componentsTable>tbody>tr>td>nobr>a>i.fa {\n  color: var(--text-main);\n}\n#consumablesTable>tbody>tr>td>nobr>a>i.fa {\n  color: var(--text-main);\n}\n.content-wrapper {\n  background-color: var(--background);\n}\n#create-form>div>div>div>span>i.fa {\n  background-color: var(--back-sub);\n  color: var(--header);\n}\n.datepicker .datepicker-switch:hover, .datepicker .next:hover, .datepicker .prev:hover, .datepicker tfoot tr th:hover, .datepicker table tr td.day.focused, .datepicker table tr td.day:hover {\n  background-color: var(--header);\n}\n.datepicker.dropdown-menu {\n  background-color: var(--back-main);\n  color: var(--text-main);\n}\n#details>div>div>div>table {\n  background-color: transparent;\n}\n.dropdown-menu>li>a:hover {\n  background-color: var(--back-main);\n  color: var(--nav-link);\n}\n.fixed-table-body thead th .th-inner{\n  color: var(--nav-link);\n}\n.form-control {\n  background-color: var(--back-main);\n  color: var(--text-main);\n}\n.form-control[disabled], .form-control[readonly], fieldset[disabled] .form-control{\n  background-color: var(--back-main);\n  color: var(--text-main);\n}\nh1, h2, h3, h4, h5, h6, p {\n  color: var(--text-main);\n}\n.help-block {\n  color: var(--text-sub);\n}\ninput[type=text], input[type=search] {\n  background-color: var(--back-sub);\n  color: var(--text-main);\n}\n.input-group, .input-group-addon {\n  background-color: var(--back-sub)!important;\n  color: var(--text-main);\n}\n#licensesTable>tbody>tr>td>nobr>a>i.fa {\n  color: var(--text-main);\n}\n.main-footer {\n  background-color: var(--back-main);\n  color: var(--text-main);\n}\n.nav-tabs-custom>.nav-tabs>li>a, .nav-tabs-custom>.nav-tabs>li.active>a {\n  color: var(--text-main);\n}\n.nav-tabs-custom>.nav-tabs>li.active {\n  border-top-color: var(--header);\n}\n.nav-tabs-custom>.nav-tabs>li.active>a {\n  background-color: var(--back-main);\n}\n.nav-tabs-custom>.nav-tabs>li.active>a:hover {\n  background-color: var(--back-sub);\n  color: var(--text-main);\n}\n.nav-tabs-custom, .nav-tabs-custom>.tab-content {\n  background-color: var(--back-main);\n}\n.navbar-nav>.tasks-menu>.dropdown-menu>li.header {\n  background-color: var(--back-main);\n  color: var(--link);\n}\n.open>.dropdown-toggle.btn-default {\n  background-color: var(--back-sub);\n  color: var(--header);\n}\n.panel {\n  background-color: var(--back-sub);\n  color: var(--text-main);\n}\n.panel-default>.panel-heading {\n  background-color: var(--back-main);\n  color: var(--header);\n}\n.select2-container--default .select2-results__option[aria-selected=true], .select2-container--default .select2-results__option[aria-selected=true]:hover {\n  background-color: var(--back-sub);\n  color: var(--header);\n}\n.select2-container--default .select2-results__option--highlighted[aria-selected] {\n  background-color: var(--header);\n  color: var(--back-main);\n}\n.select2-container--default .select2-selection--single .select2-selection__rendered {\n  color: var(--text-main);\n}\n.select2-container--default .select2-selection--multiple .select2-selection__choice {\n  background-color: var(--header);\n}\n.select2-selection--single {\n  background-color: var(--back-sub)!important;\n  color: var(--text-main)!important;\n}\n.select2-dropdown {\n  background-color: var(--back-main);\n  color: var(--text-main);\n}\n.skin-purple-dark .main-header .navbar .dropdown-menu li a {\n  color: #FFFFFF;\n}\n.skin-purple-dark .main-header .navbar .dropdown-menu li a:hover {\n  background-color: #5f5ca8;\n}\n.fixed-table-body thead th .th-inner, .skin-purple-dark .sidebar-menu>li.active>a, .skin-purple .sidebar-menu>li:hover>a, .sidebar-toggle:hover {\n  background-color: var(--header)!important;\n}\n.tab-content, .tab-pane {\n  background-color: var(--back-main);\n  color: var(--text-main);\n}\n.table-striped>tbody>tr:nth-of-type(odd) {\n  background-color: var(--back-sub);\n}\n.table-striped>tbody>tr:nth-of-type(even){\n  background-color: var(--back-sub-alt);\n}\n#webui>div>div>div>div>div>table>tbody>tr>td>a>i.fa, .box-body, .box-footer, .box-header {\n  color: var(--text-main);\n}\n\n.box-header.with-border {\n  border-bottom: #000;\n}\n\na {\n  color: var(--link);\n\n  &:link {\n    color: var(--link)  }\n  &:hover {\n    color: var(--hover-link);\n    text-decoration: underline;\n  }\n  &:visited {\n    color: var(--visited-link)\n  }\n}\n\n.row-striped {\n  vertical-align: top;\n  line-height: 2.6;\n  padding: 0px;\n  margin-left: 20px;\n  box-sizing: border-box;\n  //border-left: 1px solid #dddddd;\n  //border-right: 1px solid #dddddd;\n  display: table;\n\n}\n\n.row-striped .row:nth-of-type(odd) div {\n  background-color: var(--back-sub);\n  color: var(--text-main);\n  border-top: 1px solid #dddddd;\n  display: table-cell;\n\n}\n\n.row-striped .row:nth-of-type(even) div {\n  background-color: var(--back-sub);\n  color: var(--text-main);\n  border-top: 1px solid #dddddd;\n  display: table-cell;\n}\n.row-new-striped > .row:nth-of-type(odd){\n  background-color: var(--back-sub);\n  color: var(--text-main);\n}\n.row-new-striped > .row:nth-of-type(even){\n  background-color: var(--back-sub-alt);\n  color: var(--text-main);\n}\n\n.search-highlight, .search-highlight:hover {\n  background-color: #e9d15b;\n}\n.table > tbody > tr.warning > td{\n  background-color:var(--back-sub);\n}","/*\n * Skin: Red\n * ----------\n */\n@import \"../bootstrap-less/mixins.less\";\n@import \"../bootstrap-less/variables.less\";\n@import \"../variables.less\";\n@import \"../mixins.less\";\n\n.skin-red {\n  //Navbar\n  .main-header {\n    .navbar {\n      .navbar-variant(@red; #fff);\n      .sidebar-toggle {\n        color: #fff;\n        &:hover {\n          background-color: darken(@red, 5%);\n        }\n      }\n      @media (max-width: @screen-header-collapse) {\n        .dropdown-menu {\n          li {\n            &.divider {\n              background-color: rgba(255, 255, 255, 0.1);\n            }\n            a {\n              color: #333;\n              &:hover {\n                background: darken(@red, 5%);\n              }\n            }\n          }\n        }\n      }\n    }\n    //Logo\n\n    li.user-header {\n      background-color: @red;\n    }\n  }\n\n  //Content Header\n  .content-header {\n    background: transparent;\n  }\n\n  //Create the sidebar skin\n  .skin-dark-sidebar(@red);\n}\n\n.skin-red.layout-top-nav .main-header > .logo {\n  .logo-variant {\n    background-color: none;\n  }\n}\n\n\n\n.btn, .btn:hover {\n\n\n  &.btn-primary, .btn-primary:link {\n    background-color: darken(@red, 10%);\n    border-color: darken(@red, 20%);\n    color: #fff;\n  }\n\n\n  &a.btn-primary:hover {\n    background-color: darken(@red, 20%);\n    border-color: darken(@red, 20%);\n    color: #fff;\n  }\n\n  &.btn-white:link {\n    background-color: darken(@red, 10%);\n    color: #fff;\n  }\n\n  &.btn-white:hover {\n    background-color: darken(@red, 30%);\n    color: #fff;\n  }\n}\n\n\na {\n  color: @red;\n  &:hover {\n    color: darken(@red, 20%);\n  }\n  &:visited {\n    color: @red;\n  }\n}\n\n.text-primary {\n  color: darken(@red, 20%);\n}\n\n:root {\n  --button-default: darken(@red, 15%);\n  --button-primary: darken(@red, 25%);\n  --button-hover: darken(@red, 30%);\n  --header: @red; /* Use same as Header picker */\n  --text-main: #BBB;\n  --text-alt: #222;\n  --text-sub: #9b9b9b;\n  --link: @red; /* Use same as Header picker, lighten by 70% */\n  --visited-link: lighten(@red, 15%); /* Use same as Header picker, lighten by 70% */\n  --hover-link: lighten(@red, 30%); /* Use same as Header picker, lighten by 70% */\n  --nav-link: #FFF; /* Use same as Header picker */\n  --light-link: #fff; /* Use same as Header picker */\n}\na:link {\n  color: var(--link);\n}\n\na:visited {\n  color: var(--visited-link);\n}\na.btn-info:link, a.btn-warning:link, a.btn-danger:link{\n  color: #FFF;\n}\n&a.btn-info:visited, a.btn-warning:visited, a.btn-danger:visited{\n  color: #FFF;\n}\n\n.fixed-table-container tbody .selected td {\n  background-color: #fff8af;\n}\n.select2-container--default .select2-selection--multiple .select2-selection__choice {\n  background-color: @red;\n}\n\n.search-highlight, .search-highlight:hover {\n  background-color: #e9d15b;\n}\n.far fa-life-ring{\n  color:var(--link);\n}","/*\n * Skin: red dark\n * ----------\n */\n@import \"../bootstrap-less/mixins.less\";\n@import \"../bootstrap-less/variables.less\";\n@import \"../variables.less\";\n@import \"../mixins.less\";\n\n.skin-red-dark {\n  //Navbar\n  .main-header {\n    .navbar {\n      .navbar-variant(@red; #fff);\n      .sidebar-toggle {\n        color: #fff;\n        &:hover {\n          background-color: darken(@red, 5%);\n        }\n      }\n      @media (max-width: @screen-header-collapse) {\n        .dropdown-menu {\n          li {\n            &.divider {\n              background-color: rgba(255, 255, 255, 0.1);\n              color: #fff;\n            }\n            a {\n              color: #fff;\n              &:hover {\n                background: darken(@red, 5%);\n                color: #fff;\n              }\n            }\n          }\n        }\n      }\n    }\n    //Logo\n\n    li.user-header {\n      background-color: @red;\n    }\n  }\n\n  //Content Header\n  .content-header {\n    background: transparent;\n  }\n\n  //Create the sidebar skin\n  .skin-dark-sidebar(@red);\n}\n\n.skin-red-dark.layout-top-nav .main-header > .logo {\n  .logo-variant {\n    background-color: none;\n  }\n}\n\n.btn, .btn:hover {\n  color: #fff;\n\n  &.btn-primary, .btn-primary:link {\n    background-color: darken(@red, 10%);\n    border-color: #FFF;\n    color: #fff;\n  }\n\n\n  &a.btn-primary:hover {\n    background-color: darken(@red, 20%);\n    border-color: darken(@red, 20%);\n    color: #fff;\n  }\n\n  &.btn-white:link {\n    background-color: darken(@red, 10%);\n    color: #fff;\n  }\n\n  &.btn-white:hover {\n    background-color: darken(@red, 30%);\n    color: #fff;\n  }\n}\n\n\n/**\nThe dropdown is white, so use a darker color\n */\nli.dropdown-item-marker {\n  color: var(--button-primary);\n}\n\n\na {\n  &:hover {\n    color: #fff;\n  }\n  &:visited {\n    color: #fff;\n  }\n}\n\n.text-primary {\n  color: #fff;\n}\n\n\n\n\n:root {\n  --background: #222;\n  --back-main: #333;\n  --back-sub: #3d4144;\n  --back-sub-alt: rgba(0, 0, 0, 0.36);\n  --button-default: darken(@red, 15%);\n  --button-primary: darken(@red, 25%);\n  --button-hover: darken(@red, 30%);\n  --header: @red; /* Use same as Header picker */\n  --text-main: #BBB;\n  --text-alt: #222;\n  --text-sub: #9b9b9b;\n  --link: #e00000; /* Use same as Header picker, lighten by 70% */\n  --visited-link: #D24D57; /* Use same as Header picker, lighten by 70% */\n  --hover-link: #D24D57; /* Use same as Header picker, lighten by 70% */\n  --nav-link: #FFF; /* Use same as Header picker */\n  --light-link: #fff; /* Use same as Header picker */\n}\n\n#ldapad_test_results.well.well-sm{\n  color: var(--back-main);\n}\n\n//pagination\n.pagination > li >a{\n  color: var(--light-link);\n  background-color: var(--back-main);\n}\n.pagination > .active > a {\n  background-color: var(--visited-link);\n  border-color: var(--light-link);\n}\n.pagination > .active > a:hover{\n  background-color: var(--hover-link);\n}\n.tasks-menu > .dropdown-menu > li .menu{\n  background-color: var(--back-main);\n}\n\n.tasks-menu > .dropdown-menu > li .menu > li > a:hover .progress{\n  background-color: var(--background);\n}\nh2.task_menu{\n  color:var(--link);\n}\n.navbar-custom-menu > .navbar-nav > li > .dropdown-menu{\n  background-color:var(--back-main);\n  color:var(--link);\n}\n.main-header .navbar, .main-header .logo {\n  background-color: var(--header);\n  background: -webkit-linear-gradient(top,  var(--header) 0%,var(--header) 100%);\n  background: linear-gradient(to bottom, var(--header) 0%,var(--header) 100%);\n  border-color: var(--header);\n}\n\n.bootstrap-table .fixed-table-container .table thead th .sortable {\n  color: var(--nav-link);\n}\n.bootstrap-table .fixed-table-toolbar .columns label {\n  color:#000;\n}\n\n.thead, .navbar-nav>li>a:link {\n  color: var(--nav-link);\n}\n\n.modal-content {\n  background-color: var(--back-main);\n  color: var(--text-main);\n}\n\na:link {\n  color: var(--link);\n}\na:hover {\n  color: var(--hover-link);\n}\na:visited {\n  color: var(--nav-link);\n}\n.far fa-life-ring{\n  color:var(--link);\n}\n\n.btn-primary.hover {\n  color: var(--nav-link);\n}\n\n.small-box h3, .small-box p {\n  color: var(--nav-link) !important;\n  a:hover {\n    text-decoration: none;\n    color: var(--nav-link) !important;\n  }\n}\n\n\n#accessoriesTable>tbody>tr>td>nobr>a>i.fa {\n  color: var(--text-main);\n}\n#assetsListingTable>tbody>tr>td>nobr>a>i.fa {\n  color: var(--text-main);\n}\n\n#assetsListingTable>tbody>tr.selected>td {\n  background-color: var(--back-main);\n}\nbody {\n  color: var(--text-main);\n}\n.box, .box.box-default {\n  border-top: 3px solid var(--header);\n  border-top-color: var(--header);\n}\n.box-body, .box-footer, .box-header {\n  background-color: var(--back-sub);\n  color: var(--header);\n}\n.btn-default{\n  background-color: var(--back-sub);\n}\n\n.btn-default dropdown-toggle {\n  background-color: var(--button-default);\n  color: var(--link);\n}\n\n.btn-default:active, .btn-default:focus, .btn-default:hover, .btn-default.active {\n  background-color: var(--button-hover);\n  color: var(--link);\n}\n.btn-primary, .btn-primary.hover, .btn-primary:active, .text-red {\n  color: var(--button-primary);\n}\n.btn-primary:hover {\n  background-color: var(--button-primary);\n}\n#componentsTable>tbody>tr>td>nobr>a>i.fa {\n  color: var(--text-main);\n}\n#consumablesTable>tbody>tr>td>nobr>a>i.fa {\n  color: var(--text-main);\n}\n.content-wrapper {\n  background-color: var(--background);\n}\n#create-form>div>div>div>span>i.fa {\n  background-color: var(--back-sub);\n  color: var(--header);\n}\n.datepicker .datepicker-switch:hover, .datepicker .next:hover, .datepicker .prev:hover, .datepicker tfoot tr th:hover, .datepicker table tr td.day.focused, .datepicker table tr td.day:hover {\n  background-color: var(--header);\n}\n.datepicker.dropdown-menu {\n  background-color: var(--back-main);\n  color: var(--text-main);\n}\n#details>div>div>div>table {\n  background-color: transparent;\n}\n.dropdown-menu>li>a:hover {\n  background-color: var(--back-main);\n  color: var(--nav-link);\n}\n.fixed-table-body thead th .th-inner{\n  color: var(--nav-link);\n}\n.form-control {\n  background-color: var(--back-main);\n  color: var(--text-main);\n}\n.form-control[disabled], .form-control[readonly], fieldset[disabled] .form-control{\n  background-color: var(--back-main);\n  color: var(--text-main);\n}\nh1, h2, h3, h4, h5, h6, p {\n  color: var(--text-main);\n}\n.help-block {\n  color: var(--text-sub);\n}\ninput[type=text], input[type=search] {\n  background-color: var(--back-sub);\n  color: var(--text-main);\n}\n.input-group, .input-group-addon {\n  background-color: var(--back-sub)!important;\n  color: var(--text-main);\n}\n#licensesTable>tbody>tr>td>nobr>a>i.fa {\n  color: var(--text-main);\n}\n.main-footer {\n  background-color: var(--back-main);\n  color: var(--text-main);\n}\n.nav-tabs-custom>.nav-tabs>li>a, .nav-tabs-custom>.nav-tabs>li.active>a {\n  color: var(--text-main);\n}\n.nav-tabs-custom>.nav-tabs>li.active {\n  border-top-color: var(--header);\n}\n.nav-tabs-custom>.nav-tabs>li.active>a {\n  background-color: var(--back-main);\n}\n.nav-tabs-custom>.nav-tabs>li.active>a:hover {\n  background-color: var(--back-sub);\n  color: var(--text-main);\n}\n.nav-tabs-custom, .nav-tabs-custom>.tab-content {\n  background-color: var(--back-main);\n}\n.navbar-nav>.tasks-menu>.dropdown-menu>li.header {\n  background-color: var(--back-main);\n  color: var(--header);\n}\n.open>.dropdown-toggle.btn-default {\n  background-color: var(--back-sub);\n  color: var(--header);\n}\n.panel {\n  background-color: var(--back-sub);\n  color: var(--text-main);\n}\n.panel-default>.panel-heading {\n  background-color: var(--back-main);\n  color: var(--header);\n}\n.select2-container--default .select2-results__option[aria-selected=true], .select2-container--default .select2-results__option[aria-selected=true]:hover {\n  background-color: var(--back-sub);\n  color: var(--header);\n}\n.select2-container--default .select2-results__option--highlighted[aria-selected] {\n  background-color: var(--header);\n  color: var(--back-main);\n}\n.select2-container--default .select2-selection--single .select2-selection__rendered {\n  color: var(--text-main);\n}\n.select2-container--default .select2-selection--multiple .select2-selection__choice {\n  background-color: var(--header);\n}\n.select2-selection--single {\n  background-color: var(--back-sub)!important;\n  color: var(--text-main)!important;\n}\n.select2-dropdown {\n  background-color: var(--back-main);\n  color: var(--text-main);\n}\n.skin-red-dark .main-header .navbar .dropdown-menu li a {\n  color: #FFFFFF;\n}\n.skin-red-dark .main-header .navbar .dropdown-menu li a:hover {\n  background-color: #c23320;\n}\n.fixed-table-body thead th .th-inner, .skin-red-dark .sidebar-menu>li.active>a, .skin-red .sidebar-menu>li:hover>a, .sidebar-toggle:hover {\n  background-color: var(--header)!important;\n}\n.tab-content, .tab-pane {\n  background-color: var(--back-main);\n  color: var(--text-main);\n}\n.table-striped>tbody>tr:nth-of-type(odd) {\n  background-color: var(--back-sub);\n}\n.table-striped>tbody>tr:nth-of-type(even){\n  background-color: var(--back-sub-alt);\n}\n#webui>div>div>div>div>div>table>tbody>tr>td>a>i.fa, .box-body, .box-footer, .box-header {\n  color: var(--text-main);\n}\n\n.box-header.with-border {\n  border-bottom: #000;\n}\n#upload-table tbody > tr.warning > td,#upload-table h3,#upload-table p{\n  background-color:#fcf8e3;\n  color:#000;\n}\n\na {\n  color: var(--link);\n\n  &:link {\n    color: var(--nav-link);\n  }\n  &:hover {\n    color: var(--nav-link);\n    text-decoration: underline;\n  }\n  &:visited {\n    color: var(--nav-link);\n  }\n}\n#customFieldsTable a[href*='/models'] {\n  color: var(--back-sub);\n}\n#customFieldsTable a[href*='/fieldsets']{\n  background-color: transparent;\n}\n.row-striped {\n  vertical-align: top;\n  line-height: 2.6;\n  padding: 0px;\n  margin-left: 20px;\n  box-sizing: border-box;\n  //border-left: 1px solid #dddddd;\n  //border-right: 1px solid #dddddd;\n  display: table;\n\n}\n\n.row-striped .row:nth-of-type(odd) div {\n  background-color: var(--back-sub);\n  color: var(--text-main);\n  border-top: 1px solid #dddddd;\n  display: table-cell;\n\n}\n\n.row-striped .row:nth-of-type(even) div {\n  background-color: var(--back-sub);\n  color: var(--text-main);\n  border-top: 1px solid #dddddd;\n  display: table-cell;\n}\n\n.row-new-striped > .row:nth-of-type(odd){\n  background-color: var(--back-sub);\n  color: var(--text-main);\n}\n.row-new-striped > .row:nth-of-type(even){\n  background-color: var(--back-sub-alt);\n  color: var(--text-main);\n}\n\n.search-highlight, .search-highlight:hover {\n  background-color: #e9d15b;\n}\n.table > tbody > tr.warning > td{\n  background-color:var(--back-sub);\n}","/*\n * Skin: Orange\n * ----------\n */\n@import \"../bootstrap-less/mixins.less\";\n@import \"../bootstrap-less/variables.less\";\n@import \"../variables.less\";\n@import \"../mixins.less\";\n\n.skin-orange {\n  //Navbar\n  .main-header {\n    .navbar {\n      .navbar-variant(@orange; #fff);\n      .sidebar-toggle {\n        color: #fff;\n        &:hover {\n          background-color: darken(@orange, 5%);\n        }\n      }\n      @media (max-width: @screen-header-collapse) {\n        .dropdown-menu {\n          li {\n            &.divider {\n              background-color: rgba(255, 255, 255, 0.1);\n            }\n            a {\n              color: #333;\n              &:hover {\n                background: darken(@orange, 5%);\n              }\n            }\n          }\n        }\n      }\n    }\n    //Logo\n\n    li.user-header {\n      background-color: @orange;\n    }\n  }\n\n  //Content Header\n  .content-header {\n    background: transparent;\n  }\n\n  //Create the sidebar skin\n  .skin-dark-sidebar(@orange);\n}\n\n.skin-orange.layout-top-nav .main-header > .logo {\n  .logo-variant {\n    background-color: none;\n  }\n}\n\n\n\n.btn, .btn:hover {\n\n\n  &.btn-primary, .btn-primary:link {\n    background-color: darken(@orange, 10%);\n    border-color: darken(@orange, 20%);\n    color: #fff;\n  }\n\n\n  &a.btn-primary:hover {\n    background-color: darken(@orange, 20%);\n    border-color: darken(@orange, 20%);\n    color: #fff;\n  }\n\n  &.btn-white:link {\n    background-color: darken(@orange, 10%);\n    color: #fff;\n  }\n\n  &.btn-white:hover {\n    background-color: darken(@orange, 30%);\n    color: #fff;\n  }\n}\n\n\na {\n  color: var(--link);\n  &:hover {\n    color: var(--hover-link);\n  }\n  &:visited {\n    color: var(--visited-link);\n  }\n}\n\n.text-primary {\n  color: darken(@orange, 20%);\n}\n:root {\n  --button-default: darken(@orange, 15%);\n  --button-primary: darken(@orange, 25%);\n  --button-hover: darken(@orange, 30%);\n  --header: @orange; /* Use same as Header picker */\n  --text-main: #BBB;\n  --text-sub: #9b9b9b;\n  --link: @orange; /* Use same as Header picker, lighten by 70% */\n  --visited-link: lighten(@orange, 10%); /* Use same as Header picker, lighten by 70% */\n  --hover-link: lighten(@orange, 15%); /* Use same as Header picker, lighten by 70% */\n  --nav-link: #FFF; /* Use same as Header picker */\n  --light-link: #fff; /* Use same as Header picker */\n}\n\na.btn-info:link, a.btn-warning:link, a.btn-danger:link{\n  color: #FFF;\n}\n&a.btn-info:visited, a.btn-warning:visited, a.btn-danger:visited{\n  color: #FFF;\n}\n.far fa-life-ring{\n  color:var(--link);\n}\n\n.fixed-table-container tbody .selected td {\n  background-color: #fff8af;\n}\n.select2-container--default .select2-selection--multiple .select2-selection__choice {\n  background-color: @orange;\n}\n\n.search-highlight, .search-highlight:hover {\n  background-color: #e9d15b;\n}","/*\n * Skin: Yellow\n * ----------\n */\n@import \"../bootstrap-less/mixins.less\";\n@import \"../bootstrap-less/variables.less\";\n@import \"../variables.less\";\n@import \"../mixins.less\";\n\n.skin-yellow {\n  //Navbar\n  .main-header {\n    .navbar {\n      .navbar-variant(#FBCC34);\n      .sidebar-toggle {\n        color: #000;\n        &:hover {\n          background-color: darken(#FBCC34, 5%);\n        }\n      }\n      @media (max-width: @screen-header-collapse) {\n        .dropdown-menu {\n          li {\n            &.divider {\n              background-color: rgba(255, 255, 255, 0.1);\n            }\n            a {\n              color: #333;\n              &:hover {\n                background: darken(#FBCC34, 5%);\n              }\n            }\n          }\n        }\n      }\n    }\n    //Logo\n\n    li.user-header {\n      background-color: #FBCC34;\n    }\n  }\n\n  //Content Header\n  .content-header {\n    background: transparent;\n  }\n\n  //Create the sidebar skin\n  .skin-dark-sidebar(#FBCC34);\n}\n\n.skin-yellow.layout-top-nav .main-header > .logo {\n  .logo-variant {\n    color: #413F42;\n    background-color: none;\n  }\n}\n\n\n\n.btn, .btn:hover {\n\n\n  &.btn-primary, .btn-primary:link {\n    background-color: darken(#FBCC34, 10%);\n    border-color: darken(#FBCC34, 20%);\n    color: var(--nav-link);\n  }\n\n\n  &a.btn-primary:hover {\n    background-color: darken(#FBCC34, 20%);\n    border-color: darken(#FBCC34, 20%);\n    color: var(--nav-link);\n  }\n\n  &.btn-white:link {\n    background-color: darken(#FBCC34, 10%);\n    color: var(--nav-link);\n  }\n\n  &.btn-white:hover {\n    background-color: darken(#FBCC34, 30%);\n    color: var(--nav-link);\n  }\n}\na.btn-info:link, a.btn-warning:link, a.btn-danger:link{\n  color: #FFF;\n}\n&a.btn-info:visited, a.btn-warning:visited, a.btn-danger:visited{\n  color: #FFF;\n}\n\na {\n  color: var(--link);\n  &:hover {\n    color: var(--hover-link);\n  }\n  &:visited {\n    color: var(--visited-link);\n  }\n}\n\n.text-primary {\n  color: darken(#FBCC34, 20%);\n}\n\n:root {\n  --button-default: darken(#FBCC34, 15%);\n  --button-primary: darken(#FBCC34, 25%);\n  --button-hover: darken(#FBCC34, 30%);\n  --header: #FBCC34; /* Use same as Header picker */\n  --text-main: #BBB;\n  --text-sub: #9b9b9b;\n  --link: lighten( #413F42, 10%); /* Use same as Header picker, lighten by 70% */\n  --visited-link: lighten(#413F42, 20%); /* Use same as Header picker, lighten by 70% */\n  --hover-link: lighten(#413F42, 45%); /* Use same as Header picker, lighten by 70% */\n  --nav-link: #222; /* Use same as Header picker */\n  --light-link: #fff; /* Use same as Header picker */\n}\n\n.fixed-table-container tbody .selected td {\n  background-color: #fff8af;\n}\n.select2-container--default .select2-selection--multiple .select2-selection__choice {\n  background-color: #FBCC34;\n}\n\n.search-highlight, .search-highlight:hover {\n  background-color: #e9d15b;\n}\n.thead, .navbar-nav>li>a:link {\n  color: var(--nav-link);\n}\n.navbar-nav>li>a:visited {\n  color: var(--nav-link);\n}\n&:hover{\n  color: var(--nav-link);\n}\n.skin-yellow .main-header .navbar .nav > li > a {\n  color: #413F42;\n}\n.far fa-life-ring{\n  color:var(--link);\n}","/*\n * Skin: yellow dark\n * ----------\n */\n@import \"../bootstrap-less/mixins.less\";\n@import \"../bootstrap-less/variables.less\";\n@import \"../variables.less\";\n@import \"../mixins.less\";\n\n.skin-yellow-dark {\n  //Navbar\n  .main-header {\n    .navbar {\n      .sidebar-toggle {\n        color: #000 !important;\n        &:hover {\n          background-color: var(--link);\n        }\n      }\n      @media (max-width: @screen-header-collapse) {\n        .dropdown-menu {\n          li {\n            &.divider {\n              background-color: rgba(255, 255, 255, 0.1);\n              color: #fff;\n            }\n            a {\n              color: #fff;\n              &:hover {\n                background: darken(@yellow, 5%);\n                color: #fff;\n              }\n            }\n          }\n        }\n      }\n    }\n    //Logo\n\n    li.user-header {\n      background-color: @yellow;\n    }\n  }\n\n  //Content Header\n  .content-header {\n    background: transparent;\n  }\n\n  //Create the sidebar skin\n  .skin-dark-sidebar(@yellow);\n}\n\n.btn, .btn:hover {\n\n  &.btn-primary, .btn-primary:link {\n    background-color: var(--button-default);\n    border-color: #000000;\n    color: #545454;\n  }\n\n  &a.btn-primary:hover {\n    background-color: var(--button-hover);\n    border-color: var(--button-hover);\n    color: #545454;\n  }\n\n  &.btn-white:link {\n    background-color: var(--button-default);\n    color: #545454;\n  }\n\n  &.btn-white:hover {\n    background-color: var(--hover-link);\n    color: #545454;\n  }\n}\na.actions {\n  color:#fff !important;\n}\na:visited.label-default, a:link.label-default{\n  color:#444;\n}\n/**\nThe dropdown is white, so use a darker color\n */\nli.dropdown-item-marker {\n  color: var(--button-primary);\n}\n\na {\n  &:link {\n    color: var(--link);\n  }\n  &:hover {\n    color: var(--hover-link);\n  }\n  &:visited {\n    color: var(--visited-link);\n  }\n}\n\n.text-primary {\n  color: #fff;\n}\n\n\n\n\n:root {\n  --background: #222;\n  --back-main: #333;\n  --back-sub: #3d4144;\n  --back-sub-alt: rgba(0, 0, 0, 0.36);\n  --button-default: #FFCC32;\n  --button-primary: darken(#FFCC32, 25%);\n  --button-hover: darken(#FFCC32, 30%);\n  --header: #FFCC32; /* Use same as Header picker */\n  --text-main: #BBB;\n  --text-sub: #9b9b9b;\n  --link: #F0E68C; /* Use same as Header picker, lighten by 70% */\n  --visited-link: lighten(#F0E68C, 15%); /* Use same as Header picker, lighten by 70% */\n  --hover-link: lighten(#F0E68C, 45%); /* Use same as Header picker, lighten by 70% */\n  --nav-link: #222; /* Use same as Header picker */\n  --light-link: #545454; /* Use same as Header picker */\n}\n\n#ldapad_test_results.well.well-sm{\n  color: var(--back-main);\n}\n//pagination\n.pagination > li >a{\n  color: var(--text-main);\n  background-color: var(--back-main);\n}\n.pagination > .active > a {\n  background-color: var(--button-default);\n  border-color: var(--light-link);\n  color:var(--nav-link);\n}\n.pagination > .active > a:hover{\n  background-color: var(--hover-link);\n}\n.tasks-menu > .dropdown-menu > li .menu{\n  background-color: var(--back-main);\n}\n\n.tasks-menu > .dropdown-menu > li .menu > li > a:hover .progress{\n  background-color: var(--background);\n}\nh2.task_menu{\n  color:var(--link);\n}\n.navbar-custom-menu > .navbar-nav > li > .dropdown-menu{\n  background-color:var(--back-main);\n  color:var(--link);\n}\n.main-header .navbar, .main-header .logo {\n  background-color: var(--header);\n  background: -webkit-linear-gradient(top,  var(--header) 0%,var(--header) 100%);\n  background: linear-gradient(to bottom, var(--header) 0%,var(--header) 100%);\n  border-color: var(--header);\n}\na.btn.btn-default{\n  color:var(--nav-link);\n}\n.bootstrap-table .fixed-table-container .table thead th .sortable {\n  color: var(--text-main);\n}\n.bootstrap-table .fixed-table-toolbar .columns label {\n  color:#000;\n}\n.thead, .navbar-nav>li>a:link {\n  color: var(--nav-link);\n}\n.navbar-nav>li>a:visited {\n  color: var(--nav-link);\n}\n\n.modal-content {\n  background-color: var(--back-main);\n  color: var(--text-main);\n}\n\na:link.btn-default{\n  color: var(--nav-link);\n}\n.btn-primary.hover {\n  color: var(--nav-link);\n}\n\n.small-box h3, .small-box p {\n  color: #fff !important;\n  a:hover {\n    text-decoration: none;\n    color: var(--nav-link) !important;\n  }\n}\n.far fa-life-ring{\n  color:var(--link);\n}\n\n#accessoriesTable>tbody>tr>td>nobr>a>i.fa {\n  color: var(--text-main);\n}\n#assetsListingTable>tbody>tr>td>nobr>a>i.fa {\n  color: var(--text-main);\n}\n\n#assetsListingTable>tbody>tr.selected>td {\n  background-color: var(--back-main);\n}\nbody {\n  color: var(--text-main);\n}\n.box, .box.box-default {\n  border-top: 3px solid var(--header);\n  border-top-color: var(--header);\n}\n.box-body, .box-footer, .box-header {\n  background-color: var(--back-sub);\n  color: var(--header);\n}\n.btn-default{\n  background-color: var(--button-default);\n\n}\n\n.btn-default dropdown-toggle {\n  background-color: var(--button-default);\n  color: var(--nav-link);\n}\n\n.btn-default:active, .btn-default:focus, .btn-default:hover, .btn-default.active {\n  background-color: var(--button-hover);\n  color: var(--nav-link);\n}\n.btn-primary, .btn-primary.hover, .btn-primary:active, .text-yellow {\n  color: var(--nav-link)!important;\n}\n.btn-primary:hover {\n  background-color: var(--button-primary);\n  color: var(--nav-link)!important;\n}\n#componentsTable>tbody>tr>td>nobr>a>i.fa {\n  color: var(--text-main);\n}\n#consumablesTable>tbody>tr>td>nobr>a>i.fa {\n  color: var(--text-main);\n}\n.content-wrapper {\n  background-color: var(--background);\n}\n#create-form>div>div>div>span>i.fa {\n  background-color: var(--back-sub);\n  color: var(--header);\n}\n.datepicker .datepicker-switch:hover, .datepicker .next:hover, .datepicker .prev:hover, .datepicker tfoot tr th:hover, .datepicker table tr td.day.focused, .datepicker table tr td.day:hover {\n  background-color: var(--header);\n}\n.datepicker.dropdown-menu {\n  background-color: var(--back-main);\n  color: var(--text-main);\n}\n#details>div>div>div>table {\n  background-color: transparent;\n}\n.dropdown-menu>li>a:hover {\n  background-color: var(--back-main);\n  color: var(--nav-link);\n}\n.form-control {\n  background-color: var(--back-main);\n  color: var(--text-main);\n}\n.form-control[disabled], .form-control[readonly], fieldset[disabled] .form-control{\n  background-color: var(--back-main);\n  color: var(--text-main);\n}\nh1, h2, h3, h4, h5, h6, p {\n  color: var(--text-main);\n}\n.help-block {\n  color: var(--text-sub);\n}\ninput[type=text], input[type=search] {\n  background-color: var(--back-sub);\n  color: var(--text-main);\n}\n.input-group, .input-group-addon {\n  background-color: var(--back-sub)!important;\n  color: var(--text-main);\n}\n#licensesTable>tbody>tr>td>nobr>a>i.fa {\n  color: var(--text-main);\n}\n.main-footer {\n  background-color: var(--back-main);\n  color: var(--text-main);\n}\n.nav-tabs-custom>.nav-tabs>li>a, .nav-tabs-custom>.nav-tabs>li.active>a {\n  color: var(--text-main);\n}\n.nav-tabs-custom>.nav-tabs>li.active {\n  border-top-color: var(--header);\n}\n.nav-tabs-custom>.nav-tabs>li.active>a {\n  background-color: var(--back-main);\n}\n.nav-tabs-custom>.nav-tabs>li.active>a:hover {\n  background-color: var(--back-sub);\n  color: var(--text-main);\n}\n.nav-tabs-custom, .nav-tabs-custom>.tab-content {\n  background-color: var(--back-main);\n}\n.navbar-nav>.tasks-menu>.dropdown-menu>li.header {\n  background-color: var(--back-main);\n  color: var(--header);\n}\n.open>.dropdown-toggle.btn-default {\n  background-color: var(--back-sub);\n  color: var(--header);\n}\n.panel {\n  background-color: var(--back-sub);\n  color: var(--text-main);\n}\n.panel-default>.panel-heading {\n  background-color: var(--back-main);\n  color: var(--header);\n}\n.select2-container--default .select2-results__option[aria-selected=true], .select2-container--default .select2-results__option[aria-selected=true]:hover {\n  background-color: var(--back-sub);\n  color: var(--header);\n}\n.select2-container--default .select2-results__option--highlighted[aria-selected] {\n  background-color: var(--header);\n  color: var(--back-main);\n}\n.select2-container--default .select2-selection--single .select2-selection__rendered {\n  color: var(--text-main);\n}\n.select2-container--default .select2-selection--multiple .select2-selection__choice {\n  background-color: var(--header);\n}\n.select2-selection--single {\n  background-color: var(--back-sub)!important;\n  color: var(--text-main)!important;\n}\n.select2-dropdown {\n  background-color: var(--back-main);\n  color: var(--text-main);\n}\n.skin-yellow-dark .main-header .navbar .dropdown-menu li a {\n  color: var(--header);\n}\n.skin-yellow-dark .main-header .navbar .dropdown-menu li a:hover {\n  background-color: #000000;\n}\ntr th div.th-inner {\n  color: #FFFFFF;\n}\n.tab-content, .tab-pane {\n  background-color: var(--back-main);\n  color: var(--text-main);\n}\n.table-striped>tbody>tr:nth-of-type(odd) {\n  background-color: var(--back-sub);\n}\n.table-striped>tbody>tr:nth-of-type(even){\n  background-color: var(--back-sub-alt);\n}\n.th-inner{\n  color: var(--nav-link);\n}\n#webui>div>div>div>div>div>table>tbody>tr>td>a>i.fa, .box-body, .box-footer, .box-header {\n  color: var(--text-main);\n}\n\n.box-header.with-border {\n  border-bottom: #000;\n}\n\n.row-striped {\n  vertical-align: top;\n  line-height: 2.6;\n  padding: 0px;\n  margin-left: 20px;\n  box-sizing: border-box;\n  //border-left: 1px solid #dddddd;\n  //border-right: 1px solid #dddddd;\n  display: table;\n}\n\n.row-striped .row:nth-of-type(odd) div {\n  background-color: var(--back-sub);\n  color: var(--text-main);\n  border-top: 1px solid #dddddd;\n  display: table-cell;\n}\n\n.row-striped .row:nth-of-type(even) div {\n  background-color: var(--back-sub);\n  color: var(--text-main);\n  border-top: 1px solid #dddddd;\n  display: table-cell;\n}\n\n.row-new-striped > .row:nth-of-type(odd){\n  background-color: var(--back-sub);\n  color: var(--text-main);\n}\n.row-new-striped > .row:nth-of-type(even){\n  background-color: var(--back-sub-alt);\n  color: var(--text-main);\n}\n\n.search-highlight, .search-highlight:hover {\n  background-color: #e9d15b;\n}\n.table > tbody > tr.warning > td{\n  background-color:var(--back-sub);\n}"],"names":[],"sourceRoot":""}
\ No newline at end of file
diff --git a/public/css/dist/skins/_all-skins.min.css b/public/css/dist/skins/_all-skins.min.css
new file mode 100644
index 0000000000..6e7722f34b
--- /dev/null
+++ b/public/css/dist/skins/_all-skins.min.css
@@ -0,0 +1,5473 @@
+/*
+ * Skin: Black
+ * ----------
+ */
+.skin-black .main-header .navbar {
+  background-color: #111;
+}
+.skin-black .main-header .navbar .nav > li > a {
+  color: #fff;
+}
+.skin-black .main-header .navbar .nav > li > a:hover,
+.skin-black .main-header .navbar .nav > li > a:active,
+.skin-black .main-header .navbar .nav > li > a:focus,
+.skin-black .main-header .navbar .nav .open > a,
+.skin-black .main-header .navbar .nav .open > a:hover,
+.skin-black .main-header .navbar .nav .open > a:focus,
+.skin-black .main-header .navbar .nav > .active > a {
+  background: rgba(0, 0, 0, 0.1);
+  color: #f6f6f6;
+}
+.skin-black .main-header .navbar .sidebar-toggle {
+  color: #fff;
+}
+.skin-black .main-header .navbar .sidebar-toggle:hover {
+  color: #f6f6f6;
+  background: rgba(0, 0, 0, 0.1);
+}
+.skin-black .main-header .navbar .sidebar-toggle {
+  color: #fff;
+}
+.skin-black .main-header .navbar .sidebar-toggle:hover {
+  background-color: #040404;
+}
+@media (max-width: 767px) {
+  .skin-black .main-header .navbar .dropdown-menu li.divider {
+    background-color: rgba(255, 255, 255, 0.1);
+  }
+  .skin-black .main-header .navbar .dropdown-menu li a {
+    color: #333;
+  }
+  .skin-black .main-header .navbar .dropdown-menu li a:hover {
+    background: #040404;
+  }
+}
+.skin-black .main-header li.user-header {
+  background-color: #111;
+}
+.skin-black .content-header {
+  background: transparent;
+}
+.skin-black .wrapper,
+.skin-black .main-sidebar,
+.skin-black .left-side {
+  background-color: #222d32;
+}
+.skin-black .user-panel > .info,
+.skin-black .user-panel > .info > a {
+  color: #fff;
+}
+.skin-black .sidebar-menu > li.header {
+  color: #4b646f;
+  background: #1a2226;
+}
+.skin-black .sidebar-menu > li > a {
+  border-left: 3px solid transparent;
+}
+.skin-black .sidebar-menu > li:hover > a,
+.skin-black .sidebar-menu > li.active > a {
+  color: #fff;
+  background: #1e282c;
+  border-left-color: #111;
+}
+.skin-black .sidebar-menu > li > .treeview-menu {
+  margin: 0 1px;
+  background: #2c3b41;
+}
+.skin-black .sidebar a {
+  color: #b8c7ce;
+}
+.skin-black .sidebar a:hover {
+  text-decoration: none;
+}
+.skin-black .treeview-menu > li > a {
+  color: #8aa4af;
+}
+.skin-black .treeview-menu > li.active > a,
+.skin-black .treeview-menu > li > a:hover {
+  color: #fff;
+}
+.skin-black .sidebar-form {
+  border-radius: 3px;
+  border: 1px solid #374850;
+  margin: 10px 10px;
+}
+.skin-black .sidebar-form input[type="text"],
+.skin-black .sidebar-form .btn {
+  box-shadow: none;
+  background-color: #374850;
+  border: 1px solid transparent;
+  height: 35px;
+  transition: all 0.3s ease-in-out;
+}
+.skin-black .sidebar-form input[type="text"] {
+  color: #666;
+  border-top-left-radius: 2px;
+  border-top-right-radius: 0;
+  border-bottom-right-radius: 0;
+  border-bottom-left-radius: 2px;
+}
+.skin-black .sidebar-form input[type="text"]:focus,
+.skin-black .sidebar-form input[type="text"]:focus + .input-group-btn .btn {
+  background-color: #fff;
+  color: #666;
+}
+.skin-black .sidebar-form input[type="text"]:focus + .input-group-btn .btn {
+  border-left-color: #fff;
+}
+.skin-black .sidebar-form .btn {
+  color: #999;
+  border-top-left-radius: 0;
+  border-top-right-radius: 2px;
+  border-bottom-right-radius: 2px;
+  border-bottom-left-radius: 0;
+}
+.skin-black.layout-top-nav .main-header > .logo .logo-variant {
+  background-color: none;
+}
+.btn,
+.btn:hover {
+  color: #000;
+}
+.btn.btn-primary,
+.btn:hover.btn-primary,
+.btn .btn-primary:link,
+.btn:hover .btn-primary:link {
+  background-color: #505156;
+  border-color: #FFF;
+  color: #FFF;
+}
+.btna.btn-primary:hover,
+.btn:hovera.btn-primary:hover {
+  background-color: #111;
+  border-color: #1f1f21;
+  color: #fff;
+}
+.btn.btn-white:link,
+.btn:hover.btn-white:link {
+  color: #fff;
+}
+.btn.btn-white:hover,
+.btn:hover.btn-white:hover {
+  color: #fff;
+}
+.btn.btn-white:visited,
+.btn:hover.btn-white:visited {
+  color: #fff;
+}
+a {
+  color: var(--link);
+}
+a:hover {
+  color: var(--hover-link);
+}
+a:visited {
+  color: var(--visited-link);
+}
+.text-primary {
+  color: #000000;
+}
+:root {
+  --button-default: #000000;
+  --button-primary: #000000;
+  --button-hover: #000000;
+  --header: #111;
+  /* Use same as Header picker */
+  --text-main: #BBB;
+  --text-sub: #9b9b9b;
+  --link: #black;
+  /* Use same as Header picker, lighten by 70% */
+  --visited-link: #111;
+  /* Use same as Header picker, lighten by 70% */
+  --hover-link: #999999;
+  /* Use same as Header picker, lighten by 70% */
+  --nav-link: #FFF;
+  /* Use same as Header picker */
+  --light-link: #fff;
+  /* Use same as Header picker */
+}
+a.btn-info:link,
+a.btn-warning:link,
+a.btn-danger:link {
+  color: #FFF;
+}
+a.btn-info:visited,
+a.btn-warning:visited,
+a.btn-danger:visited {
+  color: #FFF;
+}
+.btn-danger.btn-sm.disabled {
+  color: #FFF;
+}
+.far fa-life-ring {
+  color: var(--link);
+}
+.sidebar-toggle-mobile {
+  color: #FFF !important;
+}
+.skin-black .main-header .navbar .nav > li > a,
+.skin-black .main-header .navbar .nav > li > a {
+  text-decoration: none;
+}
+.select2-container--default .select2-selection--multiple .select2-selection__choice {
+  background-color: #111;
+}
+.search-highlight,
+.search-highlight:hover {
+  background-color: #e9d15b;
+}
+/*
+ * Skin: black dark
+ * ----------
+ */
+.skin-black-dark .main-header .navbar {
+  background-color: #111;
+}
+.skin-black-dark .main-header .navbar .nav > li > a {
+  color: #fff;
+}
+.skin-black-dark .main-header .navbar .nav > li > a:hover,
+.skin-black-dark .main-header .navbar .nav > li > a:active,
+.skin-black-dark .main-header .navbar .nav > li > a:focus,
+.skin-black-dark .main-header .navbar .nav .open > a,
+.skin-black-dark .main-header .navbar .nav .open > a:hover,
+.skin-black-dark .main-header .navbar .nav .open > a:focus,
+.skin-black-dark .main-header .navbar .nav > .active > a {
+  background: rgba(0, 0, 0, 0.1);
+  color: #f6f6f6;
+}
+.skin-black-dark .main-header .navbar .sidebar-toggle {
+  color: #fff;
+}
+.skin-black-dark .main-header .navbar .sidebar-toggle:hover {
+  color: #f6f6f6;
+  background: rgba(0, 0, 0, 0.1);
+}
+.skin-black-dark .main-header .navbar .sidebar-toggle {
+  color: #fff;
+}
+.skin-black-dark .main-header .navbar .sidebar-toggle:hover {
+  background-color: #040404;
+}
+@media (max-width: 767px) {
+  .skin-black-dark .main-header .navbar .dropdown-menu li.divider {
+    background-color: rgba(255, 255, 255, 0.1);
+    color: #fff;
+  }
+  .skin-black-dark .main-header .navbar .dropdown-menu li a {
+    color: #333;
+  }
+  .skin-black-dark .main-header .navbar .dropdown-menu li a:hover {
+    background: #040404;
+    color: #fff;
+  }
+}
+@media (max-width: 991px) {
+  .skin-black-dark .main-header .navbar-custom-menu > .navbar-nav > li > .dropdown-menu {
+    background-color: var(--back-sub);
+  }
+}
+.skin-black-dark .main-header li.user-header {
+  background-color: #111;
+}
+.skin-black-dark .content-header {
+  background: transparent;
+}
+.skin-black-dark .wrapper,
+.skin-black-dark .main-sidebar,
+.skin-black-dark .left-side {
+  background-color: #222d32;
+}
+.skin-black-dark .user-panel > .info,
+.skin-black-dark .user-panel > .info > a {
+  color: #fff;
+}
+.skin-black-dark .sidebar-menu > li.header {
+  color: #4b646f;
+  background: #1a2226;
+}
+.skin-black-dark .sidebar-menu > li > a {
+  border-left: 3px solid transparent;
+}
+.skin-black-dark .sidebar-menu > li:hover > a,
+.skin-black-dark .sidebar-menu > li.active > a {
+  color: #fff;
+  background: #1e282c;
+  border-left-color: #111;
+}
+.skin-black-dark .sidebar-menu > li > .treeview-menu {
+  margin: 0 1px;
+  background: #2c3b41;
+}
+.skin-black-dark .sidebar a {
+  color: #b8c7ce;
+}
+.skin-black-dark .sidebar a:hover {
+  text-decoration: none;
+}
+.skin-black-dark .treeview-menu > li > a {
+  color: #8aa4af;
+}
+.skin-black-dark .treeview-menu > li.active > a,
+.skin-black-dark .treeview-menu > li > a:hover {
+  color: #fff;
+}
+.skin-black-dark .sidebar-form {
+  border-radius: 3px;
+  border: 1px solid #374850;
+  margin: 10px 10px;
+}
+.skin-black-dark .sidebar-form input[type="text"],
+.skin-black-dark .sidebar-form .btn {
+  box-shadow: none;
+  background-color: #374850;
+  border: 1px solid transparent;
+  height: 35px;
+  transition: all 0.3s ease-in-out;
+}
+.skin-black-dark .sidebar-form input[type="text"] {
+  color: #666;
+  border-top-left-radius: 2px;
+  border-top-right-radius: 0;
+  border-bottom-right-radius: 0;
+  border-bottom-left-radius: 2px;
+}
+.skin-black-dark .sidebar-form input[type="text"]:focus,
+.skin-black-dark .sidebar-form input[type="text"]:focus + .input-group-btn .btn {
+  background-color: #fff;
+  color: #666;
+}
+.skin-black-dark .sidebar-form input[type="text"]:focus + .input-group-btn .btn {
+  border-left-color: #fff;
+}
+.skin-black-dark .sidebar-form .btn {
+  color: #999;
+  border-top-left-radius: 0;
+  border-top-right-radius: 2px;
+  border-bottom-right-radius: 2px;
+  border-bottom-left-radius: 0;
+}
+.skin-black-dark.layout-top-nav .main-header > .logo .logo-variant {
+  background-color: none;
+}
+.btn,
+.btn:hover {
+  color: #fff;
+}
+.btn.btn-primary,
+.btn:hover.btn-primary,
+.btn .btn-primary:link,
+.btn:hover .btn-primary:link {
+  background-color: #000000;
+  border-color: #FFF;
+  color: #fff;
+}
+.btna.btn-primary:hover,
+.btn:hovera.btn-primary:hover {
+  background-color: #000000;
+  border-color: #000000;
+  color: #fff;
+}
+.btn.btn-white:link,
+.btn:hover.btn-white:link {
+  background-color: #000000;
+  color: #fff;
+}
+.btn.btn-white:hover,
+.btn:hover.btn-white:hover {
+  background-color: #000000;
+  color: #fff;
+}
+/**
+The dropdown is white, so use a darker color
+ */
+li.dropdown-item-marker {
+  color: var(--button-primary);
+}
+a:hover {
+  color: #fff;
+}
+a:visited {
+  color: #fff;
+}
+.text-primary {
+  color: #fff;
+}
+#sort tr.cansort {
+  background-color: var(--back-main);
+  color: var(--text-main);
+}
+:root {
+  --background: #222;
+  --back-main: #333;
+  --back-sub: #3d4144;
+  --back-sub-alt: rgba(0, 0, 0, 0.36);
+  --button-default: #000000;
+  --button-primary: #000000;
+  --button-hover: #000000;
+  --header: #111;
+  /* Use same as Header picker */
+  --text-main: #fff;
+  --text-sub: #9b9b9b;
+  --link: #fff;
+  /* Use same as Header picker, lighten by 70% */
+  --visited-link: #fff;
+  /* Use same as Header picker, lighten by 70% */
+  --hover-link: #949494;
+  /* Use same as Header picker, lighten by 70% */
+  --nav-link: #FFF;
+  /* Use same as Header picker */
+  --light-link: #fff;
+  /* Use same as Header picker */
+}
+#ldapad_test_results.well.well-sm {
+  color: var(--back-main);
+}
+a.actions {
+  color: #fff !important;
+}
+.pagination > li > a {
+  color: var(--light-link);
+  background-color: var(--back-main);
+}
+.pagination > .active > a {
+  background-color: var(--visited-link);
+  border-color: var(--light-link);
+}
+.pagination > .active > a:hover {
+  background-color: var(--hover-link);
+}
+.tasks-menu > .dropdown-menu > li .menu > li > a:hover .progress {
+  background-color: var(--background);
+}
+a:hover > h2.task_menu {
+  color: var(--header);
+}
+h2.task_menu {
+  color: var(--link);
+}
+.navbar-custom-menu > .navbar-nav > li > .dropdown-menu {
+  background-color: var(--back-main);
+  color: var(--link);
+}
+.navbar-custom-menu > .navbar-nav > li > .dropdown-menu > li.header {
+  background-color: var(--header);
+  color: var(--link);
+}
+.main-header .navbar,
+.main-header .logo {
+  background-color: var(--header);
+  background: linear-gradient(to bottom, var(--header) 0%, var(--header) 100%);
+  border-color: var(--header);
+}
+.bootstrap-table .fixed-table-container .table thead th .sortable {
+  color: var(--nav-link);
+}
+.bootstrap-table .fixed-table-toolbar .columns label {
+  color: #000;
+}
+.thead,
+.navbar-nav > li > a:link {
+  color: var(--nav-link);
+}
+.far fa-life-ring {
+  color: var(--link);
+}
+.modal-content {
+  background-color: var(--back-main);
+  color: var(--text-main);
+}
+.btn-primary.hover {
+  color: var(--nav-link);
+}
+.small-box h3,
+.small-box p {
+  color: var(--nav-link) !important;
+}
+.small-box h3 a:hover,
+.small-box p a:hover {
+  text-decoration: none;
+  color: var(--nav-link) !important;
+}
+a:link.btn-default {
+  color: var(--nav-link);
+}
+/* Trying to figure out a way of having links different shades based on what row they are on (even/odd).
+a unique challenge for this dark mode skin.
+Probably writing the specificity for this incorrectly. --Godfrey Martinez 02/04/21
+
+.table-striped>tbody>tr:nth-of-type(even)>a:link{
+  color:#000d07;
+}
+.table-striped>tbody>tr:nth-of-type(odd)>a:link{
+  color:#bfbfbf;
+
+}*/
+#accessoriesTable > tbody > tr > td > nobr > a > i.fa {
+  color: var(--text-main);
+}
+#assetsListingTable > tbody > tr > td > nobr > a > i.fa {
+  color: var(--text-main);
+}
+#assetsListingTable > tbody > tr.selected > td {
+  background-color: var(--back-main);
+}
+body {
+  color: var(--text-main);
+}
+.box,
+.box.box-default {
+  border-top: 3px solid var(--header);
+  border-top-color: var(--header);
+}
+.box-body,
+.box-footer,
+.box-header {
+  background-color: var(--back-sub);
+  color: var(--header);
+}
+.btn-default {
+  background-color: var(--button-default);
+  color: var(--nav-link);
+}
+.btn-default dropdown-toggle {
+  background-color: var(--button-default);
+  color: var(--nav-link);
+}
+.btn-default:active,
+.btn-default:focus,
+.btn-default:hover,
+.btn-default.active {
+  background-color: var(--button-hover);
+  color: var(--nav-link);
+}
+.btn-primary,
+.btn-primary.hover,
+.btn-primary:active,
+.text-black {
+  color: var(--nav-link) !important;
+}
+.btn-primary:hover {
+  background-color: var(--button-primary);
+  color: var(--link) !important;
+}
+#componentsTable > tbody > tr > td > nobr > a > i.fa {
+  color: var(--text-main);
+}
+#consumablesTable > tbody > tr > td > nobr > a > i.fa {
+  color: var(--text-main);
+}
+.content-wrapper {
+  background-color: var(--background);
+}
+#create-form > div > div > div > span > i.fa {
+  background-color: var(--back-sub);
+  color: var(--header);
+}
+.datepicker .datepicker-switch:hover,
+.datepicker .next:hover,
+.datepicker .prev:hover,
+.datepicker tfoot tr th:hover,
+.datepicker table tr td.day.focused,
+.datepicker table tr td.day:hover {
+  background-color: var(--header);
+}
+.datepicker.dropdown-menu {
+  background-color: var(--back-main);
+  color: var(--text-main);
+}
+#details > div > div > div > table {
+  background-color: transparent;
+}
+.dropdown-menu > li > a:hover {
+  background-color: var(--back-main);
+  color: var(--nav-link);
+}
+.form-control {
+  background-color: var(--back-main);
+  color: var(--text-main);
+}
+.form-control[disabled],
+.form-control[readonly],
+fieldset[disabled] .form-control {
+  background-color: var(--back-main);
+  color: var(--text-main);
+}
+h1,
+h2,
+h3,
+h4,
+h5,
+h6,
+p {
+  color: var(--text-main);
+}
+.help-block {
+  color: var(--text-sub);
+}
+input[type=text],
+input[type=search] {
+  background-color: var(--back-sub);
+  color: var(--text-main);
+}
+.search-highlight,
+.search-highlight:hover {
+  background-color: var(--back-sub) !important;
+}
+#licensesTable > tbody > tr > td > nobr > a > i.fa {
+  color: var(--text-main);
+}
+.main-footer {
+  background-color: var(--back-main);
+  color: var(--text-main);
+}
+.nav-tabs-custom > .nav-tabs > li > a,
+.nav-tabs-custom > .nav-tabs > li.active > a {
+  color: var(--text-main);
+}
+.nav-tabs-custom > .nav-tabs > li.active {
+  border-top-color: var(--header);
+}
+.nav-tabs-custom > .nav-tabs > li.active > a {
+  background-color: var(--back-main);
+}
+.nav-tabs-custom > .nav-tabs > li.active > a:hover {
+  background-color: var(--back-sub);
+  color: var(--text-main);
+}
+.nav-tabs-custom,
+.nav-tabs-custom > .tab-content {
+  background-color: var(--back-main);
+}
+.navbar-nav > .tasks-menu > .dropdown-menu > li.header {
+  background-color: var(--back-main);
+  color: var(--header);
+}
+.open > .dropdown-toggle.btn-default {
+  background-color: var(--back-sub);
+  color: var(--header);
+}
+.panel {
+  background-color: var(--back-sub);
+  color: var(--text-main);
+}
+.panel-default > .panel-heading {
+  background-color: var(--back-main);
+  color: var(--header);
+}
+.select2-container--default .select2-results__option[aria-selected=true],
+.select2-container--default .select2-results__option[aria-selected=true]:hover {
+  background-color: var(--back-sub);
+  color: var(--nav-link);
+}
+.select2-container--default .select2-results__option--highlighted[aria-selected] {
+  background-color: var(--back-sub);
+  color: var(--visited-link);
+}
+.select2-container--default .select2-selection--single .select2-selection__rendered {
+  color: var(--text-main);
+}
+.select2-container--default .select2-selection--multiple .select2-selection__choice {
+  background-color: var(--header);
+}
+.select2-selection--single {
+  background-color: var(--back-sub) !important;
+  color: var(--text-main) !important;
+}
+.select2-dropdown {
+  background-color: var(--back-main);
+  color: var(--text-main);
+}
+.skin-black-dark .main-header .navbar .dropdown-menu li a {
+  color: #FFFFFF;
+}
+.skin-black-dark .main-header .navbar .dropdown-menu li a:hover {
+  background-color: #000000;
+}
+.fixed-table-body thead th .th-inner,
+.skin-black-dark .sidebar-menu > li.active > a,
+.skin-black .sidebar-menu > li:hover > a,
+.sidebar-toggle:hover {
+  background-color: var(--header) !important;
+}
+.tab-content,
+.tab-pane {
+  background-color: var(--back-main);
+  color: var(--text-main);
+}
+.table-striped > tbody > tr:nth-of-type(odd) {
+  background-color: var(--back-sub);
+  color: var(--text-main);
+}
+.table-striped > tbody > tr:nth-of-type(even) {
+  background-color: var(--back-sub-alt);
+  color: var(--text-main);
+}
+.row-new-striped > .row:nth-of-type(odd) {
+  background-color: var(--back-sub);
+  color: var(--text-main);
+}
+.row-new-striped > .row:nth-of-type(even) {
+  background-color: var(--back-sub-alt);
+  color: var(--text-main);
+}
+#webui > div > div > div > div > div > table > tbody > tr > td > a > i.fa,
+.box-body,
+.box-footer,
+.box-header {
+  color: var(--text-main);
+}
+.box-header.with-border {
+  border-bottom: #000;
+}
+a {
+  color: var(--link);
+}
+a:link {
+  color: var(--link);
+}
+a:hover {
+  color: var(--hover-link);
+  text-decoration: underline;
+}
+.row-striped {
+  vertical-align: top;
+  line-height: 2.6;
+  padding: 0px;
+  margin-left: 20px;
+  box-sizing: border-box;
+  display: table;
+}
+.row-striped .row:nth-of-type(odd) div {
+  background-color: var(--back-sub);
+  color: var(--text-main);
+  border-top: 1px solid #dddddd;
+  display: table-cell;
+}
+.row-striped .row:nth-of-type(even) div {
+  background-color: var(--back-sub);
+  color: var(--text-main);
+  border-top: 1px solid #dddddd;
+  display: table-cell;
+}
+.search-highlight,
+.search-highlight:hover {
+  background-color: #e9d15b;
+}
+div.container.row-new-striped {
+  background-color: var(--back-sub);
+}
+.table > thead > tr > td.danger,
+.table > tbody > tr > td.danger,
+.table > tfoot > tr > td.danger,
+.table > thead > tr > th.danger,
+.table > tbody > tr > th.danger,
+.table > tfoot > tr > th.danger,
+.table > thead > tr.danger > td,
+.table > tbody > tr.danger > td,
+.table > tfoot > tr.danger > td,
+.table > thead > tr.danger > th,
+.table > tbody > tr.danger > th,
+.table > tfoot > tr.danger > th {
+  background-color: var(--back-sub);
+}
+.table > tbody > tr.warning > td {
+  background-color: var(--back-sub);
+}
+/*
+ * Skin: Blue
+ * ----------
+ */
+.skin-blue .main-header .navbar {
+  background-color: #3c8dbc;
+}
+.skin-blue .main-header .navbar .nav > li > a {
+  color: #fff;
+}
+.skin-blue .main-header .navbar .nav > li > a:hover,
+.skin-blue .main-header .navbar .nav > li > a:active,
+.skin-blue .main-header .navbar .nav > li > a:focus,
+.skin-blue .main-header .navbar .nav .open > a,
+.skin-blue .main-header .navbar .nav .open > a:hover,
+.skin-blue .main-header .navbar .nav .open > a:focus,
+.skin-blue .main-header .navbar .nav > .active > a {
+  background: rgba(0, 0, 0, 0.1);
+  color: #f6f6f6;
+}
+.skin-blue .main-header .navbar .sidebar-toggle {
+  color: #fff;
+}
+.skin-blue .main-header .navbar .sidebar-toggle:hover {
+  color: #f6f6f6;
+  background: rgba(0, 0, 0, 0.1);
+}
+.skin-blue .main-header .navbar .sidebar-toggle {
+  color: #fff;
+}
+.skin-blue .main-header .navbar .sidebar-toggle:hover {
+  background-color: #367fa9;
+}
+@media (max-width: 767px) {
+  .skin-blue .main-header .navbar .dropdown-menu li.divider {
+    background-color: rgba(255, 255, 255, 0.1);
+  }
+  .skin-blue .main-header .navbar .dropdown-menu li a {
+    color: #333;
+  }
+  .skin-blue .main-header .navbar .dropdown-menu li a:hover {
+    background: #367fa9;
+  }
+}
+.skin-blue .main-header li.user-header {
+  background-color: #3c8dbc;
+}
+.skin-blue .content-header {
+  background: transparent;
+}
+.skin-blue .wrapper,
+.skin-blue .main-sidebar,
+.skin-blue .left-side {
+  background-color: #222d32;
+}
+.skin-blue .user-panel > .info,
+.skin-blue .user-panel > .info > a {
+  color: #fff;
+}
+.skin-blue .sidebar-menu > li.header {
+  color: #4b646f;
+  background: #1a2226;
+}
+.skin-blue .sidebar-menu > li > a {
+  border-left: 3px solid transparent;
+}
+.skin-blue .sidebar-menu > li:hover > a,
+.skin-blue .sidebar-menu > li.active > a {
+  color: #fff;
+  background: #1e282c;
+  border-left-color: #3c8dbc;
+}
+.skin-blue .sidebar-menu > li > .treeview-menu {
+  margin: 0 1px;
+  background: #2c3b41;
+}
+.skin-blue .sidebar a {
+  color: #b8c7ce;
+}
+.skin-blue .sidebar a:hover {
+  text-decoration: none;
+}
+.skin-blue .treeview-menu > li > a {
+  color: #8aa4af;
+}
+.skin-blue .treeview-menu > li.active > a,
+.skin-blue .treeview-menu > li > a:hover {
+  color: #fff;
+}
+.skin-blue .sidebar-form {
+  border-radius: 3px;
+  border: 1px solid #374850;
+  margin: 10px 10px;
+}
+.skin-blue .sidebar-form input[type="text"],
+.skin-blue .sidebar-form .btn {
+  box-shadow: none;
+  background-color: #374850;
+  border: 1px solid transparent;
+  height: 35px;
+  transition: all 0.3s ease-in-out;
+}
+.skin-blue .sidebar-form input[type="text"] {
+  color: #666;
+  border-top-left-radius: 2px;
+  border-top-right-radius: 0;
+  border-bottom-right-radius: 0;
+  border-bottom-left-radius: 2px;
+}
+.skin-blue .sidebar-form input[type="text"]:focus,
+.skin-blue .sidebar-form input[type="text"]:focus + .input-group-btn .btn {
+  background-color: #fff;
+  color: #666;
+}
+.skin-blue .sidebar-form input[type="text"]:focus + .input-group-btn .btn {
+  border-left-color: #fff;
+}
+.skin-blue .sidebar-form .btn {
+  color: #999;
+  border-top-left-radius: 0;
+  border-top-right-radius: 2px;
+  border-bottom-right-radius: 2px;
+  border-bottom-left-radius: 0;
+}
+.skin-blue.layout-top-nav .main-header > .logo .logo-variant {
+  background-color: unset;
+}
+.btn.btn-primary,
+btn-sm.btn-primary,
+.btn:hover.btn-primary,
+.btn .btn-primary:link,
+btn-sm .btn-primary:link,
+.btn:hover .btn-primary:link {
+  background-color: #307095;
+  border-color: #23536f;
+  color: #fff !important;
+}
+.btna.btn-primary:hover,
+btn-sma.btn-primary:hover,
+.btn:hovera.btn-primary:hover {
+  background-color: #23536f;
+  border-color: #23536f;
+  color: #fff;
+}
+.btn.btn-white:link,
+btn-sm.btn-white:link,
+.btn:hover.btn-white:link {
+  background-color: #307095;
+  color: #fff;
+}
+.btn.btn-white:hover,
+btn-sm.btn-white:hover,
+.btn:hover.btn-white:hover {
+  background-color: #173648;
+  color: #fff;
+}
+.btn.btn-white:visited,
+btn-sm.btn-white:visited,
+.btn:hover.btn-white:visited {
+  background-color: #173648;
+  color: #fff;
+}
+.btn-warning,
+.btn-warning:link,
+a.btn-warning:hover,
+.btn-warning:link,
+.btn-warning:visited,
+.btn-danger,
+.btn-danger:link,
+a.btn-danger:hover,
+.btn-danger:link,
+.btn-danger:visited {
+  color: #fff;
+}
+.btn-default:link,
+a.btn-default:hover,
+.btn-default:visited {
+  color: #505156;
+}
+:root {
+  --button-default: #505156;
+  --button-primary: #1d455b;
+  --button-hover: #173648;
+  --header: #3c8dbc;
+  /* Use same as Header picker */
+  --text-main: #BBB;
+  --text-sub: #9b9b9b;
+  --link: #296282;
+  /* Use same as Header picker, lighten by 70% */
+  --visited-link: #5fa4cc;
+  /* Use same as Header picker, lighten by 70% */
+  --hover-link: #86bad8;
+  /* Use same as Header picker, lighten by 70% */
+  --nav-link: #FFF;
+  /* Use same as Header picker */
+  --light-link: #fff;
+  /* Use same as Header picker */
+}
+a.btn-info:link,
+a.btn-warning:link,
+a.btn-danger:link {
+  color: #FFF;
+}
+a.btn-info:visited,
+a.btn-warning:visited,
+a.btn-danger:visited {
+  color: #FFF;
+}
+a:link {
+  color: var(--link);
+}
+a:visited {
+  color: var(--visited-link);
+}
+a:hover {
+  color: var(--hover-link);
+}
+.text-primary {
+  color: #23536f;
+}
+.far fa-life-ring {
+  color: var(--link);
+}
+.fixed-table-container tbody .selected td {
+  background-color: #fff8af;
+}
+.select2-container--default .select2-selection--multiple .select2-selection__choice {
+  background-color: #3c8dbc;
+}
+.search-highlight,
+.search-highlight:hover {
+  background-color: #e9d15b;
+}
+a.settings_button:link,
+a.settings_button:visited,
+a.settings_button:hover {
+  color: #3c8dbc;
+}
+a.label.label-default:link {
+  color: #307095;
+  /* Use same as Header picker, lighten by 70% */
+}
+a.label.label-default:visited {
+  color: #23536f;
+  /* Use same as Header picker, lighten by 70% */
+}
+a.label.label-default:hover {
+  background-color: #BBB;
+  color: #296282;
+}
+/*
+ * Skin: blue dark
+ * ----------
+ */
+.skin-blue-dark .main-header .navbar {
+  background-color: #3c8dbc;
+}
+.skin-blue-dark .main-header .navbar .nav > li > a {
+  color: #fff;
+}
+.skin-blue-dark .main-header .navbar .nav > li > a:hover,
+.skin-blue-dark .main-header .navbar .nav > li > a:active,
+.skin-blue-dark .main-header .navbar .nav > li > a:focus,
+.skin-blue-dark .main-header .navbar .nav .open > a,
+.skin-blue-dark .main-header .navbar .nav .open > a:hover,
+.skin-blue-dark .main-header .navbar .nav .open > a:focus,
+.skin-blue-dark .main-header .navbar .nav > .active > a {
+  background: rgba(0, 0, 0, 0.1);
+  color: #f6f6f6;
+}
+.skin-blue-dark .main-header .navbar .sidebar-toggle {
+  color: #fff;
+}
+.skin-blue-dark .main-header .navbar .sidebar-toggle:hover {
+  color: #f6f6f6;
+  background: rgba(0, 0, 0, 0.1);
+}
+.skin-blue-dark .main-header .navbar .sidebar-toggle {
+  color: #fff;
+}
+.skin-blue-dark .main-header .navbar .sidebar-toggle:hover {
+  background-color: #367fa9;
+}
+@media (max-width: 767px) {
+  .skin-blue-dark .main-header .navbar .dropdown-menu li.divider {
+    background-color: rgba(255, 255, 255, 0.1);
+    color: #fff;
+  }
+  .skin-blue-dark .main-header .navbar .dropdown-menu li a {
+    color: #fff;
+  }
+  .skin-blue-dark .main-header .navbar .dropdown-menu li a:hover {
+    background: #367fa9;
+    color: #fff;
+  }
+}
+.skin-blue-dark .main-header li.user-header {
+  background-color: #3c8dbc;
+}
+.skin-blue-dark .content-header {
+  background: transparent;
+}
+.skin-blue-dark .wrapper,
+.skin-blue-dark .main-sidebar,
+.skin-blue-dark .left-side {
+  background-color: #222d32;
+}
+.skin-blue-dark .user-panel > .info,
+.skin-blue-dark .user-panel > .info > a {
+  color: #fff;
+}
+.skin-blue-dark .sidebar-menu > li.header {
+  color: #4b646f;
+  background: #1a2226;
+}
+.skin-blue-dark .sidebar-menu > li > a {
+  border-left: 3px solid transparent;
+}
+.skin-blue-dark .sidebar-menu > li:hover > a,
+.skin-blue-dark .sidebar-menu > li.active > a {
+  color: #fff;
+  background: #1e282c;
+  border-left-color: #3c8dbc;
+}
+.skin-blue-dark .sidebar-menu > li > .treeview-menu {
+  margin: 0 1px;
+  background: #2c3b41;
+}
+.skin-blue-dark .sidebar a {
+  color: #b8c7ce;
+}
+.skin-blue-dark .sidebar a:hover {
+  text-decoration: none;
+}
+.skin-blue-dark .treeview-menu > li > a {
+  color: #8aa4af;
+}
+.skin-blue-dark .treeview-menu > li.active > a,
+.skin-blue-dark .treeview-menu > li > a:hover {
+  color: #fff;
+}
+.skin-blue-dark .sidebar-form {
+  border-radius: 3px;
+  border: 1px solid #374850;
+  margin: 10px 10px;
+}
+.skin-blue-dark .sidebar-form input[type="text"],
+.skin-blue-dark .sidebar-form .btn {
+  box-shadow: none;
+  background-color: #374850;
+  border: 1px solid transparent;
+  height: 35px;
+  transition: all 0.3s ease-in-out;
+}
+.skin-blue-dark .sidebar-form input[type="text"] {
+  color: #666;
+  border-top-left-radius: 2px;
+  border-top-right-radius: 0;
+  border-bottom-right-radius: 0;
+  border-bottom-left-radius: 2px;
+}
+.skin-blue-dark .sidebar-form input[type="text"]:focus,
+.skin-blue-dark .sidebar-form input[type="text"]:focus + .input-group-btn .btn {
+  background-color: #fff;
+  color: #666;
+}
+.skin-blue-dark .sidebar-form input[type="text"]:focus + .input-group-btn .btn {
+  border-left-color: #fff;
+}
+.skin-blue-dark .sidebar-form .btn {
+  color: #999;
+  border-top-left-radius: 0;
+  border-top-right-radius: 2px;
+  border-bottom-right-radius: 2px;
+  border-bottom-left-radius: 0;
+}
+.skin-blue-dark.layout-top-nav .main-header > .logo .logo-variant {
+  background-color: none;
+}
+.btn,
+.btn:hover {
+  color: #fff !important;
+}
+.btn.btn-primary,
+.btn:hover.btn-primary,
+.btn .btn-primary:link,
+.btn:hover .btn-primary:link {
+  background-color: #307095;
+  border-color: #FFF;
+  color: #FFF;
+}
+.btna.btn-primary:hover,
+.btn:hovera.btn-primary:hover {
+  background-color: #23536f;
+  border-color: #23536f;
+  color: #fff;
+}
+.btn.btn-white:link,
+.btn:hover.btn-white:link {
+  background-color: #307095;
+  color: #fff;
+}
+.btn.btn-white:hover,
+.btn:hover.btn-white:hover {
+  background-color: #173648;
+  color: #fff;
+}
+/**
+The dropdown is white, so use a darker color
+ */
+li.dropdown-item-marker {
+  color: var(--button-primary);
+}
+a:hover {
+  color: var(--hover-link);
+}
+a:visited {
+  color: var(--visited-link);
+}
+.text-primary {
+  color: #fff;
+}
+#sort tr.cansort {
+  background-color: var(--back-main);
+  color: var(--text-main);
+}
+:root {
+  --background: #222;
+  --back-main: #333;
+  --back-sub: #272727;
+  --back-sub-alt: rgba(0, 0, 0, 0.36);
+  --button-default: #296282;
+  --button-primary: #1d455b;
+  --button-hover: #173648;
+  --header: #3c8dbc;
+  /* Use same as Header picker */
+  --text-main: #BBB;
+  --text-sub: #9b9b9b;
+  --link: #00BFFF;
+  /* Use same as Header picker, lighten by 70% */
+  --visited-link: #4dd2ff;
+  /* Use same as Header picker, lighten by 70% */
+  --hover-link: #99e5ff;
+  /* Use same as Header picker, lighten by 70% */
+  --nav-link: #FFF;
+  /* Use same as Header picker */
+  --light-link: #fff;
+  /* Use same as Header picker */
+}
+#ldapad_test_results.well.well-sm {
+  color: var(--back-main);
+}
+a.actions {
+  color: #fff !important;
+}
+.pagination > li > a {
+  color: var(--light-link);
+  background-color: var(--back-main);
+}
+.pagination > .active > a {
+  background-color: var(--visited-link);
+  border-color: var(--light-link);
+}
+.pagination > .active > a:hover {
+  background-color: var(--hover-link);
+}
+.tasks-menu > .dropdown-menu > li .menu {
+  background-color: var(--back-main);
+}
+.tasks-menu > .dropdown-menu > li .menu > li > a:hover .progress {
+  background-color: var(--background);
+}
+h2.task_menu {
+  color: var(--link);
+}
+.navbar-custom-menu > .navbar-nav > li > .dropdown-menu {
+  background-color: var(--back-main);
+  color: var(--link);
+}
+.main-header .navbar,
+.main-header .logo {
+  background-color: var(--header);
+  background: linear-gradient(to bottom, var(--header) 0%, var(--header) 100%);
+  border-color: var(--header);
+}
+.bootstrap-table .fixed-table-container .table thead th .sortable {
+  color: var(--nav-link);
+}
+.bootstrap-table .fixed-table-toolbar .columns label {
+  color: #000;
+}
+.thead,
+.navbar-nav > li > a:link {
+  color: var(--nav-link);
+}
+.far fa-life-ring {
+  color: var(--link);
+}
+.modal-content {
+  background-color: var(--back-main);
+  color: var(--text-main);
+}
+a:link {
+  color: var(--link);
+}
+.btn-primary.hover {
+  color: var(--nav-link);
+}
+.bootstrap-table .fixed-table-toolbar .columns label {
+  color: #000;
+}
+.small-box h3,
+.small-box p {
+  color: var(--nav-link) !important;
+}
+.small-box h3 a:hover,
+.small-box p a:hover {
+  text-decoration: none;
+  color: var(--nav-link) !important;
+}
+#accessoriesTable > tbody > tr > td > nobr > a > i.fa {
+  color: var(--text-main);
+}
+#assetsListingTable > tbody > tr > td > nobr > a > i.fa {
+  color: var(--text-main);
+}
+#assetsListingTable > tbody > tr.selected > td {
+  background-color: var(--back-main);
+}
+body {
+  color: var(--text-main);
+}
+.box,
+.box.box-default {
+  border-top: 3px solid var(--header);
+  border-top-color: var(--header);
+}
+.box-body,
+.box-footer,
+.box-header {
+  background-color: var(--back-sub);
+  color: var(--header);
+}
+.btn-default {
+  background-color: var(--button-default);
+  color: var(--link);
+}
+.btn-default dropdown-toggle {
+  background-color: var(--button-default);
+  color: var(--link);
+}
+.btn-default:active,
+.btn-default:focus,
+.btn-default:hover,
+.btn-default.active {
+  background-color: var(--button-hover);
+  color: var(--link);
+}
+.btn-primary,
+.btn-primary.hover,
+.btn-primary:active,
+.text-blue {
+  color: var(--text-main);
+}
+.btn-primary:hover {
+  background-color: var(--button-primary);
+}
+#componentsTable > tbody > tr > td > nobr > a > i.fa {
+  color: var(--text-main);
+}
+#consumablesTable > tbody > tr > td > nobr > a > i.fa {
+  color: var(--text-main);
+}
+.content-wrapper {
+  background-color: var(--background);
+}
+#create-form > div > div > div > span > i.fa {
+  background-color: var(--back-sub);
+  color: var(--header);
+}
+.datepicker .datepicker-switch:hover,
+.datepicker .next:hover,
+.datepicker .prev:hover,
+.datepicker tfoot tr th:hover,
+.datepicker table tr td.day.focused,
+.datepicker table tr td.day:hover {
+  background-color: var(--header);
+}
+.datepicker.dropdown-menu {
+  background-color: var(--back-main);
+  color: var(--text-main);
+}
+#details > div > div > div > table {
+  background-color: transparent;
+}
+.dropdown-menu > li > a:hover {
+  background-color: var(--back-main);
+  color: var(--nav-link);
+}
+.fixed-table-body thead th .th-inner {
+  color: var(--nav-link);
+}
+.form-control {
+  background-color: var(--back-main);
+  color: var(--text-main);
+}
+.form-control[disabled],
+.form-control[readonly],
+fieldset[disabled] .form-control {
+  background-color: var(--back-main);
+  color: var(--text-main);
+}
+h1,
+h2,
+h3,
+h4,
+h5,
+h6,
+p {
+  color: var(--text-main);
+}
+.help-block {
+  color: var(--text-sub);
+}
+input[type=text],
+input[type=search] {
+  background-color: var(--back-sub);
+  color: var(--text-main);
+}
+#licensesTable > tbody > tr > td > nobr > a > i.fa {
+  color: var(--text-main);
+}
+.main-footer {
+  background-color: var(--back-main);
+  color: var(--text-main);
+}
+.nav-tabs-custom > .nav-tabs > li > a,
+.nav-tabs-custom > .nav-tabs > li.active > a {
+  color: var(--text-main);
+}
+.nav-tabs-custom > .nav-tabs > li.active {
+  border-top-color: var(--header);
+}
+.nav-tabs-custom > .nav-tabs > li.active > a {
+  background-color: var(--back-main);
+}
+.nav-tabs-custom > .nav-tabs > li.active > a:hover {
+  background-color: var(--back-sub);
+  color: var(--text-main);
+}
+.nav-tabs-custom,
+.nav-tabs-custom > .tab-content {
+  background-color: var(--back-main);
+}
+.navbar-nav > .tasks-menu > .dropdown-menu > li.header {
+  background-color: var(--back-main);
+  color: var(--header);
+}
+.open > .dropdown-toggle.btn-default {
+  background-color: var(--back-sub);
+  color: var(--header);
+}
+.panel {
+  background-color: var(--back-sub);
+  color: var(--text-main);
+}
+.panel-default > .panel-heading {
+  background-color: var(--back-main);
+  color: var(--header);
+}
+.select2-container--default .select2-results__option[aria-selected=true],
+.select2-container--default .select2-results__option[aria-selected=true]:hover {
+  background-color: var(--back-sub);
+  color: var(--header);
+}
+.select2-container--default .select2-results__option--highlighted[aria-selected] {
+  background-color: var(--header);
+  color: var(--back-main);
+}
+.select2-container--default .select2-selection--single .select2-selection__rendered {
+  color: var(--text-main);
+}
+.select2-container--default .select2-selection--multiple .select2-selection__choice {
+  background-color: var(--header);
+}
+.select2-selection--single {
+  background-color: var(--back-sub) !important;
+  color: var(--text-main) !important;
+}
+.select2-dropdown {
+  background-color: var(--back-main);
+  color: var(--text-main);
+}
+.skin-blue-dark .main-header .navbar .dropdown-menu li a {
+  color: #FFFFFF;
+}
+.skin-blue-dark .main-header .navbar .dropdown-menu li a:hover {
+  background-color: #3c8dbc;
+}
+.fixed-table-body thead th .th-inner,
+.skin-blue-dark .sidebar-menu > li.active > a,
+.skin-blue .sidebar-menu > li:hover > a,
+.sidebar-toggle:hover {
+  background-color: var(--header) !important;
+}
+.tab-content,
+.tab-pane {
+  background-color: var(--back-main);
+  color: var(--text-main);
+}
+.table-striped > tbody > tr:nth-of-type(odd) {
+  background-color: var(--back-sub);
+}
+.table-striped > tbody > tr:nth-of-type(even) {
+  background-color: var(--back-main);
+}
+#webui > div > div > div > div > div > table > tbody > tr > td > a > i.fa,
+.box-body,
+.box-footer,
+.box-header {
+  color: var(--text-main);
+}
+.box-header.with-border {
+  border-bottom: #000;
+}
+a {
+  color: var(--link);
+}
+a:link {
+  color: var(--link);
+}
+a:hover {
+  color: var(--hover-link);
+  text-decoration: underline;
+}
+a:visited {
+  color: var(--visited-link);
+}
+#customFieldsTable a[href*='/models'] {
+  background-color: var(--back-sub-alt);
+  color: var(--link);
+}
+#customFieldsTable a[href*='/models']:hover {
+  background-color: var(--text-sub);
+  color: var(--button-hover);
+}
+#customFieldsTable a[href*='/models']:visited {
+  background-color: var(--background);
+  color: var(--visited-link);
+}
+#customFieldsTable a[href*='/fieldsets'] {
+  background-color: transparent;
+}
+.row-striped {
+  vertical-align: top;
+  line-height: 2.6;
+  padding: 0px;
+  margin-left: 20px;
+  box-sizing: border-box;
+  display: table;
+}
+.row-striped .row:nth-of-type(odd) div {
+  background-color: var(--back-sub);
+  color: var(--text-main);
+  border-top: 1px solid #dddddd;
+  display: table-cell;
+}
+.row-striped .row:nth-of-type(even) div {
+  background-color: var(--back-sub);
+  color: var(--text-main);
+  border-top: 1px solid #dddddd;
+  display: table-cell;
+}
+.row-new-striped > .row:nth-of-type(odd) {
+  background-color: var(--back-sub);
+  color: var(--text-main);
+}
+.row-new-striped > .row:nth-of-type(even) {
+  background-color: var(--back-sub-alt);
+  color: var(--text-main);
+}
+.search-highlight,
+.search-highlight:hover {
+  background-color: #e9d15b;
+}
+.table > tbody > tr.warning > td {
+  background-color: var(--back-sub);
+}
+/*
+ * Skin: Contrast
+ * ----------
+ */
+.skin-contrast .main-header .navbar {
+  background-color: #001F3F;
+}
+.skin-contrast .main-header .navbar .nav > li > a {
+  color: #fff;
+}
+.skin-contrast .main-header .navbar .nav > li > a:hover,
+.skin-contrast .main-header .navbar .nav > li > a:active,
+.skin-contrast .main-header .navbar .nav > li > a:focus,
+.skin-contrast .main-header .navbar .nav .open > a,
+.skin-contrast .main-header .navbar .nav .open > a:hover,
+.skin-contrast .main-header .navbar .nav .open > a:focus,
+.skin-contrast .main-header .navbar .nav > .active > a {
+  background: rgba(0, 0, 0, 0.1);
+  color: #f6f6f6;
+}
+.skin-contrast .main-header .navbar .sidebar-toggle {
+  color: #fff;
+}
+.skin-contrast .main-header .navbar .sidebar-toggle:hover {
+  color: #f6f6f6;
+  background: rgba(0, 0, 0, 0.1);
+}
+.skin-contrast .main-header .navbar .sidebar-toggle {
+  color: #fff;
+}
+.skin-contrast .main-header .navbar .sidebar-toggle:hover {
+  background-color: #001226;
+}
+@media (max-width: 767px) {
+  .skin-contrast .main-header .navbar .dropdown-menu li.divider {
+    background-color: rgba(255, 255, 255, 0.1);
+  }
+  .skin-contrast .main-header .navbar .dropdown-menu li a {
+    color: #fff;
+  }
+  .skin-contrast .main-header .navbar .dropdown-menu li a:hover {
+    background: #001226;
+  }
+}
+.skin-contrast .main-header li.user-header {
+  background-color: #001F3F;
+}
+.skin-contrast .content-header {
+  background: transparent;
+}
+.skin-contrast .wrapper,
+.skin-contrast .main-sidebar,
+.skin-contrast .left-side {
+  background-color: #222d32;
+}
+.skin-contrast .user-panel > .info,
+.skin-contrast .user-panel > .info > a {
+  color: #fff;
+}
+.skin-contrast .sidebar-menu > li.header {
+  color: #4b646f;
+  background: #1a2226;
+}
+.skin-contrast .sidebar-menu > li > a {
+  border-left: 3px solid transparent;
+}
+.skin-contrast .sidebar-menu > li:hover > a,
+.skin-contrast .sidebar-menu > li.active > a {
+  color: #fff;
+  background: #1e282c;
+  border-left-color: #001F3F;
+}
+.skin-contrast .sidebar-menu > li > .treeview-menu {
+  margin: 0 1px;
+  background: #2c3b41;
+}
+.skin-contrast .sidebar a {
+  color: #b8c7ce;
+}
+.skin-contrast .sidebar a:hover {
+  text-decoration: none;
+}
+.skin-contrast .treeview-menu > li > a {
+  color: #8aa4af;
+}
+.skin-contrast .treeview-menu > li.active > a,
+.skin-contrast .treeview-menu > li > a:hover {
+  color: #fff;
+}
+.skin-contrast .sidebar-form {
+  border-radius: 3px;
+  border: 1px solid #374850;
+  margin: 10px 10px;
+}
+.skin-contrast .sidebar-form input[type="text"],
+.skin-contrast .sidebar-form .btn {
+  box-shadow: none;
+  background-color: #374850;
+  border: 1px solid transparent;
+  height: 35px;
+  transition: all 0.3s ease-in-out;
+}
+.skin-contrast .sidebar-form input[type="text"] {
+  color: #666;
+  border-top-left-radius: 2px;
+  border-top-right-radius: 0;
+  border-bottom-right-radius: 0;
+  border-bottom-left-radius: 2px;
+}
+.skin-contrast .sidebar-form input[type="text"]:focus,
+.skin-contrast .sidebar-form input[type="text"]:focus + .input-group-btn .btn {
+  background-color: #fff;
+  color: #666;
+}
+.skin-contrast .sidebar-form input[type="text"]:focus + .input-group-btn .btn {
+  border-left-color: #fff;
+}
+.skin-contrast .sidebar-form .btn {
+  color: #999;
+  border-top-left-radius: 0;
+  border-top-right-radius: 2px;
+  border-bottom-right-radius: 2px;
+  border-bottom-left-radius: 0;
+}
+.skin-contrast.layout-top-nav .main-header > .logo .logo-variant {
+  background-color: none;
+}
+.btn.btn-primary,
+.btn:hover.btn-primary,
+.btn .btn-primary:link,
+.btn:hover .btn-primary:link {
+  background-color: #00060c;
+  border-color: #000000;
+  color: #fff;
+}
+.btna.btn-primary:hover,
+.btn:hovera.btn-primary:hover {
+  background-color: #000000;
+  border-color: #000000;
+  color: #fff;
+}
+.btn.btn-white:link,
+.btn:hover.btn-white:link {
+  background-color: #00060c;
+  color: #fff;
+}
+.btn.btn-white:hover,
+.btn:hover.btn-white:hover {
+  background-color: #000000;
+  color: #fff;
+}
+a.btn.btn-link.text-left {
+  color: #001F3F;
+  border: 1px solid #000;
+}
+a.btn.btn-link.text-left:hover {
+  color: #001F3F;
+}
+a {
+  color: #001F3F;
+}
+a:hover {
+  color: #001F3F;
+  text-decoration: underline;
+}
+a:visited {
+  color: #001F3F;
+}
+a.btn:hover {
+  color: #fff;
+  text-decoration: underline;
+}
+.text-primary {
+  color: #000000;
+}
+.skin-contrast .treeview-menu > li > a {
+  color: #FFF;
+}
+.bg-teal {
+  background-color: #1b6a6a !important;
+}
+.bg-orange {
+  background-color: #995400 !important;
+}
+.bg-purple {
+  background-color: #3a3767 !important;
+}
+.bg-maroon {
+  background-color: #7d1038 !important;
+}
+.pagination > li > a {
+  color: #00060c !important;
+}
+.pagination > .active > a {
+  background-color: #001F3F;
+  color: #FFF !important;
+}
+btn-success {
+  background-color: #000d07;
+}
+input::-webkit-input-placeholder {
+  /* Chrome/Opera/Safari */
+  color: #b5bbc8 !important;
+}
+input::-moz-placeholder {
+  /* Firefox 19+ */
+  color: #b5bbc8 !important;
+}
+input::-ms-input-placeholder {
+  /* IE 10+ */
+  color: #b5bbc8 !important;
+}
+.select2-default,
+.select2-selection__placeholder {
+  color: #37383c !important;
+}
+.callout.callout-info {
+  background-color: #23536f !important;
+}
+.fixed-table-container tbody .selected td {
+  background-color: #fff8af;
+}
+.search-highlight,
+.search-highlight:hover {
+  background-color: #e9d15b;
+}
+/*
+ * Skin: Green
+ * ----------
+ */
+:root {
+  --background: #222;
+  --back-main: #333;
+  --back-sub: #3d4144;
+  --back-sub-alt: rgba(0, 0, 0, 0.36);
+  --button-default: #005a31;
+  --button-primary: #002715;
+  --button-hover: #000d07;
+  --header: #00a65a;
+  /* Use same as Header picker */
+  --text-main: #BBB;
+  --text-sub: #9b9b9b;
+  --link: #00a65a;
+  /* Use same as Header picker, lighten by 70% */
+  --visited-link: #00f383;
+  /* Use same as Header picker, lighten by 70% */
+  --hover-link: #0dff90;
+}
+.skin-green .main-header .navbar {
+  background-color: #00a65a;
+}
+.skin-green .main-header .navbar .nav > li > a {
+  color: #fff;
+}
+.skin-green .main-header .navbar .nav > li > a:hover,
+.skin-green .main-header .navbar .nav > li > a:active,
+.skin-green .main-header .navbar .nav > li > a:focus,
+.skin-green .main-header .navbar .nav .open > a,
+.skin-green .main-header .navbar .nav .open > a:hover,
+.skin-green .main-header .navbar .nav .open > a:focus,
+.skin-green .main-header .navbar .nav > .active > a {
+  background: rgba(0, 0, 0, 0.1);
+  color: #f6f6f6;
+}
+.skin-green .main-header .navbar .sidebar-toggle {
+  color: #fff;
+}
+.skin-green .main-header .navbar .sidebar-toggle:hover {
+  color: #f6f6f6;
+  background: rgba(0, 0, 0, 0.1);
+}
+.skin-green .main-header .navbar .sidebar-toggle {
+  color: #fff;
+}
+.skin-green .main-header .navbar .sidebar-toggle:hover {
+  background-color: #008d4c;
+}
+@media (max-width: 767px) {
+  .skin-green .main-header .navbar .dropdown-menu li.divider {
+    background-color: rgba(255, 255, 255, 0.1);
+  }
+  .skin-green .main-header .navbar .dropdown-menu li a {
+    color: #333;
+  }
+  .skin-green .main-header .navbar .dropdown-menu li a:hover {
+    background: #008d4c;
+  }
+}
+.skin-green .main-header li.user-header {
+  background-color: #00a65a;
+}
+.skin-green .content-header {
+  background: transparent;
+}
+.skin-green .wrapper,
+.skin-green .main-sidebar,
+.skin-green .left-side {
+  background-color: #222d32;
+}
+.skin-green .user-panel > .info,
+.skin-green .user-panel > .info > a {
+  color: #fff;
+}
+.skin-green .sidebar-menu > li.header {
+  color: #4b646f;
+  background: #1a2226;
+}
+.skin-green .sidebar-menu > li > a {
+  border-left: 3px solid transparent;
+}
+.skin-green .sidebar-menu > li:hover > a,
+.skin-green .sidebar-menu > li.active > a {
+  color: #fff;
+  background: #1e282c;
+  border-left-color: #00a65a;
+}
+.skin-green .sidebar-menu > li > .treeview-menu {
+  margin: 0 1px;
+  background: #2c3b41;
+}
+.skin-green .sidebar a {
+  color: #b8c7ce;
+}
+.skin-green .sidebar a:hover {
+  text-decoration: none;
+}
+.skin-green .treeview-menu > li > a {
+  color: #8aa4af;
+}
+.skin-green .treeview-menu > li.active > a,
+.skin-green .treeview-menu > li > a:hover {
+  color: #fff;
+}
+.skin-green .sidebar-form {
+  border-radius: 3px;
+  border: 1px solid #374850;
+  margin: 10px 10px;
+}
+.skin-green .sidebar-form input[type="text"],
+.skin-green .sidebar-form .btn {
+  box-shadow: none;
+  background-color: #374850;
+  border: 1px solid transparent;
+  height: 35px;
+  transition: all 0.3s ease-in-out;
+}
+.skin-green .sidebar-form input[type="text"] {
+  color: #666;
+  border-top-left-radius: 2px;
+  border-top-right-radius: 0;
+  border-bottom-right-radius: 0;
+  border-bottom-left-radius: 2px;
+}
+.skin-green .sidebar-form input[type="text"]:focus,
+.skin-green .sidebar-form input[type="text"]:focus + .input-group-btn .btn {
+  background-color: #fff;
+  color: #666;
+}
+.skin-green .sidebar-form input[type="text"]:focus + .input-group-btn .btn {
+  border-left-color: #fff;
+}
+.skin-green .sidebar-form .btn {
+  color: #999;
+  border-top-left-radius: 0;
+  border-top-right-radius: 2px;
+  border-bottom-right-radius: 2px;
+  border-bottom-left-radius: 0;
+}
+.skin-green.layout-top-nav .main-header > .logo .logo-variant {
+  background-color: none;
+}
+.btn.btn-primary,
+.btn:hover.btn-primary,
+.btn .btn-primary:link,
+.btn:hover .btn-primary:link {
+  background-color: #00733e;
+  border-color: #004023;
+  color: #fff;
+}
+.btna.btn-primary:hover,
+.btn:hovera.btn-primary:hover {
+  background-color: #004023;
+  border-color: #004023;
+  color: #fff;
+}
+.btn.btn-white:link,
+.btn:hover.btn-white:link {
+  background-color: #00733e;
+  color: #fff;
+}
+.btn.btn-white:hover,
+.btn:hover.btn-white:hover {
+  background-color: #000d07;
+  color: #fff;
+}
+a.btn-info:link,
+a.btn-warning:link,
+a.btn-danger:link {
+  color: #FFF;
+}
+a.btn-info:visited,
+a.btn-warning:visited,
+a.btn-danger:visited {
+  color: #FFF;
+}
+a:link {
+  color: var(--link);
+}
+a:visited {
+  color: var(--visited-link);
+}
+a {
+  color: #00a65a;
+}
+a:hover {
+  color: #004023;
+}
+a:visited {
+  color: #00a65a;
+}
+.text-primary {
+  color: #004023;
+}
+.far fa-life-ring {
+  color: var(--link);
+}
+.fixed-table-container tbody .selected td {
+  background-color: #fff8af;
+}
+.select2-container--default .select2-selection--multiple .select2-selection__choice {
+  background-color: #00a65a;
+}
+.search-highlight,
+.search-highlight:hover {
+  background-color: #e9d15b;
+}
+/*
+ * Skin: green dark
+ * ----------
+ */
+.skin-green-dark .main-header .navbar {
+  background-color: #00a65a;
+}
+.skin-green-dark .main-header .navbar .nav > li > a {
+  color: #fff;
+}
+.skin-green-dark .main-header .navbar .nav > li > a:hover,
+.skin-green-dark .main-header .navbar .nav > li > a:active,
+.skin-green-dark .main-header .navbar .nav > li > a:focus,
+.skin-green-dark .main-header .navbar .nav .open > a,
+.skin-green-dark .main-header .navbar .nav .open > a:hover,
+.skin-green-dark .main-header .navbar .nav .open > a:focus,
+.skin-green-dark .main-header .navbar .nav > .active > a {
+  background: rgba(0, 0, 0, 0.1);
+  color: #f6f6f6;
+}
+.skin-green-dark .main-header .navbar .sidebar-toggle {
+  color: #fff;
+}
+.skin-green-dark .main-header .navbar .sidebar-toggle:hover {
+  color: #f6f6f6;
+  background: rgba(0, 0, 0, 0.1);
+}
+.skin-green-dark .main-header .navbar .sidebar-toggle {
+  color: #fff;
+}
+.skin-green-dark .main-header .navbar .sidebar-toggle:hover {
+  background-color: #008d4c;
+}
+@media (max-width: 767px) {
+  .skin-green-dark .main-header .navbar .dropdown-menu li.divider {
+    background-color: rgba(255, 255, 255, 0.1);
+    color: #fff;
+  }
+  .skin-green-dark .main-header .navbar .dropdown-menu li a {
+    color: #fff;
+  }
+  .skin-green-dark .main-header .navbar .dropdown-menu li a:hover {
+    background: #008d4c;
+    color: #fff;
+  }
+}
+.skin-green-dark .main-header li.user-header {
+  background-color: #00a65a;
+}
+.skin-green-dark .content-header {
+  background: transparent;
+}
+.skin-green-dark .wrapper,
+.skin-green-dark .main-sidebar,
+.skin-green-dark .left-side {
+  background-color: #222d32;
+}
+.skin-green-dark .user-panel > .info,
+.skin-green-dark .user-panel > .info > a {
+  color: #fff;
+}
+.skin-green-dark .sidebar-menu > li.header {
+  color: #4b646f;
+  background: #1a2226;
+}
+.skin-green-dark .sidebar-menu > li > a {
+  border-left: 3px solid transparent;
+}
+.skin-green-dark .sidebar-menu > li:hover > a,
+.skin-green-dark .sidebar-menu > li.active > a {
+  color: #fff;
+  background: #1e282c;
+  border-left-color: #00a65a;
+}
+.skin-green-dark .sidebar-menu > li > .treeview-menu {
+  margin: 0 1px;
+  background: #2c3b41;
+}
+.skin-green-dark .sidebar a {
+  color: #b8c7ce;
+}
+.skin-green-dark .sidebar a:hover {
+  text-decoration: none;
+}
+.skin-green-dark .treeview-menu > li > a {
+  color: #8aa4af;
+}
+.skin-green-dark .treeview-menu > li.active > a,
+.skin-green-dark .treeview-menu > li > a:hover {
+  color: #fff;
+}
+.skin-green-dark .sidebar-form {
+  border-radius: 3px;
+  border: 1px solid #374850;
+  margin: 10px 10px;
+}
+.skin-green-dark .sidebar-form input[type="text"],
+.skin-green-dark .sidebar-form .btn {
+  box-shadow: none;
+  background-color: #374850;
+  border: 1px solid transparent;
+  height: 35px;
+  transition: all 0.3s ease-in-out;
+}
+.skin-green-dark .sidebar-form input[type="text"] {
+  color: #666;
+  border-top-left-radius: 2px;
+  border-top-right-radius: 0;
+  border-bottom-right-radius: 0;
+  border-bottom-left-radius: 2px;
+}
+.skin-green-dark .sidebar-form input[type="text"]:focus,
+.skin-green-dark .sidebar-form input[type="text"]:focus + .input-group-btn .btn {
+  background-color: #fff;
+  color: #666;
+}
+.skin-green-dark .sidebar-form input[type="text"]:focus + .input-group-btn .btn {
+  border-left-color: #fff;
+}
+.skin-green-dark .sidebar-form .btn {
+  color: #999;
+  border-top-left-radius: 0;
+  border-top-right-radius: 2px;
+  border-bottom-right-radius: 2px;
+  border-bottom-left-radius: 0;
+}
+.skin-green-dark.layout-top-nav .main-header > .logo .logo-variant {
+  background-color: none;
+}
+.btn,
+.btn:hover {
+  color: #FFF !important;
+}
+.btn.btn-primary,
+.btn:hover.btn-primary,
+.btn .btn-primary:link,
+.btn:hover .btn-primary:link {
+  background-color: #00733e;
+  border-color: #FFF;
+  color: #FFF;
+}
+.btna.btn-primary:hover,
+.btn:hovera.btn-primary:hover {
+  background-color: #004023;
+  border-color: #004023;
+  color: #FFF;
+}
+.btn.btn-white:link,
+.btn:hover.btn-white:link {
+  background-color: #00733e;
+  color: #FFF;
+}
+.btn.btn-white:hover,
+.btn:hover.btn-white:hover {
+  background-color: #000d07;
+  color: #FFF;
+}
+/**
+The dropdown is white, so use a darker color
+ */
+li.dropdown-item-marker {
+  color: var(--button-primary);
+}
+a:hover {
+  color: var(--hover-link);
+}
+a:visited {
+  color: var(--visited-link);
+}
+.text-primary {
+  color: #fff;
+}
+#sort tr.cansort {
+  background-color: var(--back-main);
+  color: var(--text-main);
+}
+:root {
+  --background: #222;
+  --back-main: #333;
+  --back-sub: #312F2F;
+  --back-sub-alt: rgba(0, 0, 0, 0.36);
+  --button-default: #006400;
+  --button-primary: #003100;
+  --button-hover: #000000;
+  --header: #006400;
+  /* Use same as Header picker */
+  --text-main: #FFF;
+  --text-sub: #9b9b9b;
+  --link: #9ACD32;
+  /* Use same as Header picker, lighten by 70% */
+  --visited-link: #b8dc70;
+  /* Use same as Header picker, lighten by 70% */
+  --hover-link: #d7ebad;
+  /* Use same as Header picker, lighten by 70% */
+  --nav-link: #FFF;
+  /* Use same as Header picker */
+  --light-link: #fff;
+  /* Use same as Header picker */
+}
+#ldapad_test_results.well.well-sm {
+  color: var(--back-main);
+}
+a.actions {
+  color: #fff !important;
+}
+.pagination > li > a {
+  color: var(--light-link);
+  background-color: var(--back-main);
+}
+.pagination > .active > a {
+  background-color: var(--visited-link);
+  border-color: var(--light-link);
+}
+.pagination > .active > a:hover {
+  background-color: var(--hover-link);
+}
+.tasks-menu > .dropdown-menu > li .menu {
+  background-color: var(--back-main);
+}
+.tasks-menu > .dropdown-menu > li .menu > li > a:hover .progress {
+  background-color: var(--background);
+}
+h2.task_menu {
+  color: var(--link);
+}
+.navbar-custom-menu > .navbar-nav > li > .dropdown-menu {
+  background-color: var(--back-main);
+  color: var(--link);
+}
+.main-header .navbar,
+.main-header .logo {
+  background-color: var(--header);
+  background: linear-gradient(to bottom, var(--header) 0%, var(--header) 100%);
+  border-color: var(--header);
+}
+.bootstrap-table .fixed-table-container .table thead th .sortable {
+  color: var(--nav-link);
+}
+.far fa-life-ring {
+  color: var(--link);
+}
+.thead,
+.navbar-nav > li > a:link {
+  color: var(--nav-link);
+}
+.modal-content {
+  background-color: var(--back-main);
+  color: var(--text-main);
+}
+.btn-primary.hover {
+  color: var(--nav-link);
+}
+.small-box h3,
+.small-box p {
+  color: var(--nav-link) !important;
+}
+.small-box h3 a:hover,
+.small-box p a:hover {
+  text-decoration: none;
+  color: var(--nav-link) !important;
+}
+#accessoriesTable > tbody > tr > td > nobr > a > i.fa {
+  color: var(--text-main);
+}
+#assetsListingTable > tbody > tr > td > nobr > a > i.fa {
+  color: var(--text-main);
+}
+#assetsListingTable > tbody > tr.selected > td {
+  background-color: var(--back-main);
+}
+body {
+  color: var(--text-main);
+}
+.box,
+.box.box-default {
+  border-top: 3px solid var(--header);
+  border-top-color: var(--header);
+}
+.box-body,
+.box-footer,
+.box-header {
+  background-color: var(--back-sub);
+  color: var(--header);
+}
+.btn-default {
+  background-color: var(--button-default);
+  color: var(--link);
+}
+.btn-default dropdown-toggle {
+  background-color: var(--button-default);
+  color: var(--link);
+}
+.btn-default:active,
+.btn-default:focus,
+.btn-default:hover,
+.btn-default.active {
+  background-color: var(--button-hover);
+  color: var(--link);
+}
+.btn-primary,
+.btn-primary.hover,
+.btn-primary:active,
+.text-green {
+  color: var(--text-main);
+}
+.btn-primary:hover {
+  background-color: var(--button-primary);
+}
+#componentsTable > tbody > tr > td > nobr > a > i.fa {
+  color: var(--text-main);
+}
+#consumablesTable > tbody > tr > td > nobr > a > i.fa {
+  color: var(--text-main);
+}
+.content-wrapper {
+  background-color: var(--background);
+}
+#create-form > div > div > div > span > i.fa {
+  background-color: var(--back-sub);
+  color: var(--header);
+}
+.datepicker .datepicker-switch:hover,
+.datepicker .next:hover,
+.datepicker .prev:hover,
+.datepicker tfoot tr th:hover,
+.datepicker table tr td.day.focused,
+.datepicker table tr td.day:hover {
+  background-color: var(--header);
+}
+.datepicker.dropdown-menu {
+  background-color: var(--back-main);
+  color: var(--text-main);
+}
+#details > div > div > div > table {
+  background-color: transparent;
+}
+.dropdown-menu > li > a:hover {
+  background-color: var(--back-main);
+  color: var(--nav-link);
+}
+.fixed-table-body thead th .th-inner {
+  color: var(--nav-link);
+}
+.form-control {
+  background-color: var(--back-main);
+  color: var(--text-main);
+}
+.form-control[disabled],
+.form-control[readonly],
+fieldset[disabled] .form-control {
+  background-color: var(--back-main);
+  color: var(--text-main);
+}
+h1,
+h2,
+h3,
+h4,
+h5,
+h6,
+p {
+  color: var(--text-main);
+}
+.help-block {
+  color: var(--text-sub);
+}
+input[type=text],
+input[type=search] {
+  background-color: var(--back-sub);
+  color: var(--text-main);
+}
+#licensesTable > tbody > tr > td > nobr > a > i.fa {
+  color: var(--text-main);
+}
+.main-footer {
+  background-color: var(--back-main);
+  color: var(--text-main);
+}
+.nav-tabs-custom > .nav-tabs > li > a,
+.nav-tabs-custom > .nav-tabs > li.active > a {
+  color: var(--text-main);
+}
+.nav-tabs-custom > .nav-tabs > li.active {
+  border-top-color: var(--header);
+}
+.nav-tabs-custom > .nav-tabs > li.active > a {
+  background-color: var(--back-main);
+}
+.nav-tabs-custom > .nav-tabs > li.active > a:hover {
+  background-color: var(--back-sub);
+  color: var(--text-main);
+}
+.nav-tabs-custom,
+.nav-tabs-custom > .tab-content {
+  background-color: var(--back-main);
+}
+.open > .dropdown-toggle.btn-default {
+  background-color: var(--back-sub);
+  color: var(--header);
+}
+.panel {
+  background-color: var(--back-sub);
+  color: var(--text-main);
+}
+.panel-default > .panel-heading {
+  background-color: var(--back-main);
+  color: var(--header);
+}
+.select2-container--default .select2-results__option[aria-selected=true],
+.select2-container--default .select2-results__option[aria-selected=true]:hover {
+  background-color: var(--back-sub);
+  color: var(--header);
+}
+.select2-container--default .select2-results__option--highlighted[aria-selected] {
+  background-color: var(--header);
+  color: var(--back-main);
+}
+.select2-container--default .select2-selection--single .select2-selection__rendered {
+  color: var(--text-main);
+}
+.select2-container--default .select2-selection--multiple .select2-selection__choice {
+  background-color: var(--header);
+}
+.select2-selection--single {
+  background-color: var(--back-sub) !important;
+  color: var(--text-main) !important;
+}
+.select2-dropdown {
+  background-color: var(--back-main);
+  color: var(--text-main);
+}
+.skin-green-dark .main-header .navbar .dropdown-menu li a {
+  color: #FFFFFF;
+}
+.skin-green-dark .main-header .navbar .dropdown-menu li a:hover {
+  background-color: #006300;
+}
+.fixed-table-body thead th .th-inner,
+.skin-green-dark .sidebar-menu > li.active > a,
+.skin-green .sidebar-menu > li:hover > a,
+.sidebar-toggle:hover {
+  background-color: var(--header) !important;
+}
+.tab-content,
+.tab-pane {
+  background-color: var(--back-main);
+  color: var(--text-main);
+}
+.table-striped > tbody > tr:nth-of-type(odd) {
+  background-color: var(--back-sub);
+}
+.table-striped > tbody > tr:nth-of-type(even) {
+  background-color: var(--back-sub);
+}
+#webui > div > div > div > div > div > table > tbody > tr > td > a > i.fa,
+.box-body,
+.box-footer,
+.box-header {
+  color: var(--text-main);
+}
+.box-header.with-border {
+  border-bottom: #000;
+}
+a {
+  color: var(--link);
+}
+a:link {
+  color: var(--link);
+}
+a:hover {
+  color: var(--hover-link);
+  text-decoration: underline;
+}
+a:visited {
+  color: var(--visited-link);
+}
+#customFieldsTable a[href*='/models'] {
+  background-color: var(--back-sub-alt);
+  color: var(--link);
+}
+#customFieldsTable a[href*='/models']:hover {
+  background-color: var(--text-sub);
+  color: var(--button-hover);
+}
+#customFieldsTable a[href*='/models']:visited {
+  background-color: var(--background);
+  color: var(--visited-link);
+}
+#customFieldsTable a[href*='/fieldsets'] {
+  background-color: transparent;
+}
+.row-striped {
+  vertical-align: top;
+  line-height: 2.6;
+  padding: 0px;
+  margin-left: 20px;
+  box-sizing: border-box;
+  display: table;
+}
+.row-striped .row:nth-of-type(odd) div {
+  background-color: var(--back-sub);
+  color: var(--text-main);
+  border-top: 1px solid #dddddd;
+  display: table-cell;
+}
+.row-striped .row:nth-of-type(even) div {
+  background-color: var(--back-sub);
+  color: var(--text-main);
+  border-top: 1px solid #dddddd;
+  display: table-cell;
+}
+.row-new-striped > .row:nth-of-type(odd) {
+  background-color: var(--back-sub);
+  color: var(--text-main);
+}
+.row-new-striped > .row:nth-of-type(even) {
+  background-color: var(--back-sub-alt);
+  color: var(--text-main);
+}
+.search-highlight,
+.search-highlight:hover {
+  background-color: #e9d15b;
+}
+.table > tbody > tr.warning > td {
+  background-color: var(--back-sub);
+}
+/*
+ * Skin: orange dark
+ * ----------
+ */
+.skin-orange-dark .main-header .navbar {
+  background-color: #FF8C00;
+}
+.skin-orange-dark .main-header .navbar .nav > li > a {
+  color: #fff;
+}
+.skin-orange-dark .main-header .navbar .nav > li > a:hover,
+.skin-orange-dark .main-header .navbar .nav > li > a:active,
+.skin-orange-dark .main-header .navbar .nav > li > a:focus,
+.skin-orange-dark .main-header .navbar .nav .open > a,
+.skin-orange-dark .main-header .navbar .nav .open > a:hover,
+.skin-orange-dark .main-header .navbar .nav .open > a:focus,
+.skin-orange-dark .main-header .navbar .nav > .active > a {
+  background: rgba(0, 0, 0, 0.1);
+  color: #f6f6f6;
+}
+.skin-orange-dark .main-header .navbar .sidebar-toggle {
+  color: #fff;
+}
+.skin-orange-dark .main-header .navbar .sidebar-toggle:hover {
+  color: #f6f6f6;
+  background: rgba(0, 0, 0, 0.1);
+}
+.skin-orange-dark .main-header .navbar .sidebar-toggle {
+  color: #fff;
+}
+.skin-orange-dark .main-header .navbar .sidebar-toggle:hover {
+  background-color: #e67e00;
+}
+@media (max-width: 767px) {
+  .skin-orange-dark .main-header .navbar .dropdown-menu li.divider {
+    background-color: rgba(255, 255, 255, 0.1);
+    color: #fff;
+  }
+  .skin-orange-dark .main-header .navbar .dropdown-menu li a {
+    color: #fff;
+  }
+  .skin-orange-dark .main-header .navbar .dropdown-menu li a:hover {
+    background: #e67e00;
+    color: #fff;
+  }
+}
+.skin-orange-dark .main-header li.user-header {
+  background-color: #FF8C00;
+}
+.skin-orange-dark .content-header {
+  background: transparent;
+}
+.skin-orange-dark .wrapper,
+.skin-orange-dark .main-sidebar,
+.skin-orange-dark .left-side {
+  background-color: #222d32;
+}
+.skin-orange-dark .user-panel > .info,
+.skin-orange-dark .user-panel > .info > a {
+  color: #fff;
+}
+.skin-orange-dark .sidebar-menu > li.header {
+  color: #4b646f;
+  background: #1a2226;
+}
+.skin-orange-dark .sidebar-menu > li > a {
+  border-left: 3px solid transparent;
+}
+.skin-orange-dark .sidebar-menu > li:hover > a,
+.skin-orange-dark .sidebar-menu > li.active > a {
+  color: #fff;
+  background: #1e282c;
+  border-left-color: #FF8C00;
+}
+.skin-orange-dark .sidebar-menu > li > .treeview-menu {
+  margin: 0 1px;
+  background: #2c3b41;
+}
+.skin-orange-dark .sidebar a {
+  color: #b8c7ce;
+}
+.skin-orange-dark .sidebar a:hover {
+  text-decoration: none;
+}
+.skin-orange-dark .treeview-menu > li > a {
+  color: #8aa4af;
+}
+.skin-orange-dark .treeview-menu > li.active > a,
+.skin-orange-dark .treeview-menu > li > a:hover {
+  color: #fff;
+}
+.skin-orange-dark .sidebar-form {
+  border-radius: 3px;
+  border: 1px solid #374850;
+  margin: 10px 10px;
+}
+.skin-orange-dark .sidebar-form input[type="text"],
+.skin-orange-dark .sidebar-form .btn {
+  box-shadow: none;
+  background-color: #374850;
+  border: 1px solid transparent;
+  height: 35px;
+  transition: all 0.3s ease-in-out;
+}
+.skin-orange-dark .sidebar-form input[type="text"] {
+  color: #666;
+  border-top-left-radius: 2px;
+  border-top-right-radius: 0;
+  border-bottom-right-radius: 0;
+  border-bottom-left-radius: 2px;
+}
+.skin-orange-dark .sidebar-form input[type="text"]:focus,
+.skin-orange-dark .sidebar-form input[type="text"]:focus + .input-group-btn .btn {
+  background-color: #fff;
+  color: #666;
+}
+.skin-orange-dark .sidebar-form input[type="text"]:focus + .input-group-btn .btn {
+  border-left-color: #fff;
+}
+.skin-orange-dark .sidebar-form .btn {
+  color: #999;
+  border-top-left-radius: 0;
+  border-top-right-radius: 2px;
+  border-bottom-right-radius: 2px;
+  border-bottom-left-radius: 0;
+}
+.skin-orange-dark.layout-top-nav .main-header > .logo .logo-variant {
+  background-color: none;
+}
+.btn,
+.btn:hover {
+  color: #fff !important;
+}
+.btn.btn-primary,
+.btn:hover.btn-primary,
+.btn .btn-primary:link,
+.btn:hover .btn-primary:link {
+  background-color: #cc7000;
+  border-color: #fff;
+  color: #fff;
+}
+.btna.btn-primary:hover,
+.btn:hovera.btn-primary:hover {
+  background-color: #995400;
+  border-color: #995400;
+  color: #fff;
+}
+.btn.btn-white:link,
+.btn:hover.btn-white:link {
+  background-color: #cc7000;
+  color: #fff;
+}
+.btn.btn-white:hover,
+.btn:hover.btn-white:hover {
+  background-color: #663800;
+  color: #fff;
+}
+/**
+The dropdown is white, so use a darker color
+ */
+li.dropdown-item-marker {
+  color: var(--button-primary);
+}
+.text-primary {
+  color: #fff;
+}
+#sort tr.cansort {
+  background-color: var(--back-main);
+  color: var(--text-main);
+}
+:root {
+  --background: #222;
+  --back-main: #333;
+  --back-sub: #2E2C2C;
+  --back-sub-alt: rgba(0, 0, 0, 0.36);
+  --button-default: #b36200;
+  --button-primary: #804600;
+  --button-hover: #663800;
+  --header: #FF8C00;
+  /* Use same as Header picker */
+  --text-main: #BBB;
+  --text-sub: #9b9b9b;
+  --link: #FFA500;
+  /* Use same as Header picker, lighten by 70% */
+  --visited-link: #ffc04d;
+  /* Use same as Header picker, lighten by 70% */
+  --hover-link: #ffdb99;
+  /* Use same as Header picker, lighten by 70% */
+  --nav-link: #FFF;
+  /* Use same as Header picker */
+  --light-link: #fff;
+  /* Use same as Header picker */
+}
+#ldapad_test_results.well.well-sm {
+  color: var(--back-main);
+}
+a.actions {
+  color: #fff !important;
+}
+.pagination > li > a {
+  color: var(--light-link);
+  background-color: var(--back-main);
+}
+.pagination > .active > a {
+  background-color: var(--visited-link);
+  border-color: var(--light-link);
+}
+.pagination > .active > a:hover {
+  background-color: var(--hover-link);
+}
+.tasks-menu > .dropdown-menu > li .menu {
+  background-color: var(--back-main);
+}
+.tasks-menu > .dropdown-menu > li .menu > li > a:hover .progress {
+  background-color: var(--background);
+}
+h2.task_menu {
+  color: var(--link);
+}
+.navbar-custom-menu > .navbar-nav > li > .dropdown-menu {
+  background-color: var(--back-main);
+  color: var(--link);
+}
+.main-header .navbar,
+.main-header .logo {
+  background-color: var(--header);
+  background: linear-gradient(to bottom, var(--header) 0%, var(--header) 100%);
+  border-color: var(--header);
+}
+.far fa-life-ring {
+  color: var(--link);
+}
+.bootstrap-table .fixed-table-container .table thead th .sortable {
+  color: var(--nav-link);
+}
+.bootstrap-table .fixed-table-toolbar .columns label {
+  color: #000;
+}
+.thead,
+.navbar-nav > li > a:link {
+  color: var(--nav-link);
+}
+.modal-content {
+  background-color: var(--back-main);
+  color: var(--text-main);
+}
+a:link {
+  color: var(--link);
+}
+a:visited {
+  color: var(--visited-link);
+}
+a:hover {
+  color: var(--hover-link);
+}
+.btn-primary.hover {
+  color: var(--nav-link);
+}
+.small-box h3,
+.small-box p {
+  color: var(--nav-link) !important;
+}
+.small-box h3 a:hover,
+.small-box p a:hover {
+  text-decoration: none;
+  color: var(--nav-link) !important;
+}
+#accessoriesTable > tbody > tr > td > nobr > a > i.fa {
+  color: var(--text-main);
+}
+#assetsListingTable > tbody > tr > td > nobr > a > i.fa {
+  color: var(--text-main);
+}
+#assetsListingTable > tbody > tr.selected > td {
+  background-color: var(--back-main);
+}
+body {
+  color: var(--text-main);
+}
+.box,
+.box.box-default {
+  border-top: 3px solid var(--header);
+  border-top-color: var(--header);
+}
+.box-body,
+.box-footer,
+.box-header {
+  background-color: var(--back-sub);
+  color: var(--header);
+}
+.btn-default {
+  background-color: var(--button-default);
+  color: var(--nav-link);
+}
+a:link.btn-default {
+  color: var(--nav-link);
+}
+.btn-default dropdown-toggle {
+  background-color: var(--button-default);
+  color: var(--nav-link);
+}
+.btn-default:active,
+.btn-default:focus,
+.btn-default:hover,
+.btn-default.active {
+  background-color: var(--button-hover);
+  color: var(--background);
+}
+.btn-primary,
+.btn-primary.hover,
+.btn-primary:active,
+.text-orange {
+  color: var(--nav-link) !important;
+  border-color: var(--button-primary);
+}
+.btn-primary:hover {
+  background-color: var(--button-primary);
+}
+#componentsTable > tbody > tr > td > nobr > a > i.fa {
+  color: var(--text-main);
+}
+#consumablesTable > tbody > tr > td > nobr > a > i.fa {
+  color: var(--text-main);
+}
+.content-wrapper {
+  background-color: var(--background);
+}
+#create-form > div > div > div > span > i.fa {
+  background-color: var(--back-sub);
+  color: var(--header);
+}
+.datepicker .datepicker-switch:hover,
+.datepicker .next:hover,
+.datepicker .prev:hover,
+.datepicker tfoot tr th:hover,
+.datepicker table tr td.day.focused,
+.datepicker table tr td.day:hover {
+  background-color: var(--header);
+}
+.datepicker.dropdown-menu {
+  background-color: var(--back-main);
+  color: var(--text-main);
+}
+#details > div > div > div > table {
+  background-color: transparent;
+}
+.dropdown-menu > li > a:hover {
+  background-color: var(--back-main);
+  color: var(--nav-link);
+}
+.fixed-table-body thead th .th-inner {
+  color: var(--nav-link);
+}
+.form-control {
+  background-color: var(--back-main);
+  color: var(--text-main);
+}
+.form-control[disabled],
+.form-control[readonly],
+fieldset[disabled] .form-control {
+  background-color: var(--back-main);
+  color: var(--text-main);
+}
+h1,
+h2,
+h3,
+h4,
+h5,
+h6,
+p {
+  color: var(--text-main);
+}
+.help-block {
+  color: var(--text-sub);
+}
+input[type=text],
+input[type=search] {
+  background-color: var(--back-sub);
+  color: var(--text-main);
+}
+#licensesTable > tbody > tr > td > nobr > a > i.fa {
+  color: var(--text-main);
+}
+.main-footer {
+  background-color: var(--back-main);
+  color: var(--text-main);
+}
+.nav-tabs-custom > .nav-tabs > li > a,
+.nav-tabs-custom > .nav-tabs > li.active > a {
+  color: var(--text-main);
+}
+.nav-tabs-custom > .nav-tabs > li.active {
+  border-top-color: var(--header);
+}
+.nav-tabs-custom > .nav-tabs > li.active > a {
+  background-color: var(--back-main);
+}
+.nav-tabs-custom > .nav-tabs > li.active > a:hover {
+  background-color: var(--back-sub);
+  color: var(--text-main);
+}
+.nav-tabs-custom,
+.nav-tabs-custom > .tab-content {
+  background-color: var(--back-main);
+}
+.navbar-nav > .tasks-menu > .dropdown-menu > li.header {
+  background-color: var(--back-main);
+  color: var(--header);
+}
+.open > .dropdown-toggle.btn-default {
+  background-color: var(--back-sub);
+  color: var(--header);
+}
+.panel {
+  background-color: var(--back-sub);
+  color: var(--text-main);
+}
+.panel-default > .panel-heading {
+  background-color: var(--back-main);
+  color: var(--header);
+}
+.select2-container--default .select2-results__option[aria-selected=true],
+.select2-container--default .select2-results__option[aria-selected=true]:hover {
+  background-color: var(--back-sub);
+  color: var(--header);
+}
+.select2-container--default .select2-results__option--highlighted[aria-selected] {
+  background-color: var(--header);
+  color: var(--back-main);
+}
+.select2-container--default .select2-selection--single .select2-selection__rendered {
+  color: var(--text-main);
+}
+.select2-container--default .select2-selection--multiple .select2-selection__choice {
+  background-color: var(--header);
+}
+.select2-selection--single {
+  background-color: var(--back-sub) !important;
+  color: var(--text-main) !important;
+}
+.select2-dropdown {
+  background-color: var(--back-main);
+  color: var(--text-main);
+}
+.skin-orange-dark .main-header .navbar .dropdown-menu li a {
+  color: #FFFFFF;
+}
+.skin-orange-dark .main-header .navbar .dropdown-menu li a:hover {
+  background-color: #ff8c00;
+}
+.fixed-table-body thead th .th-inner,
+.skin-orange-dark .sidebar-menu > li.active > a,
+.skin-orange .sidebar-menu > li:hover > a,
+.sidebar-toggle:hover {
+  background-color: var(--header) !important;
+}
+.tab-content,
+.tab-pane {
+  background-color: var(--back-main);
+  color: var(--text-main);
+}
+.table-striped > tbody > tr:nth-of-type(odd) {
+  background-color: var(--back-sub);
+}
+.table-striped > tbody > tr:nth-of-type(even) {
+  background-color: var(--back-sub-alt);
+}
+#webui > div > div > div > div > div > table > tbody > tr > td > a > i.fa,
+.box-body,
+.box-footer,
+.box-header {
+  color: var(--text-main);
+}
+.box-header.with-border {
+  border-bottom: #000;
+}
+#customFieldsTable a[href*='/models'] {
+  background-color: var(--back-sub-alt);
+  color: var(--link);
+}
+#customFieldsTable a[href*='/models']:hover {
+  background-color: var(--text-sub);
+  color: var(--button-hover);
+}
+#customFieldsTable a[href*='/models']:visited {
+  background-color: var(--background);
+  color: var(--visited-link);
+}
+#customFieldsTable a[href*='/fieldsets'] {
+  background-color: transparent;
+}
+.row-striped {
+  vertical-align: top;
+  line-height: 2.6;
+  padding: 0px;
+  margin-left: 20px;
+  box-sizing: border-box;
+  display: table;
+}
+.row-striped .row:nth-of-type(odd) div {
+  background-color: var(--back-sub);
+  color: var(--text-main);
+  border-top: 1px solid #dddddd;
+  display: table-cell;
+}
+.row-striped .row:nth-of-type(even) div {
+  background-color: var(--back-sub);
+  color: var(--text-main);
+  border-top: 1px solid #dddddd;
+  display: table-cell;
+}
+.row-new-striped > .row:nth-of-type(odd) {
+  background-color: var(--back-sub);
+  color: var(--text-main);
+}
+.row-new-striped > .row:nth-of-type(even) {
+  background-color: var(--back-sub-alt);
+  color: var(--text-main);
+}
+.search-highlight,
+.search-highlight:hover {
+  background-color: #e9d15b;
+}
+.table > tbody > tr.warning > td {
+  background-color: var(--back-sub);
+}
+/*
+ * Skin: Purple
+ * ----------
+ */
+.skin-purple .main-header .navbar {
+  background-color: #605ca8;
+}
+.skin-purple .main-header .navbar .nav > li > a {
+  color: #fff;
+}
+.skin-purple .main-header .navbar .nav > li > a:hover,
+.skin-purple .main-header .navbar .nav > li > a:active,
+.skin-purple .main-header .navbar .nav > li > a:focus,
+.skin-purple .main-header .navbar .nav .open > a,
+.skin-purple .main-header .navbar .nav .open > a:hover,
+.skin-purple .main-header .navbar .nav .open > a:focus,
+.skin-purple .main-header .navbar .nav > .active > a {
+  background: rgba(0, 0, 0, 0.1);
+  color: #f6f6f6;
+}
+.skin-purple .main-header .navbar .sidebar-toggle {
+  color: #fff;
+}
+.skin-purple .main-header .navbar .sidebar-toggle:hover {
+  color: #f6f6f6;
+  background: rgba(0, 0, 0, 0.1);
+}
+.skin-purple .main-header .navbar .sidebar-toggle {
+  color: #fff;
+}
+.skin-purple .main-header .navbar .sidebar-toggle:hover {
+  background-color: #555299;
+}
+@media (max-width: 767px) {
+  .skin-purple .main-header .navbar .dropdown-menu li.divider {
+    background-color: rgba(255, 255, 255, 0.1);
+  }
+  .skin-purple .main-header .navbar .dropdown-menu li a {
+    color: #333;
+  }
+  .skin-purple .main-header .navbar .dropdown-menu li a:hover {
+    background: #555299;
+  }
+}
+.skin-purple .main-header li.user-header {
+  background-color: #605ca8;
+}
+.skin-purple .content-header {
+  background: transparent;
+}
+.skin-purple .wrapper,
+.skin-purple .main-sidebar,
+.skin-purple .left-side {
+  background-color: #222d32;
+}
+.skin-purple .user-panel > .info,
+.skin-purple .user-panel > .info > a {
+  color: #fff;
+}
+.skin-purple .sidebar-menu > li.header {
+  color: #4b646f;
+  background: #1a2226;
+}
+.skin-purple .sidebar-menu > li > a {
+  border-left: 3px solid transparent;
+}
+.skin-purple .sidebar-menu > li:hover > a,
+.skin-purple .sidebar-menu > li.active > a {
+  color: #fff;
+  background: #1e282c;
+  border-left-color: #605ca8;
+}
+.skin-purple .sidebar-menu > li > .treeview-menu {
+  margin: 0 1px;
+  background: #2c3b41;
+}
+.skin-purple .sidebar a {
+  color: #b8c7ce;
+}
+.skin-purple .sidebar a:hover {
+  text-decoration: none;
+}
+.skin-purple .treeview-menu > li > a {
+  color: #8aa4af;
+}
+.skin-purple .treeview-menu > li.active > a,
+.skin-purple .treeview-menu > li > a:hover {
+  color: #fff;
+}
+.skin-purple .sidebar-form {
+  border-radius: 3px;
+  border: 1px solid #374850;
+  margin: 10px 10px;
+}
+.skin-purple .sidebar-form input[type="text"],
+.skin-purple .sidebar-form .btn {
+  box-shadow: none;
+  background-color: #374850;
+  border: 1px solid transparent;
+  height: 35px;
+  transition: all 0.3s ease-in-out;
+}
+.skin-purple .sidebar-form input[type="text"] {
+  color: #666;
+  border-top-left-radius: 2px;
+  border-top-right-radius: 0;
+  border-bottom-right-radius: 0;
+  border-bottom-left-radius: 2px;
+}
+.skin-purple .sidebar-form input[type="text"]:focus,
+.skin-purple .sidebar-form input[type="text"]:focus + .input-group-btn .btn {
+  background-color: #fff;
+  color: #666;
+}
+.skin-purple .sidebar-form input[type="text"]:focus + .input-group-btn .btn {
+  border-left-color: #fff;
+}
+.skin-purple .sidebar-form .btn {
+  color: #999;
+  border-top-left-radius: 0;
+  border-top-right-radius: 2px;
+  border-bottom-right-radius: 2px;
+  border-bottom-left-radius: 0;
+}
+.skin-purple.layout-top-nav .main-header > .logo .logo-variant {
+  background-color: none;
+}
+.btn.btn-primary,
+.btn:hover.btn-primary,
+.btn .btn-primary:link,
+.btn:hover .btn-primary:link {
+  background-color: #4c4988;
+  border-color: #3a3767;
+  color: #fff;
+}
+.btna.btn-primary:hover,
+.btn:hovera.btn-primary:hover {
+  background-color: #3a3767;
+  border-color: #3a3767;
+  color: #fff;
+}
+.btn.btn-white:link,
+.btn:hover.btn-white:link {
+  background-color: #4c4988;
+  color: #fff;
+}
+.btn.btn-white:hover,
+.btn:hover.btn-white:hover {
+  background-color: #272546;
+  color: #fff;
+}
+a {
+  color: var(--link);
+}
+a:hover {
+  color: var(--hover-link);
+}
+a:visited {
+  color: var(--visited-link);
+}
+.text-primary {
+  color: #3a3767;
+}
+:root {
+  --button-default: #434078;
+  --button-primary: #302e56;
+  --button-hover: #272546;
+  --header: #605ca8;
+  /* Use same as Header picker */
+  --text-main: #BBB;
+  --text-sub: #9b9b9b;
+  --link: #605ca8;
+  /* Use same as Header picker, lighten by 70% */
+  --visited-link: #918ec3;
+  /* Use same as Header picker, lighten by 70% */
+  --hover-link: #c1c0dd;
+  /* Use same as Header picker, lighten by 70% */
+  --nav-link: #FFF;
+  /* Use same as Header picker */
+  --light-link: #fff;
+  /* Use same as Header picker */
+}
+a.btn-info:link,
+a.btn-warning:link,
+a.btn-danger:link {
+  color: #FFF;
+}
+a.btn-info:visited,
+a.btn-warning:visited,
+a.btn-danger:visited {
+  color: #FFF;
+}
+.fixed-table-container tbody .selected td {
+  background-color: #fff8af;
+}
+.select2-container--default .select2-selection--multiple .select2-selection__choice {
+  background-color: #605ca8;
+}
+.far fa-life-ring {
+  color: var(--link);
+}
+.search-highlight,
+.search-highlight:hover {
+  background-color: #e9d15b;
+}
+/*
+ * Skin: purple dark
+ * ----------
+ */
+.skin-purple-dark .main-header .navbar {
+  background-color: #605ca8;
+}
+.skin-purple-dark .main-header .navbar .nav > li > a {
+  color: #fff;
+}
+.skin-purple-dark .main-header .navbar .nav > li > a:hover,
+.skin-purple-dark .main-header .navbar .nav > li > a:active,
+.skin-purple-dark .main-header .navbar .nav > li > a:focus,
+.skin-purple-dark .main-header .navbar .nav .open > a,
+.skin-purple-dark .main-header .navbar .nav .open > a:hover,
+.skin-purple-dark .main-header .navbar .nav .open > a:focus,
+.skin-purple-dark .main-header .navbar .nav > .active > a {
+  background: rgba(0, 0, 0, 0.1);
+  color: #f6f6f6;
+}
+.skin-purple-dark .main-header .navbar .sidebar-toggle {
+  color: #fff;
+}
+.skin-purple-dark .main-header .navbar .sidebar-toggle:hover {
+  color: #f6f6f6;
+  background: rgba(0, 0, 0, 0.1);
+}
+.skin-purple-dark .main-header .navbar .sidebar-toggle {
+  color: #fff;
+}
+.skin-purple-dark .main-header .navbar .sidebar-toggle:hover {
+  background-color: #555299;
+}
+@media (max-width: 767px) {
+  .skin-purple-dark .main-header .navbar .dropdown-menu li.divider {
+    background-color: rgba(255, 255, 255, 0.1);
+    color: #fff;
+  }
+  .skin-purple-dark .main-header .navbar .dropdown-menu li a {
+    color: #fff;
+  }
+  .skin-purple-dark .main-header .navbar .dropdown-menu li a:hover {
+    background: #555299;
+    color: #fff;
+  }
+}
+.skin-purple-dark .main-header li.user-header {
+  background-color: #605ca8;
+}
+.skin-purple-dark .content-header {
+  background: transparent;
+}
+.skin-purple-dark .wrapper,
+.skin-purple-dark .main-sidebar,
+.skin-purple-dark .left-side {
+  background-color: #222d32;
+}
+.skin-purple-dark .user-panel > .info,
+.skin-purple-dark .user-panel > .info > a {
+  color: #fff;
+}
+.skin-purple-dark .sidebar-menu > li.header {
+  color: #4b646f;
+  background: #1a2226;
+}
+.skin-purple-dark .sidebar-menu > li > a {
+  border-left: 3px solid transparent;
+}
+.skin-purple-dark .sidebar-menu > li:hover > a,
+.skin-purple-dark .sidebar-menu > li.active > a {
+  color: #fff;
+  background: #1e282c;
+  border-left-color: #605ca8;
+}
+.skin-purple-dark .sidebar-menu > li > .treeview-menu {
+  margin: 0 1px;
+  background: #2c3b41;
+}
+.skin-purple-dark .sidebar a {
+  color: #b8c7ce;
+}
+.skin-purple-dark .sidebar a:hover {
+  text-decoration: none;
+}
+.skin-purple-dark .treeview-menu > li > a {
+  color: #8aa4af;
+}
+.skin-purple-dark .treeview-menu > li.active > a,
+.skin-purple-dark .treeview-menu > li > a:hover {
+  color: #fff;
+}
+.skin-purple-dark .sidebar-form {
+  border-radius: 3px;
+  border: 1px solid #374850;
+  margin: 10px 10px;
+}
+.skin-purple-dark .sidebar-form input[type="text"],
+.skin-purple-dark .sidebar-form .btn {
+  box-shadow: none;
+  background-color: #374850;
+  border: 1px solid transparent;
+  height: 35px;
+  transition: all 0.3s ease-in-out;
+}
+.skin-purple-dark .sidebar-form input[type="text"] {
+  color: #666;
+  border-top-left-radius: 2px;
+  border-top-right-radius: 0;
+  border-bottom-right-radius: 0;
+  border-bottom-left-radius: 2px;
+}
+.skin-purple-dark .sidebar-form input[type="text"]:focus,
+.skin-purple-dark .sidebar-form input[type="text"]:focus + .input-group-btn .btn {
+  background-color: #fff;
+  color: #666;
+}
+.skin-purple-dark .sidebar-form input[type="text"]:focus + .input-group-btn .btn {
+  border-left-color: #fff;
+}
+.skin-purple-dark .sidebar-form .btn {
+  color: #999;
+  border-top-left-radius: 0;
+  border-top-right-radius: 2px;
+  border-bottom-right-radius: 2px;
+  border-bottom-left-radius: 0;
+}
+.skin-purple-dark.layout-top-nav .main-header > .logo .logo-variant {
+  background-color: none;
+}
+.btn,
+.btn:hover {
+  color: #fff !important;
+}
+.btn.btn-primary,
+.btn:hover.btn-primary,
+.btn .btn-primary:link,
+.btn:hover .btn-primary:link {
+  background-color: #4c4988;
+  border-color: #FFF;
+  color: #fff;
+}
+.btna.btn-primary:hover,
+.btn:hovera.btn-primary:hover {
+  background-color: #3a3767;
+  border-color: #3a3767;
+  color: #fff;
+}
+.btn.btn-white:link,
+.btn:hover.btn-white:link {
+  background-color: #4c4988;
+  color: #fff;
+}
+.btn.btn-white:hover,
+.btn:hover.btn-white:hover {
+  background-color: #272546;
+  color: #fff;
+}
+/**
+The dropdown is white, so use a darker color
+ */
+li.dropdown-item-marker {
+  color: var(--button-primary);
+}
+a:hover {
+  color: var(--hover-link);
+}
+a:visited {
+  color: var(--visited-link);
+}
+.text-primary {
+  color: #fff;
+}
+#sort tr.cansort {
+  background-color: var(--back-main);
+  color: var(--text-main);
+}
+:root {
+  --background: #222;
+  --back-main: #333;
+  --back-sub: #080808;
+  --back-sub-alt: rgba(0, 0, 0, 0.36);
+  --button-default: #434078;
+  --button-primary: #302e56;
+  --button-hover: #272546;
+  --header: #605ca8;
+  /* Use same as Header picker */
+  --text-main: #BBB;
+  --text-sub: #9b9b9b;
+  --link: #AC83FF;
+  /* Use same as Header picker, lighten by 70% */
+  --visited-link: #dfd0ff;
+  /* Use same as Header picker, lighten by 70% */
+  --hover-link: #ffffff;
+  /* Use same as Header picker, lighten by 70% */
+  --nav-link: #FFF;
+  /* Use same as Header picker */
+  --light-link: #fff;
+  /* Use same as Header picker */
+}
+#ldapad_test_results.well.well-sm {
+  color: var(--back-main);
+}
+.pagination > li > a {
+  color: var(--light-link);
+  background-color: var(--back-main);
+}
+.pagination > .active > a {
+  background-color: var(--button-default);
+  border-color: var(--light-link);
+}
+.pagination > .active > a:hover {
+  background-color: var(--hover-link);
+}
+.tasks-menu > .dropdown-menu > li .menu {
+  background-color: var(--back-main);
+}
+.tasks-menu > .dropdown-menu > li .menu > li > a:hover .progress {
+  background-color: var(--background);
+}
+h2.task_menu {
+  color: var(--link);
+}
+.navbar-custom-menu > .navbar-nav > li > .dropdown-menu {
+  background-color: var(--back-main);
+  color: var(--link);
+}
+.main-header .navbar,
+.main-header .logo {
+  background-color: var(--header);
+  background: linear-gradient(to bottom, var(--header) 0%, var(--header) 100%);
+  border-color: var(--header);
+}
+.bootstrap-table .fixed-table-container .table thead th .sortable {
+  color: var(--nav-link);
+}
+.bootstrap-table .fixed-table-toolbar .columns label {
+  color: #000;
+}
+.thead,
+.navbar-nav > li > a:link {
+  color: var(--nav-link);
+}
+.label-default {
+  background-color: var(--back-sub);
+  color: #fff;
+}
+.modal-content {
+  background-color: var(--back-main);
+  color: var(--text-main);
+}
+a:link {
+  color: var(--link);
+}
+.far fa-life-ring {
+  color: var(--link);
+}
+.btn-primary.hover {
+  color: var(--nav-link);
+}
+.small-box h3,
+.small-box p {
+  color: var(--nav-link) !important;
+}
+.small-box h3 a:hover,
+.small-box p a:hover {
+  text-decoration: none;
+  color: var(--nav-link) !important;
+}
+a:link.btn-default {
+  color: var(--nav-link);
+}
+#accessoriesTable > tbody > tr > td > nobr > a > i.fa {
+  color: var(--text-main);
+}
+#assetsListingTable > tbody > tr > td > nobr > a > i.fa {
+  color: var(--text-main);
+}
+#assetsListingTable > tbody > tr.selected > td {
+  background-color: var(--back-main);
+}
+body {
+  color: var(--text-main);
+}
+.box,
+.box.box-default {
+  border-top: 3px solid var(--header);
+  border-top-color: var(--header);
+}
+.box-body,
+.box-footer,
+.box-header {
+  background-color: var(--back-sub);
+  color: var(--header);
+}
+.btn-default {
+  background-color: var(--button-default);
+  color: var(--nav-link);
+}
+.btn-default dropdown-toggle {
+  background-color: var(--button-default);
+  color: var(--nav-link);
+}
+.btn-default:active,
+.btn-default:focus,
+.btn-default:hover,
+.btn-default.active {
+  background-color: var(--button-hover);
+  color: var(--nav-link);
+}
+.btn-primary,
+.btn-primary.hover,
+.btn-primary:active,
+.text-purple {
+  color: var(--nav-link) !important;
+}
+.btn-primary:hover {
+  background-color: var(--button-primary);
+}
+#componentsTable > tbody > tr > td > nobr > a > i.fa {
+  color: var(--text-main);
+}
+#consumablesTable > tbody > tr > td > nobr > a > i.fa {
+  color: var(--text-main);
+}
+.content-wrapper {
+  background-color: var(--background);
+}
+#create-form > div > div > div > span > i.fa {
+  background-color: var(--back-sub);
+  color: var(--header);
+}
+.datepicker .datepicker-switch:hover,
+.datepicker .next:hover,
+.datepicker .prev:hover,
+.datepicker tfoot tr th:hover,
+.datepicker table tr td.day.focused,
+.datepicker table tr td.day:hover {
+  background-color: var(--header);
+}
+.datepicker.dropdown-menu {
+  background-color: var(--back-main);
+  color: var(--text-main);
+}
+#details > div > div > div > table {
+  background-color: transparent;
+}
+.dropdown-menu > li > a:hover {
+  background-color: var(--back-main);
+  color: var(--nav-link);
+}
+.fixed-table-body thead th .th-inner {
+  color: var(--nav-link);
+}
+.form-control {
+  background-color: var(--back-main);
+  color: var(--text-main);
+}
+.form-control[disabled],
+.form-control[readonly],
+fieldset[disabled] .form-control {
+  background-color: var(--back-main);
+  color: var(--text-main);
+}
+h1,
+h2,
+h3,
+h4,
+h5,
+h6,
+p {
+  color: var(--text-main);
+}
+.help-block {
+  color: var(--text-sub);
+}
+input[type=text],
+input[type=search] {
+  background-color: var(--back-sub);
+  color: var(--text-main);
+}
+#licensesTable > tbody > tr > td > nobr > a > i.fa {
+  color: var(--text-main);
+}
+.main-footer {
+  background-color: var(--back-main);
+  color: var(--text-main);
+}
+.nav-tabs-custom > .nav-tabs > li > a,
+.nav-tabs-custom > .nav-tabs > li.active > a {
+  color: var(--text-main);
+}
+.nav-tabs-custom > .nav-tabs > li.active {
+  border-top-color: var(--header);
+}
+.nav-tabs-custom > .nav-tabs > li.active > a {
+  background-color: var(--back-main);
+}
+.nav-tabs-custom > .nav-tabs > li.active > a:hover {
+  background-color: var(--back-sub);
+  color: var(--text-main);
+}
+.nav-tabs-custom,
+.nav-tabs-custom > .tab-content {
+  background-color: var(--back-main);
+}
+.navbar-nav > .tasks-menu > .dropdown-menu > li.header {
+  background-color: var(--back-main);
+  color: var(--link);
+}
+.open > .dropdown-toggle.btn-default {
+  background-color: var(--back-sub);
+  color: var(--header);
+}
+.panel {
+  background-color: var(--back-sub);
+  color: var(--text-main);
+}
+.panel-default > .panel-heading {
+  background-color: var(--back-main);
+  color: var(--header);
+}
+.select2-container--default .select2-results__option[aria-selected=true],
+.select2-container--default .select2-results__option[aria-selected=true]:hover {
+  background-color: var(--back-sub);
+  color: var(--header);
+}
+.select2-container--default .select2-results__option--highlighted[aria-selected] {
+  background-color: var(--header);
+  color: var(--back-main);
+}
+.select2-container--default .select2-selection--single .select2-selection__rendered {
+  color: var(--text-main);
+}
+.select2-container--default .select2-selection--multiple .select2-selection__choice {
+  background-color: var(--header);
+}
+.select2-selection--single {
+  background-color: var(--back-sub) !important;
+  color: var(--text-main) !important;
+}
+.select2-dropdown {
+  background-color: var(--back-main);
+  color: var(--text-main);
+}
+.skin-purple-dark .main-header .navbar .dropdown-menu li a {
+  color: #FFFFFF;
+}
+.skin-purple-dark .main-header .navbar .dropdown-menu li a:hover {
+  background-color: #5f5ca8;
+}
+.fixed-table-body thead th .th-inner,
+.skin-purple-dark .sidebar-menu > li.active > a,
+.skin-purple .sidebar-menu > li:hover > a,
+.sidebar-toggle:hover {
+  background-color: var(--header) !important;
+}
+.tab-content,
+.tab-pane {
+  background-color: var(--back-main);
+  color: var(--text-main);
+}
+.table-striped > tbody > tr:nth-of-type(odd) {
+  background-color: var(--back-sub);
+}
+.table-striped > tbody > tr:nth-of-type(even) {
+  background-color: var(--back-sub-alt);
+}
+#webui > div > div > div > div > div > table > tbody > tr > td > a > i.fa,
+.box-body,
+.box-footer,
+.box-header {
+  color: var(--text-main);
+}
+.box-header.with-border {
+  border-bottom: #000;
+}
+a {
+  color: var(--link);
+}
+a:link {
+  color: var(--link);
+}
+a:hover {
+  color: var(--hover-link);
+  text-decoration: underline;
+}
+a:visited {
+  color: var(--visited-link);
+}
+.row-striped {
+  vertical-align: top;
+  line-height: 2.6;
+  padding: 0px;
+  margin-left: 20px;
+  box-sizing: border-box;
+  display: table;
+}
+#customFieldsTable a[href*='/models'] {
+  background-color: var(--back-sub-alt);
+  color: var(--link);
+}
+#customFieldsTable a[href*='/models']:hover {
+  background-color: var(--text-sub);
+  color: var(--button-hover);
+}
+#customFieldsTable a[href*='/models']:visited {
+  background-color: var(--back-sub);
+  color: var(--visited-link);
+}
+.row-striped .row:nth-of-type(odd) div {
+  background-color: var(--back-sub);
+  color: var(--text-main);
+  border-top: 1px solid #dddddd;
+  display: table-cell;
+}
+.row-striped .row:nth-of-type(even) div {
+  background-color: var(--back-sub);
+  color: var(--text-main);
+  border-top: 1px solid #dddddd;
+  display: table-cell;
+}
+.row-new-striped > .row:nth-of-type(odd) {
+  background-color: var(--back-sub);
+  color: var(--text-main);
+}
+.row-new-striped > .row:nth-of-type(even) {
+  background-color: var(--back-sub-alt);
+  color: var(--text-main);
+}
+.search-highlight,
+.search-highlight:hover {
+  background-color: #e9d15b;
+}
+.table > tbody > tr.warning > td {
+  background-color: var(--back-sub);
+}
+/*
+ * Skin: Red
+ * ----------
+ */
+.skin-red .main-header .navbar {
+  background-color: #dd4b39;
+}
+.skin-red .main-header .navbar .nav > li > a {
+  color: #fff;
+}
+.skin-red .main-header .navbar .nav > li > a:hover,
+.skin-red .main-header .navbar .nav > li > a:active,
+.skin-red .main-header .navbar .nav > li > a:focus,
+.skin-red .main-header .navbar .nav .open > a,
+.skin-red .main-header .navbar .nav .open > a:hover,
+.skin-red .main-header .navbar .nav .open > a:focus,
+.skin-red .main-header .navbar .nav > .active > a {
+  background: rgba(0, 0, 0, 0.1);
+  color: #f6f6f6;
+}
+.skin-red .main-header .navbar .sidebar-toggle {
+  color: #fff;
+}
+.skin-red .main-header .navbar .sidebar-toggle:hover {
+  color: #f6f6f6;
+  background: rgba(0, 0, 0, 0.1);
+}
+.skin-red .main-header .navbar .sidebar-toggle {
+  color: #fff;
+}
+.skin-red .main-header .navbar .sidebar-toggle:hover {
+  background-color: #d73925;
+}
+@media (max-width: 767px) {
+  .skin-red .main-header .navbar .dropdown-menu li.divider {
+    background-color: rgba(255, 255, 255, 0.1);
+  }
+  .skin-red .main-header .navbar .dropdown-menu li a {
+    color: #333;
+  }
+  .skin-red .main-header .navbar .dropdown-menu li a:hover {
+    background: #d73925;
+  }
+}
+.skin-red .main-header li.user-header {
+  background-color: #dd4b39;
+}
+.skin-red .content-header {
+  background: transparent;
+}
+.skin-red .wrapper,
+.skin-red .main-sidebar,
+.skin-red .left-side {
+  background-color: #222d32;
+}
+.skin-red .user-panel > .info,
+.skin-red .user-panel > .info > a {
+  color: #fff;
+}
+.skin-red .sidebar-menu > li.header {
+  color: #4b646f;
+  background: #1a2226;
+}
+.skin-red .sidebar-menu > li > a {
+  border-left: 3px solid transparent;
+}
+.skin-red .sidebar-menu > li:hover > a,
+.skin-red .sidebar-menu > li.active > a {
+  color: #fff;
+  background: #1e282c;
+  border-left-color: #dd4b39;
+}
+.skin-red .sidebar-menu > li > .treeview-menu {
+  margin: 0 1px;
+  background: #2c3b41;
+}
+.skin-red .sidebar a {
+  color: #b8c7ce;
+}
+.skin-red .sidebar a:hover {
+  text-decoration: none;
+}
+.skin-red .treeview-menu > li > a {
+  color: #8aa4af;
+}
+.skin-red .treeview-menu > li.active > a,
+.skin-red .treeview-menu > li > a:hover {
+  color: #fff;
+}
+.skin-red .sidebar-form {
+  border-radius: 3px;
+  border: 1px solid #374850;
+  margin: 10px 10px;
+}
+.skin-red .sidebar-form input[type="text"],
+.skin-red .sidebar-form .btn {
+  box-shadow: none;
+  background-color: #374850;
+  border: 1px solid transparent;
+  height: 35px;
+  transition: all 0.3s ease-in-out;
+}
+.skin-red .sidebar-form input[type="text"] {
+  color: #666;
+  border-top-left-radius: 2px;
+  border-top-right-radius: 0;
+  border-bottom-right-radius: 0;
+  border-bottom-left-radius: 2px;
+}
+.skin-red .sidebar-form input[type="text"]:focus,
+.skin-red .sidebar-form input[type="text"]:focus + .input-group-btn .btn {
+  background-color: #fff;
+  color: #666;
+}
+.skin-red .sidebar-form input[type="text"]:focus + .input-group-btn .btn {
+  border-left-color: #fff;
+}
+.skin-red .sidebar-form .btn {
+  color: #999;
+  border-top-left-radius: 0;
+  border-top-right-radius: 2px;
+  border-bottom-right-radius: 2px;
+  border-bottom-left-radius: 0;
+}
+.skin-red.layout-top-nav .main-header > .logo .logo-variant {
+  background-color: none;
+}
+.btn.btn-primary,
+.btn:hover.btn-primary,
+.btn .btn-primary:link,
+.btn:hover .btn-primary:link {
+  background-color: #c23321;
+  border-color: #96271a;
+  color: #fff;
+}
+.btna.btn-primary:hover,
+.btn:hovera.btn-primary:hover {
+  background-color: #96271a;
+  border-color: #96271a;
+  color: #fff;
+}
+.btn.btn-white:link,
+.btn:hover.btn-white:link {
+  background-color: #c23321;
+  color: #fff;
+}
+.btn.btn-white:hover,
+.btn:hover.btn-white:hover {
+  background-color: #6b1c12;
+  color: #fff;
+}
+a {
+  color: #dd4b39;
+}
+a:hover {
+  color: #96271a;
+}
+a:visited {
+  color: #dd4b39;
+}
+.text-primary {
+  color: #96271a;
+}
+:root {
+  --button-default: #ac2d1e;
+  --button-primary: #802216;
+  --button-hover: #6b1c12;
+  --header: #dd4b39;
+  /* Use same as Header picker */
+  --text-main: #BBB;
+  --text-alt: #222;
+  --text-sub: #9b9b9b;
+  --link: #dd4b39;
+  /* Use same as Header picker, lighten by 70% */
+  --visited-link: #e8867a;
+  /* Use same as Header picker, lighten by 70% */
+  --hover-link: #f3c2bc;
+  /* Use same as Header picker, lighten by 70% */
+  --nav-link: #FFF;
+  /* Use same as Header picker */
+  --light-link: #fff;
+  /* Use same as Header picker */
+}
+a:link {
+  color: var(--link);
+}
+a:visited {
+  color: var(--visited-link);
+}
+a.btn-info:link,
+a.btn-warning:link,
+a.btn-danger:link {
+  color: #FFF;
+}
+a.btn-info:visited,
+a.btn-warning:visited,
+a.btn-danger:visited {
+  color: #FFF;
+}
+.fixed-table-container tbody .selected td {
+  background-color: #fff8af;
+}
+.select2-container--default .select2-selection--multiple .select2-selection__choice {
+  background-color: #dd4b39;
+}
+.search-highlight,
+.search-highlight:hover {
+  background-color: #e9d15b;
+}
+.far fa-life-ring {
+  color: var(--link);
+}
+/*
+ * Skin: red dark
+ * ----------
+ */
+.skin-red-dark .main-header .navbar {
+  background-color: #dd4b39;
+}
+.skin-red-dark .main-header .navbar .nav > li > a {
+  color: #fff;
+}
+.skin-red-dark .main-header .navbar .nav > li > a:hover,
+.skin-red-dark .main-header .navbar .nav > li > a:active,
+.skin-red-dark .main-header .navbar .nav > li > a:focus,
+.skin-red-dark .main-header .navbar .nav .open > a,
+.skin-red-dark .main-header .navbar .nav .open > a:hover,
+.skin-red-dark .main-header .navbar .nav .open > a:focus,
+.skin-red-dark .main-header .navbar .nav > .active > a {
+  background: rgba(0, 0, 0, 0.1);
+  color: #f6f6f6;
+}
+.skin-red-dark .main-header .navbar .sidebar-toggle {
+  color: #fff;
+}
+.skin-red-dark .main-header .navbar .sidebar-toggle:hover {
+  color: #f6f6f6;
+  background: rgba(0, 0, 0, 0.1);
+}
+.skin-red-dark .main-header .navbar .sidebar-toggle {
+  color: #fff;
+}
+.skin-red-dark .main-header .navbar .sidebar-toggle:hover {
+  background-color: #d73925;
+}
+@media (max-width: 767px) {
+  .skin-red-dark .main-header .navbar .dropdown-menu li.divider {
+    background-color: rgba(255, 255, 255, 0.1);
+    color: #fff;
+  }
+  .skin-red-dark .main-header .navbar .dropdown-menu li a {
+    color: #fff;
+  }
+  .skin-red-dark .main-header .navbar .dropdown-menu li a:hover {
+    background: #d73925;
+    color: #fff;
+  }
+}
+.skin-red-dark .main-header li.user-header {
+  background-color: #dd4b39;
+}
+.skin-red-dark .content-header {
+  background: transparent;
+}
+.skin-red-dark .wrapper,
+.skin-red-dark .main-sidebar,
+.skin-red-dark .left-side {
+  background-color: #222d32;
+}
+.skin-red-dark .user-panel > .info,
+.skin-red-dark .user-panel > .info > a {
+  color: #fff;
+}
+.skin-red-dark .sidebar-menu > li.header {
+  color: #4b646f;
+  background: #1a2226;
+}
+.skin-red-dark .sidebar-menu > li > a {
+  border-left: 3px solid transparent;
+}
+.skin-red-dark .sidebar-menu > li:hover > a,
+.skin-red-dark .sidebar-menu > li.active > a {
+  color: #fff;
+  background: #1e282c;
+  border-left-color: #dd4b39;
+}
+.skin-red-dark .sidebar-menu > li > .treeview-menu {
+  margin: 0 1px;
+  background: #2c3b41;
+}
+.skin-red-dark .sidebar a {
+  color: #b8c7ce;
+}
+.skin-red-dark .sidebar a:hover {
+  text-decoration: none;
+}
+.skin-red-dark .treeview-menu > li > a {
+  color: #8aa4af;
+}
+.skin-red-dark .treeview-menu > li.active > a,
+.skin-red-dark .treeview-menu > li > a:hover {
+  color: #fff;
+}
+.skin-red-dark .sidebar-form {
+  border-radius: 3px;
+  border: 1px solid #374850;
+  margin: 10px 10px;
+}
+.skin-red-dark .sidebar-form input[type="text"],
+.skin-red-dark .sidebar-form .btn {
+  box-shadow: none;
+  background-color: #374850;
+  border: 1px solid transparent;
+  height: 35px;
+  transition: all 0.3s ease-in-out;
+}
+.skin-red-dark .sidebar-form input[type="text"] {
+  color: #666;
+  border-top-left-radius: 2px;
+  border-top-right-radius: 0;
+  border-bottom-right-radius: 0;
+  border-bottom-left-radius: 2px;
+}
+.skin-red-dark .sidebar-form input[type="text"]:focus,
+.skin-red-dark .sidebar-form input[type="text"]:focus + .input-group-btn .btn {
+  background-color: #fff;
+  color: #666;
+}
+.skin-red-dark .sidebar-form input[type="text"]:focus + .input-group-btn .btn {
+  border-left-color: #fff;
+}
+.skin-red-dark .sidebar-form .btn {
+  color: #999;
+  border-top-left-radius: 0;
+  border-top-right-radius: 2px;
+  border-bottom-right-radius: 2px;
+  border-bottom-left-radius: 0;
+}
+.skin-red-dark.layout-top-nav .main-header > .logo .logo-variant {
+  background-color: none;
+}
+.btn,
+.btn:hover {
+  color: #fff;
+}
+.btn.btn-primary,
+.btn:hover.btn-primary,
+.btn .btn-primary:link,
+.btn:hover .btn-primary:link {
+  background-color: #c23321;
+  border-color: #FFF;
+  color: #fff;
+}
+.btna.btn-primary:hover,
+.btn:hovera.btn-primary:hover {
+  background-color: #96271a;
+  border-color: #96271a;
+  color: #fff;
+}
+.btn.btn-white:link,
+.btn:hover.btn-white:link {
+  background-color: #c23321;
+  color: #fff;
+}
+.btn.btn-white:hover,
+.btn:hover.btn-white:hover {
+  background-color: #6b1c12;
+  color: #fff;
+}
+/**
+The dropdown is white, so use a darker color
+ */
+li.dropdown-item-marker {
+  color: var(--button-primary);
+}
+a:hover {
+  color: #fff;
+}
+a:visited {
+  color: #fff;
+}
+.text-primary {
+  color: #fff;
+}
+#sort tr.cansort {
+  background-color: var(--back-main);
+  color: var(--text-main);
+}
+:root {
+  --background: #222;
+  --back-main: #333;
+  --back-sub: #3d4144;
+  --back-sub-alt: rgba(0, 0, 0, 0.36);
+  --button-default: #ac2d1e;
+  --button-primary: #802216;
+  --button-hover: #6b1c12;
+  --header: #dd4b39;
+  /* Use same as Header picker */
+  --text-main: #BBB;
+  --text-alt: #222;
+  --text-sub: #9b9b9b;
+  --link: #e00000;
+  /* Use same as Header picker, lighten by 70% */
+  --visited-link: #D24D57;
+  /* Use same as Header picker, lighten by 70% */
+  --hover-link: #D24D57;
+  /* Use same as Header picker, lighten by 70% */
+  --nav-link: #FFF;
+  /* Use same as Header picker */
+  --light-link: #fff;
+  /* Use same as Header picker */
+}
+#ldapad_test_results.well.well-sm {
+  color: var(--back-main);
+}
+.pagination > li > a {
+  color: var(--light-link);
+  background-color: var(--back-main);
+}
+.pagination > .active > a {
+  background-color: var(--visited-link);
+  border-color: var(--light-link);
+}
+.pagination > .active > a:hover {
+  background-color: var(--hover-link);
+}
+.tasks-menu > .dropdown-menu > li .menu {
+  background-color: var(--back-main);
+}
+.tasks-menu > .dropdown-menu > li .menu > li > a:hover .progress {
+  background-color: var(--background);
+}
+h2.task_menu {
+  color: var(--link);
+}
+.navbar-custom-menu > .navbar-nav > li > .dropdown-menu {
+  background-color: var(--back-main);
+  color: var(--link);
+}
+.main-header .navbar,
+.main-header .logo {
+  background-color: var(--header);
+  background: linear-gradient(to bottom, var(--header) 0%, var(--header) 100%);
+  border-color: var(--header);
+}
+.bootstrap-table .fixed-table-container .table thead th .sortable {
+  color: var(--nav-link);
+}
+.bootstrap-table .fixed-table-toolbar .columns label {
+  color: #000;
+}
+.thead,
+.navbar-nav > li > a:link {
+  color: var(--nav-link);
+}
+.modal-content {
+  background-color: var(--back-main);
+  color: var(--text-main);
+}
+a:link {
+  color: var(--link);
+}
+a:hover {
+  color: var(--hover-link);
+}
+a:visited {
+  color: var(--nav-link);
+}
+.far fa-life-ring {
+  color: var(--link);
+}
+.btn-primary.hover {
+  color: var(--nav-link);
+}
+.small-box h3,
+.small-box p {
+  color: var(--nav-link) !important;
+}
+.small-box h3 a:hover,
+.small-box p a:hover {
+  text-decoration: none;
+  color: var(--nav-link) !important;
+}
+#accessoriesTable > tbody > tr > td > nobr > a > i.fa {
+  color: var(--text-main);
+}
+#assetsListingTable > tbody > tr > td > nobr > a > i.fa {
+  color: var(--text-main);
+}
+#assetsListingTable > tbody > tr.selected > td {
+  background-color: var(--back-main);
+}
+body {
+  color: var(--text-main);
+}
+.box,
+.box.box-default {
+  border-top: 3px solid var(--header);
+  border-top-color: var(--header);
+}
+.box-body,
+.box-footer,
+.box-header {
+  background-color: var(--back-sub);
+  color: var(--header);
+}
+.btn-default {
+  background-color: var(--back-sub);
+}
+.btn-default dropdown-toggle {
+  background-color: var(--button-default);
+  color: var(--link);
+}
+.btn-default:active,
+.btn-default:focus,
+.btn-default:hover,
+.btn-default.active {
+  background-color: var(--button-hover);
+  color: var(--link);
+}
+.btn-primary,
+.btn-primary.hover,
+.btn-primary:active,
+.text-red {
+  color: var(--button-primary);
+}
+.btn-primary:hover {
+  background-color: var(--button-primary);
+}
+#componentsTable > tbody > tr > td > nobr > a > i.fa {
+  color: var(--text-main);
+}
+#consumablesTable > tbody > tr > td > nobr > a > i.fa {
+  color: var(--text-main);
+}
+.content-wrapper {
+  background-color: var(--background);
+}
+#create-form > div > div > div > span > i.fa {
+  background-color: var(--back-sub);
+  color: var(--header);
+}
+.datepicker .datepicker-switch:hover,
+.datepicker .next:hover,
+.datepicker .prev:hover,
+.datepicker tfoot tr th:hover,
+.datepicker table tr td.day.focused,
+.datepicker table tr td.day:hover {
+  background-color: var(--header);
+}
+.datepicker.dropdown-menu {
+  background-color: var(--back-main);
+  color: var(--text-main);
+}
+#details > div > div > div > table {
+  background-color: transparent;
+}
+.dropdown-menu > li > a:hover {
+  background-color: var(--back-main);
+  color: var(--nav-link);
+}
+.fixed-table-body thead th .th-inner {
+  color: var(--nav-link);
+}
+.form-control {
+  background-color: var(--back-main);
+  color: var(--text-main);
+}
+.form-control[disabled],
+.form-control[readonly],
+fieldset[disabled] .form-control {
+  background-color: var(--back-main);
+  color: var(--text-main);
+}
+h1,
+h2,
+h3,
+h4,
+h5,
+h6,
+p {
+  color: var(--text-main);
+}
+.help-block {
+  color: var(--text-sub);
+}
+input[type=text],
+input[type=search] {
+  background-color: var(--back-sub);
+  color: var(--text-main);
+}
+#licensesTable > tbody > tr > td > nobr > a > i.fa {
+  color: var(--text-main);
+}
+.main-footer {
+  background-color: var(--back-main);
+  color: var(--text-main);
+}
+.nav-tabs-custom > .nav-tabs > li > a,
+.nav-tabs-custom > .nav-tabs > li.active > a {
+  color: var(--text-main);
+}
+.nav-tabs-custom > .nav-tabs > li.active {
+  border-top-color: var(--header);
+}
+.nav-tabs-custom > .nav-tabs > li.active > a {
+  background-color: var(--back-main);
+}
+.nav-tabs-custom > .nav-tabs > li.active > a:hover {
+  background-color: var(--back-sub);
+  color: var(--text-main);
+}
+.nav-tabs-custom,
+.nav-tabs-custom > .tab-content {
+  background-color: var(--back-main);
+}
+.navbar-nav > .tasks-menu > .dropdown-menu > li.header {
+  background-color: var(--back-main);
+  color: var(--header);
+}
+.open > .dropdown-toggle.btn-default {
+  background-color: var(--back-sub);
+  color: var(--header);
+}
+.panel {
+  background-color: var(--back-sub);
+  color: var(--text-main);
+}
+.panel-default > .panel-heading {
+  background-color: var(--back-main);
+  color: var(--header);
+}
+.select2-container--default .select2-results__option[aria-selected=true],
+.select2-container--default .select2-results__option[aria-selected=true]:hover {
+  background-color: var(--back-sub);
+  color: var(--header);
+}
+.select2-container--default .select2-results__option--highlighted[aria-selected] {
+  background-color: var(--header);
+  color: var(--back-main);
+}
+.select2-container--default .select2-selection--single .select2-selection__rendered {
+  color: var(--text-main);
+}
+.select2-container--default .select2-selection--multiple .select2-selection__choice {
+  background-color: var(--header);
+}
+.select2-selection--single {
+  background-color: var(--back-sub) !important;
+  color: var(--text-main) !important;
+}
+.select2-dropdown {
+  background-color: var(--back-main);
+  color: var(--text-main);
+}
+.skin-red-dark .main-header .navbar .dropdown-menu li a {
+  color: #FFFFFF;
+}
+.skin-red-dark .main-header .navbar .dropdown-menu li a:hover {
+  background-color: #c23320;
+}
+.fixed-table-body thead th .th-inner,
+.skin-red-dark .sidebar-menu > li.active > a,
+.skin-red .sidebar-menu > li:hover > a,
+.sidebar-toggle:hover {
+  background-color: var(--header) !important;
+}
+.tab-content,
+.tab-pane {
+  background-color: var(--back-main);
+  color: var(--text-main);
+}
+.table-striped > tbody > tr:nth-of-type(odd) {
+  background-color: var(--back-sub);
+}
+.table-striped > tbody > tr:nth-of-type(even) {
+  background-color: var(--back-sub-alt);
+}
+#webui > div > div > div > div > div > table > tbody > tr > td > a > i.fa,
+.box-body,
+.box-footer,
+.box-header {
+  color: var(--text-main);
+}
+.box-header.with-border {
+  border-bottom: #000;
+}
+#upload-table tbody > tr.warning > td,
+#upload-table h3,
+#upload-table p {
+  background-color: #fcf8e3;
+  color: #000;
+}
+a {
+  color: var(--link);
+}
+a:link {
+  color: var(--nav-link);
+}
+a:hover {
+  color: var(--nav-link);
+  text-decoration: underline;
+}
+a:visited {
+  color: var(--nav-link);
+}
+#customFieldsTable a[href*='/models'] {
+  background-color: var(--back-sub-alt);
+  color: var(--link);
+}
+#customFieldsTable a[href*='/models']:hover {
+  background-color: var(--text-sub);
+  color: var(--button-hover);
+}
+#customFieldsTable a[href*='/models']:visited {
+  background-color: var(--back-sub);
+  color: var(--visited-link);
+}
+#customFieldsTable a[href*='/fieldsets'] {
+  background-color: transparent;
+}
+.row-striped {
+  vertical-align: top;
+  line-height: 2.6;
+  padding: 0px;
+  margin-left: 20px;
+  box-sizing: border-box;
+  display: table;
+}
+.row-striped .row:nth-of-type(odd) div {
+  background-color: var(--back-sub);
+  color: var(--text-main);
+  border-top: 1px solid #dddddd;
+  display: table-cell;
+}
+.row-striped .row:nth-of-type(even) div {
+  background-color: var(--back-sub);
+  color: var(--text-main);
+  border-top: 1px solid #dddddd;
+  display: table-cell;
+}
+.row-new-striped > .row:nth-of-type(odd) {
+  background-color: var(--back-sub);
+  color: var(--text-main);
+}
+.row-new-striped > .row:nth-of-type(even) {
+  background-color: var(--back-sub-alt);
+  color: var(--text-main);
+}
+.search-highlight,
+.search-highlight:hover {
+  background-color: #e9d15b;
+}
+.table > tbody > tr.warning > td {
+  background-color: var(--back-sub);
+}
+/*
+ * Skin: Orange
+ * ----------
+ */
+.skin-orange .main-header .navbar {
+  background-color: #FF8C00;
+}
+.skin-orange .main-header .navbar .nav > li > a {
+  color: #fff;
+}
+.skin-orange .main-header .navbar .nav > li > a:hover,
+.skin-orange .main-header .navbar .nav > li > a:active,
+.skin-orange .main-header .navbar .nav > li > a:focus,
+.skin-orange .main-header .navbar .nav .open > a,
+.skin-orange .main-header .navbar .nav .open > a:hover,
+.skin-orange .main-header .navbar .nav .open > a:focus,
+.skin-orange .main-header .navbar .nav > .active > a {
+  background: rgba(0, 0, 0, 0.1);
+  color: #f6f6f6;
+}
+.skin-orange .main-header .navbar .sidebar-toggle {
+  color: #fff;
+}
+.skin-orange .main-header .navbar .sidebar-toggle:hover {
+  color: #f6f6f6;
+  background: rgba(0, 0, 0, 0.1);
+}
+.skin-orange .main-header .navbar .sidebar-toggle {
+  color: #fff;
+}
+.skin-orange .main-header .navbar .sidebar-toggle:hover {
+  background-color: #e67e00;
+}
+@media (max-width: 767px) {
+  .skin-orange .main-header .navbar .dropdown-menu li.divider {
+    background-color: rgba(255, 255, 255, 0.1);
+  }
+  .skin-orange .main-header .navbar .dropdown-menu li a {
+    color: #333;
+  }
+  .skin-orange .main-header .navbar .dropdown-menu li a:hover {
+    background: #e67e00;
+  }
+}
+.skin-orange .main-header li.user-header {
+  background-color: #FF8C00;
+}
+.skin-orange .content-header {
+  background: transparent;
+}
+.skin-orange .wrapper,
+.skin-orange .main-sidebar,
+.skin-orange .left-side {
+  background-color: #222d32;
+}
+.skin-orange .user-panel > .info,
+.skin-orange .user-panel > .info > a {
+  color: #fff;
+}
+.skin-orange .sidebar-menu > li.header {
+  color: #4b646f;
+  background: #1a2226;
+}
+.skin-orange .sidebar-menu > li > a {
+  border-left: 3px solid transparent;
+}
+.skin-orange .sidebar-menu > li:hover > a,
+.skin-orange .sidebar-menu > li.active > a {
+  color: #fff;
+  background: #1e282c;
+  border-left-color: #FF8C00;
+}
+.skin-orange .sidebar-menu > li > .treeview-menu {
+  margin: 0 1px;
+  background: #2c3b41;
+}
+.skin-orange .sidebar a {
+  color: #b8c7ce;
+}
+.skin-orange .sidebar a:hover {
+  text-decoration: none;
+}
+.skin-orange .treeview-menu > li > a {
+  color: #8aa4af;
+}
+.skin-orange .treeview-menu > li.active > a,
+.skin-orange .treeview-menu > li > a:hover {
+  color: #fff;
+}
+.skin-orange .sidebar-form {
+  border-radius: 3px;
+  border: 1px solid #374850;
+  margin: 10px 10px;
+}
+.skin-orange .sidebar-form input[type="text"],
+.skin-orange .sidebar-form .btn {
+  box-shadow: none;
+  background-color: #374850;
+  border: 1px solid transparent;
+  height: 35px;
+  transition: all 0.3s ease-in-out;
+}
+.skin-orange .sidebar-form input[type="text"] {
+  color: #666;
+  border-top-left-radius: 2px;
+  border-top-right-radius: 0;
+  border-bottom-right-radius: 0;
+  border-bottom-left-radius: 2px;
+}
+.skin-orange .sidebar-form input[type="text"]:focus,
+.skin-orange .sidebar-form input[type="text"]:focus + .input-group-btn .btn {
+  background-color: #fff;
+  color: #666;
+}
+.skin-orange .sidebar-form input[type="text"]:focus + .input-group-btn .btn {
+  border-left-color: #fff;
+}
+.skin-orange .sidebar-form .btn {
+  color: #999;
+  border-top-left-radius: 0;
+  border-top-right-radius: 2px;
+  border-bottom-right-radius: 2px;
+  border-bottom-left-radius: 0;
+}
+.skin-orange.layout-top-nav .main-header > .logo .logo-variant {
+  background-color: none;
+}
+.btn.btn-primary,
+.btn:hover.btn-primary,
+.btn .btn-primary:link,
+.btn:hover .btn-primary:link {
+  background-color: #cc7000;
+  border-color: #995400;
+  color: #fff;
+}
+.btna.btn-primary:hover,
+.btn:hovera.btn-primary:hover {
+  background-color: #995400;
+  border-color: #995400;
+  color: #fff;
+}
+.btn.btn-white:link,
+.btn:hover.btn-white:link {
+  background-color: #cc7000;
+  color: #fff;
+}
+.btn.btn-white:hover,
+.btn:hover.btn-white:hover {
+  background-color: #663800;
+  color: #fff;
+}
+a {
+  color: var(--link);
+}
+a:hover {
+  color: var(--hover-link);
+}
+a:visited {
+  color: var(--visited-link);
+}
+.text-primary {
+  color: #995400;
+}
+:root {
+  --button-default: #b36200;
+  --button-primary: #804600;
+  --button-hover: #663800;
+  --header: #FF8C00;
+  /* Use same as Header picker */
+  --text-main: #BBB;
+  --text-sub: #9b9b9b;
+  --link: #FF8C00;
+  /* Use same as Header picker, lighten by 70% */
+  --visited-link: #ffa333;
+  /* Use same as Header picker, lighten by 70% */
+  --hover-link: #ffaf4d;
+  /* Use same as Header picker, lighten by 70% */
+  --nav-link: #FFF;
+  /* Use same as Header picker */
+  --light-link: #fff;
+  /* Use same as Header picker */
+}
+a.btn-info:link,
+a.btn-warning:link,
+a.btn-danger:link {
+  color: #FFF;
+}
+a.btn-info:visited,
+a.btn-warning:visited,
+a.btn-danger:visited {
+  color: #FFF;
+}
+.far fa-life-ring {
+  color: var(--link);
+}
+.fixed-table-container tbody .selected td {
+  background-color: #fff8af;
+}
+.select2-container--default .select2-selection--multiple .select2-selection__choice {
+  background-color: #FF8C00;
+}
+.search-highlight,
+.search-highlight:hover {
+  background-color: #e9d15b;
+}
+/*
+ * Skin: Yellow
+ * ----------
+ */
+.skin-yellow .main-header .navbar {
+  background-color: #FBCC34;
+}
+.skin-yellow .main-header .navbar .nav > li > a {
+  color: rgba(255, 255, 255, 0.8);
+}
+.skin-yellow .main-header .navbar .nav > li > a:hover,
+.skin-yellow .main-header .navbar .nav > li > a:active,
+.skin-yellow .main-header .navbar .nav > li > a:focus,
+.skin-yellow .main-header .navbar .nav .open > a,
+.skin-yellow .main-header .navbar .nav .open > a:hover,
+.skin-yellow .main-header .navbar .nav .open > a:focus,
+.skin-yellow .main-header .navbar .nav > .active > a {
+  background: rgba(0, 0, 0, 0.1);
+  color: #f6f6f6;
+}
+.skin-yellow .main-header .navbar .sidebar-toggle {
+  color: rgba(255, 255, 255, 0.8);
+}
+.skin-yellow .main-header .navbar .sidebar-toggle:hover {
+  color: #f6f6f6;
+  background: rgba(0, 0, 0, 0.1);
+}
+.skin-yellow .main-header .navbar .sidebar-toggle {
+  color: #000;
+}
+.skin-yellow .main-header .navbar .sidebar-toggle:hover {
+  background-color: #fbc61b;
+}
+@media (max-width: 767px) {
+  .skin-yellow .main-header .navbar .dropdown-menu li.divider {
+    background-color: rgba(255, 255, 255, 0.1);
+  }
+  .skin-yellow .main-header .navbar .dropdown-menu li a {
+    color: #333;
+  }
+  .skin-yellow .main-header .navbar .dropdown-menu li a:hover {
+    background: #fbc61b;
+  }
+}
+.skin-yellow .main-header li.user-header {
+  background-color: #FBCC34;
+}
+.skin-yellow .content-header {
+  background: transparent;
+}
+.skin-yellow .wrapper,
+.skin-yellow .main-sidebar,
+.skin-yellow .left-side {
+  background-color: #222d32;
+}
+.skin-yellow .user-panel > .info,
+.skin-yellow .user-panel > .info > a {
+  color: #fff;
+}
+.skin-yellow .sidebar-menu > li.header {
+  color: #4b646f;
+  background: #1a2226;
+}
+.skin-yellow .sidebar-menu > li > a {
+  border-left: 3px solid transparent;
+}
+.skin-yellow .sidebar-menu > li:hover > a,
+.skin-yellow .sidebar-menu > li.active > a {
+  color: #fff;
+  background: #1e282c;
+  border-left-color: #FBCC34;
+}
+.skin-yellow .sidebar-menu > li > .treeview-menu {
+  margin: 0 1px;
+  background: #2c3b41;
+}
+.skin-yellow .sidebar a {
+  color: #b8c7ce;
+}
+.skin-yellow .sidebar a:hover {
+  text-decoration: none;
+}
+.skin-yellow .treeview-menu > li > a {
+  color: #8aa4af;
+}
+.skin-yellow .treeview-menu > li.active > a,
+.skin-yellow .treeview-menu > li > a:hover {
+  color: #fff;
+}
+.skin-yellow .sidebar-form {
+  border-radius: 3px;
+  border: 1px solid #374850;
+  margin: 10px 10px;
+}
+.skin-yellow .sidebar-form input[type="text"],
+.skin-yellow .sidebar-form .btn {
+  box-shadow: none;
+  background-color: #374850;
+  border: 1px solid transparent;
+  height: 35px;
+  transition: all 0.3s ease-in-out;
+}
+.skin-yellow .sidebar-form input[type="text"] {
+  color: #666;
+  border-top-left-radius: 2px;
+  border-top-right-radius: 0;
+  border-bottom-right-radius: 0;
+  border-bottom-left-radius: 2px;
+}
+.skin-yellow .sidebar-form input[type="text"]:focus,
+.skin-yellow .sidebar-form input[type="text"]:focus + .input-group-btn .btn {
+  background-color: #fff;
+  color: #666;
+}
+.skin-yellow .sidebar-form input[type="text"]:focus + .input-group-btn .btn {
+  border-left-color: #fff;
+}
+.skin-yellow .sidebar-form .btn {
+  color: #999;
+  border-top-left-radius: 0;
+  border-top-right-radius: 2px;
+  border-bottom-right-radius: 2px;
+  border-bottom-left-radius: 0;
+}
+.skin-yellow.layout-top-nav .main-header > .logo .logo-variant {
+  color: #413F42;
+  background-color: none;
+}
+.btn.btn-primary,
+.btn:hover.btn-primary,
+.btn .btn-primary:link,
+.btn:hover .btn-primary:link {
+  background-color: #f7be05;
+  border-color: #c59704;
+  color: var(--nav-link);
+}
+.btna.btn-primary:hover,
+.btn:hovera.btn-primary:hover {
+  background-color: #c59704;
+  border-color: #c59704;
+  color: var(--nav-link);
+}
+.btn.btn-white:link,
+.btn:hover.btn-white:link {
+  background-color: #f7be05;
+  color: var(--nav-link);
+}
+.btn.btn-white:hover,
+.btn:hover.btn-white:hover {
+  background-color: #937103;
+  color: var(--nav-link);
+}
+a.btn-info:link,
+a.btn-warning:link,
+a.btn-danger:link {
+  color: #FFF;
+}
+a.btn-info:visited,
+a.btn-warning:visited,
+a.btn-danger:visited {
+  color: #FFF;
+}
+a {
+  color: var(--link);
+}
+a:hover {
+  color: var(--hover-link);
+}
+a:visited {
+  color: var(--visited-link);
+}
+.text-primary {
+  color: #c59704;
+}
+:root {
+  --button-default: #deab04;
+  --button-primary: #ac8403;
+  --button-hover: #937103;
+  --header: #FBCC34;
+  /* Use same as Header picker */
+  --text-main: #BBB;
+  --text-sub: #9b9b9b;
+  --link: #5b585c;
+  /* Use same as Header picker, lighten by 70% */
+  --visited-link: #747176;
+  /* Use same as Header picker, lighten by 70% */
+  --hover-link: #b4b1b5;
+  /* Use same as Header picker, lighten by 70% */
+  --nav-link: #222;
+  /* Use same as Header picker */
+  --light-link: #fff;
+  /* Use same as Header picker */
+}
+.fixed-table-container tbody .selected td {
+  background-color: #fff8af;
+}
+.select2-container--default .select2-selection--multiple .select2-selection__choice {
+  background-color: #FBCC34;
+}
+.search-highlight,
+.search-highlight:hover {
+  background-color: #e9d15b;
+}
+.thead,
+.navbar-nav > li > a:link {
+  color: var(--nav-link);
+}
+.navbar-nav > li > a:visited {
+  color: var(--nav-link);
+}
+:hover {
+  color: var(--nav-link);
+}
+.skin-yellow .main-header .navbar .nav > li > a {
+  color: #413F42;
+}
+.far fa-life-ring {
+  color: var(--link);
+}
+/*
+ * Skin: yellow dark
+ * ----------
+ */
+.skin-yellow-dark .main-header .navbar .sidebar-toggle {
+  color: #000 !important;
+}
+.skin-yellow-dark .main-header .navbar .sidebar-toggle:hover {
+  background-color: var(--link);
+}
+@media (max-width: 767px) {
+  .skin-yellow-dark .main-header .navbar .dropdown-menu li.divider {
+    background-color: rgba(255, 255, 255, 0.1);
+    color: #fff;
+  }
+  .skin-yellow-dark .main-header .navbar .dropdown-menu li a {
+    color: #fff;
+  }
+  .skin-yellow-dark .main-header .navbar .dropdown-menu li a:hover {
+    background: #e08e0b;
+    color: #fff;
+  }
+}
+.skin-yellow-dark .main-header li.user-header {
+  background-color: #f39c12;
+}
+.skin-yellow-dark .content-header {
+  background: transparent;
+}
+.skin-yellow-dark .wrapper,
+.skin-yellow-dark .main-sidebar,
+.skin-yellow-dark .left-side {
+  background-color: #222d32;
+}
+.skin-yellow-dark .user-panel > .info,
+.skin-yellow-dark .user-panel > .info > a {
+  color: #fff;
+}
+.skin-yellow-dark .sidebar-menu > li.header {
+  color: #4b646f;
+  background: #1a2226;
+}
+.skin-yellow-dark .sidebar-menu > li > a {
+  border-left: 3px solid transparent;
+}
+.skin-yellow-dark .sidebar-menu > li:hover > a,
+.skin-yellow-dark .sidebar-menu > li.active > a {
+  color: #fff;
+  background: #1e282c;
+  border-left-color: #f39c12;
+}
+.skin-yellow-dark .sidebar-menu > li > .treeview-menu {
+  margin: 0 1px;
+  background: #2c3b41;
+}
+.skin-yellow-dark .sidebar a {
+  color: #b8c7ce;
+}
+.skin-yellow-dark .sidebar a:hover {
+  text-decoration: none;
+}
+.skin-yellow-dark .treeview-menu > li > a {
+  color: #8aa4af;
+}
+.skin-yellow-dark .treeview-menu > li.active > a,
+.skin-yellow-dark .treeview-menu > li > a:hover {
+  color: #fff;
+}
+.skin-yellow-dark .sidebar-form {
+  border-radius: 3px;
+  border: 1px solid #374850;
+  margin: 10px 10px;
+}
+.skin-yellow-dark .sidebar-form input[type="text"],
+.skin-yellow-dark .sidebar-form .btn {
+  box-shadow: none;
+  background-color: #374850;
+  border: 1px solid transparent;
+  height: 35px;
+  transition: all 0.3s ease-in-out;
+}
+.skin-yellow-dark .sidebar-form input[type="text"] {
+  color: #666;
+  border-top-left-radius: 2px;
+  border-top-right-radius: 0;
+  border-bottom-right-radius: 0;
+  border-bottom-left-radius: 2px;
+}
+.skin-yellow-dark .sidebar-form input[type="text"]:focus,
+.skin-yellow-dark .sidebar-form input[type="text"]:focus + .input-group-btn .btn {
+  background-color: #fff;
+  color: #666;
+}
+.skin-yellow-dark .sidebar-form input[type="text"]:focus + .input-group-btn .btn {
+  border-left-color: #fff;
+}
+.skin-yellow-dark .sidebar-form .btn {
+  color: #999;
+  border-top-left-radius: 0;
+  border-top-right-radius: 2px;
+  border-bottom-right-radius: 2px;
+  border-bottom-left-radius: 0;
+}
+.btn.btn-primary,
+.btn:hover.btn-primary,
+.btn .btn-primary:link,
+.btn:hover .btn-primary:link {
+  background-color: var(--button-default);
+  border-color: #000000;
+  color: #545454;
+}
+.btna.btn-primary:hover,
+.btn:hovera.btn-primary:hover {
+  background-color: var(--button-hover);
+  border-color: var(--button-hover);
+  color: #545454;
+}
+.btn.btn-white:link,
+.btn:hover.btn-white:link {
+  background-color: var(--button-default);
+  color: #545454;
+}
+.btn.btn-white:hover,
+.btn:hover.btn-white:hover {
+  background-color: var(--hover-link);
+  color: #545454;
+}
+a.actions {
+  color: #fff !important;
+}
+a:visited.label-default,
+a:link.label-default {
+  color: #444;
+}
+/**
+The dropdown is white, so use a darker color
+ */
+li.dropdown-item-marker {
+  color: var(--button-primary);
+}
+a:link {
+  color: var(--link);
+}
+a:hover {
+  color: var(--hover-link);
+}
+a:visited {
+  color: var(--visited-link);
+}
+.text-primary {
+  color: #fff;
+}
+#sort tr.cansort {
+  background-color: var(--back-main);
+  color: var(--text-main);
+}
+:root {
+  --background: #222;
+  --back-main: #333;
+  --back-sub: #3d4144;
+  --back-sub-alt: rgba(0, 0, 0, 0.36);
+  --button-default: #FFCC32;
+  --button-primary: #b28500;
+  --button-hover: #987200;
+  --header: #FFCC32;
+  /* Use same as Header picker */
+  --text-main: #BBB;
+  --text-sub: #9b9b9b;
+  --link: #F0E68C;
+  /* Use same as Header picker, lighten by 70% */
+  --visited-link: #f9f5d0;
+  /* Use same as Header picker, lighten by 70% */
+  --hover-link: #ffffff;
+  /* Use same as Header picker, lighten by 70% */
+  --nav-link: #222;
+  /* Use same as Header picker */
+  --light-link: #545454;
+  /* Use same as Header picker */
+}
+#ldapad_test_results.well.well-sm {
+  color: var(--back-main);
+}
+.pagination > li > a {
+  color: var(--text-main);
+  background-color: var(--back-main);
+}
+.pagination > .active > a {
+  background-color: var(--button-default);
+  border-color: var(--light-link);
+  color: var(--nav-link);
+}
+.pagination > .active > a:hover {
+  background-color: var(--hover-link);
+}
+.tasks-menu > .dropdown-menu > li .menu {
+  background-color: var(--back-main);
+}
+.tasks-menu > .dropdown-menu > li .menu > li > a:hover .progress {
+  background-color: var(--background);
+}
+h2.task_menu {
+  color: var(--link);
+}
+.navbar-custom-menu > .navbar-nav > li > .dropdown-menu {
+  background-color: var(--back-main);
+  color: var(--link);
+}
+.main-header .navbar,
+.main-header .logo {
+  background-color: var(--header);
+  background: linear-gradient(to bottom, var(--header) 0%, var(--header) 100%);
+  border-color: var(--header);
+}
+a.btn.btn-default {
+  color: var(--nav-link);
+}
+.bootstrap-table .fixed-table-container .table thead th .sortable {
+  color: var(--text-main);
+}
+.bootstrap-table .fixed-table-toolbar .columns label {
+  color: #000;
+}
+.thead,
+.navbar-nav > li > a:link {
+  color: var(--nav-link);
+}
+.navbar-nav > li > a:visited {
+  color: var(--nav-link);
+}
+.modal-content {
+  background-color: var(--back-main);
+  color: var(--text-main);
+}
+a:link.btn-default {
+  color: var(--nav-link);
+}
+.btn-primary.hover {
+  color: var(--nav-link);
+}
+.small-box h3,
+.small-box p {
+  color: #fff !important;
+}
+.small-box h3 a:hover,
+.small-box p a:hover {
+  text-decoration: none;
+  color: var(--nav-link) !important;
+}
+.far fa-life-ring {
+  color: var(--link);
+}
+#accessoriesTable > tbody > tr > td > nobr > a > i.fa {
+  color: var(--text-main);
+}
+#assetsListingTable > tbody > tr > td > nobr > a > i.fa {
+  color: var(--text-main);
+}
+#assetsListingTable > tbody > tr.selected > td {
+  background-color: var(--back-main);
+}
+body {
+  color: var(--text-main);
+}
+.box,
+.box.box-default {
+  border-top: 3px solid var(--header);
+  border-top-color: var(--header);
+}
+.box-body,
+.box-footer,
+.box-header {
+  background-color: var(--back-sub);
+  color: var(--header);
+}
+.btn-default {
+  background-color: var(--button-default);
+}
+.btn-default dropdown-toggle {
+  background-color: var(--button-default);
+  color: var(--nav-link);
+}
+.btn-default:active,
+.btn-default:focus,
+.btn-default:hover,
+.btn-default.active {
+  background-color: var(--button-hover);
+  color: var(--nav-link);
+}
+.btn-primary,
+.btn-primary.hover,
+.btn-primary:active,
+.text-yellow {
+  color: var(--nav-link) !important;
+}
+.btn-primary:hover {
+  background-color: var(--button-primary);
+  color: var(--nav-link) !important;
+}
+#componentsTable > tbody > tr > td > nobr > a > i.fa {
+  color: var(--text-main);
+}
+#consumablesTable > tbody > tr > td > nobr > a > i.fa {
+  color: var(--text-main);
+}
+.content-wrapper {
+  background-color: var(--background);
+}
+#create-form > div > div > div > span > i.fa {
+  background-color: var(--back-sub);
+  color: var(--header);
+}
+.datepicker .datepicker-switch:hover,
+.datepicker .next:hover,
+.datepicker .prev:hover,
+.datepicker tfoot tr th:hover,
+.datepicker table tr td.day.focused,
+.datepicker table tr td.day:hover {
+  background-color: var(--header);
+}
+.datepicker.dropdown-menu {
+  background-color: var(--back-main);
+  color: var(--text-main);
+}
+#details > div > div > div > table {
+  background-color: transparent;
+}
+.dropdown-menu > li > a:hover {
+  background-color: var(--back-main);
+  color: var(--nav-link);
+}
+.form-control {
+  background-color: var(--back-main);
+  color: var(--text-main);
+}
+.form-control[disabled],
+.form-control[readonly],
+fieldset[disabled] .form-control {
+  background-color: var(--back-main);
+  color: var(--text-main);
+}
+h1,
+h2,
+h3,
+h4,
+h5,
+h6,
+p {
+  color: var(--text-main);
+}
+.help-block {
+  color: var(--text-sub);
+}
+input[type=text],
+input[type=search] {
+  background-color: var(--back-sub);
+  color: var(--text-main);
+}
+#licensesTable > tbody > tr > td > nobr > a > i.fa {
+  color: var(--text-main);
+}
+.main-footer {
+  background-color: var(--back-main);
+  color: var(--text-main);
+}
+.nav-tabs-custom > .nav-tabs > li > a,
+.nav-tabs-custom > .nav-tabs > li.active > a {
+  color: var(--text-main);
+}
+.nav-tabs-custom > .nav-tabs > li.active {
+  border-top-color: var(--header);
+}
+.nav-tabs-custom > .nav-tabs > li.active > a {
+  background-color: var(--back-main);
+}
+.nav-tabs-custom > .nav-tabs > li.active > a:hover {
+  background-color: var(--back-sub);
+  color: var(--text-main);
+}
+.nav-tabs-custom,
+.nav-tabs-custom > .tab-content {
+  background-color: var(--back-main);
+}
+.navbar-nav > .tasks-menu > .dropdown-menu > li.header {
+  background-color: var(--back-main);
+  color: var(--header);
+}
+.open > .dropdown-toggle.btn-default {
+  background-color: var(--back-sub);
+  color: var(--header);
+}
+.panel {
+  background-color: var(--back-sub);
+  color: var(--text-main);
+}
+.panel-default > .panel-heading {
+  background-color: var(--back-main);
+  color: var(--header);
+}
+.select2-container--default .select2-results__option[aria-selected=true],
+.select2-container--default .select2-results__option[aria-selected=true]:hover {
+  background-color: var(--back-sub);
+  color: var(--header);
+}
+.select2-container--default .select2-results__option--highlighted[aria-selected] {
+  background-color: var(--header);
+  color: var(--back-main);
+}
+.select2-container--default .select2-selection--single .select2-selection__rendered {
+  color: var(--text-main);
+}
+.select2-container--default .select2-selection--multiple .select2-selection__choice {
+  background-color: var(--header);
+}
+.select2-selection--single {
+  background-color: var(--back-sub) !important;
+  color: var(--text-main) !important;
+}
+.select2-dropdown {
+  background-color: var(--back-main);
+  color: var(--text-main);
+}
+.skin-yellow-dark .main-header .navbar .dropdown-menu li a {
+  color: var(--header);
+}
+.skin-yellow-dark .main-header .navbar .dropdown-menu li a:hover {
+  background-color: #000000;
+}
+tr th div.th-inner {
+  color: #FFFFFF;
+}
+.tab-content,
+.tab-pane {
+  background-color: var(--back-main);
+  color: var(--text-main);
+}
+.table-striped > tbody > tr:nth-of-type(odd) {
+  background-color: var(--back-sub);
+}
+.table-striped > tbody > tr:nth-of-type(even) {
+  background-color: var(--back-sub-alt);
+}
+.th-inner {
+  color: var(--nav-link);
+}
+#webui > div > div > div > div > div > table > tbody > tr > td > a > i.fa,
+.box-body,
+.box-footer,
+.box-header {
+  color: var(--text-main);
+}
+.box-header.with-border {
+  border-bottom: #000;
+}
+#customFieldsTable a[href*='/models'] {
+  background-color: var(--back-sub-alt);
+  color: var(--link);
+}
+#customFieldsTable a[href*='/models']:hover {
+  background-color: var(--text-sub);
+  color: var(--button-hover);
+}
+#customFieldsTable a[href*='/models']:visited {
+  background-color: var(--background);
+  color: var(--visited-link);
+}
+.row-striped {
+  vertical-align: top;
+  line-height: 2.6;
+  padding: 0px;
+  margin-left: 20px;
+  box-sizing: border-box;
+  display: table;
+}
+.row-striped .row:nth-of-type(odd) div {
+  background-color: var(--back-sub);
+  color: var(--text-main);
+  border-top: 1px solid #dddddd;
+  display: table-cell;
+}
+.row-striped .row:nth-of-type(even) div {
+  background-color: var(--back-sub);
+  color: var(--text-main);
+  border-top: 1px solid #dddddd;
+  display: table-cell;
+}
+.row-new-striped > .row:nth-of-type(odd) {
+  background-color: var(--back-sub);
+  color: var(--text-main);
+}
+.row-new-striped > .row:nth-of-type(even) {
+  background-color: var(--back-sub-alt);
+  color: var(--text-main);
+}
+.search-highlight,
+.search-highlight:hover {
+  background-color: #e9d15b;
+}
+.table > tbody > tr.warning > td {
+  background-color: var(--back-sub);
+}
+
diff --git a/public/css/dist/skins/skin-black-dark.css b/public/css/dist/skins/skin-black-dark.css
index 89528e8ac4..15c1fd488b 100644
--- a/public/css/dist/skins/skin-black-dark.css
+++ b/public/css/dist/skins/skin-black-dark.css
@@ -175,6 +175,10 @@ a:visited {
 .text-primary {
   color: #fff;
 }
+#sort tr.cansort {
+  background-color: var(--back-main);
+  color: var(--text-main);
+}
 :root {
   --background: #222;
   --back-main: #333;
@@ -392,11 +396,6 @@ input[type=search] {
 .search-highlight:hover {
   background-color: var(--back-sub) !important;
 }
-.input-group,
-.input-group-addon {
-  background-color: var(--back-sub);
-  color: var(--text-main);
-}
 #licensesTable > tbody > tr > td > nobr > a > i.fa {
   color: var(--text-main);
 }
diff --git a/public/css/dist/skins/skin-black-dark.min.css b/public/css/dist/skins/skin-black-dark.min.css
index 89528e8ac4..15c1fd488b 100644
--- a/public/css/dist/skins/skin-black-dark.min.css
+++ b/public/css/dist/skins/skin-black-dark.min.css
@@ -175,6 +175,10 @@ a:visited {
 .text-primary {
   color: #fff;
 }
+#sort tr.cansort {
+  background-color: var(--back-main);
+  color: var(--text-main);
+}
 :root {
   --background: #222;
   --back-main: #333;
@@ -392,11 +396,6 @@ input[type=search] {
 .search-highlight:hover {
   background-color: var(--back-sub) !important;
 }
-.input-group,
-.input-group-addon {
-  background-color: var(--back-sub);
-  color: var(--text-main);
-}
 #licensesTable > tbody > tr > td > nobr > a > i.fa {
   color: var(--text-main);
 }
diff --git a/public/css/dist/skins/skin-blue-dark.css b/public/css/dist/skins/skin-blue-dark.css
index bfac907779..97a05cf51c 100644
--- a/public/css/dist/skins/skin-blue-dark.css
+++ b/public/css/dist/skins/skin-blue-dark.css
@@ -170,6 +170,10 @@ a:visited {
 .text-primary {
   color: #fff;
 }
+#sort tr.cansort {
+  background-color: var(--back-main);
+  color: var(--text-main);
+}
 :root {
   --background: #222;
   --back-main: #333;
@@ -373,11 +377,6 @@ input[type=search] {
   background-color: var(--back-sub);
   color: var(--text-main);
 }
-.input-group,
-.input-group-addon {
-  background-color: var(--back-sub) !important;
-  color: var(--text-main);
-}
 #licensesTable > tbody > tr > td > nobr > a > i.fa {
   color: var(--text-main);
 }
@@ -463,7 +462,7 @@ input[type=search] {
   background-color: var(--back-sub);
 }
 .table-striped > tbody > tr:nth-of-type(even) {
-  background-color: var(--back-sub-alt);
+  background-color: var(--back-main);
 }
 #webui > div > div > div > div > div > table > tbody > tr > td > a > i.fa,
 .box-body,
@@ -488,7 +487,16 @@ a:visited {
   color: var(--visited-link);
 }
 #customFieldsTable a[href*='/models'] {
-  color: var(--back-sub);
+  background-color: var(--back-sub-alt);
+  color: var(--link);
+}
+#customFieldsTable a[href*='/models']:hover {
+  background-color: var(--text-sub);
+  color: var(--button-hover);
+}
+#customFieldsTable a[href*='/models']:visited {
+  background-color: var(--background);
+  color: var(--visited-link);
 }
 #customFieldsTable a[href*='/fieldsets'] {
   background-color: transparent;
diff --git a/public/css/dist/skins/skin-blue-dark.css.map b/public/css/dist/skins/skin-blue-dark.css.map
new file mode 100644
index 0000000000..96583b65b1
--- /dev/null
+++ b/public/css/dist/skins/skin-blue-dark.css.map
@@ -0,0 +1 @@
+{"version":3,"file":"css/dist/skins/skin-blue-dark.css","mappings":"AAAA;;;EAGE;AAMF;ECHE;ADAF;AAGA;ECAI;ADAJ;AAAA;;;;;;;ECUI;EACA;ADDJ;AAVA;ECgBI;ADHJ;ACII;EACE;EACA;ADFN;AAjBA;EAMQ;AAcR;AAbQ;EACE;AAeV;AAZM;EAGM;IACE;IACA;EAYZ;EAjBI;IAQQ;EAYZ;EAXY;IACE;IACA;EAad;AACF;AApCA;EAgCM;AAON;AAvCA;EAsCI;AAIJ;AA1CA;;;ECsGI;ADvDJ;AA/CA;;EC2GM;ADxDN;AC8DI;EACE;EACA;AD5DN;AAvDA;ECuHM;AD7DN;ACgEI;;EACE;EACA;EACA;AD7DN;AAhEA;ECiIM;EACA;AD9DN;AApEA;ECuII;ADhEJ;ACiEI;EACE;AD/DN;AA1EA;ECgJQ;ADnER;ACqEM;;EACE;ADlER;AAjFA;ECgEE;EA0FE;EACA;ADrEJ;AAtFA;;EC6JM;EACA;EACA;EACA;ECuBI;AFvFV;AAhGA;ECoKM;EAhGJ;EACA;EACA;EACA;ADgCF;AC+DM;;EACE;EACA;AD5DR;AC8DM;EACE;AD5DR;AA/GA;EC+KM;EA3GJ;EACA;EACA;EACA;AD+CF;AAzEA;EAEI;AA0EJ;AApEA;;EACE;AAuEF;AArEE;;;;EACE;EACA;EACA;AA0EJ;AAtEE;;EACE;EACA;EACA;AAyEJ;AAtEE;;EACE;EACA;AAyEJ;AAtEE;;EACE;EACA;AAyEJ;AACA;;EAEE;AArEF;EACE;AAuEF;AAlEE;EACE;AAoEJ;AAlEE;EACE;AAoEJ;AAhEA;EACE;AAkEF;AA5DA;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EA8DA,8BAA8B;EA7D9B;EACA;EACA;EA+DA,8CAA8C;EA9D9C;EAgEA,8CAA8C;EA/D9C;EAiEA,8CAA8C;EAhE9C;EAkEA,8BAA8B;EAjE9B;EAmEA,8BAA8B;AAChC;AAjEA;EACE;AAmEF;AAjEA;EACE;AAmEF;AAhEA;EACE;EACA;AAkEF;AAhEA;EACE;EACA;AAkEF;AAhEA;EACE;AAkEF;AAhEA;EACE;AAkEF;AA/DA;EACE;AAiEF;AA/DA;EACE;AAiEF;AA/DA;EACE;EACA;AAiEF;AA9DA;;EACE;EAEA;EACA;AAiEF;AA9DA;EACE;AAgEF;AA9DA;EACE;AAgEF;AA9DA;;EACE;AAiEF;AA/DA;EACE;AAiEF;AA/DA;EACE;EACA;AAiEF;AA9DA;EACE;AAgEF;AA7DA;EACE;AA+DF;AA7DA;EACE;AA+DF;AA7DA;;EACE;AAgEF;AAjEA;;EAGI;EACA;AAkEJ;AA7DA;EACE;AA+DF;AA7DA;EACE;AA+DF;AA5DA;EACE;AA8DF;AA5DA;EACE;AA8DF;AA5DA;;EACE;EACA;AA+DF;AA7DA;;;EACE;EACA;AAiEF;AA/DA;EACE;EACA;AAiEF;AA9DA;EACE;EACA;AAgEF;AA7DA;;;;EACE;EACA;AAkEF;AAhEA;;;;EACE;AAqEF;AAnEA;EACE;AAqEF;AAnEA;EACE;AAqEF;AAnEA;EACE;AAqEF;AAnEA;EACE;AAqEF;AAnEA;EACE;EACA;AAqEF;AAnEA;;;;;;EACE;AA0EF;AAxEA;EACE;EACA;AA0EF;AAxEA;EACE;AA0EF;AAxEA;EACE;EACA;AA0EF;AAxEA;EACE;AA0EF;AAxEA;EACE;EACA;AA0EF;AAxEA;;;EACE;EACA;AA4EF;AA1EA;;;;;;;EACE;AAkFF;AAhFA;EACE;AAkFF;AAhFA;;EACE;EACA;AAmFF;AAjFA;;EACE;EACA;AAoFF;AAlFA;EACE;AAoFF;AAlFA;EACE;EACA;AAoFF;AAlFA;;EACE;AAqFF;AAnFA;EACE;AAqFF;AAnFA;EACE;AAqFF;AAnFA;EACE;EACA;AAqFF;AAnFA;;EACE;AAsFF;AApFA;EACE;EACA;AAsFF;AApFA;EACE;EACA;AAsFF;AApFA;EACE;EACA;AAsFF;AApFA;EACE;EACA;AAsFF;AApFA;;EACE;EACA;AAuFF;AArFA;EACE;EACA;AAuFF;AArFA;EACE;AAuFF;AArFA;EACE;AAuFF;AArFA;EACE;EACA;AAuFF;AArFA;EACE;EACA;AAuFF;AArFA;EACE;AAuFF;AArFA;EACE;AAuFF;AArFA;;;;EACE;AA0FF;AAxFA;;EACE;EACA;AA2FF;AAzFA;EACE;AA2FF;AAzFA;EACE;AA2FF;AAzFA;;;;EACE;AA8FF;AA3FA;EACE;AA6FF;AA1FA;EACE;AA4FF;AA1FE;EACE;AA4FJ;AA3FE;EACE;EACA;AA6FJ;AA3FE;EACE;AA6FJ;AA1FA;EACE;AA4FF;AA1FA;EACE;AA4FF;AAzFA;EACE;EACA;EACA;EACA;EACA;EAGA;AAyFF;AArFA;EACE;EACA;EACA;EACA;AAuFF;AAnFA;EACE;EACA;EACA;EACA;AAqFF;AAnFA;EACE;EACA;AAqFF;AAnFA;EACE;EACA;AAqFF;AAlFA;;EACE;AAqFF;AAnFA;EACE;AAqFF","sources":["webpack:///./resources/assets/less/skins/skin-blue-dark.less","webpack:///./resources/assets/less/mixins.less","webpack:///./resources/assets/less/bootstrap-less/mixins/vendor-prefixes.less"],"sourcesContent":["/*\n * Skin: blue dark\n * ----------\n */\n@import \"../bootstrap-less/mixins.less\";\n@import \"../bootstrap-less/variables.less\";\n@import \"../variables.less\";\n@import \"../mixins.less\";\n\n.skin-blue-dark {\n  //Navbar\n  .main-header {\n    .navbar {\n      .navbar-variant(@blue; #fff);\n      .sidebar-toggle {\n        color: #fff;\n        &:hover {\n          background-color: darken(@blue, 5%);\n        }\n      }\n      @media (max-width: @screen-header-collapse) {\n        .dropdown-menu {\n          li {\n            &.divider {\n              background-color: rgba(255, 255, 255, 0.1);\n              color: #fff;\n            }\n            a {\n              color: #fff;\n              &:hover {\n                background: darken(@blue, 5%);\n                color: #fff;\n              }\n            }\n          }\n        }\n      }\n    }\n    //Logo\n\n    li.user-header {\n      background-color: @blue;\n    }\n  }\n\n  //Content Header\n  .content-header {\n    background: transparent;\n  }\n\n  //Create the sidebar skin\n  .skin-dark-sidebar(@blue);\n}\n\n.skin-blue-dark.layout-top-nav .main-header > .logo {\n  .logo-variant {\n    background-color: none;\n  }\n}\n\n\n\n.btn, .btn:hover {\n  color: #fff !important;\n\n  &.btn-primary, .btn-primary:link {\n    background-color: darken(@blue, 10%);\n    border-color: #FFF;\n    color: #FFF;\n  }\n\n\n  &a.btn-primary:hover {\n    background-color: darken(@blue, 20%);\n    border-color: darken(@blue, 20%);\n    color: #fff;\n  }\n\n  &.btn-white:link {\n    background-color: darken(@blue, 10%);\n    color: #fff;\n  }\n\n  &.btn-white:hover {\n    background-color: darken(@blue, 30%);\n    color: #fff;\n  }\n}\n\n/**\nThe dropdown is white, so use a darker color\n */\nli.dropdown-item-marker {\n  color: var(--button-primary);\n}\n\n\na {\n  &:hover {\n    color: var(--hover-link);\n  }\n  &:visited {\n    color: var(--visited-link);\n  }\n}\n\n.text-primary {\n  color: #fff;\n}\n\n\n\n\n:root {\n  --background: #222;\n  --back-main: #333;\n  --back-sub: #272727;\n  --back-sub-alt: rgba(0, 0, 0, 0.36);\n  --button-default: darken(@blue, 15%);\n  --button-primary: darken(@blue, 25%);\n  --button-hover: darken(@blue, 30%);\n  --header: @blue; /* Use same as Header picker */\n  --text-main: #BBB;\n  --text-sub: #9b9b9b;\n  --link: #00BFFF; /* Use same as Header picker, lighten by 70% */\n  --visited-link: lighten(#00BFFF,15%); /* Use same as Header picker, lighten by 70% */\n  --hover-link: lighten(#00BFFF,30%); /* Use same as Header picker, lighten by 70% */\n  --nav-link: #FFF; /* Use same as Header picker */\n  --light-link: #fff; /* Use same as Header picker */\n}\n\n#ldapad_test_results.well.well-sm{\n  color: var(--back-main);\n}\na.actions {\n  color:#fff !important;\n}\n//pagination\n.pagination > li >a{\n  color: var(--light-link);\n  background-color: var(--back-main);\n}\n.pagination > .active > a {\n  background-color: var(--visited-link);\n  border-color: var(--light-link);\n}\n.pagination > .active > a:hover{\n  background-color: var(--hover-link);\n}\n.tasks-menu > .dropdown-menu > li .menu{\n  background-color: var(--back-main);\n}\n\n.tasks-menu > .dropdown-menu > li .menu > li > a:hover .progress{\n  background-color: var(--background);\n}\nh2.task_menu{\n  color:var(--link);\n}\n.navbar-custom-menu > .navbar-nav > li > .dropdown-menu{\n  background-color:var(--back-main);\n  color:var(--link);\n}\n\n.main-header .navbar, .main-header .logo {\n  background-color: var(--header);\n  background: -webkit-linear-gradient(top,  var(--header) 0%,var(--header) 100%);\n  background: linear-gradient(to bottom, var(--header) 0%,var(--header) 100%);\n  border-color: var(--header);\n}\n\n.bootstrap-table .fixed-table-container .table thead th .sortable {\n  color: var(--nav-link);\n}\n.bootstrap-table .fixed-table-toolbar .columns label {\n  color:#000;\n}\n.thead, .navbar-nav>li>a:link {\n  color: var(--nav-link);\n}\n.far fa-life-ring{\n  color:var(--link);\n}\n.modal-content {\n  background-color: var(--back-main);\n  color: var(--text-main);\n}\n\na:link {\n  color: var(--link);\n}\n\n.btn-primary.hover {\n  color: var(--nav-link);\n}\n.bootstrap-table .fixed-table-toolbar .columns label {\n  color:#000;\n}\n.small-box h3, .small-box p {\n  color: var(--nav-link) !important;\n  a:hover {\n    text-decoration: none;\n    color: var(--nav-link) !important;\n  }\n}\n\n\n#accessoriesTable>tbody>tr>td>nobr>a>i.fa {\n  color: var(--text-main);\n}\n#assetsListingTable>tbody>tr>td>nobr>a>i.fa {\n  color: var(--text-main);\n}\n\n#assetsListingTable>tbody>tr.selected>td {\n  background-color: var(--back-main);\n}\nbody {\n  color: var(--text-main);\n}\n.box, .box.box-default {\n  border-top: 3px solid var(--header);\n  border-top-color: var(--header);\n}\n.box-body, .box-footer, .box-header {\n  background-color: var(--back-sub);\n  color: var(--header);\n}\n.btn-default{\n  background-color: var(--button-default);\n  color: var(--link);\n}\n\n.btn-default dropdown-toggle {\n  background-color: var(--button-default);\n  color: var(--link);\n}\n\n.btn-default:active, .btn-default:focus, .btn-default:hover, .btn-default.active {\n  background-color: var(--button-hover);\n  color: var(--link);\n}\n.btn-primary, .btn-primary.hover, .btn-primary:active, .text-blue {\n  color: var(--text-main);\n}\n.btn-primary:hover {\n  background-color: var(--button-primary);\n}\n#componentsTable>tbody>tr>td>nobr>a>i.fa {\n  color: var(--text-main);\n}\n#consumablesTable>tbody>tr>td>nobr>a>i.fa {\n  color: var(--text-main);\n}\n.content-wrapper {\n  background-color: var(--background);\n}\n#create-form>div>div>div>span>i.fa {\n  background-color: var(--back-sub);\n  color: var(--header);\n}\n.datepicker .datepicker-switch:hover, .datepicker .next:hover, .datepicker .prev:hover, .datepicker tfoot tr th:hover, .datepicker table tr td.day.focused, .datepicker table tr td.day:hover {\n  background-color: var(--header);\n}\n.datepicker.dropdown-menu {\n  background-color: var(--back-main);\n  color: var(--text-main);\n}\n#details>div>div>div>table {\n  background-color: transparent;\n}\n.dropdown-menu>li>a:hover {\n  background-color: var(--back-main);\n  color: var(--nav-link);\n}\n.fixed-table-body thead th .th-inner{\n  color: var(--nav-link);\n}\n.form-control {\n  background-color: var(--back-main);\n  color: var(--text-main);\n}\n.form-control[disabled], .form-control[readonly], fieldset[disabled] .form-control{\n  background-color: var(--back-main);\n  color: var(--text-main);\n}\nh1, h2, h3, h4, h5, h6, p {\n  color: var(--text-main);\n}\n.help-block {\n  color: var(--text-sub);\n}\ninput[type=text], input[type=search] {\n  background-color: var(--back-sub);\n  color: var(--text-main);\n}\n.input-group, .input-group-addon {\n  background-color: var(--back-sub)!important;\n  color: var(--text-main);\n}\n#licensesTable>tbody>tr>td>nobr>a>i.fa {\n  color: var(--text-main);\n}\n.main-footer {\n  background-color: var(--back-main);\n  color: var(--text-main);\n}\n.nav-tabs-custom>.nav-tabs>li>a, .nav-tabs-custom>.nav-tabs>li.active>a {\n  color: var(--text-main);\n}\n.nav-tabs-custom>.nav-tabs>li.active {\n  border-top-color: var(--header);\n}\n.nav-tabs-custom>.nav-tabs>li.active>a {\n  background-color: var(--back-main);\n}\n.nav-tabs-custom>.nav-tabs>li.active>a:hover {\n  background-color: var(--back-sub);\n  color: var(--text-main);\n}\n.nav-tabs-custom, .nav-tabs-custom>.tab-content {\n  background-color: var(--back-main);\n}\n.navbar-nav>.tasks-menu>.dropdown-menu>li.header {\n  background-color: var(--back-main);\n  color: var(--header);\n}\n.open>.dropdown-toggle.btn-default {\n  background-color: var(--back-sub);\n  color: var(--header);\n}\n.panel {\n  background-color: var(--back-sub);\n  color: var(--text-main);\n}\n.panel-default>.panel-heading {\n  background-color: var(--back-main);\n  color: var(--header);\n}\n.select2-container--default .select2-results__option[aria-selected=true], .select2-container--default .select2-results__option[aria-selected=true]:hover {\n  background-color: var(--back-sub);\n  color: var(--header);\n}\n.select2-container--default .select2-results__option--highlighted[aria-selected] {\n  background-color: var(--header);\n  color: var(--back-main);\n}\n.select2-container--default .select2-selection--single .select2-selection__rendered {\n  color: var(--text-main);\n}\n.select2-container--default .select2-selection--multiple .select2-selection__choice {\n  background-color: var(--header);\n}\n.select2-selection--single {\n  background-color: var(--back-sub)!important;\n  color: var(--text-main)!important;\n}\n.select2-dropdown {\n  background-color: var(--back-main);\n  color: var(--text-main);\n}\n.skin-blue-dark .main-header .navbar .dropdown-menu li a {\n  color: #FFFFFF;\n}\n.skin-blue-dark .main-header .navbar .dropdown-menu li a:hover {\n  background-color: #3c8dbc;\n}\n.fixed-table-body thead th .th-inner, .skin-blue-dark .sidebar-menu>li.active>a, .skin-blue .sidebar-menu>li:hover>a, .sidebar-toggle:hover {\n  background-color: var(--header)!important;\n}\n.tab-content, .tab-pane {\n  background-color: var(--back-main);\n  color: var(--text-main);\n}\n.table-striped>tbody>tr:nth-of-type(odd) {\n  background-color: var(--back-sub);\n}\n.table-striped>tbody>tr:nth-of-type(even){\n  background-color: var(--back-sub-alt);\n}\n#webui>div>div>div>div>div>table>tbody>tr>td>a>i.fa, .box-body, .box-footer, .box-header {\n  color: var(--text-main);\n}\n\n.box-header.with-border {\n  border-bottom: #000;\n}\n\na {\n  color: var(--link);\n\n  &:link {\n    color: var(--link)  }\n  &:hover {\n    color: var(--hover-link);\n    text-decoration: underline;\n  }\n  &:visited {\n    color: var(--visited-link)\n  }\n}\n#customFieldsTable a[href*='/models'] {\n  color: var(--back-sub);\n}\n#customFieldsTable a[href*='/fieldsets']{\n  background-color: transparent;\n}\n\n.row-striped {\n  vertical-align: top;\n  line-height: 2.6;\n  padding: 0px;\n  margin-left: 20px;\n  box-sizing: border-box;\n  //border-left: 1px solid #dddddd;\n  //border-right: 1px solid #dddddd;\n  display: table;\n\n}\n\n.row-striped .row:nth-of-type(odd) div {\n  background-color: var(--back-sub);\n  color: var(--text-main);\n  border-top: 1px solid #dddddd;\n  display: table-cell;\n\n}\n\n.row-striped .row:nth-of-type(even) div {\n  background-color: var(--back-sub);\n  color: var(--text-main);\n  border-top: 1px solid #dddddd;\n  display: table-cell;\n}\n.row-new-striped > .row:nth-of-type(odd){\n  background-color: var(--back-sub);\n  color: var(--text-main);\n}\n.row-new-striped > .row:nth-of-type(even){\n  background-color: var(--back-sub-alt);\n  color: var(--text-main);\n}\n\n.search-highlight, .search-highlight:hover {\n  background-color: #e9d15b;\n}\n.table > tbody > tr.warning > td{\n  background-color:var(--back-sub);\n}","//AdminLTE mixins\n//===============\n\n\n//Changes the color and the hovering properties of the navbar\n.navbar-variant(@color; @font-color: rgba(255, 255, 255, 0.8); @hover-color: #f6f6f6; @hover-bg: rgba(0, 0, 0, 0.1)) {\n  background-color: @color;\n  //Navbar links\n  .nav > li > a {\n    color: @font-color;\n  }\n\n  .nav > li > a:hover,\n    .nav > li > a:active,\n    .nav > li > a:focus,\n    .nav .open > a,\n    .nav .open > a:hover,\n    .nav .open > a:focus,\n    .nav > .active > a {\n    background: @hover-bg;\n    color: @hover-color;\n  }\n\n  //Add color to the sidebar toggle button\n  .sidebar-toggle {\n    color: @font-color;\n    &:hover {\n      color: @hover-color;\n      background: @hover-bg;\n    }\n  }\n}\n\n//Logo color variation\n.logo-variant(@bg-color; @color: #fff; @border-bottom-color: transparent; @border-bottom-width: 0) {\n  background-color: @bg-color;\n  color: @color;\n  border-bottom: @border-bottom-width solid @border-bottom-color;\n\n  &:hover {\n    background-color: darken(@bg-color, 1%);\n  }\n}\n\n//Box solid color variantion creator\n.box-solid-variant(@color; @text-color: #fff) {\n  border: 1px solid @color;\n  > .box-header {\n    color: @text-color;\n    background: @color;\n    background-color: @color;\n    a,\n    .btn {\n      color: @text-color;\n    }\n  }\n}\n\n//Direct Chat Variant\n.direct-chat-variant(@bg-color; @color: #fff) {\n  .right > .direct-chat-text {\n    background: @bg-color;\n    border-color: @bg-color;\n    color: @color;\n    &:after,\n      &:before {\n      border-left-color: @bg-color;\n    }\n  }\n}\n\n//border radius creator\n.border-radius(@radius) {\n  border-radius: @radius;\n}\n//Different radius each side\n.border-radius(@top-left; @top-right; @bottom-left; @bottom-right) {\n  border-top-left-radius: @top-left;\n  border-top-right-radius: @top-right;\n  border-bottom-right-radius: @bottom-right;\n  border-bottom-left-radius: @bottom-left;\n}\n\n//Gradient background\n.gradient(@color: #F5F5F5, @start: #EEE, @stop: #FFF) {\n  background: @color;\n  background: -webkit-gradient(linear,\n    left bottom,\n    left top,\n    color-stop(0, @start),\n    color-stop(1, @stop));\n  background: -ms-linear-gradient(bottom,\n    @start,\n    @stop);\n  background: -moz-linear-gradient(center bottom,\n    @start 0%,\n    @stop 100%);\n  background: -o-linear-gradient(@stop,\n    @start);\n  filter: e(%(\"progid:DXImageTransform.Microsoft.gradient(startColorstr='%d', endColorstr='%d', GradientType=0)\",@stop,@start));\n}\n\n//Added 2.1.0\n//Skins Mixins\n\n//Dark Sidebar Mixin\n.skin-dark-sidebar(@link-hover-border-color) {\n  // Sidebar background color (Both .wrapper and .left-side are responsible for sidebar bg color)\n  .wrapper,\n  .main-sidebar,\n  .left-side {\n    background-color: @sidebar-dark-bg;\n  }\n  //User Panel (resides in the sidebar)\n  .user-panel {\n    > .info, > .info > a {\n      color: #fff;\n    }\n  }\n  //Sidebar Menu. First level links\n  .sidebar-menu > li {\n    //Section Headning\n    &.header {\n      color: lighten(@sidebar-dark-bg, 20%);\n      background: darken(@sidebar-dark-bg, 4%);\n    }\n    //links\n    > a {\n      border-left: 3px solid transparent;\n    }\n    //Hover and active states\n    &:hover > a, &.active > a {\n      color: @sidebar-dark-hover-color;\n      background: @sidebar-dark-hover-bg;\n      border-left-color: @link-hover-border-color;\n    }\n    //First Level Submenu\n    > .treeview-menu {\n      margin: 0 1px;\n      background: @sidebar-dark-submenu-bg;\n    }\n  }\n  //All links within the sidebar menu\n  .sidebar a {\n    color: @sidebar-dark-color;\n    &:hover {\n      text-decoration: none;\n    }\n  }\n  //All submenus\n  .treeview-menu {\n    > li {\n      > a {\n        color: @sidebar-dark-submenu-color;\n      }\n      &.active > a, > a:hover {\n        color: @sidebar-dark-submenu-hover-color;\n      }\n    }\n  }\n  //The sidebar search form\n  .sidebar-form {\n    .border-radius(3px);\n    border: 1px solid lighten(@sidebar-dark-bg, 10%);\n    margin: 10px 10px;\n    input[type=\"text\"], .btn {\n      box-shadow: none;\n      background-color: lighten(@sidebar-dark-bg, 10%);\n      border: 1px solid transparent;\n      height: 35px;\n      .transition(all @transition-speed @transition-fn);\n    }\n    input[type=\"text\"] {\n      color: #666;\n      .border-radius(2px, 0, 2px, 0);\n      &:focus, &:focus + .input-group-btn .btn {\n        background-color: #fff;\n        color: #666;\n      }\n      &:focus + .input-group-btn .btn {\n        border-left-color: #fff;\n      }\n    }\n    .btn {\n      color: #999;\n      .border-radius(0, 2px, 0, 2px);\n    }\n  }\n}\n\n//Light Sidebar Mixin\n.skin-light-sidebar(@icon-active-color) {\n  // Sidebar background color (Both .wrapper and .left-side are responsible for sidebar bg color)\n  .wrapper,\n  .main-sidebar,\n  .left-side {\n    background-color: @sidebar-light-bg;\n  }\n  .content-wrapper,\n  .main-footer {\n    border-left: 1px solid @gray;\n  }\n  //User Panel (resides in the sidebar)\n  .user-panel {\n    > .info, > .info > a {\n      color: @sidebar-light-color;\n    }\n  }\n  //Sidebar Menu. First level links\n  .sidebar-menu > li {\n    .transition(border-left-color .3s ease);\n    //border-left: 3px solid transparent;\n    //Section Headning\n    &.header {\n      color: lighten(@sidebar-light-color, 25%);\n      background: @sidebar-light-bg;\n    }\n    //links\n    > a {\n      border-left: 3px solid transparent;\n      font-weight: 600;\n    }\n    //Hover and active states\n    &:hover > a,\n      &.active > a {\n      color: @sidebar-light-hover-color;\n      background: @sidebar-light-hover-bg;\n    }\n    &:hover > a {\n\n    }\n    &.active {\n      border-left-color: @icon-active-color;\n      > a {\n        font-weight: 600;\n      }\n    }\n    //First Level Submenu\n    > .treeview-menu {\n      background: @sidebar-light-submenu-bg;\n    }\n  }\n  //All links within the sidebar menu\n  .sidebar a {\n    color: @sidebar-light-color;\n    &:hover {\n      text-decoration: none;\n    }\n  }\n  //All submenus\n  .treeview-menu {\n    > li {\n      > a {\n        color: @sidebar-light-submenu-color;\n      }\n      &.active > a,\n      > a:hover {\n        color: @sidebar-light-submenu-hover-color;\n      }\n      &.active > a {\n        font-weight: 600;\n      }\n    }\n  }\n  //The sidebar search form\n  .sidebar-form {\n    .border-radius(3px);\n    border: 1px solid @gray;//darken(@sidebar-light-bg, 5%);\n    margin: 10px 10px;\n    input[type=\"text\"],\n    .btn {\n      box-shadow: none;\n      background-color: #fff;//darken(@sidebar-light-bg, 3%);\n      border: 1px solid transparent;\n      height: 35px;\n      .transition(all @transition-speed @transition-fn);\n    }\n    input[type=\"text\"] {\n      color: #666;\n      .border-radius(2px, 0, 2px, 0);\n      &:focus,\n        &:focus + .input-group-btn .btn {\n        background-color: #fff;\n        color: #666;\n      }\n      &:focus + .input-group-btn .btn {\n        border-left-color: #fff;\n      }\n    }\n    .btn {\n      color: #999;\n      .border-radius(0, 2px, 0, 2px);\n    }\n  }\n  @media(min-width: @screen-sm-min) {\n    &.sidebar-mini.sidebar-collapse {\n      .sidebar-menu > li > .treeview-menu {\n        border-left: 1px solid @gray;\n      }\n    }\n  }\n}\n","// Vendor Prefixes\n//\n// All vendor mixins are deprecated as of v3.2.0 due to the introduction of\n// Autoprefixer in our Gruntfile. They will be removed in v4.\n\n// - Animations\n// - Backface visibility\n// - Box shadow\n// - Box sizing\n// - Content columns\n// - Hyphens\n// - Placeholder text\n// - Transformations\n// - Transitions\n// - User Select\n\n\n// Animations\n.animation(@animation) {\n  -webkit-animation: @animation;\n       -o-animation: @animation;\n          animation: @animation;\n}\n.animation-name(@name) {\n  -webkit-animation-name: @name;\n          animation-name: @name;\n}\n.animation-duration(@duration) {\n  -webkit-animation-duration: @duration;\n          animation-duration: @duration;\n}\n.animation-timing-function(@timing-function) {\n  -webkit-animation-timing-function: @timing-function;\n          animation-timing-function: @timing-function;\n}\n.animation-delay(@delay) {\n  -webkit-animation-delay: @delay;\n          animation-delay: @delay;\n}\n.animation-iteration-count(@iteration-count) {\n  -webkit-animation-iteration-count: @iteration-count;\n          animation-iteration-count: @iteration-count;\n}\n.animation-direction(@direction) {\n  -webkit-animation-direction: @direction;\n          animation-direction: @direction;\n}\n.animation-fill-mode(@fill-mode) {\n  -webkit-animation-fill-mode: @fill-mode;\n          animation-fill-mode: @fill-mode;\n}\n\n// Backface visibility\n// Prevent browsers from flickering when using CSS 3D transforms.\n// Default value is `visible`, but can be changed to `hidden`\n\n.backface-visibility(@visibility){\n  -webkit-backface-visibility: @visibility;\n     -moz-backface-visibility: @visibility;\n          backface-visibility: @visibility;\n}\n\n// Drop shadows\n//\n// Note: Deprecated `.box-shadow()` as of v3.1.0 since all of Bootstrap's\n// supported browsers that have box shadow capabilities now support it.\n\n.box-shadow(@shadow) {\n  -webkit-box-shadow: @shadow; // iOS <4.3 & Android <4.1\n          box-shadow: @shadow;\n}\n\n// Box sizing\n.box-sizing(@boxmodel) {\n  -webkit-box-sizing: @boxmodel;\n     -moz-box-sizing: @boxmodel;\n          box-sizing: @boxmodel;\n}\n\n// CSS3 Content Columns\n.content-columns(@column-count; @column-gap: @grid-gutter-width) {\n  -webkit-column-count: @column-count;\n     -moz-column-count: @column-count;\n          column-count: @column-count;\n  -webkit-column-gap: @column-gap;\n     -moz-column-gap: @column-gap;\n          column-gap: @column-gap;\n}\n\n// Optional hyphenation\n.hyphens(@mode: auto) {\n  word-wrap: break-word;\n  -webkit-hyphens: @mode;\n     -moz-hyphens: @mode;\n      -ms-hyphens: @mode; // IE10+\n       -o-hyphens: @mode;\n          hyphens: @mode;\n}\n\n// Placeholder text\n.placeholder(@color: @input-color-placeholder) {\n  // Firefox\n  &::-moz-placeholder {\n    color: @color;\n    opacity: 1; // Override Firefox's unusual default opacity; see https://github.com/twbs/bootstrap/pull/11526\n  }\n  &:-ms-input-placeholder { color: @color; } // Internet Explorer 10+\n  &::-webkit-input-placeholder  { color: @color; } // Safari and Chrome\n}\n\n// Transformations\n.scale(@ratio) {\n  -webkit-transform: scale(@ratio);\n      -ms-transform: scale(@ratio); // IE9 only\n       -o-transform: scale(@ratio);\n          transform: scale(@ratio);\n}\n.scale(@ratioX; @ratioY) {\n  -webkit-transform: scale(@ratioX, @ratioY);\n      -ms-transform: scale(@ratioX, @ratioY); // IE9 only\n       -o-transform: scale(@ratioX, @ratioY);\n          transform: scale(@ratioX, @ratioY);\n}\n.scaleX(@ratio) {\n  -webkit-transform: scaleX(@ratio);\n      -ms-transform: scaleX(@ratio); // IE9 only\n       -o-transform: scaleX(@ratio);\n          transform: scaleX(@ratio);\n}\n.scaleY(@ratio) {\n  -webkit-transform: scaleY(@ratio);\n      -ms-transform: scaleY(@ratio); // IE9 only\n       -o-transform: scaleY(@ratio);\n          transform: scaleY(@ratio);\n}\n.skew(@x; @y) {\n  -webkit-transform: skewX(@x) skewY(@y);\n      -ms-transform: skewX(@x) skewY(@y); // See https://github.com/twbs/bootstrap/issues/4885; IE9+\n       -o-transform: skewX(@x) skewY(@y);\n          transform: skewX(@x) skewY(@y);\n}\n.translate(@x; @y) {\n  -webkit-transform: translate(@x, @y);\n      -ms-transform: translate(@x, @y); // IE9 only\n       -o-transform: translate(@x, @y);\n          transform: translate(@x, @y);\n}\n.translate3d(@x; @y; @z) {\n  -webkit-transform: translate3d(@x, @y, @z);\n          transform: translate3d(@x, @y, @z);\n}\n.rotate(@degrees) {\n  -webkit-transform: rotate(@degrees);\n      -ms-transform: rotate(@degrees); // IE9 only\n       -o-transform: rotate(@degrees);\n          transform: rotate(@degrees);\n}\n.rotateX(@degrees) {\n  -webkit-transform: rotateX(@degrees);\n      -ms-transform: rotateX(@degrees); // IE9 only\n       -o-transform: rotateX(@degrees);\n          transform: rotateX(@degrees);\n}\n.rotateY(@degrees) {\n  -webkit-transform: rotateY(@degrees);\n      -ms-transform: rotateY(@degrees); // IE9 only\n       -o-transform: rotateY(@degrees);\n          transform: rotateY(@degrees);\n}\n.perspective(@perspective) {\n  -webkit-perspective: @perspective;\n     -moz-perspective: @perspective;\n          perspective: @perspective;\n}\n.perspective-origin(@perspective) {\n  -webkit-perspective-origin: @perspective;\n     -moz-perspective-origin: @perspective;\n          perspective-origin: @perspective;\n}\n.transform-origin(@origin) {\n  -webkit-transform-origin: @origin;\n     -moz-transform-origin: @origin;\n      -ms-transform-origin: @origin; // IE9 only\n          transform-origin: @origin;\n}\n\n\n// Transitions\n\n.transition(@transition) {\n  -webkit-transition: @transition;\n       -o-transition: @transition;\n          transition: @transition;\n}\n.transition-property(@transition-property) {\n  -webkit-transition-property: @transition-property;\n          transition-property: @transition-property;\n}\n.transition-delay(@transition-delay) {\n  -webkit-transition-delay: @transition-delay;\n          transition-delay: @transition-delay;\n}\n.transition-duration(@transition-duration) {\n  -webkit-transition-duration: @transition-duration;\n          transition-duration: @transition-duration;\n}\n.transition-timing-function(@timing-function) {\n  -webkit-transition-timing-function: @timing-function;\n          transition-timing-function: @timing-function;\n}\n.transition-transform(@transition) {\n  -webkit-transition: -webkit-transform @transition;\n     -moz-transition: -moz-transform @transition;\n       -o-transition: -o-transform @transition;\n          transition: transform @transition;\n}\n\n\n// User select\n// For selecting text on the page\n\n.user-select(@select) {\n  -webkit-user-select: @select;\n     -moz-user-select: @select;\n      -ms-user-select: @select; // IE10+\n          user-select: @select;\n}\n"],"names":[],"sourceRoot":""}
\ No newline at end of file
diff --git a/public/css/dist/skins/skin-blue-dark.min.css b/public/css/dist/skins/skin-blue-dark.min.css
index bfac907779..97a05cf51c 100644
--- a/public/css/dist/skins/skin-blue-dark.min.css
+++ b/public/css/dist/skins/skin-blue-dark.min.css
@@ -170,6 +170,10 @@ a:visited {
 .text-primary {
   color: #fff;
 }
+#sort tr.cansort {
+  background-color: var(--back-main);
+  color: var(--text-main);
+}
 :root {
   --background: #222;
   --back-main: #333;
@@ -373,11 +377,6 @@ input[type=search] {
   background-color: var(--back-sub);
   color: var(--text-main);
 }
-.input-group,
-.input-group-addon {
-  background-color: var(--back-sub) !important;
-  color: var(--text-main);
-}
 #licensesTable > tbody > tr > td > nobr > a > i.fa {
   color: var(--text-main);
 }
@@ -463,7 +462,7 @@ input[type=search] {
   background-color: var(--back-sub);
 }
 .table-striped > tbody > tr:nth-of-type(even) {
-  background-color: var(--back-sub-alt);
+  background-color: var(--back-main);
 }
 #webui > div > div > div > div > div > table > tbody > tr > td > a > i.fa,
 .box-body,
@@ -488,7 +487,16 @@ a:visited {
   color: var(--visited-link);
 }
 #customFieldsTable a[href*='/models'] {
-  color: var(--back-sub);
+  background-color: var(--back-sub-alt);
+  color: var(--link);
+}
+#customFieldsTable a[href*='/models']:hover {
+  background-color: var(--text-sub);
+  color: var(--button-hover);
+}
+#customFieldsTable a[href*='/models']:visited {
+  background-color: var(--background);
+  color: var(--visited-link);
 }
 #customFieldsTable a[href*='/fieldsets'] {
   background-color: transparent;
diff --git a/public/css/dist/skins/skin-blue.css b/public/css/dist/skins/skin-blue.css
index cac9000174..216768cdf1 100644
--- a/public/css/dist/skins/skin-blue.css
+++ b/public/css/dist/skins/skin-blue.css
@@ -236,4 +236,16 @@ a.settings_button:visited,
 a.settings_button:hover {
   color: #3c8dbc;
 }
+a.label.label-default:link {
+  color: #307095;
+  /* Use same as Header picker, lighten by 70% */
+}
+a.label.label-default:visited {
+  color: #23536f;
+  /* Use same as Header picker, lighten by 70% */
+}
+a.label.label-default:hover {
+  background-color: #BBB;
+  color: #296282;
+}
 
diff --git a/public/css/dist/skins/skin-blue.min.css b/public/css/dist/skins/skin-blue.min.css
index cac9000174..216768cdf1 100644
--- a/public/css/dist/skins/skin-blue.min.css
+++ b/public/css/dist/skins/skin-blue.min.css
@@ -236,4 +236,16 @@ a.settings_button:visited,
 a.settings_button:hover {
   color: #3c8dbc;
 }
+a.label.label-default:link {
+  color: #307095;
+  /* Use same as Header picker, lighten by 70% */
+}
+a.label.label-default:visited {
+  color: #23536f;
+  /* Use same as Header picker, lighten by 70% */
+}
+a.label.label-default:hover {
+  background-color: #BBB;
+  color: #296282;
+}
 
diff --git a/public/css/dist/skins/skin-green-dark.css b/public/css/dist/skins/skin-green-dark.css
index 275fa58ade..fed4dd79a5 100644
--- a/public/css/dist/skins/skin-green-dark.css
+++ b/public/css/dist/skins/skin-green-dark.css
@@ -170,6 +170,10 @@ a:visited {
 .text-primary {
   color: #fff;
 }
+#sort tr.cansort {
+  background-color: var(--back-main);
+  color: var(--text-main);
+}
 :root {
   --background: #222;
   --back-main: #333;
@@ -364,11 +368,6 @@ input[type=search] {
   background-color: var(--back-sub);
   color: var(--text-main);
 }
-.input-group,
-.input-group-addon {
-  background-color: var(--back-sub) !important;
-  color: var(--text-main);
-}
 #licensesTable > tbody > tr > td > nobr > a > i.fa {
   color: var(--text-main);
 }
@@ -475,7 +474,16 @@ a:visited {
   color: var(--visited-link);
 }
 #customFieldsTable a[href*='/models'] {
-  color: var(--back-sub);
+  background-color: var(--back-sub-alt);
+  color: var(--link);
+}
+#customFieldsTable a[href*='/models']:hover {
+  background-color: var(--text-sub);
+  color: var(--button-hover);
+}
+#customFieldsTable a[href*='/models']:visited {
+  background-color: var(--background);
+  color: var(--visited-link);
 }
 #customFieldsTable a[href*='/fieldsets'] {
   background-color: transparent;
diff --git a/public/css/dist/skins/skin-green-dark.min.css b/public/css/dist/skins/skin-green-dark.min.css
index 275fa58ade..fed4dd79a5 100644
--- a/public/css/dist/skins/skin-green-dark.min.css
+++ b/public/css/dist/skins/skin-green-dark.min.css
@@ -170,6 +170,10 @@ a:visited {
 .text-primary {
   color: #fff;
 }
+#sort tr.cansort {
+  background-color: var(--back-main);
+  color: var(--text-main);
+}
 :root {
   --background: #222;
   --back-main: #333;
@@ -364,11 +368,6 @@ input[type=search] {
   background-color: var(--back-sub);
   color: var(--text-main);
 }
-.input-group,
-.input-group-addon {
-  background-color: var(--back-sub) !important;
-  color: var(--text-main);
-}
 #licensesTable > tbody > tr > td > nobr > a > i.fa {
   color: var(--text-main);
 }
@@ -475,7 +474,16 @@ a:visited {
   color: var(--visited-link);
 }
 #customFieldsTable a[href*='/models'] {
-  color: var(--back-sub);
+  background-color: var(--back-sub-alt);
+  color: var(--link);
+}
+#customFieldsTable a[href*='/models']:hover {
+  background-color: var(--text-sub);
+  color: var(--button-hover);
+}
+#customFieldsTable a[href*='/models']:visited {
+  background-color: var(--background);
+  color: var(--visited-link);
 }
 #customFieldsTable a[href*='/fieldsets'] {
   background-color: transparent;
diff --git a/public/css/dist/skins/skin-orange-dark.css b/public/css/dist/skins/skin-orange-dark.css
index 816c529ef2..04fd2f16ad 100644
--- a/public/css/dist/skins/skin-orange-dark.css
+++ b/public/css/dist/skins/skin-orange-dark.css
@@ -164,6 +164,10 @@ li.dropdown-item-marker {
 .text-primary {
   color: #fff;
 }
+#sort tr.cansort {
+  background-color: var(--back-main);
+  color: var(--text-main);
+}
 :root {
   --background: #222;
   --back-main: #333;
@@ -374,11 +378,6 @@ input[type=search] {
   background-color: var(--back-sub);
   color: var(--text-main);
 }
-.input-group,
-.input-group-addon {
-  background-color: var(--back-sub) !important;
-  color: var(--text-main);
-}
 #licensesTable > tbody > tr > td > nobr > a > i.fa {
   color: var(--text-main);
 }
@@ -476,7 +475,16 @@ input[type=search] {
   border-bottom: #000;
 }
 #customFieldsTable a[href*='/models'] {
-  color: var(--back-sub);
+  background-color: var(--back-sub-alt);
+  color: var(--link);
+}
+#customFieldsTable a[href*='/models']:hover {
+  background-color: var(--text-sub);
+  color: var(--button-hover);
+}
+#customFieldsTable a[href*='/models']:visited {
+  background-color: var(--background);
+  color: var(--visited-link);
 }
 #customFieldsTable a[href*='/fieldsets'] {
   background-color: transparent;
diff --git a/public/css/dist/skins/skin-orange-dark.min.css b/public/css/dist/skins/skin-orange-dark.min.css
index 816c529ef2..04fd2f16ad 100644
--- a/public/css/dist/skins/skin-orange-dark.min.css
+++ b/public/css/dist/skins/skin-orange-dark.min.css
@@ -164,6 +164,10 @@ li.dropdown-item-marker {
 .text-primary {
   color: #fff;
 }
+#sort tr.cansort {
+  background-color: var(--back-main);
+  color: var(--text-main);
+}
 :root {
   --background: #222;
   --back-main: #333;
@@ -374,11 +378,6 @@ input[type=search] {
   background-color: var(--back-sub);
   color: var(--text-main);
 }
-.input-group,
-.input-group-addon {
-  background-color: var(--back-sub) !important;
-  color: var(--text-main);
-}
 #licensesTable > tbody > tr > td > nobr > a > i.fa {
   color: var(--text-main);
 }
@@ -476,7 +475,16 @@ input[type=search] {
   border-bottom: #000;
 }
 #customFieldsTable a[href*='/models'] {
-  color: var(--back-sub);
+  background-color: var(--back-sub-alt);
+  color: var(--link);
+}
+#customFieldsTable a[href*='/models']:hover {
+  background-color: var(--text-sub);
+  color: var(--button-hover);
+}
+#customFieldsTable a[href*='/models']:visited {
+  background-color: var(--background);
+  color: var(--visited-link);
 }
 #customFieldsTable a[href*='/fieldsets'] {
   background-color: transparent;
diff --git a/public/css/dist/skins/skin-purple-dark.css b/public/css/dist/skins/skin-purple-dark.css
index 88fe4ee35b..f07f224a34 100644
--- a/public/css/dist/skins/skin-purple-dark.css
+++ b/public/css/dist/skins/skin-purple-dark.css
@@ -170,6 +170,10 @@ a:visited {
 .text-primary {
   color: #fff;
 }
+#sort tr.cansort {
+  background-color: var(--back-main);
+  color: var(--text-main);
+}
 :root {
   --background: #222;
   --back-main: #333;
@@ -374,11 +378,6 @@ input[type=search] {
   background-color: var(--back-sub);
   color: var(--text-main);
 }
-.input-group,
-.input-group-addon {
-  background-color: var(--back-sub) !important;
-  color: var(--text-main);
-}
 #licensesTable > tbody > tr > td > nobr > a > i.fa {
   color: var(--text-main);
 }
@@ -496,6 +495,18 @@ a:visited {
   box-sizing: border-box;
   display: table;
 }
+#customFieldsTable a[href*='/models'] {
+  background-color: var(--back-sub-alt);
+  color: var(--link);
+}
+#customFieldsTable a[href*='/models']:hover {
+  background-color: var(--text-sub);
+  color: var(--button-hover);
+}
+#customFieldsTable a[href*='/models']:visited {
+  background-color: var(--back-sub);
+  color: var(--visited-link);
+}
 .row-striped .row:nth-of-type(odd) div {
   background-color: var(--back-sub);
   color: var(--text-main);
diff --git a/public/css/dist/skins/skin-purple-dark.min.css b/public/css/dist/skins/skin-purple-dark.min.css
index 88fe4ee35b..f07f224a34 100644
--- a/public/css/dist/skins/skin-purple-dark.min.css
+++ b/public/css/dist/skins/skin-purple-dark.min.css
@@ -170,6 +170,10 @@ a:visited {
 .text-primary {
   color: #fff;
 }
+#sort tr.cansort {
+  background-color: var(--back-main);
+  color: var(--text-main);
+}
 :root {
   --background: #222;
   --back-main: #333;
@@ -374,11 +378,6 @@ input[type=search] {
   background-color: var(--back-sub);
   color: var(--text-main);
 }
-.input-group,
-.input-group-addon {
-  background-color: var(--back-sub) !important;
-  color: var(--text-main);
-}
 #licensesTable > tbody > tr > td > nobr > a > i.fa {
   color: var(--text-main);
 }
@@ -496,6 +495,18 @@ a:visited {
   box-sizing: border-box;
   display: table;
 }
+#customFieldsTable a[href*='/models'] {
+  background-color: var(--back-sub-alt);
+  color: var(--link);
+}
+#customFieldsTable a[href*='/models']:hover {
+  background-color: var(--text-sub);
+  color: var(--button-hover);
+}
+#customFieldsTable a[href*='/models']:visited {
+  background-color: var(--back-sub);
+  color: var(--visited-link);
+}
 .row-striped .row:nth-of-type(odd) div {
   background-color: var(--back-sub);
   color: var(--text-main);
diff --git a/public/css/dist/skins/skin-red-dark.css b/public/css/dist/skins/skin-red-dark.css
index db532575b2..907f3ee816 100644
--- a/public/css/dist/skins/skin-red-dark.css
+++ b/public/css/dist/skins/skin-red-dark.css
@@ -170,6 +170,10 @@ a:visited {
 .text-primary {
   color: #fff;
 }
+#sort tr.cansort {
+  background-color: var(--back-main);
+  color: var(--text-main);
+}
 :root {
   --background: #222;
   --back-main: #333;
@@ -373,11 +377,6 @@ input[type=search] {
   background-color: var(--back-sub);
   color: var(--text-main);
 }
-.input-group,
-.input-group-addon {
-  background-color: var(--back-sub) !important;
-  color: var(--text-main);
-}
 #licensesTable > tbody > tr > td > nobr > a > i.fa {
   color: var(--text-main);
 }
@@ -494,7 +493,16 @@ a:visited {
   color: var(--nav-link);
 }
 #customFieldsTable a[href*='/models'] {
-  color: var(--back-sub);
+  background-color: var(--back-sub-alt);
+  color: var(--link);
+}
+#customFieldsTable a[href*='/models']:hover {
+  background-color: var(--text-sub);
+  color: var(--button-hover);
+}
+#customFieldsTable a[href*='/models']:visited {
+  background-color: var(--back-sub);
+  color: var(--visited-link);
 }
 #customFieldsTable a[href*='/fieldsets'] {
   background-color: transparent;
diff --git a/public/css/dist/skins/skin-red-dark.min.css b/public/css/dist/skins/skin-red-dark.min.css
index db532575b2..907f3ee816 100644
--- a/public/css/dist/skins/skin-red-dark.min.css
+++ b/public/css/dist/skins/skin-red-dark.min.css
@@ -170,6 +170,10 @@ a:visited {
 .text-primary {
   color: #fff;
 }
+#sort tr.cansort {
+  background-color: var(--back-main);
+  color: var(--text-main);
+}
 :root {
   --background: #222;
   --back-main: #333;
@@ -373,11 +377,6 @@ input[type=search] {
   background-color: var(--back-sub);
   color: var(--text-main);
 }
-.input-group,
-.input-group-addon {
-  background-color: var(--back-sub) !important;
-  color: var(--text-main);
-}
 #licensesTable > tbody > tr > td > nobr > a > i.fa {
   color: var(--text-main);
 }
@@ -494,7 +493,16 @@ a:visited {
   color: var(--nav-link);
 }
 #customFieldsTable a[href*='/models'] {
-  color: var(--back-sub);
+  background-color: var(--back-sub-alt);
+  color: var(--link);
+}
+#customFieldsTable a[href*='/models']:hover {
+  background-color: var(--text-sub);
+  color: var(--button-hover);
+}
+#customFieldsTable a[href*='/models']:visited {
+  background-color: var(--back-sub);
+  color: var(--visited-link);
 }
 #customFieldsTable a[href*='/fieldsets'] {
   background-color: transparent;
diff --git a/public/css/dist/skins/skin-yellow-dark.css b/public/css/dist/skins/skin-yellow-dark.css
index fb692ce058..a1311532e4 100644
--- a/public/css/dist/skins/skin-yellow-dark.css
+++ b/public/css/dist/skins/skin-yellow-dark.css
@@ -150,6 +150,10 @@ a:visited {
 .text-primary {
   color: #fff;
 }
+#sort tr.cansort {
+  background-color: var(--back-main);
+  color: var(--text-main);
+}
 :root {
   --background: #222;
   --back-main: #333;
@@ -351,11 +355,6 @@ input[type=search] {
   background-color: var(--back-sub);
   color: var(--text-main);
 }
-.input-group,
-.input-group-addon {
-  background-color: var(--back-sub) !important;
-  color: var(--text-main);
-}
 #licensesTable > tbody > tr > td > nobr > a > i.fa {
   color: var(--text-main);
 }
@@ -452,6 +451,18 @@ tr th div.th-inner {
 .box-header.with-border {
   border-bottom: #000;
 }
+#customFieldsTable a[href*='/models'] {
+  background-color: var(--back-sub-alt);
+  color: var(--link);
+}
+#customFieldsTable a[href*='/models']:hover {
+  background-color: var(--text-sub);
+  color: var(--button-hover);
+}
+#customFieldsTable a[href*='/models']:visited {
+  background-color: var(--background);
+  color: var(--visited-link);
+}
 .row-striped {
   vertical-align: top;
   line-height: 2.6;
diff --git a/public/css/dist/skins/skin-yellow-dark.min.css b/public/css/dist/skins/skin-yellow-dark.min.css
index fb692ce058..a1311532e4 100644
--- a/public/css/dist/skins/skin-yellow-dark.min.css
+++ b/public/css/dist/skins/skin-yellow-dark.min.css
@@ -150,6 +150,10 @@ a:visited {
 .text-primary {
   color: #fff;
 }
+#sort tr.cansort {
+  background-color: var(--back-main);
+  color: var(--text-main);
+}
 :root {
   --background: #222;
   --back-main: #333;
@@ -351,11 +355,6 @@ input[type=search] {
   background-color: var(--back-sub);
   color: var(--text-main);
 }
-.input-group,
-.input-group-addon {
-  background-color: var(--back-sub) !important;
-  color: var(--text-main);
-}
 #licensesTable > tbody > tr > td > nobr > a > i.fa {
   color: var(--text-main);
 }
@@ -452,6 +451,18 @@ tr th div.th-inner {
 .box-header.with-border {
   border-bottom: #000;
 }
+#customFieldsTable a[href*='/models'] {
+  background-color: var(--back-sub-alt);
+  color: var(--link);
+}
+#customFieldsTable a[href*='/models']:hover {
+  background-color: var(--text-sub);
+  color: var(--button-hover);
+}
+#customFieldsTable a[href*='/models']:visited {
+  background-color: var(--background);
+  color: var(--visited-link);
+}
 .row-striped {
   vertical-align: top;
   line-height: 2.6;
diff --git a/public/css/overrides.css.map b/public/css/overrides.css.map
index bfec6b1f14..3ee4545e6c 100644
--- a/public/css/overrides.css.map
+++ b/public/css/overrides.css.map
@@ -1 +1 @@
-{"version":3,"sources":["webpack:///./resources/assets/less/overrides.less"],"names":[],"mappings":"AAAA,6OAkBE,yBAEF,mBACE,qBACA,mBACA,gBACA,cACA,WACA,iFACE,WAGJ,MACE,eAGF,UACI,kBACA,gBAGJ,oBACI,cAIJ,iBACA,kBACA,aACA,mBACA,kBACA,8BACA,WACA,YAGA,mBACE,WACA,WACA,YACA,kBACA,kBAGF,gCACE,yBAGF,mBACI,WAGJ,kBACE,aACA,YAIF,QACE,kBAGF,2BACI,kBACA,MACA,QACA,eACA,gBACA,gBACA,iBACA,wBACA,UACA,aACA,gBACA,eACA,cAEJ,aACE,eAEF,aACE,iBAIF,sCACE,cAEF,mBACE,qBAIF,gBACE,kBACA,YACA,yBAGF,uBACE,YACA,WACA,iBAwBF,oCACE,eAAS,CAGX,sBACE,aACA,aAIF,mBACE,WAEF,aACE,cACA,mCAGF,wBACE,cACA,cAGF,0BACQ,mBACA,kBAEN,yBACI,iBAGN,aACE,cACA,6BACA,8CAGF,yBACE,cAGF,yBACE,cAGF,sBACE,cAGF,yBACE,cAGF,wBACE,cAGF,uJACE,WAGF,eACC,eACA,MACA,aACA,YACA,YACA,gBACA,YACC,iBACA,WACA,aAEF,kBACC,kBACA,YACA,WACA,gBACA,gBACA,6BAED,qCACC,kBACA,SACA,WACA,qBACA,oBACA,6BACA,gBACA,cACA,gBACA,WACA,qBACA,mBAED,2CACC,WAED,kBACC,gBACA,gBACA,6BACA,gCAED,qBACC,6BACA,gCAED,uBACC,kBACA,cACA,aACA,WACA,qBAED,6BACC,gBACA,WAED,yBACC,kBACA,SACA,WACA,WAGA,iBACE,eACA,aAKF,WAAY,gBAGA,gCAAkC,iBAC9C,2BAA8B,UAAY,kBAE1C,8CAAiD,cAAgB,eAAiB,kBAClF,2CAA8C,WAAa,eAC3D,0CAA+C,kBAAoB,WAAa,YAAc,cAAgB,mBAAqB,SAAW,SAAW,iBAAmB,kBAAoB,kBAChM,gDAAqD,YAAc,WAAa,YAAc,mBAAqB,mBAAqB,kBAAoB,QAAU,SACtK,qCAA0C,kBAAoB,gBAAoB,WAAa,wCAAkB,cACjH,mDAA0D,QAAW,wCAAkB,mBACvF,4DAAmE,WACnE,0DAAiE,UACjE,sEAA6E,QAC7E,qEAA4E,WAC5E,mDAAwD,yBACxD,yDAA8D,UAC9D,iDAAuD,SAAW,UAClE,gDAAsD,UACtD,oDAAuD,oBAGxD,eACE,qBACA,WACA,gBACA,WACA,UAIF,mQAkBE,WAGF,wBACC,6BAID,UACE,8BAGF,KACE,oIAIA,eAGF,cACE,eACA,mBAGF,aACE,cACE,aAGF,uBACE,wBACA,oBACA,8BAIJ,uCACE,WACA,sBACA,gBAGF,iBACE,gBAGF,8BACE,eAGF,SACE,uBAGF,SACE,gBAGF,eACE,qBACA,CAIF,UACE,eACA,cAGF,YACE,iBACA,oBACA,gBAIF,YACE,YACA,kBACA,SACA,UACA,WACA,gBACA,aAEF,qCACE,WACA,sBACA,UACA,SACA,UACA,YACA,cACA,gBACA,YACA,mBACA,sBACA,kBACA,gBACA,YAGF,GACE,eAGF,GACE,eAGF,GACE,eAIF,aACE,mBACA,gBACA,UACA,iBACA,oDAGA,cAIF,uCACE,yBACA,0BACA,mBAIF,sCACE,gBACA,0BACA,mBAoBF,yGAKE,YACA,wBACA,gBACA,oBACA,mCACA,kCAIF,qKAOE,qBACA,6CACA,eAGF,gCAEE,gBACA,kBAGF,gCAEE,eAAS,CAGX,gCAEE,eAAS,CAGX,mCAEE,eAAS,CAGX,kCAEE,eAAS","file":"css/overrides.css","sourcesContent":[".skin-red\n.skin-purple\n.skin-blue\n.skin-black\n.skin-orange\n.skin-yellow\n.skin-green\n.skin-red-dark\n.skin-purple-dark\n.skin-blue-dark\n.skin-black-dark\n.skin-orange-dark\n.skin-yellow-dark\n.skin-green-dark\n.skin-contrast\n.main-header\n\n.logo {\n  background-color: inherit;\n}\n.main-header .logo {\n  width: 100% !important;\n  white-space: nowrap;\n  text-align: left;\n  display: block;\n  clear: both;\n  &a:link, a:hover, a:visited   {\n    color: #fff\n  }\n}\n.huge {\n  font-size: 40px;\n}\n\n.btn-file {\n    position: relative;\n    overflow: hidden;\n}\n\n.dropdown-menu>li>a {\n    color: #354044;\n}\n\n\n#sort tr.cansort {\nborder-radius: 2px;\npadding: 10px;\nbackground: #f4f4f4;\nmargin-bottom: 3px;\nborder-left: 2px solid #e6e7e8;\ncolor: #444;\ncursor: move;\n}\n\n.user-image-inline {\n  float: left;\n  width: 25px;\n  height: 25px;\n  border-radius: 50%;\n  margin-right: 10px;\n}\n\n.input-group .input-group-addon {\n  background-color: #f4f4f4;\n}\n\na.accordion-header {\n    color: #333;\n}\n\n.dynamic-form-row {\n  padding: 10px;\n  margin: 20px;\n}\n\n\n.handle {\n  padding-left: 10px;\n}\n\n.btn-file input[type=file] {\n    position: absolute;\n    top: 0;\n    right: 0;\n    min-width: 100%;\n    min-height: 100%;\n    font-size: 100px;\n    text-align: right;\n    filter: alpha(opacity=0);\n    opacity: 0;\n    outline: none;\n    background: white;\n    cursor: inherit;\n    display: block;\n}\n.main-footer {\n  font-size: 13px;\n}\n.main-header {\n  max-height: 150px;\n}\n\n\n.navbar-nav>.user-menu>.dropdown-menu {\n  width: inherit;\n}\n.main-header .logo {\n  padding: 0px 5px 0px 15px;\n}\n\n\n.sidebar-toggle {\n  margin-left: -48px;\n  z-index: 100;\n  background-color: inherit;\n}\n\n.sidebar-toggle-mobile {\n  z-index: 100;\n  width: 50px;\n  padding-top: 10px;\n}\n\n.skin-red\n.skin-purple\n.skin-blue\n.skin-black\n.skin-orange\n.skin-yellow\n.skin-green\n.skin-red-dark\n.skin-purple-dark\n.skin-blue-dark\n.skin-black-dark\n.skin-orange-dark\n.skin-yellow-dark\n.skin-green-dark\n.skin-contrast\n.main-header\n.navbar\n.dropdown-menu li a {\n  //color: inherit;\n}\n\n.main-header .sidebar-toggle:before {\n  content: \"\\f0c9\";\n}\n\n.direct-chat-contacts {\n  padding: 10px;\n  height: 150px;\n}\n\n\n.select2-container {\n  width: 100%;\n}\n.error input {\n  color: #dd4b39;\n  border: 2px solid #dd4b39 !important;\n}\n\n.error label, .alert-msg {\n  color: #dd4b39;\n  display: block;\n}\n\n.input-group[class*=\"col-\"] {\n        padding-right: 15px;\n        padding-left: 15px;\n  }\n  .control-label.multiline {\n      padding-top: 10px;\n  }\n\n.btn-outline {\n  color: inherit;\n  background-color: transparent;\n  transition: all .5s;\n}\n\n.btn-primary.btn-outline {\n  color: #428bca;\n}\n\n.btn-success.btn-outline {\n  color: #5cb85c;\n}\n\n.btn-info.btn-outline {\n  color: #5bc0de;\n}\n\n.btn-warning.btn-outline {\n  color: #f0ad4e;\n}\n\n.btn-danger.btn-outline {\n  color: #d9534f;\n}\n\n.btn-primary.btn-outline:hover, .btn-success.btn-outline:hover, .btn-info.btn-outline:hover, .btn-warning.btn-outline:hover, .btn-danger.btn-outline:hover {\n  color: #fff;\n}\n\n.slideout-menu {\n\tposition: fixed;\n\ttop: 0;\n\tright: -250px;\n\twidth: 250px;\n\theight: 100%;\n\tbackground: #333;\n\tz-index: 100;\n  margin-top: 100px;\n  color: white;\n  padding: 10px;\n}\n.slideout-menu h3 {\n\tposition: relative;\n\tpadding: 5px 5px;\n\tcolor: #fff;\n\tfont-size: 1.2em;\n\tfont-weight: 400;\n\tborder-bottom: 4px solid #222;\n}\n.slideout-menu .slideout-menu-toggle {\n\tposition: absolute;\n\ttop: 12px;\n\tright: 10px;\n\tdisplay: inline-block;\n\tpadding: 6px 9px 5px;\n\tfont-family: Arial, sans-serif;\n\tfont-weight: bold;\n\tline-height: 1;\n\tbackground: #222;\n\tcolor: #999;\n\ttext-decoration: none;\n\tvertical-align: top;\n}\n.slideout-menu .slideout-menu-toggle:hover {\n\tcolor: #fff;\n}\n.slideout-menu ul {\n\tlist-style: none;\n\tfont-weight: 300;\n\tborder-top: 1px solid #151515;\n\tborder-bottom: 1px solid #454545;\n}\n.slideout-menu ul li {\n\tborder-top: 1px solid #454545;\n\tborder-bottom: 1px solid #151515;\n}\n.slideout-menu ul li a {\n\tposition: relative;\n\tdisplay: block;\n\tpadding: 10px;\n\tcolor: #999;\n\ttext-decoration: none;\n}\n.slideout-menu ul li a:hover {\n\tbackground: #000;\n\tcolor: #fff;\n}\n.slideout-menu ul li a i {\n\tposition: absolute;\n\ttop: 15px;\n\tright: 10px;\n\topacity: .5;\n}\n\n .btn-box-tool-lg {\n   font-size: 16px;\n   color: orange;\n }\n\n\n\n .bs-wizard {margin-top: 20px;}\n\n /*Form Wizard*/\n .bs-wizard {border-bottom: solid 1px #e0e0e0; padding: 0 0 10px 0;}\n .bs-wizard > .bs-wizard-step {padding: 0; position: relative;}\n .bs-wizard > .bs-wizard-step + .bs-wizard-step {}\n .bs-wizard > .bs-wizard-step .bs-wizard-stepnum {color: #595959; font-size: 16px; margin-bottom: 5px;}\n .bs-wizard > .bs-wizard-step .bs-wizard-info {color: #999; font-size: 14px;}\n .bs-wizard > .bs-wizard-step > .bs-wizard-dot {position: absolute; width: 30px; height: 30px; display: block; background: #fbe8aa; top: 45px; left: 50%; margin-top: -15px; margin-left: -15px; border-radius: 50%;}\n .bs-wizard > .bs-wizard-step > .bs-wizard-dot:after {content: ' '; width: 14px; height: 14px; background: #fbbd19; border-radius: 50px; position: absolute; top: 8px; left: 8px; }\n .bs-wizard > .bs-wizard-step > .progress {position: relative; border-radius: 0px; height: 8px; box-shadow: none; margin: 20px 0;}\n .bs-wizard > .bs-wizard-step > .progress > .progress-bar {width:0px; box-shadow: none; background: #fbe8aa;}\n .bs-wizard > .bs-wizard-step.complete > .progress > .progress-bar {width:100%;}\n .bs-wizard > .bs-wizard-step.active > .progress > .progress-bar {width:50%;}\n .bs-wizard > .bs-wizard-step:first-child.active > .progress > .progress-bar {width:0%;}\n .bs-wizard > .bs-wizard-step:last-child.active > .progress > .progress-bar {width: 100%;}\n .bs-wizard > .bs-wizard-step.disabled > .bs-wizard-dot {background-color: #f5f5f5;}\n .bs-wizard > .bs-wizard-step.disabled > .bs-wizard-dot:after {opacity: 0;}\n .bs-wizard > .bs-wizard-step:first-child  > .progress {left: 50%; width: 50%;}\n .bs-wizard > .bs-wizard-step:last-child  > .progress {width: 50%;}\n .bs-wizard > .bs-wizard-step.disabled a.bs-wizard-dot{ pointer-events: none; }\n /*END Form Wizard*/\n\n.left-navblock {\n  display: inline-block;\n  float: left;\n  text-align: left;\n  color: white;\n  padding: 0px;\n  /* adjust based on your layout */\n\n}\n.skin-red\n.skin-purple\n.skin-blue\n.skin-black\n.skin-orange\n.skin-yellow\n.skin-green\n.skin-red-dark\n.skin-purple-dark\n.skin-blue-dark\n.skin-black-dark\n.skin-orange-dark\n.skin-yellow-dark\n.skin-green-dark\n.skin-contrast\n.main-header\n.navbar\n.dropdown-menu li a {\n  color: #333;\n}\n\na.logo.no-hover a:hover {\n background-color: transparent;\n}\n\n\n.required {\n  border-right: 6px solid orange;\n}\n\nbody {\n  font-family: -apple-system, BlinkMacSystemFont,\n  \"Segoe UI\", \"Roboto\", \"Oxygen\", \"Ubuntu\", \"Cantarell\",\n  \"Fira Sans\", \"Droid Sans\", \"Helvetica Neue\",\n  sans-serif;\n  font-size: 13px;\n}\n\n.sidebar-menu {\n  font-size: 14px;\n  white-space: normal;\n}\n\n@media print {\n  a[href]:after {\n    content: none;\n  }\n\n  .tab-content > .tab-pane {\n    display: block !important;\n    opacity: 1 !important;\n    visibility: visible !important;\n  }\n}\n\nimg.navbar-brand-img, .navbar-brand>img {\n  float: left;\n  padding: 5px 5px 5px 0;\n  max-height: 50px;\n}\n\n.input-daterange {\n  border-radius: 0px;\n}\n\n.btn.bg-maroon, .btn.bg-purple{\n  min-width:90px;\n}\n\n[hidden] {\n  display: none !important;\n}\n\n#toolbar {\n  margin-top: 10px;\n}\n\n#uploadPreview {\n  border-color: grey;\n  border-width: 1px;\n  border-style: solid\n}\n\n.icon-med {\n  font-size: 20px;\n  color: #889195;\n}\n\n#login-logo {\n  padding-top: 20px;\n  padding-bottom: 10px;\n  max-width: 200px\n}\n\n// accessibility skip link\na.skip-main {\n  left:-999px;\n  position:absolute;\n  top:auto;\n  width:1px;\n  height:1px;\n  overflow:hidden;\n  z-index:-999;\n}\na.skip-main:focus, a.skip-main:active {\n  color: #fff;\n  background-color:#000;\n  left: auto;\n  top: auto;\n  width: 30%;\n  height: auto;\n  overflow:auto;\n  margin: 10px 35%;\n  padding:5px;\n  border-radius: 15px;\n  border:4px solid yellow;\n  text-align:center;\n  font-size:1.2em;\n  z-index:999;\n}\n\nh2 {\n  font-size: 22px;\n}\n\nh3 {\n  font-size: 20px;\n}\n\nh4 {\n  font-size: 16px;\n}\n\n\n.row-striped {\n  vertical-align: top;\n  line-height: 2.6;\n  padding: 0px;\n  margin-left: 20px;\n  box-sizing: border-box;\n  //border-left: 1px solid #dddddd;\n  //border-right: 1px solid #dddddd;\n  display: table;\n\n}\n\n.row-striped .row:nth-of-type(odd) div {\n  background-color: #f9f9f9;\n  border-top: 1px solid #dddddd;\n  display: table-cell;\n\n}\n\n.row-striped .row:nth-of-type(even) div {\n  background: #FFFFFF;\n  border-top: 1px solid #dddddd;\n  display: table-cell;\n}\n\n\n\n\n/**\n\n COLUMN SELECTOR ICONS\n -----------------------------\n This is kind of weird, but it is necessary to prevent the column-selector code from barfing, since\n any HTML used in the UserPresenter \"title\" attribute breaks the column selector HTML.\n\n Instead, we use CSS to add the icon into the table header, which leaves the column selector\n \"title\" text as-is.\n\n See https://github.com/snipe/snipe-it/issues/7989\n\n */\n\nth.css-barcode > .th-inner,\nth.css-license > .th-inner,\nth.css-consumable > .th-inner,\nth.css-accessory > .th-inner\n{\n  font-size: 0px;\n  line-height: 4!important;\n  text-align: left;\n  text-rendering: auto;\n  -webkit-font-smoothing: antialiased;\n  -moz-osx-font-smoothing: grayscale;\n}\n\n\nth.css-padlock > .th-inner::before,\nth.css-barcode > .th-inner::before,\nth.css-license > .th-inner::before,\nth.css-consumable > .th-inner::before,\nth.css-accessory > .th-inner::before\n\n{\n  display: inline-block;\n  font: normal normal normal 14px/1 FontAwesome;\n  font-size: 20px;\n}\n\nth.css-padlock > .th-inner::before\n{\n  content: \"\\f023\";\n  padding-right: 2px;\n}\n\nth.css-barcode > .th-inner::before\n{\n  content: \"\\f02a\";\n}\n\nth.css-license > .th-inner::before\n{\n  content: \"\\f0c7\";\n}\n\nth.css-consumable > .th-inner::before\n{\n  content: \"\\f043\";\n}\n\nth.css-accessory > .th-inner::before\n{\n  content: \"\\f11c\";\n}\n\n\n// WEBPACK FOOTER //\n// ./resources/assets/less/overrides.less"],"sourceRoot":""}
\ No newline at end of file
+{"version":3,"sources":["webpack:///./resources/assets/less/overrides.less"],"names":[],"mappings":"AAAA,6OAkBE,yBAEF,mBACE,qBACA,mBACA,gBACA,cACA,WACA,iFACE,WAGJ,MACE,eAGF,UACI,kBACA,gBAGJ,oBACI,cAIJ,iBACA,kBACA,aACA,mBACA,kBACA,8BACA,WACA,YAGA,mBACE,WACA,WACA,YACA,kBACA,kBAGF,gCACE,yBAGF,mBACI,WAGJ,kBACE,aACA,YAIF,QACE,kBAGF,2BACI,kBACA,MACA,QACA,eACA,gBACA,gBACA,iBACA,wBACA,UACA,aACA,gBACA,eACA,cAEJ,aACE,eAEF,aACE,iBAIF,sCACE,cAEF,mBACE,qBAIF,gBACE,kBACA,YACA,yBAGF,uBACE,YACA,WACA,iBAwBF,oCACE,eAAS,CAGX,sBACE,aACA,aAIF,mBACE,WAEF,aACE,cACA,mCAGF,wBACE,cACA,cAGF,0BACQ,mBACA,kBAEN,yBACI,iBAGN,aACE,cACA,6BACA,8CAGF,yBACE,cAGF,yBACE,cAGF,sBACE,cAGF,yBACE,cAGF,wBACE,cAGF,uJACE,WAGF,eACC,eACA,MACA,aACA,YACA,YACA,gBACA,YACC,iBACA,WACA,aAEF,kBACC,kBACA,YACA,WACA,gBACA,gBACA,6BAED,qCACC,kBACA,SACA,WACA,qBACA,oBACA,6BACA,gBACA,cACA,gBACA,WACA,qBACA,mBAED,2CACC,WAED,kBACC,gBACA,gBACA,6BACA,gCAED,qBACC,6BACA,gCAED,uBACC,kBACA,cACA,aACA,WACA,qBAED,6BACC,gBACA,WAED,yBACC,kBACA,SACA,WACA,WAGA,iBACE,eACA,aAKF,WAAY,gBAGA,gCAAkC,iBAC9C,2BAA8B,UAAY,kBAE1C,8CAAiD,cAAgB,eAAiB,kBAClF,2CAA8C,WAAa,eAC3D,0CAA+C,kBAAoB,WAAa,YAAc,cAAgB,mBAAqB,SAAW,SAAW,iBAAmB,kBAAoB,kBAChM,gDAAqD,YAAc,WAAa,YAAc,mBAAqB,mBAAqB,kBAAoB,QAAU,SACtK,qCAA0C,kBAAoB,gBAAoB,WAAa,wCAAkB,cACjH,mDAA0D,QAAW,wCAAkB,mBACvF,4DAAmE,WACnE,0DAAiE,UACjE,sEAA6E,QAC7E,qEAA4E,WAC5E,mDAAwD,yBACxD,yDAA8D,UAC9D,iDAAuD,SAAW,UAClE,gDAAsD,UACtD,oDAAuD,oBAGxD,eACE,qBACA,WACA,gBACA,WACA,UAIF,mQAkBE,WAGF,wBACC,6BAID,UACE,8BAGF,KACE,oIAIA,eAGF,cACE,eACA,mBAGF,aACE,cACE,aAGF,uBACE,wBACA,oBACA,8BAIJ,uCACE,WACA,sBACA,gBAGF,iBACE,gBAGF,8BACE,eAGF,SACE,uBAGF,SACE,gBAGF,eACE,qBACA,CAIF,UACE,eACA,cAGF,YACE,iBACA,oBACA,gBAIF,YACE,YACA,kBACA,SACA,UACA,WACA,gBACA,aAEF,qCACE,WACA,sBACA,UACA,SACA,UACA,YACA,cACA,gBACA,YACA,mBACA,sBACA,kBACA,gBACA,YAGF,GACE,eAGF,GACE,eAGF,GACE,eAIF,aACE,mBACA,gBACA,UACA,iBACA,oDAGA,cAIF,uCACE,yBACA,0BACA,mBAIF,sCACE,gBACA,0BACA,mBAoBF,yGAKE,YACA,wBACA,gBACA,oBACA,mCACA,kCAIF,qKAOE,qBACA,6CACA,eAGF,gCAEE,gBACA,kBAGF,gCAEE,eAAS,CAGX,gCAEE,eAAS,CAGX,mCAEE,eAAS,CAGX,kCAEE,eAAS","file":"css/overrides.css","sourcesContent":[".skin-red\n.skin-purple\n.skin-blue\n.skin-black\n.skin-orange\n.skin-yellow\n.skin-green\n.skin-red-dark\n.skin-purple-dark\n.skin-blue-dark\n.skin-black-dark\n.skin-orange-dark\n.skin-yellow-dark\n.skin-green-dark\n.skin-contrast\n.main-header\n\n.logo {\n  background-color: inherit;\n}\n.main-header .logo {\n  width: 100% !important;\n  white-space: nowrap;\n  text-align: left;\n  display: block;\n  clear: both;\n  &a:link, a:hover, a:visited   {\n    color: #fff\n  }\n}\n.huge {\n  font-size: 40px;\n}\n\n.btn-file {\n    position: relative;\n    overflow: hidden;\n}\n\n.dropdown-menu>li>a {\n    color: #354044;\n}\n\n\n#sort tr.cansort {\nborder-radius: 2px;\npadding: 10px;\nbackground: #f4f4f4;\nmargin-bottom: 3px;\nborder-left: 2px solid #e6e7e8;\ncolor: #444;\ncursor: move;\n}\n\n.user-image-inline {\n  float: left;\n  width: 25px;\n  height: 25px;\n  border-radius: 50%;\n  margin-right: 10px;\n}\n\n.input-group .input-group-addon {\n  background-color: #f4f4f4;\n}\n\na.accordion-header {\n    color: #333;\n}\n\n.dynamic-form-row {\n  padding: 10px;\n  margin: 20px;\n}\n\n\n.handle {\n  padding-left: 10px;\n}\n\n.btn-file input[type=file] {\n    position: absolute;\n    top: 0;\n    right: 0;\n    min-width: 100%;\n    min-height: 100%;\n    font-size: 100px;\n    text-align: right;\n    filter: alpha(opacity=0);\n    opacity: 0;\n    outline: none;\n    background: white;\n    cursor: inherit;\n    display: block;\n}\n.main-footer {\n  font-size: 13px;\n}\n.main-header {\n  max-height: 150px;\n}\n\n\n.navbar-nav>.user-menu>.dropdown-menu {\n  width: inherit;\n}\n.main-header .logo {\n  padding: 0px 5px 0px 15px;\n}\n\n\n.sidebar-toggle {\n  margin-left: -48px;\n  z-index: 100;\n  background-color: inherit;\n}\n\n.sidebar-toggle-mobile {\n  z-index: 100;\n  width: 50px;\n  padding-top: 10px;\n}\n\n.skin-red\n.skin-purple\n.skin-blue\n.skin-black\n.skin-orange\n.skin-yellow\n.skin-green\n.skin-red-dark\n.skin-purple-dark\n.skin-blue-dark\n.skin-black-dark\n.skin-orange-dark\n.skin-yellow-dark\n.skin-green-dark\n.skin-contrast\n.main-header\n.navbar\n.dropdown-menu li a {\n  //color: inherit;\n}\n\n.main-header .sidebar-toggle:before {\n  content: \"\\f0c9\";\n}\n\n.direct-chat-contacts {\n  padding: 10px;\n  height: 150px;\n}\n\n\n.select2-container {\n  width: 100%;\n}\n.error input {\n  color: #dd4b39;\n  border: 2px solid #dd4b39 !important;\n}\n\n.error label, .alert-msg {\n  color: #dd4b39;\n  display: block;\n}\n\n.input-group[class*=\"col-\"] {\n        padding-right: 15px;\n        padding-left: 15px;\n  }\n  .control-label.multiline {\n      padding-top: 10px;\n  }\n\n.btn-outline {\n  color: inherit;\n  background-color: transparent;\n  transition: all .5s;\n}\n\n.btn-primary.btn-outline {\n  color: #428bca;\n}\n\n.btn-success.btn-outline {\n  color: #5cb85c;\n}\n\n.btn-info.btn-outline {\n  color: #5bc0de;\n}\n\n.btn-warning.btn-outline {\n  color: #f0ad4e;\n}\n\n.btn-danger.btn-outline {\n  color: #d9534f;\n}\n\n.btn-primary.btn-outline:hover, .btn-success.btn-outline:hover, .btn-info.btn-outline:hover, .btn-warning.btn-outline:hover, .btn-danger.btn-outline:hover {\n  color: #fff;\n}\n\n.slideout-menu {\n\tposition: fixed;\n\ttop: 0;\n\tright: -250px;\n\twidth: 250px;\n\theight: 100%;\n\tbackground: #333;\n\tz-index: 100;\n  margin-top: 100px;\n  color: white;\n  padding: 10px;\n}\n.slideout-menu h3 {\n\tposition: relative;\n\tpadding: 5px 5px;\n\tcolor: #fff;\n\tfont-size: 1.2em;\n\tfont-weight: 400;\n\tborder-bottom: 4px solid #222;\n}\n.slideout-menu .slideout-menu-toggle {\n\tposition: absolute;\n\ttop: 12px;\n\tright: 10px;\n\tdisplay: inline-block;\n\tpadding: 6px 9px 5px;\n\tfont-family: Arial, sans-serif;\n\tfont-weight: bold;\n\tline-height: 1;\n\tbackground: #222;\n\tcolor: #999;\n\ttext-decoration: none;\n\tvertical-align: top;\n}\n.slideout-menu .slideout-menu-toggle:hover {\n\tcolor: #fff;\n}\n.slideout-menu ul {\n\tlist-style: none;\n\tfont-weight: 300;\n\tborder-top: 1px solid #151515;\n\tborder-bottom: 1px solid #454545;\n}\n.slideout-menu ul li {\n\tborder-top: 1px solid #454545;\n\tborder-bottom: 1px solid #151515;\n}\n.slideout-menu ul li a {\n\tposition: relative;\n\tdisplay: block;\n\tpadding: 10px;\n\tcolor: #999;\n\ttext-decoration: none;\n}\n.slideout-menu ul li a:hover {\n\tbackground: #000;\n\tcolor: #fff;\n}\n.slideout-menu ul li a i {\n\tposition: absolute;\n\ttop: 15px;\n\tright: 10px;\n\topacity: .5;\n}\n\n .btn-box-tool-lg {\n   font-size: 16px;\n   color: orange;\n }\n\n\n\n .bs-wizard {margin-top: 20px;}\n\n /*Form Wizard*/\n .bs-wizard {border-bottom: solid 1px #e0e0e0; padding: 0 0 10px 0;}\n .bs-wizard > .bs-wizard-step {padding: 0; position: relative;}\n .bs-wizard > .bs-wizard-step + .bs-wizard-step {}\n .bs-wizard > .bs-wizard-step .bs-wizard-stepnum {color: #595959; font-size: 16px; margin-bottom: 5px;}\n .bs-wizard > .bs-wizard-step .bs-wizard-info {color: #999; font-size: 14px;}\n .bs-wizard > .bs-wizard-step > .bs-wizard-dot {position: absolute; width: 30px; height: 30px; display: block; background: #fbe8aa; top: 45px; left: 50%; margin-top: -15px; margin-left: -15px; border-radius: 50%;}\n .bs-wizard > .bs-wizard-step > .bs-wizard-dot:after {content: ' '; width: 14px; height: 14px; background: #fbbd19; border-radius: 50px; position: absolute; top: 8px; left: 8px; }\n .bs-wizard > .bs-wizard-step > .progress {position: relative; border-radius: 0px; height: 8px; box-shadow: none; margin: 20px 0;}\n .bs-wizard > .bs-wizard-step > .progress > .progress-bar {width:0px; box-shadow: none; background: #fbe8aa;}\n .bs-wizard > .bs-wizard-step.complete > .progress > .progress-bar {width:100%;}\n .bs-wizard > .bs-wizard-step.active > .progress > .progress-bar {width:50%;}\n .bs-wizard > .bs-wizard-step:first-child.active > .progress > .progress-bar {width:0%;}\n .bs-wizard > .bs-wizard-step:last-child.active > .progress > .progress-bar {width: 100%;}\n .bs-wizard > .bs-wizard-step.disabled > .bs-wizard-dot {background-color: #f5f5f5;}\n .bs-wizard > .bs-wizard-step.disabled > .bs-wizard-dot:after {opacity: 0;}\n .bs-wizard > .bs-wizard-step:first-child  > .progress {left: 50%; width: 50%;}\n .bs-wizard > .bs-wizard-step:last-child  > .progress {width: 50%;}\n .bs-wizard > .bs-wizard-step.disabled a.bs-wizard-dot{ pointer-events: none; }\n /*END Form Wizard*/\n\n.left-navblock {\n  display: inline-block;\n  float: left;\n  text-align: left;\n  color: white;\n  padding: 0px;\n  /* adjust based on your layout */\n\n}\n.skin-red\n.skin-purple\n.skin-blue\n.skin-black\n.skin-orange\n.skin-yellow\n.skin-green\n.skin-red-dark\n.skin-purple-dark\n.skin-blue-dark\n.skin-black-dark\n.skin-orange-dark\n.skin-yellow-dark\n.skin-green-dark\n.skin-contrast\n.main-header\n.navbar\n.dropdown-menu li a {\n  color: #333;\n}\n\na.logo.no-hover a:hover {\n background-color: transparent;\n}\n\n\n.required {\n  border-right: 6px solid orange;\n}\n\nbody {\n  font-family: -apple-system, BlinkMacSystemFont,\n  \"Segoe UI\", \"Roboto\", \"Oxygen\", \"Ubuntu\", \"Cantarell\",\n  \"Fira Sans\", \"Droid Sans\", \"Helvetica Neue\",\n  sans-serif;\n  font-size: 13px;\n}\n\n.sidebar-menu {\n  font-size: 14px;\n  white-space: normal;\n}\n\n@media print {\n  a[href]:after {\n    content: none;\n  }\n\n  .tab-content > .tab-pane {\n    display: block !important;\n    opacity: 1 !important;\n    visibility: visible !important;\n  }\n}\n\nimg.navbar-brand-img, .navbar-brand>img {\n  float: left;\n  padding: 5px 5px 5px 0;\n  max-height: 50px;\n}\n\n.input-daterange {\n  border-radius: 0px;\n}\n\n.btn.bg-maroon, .btn.bg-purple{\n  min-width:90px;\n}\n\n[hidden] {\n  display: none !important;\n}\n\n#toolbar {\n  margin-top: 10px;\n}\n\n#uploadPreview {\n  border-color: grey;\n  border-width: 1px;\n  border-style: solid\n}\n\n.icon-med {\n  font-size: 20px;\n  color: #889195;\n}\n\n#login-logo {\n  padding-top: 20px;\n  padding-bottom: 10px;\n  max-width: 200px\n}\n\n// accessibility skip link\na.skip-main {\n  left:-999px;\n  position:absolute;\n  top:auto;\n  width:1px;\n  height:1px;\n  overflow:hidden;\n  z-index:-999;\n}\na.skip-main:focus, a.skip-main:active {\n  color: #fff;\n  background-color:#000;\n  left: auto;\n  top: auto;\n  width: 30%;\n  height: auto;\n  overflow:auto;\n  margin: 10px 35%;\n  padding:5px;\n  border-radius: 15px;\n  border:4px solid yellow;\n  text-align:center;\n  font-size:1.2em;\n  z-index:999;\n}\n\nh2 {\n  font-size: 22px;\n}\n\nh3 {\n  font-size: 20px;\n}\n\nh4 {\n  font-size: 16px;\n}\n\n\n.row-striped {\n  vertical-align: top;\n  line-height: 2.6;\n  padding: 0px;\n  margin-left: 20px;\n  box-sizing: border-box;\n  //border-left: 1px solid #dddddd;\n  //border-right: 1px solid #dddddd;\n  display: table;\n\n}\n\n.row-striped .row:nth-of-type(odd) div {\n  background-color: #f9f9f9;\n  border-top: 1px solid #dddddd;\n  display: table-cell;\n\n}\n\n.row-striped .row:nth-of-type(even) div {\n  background: #FFFFFF;\n  border-top: 1px solid #dddddd;\n  display: table-cell;\n}\n\n\n\n\n/**\n\n COLUMN SELECTOR ICONS\n -----------------------------\n This is kind of weird, but it is necessary to prevent the column-selector code from barfing, since\n any HTML used in the UserPresenter \"title\" attribute breaks the column selector HTML.\n\n Instead, we use CSS to add the icon into the table header, which leaves the column selector\n \"title\" text as-is.\n\n See https://github.com/grokability/snipe-it/issues/7989\n\n */\n\nth.css-barcode > .th-inner,\nth.css-license > .th-inner,\nth.css-consumable > .th-inner,\nth.css-accessory > .th-inner\n{\n  font-size: 0px;\n  line-height: 4!important;\n  text-align: left;\n  text-rendering: auto;\n  -webkit-font-smoothing: antialiased;\n  -moz-osx-font-smoothing: grayscale;\n}\n\n\nth.css-padlock > .th-inner::before,\nth.css-barcode > .th-inner::before,\nth.css-license > .th-inner::before,\nth.css-consumable > .th-inner::before,\nth.css-accessory > .th-inner::before\n\n{\n  display: inline-block;\n  font: normal normal normal 14px/1 FontAwesome;\n  font-size: 20px;\n}\n\nth.css-padlock > .th-inner::before\n{\n  content: \"\\f023\";\n  padding-right: 2px;\n}\n\nth.css-barcode > .th-inner::before\n{\n  content: \"\\f02a\";\n}\n\nth.css-license > .th-inner::before\n{\n  content: \"\\f0c7\";\n}\n\nth.css-consumable > .th-inner::before\n{\n  content: \"\\f043\";\n}\n\nth.css-accessory > .th-inner::before\n{\n  content: \"\\f11c\";\n}\n\n\n// WEBPACK FOOTER //\n// ./resources/assets/less/overrides.less"],"sourceRoot":""}
diff --git a/public/css/webfonts/fa-brands-400.ttf b/public/css/webfonts/fa-brands-400.ttf
index 1fbb1f7c32..0f82a83605 100644
Binary files a/public/css/webfonts/fa-brands-400.ttf and b/public/css/webfonts/fa-brands-400.ttf differ
diff --git a/public/css/webfonts/fa-brands-400.woff2 b/public/css/webfonts/fa-brands-400.woff2
index 5d28021697..3c5cf97ec3 100644
Binary files a/public/css/webfonts/fa-brands-400.woff2 and b/public/css/webfonts/fa-brands-400.woff2 differ
diff --git a/public/css/webfonts/fa-regular-400.ttf b/public/css/webfonts/fa-regular-400.ttf
index 549d68dc02..9ee1919dc2 100644
Binary files a/public/css/webfonts/fa-regular-400.ttf and b/public/css/webfonts/fa-regular-400.ttf differ
diff --git a/public/css/webfonts/fa-regular-400.woff2 b/public/css/webfonts/fa-regular-400.woff2
index 18400d7fad..57d9179654 100644
Binary files a/public/css/webfonts/fa-regular-400.woff2 and b/public/css/webfonts/fa-regular-400.woff2 differ
diff --git a/public/css/webfonts/fa-solid-900.ttf b/public/css/webfonts/fa-solid-900.ttf
index bb2a869565..1c10972ece 100644
Binary files a/public/css/webfonts/fa-solid-900.ttf and b/public/css/webfonts/fa-solid-900.ttf differ
diff --git a/public/css/webfonts/fa-solid-900.woff2 b/public/css/webfonts/fa-solid-900.woff2
index 758dd4f607..16721020f0 100644
Binary files a/public/css/webfonts/fa-solid-900.woff2 and b/public/css/webfonts/fa-solid-900.woff2 differ
diff --git a/public/css/webfonts/fa-v4compatibility.ttf b/public/css/webfonts/fa-v4compatibility.ttf
index 8c5864c42f..3bcb67ffcc 100644
Binary files a/public/css/webfonts/fa-v4compatibility.ttf and b/public/css/webfonts/fa-v4compatibility.ttf differ
diff --git a/public/css/webfonts/fa-v4compatibility.woff2 b/public/css/webfonts/fa-v4compatibility.woff2
index f94bec2275..fbafb22222 100644
Binary files a/public/css/webfonts/fa-v4compatibility.woff2 and b/public/css/webfonts/fa-v4compatibility.woff2 differ
diff --git a/public/img/default-sm.png b/public/img/default-sm.png
deleted file mode 100644
index 49aa98b55d..0000000000
Binary files a/public/img/default-sm.png and /dev/null differ
diff --git a/public/img/default.png b/public/img/demo/avatars/default.png
similarity index 100%
rename from public/img/default.png
rename to public/img/demo/avatars/default.png
diff --git a/public/img/demo/manufacturers/google.webp b/public/img/demo/manufacturers/google.webp
new file mode 100644
index 0000000000..4355fcec82
Binary files /dev/null and b/public/img/demo/manufacturers/google.webp differ
diff --git a/public/img/demo/manufacturers/huawei.webp b/public/img/demo/manufacturers/huawei.webp
new file mode 100644
index 0000000000..23a6c21dfe
Binary files /dev/null and b/public/img/demo/manufacturers/huawei.webp differ
diff --git a/public/img/demo/manufacturers/samsung.png b/public/img/demo/manufacturers/samsung.png
new file mode 100644
index 0000000000..0dc9444ef0
Binary files /dev/null and b/public/img/demo/manufacturers/samsung.png differ
diff --git a/public/img/demo/manufacturers/sony.png b/public/img/demo/manufacturers/sony.png
new file mode 100644
index 0000000000..95753078c9
Binary files /dev/null and b/public/img/demo/manufacturers/sony.png differ
diff --git a/public/js/build/app.js b/public/js/build/app.js
index 50fab0d8d0..4c548c266f 100644
--- a/public/js/build/app.js
+++ b/public/js/build/app.js
@@ -1,828 +1,16 @@
 /******/ (() => { // webpackBootstrap
 /******/ 	var __webpack_modules__ = ({
 
-/***/ "./resources/assets/js/bootstrap.js":
-/*!******************************************!*\
-  !*** ./resources/assets/js/bootstrap.js ***!
-  \******************************************/
-/***/ ((__unused_webpack_module, __unused_webpack_exports, __webpack_require__) => {
+/***/ "./node_modules/admin-lte/build/less/AdminLTE.less":
+/*!*********************************************************!*\
+  !*** ./node_modules/admin-lte/build/less/AdminLTE.less ***!
+  \*********************************************************/
+/***/ ((__unused_webpack_module, __webpack_exports__, __webpack_require__) => {
 
-window._ = __webpack_require__(/*! lodash */ "./node_modules/lodash/lodash.js");
+"use strict";
+__webpack_require__.r(__webpack_exports__);
+// extracted by mini-css-extract-plugin
 
-/**
- * We'll load jQuery and the Bootstrap jQuery plugin which provides support
- * for JavaScript based Bootstrap features such as modals and tabs. This
- * code may be modified to fit the specific needs of your application.
- */
-//window.$ = window.jQuery = require('jquery');
-
-/**
- * jQuery UI is loaded here and then the tooltip is assigned another funtion name
- * This resolves the issue of jquery-ui & bootstrap tooltip conflict
- */
-__webpack_require__(/*! jquery-ui */ "./node_modules/jquery-ui/ui/widget.js");
-jQuery.fn.uitooltip = jQuery.fn.tooltip;
-
-/**
- * Load boostrap
- */
-__webpack_require__(/*! bootstrap-less */ "./node_modules/bootstrap-less/js/bootstrap.js");
-
-// require('admin-lte');
-
-// require('chart.js');
-
-// require('jquery-form-validator'); //says something about dependency
-/**
- * Echo exposes an expressive API for subscribing to channels and listening
- * for events that are broadcast by Laravel. Echo and event broadcasting
- * allows your team to easily build robust real-time web applications.
- */
-
-// import Echo from "laravel-echo"
-
-// window.Echo = new Echo({
-//     broadcaster: 'pusher',
-//     key: 'your-pusher-key'
-// });
-
-/***/ }),
-
-/***/ "./resources/assets/js/snipeit.js":
-/*!****************************************!*\
-  !*** ./resources/assets/js/snipeit.js ***!
-  \****************************************/
-/***/ ((__unused_webpack_module, __unused_webpack_exports, __webpack_require__) => {
-
-// var jQuery = require('jquery');
-// window.jQuery = jQuery
-// window.$ = jQuery
-
-__webpack_require__(/*! ./bootstrap */ "./resources/assets/js/bootstrap.js");
-
-/**
- * Module containing core application logic.
- * @param  {jQuery} $        Insulated jQuery object
- * @param  {JSON} settings Insulated `window.snipeit.settings` object.
- * @return {IIFE}          Immediately invoked. Returns self.
- */
-
-lineOptions = {
-  legend: {
-    position: "bottom"
-  },
-  scales: {
-    yAxes: [{
-      ticks: {
-        fontColor: "rgba(0,0,0,0.5)",
-        fontStyle: "bold",
-        beginAtZero: true,
-        maxTicksLimit: 5,
-        padding: 20
-      },
-      gridLines: {
-        drawTicks: false,
-        display: false
-      }
-    }],
-    xAxes: [{
-      gridLines: {
-        zeroLineColor: "transparent"
-      },
-      ticks: {
-        padding: 20,
-        fontColor: "rgba(0,0,0,0.5)",
-        fontStyle: "bold"
-      }
-    }]
-  }
-};
-pieOptions = {
-  //Boolean - Whether we should show a stroke on each segment
-  segmentShowStroke: true,
-  //String - The colour of each segment stroke
-  segmentStrokeColor: "#fff",
-  //Number - The width of each segment stroke
-  segmentStrokeWidth: 1,
-  //Number - The percentage of the chart that we cut out of the middle
-  percentageInnerCutout: 50,
-  // This is 0 for Pie charts
-  //Number - Amount of animation steps
-  animationSteps: 100,
-  //String - Animation easing effect
-  animationEasing: "easeOutBounce",
-  //Boolean - Whether we animate the rotation of the Doughnut
-  animateRotate: true,
-  //Boolean - Whether we animate scaling the Doughnut from the centre
-  animateScale: false,
-  //Boolean - whether to make the chart responsive to window resizing
-  responsive: true,
-  // Boolean - whether to maintain the starting aspect ratio or not when responsive, if set to false, will take up entire container
-  maintainAspectRatio: false,
-  //String - A legend template
-  legendTemplate: "<ul class=\"<%=name.toLowerCase()%>-legend\"><% for (var i=0; i<segments.length; i++){%><li>" + "<i class='fas fa-circle-o' style='color: <%=segments[i].fillColor%>'></i>" + "<%if(segments[i].label){%><%=segments[i].label%><%}%> foo</li><%}%></ul>",
-  //String - A tooltip template
-  tooltipTemplate: "<%=value %> <%=label%> "
-};
-
-//-----------------
-//- END PIE CHART -
-//-----------------
-
-var baseUrl = $('meta[name="baseUrl"]').attr('content');
-(function ($, settings) {
-  var Components = {};
-  Components.modals = {};
-
-  // confirm restore modal
-  Components.modals.confirmRestore = function () {
-    var $el = $('table');
-    var events = {
-      'click': function click(evnt) {
-        var $context = $(this);
-        var $restoreConfirmModal = $('#restoreConfirmModal');
-        var href = $context.attr('href');
-        var message = $context.attr('data-content');
-        var title = $context.attr('data-title');
-        $('#restoreConfirmModalLabel').text(title);
-        $restoreConfirmModal.find('.modal-body').text(message);
-        $('#restoreForm').attr('action', href);
-        $restoreConfirmModal.modal({
-          show: true
-        });
-        return false;
-      }
-    };
-    var render = function render() {
-      $el.on('click', '.restore-asset', events['click']);
-    };
-    return {
-      render: render
-    };
-  };
-
-  // confirm delete modal
-  Components.modals.confirmDelete = function () {
-    var $el = $('table');
-    var events = {
-      'click': function click(evnt) {
-        var $context = $(this);
-        var $dataConfirmModal = $('#dataConfirmModal');
-        var href = $context.attr('href');
-        var message = $context.attr('data-content');
-        var title = $context.attr('data-title');
-        $('#myModalLabel').text(title);
-        $dataConfirmModal.find('.modal-body').text(message);
-        $('#deleteForm').attr('action', href);
-        $dataConfirmModal.modal({
-          show: true
-        });
-        return false;
-      }
-    };
-    var render = function render() {
-      $el.on('click', '.delete-asset', events['click']);
-    };
-    return {
-      render: render
-    };
-  };
-
-  /**
-   * Application start point
-   * Component definition stays out of load event, execution only happens.
-   */
-  $(function () {
-    new Components.modals.confirmRestore().render();
-    new Components.modals.confirmDelete().render();
-  });
-})(jQuery, window.snipeit.settings);
-$(document).ready(function () {
-  /*
-  * Slideout help menu
-  */
-  $('.slideout-menu-toggle').on('click', function (event) {
-    event.preventDefault();
-    // create menu variables
-    var slideoutMenu = $('.slideout-menu');
-    var slideoutMenuWidth = $('.slideout-menu').width();
-
-    // toggle open class
-    slideoutMenu.toggleClass("open");
-
-    // slide menu
-    if (slideoutMenu.hasClass("open")) {
-      slideoutMenu.show();
-      slideoutMenu.animate({
-        right: "0px"
-      });
-    } else {
-      slideoutMenu.animate({
-        right: -slideoutMenuWidth
-      }, "-350px");
-      slideoutMenu.fadeOut();
-    }
-  });
-
-  /*
-  * Select2
-  */
-
-  $('select.select2:not(".select2-hidden-accessible")').each(function (i, obj) {
-    {
-      $(obj).select2();
-    }
-  });
-
-  // $('.datepicker').datepicker();
-  // var datepicker = $.fn.datepicker.noConflict(); // return $.fn.datepicker to previously assigned value
-  // $.fn.bootstrapDP = datepicker;
-  // $('.datepicker').datepicker();
-
-  // Crazy select2 rich dropdowns with images!
-  $('.js-data-ajax').each(function (i, item) {
-    var link = $(item);
-    var endpoint = link.data("endpoint");
-    var select = link.data("select");
-    link.select2({
-      /**
-       * Adds an empty placeholder, allowing every select2 instance to be cleared.
-       * This placeholder can be overridden with the "data-placeholder" attribute.
-       */
-      placeholder: '',
-      allowClear: true,
-      ajax: {
-        // the baseUrl includes a trailing slash
-        url: baseUrl + 'api/v1/' + endpoint + '/selectlist',
-        dataType: 'json',
-        delay: 250,
-        headers: {
-          "X-Requested-With": 'XMLHttpRequest',
-          "X-CSRF-TOKEN": $('meta[name="csrf-token"]').attr('content')
-        },
-        data: function data(params) {
-          var data = {
-            search: params.term,
-            page: params.page || 1,
-            assetStatusType: link.data("asset-status-type")
-          };
-          return data;
-        },
-        /* processResults: function (data, params) {
-             params.page = params.page || 1;
-             var answer =  {
-                results: data.items,
-                pagination: {
-                    more: data.pagination.more
-                }
-            };
-             return answer;
-        }, */
-        cache: true
-      },
-      //escapeMarkup: function (markup) { return markup; }, // let our custom formatter work
-      templateResult: formatDatalistSafe
-      //templateSelection: formatDataSelection
-    });
-  });
-  function getSelect2Value(element) {
-    // if the passed object is not a jquery object, assuming 'element' is a selector
-    if (!(element instanceof jQuery)) element = $(element);
-    var select = element.data("select2");
-
-    // There's two different locations where the select2-generated input element can be. 
-    searchElement = select.dropdown.$search || select.$container.find(".select2-search__field");
-    var value = searchElement.val();
-    return value;
-  }
-  $(".select2-hidden-accessible").on('select2:selecting', function (e) {
-    var data = e.params.args.data;
-    var isMouseUp = false;
-    var element = $(this);
-    var value = getSelect2Value(element);
-    if (e.params.args.originalEvent) isMouseUp = e.params.args.originalEvent.type == "mouseup";
-
-    // if selected item does not match typed text, do not allow it to pass - force close for ajax.
-    if (!isMouseUp) {
-      if (value.toLowerCase() && data.text.toLowerCase().indexOf(value) < 0) {
-        e.preventDefault();
-        element.select2('close');
-
-        // if it does match, we set a flag in the event (which gets passed to subsequent events), telling it not to worry about the ajax
-      } else if (value.toLowerCase() && data.text.toLowerCase().indexOf(value) > -1) {
-        e.params.args.noForceAjax = true;
-      }
-    }
-  });
-  $(".select2-hidden-accessible").on('select2:closing', function (e) {
-    var element = $(this);
-    var value = getSelect2Value(element);
-    var noForceAjax = false;
-    var isMouseUp = false;
-    if (e.params.args.originalSelect2Event) noForceAjax = e.params.args.originalSelect2Event.noForceAjax;
-    if (e.params.args.originalEvent) isMouseUp = e.params.args.originalEvent.type == "mouseup";
-    if (value && !noForceAjax && !isMouseUp) {
-      var endpoint = element.data("endpoint");
-      var assetStatusType = element.data("asset-status-type");
-      $.ajax({
-        url: baseUrl + 'api/v1/' + endpoint + '/selectlist?search=' + value + '&page=1' + (assetStatusType ? '&assetStatusType=' + assetStatusType : ''),
-        dataType: 'json',
-        headers: {
-          "X-Requested-With": 'XMLHttpRequest',
-          "X-CSRF-TOKEN": $('meta[name="csrf-token"]').attr('content')
-        }
-      }).done(function (response) {
-        var currentlySelected = element.select2('data').map(function (x) {
-          return +x.id;
-        }).filter(function (x) {
-          return x !== 0;
-        });
-
-        // makes sure we're not selecting the same thing twice for multiples
-        var filteredResponse = response.results.filter(function (item) {
-          return currentlySelected.indexOf(+item.id) < 0;
-        });
-        var first = currentlySelected.length > 0 ? filteredResponse[0] : response.results[0];
-        if (first && first.id) {
-          first.selected = true;
-          if ($("option[value='" + first.id + "']", element).length < 1) {
-            var option = new Option(first.text, first.id, true, true);
-            element.append(option);
-          } else {
-            var isMultiple = element.attr("multiple") == "multiple";
-            element.val(isMultiple ? element.val().concat(first.id) : element.val(first.id));
-          }
-          element.trigger('change');
-          element.trigger({
-            type: 'select2:select',
-            params: {
-              data: first
-            }
-          });
-        }
-      });
-    }
-  });
-  function formatDatalist(datalist) {
-    var loading_markup = '<i class="fas fa-spinner fa-spin" aria-hidden="true"></i> Loading...';
-    if (datalist.loading) {
-      return loading_markup;
-    }
-    var markup = '<div class="clearfix">';
-    markup += '<div class="pull-left" style="padding-right: 10px;">';
-    if (datalist.image) {
-      markup += "<div style='width: 30px;'><img src='" + datalist.image + "' style='max-height: 20px; max-width: 30px;' alt='" + datalist.text + "'></div>";
-    } else {
-      markup += '<div style="height: 20px; width: 30px;"></div>';
-    }
-    markup += "</div><div>" + datalist.text + "</div>";
-    markup += "</div>";
-    return markup;
-  }
-  function formatDatalistSafe(datalist) {
-    // console.warn("What in the hell is going on with Select2?!?!!?!?");
-    // console.warn($.select2);
-    if (datalist.loading) {
-      return $('<i class="fas fa-spinner fa-spin" aria-hidden="true"></i> Loading...');
-    }
-    var root_div = $("<div class='clearfix'>");
-    var left_pull = $("<div class='pull-left' style='padding-right: 10px;'>");
-    if (datalist.image) {
-      var inner_div = $("<div style='width: 30px;'>");
-      /******************************************************************
-       * 
-       * We are specifically chosing empty alt-text below, because this 
-       * image conveys no additional information, relative to the text
-       * that will *always* be there in any select2 list that is in use
-       * in Snipe-IT. If that changes, we would probably want to change
-       * some signatures of some functions, but right now, we don't want
-       * screen readers to say "HP SuperJet 5000, .... picture of HP 
-       * SuperJet 5000..." and so on, for every single row in a list of
-       * assets or models or whatever.
-       * 
-       *******************************************************************/
-      var img = $("<img src='' style='max-height: 20px; max-width: 30px;' alt=''>");
-      // console.warn("Img is: ");
-      // console.dir(img);
-      // console.warn("Strigularly, that's: ");
-      // console.log(img);
-      img.attr("src", datalist.image);
-      inner_div.append(img);
-    } else {
-      var inner_div = $("<div style='height: 20px; width: 30px;'></div>");
-    }
-    left_pull.append(inner_div);
-    root_div.append(left_pull);
-    var name_div = $("<div>");
-    name_div.text(datalist.text);
-    root_div.append(name_div);
-    var safe_html = root_div.get(0).outerHTML;
-    var old_html = formatDatalist(datalist);
-    if (safe_html != old_html) {
-      //console.log("HTML MISMATCH: ");
-      //console.log("FormatDatalistSafe: ");
-      // console.dir(root_div.get(0));
-      //console.log(safe_html);
-      //console.log("FormatDataList: ");
-      //console.log(old_html);
-    }
-    return root_div;
-  }
-  function formatDataSelection(datalist) {
-    // This a heinous workaround for a known bug in Select2.
-    // Without this, the rich selectlists are vulnerable to XSS.
-    // Many thanks to @uberbrady for this fix. It ain't pretty,
-    // but it resolves the issue until Select2 addresses it on their end.
-    //
-    // Bug was reported in 2016 :{
-    // https://github.com/select2/select2/issues/4587
-
-    return datalist.text.replace(/>/g, '&gt;').replace(/</g, '&lt;').replace(/"/g, '&quot;').replace(/'/g, '&#039;');
-  }
-
-  // This handles the radio button selectors for the checkout-to-foo options
-  // on asset checkout and also on asset edit
-  $(function () {
-    $('input[name=checkout_to_type]').on("change", function () {
-      var assignto_type = $('input[name=checkout_to_type]:checked').val();
-      var userid = $('#assigned_user option:selected').val();
-      if (assignto_type == 'asset') {
-        $('#current_assets_box').fadeOut();
-        $('#assigned_asset').show();
-        $('#assigned_user').hide();
-        $('#assigned_location').hide();
-        $('.notification-callout').fadeOut();
-        $('[name="assigned_location"]').val('').trigger('change.select2');
-        $('[name="assigned_user"]').val('').trigger('change.select2');
-      } else if (assignto_type == 'location') {
-        $('#current_assets_box').fadeOut();
-        $('#assigned_asset').hide();
-        $('#assigned_user').hide();
-        $('#assigned_location').show();
-        $('.notification-callout').fadeOut();
-        $('[name="assigned_asset"]').val('').trigger('change.select2');
-        $('[name="assigned_user"]').val('').trigger('change.select2');
-      } else {
-        $('#assigned_asset').hide();
-        $('#assigned_user').show();
-        $('#assigned_location').hide();
-        if (userid) {
-          $('#current_assets_box').fadeIn();
-        }
-        $('.notification-callout').fadeIn();
-        $('[name="assigned_asset"]').val('').trigger('change.select2');
-        $('[name="assigned_location"]').val('').trigger('change.select2');
-      }
-    });
-  });
-
-  // ------------------------------------------------
-  // Deep linking for Bootstrap tabs
-  // ------------------------------------------------
-  var taburl = document.location.toString();
-
-  // Allow full page URL to activate a tab's ID
-  // ------------------------------------------------
-  // This allows linking to a tab on page load via the address bar.
-  // So a URL such as, http://snipe-it.local/hardware/2/#my_tab will
-  // cause the tab on that page with an ID of “my_tab” to be active.
-  if (taburl.match('#')) {
-    $('.nav-tabs a[href="#' + taburl.split('#')[1] + '"]').tab('show');
-  }
-
-  // Allow internal page links to activate a tab's ID.
-  // ------------------------------------------------
-  // This allows you to link to a tab from anywhere on the page
-  // including from within another tab. Also note that internal page
-  // links either inside or out of the tabs need to include data-toggle="tab"
-  // Ex: <a href="#my_tab" data-toggle="tab">Click me</a>
-  $('a[data-toggle="tab"]').click(function (e) {
-    var href = $(this).attr("href");
-    history.pushState(null, null, href);
-    e.preventDefault();
-    $('a[href="' + $(this).attr('href') + '"]').tab('show');
-  });
-
-  // ------------------------------------------------
-  // End Deep Linking for Bootstrap tabs
-  // ------------------------------------------------
-
-  // Image preview
-  function readURL(input, $preview) {
-    if (input.files && input.files[0]) {
-      var reader = new FileReader();
-      reader.onload = function (e) {
-        $preview.attr('src', e.target.result);
-      };
-      reader.readAsDataURL(input.files[0]);
-    }
-  }
-  function formatBytes(bytes) {
-    if (bytes < 1024) return bytes + " Bytes";else if (bytes < 1048576) return (bytes / 1024).toFixed(2) + " KB";else if (bytes < 1073741824) return (bytes / 1048576).toFixed(2) + " MB";else return (bytes / 1073741824).toFixed(2) + " GB";
-  }
-
-  // File size validation
-  $('.js-uploadFile').bind('change', function () {
-    var $this = $(this);
-    var id = '#' + $this.attr('id');
-    var status = id + '-status';
-    var $status = $(status);
-    var delete_id = $(id + '-deleteCheckbox');
-    var preview_container = $(id + '-previewContainer');
-    $status.removeClass('text-success').removeClass('text-danger');
-    $(status + ' .goodfile').remove();
-    $(status + ' .badfile').remove();
-    $(status + ' .previewSize').hide();
-    preview_container.hide();
-    $(id + '-info').html('');
-    var max_size = $this.data('maxsize');
-    var total_size = 0;
-    for (var i = 0; i < this.files.length; i++) {
-      total_size += this.files[i].size;
-      $(id + '-info').append('<span class="label label-default">' + htmlEntities(this.files[i].name) + ' (' + formatBytes(this.files[i].size) + ')</span> ');
-    }
-    if (total_size > max_size) {
-      $status.addClass('text-danger').removeClass('help-block').prepend('<i class="badfile fas fa-times"></i> ').append('<span class="previewSize"> Upload is ' + formatBytes(total_size) + '.</span>');
-    } else {
-      $status.addClass('text-success').removeClass('help-block').prepend('<i class="goodfile fas fa-check"></i> ');
-      var $preview = $(id + '-imagePreview');
-      readURL(this, $preview);
-      $preview.fadeIn();
-      preview_container.fadeIn();
-      delete_id.hide();
-    }
-  });
-});
-function htmlEntities(str) {
-  return String(str).replace(/&/g, '&amp;').replace(/</g, '&lt;').replace(/>/g, '&gt;').replace(/"/g, '&quot;');
-}
-
-/**
- * Toggle disabled
- */
-(function ($) {
-  $.fn.toggleDisabled = function (callback) {
-    return this.each(function () {
-      var disabled,
-        $this = $(this);
-      if ($this.attr('disabled')) {
-        $this.removeAttr('disabled');
-        disabled = false;
-      } else {
-        $this.attr('disabled', 'disabled');
-        disabled = true;
-      }
-      if (callback && typeof callback === 'function') {
-        callback(this, disabled);
-      }
-    });
-  };
-})(jQuery);
-
-/**
- * Universal Livewire Select2 integration
- *
- * How to use:
- *
- * 1. Set the class of your select2 elements to 'livewire-select2').
- * 2. Name your element to match a property in your Livewire component
- * 3. Add an attribute called 'data-livewire-component' that points to $this->getId() (via `{{ }}` if you're in a blade,
- *    or just $this->getId() if not).
- */
-document.addEventListener('livewire:init', function () {
-  $('.livewire-select2').select2();
-  $(document).on('select2:select', '.livewire-select2', function (event) {
-    var target = $(event.target);
-    if (!event.target.name || !target.data('livewire-component')) {
-      console.error("You need to set both name (which should match a Livewire property) and data-livewire-component on your Livewire-ed select2 elements!");
-      console.error("For data-livewire-component, you probably want to use $this->getId() or {{ $this->getId() }}, as appropriate");
-      return false;
-    }
-    Livewire.find(target.data('livewire-component')).set(event.target.name, this.options[this.selectedIndex].value);
-  });
-  Livewire.hook('request', function (_ref) {
-    var succeed = _ref.succeed;
-    succeed(function () {
-      queueMicrotask(function () {
-        $('.livewire-select2').select2();
-      });
-    });
-  });
-});
-
-/***/ }),
-
-/***/ "./resources/assets/js/snipeit_modals.js":
-/*!***********************************************!*\
-  !*** ./resources/assets/js/snipeit_modals.js ***!
-  \***********************************************/
-/***/ (() => {
-
-/* 
- * 
- * Snipe-IT Universal Modal support
- * 
- * Enables modal dialogs to create sub-resources throughout Snipe-IT
- * 
- */
-
-/* 
-HOW TO USE
- Create a Button looking like this:
- <a href='{{ route('modal.show', 'user') }}' data-toggle="modal"  data-target="#createModal" data-select='assigned_to' class="btn btn-sm btn-primary">New</a>
- If you don't have access to Blade commands (like {{ and }}, etc), you can hard-code a URL as the 'href'
- data-toggle="modal" - required for Bootstrap Modals
-data-target="#createModal" - fixed ID for the modal, do not change
-data-select="assigned_to" - What is the *ID* of the select-dropdown that you're going to be adding to, if the modal-create was a success? Be on the lookout for duplicate ID's, it will confuse this library!
-class="btn btn-sm btn-primary" - makes it look button-ey, feel free to change :)
-
-If you want to pass additional variables to the modal (In the Category Create one, for example, you can pass category_id), you can encode them as URL variables in the href
-
-*/
-
-$(function () {
-  var baseUrl = $('meta[name="baseUrl"]').attr('content');
-  //handle modal-add-interstitial calls
-  var model, select, refreshSelector;
-  if ($('#createModal').length == 0) {
-    $('body').append('<div class="modal fade" id="createModal"></div><!-- /.modal -->');
-  }
-  $('#createModal').on("show.bs.modal", function (event) {
-    var link = $(event.relatedTarget);
-    model = link.data("dependency");
-    select = link.data("select");
-    refreshSelector = link.data("refresh");
-    $('#createModal').load(link.attr('href'), function () {
-      // this sets the focus to be the name field
-      $('#modal-name').focus();
-
-      //do we need to re-select2 this, after load? Probably.
-      $('#createModal').find('select.select2').select2();
-      // Initialize the ajaxy select2 with images.
-      // This is a copy/paste of the code from snipeit.js, would be great to only have this in one place.
-
-      $('.js-data-ajax').each(function (i, item) {
-        var link = $(item);
-        var endpoint = link.data("endpoint");
-        var select = link.data("select");
-        link.select2({
-          ajax: {
-            // the baseUrl includes a trailing slash
-            url: baseUrl + 'api/v1/' + endpoint + '/selectlist',
-            //WARNING - we're hoping that's defined on the page somewhere...
-            dataType: 'json',
-            delay: 250,
-            headers: {
-              "X-Requested-With": 'XMLHttpRequest',
-              "X-CSRF-TOKEN": $('meta[name="csrf-token"]').attr('content')
-            },
-            data: function data(params) {
-              var data = {
-                search: params.term,
-                page: params.page || 1,
-                assetStatusType: link.data("asset-status-type")
-              };
-              return data;
-            },
-            /*processResults: function (data, params) {
-                 params.page = params.page || 1;
-                 var answer =  {
-                    results: data.items,
-                    pagination: {
-                        more: data.pagination.more
-                    }
-                };
-                 return answer;
-            },*/
-            cache: true
-          },
-          //escapeMarkup: function (markup) { return markup; }, // let our custom formatter work
-          templateResult: formatDatalistSafe
-          //templateSelection: formatDataSelection
-        });
-      });
-    });
-  });
-  $('#createModal').on('click', '#modal-save', function () {
-    $.ajax({
-      type: 'POST',
-      url: $('.modal-body form').attr('action'),
-      headers: {
-        "X-Requested-With": 'XMLHttpRequest',
-        "X-CSRF-TOKEN": $('meta[name="csrf-token"]').attr('content')
-      },
-      data: $('.modal-body form').serialize(),
-      success: function success(result) {
-        if (result.status == "error") {
-          var error_message = "";
-          for (var field in result.messages) {
-            error_message += "<li>Problem(s) with field <i><strong>" + field + "</strong></i>: " + result.messages[field];
-          }
-          $('#modal_error_msg').html(error_message).show();
-          return false;
-        }
-        var id = result.payload.id;
-        var name = result.payload.name || result.payload.first_name + " " + result.payload.last_name;
-        if (!id || !name) {
-          console.error("Could not find resulting name or ID from modal-create. Name: " + name + ", id: " + id);
-          return false;
-        }
-        $('#createModal').modal('hide');
-        $('#createModal').html("");
-        var refreshTable = $('#' + refreshSelector);
-        if (refreshTable.length > 0) {
-          refreshTable.bootstrapTable('refresh');
-        }
-
-        // "select" is the original drop-down menu that someone
-        // clicked 'add' on to add a new 'thing'
-        // this code adds the newly created object to that select
-        var selector = document.getElementById(select);
-        if (!selector) {
-          return false;
-        }
-        selector.options[selector.length] = new Option(name, id);
-        selector.selectedIndex = selector.length - 1;
-        $(selector).trigger("change");
-        if (window.fetchCustomFields) {
-          fetchCustomFields();
-        }
-      },
-      error: function error(result) {
-        msg = result.responseJSON.messages || result.responseJSON.error;
-        $('#modal_error_msg').html("Server Error: " + msg).show();
-      }
-    });
-  });
-});
-function formatDatalistSafe(datalist) {
-  // console.warn("What in the hell is going on with Select2?!?!!?!?");
-  // console.warn($.select2);
-  if (datalist.loading) {
-    return $('<i class="fas fa-spinner fa-spin" aria-hidden="true"></i> Loading...');
-  }
-  var root_div = $("<div class='clearfix'>");
-  var left_pull = $("<div class='pull-left' style='padding-right: 10px;'>");
-  if (datalist.image) {
-    var inner_div = $("<div style='width: 30px;'>");
-    /******************************************************************
-     * 
-     * We are specifically chosing empty alt-text below, because this 
-     * image conveys no additional information, relative to the text
-     * that will *always* be there in any select2 list that is in use
-     * in Snipe-IT. If that changes, we would probably want to change
-     * some signatures of some functions, but right now, we don't want
-     * screen readers to say "HP SuperJet 5000, .... picture of HP 
-     * SuperJet 5000..." and so on, for every single row in a list of
-     * assets or models or whatever.
-     * 
-     *******************************************************************/
-    var img = $("<img src='' style='max-height: 20px; max-width: 30px;' alt=''>");
-    // console.warn("Img is: ");
-    // console.dir(img);
-    // console.warn("Strigularly, that's: ");
-    // console.log(img);
-    img.attr("src", datalist.image);
-    inner_div.append(img);
-  } else {
-    var inner_div = $("<div style='height: 20px; width: 30px;'></div>");
-  }
-  left_pull.append(inner_div);
-  root_div.append(left_pull);
-  var name_div = $("<div>");
-  name_div.text(datalist.text);
-  root_div.append(name_div);
-  var safe_html = root_div.get(0).outerHTML;
-  var old_html = formatDatalist(datalist);
-  if (safe_html != old_html) {
-    // console.log("HTML MISMATCH: ");
-    // console.log("FormatDatalistSafe: ");
-    // console.dir(root_div.get(0));
-    // console.log(safe_html);
-    // console.log("FormatDataList: ");
-    // console.log(old_html);
-  }
-  return root_div;
-}
-function formatDatalist(datalist) {
-  var loading_markup = '<i class="fas fa-spinner fa-spin" aria-hidden="true"></i> Loading...';
-  if (datalist.loading) {
-    return loading_markup;
-  }
-  var markup = "<div class='clearfix'>";
-  markup += "<div class='pull-left' style='padding-right: 10px;'>";
-  if (datalist.image) {
-    markup += "<div style='width: 30px;'><img src='" + datalist.image + "' alt='" + datalist.tex + "' style='max-height: 20px; max-width: 30px;'></div>";
-  } else {
-    markup += "<div style='height: 20px; width: 30px;'></div>";
-  }
-  markup += "</div><div>" + datalist.text + "</div>";
-  markup += "</div>";
-  return markup;
-}
-function formatDataSelection(datalist) {
-  return datalist.text.replace(/>/g, '&gt;').replace(/</g, '&lt;').replace(/"/g, '&quot;').replace(/'/g, '&#039;');
-}
 
 /***/ }),
 
@@ -3155,6 +2343,903 @@ if (typeof jQuery === 'undefined') {
 }(jQuery);
 
 
+/***/ }),
+
+/***/ "./node_modules/canvas-confetti/dist/confetti.browser.js":
+/*!***************************************************************!*\
+  !*** ./node_modules/canvas-confetti/dist/confetti.browser.js ***!
+  \***************************************************************/
+/***/ (() => {
+
+// canvas-confetti v1.9.3 built on 2024-04-30T22:19:17.794Z
+!(function (window, module) {
+// source content
+/* globals Map */
+
+(function main(global, module, isWorker, workerSize) {
+  var canUseWorker = !!(
+    global.Worker &&
+    global.Blob &&
+    global.Promise &&
+    global.OffscreenCanvas &&
+    global.OffscreenCanvasRenderingContext2D &&
+    global.HTMLCanvasElement &&
+    global.HTMLCanvasElement.prototype.transferControlToOffscreen &&
+    global.URL &&
+    global.URL.createObjectURL);
+
+  var canUsePaths = typeof Path2D === 'function' && typeof DOMMatrix === 'function';
+  var canDrawBitmap = (function () {
+    // this mostly supports ssr
+    if (!global.OffscreenCanvas) {
+      return false;
+    }
+
+    var canvas = new OffscreenCanvas(1, 1);
+    var ctx = canvas.getContext('2d');
+    ctx.fillRect(0, 0, 1, 1);
+    var bitmap = canvas.transferToImageBitmap();
+
+    try {
+      ctx.createPattern(bitmap, 'no-repeat');
+    } catch (e) {
+      return false;
+    }
+
+    return true;
+  })();
+
+  function noop() {}
+
+  // create a promise if it exists, otherwise, just
+  // call the function directly
+  function promise(func) {
+    var ModulePromise = module.exports.Promise;
+    var Prom = ModulePromise !== void 0 ? ModulePromise : global.Promise;
+
+    if (typeof Prom === 'function') {
+      return new Prom(func);
+    }
+
+    func(noop, noop);
+
+    return null;
+  }
+
+  var bitmapMapper = (function (skipTransform, map) {
+    // see https://github.com/catdad/canvas-confetti/issues/209
+    // creating canvases is actually pretty expensive, so we should create a
+    // 1:1 map for bitmap:canvas, so that we can animate the confetti in
+    // a performant manner, but also not store them forever so that we don't
+    // have a memory leak
+    return {
+      transform: function(bitmap) {
+        if (skipTransform) {
+          return bitmap;
+        }
+
+        if (map.has(bitmap)) {
+          return map.get(bitmap);
+        }
+
+        var canvas = new OffscreenCanvas(bitmap.width, bitmap.height);
+        var ctx = canvas.getContext('2d');
+        ctx.drawImage(bitmap, 0, 0);
+
+        map.set(bitmap, canvas);
+
+        return canvas;
+      },
+      clear: function () {
+        map.clear();
+      }
+    };
+  })(canDrawBitmap, new Map());
+
+  var raf = (function () {
+    var TIME = Math.floor(1000 / 60);
+    var frame, cancel;
+    var frames = {};
+    var lastFrameTime = 0;
+
+    if (typeof requestAnimationFrame === 'function' && typeof cancelAnimationFrame === 'function') {
+      frame = function (cb) {
+        var id = Math.random();
+
+        frames[id] = requestAnimationFrame(function onFrame(time) {
+          if (lastFrameTime === time || lastFrameTime + TIME - 1 < time) {
+            lastFrameTime = time;
+            delete frames[id];
+
+            cb();
+          } else {
+            frames[id] = requestAnimationFrame(onFrame);
+          }
+        });
+
+        return id;
+      };
+      cancel = function (id) {
+        if (frames[id]) {
+          cancelAnimationFrame(frames[id]);
+        }
+      };
+    } else {
+      frame = function (cb) {
+        return setTimeout(cb, TIME);
+      };
+      cancel = function (timer) {
+        return clearTimeout(timer);
+      };
+    }
+
+    return { frame: frame, cancel: cancel };
+  }());
+
+  var getWorker = (function () {
+    var worker;
+    var prom;
+    var resolves = {};
+
+    function decorate(worker) {
+      function execute(options, callback) {
+        worker.postMessage({ options: options || {}, callback: callback });
+      }
+      worker.init = function initWorker(canvas) {
+        var offscreen = canvas.transferControlToOffscreen();
+        worker.postMessage({ canvas: offscreen }, [offscreen]);
+      };
+
+      worker.fire = function fireWorker(options, size, done) {
+        if (prom) {
+          execute(options, null);
+          return prom;
+        }
+
+        var id = Math.random().toString(36).slice(2);
+
+        prom = promise(function (resolve) {
+          function workerDone(msg) {
+            if (msg.data.callback !== id) {
+              return;
+            }
+
+            delete resolves[id];
+            worker.removeEventListener('message', workerDone);
+
+            prom = null;
+
+            bitmapMapper.clear();
+
+            done();
+            resolve();
+          }
+
+          worker.addEventListener('message', workerDone);
+          execute(options, id);
+
+          resolves[id] = workerDone.bind(null, { data: { callback: id }});
+        });
+
+        return prom;
+      };
+
+      worker.reset = function resetWorker() {
+        worker.postMessage({ reset: true });
+
+        for (var id in resolves) {
+          resolves[id]();
+          delete resolves[id];
+        }
+      };
+    }
+
+    return function () {
+      if (worker) {
+        return worker;
+      }
+
+      if (!isWorker && canUseWorker) {
+        var code = [
+          'var CONFETTI, SIZE = {}, module = {};',
+          '(' + main.toString() + ')(this, module, true, SIZE);',
+          'onmessage = function(msg) {',
+          '  if (msg.data.options) {',
+          '    CONFETTI(msg.data.options).then(function () {',
+          '      if (msg.data.callback) {',
+          '        postMessage({ callback: msg.data.callback });',
+          '      }',
+          '    });',
+          '  } else if (msg.data.reset) {',
+          '    CONFETTI && CONFETTI.reset();',
+          '  } else if (msg.data.resize) {',
+          '    SIZE.width = msg.data.resize.width;',
+          '    SIZE.height = msg.data.resize.height;',
+          '  } else if (msg.data.canvas) {',
+          '    SIZE.width = msg.data.canvas.width;',
+          '    SIZE.height = msg.data.canvas.height;',
+          '    CONFETTI = module.exports.create(msg.data.canvas);',
+          '  }',
+          '}',
+        ].join('\n');
+        try {
+          worker = new Worker(URL.createObjectURL(new Blob([code])));
+        } catch (e) {
+          // eslint-disable-next-line no-console
+          typeof console !== undefined && typeof console.warn === 'function' ? console.warn('🎊 Could not load worker', e) : null;
+
+          return null;
+        }
+
+        decorate(worker);
+      }
+
+      return worker;
+    };
+  })();
+
+  var defaults = {
+    particleCount: 50,
+    angle: 90,
+    spread: 45,
+    startVelocity: 45,
+    decay: 0.9,
+    gravity: 1,
+    drift: 0,
+    ticks: 200,
+    x: 0.5,
+    y: 0.5,
+    shapes: ['square', 'circle'],
+    zIndex: 100,
+    colors: [
+      '#26ccff',
+      '#a25afd',
+      '#ff5e7e',
+      '#88ff5a',
+      '#fcff42',
+      '#ffa62d',
+      '#ff36ff'
+    ],
+    // probably should be true, but back-compat
+    disableForReducedMotion: false,
+    scalar: 1
+  };
+
+  function convert(val, transform) {
+    return transform ? transform(val) : val;
+  }
+
+  function isOk(val) {
+    return !(val === null || val === undefined);
+  }
+
+  function prop(options, name, transform) {
+    return convert(
+      options && isOk(options[name]) ? options[name] : defaults[name],
+      transform
+    );
+  }
+
+  function onlyPositiveInt(number){
+    return number < 0 ? 0 : Math.floor(number);
+  }
+
+  function randomInt(min, max) {
+    // [min, max)
+    return Math.floor(Math.random() * (max - min)) + min;
+  }
+
+  function toDecimal(str) {
+    return parseInt(str, 16);
+  }
+
+  function colorsToRgb(colors) {
+    return colors.map(hexToRgb);
+  }
+
+  function hexToRgb(str) {
+    var val = String(str).replace(/[^0-9a-f]/gi, '');
+
+    if (val.length < 6) {
+        val = val[0]+val[0]+val[1]+val[1]+val[2]+val[2];
+    }
+
+    return {
+      r: toDecimal(val.substring(0,2)),
+      g: toDecimal(val.substring(2,4)),
+      b: toDecimal(val.substring(4,6))
+    };
+  }
+
+  function getOrigin(options) {
+    var origin = prop(options, 'origin', Object);
+    origin.x = prop(origin, 'x', Number);
+    origin.y = prop(origin, 'y', Number);
+
+    return origin;
+  }
+
+  function setCanvasWindowSize(canvas) {
+    canvas.width = document.documentElement.clientWidth;
+    canvas.height = document.documentElement.clientHeight;
+  }
+
+  function setCanvasRectSize(canvas) {
+    var rect = canvas.getBoundingClientRect();
+    canvas.width = rect.width;
+    canvas.height = rect.height;
+  }
+
+  function getCanvas(zIndex) {
+    var canvas = document.createElement('canvas');
+
+    canvas.style.position = 'fixed';
+    canvas.style.top = '0px';
+    canvas.style.left = '0px';
+    canvas.style.pointerEvents = 'none';
+    canvas.style.zIndex = zIndex;
+
+    return canvas;
+  }
+
+  function ellipse(context, x, y, radiusX, radiusY, rotation, startAngle, endAngle, antiClockwise) {
+    context.save();
+    context.translate(x, y);
+    context.rotate(rotation);
+    context.scale(radiusX, radiusY);
+    context.arc(0, 0, 1, startAngle, endAngle, antiClockwise);
+    context.restore();
+  }
+
+  function randomPhysics(opts) {
+    var radAngle = opts.angle * (Math.PI / 180);
+    var radSpread = opts.spread * (Math.PI / 180);
+
+    return {
+      x: opts.x,
+      y: opts.y,
+      wobble: Math.random() * 10,
+      wobbleSpeed: Math.min(0.11, Math.random() * 0.1 + 0.05),
+      velocity: (opts.startVelocity * 0.5) + (Math.random() * opts.startVelocity),
+      angle2D: -radAngle + ((0.5 * radSpread) - (Math.random() * radSpread)),
+      tiltAngle: (Math.random() * (0.75 - 0.25) + 0.25) * Math.PI,
+      color: opts.color,
+      shape: opts.shape,
+      tick: 0,
+      totalTicks: opts.ticks,
+      decay: opts.decay,
+      drift: opts.drift,
+      random: Math.random() + 2,
+      tiltSin: 0,
+      tiltCos: 0,
+      wobbleX: 0,
+      wobbleY: 0,
+      gravity: opts.gravity * 3,
+      ovalScalar: 0.6,
+      scalar: opts.scalar,
+      flat: opts.flat
+    };
+  }
+
+  function updateFetti(context, fetti) {
+    fetti.x += Math.cos(fetti.angle2D) * fetti.velocity + fetti.drift;
+    fetti.y += Math.sin(fetti.angle2D) * fetti.velocity + fetti.gravity;
+    fetti.velocity *= fetti.decay;
+
+    if (fetti.flat) {
+      fetti.wobble = 0;
+      fetti.wobbleX = fetti.x + (10 * fetti.scalar);
+      fetti.wobbleY = fetti.y + (10 * fetti.scalar);
+
+      fetti.tiltSin = 0;
+      fetti.tiltCos = 0;
+      fetti.random = 1;
+    } else {
+      fetti.wobble += fetti.wobbleSpeed;
+      fetti.wobbleX = fetti.x + ((10 * fetti.scalar) * Math.cos(fetti.wobble));
+      fetti.wobbleY = fetti.y + ((10 * fetti.scalar) * Math.sin(fetti.wobble));
+
+      fetti.tiltAngle += 0.1;
+      fetti.tiltSin = Math.sin(fetti.tiltAngle);
+      fetti.tiltCos = Math.cos(fetti.tiltAngle);
+      fetti.random = Math.random() + 2;
+    }
+
+    var progress = (fetti.tick++) / fetti.totalTicks;
+
+    var x1 = fetti.x + (fetti.random * fetti.tiltCos);
+    var y1 = fetti.y + (fetti.random * fetti.tiltSin);
+    var x2 = fetti.wobbleX + (fetti.random * fetti.tiltCos);
+    var y2 = fetti.wobbleY + (fetti.random * fetti.tiltSin);
+
+    context.fillStyle = 'rgba(' + fetti.color.r + ', ' + fetti.color.g + ', ' + fetti.color.b + ', ' + (1 - progress) + ')';
+
+    context.beginPath();
+
+    if (canUsePaths && fetti.shape.type === 'path' && typeof fetti.shape.path === 'string' && Array.isArray(fetti.shape.matrix)) {
+      context.fill(transformPath2D(
+        fetti.shape.path,
+        fetti.shape.matrix,
+        fetti.x,
+        fetti.y,
+        Math.abs(x2 - x1) * 0.1,
+        Math.abs(y2 - y1) * 0.1,
+        Math.PI / 10 * fetti.wobble
+      ));
+    } else if (fetti.shape.type === 'bitmap') {
+      var rotation = Math.PI / 10 * fetti.wobble;
+      var scaleX = Math.abs(x2 - x1) * 0.1;
+      var scaleY = Math.abs(y2 - y1) * 0.1;
+      var width = fetti.shape.bitmap.width * fetti.scalar;
+      var height = fetti.shape.bitmap.height * fetti.scalar;
+
+      var matrix = new DOMMatrix([
+        Math.cos(rotation) * scaleX,
+        Math.sin(rotation) * scaleX,
+        -Math.sin(rotation) * scaleY,
+        Math.cos(rotation) * scaleY,
+        fetti.x,
+        fetti.y
+      ]);
+
+      // apply the transform matrix from the confetti shape
+      matrix.multiplySelf(new DOMMatrix(fetti.shape.matrix));
+
+      var pattern = context.createPattern(bitmapMapper.transform(fetti.shape.bitmap), 'no-repeat');
+      pattern.setTransform(matrix);
+
+      context.globalAlpha = (1 - progress);
+      context.fillStyle = pattern;
+      context.fillRect(
+        fetti.x - (width / 2),
+        fetti.y - (height / 2),
+        width,
+        height
+      );
+      context.globalAlpha = 1;
+    } else if (fetti.shape === 'circle') {
+      context.ellipse ?
+        context.ellipse(fetti.x, fetti.y, Math.abs(x2 - x1) * fetti.ovalScalar, Math.abs(y2 - y1) * fetti.ovalScalar, Math.PI / 10 * fetti.wobble, 0, 2 * Math.PI) :
+        ellipse(context, fetti.x, fetti.y, Math.abs(x2 - x1) * fetti.ovalScalar, Math.abs(y2 - y1) * fetti.ovalScalar, Math.PI / 10 * fetti.wobble, 0, 2 * Math.PI);
+    } else if (fetti.shape === 'star') {
+      var rot = Math.PI / 2 * 3;
+      var innerRadius = 4 * fetti.scalar;
+      var outerRadius = 8 * fetti.scalar;
+      var x = fetti.x;
+      var y = fetti.y;
+      var spikes = 5;
+      var step = Math.PI / spikes;
+
+      while (spikes--) {
+        x = fetti.x + Math.cos(rot) * outerRadius;
+        y = fetti.y + Math.sin(rot) * outerRadius;
+        context.lineTo(x, y);
+        rot += step;
+
+        x = fetti.x + Math.cos(rot) * innerRadius;
+        y = fetti.y + Math.sin(rot) * innerRadius;
+        context.lineTo(x, y);
+        rot += step;
+      }
+    } else {
+      context.moveTo(Math.floor(fetti.x), Math.floor(fetti.y));
+      context.lineTo(Math.floor(fetti.wobbleX), Math.floor(y1));
+      context.lineTo(Math.floor(x2), Math.floor(y2));
+      context.lineTo(Math.floor(x1), Math.floor(fetti.wobbleY));
+    }
+
+    context.closePath();
+    context.fill();
+
+    return fetti.tick < fetti.totalTicks;
+  }
+
+  function animate(canvas, fettis, resizer, size, done) {
+    var animatingFettis = fettis.slice();
+    var context = canvas.getContext('2d');
+    var animationFrame;
+    var destroy;
+
+    var prom = promise(function (resolve) {
+      function onDone() {
+        animationFrame = destroy = null;
+
+        context.clearRect(0, 0, size.width, size.height);
+        bitmapMapper.clear();
+
+        done();
+        resolve();
+      }
+
+      function update() {
+        if (isWorker && !(size.width === workerSize.width && size.height === workerSize.height)) {
+          size.width = canvas.width = workerSize.width;
+          size.height = canvas.height = workerSize.height;
+        }
+
+        if (!size.width && !size.height) {
+          resizer(canvas);
+          size.width = canvas.width;
+          size.height = canvas.height;
+        }
+
+        context.clearRect(0, 0, size.width, size.height);
+
+        animatingFettis = animatingFettis.filter(function (fetti) {
+          return updateFetti(context, fetti);
+        });
+
+        if (animatingFettis.length) {
+          animationFrame = raf.frame(update);
+        } else {
+          onDone();
+        }
+      }
+
+      animationFrame = raf.frame(update);
+      destroy = onDone;
+    });
+
+    return {
+      addFettis: function (fettis) {
+        animatingFettis = animatingFettis.concat(fettis);
+
+        return prom;
+      },
+      canvas: canvas,
+      promise: prom,
+      reset: function () {
+        if (animationFrame) {
+          raf.cancel(animationFrame);
+        }
+
+        if (destroy) {
+          destroy();
+        }
+      }
+    };
+  }
+
+  function confettiCannon(canvas, globalOpts) {
+    var isLibCanvas = !canvas;
+    var allowResize = !!prop(globalOpts || {}, 'resize');
+    var hasResizeEventRegistered = false;
+    var globalDisableForReducedMotion = prop(globalOpts, 'disableForReducedMotion', Boolean);
+    var shouldUseWorker = canUseWorker && !!prop(globalOpts || {}, 'useWorker');
+    var worker = shouldUseWorker ? getWorker() : null;
+    var resizer = isLibCanvas ? setCanvasWindowSize : setCanvasRectSize;
+    var initialized = (canvas && worker) ? !!canvas.__confetti_initialized : false;
+    var preferLessMotion = typeof matchMedia === 'function' && matchMedia('(prefers-reduced-motion)').matches;
+    var animationObj;
+
+    function fireLocal(options, size, done) {
+      var particleCount = prop(options, 'particleCount', onlyPositiveInt);
+      var angle = prop(options, 'angle', Number);
+      var spread = prop(options, 'spread', Number);
+      var startVelocity = prop(options, 'startVelocity', Number);
+      var decay = prop(options, 'decay', Number);
+      var gravity = prop(options, 'gravity', Number);
+      var drift = prop(options, 'drift', Number);
+      var colors = prop(options, 'colors', colorsToRgb);
+      var ticks = prop(options, 'ticks', Number);
+      var shapes = prop(options, 'shapes');
+      var scalar = prop(options, 'scalar');
+      var flat = !!prop(options, 'flat');
+      var origin = getOrigin(options);
+
+      var temp = particleCount;
+      var fettis = [];
+
+      var startX = canvas.width * origin.x;
+      var startY = canvas.height * origin.y;
+
+      while (temp--) {
+        fettis.push(
+          randomPhysics({
+            x: startX,
+            y: startY,
+            angle: angle,
+            spread: spread,
+            startVelocity: startVelocity,
+            color: colors[temp % colors.length],
+            shape: shapes[randomInt(0, shapes.length)],
+            ticks: ticks,
+            decay: decay,
+            gravity: gravity,
+            drift: drift,
+            scalar: scalar,
+            flat: flat
+          })
+        );
+      }
+
+      // if we have a previous canvas already animating,
+      // add to it
+      if (animationObj) {
+        return animationObj.addFettis(fettis);
+      }
+
+      animationObj = animate(canvas, fettis, resizer, size , done);
+
+      return animationObj.promise;
+    }
+
+    function fire(options) {
+      var disableForReducedMotion = globalDisableForReducedMotion || prop(options, 'disableForReducedMotion', Boolean);
+      var zIndex = prop(options, 'zIndex', Number);
+
+      if (disableForReducedMotion && preferLessMotion) {
+        return promise(function (resolve) {
+          resolve();
+        });
+      }
+
+      if (isLibCanvas && animationObj) {
+        // use existing canvas from in-progress animation
+        canvas = animationObj.canvas;
+      } else if (isLibCanvas && !canvas) {
+        // create and initialize a new canvas
+        canvas = getCanvas(zIndex);
+        document.body.appendChild(canvas);
+      }
+
+      if (allowResize && !initialized) {
+        // initialize the size of a user-supplied canvas
+        resizer(canvas);
+      }
+
+      var size = {
+        width: canvas.width,
+        height: canvas.height
+      };
+
+      if (worker && !initialized) {
+        worker.init(canvas);
+      }
+
+      initialized = true;
+
+      if (worker) {
+        canvas.__confetti_initialized = true;
+      }
+
+      function onResize() {
+        if (worker) {
+          // TODO this really shouldn't be immediate, because it is expensive
+          var obj = {
+            getBoundingClientRect: function () {
+              if (!isLibCanvas) {
+                return canvas.getBoundingClientRect();
+              }
+            }
+          };
+
+          resizer(obj);
+
+          worker.postMessage({
+            resize: {
+              width: obj.width,
+              height: obj.height
+            }
+          });
+          return;
+        }
+
+        // don't actually query the size here, since this
+        // can execute frequently and rapidly
+        size.width = size.height = null;
+      }
+
+      function done() {
+        animationObj = null;
+
+        if (allowResize) {
+          hasResizeEventRegistered = false;
+          global.removeEventListener('resize', onResize);
+        }
+
+        if (isLibCanvas && canvas) {
+          if (document.body.contains(canvas)) {
+            document.body.removeChild(canvas); 
+          }
+          canvas = null;
+          initialized = false;
+        }
+      }
+
+      if (allowResize && !hasResizeEventRegistered) {
+        hasResizeEventRegistered = true;
+        global.addEventListener('resize', onResize, false);
+      }
+
+      if (worker) {
+        return worker.fire(options, size, done);
+      }
+
+      return fireLocal(options, size, done);
+    }
+
+    fire.reset = function () {
+      if (worker) {
+        worker.reset();
+      }
+
+      if (animationObj) {
+        animationObj.reset();
+      }
+    };
+
+    return fire;
+  }
+
+  // Make default export lazy to defer worker creation until called.
+  var defaultFire;
+  function getDefaultFire() {
+    if (!defaultFire) {
+      defaultFire = confettiCannon(null, { useWorker: true, resize: true });
+    }
+    return defaultFire;
+  }
+
+  function transformPath2D(pathString, pathMatrix, x, y, scaleX, scaleY, rotation) {
+    var path2d = new Path2D(pathString);
+
+    var t1 = new Path2D();
+    t1.addPath(path2d, new DOMMatrix(pathMatrix));
+
+    var t2 = new Path2D();
+    // see https://developer.mozilla.org/en-US/docs/Web/API/DOMMatrix/DOMMatrix
+    t2.addPath(t1, new DOMMatrix([
+      Math.cos(rotation) * scaleX,
+      Math.sin(rotation) * scaleX,
+      -Math.sin(rotation) * scaleY,
+      Math.cos(rotation) * scaleY,
+      x,
+      y
+    ]));
+
+    return t2;
+  }
+
+  function shapeFromPath(pathData) {
+    if (!canUsePaths) {
+      throw new Error('path confetti are not supported in this browser');
+    }
+
+    var path, matrix;
+
+    if (typeof pathData === 'string') {
+      path = pathData;
+    } else {
+      path = pathData.path;
+      matrix = pathData.matrix;
+    }
+
+    var path2d = new Path2D(path);
+    var tempCanvas = document.createElement('canvas');
+    var tempCtx = tempCanvas.getContext('2d');
+
+    if (!matrix) {
+      // attempt to figure out the width of the path, up to 1000x1000
+      var maxSize = 1000;
+      var minX = maxSize;
+      var minY = maxSize;
+      var maxX = 0;
+      var maxY = 0;
+      var width, height;
+
+      // do some line skipping... this is faster than checking
+      // every pixel and will be mostly still correct
+      for (var x = 0; x < maxSize; x += 2) {
+        for (var y = 0; y < maxSize; y += 2) {
+          if (tempCtx.isPointInPath(path2d, x, y, 'nonzero')) {
+            minX = Math.min(minX, x);
+            minY = Math.min(minY, y);
+            maxX = Math.max(maxX, x);
+            maxY = Math.max(maxY, y);
+          }
+        }
+      }
+
+      width = maxX - minX;
+      height = maxY - minY;
+
+      var maxDesiredSize = 10;
+      var scale = Math.min(maxDesiredSize/width, maxDesiredSize/height);
+
+      matrix = [
+        scale, 0, 0, scale,
+        -Math.round((width/2) + minX) * scale,
+        -Math.round((height/2) + minY) * scale
+      ];
+    }
+
+    return {
+      type: 'path',
+      path: path,
+      matrix: matrix
+    };
+  }
+
+  function shapeFromText(textData) {
+    var text,
+        scalar = 1,
+        color = '#000000',
+        // see https://nolanlawson.com/2022/04/08/the-struggle-of-using-native-emoji-on-the-web/
+        fontFamily = '"Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji", "EmojiOne Color", "Android Emoji", "Twemoji Mozilla", "system emoji", sans-serif';
+
+    if (typeof textData === 'string') {
+      text = textData;
+    } else {
+      text = textData.text;
+      scalar = 'scalar' in textData ? textData.scalar : scalar;
+      fontFamily = 'fontFamily' in textData ? textData.fontFamily : fontFamily;
+      color = 'color' in textData ? textData.color : color;
+    }
+
+    // all other confetti are 10 pixels,
+    // so this pixel size is the de-facto 100% scale confetti
+    var fontSize = 10 * scalar;
+    var font = '' + fontSize + 'px ' + fontFamily;
+
+    var canvas = new OffscreenCanvas(fontSize, fontSize);
+    var ctx = canvas.getContext('2d');
+
+    ctx.font = font;
+    var size = ctx.measureText(text);
+    var width = Math.ceil(size.actualBoundingBoxRight + size.actualBoundingBoxLeft);
+    var height = Math.ceil(size.actualBoundingBoxAscent + size.actualBoundingBoxDescent);
+
+    var padding = 2;
+    var x = size.actualBoundingBoxLeft + padding;
+    var y = size.actualBoundingBoxAscent + padding;
+    width += padding + padding;
+    height += padding + padding;
+
+    canvas = new OffscreenCanvas(width, height);
+    ctx = canvas.getContext('2d');
+    ctx.font = font;
+    ctx.fillStyle = color;
+
+    ctx.fillText(text, x, y);
+
+    var scale = 1 / scalar;
+
+    return {
+      type: 'bitmap',
+      // TODO these probably need to be transfered for workers
+      bitmap: canvas.transferToImageBitmap(),
+      matrix: [scale, 0, 0, scale, -width * scale / 2, -height * scale / 2]
+    };
+  }
+
+  module.exports = function() {
+    return getDefaultFire().apply(this, arguments);
+  };
+  module.exports.reset = function() {
+    getDefaultFire().reset();
+  };
+  module.exports.create = confettiCannon;
+  module.exports.shapeFromPath = shapeFromPath;
+  module.exports.shapeFromText = shapeFromText;
+}((function () {
+  if (typeof window !== 'undefined') {
+    return window;
+  }
+
+  if (typeof self !== 'undefined') {
+    return self;
+  }
+
+  return this || {};
+})(), module, false));
+
+// end source content
+
+  window.confetti = module.exports;
+}(window, {}));
+
+
 /***/ }),
 
 /***/ "./node_modules/jquery-ui/ui/version.js":
@@ -3179,7 +3264,7 @@ var __WEBPACK_AMD_DEFINE_FACTORY__, __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_
 
 $.ui = $.ui || {};
 
-return $.ui.version = "1.13.3";
+return $.ui.version = "1.14.1";
 
 } );
 
@@ -3193,7 +3278,7 @@ return $.ui.version = "1.13.3";
 /***/ ((module, exports, __webpack_require__) => {
 
 var __WEBPACK_AMD_DEFINE_FACTORY__, __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_DEFINE_RESULT__;/*!
- * jQuery UI Widget 1.13.3
+ * jQuery UI Widget 1.14.1
  * https://jqueryui.com
  *
  * Copyright OpenJS Foundation and other contributors
@@ -3249,6 +3334,9 @@ $.widget = function( name, base, prototype ) {
 
 	var namespace = name.split( "." )[ 0 ];
 	name = name.split( "." )[ 1 ];
+	if ( name === "__proto__" || name === "constructor" ) {
+		return $.error( "Invalid widget name: " + name );
+	}
 	var fullName = namespace + "-" + name;
 
 	if ( !prototype ) {
@@ -32046,10 +32134,807 @@ var __WEBPACK_AMD_DEFINE_RESULT__;/**
 
 /***/ }),
 
-/***/ "./resources/assets/less/skins/skin-contrast.less":
-/*!********************************************************!*\
-  !*** ./resources/assets/less/skins/skin-contrast.less ***!
-  \********************************************************/
+/***/ "./resources/assets/js/bootstrap.js":
+/*!******************************************!*\
+  !*** ./resources/assets/js/bootstrap.js ***!
+  \******************************************/
+/***/ ((__unused_webpack_module, __unused_webpack_exports, __webpack_require__) => {
+
+window._ = __webpack_require__(/*! lodash */ "./node_modules/lodash/lodash.js");
+
+/**
+ * We'll load jQuery and the Bootstrap jQuery plugin which provides support
+ * for JavaScript based Bootstrap features such as modals and tabs. This
+ * code may be modified to fit the specific needs of your application.
+ */
+//window.$ = window.jQuery = require('jquery');
+
+/**
+ * jQuery UI is loaded here and then the tooltip is assigned another funtion name
+ * This resolves the issue of jquery-ui & bootstrap tooltip conflict
+ */
+__webpack_require__(/*! jquery-ui */ "./node_modules/jquery-ui/ui/widget.js");
+jQuery.fn.uitooltip = jQuery.fn.tooltip;
+
+/**
+ * Load boostrap
+ */
+__webpack_require__(/*! bootstrap-less */ "./node_modules/bootstrap-less/js/bootstrap.js");
+
+// require('admin-lte');
+
+// require('chart.js');
+
+// require('jquery-form-validator'); //says something about dependency
+/**
+ * Echo exposes an expressive API for subscribing to channels and listening
+ * for events that are broadcast by Laravel. Echo and event broadcasting
+ * allows your team to easily build robust real-time web applications.
+ */
+
+// import Echo from "laravel-echo"
+
+// window.Echo = new Echo({
+//     broadcaster: 'pusher',
+//     key: 'your-pusher-key'
+// });
+
+/***/ }),
+
+/***/ "./resources/assets/js/snipeit.js":
+/*!****************************************!*\
+  !*** ./resources/assets/js/snipeit.js ***!
+  \****************************************/
+/***/ ((__unused_webpack_module, __unused_webpack_exports, __webpack_require__) => {
+
+// var jQuery = require('jquery');
+// window.jQuery = jQuery
+// window.$ = jQuery
+
+__webpack_require__(/*! ./bootstrap */ "./resources/assets/js/bootstrap.js");
+
+/**
+ * Module containing core application logic.
+ * @param  {jQuery} $        Insulated jQuery object
+ * @param  {JSON} settings Insulated `window.snipeit.settings` object.
+ * @return {IIFE}          Immediately invoked. Returns self.
+ */
+
+lineOptions = {
+  legend: {
+    position: "bottom"
+  },
+  scales: {
+    yAxes: [{
+      ticks: {
+        fontColor: "rgba(0,0,0,0.5)",
+        fontStyle: "bold",
+        beginAtZero: true,
+        maxTicksLimit: 5,
+        padding: 20
+      },
+      gridLines: {
+        drawTicks: false,
+        display: false
+      }
+    }],
+    xAxes: [{
+      gridLines: {
+        zeroLineColor: "transparent"
+      },
+      ticks: {
+        padding: 20,
+        fontColor: "rgba(0,0,0,0.5)",
+        fontStyle: "bold"
+      }
+    }]
+  }
+};
+pieOptions = {
+  //Boolean - Whether we should show a stroke on each segment
+  segmentShowStroke: true,
+  //String - The colour of each segment stroke
+  segmentStrokeColor: "#fff",
+  //Number - The width of each segment stroke
+  segmentStrokeWidth: 1,
+  //Number - The percentage of the chart that we cut out of the middle
+  percentageInnerCutout: 50,
+  // This is 0 for Pie charts
+  //Number - Amount of animation steps
+  animationSteps: 100,
+  //String - Animation easing effect
+  animationEasing: "easeOutBounce",
+  //Boolean - Whether we animate the rotation of the Doughnut
+  animateRotate: true,
+  //Boolean - Whether we animate scaling the Doughnut from the centre
+  animateScale: false,
+  //Boolean - whether to make the chart responsive to window resizing
+  responsive: true,
+  // Boolean - whether to maintain the starting aspect ratio or not when responsive, if set to false, will take up entire container
+  maintainAspectRatio: false,
+  //String - A legend template
+  legendTemplate: "<ul class=\"<%=name.toLowerCase()%>-legend\"><% for (var i=0; i<segments.length; i++){%><li>" + "<i class='fas fa-circle-o' style='color: <%=segments[i].fillColor%>'></i>" + "<%if(segments[i].label){%><%=segments[i].label%><%}%> foo</li><%}%></ul>",
+  //String - A tooltip template
+  tooltipTemplate: "<%=value %> <%=label%> "
+};
+
+//-----------------
+//- END PIE CHART -
+//-----------------
+
+var baseUrl = $('meta[name="baseUrl"]').attr('content');
+$(function () {
+  var $el = $('table');
+
+  // confirm restore modal
+
+  $el.on('click', '.restore-asset', function (evnt) {
+    var $context = $(this);
+    var $restoreConfirmModal = $('#restoreConfirmModal');
+    var href = $context.attr('href');
+    var message = $context.attr('data-content');
+    var title = $context.attr('data-title');
+    $('#confirmModalLabel').text(title);
+    $restoreConfirmModal.find('.modal-body').text(message);
+    $('#restoreForm').attr('action', href);
+    $restoreConfirmModal.modal({
+      show: true
+    });
+    return false;
+  });
+
+  // confirm delete modal
+
+  $el.on('click', '.delete-asset', function (evnt) {
+    var $context = $(this);
+    var $dataConfirmModal = $('#dataConfirmModal');
+    var href = $context.attr('href');
+    var message = $context.attr('data-content');
+    var title = $context.attr('data-title');
+    $('#myModalLabel').text(title);
+    $dataConfirmModal.find('.modal-body').text(message);
+    $('#deleteForm').attr('action', href);
+    $dataConfirmModal.modal({
+      show: true
+    });
+    return false;
+  });
+
+  /*
+  * Slideout help menu
+  */
+  $('.slideout-menu-toggle').on('click', function (event) {
+    event.preventDefault();
+    // create menu variables
+    var slideoutMenu = $('.slideout-menu');
+    var slideoutMenuWidth = $('.slideout-menu').width();
+
+    // toggle open class
+    slideoutMenu.toggleClass("open");
+
+    // slide menu
+    if (slideoutMenu.hasClass("open")) {
+      slideoutMenu.show();
+      slideoutMenu.animate({
+        right: "0px"
+      });
+    } else {
+      slideoutMenu.animate({
+        right: -slideoutMenuWidth
+      }, "-350px");
+      slideoutMenu.fadeOut();
+    }
+  });
+
+  /*
+  * Select2
+  */
+
+  $('select.select2:not(".select2-hidden-accessible")').each(function (i, obj) {
+    {
+      $(obj).select2();
+    }
+  });
+
+  // $('.datepicker').datepicker();
+  // var datepicker = $.fn.datepicker.noConflict(); // return $.fn.datepicker to previously assigned value
+  // $.fn.bootstrapDP = datepicker;
+  // $('.datepicker').datepicker();
+
+  // Crazy select2 rich dropdowns with images!
+  $('.js-data-ajax').each(function (i, item) {
+    var link = $(item);
+    var endpoint = link.data("endpoint");
+    var select = link.data("select");
+    link.select2({
+      /**
+       * Adds an empty placeholder, allowing every select2 instance to be cleared.
+       * This placeholder can be overridden with the "data-placeholder" attribute.
+       */
+      placeholder: '',
+      allowClear: true,
+      language: $('meta[name="language"]').attr('content'),
+      dir: $('meta[name="language-direction"]').attr('content'),
+      ajax: {
+        // the baseUrl includes a trailing slash
+        url: baseUrl + 'api/v1/' + endpoint + '/selectlist',
+        dataType: 'json',
+        delay: 250,
+        headers: {
+          "X-Requested-With": 'XMLHttpRequest',
+          "X-CSRF-TOKEN": $('meta[name="csrf-token"]').attr('content')
+        },
+        data: function data(params) {
+          var data = {
+            search: params.term,
+            page: params.page || 1,
+            assetStatusType: link.data("asset-status-type"),
+            companyId: link.data("company-id")
+          };
+          return data;
+        },
+        /* processResults: function (data, params) {
+             params.page = params.page || 1;
+             var answer =  {
+                results: data.items,
+                pagination: {
+                    more: data.pagination.more
+                }
+            };
+             return answer;
+        }, */
+        cache: true
+      },
+      //escapeMarkup: function (markup) { return markup; }, // let our custom formatter work
+      templateResult: formatDatalistSafe
+      //templateSelection: formatDataSelection
+    });
+  });
+  function getSelect2Value(element) {
+    // if the passed object is not a jquery object, assuming 'element' is a selector
+    if (!(element instanceof jQuery)) element = $(element);
+    var select = element.data("select2");
+
+    // There's two different locations where the select2-generated input element can be. 
+    searchElement = select.dropdown.$search || select.$container.find(".select2-search__field");
+    var value = searchElement.val();
+    return value;
+  }
+  $(".select2-hidden-accessible").on('select2:selecting', function (e) {
+    var data = e.params.args.data;
+    var isMouseUp = false;
+    var element = $(this);
+    var value = getSelect2Value(element);
+    if (e.params.args.originalEvent) isMouseUp = e.params.args.originalEvent.type == "mouseup";
+
+    // if selected item does not match typed text, do not allow it to pass - force close for ajax.
+    if (!isMouseUp) {
+      if (value.toLowerCase() && data.text.toLowerCase().indexOf(value) < 0) {
+        e.preventDefault();
+        element.select2('close');
+
+        // if it does match, we set a flag in the event (which gets passed to subsequent events), telling it not to worry about the ajax
+      } else if (value.toLowerCase() && data.text.toLowerCase().indexOf(value) > -1) {
+        e.params.args.noForceAjax = true;
+      }
+    }
+  });
+  $(".select2-hidden-accessible").on('select2:closing', function (e) {
+    var element = $(this);
+    var value = getSelect2Value(element);
+    var noForceAjax = false;
+    var isMouseUp = false;
+    if (e.params.args.originalSelect2Event) noForceAjax = e.params.args.originalSelect2Event.noForceAjax;
+    if (e.params.args.originalEvent) isMouseUp = e.params.args.originalEvent.type == "mouseup";
+    if (value && !noForceAjax && !isMouseUp) {
+      var endpoint = element.data("endpoint");
+      var assetStatusType = element.data("asset-status-type");
+      $.ajax({
+        url: baseUrl + 'api/v1/' + endpoint + '/selectlist?search=' + value + '&page=1' + (assetStatusType ? '&assetStatusType=' + assetStatusType : ''),
+        dataType: 'json',
+        headers: {
+          "X-Requested-With": 'XMLHttpRequest',
+          "X-CSRF-TOKEN": $('meta[name="csrf-token"]').attr('content')
+        }
+      }).done(function (response) {
+        var currentlySelected = element.select2('data').map(function (x) {
+          return +x.id;
+        }).filter(function (x) {
+          return x !== 0;
+        });
+
+        // makes sure we're not selecting the same thing twice for multiples
+        var filteredResponse = response.results.filter(function (item) {
+          return currentlySelected.indexOf(+item.id) < 0;
+        });
+        var first = currentlySelected.length > 0 ? filteredResponse[0] : response.results[0];
+        if (first && first.id) {
+          first.selected = true;
+          if ($("option[value='" + first.id + "']", element).length < 1) {
+            var option = new Option(first.text, first.id, true, true);
+            element.append(option);
+          } else {
+            var isMultiple = element.attr("multiple") == "multiple";
+            element.val(isMultiple ? element.val().concat(first.id) : element.val(first.id));
+          }
+          element.trigger('change');
+          element.trigger({
+            type: 'select2:select',
+            params: {
+              data: first
+            }
+          });
+        }
+      });
+    }
+  });
+  function formatDatalist(datalist) {
+    var loading_markup = '<i class="fas fa-spinner fa-spin" aria-hidden="true"></i> Loading...';
+    if (datalist.loading) {
+      return loading_markup;
+    }
+    var markup = '<div class="clearfix">';
+    markup += '<div class="pull-left" style="padding-right: 10px;">';
+    if (datalist.image) {
+      markup += "<div style='width: 30px;'><img src='" + datalist.image + "' style='max-height: 20px; max-width: 30px;' alt='" + datalist.text + "'></div>";
+    } else {
+      markup += '<div style="height: 20px; width: 30px;"></div>';
+    }
+    markup += "</div><div>" + datalist.text + "</div>";
+    markup += "</div>";
+    return markup;
+  }
+  function formatDatalistSafe(datalist) {
+    // console.warn("What in the hell is going on with Select2?!?!!?!?");
+    // console.warn($.select2);
+    if (datalist.loading) {
+      return $('<i class="fas fa-spinner fa-spin" aria-hidden="true"></i> Loading...');
+    }
+    var root_div = $("<div class='clearfix'>");
+    var left_pull = $("<div class='pull-left' style='padding-right: 10px;'>");
+    if (datalist.image) {
+      var inner_div = $("<div style='width: 30px;'>");
+      /******************************************************************
+       * 
+       * We are specifically chosing empty alt-text below, because this 
+       * image conveys no additional information, relative to the text
+       * that will *always* be there in any select2 list that is in use
+       * in Snipe-IT. If that changes, we would probably want to change
+       * some signatures of some functions, but right now, we don't want
+       * screen readers to say "HP SuperJet 5000, .... picture of HP 
+       * SuperJet 5000..." and so on, for every single row in a list of
+       * assets or models or whatever.
+       * 
+       *******************************************************************/
+      var img = $("<img src='' style='max-height: 20px; max-width: 30px;' alt=''>");
+      // console.warn("Img is: ");
+      // console.dir(img);
+      // console.warn("Strigularly, that's: ");
+      // console.log(img);
+      img.attr("src", datalist.image);
+      inner_div.append(img);
+    } else {
+      var inner_div = $("<div style='height: 20px; width: 30px;'></div>");
+    }
+    left_pull.append(inner_div);
+    root_div.append(left_pull);
+    var name_div = $("<div>");
+    name_div.text(datalist.text);
+    root_div.append(name_div);
+    var safe_html = root_div.get(0).outerHTML;
+    var old_html = formatDatalist(datalist);
+    if (safe_html != old_html) {
+      //console.log("HTML MISMATCH: ");
+      //console.log("FormatDatalistSafe: ");
+      // console.dir(root_div.get(0));
+      //console.log(safe_html);
+      //console.log("FormatDataList: ");
+      //console.log(old_html);
+    }
+    return root_div;
+  }
+  function formatDataSelection(datalist) {
+    // This a heinous workaround for a known bug in Select2.
+    // Without this, the rich selectlists are vulnerable to XSS.
+    // Many thanks to @uberbrady for this fix. It ain't pretty,
+    // but it resolves the issue until Select2 addresses it on their end.
+    //
+    // Bug was reported in 2016 :{
+    // https://github.com/select2/select2/issues/4587
+
+    return datalist.text.replace(/>/g, '&gt;').replace(/</g, '&lt;').replace(/"/g, '&quot;').replace(/'/g, '&#039;');
+  }
+
+  // This handles the radio button selectors for the checkout-to-foo options
+  // on asset checkout and also on asset edit
+  $(function () {
+    $('input[name=checkout_to_type]').on("change", function () {
+      var assignto_type = $('input[name=checkout_to_type]:checked').val();
+      var userid = $('#assigned_user option:selected').val();
+      if (assignto_type == 'asset') {
+        $('#current_assets_box').fadeOut();
+        $('#assigned_asset').show();
+        $('#assigned_user').hide();
+        $('#assigned_location').hide();
+        $('.notification-callout').fadeOut();
+        $('[name="assigned_location"]').val('').trigger('change.select2');
+        $('[name="assigned_user"]').val('').trigger('change.select2');
+      } else if (assignto_type == 'location') {
+        $('#current_assets_box').fadeOut();
+        $('#assigned_asset').hide();
+        $('#assigned_user').hide();
+        $('#assigned_location').show();
+        $('.notification-callout').fadeOut();
+        $('[name="assigned_asset"]').val('').trigger('change.select2');
+        $('[name="assigned_user"]').val('').trigger('change.select2');
+      } else {
+        $('#assigned_asset').hide();
+        $('#assigned_user').show();
+        $('#assigned_location').hide();
+        if (userid) {
+          $('#current_assets_box').fadeIn();
+        }
+        $('.notification-callout').fadeIn();
+        $('[name="assigned_asset"]').val('').trigger('change.select2');
+        $('[name="assigned_location"]').val('').trigger('change.select2');
+      }
+    });
+  });
+
+  // ------------------------------------------------
+  // Deep linking for Bootstrap tabs
+  // ------------------------------------------------
+  var taburl = document.location.toString();
+
+  // Allow full page URL to activate a tab's ID
+  // ------------------------------------------------
+  // This allows linking to a tab on page load via the address bar.
+  // So a URL such as, http://snipe-it.local/hardware/2/#my_tab will
+  // cause the tab on that page with an ID of “my_tab” to be active.
+  if (taburl.match('#')) {
+    $('.nav-tabs a[href="#' + taburl.split('#')[1] + '"]').tab('show');
+  }
+
+  // Allow internal page links to activate a tab's ID.
+  // ------------------------------------------------
+  // This allows you to link to a tab from anywhere on the page
+  // including from within another tab. Also note that internal page
+  // links either inside or out of the tabs need to include data-toggle="tab"
+  // Ex: <a href="#my_tab" data-toggle="tab">Click me</a>
+  $('a[data-toggle="tab"]').click(function (e) {
+    var href = $(this).attr("href");
+    history.pushState(null, null, href);
+    e.preventDefault();
+    $('a[href="' + $(this).attr('href') + '"]').tab('show');
+  });
+
+  // ------------------------------------------------
+  // End Deep Linking for Bootstrap tabs
+  // ------------------------------------------------
+
+  // Image preview
+  function readURL(input, $preview) {
+    if (input.files && input.files[0]) {
+      var reader = new FileReader();
+      reader.onload = function (e) {
+        $preview.attr('src', e.target.result);
+      };
+      reader.readAsDataURL(input.files[0]);
+    }
+  }
+  function formatBytes(bytes) {
+    if (bytes < 1024) return bytes + " Bytes";else if (bytes < 1048576) return (bytes / 1024).toFixed(2) + " KB";else if (bytes < 1073741824) return (bytes / 1048576).toFixed(2) + " MB";else return (bytes / 1073741824).toFixed(2) + " GB";
+  }
+
+  // File size validation
+  $('.js-uploadFile').bind('change', function () {
+    var $this = $(this);
+    var id = '#' + $this.attr('id');
+    var status = id + '-status';
+    var $status = $(status);
+    var delete_id = $(id + '-deleteCheckbox');
+    var preview_container = $(id + '-previewContainer');
+    $status.removeClass('text-success').removeClass('text-danger');
+    $(status + ' .goodfile').remove();
+    $(status + ' .badfile').remove();
+    $(status + ' .previewSize').hide();
+    preview_container.hide();
+    $(id + '-info').html('');
+    var max_size = $this.data('maxsize');
+    var total_size = 0;
+    for (var i = 0; i < this.files.length; i++) {
+      total_size += this.files[i].size;
+      $(id + '-info').append('<span class="label label-default">' + htmlEntities(this.files[i].name) + ' (' + formatBytes(this.files[i].size) + ')</span> ');
+    }
+    if (total_size > max_size) {
+      $status.addClass('text-danger').removeClass('help-block').prepend('<i class="badfile fas fa-times"></i> ').append('<span class="previewSize"> Upload is ' + formatBytes(total_size) + '.</span>');
+    } else {
+      $status.addClass('text-success').removeClass('help-block').prepend('<i class="goodfile fas fa-check"></i> ');
+      var $preview = $(id + '-imagePreview');
+      readURL(this, $preview);
+      $preview.fadeIn();
+      preview_container.fadeIn();
+      delete_id.hide();
+    }
+  });
+});
+function htmlEntities(str) {
+  return String(str).replace(/&/g, '&amp;').replace(/</g, '&lt;').replace(/>/g, '&gt;').replace(/"/g, '&quot;');
+}
+
+/**
+ * Toggle disabled
+ */
+(function ($) {
+  $.fn.toggleDisabled = function (callback) {
+    return this.each(function () {
+      var disabled,
+        $this = $(this);
+      if ($this.attr('disabled')) {
+        $this.removeAttr('disabled');
+        disabled = false;
+      } else {
+        $this.attr('disabled', 'disabled');
+        disabled = true;
+      }
+      if (callback && typeof callback === 'function') {
+        callback(this, disabled);
+      }
+    });
+  };
+})(jQuery);
+
+/**
+ * Universal Livewire Select2 integration
+ *
+ * How to use:
+ *
+ * 1. Set the class of your select2 elements to 'livewire-select2').
+ * 2. Name your element to match a property in your Livewire component
+ * 3. Add an attribute called 'data-livewire-component' that points to $this->getId() (via `{{ }}` if you're in a blade,
+ *    or just $this->getId() if not).
+ */
+document.addEventListener('livewire:init', function () {
+  $('.livewire-select2').select2();
+  $(document).on('select2:select', '.livewire-select2', function (event) {
+    var target = $(event.target);
+    if (!event.target.name || !target.data('livewire-component')) {
+      console.error("You need to set both name (which should match a Livewire property) and data-livewire-component on your Livewire-ed select2 elements!");
+      console.error("For data-livewire-component, you probably want to use $this->getId() or {{ $this->getId() }}, as appropriate");
+      return false;
+    }
+    Livewire.find(target.data('livewire-component')).set(event.target.name, this.options[this.selectedIndex].value);
+  });
+  Livewire.hook('request', function (_ref) {
+    var succeed = _ref.succeed;
+    succeed(function () {
+      queueMicrotask(function () {
+        $('.livewire-select2').select2();
+      });
+    });
+  });
+});
+
+/***/ }),
+
+/***/ "./resources/assets/js/snipeit_modals.js":
+/*!***********************************************!*\
+  !*** ./resources/assets/js/snipeit_modals.js ***!
+  \***********************************************/
+/***/ (() => {
+
+/* 
+ * 
+ * Snipe-IT Universal Modal support
+ * 
+ * Enables modal dialogs to create sub-resources throughout Snipe-IT
+ * 
+ */
+
+/* 
+HOW TO USE
+ Create a Button looking like this:
+ <a href='{{ route('modal.show', 'user') }}' data-toggle="modal"  data-target="#createModal" data-select='assigned_to' class="btn btn-sm btn-primary">New</a>
+ If you don't have access to Blade commands (like {{ and }}, etc), you can hard-code a URL as the 'href'
+ data-toggle="modal" - required for Bootstrap Modals
+data-target="#createModal" - fixed ID for the modal, do not change
+data-select="assigned_to" - What is the *ID* of the select-dropdown that you're going to be adding to, if the modal-create was a success? Be on the lookout for duplicate ID's, it will confuse this library!
+class="btn btn-sm btn-primary" - makes it look button-ey, feel free to change :)
+
+If you want to pass additional variables to the modal (In the Category Create one, for example, you can pass category_id), you can encode them as URL variables in the href
+
+*/
+
+$(function () {
+  var baseUrl = $('meta[name="baseUrl"]').attr('content');
+  //handle modal-add-interstitial calls
+  var model, select, refreshSelector;
+  if ($('#createModal').length == 0) {
+    $('body').append('<div class="modal fade" id="createModal"></div><!-- /.modal -->');
+  }
+  $('#createModal').on("show.bs.modal", function (event) {
+    var link = $(event.relatedTarget);
+    model = link.data("dependency");
+    select = link.data("select");
+    refreshSelector = link.data("refresh");
+    $('#createModal').load(link.attr('href'), function () {
+      // this sets the focus to be the name field
+      $('#modal-name').focus();
+
+      //do we need to re-select2 this, after load? Probably.
+      $('#createModal').find('select.select2').select2();
+      // Initialize the ajaxy select2 with images.
+      // This is a copy/paste of the code from snipeit.js, would be great to only have this in one place.
+
+      $('.js-data-ajax').each(function (i, item) {
+        var link = $(item);
+        var endpoint = link.data("endpoint");
+        var select = link.data("select");
+        link.select2({
+          ajax: {
+            // the baseUrl includes a trailing slash
+            url: baseUrl + 'api/v1/' + endpoint + '/selectlist',
+            //WARNING - we're hoping that's defined on the page somewhere...
+            dataType: 'json',
+            delay: 250,
+            headers: {
+              "X-Requested-With": 'XMLHttpRequest',
+              "X-CSRF-TOKEN": $('meta[name="csrf-token"]').attr('content')
+            },
+            data: function data(params) {
+              var data = {
+                search: params.term,
+                page: params.page || 1,
+                assetStatusType: link.data("asset-status-type")
+              };
+              return data;
+            },
+            /*processResults: function (data, params) {
+                 params.page = params.page || 1;
+                 var answer =  {
+                    results: data.items,
+                    pagination: {
+                        more: data.pagination.more
+                    }
+                };
+                 return answer;
+            },*/
+            cache: true
+          },
+          //escapeMarkup: function (markup) { return markup; }, // let our custom formatter work
+          templateResult: formatDatalistSafe
+          //templateSelection: formatDataSelection
+        });
+      });
+    });
+  });
+  $('#createModal').on('click', '#modal-save', function () {
+    $.ajax({
+      type: 'POST',
+      url: $('.modal-body form').attr('action'),
+      headers: {
+        "X-Requested-With": 'XMLHttpRequest',
+        "X-CSRF-TOKEN": $('meta[name="csrf-token"]').attr('content')
+      },
+      data: $('.modal-body form').serialize(),
+      success: function success(result) {
+        if (result.status == "error") {
+          var error_message = "";
+          for (var field in result.messages) {
+            error_message += "<li>Problem(s) with field <i><strong>" + field + "</strong></i>: " + result.messages[field];
+          }
+          $('#modal_error_msg').html(error_message).show();
+          return false;
+        }
+        var id = result.payload.id;
+        var name = result.payload.name || result.payload.first_name + " " + result.payload.last_name;
+        if (!id || !name) {
+          console.error("Could not find resulting name or ID from modal-create. Name: " + name + ", id: " + id);
+          return false;
+        }
+        $('#createModal').modal('hide');
+        $('#createModal').html("");
+        var refreshTable = $('#' + refreshSelector);
+        if (refreshTable.length > 0) {
+          refreshTable.bootstrapTable('refresh');
+        }
+
+        // "select" is the original drop-down menu that someone
+        // clicked 'add' on to add a new 'thing'
+        // this code adds the newly created object to that select
+        var selector = document.getElementById(select);
+        if (!selector) {
+          return false;
+        }
+        selector.options[selector.length] = new Option(name, id);
+        selector.selectedIndex = selector.length - 1;
+        $(selector).trigger("change");
+        if (window.fetchCustomFields) {
+          fetchCustomFields();
+        }
+      },
+      error: function error(result) {
+        msg = result.responseJSON.messages || result.responseJSON.error;
+        $('#modal_error_msg').html("Server Error: " + msg).show();
+      }
+    });
+  });
+});
+function formatDatalistSafe(datalist) {
+  // console.warn("What in the hell is going on with Select2?!?!!?!?");
+  // console.warn($.select2);
+  if (datalist.loading) {
+    return $('<i class="fas fa-spinner fa-spin" aria-hidden="true"></i> Loading...');
+  }
+  var root_div = $("<div class='clearfix'>");
+  var left_pull = $("<div class='pull-left' style='padding-right: 10px;'>");
+  if (datalist.image) {
+    var inner_div = $("<div style='width: 30px;'>");
+    /******************************************************************
+     * 
+     * We are specifically chosing empty alt-text below, because this 
+     * image conveys no additional information, relative to the text
+     * that will *always* be there in any select2 list that is in use
+     * in Snipe-IT. If that changes, we would probably want to change
+     * some signatures of some functions, but right now, we don't want
+     * screen readers to say "HP SuperJet 5000, .... picture of HP 
+     * SuperJet 5000..." and so on, for every single row in a list of
+     * assets or models or whatever.
+     * 
+     *******************************************************************/
+    var img = $("<img src='' style='max-height: 20px; max-width: 30px;' alt=''>");
+    // console.warn("Img is: ");
+    // console.dir(img);
+    // console.warn("Strigularly, that's: ");
+    // console.log(img);
+    img.attr("src", datalist.image);
+    inner_div.append(img);
+  } else {
+    var inner_div = $("<div style='height: 20px; width: 30px;'></div>");
+  }
+  left_pull.append(inner_div);
+  root_div.append(left_pull);
+  var name_div = $("<div>");
+  name_div.text(datalist.text);
+  root_div.append(name_div);
+  var safe_html = root_div.get(0).outerHTML;
+  var old_html = formatDatalist(datalist);
+  if (safe_html != old_html) {
+    // console.log("HTML MISMATCH: ");
+    // console.log("FormatDatalistSafe: ");
+    // console.dir(root_div.get(0));
+    // console.log(safe_html);
+    // console.log("FormatDataList: ");
+    // console.log(old_html);
+  }
+  return root_div;
+}
+function formatDatalist(datalist) {
+  var loading_markup = '<i class="fas fa-spinner fa-spin" aria-hidden="true"></i> Loading...';
+  if (datalist.loading) {
+    return loading_markup;
+  }
+  var markup = "<div class='clearfix'>";
+  markup += "<div class='pull-left' style='padding-right: 10px;'>";
+  if (datalist.image) {
+    markup += "<div style='width: 30px;'><img src='" + datalist.image + "' alt='" + datalist.tex + "' style='max-height: 20px; max-width: 30px;'></div>";
+  } else {
+    markup += "<div style='height: 20px; width: 30px;'></div>";
+  }
+  markup += "</div><div>" + datalist.text + "</div>";
+  markup += "</div>";
+  return markup;
+}
+function formatDataSelection(datalist) {
+  return datalist.text.replace(/>/g, '&gt;').replace(/</g, '&lt;').replace(/"/g, '&quot;').replace(/'/g, '&#039;');
+}
+
+/***/ }),
+
+/***/ "./resources/assets/less/app.less":
+/*!****************************************!*\
+  !*** ./resources/assets/less/app.less ***!
+  \****************************************/
 /***/ ((__unused_webpack_module, __webpack_exports__, __webpack_require__) => {
 
 "use strict";
@@ -32059,35 +32944,22 @@ __webpack_require__.r(__webpack_exports__);
 
 /***/ }),
 
-/***/ "./resources/assets/less/skins/skin-green.less":
+/***/ "./resources/assets/less/overrides.less":
+/*!**********************************************!*\
+  !*** ./resources/assets/less/overrides.less ***!
+  \**********************************************/
+/***/ ((__unused_webpack_module, __webpack_exports__, __webpack_require__) => {
+
+"use strict";
+__webpack_require__.r(__webpack_exports__);
+// extracted by mini-css-extract-plugin
+
+
+/***/ }),
+
+/***/ "./resources/assets/less/skins/_all-skins.less":
 /*!*****************************************************!*\
-  !*** ./resources/assets/less/skins/skin-green.less ***!
-  \*****************************************************/
-/***/ ((__unused_webpack_module, __webpack_exports__, __webpack_require__) => {
-
-"use strict";
-__webpack_require__.r(__webpack_exports__);
-// extracted by mini-css-extract-plugin
-
-
-/***/ }),
-
-/***/ "./resources/assets/less/skins/skin-green-dark.less":
-/*!**********************************************************!*\
-  !*** ./resources/assets/less/skins/skin-green-dark.less ***!
-  \**********************************************************/
-/***/ ((__unused_webpack_module, __webpack_exports__, __webpack_require__) => {
-
-"use strict";
-__webpack_require__.r(__webpack_exports__);
-// extracted by mini-css-extract-plugin
-
-
-/***/ }),
-
-/***/ "./resources/assets/less/skins/skin-black.less":
-/*!*****************************************************!*\
-  !*** ./resources/assets/less/skins/skin-black.less ***!
+  !*** ./resources/assets/less/skins/_all-skins.less ***!
   \*****************************************************/
 /***/ ((__unused_webpack_module, __webpack_exports__, __webpack_require__) => {
 
@@ -32111,62 +32983,10 @@ __webpack_require__.r(__webpack_exports__);
 
 /***/ }),
 
-/***/ "./resources/assets/less/skins/skin-red-dark.less":
-/*!********************************************************!*\
-  !*** ./resources/assets/less/skins/skin-red-dark.less ***!
-  \********************************************************/
-/***/ ((__unused_webpack_module, __webpack_exports__, __webpack_require__) => {
-
-"use strict";
-__webpack_require__.r(__webpack_exports__);
-// extracted by mini-css-extract-plugin
-
-
-/***/ }),
-
-/***/ "./resources/assets/less/skins/skin-purple.less":
-/*!******************************************************!*\
-  !*** ./resources/assets/less/skins/skin-purple.less ***!
-  \******************************************************/
-/***/ ((__unused_webpack_module, __webpack_exports__, __webpack_require__) => {
-
-"use strict";
-__webpack_require__.r(__webpack_exports__);
-// extracted by mini-css-extract-plugin
-
-
-/***/ }),
-
-/***/ "./resources/assets/less/skins/skin-purple-dark.less":
-/*!***********************************************************!*\
-  !*** ./resources/assets/less/skins/skin-purple-dark.less ***!
-  \***********************************************************/
-/***/ ((__unused_webpack_module, __webpack_exports__, __webpack_require__) => {
-
-"use strict";
-__webpack_require__.r(__webpack_exports__);
-// extracted by mini-css-extract-plugin
-
-
-/***/ }),
-
-/***/ "./resources/assets/less/skins/skin-yellow.less":
-/*!******************************************************!*\
-  !*** ./resources/assets/less/skins/skin-yellow.less ***!
-  \******************************************************/
-/***/ ((__unused_webpack_module, __webpack_exports__, __webpack_require__) => {
-
-"use strict";
-__webpack_require__.r(__webpack_exports__);
-// extracted by mini-css-extract-plugin
-
-
-/***/ }),
-
-/***/ "./resources/assets/less/skins/skin-yellow-dark.less":
-/*!***********************************************************!*\
-  !*** ./resources/assets/less/skins/skin-yellow-dark.less ***!
-  \***********************************************************/
+/***/ "./resources/assets/less/skins/skin-black.less":
+/*!*****************************************************!*\
+  !*** ./resources/assets/less/skins/skin-black.less ***!
+  \*****************************************************/
 /***/ ((__unused_webpack_module, __webpack_exports__, __webpack_require__) => {
 
 "use strict";
@@ -32187,6 +33007,58 @@ __webpack_require__.r(__webpack_exports__);
 // extracted by mini-css-extract-plugin
 
 
+/***/ }),
+
+/***/ "./resources/assets/less/skins/skin-blue.less":
+/*!****************************************************!*\
+  !*** ./resources/assets/less/skins/skin-blue.less ***!
+  \****************************************************/
+/***/ ((__unused_webpack_module, __webpack_exports__, __webpack_require__) => {
+
+"use strict";
+__webpack_require__.r(__webpack_exports__);
+// extracted by mini-css-extract-plugin
+
+
+/***/ }),
+
+/***/ "./resources/assets/less/skins/skin-contrast.less":
+/*!********************************************************!*\
+  !*** ./resources/assets/less/skins/skin-contrast.less ***!
+  \********************************************************/
+/***/ ((__unused_webpack_module, __webpack_exports__, __webpack_require__) => {
+
+"use strict";
+__webpack_require__.r(__webpack_exports__);
+// extracted by mini-css-extract-plugin
+
+
+/***/ }),
+
+/***/ "./resources/assets/less/skins/skin-green-dark.less":
+/*!**********************************************************!*\
+  !*** ./resources/assets/less/skins/skin-green-dark.less ***!
+  \**********************************************************/
+/***/ ((__unused_webpack_module, __webpack_exports__, __webpack_require__) => {
+
+"use strict";
+__webpack_require__.r(__webpack_exports__);
+// extracted by mini-css-extract-plugin
+
+
+/***/ }),
+
+/***/ "./resources/assets/less/skins/skin-green.less":
+/*!*****************************************************!*\
+  !*** ./resources/assets/less/skins/skin-green.less ***!
+  \*****************************************************/
+/***/ ((__unused_webpack_module, __webpack_exports__, __webpack_require__) => {
+
+"use strict";
+__webpack_require__.r(__webpack_exports__);
+// extracted by mini-css-extract-plugin
+
+
 /***/ }),
 
 /***/ "./resources/assets/less/skins/skin-orange-dark.less":
@@ -32215,10 +33087,10 @@ __webpack_require__.r(__webpack_exports__);
 
 /***/ }),
 
-/***/ "./node_modules/admin-lte/build/less/AdminLTE.less":
-/*!*********************************************************!*\
-  !*** ./node_modules/admin-lte/build/less/AdminLTE.less ***!
-  \*********************************************************/
+/***/ "./resources/assets/less/skins/skin-purple-dark.less":
+/*!***********************************************************!*\
+  !*** ./resources/assets/less/skins/skin-purple-dark.less ***!
+  \***********************************************************/
 /***/ ((__unused_webpack_module, __webpack_exports__, __webpack_require__) => {
 
 "use strict";
@@ -32228,10 +33100,10 @@ __webpack_require__.r(__webpack_exports__);
 
 /***/ }),
 
-/***/ "./resources/assets/less/app.less":
-/*!****************************************!*\
-  !*** ./resources/assets/less/app.less ***!
-  \****************************************/
+/***/ "./resources/assets/less/skins/skin-purple.less":
+/*!******************************************************!*\
+  !*** ./resources/assets/less/skins/skin-purple.less ***!
+  \******************************************************/
 /***/ ((__unused_webpack_module, __webpack_exports__, __webpack_require__) => {
 
 "use strict";
@@ -32241,23 +33113,10 @@ __webpack_require__.r(__webpack_exports__);
 
 /***/ }),
 
-/***/ "./resources/assets/less/overrides.less":
-/*!**********************************************!*\
-  !*** ./resources/assets/less/overrides.less ***!
-  \**********************************************/
-/***/ ((__unused_webpack_module, __webpack_exports__, __webpack_require__) => {
-
-"use strict";
-__webpack_require__.r(__webpack_exports__);
-// extracted by mini-css-extract-plugin
-
-
-/***/ }),
-
-/***/ "./resources/assets/less/skins/skin-blue.less":
-/*!****************************************************!*\
-  !*** ./resources/assets/less/skins/skin-blue.less ***!
-  \****************************************************/
+/***/ "./resources/assets/less/skins/skin-red-dark.less":
+/*!********************************************************!*\
+  !*** ./resources/assets/less/skins/skin-red-dark.less ***!
+  \********************************************************/
 /***/ ((__unused_webpack_module, __webpack_exports__, __webpack_require__) => {
 
 "use strict";
@@ -32278,6 +33137,32 @@ __webpack_require__.r(__webpack_exports__);
 // extracted by mini-css-extract-plugin
 
 
+/***/ }),
+
+/***/ "./resources/assets/less/skins/skin-yellow-dark.less":
+/*!***********************************************************!*\
+  !*** ./resources/assets/less/skins/skin-yellow-dark.less ***!
+  \***********************************************************/
+/***/ ((__unused_webpack_module, __webpack_exports__, __webpack_require__) => {
+
+"use strict";
+__webpack_require__.r(__webpack_exports__);
+// extracted by mini-css-extract-plugin
+
+
+/***/ }),
+
+/***/ "./resources/assets/less/skins/skin-yellow.less":
+/*!******************************************************!*\
+  !*** ./resources/assets/less/skins/skin-yellow.less ***!
+  \******************************************************/
+/***/ ((__unused_webpack_module, __webpack_exports__, __webpack_require__) => {
+
+"use strict";
+__webpack_require__.r(__webpack_exports__);
+// extracted by mini-css-extract-plugin
+
+
 /***/ })
 
 /******/ 	});
@@ -32391,24 +33276,25 @@ __webpack_require__.r(__webpack_exports__);
 /******/ 		// [resolve, reject, Promise] = chunk loading, 0 = chunk loaded
 /******/ 		var installedChunks = {
 /******/ 			"/js/build/app": 0,
-/******/ 			"css/dist/skins/skin-red": 0,
-/******/ 			"css/dist/skins/skin-blue": 0,
+/******/ 			"css/dist/skins/skin-black-dark": 0,
+/******/ 			"css/dist/skins/_all-skins": 0,
 /******/ 			"css/build/overrides": 0,
 /******/ 			"css/build/app": 0,
 /******/ 			"css/build/AdminLTE": 0,
+/******/ 			"css/dist/skins/skin-yellow": 0,
+/******/ 			"css/dist/skins/skin-yellow-dark": 0,
+/******/ 			"css/dist/skins/skin-red": 0,
+/******/ 			"css/dist/skins/skin-red-dark": 0,
+/******/ 			"css/dist/skins/skin-purple": 0,
+/******/ 			"css/dist/skins/skin-purple-dark": 0,
 /******/ 			"css/dist/skins/skin-orange": 0,
 /******/ 			"css/dist/skins/skin-orange-dark": 0,
-/******/ 			"css/dist/skins/skin-blue-dark": 0,
-/******/ 			"css/dist/skins/skin-yellow-dark": 0,
-/******/ 			"css/dist/skins/skin-yellow": 0,
-/******/ 			"css/dist/skins/skin-purple-dark": 0,
-/******/ 			"css/dist/skins/skin-purple": 0,
-/******/ 			"css/dist/skins/skin-red-dark": 0,
-/******/ 			"css/dist/skins/skin-black-dark": 0,
-/******/ 			"css/dist/skins/skin-black": 0,
-/******/ 			"css/dist/skins/skin-green-dark": 0,
 /******/ 			"css/dist/skins/skin-green": 0,
-/******/ 			"css/dist/skins/skin-contrast": 0
+/******/ 			"css/dist/skins/skin-green-dark": 0,
+/******/ 			"css/dist/skins/skin-contrast": 0,
+/******/ 			"css/dist/skins/skin-blue": 0,
+/******/ 			"css/dist/skins/skin-blue-dark": 0,
+/******/ 			"css/dist/skins/skin-black": 0
 /******/ 		};
 /******/ 		
 /******/ 		// no chunk on demand loading
@@ -32458,26 +33344,28 @@ __webpack_require__.r(__webpack_exports__);
 /******/ 	// startup
 /******/ 	// Load entry module and return exports
 /******/ 	// This entry module depends on other loaded chunks and execution need to be delayed
-/******/ 	__webpack_require__.O(undefined, ["css/dist/skins/skin-red","css/dist/skins/skin-blue","css/build/overrides","css/build/app","css/build/AdminLTE","css/dist/skins/skin-orange","css/dist/skins/skin-orange-dark","css/dist/skins/skin-blue-dark","css/dist/skins/skin-yellow-dark","css/dist/skins/skin-yellow","css/dist/skins/skin-purple-dark","css/dist/skins/skin-purple","css/dist/skins/skin-red-dark","css/dist/skins/skin-black-dark","css/dist/skins/skin-black","css/dist/skins/skin-green-dark","css/dist/skins/skin-green","css/dist/skins/skin-contrast"], () => (__webpack_require__("./resources/assets/js/snipeit.js")))
-/******/ 	__webpack_require__.O(undefined, ["css/dist/skins/skin-red","css/dist/skins/skin-blue","css/build/overrides","css/build/app","css/build/AdminLTE","css/dist/skins/skin-orange","css/dist/skins/skin-orange-dark","css/dist/skins/skin-blue-dark","css/dist/skins/skin-yellow-dark","css/dist/skins/skin-yellow","css/dist/skins/skin-purple-dark","css/dist/skins/skin-purple","css/dist/skins/skin-red-dark","css/dist/skins/skin-black-dark","css/dist/skins/skin-black","css/dist/skins/skin-green-dark","css/dist/skins/skin-green","css/dist/skins/skin-contrast"], () => (__webpack_require__("./resources/assets/js/snipeit_modals.js")))
-/******/ 	__webpack_require__.O(undefined, ["css/dist/skins/skin-red","css/dist/skins/skin-blue","css/build/overrides","css/build/app","css/build/AdminLTE","css/dist/skins/skin-orange","css/dist/skins/skin-orange-dark","css/dist/skins/skin-blue-dark","css/dist/skins/skin-yellow-dark","css/dist/skins/skin-yellow","css/dist/skins/skin-purple-dark","css/dist/skins/skin-purple","css/dist/skins/skin-red-dark","css/dist/skins/skin-black-dark","css/dist/skins/skin-black","css/dist/skins/skin-green-dark","css/dist/skins/skin-green","css/dist/skins/skin-contrast"], () => (__webpack_require__("./node_modules/admin-lte/build/less/AdminLTE.less")))
-/******/ 	__webpack_require__.O(undefined, ["css/dist/skins/skin-red","css/dist/skins/skin-blue","css/build/overrides","css/build/app","css/build/AdminLTE","css/dist/skins/skin-orange","css/dist/skins/skin-orange-dark","css/dist/skins/skin-blue-dark","css/dist/skins/skin-yellow-dark","css/dist/skins/skin-yellow","css/dist/skins/skin-purple-dark","css/dist/skins/skin-purple","css/dist/skins/skin-red-dark","css/dist/skins/skin-black-dark","css/dist/skins/skin-black","css/dist/skins/skin-green-dark","css/dist/skins/skin-green","css/dist/skins/skin-contrast"], () => (__webpack_require__("./resources/assets/less/app.less")))
-/******/ 	__webpack_require__.O(undefined, ["css/dist/skins/skin-red","css/dist/skins/skin-blue","css/build/overrides","css/build/app","css/build/AdminLTE","css/dist/skins/skin-orange","css/dist/skins/skin-orange-dark","css/dist/skins/skin-blue-dark","css/dist/skins/skin-yellow-dark","css/dist/skins/skin-yellow","css/dist/skins/skin-purple-dark","css/dist/skins/skin-purple","css/dist/skins/skin-red-dark","css/dist/skins/skin-black-dark","css/dist/skins/skin-black","css/dist/skins/skin-green-dark","css/dist/skins/skin-green","css/dist/skins/skin-contrast"], () => (__webpack_require__("./resources/assets/less/overrides.less")))
-/******/ 	__webpack_require__.O(undefined, ["css/dist/skins/skin-red","css/dist/skins/skin-blue","css/build/overrides","css/build/app","css/build/AdminLTE","css/dist/skins/skin-orange","css/dist/skins/skin-orange-dark","css/dist/skins/skin-blue-dark","css/dist/skins/skin-yellow-dark","css/dist/skins/skin-yellow","css/dist/skins/skin-purple-dark","css/dist/skins/skin-purple","css/dist/skins/skin-red-dark","css/dist/skins/skin-black-dark","css/dist/skins/skin-black","css/dist/skins/skin-green-dark","css/dist/skins/skin-green","css/dist/skins/skin-contrast"], () => (__webpack_require__("./resources/assets/less/skins/skin-blue.less")))
-/******/ 	__webpack_require__.O(undefined, ["css/dist/skins/skin-red","css/dist/skins/skin-blue","css/build/overrides","css/build/app","css/build/AdminLTE","css/dist/skins/skin-orange","css/dist/skins/skin-orange-dark","css/dist/skins/skin-blue-dark","css/dist/skins/skin-yellow-dark","css/dist/skins/skin-yellow","css/dist/skins/skin-purple-dark","css/dist/skins/skin-purple","css/dist/skins/skin-red-dark","css/dist/skins/skin-black-dark","css/dist/skins/skin-black","css/dist/skins/skin-green-dark","css/dist/skins/skin-green","css/dist/skins/skin-contrast"], () => (__webpack_require__("./resources/assets/less/skins/skin-red.less")))
-/******/ 	__webpack_require__.O(undefined, ["css/dist/skins/skin-red","css/dist/skins/skin-blue","css/build/overrides","css/build/app","css/build/AdminLTE","css/dist/skins/skin-orange","css/dist/skins/skin-orange-dark","css/dist/skins/skin-blue-dark","css/dist/skins/skin-yellow-dark","css/dist/skins/skin-yellow","css/dist/skins/skin-purple-dark","css/dist/skins/skin-purple","css/dist/skins/skin-red-dark","css/dist/skins/skin-black-dark","css/dist/skins/skin-black","css/dist/skins/skin-green-dark","css/dist/skins/skin-green","css/dist/skins/skin-contrast"], () => (__webpack_require__("./resources/assets/less/skins/skin-contrast.less")))
-/******/ 	__webpack_require__.O(undefined, ["css/dist/skins/skin-red","css/dist/skins/skin-blue","css/build/overrides","css/build/app","css/build/AdminLTE","css/dist/skins/skin-orange","css/dist/skins/skin-orange-dark","css/dist/skins/skin-blue-dark","css/dist/skins/skin-yellow-dark","css/dist/skins/skin-yellow","css/dist/skins/skin-purple-dark","css/dist/skins/skin-purple","css/dist/skins/skin-red-dark","css/dist/skins/skin-black-dark","css/dist/skins/skin-black","css/dist/skins/skin-green-dark","css/dist/skins/skin-green","css/dist/skins/skin-contrast"], () => (__webpack_require__("./resources/assets/less/skins/skin-green.less")))
-/******/ 	__webpack_require__.O(undefined, ["css/dist/skins/skin-red","css/dist/skins/skin-blue","css/build/overrides","css/build/app","css/build/AdminLTE","css/dist/skins/skin-orange","css/dist/skins/skin-orange-dark","css/dist/skins/skin-blue-dark","css/dist/skins/skin-yellow-dark","css/dist/skins/skin-yellow","css/dist/skins/skin-purple-dark","css/dist/skins/skin-purple","css/dist/skins/skin-red-dark","css/dist/skins/skin-black-dark","css/dist/skins/skin-black","css/dist/skins/skin-green-dark","css/dist/skins/skin-green","css/dist/skins/skin-contrast"], () => (__webpack_require__("./resources/assets/less/skins/skin-green-dark.less")))
-/******/ 	__webpack_require__.O(undefined, ["css/dist/skins/skin-red","css/dist/skins/skin-blue","css/build/overrides","css/build/app","css/build/AdminLTE","css/dist/skins/skin-orange","css/dist/skins/skin-orange-dark","css/dist/skins/skin-blue-dark","css/dist/skins/skin-yellow-dark","css/dist/skins/skin-yellow","css/dist/skins/skin-purple-dark","css/dist/skins/skin-purple","css/dist/skins/skin-red-dark","css/dist/skins/skin-black-dark","css/dist/skins/skin-black","css/dist/skins/skin-green-dark","css/dist/skins/skin-green","css/dist/skins/skin-contrast"], () => (__webpack_require__("./resources/assets/less/skins/skin-black.less")))
-/******/ 	__webpack_require__.O(undefined, ["css/dist/skins/skin-red","css/dist/skins/skin-blue","css/build/overrides","css/build/app","css/build/AdminLTE","css/dist/skins/skin-orange","css/dist/skins/skin-orange-dark","css/dist/skins/skin-blue-dark","css/dist/skins/skin-yellow-dark","css/dist/skins/skin-yellow","css/dist/skins/skin-purple-dark","css/dist/skins/skin-purple","css/dist/skins/skin-red-dark","css/dist/skins/skin-black-dark","css/dist/skins/skin-black","css/dist/skins/skin-green-dark","css/dist/skins/skin-green","css/dist/skins/skin-contrast"], () => (__webpack_require__("./resources/assets/less/skins/skin-black-dark.less")))
-/******/ 	__webpack_require__.O(undefined, ["css/dist/skins/skin-red","css/dist/skins/skin-blue","css/build/overrides","css/build/app","css/build/AdminLTE","css/dist/skins/skin-orange","css/dist/skins/skin-orange-dark","css/dist/skins/skin-blue-dark","css/dist/skins/skin-yellow-dark","css/dist/skins/skin-yellow","css/dist/skins/skin-purple-dark","css/dist/skins/skin-purple","css/dist/skins/skin-red-dark","css/dist/skins/skin-black-dark","css/dist/skins/skin-black","css/dist/skins/skin-green-dark","css/dist/skins/skin-green","css/dist/skins/skin-contrast"], () => (__webpack_require__("./resources/assets/less/skins/skin-red-dark.less")))
-/******/ 	__webpack_require__.O(undefined, ["css/dist/skins/skin-red","css/dist/skins/skin-blue","css/build/overrides","css/build/app","css/build/AdminLTE","css/dist/skins/skin-orange","css/dist/skins/skin-orange-dark","css/dist/skins/skin-blue-dark","css/dist/skins/skin-yellow-dark","css/dist/skins/skin-yellow","css/dist/skins/skin-purple-dark","css/dist/skins/skin-purple","css/dist/skins/skin-red-dark","css/dist/skins/skin-black-dark","css/dist/skins/skin-black","css/dist/skins/skin-green-dark","css/dist/skins/skin-green","css/dist/skins/skin-contrast"], () => (__webpack_require__("./resources/assets/less/skins/skin-purple.less")))
-/******/ 	__webpack_require__.O(undefined, ["css/dist/skins/skin-red","css/dist/skins/skin-blue","css/build/overrides","css/build/app","css/build/AdminLTE","css/dist/skins/skin-orange","css/dist/skins/skin-orange-dark","css/dist/skins/skin-blue-dark","css/dist/skins/skin-yellow-dark","css/dist/skins/skin-yellow","css/dist/skins/skin-purple-dark","css/dist/skins/skin-purple","css/dist/skins/skin-red-dark","css/dist/skins/skin-black-dark","css/dist/skins/skin-black","css/dist/skins/skin-green-dark","css/dist/skins/skin-green","css/dist/skins/skin-contrast"], () => (__webpack_require__("./resources/assets/less/skins/skin-purple-dark.less")))
-/******/ 	__webpack_require__.O(undefined, ["css/dist/skins/skin-red","css/dist/skins/skin-blue","css/build/overrides","css/build/app","css/build/AdminLTE","css/dist/skins/skin-orange","css/dist/skins/skin-orange-dark","css/dist/skins/skin-blue-dark","css/dist/skins/skin-yellow-dark","css/dist/skins/skin-yellow","css/dist/skins/skin-purple-dark","css/dist/skins/skin-purple","css/dist/skins/skin-red-dark","css/dist/skins/skin-black-dark","css/dist/skins/skin-black","css/dist/skins/skin-green-dark","css/dist/skins/skin-green","css/dist/skins/skin-contrast"], () => (__webpack_require__("./resources/assets/less/skins/skin-yellow.less")))
-/******/ 	__webpack_require__.O(undefined, ["css/dist/skins/skin-red","css/dist/skins/skin-blue","css/build/overrides","css/build/app","css/build/AdminLTE","css/dist/skins/skin-orange","css/dist/skins/skin-orange-dark","css/dist/skins/skin-blue-dark","css/dist/skins/skin-yellow-dark","css/dist/skins/skin-yellow","css/dist/skins/skin-purple-dark","css/dist/skins/skin-purple","css/dist/skins/skin-red-dark","css/dist/skins/skin-black-dark","css/dist/skins/skin-black","css/dist/skins/skin-green-dark","css/dist/skins/skin-green","css/dist/skins/skin-contrast"], () => (__webpack_require__("./resources/assets/less/skins/skin-yellow-dark.less")))
-/******/ 	__webpack_require__.O(undefined, ["css/dist/skins/skin-red","css/dist/skins/skin-blue","css/build/overrides","css/build/app","css/build/AdminLTE","css/dist/skins/skin-orange","css/dist/skins/skin-orange-dark","css/dist/skins/skin-blue-dark","css/dist/skins/skin-yellow-dark","css/dist/skins/skin-yellow","css/dist/skins/skin-purple-dark","css/dist/skins/skin-purple","css/dist/skins/skin-red-dark","css/dist/skins/skin-black-dark","css/dist/skins/skin-black","css/dist/skins/skin-green-dark","css/dist/skins/skin-green","css/dist/skins/skin-contrast"], () => (__webpack_require__("./resources/assets/less/skins/skin-blue-dark.less")))
-/******/ 	__webpack_require__.O(undefined, ["css/dist/skins/skin-red","css/dist/skins/skin-blue","css/build/overrides","css/build/app","css/build/AdminLTE","css/dist/skins/skin-orange","css/dist/skins/skin-orange-dark","css/dist/skins/skin-blue-dark","css/dist/skins/skin-yellow-dark","css/dist/skins/skin-yellow","css/dist/skins/skin-purple-dark","css/dist/skins/skin-purple","css/dist/skins/skin-red-dark","css/dist/skins/skin-black-dark","css/dist/skins/skin-black","css/dist/skins/skin-green-dark","css/dist/skins/skin-green","css/dist/skins/skin-contrast"], () => (__webpack_require__("./resources/assets/less/skins/skin-orange-dark.less")))
-/******/ 	var __webpack_exports__ = __webpack_require__.O(undefined, ["css/dist/skins/skin-red","css/dist/skins/skin-blue","css/build/overrides","css/build/app","css/build/AdminLTE","css/dist/skins/skin-orange","css/dist/skins/skin-orange-dark","css/dist/skins/skin-blue-dark","css/dist/skins/skin-yellow-dark","css/dist/skins/skin-yellow","css/dist/skins/skin-purple-dark","css/dist/skins/skin-purple","css/dist/skins/skin-red-dark","css/dist/skins/skin-black-dark","css/dist/skins/skin-black","css/dist/skins/skin-green-dark","css/dist/skins/skin-green","css/dist/skins/skin-contrast"], () => (__webpack_require__("./resources/assets/less/skins/skin-orange.less")))
+/******/ 	__webpack_require__.O(undefined, ["css/dist/skins/skin-black-dark","css/dist/skins/_all-skins","css/build/overrides","css/build/app","css/build/AdminLTE","css/dist/skins/skin-yellow","css/dist/skins/skin-yellow-dark","css/dist/skins/skin-red","css/dist/skins/skin-red-dark","css/dist/skins/skin-purple","css/dist/skins/skin-purple-dark","css/dist/skins/skin-orange","css/dist/skins/skin-orange-dark","css/dist/skins/skin-green","css/dist/skins/skin-green-dark","css/dist/skins/skin-contrast","css/dist/skins/skin-blue","css/dist/skins/skin-blue-dark","css/dist/skins/skin-black"], () => (__webpack_require__("./resources/assets/js/snipeit.js")))
+/******/ 	__webpack_require__.O(undefined, ["css/dist/skins/skin-black-dark","css/dist/skins/_all-skins","css/build/overrides","css/build/app","css/build/AdminLTE","css/dist/skins/skin-yellow","css/dist/skins/skin-yellow-dark","css/dist/skins/skin-red","css/dist/skins/skin-red-dark","css/dist/skins/skin-purple","css/dist/skins/skin-purple-dark","css/dist/skins/skin-orange","css/dist/skins/skin-orange-dark","css/dist/skins/skin-green","css/dist/skins/skin-green-dark","css/dist/skins/skin-contrast","css/dist/skins/skin-blue","css/dist/skins/skin-blue-dark","css/dist/skins/skin-black"], () => (__webpack_require__("./resources/assets/js/snipeit_modals.js")))
+/******/ 	__webpack_require__.O(undefined, ["css/dist/skins/skin-black-dark","css/dist/skins/_all-skins","css/build/overrides","css/build/app","css/build/AdminLTE","css/dist/skins/skin-yellow","css/dist/skins/skin-yellow-dark","css/dist/skins/skin-red","css/dist/skins/skin-red-dark","css/dist/skins/skin-purple","css/dist/skins/skin-purple-dark","css/dist/skins/skin-orange","css/dist/skins/skin-orange-dark","css/dist/skins/skin-green","css/dist/skins/skin-green-dark","css/dist/skins/skin-contrast","css/dist/skins/skin-blue","css/dist/skins/skin-blue-dark","css/dist/skins/skin-black"], () => (__webpack_require__("./node_modules/canvas-confetti/dist/confetti.browser.js")))
+/******/ 	__webpack_require__.O(undefined, ["css/dist/skins/skin-black-dark","css/dist/skins/_all-skins","css/build/overrides","css/build/app","css/build/AdminLTE","css/dist/skins/skin-yellow","css/dist/skins/skin-yellow-dark","css/dist/skins/skin-red","css/dist/skins/skin-red-dark","css/dist/skins/skin-purple","css/dist/skins/skin-purple-dark","css/dist/skins/skin-orange","css/dist/skins/skin-orange-dark","css/dist/skins/skin-green","css/dist/skins/skin-green-dark","css/dist/skins/skin-contrast","css/dist/skins/skin-blue","css/dist/skins/skin-blue-dark","css/dist/skins/skin-black"], () => (__webpack_require__("./node_modules/admin-lte/build/less/AdminLTE.less")))
+/******/ 	__webpack_require__.O(undefined, ["css/dist/skins/skin-black-dark","css/dist/skins/_all-skins","css/build/overrides","css/build/app","css/build/AdminLTE","css/dist/skins/skin-yellow","css/dist/skins/skin-yellow-dark","css/dist/skins/skin-red","css/dist/skins/skin-red-dark","css/dist/skins/skin-purple","css/dist/skins/skin-purple-dark","css/dist/skins/skin-orange","css/dist/skins/skin-orange-dark","css/dist/skins/skin-green","css/dist/skins/skin-green-dark","css/dist/skins/skin-contrast","css/dist/skins/skin-blue","css/dist/skins/skin-blue-dark","css/dist/skins/skin-black"], () => (__webpack_require__("./resources/assets/less/app.less")))
+/******/ 	__webpack_require__.O(undefined, ["css/dist/skins/skin-black-dark","css/dist/skins/_all-skins","css/build/overrides","css/build/app","css/build/AdminLTE","css/dist/skins/skin-yellow","css/dist/skins/skin-yellow-dark","css/dist/skins/skin-red","css/dist/skins/skin-red-dark","css/dist/skins/skin-purple","css/dist/skins/skin-purple-dark","css/dist/skins/skin-orange","css/dist/skins/skin-orange-dark","css/dist/skins/skin-green","css/dist/skins/skin-green-dark","css/dist/skins/skin-contrast","css/dist/skins/skin-blue","css/dist/skins/skin-blue-dark","css/dist/skins/skin-black"], () => (__webpack_require__("./resources/assets/less/overrides.less")))
+/******/ 	__webpack_require__.O(undefined, ["css/dist/skins/skin-black-dark","css/dist/skins/_all-skins","css/build/overrides","css/build/app","css/build/AdminLTE","css/dist/skins/skin-yellow","css/dist/skins/skin-yellow-dark","css/dist/skins/skin-red","css/dist/skins/skin-red-dark","css/dist/skins/skin-purple","css/dist/skins/skin-purple-dark","css/dist/skins/skin-orange","css/dist/skins/skin-orange-dark","css/dist/skins/skin-green","css/dist/skins/skin-green-dark","css/dist/skins/skin-contrast","css/dist/skins/skin-blue","css/dist/skins/skin-blue-dark","css/dist/skins/skin-black"], () => (__webpack_require__("./resources/assets/less/skins/_all-skins.less")))
+/******/ 	__webpack_require__.O(undefined, ["css/dist/skins/skin-black-dark","css/dist/skins/_all-skins","css/build/overrides","css/build/app","css/build/AdminLTE","css/dist/skins/skin-yellow","css/dist/skins/skin-yellow-dark","css/dist/skins/skin-red","css/dist/skins/skin-red-dark","css/dist/skins/skin-purple","css/dist/skins/skin-purple-dark","css/dist/skins/skin-orange","css/dist/skins/skin-orange-dark","css/dist/skins/skin-green","css/dist/skins/skin-green-dark","css/dist/skins/skin-contrast","css/dist/skins/skin-blue","css/dist/skins/skin-blue-dark","css/dist/skins/skin-black"], () => (__webpack_require__("./resources/assets/less/skins/skin-black-dark.less")))
+/******/ 	__webpack_require__.O(undefined, ["css/dist/skins/skin-black-dark","css/dist/skins/_all-skins","css/build/overrides","css/build/app","css/build/AdminLTE","css/dist/skins/skin-yellow","css/dist/skins/skin-yellow-dark","css/dist/skins/skin-red","css/dist/skins/skin-red-dark","css/dist/skins/skin-purple","css/dist/skins/skin-purple-dark","css/dist/skins/skin-orange","css/dist/skins/skin-orange-dark","css/dist/skins/skin-green","css/dist/skins/skin-green-dark","css/dist/skins/skin-contrast","css/dist/skins/skin-blue","css/dist/skins/skin-blue-dark","css/dist/skins/skin-black"], () => (__webpack_require__("./resources/assets/less/skins/skin-black.less")))
+/******/ 	__webpack_require__.O(undefined, ["css/dist/skins/skin-black-dark","css/dist/skins/_all-skins","css/build/overrides","css/build/app","css/build/AdminLTE","css/dist/skins/skin-yellow","css/dist/skins/skin-yellow-dark","css/dist/skins/skin-red","css/dist/skins/skin-red-dark","css/dist/skins/skin-purple","css/dist/skins/skin-purple-dark","css/dist/skins/skin-orange","css/dist/skins/skin-orange-dark","css/dist/skins/skin-green","css/dist/skins/skin-green-dark","css/dist/skins/skin-contrast","css/dist/skins/skin-blue","css/dist/skins/skin-blue-dark","css/dist/skins/skin-black"], () => (__webpack_require__("./resources/assets/less/skins/skin-blue-dark.less")))
+/******/ 	__webpack_require__.O(undefined, ["css/dist/skins/skin-black-dark","css/dist/skins/_all-skins","css/build/overrides","css/build/app","css/build/AdminLTE","css/dist/skins/skin-yellow","css/dist/skins/skin-yellow-dark","css/dist/skins/skin-red","css/dist/skins/skin-red-dark","css/dist/skins/skin-purple","css/dist/skins/skin-purple-dark","css/dist/skins/skin-orange","css/dist/skins/skin-orange-dark","css/dist/skins/skin-green","css/dist/skins/skin-green-dark","css/dist/skins/skin-contrast","css/dist/skins/skin-blue","css/dist/skins/skin-blue-dark","css/dist/skins/skin-black"], () => (__webpack_require__("./resources/assets/less/skins/skin-blue.less")))
+/******/ 	__webpack_require__.O(undefined, ["css/dist/skins/skin-black-dark","css/dist/skins/_all-skins","css/build/overrides","css/build/app","css/build/AdminLTE","css/dist/skins/skin-yellow","css/dist/skins/skin-yellow-dark","css/dist/skins/skin-red","css/dist/skins/skin-red-dark","css/dist/skins/skin-purple","css/dist/skins/skin-purple-dark","css/dist/skins/skin-orange","css/dist/skins/skin-orange-dark","css/dist/skins/skin-green","css/dist/skins/skin-green-dark","css/dist/skins/skin-contrast","css/dist/skins/skin-blue","css/dist/skins/skin-blue-dark","css/dist/skins/skin-black"], () => (__webpack_require__("./resources/assets/less/skins/skin-contrast.less")))
+/******/ 	__webpack_require__.O(undefined, ["css/dist/skins/skin-black-dark","css/dist/skins/_all-skins","css/build/overrides","css/build/app","css/build/AdminLTE","css/dist/skins/skin-yellow","css/dist/skins/skin-yellow-dark","css/dist/skins/skin-red","css/dist/skins/skin-red-dark","css/dist/skins/skin-purple","css/dist/skins/skin-purple-dark","css/dist/skins/skin-orange","css/dist/skins/skin-orange-dark","css/dist/skins/skin-green","css/dist/skins/skin-green-dark","css/dist/skins/skin-contrast","css/dist/skins/skin-blue","css/dist/skins/skin-blue-dark","css/dist/skins/skin-black"], () => (__webpack_require__("./resources/assets/less/skins/skin-green-dark.less")))
+/******/ 	__webpack_require__.O(undefined, ["css/dist/skins/skin-black-dark","css/dist/skins/_all-skins","css/build/overrides","css/build/app","css/build/AdminLTE","css/dist/skins/skin-yellow","css/dist/skins/skin-yellow-dark","css/dist/skins/skin-red","css/dist/skins/skin-red-dark","css/dist/skins/skin-purple","css/dist/skins/skin-purple-dark","css/dist/skins/skin-orange","css/dist/skins/skin-orange-dark","css/dist/skins/skin-green","css/dist/skins/skin-green-dark","css/dist/skins/skin-contrast","css/dist/skins/skin-blue","css/dist/skins/skin-blue-dark","css/dist/skins/skin-black"], () => (__webpack_require__("./resources/assets/less/skins/skin-green.less")))
+/******/ 	__webpack_require__.O(undefined, ["css/dist/skins/skin-black-dark","css/dist/skins/_all-skins","css/build/overrides","css/build/app","css/build/AdminLTE","css/dist/skins/skin-yellow","css/dist/skins/skin-yellow-dark","css/dist/skins/skin-red","css/dist/skins/skin-red-dark","css/dist/skins/skin-purple","css/dist/skins/skin-purple-dark","css/dist/skins/skin-orange","css/dist/skins/skin-orange-dark","css/dist/skins/skin-green","css/dist/skins/skin-green-dark","css/dist/skins/skin-contrast","css/dist/skins/skin-blue","css/dist/skins/skin-blue-dark","css/dist/skins/skin-black"], () => (__webpack_require__("./resources/assets/less/skins/skin-orange-dark.less")))
+/******/ 	__webpack_require__.O(undefined, ["css/dist/skins/skin-black-dark","css/dist/skins/_all-skins","css/build/overrides","css/build/app","css/build/AdminLTE","css/dist/skins/skin-yellow","css/dist/skins/skin-yellow-dark","css/dist/skins/skin-red","css/dist/skins/skin-red-dark","css/dist/skins/skin-purple","css/dist/skins/skin-purple-dark","css/dist/skins/skin-orange","css/dist/skins/skin-orange-dark","css/dist/skins/skin-green","css/dist/skins/skin-green-dark","css/dist/skins/skin-contrast","css/dist/skins/skin-blue","css/dist/skins/skin-blue-dark","css/dist/skins/skin-black"], () => (__webpack_require__("./resources/assets/less/skins/skin-orange.less")))
+/******/ 	__webpack_require__.O(undefined, ["css/dist/skins/skin-black-dark","css/dist/skins/_all-skins","css/build/overrides","css/build/app","css/build/AdminLTE","css/dist/skins/skin-yellow","css/dist/skins/skin-yellow-dark","css/dist/skins/skin-red","css/dist/skins/skin-red-dark","css/dist/skins/skin-purple","css/dist/skins/skin-purple-dark","css/dist/skins/skin-orange","css/dist/skins/skin-orange-dark","css/dist/skins/skin-green","css/dist/skins/skin-green-dark","css/dist/skins/skin-contrast","css/dist/skins/skin-blue","css/dist/skins/skin-blue-dark","css/dist/skins/skin-black"], () => (__webpack_require__("./resources/assets/less/skins/skin-purple-dark.less")))
+/******/ 	__webpack_require__.O(undefined, ["css/dist/skins/skin-black-dark","css/dist/skins/_all-skins","css/build/overrides","css/build/app","css/build/AdminLTE","css/dist/skins/skin-yellow","css/dist/skins/skin-yellow-dark","css/dist/skins/skin-red","css/dist/skins/skin-red-dark","css/dist/skins/skin-purple","css/dist/skins/skin-purple-dark","css/dist/skins/skin-orange","css/dist/skins/skin-orange-dark","css/dist/skins/skin-green","css/dist/skins/skin-green-dark","css/dist/skins/skin-contrast","css/dist/skins/skin-blue","css/dist/skins/skin-blue-dark","css/dist/skins/skin-black"], () => (__webpack_require__("./resources/assets/less/skins/skin-purple.less")))
+/******/ 	__webpack_require__.O(undefined, ["css/dist/skins/skin-black-dark","css/dist/skins/_all-skins","css/build/overrides","css/build/app","css/build/AdminLTE","css/dist/skins/skin-yellow","css/dist/skins/skin-yellow-dark","css/dist/skins/skin-red","css/dist/skins/skin-red-dark","css/dist/skins/skin-purple","css/dist/skins/skin-purple-dark","css/dist/skins/skin-orange","css/dist/skins/skin-orange-dark","css/dist/skins/skin-green","css/dist/skins/skin-green-dark","css/dist/skins/skin-contrast","css/dist/skins/skin-blue","css/dist/skins/skin-blue-dark","css/dist/skins/skin-black"], () => (__webpack_require__("./resources/assets/less/skins/skin-red-dark.less")))
+/******/ 	__webpack_require__.O(undefined, ["css/dist/skins/skin-black-dark","css/dist/skins/_all-skins","css/build/overrides","css/build/app","css/build/AdminLTE","css/dist/skins/skin-yellow","css/dist/skins/skin-yellow-dark","css/dist/skins/skin-red","css/dist/skins/skin-red-dark","css/dist/skins/skin-purple","css/dist/skins/skin-purple-dark","css/dist/skins/skin-orange","css/dist/skins/skin-orange-dark","css/dist/skins/skin-green","css/dist/skins/skin-green-dark","css/dist/skins/skin-contrast","css/dist/skins/skin-blue","css/dist/skins/skin-blue-dark","css/dist/skins/skin-black"], () => (__webpack_require__("./resources/assets/less/skins/skin-red.less")))
+/******/ 	__webpack_require__.O(undefined, ["css/dist/skins/skin-black-dark","css/dist/skins/_all-skins","css/build/overrides","css/build/app","css/build/AdminLTE","css/dist/skins/skin-yellow","css/dist/skins/skin-yellow-dark","css/dist/skins/skin-red","css/dist/skins/skin-red-dark","css/dist/skins/skin-purple","css/dist/skins/skin-purple-dark","css/dist/skins/skin-orange","css/dist/skins/skin-orange-dark","css/dist/skins/skin-green","css/dist/skins/skin-green-dark","css/dist/skins/skin-contrast","css/dist/skins/skin-blue","css/dist/skins/skin-blue-dark","css/dist/skins/skin-black"], () => (__webpack_require__("./resources/assets/less/skins/skin-yellow-dark.less")))
+/******/ 	var __webpack_exports__ = __webpack_require__.O(undefined, ["css/dist/skins/skin-black-dark","css/dist/skins/_all-skins","css/build/overrides","css/build/app","css/build/AdminLTE","css/dist/skins/skin-yellow","css/dist/skins/skin-yellow-dark","css/dist/skins/skin-red","css/dist/skins/skin-red-dark","css/dist/skins/skin-purple","css/dist/skins/skin-purple-dark","css/dist/skins/skin-orange","css/dist/skins/skin-orange-dark","css/dist/skins/skin-green","css/dist/skins/skin-green-dark","css/dist/skins/skin-contrast","css/dist/skins/skin-blue","css/dist/skins/skin-blue-dark","css/dist/skins/skin-black"], () => (__webpack_require__("./resources/assets/less/skins/skin-yellow.less")))
 /******/ 	__webpack_exports__ = __webpack_require__.O(__webpack_exports__);
 /******/ 	
 /******/ })()
diff --git a/public/js/build/app.js.LICENSE.txt b/public/js/build/app.js.LICENSE.txt
index cb3342c839..5b8cf0d08b 100644
--- a/public/js/build/app.js.LICENSE.txt
+++ b/public/js/build/app.js.LICENSE.txt
@@ -30,7 +30,7 @@
  */
 
 /*!
- * jQuery UI Widget 1.13.3
+ * jQuery UI Widget 1.14.1
  * https://jqueryui.com
  *
  * Copyright OpenJS Foundation and other contributors
diff --git a/public/js/build/vendor.js b/public/js/build/vendor.js
index 03b90c5529..102490976b 100644
--- a/public/js/build/vendor.js
+++ b/public/js/build/vendor.js
@@ -12707,14 +12707,14 @@ return Tether;
 
 }));
 
-/*! jQuery UI - v1.13.3 - 2024-04-26
+/*! jQuery UI - v1.14.1 - 2024-10-30
 * https://jqueryui.com
 * Includes: widget.js, position.js, data.js, disable-selection.js, effect.js, effects/effect-blind.js, effects/effect-bounce.js, effects/effect-clip.js, effects/effect-drop.js, effects/effect-explode.js, effects/effect-fade.js, effects/effect-fold.js, effects/effect-highlight.js, effects/effect-puff.js, effects/effect-pulsate.js, effects/effect-scale.js, effects/effect-shake.js, effects/effect-size.js, effects/effect-slide.js, effects/effect-transfer.js, focusable.js, form-reset-mixin.js, jquery-patch.js, keycode.js, labels.js, scroll-parent.js, tabbable.js, unique-id.js, widgets/accordion.js, widgets/autocomplete.js, widgets/button.js, widgets/checkboxradio.js, widgets/controlgroup.js, widgets/datepicker.js, widgets/dialog.js, widgets/draggable.js, widgets/droppable.js, widgets/menu.js, widgets/mouse.js, widgets/progressbar.js, widgets/resizable.js, widgets/selectable.js, widgets/selectmenu.js, widgets/slider.js, widgets/sortable.js, widgets/spinner.js, widgets/tabs.js, widgets/tooltip.js
 * Copyright OpenJS Foundation and other contributors; Licensed MIT */
 
 ( function( factory ) {
 	"use strict";
-	
+
 	if ( typeof define === "function" && define.amd ) {
 
 		// AMD. Register as an anonymous module.
@@ -12729,11 +12729,11 @@ return Tether;
 
 $.ui = $.ui || {};
 
-var version = $.ui.version = "1.13.3";
+var version = $.ui.version = "1.14.1";
 
 
 /*!
- * jQuery UI Widget 1.13.3
+ * jQuery UI Widget 1.14.1
  * https://jqueryui.com
  *
  * Copyright OpenJS Foundation and other contributors
@@ -12776,6 +12776,9 @@ $.widget = function( name, base, prototype ) {
 
 	var namespace = name.split( "." )[ 0 ];
 	name = name.split( "." )[ 1 ];
+	if ( name === "__proto__" || name === "constructor" ) {
+		return $.error( "Invalid widget name: " + name );
+	}
 	var fullName = namespace + "-" + name;
 
 	if ( !prototype ) {
@@ -13475,7 +13478,7 @@ var widget = $.widget;
 
 
 /*!
- * jQuery UI Position 1.13.3
+ * jQuery UI Position 1.14.1
  * https://jqueryui.com
  *
  * Copyright OpenJS Foundation and other contributors
@@ -13972,7 +13975,7 @@ var position = $.ui.position;
 
 
 /*!
- * jQuery UI :data 1.13.3
+ * jQuery UI :data 1.14.1
  * https://jqueryui.com
  *
  * Copyright OpenJS Foundation and other contributors
@@ -13987,21 +13990,15 @@ var position = $.ui.position;
 
 
 var data = $.extend( $.expr.pseudos, {
-	data: $.expr.createPseudo ?
-		$.expr.createPseudo( function( dataName ) {
-			return function( elem ) {
-				return !!$.data( elem, dataName );
-			};
-		} ) :
-
-		// Support: jQuery <1.8
-		function( elem, i, match ) {
-			return !!$.data( elem, match[ 3 ] );
-		}
+	data: $.expr.createPseudo( function( dataName ) {
+		return function( elem ) {
+			return !!$.data( elem, dataName );
+		};
+	} )
 } );
 
 /*!
- * jQuery UI Disable Selection 1.13.3
+ * jQuery UI Disable Selection 1.14.1
  * https://jqueryui.com
  *
  * Copyright OpenJS Foundation and other contributors
@@ -14044,18 +14041,17 @@ var jQuery = $;
 
 
 /*!
- * jQuery Color Animations v2.2.0
+ * jQuery Color Animations v3.0.0
  * https://github.com/jquery/jquery-color
  *
  * Copyright OpenJS Foundation and other contributors
  * Released under the MIT license.
  * https://jquery.org/license
  *
- * Date: Sun May 10 09:02:36 2020 +0200
+ * Date: Wed May 15 16:49:44 2024 +0200
  */
 
 
-
 	var stepHooks = "backgroundColor borderBottomColor borderLeftColor borderRightColor " +
 		"borderTopColor color columnRuleColor outlineColor textDecorationColor textEmphasisColor",
 
@@ -14180,10 +14176,6 @@ var jQuery = $;
 			floor: true
 		}
 	},
-	support = color.support = {},
-
-	// element for support tests
-	supportElem = jQuery( "<p>" )[ 0 ],
 
 	// colors = jQuery.Color.names
 	colors,
@@ -14191,10 +14183,6 @@ var jQuery = $;
 	// local aliases of functions called often
 	each = jQuery.each;
 
-// determine rgba support immediately
-supportElem.style.cssText = "background-color:rgba(1,1,1,.5)";
-support.rgba = supportElem.style.backgroundColor.indexOf( "rgba" ) > -1;
-
 // define cache name and alpha properties
 // for rgba and hsla spaces
 each( spaces, function( spaceName, space ) {
@@ -14232,12 +14220,6 @@ function clamp( value, prop, allowEmpty ) {
 	// ~~ is an short way of doing floor for positive numbers
 	value = type.floor ? ~~value : parseFloat( value );
 
-	// IE will pass in empty strings as value for alpha,
-	// which will hit this case
-	if ( isNaN( value ) ) {
-		return prop.def;
-	}
-
 	if ( type.mod ) {
 
 		// we add mod before modding to make sure that negatives values
@@ -14350,7 +14332,10 @@ color.fn = jQuery.extend( color.prototype, {
 					} );
 
 					// everything defined but alpha?
-					if ( inst[ cache ] && jQuery.inArray( null, inst[ cache ].slice( 0, 3 ) ) < 0 ) {
+					if ( inst[ cache ] && jQuery.inArray(
+						null,
+						inst[ cache ].slice( 0, 3 )
+					) < 0 ) {
 
 						// use the default of 1
 						if ( inst[ cache ][ 3 ] == null ) {
@@ -14462,7 +14447,7 @@ color.fn = jQuery.extend( color.prototype, {
 			prefix = "rgb(";
 		}
 
-		return prefix + rgba.join() + ")";
+		return prefix + rgba.join( ", " ) + ")";
 	},
 	toHslaString: function() {
 		var prefix = "hsla(",
@@ -14482,7 +14467,7 @@ color.fn = jQuery.extend( color.prototype, {
 			hsla.pop();
 			prefix = "hsl(";
 		}
-		return prefix + hsla.join() + ")";
+		return prefix + hsla.join( ", " ) + ")";
 	},
 	toHexString: function( includeAlpha ) {
 		var rgba = this._rgba.slice(),
@@ -14495,12 +14480,11 @@ color.fn = jQuery.extend( color.prototype, {
 		return "#" + jQuery.map( rgba, function( v ) {
 
 			// default to 0 when nulls exist
-			v = ( v || 0 ).toString( 16 );
-			return v.length === 1 ? "0" + v : v;
+			return ( "0" + ( v || 0 ).toString( 16 ) ).substr( -2 );
 		} ).join( "" );
 	},
 	toString: function() {
-		return this._rgba[ 3 ] === 0 ? "transparent" : this.toRgbaString();
+		return this.toRgbaString();
 	}
 } );
 color.fn.parse.prototype = color.fn;
@@ -14667,37 +14651,15 @@ color.hook = function( hook ) {
 	each( hooks, function( _i, hook ) {
 		jQuery.cssHooks[ hook ] = {
 			set: function( elem, value ) {
-				var parsed, curElem,
-					backgroundColor = "";
+				var parsed;
 
-				if ( value !== "transparent" && ( getType( value ) !== "string" || ( parsed = stringParse( value ) ) ) ) {
+				if ( value !== "transparent" &&
+					( getType( value ) !== "string" ||
+						( parsed = stringParse( value ) ) ) ) {
 					value = color( parsed || value );
-					if ( !support.rgba && value._rgba[ 3 ] !== 1 ) {
-						curElem = hook === "backgroundColor" ? elem.parentNode : elem;
-						while (
-							( backgroundColor === "" || backgroundColor === "transparent" ) &&
-							curElem && curElem.style
-						) {
-							try {
-								backgroundColor = jQuery.css( curElem, "backgroundColor" );
-								curElem = curElem.parentNode;
-							} catch ( e ) {
-							}
-						}
-
-						value = value.blend( backgroundColor && backgroundColor !== "transparent" ?
-							backgroundColor :
-							"_default" );
-					}
-
 					value = value.toRgbaString();
 				}
-				try {
-					elem.style[ hook ] = value;
-				} catch ( e ) {
-
-					// wrapped to prevent IE from throwing errors on "invalid" values like 'auto' or 'inherit'
-				}
+				elem.style[ hook ] = value;
 			}
 		};
 		jQuery.fx.step[ hook ] = function( fx ) {
@@ -14756,7 +14718,7 @@ colors = jQuery.Color.names = {
 
 
 /*!
- * jQuery UI Effects 1.13.3
+ * jQuery UI Effects 1.14.1
  * https://jqueryui.com
  *
  * Copyright OpenJS Foundation and other contributors
@@ -14819,26 +14781,14 @@ function camelCase( string ) {
 
 function getElementStyles( elem ) {
 	var key, len,
-		style = elem.ownerDocument.defaultView ?
-			elem.ownerDocument.defaultView.getComputedStyle( elem, null ) :
-			elem.currentStyle,
+		style = elem.ownerDocument.defaultView.getComputedStyle( elem ),
 		styles = {};
 
-	if ( style && style.length && style[ 0 ] && style[ style[ 0 ] ] ) {
-		len = style.length;
-		while ( len-- ) {
-			key = style[ len ];
-			if ( typeof style[ key ] === "string" ) {
-				styles[ camelCase( key ) ] = style[ key ];
-			}
-		}
-
-	// Support: Opera, IE <9
-	} else {
-		for ( key in style ) {
-			if ( typeof style[ key ] === "string" ) {
-				styles[ key ] = style[ key ];
-			}
+	len = style.length;
+	while ( len-- ) {
+		key = style[ len ];
+		if ( typeof style[ key ] === "string" ) {
+			styles[ camelCase( key ) ] = style[ key ];
 		}
 	}
 
@@ -14863,15 +14813,6 @@ function styleDifference( oldStyle, newStyle ) {
 	return diff;
 }
 
-// Support: jQuery <1.8
-if ( !$.fn.addBack ) {
-	$.fn.addBack = function( selector ) {
-		return this.add( selector == null ?
-			this.prevObject : this.prevObject.filter( selector )
-		);
-	};
-}
-
 $.effects.animateClass = function( value, duration, easing, callback ) {
 	var o = $.speed( duration, easing, callback );
 
@@ -15011,7 +14952,7 @@ if ( $.expr && $.expr.pseudos && $.expr.pseudos.animated ) {
 	} )( $.expr.pseudos.animated );
 }
 
-if ( $.uiBackCompat !== false ) {
+if ( $.uiBackCompat === true ) {
 	$.extend( $.effects, {
 
 		// Saves a set of properties in a data storage
@@ -15140,7 +15081,7 @@ if ( $.uiBackCompat !== false ) {
 }
 
 $.extend( $.effects, {
-	version: "1.13.3",
+	version: "1.14.1",
 
 	define: function( name, mode, effect ) {
 		if ( !effect ) {
@@ -15497,7 +15438,7 @@ $.fn.extend( {
 			// as toggle can be either show or hide depending on element state
 			args.mode = modes.shift();
 
-			if ( $.uiBackCompat !== false && !defaultMode ) {
+			if ( $.uiBackCompat === true && !defaultMode ) {
 				if ( elem.is( ":hidden" ) ? mode === "hide" : mode === "show" ) {
 
 					// Call the core method to track "olddisplay" properly
@@ -15708,7 +15649,7 @@ var effect = $.effects;
 
 
 /*!
- * jQuery UI Effects Blind 1.13.3
+ * jQuery UI Effects Blind 1.14.1
  * https://jqueryui.com
  *
  * Copyright OpenJS Foundation and other contributors
@@ -15763,7 +15704,7 @@ var effectsEffectBlind = $.effects.define( "blind", "hide", function( options, d
 
 
 /*!
- * jQuery UI Effects Bounce 1.13.3
+ * jQuery UI Effects Bounce 1.14.1
  * https://jqueryui.com
  *
  * Copyright OpenJS Foundation and other contributors
@@ -15858,7 +15799,7 @@ var effectsEffectBounce = $.effects.define( "bounce", function( options, done )
 
 
 /*!
- * jQuery UI Effects Clip 1.13.3
+ * jQuery UI Effects Clip 1.14.1
  * https://jqueryui.com
  *
  * Copyright OpenJS Foundation and other contributors
@@ -15908,7 +15849,7 @@ var effectsEffectClip = $.effects.define( "clip", "hide", function( options, don
 
 
 /*!
- * jQuery UI Effects Drop 1.13.3
+ * jQuery UI Effects Drop 1.14.1
  * https://jqueryui.com
  *
  * Copyright OpenJS Foundation and other contributors
@@ -15962,7 +15903,7 @@ var effectsEffectDrop = $.effects.define( "drop", "hide", function( options, don
 
 
 /*!
- * jQuery UI Effects Explode 1.13.3
+ * jQuery UI Effects Explode 1.14.1
  * https://jqueryui.com
  *
  * Copyright OpenJS Foundation and other contributors
@@ -16058,7 +15999,7 @@ var effectsEffectExplode = $.effects.define( "explode", "hide", function( option
 
 
 /*!
- * jQuery UI Effects Fade 1.13.3
+ * jQuery UI Effects Fade 1.14.1
  * https://jqueryui.com
  *
  * Copyright OpenJS Foundation and other contributors
@@ -16090,7 +16031,7 @@ var effectsEffectFade = $.effects.define( "fade", "toggle", function( options, d
 
 
 /*!
- * jQuery UI Effects Fold 1.13.3
+ * jQuery UI Effects Fold 1.14.1
  * https://jqueryui.com
  *
  * Copyright OpenJS Foundation and other contributors
@@ -16164,7 +16105,7 @@ var effectsEffectFold = $.effects.define( "fold", "hide", function( options, don
 
 
 /*!
- * jQuery UI Effects Highlight 1.13.3
+ * jQuery UI Effects Highlight 1.14.1
  * https://jqueryui.com
  *
  * Copyright OpenJS Foundation and other contributors
@@ -16206,7 +16147,7 @@ var effectsEffectHighlight = $.effects.define( "highlight", "show", function( op
 
 
 /*!
- * jQuery UI Effects Size 1.13.3
+ * jQuery UI Effects Size 1.14.1
  * https://jqueryui.com
  *
  * Copyright OpenJS Foundation and other contributors
@@ -16384,7 +16325,7 @@ var effectsEffectSize = $.effects.define( "size", function( options, done ) {
 
 
 /*!
- * jQuery UI Effects Scale 1.13.3
+ * jQuery UI Effects Scale 1.14.1
  * https://jqueryui.com
  *
  * Copyright OpenJS Foundation and other contributors
@@ -16424,7 +16365,7 @@ var effectsEffectScale = $.effects.define( "scale", function( options, done ) {
 
 
 /*!
- * jQuery UI Effects Puff 1.13.3
+ * jQuery UI Effects Puff 1.14.1
  * https://jqueryui.com
  *
  * Copyright OpenJS Foundation and other contributors
@@ -16450,7 +16391,7 @@ var effectsEffectPuff = $.effects.define( "puff", "hide", function( options, don
 
 
 /*!
- * jQuery UI Effects Pulsate 1.13.3
+ * jQuery UI Effects Pulsate 1.14.1
  * https://jqueryui.com
  *
  * Copyright OpenJS Foundation and other contributors
@@ -16499,7 +16440,7 @@ var effectsEffectPulsate = $.effects.define( "pulsate", "show", function( option
 
 
 /*!
- * jQuery UI Effects Shake 1.13.3
+ * jQuery UI Effects Shake 1.14.1
  * https://jqueryui.com
  *
  * Copyright OpenJS Foundation and other contributors
@@ -16558,7 +16499,7 @@ var effectsEffectShake = $.effects.define( "shake", function( options, done ) {
 
 
 /*!
- * jQuery UI Effects Slide 1.13.3
+ * jQuery UI Effects Slide 1.14.1
  * https://jqueryui.com
  *
  * Copyright OpenJS Foundation and other contributors
@@ -16619,7 +16560,7 @@ var effectsEffectSlide = $.effects.define( "slide", "show", function( options, d
 
 
 /*!
- * jQuery UI Effects Transfer 1.13.3
+ * jQuery UI Effects Transfer 1.14.1
  * https://jqueryui.com
  *
  * Copyright OpenJS Foundation and other contributors
@@ -16635,7 +16576,7 @@ var effectsEffectSlide = $.effects.define( "slide", "show", function( options, d
 
 
 var effect;
-if ( $.uiBackCompat !== false ) {
+if ( $.uiBackCompat === true ) {
 	effect = $.effects.define( "transfer", function( options, done ) {
 		$( this ).transfer( options, done );
 	} );
@@ -16644,7 +16585,7 @@ var effectsEffectTransfer = effect;
 
 
 /*!
- * jQuery UI Focusable 1.13.3
+ * jQuery UI Focusable 1.14.1
  * https://jqueryui.com
  *
  * Copyright OpenJS Foundation and other contributors
@@ -16693,20 +16634,10 @@ $.ui.focusable = function( element, hasTabindex ) {
 		focusableIfVisible = hasTabindex;
 	}
 
-	return focusableIfVisible && $( element ).is( ":visible" ) && visible( $( element ) );
+	return focusableIfVisible && $( element ).is( ":visible" ) &&
+		$( element ).css( "visibility" ) === "visible";
 };
 
-// Support: IE 8 only
-// IE 8 doesn't resolve inherit to visible/hidden for computed values
-function visible( element ) {
-	var visibility = element.css( "visibility" );
-	while ( visibility === "inherit" ) {
-		element = element.parent();
-		visibility = element.css( "visibility" );
-	}
-	return visibility === "visible";
-}
-
 $.extend( $.expr.pseudos, {
 	focusable: function( element ) {
 		return $.ui.focusable( element, $.attr( element, "tabindex" ) != null );
@@ -16716,17 +16647,8 @@ $.extend( $.expr.pseudos, {
 var focusable = $.ui.focusable;
 
 
-
-// Support: IE8 Only
-// IE8 does not support the form attribute and when it is supplied. It overwrites the form prop
-// with a string, so we need to find the proper form.
-var form = $.fn._form = function() {
-	return typeof this[ 0 ].form === "string" ? this.closest( "form" ) : $( this[ 0 ].form );
-};
-
-
 /*!
- * jQuery UI Form Reset Mixin 1.13.3
+ * jQuery UI Form Reset Mixin 1.14.1
  * https://jqueryui.com
  *
  * Copyright OpenJS Foundation and other contributors
@@ -16754,7 +16676,7 @@ var formResetMixin = $.ui.formResetMixin = {
 	},
 
 	_bindFormResetHandler: function() {
-		this.form = this.element._form();
+		this.form = $( this.element.prop( "form" ) );
 		if ( !this.form.length ) {
 			return;
 		}
@@ -16788,7 +16710,7 @@ var formResetMixin = $.ui.formResetMixin = {
 
 
 /*!
- * jQuery UI Support for jQuery core 1.8.x and newer 1.13.3
+ * jQuery UI Legacy jQuery Core patches 1.14.1
  * https://jqueryui.com
  *
  * Copyright OpenJS Foundation and other contributors
@@ -16797,50 +16719,17 @@ var formResetMixin = $.ui.formResetMixin = {
  *
  */
 
-//>>label: jQuery 1.8+ Support
+//>>label: Legacy jQuery Core patches
 //>>group: Core
-//>>description: Support version 1.8.x and newer of jQuery core
+//>>description: Backport `.even()`, `.odd()` and `$.escapeSelector` to older jQuery Core versions (deprecated)
 
 
-// Support: jQuery 1.9.x or older
-// $.expr[ ":" ] is deprecated.
-if ( !$.expr.pseudos ) {
-	$.expr.pseudos = $.expr[ ":" ];
-}
-
-// Support: jQuery 1.11.x or older
-// $.unique has been renamed to $.uniqueSort
-if ( !$.uniqueSort ) {
-	$.uniqueSort = $.unique;
-}
-
 // Support: jQuery 2.2.x or older.
 // This method has been defined in jQuery 3.0.0.
 // Code from https://github.com/jquery/jquery/blob/e539bac79e666bba95bba86d690b4e609dca2286/src/selector/escapeSelector.js
 if ( !$.escapeSelector ) {
-
-	// CSS string/identifier serialization
-	// https://drafts.csswg.org/cssom/#common-serializing-idioms
-	var rcssescape = /([\0-\x1f\x7f]|^-?\d)|^-$|[^\x80-\uFFFF\w-]/g;
-
-	var fcssescape = function( ch, asCodePoint ) {
-		if ( asCodePoint ) {
-
-			// U+0000 NULL becomes U+FFFD REPLACEMENT CHARACTER
-			if ( ch === "\0" ) {
-				return "\uFFFD";
-			}
-
-			// Control characters and (dependent upon position) numbers get escaped as code points
-			return ch.slice( 0, -1 ) + "\\" + ch.charCodeAt( ch.length - 1 ).toString( 16 ) + " ";
-		}
-
-		// Other potentially-special ASCII characters get backslash-escaped
-		return "\\" + ch;
-	};
-
-	$.escapeSelector = function( sel ) {
-		return ( sel + "" ).replace( rcssescape, fcssescape );
+	$.escapeSelector = function( id ) {
+		return CSS.escape( id + "" );
 	};
 }
 
@@ -16863,7 +16752,7 @@ if ( !$.fn.even || !$.fn.odd ) {
 
 ;
 /*!
- * jQuery UI Keycode 1.13.3
+ * jQuery UI Keycode 1.14.1
  * https://jqueryui.com
  *
  * Copyright OpenJS Foundation and other contributors
@@ -16898,7 +16787,7 @@ var keycode = $.ui.keyCode = {
 
 
 /*!
- * jQuery UI Labels 1.13.3
+ * jQuery UI Labels 1.14.1
  * https://jqueryui.com
  *
  * Copyright OpenJS Foundation and other contributors
@@ -16924,9 +16813,8 @@ var labels = $.fn.labels = function() {
 		return this.pushStack( this[ 0 ].labels );
 	}
 
-	// Support: IE <= 11, FF <= 37, Android <= 2.3 only
-	// Above browsers do not support control.labels. Everything below is to support them
-	// as well as document fragments. control.labels does not work on document fragments
+	// If `control.labels` is empty - e.g. inside of document fragments - find
+	// the labels manually
 	labels = this.eq( 0 ).parents( "label" );
 
 	// Look for the label based on the id
@@ -16941,7 +16829,7 @@ var labels = $.fn.labels = function() {
 		ancestors = ancestor.add( ancestor.length ? ancestor.siblings() : this.siblings() );
 
 		// Create a selector for the label based on the id
-		selector = "label[for='" + $.escapeSelector( id ) + "']";
+		selector = "label[for='" + CSS.escape( id ) + "']";
 
 		labels = labels.add( ancestors.find( selector ).addBack( selector ) );
 
@@ -16953,7 +16841,7 @@ var labels = $.fn.labels = function() {
 
 
 /*!
- * jQuery UI Scroll Parent 1.13.3
+ * jQuery UI Scroll Parent 1.14.1
  * https://jqueryui.com
  *
  * Copyright OpenJS Foundation and other contributors
@@ -16987,7 +16875,7 @@ var scrollParent = $.fn.scrollParent = function( includeHidden ) {
 
 
 /*!
- * jQuery UI Tabbable 1.13.3
+ * jQuery UI Tabbable 1.14.1
  * https://jqueryui.com
  *
  * Copyright OpenJS Foundation and other contributors
@@ -17011,7 +16899,7 @@ var tabbable = $.extend( $.expr.pseudos, {
 
 
 /*!
- * jQuery UI Unique ID 1.13.3
+ * jQuery UI Unique ID 1.14.1
  * https://jqueryui.com
  *
  * Copyright OpenJS Foundation and other contributors
@@ -17049,7 +16937,7 @@ var uniqueId = $.fn.extend( {
 
 
 /*!
- * jQuery UI Accordion 1.13.3
+ * jQuery UI Accordion 1.14.1
  * https://jqueryui.com
  *
  * Copyright OpenJS Foundation and other contributors
@@ -17070,7 +16958,7 @@ var uniqueId = $.fn.extend( {
 
 
 var widgetsAccordion = $.widget( "ui.accordion", {
-	version: "1.13.3",
+	version: "1.14.1",
 	options: {
 		active: 0,
 		animate: {},
@@ -17082,7 +16970,17 @@ var widgetsAccordion = $.widget( "ui.accordion", {
 		collapsible: false,
 		event: "click",
 		header: function( elem ) {
-			return elem.find( "> li > :first-child" ).add( elem.find( "> :not(li)" ).even() );
+			return elem
+				.find( "> li > :first-child" )
+				.add(
+					elem.find( "> :not(li)" )
+
+						// Support: jQuery <3.5 only
+						// We could use `.even()` but that's unavailable in older jQuery.
+						.filter( function( i ) {
+							return i % 2 === 0;
+						} )
+				);
 		},
 		heightStyle: "auto",
 		icons: {
@@ -17217,13 +17115,7 @@ var widgetsAccordion = $.widget( "ui.accordion", {
 		this._super( value );
 
 		this.element.attr( "aria-disabled", value );
-
-		// Support: IE8 Only
-		// #5332 / #6059 - opacity doesn't cascade to positioned elements in IE
-		// so we need to add the disabled class to the headers and panels
 		this._toggleClass( null, "ui-state-disabled", !!value );
-		this._toggleClass( this.headers.add( this.headers.next() ), null, "ui-state-disabled",
-			!!value );
 	},
 
 	_keydown: function( event ) {
@@ -17641,47 +17533,13 @@ var widgetsAccordion = $.widget( "ui.accordion", {
 		this._removeClass( prev, "ui-accordion-header-active" )
 			._addClass( prev, "ui-accordion-header-collapsed" );
 
-		// Work around for rendering bug in IE (#5421)
-		if ( toHide.length ) {
-			toHide.parent()[ 0 ].className = toHide.parent()[ 0 ].className;
-		}
 		this._trigger( "activate", null, data );
 	}
 } );
 
 
-
-var safeActiveElement = $.ui.safeActiveElement = function( document ) {
-	var activeElement;
-
-	// Support: IE 9 only
-	// IE9 throws an "Unspecified error" accessing document.activeElement from an <iframe>
-	try {
-		activeElement = document.activeElement;
-	} catch ( error ) {
-		activeElement = document.body;
-	}
-
-	// Support: IE 9 - 11 only
-	// IE may return null instead of an element
-	// Interestingly, this only seems to occur when NOT in an iframe
-	if ( !activeElement ) {
-		activeElement = document.body;
-	}
-
-	// Support: IE 11 only
-	// IE11 returns a seemingly empty object in some cases when accessing
-	// document.activeElement from an <iframe>
-	if ( !activeElement.nodeName ) {
-		activeElement = document.body;
-	}
-
-	return activeElement;
-};
-
-
 /*!
- * jQuery UI Menu 1.13.3
+ * jQuery UI Menu 1.14.1
  * https://jqueryui.com
  *
  * Copyright OpenJS Foundation and other contributors
@@ -17700,7 +17558,7 @@ var safeActiveElement = $.ui.safeActiveElement = function( document ) {
 
 
 var widgetsMenu = $.widget( "ui.menu", {
-	version: "1.13.3",
+	version: "1.14.1",
 	defaultElement: "<ul>",
 	delay: 300,
 	options: {
@@ -17747,7 +17605,7 @@ var widgetsMenu = $.widget( "ui.menu", {
 			},
 			"click .ui-menu-item": function( event ) {
 				var target = $( event.target );
-				var active = $( $.ui.safeActiveElement( this.document[ 0 ] ) );
+				var active = $( this.document[ 0 ].activeElement );
 				if ( !this.mouseHandled && target.not( ".ui-state-disabled" ).length ) {
 					this.select( event );
 
@@ -17791,7 +17649,7 @@ var widgetsMenu = $.widget( "ui.menu", {
 				this._delay( function() {
 					var notContained = !$.contains(
 						this.element[ 0 ],
-						$.ui.safeActiveElement( this.document[ 0 ] )
+						this.document[ 0 ].activeElement
 					);
 					if ( notContained ) {
 						this.collapseAll( event );
@@ -18372,7 +18230,7 @@ var widgetsMenu = $.widget( "ui.menu", {
 
 
 /*!
- * jQuery UI Autocomplete 1.13.3
+ * jQuery UI Autocomplete 1.14.1
  * https://jqueryui.com
  *
  * Copyright OpenJS Foundation and other contributors
@@ -18391,7 +18249,7 @@ var widgetsMenu = $.widget( "ui.menu", {
 
 
 $.widget( "ui.autocomplete", {
-	version: "1.13.3",
+	version: "1.14.1",
 	defaultElement: "<input>",
 	options: {
 		appendTo: null,
@@ -18435,9 +18293,9 @@ $.widget( "ui.autocomplete", {
 
 		// Textareas are always multi-line
 		// Inputs are always single-line, even if inside a contentEditable element
-		// IE also treats inputs as contentEditable
-		// All other element types are determined by whether or not they're contentEditable
-		this.isMultiLine = isTextarea || !isInput && this._isContentEditable( this.element );
+		// All other element types are determined by whether they're contentEditable
+		this.isMultiLine = isTextarea ||
+			!isInput && this.element.prop( "contentEditable" ) === "true";
 
 		this.valueMethod = this.element[ isTextarea || isInput ? "val" : "text" ];
 		this.isNewMenu = true;
@@ -18501,7 +18359,6 @@ $.widget( "ui.autocomplete", {
 
 						// Different browsers have different default behavior for escape
 						// Single press can mean undo or clear
-						// Double press in IE means clear the whole form
 						event.preventDefault();
 					}
 					break;
@@ -18570,16 +18427,6 @@ $.widget( "ui.autocomplete", {
 				role: null
 			} )
 			.hide()
-
-			// Support: IE 11 only, Edge <= 14
-			// For other browsers, we preventDefault() on the mousedown event
-			// to keep the dropdown from taking focus from the input. This doesn't
-			// work for IE/Edge, causing problems with selection and scrolling (#9638)
-			// Happily, IE and Edge support an "unselectable" attribute that
-			// prevents an element from receiving focus, exactly what we want here.
-			.attr( {
-				"unselectable": "on"
-			} )
 			.menu( "instance" );
 
 		this._addClass( this.menu.element, "ui-autocomplete", "ui-front" );
@@ -18592,7 +18439,7 @@ $.widget( "ui.autocomplete", {
 			menufocus: function( event, ui ) {
 				var label, item;
 
-				// support: Firefox
+				// Support: Firefox
 				// Prevent accidental activation of menu items in Firefox (#7024 #9118)
 				if ( this.isNewMenu ) {
 					this.isNewMenu = false;
@@ -18630,17 +18477,9 @@ $.widget( "ui.autocomplete", {
 					previous = this.previous;
 
 				// Only trigger when focus was lost (click on menu)
-				if ( this.element[ 0 ] !== $.ui.safeActiveElement( this.document[ 0 ] ) ) {
+				if ( this.element[ 0 ] !== this.document[ 0 ].activeElement ) {
 					this.element.trigger( "focus" );
 					this.previous = previous;
-
-					// #6109 - IE triggers two focus events and the second
-					// is asynchronous, so we need to reset the previous
-					// term synchronously and asynchronously :-(
-					this._delay( function() {
-						this.previous = previous;
-						this.selectedItem = item;
-					} );
 				}
 
 				if ( false !== this._trigger( "select", event, { item: item } ) ) {
@@ -18959,24 +18798,6 @@ $.widget( "ui.autocomplete", {
 			// Prevents moving cursor to beginning/end of the text field in some browsers
 			event.preventDefault();
 		}
-	},
-
-	// Support: Chrome <=50
-	// We should be able to just use this.element.prop( "isContentEditable" )
-	// but hidden elements always report false in Chrome.
-	// https://code.google.com/p/chromium/issues/detail?id=313082
-	_isContentEditable: function( element ) {
-		if ( !element.length ) {
-			return false;
-		}
-
-		var editable = element.prop( "contentEditable" );
-
-		if ( editable === "inherit" ) {
-			return this._isContentEditable( element.parent() );
-		}
-
-		return editable === "true";
 	}
 } );
 
@@ -19028,7 +18849,7 @@ var widgetsAutocomplete = $.ui.autocomplete;
 
 
 /*!
- * jQuery UI Controlgroup 1.13.3
+ * jQuery UI Controlgroup 1.14.1
  * https://jqueryui.com
  *
  * Copyright OpenJS Foundation and other contributors
@@ -19049,7 +18870,7 @@ var widgetsAutocomplete = $.ui.autocomplete;
 var controlgroupCornerRegex = /ui-corner-([a-z]){2,6}/g;
 
 var widgetsControlgroup = $.widget( "ui.controlgroup", {
-	version: "1.13.3",
+	version: "1.14.1",
 	defaultElement: "<div>",
 	options: {
 		direction: "horizontal",
@@ -19313,7 +19134,7 @@ var widgetsControlgroup = $.widget( "ui.controlgroup", {
 } );
 
 /*!
- * jQuery UI Checkboxradio 1.13.3
+ * jQuery UI Checkboxradio 1.14.1
  * https://jqueryui.com
  *
  * Copyright OpenJS Foundation and other contributors
@@ -19333,7 +19154,7 @@ var widgetsControlgroup = $.widget( "ui.controlgroup", {
 
 
 $.widget( "ui.checkboxradio", [ $.ui.formResetMixin, {
-	version: "1.13.3",
+	version: "1.14.1",
 	options: {
 		disabled: null,
 		label: null,
@@ -19451,7 +19272,7 @@ $.widget( "ui.checkboxradio", [ $.ui.formResetMixin, {
 	_getRadioGroup: function() {
 		var group;
 		var name = this.element[ 0 ].name;
-		var nameSelector = "input[name='" + $.escapeSelector( name ) + "']";
+		var nameSelector = "input[name='" + CSS.escape( name ) + "']";
 
 		if ( !name ) {
 			return $( [] );
@@ -19463,7 +19284,7 @@ $.widget( "ui.checkboxradio", [ $.ui.formResetMixin, {
 
 			// Not inside a form, check all inputs that also are not inside a form
 			group = $( nameSelector ).filter( function() {
-				return $( this )._form().length === 0;
+				return $( $( this ).prop( "form" ) ).length === 0;
 			} );
 		}
 
@@ -19584,7 +19405,7 @@ var widgetsCheckboxradio = $.ui.checkboxradio;
 
 
 /*!
- * jQuery UI Button 1.13.3
+ * jQuery UI Button 1.14.1
  * https://jqueryui.com
  *
  * Copyright OpenJS Foundation and other contributors
@@ -19603,7 +19424,7 @@ var widgetsCheckboxradio = $.ui.checkboxradio;
 
 
 $.widget( "ui.button", {
-	version: "1.13.3",
+	version: "1.14.1",
 	defaultElement: "<button>",
 	options: {
 		classes: {
@@ -19670,9 +19491,9 @@ $.widget( "ui.button", {
 					if ( event.keyCode === $.ui.keyCode.SPACE ) {
 						event.preventDefault();
 
-						// Support: PhantomJS <= 1.9, IE 8 Only
-						// If a native click is available use it so we actually cause navigation
-						// otherwise just trigger a click event
+						// If a native click is available use it, so we
+						// actually cause navigation. Otherwise, just trigger
+						// a click event.
 						if ( this.element[ 0 ].click ) {
 							this.element[ 0 ].click();
 						} else {
@@ -19848,7 +19669,7 @@ $.widget( "ui.button", {
 } );
 
 // DEPRECATED
-if ( $.uiBackCompat !== false ) {
+if ( $.uiBackCompat === true ) {
 
 	// Text and Icons options
 	$.widget( "ui.button", $.ui.button, {
@@ -20010,7 +19831,7 @@ var widgetsButton = $.ui.button;
 
 /* eslint-disable max-len, camelcase */
 /*!
- * jQuery UI Datepicker 1.13.3
+ * jQuery UI Datepicker 1.14.1
  * https://jqueryui.com
  *
  * Copyright OpenJS Foundation and other contributors
@@ -20028,7 +19849,7 @@ var widgetsButton = $.ui.button;
 //>>css.theme: ../../themes/base/theme.css
 
 
-$.extend( $.ui, { datepicker: { version: "1.13.3" } } );
+$.extend( $.ui, { datepicker: { version: "1.14.1" } } );
 
 var datepicker_instActive;
 
@@ -20427,6 +20248,7 @@ $.extend( Datepicker.prototype, {
 			$target.removeClass( this.markerClassName ).empty();
 		}
 
+		$.datepicker._hideDatepicker();
 		if ( datepicker_instActive === inst ) {
 			datepicker_instActive = null;
 			this._curInst = null;
@@ -20902,11 +20724,8 @@ $.extend( Datepicker.prototype, {
 		}
 	},
 
-	// #6694 - don't focus the input if it's already focused
-	// this breaks the change event in IE
-	// Support: IE and jQuery <1.9
 	_shouldFocusInput: function( inst ) {
-		return inst.input && inst.input.is( ":visible" ) && !inst.input.is( ":disabled" ) && !inst.input.is( ":focus" );
+		return inst.input && inst.input.is( ":visible" ) && !inst.input.is( ":disabled" );
 	},
 
 	/* Check positioning to remain on screen. */
@@ -20963,8 +20782,7 @@ $.extend( Datepicker.prototype, {
 				$.datepicker._tidyDialog( inst );
 			};
 
-			// DEPRECATED: after BC for 1.8.x $.effects[ showAnim ] is not needed
-			if ( $.effects && ( $.effects.effect[ showAnim ] || $.effects[ showAnim ] ) ) {
+			if ( $.effects && ( $.effects.effect[ showAnim ] ) ) {
 				inst.dpDiv.hide( showAnim, $.datepicker._get( inst, "showOptions" ), duration, postProcess );
 			} else {
 				inst.dpDiv[ ( showAnim === "slideDown" ? "slideUp" :
@@ -22225,17 +22043,13 @@ $.fn.datepicker = function( options ) {
 $.datepicker = new Datepicker(); // singleton instance
 $.datepicker.initialized = false;
 $.datepicker.uuid = new Date().getTime();
-$.datepicker.version = "1.13.3";
+$.datepicker.version = "1.14.1";
 
 var widgetsDatepicker = $.datepicker;
 
 
-
-// This file is deprecated
-var ie = $.ui.ie = !!/msie [\w.]+/.exec( navigator.userAgent.toLowerCase() );
-
 /*!
- * jQuery UI Mouse 1.13.3
+ * jQuery UI Mouse 1.14.1
  * https://jqueryui.com
  *
  * Copyright OpenJS Foundation and other contributors
@@ -22255,7 +22069,7 @@ $( document ).on( "mouseup", function() {
 } );
 
 var widgetsMouse = $.widget( "ui.mouse", {
-	version: "1.13.3",
+	version: "1.14.1",
 	options: {
 		cancel: "input, textarea, button, select, option",
 		distance: 1,
@@ -22307,12 +22121,10 @@ var widgetsMouse = $.widget( "ui.mouse", {
 		this._mouseDownEvent = event;
 
 		var that = this,
-			btnIsLeft = ( event.which === 1 ),
-
-			// event.target.nodeName works around a bug in IE 8 with
-			// disabled inputs (#7620)
-			elIsCancel = ( typeof this.options.cancel === "string" && event.target.nodeName ?
-				$( event.target ).closest( this.options.cancel ).length : false );
+			btnIsLeft = event.which === 1,
+			elIsCancel = typeof this.options.cancel === "string" ?
+				$( event.target ).closest( this.options.cancel ).length :
+				false;
 		if ( !btnIsLeft || elIsCancel || !this._mouseCapture( event ) ) {
 			return true;
 		}
@@ -22358,28 +22170,17 @@ var widgetsMouse = $.widget( "ui.mouse", {
 	_mouseMove: function( event ) {
 
 		// Only check for mouseups outside the document if you've moved inside the document
-		// at least once. This prevents the firing of mouseup in the case of IE<9, which will
-		// fire a mousemove event if content is placed under the cursor. See #7778
-		// Support: IE <9
-		if ( this._mouseMoved ) {
+		// at least once.
+		if ( this._mouseMoved && !event.which ) {
 
-			// IE mouseup check - mouseup happened when mouse was out of window
-			if ( $.ui.ie && ( !document.documentMode || document.documentMode < 9 ) &&
-					!event.button ) {
+			// Support: Safari <=8 - 9
+			// Safari sets which to 0 if you press any of the following keys
+			// during a drag (#14461)
+			if ( event.originalEvent.altKey || event.originalEvent.ctrlKey ||
+					event.originalEvent.metaKey || event.originalEvent.shiftKey ) {
+				this.ignoreMissingWhich = true;
+			} else if ( !this.ignoreMissingWhich ) {
 				return this._mouseUp( event );
-
-			// Iframe mouseup check - mouseup occurred in another document
-			} else if ( !event.which ) {
-
-				// Support: Safari <=8 - 9
-				// Safari sets which to 0 if you press any of the following keys
-				// during a drag (#14461)
-				if ( event.originalEvent.altKey || event.originalEvent.ctrlKey ||
-						event.originalEvent.metaKey || event.originalEvent.shiftKey ) {
-					this.ignoreMissingWhich = true;
-				} else if ( !this.ignoreMissingWhich ) {
-					return this._mouseUp( event );
-				}
 			}
 		}
 
@@ -22485,19 +22286,8 @@ var plugin = $.ui.plugin = {
 };
 
 
-
-var safeBlur = $.ui.safeBlur = function( element ) {
-
-	// Support: IE9 - 10 only
-	// If the <body> is blurred, IE will switch windows, see #9420
-	if ( element && element.nodeName.toLowerCase() !== "body" ) {
-		$( element ).trigger( "blur" );
-	}
-};
-
-
 /*!
- * jQuery UI Draggable 1.13.3
+ * jQuery UI Draggable 1.14.1
  * https://jqueryui.com
  *
  * Copyright OpenJS Foundation and other contributors
@@ -22514,7 +22304,7 @@ var safeBlur = $.ui.safeBlur = function( element ) {
 
 
 $.widget( "ui.draggable", $.ui.mouse, {
-	version: "1.13.3",
+	version: "1.14.1",
 	widgetEventPrefix: "drag",
 	options: {
 		addClasses: true,
@@ -22621,7 +22411,7 @@ $.widget( "ui.draggable", $.ui.mouse, {
 	},
 
 	_blurActiveElement: function( event ) {
-		var activeElement = $.ui.safeActiveElement( this.document[ 0 ] ),
+		var activeElement = this.document[ 0 ].activeElement,
 			target = $( event.target );
 
 		// Don't blur if the event occurred on an element that is within
@@ -22632,7 +22422,7 @@ $.widget( "ui.draggable", $.ui.mouse, {
 		}
 
 		// Blur any element that currently has focus, see #4261
-		$.ui.safeBlur( activeElement );
+		$( activeElement ).trigger( "blur" );
 	},
 
 	_mouseStart: function( event ) {
@@ -23732,7 +23522,7 @@ var widgetsDraggable = $.ui.draggable;
 
 
 /*!
- * jQuery UI Resizable 1.13.3
+ * jQuery UI Resizable 1.14.1
  * https://jqueryui.com
  *
  * Copyright OpenJS Foundation and other contributors
@@ -23751,7 +23541,7 @@ var widgetsDraggable = $.ui.draggable;
 
 
 $.widget( "ui.resizable", $.ui.mouse, {
-	version: "1.13.3",
+	version: "1.14.1",
 	widgetEventPrefix: "resize",
 	options: {
 		alsoResize: false,
@@ -23792,12 +23582,18 @@ $.widget( "ui.resizable", $.ui.mouse, {
 
 	_hasScroll: function( el, a ) {
 
-		if ( $( el ).css( "overflow" ) === "hidden" ) {
+		var scroll,
+			has = false,
+			overflow = $( el ).css( "overflow" );
+
+		if ( overflow === "hidden" ) {
 			return false;
 		}
+		if ( overflow === "scroll" ) {
+			return true;
+		}
 
-		var scroll = ( a && a === "left" ) ? "scrollLeft" : "scrollTop",
-			has = false;
+		scroll = ( a && a === "left" ) ? "scrollLeft" : "scrollTop";
 
 		if ( el[ scroll ] > 0 ) {
 			return true;
@@ -23861,9 +23657,8 @@ $.widget( "ui.resizable", $.ui.mouse, {
 			};
 
 			this.element.css( margins );
-			this.originalElement.css( "margin", 0 );
 
-			// support: Safari
+			// Support: Safari
 			// Prevent Safari textarea resize
 			this.originalResizeStyle = this.originalElement.css( "resize" );
 			this.originalElement.css( "resize", "none" );
@@ -23874,10 +23669,6 @@ $.widget( "ui.resizable", $.ui.mouse, {
 				display: "block"
 			} ) );
 
-			// Support: IE9
-			// avoid IE jump (hard set the margin)
-			this.originalElement.css( margins );
-
 			this._proportionallyResize();
 		}
 
@@ -24079,7 +23870,7 @@ $.widget( "ui.resizable", $.ui.mouse, {
 
 	_mouseStart: function( event ) {
 
-		var curleft, curtop, cursor,
+		var curleft, curtop, cursor, calculatedSize,
 			o = this.options,
 			el = this.element;
 
@@ -24098,20 +23889,24 @@ $.widget( "ui.resizable", $.ui.mouse, {
 		this.offset = this.helper.offset();
 		this.position = { left: curleft, top: curtop };
 
+		if ( !this._helper ) {
+			calculatedSize = this._calculateAdjustedElementDimensions( el );
+		}
+
 		this.size = this._helper ? {
 				width: this.helper.width(),
 				height: this.helper.height()
 			} : {
-				width: el.width(),
-				height: el.height()
+				width: calculatedSize.width,
+				height: calculatedSize.height
 			};
 
 		this.originalSize = this._helper ? {
 				width: el.outerWidth(),
 				height: el.outerHeight()
 			} : {
-				width: el.width(),
-				height: el.height()
+				width: calculatedSize.width,
+				height: calculatedSize.height
 			};
 
 		this.sizeDiff = {
@@ -24407,6 +24202,52 @@ $.widget( "ui.resizable", $.ui.mouse, {
 		};
 	},
 
+	_calculateAdjustedElementDimensions: function( element ) {
+		var elWidth, elHeight, paddingBorder,
+			ce = element.get( 0 );
+
+		if ( element.css( "box-sizing" ) !== "content-box" ||
+			( !this._hasScroll( ce ) && !this._hasScroll( ce, "left" ) ) ) {
+				return {
+					height: parseFloat( element.css( "height" ) ),
+					width: parseFloat( element.css( "width" ) )
+				};
+		}
+
+		// Check if CSS inline styles are set and use those (usually from previous resizes)
+		elWidth = parseFloat( ce.style.width );
+		elHeight = parseFloat( ce.style.height );
+
+		paddingBorder = this._getPaddingPlusBorderDimensions( element );
+		elWidth = isNaN( elWidth ) ?
+			this._getElementTheoreticalSize( element, paddingBorder, "width" ) :
+			elWidth;
+		elHeight = isNaN( elHeight ) ?
+			this._getElementTheoreticalSize( element, paddingBorder, "height" ) :
+			elHeight;
+
+		return {
+			height: elHeight,
+			width: elWidth
+		};
+	},
+
+	_getElementTheoreticalSize: function( element, extraSize, dimension ) {
+
+		// offsetWidth/offsetHeight is a rounded sum of content, padding, scroll gutter, and border
+		var size = Math.max( 0, Math.ceil(
+			element.get( 0 )[ "offset" + dimension[ 0 ].toUpperCase() + dimension.slice( 1 ) ] -
+			extraSize[ dimension ] -
+			0.5
+
+		// If offsetWidth/offsetHeight is unknown, then we can't determine theoretical size.
+		// Use an explicit zero to avoid NaN.
+		// See https://github.com/jquery/jquery/issues/3964
+		) ) || 0;
+
+		return size;
+	},
+
 	_proportionallyResize: function() {
 
 		if ( !this._proportionallyResizeElements.length ) {
@@ -24761,9 +24602,11 @@ $.ui.plugin.add( "resizable", "alsoResize", {
 			o = that.options;
 
 		$( o.alsoResize ).each( function() {
-			var el = $( this );
+			var el = $( this ),
+				elSize = that._calculateAdjustedElementDimensions( el );
+
 			el.data( "ui-resizable-alsoresize", {
-				width: parseFloat( el.css( "width" ) ), height: parseFloat( el.css( "height" ) ),
+				width: elSize.width, height: elSize.height,
 				left: parseFloat( el.css( "left" ) ), top: parseFloat( el.css( "top" ) )
 			} );
 		} );
@@ -24825,7 +24668,7 @@ $.ui.plugin.add( "resizable", "ghost", {
 
 		// DEPRECATED
 		// TODO: remove after 1.12
-		if ( $.uiBackCompat !== false && typeof that.options.ghost === "string" ) {
+		if ( $.uiBackCompat === true && typeof that.options.ghost === "string" ) {
 
 			// Ghost option
 			that.ghost.addClass( this.options.ghost );
@@ -24933,7 +24776,7 @@ var widgetsResizable = $.ui.resizable;
 
 
 /*!
- * jQuery UI Dialog 1.13.3
+ * jQuery UI Dialog 1.14.1
  * https://jqueryui.com
  *
  * Copyright OpenJS Foundation and other contributors
@@ -24952,7 +24795,7 @@ var widgetsResizable = $.ui.resizable;
 
 
 $.widget( "ui.dialog", {
-	version: "1.13.3",
+	version: "1.14.1",
 	options: {
 		appendTo: "body",
 		autoOpen: true,
@@ -24988,6 +24831,7 @@ $.widget( "ui.dialog", {
 		resizable: true,
 		show: null,
 		title: null,
+		uiDialogTitleHeadingLevel: 0,
 		width: 300,
 
 		// Callbacks
@@ -25134,7 +24978,7 @@ $.widget( "ui.dialog", {
 			// Hiding a focused element doesn't trigger blur in WebKit
 			// so in case we have nothing to focus on, explicitly blur the active element
 			// https://bugs.webkit.org/show_bug.cgi?id=47182
-			$.ui.safeBlur( $.ui.safeActiveElement( this.document[ 0 ] ) );
+			$( this.document[ 0 ].activeElement ).trigger( "blur" );
 		}
 
 		this._hide( this.uiDialog, this.options.hide, function() {
@@ -25178,7 +25022,7 @@ $.widget( "ui.dialog", {
 		}
 
 		this._isOpen = true;
-		this.opener = $( $.ui.safeActiveElement( this.document[ 0 ] ) );
+		this.opener = $( this.document[ 0 ].activeElement );
 
 		this._size();
 		this._position();
@@ -25234,7 +25078,7 @@ $.widget( "ui.dialog", {
 	},
 
 	_restoreTabbableFocus: function() {
-		var activeElement = $.ui.safeActiveElement( this.document[ 0 ] ),
+		var activeElement = this.document[ 0 ].activeElement,
 			isActive = this.uiDialog[ 0 ] === activeElement ||
 				$.contains( this.uiDialog[ 0 ], activeElement );
 		if ( !isActive ) {
@@ -25245,11 +25089,6 @@ $.widget( "ui.dialog", {
 	_keepFocus: function( event ) {
 		event.preventDefault();
 		this._restoreTabbableFocus();
-
-		// support: IE
-		// IE <= 8 doesn't prevent moving focus even with event.preventDefault()
-		// so we check again later
-		this._delay( this._restoreTabbableFocus );
 	},
 
 	_createWrapper: function() {
@@ -25259,7 +25098,8 @@ $.widget( "ui.dialog", {
 
 				// Setting tabIndex makes the div focusable
 				tabIndex: -1,
-				role: "dialog"
+				role: "dialog",
+				"aria-modal": this.options.modal ? "true" : null
 			} )
 			.appendTo( this._appendTo() );
 
@@ -25332,9 +25172,6 @@ $.widget( "ui.dialog", {
 			}
 		} );
 
-		// Support: IE
-		// Use type="button" to prevent enter keypresses in textboxes from closing the
-		// dialog in IE (#9312)
 		this.uiDialogTitlebarClose = $( "<button type='button'></button>" )
 			.button( {
 				label: $( "<a>" ).text( this.options.closeText ).html(),
@@ -25351,7 +25188,13 @@ $.widget( "ui.dialog", {
 			}
 		} );
 
-		uiDialogTitle = $( "<span>" ).uniqueId().prependTo( this.uiDialogTitlebar );
+		var uiDialogHeadingLevel = Number.isInteger( this.options.uiDialogTitleHeadingLevel ) &&
+			this.options.uiDialogTitleHeadingLevel > 0 &&
+			this.options.uiDialogTitleHeadingLevel <= 6 ?
+			"h" + this.options.uiDialogTitleHeadingLevel : "span";
+
+		uiDialogTitle = $( "<" + uiDialogHeadingLevel + ">" )
+			.uniqueId().prependTo( this.uiDialogTitlebar );
 		this._addClass( uiDialogTitle, "ui-dialog-title" );
 		this._title( uiDialogTitle );
 
@@ -25677,6 +25520,10 @@ $.widget( "ui.dialog", {
 		if ( key === "title" ) {
 			this._title( this.uiDialogTitlebar.find( ".ui-dialog-title" ) );
 		}
+
+		if ( key === "modal" ) {
+			uiDialog.attr( "aria-modal", value ? "true" : null );
+		}
 	},
 
 	_size: function() {
@@ -25762,8 +25609,6 @@ $.widget( "ui.dialog", {
 			return;
 		}
 
-		var jqMinor = $.fn.jquery.substring( 0, 4 );
-
 		// We use a delay in case the overlay is created from an
 		// event that we're going to be cancelling (#2804)
 		var isOpening = true;
@@ -25785,18 +25630,6 @@ $.widget( "ui.dialog", {
 				if ( !instance._allowInteraction( event ) ) {
 					event.preventDefault();
 					instance._focusTabbable();
-
-					// Support: jQuery >=3.4 <3.7 only
-					// In jQuery 3.4-3.6, there are multiple issues with focus/blur
-					// trigger chains or when triggering is done on a hidden element
-					// at least once.
-					// Trigger focus in a delay in addition if needed to avoid the issues.
-					// See https://github.com/jquery/jquery/issues/4382
-					// See https://github.com/jquery/jquery/issues/4856
-					// See https://github.com/jquery/jquery/issues/4950
-					if ( jqMinor === "3.4." || jqMinor === "3.5." || jqMinor === "3.6." ) {
-						instance._delay( instance._restoreTabbableFocus );
-					}
 				}
 			}.bind( this ) );
 		}
@@ -25835,7 +25668,7 @@ $.widget( "ui.dialog", {
 
 // DEPRECATED
 // TODO: switch return back to widget declaration at top of file when this is removed
-if ( $.uiBackCompat !== false ) {
+if ( $.uiBackCompat === true ) {
 
 	// Backcompat for dialogClass option
 	$.widget( "ui.dialog", $.ui.dialog, {
@@ -25861,7 +25694,7 @@ var widgetsDialog = $.ui.dialog;
 
 
 /*!
- * jQuery UI Droppable 1.13.3
+ * jQuery UI Droppable 1.14.1
  * https://jqueryui.com
  *
  * Copyright OpenJS Foundation and other contributors
@@ -25877,7 +25710,7 @@ var widgetsDialog = $.ui.dialog;
 
 
 $.widget( "ui.droppable", {
-	version: "1.13.3",
+	version: "1.14.1",
 	widgetEventPrefix: "drop",
 	options: {
 		accept: "*",
@@ -26305,7 +26138,7 @@ $.ui.ddmanager = {
 
 // DEPRECATED
 // TODO: switch return back to widget declaration at top of file when this is removed
-if ( $.uiBackCompat !== false ) {
+if ( $.uiBackCompat === true ) {
 
 	// Backcompat for activeClass and hoverClass options
 	$.widget( "ui.droppable", $.ui.droppable, {
@@ -26344,7 +26177,7 @@ var widgetsDroppable = $.ui.droppable;
 
 
 /*!
- * jQuery UI Progressbar 1.13.3
+ * jQuery UI Progressbar 1.14.1
  * https://jqueryui.com
  *
  * Copyright OpenJS Foundation and other contributors
@@ -26365,7 +26198,7 @@ var widgetsDroppable = $.ui.droppable;
 
 
 var widgetsProgressbar = $.widget( "ui.progressbar", {
-	version: "1.13.3",
+	version: "1.14.1",
 	options: {
 		classes: {
 			"ui-progressbar": "ui-corner-all",
@@ -26507,7 +26340,7 @@ var widgetsProgressbar = $.widget( "ui.progressbar", {
 
 
 /*!
- * jQuery UI Selectable 1.13.3
+ * jQuery UI Selectable 1.14.1
  * https://jqueryui.com
  *
  * Copyright OpenJS Foundation and other contributors
@@ -26524,7 +26357,7 @@ var widgetsProgressbar = $.widget( "ui.progressbar", {
 
 
 var widgetsSelectable = $.widget( "ui.selectable", $.ui.mouse, {
-	version: "1.13.3",
+	version: "1.14.1",
 	options: {
 		appendTo: "body",
 		autoRefresh: true,
@@ -26805,7 +26638,7 @@ var widgetsSelectable = $.widget( "ui.selectable", $.ui.mouse, {
 
 
 /*!
- * jQuery UI Selectmenu 1.13.3
+ * jQuery UI Selectmenu 1.14.1
  * https://jqueryui.com
  *
  * Copyright OpenJS Foundation and other contributors
@@ -26826,7 +26659,7 @@ var widgetsSelectable = $.widget( "ui.selectable", $.ui.mouse, {
 
 
 var widgetsSelectmenu = $.widget( "ui.selectmenu", [ $.ui.formResetMixin, {
-	version: "1.13.3",
+	version: "1.14.1",
 	defaultElement: "<select>",
 	options: {
 		appendTo: null,
@@ -26949,12 +26782,6 @@ var widgetsSelectmenu = $.widget( "ui.selectmenu", [ $.ui.formResetMixin, {
 				role: "listbox",
 				select: function( event, ui ) {
 					event.preventDefault();
-
-					// Support: IE8
-					// If the item was selected via a click, the text selection
-					// will be destroyed in IE
-					that._setSelection();
-
 					that._select( ui.item.data( "ui-selectmenu-item" ), event );
 				},
 				focus: function( event, ui ) {
@@ -27191,20 +27018,9 @@ var widgetsSelectmenu = $.widget( "ui.selectmenu", [ $.ui.formResetMixin, {
 			return;
 		}
 
-		if ( window.getSelection ) {
-			selection = window.getSelection();
-			selection.removeAllRanges();
-			selection.addRange( this.range );
-
-		// Support: IE8
-		} else {
-			this.range.select();
-		}
-
-		// Support: IE
-		// Setting the text selection kills the button focus in IE, but
-		// restoring the focus doesn't kill the selection.
-		this.button.trigger( "focus" );
+		selection = window.getSelection();
+		selection.removeAllRanges();
+		selection.addRange( this.range );
 	},
 
 	_documentClick: {
@@ -27214,7 +27030,7 @@ var widgetsSelectmenu = $.widget( "ui.selectmenu", [ $.ui.formResetMixin, {
 			}
 
 			if ( !$( event.target ).closest( ".ui-selectmenu-menu, #" +
-				$.escapeSelector( this.ids.button ) ).length ) {
+				CSS.escape( this.ids.button ) ).length ) {
 				this.close( event );
 			}
 		}
@@ -27224,17 +27040,9 @@ var widgetsSelectmenu = $.widget( "ui.selectmenu", [ $.ui.formResetMixin, {
 
 		// Prevent text selection from being reset when interacting with the selectmenu (#10144)
 		mousedown: function() {
-			var selection;
-
-			if ( window.getSelection ) {
-				selection = window.getSelection();
-				if ( selection.rangeCount ) {
-					this.range = selection.getRangeAt( 0 );
-				}
-
-			// Support: IE8
-			} else {
-				this.range = document.selection.createRange();
+			var selection = window.getSelection();
+			if ( selection.rangeCount ) {
+				this.range = selection.getRangeAt( 0 );
 			}
 		},
 
@@ -27425,11 +27233,7 @@ var widgetsSelectmenu = $.widget( "ui.selectmenu", [ $.ui.formResetMixin, {
 	_resizeMenu: function() {
 		this.menu.outerWidth( Math.max(
 			this.button.outerWidth(),
-
-			// Support: IE10
-			// IE10 wraps long text (possibly a rounding bug)
-			// so we add 1px to avoid the wrapping
-			this.menu.width( "" ).outerWidth() + 1
+			this.menu.width( "" ).outerWidth()
 		) );
 	},
 
@@ -27476,7 +27280,7 @@ var widgetsSelectmenu = $.widget( "ui.selectmenu", [ $.ui.formResetMixin, {
 
 
 /*!
- * jQuery UI Slider 1.13.3
+ * jQuery UI Slider 1.14.1
  * https://jqueryui.com
  *
  * Copyright OpenJS Foundation and other contributors
@@ -27495,7 +27299,7 @@ var widgetsSelectmenu = $.widget( "ui.selectmenu", [ $.ui.formResetMixin, {
 
 
 var widgetsSlider = $.widget( "ui.slider", $.ui.mouse, {
-	version: "1.13.3",
+	version: "1.14.1",
 	widgetEventPrefix: "slide",
 
 	options: {
@@ -28211,7 +28015,7 @@ var widgetsSlider = $.widget( "ui.slider", $.ui.mouse, {
 
 
 /*!
- * jQuery UI Sortable 1.13.3
+ * jQuery UI Sortable 1.14.1
  * https://jqueryui.com
  *
  * Copyright OpenJS Foundation and other contributors
@@ -28228,7 +28032,7 @@ var widgetsSlider = $.widget( "ui.slider", $.ui.mouse, {
 
 
 var widgetsSortable = $.widget( "ui.sortable", $.ui.mouse, {
-	version: "1.13.3",
+	version: "1.14.1",
 	widgetEventPrefix: "sort",
 	ready: false,
 	options: {
@@ -28466,11 +28270,7 @@ var widgetsSortable = $.widget( "ui.sortable", $.ui.mouse, {
 		if ( o.cursor && o.cursor !== "auto" ) { // cursor option
 			body = this.document.find( "body" );
 
-			// Support: IE
-			this.storedCursor = body.css( "cursor" );
-			body.css( "cursor", o.cursor );
-
-			this.storedStylesheet =
+			this._storedStylesheet =
 				$( "<style>*{ cursor: " + o.cursor + " !important; }</style>" ).appendTo( body );
 		}
 
@@ -29387,11 +29187,9 @@ var widgetsSortable = $.widget( "ui.sortable", $.ui.mouse, {
 			po.top += this.scrollParent.scrollTop();
 		}
 
-		// This needs to be actually done for all browsers, since pageX/pageY includes this
-		// information with an ugly IE fix
-		if ( this.offsetParent[ 0 ] === this.document[ 0 ].body ||
-				( this.offsetParent[ 0 ].tagName &&
-				this.offsetParent[ 0 ].tagName.toLowerCase() === "html" && $.ui.ie ) ) {
+		// This needs to be actually done for all browsers, since pageX/pageY includes
+		// this information.
+		if ( this.offsetParent[ 0 ] === this.document[ 0 ].body ) {
 			po = { top: 0, left: 0 };
 		}
 
@@ -29739,9 +29537,9 @@ var widgetsSortable = $.widget( "ui.sortable", $.ui.mouse, {
 		}
 
 		//Do what was originally in plugins
-		if ( this.storedCursor ) {
-			this.document.find( "body" ).css( "cursor", this.storedCursor );
-			this.storedStylesheet.remove();
+		if ( this._storedStylesheet ) {
+			this._storedStylesheet.remove();
+			this._storedStylesheet = null;
 		}
 		if ( this._storedOpacity ) {
 			this.helper.css( "opacity", this._storedOpacity );
@@ -29804,7 +29602,7 @@ var widgetsSortable = $.widget( "ui.sortable", $.ui.mouse, {
 
 
 /*!
- * jQuery UI Spinner 1.13.3
+ * jQuery UI Spinner 1.14.1
  * https://jqueryui.com
  *
  * Copyright OpenJS Foundation and other contributors
@@ -29834,7 +29632,7 @@ function spinnerModifier( fn ) {
 }
 
 $.widget( "ui.spinner", {
-	version: "1.13.3",
+	version: "1.14.1",
 	defaultElement: "<input>",
 	widgetEventPrefix: "spin",
 	options: {
@@ -29915,11 +29713,6 @@ $.widget( "ui.spinner", {
 			this.previous = this.element.val();
 		},
 		blur: function( event ) {
-			if ( this.cancelBlur ) {
-				delete this.cancelBlur;
-				return;
-			}
-
 			this._stop();
 			this._refresh();
 			if ( this.previous !== this.element.val() ) {
@@ -29927,7 +29720,7 @@ $.widget( "ui.spinner", {
 			}
 		},
 		mousewheel: function( event, delta ) {
-			var activeElement = $.ui.safeActiveElement( this.document[ 0 ] );
+			var activeElement = this.document[ 0 ].activeElement;
 			var isActive = this.element[ 0 ] === activeElement;
 
 			if ( !isActive || !delta ) {
@@ -29955,20 +29748,13 @@ $.widget( "ui.spinner", {
 			// If the input is focused then this.previous is properly set from
 			// when the input first received focus. If the input is not focused
 			// then we need to set this.previous based on the value before spinning.
-			previous = this.element[ 0 ] === $.ui.safeActiveElement( this.document[ 0 ] ) ?
+			previous = this.element[ 0 ] === this.document[ 0 ].activeElement ?
 				this.previous : this.element.val();
 			function checkFocus() {
-				var isActive = this.element[ 0 ] === $.ui.safeActiveElement( this.document[ 0 ] );
+				var isActive = this.element[ 0 ] === this.document[ 0 ].activeElement;
 				if ( !isActive ) {
 					this.element.trigger( "focus" );
 					this.previous = previous;
-
-					// support: IE
-					// IE sets focus asynchronously, so we need to check if focus
-					// moved off of the input because the user clicked on the button.
-					this._delay( function() {
-						this.previous = previous;
-					} );
 				}
 			}
 
@@ -29976,16 +29762,6 @@ $.widget( "ui.spinner", {
 			event.preventDefault();
 			checkFocus.call( this );
 
-			// Support: IE
-			// IE doesn't prevent moving focus even with event.preventDefault()
-			// so we set a flag to know when we should ignore the blur event
-			// and check (again) if focus moved off of the input.
-			this.cancelBlur = true;
-			this._delay( function() {
-				delete this.cancelBlur;
-				checkFocus.call( this );
-			} );
-
 			if ( this._start( event ) === false ) {
 				return;
 			}
@@ -30338,7 +30114,7 @@ $.widget( "ui.spinner", {
 
 // DEPRECATED
 // TODO: switch return back to widget declaration at top of file when this is removed
-if ( $.uiBackCompat !== false ) {
+if ( $.uiBackCompat === true ) {
 
 	// Backcompat for spinner html extension points
 	$.widget( "ui.spinner", $.ui.spinner, {
@@ -30365,7 +30141,7 @@ var widgetsSpinner = $.ui.spinner;
 
 
 /*!
- * jQuery UI Tabs 1.13.3
+ * jQuery UI Tabs 1.14.1
  * https://jqueryui.com
  *
  * Copyright OpenJS Foundation and other contributors
@@ -30384,7 +30160,7 @@ var widgetsSpinner = $.ui.spinner;
 
 
 $.widget( "ui.tabs", {
-	version: "1.13.3",
+	version: "1.14.1",
 	delay: 300,
 	options: {
 		active: null,
@@ -30467,14 +30243,14 @@ $.widget( "ui.tabs", {
 	_initialActive: function() {
 		var active = this.options.active,
 			collapsible = this.options.collapsible,
-			locationHash = location.hash.substring( 1 );
+			locationHashDecoded = decodeURIComponent( location.hash.substring( 1 ) );
 
 		if ( active === null ) {
 
 			// check the fragment identifier in the URL
-			if ( locationHash ) {
+			if ( locationHashDecoded ) {
 				this.tabs.each( function( i, tab ) {
-					if ( $( tab ).attr( "aria-controls" ) === locationHash ) {
+					if ( $( tab ).attr( "aria-controls" ) === locationHashDecoded ) {
 						active = i;
 						return false;
 					}
@@ -30516,7 +30292,7 @@ $.widget( "ui.tabs", {
 	},
 
 	_tabKeydown: function( event ) {
-		var focusedTab = $( $.ui.safeActiveElement( this.document[ 0 ] ) ).closest( "li" ),
+		var focusedTab = $( this.document[ 0 ].activeElement ).closest( "li" ),
 			selectedIndex = this.tabs.index( focusedTab ),
 			goingForward = true;
 
@@ -30658,10 +30434,6 @@ $.widget( "ui.tabs", {
 		}
 	},
 
-	_sanitizeSelector: function( hash ) {
-		return hash ? hash.replace( /[!"$%&'()*+,.\/:;<=>?@\[\]\^`{|}~]/g, "\\$&" ) : "";
-	},
-
 	refresh: function() {
 		var options = this.options,
 			lis = this.tablist.children( ":has(a[href])" );
@@ -30753,18 +30525,6 @@ $.widget( "ui.tabs", {
 				if ( $( this ).is( ".ui-state-disabled" ) ) {
 					event.preventDefault();
 				}
-			} )
-
-			// Support: IE <9
-			// Preventing the default action in mousedown doesn't prevent IE
-			// from focusing the element, so if the anchor gets focused, blur.
-			// We don't have to worry about focusing the previously focused
-			// element since clicking on a non-focusable element should focus
-			// the body anyway.
-			.on( "focus" + this.eventNamespace, ".ui-tabs-anchor", function() {
-				if ( $( this ).closest( "li" ).is( ".ui-state-disabled" ) ) {
-					this.blur();
-				}
 			} );
 
 		this.tabs = this.tablist.find( "> li:has(a[href])" )
@@ -30792,9 +30552,9 @@ $.widget( "ui.tabs", {
 
 			// Inline tab
 			if ( that._isLocal( anchor ) ) {
-				selector = anchor.hash;
+				selector = decodeURIComponent( anchor.hash );
 				panelId = selector.substring( 1 );
-				panel = that.element.find( that._sanitizeSelector( selector ) );
+				panel = that.element.find( "#" + CSS.escape( panelId ) );
 
 			// remote tab
 			} else {
@@ -31080,7 +30840,7 @@ $.widget( "ui.tabs", {
 		// meta-function to give users option to provide a href string instead of a numerical index.
 		if ( typeof index === "string" ) {
 			index = this.anchors.index( this.anchors.filter( "[href$='" +
-				$.escapeSelector( index ) + "']" ) );
+				CSS.escape( index ) + "']" ) );
 		}
 
 		return index;
@@ -31202,32 +30962,19 @@ $.widget( "ui.tabs", {
 
 		this.xhr = $.ajax( this._ajaxSettings( anchor, event, eventData ) );
 
-		// Support: jQuery <1.8
-		// jQuery <1.8 returns false if the request is canceled in beforeSend,
-		// but as of 1.8, $.ajax() always returns a jqXHR object.
-		if ( this.xhr && this.xhr.statusText !== "canceled" ) {
+		if ( this.xhr.statusText !== "canceled" ) {
 			this._addClass( tab, "ui-tabs-loading" );
 			panel.attr( "aria-busy", "true" );
 
 			this.xhr
 				.done( function( response, status, jqXHR ) {
+					panel.html( response );
+					that._trigger( "load", event, eventData );
 
-					// support: jQuery <1.8
-					// https://bugs.jquery.com/ticket/11778
-					setTimeout( function() {
-						panel.html( response );
-						that._trigger( "load", event, eventData );
-
-						complete( jqXHR, status );
-					}, 1 );
+					complete( jqXHR, status );
 				} )
 				.fail( function( jqXHR, status ) {
-
-					// support: jQuery <1.8
-					// https://bugs.jquery.com/ticket/11778
-					setTimeout( function() {
-						complete( jqXHR, status );
-					}, 1 );
+					complete( jqXHR, status );
 				} );
 		}
 	},
@@ -31235,10 +30982,7 @@ $.widget( "ui.tabs", {
 	_ajaxSettings: function( anchor, event, eventData ) {
 		var that = this;
 		return {
-
-			// Support: IE <11 only
-			// Strip any hash that exists to prevent errors with the Ajax request
-			url: anchor.attr( "href" ).replace( /#.*$/, "" ),
+			url: anchor.attr( "href" ),
 			beforeSend: function( jqXHR, settings ) {
 				return that._trigger( "beforeLoad", event,
 					$.extend( { jqXHR: jqXHR, ajaxSettings: settings }, eventData ) );
@@ -31248,13 +30992,13 @@ $.widget( "ui.tabs", {
 
 	_getPanelForTab: function( tab ) {
 		var id = $( tab ).attr( "aria-controls" );
-		return this.element.find( this._sanitizeSelector( "#" + id ) );
+		return this.element.find( "#" + CSS.escape( id ) );
 	}
 } );
 
 // DEPRECATED
 // TODO: Switch return back to widget declaration at top of file when this is removed
-if ( $.uiBackCompat !== false ) {
+if ( $.uiBackCompat === true ) {
 
 	// Backcompat for ui-tab class (now ui-tabs-tab)
 	$.widget( "ui.tabs", $.ui.tabs, {
@@ -31269,7 +31013,7 @@ var widgetsTabs = $.ui.tabs;
 
 
 /*!
- * jQuery UI Tooltip 1.13.3
+ * jQuery UI Tooltip 1.14.1
  * https://jqueryui.com
  *
  * Copyright OpenJS Foundation and other contributors
@@ -31288,7 +31032,7 @@ var widgetsTabs = $.ui.tabs;
 
 
 $.widget( "ui.tooltip", {
-	version: "1.13.3",
+	version: "1.14.1",
 	options: {
 		classes: {
 			"ui-tooltip": "ui-corner-all ui-widget-shadow"
@@ -31476,25 +31220,20 @@ $.widget( "ui.tooltip", {
 
 		content = contentOption.call( target[ 0 ], function( response ) {
 
-			// IE may instantly serve a cached response for ajax requests
-			// delay this call to _open so the other call to _open runs first
-			that._delay( function() {
+			// Ignore async response if tooltip was closed already
+			if ( !target.data( "ui-tooltip-open" ) ) {
+				return;
+			}
 
-				// Ignore async response if tooltip was closed already
-				if ( !target.data( "ui-tooltip-open" ) ) {
-					return;
-				}
-
-				// JQuery creates a special event for focusin when it doesn't
-				// exist natively. To improve performance, the native event
-				// object is reused and the type is changed. Therefore, we can't
-				// rely on the type being correct after the event finished
-				// bubbling, so we set it back to the previous value. (#8740)
-				if ( event ) {
-					event.type = eventType;
-				}
-				this._open( event, target, response );
-			} );
+			// JQuery creates a special event for focusin when it doesn't
+			// exist natively. To improve performance, the native event
+			// object is reused and the type is changed. Therefore, we can't
+			// rely on the type being correct after the event finished
+			// bubbling, so we set it back to the previous value. (#8740)
+			if ( event ) {
+				event.type = eventType;
+			}
+			that._open( event, target, response );
 		} );
 		if ( content ) {
 			this._open( event, target, content );
@@ -31754,7 +31493,7 @@ $.widget( "ui.tooltip", {
 
 // DEPRECATED
 // TODO: Switch return back to widget declaration at top of file when this is removed
-if ( $.uiBackCompat !== false ) {
+if ( $.uiBackCompat === true ) {
 
 	// Backcompat for tooltipClass option
 	$.widget( "ui.tooltip", $.ui.tooltip, {
@@ -54842,11 +54581,11 @@ return SignaturePad;
 }));
 
 /*!
- * jQuery Validation Plugin v1.20.0
+ * jQuery Validation Plugin v1.21.0
  *
  * https://jqueryvalidation.org/
  *
- * Copyright (c) 2023 Jörn Zaefferer
+ * Copyright (c) 2024 Jörn Zaefferer
  * Released under the MIT license
  */
 (function( factory ) {
@@ -55136,6 +54875,7 @@ $.extend( $.validator, {
 		onsubmit: true,
 		ignore: ":hidden",
 		ignoreTitle: false,
+		customElements: [],
 		onfocusin: function( element ) {
 			this.lastActive = element;
 
@@ -55283,17 +55023,17 @@ $.extend( $.validator, {
 					settings[ eventType ].call( validator, this, event );
 				}
 			}
-
+			var focusListeners = [ ":text", "[type='password']", "[type='file']", "select", "textarea", "[type='number']", "[type='search']",
+								"[type='tel']", "[type='url']", "[type='email']", "[type='datetime']", "[type='date']", "[type='month']",
+								"[type='week']", "[type='time']", "[type='datetime-local']", "[type='range']", "[type='color']",
+								"[type='radio']", "[type='checkbox']", "[contenteditable]", "[type='button']" ];
+			var clickListeners = [ "select", "option", "[type='radio']", "[type='checkbox']" ];
 			$( this.currentForm )
-				.on( "focusin.validate focusout.validate keyup.validate",
-					":text, [type='password'], [type='file'], select, textarea, [type='number'], [type='search'], " +
-					"[type='tel'], [type='url'], [type='email'], [type='datetime'], [type='date'], [type='month'], " +
-					"[type='week'], [type='time'], [type='datetime-local'], [type='range'], [type='color'], " +
-					"[type='radio'], [type='checkbox'], [contenteditable], [type='button']", delegate )
+				.on( "focusin.validate focusout.validate keyup.validate", focusListeners.concat( this.settings.customElements ).join( ", " ), delegate )
 
 				// Support: Chrome, oldIE
 				// "select" is provided as event.target when clicking a option
-				.on( "click.validate", "select, option, [type='radio'], [type='checkbox']", delegate );
+				.on( "click.validate", clickListeners.concat( this.settings.customElements ).join( ", " ), delegate );
 
 			if ( this.settings.invalidHandler ) {
 				$( this.currentForm ).on( "invalid-form.validate", this.settings.invalidHandler );
@@ -55490,11 +55230,12 @@ $.extend( $.validator, {
 
 		elements: function() {
 			var validator = this,
-				rulesCache = {};
+				rulesCache = {},
+				selectors = [ "input", "select", "textarea", "[contenteditable]" ];
 
 			// Select all valid inputs inside the form (no submit or reset buttons)
 			return $( this.currentForm )
-			.find( "input, select, textarea, [contenteditable]" )
+			.find( selectors.concat( this.settings.customElements ).join( ", " ) )
 			.not( ":submit, :reset, :image, :disabled" )
 			.not( this.settings.ignore )
 			.filter( function() {
@@ -56344,7 +56085,7 @@ $.extend( $.validator, {
 
 		// https://jqueryvalidation.org/number-method/
 		number: function( value, element ) {
-			return this.optional( element ) || /^(?:-?\d+|-?\d{1,3}(?:,\d{3})+)?(?:\.\d+)?$/.test( value );
+			return this.optional( element ) || /^(?:-?\d+|-?\d{1,3}(?:,\d{3})+)?(?:-?\.\d+)?$/.test( value );
 		},
 
 		// https://jqueryvalidation.org/digits-method/
@@ -56455,11 +56196,12 @@ $.extend( $.validator, {
 
 			param = typeof param === "string" && { url: param } || param;
 			optionDataString = $.param( $.extend( { data: value }, param.data ) );
-			if ( previous.old === optionDataString ) {
+			if ( previous.valid !== null && previous.old === optionDataString ) {
 				return previous.valid;
 			}
 
 			previous.old = optionDataString;
+			previous.valid = null;
 			validator = this;
 			this.startRequest( element );
 			data = {};
diff --git a/public/js/dist/all-defer.js b/public/js/dist/all-defer.js
index 7480ea7c6d..09559f9cb9 100644
--- a/public/js/dist/all-defer.js
+++ b/public/js/dist/all-defer.js
@@ -1,3381 +1 @@
-(() => {
-  // packages/alpinejs/src/scheduler.js
-  var flushPending = false;
-  var flushing = false;
-  var queue = [];
-  var lastFlushedIndex = -1;
-  function scheduler(callback) {
-    queueJob(callback);
-  }
-  function queueJob(job) {
-    if (!queue.includes(job))
-      queue.push(job);
-    queueFlush();
-  }
-  function dequeueJob(job) {
-    let index = queue.indexOf(job);
-    if (index !== -1 && index > lastFlushedIndex)
-      queue.splice(index, 1);
-  }
-  function queueFlush() {
-    if (!flushing && !flushPending) {
-      flushPending = true;
-      queueMicrotask(flushJobs);
-    }
-  }
-  function flushJobs() {
-    flushPending = false;
-    flushing = true;
-    for (let i = 0; i < queue.length; i++) {
-      queue[i]();
-      lastFlushedIndex = i;
-    }
-    queue.length = 0;
-    lastFlushedIndex = -1;
-    flushing = false;
-  }
-
-  // packages/alpinejs/src/reactivity.js
-  var reactive;
-  var effect;
-  var release;
-  var raw;
-  var shouldSchedule = true;
-  function disableEffectScheduling(callback) {
-    shouldSchedule = false;
-    callback();
-    shouldSchedule = true;
-  }
-  function setReactivityEngine(engine) {
-    reactive = engine.reactive;
-    release = engine.release;
-    effect = (callback) => engine.effect(callback, { scheduler: (task) => {
-      if (shouldSchedule) {
-        scheduler(task);
-      } else {
-        task();
-      }
-    } });
-    raw = engine.raw;
-  }
-  function overrideEffect(override) {
-    effect = override;
-  }
-  function elementBoundEffect(el) {
-    let cleanup2 = () => {
-    };
-    let wrappedEffect = (callback) => {
-      let effectReference = effect(callback);
-      if (!el._x_effects) {
-        el._x_effects = /* @__PURE__ */ new Set();
-        el._x_runEffects = () => {
-          el._x_effects.forEach((i) => i());
-        };
-      }
-      el._x_effects.add(effectReference);
-      cleanup2 = () => {
-        if (effectReference === void 0)
-          return;
-        el._x_effects.delete(effectReference);
-        release(effectReference);
-      };
-      return effectReference;
-    };
-    return [wrappedEffect, () => {
-      cleanup2();
-    }];
-  }
-  function watch(getter, callback) {
-    let firstTime = true;
-    let oldValue;
-    let effectReference = effect(() => {
-      let value = getter();
-      JSON.stringify(value);
-      if (!firstTime) {
-        queueMicrotask(() => {
-          callback(value, oldValue);
-          oldValue = value;
-        });
-      } else {
-        oldValue = value;
-      }
-      firstTime = false;
-    });
-    return () => release(effectReference);
-  }
-
-  // packages/alpinejs/src/mutation.js
-  var onAttributeAddeds = [];
-  var onElRemoveds = [];
-  var onElAddeds = [];
-  function onElAdded(callback) {
-    onElAddeds.push(callback);
-  }
-  function onElRemoved(el, callback) {
-    if (typeof callback === "function") {
-      if (!el._x_cleanups)
-        el._x_cleanups = [];
-      el._x_cleanups.push(callback);
-    } else {
-      callback = el;
-      onElRemoveds.push(callback);
-    }
-  }
-  function onAttributesAdded(callback) {
-    onAttributeAddeds.push(callback);
-  }
-  function onAttributeRemoved(el, name, callback) {
-    if (!el._x_attributeCleanups)
-      el._x_attributeCleanups = {};
-    if (!el._x_attributeCleanups[name])
-      el._x_attributeCleanups[name] = [];
-    el._x_attributeCleanups[name].push(callback);
-  }
-  function cleanupAttributes(el, names) {
-    if (!el._x_attributeCleanups)
-      return;
-    Object.entries(el._x_attributeCleanups).forEach(([name, value]) => {
-      if (names === void 0 || names.includes(name)) {
-        value.forEach((i) => i());
-        delete el._x_attributeCleanups[name];
-      }
-    });
-  }
-  function cleanupElement(el) {
-    if (el._x_cleanups) {
-      while (el._x_cleanups.length)
-        el._x_cleanups.pop()();
-    }
-  }
-  var observer = new MutationObserver(onMutate);
-  var currentlyObserving = false;
-  function startObservingMutations() {
-    observer.observe(document, { subtree: true, childList: true, attributes: true, attributeOldValue: true });
-    currentlyObserving = true;
-  }
-  function stopObservingMutations() {
-    flushObserver();
-    observer.disconnect();
-    currentlyObserving = false;
-  }
-  var queuedMutations = [];
-  function flushObserver() {
-    let records = observer.takeRecords();
-    queuedMutations.push(() => records.length > 0 && onMutate(records));
-    let queueLengthWhenTriggered = queuedMutations.length;
-    queueMicrotask(() => {
-      if (queuedMutations.length === queueLengthWhenTriggered) {
-        while (queuedMutations.length > 0)
-          queuedMutations.shift()();
-      }
-    });
-  }
-  function mutateDom(callback) {
-    if (!currentlyObserving)
-      return callback();
-    stopObservingMutations();
-    let result = callback();
-    startObservingMutations();
-    return result;
-  }
-  var isCollecting = false;
-  var deferredMutations = [];
-  function deferMutations() {
-    isCollecting = true;
-  }
-  function flushAndStopDeferringMutations() {
-    isCollecting = false;
-    onMutate(deferredMutations);
-    deferredMutations = [];
-  }
-  function onMutate(mutations) {
-    if (isCollecting) {
-      deferredMutations = deferredMutations.concat(mutations);
-      return;
-    }
-    let addedNodes = /* @__PURE__ */ new Set();
-    let removedNodes = /* @__PURE__ */ new Set();
-    let addedAttributes = /* @__PURE__ */ new Map();
-    let removedAttributes = /* @__PURE__ */ new Map();
-    for (let i = 0; i < mutations.length; i++) {
-      if (mutations[i].target._x_ignoreMutationObserver)
-        continue;
-      if (mutations[i].type === "childList") {
-        mutations[i].addedNodes.forEach((node) => node.nodeType === 1 && addedNodes.add(node));
-        mutations[i].removedNodes.forEach((node) => node.nodeType === 1 && removedNodes.add(node));
-      }
-      if (mutations[i].type === "attributes") {
-        let el = mutations[i].target;
-        let name = mutations[i].attributeName;
-        let oldValue = mutations[i].oldValue;
-        let add2 = () => {
-          if (!addedAttributes.has(el))
-            addedAttributes.set(el, []);
-          addedAttributes.get(el).push({ name, value: el.getAttribute(name) });
-        };
-        let remove = () => {
-          if (!removedAttributes.has(el))
-            removedAttributes.set(el, []);
-          removedAttributes.get(el).push(name);
-        };
-        if (el.hasAttribute(name) && oldValue === null) {
-          add2();
-        } else if (el.hasAttribute(name)) {
-          remove();
-          add2();
-        } else {
-          remove();
-        }
-      }
-    }
-    removedAttributes.forEach((attrs, el) => {
-      cleanupAttributes(el, attrs);
-    });
-    addedAttributes.forEach((attrs, el) => {
-      onAttributeAddeds.forEach((i) => i(el, attrs));
-    });
-    for (let node of removedNodes) {
-      if (addedNodes.has(node))
-        continue;
-      onElRemoveds.forEach((i) => i(node));
-    }
-    addedNodes.forEach((node) => {
-      node._x_ignoreSelf = true;
-      node._x_ignore = true;
-    });
-    for (let node of addedNodes) {
-      if (removedNodes.has(node))
-        continue;
-      if (!node.isConnected)
-        continue;
-      delete node._x_ignoreSelf;
-      delete node._x_ignore;
-      onElAddeds.forEach((i) => i(node));
-      node._x_ignore = true;
-      node._x_ignoreSelf = true;
-    }
-    addedNodes.forEach((node) => {
-      delete node._x_ignoreSelf;
-      delete node._x_ignore;
-    });
-    addedNodes = null;
-    removedNodes = null;
-    addedAttributes = null;
-    removedAttributes = null;
-  }
-
-  // packages/alpinejs/src/scope.js
-  function scope(node) {
-    return mergeProxies(closestDataStack(node));
-  }
-  function addScopeToNode(node, data2, referenceNode) {
-    node._x_dataStack = [data2, ...closestDataStack(referenceNode || node)];
-    return () => {
-      node._x_dataStack = node._x_dataStack.filter((i) => i !== data2);
-    };
-  }
-  function closestDataStack(node) {
-    if (node._x_dataStack)
-      return node._x_dataStack;
-    if (typeof ShadowRoot === "function" && node instanceof ShadowRoot) {
-      return closestDataStack(node.host);
-    }
-    if (!node.parentNode) {
-      return [];
-    }
-    return closestDataStack(node.parentNode);
-  }
-  function mergeProxies(objects) {
-    return new Proxy({ objects }, mergeProxyTrap);
-  }
-  var mergeProxyTrap = {
-    ownKeys({ objects }) {
-      return Array.from(
-        new Set(objects.flatMap((i) => Object.keys(i)))
-      );
-    },
-    has({ objects }, name) {
-      if (name == Symbol.unscopables)
-        return false;
-      return objects.some(
-        (obj) => Object.prototype.hasOwnProperty.call(obj, name) || Reflect.has(obj, name)
-      );
-    },
-    get({ objects }, name, thisProxy) {
-      if (name == "toJSON")
-        return collapseProxies;
-      return Reflect.get(
-        objects.find(
-          (obj) => Reflect.has(obj, name)
-        ) || {},
-        name,
-        thisProxy
-      );
-    },
-    set({ objects }, name, value, thisProxy) {
-      const target = objects.find(
-        (obj) => Object.prototype.hasOwnProperty.call(obj, name)
-      ) || objects[objects.length - 1];
-      const descriptor = Object.getOwnPropertyDescriptor(target, name);
-      if (descriptor?.set && descriptor?.get)
-        return Reflect.set(target, name, value, thisProxy);
-      return Reflect.set(target, name, value);
-    }
-  };
-  function collapseProxies() {
-    let keys = Reflect.ownKeys(this);
-    return keys.reduce((acc, key) => {
-      acc[key] = Reflect.get(this, key);
-      return acc;
-    }, {});
-  }
-
-  // packages/alpinejs/src/interceptor.js
-  function initInterceptors(data2) {
-    let isObject2 = (val) => typeof val === "object" && !Array.isArray(val) && val !== null;
-    let recurse = (obj, basePath = "") => {
-      Object.entries(Object.getOwnPropertyDescriptors(obj)).forEach(([key, { value, enumerable }]) => {
-        if (enumerable === false || value === void 0)
-          return;
-        if (typeof value === "object" && value !== null && value.__v_skip)
-          return;
-        let path = basePath === "" ? key : `${basePath}.${key}`;
-        if (typeof value === "object" && value !== null && value._x_interceptor) {
-          obj[key] = value.initialize(data2, path, key);
-        } else {
-          if (isObject2(value) && value !== obj && !(value instanceof Element)) {
-            recurse(value, path);
-          }
-        }
-      });
-    };
-    return recurse(data2);
-  }
-  function interceptor(callback, mutateObj = () => {
-  }) {
-    let obj = {
-      initialValue: void 0,
-      _x_interceptor: true,
-      initialize(data2, path, key) {
-        return callback(this.initialValue, () => get(data2, path), (value) => set(data2, path, value), path, key);
-      }
-    };
-    mutateObj(obj);
-    return (initialValue) => {
-      if (typeof initialValue === "object" && initialValue !== null && initialValue._x_interceptor) {
-        let initialize = obj.initialize.bind(obj);
-        obj.initialize = (data2, path, key) => {
-          let innerValue = initialValue.initialize(data2, path, key);
-          obj.initialValue = innerValue;
-          return initialize(data2, path, key);
-        };
-      } else {
-        obj.initialValue = initialValue;
-      }
-      return obj;
-    };
-  }
-  function get(obj, path) {
-    return path.split(".").reduce((carry, segment) => carry[segment], obj);
-  }
-  function set(obj, path, value) {
-    if (typeof path === "string")
-      path = path.split(".");
-    if (path.length === 1)
-      obj[path[0]] = value;
-    else if (path.length === 0)
-      throw error;
-    else {
-      if (obj[path[0]])
-        return set(obj[path[0]], path.slice(1), value);
-      else {
-        obj[path[0]] = {};
-        return set(obj[path[0]], path.slice(1), value);
-      }
-    }
-  }
-
-  // packages/alpinejs/src/magics.js
-  var magics = {};
-  function magic(name, callback) {
-    magics[name] = callback;
-  }
-  function injectMagics(obj, el) {
-    Object.entries(magics).forEach(([name, callback]) => {
-      let memoizedUtilities = null;
-      function getUtilities() {
-        if (memoizedUtilities) {
-          return memoizedUtilities;
-        } else {
-          let [utilities, cleanup2] = getElementBoundUtilities(el);
-          memoizedUtilities = { interceptor, ...utilities };
-          onElRemoved(el, cleanup2);
-          return memoizedUtilities;
-        }
-      }
-      Object.defineProperty(obj, `$${name}`, {
-        get() {
-          return callback(el, getUtilities());
-        },
-        enumerable: false
-      });
-    });
-    return obj;
-  }
-
-  // packages/alpinejs/src/utils/error.js
-  function tryCatch(el, expression, callback, ...args) {
-    try {
-      return callback(...args);
-    } catch (e) {
-      handleError(e, el, expression);
-    }
-  }
-  function handleError(error2, el, expression = void 0) {
-    error2 = Object.assign(
-      error2 ?? { message: "No error message given." },
-      { el, expression }
-    );
-    console.warn(`Alpine Expression Error: ${error2.message}
-
-${expression ? 'Expression: "' + expression + '"\n\n' : ""}`, el);
-    setTimeout(() => {
-      throw error2;
-    }, 0);
-  }
-
-  // packages/alpinejs/src/evaluator.js
-  var shouldAutoEvaluateFunctions = true;
-  function dontAutoEvaluateFunctions(callback) {
-    let cache = shouldAutoEvaluateFunctions;
-    shouldAutoEvaluateFunctions = false;
-    let result = callback();
-    shouldAutoEvaluateFunctions = cache;
-    return result;
-  }
-  function evaluate(el, expression, extras = {}) {
-    let result;
-    evaluateLater(el, expression)((value) => result = value, extras);
-    return result;
-  }
-  function evaluateLater(...args) {
-    return theEvaluatorFunction(...args);
-  }
-  var theEvaluatorFunction = normalEvaluator;
-  function setEvaluator(newEvaluator) {
-    theEvaluatorFunction = newEvaluator;
-  }
-  function normalEvaluator(el, expression) {
-    let overriddenMagics = {};
-    injectMagics(overriddenMagics, el);
-    let dataStack = [overriddenMagics, ...closestDataStack(el)];
-    let evaluator = typeof expression === "function" ? generateEvaluatorFromFunction(dataStack, expression) : generateEvaluatorFromString(dataStack, expression, el);
-    return tryCatch.bind(null, el, expression, evaluator);
-  }
-  function generateEvaluatorFromFunction(dataStack, func) {
-    return (receiver = () => {
-    }, { scope: scope2 = {}, params = [] } = {}) => {
-      let result = func.apply(mergeProxies([scope2, ...dataStack]), params);
-      runIfTypeOfFunction(receiver, result);
-    };
-  }
-  var evaluatorMemo = {};
-  function generateFunctionFromString(expression, el) {
-    if (evaluatorMemo[expression]) {
-      return evaluatorMemo[expression];
-    }
-    let AsyncFunction = Object.getPrototypeOf(async function() {
-    }).constructor;
-    let rightSideSafeExpression = /^[\n\s]*if.*\(.*\)/.test(expression.trim()) || /^(let|const)\s/.test(expression.trim()) ? `(async()=>{ ${expression} })()` : expression;
-    const safeAsyncFunction = () => {
-      try {
-        let func2 = new AsyncFunction(
-          ["__self", "scope"],
-          `with (scope) { __self.result = ${rightSideSafeExpression} }; __self.finished = true; return __self.result;`
-        );
-        Object.defineProperty(func2, "name", {
-          value: `[Alpine] ${expression}`
-        });
-        return func2;
-      } catch (error2) {
-        handleError(error2, el, expression);
-        return Promise.resolve();
-      }
-    };
-    let func = safeAsyncFunction();
-    evaluatorMemo[expression] = func;
-    return func;
-  }
-  function generateEvaluatorFromString(dataStack, expression, el) {
-    let func = generateFunctionFromString(expression, el);
-    return (receiver = () => {
-    }, { scope: scope2 = {}, params = [] } = {}) => {
-      func.result = void 0;
-      func.finished = false;
-      let completeScope = mergeProxies([scope2, ...dataStack]);
-      if (typeof func === "function") {
-        let promise = func(func, completeScope).catch((error2) => handleError(error2, el, expression));
-        if (func.finished) {
-          runIfTypeOfFunction(receiver, func.result, completeScope, params, el);
-          func.result = void 0;
-        } else {
-          promise.then((result) => {
-            runIfTypeOfFunction(receiver, result, completeScope, params, el);
-          }).catch((error2) => handleError(error2, el, expression)).finally(() => func.result = void 0);
-        }
-      }
-    };
-  }
-  function runIfTypeOfFunction(receiver, value, scope2, params, el) {
-    if (shouldAutoEvaluateFunctions && typeof value === "function") {
-      let result = value.apply(scope2, params);
-      if (result instanceof Promise) {
-        result.then((i) => runIfTypeOfFunction(receiver, i, scope2, params)).catch((error2) => handleError(error2, el, value));
-      } else {
-        receiver(result);
-      }
-    } else if (typeof value === "object" && value instanceof Promise) {
-      value.then((i) => receiver(i));
-    } else {
-      receiver(value);
-    }
-  }
-
-  // packages/alpinejs/src/directives.js
-  var prefixAsString = "x-";
-  function prefix(subject = "") {
-    return prefixAsString + subject;
-  }
-  function setPrefix(newPrefix) {
-    prefixAsString = newPrefix;
-  }
-  var directiveHandlers = {};
-  function directive(name, callback) {
-    directiveHandlers[name] = callback;
-    return {
-      before(directive2) {
-        if (!directiveHandlers[directive2]) {
-          console.warn(String.raw`Cannot find directive \`${directive2}\`. \`${name}\` will use the default order of execution`);
-          return;
-        }
-        const pos = directiveOrder.indexOf(directive2);
-        directiveOrder.splice(pos >= 0 ? pos : directiveOrder.indexOf("DEFAULT"), 0, name);
-      }
-    };
-  }
-  function directiveExists(name) {
-    return Object.keys(directiveHandlers).includes(name);
-  }
-  function directives(el, attributes, originalAttributeOverride) {
-    attributes = Array.from(attributes);
-    if (el._x_virtualDirectives) {
-      let vAttributes = Object.entries(el._x_virtualDirectives).map(([name, value]) => ({ name, value }));
-      let staticAttributes = attributesOnly(vAttributes);
-      vAttributes = vAttributes.map((attribute) => {
-        if (staticAttributes.find((attr) => attr.name === attribute.name)) {
-          return {
-            name: `x-bind:${attribute.name}`,
-            value: `"${attribute.value}"`
-          };
-        }
-        return attribute;
-      });
-      attributes = attributes.concat(vAttributes);
-    }
-    let transformedAttributeMap = {};
-    let directives2 = attributes.map(toTransformedAttributes((newName, oldName) => transformedAttributeMap[newName] = oldName)).filter(outNonAlpineAttributes).map(toParsedDirectives(transformedAttributeMap, originalAttributeOverride)).sort(byPriority);
-    return directives2.map((directive2) => {
-      return getDirectiveHandler(el, directive2);
-    });
-  }
-  function attributesOnly(attributes) {
-    return Array.from(attributes).map(toTransformedAttributes()).filter((attr) => !outNonAlpineAttributes(attr));
-  }
-  var isDeferringHandlers = false;
-  var directiveHandlerStacks = /* @__PURE__ */ new Map();
-  var currentHandlerStackKey = Symbol();
-  function deferHandlingDirectives(callback) {
-    isDeferringHandlers = true;
-    let key = Symbol();
-    currentHandlerStackKey = key;
-    directiveHandlerStacks.set(key, []);
-    let flushHandlers = () => {
-      while (directiveHandlerStacks.get(key).length)
-        directiveHandlerStacks.get(key).shift()();
-      directiveHandlerStacks.delete(key);
-    };
-    let stopDeferring = () => {
-      isDeferringHandlers = false;
-      flushHandlers();
-    };
-    callback(flushHandlers);
-    stopDeferring();
-  }
-  function getElementBoundUtilities(el) {
-    let cleanups = [];
-    let cleanup2 = (callback) => cleanups.push(callback);
-    let [effect3, cleanupEffect] = elementBoundEffect(el);
-    cleanups.push(cleanupEffect);
-    let utilities = {
-      Alpine: alpine_default,
-      effect: effect3,
-      cleanup: cleanup2,
-      evaluateLater: evaluateLater.bind(evaluateLater, el),
-      evaluate: evaluate.bind(evaluate, el)
-    };
-    let doCleanup = () => cleanups.forEach((i) => i());
-    return [utilities, doCleanup];
-  }
-  function getDirectiveHandler(el, directive2) {
-    let noop = () => {
-    };
-    let handler4 = directiveHandlers[directive2.type] || noop;
-    let [utilities, cleanup2] = getElementBoundUtilities(el);
-    onAttributeRemoved(el, directive2.original, cleanup2);
-    let fullHandler = () => {
-      if (el._x_ignore || el._x_ignoreSelf)
-        return;
-      handler4.inline && handler4.inline(el, directive2, utilities);
-      handler4 = handler4.bind(handler4, el, directive2, utilities);
-      isDeferringHandlers ? directiveHandlerStacks.get(currentHandlerStackKey).push(handler4) : handler4();
-    };
-    fullHandler.runCleanups = cleanup2;
-    return fullHandler;
-  }
-  var startingWith = (subject, replacement) => ({ name, value }) => {
-    if (name.startsWith(subject))
-      name = name.replace(subject, replacement);
-    return { name, value };
-  };
-  var into = (i) => i;
-  function toTransformedAttributes(callback = () => {
-  }) {
-    return ({ name, value }) => {
-      let { name: newName, value: newValue } = attributeTransformers.reduce((carry, transform) => {
-        return transform(carry);
-      }, { name, value });
-      if (newName !== name)
-        callback(newName, name);
-      return { name: newName, value: newValue };
-    };
-  }
-  var attributeTransformers = [];
-  function mapAttributes(callback) {
-    attributeTransformers.push(callback);
-  }
-  function outNonAlpineAttributes({ name }) {
-    return alpineAttributeRegex().test(name);
-  }
-  var alpineAttributeRegex = () => new RegExp(`^${prefixAsString}([^:^.]+)\\b`);
-  function toParsedDirectives(transformedAttributeMap, originalAttributeOverride) {
-    return ({ name, value }) => {
-      let typeMatch = name.match(alpineAttributeRegex());
-      let valueMatch = name.match(/:([a-zA-Z0-9\-_:]+)/);
-      let modifiers = name.match(/\.[^.\]]+(?=[^\]]*$)/g) || [];
-      let original = originalAttributeOverride || transformedAttributeMap[name] || name;
-      return {
-        type: typeMatch ? typeMatch[1] : null,
-        value: valueMatch ? valueMatch[1] : null,
-        modifiers: modifiers.map((i) => i.replace(".", "")),
-        expression: value,
-        original
-      };
-    };
-  }
-  var DEFAULT = "DEFAULT";
-  var directiveOrder = [
-    "ignore",
-    "ref",
-    "data",
-    "id",
-    "anchor",
-    "bind",
-    "init",
-    "for",
-    "model",
-    "modelable",
-    "transition",
-    "show",
-    "if",
-    DEFAULT,
-    "teleport"
-  ];
-  function byPriority(a, b) {
-    let typeA = directiveOrder.indexOf(a.type) === -1 ? DEFAULT : a.type;
-    let typeB = directiveOrder.indexOf(b.type) === -1 ? DEFAULT : b.type;
-    return directiveOrder.indexOf(typeA) - directiveOrder.indexOf(typeB);
-  }
-
-  // packages/alpinejs/src/utils/dispatch.js
-  function dispatch(el, name, detail = {}) {
-    el.dispatchEvent(
-      new CustomEvent(name, {
-        detail,
-        bubbles: true,
-        // Allows events to pass the shadow DOM barrier.
-        composed: true,
-        cancelable: true
-      })
-    );
-  }
-
-  // packages/alpinejs/src/utils/walk.js
-  function walk(el, callback) {
-    if (typeof ShadowRoot === "function" && el instanceof ShadowRoot) {
-      Array.from(el.children).forEach((el2) => walk(el2, callback));
-      return;
-    }
-    let skip = false;
-    callback(el, () => skip = true);
-    if (skip)
-      return;
-    let node = el.firstElementChild;
-    while (node) {
-      walk(node, callback, false);
-      node = node.nextElementSibling;
-    }
-  }
-
-  // packages/alpinejs/src/utils/warn.js
-  function warn(message, ...args) {
-    console.warn(`Alpine Warning: ${message}`, ...args);
-  }
-
-  // packages/alpinejs/src/lifecycle.js
-  var started = false;
-  function start() {
-    if (started)
-      warn("Alpine has already been initialized on this page. Calling Alpine.start() more than once can cause problems.");
-    started = true;
-    if (!document.body)
-      warn("Unable to initialize. Trying to load Alpine before `<body>` is available. Did you forget to add `defer` in Alpine's `<script>` tag?");
-    dispatch(document, "alpine:init");
-    dispatch(document, "alpine:initializing");
-    startObservingMutations();
-    onElAdded((el) => initTree(el, walk));
-    onElRemoved((el) => destroyTree(el));
-    onAttributesAdded((el, attrs) => {
-      directives(el, attrs).forEach((handle) => handle());
-    });
-    let outNestedComponents = (el) => !closestRoot(el.parentElement, true);
-    Array.from(document.querySelectorAll(allSelectors().join(","))).filter(outNestedComponents).forEach((el) => {
-      initTree(el);
-    });
-    dispatch(document, "alpine:initialized");
-    setTimeout(() => {
-      warnAboutMissingPlugins();
-    });
-  }
-  var rootSelectorCallbacks = [];
-  var initSelectorCallbacks = [];
-  function rootSelectors() {
-    return rootSelectorCallbacks.map((fn) => fn());
-  }
-  function allSelectors() {
-    return rootSelectorCallbacks.concat(initSelectorCallbacks).map((fn) => fn());
-  }
-  function addRootSelector(selectorCallback) {
-    rootSelectorCallbacks.push(selectorCallback);
-  }
-  function addInitSelector(selectorCallback) {
-    initSelectorCallbacks.push(selectorCallback);
-  }
-  function closestRoot(el, includeInitSelectors = false) {
-    return findClosest(el, (element) => {
-      const selectors = includeInitSelectors ? allSelectors() : rootSelectors();
-      if (selectors.some((selector) => element.matches(selector)))
-        return true;
-    });
-  }
-  function findClosest(el, callback) {
-    if (!el)
-      return;
-    if (callback(el))
-      return el;
-    if (el._x_teleportBack)
-      el = el._x_teleportBack;
-    if (!el.parentElement)
-      return;
-    return findClosest(el.parentElement, callback);
-  }
-  function isRoot(el) {
-    return rootSelectors().some((selector) => el.matches(selector));
-  }
-  var initInterceptors2 = [];
-  function interceptInit(callback) {
-    initInterceptors2.push(callback);
-  }
-  function initTree(el, walker = walk, intercept = () => {
-  }) {
-    deferHandlingDirectives(() => {
-      walker(el, (el2, skip) => {
-        intercept(el2, skip);
-        initInterceptors2.forEach((i) => i(el2, skip));
-        directives(el2, el2.attributes).forEach((handle) => handle());
-        el2._x_ignore && skip();
-      });
-    });
-  }
-  function destroyTree(root, walker = walk) {
-    walker(root, (el) => {
-      cleanupAttributes(el);
-      cleanupElement(el);
-    });
-  }
-  function warnAboutMissingPlugins() {
-    let pluginDirectives = [
-      ["ui", "dialog", ["[x-dialog], [x-popover]"]],
-      ["anchor", "anchor", ["[x-anchor]"]],
-      ["sort", "sort", ["[x-sort]"]]
-    ];
-    pluginDirectives.forEach(([plugin2, directive2, selectors]) => {
-      if (directiveExists(directive2))
-        return;
-      selectors.some((selector) => {
-        if (document.querySelector(selector)) {
-          warn(`found "${selector}", but missing ${plugin2} plugin`);
-          return true;
-        }
-      });
-    });
-  }
-
-  // packages/alpinejs/src/nextTick.js
-  var tickStack = [];
-  var isHolding = false;
-  function nextTick(callback = () => {
-  }) {
-    queueMicrotask(() => {
-      isHolding || setTimeout(() => {
-        releaseNextTicks();
-      });
-    });
-    return new Promise((res) => {
-      tickStack.push(() => {
-        callback();
-        res();
-      });
-    });
-  }
-  function releaseNextTicks() {
-    isHolding = false;
-    while (tickStack.length)
-      tickStack.shift()();
-  }
-  function holdNextTicks() {
-    isHolding = true;
-  }
-
-  // packages/alpinejs/src/utils/classes.js
-  function setClasses(el, value) {
-    if (Array.isArray(value)) {
-      return setClassesFromString(el, value.join(" "));
-    } else if (typeof value === "object" && value !== null) {
-      return setClassesFromObject(el, value);
-    } else if (typeof value === "function") {
-      return setClasses(el, value());
-    }
-    return setClassesFromString(el, value);
-  }
-  function setClassesFromString(el, classString) {
-    let split = (classString2) => classString2.split(" ").filter(Boolean);
-    let missingClasses = (classString2) => classString2.split(" ").filter((i) => !el.classList.contains(i)).filter(Boolean);
-    let addClassesAndReturnUndo = (classes) => {
-      el.classList.add(...classes);
-      return () => {
-        el.classList.remove(...classes);
-      };
-    };
-    classString = classString === true ? classString = "" : classString || "";
-    return addClassesAndReturnUndo(missingClasses(classString));
-  }
-  function setClassesFromObject(el, classObject) {
-    let split = (classString) => classString.split(" ").filter(Boolean);
-    let forAdd = Object.entries(classObject).flatMap(([classString, bool]) => bool ? split(classString) : false).filter(Boolean);
-    let forRemove = Object.entries(classObject).flatMap(([classString, bool]) => !bool ? split(classString) : false).filter(Boolean);
-    let added = [];
-    let removed = [];
-    forRemove.forEach((i) => {
-      if (el.classList.contains(i)) {
-        el.classList.remove(i);
-        removed.push(i);
-      }
-    });
-    forAdd.forEach((i) => {
-      if (!el.classList.contains(i)) {
-        el.classList.add(i);
-        added.push(i);
-      }
-    });
-    return () => {
-      removed.forEach((i) => el.classList.add(i));
-      added.forEach((i) => el.classList.remove(i));
-    };
-  }
-
-  // packages/alpinejs/src/utils/styles.js
-  function setStyles(el, value) {
-    if (typeof value === "object" && value !== null) {
-      return setStylesFromObject(el, value);
-    }
-    return setStylesFromString(el, value);
-  }
-  function setStylesFromObject(el, value) {
-    let previousStyles = {};
-    Object.entries(value).forEach(([key, value2]) => {
-      previousStyles[key] = el.style[key];
-      if (!key.startsWith("--")) {
-        key = kebabCase(key);
-      }
-      el.style.setProperty(key, value2);
-    });
-    setTimeout(() => {
-      if (el.style.length === 0) {
-        el.removeAttribute("style");
-      }
-    });
-    return () => {
-      setStyles(el, previousStyles);
-    };
-  }
-  function setStylesFromString(el, value) {
-    let cache = el.getAttribute("style", value);
-    el.setAttribute("style", value);
-    return () => {
-      el.setAttribute("style", cache || "");
-    };
-  }
-  function kebabCase(subject) {
-    return subject.replace(/([a-z])([A-Z])/g, "$1-$2").toLowerCase();
-  }
-
-  // packages/alpinejs/src/utils/once.js
-  function once(callback, fallback = () => {
-  }) {
-    let called = false;
-    return function() {
-      if (!called) {
-        called = true;
-        callback.apply(this, arguments);
-      } else {
-        fallback.apply(this, arguments);
-      }
-    };
-  }
-
-  // packages/alpinejs/src/directives/x-transition.js
-  directive("transition", (el, { value, modifiers, expression }, { evaluate: evaluate2 }) => {
-    if (typeof expression === "function")
-      expression = evaluate2(expression);
-    if (expression === false)
-      return;
-    if (!expression || typeof expression === "boolean") {
-      registerTransitionsFromHelper(el, modifiers, value);
-    } else {
-      registerTransitionsFromClassString(el, expression, value);
-    }
-  });
-  function registerTransitionsFromClassString(el, classString, stage) {
-    registerTransitionObject(el, setClasses, "");
-    let directiveStorageMap = {
-      "enter": (classes) => {
-        el._x_transition.enter.during = classes;
-      },
-      "enter-start": (classes) => {
-        el._x_transition.enter.start = classes;
-      },
-      "enter-end": (classes) => {
-        el._x_transition.enter.end = classes;
-      },
-      "leave": (classes) => {
-        el._x_transition.leave.during = classes;
-      },
-      "leave-start": (classes) => {
-        el._x_transition.leave.start = classes;
-      },
-      "leave-end": (classes) => {
-        el._x_transition.leave.end = classes;
-      }
-    };
-    directiveStorageMap[stage](classString);
-  }
-  function registerTransitionsFromHelper(el, modifiers, stage) {
-    registerTransitionObject(el, setStyles);
-    let doesntSpecify = !modifiers.includes("in") && !modifiers.includes("out") && !stage;
-    let transitioningIn = doesntSpecify || modifiers.includes("in") || ["enter"].includes(stage);
-    let transitioningOut = doesntSpecify || modifiers.includes("out") || ["leave"].includes(stage);
-    if (modifiers.includes("in") && !doesntSpecify) {
-      modifiers = modifiers.filter((i, index) => index < modifiers.indexOf("out"));
-    }
-    if (modifiers.includes("out") && !doesntSpecify) {
-      modifiers = modifiers.filter((i, index) => index > modifiers.indexOf("out"));
-    }
-    let wantsAll = !modifiers.includes("opacity") && !modifiers.includes("scale");
-    let wantsOpacity = wantsAll || modifiers.includes("opacity");
-    let wantsScale = wantsAll || modifiers.includes("scale");
-    let opacityValue = wantsOpacity ? 0 : 1;
-    let scaleValue = wantsScale ? modifierValue(modifiers, "scale", 95) / 100 : 1;
-    let delay = modifierValue(modifiers, "delay", 0) / 1e3;
-    let origin = modifierValue(modifiers, "origin", "center");
-    let property = "opacity, transform";
-    let durationIn = modifierValue(modifiers, "duration", 150) / 1e3;
-    let durationOut = modifierValue(modifiers, "duration", 75) / 1e3;
-    let easing = `cubic-bezier(0.4, 0.0, 0.2, 1)`;
-    if (transitioningIn) {
-      el._x_transition.enter.during = {
-        transformOrigin: origin,
-        transitionDelay: `${delay}s`,
-        transitionProperty: property,
-        transitionDuration: `${durationIn}s`,
-        transitionTimingFunction: easing
-      };
-      el._x_transition.enter.start = {
-        opacity: opacityValue,
-        transform: `scale(${scaleValue})`
-      };
-      el._x_transition.enter.end = {
-        opacity: 1,
-        transform: `scale(1)`
-      };
-    }
-    if (transitioningOut) {
-      el._x_transition.leave.during = {
-        transformOrigin: origin,
-        transitionDelay: `${delay}s`,
-        transitionProperty: property,
-        transitionDuration: `${durationOut}s`,
-        transitionTimingFunction: easing
-      };
-      el._x_transition.leave.start = {
-        opacity: 1,
-        transform: `scale(1)`
-      };
-      el._x_transition.leave.end = {
-        opacity: opacityValue,
-        transform: `scale(${scaleValue})`
-      };
-    }
-  }
-  function registerTransitionObject(el, setFunction, defaultValue = {}) {
-    if (!el._x_transition)
-      el._x_transition = {
-        enter: { during: defaultValue, start: defaultValue, end: defaultValue },
-        leave: { during: defaultValue, start: defaultValue, end: defaultValue },
-        in(before = () => {
-        }, after = () => {
-        }) {
-          transition(el, setFunction, {
-            during: this.enter.during,
-            start: this.enter.start,
-            end: this.enter.end
-          }, before, after);
-        },
-        out(before = () => {
-        }, after = () => {
-        }) {
-          transition(el, setFunction, {
-            during: this.leave.during,
-            start: this.leave.start,
-            end: this.leave.end
-          }, before, after);
-        }
-      };
-  }
-  window.Element.prototype._x_toggleAndCascadeWithTransitions = function(el, value, show, hide) {
-    const nextTick2 = document.visibilityState === "visible" ? requestAnimationFrame : setTimeout;
-    let clickAwayCompatibleShow = () => nextTick2(show);
-    if (value) {
-      if (el._x_transition && (el._x_transition.enter || el._x_transition.leave)) {
-        el._x_transition.enter && (Object.entries(el._x_transition.enter.during).length || Object.entries(el._x_transition.enter.start).length || Object.entries(el._x_transition.enter.end).length) ? el._x_transition.in(show) : clickAwayCompatibleShow();
-      } else {
-        el._x_transition ? el._x_transition.in(show) : clickAwayCompatibleShow();
-      }
-      return;
-    }
-    el._x_hidePromise = el._x_transition ? new Promise((resolve, reject) => {
-      el._x_transition.out(() => {
-      }, () => resolve(hide));
-      el._x_transitioning && el._x_transitioning.beforeCancel(() => reject({ isFromCancelledTransition: true }));
-    }) : Promise.resolve(hide);
-    queueMicrotask(() => {
-      let closest = closestHide(el);
-      if (closest) {
-        if (!closest._x_hideChildren)
-          closest._x_hideChildren = [];
-        closest._x_hideChildren.push(el);
-      } else {
-        nextTick2(() => {
-          let hideAfterChildren = (el2) => {
-            let carry = Promise.all([
-              el2._x_hidePromise,
-              ...(el2._x_hideChildren || []).map(hideAfterChildren)
-            ]).then(([i]) => i());
-            delete el2._x_hidePromise;
-            delete el2._x_hideChildren;
-            return carry;
-          };
-          hideAfterChildren(el).catch((e) => {
-            if (!e.isFromCancelledTransition)
-              throw e;
-          });
-        });
-      }
-    });
-  };
-  function closestHide(el) {
-    let parent = el.parentNode;
-    if (!parent)
-      return;
-    return parent._x_hidePromise ? parent : closestHide(parent);
-  }
-  function transition(el, setFunction, { during, start: start2, end } = {}, before = () => {
-  }, after = () => {
-  }) {
-    if (el._x_transitioning)
-      el._x_transitioning.cancel();
-    if (Object.keys(during).length === 0 && Object.keys(start2).length === 0 && Object.keys(end).length === 0) {
-      before();
-      after();
-      return;
-    }
-    let undoStart, undoDuring, undoEnd;
-    performTransition(el, {
-      start() {
-        undoStart = setFunction(el, start2);
-      },
-      during() {
-        undoDuring = setFunction(el, during);
-      },
-      before,
-      end() {
-        undoStart();
-        undoEnd = setFunction(el, end);
-      },
-      after,
-      cleanup() {
-        undoDuring();
-        undoEnd();
-      }
-    });
-  }
-  function performTransition(el, stages) {
-    let interrupted, reachedBefore, reachedEnd;
-    let finish = once(() => {
-      mutateDom(() => {
-        interrupted = true;
-        if (!reachedBefore)
-          stages.before();
-        if (!reachedEnd) {
-          stages.end();
-          releaseNextTicks();
-        }
-        stages.after();
-        if (el.isConnected)
-          stages.cleanup();
-        delete el._x_transitioning;
-      });
-    });
-    el._x_transitioning = {
-      beforeCancels: [],
-      beforeCancel(callback) {
-        this.beforeCancels.push(callback);
-      },
-      cancel: once(function() {
-        while (this.beforeCancels.length) {
-          this.beforeCancels.shift()();
-        }
-        ;
-        finish();
-      }),
-      finish
-    };
-    mutateDom(() => {
-      stages.start();
-      stages.during();
-    });
-    holdNextTicks();
-    requestAnimationFrame(() => {
-      if (interrupted)
-        return;
-      let duration = Number(getComputedStyle(el).transitionDuration.replace(/,.*/, "").replace("s", "")) * 1e3;
-      let delay = Number(getComputedStyle(el).transitionDelay.replace(/,.*/, "").replace("s", "")) * 1e3;
-      if (duration === 0)
-        duration = Number(getComputedStyle(el).animationDuration.replace("s", "")) * 1e3;
-      mutateDom(() => {
-        stages.before();
-      });
-      reachedBefore = true;
-      requestAnimationFrame(() => {
-        if (interrupted)
-          return;
-        mutateDom(() => {
-          stages.end();
-        });
-        releaseNextTicks();
-        setTimeout(el._x_transitioning.finish, duration + delay);
-        reachedEnd = true;
-      });
-    });
-  }
-  function modifierValue(modifiers, key, fallback) {
-    if (modifiers.indexOf(key) === -1)
-      return fallback;
-    const rawValue = modifiers[modifiers.indexOf(key) + 1];
-    if (!rawValue)
-      return fallback;
-    if (key === "scale") {
-      if (isNaN(rawValue))
-        return fallback;
-    }
-    if (key === "duration" || key === "delay") {
-      let match = rawValue.match(/([0-9]+)ms/);
-      if (match)
-        return match[1];
-    }
-    if (key === "origin") {
-      if (["top", "right", "left", "center", "bottom"].includes(modifiers[modifiers.indexOf(key) + 2])) {
-        return [rawValue, modifiers[modifiers.indexOf(key) + 2]].join(" ");
-      }
-    }
-    return rawValue;
-  }
-
-  // packages/alpinejs/src/clone.js
-  var isCloning = false;
-  function skipDuringClone(callback, fallback = () => {
-  }) {
-    return (...args) => isCloning ? fallback(...args) : callback(...args);
-  }
-  function onlyDuringClone(callback) {
-    return (...args) => isCloning && callback(...args);
-  }
-  var interceptors = [];
-  function interceptClone(callback) {
-    interceptors.push(callback);
-  }
-  function cloneNode(from, to) {
-    interceptors.forEach((i) => i(from, to));
-    isCloning = true;
-    dontRegisterReactiveSideEffects(() => {
-      initTree(to, (el, callback) => {
-        callback(el, () => {
-        });
-      });
-    });
-    isCloning = false;
-  }
-  var isCloningLegacy = false;
-  function clone(oldEl, newEl) {
-    if (!newEl._x_dataStack)
-      newEl._x_dataStack = oldEl._x_dataStack;
-    isCloning = true;
-    isCloningLegacy = true;
-    dontRegisterReactiveSideEffects(() => {
-      cloneTree(newEl);
-    });
-    isCloning = false;
-    isCloningLegacy = false;
-  }
-  function cloneTree(el) {
-    let hasRunThroughFirstEl = false;
-    let shallowWalker = (el2, callback) => {
-      walk(el2, (el3, skip) => {
-        if (hasRunThroughFirstEl && isRoot(el3))
-          return skip();
-        hasRunThroughFirstEl = true;
-        callback(el3, skip);
-      });
-    };
-    initTree(el, shallowWalker);
-  }
-  function dontRegisterReactiveSideEffects(callback) {
-    let cache = effect;
-    overrideEffect((callback2, el) => {
-      let storedEffect = cache(callback2);
-      release(storedEffect);
-      return () => {
-      };
-    });
-    callback();
-    overrideEffect(cache);
-  }
-
-  // packages/alpinejs/src/utils/bind.js
-  function bind(el, name, value, modifiers = []) {
-    if (!el._x_bindings)
-      el._x_bindings = reactive({});
-    el._x_bindings[name] = value;
-    name = modifiers.includes("camel") ? camelCase(name) : name;
-    switch (name) {
-      case "value":
-        bindInputValue(el, value);
-        break;
-      case "style":
-        bindStyles(el, value);
-        break;
-      case "class":
-        bindClasses(el, value);
-        break;
-      case "selected":
-      case "checked":
-        bindAttributeAndProperty(el, name, value);
-        break;
-      default:
-        bindAttribute(el, name, value);
-        break;
-    }
-  }
-  function bindInputValue(el, value) {
-    if (el.type === "radio") {
-      if (el.attributes.value === void 0) {
-        el.value = value;
-      }
-      if (window.fromModel) {
-        if (typeof value === "boolean") {
-          el.checked = safeParseBoolean(el.value) === value;
-        } else {
-          el.checked = checkedAttrLooseCompare(el.value, value);
-        }
-      }
-    } else if (el.type === "checkbox") {
-      if (Number.isInteger(value)) {
-        el.value = value;
-      } else if (!Array.isArray(value) && typeof value !== "boolean" && ![null, void 0].includes(value)) {
-        el.value = String(value);
-      } else {
-        if (Array.isArray(value)) {
-          el.checked = value.some((val) => checkedAttrLooseCompare(val, el.value));
-        } else {
-          el.checked = !!value;
-        }
-      }
-    } else if (el.tagName === "SELECT") {
-      updateSelect(el, value);
-    } else {
-      if (el.value === value)
-        return;
-      el.value = value === void 0 ? "" : value;
-    }
-  }
-  function bindClasses(el, value) {
-    if (el._x_undoAddedClasses)
-      el._x_undoAddedClasses();
-    el._x_undoAddedClasses = setClasses(el, value);
-  }
-  function bindStyles(el, value) {
-    if (el._x_undoAddedStyles)
-      el._x_undoAddedStyles();
-    el._x_undoAddedStyles = setStyles(el, value);
-  }
-  function bindAttributeAndProperty(el, name, value) {
-    bindAttribute(el, name, value);
-    setPropertyIfChanged(el, name, value);
-  }
-  function bindAttribute(el, name, value) {
-    if ([null, void 0, false].includes(value) && attributeShouldntBePreservedIfFalsy(name)) {
-      el.removeAttribute(name);
-    } else {
-      if (isBooleanAttr(name))
-        value = name;
-      setIfChanged(el, name, value);
-    }
-  }
-  function setIfChanged(el, attrName, value) {
-    if (el.getAttribute(attrName) != value) {
-      el.setAttribute(attrName, value);
-    }
-  }
-  function setPropertyIfChanged(el, propName, value) {
-    if (el[propName] !== value) {
-      el[propName] = value;
-    }
-  }
-  function updateSelect(el, value) {
-    const arrayWrappedValue = [].concat(value).map((value2) => {
-      return value2 + "";
-    });
-    Array.from(el.options).forEach((option) => {
-      option.selected = arrayWrappedValue.includes(option.value);
-    });
-  }
-  function camelCase(subject) {
-    return subject.toLowerCase().replace(/-(\w)/g, (match, char) => char.toUpperCase());
-  }
-  function checkedAttrLooseCompare(valueA, valueB) {
-    return valueA == valueB;
-  }
-  function safeParseBoolean(rawValue) {
-    if ([1, "1", "true", "on", "yes", true].includes(rawValue)) {
-      return true;
-    }
-    if ([0, "0", "false", "off", "no", false].includes(rawValue)) {
-      return false;
-    }
-    return rawValue ? Boolean(rawValue) : null;
-  }
-  function isBooleanAttr(attrName) {
-    const booleanAttributes = [
-      "disabled",
-      "checked",
-      "required",
-      "readonly",
-      "open",
-      "selected",
-      "autofocus",
-      "itemscope",
-      "multiple",
-      "novalidate",
-      "allowfullscreen",
-      "allowpaymentrequest",
-      "formnovalidate",
-      "autoplay",
-      "controls",
-      "loop",
-      "muted",
-      "playsinline",
-      "default",
-      "ismap",
-      "reversed",
-      "async",
-      "defer",
-      "nomodule"
-    ];
-    return booleanAttributes.includes(attrName);
-  }
-  function attributeShouldntBePreservedIfFalsy(name) {
-    return !["aria-pressed", "aria-checked", "aria-expanded", "aria-selected"].includes(name);
-  }
-  function getBinding(el, name, fallback) {
-    if (el._x_bindings && el._x_bindings[name] !== void 0)
-      return el._x_bindings[name];
-    return getAttributeBinding(el, name, fallback);
-  }
-  function extractProp(el, name, fallback, extract = true) {
-    if (el._x_bindings && el._x_bindings[name] !== void 0)
-      return el._x_bindings[name];
-    if (el._x_inlineBindings && el._x_inlineBindings[name] !== void 0) {
-      let binding = el._x_inlineBindings[name];
-      binding.extract = extract;
-      return dontAutoEvaluateFunctions(() => {
-        return evaluate(el, binding.expression);
-      });
-    }
-    return getAttributeBinding(el, name, fallback);
-  }
-  function getAttributeBinding(el, name, fallback) {
-    let attr = el.getAttribute(name);
-    if (attr === null)
-      return typeof fallback === "function" ? fallback() : fallback;
-    if (attr === "")
-      return true;
-    if (isBooleanAttr(name)) {
-      return !![name, "true"].includes(attr);
-    }
-    return attr;
-  }
-
-  // packages/alpinejs/src/utils/debounce.js
-  function debounce(func, wait) {
-    var timeout;
-    return function() {
-      var context = this, args = arguments;
-      var later = function() {
-        timeout = null;
-        func.apply(context, args);
-      };
-      clearTimeout(timeout);
-      timeout = setTimeout(later, wait);
-    };
-  }
-
-  // packages/alpinejs/src/utils/throttle.js
-  function throttle(func, limit) {
-    let inThrottle;
-    return function() {
-      let context = this, args = arguments;
-      if (!inThrottle) {
-        func.apply(context, args);
-        inThrottle = true;
-        setTimeout(() => inThrottle = false, limit);
-      }
-    };
-  }
-
-  // packages/alpinejs/src/entangle.js
-  function entangle({ get: outerGet, set: outerSet }, { get: innerGet, set: innerSet }) {
-    let firstRun = true;
-    let outerHash;
-    let innerHash;
-    let reference = effect(() => {
-      let outer = outerGet();
-      let inner = innerGet();
-      if (firstRun) {
-        innerSet(cloneIfObject(outer));
-        firstRun = false;
-      } else {
-        let outerHashLatest = JSON.stringify(outer);
-        let innerHashLatest = JSON.stringify(inner);
-        if (outerHashLatest !== outerHash) {
-          innerSet(cloneIfObject(outer));
-        } else if (outerHashLatest !== innerHashLatest) {
-          outerSet(cloneIfObject(inner));
-        } else {
-        }
-      }
-      outerHash = JSON.stringify(outerGet());
-      innerHash = JSON.stringify(innerGet());
-    });
-    return () => {
-      release(reference);
-    };
-  }
-  function cloneIfObject(value) {
-    return typeof value === "object" ? JSON.parse(JSON.stringify(value)) : value;
-  }
-
-  // packages/alpinejs/src/plugin.js
-  function plugin(callback) {
-    let callbacks = Array.isArray(callback) ? callback : [callback];
-    callbacks.forEach((i) => i(alpine_default));
-  }
-
-  // packages/alpinejs/src/store.js
-  var stores = {};
-  var isReactive = false;
-  function store(name, value) {
-    if (!isReactive) {
-      stores = reactive(stores);
-      isReactive = true;
-    }
-    if (value === void 0) {
-      return stores[name];
-    }
-    stores[name] = value;
-    if (typeof value === "object" && value !== null && value.hasOwnProperty("init") && typeof value.init === "function") {
-      stores[name].init();
-    }
-    initInterceptors(stores[name]);
-  }
-  function getStores() {
-    return stores;
-  }
-
-  // packages/alpinejs/src/binds.js
-  var binds = {};
-  function bind2(name, bindings) {
-    let getBindings = typeof bindings !== "function" ? () => bindings : bindings;
-    if (name instanceof Element) {
-      return applyBindingsObject(name, getBindings());
-    } else {
-      binds[name] = getBindings;
-    }
-    return () => {
-    };
-  }
-  function injectBindingProviders(obj) {
-    Object.entries(binds).forEach(([name, callback]) => {
-      Object.defineProperty(obj, name, {
-        get() {
-          return (...args) => {
-            return callback(...args);
-          };
-        }
-      });
-    });
-    return obj;
-  }
-  function applyBindingsObject(el, obj, original) {
-    let cleanupRunners = [];
-    while (cleanupRunners.length)
-      cleanupRunners.pop()();
-    let attributes = Object.entries(obj).map(([name, value]) => ({ name, value }));
-    let staticAttributes = attributesOnly(attributes);
-    attributes = attributes.map((attribute) => {
-      if (staticAttributes.find((attr) => attr.name === attribute.name)) {
-        return {
-          name: `x-bind:${attribute.name}`,
-          value: `"${attribute.value}"`
-        };
-      }
-      return attribute;
-    });
-    directives(el, attributes, original).map((handle) => {
-      cleanupRunners.push(handle.runCleanups);
-      handle();
-    });
-    return () => {
-      while (cleanupRunners.length)
-        cleanupRunners.pop()();
-    };
-  }
-
-  // packages/alpinejs/src/datas.js
-  var datas = {};
-  function data(name, callback) {
-    datas[name] = callback;
-  }
-  function injectDataProviders(obj, context) {
-    Object.entries(datas).forEach(([name, callback]) => {
-      Object.defineProperty(obj, name, {
-        get() {
-          return (...args) => {
-            return callback.bind(context)(...args);
-          };
-        },
-        enumerable: false
-      });
-    });
-    return obj;
-  }
-
-  // packages/alpinejs/src/alpine.js
-  var Alpine = {
-    get reactive() {
-      return reactive;
-    },
-    get release() {
-      return release;
-    },
-    get effect() {
-      return effect;
-    },
-    get raw() {
-      return raw;
-    },
-    version: "3.13.10",
-    flushAndStopDeferringMutations,
-    dontAutoEvaluateFunctions,
-    disableEffectScheduling,
-    startObservingMutations,
-    stopObservingMutations,
-    setReactivityEngine,
-    onAttributeRemoved,
-    onAttributesAdded,
-    closestDataStack,
-    skipDuringClone,
-    onlyDuringClone,
-    addRootSelector,
-    addInitSelector,
-    interceptClone,
-    addScopeToNode,
-    deferMutations,
-    mapAttributes,
-    evaluateLater,
-    interceptInit,
-    setEvaluator,
-    mergeProxies,
-    extractProp,
-    findClosest,
-    onElRemoved,
-    closestRoot,
-    destroyTree,
-    interceptor,
-    // INTERNAL: not public API and is subject to change without major release.
-    transition,
-    // INTERNAL
-    setStyles,
-    // INTERNAL
-    mutateDom,
-    directive,
-    entangle,
-    throttle,
-    debounce,
-    evaluate,
-    initTree,
-    nextTick,
-    prefixed: prefix,
-    prefix: setPrefix,
-    plugin,
-    magic,
-    store,
-    start,
-    clone,
-    // INTERNAL
-    cloneNode,
-    // INTERNAL
-    bound: getBinding,
-    $data: scope,
-    watch,
-    walk,
-    data,
-    bind: bind2
-  };
-  var alpine_default = Alpine;
-
-  // node_modules/@vue/shared/dist/shared.esm-bundler.js
-  function makeMap(str, expectsLowerCase) {
-    const map = /* @__PURE__ */ Object.create(null);
-    const list = str.split(",");
-    for (let i = 0; i < list.length; i++) {
-      map[list[i]] = true;
-    }
-    return expectsLowerCase ? (val) => !!map[val.toLowerCase()] : (val) => !!map[val];
-  }
-  var specialBooleanAttrs = `itemscope,allowfullscreen,formnovalidate,ismap,nomodule,novalidate,readonly`;
-  var isBooleanAttr2 = /* @__PURE__ */ makeMap(specialBooleanAttrs + `,async,autofocus,autoplay,controls,default,defer,disabled,hidden,loop,open,required,reversed,scoped,seamless,checked,muted,multiple,selected`);
-  var EMPTY_OBJ = true ? Object.freeze({}) : {};
-  var EMPTY_ARR = true ? Object.freeze([]) : [];
-  var hasOwnProperty = Object.prototype.hasOwnProperty;
-  var hasOwn = (val, key) => hasOwnProperty.call(val, key);
-  var isArray = Array.isArray;
-  var isMap = (val) => toTypeString(val) === "[object Map]";
-  var isString = (val) => typeof val === "string";
-  var isSymbol = (val) => typeof val === "symbol";
-  var isObject = (val) => val !== null && typeof val === "object";
-  var objectToString = Object.prototype.toString;
-  var toTypeString = (value) => objectToString.call(value);
-  var toRawType = (value) => {
-    return toTypeString(value).slice(8, -1);
-  };
-  var isIntegerKey = (key) => isString(key) && key !== "NaN" && key[0] !== "-" && "" + parseInt(key, 10) === key;
-  var cacheStringFunction = (fn) => {
-    const cache = /* @__PURE__ */ Object.create(null);
-    return (str) => {
-      const hit = cache[str];
-      return hit || (cache[str] = fn(str));
-    };
-  };
-  var camelizeRE = /-(\w)/g;
-  var camelize = cacheStringFunction((str) => {
-    return str.replace(camelizeRE, (_, c) => c ? c.toUpperCase() : "");
-  });
-  var hyphenateRE = /\B([A-Z])/g;
-  var hyphenate = cacheStringFunction((str) => str.replace(hyphenateRE, "-$1").toLowerCase());
-  var capitalize = cacheStringFunction((str) => str.charAt(0).toUpperCase() + str.slice(1));
-  var toHandlerKey = cacheStringFunction((str) => str ? `on${capitalize(str)}` : ``);
-  var hasChanged = (value, oldValue) => value !== oldValue && (value === value || oldValue === oldValue);
-
-  // node_modules/@vue/reactivity/dist/reactivity.esm-bundler.js
-  var targetMap = /* @__PURE__ */ new WeakMap();
-  var effectStack = [];
-  var activeEffect;
-  var ITERATE_KEY = Symbol(true ? "iterate" : "");
-  var MAP_KEY_ITERATE_KEY = Symbol(true ? "Map key iterate" : "");
-  function isEffect(fn) {
-    return fn && fn._isEffect === true;
-  }
-  function effect2(fn, options = EMPTY_OBJ) {
-    if (isEffect(fn)) {
-      fn = fn.raw;
-    }
-    const effect3 = createReactiveEffect(fn, options);
-    if (!options.lazy) {
-      effect3();
-    }
-    return effect3;
-  }
-  function stop(effect3) {
-    if (effect3.active) {
-      cleanup(effect3);
-      if (effect3.options.onStop) {
-        effect3.options.onStop();
-      }
-      effect3.active = false;
-    }
-  }
-  var uid = 0;
-  function createReactiveEffect(fn, options) {
-    const effect3 = function reactiveEffect() {
-      if (!effect3.active) {
-        return fn();
-      }
-      if (!effectStack.includes(effect3)) {
-        cleanup(effect3);
-        try {
-          enableTracking();
-          effectStack.push(effect3);
-          activeEffect = effect3;
-          return fn();
-        } finally {
-          effectStack.pop();
-          resetTracking();
-          activeEffect = effectStack[effectStack.length - 1];
-        }
-      }
-    };
-    effect3.id = uid++;
-    effect3.allowRecurse = !!options.allowRecurse;
-    effect3._isEffect = true;
-    effect3.active = true;
-    effect3.raw = fn;
-    effect3.deps = [];
-    effect3.options = options;
-    return effect3;
-  }
-  function cleanup(effect3) {
-    const { deps } = effect3;
-    if (deps.length) {
-      for (let i = 0; i < deps.length; i++) {
-        deps[i].delete(effect3);
-      }
-      deps.length = 0;
-    }
-  }
-  var shouldTrack = true;
-  var trackStack = [];
-  function pauseTracking() {
-    trackStack.push(shouldTrack);
-    shouldTrack = false;
-  }
-  function enableTracking() {
-    trackStack.push(shouldTrack);
-    shouldTrack = true;
-  }
-  function resetTracking() {
-    const last = trackStack.pop();
-    shouldTrack = last === void 0 ? true : last;
-  }
-  function track(target, type, key) {
-    if (!shouldTrack || activeEffect === void 0) {
-      return;
-    }
-    let depsMap = targetMap.get(target);
-    if (!depsMap) {
-      targetMap.set(target, depsMap = /* @__PURE__ */ new Map());
-    }
-    let dep = depsMap.get(key);
-    if (!dep) {
-      depsMap.set(key, dep = /* @__PURE__ */ new Set());
-    }
-    if (!dep.has(activeEffect)) {
-      dep.add(activeEffect);
-      activeEffect.deps.push(dep);
-      if (activeEffect.options.onTrack) {
-        activeEffect.options.onTrack({
-          effect: activeEffect,
-          target,
-          type,
-          key
-        });
-      }
-    }
-  }
-  function trigger(target, type, key, newValue, oldValue, oldTarget) {
-    const depsMap = targetMap.get(target);
-    if (!depsMap) {
-      return;
-    }
-    const effects = /* @__PURE__ */ new Set();
-    const add2 = (effectsToAdd) => {
-      if (effectsToAdd) {
-        effectsToAdd.forEach((effect3) => {
-          if (effect3 !== activeEffect || effect3.allowRecurse) {
-            effects.add(effect3);
-          }
-        });
-      }
-    };
-    if (type === "clear") {
-      depsMap.forEach(add2);
-    } else if (key === "length" && isArray(target)) {
-      depsMap.forEach((dep, key2) => {
-        if (key2 === "length" || key2 >= newValue) {
-          add2(dep);
-        }
-      });
-    } else {
-      if (key !== void 0) {
-        add2(depsMap.get(key));
-      }
-      switch (type) {
-        case "add":
-          if (!isArray(target)) {
-            add2(depsMap.get(ITERATE_KEY));
-            if (isMap(target)) {
-              add2(depsMap.get(MAP_KEY_ITERATE_KEY));
-            }
-          } else if (isIntegerKey(key)) {
-            add2(depsMap.get("length"));
-          }
-          break;
-        case "delete":
-          if (!isArray(target)) {
-            add2(depsMap.get(ITERATE_KEY));
-            if (isMap(target)) {
-              add2(depsMap.get(MAP_KEY_ITERATE_KEY));
-            }
-          }
-          break;
-        case "set":
-          if (isMap(target)) {
-            add2(depsMap.get(ITERATE_KEY));
-          }
-          break;
-      }
-    }
-    const run = (effect3) => {
-      if (effect3.options.onTrigger) {
-        effect3.options.onTrigger({
-          effect: effect3,
-          target,
-          key,
-          type,
-          newValue,
-          oldValue,
-          oldTarget
-        });
-      }
-      if (effect3.options.scheduler) {
-        effect3.options.scheduler(effect3);
-      } else {
-        effect3();
-      }
-    };
-    effects.forEach(run);
-  }
-  var isNonTrackableKeys = /* @__PURE__ */ makeMap(`__proto__,__v_isRef,__isVue`);
-  var builtInSymbols = new Set(Object.getOwnPropertyNames(Symbol).map((key) => Symbol[key]).filter(isSymbol));
-  var get2 = /* @__PURE__ */ createGetter();
-  var readonlyGet = /* @__PURE__ */ createGetter(true);
-  var arrayInstrumentations = /* @__PURE__ */ createArrayInstrumentations();
-  function createArrayInstrumentations() {
-    const instrumentations = {};
-    ["includes", "indexOf", "lastIndexOf"].forEach((key) => {
-      instrumentations[key] = function(...args) {
-        const arr = toRaw(this);
-        for (let i = 0, l = this.length; i < l; i++) {
-          track(arr, "get", i + "");
-        }
-        const res = arr[key](...args);
-        if (res === -1 || res === false) {
-          return arr[key](...args.map(toRaw));
-        } else {
-          return res;
-        }
-      };
-    });
-    ["push", "pop", "shift", "unshift", "splice"].forEach((key) => {
-      instrumentations[key] = function(...args) {
-        pauseTracking();
-        const res = toRaw(this)[key].apply(this, args);
-        resetTracking();
-        return res;
-      };
-    });
-    return instrumentations;
-  }
-  function createGetter(isReadonly = false, shallow = false) {
-    return function get3(target, key, receiver) {
-      if (key === "__v_isReactive") {
-        return !isReadonly;
-      } else if (key === "__v_isReadonly") {
-        return isReadonly;
-      } else if (key === "__v_raw" && receiver === (isReadonly ? shallow ? shallowReadonlyMap : readonlyMap : shallow ? shallowReactiveMap : reactiveMap).get(target)) {
-        return target;
-      }
-      const targetIsArray = isArray(target);
-      if (!isReadonly && targetIsArray && hasOwn(arrayInstrumentations, key)) {
-        return Reflect.get(arrayInstrumentations, key, receiver);
-      }
-      const res = Reflect.get(target, key, receiver);
-      if (isSymbol(key) ? builtInSymbols.has(key) : isNonTrackableKeys(key)) {
-        return res;
-      }
-      if (!isReadonly) {
-        track(target, "get", key);
-      }
-      if (shallow) {
-        return res;
-      }
-      if (isRef(res)) {
-        const shouldUnwrap = !targetIsArray || !isIntegerKey(key);
-        return shouldUnwrap ? res.value : res;
-      }
-      if (isObject(res)) {
-        return isReadonly ? readonly(res) : reactive2(res);
-      }
-      return res;
-    };
-  }
-  var set2 = /* @__PURE__ */ createSetter();
-  function createSetter(shallow = false) {
-    return function set3(target, key, value, receiver) {
-      let oldValue = target[key];
-      if (!shallow) {
-        value = toRaw(value);
-        oldValue = toRaw(oldValue);
-        if (!isArray(target) && isRef(oldValue) && !isRef(value)) {
-          oldValue.value = value;
-          return true;
-        }
-      }
-      const hadKey = isArray(target) && isIntegerKey(key) ? Number(key) < target.length : hasOwn(target, key);
-      const result = Reflect.set(target, key, value, receiver);
-      if (target === toRaw(receiver)) {
-        if (!hadKey) {
-          trigger(target, "add", key, value);
-        } else if (hasChanged(value, oldValue)) {
-          trigger(target, "set", key, value, oldValue);
-        }
-      }
-      return result;
-    };
-  }
-  function deleteProperty(target, key) {
-    const hadKey = hasOwn(target, key);
-    const oldValue = target[key];
-    const result = Reflect.deleteProperty(target, key);
-    if (result && hadKey) {
-      trigger(target, "delete", key, void 0, oldValue);
-    }
-    return result;
-  }
-  function has(target, key) {
-    const result = Reflect.has(target, key);
-    if (!isSymbol(key) || !builtInSymbols.has(key)) {
-      track(target, "has", key);
-    }
-    return result;
-  }
-  function ownKeys(target) {
-    track(target, "iterate", isArray(target) ? "length" : ITERATE_KEY);
-    return Reflect.ownKeys(target);
-  }
-  var mutableHandlers = {
-    get: get2,
-    set: set2,
-    deleteProperty,
-    has,
-    ownKeys
-  };
-  var readonlyHandlers = {
-    get: readonlyGet,
-    set(target, key) {
-      if (true) {
-        console.warn(`Set operation on key "${String(key)}" failed: target is readonly.`, target);
-      }
-      return true;
-    },
-    deleteProperty(target, key) {
-      if (true) {
-        console.warn(`Delete operation on key "${String(key)}" failed: target is readonly.`, target);
-      }
-      return true;
-    }
-  };
-  var toReactive = (value) => isObject(value) ? reactive2(value) : value;
-  var toReadonly = (value) => isObject(value) ? readonly(value) : value;
-  var toShallow = (value) => value;
-  var getProto = (v) => Reflect.getPrototypeOf(v);
-  function get$1(target, key, isReadonly = false, isShallow = false) {
-    target = target[
-      "__v_raw"
-      /* RAW */
-    ];
-    const rawTarget = toRaw(target);
-    const rawKey = toRaw(key);
-    if (key !== rawKey) {
-      !isReadonly && track(rawTarget, "get", key);
-    }
-    !isReadonly && track(rawTarget, "get", rawKey);
-    const { has: has2 } = getProto(rawTarget);
-    const wrap = isShallow ? toShallow : isReadonly ? toReadonly : toReactive;
-    if (has2.call(rawTarget, key)) {
-      return wrap(target.get(key));
-    } else if (has2.call(rawTarget, rawKey)) {
-      return wrap(target.get(rawKey));
-    } else if (target !== rawTarget) {
-      target.get(key);
-    }
-  }
-  function has$1(key, isReadonly = false) {
-    const target = this[
-      "__v_raw"
-      /* RAW */
-    ];
-    const rawTarget = toRaw(target);
-    const rawKey = toRaw(key);
-    if (key !== rawKey) {
-      !isReadonly && track(rawTarget, "has", key);
-    }
-    !isReadonly && track(rawTarget, "has", rawKey);
-    return key === rawKey ? target.has(key) : target.has(key) || target.has(rawKey);
-  }
-  function size(target, isReadonly = false) {
-    target = target[
-      "__v_raw"
-      /* RAW */
-    ];
-    !isReadonly && track(toRaw(target), "iterate", ITERATE_KEY);
-    return Reflect.get(target, "size", target);
-  }
-  function add(value) {
-    value = toRaw(value);
-    const target = toRaw(this);
-    const proto = getProto(target);
-    const hadKey = proto.has.call(target, value);
-    if (!hadKey) {
-      target.add(value);
-      trigger(target, "add", value, value);
-    }
-    return this;
-  }
-  function set$1(key, value) {
-    value = toRaw(value);
-    const target = toRaw(this);
-    const { has: has2, get: get3 } = getProto(target);
-    let hadKey = has2.call(target, key);
-    if (!hadKey) {
-      key = toRaw(key);
-      hadKey = has2.call(target, key);
-    } else if (true) {
-      checkIdentityKeys(target, has2, key);
-    }
-    const oldValue = get3.call(target, key);
-    target.set(key, value);
-    if (!hadKey) {
-      trigger(target, "add", key, value);
-    } else if (hasChanged(value, oldValue)) {
-      trigger(target, "set", key, value, oldValue);
-    }
-    return this;
-  }
-  function deleteEntry(key) {
-    const target = toRaw(this);
-    const { has: has2, get: get3 } = getProto(target);
-    let hadKey = has2.call(target, key);
-    if (!hadKey) {
-      key = toRaw(key);
-      hadKey = has2.call(target, key);
-    } else if (true) {
-      checkIdentityKeys(target, has2, key);
-    }
-    const oldValue = get3 ? get3.call(target, key) : void 0;
-    const result = target.delete(key);
-    if (hadKey) {
-      trigger(target, "delete", key, void 0, oldValue);
-    }
-    return result;
-  }
-  function clear() {
-    const target = toRaw(this);
-    const hadItems = target.size !== 0;
-    const oldTarget = true ? isMap(target) ? new Map(target) : new Set(target) : void 0;
-    const result = target.clear();
-    if (hadItems) {
-      trigger(target, "clear", void 0, void 0, oldTarget);
-    }
-    return result;
-  }
-  function createForEach(isReadonly, isShallow) {
-    return function forEach(callback, thisArg) {
-      const observed = this;
-      const target = observed[
-        "__v_raw"
-        /* RAW */
-      ];
-      const rawTarget = toRaw(target);
-      const wrap = isShallow ? toShallow : isReadonly ? toReadonly : toReactive;
-      !isReadonly && track(rawTarget, "iterate", ITERATE_KEY);
-      return target.forEach((value, key) => {
-        return callback.call(thisArg, wrap(value), wrap(key), observed);
-      });
-    };
-  }
-  function createIterableMethod(method, isReadonly, isShallow) {
-    return function(...args) {
-      const target = this[
-        "__v_raw"
-        /* RAW */
-      ];
-      const rawTarget = toRaw(target);
-      const targetIsMap = isMap(rawTarget);
-      const isPair = method === "entries" || method === Symbol.iterator && targetIsMap;
-      const isKeyOnly = method === "keys" && targetIsMap;
-      const innerIterator = target[method](...args);
-      const wrap = isShallow ? toShallow : isReadonly ? toReadonly : toReactive;
-      !isReadonly && track(rawTarget, "iterate", isKeyOnly ? MAP_KEY_ITERATE_KEY : ITERATE_KEY);
-      return {
-        // iterator protocol
-        next() {
-          const { value, done } = innerIterator.next();
-          return done ? { value, done } : {
-            value: isPair ? [wrap(value[0]), wrap(value[1])] : wrap(value),
-            done
-          };
-        },
-        // iterable protocol
-        [Symbol.iterator]() {
-          return this;
-        }
-      };
-    };
-  }
-  function createReadonlyMethod(type) {
-    return function(...args) {
-      if (true) {
-        const key = args[0] ? `on key "${args[0]}" ` : ``;
-        console.warn(`${capitalize(type)} operation ${key}failed: target is readonly.`, toRaw(this));
-      }
-      return type === "delete" ? false : this;
-    };
-  }
-  function createInstrumentations() {
-    const mutableInstrumentations2 = {
-      get(key) {
-        return get$1(this, key);
-      },
-      get size() {
-        return size(this);
-      },
-      has: has$1,
-      add,
-      set: set$1,
-      delete: deleteEntry,
-      clear,
-      forEach: createForEach(false, false)
-    };
-    const shallowInstrumentations2 = {
-      get(key) {
-        return get$1(this, key, false, true);
-      },
-      get size() {
-        return size(this);
-      },
-      has: has$1,
-      add,
-      set: set$1,
-      delete: deleteEntry,
-      clear,
-      forEach: createForEach(false, true)
-    };
-    const readonlyInstrumentations2 = {
-      get(key) {
-        return get$1(this, key, true);
-      },
-      get size() {
-        return size(this, true);
-      },
-      has(key) {
-        return has$1.call(this, key, true);
-      },
-      add: createReadonlyMethod(
-        "add"
-        /* ADD */
-      ),
-      set: createReadonlyMethod(
-        "set"
-        /* SET */
-      ),
-      delete: createReadonlyMethod(
-        "delete"
-        /* DELETE */
-      ),
-      clear: createReadonlyMethod(
-        "clear"
-        /* CLEAR */
-      ),
-      forEach: createForEach(true, false)
-    };
-    const shallowReadonlyInstrumentations2 = {
-      get(key) {
-        return get$1(this, key, true, true);
-      },
-      get size() {
-        return size(this, true);
-      },
-      has(key) {
-        return has$1.call(this, key, true);
-      },
-      add: createReadonlyMethod(
-        "add"
-        /* ADD */
-      ),
-      set: createReadonlyMethod(
-        "set"
-        /* SET */
-      ),
-      delete: createReadonlyMethod(
-        "delete"
-        /* DELETE */
-      ),
-      clear: createReadonlyMethod(
-        "clear"
-        /* CLEAR */
-      ),
-      forEach: createForEach(true, true)
-    };
-    const iteratorMethods = ["keys", "values", "entries", Symbol.iterator];
-    iteratorMethods.forEach((method) => {
-      mutableInstrumentations2[method] = createIterableMethod(method, false, false);
-      readonlyInstrumentations2[method] = createIterableMethod(method, true, false);
-      shallowInstrumentations2[method] = createIterableMethod(method, false, true);
-      shallowReadonlyInstrumentations2[method] = createIterableMethod(method, true, true);
-    });
-    return [
-      mutableInstrumentations2,
-      readonlyInstrumentations2,
-      shallowInstrumentations2,
-      shallowReadonlyInstrumentations2
-    ];
-  }
-  var [mutableInstrumentations, readonlyInstrumentations, shallowInstrumentations, shallowReadonlyInstrumentations] = /* @__PURE__ */ createInstrumentations();
-  function createInstrumentationGetter(isReadonly, shallow) {
-    const instrumentations = shallow ? isReadonly ? shallowReadonlyInstrumentations : shallowInstrumentations : isReadonly ? readonlyInstrumentations : mutableInstrumentations;
-    return (target, key, receiver) => {
-      if (key === "__v_isReactive") {
-        return !isReadonly;
-      } else if (key === "__v_isReadonly") {
-        return isReadonly;
-      } else if (key === "__v_raw") {
-        return target;
-      }
-      return Reflect.get(hasOwn(instrumentations, key) && key in target ? instrumentations : target, key, receiver);
-    };
-  }
-  var mutableCollectionHandlers = {
-    get: /* @__PURE__ */ createInstrumentationGetter(false, false)
-  };
-  var readonlyCollectionHandlers = {
-    get: /* @__PURE__ */ createInstrumentationGetter(true, false)
-  };
-  function checkIdentityKeys(target, has2, key) {
-    const rawKey = toRaw(key);
-    if (rawKey !== key && has2.call(target, rawKey)) {
-      const type = toRawType(target);
-      console.warn(`Reactive ${type} contains both the raw and reactive versions of the same object${type === `Map` ? ` as keys` : ``}, which can lead to inconsistencies. Avoid differentiating between the raw and reactive versions of an object and only use the reactive version if possible.`);
-    }
-  }
-  var reactiveMap = /* @__PURE__ */ new WeakMap();
-  var shallowReactiveMap = /* @__PURE__ */ new WeakMap();
-  var readonlyMap = /* @__PURE__ */ new WeakMap();
-  var shallowReadonlyMap = /* @__PURE__ */ new WeakMap();
-  function targetTypeMap(rawType) {
-    switch (rawType) {
-      case "Object":
-      case "Array":
-        return 1;
-      case "Map":
-      case "Set":
-      case "WeakMap":
-      case "WeakSet":
-        return 2;
-      default:
-        return 0;
-    }
-  }
-  function getTargetType(value) {
-    return value[
-      "__v_skip"
-      /* SKIP */
-    ] || !Object.isExtensible(value) ? 0 : targetTypeMap(toRawType(value));
-  }
-  function reactive2(target) {
-    if (target && target[
-      "__v_isReadonly"
-      /* IS_READONLY */
-    ]) {
-      return target;
-    }
-    return createReactiveObject(target, false, mutableHandlers, mutableCollectionHandlers, reactiveMap);
-  }
-  function readonly(target) {
-    return createReactiveObject(target, true, readonlyHandlers, readonlyCollectionHandlers, readonlyMap);
-  }
-  function createReactiveObject(target, isReadonly, baseHandlers, collectionHandlers, proxyMap) {
-    if (!isObject(target)) {
-      if (true) {
-        console.warn(`value cannot be made reactive: ${String(target)}`);
-      }
-      return target;
-    }
-    if (target[
-      "__v_raw"
-      /* RAW */
-    ] && !(isReadonly && target[
-      "__v_isReactive"
-      /* IS_REACTIVE */
-    ])) {
-      return target;
-    }
-    const existingProxy = proxyMap.get(target);
-    if (existingProxy) {
-      return existingProxy;
-    }
-    const targetType = getTargetType(target);
-    if (targetType === 0) {
-      return target;
-    }
-    const proxy = new Proxy(target, targetType === 2 ? collectionHandlers : baseHandlers);
-    proxyMap.set(target, proxy);
-    return proxy;
-  }
-  function toRaw(observed) {
-    return observed && toRaw(observed[
-      "__v_raw"
-      /* RAW */
-    ]) || observed;
-  }
-  function isRef(r) {
-    return Boolean(r && r.__v_isRef === true);
-  }
-
-  // packages/alpinejs/src/magics/$nextTick.js
-  magic("nextTick", () => nextTick);
-
-  // packages/alpinejs/src/magics/$dispatch.js
-  magic("dispatch", (el) => dispatch.bind(dispatch, el));
-
-  // packages/alpinejs/src/magics/$watch.js
-  magic("watch", (el, { evaluateLater: evaluateLater2, cleanup: cleanup2 }) => (key, callback) => {
-    let evaluate2 = evaluateLater2(key);
-    let getter = () => {
-      let value;
-      evaluate2((i) => value = i);
-      return value;
-    };
-    let unwatch = watch(getter, callback);
-    cleanup2(unwatch);
-  });
-
-  // packages/alpinejs/src/magics/$store.js
-  magic("store", getStores);
-
-  // packages/alpinejs/src/magics/$data.js
-  magic("data", (el) => scope(el));
-
-  // packages/alpinejs/src/magics/$root.js
-  magic("root", (el) => closestRoot(el));
-
-  // packages/alpinejs/src/magics/$refs.js
-  magic("refs", (el) => {
-    if (el._x_refs_proxy)
-      return el._x_refs_proxy;
-    el._x_refs_proxy = mergeProxies(getArrayOfRefObject(el));
-    return el._x_refs_proxy;
-  });
-  function getArrayOfRefObject(el) {
-    let refObjects = [];
-    findClosest(el, (i) => {
-      if (i._x_refs)
-        refObjects.push(i._x_refs);
-    });
-    return refObjects;
-  }
-
-  // packages/alpinejs/src/ids.js
-  var globalIdMemo = {};
-  function findAndIncrementId(name) {
-    if (!globalIdMemo[name])
-      globalIdMemo[name] = 0;
-    return ++globalIdMemo[name];
-  }
-  function closestIdRoot(el, name) {
-    return findClosest(el, (element) => {
-      if (element._x_ids && element._x_ids[name])
-        return true;
-    });
-  }
-  function setIdRoot(el, name) {
-    if (!el._x_ids)
-      el._x_ids = {};
-    if (!el._x_ids[name])
-      el._x_ids[name] = findAndIncrementId(name);
-  }
-
-  // packages/alpinejs/src/magics/$id.js
-  magic("id", (el, { cleanup: cleanup2 }) => (name, key = null) => {
-    let cacheKey = `${name}${key ? `-${key}` : ""}`;
-    return cacheIdByNameOnElement(el, cacheKey, cleanup2, () => {
-      let root = closestIdRoot(el, name);
-      let id = root ? root._x_ids[name] : findAndIncrementId(name);
-      return key ? `${name}-${id}-${key}` : `${name}-${id}`;
-    });
-  });
-  interceptClone((from, to) => {
-    if (from._x_id) {
-      to._x_id = from._x_id;
-    }
-  });
-  function cacheIdByNameOnElement(el, cacheKey, cleanup2, callback) {
-    if (!el._x_id)
-      el._x_id = {};
-    if (el._x_id[cacheKey])
-      return el._x_id[cacheKey];
-    let output = callback();
-    el._x_id[cacheKey] = output;
-    cleanup2(() => {
-      delete el._x_id[cacheKey];
-    });
-    return output;
-  }
-
-  // packages/alpinejs/src/magics/$el.js
-  magic("el", (el) => el);
-
-  // packages/alpinejs/src/magics/index.js
-  warnMissingPluginMagic("Focus", "focus", "focus");
-  warnMissingPluginMagic("Persist", "persist", "persist");
-  function warnMissingPluginMagic(name, magicName, slug) {
-    magic(magicName, (el) => warn(`You can't use [$${magicName}] without first installing the "${name}" plugin here: https://alpinejs.dev/plugins/${slug}`, el));
-  }
-
-  // packages/alpinejs/src/directives/x-modelable.js
-  directive("modelable", (el, { expression }, { effect: effect3, evaluateLater: evaluateLater2, cleanup: cleanup2 }) => {
-    let func = evaluateLater2(expression);
-    let innerGet = () => {
-      let result;
-      func((i) => result = i);
-      return result;
-    };
-    let evaluateInnerSet = evaluateLater2(`${expression} = __placeholder`);
-    let innerSet = (val) => evaluateInnerSet(() => {
-    }, { scope: { "__placeholder": val } });
-    let initialValue = innerGet();
-    innerSet(initialValue);
-    queueMicrotask(() => {
-      if (!el._x_model)
-        return;
-      el._x_removeModelListeners["default"]();
-      let outerGet = el._x_model.get;
-      let outerSet = el._x_model.set;
-      let releaseEntanglement = entangle(
-        {
-          get() {
-            return outerGet();
-          },
-          set(value) {
-            outerSet(value);
-          }
-        },
-        {
-          get() {
-            return innerGet();
-          },
-          set(value) {
-            innerSet(value);
-          }
-        }
-      );
-      cleanup2(releaseEntanglement);
-    });
-  });
-
-  // packages/alpinejs/src/directives/x-teleport.js
-  directive("teleport", (el, { modifiers, expression }, { cleanup: cleanup2 }) => {
-    if (el.tagName.toLowerCase() !== "template")
-      warn("x-teleport can only be used on a <template> tag", el);
-    let target = getTarget(expression);
-    let clone2 = el.content.cloneNode(true).firstElementChild;
-    el._x_teleport = clone2;
-    clone2._x_teleportBack = el;
-    el.setAttribute("data-teleport-template", true);
-    clone2.setAttribute("data-teleport-target", true);
-    if (el._x_forwardEvents) {
-      el._x_forwardEvents.forEach((eventName) => {
-        clone2.addEventListener(eventName, (e) => {
-          e.stopPropagation();
-          el.dispatchEvent(new e.constructor(e.type, e));
-        });
-      });
-    }
-    addScopeToNode(clone2, {}, el);
-    let placeInDom = (clone3, target2, modifiers2) => {
-      if (modifiers2.includes("prepend")) {
-        target2.parentNode.insertBefore(clone3, target2);
-      } else if (modifiers2.includes("append")) {
-        target2.parentNode.insertBefore(clone3, target2.nextSibling);
-      } else {
-        target2.appendChild(clone3);
-      }
-    };
-    mutateDom(() => {
-      placeInDom(clone2, target, modifiers);
-      skipDuringClone(() => {
-        initTree(clone2);
-        clone2._x_ignore = true;
-      })();
-    });
-    el._x_teleportPutBack = () => {
-      let target2 = getTarget(expression);
-      mutateDom(() => {
-        placeInDom(el._x_teleport, target2, modifiers);
-      });
-    };
-    cleanup2(() => clone2.remove());
-  });
-  var teleportContainerDuringClone = document.createElement("div");
-  function getTarget(expression) {
-    let target = skipDuringClone(() => {
-      return document.querySelector(expression);
-    }, () => {
-      return teleportContainerDuringClone;
-    })();
-    if (!target)
-      warn(`Cannot find x-teleport element for selector: "${expression}"`);
-    return target;
-  }
-
-  // packages/alpinejs/src/directives/x-ignore.js
-  var handler = () => {
-  };
-  handler.inline = (el, { modifiers }, { cleanup: cleanup2 }) => {
-    modifiers.includes("self") ? el._x_ignoreSelf = true : el._x_ignore = true;
-    cleanup2(() => {
-      modifiers.includes("self") ? delete el._x_ignoreSelf : delete el._x_ignore;
-    });
-  };
-  directive("ignore", handler);
-
-  // packages/alpinejs/src/directives/x-effect.js
-  directive("effect", skipDuringClone((el, { expression }, { effect: effect3 }) => {
-    effect3(evaluateLater(el, expression));
-  }));
-
-  // packages/alpinejs/src/utils/on.js
-  function on(el, event, modifiers, callback) {
-    let listenerTarget = el;
-    let handler4 = (e) => callback(e);
-    let options = {};
-    let wrapHandler = (callback2, wrapper) => (e) => wrapper(callback2, e);
-    if (modifiers.includes("dot"))
-      event = dotSyntax(event);
-    if (modifiers.includes("camel"))
-      event = camelCase2(event);
-    if (modifiers.includes("passive"))
-      options.passive = true;
-    if (modifiers.includes("capture"))
-      options.capture = true;
-    if (modifiers.includes("window"))
-      listenerTarget = window;
-    if (modifiers.includes("document"))
-      listenerTarget = document;
-    if (modifiers.includes("debounce")) {
-      let nextModifier = modifiers[modifiers.indexOf("debounce") + 1] || "invalid-wait";
-      let wait = isNumeric(nextModifier.split("ms")[0]) ? Number(nextModifier.split("ms")[0]) : 250;
-      handler4 = debounce(handler4, wait);
-    }
-    if (modifiers.includes("throttle")) {
-      let nextModifier = modifiers[modifiers.indexOf("throttle") + 1] || "invalid-wait";
-      let wait = isNumeric(nextModifier.split("ms")[0]) ? Number(nextModifier.split("ms")[0]) : 250;
-      handler4 = throttle(handler4, wait);
-    }
-    if (modifiers.includes("prevent"))
-      handler4 = wrapHandler(handler4, (next, e) => {
-        e.preventDefault();
-        next(e);
-      });
-    if (modifiers.includes("stop"))
-      handler4 = wrapHandler(handler4, (next, e) => {
-        e.stopPropagation();
-        next(e);
-      });
-    if (modifiers.includes("once")) {
-      handler4 = wrapHandler(handler4, (next, e) => {
-        next(e);
-        listenerTarget.removeEventListener(event, handler4, options);
-      });
-    }
-    if (modifiers.includes("away") || modifiers.includes("outside")) {
-      listenerTarget = document;
-      handler4 = wrapHandler(handler4, (next, e) => {
-        if (el.contains(e.target))
-          return;
-        if (e.target.isConnected === false)
-          return;
-        if (el.offsetWidth < 1 && el.offsetHeight < 1)
-          return;
-        if (el._x_isShown === false)
-          return;
-        next(e);
-      });
-    }
-    if (modifiers.includes("self"))
-      handler4 = wrapHandler(handler4, (next, e) => {
-        e.target === el && next(e);
-      });
-    handler4 = wrapHandler(handler4, (next, e) => {
-      if (isKeyEvent(event)) {
-        if (isListeningForASpecificKeyThatHasntBeenPressed(e, modifiers)) {
-          return;
-        }
-      }
-      next(e);
-    });
-    listenerTarget.addEventListener(event, handler4, options);
-    return () => {
-      listenerTarget.removeEventListener(event, handler4, options);
-    };
-  }
-  function dotSyntax(subject) {
-    return subject.replace(/-/g, ".");
-  }
-  function camelCase2(subject) {
-    return subject.toLowerCase().replace(/-(\w)/g, (match, char) => char.toUpperCase());
-  }
-  function isNumeric(subject) {
-    return !Array.isArray(subject) && !isNaN(subject);
-  }
-  function kebabCase2(subject) {
-    if ([" ", "_"].includes(
-      subject
-    ))
-      return subject;
-    return subject.replace(/([a-z])([A-Z])/g, "$1-$2").replace(/[_\s]/, "-").toLowerCase();
-  }
-  function isKeyEvent(event) {
-    return ["keydown", "keyup"].includes(event);
-  }
-  function isListeningForASpecificKeyThatHasntBeenPressed(e, modifiers) {
-    let keyModifiers = modifiers.filter((i) => {
-      return !["window", "document", "prevent", "stop", "once", "capture"].includes(i);
-    });
-    if (keyModifiers.includes("debounce")) {
-      let debounceIndex = keyModifiers.indexOf("debounce");
-      keyModifiers.splice(debounceIndex, isNumeric((keyModifiers[debounceIndex + 1] || "invalid-wait").split("ms")[0]) ? 2 : 1);
-    }
-    if (keyModifiers.includes("throttle")) {
-      let debounceIndex = keyModifiers.indexOf("throttle");
-      keyModifiers.splice(debounceIndex, isNumeric((keyModifiers[debounceIndex + 1] || "invalid-wait").split("ms")[0]) ? 2 : 1);
-    }
-    if (keyModifiers.length === 0)
-      return false;
-    if (keyModifiers.length === 1 && keyToModifiers(e.key).includes(keyModifiers[0]))
-      return false;
-    const systemKeyModifiers = ["ctrl", "shift", "alt", "meta", "cmd", "super"];
-    const selectedSystemKeyModifiers = systemKeyModifiers.filter((modifier) => keyModifiers.includes(modifier));
-    keyModifiers = keyModifiers.filter((i) => !selectedSystemKeyModifiers.includes(i));
-    if (selectedSystemKeyModifiers.length > 0) {
-      const activelyPressedKeyModifiers = selectedSystemKeyModifiers.filter((modifier) => {
-        if (modifier === "cmd" || modifier === "super")
-          modifier = "meta";
-        return e[`${modifier}Key`];
-      });
-      if (activelyPressedKeyModifiers.length === selectedSystemKeyModifiers.length) {
-        if (keyToModifiers(e.key).includes(keyModifiers[0]))
-          return false;
-      }
-    }
-    return true;
-  }
-  function keyToModifiers(key) {
-    if (!key)
-      return [];
-    key = kebabCase2(key);
-    let modifierToKeyMap = {
-      "ctrl": "control",
-      "slash": "/",
-      "space": " ",
-      "spacebar": " ",
-      "cmd": "meta",
-      "esc": "escape",
-      "up": "arrow-up",
-      "down": "arrow-down",
-      "left": "arrow-left",
-      "right": "arrow-right",
-      "period": ".",
-      "comma": ",",
-      "equal": "=",
-      "minus": "-",
-      "underscore": "_"
-    };
-    modifierToKeyMap[key] = key;
-    return Object.keys(modifierToKeyMap).map((modifier) => {
-      if (modifierToKeyMap[modifier] === key)
-        return modifier;
-    }).filter((modifier) => modifier);
-  }
-
-  // packages/alpinejs/src/directives/x-model.js
-  directive("model", (el, { modifiers, expression }, { effect: effect3, cleanup: cleanup2 }) => {
-    let scopeTarget = el;
-    if (modifiers.includes("parent")) {
-      scopeTarget = el.parentNode;
-    }
-    let evaluateGet = evaluateLater(scopeTarget, expression);
-    let evaluateSet;
-    if (typeof expression === "string") {
-      evaluateSet = evaluateLater(scopeTarget, `${expression} = __placeholder`);
-    } else if (typeof expression === "function" && typeof expression() === "string") {
-      evaluateSet = evaluateLater(scopeTarget, `${expression()} = __placeholder`);
-    } else {
-      evaluateSet = () => {
-      };
-    }
-    let getValue = () => {
-      let result;
-      evaluateGet((value) => result = value);
-      return isGetterSetter(result) ? result.get() : result;
-    };
-    let setValue = (value) => {
-      let result;
-      evaluateGet((value2) => result = value2);
-      if (isGetterSetter(result)) {
-        result.set(value);
-      } else {
-        evaluateSet(() => {
-        }, {
-          scope: { "__placeholder": value }
-        });
-      }
-    };
-    if (typeof expression === "string" && el.type === "radio") {
-      mutateDom(() => {
-        if (!el.hasAttribute("name"))
-          el.setAttribute("name", expression);
-      });
-    }
-    var event = el.tagName.toLowerCase() === "select" || ["checkbox", "radio"].includes(el.type) || modifiers.includes("lazy") ? "change" : "input";
-    let removeListener = isCloning ? () => {
-    } : on(el, event, modifiers, (e) => {
-      setValue(getInputValue(el, modifiers, e, getValue()));
-    });
-    if (modifiers.includes("fill")) {
-      if ([void 0, null, ""].includes(getValue()) || el.type === "checkbox" && Array.isArray(getValue()) || el.tagName.toLowerCase() === "select" && el.multiple) {
-        setValue(
-          getInputValue(el, modifiers, { target: el }, getValue())
-        );
-      }
-    }
-    if (!el._x_removeModelListeners)
-      el._x_removeModelListeners = {};
-    el._x_removeModelListeners["default"] = removeListener;
-    cleanup2(() => el._x_removeModelListeners["default"]());
-    if (el.form) {
-      let removeResetListener = on(el.form, "reset", [], (e) => {
-        nextTick(() => el._x_model && el._x_model.set(getInputValue(el, modifiers, { target: el }, getValue())));
-      });
-      cleanup2(() => removeResetListener());
-    }
-    el._x_model = {
-      get() {
-        return getValue();
-      },
-      set(value) {
-        setValue(value);
-      }
-    };
-    el._x_forceModelUpdate = (value) => {
-      if (value === void 0 && typeof expression === "string" && expression.match(/\./))
-        value = "";
-      window.fromModel = true;
-      mutateDom(() => bind(el, "value", value));
-      delete window.fromModel;
-    };
-    effect3(() => {
-      let value = getValue();
-      if (modifiers.includes("unintrusive") && document.activeElement.isSameNode(el))
-        return;
-      el._x_forceModelUpdate(value);
-    });
-  });
-  function getInputValue(el, modifiers, event, currentValue) {
-    return mutateDom(() => {
-      if (event instanceof CustomEvent && event.detail !== void 0)
-        return event.detail !== null && event.detail !== void 0 ? event.detail : event.target.value;
-      else if (el.type === "checkbox") {
-        if (Array.isArray(currentValue)) {
-          let newValue = null;
-          if (modifiers.includes("number")) {
-            newValue = safeParseNumber(event.target.value);
-          } else if (modifiers.includes("boolean")) {
-            newValue = safeParseBoolean(event.target.value);
-          } else {
-            newValue = event.target.value;
-          }
-          return event.target.checked ? currentValue.includes(newValue) ? currentValue : currentValue.concat([newValue]) : currentValue.filter((el2) => !checkedAttrLooseCompare2(el2, newValue));
-        } else {
-          return event.target.checked;
-        }
-      } else if (el.tagName.toLowerCase() === "select" && el.multiple) {
-        if (modifiers.includes("number")) {
-          return Array.from(event.target.selectedOptions).map((option) => {
-            let rawValue = option.value || option.text;
-            return safeParseNumber(rawValue);
-          });
-        } else if (modifiers.includes("boolean")) {
-          return Array.from(event.target.selectedOptions).map((option) => {
-            let rawValue = option.value || option.text;
-            return safeParseBoolean(rawValue);
-          });
-        }
-        return Array.from(event.target.selectedOptions).map((option) => {
-          return option.value || option.text;
-        });
-      } else {
-        let newValue;
-        if (el.type === "radio") {
-          if (event.target.checked) {
-            newValue = event.target.value;
-          } else {
-            newValue = currentValue;
-          }
-        } else {
-          newValue = event.target.value;
-        }
-        if (modifiers.includes("number")) {
-          return safeParseNumber(newValue);
-        } else if (modifiers.includes("boolean")) {
-          return safeParseBoolean(newValue);
-        } else if (modifiers.includes("trim")) {
-          return newValue.trim();
-        } else {
-          return newValue;
-        }
-      }
-    });
-  }
-  function safeParseNumber(rawValue) {
-    let number = rawValue ? parseFloat(rawValue) : null;
-    return isNumeric2(number) ? number : rawValue;
-  }
-  function checkedAttrLooseCompare2(valueA, valueB) {
-    return valueA == valueB;
-  }
-  function isNumeric2(subject) {
-    return !Array.isArray(subject) && !isNaN(subject);
-  }
-  function isGetterSetter(value) {
-    return value !== null && typeof value === "object" && typeof value.get === "function" && typeof value.set === "function";
-  }
-
-  // packages/alpinejs/src/directives/x-cloak.js
-  directive("cloak", (el) => queueMicrotask(() => mutateDom(() => el.removeAttribute(prefix("cloak")))));
-
-  // packages/alpinejs/src/directives/x-init.js
-  addInitSelector(() => `[${prefix("init")}]`);
-  directive("init", skipDuringClone((el, { expression }, { evaluate: evaluate2 }) => {
-    if (typeof expression === "string") {
-      return !!expression.trim() && evaluate2(expression, {}, false);
-    }
-    return evaluate2(expression, {}, false);
-  }));
-
-  // packages/alpinejs/src/directives/x-text.js
-  directive("text", (el, { expression }, { effect: effect3, evaluateLater: evaluateLater2 }) => {
-    let evaluate2 = evaluateLater2(expression);
-    effect3(() => {
-      evaluate2((value) => {
-        mutateDom(() => {
-          el.textContent = value;
-        });
-      });
-    });
-  });
-
-  // packages/alpinejs/src/directives/x-html.js
-  directive("html", (el, { expression }, { effect: effect3, evaluateLater: evaluateLater2 }) => {
-    let evaluate2 = evaluateLater2(expression);
-    effect3(() => {
-      evaluate2((value) => {
-        mutateDom(() => {
-          el.innerHTML = value;
-          el._x_ignoreSelf = true;
-          initTree(el);
-          delete el._x_ignoreSelf;
-        });
-      });
-    });
-  });
-
-  // packages/alpinejs/src/directives/x-bind.js
-  mapAttributes(startingWith(":", into(prefix("bind:"))));
-  var handler2 = (el, { value, modifiers, expression, original }, { effect: effect3, cleanup: cleanup2 }) => {
-    if (!value) {
-      let bindingProviders = {};
-      injectBindingProviders(bindingProviders);
-      let getBindings = evaluateLater(el, expression);
-      getBindings((bindings) => {
-        applyBindingsObject(el, bindings, original);
-      }, { scope: bindingProviders });
-      return;
-    }
-    if (value === "key")
-      return storeKeyForXFor(el, expression);
-    if (el._x_inlineBindings && el._x_inlineBindings[value] && el._x_inlineBindings[value].extract) {
-      return;
-    }
-    let evaluate2 = evaluateLater(el, expression);
-    effect3(() => evaluate2((result) => {
-      if (result === void 0 && typeof expression === "string" && expression.match(/\./)) {
-        result = "";
-      }
-      mutateDom(() => bind(el, value, result, modifiers));
-    }));
-    cleanup2(() => {
-      el._x_undoAddedClasses && el._x_undoAddedClasses();
-      el._x_undoAddedStyles && el._x_undoAddedStyles();
-    });
-  };
-  handler2.inline = (el, { value, modifiers, expression }) => {
-    if (!value)
-      return;
-    if (!el._x_inlineBindings)
-      el._x_inlineBindings = {};
-    el._x_inlineBindings[value] = { expression, extract: false };
-  };
-  directive("bind", handler2);
-  function storeKeyForXFor(el, expression) {
-    el._x_keyExpression = expression;
-  }
-
-  // packages/alpinejs/src/directives/x-data.js
-  addRootSelector(() => `[${prefix("data")}]`);
-  directive("data", (el, { expression }, { cleanup: cleanup2 }) => {
-    if (shouldSkipRegisteringDataDuringClone(el))
-      return;
-    expression = expression === "" ? "{}" : expression;
-    let magicContext = {};
-    injectMagics(magicContext, el);
-    let dataProviderContext = {};
-    injectDataProviders(dataProviderContext, magicContext);
-    let data2 = evaluate(el, expression, { scope: dataProviderContext });
-    if (data2 === void 0 || data2 === true)
-      data2 = {};
-    injectMagics(data2, el);
-    let reactiveData = reactive(data2);
-    initInterceptors(reactiveData);
-    let undo = addScopeToNode(el, reactiveData);
-    reactiveData["init"] && evaluate(el, reactiveData["init"]);
-    cleanup2(() => {
-      reactiveData["destroy"] && evaluate(el, reactiveData["destroy"]);
-      undo();
-    });
-  });
-  interceptClone((from, to) => {
-    if (from._x_dataStack) {
-      to._x_dataStack = from._x_dataStack;
-      to.setAttribute("data-has-alpine-state", true);
-    }
-  });
-  function shouldSkipRegisteringDataDuringClone(el) {
-    if (!isCloning)
-      return false;
-    if (isCloningLegacy)
-      return true;
-    return el.hasAttribute("data-has-alpine-state");
-  }
-
-  // packages/alpinejs/src/directives/x-show.js
-  directive("show", (el, { modifiers, expression }, { effect: effect3 }) => {
-    let evaluate2 = evaluateLater(el, expression);
-    if (!el._x_doHide)
-      el._x_doHide = () => {
-        mutateDom(() => {
-          el.style.setProperty("display", "none", modifiers.includes("important") ? "important" : void 0);
-        });
-      };
-    if (!el._x_doShow)
-      el._x_doShow = () => {
-        mutateDom(() => {
-          if (el.style.length === 1 && el.style.display === "none") {
-            el.removeAttribute("style");
-          } else {
-            el.style.removeProperty("display");
-          }
-        });
-      };
-    let hide = () => {
-      el._x_doHide();
-      el._x_isShown = false;
-    };
-    let show = () => {
-      el._x_doShow();
-      el._x_isShown = true;
-    };
-    let clickAwayCompatibleShow = () => setTimeout(show);
-    let toggle = once(
-      (value) => value ? show() : hide(),
-      (value) => {
-        if (typeof el._x_toggleAndCascadeWithTransitions === "function") {
-          el._x_toggleAndCascadeWithTransitions(el, value, show, hide);
-        } else {
-          value ? clickAwayCompatibleShow() : hide();
-        }
-      }
-    );
-    let oldValue;
-    let firstTime = true;
-    effect3(() => evaluate2((value) => {
-      if (!firstTime && value === oldValue)
-        return;
-      if (modifiers.includes("immediate"))
-        value ? clickAwayCompatibleShow() : hide();
-      toggle(value);
-      oldValue = value;
-      firstTime = false;
-    }));
-  });
-
-  // packages/alpinejs/src/directives/x-for.js
-  directive("for", (el, { expression }, { effect: effect3, cleanup: cleanup2 }) => {
-    let iteratorNames = parseForExpression(expression);
-    let evaluateItems = evaluateLater(el, iteratorNames.items);
-    let evaluateKey = evaluateLater(
-      el,
-      // the x-bind:key expression is stored for our use instead of evaluated.
-      el._x_keyExpression || "index"
-    );
-    el._x_prevKeys = [];
-    el._x_lookup = {};
-    effect3(() => loop(el, iteratorNames, evaluateItems, evaluateKey));
-    cleanup2(() => {
-      Object.values(el._x_lookup).forEach((el2) => el2.remove());
-      delete el._x_prevKeys;
-      delete el._x_lookup;
-    });
-  });
-  function loop(el, iteratorNames, evaluateItems, evaluateKey) {
-    let isObject2 = (i) => typeof i === "object" && !Array.isArray(i);
-    let templateEl = el;
-    evaluateItems((items) => {
-      if (isNumeric3(items) && items >= 0) {
-        items = Array.from(Array(items).keys(), (i) => i + 1);
-      }
-      if (items === void 0)
-        items = [];
-      let lookup = el._x_lookup;
-      let prevKeys = el._x_prevKeys;
-      let scopes = [];
-      let keys = [];
-      if (isObject2(items)) {
-        items = Object.entries(items).map(([key, value]) => {
-          let scope2 = getIterationScopeVariables(iteratorNames, value, key, items);
-          evaluateKey((value2) => {
-            if (keys.includes(value2))
-              warn("Duplicate key on x-for", el);
-            keys.push(value2);
-          }, { scope: { index: key, ...scope2 } });
-          scopes.push(scope2);
-        });
-      } else {
-        for (let i = 0; i < items.length; i++) {
-          let scope2 = getIterationScopeVariables(iteratorNames, items[i], i, items);
-          evaluateKey((value) => {
-            if (keys.includes(value))
-              warn("Duplicate key on x-for", el);
-            keys.push(value);
-          }, { scope: { index: i, ...scope2 } });
-          scopes.push(scope2);
-        }
-      }
-      let adds = [];
-      let moves = [];
-      let removes = [];
-      let sames = [];
-      for (let i = 0; i < prevKeys.length; i++) {
-        let key = prevKeys[i];
-        if (keys.indexOf(key) === -1)
-          removes.push(key);
-      }
-      prevKeys = prevKeys.filter((key) => !removes.includes(key));
-      let lastKey = "template";
-      for (let i = 0; i < keys.length; i++) {
-        let key = keys[i];
-        let prevIndex = prevKeys.indexOf(key);
-        if (prevIndex === -1) {
-          prevKeys.splice(i, 0, key);
-          adds.push([lastKey, i]);
-        } else if (prevIndex !== i) {
-          let keyInSpot = prevKeys.splice(i, 1)[0];
-          let keyForSpot = prevKeys.splice(prevIndex - 1, 1)[0];
-          prevKeys.splice(i, 0, keyForSpot);
-          prevKeys.splice(prevIndex, 0, keyInSpot);
-          moves.push([keyInSpot, keyForSpot]);
-        } else {
-          sames.push(key);
-        }
-        lastKey = key;
-      }
-      for (let i = 0; i < removes.length; i++) {
-        let key = removes[i];
-        if (!!lookup[key]._x_effects) {
-          lookup[key]._x_effects.forEach(dequeueJob);
-        }
-        lookup[key].remove();
-        lookup[key] = null;
-        delete lookup[key];
-      }
-      for (let i = 0; i < moves.length; i++) {
-        let [keyInSpot, keyForSpot] = moves[i];
-        let elInSpot = lookup[keyInSpot];
-        let elForSpot = lookup[keyForSpot];
-        let marker = document.createElement("div");
-        mutateDom(() => {
-          if (!elForSpot)
-            warn(`x-for ":key" is undefined or invalid`, templateEl, keyForSpot, lookup);
-          elForSpot.after(marker);
-          elInSpot.after(elForSpot);
-          elForSpot._x_currentIfEl && elForSpot.after(elForSpot._x_currentIfEl);
-          marker.before(elInSpot);
-          elInSpot._x_currentIfEl && elInSpot.after(elInSpot._x_currentIfEl);
-          marker.remove();
-        });
-        elForSpot._x_refreshXForScope(scopes[keys.indexOf(keyForSpot)]);
-      }
-      for (let i = 0; i < adds.length; i++) {
-        let [lastKey2, index] = adds[i];
-        let lastEl = lastKey2 === "template" ? templateEl : lookup[lastKey2];
-        if (lastEl._x_currentIfEl)
-          lastEl = lastEl._x_currentIfEl;
-        let scope2 = scopes[index];
-        let key = keys[index];
-        let clone2 = document.importNode(templateEl.content, true).firstElementChild;
-        let reactiveScope = reactive(scope2);
-        addScopeToNode(clone2, reactiveScope, templateEl);
-        clone2._x_refreshXForScope = (newScope) => {
-          Object.entries(newScope).forEach(([key2, value]) => {
-            reactiveScope[key2] = value;
-          });
-        };
-        mutateDom(() => {
-          lastEl.after(clone2);
-          skipDuringClone(() => initTree(clone2))();
-        });
-        if (typeof key === "object") {
-          warn("x-for key cannot be an object, it must be a string or an integer", templateEl);
-        }
-        lookup[key] = clone2;
-      }
-      for (let i = 0; i < sames.length; i++) {
-        lookup[sames[i]]._x_refreshXForScope(scopes[keys.indexOf(sames[i])]);
-      }
-      templateEl._x_prevKeys = keys;
-    });
-  }
-  function parseForExpression(expression) {
-    let forIteratorRE = /,([^,\}\]]*)(?:,([^,\}\]]*))?$/;
-    let stripParensRE = /^\s*\(|\)\s*$/g;
-    let forAliasRE = /([\s\S]*?)\s+(?:in|of)\s+([\s\S]*)/;
-    let inMatch = expression.match(forAliasRE);
-    if (!inMatch)
-      return;
-    let res = {};
-    res.items = inMatch[2].trim();
-    let item = inMatch[1].replace(stripParensRE, "").trim();
-    let iteratorMatch = item.match(forIteratorRE);
-    if (iteratorMatch) {
-      res.item = item.replace(forIteratorRE, "").trim();
-      res.index = iteratorMatch[1].trim();
-      if (iteratorMatch[2]) {
-        res.collection = iteratorMatch[2].trim();
-      }
-    } else {
-      res.item = item;
-    }
-    return res;
-  }
-  function getIterationScopeVariables(iteratorNames, item, index, items) {
-    let scopeVariables = {};
-    if (/^\[.*\]$/.test(iteratorNames.item) && Array.isArray(item)) {
-      let names = iteratorNames.item.replace("[", "").replace("]", "").split(",").map((i) => i.trim());
-      names.forEach((name, i) => {
-        scopeVariables[name] = item[i];
-      });
-    } else if (/^\{.*\}$/.test(iteratorNames.item) && !Array.isArray(item) && typeof item === "object") {
-      let names = iteratorNames.item.replace("{", "").replace("}", "").split(",").map((i) => i.trim());
-      names.forEach((name) => {
-        scopeVariables[name] = item[name];
-      });
-    } else {
-      scopeVariables[iteratorNames.item] = item;
-    }
-    if (iteratorNames.index)
-      scopeVariables[iteratorNames.index] = index;
-    if (iteratorNames.collection)
-      scopeVariables[iteratorNames.collection] = items;
-    return scopeVariables;
-  }
-  function isNumeric3(subject) {
-    return !Array.isArray(subject) && !isNaN(subject);
-  }
-
-  // packages/alpinejs/src/directives/x-ref.js
-  function handler3() {
-  }
-  handler3.inline = (el, { expression }, { cleanup: cleanup2 }) => {
-    let root = closestRoot(el);
-    if (!root._x_refs)
-      root._x_refs = {};
-    root._x_refs[expression] = el;
-    cleanup2(() => delete root._x_refs[expression]);
-  };
-  directive("ref", handler3);
-
-  // packages/alpinejs/src/directives/x-if.js
-  directive("if", (el, { expression }, { effect: effect3, cleanup: cleanup2 }) => {
-    if (el.tagName.toLowerCase() !== "template")
-      warn("x-if can only be used on a <template> tag", el);
-    let evaluate2 = evaluateLater(el, expression);
-    let show = () => {
-      if (el._x_currentIfEl)
-        return el._x_currentIfEl;
-      let clone2 = el.content.cloneNode(true).firstElementChild;
-      addScopeToNode(clone2, {}, el);
-      mutateDom(() => {
-        el.after(clone2);
-        skipDuringClone(() => initTree(clone2))();
-      });
-      el._x_currentIfEl = clone2;
-      el._x_undoIf = () => {
-        walk(clone2, (node) => {
-          if (!!node._x_effects) {
-            node._x_effects.forEach(dequeueJob);
-          }
-        });
-        clone2.remove();
-        delete el._x_currentIfEl;
-      };
-      return clone2;
-    };
-    let hide = () => {
-      if (!el._x_undoIf)
-        return;
-      el._x_undoIf();
-      delete el._x_undoIf;
-    };
-    effect3(() => evaluate2((value) => {
-      value ? show() : hide();
-    }));
-    cleanup2(() => el._x_undoIf && el._x_undoIf());
-  });
-
-  // packages/alpinejs/src/directives/x-id.js
-  directive("id", (el, { expression }, { evaluate: evaluate2 }) => {
-    let names = evaluate2(expression);
-    names.forEach((name) => setIdRoot(el, name));
-  });
-  interceptClone((from, to) => {
-    if (from._x_ids) {
-      to._x_ids = from._x_ids;
-    }
-  });
-
-  // packages/alpinejs/src/directives/x-on.js
-  mapAttributes(startingWith("@", into(prefix("on:"))));
-  directive("on", skipDuringClone((el, { value, modifiers, expression }, { cleanup: cleanup2 }) => {
-    let evaluate2 = expression ? evaluateLater(el, expression) : () => {
-    };
-    if (el.tagName.toLowerCase() === "template") {
-      if (!el._x_forwardEvents)
-        el._x_forwardEvents = [];
-      if (!el._x_forwardEvents.includes(value))
-        el._x_forwardEvents.push(value);
-    }
-    let removeListener = on(el, value, modifiers, (e) => {
-      evaluate2(() => {
-      }, { scope: { "$event": e }, params: [e] });
-    });
-    cleanup2(() => removeListener());
-  }));
-
-  // packages/alpinejs/src/directives/index.js
-  warnMissingPluginDirective("Collapse", "collapse", "collapse");
-  warnMissingPluginDirective("Intersect", "intersect", "intersect");
-  warnMissingPluginDirective("Focus", "trap", "focus");
-  warnMissingPluginDirective("Mask", "mask", "mask");
-  function warnMissingPluginDirective(name, directiveName, slug) {
-    directive(directiveName, (el) => warn(`You can't use [x-${directiveName}] without first installing the "${name}" plugin here: https://alpinejs.dev/plugins/${slug}`, el));
-  }
-
-  // packages/alpinejs/src/index.js
-  alpine_default.setEvaluator(normalEvaluator);
-  alpine_default.setReactivityEngine({ reactive: reactive2, effect: effect2, release: stop, raw: toRaw });
-  var src_default = alpine_default;
-
-  // packages/alpinejs/builds/cdn.js
-  window.Alpine = src_default;
-  queueMicrotask(() => {
-    src_default.start();
-  });
-})();
+(()=>{var e,t,n,r,i=!1,o=!1,a=[],s=-1;function l(e){!function(e){a.includes(e)||a.push(e);o||i||(i=!0,queueMicrotask(u))}(e)}function c(e){let t=a.indexOf(e);-1!==t&&t>s&&a.splice(t,1)}function u(){i=!1,o=!0;for(let e=0;e<a.length;e++)a[e](),s=e;a.length=0,s=-1,o=!1}var f=!0;function d(e){t=e}function _(e,r){let i,o=!0,a=t((()=>{let t=e();JSON.stringify(t),o?i=t:queueMicrotask((()=>{r(t,i),i=t})),o=!1}));return()=>n(a)}var p=[],h=[],x=[];function g(e,t){"function"==typeof t?(e._x_cleanups||(e._x_cleanups=[]),e._x_cleanups.push(t)):(t=e,h.push(t))}function m(e){p.push(e)}function v(e,t,n){e._x_attributeCleanups||(e._x_attributeCleanups={}),e._x_attributeCleanups[t]||(e._x_attributeCleanups[t]=[]),e._x_attributeCleanups[t].push(n)}function y(e,t){e._x_attributeCleanups&&Object.entries(e._x_attributeCleanups).forEach((([n,r])=>{(void 0===t||t.includes(n))&&(r.forEach((e=>e())),delete e._x_attributeCleanups[n])}))}var b=new MutationObserver(j),w=!1;function E(){b.observe(document,{subtree:!0,childList:!0,attributes:!0,attributeOldValue:!0}),w=!0}function A(){!function(){let e=b.takeRecords();k.push((()=>e.length>0&&j(e)));let t=k.length;queueMicrotask((()=>{if(k.length===t)for(;k.length>0;)k.shift()()}))}(),b.disconnect(),w=!1}var k=[];function S(e){if(!w)return e();A();let t=e();return E(),t}var O=!1,C=[];function j(e){if(O)return void(C=C.concat(e));let t=new Set,n=new Set,r=new Map,i=new Map;for(let o=0;o<e.length;o++)if(!e[o].target._x_ignoreMutationObserver&&("childList"===e[o].type&&(e[o].addedNodes.forEach((e=>1===e.nodeType&&t.add(e))),e[o].removedNodes.forEach((e=>1===e.nodeType&&n.add(e)))),"attributes"===e[o].type)){let t=e[o].target,n=e[o].attributeName,a=e[o].oldValue,s=()=>{r.has(t)||r.set(t,[]),r.get(t).push({name:n,value:t.getAttribute(n)})},l=()=>{i.has(t)||i.set(t,[]),i.get(t).push(n)};t.hasAttribute(n)&&null===a?s():t.hasAttribute(n)?(l(),s()):l()}i.forEach(((e,t)=>{y(t,e)})),r.forEach(((e,t)=>{p.forEach((n=>n(t,e)))}));for(let e of n)t.has(e)||h.forEach((t=>t(e)));t.forEach((e=>{e._x_ignoreSelf=!0,e._x_ignore=!0}));for(let e of t)n.has(e)||e.isConnected&&(delete e._x_ignoreSelf,delete e._x_ignore,x.forEach((t=>t(e))),e._x_ignore=!0,e._x_ignoreSelf=!0);t.forEach((e=>{delete e._x_ignoreSelf,delete e._x_ignore})),t=null,n=null,r=null,i=null}function $(e){return L(M(e))}function N(e,t,n){return e._x_dataStack=[t,...M(n||e)],()=>{e._x_dataStack=e._x_dataStack.filter((e=>e!==t))}}function M(e){return e._x_dataStack?e._x_dataStack:"function"==typeof ShadowRoot&&e instanceof ShadowRoot?M(e.host):e.parentNode?M(e.parentNode):[]}function L(e){return new Proxy({objects:e},P)}var P={ownKeys:({objects:e})=>Array.from(new Set(e.flatMap((e=>Object.keys(e))))),has:({objects:e},t)=>t!=Symbol.unscopables&&e.some((e=>Object.prototype.hasOwnProperty.call(e,t)||Reflect.has(e,t))),get:({objects:e},t,n)=>"toJSON"==t?R:Reflect.get(e.find((e=>Reflect.has(e,t)))||{},t,n),set({objects:e},t,n,r){const i=e.find((e=>Object.prototype.hasOwnProperty.call(e,t)))||e[e.length-1],o=Object.getOwnPropertyDescriptor(i,t);return o?.set&&o?.get?Reflect.set(i,t,n,r):Reflect.set(i,t,n)}};function R(){return Reflect.ownKeys(this).reduce(((e,t)=>(e[t]=Reflect.get(this,t),e)),{})}function T(e){let t=(n,r="")=>{Object.entries(Object.getOwnPropertyDescriptors(n)).forEach((([i,{value:o,enumerable:a}])=>{if(!1===a||void 0===o)return;if("object"==typeof o&&null!==o&&o.__v_skip)return;let s=""===r?i:`${r}.${i}`;var l;"object"==typeof o&&null!==o&&o._x_interceptor?n[i]=o.initialize(e,s,i):"object"!=typeof(l=o)||Array.isArray(l)||null===l||o===n||o instanceof Element||t(o,s)}))};return t(e)}function z(e,t=(()=>{})){let n={initialValue:void 0,_x_interceptor:!0,initialize(t,n,r){return e(this.initialValue,(()=>function(e,t){return t.split(".").reduce(((e,t)=>e[t]),e)}(t,n)),(e=>D(t,n,e)),n,r)}};return t(n),e=>{if("object"==typeof e&&null!==e&&e._x_interceptor){let t=n.initialize.bind(n);n.initialize=(r,i,o)=>{let a=e.initialize(r,i,o);return n.initialValue=a,t(r,i,o)}}else n.initialValue=e;return n}}function D(e,t,n){if("string"==typeof t&&(t=t.split(".")),1!==t.length){if(0===t.length)throw error;return e[t[0]]||(e[t[0]]={}),D(e[t[0]],t.slice(1),n)}e[t[0]]=n}var B={};function I(e,t){B[e]=t}function q(e,t){return Object.entries(B).forEach((([n,r])=>{let i=null;Object.defineProperty(e,`$${n}`,{get:()=>r(t,function(){if(i)return i;{let[e,n]=se(t);return i={interceptor:z,...e},g(t,n),i}}()),enumerable:!1})})),e}function F(e,t,n,...r){try{return n(...r)}catch(n){W(n,e,t)}}function W(e,t,n=void 0){e=Object.assign(e??{message:"No error message given."},{el:t,expression:n}),console.warn(`Alpine Expression Error: ${e.message}\n\n${n?'Expression: "'+n+'"\n\n':""}`,t),setTimeout((()=>{throw e}),0)}var K=!0;function U(e){let t=K;K=!1;let n=e();return K=t,n}function V(e,t,n={}){let r;return J(e,t)((e=>r=e),n),r}function J(...e){return H(...e)}var H=Z;function Z(e,t){let n={};q(n,e);let r=[n,...M(e)],i="function"==typeof t?function(e,t){return(n=(()=>{}),{scope:r={},params:i=[]}={})=>{Y(n,t.apply(L([r,...e]),i))}}(r,t):function(e,t,n){let r=function(e,t){if(X[e])return X[e];let n=Object.getPrototypeOf((async function(){})).constructor,r=/^[\n\s]*if.*\(.*\)/.test(e.trim())||/^(let|const)\s/.test(e.trim())?`(async()=>{ ${e} })()`:e;const i=()=>{try{let t=new n(["__self","scope"],`with (scope) { __self.result = ${r} }; __self.finished = true; return __self.result;`);return Object.defineProperty(t,"name",{value:`[Alpine] ${e}`}),t}catch(n){return W(n,t,e),Promise.resolve()}};let o=i();return X[e]=o,o}(t,n);return(i=(()=>{}),{scope:o={},params:a=[]}={})=>{r.result=void 0,r.finished=!1;let s=L([o,...e]);if("function"==typeof r){let e=r(r,s).catch((e=>W(e,n,t)));r.finished?(Y(i,r.result,s,a,n),r.result=void 0):e.then((e=>{Y(i,e,s,a,n)})).catch((e=>W(e,n,t))).finally((()=>r.result=void 0))}}}(r,t,e);return F.bind(null,e,t,i)}var X={};function Y(e,t,n,r,i){if(K&&"function"==typeof t){let o=t.apply(n,r);o instanceof Promise?o.then((t=>Y(e,t,n,r))).catch((e=>W(e,i,t))):e(o)}else"object"==typeof t&&t instanceof Promise?t.then((t=>e(t))):e(t)}var G="x-";function Q(e=""){return G+e}var ee={};function te(e,t){return ee[e]=t,{before(t){if(!ee[t])return void console.warn(String.raw`Cannot find directive \`${t}\`. \`${e}\` will use the default order of execution`);const n=he.indexOf(t);he.splice(n>=0?n:he.indexOf("DEFAULT"),0,e)}}}function ne(e,t,n){if(t=Array.from(t),e._x_virtualDirectives){let n=Object.entries(e._x_virtualDirectives).map((([e,t])=>({name:e,value:t}))),r=re(n);n=n.map((e=>r.find((t=>t.name===e.name))?{name:`x-bind:${e.name}`,value:`"${e.value}"`}:e)),t=t.concat(n)}let r={},i=t.map(ce(((e,t)=>r[e]=t))).filter(de).map(function(e,t){return({name:n,value:r})=>{let i=n.match(_e()),o=n.match(/:([a-zA-Z0-9\-_:]+)/),a=n.match(/\.[^.\]]+(?=[^\]]*$)/g)||[],s=t||e[n]||n;return{type:i?i[1]:null,value:o?o[1]:null,modifiers:a.map((e=>e.replace(".",""))),expression:r,original:s}}}(r,n)).sort(xe);return i.map((t=>function(e,t){let n=()=>{},r=ee[t.type]||n,[i,o]=se(e);v(e,t.original,o);let a=()=>{e._x_ignore||e._x_ignoreSelf||(r.inline&&r.inline(e,t,i),r=r.bind(r,e,t,i),ie?oe.get(ae).push(r):r())};return a.runCleanups=o,a}(e,t)))}function re(e){return Array.from(e).map(ce()).filter((e=>!de(e)))}var ie=!1,oe=new Map,ae=Symbol();function se(e){let r=[],[i,o]=function(e){let r=()=>{};return[i=>{let o=t(i);return e._x_effects||(e._x_effects=new Set,e._x_runEffects=()=>{e._x_effects.forEach((e=>e()))}),e._x_effects.add(o),r=()=>{void 0!==o&&(e._x_effects.delete(o),n(o))},o},()=>{r()}]}(e);r.push(o);return[{Alpine:ft,effect:i,cleanup:e=>r.push(e),evaluateLater:J.bind(J,e),evaluate:V.bind(V,e)},()=>r.forEach((e=>e()))]}var le=(e,t)=>({name:n,value:r})=>(n.startsWith(e)&&(n=n.replace(e,t)),{name:n,value:r});function ce(e=(()=>{})){return({name:t,value:n})=>{let{name:r,value:i}=ue.reduce(((e,t)=>t(e)),{name:t,value:n});return r!==t&&e(r,t),{name:r,value:i}}}var ue=[];function fe(e){ue.push(e)}function de({name:e}){return _e().test(e)}var _e=()=>new RegExp(`^${G}([^:^.]+)\\b`);var pe="DEFAULT",he=["ignore","ref","data","id","anchor","bind","init","for","model","modelable","transition","show","if",pe,"teleport"];function xe(e,t){let n=-1===he.indexOf(e.type)?pe:e.type,r=-1===he.indexOf(t.type)?pe:t.type;return he.indexOf(n)-he.indexOf(r)}function ge(e,t,n={}){e.dispatchEvent(new CustomEvent(t,{detail:n,bubbles:!0,composed:!0,cancelable:!0}))}function me(e,t){if("function"==typeof ShadowRoot&&e instanceof ShadowRoot)return void Array.from(e.children).forEach((e=>me(e,t)));let n=!1;if(t(e,(()=>n=!0)),n)return;let r=e.firstElementChild;for(;r;)me(r,t),r=r.nextElementSibling}function ve(e,...t){console.warn(`Alpine Warning: ${e}`,...t)}var ye=!1;var be=[],we=[];function Ee(){return be.map((e=>e()))}function Ae(){return be.concat(we).map((e=>e()))}function ke(e){be.push(e)}function Se(e){we.push(e)}function Oe(e,t=!1){return Ce(e,(e=>{if((t?Ae():Ee()).some((t=>e.matches(t))))return!0}))}function Ce(e,t){if(e){if(t(e))return e;if(e._x_teleportBack&&(e=e._x_teleportBack),e.parentElement)return Ce(e.parentElement,t)}}var je=[];function $e(e,t=me,n=(()=>{})){!function(e){ie=!0;let t=Symbol();ae=t,oe.set(t,[]);let n=()=>{for(;oe.get(t).length;)oe.get(t).shift()();oe.delete(t)};e(n),ie=!1,n()}((()=>{t(e,((e,t)=>{n(e,t),je.forEach((n=>n(e,t))),ne(e,e.attributes).forEach((e=>e())),e._x_ignore&&t()}))}))}function Ne(e,t=me){t(e,(e=>{y(e),function(e){if(e._x_cleanups)for(;e._x_cleanups.length;)e._x_cleanups.pop()()}(e)}))}var Me=[],Le=!1;function Pe(e=(()=>{})){return queueMicrotask((()=>{Le||setTimeout((()=>{Re()}))})),new Promise((t=>{Me.push((()=>{e(),t()}))}))}function Re(){for(Le=!1;Me.length;)Me.shift()()}function Te(e,t){return Array.isArray(t)?ze(e,t.join(" ")):"object"==typeof t&&null!==t?function(e,t){let n=e=>e.split(" ").filter(Boolean),r=Object.entries(t).flatMap((([e,t])=>!!t&&n(e))).filter(Boolean),i=Object.entries(t).flatMap((([e,t])=>!t&&n(e))).filter(Boolean),o=[],a=[];return i.forEach((t=>{e.classList.contains(t)&&(e.classList.remove(t),a.push(t))})),r.forEach((t=>{e.classList.contains(t)||(e.classList.add(t),o.push(t))})),()=>{a.forEach((t=>e.classList.add(t))),o.forEach((t=>e.classList.remove(t)))}}(e,t):"function"==typeof t?Te(e,t()):ze(e,t)}function ze(e,t){return t=!0===t?t="":t||"",n=t.split(" ").filter((t=>!e.classList.contains(t))).filter(Boolean),e.classList.add(...n),()=>{e.classList.remove(...n)};var n}function De(e,t){return"object"==typeof t&&null!==t?function(e,t){let n={};return Object.entries(t).forEach((([t,r])=>{n[t]=e.style[t],t.startsWith("--")||(t=t.replace(/([a-z])([A-Z])/g,"$1-$2").toLowerCase()),e.style.setProperty(t,r)})),setTimeout((()=>{0===e.style.length&&e.removeAttribute("style")})),()=>{De(e,n)}}(e,t):function(e,t){let n=e.getAttribute("style",t);return e.setAttribute("style",t),()=>{e.setAttribute("style",n||"")}}(e,t)}function Be(e,t=(()=>{})){let n=!1;return function(){n?t.apply(this,arguments):(n=!0,e.apply(this,arguments))}}function Ie(e,t,n={}){e._x_transition||(e._x_transition={enter:{during:n,start:n,end:n},leave:{during:n,start:n,end:n},in(n=(()=>{}),r=(()=>{})){Fe(e,t,{during:this.enter.during,start:this.enter.start,end:this.enter.end},n,r)},out(n=(()=>{}),r=(()=>{})){Fe(e,t,{during:this.leave.during,start:this.leave.start,end:this.leave.end},n,r)}})}function qe(e){let t=e.parentNode;if(t)return t._x_hidePromise?t:qe(t)}function Fe(e,t,{during:n,start:r,end:i}={},o=(()=>{}),a=(()=>{})){if(e._x_transitioning&&e._x_transitioning.cancel(),0===Object.keys(n).length&&0===Object.keys(r).length&&0===Object.keys(i).length)return o(),void a();let s,l,c;!function(e,t){let n,r,i,o=Be((()=>{S((()=>{n=!0,r||t.before(),i||(t.end(),Re()),t.after(),e.isConnected&&t.cleanup(),delete e._x_transitioning}))}));e._x_transitioning={beforeCancels:[],beforeCancel(e){this.beforeCancels.push(e)},cancel:Be((function(){for(;this.beforeCancels.length;)this.beforeCancels.shift()();o()})),finish:o},S((()=>{t.start(),t.during()})),Le=!0,requestAnimationFrame((()=>{if(n)return;let o=1e3*Number(getComputedStyle(e).transitionDuration.replace(/,.*/,"").replace("s","")),a=1e3*Number(getComputedStyle(e).transitionDelay.replace(/,.*/,"").replace("s",""));0===o&&(o=1e3*Number(getComputedStyle(e).animationDuration.replace("s",""))),S((()=>{t.before()})),r=!0,requestAnimationFrame((()=>{n||(S((()=>{t.end()})),Re(),setTimeout(e._x_transitioning.finish,o+a),i=!0)}))}))}(e,{start(){s=t(e,r)},during(){l=t(e,n)},before:o,end(){s(),c=t(e,i)},after:a,cleanup(){l(),c()}})}function We(e,t,n){if(-1===e.indexOf(t))return n;const r=e[e.indexOf(t)+1];if(!r)return n;if("scale"===t&&isNaN(r))return n;if("duration"===t||"delay"===t){let e=r.match(/([0-9]+)ms/);if(e)return e[1]}return"origin"===t&&["top","right","left","center","bottom"].includes(e[e.indexOf(t)+2])?[r,e[e.indexOf(t)+2]].join(" "):r}te("transition",((e,{value:t,modifiers:n,expression:r},{evaluate:i})=>{"function"==typeof r&&(r=i(r)),!1!==r&&(r&&"boolean"!=typeof r?function(e,t,n){Ie(e,Te,"");let r={enter:t=>{e._x_transition.enter.during=t},"enter-start":t=>{e._x_transition.enter.start=t},"enter-end":t=>{e._x_transition.enter.end=t},leave:t=>{e._x_transition.leave.during=t},"leave-start":t=>{e._x_transition.leave.start=t},"leave-end":t=>{e._x_transition.leave.end=t}};r[n](t)}(e,r,t):function(e,t,n){Ie(e,De);let r=!t.includes("in")&&!t.includes("out")&&!n,i=r||t.includes("in")||["enter"].includes(n),o=r||t.includes("out")||["leave"].includes(n);t.includes("in")&&!r&&(t=t.filter(((e,n)=>n<t.indexOf("out"))));t.includes("out")&&!r&&(t=t.filter(((e,n)=>n>t.indexOf("out"))));let a=!t.includes("opacity")&&!t.includes("scale"),s=a||t.includes("opacity"),l=a||t.includes("scale"),c=s?0:1,u=l?We(t,"scale",95)/100:1,f=We(t,"delay",0)/1e3,d=We(t,"origin","center"),_="opacity, transform",p=We(t,"duration",150)/1e3,h=We(t,"duration",75)/1e3,x="cubic-bezier(0.4, 0.0, 0.2, 1)";i&&(e._x_transition.enter.during={transformOrigin:d,transitionDelay:`${f}s`,transitionProperty:_,transitionDuration:`${p}s`,transitionTimingFunction:x},e._x_transition.enter.start={opacity:c,transform:`scale(${u})`},e._x_transition.enter.end={opacity:1,transform:"scale(1)"});o&&(e._x_transition.leave.during={transformOrigin:d,transitionDelay:`${f}s`,transitionProperty:_,transitionDuration:`${h}s`,transitionTimingFunction:x},e._x_transition.leave.start={opacity:1,transform:"scale(1)"},e._x_transition.leave.end={opacity:c,transform:`scale(${u})`})}(e,n,t))})),window.Element.prototype._x_toggleAndCascadeWithTransitions=function(e,t,n,r){const i="visible"===document.visibilityState?requestAnimationFrame:setTimeout;let o=()=>i(n);t?e._x_transition&&(e._x_transition.enter||e._x_transition.leave)?e._x_transition.enter&&(Object.entries(e._x_transition.enter.during).length||Object.entries(e._x_transition.enter.start).length||Object.entries(e._x_transition.enter.end).length)?e._x_transition.in(n):o():e._x_transition?e._x_transition.in(n):o():(e._x_hidePromise=e._x_transition?new Promise(((t,n)=>{e._x_transition.out((()=>{}),(()=>t(r))),e._x_transitioning&&e._x_transitioning.beforeCancel((()=>n({isFromCancelledTransition:!0})))})):Promise.resolve(r),queueMicrotask((()=>{let t=qe(e);t?(t._x_hideChildren||(t._x_hideChildren=[]),t._x_hideChildren.push(e)):i((()=>{let t=e=>{let n=Promise.all([e._x_hidePromise,...(e._x_hideChildren||[]).map(t)]).then((([e])=>e()));return delete e._x_hidePromise,delete e._x_hideChildren,n};t(e).catch((e=>{if(!e.isFromCancelledTransition)throw e}))}))})))};var Ke=!1;function Ue(e,t=(()=>{})){return(...n)=>Ke?t(...n):e(...n)}var Ve=[];function Je(e){Ve.push(e)}var He=!1;function Ze(e){let r=t;d(((e,t)=>{let i=r(e);return n(i),()=>{}})),e(),d(r)}function Xe(t,n,r,i=[]){switch(t._x_bindings||(t._x_bindings=e({})),t._x_bindings[n]=r,n=i.includes("camel")?n.toLowerCase().replace(/-(\w)/g,((e,t)=>t.toUpperCase())):n){case"value":!function(e,t){if("radio"===e.type)void 0===e.attributes.value&&(e.value=t),window.fromModel&&(e.checked="boolean"==typeof t?Qe(e.value)===t:Ge(e.value,t));else if("checkbox"===e.type)Number.isInteger(t)?e.value=t:Array.isArray(t)||"boolean"==typeof t||[null,void 0].includes(t)?Array.isArray(t)?e.checked=t.some((t=>Ge(t,e.value))):e.checked=!!t:e.value=String(t);else if("SELECT"===e.tagName)!function(e,t){const n=[].concat(t).map((e=>e+""));Array.from(e.options).forEach((e=>{e.selected=n.includes(e.value)}))}(e,t);else{if(e.value===t)return;e.value=void 0===t?"":t}}(t,r);break;case"style":!function(e,t){e._x_undoAddedStyles&&e._x_undoAddedStyles();e._x_undoAddedStyles=De(e,t)}(t,r);break;case"class":!function(e,t){e._x_undoAddedClasses&&e._x_undoAddedClasses();e._x_undoAddedClasses=Te(e,t)}(t,r);break;case"selected":case"checked":!function(e,t,n){Ye(e,t,n),function(e,t,n){e[t]!==n&&(e[t]=n)}(e,t,n)}(t,n,r);break;default:Ye(t,n,r)}}function Ye(e,t,n){[null,void 0,!1].includes(n)&&function(e){return!["aria-pressed","aria-checked","aria-expanded","aria-selected"].includes(e)}(t)?e.removeAttribute(t):(et(t)&&(n=t),function(e,t,n){e.getAttribute(t)!=n&&e.setAttribute(t,n)}(e,t,n))}function Ge(e,t){return e==t}function Qe(e){return!![1,"1","true","on","yes",!0].includes(e)||![0,"0","false","off","no",!1].includes(e)&&(e?Boolean(e):null)}function et(e){return["disabled","checked","required","readonly","open","selected","autofocus","itemscope","multiple","novalidate","allowfullscreen","allowpaymentrequest","formnovalidate","autoplay","controls","loop","muted","playsinline","default","ismap","reversed","async","defer","nomodule"].includes(e)}function tt(e,t,n){let r=e.getAttribute(t);return null===r?"function"==typeof n?n():n:""===r||(et(t)?!![t,"true"].includes(r):r)}function nt(e,t){var n;return function(){var r=this,i=arguments;clearTimeout(n),n=setTimeout((function(){n=null,e.apply(r,i)}),t)}}function rt(e,t){let n;return function(){let r=this,i=arguments;n||(e.apply(r,i),n=!0,setTimeout((()=>n=!1),t))}}function it({get:e,set:r},{get:i,set:o}){let a,s,l=!0,c=t((()=>{let t=e(),n=i();if(l)o(ot(t)),l=!1;else{let e=JSON.stringify(t),i=JSON.stringify(n);e!==a?o(ot(t)):e!==i&&r(ot(n))}a=JSON.stringify(e()),s=JSON.stringify(i())}));return()=>{n(c)}}function ot(e){return"object"==typeof e?JSON.parse(JSON.stringify(e)):e}var at={},st=!1;var lt={};function ct(e,t,n){let r=[];for(;r.length;)r.pop()();let i=Object.entries(t).map((([e,t])=>({name:e,value:t}))),o=re(i);return i=i.map((e=>o.find((t=>t.name===e.name))?{name:`x-bind:${e.name}`,value:`"${e.value}"`}:e)),ne(e,i,n).map((e=>{r.push(e.runCleanups),e()})),()=>{for(;r.length;)r.pop()()}}var ut={};var ft={get reactive(){return e},get release(){return n},get effect(){return t},get raw(){return r},version:"3.13.10",flushAndStopDeferringMutations:function(){O=!1,j(C),C=[]},dontAutoEvaluateFunctions:U,disableEffectScheduling:function(e){f=!1,e(),f=!0},startObservingMutations:E,stopObservingMutations:A,setReactivityEngine:function(i){e=i.reactive,n=i.release,t=e=>i.effect(e,{scheduler:e=>{f?l(e):e()}}),r=i.raw},onAttributeRemoved:v,onAttributesAdded:m,closestDataStack:M,skipDuringClone:Ue,onlyDuringClone:function(e){return(...t)=>Ke&&e(...t)},addRootSelector:ke,addInitSelector:Se,interceptClone:Je,addScopeToNode:N,deferMutations:function(){O=!0},mapAttributes:fe,evaluateLater:J,interceptInit:function(e){je.push(e)},setEvaluator:function(e){H=e},mergeProxies:L,extractProp:function(e,t,n,r=!0){if(e._x_bindings&&void 0!==e._x_bindings[t])return e._x_bindings[t];if(e._x_inlineBindings&&void 0!==e._x_inlineBindings[t]){let n=e._x_inlineBindings[t];return n.extract=r,U((()=>V(e,n.expression)))}return tt(e,t,n)},findClosest:Ce,onElRemoved:g,closestRoot:Oe,destroyTree:Ne,interceptor:z,transition:Fe,setStyles:De,mutateDom:S,directive:te,entangle:it,throttle:rt,debounce:nt,evaluate:V,initTree:$e,nextTick:Pe,prefixed:Q,prefix:function(e){G=e},plugin:function(e){(Array.isArray(e)?e:[e]).forEach((e=>e(ft)))},magic:I,store:function(t,n){if(st||(at=e(at),st=!0),void 0===n)return at[t];at[t]=n,"object"==typeof n&&null!==n&&n.hasOwnProperty("init")&&"function"==typeof n.init&&at[t].init(),T(at[t])},start:function(){var e;ye&&ve("Alpine has already been initialized on this page. Calling Alpine.start() more than once can cause problems."),ye=!0,document.body||ve("Unable to initialize. Trying to load Alpine before `<body>` is available. Did you forget to add `defer` in Alpine's `<script>` tag?"),ge(document,"alpine:init"),ge(document,"alpine:initializing"),E(),e=e=>$e(e,me),x.push(e),g((e=>Ne(e))),m(((e,t)=>{ne(e,t).forEach((e=>e()))})),Array.from(document.querySelectorAll(Ae().join(","))).filter((e=>!Oe(e.parentElement,!0))).forEach((e=>{$e(e)})),ge(document,"alpine:initialized"),setTimeout((()=>{[["ui","dialog",["[x-dialog], [x-popover]"]],["anchor","anchor",["[x-anchor]"]],["sort","sort",["[x-sort]"]]].forEach((([e,t,n])=>{var r;r=t,Object.keys(ee).includes(r)||n.some((t=>{if(document.querySelector(t))return ve(`found "${t}", but missing ${e} plugin`),!0}))}))}))},clone:function(e,t){t._x_dataStack||(t._x_dataStack=e._x_dataStack),Ke=!0,He=!0,Ze((()=>{!function(e){let t=!1;$e(e,((e,n)=>{me(e,((e,r)=>{if(t&&function(e){return Ee().some((t=>e.matches(t)))}(e))return r();t=!0,n(e,r)}))}))}(t)})),Ke=!1,He=!1},cloneNode:function(e,t){Ve.forEach((n=>n(e,t))),Ke=!0,Ze((()=>{$e(t,((e,t)=>{t(e,(()=>{}))}))})),Ke=!1},bound:function(e,t,n){return e._x_bindings&&void 0!==e._x_bindings[t]?e._x_bindings[t]:tt(e,t,n)},$data:$,watch:_,walk:me,data:function(e,t){ut[e]=t},bind:function(e,t){let n="function"!=typeof t?()=>t:t;return e instanceof Element?ct(e,n()):(lt[e]=n,()=>{})}};function dt(e,t){const n=Object.create(null),r=e.split(",");for(let e=0;e<r.length;e++)n[r[e]]=!0;return t?e=>!!n[e.toLowerCase()]:e=>!!n[e]}var _t,pt=Object.freeze({}),ht=(Object.freeze([]),Object.prototype.hasOwnProperty),xt=(e,t)=>ht.call(e,t),gt=Array.isArray,mt=e=>"[object Map]"===wt(e),vt=e=>"symbol"==typeof e,yt=e=>null!==e&&"object"==typeof e,bt=Object.prototype.toString,wt=e=>bt.call(e),Et=e=>wt(e).slice(8,-1),At=e=>"string"==typeof e&&"NaN"!==e&&"-"!==e[0]&&""+parseInt(e,10)===e,kt=e=>{const t=Object.create(null);return n=>t[n]||(t[n]=e(n))},St=/-(\w)/g,Ot=(kt((e=>e.replace(St,((e,t)=>t?t.toUpperCase():"")))),/\B([A-Z])/g),Ct=(kt((e=>e.replace(Ot,"-$1").toLowerCase())),kt((e=>e.charAt(0).toUpperCase()+e.slice(1)))),jt=(kt((e=>e?`on${Ct(e)}`:"")),(e,t)=>e!==t&&(e==e||t==t)),$t=new WeakMap,Nt=[],Mt=Symbol("iterate"),Lt=Symbol("Map key iterate");var Pt=0;function Rt(e){const{deps:t}=e;if(t.length){for(let n=0;n<t.length;n++)t[n].delete(e);t.length=0}}var Tt=!0,zt=[];function Dt(){const e=zt.pop();Tt=void 0===e||e}function Bt(e,t,n){if(!Tt||void 0===_t)return;let r=$t.get(e);r||$t.set(e,r=new Map);let i=r.get(n);i||r.set(n,i=new Set),i.has(_t)||(i.add(_t),_t.deps.push(i),_t.options.onTrack&&_t.options.onTrack({effect:_t,target:e,type:t,key:n}))}function It(e,t,n,r,i,o){const a=$t.get(e);if(!a)return;const s=new Set,l=e=>{e&&e.forEach((e=>{(e!==_t||e.allowRecurse)&&s.add(e)}))};if("clear"===t)a.forEach(l);else if("length"===n&&gt(e))a.forEach(((e,t)=>{("length"===t||t>=r)&&l(e)}));else switch(void 0!==n&&l(a.get(n)),t){case"add":gt(e)?At(n)&&l(a.get("length")):(l(a.get(Mt)),mt(e)&&l(a.get(Lt)));break;case"delete":gt(e)||(l(a.get(Mt)),mt(e)&&l(a.get(Lt)));break;case"set":mt(e)&&l(a.get(Mt))}s.forEach((a=>{a.options.onTrigger&&a.options.onTrigger({effect:a,target:e,key:n,type:t,newValue:r,oldValue:i,oldTarget:o}),a.options.scheduler?a.options.scheduler(a):a()}))}var qt=dt("__proto__,__v_isRef,__isVue"),Ft=new Set(Object.getOwnPropertyNames(Symbol).map((e=>Symbol[e])).filter(vt)),Wt=Jt(),Kt=Jt(!0),Ut=Vt();function Vt(){const e={};return["includes","indexOf","lastIndexOf"].forEach((t=>{e[t]=function(...e){const n=Cn(this);for(let e=0,t=this.length;e<t;e++)Bt(n,"get",e+"");const r=n[t](...e);return-1===r||!1===r?n[t](...e.map(Cn)):r}})),["push","pop","shift","unshift","splice"].forEach((t=>{e[t]=function(...e){zt.push(Tt),Tt=!1;const n=Cn(this)[t].apply(this,e);return Dt(),n}})),e}function Jt(e=!1,t=!1){return function(n,r,i){if("__v_isReactive"===r)return!e;if("__v_isReadonly"===r)return e;if("__v_raw"===r&&i===(e?t?An:En:t?wn:bn).get(n))return n;const o=gt(n);if(!e&&o&&xt(Ut,r))return Reflect.get(Ut,r,i);const a=Reflect.get(n,r,i);if(vt(r)?Ft.has(r):qt(r))return a;if(e||Bt(n,"get",r),t)return a;if(jn(a)){return!o||!At(r)?a.value:a}return yt(a)?e?Sn(a):kn(a):a}}function Ht(e=!1){return function(t,n,r,i){let o=t[n];if(!e&&(r=Cn(r),o=Cn(o),!gt(t)&&jn(o)&&!jn(r)))return o.value=r,!0;const a=gt(t)&&At(n)?Number(n)<t.length:xt(t,n),s=Reflect.set(t,n,r,i);return t===Cn(i)&&(a?jt(r,o)&&It(t,"set",n,r,o):It(t,"add",n,r)),s}}var Zt={get:Wt,set:Ht(),deleteProperty:function(e,t){const n=xt(e,t),r=e[t],i=Reflect.deleteProperty(e,t);return i&&n&&It(e,"delete",t,void 0,r),i},has:function(e,t){const n=Reflect.has(e,t);return vt(t)&&Ft.has(t)||Bt(e,"has",t),n},ownKeys:function(e){return Bt(e,"iterate",gt(e)?"length":Mt),Reflect.ownKeys(e)}},Xt={get:Kt,set:(e,t)=>(console.warn(`Set operation on key "${String(t)}" failed: target is readonly.`,e),!0),deleteProperty:(e,t)=>(console.warn(`Delete operation on key "${String(t)}" failed: target is readonly.`,e),!0)},Yt=e=>yt(e)?kn(e):e,Gt=e=>yt(e)?Sn(e):e,Qt=e=>e,en=e=>Reflect.getPrototypeOf(e);function tn(e,t,n=!1,r=!1){const i=Cn(e=e.__v_raw),o=Cn(t);t!==o&&!n&&Bt(i,"get",t),!n&&Bt(i,"get",o);const{has:a}=en(i),s=r?Qt:n?Gt:Yt;return a.call(i,t)?s(e.get(t)):a.call(i,o)?s(e.get(o)):void(e!==i&&e.get(t))}function nn(e,t=!1){const n=this.__v_raw,r=Cn(n),i=Cn(e);return e!==i&&!t&&Bt(r,"has",e),!t&&Bt(r,"has",i),e===i?n.has(e):n.has(e)||n.has(i)}function rn(e,t=!1){return e=e.__v_raw,!t&&Bt(Cn(e),"iterate",Mt),Reflect.get(e,"size",e)}function on(e){e=Cn(e);const t=Cn(this);return en(t).has.call(t,e)||(t.add(e),It(t,"add",e,e)),this}function an(e,t){t=Cn(t);const n=Cn(this),{has:r,get:i}=en(n);let o=r.call(n,e);o?yn(n,r,e):(e=Cn(e),o=r.call(n,e));const a=i.call(n,e);return n.set(e,t),o?jt(t,a)&&It(n,"set",e,t,a):It(n,"add",e,t),this}function sn(e){const t=Cn(this),{has:n,get:r}=en(t);let i=n.call(t,e);i?yn(t,n,e):(e=Cn(e),i=n.call(t,e));const o=r?r.call(t,e):void 0,a=t.delete(e);return i&&It(t,"delete",e,void 0,o),a}function ln(){const e=Cn(this),t=0!==e.size,n=mt(e)?new Map(e):new Set(e),r=e.clear();return t&&It(e,"clear",void 0,void 0,n),r}function cn(e,t){return function(n,r){const i=this,o=i.__v_raw,a=Cn(o),s=t?Qt:e?Gt:Yt;return!e&&Bt(a,"iterate",Mt),o.forEach(((e,t)=>n.call(r,s(e),s(t),i)))}}function un(e,t,n){return function(...r){const i=this.__v_raw,o=Cn(i),a=mt(o),s="entries"===e||e===Symbol.iterator&&a,l="keys"===e&&a,c=i[e](...r),u=n?Qt:t?Gt:Yt;return!t&&Bt(o,"iterate",l?Lt:Mt),{next(){const{value:e,done:t}=c.next();return t?{value:e,done:t}:{value:s?[u(e[0]),u(e[1])]:u(e),done:t}},[Symbol.iterator](){return this}}}}function fn(e){return function(...t){{const n=t[0]?`on key "${t[0]}" `:"";console.warn(`${Ct(e)} operation ${n}failed: target is readonly.`,Cn(this))}return"delete"!==e&&this}}function dn(){const e={get(e){return tn(this,e)},get size(){return rn(this)},has:nn,add:on,set:an,delete:sn,clear:ln,forEach:cn(!1,!1)},t={get(e){return tn(this,e,!1,!0)},get size(){return rn(this)},has:nn,add:on,set:an,delete:sn,clear:ln,forEach:cn(!1,!0)},n={get(e){return tn(this,e,!0)},get size(){return rn(this,!0)},has(e){return nn.call(this,e,!0)},add:fn("add"),set:fn("set"),delete:fn("delete"),clear:fn("clear"),forEach:cn(!0,!1)},r={get(e){return tn(this,e,!0,!0)},get size(){return rn(this,!0)},has(e){return nn.call(this,e,!0)},add:fn("add"),set:fn("set"),delete:fn("delete"),clear:fn("clear"),forEach:cn(!0,!0)};return["keys","values","entries",Symbol.iterator].forEach((i=>{e[i]=un(i,!1,!1),n[i]=un(i,!0,!1),t[i]=un(i,!1,!0),r[i]=un(i,!0,!0)})),[e,n,t,r]}var[_n,pn,hn,xn]=dn();function gn(e,t){const n=t?e?xn:hn:e?pn:_n;return(t,r,i)=>"__v_isReactive"===r?!e:"__v_isReadonly"===r?e:"__v_raw"===r?t:Reflect.get(xt(n,r)&&r in t?n:t,r,i)}var mn={get:gn(!1,!1)},vn={get:gn(!0,!1)};function yn(e,t,n){const r=Cn(n);if(r!==n&&t.call(e,r)){const t=Et(e);console.warn(`Reactive ${t} contains both the raw and reactive versions of the same object${"Map"===t?" as keys":""}, which can lead to inconsistencies. Avoid differentiating between the raw and reactive versions of an object and only use the reactive version if possible.`)}}var bn=new WeakMap,wn=new WeakMap,En=new WeakMap,An=new WeakMap;function kn(e){return e&&e.__v_isReadonly?e:On(e,!1,Zt,mn,bn)}function Sn(e){return On(e,!0,Xt,vn,En)}function On(e,t,n,r,i){if(!yt(e))return console.warn(`value cannot be made reactive: ${String(e)}`),e;if(e.__v_raw&&(!t||!e.__v_isReactive))return e;const o=i.get(e);if(o)return o;const a=(s=e).__v_skip||!Object.isExtensible(s)?0:function(e){switch(e){case"Object":case"Array":return 1;case"Map":case"Set":case"WeakMap":case"WeakSet":return 2;default:return 0}}(Et(s));var s;if(0===a)return e;const l=new Proxy(e,2===a?r:n);return i.set(e,l),l}function Cn(e){return e&&Cn(e.__v_raw)||e}function jn(e){return Boolean(e&&!0===e.__v_isRef)}I("nextTick",(()=>Pe)),I("dispatch",(e=>ge.bind(ge,e))),I("watch",((e,{evaluateLater:t,cleanup:n})=>(e,r)=>{let i=t(e),o=_((()=>{let e;return i((t=>e=t)),e}),r);n(o)})),I("store",(function(){return at})),I("data",(e=>$(e))),I("root",(e=>Oe(e))),I("refs",(e=>(e._x_refs_proxy||(e._x_refs_proxy=L(function(e){let t=[];return Ce(e,(e=>{e._x_refs&&t.push(e._x_refs)})),t}(e))),e._x_refs_proxy)));var $n={};function Nn(e){return $n[e]||($n[e]=0),++$n[e]}function Mn(e,t,n){I(t,(r=>ve(`You can't use [$${t}] without first installing the "${e}" plugin here: https://alpinejs.dev/plugins/${n}`,r)))}I("id",((e,{cleanup:t})=>(n,r=null)=>function(e,t,n,r){e._x_id||(e._x_id={});if(e._x_id[t])return e._x_id[t];let i=r();return e._x_id[t]=i,n((()=>{delete e._x_id[t]})),i}(e,`${n}${r?`-${r}`:""}`,t,(()=>{let t=function(e,t){return Ce(e,(e=>{if(e._x_ids&&e._x_ids[t])return!0}))}(e,n),i=t?t._x_ids[n]:Nn(n);return r?`${n}-${i}-${r}`:`${n}-${i}`})))),Je(((e,t)=>{e._x_id&&(t._x_id=e._x_id)})),I("el",(e=>e)),Mn("Focus","focus","focus"),Mn("Persist","persist","persist"),te("modelable",((e,{expression:t},{effect:n,evaluateLater:r,cleanup:i})=>{let o=r(t),a=()=>{let e;return o((t=>e=t)),e},s=r(`${t} = __placeholder`),l=e=>s((()=>{}),{scope:{__placeholder:e}}),c=a();l(c),queueMicrotask((()=>{if(!e._x_model)return;e._x_removeModelListeners.default();let t=e._x_model.get,n=e._x_model.set,r=it({get:()=>t(),set(e){n(e)}},{get:()=>a(),set(e){l(e)}});i(r)}))})),te("teleport",((e,{modifiers:t,expression:n},{cleanup:r})=>{"template"!==e.tagName.toLowerCase()&&ve("x-teleport can only be used on a <template> tag",e);let i=Pn(n),o=e.content.cloneNode(!0).firstElementChild;e._x_teleport=o,o._x_teleportBack=e,e.setAttribute("data-teleport-template",!0),o.setAttribute("data-teleport-target",!0),e._x_forwardEvents&&e._x_forwardEvents.forEach((t=>{o.addEventListener(t,(t=>{t.stopPropagation(),e.dispatchEvent(new t.constructor(t.type,t))}))})),N(o,{},e);let a=(e,t,n)=>{n.includes("prepend")?t.parentNode.insertBefore(e,t):n.includes("append")?t.parentNode.insertBefore(e,t.nextSibling):t.appendChild(e)};S((()=>{a(o,i,t),Ue((()=>{$e(o),o._x_ignore=!0}))()})),e._x_teleportPutBack=()=>{let r=Pn(n);S((()=>{a(e._x_teleport,r,t)}))},r((()=>o.remove()))}));var Ln=document.createElement("div");function Pn(e){let t=Ue((()=>document.querySelector(e)),(()=>Ln))();return t||ve(`Cannot find x-teleport element for selector: "${e}"`),t}var Rn=()=>{};function Tn(e,t,n,r){let i=e,o=e=>r(e),a={},s=(e,t)=>n=>t(e,n);if(n.includes("dot")&&(t=t.replace(/-/g,".")),n.includes("camel")&&(t=function(e){return e.toLowerCase().replace(/-(\w)/g,((e,t)=>t.toUpperCase()))}(t)),n.includes("passive")&&(a.passive=!0),n.includes("capture")&&(a.capture=!0),n.includes("window")&&(i=window),n.includes("document")&&(i=document),n.includes("debounce")){let e=n[n.indexOf("debounce")+1]||"invalid-wait",t=zn(e.split("ms")[0])?Number(e.split("ms")[0]):250;o=nt(o,t)}if(n.includes("throttle")){let e=n[n.indexOf("throttle")+1]||"invalid-wait",t=zn(e.split("ms")[0])?Number(e.split("ms")[0]):250;o=rt(o,t)}return n.includes("prevent")&&(o=s(o,((e,t)=>{t.preventDefault(),e(t)}))),n.includes("stop")&&(o=s(o,((e,t)=>{t.stopPropagation(),e(t)}))),n.includes("once")&&(o=s(o,((e,n)=>{e(n),i.removeEventListener(t,o,a)}))),(n.includes("away")||n.includes("outside"))&&(i=document,o=s(o,((t,n)=>{e.contains(n.target)||!1!==n.target.isConnected&&(e.offsetWidth<1&&e.offsetHeight<1||!1!==e._x_isShown&&t(n))}))),n.includes("self")&&(o=s(o,((t,n)=>{n.target===e&&t(n)}))),o=s(o,((e,r)=>{(function(e){return["keydown","keyup"].includes(e)})(t)&&function(e,t){let n=t.filter((e=>!["window","document","prevent","stop","once","capture"].includes(e)));if(n.includes("debounce")){let e=n.indexOf("debounce");n.splice(e,zn((n[e+1]||"invalid-wait").split("ms")[0])?2:1)}if(n.includes("throttle")){let e=n.indexOf("throttle");n.splice(e,zn((n[e+1]||"invalid-wait").split("ms")[0])?2:1)}if(0===n.length)return!1;if(1===n.length&&Dn(e.key).includes(n[0]))return!1;const r=["ctrl","shift","alt","meta","cmd","super"].filter((e=>n.includes(e)));if(n=n.filter((e=>!r.includes(e))),r.length>0){if(r.filter((t=>("cmd"!==t&&"super"!==t||(t="meta"),e[`${t}Key`]))).length===r.length&&Dn(e.key).includes(n[0]))return!1}return!0}(r,n)||e(r)})),i.addEventListener(t,o,a),()=>{i.removeEventListener(t,o,a)}}function zn(e){return!Array.isArray(e)&&!isNaN(e)}function Dn(e){if(!e)return[];var t;e=[" ","_"].includes(t=e)?t:t.replace(/([a-z])([A-Z])/g,"$1-$2").replace(/[_\s]/,"-").toLowerCase();let n={ctrl:"control",slash:"/",space:" ",spacebar:" ",cmd:"meta",esc:"escape",up:"arrow-up",down:"arrow-down",left:"arrow-left",right:"arrow-right",period:".",comma:",",equal:"=",minus:"-",underscore:"_"};return n[e]=e,Object.keys(n).map((t=>{if(n[t]===e)return t})).filter((e=>e))}function Bn(e,t,n,r){return S((()=>{if(n instanceof CustomEvent&&void 0!==n.detail)return null!==n.detail&&void 0!==n.detail?n.detail:n.target.value;if("checkbox"===e.type){if(Array.isArray(r)){let e=null;return e=t.includes("number")?In(n.target.value):t.includes("boolean")?Qe(n.target.value):n.target.value,n.target.checked?r.includes(e)?r:r.concat([e]):r.filter((t=>!(t==e)))}return n.target.checked}if("select"===e.tagName.toLowerCase()&&e.multiple)return t.includes("number")?Array.from(n.target.selectedOptions).map((e=>In(e.value||e.text))):t.includes("boolean")?Array.from(n.target.selectedOptions).map((e=>Qe(e.value||e.text))):Array.from(n.target.selectedOptions).map((e=>e.value||e.text));{let i;return i="radio"===e.type?n.target.checked?n.target.value:r:n.target.value,t.includes("number")?In(i):t.includes("boolean")?Qe(i):t.includes("trim")?i.trim():i}}))}function In(e){let t=e?parseFloat(e):null;return n=t,Array.isArray(n)||isNaN(n)?e:t;var n}function qn(e){return null!==e&&"object"==typeof e&&"function"==typeof e.get&&"function"==typeof e.set}Rn.inline=(e,{modifiers:t},{cleanup:n})=>{t.includes("self")?e._x_ignoreSelf=!0:e._x_ignore=!0,n((()=>{t.includes("self")?delete e._x_ignoreSelf:delete e._x_ignore}))},te("ignore",Rn),te("effect",Ue(((e,{expression:t},{effect:n})=>{n(J(e,t))}))),te("model",((e,{modifiers:t,expression:n},{effect:r,cleanup:i})=>{let o=e;t.includes("parent")&&(o=e.parentNode);let a,s=J(o,n);a="string"==typeof n?J(o,`${n} = __placeholder`):"function"==typeof n&&"string"==typeof n()?J(o,`${n()} = __placeholder`):()=>{};let l=()=>{let e;return s((t=>e=t)),qn(e)?e.get():e},c=e=>{let t;s((e=>t=e)),qn(t)?t.set(e):a((()=>{}),{scope:{__placeholder:e}})};"string"==typeof n&&"radio"===e.type&&S((()=>{e.hasAttribute("name")||e.setAttribute("name",n)}));var u="select"===e.tagName.toLowerCase()||["checkbox","radio"].includes(e.type)||t.includes("lazy")?"change":"input";let f=Ke?()=>{}:Tn(e,u,t,(n=>{c(Bn(e,t,n,l()))}));if(t.includes("fill")&&([void 0,null,""].includes(l())||"checkbox"===e.type&&Array.isArray(l())||"select"===e.tagName.toLowerCase()&&e.multiple)&&c(Bn(e,t,{target:e},l())),e._x_removeModelListeners||(e._x_removeModelListeners={}),e._x_removeModelListeners.default=f,i((()=>e._x_removeModelListeners.default())),e.form){let n=Tn(e.form,"reset",[],(n=>{Pe((()=>e._x_model&&e._x_model.set(Bn(e,t,{target:e},l()))))}));i((()=>n()))}e._x_model={get:()=>l(),set(e){c(e)}},e._x_forceModelUpdate=t=>{void 0===t&&"string"==typeof n&&n.match(/\./)&&(t=""),window.fromModel=!0,S((()=>Xe(e,"value",t))),delete window.fromModel},r((()=>{let n=l();t.includes("unintrusive")&&document.activeElement.isSameNode(e)||e._x_forceModelUpdate(n)}))})),te("cloak",(e=>queueMicrotask((()=>S((()=>e.removeAttribute(Q("cloak")))))))),Se((()=>`[${Q("init")}]`)),te("init",Ue(((e,{expression:t},{evaluate:n})=>"string"==typeof t?!!t.trim()&&n(t,{},!1):n(t,{},!1)))),te("text",((e,{expression:t},{effect:n,evaluateLater:r})=>{let i=r(t);n((()=>{i((t=>{S((()=>{e.textContent=t}))}))}))})),te("html",((e,{expression:t},{effect:n,evaluateLater:r})=>{let i=r(t);n((()=>{i((t=>{S((()=>{e.innerHTML=t,e._x_ignoreSelf=!0,$e(e),delete e._x_ignoreSelf}))}))}))})),fe(le(":",Q("bind:")));var Fn=(e,{value:t,modifiers:n,expression:r,original:i},{effect:o,cleanup:a})=>{if(!t){let t={};return s=t,Object.entries(lt).forEach((([e,t])=>{Object.defineProperty(s,e,{get:()=>(...e)=>t(...e)})})),void J(e,r)((t=>{ct(e,t,i)}),{scope:t})}var s;if("key"===t)return function(e,t){e._x_keyExpression=t}(e,r);if(e._x_inlineBindings&&e._x_inlineBindings[t]&&e._x_inlineBindings[t].extract)return;let l=J(e,r);o((()=>l((i=>{void 0===i&&"string"==typeof r&&r.match(/\./)&&(i=""),S((()=>Xe(e,t,i,n)))})))),a((()=>{e._x_undoAddedClasses&&e._x_undoAddedClasses(),e._x_undoAddedStyles&&e._x_undoAddedStyles()}))};function Wn(e,t,n,r){let i={};if(/^\[.*\]$/.test(e.item)&&Array.isArray(t)){e.item.replace("[","").replace("]","").split(",").map((e=>e.trim())).forEach(((e,n)=>{i[e]=t[n]}))}else if(/^\{.*\}$/.test(e.item)&&!Array.isArray(t)&&"object"==typeof t){e.item.replace("{","").replace("}","").split(",").map((e=>e.trim())).forEach((e=>{i[e]=t[e]}))}else i[e.item]=t;return e.index&&(i[e.index]=n),e.collection&&(i[e.collection]=r),i}function Kn(){}function Un(e,t,n){te(t,(r=>ve(`You can't use [x-${t}] without first installing the "${e}" plugin here: https://alpinejs.dev/plugins/${n}`,r)))}Fn.inline=(e,{value:t,modifiers:n,expression:r})=>{t&&(e._x_inlineBindings||(e._x_inlineBindings={}),e._x_inlineBindings[t]={expression:r,extract:!1})},te("bind",Fn),ke((()=>`[${Q("data")}]`)),te("data",((t,{expression:n},{cleanup:r})=>{if(function(e){return!!Ke&&(!!He||e.hasAttribute("data-has-alpine-state"))}(t))return;n=""===n?"{}":n;let i={};q(i,t);let o={};var a,s;a=o,s=i,Object.entries(ut).forEach((([e,t])=>{Object.defineProperty(a,e,{get:()=>(...e)=>t.bind(s)(...e),enumerable:!1})}));let l=V(t,n,{scope:o});void 0!==l&&!0!==l||(l={}),q(l,t);let c=e(l);T(c);let u=N(t,c);c.init&&V(t,c.init),r((()=>{c.destroy&&V(t,c.destroy),u()}))})),Je(((e,t)=>{e._x_dataStack&&(t._x_dataStack=e._x_dataStack,t.setAttribute("data-has-alpine-state",!0))})),te("show",((e,{modifiers:t,expression:n},{effect:r})=>{let i=J(e,n);e._x_doHide||(e._x_doHide=()=>{S((()=>{e.style.setProperty("display","none",t.includes("important")?"important":void 0)}))}),e._x_doShow||(e._x_doShow=()=>{S((()=>{1===e.style.length&&"none"===e.style.display?e.removeAttribute("style"):e.style.removeProperty("display")}))});let o,a=()=>{e._x_doHide(),e._x_isShown=!1},s=()=>{e._x_doShow(),e._x_isShown=!0},l=()=>setTimeout(s),c=Be((e=>e?s():a()),(t=>{"function"==typeof e._x_toggleAndCascadeWithTransitions?e._x_toggleAndCascadeWithTransitions(e,t,s,a):t?l():a()})),u=!0;r((()=>i((e=>{(u||e!==o)&&(t.includes("immediate")&&(e?l():a()),c(e),o=e,u=!1)}))))})),te("for",((t,{expression:n},{effect:r,cleanup:i})=>{let o=function(e){let t=/,([^,\}\]]*)(?:,([^,\}\]]*))?$/,n=/^\s*\(|\)\s*$/g,r=/([\s\S]*?)\s+(?:in|of)\s+([\s\S]*)/,i=e.match(r);if(!i)return;let o={};o.items=i[2].trim();let a=i[1].replace(n,"").trim(),s=a.match(t);s?(o.item=a.replace(t,"").trim(),o.index=s[1].trim(),s[2]&&(o.collection=s[2].trim())):o.item=a;return o}(n),a=J(t,o.items),s=J(t,t._x_keyExpression||"index");t._x_prevKeys=[],t._x_lookup={},r((()=>function(t,n,r,i){let o=e=>"object"==typeof e&&!Array.isArray(e),a=t;r((r=>{var s;s=r,!Array.isArray(s)&&!isNaN(s)&&r>=0&&(r=Array.from(Array(r).keys(),(e=>e+1))),void 0===r&&(r=[]);let l=t._x_lookup,u=t._x_prevKeys,f=[],d=[];if(o(r))r=Object.entries(r).map((([e,o])=>{let a=Wn(n,o,e,r);i((e=>{d.includes(e)&&ve("Duplicate key on x-for",t),d.push(e)}),{scope:{index:e,...a}}),f.push(a)}));else for(let e=0;e<r.length;e++){let o=Wn(n,r[e],e,r);i((e=>{d.includes(e)&&ve("Duplicate key on x-for",t),d.push(e)}),{scope:{index:e,...o}}),f.push(o)}let _=[],p=[],h=[],x=[];for(let e=0;e<u.length;e++){let t=u[e];-1===d.indexOf(t)&&h.push(t)}u=u.filter((e=>!h.includes(e)));let g="template";for(let e=0;e<d.length;e++){let t=d[e],n=u.indexOf(t);if(-1===n)u.splice(e,0,t),_.push([g,e]);else if(n!==e){let t=u.splice(e,1)[0],r=u.splice(n-1,1)[0];u.splice(e,0,r),u.splice(n,0,t),p.push([t,r])}else x.push(t);g=t}for(let e=0;e<h.length;e++){let t=h[e];l[t]._x_effects&&l[t]._x_effects.forEach(c),l[t].remove(),l[t]=null,delete l[t]}for(let e=0;e<p.length;e++){let[t,n]=p[e],r=l[t],i=l[n],o=document.createElement("div");S((()=>{i||ve('x-for ":key" is undefined or invalid',a,n,l),i.after(o),r.after(i),i._x_currentIfEl&&i.after(i._x_currentIfEl),o.before(r),r._x_currentIfEl&&r.after(r._x_currentIfEl),o.remove()})),i._x_refreshXForScope(f[d.indexOf(n)])}for(let t=0;t<_.length;t++){let[n,r]=_[t],i="template"===n?a:l[n];i._x_currentIfEl&&(i=i._x_currentIfEl);let o=f[r],s=d[r],c=document.importNode(a.content,!0).firstElementChild,u=e(o);N(c,u,a),c._x_refreshXForScope=e=>{Object.entries(e).forEach((([e,t])=>{u[e]=t}))},S((()=>{i.after(c),Ue((()=>$e(c)))()})),"object"==typeof s&&ve("x-for key cannot be an object, it must be a string or an integer",a),l[s]=c}for(let e=0;e<x.length;e++)l[x[e]]._x_refreshXForScope(f[d.indexOf(x[e])]);a._x_prevKeys=d}))}(t,o,a,s))),i((()=>{Object.values(t._x_lookup).forEach((e=>e.remove())),delete t._x_prevKeys,delete t._x_lookup}))})),Kn.inline=(e,{expression:t},{cleanup:n})=>{let r=Oe(e);r._x_refs||(r._x_refs={}),r._x_refs[t]=e,n((()=>delete r._x_refs[t]))},te("ref",Kn),te("if",((e,{expression:t},{effect:n,cleanup:r})=>{"template"!==e.tagName.toLowerCase()&&ve("x-if can only be used on a <template> tag",e);let i=J(e,t);n((()=>i((t=>{t?(()=>{if(e._x_currentIfEl)return e._x_currentIfEl;let t=e.content.cloneNode(!0).firstElementChild;N(t,{},e),S((()=>{e.after(t),Ue((()=>$e(t)))()})),e._x_currentIfEl=t,e._x_undoIf=()=>{me(t,(e=>{e._x_effects&&e._x_effects.forEach(c)})),t.remove(),delete e._x_currentIfEl}})():e._x_undoIf&&(e._x_undoIf(),delete e._x_undoIf)})))),r((()=>e._x_undoIf&&e._x_undoIf()))})),te("id",((e,{expression:t},{evaluate:n})=>{n(t).forEach((t=>function(e,t){e._x_ids||(e._x_ids={}),e._x_ids[t]||(e._x_ids[t]=Nn(t))}(e,t)))})),Je(((e,t)=>{e._x_ids&&(t._x_ids=e._x_ids)})),fe(le("@",Q("on:"))),te("on",Ue(((e,{value:t,modifiers:n,expression:r},{cleanup:i})=>{let o=r?J(e,r):()=>{};"template"===e.tagName.toLowerCase()&&(e._x_forwardEvents||(e._x_forwardEvents=[]),e._x_forwardEvents.includes(t)||e._x_forwardEvents.push(t));let a=Tn(e,t,n,(e=>{o((()=>{}),{scope:{$event:e},params:[e]})}));i((()=>a()))}))),Un("Collapse","collapse","collapse"),Un("Intersect","intersect","intersect"),Un("Focus","trap","focus"),Un("Mask","mask","mask"),ft.setEvaluator(Z),ft.setReactivityEngine({reactive:kn,effect:function(e,t=pt){(function(e){return e&&!0===e._isEffect})(e)&&(e=e.raw);const n=function(e,t){const n=function(){if(!n.active)return e();if(!Nt.includes(n)){Rt(n);try{return zt.push(Tt),Tt=!0,Nt.push(n),_t=n,e()}finally{Nt.pop(),Dt(),_t=Nt[Nt.length-1]}}};return n.id=Pt++,n.allowRecurse=!!t.allowRecurse,n._isEffect=!0,n.active=!0,n.raw=e,n.deps=[],n.options=t,n}(e,t);return t.lazy||n(),n},release:function(e){e.active&&(Rt(e),e.options.onStop&&e.options.onStop(),e.active=!1)},raw:Cn});var Vn=ft;window.Alpine=Vn,queueMicrotask((()=>{Vn.start()}))})();
diff --git a/public/js/dist/all.js b/public/js/dist/all.js
index 6e04bad7dd..825c0b27c2 100644
--- a/public/js/dist/all.js
+++ b/public/js/dist/all.js
@@ -12707,14 +12707,14 @@ return Tether;
 
 }));
 
-/*! jQuery UI - v1.13.3 - 2024-04-26
+/*! jQuery UI - v1.14.1 - 2024-10-30
 * https://jqueryui.com
 * Includes: widget.js, position.js, data.js, disable-selection.js, effect.js, effects/effect-blind.js, effects/effect-bounce.js, effects/effect-clip.js, effects/effect-drop.js, effects/effect-explode.js, effects/effect-fade.js, effects/effect-fold.js, effects/effect-highlight.js, effects/effect-puff.js, effects/effect-pulsate.js, effects/effect-scale.js, effects/effect-shake.js, effects/effect-size.js, effects/effect-slide.js, effects/effect-transfer.js, focusable.js, form-reset-mixin.js, jquery-patch.js, keycode.js, labels.js, scroll-parent.js, tabbable.js, unique-id.js, widgets/accordion.js, widgets/autocomplete.js, widgets/button.js, widgets/checkboxradio.js, widgets/controlgroup.js, widgets/datepicker.js, widgets/dialog.js, widgets/draggable.js, widgets/droppable.js, widgets/menu.js, widgets/mouse.js, widgets/progressbar.js, widgets/resizable.js, widgets/selectable.js, widgets/selectmenu.js, widgets/slider.js, widgets/sortable.js, widgets/spinner.js, widgets/tabs.js, widgets/tooltip.js
 * Copyright OpenJS Foundation and other contributors; Licensed MIT */
 
 ( function( factory ) {
 	"use strict";
-	
+
 	if ( typeof define === "function" && define.amd ) {
 
 		// AMD. Register as an anonymous module.
@@ -12729,11 +12729,11 @@ return Tether;
 
 $.ui = $.ui || {};
 
-var version = $.ui.version = "1.13.3";
+var version = $.ui.version = "1.14.1";
 
 
 /*!
- * jQuery UI Widget 1.13.3
+ * jQuery UI Widget 1.14.1
  * https://jqueryui.com
  *
  * Copyright OpenJS Foundation and other contributors
@@ -12776,6 +12776,9 @@ $.widget = function( name, base, prototype ) {
 
 	var namespace = name.split( "." )[ 0 ];
 	name = name.split( "." )[ 1 ];
+	if ( name === "__proto__" || name === "constructor" ) {
+		return $.error( "Invalid widget name: " + name );
+	}
 	var fullName = namespace + "-" + name;
 
 	if ( !prototype ) {
@@ -13475,7 +13478,7 @@ var widget = $.widget;
 
 
 /*!
- * jQuery UI Position 1.13.3
+ * jQuery UI Position 1.14.1
  * https://jqueryui.com
  *
  * Copyright OpenJS Foundation and other contributors
@@ -13972,7 +13975,7 @@ var position = $.ui.position;
 
 
 /*!
- * jQuery UI :data 1.13.3
+ * jQuery UI :data 1.14.1
  * https://jqueryui.com
  *
  * Copyright OpenJS Foundation and other contributors
@@ -13987,21 +13990,15 @@ var position = $.ui.position;
 
 
 var data = $.extend( $.expr.pseudos, {
-	data: $.expr.createPseudo ?
-		$.expr.createPseudo( function( dataName ) {
-			return function( elem ) {
-				return !!$.data( elem, dataName );
-			};
-		} ) :
-
-		// Support: jQuery <1.8
-		function( elem, i, match ) {
-			return !!$.data( elem, match[ 3 ] );
-		}
+	data: $.expr.createPseudo( function( dataName ) {
+		return function( elem ) {
+			return !!$.data( elem, dataName );
+		};
+	} )
 } );
 
 /*!
- * jQuery UI Disable Selection 1.13.3
+ * jQuery UI Disable Selection 1.14.1
  * https://jqueryui.com
  *
  * Copyright OpenJS Foundation and other contributors
@@ -14044,18 +14041,17 @@ var jQuery = $;
 
 
 /*!
- * jQuery Color Animations v2.2.0
+ * jQuery Color Animations v3.0.0
  * https://github.com/jquery/jquery-color
  *
  * Copyright OpenJS Foundation and other contributors
  * Released under the MIT license.
  * https://jquery.org/license
  *
- * Date: Sun May 10 09:02:36 2020 +0200
+ * Date: Wed May 15 16:49:44 2024 +0200
  */
 
 
-
 	var stepHooks = "backgroundColor borderBottomColor borderLeftColor borderRightColor " +
 		"borderTopColor color columnRuleColor outlineColor textDecorationColor textEmphasisColor",
 
@@ -14180,10 +14176,6 @@ var jQuery = $;
 			floor: true
 		}
 	},
-	support = color.support = {},
-
-	// element for support tests
-	supportElem = jQuery( "<p>" )[ 0 ],
 
 	// colors = jQuery.Color.names
 	colors,
@@ -14191,10 +14183,6 @@ var jQuery = $;
 	// local aliases of functions called often
 	each = jQuery.each;
 
-// determine rgba support immediately
-supportElem.style.cssText = "background-color:rgba(1,1,1,.5)";
-support.rgba = supportElem.style.backgroundColor.indexOf( "rgba" ) > -1;
-
 // define cache name and alpha properties
 // for rgba and hsla spaces
 each( spaces, function( spaceName, space ) {
@@ -14232,12 +14220,6 @@ function clamp( value, prop, allowEmpty ) {
 	// ~~ is an short way of doing floor for positive numbers
 	value = type.floor ? ~~value : parseFloat( value );
 
-	// IE will pass in empty strings as value for alpha,
-	// which will hit this case
-	if ( isNaN( value ) ) {
-		return prop.def;
-	}
-
 	if ( type.mod ) {
 
 		// we add mod before modding to make sure that negatives values
@@ -14350,7 +14332,10 @@ color.fn = jQuery.extend( color.prototype, {
 					} );
 
 					// everything defined but alpha?
-					if ( inst[ cache ] && jQuery.inArray( null, inst[ cache ].slice( 0, 3 ) ) < 0 ) {
+					if ( inst[ cache ] && jQuery.inArray(
+						null,
+						inst[ cache ].slice( 0, 3 )
+					) < 0 ) {
 
 						// use the default of 1
 						if ( inst[ cache ][ 3 ] == null ) {
@@ -14462,7 +14447,7 @@ color.fn = jQuery.extend( color.prototype, {
 			prefix = "rgb(";
 		}
 
-		return prefix + rgba.join() + ")";
+		return prefix + rgba.join( ", " ) + ")";
 	},
 	toHslaString: function() {
 		var prefix = "hsla(",
@@ -14482,7 +14467,7 @@ color.fn = jQuery.extend( color.prototype, {
 			hsla.pop();
 			prefix = "hsl(";
 		}
-		return prefix + hsla.join() + ")";
+		return prefix + hsla.join( ", " ) + ")";
 	},
 	toHexString: function( includeAlpha ) {
 		var rgba = this._rgba.slice(),
@@ -14495,12 +14480,11 @@ color.fn = jQuery.extend( color.prototype, {
 		return "#" + jQuery.map( rgba, function( v ) {
 
 			// default to 0 when nulls exist
-			v = ( v || 0 ).toString( 16 );
-			return v.length === 1 ? "0" + v : v;
+			return ( "0" + ( v || 0 ).toString( 16 ) ).substr( -2 );
 		} ).join( "" );
 	},
 	toString: function() {
-		return this._rgba[ 3 ] === 0 ? "transparent" : this.toRgbaString();
+		return this.toRgbaString();
 	}
 } );
 color.fn.parse.prototype = color.fn;
@@ -14667,37 +14651,15 @@ color.hook = function( hook ) {
 	each( hooks, function( _i, hook ) {
 		jQuery.cssHooks[ hook ] = {
 			set: function( elem, value ) {
-				var parsed, curElem,
-					backgroundColor = "";
+				var parsed;
 
-				if ( value !== "transparent" && ( getType( value ) !== "string" || ( parsed = stringParse( value ) ) ) ) {
+				if ( value !== "transparent" &&
+					( getType( value ) !== "string" ||
+						( parsed = stringParse( value ) ) ) ) {
 					value = color( parsed || value );
-					if ( !support.rgba && value._rgba[ 3 ] !== 1 ) {
-						curElem = hook === "backgroundColor" ? elem.parentNode : elem;
-						while (
-							( backgroundColor === "" || backgroundColor === "transparent" ) &&
-							curElem && curElem.style
-						) {
-							try {
-								backgroundColor = jQuery.css( curElem, "backgroundColor" );
-								curElem = curElem.parentNode;
-							} catch ( e ) {
-							}
-						}
-
-						value = value.blend( backgroundColor && backgroundColor !== "transparent" ?
-							backgroundColor :
-							"_default" );
-					}
-
 					value = value.toRgbaString();
 				}
-				try {
-					elem.style[ hook ] = value;
-				} catch ( e ) {
-
-					// wrapped to prevent IE from throwing errors on "invalid" values like 'auto' or 'inherit'
-				}
+				elem.style[ hook ] = value;
 			}
 		};
 		jQuery.fx.step[ hook ] = function( fx ) {
@@ -14756,7 +14718,7 @@ colors = jQuery.Color.names = {
 
 
 /*!
- * jQuery UI Effects 1.13.3
+ * jQuery UI Effects 1.14.1
  * https://jqueryui.com
  *
  * Copyright OpenJS Foundation and other contributors
@@ -14819,26 +14781,14 @@ function camelCase( string ) {
 
 function getElementStyles( elem ) {
 	var key, len,
-		style = elem.ownerDocument.defaultView ?
-			elem.ownerDocument.defaultView.getComputedStyle( elem, null ) :
-			elem.currentStyle,
+		style = elem.ownerDocument.defaultView.getComputedStyle( elem ),
 		styles = {};
 
-	if ( style && style.length && style[ 0 ] && style[ style[ 0 ] ] ) {
-		len = style.length;
-		while ( len-- ) {
-			key = style[ len ];
-			if ( typeof style[ key ] === "string" ) {
-				styles[ camelCase( key ) ] = style[ key ];
-			}
-		}
-
-	// Support: Opera, IE <9
-	} else {
-		for ( key in style ) {
-			if ( typeof style[ key ] === "string" ) {
-				styles[ key ] = style[ key ];
-			}
+	len = style.length;
+	while ( len-- ) {
+		key = style[ len ];
+		if ( typeof style[ key ] === "string" ) {
+			styles[ camelCase( key ) ] = style[ key ];
 		}
 	}
 
@@ -14863,15 +14813,6 @@ function styleDifference( oldStyle, newStyle ) {
 	return diff;
 }
 
-// Support: jQuery <1.8
-if ( !$.fn.addBack ) {
-	$.fn.addBack = function( selector ) {
-		return this.add( selector == null ?
-			this.prevObject : this.prevObject.filter( selector )
-		);
-	};
-}
-
 $.effects.animateClass = function( value, duration, easing, callback ) {
 	var o = $.speed( duration, easing, callback );
 
@@ -15011,7 +14952,7 @@ if ( $.expr && $.expr.pseudos && $.expr.pseudos.animated ) {
 	} )( $.expr.pseudos.animated );
 }
 
-if ( $.uiBackCompat !== false ) {
+if ( $.uiBackCompat === true ) {
 	$.extend( $.effects, {
 
 		// Saves a set of properties in a data storage
@@ -15140,7 +15081,7 @@ if ( $.uiBackCompat !== false ) {
 }
 
 $.extend( $.effects, {
-	version: "1.13.3",
+	version: "1.14.1",
 
 	define: function( name, mode, effect ) {
 		if ( !effect ) {
@@ -15497,7 +15438,7 @@ $.fn.extend( {
 			// as toggle can be either show or hide depending on element state
 			args.mode = modes.shift();
 
-			if ( $.uiBackCompat !== false && !defaultMode ) {
+			if ( $.uiBackCompat === true && !defaultMode ) {
 				if ( elem.is( ":hidden" ) ? mode === "hide" : mode === "show" ) {
 
 					// Call the core method to track "olddisplay" properly
@@ -15708,7 +15649,7 @@ var effect = $.effects;
 
 
 /*!
- * jQuery UI Effects Blind 1.13.3
+ * jQuery UI Effects Blind 1.14.1
  * https://jqueryui.com
  *
  * Copyright OpenJS Foundation and other contributors
@@ -15763,7 +15704,7 @@ var effectsEffectBlind = $.effects.define( "blind", "hide", function( options, d
 
 
 /*!
- * jQuery UI Effects Bounce 1.13.3
+ * jQuery UI Effects Bounce 1.14.1
  * https://jqueryui.com
  *
  * Copyright OpenJS Foundation and other contributors
@@ -15858,7 +15799,7 @@ var effectsEffectBounce = $.effects.define( "bounce", function( options, done )
 
 
 /*!
- * jQuery UI Effects Clip 1.13.3
+ * jQuery UI Effects Clip 1.14.1
  * https://jqueryui.com
  *
  * Copyright OpenJS Foundation and other contributors
@@ -15908,7 +15849,7 @@ var effectsEffectClip = $.effects.define( "clip", "hide", function( options, don
 
 
 /*!
- * jQuery UI Effects Drop 1.13.3
+ * jQuery UI Effects Drop 1.14.1
  * https://jqueryui.com
  *
  * Copyright OpenJS Foundation and other contributors
@@ -15962,7 +15903,7 @@ var effectsEffectDrop = $.effects.define( "drop", "hide", function( options, don
 
 
 /*!
- * jQuery UI Effects Explode 1.13.3
+ * jQuery UI Effects Explode 1.14.1
  * https://jqueryui.com
  *
  * Copyright OpenJS Foundation and other contributors
@@ -16058,7 +15999,7 @@ var effectsEffectExplode = $.effects.define( "explode", "hide", function( option
 
 
 /*!
- * jQuery UI Effects Fade 1.13.3
+ * jQuery UI Effects Fade 1.14.1
  * https://jqueryui.com
  *
  * Copyright OpenJS Foundation and other contributors
@@ -16090,7 +16031,7 @@ var effectsEffectFade = $.effects.define( "fade", "toggle", function( options, d
 
 
 /*!
- * jQuery UI Effects Fold 1.13.3
+ * jQuery UI Effects Fold 1.14.1
  * https://jqueryui.com
  *
  * Copyright OpenJS Foundation and other contributors
@@ -16164,7 +16105,7 @@ var effectsEffectFold = $.effects.define( "fold", "hide", function( options, don
 
 
 /*!
- * jQuery UI Effects Highlight 1.13.3
+ * jQuery UI Effects Highlight 1.14.1
  * https://jqueryui.com
  *
  * Copyright OpenJS Foundation and other contributors
@@ -16206,7 +16147,7 @@ var effectsEffectHighlight = $.effects.define( "highlight", "show", function( op
 
 
 /*!
- * jQuery UI Effects Size 1.13.3
+ * jQuery UI Effects Size 1.14.1
  * https://jqueryui.com
  *
  * Copyright OpenJS Foundation and other contributors
@@ -16384,7 +16325,7 @@ var effectsEffectSize = $.effects.define( "size", function( options, done ) {
 
 
 /*!
- * jQuery UI Effects Scale 1.13.3
+ * jQuery UI Effects Scale 1.14.1
  * https://jqueryui.com
  *
  * Copyright OpenJS Foundation and other contributors
@@ -16424,7 +16365,7 @@ var effectsEffectScale = $.effects.define( "scale", function( options, done ) {
 
 
 /*!
- * jQuery UI Effects Puff 1.13.3
+ * jQuery UI Effects Puff 1.14.1
  * https://jqueryui.com
  *
  * Copyright OpenJS Foundation and other contributors
@@ -16450,7 +16391,7 @@ var effectsEffectPuff = $.effects.define( "puff", "hide", function( options, don
 
 
 /*!
- * jQuery UI Effects Pulsate 1.13.3
+ * jQuery UI Effects Pulsate 1.14.1
  * https://jqueryui.com
  *
  * Copyright OpenJS Foundation and other contributors
@@ -16499,7 +16440,7 @@ var effectsEffectPulsate = $.effects.define( "pulsate", "show", function( option
 
 
 /*!
- * jQuery UI Effects Shake 1.13.3
+ * jQuery UI Effects Shake 1.14.1
  * https://jqueryui.com
  *
  * Copyright OpenJS Foundation and other contributors
@@ -16558,7 +16499,7 @@ var effectsEffectShake = $.effects.define( "shake", function( options, done ) {
 
 
 /*!
- * jQuery UI Effects Slide 1.13.3
+ * jQuery UI Effects Slide 1.14.1
  * https://jqueryui.com
  *
  * Copyright OpenJS Foundation and other contributors
@@ -16619,7 +16560,7 @@ var effectsEffectSlide = $.effects.define( "slide", "show", function( options, d
 
 
 /*!
- * jQuery UI Effects Transfer 1.13.3
+ * jQuery UI Effects Transfer 1.14.1
  * https://jqueryui.com
  *
  * Copyright OpenJS Foundation and other contributors
@@ -16635,7 +16576,7 @@ var effectsEffectSlide = $.effects.define( "slide", "show", function( options, d
 
 
 var effect;
-if ( $.uiBackCompat !== false ) {
+if ( $.uiBackCompat === true ) {
 	effect = $.effects.define( "transfer", function( options, done ) {
 		$( this ).transfer( options, done );
 	} );
@@ -16644,7 +16585,7 @@ var effectsEffectTransfer = effect;
 
 
 /*!
- * jQuery UI Focusable 1.13.3
+ * jQuery UI Focusable 1.14.1
  * https://jqueryui.com
  *
  * Copyright OpenJS Foundation and other contributors
@@ -16693,20 +16634,10 @@ $.ui.focusable = function( element, hasTabindex ) {
 		focusableIfVisible = hasTabindex;
 	}
 
-	return focusableIfVisible && $( element ).is( ":visible" ) && visible( $( element ) );
+	return focusableIfVisible && $( element ).is( ":visible" ) &&
+		$( element ).css( "visibility" ) === "visible";
 };
 
-// Support: IE 8 only
-// IE 8 doesn't resolve inherit to visible/hidden for computed values
-function visible( element ) {
-	var visibility = element.css( "visibility" );
-	while ( visibility === "inherit" ) {
-		element = element.parent();
-		visibility = element.css( "visibility" );
-	}
-	return visibility === "visible";
-}
-
 $.extend( $.expr.pseudos, {
 	focusable: function( element ) {
 		return $.ui.focusable( element, $.attr( element, "tabindex" ) != null );
@@ -16716,17 +16647,8 @@ $.extend( $.expr.pseudos, {
 var focusable = $.ui.focusable;
 
 
-
-// Support: IE8 Only
-// IE8 does not support the form attribute and when it is supplied. It overwrites the form prop
-// with a string, so we need to find the proper form.
-var form = $.fn._form = function() {
-	return typeof this[ 0 ].form === "string" ? this.closest( "form" ) : $( this[ 0 ].form );
-};
-
-
 /*!
- * jQuery UI Form Reset Mixin 1.13.3
+ * jQuery UI Form Reset Mixin 1.14.1
  * https://jqueryui.com
  *
  * Copyright OpenJS Foundation and other contributors
@@ -16754,7 +16676,7 @@ var formResetMixin = $.ui.formResetMixin = {
 	},
 
 	_bindFormResetHandler: function() {
-		this.form = this.element._form();
+		this.form = $( this.element.prop( "form" ) );
 		if ( !this.form.length ) {
 			return;
 		}
@@ -16788,7 +16710,7 @@ var formResetMixin = $.ui.formResetMixin = {
 
 
 /*!
- * jQuery UI Support for jQuery core 1.8.x and newer 1.13.3
+ * jQuery UI Legacy jQuery Core patches 1.14.1
  * https://jqueryui.com
  *
  * Copyright OpenJS Foundation and other contributors
@@ -16797,50 +16719,17 @@ var formResetMixin = $.ui.formResetMixin = {
  *
  */
 
-//>>label: jQuery 1.8+ Support
+//>>label: Legacy jQuery Core patches
 //>>group: Core
-//>>description: Support version 1.8.x and newer of jQuery core
+//>>description: Backport `.even()`, `.odd()` and `$.escapeSelector` to older jQuery Core versions (deprecated)
 
 
-// Support: jQuery 1.9.x or older
-// $.expr[ ":" ] is deprecated.
-if ( !$.expr.pseudos ) {
-	$.expr.pseudos = $.expr[ ":" ];
-}
-
-// Support: jQuery 1.11.x or older
-// $.unique has been renamed to $.uniqueSort
-if ( !$.uniqueSort ) {
-	$.uniqueSort = $.unique;
-}
-
 // Support: jQuery 2.2.x or older.
 // This method has been defined in jQuery 3.0.0.
 // Code from https://github.com/jquery/jquery/blob/e539bac79e666bba95bba86d690b4e609dca2286/src/selector/escapeSelector.js
 if ( !$.escapeSelector ) {
-
-	// CSS string/identifier serialization
-	// https://drafts.csswg.org/cssom/#common-serializing-idioms
-	var rcssescape = /([\0-\x1f\x7f]|^-?\d)|^-$|[^\x80-\uFFFF\w-]/g;
-
-	var fcssescape = function( ch, asCodePoint ) {
-		if ( asCodePoint ) {
-
-			// U+0000 NULL becomes U+FFFD REPLACEMENT CHARACTER
-			if ( ch === "\0" ) {
-				return "\uFFFD";
-			}
-
-			// Control characters and (dependent upon position) numbers get escaped as code points
-			return ch.slice( 0, -1 ) + "\\" + ch.charCodeAt( ch.length - 1 ).toString( 16 ) + " ";
-		}
-
-		// Other potentially-special ASCII characters get backslash-escaped
-		return "\\" + ch;
-	};
-
-	$.escapeSelector = function( sel ) {
-		return ( sel + "" ).replace( rcssescape, fcssescape );
+	$.escapeSelector = function( id ) {
+		return CSS.escape( id + "" );
 	};
 }
 
@@ -16863,7 +16752,7 @@ if ( !$.fn.even || !$.fn.odd ) {
 
 ;
 /*!
- * jQuery UI Keycode 1.13.3
+ * jQuery UI Keycode 1.14.1
  * https://jqueryui.com
  *
  * Copyright OpenJS Foundation and other contributors
@@ -16898,7 +16787,7 @@ var keycode = $.ui.keyCode = {
 
 
 /*!
- * jQuery UI Labels 1.13.3
+ * jQuery UI Labels 1.14.1
  * https://jqueryui.com
  *
  * Copyright OpenJS Foundation and other contributors
@@ -16924,9 +16813,8 @@ var labels = $.fn.labels = function() {
 		return this.pushStack( this[ 0 ].labels );
 	}
 
-	// Support: IE <= 11, FF <= 37, Android <= 2.3 only
-	// Above browsers do not support control.labels. Everything below is to support them
-	// as well as document fragments. control.labels does not work on document fragments
+	// If `control.labels` is empty - e.g. inside of document fragments - find
+	// the labels manually
 	labels = this.eq( 0 ).parents( "label" );
 
 	// Look for the label based on the id
@@ -16941,7 +16829,7 @@ var labels = $.fn.labels = function() {
 		ancestors = ancestor.add( ancestor.length ? ancestor.siblings() : this.siblings() );
 
 		// Create a selector for the label based on the id
-		selector = "label[for='" + $.escapeSelector( id ) + "']";
+		selector = "label[for='" + CSS.escape( id ) + "']";
 
 		labels = labels.add( ancestors.find( selector ).addBack( selector ) );
 
@@ -16953,7 +16841,7 @@ var labels = $.fn.labels = function() {
 
 
 /*!
- * jQuery UI Scroll Parent 1.13.3
+ * jQuery UI Scroll Parent 1.14.1
  * https://jqueryui.com
  *
  * Copyright OpenJS Foundation and other contributors
@@ -16987,7 +16875,7 @@ var scrollParent = $.fn.scrollParent = function( includeHidden ) {
 
 
 /*!
- * jQuery UI Tabbable 1.13.3
+ * jQuery UI Tabbable 1.14.1
  * https://jqueryui.com
  *
  * Copyright OpenJS Foundation and other contributors
@@ -17011,7 +16899,7 @@ var tabbable = $.extend( $.expr.pseudos, {
 
 
 /*!
- * jQuery UI Unique ID 1.13.3
+ * jQuery UI Unique ID 1.14.1
  * https://jqueryui.com
  *
  * Copyright OpenJS Foundation and other contributors
@@ -17049,7 +16937,7 @@ var uniqueId = $.fn.extend( {
 
 
 /*!
- * jQuery UI Accordion 1.13.3
+ * jQuery UI Accordion 1.14.1
  * https://jqueryui.com
  *
  * Copyright OpenJS Foundation and other contributors
@@ -17070,7 +16958,7 @@ var uniqueId = $.fn.extend( {
 
 
 var widgetsAccordion = $.widget( "ui.accordion", {
-	version: "1.13.3",
+	version: "1.14.1",
 	options: {
 		active: 0,
 		animate: {},
@@ -17082,7 +16970,17 @@ var widgetsAccordion = $.widget( "ui.accordion", {
 		collapsible: false,
 		event: "click",
 		header: function( elem ) {
-			return elem.find( "> li > :first-child" ).add( elem.find( "> :not(li)" ).even() );
+			return elem
+				.find( "> li > :first-child" )
+				.add(
+					elem.find( "> :not(li)" )
+
+						// Support: jQuery <3.5 only
+						// We could use `.even()` but that's unavailable in older jQuery.
+						.filter( function( i ) {
+							return i % 2 === 0;
+						} )
+				);
 		},
 		heightStyle: "auto",
 		icons: {
@@ -17217,13 +17115,7 @@ var widgetsAccordion = $.widget( "ui.accordion", {
 		this._super( value );
 
 		this.element.attr( "aria-disabled", value );
-
-		// Support: IE8 Only
-		// #5332 / #6059 - opacity doesn't cascade to positioned elements in IE
-		// so we need to add the disabled class to the headers and panels
 		this._toggleClass( null, "ui-state-disabled", !!value );
-		this._toggleClass( this.headers.add( this.headers.next() ), null, "ui-state-disabled",
-			!!value );
 	},
 
 	_keydown: function( event ) {
@@ -17641,47 +17533,13 @@ var widgetsAccordion = $.widget( "ui.accordion", {
 		this._removeClass( prev, "ui-accordion-header-active" )
 			._addClass( prev, "ui-accordion-header-collapsed" );
 
-		// Work around for rendering bug in IE (#5421)
-		if ( toHide.length ) {
-			toHide.parent()[ 0 ].className = toHide.parent()[ 0 ].className;
-		}
 		this._trigger( "activate", null, data );
 	}
 } );
 
 
-
-var safeActiveElement = $.ui.safeActiveElement = function( document ) {
-	var activeElement;
-
-	// Support: IE 9 only
-	// IE9 throws an "Unspecified error" accessing document.activeElement from an <iframe>
-	try {
-		activeElement = document.activeElement;
-	} catch ( error ) {
-		activeElement = document.body;
-	}
-
-	// Support: IE 9 - 11 only
-	// IE may return null instead of an element
-	// Interestingly, this only seems to occur when NOT in an iframe
-	if ( !activeElement ) {
-		activeElement = document.body;
-	}
-
-	// Support: IE 11 only
-	// IE11 returns a seemingly empty object in some cases when accessing
-	// document.activeElement from an <iframe>
-	if ( !activeElement.nodeName ) {
-		activeElement = document.body;
-	}
-
-	return activeElement;
-};
-
-
 /*!
- * jQuery UI Menu 1.13.3
+ * jQuery UI Menu 1.14.1
  * https://jqueryui.com
  *
  * Copyright OpenJS Foundation and other contributors
@@ -17700,7 +17558,7 @@ var safeActiveElement = $.ui.safeActiveElement = function( document ) {
 
 
 var widgetsMenu = $.widget( "ui.menu", {
-	version: "1.13.3",
+	version: "1.14.1",
 	defaultElement: "<ul>",
 	delay: 300,
 	options: {
@@ -17747,7 +17605,7 @@ var widgetsMenu = $.widget( "ui.menu", {
 			},
 			"click .ui-menu-item": function( event ) {
 				var target = $( event.target );
-				var active = $( $.ui.safeActiveElement( this.document[ 0 ] ) );
+				var active = $( this.document[ 0 ].activeElement );
 				if ( !this.mouseHandled && target.not( ".ui-state-disabled" ).length ) {
 					this.select( event );
 
@@ -17791,7 +17649,7 @@ var widgetsMenu = $.widget( "ui.menu", {
 				this._delay( function() {
 					var notContained = !$.contains(
 						this.element[ 0 ],
-						$.ui.safeActiveElement( this.document[ 0 ] )
+						this.document[ 0 ].activeElement
 					);
 					if ( notContained ) {
 						this.collapseAll( event );
@@ -18372,7 +18230,7 @@ var widgetsMenu = $.widget( "ui.menu", {
 
 
 /*!
- * jQuery UI Autocomplete 1.13.3
+ * jQuery UI Autocomplete 1.14.1
  * https://jqueryui.com
  *
  * Copyright OpenJS Foundation and other contributors
@@ -18391,7 +18249,7 @@ var widgetsMenu = $.widget( "ui.menu", {
 
 
 $.widget( "ui.autocomplete", {
-	version: "1.13.3",
+	version: "1.14.1",
 	defaultElement: "<input>",
 	options: {
 		appendTo: null,
@@ -18435,9 +18293,9 @@ $.widget( "ui.autocomplete", {
 
 		// Textareas are always multi-line
 		// Inputs are always single-line, even if inside a contentEditable element
-		// IE also treats inputs as contentEditable
-		// All other element types are determined by whether or not they're contentEditable
-		this.isMultiLine = isTextarea || !isInput && this._isContentEditable( this.element );
+		// All other element types are determined by whether they're contentEditable
+		this.isMultiLine = isTextarea ||
+			!isInput && this.element.prop( "contentEditable" ) === "true";
 
 		this.valueMethod = this.element[ isTextarea || isInput ? "val" : "text" ];
 		this.isNewMenu = true;
@@ -18501,7 +18359,6 @@ $.widget( "ui.autocomplete", {
 
 						// Different browsers have different default behavior for escape
 						// Single press can mean undo or clear
-						// Double press in IE means clear the whole form
 						event.preventDefault();
 					}
 					break;
@@ -18570,16 +18427,6 @@ $.widget( "ui.autocomplete", {
 				role: null
 			} )
 			.hide()
-
-			// Support: IE 11 only, Edge <= 14
-			// For other browsers, we preventDefault() on the mousedown event
-			// to keep the dropdown from taking focus from the input. This doesn't
-			// work for IE/Edge, causing problems with selection and scrolling (#9638)
-			// Happily, IE and Edge support an "unselectable" attribute that
-			// prevents an element from receiving focus, exactly what we want here.
-			.attr( {
-				"unselectable": "on"
-			} )
 			.menu( "instance" );
 
 		this._addClass( this.menu.element, "ui-autocomplete", "ui-front" );
@@ -18592,7 +18439,7 @@ $.widget( "ui.autocomplete", {
 			menufocus: function( event, ui ) {
 				var label, item;
 
-				// support: Firefox
+				// Support: Firefox
 				// Prevent accidental activation of menu items in Firefox (#7024 #9118)
 				if ( this.isNewMenu ) {
 					this.isNewMenu = false;
@@ -18630,17 +18477,9 @@ $.widget( "ui.autocomplete", {
 					previous = this.previous;
 
 				// Only trigger when focus was lost (click on menu)
-				if ( this.element[ 0 ] !== $.ui.safeActiveElement( this.document[ 0 ] ) ) {
+				if ( this.element[ 0 ] !== this.document[ 0 ].activeElement ) {
 					this.element.trigger( "focus" );
 					this.previous = previous;
-
-					// #6109 - IE triggers two focus events and the second
-					// is asynchronous, so we need to reset the previous
-					// term synchronously and asynchronously :-(
-					this._delay( function() {
-						this.previous = previous;
-						this.selectedItem = item;
-					} );
 				}
 
 				if ( false !== this._trigger( "select", event, { item: item } ) ) {
@@ -18959,24 +18798,6 @@ $.widget( "ui.autocomplete", {
 			// Prevents moving cursor to beginning/end of the text field in some browsers
 			event.preventDefault();
 		}
-	},
-
-	// Support: Chrome <=50
-	// We should be able to just use this.element.prop( "isContentEditable" )
-	// but hidden elements always report false in Chrome.
-	// https://code.google.com/p/chromium/issues/detail?id=313082
-	_isContentEditable: function( element ) {
-		if ( !element.length ) {
-			return false;
-		}
-
-		var editable = element.prop( "contentEditable" );
-
-		if ( editable === "inherit" ) {
-			return this._isContentEditable( element.parent() );
-		}
-
-		return editable === "true";
 	}
 } );
 
@@ -19028,7 +18849,7 @@ var widgetsAutocomplete = $.ui.autocomplete;
 
 
 /*!
- * jQuery UI Controlgroup 1.13.3
+ * jQuery UI Controlgroup 1.14.1
  * https://jqueryui.com
  *
  * Copyright OpenJS Foundation and other contributors
@@ -19049,7 +18870,7 @@ var widgetsAutocomplete = $.ui.autocomplete;
 var controlgroupCornerRegex = /ui-corner-([a-z]){2,6}/g;
 
 var widgetsControlgroup = $.widget( "ui.controlgroup", {
-	version: "1.13.3",
+	version: "1.14.1",
 	defaultElement: "<div>",
 	options: {
 		direction: "horizontal",
@@ -19313,7 +19134,7 @@ var widgetsControlgroup = $.widget( "ui.controlgroup", {
 } );
 
 /*!
- * jQuery UI Checkboxradio 1.13.3
+ * jQuery UI Checkboxradio 1.14.1
  * https://jqueryui.com
  *
  * Copyright OpenJS Foundation and other contributors
@@ -19333,7 +19154,7 @@ var widgetsControlgroup = $.widget( "ui.controlgroup", {
 
 
 $.widget( "ui.checkboxradio", [ $.ui.formResetMixin, {
-	version: "1.13.3",
+	version: "1.14.1",
 	options: {
 		disabled: null,
 		label: null,
@@ -19451,7 +19272,7 @@ $.widget( "ui.checkboxradio", [ $.ui.formResetMixin, {
 	_getRadioGroup: function() {
 		var group;
 		var name = this.element[ 0 ].name;
-		var nameSelector = "input[name='" + $.escapeSelector( name ) + "']";
+		var nameSelector = "input[name='" + CSS.escape( name ) + "']";
 
 		if ( !name ) {
 			return $( [] );
@@ -19463,7 +19284,7 @@ $.widget( "ui.checkboxradio", [ $.ui.formResetMixin, {
 
 			// Not inside a form, check all inputs that also are not inside a form
 			group = $( nameSelector ).filter( function() {
-				return $( this )._form().length === 0;
+				return $( $( this ).prop( "form" ) ).length === 0;
 			} );
 		}
 
@@ -19584,7 +19405,7 @@ var widgetsCheckboxradio = $.ui.checkboxradio;
 
 
 /*!
- * jQuery UI Button 1.13.3
+ * jQuery UI Button 1.14.1
  * https://jqueryui.com
  *
  * Copyright OpenJS Foundation and other contributors
@@ -19603,7 +19424,7 @@ var widgetsCheckboxradio = $.ui.checkboxradio;
 
 
 $.widget( "ui.button", {
-	version: "1.13.3",
+	version: "1.14.1",
 	defaultElement: "<button>",
 	options: {
 		classes: {
@@ -19670,9 +19491,9 @@ $.widget( "ui.button", {
 					if ( event.keyCode === $.ui.keyCode.SPACE ) {
 						event.preventDefault();
 
-						// Support: PhantomJS <= 1.9, IE 8 Only
-						// If a native click is available use it so we actually cause navigation
-						// otherwise just trigger a click event
+						// If a native click is available use it, so we
+						// actually cause navigation. Otherwise, just trigger
+						// a click event.
 						if ( this.element[ 0 ].click ) {
 							this.element[ 0 ].click();
 						} else {
@@ -19848,7 +19669,7 @@ $.widget( "ui.button", {
 } );
 
 // DEPRECATED
-if ( $.uiBackCompat !== false ) {
+if ( $.uiBackCompat === true ) {
 
 	// Text and Icons options
 	$.widget( "ui.button", $.ui.button, {
@@ -20010,7 +19831,7 @@ var widgetsButton = $.ui.button;
 
 /* eslint-disable max-len, camelcase */
 /*!
- * jQuery UI Datepicker 1.13.3
+ * jQuery UI Datepicker 1.14.1
  * https://jqueryui.com
  *
  * Copyright OpenJS Foundation and other contributors
@@ -20028,7 +19849,7 @@ var widgetsButton = $.ui.button;
 //>>css.theme: ../../themes/base/theme.css
 
 
-$.extend( $.ui, { datepicker: { version: "1.13.3" } } );
+$.extend( $.ui, { datepicker: { version: "1.14.1" } } );
 
 var datepicker_instActive;
 
@@ -20427,6 +20248,7 @@ $.extend( Datepicker.prototype, {
 			$target.removeClass( this.markerClassName ).empty();
 		}
 
+		$.datepicker._hideDatepicker();
 		if ( datepicker_instActive === inst ) {
 			datepicker_instActive = null;
 			this._curInst = null;
@@ -20902,11 +20724,8 @@ $.extend( Datepicker.prototype, {
 		}
 	},
 
-	// #6694 - don't focus the input if it's already focused
-	// this breaks the change event in IE
-	// Support: IE and jQuery <1.9
 	_shouldFocusInput: function( inst ) {
-		return inst.input && inst.input.is( ":visible" ) && !inst.input.is( ":disabled" ) && !inst.input.is( ":focus" );
+		return inst.input && inst.input.is( ":visible" ) && !inst.input.is( ":disabled" );
 	},
 
 	/* Check positioning to remain on screen. */
@@ -20963,8 +20782,7 @@ $.extend( Datepicker.prototype, {
 				$.datepicker._tidyDialog( inst );
 			};
 
-			// DEPRECATED: after BC for 1.8.x $.effects[ showAnim ] is not needed
-			if ( $.effects && ( $.effects.effect[ showAnim ] || $.effects[ showAnim ] ) ) {
+			if ( $.effects && ( $.effects.effect[ showAnim ] ) ) {
 				inst.dpDiv.hide( showAnim, $.datepicker._get( inst, "showOptions" ), duration, postProcess );
 			} else {
 				inst.dpDiv[ ( showAnim === "slideDown" ? "slideUp" :
@@ -22225,17 +22043,13 @@ $.fn.datepicker = function( options ) {
 $.datepicker = new Datepicker(); // singleton instance
 $.datepicker.initialized = false;
 $.datepicker.uuid = new Date().getTime();
-$.datepicker.version = "1.13.3";
+$.datepicker.version = "1.14.1";
 
 var widgetsDatepicker = $.datepicker;
 
 
-
-// This file is deprecated
-var ie = $.ui.ie = !!/msie [\w.]+/.exec( navigator.userAgent.toLowerCase() );
-
 /*!
- * jQuery UI Mouse 1.13.3
+ * jQuery UI Mouse 1.14.1
  * https://jqueryui.com
  *
  * Copyright OpenJS Foundation and other contributors
@@ -22255,7 +22069,7 @@ $( document ).on( "mouseup", function() {
 } );
 
 var widgetsMouse = $.widget( "ui.mouse", {
-	version: "1.13.3",
+	version: "1.14.1",
 	options: {
 		cancel: "input, textarea, button, select, option",
 		distance: 1,
@@ -22307,12 +22121,10 @@ var widgetsMouse = $.widget( "ui.mouse", {
 		this._mouseDownEvent = event;
 
 		var that = this,
-			btnIsLeft = ( event.which === 1 ),
-
-			// event.target.nodeName works around a bug in IE 8 with
-			// disabled inputs (#7620)
-			elIsCancel = ( typeof this.options.cancel === "string" && event.target.nodeName ?
-				$( event.target ).closest( this.options.cancel ).length : false );
+			btnIsLeft = event.which === 1,
+			elIsCancel = typeof this.options.cancel === "string" ?
+				$( event.target ).closest( this.options.cancel ).length :
+				false;
 		if ( !btnIsLeft || elIsCancel || !this._mouseCapture( event ) ) {
 			return true;
 		}
@@ -22358,28 +22170,17 @@ var widgetsMouse = $.widget( "ui.mouse", {
 	_mouseMove: function( event ) {
 
 		// Only check for mouseups outside the document if you've moved inside the document
-		// at least once. This prevents the firing of mouseup in the case of IE<9, which will
-		// fire a mousemove event if content is placed under the cursor. See #7778
-		// Support: IE <9
-		if ( this._mouseMoved ) {
+		// at least once.
+		if ( this._mouseMoved && !event.which ) {
 
-			// IE mouseup check - mouseup happened when mouse was out of window
-			if ( $.ui.ie && ( !document.documentMode || document.documentMode < 9 ) &&
-					!event.button ) {
+			// Support: Safari <=8 - 9
+			// Safari sets which to 0 if you press any of the following keys
+			// during a drag (#14461)
+			if ( event.originalEvent.altKey || event.originalEvent.ctrlKey ||
+					event.originalEvent.metaKey || event.originalEvent.shiftKey ) {
+				this.ignoreMissingWhich = true;
+			} else if ( !this.ignoreMissingWhich ) {
 				return this._mouseUp( event );
-
-			// Iframe mouseup check - mouseup occurred in another document
-			} else if ( !event.which ) {
-
-				// Support: Safari <=8 - 9
-				// Safari sets which to 0 if you press any of the following keys
-				// during a drag (#14461)
-				if ( event.originalEvent.altKey || event.originalEvent.ctrlKey ||
-						event.originalEvent.metaKey || event.originalEvent.shiftKey ) {
-					this.ignoreMissingWhich = true;
-				} else if ( !this.ignoreMissingWhich ) {
-					return this._mouseUp( event );
-				}
 			}
 		}
 
@@ -22485,19 +22286,8 @@ var plugin = $.ui.plugin = {
 };
 
 
-
-var safeBlur = $.ui.safeBlur = function( element ) {
-
-	// Support: IE9 - 10 only
-	// If the <body> is blurred, IE will switch windows, see #9420
-	if ( element && element.nodeName.toLowerCase() !== "body" ) {
-		$( element ).trigger( "blur" );
-	}
-};
-
-
 /*!
- * jQuery UI Draggable 1.13.3
+ * jQuery UI Draggable 1.14.1
  * https://jqueryui.com
  *
  * Copyright OpenJS Foundation and other contributors
@@ -22514,7 +22304,7 @@ var safeBlur = $.ui.safeBlur = function( element ) {
 
 
 $.widget( "ui.draggable", $.ui.mouse, {
-	version: "1.13.3",
+	version: "1.14.1",
 	widgetEventPrefix: "drag",
 	options: {
 		addClasses: true,
@@ -22621,7 +22411,7 @@ $.widget( "ui.draggable", $.ui.mouse, {
 	},
 
 	_blurActiveElement: function( event ) {
-		var activeElement = $.ui.safeActiveElement( this.document[ 0 ] ),
+		var activeElement = this.document[ 0 ].activeElement,
 			target = $( event.target );
 
 		// Don't blur if the event occurred on an element that is within
@@ -22632,7 +22422,7 @@ $.widget( "ui.draggable", $.ui.mouse, {
 		}
 
 		// Blur any element that currently has focus, see #4261
-		$.ui.safeBlur( activeElement );
+		$( activeElement ).trigger( "blur" );
 	},
 
 	_mouseStart: function( event ) {
@@ -23732,7 +23522,7 @@ var widgetsDraggable = $.ui.draggable;
 
 
 /*!
- * jQuery UI Resizable 1.13.3
+ * jQuery UI Resizable 1.14.1
  * https://jqueryui.com
  *
  * Copyright OpenJS Foundation and other contributors
@@ -23751,7 +23541,7 @@ var widgetsDraggable = $.ui.draggable;
 
 
 $.widget( "ui.resizable", $.ui.mouse, {
-	version: "1.13.3",
+	version: "1.14.1",
 	widgetEventPrefix: "resize",
 	options: {
 		alsoResize: false,
@@ -23792,12 +23582,18 @@ $.widget( "ui.resizable", $.ui.mouse, {
 
 	_hasScroll: function( el, a ) {
 
-		if ( $( el ).css( "overflow" ) === "hidden" ) {
+		var scroll,
+			has = false,
+			overflow = $( el ).css( "overflow" );
+
+		if ( overflow === "hidden" ) {
 			return false;
 		}
+		if ( overflow === "scroll" ) {
+			return true;
+		}
 
-		var scroll = ( a && a === "left" ) ? "scrollLeft" : "scrollTop",
-			has = false;
+		scroll = ( a && a === "left" ) ? "scrollLeft" : "scrollTop";
 
 		if ( el[ scroll ] > 0 ) {
 			return true;
@@ -23861,9 +23657,8 @@ $.widget( "ui.resizable", $.ui.mouse, {
 			};
 
 			this.element.css( margins );
-			this.originalElement.css( "margin", 0 );
 
-			// support: Safari
+			// Support: Safari
 			// Prevent Safari textarea resize
 			this.originalResizeStyle = this.originalElement.css( "resize" );
 			this.originalElement.css( "resize", "none" );
@@ -23874,10 +23669,6 @@ $.widget( "ui.resizable", $.ui.mouse, {
 				display: "block"
 			} ) );
 
-			// Support: IE9
-			// avoid IE jump (hard set the margin)
-			this.originalElement.css( margins );
-
 			this._proportionallyResize();
 		}
 
@@ -24079,7 +23870,7 @@ $.widget( "ui.resizable", $.ui.mouse, {
 
 	_mouseStart: function( event ) {
 
-		var curleft, curtop, cursor,
+		var curleft, curtop, cursor, calculatedSize,
 			o = this.options,
 			el = this.element;
 
@@ -24098,20 +23889,24 @@ $.widget( "ui.resizable", $.ui.mouse, {
 		this.offset = this.helper.offset();
 		this.position = { left: curleft, top: curtop };
 
+		if ( !this._helper ) {
+			calculatedSize = this._calculateAdjustedElementDimensions( el );
+		}
+
 		this.size = this._helper ? {
 				width: this.helper.width(),
 				height: this.helper.height()
 			} : {
-				width: el.width(),
-				height: el.height()
+				width: calculatedSize.width,
+				height: calculatedSize.height
 			};
 
 		this.originalSize = this._helper ? {
 				width: el.outerWidth(),
 				height: el.outerHeight()
 			} : {
-				width: el.width(),
-				height: el.height()
+				width: calculatedSize.width,
+				height: calculatedSize.height
 			};
 
 		this.sizeDiff = {
@@ -24407,6 +24202,52 @@ $.widget( "ui.resizable", $.ui.mouse, {
 		};
 	},
 
+	_calculateAdjustedElementDimensions: function( element ) {
+		var elWidth, elHeight, paddingBorder,
+			ce = element.get( 0 );
+
+		if ( element.css( "box-sizing" ) !== "content-box" ||
+			( !this._hasScroll( ce ) && !this._hasScroll( ce, "left" ) ) ) {
+				return {
+					height: parseFloat( element.css( "height" ) ),
+					width: parseFloat( element.css( "width" ) )
+				};
+		}
+
+		// Check if CSS inline styles are set and use those (usually from previous resizes)
+		elWidth = parseFloat( ce.style.width );
+		elHeight = parseFloat( ce.style.height );
+
+		paddingBorder = this._getPaddingPlusBorderDimensions( element );
+		elWidth = isNaN( elWidth ) ?
+			this._getElementTheoreticalSize( element, paddingBorder, "width" ) :
+			elWidth;
+		elHeight = isNaN( elHeight ) ?
+			this._getElementTheoreticalSize( element, paddingBorder, "height" ) :
+			elHeight;
+
+		return {
+			height: elHeight,
+			width: elWidth
+		};
+	},
+
+	_getElementTheoreticalSize: function( element, extraSize, dimension ) {
+
+		// offsetWidth/offsetHeight is a rounded sum of content, padding, scroll gutter, and border
+		var size = Math.max( 0, Math.ceil(
+			element.get( 0 )[ "offset" + dimension[ 0 ].toUpperCase() + dimension.slice( 1 ) ] -
+			extraSize[ dimension ] -
+			0.5
+
+		// If offsetWidth/offsetHeight is unknown, then we can't determine theoretical size.
+		// Use an explicit zero to avoid NaN.
+		// See https://github.com/jquery/jquery/issues/3964
+		) ) || 0;
+
+		return size;
+	},
+
 	_proportionallyResize: function() {
 
 		if ( !this._proportionallyResizeElements.length ) {
@@ -24761,9 +24602,11 @@ $.ui.plugin.add( "resizable", "alsoResize", {
 			o = that.options;
 
 		$( o.alsoResize ).each( function() {
-			var el = $( this );
+			var el = $( this ),
+				elSize = that._calculateAdjustedElementDimensions( el );
+
 			el.data( "ui-resizable-alsoresize", {
-				width: parseFloat( el.css( "width" ) ), height: parseFloat( el.css( "height" ) ),
+				width: elSize.width, height: elSize.height,
 				left: parseFloat( el.css( "left" ) ), top: parseFloat( el.css( "top" ) )
 			} );
 		} );
@@ -24825,7 +24668,7 @@ $.ui.plugin.add( "resizable", "ghost", {
 
 		// DEPRECATED
 		// TODO: remove after 1.12
-		if ( $.uiBackCompat !== false && typeof that.options.ghost === "string" ) {
+		if ( $.uiBackCompat === true && typeof that.options.ghost === "string" ) {
 
 			// Ghost option
 			that.ghost.addClass( this.options.ghost );
@@ -24933,7 +24776,7 @@ var widgetsResizable = $.ui.resizable;
 
 
 /*!
- * jQuery UI Dialog 1.13.3
+ * jQuery UI Dialog 1.14.1
  * https://jqueryui.com
  *
  * Copyright OpenJS Foundation and other contributors
@@ -24952,7 +24795,7 @@ var widgetsResizable = $.ui.resizable;
 
 
 $.widget( "ui.dialog", {
-	version: "1.13.3",
+	version: "1.14.1",
 	options: {
 		appendTo: "body",
 		autoOpen: true,
@@ -24988,6 +24831,7 @@ $.widget( "ui.dialog", {
 		resizable: true,
 		show: null,
 		title: null,
+		uiDialogTitleHeadingLevel: 0,
 		width: 300,
 
 		// Callbacks
@@ -25134,7 +24978,7 @@ $.widget( "ui.dialog", {
 			// Hiding a focused element doesn't trigger blur in WebKit
 			// so in case we have nothing to focus on, explicitly blur the active element
 			// https://bugs.webkit.org/show_bug.cgi?id=47182
-			$.ui.safeBlur( $.ui.safeActiveElement( this.document[ 0 ] ) );
+			$( this.document[ 0 ].activeElement ).trigger( "blur" );
 		}
 
 		this._hide( this.uiDialog, this.options.hide, function() {
@@ -25178,7 +25022,7 @@ $.widget( "ui.dialog", {
 		}
 
 		this._isOpen = true;
-		this.opener = $( $.ui.safeActiveElement( this.document[ 0 ] ) );
+		this.opener = $( this.document[ 0 ].activeElement );
 
 		this._size();
 		this._position();
@@ -25234,7 +25078,7 @@ $.widget( "ui.dialog", {
 	},
 
 	_restoreTabbableFocus: function() {
-		var activeElement = $.ui.safeActiveElement( this.document[ 0 ] ),
+		var activeElement = this.document[ 0 ].activeElement,
 			isActive = this.uiDialog[ 0 ] === activeElement ||
 				$.contains( this.uiDialog[ 0 ], activeElement );
 		if ( !isActive ) {
@@ -25245,11 +25089,6 @@ $.widget( "ui.dialog", {
 	_keepFocus: function( event ) {
 		event.preventDefault();
 		this._restoreTabbableFocus();
-
-		// support: IE
-		// IE <= 8 doesn't prevent moving focus even with event.preventDefault()
-		// so we check again later
-		this._delay( this._restoreTabbableFocus );
 	},
 
 	_createWrapper: function() {
@@ -25259,7 +25098,8 @@ $.widget( "ui.dialog", {
 
 				// Setting tabIndex makes the div focusable
 				tabIndex: -1,
-				role: "dialog"
+				role: "dialog",
+				"aria-modal": this.options.modal ? "true" : null
 			} )
 			.appendTo( this._appendTo() );
 
@@ -25332,9 +25172,6 @@ $.widget( "ui.dialog", {
 			}
 		} );
 
-		// Support: IE
-		// Use type="button" to prevent enter keypresses in textboxes from closing the
-		// dialog in IE (#9312)
 		this.uiDialogTitlebarClose = $( "<button type='button'></button>" )
 			.button( {
 				label: $( "<a>" ).text( this.options.closeText ).html(),
@@ -25351,7 +25188,13 @@ $.widget( "ui.dialog", {
 			}
 		} );
 
-		uiDialogTitle = $( "<span>" ).uniqueId().prependTo( this.uiDialogTitlebar );
+		var uiDialogHeadingLevel = Number.isInteger( this.options.uiDialogTitleHeadingLevel ) &&
+			this.options.uiDialogTitleHeadingLevel > 0 &&
+			this.options.uiDialogTitleHeadingLevel <= 6 ?
+			"h" + this.options.uiDialogTitleHeadingLevel : "span";
+
+		uiDialogTitle = $( "<" + uiDialogHeadingLevel + ">" )
+			.uniqueId().prependTo( this.uiDialogTitlebar );
 		this._addClass( uiDialogTitle, "ui-dialog-title" );
 		this._title( uiDialogTitle );
 
@@ -25677,6 +25520,10 @@ $.widget( "ui.dialog", {
 		if ( key === "title" ) {
 			this._title( this.uiDialogTitlebar.find( ".ui-dialog-title" ) );
 		}
+
+		if ( key === "modal" ) {
+			uiDialog.attr( "aria-modal", value ? "true" : null );
+		}
 	},
 
 	_size: function() {
@@ -25762,8 +25609,6 @@ $.widget( "ui.dialog", {
 			return;
 		}
 
-		var jqMinor = $.fn.jquery.substring( 0, 4 );
-
 		// We use a delay in case the overlay is created from an
 		// event that we're going to be cancelling (#2804)
 		var isOpening = true;
@@ -25785,18 +25630,6 @@ $.widget( "ui.dialog", {
 				if ( !instance._allowInteraction( event ) ) {
 					event.preventDefault();
 					instance._focusTabbable();
-
-					// Support: jQuery >=3.4 <3.7 only
-					// In jQuery 3.4-3.6, there are multiple issues with focus/blur
-					// trigger chains or when triggering is done on a hidden element
-					// at least once.
-					// Trigger focus in a delay in addition if needed to avoid the issues.
-					// See https://github.com/jquery/jquery/issues/4382
-					// See https://github.com/jquery/jquery/issues/4856
-					// See https://github.com/jquery/jquery/issues/4950
-					if ( jqMinor === "3.4." || jqMinor === "3.5." || jqMinor === "3.6." ) {
-						instance._delay( instance._restoreTabbableFocus );
-					}
 				}
 			}.bind( this ) );
 		}
@@ -25835,7 +25668,7 @@ $.widget( "ui.dialog", {
 
 // DEPRECATED
 // TODO: switch return back to widget declaration at top of file when this is removed
-if ( $.uiBackCompat !== false ) {
+if ( $.uiBackCompat === true ) {
 
 	// Backcompat for dialogClass option
 	$.widget( "ui.dialog", $.ui.dialog, {
@@ -25861,7 +25694,7 @@ var widgetsDialog = $.ui.dialog;
 
 
 /*!
- * jQuery UI Droppable 1.13.3
+ * jQuery UI Droppable 1.14.1
  * https://jqueryui.com
  *
  * Copyright OpenJS Foundation and other contributors
@@ -25877,7 +25710,7 @@ var widgetsDialog = $.ui.dialog;
 
 
 $.widget( "ui.droppable", {
-	version: "1.13.3",
+	version: "1.14.1",
 	widgetEventPrefix: "drop",
 	options: {
 		accept: "*",
@@ -26305,7 +26138,7 @@ $.ui.ddmanager = {
 
 // DEPRECATED
 // TODO: switch return back to widget declaration at top of file when this is removed
-if ( $.uiBackCompat !== false ) {
+if ( $.uiBackCompat === true ) {
 
 	// Backcompat for activeClass and hoverClass options
 	$.widget( "ui.droppable", $.ui.droppable, {
@@ -26344,7 +26177,7 @@ var widgetsDroppable = $.ui.droppable;
 
 
 /*!
- * jQuery UI Progressbar 1.13.3
+ * jQuery UI Progressbar 1.14.1
  * https://jqueryui.com
  *
  * Copyright OpenJS Foundation and other contributors
@@ -26365,7 +26198,7 @@ var widgetsDroppable = $.ui.droppable;
 
 
 var widgetsProgressbar = $.widget( "ui.progressbar", {
-	version: "1.13.3",
+	version: "1.14.1",
 	options: {
 		classes: {
 			"ui-progressbar": "ui-corner-all",
@@ -26507,7 +26340,7 @@ var widgetsProgressbar = $.widget( "ui.progressbar", {
 
 
 /*!
- * jQuery UI Selectable 1.13.3
+ * jQuery UI Selectable 1.14.1
  * https://jqueryui.com
  *
  * Copyright OpenJS Foundation and other contributors
@@ -26524,7 +26357,7 @@ var widgetsProgressbar = $.widget( "ui.progressbar", {
 
 
 var widgetsSelectable = $.widget( "ui.selectable", $.ui.mouse, {
-	version: "1.13.3",
+	version: "1.14.1",
 	options: {
 		appendTo: "body",
 		autoRefresh: true,
@@ -26805,7 +26638,7 @@ var widgetsSelectable = $.widget( "ui.selectable", $.ui.mouse, {
 
 
 /*!
- * jQuery UI Selectmenu 1.13.3
+ * jQuery UI Selectmenu 1.14.1
  * https://jqueryui.com
  *
  * Copyright OpenJS Foundation and other contributors
@@ -26826,7 +26659,7 @@ var widgetsSelectable = $.widget( "ui.selectable", $.ui.mouse, {
 
 
 var widgetsSelectmenu = $.widget( "ui.selectmenu", [ $.ui.formResetMixin, {
-	version: "1.13.3",
+	version: "1.14.1",
 	defaultElement: "<select>",
 	options: {
 		appendTo: null,
@@ -26949,12 +26782,6 @@ var widgetsSelectmenu = $.widget( "ui.selectmenu", [ $.ui.formResetMixin, {
 				role: "listbox",
 				select: function( event, ui ) {
 					event.preventDefault();
-
-					// Support: IE8
-					// If the item was selected via a click, the text selection
-					// will be destroyed in IE
-					that._setSelection();
-
 					that._select( ui.item.data( "ui-selectmenu-item" ), event );
 				},
 				focus: function( event, ui ) {
@@ -27191,20 +27018,9 @@ var widgetsSelectmenu = $.widget( "ui.selectmenu", [ $.ui.formResetMixin, {
 			return;
 		}
 
-		if ( window.getSelection ) {
-			selection = window.getSelection();
-			selection.removeAllRanges();
-			selection.addRange( this.range );
-
-		// Support: IE8
-		} else {
-			this.range.select();
-		}
-
-		// Support: IE
-		// Setting the text selection kills the button focus in IE, but
-		// restoring the focus doesn't kill the selection.
-		this.button.trigger( "focus" );
+		selection = window.getSelection();
+		selection.removeAllRanges();
+		selection.addRange( this.range );
 	},
 
 	_documentClick: {
@@ -27214,7 +27030,7 @@ var widgetsSelectmenu = $.widget( "ui.selectmenu", [ $.ui.formResetMixin, {
 			}
 
 			if ( !$( event.target ).closest( ".ui-selectmenu-menu, #" +
-				$.escapeSelector( this.ids.button ) ).length ) {
+				CSS.escape( this.ids.button ) ).length ) {
 				this.close( event );
 			}
 		}
@@ -27224,17 +27040,9 @@ var widgetsSelectmenu = $.widget( "ui.selectmenu", [ $.ui.formResetMixin, {
 
 		// Prevent text selection from being reset when interacting with the selectmenu (#10144)
 		mousedown: function() {
-			var selection;
-
-			if ( window.getSelection ) {
-				selection = window.getSelection();
-				if ( selection.rangeCount ) {
-					this.range = selection.getRangeAt( 0 );
-				}
-
-			// Support: IE8
-			} else {
-				this.range = document.selection.createRange();
+			var selection = window.getSelection();
+			if ( selection.rangeCount ) {
+				this.range = selection.getRangeAt( 0 );
 			}
 		},
 
@@ -27425,11 +27233,7 @@ var widgetsSelectmenu = $.widget( "ui.selectmenu", [ $.ui.formResetMixin, {
 	_resizeMenu: function() {
 		this.menu.outerWidth( Math.max(
 			this.button.outerWidth(),
-
-			// Support: IE10
-			// IE10 wraps long text (possibly a rounding bug)
-			// so we add 1px to avoid the wrapping
-			this.menu.width( "" ).outerWidth() + 1
+			this.menu.width( "" ).outerWidth()
 		) );
 	},
 
@@ -27476,7 +27280,7 @@ var widgetsSelectmenu = $.widget( "ui.selectmenu", [ $.ui.formResetMixin, {
 
 
 /*!
- * jQuery UI Slider 1.13.3
+ * jQuery UI Slider 1.14.1
  * https://jqueryui.com
  *
  * Copyright OpenJS Foundation and other contributors
@@ -27495,7 +27299,7 @@ var widgetsSelectmenu = $.widget( "ui.selectmenu", [ $.ui.formResetMixin, {
 
 
 var widgetsSlider = $.widget( "ui.slider", $.ui.mouse, {
-	version: "1.13.3",
+	version: "1.14.1",
 	widgetEventPrefix: "slide",
 
 	options: {
@@ -28211,7 +28015,7 @@ var widgetsSlider = $.widget( "ui.slider", $.ui.mouse, {
 
 
 /*!
- * jQuery UI Sortable 1.13.3
+ * jQuery UI Sortable 1.14.1
  * https://jqueryui.com
  *
  * Copyright OpenJS Foundation and other contributors
@@ -28228,7 +28032,7 @@ var widgetsSlider = $.widget( "ui.slider", $.ui.mouse, {
 
 
 var widgetsSortable = $.widget( "ui.sortable", $.ui.mouse, {
-	version: "1.13.3",
+	version: "1.14.1",
 	widgetEventPrefix: "sort",
 	ready: false,
 	options: {
@@ -28466,11 +28270,7 @@ var widgetsSortable = $.widget( "ui.sortable", $.ui.mouse, {
 		if ( o.cursor && o.cursor !== "auto" ) { // cursor option
 			body = this.document.find( "body" );
 
-			// Support: IE
-			this.storedCursor = body.css( "cursor" );
-			body.css( "cursor", o.cursor );
-
-			this.storedStylesheet =
+			this._storedStylesheet =
 				$( "<style>*{ cursor: " + o.cursor + " !important; }</style>" ).appendTo( body );
 		}
 
@@ -29387,11 +29187,9 @@ var widgetsSortable = $.widget( "ui.sortable", $.ui.mouse, {
 			po.top += this.scrollParent.scrollTop();
 		}
 
-		// This needs to be actually done for all browsers, since pageX/pageY includes this
-		// information with an ugly IE fix
-		if ( this.offsetParent[ 0 ] === this.document[ 0 ].body ||
-				( this.offsetParent[ 0 ].tagName &&
-				this.offsetParent[ 0 ].tagName.toLowerCase() === "html" && $.ui.ie ) ) {
+		// This needs to be actually done for all browsers, since pageX/pageY includes
+		// this information.
+		if ( this.offsetParent[ 0 ] === this.document[ 0 ].body ) {
 			po = { top: 0, left: 0 };
 		}
 
@@ -29739,9 +29537,9 @@ var widgetsSortable = $.widget( "ui.sortable", $.ui.mouse, {
 		}
 
 		//Do what was originally in plugins
-		if ( this.storedCursor ) {
-			this.document.find( "body" ).css( "cursor", this.storedCursor );
-			this.storedStylesheet.remove();
+		if ( this._storedStylesheet ) {
+			this._storedStylesheet.remove();
+			this._storedStylesheet = null;
 		}
 		if ( this._storedOpacity ) {
 			this.helper.css( "opacity", this._storedOpacity );
@@ -29804,7 +29602,7 @@ var widgetsSortable = $.widget( "ui.sortable", $.ui.mouse, {
 
 
 /*!
- * jQuery UI Spinner 1.13.3
+ * jQuery UI Spinner 1.14.1
  * https://jqueryui.com
  *
  * Copyright OpenJS Foundation and other contributors
@@ -29834,7 +29632,7 @@ function spinnerModifier( fn ) {
 }
 
 $.widget( "ui.spinner", {
-	version: "1.13.3",
+	version: "1.14.1",
 	defaultElement: "<input>",
 	widgetEventPrefix: "spin",
 	options: {
@@ -29915,11 +29713,6 @@ $.widget( "ui.spinner", {
 			this.previous = this.element.val();
 		},
 		blur: function( event ) {
-			if ( this.cancelBlur ) {
-				delete this.cancelBlur;
-				return;
-			}
-
 			this._stop();
 			this._refresh();
 			if ( this.previous !== this.element.val() ) {
@@ -29927,7 +29720,7 @@ $.widget( "ui.spinner", {
 			}
 		},
 		mousewheel: function( event, delta ) {
-			var activeElement = $.ui.safeActiveElement( this.document[ 0 ] );
+			var activeElement = this.document[ 0 ].activeElement;
 			var isActive = this.element[ 0 ] === activeElement;
 
 			if ( !isActive || !delta ) {
@@ -29955,20 +29748,13 @@ $.widget( "ui.spinner", {
 			// If the input is focused then this.previous is properly set from
 			// when the input first received focus. If the input is not focused
 			// then we need to set this.previous based on the value before spinning.
-			previous = this.element[ 0 ] === $.ui.safeActiveElement( this.document[ 0 ] ) ?
+			previous = this.element[ 0 ] === this.document[ 0 ].activeElement ?
 				this.previous : this.element.val();
 			function checkFocus() {
-				var isActive = this.element[ 0 ] === $.ui.safeActiveElement( this.document[ 0 ] );
+				var isActive = this.element[ 0 ] === this.document[ 0 ].activeElement;
 				if ( !isActive ) {
 					this.element.trigger( "focus" );
 					this.previous = previous;
-
-					// support: IE
-					// IE sets focus asynchronously, so we need to check if focus
-					// moved off of the input because the user clicked on the button.
-					this._delay( function() {
-						this.previous = previous;
-					} );
 				}
 			}
 
@@ -29976,16 +29762,6 @@ $.widget( "ui.spinner", {
 			event.preventDefault();
 			checkFocus.call( this );
 
-			// Support: IE
-			// IE doesn't prevent moving focus even with event.preventDefault()
-			// so we set a flag to know when we should ignore the blur event
-			// and check (again) if focus moved off of the input.
-			this.cancelBlur = true;
-			this._delay( function() {
-				delete this.cancelBlur;
-				checkFocus.call( this );
-			} );
-
 			if ( this._start( event ) === false ) {
 				return;
 			}
@@ -30338,7 +30114,7 @@ $.widget( "ui.spinner", {
 
 // DEPRECATED
 // TODO: switch return back to widget declaration at top of file when this is removed
-if ( $.uiBackCompat !== false ) {
+if ( $.uiBackCompat === true ) {
 
 	// Backcompat for spinner html extension points
 	$.widget( "ui.spinner", $.ui.spinner, {
@@ -30365,7 +30141,7 @@ var widgetsSpinner = $.ui.spinner;
 
 
 /*!
- * jQuery UI Tabs 1.13.3
+ * jQuery UI Tabs 1.14.1
  * https://jqueryui.com
  *
  * Copyright OpenJS Foundation and other contributors
@@ -30384,7 +30160,7 @@ var widgetsSpinner = $.ui.spinner;
 
 
 $.widget( "ui.tabs", {
-	version: "1.13.3",
+	version: "1.14.1",
 	delay: 300,
 	options: {
 		active: null,
@@ -30467,14 +30243,14 @@ $.widget( "ui.tabs", {
 	_initialActive: function() {
 		var active = this.options.active,
 			collapsible = this.options.collapsible,
-			locationHash = location.hash.substring( 1 );
+			locationHashDecoded = decodeURIComponent( location.hash.substring( 1 ) );
 
 		if ( active === null ) {
 
 			// check the fragment identifier in the URL
-			if ( locationHash ) {
+			if ( locationHashDecoded ) {
 				this.tabs.each( function( i, tab ) {
-					if ( $( tab ).attr( "aria-controls" ) === locationHash ) {
+					if ( $( tab ).attr( "aria-controls" ) === locationHashDecoded ) {
 						active = i;
 						return false;
 					}
@@ -30516,7 +30292,7 @@ $.widget( "ui.tabs", {
 	},
 
 	_tabKeydown: function( event ) {
-		var focusedTab = $( $.ui.safeActiveElement( this.document[ 0 ] ) ).closest( "li" ),
+		var focusedTab = $( this.document[ 0 ].activeElement ).closest( "li" ),
 			selectedIndex = this.tabs.index( focusedTab ),
 			goingForward = true;
 
@@ -30658,10 +30434,6 @@ $.widget( "ui.tabs", {
 		}
 	},
 
-	_sanitizeSelector: function( hash ) {
-		return hash ? hash.replace( /[!"$%&'()*+,.\/:;<=>?@\[\]\^`{|}~]/g, "\\$&" ) : "";
-	},
-
 	refresh: function() {
 		var options = this.options,
 			lis = this.tablist.children( ":has(a[href])" );
@@ -30753,18 +30525,6 @@ $.widget( "ui.tabs", {
 				if ( $( this ).is( ".ui-state-disabled" ) ) {
 					event.preventDefault();
 				}
-			} )
-
-			// Support: IE <9
-			// Preventing the default action in mousedown doesn't prevent IE
-			// from focusing the element, so if the anchor gets focused, blur.
-			// We don't have to worry about focusing the previously focused
-			// element since clicking on a non-focusable element should focus
-			// the body anyway.
-			.on( "focus" + this.eventNamespace, ".ui-tabs-anchor", function() {
-				if ( $( this ).closest( "li" ).is( ".ui-state-disabled" ) ) {
-					this.blur();
-				}
 			} );
 
 		this.tabs = this.tablist.find( "> li:has(a[href])" )
@@ -30792,9 +30552,9 @@ $.widget( "ui.tabs", {
 
 			// Inline tab
 			if ( that._isLocal( anchor ) ) {
-				selector = anchor.hash;
+				selector = decodeURIComponent( anchor.hash );
 				panelId = selector.substring( 1 );
-				panel = that.element.find( that._sanitizeSelector( selector ) );
+				panel = that.element.find( "#" + CSS.escape( panelId ) );
 
 			// remote tab
 			} else {
@@ -31080,7 +30840,7 @@ $.widget( "ui.tabs", {
 		// meta-function to give users option to provide a href string instead of a numerical index.
 		if ( typeof index === "string" ) {
 			index = this.anchors.index( this.anchors.filter( "[href$='" +
-				$.escapeSelector( index ) + "']" ) );
+				CSS.escape( index ) + "']" ) );
 		}
 
 		return index;
@@ -31202,32 +30962,19 @@ $.widget( "ui.tabs", {
 
 		this.xhr = $.ajax( this._ajaxSettings( anchor, event, eventData ) );
 
-		// Support: jQuery <1.8
-		// jQuery <1.8 returns false if the request is canceled in beforeSend,
-		// but as of 1.8, $.ajax() always returns a jqXHR object.
-		if ( this.xhr && this.xhr.statusText !== "canceled" ) {
+		if ( this.xhr.statusText !== "canceled" ) {
 			this._addClass( tab, "ui-tabs-loading" );
 			panel.attr( "aria-busy", "true" );
 
 			this.xhr
 				.done( function( response, status, jqXHR ) {
+					panel.html( response );
+					that._trigger( "load", event, eventData );
 
-					// support: jQuery <1.8
-					// https://bugs.jquery.com/ticket/11778
-					setTimeout( function() {
-						panel.html( response );
-						that._trigger( "load", event, eventData );
-
-						complete( jqXHR, status );
-					}, 1 );
+					complete( jqXHR, status );
 				} )
 				.fail( function( jqXHR, status ) {
-
-					// support: jQuery <1.8
-					// https://bugs.jquery.com/ticket/11778
-					setTimeout( function() {
-						complete( jqXHR, status );
-					}, 1 );
+					complete( jqXHR, status );
 				} );
 		}
 	},
@@ -31235,10 +30982,7 @@ $.widget( "ui.tabs", {
 	_ajaxSettings: function( anchor, event, eventData ) {
 		var that = this;
 		return {
-
-			// Support: IE <11 only
-			// Strip any hash that exists to prevent errors with the Ajax request
-			url: anchor.attr( "href" ).replace( /#.*$/, "" ),
+			url: anchor.attr( "href" ),
 			beforeSend: function( jqXHR, settings ) {
 				return that._trigger( "beforeLoad", event,
 					$.extend( { jqXHR: jqXHR, ajaxSettings: settings }, eventData ) );
@@ -31248,13 +30992,13 @@ $.widget( "ui.tabs", {
 
 	_getPanelForTab: function( tab ) {
 		var id = $( tab ).attr( "aria-controls" );
-		return this.element.find( this._sanitizeSelector( "#" + id ) );
+		return this.element.find( "#" + CSS.escape( id ) );
 	}
 } );
 
 // DEPRECATED
 // TODO: Switch return back to widget declaration at top of file when this is removed
-if ( $.uiBackCompat !== false ) {
+if ( $.uiBackCompat === true ) {
 
 	// Backcompat for ui-tab class (now ui-tabs-tab)
 	$.widget( "ui.tabs", $.ui.tabs, {
@@ -31269,7 +31013,7 @@ var widgetsTabs = $.ui.tabs;
 
 
 /*!
- * jQuery UI Tooltip 1.13.3
+ * jQuery UI Tooltip 1.14.1
  * https://jqueryui.com
  *
  * Copyright OpenJS Foundation and other contributors
@@ -31288,7 +31032,7 @@ var widgetsTabs = $.ui.tabs;
 
 
 $.widget( "ui.tooltip", {
-	version: "1.13.3",
+	version: "1.14.1",
 	options: {
 		classes: {
 			"ui-tooltip": "ui-corner-all ui-widget-shadow"
@@ -31476,25 +31220,20 @@ $.widget( "ui.tooltip", {
 
 		content = contentOption.call( target[ 0 ], function( response ) {
 
-			// IE may instantly serve a cached response for ajax requests
-			// delay this call to _open so the other call to _open runs first
-			that._delay( function() {
+			// Ignore async response if tooltip was closed already
+			if ( !target.data( "ui-tooltip-open" ) ) {
+				return;
+			}
 
-				// Ignore async response if tooltip was closed already
-				if ( !target.data( "ui-tooltip-open" ) ) {
-					return;
-				}
-
-				// JQuery creates a special event for focusin when it doesn't
-				// exist natively. To improve performance, the native event
-				// object is reused and the type is changed. Therefore, we can't
-				// rely on the type being correct after the event finished
-				// bubbling, so we set it back to the previous value. (#8740)
-				if ( event ) {
-					event.type = eventType;
-				}
-				this._open( event, target, response );
-			} );
+			// JQuery creates a special event for focusin when it doesn't
+			// exist natively. To improve performance, the native event
+			// object is reused and the type is changed. Therefore, we can't
+			// rely on the type being correct after the event finished
+			// bubbling, so we set it back to the previous value. (#8740)
+			if ( event ) {
+				event.type = eventType;
+			}
+			that._open( event, target, response );
 		} );
 		if ( content ) {
 			this._open( event, target, content );
@@ -31754,7 +31493,7 @@ $.widget( "ui.tooltip", {
 
 // DEPRECATED
 // TODO: Switch return back to widget declaration at top of file when this is removed
-if ( $.uiBackCompat !== false ) {
+if ( $.uiBackCompat === true ) {
 
 	// Backcompat for tooltipClass option
 	$.widget( "ui.tooltip", $.ui.tooltip, {
@@ -54842,11 +54581,11 @@ return SignaturePad;
 }));
 
 /*!
- * jQuery Validation Plugin v1.20.0
+ * jQuery Validation Plugin v1.21.0
  *
  * https://jqueryvalidation.org/
  *
- * Copyright (c) 2023 Jörn Zaefferer
+ * Copyright (c) 2024 Jörn Zaefferer
  * Released under the MIT license
  */
 (function( factory ) {
@@ -55136,6 +54875,7 @@ $.extend( $.validator, {
 		onsubmit: true,
 		ignore: ":hidden",
 		ignoreTitle: false,
+		customElements: [],
 		onfocusin: function( element ) {
 			this.lastActive = element;
 
@@ -55283,17 +55023,17 @@ $.extend( $.validator, {
 					settings[ eventType ].call( validator, this, event );
 				}
 			}
-
+			var focusListeners = [ ":text", "[type='password']", "[type='file']", "select", "textarea", "[type='number']", "[type='search']",
+								"[type='tel']", "[type='url']", "[type='email']", "[type='datetime']", "[type='date']", "[type='month']",
+								"[type='week']", "[type='time']", "[type='datetime-local']", "[type='range']", "[type='color']",
+								"[type='radio']", "[type='checkbox']", "[contenteditable]", "[type='button']" ];
+			var clickListeners = [ "select", "option", "[type='radio']", "[type='checkbox']" ];
 			$( this.currentForm )
-				.on( "focusin.validate focusout.validate keyup.validate",
-					":text, [type='password'], [type='file'], select, textarea, [type='number'], [type='search'], " +
-					"[type='tel'], [type='url'], [type='email'], [type='datetime'], [type='date'], [type='month'], " +
-					"[type='week'], [type='time'], [type='datetime-local'], [type='range'], [type='color'], " +
-					"[type='radio'], [type='checkbox'], [contenteditable], [type='button']", delegate )
+				.on( "focusin.validate focusout.validate keyup.validate", focusListeners.concat( this.settings.customElements ).join( ", " ), delegate )
 
 				// Support: Chrome, oldIE
 				// "select" is provided as event.target when clicking a option
-				.on( "click.validate", "select, option, [type='radio'], [type='checkbox']", delegate );
+				.on( "click.validate", clickListeners.concat( this.settings.customElements ).join( ", " ), delegate );
 
 			if ( this.settings.invalidHandler ) {
 				$( this.currentForm ).on( "invalid-form.validate", this.settings.invalidHandler );
@@ -55490,11 +55230,12 @@ $.extend( $.validator, {
 
 		elements: function() {
 			var validator = this,
-				rulesCache = {};
+				rulesCache = {},
+				selectors = [ "input", "select", "textarea", "[contenteditable]" ];
 
 			// Select all valid inputs inside the form (no submit or reset buttons)
 			return $( this.currentForm )
-			.find( "input, select, textarea, [contenteditable]" )
+			.find( selectors.concat( this.settings.customElements ).join( ", " ) )
 			.not( ":submit, :reset, :image, :disabled" )
 			.not( this.settings.ignore )
 			.filter( function() {
@@ -56344,7 +56085,7 @@ $.extend( $.validator, {
 
 		// https://jqueryvalidation.org/number-method/
 		number: function( value, element ) {
-			return this.optional( element ) || /^(?:-?\d+|-?\d{1,3}(?:,\d{3})+)?(?:\.\d+)?$/.test( value );
+			return this.optional( element ) || /^(?:-?\d+|-?\d{1,3}(?:,\d{3})+)?(?:-?\.\d+)?$/.test( value );
 		},
 
 		// https://jqueryvalidation.org/digits-method/
@@ -56455,11 +56196,12 @@ $.extend( $.validator, {
 
 			param = typeof param === "string" && { url: param } || param;
 			optionDataString = $.param( $.extend( { data: value }, param.data ) );
-			if ( previous.old === optionDataString ) {
+			if ( previous.valid !== null && previous.old === optionDataString ) {
 				return previous.valid;
 			}
 
 			previous.old = optionDataString;
+			previous.valid = null;
 			validator = this;
 			this.startRequest( element );
 			data = {};
@@ -59192,828 +58934,16 @@ module.exports.TinyEmitter = E;
 /******/ (() => { // webpackBootstrap
 /******/ 	var __webpack_modules__ = ({
 
-/***/ "./resources/assets/js/bootstrap.js":
-/*!******************************************!*\
-  !*** ./resources/assets/js/bootstrap.js ***!
-  \******************************************/
-/***/ ((__unused_webpack_module, __unused_webpack_exports, __webpack_require__) => {
+/***/ "./node_modules/admin-lte/build/less/AdminLTE.less":
+/*!*********************************************************!*\
+  !*** ./node_modules/admin-lte/build/less/AdminLTE.less ***!
+  \*********************************************************/
+/***/ ((__unused_webpack_module, __webpack_exports__, __webpack_require__) => {
 
-window._ = __webpack_require__(/*! lodash */ "./node_modules/lodash/lodash.js");
+"use strict";
+__webpack_require__.r(__webpack_exports__);
+// extracted by mini-css-extract-plugin
 
-/**
- * We'll load jQuery and the Bootstrap jQuery plugin which provides support
- * for JavaScript based Bootstrap features such as modals and tabs. This
- * code may be modified to fit the specific needs of your application.
- */
-//window.$ = window.jQuery = require('jquery');
-
-/**
- * jQuery UI is loaded here and then the tooltip is assigned another funtion name
- * This resolves the issue of jquery-ui & bootstrap tooltip conflict
- */
-__webpack_require__(/*! jquery-ui */ "./node_modules/jquery-ui/ui/widget.js");
-jQuery.fn.uitooltip = jQuery.fn.tooltip;
-
-/**
- * Load boostrap
- */
-__webpack_require__(/*! bootstrap-less */ "./node_modules/bootstrap-less/js/bootstrap.js");
-
-// require('admin-lte');
-
-// require('chart.js');
-
-// require('jquery-form-validator'); //says something about dependency
-/**
- * Echo exposes an expressive API for subscribing to channels and listening
- * for events that are broadcast by Laravel. Echo and event broadcasting
- * allows your team to easily build robust real-time web applications.
- */
-
-// import Echo from "laravel-echo"
-
-// window.Echo = new Echo({
-//     broadcaster: 'pusher',
-//     key: 'your-pusher-key'
-// });
-
-/***/ }),
-
-/***/ "./resources/assets/js/snipeit.js":
-/*!****************************************!*\
-  !*** ./resources/assets/js/snipeit.js ***!
-  \****************************************/
-/***/ ((__unused_webpack_module, __unused_webpack_exports, __webpack_require__) => {
-
-// var jQuery = require('jquery');
-// window.jQuery = jQuery
-// window.$ = jQuery
-
-__webpack_require__(/*! ./bootstrap */ "./resources/assets/js/bootstrap.js");
-
-/**
- * Module containing core application logic.
- * @param  {jQuery} $        Insulated jQuery object
- * @param  {JSON} settings Insulated `window.snipeit.settings` object.
- * @return {IIFE}          Immediately invoked. Returns self.
- */
-
-lineOptions = {
-  legend: {
-    position: "bottom"
-  },
-  scales: {
-    yAxes: [{
-      ticks: {
-        fontColor: "rgba(0,0,0,0.5)",
-        fontStyle: "bold",
-        beginAtZero: true,
-        maxTicksLimit: 5,
-        padding: 20
-      },
-      gridLines: {
-        drawTicks: false,
-        display: false
-      }
-    }],
-    xAxes: [{
-      gridLines: {
-        zeroLineColor: "transparent"
-      },
-      ticks: {
-        padding: 20,
-        fontColor: "rgba(0,0,0,0.5)",
-        fontStyle: "bold"
-      }
-    }]
-  }
-};
-pieOptions = {
-  //Boolean - Whether we should show a stroke on each segment
-  segmentShowStroke: true,
-  //String - The colour of each segment stroke
-  segmentStrokeColor: "#fff",
-  //Number - The width of each segment stroke
-  segmentStrokeWidth: 1,
-  //Number - The percentage of the chart that we cut out of the middle
-  percentageInnerCutout: 50,
-  // This is 0 for Pie charts
-  //Number - Amount of animation steps
-  animationSteps: 100,
-  //String - Animation easing effect
-  animationEasing: "easeOutBounce",
-  //Boolean - Whether we animate the rotation of the Doughnut
-  animateRotate: true,
-  //Boolean - Whether we animate scaling the Doughnut from the centre
-  animateScale: false,
-  //Boolean - whether to make the chart responsive to window resizing
-  responsive: true,
-  // Boolean - whether to maintain the starting aspect ratio or not when responsive, if set to false, will take up entire container
-  maintainAspectRatio: false,
-  //String - A legend template
-  legendTemplate: "<ul class=\"<%=name.toLowerCase()%>-legend\"><% for (var i=0; i<segments.length; i++){%><li>" + "<i class='fas fa-circle-o' style='color: <%=segments[i].fillColor%>'></i>" + "<%if(segments[i].label){%><%=segments[i].label%><%}%> foo</li><%}%></ul>",
-  //String - A tooltip template
-  tooltipTemplate: "<%=value %> <%=label%> "
-};
-
-//-----------------
-//- END PIE CHART -
-//-----------------
-
-var baseUrl = $('meta[name="baseUrl"]').attr('content');
-(function ($, settings) {
-  var Components = {};
-  Components.modals = {};
-
-  // confirm restore modal
-  Components.modals.confirmRestore = function () {
-    var $el = $('table');
-    var events = {
-      'click': function click(evnt) {
-        var $context = $(this);
-        var $restoreConfirmModal = $('#restoreConfirmModal');
-        var href = $context.attr('href');
-        var message = $context.attr('data-content');
-        var title = $context.attr('data-title');
-        $('#restoreConfirmModalLabel').text(title);
-        $restoreConfirmModal.find('.modal-body').text(message);
-        $('#restoreForm').attr('action', href);
-        $restoreConfirmModal.modal({
-          show: true
-        });
-        return false;
-      }
-    };
-    var render = function render() {
-      $el.on('click', '.restore-asset', events['click']);
-    };
-    return {
-      render: render
-    };
-  };
-
-  // confirm delete modal
-  Components.modals.confirmDelete = function () {
-    var $el = $('table');
-    var events = {
-      'click': function click(evnt) {
-        var $context = $(this);
-        var $dataConfirmModal = $('#dataConfirmModal');
-        var href = $context.attr('href');
-        var message = $context.attr('data-content');
-        var title = $context.attr('data-title');
-        $('#myModalLabel').text(title);
-        $dataConfirmModal.find('.modal-body').text(message);
-        $('#deleteForm').attr('action', href);
-        $dataConfirmModal.modal({
-          show: true
-        });
-        return false;
-      }
-    };
-    var render = function render() {
-      $el.on('click', '.delete-asset', events['click']);
-    };
-    return {
-      render: render
-    };
-  };
-
-  /**
-   * Application start point
-   * Component definition stays out of load event, execution only happens.
-   */
-  $(function () {
-    new Components.modals.confirmRestore().render();
-    new Components.modals.confirmDelete().render();
-  });
-})(jQuery, window.snipeit.settings);
-$(document).ready(function () {
-  /*
-  * Slideout help menu
-  */
-  $('.slideout-menu-toggle').on('click', function (event) {
-    event.preventDefault();
-    // create menu variables
-    var slideoutMenu = $('.slideout-menu');
-    var slideoutMenuWidth = $('.slideout-menu').width();
-
-    // toggle open class
-    slideoutMenu.toggleClass("open");
-
-    // slide menu
-    if (slideoutMenu.hasClass("open")) {
-      slideoutMenu.show();
-      slideoutMenu.animate({
-        right: "0px"
-      });
-    } else {
-      slideoutMenu.animate({
-        right: -slideoutMenuWidth
-      }, "-350px");
-      slideoutMenu.fadeOut();
-    }
-  });
-
-  /*
-  * Select2
-  */
-
-  $('select.select2:not(".select2-hidden-accessible")').each(function (i, obj) {
-    {
-      $(obj).select2();
-    }
-  });
-
-  // $('.datepicker').datepicker();
-  // var datepicker = $.fn.datepicker.noConflict(); // return $.fn.datepicker to previously assigned value
-  // $.fn.bootstrapDP = datepicker;
-  // $('.datepicker').datepicker();
-
-  // Crazy select2 rich dropdowns with images!
-  $('.js-data-ajax').each(function (i, item) {
-    var link = $(item);
-    var endpoint = link.data("endpoint");
-    var select = link.data("select");
-    link.select2({
-      /**
-       * Adds an empty placeholder, allowing every select2 instance to be cleared.
-       * This placeholder can be overridden with the "data-placeholder" attribute.
-       */
-      placeholder: '',
-      allowClear: true,
-      ajax: {
-        // the baseUrl includes a trailing slash
-        url: baseUrl + 'api/v1/' + endpoint + '/selectlist',
-        dataType: 'json',
-        delay: 250,
-        headers: {
-          "X-Requested-With": 'XMLHttpRequest',
-          "X-CSRF-TOKEN": $('meta[name="csrf-token"]').attr('content')
-        },
-        data: function data(params) {
-          var data = {
-            search: params.term,
-            page: params.page || 1,
-            assetStatusType: link.data("asset-status-type")
-          };
-          return data;
-        },
-        /* processResults: function (data, params) {
-             params.page = params.page || 1;
-             var answer =  {
-                results: data.items,
-                pagination: {
-                    more: data.pagination.more
-                }
-            };
-             return answer;
-        }, */
-        cache: true
-      },
-      //escapeMarkup: function (markup) { return markup; }, // let our custom formatter work
-      templateResult: formatDatalistSafe
-      //templateSelection: formatDataSelection
-    });
-  });
-  function getSelect2Value(element) {
-    // if the passed object is not a jquery object, assuming 'element' is a selector
-    if (!(element instanceof jQuery)) element = $(element);
-    var select = element.data("select2");
-
-    // There's two different locations where the select2-generated input element can be. 
-    searchElement = select.dropdown.$search || select.$container.find(".select2-search__field");
-    var value = searchElement.val();
-    return value;
-  }
-  $(".select2-hidden-accessible").on('select2:selecting', function (e) {
-    var data = e.params.args.data;
-    var isMouseUp = false;
-    var element = $(this);
-    var value = getSelect2Value(element);
-    if (e.params.args.originalEvent) isMouseUp = e.params.args.originalEvent.type == "mouseup";
-
-    // if selected item does not match typed text, do not allow it to pass - force close for ajax.
-    if (!isMouseUp) {
-      if (value.toLowerCase() && data.text.toLowerCase().indexOf(value) < 0) {
-        e.preventDefault();
-        element.select2('close');
-
-        // if it does match, we set a flag in the event (which gets passed to subsequent events), telling it not to worry about the ajax
-      } else if (value.toLowerCase() && data.text.toLowerCase().indexOf(value) > -1) {
-        e.params.args.noForceAjax = true;
-      }
-    }
-  });
-  $(".select2-hidden-accessible").on('select2:closing', function (e) {
-    var element = $(this);
-    var value = getSelect2Value(element);
-    var noForceAjax = false;
-    var isMouseUp = false;
-    if (e.params.args.originalSelect2Event) noForceAjax = e.params.args.originalSelect2Event.noForceAjax;
-    if (e.params.args.originalEvent) isMouseUp = e.params.args.originalEvent.type == "mouseup";
-    if (value && !noForceAjax && !isMouseUp) {
-      var endpoint = element.data("endpoint");
-      var assetStatusType = element.data("asset-status-type");
-      $.ajax({
-        url: baseUrl + 'api/v1/' + endpoint + '/selectlist?search=' + value + '&page=1' + (assetStatusType ? '&assetStatusType=' + assetStatusType : ''),
-        dataType: 'json',
-        headers: {
-          "X-Requested-With": 'XMLHttpRequest',
-          "X-CSRF-TOKEN": $('meta[name="csrf-token"]').attr('content')
-        }
-      }).done(function (response) {
-        var currentlySelected = element.select2('data').map(function (x) {
-          return +x.id;
-        }).filter(function (x) {
-          return x !== 0;
-        });
-
-        // makes sure we're not selecting the same thing twice for multiples
-        var filteredResponse = response.results.filter(function (item) {
-          return currentlySelected.indexOf(+item.id) < 0;
-        });
-        var first = currentlySelected.length > 0 ? filteredResponse[0] : response.results[0];
-        if (first && first.id) {
-          first.selected = true;
-          if ($("option[value='" + first.id + "']", element).length < 1) {
-            var option = new Option(first.text, first.id, true, true);
-            element.append(option);
-          } else {
-            var isMultiple = element.attr("multiple") == "multiple";
-            element.val(isMultiple ? element.val().concat(first.id) : element.val(first.id));
-          }
-          element.trigger('change');
-          element.trigger({
-            type: 'select2:select',
-            params: {
-              data: first
-            }
-          });
-        }
-      });
-    }
-  });
-  function formatDatalist(datalist) {
-    var loading_markup = '<i class="fas fa-spinner fa-spin" aria-hidden="true"></i> Loading...';
-    if (datalist.loading) {
-      return loading_markup;
-    }
-    var markup = '<div class="clearfix">';
-    markup += '<div class="pull-left" style="padding-right: 10px;">';
-    if (datalist.image) {
-      markup += "<div style='width: 30px;'><img src='" + datalist.image + "' style='max-height: 20px; max-width: 30px;' alt='" + datalist.text + "'></div>";
-    } else {
-      markup += '<div style="height: 20px; width: 30px;"></div>';
-    }
-    markup += "</div><div>" + datalist.text + "</div>";
-    markup += "</div>";
-    return markup;
-  }
-  function formatDatalistSafe(datalist) {
-    // console.warn("What in the hell is going on with Select2?!?!!?!?");
-    // console.warn($.select2);
-    if (datalist.loading) {
-      return $('<i class="fas fa-spinner fa-spin" aria-hidden="true"></i> Loading...');
-    }
-    var root_div = $("<div class='clearfix'>");
-    var left_pull = $("<div class='pull-left' style='padding-right: 10px;'>");
-    if (datalist.image) {
-      var inner_div = $("<div style='width: 30px;'>");
-      /******************************************************************
-       * 
-       * We are specifically chosing empty alt-text below, because this 
-       * image conveys no additional information, relative to the text
-       * that will *always* be there in any select2 list that is in use
-       * in Snipe-IT. If that changes, we would probably want to change
-       * some signatures of some functions, but right now, we don't want
-       * screen readers to say "HP SuperJet 5000, .... picture of HP 
-       * SuperJet 5000..." and so on, for every single row in a list of
-       * assets or models or whatever.
-       * 
-       *******************************************************************/
-      var img = $("<img src='' style='max-height: 20px; max-width: 30px;' alt=''>");
-      // console.warn("Img is: ");
-      // console.dir(img);
-      // console.warn("Strigularly, that's: ");
-      // console.log(img);
-      img.attr("src", datalist.image);
-      inner_div.append(img);
-    } else {
-      var inner_div = $("<div style='height: 20px; width: 30px;'></div>");
-    }
-    left_pull.append(inner_div);
-    root_div.append(left_pull);
-    var name_div = $("<div>");
-    name_div.text(datalist.text);
-    root_div.append(name_div);
-    var safe_html = root_div.get(0).outerHTML;
-    var old_html = formatDatalist(datalist);
-    if (safe_html != old_html) {
-      //console.log("HTML MISMATCH: ");
-      //console.log("FormatDatalistSafe: ");
-      // console.dir(root_div.get(0));
-      //console.log(safe_html);
-      //console.log("FormatDataList: ");
-      //console.log(old_html);
-    }
-    return root_div;
-  }
-  function formatDataSelection(datalist) {
-    // This a heinous workaround for a known bug in Select2.
-    // Without this, the rich selectlists are vulnerable to XSS.
-    // Many thanks to @uberbrady for this fix. It ain't pretty,
-    // but it resolves the issue until Select2 addresses it on their end.
-    //
-    // Bug was reported in 2016 :{
-    // https://github.com/select2/select2/issues/4587
-
-    return datalist.text.replace(/>/g, '&gt;').replace(/</g, '&lt;').replace(/"/g, '&quot;').replace(/'/g, '&#039;');
-  }
-
-  // This handles the radio button selectors for the checkout-to-foo options
-  // on asset checkout and also on asset edit
-  $(function () {
-    $('input[name=checkout_to_type]').on("change", function () {
-      var assignto_type = $('input[name=checkout_to_type]:checked').val();
-      var userid = $('#assigned_user option:selected').val();
-      if (assignto_type == 'asset') {
-        $('#current_assets_box').fadeOut();
-        $('#assigned_asset').show();
-        $('#assigned_user').hide();
-        $('#assigned_location').hide();
-        $('.notification-callout').fadeOut();
-        $('[name="assigned_location"]').val('').trigger('change.select2');
-        $('[name="assigned_user"]').val('').trigger('change.select2');
-      } else if (assignto_type == 'location') {
-        $('#current_assets_box').fadeOut();
-        $('#assigned_asset').hide();
-        $('#assigned_user').hide();
-        $('#assigned_location').show();
-        $('.notification-callout').fadeOut();
-        $('[name="assigned_asset"]').val('').trigger('change.select2');
-        $('[name="assigned_user"]').val('').trigger('change.select2');
-      } else {
-        $('#assigned_asset').hide();
-        $('#assigned_user').show();
-        $('#assigned_location').hide();
-        if (userid) {
-          $('#current_assets_box').fadeIn();
-        }
-        $('.notification-callout').fadeIn();
-        $('[name="assigned_asset"]').val('').trigger('change.select2');
-        $('[name="assigned_location"]').val('').trigger('change.select2');
-      }
-    });
-  });
-
-  // ------------------------------------------------
-  // Deep linking for Bootstrap tabs
-  // ------------------------------------------------
-  var taburl = document.location.toString();
-
-  // Allow full page URL to activate a tab's ID
-  // ------------------------------------------------
-  // This allows linking to a tab on page load via the address bar.
-  // So a URL such as, http://snipe-it.local/hardware/2/#my_tab will
-  // cause the tab on that page with an ID of “my_tab” to be active.
-  if (taburl.match('#')) {
-    $('.nav-tabs a[href="#' + taburl.split('#')[1] + '"]').tab('show');
-  }
-
-  // Allow internal page links to activate a tab's ID.
-  // ------------------------------------------------
-  // This allows you to link to a tab from anywhere on the page
-  // including from within another tab. Also note that internal page
-  // links either inside or out of the tabs need to include data-toggle="tab"
-  // Ex: <a href="#my_tab" data-toggle="tab">Click me</a>
-  $('a[data-toggle="tab"]').click(function (e) {
-    var href = $(this).attr("href");
-    history.pushState(null, null, href);
-    e.preventDefault();
-    $('a[href="' + $(this).attr('href') + '"]').tab('show');
-  });
-
-  // ------------------------------------------------
-  // End Deep Linking for Bootstrap tabs
-  // ------------------------------------------------
-
-  // Image preview
-  function readURL(input, $preview) {
-    if (input.files && input.files[0]) {
-      var reader = new FileReader();
-      reader.onload = function (e) {
-        $preview.attr('src', e.target.result);
-      };
-      reader.readAsDataURL(input.files[0]);
-    }
-  }
-  function formatBytes(bytes) {
-    if (bytes < 1024) return bytes + " Bytes";else if (bytes < 1048576) return (bytes / 1024).toFixed(2) + " KB";else if (bytes < 1073741824) return (bytes / 1048576).toFixed(2) + " MB";else return (bytes / 1073741824).toFixed(2) + " GB";
-  }
-
-  // File size validation
-  $('.js-uploadFile').bind('change', function () {
-    var $this = $(this);
-    var id = '#' + $this.attr('id');
-    var status = id + '-status';
-    var $status = $(status);
-    var delete_id = $(id + '-deleteCheckbox');
-    var preview_container = $(id + '-previewContainer');
-    $status.removeClass('text-success').removeClass('text-danger');
-    $(status + ' .goodfile').remove();
-    $(status + ' .badfile').remove();
-    $(status + ' .previewSize').hide();
-    preview_container.hide();
-    $(id + '-info').html('');
-    var max_size = $this.data('maxsize');
-    var total_size = 0;
-    for (var i = 0; i < this.files.length; i++) {
-      total_size += this.files[i].size;
-      $(id + '-info').append('<span class="label label-default">' + htmlEntities(this.files[i].name) + ' (' + formatBytes(this.files[i].size) + ')</span> ');
-    }
-    if (total_size > max_size) {
-      $status.addClass('text-danger').removeClass('help-block').prepend('<i class="badfile fas fa-times"></i> ').append('<span class="previewSize"> Upload is ' + formatBytes(total_size) + '.</span>');
-    } else {
-      $status.addClass('text-success').removeClass('help-block').prepend('<i class="goodfile fas fa-check"></i> ');
-      var $preview = $(id + '-imagePreview');
-      readURL(this, $preview);
-      $preview.fadeIn();
-      preview_container.fadeIn();
-      delete_id.hide();
-    }
-  });
-});
-function htmlEntities(str) {
-  return String(str).replace(/&/g, '&amp;').replace(/</g, '&lt;').replace(/>/g, '&gt;').replace(/"/g, '&quot;');
-}
-
-/**
- * Toggle disabled
- */
-(function ($) {
-  $.fn.toggleDisabled = function (callback) {
-    return this.each(function () {
-      var disabled,
-        $this = $(this);
-      if ($this.attr('disabled')) {
-        $this.removeAttr('disabled');
-        disabled = false;
-      } else {
-        $this.attr('disabled', 'disabled');
-        disabled = true;
-      }
-      if (callback && typeof callback === 'function') {
-        callback(this, disabled);
-      }
-    });
-  };
-})(jQuery);
-
-/**
- * Universal Livewire Select2 integration
- *
- * How to use:
- *
- * 1. Set the class of your select2 elements to 'livewire-select2').
- * 2. Name your element to match a property in your Livewire component
- * 3. Add an attribute called 'data-livewire-component' that points to $this->getId() (via `{{ }}` if you're in a blade,
- *    or just $this->getId() if not).
- */
-document.addEventListener('livewire:init', function () {
-  $('.livewire-select2').select2();
-  $(document).on('select2:select', '.livewire-select2', function (event) {
-    var target = $(event.target);
-    if (!event.target.name || !target.data('livewire-component')) {
-      console.error("You need to set both name (which should match a Livewire property) and data-livewire-component on your Livewire-ed select2 elements!");
-      console.error("For data-livewire-component, you probably want to use $this->getId() or {{ $this->getId() }}, as appropriate");
-      return false;
-    }
-    Livewire.find(target.data('livewire-component')).set(event.target.name, this.options[this.selectedIndex].value);
-  });
-  Livewire.hook('request', function (_ref) {
-    var succeed = _ref.succeed;
-    succeed(function () {
-      queueMicrotask(function () {
-        $('.livewire-select2').select2();
-      });
-    });
-  });
-});
-
-/***/ }),
-
-/***/ "./resources/assets/js/snipeit_modals.js":
-/*!***********************************************!*\
-  !*** ./resources/assets/js/snipeit_modals.js ***!
-  \***********************************************/
-/***/ (() => {
-
-/* 
- * 
- * Snipe-IT Universal Modal support
- * 
- * Enables modal dialogs to create sub-resources throughout Snipe-IT
- * 
- */
-
-/* 
-HOW TO USE
- Create a Button looking like this:
- <a href='{{ route('modal.show', 'user') }}' data-toggle="modal"  data-target="#createModal" data-select='assigned_to' class="btn btn-sm btn-primary">New</a>
- If you don't have access to Blade commands (like {{ and }}, etc), you can hard-code a URL as the 'href'
- data-toggle="modal" - required for Bootstrap Modals
-data-target="#createModal" - fixed ID for the modal, do not change
-data-select="assigned_to" - What is the *ID* of the select-dropdown that you're going to be adding to, if the modal-create was a success? Be on the lookout for duplicate ID's, it will confuse this library!
-class="btn btn-sm btn-primary" - makes it look button-ey, feel free to change :)
-
-If you want to pass additional variables to the modal (In the Category Create one, for example, you can pass category_id), you can encode them as URL variables in the href
-
-*/
-
-$(function () {
-  var baseUrl = $('meta[name="baseUrl"]').attr('content');
-  //handle modal-add-interstitial calls
-  var model, select, refreshSelector;
-  if ($('#createModal').length == 0) {
-    $('body').append('<div class="modal fade" id="createModal"></div><!-- /.modal -->');
-  }
-  $('#createModal').on("show.bs.modal", function (event) {
-    var link = $(event.relatedTarget);
-    model = link.data("dependency");
-    select = link.data("select");
-    refreshSelector = link.data("refresh");
-    $('#createModal').load(link.attr('href'), function () {
-      // this sets the focus to be the name field
-      $('#modal-name').focus();
-
-      //do we need to re-select2 this, after load? Probably.
-      $('#createModal').find('select.select2').select2();
-      // Initialize the ajaxy select2 with images.
-      // This is a copy/paste of the code from snipeit.js, would be great to only have this in one place.
-
-      $('.js-data-ajax').each(function (i, item) {
-        var link = $(item);
-        var endpoint = link.data("endpoint");
-        var select = link.data("select");
-        link.select2({
-          ajax: {
-            // the baseUrl includes a trailing slash
-            url: baseUrl + 'api/v1/' + endpoint + '/selectlist',
-            //WARNING - we're hoping that's defined on the page somewhere...
-            dataType: 'json',
-            delay: 250,
-            headers: {
-              "X-Requested-With": 'XMLHttpRequest',
-              "X-CSRF-TOKEN": $('meta[name="csrf-token"]').attr('content')
-            },
-            data: function data(params) {
-              var data = {
-                search: params.term,
-                page: params.page || 1,
-                assetStatusType: link.data("asset-status-type")
-              };
-              return data;
-            },
-            /*processResults: function (data, params) {
-                 params.page = params.page || 1;
-                 var answer =  {
-                    results: data.items,
-                    pagination: {
-                        more: data.pagination.more
-                    }
-                };
-                 return answer;
-            },*/
-            cache: true
-          },
-          //escapeMarkup: function (markup) { return markup; }, // let our custom formatter work
-          templateResult: formatDatalistSafe
-          //templateSelection: formatDataSelection
-        });
-      });
-    });
-  });
-  $('#createModal').on('click', '#modal-save', function () {
-    $.ajax({
-      type: 'POST',
-      url: $('.modal-body form').attr('action'),
-      headers: {
-        "X-Requested-With": 'XMLHttpRequest',
-        "X-CSRF-TOKEN": $('meta[name="csrf-token"]').attr('content')
-      },
-      data: $('.modal-body form').serialize(),
-      success: function success(result) {
-        if (result.status == "error") {
-          var error_message = "";
-          for (var field in result.messages) {
-            error_message += "<li>Problem(s) with field <i><strong>" + field + "</strong></i>: " + result.messages[field];
-          }
-          $('#modal_error_msg').html(error_message).show();
-          return false;
-        }
-        var id = result.payload.id;
-        var name = result.payload.name || result.payload.first_name + " " + result.payload.last_name;
-        if (!id || !name) {
-          console.error("Could not find resulting name or ID from modal-create. Name: " + name + ", id: " + id);
-          return false;
-        }
-        $('#createModal').modal('hide');
-        $('#createModal').html("");
-        var refreshTable = $('#' + refreshSelector);
-        if (refreshTable.length > 0) {
-          refreshTable.bootstrapTable('refresh');
-        }
-
-        // "select" is the original drop-down menu that someone
-        // clicked 'add' on to add a new 'thing'
-        // this code adds the newly created object to that select
-        var selector = document.getElementById(select);
-        if (!selector) {
-          return false;
-        }
-        selector.options[selector.length] = new Option(name, id);
-        selector.selectedIndex = selector.length - 1;
-        $(selector).trigger("change");
-        if (window.fetchCustomFields) {
-          fetchCustomFields();
-        }
-      },
-      error: function error(result) {
-        msg = result.responseJSON.messages || result.responseJSON.error;
-        $('#modal_error_msg').html("Server Error: " + msg).show();
-      }
-    });
-  });
-});
-function formatDatalistSafe(datalist) {
-  // console.warn("What in the hell is going on with Select2?!?!!?!?");
-  // console.warn($.select2);
-  if (datalist.loading) {
-    return $('<i class="fas fa-spinner fa-spin" aria-hidden="true"></i> Loading...');
-  }
-  var root_div = $("<div class='clearfix'>");
-  var left_pull = $("<div class='pull-left' style='padding-right: 10px;'>");
-  if (datalist.image) {
-    var inner_div = $("<div style='width: 30px;'>");
-    /******************************************************************
-     * 
-     * We are specifically chosing empty alt-text below, because this 
-     * image conveys no additional information, relative to the text
-     * that will *always* be there in any select2 list that is in use
-     * in Snipe-IT. If that changes, we would probably want to change
-     * some signatures of some functions, but right now, we don't want
-     * screen readers to say "HP SuperJet 5000, .... picture of HP 
-     * SuperJet 5000..." and so on, for every single row in a list of
-     * assets or models or whatever.
-     * 
-     *******************************************************************/
-    var img = $("<img src='' style='max-height: 20px; max-width: 30px;' alt=''>");
-    // console.warn("Img is: ");
-    // console.dir(img);
-    // console.warn("Strigularly, that's: ");
-    // console.log(img);
-    img.attr("src", datalist.image);
-    inner_div.append(img);
-  } else {
-    var inner_div = $("<div style='height: 20px; width: 30px;'></div>");
-  }
-  left_pull.append(inner_div);
-  root_div.append(left_pull);
-  var name_div = $("<div>");
-  name_div.text(datalist.text);
-  root_div.append(name_div);
-  var safe_html = root_div.get(0).outerHTML;
-  var old_html = formatDatalist(datalist);
-  if (safe_html != old_html) {
-    // console.log("HTML MISMATCH: ");
-    // console.log("FormatDatalistSafe: ");
-    // console.dir(root_div.get(0));
-    // console.log(safe_html);
-    // console.log("FormatDataList: ");
-    // console.log(old_html);
-  }
-  return root_div;
-}
-function formatDatalist(datalist) {
-  var loading_markup = '<i class="fas fa-spinner fa-spin" aria-hidden="true"></i> Loading...';
-  if (datalist.loading) {
-    return loading_markup;
-  }
-  var markup = "<div class='clearfix'>";
-  markup += "<div class='pull-left' style='padding-right: 10px;'>";
-  if (datalist.image) {
-    markup += "<div style='width: 30px;'><img src='" + datalist.image + "' alt='" + datalist.tex + "' style='max-height: 20px; max-width: 30px;'></div>";
-  } else {
-    markup += "<div style='height: 20px; width: 30px;'></div>";
-  }
-  markup += "</div><div>" + datalist.text + "</div>";
-  markup += "</div>";
-  return markup;
-}
-function formatDataSelection(datalist) {
-  return datalist.text.replace(/>/g, '&gt;').replace(/</g, '&lt;').replace(/"/g, '&quot;').replace(/'/g, '&#039;');
-}
 
 /***/ }),
 
@@ -62346,6 +61276,903 @@ if (typeof jQuery === 'undefined') {
 }(jQuery);
 
 
+/***/ }),
+
+/***/ "./node_modules/canvas-confetti/dist/confetti.browser.js":
+/*!***************************************************************!*\
+  !*** ./node_modules/canvas-confetti/dist/confetti.browser.js ***!
+  \***************************************************************/
+/***/ (() => {
+
+// canvas-confetti v1.9.3 built on 2024-04-30T22:19:17.794Z
+!(function (window, module) {
+// source content
+/* globals Map */
+
+(function main(global, module, isWorker, workerSize) {
+  var canUseWorker = !!(
+    global.Worker &&
+    global.Blob &&
+    global.Promise &&
+    global.OffscreenCanvas &&
+    global.OffscreenCanvasRenderingContext2D &&
+    global.HTMLCanvasElement &&
+    global.HTMLCanvasElement.prototype.transferControlToOffscreen &&
+    global.URL &&
+    global.URL.createObjectURL);
+
+  var canUsePaths = typeof Path2D === 'function' && typeof DOMMatrix === 'function';
+  var canDrawBitmap = (function () {
+    // this mostly supports ssr
+    if (!global.OffscreenCanvas) {
+      return false;
+    }
+
+    var canvas = new OffscreenCanvas(1, 1);
+    var ctx = canvas.getContext('2d');
+    ctx.fillRect(0, 0, 1, 1);
+    var bitmap = canvas.transferToImageBitmap();
+
+    try {
+      ctx.createPattern(bitmap, 'no-repeat');
+    } catch (e) {
+      return false;
+    }
+
+    return true;
+  })();
+
+  function noop() {}
+
+  // create a promise if it exists, otherwise, just
+  // call the function directly
+  function promise(func) {
+    var ModulePromise = module.exports.Promise;
+    var Prom = ModulePromise !== void 0 ? ModulePromise : global.Promise;
+
+    if (typeof Prom === 'function') {
+      return new Prom(func);
+    }
+
+    func(noop, noop);
+
+    return null;
+  }
+
+  var bitmapMapper = (function (skipTransform, map) {
+    // see https://github.com/catdad/canvas-confetti/issues/209
+    // creating canvases is actually pretty expensive, so we should create a
+    // 1:1 map for bitmap:canvas, so that we can animate the confetti in
+    // a performant manner, but also not store them forever so that we don't
+    // have a memory leak
+    return {
+      transform: function(bitmap) {
+        if (skipTransform) {
+          return bitmap;
+        }
+
+        if (map.has(bitmap)) {
+          return map.get(bitmap);
+        }
+
+        var canvas = new OffscreenCanvas(bitmap.width, bitmap.height);
+        var ctx = canvas.getContext('2d');
+        ctx.drawImage(bitmap, 0, 0);
+
+        map.set(bitmap, canvas);
+
+        return canvas;
+      },
+      clear: function () {
+        map.clear();
+      }
+    };
+  })(canDrawBitmap, new Map());
+
+  var raf = (function () {
+    var TIME = Math.floor(1000 / 60);
+    var frame, cancel;
+    var frames = {};
+    var lastFrameTime = 0;
+
+    if (typeof requestAnimationFrame === 'function' && typeof cancelAnimationFrame === 'function') {
+      frame = function (cb) {
+        var id = Math.random();
+
+        frames[id] = requestAnimationFrame(function onFrame(time) {
+          if (lastFrameTime === time || lastFrameTime + TIME - 1 < time) {
+            lastFrameTime = time;
+            delete frames[id];
+
+            cb();
+          } else {
+            frames[id] = requestAnimationFrame(onFrame);
+          }
+        });
+
+        return id;
+      };
+      cancel = function (id) {
+        if (frames[id]) {
+          cancelAnimationFrame(frames[id]);
+        }
+      };
+    } else {
+      frame = function (cb) {
+        return setTimeout(cb, TIME);
+      };
+      cancel = function (timer) {
+        return clearTimeout(timer);
+      };
+    }
+
+    return { frame: frame, cancel: cancel };
+  }());
+
+  var getWorker = (function () {
+    var worker;
+    var prom;
+    var resolves = {};
+
+    function decorate(worker) {
+      function execute(options, callback) {
+        worker.postMessage({ options: options || {}, callback: callback });
+      }
+      worker.init = function initWorker(canvas) {
+        var offscreen = canvas.transferControlToOffscreen();
+        worker.postMessage({ canvas: offscreen }, [offscreen]);
+      };
+
+      worker.fire = function fireWorker(options, size, done) {
+        if (prom) {
+          execute(options, null);
+          return prom;
+        }
+
+        var id = Math.random().toString(36).slice(2);
+
+        prom = promise(function (resolve) {
+          function workerDone(msg) {
+            if (msg.data.callback !== id) {
+              return;
+            }
+
+            delete resolves[id];
+            worker.removeEventListener('message', workerDone);
+
+            prom = null;
+
+            bitmapMapper.clear();
+
+            done();
+            resolve();
+          }
+
+          worker.addEventListener('message', workerDone);
+          execute(options, id);
+
+          resolves[id] = workerDone.bind(null, { data: { callback: id }});
+        });
+
+        return prom;
+      };
+
+      worker.reset = function resetWorker() {
+        worker.postMessage({ reset: true });
+
+        for (var id in resolves) {
+          resolves[id]();
+          delete resolves[id];
+        }
+      };
+    }
+
+    return function () {
+      if (worker) {
+        return worker;
+      }
+
+      if (!isWorker && canUseWorker) {
+        var code = [
+          'var CONFETTI, SIZE = {}, module = {};',
+          '(' + main.toString() + ')(this, module, true, SIZE);',
+          'onmessage = function(msg) {',
+          '  if (msg.data.options) {',
+          '    CONFETTI(msg.data.options).then(function () {',
+          '      if (msg.data.callback) {',
+          '        postMessage({ callback: msg.data.callback });',
+          '      }',
+          '    });',
+          '  } else if (msg.data.reset) {',
+          '    CONFETTI && CONFETTI.reset();',
+          '  } else if (msg.data.resize) {',
+          '    SIZE.width = msg.data.resize.width;',
+          '    SIZE.height = msg.data.resize.height;',
+          '  } else if (msg.data.canvas) {',
+          '    SIZE.width = msg.data.canvas.width;',
+          '    SIZE.height = msg.data.canvas.height;',
+          '    CONFETTI = module.exports.create(msg.data.canvas);',
+          '  }',
+          '}',
+        ].join('\n');
+        try {
+          worker = new Worker(URL.createObjectURL(new Blob([code])));
+        } catch (e) {
+          // eslint-disable-next-line no-console
+          typeof console !== undefined && typeof console.warn === 'function' ? console.warn('🎊 Could not load worker', e) : null;
+
+          return null;
+        }
+
+        decorate(worker);
+      }
+
+      return worker;
+    };
+  })();
+
+  var defaults = {
+    particleCount: 50,
+    angle: 90,
+    spread: 45,
+    startVelocity: 45,
+    decay: 0.9,
+    gravity: 1,
+    drift: 0,
+    ticks: 200,
+    x: 0.5,
+    y: 0.5,
+    shapes: ['square', 'circle'],
+    zIndex: 100,
+    colors: [
+      '#26ccff',
+      '#a25afd',
+      '#ff5e7e',
+      '#88ff5a',
+      '#fcff42',
+      '#ffa62d',
+      '#ff36ff'
+    ],
+    // probably should be true, but back-compat
+    disableForReducedMotion: false,
+    scalar: 1
+  };
+
+  function convert(val, transform) {
+    return transform ? transform(val) : val;
+  }
+
+  function isOk(val) {
+    return !(val === null || val === undefined);
+  }
+
+  function prop(options, name, transform) {
+    return convert(
+      options && isOk(options[name]) ? options[name] : defaults[name],
+      transform
+    );
+  }
+
+  function onlyPositiveInt(number){
+    return number < 0 ? 0 : Math.floor(number);
+  }
+
+  function randomInt(min, max) {
+    // [min, max)
+    return Math.floor(Math.random() * (max - min)) + min;
+  }
+
+  function toDecimal(str) {
+    return parseInt(str, 16);
+  }
+
+  function colorsToRgb(colors) {
+    return colors.map(hexToRgb);
+  }
+
+  function hexToRgb(str) {
+    var val = String(str).replace(/[^0-9a-f]/gi, '');
+
+    if (val.length < 6) {
+        val = val[0]+val[0]+val[1]+val[1]+val[2]+val[2];
+    }
+
+    return {
+      r: toDecimal(val.substring(0,2)),
+      g: toDecimal(val.substring(2,4)),
+      b: toDecimal(val.substring(4,6))
+    };
+  }
+
+  function getOrigin(options) {
+    var origin = prop(options, 'origin', Object);
+    origin.x = prop(origin, 'x', Number);
+    origin.y = prop(origin, 'y', Number);
+
+    return origin;
+  }
+
+  function setCanvasWindowSize(canvas) {
+    canvas.width = document.documentElement.clientWidth;
+    canvas.height = document.documentElement.clientHeight;
+  }
+
+  function setCanvasRectSize(canvas) {
+    var rect = canvas.getBoundingClientRect();
+    canvas.width = rect.width;
+    canvas.height = rect.height;
+  }
+
+  function getCanvas(zIndex) {
+    var canvas = document.createElement('canvas');
+
+    canvas.style.position = 'fixed';
+    canvas.style.top = '0px';
+    canvas.style.left = '0px';
+    canvas.style.pointerEvents = 'none';
+    canvas.style.zIndex = zIndex;
+
+    return canvas;
+  }
+
+  function ellipse(context, x, y, radiusX, radiusY, rotation, startAngle, endAngle, antiClockwise) {
+    context.save();
+    context.translate(x, y);
+    context.rotate(rotation);
+    context.scale(radiusX, radiusY);
+    context.arc(0, 0, 1, startAngle, endAngle, antiClockwise);
+    context.restore();
+  }
+
+  function randomPhysics(opts) {
+    var radAngle = opts.angle * (Math.PI / 180);
+    var radSpread = opts.spread * (Math.PI / 180);
+
+    return {
+      x: opts.x,
+      y: opts.y,
+      wobble: Math.random() * 10,
+      wobbleSpeed: Math.min(0.11, Math.random() * 0.1 + 0.05),
+      velocity: (opts.startVelocity * 0.5) + (Math.random() * opts.startVelocity),
+      angle2D: -radAngle + ((0.5 * radSpread) - (Math.random() * radSpread)),
+      tiltAngle: (Math.random() * (0.75 - 0.25) + 0.25) * Math.PI,
+      color: opts.color,
+      shape: opts.shape,
+      tick: 0,
+      totalTicks: opts.ticks,
+      decay: opts.decay,
+      drift: opts.drift,
+      random: Math.random() + 2,
+      tiltSin: 0,
+      tiltCos: 0,
+      wobbleX: 0,
+      wobbleY: 0,
+      gravity: opts.gravity * 3,
+      ovalScalar: 0.6,
+      scalar: opts.scalar,
+      flat: opts.flat
+    };
+  }
+
+  function updateFetti(context, fetti) {
+    fetti.x += Math.cos(fetti.angle2D) * fetti.velocity + fetti.drift;
+    fetti.y += Math.sin(fetti.angle2D) * fetti.velocity + fetti.gravity;
+    fetti.velocity *= fetti.decay;
+
+    if (fetti.flat) {
+      fetti.wobble = 0;
+      fetti.wobbleX = fetti.x + (10 * fetti.scalar);
+      fetti.wobbleY = fetti.y + (10 * fetti.scalar);
+
+      fetti.tiltSin = 0;
+      fetti.tiltCos = 0;
+      fetti.random = 1;
+    } else {
+      fetti.wobble += fetti.wobbleSpeed;
+      fetti.wobbleX = fetti.x + ((10 * fetti.scalar) * Math.cos(fetti.wobble));
+      fetti.wobbleY = fetti.y + ((10 * fetti.scalar) * Math.sin(fetti.wobble));
+
+      fetti.tiltAngle += 0.1;
+      fetti.tiltSin = Math.sin(fetti.tiltAngle);
+      fetti.tiltCos = Math.cos(fetti.tiltAngle);
+      fetti.random = Math.random() + 2;
+    }
+
+    var progress = (fetti.tick++) / fetti.totalTicks;
+
+    var x1 = fetti.x + (fetti.random * fetti.tiltCos);
+    var y1 = fetti.y + (fetti.random * fetti.tiltSin);
+    var x2 = fetti.wobbleX + (fetti.random * fetti.tiltCos);
+    var y2 = fetti.wobbleY + (fetti.random * fetti.tiltSin);
+
+    context.fillStyle = 'rgba(' + fetti.color.r + ', ' + fetti.color.g + ', ' + fetti.color.b + ', ' + (1 - progress) + ')';
+
+    context.beginPath();
+
+    if (canUsePaths && fetti.shape.type === 'path' && typeof fetti.shape.path === 'string' && Array.isArray(fetti.shape.matrix)) {
+      context.fill(transformPath2D(
+        fetti.shape.path,
+        fetti.shape.matrix,
+        fetti.x,
+        fetti.y,
+        Math.abs(x2 - x1) * 0.1,
+        Math.abs(y2 - y1) * 0.1,
+        Math.PI / 10 * fetti.wobble
+      ));
+    } else if (fetti.shape.type === 'bitmap') {
+      var rotation = Math.PI / 10 * fetti.wobble;
+      var scaleX = Math.abs(x2 - x1) * 0.1;
+      var scaleY = Math.abs(y2 - y1) * 0.1;
+      var width = fetti.shape.bitmap.width * fetti.scalar;
+      var height = fetti.shape.bitmap.height * fetti.scalar;
+
+      var matrix = new DOMMatrix([
+        Math.cos(rotation) * scaleX,
+        Math.sin(rotation) * scaleX,
+        -Math.sin(rotation) * scaleY,
+        Math.cos(rotation) * scaleY,
+        fetti.x,
+        fetti.y
+      ]);
+
+      // apply the transform matrix from the confetti shape
+      matrix.multiplySelf(new DOMMatrix(fetti.shape.matrix));
+
+      var pattern = context.createPattern(bitmapMapper.transform(fetti.shape.bitmap), 'no-repeat');
+      pattern.setTransform(matrix);
+
+      context.globalAlpha = (1 - progress);
+      context.fillStyle = pattern;
+      context.fillRect(
+        fetti.x - (width / 2),
+        fetti.y - (height / 2),
+        width,
+        height
+      );
+      context.globalAlpha = 1;
+    } else if (fetti.shape === 'circle') {
+      context.ellipse ?
+        context.ellipse(fetti.x, fetti.y, Math.abs(x2 - x1) * fetti.ovalScalar, Math.abs(y2 - y1) * fetti.ovalScalar, Math.PI / 10 * fetti.wobble, 0, 2 * Math.PI) :
+        ellipse(context, fetti.x, fetti.y, Math.abs(x2 - x1) * fetti.ovalScalar, Math.abs(y2 - y1) * fetti.ovalScalar, Math.PI / 10 * fetti.wobble, 0, 2 * Math.PI);
+    } else if (fetti.shape === 'star') {
+      var rot = Math.PI / 2 * 3;
+      var innerRadius = 4 * fetti.scalar;
+      var outerRadius = 8 * fetti.scalar;
+      var x = fetti.x;
+      var y = fetti.y;
+      var spikes = 5;
+      var step = Math.PI / spikes;
+
+      while (spikes--) {
+        x = fetti.x + Math.cos(rot) * outerRadius;
+        y = fetti.y + Math.sin(rot) * outerRadius;
+        context.lineTo(x, y);
+        rot += step;
+
+        x = fetti.x + Math.cos(rot) * innerRadius;
+        y = fetti.y + Math.sin(rot) * innerRadius;
+        context.lineTo(x, y);
+        rot += step;
+      }
+    } else {
+      context.moveTo(Math.floor(fetti.x), Math.floor(fetti.y));
+      context.lineTo(Math.floor(fetti.wobbleX), Math.floor(y1));
+      context.lineTo(Math.floor(x2), Math.floor(y2));
+      context.lineTo(Math.floor(x1), Math.floor(fetti.wobbleY));
+    }
+
+    context.closePath();
+    context.fill();
+
+    return fetti.tick < fetti.totalTicks;
+  }
+
+  function animate(canvas, fettis, resizer, size, done) {
+    var animatingFettis = fettis.slice();
+    var context = canvas.getContext('2d');
+    var animationFrame;
+    var destroy;
+
+    var prom = promise(function (resolve) {
+      function onDone() {
+        animationFrame = destroy = null;
+
+        context.clearRect(0, 0, size.width, size.height);
+        bitmapMapper.clear();
+
+        done();
+        resolve();
+      }
+
+      function update() {
+        if (isWorker && !(size.width === workerSize.width && size.height === workerSize.height)) {
+          size.width = canvas.width = workerSize.width;
+          size.height = canvas.height = workerSize.height;
+        }
+
+        if (!size.width && !size.height) {
+          resizer(canvas);
+          size.width = canvas.width;
+          size.height = canvas.height;
+        }
+
+        context.clearRect(0, 0, size.width, size.height);
+
+        animatingFettis = animatingFettis.filter(function (fetti) {
+          return updateFetti(context, fetti);
+        });
+
+        if (animatingFettis.length) {
+          animationFrame = raf.frame(update);
+        } else {
+          onDone();
+        }
+      }
+
+      animationFrame = raf.frame(update);
+      destroy = onDone;
+    });
+
+    return {
+      addFettis: function (fettis) {
+        animatingFettis = animatingFettis.concat(fettis);
+
+        return prom;
+      },
+      canvas: canvas,
+      promise: prom,
+      reset: function () {
+        if (animationFrame) {
+          raf.cancel(animationFrame);
+        }
+
+        if (destroy) {
+          destroy();
+        }
+      }
+    };
+  }
+
+  function confettiCannon(canvas, globalOpts) {
+    var isLibCanvas = !canvas;
+    var allowResize = !!prop(globalOpts || {}, 'resize');
+    var hasResizeEventRegistered = false;
+    var globalDisableForReducedMotion = prop(globalOpts, 'disableForReducedMotion', Boolean);
+    var shouldUseWorker = canUseWorker && !!prop(globalOpts || {}, 'useWorker');
+    var worker = shouldUseWorker ? getWorker() : null;
+    var resizer = isLibCanvas ? setCanvasWindowSize : setCanvasRectSize;
+    var initialized = (canvas && worker) ? !!canvas.__confetti_initialized : false;
+    var preferLessMotion = typeof matchMedia === 'function' && matchMedia('(prefers-reduced-motion)').matches;
+    var animationObj;
+
+    function fireLocal(options, size, done) {
+      var particleCount = prop(options, 'particleCount', onlyPositiveInt);
+      var angle = prop(options, 'angle', Number);
+      var spread = prop(options, 'spread', Number);
+      var startVelocity = prop(options, 'startVelocity', Number);
+      var decay = prop(options, 'decay', Number);
+      var gravity = prop(options, 'gravity', Number);
+      var drift = prop(options, 'drift', Number);
+      var colors = prop(options, 'colors', colorsToRgb);
+      var ticks = prop(options, 'ticks', Number);
+      var shapes = prop(options, 'shapes');
+      var scalar = prop(options, 'scalar');
+      var flat = !!prop(options, 'flat');
+      var origin = getOrigin(options);
+
+      var temp = particleCount;
+      var fettis = [];
+
+      var startX = canvas.width * origin.x;
+      var startY = canvas.height * origin.y;
+
+      while (temp--) {
+        fettis.push(
+          randomPhysics({
+            x: startX,
+            y: startY,
+            angle: angle,
+            spread: spread,
+            startVelocity: startVelocity,
+            color: colors[temp % colors.length],
+            shape: shapes[randomInt(0, shapes.length)],
+            ticks: ticks,
+            decay: decay,
+            gravity: gravity,
+            drift: drift,
+            scalar: scalar,
+            flat: flat
+          })
+        );
+      }
+
+      // if we have a previous canvas already animating,
+      // add to it
+      if (animationObj) {
+        return animationObj.addFettis(fettis);
+      }
+
+      animationObj = animate(canvas, fettis, resizer, size , done);
+
+      return animationObj.promise;
+    }
+
+    function fire(options) {
+      var disableForReducedMotion = globalDisableForReducedMotion || prop(options, 'disableForReducedMotion', Boolean);
+      var zIndex = prop(options, 'zIndex', Number);
+
+      if (disableForReducedMotion && preferLessMotion) {
+        return promise(function (resolve) {
+          resolve();
+        });
+      }
+
+      if (isLibCanvas && animationObj) {
+        // use existing canvas from in-progress animation
+        canvas = animationObj.canvas;
+      } else if (isLibCanvas && !canvas) {
+        // create and initialize a new canvas
+        canvas = getCanvas(zIndex);
+        document.body.appendChild(canvas);
+      }
+
+      if (allowResize && !initialized) {
+        // initialize the size of a user-supplied canvas
+        resizer(canvas);
+      }
+
+      var size = {
+        width: canvas.width,
+        height: canvas.height
+      };
+
+      if (worker && !initialized) {
+        worker.init(canvas);
+      }
+
+      initialized = true;
+
+      if (worker) {
+        canvas.__confetti_initialized = true;
+      }
+
+      function onResize() {
+        if (worker) {
+          // TODO this really shouldn't be immediate, because it is expensive
+          var obj = {
+            getBoundingClientRect: function () {
+              if (!isLibCanvas) {
+                return canvas.getBoundingClientRect();
+              }
+            }
+          };
+
+          resizer(obj);
+
+          worker.postMessage({
+            resize: {
+              width: obj.width,
+              height: obj.height
+            }
+          });
+          return;
+        }
+
+        // don't actually query the size here, since this
+        // can execute frequently and rapidly
+        size.width = size.height = null;
+      }
+
+      function done() {
+        animationObj = null;
+
+        if (allowResize) {
+          hasResizeEventRegistered = false;
+          global.removeEventListener('resize', onResize);
+        }
+
+        if (isLibCanvas && canvas) {
+          if (document.body.contains(canvas)) {
+            document.body.removeChild(canvas); 
+          }
+          canvas = null;
+          initialized = false;
+        }
+      }
+
+      if (allowResize && !hasResizeEventRegistered) {
+        hasResizeEventRegistered = true;
+        global.addEventListener('resize', onResize, false);
+      }
+
+      if (worker) {
+        return worker.fire(options, size, done);
+      }
+
+      return fireLocal(options, size, done);
+    }
+
+    fire.reset = function () {
+      if (worker) {
+        worker.reset();
+      }
+
+      if (animationObj) {
+        animationObj.reset();
+      }
+    };
+
+    return fire;
+  }
+
+  // Make default export lazy to defer worker creation until called.
+  var defaultFire;
+  function getDefaultFire() {
+    if (!defaultFire) {
+      defaultFire = confettiCannon(null, { useWorker: true, resize: true });
+    }
+    return defaultFire;
+  }
+
+  function transformPath2D(pathString, pathMatrix, x, y, scaleX, scaleY, rotation) {
+    var path2d = new Path2D(pathString);
+
+    var t1 = new Path2D();
+    t1.addPath(path2d, new DOMMatrix(pathMatrix));
+
+    var t2 = new Path2D();
+    // see https://developer.mozilla.org/en-US/docs/Web/API/DOMMatrix/DOMMatrix
+    t2.addPath(t1, new DOMMatrix([
+      Math.cos(rotation) * scaleX,
+      Math.sin(rotation) * scaleX,
+      -Math.sin(rotation) * scaleY,
+      Math.cos(rotation) * scaleY,
+      x,
+      y
+    ]));
+
+    return t2;
+  }
+
+  function shapeFromPath(pathData) {
+    if (!canUsePaths) {
+      throw new Error('path confetti are not supported in this browser');
+    }
+
+    var path, matrix;
+
+    if (typeof pathData === 'string') {
+      path = pathData;
+    } else {
+      path = pathData.path;
+      matrix = pathData.matrix;
+    }
+
+    var path2d = new Path2D(path);
+    var tempCanvas = document.createElement('canvas');
+    var tempCtx = tempCanvas.getContext('2d');
+
+    if (!matrix) {
+      // attempt to figure out the width of the path, up to 1000x1000
+      var maxSize = 1000;
+      var minX = maxSize;
+      var minY = maxSize;
+      var maxX = 0;
+      var maxY = 0;
+      var width, height;
+
+      // do some line skipping... this is faster than checking
+      // every pixel and will be mostly still correct
+      for (var x = 0; x < maxSize; x += 2) {
+        for (var y = 0; y < maxSize; y += 2) {
+          if (tempCtx.isPointInPath(path2d, x, y, 'nonzero')) {
+            minX = Math.min(minX, x);
+            minY = Math.min(minY, y);
+            maxX = Math.max(maxX, x);
+            maxY = Math.max(maxY, y);
+          }
+        }
+      }
+
+      width = maxX - minX;
+      height = maxY - minY;
+
+      var maxDesiredSize = 10;
+      var scale = Math.min(maxDesiredSize/width, maxDesiredSize/height);
+
+      matrix = [
+        scale, 0, 0, scale,
+        -Math.round((width/2) + minX) * scale,
+        -Math.round((height/2) + minY) * scale
+      ];
+    }
+
+    return {
+      type: 'path',
+      path: path,
+      matrix: matrix
+    };
+  }
+
+  function shapeFromText(textData) {
+    var text,
+        scalar = 1,
+        color = '#000000',
+        // see https://nolanlawson.com/2022/04/08/the-struggle-of-using-native-emoji-on-the-web/
+        fontFamily = '"Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji", "EmojiOne Color", "Android Emoji", "Twemoji Mozilla", "system emoji", sans-serif';
+
+    if (typeof textData === 'string') {
+      text = textData;
+    } else {
+      text = textData.text;
+      scalar = 'scalar' in textData ? textData.scalar : scalar;
+      fontFamily = 'fontFamily' in textData ? textData.fontFamily : fontFamily;
+      color = 'color' in textData ? textData.color : color;
+    }
+
+    // all other confetti are 10 pixels,
+    // so this pixel size is the de-facto 100% scale confetti
+    var fontSize = 10 * scalar;
+    var font = '' + fontSize + 'px ' + fontFamily;
+
+    var canvas = new OffscreenCanvas(fontSize, fontSize);
+    var ctx = canvas.getContext('2d');
+
+    ctx.font = font;
+    var size = ctx.measureText(text);
+    var width = Math.ceil(size.actualBoundingBoxRight + size.actualBoundingBoxLeft);
+    var height = Math.ceil(size.actualBoundingBoxAscent + size.actualBoundingBoxDescent);
+
+    var padding = 2;
+    var x = size.actualBoundingBoxLeft + padding;
+    var y = size.actualBoundingBoxAscent + padding;
+    width += padding + padding;
+    height += padding + padding;
+
+    canvas = new OffscreenCanvas(width, height);
+    ctx = canvas.getContext('2d');
+    ctx.font = font;
+    ctx.fillStyle = color;
+
+    ctx.fillText(text, x, y);
+
+    var scale = 1 / scalar;
+
+    return {
+      type: 'bitmap',
+      // TODO these probably need to be transfered for workers
+      bitmap: canvas.transferToImageBitmap(),
+      matrix: [scale, 0, 0, scale, -width * scale / 2, -height * scale / 2]
+    };
+  }
+
+  module.exports = function() {
+    return getDefaultFire().apply(this, arguments);
+  };
+  module.exports.reset = function() {
+    getDefaultFire().reset();
+  };
+  module.exports.create = confettiCannon;
+  module.exports.shapeFromPath = shapeFromPath;
+  module.exports.shapeFromText = shapeFromText;
+}((function () {
+  if (typeof window !== 'undefined') {
+    return window;
+  }
+
+  if (typeof self !== 'undefined') {
+    return self;
+  }
+
+  return this || {};
+})(), module, false));
+
+// end source content
+
+  window.confetti = module.exports;
+}(window, {}));
+
+
 /***/ }),
 
 /***/ "./node_modules/jquery-ui/ui/version.js":
@@ -62370,7 +62197,7 @@ var __WEBPACK_AMD_DEFINE_FACTORY__, __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_
 
 $.ui = $.ui || {};
 
-return $.ui.version = "1.13.3";
+return $.ui.version = "1.14.1";
 
 } );
 
@@ -62384,7 +62211,7 @@ return $.ui.version = "1.13.3";
 /***/ ((module, exports, __webpack_require__) => {
 
 var __WEBPACK_AMD_DEFINE_FACTORY__, __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_DEFINE_RESULT__;/*!
- * jQuery UI Widget 1.13.3
+ * jQuery UI Widget 1.14.1
  * https://jqueryui.com
  *
  * Copyright OpenJS Foundation and other contributors
@@ -62440,6 +62267,9 @@ $.widget = function( name, base, prototype ) {
 
 	var namespace = name.split( "." )[ 0 ];
 	name = name.split( "." )[ 1 ];
+	if ( name === "__proto__" || name === "constructor" ) {
+		return $.error( "Invalid widget name: " + name );
+	}
 	var fullName = namespace + "-" + name;
 
 	if ( !prototype ) {
@@ -91237,10 +91067,807 @@ var __WEBPACK_AMD_DEFINE_RESULT__;/**
 
 /***/ }),
 
-/***/ "./resources/assets/less/skins/skin-contrast.less":
-/*!********************************************************!*\
-  !*** ./resources/assets/less/skins/skin-contrast.less ***!
-  \********************************************************/
+/***/ "./resources/assets/js/bootstrap.js":
+/*!******************************************!*\
+  !*** ./resources/assets/js/bootstrap.js ***!
+  \******************************************/
+/***/ ((__unused_webpack_module, __unused_webpack_exports, __webpack_require__) => {
+
+window._ = __webpack_require__(/*! lodash */ "./node_modules/lodash/lodash.js");
+
+/**
+ * We'll load jQuery and the Bootstrap jQuery plugin which provides support
+ * for JavaScript based Bootstrap features such as modals and tabs. This
+ * code may be modified to fit the specific needs of your application.
+ */
+//window.$ = window.jQuery = require('jquery');
+
+/**
+ * jQuery UI is loaded here and then the tooltip is assigned another funtion name
+ * This resolves the issue of jquery-ui & bootstrap tooltip conflict
+ */
+__webpack_require__(/*! jquery-ui */ "./node_modules/jquery-ui/ui/widget.js");
+jQuery.fn.uitooltip = jQuery.fn.tooltip;
+
+/**
+ * Load boostrap
+ */
+__webpack_require__(/*! bootstrap-less */ "./node_modules/bootstrap-less/js/bootstrap.js");
+
+// require('admin-lte');
+
+// require('chart.js');
+
+// require('jquery-form-validator'); //says something about dependency
+/**
+ * Echo exposes an expressive API for subscribing to channels and listening
+ * for events that are broadcast by Laravel. Echo and event broadcasting
+ * allows your team to easily build robust real-time web applications.
+ */
+
+// import Echo from "laravel-echo"
+
+// window.Echo = new Echo({
+//     broadcaster: 'pusher',
+//     key: 'your-pusher-key'
+// });
+
+/***/ }),
+
+/***/ "./resources/assets/js/snipeit.js":
+/*!****************************************!*\
+  !*** ./resources/assets/js/snipeit.js ***!
+  \****************************************/
+/***/ ((__unused_webpack_module, __unused_webpack_exports, __webpack_require__) => {
+
+// var jQuery = require('jquery');
+// window.jQuery = jQuery
+// window.$ = jQuery
+
+__webpack_require__(/*! ./bootstrap */ "./resources/assets/js/bootstrap.js");
+
+/**
+ * Module containing core application logic.
+ * @param  {jQuery} $        Insulated jQuery object
+ * @param  {JSON} settings Insulated `window.snipeit.settings` object.
+ * @return {IIFE}          Immediately invoked. Returns self.
+ */
+
+lineOptions = {
+  legend: {
+    position: "bottom"
+  },
+  scales: {
+    yAxes: [{
+      ticks: {
+        fontColor: "rgba(0,0,0,0.5)",
+        fontStyle: "bold",
+        beginAtZero: true,
+        maxTicksLimit: 5,
+        padding: 20
+      },
+      gridLines: {
+        drawTicks: false,
+        display: false
+      }
+    }],
+    xAxes: [{
+      gridLines: {
+        zeroLineColor: "transparent"
+      },
+      ticks: {
+        padding: 20,
+        fontColor: "rgba(0,0,0,0.5)",
+        fontStyle: "bold"
+      }
+    }]
+  }
+};
+pieOptions = {
+  //Boolean - Whether we should show a stroke on each segment
+  segmentShowStroke: true,
+  //String - The colour of each segment stroke
+  segmentStrokeColor: "#fff",
+  //Number - The width of each segment stroke
+  segmentStrokeWidth: 1,
+  //Number - The percentage of the chart that we cut out of the middle
+  percentageInnerCutout: 50,
+  // This is 0 for Pie charts
+  //Number - Amount of animation steps
+  animationSteps: 100,
+  //String - Animation easing effect
+  animationEasing: "easeOutBounce",
+  //Boolean - Whether we animate the rotation of the Doughnut
+  animateRotate: true,
+  //Boolean - Whether we animate scaling the Doughnut from the centre
+  animateScale: false,
+  //Boolean - whether to make the chart responsive to window resizing
+  responsive: true,
+  // Boolean - whether to maintain the starting aspect ratio or not when responsive, if set to false, will take up entire container
+  maintainAspectRatio: false,
+  //String - A legend template
+  legendTemplate: "<ul class=\"<%=name.toLowerCase()%>-legend\"><% for (var i=0; i<segments.length; i++){%><li>" + "<i class='fas fa-circle-o' style='color: <%=segments[i].fillColor%>'></i>" + "<%if(segments[i].label){%><%=segments[i].label%><%}%> foo</li><%}%></ul>",
+  //String - A tooltip template
+  tooltipTemplate: "<%=value %> <%=label%> "
+};
+
+//-----------------
+//- END PIE CHART -
+//-----------------
+
+var baseUrl = $('meta[name="baseUrl"]').attr('content');
+$(function () {
+  var $el = $('table');
+
+  // confirm restore modal
+
+  $el.on('click', '.restore-asset', function (evnt) {
+    var $context = $(this);
+    var $restoreConfirmModal = $('#restoreConfirmModal');
+    var href = $context.attr('href');
+    var message = $context.attr('data-content');
+    var title = $context.attr('data-title');
+    $('#confirmModalLabel').text(title);
+    $restoreConfirmModal.find('.modal-body').text(message);
+    $('#restoreForm').attr('action', href);
+    $restoreConfirmModal.modal({
+      show: true
+    });
+    return false;
+  });
+
+  // confirm delete modal
+
+  $el.on('click', '.delete-asset', function (evnt) {
+    var $context = $(this);
+    var $dataConfirmModal = $('#dataConfirmModal');
+    var href = $context.attr('href');
+    var message = $context.attr('data-content');
+    var title = $context.attr('data-title');
+    $('#myModalLabel').text(title);
+    $dataConfirmModal.find('.modal-body').text(message);
+    $('#deleteForm').attr('action', href);
+    $dataConfirmModal.modal({
+      show: true
+    });
+    return false;
+  });
+
+  /*
+  * Slideout help menu
+  */
+  $('.slideout-menu-toggle').on('click', function (event) {
+    event.preventDefault();
+    // create menu variables
+    var slideoutMenu = $('.slideout-menu');
+    var slideoutMenuWidth = $('.slideout-menu').width();
+
+    // toggle open class
+    slideoutMenu.toggleClass("open");
+
+    // slide menu
+    if (slideoutMenu.hasClass("open")) {
+      slideoutMenu.show();
+      slideoutMenu.animate({
+        right: "0px"
+      });
+    } else {
+      slideoutMenu.animate({
+        right: -slideoutMenuWidth
+      }, "-350px");
+      slideoutMenu.fadeOut();
+    }
+  });
+
+  /*
+  * Select2
+  */
+
+  $('select.select2:not(".select2-hidden-accessible")').each(function (i, obj) {
+    {
+      $(obj).select2();
+    }
+  });
+
+  // $('.datepicker').datepicker();
+  // var datepicker = $.fn.datepicker.noConflict(); // return $.fn.datepicker to previously assigned value
+  // $.fn.bootstrapDP = datepicker;
+  // $('.datepicker').datepicker();
+
+  // Crazy select2 rich dropdowns with images!
+  $('.js-data-ajax').each(function (i, item) {
+    var link = $(item);
+    var endpoint = link.data("endpoint");
+    var select = link.data("select");
+    link.select2({
+      /**
+       * Adds an empty placeholder, allowing every select2 instance to be cleared.
+       * This placeholder can be overridden with the "data-placeholder" attribute.
+       */
+      placeholder: '',
+      allowClear: true,
+      language: $('meta[name="language"]').attr('content'),
+      dir: $('meta[name="language-direction"]').attr('content'),
+      ajax: {
+        // the baseUrl includes a trailing slash
+        url: baseUrl + 'api/v1/' + endpoint + '/selectlist',
+        dataType: 'json',
+        delay: 250,
+        headers: {
+          "X-Requested-With": 'XMLHttpRequest',
+          "X-CSRF-TOKEN": $('meta[name="csrf-token"]').attr('content')
+        },
+        data: function data(params) {
+          var data = {
+            search: params.term,
+            page: params.page || 1,
+            assetStatusType: link.data("asset-status-type"),
+            companyId: link.data("company-id")
+          };
+          return data;
+        },
+        /* processResults: function (data, params) {
+             params.page = params.page || 1;
+             var answer =  {
+                results: data.items,
+                pagination: {
+                    more: data.pagination.more
+                }
+            };
+             return answer;
+        }, */
+        cache: true
+      },
+      //escapeMarkup: function (markup) { return markup; }, // let our custom formatter work
+      templateResult: formatDatalistSafe
+      //templateSelection: formatDataSelection
+    });
+  });
+  function getSelect2Value(element) {
+    // if the passed object is not a jquery object, assuming 'element' is a selector
+    if (!(element instanceof jQuery)) element = $(element);
+    var select = element.data("select2");
+
+    // There's two different locations where the select2-generated input element can be. 
+    searchElement = select.dropdown.$search || select.$container.find(".select2-search__field");
+    var value = searchElement.val();
+    return value;
+  }
+  $(".select2-hidden-accessible").on('select2:selecting', function (e) {
+    var data = e.params.args.data;
+    var isMouseUp = false;
+    var element = $(this);
+    var value = getSelect2Value(element);
+    if (e.params.args.originalEvent) isMouseUp = e.params.args.originalEvent.type == "mouseup";
+
+    // if selected item does not match typed text, do not allow it to pass - force close for ajax.
+    if (!isMouseUp) {
+      if (value.toLowerCase() && data.text.toLowerCase().indexOf(value) < 0) {
+        e.preventDefault();
+        element.select2('close');
+
+        // if it does match, we set a flag in the event (which gets passed to subsequent events), telling it not to worry about the ajax
+      } else if (value.toLowerCase() && data.text.toLowerCase().indexOf(value) > -1) {
+        e.params.args.noForceAjax = true;
+      }
+    }
+  });
+  $(".select2-hidden-accessible").on('select2:closing', function (e) {
+    var element = $(this);
+    var value = getSelect2Value(element);
+    var noForceAjax = false;
+    var isMouseUp = false;
+    if (e.params.args.originalSelect2Event) noForceAjax = e.params.args.originalSelect2Event.noForceAjax;
+    if (e.params.args.originalEvent) isMouseUp = e.params.args.originalEvent.type == "mouseup";
+    if (value && !noForceAjax && !isMouseUp) {
+      var endpoint = element.data("endpoint");
+      var assetStatusType = element.data("asset-status-type");
+      $.ajax({
+        url: baseUrl + 'api/v1/' + endpoint + '/selectlist?search=' + value + '&page=1' + (assetStatusType ? '&assetStatusType=' + assetStatusType : ''),
+        dataType: 'json',
+        headers: {
+          "X-Requested-With": 'XMLHttpRequest',
+          "X-CSRF-TOKEN": $('meta[name="csrf-token"]').attr('content')
+        }
+      }).done(function (response) {
+        var currentlySelected = element.select2('data').map(function (x) {
+          return +x.id;
+        }).filter(function (x) {
+          return x !== 0;
+        });
+
+        // makes sure we're not selecting the same thing twice for multiples
+        var filteredResponse = response.results.filter(function (item) {
+          return currentlySelected.indexOf(+item.id) < 0;
+        });
+        var first = currentlySelected.length > 0 ? filteredResponse[0] : response.results[0];
+        if (first && first.id) {
+          first.selected = true;
+          if ($("option[value='" + first.id + "']", element).length < 1) {
+            var option = new Option(first.text, first.id, true, true);
+            element.append(option);
+          } else {
+            var isMultiple = element.attr("multiple") == "multiple";
+            element.val(isMultiple ? element.val().concat(first.id) : element.val(first.id));
+          }
+          element.trigger('change');
+          element.trigger({
+            type: 'select2:select',
+            params: {
+              data: first
+            }
+          });
+        }
+      });
+    }
+  });
+  function formatDatalist(datalist) {
+    var loading_markup = '<i class="fas fa-spinner fa-spin" aria-hidden="true"></i> Loading...';
+    if (datalist.loading) {
+      return loading_markup;
+    }
+    var markup = '<div class="clearfix">';
+    markup += '<div class="pull-left" style="padding-right: 10px;">';
+    if (datalist.image) {
+      markup += "<div style='width: 30px;'><img src='" + datalist.image + "' style='max-height: 20px; max-width: 30px;' alt='" + datalist.text + "'></div>";
+    } else {
+      markup += '<div style="height: 20px; width: 30px;"></div>';
+    }
+    markup += "</div><div>" + datalist.text + "</div>";
+    markup += "</div>";
+    return markup;
+  }
+  function formatDatalistSafe(datalist) {
+    // console.warn("What in the hell is going on with Select2?!?!!?!?");
+    // console.warn($.select2);
+    if (datalist.loading) {
+      return $('<i class="fas fa-spinner fa-spin" aria-hidden="true"></i> Loading...');
+    }
+    var root_div = $("<div class='clearfix'>");
+    var left_pull = $("<div class='pull-left' style='padding-right: 10px;'>");
+    if (datalist.image) {
+      var inner_div = $("<div style='width: 30px;'>");
+      /******************************************************************
+       * 
+       * We are specifically chosing empty alt-text below, because this 
+       * image conveys no additional information, relative to the text
+       * that will *always* be there in any select2 list that is in use
+       * in Snipe-IT. If that changes, we would probably want to change
+       * some signatures of some functions, but right now, we don't want
+       * screen readers to say "HP SuperJet 5000, .... picture of HP 
+       * SuperJet 5000..." and so on, for every single row in a list of
+       * assets or models or whatever.
+       * 
+       *******************************************************************/
+      var img = $("<img src='' style='max-height: 20px; max-width: 30px;' alt=''>");
+      // console.warn("Img is: ");
+      // console.dir(img);
+      // console.warn("Strigularly, that's: ");
+      // console.log(img);
+      img.attr("src", datalist.image);
+      inner_div.append(img);
+    } else {
+      var inner_div = $("<div style='height: 20px; width: 30px;'></div>");
+    }
+    left_pull.append(inner_div);
+    root_div.append(left_pull);
+    var name_div = $("<div>");
+    name_div.text(datalist.text);
+    root_div.append(name_div);
+    var safe_html = root_div.get(0).outerHTML;
+    var old_html = formatDatalist(datalist);
+    if (safe_html != old_html) {
+      //console.log("HTML MISMATCH: ");
+      //console.log("FormatDatalistSafe: ");
+      // console.dir(root_div.get(0));
+      //console.log(safe_html);
+      //console.log("FormatDataList: ");
+      //console.log(old_html);
+    }
+    return root_div;
+  }
+  function formatDataSelection(datalist) {
+    // This a heinous workaround for a known bug in Select2.
+    // Without this, the rich selectlists are vulnerable to XSS.
+    // Many thanks to @uberbrady for this fix. It ain't pretty,
+    // but it resolves the issue until Select2 addresses it on their end.
+    //
+    // Bug was reported in 2016 :{
+    // https://github.com/select2/select2/issues/4587
+
+    return datalist.text.replace(/>/g, '&gt;').replace(/</g, '&lt;').replace(/"/g, '&quot;').replace(/'/g, '&#039;');
+  }
+
+  // This handles the radio button selectors for the checkout-to-foo options
+  // on asset checkout and also on asset edit
+  $(function () {
+    $('input[name=checkout_to_type]').on("change", function () {
+      var assignto_type = $('input[name=checkout_to_type]:checked').val();
+      var userid = $('#assigned_user option:selected').val();
+      if (assignto_type == 'asset') {
+        $('#current_assets_box').fadeOut();
+        $('#assigned_asset').show();
+        $('#assigned_user').hide();
+        $('#assigned_location').hide();
+        $('.notification-callout').fadeOut();
+        $('[name="assigned_location"]').val('').trigger('change.select2');
+        $('[name="assigned_user"]').val('').trigger('change.select2');
+      } else if (assignto_type == 'location') {
+        $('#current_assets_box').fadeOut();
+        $('#assigned_asset').hide();
+        $('#assigned_user').hide();
+        $('#assigned_location').show();
+        $('.notification-callout').fadeOut();
+        $('[name="assigned_asset"]').val('').trigger('change.select2');
+        $('[name="assigned_user"]').val('').trigger('change.select2');
+      } else {
+        $('#assigned_asset').hide();
+        $('#assigned_user').show();
+        $('#assigned_location').hide();
+        if (userid) {
+          $('#current_assets_box').fadeIn();
+        }
+        $('.notification-callout').fadeIn();
+        $('[name="assigned_asset"]').val('').trigger('change.select2');
+        $('[name="assigned_location"]').val('').trigger('change.select2');
+      }
+    });
+  });
+
+  // ------------------------------------------------
+  // Deep linking for Bootstrap tabs
+  // ------------------------------------------------
+  var taburl = document.location.toString();
+
+  // Allow full page URL to activate a tab's ID
+  // ------------------------------------------------
+  // This allows linking to a tab on page load via the address bar.
+  // So a URL such as, http://snipe-it.local/hardware/2/#my_tab will
+  // cause the tab on that page with an ID of “my_tab” to be active.
+  if (taburl.match('#')) {
+    $('.nav-tabs a[href="#' + taburl.split('#')[1] + '"]').tab('show');
+  }
+
+  // Allow internal page links to activate a tab's ID.
+  // ------------------------------------------------
+  // This allows you to link to a tab from anywhere on the page
+  // including from within another tab. Also note that internal page
+  // links either inside or out of the tabs need to include data-toggle="tab"
+  // Ex: <a href="#my_tab" data-toggle="tab">Click me</a>
+  $('a[data-toggle="tab"]').click(function (e) {
+    var href = $(this).attr("href");
+    history.pushState(null, null, href);
+    e.preventDefault();
+    $('a[href="' + $(this).attr('href') + '"]').tab('show');
+  });
+
+  // ------------------------------------------------
+  // End Deep Linking for Bootstrap tabs
+  // ------------------------------------------------
+
+  // Image preview
+  function readURL(input, $preview) {
+    if (input.files && input.files[0]) {
+      var reader = new FileReader();
+      reader.onload = function (e) {
+        $preview.attr('src', e.target.result);
+      };
+      reader.readAsDataURL(input.files[0]);
+    }
+  }
+  function formatBytes(bytes) {
+    if (bytes < 1024) return bytes + " Bytes";else if (bytes < 1048576) return (bytes / 1024).toFixed(2) + " KB";else if (bytes < 1073741824) return (bytes / 1048576).toFixed(2) + " MB";else return (bytes / 1073741824).toFixed(2) + " GB";
+  }
+
+  // File size validation
+  $('.js-uploadFile').bind('change', function () {
+    var $this = $(this);
+    var id = '#' + $this.attr('id');
+    var status = id + '-status';
+    var $status = $(status);
+    var delete_id = $(id + '-deleteCheckbox');
+    var preview_container = $(id + '-previewContainer');
+    $status.removeClass('text-success').removeClass('text-danger');
+    $(status + ' .goodfile').remove();
+    $(status + ' .badfile').remove();
+    $(status + ' .previewSize').hide();
+    preview_container.hide();
+    $(id + '-info').html('');
+    var max_size = $this.data('maxsize');
+    var total_size = 0;
+    for (var i = 0; i < this.files.length; i++) {
+      total_size += this.files[i].size;
+      $(id + '-info').append('<span class="label label-default">' + htmlEntities(this.files[i].name) + ' (' + formatBytes(this.files[i].size) + ')</span> ');
+    }
+    if (total_size > max_size) {
+      $status.addClass('text-danger').removeClass('help-block').prepend('<i class="badfile fas fa-times"></i> ').append('<span class="previewSize"> Upload is ' + formatBytes(total_size) + '.</span>');
+    } else {
+      $status.addClass('text-success').removeClass('help-block').prepend('<i class="goodfile fas fa-check"></i> ');
+      var $preview = $(id + '-imagePreview');
+      readURL(this, $preview);
+      $preview.fadeIn();
+      preview_container.fadeIn();
+      delete_id.hide();
+    }
+  });
+});
+function htmlEntities(str) {
+  return String(str).replace(/&/g, '&amp;').replace(/</g, '&lt;').replace(/>/g, '&gt;').replace(/"/g, '&quot;');
+}
+
+/**
+ * Toggle disabled
+ */
+(function ($) {
+  $.fn.toggleDisabled = function (callback) {
+    return this.each(function () {
+      var disabled,
+        $this = $(this);
+      if ($this.attr('disabled')) {
+        $this.removeAttr('disabled');
+        disabled = false;
+      } else {
+        $this.attr('disabled', 'disabled');
+        disabled = true;
+      }
+      if (callback && typeof callback === 'function') {
+        callback(this, disabled);
+      }
+    });
+  };
+})(jQuery);
+
+/**
+ * Universal Livewire Select2 integration
+ *
+ * How to use:
+ *
+ * 1. Set the class of your select2 elements to 'livewire-select2').
+ * 2. Name your element to match a property in your Livewire component
+ * 3. Add an attribute called 'data-livewire-component' that points to $this->getId() (via `{{ }}` if you're in a blade,
+ *    or just $this->getId() if not).
+ */
+document.addEventListener('livewire:init', function () {
+  $('.livewire-select2').select2();
+  $(document).on('select2:select', '.livewire-select2', function (event) {
+    var target = $(event.target);
+    if (!event.target.name || !target.data('livewire-component')) {
+      console.error("You need to set both name (which should match a Livewire property) and data-livewire-component on your Livewire-ed select2 elements!");
+      console.error("For data-livewire-component, you probably want to use $this->getId() or {{ $this->getId() }}, as appropriate");
+      return false;
+    }
+    Livewire.find(target.data('livewire-component')).set(event.target.name, this.options[this.selectedIndex].value);
+  });
+  Livewire.hook('request', function (_ref) {
+    var succeed = _ref.succeed;
+    succeed(function () {
+      queueMicrotask(function () {
+        $('.livewire-select2').select2();
+      });
+    });
+  });
+});
+
+/***/ }),
+
+/***/ "./resources/assets/js/snipeit_modals.js":
+/*!***********************************************!*\
+  !*** ./resources/assets/js/snipeit_modals.js ***!
+  \***********************************************/
+/***/ (() => {
+
+/* 
+ * 
+ * Snipe-IT Universal Modal support
+ * 
+ * Enables modal dialogs to create sub-resources throughout Snipe-IT
+ * 
+ */
+
+/* 
+HOW TO USE
+ Create a Button looking like this:
+ <a href='{{ route('modal.show', 'user') }}' data-toggle="modal"  data-target="#createModal" data-select='assigned_to' class="btn btn-sm btn-primary">New</a>
+ If you don't have access to Blade commands (like {{ and }}, etc), you can hard-code a URL as the 'href'
+ data-toggle="modal" - required for Bootstrap Modals
+data-target="#createModal" - fixed ID for the modal, do not change
+data-select="assigned_to" - What is the *ID* of the select-dropdown that you're going to be adding to, if the modal-create was a success? Be on the lookout for duplicate ID's, it will confuse this library!
+class="btn btn-sm btn-primary" - makes it look button-ey, feel free to change :)
+
+If you want to pass additional variables to the modal (In the Category Create one, for example, you can pass category_id), you can encode them as URL variables in the href
+
+*/
+
+$(function () {
+  var baseUrl = $('meta[name="baseUrl"]').attr('content');
+  //handle modal-add-interstitial calls
+  var model, select, refreshSelector;
+  if ($('#createModal').length == 0) {
+    $('body').append('<div class="modal fade" id="createModal"></div><!-- /.modal -->');
+  }
+  $('#createModal').on("show.bs.modal", function (event) {
+    var link = $(event.relatedTarget);
+    model = link.data("dependency");
+    select = link.data("select");
+    refreshSelector = link.data("refresh");
+    $('#createModal').load(link.attr('href'), function () {
+      // this sets the focus to be the name field
+      $('#modal-name').focus();
+
+      //do we need to re-select2 this, after load? Probably.
+      $('#createModal').find('select.select2').select2();
+      // Initialize the ajaxy select2 with images.
+      // This is a copy/paste of the code from snipeit.js, would be great to only have this in one place.
+
+      $('.js-data-ajax').each(function (i, item) {
+        var link = $(item);
+        var endpoint = link.data("endpoint");
+        var select = link.data("select");
+        link.select2({
+          ajax: {
+            // the baseUrl includes a trailing slash
+            url: baseUrl + 'api/v1/' + endpoint + '/selectlist',
+            //WARNING - we're hoping that's defined on the page somewhere...
+            dataType: 'json',
+            delay: 250,
+            headers: {
+              "X-Requested-With": 'XMLHttpRequest',
+              "X-CSRF-TOKEN": $('meta[name="csrf-token"]').attr('content')
+            },
+            data: function data(params) {
+              var data = {
+                search: params.term,
+                page: params.page || 1,
+                assetStatusType: link.data("asset-status-type")
+              };
+              return data;
+            },
+            /*processResults: function (data, params) {
+                 params.page = params.page || 1;
+                 var answer =  {
+                    results: data.items,
+                    pagination: {
+                        more: data.pagination.more
+                    }
+                };
+                 return answer;
+            },*/
+            cache: true
+          },
+          //escapeMarkup: function (markup) { return markup; }, // let our custom formatter work
+          templateResult: formatDatalistSafe
+          //templateSelection: formatDataSelection
+        });
+      });
+    });
+  });
+  $('#createModal').on('click', '#modal-save', function () {
+    $.ajax({
+      type: 'POST',
+      url: $('.modal-body form').attr('action'),
+      headers: {
+        "X-Requested-With": 'XMLHttpRequest',
+        "X-CSRF-TOKEN": $('meta[name="csrf-token"]').attr('content')
+      },
+      data: $('.modal-body form').serialize(),
+      success: function success(result) {
+        if (result.status == "error") {
+          var error_message = "";
+          for (var field in result.messages) {
+            error_message += "<li>Problem(s) with field <i><strong>" + field + "</strong></i>: " + result.messages[field];
+          }
+          $('#modal_error_msg').html(error_message).show();
+          return false;
+        }
+        var id = result.payload.id;
+        var name = result.payload.name || result.payload.first_name + " " + result.payload.last_name;
+        if (!id || !name) {
+          console.error("Could not find resulting name or ID from modal-create. Name: " + name + ", id: " + id);
+          return false;
+        }
+        $('#createModal').modal('hide');
+        $('#createModal').html("");
+        var refreshTable = $('#' + refreshSelector);
+        if (refreshTable.length > 0) {
+          refreshTable.bootstrapTable('refresh');
+        }
+
+        // "select" is the original drop-down menu that someone
+        // clicked 'add' on to add a new 'thing'
+        // this code adds the newly created object to that select
+        var selector = document.getElementById(select);
+        if (!selector) {
+          return false;
+        }
+        selector.options[selector.length] = new Option(name, id);
+        selector.selectedIndex = selector.length - 1;
+        $(selector).trigger("change");
+        if (window.fetchCustomFields) {
+          fetchCustomFields();
+        }
+      },
+      error: function error(result) {
+        msg = result.responseJSON.messages || result.responseJSON.error;
+        $('#modal_error_msg').html("Server Error: " + msg).show();
+      }
+    });
+  });
+});
+function formatDatalistSafe(datalist) {
+  // console.warn("What in the hell is going on with Select2?!?!!?!?");
+  // console.warn($.select2);
+  if (datalist.loading) {
+    return $('<i class="fas fa-spinner fa-spin" aria-hidden="true"></i> Loading...');
+  }
+  var root_div = $("<div class='clearfix'>");
+  var left_pull = $("<div class='pull-left' style='padding-right: 10px;'>");
+  if (datalist.image) {
+    var inner_div = $("<div style='width: 30px;'>");
+    /******************************************************************
+     * 
+     * We are specifically chosing empty alt-text below, because this 
+     * image conveys no additional information, relative to the text
+     * that will *always* be there in any select2 list that is in use
+     * in Snipe-IT. If that changes, we would probably want to change
+     * some signatures of some functions, but right now, we don't want
+     * screen readers to say "HP SuperJet 5000, .... picture of HP 
+     * SuperJet 5000..." and so on, for every single row in a list of
+     * assets or models or whatever.
+     * 
+     *******************************************************************/
+    var img = $("<img src='' style='max-height: 20px; max-width: 30px;' alt=''>");
+    // console.warn("Img is: ");
+    // console.dir(img);
+    // console.warn("Strigularly, that's: ");
+    // console.log(img);
+    img.attr("src", datalist.image);
+    inner_div.append(img);
+  } else {
+    var inner_div = $("<div style='height: 20px; width: 30px;'></div>");
+  }
+  left_pull.append(inner_div);
+  root_div.append(left_pull);
+  var name_div = $("<div>");
+  name_div.text(datalist.text);
+  root_div.append(name_div);
+  var safe_html = root_div.get(0).outerHTML;
+  var old_html = formatDatalist(datalist);
+  if (safe_html != old_html) {
+    // console.log("HTML MISMATCH: ");
+    // console.log("FormatDatalistSafe: ");
+    // console.dir(root_div.get(0));
+    // console.log(safe_html);
+    // console.log("FormatDataList: ");
+    // console.log(old_html);
+  }
+  return root_div;
+}
+function formatDatalist(datalist) {
+  var loading_markup = '<i class="fas fa-spinner fa-spin" aria-hidden="true"></i> Loading...';
+  if (datalist.loading) {
+    return loading_markup;
+  }
+  var markup = "<div class='clearfix'>";
+  markup += "<div class='pull-left' style='padding-right: 10px;'>";
+  if (datalist.image) {
+    markup += "<div style='width: 30px;'><img src='" + datalist.image + "' alt='" + datalist.tex + "' style='max-height: 20px; max-width: 30px;'></div>";
+  } else {
+    markup += "<div style='height: 20px; width: 30px;'></div>";
+  }
+  markup += "</div><div>" + datalist.text + "</div>";
+  markup += "</div>";
+  return markup;
+}
+function formatDataSelection(datalist) {
+  return datalist.text.replace(/>/g, '&gt;').replace(/</g, '&lt;').replace(/"/g, '&quot;').replace(/'/g, '&#039;');
+}
+
+/***/ }),
+
+/***/ "./resources/assets/less/app.less":
+/*!****************************************!*\
+  !*** ./resources/assets/less/app.less ***!
+  \****************************************/
 /***/ ((__unused_webpack_module, __webpack_exports__, __webpack_require__) => {
 
 "use strict";
@@ -91250,35 +91877,22 @@ __webpack_require__.r(__webpack_exports__);
 
 /***/ }),
 
-/***/ "./resources/assets/less/skins/skin-green.less":
+/***/ "./resources/assets/less/overrides.less":
+/*!**********************************************!*\
+  !*** ./resources/assets/less/overrides.less ***!
+  \**********************************************/
+/***/ ((__unused_webpack_module, __webpack_exports__, __webpack_require__) => {
+
+"use strict";
+__webpack_require__.r(__webpack_exports__);
+// extracted by mini-css-extract-plugin
+
+
+/***/ }),
+
+/***/ "./resources/assets/less/skins/_all-skins.less":
 /*!*****************************************************!*\
-  !*** ./resources/assets/less/skins/skin-green.less ***!
-  \*****************************************************/
-/***/ ((__unused_webpack_module, __webpack_exports__, __webpack_require__) => {
-
-"use strict";
-__webpack_require__.r(__webpack_exports__);
-// extracted by mini-css-extract-plugin
-
-
-/***/ }),
-
-/***/ "./resources/assets/less/skins/skin-green-dark.less":
-/*!**********************************************************!*\
-  !*** ./resources/assets/less/skins/skin-green-dark.less ***!
-  \**********************************************************/
-/***/ ((__unused_webpack_module, __webpack_exports__, __webpack_require__) => {
-
-"use strict";
-__webpack_require__.r(__webpack_exports__);
-// extracted by mini-css-extract-plugin
-
-
-/***/ }),
-
-/***/ "./resources/assets/less/skins/skin-black.less":
-/*!*****************************************************!*\
-  !*** ./resources/assets/less/skins/skin-black.less ***!
+  !*** ./resources/assets/less/skins/_all-skins.less ***!
   \*****************************************************/
 /***/ ((__unused_webpack_module, __webpack_exports__, __webpack_require__) => {
 
@@ -91302,62 +91916,10 @@ __webpack_require__.r(__webpack_exports__);
 
 /***/ }),
 
-/***/ "./resources/assets/less/skins/skin-red-dark.less":
-/*!********************************************************!*\
-  !*** ./resources/assets/less/skins/skin-red-dark.less ***!
-  \********************************************************/
-/***/ ((__unused_webpack_module, __webpack_exports__, __webpack_require__) => {
-
-"use strict";
-__webpack_require__.r(__webpack_exports__);
-// extracted by mini-css-extract-plugin
-
-
-/***/ }),
-
-/***/ "./resources/assets/less/skins/skin-purple.less":
-/*!******************************************************!*\
-  !*** ./resources/assets/less/skins/skin-purple.less ***!
-  \******************************************************/
-/***/ ((__unused_webpack_module, __webpack_exports__, __webpack_require__) => {
-
-"use strict";
-__webpack_require__.r(__webpack_exports__);
-// extracted by mini-css-extract-plugin
-
-
-/***/ }),
-
-/***/ "./resources/assets/less/skins/skin-purple-dark.less":
-/*!***********************************************************!*\
-  !*** ./resources/assets/less/skins/skin-purple-dark.less ***!
-  \***********************************************************/
-/***/ ((__unused_webpack_module, __webpack_exports__, __webpack_require__) => {
-
-"use strict";
-__webpack_require__.r(__webpack_exports__);
-// extracted by mini-css-extract-plugin
-
-
-/***/ }),
-
-/***/ "./resources/assets/less/skins/skin-yellow.less":
-/*!******************************************************!*\
-  !*** ./resources/assets/less/skins/skin-yellow.less ***!
-  \******************************************************/
-/***/ ((__unused_webpack_module, __webpack_exports__, __webpack_require__) => {
-
-"use strict";
-__webpack_require__.r(__webpack_exports__);
-// extracted by mini-css-extract-plugin
-
-
-/***/ }),
-
-/***/ "./resources/assets/less/skins/skin-yellow-dark.less":
-/*!***********************************************************!*\
-  !*** ./resources/assets/less/skins/skin-yellow-dark.less ***!
-  \***********************************************************/
+/***/ "./resources/assets/less/skins/skin-black.less":
+/*!*****************************************************!*\
+  !*** ./resources/assets/less/skins/skin-black.less ***!
+  \*****************************************************/
 /***/ ((__unused_webpack_module, __webpack_exports__, __webpack_require__) => {
 
 "use strict";
@@ -91378,6 +91940,58 @@ __webpack_require__.r(__webpack_exports__);
 // extracted by mini-css-extract-plugin
 
 
+/***/ }),
+
+/***/ "./resources/assets/less/skins/skin-blue.less":
+/*!****************************************************!*\
+  !*** ./resources/assets/less/skins/skin-blue.less ***!
+  \****************************************************/
+/***/ ((__unused_webpack_module, __webpack_exports__, __webpack_require__) => {
+
+"use strict";
+__webpack_require__.r(__webpack_exports__);
+// extracted by mini-css-extract-plugin
+
+
+/***/ }),
+
+/***/ "./resources/assets/less/skins/skin-contrast.less":
+/*!********************************************************!*\
+  !*** ./resources/assets/less/skins/skin-contrast.less ***!
+  \********************************************************/
+/***/ ((__unused_webpack_module, __webpack_exports__, __webpack_require__) => {
+
+"use strict";
+__webpack_require__.r(__webpack_exports__);
+// extracted by mini-css-extract-plugin
+
+
+/***/ }),
+
+/***/ "./resources/assets/less/skins/skin-green-dark.less":
+/*!**********************************************************!*\
+  !*** ./resources/assets/less/skins/skin-green-dark.less ***!
+  \**********************************************************/
+/***/ ((__unused_webpack_module, __webpack_exports__, __webpack_require__) => {
+
+"use strict";
+__webpack_require__.r(__webpack_exports__);
+// extracted by mini-css-extract-plugin
+
+
+/***/ }),
+
+/***/ "./resources/assets/less/skins/skin-green.less":
+/*!*****************************************************!*\
+  !*** ./resources/assets/less/skins/skin-green.less ***!
+  \*****************************************************/
+/***/ ((__unused_webpack_module, __webpack_exports__, __webpack_require__) => {
+
+"use strict";
+__webpack_require__.r(__webpack_exports__);
+// extracted by mini-css-extract-plugin
+
+
 /***/ }),
 
 /***/ "./resources/assets/less/skins/skin-orange-dark.less":
@@ -91406,10 +92020,10 @@ __webpack_require__.r(__webpack_exports__);
 
 /***/ }),
 
-/***/ "./node_modules/admin-lte/build/less/AdminLTE.less":
-/*!*********************************************************!*\
-  !*** ./node_modules/admin-lte/build/less/AdminLTE.less ***!
-  \*********************************************************/
+/***/ "./resources/assets/less/skins/skin-purple-dark.less":
+/*!***********************************************************!*\
+  !*** ./resources/assets/less/skins/skin-purple-dark.less ***!
+  \***********************************************************/
 /***/ ((__unused_webpack_module, __webpack_exports__, __webpack_require__) => {
 
 "use strict";
@@ -91419,10 +92033,10 @@ __webpack_require__.r(__webpack_exports__);
 
 /***/ }),
 
-/***/ "./resources/assets/less/app.less":
-/*!****************************************!*\
-  !*** ./resources/assets/less/app.less ***!
-  \****************************************/
+/***/ "./resources/assets/less/skins/skin-purple.less":
+/*!******************************************************!*\
+  !*** ./resources/assets/less/skins/skin-purple.less ***!
+  \******************************************************/
 /***/ ((__unused_webpack_module, __webpack_exports__, __webpack_require__) => {
 
 "use strict";
@@ -91432,23 +92046,10 @@ __webpack_require__.r(__webpack_exports__);
 
 /***/ }),
 
-/***/ "./resources/assets/less/overrides.less":
-/*!**********************************************!*\
-  !*** ./resources/assets/less/overrides.less ***!
-  \**********************************************/
-/***/ ((__unused_webpack_module, __webpack_exports__, __webpack_require__) => {
-
-"use strict";
-__webpack_require__.r(__webpack_exports__);
-// extracted by mini-css-extract-plugin
-
-
-/***/ }),
-
-/***/ "./resources/assets/less/skins/skin-blue.less":
-/*!****************************************************!*\
-  !*** ./resources/assets/less/skins/skin-blue.less ***!
-  \****************************************************/
+/***/ "./resources/assets/less/skins/skin-red-dark.less":
+/*!********************************************************!*\
+  !*** ./resources/assets/less/skins/skin-red-dark.less ***!
+  \********************************************************/
 /***/ ((__unused_webpack_module, __webpack_exports__, __webpack_require__) => {
 
 "use strict";
@@ -91469,6 +92070,32 @@ __webpack_require__.r(__webpack_exports__);
 // extracted by mini-css-extract-plugin
 
 
+/***/ }),
+
+/***/ "./resources/assets/less/skins/skin-yellow-dark.less":
+/*!***********************************************************!*\
+  !*** ./resources/assets/less/skins/skin-yellow-dark.less ***!
+  \***********************************************************/
+/***/ ((__unused_webpack_module, __webpack_exports__, __webpack_require__) => {
+
+"use strict";
+__webpack_require__.r(__webpack_exports__);
+// extracted by mini-css-extract-plugin
+
+
+/***/ }),
+
+/***/ "./resources/assets/less/skins/skin-yellow.less":
+/*!******************************************************!*\
+  !*** ./resources/assets/less/skins/skin-yellow.less ***!
+  \******************************************************/
+/***/ ((__unused_webpack_module, __webpack_exports__, __webpack_require__) => {
+
+"use strict";
+__webpack_require__.r(__webpack_exports__);
+// extracted by mini-css-extract-plugin
+
+
 /***/ })
 
 /******/ 	});
@@ -91582,24 +92209,25 @@ __webpack_require__.r(__webpack_exports__);
 /******/ 		// [resolve, reject, Promise] = chunk loading, 0 = chunk loaded
 /******/ 		var installedChunks = {
 /******/ 			"/js/build/app": 0,
-/******/ 			"css/dist/skins/skin-red": 0,
-/******/ 			"css/dist/skins/skin-blue": 0,
+/******/ 			"css/dist/skins/skin-black-dark": 0,
+/******/ 			"css/dist/skins/_all-skins": 0,
 /******/ 			"css/build/overrides": 0,
 /******/ 			"css/build/app": 0,
 /******/ 			"css/build/AdminLTE": 0,
+/******/ 			"css/dist/skins/skin-yellow": 0,
+/******/ 			"css/dist/skins/skin-yellow-dark": 0,
+/******/ 			"css/dist/skins/skin-red": 0,
+/******/ 			"css/dist/skins/skin-red-dark": 0,
+/******/ 			"css/dist/skins/skin-purple": 0,
+/******/ 			"css/dist/skins/skin-purple-dark": 0,
 /******/ 			"css/dist/skins/skin-orange": 0,
 /******/ 			"css/dist/skins/skin-orange-dark": 0,
-/******/ 			"css/dist/skins/skin-blue-dark": 0,
-/******/ 			"css/dist/skins/skin-yellow-dark": 0,
-/******/ 			"css/dist/skins/skin-yellow": 0,
-/******/ 			"css/dist/skins/skin-purple-dark": 0,
-/******/ 			"css/dist/skins/skin-purple": 0,
-/******/ 			"css/dist/skins/skin-red-dark": 0,
-/******/ 			"css/dist/skins/skin-black-dark": 0,
-/******/ 			"css/dist/skins/skin-black": 0,
-/******/ 			"css/dist/skins/skin-green-dark": 0,
 /******/ 			"css/dist/skins/skin-green": 0,
-/******/ 			"css/dist/skins/skin-contrast": 0
+/******/ 			"css/dist/skins/skin-green-dark": 0,
+/******/ 			"css/dist/skins/skin-contrast": 0,
+/******/ 			"css/dist/skins/skin-blue": 0,
+/******/ 			"css/dist/skins/skin-blue-dark": 0,
+/******/ 			"css/dist/skins/skin-black": 0
 /******/ 		};
 /******/ 		
 /******/ 		// no chunk on demand loading
@@ -91649,26 +92277,28 @@ __webpack_require__.r(__webpack_exports__);
 /******/ 	// startup
 /******/ 	// Load entry module and return exports
 /******/ 	// This entry module depends on other loaded chunks and execution need to be delayed
-/******/ 	__webpack_require__.O(undefined, ["css/dist/skins/skin-red","css/dist/skins/skin-blue","css/build/overrides","css/build/app","css/build/AdminLTE","css/dist/skins/skin-orange","css/dist/skins/skin-orange-dark","css/dist/skins/skin-blue-dark","css/dist/skins/skin-yellow-dark","css/dist/skins/skin-yellow","css/dist/skins/skin-purple-dark","css/dist/skins/skin-purple","css/dist/skins/skin-red-dark","css/dist/skins/skin-black-dark","css/dist/skins/skin-black","css/dist/skins/skin-green-dark","css/dist/skins/skin-green","css/dist/skins/skin-contrast"], () => (__webpack_require__("./resources/assets/js/snipeit.js")))
-/******/ 	__webpack_require__.O(undefined, ["css/dist/skins/skin-red","css/dist/skins/skin-blue","css/build/overrides","css/build/app","css/build/AdminLTE","css/dist/skins/skin-orange","css/dist/skins/skin-orange-dark","css/dist/skins/skin-blue-dark","css/dist/skins/skin-yellow-dark","css/dist/skins/skin-yellow","css/dist/skins/skin-purple-dark","css/dist/skins/skin-purple","css/dist/skins/skin-red-dark","css/dist/skins/skin-black-dark","css/dist/skins/skin-black","css/dist/skins/skin-green-dark","css/dist/skins/skin-green","css/dist/skins/skin-contrast"], () => (__webpack_require__("./resources/assets/js/snipeit_modals.js")))
-/******/ 	__webpack_require__.O(undefined, ["css/dist/skins/skin-red","css/dist/skins/skin-blue","css/build/overrides","css/build/app","css/build/AdminLTE","css/dist/skins/skin-orange","css/dist/skins/skin-orange-dark","css/dist/skins/skin-blue-dark","css/dist/skins/skin-yellow-dark","css/dist/skins/skin-yellow","css/dist/skins/skin-purple-dark","css/dist/skins/skin-purple","css/dist/skins/skin-red-dark","css/dist/skins/skin-black-dark","css/dist/skins/skin-black","css/dist/skins/skin-green-dark","css/dist/skins/skin-green","css/dist/skins/skin-contrast"], () => (__webpack_require__("./node_modules/admin-lte/build/less/AdminLTE.less")))
-/******/ 	__webpack_require__.O(undefined, ["css/dist/skins/skin-red","css/dist/skins/skin-blue","css/build/overrides","css/build/app","css/build/AdminLTE","css/dist/skins/skin-orange","css/dist/skins/skin-orange-dark","css/dist/skins/skin-blue-dark","css/dist/skins/skin-yellow-dark","css/dist/skins/skin-yellow","css/dist/skins/skin-purple-dark","css/dist/skins/skin-purple","css/dist/skins/skin-red-dark","css/dist/skins/skin-black-dark","css/dist/skins/skin-black","css/dist/skins/skin-green-dark","css/dist/skins/skin-green","css/dist/skins/skin-contrast"], () => (__webpack_require__("./resources/assets/less/app.less")))
-/******/ 	__webpack_require__.O(undefined, ["css/dist/skins/skin-red","css/dist/skins/skin-blue","css/build/overrides","css/build/app","css/build/AdminLTE","css/dist/skins/skin-orange","css/dist/skins/skin-orange-dark","css/dist/skins/skin-blue-dark","css/dist/skins/skin-yellow-dark","css/dist/skins/skin-yellow","css/dist/skins/skin-purple-dark","css/dist/skins/skin-purple","css/dist/skins/skin-red-dark","css/dist/skins/skin-black-dark","css/dist/skins/skin-black","css/dist/skins/skin-green-dark","css/dist/skins/skin-green","css/dist/skins/skin-contrast"], () => (__webpack_require__("./resources/assets/less/overrides.less")))
-/******/ 	__webpack_require__.O(undefined, ["css/dist/skins/skin-red","css/dist/skins/skin-blue","css/build/overrides","css/build/app","css/build/AdminLTE","css/dist/skins/skin-orange","css/dist/skins/skin-orange-dark","css/dist/skins/skin-blue-dark","css/dist/skins/skin-yellow-dark","css/dist/skins/skin-yellow","css/dist/skins/skin-purple-dark","css/dist/skins/skin-purple","css/dist/skins/skin-red-dark","css/dist/skins/skin-black-dark","css/dist/skins/skin-black","css/dist/skins/skin-green-dark","css/dist/skins/skin-green","css/dist/skins/skin-contrast"], () => (__webpack_require__("./resources/assets/less/skins/skin-blue.less")))
-/******/ 	__webpack_require__.O(undefined, ["css/dist/skins/skin-red","css/dist/skins/skin-blue","css/build/overrides","css/build/app","css/build/AdminLTE","css/dist/skins/skin-orange","css/dist/skins/skin-orange-dark","css/dist/skins/skin-blue-dark","css/dist/skins/skin-yellow-dark","css/dist/skins/skin-yellow","css/dist/skins/skin-purple-dark","css/dist/skins/skin-purple","css/dist/skins/skin-red-dark","css/dist/skins/skin-black-dark","css/dist/skins/skin-black","css/dist/skins/skin-green-dark","css/dist/skins/skin-green","css/dist/skins/skin-contrast"], () => (__webpack_require__("./resources/assets/less/skins/skin-red.less")))
-/******/ 	__webpack_require__.O(undefined, ["css/dist/skins/skin-red","css/dist/skins/skin-blue","css/build/overrides","css/build/app","css/build/AdminLTE","css/dist/skins/skin-orange","css/dist/skins/skin-orange-dark","css/dist/skins/skin-blue-dark","css/dist/skins/skin-yellow-dark","css/dist/skins/skin-yellow","css/dist/skins/skin-purple-dark","css/dist/skins/skin-purple","css/dist/skins/skin-red-dark","css/dist/skins/skin-black-dark","css/dist/skins/skin-black","css/dist/skins/skin-green-dark","css/dist/skins/skin-green","css/dist/skins/skin-contrast"], () => (__webpack_require__("./resources/assets/less/skins/skin-contrast.less")))
-/******/ 	__webpack_require__.O(undefined, ["css/dist/skins/skin-red","css/dist/skins/skin-blue","css/build/overrides","css/build/app","css/build/AdminLTE","css/dist/skins/skin-orange","css/dist/skins/skin-orange-dark","css/dist/skins/skin-blue-dark","css/dist/skins/skin-yellow-dark","css/dist/skins/skin-yellow","css/dist/skins/skin-purple-dark","css/dist/skins/skin-purple","css/dist/skins/skin-red-dark","css/dist/skins/skin-black-dark","css/dist/skins/skin-black","css/dist/skins/skin-green-dark","css/dist/skins/skin-green","css/dist/skins/skin-contrast"], () => (__webpack_require__("./resources/assets/less/skins/skin-green.less")))
-/******/ 	__webpack_require__.O(undefined, ["css/dist/skins/skin-red","css/dist/skins/skin-blue","css/build/overrides","css/build/app","css/build/AdminLTE","css/dist/skins/skin-orange","css/dist/skins/skin-orange-dark","css/dist/skins/skin-blue-dark","css/dist/skins/skin-yellow-dark","css/dist/skins/skin-yellow","css/dist/skins/skin-purple-dark","css/dist/skins/skin-purple","css/dist/skins/skin-red-dark","css/dist/skins/skin-black-dark","css/dist/skins/skin-black","css/dist/skins/skin-green-dark","css/dist/skins/skin-green","css/dist/skins/skin-contrast"], () => (__webpack_require__("./resources/assets/less/skins/skin-green-dark.less")))
-/******/ 	__webpack_require__.O(undefined, ["css/dist/skins/skin-red","css/dist/skins/skin-blue","css/build/overrides","css/build/app","css/build/AdminLTE","css/dist/skins/skin-orange","css/dist/skins/skin-orange-dark","css/dist/skins/skin-blue-dark","css/dist/skins/skin-yellow-dark","css/dist/skins/skin-yellow","css/dist/skins/skin-purple-dark","css/dist/skins/skin-purple","css/dist/skins/skin-red-dark","css/dist/skins/skin-black-dark","css/dist/skins/skin-black","css/dist/skins/skin-green-dark","css/dist/skins/skin-green","css/dist/skins/skin-contrast"], () => (__webpack_require__("./resources/assets/less/skins/skin-black.less")))
-/******/ 	__webpack_require__.O(undefined, ["css/dist/skins/skin-red","css/dist/skins/skin-blue","css/build/overrides","css/build/app","css/build/AdminLTE","css/dist/skins/skin-orange","css/dist/skins/skin-orange-dark","css/dist/skins/skin-blue-dark","css/dist/skins/skin-yellow-dark","css/dist/skins/skin-yellow","css/dist/skins/skin-purple-dark","css/dist/skins/skin-purple","css/dist/skins/skin-red-dark","css/dist/skins/skin-black-dark","css/dist/skins/skin-black","css/dist/skins/skin-green-dark","css/dist/skins/skin-green","css/dist/skins/skin-contrast"], () => (__webpack_require__("./resources/assets/less/skins/skin-black-dark.less")))
-/******/ 	__webpack_require__.O(undefined, ["css/dist/skins/skin-red","css/dist/skins/skin-blue","css/build/overrides","css/build/app","css/build/AdminLTE","css/dist/skins/skin-orange","css/dist/skins/skin-orange-dark","css/dist/skins/skin-blue-dark","css/dist/skins/skin-yellow-dark","css/dist/skins/skin-yellow","css/dist/skins/skin-purple-dark","css/dist/skins/skin-purple","css/dist/skins/skin-red-dark","css/dist/skins/skin-black-dark","css/dist/skins/skin-black","css/dist/skins/skin-green-dark","css/dist/skins/skin-green","css/dist/skins/skin-contrast"], () => (__webpack_require__("./resources/assets/less/skins/skin-red-dark.less")))
-/******/ 	__webpack_require__.O(undefined, ["css/dist/skins/skin-red","css/dist/skins/skin-blue","css/build/overrides","css/build/app","css/build/AdminLTE","css/dist/skins/skin-orange","css/dist/skins/skin-orange-dark","css/dist/skins/skin-blue-dark","css/dist/skins/skin-yellow-dark","css/dist/skins/skin-yellow","css/dist/skins/skin-purple-dark","css/dist/skins/skin-purple","css/dist/skins/skin-red-dark","css/dist/skins/skin-black-dark","css/dist/skins/skin-black","css/dist/skins/skin-green-dark","css/dist/skins/skin-green","css/dist/skins/skin-contrast"], () => (__webpack_require__("./resources/assets/less/skins/skin-purple.less")))
-/******/ 	__webpack_require__.O(undefined, ["css/dist/skins/skin-red","css/dist/skins/skin-blue","css/build/overrides","css/build/app","css/build/AdminLTE","css/dist/skins/skin-orange","css/dist/skins/skin-orange-dark","css/dist/skins/skin-blue-dark","css/dist/skins/skin-yellow-dark","css/dist/skins/skin-yellow","css/dist/skins/skin-purple-dark","css/dist/skins/skin-purple","css/dist/skins/skin-red-dark","css/dist/skins/skin-black-dark","css/dist/skins/skin-black","css/dist/skins/skin-green-dark","css/dist/skins/skin-green","css/dist/skins/skin-contrast"], () => (__webpack_require__("./resources/assets/less/skins/skin-purple-dark.less")))
-/******/ 	__webpack_require__.O(undefined, ["css/dist/skins/skin-red","css/dist/skins/skin-blue","css/build/overrides","css/build/app","css/build/AdminLTE","css/dist/skins/skin-orange","css/dist/skins/skin-orange-dark","css/dist/skins/skin-blue-dark","css/dist/skins/skin-yellow-dark","css/dist/skins/skin-yellow","css/dist/skins/skin-purple-dark","css/dist/skins/skin-purple","css/dist/skins/skin-red-dark","css/dist/skins/skin-black-dark","css/dist/skins/skin-black","css/dist/skins/skin-green-dark","css/dist/skins/skin-green","css/dist/skins/skin-contrast"], () => (__webpack_require__("./resources/assets/less/skins/skin-yellow.less")))
-/******/ 	__webpack_require__.O(undefined, ["css/dist/skins/skin-red","css/dist/skins/skin-blue","css/build/overrides","css/build/app","css/build/AdminLTE","css/dist/skins/skin-orange","css/dist/skins/skin-orange-dark","css/dist/skins/skin-blue-dark","css/dist/skins/skin-yellow-dark","css/dist/skins/skin-yellow","css/dist/skins/skin-purple-dark","css/dist/skins/skin-purple","css/dist/skins/skin-red-dark","css/dist/skins/skin-black-dark","css/dist/skins/skin-black","css/dist/skins/skin-green-dark","css/dist/skins/skin-green","css/dist/skins/skin-contrast"], () => (__webpack_require__("./resources/assets/less/skins/skin-yellow-dark.less")))
-/******/ 	__webpack_require__.O(undefined, ["css/dist/skins/skin-red","css/dist/skins/skin-blue","css/build/overrides","css/build/app","css/build/AdminLTE","css/dist/skins/skin-orange","css/dist/skins/skin-orange-dark","css/dist/skins/skin-blue-dark","css/dist/skins/skin-yellow-dark","css/dist/skins/skin-yellow","css/dist/skins/skin-purple-dark","css/dist/skins/skin-purple","css/dist/skins/skin-red-dark","css/dist/skins/skin-black-dark","css/dist/skins/skin-black","css/dist/skins/skin-green-dark","css/dist/skins/skin-green","css/dist/skins/skin-contrast"], () => (__webpack_require__("./resources/assets/less/skins/skin-blue-dark.less")))
-/******/ 	__webpack_require__.O(undefined, ["css/dist/skins/skin-red","css/dist/skins/skin-blue","css/build/overrides","css/build/app","css/build/AdminLTE","css/dist/skins/skin-orange","css/dist/skins/skin-orange-dark","css/dist/skins/skin-blue-dark","css/dist/skins/skin-yellow-dark","css/dist/skins/skin-yellow","css/dist/skins/skin-purple-dark","css/dist/skins/skin-purple","css/dist/skins/skin-red-dark","css/dist/skins/skin-black-dark","css/dist/skins/skin-black","css/dist/skins/skin-green-dark","css/dist/skins/skin-green","css/dist/skins/skin-contrast"], () => (__webpack_require__("./resources/assets/less/skins/skin-orange-dark.less")))
-/******/ 	var __webpack_exports__ = __webpack_require__.O(undefined, ["css/dist/skins/skin-red","css/dist/skins/skin-blue","css/build/overrides","css/build/app","css/build/AdminLTE","css/dist/skins/skin-orange","css/dist/skins/skin-orange-dark","css/dist/skins/skin-blue-dark","css/dist/skins/skin-yellow-dark","css/dist/skins/skin-yellow","css/dist/skins/skin-purple-dark","css/dist/skins/skin-purple","css/dist/skins/skin-red-dark","css/dist/skins/skin-black-dark","css/dist/skins/skin-black","css/dist/skins/skin-green-dark","css/dist/skins/skin-green","css/dist/skins/skin-contrast"], () => (__webpack_require__("./resources/assets/less/skins/skin-orange.less")))
+/******/ 	__webpack_require__.O(undefined, ["css/dist/skins/skin-black-dark","css/dist/skins/_all-skins","css/build/overrides","css/build/app","css/build/AdminLTE","css/dist/skins/skin-yellow","css/dist/skins/skin-yellow-dark","css/dist/skins/skin-red","css/dist/skins/skin-red-dark","css/dist/skins/skin-purple","css/dist/skins/skin-purple-dark","css/dist/skins/skin-orange","css/dist/skins/skin-orange-dark","css/dist/skins/skin-green","css/dist/skins/skin-green-dark","css/dist/skins/skin-contrast","css/dist/skins/skin-blue","css/dist/skins/skin-blue-dark","css/dist/skins/skin-black"], () => (__webpack_require__("./resources/assets/js/snipeit.js")))
+/******/ 	__webpack_require__.O(undefined, ["css/dist/skins/skin-black-dark","css/dist/skins/_all-skins","css/build/overrides","css/build/app","css/build/AdminLTE","css/dist/skins/skin-yellow","css/dist/skins/skin-yellow-dark","css/dist/skins/skin-red","css/dist/skins/skin-red-dark","css/dist/skins/skin-purple","css/dist/skins/skin-purple-dark","css/dist/skins/skin-orange","css/dist/skins/skin-orange-dark","css/dist/skins/skin-green","css/dist/skins/skin-green-dark","css/dist/skins/skin-contrast","css/dist/skins/skin-blue","css/dist/skins/skin-blue-dark","css/dist/skins/skin-black"], () => (__webpack_require__("./resources/assets/js/snipeit_modals.js")))
+/******/ 	__webpack_require__.O(undefined, ["css/dist/skins/skin-black-dark","css/dist/skins/_all-skins","css/build/overrides","css/build/app","css/build/AdminLTE","css/dist/skins/skin-yellow","css/dist/skins/skin-yellow-dark","css/dist/skins/skin-red","css/dist/skins/skin-red-dark","css/dist/skins/skin-purple","css/dist/skins/skin-purple-dark","css/dist/skins/skin-orange","css/dist/skins/skin-orange-dark","css/dist/skins/skin-green","css/dist/skins/skin-green-dark","css/dist/skins/skin-contrast","css/dist/skins/skin-blue","css/dist/skins/skin-blue-dark","css/dist/skins/skin-black"], () => (__webpack_require__("./node_modules/canvas-confetti/dist/confetti.browser.js")))
+/******/ 	__webpack_require__.O(undefined, ["css/dist/skins/skin-black-dark","css/dist/skins/_all-skins","css/build/overrides","css/build/app","css/build/AdminLTE","css/dist/skins/skin-yellow","css/dist/skins/skin-yellow-dark","css/dist/skins/skin-red","css/dist/skins/skin-red-dark","css/dist/skins/skin-purple","css/dist/skins/skin-purple-dark","css/dist/skins/skin-orange","css/dist/skins/skin-orange-dark","css/dist/skins/skin-green","css/dist/skins/skin-green-dark","css/dist/skins/skin-contrast","css/dist/skins/skin-blue","css/dist/skins/skin-blue-dark","css/dist/skins/skin-black"], () => (__webpack_require__("./node_modules/admin-lte/build/less/AdminLTE.less")))
+/******/ 	__webpack_require__.O(undefined, ["css/dist/skins/skin-black-dark","css/dist/skins/_all-skins","css/build/overrides","css/build/app","css/build/AdminLTE","css/dist/skins/skin-yellow","css/dist/skins/skin-yellow-dark","css/dist/skins/skin-red","css/dist/skins/skin-red-dark","css/dist/skins/skin-purple","css/dist/skins/skin-purple-dark","css/dist/skins/skin-orange","css/dist/skins/skin-orange-dark","css/dist/skins/skin-green","css/dist/skins/skin-green-dark","css/dist/skins/skin-contrast","css/dist/skins/skin-blue","css/dist/skins/skin-blue-dark","css/dist/skins/skin-black"], () => (__webpack_require__("./resources/assets/less/app.less")))
+/******/ 	__webpack_require__.O(undefined, ["css/dist/skins/skin-black-dark","css/dist/skins/_all-skins","css/build/overrides","css/build/app","css/build/AdminLTE","css/dist/skins/skin-yellow","css/dist/skins/skin-yellow-dark","css/dist/skins/skin-red","css/dist/skins/skin-red-dark","css/dist/skins/skin-purple","css/dist/skins/skin-purple-dark","css/dist/skins/skin-orange","css/dist/skins/skin-orange-dark","css/dist/skins/skin-green","css/dist/skins/skin-green-dark","css/dist/skins/skin-contrast","css/dist/skins/skin-blue","css/dist/skins/skin-blue-dark","css/dist/skins/skin-black"], () => (__webpack_require__("./resources/assets/less/overrides.less")))
+/******/ 	__webpack_require__.O(undefined, ["css/dist/skins/skin-black-dark","css/dist/skins/_all-skins","css/build/overrides","css/build/app","css/build/AdminLTE","css/dist/skins/skin-yellow","css/dist/skins/skin-yellow-dark","css/dist/skins/skin-red","css/dist/skins/skin-red-dark","css/dist/skins/skin-purple","css/dist/skins/skin-purple-dark","css/dist/skins/skin-orange","css/dist/skins/skin-orange-dark","css/dist/skins/skin-green","css/dist/skins/skin-green-dark","css/dist/skins/skin-contrast","css/dist/skins/skin-blue","css/dist/skins/skin-blue-dark","css/dist/skins/skin-black"], () => (__webpack_require__("./resources/assets/less/skins/_all-skins.less")))
+/******/ 	__webpack_require__.O(undefined, ["css/dist/skins/skin-black-dark","css/dist/skins/_all-skins","css/build/overrides","css/build/app","css/build/AdminLTE","css/dist/skins/skin-yellow","css/dist/skins/skin-yellow-dark","css/dist/skins/skin-red","css/dist/skins/skin-red-dark","css/dist/skins/skin-purple","css/dist/skins/skin-purple-dark","css/dist/skins/skin-orange","css/dist/skins/skin-orange-dark","css/dist/skins/skin-green","css/dist/skins/skin-green-dark","css/dist/skins/skin-contrast","css/dist/skins/skin-blue","css/dist/skins/skin-blue-dark","css/dist/skins/skin-black"], () => (__webpack_require__("./resources/assets/less/skins/skin-black-dark.less")))
+/******/ 	__webpack_require__.O(undefined, ["css/dist/skins/skin-black-dark","css/dist/skins/_all-skins","css/build/overrides","css/build/app","css/build/AdminLTE","css/dist/skins/skin-yellow","css/dist/skins/skin-yellow-dark","css/dist/skins/skin-red","css/dist/skins/skin-red-dark","css/dist/skins/skin-purple","css/dist/skins/skin-purple-dark","css/dist/skins/skin-orange","css/dist/skins/skin-orange-dark","css/dist/skins/skin-green","css/dist/skins/skin-green-dark","css/dist/skins/skin-contrast","css/dist/skins/skin-blue","css/dist/skins/skin-blue-dark","css/dist/skins/skin-black"], () => (__webpack_require__("./resources/assets/less/skins/skin-black.less")))
+/******/ 	__webpack_require__.O(undefined, ["css/dist/skins/skin-black-dark","css/dist/skins/_all-skins","css/build/overrides","css/build/app","css/build/AdminLTE","css/dist/skins/skin-yellow","css/dist/skins/skin-yellow-dark","css/dist/skins/skin-red","css/dist/skins/skin-red-dark","css/dist/skins/skin-purple","css/dist/skins/skin-purple-dark","css/dist/skins/skin-orange","css/dist/skins/skin-orange-dark","css/dist/skins/skin-green","css/dist/skins/skin-green-dark","css/dist/skins/skin-contrast","css/dist/skins/skin-blue","css/dist/skins/skin-blue-dark","css/dist/skins/skin-black"], () => (__webpack_require__("./resources/assets/less/skins/skin-blue-dark.less")))
+/******/ 	__webpack_require__.O(undefined, ["css/dist/skins/skin-black-dark","css/dist/skins/_all-skins","css/build/overrides","css/build/app","css/build/AdminLTE","css/dist/skins/skin-yellow","css/dist/skins/skin-yellow-dark","css/dist/skins/skin-red","css/dist/skins/skin-red-dark","css/dist/skins/skin-purple","css/dist/skins/skin-purple-dark","css/dist/skins/skin-orange","css/dist/skins/skin-orange-dark","css/dist/skins/skin-green","css/dist/skins/skin-green-dark","css/dist/skins/skin-contrast","css/dist/skins/skin-blue","css/dist/skins/skin-blue-dark","css/dist/skins/skin-black"], () => (__webpack_require__("./resources/assets/less/skins/skin-blue.less")))
+/******/ 	__webpack_require__.O(undefined, ["css/dist/skins/skin-black-dark","css/dist/skins/_all-skins","css/build/overrides","css/build/app","css/build/AdminLTE","css/dist/skins/skin-yellow","css/dist/skins/skin-yellow-dark","css/dist/skins/skin-red","css/dist/skins/skin-red-dark","css/dist/skins/skin-purple","css/dist/skins/skin-purple-dark","css/dist/skins/skin-orange","css/dist/skins/skin-orange-dark","css/dist/skins/skin-green","css/dist/skins/skin-green-dark","css/dist/skins/skin-contrast","css/dist/skins/skin-blue","css/dist/skins/skin-blue-dark","css/dist/skins/skin-black"], () => (__webpack_require__("./resources/assets/less/skins/skin-contrast.less")))
+/******/ 	__webpack_require__.O(undefined, ["css/dist/skins/skin-black-dark","css/dist/skins/_all-skins","css/build/overrides","css/build/app","css/build/AdminLTE","css/dist/skins/skin-yellow","css/dist/skins/skin-yellow-dark","css/dist/skins/skin-red","css/dist/skins/skin-red-dark","css/dist/skins/skin-purple","css/dist/skins/skin-purple-dark","css/dist/skins/skin-orange","css/dist/skins/skin-orange-dark","css/dist/skins/skin-green","css/dist/skins/skin-green-dark","css/dist/skins/skin-contrast","css/dist/skins/skin-blue","css/dist/skins/skin-blue-dark","css/dist/skins/skin-black"], () => (__webpack_require__("./resources/assets/less/skins/skin-green-dark.less")))
+/******/ 	__webpack_require__.O(undefined, ["css/dist/skins/skin-black-dark","css/dist/skins/_all-skins","css/build/overrides","css/build/app","css/build/AdminLTE","css/dist/skins/skin-yellow","css/dist/skins/skin-yellow-dark","css/dist/skins/skin-red","css/dist/skins/skin-red-dark","css/dist/skins/skin-purple","css/dist/skins/skin-purple-dark","css/dist/skins/skin-orange","css/dist/skins/skin-orange-dark","css/dist/skins/skin-green","css/dist/skins/skin-green-dark","css/dist/skins/skin-contrast","css/dist/skins/skin-blue","css/dist/skins/skin-blue-dark","css/dist/skins/skin-black"], () => (__webpack_require__("./resources/assets/less/skins/skin-green.less")))
+/******/ 	__webpack_require__.O(undefined, ["css/dist/skins/skin-black-dark","css/dist/skins/_all-skins","css/build/overrides","css/build/app","css/build/AdminLTE","css/dist/skins/skin-yellow","css/dist/skins/skin-yellow-dark","css/dist/skins/skin-red","css/dist/skins/skin-red-dark","css/dist/skins/skin-purple","css/dist/skins/skin-purple-dark","css/dist/skins/skin-orange","css/dist/skins/skin-orange-dark","css/dist/skins/skin-green","css/dist/skins/skin-green-dark","css/dist/skins/skin-contrast","css/dist/skins/skin-blue","css/dist/skins/skin-blue-dark","css/dist/skins/skin-black"], () => (__webpack_require__("./resources/assets/less/skins/skin-orange-dark.less")))
+/******/ 	__webpack_require__.O(undefined, ["css/dist/skins/skin-black-dark","css/dist/skins/_all-skins","css/build/overrides","css/build/app","css/build/AdminLTE","css/dist/skins/skin-yellow","css/dist/skins/skin-yellow-dark","css/dist/skins/skin-red","css/dist/skins/skin-red-dark","css/dist/skins/skin-purple","css/dist/skins/skin-purple-dark","css/dist/skins/skin-orange","css/dist/skins/skin-orange-dark","css/dist/skins/skin-green","css/dist/skins/skin-green-dark","css/dist/skins/skin-contrast","css/dist/skins/skin-blue","css/dist/skins/skin-blue-dark","css/dist/skins/skin-black"], () => (__webpack_require__("./resources/assets/less/skins/skin-orange.less")))
+/******/ 	__webpack_require__.O(undefined, ["css/dist/skins/skin-black-dark","css/dist/skins/_all-skins","css/build/overrides","css/build/app","css/build/AdminLTE","css/dist/skins/skin-yellow","css/dist/skins/skin-yellow-dark","css/dist/skins/skin-red","css/dist/skins/skin-red-dark","css/dist/skins/skin-purple","css/dist/skins/skin-purple-dark","css/dist/skins/skin-orange","css/dist/skins/skin-orange-dark","css/dist/skins/skin-green","css/dist/skins/skin-green-dark","css/dist/skins/skin-contrast","css/dist/skins/skin-blue","css/dist/skins/skin-blue-dark","css/dist/skins/skin-black"], () => (__webpack_require__("./resources/assets/less/skins/skin-purple-dark.less")))
+/******/ 	__webpack_require__.O(undefined, ["css/dist/skins/skin-black-dark","css/dist/skins/_all-skins","css/build/overrides","css/build/app","css/build/AdminLTE","css/dist/skins/skin-yellow","css/dist/skins/skin-yellow-dark","css/dist/skins/skin-red","css/dist/skins/skin-red-dark","css/dist/skins/skin-purple","css/dist/skins/skin-purple-dark","css/dist/skins/skin-orange","css/dist/skins/skin-orange-dark","css/dist/skins/skin-green","css/dist/skins/skin-green-dark","css/dist/skins/skin-contrast","css/dist/skins/skin-blue","css/dist/skins/skin-blue-dark","css/dist/skins/skin-black"], () => (__webpack_require__("./resources/assets/less/skins/skin-purple.less")))
+/******/ 	__webpack_require__.O(undefined, ["css/dist/skins/skin-black-dark","css/dist/skins/_all-skins","css/build/overrides","css/build/app","css/build/AdminLTE","css/dist/skins/skin-yellow","css/dist/skins/skin-yellow-dark","css/dist/skins/skin-red","css/dist/skins/skin-red-dark","css/dist/skins/skin-purple","css/dist/skins/skin-purple-dark","css/dist/skins/skin-orange","css/dist/skins/skin-orange-dark","css/dist/skins/skin-green","css/dist/skins/skin-green-dark","css/dist/skins/skin-contrast","css/dist/skins/skin-blue","css/dist/skins/skin-blue-dark","css/dist/skins/skin-black"], () => (__webpack_require__("./resources/assets/less/skins/skin-red-dark.less")))
+/******/ 	__webpack_require__.O(undefined, ["css/dist/skins/skin-black-dark","css/dist/skins/_all-skins","css/build/overrides","css/build/app","css/build/AdminLTE","css/dist/skins/skin-yellow","css/dist/skins/skin-yellow-dark","css/dist/skins/skin-red","css/dist/skins/skin-red-dark","css/dist/skins/skin-purple","css/dist/skins/skin-purple-dark","css/dist/skins/skin-orange","css/dist/skins/skin-orange-dark","css/dist/skins/skin-green","css/dist/skins/skin-green-dark","css/dist/skins/skin-contrast","css/dist/skins/skin-blue","css/dist/skins/skin-blue-dark","css/dist/skins/skin-black"], () => (__webpack_require__("./resources/assets/less/skins/skin-red.less")))
+/******/ 	__webpack_require__.O(undefined, ["css/dist/skins/skin-black-dark","css/dist/skins/_all-skins","css/build/overrides","css/build/app","css/build/AdminLTE","css/dist/skins/skin-yellow","css/dist/skins/skin-yellow-dark","css/dist/skins/skin-red","css/dist/skins/skin-red-dark","css/dist/skins/skin-purple","css/dist/skins/skin-purple-dark","css/dist/skins/skin-orange","css/dist/skins/skin-orange-dark","css/dist/skins/skin-green","css/dist/skins/skin-green-dark","css/dist/skins/skin-contrast","css/dist/skins/skin-blue","css/dist/skins/skin-blue-dark","css/dist/skins/skin-black"], () => (__webpack_require__("./resources/assets/less/skins/skin-yellow-dark.less")))
+/******/ 	var __webpack_exports__ = __webpack_require__.O(undefined, ["css/dist/skins/skin-black-dark","css/dist/skins/_all-skins","css/build/overrides","css/build/app","css/build/AdminLTE","css/dist/skins/skin-yellow","css/dist/skins/skin-yellow-dark","css/dist/skins/skin-red","css/dist/skins/skin-red-dark","css/dist/skins/skin-purple","css/dist/skins/skin-purple-dark","css/dist/skins/skin-orange","css/dist/skins/skin-orange-dark","css/dist/skins/skin-green","css/dist/skins/skin-green-dark","css/dist/skins/skin-contrast","css/dist/skins/skin-blue","css/dist/skins/skin-blue-dark","css/dist/skins/skin-black"], () => (__webpack_require__("./resources/assets/less/skins/skin-yellow.less")))
 /******/ 	__webpack_exports__ = __webpack_require__.O(__webpack_exports__);
 /******/ 	
 /******/ })()
diff --git a/public/js/dist/bootstrap-table-en-US.min.js b/public/js/dist/bootstrap-table-en-US.min.js
new file mode 100644
index 0000000000..b80e66ffef
--- /dev/null
+++ b/public/js/dist/bootstrap-table-en-US.min.js
@@ -0,0 +1,10 @@
+/**
+  * bootstrap-table - An extended table to integration with some of the most widely used CSS frameworks. (Supports Bootstrap, Semantic UI, Bulma, Material Design, Foundation)
+  *
+  * @version v1.24.1
+  * @homepage https://bootstrap-table.com
+  * @author wenzhixin <wenzhixin2010@gmail.com> (http://wenzhixin.net.cn/)
+  * @license MIT
+  */
+
+!function(r,n){"object"==typeof exports&&"undefined"!=typeof module?n(require("jquery")):"function"==typeof define&&define.amd?define(["jquery"],n):n((r="undefined"!=typeof globalThis?globalThis:r||self).jQuery)}(this,(function(r){"use strict";var n,t,e="undefined"!=typeof globalThis?globalThis:"undefined"!=typeof window?window:"undefined"!=typeof global?global:"undefined"!=typeof self?self:{},o={};function u(){if(t)return n;t=1;var r=function(r){return r&&r.Math===Math&&r};return n=r("object"==typeof globalThis&&globalThis)||r("object"==typeof window&&window)||r("object"==typeof self&&self)||r("object"==typeof e&&e)||r("object"==typeof n&&n)||function(){return this}()||Function("return this")()}var i,f,c,a,l,s,v,p,g={};function y(){return f?i:(f=1,i=function(r){try{return!!r()}catch(r){return!0}})}function b(){if(a)return c;a=1;var r=y();return c=!r((function(){return 7!==Object.defineProperty({},1,{get:function(){return 7}})[1]}))}function h(){if(s)return l;s=1;var r=y();return l=!r((function(){var r=function(){}.bind();return"function"!=typeof r||r.hasOwnProperty("prototype")}))}function m(){if(p)return v;p=1;var r=h(),n=Function.prototype.call;return v=r?n.bind(n):function(){return n.apply(n,arguments)},v}var d,w,S,O,j,P,T,E,x,C,A,F,R,M,k,I,L,N,z,D,G,H,U,_,q,B,W,$,J,K,Q,V,X,Y,Z,rr,nr,tr,er,or,ur,ir={};function fr(){if(d)return ir;d=1;var r={}.propertyIsEnumerable,n=Object.getOwnPropertyDescriptor,t=n&&!r.call({1:2},1);return ir.f=t?function(r){var t=n(this,r);return!!t&&t.enumerable}:r,ir}function cr(){return S?w:(S=1,w=function(r,n){return{enumerable:!(1&r),configurable:!(2&r),writable:!(4&r),value:n}})}function ar(){if(j)return O;j=1;var r=h(),n=Function.prototype,t=n.call,e=r&&n.bind.bind(t,t);return O=r?e:function(r){return function(){return t.apply(r,arguments)}},O}function lr(){if(T)return P;T=1;var r=ar(),n=r({}.toString),t=r("".slice);return P=function(r){return t(n(r),8,-1)}}function sr(){if(x)return E;x=1;var r=ar(),n=y(),t=lr(),e=Object,o=r("".split);return E=n((function(){return!e("z").propertyIsEnumerable(0)}))?function(r){return"String"===t(r)?o(r,""):e(r)}:e}function vr(){return A?C:(A=1,C=function(r){return null==r})}function pr(){if(R)return F;R=1;var r=vr(),n=TypeError;return F=function(t){if(r(t))throw new n("Can't call method on "+t);return t}}function gr(){if(k)return M;k=1;var r=sr(),n=pr();return M=function(t){return r(n(t))}}function yr(){if(L)return I;L=1;var r="object"==typeof document&&document.all;return I=void 0===r&&void 0!==r?function(n){return"function"==typeof n||n===r}:function(r){return"function"==typeof r}}function br(){if(z)return N;z=1;var r=yr();return N=function(n){return"object"==typeof n?null!==n:r(n)}}function hr(){if(G)return D;G=1;var r=u(),n=yr();return D=function(t,e){return arguments.length<2?(o=r[t],n(o)?o:void 0):r[t]&&r[t][e];var o},D}function mr(){if(W)return B;W=1;var r,n,t=u(),e=function(){if(q)return _;q=1;var r=u().navigator,n=r&&r.userAgent;return _=n?String(n):""}(),o=t.process,i=t.Deno,f=o&&o.versions||i&&i.version,c=f&&f.v8;return c&&(n=(r=c.split("."))[0]>0&&r[0]<4?1:+(r[0]+r[1])),!n&&e&&(!(r=e.match(/Edge\/(\d+)/))||r[1]>=74)&&(r=e.match(/Chrome\/(\d+)/))&&(n=+r[1]),B=n}function dr(){if(J)return $;J=1;var r=mr(),n=y(),t=u().String;return $=!!Object.getOwnPropertySymbols&&!n((function(){var n=Symbol("symbol detection");return!t(n)||!(Object(n)instanceof Symbol)||!Symbol.sham&&r&&r<41}))}function wr(){if(Q)return K;Q=1;var r=dr();return K=r&&!Symbol.sham&&"symbol"==typeof Symbol.iterator}function Sr(){if(X)return V;X=1;var r=hr(),n=yr(),t=function(){if(U)return H;U=1;var r=ar();return H=r({}.isPrototypeOf)}(),e=wr(),o=Object;return V=e?function(r){return"symbol"==typeof r}:function(e){var u=r("Symbol");return n(u)&&t(u.prototype,o(e))}}function Or(){if(Z)return Y;Z=1;var r=String;return Y=function(n){try{return r(n)}catch(r){return"Object"}}}function jr(){if(nr)return rr;nr=1;var r=yr(),n=Or(),t=TypeError;return rr=function(e){if(r(e))return e;throw new t(n(e)+" is not a function")}}function Pr(){if(er)return tr;er=1;var r=jr(),n=vr();return tr=function(t,e){var o=t[e];return n(o)?void 0:r(o)}}function Tr(){if(ur)return or;ur=1;var r=m(),n=yr(),t=br(),e=TypeError;return or=function(o,u){var i,f;if("string"===u&&n(i=o.toString)&&!t(f=r(i,o)))return f;if(n(i=o.valueOf)&&!t(f=r(i,o)))return f;if("string"!==u&&n(i=o.toString)&&!t(f=r(i,o)))return f;throw new e("Can't convert object to primitive value")}}var Er,xr,Cr,Ar,Fr,Rr,Mr,kr,Ir,Lr,Nr,zr,Dr,Gr,Hr,Ur,_r,qr,Br,Wr,$r,Jr,Kr,Qr,Vr={exports:{}};function Xr(){if(Ar)return Cr;Ar=1;var r=u(),n=Object.defineProperty;return Cr=function(t,e){try{n(r,t,{value:e,configurable:!0,writable:!0})}catch(n){r[t]=e}return e}}function Yr(){if(Fr)return Vr.exports;Fr=1;var r=xr?Er:(xr=1,Er=!1),n=u(),t=Xr(),e="__core-js_shared__",o=Vr.exports=n[e]||t(e,{});return(o.versions||(o.versions=[])).push({version:"3.39.0",mode:r?"pure":"global",copyright:"© 2014-2024 Denis Pushkarev (zloirock.ru)",license:"https://github.com/zloirock/core-js/blob/v3.39.0/LICENSE",source:"https://github.com/zloirock/core-js"}),Vr.exports}function Zr(){if(Mr)return Rr;Mr=1;var r=Yr();return Rr=function(n,t){return r[n]||(r[n]=t||{})}}function rn(){if(Ir)return kr;Ir=1;var r=pr(),n=Object;return kr=function(t){return n(r(t))}}function nn(){if(Nr)return Lr;Nr=1;var r=ar(),n=rn(),t=r({}.hasOwnProperty);return Lr=Object.hasOwn||function(r,e){return t(n(r),e)}}function tn(){if(Dr)return zr;Dr=1;var r=ar(),n=0,t=Math.random(),e=r(1..toString);return zr=function(r){return"Symbol("+(void 0===r?"":r)+")_"+e(++n+t,36)}}function en(){if(Hr)return Gr;Hr=1;var r=u(),n=Zr(),t=nn(),e=tn(),o=dr(),i=wr(),f=r.Symbol,c=n("wks"),a=i?f.for||f:f&&f.withoutSetter||e;return Gr=function(r){return t(c,r)||(c[r]=o&&t(f,r)?f[r]:a("Symbol."+r)),c[r]}}function on(){if(_r)return Ur;_r=1;var r=m(),n=br(),t=Sr(),e=Pr(),o=Tr(),u=en(),i=TypeError,f=u("toPrimitive");return Ur=function(u,c){if(!n(u)||t(u))return u;var a,l=e(u,f);if(l){if(void 0===c&&(c="default"),a=r(l,u,c),!n(a)||t(a))return a;throw new i("Can't convert object to primitive value")}return void 0===c&&(c="number"),o(u,c)}}function un(){if(Br)return qr;Br=1;var r=on(),n=Sr();return qr=function(t){var e=r(t,"string");return n(e)?e:e+""}}function fn(){if(Kr)return Jr;Kr=1;var r=b(),n=y(),t=function(){if($r)return Wr;$r=1;var r=u(),n=br(),t=r.document,e=n(t)&&n(t.createElement);return Wr=function(r){return e?t.createElement(r):{}}}();return Jr=!r&&!n((function(){return 7!==Object.defineProperty(t("div"),"a",{get:function(){return 7}}).a}))}function cn(){if(Qr)return g;Qr=1;var r=b(),n=m(),t=fr(),e=cr(),o=gr(),u=un(),i=nn(),f=fn(),c=Object.getOwnPropertyDescriptor;return g.f=r?c:function(r,a){if(r=o(r),a=u(a),f)try{return c(r,a)}catch(r){}if(i(r,a))return e(!n(t.f,r,a),r[a])},g}var an,ln,sn,vn,pn,gn,yn,bn={};function hn(){if(vn)return sn;vn=1;var r=br(),n=String,t=TypeError;return sn=function(e){if(r(e))return e;throw new t(n(e)+" is not an object")}}function mn(){if(pn)return bn;pn=1;var r=b(),n=fn(),t=function(){if(ln)return an;ln=1;var r=b(),n=y();return an=r&&n((function(){return 42!==Object.defineProperty((function(){}),"prototype",{value:42,writable:!1}).prototype}))}(),e=hn(),o=un(),u=TypeError,i=Object.defineProperty,f=Object.getOwnPropertyDescriptor,c="enumerable",a="configurable",l="writable";return bn.f=r?t?function(r,n,t){if(e(r),n=o(n),e(t),"function"==typeof r&&"prototype"===n&&"value"in t&&l in t&&!t[l]){var u=f(r,n);u&&u[l]&&(r[n]=t.value,t={configurable:a in t?t[a]:u[a],enumerable:c in t?t[c]:u[c],writable:!1})}return i(r,n,t)}:i:function(r,t,f){if(e(r),t=o(t),e(f),n)try{return i(r,t,f)}catch(r){}if("get"in f||"set"in f)throw new u("Accessors not supported");return"value"in f&&(r[t]=f.value),r},bn}function dn(){if(yn)return gn;yn=1;var r=b(),n=mn(),t=cr();return gn=r?function(r,e,o){return n.f(r,e,t(1,o))}:function(r,n,t){return r[n]=t,r}}var wn,Sn,On,jn,Pn,Tn,En,xn,Cn,An,Fn,Rn,Mn,kn,In,Ln={exports:{}};function Nn(){if(jn)return On;jn=1;var r=ar(),n=yr(),t=Yr(),e=r(Function.toString);return n(t.inspectSource)||(t.inspectSource=function(r){return e(r)}),On=t.inspectSource}function zn(){if(xn)return En;xn=1;var r=Zr(),n=tn(),t=r("keys");return En=function(r){return t[r]||(t[r]=n(r))}}function Dn(){return An?Cn:(An=1,Cn={})}function Gn(){if(Rn)return Fn;Rn=1;var r,n,t,e=function(){if(Tn)return Pn;Tn=1;var r=u(),n=yr(),t=r.WeakMap;return Pn=n(t)&&/native code/.test(String(t))}(),o=u(),i=br(),f=dn(),c=nn(),a=Yr(),l=zn(),s=Dn(),v="Object already initialized",p=o.TypeError,g=o.WeakMap;if(e||a.state){var y=a.state||(a.state=new g);y.get=y.get,y.has=y.has,y.set=y.set,r=function(r,n){if(y.has(r))throw new p(v);return n.facade=r,y.set(r,n),n},n=function(r){return y.get(r)||{}},t=function(r){return y.has(r)}}else{var b=l("state");s[b]=!0,r=function(r,n){if(c(r,b))throw new p(v);return n.facade=r,f(r,b,n),n},n=function(r){return c(r,b)?r[b]:{}},t=function(r){return c(r,b)}}return Fn={set:r,get:n,has:t,enforce:function(e){return t(e)?n(e):r(e,{})},getterFor:function(r){return function(t){var e;if(!i(t)||(e=n(t)).type!==r)throw new p("Incompatible receiver, "+r+" required");return e}}}}function Hn(){if(Mn)return Ln.exports;Mn=1;var r=ar(),n=y(),t=yr(),e=nn(),o=b(),u=function(){if(Sn)return wn;Sn=1;var r=b(),n=nn(),t=Function.prototype,e=r&&Object.getOwnPropertyDescriptor,o=n(t,"name"),u=o&&"something"===function(){}.name,i=o&&(!r||r&&e(t,"name").configurable);return wn={EXISTS:o,PROPER:u,CONFIGURABLE:i}}().CONFIGURABLE,i=Nn(),f=Gn(),c=f.enforce,a=f.get,l=String,s=Object.defineProperty,v=r("".slice),p=r("".replace),g=r([].join),h=o&&!n((function(){return 8!==s((function(){}),"length",{value:8}).length})),m=String(String).split("String"),d=Ln.exports=function(r,n,t){"Symbol("===v(l(n),0,7)&&(n="["+p(l(n),/^Symbol\(([^)]*)\).*$/,"$1")+"]"),t&&t.getter&&(n="get "+n),t&&t.setter&&(n="set "+n),(!e(r,"name")||u&&r.name!==n)&&(o?s(r,"name",{value:n,configurable:!0}):r.name=n),h&&t&&e(t,"arity")&&r.length!==t.arity&&s(r,"length",{value:t.arity});try{t&&e(t,"constructor")&&t.constructor?o&&s(r,"prototype",{writable:!1}):r.prototype&&(r.prototype=void 0)}catch(r){}var i=c(r);return e(i,"source")||(i.source=g(m,"string"==typeof n?n:"")),r};return Function.prototype.toString=d((function(){return t(this)&&a(this).source||i(this)}),"toString"),Ln.exports}function Un(){if(In)return kn;In=1;var r=yr(),n=mn(),t=Hn(),e=Xr();return kn=function(o,u,i,f){f||(f={});var c=f.enumerable,a=void 0!==f.name?f.name:u;if(r(i)&&t(i,a,f),f.global)c?o[u]=i:e(u,i);else{try{f.unsafe?o[u]&&(c=!0):delete o[u]}catch(r){}c?o[u]=i:n.f(o,u,{value:i,enumerable:!1,configurable:!f.nonConfigurable,writable:!f.nonWritable})}return o}}var _n,qn,Bn,Wn,$n,Jn,Kn,Qn,Vn,Xn,Yn,Zn,rt,nt,tt,et,ot,ut={};function it(){if(Wn)return Bn;Wn=1;var r=function(){if(qn)return _n;qn=1;var r=Math.ceil,n=Math.floor;return _n=Math.trunc||function(t){var e=+t;return(e>0?n:r)(e)}}();return Bn=function(n){var t=+n;return t!=t||0===t?0:r(t)}}function ft(){if(Jn)return $n;Jn=1;var r=it(),n=Math.max,t=Math.min;return $n=function(e,o){var u=r(e);return u<0?n(u+o,0):t(u,o)}}function ct(){if(Qn)return Kn;Qn=1;var r=it(),n=Math.min;return Kn=function(t){var e=r(t);return e>0?n(e,9007199254740991):0}}function at(){if(Xn)return Vn;Xn=1;var r=ct();return Vn=function(n){return r(n.length)}}function lt(){if(nt)return rt;nt=1;var r=ar(),n=nn(),t=gr(),e=function(){if(Zn)return Yn;Zn=1;var r=gr(),n=ft(),t=at(),e=function(e){return function(o,u,i){var f=r(o),c=t(f);if(0===c)return!e&&-1;var a,l=n(i,c);if(e&&u!=u){for(;c>l;)if((a=f[l++])!=a)return!0}else for(;c>l;l++)if((e||l in f)&&f[l]===u)return e||l||0;return!e&&-1}};return Yn={includes:e(!0),indexOf:e(!1)}}().indexOf,o=Dn(),u=r([].push);return rt=function(r,i){var f,c=t(r),a=0,l=[];for(f in c)!n(o,f)&&n(c,f)&&u(l,f);for(;i.length>a;)n(c,f=i[a++])&&(~e(l,f)||u(l,f));return l}}function st(){return et?tt:(et=1,tt=["constructor","hasOwnProperty","isPrototypeOf","propertyIsEnumerable","toLocaleString","toString","valueOf"])}var vt,pt,gt,yt,bt,ht,mt,dt,wt,St,Ot,jt,Pt,Tt,Et,xt,Ct,At,Ft,Rt,Mt,kt,It,Lt,Nt,zt,Dt,Gt,Ht={};function Ut(){return vt||(vt=1,Ht.f=Object.getOwnPropertySymbols),Ht}function _t(){if(gt)return pt;gt=1;var r=hr(),n=ar(),t=function(){if(ot)return ut;ot=1;var r=lt(),n=st().concat("length","prototype");return ut.f=Object.getOwnPropertyNames||function(t){return r(t,n)},ut}(),e=Ut(),o=hn(),u=n([].concat);return pt=r("Reflect","ownKeys")||function(r){var n=t.f(o(r)),i=e.f;return i?u(n,i(r)):n}}function qt(){if(bt)return yt;bt=1;var r=nn(),n=_t(),t=cn(),e=mn();return yt=function(o,u,i){for(var f=n(u),c=e.f,a=t.f,l=0;l<f.length;l++){var s=f[l];r(o,s)||i&&r(i,s)||c(o,s,a(u,s))}}}function Bt(){if(wt)return dt;wt=1;var r=u(),n=cn().f,t=dn(),e=Un(),o=Xr(),i=qt(),f=function(){if(mt)return ht;mt=1;var r=y(),n=yr(),t=/#|\.prototype\./,e=function(t,e){var c=u[o(t)];return c===f||c!==i&&(n(e)?r(e):!!e)},o=e.normalize=function(r){return String(r).replace(t,".").toLowerCase()},u=e.data={},i=e.NATIVE="N",f=e.POLYFILL="P";return ht=e}();return dt=function(u,c){var a,l,s,v,p,g=u.target,y=u.global,b=u.stat;if(a=y?r:b?r[g]||o(g,{}):r[g]&&r[g].prototype)for(l in c){if(v=c[l],s=u.dontCallGetSet?(p=n(a,l))&&p.value:a[l],!f(y?l:g+(b?".":"#")+l,u.forced)&&void 0!==s){if(typeof v==typeof s)continue;i(v,s)}(u.sham||s&&s.sham)&&t(v,"sham",!0),e(a,l,v,u)}}}function Wt(){if(Ot)return St;Ot=1;var r=lr();return St=Array.isArray||function(n){return"Array"===r(n)}}function $t(){if(Pt)return jt;Pt=1;var r=TypeError;return jt=function(n){if(n>9007199254740991)throw r("Maximum allowed index exceeded");return n}}function Jt(){if(Et)return Tt;Et=1;var r=b(),n=mn(),t=cr();return Tt=function(e,o,u){r?n.f(e,o,t(0,u)):e[o]=u}}function Kt(){if(Ft)return At;Ft=1;var r=function(){if(Ct)return xt;Ct=1;var r={};return r[en()("toStringTag")]="z",xt="[object z]"===String(r)}(),n=yr(),t=lr(),e=en()("toStringTag"),o=Object,u="Arguments"===t(function(){return arguments}());return At=r?t:function(r){var i,f,c;return void 0===r?"Undefined":null===r?"Null":"string"==typeof(f=function(r,n){try{return r[n]}catch(r){}}(i=o(r),e))?f:u?t(i):"Object"===(c=t(i))&&n(i.callee)?"Arguments":c}}function Qt(){if(Mt)return Rt;Mt=1;var r=ar(),n=y(),t=yr(),e=Kt(),o=hr(),u=Nn(),i=function(){},f=o("Reflect","construct"),c=/^\s*(?:class|function)\b/,a=r(c.exec),l=!c.test(i),s=function(r){if(!t(r))return!1;try{return f(i,[],r),!0}catch(r){return!1}},v=function(r){if(!t(r))return!1;switch(e(r)){case"AsyncFunction":case"GeneratorFunction":case"AsyncGeneratorFunction":return!1}try{return l||!!a(c,u(r))}catch(r){return!0}};return v.sham=!0,Rt=!f||n((function(){var r;return s(s.call)||!s(Object)||!s((function(){r=!0}))||r}))?v:s}function Vt(){if(It)return kt;It=1;var r=Wt(),n=Qt(),t=br(),e=en()("species"),o=Array;return kt=function(u){var i;return r(u)&&(i=u.constructor,(n(i)&&(i===o||r(i.prototype))||t(i)&&null===(i=i[e]))&&(i=void 0)),void 0===i?o:i}}function Xt(){if(Nt)return Lt;Nt=1;var r=Vt();return Lt=function(n,t){return new(r(n))(0===t?0:t)}}function Yt(){if(Dt)return zt;Dt=1;var r=y(),n=en(),t=mr(),e=n("species");return zt=function(n){return t>=51||!r((function(){var r=[];return(r.constructor={})[e]=function(){return{foo:1}},1!==r[n](Boolean).foo}))}}!function(){if(Gt)return o;Gt=1;var r=Bt(),n=y(),t=Wt(),e=br(),u=rn(),i=at(),f=$t(),c=Jt(),a=Xt(),l=Yt(),s=en(),v=mr(),p=s("isConcatSpreadable"),g=v>=51||!n((function(){var r=[];return r[p]=!1,r.concat()[0]!==r})),b=function(r){if(!e(r))return!1;var n=r[p];return void 0!==n?!!n:t(r)};r({target:"Array",proto:!0,arity:1,forced:!g||!l("concat")},{concat:function(r){var n,t,e,o,l,s=u(this),v=a(s,0),p=0;for(n=-1,e=arguments.length;n<e;n++)if(b(l=-1===n?s:arguments[n]))for(o=i(l),f(p+o),t=0;t<o;t++,p++)t in l&&c(v,p,l[t]);else f(p+1),c(v,p++,l);return v.length=p,v}})}();var Zt,re,ne,te,ee,oe={};function ue(){if(re)return Zt;re=1;var r=lt(),n=st();return Zt=Object.keys||function(t){return r(t,n)}}!function(){if(ee)return oe;ee=1;var r=Bt(),n=function(){if(te)return ne;te=1;var r=b(),n=ar(),t=m(),e=y(),o=ue(),u=Ut(),i=fr(),f=rn(),c=sr(),a=Object.assign,l=Object.defineProperty,s=n([].concat);return ne=!a||e((function(){if(r&&1!==a({b:1},a(l({},"a",{enumerable:!0,get:function(){l(this,"b",{value:3,enumerable:!1})}}),{b:2})).b)return!0;var n={},t={},e=Symbol("assign detection"),u="abcdefghijklmnopqrst";return n[e]=7,u.split("").forEach((function(r){t[r]=r})),7!==a({},n)[e]||o(a({},t)).join("")!==u}))?function(n,e){for(var a=f(n),l=arguments.length,v=1,p=u.f,g=i.f;l>v;)for(var y,b=c(arguments[v++]),h=p?s(o(b),p(b)):o(b),m=h.length,d=0;m>d;)y=h[d++],r&&!t(g,b,y)||(a[y]=b[y]);return a}:a,ne}();r({target:"Object",stat:!0,arity:2,forced:Object.assign!==n},{assign:n})}(),r.fn.bootstrapTable.locales["en-US"]=r.fn.bootstrapTable.locales.en={formatCopyRows:function(){return"Copy Rows"},formatPrint:function(){return"Print"},formatLoadingMessage:function(){return"Loading, please wait"},formatRecordsPerPage:function(r){return"".concat(r," rows per page")},formatShowingRows:function(r,n,t,e){return void 0!==e&&e>0&&e>t?"Showing ".concat(r," to ").concat(n," of ").concat(t," rows (filtered from ").concat(e," total rows)"):"Showing ".concat(r," to ").concat(n," of ").concat(t," rows")},formatSRPaginationPreText:function(){return"previous page"},formatSRPaginationPageText:function(r){return"to page ".concat(r)},formatSRPaginationNextText:function(){return"next page"},formatDetailPagination:function(r){return"Showing ".concat(r," rows")},formatClearSearch:function(){return"Clear Search"},formatSearch:function(){return"Search"},formatNoMatches:function(){return"No matching records found"},formatPaginationSwitch:function(){return"Hide/Show pagination"},formatPaginationSwitchDown:function(){return"Show pagination"},formatPaginationSwitchUp:function(){return"Hide pagination"},formatRefresh:function(){return"Refresh"},formatToggleOn:function(){return"Show card view"},formatToggleOff:function(){return"Hide card view"},formatColumns:function(){return"Columns"},formatColumnsToggleAll:function(){return"Toggle all"},formatFullscreen:function(){return"Fullscreen"},formatAllRows:function(){return"All"},formatAutoRefresh:function(){return"Auto Refresh"},formatExport:function(){return"Export data"},formatJumpTo:function(){return"GO"},formatAdvancedSearch:function(){return"Advanced search"},formatAdvancedCloseButton:function(){return"Close"},formatFilterControlSwitch:function(){return"Hide/Show controls"},formatFilterControlSwitchHide:function(){return"Hide controls"},formatFilterControlSwitchShow:function(){return"Show controls"}},Object.assign(r.fn.bootstrapTable.defaults,r.fn.bootstrapTable.locales["en-US"])}));
diff --git a/public/js/dist/bootstrap-table-locale-all.min.js b/public/js/dist/bootstrap-table-locale-all.min.js
new file mode 100644
index 0000000000..360703695b
--- /dev/null
+++ b/public/js/dist/bootstrap-table-locale-all.min.js
@@ -0,0 +1,10 @@
+/**
+  * bootstrap-table - An extended table to integration with some of the most widely used CSS frameworks. (Supports Bootstrap, Semantic UI, Bulma, Material Design, Foundation)
+  *
+  * @version v1.24.1
+  * @homepage https://bootstrap-table.com
+  * @author wenzhixin <wenzhixin2010@gmail.com> (http://wenzhixin.net.cn/)
+  * @license MIT
+  */
+
+!function(t,n){"object"==typeof exports&&"undefined"!=typeof module?n(require("jquery")):"function"==typeof define&&define.amd?define(["jquery"],n):n((t="undefined"!=typeof globalThis?globalThis:t||self).jQuery)}(this,(function(t){"use strict";var n,r,o="undefined"!=typeof globalThis?globalThis:"undefined"!=typeof window?window:"undefined"!=typeof global?global:"undefined"!=typeof self?self:{},e={};function a(){if(r)return n;r=1;var t=function(t){return t&&t.Math===Math&&t};return n=t("object"==typeof globalThis&&globalThis)||t("object"==typeof window&&window)||t("object"==typeof self&&self)||t("object"==typeof o&&o)||t("object"==typeof n&&n)||function(){return this}()||Function("return this")()}var i,u,c,f,l,s,m,g,d={};function h(){return u?i:(u=1,i=function(t){try{return!!t()}catch(t){return!0}})}function p(){if(f)return c;f=1;var t=h();return c=!t((function(){return 7!==Object.defineProperty({},1,{get:function(){return 7}})[1]}))}function S(){if(s)return l;s=1;var t=h();return l=!t((function(){var t=function(){}.bind();return"function"!=typeof t||t.hasOwnProperty("prototype")}))}function w(){if(g)return m;g=1;var t=S(),n=Function.prototype.call;return m=t?n.bind(n):function(){return n.apply(n,arguments)},m}var P,T,b,v,C,R,A,x,y,O,k,F,M,j,D,N,E,H,z,L,B,U,V,G,J,Z,I,K,q,W,Y,_,X,Q,$,tt,nt,rt,ot,et,at,it={};function ut(){if(P)return it;P=1;var t={}.propertyIsEnumerable,n=Object.getOwnPropertyDescriptor,r=n&&!t.call({1:2},1);return it.f=r?function(t){var r=n(this,t);return!!r&&r.enumerable}:t,it}function ct(){return b?T:(b=1,T=function(t,n){return{enumerable:!(1&t),configurable:!(2&t),writable:!(4&t),value:n}})}function ft(){if(C)return v;C=1;var t=S(),n=Function.prototype,r=n.call,o=t&&n.bind.bind(r,r);return v=t?o:function(t){return function(){return r.apply(t,arguments)}},v}function lt(){if(A)return R;A=1;var t=ft(),n=t({}.toString),r=t("".slice);return R=function(t){return r(n(t),8,-1)}}function st(){if(y)return x;y=1;var t=ft(),n=h(),r=lt(),o=Object,e=t("".split);return x=n((function(){return!o("z").propertyIsEnumerable(0)}))?function(t){return"String"===r(t)?e(t,""):o(t)}:o}function mt(){return k?O:(k=1,O=function(t){return null==t})}function gt(){if(M)return F;M=1;var t=mt(),n=TypeError;return F=function(r){if(t(r))throw new n("Can't call method on "+r);return r}}function dt(){if(D)return j;D=1;var t=st(),n=gt();return j=function(r){return t(n(r))}}function ht(){if(E)return N;E=1;var t="object"==typeof document&&document.all;return N=void 0===t&&void 0!==t?function(n){return"function"==typeof n||n===t}:function(t){return"function"==typeof t}}function pt(){if(z)return H;z=1;var t=ht();return H=function(n){return"object"==typeof n?null!==n:t(n)}}function St(){if(B)return L;B=1;var t=a(),n=ht();return L=function(r,o){return arguments.length<2?(e=t[r],n(e)?e:void 0):t[r]&&t[r][o];var e},L}function wt(){if(I)return Z;I=1;var t,n,r=a(),o=function(){if(J)return G;J=1;var t=a().navigator,n=t&&t.userAgent;return G=n?String(n):""}(),e=r.process,i=r.Deno,u=e&&e.versions||i&&i.version,c=u&&u.v8;return c&&(n=(t=c.split("."))[0]>0&&t[0]<4?1:+(t[0]+t[1])),!n&&o&&(!(t=o.match(/Edge\/(\d+)/))||t[1]>=74)&&(t=o.match(/Chrome\/(\d+)/))&&(n=+t[1]),Z=n}function Pt(){if(q)return K;q=1;var t=wt(),n=h(),r=a().String;return K=!!Object.getOwnPropertySymbols&&!n((function(){var n=Symbol("symbol detection");return!r(n)||!(Object(n)instanceof Symbol)||!Symbol.sham&&t&&t<41}))}function Tt(){if(Y)return W;Y=1;var t=Pt();return W=t&&!Symbol.sham&&"symbol"==typeof Symbol.iterator}function bt(){if(X)return _;X=1;var t=St(),n=ht(),r=function(){if(V)return U;V=1;var t=ft();return U=t({}.isPrototypeOf)}(),o=Tt(),e=Object;return _=o?function(t){return"symbol"==typeof t}:function(o){var a=t("Symbol");return n(a)&&r(a.prototype,e(o))}}function vt(){if($)return Q;$=1;var t=String;return Q=function(n){try{return t(n)}catch(t){return"Object"}}}function Ct(){if(nt)return tt;nt=1;var t=ht(),n=vt(),r=TypeError;return tt=function(o){if(t(o))return o;throw new r(n(o)+" is not a function")}}function Rt(){if(ot)return rt;ot=1;var t=Ct(),n=mt();return rt=function(r,o){var e=r[o];return n(e)?void 0:t(e)}}function At(){if(at)return et;at=1;var t=w(),n=ht(),r=pt(),o=TypeError;return et=function(e,a){var i,u;if("string"===a&&n(i=e.toString)&&!r(u=t(i,e)))return u;if(n(i=e.valueOf)&&!r(u=t(i,e)))return u;if("string"!==a&&n(i=e.toString)&&!r(u=t(i,e)))return u;throw new o("Can't convert object to primitive value")}}var xt,yt,Ot,kt,Ft,Mt,jt,Dt,Nt,Et,Ht,zt,Lt,Bt,Ut,Vt,Gt,Jt,Zt,It,Kt,qt,Wt,Yt,_t={exports:{}};function Xt(){if(kt)return Ot;kt=1;var t=a(),n=Object.defineProperty;return Ot=function(r,o){try{n(t,r,{value:o,configurable:!0,writable:!0})}catch(n){t[r]=o}return o}}function Qt(){if(Ft)return _t.exports;Ft=1;var t=yt?xt:(yt=1,xt=!1),n=a(),r=Xt(),o="__core-js_shared__",e=_t.exports=n[o]||r(o,{});return(e.versions||(e.versions=[])).push({version:"3.39.0",mode:t?"pure":"global",copyright:"© 2014-2024 Denis Pushkarev (zloirock.ru)",license:"https://github.com/zloirock/core-js/blob/v3.39.0/LICENSE",source:"https://github.com/zloirock/core-js"}),_t.exports}function $t(){if(jt)return Mt;jt=1;var t=Qt();return Mt=function(n,r){return t[n]||(t[n]=r||{})}}function tn(){if(Nt)return Dt;Nt=1;var t=gt(),n=Object;return Dt=function(r){return n(t(r))}}function nn(){if(Ht)return Et;Ht=1;var t=ft(),n=tn(),r=t({}.hasOwnProperty);return Et=Object.hasOwn||function(t,o){return r(n(t),o)}}function rn(){if(Lt)return zt;Lt=1;var t=ft(),n=0,r=Math.random(),o=t(1..toString);return zt=function(t){return"Symbol("+(void 0===t?"":t)+")_"+o(++n+r,36)}}function on(){if(Ut)return Bt;Ut=1;var t=a(),n=$t(),r=nn(),o=rn(),e=Pt(),i=Tt(),u=t.Symbol,c=n("wks"),f=i?u.for||u:u&&u.withoutSetter||o;return Bt=function(t){return r(c,t)||(c[t]=e&&r(u,t)?u[t]:f("Symbol."+t)),c[t]}}function en(){if(Gt)return Vt;Gt=1;var t=w(),n=pt(),r=bt(),o=Rt(),e=At(),a=on(),i=TypeError,u=a("toPrimitive");return Vt=function(a,c){if(!n(a)||r(a))return a;var f,l=o(a,u);if(l){if(void 0===c&&(c="default"),f=t(l,a,c),!n(f)||r(f))return f;throw new i("Can't convert object to primitive value")}return void 0===c&&(c="number"),e(a,c)}}function an(){if(Zt)return Jt;Zt=1;var t=en(),n=bt();return Jt=function(r){var o=t(r,"string");return n(o)?o:o+""}}function un(){if(Wt)return qt;Wt=1;var t=p(),n=h(),r=function(){if(Kt)return It;Kt=1;var t=a(),n=pt(),r=t.document,o=n(r)&&n(r.createElement);return It=function(t){return o?r.createElement(t):{}}}();return qt=!t&&!n((function(){return 7!==Object.defineProperty(r("div"),"a",{get:function(){return 7}}).a}))}function cn(){if(Yt)return d;Yt=1;var t=p(),n=w(),r=ut(),o=ct(),e=dt(),a=an(),i=nn(),u=un(),c=Object.getOwnPropertyDescriptor;return d.f=t?c:function(t,f){if(t=e(t),f=a(f),u)try{return c(t,f)}catch(t){}if(i(t,f))return o(!n(r.f,t,f),t[f])},d}var fn,ln,sn,mn,gn,dn,hn,pn={};function Sn(){if(mn)return sn;mn=1;var t=pt(),n=String,r=TypeError;return sn=function(o){if(t(o))return o;throw new r(n(o)+" is not an object")}}function wn(){if(gn)return pn;gn=1;var t=p(),n=un(),r=function(){if(ln)return fn;ln=1;var t=p(),n=h();return fn=t&&n((function(){return 42!==Object.defineProperty((function(){}),"prototype",{value:42,writable:!1}).prototype}))}(),o=Sn(),e=an(),a=TypeError,i=Object.defineProperty,u=Object.getOwnPropertyDescriptor,c="enumerable",f="configurable",l="writable";return pn.f=t?r?function(t,n,r){if(o(t),n=e(n),o(r),"function"==typeof t&&"prototype"===n&&"value"in r&&l in r&&!r[l]){var a=u(t,n);a&&a[l]&&(t[n]=r.value,r={configurable:f in r?r[f]:a[f],enumerable:c in r?r[c]:a[c],writable:!1})}return i(t,n,r)}:i:function(t,r,u){if(o(t),r=e(r),o(u),n)try{return i(t,r,u)}catch(t){}if("get"in u||"set"in u)throw new a("Accessors not supported");return"value"in u&&(t[r]=u.value),t},pn}function Pn(){if(hn)return dn;hn=1;var t=p(),n=wn(),r=ct();return dn=t?function(t,o,e){return n.f(t,o,r(1,e))}:function(t,n,r){return t[n]=r,t}}var Tn,bn,vn,Cn,Rn,An,xn,yn,On,kn,Fn,Mn,jn,Dn,Nn,En={exports:{}};function Hn(){if(Cn)return vn;Cn=1;var t=ft(),n=ht(),r=Qt(),o=t(Function.toString);return n(r.inspectSource)||(r.inspectSource=function(t){return o(t)}),vn=r.inspectSource}function zn(){if(yn)return xn;yn=1;var t=$t(),n=rn(),r=t("keys");return xn=function(t){return r[t]||(r[t]=n(t))}}function Ln(){return kn?On:(kn=1,On={})}function Bn(){if(Mn)return Fn;Mn=1;var t,n,r,o=function(){if(An)return Rn;An=1;var t=a(),n=ht(),r=t.WeakMap;return Rn=n(r)&&/native code/.test(String(r))}(),e=a(),i=pt(),u=Pn(),c=nn(),f=Qt(),l=zn(),s=Ln(),m="Object already initialized",g=e.TypeError,d=e.WeakMap;if(o||f.state){var h=f.state||(f.state=new d);h.get=h.get,h.has=h.has,h.set=h.set,t=function(t,n){if(h.has(t))throw new g(m);return n.facade=t,h.set(t,n),n},n=function(t){return h.get(t)||{}},r=function(t){return h.has(t)}}else{var p=l("state");s[p]=!0,t=function(t,n){if(c(t,p))throw new g(m);return n.facade=t,u(t,p,n),n},n=function(t){return c(t,p)?t[p]:{}},r=function(t){return c(t,p)}}return Fn={set:t,get:n,has:r,enforce:function(o){return r(o)?n(o):t(o,{})},getterFor:function(t){return function(r){var o;if(!i(r)||(o=n(r)).type!==t)throw new g("Incompatible receiver, "+t+" required");return o}}}}function Un(){if(jn)return En.exports;jn=1;var t=ft(),n=h(),r=ht(),o=nn(),e=p(),a=function(){if(bn)return Tn;bn=1;var t=p(),n=nn(),r=Function.prototype,o=t&&Object.getOwnPropertyDescriptor,e=n(r,"name"),a=e&&"something"===function(){}.name,i=e&&(!t||t&&o(r,"name").configurable);return Tn={EXISTS:e,PROPER:a,CONFIGURABLE:i}}().CONFIGURABLE,i=Hn(),u=Bn(),c=u.enforce,f=u.get,l=String,s=Object.defineProperty,m=t("".slice),g=t("".replace),d=t([].join),S=e&&!n((function(){return 8!==s((function(){}),"length",{value:8}).length})),w=String(String).split("String"),P=En.exports=function(t,n,r){"Symbol("===m(l(n),0,7)&&(n="["+g(l(n),/^Symbol\(([^)]*)\).*$/,"$1")+"]"),r&&r.getter&&(n="get "+n),r&&r.setter&&(n="set "+n),(!o(t,"name")||a&&t.name!==n)&&(e?s(t,"name",{value:n,configurable:!0}):t.name=n),S&&r&&o(r,"arity")&&t.length!==r.arity&&s(t,"length",{value:r.arity});try{r&&o(r,"constructor")&&r.constructor?e&&s(t,"prototype",{writable:!1}):t.prototype&&(t.prototype=void 0)}catch(t){}var i=c(t);return o(i,"source")||(i.source=d(w,"string"==typeof n?n:"")),t};return Function.prototype.toString=P((function(){return r(this)&&f(this).source||i(this)}),"toString"),En.exports}function Vn(){if(Nn)return Dn;Nn=1;var t=ht(),n=wn(),r=Un(),o=Xt();return Dn=function(e,a,i,u){u||(u={});var c=u.enumerable,f=void 0!==u.name?u.name:a;if(t(i)&&r(i,f,u),u.global)c?e[a]=i:o(a,i);else{try{u.unsafe?e[a]&&(c=!0):delete e[a]}catch(t){}c?e[a]=i:n.f(e,a,{value:i,enumerable:!1,configurable:!u.nonConfigurable,writable:!u.nonWritable})}return e}}var Gn,Jn,Zn,In,Kn,qn,Wn,Yn,_n,Xn,Qn,$n,tr,nr,rr,or,er,ar={};function ir(){if(In)return Zn;In=1;var t=function(){if(Jn)return Gn;Jn=1;var t=Math.ceil,n=Math.floor;return Gn=Math.trunc||function(r){var o=+r;return(o>0?n:t)(o)}}();return Zn=function(n){var r=+n;return r!=r||0===r?0:t(r)}}function ur(){if(qn)return Kn;qn=1;var t=ir(),n=Math.max,r=Math.min;return Kn=function(o,e){var a=t(o);return a<0?n(a+e,0):r(a,e)}}function cr(){if(Yn)return Wn;Yn=1;var t=ir(),n=Math.min;return Wn=function(r){var o=t(r);return o>0?n(o,9007199254740991):0}}function fr(){if(Xn)return _n;Xn=1;var t=cr();return _n=function(n){return t(n.length)}}function lr(){if(nr)return tr;nr=1;var t=ft(),n=nn(),r=dt(),o=function(){if($n)return Qn;$n=1;var t=dt(),n=ur(),r=fr(),o=function(o){return function(e,a,i){var u=t(e),c=r(u);if(0===c)return!o&&-1;var f,l=n(i,c);if(o&&a!=a){for(;c>l;)if((f=u[l++])!=f)return!0}else for(;c>l;l++)if((o||l in u)&&u[l]===a)return o||l||0;return!o&&-1}};return Qn={includes:o(!0),indexOf:o(!1)}}().indexOf,e=Ln(),a=t([].push);return tr=function(t,i){var u,c=r(t),f=0,l=[];for(u in c)!n(e,u)&&n(c,u)&&a(l,u);for(;i.length>f;)n(c,u=i[f++])&&(~o(l,u)||a(l,u));return l}}function sr(){return or?rr:(or=1,rr=["constructor","hasOwnProperty","isPrototypeOf","propertyIsEnumerable","toLocaleString","toString","valueOf"])}var mr,gr,dr,hr,pr,Sr,wr,Pr,Tr,br,vr,Cr,Rr,Ar,xr,yr,Or,kr,Fr,Mr,jr,Dr,Nr,Er,Hr,zr,Lr,Br,Ur={};function Vr(){return mr||(mr=1,Ur.f=Object.getOwnPropertySymbols),Ur}function Gr(){if(dr)return gr;dr=1;var t=St(),n=ft(),r=function(){if(er)return ar;er=1;var t=lr(),n=sr().concat("length","prototype");return ar.f=Object.getOwnPropertyNames||function(r){return t(r,n)},ar}(),o=Vr(),e=Sn(),a=n([].concat);return gr=t("Reflect","ownKeys")||function(t){var n=r.f(e(t)),i=o.f;return i?a(n,i(t)):n}}function Jr(){if(pr)return hr;pr=1;var t=nn(),n=Gr(),r=cn(),o=wn();return hr=function(e,a,i){for(var u=n(a),c=o.f,f=r.f,l=0;l<u.length;l++){var s=u[l];t(e,s)||i&&t(i,s)||c(e,s,f(a,s))}}}function Zr(){if(Tr)return Pr;Tr=1;var t=a(),n=cn().f,r=Pn(),o=Vn(),e=Xt(),i=Jr(),u=function(){if(wr)return Sr;wr=1;var t=h(),n=ht(),r=/#|\.prototype\./,o=function(r,o){var c=a[e(r)];return c===u||c!==i&&(n(o)?t(o):!!o)},e=o.normalize=function(t){return String(t).replace(r,".").toLowerCase()},a=o.data={},i=o.NATIVE="N",u=o.POLYFILL="P";return Sr=o}();return Pr=function(a,c){var f,l,s,m,g,d=a.target,h=a.global,p=a.stat;if(f=h?t:p?t[d]||e(d,{}):t[d]&&t[d].prototype)for(l in c){if(m=c[l],s=a.dontCallGetSet?(g=n(f,l))&&g.value:f[l],!u(h?l:d+(p?".":"#")+l,a.forced)&&void 0!==s){if(typeof m==typeof s)continue;i(m,s)}(a.sham||s&&s.sham)&&r(m,"sham",!0),o(f,l,m,a)}}}function Ir(){if(vr)return br;vr=1;var t=lt();return br=Array.isArray||function(n){return"Array"===t(n)}}function Kr(){if(Rr)return Cr;Rr=1;var t=TypeError;return Cr=function(n){if(n>9007199254740991)throw t("Maximum allowed index exceeded");return n}}function qr(){if(xr)return Ar;xr=1;var t=p(),n=wn(),r=ct();return Ar=function(o,e,a){t?n.f(o,e,r(0,a)):o[e]=a}}function Wr(){if(Fr)return kr;Fr=1;var t=function(){if(Or)return yr;Or=1;var t={};return t[on()("toStringTag")]="z",yr="[object z]"===String(t)}(),n=ht(),r=lt(),o=on()("toStringTag"),e=Object,a="Arguments"===r(function(){return arguments}());return kr=t?r:function(t){var i,u,c;return void 0===t?"Undefined":null===t?"Null":"string"==typeof(u=function(t,n){try{return t[n]}catch(t){}}(i=e(t),o))?u:a?r(i):"Object"===(c=r(i))&&n(i.callee)?"Arguments":c}}function Yr(){if(jr)return Mr;jr=1;var t=ft(),n=h(),r=ht(),o=Wr(),e=St(),a=Hn(),i=function(){},u=e("Reflect","construct"),c=/^\s*(?:class|function)\b/,f=t(c.exec),l=!c.test(i),s=function(t){if(!r(t))return!1;try{return u(i,[],t),!0}catch(t){return!1}},m=function(t){if(!r(t))return!1;switch(o(t)){case"AsyncFunction":case"GeneratorFunction":case"AsyncGeneratorFunction":return!1}try{return l||!!f(c,a(t))}catch(t){return!0}};return m.sham=!0,Mr=!u||n((function(){var t;return s(s.call)||!s(Object)||!s((function(){t=!0}))||t}))?m:s}function _r(){if(Nr)return Dr;Nr=1;var t=Ir(),n=Yr(),r=pt(),o=on()("species"),e=Array;return Dr=function(a){var i;return t(a)&&(i=a.constructor,(n(i)&&(i===e||t(i.prototype))||r(i)&&null===(i=i[o]))&&(i=void 0)),void 0===i?e:i}}function Xr(){if(Hr)return Er;Hr=1;var t=_r();return Er=function(n,r){return new(t(n))(0===r?0:r)}}function Qr(){if(Lr)return zr;Lr=1;var t=h(),n=on(),r=wt(),o=n("species");return zr=function(n){return r>=51||!t((function(){var t=[];return(t.constructor={})[o]=function(){return{foo:1}},1!==t[n](Boolean).foo}))}}!function(){if(Br)return e;Br=1;var t=Zr(),n=h(),r=Ir(),o=pt(),a=tn(),i=fr(),u=Kr(),c=qr(),f=Xr(),l=Qr(),s=on(),m=wt(),g=s("isConcatSpreadable"),d=m>=51||!n((function(){var t=[];return t[g]=!1,t.concat()[0]!==t})),p=function(t){if(!o(t))return!1;var n=t[g];return void 0!==n?!!n:r(t)};t({target:"Array",proto:!0,arity:1,forced:!d||!l("concat")},{concat:function(t){var n,r,o,e,l,s=a(this),m=f(s,0),g=0;for(n=-1,o=arguments.length;n<o;n++)if(p(l=-1===n?s:arguments[n]))for(e=i(l),u(g+e),r=0;r<e;r++,g++)r in l&&c(m,g,l[r]);else u(g+1),c(m,g++,l);return m.length=g,m}})}();var $r,to,no,ro,oo,eo={};function ao(){if(to)return $r;to=1;var t=lr(),n=sr();return $r=Object.keys||function(r){return t(r,n)}}!function(){if(oo)return eo;oo=1;var t=Zr(),n=function(){if(ro)return no;ro=1;var t=p(),n=ft(),r=w(),o=h(),e=ao(),a=Vr(),i=ut(),u=tn(),c=st(),f=Object.assign,l=Object.defineProperty,s=n([].concat);return no=!f||o((function(){if(t&&1!==f({b:1},f(l({},"a",{enumerable:!0,get:function(){l(this,"b",{value:3,enumerable:!1})}}),{b:2})).b)return!0;var n={},r={},o=Symbol("assign detection"),a="abcdefghijklmnopqrst";return n[o]=7,a.split("").forEach((function(t){r[t]=t})),7!==f({},n)[o]||e(f({},r)).join("")!==a}))?function(n,o){for(var f=u(n),l=arguments.length,m=1,g=a.f,d=i.f;l>m;)for(var h,p=c(arguments[m++]),S=g?s(e(p),g(p)):e(p),w=S.length,P=0;w>P;)h=S[P++],t&&!r(d,p,h)||(f[h]=p[h]);return f}:f,no}();t({target:"Object",stat:!0,arity:2,forced:Object.assign!==n},{assign:n})}(),t.fn.bootstrapTable.locales["af-ZA"]=t.fn.bootstrapTable.locales.af={formatCopyRows:function(){return"Kopieer lyne"},formatPrint:function(){return"Druk uit"},formatLoadingMessage:function(){return"Laai tans"},formatRecordsPerPage:function(t){return"".concat(t," reëls per bladsy")},formatShowingRows:function(t,n,r,o){return void 0!==o&&o>0&&o>r?"Wys ".concat(t," tot ").concat(n," van ").concat(r," lyne (gefiltreer vanaf ").concat(o," lyne)"):"Wys ".concat(t," tot ").concat(n," van ").concat(r," lyne")},formatSRPaginationPreText:function(){return"vorige bladsy"},formatSRPaginationPageText:function(t){return"na bladsy ".concat(t)},formatSRPaginationNextText:function(){return"volgende bladsy"},formatDetailPagination:function(t){return"".concat(t,"-reël vertoon")},formatClearSearch:function(){return"Duidelike soektog"},formatSearch:function(){return"Navorsing"},formatNoMatches:function(){return"Geen resultate nie"},formatPaginationSwitch:function(){return"Versteek/Wys paginasie"},formatPaginationSwitchDown:function(){return"Wys paginasie"},formatPaginationSwitchUp:function(){return"Versteek paginasie"},formatRefresh:function(){return"Verfris"},formatToggleOn:function(){return"Wys kaartaansig"},formatToggleOff:function(){return"Versteek kaartaansig"},formatColumns:function(){return"Kolomme"},formatColumnsToggleAll:function(){return"Wys alles"},formatFullscreen:function(){return"Volskerm"},formatAllRows:function(){return"Alles"},formatAutoRefresh:function(){return"Verfris outomaties"},formatExport:function(){return"Voer data uit"},formatJumpTo:function(){return"Gaan na"},formatAdvancedSearch:function(){return"Gevorderde soektog"},formatAdvancedCloseButton:function(){return"Maak"},formatFilterControlSwitch:function(){return"Versteek/Wys kontroles"},formatFilterControlSwitchHide:function(){return"Versteek kontroles"},formatFilterControlSwitchShow:function(){return"Wys kontroles"},formatToggleCustomViewOn:function(){return"Wys pasgemaakte aansig"},formatToggleCustomViewOff:function(){return"Versteek pasgemaakte aansig"},formatClearFilters:function(){return"Verwyder filters"},formatAddLevel:function(){return"Voeg 'n vlak by"},formatCancel:function(){return"Kanselleer"},formatColumn:function(){return"Kolom"},formatDeleteLevel:function(){return"Vee 'n vlak uit"},formatDuplicateAlertTitle:function(){return"Duplikaatinskrywings is gevind!"},formatDuplicateAlertDescription:function(){return"Verwyder of wysig asseblief duplikaatinskrywings"},formatMultipleSort:function(){return"Multi-sorteer"},formatOrder:function(){return"Bestelling"},formatSort:function(){return"Rangskik"},formatSortBy:function(){return"Sorteer volgens"},formatSortOrders:function(){return{asc:"Stygende",desc:"Dalende"}},formatThenBy:function(){return"Dan deur"}},Object.assign(t.fn.bootstrapTable.defaults,t.fn.bootstrapTable.locales["af-ZA"]),t.fn.bootstrapTable.locales["ca-ES"]=t.fn.bootstrapTable.locales.ca={formatCopyRows:function(){return"Copia resultats"},formatPrint:function(){return"Imprimeix"},formatLoadingMessage:function(){return"Espereu, si us plau"},formatRecordsPerPage:function(t){return"".concat(t," resultats per pàgina")},formatShowingRows:function(t,n,r,o){return void 0!==o&&o>0&&o>r?"Mostrant resultats ".concat(t," fins ").concat(n," - ").concat(r," resultats (filtrats d'un total de ").concat(o," resultats)"):"Mostrant resultats ".concat(t," fins ").concat(n," - ").concat(r," resultats en total")},formatSRPaginationPreText:function(){return"Pàgina anterior"},formatSRPaginationPageText:function(t){return"A la pàgina ".concat(t)},formatSRPaginationNextText:function(){return"Pàgina següent"},formatDetailPagination:function(t){return"Mostrant ".concat(t," resultats")},formatClearSearch:function(){return"Neteja cerca"},formatSearch:function(){return"Cerca"},formatNoMatches:function(){return"No s'han trobat resultats"},formatPaginationSwitch:function(){return"Amaga/Mostra paginació"},formatPaginationSwitchDown:function(){return"Mostra paginació"},formatPaginationSwitchUp:function(){return"Amaga paginació"},formatRefresh:function(){return"Refresca"},formatToggleOn:function(){return"Mostra vista de tarjeta"},formatToggleOff:function(){return"Amaga vista de tarjeta"},formatColumns:function(){return"Columnes"},formatColumnsToggleAll:function(){return"Alterna totes"},formatFullscreen:function(){return"Pantalla completa"},formatAllRows:function(){return"Tots"},formatAutoRefresh:function(){return"Auto Refresca"},formatExport:function(){return"Exporta dades"},formatJumpTo:function(){return"GO"},formatAdvancedSearch:function(){return"Cerca avançada"},formatAdvancedCloseButton:function(){return"Tanca"},formatFilterControlSwitch:function(){return"Mostra/Amaga controls"},formatFilterControlSwitchHide:function(){return"Mostra controls"},formatFilterControlSwitchShow:function(){return"Amaga controls"}},Object.assign(t.fn.bootstrapTable.defaults,t.fn.bootstrapTable.locales["ca-ES"]),t.fn.bootstrapTable.locales["ar-SA"]=t.fn.bootstrapTable.locales.ar={formatCopyRows:function(){return"نسخ الصفوف"},formatPrint:function(){return"طباعة"},formatLoadingMessage:function(){return"جارٍ التحميل، يرجى الانتظار..."},formatRecordsPerPage:function(t){return"".concat(t," صف لكل صفحة")},formatShowingRows:function(t,n,r,o){return void 0!==o&&o>0&&o>r?"الظاهر ".concat(t," إلى ").concat(n," من ").concat(r," سجل ").concat(o," إجمالي الصفوف)"):"الظاهر ".concat(t," إلى ").concat(n," من ").concat(r," سجل")},formatSRPaginationPreText:function(){return"الصفحة السابقة"},formatSRPaginationPageText:function(t){return"إلى الصفحة ".concat(t)},formatSRPaginationNextText:function(){return"الصفحة التالية"},formatDetailPagination:function(t){return"عرض ".concat(t," أعمدة")},formatClearSearch:function(){return"مسح مربع البحث"},formatSearch:function(){return"بحث"},formatNoMatches:function(){return"لا توجد نتائج مطابقة للبحث"},formatPaginationSwitch:function(){return"إخفاء/إظهار ترقيم الصفحات"},formatPaginationSwitchDown:function(){return"إظهار ترقيم الصفحات"},formatPaginationSwitchUp:function(){return"إخفاء ترقيم الصفحات"},formatRefresh:function(){return"تحديث"},formatToggleOn:function(){return"إظهار كبطاقات"},formatToggleOff:function(){return"إلغاء البطاقات"},formatColumns:function(){return"أعمدة"},formatColumnsToggleAll:function(){return"تبديل الكل"},formatFullscreen:function(){return"الشاشة كاملة"},formatAllRows:function(){return"الكل"},formatAutoRefresh:function(){return"تحديث تلقائي"},formatExport:function(){return"تصدير البيانات"},formatJumpTo:function(){return"قفز"},formatAdvancedSearch:function(){return"بحث متقدم"},formatAdvancedCloseButton:function(){return"إغلاق"},formatFilterControlSwitch:function(){return"عرض/إخفاء عناصر التصفية"},formatFilterControlSwitchHide:function(){return"إخفاء عناصر التصفية"},formatFilterControlSwitchShow:function(){return"عرض عناصر التصفية"}},Object.assign(t.fn.bootstrapTable.defaults,t.fn.bootstrapTable.locales["ar-SA"]),t.fn.bootstrapTable.locales["da-DK"]=t.fn.bootstrapTable.locales.da={formatCopyRows:function(){return"Copy Rows"},formatPrint:function(){return"Print"},formatLoadingMessage:function(){return"Indlæser, vent venligst"},formatRecordsPerPage:function(t){return"".concat(t," poster pr side")},formatShowingRows:function(t,n,r,o){return void 0!==o&&o>0&&o>r?"Viser ".concat(t," til ").concat(n," af ").concat(r," række").concat(r>1?"r":""," (filtered from ").concat(o," total rows)"):"Viser ".concat(t," til ").concat(n," af ").concat(r," række").concat(r>1?"r":"")},formatSRPaginationPreText:function(){return"previous page"},formatSRPaginationPageText:function(t){return"to page ".concat(t)},formatSRPaginationNextText:function(){return"next page"},formatDetailPagination:function(t){return"Viser ".concat(t," række").concat(t>1?"r":"")},formatClearSearch:function(){return"Ryd filtre"},formatSearch:function(){return"Søg"},formatNoMatches:function(){return"Ingen poster fundet"},formatPaginationSwitch:function(){return"Skjul/vis nummerering"},formatPaginationSwitchDown:function(){return"Show pagination"},formatPaginationSwitchUp:function(){return"Hide pagination"},formatRefresh:function(){return"Opdater"},formatToggleOn:function(){return"Show card view"},formatToggleOff:function(){return"Hide card view"},formatColumns:function(){return"Kolonner"},formatColumnsToggleAll:function(){return"Toggle all"},formatFullscreen:function(){return"Fullscreen"},formatAllRows:function(){return"Alle"},formatAutoRefresh:function(){return"Auto Refresh"},formatExport:function(){return"Eksporter"},formatJumpTo:function(){return"GO"},formatAdvancedSearch:function(){return"Advanced search"},formatAdvancedCloseButton:function(){return"Close"},formatFilterControlSwitch:function(){return"Hide/Show controls"},formatFilterControlSwitchHide:function(){return"Hide controls"},formatFilterControlSwitchShow:function(){return"Show controls"}},Object.assign(t.fn.bootstrapTable.defaults,t.fn.bootstrapTable.locales["da-DK"]),t.fn.bootstrapTable.locales["bg-BG"]=t.fn.bootstrapTable.locales.bg={formatCopyRows:function(){return"Копиране на редове"},formatPrint:function(){return"Печат"},formatLoadingMessage:function(){return"Зареждане, моля изчакайте"},formatRecordsPerPage:function(t){return"".concat(t," реда на страница")},formatShowingRows:function(t,n,r,o){return void 0!==o&&o>0&&o>r?"Показани редове от ".concat(t," до ").concat(n," от ").concat(r," (филтрирани от общо ").concat(o,")"):"Показани редове от ".concat(t," до ").concat(n," от общо ").concat(r)},formatSRPaginationPreText:function(){return"предишна страница"},formatSRPaginationPageText:function(t){return"до страница ".concat(t)},formatSRPaginationNextText:function(){return"следваща страница"},formatDetailPagination:function(t){return"Показани ".concat(t," реда")},formatClearSearch:function(){return"Изчистване на търсенето"},formatSearch:function(){return"Търсене"},formatNoMatches:function(){return"Не са намерени съвпадащи записи"},formatPaginationSwitch:function(){return"Скриване/Показване на странициране"},formatPaginationSwitchDown:function(){return"Показване на странициране"},formatPaginationSwitchUp:function(){return"Скриване на странициране"},formatRefresh:function(){return"Обновяване"},formatToggleOn:function(){return"Показване на изглед карта"},formatToggleOff:function(){return"Скриване на изглед карта"},formatColumns:function(){return"Колони"},formatColumnsToggleAll:function(){return"Превключване на всички"},formatFullscreen:function(){return"Цял екран"},formatAllRows:function(){return"Всички"},formatAutoRefresh:function(){return"Автоматично обновяване"},formatExport:function(){return"Експорт на данни"},formatJumpTo:function(){return"ОТИДИ"},formatAdvancedSearch:function(){return"Разширено търсене"},formatAdvancedCloseButton:function(){return"Затваряне"},formatFilterControlSwitch:function(){return"Скрива/показва контроли"},formatFilterControlSwitchHide:function(){return"Скрива контроли"},formatFilterControlSwitchShow:function(){return"Показва контроли"}},Object.assign(t.fn.bootstrapTable.defaults,t.fn.bootstrapTable.locales["bg-BG"]),t.fn.bootstrapTable.locales["de-DE"]=t.fn.bootstrapTable.locales.de={formatCopyRows:function(){return"Zeilen kopieren"},formatPrint:function(){return"Drucken"},formatLoadingMessage:function(){return"Lade, bitte warten"},formatRecordsPerPage:function(t){return"".concat(t," Zeilen pro Seite.")},formatShowingRows:function(t,n,r,o){return void 0!==o&&o>0&&o>r?"Zeige Zeile ".concat(t," bis ").concat(n," von ").concat(r," Zeile").concat(r>1?"n":""," (Gefiltert von ").concat(o," Zeile").concat(o>1?"n":"",")"):"Zeige Zeile ".concat(t," bis ").concat(n," von ").concat(r," Zeile").concat(r>1?"n":"",".")},formatSRPaginationPreText:function(){return"Vorherige Seite"},formatSRPaginationPageText:function(t){return"Zu Seite ".concat(t)},formatSRPaginationNextText:function(){return"Nächste Seite"},formatDetailPagination:function(t){return"Zeige ".concat(t," Zeile").concat(t>1?"n":"",".")},formatClearSearch:function(){return"Lösche Filter"},formatSearch:function(){return"Suchen"},formatNoMatches:function(){return"Keine passenden Ergebnisse gefunden"},formatPaginationSwitch:function(){return"Verstecke/Zeige Nummerierung"},formatPaginationSwitchDown:function(){return"Zeige Nummerierung"},formatPaginationSwitchUp:function(){return"Verstecke Nummerierung"},formatRefresh:function(){return"Neu laden"},formatToggleOn:function(){return"Normale Ansicht"},formatToggleOff:function(){return"Kartenansicht"},formatColumns:function(){return"Spalten"},formatColumnsToggleAll:function(){return"Alle umschalten"},formatFullscreen:function(){return"Vollbild"},formatAllRows:function(){return"Alle"},formatAutoRefresh:function(){return"Automatisches Neuladen"},formatExport:function(){return"Datenexport"},formatJumpTo:function(){return"Springen"},formatAdvancedSearch:function(){return"Erweiterte Suche"},formatAdvancedCloseButton:function(){return"Schließen"},formatFilterControlSwitch:function(){return"Verstecke/Zeige Filter"},formatFilterControlSwitchHide:function(){return"Verstecke Filter"},formatFilterControlSwitchShow:function(){return"Zeige Filter"},formatAddLevel:function(){return"Ebene hinzufügen"},formatCancel:function(){return"Abbrechen"},formatColumn:function(){return"Spalte"},formatDeleteLevel:function(){return"Ebene entfernen"},formatDuplicateAlertTitle:function(){return"Doppelte Einträge gefunden!"},formatDuplicateAlertDescription:function(){return"Bitte doppelte Spalten entfenen oder ändern"},formatMultipleSort:function(){return"Mehrfachsortierung"},formatOrder:function(){return"Reihenfolge"},formatSort:function(){return"Sortieren"},formatSortBy:function(){return"Sortieren nach"},formatThenBy:function(){return"anschließend"},formatSortOrders:function(){return{asc:"Aufsteigend",desc:"Absteigend"}}},Object.assign(t.fn.bootstrapTable.defaults,t.fn.bootstrapTable.locales["de-DE"]),t.fn.bootstrapTable.locales["el-GR"]=t.fn.bootstrapTable.locales.el={formatCopyRows:function(){return"Copy Rows"},formatPrint:function(){return"Print"},formatLoadingMessage:function(){return"Φορτώνει, παρακαλώ περιμένετε"},formatRecordsPerPage:function(t){return"".concat(t," αποτελέσματα ανά σελίδα")},formatShowingRows:function(t,n,r,o){return void 0!==o&&o>0&&o>r?"Εμφανίζονται από την ".concat(t," ως την ").concat(n," από σύνολο ").concat(r," σειρών (filtered from ").concat(o," total rows)"):"Εμφανίζονται από την ".concat(t," ως την ").concat(n," από σύνολο ").concat(r," σειρών")},formatSRPaginationPreText:function(){return"previous page"},formatSRPaginationPageText:function(t){return"to page ".concat(t)},formatSRPaginationNextText:function(){return"next page"},formatDetailPagination:function(t){return"Showing ".concat(t," rows")},formatClearSearch:function(){return"Clear Search"},formatSearch:function(){return"Αναζητήστε"},formatNoMatches:function(){return"Δεν βρέθηκαν αποτελέσματα"},formatPaginationSwitch:function(){return"Hide/Show pagination"},formatPaginationSwitchDown:function(){return"Show pagination"},formatPaginationSwitchUp:function(){return"Hide pagination"},formatRefresh:function(){return"Refresh"},formatToggleOn:function(){return"Show card view"},formatToggleOff:function(){return"Hide card view"},formatColumns:function(){return"Columns"},formatColumnsToggleAll:function(){return"Toggle all"},formatFullscreen:function(){return"Fullscreen"},formatAllRows:function(){return"All"},formatAutoRefresh:function(){return"Auto Refresh"},formatExport:function(){return"Export data"},formatJumpTo:function(){return"GO"},formatAdvancedSearch:function(){return"Advanced search"},formatAdvancedCloseButton:function(){return"Close"},formatFilterControlSwitch:function(){return"Hide/Show controls"},formatFilterControlSwitchHide:function(){return"Hide controls"},formatFilterControlSwitchShow:function(){return"Show controls"}},Object.assign(t.fn.bootstrapTable.defaults,t.fn.bootstrapTable.locales["el-GR"]),t.fn.bootstrapTable.locales["es-CR"]={formatCopyRows:function(){return"Copiar filas"},formatPrint:function(){return"Imprimir"},formatLoadingMessage:function(){return"Cargando, por favor espere"},formatRecordsPerPage:function(t){return"".concat(t," filas por página")},formatShowingRows:function(t,n,r,o){return void 0!==o&&o>0&&o>r?"Mostrando ".concat(t," a ").concat(n," de ").concat(r," filas (filtrado de un total de ").concat(o," filas)"):"Mostrando ".concat(t," a ").concat(n," de ").concat(r," filas")},formatSRPaginationPreText:function(){return"página anterior"},formatSRPaginationPageText:function(t){return"ir a la página ".concat(t)},formatSRPaginationNextText:function(){return"página siguiente"},formatDetailPagination:function(t){return"Mostrando ".concat(t," filas")},formatClearSearch:function(){return"Limpiar búsqueda"},formatSearch:function(){return"Buscar"},formatNoMatches:function(){return"No se encontraron resultados"},formatPaginationSwitch:function(){return"Mostrar/ocultar paginación"},formatPaginationSwitchDown:function(){return"Mostrar paginación"},formatPaginationSwitchUp:function(){return"Ocultar paginación"},formatRefresh:function(){return"Actualizar"},formatToggleOn:function(){return"Mostrar vista en tarjetas"},formatToggleOff:function(){return"Ocultar vista en tarjetas"},formatColumns:function(){return"Columnas"},formatColumnsToggleAll:function(){return"Alternar todo"},formatFullscreen:function(){return"Pantalla completa"},formatAllRows:function(){return"Todas las filas"},formatAutoRefresh:function(){return"Actualización automática"},formatExport:function(){return"Exportar"},formatJumpTo:function(){return"Ver"},formatAdvancedSearch:function(){return"Búsqueda avanzada"},formatAdvancedCloseButton:function(){return"Cerrar"},formatFilterControlSwitch:function(){return"Mostrar/ocultar controles"},formatFilterControlSwitchHide:function(){return"Ocultar controles"},formatFilterControlSwitchShow:function(){return"Mostrar controles"}},Object.assign(t.fn.bootstrapTable.defaults,t.fn.bootstrapTable.locales["es-CR"]),t.fn.bootstrapTable.locales["en-US"]=t.fn.bootstrapTable.locales.en={formatCopyRows:function(){return"Copy Rows"},formatPrint:function(){return"Print"},formatLoadingMessage:function(){return"Loading, please wait"},formatRecordsPerPage:function(t){return"".concat(t," rows per page")},formatShowingRows:function(t,n,r,o){return void 0!==o&&o>0&&o>r?"Showing ".concat(t," to ").concat(n," of ").concat(r," rows (filtered from ").concat(o," total rows)"):"Showing ".concat(t," to ").concat(n," of ").concat(r," rows")},formatSRPaginationPreText:function(){return"previous page"},formatSRPaginationPageText:function(t){return"to page ".concat(t)},formatSRPaginationNextText:function(){return"next page"},formatDetailPagination:function(t){return"Showing ".concat(t," rows")},formatClearSearch:function(){return"Clear Search"},formatSearch:function(){return"Search"},formatNoMatches:function(){return"No matching records found"},formatPaginationSwitch:function(){return"Hide/Show pagination"},formatPaginationSwitchDown:function(){return"Show pagination"},formatPaginationSwitchUp:function(){return"Hide pagination"},formatRefresh:function(){return"Refresh"},formatToggleOn:function(){return"Show card view"},formatToggleOff:function(){return"Hide card view"},formatColumns:function(){return"Columns"},formatColumnsToggleAll:function(){return"Toggle all"},formatFullscreen:function(){return"Fullscreen"},formatAllRows:function(){return"All"},formatAutoRefresh:function(){return"Auto Refresh"},formatExport:function(){return"Export data"},formatJumpTo:function(){return"GO"},formatAdvancedSearch:function(){return"Advanced search"},formatAdvancedCloseButton:function(){return"Close"},formatFilterControlSwitch:function(){return"Hide/Show controls"},formatFilterControlSwitchHide:function(){return"Hide controls"},formatFilterControlSwitchShow:function(){return"Show controls"}},Object.assign(t.fn.bootstrapTable.defaults,t.fn.bootstrapTable.locales["en-US"]),t.fn.bootstrapTable.locales["es-CL"]={formatCopyRows:function(){return"Copiar Filas"},formatPrint:function(){return"Imprimir"},formatLoadingMessage:function(){return"Cargando, espere por favor"},formatRecordsPerPage:function(t){return"".concat(t," filas por página")},formatShowingRows:function(t,n,r,o){return void 0!==o&&o>0&&o>r?"Mostrando ".concat(t," a ").concat(n," de ").concat(r," filas (filtrado de ").concat(o," filas totales)"):"Mostrando ".concat(t," a ").concat(n," de ").concat(r," filas")},formatSRPaginationPreText:function(){return"página anterior"},formatSRPaginationPageText:function(t){return"a la página ".concat(t)},formatSRPaginationNextText:function(){return"siguiente página"},formatDetailPagination:function(t){return"Mostrando ".concat(t," filas")},formatClearSearch:function(){return"Limpiar búsqueda"},formatSearch:function(){return"Buscar"},formatNoMatches:function(){return"No se encontraron registros"},formatPaginationSwitch:function(){return"Ocultar/Mostrar paginación"},formatPaginationSwitchDown:function(){return"Mostrar paginación"},formatPaginationSwitchUp:function(){return"Ocultar paginación"},formatRefresh:function(){return"Refrescar"},formatToggleOn:function(){return"Mostrar vista de carta"},formatToggleOff:function(){return"Ocultar vista de carta"},formatColumns:function(){return"Columnas"},formatColumnsToggleAll:function(){return"Cambiar todo"},formatFullscreen:function(){return"Pantalla completa"},formatAllRows:function(){return"Todo"},formatAutoRefresh:function(){return"Auto Recargar"},formatExport:function(){return"Exportar datos"},formatJumpTo:function(){return"IR"},formatAdvancedSearch:function(){return"Búsqueda avanzada"},formatAdvancedCloseButton:function(){return"Cerrar"},formatFilterControlSwitch:function(){return"Ocultar/Mostrar controles"},formatFilterControlSwitchHide:function(){return"Ocultar controles"},formatFilterControlSwitchShow:function(){return"Mostrar controles"}},Object.assign(t.fn.bootstrapTable.defaults,t.fn.bootstrapTable.locales["es-CL"]),t.fn.bootstrapTable.locales["es-ES"]=t.fn.bootstrapTable.locales.es={formatCopyRows:function(){return"Copiar filas"},formatPrint:function(){return"Imprimir"},formatLoadingMessage:function(){return"Cargando, por favor espere"},formatRecordsPerPage:function(t){return"".concat(t," resultados por página")},formatShowingRows:function(t,n,r,o){var e=r>1?"s":"";return void 0!==o&&o>0&&o>r?"Mostrando desde ".concat(t," hasta ").concat(n," - En total ").concat(r," resultado").concat(e," (filtrado de un total de ").concat(o," fila").concat(e,")"):"Mostrando desde ".concat(t," hasta ").concat(n," - En total ").concat(r," resultado").concat(e)},formatSRPaginationPreText:function(){return"página anterior"},formatSRPaginationPageText:function(t){return"a la página ".concat(t)},formatSRPaginationNextText:function(){return"siguiente página"},formatDetailPagination:function(t){return"Mostrando ".concat(t," fila").concat(t>1?"s":"")},formatClearSearch:function(){return"Limpiar búsqueda"},formatSearch:function(){return"Buscar"},formatNoMatches:function(){return"No se encontraron resultados coincidentes"},formatPaginationSwitch:function(){return"Ocultar/Mostrar paginación"},formatPaginationSwitchDown:function(){return"Mostrar paginación"},formatPaginationSwitchUp:function(){return"Ocultar paginación"},formatRefresh:function(){return"Recargar"},formatToggleOn:function(){return"Mostrar vista de carta"},formatToggleOff:function(){return"Ocultar vista de carta"},formatColumns:function(){return"Columnas"},formatColumnsToggleAll:function(){return"Cambiar todo"},formatFullscreen:function(){return"Pantalla completa"},formatAllRows:function(){return"Todos"},formatAutoRefresh:function(){return"Auto Recargar"},formatExport:function(){return"Exportar los datos"},formatJumpTo:function(){return"IR"},formatAdvancedSearch:function(){return"Búsqueda avanzada"},formatAdvancedCloseButton:function(){return"Cerrar"},formatFilterControlSwitch:function(){return"Ocultar/Exibir controles"},formatFilterControlSwitchHide:function(){return"Ocultar controles"},formatFilterControlSwitchShow:function(){return"Mostrar controles"},formatAddLevel:function(){return"Agregar nivel"},formatCancel:function(){return"Cancelar"},formatColumn:function(){return"Columna"},formatDeleteLevel:function(){return"Eliminar nivel"},formatDuplicateAlertTitle:function(){return"¡Se encontraron entradas duplicadas!"},formatDuplicateAlertDescription:function(){return"Por favor, elimine o modifique las columnas duplicadas"},formatMultipleSort:function(){return"Ordenación múltiple"},formatOrder:function(){return"Orden"},formatSort:function(){return"Ordenar"},formatSortBy:function(){return"Ordenar por"},formatThenBy:function(){return"a continuación"},formatSortOrders:function(){return{asc:"Ascendente",desc:"Descendente"}}},Object.assign(t.fn.bootstrapTable.defaults,t.fn.bootstrapTable.locales["es-ES"]),t.fn.bootstrapTable.locales["es-MX"]={formatCopyRows:function(){return"Copiar Filas"},formatPrint:function(){return"Imprimir"},formatLoadingMessage:function(){return"Cargando, espere por favor"},formatRecordsPerPage:function(t){return"".concat(t," resultados por página")},formatShowingRows:function(t,n,r,o){return void 0!==o&&o>0&&o>r?"Mostrando ".concat(t," a ").concat(n," de ").concat(r," filas (filtrado de ").concat(o," filas totales)"):"Mostrando ".concat(t," a ").concat(n," de ").concat(r," filas")},formatSRPaginationPreText:function(){return"página anterior"},formatSRPaginationPageText:function(t){return"ir a la página ".concat(t)},formatSRPaginationNextText:function(){return"página siguiente"},formatDetailPagination:function(t){return"Mostrando ".concat(t," filas")},formatClearSearch:function(){return"Limpiar búsqueda"},formatSearch:function(){return"Buscar"},formatNoMatches:function(){return"No se encontraron registros que coincidan"},formatPaginationSwitch:function(){return"Mostrar/ocultar paginación"},formatPaginationSwitchDown:function(){return"Mostrar paginación"},formatPaginationSwitchUp:function(){return"Ocultar paginación"},formatRefresh:function(){return"Actualizar"},formatToggleOn:function(){return"Mostrar vista"},formatToggleOff:function(){return"Ocultar vista"},formatColumns:function(){return"Columnas"},formatColumnsToggleAll:function(){return"Alternar todo"},formatFullscreen:function(){return"Pantalla completa"},formatAllRows:function(){return"Todo"},formatAutoRefresh:function(){return"Auto actualizar"},formatExport:function(){return"Exportar datos"},formatJumpTo:function(){return"IR"},formatAdvancedSearch:function(){return"Búsqueda avanzada"},formatAdvancedCloseButton:function(){return"Cerrar"},formatFilterControlSwitch:function(){return"Ocultar/Mostrar controles"},formatFilterControlSwitchHide:function(){return"Ocultar controles"},formatFilterControlSwitchShow:function(){return"Mostrar controles"}},Object.assign(t.fn.bootstrapTable.defaults,t.fn.bootstrapTable.locales["es-MX"]),t.fn.bootstrapTable.locales["es-NI"]={formatCopyRows:function(){return"Copy Rows"},formatPrint:function(){return"Print"},formatLoadingMessage:function(){return"Cargando, por favor espere"},formatRecordsPerPage:function(t){return"".concat(t," registros por página")},formatShowingRows:function(t,n,r,o){return void 0!==o&&o>0&&o>r?"Mostrando de ".concat(t," a ").concat(n," registros de ").concat(r," registros en total (filtered from ").concat(o," total rows)"):"Mostrando de ".concat(t," a ").concat(n," registros de ").concat(r," registros en total")},formatSRPaginationPreText:function(){return"previous page"},formatSRPaginationPageText:function(t){return"to page ".concat(t)},formatSRPaginationNextText:function(){return"next page"},formatDetailPagination:function(t){return"Showing ".concat(t," rows")},formatClearSearch:function(){return"Limpiar búsqueda"},formatSearch:function(){return"Buscar"},formatNoMatches:function(){return"No se encontraron registros"},formatPaginationSwitch:function(){return"Hide/Show pagination"},formatPaginationSwitchDown:function(){return"Show pagination"},formatPaginationSwitchUp:function(){return"Hide pagination"},formatRefresh:function(){return"Refrescar"},formatToggleOn:function(){return"Show card view"},formatToggleOff:function(){return"Hide card view"},formatColumns:function(){return"Columnas"},formatColumnsToggleAll:function(){return"Toggle all"},formatFullscreen:function(){return"Fullscreen"},formatAllRows:function(){return"Todo"},formatAutoRefresh:function(){return"Auto Refresh"},formatExport:function(){return"Export data"},formatJumpTo:function(){return"GO"},formatAdvancedSearch:function(){return"Advanced search"},formatAdvancedCloseButton:function(){return"Close"},formatFilterControlSwitch:function(){return"Ocultar/Mostrar controles"},formatFilterControlSwitchHide:function(){return"Ocultar controles"},formatFilterControlSwitchShow:function(){return"Mostrar controles"}},Object.assign(t.fn.bootstrapTable.defaults,t.fn.bootstrapTable.locales["es-NI"]),t.fn.bootstrapTable.locales["es-SP"]={formatCopyRows:function(){return"Copy Rows"},formatPrint:function(){return"Print"},formatLoadingMessage:function(){return"Cargando, por favor espera"},formatRecordsPerPage:function(t){return"".concat(t," registros por p&#225;gina.")},formatShowingRows:function(t,n,r,o){return void 0!==o&&o>0&&o>r?"".concat(t," - ").concat(n," de ").concat(r," registros (filtered from ").concat(o," total rows)"):"".concat(t," - ").concat(n," de ").concat(r," registros.")},formatSRPaginationPreText:function(){return"previous page"},formatSRPaginationPageText:function(t){return"to page ".concat(t)},formatSRPaginationNextText:function(){return"next page"},formatDetailPagination:function(t){return"Showing ".concat(t," rows")},formatClearSearch:function(){return"Limpiar búsqueda"},formatSearch:function(){return"Buscar"},formatNoMatches:function(){return"No se han encontrado registros."},formatPaginationSwitch:function(){return"Hide/Show pagination"},formatPaginationSwitchDown:function(){return"Show pagination"},formatPaginationSwitchUp:function(){return"Hide pagination"},formatRefresh:function(){return"Actualizar"},formatToggleOn:function(){return"Show card view"},formatToggleOff:function(){return"Hide card view"},formatColumns:function(){return"Columnas"},formatColumnsToggleAll:function(){return"Toggle all"},formatFullscreen:function(){return"Fullscreen"},formatAllRows:function(){return"Todo"},formatAutoRefresh:function(){return"Auto Refresh"},formatExport:function(){return"Export data"},formatJumpTo:function(){return"GO"},formatAdvancedSearch:function(){return"Advanced search"},formatAdvancedCloseButton:function(){return"Close"},formatFilterControlSwitch:function(){return"Ocultar/Mostrar controles"},formatFilterControlSwitchHide:function(){return"Ocultar controles"},formatFilterControlSwitchShow:function(){return"Mostrar controles"}},Object.assign(t.fn.bootstrapTable.defaults,t.fn.bootstrapTable.locales["es-SP"]),t.fn.bootstrapTable.locales["eu-EU"]=t.fn.bootstrapTable.locales.eu={formatCopyRows:function(){return"Copy Rows"},formatPrint:function(){return"Print"},formatLoadingMessage:function(){return"Itxaron mesedez"},formatRecordsPerPage:function(t){return"".concat(t," emaitza orriko.")},formatShowingRows:function(t,n,r,o){return void 0!==o&&o>0&&o>r?"".concat(r," erregistroetatik ").concat(t,"etik ").concat(n,"erakoak erakusten (filtered from ").concat(o," total rows)"):"".concat(r," erregistroetatik ").concat(t,"etik ").concat(n,"erakoak erakusten.")},formatSRPaginationPreText:function(){return"previous page"},formatSRPaginationPageText:function(t){return"to page ".concat(t)},formatSRPaginationNextText:function(){return"next page"},formatDetailPagination:function(t){return"Showing ".concat(t," rows")},formatClearSearch:function(){return"Clear Search"},formatSearch:function(){return"Bilatu"},formatNoMatches:function(){return"Ez da emaitzarik aurkitu"},formatPaginationSwitch:function(){return"Ezkutatu/Erakutsi orrikatzea"},formatPaginationSwitchDown:function(){return"Show pagination"},formatPaginationSwitchUp:function(){return"Hide pagination"},formatRefresh:function(){return"Eguneratu"},formatToggleOn:function(){return"Show card view"},formatToggleOff:function(){return"Hide card view"},formatColumns:function(){return"Zutabeak"},formatColumnsToggleAll:function(){return"Toggle all"},formatFullscreen:function(){return"Fullscreen"},formatAllRows:function(){return"Guztiak"},formatAutoRefresh:function(){return"Auto Refresh"},formatExport:function(){return"Export data"},formatJumpTo:function(){return"GO"},formatAdvancedSearch:function(){return"Advanced search"},formatAdvancedCloseButton:function(){return"Close"},formatFilterControlSwitch:function(){return"Hide/Show controls"},formatFilterControlSwitchHide:function(){return"Hide controls"},formatFilterControlSwitchShow:function(){return"Show controls"}},Object.assign(t.fn.bootstrapTable.defaults,t.fn.bootstrapTable.locales["eu-EU"]),t.fn.bootstrapTable.locales["cs-CZ"]=t.fn.bootstrapTable.locales.cs={formatCopyRows:function(){return"Kopírovat řádky"},formatPrint:function(){return"Tisk"},formatLoadingMessage:function(){return"Čekejte, prosím"},formatRecordsPerPage:function(t){return"".concat(t," položek na stránku")},formatShowingRows:function(t,n,r,o){return void 0!==o&&o>0&&o>r?"Zobrazena ".concat(t,". - ").concat(n," . položka z celkových ").concat(r," (filtered from ").concat(o," total rows)"):"Zobrazena ".concat(t,". - ").concat(n," . položka z celkových ").concat(r)},formatSRPaginationPreText:function(){return"předchozí strana"},formatSRPaginationPageText:function(t){return"na stranu ".concat(t)},formatSRPaginationNextText:function(){return"další strana"},formatDetailPagination:function(t){return"Zobrazuji ".concat(t," řádek")},formatClearSearch:function(){return"Smazat hledání"},formatSearch:function(){return"Vyhledávání"},formatNoMatches:function(){return"Nenalezena žádná vyhovující položka"},formatPaginationSwitch:function(){return"Skrýt/Zobrazit stránkování"},formatPaginationSwitchDown:function(){return"Zobrazit stránkování"},formatPaginationSwitchUp:function(){return"Skrýt stránkování"},formatRefresh:function(){return"Aktualizovat"},formatToggleOn:function(){return"Zobrazit karty"},formatToggleOff:function(){return"Zobrazit tabulku"},formatColumns:function(){return"Sloupce"},formatColumnsToggleAll:function(){return"Zobrazit/Skrýt vše"},formatFullscreen:function(){return"Zapnout/Vypnout fullscreen"},formatAllRows:function(){return"Vše"},formatAutoRefresh:function(){return"Automatické obnovení"},formatExport:function(){return"Export dat"},formatJumpTo:function(){return"GO"},formatAdvancedSearch:function(){return"Pokročilé hledání"},formatAdvancedCloseButton:function(){return"Zavřít"},formatFilterControlSwitch:function(){return"Skrýt/Zobrazit ovladače"},formatFilterControlSwitchHide:function(){return"Skrýt ovladače"},formatFilterControlSwitchShow:function(){return"Zobrazit ovladače"}},Object.assign(t.fn.bootstrapTable.defaults,t.fn.bootstrapTable.locales["cs-CZ"]),t.fn.bootstrapTable.locales["et-EE"]=t.fn.bootstrapTable.locales.et={formatCopyRows:function(){return"Copy Rows"},formatPrint:function(){return"Print"},formatLoadingMessage:function(){return"Päring käib, palun oota"},formatRecordsPerPage:function(t){return"".concat(t," rida lehe kohta")},formatShowingRows:function(t,n,r,o){return void 0!==o&&o>0&&o>r?"Näitan tulemusi ".concat(t," kuni ").concat(n," - kokku ").concat(r," tulemust (filtered from ").concat(o," total rows)"):"Näitan tulemusi ".concat(t," kuni ").concat(n," - kokku ").concat(r," tulemust")},formatSRPaginationPreText:function(){return"previous page"},formatSRPaginationPageText:function(t){return"to page ".concat(t)},formatSRPaginationNextText:function(){return"next page"},formatDetailPagination:function(t){return"Showing ".concat(t," rows")},formatClearSearch:function(){return"Clear Search"},formatSearch:function(){return"Otsi"},formatNoMatches:function(){return"Päringu tingimustele ei vastanud ühtegi tulemust"},formatPaginationSwitch:function(){return"Näita/Peida lehtedeks jagamine"},formatPaginationSwitchDown:function(){return"Show pagination"},formatPaginationSwitchUp:function(){return"Hide pagination"},formatRefresh:function(){return"Värskenda"},formatToggleOn:function(){return"Show card view"},formatToggleOff:function(){return"Hide card view"},formatColumns:function(){return"Veerud"},formatColumnsToggleAll:function(){return"Toggle all"},formatFullscreen:function(){return"Fullscreen"},formatAllRows:function(){return"Kõik"},formatAutoRefresh:function(){return"Auto Refresh"},formatExport:function(){return"Export data"},formatJumpTo:function(){return"GO"},formatAdvancedSearch:function(){return"Advanced search"},formatAdvancedCloseButton:function(){return"Close"},formatFilterControlSwitch:function(){return"Hide/Show controls"},formatFilterControlSwitchHide:function(){return"Hide controls"},formatFilterControlSwitchShow:function(){return"Show controls"}},Object.assign(t.fn.bootstrapTable.defaults,t.fn.bootstrapTable.locales["et-EE"]),t.fn.bootstrapTable.locales["fi-FI"]=t.fn.bootstrapTable.locales.fi={formatCopyRows:function(){return"Copy Rows"},formatPrint:function(){return"Print"},formatLoadingMessage:function(){return"Ladataan, ole hyvä ja odota"},formatRecordsPerPage:function(t){return"".concat(t," riviä sivulla")},formatShowingRows:function(t,n,r,o){return void 0!==o&&o>0&&o>r?"Näytetään rivit ".concat(t," - ").concat(n," / ").concat(r," (filtered from ").concat(o," total rows)"):"Näytetään rivit ".concat(t," - ").concat(n," / ").concat(r)},formatSRPaginationPreText:function(){return"previous page"},formatSRPaginationPageText:function(t){return"to page ".concat(t)},formatSRPaginationNextText:function(){return"next page"},formatDetailPagination:function(t){return"Showing ".concat(t," rows")},formatClearSearch:function(){return"Poista suodattimet"},formatSearch:function(){return"Hae"},formatNoMatches:function(){return"Hakuehtoja vastaavia tuloksia ei löytynyt"},formatPaginationSwitch:function(){return"Näytä/Piilota sivutus"},formatPaginationSwitchDown:function(){return"Show pagination"},formatPaginationSwitchUp:function(){return"Hide pagination"},formatRefresh:function(){return"Päivitä"},formatToggleOn:function(){return"Show card view"},formatToggleOff:function(){return"Hide card view"},formatColumns:function(){return"Sarakkeet"},formatColumnsToggleAll:function(){return"Toggle all"},formatFullscreen:function(){return"Fullscreen"},formatAllRows:function(){return"Kaikki"},formatAutoRefresh:function(){return"Auto Refresh"},formatExport:function(){return"Vie tiedot"},formatJumpTo:function(){return"GO"},formatAdvancedSearch:function(){return"Advanced search"},formatAdvancedCloseButton:function(){return"Close"},formatFilterControlSwitch:function(){return"Hide/Show controls"},formatFilterControlSwitchHide:function(){return"Hide controls"},formatFilterControlSwitchShow:function(){return"Show controls"}},Object.assign(t.fn.bootstrapTable.defaults,t.fn.bootstrapTable.locales["fi-FI"]),t.fn.bootstrapTable.locales["fa-IR"]=t.fn.bootstrapTable.locales.fa={formatCopyRows:function(){return"کپی ردیف ها"},formatPrint:function(){return"پرینت"},formatLoadingMessage:function(){return"در حال بارگذاری, لطفا صبر کنید"},formatRecordsPerPage:function(t){return"".concat(t," رکورد در صفحه")},formatShowingRows:function(t,n,r,o){return void 0!==o&&o>0&&o>r?"نمایش ".concat(t," تا ").concat(n," از ").concat(r," ردیف (filtered from ").concat(o," total rows)"):"نمایش ".concat(t," تا ").concat(n," از ").concat(r," ردیف")},formatSRPaginationPreText:function(){return"صفحه قبلی"},formatSRPaginationPageText:function(t){return"به صفحه ".concat(t)},formatSRPaginationNextText:function(){return"صفحه بعدی"},formatDetailPagination:function(t){return"نمایش ".concat(t," سطرها")},formatClearSearch:function(){return"پاک کردن جستجو"},formatSearch:function(){return"جستجو"},formatNoMatches:function(){return"رکوردی یافت نشد."},formatPaginationSwitch:function(){return"نمایش/مخفی صفحه بندی"},formatPaginationSwitchDown:function(){return"نمایش صفحه بندی"},formatPaginationSwitchUp:function(){return"پنهان کردن صفحه بندی"},formatRefresh:function(){return"به روز رسانی"},formatToggleOn:function(){return"Show card view"},formatToggleOff:function(){return"Hide card view"},formatColumns:function(){return"سطر ها"},formatColumnsToggleAll:function(){return"تغییر وضعیت همه"},formatFullscreen:function(){return"تمام صفحه"},formatAllRows:function(){return"همه"},formatAutoRefresh:function(){return"رفرش اتوماتیک"},formatExport:function(){return"خروجی دیتا"},formatJumpTo:function(){return"برو"},formatAdvancedSearch:function(){return"جستجوی پیشرفته"},formatAdvancedCloseButton:function(){return"بستن"},formatFilterControlSwitch:function(){return"پنهان/نمایش دادن کنترل ها"},formatFilterControlSwitchHide:function(){return"پنهان کردن کنترل ها"},formatFilterControlSwitchShow:function(){return"نمایش کنترل ها"}},Object.assign(t.fn.bootstrapTable.defaults,t.fn.bootstrapTable.locales["fa-IR"]),t.fn.bootstrapTable.locales["fr-BE"]={formatCopyRows:function(){return"Copier les lignes"},formatPrint:function(){return"Imprimer"},formatLoadingMessage:function(){return"Chargement en cours"},formatRecordsPerPage:function(t){return"".concat(t," lignes par page")},formatShowingRows:function(t,n,r,o){return void 0!==o&&o>0&&o>r?"Affichage de ".concat(t," à ").concat(n," sur ").concat(r," lignes (filtrées à partir de ").concat(o," lignes)"):"Affichage de ".concat(t," à ").concat(n," sur ").concat(r," lignes")},formatSRPaginationPreText:function(){return"page précédente"},formatSRPaginationPageText:function(t){return"vers la page ".concat(t)},formatSRPaginationNextText:function(){return"page suivante"},formatDetailPagination:function(t){return"Affichage de ".concat(t," lignes")},formatClearSearch:function(){return"Effacer la recherche"},formatSearch:function(){return"Rechercher"},formatNoMatches:function(){return"Aucun résultat"},formatPaginationSwitch:function(){return"Masquer/Afficher la pagination"},formatPaginationSwitchDown:function(){return"Afficher la pagination"},formatPaginationSwitchUp:function(){return"Masquer la pagination"},formatRefresh:function(){return"Actualiser"},formatToggleOn:function(){return"Afficher la vue en cartes"},formatToggleOff:function(){return"Cacher la vue en cartes"},formatColumns:function(){return"Colonnes"},formatColumnsToggleAll:function(){return"Tout afficher"},formatFullscreen:function(){return"Plein écran"},formatAllRows:function(){return"Tout"},formatAutoRefresh:function(){return"Actualiser automatiquement"},formatExport:function(){return"Exporter"},formatJumpTo:function(){return"Aller à"},formatAdvancedSearch:function(){return"Recherche avancée"},formatAdvancedCloseButton:function(){return"Fermer"},formatFilterControlSwitch:function(){return"Masquer/Afficher les contrôles"},formatFilterControlSwitchHide:function(){return"Masquer les contrôles"},formatFilterControlSwitchShow:function(){return"Afficher les contrôles"},formatToggleCustomViewOn:function(){return"Afficher la vue personnalisée"},formatToggleCustomViewOff:function(){return"Cacher la vue personnalisée"},formatClearFilters:function(){return"Retirer les filtres"},formatAddLevel:function(){return"Ajouter un niveau"},formatCancel:function(){return"Annuler"},formatColumn:function(){return"Colonne"},formatDeleteLevel:function(){return"Supprimer un niveau"},formatDuplicateAlertTitle:function(){return"Des entrées en double ont été trouvées !"},formatDuplicateAlertDescription:function(){return"Veuillez supprimer ou modifier les entrées en double"},formatMultipleSort:function(){return"Tri multiple"},formatOrder:function(){return"Ordre"},formatSort:function(){return"Trier"},formatSortBy:function(){return"Trier par"},formatSortOrders:function(){return{asc:"Ascendant",desc:"Descendant"}},formatThenBy:function(){return"Puis par"}},Object.assign(t.fn.bootstrapTable.defaults,t.fn.bootstrapTable.locales["fr-BE"]),t.fn.bootstrapTable.locales["fr-CH"]={formatCopyRows:function(){return"Copier les lignes"},formatPrint:function(){return"Imprimer"},formatLoadingMessage:function(){return"Chargement en cours"},formatRecordsPerPage:function(t){return"".concat(t," lignes par page")},formatShowingRows:function(t,n,r,o){return void 0!==o&&o>0&&o>r?"Affichage de ".concat(t," à ").concat(n," sur ").concat(r," lignes (filtrées à partir de ").concat(o," lignes)"):"Affichage de ".concat(t," à ").concat(n," sur ").concat(r," lignes")},formatSRPaginationPreText:function(){return"page précédente"},formatSRPaginationPageText:function(t){return"vers la page ".concat(t)},formatSRPaginationNextText:function(){return"page suivante"},formatDetailPagination:function(t){return"Affichage de ".concat(t," lignes")},formatClearSearch:function(){return"Effacer la recherche"},formatSearch:function(){return"Rechercher"},formatNoMatches:function(){return"Aucun résultat"},formatPaginationSwitch:function(){return"Masquer/Afficher la pagination"},formatPaginationSwitchDown:function(){return"Afficher la pagination"},formatPaginationSwitchUp:function(){return"Masquer la pagination"},formatRefresh:function(){return"Actualiser"},formatToggleOn:function(){return"Afficher la vue en cartes"},formatToggleOff:function(){return"Cacher la vue en cartes"},formatColumns:function(){return"Colonnes"},formatColumnsToggleAll:function(){return"Tout afficher"},formatFullscreen:function(){return"Plein écran"},formatAllRows:function(){return"Tout"},formatAutoRefresh:function(){return"Actualiser automatiquement"},formatExport:function(){return"Exporter"},formatJumpTo:function(){return"Aller à"},formatAdvancedSearch:function(){return"Recherche avancée"},formatAdvancedCloseButton:function(){return"Fermer"},formatFilterControlSwitch:function(){return"Masquer/Afficher les contrôles"},formatFilterControlSwitchHide:function(){return"Masquer les contrôles"},formatFilterControlSwitchShow:function(){return"Afficher les contrôles"},formatToggleCustomViewOn:function(){return"Afficher la vue personnalisée"},formatToggleCustomViewOff:function(){return"Cacher la vue personnalisée"},formatClearFilters:function(){return"Retirer les filtres"},formatAddLevel:function(){return"Ajouter un niveau"},formatCancel:function(){return"Annuler"},formatColumn:function(){return"Colonne"},formatDeleteLevel:function(){return"Supprimer un niveau"},formatDuplicateAlertTitle:function(){return"Des entrées en double ont été trouvées !"},formatDuplicateAlertDescription:function(){return"Veuillez supprimer ou modifier les entrées en double"},formatMultipleSort:function(){return"Tri multiple"},formatOrder:function(){return"Ordre"},formatSort:function(){return"Trier"},formatSortBy:function(){return"Trier par"},formatSortOrders:function(){return{asc:"Ascendant",desc:"Descendant"}},formatThenBy:function(){return"Puis par"}},Object.assign(t.fn.bootstrapTable.defaults,t.fn.bootstrapTable.locales["fr-CH"]),t.fn.bootstrapTable.locales["fr-FR"]=t.fn.bootstrapTable.locales.fr={formatCopyRows:function(){return"Copier les lignes"},formatPrint:function(){return"Imprimer"},formatLoadingMessage:function(){return"Chargement en cours"},formatRecordsPerPage:function(t){return"".concat(t," lignes par page")},formatShowingRows:function(t,n,r,o){return void 0!==o&&o>0&&o>r?"Affichage de ".concat(t," à ").concat(n," sur ").concat(r," lignes (filtrées à partir de ").concat(o," lignes)"):"Affichage de ".concat(t," à ").concat(n," sur ").concat(r," lignes")},formatSRPaginationPreText:function(){return"page précédente"},formatSRPaginationPageText:function(t){return"vers la page ".concat(t)},formatSRPaginationNextText:function(){return"page suivante"},formatDetailPagination:function(t){return"Affichage de ".concat(t," lignes")},formatClearSearch:function(){return"Effacer la recherche"},formatSearch:function(){return"Rechercher"},formatNoMatches:function(){return"Aucun résultat"},formatPaginationSwitch:function(){return"Masquer/Afficher la pagination"},formatPaginationSwitchDown:function(){return"Afficher la pagination"},formatPaginationSwitchUp:function(){return"Masquer la pagination"},formatRefresh:function(){return"Actualiser"},formatToggleOn:function(){return"Afficher la vue en cartes"},formatToggleOff:function(){return"Cacher la vue en cartes"},formatColumns:function(){return"Colonnes"},formatColumnsToggleAll:function(){return"Tout afficher"},formatFullscreen:function(){return"Plein écran"},formatAllRows:function(){return"Tout"},formatAutoRefresh:function(){return"Actualiser automatiquement"},formatExport:function(){return"Exporter"},formatJumpTo:function(){return"Aller à"},formatAdvancedSearch:function(){return"Recherche avancée"},formatAdvancedCloseButton:function(){return"Fermer"},formatFilterControlSwitch:function(){return"Masquer/Afficher les contrôles"},formatFilterControlSwitchHide:function(){return"Masquer les contrôles"},formatFilterControlSwitchShow:function(){return"Afficher les contrôles"},formatToggleCustomViewOn:function(){return"Afficher la vue personnalisée"},formatToggleCustomViewOff:function(){return"Cacher la vue personnalisée"},formatClearFilters:function(){return"Retirer les filtres"},formatAddLevel:function(){return"Ajouter un niveau"},formatCancel:function(){return"Annuler"},formatColumn:function(){return"Colonne"},formatDeleteLevel:function(){return"Supprimer un niveau"},formatDuplicateAlertTitle:function(){return"Des entrées en double ont été trouvées !"},formatDuplicateAlertDescription:function(){return"Veuillez supprimer ou modifier les entrées en double"},formatMultipleSort:function(){return"Tri multiple"},formatOrder:function(){return"Ordre"},formatSort:function(){return"Trier"},formatSortBy:function(){return"Trier par"},formatSortOrders:function(){return{asc:"Ascendant",desc:"Descendant"}},formatThenBy:function(){return"Puis par"}},Object.assign(t.fn.bootstrapTable.defaults,t.fn.bootstrapTable.locales["fr-FR"]),t.fn.bootstrapTable.locales["he-IL"]=t.fn.bootstrapTable.locales.he={formatCopyRows:function(){return"Copy Rows"},formatPrint:function(){return"Print"},formatLoadingMessage:function(){return"טוען, נא להמתין"},formatRecordsPerPage:function(t){return"".concat(t," שורות בעמוד")},formatShowingRows:function(t,n,r,o){return void 0!==o&&o>0&&o>r?"מציג ".concat(t," עד ").concat(n," מ-").concat(r,"שורות").concat(o," total rows)"):"מציג ".concat(t," עד ").concat(n," מ-").concat(r," שורות")},formatSRPaginationPreText:function(){return"previous page"},formatSRPaginationPageText:function(t){return"to page ".concat(t)},formatSRPaginationNextText:function(){return"next page"},formatDetailPagination:function(t){return"Showing ".concat(t," rows")},formatClearSearch:function(){return"Clear Search"},formatSearch:function(){return"חיפוש"},formatNoMatches:function(){return"לא נמצאו רשומות תואמות"},formatPaginationSwitch:function(){return"הסתר/הצג מספור דפים"},formatPaginationSwitchDown:function(){return"Show pagination"},formatPaginationSwitchUp:function(){return"Hide pagination"},formatRefresh:function(){return"רענן"},formatToggleOn:function(){return"Show card view"},formatToggleOff:function(){return"Hide card view"},formatColumns:function(){return"עמודות"},formatColumnsToggleAll:function(){return"Toggle all"},formatFullscreen:function(){return"Fullscreen"},formatAllRows:function(){return"הכל"},formatAutoRefresh:function(){return"Auto Refresh"},formatExport:function(){return"Export data"},formatJumpTo:function(){return"GO"},formatAdvancedSearch:function(){return"Advanced search"},formatAdvancedCloseButton:function(){return"Close"},formatFilterControlSwitch:function(){return"Hide/Show controls"},formatFilterControlSwitchHide:function(){return"Hide controls"},formatFilterControlSwitchShow:function(){return"Show controls"}},Object.assign(t.fn.bootstrapTable.defaults,t.fn.bootstrapTable.locales["he-IL"]),t.fn.bootstrapTable.locales["hi-IN"]={formatCopyRows:function(){return"पंक्तियों की कॉपी करें"},formatPrint:function(){return"प्रिंट"},formatLoadingMessage:function(){return"लोड हो रहा है कृपया प्रतीक्षा करें"},formatRecordsPerPage:function(t){return"".concat(t," प्रति पृष्ठ पंक्तियाँ")},formatShowingRows:function(t,n,r,o){return void 0!==o&&o>0&&o>r?"".concat(t," - ").concat(n," पक्तिया ").concat(r," में से ( ").concat(o," पक्तिया)"):"".concat(t," - ").concat(n," पक्तिया ").concat(r," में से")},formatSRPaginationPreText:function(){return"पिछला पृष्ठ"},formatSRPaginationPageText:function(t){return"".concat(t," पृष्ठ पर")},formatSRPaginationNextText:function(){return"अगला पृष्ठ"},formatDetailPagination:function(t){return"".concat(t," पंक्तियां")},formatClearSearch:function(){return"सर्च क्लिअर करें"},formatSearch:function(){return"सर्च"},formatNoMatches:function(){return"मेल खाते रिकॉर्ड नही मिले"},formatPaginationSwitch:function(){return"छुपाओ/दिखाओ पृष्ठ संख्या"},formatPaginationSwitchDown:function(){return"दिखाओ पृष्ठ संख्या"},formatPaginationSwitchUp:function(){return"छुपाओ पृष्ठ संख्या"},formatRefresh:function(){return"रिफ्रेश"},formatToggleOn:function(){return"कार्ड दृश्य दिखाएं"},formatToggleOff:function(){return"कार्ड दृश्य छुपाएं"},formatColumns:function(){return"कॉलम"},formatColumnsToggleAll:function(){return"टॉगल आल"},formatFullscreen:function(){return"पूर्ण स्क्रीन"},formatAllRows:function(){return"सब"},formatAutoRefresh:function(){return"ऑटो रिफ्रेश"},formatExport:function(){return"एक्सपोर्ट डाटा"},formatJumpTo:function(){return"जाओ"},formatAdvancedSearch:function(){return"एडवांस सर्च"},formatAdvancedCloseButton:function(){return"बंद करे"},formatFilterControlSwitch:function(){return"छुपाओ/दिखाओ कंट्रोल्स"},formatFilterControlSwitchHide:function(){return"छुपाओ कंट्रोल्स"},formatFilterControlSwitchShow:function(){return"दिखाओ कंट्रोल्स"}},Object.assign(t.fn.bootstrapTable.defaults,t.fn.bootstrapTable.locales["hi-IN"]),t.fn.bootstrapTable.locales["hr-HR"]=t.fn.bootstrapTable.locales.hr={formatCopyRows:function(){return"Copy Rows"},formatPrint:function(){return"Print"},formatLoadingMessage:function(){return"Molimo pričekajte"},formatRecordsPerPage:function(t){return"".concat(t," broj zapisa po stranici")},formatShowingRows:function(t,n,r,o){return void 0!==o&&o>0&&o>r?"Prikazujem ".concat(t,". - ").concat(n,". od ukupnog broja zapisa ").concat(r," (filtered from ").concat(o," total rows)"):"Prikazujem ".concat(t,". - ").concat(n,". od ukupnog broja zapisa ").concat(r)},formatSRPaginationPreText:function(){return"previous page"},formatSRPaginationPageText:function(t){return"to page ".concat(t)},formatSRPaginationNextText:function(){return"next page"},formatDetailPagination:function(t){return"Showing ".concat(t," rows")},formatClearSearch:function(){return"Clear Search"},formatSearch:function(){return"Pretraži"},formatNoMatches:function(){return"Nije pronađen niti jedan zapis"},formatPaginationSwitch:function(){return"Prikaži/sakrij stranice"},formatPaginationSwitchDown:function(){return"Show pagination"},formatPaginationSwitchUp:function(){return"Hide pagination"},formatRefresh:function(){return"Osvježi"},formatToggleOn:function(){return"Show card view"},formatToggleOff:function(){return"Hide card view"},formatColumns:function(){return"Kolone"},formatColumnsToggleAll:function(){return"Toggle all"},formatFullscreen:function(){return"Fullscreen"},formatAllRows:function(){return"Sve"},formatAutoRefresh:function(){return"Auto Refresh"},formatExport:function(){return"Export data"},formatJumpTo:function(){return"GO"},formatAdvancedSearch:function(){return"Advanced search"},formatAdvancedCloseButton:function(){return"Close"},formatFilterControlSwitch:function(){return"Hide/Show controls"},formatFilterControlSwitchHide:function(){return"Hide controls"},formatFilterControlSwitchShow:function(){return"Show controls"}},Object.assign(t.fn.bootstrapTable.defaults,t.fn.bootstrapTable.locales["hr-HR"]),t.fn.bootstrapTable.locales["hu-HU"]=t.fn.bootstrapTable.locales.hu={formatCopyRows:function(){return"Copy Rows"},formatPrint:function(){return"Print"},formatLoadingMessage:function(){return"Betöltés, kérem várjon"},formatRecordsPerPage:function(t){return"".concat(t," rekord per oldal")},formatShowingRows:function(t,n,r,o){return void 0!==o&&o>0&&o>r?"Megjelenítve ".concat(t," - ").concat(n," / ").concat(r," összesen (filtered from ").concat(o," total rows)"):"Megjelenítve ".concat(t," - ").concat(n," / ").concat(r," összesen")},formatSRPaginationPreText:function(){return"previous page"},formatSRPaginationPageText:function(t){return"to page ".concat(t)},formatSRPaginationNextText:function(){return"next page"},formatDetailPagination:function(t){return"Showing ".concat(t," rows")},formatClearSearch:function(){return"Clear Search"},formatSearch:function(){return"Keresés"},formatNoMatches:function(){return"Nincs találat"},formatPaginationSwitch:function(){return"Lapozó elrejtése/megjelenítése"},formatPaginationSwitchDown:function(){return"Show pagination"},formatPaginationSwitchUp:function(){return"Hide pagination"},formatRefresh:function(){return"Frissítés"},formatToggleOn:function(){return"Show card view"},formatToggleOff:function(){return"Hide card view"},formatColumns:function(){return"Oszlopok"},formatColumnsToggleAll:function(){return"Toggle all"},formatFullscreen:function(){return"Fullscreen"},formatAllRows:function(){return"Összes"},formatAutoRefresh:function(){return"Auto Refresh"},formatExport:function(){return"Export data"},formatJumpTo:function(){return"GO"},formatAdvancedSearch:function(){return"Advanced search"},formatAdvancedCloseButton:function(){return"Close"},formatFilterControlSwitch:function(){return"Hide/Show controls"},formatFilterControlSwitchHide:function(){return"Hide controls"},formatFilterControlSwitchShow:function(){return"Show controls"}},Object.assign(t.fn.bootstrapTable.defaults,t.fn.bootstrapTable.locales["hu-HU"]),t.fn.bootstrapTable.locales["it-IT"]=t.fn.bootstrapTable.locales.it={formatCopyRows:function(){return"Copy Rows"},formatPrint:function(){return"Print"},formatLoadingMessage:function(){return"Caricamento in corso"},formatRecordsPerPage:function(t){return"".concat(t," elementi per pagina")},formatShowingRows:function(t,n,r,o){return void 0!==o&&o>0&&o>r?"Visualizzazione da ".concat(t," a ").concat(n," di ").concat(r," elementi (filtrati da ").concat(o," elementi totali)"):"Visualizzazione da ".concat(t," a ").concat(n," di ").concat(r," elementi")},formatSRPaginationPreText:function(){return"pagina precedente"},formatSRPaginationPageText:function(t){return"alla pagina ".concat(t)},formatSRPaginationNextText:function(){return"pagina successiva"},formatDetailPagination:function(t){return"Mostrando ".concat(t," elementi")},formatClearSearch:function(){return"Pulisci filtri"},formatSearch:function(){return"Cerca"},formatNoMatches:function(){return"Nessun elemento trovato"},formatPaginationSwitch:function(){return"Nascondi/Mostra paginazione"},formatPaginationSwitchDown:function(){return"Mostra paginazione"},formatPaginationSwitchUp:function(){return"Nascondi paginazione"},formatRefresh:function(){return"Aggiorna"},formatToggleOn:function(){return"Mostra visuale a scheda"},formatToggleOff:function(){return"Nascondi visuale a scheda"},formatColumns:function(){return"Colonne"},formatColumnsToggleAll:function(){return"Mostra tutte"},formatFullscreen:function(){return"Schermo intero"},formatAllRows:function(){return"Tutto"},formatAutoRefresh:function(){return"Auto Aggiornamento"},formatExport:function(){return"Esporta dati"},formatJumpTo:function(){return"VAI"},formatAdvancedSearch:function(){return"Filtri avanzati"},formatAdvancedCloseButton:function(){return"Chiudi"},formatFilterControlSwitch:function(){return"Hide/Show controls"},formatFilterControlSwitchHide:function(){return"Hide controls"},formatFilterControlSwitchShow:function(){return"Show controls"}},Object.assign(t.fn.bootstrapTable.defaults,t.fn.bootstrapTable.locales["it-IT"]),t.fn.bootstrapTable.locales["fr-LU"]={formatCopyRows:function(){return"Copier les lignes"},formatPrint:function(){return"Imprimer"},formatLoadingMessage:function(){return"Chargement en cours"},formatRecordsPerPage:function(t){return"".concat(t," lignes par page")},formatShowingRows:function(t,n,r,o){return void 0!==o&&o>0&&o>r?"Affichage de ".concat(t," à ").concat(n," sur ").concat(r," lignes (filtrées à partir de ").concat(o," lignes)"):"Affichage de ".concat(t," à ").concat(n," sur ").concat(r," lignes")},formatSRPaginationPreText:function(){return"page précédente"},formatSRPaginationPageText:function(t){return"vers la page ".concat(t)},formatSRPaginationNextText:function(){return"page suivante"},formatDetailPagination:function(t){return"Affichage de ".concat(t," lignes")},formatClearSearch:function(){return"Effacer la recherche"},formatSearch:function(){return"Rechercher"},formatNoMatches:function(){return"Aucun résultat"},formatPaginationSwitch:function(){return"Masquer/Afficher la pagination"},formatPaginationSwitchDown:function(){return"Afficher la pagination"},formatPaginationSwitchUp:function(){return"Masquer la pagination"},formatRefresh:function(){return"Actualiser"},formatToggleOn:function(){return"Afficher la vue en cartes"},formatToggleOff:function(){return"Cacher la vue en cartes"},formatColumns:function(){return"Colonnes"},formatColumnsToggleAll:function(){return"Tout afficher"},formatFullscreen:function(){return"Plein écran"},formatAllRows:function(){return"Tout"},formatAutoRefresh:function(){return"Actualiser automatiquement"},formatExport:function(){return"Exporter"},formatJumpTo:function(){return"Aller à"},formatAdvancedSearch:function(){return"Recherche avancée"},formatAdvancedCloseButton:function(){return"Fermer"},formatFilterControlSwitch:function(){return"Masquer/Afficher les contrôles"},formatFilterControlSwitchHide:function(){return"Masquer les contrôles"},formatFilterControlSwitchShow:function(){return"Afficher les contrôles"},formatToggleCustomViewOn:function(){return"Afficher la vue personnalisée"},formatToggleCustomViewOff:function(){return"Cacher la vue personnalisée"},formatClearFilters:function(){return"Retirer les filtres"},formatAddLevel:function(){return"Ajouter un niveau"},formatCancel:function(){return"Annuler"},formatColumn:function(){return"Colonne"},formatDeleteLevel:function(){return"Supprimer un niveau"},formatDuplicateAlertTitle:function(){return"Des entrées en double ont été trouvées !"},formatDuplicateAlertDescription:function(){return"Veuillez supprimer ou modifier les entrées en double"},formatMultipleSort:function(){return"Tri multiple"},formatOrder:function(){return"Ordre"},formatSort:function(){return"Trier"},formatSortBy:function(){return"Trier par"},formatSortOrders:function(){return{asc:"Ascendant",desc:"Descendant"}},formatThenBy:function(){return"Puis par"}},Object.assign(t.fn.bootstrapTable.defaults,t.fn.bootstrapTable.locales["fr-LU"]),t.fn.bootstrapTable.locales["id-ID"]=t.fn.bootstrapTable.locales.id={formatCopyRows:function(){return"Salin baris"},formatPrint:function(){return"Mencetak"},formatLoadingMessage:function(){return"Pemuatan sedang berlangsung"},formatRecordsPerPage:function(t){return"".concat(t," baris per halaman")},formatShowingRows:function(t,n,r,o){return void 0!==o&&o>0&&o>r?"Menampilkan dari ".concat(t," hingga ").concat(n," pada ").concat(r," baris (difilter dari ").concat(o," baris)"):"Menampilkan dari ".concat(t," hingga ").concat(n," pada ").concat(r," baris")},formatSRPaginationPreText:function(){return"halaman sebelumnya"},formatSRPaginationPageText:function(t){return"ke halaman ".concat(t)},formatSRPaginationNextText:function(){return"halaman berikutnya"},formatDetailPagination:function(t){return"Tampilan ".concat(t," baris")},formatClearSearch:function(){return"Menghapus pencarian"},formatSearch:function(){return"Pencarian"},formatNoMatches:function(){return"Tidak ada hasil"},formatPaginationSwitch:function(){return"Sembunyikan/Tampilkan penomoran halaman"},formatPaginationSwitchDown:function(){return"Tampilkan penomoran halaman"},formatPaginationSwitchUp:function(){return"Sembunyikan penomoran halaman"},formatRefresh:function(){return"Segarkan"},formatToggleOn:function(){return"Menampilkan tampilan peta"},formatToggleOff:function(){return"Menyembunyikan tampilan peta"},formatColumns:function(){return"Kolom"},formatColumnsToggleAll:function(){return"Tampilkan semua"},formatFullscreen:function(){return"Layar penuh"},formatAllRows:function(){return"Semua"},formatAutoRefresh:function(){return"Penyegaran otomatis"},formatExport:function(){return"Mengekspor data"},formatJumpTo:function(){return"Pergi ke"},formatAdvancedSearch:function(){return"Pencarian lanjutan"},formatAdvancedCloseButton:function(){return"Tutup"},formatFilterControlSwitch:function(){return"Menyembunyikan/Menampilkan kontrol"},formatFilterControlSwitchHide:function(){return"Menyembunyikan kontrol"},formatFilterControlSwitchShow:function(){return"Menampilkan kontrol"},formatToggleCustomViewOn:function(){return"Menampilkan tampilan khusus"},formatToggleCustomViewOff:function(){return"Menyembunyikan tampilan khusus"},formatClearFilters:function(){return"Menghapus filter"},formatAddLevel:function(){return"Menambahkan level"},formatCancel:function(){return"Batal"},formatColumn:function(){return"Kolom"},formatDeleteLevel:function(){return"Menghapus level"},formatDuplicateAlertTitle:function(){return"Entri duplikat telah ditemukan!"},formatDuplicateAlertDescription:function(){return"Harap hapus atau ubah entri duplikat"},formatMultipleSort:function(){return"Penyortiran ganda"},formatOrder:function(){return"Urutan"},formatSort:function(){return"Penyortiran"},formatSortBy:function(){return"Urutkan berdasarkan"},formatSortOrders:function(){return{asc:"Menaik",desc:"Menurun"}},formatThenBy:function(){return"Kemudian oleh"}},Object.assign(t.fn.bootstrapTable.defaults,t.fn.bootstrapTable.locales["id-ID"]),t.fn.bootstrapTable.locales["ja-JP"]=t.fn.bootstrapTable.locales.ja={formatCopyRows:function(){return"Copy Rows"},formatPrint:function(){return"Print"},formatLoadingMessage:function(){return"読み込み中です。少々お待ちください。"},formatRecordsPerPage:function(t){return"ページ当たり最大".concat(t,"件")},formatShowingRows:function(t,n,r,o){return void 0!==o&&o>0&&o>r?"全".concat(r,"件から、").concat(t,"から").concat(n,"件目まで表示しています (filtered from ").concat(o," total rows)"):"全".concat(r,"件から、").concat(t,"から").concat(n,"件目まで表示しています")},formatSRPaginationPreText:function(){return"previous page"},formatSRPaginationPageText:function(t){return"to page ".concat(t)},formatSRPaginationNextText:function(){return"next page"},formatDetailPagination:function(t){return"Showing ".concat(t," rows")},formatClearSearch:function(){return"Clear Search"},formatSearch:function(){return"検索"},formatNoMatches:function(){return"該当するレコードが見つかりません"},formatPaginationSwitch:function(){return"ページ数を表示・非表示"},formatPaginationSwitchDown:function(){return"Show pagination"},formatPaginationSwitchUp:function(){return"Hide pagination"},formatRefresh:function(){return"更新"},formatToggleOn:function(){return"Show card view"},formatToggleOff:function(){return"Hide card view"},formatColumns:function(){return"列"},formatColumnsToggleAll:function(){return"Toggle all"},formatFullscreen:function(){return"Fullscreen"},formatAllRows:function(){return"すべて"},formatAutoRefresh:function(){return"Auto Refresh"},formatExport:function(){return"Export data"},formatJumpTo:function(){return"GO"},formatAdvancedSearch:function(){return"Advanced search"},formatAdvancedCloseButton:function(){return"Close"},formatFilterControlSwitch:function(){return"Hide/Show controls"},formatFilterControlSwitchHide:function(){return"Hide controls"},formatFilterControlSwitchShow:function(){return"Show controls"}},Object.assign(t.fn.bootstrapTable.defaults,t.fn.bootstrapTable.locales["ja-JP"]),t.fn.bootstrapTable.locales["lb-LU"]=t.fn.bootstrapTable.locales.lb={formatCopyRows:function(){return"Zeilen kopéieren"},formatPrint:function(){return"Drécken"},formatLoadingMessage:function(){return"Gëtt gelueden, gedellëgt Iech wannechgelift ee Moment"},formatRecordsPerPage:function(t){return"".concat(t," Zeilen per Säit")},formatShowingRows:function(t,n,r,o){return void 0!==o&&o>0&&o>r?"Weist Zeil ".concat(t," bis ").concat(n," vun ").concat(r," Zeil").concat(r>1?"en":""," (gefiltert vun insgesamt ").concat(o," Zeil").concat(r>1?"en":"",")"):"Weist Zeil ".concat(t," bis ").concat(n," vun ").concat(r," Zeil").concat(r>1?"en":"")},formatSRPaginationPreText:function(){return"viregt Säit"},formatSRPaginationPageText:function(t){return"op Säit ".concat(t)},formatSRPaginationNextText:function(){return"nächst Säit"},formatDetailPagination:function(t){return"Weist ".concat(t," Zeilen")},formatClearSearch:function(){return"Sich réckgängeg maachen"},formatSearch:function(){return"Sich"},formatNoMatches:function(){return"Keng passend Anträg fonnt"},formatPaginationSwitch:function(){return"Paginatioun uweisen/verstoppen"},formatPaginationSwitchDown:function(){return"Paginatioun uweisen"},formatPaginationSwitchUp:function(){return"Paginatioun verstoppen"},formatRefresh:function(){return"Nei lueden"},formatToggleOn:function(){return"Kaartenusiicht uweisen"},formatToggleOff:function(){return"Kaartenusiicht verstoppen"},formatColumns:function(){return"Kolonnen"},formatColumnsToggleAll:function(){return"All ëmschalten"},formatFullscreen:function(){return"Vollbild"},formatAllRows:function(){return"All"},formatAutoRefresh:function(){return"Automatescht neilueden"},formatExport:function(){return"Daten exportéieren"},formatJumpTo:function(){return"Sprangen"},formatAdvancedSearch:function(){return"Erweidert Sich"},formatAdvancedCloseButton:function(){return"Zoumaachen"},formatFilterControlSwitch:function(){return"Schaltelementer uweisen/verstoppen"},formatFilterControlSwitchHide:function(){return"Schaltelementer verstoppen"},formatFilterControlSwitchShow:function(){return"Schaltelementer uweisen"}},Object.assign(t.fn.bootstrapTable.defaults,t.fn.bootstrapTable.locales["lb-LU"]),t.fn.bootstrapTable.locales["ko-KR"]=t.fn.bootstrapTable.locales.ko={formatCopyRows:function(){return"행 복사"},formatPrint:function(){return"프린트"},formatLoadingMessage:function(){return"데이터를 불러오는 중입니다"},formatRecordsPerPage:function(t){return"페이지 당 ".concat(t,"개 데이터 출력")},formatShowingRows:function(t,n,r,o){return void 0!==o&&o>0&&o>r?"전체 ".concat(r,"개 중 ").concat(t,"~").concat(n,"번째 데이터 출력, (전체 ").concat(o," 행에서 필터됨)"):"전체 ".concat(r,"개 중 ").concat(t,"~").concat(n,"번째 데이터 출력,")},formatSRPaginationPreText:function(){return"이전 페이지"},formatSRPaginationPageText:function(t){return"".concat(t," 페이지로 이동")},formatSRPaginationNextText:function(){return"다음 페이지"},formatDetailPagination:function(t){return"".concat(t," 행들 표시 중")},formatClearSearch:function(){return"검색 초기화"},formatSearch:function(){return"검색"},formatNoMatches:function(){return"조회된 데이터가 없습니다."},formatPaginationSwitch:function(){return"페이지 넘버 보기/숨기기"},formatPaginationSwitchDown:function(){return"페이지 넘버 보기"},formatPaginationSwitchUp:function(){return"페이지 넘버 숨기기"},formatRefresh:function(){return"새로 고침"},formatToggleOn:function(){return"카드뷰 보기"},formatToggleOff:function(){return"카드뷰 숨기기"},formatColumns:function(){return"컬럼 필터링"},formatColumnsToggleAll:function(){return"전체 토글"},formatFullscreen:function(){return"전체 화면"},formatAllRows:function(){return"전체"},formatAutoRefresh:function(){return"자동 갱신"},formatExport:function(){return"데이터 추출"},formatJumpTo:function(){return"이동"},formatAdvancedSearch:function(){return"심화 검색"},formatAdvancedCloseButton:function(){return"닫기"},formatFilterControlSwitch:function(){return"컨트롤 보기/숨기기"},formatFilterControlSwitchHide:function(){return"컨트롤 숨기기"},formatFilterControlSwitchShow:function(){return"컨트롤 보기"}},Object.assign(t.fn.bootstrapTable.defaults,t.fn.bootstrapTable.locales["ko-KR"]),t.fn.bootstrapTable.locales["lt-LT"]=t.fn.bootstrapTable.locales.lt={formatCopyRows:function(){return"Kopijuoti eilutes"},formatPrint:function(){return"Spausdinti"},formatLoadingMessage:function(){return"Įkeliama, palaukite"},formatRecordsPerPage:function(t){return"".concat(t," eilučių puslapyje")},formatShowingRows:function(t,n,r,o){return void 0!==o&&o>0&&o>r?"Rodomos eilutės nuo ".concat(t," iki ").concat(n," iš ").concat(r," eilučių (atrinktos iš visų ").concat(o," eilučių)"):"Rodomos eilutės nuo ".concat(t," iki ").concat(n," iš ").concat(r," eilučių")},formatSRPaginationPreText:function(){return"ankstesnis puslapis"},formatSRPaginationPageText:function(t){return"į puslapį ".concat(t)},formatSRPaginationNextText:function(){return"sekantis puslapis"},formatDetailPagination:function(t){return"Rodomos ".concat(t," eilutės (-čių)")},formatClearSearch:function(){return"Išvalyti paiešką"},formatSearch:function(){return"Ieškoti"},formatNoMatches:function(){return"Atitinkančių įrašų nerasta"},formatPaginationSwitch:function(){return"Slėpti/rodyti puslapių rūšiavimą"},formatPaginationSwitchDown:function(){return"Rodyti puslapių rūšiavimą"},formatPaginationSwitchUp:function(){return"Slėpti puslapių rūšiavimą"},formatRefresh:function(){return"Atnaujinti"},formatToggleOn:function(){return"Rodyti kortelių rodinį"},formatToggleOff:function(){return"Slėpti kortelių rodinį"},formatColumns:function(){return"Stulpeliai"},formatColumnsToggleAll:function(){return"Perjungti viską"},formatFullscreen:function(){return"Visame ekrane"},formatAllRows:function(){return"Viskas"},formatAutoRefresh:function(){return"Automatinis atnaujinimas"},formatExport:function(){return"Eksportuoti duomenis"},formatJumpTo:function(){return"Eiti"},formatAdvancedSearch:function(){return"Išplėstinė paieška"},formatAdvancedCloseButton:function(){return"Uždaryti"},formatFilterControlSwitch:function(){return"Slėpti/rodyti valdiklius"},formatFilterControlSwitchHide:function(){return"Slėpti valdiklius"},formatFilterControlSwitchShow:function(){return"Rodyti valdiklius"}},Object.assign(t.fn.bootstrapTable.defaults,t.fn.bootstrapTable.locales["lt-LT"]),t.fn.bootstrapTable.locales["ms-MY"]=t.fn.bootstrapTable.locales.ms={formatCopyRows:function(){return"Copy Rows"},formatPrint:function(){return"Print"},formatLoadingMessage:function(){return"Permintaan sedang dimuatkan. Sila tunggu sebentar"},formatRecordsPerPage:function(t){return"".concat(t," rekod setiap muka surat")},formatShowingRows:function(t,n,r,o){return void 0!==o&&o>0&&o>r?"Sedang memaparkan rekod ".concat(t," hingga ").concat(n," daripada jumlah ").concat(r," rekod (filtered from ").concat(o," total rows)"):"Sedang memaparkan rekod ".concat(t," hingga ").concat(n," daripada jumlah ").concat(r," rekod")},formatSRPaginationPreText:function(){return"previous page"},formatSRPaginationPageText:function(t){return"to page ".concat(t)},formatSRPaginationNextText:function(){return"next page"},formatDetailPagination:function(t){return"Showing ".concat(t," rows")},formatClearSearch:function(){return"Clear Search"},formatSearch:function(){return"Cari"},formatNoMatches:function(){return"Tiada rekod yang menyamai permintaan"},formatPaginationSwitch:function(){return"Tunjuk/sembunyi muka surat"},formatPaginationSwitchDown:function(){return"Show pagination"},formatPaginationSwitchUp:function(){return"Hide pagination"},formatRefresh:function(){return"Muatsemula"},formatToggleOn:function(){return"Show card view"},formatToggleOff:function(){return"Hide card view"},formatColumns:function(){return"Lajur"},formatColumnsToggleAll:function(){return"Toggle all"},formatFullscreen:function(){return"Fullscreen"},formatAllRows:function(){return"Semua"},formatAutoRefresh:function(){return"Auto Refresh"},formatExport:function(){return"Export data"},formatJumpTo:function(){return"GO"},formatAdvancedSearch:function(){return"Advanced search"},formatAdvancedCloseButton:function(){return"Close"},formatFilterControlSwitch:function(){return"Hide/Show controls"},formatFilterControlSwitchHide:function(){return"Hide controls"},formatFilterControlSwitchShow:function(){return"Show controls"}},Object.assign(t.fn.bootstrapTable.defaults,t.fn.bootstrapTable.locales["ms-MY"]),t.fn.bootstrapTable.locales["nb-NO"]=t.fn.bootstrapTable.locales.nb={formatCopyRows:function(){return"Copy Rows"},formatPrint:function(){return"Print"},formatLoadingMessage:function(){return"Oppdaterer, vennligst vent"},formatRecordsPerPage:function(t){return"".concat(t," poster pr side")},formatShowingRows:function(t,n,r,o){return void 0!==o&&o>0&&o>r?"Viser ".concat(t," til ").concat(n," av ").concat(r," rekker (filtered from ").concat(o," total rows)"):"Viser ".concat(t," til ").concat(n," av ").concat(r," rekker")},formatSRPaginationPreText:function(){return"previous page"},formatSRPaginationPageText:function(t){return"to page ".concat(t)},formatSRPaginationNextText:function(){return"next page"},formatDetailPagination:function(t){return"Showing ".concat(t," rows")},formatClearSearch:function(){return"Clear Search"},formatSearch:function(){return"Søk"},formatNoMatches:function(){return"Ingen poster funnet"},formatPaginationSwitch:function(){return"Hide/Show pagination"},formatPaginationSwitchDown:function(){return"Show pagination"},formatPaginationSwitchUp:function(){return"Hide pagination"},formatRefresh:function(){return"Oppdater"},formatToggleOn:function(){return"Show card view"},formatToggleOff:function(){return"Hide card view"},formatColumns:function(){return"Kolonner"},formatColumnsToggleAll:function(){return"Toggle all"},formatFullscreen:function(){return"Fullscreen"},formatAllRows:function(){return"All"},formatAutoRefresh:function(){return"Auto Refresh"},formatExport:function(){return"Export data"},formatJumpTo:function(){return"GO"},formatAdvancedSearch:function(){return"Advanced search"},formatAdvancedCloseButton:function(){return"Close"},formatFilterControlSwitch:function(){return"Hide/Show controls"},formatFilterControlSwitchHide:function(){return"Hide controls"},formatFilterControlSwitchShow:function(){return"Show controls"}},Object.assign(t.fn.bootstrapTable.defaults,t.fn.bootstrapTable.locales["nb-NO"]),t.fn.bootstrapTable.locales["nl-BE"]={formatCopyRows:function(){return"Copy Rows"},formatPrint:function(){return"Print"},formatLoadingMessage:function(){return"Laden, even geduld"},formatRecordsPerPage:function(t){return"".concat(t," records per pagina")},formatShowingRows:function(t,n,r,o){return void 0!==o&&o>0&&o>r?"Toon ".concat(t," tot ").concat(n," van ").concat(r," record").concat(r>1?"s":""," (gefilterd van ").concat(o," records in totaal)"):"Toon ".concat(t," tot ").concat(n," van ").concat(r," record").concat(r>1?"s":"")},formatSRPaginationPreText:function(){return"vorige pagina"},formatSRPaginationPageText:function(t){return"tot pagina ".concat(t)},formatSRPaginationNextText:function(){return"volgende pagina"},formatDetailPagination:function(t){return"Toon ".concat(t," record").concat(t>1?"s":"")},formatClearSearch:function(){return"Verwijder filters"},formatSearch:function(){return"Zoeken"},formatNoMatches:function(){return"Geen resultaten gevonden"},formatPaginationSwitch:function(){return"Verberg/Toon paginering"},formatPaginationSwitchDown:function(){return"Toon paginering"},formatPaginationSwitchUp:function(){return"Verberg paginering"},formatRefresh:function(){return"Vernieuwen"},formatToggleOn:function(){return"Toon kaartweergave"},formatToggleOff:function(){return"Verberg kaartweergave"},formatColumns:function(){return"Kolommen"},formatColumnsToggleAll:function(){return"Allen omschakelen"},formatFullscreen:function(){return"Volledig scherm"},formatAllRows:function(){return"Alle"},formatAutoRefresh:function(){return"Automatisch vernieuwen"},formatExport:function(){return"Exporteer gegevens"},formatJumpTo:function(){return"GA"},formatAdvancedSearch:function(){return"Geavanceerd zoeken"},formatAdvancedCloseButton:function(){return"Sluiten"},formatFilterControlSwitch:function(){return"Verberg/Toon controls"},formatFilterControlSwitchHide:function(){return"Verberg controls"},formatFilterControlSwitchShow:function(){return"Toon controls"},formatAddLevel:function(){return"Niveau toevoegen"},formatCancel:function(){return"Annuleren"},formatColumn:function(){return"Kolom"},formatDeleteLevel:function(){return"Niveau verwijderen"},formatDuplicateAlertTitle:function(){return"Duplicaten gevonden!"},formatDuplicateAlertDescription:function(){return"Gelieve dubbele kolommen te verwijderen of wijzigen"},formatMultipleSort:function(){return"Meervoudige sortering"},formatOrder:function(){return"Volgorde"},formatSort:function(){return"Sorteren"},formatSortBy:function(){return"Sorteren op"},formatThenBy:function(){return"vervolgens"},formatSortOrders:function(){return{asc:"Oplopend",desc:"Aflopend"}}},Object.assign(t.fn.bootstrapTable.defaults,t.fn.bootstrapTable.locales["nl-BE"]),t.fn.bootstrapTable.locales["nl-NL"]=t.fn.bootstrapTable.locales.nl={formatCopyRows:function(){return"Copy Rows"},formatPrint:function(){return"Print"},formatLoadingMessage:function(){return"Laden, even geduld"},formatRecordsPerPage:function(t){return"".concat(t," records per pagina")},formatShowingRows:function(t,n,r,o){return void 0!==o&&o>0&&o>r?"Toon ".concat(t," tot ").concat(n," van ").concat(r," record").concat(r>1?"s":""," (gefilterd van ").concat(o," records in totaal)"):"Toon ".concat(t," tot ").concat(n," van ").concat(r," record").concat(r>1?"s":"")},formatSRPaginationPreText:function(){return"vorige pagina"},formatSRPaginationPageText:function(t){return"tot pagina ".concat(t)},formatSRPaginationNextText:function(){return"volgende pagina"},formatDetailPagination:function(t){return"Toon ".concat(t," record").concat(t>1?"s":"")},formatClearSearch:function(){return"Verwijder filters"},formatSearch:function(){return"Zoeken"},formatNoMatches:function(){return"Geen resultaten gevonden"},formatPaginationSwitch:function(){return"Verberg/Toon paginering"},formatPaginationSwitchDown:function(){return"Toon paginering"},formatPaginationSwitchUp:function(){return"Verberg paginering"},formatRefresh:function(){return"Vernieuwen"},formatToggleOn:function(){return"Toon kaartweergave"},formatToggleOff:function(){return"Verberg kaartweergave"},formatColumns:function(){return"Kolommen"},formatColumnsToggleAll:function(){return"Allen omschakelen"},formatFullscreen:function(){return"Volledig scherm"},formatAllRows:function(){return"Alle"},formatAutoRefresh:function(){return"Automatisch vernieuwen"},formatExport:function(){return"Exporteer gegevens"},formatJumpTo:function(){return"GA"},formatAdvancedSearch:function(){return"Geavanceerd zoeken"},formatAdvancedCloseButton:function(){return"Sluiten"},formatFilterControlSwitch:function(){return"Verberg/Toon controls"},formatFilterControlSwitchHide:function(){return"Verberg controls"},formatFilterControlSwitchShow:function(){return"Toon controls"},formatAddLevel:function(){return"Niveau toevoegen"},formatCancel:function(){return"Annuleren"},formatColumn:function(){return"Kolom"},formatDeleteLevel:function(){return"Niveau verwijderen"},formatDuplicateAlertTitle:function(){return"Duplicaten gevonden!"},formatDuplicateAlertDescription:function(){return"Gelieve dubbele kolommen te verwijderen of wijzigen"},formatMultipleSort:function(){return"Meervoudige sortering"},formatOrder:function(){return"Volgorde"},formatSort:function(){return"Sorteren"},formatSortBy:function(){return"Sorteren op"},formatThenBy:function(){return"vervolgens"},formatSortOrders:function(){return{asc:"Oplopend",desc:"Aflopend"}}},Object.assign(t.fn.bootstrapTable.defaults,t.fn.bootstrapTable.locales["nl-NL"]),t.fn.bootstrapTable.locales["pl-PL"]=t.fn.bootstrapTable.locales.pl={formatCopyRows:function(){return"Kopiuj wiersze"},formatPrint:function(){return"Print"},formatLoadingMessage:function(){return"Ładowanie, proszę czekać"},formatRecordsPerPage:function(t){return"".concat(t," rekordów na stronę")},formatShowingRows:function(t,n,r,o){return void 0!==o&&o>0&&o>r?"Wyświetlanie rekordów od ".concat(t," do ").concat(n," z ").concat(r," (filtered from ").concat(o," total rows)"):"Wyświetlanie rekordów od ".concat(t," do ").concat(n," z ").concat(r)},formatSRPaginationPreText:function(){return"poprzednia strona"},formatSRPaginationPageText:function(t){return"z ".concat(t)},formatSRPaginationNextText:function(){return"następna strona"},formatDetailPagination:function(t){return"Wyświetla ".concat(t," wierszy")},formatClearSearch:function(){return"Wyczyść wyszukiwanie"},formatSearch:function(){return"Szukaj"},formatNoMatches:function(){return"Niestety, nic nie znaleziono"},formatPaginationSwitch:function(){return"Pokaż/ukryj stronicowanie"},formatPaginationSwitchDown:function(){return"Pokaż stronicowanie"},formatPaginationSwitchUp:function(){return"Ukryj stronicowanie"},formatRefresh:function(){return"Odśwież"},formatToggleOn:function(){return"Pokaż układ karty"},formatToggleOff:function(){return"Ukryj układ karty"},formatColumns:function(){return"Kolumny"},formatColumnsToggleAll:function(){return"Zaznacz wszystko"},formatFullscreen:function(){return"Fullscreen"},formatAllRows:function(){return"Wszystkie"},formatAutoRefresh:function(){return"Auto odświeżanie"},formatExport:function(){return"Eksport danych"},formatJumpTo:function(){return"Przejdź"},formatAdvancedSearch:function(){return"Wyszukiwanie zaawansowane"},formatAdvancedCloseButton:function(){return"Zamknij"},formatFilterControlSwitch:function(){return"Pokaż/Ukryj"},formatFilterControlSwitchHide:function(){return"Pokaż"},formatFilterControlSwitchShow:function(){return"Ukryj"}},Object.assign(t.fn.bootstrapTable.defaults,t.fn.bootstrapTable.locales["pl-PL"]),t.fn.bootstrapTable.locales["pt-BR"]=t.fn.bootstrapTable.locales.br={formatCopyRows:function(){return"Copiar linhas"},formatPrint:function(){return"Imprimir"},formatLoadingMessage:function(){return"Carregando, aguarde"},formatRecordsPerPage:function(t){return"".concat(t," registros por página")},formatShowingRows:function(t,n,r,o){var e=r>1?"s":"";return void 0!==o&&o>0&&o>r?"Exibindo ".concat(t," até ").concat(n," de ").concat(r," linha").concat(e," (filtrado de um total de ").concat(o," linha").concat(e,")"):"Exibindo ".concat(t," até ").concat(n," de ").concat(r," linha").concat(e)},formatSRPaginationPreText:function(){return"página anterior"},formatSRPaginationPageText:function(t){return"ir para a página ".concat(t)},formatSRPaginationNextText:function(){return"próxima página"},formatDetailPagination:function(t){return"Mostrando ".concat(t," linha").concat(t>1?"s":"")},formatClearSearch:function(){return"Limpar Pesquisa"},formatSearch:function(){return"Pesquisar"},formatNoMatches:function(){return"Nenhum registro encontrado"},formatPaginationSwitch:function(){return"Ocultar/Exibir paginação"},formatPaginationSwitchDown:function(){return"Mostrar Paginação"},formatPaginationSwitchUp:function(){return"Esconder Paginação"},formatRefresh:function(){return"Recarregar"},formatToggleOn:function(){return"Mostrar visualização de cartão"},formatToggleOff:function(){return"Hide card view"},formatColumns:function(){return"Colunas"},formatColumnsToggleAll:function(){return"Alternar tudo"},formatFullscreen:function(){return"Tela cheia"},formatAllRows:function(){return"Tudo"},formatAutoRefresh:function(){return"Atualização Automática"},formatExport:function(){return"Exportar dados"},formatJumpTo:function(){return"Ir"},formatAdvancedSearch:function(){return"Pesquisa Avançada"},formatAdvancedCloseButton:function(){return"Fechar"},formatFilterControlSwitch:function(){return"Ocultar/Exibir controles"},formatFilterControlSwitchHide:function(){return"Ocultar controles"},formatFilterControlSwitchShow:function(){return"Exibir controles"},formatAddLevel:function(){return"Adicionar nível"},formatCancel:function(){return"Cancelar"},formatColumn:function(){return"Coluna"},formatDeleteLevel:function(){return"Remover nível"},formatDuplicateAlertTitle:function(){return"Encontradas entradas duplicadas!"},formatDuplicateAlertDescription:function(){return"Por favor, remova ou altere as colunas duplicadas"},formatMultipleSort:function(){return"Ordenação múltipla"},formatOrder:function(){return"Ordem"},formatSort:function(){return"Ordenar"},formatSortBy:function(){return"Ordenar por"},formatThenBy:function(){return"em seguida"},formatSortOrders:function(){return{asc:"Crescente",desc:"Decrescente"}}},Object.assign(t.fn.bootstrapTable.defaults,t.fn.bootstrapTable.locales["pt-BR"]),t.fn.bootstrapTable.locales["pt-PT"]=t.fn.bootstrapTable.locales.pt={formatCopyRows:function(){return"Copiar Linhas"},formatPrint:function(){return"Imprimir"},formatLoadingMessage:function(){return"A carregar, por favor aguarde"},formatRecordsPerPage:function(t){return"".concat(t," registos por página")},formatShowingRows:function(t,n,r,o){var e=r>1?"s":"";return void 0!==o&&o>0&&o>r?"A mostrar ".concat(t," at&eacute; ").concat(n," de ").concat(r," linha").concat(e," (filtrado de um total de ").concat(o," linha").concat(e,")"):"A mostrar ".concat(t," até ").concat(n," de ").concat(r," linha").concat(e)},formatSRPaginationPreText:function(){return"página anterior"},formatSRPaginationPageText:function(t){return"ir para página ".concat(t)},formatSRPaginationNextText:function(){return"próxima página"},formatDetailPagination:function(t){return"Mostrando ".concat(t," linha").concat(t>1?"s":"")},formatClearSearch:function(){return"Limpar Pesquisa"},formatSearch:function(){return"Pesquisa"},formatNoMatches:function(){return"Nenhum registo encontrado"},formatPaginationSwitch:function(){return"Esconder/Mostrar paginação"},formatPaginationSwitchDown:function(){return"Mostrar página"},formatPaginationSwitchUp:function(){return"Esconder página"},formatRefresh:function(){return"Actualizar"},formatToggleOn:function(){return"Mostrar vista em forma de cartão"},formatToggleOff:function(){return"Esconder vista em forma de cartão"},formatColumns:function(){return"Colunas"},formatColumnsToggleAll:function(){return"Activar tudo"},formatFullscreen:function(){return"Ecrã completo"},formatAllRows:function(){return"Tudo"},formatAutoRefresh:function(){return"Actualização autmática"},formatExport:function(){return"Exportar dados"},formatJumpTo:function(){return"Avançar"},formatAdvancedSearch:function(){return"Pesquisa avançada"},formatAdvancedCloseButton:function(){return"Fechar"},formatFilterControlSwitch:function(){return"Ocultar/Exibir controles"},formatFilterControlSwitchHide:function(){return"Esconder controlos"},formatFilterControlSwitchShow:function(){return"Exibir controlos"},formatAddLevel:function(){return"Adicionar nível"},formatCancel:function(){return"Cancelar"},formatColumn:function(){return"Coluna"},formatDeleteLevel:function(){return"Remover nível"},formatDuplicateAlertTitle:function(){return"Foram encontradas entradas duplicadas!"},formatDuplicateAlertDescription:function(){return"Por favor, remova ou altere as colunas duplicadas"},formatMultipleSort:function(){return"Ordenação múltipla"},formatOrder:function(){return"Ordem"},formatSort:function(){return"Ordenar"},formatSortBy:function(){return"Ordenar por"},formatThenBy:function(){return"em seguida"},formatSortOrders:function(){return{asc:"Ascendente",desc:"Descendente"}}},Object.assign(t.fn.bootstrapTable.defaults,t.fn.bootstrapTable.locales["pt-PT"]),t.fn.bootstrapTable.locales["ro-RO"]=t.fn.bootstrapTable.locales.ro={formatCopyRows:function(){return"Copy Rows"},formatPrint:function(){return"Print"},formatLoadingMessage:function(){return"Se incarca, va rugam asteptati"},formatRecordsPerPage:function(t){return"".concat(t," inregistrari pe pagina")},formatShowingRows:function(t,n,r,o){return void 0!==o&&o>0&&o>r?"Arata de la ".concat(t," pana la ").concat(n," din ").concat(r," randuri (filtered from ").concat(o," total rows)"):"Arata de la ".concat(t," pana la ").concat(n," din ").concat(r," randuri")},formatSRPaginationPreText:function(){return"previous page"},formatSRPaginationPageText:function(t){return"to page ".concat(t)},formatSRPaginationNextText:function(){return"next page"},formatDetailPagination:function(t){return"Showing ".concat(t," rows")},formatClearSearch:function(){return"Clear Search"},formatSearch:function(){return"Cauta"},formatNoMatches:function(){return"Nu au fost gasite inregistrari"},formatPaginationSwitch:function(){return"Ascunde/Arata paginatia"},formatPaginationSwitchDown:function(){return"Show pagination"},formatPaginationSwitchUp:function(){return"Hide pagination"},formatRefresh:function(){return"Reincarca"},formatToggleOn:function(){return"Show card view"},formatToggleOff:function(){return"Hide card view"},formatColumns:function(){return"Coloane"},formatColumnsToggleAll:function(){return"Toggle all"},formatFullscreen:function(){return"Fullscreen"},formatAllRows:function(){return"Toate"},formatAutoRefresh:function(){return"Auto Refresh"},formatExport:function(){return"Export data"},formatJumpTo:function(){return"GO"},formatAdvancedSearch:function(){return"Advanced search"},formatAdvancedCloseButton:function(){return"Close"},formatFilterControlSwitch:function(){return"Hide/Show controls"},formatFilterControlSwitchHide:function(){return"Hide controls"},formatFilterControlSwitchShow:function(){return"Show controls"}},Object.assign(t.fn.bootstrapTable.defaults,t.fn.bootstrapTable.locales["ro-RO"]),t.fn.bootstrapTable.locales["ka-GE"]=t.fn.bootstrapTable.locales.ka={formatCopyRows:function(){return"Copy Rows"},formatPrint:function(){return"Print"},formatLoadingMessage:function(){return"იტვირთება, გთხოვთ მოიცადოთ"},formatRecordsPerPage:function(t){return"".concat(t," ჩანაწერი თითო გვერდზე")},formatShowingRows:function(t,n,r,o){return void 0!==o&&o>0&&o>r?"ნაჩვენებია ".concat(t,"-დან ").concat(n,"-მდე ჩანაწერი ჯამური ").concat(r,"-დან (filtered from ").concat(o," total rows)"):"ნაჩვენებია ".concat(t,"-დან ").concat(n,"-მდე ჩანაწერი ჯამური ").concat(r,"-დან")},formatSRPaginationPreText:function(){return"previous page"},formatSRPaginationPageText:function(t){return"to page ".concat(t)},formatSRPaginationNextText:function(){return"next page"},formatDetailPagination:function(t){return"Showing ".concat(t," rows")},formatClearSearch:function(){return"Clear Search"},formatSearch:function(){return"ძებნა"},formatNoMatches:function(){return"მონაცემები არ არის"},formatPaginationSwitch:function(){return"გვერდების გადამრთველის დამალვა/გამოჩენა"},formatPaginationSwitchDown:function(){return"Show pagination"},formatPaginationSwitchUp:function(){return"Hide pagination"},formatRefresh:function(){return"განახლება"},formatToggleOn:function(){return"Show card view"},formatToggleOff:function(){return"Hide card view"},formatColumns:function(){return"სვეტები"},formatColumnsToggleAll:function(){return"Toggle all"},formatFullscreen:function(){return"Fullscreen"},formatAllRows:function(){return"All"},formatAutoRefresh:function(){return"Auto Refresh"},formatExport:function(){return"Export data"},formatJumpTo:function(){return"GO"},formatAdvancedSearch:function(){return"Advanced search"},formatAdvancedCloseButton:function(){return"Close"},formatFilterControlSwitch:function(){return"Hide/Show controls"},formatFilterControlSwitchHide:function(){return"Hide controls"},formatFilterControlSwitchShow:function(){return"Show controls"}},Object.assign(t.fn.bootstrapTable.defaults,t.fn.bootstrapTable.locales["ka-GE"]),t.fn.bootstrapTable.locales["ru-RU"]=t.fn.bootstrapTable.locales.ru={formatCopyRows:function(){return"Скопировать строки"},formatPrint:function(){return"Печать"},formatLoadingMessage:function(){return"Пожалуйста, подождите, идёт загрузка"},formatRecordsPerPage:function(t){return"".concat(t," записей на страницу")},formatShowingRows:function(t,n,r,o){return void 0!==o&&o>0&&o>r?"Записи с ".concat(t," по ").concat(n," из ").concat(r," (отфильтровано, всего на сервере ").concat(o," записей)"):"Записи с ".concat(t," по ").concat(n," из ").concat(r)},formatSRPaginationPreText:function(){return"предыдущая страница"},formatSRPaginationPageText:function(t){return"перейти к странице ".concat(t)},formatSRPaginationNextText:function(){return"следующая страница"},formatDetailPagination:function(t){return"Загружено ".concat(t," строк")},formatClearSearch:function(){return"Очистить фильтры"},formatSearch:function(){return"Поиск"},formatNoMatches:function(){return"Ничего не найдено"},formatPaginationSwitch:function(){return"Скрыть/Показать постраничную навигацию"},formatPaginationSwitchDown:function(){return"Показать постраничную навигацию"},formatPaginationSwitchUp:function(){return"Скрыть постраничную навигацию"},formatRefresh:function(){return"Обновить"},formatToggleOn:function(){return"Показать записи в виде карточек"},formatToggleOff:function(){return"Табличный режим просмотра"},formatColumns:function(){return"Колонки"},formatColumnsToggleAll:function(){return"Выбрать все"},formatFullscreen:function(){return"Полноэкранный режим"},formatAllRows:function(){return"Все"},formatAutoRefresh:function(){return"Автоматическое обновление"},formatExport:function(){return"Экспортировать данные"},formatJumpTo:function(){return"Стр."},formatAdvancedSearch:function(){return"Расширенный поиск"},formatAdvancedCloseButton:function(){return"Закрыть"},formatFilterControlSwitch:function(){return"Скрыть/Показать панель инструментов"},formatFilterControlSwitchHide:function(){return"Скрыть панель инструментов"},formatFilterControlSwitchShow:function(){return"Показать панель инструментов"}},Object.assign(t.fn.bootstrapTable.defaults,t.fn.bootstrapTable.locales["ru-RU"]),t.fn.bootstrapTable.locales["sk-SK"]=t.fn.bootstrapTable.locales.sk={formatCopyRows:function(){return"Skopírovať riadky"},formatPrint:function(){return"Vytlačiť"},formatLoadingMessage:function(){return"Prosím čakajte"},formatRecordsPerPage:function(t){return"".concat(t," záznamov na stranu")},formatShowingRows:function(t,n,r,o){return void 0!==o&&o>0&&o>r?"Zobrazená ".concat(t,". - ").concat(n,". položka z celkových ").concat(r," (filtered from ").concat(o," total rows)"):"Zobrazená ".concat(t,". - ").concat(n,". položka z celkových ").concat(r)},formatSRPaginationPreText:function(){return"Predchádzajúca strana"},formatSRPaginationPageText:function(t){return"na stranu ".concat(t)},formatSRPaginationNextText:function(){return"Nasledujúca strana"},formatDetailPagination:function(t){return"Zobrazuje sa ".concat(t," riadkov")},formatClearSearch:function(){return"Odstráň filtre"},formatSearch:function(){return"Vyhľadávanie"},formatNoMatches:function(){return"Nenájdená žiadna vyhovujúca položka"},formatPaginationSwitch:function(){return"Skry/Zobraz stránkovanie"},formatPaginationSwitchDown:function(){return"Zobraziť stránkovanie"},formatPaginationSwitchUp:function(){return"Skryť stránkovanie"},formatRefresh:function(){return"Obnoviť"},formatToggleOn:function(){return"Zobraziť kartové zobrazenie"},formatToggleOff:function(){return"skryť kartové zobrazenie"},formatColumns:function(){return"Stĺpce"},formatColumnsToggleAll:function(){return"Prepnúť všetky"},formatFullscreen:function(){return"Celá obrazovka"},formatAllRows:function(){return"Všetky"},formatAutoRefresh:function(){return"Automatické obnovenie"},formatExport:function(){return"Exportuj dáta"},formatJumpTo:function(){return"Ísť"},formatAdvancedSearch:function(){return"Pokročilé vyhľadávanie"},formatAdvancedCloseButton:function(){return"Zatvoriť"},formatFilterControlSwitch:function(){return"Zobraziť/Skryť tlačidlá"},formatFilterControlSwitchHide:function(){return"Skryť tlačidlá"},formatFilterControlSwitchShow:function(){return"Zobraziť tlačidlá"}},Object.assign(t.fn.bootstrapTable.defaults,t.fn.bootstrapTable.locales["sk-SK"]),t.fn.bootstrapTable.locales["sl-SI"]=t.fn.bootstrapTable.locales.sl={formatCopyRows:function(){return"Kopiraj vrstice"},formatPrint:function(){return"Natisni"},formatLoadingMessage:function(){return"Prosim počakajte..."},formatRecordsPerPage:function(t){return"".concat(t," vrstic na stran")},formatShowingRows:function(t,n,r,o){return void 0!==o&&o>0&&o>r?"Prikaz ".concat(t," do ").concat(n," od ").concat(r," vrstic (filtrirano od skupno ").concat(o," vrstic)"):"Prikaz ".concat(t," do ").concat(n," od ").concat(r," vrstic")},formatSRPaginationPreText:function(){return"prejšnja stran"},formatSRPaginationPageText:function(t){return"na stran ".concat(t)},formatSRPaginationNextText:function(){return"na slednja stran"},formatDetailPagination:function(t){return"Prikaz ".concat(t," vrstic")},formatClearSearch:function(){return"Počisti"},formatSearch:function(){return"Iskanje"},formatNoMatches:function(){return"Ni najdenih rezultatov"},formatPaginationSwitch:function(){return"Skrij/Pokaži oštevilčevanje strani"},formatPaginationSwitchDown:function(){return"Pokaži oštevilčevanje strani"},formatPaginationSwitchUp:function(){return"Skrij oštevilčevanje strani"},formatRefresh:function(){return"Osveži"},formatToggleOn:function(){return"Prikaži kartični pogled"},formatToggleOff:function(){return"Skrij kartični pogled"},formatColumns:function(){return"Stolpci"},formatColumnsToggleAll:function(){return"Preklopi vse"},formatFullscreen:function(){return"Celozaslonski prikaz"},formatAllRows:function(){return"Vse"},formatAutoRefresh:function(){return"Samodejna osvežitev"},formatExport:function(){return"Izvoz podatkov"},formatJumpTo:function(){return"GO"},formatAdvancedSearch:function(){return"Napredno iskanje"},formatAdvancedCloseButton:function(){return"Zapri"},formatFilterControlSwitch:function(){return"Skrij/Pokaži kontrole"},formatFilterControlSwitchHide:function(){return"Skrij kontrole"},formatFilterControlSwitchShow:function(){return"Pokaži kontrole"}},Object.assign(t.fn.bootstrapTable.defaults,t.fn.bootstrapTable.locales["sl-SI"]),t.fn.bootstrapTable.locales["sr-Cyrl-RS"]=t.fn.bootstrapTable.locales.sr={formatCopyRows:function(){return"Copy Rows"},formatPrint:function(){return"Print"},formatLoadingMessage:function(){return"Молим сачекај"},formatRecordsPerPage:function(t){return"".concat(t," редова по страни")},formatShowingRows:function(t,n,r,o){return void 0!==o&&o>0&&o>r?"Приказано ".concat(t,". - ").concat(n,". од укупног броја редова ").concat(r," (филтрирано од ").concat(o,")"):"Приказано ".concat(t,". - ").concat(n,". од укупног броја редова ").concat(r)},formatSRPaginationPreText:function(){return"претходна страна"},formatSRPaginationPageText:function(t){return"на страну ".concat(t)},formatSRPaginationNextText:function(){return"следећа страна"},formatDetailPagination:function(t){return"Приказано ".concat(t," редова")},formatClearSearch:function(){return"Обриши претрагу"},formatSearch:function(){return"Пронађи"},formatNoMatches:function(){return"Није пронађен ни један податак"},formatPaginationSwitch:function(){return"Прикажи/сакриј пагинацију"},formatPaginationSwitchDown:function(){return"Прикажи пагинацију"},formatPaginationSwitchUp:function(){return"Сакриј пагинацију"},formatRefresh:function(){return"Освежи"},formatToggleOn:function(){return"Прикажи картице"},formatToggleOff:function(){return"Сакриј картице"},formatColumns:function(){return"Колоне"},formatColumnsToggleAll:function(){return"Прикажи/сакриј све"},formatFullscreen:function(){return"Цео екран"},formatAllRows:function(){return"Све"},formatAutoRefresh:function(){return"Аутоматско освежавање"},formatExport:function(){return"Извези податке"},formatJumpTo:function(){return"Иди"},formatAdvancedSearch:function(){return"Напредна претрага"},formatAdvancedCloseButton:function(){return"Затвори"},formatFilterControlSwitch:function(){return"Hide/Show controls"},formatFilterControlSwitchHide:function(){return"Hide controls"},formatFilterControlSwitchShow:function(){return"Show controls"}},Object.assign(t.fn.bootstrapTable.defaults,t.fn.bootstrapTable.locales["sr-Cyrl-RS"]),t.fn.bootstrapTable.locales["sr-Latn-RS"]={formatCopyRows:function(){return"Copy Rows"},formatPrint:function(){return"Print"},formatLoadingMessage:function(){return"Molim sačekaj"},formatRecordsPerPage:function(t){return"".concat(t," redova po strani")},formatShowingRows:function(t,n,r,o){return void 0!==o&&o>0&&o>r?"Prikazano ".concat(t,". - ").concat(n,". od ukupnog broja redova ").concat(r," (filtrirano od ").concat(o,")"):"Prikazano ".concat(t,". - ").concat(n,". od ukupnog broja redova ").concat(r)},formatSRPaginationPreText:function(){return"prethodna strana"},formatSRPaginationPageText:function(t){return"na stranu ".concat(t)},formatSRPaginationNextText:function(){return"sledeća strana"},formatDetailPagination:function(t){return"Prikazano ".concat(t," redova")},formatClearSearch:function(){return"Obriši pretragu"},formatSearch:function(){return"Pronađi"},formatNoMatches:function(){return"Nije pronađen ni jedan podatak"},formatPaginationSwitch:function(){return"Prikaži/sakrij paginaciju"},formatPaginationSwitchDown:function(){return"Prikaži paginaciju"},formatPaginationSwitchUp:function(){return"Sakrij paginaciju"},formatRefresh:function(){return"Osveži"},formatToggleOn:function(){return"Prikaži kartice"},formatToggleOff:function(){return"Sakrij kartice"},formatColumns:function(){return"Kolone"},formatColumnsToggleAll:function(){return"Prikaži/sakrij sve"},formatFullscreen:function(){return"Ceo ekran"},formatAllRows:function(){return"Sve"},formatAutoRefresh:function(){return"Automatsko osvežavanje"},formatExport:function(){return"Izvezi podatke"},formatJumpTo:function(){return"Idi"},formatAdvancedSearch:function(){return"Napredna pretraga"},formatAdvancedCloseButton:function(){return"Zatvori"},formatFilterControlSwitch:function(){return"Hide/Show controls"},formatFilterControlSwitchHide:function(){return"Hide controls"},formatFilterControlSwitchShow:function(){return"Show controls"}},Object.assign(t.fn.bootstrapTable.defaults,t.fn.bootstrapTable.locales["sr-Latn-RS"]),t.fn.bootstrapTable.locales["sv-SE"]=t.fn.bootstrapTable.locales.sv={formatCopyRows:function(){return"Copy Rows"},formatPrint:function(){return"Print"},formatLoadingMessage:function(){return"Laddar, vänligen vänta"},formatRecordsPerPage:function(t){return"".concat(t," rader per sida")},formatShowingRows:function(t,n,r,o){return void 0!==o&&o>0&&o>r?"Visa ".concat(t," till ").concat(n," av ").concat(r," rader (filtered from ").concat(o," total rows)"):"Visa ".concat(t," till ").concat(n," av ").concat(r," rader")},formatSRPaginationPreText:function(){return"previous page"},formatSRPaginationPageText:function(t){return"to page ".concat(t)},formatSRPaginationNextText:function(){return"next page"},formatDetailPagination:function(t){return"Showing ".concat(t," rows")},formatClearSearch:function(){return"Clear Search"},formatSearch:function(){return"Sök"},formatNoMatches:function(){return"Inga matchande resultat funna."},formatPaginationSwitch:function(){return"Hide/Show pagination"},formatPaginationSwitchDown:function(){return"Show pagination"},formatPaginationSwitchUp:function(){return"Hide pagination"},formatRefresh:function(){return"Uppdatera"},formatToggleOn:function(){return"Show card view"},formatToggleOff:function(){return"Hide card view"},formatColumns:function(){return"kolumn"},formatColumnsToggleAll:function(){return"Toggle all"},formatFullscreen:function(){return"Fullscreen"},formatAllRows:function(){return"All"},formatAutoRefresh:function(){return"Auto Refresh"},formatExport:function(){return"Export data"},formatJumpTo:function(){return"GO"},formatAdvancedSearch:function(){return"Advanced search"},formatAdvancedCloseButton:function(){return"Close"},formatFilterControlSwitch:function(){return"Hide/Show controls"},formatFilterControlSwitchHide:function(){return"Hide controls"},formatFilterControlSwitchShow:function(){return"Show controls"}},Object.assign(t.fn.bootstrapTable.defaults,t.fn.bootstrapTable.locales["sv-SE"]),t.fn.bootstrapTable.locales["th-TH"]=t.fn.bootstrapTable.locales.th={formatCopyRows:function(){return"Copy Rows"},formatPrint:function(){return"Print"},formatLoadingMessage:function(){return"กำลังโหลดข้อมูล, กรุณารอสักครู่"},formatRecordsPerPage:function(t){return"".concat(t," รายการต่อหน้า")},formatShowingRows:function(t,n,r,o){return void 0!==o&&o>0&&o>r?"รายการที่ ".concat(t," ถึง ").concat(n," จากทั้งหมด ").concat(r," รายการ (filtered from ").concat(o," total rows)"):"รายการที่ ".concat(t," ถึง ").concat(n," จากทั้งหมด ").concat(r," รายการ")},formatSRPaginationPreText:function(){return"previous page"},formatSRPaginationPageText:function(t){return"to page ".concat(t)},formatSRPaginationNextText:function(){return"next page"},formatDetailPagination:function(t){return"Showing ".concat(t," rows")},formatClearSearch:function(){return"Clear Search"},formatSearch:function(){return"ค้นหา"},formatNoMatches:function(){return"ไม่พบรายการที่ค้นหา !"},formatPaginationSwitch:function(){return"Hide/Show pagination"},formatPaginationSwitchDown:function(){return"Show pagination"},formatPaginationSwitchUp:function(){return"Hide pagination"},formatRefresh:function(){return"รีเฟรส"},formatToggleOn:function(){return"Show card view"},formatToggleOff:function(){return"Hide card view"},formatColumns:function(){return"คอลัมน์"},formatColumnsToggleAll:function(){return"Toggle all"},formatFullscreen:function(){return"Fullscreen"},formatAllRows:function(){return"All"},formatAutoRefresh:function(){return"Auto Refresh"},formatExport:function(){return"Export data"},formatJumpTo:function(){return"GO"},formatAdvancedSearch:function(){return"Advanced search"},formatAdvancedCloseButton:function(){return"Close"},formatFilterControlSwitch:function(){return"Hide/Show controls"},formatFilterControlSwitchHide:function(){return"Hide controls"},formatFilterControlSwitchShow:function(){return"Show controls"}},Object.assign(t.fn.bootstrapTable.defaults,t.fn.bootstrapTable.locales["th-TH"]),t.fn.bootstrapTable.locales["uk-UA"]=t.fn.bootstrapTable.locales.uk={formatCopyRows:function(){return"Скопіювати рядки"},formatPrint:function(){return"Друк"},formatLoadingMessage:function(){return"Завантаження, будь ласка, зачекайте"},formatRecordsPerPage:function(t){return"".concat(t," рядків на сторінку")},formatShowingRows:function(t,n,r,o){return void 0!==o&&o>0&&o>r?"Відображено рядки з ".concat(t," по ").concat(n," з ").concat(r," загалом (відфільтровано з ").concat(o," рядків)"):"Відображено рядки з ".concat(t," по ").concat(n," з ").concat(r," загалом")},formatSRPaginationPreText:function(){return"попередня сторінка"},formatSRPaginationPageText:function(t){return"до сторінки ".concat(t)},formatSRPaginationNextText:function(){return"наступна сторінка"},formatDetailPagination:function(t){return"Відображено ".concat(t," рядків")},formatClearSearch:function(){return"Скинути фільтри"},formatSearch:function(){return"Пошук"},formatNoMatches:function(){return"Не знайдено жодного запису"},formatPaginationSwitch:function(){return"Сховати/Відобразити пагінацію"},formatPaginationSwitchDown:function(){return"Відобразити пагінацію"},formatPaginationSwitchUp:function(){return"Сховати пагінацію"},formatRefresh:function(){return"Оновити"},formatToggleOn:function(){return"Відобразити у форматі карток"},formatToggleOff:function(){return"Вимкнути формат карток"},formatColumns:function(){return"Стовпці"},formatColumnsToggleAll:function(){return"Переключити усі"},formatFullscreen:function(){return"Повноекранний режим"},formatAllRows:function(){return"Усі"},formatAutoRefresh:function(){return"Автооновлення"},formatExport:function(){return"Експортувати дані"},formatJumpTo:function(){return"Швидкий перехід до"},formatAdvancedSearch:function(){return"Розширений пошук"},formatAdvancedCloseButton:function(){return"Закрити"},formatFilterControlSwitch:function(){return"Сховати/Відобразити елементи керування"},formatFilterControlSwitchHide:function(){return"Сховати елементи керування"},formatFilterControlSwitchShow:function(){return"Відобразити елементи керування"}},Object.assign(t.fn.bootstrapTable.defaults,t.fn.bootstrapTable.locales["uk-UA"]),t.fn.bootstrapTable.locales["tr-TR"]=t.fn.bootstrapTable.locales.tr={formatCopyRows:function(){return"Satırları Kopyala"},formatPrint:function(){return"Yazdır"},formatLoadingMessage:function(){return"Yükleniyor, lütfen bekleyin"},formatRecordsPerPage:function(t){return"Sayfa başına ".concat(t," kayıt.")},formatShowingRows:function(t,n,r,o){return void 0!==o&&o>0&&o>r?"".concat(r," kayıttan ").concat(t,"-").concat(n," arası gösteriliyor (").concat(o," toplam satır filtrelendi)."):"".concat(r," kayıttan ").concat(t,"-").concat(n," arası gösteriliyor.")},formatSRPaginationPreText:function(){return"önceki sayfa"},formatSRPaginationPageText:function(t){return"sayfa ".concat(t)},formatSRPaginationNextText:function(){return"sonraki sayfa"},formatDetailPagination:function(t){return"".concat(t," satır gösteriliyor")},formatClearSearch:function(){return"Aramayı Temizle"},formatSearch:function(){return"Ara"},formatNoMatches:function(){return"Eşleşen kayıt bulunamadı."},formatPaginationSwitch:function(){return"Sayfalamayı Gizle/Göster"},formatPaginationSwitchDown:function(){return"Sayfalamayı Göster"},formatPaginationSwitchUp:function(){return"Sayfalamayı Gizle"},formatRefresh:function(){return"Yenile"},formatToggleOn:function(){return"Kart Görünümünü Göster"},formatToggleOff:function(){return"Kart Görünümünü Gizle"},formatColumns:function(){return"Sütunlar"},formatColumnsToggleAll:function(){return"Tümünü Kapat"},formatFullscreen:function(){return"Tam Ekran"},formatAllRows:function(){return"Tüm Satırlar"},formatAutoRefresh:function(){return"Otomatik Yenileme"},formatExport:function(){return"Verileri Dışa Aktar"},formatJumpTo:function(){return"Git"},formatAdvancedSearch:function(){return"Gelişmiş Arama"},formatAdvancedCloseButton:function(){return"Kapat"},formatFilterControlSwitch:function(){return"Kontrolleri Gizle/Göster"},formatFilterControlSwitchHide:function(){return"Kontrolleri Gizle"},formatFilterControlSwitchShow:function(){return"Kontrolleri Göster"}},Object.assign(t.fn.bootstrapTable.defaults,t.fn.bootstrapTable.locales["tr-TR"]),t.fn.bootstrapTable.locales["ur-PK"]=t.fn.bootstrapTable.locales.ur={formatCopyRows:function(){return"Copy Rows"},formatPrint:function(){return"Print"},formatLoadingMessage:function(){return"براۓ مہربانی انتظار کیجئے"},formatRecordsPerPage:function(t){return"".concat(t," ریکارڈز فی صفہ ")},formatShowingRows:function(t,n,r,o){return void 0!==o&&o>0&&o>r?"دیکھیں ".concat(t," سے ").concat(n," کے ").concat(r,"ریکارڈز (filtered from ").concat(o," total rows)"):"دیکھیں ".concat(t," سے ").concat(n," کے ").concat(r,"ریکارڈز")},formatSRPaginationPreText:function(){return"previous page"},formatSRPaginationPageText:function(t){return"to page ".concat(t)},formatSRPaginationNextText:function(){return"next page"},formatDetailPagination:function(t){return"Showing ".concat(t," rows")},formatClearSearch:function(){return"Clear Search"},formatSearch:function(){return"تلاش"},formatNoMatches:function(){return"کوئی ریکارڈ نہیں ملا"},formatPaginationSwitch:function(){return"Hide/Show pagination"},formatPaginationSwitchDown:function(){return"Show pagination"},formatPaginationSwitchUp:function(){return"Hide pagination"},formatRefresh:function(){return"تازہ کریں"},formatToggleOn:function(){return"Show card view"},formatToggleOff:function(){return"Hide card view"},formatColumns:function(){return"کالم"},formatColumnsToggleAll:function(){return"Toggle all"},formatFullscreen:function(){return"Fullscreen"},formatAllRows:function(){return"All"},formatAutoRefresh:function(){return"Auto Refresh"},formatExport:function(){return"Export data"},formatJumpTo:function(){return"GO"},formatAdvancedSearch:function(){return"Advanced search"},formatAdvancedCloseButton:function(){return"Close"},formatFilterControlSwitch:function(){return"Hide/Show controls"},formatFilterControlSwitchHide:function(){return"Hide controls"},formatFilterControlSwitchShow:function(){return"Show controls"}},Object.assign(t.fn.bootstrapTable.defaults,t.fn.bootstrapTable.locales["ur-PK"]),t.fn.bootstrapTable.locales["uz-Latn-UZ"]=t.fn.bootstrapTable.locales.uz={formatCopyRows:function(){return"Copy Rows"},formatPrint:function(){return"Print"},formatLoadingMessage:function(){return"Yuklanyapti, iltimos kuting"},formatRecordsPerPage:function(t){return"".concat(t," qator har sahifada")},formatShowingRows:function(t,n,r,o){return void 0!==o&&o>0&&o>r?"Ko'rsatypati ".concat(t," dan ").concat(n," gacha ").concat(r," qatorlarni (filtered from ").concat(o," total rows)"):"Ko'rsatypati ".concat(t," dan ").concat(n," gacha ").concat(r," qatorlarni")},formatSRPaginationPreText:function(){return"previous page"},formatSRPaginationPageText:function(t){return"to page ".concat(t)},formatSRPaginationNextText:function(){return"next page"},formatDetailPagination:function(t){return"Showing ".concat(t," rows")},formatClearSearch:function(){return"Filtrlarni tozalash"},formatSearch:function(){return"Qidirish"},formatNoMatches:function(){return"Hech narsa topilmadi"},formatPaginationSwitch:function(){return"Sahifalashni yashirish/ko'rsatish"},formatPaginationSwitchDown:function(){return"Show pagination"},formatPaginationSwitchUp:function(){return"Hide pagination"},formatRefresh:function(){return"Yangilash"},formatToggleOn:function(){return"Show card view"},formatToggleOff:function(){return"Hide card view"},formatColumns:function(){return"Ustunlar"},formatColumnsToggleAll:function(){return"Toggle all"},formatFullscreen:function(){return"Fullscreen"},formatAllRows:function(){return"Hammasi"},formatAutoRefresh:function(){return"Auto Refresh"},formatExport:function(){return"Eksport"},formatJumpTo:function(){return"GO"},formatAdvancedSearch:function(){return"Advanced search"},formatAdvancedCloseButton:function(){return"Close"},formatFilterControlSwitch:function(){return"Hide/Show controls"},formatFilterControlSwitchHide:function(){return"Hide controls"},formatFilterControlSwitchShow:function(){return"Show controls"}},Object.assign(t.fn.bootstrapTable.defaults,t.fn.bootstrapTable.locales["uz-Latn-UZ"]),t.fn.bootstrapTable.locales["vi-VN"]=t.fn.bootstrapTable.locales.vi={formatCopyRows:function(){return"Sao chép hàng"},formatPrint:function(){return"In"},formatLoadingMessage:function(){return"Đang tải"},formatRecordsPerPage:function(t){return"".concat(t," bản ghi mỗi trang")},formatShowingRows:function(t,n,r,o){return void 0!==o&&o>0&&o>r?"Hiển thị từ trang ".concat(t," đến ").concat(n," của ").concat(r," bản ghi (được lọc từ tổng ").concat(o," hàng)"):"Hiển thị từ trang ".concat(t," đến ").concat(n," của ").concat(r," bản ghi")},formatSRPaginationPreText:function(){return"trang trước"},formatSRPaginationPageText:function(t){return"đến trang ".concat(t)},formatSRPaginationNextText:function(){return"trang sau"},formatDetailPagination:function(t){return"Đang hiện ".concat(t," hàng")},formatClearSearch:function(){return"Xoá tìm kiếm"},formatSearch:function(){return"Tìm kiếm"},formatNoMatches:function(){return"Không có dữ liệu"},formatPaginationSwitch:function(){return"Ẩn/Hiện phân trang"},formatPaginationSwitchDown:function(){return"Hiện phân trang"},formatPaginationSwitchUp:function(){return"Ẩn phân trang"},formatRefresh:function(){return"Làm mới"},formatToggleOn:function(){return"Hiển thị các thẻ"},formatToggleOff:function(){return"Ẩn các thẻ"},formatColumns:function(){return"Cột"},formatColumnsToggleAll:function(){return"Hiện tất cả"},formatFullscreen:function(){return"Toàn màn hình"},formatAllRows:function(){return"Tất cả"},formatAutoRefresh:function(){return"Tự động làm mới"},formatExport:function(){return"Xuất dữ liệu"},formatJumpTo:function(){return"Đến"},formatAdvancedSearch:function(){return"Tìm kiếm nâng cao"},formatAdvancedCloseButton:function(){return"Đóng"},formatFilterControlSwitch:function(){return"Ẩn/Hiện điều khiển"},formatFilterControlSwitchHide:function(){return"Ẩn điều khiển"},formatFilterControlSwitchShow:function(){return"Hiện điều khiển"}},Object.assign(t.fn.bootstrapTable.defaults,t.fn.bootstrapTable.locales["vi-VN"]),t.fn.bootstrapTable.locales["zh-CN"]=t.fn.bootstrapTable.locales.zh={formatCopyRows:function(){return"复制行"},formatPrint:function(){return"打印"},formatLoadingMessage:function(){return"正在努力地加载数据中，请稍候"},formatRecordsPerPage:function(t){return"每页显示 ".concat(t," 条记录")},formatShowingRows:function(t,n,r,o){return void 0!==o&&o>0&&o>r?"显示第 ".concat(t," 到第 ").concat(n," 条记录，总共 ").concat(r," 条记录（从 ").concat(o," 总记录中过滤）"):"显示第 ".concat(t," 到第 ").concat(n," 条记录，总共 ").concat(r," 条记录")},formatSRPaginationPreText:function(){return"上一页"},formatSRPaginationPageText:function(t){return"第".concat(t,"页")},formatSRPaginationNextText:function(){return"下一页"},formatDetailPagination:function(t){return"总共 ".concat(t," 条记录")},formatClearSearch:function(){return"清空过滤"},formatSearch:function(){return"搜索"},formatNoMatches:function(){return"没有找到匹配的记录"},formatPaginationSwitch:function(){return"隐藏/显示分页"},formatPaginationSwitchDown:function(){return"显示分页"},formatPaginationSwitchUp:function(){return"隐藏分页"},formatRefresh:function(){return"刷新"},formatToggleOn:function(){return"显示卡片视图"},formatToggleOff:function(){return"隐藏卡片视图"},formatColumns:function(){return"列"},formatColumnsToggleAll:function(){return"切换所有"},formatFullscreen:function(){return"全屏"},formatAllRows:function(){return"所有"},formatAutoRefresh:function(){return"自动刷新"},formatExport:function(){return"导出数据"},formatJumpTo:function(){return"跳转"},formatAdvancedSearch:function(){return"高级搜索"},formatAdvancedCloseButton:function(){return"关闭"},formatFilterControlSwitch:function(){return"隐藏/显示过滤控制"},formatFilterControlSwitchHide:function(){return"隐藏过滤控制"},formatFilterControlSwitchShow:function(){return"显示过滤控制"}},Object.assign(t.fn.bootstrapTable.defaults,t.fn.bootstrapTable.locales["zh-CN"]),t.fn.bootstrapTable.locales["zh-TW"]={formatCopyRows:function(){return"複製行"},formatPrint:function(){return"列印"},formatLoadingMessage:function(){return"正在努力地載入資料，請稍候"},formatRecordsPerPage:function(t){return"每頁顯示 ".concat(t," 項記錄")},formatShowingRows:function(t,n,r,o){return void 0!==o&&o>0&&o>r?"顯示第 ".concat(t," 到第 ").concat(n," 項記錄，總共 ").concat(r," 項記錄（從 ").concat(o," 總記錄中過濾）"):"顯示第 ".concat(t," 到第 ").concat(n," 項記錄，總共 ").concat(r," 項記錄")},formatSRPaginationPreText:function(){return"上一頁"},formatSRPaginationPageText:function(t){return"第".concat(t,"頁")},formatSRPaginationNextText:function(){return"下一頁"},formatDetailPagination:function(t){return"總共 ".concat(t," 項記錄")},formatClearSearch:function(){return"清空過濾"},formatSearch:function(){return"搜尋"},formatNoMatches:function(){return"沒有找到符合的結果"},formatPaginationSwitch:function(){return"隱藏/顯示分頁"},formatPaginationSwitchDown:function(){return"顯示分頁"},formatPaginationSwitchUp:function(){return"隱藏分頁"},formatRefresh:function(){return"重新整理"},formatToggleOn:function(){return"顯示卡片視圖"},formatToggleOff:function(){return"隱藏卡片視圖"},formatColumns:function(){return"列"},formatColumnsToggleAll:function(){return"切換所有"},formatFullscreen:function(){return"全屏"},formatAllRows:function(){return"所有"},formatAutoRefresh:function(){return"自動刷新"},formatExport:function(){return"導出數據"},formatJumpTo:function(){return"跳轉"},formatAdvancedSearch:function(){return"高級搜尋"},formatAdvancedCloseButton:function(){return"關閉"},formatFilterControlSwitch:function(){return"隱藏/顯示過濾控制"},formatFilterControlSwitchHide:function(){return"隱藏過濾控制"},formatFilterControlSwitchShow:function(){return"顯示過濾控制"}},Object.assign(t.fn.bootstrapTable.defaults,t.fn.bootstrapTable.locales["zh-TW"]),t.fn.bootstrapTable.locales["es-AR"]={formatCopyRows:function(){return"Copiar Filas"},formatPrint:function(){return"Imprimir"},formatLoadingMessage:function(){return"Cargando, espere por favor"},formatRecordsPerPage:function(t){return"".concat(t," registros por página")},formatShowingRows:function(t,n,r,o){return void 0!==o&&o>0&&o>r?"Mostrando desde ".concat(t," a ").concat(n," de ").concat(r," filas (filtrado de ").concat(o," columnas totales)"):"Mostrando desde ".concat(t," a ").concat(n," de ").concat(r," filas")},formatSRPaginationPreText:function(){return"página anterior"},formatSRPaginationPageText:function(t){return"a la página ".concat(t)},formatSRPaginationNextText:function(){return"siguiente página"},formatDetailPagination:function(t){return"Mostrando ".concat(t," columnas")},formatClearSearch:function(){return"Limpiar búsqueda"},formatSearch:function(){return"Buscar"},formatNoMatches:function(){return"No se encontraron registros"},formatPaginationSwitch:function(){return"Ocultar/Mostrar paginación"},formatPaginationSwitchDown:function(){return"Mostrar paginación"},formatPaginationSwitchUp:function(){return"Ocultar paginación"},formatRefresh:function(){return"Recargar"},formatToggleOn:function(){return"Mostrar vista de carta"},formatToggleOff:function(){return"Ocultar vista de carta"},formatColumns:function(){return"Columnas"},formatColumnsToggleAll:function(){return"Cambiar todo"},formatFullscreen:function(){return"Pantalla completa"},formatAllRows:function(){return"Todo"},formatAutoRefresh:function(){return"Auto Recargar"},formatExport:function(){return"Exportar datos"},formatJumpTo:function(){return"Ir"},formatAdvancedSearch:function(){return"Búsqueda avanzada"},formatAdvancedCloseButton:function(){return"Cerrar"},formatFilterControlSwitch:function(){return"Ocultar/Mostrar controles"},formatFilterControlSwitchHide:function(){return"Ocultar controles"},formatFilterControlSwitchShow:function(){return"Mostrar controles"}},Object.assign(t.fn.bootstrapTable.defaults,t.fn.bootstrapTable.locales["es-AR"])}));
diff --git a/public/js/dist/bootstrap-table.js b/public/js/dist/bootstrap-table.js
index 5b74860cb5..849c65394f 100644
--- a/public/js/dist/bootstrap-table.js
+++ b/public/js/dist/bootstrap-table.js
@@ -405,8 +405,92 @@
   typeof exports === 'object' && typeof module !== 'undefined' ? module.exports = factory(require('jquery')) :
   typeof define === 'function' && define.amd ? define(['jquery'], factory) :
   (global = typeof globalThis !== 'undefined' ? globalThis : global || self, global.BootstrapTable = factory(global.jQuery));
-})(this, (function ($$q) { 'use strict';
+})(this, (function ($) { 'use strict';
 
+  function _arrayLikeToArray(r, a) {
+    (null == a || a > r.length) && (a = r.length);
+    for (var e = 0, n = Array(a); e < a; e++) n[e] = r[e];
+    return n;
+  }
+  function _arrayWithHoles(r) {
+    if (Array.isArray(r)) return r;
+  }
+  function _arrayWithoutHoles(r) {
+    if (Array.isArray(r)) return _arrayLikeToArray(r);
+  }
+  function _classCallCheck(a, n) {
+    if (!(a instanceof n)) throw new TypeError("Cannot call a class as a function");
+  }
+  function _defineProperties(e, r) {
+    for (var t = 0; t < r.length; t++) {
+      var o = r[t];
+      o.enumerable = o.enumerable || !1, o.configurable = !0, "value" in o && (o.writable = !0), Object.defineProperty(e, _toPropertyKey(o.key), o);
+    }
+  }
+  function _createClass(e, r, t) {
+    return r && _defineProperties(e.prototype, r), Object.defineProperty(e, "prototype", {
+      writable: !1
+    }), e;
+  }
+  function _createForOfIteratorHelper(r, e) {
+    var t = "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"];
+    if (!t) {
+      if (Array.isArray(r) || (t = _unsupportedIterableToArray(r)) || e) {
+        t && (r = t);
+        var n = 0,
+          F = function () {};
+        return {
+          s: F,
+          n: function () {
+            return n >= r.length ? {
+              done: !0
+            } : {
+              done: !1,
+              value: r[n++]
+            };
+          },
+          e: function (r) {
+            throw r;
+          },
+          f: F
+        };
+      }
+      throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.");
+    }
+    var o,
+      a = !0,
+      u = !1;
+    return {
+      s: function () {
+        t = t.call(r);
+      },
+      n: function () {
+        var r = t.next();
+        return a = r.done, r;
+      },
+      e: function (r) {
+        u = !0, o = r;
+      },
+      f: function () {
+        try {
+          a || null == t.return || t.return();
+        } finally {
+          if (u) throw o;
+        }
+      }
+    };
+  }
+  function _defineProperty(e, r, t) {
+    return (r = _toPropertyKey(r)) in e ? Object.defineProperty(e, r, {
+      value: t,
+      enumerable: !0,
+      configurable: !0,
+      writable: !0
+    }) : e[r] = t, e;
+  }
+  function _iterableToArray(r) {
+    if ("undefined" != typeof Symbol && null != r[Symbol.iterator] || null != r["@@iterator"]) return Array.from(r);
+  }
   function _iterableToArrayLimit(r, l) {
     var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"];
     if (null != t) {
@@ -418,10 +502,7 @@
         f = !0,
         o = !1;
       try {
-        if (i = (t = t.call(r)).next, 0 === l) {
-          if (Object(t) !== t) return;
-          f = !1;
-        } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0);
+        if (i = (t = t.call(r)).next, 0 === l) ; else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0);
       } catch (r) {
         o = !0, n = r;
       } finally {
@@ -434,15 +515,48 @@
       return a;
     }
   }
+  function _nonIterableRest() {
+    throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.");
+  }
+  function _nonIterableSpread() {
+    throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.");
+  }
+  function ownKeys$1(e, r) {
+    var t = Object.keys(e);
+    if (Object.getOwnPropertySymbols) {
+      var o = Object.getOwnPropertySymbols(e);
+      r && (o = o.filter(function (r) {
+        return Object.getOwnPropertyDescriptor(e, r).enumerable;
+      })), t.push.apply(t, o);
+    }
+    return t;
+  }
+  function _objectSpread2(e) {
+    for (var r = 1; r < arguments.length; r++) {
+      var t = null != arguments[r] ? arguments[r] : {};
+      r % 2 ? ownKeys$1(Object(t), !0).forEach(function (r) {
+        _defineProperty(e, r, t[r]);
+      }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$1(Object(t)).forEach(function (r) {
+        Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r));
+      });
+    }
+    return e;
+  }
+  function _slicedToArray(r, e) {
+    return _arrayWithHoles(r) || _iterableToArrayLimit(r, e) || _unsupportedIterableToArray(r, e) || _nonIterableRest();
+  }
+  function _toConsumableArray(r) {
+    return _arrayWithoutHoles(r) || _iterableToArray(r) || _unsupportedIterableToArray(r) || _nonIterableSpread();
+  }
   function _toPrimitive(t, r) {
     if ("object" != typeof t || !t) return t;
     var e = t[Symbol.toPrimitive];
     if (void 0 !== e) {
-      var i = e.call(t, r || "default");
+      var i = e.call(t, r);
       if ("object" != typeof i) return i;
       throw new TypeError("@@toPrimitive must return a primitive value.");
     }
-    return ("string" === r ? String : Number)(t);
+    return (String )(t);
   }
   function _toPropertyKey(t) {
     var i = _toPrimitive(t, "string");
@@ -457,4175 +571,6352 @@
       return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o;
     }, _typeof(o);
   }
-  function _classCallCheck(instance, Constructor) {
-    if (!(instance instanceof Constructor)) {
-      throw new TypeError("Cannot call a class as a function");
+  function _unsupportedIterableToArray(r, a) {
+    if (r) {
+      if ("string" == typeof r) return _arrayLikeToArray(r, a);
+      var t = {}.toString.call(r).slice(8, -1);
+      return "Object" === t && r.constructor && (t = r.constructor.name), "Map" === t || "Set" === t ? Array.from(r) : "Arguments" === t || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(t) ? _arrayLikeToArray(r, a) : void 0;
     }
   }
-  function _defineProperties(target, props) {
-    for (var i = 0; i < props.length; i++) {
-      var descriptor = props[i];
-      descriptor.enumerable = descriptor.enumerable || false;
-      descriptor.configurable = true;
-      if ("value" in descriptor) descriptor.writable = true;
-      Object.defineProperty(target, _toPropertyKey(descriptor.key), descriptor);
-    }
-  }
-  function _createClass(Constructor, protoProps, staticProps) {
-    if (protoProps) _defineProperties(Constructor.prototype, protoProps);
-    if (staticProps) _defineProperties(Constructor, staticProps);
-    Object.defineProperty(Constructor, "prototype", {
-      writable: false
-    });
-    return Constructor;
-  }
-  function _slicedToArray(arr, i) {
-    return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest();
-  }
-  function _toConsumableArray(arr) {
-    return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread();
-  }
-  function _arrayWithoutHoles(arr) {
-    if (Array.isArray(arr)) return _arrayLikeToArray(arr);
-  }
-  function _arrayWithHoles(arr) {
-    if (Array.isArray(arr)) return arr;
-  }
-  function _iterableToArray(iter) {
-    if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter);
-  }
-  function _unsupportedIterableToArray(o, minLen) {
-    if (!o) return;
-    if (typeof o === "string") return _arrayLikeToArray(o, minLen);
-    var n = Object.prototype.toString.call(o).slice(8, -1);
-    if (n === "Object" && o.constructor) n = o.constructor.name;
-    if (n === "Map" || n === "Set") return Array.from(o);
-    if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen);
-  }
-  function _arrayLikeToArray(arr, len) {
-    if (len == null || len > arr.length) len = arr.length;
-    for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i];
-    return arr2;
-  }
-  function _nonIterableSpread() {
-    throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.");
-  }
-  function _nonIterableRest() {
-    throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.");
-  }
-  function _createForOfIteratorHelper(o, allowArrayLike) {
-    var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"];
-    if (!it) {
-      if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") {
-        if (it) o = it;
-        var i = 0;
-        var F = function () {};
-        return {
-          s: F,
-          n: function () {
-            if (i >= o.length) return {
-              done: true
-            };
-            return {
-              done: false,
-              value: o[i++]
-            };
-          },
-          e: function (e) {
-            throw e;
-          },
-          f: F
-        };
-      }
-      throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.");
-    }
-    var normalCompletion = true,
-      didErr = false,
-      err;
-    return {
-      s: function () {
-        it = it.call(o);
-      },
-      n: function () {
-        var step = it.next();
-        normalCompletion = step.done;
-        return step;
-      },
-      e: function (e) {
-        didErr = true;
-        err = e;
-      },
-      f: function () {
-        try {
-          if (!normalCompletion && it.return != null) it.return();
-        } finally {
-          if (didErr) throw err;
-        }
-      }
-    };
-  }
 
   var commonjsGlobal = typeof globalThis !== 'undefined' ? globalThis : typeof window !== 'undefined' ? window : typeof global !== 'undefined' ? global : typeof self !== 'undefined' ? self : {};
 
-  var check = function (it) {
-    return it && it.Math === Math && it;
-  };
+  var es_array_concat = {};
 
-  // https://github.com/zloirock/core-js/issues/86#issuecomment-115759028
-  var global$k =
-    // eslint-disable-next-line es/no-global-this -- safe
-    check(typeof globalThis == 'object' && globalThis) ||
-    check(typeof window == 'object' && window) ||
-    // eslint-disable-next-line no-restricted-globals -- safe
-    check(typeof self == 'object' && self) ||
-    check(typeof commonjsGlobal == 'object' && commonjsGlobal) ||
-    check(typeof commonjsGlobal == 'object' && commonjsGlobal) ||
-    // eslint-disable-next-line no-new-func -- fallback
-    (function () { return this; })() || Function('return this')();
+  var globalThis_1;
+  var hasRequiredGlobalThis;
+
+  function requireGlobalThis () {
+  	if (hasRequiredGlobalThis) return globalThis_1;
+  	hasRequiredGlobalThis = 1;
+  	var check = function (it) {
+  	  return it && it.Math === Math && it;
+  	};
+
+  	// https://github.com/zloirock/core-js/issues/86#issuecomment-115759028
+  	globalThis_1 =
+  	  // eslint-disable-next-line es/no-global-this -- safe
+  	  check(typeof globalThis == 'object' && globalThis) ||
+  	  check(typeof window == 'object' && window) ||
+  	  // eslint-disable-next-line no-restricted-globals -- safe
+  	  check(typeof self == 'object' && self) ||
+  	  check(typeof commonjsGlobal == 'object' && commonjsGlobal) ||
+  	  check(typeof globalThis_1 == 'object' && globalThis_1) ||
+  	  // eslint-disable-next-line no-new-func -- fallback
+  	  (function () { return this; })() || Function('return this')();
+  	return globalThis_1;
+  }
 
   var objectGetOwnPropertyDescriptor = {};
 
-  var fails$x = function (exec) {
-    try {
-      return !!exec();
-    } catch (error) {
-      return true;
-    }
-  };
+  var fails;
+  var hasRequiredFails;
 
-  var fails$w = fails$x;
+  function requireFails () {
+  	if (hasRequiredFails) return fails;
+  	hasRequiredFails = 1;
+  	fails = function (exec) {
+  	  try {
+  	    return !!exec();
+  	  } catch (error) {
+  	    return true;
+  	  }
+  	};
+  	return fails;
+  }
 
-  // Detect IE8's incomplete defineProperty implementation
-  var descriptors = !fails$w(function () {
-    // eslint-disable-next-line es/no-object-defineproperty -- required for testing
-    return Object.defineProperty({}, 1, { get: function () { return 7; } })[1] !== 7;
-  });
+  var descriptors;
+  var hasRequiredDescriptors;
 
-  var fails$v = fails$x;
+  function requireDescriptors () {
+  	if (hasRequiredDescriptors) return descriptors;
+  	hasRequiredDescriptors = 1;
+  	var fails = requireFails();
 
-  var functionBindNative = !fails$v(function () {
-    // eslint-disable-next-line es/no-function-prototype-bind -- safe
-    var test = (function () { /* empty */ }).bind();
-    // eslint-disable-next-line no-prototype-builtins -- safe
-    return typeof test != 'function' || test.hasOwnProperty('prototype');
-  });
+  	// Detect IE8's incomplete defineProperty implementation
+  	descriptors = !fails(function () {
+  	  // eslint-disable-next-line es/no-object-defineproperty -- required for testing
+  	  return Object.defineProperty({}, 1, { get: function () { return 7; } })[1] !== 7;
+  	});
+  	return descriptors;
+  }
 
-  var NATIVE_BIND$3 = functionBindNative;
+  var functionBindNative;
+  var hasRequiredFunctionBindNative;
 
-  var call$f = Function.prototype.call;
+  function requireFunctionBindNative () {
+  	if (hasRequiredFunctionBindNative) return functionBindNative;
+  	hasRequiredFunctionBindNative = 1;
+  	var fails = requireFails();
 
-  var functionCall = NATIVE_BIND$3 ? call$f.bind(call$f) : function () {
-    return call$f.apply(call$f, arguments);
-  };
+  	functionBindNative = !fails(function () {
+  	  // eslint-disable-next-line es/no-function-prototype-bind -- safe
+  	  var test = (function () { /* empty */ }).bind();
+  	  // eslint-disable-next-line no-prototype-builtins -- safe
+  	  return typeof test != 'function' || test.hasOwnProperty('prototype');
+  	});
+  	return functionBindNative;
+  }
+
+  var functionCall;
+  var hasRequiredFunctionCall;
+
+  function requireFunctionCall () {
+  	if (hasRequiredFunctionCall) return functionCall;
+  	hasRequiredFunctionCall = 1;
+  	var NATIVE_BIND = requireFunctionBindNative();
+
+  	var call = Function.prototype.call;
+
+  	functionCall = NATIVE_BIND ? call.bind(call) : function () {
+  	  return call.apply(call, arguments);
+  	};
+  	return functionCall;
+  }
 
   var objectPropertyIsEnumerable = {};
 
-  var $propertyIsEnumerable$1 = {}.propertyIsEnumerable;
-  // eslint-disable-next-line es/no-object-getownpropertydescriptor -- safe
-  var getOwnPropertyDescriptor$5 = Object.getOwnPropertyDescriptor;
+  var hasRequiredObjectPropertyIsEnumerable;
 
-  // Nashorn ~ JDK8 bug
-  var NASHORN_BUG = getOwnPropertyDescriptor$5 && !$propertyIsEnumerable$1.call({ 1: 2 }, 1);
+  function requireObjectPropertyIsEnumerable () {
+  	if (hasRequiredObjectPropertyIsEnumerable) return objectPropertyIsEnumerable;
+  	hasRequiredObjectPropertyIsEnumerable = 1;
+  	var $propertyIsEnumerable = {}.propertyIsEnumerable;
+  	// eslint-disable-next-line es/no-object-getownpropertydescriptor -- safe
+  	var getOwnPropertyDescriptor = Object.getOwnPropertyDescriptor;
 
-  // `Object.prototype.propertyIsEnumerable` method implementation
-  // https://tc39.es/ecma262/#sec-object.prototype.propertyisenumerable
-  objectPropertyIsEnumerable.f = NASHORN_BUG ? function propertyIsEnumerable(V) {
-    var descriptor = getOwnPropertyDescriptor$5(this, V);
-    return !!descriptor && descriptor.enumerable;
-  } : $propertyIsEnumerable$1;
+  	// Nashorn ~ JDK8 bug
+  	var NASHORN_BUG = getOwnPropertyDescriptor && !$propertyIsEnumerable.call({ 1: 2 }, 1);
 
-  var createPropertyDescriptor$4 = function (bitmap, value) {
-    return {
-      enumerable: !(bitmap & 1),
-      configurable: !(bitmap & 2),
-      writable: !(bitmap & 4),
-      value: value
-    };
-  };
-
-  var NATIVE_BIND$2 = functionBindNative;
-
-  var FunctionPrototype$2 = Function.prototype;
-  var call$e = FunctionPrototype$2.call;
-  var uncurryThisWithBind = NATIVE_BIND$2 && FunctionPrototype$2.bind.bind(call$e, call$e);
-
-  var functionUncurryThis = NATIVE_BIND$2 ? uncurryThisWithBind : function (fn) {
-    return function () {
-      return call$e.apply(fn, arguments);
-    };
-  };
-
-  var uncurryThis$y = functionUncurryThis;
-
-  var toString$h = uncurryThis$y({}.toString);
-  var stringSlice$9 = uncurryThis$y(''.slice);
-
-  var classofRaw$2 = function (it) {
-    return stringSlice$9(toString$h(it), 8, -1);
-  };
-
-  var uncurryThis$x = functionUncurryThis;
-  var fails$u = fails$x;
-  var classof$7 = classofRaw$2;
-
-  var $Object$4 = Object;
-  var split = uncurryThis$x(''.split);
-
-  // fallback for non-array-like ES3 and non-enumerable old V8 strings
-  var indexedObject = fails$u(function () {
-    // throws an error in rhino, see https://github.com/mozilla/rhino/issues/346
-    // eslint-disable-next-line no-prototype-builtins -- safe
-    return !$Object$4('z').propertyIsEnumerable(0);
-  }) ? function (it) {
-    return classof$7(it) === 'String' ? split(it, '') : $Object$4(it);
-  } : $Object$4;
-
-  // we can't use just `it == null` since of `document.all` special case
-  // https://tc39.es/ecma262/#sec-IsHTMLDDA-internal-slot-aec
-  var isNullOrUndefined$7 = function (it) {
-    return it === null || it === undefined;
-  };
-
-  var isNullOrUndefined$6 = isNullOrUndefined$7;
-
-  var $TypeError$c = TypeError;
-
-  // `RequireObjectCoercible` abstract operation
-  // https://tc39.es/ecma262/#sec-requireobjectcoercible
-  var requireObjectCoercible$c = function (it) {
-    if (isNullOrUndefined$6(it)) throw new $TypeError$c("Can't call method on " + it);
-    return it;
-  };
-
-  // toObject with fallback for non-array-like ES3 strings
-  var IndexedObject$3 = indexedObject;
-  var requireObjectCoercible$b = requireObjectCoercible$c;
-
-  var toIndexedObject$8 = function (it) {
-    return IndexedObject$3(requireObjectCoercible$b(it));
-  };
-
-  // https://tc39.es/ecma262/#sec-IsHTMLDDA-internal-slot
-  var documentAll = typeof document == 'object' && document.all;
-
-  // `IsCallable` abstract operation
-  // https://tc39.es/ecma262/#sec-iscallable
-  // eslint-disable-next-line unicorn/no-typeof-undefined -- required for testing
-  var isCallable$i = typeof documentAll == 'undefined' && documentAll !== undefined ? function (argument) {
-    return typeof argument == 'function' || argument === documentAll;
-  } : function (argument) {
-    return typeof argument == 'function';
-  };
-
-  var isCallable$h = isCallable$i;
-
-  var isObject$d = function (it) {
-    return typeof it == 'object' ? it !== null : isCallable$h(it);
-  };
-
-  var global$j = global$k;
-  var isCallable$g = isCallable$i;
-
-  var aFunction = function (argument) {
-    return isCallable$g(argument) ? argument : undefined;
-  };
-
-  var getBuiltIn$5 = function (namespace, method) {
-    return arguments.length < 2 ? aFunction(global$j[namespace]) : global$j[namespace] && global$j[namespace][method];
-  };
-
-  var uncurryThis$w = functionUncurryThis;
-
-  var objectIsPrototypeOf = uncurryThis$w({}.isPrototypeOf);
-
-  var engineUserAgent = typeof navigator != 'undefined' && String(navigator.userAgent) || '';
-
-  var global$i = global$k;
-  var userAgent$2 = engineUserAgent;
-
-  var process = global$i.process;
-  var Deno = global$i.Deno;
-  var versions = process && process.versions || Deno && Deno.version;
-  var v8 = versions && versions.v8;
-  var match, version;
-
-  if (v8) {
-    match = v8.split('.');
-    // in old Chrome, versions of V8 isn't V8 = Chrome / 10
-    // but their correct versions are not interesting for us
-    version = match[0] > 0 && match[0] < 4 ? 1 : +(match[0] + match[1]);
+  	// `Object.prototype.propertyIsEnumerable` method implementation
+  	// https://tc39.es/ecma262/#sec-object.prototype.propertyisenumerable
+  	objectPropertyIsEnumerable.f = NASHORN_BUG ? function propertyIsEnumerable(V) {
+  	  var descriptor = getOwnPropertyDescriptor(this, V);
+  	  return !!descriptor && descriptor.enumerable;
+  	} : $propertyIsEnumerable;
+  	return objectPropertyIsEnumerable;
   }
 
-  // BrowserFS NodeJS `process` polyfill incorrectly set `.v8` to `0.0`
-  // so check `userAgent` even if `.v8` exists, but 0
-  if (!version && userAgent$2) {
-    match = userAgent$2.match(/Edge\/(\d+)/);
-    if (!match || match[1] >= 74) {
-      match = userAgent$2.match(/Chrome\/(\d+)/);
-      if (match) version = +match[1];
-    }
+  var createPropertyDescriptor;
+  var hasRequiredCreatePropertyDescriptor;
+
+  function requireCreatePropertyDescriptor () {
+  	if (hasRequiredCreatePropertyDescriptor) return createPropertyDescriptor;
+  	hasRequiredCreatePropertyDescriptor = 1;
+  	createPropertyDescriptor = function (bitmap, value) {
+  	  return {
+  	    enumerable: !(bitmap & 1),
+  	    configurable: !(bitmap & 2),
+  	    writable: !(bitmap & 4),
+  	    value: value
+  	  };
+  	};
+  	return createPropertyDescriptor;
   }
 
-  var engineV8Version = version;
+  var functionUncurryThis;
+  var hasRequiredFunctionUncurryThis;
 
-  /* eslint-disable es/no-symbol -- required for testing */
-  var V8_VERSION$2 = engineV8Version;
-  var fails$t = fails$x;
-  var global$h = global$k;
+  function requireFunctionUncurryThis () {
+  	if (hasRequiredFunctionUncurryThis) return functionUncurryThis;
+  	hasRequiredFunctionUncurryThis = 1;
+  	var NATIVE_BIND = requireFunctionBindNative();
 
-  var $String$5 = global$h.String;
+  	var FunctionPrototype = Function.prototype;
+  	var call = FunctionPrototype.call;
+  	var uncurryThisWithBind = NATIVE_BIND && FunctionPrototype.bind.bind(call, call);
 
-  // eslint-disable-next-line es/no-object-getownpropertysymbols -- required for testing
-  var symbolConstructorDetection = !!Object.getOwnPropertySymbols && !fails$t(function () {
-    var symbol = Symbol('symbol detection');
-    // Chrome 38 Symbol has incorrect toString conversion
-    // `get-own-property-symbols` polyfill symbols converted to object are not Symbol instances
-    // nb: Do not call `String` directly to avoid this being optimized out to `symbol+''` which will,
-    // of course, fail.
-    return !$String$5(symbol) || !(Object(symbol) instanceof Symbol) ||
-      // Chrome 38-40 symbols are not inherited from DOM collections prototypes to instances
-      !Symbol.sham && V8_VERSION$2 && V8_VERSION$2 < 41;
-  });
+  	functionUncurryThis = NATIVE_BIND ? uncurryThisWithBind : function (fn) {
+  	  return function () {
+  	    return call.apply(fn, arguments);
+  	  };
+  	};
+  	return functionUncurryThis;
+  }
 
-  /* eslint-disable es/no-symbol -- required for testing */
-  var NATIVE_SYMBOL$1 = symbolConstructorDetection;
+  var classofRaw;
+  var hasRequiredClassofRaw;
 
-  var useSymbolAsUid = NATIVE_SYMBOL$1
-    && !Symbol.sham
-    && typeof Symbol.iterator == 'symbol';
+  function requireClassofRaw () {
+  	if (hasRequiredClassofRaw) return classofRaw;
+  	hasRequiredClassofRaw = 1;
+  	var uncurryThis = requireFunctionUncurryThis();
 
-  var getBuiltIn$4 = getBuiltIn$5;
-  var isCallable$f = isCallable$i;
-  var isPrototypeOf$3 = objectIsPrototypeOf;
-  var USE_SYMBOL_AS_UID$1 = useSymbolAsUid;
+  	var toString = uncurryThis({}.toString);
+  	var stringSlice = uncurryThis(''.slice);
 
-  var $Object$3 = Object;
+  	classofRaw = function (it) {
+  	  return stringSlice(toString(it), 8, -1);
+  	};
+  	return classofRaw;
+  }
 
-  var isSymbol$3 = USE_SYMBOL_AS_UID$1 ? function (it) {
-    return typeof it == 'symbol';
-  } : function (it) {
-    var $Symbol = getBuiltIn$4('Symbol');
-    return isCallable$f($Symbol) && isPrototypeOf$3($Symbol.prototype, $Object$3(it));
-  };
+  var indexedObject;
+  var hasRequiredIndexedObject;
 
-  var $String$4 = String;
+  function requireIndexedObject () {
+  	if (hasRequiredIndexedObject) return indexedObject;
+  	hasRequiredIndexedObject = 1;
+  	var uncurryThis = requireFunctionUncurryThis();
+  	var fails = requireFails();
+  	var classof = requireClassofRaw();
 
-  var tryToString$3 = function (argument) {
-    try {
-      return $String$4(argument);
-    } catch (error) {
-      return 'Object';
-    }
-  };
+  	var $Object = Object;
+  	var split = uncurryThis(''.split);
 
-  var isCallable$e = isCallable$i;
-  var tryToString$2 = tryToString$3;
+  	// fallback for non-array-like ES3 and non-enumerable old V8 strings
+  	indexedObject = fails(function () {
+  	  // throws an error in rhino, see https://github.com/mozilla/rhino/issues/346
+  	  // eslint-disable-next-line no-prototype-builtins -- safe
+  	  return !$Object('z').propertyIsEnumerable(0);
+  	}) ? function (it) {
+  	  return classof(it) === 'String' ? split(it, '') : $Object(it);
+  	} : $Object;
+  	return indexedObject;
+  }
 
-  var $TypeError$b = TypeError;
+  var isNullOrUndefined;
+  var hasRequiredIsNullOrUndefined;
 
-  // `Assert: IsCallable(argument) is true`
-  var aCallable$4 = function (argument) {
-    if (isCallable$e(argument)) return argument;
-    throw new $TypeError$b(tryToString$2(argument) + ' is not a function');
-  };
+  function requireIsNullOrUndefined () {
+  	if (hasRequiredIsNullOrUndefined) return isNullOrUndefined;
+  	hasRequiredIsNullOrUndefined = 1;
+  	// we can't use just `it == null` since of `document.all` special case
+  	// https://tc39.es/ecma262/#sec-IsHTMLDDA-internal-slot-aec
+  	isNullOrUndefined = function (it) {
+  	  return it === null || it === undefined;
+  	};
+  	return isNullOrUndefined;
+  }
 
-  var aCallable$3 = aCallable$4;
-  var isNullOrUndefined$5 = isNullOrUndefined$7;
+  var requireObjectCoercible;
+  var hasRequiredRequireObjectCoercible;
 
-  // `GetMethod` abstract operation
-  // https://tc39.es/ecma262/#sec-getmethod
-  var getMethod$5 = function (V, P) {
-    var func = V[P];
-    return isNullOrUndefined$5(func) ? undefined : aCallable$3(func);
-  };
+  function requireRequireObjectCoercible () {
+  	if (hasRequiredRequireObjectCoercible) return requireObjectCoercible;
+  	hasRequiredRequireObjectCoercible = 1;
+  	var isNullOrUndefined = requireIsNullOrUndefined();
 
-  var call$d = functionCall;
-  var isCallable$d = isCallable$i;
-  var isObject$c = isObject$d;
+  	var $TypeError = TypeError;
 
-  var $TypeError$a = TypeError;
+  	// `RequireObjectCoercible` abstract operation
+  	// https://tc39.es/ecma262/#sec-requireobjectcoercible
+  	requireObjectCoercible = function (it) {
+  	  if (isNullOrUndefined(it)) throw new $TypeError("Can't call method on " + it);
+  	  return it;
+  	};
+  	return requireObjectCoercible;
+  }
 
-  // `OrdinaryToPrimitive` abstract operation
-  // https://tc39.es/ecma262/#sec-ordinarytoprimitive
-  var ordinaryToPrimitive$1 = function (input, pref) {
-    var fn, val;
-    if (pref === 'string' && isCallable$d(fn = input.toString) && !isObject$c(val = call$d(fn, input))) return val;
-    if (isCallable$d(fn = input.valueOf) && !isObject$c(val = call$d(fn, input))) return val;
-    if (pref !== 'string' && isCallable$d(fn = input.toString) && !isObject$c(val = call$d(fn, input))) return val;
-    throw new $TypeError$a("Can't convert object to primitive value");
-  };
+  var toIndexedObject;
+  var hasRequiredToIndexedObject;
+
+  function requireToIndexedObject () {
+  	if (hasRequiredToIndexedObject) return toIndexedObject;
+  	hasRequiredToIndexedObject = 1;
+  	// toObject with fallback for non-array-like ES3 strings
+  	var IndexedObject = requireIndexedObject();
+  	var requireObjectCoercible = requireRequireObjectCoercible();
+
+  	toIndexedObject = function (it) {
+  	  return IndexedObject(requireObjectCoercible(it));
+  	};
+  	return toIndexedObject;
+  }
+
+  var isCallable;
+  var hasRequiredIsCallable;
+
+  function requireIsCallable () {
+  	if (hasRequiredIsCallable) return isCallable;
+  	hasRequiredIsCallable = 1;
+  	// https://tc39.es/ecma262/#sec-IsHTMLDDA-internal-slot
+  	var documentAll = typeof document == 'object' && document.all;
+
+  	// `IsCallable` abstract operation
+  	// https://tc39.es/ecma262/#sec-iscallable
+  	// eslint-disable-next-line unicorn/no-typeof-undefined -- required for testing
+  	isCallable = typeof documentAll == 'undefined' && documentAll !== undefined ? function (argument) {
+  	  return typeof argument == 'function' || argument === documentAll;
+  	} : function (argument) {
+  	  return typeof argument == 'function';
+  	};
+  	return isCallable;
+  }
+
+  var isObject;
+  var hasRequiredIsObject;
+
+  function requireIsObject () {
+  	if (hasRequiredIsObject) return isObject;
+  	hasRequiredIsObject = 1;
+  	var isCallable = requireIsCallable();
+
+  	isObject = function (it) {
+  	  return typeof it == 'object' ? it !== null : isCallable(it);
+  	};
+  	return isObject;
+  }
+
+  var getBuiltIn;
+  var hasRequiredGetBuiltIn;
+
+  function requireGetBuiltIn () {
+  	if (hasRequiredGetBuiltIn) return getBuiltIn;
+  	hasRequiredGetBuiltIn = 1;
+  	var globalThis = requireGlobalThis();
+  	var isCallable = requireIsCallable();
+
+  	var aFunction = function (argument) {
+  	  return isCallable(argument) ? argument : undefined;
+  	};
+
+  	getBuiltIn = function (namespace, method) {
+  	  return arguments.length < 2 ? aFunction(globalThis[namespace]) : globalThis[namespace] && globalThis[namespace][method];
+  	};
+  	return getBuiltIn;
+  }
+
+  var objectIsPrototypeOf;
+  var hasRequiredObjectIsPrototypeOf;
+
+  function requireObjectIsPrototypeOf () {
+  	if (hasRequiredObjectIsPrototypeOf) return objectIsPrototypeOf;
+  	hasRequiredObjectIsPrototypeOf = 1;
+  	var uncurryThis = requireFunctionUncurryThis();
+
+  	objectIsPrototypeOf = uncurryThis({}.isPrototypeOf);
+  	return objectIsPrototypeOf;
+  }
+
+  var environmentUserAgent;
+  var hasRequiredEnvironmentUserAgent;
+
+  function requireEnvironmentUserAgent () {
+  	if (hasRequiredEnvironmentUserAgent) return environmentUserAgent;
+  	hasRequiredEnvironmentUserAgent = 1;
+  	var globalThis = requireGlobalThis();
+
+  	var navigator = globalThis.navigator;
+  	var userAgent = navigator && navigator.userAgent;
+
+  	environmentUserAgent = userAgent ? String(userAgent) : '';
+  	return environmentUserAgent;
+  }
+
+  var environmentV8Version;
+  var hasRequiredEnvironmentV8Version;
+
+  function requireEnvironmentV8Version () {
+  	if (hasRequiredEnvironmentV8Version) return environmentV8Version;
+  	hasRequiredEnvironmentV8Version = 1;
+  	var globalThis = requireGlobalThis();
+  	var userAgent = requireEnvironmentUserAgent();
+
+  	var process = globalThis.process;
+  	var Deno = globalThis.Deno;
+  	var versions = process && process.versions || Deno && Deno.version;
+  	var v8 = versions && versions.v8;
+  	var match, version;
+
+  	if (v8) {
+  	  match = v8.split('.');
+  	  // in old Chrome, versions of V8 isn't V8 = Chrome / 10
+  	  // but their correct versions are not interesting for us
+  	  version = match[0] > 0 && match[0] < 4 ? 1 : +(match[0] + match[1]);
+  	}
+
+  	// BrowserFS NodeJS `process` polyfill incorrectly set `.v8` to `0.0`
+  	// so check `userAgent` even if `.v8` exists, but 0
+  	if (!version && userAgent) {
+  	  match = userAgent.match(/Edge\/(\d+)/);
+  	  if (!match || match[1] >= 74) {
+  	    match = userAgent.match(/Chrome\/(\d+)/);
+  	    if (match) version = +match[1];
+  	  }
+  	}
+
+  	environmentV8Version = version;
+  	return environmentV8Version;
+  }
+
+  var symbolConstructorDetection;
+  var hasRequiredSymbolConstructorDetection;
+
+  function requireSymbolConstructorDetection () {
+  	if (hasRequiredSymbolConstructorDetection) return symbolConstructorDetection;
+  	hasRequiredSymbolConstructorDetection = 1;
+  	/* eslint-disable es/no-symbol -- required for testing */
+  	var V8_VERSION = requireEnvironmentV8Version();
+  	var fails = requireFails();
+  	var globalThis = requireGlobalThis();
+
+  	var $String = globalThis.String;
+
+  	// eslint-disable-next-line es/no-object-getownpropertysymbols -- required for testing
+  	symbolConstructorDetection = !!Object.getOwnPropertySymbols && !fails(function () {
+  	  var symbol = Symbol('symbol detection');
+  	  // Chrome 38 Symbol has incorrect toString conversion
+  	  // `get-own-property-symbols` polyfill symbols converted to object are not Symbol instances
+  	  // nb: Do not call `String` directly to avoid this being optimized out to `symbol+''` which will,
+  	  // of course, fail.
+  	  return !$String(symbol) || !(Object(symbol) instanceof Symbol) ||
+  	    // Chrome 38-40 symbols are not inherited from DOM collections prototypes to instances
+  	    !Symbol.sham && V8_VERSION && V8_VERSION < 41;
+  	});
+  	return symbolConstructorDetection;
+  }
+
+  var useSymbolAsUid;
+  var hasRequiredUseSymbolAsUid;
+
+  function requireUseSymbolAsUid () {
+  	if (hasRequiredUseSymbolAsUid) return useSymbolAsUid;
+  	hasRequiredUseSymbolAsUid = 1;
+  	/* eslint-disable es/no-symbol -- required for testing */
+  	var NATIVE_SYMBOL = requireSymbolConstructorDetection();
+
+  	useSymbolAsUid = NATIVE_SYMBOL &&
+  	  !Symbol.sham &&
+  	  typeof Symbol.iterator == 'symbol';
+  	return useSymbolAsUid;
+  }
+
+  var isSymbol;
+  var hasRequiredIsSymbol;
+
+  function requireIsSymbol () {
+  	if (hasRequiredIsSymbol) return isSymbol;
+  	hasRequiredIsSymbol = 1;
+  	var getBuiltIn = requireGetBuiltIn();
+  	var isCallable = requireIsCallable();
+  	var isPrototypeOf = requireObjectIsPrototypeOf();
+  	var USE_SYMBOL_AS_UID = requireUseSymbolAsUid();
+
+  	var $Object = Object;
+
+  	isSymbol = USE_SYMBOL_AS_UID ? function (it) {
+  	  return typeof it == 'symbol';
+  	} : function (it) {
+  	  var $Symbol = getBuiltIn('Symbol');
+  	  return isCallable($Symbol) && isPrototypeOf($Symbol.prototype, $Object(it));
+  	};
+  	return isSymbol;
+  }
+
+  var tryToString;
+  var hasRequiredTryToString;
+
+  function requireTryToString () {
+  	if (hasRequiredTryToString) return tryToString;
+  	hasRequiredTryToString = 1;
+  	var $String = String;
+
+  	tryToString = function (argument) {
+  	  try {
+  	    return $String(argument);
+  	  } catch (error) {
+  	    return 'Object';
+  	  }
+  	};
+  	return tryToString;
+  }
+
+  var aCallable;
+  var hasRequiredACallable;
+
+  function requireACallable () {
+  	if (hasRequiredACallable) return aCallable;
+  	hasRequiredACallable = 1;
+  	var isCallable = requireIsCallable();
+  	var tryToString = requireTryToString();
+
+  	var $TypeError = TypeError;
+
+  	// `Assert: IsCallable(argument) is true`
+  	aCallable = function (argument) {
+  	  if (isCallable(argument)) return argument;
+  	  throw new $TypeError(tryToString(argument) + ' is not a function');
+  	};
+  	return aCallable;
+  }
+
+  var getMethod;
+  var hasRequiredGetMethod;
+
+  function requireGetMethod () {
+  	if (hasRequiredGetMethod) return getMethod;
+  	hasRequiredGetMethod = 1;
+  	var aCallable = requireACallable();
+  	var isNullOrUndefined = requireIsNullOrUndefined();
+
+  	// `GetMethod` abstract operation
+  	// https://tc39.es/ecma262/#sec-getmethod
+  	getMethod = function (V, P) {
+  	  var func = V[P];
+  	  return isNullOrUndefined(func) ? undefined : aCallable(func);
+  	};
+  	return getMethod;
+  }
+
+  var ordinaryToPrimitive;
+  var hasRequiredOrdinaryToPrimitive;
+
+  function requireOrdinaryToPrimitive () {
+  	if (hasRequiredOrdinaryToPrimitive) return ordinaryToPrimitive;
+  	hasRequiredOrdinaryToPrimitive = 1;
+  	var call = requireFunctionCall();
+  	var isCallable = requireIsCallable();
+  	var isObject = requireIsObject();
+
+  	var $TypeError = TypeError;
+
+  	// `OrdinaryToPrimitive` abstract operation
+  	// https://tc39.es/ecma262/#sec-ordinarytoprimitive
+  	ordinaryToPrimitive = function (input, pref) {
+  	  var fn, val;
+  	  if (pref === 'string' && isCallable(fn = input.toString) && !isObject(val = call(fn, input))) return val;
+  	  if (isCallable(fn = input.valueOf) && !isObject(val = call(fn, input))) return val;
+  	  if (pref !== 'string' && isCallable(fn = input.toString) && !isObject(val = call(fn, input))) return val;
+  	  throw new $TypeError("Can't convert object to primitive value");
+  	};
+  	return ordinaryToPrimitive;
+  }
 
   var sharedStore = {exports: {}};
 
-  var isPure = false;
+  var isPure;
+  var hasRequiredIsPure;
 
-  var global$g = global$k;
+  function requireIsPure () {
+  	if (hasRequiredIsPure) return isPure;
+  	hasRequiredIsPure = 1;
+  	isPure = false;
+  	return isPure;
+  }
 
-  // eslint-disable-next-line es/no-object-defineproperty -- safe
-  var defineProperty$8 = Object.defineProperty;
+  var defineGlobalProperty;
+  var hasRequiredDefineGlobalProperty;
 
-  var defineGlobalProperty$3 = function (key, value) {
-    try {
-      defineProperty$8(global$g, key, { value: value, configurable: true, writable: true });
-    } catch (error) {
-      global$g[key] = value;
-    } return value;
-  };
+  function requireDefineGlobalProperty () {
+  	if (hasRequiredDefineGlobalProperty) return defineGlobalProperty;
+  	hasRequiredDefineGlobalProperty = 1;
+  	var globalThis = requireGlobalThis();
 
-  var globalThis$1 = global$k;
-  var defineGlobalProperty$2 = defineGlobalProperty$3;
+  	// eslint-disable-next-line es/no-object-defineproperty -- safe
+  	var defineProperty = Object.defineProperty;
 
-  var SHARED = '__core-js_shared__';
-  var store$3 = sharedStore.exports = globalThis$1[SHARED] || defineGlobalProperty$2(SHARED, {});
+  	defineGlobalProperty = function (key, value) {
+  	  try {
+  	    defineProperty(globalThis, key, { value: value, configurable: true, writable: true });
+  	  } catch (error) {
+  	    globalThis[key] = value;
+  	  } return value;
+  	};
+  	return defineGlobalProperty;
+  }
 
-  (store$3.versions || (store$3.versions = [])).push({
-    version: '3.36.1',
-    mode: 'global',
-    copyright: '© 2014-2024 Denis Pushkarev (zloirock.ru)',
-    license: 'https://github.com/zloirock/core-js/blob/v3.36.1/LICENSE',
-    source: 'https://github.com/zloirock/core-js'
-  });
+  var hasRequiredSharedStore;
 
-  var sharedStoreExports = sharedStore.exports;
+  function requireSharedStore () {
+  	if (hasRequiredSharedStore) return sharedStore.exports;
+  	hasRequiredSharedStore = 1;
+  	var IS_PURE = requireIsPure();
+  	var globalThis = requireGlobalThis();
+  	var defineGlobalProperty = requireDefineGlobalProperty();
 
-  var store$2 = sharedStoreExports;
+  	var SHARED = '__core-js_shared__';
+  	var store = sharedStore.exports = globalThis[SHARED] || defineGlobalProperty(SHARED, {});
 
-  var shared$4 = function (key, value) {
-    return store$2[key] || (store$2[key] = value || {});
-  };
+  	(store.versions || (store.versions = [])).push({
+  	  version: '3.39.0',
+  	  mode: IS_PURE ? 'pure' : 'global',
+  	  copyright: '© 2014-2024 Denis Pushkarev (zloirock.ru)',
+  	  license: 'https://github.com/zloirock/core-js/blob/v3.39.0/LICENSE',
+  	  source: 'https://github.com/zloirock/core-js'
+  	});
+  	return sharedStore.exports;
+  }
 
-  var requireObjectCoercible$a = requireObjectCoercible$c;
+  var shared;
+  var hasRequiredShared;
 
-  var $Object$2 = Object;
+  function requireShared () {
+  	if (hasRequiredShared) return shared;
+  	hasRequiredShared = 1;
+  	var store = requireSharedStore();
 
-  // `ToObject` abstract operation
-  // https://tc39.es/ecma262/#sec-toobject
-  var toObject$b = function (argument) {
-    return $Object$2(requireObjectCoercible$a(argument));
-  };
+  	shared = function (key, value) {
+  	  return store[key] || (store[key] = value || {});
+  	};
+  	return shared;
+  }
 
-  var uncurryThis$v = functionUncurryThis;
-  var toObject$a = toObject$b;
+  var toObject;
+  var hasRequiredToObject;
 
-  var hasOwnProperty = uncurryThis$v({}.hasOwnProperty);
+  function requireToObject () {
+  	if (hasRequiredToObject) return toObject;
+  	hasRequiredToObject = 1;
+  	var requireObjectCoercible = requireRequireObjectCoercible();
 
-  // `HasOwnProperty` abstract operation
-  // https://tc39.es/ecma262/#sec-hasownproperty
-  // eslint-disable-next-line es/no-object-hasown -- safe
-  var hasOwnProperty_1 = Object.hasOwn || function hasOwn(it, key) {
-    return hasOwnProperty(toObject$a(it), key);
-  };
+  	var $Object = Object;
 
-  var uncurryThis$u = functionUncurryThis;
+  	// `ToObject` abstract operation
+  	// https://tc39.es/ecma262/#sec-toobject
+  	toObject = function (argument) {
+  	  return $Object(requireObjectCoercible(argument));
+  	};
+  	return toObject;
+  }
 
-  var id = 0;
-  var postfix = Math.random();
-  var toString$g = uncurryThis$u(1.0.toString);
+  var hasOwnProperty_1;
+  var hasRequiredHasOwnProperty;
 
-  var uid$2 = function (key) {
-    return 'Symbol(' + (key === undefined ? '' : key) + ')_' + toString$g(++id + postfix, 36);
-  };
+  function requireHasOwnProperty () {
+  	if (hasRequiredHasOwnProperty) return hasOwnProperty_1;
+  	hasRequiredHasOwnProperty = 1;
+  	var uncurryThis = requireFunctionUncurryThis();
+  	var toObject = requireToObject();
 
-  var global$f = global$k;
-  var shared$3 = shared$4;
-  var hasOwn$b = hasOwnProperty_1;
-  var uid$1 = uid$2;
-  var NATIVE_SYMBOL = symbolConstructorDetection;
-  var USE_SYMBOL_AS_UID = useSymbolAsUid;
+  	var hasOwnProperty = uncurryThis({}.hasOwnProperty);
 
-  var Symbol$3 = global$f.Symbol;
-  var WellKnownSymbolsStore = shared$3('wks');
-  var createWellKnownSymbol = USE_SYMBOL_AS_UID ? Symbol$3['for'] || Symbol$3 : Symbol$3 && Symbol$3.withoutSetter || uid$1;
+  	// `HasOwnProperty` abstract operation
+  	// https://tc39.es/ecma262/#sec-hasownproperty
+  	// eslint-disable-next-line es/no-object-hasown -- safe
+  	hasOwnProperty_1 = Object.hasOwn || function hasOwn(it, key) {
+  	  return hasOwnProperty(toObject(it), key);
+  	};
+  	return hasOwnProperty_1;
+  }
 
-  var wellKnownSymbol$j = function (name) {
-    if (!hasOwn$b(WellKnownSymbolsStore, name)) {
-      WellKnownSymbolsStore[name] = NATIVE_SYMBOL && hasOwn$b(Symbol$3, name)
-        ? Symbol$3[name]
-        : createWellKnownSymbol('Symbol.' + name);
-    } return WellKnownSymbolsStore[name];
-  };
+  var uid;
+  var hasRequiredUid;
 
-  var call$c = functionCall;
-  var isObject$b = isObject$d;
-  var isSymbol$2 = isSymbol$3;
-  var getMethod$4 = getMethod$5;
-  var ordinaryToPrimitive = ordinaryToPrimitive$1;
-  var wellKnownSymbol$i = wellKnownSymbol$j;
+  function requireUid () {
+  	if (hasRequiredUid) return uid;
+  	hasRequiredUid = 1;
+  	var uncurryThis = requireFunctionUncurryThis();
 
-  var $TypeError$9 = TypeError;
-  var TO_PRIMITIVE = wellKnownSymbol$i('toPrimitive');
+  	var id = 0;
+  	var postfix = Math.random();
+  	var toString = uncurryThis(1.0.toString);
 
-  // `ToPrimitive` abstract operation
-  // https://tc39.es/ecma262/#sec-toprimitive
-  var toPrimitive$3 = function (input, pref) {
-    if (!isObject$b(input) || isSymbol$2(input)) return input;
-    var exoticToPrim = getMethod$4(input, TO_PRIMITIVE);
-    var result;
-    if (exoticToPrim) {
-      if (pref === undefined) pref = 'default';
-      result = call$c(exoticToPrim, input, pref);
-      if (!isObject$b(result) || isSymbol$2(result)) return result;
-      throw new $TypeError$9("Can't convert object to primitive value");
-    }
-    if (pref === undefined) pref = 'number';
-    return ordinaryToPrimitive(input, pref);
-  };
+  	uid = function (key) {
+  	  return 'Symbol(' + (key === undefined ? '' : key) + ')_' + toString(++id + postfix, 36);
+  	};
+  	return uid;
+  }
 
-  var toPrimitive$2 = toPrimitive$3;
-  var isSymbol$1 = isSymbol$3;
+  var wellKnownSymbol;
+  var hasRequiredWellKnownSymbol;
 
-  // `ToPropertyKey` abstract operation
-  // https://tc39.es/ecma262/#sec-topropertykey
-  var toPropertyKey$2 = function (argument) {
-    var key = toPrimitive$2(argument, 'string');
-    return isSymbol$1(key) ? key : key + '';
-  };
+  function requireWellKnownSymbol () {
+  	if (hasRequiredWellKnownSymbol) return wellKnownSymbol;
+  	hasRequiredWellKnownSymbol = 1;
+  	var globalThis = requireGlobalThis();
+  	var shared = requireShared();
+  	var hasOwn = requireHasOwnProperty();
+  	var uid = requireUid();
+  	var NATIVE_SYMBOL = requireSymbolConstructorDetection();
+  	var USE_SYMBOL_AS_UID = requireUseSymbolAsUid();
 
-  var global$e = global$k;
-  var isObject$a = isObject$d;
+  	var Symbol = globalThis.Symbol;
+  	var WellKnownSymbolsStore = shared('wks');
+  	var createWellKnownSymbol = USE_SYMBOL_AS_UID ? Symbol['for'] || Symbol : Symbol && Symbol.withoutSetter || uid;
 
-  var document$1 = global$e.document;
-  // typeof document.createElement is 'object' in old IE
-  var EXISTS$1 = isObject$a(document$1) && isObject$a(document$1.createElement);
+  	wellKnownSymbol = function (name) {
+  	  if (!hasOwn(WellKnownSymbolsStore, name)) {
+  	    WellKnownSymbolsStore[name] = NATIVE_SYMBOL && hasOwn(Symbol, name)
+  	      ? Symbol[name]
+  	      : createWellKnownSymbol('Symbol.' + name);
+  	  } return WellKnownSymbolsStore[name];
+  	};
+  	return wellKnownSymbol;
+  }
 
-  var documentCreateElement$2 = function (it) {
-    return EXISTS$1 ? document$1.createElement(it) : {};
-  };
+  var toPrimitive;
+  var hasRequiredToPrimitive;
 
-  var DESCRIPTORS$f = descriptors;
-  var fails$s = fails$x;
-  var createElement = documentCreateElement$2;
+  function requireToPrimitive () {
+  	if (hasRequiredToPrimitive) return toPrimitive;
+  	hasRequiredToPrimitive = 1;
+  	var call = requireFunctionCall();
+  	var isObject = requireIsObject();
+  	var isSymbol = requireIsSymbol();
+  	var getMethod = requireGetMethod();
+  	var ordinaryToPrimitive = requireOrdinaryToPrimitive();
+  	var wellKnownSymbol = requireWellKnownSymbol();
 
-  // Thanks to IE8 for its funny defineProperty
-  var ie8DomDefine = !DESCRIPTORS$f && !fails$s(function () {
-    // eslint-disable-next-line es/no-object-defineproperty -- required for testing
-    return Object.defineProperty(createElement('div'), 'a', {
-      get: function () { return 7; }
-    }).a !== 7;
-  });
+  	var $TypeError = TypeError;
+  	var TO_PRIMITIVE = wellKnownSymbol('toPrimitive');
 
-  var DESCRIPTORS$e = descriptors;
-  var call$b = functionCall;
-  var propertyIsEnumerableModule$1 = objectPropertyIsEnumerable;
-  var createPropertyDescriptor$3 = createPropertyDescriptor$4;
-  var toIndexedObject$7 = toIndexedObject$8;
-  var toPropertyKey$1 = toPropertyKey$2;
-  var hasOwn$a = hasOwnProperty_1;
-  var IE8_DOM_DEFINE$1 = ie8DomDefine;
+  	// `ToPrimitive` abstract operation
+  	// https://tc39.es/ecma262/#sec-toprimitive
+  	toPrimitive = function (input, pref) {
+  	  if (!isObject(input) || isSymbol(input)) return input;
+  	  var exoticToPrim = getMethod(input, TO_PRIMITIVE);
+  	  var result;
+  	  if (exoticToPrim) {
+  	    if (pref === undefined) pref = 'default';
+  	    result = call(exoticToPrim, input, pref);
+  	    if (!isObject(result) || isSymbol(result)) return result;
+  	    throw new $TypeError("Can't convert object to primitive value");
+  	  }
+  	  if (pref === undefined) pref = 'number';
+  	  return ordinaryToPrimitive(input, pref);
+  	};
+  	return toPrimitive;
+  }
 
-  // eslint-disable-next-line es/no-object-getownpropertydescriptor -- safe
-  var $getOwnPropertyDescriptor$1 = Object.getOwnPropertyDescriptor;
+  var toPropertyKey;
+  var hasRequiredToPropertyKey;
 
-  // `Object.getOwnPropertyDescriptor` method
-  // https://tc39.es/ecma262/#sec-object.getownpropertydescriptor
-  objectGetOwnPropertyDescriptor.f = DESCRIPTORS$e ? $getOwnPropertyDescriptor$1 : function getOwnPropertyDescriptor(O, P) {
-    O = toIndexedObject$7(O);
-    P = toPropertyKey$1(P);
-    if (IE8_DOM_DEFINE$1) try {
-      return $getOwnPropertyDescriptor$1(O, P);
-    } catch (error) { /* empty */ }
-    if (hasOwn$a(O, P)) return createPropertyDescriptor$3(!call$b(propertyIsEnumerableModule$1.f, O, P), O[P]);
-  };
+  function requireToPropertyKey () {
+  	if (hasRequiredToPropertyKey) return toPropertyKey;
+  	hasRequiredToPropertyKey = 1;
+  	var toPrimitive = requireToPrimitive();
+  	var isSymbol = requireIsSymbol();
+
+  	// `ToPropertyKey` abstract operation
+  	// https://tc39.es/ecma262/#sec-topropertykey
+  	toPropertyKey = function (argument) {
+  	  var key = toPrimitive(argument, 'string');
+  	  return isSymbol(key) ? key : key + '';
+  	};
+  	return toPropertyKey;
+  }
+
+  var documentCreateElement;
+  var hasRequiredDocumentCreateElement;
+
+  function requireDocumentCreateElement () {
+  	if (hasRequiredDocumentCreateElement) return documentCreateElement;
+  	hasRequiredDocumentCreateElement = 1;
+  	var globalThis = requireGlobalThis();
+  	var isObject = requireIsObject();
+
+  	var document = globalThis.document;
+  	// typeof document.createElement is 'object' in old IE
+  	var EXISTS = isObject(document) && isObject(document.createElement);
+
+  	documentCreateElement = function (it) {
+  	  return EXISTS ? document.createElement(it) : {};
+  	};
+  	return documentCreateElement;
+  }
+
+  var ie8DomDefine;
+  var hasRequiredIe8DomDefine;
+
+  function requireIe8DomDefine () {
+  	if (hasRequiredIe8DomDefine) return ie8DomDefine;
+  	hasRequiredIe8DomDefine = 1;
+  	var DESCRIPTORS = requireDescriptors();
+  	var fails = requireFails();
+  	var createElement = requireDocumentCreateElement();
+
+  	// Thanks to IE8 for its funny defineProperty
+  	ie8DomDefine = !DESCRIPTORS && !fails(function () {
+  	  // eslint-disable-next-line es/no-object-defineproperty -- required for testing
+  	  return Object.defineProperty(createElement('div'), 'a', {
+  	    get: function () { return 7; }
+  	  }).a !== 7;
+  	});
+  	return ie8DomDefine;
+  }
+
+  var hasRequiredObjectGetOwnPropertyDescriptor;
+
+  function requireObjectGetOwnPropertyDescriptor () {
+  	if (hasRequiredObjectGetOwnPropertyDescriptor) return objectGetOwnPropertyDescriptor;
+  	hasRequiredObjectGetOwnPropertyDescriptor = 1;
+  	var DESCRIPTORS = requireDescriptors();
+  	var call = requireFunctionCall();
+  	var propertyIsEnumerableModule = requireObjectPropertyIsEnumerable();
+  	var createPropertyDescriptor = requireCreatePropertyDescriptor();
+  	var toIndexedObject = requireToIndexedObject();
+  	var toPropertyKey = requireToPropertyKey();
+  	var hasOwn = requireHasOwnProperty();
+  	var IE8_DOM_DEFINE = requireIe8DomDefine();
+
+  	// eslint-disable-next-line es/no-object-getownpropertydescriptor -- safe
+  	var $getOwnPropertyDescriptor = Object.getOwnPropertyDescriptor;
+
+  	// `Object.getOwnPropertyDescriptor` method
+  	// https://tc39.es/ecma262/#sec-object.getownpropertydescriptor
+  	objectGetOwnPropertyDescriptor.f = DESCRIPTORS ? $getOwnPropertyDescriptor : function getOwnPropertyDescriptor(O, P) {
+  	  O = toIndexedObject(O);
+  	  P = toPropertyKey(P);
+  	  if (IE8_DOM_DEFINE) try {
+  	    return $getOwnPropertyDescriptor(O, P);
+  	  } catch (error) { /* empty */ }
+  	  if (hasOwn(O, P)) return createPropertyDescriptor(!call(propertyIsEnumerableModule.f, O, P), O[P]);
+  	};
+  	return objectGetOwnPropertyDescriptor;
+  }
 
   var objectDefineProperty = {};
 
-  var DESCRIPTORS$d = descriptors;
-  var fails$r = fails$x;
+  var v8PrototypeDefineBug;
+  var hasRequiredV8PrototypeDefineBug;
 
-  // V8 ~ Chrome 36-
-  // https://bugs.chromium.org/p/v8/issues/detail?id=3334
-  var v8PrototypeDefineBug = DESCRIPTORS$d && fails$r(function () {
-    // eslint-disable-next-line es/no-object-defineproperty -- required for testing
-    return Object.defineProperty(function () { /* empty */ }, 'prototype', {
-      value: 42,
-      writable: false
-    }).prototype !== 42;
-  });
+  function requireV8PrototypeDefineBug () {
+  	if (hasRequiredV8PrototypeDefineBug) return v8PrototypeDefineBug;
+  	hasRequiredV8PrototypeDefineBug = 1;
+  	var DESCRIPTORS = requireDescriptors();
+  	var fails = requireFails();
 
-  var isObject$9 = isObject$d;
-
-  var $String$3 = String;
-  var $TypeError$8 = TypeError;
-
-  // `Assert: Type(argument) is Object`
-  var anObject$c = function (argument) {
-    if (isObject$9(argument)) return argument;
-    throw new $TypeError$8($String$3(argument) + ' is not an object');
-  };
-
-  var DESCRIPTORS$c = descriptors;
-  var IE8_DOM_DEFINE = ie8DomDefine;
-  var V8_PROTOTYPE_DEFINE_BUG$1 = v8PrototypeDefineBug;
-  var anObject$b = anObject$c;
-  var toPropertyKey = toPropertyKey$2;
-
-  var $TypeError$7 = TypeError;
-  // eslint-disable-next-line es/no-object-defineproperty -- safe
-  var $defineProperty = Object.defineProperty;
-  // eslint-disable-next-line es/no-object-getownpropertydescriptor -- safe
-  var $getOwnPropertyDescriptor = Object.getOwnPropertyDescriptor;
-  var ENUMERABLE = 'enumerable';
-  var CONFIGURABLE$1 = 'configurable';
-  var WRITABLE = 'writable';
-
-  // `Object.defineProperty` method
-  // https://tc39.es/ecma262/#sec-object.defineproperty
-  objectDefineProperty.f = DESCRIPTORS$c ? V8_PROTOTYPE_DEFINE_BUG$1 ? function defineProperty(O, P, Attributes) {
-    anObject$b(O);
-    P = toPropertyKey(P);
-    anObject$b(Attributes);
-    if (typeof O === 'function' && P === 'prototype' && 'value' in Attributes && WRITABLE in Attributes && !Attributes[WRITABLE]) {
-      var current = $getOwnPropertyDescriptor(O, P);
-      if (current && current[WRITABLE]) {
-        O[P] = Attributes.value;
-        Attributes = {
-          configurable: CONFIGURABLE$1 in Attributes ? Attributes[CONFIGURABLE$1] : current[CONFIGURABLE$1],
-          enumerable: ENUMERABLE in Attributes ? Attributes[ENUMERABLE] : current[ENUMERABLE],
-          writable: false
-        };
-      }
-    } return $defineProperty(O, P, Attributes);
-  } : $defineProperty : function defineProperty(O, P, Attributes) {
-    anObject$b(O);
-    P = toPropertyKey(P);
-    anObject$b(Attributes);
-    if (IE8_DOM_DEFINE) try {
-      return $defineProperty(O, P, Attributes);
-    } catch (error) { /* empty */ }
-    if ('get' in Attributes || 'set' in Attributes) throw new $TypeError$7('Accessors not supported');
-    if ('value' in Attributes) O[P] = Attributes.value;
-    return O;
-  };
-
-  var DESCRIPTORS$b = descriptors;
-  var definePropertyModule$4 = objectDefineProperty;
-  var createPropertyDescriptor$2 = createPropertyDescriptor$4;
-
-  var createNonEnumerableProperty$7 = DESCRIPTORS$b ? function (object, key, value) {
-    return definePropertyModule$4.f(object, key, createPropertyDescriptor$2(1, value));
-  } : function (object, key, value) {
-    object[key] = value;
-    return object;
-  };
-
-  var makeBuiltIn$3 = {exports: {}};
-
-  var DESCRIPTORS$a = descriptors;
-  var hasOwn$9 = hasOwnProperty_1;
-
-  var FunctionPrototype$1 = Function.prototype;
-  // eslint-disable-next-line es/no-object-getownpropertydescriptor -- safe
-  var getDescriptor = DESCRIPTORS$a && Object.getOwnPropertyDescriptor;
-
-  var EXISTS = hasOwn$9(FunctionPrototype$1, 'name');
-  // additional protection from minified / mangled / dropped function names
-  var PROPER = EXISTS && (function something() { /* empty */ }).name === 'something';
-  var CONFIGURABLE = EXISTS && (!DESCRIPTORS$a || (DESCRIPTORS$a && getDescriptor(FunctionPrototype$1, 'name').configurable));
-
-  var functionName = {
-    EXISTS: EXISTS,
-    PROPER: PROPER,
-    CONFIGURABLE: CONFIGURABLE
-  };
-
-  var uncurryThis$t = functionUncurryThis;
-  var isCallable$c = isCallable$i;
-  var store$1 = sharedStoreExports;
-
-  var functionToString = uncurryThis$t(Function.toString);
-
-  // this helper broken in `core-js@3.4.1-3.4.4`, so we can't use `shared` helper
-  if (!isCallable$c(store$1.inspectSource)) {
-    store$1.inspectSource = function (it) {
-      return functionToString(it);
-    };
+  	// V8 ~ Chrome 36-
+  	// https://bugs.chromium.org/p/v8/issues/detail?id=3334
+  	v8PrototypeDefineBug = DESCRIPTORS && fails(function () {
+  	  // eslint-disable-next-line es/no-object-defineproperty -- required for testing
+  	  return Object.defineProperty(function () { /* empty */ }, 'prototype', {
+  	    value: 42,
+  	    writable: false
+  	  }).prototype !== 42;
+  	});
+  	return v8PrototypeDefineBug;
   }
 
-  var inspectSource$2 = store$1.inspectSource;
+  var anObject;
+  var hasRequiredAnObject;
 
-  var global$d = global$k;
-  var isCallable$b = isCallable$i;
+  function requireAnObject () {
+  	if (hasRequiredAnObject) return anObject;
+  	hasRequiredAnObject = 1;
+  	var isObject = requireIsObject();
 
-  var WeakMap$1 = global$d.WeakMap;
+  	var $String = String;
+  	var $TypeError = TypeError;
 
-  var weakMapBasicDetection = isCallable$b(WeakMap$1) && /native code/.test(String(WeakMap$1));
-
-  var shared$2 = shared$4;
-  var uid = uid$2;
-
-  var keys$1 = shared$2('keys');
-
-  var sharedKey$3 = function (key) {
-    return keys$1[key] || (keys$1[key] = uid(key));
-  };
-
-  var hiddenKeys$4 = {};
-
-  var NATIVE_WEAK_MAP = weakMapBasicDetection;
-  var global$c = global$k;
-  var isObject$8 = isObject$d;
-  var createNonEnumerableProperty$6 = createNonEnumerableProperty$7;
-  var hasOwn$8 = hasOwnProperty_1;
-  var shared$1 = sharedStoreExports;
-  var sharedKey$2 = sharedKey$3;
-  var hiddenKeys$3 = hiddenKeys$4;
-
-  var OBJECT_ALREADY_INITIALIZED = 'Object already initialized';
-  var TypeError$2 = global$c.TypeError;
-  var WeakMap = global$c.WeakMap;
-  var set, get, has;
-
-  var enforce = function (it) {
-    return has(it) ? get(it) : set(it, {});
-  };
-
-  var getterFor = function (TYPE) {
-    return function (it) {
-      var state;
-      if (!isObject$8(it) || (state = get(it)).type !== TYPE) {
-        throw new TypeError$2('Incompatible receiver, ' + TYPE + ' required');
-      } return state;
-    };
-  };
-
-  if (NATIVE_WEAK_MAP || shared$1.state) {
-    var store = shared$1.state || (shared$1.state = new WeakMap());
-    /* eslint-disable no-self-assign -- prototype methods protection */
-    store.get = store.get;
-    store.has = store.has;
-    store.set = store.set;
-    /* eslint-enable no-self-assign -- prototype methods protection */
-    set = function (it, metadata) {
-      if (store.has(it)) throw new TypeError$2(OBJECT_ALREADY_INITIALIZED);
-      metadata.facade = it;
-      store.set(it, metadata);
-      return metadata;
-    };
-    get = function (it) {
-      return store.get(it) || {};
-    };
-    has = function (it) {
-      return store.has(it);
-    };
-  } else {
-    var STATE = sharedKey$2('state');
-    hiddenKeys$3[STATE] = true;
-    set = function (it, metadata) {
-      if (hasOwn$8(it, STATE)) throw new TypeError$2(OBJECT_ALREADY_INITIALIZED);
-      metadata.facade = it;
-      createNonEnumerableProperty$6(it, STATE, metadata);
-      return metadata;
-    };
-    get = function (it) {
-      return hasOwn$8(it, STATE) ? it[STATE] : {};
-    };
-    has = function (it) {
-      return hasOwn$8(it, STATE);
-    };
+  	// `Assert: Type(argument) is Object`
+  	anObject = function (argument) {
+  	  if (isObject(argument)) return argument;
+  	  throw new $TypeError($String(argument) + ' is not an object');
+  	};
+  	return anObject;
   }
 
-  var internalState = {
-    set: set,
-    get: get,
-    has: has,
-    enforce: enforce,
-    getterFor: getterFor
-  };
+  var hasRequiredObjectDefineProperty;
 
-  var uncurryThis$s = functionUncurryThis;
-  var fails$q = fails$x;
-  var isCallable$a = isCallable$i;
-  var hasOwn$7 = hasOwnProperty_1;
-  var DESCRIPTORS$9 = descriptors;
-  var CONFIGURABLE_FUNCTION_NAME$1 = functionName.CONFIGURABLE;
-  var inspectSource$1 = inspectSource$2;
-  var InternalStateModule$1 = internalState;
+  function requireObjectDefineProperty () {
+  	if (hasRequiredObjectDefineProperty) return objectDefineProperty;
+  	hasRequiredObjectDefineProperty = 1;
+  	var DESCRIPTORS = requireDescriptors();
+  	var IE8_DOM_DEFINE = requireIe8DomDefine();
+  	var V8_PROTOTYPE_DEFINE_BUG = requireV8PrototypeDefineBug();
+  	var anObject = requireAnObject();
+  	var toPropertyKey = requireToPropertyKey();
 
-  var enforceInternalState$1 = InternalStateModule$1.enforce;
-  var getInternalState$2 = InternalStateModule$1.get;
-  var $String$2 = String;
-  // eslint-disable-next-line es/no-object-defineproperty -- safe
-  var defineProperty$7 = Object.defineProperty;
-  var stringSlice$8 = uncurryThis$s(''.slice);
-  var replace$4 = uncurryThis$s(''.replace);
-  var join = uncurryThis$s([].join);
+  	var $TypeError = TypeError;
+  	// eslint-disable-next-line es/no-object-defineproperty -- safe
+  	var $defineProperty = Object.defineProperty;
+  	// eslint-disable-next-line es/no-object-getownpropertydescriptor -- safe
+  	var $getOwnPropertyDescriptor = Object.getOwnPropertyDescriptor;
+  	var ENUMERABLE = 'enumerable';
+  	var CONFIGURABLE = 'configurable';
+  	var WRITABLE = 'writable';
 
-  var CONFIGURABLE_LENGTH = DESCRIPTORS$9 && !fails$q(function () {
-    return defineProperty$7(function () { /* empty */ }, 'length', { value: 8 }).length !== 8;
-  });
+  	// `Object.defineProperty` method
+  	// https://tc39.es/ecma262/#sec-object.defineproperty
+  	objectDefineProperty.f = DESCRIPTORS ? V8_PROTOTYPE_DEFINE_BUG ? function defineProperty(O, P, Attributes) {
+  	  anObject(O);
+  	  P = toPropertyKey(P);
+  	  anObject(Attributes);
+  	  if (typeof O === 'function' && P === 'prototype' && 'value' in Attributes && WRITABLE in Attributes && !Attributes[WRITABLE]) {
+  	    var current = $getOwnPropertyDescriptor(O, P);
+  	    if (current && current[WRITABLE]) {
+  	      O[P] = Attributes.value;
+  	      Attributes = {
+  	        configurable: CONFIGURABLE in Attributes ? Attributes[CONFIGURABLE] : current[CONFIGURABLE],
+  	        enumerable: ENUMERABLE in Attributes ? Attributes[ENUMERABLE] : current[ENUMERABLE],
+  	        writable: false
+  	      };
+  	    }
+  	  } return $defineProperty(O, P, Attributes);
+  	} : $defineProperty : function defineProperty(O, P, Attributes) {
+  	  anObject(O);
+  	  P = toPropertyKey(P);
+  	  anObject(Attributes);
+  	  if (IE8_DOM_DEFINE) try {
+  	    return $defineProperty(O, P, Attributes);
+  	  } catch (error) { /* empty */ }
+  	  if ('get' in Attributes || 'set' in Attributes) throw new $TypeError('Accessors not supported');
+  	  if ('value' in Attributes) O[P] = Attributes.value;
+  	  return O;
+  	};
+  	return objectDefineProperty;
+  }
 
-  var TEMPLATE = String(String).split('String');
+  var createNonEnumerableProperty;
+  var hasRequiredCreateNonEnumerableProperty;
 
-  var makeBuiltIn$2 = makeBuiltIn$3.exports = function (value, name, options) {
-    if (stringSlice$8($String$2(name), 0, 7) === 'Symbol(') {
-      name = '[' + replace$4($String$2(name), /^Symbol\(([^)]*)\).*$/, '$1') + ']';
-    }
-    if (options && options.getter) name = 'get ' + name;
-    if (options && options.setter) name = 'set ' + name;
-    if (!hasOwn$7(value, 'name') || (CONFIGURABLE_FUNCTION_NAME$1 && value.name !== name)) {
-      if (DESCRIPTORS$9) defineProperty$7(value, 'name', { value: name, configurable: true });
-      else value.name = name;
-    }
-    if (CONFIGURABLE_LENGTH && options && hasOwn$7(options, 'arity') && value.length !== options.arity) {
-      defineProperty$7(value, 'length', { value: options.arity });
-    }
-    try {
-      if (options && hasOwn$7(options, 'constructor') && options.constructor) {
-        if (DESCRIPTORS$9) defineProperty$7(value, 'prototype', { writable: false });
-      // in V8 ~ Chrome 53, prototypes of some methods, like `Array.prototype.values`, are non-writable
-      } else if (value.prototype) value.prototype = undefined;
-    } catch (error) { /* empty */ }
-    var state = enforceInternalState$1(value);
-    if (!hasOwn$7(state, 'source')) {
-      state.source = join(TEMPLATE, typeof name == 'string' ? name : '');
-    } return value;
-  };
+  function requireCreateNonEnumerableProperty () {
+  	if (hasRequiredCreateNonEnumerableProperty) return createNonEnumerableProperty;
+  	hasRequiredCreateNonEnumerableProperty = 1;
+  	var DESCRIPTORS = requireDescriptors();
+  	var definePropertyModule = requireObjectDefineProperty();
+  	var createPropertyDescriptor = requireCreatePropertyDescriptor();
 
-  // add fake Function#toString for correct work wrapped methods / constructors with methods like LoDash isNative
-  // eslint-disable-next-line no-extend-native -- required
-  Function.prototype.toString = makeBuiltIn$2(function toString() {
-    return isCallable$a(this) && getInternalState$2(this).source || inspectSource$1(this);
-  }, 'toString');
+  	createNonEnumerableProperty = DESCRIPTORS ? function (object, key, value) {
+  	  return definePropertyModule.f(object, key, createPropertyDescriptor(1, value));
+  	} : function (object, key, value) {
+  	  object[key] = value;
+  	  return object;
+  	};
+  	return createNonEnumerableProperty;
+  }
 
-  var makeBuiltInExports = makeBuiltIn$3.exports;
+  var makeBuiltIn = {exports: {}};
 
-  var isCallable$9 = isCallable$i;
-  var definePropertyModule$3 = objectDefineProperty;
-  var makeBuiltIn$1 = makeBuiltInExports;
-  var defineGlobalProperty$1 = defineGlobalProperty$3;
+  var functionName;
+  var hasRequiredFunctionName;
 
-  var defineBuiltIn$7 = function (O, key, value, options) {
-    if (!options) options = {};
-    var simple = options.enumerable;
-    var name = options.name !== undefined ? options.name : key;
-    if (isCallable$9(value)) makeBuiltIn$1(value, name, options);
-    if (options.global) {
-      if (simple) O[key] = value;
-      else defineGlobalProperty$1(key, value);
-    } else {
-      try {
-        if (!options.unsafe) delete O[key];
-        else if (O[key]) simple = true;
-      } catch (error) { /* empty */ }
-      if (simple) O[key] = value;
-      else definePropertyModule$3.f(O, key, {
-        value: value,
-        enumerable: false,
-        configurable: !options.nonConfigurable,
-        writable: !options.nonWritable
-      });
-    } return O;
-  };
+  function requireFunctionName () {
+  	if (hasRequiredFunctionName) return functionName;
+  	hasRequiredFunctionName = 1;
+  	var DESCRIPTORS = requireDescriptors();
+  	var hasOwn = requireHasOwnProperty();
+
+  	var FunctionPrototype = Function.prototype;
+  	// eslint-disable-next-line es/no-object-getownpropertydescriptor -- safe
+  	var getDescriptor = DESCRIPTORS && Object.getOwnPropertyDescriptor;
+
+  	var EXISTS = hasOwn(FunctionPrototype, 'name');
+  	// additional protection from minified / mangled / dropped function names
+  	var PROPER = EXISTS && (function something() { /* empty */ }).name === 'something';
+  	var CONFIGURABLE = EXISTS && (!DESCRIPTORS || (DESCRIPTORS && getDescriptor(FunctionPrototype, 'name').configurable));
+
+  	functionName = {
+  	  EXISTS: EXISTS,
+  	  PROPER: PROPER,
+  	  CONFIGURABLE: CONFIGURABLE
+  	};
+  	return functionName;
+  }
+
+  var inspectSource;
+  var hasRequiredInspectSource;
+
+  function requireInspectSource () {
+  	if (hasRequiredInspectSource) return inspectSource;
+  	hasRequiredInspectSource = 1;
+  	var uncurryThis = requireFunctionUncurryThis();
+  	var isCallable = requireIsCallable();
+  	var store = requireSharedStore();
+
+  	var functionToString = uncurryThis(Function.toString);
+
+  	// this helper broken in `core-js@3.4.1-3.4.4`, so we can't use `shared` helper
+  	if (!isCallable(store.inspectSource)) {
+  	  store.inspectSource = function (it) {
+  	    return functionToString(it);
+  	  };
+  	}
+
+  	inspectSource = store.inspectSource;
+  	return inspectSource;
+  }
+
+  var weakMapBasicDetection;
+  var hasRequiredWeakMapBasicDetection;
+
+  function requireWeakMapBasicDetection () {
+  	if (hasRequiredWeakMapBasicDetection) return weakMapBasicDetection;
+  	hasRequiredWeakMapBasicDetection = 1;
+  	var globalThis = requireGlobalThis();
+  	var isCallable = requireIsCallable();
+
+  	var WeakMap = globalThis.WeakMap;
+
+  	weakMapBasicDetection = isCallable(WeakMap) && /native code/.test(String(WeakMap));
+  	return weakMapBasicDetection;
+  }
+
+  var sharedKey;
+  var hasRequiredSharedKey;
+
+  function requireSharedKey () {
+  	if (hasRequiredSharedKey) return sharedKey;
+  	hasRequiredSharedKey = 1;
+  	var shared = requireShared();
+  	var uid = requireUid();
+
+  	var keys = shared('keys');
+
+  	sharedKey = function (key) {
+  	  return keys[key] || (keys[key] = uid(key));
+  	};
+  	return sharedKey;
+  }
+
+  var hiddenKeys;
+  var hasRequiredHiddenKeys;
+
+  function requireHiddenKeys () {
+  	if (hasRequiredHiddenKeys) return hiddenKeys;
+  	hasRequiredHiddenKeys = 1;
+  	hiddenKeys = {};
+  	return hiddenKeys;
+  }
+
+  var internalState;
+  var hasRequiredInternalState;
+
+  function requireInternalState () {
+  	if (hasRequiredInternalState) return internalState;
+  	hasRequiredInternalState = 1;
+  	var NATIVE_WEAK_MAP = requireWeakMapBasicDetection();
+  	var globalThis = requireGlobalThis();
+  	var isObject = requireIsObject();
+  	var createNonEnumerableProperty = requireCreateNonEnumerableProperty();
+  	var hasOwn = requireHasOwnProperty();
+  	var shared = requireSharedStore();
+  	var sharedKey = requireSharedKey();
+  	var hiddenKeys = requireHiddenKeys();
+
+  	var OBJECT_ALREADY_INITIALIZED = 'Object already initialized';
+  	var TypeError = globalThis.TypeError;
+  	var WeakMap = globalThis.WeakMap;
+  	var set, get, has;
+
+  	var enforce = function (it) {
+  	  return has(it) ? get(it) : set(it, {});
+  	};
+
+  	var getterFor = function (TYPE) {
+  	  return function (it) {
+  	    var state;
+  	    if (!isObject(it) || (state = get(it)).type !== TYPE) {
+  	      throw new TypeError('Incompatible receiver, ' + TYPE + ' required');
+  	    } return state;
+  	  };
+  	};
+
+  	if (NATIVE_WEAK_MAP || shared.state) {
+  	  var store = shared.state || (shared.state = new WeakMap());
+  	  /* eslint-disable no-self-assign -- prototype methods protection */
+  	  store.get = store.get;
+  	  store.has = store.has;
+  	  store.set = store.set;
+  	  /* eslint-enable no-self-assign -- prototype methods protection */
+  	  set = function (it, metadata) {
+  	    if (store.has(it)) throw new TypeError(OBJECT_ALREADY_INITIALIZED);
+  	    metadata.facade = it;
+  	    store.set(it, metadata);
+  	    return metadata;
+  	  };
+  	  get = function (it) {
+  	    return store.get(it) || {};
+  	  };
+  	  has = function (it) {
+  	    return store.has(it);
+  	  };
+  	} else {
+  	  var STATE = sharedKey('state');
+  	  hiddenKeys[STATE] = true;
+  	  set = function (it, metadata) {
+  	    if (hasOwn(it, STATE)) throw new TypeError(OBJECT_ALREADY_INITIALIZED);
+  	    metadata.facade = it;
+  	    createNonEnumerableProperty(it, STATE, metadata);
+  	    return metadata;
+  	  };
+  	  get = function (it) {
+  	    return hasOwn(it, STATE) ? it[STATE] : {};
+  	  };
+  	  has = function (it) {
+  	    return hasOwn(it, STATE);
+  	  };
+  	}
+
+  	internalState = {
+  	  set: set,
+  	  get: get,
+  	  has: has,
+  	  enforce: enforce,
+  	  getterFor: getterFor
+  	};
+  	return internalState;
+  }
+
+  var hasRequiredMakeBuiltIn;
+
+  function requireMakeBuiltIn () {
+  	if (hasRequiredMakeBuiltIn) return makeBuiltIn.exports;
+  	hasRequiredMakeBuiltIn = 1;
+  	var uncurryThis = requireFunctionUncurryThis();
+  	var fails = requireFails();
+  	var isCallable = requireIsCallable();
+  	var hasOwn = requireHasOwnProperty();
+  	var DESCRIPTORS = requireDescriptors();
+  	var CONFIGURABLE_FUNCTION_NAME = requireFunctionName().CONFIGURABLE;
+  	var inspectSource = requireInspectSource();
+  	var InternalStateModule = requireInternalState();
+
+  	var enforceInternalState = InternalStateModule.enforce;
+  	var getInternalState = InternalStateModule.get;
+  	var $String = String;
+  	// eslint-disable-next-line es/no-object-defineproperty -- safe
+  	var defineProperty = Object.defineProperty;
+  	var stringSlice = uncurryThis(''.slice);
+  	var replace = uncurryThis(''.replace);
+  	var join = uncurryThis([].join);
+
+  	var CONFIGURABLE_LENGTH = DESCRIPTORS && !fails(function () {
+  	  return defineProperty(function () { /* empty */ }, 'length', { value: 8 }).length !== 8;
+  	});
+
+  	var TEMPLATE = String(String).split('String');
+
+  	var makeBuiltIn$1 = makeBuiltIn.exports = function (value, name, options) {
+  	  if (stringSlice($String(name), 0, 7) === 'Symbol(') {
+  	    name = '[' + replace($String(name), /^Symbol\(([^)]*)\).*$/, '$1') + ']';
+  	  }
+  	  if (options && options.getter) name = 'get ' + name;
+  	  if (options && options.setter) name = 'set ' + name;
+  	  if (!hasOwn(value, 'name') || (CONFIGURABLE_FUNCTION_NAME && value.name !== name)) {
+  	    if (DESCRIPTORS) defineProperty(value, 'name', { value: name, configurable: true });
+  	    else value.name = name;
+  	  }
+  	  if (CONFIGURABLE_LENGTH && options && hasOwn(options, 'arity') && value.length !== options.arity) {
+  	    defineProperty(value, 'length', { value: options.arity });
+  	  }
+  	  try {
+  	    if (options && hasOwn(options, 'constructor') && options.constructor) {
+  	      if (DESCRIPTORS) defineProperty(value, 'prototype', { writable: false });
+  	    // in V8 ~ Chrome 53, prototypes of some methods, like `Array.prototype.values`, are non-writable
+  	    } else if (value.prototype) value.prototype = undefined;
+  	  } catch (error) { /* empty */ }
+  	  var state = enforceInternalState(value);
+  	  if (!hasOwn(state, 'source')) {
+  	    state.source = join(TEMPLATE, typeof name == 'string' ? name : '');
+  	  } return value;
+  	};
+
+  	// add fake Function#toString for correct work wrapped methods / constructors with methods like LoDash isNative
+  	// eslint-disable-next-line no-extend-native -- required
+  	Function.prototype.toString = makeBuiltIn$1(function toString() {
+  	  return isCallable(this) && getInternalState(this).source || inspectSource(this);
+  	}, 'toString');
+  	return makeBuiltIn.exports;
+  }
+
+  var defineBuiltIn;
+  var hasRequiredDefineBuiltIn;
+
+  function requireDefineBuiltIn () {
+  	if (hasRequiredDefineBuiltIn) return defineBuiltIn;
+  	hasRequiredDefineBuiltIn = 1;
+  	var isCallable = requireIsCallable();
+  	var definePropertyModule = requireObjectDefineProperty();
+  	var makeBuiltIn = requireMakeBuiltIn();
+  	var defineGlobalProperty = requireDefineGlobalProperty();
+
+  	defineBuiltIn = function (O, key, value, options) {
+  	  if (!options) options = {};
+  	  var simple = options.enumerable;
+  	  var name = options.name !== undefined ? options.name : key;
+  	  if (isCallable(value)) makeBuiltIn(value, name, options);
+  	  if (options.global) {
+  	    if (simple) O[key] = value;
+  	    else defineGlobalProperty(key, value);
+  	  } else {
+  	    try {
+  	      if (!options.unsafe) delete O[key];
+  	      else if (O[key]) simple = true;
+  	    } catch (error) { /* empty */ }
+  	    if (simple) O[key] = value;
+  	    else definePropertyModule.f(O, key, {
+  	      value: value,
+  	      enumerable: false,
+  	      configurable: !options.nonConfigurable,
+  	      writable: !options.nonWritable
+  	    });
+  	  } return O;
+  	};
+  	return defineBuiltIn;
+  }
 
   var objectGetOwnPropertyNames = {};
 
-  var ceil = Math.ceil;
-  var floor$2 = Math.floor;
+  var mathTrunc;
+  var hasRequiredMathTrunc;
 
-  // `Math.trunc` method
-  // https://tc39.es/ecma262/#sec-math.trunc
-  // eslint-disable-next-line es/no-math-trunc -- safe
-  var mathTrunc = Math.trunc || function trunc(x) {
-    var n = +x;
-    return (n > 0 ? floor$2 : ceil)(n);
-  };
+  function requireMathTrunc () {
+  	if (hasRequiredMathTrunc) return mathTrunc;
+  	hasRequiredMathTrunc = 1;
+  	var ceil = Math.ceil;
+  	var floor = Math.floor;
 
-  var trunc = mathTrunc;
+  	// `Math.trunc` method
+  	// https://tc39.es/ecma262/#sec-math.trunc
+  	// eslint-disable-next-line es/no-math-trunc -- safe
+  	mathTrunc = Math.trunc || function trunc(x) {
+  	  var n = +x;
+  	  return (n > 0 ? floor : ceil)(n);
+  	};
+  	return mathTrunc;
+  }
 
-  // `ToIntegerOrInfinity` abstract operation
-  // https://tc39.es/ecma262/#sec-tointegerorinfinity
-  var toIntegerOrInfinity$5 = function (argument) {
-    var number = +argument;
-    // eslint-disable-next-line no-self-compare -- NaN check
-    return number !== number || number === 0 ? 0 : trunc(number);
-  };
+  var toIntegerOrInfinity;
+  var hasRequiredToIntegerOrInfinity;
 
-  var toIntegerOrInfinity$4 = toIntegerOrInfinity$5;
+  function requireToIntegerOrInfinity () {
+  	if (hasRequiredToIntegerOrInfinity) return toIntegerOrInfinity;
+  	hasRequiredToIntegerOrInfinity = 1;
+  	var trunc = requireMathTrunc();
 
-  var max$3 = Math.max;
-  var min$6 = Math.min;
+  	// `ToIntegerOrInfinity` abstract operation
+  	// https://tc39.es/ecma262/#sec-tointegerorinfinity
+  	toIntegerOrInfinity = function (argument) {
+  	  var number = +argument;
+  	  // eslint-disable-next-line no-self-compare -- NaN check
+  	  return number !== number || number === 0 ? 0 : trunc(number);
+  	};
+  	return toIntegerOrInfinity;
+  }
 
-  // Helper for a popular repeating case of the spec:
-  // Let integer be ? ToInteger(index).
-  // If integer < 0, let result be max((length + integer), 0); else let result be min(integer, length).
-  var toAbsoluteIndex$3 = function (index, length) {
-    var integer = toIntegerOrInfinity$4(index);
-    return integer < 0 ? max$3(integer + length, 0) : min$6(integer, length);
-  };
+  var toAbsoluteIndex;
+  var hasRequiredToAbsoluteIndex;
 
-  var toIntegerOrInfinity$3 = toIntegerOrInfinity$5;
+  function requireToAbsoluteIndex () {
+  	if (hasRequiredToAbsoluteIndex) return toAbsoluteIndex;
+  	hasRequiredToAbsoluteIndex = 1;
+  	var toIntegerOrInfinity = requireToIntegerOrInfinity();
 
-  var min$5 = Math.min;
+  	var max = Math.max;
+  	var min = Math.min;
 
-  // `ToLength` abstract operation
-  // https://tc39.es/ecma262/#sec-tolength
-  var toLength$6 = function (argument) {
-    var len = toIntegerOrInfinity$3(argument);
-    return len > 0 ? min$5(len, 0x1FFFFFFFFFFFFF) : 0; // 2 ** 53 - 1 == 9007199254740991
-  };
+  	// Helper for a popular repeating case of the spec:
+  	// Let integer be ? ToInteger(index).
+  	// If integer < 0, let result be max((length + integer), 0); else let result be min(integer, length).
+  	toAbsoluteIndex = function (index, length) {
+  	  var integer = toIntegerOrInfinity(index);
+  	  return integer < 0 ? max(integer + length, 0) : min(integer, length);
+  	};
+  	return toAbsoluteIndex;
+  }
 
-  var toLength$5 = toLength$6;
+  var toLength;
+  var hasRequiredToLength;
 
-  // `LengthOfArrayLike` abstract operation
-  // https://tc39.es/ecma262/#sec-lengthofarraylike
-  var lengthOfArrayLike$6 = function (obj) {
-    return toLength$5(obj.length);
-  };
+  function requireToLength () {
+  	if (hasRequiredToLength) return toLength;
+  	hasRequiredToLength = 1;
+  	var toIntegerOrInfinity = requireToIntegerOrInfinity();
 
-  var toIndexedObject$6 = toIndexedObject$8;
-  var toAbsoluteIndex$2 = toAbsoluteIndex$3;
-  var lengthOfArrayLike$5 = lengthOfArrayLike$6;
+  	var min = Math.min;
 
-  // `Array.prototype.{ indexOf, includes }` methods implementation
-  var createMethod$4 = function (IS_INCLUDES) {
-    return function ($this, el, fromIndex) {
-      var O = toIndexedObject$6($this);
-      var length = lengthOfArrayLike$5(O);
-      if (length === 0) return !IS_INCLUDES && -1;
-      var index = toAbsoluteIndex$2(fromIndex, length);
-      var value;
-      // Array#includes uses SameValueZero equality algorithm
-      // eslint-disable-next-line no-self-compare -- NaN check
-      if (IS_INCLUDES && el !== el) while (length > index) {
-        value = O[index++];
-        // eslint-disable-next-line no-self-compare -- NaN check
-        if (value !== value) return true;
-      // Array#indexOf ignores holes, Array#includes - not
-      } else for (;length > index; index++) {
-        if ((IS_INCLUDES || index in O) && O[index] === el) return IS_INCLUDES || index || 0;
-      } return !IS_INCLUDES && -1;
-    };
-  };
+  	// `ToLength` abstract operation
+  	// https://tc39.es/ecma262/#sec-tolength
+  	toLength = function (argument) {
+  	  var len = toIntegerOrInfinity(argument);
+  	  return len > 0 ? min(len, 0x1FFFFFFFFFFFFF) : 0; // 2 ** 53 - 1 == 9007199254740991
+  	};
+  	return toLength;
+  }
 
-  var arrayIncludes = {
-    // `Array.prototype.includes` method
-    // https://tc39.es/ecma262/#sec-array.prototype.includes
-    includes: createMethod$4(true),
-    // `Array.prototype.indexOf` method
-    // https://tc39.es/ecma262/#sec-array.prototype.indexof
-    indexOf: createMethod$4(false)
-  };
+  var lengthOfArrayLike;
+  var hasRequiredLengthOfArrayLike;
 
-  var uncurryThis$r = functionUncurryThis;
-  var hasOwn$6 = hasOwnProperty_1;
-  var toIndexedObject$5 = toIndexedObject$8;
-  var indexOf$1 = arrayIncludes.indexOf;
-  var hiddenKeys$2 = hiddenKeys$4;
+  function requireLengthOfArrayLike () {
+  	if (hasRequiredLengthOfArrayLike) return lengthOfArrayLike;
+  	hasRequiredLengthOfArrayLike = 1;
+  	var toLength = requireToLength();
 
-  var push$5 = uncurryThis$r([].push);
+  	// `LengthOfArrayLike` abstract operation
+  	// https://tc39.es/ecma262/#sec-lengthofarraylike
+  	lengthOfArrayLike = function (obj) {
+  	  return toLength(obj.length);
+  	};
+  	return lengthOfArrayLike;
+  }
 
-  var objectKeysInternal = function (object, names) {
-    var O = toIndexedObject$5(object);
-    var i = 0;
-    var result = [];
-    var key;
-    for (key in O) !hasOwn$6(hiddenKeys$2, key) && hasOwn$6(O, key) && push$5(result, key);
-    // Don't enum bug & hidden keys
-    while (names.length > i) if (hasOwn$6(O, key = names[i++])) {
-      ~indexOf$1(result, key) || push$5(result, key);
-    }
-    return result;
-  };
+  var arrayIncludes;
+  var hasRequiredArrayIncludes;
 
-  // IE8- don't enum bug keys
-  var enumBugKeys$3 = [
-    'constructor',
-    'hasOwnProperty',
-    'isPrototypeOf',
-    'propertyIsEnumerable',
-    'toLocaleString',
-    'toString',
-    'valueOf'
-  ];
+  function requireArrayIncludes () {
+  	if (hasRequiredArrayIncludes) return arrayIncludes;
+  	hasRequiredArrayIncludes = 1;
+  	var toIndexedObject = requireToIndexedObject();
+  	var toAbsoluteIndex = requireToAbsoluteIndex();
+  	var lengthOfArrayLike = requireLengthOfArrayLike();
 
-  var internalObjectKeys$1 = objectKeysInternal;
-  var enumBugKeys$2 = enumBugKeys$3;
+  	// `Array.prototype.{ indexOf, includes }` methods implementation
+  	var createMethod = function (IS_INCLUDES) {
+  	  return function ($this, el, fromIndex) {
+  	    var O = toIndexedObject($this);
+  	    var length = lengthOfArrayLike(O);
+  	    if (length === 0) return !IS_INCLUDES && -1;
+  	    var index = toAbsoluteIndex(fromIndex, length);
+  	    var value;
+  	    // Array#includes uses SameValueZero equality algorithm
+  	    // eslint-disable-next-line no-self-compare -- NaN check
+  	    if (IS_INCLUDES && el !== el) while (length > index) {
+  	      value = O[index++];
+  	      // eslint-disable-next-line no-self-compare -- NaN check
+  	      if (value !== value) return true;
+  	    // Array#indexOf ignores holes, Array#includes - not
+  	    } else for (;length > index; index++) {
+  	      if ((IS_INCLUDES || index in O) && O[index] === el) return IS_INCLUDES || index || 0;
+  	    } return !IS_INCLUDES && -1;
+  	  };
+  	};
 
-  var hiddenKeys$1 = enumBugKeys$2.concat('length', 'prototype');
+  	arrayIncludes = {
+  	  // `Array.prototype.includes` method
+  	  // https://tc39.es/ecma262/#sec-array.prototype.includes
+  	  includes: createMethod(true),
+  	  // `Array.prototype.indexOf` method
+  	  // https://tc39.es/ecma262/#sec-array.prototype.indexof
+  	  indexOf: createMethod(false)
+  	};
+  	return arrayIncludes;
+  }
 
-  // `Object.getOwnPropertyNames` method
-  // https://tc39.es/ecma262/#sec-object.getownpropertynames
-  // eslint-disable-next-line es/no-object-getownpropertynames -- safe
-  objectGetOwnPropertyNames.f = Object.getOwnPropertyNames || function getOwnPropertyNames(O) {
-    return internalObjectKeys$1(O, hiddenKeys$1);
-  };
+  var objectKeysInternal;
+  var hasRequiredObjectKeysInternal;
+
+  function requireObjectKeysInternal () {
+  	if (hasRequiredObjectKeysInternal) return objectKeysInternal;
+  	hasRequiredObjectKeysInternal = 1;
+  	var uncurryThis = requireFunctionUncurryThis();
+  	var hasOwn = requireHasOwnProperty();
+  	var toIndexedObject = requireToIndexedObject();
+  	var indexOf = requireArrayIncludes().indexOf;
+  	var hiddenKeys = requireHiddenKeys();
+
+  	var push = uncurryThis([].push);
+
+  	objectKeysInternal = function (object, names) {
+  	  var O = toIndexedObject(object);
+  	  var i = 0;
+  	  var result = [];
+  	  var key;
+  	  for (key in O) !hasOwn(hiddenKeys, key) && hasOwn(O, key) && push(result, key);
+  	  // Don't enum bug & hidden keys
+  	  while (names.length > i) if (hasOwn(O, key = names[i++])) {
+  	    ~indexOf(result, key) || push(result, key);
+  	  }
+  	  return result;
+  	};
+  	return objectKeysInternal;
+  }
+
+  var enumBugKeys;
+  var hasRequiredEnumBugKeys;
+
+  function requireEnumBugKeys () {
+  	if (hasRequiredEnumBugKeys) return enumBugKeys;
+  	hasRequiredEnumBugKeys = 1;
+  	// IE8- don't enum bug keys
+  	enumBugKeys = [
+  	  'constructor',
+  	  'hasOwnProperty',
+  	  'isPrototypeOf',
+  	  'propertyIsEnumerable',
+  	  'toLocaleString',
+  	  'toString',
+  	  'valueOf'
+  	];
+  	return enumBugKeys;
+  }
+
+  var hasRequiredObjectGetOwnPropertyNames;
+
+  function requireObjectGetOwnPropertyNames () {
+  	if (hasRequiredObjectGetOwnPropertyNames) return objectGetOwnPropertyNames;
+  	hasRequiredObjectGetOwnPropertyNames = 1;
+  	var internalObjectKeys = requireObjectKeysInternal();
+  	var enumBugKeys = requireEnumBugKeys();
+
+  	var hiddenKeys = enumBugKeys.concat('length', 'prototype');
+
+  	// `Object.getOwnPropertyNames` method
+  	// https://tc39.es/ecma262/#sec-object.getownpropertynames
+  	// eslint-disable-next-line es/no-object-getownpropertynames -- safe
+  	objectGetOwnPropertyNames.f = Object.getOwnPropertyNames || function getOwnPropertyNames(O) {
+  	  return internalObjectKeys(O, hiddenKeys);
+  	};
+  	return objectGetOwnPropertyNames;
+  }
 
   var objectGetOwnPropertySymbols = {};
 
-  // eslint-disable-next-line es/no-object-getownpropertysymbols -- safe
-  objectGetOwnPropertySymbols.f = Object.getOwnPropertySymbols;
+  var hasRequiredObjectGetOwnPropertySymbols;
 
-  var getBuiltIn$3 = getBuiltIn$5;
-  var uncurryThis$q = functionUncurryThis;
-  var getOwnPropertyNamesModule = objectGetOwnPropertyNames;
-  var getOwnPropertySymbolsModule$1 = objectGetOwnPropertySymbols;
-  var anObject$a = anObject$c;
+  function requireObjectGetOwnPropertySymbols () {
+  	if (hasRequiredObjectGetOwnPropertySymbols) return objectGetOwnPropertySymbols;
+  	hasRequiredObjectGetOwnPropertySymbols = 1;
+  	// eslint-disable-next-line es/no-object-getownpropertysymbols -- safe
+  	objectGetOwnPropertySymbols.f = Object.getOwnPropertySymbols;
+  	return objectGetOwnPropertySymbols;
+  }
 
-  var concat$2 = uncurryThis$q([].concat);
+  var ownKeys;
+  var hasRequiredOwnKeys;
 
-  // all object keys, includes non-enumerable and symbols
-  var ownKeys$1 = getBuiltIn$3('Reflect', 'ownKeys') || function ownKeys(it) {
-    var keys = getOwnPropertyNamesModule.f(anObject$a(it));
-    var getOwnPropertySymbols = getOwnPropertySymbolsModule$1.f;
-    return getOwnPropertySymbols ? concat$2(keys, getOwnPropertySymbols(it)) : keys;
-  };
+  function requireOwnKeys () {
+  	if (hasRequiredOwnKeys) return ownKeys;
+  	hasRequiredOwnKeys = 1;
+  	var getBuiltIn = requireGetBuiltIn();
+  	var uncurryThis = requireFunctionUncurryThis();
+  	var getOwnPropertyNamesModule = requireObjectGetOwnPropertyNames();
+  	var getOwnPropertySymbolsModule = requireObjectGetOwnPropertySymbols();
+  	var anObject = requireAnObject();
 
-  var hasOwn$5 = hasOwnProperty_1;
-  var ownKeys = ownKeys$1;
-  var getOwnPropertyDescriptorModule = objectGetOwnPropertyDescriptor;
-  var definePropertyModule$2 = objectDefineProperty;
+  	var concat = uncurryThis([].concat);
 
-  var copyConstructorProperties$2 = function (target, source, exceptions) {
-    var keys = ownKeys(source);
-    var defineProperty = definePropertyModule$2.f;
-    var getOwnPropertyDescriptor = getOwnPropertyDescriptorModule.f;
-    for (var i = 0; i < keys.length; i++) {
-      var key = keys[i];
-      if (!hasOwn$5(target, key) && !(exceptions && hasOwn$5(exceptions, key))) {
-        defineProperty(target, key, getOwnPropertyDescriptor(source, key));
-      }
-    }
-  };
+  	// all object keys, includes non-enumerable and symbols
+  	ownKeys = getBuiltIn('Reflect', 'ownKeys') || function ownKeys(it) {
+  	  var keys = getOwnPropertyNamesModule.f(anObject(it));
+  	  var getOwnPropertySymbols = getOwnPropertySymbolsModule.f;
+  	  return getOwnPropertySymbols ? concat(keys, getOwnPropertySymbols(it)) : keys;
+  	};
+  	return ownKeys;
+  }
 
-  var fails$p = fails$x;
-  var isCallable$8 = isCallable$i;
+  var copyConstructorProperties;
+  var hasRequiredCopyConstructorProperties;
 
-  var replacement = /#|\.prototype\./;
+  function requireCopyConstructorProperties () {
+  	if (hasRequiredCopyConstructorProperties) return copyConstructorProperties;
+  	hasRequiredCopyConstructorProperties = 1;
+  	var hasOwn = requireHasOwnProperty();
+  	var ownKeys = requireOwnKeys();
+  	var getOwnPropertyDescriptorModule = requireObjectGetOwnPropertyDescriptor();
+  	var definePropertyModule = requireObjectDefineProperty();
 
-  var isForced$3 = function (feature, detection) {
-    var value = data[normalize(feature)];
-    return value === POLYFILL ? true
-      : value === NATIVE ? false
-      : isCallable$8(detection) ? fails$p(detection)
-      : !!detection;
-  };
+  	copyConstructorProperties = function (target, source, exceptions) {
+  	  var keys = ownKeys(source);
+  	  var defineProperty = definePropertyModule.f;
+  	  var getOwnPropertyDescriptor = getOwnPropertyDescriptorModule.f;
+  	  for (var i = 0; i < keys.length; i++) {
+  	    var key = keys[i];
+  	    if (!hasOwn(target, key) && !(exceptions && hasOwn(exceptions, key))) {
+  	      defineProperty(target, key, getOwnPropertyDescriptor(source, key));
+  	    }
+  	  }
+  	};
+  	return copyConstructorProperties;
+  }
 
-  var normalize = isForced$3.normalize = function (string) {
-    return String(string).replace(replacement, '.').toLowerCase();
-  };
+  var isForced_1;
+  var hasRequiredIsForced;
 
-  var data = isForced$3.data = {};
-  var NATIVE = isForced$3.NATIVE = 'N';
-  var POLYFILL = isForced$3.POLYFILL = 'P';
+  function requireIsForced () {
+  	if (hasRequiredIsForced) return isForced_1;
+  	hasRequiredIsForced = 1;
+  	var fails = requireFails();
+  	var isCallable = requireIsCallable();
 
-  var isForced_1 = isForced$3;
+  	var replacement = /#|\.prototype\./;
 
-  var global$b = global$k;
-  var getOwnPropertyDescriptor$4 = objectGetOwnPropertyDescriptor.f;
-  var createNonEnumerableProperty$5 = createNonEnumerableProperty$7;
-  var defineBuiltIn$6 = defineBuiltIn$7;
-  var defineGlobalProperty = defineGlobalProperty$3;
-  var copyConstructorProperties$1 = copyConstructorProperties$2;
-  var isForced$2 = isForced_1;
+  	var isForced = function (feature, detection) {
+  	  var value = data[normalize(feature)];
+  	  return value === POLYFILL ? true
+  	    : value === NATIVE ? false
+  	    : isCallable(detection) ? fails(detection)
+  	    : !!detection;
+  	};
 
-  /*
-    options.target         - name of the target object
-    options.global         - target is the global object
-    options.stat           - export as static methods of target
-    options.proto          - export as prototype methods of target
-    options.real           - real prototype method for the `pure` version
-    options.forced         - export even if the native feature is available
-    options.bind           - bind methods to the target, required for the `pure` version
-    options.wrap           - wrap constructors to preventing global pollution, required for the `pure` version
-    options.unsafe         - use the simple assignment of property instead of delete + defineProperty
-    options.sham           - add a flag to not completely full polyfills
-    options.enumerable     - export as enumerable property
-    options.dontCallGetSet - prevent calling a getter on target
-    options.name           - the .name of the function if it does not match the key
-  */
-  var _export = function (options, source) {
-    var TARGET = options.target;
-    var GLOBAL = options.global;
-    var STATIC = options.stat;
-    var FORCED, target, key, targetProperty, sourceProperty, descriptor;
-    if (GLOBAL) {
-      target = global$b;
-    } else if (STATIC) {
-      target = global$b[TARGET] || defineGlobalProperty(TARGET, {});
-    } else {
-      target = global$b[TARGET] && global$b[TARGET].prototype;
-    }
-    if (target) for (key in source) {
-      sourceProperty = source[key];
-      if (options.dontCallGetSet) {
-        descriptor = getOwnPropertyDescriptor$4(target, key);
-        targetProperty = descriptor && descriptor.value;
-      } else targetProperty = target[key];
-      FORCED = isForced$2(GLOBAL ? key : TARGET + (STATIC ? '.' : '#') + key, options.forced);
-      // contained in target
-      if (!FORCED && targetProperty !== undefined) {
-        if (typeof sourceProperty == typeof targetProperty) continue;
-        copyConstructorProperties$1(sourceProperty, targetProperty);
-      }
-      // add a flag to not completely full polyfills
-      if (options.sham || (targetProperty && targetProperty.sham)) {
-        createNonEnumerableProperty$5(sourceProperty, 'sham', true);
-      }
-      defineBuiltIn$6(target, key, sourceProperty, options);
-    }
-  };
+  	var normalize = isForced.normalize = function (string) {
+  	  return String(string).replace(replacement, '.').toLowerCase();
+  	};
 
-  var classof$6 = classofRaw$2;
+  	var data = isForced.data = {};
+  	var NATIVE = isForced.NATIVE = 'N';
+  	var POLYFILL = isForced.POLYFILL = 'P';
 
-  // `IsArray` abstract operation
-  // https://tc39.es/ecma262/#sec-isarray
-  // eslint-disable-next-line es/no-array-isarray -- safe
-  var isArray$5 = Array.isArray || function isArray(argument) {
-    return classof$6(argument) === 'Array';
-  };
+  	isForced_1 = isForced;
+  	return isForced_1;
+  }
 
-  var $TypeError$6 = TypeError;
-  var MAX_SAFE_INTEGER = 0x1FFFFFFFFFFFFF; // 2 ** 53 - 1 == 9007199254740991
+  var _export;
+  var hasRequired_export;
 
-  var doesNotExceedSafeInteger$2 = function (it) {
-    if (it > MAX_SAFE_INTEGER) throw $TypeError$6('Maximum allowed index exceeded');
-    return it;
-  };
+  function require_export () {
+  	if (hasRequired_export) return _export;
+  	hasRequired_export = 1;
+  	var globalThis = requireGlobalThis();
+  	var getOwnPropertyDescriptor = requireObjectGetOwnPropertyDescriptor().f;
+  	var createNonEnumerableProperty = requireCreateNonEnumerableProperty();
+  	var defineBuiltIn = requireDefineBuiltIn();
+  	var defineGlobalProperty = requireDefineGlobalProperty();
+  	var copyConstructorProperties = requireCopyConstructorProperties();
+  	var isForced = requireIsForced();
 
-  var DESCRIPTORS$8 = descriptors;
-  var definePropertyModule$1 = objectDefineProperty;
-  var createPropertyDescriptor$1 = createPropertyDescriptor$4;
+  	/*
+  	  options.target         - name of the target object
+  	  options.global         - target is the global object
+  	  options.stat           - export as static methods of target
+  	  options.proto          - export as prototype methods of target
+  	  options.real           - real prototype method for the `pure` version
+  	  options.forced         - export even if the native feature is available
+  	  options.bind           - bind methods to the target, required for the `pure` version
+  	  options.wrap           - wrap constructors to preventing global pollution, required for the `pure` version
+  	  options.unsafe         - use the simple assignment of property instead of delete + defineProperty
+  	  options.sham           - add a flag to not completely full polyfills
+  	  options.enumerable     - export as enumerable property
+  	  options.dontCallGetSet - prevent calling a getter on target
+  	  options.name           - the .name of the function if it does not match the key
+  	*/
+  	_export = function (options, source) {
+  	  var TARGET = options.target;
+  	  var GLOBAL = options.global;
+  	  var STATIC = options.stat;
+  	  var FORCED, target, key, targetProperty, sourceProperty, descriptor;
+  	  if (GLOBAL) {
+  	    target = globalThis;
+  	  } else if (STATIC) {
+  	    target = globalThis[TARGET] || defineGlobalProperty(TARGET, {});
+  	  } else {
+  	    target = globalThis[TARGET] && globalThis[TARGET].prototype;
+  	  }
+  	  if (target) for (key in source) {
+  	    sourceProperty = source[key];
+  	    if (options.dontCallGetSet) {
+  	      descriptor = getOwnPropertyDescriptor(target, key);
+  	      targetProperty = descriptor && descriptor.value;
+  	    } else targetProperty = target[key];
+  	    FORCED = isForced(GLOBAL ? key : TARGET + (STATIC ? '.' : '#') + key, options.forced);
+  	    // contained in target
+  	    if (!FORCED && targetProperty !== undefined) {
+  	      if (typeof sourceProperty == typeof targetProperty) continue;
+  	      copyConstructorProperties(sourceProperty, targetProperty);
+  	    }
+  	    // add a flag to not completely full polyfills
+  	    if (options.sham || (targetProperty && targetProperty.sham)) {
+  	      createNonEnumerableProperty(sourceProperty, 'sham', true);
+  	    }
+  	    defineBuiltIn(target, key, sourceProperty, options);
+  	  }
+  	};
+  	return _export;
+  }
 
-  var createProperty$3 = function (object, key, value) {
-    if (DESCRIPTORS$8) definePropertyModule$1.f(object, key, createPropertyDescriptor$1(0, value));
-    else object[key] = value;
-  };
+  var isArray;
+  var hasRequiredIsArray;
 
-  var wellKnownSymbol$h = wellKnownSymbol$j;
+  function requireIsArray () {
+  	if (hasRequiredIsArray) return isArray;
+  	hasRequiredIsArray = 1;
+  	var classof = requireClassofRaw();
 
-  var TO_STRING_TAG$2 = wellKnownSymbol$h('toStringTag');
-  var test$2 = {};
+  	// `IsArray` abstract operation
+  	// https://tc39.es/ecma262/#sec-isarray
+  	// eslint-disable-next-line es/no-array-isarray -- safe
+  	isArray = Array.isArray || function isArray(argument) {
+  	  return classof(argument) === 'Array';
+  	};
+  	return isArray;
+  }
 
-  test$2[TO_STRING_TAG$2] = 'z';
+  var doesNotExceedSafeInteger;
+  var hasRequiredDoesNotExceedSafeInteger;
 
-  var toStringTagSupport = String(test$2) === '[object z]';
+  function requireDoesNotExceedSafeInteger () {
+  	if (hasRequiredDoesNotExceedSafeInteger) return doesNotExceedSafeInteger;
+  	hasRequiredDoesNotExceedSafeInteger = 1;
+  	var $TypeError = TypeError;
+  	var MAX_SAFE_INTEGER = 0x1FFFFFFFFFFFFF; // 2 ** 53 - 1 == 9007199254740991
 
-  var TO_STRING_TAG_SUPPORT$2 = toStringTagSupport;
-  var isCallable$7 = isCallable$i;
-  var classofRaw$1 = classofRaw$2;
-  var wellKnownSymbol$g = wellKnownSymbol$j;
+  	doesNotExceedSafeInteger = function (it) {
+  	  if (it > MAX_SAFE_INTEGER) throw $TypeError('Maximum allowed index exceeded');
+  	  return it;
+  	};
+  	return doesNotExceedSafeInteger;
+  }
 
-  var TO_STRING_TAG$1 = wellKnownSymbol$g('toStringTag');
-  var $Object$1 = Object;
+  var createProperty;
+  var hasRequiredCreateProperty;
 
-  // ES3 wrong here
-  var CORRECT_ARGUMENTS = classofRaw$1(function () { return arguments; }()) === 'Arguments';
+  function requireCreateProperty () {
+  	if (hasRequiredCreateProperty) return createProperty;
+  	hasRequiredCreateProperty = 1;
+  	var DESCRIPTORS = requireDescriptors();
+  	var definePropertyModule = requireObjectDefineProperty();
+  	var createPropertyDescriptor = requireCreatePropertyDescriptor();
 
-  // fallback for IE11 Script Access Denied error
-  var tryGet = function (it, key) {
-    try {
-      return it[key];
-    } catch (error) { /* empty */ }
-  };
+  	createProperty = function (object, key, value) {
+  	  if (DESCRIPTORS) definePropertyModule.f(object, key, createPropertyDescriptor(0, value));
+  	  else object[key] = value;
+  	};
+  	return createProperty;
+  }
 
-  // getting tag from ES6+ `Object.prototype.toString`
-  var classof$5 = TO_STRING_TAG_SUPPORT$2 ? classofRaw$1 : function (it) {
-    var O, tag, result;
-    return it === undefined ? 'Undefined' : it === null ? 'Null'
-      // @@toStringTag case
-      : typeof (tag = tryGet(O = $Object$1(it), TO_STRING_TAG$1)) == 'string' ? tag
-      // builtinTag case
-      : CORRECT_ARGUMENTS ? classofRaw$1(O)
-      // ES3 arguments fallback
-      : (result = classofRaw$1(O)) === 'Object' && isCallable$7(O.callee) ? 'Arguments' : result;
-  };
+  var toStringTagSupport;
+  var hasRequiredToStringTagSupport;
 
-  var uncurryThis$p = functionUncurryThis;
-  var fails$o = fails$x;
-  var isCallable$6 = isCallable$i;
-  var classof$4 = classof$5;
-  var getBuiltIn$2 = getBuiltIn$5;
-  var inspectSource = inspectSource$2;
+  function requireToStringTagSupport () {
+  	if (hasRequiredToStringTagSupport) return toStringTagSupport;
+  	hasRequiredToStringTagSupport = 1;
+  	var wellKnownSymbol = requireWellKnownSymbol();
 
-  var noop = function () { /* empty */ };
-  var construct = getBuiltIn$2('Reflect', 'construct');
-  var constructorRegExp = /^\s*(?:class|function)\b/;
-  var exec$3 = uncurryThis$p(constructorRegExp.exec);
-  var INCORRECT_TO_STRING = !constructorRegExp.test(noop);
+  	var TO_STRING_TAG = wellKnownSymbol('toStringTag');
+  	var test = {};
 
-  var isConstructorModern = function isConstructor(argument) {
-    if (!isCallable$6(argument)) return false;
-    try {
-      construct(noop, [], argument);
-      return true;
-    } catch (error) {
-      return false;
-    }
-  };
+  	test[TO_STRING_TAG] = 'z';
 
-  var isConstructorLegacy = function isConstructor(argument) {
-    if (!isCallable$6(argument)) return false;
-    switch (classof$4(argument)) {
-      case 'AsyncFunction':
-      case 'GeneratorFunction':
-      case 'AsyncGeneratorFunction': return false;
-    }
-    try {
-      // we can't check .prototype since constructors produced by .bind haven't it
-      // `Function#toString` throws on some built-it function in some legacy engines
-      // (for example, `DOMQuad` and similar in FF41-)
-      return INCORRECT_TO_STRING || !!exec$3(constructorRegExp, inspectSource(argument));
-    } catch (error) {
-      return true;
-    }
-  };
+  	toStringTagSupport = String(test) === '[object z]';
+  	return toStringTagSupport;
+  }
 
-  isConstructorLegacy.sham = true;
+  var classof;
+  var hasRequiredClassof;
 
-  // `IsConstructor` abstract operation
-  // https://tc39.es/ecma262/#sec-isconstructor
-  var isConstructor$3 = !construct || fails$o(function () {
-    var called;
-    return isConstructorModern(isConstructorModern.call)
-      || !isConstructorModern(Object)
-      || !isConstructorModern(function () { called = true; })
-      || called;
-  }) ? isConstructorLegacy : isConstructorModern;
+  function requireClassof () {
+  	if (hasRequiredClassof) return classof;
+  	hasRequiredClassof = 1;
+  	var TO_STRING_TAG_SUPPORT = requireToStringTagSupport();
+  	var isCallable = requireIsCallable();
+  	var classofRaw = requireClassofRaw();
+  	var wellKnownSymbol = requireWellKnownSymbol();
 
-  var isArray$4 = isArray$5;
-  var isConstructor$2 = isConstructor$3;
-  var isObject$7 = isObject$d;
-  var wellKnownSymbol$f = wellKnownSymbol$j;
+  	var TO_STRING_TAG = wellKnownSymbol('toStringTag');
+  	var $Object = Object;
 
-  var SPECIES$5 = wellKnownSymbol$f('species');
-  var $Array$1 = Array;
+  	// ES3 wrong here
+  	var CORRECT_ARGUMENTS = classofRaw(function () { return arguments; }()) === 'Arguments';
 
-  // a part of `ArraySpeciesCreate` abstract operation
-  // https://tc39.es/ecma262/#sec-arrayspeciescreate
-  var arraySpeciesConstructor$1 = function (originalArray) {
-    var C;
-    if (isArray$4(originalArray)) {
-      C = originalArray.constructor;
-      // cross-realm fallback
-      if (isConstructor$2(C) && (C === $Array$1 || isArray$4(C.prototype))) C = undefined;
-      else if (isObject$7(C)) {
-        C = C[SPECIES$5];
-        if (C === null) C = undefined;
-      }
-    } return C === undefined ? $Array$1 : C;
-  };
+  	// fallback for IE11 Script Access Denied error
+  	var tryGet = function (it, key) {
+  	  try {
+  	    return it[key];
+  	  } catch (error) { /* empty */ }
+  	};
 
-  var arraySpeciesConstructor = arraySpeciesConstructor$1;
+  	// getting tag from ES6+ `Object.prototype.toString`
+  	classof = TO_STRING_TAG_SUPPORT ? classofRaw : function (it) {
+  	  var O, tag, result;
+  	  return it === undefined ? 'Undefined' : it === null ? 'Null'
+  	    // @@toStringTag case
+  	    : typeof (tag = tryGet(O = $Object(it), TO_STRING_TAG)) == 'string' ? tag
+  	    // builtinTag case
+  	    : CORRECT_ARGUMENTS ? classofRaw(O)
+  	    // ES3 arguments fallback
+  	    : (result = classofRaw(O)) === 'Object' && isCallable(O.callee) ? 'Arguments' : result;
+  	};
+  	return classof;
+  }
 
-  // `ArraySpeciesCreate` abstract operation
-  // https://tc39.es/ecma262/#sec-arrayspeciescreate
-  var arraySpeciesCreate$3 = function (originalArray, length) {
-    return new (arraySpeciesConstructor(originalArray))(length === 0 ? 0 : length);
-  };
+  var isConstructor;
+  var hasRequiredIsConstructor;
 
-  var fails$n = fails$x;
-  var wellKnownSymbol$e = wellKnownSymbol$j;
-  var V8_VERSION$1 = engineV8Version;
+  function requireIsConstructor () {
+  	if (hasRequiredIsConstructor) return isConstructor;
+  	hasRequiredIsConstructor = 1;
+  	var uncurryThis = requireFunctionUncurryThis();
+  	var fails = requireFails();
+  	var isCallable = requireIsCallable();
+  	var classof = requireClassof();
+  	var getBuiltIn = requireGetBuiltIn();
+  	var inspectSource = requireInspectSource();
 
-  var SPECIES$4 = wellKnownSymbol$e('species');
+  	var noop = function () { /* empty */ };
+  	var construct = getBuiltIn('Reflect', 'construct');
+  	var constructorRegExp = /^\s*(?:class|function)\b/;
+  	var exec = uncurryThis(constructorRegExp.exec);
+  	var INCORRECT_TO_STRING = !constructorRegExp.test(noop);
 
-  var arrayMethodHasSpeciesSupport$5 = function (METHOD_NAME) {
-    // We can't use this feature detection in V8 since it causes
-    // deoptimization and serious performance degradation
-    // https://github.com/zloirock/core-js/issues/677
-    return V8_VERSION$1 >= 51 || !fails$n(function () {
-      var array = [];
-      var constructor = array.constructor = {};
-      constructor[SPECIES$4] = function () {
-        return { foo: 1 };
-      };
-      return array[METHOD_NAME](Boolean).foo !== 1;
-    });
-  };
+  	var isConstructorModern = function isConstructor(argument) {
+  	  if (!isCallable(argument)) return false;
+  	  try {
+  	    construct(noop, [], argument);
+  	    return true;
+  	  } catch (error) {
+  	    return false;
+  	  }
+  	};
 
-  var $$p = _export;
-  var fails$m = fails$x;
-  var isArray$3 = isArray$5;
-  var isObject$6 = isObject$d;
-  var toObject$9 = toObject$b;
-  var lengthOfArrayLike$4 = lengthOfArrayLike$6;
-  var doesNotExceedSafeInteger$1 = doesNotExceedSafeInteger$2;
-  var createProperty$2 = createProperty$3;
-  var arraySpeciesCreate$2 = arraySpeciesCreate$3;
-  var arrayMethodHasSpeciesSupport$4 = arrayMethodHasSpeciesSupport$5;
-  var wellKnownSymbol$d = wellKnownSymbol$j;
-  var V8_VERSION = engineV8Version;
+  	var isConstructorLegacy = function isConstructor(argument) {
+  	  if (!isCallable(argument)) return false;
+  	  switch (classof(argument)) {
+  	    case 'AsyncFunction':
+  	    case 'GeneratorFunction':
+  	    case 'AsyncGeneratorFunction': return false;
+  	  }
+  	  try {
+  	    // we can't check .prototype since constructors produced by .bind haven't it
+  	    // `Function#toString` throws on some built-it function in some legacy engines
+  	    // (for example, `DOMQuad` and similar in FF41-)
+  	    return INCORRECT_TO_STRING || !!exec(constructorRegExp, inspectSource(argument));
+  	  } catch (error) {
+  	    return true;
+  	  }
+  	};
 
-  var IS_CONCAT_SPREADABLE = wellKnownSymbol$d('isConcatSpreadable');
+  	isConstructorLegacy.sham = true;
 
-  // We can't use this feature detection in V8 since it causes
-  // deoptimization and serious performance degradation
-  // https://github.com/zloirock/core-js/issues/679
-  var IS_CONCAT_SPREADABLE_SUPPORT = V8_VERSION >= 51 || !fails$m(function () {
-    var array = [];
-    array[IS_CONCAT_SPREADABLE] = false;
-    return array.concat()[0] !== array;
-  });
+  	// `IsConstructor` abstract operation
+  	// https://tc39.es/ecma262/#sec-isconstructor
+  	isConstructor = !construct || fails(function () {
+  	  var called;
+  	  return isConstructorModern(isConstructorModern.call)
+  	    || !isConstructorModern(Object)
+  	    || !isConstructorModern(function () { called = true; })
+  	    || called;
+  	}) ? isConstructorLegacy : isConstructorModern;
+  	return isConstructor;
+  }
 
-  var isConcatSpreadable = function (O) {
-    if (!isObject$6(O)) return false;
-    var spreadable = O[IS_CONCAT_SPREADABLE];
-    return spreadable !== undefined ? !!spreadable : isArray$3(O);
-  };
+  var arraySpeciesConstructor;
+  var hasRequiredArraySpeciesConstructor;
 
-  var FORCED$7 = !IS_CONCAT_SPREADABLE_SUPPORT || !arrayMethodHasSpeciesSupport$4('concat');
+  function requireArraySpeciesConstructor () {
+  	if (hasRequiredArraySpeciesConstructor) return arraySpeciesConstructor;
+  	hasRequiredArraySpeciesConstructor = 1;
+  	var isArray = requireIsArray();
+  	var isConstructor = requireIsConstructor();
+  	var isObject = requireIsObject();
+  	var wellKnownSymbol = requireWellKnownSymbol();
 
-  // `Array.prototype.concat` method
-  // https://tc39.es/ecma262/#sec-array.prototype.concat
-  // with adding support of @@isConcatSpreadable and @@species
-  $$p({ target: 'Array', proto: true, arity: 1, forced: FORCED$7 }, {
-    // eslint-disable-next-line no-unused-vars -- required for `.length`
-    concat: function concat(arg) {
-      var O = toObject$9(this);
-      var A = arraySpeciesCreate$2(O, 0);
-      var n = 0;
-      var i, k, length, len, E;
-      for (i = -1, length = arguments.length; i < length; i++) {
-        E = i === -1 ? O : arguments[i];
-        if (isConcatSpreadable(E)) {
-          len = lengthOfArrayLike$4(E);
-          doesNotExceedSafeInteger$1(n + len);
-          for (k = 0; k < len; k++, n++) if (k in E) createProperty$2(A, n, E[k]);
-        } else {
-          doesNotExceedSafeInteger$1(n + 1);
-          createProperty$2(A, n++, E);
-        }
-      }
-      A.length = n;
-      return A;
-    }
-  });
+  	var SPECIES = wellKnownSymbol('species');
+  	var $Array = Array;
 
-  var classofRaw = classofRaw$2;
-  var uncurryThis$o = functionUncurryThis;
+  	// a part of `ArraySpeciesCreate` abstract operation
+  	// https://tc39.es/ecma262/#sec-arrayspeciescreate
+  	arraySpeciesConstructor = function (originalArray) {
+  	  var C;
+  	  if (isArray(originalArray)) {
+  	    C = originalArray.constructor;
+  	    // cross-realm fallback
+  	    if (isConstructor(C) && (C === $Array || isArray(C.prototype))) C = undefined;
+  	    else if (isObject(C)) {
+  	      C = C[SPECIES];
+  	      if (C === null) C = undefined;
+  	    }
+  	  } return C === undefined ? $Array : C;
+  	};
+  	return arraySpeciesConstructor;
+  }
 
-  var functionUncurryThisClause = function (fn) {
-    // Nashorn bug:
-    //   https://github.com/zloirock/core-js/issues/1128
-    //   https://github.com/zloirock/core-js/issues/1130
-    if (classofRaw(fn) === 'Function') return uncurryThis$o(fn);
-  };
+  var arraySpeciesCreate;
+  var hasRequiredArraySpeciesCreate;
 
-  var uncurryThis$n = functionUncurryThisClause;
-  var aCallable$2 = aCallable$4;
-  var NATIVE_BIND$1 = functionBindNative;
+  function requireArraySpeciesCreate () {
+  	if (hasRequiredArraySpeciesCreate) return arraySpeciesCreate;
+  	hasRequiredArraySpeciesCreate = 1;
+  	var arraySpeciesConstructor = requireArraySpeciesConstructor();
 
-  var bind$1 = uncurryThis$n(uncurryThis$n.bind);
+  	// `ArraySpeciesCreate` abstract operation
+  	// https://tc39.es/ecma262/#sec-arrayspeciescreate
+  	arraySpeciesCreate = function (originalArray, length) {
+  	  return new (arraySpeciesConstructor(originalArray))(length === 0 ? 0 : length);
+  	};
+  	return arraySpeciesCreate;
+  }
 
-  // optional / simple context binding
-  var functionBindContext = function (fn, that) {
-    aCallable$2(fn);
-    return that === undefined ? fn : NATIVE_BIND$1 ? bind$1(fn, that) : function (/* ...args */) {
-      return fn.apply(that, arguments);
-    };
-  };
+  var arrayMethodHasSpeciesSupport;
+  var hasRequiredArrayMethodHasSpeciesSupport;
 
-  var bind = functionBindContext;
-  var uncurryThis$m = functionUncurryThis;
-  var IndexedObject$2 = indexedObject;
-  var toObject$8 = toObject$b;
-  var lengthOfArrayLike$3 = lengthOfArrayLike$6;
-  var arraySpeciesCreate$1 = arraySpeciesCreate$3;
+  function requireArrayMethodHasSpeciesSupport () {
+  	if (hasRequiredArrayMethodHasSpeciesSupport) return arrayMethodHasSpeciesSupport;
+  	hasRequiredArrayMethodHasSpeciesSupport = 1;
+  	var fails = requireFails();
+  	var wellKnownSymbol = requireWellKnownSymbol();
+  	var V8_VERSION = requireEnvironmentV8Version();
 
-  var push$4 = uncurryThis$m([].push);
+  	var SPECIES = wellKnownSymbol('species');
 
-  // `Array.prototype.{ forEach, map, filter, some, every, find, findIndex, filterReject }` methods implementation
-  var createMethod$3 = function (TYPE) {
-    var IS_MAP = TYPE === 1;
-    var IS_FILTER = TYPE === 2;
-    var IS_SOME = TYPE === 3;
-    var IS_EVERY = TYPE === 4;
-    var IS_FIND_INDEX = TYPE === 6;
-    var IS_FILTER_REJECT = TYPE === 7;
-    var NO_HOLES = TYPE === 5 || IS_FIND_INDEX;
-    return function ($this, callbackfn, that, specificCreate) {
-      var O = toObject$8($this);
-      var self = IndexedObject$2(O);
-      var length = lengthOfArrayLike$3(self);
-      var boundFunction = bind(callbackfn, that);
-      var index = 0;
-      var create = specificCreate || arraySpeciesCreate$1;
-      var target = IS_MAP ? create($this, length) : IS_FILTER || IS_FILTER_REJECT ? create($this, 0) : undefined;
-      var value, result;
-      for (;length > index; index++) if (NO_HOLES || index in self) {
-        value = self[index];
-        result = boundFunction(value, index, O);
-        if (TYPE) {
-          if (IS_MAP) target[index] = result; // map
-          else if (result) switch (TYPE) {
-            case 3: return true;              // some
-            case 5: return value;             // find
-            case 6: return index;             // findIndex
-            case 2: push$4(target, value);      // filter
-          } else switch (TYPE) {
-            case 4: return false;             // every
-            case 7: push$4(target, value);      // filterReject
-          }
-        }
-      }
-      return IS_FIND_INDEX ? -1 : IS_SOME || IS_EVERY ? IS_EVERY : target;
-    };
-  };
+  	arrayMethodHasSpeciesSupport = function (METHOD_NAME) {
+  	  // We can't use this feature detection in V8 since it causes
+  	  // deoptimization and serious performance degradation
+  	  // https://github.com/zloirock/core-js/issues/677
+  	  return V8_VERSION >= 51 || !fails(function () {
+  	    var array = [];
+  	    var constructor = array.constructor = {};
+  	    constructor[SPECIES] = function () {
+  	      return { foo: 1 };
+  	    };
+  	    return array[METHOD_NAME](Boolean).foo !== 1;
+  	  });
+  	};
+  	return arrayMethodHasSpeciesSupport;
+  }
 
-  var arrayIteration = {
-    // `Array.prototype.forEach` method
-    // https://tc39.es/ecma262/#sec-array.prototype.foreach
-    forEach: createMethod$3(0),
-    // `Array.prototype.map` method
-    // https://tc39.es/ecma262/#sec-array.prototype.map
-    map: createMethod$3(1),
-    // `Array.prototype.filter` method
-    // https://tc39.es/ecma262/#sec-array.prototype.filter
-    filter: createMethod$3(2),
-    // `Array.prototype.some` method
-    // https://tc39.es/ecma262/#sec-array.prototype.some
-    some: createMethod$3(3),
-    // `Array.prototype.every` method
-    // https://tc39.es/ecma262/#sec-array.prototype.every
-    every: createMethod$3(4),
-    // `Array.prototype.find` method
-    // https://tc39.es/ecma262/#sec-array.prototype.find
-    find: createMethod$3(5),
-    // `Array.prototype.findIndex` method
-    // https://tc39.es/ecma262/#sec-array.prototype.findIndex
-    findIndex: createMethod$3(6),
-    // `Array.prototype.filterReject` method
-    // https://github.com/tc39/proposal-array-filtering
-    filterReject: createMethod$3(7)
-  };
+  var hasRequiredEs_array_concat;
 
-  var $$o = _export;
-  var $filter = arrayIteration.filter;
-  var arrayMethodHasSpeciesSupport$3 = arrayMethodHasSpeciesSupport$5;
+  function requireEs_array_concat () {
+  	if (hasRequiredEs_array_concat) return es_array_concat;
+  	hasRequiredEs_array_concat = 1;
+  	var $ = require_export();
+  	var fails = requireFails();
+  	var isArray = requireIsArray();
+  	var isObject = requireIsObject();
+  	var toObject = requireToObject();
+  	var lengthOfArrayLike = requireLengthOfArrayLike();
+  	var doesNotExceedSafeInteger = requireDoesNotExceedSafeInteger();
+  	var createProperty = requireCreateProperty();
+  	var arraySpeciesCreate = requireArraySpeciesCreate();
+  	var arrayMethodHasSpeciesSupport = requireArrayMethodHasSpeciesSupport();
+  	var wellKnownSymbol = requireWellKnownSymbol();
+  	var V8_VERSION = requireEnvironmentV8Version();
 
-  var HAS_SPECIES_SUPPORT$3 = arrayMethodHasSpeciesSupport$3('filter');
+  	var IS_CONCAT_SPREADABLE = wellKnownSymbol('isConcatSpreadable');
 
-  // `Array.prototype.filter` method
-  // https://tc39.es/ecma262/#sec-array.prototype.filter
-  // with adding support of @@species
-  $$o({ target: 'Array', proto: true, forced: !HAS_SPECIES_SUPPORT$3 }, {
-    filter: function filter(callbackfn /* , thisArg */) {
-      return $filter(this, callbackfn, arguments.length > 1 ? arguments[1] : undefined);
-    }
-  });
+  	// We can't use this feature detection in V8 since it causes
+  	// deoptimization and serious performance degradation
+  	// https://github.com/zloirock/core-js/issues/679
+  	var IS_CONCAT_SPREADABLE_SUPPORT = V8_VERSION >= 51 || !fails(function () {
+  	  var array = [];
+  	  array[IS_CONCAT_SPREADABLE] = false;
+  	  return array.concat()[0] !== array;
+  	});
+
+  	var isConcatSpreadable = function (O) {
+  	  if (!isObject(O)) return false;
+  	  var spreadable = O[IS_CONCAT_SPREADABLE];
+  	  return spreadable !== undefined ? !!spreadable : isArray(O);
+  	};
+
+  	var FORCED = !IS_CONCAT_SPREADABLE_SUPPORT || !arrayMethodHasSpeciesSupport('concat');
+
+  	// `Array.prototype.concat` method
+  	// https://tc39.es/ecma262/#sec-array.prototype.concat
+  	// with adding support of @@isConcatSpreadable and @@species
+  	$({ target: 'Array', proto: true, arity: 1, forced: FORCED }, {
+  	  // eslint-disable-next-line no-unused-vars -- required for `.length`
+  	  concat: function concat(arg) {
+  	    var O = toObject(this);
+  	    var A = arraySpeciesCreate(O, 0);
+  	    var n = 0;
+  	    var i, k, length, len, E;
+  	    for (i = -1, length = arguments.length; i < length; i++) {
+  	      E = i === -1 ? O : arguments[i];
+  	      if (isConcatSpreadable(E)) {
+  	        len = lengthOfArrayLike(E);
+  	        doesNotExceedSafeInteger(n + len);
+  	        for (k = 0; k < len; k++, n++) if (k in E) createProperty(A, n, E[k]);
+  	      } else {
+  	        doesNotExceedSafeInteger(n + 1);
+  	        createProperty(A, n++, E);
+  	      }
+  	    }
+  	    A.length = n;
+  	    return A;
+  	  }
+  	});
+  	return es_array_concat;
+  }
+
+  requireEs_array_concat();
+
+  var es_array_filter = {};
+
+  var functionUncurryThisClause;
+  var hasRequiredFunctionUncurryThisClause;
+
+  function requireFunctionUncurryThisClause () {
+  	if (hasRequiredFunctionUncurryThisClause) return functionUncurryThisClause;
+  	hasRequiredFunctionUncurryThisClause = 1;
+  	var classofRaw = requireClassofRaw();
+  	var uncurryThis = requireFunctionUncurryThis();
+
+  	functionUncurryThisClause = function (fn) {
+  	  // Nashorn bug:
+  	  //   https://github.com/zloirock/core-js/issues/1128
+  	  //   https://github.com/zloirock/core-js/issues/1130
+  	  if (classofRaw(fn) === 'Function') return uncurryThis(fn);
+  	};
+  	return functionUncurryThisClause;
+  }
+
+  var functionBindContext;
+  var hasRequiredFunctionBindContext;
+
+  function requireFunctionBindContext () {
+  	if (hasRequiredFunctionBindContext) return functionBindContext;
+  	hasRequiredFunctionBindContext = 1;
+  	var uncurryThis = requireFunctionUncurryThisClause();
+  	var aCallable = requireACallable();
+  	var NATIVE_BIND = requireFunctionBindNative();
+
+  	var bind = uncurryThis(uncurryThis.bind);
+
+  	// optional / simple context binding
+  	functionBindContext = function (fn, that) {
+  	  aCallable(fn);
+  	  return that === undefined ? fn : NATIVE_BIND ? bind(fn, that) : function (/* ...args */) {
+  	    return fn.apply(that, arguments);
+  	  };
+  	};
+  	return functionBindContext;
+  }
+
+  var arrayIteration;
+  var hasRequiredArrayIteration;
+
+  function requireArrayIteration () {
+  	if (hasRequiredArrayIteration) return arrayIteration;
+  	hasRequiredArrayIteration = 1;
+  	var bind = requireFunctionBindContext();
+  	var uncurryThis = requireFunctionUncurryThis();
+  	var IndexedObject = requireIndexedObject();
+  	var toObject = requireToObject();
+  	var lengthOfArrayLike = requireLengthOfArrayLike();
+  	var arraySpeciesCreate = requireArraySpeciesCreate();
+
+  	var push = uncurryThis([].push);
+
+  	// `Array.prototype.{ forEach, map, filter, some, every, find, findIndex, filterReject }` methods implementation
+  	var createMethod = function (TYPE) {
+  	  var IS_MAP = TYPE === 1;
+  	  var IS_FILTER = TYPE === 2;
+  	  var IS_SOME = TYPE === 3;
+  	  var IS_EVERY = TYPE === 4;
+  	  var IS_FIND_INDEX = TYPE === 6;
+  	  var IS_FILTER_REJECT = TYPE === 7;
+  	  var NO_HOLES = TYPE === 5 || IS_FIND_INDEX;
+  	  return function ($this, callbackfn, that, specificCreate) {
+  	    var O = toObject($this);
+  	    var self = IndexedObject(O);
+  	    var length = lengthOfArrayLike(self);
+  	    var boundFunction = bind(callbackfn, that);
+  	    var index = 0;
+  	    var create = specificCreate || arraySpeciesCreate;
+  	    var target = IS_MAP ? create($this, length) : IS_FILTER || IS_FILTER_REJECT ? create($this, 0) : undefined;
+  	    var value, result;
+  	    for (;length > index; index++) if (NO_HOLES || index in self) {
+  	      value = self[index];
+  	      result = boundFunction(value, index, O);
+  	      if (TYPE) {
+  	        if (IS_MAP) target[index] = result; // map
+  	        else if (result) switch (TYPE) {
+  	          case 3: return true;              // some
+  	          case 5: return value;             // find
+  	          case 6: return index;             // findIndex
+  	          case 2: push(target, value);      // filter
+  	        } else switch (TYPE) {
+  	          case 4: return false;             // every
+  	          case 7: push(target, value);      // filterReject
+  	        }
+  	      }
+  	    }
+  	    return IS_FIND_INDEX ? -1 : IS_SOME || IS_EVERY ? IS_EVERY : target;
+  	  };
+  	};
+
+  	arrayIteration = {
+  	  // `Array.prototype.forEach` method
+  	  // https://tc39.es/ecma262/#sec-array.prototype.foreach
+  	  forEach: createMethod(0),
+  	  // `Array.prototype.map` method
+  	  // https://tc39.es/ecma262/#sec-array.prototype.map
+  	  map: createMethod(1),
+  	  // `Array.prototype.filter` method
+  	  // https://tc39.es/ecma262/#sec-array.prototype.filter
+  	  filter: createMethod(2),
+  	  // `Array.prototype.some` method
+  	  // https://tc39.es/ecma262/#sec-array.prototype.some
+  	  some: createMethod(3),
+  	  // `Array.prototype.every` method
+  	  // https://tc39.es/ecma262/#sec-array.prototype.every
+  	  every: createMethod(4),
+  	  // `Array.prototype.find` method
+  	  // https://tc39.es/ecma262/#sec-array.prototype.find
+  	  find: createMethod(5),
+  	  // `Array.prototype.findIndex` method
+  	  // https://tc39.es/ecma262/#sec-array.prototype.findIndex
+  	  findIndex: createMethod(6),
+  	  // `Array.prototype.filterReject` method
+  	  // https://github.com/tc39/proposal-array-filtering
+  	  filterReject: createMethod(7)
+  	};
+  	return arrayIteration;
+  }
+
+  var hasRequiredEs_array_filter;
+
+  function requireEs_array_filter () {
+  	if (hasRequiredEs_array_filter) return es_array_filter;
+  	hasRequiredEs_array_filter = 1;
+  	var $ = require_export();
+  	var $filter = requireArrayIteration().filter;
+  	var arrayMethodHasSpeciesSupport = requireArrayMethodHasSpeciesSupport();
+
+  	var HAS_SPECIES_SUPPORT = arrayMethodHasSpeciesSupport('filter');
+
+  	// `Array.prototype.filter` method
+  	// https://tc39.es/ecma262/#sec-array.prototype.filter
+  	// with adding support of @@species
+  	$({ target: 'Array', proto: true, forced: !HAS_SPECIES_SUPPORT }, {
+  	  filter: function filter(callbackfn /* , thisArg */) {
+  	    return $filter(this, callbackfn, arguments.length > 1 ? arguments[1] : undefined);
+  	  }
+  	});
+  	return es_array_filter;
+  }
+
+  requireEs_array_filter();
+
+  var es_array_find = {};
 
   var objectDefineProperties = {};
 
-  var internalObjectKeys = objectKeysInternal;
-  var enumBugKeys$1 = enumBugKeys$3;
+  var objectKeys;
+  var hasRequiredObjectKeys;
 
-  // `Object.keys` method
-  // https://tc39.es/ecma262/#sec-object.keys
-  // eslint-disable-next-line es/no-object-keys -- safe
-  var objectKeys$3 = Object.keys || function keys(O) {
-    return internalObjectKeys(O, enumBugKeys$1);
-  };
+  function requireObjectKeys () {
+  	if (hasRequiredObjectKeys) return objectKeys;
+  	hasRequiredObjectKeys = 1;
+  	var internalObjectKeys = requireObjectKeysInternal();
+  	var enumBugKeys = requireEnumBugKeys();
 
-  var DESCRIPTORS$7 = descriptors;
-  var V8_PROTOTYPE_DEFINE_BUG = v8PrototypeDefineBug;
-  var definePropertyModule = objectDefineProperty;
-  var anObject$9 = anObject$c;
-  var toIndexedObject$4 = toIndexedObject$8;
-  var objectKeys$2 = objectKeys$3;
-
-  // `Object.defineProperties` method
-  // https://tc39.es/ecma262/#sec-object.defineproperties
-  // eslint-disable-next-line es/no-object-defineproperties -- safe
-  objectDefineProperties.f = DESCRIPTORS$7 && !V8_PROTOTYPE_DEFINE_BUG ? Object.defineProperties : function defineProperties(O, Properties) {
-    anObject$9(O);
-    var props = toIndexedObject$4(Properties);
-    var keys = objectKeys$2(Properties);
-    var length = keys.length;
-    var index = 0;
-    var key;
-    while (length > index) definePropertyModule.f(O, key = keys[index++], props[key]);
-    return O;
-  };
-
-  var getBuiltIn$1 = getBuiltIn$5;
-
-  var html$1 = getBuiltIn$1('document', 'documentElement');
-
-  /* global ActiveXObject -- old IE, WSH */
-  var anObject$8 = anObject$c;
-  var definePropertiesModule = objectDefineProperties;
-  var enumBugKeys = enumBugKeys$3;
-  var hiddenKeys = hiddenKeys$4;
-  var html = html$1;
-  var documentCreateElement$1 = documentCreateElement$2;
-  var sharedKey$1 = sharedKey$3;
-
-  var GT = '>';
-  var LT = '<';
-  var PROTOTYPE = 'prototype';
-  var SCRIPT = 'script';
-  var IE_PROTO$1 = sharedKey$1('IE_PROTO');
-
-  var EmptyConstructor = function () { /* empty */ };
-
-  var scriptTag = function (content) {
-    return LT + SCRIPT + GT + content + LT + '/' + SCRIPT + GT;
-  };
-
-  // Create object with fake `null` prototype: use ActiveX Object with cleared prototype
-  var NullProtoObjectViaActiveX = function (activeXDocument) {
-    activeXDocument.write(scriptTag(''));
-    activeXDocument.close();
-    var temp = activeXDocument.parentWindow.Object;
-    activeXDocument = null; // avoid memory leak
-    return temp;
-  };
-
-  // Create object with fake `null` prototype: use iframe Object with cleared prototype
-  var NullProtoObjectViaIFrame = function () {
-    // Thrash, waste and sodomy: IE GC bug
-    var iframe = documentCreateElement$1('iframe');
-    var JS = 'java' + SCRIPT + ':';
-    var iframeDocument;
-    iframe.style.display = 'none';
-    html.appendChild(iframe);
-    // https://github.com/zloirock/core-js/issues/475
-    iframe.src = String(JS);
-    iframeDocument = iframe.contentWindow.document;
-    iframeDocument.open();
-    iframeDocument.write(scriptTag('document.F=Object'));
-    iframeDocument.close();
-    return iframeDocument.F;
-  };
-
-  // Check for document.domain and active x support
-  // No need to use active x approach when document.domain is not set
-  // see https://github.com/es-shims/es5-shim/issues/150
-  // variation of https://github.com/kitcambridge/es5-shim/commit/4f738ac066346
-  // avoid IE GC bug
-  var activeXDocument;
-  var NullProtoObject = function () {
-    try {
-      activeXDocument = new ActiveXObject('htmlfile');
-    } catch (error) { /* ignore */ }
-    NullProtoObject = typeof document != 'undefined'
-      ? document.domain && activeXDocument
-        ? NullProtoObjectViaActiveX(activeXDocument) // old IE
-        : NullProtoObjectViaIFrame()
-      : NullProtoObjectViaActiveX(activeXDocument); // WSH
-    var length = enumBugKeys.length;
-    while (length--) delete NullProtoObject[PROTOTYPE][enumBugKeys[length]];
-    return NullProtoObject();
-  };
-
-  hiddenKeys[IE_PROTO$1] = true;
-
-  // `Object.create` method
-  // https://tc39.es/ecma262/#sec-object.create
-  // eslint-disable-next-line es/no-object-create -- safe
-  var objectCreate = Object.create || function create(O, Properties) {
-    var result;
-    if (O !== null) {
-      EmptyConstructor[PROTOTYPE] = anObject$8(O);
-      result = new EmptyConstructor();
-      EmptyConstructor[PROTOTYPE] = null;
-      // add "__proto__" for Object.getPrototypeOf polyfill
-      result[IE_PROTO$1] = O;
-    } else result = NullProtoObject();
-    return Properties === undefined ? result : definePropertiesModule.f(result, Properties);
-  };
-
-  var wellKnownSymbol$c = wellKnownSymbol$j;
-  var create$3 = objectCreate;
-  var defineProperty$6 = objectDefineProperty.f;
-
-  var UNSCOPABLES = wellKnownSymbol$c('unscopables');
-  var ArrayPrototype = Array.prototype;
-
-  // Array.prototype[@@unscopables]
-  // https://tc39.es/ecma262/#sec-array.prototype-@@unscopables
-  if (ArrayPrototype[UNSCOPABLES] === undefined) {
-    defineProperty$6(ArrayPrototype, UNSCOPABLES, {
-      configurable: true,
-      value: create$3(null)
-    });
+  	// `Object.keys` method
+  	// https://tc39.es/ecma262/#sec-object.keys
+  	// eslint-disable-next-line es/no-object-keys -- safe
+  	objectKeys = Object.keys || function keys(O) {
+  	  return internalObjectKeys(O, enumBugKeys);
+  	};
+  	return objectKeys;
   }
 
-  // add a key to Array.prototype[@@unscopables]
-  var addToUnscopables$4 = function (key) {
-    ArrayPrototype[UNSCOPABLES][key] = true;
-  };
+  var hasRequiredObjectDefineProperties;
 
-  var $$n = _export;
-  var $find = arrayIteration.find;
-  var addToUnscopables$3 = addToUnscopables$4;
+  function requireObjectDefineProperties () {
+  	if (hasRequiredObjectDefineProperties) return objectDefineProperties;
+  	hasRequiredObjectDefineProperties = 1;
+  	var DESCRIPTORS = requireDescriptors();
+  	var V8_PROTOTYPE_DEFINE_BUG = requireV8PrototypeDefineBug();
+  	var definePropertyModule = requireObjectDefineProperty();
+  	var anObject = requireAnObject();
+  	var toIndexedObject = requireToIndexedObject();
+  	var objectKeys = requireObjectKeys();
 
-  var FIND = 'find';
-  var SKIPS_HOLES$1 = true;
-
-  // Shouldn't skip holes
-  // eslint-disable-next-line es/no-array-prototype-find -- testing
-  if (FIND in []) Array(1)[FIND](function () { SKIPS_HOLES$1 = false; });
-
-  // `Array.prototype.find` method
-  // https://tc39.es/ecma262/#sec-array.prototype.find
-  $$n({ target: 'Array', proto: true, forced: SKIPS_HOLES$1 }, {
-    find: function find(callbackfn /* , that = undefined */) {
-      return $find(this, callbackfn, arguments.length > 1 ? arguments[1] : undefined);
-    }
-  });
-
-  // https://tc39.es/ecma262/#sec-array.prototype-@@unscopables
-  addToUnscopables$3(FIND);
-
-  var $$m = _export;
-  var $findIndex = arrayIteration.findIndex;
-  var addToUnscopables$2 = addToUnscopables$4;
-
-  var FIND_INDEX = 'findIndex';
-  var SKIPS_HOLES = true;
-
-  // Shouldn't skip holes
-  // eslint-disable-next-line es/no-array-prototype-findindex -- testing
-  if (FIND_INDEX in []) Array(1)[FIND_INDEX](function () { SKIPS_HOLES = false; });
-
-  // `Array.prototype.findIndex` method
-  // https://tc39.es/ecma262/#sec-array.prototype.findindex
-  $$m({ target: 'Array', proto: true, forced: SKIPS_HOLES }, {
-    findIndex: function findIndex(callbackfn /* , that = undefined */) {
-      return $findIndex(this, callbackfn, arguments.length > 1 ? arguments[1] : undefined);
-    }
-  });
-
-  // https://tc39.es/ecma262/#sec-array.prototype-@@unscopables
-  addToUnscopables$2(FIND_INDEX);
-
-  var $$l = _export;
-  var $includes = arrayIncludes.includes;
-  var fails$l = fails$x;
-  var addToUnscopables$1 = addToUnscopables$4;
-
-  // FF99+ bug
-  var BROKEN_ON_SPARSE = fails$l(function () {
-    // eslint-disable-next-line es/no-array-prototype-includes -- detection
-    return !Array(1).includes();
-  });
-
-  // `Array.prototype.includes` method
-  // https://tc39.es/ecma262/#sec-array.prototype.includes
-  $$l({ target: 'Array', proto: true, forced: BROKEN_ON_SPARSE }, {
-    includes: function includes(el /* , fromIndex = 0 */) {
-      return $includes(this, el, arguments.length > 1 ? arguments[1] : undefined);
-    }
-  });
-
-  // https://tc39.es/ecma262/#sec-array.prototype-@@unscopables
-  addToUnscopables$1('includes');
-
-  var fails$k = fails$x;
-
-  var arrayMethodIsStrict$4 = function (METHOD_NAME, argument) {
-    var method = [][METHOD_NAME];
-    return !!method && fails$k(function () {
-      // eslint-disable-next-line no-useless-call -- required for testing
-      method.call(null, argument || function () { return 1; }, 1);
-    });
-  };
-
-  /* eslint-disable es/no-array-prototype-indexof -- required for testing */
-  var $$k = _export;
-  var uncurryThis$l = functionUncurryThisClause;
-  var $indexOf = arrayIncludes.indexOf;
-  var arrayMethodIsStrict$3 = arrayMethodIsStrict$4;
-
-  var nativeIndexOf = uncurryThis$l([].indexOf);
-
-  var NEGATIVE_ZERO = !!nativeIndexOf && 1 / nativeIndexOf([1], 1, -0) < 0;
-  var FORCED$6 = NEGATIVE_ZERO || !arrayMethodIsStrict$3('indexOf');
-
-  // `Array.prototype.indexOf` method
-  // https://tc39.es/ecma262/#sec-array.prototype.indexof
-  $$k({ target: 'Array', proto: true, forced: FORCED$6 }, {
-    indexOf: function indexOf(searchElement /* , fromIndex = 0 */) {
-      var fromIndex = arguments.length > 1 ? arguments[1] : undefined;
-      return NEGATIVE_ZERO
-        // convert -0 to +0
-        ? nativeIndexOf(this, searchElement, fromIndex) || 0
-        : $indexOf(this, searchElement, fromIndex);
-    }
-  });
-
-  var iterators = {};
-
-  var fails$j = fails$x;
-
-  var correctPrototypeGetter = !fails$j(function () {
-    function F() { /* empty */ }
-    F.prototype.constructor = null;
-    // eslint-disable-next-line es/no-object-getprototypeof -- required for testing
-    return Object.getPrototypeOf(new F()) !== F.prototype;
-  });
-
-  var hasOwn$4 = hasOwnProperty_1;
-  var isCallable$5 = isCallable$i;
-  var toObject$7 = toObject$b;
-  var sharedKey = sharedKey$3;
-  var CORRECT_PROTOTYPE_GETTER$1 = correctPrototypeGetter;
-
-  var IE_PROTO = sharedKey('IE_PROTO');
-  var $Object = Object;
-  var ObjectPrototype = $Object.prototype;
-
-  // `Object.getPrototypeOf` method
-  // https://tc39.es/ecma262/#sec-object.getprototypeof
-  // eslint-disable-next-line es/no-object-getprototypeof -- safe
-  var objectGetPrototypeOf$1 = CORRECT_PROTOTYPE_GETTER$1 ? $Object.getPrototypeOf : function (O) {
-    var object = toObject$7(O);
-    if (hasOwn$4(object, IE_PROTO)) return object[IE_PROTO];
-    var constructor = object.constructor;
-    if (isCallable$5(constructor) && object instanceof constructor) {
-      return constructor.prototype;
-    } return object instanceof $Object ? ObjectPrototype : null;
-  };
-
-  var fails$i = fails$x;
-  var isCallable$4 = isCallable$i;
-  var isObject$5 = isObject$d;
-  var getPrototypeOf$1 = objectGetPrototypeOf$1;
-  var defineBuiltIn$5 = defineBuiltIn$7;
-  var wellKnownSymbol$b = wellKnownSymbol$j;
-
-  var ITERATOR$4 = wellKnownSymbol$b('iterator');
-  var BUGGY_SAFARI_ITERATORS$1 = false;
-
-  // `%IteratorPrototype%` object
-  // https://tc39.es/ecma262/#sec-%iteratorprototype%-object
-  var IteratorPrototype$2, PrototypeOfArrayIteratorPrototype, arrayIterator;
-
-  /* eslint-disable es/no-array-prototype-keys -- safe */
-  if ([].keys) {
-    arrayIterator = [].keys();
-    // Safari 8 has buggy iterators w/o `next`
-    if (!('next' in arrayIterator)) BUGGY_SAFARI_ITERATORS$1 = true;
-    else {
-      PrototypeOfArrayIteratorPrototype = getPrototypeOf$1(getPrototypeOf$1(arrayIterator));
-      if (PrototypeOfArrayIteratorPrototype !== Object.prototype) IteratorPrototype$2 = PrototypeOfArrayIteratorPrototype;
-    }
+  	// `Object.defineProperties` method
+  	// https://tc39.es/ecma262/#sec-object.defineproperties
+  	// eslint-disable-next-line es/no-object-defineproperties -- safe
+  	objectDefineProperties.f = DESCRIPTORS && !V8_PROTOTYPE_DEFINE_BUG ? Object.defineProperties : function defineProperties(O, Properties) {
+  	  anObject(O);
+  	  var props = toIndexedObject(Properties);
+  	  var keys = objectKeys(Properties);
+  	  var length = keys.length;
+  	  var index = 0;
+  	  var key;
+  	  while (length > index) definePropertyModule.f(O, key = keys[index++], props[key]);
+  	  return O;
+  	};
+  	return objectDefineProperties;
   }
 
-  var NEW_ITERATOR_PROTOTYPE = !isObject$5(IteratorPrototype$2) || fails$i(function () {
-    var test = {};
-    // FF44- legacy iterators case
-    return IteratorPrototype$2[ITERATOR$4].call(test) !== test;
-  });
+  var html;
+  var hasRequiredHtml;
 
-  if (NEW_ITERATOR_PROTOTYPE) IteratorPrototype$2 = {};
+  function requireHtml () {
+  	if (hasRequiredHtml) return html;
+  	hasRequiredHtml = 1;
+  	var getBuiltIn = requireGetBuiltIn();
 
-  // `%IteratorPrototype%[@@iterator]()` method
-  // https://tc39.es/ecma262/#sec-%iteratorprototype%-@@iterator
-  if (!isCallable$4(IteratorPrototype$2[ITERATOR$4])) {
-    defineBuiltIn$5(IteratorPrototype$2, ITERATOR$4, function () {
-      return this;
-    });
+  	html = getBuiltIn('document', 'documentElement');
+  	return html;
   }
 
-  var iteratorsCore = {
-    IteratorPrototype: IteratorPrototype$2,
-    BUGGY_SAFARI_ITERATORS: BUGGY_SAFARI_ITERATORS$1
-  };
-
-  var defineProperty$5 = objectDefineProperty.f;
-  var hasOwn$3 = hasOwnProperty_1;
-  var wellKnownSymbol$a = wellKnownSymbol$j;
-
-  var TO_STRING_TAG = wellKnownSymbol$a('toStringTag');
-
-  var setToStringTag$3 = function (target, TAG, STATIC) {
-    if (target && !STATIC) target = target.prototype;
-    if (target && !hasOwn$3(target, TO_STRING_TAG)) {
-      defineProperty$5(target, TO_STRING_TAG, { configurable: true, value: TAG });
-    }
-  };
-
-  var IteratorPrototype$1 = iteratorsCore.IteratorPrototype;
-  var create$2 = objectCreate;
-  var createPropertyDescriptor = createPropertyDescriptor$4;
-  var setToStringTag$2 = setToStringTag$3;
-  var Iterators$2 = iterators;
-
-  var returnThis$1 = function () { return this; };
-
-  var iteratorCreateConstructor = function (IteratorConstructor, NAME, next, ENUMERABLE_NEXT) {
-    var TO_STRING_TAG = NAME + ' Iterator';
-    IteratorConstructor.prototype = create$2(IteratorPrototype$1, { next: createPropertyDescriptor(+!ENUMERABLE_NEXT, next) });
-    setToStringTag$2(IteratorConstructor, TO_STRING_TAG, false);
-    Iterators$2[TO_STRING_TAG] = returnThis$1;
-    return IteratorConstructor;
-  };
-
-  var uncurryThis$k = functionUncurryThis;
-  var aCallable$1 = aCallable$4;
-
-  var functionUncurryThisAccessor = function (object, key, method) {
-    try {
-      // eslint-disable-next-line es/no-object-getownpropertydescriptor -- safe
-      return uncurryThis$k(aCallable$1(Object.getOwnPropertyDescriptor(object, key)[method]));
-    } catch (error) { /* empty */ }
-  };
-
-  var isObject$4 = isObject$d;
-
-  var isPossiblePrototype$1 = function (argument) {
-    return isObject$4(argument) || argument === null;
-  };
-
-  var isPossiblePrototype = isPossiblePrototype$1;
-
-  var $String$1 = String;
-  var $TypeError$5 = TypeError;
-
-  var aPossiblePrototype$1 = function (argument) {
-    if (isPossiblePrototype(argument)) return argument;
-    throw new $TypeError$5("Can't set " + $String$1(argument) + ' as a prototype');
-  };
-
-  /* eslint-disable no-proto -- safe */
-  var uncurryThisAccessor = functionUncurryThisAccessor;
-  var isObject$3 = isObject$d;
-  var requireObjectCoercible$9 = requireObjectCoercible$c;
-  var aPossiblePrototype = aPossiblePrototype$1;
-
-  // `Object.setPrototypeOf` method
-  // https://tc39.es/ecma262/#sec-object.setprototypeof
-  // Works with __proto__ only. Old v8 can't work with null proto objects.
-  // eslint-disable-next-line es/no-object-setprototypeof -- safe
-  var objectSetPrototypeOf = Object.setPrototypeOf || ('__proto__' in {} ? function () {
-    var CORRECT_SETTER = false;
-    var test = {};
-    var setter;
-    try {
-      setter = uncurryThisAccessor(Object.prototype, '__proto__', 'set');
-      setter(test, []);
-      CORRECT_SETTER = test instanceof Array;
-    } catch (error) { /* empty */ }
-    return function setPrototypeOf(O, proto) {
-      requireObjectCoercible$9(O);
-      aPossiblePrototype(proto);
-      if (!isObject$3(O)) return O;
-      if (CORRECT_SETTER) setter(O, proto);
-      else O.__proto__ = proto;
-      return O;
-    };
-  }() : undefined);
-
-  var $$j = _export;
-  var call$a = functionCall;
-  var FunctionName = functionName;
-  var isCallable$3 = isCallable$i;
-  var createIteratorConstructor = iteratorCreateConstructor;
-  var getPrototypeOf = objectGetPrototypeOf$1;
-  var setPrototypeOf$1 = objectSetPrototypeOf;
-  var setToStringTag$1 = setToStringTag$3;
-  var createNonEnumerableProperty$4 = createNonEnumerableProperty$7;
-  var defineBuiltIn$4 = defineBuiltIn$7;
-  var wellKnownSymbol$9 = wellKnownSymbol$j;
-  var Iterators$1 = iterators;
-  var IteratorsCore = iteratorsCore;
-
-  var PROPER_FUNCTION_NAME$2 = FunctionName.PROPER;
-  var CONFIGURABLE_FUNCTION_NAME = FunctionName.CONFIGURABLE;
-  var IteratorPrototype = IteratorsCore.IteratorPrototype;
-  var BUGGY_SAFARI_ITERATORS = IteratorsCore.BUGGY_SAFARI_ITERATORS;
-  var ITERATOR$3 = wellKnownSymbol$9('iterator');
-  var KEYS = 'keys';
-  var VALUES = 'values';
-  var ENTRIES = 'entries';
-
-  var returnThis = function () { return this; };
-
-  var iteratorDefine = function (Iterable, NAME, IteratorConstructor, next, DEFAULT, IS_SET, FORCED) {
-    createIteratorConstructor(IteratorConstructor, NAME, next);
-
-    var getIterationMethod = function (KIND) {
-      if (KIND === DEFAULT && defaultIterator) return defaultIterator;
-      if (!BUGGY_SAFARI_ITERATORS && KIND && KIND in IterablePrototype) return IterablePrototype[KIND];
-
-      switch (KIND) {
-        case KEYS: return function keys() { return new IteratorConstructor(this, KIND); };
-        case VALUES: return function values() { return new IteratorConstructor(this, KIND); };
-        case ENTRIES: return function entries() { return new IteratorConstructor(this, KIND); };
-      }
-
-      return function () { return new IteratorConstructor(this); };
-    };
-
-    var TO_STRING_TAG = NAME + ' Iterator';
-    var INCORRECT_VALUES_NAME = false;
-    var IterablePrototype = Iterable.prototype;
-    var nativeIterator = IterablePrototype[ITERATOR$3]
-      || IterablePrototype['@@iterator']
-      || DEFAULT && IterablePrototype[DEFAULT];
-    var defaultIterator = !BUGGY_SAFARI_ITERATORS && nativeIterator || getIterationMethod(DEFAULT);
-    var anyNativeIterator = NAME === 'Array' ? IterablePrototype.entries || nativeIterator : nativeIterator;
-    var CurrentIteratorPrototype, methods, KEY;
-
-    // fix native
-    if (anyNativeIterator) {
-      CurrentIteratorPrototype = getPrototypeOf(anyNativeIterator.call(new Iterable()));
-      if (CurrentIteratorPrototype !== Object.prototype && CurrentIteratorPrototype.next) {
-        if (getPrototypeOf(CurrentIteratorPrototype) !== IteratorPrototype) {
-          if (setPrototypeOf$1) {
-            setPrototypeOf$1(CurrentIteratorPrototype, IteratorPrototype);
-          } else if (!isCallable$3(CurrentIteratorPrototype[ITERATOR$3])) {
-            defineBuiltIn$4(CurrentIteratorPrototype, ITERATOR$3, returnThis);
-          }
-        }
-        // Set @@toStringTag to native iterators
-        setToStringTag$1(CurrentIteratorPrototype, TO_STRING_TAG, true);
-      }
-    }
-
-    // fix Array.prototype.{ values, @@iterator }.name in V8 / FF
-    if (PROPER_FUNCTION_NAME$2 && DEFAULT === VALUES && nativeIterator && nativeIterator.name !== VALUES) {
-      if (CONFIGURABLE_FUNCTION_NAME) {
-        createNonEnumerableProperty$4(IterablePrototype, 'name', VALUES);
-      } else {
-        INCORRECT_VALUES_NAME = true;
-        defaultIterator = function values() { return call$a(nativeIterator, this); };
-      }
-    }
-
-    // export additional methods
-    if (DEFAULT) {
-      methods = {
-        values: getIterationMethod(VALUES),
-        keys: IS_SET ? defaultIterator : getIterationMethod(KEYS),
-        entries: getIterationMethod(ENTRIES)
-      };
-      if (FORCED) for (KEY in methods) {
-        if (BUGGY_SAFARI_ITERATORS || INCORRECT_VALUES_NAME || !(KEY in IterablePrototype)) {
-          defineBuiltIn$4(IterablePrototype, KEY, methods[KEY]);
-        }
-      } else $$j({ target: NAME, proto: true, forced: BUGGY_SAFARI_ITERATORS || INCORRECT_VALUES_NAME }, methods);
-    }
-
-    // define iterator
-    if (IterablePrototype[ITERATOR$3] !== defaultIterator) {
-      defineBuiltIn$4(IterablePrototype, ITERATOR$3, defaultIterator, { name: DEFAULT });
-    }
-    Iterators$1[NAME] = defaultIterator;
-
-    return methods;
-  };
-
-  // `CreateIterResultObject` abstract operation
-  // https://tc39.es/ecma262/#sec-createiterresultobject
-  var createIterResultObject$1 = function (value, done) {
-    return { value: value, done: done };
-  };
-
-  var toIndexedObject$3 = toIndexedObject$8;
-  var addToUnscopables = addToUnscopables$4;
-  var Iterators = iterators;
-  var InternalStateModule = internalState;
-  var defineProperty$4 = objectDefineProperty.f;
-  var defineIterator = iteratorDefine;
-  var createIterResultObject = createIterResultObject$1;
-  var DESCRIPTORS$6 = descriptors;
-
-  var ARRAY_ITERATOR = 'Array Iterator';
-  var setInternalState = InternalStateModule.set;
-  var getInternalState$1 = InternalStateModule.getterFor(ARRAY_ITERATOR);
-
-  // `Array.prototype.entries` method
-  // https://tc39.es/ecma262/#sec-array.prototype.entries
-  // `Array.prototype.keys` method
-  // https://tc39.es/ecma262/#sec-array.prototype.keys
-  // `Array.prototype.values` method
-  // https://tc39.es/ecma262/#sec-array.prototype.values
-  // `Array.prototype[@@iterator]` method
-  // https://tc39.es/ecma262/#sec-array.prototype-@@iterator
-  // `CreateArrayIterator` internal method
-  // https://tc39.es/ecma262/#sec-createarrayiterator
-  var es_array_iterator = defineIterator(Array, 'Array', function (iterated, kind) {
-    setInternalState(this, {
-      type: ARRAY_ITERATOR,
-      target: toIndexedObject$3(iterated), // target
-      index: 0,                          // next index
-      kind: kind                         // kind
-    });
-  // `%ArrayIteratorPrototype%.next` method
-  // https://tc39.es/ecma262/#sec-%arrayiteratorprototype%.next
-  }, function () {
-    var state = getInternalState$1(this);
-    var target = state.target;
-    var index = state.index++;
-    if (!target || index >= target.length) {
-      state.target = undefined;
-      return createIterResultObject(undefined, true);
-    }
-    switch (state.kind) {
-      case 'keys': return createIterResultObject(index, false);
-      case 'values': return createIterResultObject(target[index], false);
-    } return createIterResultObject([index, target[index]], false);
-  }, 'values');
-
-  // argumentsList[@@iterator] is %ArrayProto_values%
-  // https://tc39.es/ecma262/#sec-createunmappedargumentsobject
-  // https://tc39.es/ecma262/#sec-createmappedargumentsobject
-  var values = Iterators.Arguments = Iterators.Array;
-
-  // https://tc39.es/ecma262/#sec-array.prototype-@@unscopables
-  addToUnscopables('keys');
-  addToUnscopables('values');
-  addToUnscopables('entries');
-
-  // V8 ~ Chrome 45- bug
-  if (DESCRIPTORS$6 && values.name !== 'values') try {
-    defineProperty$4(values, 'name', { value: 'values' });
-  } catch (error) { /* empty */ }
-
-  var $$i = _export;
-  var uncurryThis$j = functionUncurryThis;
-  var IndexedObject$1 = indexedObject;
-  var toIndexedObject$2 = toIndexedObject$8;
-  var arrayMethodIsStrict$2 = arrayMethodIsStrict$4;
-
-  var nativeJoin = uncurryThis$j([].join);
-
-  var ES3_STRINGS = IndexedObject$1 !== Object;
-  var FORCED$5 = ES3_STRINGS || !arrayMethodIsStrict$2('join', ',');
-
-  // `Array.prototype.join` method
-  // https://tc39.es/ecma262/#sec-array.prototype.join
-  $$i({ target: 'Array', proto: true, forced: FORCED$5 }, {
-    join: function join(separator) {
-      return nativeJoin(toIndexedObject$2(this), separator === undefined ? ',' : separator);
-    }
-  });
-
-  var $$h = _export;
-  var $map = arrayIteration.map;
-  var arrayMethodHasSpeciesSupport$2 = arrayMethodHasSpeciesSupport$5;
-
-  var HAS_SPECIES_SUPPORT$2 = arrayMethodHasSpeciesSupport$2('map');
-
-  // `Array.prototype.map` method
-  // https://tc39.es/ecma262/#sec-array.prototype.map
-  // with adding support of @@species
-  $$h({ target: 'Array', proto: true, forced: !HAS_SPECIES_SUPPORT$2 }, {
-    map: function map(callbackfn /* , thisArg */) {
-      return $map(this, callbackfn, arguments.length > 1 ? arguments[1] : undefined);
-    }
-  });
-
-  var $$g = _export;
-  var uncurryThis$i = functionUncurryThis;
-  var isArray$2 = isArray$5;
-
-  var nativeReverse = uncurryThis$i([].reverse);
-  var test$1 = [1, 2];
-
-  // `Array.prototype.reverse` method
-  // https://tc39.es/ecma262/#sec-array.prototype.reverse
-  // fix for Safari 12.0 bug
-  // https://bugs.webkit.org/show_bug.cgi?id=188794
-  $$g({ target: 'Array', proto: true, forced: String(test$1) === String(test$1.reverse()) }, {
-    reverse: function reverse() {
-      // eslint-disable-next-line no-self-assign -- dirty hack
-      if (isArray$2(this)) this.length = this.length;
-      return nativeReverse(this);
-    }
-  });
-
-  var uncurryThis$h = functionUncurryThis;
-
-  var arraySlice$1 = uncurryThis$h([].slice);
-
-  var $$f = _export;
-  var isArray$1 = isArray$5;
-  var isConstructor$1 = isConstructor$3;
-  var isObject$2 = isObject$d;
-  var toAbsoluteIndex$1 = toAbsoluteIndex$3;
-  var lengthOfArrayLike$2 = lengthOfArrayLike$6;
-  var toIndexedObject$1 = toIndexedObject$8;
-  var createProperty$1 = createProperty$3;
-  var wellKnownSymbol$8 = wellKnownSymbol$j;
-  var arrayMethodHasSpeciesSupport$1 = arrayMethodHasSpeciesSupport$5;
-  var nativeSlice = arraySlice$1;
-
-  var HAS_SPECIES_SUPPORT$1 = arrayMethodHasSpeciesSupport$1('slice');
-
-  var SPECIES$3 = wellKnownSymbol$8('species');
-  var $Array = Array;
-  var max$2 = Math.max;
-
-  // `Array.prototype.slice` method
-  // https://tc39.es/ecma262/#sec-array.prototype.slice
-  // fallback for not array-like ES3 strings and DOM objects
-  $$f({ target: 'Array', proto: true, forced: !HAS_SPECIES_SUPPORT$1 }, {
-    slice: function slice(start, end) {
-      var O = toIndexedObject$1(this);
-      var length = lengthOfArrayLike$2(O);
-      var k = toAbsoluteIndex$1(start, length);
-      var fin = toAbsoluteIndex$1(end === undefined ? length : end, length);
-      // inline `ArraySpeciesCreate` for usage native `Array#slice` where it's possible
-      var Constructor, result, n;
-      if (isArray$1(O)) {
-        Constructor = O.constructor;
-        // cross-realm fallback
-        if (isConstructor$1(Constructor) && (Constructor === $Array || isArray$1(Constructor.prototype))) {
-          Constructor = undefined;
-        } else if (isObject$2(Constructor)) {
-          Constructor = Constructor[SPECIES$3];
-          if (Constructor === null) Constructor = undefined;
-        }
-        if (Constructor === $Array || Constructor === undefined) {
-          return nativeSlice(O, k, fin);
-        }
-      }
-      result = new (Constructor === undefined ? $Array : Constructor)(max$2(fin - k, 0));
-      for (n = 0; k < fin; k++, n++) if (k in O) createProperty$1(result, n, O[k]);
-      result.length = n;
-      return result;
-    }
-  });
-
-  var tryToString$1 = tryToString$3;
-
-  var $TypeError$4 = TypeError;
-
-  var deletePropertyOrThrow$2 = function (O, P) {
-    if (!delete O[P]) throw new $TypeError$4('Cannot delete property ' + tryToString$1(P) + ' of ' + tryToString$1(O));
-  };
-
-  var classof$3 = classof$5;
-
-  var $String = String;
-
-  var toString$f = function (argument) {
-    if (classof$3(argument) === 'Symbol') throw new TypeError('Cannot convert a Symbol value to a string');
-    return $String(argument);
-  };
-
-  var arraySlice = arraySlice$1;
-
-  var floor$1 = Math.floor;
-
-  var sort = function (array, comparefn) {
-    var length = array.length;
-
-    if (length < 8) {
-      // insertion sort
-      var i = 1;
-      var element, j;
-
-      while (i < length) {
-        j = i;
-        element = array[i];
-        while (j && comparefn(array[j - 1], element) > 0) {
-          array[j] = array[--j];
-        }
-        if (j !== i++) array[j] = element;
-      }
-    } else {
-      // merge sort
-      var middle = floor$1(length / 2);
-      var left = sort(arraySlice(array, 0, middle), comparefn);
-      var right = sort(arraySlice(array, middle), comparefn);
-      var llength = left.length;
-      var rlength = right.length;
-      var lindex = 0;
-      var rindex = 0;
-
-      while (lindex < llength || rindex < rlength) {
-        array[lindex + rindex] = (lindex < llength && rindex < rlength)
-          ? comparefn(left[lindex], right[rindex]) <= 0 ? left[lindex++] : right[rindex++]
-          : lindex < llength ? left[lindex++] : right[rindex++];
-      }
-    }
-
-    return array;
-  };
-
-  var arraySort = sort;
-
-  var userAgent$1 = engineUserAgent;
-
-  var firefox = userAgent$1.match(/firefox\/(\d+)/i);
-
-  var engineFfVersion = !!firefox && +firefox[1];
-
-  var UA = engineUserAgent;
-
-  var engineIsIeOrEdge = /MSIE|Trident/.test(UA);
-
-  var userAgent = engineUserAgent;
-
-  var webkit = userAgent.match(/AppleWebKit\/(\d+)\./);
-
-  var engineWebkitVersion = !!webkit && +webkit[1];
-
-  var $$e = _export;
-  var uncurryThis$g = functionUncurryThis;
-  var aCallable = aCallable$4;
-  var toObject$6 = toObject$b;
-  var lengthOfArrayLike$1 = lengthOfArrayLike$6;
-  var deletePropertyOrThrow$1 = deletePropertyOrThrow$2;
-  var toString$e = toString$f;
-  var fails$h = fails$x;
-  var internalSort = arraySort;
-  var arrayMethodIsStrict$1 = arrayMethodIsStrict$4;
-  var FF = engineFfVersion;
-  var IE_OR_EDGE = engineIsIeOrEdge;
-  var V8 = engineV8Version;
-  var WEBKIT = engineWebkitVersion;
-
-  var test = [];
-  var nativeSort = uncurryThis$g(test.sort);
-  var push$3 = uncurryThis$g(test.push);
-
-  // IE8-
-  var FAILS_ON_UNDEFINED = fails$h(function () {
-    test.sort(undefined);
-  });
-  // V8 bug
-  var FAILS_ON_NULL = fails$h(function () {
-    test.sort(null);
-  });
-  // Old WebKit
-  var STRICT_METHOD$1 = arrayMethodIsStrict$1('sort');
-
-  var STABLE_SORT = !fails$h(function () {
-    // feature detection can be too slow, so check engines versions
-    if (V8) return V8 < 70;
-    if (FF && FF > 3) return;
-    if (IE_OR_EDGE) return true;
-    if (WEBKIT) return WEBKIT < 603;
-
-    var result = '';
-    var code, chr, value, index;
-
-    // generate an array with more 512 elements (Chakra and old V8 fails only in this case)
-    for (code = 65; code < 76; code++) {
-      chr = String.fromCharCode(code);
-
-      switch (code) {
-        case 66: case 69: case 70: case 72: value = 3; break;
-        case 68: case 71: value = 4; break;
-        default: value = 2;
-      }
-
-      for (index = 0; index < 47; index++) {
-        test.push({ k: chr + index, v: value });
-      }
-    }
-
-    test.sort(function (a, b) { return b.v - a.v; });
-
-    for (index = 0; index < test.length; index++) {
-      chr = test[index].k.charAt(0);
-      if (result.charAt(result.length - 1) !== chr) result += chr;
-    }
-
-    return result !== 'DGBEFHACIJK';
-  });
-
-  var FORCED$4 = FAILS_ON_UNDEFINED || !FAILS_ON_NULL || !STRICT_METHOD$1 || !STABLE_SORT;
-
-  var getSortCompare = function (comparefn) {
-    return function (x, y) {
-      if (y === undefined) return -1;
-      if (x === undefined) return 1;
-      if (comparefn !== undefined) return +comparefn(x, y) || 0;
-      return toString$e(x) > toString$e(y) ? 1 : -1;
-    };
-  };
-
-  // `Array.prototype.sort` method
-  // https://tc39.es/ecma262/#sec-array.prototype.sort
-  $$e({ target: 'Array', proto: true, forced: FORCED$4 }, {
-    sort: function sort(comparefn) {
-      if (comparefn !== undefined) aCallable(comparefn);
-
-      var array = toObject$6(this);
-
-      if (STABLE_SORT) return comparefn === undefined ? nativeSort(array) : nativeSort(array, comparefn);
-
-      var items = [];
-      var arrayLength = lengthOfArrayLike$1(array);
-      var itemsLength, index;
-
-      for (index = 0; index < arrayLength; index++) {
-        if (index in array) push$3(items, array[index]);
-      }
-
-      internalSort(items, getSortCompare(comparefn));
-
-      itemsLength = lengthOfArrayLike$1(items);
-      index = 0;
-
-      while (index < itemsLength) array[index] = items[index++];
-      while (index < arrayLength) deletePropertyOrThrow$1(array, index++);
-
-      return array;
-    }
-  });
-
-  var DESCRIPTORS$5 = descriptors;
-  var isArray = isArray$5;
-
-  var $TypeError$3 = TypeError;
-  // eslint-disable-next-line es/no-object-getownpropertydescriptor -- safe
-  var getOwnPropertyDescriptor$3 = Object.getOwnPropertyDescriptor;
-
-  // Safari < 13 does not throw an error in this case
-  var SILENT_ON_NON_WRITABLE_LENGTH_SET = DESCRIPTORS$5 && !function () {
-    // makes no sense without proper strict mode support
-    if (this !== undefined) return true;
-    try {
-      // eslint-disable-next-line es/no-object-defineproperty -- safe
-      Object.defineProperty([], 'length', { writable: false }).length = 1;
-    } catch (error) {
-      return error instanceof TypeError;
-    }
-  }();
-
-  var arraySetLength = SILENT_ON_NON_WRITABLE_LENGTH_SET ? function (O, length) {
-    if (isArray(O) && !getOwnPropertyDescriptor$3(O, 'length').writable) {
-      throw new $TypeError$3('Cannot set read only .length');
-    } return O.length = length;
-  } : function (O, length) {
-    return O.length = length;
-  };
-
-  var $$d = _export;
-  var toObject$5 = toObject$b;
-  var toAbsoluteIndex = toAbsoluteIndex$3;
-  var toIntegerOrInfinity$2 = toIntegerOrInfinity$5;
-  var lengthOfArrayLike = lengthOfArrayLike$6;
-  var setArrayLength = arraySetLength;
-  var doesNotExceedSafeInteger = doesNotExceedSafeInteger$2;
-  var arraySpeciesCreate = arraySpeciesCreate$3;
-  var createProperty = createProperty$3;
-  var deletePropertyOrThrow = deletePropertyOrThrow$2;
-  var arrayMethodHasSpeciesSupport = arrayMethodHasSpeciesSupport$5;
-
-  var HAS_SPECIES_SUPPORT = arrayMethodHasSpeciesSupport('splice');
-
-  var max$1 = Math.max;
-  var min$4 = Math.min;
-
-  // `Array.prototype.splice` method
-  // https://tc39.es/ecma262/#sec-array.prototype.splice
-  // with adding support of @@species
-  $$d({ target: 'Array', proto: true, forced: !HAS_SPECIES_SUPPORT }, {
-    splice: function splice(start, deleteCount /* , ...items */) {
-      var O = toObject$5(this);
-      var len = lengthOfArrayLike(O);
-      var actualStart = toAbsoluteIndex(start, len);
-      var argumentsLength = arguments.length;
-      var insertCount, actualDeleteCount, A, k, from, to;
-      if (argumentsLength === 0) {
-        insertCount = actualDeleteCount = 0;
-      } else if (argumentsLength === 1) {
-        insertCount = 0;
-        actualDeleteCount = len - actualStart;
-      } else {
-        insertCount = argumentsLength - 2;
-        actualDeleteCount = min$4(max$1(toIntegerOrInfinity$2(deleteCount), 0), len - actualStart);
-      }
-      doesNotExceedSafeInteger(len + insertCount - actualDeleteCount);
-      A = arraySpeciesCreate(O, actualDeleteCount);
-      for (k = 0; k < actualDeleteCount; k++) {
-        from = actualStart + k;
-        if (from in O) createProperty(A, k, O[from]);
-      }
-      A.length = actualDeleteCount;
-      if (insertCount < actualDeleteCount) {
-        for (k = actualStart; k < len - actualDeleteCount; k++) {
-          from = k + actualDeleteCount;
-          to = k + insertCount;
-          if (from in O) O[to] = O[from];
-          else deletePropertyOrThrow(O, to);
-        }
-        for (k = len; k > len - actualDeleteCount + insertCount; k--) deletePropertyOrThrow(O, k - 1);
-      } else if (insertCount > actualDeleteCount) {
-        for (k = len - actualDeleteCount; k > actualStart; k--) {
-          from = k + actualDeleteCount - 1;
-          to = k + insertCount - 1;
-          if (from in O) O[to] = O[from];
-          else deletePropertyOrThrow(O, to);
-        }
-      }
-      for (k = 0; k < insertCount; k++) {
-        O[k + actualStart] = arguments[k + 2];
-      }
-      setArrayLength(O, len - actualDeleteCount + insertCount);
-      return A;
-    }
-  });
-
-  var $$c = _export;
-  var fails$g = fails$x;
-  var toObject$4 = toObject$b;
-  var toPrimitive$1 = toPrimitive$3;
-
-  var FORCED$3 = fails$g(function () {
-    return new Date(NaN).toJSON() !== null
-      || Date.prototype.toJSON.call({ toISOString: function () { return 1; } }) !== 1;
-  });
-
-  // `Date.prototype.toJSON` method
-  // https://tc39.es/ecma262/#sec-date.prototype.tojson
-  $$c({ target: 'Date', proto: true, arity: 1, forced: FORCED$3 }, {
-    // eslint-disable-next-line no-unused-vars -- required for `.length`
-    toJSON: function toJSON(key) {
-      var O = toObject$4(this);
-      var pv = toPrimitive$1(O, 'number');
-      return typeof pv == 'number' && !isFinite(pv) ? null : O.toISOString();
-    }
-  });
-
-  var global$a = global$k;
-
-  var path$1 = global$a;
-
-  var isCallable$2 = isCallable$i;
-  var isObject$1 = isObject$d;
-  var setPrototypeOf = objectSetPrototypeOf;
-
-  // makes subclassing work correct for wrapped built-ins
-  var inheritIfRequired$2 = function ($this, dummy, Wrapper) {
-    var NewTarget, NewTargetPrototype;
-    if (
-      // it can work only with native `setPrototypeOf`
-      setPrototypeOf &&
-      // we haven't completely correct pre-ES6 way for getting `new.target`, so use this
-      isCallable$2(NewTarget = dummy.constructor) &&
-      NewTarget !== Wrapper &&
-      isObject$1(NewTargetPrototype = NewTarget.prototype) &&
-      NewTargetPrototype !== Wrapper.prototype
-    ) setPrototypeOf($this, NewTargetPrototype);
-    return $this;
-  };
-
-  var uncurryThis$f = functionUncurryThis;
-
-  // `thisNumberValue` abstract operation
-  // https://tc39.es/ecma262/#sec-thisnumbervalue
-  var thisNumberValue$1 = uncurryThis$f(1.0.valueOf);
-
-  // a string of all valid unicode whitespaces
-  var whitespaces$4 = '\u0009\u000A\u000B\u000C\u000D\u0020\u00A0\u1680\u2000\u2001\u2002' +
-    '\u2003\u2004\u2005\u2006\u2007\u2008\u2009\u200A\u202F\u205F\u3000\u2028\u2029\uFEFF';
-
-  var uncurryThis$e = functionUncurryThis;
-  var requireObjectCoercible$8 = requireObjectCoercible$c;
-  var toString$d = toString$f;
-  var whitespaces$3 = whitespaces$4;
-
-  var replace$3 = uncurryThis$e(''.replace);
-  var ltrim = RegExp('^[' + whitespaces$3 + ']+');
-  var rtrim = RegExp('(^|[^' + whitespaces$3 + '])[' + whitespaces$3 + ']+$');
-
-  // `String.prototype.{ trim, trimStart, trimEnd, trimLeft, trimRight }` methods implementation
-  var createMethod$2 = function (TYPE) {
-    return function ($this) {
-      var string = toString$d(requireObjectCoercible$8($this));
-      if (TYPE & 1) string = replace$3(string, ltrim, '');
-      if (TYPE & 2) string = replace$3(string, rtrim, '$1');
-      return string;
-    };
-  };
-
-  var stringTrim = {
-    // `String.prototype.{ trimLeft, trimStart }` methods
-    // https://tc39.es/ecma262/#sec-string.prototype.trimstart
-    start: createMethod$2(1),
-    // `String.prototype.{ trimRight, trimEnd }` methods
-    // https://tc39.es/ecma262/#sec-string.prototype.trimend
-    end: createMethod$2(2),
-    // `String.prototype.trim` method
-    // https://tc39.es/ecma262/#sec-string.prototype.trim
-    trim: createMethod$2(3)
-  };
-
-  var $$b = _export;
-  var IS_PURE = isPure;
-  var DESCRIPTORS$4 = descriptors;
-  var global$9 = global$k;
-  var path = path$1;
-  var uncurryThis$d = functionUncurryThis;
-  var isForced$1 = isForced_1;
-  var hasOwn$2 = hasOwnProperty_1;
-  var inheritIfRequired$1 = inheritIfRequired$2;
-  var isPrototypeOf$2 = objectIsPrototypeOf;
-  var isSymbol = isSymbol$3;
-  var toPrimitive = toPrimitive$3;
-  var fails$f = fails$x;
-  var getOwnPropertyNames$1 = objectGetOwnPropertyNames.f;
-  var getOwnPropertyDescriptor$2 = objectGetOwnPropertyDescriptor.f;
-  var defineProperty$3 = objectDefineProperty.f;
-  var thisNumberValue = thisNumberValue$1;
-  var trim$2 = stringTrim.trim;
-
-  var NUMBER = 'Number';
-  var NativeNumber = global$9[NUMBER];
-  path[NUMBER];
-  var NumberPrototype = NativeNumber.prototype;
-  var TypeError$1 = global$9.TypeError;
-  var stringSlice$7 = uncurryThis$d(''.slice);
-  var charCodeAt$1 = uncurryThis$d(''.charCodeAt);
-
-  // `ToNumeric` abstract operation
-  // https://tc39.es/ecma262/#sec-tonumeric
-  var toNumeric = function (value) {
-    var primValue = toPrimitive(value, 'number');
-    return typeof primValue == 'bigint' ? primValue : toNumber(primValue);
-  };
-
-  // `ToNumber` abstract operation
-  // https://tc39.es/ecma262/#sec-tonumber
-  var toNumber = function (argument) {
-    var it = toPrimitive(argument, 'number');
-    var first, third, radix, maxCode, digits, length, index, code;
-    if (isSymbol(it)) throw new TypeError$1('Cannot convert a Symbol value to a number');
-    if (typeof it == 'string' && it.length > 2) {
-      it = trim$2(it);
-      first = charCodeAt$1(it, 0);
-      if (first === 43 || first === 45) {
-        third = charCodeAt$1(it, 2);
-        if (third === 88 || third === 120) return NaN; // Number('+0x1') should be NaN, old V8 fix
-      } else if (first === 48) {
-        switch (charCodeAt$1(it, 1)) {
-          // fast equal of /^0b[01]+$/i
-          case 66:
-          case 98:
-            radix = 2;
-            maxCode = 49;
-            break;
-          // fast equal of /^0o[0-7]+$/i
-          case 79:
-          case 111:
-            radix = 8;
-            maxCode = 55;
-            break;
-          default:
-            return +it;
-        }
-        digits = stringSlice$7(it, 2);
-        length = digits.length;
-        for (index = 0; index < length; index++) {
-          code = charCodeAt$1(digits, index);
-          // parseInt parses a string to a first unavailable symbol
-          // but ToNumber should return NaN if a string contains unavailable symbols
-          if (code < 48 || code > maxCode) return NaN;
-        } return parseInt(digits, radix);
-      }
-    } return +it;
-  };
-
-  var FORCED$2 = isForced$1(NUMBER, !NativeNumber(' 0o1') || !NativeNumber('0b1') || NativeNumber('+0x1'));
-
-  var calledWithNew = function (dummy) {
-    // includes check on 1..constructor(foo) case
-    return isPrototypeOf$2(NumberPrototype, dummy) && fails$f(function () { thisNumberValue(dummy); });
-  };
-
-  // `Number` constructor
-  // https://tc39.es/ecma262/#sec-number-constructor
-  var NumberWrapper = function Number(value) {
-    var n = arguments.length < 1 ? 0 : NativeNumber(toNumeric(value));
-    return calledWithNew(this) ? inheritIfRequired$1(Object(n), this, NumberWrapper) : n;
-  };
-
-  NumberWrapper.prototype = NumberPrototype;
-  if (FORCED$2 && !IS_PURE) NumberPrototype.constructor = NumberWrapper;
-
-  $$b({ global: true, constructor: true, wrap: true, forced: FORCED$2 }, {
-    Number: NumberWrapper
-  });
-
-  // Use `internal/copy-constructor-properties` helper in `core-js@4`
-  var copyConstructorProperties = function (target, source) {
-    for (var keys = DESCRIPTORS$4 ? getOwnPropertyNames$1(source) : (
-      // ES3:
-      'MAX_VALUE,MIN_VALUE,NaN,NEGATIVE_INFINITY,POSITIVE_INFINITY,' +
-      // ES2015 (in case, if modules with ES2015 Number statics required before):
-      'EPSILON,MAX_SAFE_INTEGER,MIN_SAFE_INTEGER,isFinite,isInteger,isNaN,isSafeInteger,parseFloat,parseInt,' +
-      // ESNext
-      'fromString,range'
-    ).split(','), j = 0, key; keys.length > j; j++) {
-      if (hasOwn$2(source, key = keys[j]) && !hasOwn$2(target, key)) {
-        defineProperty$3(target, key, getOwnPropertyDescriptor$2(source, key));
-      }
-    }
-  };
-  if (FORCED$2 || IS_PURE) copyConstructorProperties(path[NUMBER], NativeNumber);
-
-  var DESCRIPTORS$3 = descriptors;
-  var uncurryThis$c = functionUncurryThis;
-  var call$9 = functionCall;
-  var fails$e = fails$x;
-  var objectKeys$1 = objectKeys$3;
-  var getOwnPropertySymbolsModule = objectGetOwnPropertySymbols;
-  var propertyIsEnumerableModule = objectPropertyIsEnumerable;
-  var toObject$3 = toObject$b;
-  var IndexedObject = indexedObject;
-
-  // eslint-disable-next-line es/no-object-assign -- safe
-  var $assign = Object.assign;
-  // eslint-disable-next-line es/no-object-defineproperty -- required for testing
-  var defineProperty$2 = Object.defineProperty;
-  var concat$1 = uncurryThis$c([].concat);
-
-  // `Object.assign` method
-  // https://tc39.es/ecma262/#sec-object.assign
-  var objectAssign = !$assign || fails$e(function () {
-    // should have correct order of operations (Edge bug)
-    if (DESCRIPTORS$3 && $assign({ b: 1 }, $assign(defineProperty$2({}, 'a', {
-      enumerable: true,
-      get: function () {
-        defineProperty$2(this, 'b', {
-          value: 3,
-          enumerable: false
-        });
-      }
-    }), { b: 2 })).b !== 1) return true;
-    // should work with symbols and should have deterministic property order (V8 bug)
-    var A = {};
-    var B = {};
-    // eslint-disable-next-line es/no-symbol -- safe
-    var symbol = Symbol('assign detection');
-    var alphabet = 'abcdefghijklmnopqrst';
-    A[symbol] = 7;
-    alphabet.split('').forEach(function (chr) { B[chr] = chr; });
-    return $assign({}, A)[symbol] !== 7 || objectKeys$1($assign({}, B)).join('') !== alphabet;
-  }) ? function assign(target, source) { // eslint-disable-line no-unused-vars -- required for `.length`
-    var T = toObject$3(target);
-    var argumentsLength = arguments.length;
-    var index = 1;
-    var getOwnPropertySymbols = getOwnPropertySymbolsModule.f;
-    var propertyIsEnumerable = propertyIsEnumerableModule.f;
-    while (argumentsLength > index) {
-      var S = IndexedObject(arguments[index++]);
-      var keys = getOwnPropertySymbols ? concat$1(objectKeys$1(S), getOwnPropertySymbols(S)) : objectKeys$1(S);
-      var length = keys.length;
-      var j = 0;
-      var key;
-      while (length > j) {
-        key = keys[j++];
-        if (!DESCRIPTORS$3 || call$9(propertyIsEnumerable, S, key)) T[key] = S[key];
-      }
-    } return T;
-  } : $assign;
-
-  var $$a = _export;
-  var assign = objectAssign;
-
-  // `Object.assign` method
-  // https://tc39.es/ecma262/#sec-object.assign
-  // eslint-disable-next-line es/no-object-assign -- required for testing
-  $$a({ target: 'Object', stat: true, arity: 2, forced: Object.assign !== assign }, {
-    assign: assign
-  });
-
-  var DESCRIPTORS$2 = descriptors;
-  var fails$d = fails$x;
-  var uncurryThis$b = functionUncurryThis;
-  var objectGetPrototypeOf = objectGetPrototypeOf$1;
-  var objectKeys = objectKeys$3;
-  var toIndexedObject = toIndexedObject$8;
-  var $propertyIsEnumerable = objectPropertyIsEnumerable.f;
-
-  var propertyIsEnumerable = uncurryThis$b($propertyIsEnumerable);
-  var push$2 = uncurryThis$b([].push);
-
-  // in some IE versions, `propertyIsEnumerable` returns incorrect result on integer keys
-  // of `null` prototype objects
-  var IE_BUG = DESCRIPTORS$2 && fails$d(function () {
-    // eslint-disable-next-line es/no-object-create -- safe
-    var O = Object.create(null);
-    O[2] = 2;
-    return !propertyIsEnumerable(O, 2);
-  });
-
-  // `Object.{ entries, values }` methods implementation
-  var createMethod$1 = function (TO_ENTRIES) {
-    return function (it) {
-      var O = toIndexedObject(it);
-      var keys = objectKeys(O);
-      var IE_WORKAROUND = IE_BUG && objectGetPrototypeOf(O) === null;
-      var length = keys.length;
-      var i = 0;
-      var result = [];
-      var key;
-      while (length > i) {
-        key = keys[i++];
-        if (!DESCRIPTORS$2 || (IE_WORKAROUND ? key in O : propertyIsEnumerable(O, key))) {
-          push$2(result, TO_ENTRIES ? [key, O[key]] : O[key]);
-        }
-      }
-      return result;
-    };
-  };
-
-  var objectToArray = {
-    // `Object.entries` method
-    // https://tc39.es/ecma262/#sec-object.entries
-    entries: createMethod$1(true),
-    // `Object.values` method
-    // https://tc39.es/ecma262/#sec-object.values
-    values: createMethod$1(false)
-  };
-
-  var $$9 = _export;
-  var $entries = objectToArray.entries;
-
-  // `Object.entries` method
-  // https://tc39.es/ecma262/#sec-object.entries
-  $$9({ target: 'Object', stat: true }, {
-    entries: function entries(O) {
-      return $entries(O);
-    }
-  });
-
-  var $$8 = _export;
-  var toObject$2 = toObject$b;
-  var nativeKeys = objectKeys$3;
-  var fails$c = fails$x;
-
-  var FAILS_ON_PRIMITIVES$1 = fails$c(function () { nativeKeys(1); });
-
-  // `Object.keys` method
-  // https://tc39.es/ecma262/#sec-object.keys
-  $$8({ target: 'Object', stat: true, forced: FAILS_ON_PRIMITIVES$1 }, {
-    keys: function keys(it) {
-      return nativeKeys(toObject$2(it));
-    }
-  });
-
-  var TO_STRING_TAG_SUPPORT$1 = toStringTagSupport;
-  var classof$2 = classof$5;
-
-  // `Object.prototype.toString` method implementation
-  // https://tc39.es/ecma262/#sec-object.prototype.tostring
-  var objectToString = TO_STRING_TAG_SUPPORT$1 ? {}.toString : function toString() {
-    return '[object ' + classof$2(this) + ']';
-  };
-
-  var TO_STRING_TAG_SUPPORT = toStringTagSupport;
-  var defineBuiltIn$3 = defineBuiltIn$7;
-  var toString$c = objectToString;
-
-  // `Object.prototype.toString` method
-  // https://tc39.es/ecma262/#sec-object.prototype.tostring
-  if (!TO_STRING_TAG_SUPPORT) {
-    defineBuiltIn$3(Object.prototype, 'toString', toString$c, { unsafe: true });
+  var objectCreate;
+  var hasRequiredObjectCreate;
+
+  function requireObjectCreate () {
+  	if (hasRequiredObjectCreate) return objectCreate;
+  	hasRequiredObjectCreate = 1;
+  	/* global ActiveXObject -- old IE, WSH */
+  	var anObject = requireAnObject();
+  	var definePropertiesModule = requireObjectDefineProperties();
+  	var enumBugKeys = requireEnumBugKeys();
+  	var hiddenKeys = requireHiddenKeys();
+  	var html = requireHtml();
+  	var documentCreateElement = requireDocumentCreateElement();
+  	var sharedKey = requireSharedKey();
+
+  	var GT = '>';
+  	var LT = '<';
+  	var PROTOTYPE = 'prototype';
+  	var SCRIPT = 'script';
+  	var IE_PROTO = sharedKey('IE_PROTO');
+
+  	var EmptyConstructor = function () { /* empty */ };
+
+  	var scriptTag = function (content) {
+  	  return LT + SCRIPT + GT + content + LT + '/' + SCRIPT + GT;
+  	};
+
+  	// Create object with fake `null` prototype: use ActiveX Object with cleared prototype
+  	var NullProtoObjectViaActiveX = function (activeXDocument) {
+  	  activeXDocument.write(scriptTag(''));
+  	  activeXDocument.close();
+  	  var temp = activeXDocument.parentWindow.Object;
+  	  // eslint-disable-next-line no-useless-assignment -- avoid memory leak
+  	  activeXDocument = null;
+  	  return temp;
+  	};
+
+  	// Create object with fake `null` prototype: use iframe Object with cleared prototype
+  	var NullProtoObjectViaIFrame = function () {
+  	  // Thrash, waste and sodomy: IE GC bug
+  	  var iframe = documentCreateElement('iframe');
+  	  var JS = 'java' + SCRIPT + ':';
+  	  var iframeDocument;
+  	  iframe.style.display = 'none';
+  	  html.appendChild(iframe);
+  	  // https://github.com/zloirock/core-js/issues/475
+  	  iframe.src = String(JS);
+  	  iframeDocument = iframe.contentWindow.document;
+  	  iframeDocument.open();
+  	  iframeDocument.write(scriptTag('document.F=Object'));
+  	  iframeDocument.close();
+  	  return iframeDocument.F;
+  	};
+
+  	// Check for document.domain and active x support
+  	// No need to use active x approach when document.domain is not set
+  	// see https://github.com/es-shims/es5-shim/issues/150
+  	// variation of https://github.com/kitcambridge/es5-shim/commit/4f738ac066346
+  	// avoid IE GC bug
+  	var activeXDocument;
+  	var NullProtoObject = function () {
+  	  try {
+  	    activeXDocument = new ActiveXObject('htmlfile');
+  	  } catch (error) { /* ignore */ }
+  	  NullProtoObject = typeof document != 'undefined'
+  	    ? document.domain && activeXDocument
+  	      ? NullProtoObjectViaActiveX(activeXDocument) // old IE
+  	      : NullProtoObjectViaIFrame()
+  	    : NullProtoObjectViaActiveX(activeXDocument); // WSH
+  	  var length = enumBugKeys.length;
+  	  while (length--) delete NullProtoObject[PROTOTYPE][enumBugKeys[length]];
+  	  return NullProtoObject();
+  	};
+
+  	hiddenKeys[IE_PROTO] = true;
+
+  	// `Object.create` method
+  	// https://tc39.es/ecma262/#sec-object.create
+  	// eslint-disable-next-line es/no-object-create -- safe
+  	objectCreate = Object.create || function create(O, Properties) {
+  	  var result;
+  	  if (O !== null) {
+  	    EmptyConstructor[PROTOTYPE] = anObject(O);
+  	    result = new EmptyConstructor();
+  	    EmptyConstructor[PROTOTYPE] = null;
+  	    // add "__proto__" for Object.getPrototypeOf polyfill
+  	    result[IE_PROTO] = O;
+  	  } else result = NullProtoObject();
+  	  return Properties === undefined ? result : definePropertiesModule.f(result, Properties);
+  	};
+  	return objectCreate;
   }
 
-  var global$8 = global$k;
-  var fails$b = fails$x;
-  var uncurryThis$a = functionUncurryThis;
-  var toString$b = toString$f;
-  var trim$1 = stringTrim.trim;
-  var whitespaces$2 = whitespaces$4;
+  var addToUnscopables;
+  var hasRequiredAddToUnscopables;
 
-  var charAt$5 = uncurryThis$a(''.charAt);
-  var $parseFloat$1 = global$8.parseFloat;
-  var Symbol$2 = global$8.Symbol;
-  var ITERATOR$2 = Symbol$2 && Symbol$2.iterator;
-  var FORCED$1 = 1 / $parseFloat$1(whitespaces$2 + '-0') !== -Infinity
-    // MS Edge 18- broken with boxed symbols
-    || (ITERATOR$2 && !fails$b(function () { $parseFloat$1(Object(ITERATOR$2)); }));
+  function requireAddToUnscopables () {
+  	if (hasRequiredAddToUnscopables) return addToUnscopables;
+  	hasRequiredAddToUnscopables = 1;
+  	var wellKnownSymbol = requireWellKnownSymbol();
+  	var create = requireObjectCreate();
+  	var defineProperty = requireObjectDefineProperty().f;
 
-  // `parseFloat` method
-  // https://tc39.es/ecma262/#sec-parsefloat-string
-  var numberParseFloat = FORCED$1 ? function parseFloat(string) {
-    var trimmedString = trim$1(toString$b(string));
-    var result = $parseFloat$1(trimmedString);
-    return result === 0 && charAt$5(trimmedString, 0) === '-' ? -0 : result;
-  } : $parseFloat$1;
+  	var UNSCOPABLES = wellKnownSymbol('unscopables');
+  	var ArrayPrototype = Array.prototype;
 
-  var $$7 = _export;
-  var $parseFloat = numberParseFloat;
+  	// Array.prototype[@@unscopables]
+  	// https://tc39.es/ecma262/#sec-array.prototype-@@unscopables
+  	if (ArrayPrototype[UNSCOPABLES] === undefined) {
+  	  defineProperty(ArrayPrototype, UNSCOPABLES, {
+  	    configurable: true,
+  	    value: create(null)
+  	  });
+  	}
 
-  // `parseFloat` method
-  // https://tc39.es/ecma262/#sec-parsefloat-string
-  $$7({ global: true, forced: parseFloat !== $parseFloat }, {
-    parseFloat: $parseFloat
-  });
-
-  var global$7 = global$k;
-  var fails$a = fails$x;
-  var uncurryThis$9 = functionUncurryThis;
-  var toString$a = toString$f;
-  var trim = stringTrim.trim;
-  var whitespaces$1 = whitespaces$4;
-
-  var $parseInt$1 = global$7.parseInt;
-  var Symbol$1 = global$7.Symbol;
-  var ITERATOR$1 = Symbol$1 && Symbol$1.iterator;
-  var hex = /^[+-]?0x/i;
-  var exec$2 = uncurryThis$9(hex.exec);
-  var FORCED = $parseInt$1(whitespaces$1 + '08') !== 8 || $parseInt$1(whitespaces$1 + '0x16') !== 22
-    // MS Edge 18- broken with boxed symbols
-    || (ITERATOR$1 && !fails$a(function () { $parseInt$1(Object(ITERATOR$1)); }));
-
-  // `parseInt` method
-  // https://tc39.es/ecma262/#sec-parseint-string-radix
-  var numberParseInt = FORCED ? function parseInt(string, radix) {
-    var S = trim(toString$a(string));
-    return $parseInt$1(S, (radix >>> 0) || (exec$2(hex, S) ? 16 : 10));
-  } : $parseInt$1;
-
-  var $$6 = _export;
-  var $parseInt = numberParseInt;
-
-  // `parseInt` method
-  // https://tc39.es/ecma262/#sec-parseint-string-radix
-  $$6({ global: true, forced: parseInt !== $parseInt }, {
-    parseInt: $parseInt
-  });
-
-  var isObject = isObject$d;
-  var classof$1 = classofRaw$2;
-  var wellKnownSymbol$7 = wellKnownSymbol$j;
-
-  var MATCH$2 = wellKnownSymbol$7('match');
-
-  // `IsRegExp` abstract operation
-  // https://tc39.es/ecma262/#sec-isregexp
-  var isRegexp = function (it) {
-    var isRegExp;
-    return isObject(it) && ((isRegExp = it[MATCH$2]) !== undefined ? !!isRegExp : classof$1(it) === 'RegExp');
-  };
-
-  var anObject$7 = anObject$c;
-
-  // `RegExp.prototype.flags` getter implementation
-  // https://tc39.es/ecma262/#sec-get-regexp.prototype.flags
-  var regexpFlags$1 = function () {
-    var that = anObject$7(this);
-    var result = '';
-    if (that.hasIndices) result += 'd';
-    if (that.global) result += 'g';
-    if (that.ignoreCase) result += 'i';
-    if (that.multiline) result += 'm';
-    if (that.dotAll) result += 's';
-    if (that.unicode) result += 'u';
-    if (that.unicodeSets) result += 'v';
-    if (that.sticky) result += 'y';
-    return result;
-  };
-
-  var call$8 = functionCall;
-  var hasOwn$1 = hasOwnProperty_1;
-  var isPrototypeOf$1 = objectIsPrototypeOf;
-  var regExpFlags = regexpFlags$1;
-
-  var RegExpPrototype$3 = RegExp.prototype;
-
-  var regexpGetFlags = function (R) {
-    var flags = R.flags;
-    return flags === undefined && !('flags' in RegExpPrototype$3) && !hasOwn$1(R, 'flags') && isPrototypeOf$1(RegExpPrototype$3, R)
-      ? call$8(regExpFlags, R) : flags;
-  };
-
-  var fails$9 = fails$x;
-  var global$6 = global$k;
-
-  // babel-minify and Closure Compiler transpiles RegExp('a', 'y') -> /a/y and it causes SyntaxError
-  var $RegExp$2 = global$6.RegExp;
-
-  var UNSUPPORTED_Y$3 = fails$9(function () {
-    var re = $RegExp$2('a', 'y');
-    re.lastIndex = 2;
-    return re.exec('abcd') !== null;
-  });
-
-  // UC Browser bug
-  // https://github.com/zloirock/core-js/issues/1008
-  var MISSED_STICKY$1 = UNSUPPORTED_Y$3 || fails$9(function () {
-    return !$RegExp$2('a', 'y').sticky;
-  });
-
-  var BROKEN_CARET = UNSUPPORTED_Y$3 || fails$9(function () {
-    // https://bugzilla.mozilla.org/show_bug.cgi?id=773687
-    var re = $RegExp$2('^r', 'gy');
-    re.lastIndex = 2;
-    return re.exec('str') !== null;
-  });
-
-  var regexpStickyHelpers = {
-    BROKEN_CARET: BROKEN_CARET,
-    MISSED_STICKY: MISSED_STICKY$1,
-    UNSUPPORTED_Y: UNSUPPORTED_Y$3
-  };
-
-  var defineProperty$1 = objectDefineProperty.f;
-
-  var proxyAccessor$1 = function (Target, Source, key) {
-    key in Target || defineProperty$1(Target, key, {
-      configurable: true,
-      get: function () { return Source[key]; },
-      set: function (it) { Source[key] = it; }
-    });
-  };
-
-  var makeBuiltIn = makeBuiltInExports;
-  var defineProperty = objectDefineProperty;
-
-  var defineBuiltInAccessor$1 = function (target, name, descriptor) {
-    if (descriptor.get) makeBuiltIn(descriptor.get, name, { getter: true });
-    if (descriptor.set) makeBuiltIn(descriptor.set, name, { setter: true });
-    return defineProperty.f(target, name, descriptor);
-  };
-
-  var getBuiltIn = getBuiltIn$5;
-  var defineBuiltInAccessor = defineBuiltInAccessor$1;
-  var wellKnownSymbol$6 = wellKnownSymbol$j;
-  var DESCRIPTORS$1 = descriptors;
-
-  var SPECIES$2 = wellKnownSymbol$6('species');
-
-  var setSpecies$1 = function (CONSTRUCTOR_NAME) {
-    var Constructor = getBuiltIn(CONSTRUCTOR_NAME);
-
-    if (DESCRIPTORS$1 && Constructor && !Constructor[SPECIES$2]) {
-      defineBuiltInAccessor(Constructor, SPECIES$2, {
-        configurable: true,
-        get: function () { return this; }
-      });
-    }
-  };
-
-  var fails$8 = fails$x;
-  var global$5 = global$k;
-
-  // babel-minify and Closure Compiler transpiles RegExp('.', 's') -> /./s and it causes SyntaxError
-  var $RegExp$1 = global$5.RegExp;
-
-  var regexpUnsupportedDotAll = fails$8(function () {
-    var re = $RegExp$1('.', 's');
-    return !(re.dotAll && re.test('\n') && re.flags === 's');
-  });
-
-  var fails$7 = fails$x;
-  var global$4 = global$k;
-
-  // babel-minify and Closure Compiler transpiles RegExp('(?<a>b)', 'g') -> /(?<a>b)/g and it causes SyntaxError
-  var $RegExp = global$4.RegExp;
-
-  var regexpUnsupportedNcg = fails$7(function () {
-    var re = $RegExp('(?<a>b)', 'g');
-    return re.exec('b').groups.a !== 'b' ||
-      'b'.replace(re, '$<a>c') !== 'bc';
-  });
-
-  var DESCRIPTORS = descriptors;
-  var global$3 = global$k;
-  var uncurryThis$8 = functionUncurryThis;
-  var isForced = isForced_1;
-  var inheritIfRequired = inheritIfRequired$2;
-  var createNonEnumerableProperty$3 = createNonEnumerableProperty$7;
-  var create$1 = objectCreate;
-  var getOwnPropertyNames = objectGetOwnPropertyNames.f;
-  var isPrototypeOf = objectIsPrototypeOf;
-  var isRegExp$1 = isRegexp;
-  var toString$9 = toString$f;
-  var getRegExpFlags$1 = regexpGetFlags;
-  var stickyHelpers$2 = regexpStickyHelpers;
-  var proxyAccessor = proxyAccessor$1;
-  var defineBuiltIn$2 = defineBuiltIn$7;
-  var fails$6 = fails$x;
-  var hasOwn = hasOwnProperty_1;
-  var enforceInternalState = internalState.enforce;
-  var setSpecies = setSpecies$1;
-  var wellKnownSymbol$5 = wellKnownSymbol$j;
-  var UNSUPPORTED_DOT_ALL$1 = regexpUnsupportedDotAll;
-  var UNSUPPORTED_NCG$1 = regexpUnsupportedNcg;
-
-  var MATCH$1 = wellKnownSymbol$5('match');
-  var NativeRegExp = global$3.RegExp;
-  var RegExpPrototype$2 = NativeRegExp.prototype;
-  var SyntaxError = global$3.SyntaxError;
-  var exec$1 = uncurryThis$8(RegExpPrototype$2.exec);
-  var charAt$4 = uncurryThis$8(''.charAt);
-  var replace$2 = uncurryThis$8(''.replace);
-  var stringIndexOf$2 = uncurryThis$8(''.indexOf);
-  var stringSlice$6 = uncurryThis$8(''.slice);
-  // TODO: Use only proper RegExpIdentifierName
-  var IS_NCG = /^\?<[^\s\d!#%&*+<=>@^][^\s!#%&*+<=>@^]*>/;
-  var re1 = /a/g;
-  var re2 = /a/g;
-
-  // "new" should create a new object, old webkit bug
-  var CORRECT_NEW = new NativeRegExp(re1) !== re1;
-
-  var MISSED_STICKY = stickyHelpers$2.MISSED_STICKY;
-  var UNSUPPORTED_Y$2 = stickyHelpers$2.UNSUPPORTED_Y;
-
-  var BASE_FORCED = DESCRIPTORS &&
-    (!CORRECT_NEW || MISSED_STICKY || UNSUPPORTED_DOT_ALL$1 || UNSUPPORTED_NCG$1 || fails$6(function () {
-      re2[MATCH$1] = false;
-      // RegExp constructor can alter flags and IsRegExp works correct with @@match
-      return NativeRegExp(re1) !== re1 || NativeRegExp(re2) === re2 || String(NativeRegExp(re1, 'i')) !== '/a/i';
-    }));
-
-  var handleDotAll = function (string) {
-    var length = string.length;
-    var index = 0;
-    var result = '';
-    var brackets = false;
-    var chr;
-    for (; index <= length; index++) {
-      chr = charAt$4(string, index);
-      if (chr === '\\') {
-        result += chr + charAt$4(string, ++index);
-        continue;
-      }
-      if (!brackets && chr === '.') {
-        result += '[\\s\\S]';
-      } else {
-        if (chr === '[') {
-          brackets = true;
-        } else if (chr === ']') {
-          brackets = false;
-        } result += chr;
-      }
-    } return result;
-  };
-
-  var handleNCG = function (string) {
-    var length = string.length;
-    var index = 0;
-    var result = '';
-    var named = [];
-    var names = create$1(null);
-    var brackets = false;
-    var ncg = false;
-    var groupid = 0;
-    var groupname = '';
-    var chr;
-    for (; index <= length; index++) {
-      chr = charAt$4(string, index);
-      if (chr === '\\') {
-        chr += charAt$4(string, ++index);
-      } else if (chr === ']') {
-        brackets = false;
-      } else if (!brackets) switch (true) {
-        case chr === '[':
-          brackets = true;
-          break;
-        case chr === '(':
-          if (exec$1(IS_NCG, stringSlice$6(string, index + 1))) {
-            index += 2;
-            ncg = true;
-          }
-          result += chr;
-          groupid++;
-          continue;
-        case chr === '>' && ncg:
-          if (groupname === '' || hasOwn(names, groupname)) {
-            throw new SyntaxError('Invalid capture group name');
-          }
-          names[groupname] = true;
-          named[named.length] = [groupname, groupid];
-          ncg = false;
-          groupname = '';
-          continue;
-      }
-      if (ncg) groupname += chr;
-      else result += chr;
-    } return [result, named];
-  };
-
-  // `RegExp` constructor
-  // https://tc39.es/ecma262/#sec-regexp-constructor
-  if (isForced('RegExp', BASE_FORCED)) {
-    var RegExpWrapper = function RegExp(pattern, flags) {
-      var thisIsRegExp = isPrototypeOf(RegExpPrototype$2, this);
-      var patternIsRegExp = isRegExp$1(pattern);
-      var flagsAreUndefined = flags === undefined;
-      var groups = [];
-      var rawPattern = pattern;
-      var rawFlags, dotAll, sticky, handled, result, state;
-
-      if (!thisIsRegExp && patternIsRegExp && flagsAreUndefined && pattern.constructor === RegExpWrapper) {
-        return pattern;
-      }
-
-      if (patternIsRegExp || isPrototypeOf(RegExpPrototype$2, pattern)) {
-        pattern = pattern.source;
-        if (flagsAreUndefined) flags = getRegExpFlags$1(rawPattern);
-      }
-
-      pattern = pattern === undefined ? '' : toString$9(pattern);
-      flags = flags === undefined ? '' : toString$9(flags);
-      rawPattern = pattern;
-
-      if (UNSUPPORTED_DOT_ALL$1 && 'dotAll' in re1) {
-        dotAll = !!flags && stringIndexOf$2(flags, 's') > -1;
-        if (dotAll) flags = replace$2(flags, /s/g, '');
-      }
-
-      rawFlags = flags;
-
-      if (MISSED_STICKY && 'sticky' in re1) {
-        sticky = !!flags && stringIndexOf$2(flags, 'y') > -1;
-        if (sticky && UNSUPPORTED_Y$2) flags = replace$2(flags, /y/g, '');
-      }
-
-      if (UNSUPPORTED_NCG$1) {
-        handled = handleNCG(pattern);
-        pattern = handled[0];
-        groups = handled[1];
-      }
-
-      result = inheritIfRequired(NativeRegExp(pattern, flags), thisIsRegExp ? this : RegExpPrototype$2, RegExpWrapper);
-
-      if (dotAll || sticky || groups.length) {
-        state = enforceInternalState(result);
-        if (dotAll) {
-          state.dotAll = true;
-          state.raw = RegExpWrapper(handleDotAll(pattern), rawFlags);
-        }
-        if (sticky) state.sticky = true;
-        if (groups.length) state.groups = groups;
-      }
-
-      if (pattern !== rawPattern) try {
-        // fails in old engines, but we have no alternatives for unsupported regex syntax
-        createNonEnumerableProperty$3(result, 'source', rawPattern === '' ? '(?:)' : rawPattern);
-      } catch (error) { /* empty */ }
-
-      return result;
-    };
-
-    for (var keys = getOwnPropertyNames(NativeRegExp), index = 0; keys.length > index;) {
-      proxyAccessor(RegExpWrapper, NativeRegExp, keys[index++]);
-    }
-
-    RegExpPrototype$2.constructor = RegExpWrapper;
-    RegExpWrapper.prototype = RegExpPrototype$2;
-    defineBuiltIn$2(global$3, 'RegExp', RegExpWrapper, { constructor: true });
+  	// add a key to Array.prototype[@@unscopables]
+  	addToUnscopables = function (key) {
+  	  ArrayPrototype[UNSCOPABLES][key] = true;
+  	};
+  	return addToUnscopables;
   }
 
-  // https://tc39.es/ecma262/#sec-get-regexp-@@species
-  setSpecies('RegExp');
+  var hasRequiredEs_array_find;
 
-  /* eslint-disable regexp/no-empty-capturing-group, regexp/no-empty-group, regexp/no-lazy-ends -- testing */
-  /* eslint-disable regexp/no-useless-quantifier -- testing */
-  var call$7 = functionCall;
-  var uncurryThis$7 = functionUncurryThis;
-  var toString$8 = toString$f;
-  var regexpFlags = regexpFlags$1;
-  var stickyHelpers$1 = regexpStickyHelpers;
-  var shared = shared$4;
-  var create = objectCreate;
-  var getInternalState = internalState.get;
-  var UNSUPPORTED_DOT_ALL = regexpUnsupportedDotAll;
-  var UNSUPPORTED_NCG = regexpUnsupportedNcg;
+  function requireEs_array_find () {
+  	if (hasRequiredEs_array_find) return es_array_find;
+  	hasRequiredEs_array_find = 1;
+  	var $ = require_export();
+  	var $find = requireArrayIteration().find;
+  	var addToUnscopables = requireAddToUnscopables();
 
-  var nativeReplace = shared('native-string-replace', String.prototype.replace);
-  var nativeExec = RegExp.prototype.exec;
-  var patchedExec = nativeExec;
-  var charAt$3 = uncurryThis$7(''.charAt);
-  var indexOf = uncurryThis$7(''.indexOf);
-  var replace$1 = uncurryThis$7(''.replace);
-  var stringSlice$5 = uncurryThis$7(''.slice);
+  	var FIND = 'find';
+  	var SKIPS_HOLES = true;
 
-  var UPDATES_LAST_INDEX_WRONG = (function () {
-    var re1 = /a/;
-    var re2 = /b*/g;
-    call$7(nativeExec, re1, 'a');
-    call$7(nativeExec, re2, 'a');
-    return re1.lastIndex !== 0 || re2.lastIndex !== 0;
-  })();
+  	// Shouldn't skip holes
+  	// eslint-disable-next-line es/no-array-prototype-find -- testing
+  	if (FIND in []) Array(1)[FIND](function () { SKIPS_HOLES = false; });
 
-  var UNSUPPORTED_Y$1 = stickyHelpers$1.BROKEN_CARET;
+  	// `Array.prototype.find` method
+  	// https://tc39.es/ecma262/#sec-array.prototype.find
+  	$({ target: 'Array', proto: true, forced: SKIPS_HOLES }, {
+  	  find: function find(callbackfn /* , that = undefined */) {
+  	    return $find(this, callbackfn, arguments.length > 1 ? arguments[1] : undefined);
+  	  }
+  	});
 
-  // nonparticipating capturing group, copied from es5-shim's String#split patch.
-  var NPCG_INCLUDED = /()??/.exec('')[1] !== undefined;
-
-  var PATCH = UPDATES_LAST_INDEX_WRONG || NPCG_INCLUDED || UNSUPPORTED_Y$1 || UNSUPPORTED_DOT_ALL || UNSUPPORTED_NCG;
-
-  if (PATCH) {
-    patchedExec = function exec(string) {
-      var re = this;
-      var state = getInternalState(re);
-      var str = toString$8(string);
-      var raw = state.raw;
-      var result, reCopy, lastIndex, match, i, object, group;
-
-      if (raw) {
-        raw.lastIndex = re.lastIndex;
-        result = call$7(patchedExec, raw, str);
-        re.lastIndex = raw.lastIndex;
-        return result;
-      }
-
-      var groups = state.groups;
-      var sticky = UNSUPPORTED_Y$1 && re.sticky;
-      var flags = call$7(regexpFlags, re);
-      var source = re.source;
-      var charsAdded = 0;
-      var strCopy = str;
-
-      if (sticky) {
-        flags = replace$1(flags, 'y', '');
-        if (indexOf(flags, 'g') === -1) {
-          flags += 'g';
-        }
-
-        strCopy = stringSlice$5(str, re.lastIndex);
-        // Support anchored sticky behavior.
-        if (re.lastIndex > 0 && (!re.multiline || re.multiline && charAt$3(str, re.lastIndex - 1) !== '\n')) {
-          source = '(?: ' + source + ')';
-          strCopy = ' ' + strCopy;
-          charsAdded++;
-        }
-        // ^(? + rx + ) is needed, in combination with some str slicing, to
-        // simulate the 'y' flag.
-        reCopy = new RegExp('^(?:' + source + ')', flags);
-      }
-
-      if (NPCG_INCLUDED) {
-        reCopy = new RegExp('^' + source + '$(?!\\s)', flags);
-      }
-      if (UPDATES_LAST_INDEX_WRONG) lastIndex = re.lastIndex;
-
-      match = call$7(nativeExec, sticky ? reCopy : re, strCopy);
-
-      if (sticky) {
-        if (match) {
-          match.input = stringSlice$5(match.input, charsAdded);
-          match[0] = stringSlice$5(match[0], charsAdded);
-          match.index = re.lastIndex;
-          re.lastIndex += match[0].length;
-        } else re.lastIndex = 0;
-      } else if (UPDATES_LAST_INDEX_WRONG && match) {
-        re.lastIndex = re.global ? match.index + match[0].length : lastIndex;
-      }
-      if (NPCG_INCLUDED && match && match.length > 1) {
-        // Fix browsers whose `exec` methods don't consistently return `undefined`
-        // for NPCG, like IE8. NOTE: This doesn't work for /(.?)?/
-        call$7(nativeReplace, match[0], reCopy, function () {
-          for (i = 1; i < arguments.length - 2; i++) {
-            if (arguments[i] === undefined) match[i] = undefined;
-          }
-        });
-      }
-
-      if (match && groups) {
-        match.groups = object = create(null);
-        for (i = 0; i < groups.length; i++) {
-          group = groups[i];
-          object[group[0]] = match[group[1]];
-        }
-      }
-
-      return match;
-    };
+  	// https://tc39.es/ecma262/#sec-array.prototype-@@unscopables
+  	addToUnscopables(FIND);
+  	return es_array_find;
   }
 
-  var regexpExec$2 = patchedExec;
+  requireEs_array_find();
 
-  var $$5 = _export;
-  var exec = regexpExec$2;
+  var es_array_findIndex = {};
 
-  // `RegExp.prototype.exec` method
-  // https://tc39.es/ecma262/#sec-regexp.prototype.exec
-  $$5({ target: 'RegExp', proto: true, forced: /./.exec !== exec }, {
-    exec: exec
-  });
+  var hasRequiredEs_array_findIndex;
 
-  var PROPER_FUNCTION_NAME$1 = functionName.PROPER;
-  var defineBuiltIn$1 = defineBuiltIn$7;
-  var anObject$6 = anObject$c;
-  var $toString = toString$f;
-  var fails$5 = fails$x;
-  var getRegExpFlags = regexpGetFlags;
+  function requireEs_array_findIndex () {
+  	if (hasRequiredEs_array_findIndex) return es_array_findIndex;
+  	hasRequiredEs_array_findIndex = 1;
+  	var $ = require_export();
+  	var $findIndex = requireArrayIteration().findIndex;
+  	var addToUnscopables = requireAddToUnscopables();
 
-  var TO_STRING = 'toString';
-  var RegExpPrototype$1 = RegExp.prototype;
-  var nativeToString = RegExpPrototype$1[TO_STRING];
+  	var FIND_INDEX = 'findIndex';
+  	var SKIPS_HOLES = true;
 
-  var NOT_GENERIC = fails$5(function () { return nativeToString.call({ source: 'a', flags: 'b' }) !== '/a/b'; });
-  // FF44- RegExp#toString has a wrong name
-  var INCORRECT_NAME = PROPER_FUNCTION_NAME$1 && nativeToString.name !== TO_STRING;
+  	// Shouldn't skip holes
+  	// eslint-disable-next-line es/no-array-prototype-findindex -- testing
+  	if (FIND_INDEX in []) Array(1)[FIND_INDEX](function () { SKIPS_HOLES = false; });
 
-  // `RegExp.prototype.toString` method
-  // https://tc39.es/ecma262/#sec-regexp.prototype.tostring
-  if (NOT_GENERIC || INCORRECT_NAME) {
-    defineBuiltIn$1(RegExpPrototype$1, TO_STRING, function toString() {
-      var R = anObject$6(this);
-      var pattern = $toString(R.source);
-      var flags = $toString(getRegExpFlags(R));
-      return '/' + pattern + '/' + flags;
-    }, { unsafe: true });
+  	// `Array.prototype.findIndex` method
+  	// https://tc39.es/ecma262/#sec-array.prototype.findindex
+  	$({ target: 'Array', proto: true, forced: SKIPS_HOLES }, {
+  	  findIndex: function findIndex(callbackfn /* , that = undefined */) {
+  	    return $findIndex(this, callbackfn, arguments.length > 1 ? arguments[1] : undefined);
+  	  }
+  	});
+
+  	// https://tc39.es/ecma262/#sec-array.prototype-@@unscopables
+  	addToUnscopables(FIND_INDEX);
+  	return es_array_findIndex;
   }
 
-  var isRegExp = isRegexp;
-
-  var $TypeError$2 = TypeError;
-
-  var notARegexp = function (it) {
-    if (isRegExp(it)) {
-      throw new $TypeError$2("The method doesn't accept regular expressions");
-    } return it;
-  };
-
-  var wellKnownSymbol$4 = wellKnownSymbol$j;
-
-  var MATCH = wellKnownSymbol$4('match');
-
-  var correctIsRegexpLogic = function (METHOD_NAME) {
-    var regexp = /./;
-    try {
-      '/./'[METHOD_NAME](regexp);
-    } catch (error1) {
-      try {
-        regexp[MATCH] = false;
-        return '/./'[METHOD_NAME](regexp);
-      } catch (error2) { /* empty */ }
-    } return false;
-  };
-
-  var $$4 = _export;
-  var uncurryThis$6 = functionUncurryThis;
-  var notARegExp$2 = notARegexp;
-  var requireObjectCoercible$7 = requireObjectCoercible$c;
-  var toString$7 = toString$f;
-  var correctIsRegExpLogic$2 = correctIsRegexpLogic;
-
-  var stringIndexOf$1 = uncurryThis$6(''.indexOf);
-
-  // `String.prototype.includes` method
-  // https://tc39.es/ecma262/#sec-string.prototype.includes
-  $$4({ target: 'String', proto: true, forced: !correctIsRegExpLogic$2('includes') }, {
-    includes: function includes(searchString /* , position = 0 */) {
-      return !!~stringIndexOf$1(
-        toString$7(requireObjectCoercible$7(this)),
-        toString$7(notARegExp$2(searchString)),
-        arguments.length > 1 ? arguments[1] : undefined
-      );
-    }
-  });
-
-  var NATIVE_BIND = functionBindNative;
-
-  var FunctionPrototype = Function.prototype;
-  var apply$1 = FunctionPrototype.apply;
-  var call$6 = FunctionPrototype.call;
-
-  // eslint-disable-next-line es/no-reflect -- safe
-  var functionApply = typeof Reflect == 'object' && Reflect.apply || (NATIVE_BIND ? call$6.bind(apply$1) : function () {
-    return call$6.apply(apply$1, arguments);
-  });
-
-  // TODO: Remove from `core-js@4` since it's moved to entry points
-
-  var call$5 = functionCall;
-  var defineBuiltIn = defineBuiltIn$7;
-  var regexpExec$1 = regexpExec$2;
-  var fails$4 = fails$x;
-  var wellKnownSymbol$3 = wellKnownSymbol$j;
-  var createNonEnumerableProperty$2 = createNonEnumerableProperty$7;
-
-  var SPECIES$1 = wellKnownSymbol$3('species');
-  var RegExpPrototype = RegExp.prototype;
-
-  var fixRegexpWellKnownSymbolLogic = function (KEY, exec, FORCED, SHAM) {
-    var SYMBOL = wellKnownSymbol$3(KEY);
-
-    var DELEGATES_TO_SYMBOL = !fails$4(function () {
-      // String methods call symbol-named RegExp methods
-      var O = {};
-      O[SYMBOL] = function () { return 7; };
-      return ''[KEY](O) !== 7;
-    });
-
-    var DELEGATES_TO_EXEC = DELEGATES_TO_SYMBOL && !fails$4(function () {
-      // Symbol-named RegExp methods call .exec
-      var execCalled = false;
-      var re = /a/;
-
-      if (KEY === 'split') {
-        // We can't use real regex here since it causes deoptimization
-        // and serious performance degradation in V8
-        // https://github.com/zloirock/core-js/issues/306
-        re = {};
-        // RegExp[@@split] doesn't call the regex's exec method, but first creates
-        // a new one. We need to return the patched regex when creating the new one.
-        re.constructor = {};
-        re.constructor[SPECIES$1] = function () { return re; };
-        re.flags = '';
-        re[SYMBOL] = /./[SYMBOL];
-      }
-
-      re.exec = function () {
-        execCalled = true;
-        return null;
-      };
-
-      re[SYMBOL]('');
-      return !execCalled;
-    });
-
-    if (
-      !DELEGATES_TO_SYMBOL ||
-      !DELEGATES_TO_EXEC ||
-      FORCED
-    ) {
-      var nativeRegExpMethod = /./[SYMBOL];
-      var methods = exec(SYMBOL, ''[KEY], function (nativeMethod, regexp, str, arg2, forceStringMethod) {
-        var $exec = regexp.exec;
-        if ($exec === regexpExec$1 || $exec === RegExpPrototype.exec) {
-          if (DELEGATES_TO_SYMBOL && !forceStringMethod) {
-            // The native String method already delegates to @@method (this
-            // polyfilled function), leasing to infinite recursion.
-            // We avoid it by directly calling the native @@method method.
-            return { done: true, value: call$5(nativeRegExpMethod, regexp, str, arg2) };
-          }
-          return { done: true, value: call$5(nativeMethod, str, regexp, arg2) };
-        }
-        return { done: false };
-      });
-
-      defineBuiltIn(String.prototype, KEY, methods[0]);
-      defineBuiltIn(RegExpPrototype, SYMBOL, methods[1]);
-    }
-
-    if (SHAM) createNonEnumerableProperty$2(RegExpPrototype[SYMBOL], 'sham', true);
-  };
-
-  var uncurryThis$5 = functionUncurryThis;
-  var toIntegerOrInfinity$1 = toIntegerOrInfinity$5;
-  var toString$6 = toString$f;
-  var requireObjectCoercible$6 = requireObjectCoercible$c;
-
-  var charAt$2 = uncurryThis$5(''.charAt);
-  var charCodeAt = uncurryThis$5(''.charCodeAt);
-  var stringSlice$4 = uncurryThis$5(''.slice);
-
-  var createMethod = function (CONVERT_TO_STRING) {
-    return function ($this, pos) {
-      var S = toString$6(requireObjectCoercible$6($this));
-      var position = toIntegerOrInfinity$1(pos);
-      var size = S.length;
-      var first, second;
-      if (position < 0 || position >= size) return CONVERT_TO_STRING ? '' : undefined;
-      first = charCodeAt(S, position);
-      return first < 0xD800 || first > 0xDBFF || position + 1 === size
-        || (second = charCodeAt(S, position + 1)) < 0xDC00 || second > 0xDFFF
-          ? CONVERT_TO_STRING
-            ? charAt$2(S, position)
-            : first
-          : CONVERT_TO_STRING
-            ? stringSlice$4(S, position, position + 2)
-            : (first - 0xD800 << 10) + (second - 0xDC00) + 0x10000;
-    };
-  };
-
-  var stringMultibyte = {
-    // `String.prototype.codePointAt` method
-    // https://tc39.es/ecma262/#sec-string.prototype.codepointat
-    codeAt: createMethod(false),
-    // `String.prototype.at` method
-    // https://github.com/mathiasbynens/String.prototype.at
-    charAt: createMethod(true)
-  };
-
-  var charAt$1 = stringMultibyte.charAt;
-
-  // `AdvanceStringIndex` abstract operation
-  // https://tc39.es/ecma262/#sec-advancestringindex
-  var advanceStringIndex$3 = function (S, index, unicode) {
-    return index + (unicode ? charAt$1(S, index).length : 1);
-  };
-
-  var uncurryThis$4 = functionUncurryThis;
-  var toObject$1 = toObject$b;
-
-  var floor = Math.floor;
-  var charAt = uncurryThis$4(''.charAt);
-  var replace = uncurryThis$4(''.replace);
-  var stringSlice$3 = uncurryThis$4(''.slice);
-  // eslint-disable-next-line redos/no-vulnerable -- safe
-  var SUBSTITUTION_SYMBOLS = /\$([$&'`]|\d{1,2}|<[^>]*>)/g;
-  var SUBSTITUTION_SYMBOLS_NO_NAMED = /\$([$&'`]|\d{1,2})/g;
-
-  // `GetSubstitution` abstract operation
-  // https://tc39.es/ecma262/#sec-getsubstitution
-  var getSubstitution$1 = function (matched, str, position, captures, namedCaptures, replacement) {
-    var tailPos = position + matched.length;
-    var m = captures.length;
-    var symbols = SUBSTITUTION_SYMBOLS_NO_NAMED;
-    if (namedCaptures !== undefined) {
-      namedCaptures = toObject$1(namedCaptures);
-      symbols = SUBSTITUTION_SYMBOLS;
-    }
-    return replace(replacement, symbols, function (match, ch) {
-      var capture;
-      switch (charAt(ch, 0)) {
-        case '$': return '$';
-        case '&': return matched;
-        case '`': return stringSlice$3(str, 0, position);
-        case "'": return stringSlice$3(str, tailPos);
-        case '<':
-          capture = namedCaptures[stringSlice$3(ch, 1, -1)];
-          break;
-        default: // \d\d?
-          var n = +ch;
-          if (n === 0) return match;
-          if (n > m) {
-            var f = floor(n / 10);
-            if (f === 0) return match;
-            if (f <= m) return captures[f - 1] === undefined ? charAt(ch, 1) : captures[f - 1] + charAt(ch, 1);
-            return match;
-          }
-          capture = captures[n - 1];
-      }
-      return capture === undefined ? '' : capture;
-    });
-  };
-
-  var call$4 = functionCall;
-  var anObject$5 = anObject$c;
-  var isCallable$1 = isCallable$i;
-  var classof = classofRaw$2;
-  var regexpExec = regexpExec$2;
-
-  var $TypeError$1 = TypeError;
-
-  // `RegExpExec` abstract operation
-  // https://tc39.es/ecma262/#sec-regexpexec
-  var regexpExecAbstract = function (R, S) {
-    var exec = R.exec;
-    if (isCallable$1(exec)) {
-      var result = call$4(exec, R, S);
-      if (result !== null) anObject$5(result);
-      return result;
-    }
-    if (classof(R) === 'RegExp') return call$4(regexpExec, R, S);
-    throw new $TypeError$1('RegExp#exec called on incompatible receiver');
-  };
-
-  var apply = functionApply;
-  var call$3 = functionCall;
-  var uncurryThis$3 = functionUncurryThis;
-  var fixRegExpWellKnownSymbolLogic$3 = fixRegexpWellKnownSymbolLogic;
-  var fails$3 = fails$x;
-  var anObject$4 = anObject$c;
-  var isCallable = isCallable$i;
-  var isNullOrUndefined$4 = isNullOrUndefined$7;
-  var toIntegerOrInfinity = toIntegerOrInfinity$5;
-  var toLength$4 = toLength$6;
-  var toString$5 = toString$f;
-  var requireObjectCoercible$5 = requireObjectCoercible$c;
-  var advanceStringIndex$2 = advanceStringIndex$3;
-  var getMethod$3 = getMethod$5;
-  var getSubstitution = getSubstitution$1;
-  var regExpExec$3 = regexpExecAbstract;
-  var wellKnownSymbol$2 = wellKnownSymbol$j;
-
-  var REPLACE = wellKnownSymbol$2('replace');
-  var max = Math.max;
-  var min$3 = Math.min;
-  var concat = uncurryThis$3([].concat);
-  var push$1 = uncurryThis$3([].push);
-  var stringIndexOf = uncurryThis$3(''.indexOf);
-  var stringSlice$2 = uncurryThis$3(''.slice);
-
-  var maybeToString = function (it) {
-    return it === undefined ? it : String(it);
-  };
-
-  // IE <= 11 replaces $0 with the whole match, as if it was $&
-  // https://stackoverflow.com/questions/6024666/getting-ie-to-replace-a-regex-with-the-literal-string-0
-  var REPLACE_KEEPS_$0 = (function () {
-    // eslint-disable-next-line regexp/prefer-escape-replacement-dollar-char -- required for testing
-    return 'a'.replace(/./, '$0') === '$0';
-  })();
-
-  // Safari <= 13.0.3(?) substitutes nth capture where n>m with an empty string
-  var REGEXP_REPLACE_SUBSTITUTES_UNDEFINED_CAPTURE = (function () {
-    if (/./[REPLACE]) {
-      return /./[REPLACE]('a', '$0') === '';
-    }
-    return false;
-  })();
-
-  var REPLACE_SUPPORTS_NAMED_GROUPS = !fails$3(function () {
-    var re = /./;
-    re.exec = function () {
-      var result = [];
-      result.groups = { a: '7' };
-      return result;
-    };
-    // eslint-disable-next-line regexp/no-useless-dollar-replacements -- false positive
-    return ''.replace(re, '$<a>') !== '7';
-  });
-
-  // @@replace logic
-  fixRegExpWellKnownSymbolLogic$3('replace', function (_, nativeReplace, maybeCallNative) {
-    var UNSAFE_SUBSTITUTE = REGEXP_REPLACE_SUBSTITUTES_UNDEFINED_CAPTURE ? '$' : '$0';
-
-    return [
-      // `String.prototype.replace` method
-      // https://tc39.es/ecma262/#sec-string.prototype.replace
-      function replace(searchValue, replaceValue) {
-        var O = requireObjectCoercible$5(this);
-        var replacer = isNullOrUndefined$4(searchValue) ? undefined : getMethod$3(searchValue, REPLACE);
-        return replacer
-          ? call$3(replacer, searchValue, O, replaceValue)
-          : call$3(nativeReplace, toString$5(O), searchValue, replaceValue);
-      },
-      // `RegExp.prototype[@@replace]` method
-      // https://tc39.es/ecma262/#sec-regexp.prototype-@@replace
-      function (string, replaceValue) {
-        var rx = anObject$4(this);
-        var S = toString$5(string);
-
-        if (
-          typeof replaceValue == 'string' &&
-          stringIndexOf(replaceValue, UNSAFE_SUBSTITUTE) === -1 &&
-          stringIndexOf(replaceValue, '$<') === -1
-        ) {
-          var res = maybeCallNative(nativeReplace, rx, S, replaceValue);
-          if (res.done) return res.value;
-        }
-
-        var functionalReplace = isCallable(replaceValue);
-        if (!functionalReplace) replaceValue = toString$5(replaceValue);
-
-        var global = rx.global;
-        var fullUnicode;
-        if (global) {
-          fullUnicode = rx.unicode;
-          rx.lastIndex = 0;
-        }
-
-        var results = [];
-        var result;
-        while (true) {
-          result = regExpExec$3(rx, S);
-          if (result === null) break;
-
-          push$1(results, result);
-          if (!global) break;
-
-          var matchStr = toString$5(result[0]);
-          if (matchStr === '') rx.lastIndex = advanceStringIndex$2(S, toLength$4(rx.lastIndex), fullUnicode);
-        }
-
-        var accumulatedResult = '';
-        var nextSourcePosition = 0;
-        for (var i = 0; i < results.length; i++) {
-          result = results[i];
-
-          var matched = toString$5(result[0]);
-          var position = max(min$3(toIntegerOrInfinity(result.index), S.length), 0);
-          var captures = [];
-          var replacement;
-          // NOTE: This is equivalent to
-          //   captures = result.slice(1).map(maybeToString)
-          // but for some reason `nativeSlice.call(result, 1, result.length)` (called in
-          // the slice polyfill when slicing native arrays) "doesn't work" in safari 9 and
-          // causes a crash (https://pastebin.com/N21QzeQA) when trying to debug it.
-          for (var j = 1; j < result.length; j++) push$1(captures, maybeToString(result[j]));
-          var namedCaptures = result.groups;
-          if (functionalReplace) {
-            var replacerArgs = concat([matched], captures, position, S);
-            if (namedCaptures !== undefined) push$1(replacerArgs, namedCaptures);
-            replacement = toString$5(apply(replaceValue, undefined, replacerArgs));
-          } else {
-            replacement = getSubstitution(matched, S, position, captures, namedCaptures, replaceValue);
-          }
-          if (position >= nextSourcePosition) {
-            accumulatedResult += stringSlice$2(S, nextSourcePosition, position) + replacement;
-            nextSourcePosition = position + matched.length;
-          }
-        }
-
-        return accumulatedResult + stringSlice$2(S, nextSourcePosition);
-      }
-    ];
-  }, !REPLACE_SUPPORTS_NAMED_GROUPS || !REPLACE_KEEPS_$0 || REGEXP_REPLACE_SUBSTITUTES_UNDEFINED_CAPTURE);
-
-  // `SameValue` abstract operation
-  // https://tc39.es/ecma262/#sec-samevalue
-  // eslint-disable-next-line es/no-object-is -- safe
-  var sameValue$1 = Object.is || function is(x, y) {
-    // eslint-disable-next-line no-self-compare -- NaN check
-    return x === y ? x !== 0 || 1 / x === 1 / y : x !== x && y !== y;
-  };
-
-  var call$2 = functionCall;
-  var fixRegExpWellKnownSymbolLogic$2 = fixRegexpWellKnownSymbolLogic;
-  var anObject$3 = anObject$c;
-  var isNullOrUndefined$3 = isNullOrUndefined$7;
-  var requireObjectCoercible$4 = requireObjectCoercible$c;
-  var sameValue = sameValue$1;
-  var toString$4 = toString$f;
-  var getMethod$2 = getMethod$5;
-  var regExpExec$2 = regexpExecAbstract;
-
-  // @@search logic
-  fixRegExpWellKnownSymbolLogic$2('search', function (SEARCH, nativeSearch, maybeCallNative) {
-    return [
-      // `String.prototype.search` method
-      // https://tc39.es/ecma262/#sec-string.prototype.search
-      function search(regexp) {
-        var O = requireObjectCoercible$4(this);
-        var searcher = isNullOrUndefined$3(regexp) ? undefined : getMethod$2(regexp, SEARCH);
-        return searcher ? call$2(searcher, regexp, O) : new RegExp(regexp)[SEARCH](toString$4(O));
-      },
-      // `RegExp.prototype[@@search]` method
-      // https://tc39.es/ecma262/#sec-regexp.prototype-@@search
-      function (string) {
-        var rx = anObject$3(this);
-        var S = toString$4(string);
-        var res = maybeCallNative(nativeSearch, rx, S);
-
-        if (res.done) return res.value;
-
-        var previousLastIndex = rx.lastIndex;
-        if (!sameValue(previousLastIndex, 0)) rx.lastIndex = 0;
-        var result = regExpExec$2(rx, S);
-        if (!sameValue(rx.lastIndex, previousLastIndex)) rx.lastIndex = previousLastIndex;
-        return result === null ? -1 : result.index;
-      }
-    ];
-  });
-
-  var isConstructor = isConstructor$3;
-  var tryToString = tryToString$3;
-
-  var $TypeError = TypeError;
-
-  // `Assert: IsConstructor(argument) is true`
-  var aConstructor$1 = function (argument) {
-    if (isConstructor(argument)) return argument;
-    throw new $TypeError(tryToString(argument) + ' is not a constructor');
-  };
-
-  var anObject$2 = anObject$c;
-  var aConstructor = aConstructor$1;
-  var isNullOrUndefined$2 = isNullOrUndefined$7;
-  var wellKnownSymbol$1 = wellKnownSymbol$j;
-
-  var SPECIES = wellKnownSymbol$1('species');
-
-  // `SpeciesConstructor` abstract operation
-  // https://tc39.es/ecma262/#sec-speciesconstructor
-  var speciesConstructor$1 = function (O, defaultConstructor) {
-    var C = anObject$2(O).constructor;
-    var S;
-    return C === undefined || isNullOrUndefined$2(S = anObject$2(C)[SPECIES]) ? defaultConstructor : aConstructor(S);
-  };
-
-  var call$1 = functionCall;
-  var uncurryThis$2 = functionUncurryThis;
-  var fixRegExpWellKnownSymbolLogic$1 = fixRegexpWellKnownSymbolLogic;
-  var anObject$1 = anObject$c;
-  var isNullOrUndefined$1 = isNullOrUndefined$7;
-  var requireObjectCoercible$3 = requireObjectCoercible$c;
-  var speciesConstructor = speciesConstructor$1;
-  var advanceStringIndex$1 = advanceStringIndex$3;
-  var toLength$3 = toLength$6;
-  var toString$3 = toString$f;
-  var getMethod$1 = getMethod$5;
-  var regExpExec$1 = regexpExecAbstract;
-  var stickyHelpers = regexpStickyHelpers;
-  var fails$2 = fails$x;
-
-  var UNSUPPORTED_Y = stickyHelpers.UNSUPPORTED_Y;
-  var MAX_UINT32 = 0xFFFFFFFF;
-  var min$2 = Math.min;
-  var push = uncurryThis$2([].push);
-  var stringSlice$1 = uncurryThis$2(''.slice);
-
-  // Chrome 51 has a buggy "split" implementation when RegExp#exec !== nativeExec
-  // Weex JS has frozen built-in prototypes, so use try / catch wrapper
-  var SPLIT_WORKS_WITH_OVERWRITTEN_EXEC = !fails$2(function () {
-    // eslint-disable-next-line regexp/no-empty-group -- required for testing
-    var re = /(?:)/;
-    var originalExec = re.exec;
-    re.exec = function () { return originalExec.apply(this, arguments); };
-    var result = 'ab'.split(re);
-    return result.length !== 2 || result[0] !== 'a' || result[1] !== 'b';
-  });
-
-  var BUGGY = 'abbc'.split(/(b)*/)[1] === 'c' ||
-    // eslint-disable-next-line regexp/no-empty-group -- required for testing
-    'test'.split(/(?:)/, -1).length !== 4 ||
-    'ab'.split(/(?:ab)*/).length !== 2 ||
-    '.'.split(/(.?)(.?)/).length !== 4 ||
-    // eslint-disable-next-line regexp/no-empty-capturing-group, regexp/no-empty-group -- required for testing
-    '.'.split(/()()/).length > 1 ||
-    ''.split(/.?/).length;
-
-  // @@split logic
-  fixRegExpWellKnownSymbolLogic$1('split', function (SPLIT, nativeSplit, maybeCallNative) {
-    var internalSplit = '0'.split(undefined, 0).length ? function (separator, limit) {
-      return separator === undefined && limit === 0 ? [] : call$1(nativeSplit, this, separator, limit);
-    } : nativeSplit;
-
-    return [
-      // `String.prototype.split` method
-      // https://tc39.es/ecma262/#sec-string.prototype.split
-      function split(separator, limit) {
-        var O = requireObjectCoercible$3(this);
-        var splitter = isNullOrUndefined$1(separator) ? undefined : getMethod$1(separator, SPLIT);
-        return splitter
-          ? call$1(splitter, separator, O, limit)
-          : call$1(internalSplit, toString$3(O), separator, limit);
-      },
-      // `RegExp.prototype[@@split]` method
-      // https://tc39.es/ecma262/#sec-regexp.prototype-@@split
-      //
-      // NOTE: This cannot be properly polyfilled in engines that don't support
-      // the 'y' flag.
-      function (string, limit) {
-        var rx = anObject$1(this);
-        var S = toString$3(string);
-
-        if (!BUGGY) {
-          var res = maybeCallNative(internalSplit, rx, S, limit, internalSplit !== nativeSplit);
-          if (res.done) return res.value;
-        }
-
-        var C = speciesConstructor(rx, RegExp);
-        var unicodeMatching = rx.unicode;
-        var flags = (rx.ignoreCase ? 'i' : '') +
-                    (rx.multiline ? 'm' : '') +
-                    (rx.unicode ? 'u' : '') +
-                    (UNSUPPORTED_Y ? 'g' : 'y');
-        // ^(? + rx + ) is needed, in combination with some S slicing, to
-        // simulate the 'y' flag.
-        var splitter = new C(UNSUPPORTED_Y ? '^(?:' + rx.source + ')' : rx, flags);
-        var lim = limit === undefined ? MAX_UINT32 : limit >>> 0;
-        if (lim === 0) return [];
-        if (S.length === 0) return regExpExec$1(splitter, S) === null ? [S] : [];
-        var p = 0;
-        var q = 0;
-        var A = [];
-        while (q < S.length) {
-          splitter.lastIndex = UNSUPPORTED_Y ? 0 : q;
-          var z = regExpExec$1(splitter, UNSUPPORTED_Y ? stringSlice$1(S, q) : S);
-          var e;
-          if (
-            z === null ||
-            (e = min$2(toLength$3(splitter.lastIndex + (UNSUPPORTED_Y ? q : 0)), S.length)) === p
-          ) {
-            q = advanceStringIndex$1(S, q, unicodeMatching);
-          } else {
-            push(A, stringSlice$1(S, p, q));
-            if (A.length === lim) return A;
-            for (var i = 1; i <= z.length - 1; i++) {
-              push(A, z[i]);
-              if (A.length === lim) return A;
-            }
-            q = p = e;
-          }
-        }
-        push(A, stringSlice$1(S, p));
-        return A;
-      }
-    ];
-  }, BUGGY || !SPLIT_WORKS_WITH_OVERWRITTEN_EXEC, UNSUPPORTED_Y);
-
-  var PROPER_FUNCTION_NAME = functionName.PROPER;
-  var fails$1 = fails$x;
-  var whitespaces = whitespaces$4;
-
-  var non = '\u200B\u0085\u180E';
-
-  // check that a method works with the correct list
-  // of whitespaces and has a correct name
-  var stringTrimForced = function (METHOD_NAME) {
-    return fails$1(function () {
-      return !!whitespaces[METHOD_NAME]()
-        || non[METHOD_NAME]() !== non
-        || (PROPER_FUNCTION_NAME && whitespaces[METHOD_NAME].name !== METHOD_NAME);
-    });
-  };
-
-  var $$3 = _export;
-  var $trim = stringTrim.trim;
-  var forcedStringTrimMethod = stringTrimForced;
-
-  // `String.prototype.trim` method
-  // https://tc39.es/ecma262/#sec-string.prototype.trim
-  $$3({ target: 'String', proto: true, forced: forcedStringTrimMethod('trim') }, {
-    trim: function trim() {
-      return $trim(this);
-    }
-  });
-
-  // iterable DOM collections
-  // flag - `iterable` interface - 'entries', 'keys', 'values', 'forEach' methods
-  var domIterables = {
-    CSSRuleList: 0,
-    CSSStyleDeclaration: 0,
-    CSSValueList: 0,
-    ClientRectList: 0,
-    DOMRectList: 0,
-    DOMStringList: 0,
-    DOMTokenList: 1,
-    DataTransferItemList: 0,
-    FileList: 0,
-    HTMLAllCollection: 0,
-    HTMLCollection: 0,
-    HTMLFormElement: 0,
-    HTMLSelectElement: 0,
-    MediaList: 0,
-    MimeTypeArray: 0,
-    NamedNodeMap: 0,
-    NodeList: 1,
-    PaintRequestList: 0,
-    Plugin: 0,
-    PluginArray: 0,
-    SVGLengthList: 0,
-    SVGNumberList: 0,
-    SVGPathSegList: 0,
-    SVGPointList: 0,
-    SVGStringList: 0,
-    SVGTransformList: 0,
-    SourceBufferList: 0,
-    StyleSheetList: 0,
-    TextTrackCueList: 0,
-    TextTrackList: 0,
-    TouchList: 0
-  };
-
-  // in old WebKit versions, `element.classList` is not an instance of global `DOMTokenList`
-  var documentCreateElement = documentCreateElement$2;
-
-  var classList = documentCreateElement('span').classList;
-  var DOMTokenListPrototype$2 = classList && classList.constructor && classList.constructor.prototype;
-
-  var domTokenListPrototype = DOMTokenListPrototype$2 === Object.prototype ? undefined : DOMTokenListPrototype$2;
-
-  var $forEach = arrayIteration.forEach;
-  var arrayMethodIsStrict = arrayMethodIsStrict$4;
-
-  var STRICT_METHOD = arrayMethodIsStrict('forEach');
-
-  // `Array.prototype.forEach` method implementation
-  // https://tc39.es/ecma262/#sec-array.prototype.foreach
-  var arrayForEach = !STRICT_METHOD ? function forEach(callbackfn /* , thisArg */) {
-    return $forEach(this, callbackfn, arguments.length > 1 ? arguments[1] : undefined);
-  // eslint-disable-next-line es/no-array-prototype-foreach -- safe
-  } : [].forEach;
-
-  var global$2 = global$k;
-  var DOMIterables$1 = domIterables;
-  var DOMTokenListPrototype$1 = domTokenListPrototype;
-  var forEach = arrayForEach;
-  var createNonEnumerableProperty$1 = createNonEnumerableProperty$7;
-
-  var handlePrototype$1 = function (CollectionPrototype) {
-    // some Chrome versions have non-configurable methods on DOMTokenList
-    if (CollectionPrototype && CollectionPrototype.forEach !== forEach) try {
-      createNonEnumerableProperty$1(CollectionPrototype, 'forEach', forEach);
-    } catch (error) {
-      CollectionPrototype.forEach = forEach;
-    }
-  };
-
-  for (var COLLECTION_NAME$1 in DOMIterables$1) {
-    if (DOMIterables$1[COLLECTION_NAME$1]) {
-      handlePrototype$1(global$2[COLLECTION_NAME$1] && global$2[COLLECTION_NAME$1].prototype);
-    }
+  requireEs_array_findIndex();
+
+  var es_array_includes = {};
+
+  var hasRequiredEs_array_includes;
+
+  function requireEs_array_includes () {
+  	if (hasRequiredEs_array_includes) return es_array_includes;
+  	hasRequiredEs_array_includes = 1;
+  	var $ = require_export();
+  	var $includes = requireArrayIncludes().includes;
+  	var fails = requireFails();
+  	var addToUnscopables = requireAddToUnscopables();
+
+  	// FF99+ bug
+  	var BROKEN_ON_SPARSE = fails(function () {
+  	  // eslint-disable-next-line es/no-array-prototype-includes -- detection
+  	  return !Array(1).includes();
+  	});
+
+  	// `Array.prototype.includes` method
+  	// https://tc39.es/ecma262/#sec-array.prototype.includes
+  	$({ target: 'Array', proto: true, forced: BROKEN_ON_SPARSE }, {
+  	  includes: function includes(el /* , fromIndex = 0 */) {
+  	    return $includes(this, el, arguments.length > 1 ? arguments[1] : undefined);
+  	  }
+  	});
+
+  	// https://tc39.es/ecma262/#sec-array.prototype-@@unscopables
+  	addToUnscopables('includes');
+  	return es_array_includes;
   }
 
-  handlePrototype$1(DOMTokenListPrototype$1);
+  requireEs_array_includes();
 
-  var global$1 = global$k;
-  var DOMIterables = domIterables;
-  var DOMTokenListPrototype = domTokenListPrototype;
-  var ArrayIteratorMethods = es_array_iterator;
-  var createNonEnumerableProperty = createNonEnumerableProperty$7;
-  var setToStringTag = setToStringTag$3;
-  var wellKnownSymbol = wellKnownSymbol$j;
+  var es_array_indexOf = {};
 
-  var ITERATOR = wellKnownSymbol('iterator');
-  var ArrayValues = ArrayIteratorMethods.values;
+  var arrayMethodIsStrict;
+  var hasRequiredArrayMethodIsStrict;
 
-  var handlePrototype = function (CollectionPrototype, COLLECTION_NAME) {
-    if (CollectionPrototype) {
-      // some Chrome versions have non-configurable methods on DOMTokenList
-      if (CollectionPrototype[ITERATOR] !== ArrayValues) try {
-        createNonEnumerableProperty(CollectionPrototype, ITERATOR, ArrayValues);
-      } catch (error) {
-        CollectionPrototype[ITERATOR] = ArrayValues;
-      }
-      setToStringTag(CollectionPrototype, COLLECTION_NAME, true);
-      if (DOMIterables[COLLECTION_NAME]) for (var METHOD_NAME in ArrayIteratorMethods) {
-        // some Chrome versions have non-configurable methods on DOMTokenList
-        if (CollectionPrototype[METHOD_NAME] !== ArrayIteratorMethods[METHOD_NAME]) try {
-          createNonEnumerableProperty(CollectionPrototype, METHOD_NAME, ArrayIteratorMethods[METHOD_NAME]);
-        } catch (error) {
-          CollectionPrototype[METHOD_NAME] = ArrayIteratorMethods[METHOD_NAME];
-        }
-      }
-    }
-  };
+  function requireArrayMethodIsStrict () {
+  	if (hasRequiredArrayMethodIsStrict) return arrayMethodIsStrict;
+  	hasRequiredArrayMethodIsStrict = 1;
+  	var fails = requireFails();
 
-  for (var COLLECTION_NAME in DOMIterables) {
-    handlePrototype(global$1[COLLECTION_NAME] && global$1[COLLECTION_NAME].prototype, COLLECTION_NAME);
+  	arrayMethodIsStrict = function (METHOD_NAME, argument) {
+  	  var method = [][METHOD_NAME];
+  	  return !!method && fails(function () {
+  	    // eslint-disable-next-line no-useless-call -- required for testing
+  	    method.call(null, argument || function () { return 1; }, 1);
+  	  });
+  	};
+  	return arrayMethodIsStrict;
   }
 
-  handlePrototype(DOMTokenListPrototype, 'DOMTokenList');
+  var hasRequiredEs_array_indexOf;
 
-  var $$2 = _export;
-  var fails = fails$x;
-  var toObject = toObject$b;
-  var nativeGetPrototypeOf = objectGetPrototypeOf$1;
-  var CORRECT_PROTOTYPE_GETTER = correctPrototypeGetter;
+  function requireEs_array_indexOf () {
+  	if (hasRequiredEs_array_indexOf) return es_array_indexOf;
+  	hasRequiredEs_array_indexOf = 1;
+  	/* eslint-disable es/no-array-prototype-indexof -- required for testing */
+  	var $ = require_export();
+  	var uncurryThis = requireFunctionUncurryThisClause();
+  	var $indexOf = requireArrayIncludes().indexOf;
+  	var arrayMethodIsStrict = requireArrayMethodIsStrict();
 
-  var FAILS_ON_PRIMITIVES = fails(function () { nativeGetPrototypeOf(1); });
+  	var nativeIndexOf = uncurryThis([].indexOf);
 
-  // `Object.getPrototypeOf` method
-  // https://tc39.es/ecma262/#sec-object.getprototypeof
-  $$2({ target: 'Object', stat: true, forced: FAILS_ON_PRIMITIVES, sham: !CORRECT_PROTOTYPE_GETTER }, {
-    getPrototypeOf: function getPrototypeOf(it) {
-      return nativeGetPrototypeOf(toObject(it));
-    }
-  });
+  	var NEGATIVE_ZERO = !!nativeIndexOf && 1 / nativeIndexOf([1], 1, -0) < 0;
+  	var FORCED = NEGATIVE_ZERO || !arrayMethodIsStrict('indexOf');
 
-  var $$1 = _export;
-  var uncurryThis$1 = functionUncurryThisClause;
-  var getOwnPropertyDescriptor$1 = objectGetOwnPropertyDescriptor.f;
-  var toLength$2 = toLength$6;
-  var toString$2 = toString$f;
-  var notARegExp$1 = notARegexp;
-  var requireObjectCoercible$2 = requireObjectCoercible$c;
-  var correctIsRegExpLogic$1 = correctIsRegexpLogic;
+  	// `Array.prototype.indexOf` method
+  	// https://tc39.es/ecma262/#sec-array.prototype.indexof
+  	$({ target: 'Array', proto: true, forced: FORCED }, {
+  	  indexOf: function indexOf(searchElement /* , fromIndex = 0 */) {
+  	    var fromIndex = arguments.length > 1 ? arguments[1] : undefined;
+  	    return NEGATIVE_ZERO
+  	      // convert -0 to +0
+  	      ? nativeIndexOf(this, searchElement, fromIndex) || 0
+  	      : $indexOf(this, searchElement, fromIndex);
+  	  }
+  	});
+  	return es_array_indexOf;
+  }
 
-  var slice = uncurryThis$1(''.slice);
-  var min$1 = Math.min;
+  requireEs_array_indexOf();
 
-  var CORRECT_IS_REGEXP_LOGIC$1 = correctIsRegExpLogic$1('endsWith');
-  // https://github.com/zloirock/core-js/pull/702
-  var MDN_POLYFILL_BUG$1 = !CORRECT_IS_REGEXP_LOGIC$1 && !!function () {
-    var descriptor = getOwnPropertyDescriptor$1(String.prototype, 'endsWith');
-    return descriptor && !descriptor.writable;
-  }();
+  var iterators;
+  var hasRequiredIterators;
 
-  // `String.prototype.endsWith` method
-  // https://tc39.es/ecma262/#sec-string.prototype.endswith
-  $$1({ target: 'String', proto: true, forced: !MDN_POLYFILL_BUG$1 && !CORRECT_IS_REGEXP_LOGIC$1 }, {
-    endsWith: function endsWith(searchString /* , endPosition = @length */) {
-      var that = toString$2(requireObjectCoercible$2(this));
-      notARegExp$1(searchString);
-      var endPosition = arguments.length > 1 ? arguments[1] : undefined;
-      var len = that.length;
-      var end = endPosition === undefined ? len : min$1(toLength$2(endPosition), len);
-      var search = toString$2(searchString);
-      return slice(that, end - search.length, end) === search;
-    }
-  });
+  function requireIterators () {
+  	if (hasRequiredIterators) return iterators;
+  	hasRequiredIterators = 1;
+  	iterators = {};
+  	return iterators;
+  }
 
-  var call = functionCall;
-  var fixRegExpWellKnownSymbolLogic = fixRegexpWellKnownSymbolLogic;
-  var anObject = anObject$c;
-  var isNullOrUndefined = isNullOrUndefined$7;
-  var toLength$1 = toLength$6;
-  var toString$1 = toString$f;
-  var requireObjectCoercible$1 = requireObjectCoercible$c;
-  var getMethod = getMethod$5;
-  var advanceStringIndex = advanceStringIndex$3;
-  var regExpExec = regexpExecAbstract;
+  var correctPrototypeGetter;
+  var hasRequiredCorrectPrototypeGetter;
 
-  // @@match logic
-  fixRegExpWellKnownSymbolLogic('match', function (MATCH, nativeMatch, maybeCallNative) {
-    return [
-      // `String.prototype.match` method
-      // https://tc39.es/ecma262/#sec-string.prototype.match
-      function match(regexp) {
-        var O = requireObjectCoercible$1(this);
-        var matcher = isNullOrUndefined(regexp) ? undefined : getMethod(regexp, MATCH);
-        return matcher ? call(matcher, regexp, O) : new RegExp(regexp)[MATCH](toString$1(O));
-      },
-      // `RegExp.prototype[@@match]` method
-      // https://tc39.es/ecma262/#sec-regexp.prototype-@@match
-      function (string) {
-        var rx = anObject(this);
-        var S = toString$1(string);
-        var res = maybeCallNative(nativeMatch, rx, S);
+  function requireCorrectPrototypeGetter () {
+  	if (hasRequiredCorrectPrototypeGetter) return correctPrototypeGetter;
+  	hasRequiredCorrectPrototypeGetter = 1;
+  	var fails = requireFails();
 
-        if (res.done) return res.value;
+  	correctPrototypeGetter = !fails(function () {
+  	  function F() { /* empty */ }
+  	  F.prototype.constructor = null;
+  	  // eslint-disable-next-line es/no-object-getprototypeof -- required for testing
+  	  return Object.getPrototypeOf(new F()) !== F.prototype;
+  	});
+  	return correctPrototypeGetter;
+  }
 
-        if (!rx.global) return regExpExec(rx, S);
+  var objectGetPrototypeOf;
+  var hasRequiredObjectGetPrototypeOf;
 
-        var fullUnicode = rx.unicode;
-        rx.lastIndex = 0;
-        var A = [];
-        var n = 0;
-        var result;
-        while ((result = regExpExec(rx, S)) !== null) {
-          var matchStr = toString$1(result[0]);
-          A[n] = matchStr;
-          if (matchStr === '') rx.lastIndex = advanceStringIndex(S, toLength$1(rx.lastIndex), fullUnicode);
-          n++;
-        }
-        return n === 0 ? null : A;
-      }
-    ];
-  });
+  function requireObjectGetPrototypeOf () {
+  	if (hasRequiredObjectGetPrototypeOf) return objectGetPrototypeOf;
+  	hasRequiredObjectGetPrototypeOf = 1;
+  	var hasOwn = requireHasOwnProperty();
+  	var isCallable = requireIsCallable();
+  	var toObject = requireToObject();
+  	var sharedKey = requireSharedKey();
+  	var CORRECT_PROTOTYPE_GETTER = requireCorrectPrototypeGetter();
 
-  var $ = _export;
-  var uncurryThis = functionUncurryThisClause;
-  var getOwnPropertyDescriptor = objectGetOwnPropertyDescriptor.f;
-  var toLength = toLength$6;
-  var toString = toString$f;
-  var notARegExp = notARegexp;
-  var requireObjectCoercible = requireObjectCoercible$c;
-  var correctIsRegExpLogic = correctIsRegexpLogic;
+  	var IE_PROTO = sharedKey('IE_PROTO');
+  	var $Object = Object;
+  	var ObjectPrototype = $Object.prototype;
 
-  var stringSlice = uncurryThis(''.slice);
-  var min = Math.min;
+  	// `Object.getPrototypeOf` method
+  	// https://tc39.es/ecma262/#sec-object.getprototypeof
+  	// eslint-disable-next-line es/no-object-getprototypeof -- safe
+  	objectGetPrototypeOf = CORRECT_PROTOTYPE_GETTER ? $Object.getPrototypeOf : function (O) {
+  	  var object = toObject(O);
+  	  if (hasOwn(object, IE_PROTO)) return object[IE_PROTO];
+  	  var constructor = object.constructor;
+  	  if (isCallable(constructor) && object instanceof constructor) {
+  	    return constructor.prototype;
+  	  } return object instanceof $Object ? ObjectPrototype : null;
+  	};
+  	return objectGetPrototypeOf;
+  }
 
-  var CORRECT_IS_REGEXP_LOGIC = correctIsRegExpLogic('startsWith');
-  // https://github.com/zloirock/core-js/pull/702
-  var MDN_POLYFILL_BUG = !CORRECT_IS_REGEXP_LOGIC && !!function () {
-    var descriptor = getOwnPropertyDescriptor(String.prototype, 'startsWith');
-    return descriptor && !descriptor.writable;
-  }();
+  var iteratorsCore;
+  var hasRequiredIteratorsCore;
 
-  // `String.prototype.startsWith` method
-  // https://tc39.es/ecma262/#sec-string.prototype.startswith
-  $({ target: 'String', proto: true, forced: !MDN_POLYFILL_BUG && !CORRECT_IS_REGEXP_LOGIC }, {
-    startsWith: function startsWith(searchString /* , position = 0 */) {
-      var that = toString(requireObjectCoercible(this));
-      notARegExp(searchString);
-      var index = toLength(min(arguments.length > 1 ? arguments[1] : undefined, that.length));
-      var search = toString(searchString);
-      return stringSlice(that, index, index + search.length) === search;
-    }
-  });
+  function requireIteratorsCore () {
+  	if (hasRequiredIteratorsCore) return iteratorsCore;
+  	hasRequiredIteratorsCore = 1;
+  	var fails = requireFails();
+  	var isCallable = requireIsCallable();
+  	var isObject = requireIsObject();
+  	var create = requireObjectCreate();
+  	var getPrototypeOf = requireObjectGetPrototypeOf();
+  	var defineBuiltIn = requireDefineBuiltIn();
+  	var wellKnownSymbol = requireWellKnownSymbol();
+  	var IS_PURE = requireIsPure();
+
+  	var ITERATOR = wellKnownSymbol('iterator');
+  	var BUGGY_SAFARI_ITERATORS = false;
+
+  	// `%IteratorPrototype%` object
+  	// https://tc39.es/ecma262/#sec-%iteratorprototype%-object
+  	var IteratorPrototype, PrototypeOfArrayIteratorPrototype, arrayIterator;
+
+  	/* eslint-disable es/no-array-prototype-keys -- safe */
+  	if ([].keys) {
+  	  arrayIterator = [].keys();
+  	  // Safari 8 has buggy iterators w/o `next`
+  	  if (!('next' in arrayIterator)) BUGGY_SAFARI_ITERATORS = true;
+  	  else {
+  	    PrototypeOfArrayIteratorPrototype = getPrototypeOf(getPrototypeOf(arrayIterator));
+  	    if (PrototypeOfArrayIteratorPrototype !== Object.prototype) IteratorPrototype = PrototypeOfArrayIteratorPrototype;
+  	  }
+  	}
+
+  	var NEW_ITERATOR_PROTOTYPE = !isObject(IteratorPrototype) || fails(function () {
+  	  var test = {};
+  	  // FF44- legacy iterators case
+  	  return IteratorPrototype[ITERATOR].call(test) !== test;
+  	});
+
+  	if (NEW_ITERATOR_PROTOTYPE) IteratorPrototype = {};
+  	else if (IS_PURE) IteratorPrototype = create(IteratorPrototype);
+
+  	// `%IteratorPrototype%[@@iterator]()` method
+  	// https://tc39.es/ecma262/#sec-%iteratorprototype%-@@iterator
+  	if (!isCallable(IteratorPrototype[ITERATOR])) {
+  	  defineBuiltIn(IteratorPrototype, ITERATOR, function () {
+  	    return this;
+  	  });
+  	}
+
+  	iteratorsCore = {
+  	  IteratorPrototype: IteratorPrototype,
+  	  BUGGY_SAFARI_ITERATORS: BUGGY_SAFARI_ITERATORS
+  	};
+  	return iteratorsCore;
+  }
+
+  var setToStringTag;
+  var hasRequiredSetToStringTag;
+
+  function requireSetToStringTag () {
+  	if (hasRequiredSetToStringTag) return setToStringTag;
+  	hasRequiredSetToStringTag = 1;
+  	var defineProperty = requireObjectDefineProperty().f;
+  	var hasOwn = requireHasOwnProperty();
+  	var wellKnownSymbol = requireWellKnownSymbol();
+
+  	var TO_STRING_TAG = wellKnownSymbol('toStringTag');
+
+  	setToStringTag = function (target, TAG, STATIC) {
+  	  if (target && !STATIC) target = target.prototype;
+  	  if (target && !hasOwn(target, TO_STRING_TAG)) {
+  	    defineProperty(target, TO_STRING_TAG, { configurable: true, value: TAG });
+  	  }
+  	};
+  	return setToStringTag;
+  }
+
+  var iteratorCreateConstructor;
+  var hasRequiredIteratorCreateConstructor;
+
+  function requireIteratorCreateConstructor () {
+  	if (hasRequiredIteratorCreateConstructor) return iteratorCreateConstructor;
+  	hasRequiredIteratorCreateConstructor = 1;
+  	var IteratorPrototype = requireIteratorsCore().IteratorPrototype;
+  	var create = requireObjectCreate();
+  	var createPropertyDescriptor = requireCreatePropertyDescriptor();
+  	var setToStringTag = requireSetToStringTag();
+  	var Iterators = requireIterators();
+
+  	var returnThis = function () { return this; };
+
+  	iteratorCreateConstructor = function (IteratorConstructor, NAME, next, ENUMERABLE_NEXT) {
+  	  var TO_STRING_TAG = NAME + ' Iterator';
+  	  IteratorConstructor.prototype = create(IteratorPrototype, { next: createPropertyDescriptor(+!ENUMERABLE_NEXT, next) });
+  	  setToStringTag(IteratorConstructor, TO_STRING_TAG, false, true);
+  	  Iterators[TO_STRING_TAG] = returnThis;
+  	  return IteratorConstructor;
+  	};
+  	return iteratorCreateConstructor;
+  }
+
+  var functionUncurryThisAccessor;
+  var hasRequiredFunctionUncurryThisAccessor;
+
+  function requireFunctionUncurryThisAccessor () {
+  	if (hasRequiredFunctionUncurryThisAccessor) return functionUncurryThisAccessor;
+  	hasRequiredFunctionUncurryThisAccessor = 1;
+  	var uncurryThis = requireFunctionUncurryThis();
+  	var aCallable = requireACallable();
+
+  	functionUncurryThisAccessor = function (object, key, method) {
+  	  try {
+  	    // eslint-disable-next-line es/no-object-getownpropertydescriptor -- safe
+  	    return uncurryThis(aCallable(Object.getOwnPropertyDescriptor(object, key)[method]));
+  	  } catch (error) { /* empty */ }
+  	};
+  	return functionUncurryThisAccessor;
+  }
+
+  var isPossiblePrototype;
+  var hasRequiredIsPossiblePrototype;
+
+  function requireIsPossiblePrototype () {
+  	if (hasRequiredIsPossiblePrototype) return isPossiblePrototype;
+  	hasRequiredIsPossiblePrototype = 1;
+  	var isObject = requireIsObject();
+
+  	isPossiblePrototype = function (argument) {
+  	  return isObject(argument) || argument === null;
+  	};
+  	return isPossiblePrototype;
+  }
+
+  var aPossiblePrototype;
+  var hasRequiredAPossiblePrototype;
+
+  function requireAPossiblePrototype () {
+  	if (hasRequiredAPossiblePrototype) return aPossiblePrototype;
+  	hasRequiredAPossiblePrototype = 1;
+  	var isPossiblePrototype = requireIsPossiblePrototype();
+
+  	var $String = String;
+  	var $TypeError = TypeError;
+
+  	aPossiblePrototype = function (argument) {
+  	  if (isPossiblePrototype(argument)) return argument;
+  	  throw new $TypeError("Can't set " + $String(argument) + ' as a prototype');
+  	};
+  	return aPossiblePrototype;
+  }
+
+  var objectSetPrototypeOf;
+  var hasRequiredObjectSetPrototypeOf;
+
+  function requireObjectSetPrototypeOf () {
+  	if (hasRequiredObjectSetPrototypeOf) return objectSetPrototypeOf;
+  	hasRequiredObjectSetPrototypeOf = 1;
+  	/* eslint-disable no-proto -- safe */
+  	var uncurryThisAccessor = requireFunctionUncurryThisAccessor();
+  	var isObject = requireIsObject();
+  	var requireObjectCoercible = requireRequireObjectCoercible();
+  	var aPossiblePrototype = requireAPossiblePrototype();
+
+  	// `Object.setPrototypeOf` method
+  	// https://tc39.es/ecma262/#sec-object.setprototypeof
+  	// Works with __proto__ only. Old v8 can't work with null proto objects.
+  	// eslint-disable-next-line es/no-object-setprototypeof -- safe
+  	objectSetPrototypeOf = Object.setPrototypeOf || ('__proto__' in {} ? function () {
+  	  var CORRECT_SETTER = false;
+  	  var test = {};
+  	  var setter;
+  	  try {
+  	    setter = uncurryThisAccessor(Object.prototype, '__proto__', 'set');
+  	    setter(test, []);
+  	    CORRECT_SETTER = test instanceof Array;
+  	  } catch (error) { /* empty */ }
+  	  return function setPrototypeOf(O, proto) {
+  	    requireObjectCoercible(O);
+  	    aPossiblePrototype(proto);
+  	    if (!isObject(O)) return O;
+  	    if (CORRECT_SETTER) setter(O, proto);
+  	    else O.__proto__ = proto;
+  	    return O;
+  	  };
+  	}() : undefined);
+  	return objectSetPrototypeOf;
+  }
+
+  var iteratorDefine;
+  var hasRequiredIteratorDefine;
+
+  function requireIteratorDefine () {
+  	if (hasRequiredIteratorDefine) return iteratorDefine;
+  	hasRequiredIteratorDefine = 1;
+  	var $ = require_export();
+  	var call = requireFunctionCall();
+  	var IS_PURE = requireIsPure();
+  	var FunctionName = requireFunctionName();
+  	var isCallable = requireIsCallable();
+  	var createIteratorConstructor = requireIteratorCreateConstructor();
+  	var getPrototypeOf = requireObjectGetPrototypeOf();
+  	var setPrototypeOf = requireObjectSetPrototypeOf();
+  	var setToStringTag = requireSetToStringTag();
+  	var createNonEnumerableProperty = requireCreateNonEnumerableProperty();
+  	var defineBuiltIn = requireDefineBuiltIn();
+  	var wellKnownSymbol = requireWellKnownSymbol();
+  	var Iterators = requireIterators();
+  	var IteratorsCore = requireIteratorsCore();
+
+  	var PROPER_FUNCTION_NAME = FunctionName.PROPER;
+  	var CONFIGURABLE_FUNCTION_NAME = FunctionName.CONFIGURABLE;
+  	var IteratorPrototype = IteratorsCore.IteratorPrototype;
+  	var BUGGY_SAFARI_ITERATORS = IteratorsCore.BUGGY_SAFARI_ITERATORS;
+  	var ITERATOR = wellKnownSymbol('iterator');
+  	var KEYS = 'keys';
+  	var VALUES = 'values';
+  	var ENTRIES = 'entries';
+
+  	var returnThis = function () { return this; };
+
+  	iteratorDefine = function (Iterable, NAME, IteratorConstructor, next, DEFAULT, IS_SET, FORCED) {
+  	  createIteratorConstructor(IteratorConstructor, NAME, next);
+
+  	  var getIterationMethod = function (KIND) {
+  	    if (KIND === DEFAULT && defaultIterator) return defaultIterator;
+  	    if (!BUGGY_SAFARI_ITERATORS && KIND && KIND in IterablePrototype) return IterablePrototype[KIND];
+
+  	    switch (KIND) {
+  	      case KEYS: return function keys() { return new IteratorConstructor(this, KIND); };
+  	      case VALUES: return function values() { return new IteratorConstructor(this, KIND); };
+  	      case ENTRIES: return function entries() { return new IteratorConstructor(this, KIND); };
+  	    }
+
+  	    return function () { return new IteratorConstructor(this); };
+  	  };
+
+  	  var TO_STRING_TAG = NAME + ' Iterator';
+  	  var INCORRECT_VALUES_NAME = false;
+  	  var IterablePrototype = Iterable.prototype;
+  	  var nativeIterator = IterablePrototype[ITERATOR]
+  	    || IterablePrototype['@@iterator']
+  	    || DEFAULT && IterablePrototype[DEFAULT];
+  	  var defaultIterator = !BUGGY_SAFARI_ITERATORS && nativeIterator || getIterationMethod(DEFAULT);
+  	  var anyNativeIterator = NAME === 'Array' ? IterablePrototype.entries || nativeIterator : nativeIterator;
+  	  var CurrentIteratorPrototype, methods, KEY;
+
+  	  // fix native
+  	  if (anyNativeIterator) {
+  	    CurrentIteratorPrototype = getPrototypeOf(anyNativeIterator.call(new Iterable()));
+  	    if (CurrentIteratorPrototype !== Object.prototype && CurrentIteratorPrototype.next) {
+  	      if (!IS_PURE && getPrototypeOf(CurrentIteratorPrototype) !== IteratorPrototype) {
+  	        if (setPrototypeOf) {
+  	          setPrototypeOf(CurrentIteratorPrototype, IteratorPrototype);
+  	        } else if (!isCallable(CurrentIteratorPrototype[ITERATOR])) {
+  	          defineBuiltIn(CurrentIteratorPrototype, ITERATOR, returnThis);
+  	        }
+  	      }
+  	      // Set @@toStringTag to native iterators
+  	      setToStringTag(CurrentIteratorPrototype, TO_STRING_TAG, true, true);
+  	      if (IS_PURE) Iterators[TO_STRING_TAG] = returnThis;
+  	    }
+  	  }
+
+  	  // fix Array.prototype.{ values, @@iterator }.name in V8 / FF
+  	  if (PROPER_FUNCTION_NAME && DEFAULT === VALUES && nativeIterator && nativeIterator.name !== VALUES) {
+  	    if (!IS_PURE && CONFIGURABLE_FUNCTION_NAME) {
+  	      createNonEnumerableProperty(IterablePrototype, 'name', VALUES);
+  	    } else {
+  	      INCORRECT_VALUES_NAME = true;
+  	      defaultIterator = function values() { return call(nativeIterator, this); };
+  	    }
+  	  }
+
+  	  // export additional methods
+  	  if (DEFAULT) {
+  	    methods = {
+  	      values: getIterationMethod(VALUES),
+  	      keys: IS_SET ? defaultIterator : getIterationMethod(KEYS),
+  	      entries: getIterationMethod(ENTRIES)
+  	    };
+  	    if (FORCED) for (KEY in methods) {
+  	      if (BUGGY_SAFARI_ITERATORS || INCORRECT_VALUES_NAME || !(KEY in IterablePrototype)) {
+  	        defineBuiltIn(IterablePrototype, KEY, methods[KEY]);
+  	      }
+  	    } else $({ target: NAME, proto: true, forced: BUGGY_SAFARI_ITERATORS || INCORRECT_VALUES_NAME }, methods);
+  	  }
+
+  	  // define iterator
+  	  if ((!IS_PURE || FORCED) && IterablePrototype[ITERATOR] !== defaultIterator) {
+  	    defineBuiltIn(IterablePrototype, ITERATOR, defaultIterator, { name: DEFAULT });
+  	  }
+  	  Iterators[NAME] = defaultIterator;
+
+  	  return methods;
+  	};
+  	return iteratorDefine;
+  }
+
+  var createIterResultObject;
+  var hasRequiredCreateIterResultObject;
+
+  function requireCreateIterResultObject () {
+  	if (hasRequiredCreateIterResultObject) return createIterResultObject;
+  	hasRequiredCreateIterResultObject = 1;
+  	// `CreateIterResultObject` abstract operation
+  	// https://tc39.es/ecma262/#sec-createiterresultobject
+  	createIterResultObject = function (value, done) {
+  	  return { value: value, done: done };
+  	};
+  	return createIterResultObject;
+  }
+
+  var es_array_iterator;
+  var hasRequiredEs_array_iterator;
+
+  function requireEs_array_iterator () {
+  	if (hasRequiredEs_array_iterator) return es_array_iterator;
+  	hasRequiredEs_array_iterator = 1;
+  	var toIndexedObject = requireToIndexedObject();
+  	var addToUnscopables = requireAddToUnscopables();
+  	var Iterators = requireIterators();
+  	var InternalStateModule = requireInternalState();
+  	var defineProperty = requireObjectDefineProperty().f;
+  	var defineIterator = requireIteratorDefine();
+  	var createIterResultObject = requireCreateIterResultObject();
+  	var IS_PURE = requireIsPure();
+  	var DESCRIPTORS = requireDescriptors();
+
+  	var ARRAY_ITERATOR = 'Array Iterator';
+  	var setInternalState = InternalStateModule.set;
+  	var getInternalState = InternalStateModule.getterFor(ARRAY_ITERATOR);
+
+  	// `Array.prototype.entries` method
+  	// https://tc39.es/ecma262/#sec-array.prototype.entries
+  	// `Array.prototype.keys` method
+  	// https://tc39.es/ecma262/#sec-array.prototype.keys
+  	// `Array.prototype.values` method
+  	// https://tc39.es/ecma262/#sec-array.prototype.values
+  	// `Array.prototype[@@iterator]` method
+  	// https://tc39.es/ecma262/#sec-array.prototype-@@iterator
+  	// `CreateArrayIterator` internal method
+  	// https://tc39.es/ecma262/#sec-createarrayiterator
+  	es_array_iterator = defineIterator(Array, 'Array', function (iterated, kind) {
+  	  setInternalState(this, {
+  	    type: ARRAY_ITERATOR,
+  	    target: toIndexedObject(iterated), // target
+  	    index: 0,                          // next index
+  	    kind: kind                         // kind
+  	  });
+  	// `%ArrayIteratorPrototype%.next` method
+  	// https://tc39.es/ecma262/#sec-%arrayiteratorprototype%.next
+  	}, function () {
+  	  var state = getInternalState(this);
+  	  var target = state.target;
+  	  var index = state.index++;
+  	  if (!target || index >= target.length) {
+  	    state.target = null;
+  	    return createIterResultObject(undefined, true);
+  	  }
+  	  switch (state.kind) {
+  	    case 'keys': return createIterResultObject(index, false);
+  	    case 'values': return createIterResultObject(target[index], false);
+  	  } return createIterResultObject([index, target[index]], false);
+  	}, 'values');
+
+  	// argumentsList[@@iterator] is %ArrayProto_values%
+  	// https://tc39.es/ecma262/#sec-createunmappedargumentsobject
+  	// https://tc39.es/ecma262/#sec-createmappedargumentsobject
+  	var values = Iterators.Arguments = Iterators.Array;
+
+  	// https://tc39.es/ecma262/#sec-array.prototype-@@unscopables
+  	addToUnscopables('keys');
+  	addToUnscopables('values');
+  	addToUnscopables('entries');
+
+  	// V8 ~ Chrome 45- bug
+  	if (!IS_PURE && DESCRIPTORS && values.name !== 'values') try {
+  	  defineProperty(values, 'name', { value: 'values' });
+  	} catch (error) { /* empty */ }
+  	return es_array_iterator;
+  }
+
+  requireEs_array_iterator();
+
+  var es_array_join = {};
+
+  var hasRequiredEs_array_join;
+
+  function requireEs_array_join () {
+  	if (hasRequiredEs_array_join) return es_array_join;
+  	hasRequiredEs_array_join = 1;
+  	var $ = require_export();
+  	var uncurryThis = requireFunctionUncurryThis();
+  	var IndexedObject = requireIndexedObject();
+  	var toIndexedObject = requireToIndexedObject();
+  	var arrayMethodIsStrict = requireArrayMethodIsStrict();
+
+  	var nativeJoin = uncurryThis([].join);
+
+  	var ES3_STRINGS = IndexedObject !== Object;
+  	var FORCED = ES3_STRINGS || !arrayMethodIsStrict('join', ',');
+
+  	// `Array.prototype.join` method
+  	// https://tc39.es/ecma262/#sec-array.prototype.join
+  	$({ target: 'Array', proto: true, forced: FORCED }, {
+  	  join: function join(separator) {
+  	    return nativeJoin(toIndexedObject(this), separator === undefined ? ',' : separator);
+  	  }
+  	});
+  	return es_array_join;
+  }
+
+  requireEs_array_join();
+
+  var es_array_map = {};
+
+  var hasRequiredEs_array_map;
+
+  function requireEs_array_map () {
+  	if (hasRequiredEs_array_map) return es_array_map;
+  	hasRequiredEs_array_map = 1;
+  	var $ = require_export();
+  	var $map = requireArrayIteration().map;
+  	var arrayMethodHasSpeciesSupport = requireArrayMethodHasSpeciesSupport();
+
+  	var HAS_SPECIES_SUPPORT = arrayMethodHasSpeciesSupport('map');
+
+  	// `Array.prototype.map` method
+  	// https://tc39.es/ecma262/#sec-array.prototype.map
+  	// with adding support of @@species
+  	$({ target: 'Array', proto: true, forced: !HAS_SPECIES_SUPPORT }, {
+  	  map: function map(callbackfn /* , thisArg */) {
+  	    return $map(this, callbackfn, arguments.length > 1 ? arguments[1] : undefined);
+  	  }
+  	});
+  	return es_array_map;
+  }
+
+  requireEs_array_map();
+
+  var es_array_reverse = {};
+
+  var hasRequiredEs_array_reverse;
+
+  function requireEs_array_reverse () {
+  	if (hasRequiredEs_array_reverse) return es_array_reverse;
+  	hasRequiredEs_array_reverse = 1;
+  	var $ = require_export();
+  	var uncurryThis = requireFunctionUncurryThis();
+  	var isArray = requireIsArray();
+
+  	var nativeReverse = uncurryThis([].reverse);
+  	var test = [1, 2];
+
+  	// `Array.prototype.reverse` method
+  	// https://tc39.es/ecma262/#sec-array.prototype.reverse
+  	// fix for Safari 12.0 bug
+  	// https://bugs.webkit.org/show_bug.cgi?id=188794
+  	$({ target: 'Array', proto: true, forced: String(test) === String(test.reverse()) }, {
+  	  reverse: function reverse() {
+  	    // eslint-disable-next-line no-self-assign -- dirty hack
+  	    if (isArray(this)) this.length = this.length;
+  	    return nativeReverse(this);
+  	  }
+  	});
+  	return es_array_reverse;
+  }
+
+  requireEs_array_reverse();
+
+  var es_array_slice = {};
+
+  var arraySlice;
+  var hasRequiredArraySlice;
+
+  function requireArraySlice () {
+  	if (hasRequiredArraySlice) return arraySlice;
+  	hasRequiredArraySlice = 1;
+  	var uncurryThis = requireFunctionUncurryThis();
+
+  	arraySlice = uncurryThis([].slice);
+  	return arraySlice;
+  }
+
+  var hasRequiredEs_array_slice;
+
+  function requireEs_array_slice () {
+  	if (hasRequiredEs_array_slice) return es_array_slice;
+  	hasRequiredEs_array_slice = 1;
+  	var $ = require_export();
+  	var isArray = requireIsArray();
+  	var isConstructor = requireIsConstructor();
+  	var isObject = requireIsObject();
+  	var toAbsoluteIndex = requireToAbsoluteIndex();
+  	var lengthOfArrayLike = requireLengthOfArrayLike();
+  	var toIndexedObject = requireToIndexedObject();
+  	var createProperty = requireCreateProperty();
+  	var wellKnownSymbol = requireWellKnownSymbol();
+  	var arrayMethodHasSpeciesSupport = requireArrayMethodHasSpeciesSupport();
+  	var nativeSlice = requireArraySlice();
+
+  	var HAS_SPECIES_SUPPORT = arrayMethodHasSpeciesSupport('slice');
+
+  	var SPECIES = wellKnownSymbol('species');
+  	var $Array = Array;
+  	var max = Math.max;
+
+  	// `Array.prototype.slice` method
+  	// https://tc39.es/ecma262/#sec-array.prototype.slice
+  	// fallback for not array-like ES3 strings and DOM objects
+  	$({ target: 'Array', proto: true, forced: !HAS_SPECIES_SUPPORT }, {
+  	  slice: function slice(start, end) {
+  	    var O = toIndexedObject(this);
+  	    var length = lengthOfArrayLike(O);
+  	    var k = toAbsoluteIndex(start, length);
+  	    var fin = toAbsoluteIndex(end === undefined ? length : end, length);
+  	    // inline `ArraySpeciesCreate` for usage native `Array#slice` where it's possible
+  	    var Constructor, result, n;
+  	    if (isArray(O)) {
+  	      Constructor = O.constructor;
+  	      // cross-realm fallback
+  	      if (isConstructor(Constructor) && (Constructor === $Array || isArray(Constructor.prototype))) {
+  	        Constructor = undefined;
+  	      } else if (isObject(Constructor)) {
+  	        Constructor = Constructor[SPECIES];
+  	        if (Constructor === null) Constructor = undefined;
+  	      }
+  	      if (Constructor === $Array || Constructor === undefined) {
+  	        return nativeSlice(O, k, fin);
+  	      }
+  	    }
+  	    result = new (Constructor === undefined ? $Array : Constructor)(max(fin - k, 0));
+  	    for (n = 0; k < fin; k++, n++) if (k in O) createProperty(result, n, O[k]);
+  	    result.length = n;
+  	    return result;
+  	  }
+  	});
+  	return es_array_slice;
+  }
+
+  requireEs_array_slice();
+
+  var es_array_sort = {};
+
+  var deletePropertyOrThrow;
+  var hasRequiredDeletePropertyOrThrow;
+
+  function requireDeletePropertyOrThrow () {
+  	if (hasRequiredDeletePropertyOrThrow) return deletePropertyOrThrow;
+  	hasRequiredDeletePropertyOrThrow = 1;
+  	var tryToString = requireTryToString();
+
+  	var $TypeError = TypeError;
+
+  	deletePropertyOrThrow = function (O, P) {
+  	  if (!delete O[P]) throw new $TypeError('Cannot delete property ' + tryToString(P) + ' of ' + tryToString(O));
+  	};
+  	return deletePropertyOrThrow;
+  }
+
+  var toString;
+  var hasRequiredToString;
+
+  function requireToString () {
+  	if (hasRequiredToString) return toString;
+  	hasRequiredToString = 1;
+  	var classof = requireClassof();
+
+  	var $String = String;
+
+  	toString = function (argument) {
+  	  if (classof(argument) === 'Symbol') throw new TypeError('Cannot convert a Symbol value to a string');
+  	  return $String(argument);
+  	};
+  	return toString;
+  }
+
+  var arraySort;
+  var hasRequiredArraySort;
+
+  function requireArraySort () {
+  	if (hasRequiredArraySort) return arraySort;
+  	hasRequiredArraySort = 1;
+  	var arraySlice = requireArraySlice();
+
+  	var floor = Math.floor;
+
+  	var sort = function (array, comparefn) {
+  	  var length = array.length;
+
+  	  if (length < 8) {
+  	    // insertion sort
+  	    var i = 1;
+  	    var element, j;
+
+  	    while (i < length) {
+  	      j = i;
+  	      element = array[i];
+  	      while (j && comparefn(array[j - 1], element) > 0) {
+  	        array[j] = array[--j];
+  	      }
+  	      if (j !== i++) array[j] = element;
+  	    }
+  	  } else {
+  	    // merge sort
+  	    var middle = floor(length / 2);
+  	    var left = sort(arraySlice(array, 0, middle), comparefn);
+  	    var right = sort(arraySlice(array, middle), comparefn);
+  	    var llength = left.length;
+  	    var rlength = right.length;
+  	    var lindex = 0;
+  	    var rindex = 0;
+
+  	    while (lindex < llength || rindex < rlength) {
+  	      array[lindex + rindex] = (lindex < llength && rindex < rlength)
+  	        ? comparefn(left[lindex], right[rindex]) <= 0 ? left[lindex++] : right[rindex++]
+  	        : lindex < llength ? left[lindex++] : right[rindex++];
+  	    }
+  	  }
+
+  	  return array;
+  	};
+
+  	arraySort = sort;
+  	return arraySort;
+  }
+
+  var environmentFfVersion;
+  var hasRequiredEnvironmentFfVersion;
+
+  function requireEnvironmentFfVersion () {
+  	if (hasRequiredEnvironmentFfVersion) return environmentFfVersion;
+  	hasRequiredEnvironmentFfVersion = 1;
+  	var userAgent = requireEnvironmentUserAgent();
+
+  	var firefox = userAgent.match(/firefox\/(\d+)/i);
+
+  	environmentFfVersion = !!firefox && +firefox[1];
+  	return environmentFfVersion;
+  }
+
+  var environmentIsIeOrEdge;
+  var hasRequiredEnvironmentIsIeOrEdge;
+
+  function requireEnvironmentIsIeOrEdge () {
+  	if (hasRequiredEnvironmentIsIeOrEdge) return environmentIsIeOrEdge;
+  	hasRequiredEnvironmentIsIeOrEdge = 1;
+  	var UA = requireEnvironmentUserAgent();
+
+  	environmentIsIeOrEdge = /MSIE|Trident/.test(UA);
+  	return environmentIsIeOrEdge;
+  }
+
+  var environmentWebkitVersion;
+  var hasRequiredEnvironmentWebkitVersion;
+
+  function requireEnvironmentWebkitVersion () {
+  	if (hasRequiredEnvironmentWebkitVersion) return environmentWebkitVersion;
+  	hasRequiredEnvironmentWebkitVersion = 1;
+  	var userAgent = requireEnvironmentUserAgent();
+
+  	var webkit = userAgent.match(/AppleWebKit\/(\d+)\./);
+
+  	environmentWebkitVersion = !!webkit && +webkit[1];
+  	return environmentWebkitVersion;
+  }
+
+  var hasRequiredEs_array_sort;
+
+  function requireEs_array_sort () {
+  	if (hasRequiredEs_array_sort) return es_array_sort;
+  	hasRequiredEs_array_sort = 1;
+  	var $ = require_export();
+  	var uncurryThis = requireFunctionUncurryThis();
+  	var aCallable = requireACallable();
+  	var toObject = requireToObject();
+  	var lengthOfArrayLike = requireLengthOfArrayLike();
+  	var deletePropertyOrThrow = requireDeletePropertyOrThrow();
+  	var toString = requireToString();
+  	var fails = requireFails();
+  	var internalSort = requireArraySort();
+  	var arrayMethodIsStrict = requireArrayMethodIsStrict();
+  	var FF = requireEnvironmentFfVersion();
+  	var IE_OR_EDGE = requireEnvironmentIsIeOrEdge();
+  	var V8 = requireEnvironmentV8Version();
+  	var WEBKIT = requireEnvironmentWebkitVersion();
+
+  	var test = [];
+  	var nativeSort = uncurryThis(test.sort);
+  	var push = uncurryThis(test.push);
+
+  	// IE8-
+  	var FAILS_ON_UNDEFINED = fails(function () {
+  	  test.sort(undefined);
+  	});
+  	// V8 bug
+  	var FAILS_ON_NULL = fails(function () {
+  	  test.sort(null);
+  	});
+  	// Old WebKit
+  	var STRICT_METHOD = arrayMethodIsStrict('sort');
+
+  	var STABLE_SORT = !fails(function () {
+  	  // feature detection can be too slow, so check engines versions
+  	  if (V8) return V8 < 70;
+  	  if (FF && FF > 3) return;
+  	  if (IE_OR_EDGE) return true;
+  	  if (WEBKIT) return WEBKIT < 603;
+
+  	  var result = '';
+  	  var code, chr, value, index;
+
+  	  // generate an array with more 512 elements (Chakra and old V8 fails only in this case)
+  	  for (code = 65; code < 76; code++) {
+  	    chr = String.fromCharCode(code);
+
+  	    switch (code) {
+  	      case 66: case 69: case 70: case 72: value = 3; break;
+  	      case 68: case 71: value = 4; break;
+  	      default: value = 2;
+  	    }
+
+  	    for (index = 0; index < 47; index++) {
+  	      test.push({ k: chr + index, v: value });
+  	    }
+  	  }
+
+  	  test.sort(function (a, b) { return b.v - a.v; });
+
+  	  for (index = 0; index < test.length; index++) {
+  	    chr = test[index].k.charAt(0);
+  	    if (result.charAt(result.length - 1) !== chr) result += chr;
+  	  }
+
+  	  return result !== 'DGBEFHACIJK';
+  	});
+
+  	var FORCED = FAILS_ON_UNDEFINED || !FAILS_ON_NULL || !STRICT_METHOD || !STABLE_SORT;
+
+  	var getSortCompare = function (comparefn) {
+  	  return function (x, y) {
+  	    if (y === undefined) return -1;
+  	    if (x === undefined) return 1;
+  	    if (comparefn !== undefined) return +comparefn(x, y) || 0;
+  	    return toString(x) > toString(y) ? 1 : -1;
+  	  };
+  	};
+
+  	// `Array.prototype.sort` method
+  	// https://tc39.es/ecma262/#sec-array.prototype.sort
+  	$({ target: 'Array', proto: true, forced: FORCED }, {
+  	  sort: function sort(comparefn) {
+  	    if (comparefn !== undefined) aCallable(comparefn);
+
+  	    var array = toObject(this);
+
+  	    if (STABLE_SORT) return comparefn === undefined ? nativeSort(array) : nativeSort(array, comparefn);
+
+  	    var items = [];
+  	    var arrayLength = lengthOfArrayLike(array);
+  	    var itemsLength, index;
+
+  	    for (index = 0; index < arrayLength; index++) {
+  	      if (index in array) push(items, array[index]);
+  	    }
+
+  	    internalSort(items, getSortCompare(comparefn));
+
+  	    itemsLength = lengthOfArrayLike(items);
+  	    index = 0;
+
+  	    while (index < itemsLength) array[index] = items[index++];
+  	    while (index < arrayLength) deletePropertyOrThrow(array, index++);
+
+  	    return array;
+  	  }
+  	});
+  	return es_array_sort;
+  }
+
+  requireEs_array_sort();
+
+  var es_array_splice = {};
+
+  var arraySetLength;
+  var hasRequiredArraySetLength;
+
+  function requireArraySetLength () {
+  	if (hasRequiredArraySetLength) return arraySetLength;
+  	hasRequiredArraySetLength = 1;
+  	var DESCRIPTORS = requireDescriptors();
+  	var isArray = requireIsArray();
+
+  	var $TypeError = TypeError;
+  	// eslint-disable-next-line es/no-object-getownpropertydescriptor -- safe
+  	var getOwnPropertyDescriptor = Object.getOwnPropertyDescriptor;
+
+  	// Safari < 13 does not throw an error in this case
+  	var SILENT_ON_NON_WRITABLE_LENGTH_SET = DESCRIPTORS && !function () {
+  	  // makes no sense without proper strict mode support
+  	  if (this !== undefined) return true;
+  	  try {
+  	    // eslint-disable-next-line es/no-object-defineproperty -- safe
+  	    Object.defineProperty([], 'length', { writable: false }).length = 1;
+  	  } catch (error) {
+  	    return error instanceof TypeError;
+  	  }
+  	}();
+
+  	arraySetLength = SILENT_ON_NON_WRITABLE_LENGTH_SET ? function (O, length) {
+  	  if (isArray(O) && !getOwnPropertyDescriptor(O, 'length').writable) {
+  	    throw new $TypeError('Cannot set read only .length');
+  	  } return O.length = length;
+  	} : function (O, length) {
+  	  return O.length = length;
+  	};
+  	return arraySetLength;
+  }
+
+  var hasRequiredEs_array_splice;
+
+  function requireEs_array_splice () {
+  	if (hasRequiredEs_array_splice) return es_array_splice;
+  	hasRequiredEs_array_splice = 1;
+  	var $ = require_export();
+  	var toObject = requireToObject();
+  	var toAbsoluteIndex = requireToAbsoluteIndex();
+  	var toIntegerOrInfinity = requireToIntegerOrInfinity();
+  	var lengthOfArrayLike = requireLengthOfArrayLike();
+  	var setArrayLength = requireArraySetLength();
+  	var doesNotExceedSafeInteger = requireDoesNotExceedSafeInteger();
+  	var arraySpeciesCreate = requireArraySpeciesCreate();
+  	var createProperty = requireCreateProperty();
+  	var deletePropertyOrThrow = requireDeletePropertyOrThrow();
+  	var arrayMethodHasSpeciesSupport = requireArrayMethodHasSpeciesSupport();
+
+  	var HAS_SPECIES_SUPPORT = arrayMethodHasSpeciesSupport('splice');
+
+  	var max = Math.max;
+  	var min = Math.min;
+
+  	// `Array.prototype.splice` method
+  	// https://tc39.es/ecma262/#sec-array.prototype.splice
+  	// with adding support of @@species
+  	$({ target: 'Array', proto: true, forced: !HAS_SPECIES_SUPPORT }, {
+  	  splice: function splice(start, deleteCount /* , ...items */) {
+  	    var O = toObject(this);
+  	    var len = lengthOfArrayLike(O);
+  	    var actualStart = toAbsoluteIndex(start, len);
+  	    var argumentsLength = arguments.length;
+  	    var insertCount, actualDeleteCount, A, k, from, to;
+  	    if (argumentsLength === 0) {
+  	      insertCount = actualDeleteCount = 0;
+  	    } else if (argumentsLength === 1) {
+  	      insertCount = 0;
+  	      actualDeleteCount = len - actualStart;
+  	    } else {
+  	      insertCount = argumentsLength - 2;
+  	      actualDeleteCount = min(max(toIntegerOrInfinity(deleteCount), 0), len - actualStart);
+  	    }
+  	    doesNotExceedSafeInteger(len + insertCount - actualDeleteCount);
+  	    A = arraySpeciesCreate(O, actualDeleteCount);
+  	    for (k = 0; k < actualDeleteCount; k++) {
+  	      from = actualStart + k;
+  	      if (from in O) createProperty(A, k, O[from]);
+  	    }
+  	    A.length = actualDeleteCount;
+  	    if (insertCount < actualDeleteCount) {
+  	      for (k = actualStart; k < len - actualDeleteCount; k++) {
+  	        from = k + actualDeleteCount;
+  	        to = k + insertCount;
+  	        if (from in O) O[to] = O[from];
+  	        else deletePropertyOrThrow(O, to);
+  	      }
+  	      for (k = len; k > len - actualDeleteCount + insertCount; k--) deletePropertyOrThrow(O, k - 1);
+  	    } else if (insertCount > actualDeleteCount) {
+  	      for (k = len - actualDeleteCount; k > actualStart; k--) {
+  	        from = k + actualDeleteCount - 1;
+  	        to = k + insertCount - 1;
+  	        if (from in O) O[to] = O[from];
+  	        else deletePropertyOrThrow(O, to);
+  	      }
+  	    }
+  	    for (k = 0; k < insertCount; k++) {
+  	      O[k + actualStart] = arguments[k + 2];
+  	    }
+  	    setArrayLength(O, len - actualDeleteCount + insertCount);
+  	    return A;
+  	  }
+  	});
+  	return es_array_splice;
+  }
+
+  requireEs_array_splice();
+
+  var es_date_toJson = {};
+
+  var hasRequiredEs_date_toJson;
+
+  function requireEs_date_toJson () {
+  	if (hasRequiredEs_date_toJson) return es_date_toJson;
+  	hasRequiredEs_date_toJson = 1;
+  	var $ = require_export();
+  	var fails = requireFails();
+  	var toObject = requireToObject();
+  	var toPrimitive = requireToPrimitive();
+
+  	var FORCED = fails(function () {
+  	  return new Date(NaN).toJSON() !== null
+  	    || Date.prototype.toJSON.call({ toISOString: function () { return 1; } }) !== 1;
+  	});
+
+  	// `Date.prototype.toJSON` method
+  	// https://tc39.es/ecma262/#sec-date.prototype.tojson
+  	$({ target: 'Date', proto: true, arity: 1, forced: FORCED }, {
+  	  // eslint-disable-next-line no-unused-vars -- required for `.length`
+  	  toJSON: function toJSON(key) {
+  	    var O = toObject(this);
+  	    var pv = toPrimitive(O, 'number');
+  	    return typeof pv == 'number' && !isFinite(pv) ? null : O.toISOString();
+  	  }
+  	});
+  	return es_date_toJson;
+  }
+
+  requireEs_date_toJson();
+
+  var es_number_constructor = {};
+
+  var path;
+  var hasRequiredPath;
+
+  function requirePath () {
+  	if (hasRequiredPath) return path;
+  	hasRequiredPath = 1;
+  	var globalThis = requireGlobalThis();
+
+  	path = globalThis;
+  	return path;
+  }
+
+  var inheritIfRequired;
+  var hasRequiredInheritIfRequired;
+
+  function requireInheritIfRequired () {
+  	if (hasRequiredInheritIfRequired) return inheritIfRequired;
+  	hasRequiredInheritIfRequired = 1;
+  	var isCallable = requireIsCallable();
+  	var isObject = requireIsObject();
+  	var setPrototypeOf = requireObjectSetPrototypeOf();
+
+  	// makes subclassing work correct for wrapped built-ins
+  	inheritIfRequired = function ($this, dummy, Wrapper) {
+  	  var NewTarget, NewTargetPrototype;
+  	  if (
+  	    // it can work only with native `setPrototypeOf`
+  	    setPrototypeOf &&
+  	    // we haven't completely correct pre-ES6 way for getting `new.target`, so use this
+  	    isCallable(NewTarget = dummy.constructor) &&
+  	    NewTarget !== Wrapper &&
+  	    isObject(NewTargetPrototype = NewTarget.prototype) &&
+  	    NewTargetPrototype !== Wrapper.prototype
+  	  ) setPrototypeOf($this, NewTargetPrototype);
+  	  return $this;
+  	};
+  	return inheritIfRequired;
+  }
+
+  var thisNumberValue;
+  var hasRequiredThisNumberValue;
+
+  function requireThisNumberValue () {
+  	if (hasRequiredThisNumberValue) return thisNumberValue;
+  	hasRequiredThisNumberValue = 1;
+  	var uncurryThis = requireFunctionUncurryThis();
+
+  	// `thisNumberValue` abstract operation
+  	// https://tc39.es/ecma262/#sec-thisnumbervalue
+  	thisNumberValue = uncurryThis(1.0.valueOf);
+  	return thisNumberValue;
+  }
+
+  var whitespaces;
+  var hasRequiredWhitespaces;
+
+  function requireWhitespaces () {
+  	if (hasRequiredWhitespaces) return whitespaces;
+  	hasRequiredWhitespaces = 1;
+  	// a string of all valid unicode whitespaces
+  	whitespaces = '\u0009\u000A\u000B\u000C\u000D\u0020\u00A0\u1680\u2000\u2001\u2002' +
+  	  '\u2003\u2004\u2005\u2006\u2007\u2008\u2009\u200A\u202F\u205F\u3000\u2028\u2029\uFEFF';
+  	return whitespaces;
+  }
+
+  var stringTrim;
+  var hasRequiredStringTrim;
+
+  function requireStringTrim () {
+  	if (hasRequiredStringTrim) return stringTrim;
+  	hasRequiredStringTrim = 1;
+  	var uncurryThis = requireFunctionUncurryThis();
+  	var requireObjectCoercible = requireRequireObjectCoercible();
+  	var toString = requireToString();
+  	var whitespaces = requireWhitespaces();
+
+  	var replace = uncurryThis(''.replace);
+  	var ltrim = RegExp('^[' + whitespaces + ']+');
+  	var rtrim = RegExp('(^|[^' + whitespaces + '])[' + whitespaces + ']+$');
+
+  	// `String.prototype.{ trim, trimStart, trimEnd, trimLeft, trimRight }` methods implementation
+  	var createMethod = function (TYPE) {
+  	  return function ($this) {
+  	    var string = toString(requireObjectCoercible($this));
+  	    if (TYPE & 1) string = replace(string, ltrim, '');
+  	    if (TYPE & 2) string = replace(string, rtrim, '$1');
+  	    return string;
+  	  };
+  	};
+
+  	stringTrim = {
+  	  // `String.prototype.{ trimLeft, trimStart }` methods
+  	  // https://tc39.es/ecma262/#sec-string.prototype.trimstart
+  	  start: createMethod(1),
+  	  // `String.prototype.{ trimRight, trimEnd }` methods
+  	  // https://tc39.es/ecma262/#sec-string.prototype.trimend
+  	  end: createMethod(2),
+  	  // `String.prototype.trim` method
+  	  // https://tc39.es/ecma262/#sec-string.prototype.trim
+  	  trim: createMethod(3)
+  	};
+  	return stringTrim;
+  }
+
+  var hasRequiredEs_number_constructor;
+
+  function requireEs_number_constructor () {
+  	if (hasRequiredEs_number_constructor) return es_number_constructor;
+  	hasRequiredEs_number_constructor = 1;
+  	var $ = require_export();
+  	var IS_PURE = requireIsPure();
+  	var DESCRIPTORS = requireDescriptors();
+  	var globalThis = requireGlobalThis();
+  	var path = requirePath();
+  	var uncurryThis = requireFunctionUncurryThis();
+  	var isForced = requireIsForced();
+  	var hasOwn = requireHasOwnProperty();
+  	var inheritIfRequired = requireInheritIfRequired();
+  	var isPrototypeOf = requireObjectIsPrototypeOf();
+  	var isSymbol = requireIsSymbol();
+  	var toPrimitive = requireToPrimitive();
+  	var fails = requireFails();
+  	var getOwnPropertyNames = requireObjectGetOwnPropertyNames().f;
+  	var getOwnPropertyDescriptor = requireObjectGetOwnPropertyDescriptor().f;
+  	var defineProperty = requireObjectDefineProperty().f;
+  	var thisNumberValue = requireThisNumberValue();
+  	var trim = requireStringTrim().trim;
+
+  	var NUMBER = 'Number';
+  	var NativeNumber = globalThis[NUMBER];
+  	var PureNumberNamespace = path[NUMBER];
+  	var NumberPrototype = NativeNumber.prototype;
+  	var TypeError = globalThis.TypeError;
+  	var stringSlice = uncurryThis(''.slice);
+  	var charCodeAt = uncurryThis(''.charCodeAt);
+
+  	// `ToNumeric` abstract operation
+  	// https://tc39.es/ecma262/#sec-tonumeric
+  	var toNumeric = function (value) {
+  	  var primValue = toPrimitive(value, 'number');
+  	  return typeof primValue == 'bigint' ? primValue : toNumber(primValue);
+  	};
+
+  	// `ToNumber` abstract operation
+  	// https://tc39.es/ecma262/#sec-tonumber
+  	var toNumber = function (argument) {
+  	  var it = toPrimitive(argument, 'number');
+  	  var first, third, radix, maxCode, digits, length, index, code;
+  	  if (isSymbol(it)) throw new TypeError('Cannot convert a Symbol value to a number');
+  	  if (typeof it == 'string' && it.length > 2) {
+  	    it = trim(it);
+  	    first = charCodeAt(it, 0);
+  	    if (first === 43 || first === 45) {
+  	      third = charCodeAt(it, 2);
+  	      if (third === 88 || third === 120) return NaN; // Number('+0x1') should be NaN, old V8 fix
+  	    } else if (first === 48) {
+  	      switch (charCodeAt(it, 1)) {
+  	        // fast equal of /^0b[01]+$/i
+  	        case 66:
+  	        case 98:
+  	          radix = 2;
+  	          maxCode = 49;
+  	          break;
+  	        // fast equal of /^0o[0-7]+$/i
+  	        case 79:
+  	        case 111:
+  	          radix = 8;
+  	          maxCode = 55;
+  	          break;
+  	        default:
+  	          return +it;
+  	      }
+  	      digits = stringSlice(it, 2);
+  	      length = digits.length;
+  	      for (index = 0; index < length; index++) {
+  	        code = charCodeAt(digits, index);
+  	        // parseInt parses a string to a first unavailable symbol
+  	        // but ToNumber should return NaN if a string contains unavailable symbols
+  	        if (code < 48 || code > maxCode) return NaN;
+  	      } return parseInt(digits, radix);
+  	    }
+  	  } return +it;
+  	};
+
+  	var FORCED = isForced(NUMBER, !NativeNumber(' 0o1') || !NativeNumber('0b1') || NativeNumber('+0x1'));
+
+  	var calledWithNew = function (dummy) {
+  	  // includes check on 1..constructor(foo) case
+  	  return isPrototypeOf(NumberPrototype, dummy) && fails(function () { thisNumberValue(dummy); });
+  	};
+
+  	// `Number` constructor
+  	// https://tc39.es/ecma262/#sec-number-constructor
+  	var NumberWrapper = function Number(value) {
+  	  var n = arguments.length < 1 ? 0 : NativeNumber(toNumeric(value));
+  	  return calledWithNew(this) ? inheritIfRequired(Object(n), this, NumberWrapper) : n;
+  	};
+
+  	NumberWrapper.prototype = NumberPrototype;
+  	if (FORCED && !IS_PURE) NumberPrototype.constructor = NumberWrapper;
+
+  	$({ global: true, constructor: true, wrap: true, forced: FORCED }, {
+  	  Number: NumberWrapper
+  	});
+
+  	// Use `internal/copy-constructor-properties` helper in `core-js@4`
+  	var copyConstructorProperties = function (target, source) {
+  	  for (var keys = DESCRIPTORS ? getOwnPropertyNames(source) : (
+  	    // ES3:
+  	    'MAX_VALUE,MIN_VALUE,NaN,NEGATIVE_INFINITY,POSITIVE_INFINITY,' +
+  	    // ES2015 (in case, if modules with ES2015 Number statics required before):
+  	    'EPSILON,MAX_SAFE_INTEGER,MIN_SAFE_INTEGER,isFinite,isInteger,isNaN,isSafeInteger,parseFloat,parseInt,' +
+  	    // ESNext
+  	    'fromString,range'
+  	  ).split(','), j = 0, key; keys.length > j; j++) {
+  	    if (hasOwn(source, key = keys[j]) && !hasOwn(target, key)) {
+  	      defineProperty(target, key, getOwnPropertyDescriptor(source, key));
+  	    }
+  	  }
+  	};
+
+  	if (IS_PURE && PureNumberNamespace) copyConstructorProperties(path[NUMBER], PureNumberNamespace);
+  	if (FORCED || IS_PURE) copyConstructorProperties(path[NUMBER], NativeNumber);
+  	return es_number_constructor;
+  }
+
+  requireEs_number_constructor();
+
+  var es_object_assign = {};
+
+  var objectAssign;
+  var hasRequiredObjectAssign;
+
+  function requireObjectAssign () {
+  	if (hasRequiredObjectAssign) return objectAssign;
+  	hasRequiredObjectAssign = 1;
+  	var DESCRIPTORS = requireDescriptors();
+  	var uncurryThis = requireFunctionUncurryThis();
+  	var call = requireFunctionCall();
+  	var fails = requireFails();
+  	var objectKeys = requireObjectKeys();
+  	var getOwnPropertySymbolsModule = requireObjectGetOwnPropertySymbols();
+  	var propertyIsEnumerableModule = requireObjectPropertyIsEnumerable();
+  	var toObject = requireToObject();
+  	var IndexedObject = requireIndexedObject();
+
+  	// eslint-disable-next-line es/no-object-assign -- safe
+  	var $assign = Object.assign;
+  	// eslint-disable-next-line es/no-object-defineproperty -- required for testing
+  	var defineProperty = Object.defineProperty;
+  	var concat = uncurryThis([].concat);
+
+  	// `Object.assign` method
+  	// https://tc39.es/ecma262/#sec-object.assign
+  	objectAssign = !$assign || fails(function () {
+  	  // should have correct order of operations (Edge bug)
+  	  if (DESCRIPTORS && $assign({ b: 1 }, $assign(defineProperty({}, 'a', {
+  	    enumerable: true,
+  	    get: function () {
+  	      defineProperty(this, 'b', {
+  	        value: 3,
+  	        enumerable: false
+  	      });
+  	    }
+  	  }), { b: 2 })).b !== 1) return true;
+  	  // should work with symbols and should have deterministic property order (V8 bug)
+  	  var A = {};
+  	  var B = {};
+  	  // eslint-disable-next-line es/no-symbol -- safe
+  	  var symbol = Symbol('assign detection');
+  	  var alphabet = 'abcdefghijklmnopqrst';
+  	  A[symbol] = 7;
+  	  alphabet.split('').forEach(function (chr) { B[chr] = chr; });
+  	  return $assign({}, A)[symbol] !== 7 || objectKeys($assign({}, B)).join('') !== alphabet;
+  	}) ? function assign(target, source) { // eslint-disable-line no-unused-vars -- required for `.length`
+  	  var T = toObject(target);
+  	  var argumentsLength = arguments.length;
+  	  var index = 1;
+  	  var getOwnPropertySymbols = getOwnPropertySymbolsModule.f;
+  	  var propertyIsEnumerable = propertyIsEnumerableModule.f;
+  	  while (argumentsLength > index) {
+  	    var S = IndexedObject(arguments[index++]);
+  	    var keys = getOwnPropertySymbols ? concat(objectKeys(S), getOwnPropertySymbols(S)) : objectKeys(S);
+  	    var length = keys.length;
+  	    var j = 0;
+  	    var key;
+  	    while (length > j) {
+  	      key = keys[j++];
+  	      if (!DESCRIPTORS || call(propertyIsEnumerable, S, key)) T[key] = S[key];
+  	    }
+  	  } return T;
+  	} : $assign;
+  	return objectAssign;
+  }
+
+  var hasRequiredEs_object_assign;
+
+  function requireEs_object_assign () {
+  	if (hasRequiredEs_object_assign) return es_object_assign;
+  	hasRequiredEs_object_assign = 1;
+  	var $ = require_export();
+  	var assign = requireObjectAssign();
+
+  	// `Object.assign` method
+  	// https://tc39.es/ecma262/#sec-object.assign
+  	// eslint-disable-next-line es/no-object-assign -- required for testing
+  	$({ target: 'Object', stat: true, arity: 2, forced: Object.assign !== assign }, {
+  	  assign: assign
+  	});
+  	return es_object_assign;
+  }
+
+  requireEs_object_assign();
+
+  var es_object_entries = {};
+
+  var objectToArray;
+  var hasRequiredObjectToArray;
+
+  function requireObjectToArray () {
+  	if (hasRequiredObjectToArray) return objectToArray;
+  	hasRequiredObjectToArray = 1;
+  	var DESCRIPTORS = requireDescriptors();
+  	var fails = requireFails();
+  	var uncurryThis = requireFunctionUncurryThis();
+  	var objectGetPrototypeOf = requireObjectGetPrototypeOf();
+  	var objectKeys = requireObjectKeys();
+  	var toIndexedObject = requireToIndexedObject();
+  	var $propertyIsEnumerable = requireObjectPropertyIsEnumerable().f;
+
+  	var propertyIsEnumerable = uncurryThis($propertyIsEnumerable);
+  	var push = uncurryThis([].push);
+
+  	// in some IE versions, `propertyIsEnumerable` returns incorrect result on integer keys
+  	// of `null` prototype objects
+  	var IE_BUG = DESCRIPTORS && fails(function () {
+  	  // eslint-disable-next-line es/no-object-create -- safe
+  	  var O = Object.create(null);
+  	  O[2] = 2;
+  	  return !propertyIsEnumerable(O, 2);
+  	});
+
+  	// `Object.{ entries, values }` methods implementation
+  	var createMethod = function (TO_ENTRIES) {
+  	  return function (it) {
+  	    var O = toIndexedObject(it);
+  	    var keys = objectKeys(O);
+  	    var IE_WORKAROUND = IE_BUG && objectGetPrototypeOf(O) === null;
+  	    var length = keys.length;
+  	    var i = 0;
+  	    var result = [];
+  	    var key;
+  	    while (length > i) {
+  	      key = keys[i++];
+  	      if (!DESCRIPTORS || (IE_WORKAROUND ? key in O : propertyIsEnumerable(O, key))) {
+  	        push(result, TO_ENTRIES ? [key, O[key]] : O[key]);
+  	      }
+  	    }
+  	    return result;
+  	  };
+  	};
+
+  	objectToArray = {
+  	  // `Object.entries` method
+  	  // https://tc39.es/ecma262/#sec-object.entries
+  	  entries: createMethod(true),
+  	  // `Object.values` method
+  	  // https://tc39.es/ecma262/#sec-object.values
+  	  values: createMethod(false)
+  	};
+  	return objectToArray;
+  }
+
+  var hasRequiredEs_object_entries;
+
+  function requireEs_object_entries () {
+  	if (hasRequiredEs_object_entries) return es_object_entries;
+  	hasRequiredEs_object_entries = 1;
+  	var $ = require_export();
+  	var $entries = requireObjectToArray().entries;
+
+  	// `Object.entries` method
+  	// https://tc39.es/ecma262/#sec-object.entries
+  	$({ target: 'Object', stat: true }, {
+  	  entries: function entries(O) {
+  	    return $entries(O);
+  	  }
+  	});
+  	return es_object_entries;
+  }
+
+  requireEs_object_entries();
+
+  var es_object_keys = {};
+
+  var hasRequiredEs_object_keys;
+
+  function requireEs_object_keys () {
+  	if (hasRequiredEs_object_keys) return es_object_keys;
+  	hasRequiredEs_object_keys = 1;
+  	var $ = require_export();
+  	var toObject = requireToObject();
+  	var nativeKeys = requireObjectKeys();
+  	var fails = requireFails();
+
+  	var FAILS_ON_PRIMITIVES = fails(function () { nativeKeys(1); });
+
+  	// `Object.keys` method
+  	// https://tc39.es/ecma262/#sec-object.keys
+  	$({ target: 'Object', stat: true, forced: FAILS_ON_PRIMITIVES }, {
+  	  keys: function keys(it) {
+  	    return nativeKeys(toObject(it));
+  	  }
+  	});
+  	return es_object_keys;
+  }
+
+  requireEs_object_keys();
+
+  var es_object_toString = {};
+
+  var objectToString;
+  var hasRequiredObjectToString;
+
+  function requireObjectToString () {
+  	if (hasRequiredObjectToString) return objectToString;
+  	hasRequiredObjectToString = 1;
+  	var TO_STRING_TAG_SUPPORT = requireToStringTagSupport();
+  	var classof = requireClassof();
+
+  	// `Object.prototype.toString` method implementation
+  	// https://tc39.es/ecma262/#sec-object.prototype.tostring
+  	objectToString = TO_STRING_TAG_SUPPORT ? {}.toString : function toString() {
+  	  return '[object ' + classof(this) + ']';
+  	};
+  	return objectToString;
+  }
+
+  var hasRequiredEs_object_toString;
+
+  function requireEs_object_toString () {
+  	if (hasRequiredEs_object_toString) return es_object_toString;
+  	hasRequiredEs_object_toString = 1;
+  	var TO_STRING_TAG_SUPPORT = requireToStringTagSupport();
+  	var defineBuiltIn = requireDefineBuiltIn();
+  	var toString = requireObjectToString();
+
+  	// `Object.prototype.toString` method
+  	// https://tc39.es/ecma262/#sec-object.prototype.tostring
+  	if (!TO_STRING_TAG_SUPPORT) {
+  	  defineBuiltIn(Object.prototype, 'toString', toString, { unsafe: true });
+  	}
+  	return es_object_toString;
+  }
+
+  requireEs_object_toString();
+
+  var es_parseFloat = {};
+
+  var numberParseFloat;
+  var hasRequiredNumberParseFloat;
+
+  function requireNumberParseFloat () {
+  	if (hasRequiredNumberParseFloat) return numberParseFloat;
+  	hasRequiredNumberParseFloat = 1;
+  	var globalThis = requireGlobalThis();
+  	var fails = requireFails();
+  	var uncurryThis = requireFunctionUncurryThis();
+  	var toString = requireToString();
+  	var trim = requireStringTrim().trim;
+  	var whitespaces = requireWhitespaces();
+
+  	var charAt = uncurryThis(''.charAt);
+  	var $parseFloat = globalThis.parseFloat;
+  	var Symbol = globalThis.Symbol;
+  	var ITERATOR = Symbol && Symbol.iterator;
+  	var FORCED = 1 / $parseFloat(whitespaces + '-0') !== -Infinity
+  	  // MS Edge 18- broken with boxed symbols
+  	  || (ITERATOR && !fails(function () { $parseFloat(Object(ITERATOR)); }));
+
+  	// `parseFloat` method
+  	// https://tc39.es/ecma262/#sec-parsefloat-string
+  	numberParseFloat = FORCED ? function parseFloat(string) {
+  	  var trimmedString = trim(toString(string));
+  	  var result = $parseFloat(trimmedString);
+  	  return result === 0 && charAt(trimmedString, 0) === '-' ? -0 : result;
+  	} : $parseFloat;
+  	return numberParseFloat;
+  }
+
+  var hasRequiredEs_parseFloat;
+
+  function requireEs_parseFloat () {
+  	if (hasRequiredEs_parseFloat) return es_parseFloat;
+  	hasRequiredEs_parseFloat = 1;
+  	var $ = require_export();
+  	var $parseFloat = requireNumberParseFloat();
+
+  	// `parseFloat` method
+  	// https://tc39.es/ecma262/#sec-parsefloat-string
+  	$({ global: true, forced: parseFloat !== $parseFloat }, {
+  	  parseFloat: $parseFloat
+  	});
+  	return es_parseFloat;
+  }
+
+  requireEs_parseFloat();
+
+  var es_parseInt = {};
+
+  var numberParseInt;
+  var hasRequiredNumberParseInt;
+
+  function requireNumberParseInt () {
+  	if (hasRequiredNumberParseInt) return numberParseInt;
+  	hasRequiredNumberParseInt = 1;
+  	var globalThis = requireGlobalThis();
+  	var fails = requireFails();
+  	var uncurryThis = requireFunctionUncurryThis();
+  	var toString = requireToString();
+  	var trim = requireStringTrim().trim;
+  	var whitespaces = requireWhitespaces();
+
+  	var $parseInt = globalThis.parseInt;
+  	var Symbol = globalThis.Symbol;
+  	var ITERATOR = Symbol && Symbol.iterator;
+  	var hex = /^[+-]?0x/i;
+  	var exec = uncurryThis(hex.exec);
+  	var FORCED = $parseInt(whitespaces + '08') !== 8 || $parseInt(whitespaces + '0x16') !== 22
+  	  // MS Edge 18- broken with boxed symbols
+  	  || (ITERATOR && !fails(function () { $parseInt(Object(ITERATOR)); }));
+
+  	// `parseInt` method
+  	// https://tc39.es/ecma262/#sec-parseint-string-radix
+  	numberParseInt = FORCED ? function parseInt(string, radix) {
+  	  var S = trim(toString(string));
+  	  return $parseInt(S, (radix >>> 0) || (exec(hex, S) ? 16 : 10));
+  	} : $parseInt;
+  	return numberParseInt;
+  }
+
+  var hasRequiredEs_parseInt;
+
+  function requireEs_parseInt () {
+  	if (hasRequiredEs_parseInt) return es_parseInt;
+  	hasRequiredEs_parseInt = 1;
+  	var $ = require_export();
+  	var $parseInt = requireNumberParseInt();
+
+  	// `parseInt` method
+  	// https://tc39.es/ecma262/#sec-parseint-string-radix
+  	$({ global: true, forced: parseInt !== $parseInt }, {
+  	  parseInt: $parseInt
+  	});
+  	return es_parseInt;
+  }
+
+  requireEs_parseInt();
+
+  var es_regexp_constructor = {};
+
+  var isRegexp;
+  var hasRequiredIsRegexp;
+
+  function requireIsRegexp () {
+  	if (hasRequiredIsRegexp) return isRegexp;
+  	hasRequiredIsRegexp = 1;
+  	var isObject = requireIsObject();
+  	var classof = requireClassofRaw();
+  	var wellKnownSymbol = requireWellKnownSymbol();
+
+  	var MATCH = wellKnownSymbol('match');
+
+  	// `IsRegExp` abstract operation
+  	// https://tc39.es/ecma262/#sec-isregexp
+  	isRegexp = function (it) {
+  	  var isRegExp;
+  	  return isObject(it) && ((isRegExp = it[MATCH]) !== undefined ? !!isRegExp : classof(it) === 'RegExp');
+  	};
+  	return isRegexp;
+  }
+
+  var regexpFlags;
+  var hasRequiredRegexpFlags;
+
+  function requireRegexpFlags () {
+  	if (hasRequiredRegexpFlags) return regexpFlags;
+  	hasRequiredRegexpFlags = 1;
+  	var anObject = requireAnObject();
+
+  	// `RegExp.prototype.flags` getter implementation
+  	// https://tc39.es/ecma262/#sec-get-regexp.prototype.flags
+  	regexpFlags = function () {
+  	  var that = anObject(this);
+  	  var result = '';
+  	  if (that.hasIndices) result += 'd';
+  	  if (that.global) result += 'g';
+  	  if (that.ignoreCase) result += 'i';
+  	  if (that.multiline) result += 'm';
+  	  if (that.dotAll) result += 's';
+  	  if (that.unicode) result += 'u';
+  	  if (that.unicodeSets) result += 'v';
+  	  if (that.sticky) result += 'y';
+  	  return result;
+  	};
+  	return regexpFlags;
+  }
+
+  var regexpGetFlags;
+  var hasRequiredRegexpGetFlags;
+
+  function requireRegexpGetFlags () {
+  	if (hasRequiredRegexpGetFlags) return regexpGetFlags;
+  	hasRequiredRegexpGetFlags = 1;
+  	var call = requireFunctionCall();
+  	var hasOwn = requireHasOwnProperty();
+  	var isPrototypeOf = requireObjectIsPrototypeOf();
+  	var regExpFlags = requireRegexpFlags();
+
+  	var RegExpPrototype = RegExp.prototype;
+
+  	regexpGetFlags = function (R) {
+  	  var flags = R.flags;
+  	  return flags === undefined && !('flags' in RegExpPrototype) && !hasOwn(R, 'flags') && isPrototypeOf(RegExpPrototype, R)
+  	    ? call(regExpFlags, R) : flags;
+  	};
+  	return regexpGetFlags;
+  }
+
+  var regexpStickyHelpers;
+  var hasRequiredRegexpStickyHelpers;
+
+  function requireRegexpStickyHelpers () {
+  	if (hasRequiredRegexpStickyHelpers) return regexpStickyHelpers;
+  	hasRequiredRegexpStickyHelpers = 1;
+  	var fails = requireFails();
+  	var globalThis = requireGlobalThis();
+
+  	// babel-minify and Closure Compiler transpiles RegExp('a', 'y') -> /a/y and it causes SyntaxError
+  	var $RegExp = globalThis.RegExp;
+
+  	var UNSUPPORTED_Y = fails(function () {
+  	  var re = $RegExp('a', 'y');
+  	  re.lastIndex = 2;
+  	  return re.exec('abcd') !== null;
+  	});
+
+  	// UC Browser bug
+  	// https://github.com/zloirock/core-js/issues/1008
+  	var MISSED_STICKY = UNSUPPORTED_Y || fails(function () {
+  	  return !$RegExp('a', 'y').sticky;
+  	});
+
+  	var BROKEN_CARET = UNSUPPORTED_Y || fails(function () {
+  	  // https://bugzilla.mozilla.org/show_bug.cgi?id=773687
+  	  var re = $RegExp('^r', 'gy');
+  	  re.lastIndex = 2;
+  	  return re.exec('str') !== null;
+  	});
+
+  	regexpStickyHelpers = {
+  	  BROKEN_CARET: BROKEN_CARET,
+  	  MISSED_STICKY: MISSED_STICKY,
+  	  UNSUPPORTED_Y: UNSUPPORTED_Y
+  	};
+  	return regexpStickyHelpers;
+  }
+
+  var proxyAccessor;
+  var hasRequiredProxyAccessor;
+
+  function requireProxyAccessor () {
+  	if (hasRequiredProxyAccessor) return proxyAccessor;
+  	hasRequiredProxyAccessor = 1;
+  	var defineProperty = requireObjectDefineProperty().f;
+
+  	proxyAccessor = function (Target, Source, key) {
+  	  key in Target || defineProperty(Target, key, {
+  	    configurable: true,
+  	    get: function () { return Source[key]; },
+  	    set: function (it) { Source[key] = it; }
+  	  });
+  	};
+  	return proxyAccessor;
+  }
+
+  var defineBuiltInAccessor;
+  var hasRequiredDefineBuiltInAccessor;
+
+  function requireDefineBuiltInAccessor () {
+  	if (hasRequiredDefineBuiltInAccessor) return defineBuiltInAccessor;
+  	hasRequiredDefineBuiltInAccessor = 1;
+  	var makeBuiltIn = requireMakeBuiltIn();
+  	var defineProperty = requireObjectDefineProperty();
+
+  	defineBuiltInAccessor = function (target, name, descriptor) {
+  	  if (descriptor.get) makeBuiltIn(descriptor.get, name, { getter: true });
+  	  if (descriptor.set) makeBuiltIn(descriptor.set, name, { setter: true });
+  	  return defineProperty.f(target, name, descriptor);
+  	};
+  	return defineBuiltInAccessor;
+  }
+
+  var setSpecies;
+  var hasRequiredSetSpecies;
+
+  function requireSetSpecies () {
+  	if (hasRequiredSetSpecies) return setSpecies;
+  	hasRequiredSetSpecies = 1;
+  	var getBuiltIn = requireGetBuiltIn();
+  	var defineBuiltInAccessor = requireDefineBuiltInAccessor();
+  	var wellKnownSymbol = requireWellKnownSymbol();
+  	var DESCRIPTORS = requireDescriptors();
+
+  	var SPECIES = wellKnownSymbol('species');
+
+  	setSpecies = function (CONSTRUCTOR_NAME) {
+  	  var Constructor = getBuiltIn(CONSTRUCTOR_NAME);
+
+  	  if (DESCRIPTORS && Constructor && !Constructor[SPECIES]) {
+  	    defineBuiltInAccessor(Constructor, SPECIES, {
+  	      configurable: true,
+  	      get: function () { return this; }
+  	    });
+  	  }
+  	};
+  	return setSpecies;
+  }
+
+  var regexpUnsupportedDotAll;
+  var hasRequiredRegexpUnsupportedDotAll;
+
+  function requireRegexpUnsupportedDotAll () {
+  	if (hasRequiredRegexpUnsupportedDotAll) return regexpUnsupportedDotAll;
+  	hasRequiredRegexpUnsupportedDotAll = 1;
+  	var fails = requireFails();
+  	var globalThis = requireGlobalThis();
+
+  	// babel-minify and Closure Compiler transpiles RegExp('.', 's') -> /./s and it causes SyntaxError
+  	var $RegExp = globalThis.RegExp;
+
+  	regexpUnsupportedDotAll = fails(function () {
+  	  var re = $RegExp('.', 's');
+  	  return !(re.dotAll && re.test('\n') && re.flags === 's');
+  	});
+  	return regexpUnsupportedDotAll;
+  }
+
+  var regexpUnsupportedNcg;
+  var hasRequiredRegexpUnsupportedNcg;
+
+  function requireRegexpUnsupportedNcg () {
+  	if (hasRequiredRegexpUnsupportedNcg) return regexpUnsupportedNcg;
+  	hasRequiredRegexpUnsupportedNcg = 1;
+  	var fails = requireFails();
+  	var globalThis = requireGlobalThis();
+
+  	// babel-minify and Closure Compiler transpiles RegExp('(?<a>b)', 'g') -> /(?<a>b)/g and it causes SyntaxError
+  	var $RegExp = globalThis.RegExp;
+
+  	regexpUnsupportedNcg = fails(function () {
+  	  var re = $RegExp('(?<a>b)', 'g');
+  	  return re.exec('b').groups.a !== 'b' ||
+  	    'b'.replace(re, '$<a>c') !== 'bc';
+  	});
+  	return regexpUnsupportedNcg;
+  }
+
+  var hasRequiredEs_regexp_constructor;
+
+  function requireEs_regexp_constructor () {
+  	if (hasRequiredEs_regexp_constructor) return es_regexp_constructor;
+  	hasRequiredEs_regexp_constructor = 1;
+  	var DESCRIPTORS = requireDescriptors();
+  	var globalThis = requireGlobalThis();
+  	var uncurryThis = requireFunctionUncurryThis();
+  	var isForced = requireIsForced();
+  	var inheritIfRequired = requireInheritIfRequired();
+  	var createNonEnumerableProperty = requireCreateNonEnumerableProperty();
+  	var create = requireObjectCreate();
+  	var getOwnPropertyNames = requireObjectGetOwnPropertyNames().f;
+  	var isPrototypeOf = requireObjectIsPrototypeOf();
+  	var isRegExp = requireIsRegexp();
+  	var toString = requireToString();
+  	var getRegExpFlags = requireRegexpGetFlags();
+  	var stickyHelpers = requireRegexpStickyHelpers();
+  	var proxyAccessor = requireProxyAccessor();
+  	var defineBuiltIn = requireDefineBuiltIn();
+  	var fails = requireFails();
+  	var hasOwn = requireHasOwnProperty();
+  	var enforceInternalState = requireInternalState().enforce;
+  	var setSpecies = requireSetSpecies();
+  	var wellKnownSymbol = requireWellKnownSymbol();
+  	var UNSUPPORTED_DOT_ALL = requireRegexpUnsupportedDotAll();
+  	var UNSUPPORTED_NCG = requireRegexpUnsupportedNcg();
+
+  	var MATCH = wellKnownSymbol('match');
+  	var NativeRegExp = globalThis.RegExp;
+  	var RegExpPrototype = NativeRegExp.prototype;
+  	var SyntaxError = globalThis.SyntaxError;
+  	var exec = uncurryThis(RegExpPrototype.exec);
+  	var charAt = uncurryThis(''.charAt);
+  	var replace = uncurryThis(''.replace);
+  	var stringIndexOf = uncurryThis(''.indexOf);
+  	var stringSlice = uncurryThis(''.slice);
+  	// TODO: Use only proper RegExpIdentifierName
+  	var IS_NCG = /^\?<[^\s\d!#%&*+<=>@^][^\s!#%&*+<=>@^]*>/;
+  	var re1 = /a/g;
+  	var re2 = /a/g;
+
+  	// "new" should create a new object, old webkit bug
+  	var CORRECT_NEW = new NativeRegExp(re1) !== re1;
+
+  	var MISSED_STICKY = stickyHelpers.MISSED_STICKY;
+  	var UNSUPPORTED_Y = stickyHelpers.UNSUPPORTED_Y;
+
+  	var BASE_FORCED = DESCRIPTORS &&
+  	  (!CORRECT_NEW || MISSED_STICKY || UNSUPPORTED_DOT_ALL || UNSUPPORTED_NCG || fails(function () {
+  	    re2[MATCH] = false;
+  	    // RegExp constructor can alter flags and IsRegExp works correct with @@match
+  	    // eslint-disable-next-line sonarjs/inconsistent-function-call -- required for testing
+  	    return NativeRegExp(re1) !== re1 || NativeRegExp(re2) === re2 || String(NativeRegExp(re1, 'i')) !== '/a/i';
+  	  }));
+
+  	var handleDotAll = function (string) {
+  	  var length = string.length;
+  	  var index = 0;
+  	  var result = '';
+  	  var brackets = false;
+  	  var chr;
+  	  for (; index <= length; index++) {
+  	    chr = charAt(string, index);
+  	    if (chr === '\\') {
+  	      result += chr + charAt(string, ++index);
+  	      continue;
+  	    }
+  	    if (!brackets && chr === '.') {
+  	      result += '[\\s\\S]';
+  	    } else {
+  	      if (chr === '[') {
+  	        brackets = true;
+  	      } else if (chr === ']') {
+  	        brackets = false;
+  	      } result += chr;
+  	    }
+  	  } return result;
+  	};
+
+  	var handleNCG = function (string) {
+  	  var length = string.length;
+  	  var index = 0;
+  	  var result = '';
+  	  var named = [];
+  	  var names = create(null);
+  	  var brackets = false;
+  	  var ncg = false;
+  	  var groupid = 0;
+  	  var groupname = '';
+  	  var chr;
+  	  for (; index <= length; index++) {
+  	    chr = charAt(string, index);
+  	    if (chr === '\\') {
+  	      chr += charAt(string, ++index);
+  	    } else if (chr === ']') {
+  	      brackets = false;
+  	    } else if (!brackets) switch (true) {
+  	      case chr === '[':
+  	        brackets = true;
+  	        break;
+  	      case chr === '(':
+  	        result += chr;
+  	        // ignore non-capturing groups
+  	        if (stringSlice(string, index + 1, index + 3) === '?:') {
+  	          continue;
+  	        }
+  	        if (exec(IS_NCG, stringSlice(string, index + 1))) {
+  	          index += 2;
+  	          ncg = true;
+  	        }
+  	        groupid++;
+  	        continue;
+  	      case chr === '>' && ncg:
+  	        if (groupname === '' || hasOwn(names, groupname)) {
+  	          throw new SyntaxError('Invalid capture group name');
+  	        }
+  	        names[groupname] = true;
+  	        named[named.length] = [groupname, groupid];
+  	        ncg = false;
+  	        groupname = '';
+  	        continue;
+  	    }
+  	    if (ncg) groupname += chr;
+  	    else result += chr;
+  	  } return [result, named];
+  	};
+
+  	// `RegExp` constructor
+  	// https://tc39.es/ecma262/#sec-regexp-constructor
+  	if (isForced('RegExp', BASE_FORCED)) {
+  	  var RegExpWrapper = function RegExp(pattern, flags) {
+  	    var thisIsRegExp = isPrototypeOf(RegExpPrototype, this);
+  	    var patternIsRegExp = isRegExp(pattern);
+  	    var flagsAreUndefined = flags === undefined;
+  	    var groups = [];
+  	    var rawPattern = pattern;
+  	    var rawFlags, dotAll, sticky, handled, result, state;
+
+  	    if (!thisIsRegExp && patternIsRegExp && flagsAreUndefined && pattern.constructor === RegExpWrapper) {
+  	      return pattern;
+  	    }
+
+  	    if (patternIsRegExp || isPrototypeOf(RegExpPrototype, pattern)) {
+  	      pattern = pattern.source;
+  	      if (flagsAreUndefined) flags = getRegExpFlags(rawPattern);
+  	    }
+
+  	    pattern = pattern === undefined ? '' : toString(pattern);
+  	    flags = flags === undefined ? '' : toString(flags);
+  	    rawPattern = pattern;
+
+  	    if (UNSUPPORTED_DOT_ALL && 'dotAll' in re1) {
+  	      dotAll = !!flags && stringIndexOf(flags, 's') > -1;
+  	      if (dotAll) flags = replace(flags, /s/g, '');
+  	    }
+
+  	    rawFlags = flags;
+
+  	    if (MISSED_STICKY && 'sticky' in re1) {
+  	      sticky = !!flags && stringIndexOf(flags, 'y') > -1;
+  	      if (sticky && UNSUPPORTED_Y) flags = replace(flags, /y/g, '');
+  	    }
+
+  	    if (UNSUPPORTED_NCG) {
+  	      handled = handleNCG(pattern);
+  	      pattern = handled[0];
+  	      groups = handled[1];
+  	    }
+
+  	    result = inheritIfRequired(NativeRegExp(pattern, flags), thisIsRegExp ? this : RegExpPrototype, RegExpWrapper);
+
+  	    if (dotAll || sticky || groups.length) {
+  	      state = enforceInternalState(result);
+  	      if (dotAll) {
+  	        state.dotAll = true;
+  	        state.raw = RegExpWrapper(handleDotAll(pattern), rawFlags);
+  	      }
+  	      if (sticky) state.sticky = true;
+  	      if (groups.length) state.groups = groups;
+  	    }
+
+  	    if (pattern !== rawPattern) try {
+  	      // fails in old engines, but we have no alternatives for unsupported regex syntax
+  	      createNonEnumerableProperty(result, 'source', rawPattern === '' ? '(?:)' : rawPattern);
+  	    } catch (error) { /* empty */ }
+
+  	    return result;
+  	  };
+
+  	  for (var keys = getOwnPropertyNames(NativeRegExp), index = 0; keys.length > index;) {
+  	    proxyAccessor(RegExpWrapper, NativeRegExp, keys[index++]);
+  	  }
+
+  	  RegExpPrototype.constructor = RegExpWrapper;
+  	  RegExpWrapper.prototype = RegExpPrototype;
+  	  defineBuiltIn(globalThis, 'RegExp', RegExpWrapper, { constructor: true });
+  	}
+
+  	// https://tc39.es/ecma262/#sec-get-regexp-@@species
+  	setSpecies('RegExp');
+  	return es_regexp_constructor;
+  }
+
+  requireEs_regexp_constructor();
+
+  var es_regexp_exec = {};
+
+  var regexpExec;
+  var hasRequiredRegexpExec;
+
+  function requireRegexpExec () {
+  	if (hasRequiredRegexpExec) return regexpExec;
+  	hasRequiredRegexpExec = 1;
+  	/* eslint-disable regexp/no-empty-capturing-group, regexp/no-empty-group, regexp/no-lazy-ends -- testing */
+  	/* eslint-disable regexp/no-useless-quantifier -- testing */
+  	var call = requireFunctionCall();
+  	var uncurryThis = requireFunctionUncurryThis();
+  	var toString = requireToString();
+  	var regexpFlags = requireRegexpFlags();
+  	var stickyHelpers = requireRegexpStickyHelpers();
+  	var shared = requireShared();
+  	var create = requireObjectCreate();
+  	var getInternalState = requireInternalState().get;
+  	var UNSUPPORTED_DOT_ALL = requireRegexpUnsupportedDotAll();
+  	var UNSUPPORTED_NCG = requireRegexpUnsupportedNcg();
+
+  	var nativeReplace = shared('native-string-replace', String.prototype.replace);
+  	var nativeExec = RegExp.prototype.exec;
+  	var patchedExec = nativeExec;
+  	var charAt = uncurryThis(''.charAt);
+  	var indexOf = uncurryThis(''.indexOf);
+  	var replace = uncurryThis(''.replace);
+  	var stringSlice = uncurryThis(''.slice);
+
+  	var UPDATES_LAST_INDEX_WRONG = (function () {
+  	  var re1 = /a/;
+  	  var re2 = /b*/g;
+  	  call(nativeExec, re1, 'a');
+  	  call(nativeExec, re2, 'a');
+  	  return re1.lastIndex !== 0 || re2.lastIndex !== 0;
+  	})();
+
+  	var UNSUPPORTED_Y = stickyHelpers.BROKEN_CARET;
+
+  	// nonparticipating capturing group, copied from es5-shim's String#split patch.
+  	var NPCG_INCLUDED = /()??/.exec('')[1] !== undefined;
+
+  	var PATCH = UPDATES_LAST_INDEX_WRONG || NPCG_INCLUDED || UNSUPPORTED_Y || UNSUPPORTED_DOT_ALL || UNSUPPORTED_NCG;
+
+  	if (PATCH) {
+  	  patchedExec = function exec(string) {
+  	    var re = this;
+  	    var state = getInternalState(re);
+  	    var str = toString(string);
+  	    var raw = state.raw;
+  	    var result, reCopy, lastIndex, match, i, object, group;
+
+  	    if (raw) {
+  	      raw.lastIndex = re.lastIndex;
+  	      result = call(patchedExec, raw, str);
+  	      re.lastIndex = raw.lastIndex;
+  	      return result;
+  	    }
+
+  	    var groups = state.groups;
+  	    var sticky = UNSUPPORTED_Y && re.sticky;
+  	    var flags = call(regexpFlags, re);
+  	    var source = re.source;
+  	    var charsAdded = 0;
+  	    var strCopy = str;
+
+  	    if (sticky) {
+  	      flags = replace(flags, 'y', '');
+  	      if (indexOf(flags, 'g') === -1) {
+  	        flags += 'g';
+  	      }
+
+  	      strCopy = stringSlice(str, re.lastIndex);
+  	      // Support anchored sticky behavior.
+  	      if (re.lastIndex > 0 && (!re.multiline || re.multiline && charAt(str, re.lastIndex - 1) !== '\n')) {
+  	        source = '(?: ' + source + ')';
+  	        strCopy = ' ' + strCopy;
+  	        charsAdded++;
+  	      }
+  	      // ^(? + rx + ) is needed, in combination with some str slicing, to
+  	      // simulate the 'y' flag.
+  	      reCopy = new RegExp('^(?:' + source + ')', flags);
+  	    }
+
+  	    if (NPCG_INCLUDED) {
+  	      reCopy = new RegExp('^' + source + '$(?!\\s)', flags);
+  	    }
+  	    if (UPDATES_LAST_INDEX_WRONG) lastIndex = re.lastIndex;
+
+  	    match = call(nativeExec, sticky ? reCopy : re, strCopy);
+
+  	    if (sticky) {
+  	      if (match) {
+  	        match.input = stringSlice(match.input, charsAdded);
+  	        match[0] = stringSlice(match[0], charsAdded);
+  	        match.index = re.lastIndex;
+  	        re.lastIndex += match[0].length;
+  	      } else re.lastIndex = 0;
+  	    } else if (UPDATES_LAST_INDEX_WRONG && match) {
+  	      re.lastIndex = re.global ? match.index + match[0].length : lastIndex;
+  	    }
+  	    if (NPCG_INCLUDED && match && match.length > 1) {
+  	      // Fix browsers whose `exec` methods don't consistently return `undefined`
+  	      // for NPCG, like IE8. NOTE: This doesn't work for /(.?)?/
+  	      call(nativeReplace, match[0], reCopy, function () {
+  	        for (i = 1; i < arguments.length - 2; i++) {
+  	          if (arguments[i] === undefined) match[i] = undefined;
+  	        }
+  	      });
+  	    }
+
+  	    if (match && groups) {
+  	      match.groups = object = create(null);
+  	      for (i = 0; i < groups.length; i++) {
+  	        group = groups[i];
+  	        object[group[0]] = match[group[1]];
+  	      }
+  	    }
+
+  	    return match;
+  	  };
+  	}
+
+  	regexpExec = patchedExec;
+  	return regexpExec;
+  }
+
+  var hasRequiredEs_regexp_exec;
+
+  function requireEs_regexp_exec () {
+  	if (hasRequiredEs_regexp_exec) return es_regexp_exec;
+  	hasRequiredEs_regexp_exec = 1;
+  	var $ = require_export();
+  	var exec = requireRegexpExec();
+
+  	// `RegExp.prototype.exec` method
+  	// https://tc39.es/ecma262/#sec-regexp.prototype.exec
+  	$({ target: 'RegExp', proto: true, forced: /./.exec !== exec }, {
+  	  exec: exec
+  	});
+  	return es_regexp_exec;
+  }
+
+  requireEs_regexp_exec();
+
+  var es_regexp_toString = {};
+
+  var hasRequiredEs_regexp_toString;
+
+  function requireEs_regexp_toString () {
+  	if (hasRequiredEs_regexp_toString) return es_regexp_toString;
+  	hasRequiredEs_regexp_toString = 1;
+  	var PROPER_FUNCTION_NAME = requireFunctionName().PROPER;
+  	var defineBuiltIn = requireDefineBuiltIn();
+  	var anObject = requireAnObject();
+  	var $toString = requireToString();
+  	var fails = requireFails();
+  	var getRegExpFlags = requireRegexpGetFlags();
+
+  	var TO_STRING = 'toString';
+  	var RegExpPrototype = RegExp.prototype;
+  	var nativeToString = RegExpPrototype[TO_STRING];
+
+  	var NOT_GENERIC = fails(function () { return nativeToString.call({ source: 'a', flags: 'b' }) !== '/a/b'; });
+  	// FF44- RegExp#toString has a wrong name
+  	var INCORRECT_NAME = PROPER_FUNCTION_NAME && nativeToString.name !== TO_STRING;
+
+  	// `RegExp.prototype.toString` method
+  	// https://tc39.es/ecma262/#sec-regexp.prototype.tostring
+  	if (NOT_GENERIC || INCORRECT_NAME) {
+  	  defineBuiltIn(RegExpPrototype, TO_STRING, function toString() {
+  	    var R = anObject(this);
+  	    var pattern = $toString(R.source);
+  	    var flags = $toString(getRegExpFlags(R));
+  	    return '/' + pattern + '/' + flags;
+  	  }, { unsafe: true });
+  	}
+  	return es_regexp_toString;
+  }
+
+  requireEs_regexp_toString();
+
+  var es_string_includes = {};
+
+  var notARegexp;
+  var hasRequiredNotARegexp;
+
+  function requireNotARegexp () {
+  	if (hasRequiredNotARegexp) return notARegexp;
+  	hasRequiredNotARegexp = 1;
+  	var isRegExp = requireIsRegexp();
+
+  	var $TypeError = TypeError;
+
+  	notARegexp = function (it) {
+  	  if (isRegExp(it)) {
+  	    throw new $TypeError("The method doesn't accept regular expressions");
+  	  } return it;
+  	};
+  	return notARegexp;
+  }
+
+  var correctIsRegexpLogic;
+  var hasRequiredCorrectIsRegexpLogic;
+
+  function requireCorrectIsRegexpLogic () {
+  	if (hasRequiredCorrectIsRegexpLogic) return correctIsRegexpLogic;
+  	hasRequiredCorrectIsRegexpLogic = 1;
+  	var wellKnownSymbol = requireWellKnownSymbol();
+
+  	var MATCH = wellKnownSymbol('match');
+
+  	correctIsRegexpLogic = function (METHOD_NAME) {
+  	  var regexp = /./;
+  	  try {
+  	    '/./'[METHOD_NAME](regexp);
+  	  } catch (error1) {
+  	    try {
+  	      regexp[MATCH] = false;
+  	      return '/./'[METHOD_NAME](regexp);
+  	    } catch (error2) { /* empty */ }
+  	  } return false;
+  	};
+  	return correctIsRegexpLogic;
+  }
+
+  var hasRequiredEs_string_includes;
+
+  function requireEs_string_includes () {
+  	if (hasRequiredEs_string_includes) return es_string_includes;
+  	hasRequiredEs_string_includes = 1;
+  	var $ = require_export();
+  	var uncurryThis = requireFunctionUncurryThis();
+  	var notARegExp = requireNotARegexp();
+  	var requireObjectCoercible = requireRequireObjectCoercible();
+  	var toString = requireToString();
+  	var correctIsRegExpLogic = requireCorrectIsRegexpLogic();
+
+  	var stringIndexOf = uncurryThis(''.indexOf);
+
+  	// `String.prototype.includes` method
+  	// https://tc39.es/ecma262/#sec-string.prototype.includes
+  	$({ target: 'String', proto: true, forced: !correctIsRegExpLogic('includes') }, {
+  	  includes: function includes(searchString /* , position = 0 */) {
+  	    return !!~stringIndexOf(
+  	      toString(requireObjectCoercible(this)),
+  	      toString(notARegExp(searchString)),
+  	      arguments.length > 1 ? arguments[1] : undefined
+  	    );
+  	  }
+  	});
+  	return es_string_includes;
+  }
+
+  requireEs_string_includes();
+
+  var es_string_replace = {};
+
+  var functionApply;
+  var hasRequiredFunctionApply;
+
+  function requireFunctionApply () {
+  	if (hasRequiredFunctionApply) return functionApply;
+  	hasRequiredFunctionApply = 1;
+  	var NATIVE_BIND = requireFunctionBindNative();
+
+  	var FunctionPrototype = Function.prototype;
+  	var apply = FunctionPrototype.apply;
+  	var call = FunctionPrototype.call;
+
+  	// eslint-disable-next-line es/no-reflect -- safe
+  	functionApply = typeof Reflect == 'object' && Reflect.apply || (NATIVE_BIND ? call.bind(apply) : function () {
+  	  return call.apply(apply, arguments);
+  	});
+  	return functionApply;
+  }
+
+  var fixRegexpWellKnownSymbolLogic;
+  var hasRequiredFixRegexpWellKnownSymbolLogic;
+
+  function requireFixRegexpWellKnownSymbolLogic () {
+  	if (hasRequiredFixRegexpWellKnownSymbolLogic) return fixRegexpWellKnownSymbolLogic;
+  	hasRequiredFixRegexpWellKnownSymbolLogic = 1;
+  	// TODO: Remove from `core-js@4` since it's moved to entry points
+  	requireEs_regexp_exec();
+  	var call = requireFunctionCall();
+  	var defineBuiltIn = requireDefineBuiltIn();
+  	var regexpExec = requireRegexpExec();
+  	var fails = requireFails();
+  	var wellKnownSymbol = requireWellKnownSymbol();
+  	var createNonEnumerableProperty = requireCreateNonEnumerableProperty();
+
+  	var SPECIES = wellKnownSymbol('species');
+  	var RegExpPrototype = RegExp.prototype;
+
+  	fixRegexpWellKnownSymbolLogic = function (KEY, exec, FORCED, SHAM) {
+  	  var SYMBOL = wellKnownSymbol(KEY);
+
+  	  var DELEGATES_TO_SYMBOL = !fails(function () {
+  	    // String methods call symbol-named RegExp methods
+  	    var O = {};
+  	    O[SYMBOL] = function () { return 7; };
+  	    return ''[KEY](O) !== 7;
+  	  });
+
+  	  var DELEGATES_TO_EXEC = DELEGATES_TO_SYMBOL && !fails(function () {
+  	    // Symbol-named RegExp methods call .exec
+  	    var execCalled = false;
+  	    var re = /a/;
+
+  	    if (KEY === 'split') {
+  	      // We can't use real regex here since it causes deoptimization
+  	      // and serious performance degradation in V8
+  	      // https://github.com/zloirock/core-js/issues/306
+  	      re = {};
+  	      // RegExp[@@split] doesn't call the regex's exec method, but first creates
+  	      // a new one. We need to return the patched regex when creating the new one.
+  	      re.constructor = {};
+  	      re.constructor[SPECIES] = function () { return re; };
+  	      re.flags = '';
+  	      re[SYMBOL] = /./[SYMBOL];
+  	    }
+
+  	    re.exec = function () {
+  	      execCalled = true;
+  	      return null;
+  	    };
+
+  	    re[SYMBOL]('');
+  	    return !execCalled;
+  	  });
+
+  	  if (
+  	    !DELEGATES_TO_SYMBOL ||
+  	    !DELEGATES_TO_EXEC ||
+  	    FORCED
+  	  ) {
+  	    var nativeRegExpMethod = /./[SYMBOL];
+  	    var methods = exec(SYMBOL, ''[KEY], function (nativeMethod, regexp, str, arg2, forceStringMethod) {
+  	      var $exec = regexp.exec;
+  	      if ($exec === regexpExec || $exec === RegExpPrototype.exec) {
+  	        if (DELEGATES_TO_SYMBOL && !forceStringMethod) {
+  	          // The native String method already delegates to @@method (this
+  	          // polyfilled function), leasing to infinite recursion.
+  	          // We avoid it by directly calling the native @@method method.
+  	          return { done: true, value: call(nativeRegExpMethod, regexp, str, arg2) };
+  	        }
+  	        return { done: true, value: call(nativeMethod, str, regexp, arg2) };
+  	      }
+  	      return { done: false };
+  	    });
+
+  	    defineBuiltIn(String.prototype, KEY, methods[0]);
+  	    defineBuiltIn(RegExpPrototype, SYMBOL, methods[1]);
+  	  }
+
+  	  if (SHAM) createNonEnumerableProperty(RegExpPrototype[SYMBOL], 'sham', true);
+  	};
+  	return fixRegexpWellKnownSymbolLogic;
+  }
+
+  var stringMultibyte;
+  var hasRequiredStringMultibyte;
+
+  function requireStringMultibyte () {
+  	if (hasRequiredStringMultibyte) return stringMultibyte;
+  	hasRequiredStringMultibyte = 1;
+  	var uncurryThis = requireFunctionUncurryThis();
+  	var toIntegerOrInfinity = requireToIntegerOrInfinity();
+  	var toString = requireToString();
+  	var requireObjectCoercible = requireRequireObjectCoercible();
+
+  	var charAt = uncurryThis(''.charAt);
+  	var charCodeAt = uncurryThis(''.charCodeAt);
+  	var stringSlice = uncurryThis(''.slice);
+
+  	var createMethod = function (CONVERT_TO_STRING) {
+  	  return function ($this, pos) {
+  	    var S = toString(requireObjectCoercible($this));
+  	    var position = toIntegerOrInfinity(pos);
+  	    var size = S.length;
+  	    var first, second;
+  	    if (position < 0 || position >= size) return CONVERT_TO_STRING ? '' : undefined;
+  	    first = charCodeAt(S, position);
+  	    return first < 0xD800 || first > 0xDBFF || position + 1 === size
+  	      || (second = charCodeAt(S, position + 1)) < 0xDC00 || second > 0xDFFF
+  	        ? CONVERT_TO_STRING
+  	          ? charAt(S, position)
+  	          : first
+  	        : CONVERT_TO_STRING
+  	          ? stringSlice(S, position, position + 2)
+  	          : (first - 0xD800 << 10) + (second - 0xDC00) + 0x10000;
+  	  };
+  	};
+
+  	stringMultibyte = {
+  	  // `String.prototype.codePointAt` method
+  	  // https://tc39.es/ecma262/#sec-string.prototype.codepointat
+  	  codeAt: createMethod(false),
+  	  // `String.prototype.at` method
+  	  // https://github.com/mathiasbynens/String.prototype.at
+  	  charAt: createMethod(true)
+  	};
+  	return stringMultibyte;
+  }
+
+  var advanceStringIndex;
+  var hasRequiredAdvanceStringIndex;
+
+  function requireAdvanceStringIndex () {
+  	if (hasRequiredAdvanceStringIndex) return advanceStringIndex;
+  	hasRequiredAdvanceStringIndex = 1;
+  	var charAt = requireStringMultibyte().charAt;
+
+  	// `AdvanceStringIndex` abstract operation
+  	// https://tc39.es/ecma262/#sec-advancestringindex
+  	advanceStringIndex = function (S, index, unicode) {
+  	  return index + (unicode ? charAt(S, index).length : 1);
+  	};
+  	return advanceStringIndex;
+  }
+
+  var getSubstitution;
+  var hasRequiredGetSubstitution;
+
+  function requireGetSubstitution () {
+  	if (hasRequiredGetSubstitution) return getSubstitution;
+  	hasRequiredGetSubstitution = 1;
+  	var uncurryThis = requireFunctionUncurryThis();
+  	var toObject = requireToObject();
+
+  	var floor = Math.floor;
+  	var charAt = uncurryThis(''.charAt);
+  	var replace = uncurryThis(''.replace);
+  	var stringSlice = uncurryThis(''.slice);
+  	// eslint-disable-next-line redos/no-vulnerable -- safe
+  	var SUBSTITUTION_SYMBOLS = /\$([$&'`]|\d{1,2}|<[^>]*>)/g;
+  	var SUBSTITUTION_SYMBOLS_NO_NAMED = /\$([$&'`]|\d{1,2})/g;
+
+  	// `GetSubstitution` abstract operation
+  	// https://tc39.es/ecma262/#sec-getsubstitution
+  	getSubstitution = function (matched, str, position, captures, namedCaptures, replacement) {
+  	  var tailPos = position + matched.length;
+  	  var m = captures.length;
+  	  var symbols = SUBSTITUTION_SYMBOLS_NO_NAMED;
+  	  if (namedCaptures !== undefined) {
+  	    namedCaptures = toObject(namedCaptures);
+  	    symbols = SUBSTITUTION_SYMBOLS;
+  	  }
+  	  return replace(replacement, symbols, function (match, ch) {
+  	    var capture;
+  	    switch (charAt(ch, 0)) {
+  	      case '$': return '$';
+  	      case '&': return matched;
+  	      case '`': return stringSlice(str, 0, position);
+  	      case "'": return stringSlice(str, tailPos);
+  	      case '<':
+  	        capture = namedCaptures[stringSlice(ch, 1, -1)];
+  	        break;
+  	      default: // \d\d?
+  	        var n = +ch;
+  	        if (n === 0) return match;
+  	        if (n > m) {
+  	          var f = floor(n / 10);
+  	          if (f === 0) return match;
+  	          if (f <= m) return captures[f - 1] === undefined ? charAt(ch, 1) : captures[f - 1] + charAt(ch, 1);
+  	          return match;
+  	        }
+  	        capture = captures[n - 1];
+  	    }
+  	    return capture === undefined ? '' : capture;
+  	  });
+  	};
+  	return getSubstitution;
+  }
+
+  var regexpExecAbstract;
+  var hasRequiredRegexpExecAbstract;
+
+  function requireRegexpExecAbstract () {
+  	if (hasRequiredRegexpExecAbstract) return regexpExecAbstract;
+  	hasRequiredRegexpExecAbstract = 1;
+  	var call = requireFunctionCall();
+  	var anObject = requireAnObject();
+  	var isCallable = requireIsCallable();
+  	var classof = requireClassofRaw();
+  	var regexpExec = requireRegexpExec();
+
+  	var $TypeError = TypeError;
+
+  	// `RegExpExec` abstract operation
+  	// https://tc39.es/ecma262/#sec-regexpexec
+  	regexpExecAbstract = function (R, S) {
+  	  var exec = R.exec;
+  	  if (isCallable(exec)) {
+  	    var result = call(exec, R, S);
+  	    if (result !== null) anObject(result);
+  	    return result;
+  	  }
+  	  if (classof(R) === 'RegExp') return call(regexpExec, R, S);
+  	  throw new $TypeError('RegExp#exec called on incompatible receiver');
+  	};
+  	return regexpExecAbstract;
+  }
+
+  var hasRequiredEs_string_replace;
+
+  function requireEs_string_replace () {
+  	if (hasRequiredEs_string_replace) return es_string_replace;
+  	hasRequiredEs_string_replace = 1;
+  	var apply = requireFunctionApply();
+  	var call = requireFunctionCall();
+  	var uncurryThis = requireFunctionUncurryThis();
+  	var fixRegExpWellKnownSymbolLogic = requireFixRegexpWellKnownSymbolLogic();
+  	var fails = requireFails();
+  	var anObject = requireAnObject();
+  	var isCallable = requireIsCallable();
+  	var isNullOrUndefined = requireIsNullOrUndefined();
+  	var toIntegerOrInfinity = requireToIntegerOrInfinity();
+  	var toLength = requireToLength();
+  	var toString = requireToString();
+  	var requireObjectCoercible = requireRequireObjectCoercible();
+  	var advanceStringIndex = requireAdvanceStringIndex();
+  	var getMethod = requireGetMethod();
+  	var getSubstitution = requireGetSubstitution();
+  	var regExpExec = requireRegexpExecAbstract();
+  	var wellKnownSymbol = requireWellKnownSymbol();
+
+  	var REPLACE = wellKnownSymbol('replace');
+  	var max = Math.max;
+  	var min = Math.min;
+  	var concat = uncurryThis([].concat);
+  	var push = uncurryThis([].push);
+  	var stringIndexOf = uncurryThis(''.indexOf);
+  	var stringSlice = uncurryThis(''.slice);
+
+  	var maybeToString = function (it) {
+  	  return it === undefined ? it : String(it);
+  	};
+
+  	// IE <= 11 replaces $0 with the whole match, as if it was $&
+  	// https://stackoverflow.com/questions/6024666/getting-ie-to-replace-a-regex-with-the-literal-string-0
+  	var REPLACE_KEEPS_$0 = (function () {
+  	  // eslint-disable-next-line regexp/prefer-escape-replacement-dollar-char -- required for testing
+  	  return 'a'.replace(/./, '$0') === '$0';
+  	})();
+
+  	// Safari <= 13.0.3(?) substitutes nth capture where n>m with an empty string
+  	var REGEXP_REPLACE_SUBSTITUTES_UNDEFINED_CAPTURE = (function () {
+  	  if (/./[REPLACE]) {
+  	    return /./[REPLACE]('a', '$0') === '';
+  	  }
+  	  return false;
+  	})();
+
+  	var REPLACE_SUPPORTS_NAMED_GROUPS = !fails(function () {
+  	  var re = /./;
+  	  re.exec = function () {
+  	    var result = [];
+  	    result.groups = { a: '7' };
+  	    return result;
+  	  };
+  	  // eslint-disable-next-line regexp/no-useless-dollar-replacements -- false positive
+  	  return ''.replace(re, '$<a>') !== '7';
+  	});
+
+  	// @@replace logic
+  	fixRegExpWellKnownSymbolLogic('replace', function (_, nativeReplace, maybeCallNative) {
+  	  var UNSAFE_SUBSTITUTE = REGEXP_REPLACE_SUBSTITUTES_UNDEFINED_CAPTURE ? '$' : '$0';
+
+  	  return [
+  	    // `String.prototype.replace` method
+  	    // https://tc39.es/ecma262/#sec-string.prototype.replace
+  	    function replace(searchValue, replaceValue) {
+  	      var O = requireObjectCoercible(this);
+  	      var replacer = isNullOrUndefined(searchValue) ? undefined : getMethod(searchValue, REPLACE);
+  	      return replacer
+  	        ? call(replacer, searchValue, O, replaceValue)
+  	        : call(nativeReplace, toString(O), searchValue, replaceValue);
+  	    },
+  	    // `RegExp.prototype[@@replace]` method
+  	    // https://tc39.es/ecma262/#sec-regexp.prototype-@@replace
+  	    function (string, replaceValue) {
+  	      var rx = anObject(this);
+  	      var S = toString(string);
+
+  	      if (
+  	        typeof replaceValue == 'string' &&
+  	        stringIndexOf(replaceValue, UNSAFE_SUBSTITUTE) === -1 &&
+  	        stringIndexOf(replaceValue, '$<') === -1
+  	      ) {
+  	        var res = maybeCallNative(nativeReplace, rx, S, replaceValue);
+  	        if (res.done) return res.value;
+  	      }
+
+  	      var functionalReplace = isCallable(replaceValue);
+  	      if (!functionalReplace) replaceValue = toString(replaceValue);
+
+  	      var global = rx.global;
+  	      var fullUnicode;
+  	      if (global) {
+  	        fullUnicode = rx.unicode;
+  	        rx.lastIndex = 0;
+  	      }
+
+  	      var results = [];
+  	      var result;
+  	      while (true) {
+  	        result = regExpExec(rx, S);
+  	        if (result === null) break;
+
+  	        push(results, result);
+  	        if (!global) break;
+
+  	        var matchStr = toString(result[0]);
+  	        if (matchStr === '') rx.lastIndex = advanceStringIndex(S, toLength(rx.lastIndex), fullUnicode);
+  	      }
+
+  	      var accumulatedResult = '';
+  	      var nextSourcePosition = 0;
+  	      for (var i = 0; i < results.length; i++) {
+  	        result = results[i];
+
+  	        var matched = toString(result[0]);
+  	        var position = max(min(toIntegerOrInfinity(result.index), S.length), 0);
+  	        var captures = [];
+  	        var replacement;
+  	        // NOTE: This is equivalent to
+  	        //   captures = result.slice(1).map(maybeToString)
+  	        // but for some reason `nativeSlice.call(result, 1, result.length)` (called in
+  	        // the slice polyfill when slicing native arrays) "doesn't work" in safari 9 and
+  	        // causes a crash (https://pastebin.com/N21QzeQA) when trying to debug it.
+  	        for (var j = 1; j < result.length; j++) push(captures, maybeToString(result[j]));
+  	        var namedCaptures = result.groups;
+  	        if (functionalReplace) {
+  	          var replacerArgs = concat([matched], captures, position, S);
+  	          if (namedCaptures !== undefined) push(replacerArgs, namedCaptures);
+  	          replacement = toString(apply(replaceValue, undefined, replacerArgs));
+  	        } else {
+  	          replacement = getSubstitution(matched, S, position, captures, namedCaptures, replaceValue);
+  	        }
+  	        if (position >= nextSourcePosition) {
+  	          accumulatedResult += stringSlice(S, nextSourcePosition, position) + replacement;
+  	          nextSourcePosition = position + matched.length;
+  	        }
+  	      }
+
+  	      return accumulatedResult + stringSlice(S, nextSourcePosition);
+  	    }
+  	  ];
+  	}, !REPLACE_SUPPORTS_NAMED_GROUPS || !REPLACE_KEEPS_$0 || REGEXP_REPLACE_SUBSTITUTES_UNDEFINED_CAPTURE);
+  	return es_string_replace;
+  }
+
+  requireEs_string_replace();
+
+  var es_string_search = {};
+
+  var sameValue;
+  var hasRequiredSameValue;
+
+  function requireSameValue () {
+  	if (hasRequiredSameValue) return sameValue;
+  	hasRequiredSameValue = 1;
+  	// `SameValue` abstract operation
+  	// https://tc39.es/ecma262/#sec-samevalue
+  	// eslint-disable-next-line es/no-object-is -- safe
+  	sameValue = Object.is || function is(x, y) {
+  	  // eslint-disable-next-line no-self-compare -- NaN check
+  	  return x === y ? x !== 0 || 1 / x === 1 / y : x !== x && y !== y;
+  	};
+  	return sameValue;
+  }
+
+  var hasRequiredEs_string_search;
+
+  function requireEs_string_search () {
+  	if (hasRequiredEs_string_search) return es_string_search;
+  	hasRequiredEs_string_search = 1;
+  	var call = requireFunctionCall();
+  	var fixRegExpWellKnownSymbolLogic = requireFixRegexpWellKnownSymbolLogic();
+  	var anObject = requireAnObject();
+  	var isNullOrUndefined = requireIsNullOrUndefined();
+  	var requireObjectCoercible = requireRequireObjectCoercible();
+  	var sameValue = requireSameValue();
+  	var toString = requireToString();
+  	var getMethod = requireGetMethod();
+  	var regExpExec = requireRegexpExecAbstract();
+
+  	// @@search logic
+  	fixRegExpWellKnownSymbolLogic('search', function (SEARCH, nativeSearch, maybeCallNative) {
+  	  return [
+  	    // `String.prototype.search` method
+  	    // https://tc39.es/ecma262/#sec-string.prototype.search
+  	    function search(regexp) {
+  	      var O = requireObjectCoercible(this);
+  	      var searcher = isNullOrUndefined(regexp) ? undefined : getMethod(regexp, SEARCH);
+  	      return searcher ? call(searcher, regexp, O) : new RegExp(regexp)[SEARCH](toString(O));
+  	    },
+  	    // `RegExp.prototype[@@search]` method
+  	    // https://tc39.es/ecma262/#sec-regexp.prototype-@@search
+  	    function (string) {
+  	      var rx = anObject(this);
+  	      var S = toString(string);
+  	      var res = maybeCallNative(nativeSearch, rx, S);
+
+  	      if (res.done) return res.value;
+
+  	      var previousLastIndex = rx.lastIndex;
+  	      if (!sameValue(previousLastIndex, 0)) rx.lastIndex = 0;
+  	      var result = regExpExec(rx, S);
+  	      if (!sameValue(rx.lastIndex, previousLastIndex)) rx.lastIndex = previousLastIndex;
+  	      return result === null ? -1 : result.index;
+  	    }
+  	  ];
+  	});
+  	return es_string_search;
+  }
+
+  requireEs_string_search();
+
+  var es_string_split = {};
+
+  var aConstructor;
+  var hasRequiredAConstructor;
+
+  function requireAConstructor () {
+  	if (hasRequiredAConstructor) return aConstructor;
+  	hasRequiredAConstructor = 1;
+  	var isConstructor = requireIsConstructor();
+  	var tryToString = requireTryToString();
+
+  	var $TypeError = TypeError;
+
+  	// `Assert: IsConstructor(argument) is true`
+  	aConstructor = function (argument) {
+  	  if (isConstructor(argument)) return argument;
+  	  throw new $TypeError(tryToString(argument) + ' is not a constructor');
+  	};
+  	return aConstructor;
+  }
+
+  var speciesConstructor;
+  var hasRequiredSpeciesConstructor;
+
+  function requireSpeciesConstructor () {
+  	if (hasRequiredSpeciesConstructor) return speciesConstructor;
+  	hasRequiredSpeciesConstructor = 1;
+  	var anObject = requireAnObject();
+  	var aConstructor = requireAConstructor();
+  	var isNullOrUndefined = requireIsNullOrUndefined();
+  	var wellKnownSymbol = requireWellKnownSymbol();
+
+  	var SPECIES = wellKnownSymbol('species');
+
+  	// `SpeciesConstructor` abstract operation
+  	// https://tc39.es/ecma262/#sec-speciesconstructor
+  	speciesConstructor = function (O, defaultConstructor) {
+  	  var C = anObject(O).constructor;
+  	  var S;
+  	  return C === undefined || isNullOrUndefined(S = anObject(C)[SPECIES]) ? defaultConstructor : aConstructor(S);
+  	};
+  	return speciesConstructor;
+  }
+
+  var hasRequiredEs_string_split;
+
+  function requireEs_string_split () {
+  	if (hasRequiredEs_string_split) return es_string_split;
+  	hasRequiredEs_string_split = 1;
+  	var call = requireFunctionCall();
+  	var uncurryThis = requireFunctionUncurryThis();
+  	var fixRegExpWellKnownSymbolLogic = requireFixRegexpWellKnownSymbolLogic();
+  	var anObject = requireAnObject();
+  	var isNullOrUndefined = requireIsNullOrUndefined();
+  	var requireObjectCoercible = requireRequireObjectCoercible();
+  	var speciesConstructor = requireSpeciesConstructor();
+  	var advanceStringIndex = requireAdvanceStringIndex();
+  	var toLength = requireToLength();
+  	var toString = requireToString();
+  	var getMethod = requireGetMethod();
+  	var regExpExec = requireRegexpExecAbstract();
+  	var stickyHelpers = requireRegexpStickyHelpers();
+  	var fails = requireFails();
+
+  	var UNSUPPORTED_Y = stickyHelpers.UNSUPPORTED_Y;
+  	var MAX_UINT32 = 0xFFFFFFFF;
+  	var min = Math.min;
+  	var push = uncurryThis([].push);
+  	var stringSlice = uncurryThis(''.slice);
+
+  	// Chrome 51 has a buggy "split" implementation when RegExp#exec !== nativeExec
+  	// Weex JS has frozen built-in prototypes, so use try / catch wrapper
+  	var SPLIT_WORKS_WITH_OVERWRITTEN_EXEC = !fails(function () {
+  	  // eslint-disable-next-line regexp/no-empty-group -- required for testing
+  	  var re = /(?:)/;
+  	  var originalExec = re.exec;
+  	  re.exec = function () { return originalExec.apply(this, arguments); };
+  	  var result = 'ab'.split(re);
+  	  return result.length !== 2 || result[0] !== 'a' || result[1] !== 'b';
+  	});
+
+  	var BUGGY = 'abbc'.split(/(b)*/)[1] === 'c' ||
+  	  // eslint-disable-next-line regexp/no-empty-group -- required for testing
+  	  'test'.split(/(?:)/, -1).length !== 4 ||
+  	  'ab'.split(/(?:ab)*/).length !== 2 ||
+  	  '.'.split(/(.?)(.?)/).length !== 4 ||
+  	  // eslint-disable-next-line regexp/no-empty-capturing-group, regexp/no-empty-group -- required for testing
+  	  '.'.split(/()()/).length > 1 ||
+  	  ''.split(/.?/).length;
+
+  	// @@split logic
+  	fixRegExpWellKnownSymbolLogic('split', function (SPLIT, nativeSplit, maybeCallNative) {
+  	  var internalSplit = '0'.split(undefined, 0).length ? function (separator, limit) {
+  	    return separator === undefined && limit === 0 ? [] : call(nativeSplit, this, separator, limit);
+  	  } : nativeSplit;
+
+  	  return [
+  	    // `String.prototype.split` method
+  	    // https://tc39.es/ecma262/#sec-string.prototype.split
+  	    function split(separator, limit) {
+  	      var O = requireObjectCoercible(this);
+  	      var splitter = isNullOrUndefined(separator) ? undefined : getMethod(separator, SPLIT);
+  	      return splitter
+  	        ? call(splitter, separator, O, limit)
+  	        : call(internalSplit, toString(O), separator, limit);
+  	    },
+  	    // `RegExp.prototype[@@split]` method
+  	    // https://tc39.es/ecma262/#sec-regexp.prototype-@@split
+  	    //
+  	    // NOTE: This cannot be properly polyfilled in engines that don't support
+  	    // the 'y' flag.
+  	    function (string, limit) {
+  	      var rx = anObject(this);
+  	      var S = toString(string);
+
+  	      if (!BUGGY) {
+  	        var res = maybeCallNative(internalSplit, rx, S, limit, internalSplit !== nativeSplit);
+  	        if (res.done) return res.value;
+  	      }
+
+  	      var C = speciesConstructor(rx, RegExp);
+  	      var unicodeMatching = rx.unicode;
+  	      var flags = (rx.ignoreCase ? 'i' : '') +
+  	                  (rx.multiline ? 'm' : '') +
+  	                  (rx.unicode ? 'u' : '') +
+  	                  (UNSUPPORTED_Y ? 'g' : 'y');
+  	      // ^(? + rx + ) is needed, in combination with some S slicing, to
+  	      // simulate the 'y' flag.
+  	      var splitter = new C(UNSUPPORTED_Y ? '^(?:' + rx.source + ')' : rx, flags);
+  	      var lim = limit === undefined ? MAX_UINT32 : limit >>> 0;
+  	      if (lim === 0) return [];
+  	      if (S.length === 0) return regExpExec(splitter, S) === null ? [S] : [];
+  	      var p = 0;
+  	      var q = 0;
+  	      var A = [];
+  	      while (q < S.length) {
+  	        splitter.lastIndex = UNSUPPORTED_Y ? 0 : q;
+  	        var z = regExpExec(splitter, UNSUPPORTED_Y ? stringSlice(S, q) : S);
+  	        var e;
+  	        if (
+  	          z === null ||
+  	          (e = min(toLength(splitter.lastIndex + (UNSUPPORTED_Y ? q : 0)), S.length)) === p
+  	        ) {
+  	          q = advanceStringIndex(S, q, unicodeMatching);
+  	        } else {
+  	          push(A, stringSlice(S, p, q));
+  	          if (A.length === lim) return A;
+  	          for (var i = 1; i <= z.length - 1; i++) {
+  	            push(A, z[i]);
+  	            if (A.length === lim) return A;
+  	          }
+  	          q = p = e;
+  	        }
+  	      }
+  	      push(A, stringSlice(S, p));
+  	      return A;
+  	    }
+  	  ];
+  	}, BUGGY || !SPLIT_WORKS_WITH_OVERWRITTEN_EXEC, UNSUPPORTED_Y);
+  	return es_string_split;
+  }
+
+  requireEs_string_split();
+
+  var es_string_trim = {};
+
+  var stringTrimForced;
+  var hasRequiredStringTrimForced;
+
+  function requireStringTrimForced () {
+  	if (hasRequiredStringTrimForced) return stringTrimForced;
+  	hasRequiredStringTrimForced = 1;
+  	var PROPER_FUNCTION_NAME = requireFunctionName().PROPER;
+  	var fails = requireFails();
+  	var whitespaces = requireWhitespaces();
+
+  	var non = '\u200B\u0085\u180E';
+
+  	// check that a method works with the correct list
+  	// of whitespaces and has a correct name
+  	stringTrimForced = function (METHOD_NAME) {
+  	  return fails(function () {
+  	    return !!whitespaces[METHOD_NAME]()
+  	      || non[METHOD_NAME]() !== non
+  	      || (PROPER_FUNCTION_NAME && whitespaces[METHOD_NAME].name !== METHOD_NAME);
+  	  });
+  	};
+  	return stringTrimForced;
+  }
+
+  var hasRequiredEs_string_trim;
+
+  function requireEs_string_trim () {
+  	if (hasRequiredEs_string_trim) return es_string_trim;
+  	hasRequiredEs_string_trim = 1;
+  	var $ = require_export();
+  	var $trim = requireStringTrim().trim;
+  	var forcedStringTrimMethod = requireStringTrimForced();
+
+  	// `String.prototype.trim` method
+  	// https://tc39.es/ecma262/#sec-string.prototype.trim
+  	$({ target: 'String', proto: true, forced: forcedStringTrimMethod('trim') }, {
+  	  trim: function trim() {
+  	    return $trim(this);
+  	  }
+  	});
+  	return es_string_trim;
+  }
+
+  requireEs_string_trim();
+
+  var web_domCollections_forEach = {};
+
+  var domIterables;
+  var hasRequiredDomIterables;
+
+  function requireDomIterables () {
+  	if (hasRequiredDomIterables) return domIterables;
+  	hasRequiredDomIterables = 1;
+  	// iterable DOM collections
+  	// flag - `iterable` interface - 'entries', 'keys', 'values', 'forEach' methods
+  	domIterables = {
+  	  CSSRuleList: 0,
+  	  CSSStyleDeclaration: 0,
+  	  CSSValueList: 0,
+  	  ClientRectList: 0,
+  	  DOMRectList: 0,
+  	  DOMStringList: 0,
+  	  DOMTokenList: 1,
+  	  DataTransferItemList: 0,
+  	  FileList: 0,
+  	  HTMLAllCollection: 0,
+  	  HTMLCollection: 0,
+  	  HTMLFormElement: 0,
+  	  HTMLSelectElement: 0,
+  	  MediaList: 0,
+  	  MimeTypeArray: 0,
+  	  NamedNodeMap: 0,
+  	  NodeList: 1,
+  	  PaintRequestList: 0,
+  	  Plugin: 0,
+  	  PluginArray: 0,
+  	  SVGLengthList: 0,
+  	  SVGNumberList: 0,
+  	  SVGPathSegList: 0,
+  	  SVGPointList: 0,
+  	  SVGStringList: 0,
+  	  SVGTransformList: 0,
+  	  SourceBufferList: 0,
+  	  StyleSheetList: 0,
+  	  TextTrackCueList: 0,
+  	  TextTrackList: 0,
+  	  TouchList: 0
+  	};
+  	return domIterables;
+  }
+
+  var domTokenListPrototype;
+  var hasRequiredDomTokenListPrototype;
+
+  function requireDomTokenListPrototype () {
+  	if (hasRequiredDomTokenListPrototype) return domTokenListPrototype;
+  	hasRequiredDomTokenListPrototype = 1;
+  	// in old WebKit versions, `element.classList` is not an instance of global `DOMTokenList`
+  	var documentCreateElement = requireDocumentCreateElement();
+
+  	var classList = documentCreateElement('span').classList;
+  	var DOMTokenListPrototype = classList && classList.constructor && classList.constructor.prototype;
+
+  	domTokenListPrototype = DOMTokenListPrototype === Object.prototype ? undefined : DOMTokenListPrototype;
+  	return domTokenListPrototype;
+  }
+
+  var arrayForEach;
+  var hasRequiredArrayForEach;
+
+  function requireArrayForEach () {
+  	if (hasRequiredArrayForEach) return arrayForEach;
+  	hasRequiredArrayForEach = 1;
+  	var $forEach = requireArrayIteration().forEach;
+  	var arrayMethodIsStrict = requireArrayMethodIsStrict();
+
+  	var STRICT_METHOD = arrayMethodIsStrict('forEach');
+
+  	// `Array.prototype.forEach` method implementation
+  	// https://tc39.es/ecma262/#sec-array.prototype.foreach
+  	arrayForEach = !STRICT_METHOD ? function forEach(callbackfn /* , thisArg */) {
+  	  return $forEach(this, callbackfn, arguments.length > 1 ? arguments[1] : undefined);
+  	// eslint-disable-next-line es/no-array-prototype-foreach -- safe
+  	} : [].forEach;
+  	return arrayForEach;
+  }
+
+  var hasRequiredWeb_domCollections_forEach;
+
+  function requireWeb_domCollections_forEach () {
+  	if (hasRequiredWeb_domCollections_forEach) return web_domCollections_forEach;
+  	hasRequiredWeb_domCollections_forEach = 1;
+  	var globalThis = requireGlobalThis();
+  	var DOMIterables = requireDomIterables();
+  	var DOMTokenListPrototype = requireDomTokenListPrototype();
+  	var forEach = requireArrayForEach();
+  	var createNonEnumerableProperty = requireCreateNonEnumerableProperty();
+
+  	var handlePrototype = function (CollectionPrototype) {
+  	  // some Chrome versions have non-configurable methods on DOMTokenList
+  	  if (CollectionPrototype && CollectionPrototype.forEach !== forEach) try {
+  	    createNonEnumerableProperty(CollectionPrototype, 'forEach', forEach);
+  	  } catch (error) {
+  	    CollectionPrototype.forEach = forEach;
+  	  }
+  	};
+
+  	for (var COLLECTION_NAME in DOMIterables) {
+  	  if (DOMIterables[COLLECTION_NAME]) {
+  	    handlePrototype(globalThis[COLLECTION_NAME] && globalThis[COLLECTION_NAME].prototype);
+  	  }
+  	}
+
+  	handlePrototype(DOMTokenListPrototype);
+  	return web_domCollections_forEach;
+  }
+
+  requireWeb_domCollections_forEach();
+
+  var web_domCollections_iterator = {};
+
+  var hasRequiredWeb_domCollections_iterator;
+
+  function requireWeb_domCollections_iterator () {
+  	if (hasRequiredWeb_domCollections_iterator) return web_domCollections_iterator;
+  	hasRequiredWeb_domCollections_iterator = 1;
+  	var globalThis = requireGlobalThis();
+  	var DOMIterables = requireDomIterables();
+  	var DOMTokenListPrototype = requireDomTokenListPrototype();
+  	var ArrayIteratorMethods = requireEs_array_iterator();
+  	var createNonEnumerableProperty = requireCreateNonEnumerableProperty();
+  	var setToStringTag = requireSetToStringTag();
+  	var wellKnownSymbol = requireWellKnownSymbol();
+
+  	var ITERATOR = wellKnownSymbol('iterator');
+  	var ArrayValues = ArrayIteratorMethods.values;
+
+  	var handlePrototype = function (CollectionPrototype, COLLECTION_NAME) {
+  	  if (CollectionPrototype) {
+  	    // some Chrome versions have non-configurable methods on DOMTokenList
+  	    if (CollectionPrototype[ITERATOR] !== ArrayValues) try {
+  	      createNonEnumerableProperty(CollectionPrototype, ITERATOR, ArrayValues);
+  	    } catch (error) {
+  	      CollectionPrototype[ITERATOR] = ArrayValues;
+  	    }
+  	    setToStringTag(CollectionPrototype, COLLECTION_NAME, true);
+  	    if (DOMIterables[COLLECTION_NAME]) for (var METHOD_NAME in ArrayIteratorMethods) {
+  	      // some Chrome versions have non-configurable methods on DOMTokenList
+  	      if (CollectionPrototype[METHOD_NAME] !== ArrayIteratorMethods[METHOD_NAME]) try {
+  	        createNonEnumerableProperty(CollectionPrototype, METHOD_NAME, ArrayIteratorMethods[METHOD_NAME]);
+  	      } catch (error) {
+  	        CollectionPrototype[METHOD_NAME] = ArrayIteratorMethods[METHOD_NAME];
+  	      }
+  	    }
+  	  }
+  	};
+
+  	for (var COLLECTION_NAME in DOMIterables) {
+  	  handlePrototype(globalThis[COLLECTION_NAME] && globalThis[COLLECTION_NAME].prototype, COLLECTION_NAME);
+  	}
+
+  	handlePrototype(DOMTokenListPrototype, 'DOMTokenList');
+  	return web_domCollections_iterator;
+  }
+
+  requireWeb_domCollections_iterator();
+
+  var es_object_getPrototypeOf = {};
+
+  var hasRequiredEs_object_getPrototypeOf;
+
+  function requireEs_object_getPrototypeOf () {
+  	if (hasRequiredEs_object_getPrototypeOf) return es_object_getPrototypeOf;
+  	hasRequiredEs_object_getPrototypeOf = 1;
+  	var $ = require_export();
+  	var fails = requireFails();
+  	var toObject = requireToObject();
+  	var nativeGetPrototypeOf = requireObjectGetPrototypeOf();
+  	var CORRECT_PROTOTYPE_GETTER = requireCorrectPrototypeGetter();
+
+  	var FAILS_ON_PRIMITIVES = fails(function () { nativeGetPrototypeOf(1); });
+
+  	// `Object.getPrototypeOf` method
+  	// https://tc39.es/ecma262/#sec-object.getprototypeof
+  	$({ target: 'Object', stat: true, forced: FAILS_ON_PRIMITIVES, sham: !CORRECT_PROTOTYPE_GETTER }, {
+  	  getPrototypeOf: function getPrototypeOf(it) {
+  	    return nativeGetPrototypeOf(toObject(it));
+  	  }
+  	});
+  	return es_object_getPrototypeOf;
+  }
+
+  requireEs_object_getPrototypeOf();
+
+  var es_string_endsWith = {};
+
+  var hasRequiredEs_string_endsWith;
+
+  function requireEs_string_endsWith () {
+  	if (hasRequiredEs_string_endsWith) return es_string_endsWith;
+  	hasRequiredEs_string_endsWith = 1;
+  	var $ = require_export();
+  	var uncurryThis = requireFunctionUncurryThisClause();
+  	var getOwnPropertyDescriptor = requireObjectGetOwnPropertyDescriptor().f;
+  	var toLength = requireToLength();
+  	var toString = requireToString();
+  	var notARegExp = requireNotARegexp();
+  	var requireObjectCoercible = requireRequireObjectCoercible();
+  	var correctIsRegExpLogic = requireCorrectIsRegexpLogic();
+  	var IS_PURE = requireIsPure();
+
+  	var slice = uncurryThis(''.slice);
+  	var min = Math.min;
+
+  	var CORRECT_IS_REGEXP_LOGIC = correctIsRegExpLogic('endsWith');
+  	// https://github.com/zloirock/core-js/pull/702
+  	var MDN_POLYFILL_BUG = !IS_PURE && !CORRECT_IS_REGEXP_LOGIC && !!function () {
+  	  var descriptor = getOwnPropertyDescriptor(String.prototype, 'endsWith');
+  	  return descriptor && !descriptor.writable;
+  	}();
+
+  	// `String.prototype.endsWith` method
+  	// https://tc39.es/ecma262/#sec-string.prototype.endswith
+  	$({ target: 'String', proto: true, forced: !MDN_POLYFILL_BUG && !CORRECT_IS_REGEXP_LOGIC }, {
+  	  endsWith: function endsWith(searchString /* , endPosition = @length */) {
+  	    var that = toString(requireObjectCoercible(this));
+  	    notARegExp(searchString);
+  	    var endPosition = arguments.length > 1 ? arguments[1] : undefined;
+  	    var len = that.length;
+  	    var end = endPosition === undefined ? len : min(toLength(endPosition), len);
+  	    var search = toString(searchString);
+  	    return slice(that, end - search.length, end) === search;
+  	  }
+  	});
+  	return es_string_endsWith;
+  }
+
+  requireEs_string_endsWith();
+
+  var es_string_iterator = {};
+
+  var hasRequiredEs_string_iterator;
+
+  function requireEs_string_iterator () {
+  	if (hasRequiredEs_string_iterator) return es_string_iterator;
+  	hasRequiredEs_string_iterator = 1;
+  	var charAt = requireStringMultibyte().charAt;
+  	var toString = requireToString();
+  	var InternalStateModule = requireInternalState();
+  	var defineIterator = requireIteratorDefine();
+  	var createIterResultObject = requireCreateIterResultObject();
+
+  	var STRING_ITERATOR = 'String Iterator';
+  	var setInternalState = InternalStateModule.set;
+  	var getInternalState = InternalStateModule.getterFor(STRING_ITERATOR);
+
+  	// `String.prototype[@@iterator]` method
+  	// https://tc39.es/ecma262/#sec-string.prototype-@@iterator
+  	defineIterator(String, 'String', function (iterated) {
+  	  setInternalState(this, {
+  	    type: STRING_ITERATOR,
+  	    string: toString(iterated),
+  	    index: 0
+  	  });
+  	// `%StringIteratorPrototype%.next` method
+  	// https://tc39.es/ecma262/#sec-%stringiteratorprototype%.next
+  	}, function next() {
+  	  var state = getInternalState(this);
+  	  var string = state.string;
+  	  var index = state.index;
+  	  var point;
+  	  if (index >= string.length) return createIterResultObject(undefined, true);
+  	  point = charAt(string, index);
+  	  state.index += point.length;
+  	  return createIterResultObject(point, false);
+  	});
+  	return es_string_iterator;
+  }
+
+  requireEs_string_iterator();
+
+  var es_string_match = {};
+
+  var hasRequiredEs_string_match;
+
+  function requireEs_string_match () {
+  	if (hasRequiredEs_string_match) return es_string_match;
+  	hasRequiredEs_string_match = 1;
+  	var call = requireFunctionCall();
+  	var fixRegExpWellKnownSymbolLogic = requireFixRegexpWellKnownSymbolLogic();
+  	var anObject = requireAnObject();
+  	var isNullOrUndefined = requireIsNullOrUndefined();
+  	var toLength = requireToLength();
+  	var toString = requireToString();
+  	var requireObjectCoercible = requireRequireObjectCoercible();
+  	var getMethod = requireGetMethod();
+  	var advanceStringIndex = requireAdvanceStringIndex();
+  	var regExpExec = requireRegexpExecAbstract();
+
+  	// @@match logic
+  	fixRegExpWellKnownSymbolLogic('match', function (MATCH, nativeMatch, maybeCallNative) {
+  	  return [
+  	    // `String.prototype.match` method
+  	    // https://tc39.es/ecma262/#sec-string.prototype.match
+  	    function match(regexp) {
+  	      var O = requireObjectCoercible(this);
+  	      var matcher = isNullOrUndefined(regexp) ? undefined : getMethod(regexp, MATCH);
+  	      return matcher ? call(matcher, regexp, O) : new RegExp(regexp)[MATCH](toString(O));
+  	    },
+  	    // `RegExp.prototype[@@match]` method
+  	    // https://tc39.es/ecma262/#sec-regexp.prototype-@@match
+  	    function (string) {
+  	      var rx = anObject(this);
+  	      var S = toString(string);
+  	      var res = maybeCallNative(nativeMatch, rx, S);
+
+  	      if (res.done) return res.value;
+
+  	      if (!rx.global) return regExpExec(rx, S);
+
+  	      var fullUnicode = rx.unicode;
+  	      rx.lastIndex = 0;
+  	      var A = [];
+  	      var n = 0;
+  	      var result;
+  	      while ((result = regExpExec(rx, S)) !== null) {
+  	        var matchStr = toString(result[0]);
+  	        A[n] = matchStr;
+  	        if (matchStr === '') rx.lastIndex = advanceStringIndex(S, toLength(rx.lastIndex), fullUnicode);
+  	        n++;
+  	      }
+  	      return n === 0 ? null : A;
+  	    }
+  	  ];
+  	});
+  	return es_string_match;
+  }
+
+  requireEs_string_match();
+
+  var es_string_startsWith = {};
+
+  var hasRequiredEs_string_startsWith;
+
+  function requireEs_string_startsWith () {
+  	if (hasRequiredEs_string_startsWith) return es_string_startsWith;
+  	hasRequiredEs_string_startsWith = 1;
+  	var $ = require_export();
+  	var uncurryThis = requireFunctionUncurryThisClause();
+  	var getOwnPropertyDescriptor = requireObjectGetOwnPropertyDescriptor().f;
+  	var toLength = requireToLength();
+  	var toString = requireToString();
+  	var notARegExp = requireNotARegexp();
+  	var requireObjectCoercible = requireRequireObjectCoercible();
+  	var correctIsRegExpLogic = requireCorrectIsRegexpLogic();
+  	var IS_PURE = requireIsPure();
+
+  	var stringSlice = uncurryThis(''.slice);
+  	var min = Math.min;
+
+  	var CORRECT_IS_REGEXP_LOGIC = correctIsRegExpLogic('startsWith');
+  	// https://github.com/zloirock/core-js/pull/702
+  	var MDN_POLYFILL_BUG = !IS_PURE && !CORRECT_IS_REGEXP_LOGIC && !!function () {
+  	  var descriptor = getOwnPropertyDescriptor(String.prototype, 'startsWith');
+  	  return descriptor && !descriptor.writable;
+  	}();
+
+  	// `String.prototype.startsWith` method
+  	// https://tc39.es/ecma262/#sec-string.prototype.startswith
+  	$({ target: 'String', proto: true, forced: !MDN_POLYFILL_BUG && !CORRECT_IS_REGEXP_LOGIC }, {
+  	  startsWith: function startsWith(searchString /* , position = 0 */) {
+  	    var that = toString(requireObjectCoercible(this));
+  	    notARegExp(searchString);
+  	    var index = toLength(min(arguments.length > 1 ? arguments[1] : undefined, that.length));
+  	    var search = toString(searchString);
+  	    return stringSlice(that, index, index + search.length) === search;
+  	  }
+  	});
+  	return es_string_startsWith;
+  }
+
+  requireEs_string_startsWith();
+
+  var web_urlSearchParams = {};
+
+  var es_string_fromCodePoint = {};
+
+  var hasRequiredEs_string_fromCodePoint;
+
+  function requireEs_string_fromCodePoint () {
+  	if (hasRequiredEs_string_fromCodePoint) return es_string_fromCodePoint;
+  	hasRequiredEs_string_fromCodePoint = 1;
+  	var $ = require_export();
+  	var uncurryThis = requireFunctionUncurryThis();
+  	var toAbsoluteIndex = requireToAbsoluteIndex();
+
+  	var $RangeError = RangeError;
+  	var fromCharCode = String.fromCharCode;
+  	// eslint-disable-next-line es/no-string-fromcodepoint -- required for testing
+  	var $fromCodePoint = String.fromCodePoint;
+  	var join = uncurryThis([].join);
+
+  	// length should be 1, old FF problem
+  	var INCORRECT_LENGTH = !!$fromCodePoint && $fromCodePoint.length !== 1;
+
+  	// `String.fromCodePoint` method
+  	// https://tc39.es/ecma262/#sec-string.fromcodepoint
+  	$({ target: 'String', stat: true, arity: 1, forced: INCORRECT_LENGTH }, {
+  	  // eslint-disable-next-line no-unused-vars -- required for `.length`
+  	  fromCodePoint: function fromCodePoint(x) {
+  	    var elements = [];
+  	    var length = arguments.length;
+  	    var i = 0;
+  	    var code;
+  	    while (length > i) {
+  	      code = +arguments[i++];
+  	      if (toAbsoluteIndex(code, 0x10FFFF) !== code) throw new $RangeError(code + ' is not a valid code point');
+  	      elements[i] = code < 0x10000
+  	        ? fromCharCode(code)
+  	        : fromCharCode(((code -= 0x10000) >> 10) + 0xD800, code % 0x400 + 0xDC00);
+  	    } return join(elements, '');
+  	  }
+  	});
+  	return es_string_fromCodePoint;
+  }
+
+  var safeGetBuiltIn;
+  var hasRequiredSafeGetBuiltIn;
+
+  function requireSafeGetBuiltIn () {
+  	if (hasRequiredSafeGetBuiltIn) return safeGetBuiltIn;
+  	hasRequiredSafeGetBuiltIn = 1;
+  	var globalThis = requireGlobalThis();
+  	var DESCRIPTORS = requireDescriptors();
+
+  	// eslint-disable-next-line es/no-object-getownpropertydescriptor -- safe
+  	var getOwnPropertyDescriptor = Object.getOwnPropertyDescriptor;
+
+  	// Avoid NodeJS experimental warning
+  	safeGetBuiltIn = function (name) {
+  	  if (!DESCRIPTORS) return globalThis[name];
+  	  var descriptor = getOwnPropertyDescriptor(globalThis, name);
+  	  return descriptor && descriptor.value;
+  	};
+  	return safeGetBuiltIn;
+  }
+
+  var urlConstructorDetection;
+  var hasRequiredUrlConstructorDetection;
+
+  function requireUrlConstructorDetection () {
+  	if (hasRequiredUrlConstructorDetection) return urlConstructorDetection;
+  	hasRequiredUrlConstructorDetection = 1;
+  	var fails = requireFails();
+  	var wellKnownSymbol = requireWellKnownSymbol();
+  	var DESCRIPTORS = requireDescriptors();
+  	var IS_PURE = requireIsPure();
+
+  	var ITERATOR = wellKnownSymbol('iterator');
+
+  	urlConstructorDetection = !fails(function () {
+  	  // eslint-disable-next-line unicorn/relative-url-style -- required for testing
+  	  var url = new URL('b?a=1&b=2&c=3', 'https://a');
+  	  var params = url.searchParams;
+  	  var params2 = new URLSearchParams('a=1&a=2&b=3');
+  	  var result = '';
+  	  url.pathname = 'c%20d';
+  	  params.forEach(function (value, key) {
+  	    params['delete']('b');
+  	    result += key + value;
+  	  });
+  	  params2['delete']('a', 2);
+  	  // `undefined` case is a Chromium 117 bug
+  	  // https://bugs.chromium.org/p/v8/issues/detail?id=14222
+  	  params2['delete']('b', undefined);
+  	  return (IS_PURE && (!url.toJSON || !params2.has('a', 1) || params2.has('a', 2) || !params2.has('a', undefined) || params2.has('b')))
+  	    || (!params.size && (IS_PURE || !DESCRIPTORS))
+  	    || !params.sort
+  	    || url.href !== 'https://a/c%20d?a=1&c=3'
+  	    || params.get('c') !== '3'
+  	    || String(new URLSearchParams('?a=1')) !== 'a=1'
+  	    || !params[ITERATOR]
+  	    // throws in Edge
+  	    || new URL('https://a@b').username !== 'a'
+  	    || new URLSearchParams(new URLSearchParams('a=b')).get('a') !== 'b'
+  	    // not punycoded in Edge
+  	    || new URL('https://тест').host !== 'xn--e1aybc'
+  	    // not escaped in Chrome 62-
+  	    || new URL('https://a#б').hash !== '#%D0%B1'
+  	    // fails in Chrome 66-
+  	    || result !== 'a1c3'
+  	    // throws in Safari
+  	    || new URL('https://x', undefined).host !== 'x';
+  	});
+  	return urlConstructorDetection;
+  }
+
+  var defineBuiltIns;
+  var hasRequiredDefineBuiltIns;
+
+  function requireDefineBuiltIns () {
+  	if (hasRequiredDefineBuiltIns) return defineBuiltIns;
+  	hasRequiredDefineBuiltIns = 1;
+  	var defineBuiltIn = requireDefineBuiltIn();
+
+  	defineBuiltIns = function (target, src, options) {
+  	  for (var key in src) defineBuiltIn(target, key, src[key], options);
+  	  return target;
+  	};
+  	return defineBuiltIns;
+  }
+
+  var anInstance;
+  var hasRequiredAnInstance;
+
+  function requireAnInstance () {
+  	if (hasRequiredAnInstance) return anInstance;
+  	hasRequiredAnInstance = 1;
+  	var isPrototypeOf = requireObjectIsPrototypeOf();
+
+  	var $TypeError = TypeError;
+
+  	anInstance = function (it, Prototype) {
+  	  if (isPrototypeOf(Prototype, it)) return it;
+  	  throw new $TypeError('Incorrect invocation');
+  	};
+  	return anInstance;
+  }
+
+  var getIteratorMethod;
+  var hasRequiredGetIteratorMethod;
+
+  function requireGetIteratorMethod () {
+  	if (hasRequiredGetIteratorMethod) return getIteratorMethod;
+  	hasRequiredGetIteratorMethod = 1;
+  	var classof = requireClassof();
+  	var getMethod = requireGetMethod();
+  	var isNullOrUndefined = requireIsNullOrUndefined();
+  	var Iterators = requireIterators();
+  	var wellKnownSymbol = requireWellKnownSymbol();
+
+  	var ITERATOR = wellKnownSymbol('iterator');
+
+  	getIteratorMethod = function (it) {
+  	  if (!isNullOrUndefined(it)) return getMethod(it, ITERATOR)
+  	    || getMethod(it, '@@iterator')
+  	    || Iterators[classof(it)];
+  	};
+  	return getIteratorMethod;
+  }
+
+  var getIterator;
+  var hasRequiredGetIterator;
+
+  function requireGetIterator () {
+  	if (hasRequiredGetIterator) return getIterator;
+  	hasRequiredGetIterator = 1;
+  	var call = requireFunctionCall();
+  	var aCallable = requireACallable();
+  	var anObject = requireAnObject();
+  	var tryToString = requireTryToString();
+  	var getIteratorMethod = requireGetIteratorMethod();
+
+  	var $TypeError = TypeError;
+
+  	getIterator = function (argument, usingIterator) {
+  	  var iteratorMethod = arguments.length < 2 ? getIteratorMethod(argument) : usingIterator;
+  	  if (aCallable(iteratorMethod)) return anObject(call(iteratorMethod, argument));
+  	  throw new $TypeError(tryToString(argument) + ' is not iterable');
+  	};
+  	return getIterator;
+  }
+
+  var validateArgumentsLength;
+  var hasRequiredValidateArgumentsLength;
+
+  function requireValidateArgumentsLength () {
+  	if (hasRequiredValidateArgumentsLength) return validateArgumentsLength;
+  	hasRequiredValidateArgumentsLength = 1;
+  	var $TypeError = TypeError;
+
+  	validateArgumentsLength = function (passed, required) {
+  	  if (passed < required) throw new $TypeError('Not enough arguments');
+  	  return passed;
+  	};
+  	return validateArgumentsLength;
+  }
+
+  var web_urlSearchParams_constructor;
+  var hasRequiredWeb_urlSearchParams_constructor;
+
+  function requireWeb_urlSearchParams_constructor () {
+  	if (hasRequiredWeb_urlSearchParams_constructor) return web_urlSearchParams_constructor;
+  	hasRequiredWeb_urlSearchParams_constructor = 1;
+  	// TODO: in core-js@4, move /modules/ dependencies to public entries for better optimization by tools like `preset-env`
+  	requireEs_array_iterator();
+  	requireEs_string_fromCodePoint();
+  	var $ = require_export();
+  	var globalThis = requireGlobalThis();
+  	var safeGetBuiltIn = requireSafeGetBuiltIn();
+  	var getBuiltIn = requireGetBuiltIn();
+  	var call = requireFunctionCall();
+  	var uncurryThis = requireFunctionUncurryThis();
+  	var DESCRIPTORS = requireDescriptors();
+  	var USE_NATIVE_URL = requireUrlConstructorDetection();
+  	var defineBuiltIn = requireDefineBuiltIn();
+  	var defineBuiltInAccessor = requireDefineBuiltInAccessor();
+  	var defineBuiltIns = requireDefineBuiltIns();
+  	var setToStringTag = requireSetToStringTag();
+  	var createIteratorConstructor = requireIteratorCreateConstructor();
+  	var InternalStateModule = requireInternalState();
+  	var anInstance = requireAnInstance();
+  	var isCallable = requireIsCallable();
+  	var hasOwn = requireHasOwnProperty();
+  	var bind = requireFunctionBindContext();
+  	var classof = requireClassof();
+  	var anObject = requireAnObject();
+  	var isObject = requireIsObject();
+  	var $toString = requireToString();
+  	var create = requireObjectCreate();
+  	var createPropertyDescriptor = requireCreatePropertyDescriptor();
+  	var getIterator = requireGetIterator();
+  	var getIteratorMethod = requireGetIteratorMethod();
+  	var createIterResultObject = requireCreateIterResultObject();
+  	var validateArgumentsLength = requireValidateArgumentsLength();
+  	var wellKnownSymbol = requireWellKnownSymbol();
+  	var arraySort = requireArraySort();
+
+  	var ITERATOR = wellKnownSymbol('iterator');
+  	var URL_SEARCH_PARAMS = 'URLSearchParams';
+  	var URL_SEARCH_PARAMS_ITERATOR = URL_SEARCH_PARAMS + 'Iterator';
+  	var setInternalState = InternalStateModule.set;
+  	var getInternalParamsState = InternalStateModule.getterFor(URL_SEARCH_PARAMS);
+  	var getInternalIteratorState = InternalStateModule.getterFor(URL_SEARCH_PARAMS_ITERATOR);
+
+  	var nativeFetch = safeGetBuiltIn('fetch');
+  	var NativeRequest = safeGetBuiltIn('Request');
+  	var Headers = safeGetBuiltIn('Headers');
+  	var RequestPrototype = NativeRequest && NativeRequest.prototype;
+  	var HeadersPrototype = Headers && Headers.prototype;
+  	var TypeError = globalThis.TypeError;
+  	var encodeURIComponent = globalThis.encodeURIComponent;
+  	var fromCharCode = String.fromCharCode;
+  	var fromCodePoint = getBuiltIn('String', 'fromCodePoint');
+  	var $parseInt = parseInt;
+  	var charAt = uncurryThis(''.charAt);
+  	var join = uncurryThis([].join);
+  	var push = uncurryThis([].push);
+  	var replace = uncurryThis(''.replace);
+  	var shift = uncurryThis([].shift);
+  	var splice = uncurryThis([].splice);
+  	var split = uncurryThis(''.split);
+  	var stringSlice = uncurryThis(''.slice);
+  	var exec = uncurryThis(/./.exec);
+
+  	var plus = /\+/g;
+  	var FALLBACK_REPLACER = '\uFFFD';
+  	var VALID_HEX = /^[0-9a-f]+$/i;
+
+  	var parseHexOctet = function (string, start) {
+  	  var substr = stringSlice(string, start, start + 2);
+  	  if (!exec(VALID_HEX, substr)) return NaN;
+
+  	  return $parseInt(substr, 16);
+  	};
+
+  	var getLeadingOnes = function (octet) {
+  	  var count = 0;
+  	  for (var mask = 0x80; mask > 0 && (octet & mask) !== 0; mask >>= 1) {
+  	    count++;
+  	  }
+  	  return count;
+  	};
+
+  	var utf8Decode = function (octets) {
+  	  var codePoint = null;
+
+  	  switch (octets.length) {
+  	    case 1:
+  	      codePoint = octets[0];
+  	      break;
+  	    case 2:
+  	      codePoint = (octets[0] & 0x1F) << 6 | (octets[1] & 0x3F);
+  	      break;
+  	    case 3:
+  	      codePoint = (octets[0] & 0x0F) << 12 | (octets[1] & 0x3F) << 6 | (octets[2] & 0x3F);
+  	      break;
+  	    case 4:
+  	      codePoint = (octets[0] & 0x07) << 18 | (octets[1] & 0x3F) << 12 | (octets[2] & 0x3F) << 6 | (octets[3] & 0x3F);
+  	      break;
+  	  }
+
+  	  return codePoint > 0x10FFFF ? null : codePoint;
+  	};
+
+  	var decode = function (input) {
+  	  input = replace(input, plus, ' ');
+  	  var length = input.length;
+  	  var result = '';
+  	  var i = 0;
+
+  	  while (i < length) {
+  	    var decodedChar = charAt(input, i);
+
+  	    if (decodedChar === '%') {
+  	      if (charAt(input, i + 1) === '%' || i + 3 > length) {
+  	        result += '%';
+  	        i++;
+  	        continue;
+  	      }
+
+  	      var octet = parseHexOctet(input, i + 1);
+
+  	      // eslint-disable-next-line no-self-compare -- NaN check
+  	      if (octet !== octet) {
+  	        result += decodedChar;
+  	        i++;
+  	        continue;
+  	      }
+
+  	      i += 2;
+  	      var byteSequenceLength = getLeadingOnes(octet);
+
+  	      if (byteSequenceLength === 0) {
+  	        decodedChar = fromCharCode(octet);
+  	      } else {
+  	        if (byteSequenceLength === 1 || byteSequenceLength > 4) {
+  	          result += FALLBACK_REPLACER;
+  	          i++;
+  	          continue;
+  	        }
+
+  	        var octets = [octet];
+  	        var sequenceIndex = 1;
+
+  	        while (sequenceIndex < byteSequenceLength) {
+  	          i++;
+  	          if (i + 3 > length || charAt(input, i) !== '%') break;
+
+  	          var nextByte = parseHexOctet(input, i + 1);
+
+  	          // eslint-disable-next-line no-self-compare -- NaN check
+  	          if (nextByte !== nextByte) {
+  	            i += 3;
+  	            break;
+  	          }
+  	          if (nextByte > 191 || nextByte < 128) break;
+
+  	          push(octets, nextByte);
+  	          i += 2;
+  	          sequenceIndex++;
+  	        }
+
+  	        if (octets.length !== byteSequenceLength) {
+  	          result += FALLBACK_REPLACER;
+  	          continue;
+  	        }
+
+  	        var codePoint = utf8Decode(octets);
+  	        if (codePoint === null) {
+  	          result += FALLBACK_REPLACER;
+  	        } else {
+  	          decodedChar = fromCodePoint(codePoint);
+  	        }
+  	      }
+  	    }
+
+  	    result += decodedChar;
+  	    i++;
+  	  }
+
+  	  return result;
+  	};
+
+  	var find = /[!'()~]|%20/g;
+
+  	var replacements = {
+  	  '!': '%21',
+  	  "'": '%27',
+  	  '(': '%28',
+  	  ')': '%29',
+  	  '~': '%7E',
+  	  '%20': '+'
+  	};
+
+  	var replacer = function (match) {
+  	  return replacements[match];
+  	};
+
+  	var serialize = function (it) {
+  	  return replace(encodeURIComponent(it), find, replacer);
+  	};
+
+  	var URLSearchParamsIterator = createIteratorConstructor(function Iterator(params, kind) {
+  	  setInternalState(this, {
+  	    type: URL_SEARCH_PARAMS_ITERATOR,
+  	    target: getInternalParamsState(params).entries,
+  	    index: 0,
+  	    kind: kind
+  	  });
+  	}, URL_SEARCH_PARAMS, function next() {
+  	  var state = getInternalIteratorState(this);
+  	  var target = state.target;
+  	  var index = state.index++;
+  	  if (!target || index >= target.length) {
+  	    state.target = null;
+  	    return createIterResultObject(undefined, true);
+  	  }
+  	  var entry = target[index];
+  	  switch (state.kind) {
+  	    case 'keys': return createIterResultObject(entry.key, false);
+  	    case 'values': return createIterResultObject(entry.value, false);
+  	  } return createIterResultObject([entry.key, entry.value], false);
+  	}, true);
+
+  	var URLSearchParamsState = function (init) {
+  	  this.entries = [];
+  	  this.url = null;
+
+  	  if (init !== undefined) {
+  	    if (isObject(init)) this.parseObject(init);
+  	    else this.parseQuery(typeof init == 'string' ? charAt(init, 0) === '?' ? stringSlice(init, 1) : init : $toString(init));
+  	  }
+  	};
+
+  	URLSearchParamsState.prototype = {
+  	  type: URL_SEARCH_PARAMS,
+  	  bindURL: function (url) {
+  	    this.url = url;
+  	    this.update();
+  	  },
+  	  parseObject: function (object) {
+  	    var entries = this.entries;
+  	    var iteratorMethod = getIteratorMethod(object);
+  	    var iterator, next, step, entryIterator, entryNext, first, second;
+
+  	    if (iteratorMethod) {
+  	      iterator = getIterator(object, iteratorMethod);
+  	      next = iterator.next;
+  	      while (!(step = call(next, iterator)).done) {
+  	        entryIterator = getIterator(anObject(step.value));
+  	        entryNext = entryIterator.next;
+  	        if (
+  	          (first = call(entryNext, entryIterator)).done ||
+  	          (second = call(entryNext, entryIterator)).done ||
+  	          !call(entryNext, entryIterator).done
+  	        ) throw new TypeError('Expected sequence with length 2');
+  	        push(entries, { key: $toString(first.value), value: $toString(second.value) });
+  	      }
+  	    } else for (var key in object) if (hasOwn(object, key)) {
+  	      push(entries, { key: key, value: $toString(object[key]) });
+  	    }
+  	  },
+  	  parseQuery: function (query) {
+  	    if (query) {
+  	      var entries = this.entries;
+  	      var attributes = split(query, '&');
+  	      var index = 0;
+  	      var attribute, entry;
+  	      while (index < attributes.length) {
+  	        attribute = attributes[index++];
+  	        if (attribute.length) {
+  	          entry = split(attribute, '=');
+  	          push(entries, {
+  	            key: decode(shift(entry)),
+  	            value: decode(join(entry, '='))
+  	          });
+  	        }
+  	      }
+  	    }
+  	  },
+  	  serialize: function () {
+  	    var entries = this.entries;
+  	    var result = [];
+  	    var index = 0;
+  	    var entry;
+  	    while (index < entries.length) {
+  	      entry = entries[index++];
+  	      push(result, serialize(entry.key) + '=' + serialize(entry.value));
+  	    } return join(result, '&');
+  	  },
+  	  update: function () {
+  	    this.entries.length = 0;
+  	    this.parseQuery(this.url.query);
+  	  },
+  	  updateURL: function () {
+  	    if (this.url) this.url.update();
+  	  }
+  	};
+
+  	// `URLSearchParams` constructor
+  	// https://url.spec.whatwg.org/#interface-urlsearchparams
+  	var URLSearchParamsConstructor = function URLSearchParams(/* init */) {
+  	  anInstance(this, URLSearchParamsPrototype);
+  	  var init = arguments.length > 0 ? arguments[0] : undefined;
+  	  var state = setInternalState(this, new URLSearchParamsState(init));
+  	  if (!DESCRIPTORS) this.size = state.entries.length;
+  	};
+
+  	var URLSearchParamsPrototype = URLSearchParamsConstructor.prototype;
+
+  	defineBuiltIns(URLSearchParamsPrototype, {
+  	  // `URLSearchParams.prototype.append` method
+  	  // https://url.spec.whatwg.org/#dom-urlsearchparams-append
+  	  append: function append(name, value) {
+  	    var state = getInternalParamsState(this);
+  	    validateArgumentsLength(arguments.length, 2);
+  	    push(state.entries, { key: $toString(name), value: $toString(value) });
+  	    if (!DESCRIPTORS) this.length++;
+  	    state.updateURL();
+  	  },
+  	  // `URLSearchParams.prototype.delete` method
+  	  // https://url.spec.whatwg.org/#dom-urlsearchparams-delete
+  	  'delete': function (name /* , value */) {
+  	    var state = getInternalParamsState(this);
+  	    var length = validateArgumentsLength(arguments.length, 1);
+  	    var entries = state.entries;
+  	    var key = $toString(name);
+  	    var $value = length < 2 ? undefined : arguments[1];
+  	    var value = $value === undefined ? $value : $toString($value);
+  	    var index = 0;
+  	    while (index < entries.length) {
+  	      var entry = entries[index];
+  	      if (entry.key === key && (value === undefined || entry.value === value)) {
+  	        splice(entries, index, 1);
+  	        if (value !== undefined) break;
+  	      } else index++;
+  	    }
+  	    if (!DESCRIPTORS) this.size = entries.length;
+  	    state.updateURL();
+  	  },
+  	  // `URLSearchParams.prototype.get` method
+  	  // https://url.spec.whatwg.org/#dom-urlsearchparams-get
+  	  get: function get(name) {
+  	    var entries = getInternalParamsState(this).entries;
+  	    validateArgumentsLength(arguments.length, 1);
+  	    var key = $toString(name);
+  	    var index = 0;
+  	    for (; index < entries.length; index++) {
+  	      if (entries[index].key === key) return entries[index].value;
+  	    }
+  	    return null;
+  	  },
+  	  // `URLSearchParams.prototype.getAll` method
+  	  // https://url.spec.whatwg.org/#dom-urlsearchparams-getall
+  	  getAll: function getAll(name) {
+  	    var entries = getInternalParamsState(this).entries;
+  	    validateArgumentsLength(arguments.length, 1);
+  	    var key = $toString(name);
+  	    var result = [];
+  	    var index = 0;
+  	    for (; index < entries.length; index++) {
+  	      if (entries[index].key === key) push(result, entries[index].value);
+  	    }
+  	    return result;
+  	  },
+  	  // `URLSearchParams.prototype.has` method
+  	  // https://url.spec.whatwg.org/#dom-urlsearchparams-has
+  	  has: function has(name /* , value */) {
+  	    var entries = getInternalParamsState(this).entries;
+  	    var length = validateArgumentsLength(arguments.length, 1);
+  	    var key = $toString(name);
+  	    var $value = length < 2 ? undefined : arguments[1];
+  	    var value = $value === undefined ? $value : $toString($value);
+  	    var index = 0;
+  	    while (index < entries.length) {
+  	      var entry = entries[index++];
+  	      if (entry.key === key && (value === undefined || entry.value === value)) return true;
+  	    }
+  	    return false;
+  	  },
+  	  // `URLSearchParams.prototype.set` method
+  	  // https://url.spec.whatwg.org/#dom-urlsearchparams-set
+  	  set: function set(name, value) {
+  	    var state = getInternalParamsState(this);
+  	    validateArgumentsLength(arguments.length, 1);
+  	    var entries = state.entries;
+  	    var found = false;
+  	    var key = $toString(name);
+  	    var val = $toString(value);
+  	    var index = 0;
+  	    var entry;
+  	    for (; index < entries.length; index++) {
+  	      entry = entries[index];
+  	      if (entry.key === key) {
+  	        if (found) splice(entries, index--, 1);
+  	        else {
+  	          found = true;
+  	          entry.value = val;
+  	        }
+  	      }
+  	    }
+  	    if (!found) push(entries, { key: key, value: val });
+  	    if (!DESCRIPTORS) this.size = entries.length;
+  	    state.updateURL();
+  	  },
+  	  // `URLSearchParams.prototype.sort` method
+  	  // https://url.spec.whatwg.org/#dom-urlsearchparams-sort
+  	  sort: function sort() {
+  	    var state = getInternalParamsState(this);
+  	    arraySort(state.entries, function (a, b) {
+  	      return a.key > b.key ? 1 : -1;
+  	    });
+  	    state.updateURL();
+  	  },
+  	  // `URLSearchParams.prototype.forEach` method
+  	  forEach: function forEach(callback /* , thisArg */) {
+  	    var entries = getInternalParamsState(this).entries;
+  	    var boundFunction = bind(callback, arguments.length > 1 ? arguments[1] : undefined);
+  	    var index = 0;
+  	    var entry;
+  	    while (index < entries.length) {
+  	      entry = entries[index++];
+  	      boundFunction(entry.value, entry.key, this);
+  	    }
+  	  },
+  	  // `URLSearchParams.prototype.keys` method
+  	  keys: function keys() {
+  	    return new URLSearchParamsIterator(this, 'keys');
+  	  },
+  	  // `URLSearchParams.prototype.values` method
+  	  values: function values() {
+  	    return new URLSearchParamsIterator(this, 'values');
+  	  },
+  	  // `URLSearchParams.prototype.entries` method
+  	  entries: function entries() {
+  	    return new URLSearchParamsIterator(this, 'entries');
+  	  }
+  	}, { enumerable: true });
+
+  	// `URLSearchParams.prototype[@@iterator]` method
+  	defineBuiltIn(URLSearchParamsPrototype, ITERATOR, URLSearchParamsPrototype.entries, { name: 'entries' });
+
+  	// `URLSearchParams.prototype.toString` method
+  	// https://url.spec.whatwg.org/#urlsearchparams-stringification-behavior
+  	defineBuiltIn(URLSearchParamsPrototype, 'toString', function toString() {
+  	  return getInternalParamsState(this).serialize();
+  	}, { enumerable: true });
+
+  	// `URLSearchParams.prototype.size` getter
+  	// https://github.com/whatwg/url/pull/734
+  	if (DESCRIPTORS) defineBuiltInAccessor(URLSearchParamsPrototype, 'size', {
+  	  get: function size() {
+  	    return getInternalParamsState(this).entries.length;
+  	  },
+  	  configurable: true,
+  	  enumerable: true
+  	});
+
+  	setToStringTag(URLSearchParamsConstructor, URL_SEARCH_PARAMS);
+
+  	$({ global: true, constructor: true, forced: !USE_NATIVE_URL }, {
+  	  URLSearchParams: URLSearchParamsConstructor
+  	});
+
+  	// Wrap `fetch` and `Request` for correct work with polyfilled `URLSearchParams`
+  	if (!USE_NATIVE_URL && isCallable(Headers)) {
+  	  var headersHas = uncurryThis(HeadersPrototype.has);
+  	  var headersSet = uncurryThis(HeadersPrototype.set);
+
+  	  var wrapRequestOptions = function (init) {
+  	    if (isObject(init)) {
+  	      var body = init.body;
+  	      var headers;
+  	      if (classof(body) === URL_SEARCH_PARAMS) {
+  	        headers = init.headers ? new Headers(init.headers) : new Headers();
+  	        if (!headersHas(headers, 'content-type')) {
+  	          headersSet(headers, 'content-type', 'application/x-www-form-urlencoded;charset=UTF-8');
+  	        }
+  	        return create(init, {
+  	          body: createPropertyDescriptor(0, $toString(body)),
+  	          headers: createPropertyDescriptor(0, headers)
+  	        });
+  	      }
+  	    } return init;
+  	  };
+
+  	  if (isCallable(nativeFetch)) {
+  	    $({ global: true, enumerable: true, dontCallGetSet: true, forced: true }, {
+  	      fetch: function fetch(input /* , init */) {
+  	        return nativeFetch(input, arguments.length > 1 ? wrapRequestOptions(arguments[1]) : {});
+  	      }
+  	    });
+  	  }
+
+  	  if (isCallable(NativeRequest)) {
+  	    var RequestConstructor = function Request(input /* , init */) {
+  	      anInstance(this, RequestPrototype);
+  	      return new NativeRequest(input, arguments.length > 1 ? wrapRequestOptions(arguments[1]) : {});
+  	    };
+
+  	    RequestPrototype.constructor = RequestConstructor;
+  	    RequestConstructor.prototype = RequestPrototype;
+
+  	    $({ global: true, constructor: true, dontCallGetSet: true, forced: true }, {
+  	      Request: RequestConstructor
+  	    });
+  	  }
+  	}
+
+  	web_urlSearchParams_constructor = {
+  	  URLSearchParams: URLSearchParamsConstructor,
+  	  getState: getInternalParamsState
+  	};
+  	return web_urlSearchParams_constructor;
+  }
+
+  var hasRequiredWeb_urlSearchParams;
+
+  function requireWeb_urlSearchParams () {
+  	if (hasRequiredWeb_urlSearchParams) return web_urlSearchParams;
+  	hasRequiredWeb_urlSearchParams = 1;
+  	// TODO: Remove this module from `core-js@4` since it's replaced to module below
+  	requireWeb_urlSearchParams_constructor();
+  	return web_urlSearchParams;
+  }
+
+  requireWeb_urlSearchParams();
 
   var Utils = {
     getBootstrapVersion: function getBootstrapVersion() {
+      var _window$bootstrap, _$$fn;
       var bootstrapVersion = 5;
-      try {
-        var rawVersion = $$q.fn.dropdown.Constructor.VERSION;
-
-        // Only try to parse VERSION if it is defined.
-        // It is undefined in older versions of Bootstrap (tested with 3.1.1).
+      if (typeof window !== 'undefined' && (_window$bootstrap = window.bootstrap) !== null && _window$bootstrap !== void 0 && (_window$bootstrap = _window$bootstrap.Tooltip) !== null && _window$bootstrap !== void 0 && _window$bootstrap.VERSION) {
+        var rawVersion = window.bootstrap.Tooltip.VERSION;
         if (rawVersion !== undefined) {
           bootstrapVersion = parseInt(rawVersion, 10);
         }
-      } catch (e) {
-        // ignore
-      }
-      try {
-        // eslint-disable-next-line no-undef
-        var _rawVersion = bootstrap.Tooltip.VERSION;
+      } else if (typeof $ !== 'undefined' && (_$$fn = $.fn) !== null && _$$fn !== void 0 && (_$$fn = _$$fn.dropdown) !== null && _$$fn !== void 0 && (_$$fn = _$$fn.Constructor) !== null && _$$fn !== void 0 && _$$fn.VERSION) {
+        var _rawVersion = $.fn.dropdown.Constructor.VERSION;
+
+        // Only try to parse VERSION if it is defined.
+        // It is undefined in older versions of Bootstrap (tested with 3.1.1).
         if (_rawVersion !== undefined) {
           bootstrapVersion = parseInt(_rawVersion, 10);
         }
-      } catch (e) {
-        // ignore
       }
       return bootstrapVersion;
     },
+    /**
+     * Returns the prefix for the icons based on the theme.
+     *
+     * @param {string} theme - The theme name (bootstrap3, bootstrap4, bootstrap5, bootstrap-table, bulma, foundation, materialize, semantic).
+     * @returns {string} The icons prefix.
+     */
     getIconsPrefix: function getIconsPrefix(theme) {
       return {
         bootstrap3: 'glyphicon',
@@ -4638,79 +6929,32 @@
         semantic: 'fa'
       }[theme] || 'fa';
     },
-    getIcons: function getIcons(prefix) {
-      return {
-        glyphicon: {
-          paginationSwitchDown: 'glyphicon-collapse-down icon-chevron-down',
-          paginationSwitchUp: 'glyphicon-collapse-up icon-chevron-up',
-          refresh: 'glyphicon-refresh icon-refresh',
-          toggleOff: 'glyphicon-list-alt icon-list-alt',
-          toggleOn: 'glyphicon-list-alt icon-list-alt',
-          columns: 'glyphicon-th icon-th',
-          detailOpen: 'glyphicon-plus icon-plus',
-          detailClose: 'glyphicon-minus icon-minus',
-          fullscreen: 'glyphicon-fullscreen',
-          search: 'glyphicon-search',
-          clearSearch: 'glyphicon-trash'
-        },
-        fa: {
-          paginationSwitchDown: 'fa-caret-square-down',
-          paginationSwitchUp: 'fa-caret-square-up',
-          refresh: 'fa-sync',
-          toggleOff: 'fa-toggle-off',
-          toggleOn: 'fa-toggle-on',
-          columns: 'fa-th-list',
-          detailOpen: 'fa-plus',
-          detailClose: 'fa-minus',
-          fullscreen: 'fa-arrows-alt',
-          search: 'fa-search',
-          clearSearch: 'fa-trash'
-        },
-        bi: {
-          paginationSwitchDown: 'bi-caret-down-square',
-          paginationSwitchUp: 'bi-caret-up-square',
-          refresh: 'bi-arrow-clockwise',
-          toggleOff: 'bi-toggle-off',
-          toggleOn: 'bi-toggle-on',
-          columns: 'bi-list-ul',
-          detailOpen: 'bi-plus',
-          detailClose: 'bi-dash',
-          fullscreen: 'bi-arrows-move',
-          search: 'bi-search',
-          clearSearch: 'bi-trash'
-        },
-        icon: {
-          paginationSwitchDown: 'icon-arrow-up-circle',
-          paginationSwitchUp: 'icon-arrow-down-circle',
-          refresh: 'icon-refresh-cw',
-          toggleOff: 'icon-toggle-right',
-          toggleOn: 'icon-toggle-right',
-          columns: 'icon-list',
-          detailOpen: 'icon-plus',
-          detailClose: 'icon-minus',
-          fullscreen: 'icon-maximize',
-          search: 'icon-search',
-          clearSearch: 'icon-trash-2'
-        },
-        'material-icons': {
-          paginationSwitchDown: 'grid_on',
-          paginationSwitchUp: 'grid_off',
-          refresh: 'refresh',
-          toggleOff: 'tablet',
-          toggleOn: 'tablet_android',
-          columns: 'view_list',
-          detailOpen: 'add',
-          detailClose: 'remove',
-          fullscreen: 'fullscreen',
-          sort: 'sort',
-          search: 'search',
-          clearSearch: 'delete'
-        }
-      }[prefix] || {};
+    /**
+     * Gets the icons for a given prefix.
+     *
+     * @param {Object.<string, Object>} icons - The icons object.
+     * @param {string} prefix - The prefix. For example, 'fa', 'bi', etc.
+     * @return {Object} The icons object for the given prefix.
+     */
+    getIcons: function getIcons(icons, prefix) {
+      return icons[prefix] || {};
+    },
+    /**
+     * Assigns new icons to icons object.
+     *
+     * @param {Object.<string, Object>} icons - The icons object.
+     * @param {string} icon - The icon name. For example, 'search', 'refresh', etc.
+     * @param {Object.<string, string>} values - The values object.
+     */
+    assignIcons: function assignIcons(icons, icon, values) {
+      for (var _i = 0, _Object$keys = Object.keys(icons); _i < _Object$keys.length; _i++) {
+        var key = _Object$keys[_i];
+        icons[key][icon] = values[key];
+      }
     },
     getSearchInput: function getSearchInput(that) {
       if (typeof that.options.searchSelector === 'string') {
-        return $$q(that.options.searchSelector);
+        return $(that.options.searchSelector);
       }
       return that.$toolbar.find('.search input');
     },
@@ -4847,7 +7091,7 @@
       try {
         for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
           var column = _step2.value;
-          totalCol += column.colspan || 1;
+          totalCol += +column.colspan || 1;
         }
       } catch (err) {
         _iterator2.e(err);
@@ -4860,15 +7104,15 @@
           flag[i][j] = false;
         }
       }
-      for (var _i = 0; _i < columns.length; _i++) {
-        var _iterator3 = _createForOfIteratorHelper(columns[_i]),
+      for (var _i2 = 0; _i2 < columns.length; _i2++) {
+        var _iterator3 = _createForOfIteratorHelper(columns[_i2]),
           _step3;
         try {
           for (_iterator3.s(); !(_step3 = _iterator3.n()).done;) {
             var r = _step3.value;
-            var rowspan = r.rowspan || 1;
-            var colspan = r.colspan || 1;
-            var index = flag[_i].indexOf(false);
+            var rowspan = +r.rowspan || 1;
+            var colspan = +r.colspan || 1;
+            var index = flag[_i2].indexOf(false);
             r.colspanIndex = index;
             if (colspan === 1) {
               r.fieldIndex = index;
@@ -4877,11 +7121,11 @@
                 r.field = index;
               }
             } else {
-              r.colspanGroup = r.colspan;
+              r.colspanGroup = +r.colspan;
             }
             for (var _j = 0; _j < rowspan; _j++) {
               for (var k = 0; k < colspan; k++) {
-                flag[_i + _j][index + k] = true;
+                flag[_i2 + _j][index + k] = true;
               }
             }
           }
@@ -4982,10 +7226,10 @@
     },
     getScrollBarWidth: function getScrollBarWidth() {
       if (this.cachedWidth === undefined) {
-        var $inner = $$q('<div/>').addClass('fixed-table-scroll-inner');
-        var $outer = $$q('<div/>').addClass('fixed-table-scroll-outer');
+        var $inner = $('<div/>').addClass('fixed-table-scroll-inner');
+        var $outer = $('<div/>').addClass('fixed-table-scroll-outer');
         $outer.append($inner);
-        $$q('body').append($outer);
+        $('body').append($outer);
         var w1 = $inner[0].offsetWidth;
         $outer.css('overflow', 'scroll');
         var w2 = $inner[0].offsetWidth;
@@ -5037,8 +7281,8 @@
       if (compareLength && aKeys.length !== bKeys.length) {
         return false;
       }
-      for (var _i2 = 0, _aKeys = aKeys; _i2 < _aKeys.length; _i2++) {
-        var key = _aKeys[_i2];
+      for (var _i3 = 0, _aKeys = aKeys; _i3 < _aKeys.length; _i3++) {
+        var key = _aKeys[_i3];
         if (bKeys.includes(key) && objectA[key] !== objectB[key]) {
           return false;
         }
@@ -5052,6 +7296,7 @@
           return true;
         }
       } catch (e) {
+        console.error(e);
         return false;
       }
       return false;
@@ -5078,8 +7323,8 @@
       return text.toString().replace(/(<([^>]+)>)/ig, '').replace(/&[#A-Za-z0-9]+;/gi, '').trim();
     },
     getRealDataAttr: function getRealDataAttr(dataAttr) {
-      for (var _i3 = 0, _Object$entries = Object.entries(dataAttr); _i3 < _Object$entries.length; _i3++) {
-        var _Object$entries$_i = _slicedToArray(_Object$entries[_i3], 2),
+      for (var _i4 = 0, _Object$entries = Object.entries(dataAttr); _i4 < _Object$entries.length; _i4++) {
+        var _Object$entries$_i = _slicedToArray(_Object$entries[_i4], 2),
           attr = _Object$entries$_i[0],
           value = _Object$entries$_i[1];
         var auxAttr = attr.split(/(?=[A-Z])/).join('-').toLowerCase();
@@ -5141,7 +7386,7 @@
       var data = [];
       var m = [];
       $els.each(function (y, el) {
-        var $el = $$q(el);
+        var $el = $(el);
         var row = {};
 
         // save tr's id, class and data-* attributes
@@ -5150,7 +7395,7 @@
         row._data = _this2.getRealDataAttr($el.data());
         row._style = $el.attr('style');
         $el.find('>td,>th').each(function (_x, el) {
-          var $el = $$q(el);
+          var $el = $(el);
           var colspan = +$el.attr('colspan') || 1;
           var rowspan = +$el.attr('rowspan') || 1;
           var x = _x;
@@ -5248,8 +7493,8 @@
       try {
         for (_iterator11.s(); !(_step11 = _iterator11.n()).done;) {
           var row = _step11.value;
-          for (var _i4 = 0, _Object$keys = Object.keys(row); _i4 < _Object$keys.length; _i4++) {
-            var key = _Object$keys[_i4];
+          for (var _i5 = 0, _Object$keys2 = Object.keys(row); _i5 < _Object$keys2.length; _i5++) {
+            var key = _Object$keys2[_i5];
             if (key.startsWith('_') && (key.endsWith('_rowspan') || key.endsWith('_colspan'))) {
               return true;
             }
@@ -5282,307 +7527,550 @@
         timeout = setTimeout(later, wait);
         if (callNow) func.apply(context, args);
       };
+    },
+    replaceSearchMark: function replaceSearchMark(html, searchText) {
+      var isDom = html instanceof Element;
+      var node = isDom ? html : document.createElement('div');
+      var regExp = new RegExp(searchText, 'gim');
+      var replaceTextWithDom = function replaceTextWithDom(text, regExp) {
+        var result = [];
+        var match;
+        var lastIndex = 0;
+        while ((match = regExp.exec(text)) !== null) {
+          if (lastIndex !== match.index) {
+            result.push(document.createTextNode(text.substring(lastIndex, match.index)));
+          }
+          var mark = document.createElement('mark');
+          mark.innerText = match[0];
+          result.push(mark);
+          lastIndex = match.index + match[0].length;
+        }
+        if (!result.length) {
+          // no match
+          return;
+        }
+        if (lastIndex !== text.length) {
+          result.push(document.createTextNode(text.substring(lastIndex)));
+        }
+        return result;
+      };
+      var _replaceMark = function replaceMark(node) {
+        for (var i = 0; i < node.childNodes.length; i++) {
+          var child = node.childNodes[i];
+          if (child.nodeType === document.TEXT_NODE) {
+            var elements = replaceTextWithDom(child.data, regExp);
+            if (elements) {
+              var _iterator12 = _createForOfIteratorHelper(elements),
+                _step12;
+              try {
+                for (_iterator12.s(); !(_step12 = _iterator12.n()).done;) {
+                  var el = _step12.value;
+                  node.insertBefore(el, child);
+                }
+              } catch (err) {
+                _iterator12.e(err);
+              } finally {
+                _iterator12.f();
+              }
+              node.removeChild(child);
+              i += elements.length - 1;
+            }
+          }
+          if (child.nodeType === document.ELEMENT_NODE) {
+            _replaceMark(child);
+          }
+        }
+      };
+      if (!isDom) {
+        node.innerHTML = html;
+      }
+      _replaceMark(node);
+      return isDom ? node : node.innerHTML;
+    },
+    classToString: function classToString(class_) {
+      var _this3 = this;
+      if (typeof class_ === 'string') {
+        return class_;
+      }
+      if (Array.isArray(class_)) {
+        return class_.map(function (x) {
+          return _this3.classToString(x);
+        }).filter(function (x) {
+          return x;
+        }).join(' ');
+      }
+      if (class_ && _typeof(class_) === 'object') {
+        return Object.entries(class_).map(function (_ref2) {
+          var _ref3 = _slicedToArray(_ref2, 2),
+            k = _ref3[0],
+            v = _ref3[1];
+          return v ? k : '';
+        }).filter(function (x) {
+          return x;
+        }).join(' ');
+      }
+      return '';
+    },
+    parseStyle: function parseStyle(dom, style) {
+      if (!style) {
+        return dom;
+      }
+      if (typeof style === 'string') {
+        style.split(';').forEach(function (i) {
+          var index = i.indexOf(':');
+          if (index > 0) {
+            var k = i.substring(0, index).trim();
+            var v = i.substring(index + 1).trim();
+            dom.style.setProperty(k, v);
+          }
+        });
+      } else if (Array.isArray(style)) {
+        var _iterator13 = _createForOfIteratorHelper(style),
+          _step13;
+        try {
+          for (_iterator13.s(); !(_step13 = _iterator13.n()).done;) {
+            var item = _step13.value;
+            this.parseStyle(dom, item);
+          }
+        } catch (err) {
+          _iterator13.e(err);
+        } finally {
+          _iterator13.f();
+        }
+      } else if (_typeof(style) === 'object') {
+        for (var _i6 = 0, _Object$entries2 = Object.entries(style); _i6 < _Object$entries2.length; _i6++) {
+          var _Object$entries2$_i = _slicedToArray(_Object$entries2[_i6], 2),
+            k = _Object$entries2$_i[0],
+            v = _Object$entries2$_i[1];
+          dom.style.setProperty(k, v);
+        }
+      }
+      return dom;
+    },
+    h: function h(element, attrs, children) {
+      var el = element instanceof HTMLElement ? element : document.createElement(element);
+      var _attrs = attrs || {};
+      var _children = children || [];
+
+      // default attributes
+      if (el.tagName === 'A') {
+        el.href = 'javascript:';
+      }
+      for (var _i7 = 0, _Object$entries3 = Object.entries(_attrs); _i7 < _Object$entries3.length; _i7++) {
+        var _Object$entries3$_i = _slicedToArray(_Object$entries3[_i7], 2),
+          k = _Object$entries3$_i[0],
+          v = _Object$entries3$_i[1];
+        if (v === undefined) {
+          continue;
+        }
+        if (['text', 'innerText'].includes(k)) {
+          el.innerText = v;
+        } else if (['html', 'innerHTML'].includes(k)) {
+          el.innerHTML = v;
+        } else if (k === 'children') {
+          _children.push.apply(_children, _toConsumableArray(v));
+        } else if (k === 'class') {
+          el.setAttribute('class', this.classToString(v));
+        } else if (k === 'style') {
+          if (typeof v === 'string') {
+            el.setAttribute('style', v);
+          } else {
+            this.parseStyle(el, v);
+          }
+        } else if (k.startsWith('@') || k.startsWith('on')) {
+          // event handlers
+          var event = k.startsWith('@') ? k.substring(1) : k.substring(2).toLowerCase();
+          var args = Array.isArray(v) ? v : [v];
+          el.addEventListener.apply(el, [event].concat(_toConsumableArray(args)));
+        } else if (k.startsWith('.')) {
+          // set property
+          el[k.substring(1)] = v;
+        } else {
+          el.setAttribute(k, v);
+        }
+      }
+      if (_children.length) {
+        el.append.apply(el, _toConsumableArray(_children));
+      }
+      return el;
+    },
+    htmlToNodes: function htmlToNodes(html) {
+      if (html instanceof $) {
+        return html.get();
+      }
+      if (html instanceof Node) {
+        return [html];
+      }
+      if (typeof html !== 'string') {
+        html = new String(html).toString();
+      }
+      var d = document.createElement('div');
+      d.innerHTML = html;
+      return d.childNodes;
+    },
+    addQueryToUrl: function addQueryToUrl(url, query) {
+      var hashArray = url.split('#');
+      var _hashArray$0$split = hashArray[0].split('?'),
+        _hashArray$0$split2 = _slicedToArray(_hashArray$0$split, 2),
+        baseUrl = _hashArray$0$split2[0],
+        search = _hashArray$0$split2[1];
+      var urlParams = new URLSearchParams(search);
+      for (var _i8 = 0, _Object$entries4 = Object.entries(query); _i8 < _Object$entries4.length; _i8++) {
+        var _Object$entries4$_i = _slicedToArray(_Object$entries4[_i8], 2),
+          key = _Object$entries4$_i[0],
+          value = _Object$entries4$_i[1];
+        urlParams.set(key, value);
+      }
+      return "".concat(baseUrl, "?").concat(urlParams.toString(), "#").concat(hashArray.slice(1).join('#'));
     }
   };
 
-  var VERSION = '1.22.5';
+  var VERSION = '1.24.1';
   var bootstrapVersion = Utils.getBootstrapVersion();
   var CONSTANTS = {
     3: {
       classes: {
-        buttonsPrefix: 'btn',
+        buttonActive: 'active',
         buttons: 'default',
-        buttonsGroup: 'btn-group',
         buttonsDropdown: 'btn-group',
-        pull: 'pull',
+        buttonsGroup: 'btn-group',
+        buttonsPrefix: 'btn',
+        dropdownActive: 'active',
+        dropup: 'dropup',
+        input: 'form-control',
         inputGroup: 'input-group',
         inputPrefix: 'input-',
-        input: 'form-control',
-        select: 'form-control',
-        paginationDropdown: 'btn-group dropdown',
-        dropup: 'dropup',
-        dropdownActive: 'active',
         paginationActive: 'active',
-        buttonActive: 'active'
+        paginationDropdown: 'btn-group dropdown',
+        pull: 'pull',
+        select: 'form-control'
       },
       html: {
-        toolbarDropdown: ['<ul class="dropdown-menu" role="menu">', '</ul>'],
-        toolbarDropdownItem: '<li class="dropdown-item-marker" role="menuitem"><label>%s</label></li>',
-        toolbarDropdownSeparator: '<li class="divider"></li>',
-        pageDropdown: ['<ul class="dropdown-menu" role="menu">', '</ul>'],
-        pageDropdownItem: '<li role="menuitem" class="%s"><a href="#">%s</a></li>',
         dropdownCaret: '<span class="caret"></span>',
-        pagination: ['<ul class="pagination%s">', '</ul>'],
-        paginationItem: '<li class="page-item%s"><a class="page-link" aria-label="%s" href="javascript:void(0)">%s</a></li>',
         icon: '<i class="%s %s"></i>',
         inputGroup: '<div class="input-group">%s<span class="input-group-btn">%s</span></div>',
-        searchInput: '<input class="%s%s" type="text" placeholder="%s">',
+        pageDropdown: ['<ul class="dropdown-menu" role="menu">', '</ul>'],
+        pageDropdownItem: '<li role="menuitem" class="%s"><a href="#">%s</a></li>',
+        pagination: ['<ul class="pagination%s">', '</ul>'],
+        paginationItem: '<li class="page-item%s"><a class="page-link" aria-label="%s" href="javascript:void(0)">%s</a></li>',
         searchButton: '<button class="%s" type="button" name="search" title="%s">%s %s</button>',
-        searchClearButton: '<button class="%s" type="button" name="clearSearch" title="%s">%s %s</button>'
+        searchClearButton: '<button class="%s" type="button" name="clearSearch" title="%s">%s %s</button>',
+        searchInput: '<input class="%s%s" type="text" placeholder="%s">',
+        toolbarDropdown: ['<ul class="dropdown-menu" role="menu">', '</ul>'],
+        toolbarDropdownItem: '<li class="dropdown-item-marker" role="menuitem"><label>%s</label></li>',
+        toolbarDropdownSeparator: '<li class="divider"></li>'
       }
     },
     4: {
       classes: {
-        buttonsPrefix: 'btn',
+        buttonActive: 'active',
         buttons: 'secondary',
-        buttonsGroup: 'btn-group',
         buttonsDropdown: 'btn-group',
-        pull: 'float',
+        buttonsGroup: 'btn-group',
+        buttonsPrefix: 'btn',
+        dropdownActive: 'active',
+        dropup: 'dropup',
+        input: 'form-control',
         inputGroup: 'btn-group',
         inputPrefix: 'form-control-',
-        input: 'form-control',
-        select: 'form-control',
-        paginationDropdown: 'btn-group dropdown',
-        dropup: 'dropup',
-        dropdownActive: 'active',
         paginationActive: 'active',
-        buttonActive: 'active'
+        paginationDropdown: 'btn-group dropdown',
+        pull: 'float',
+        select: 'form-control'
       },
       html: {
-        toolbarDropdown: ['<div class="dropdown-menu dropdown-menu-right">', '</div>'],
-        toolbarDropdownItem: '<label class="dropdown-item dropdown-item-marker">%s</label>',
-        pageDropdown: ['<div class="dropdown-menu">', '</div>'],
-        pageDropdownItem: '<a class="dropdown-item %s" href="#">%s</a>',
-        toolbarDropdownSeparator: '<div class="dropdown-divider"></div>',
         dropdownCaret: '<span class="caret"></span>',
-        pagination: ['<ul class="pagination%s">', '</ul>'],
-        paginationItem: '<li class="page-item%s"><a class="page-link" aria-label="%s" href="javascript:void(0)">%s</a></li>',
         icon: '<i class="%s %s"></i>',
         inputGroup: '<div class="input-group">%s<div class="input-group-append">%s</div></div>',
-        searchInput: '<input class="%s%s" type="text" placeholder="%s">',
+        pageDropdown: ['<div class="dropdown-menu">', '</div>'],
+        pageDropdownItem: '<a class="dropdown-item %s" href="#">%s</a>',
+        pagination: ['<ul class="pagination%s">', '</ul>'],
+        paginationItem: '<li class="page-item%s"><a class="page-link" aria-label="%s" href="javascript:void(0)">%s</a></li>',
         searchButton: '<button class="%s" type="button" name="search" title="%s">%s %s</button>',
-        searchClearButton: '<button class="%s" type="button" name="clearSearch" title="%s">%s %s</button>'
+        searchClearButton: '<button class="%s" type="button" name="clearSearch" title="%s">%s %s</button>',
+        searchInput: '<input class="%s%s" type="text" placeholder="%s">',
+        toolbarDropdown: ['<div class="dropdown-menu dropdown-menu-right">', '</div>'],
+        toolbarDropdownItem: '<label class="dropdown-item dropdown-item-marker">%s</label>',
+        toolbarDropdownSeparator: '<div class="dropdown-divider"></div>'
       }
     },
     5: {
       classes: {
-        buttonsPrefix: 'btn',
+        buttonActive: 'active',
         buttons: 'secondary',
-        buttonsGroup: 'btn-group',
         buttonsDropdown: 'btn-group',
-        pull: 'float',
+        buttonsGroup: 'btn-group',
+        buttonsPrefix: 'btn',
+        dropdownActive: 'active',
+        dropup: 'dropup',
+        input: 'form-control',
         inputGroup: 'btn-group',
         inputPrefix: 'form-control-',
-        input: 'form-control',
-        select: 'form-select',
-        paginationDropdown: 'btn-group dropdown',
-        dropup: 'dropup',
-        dropdownActive: 'active',
         paginationActive: 'active',
-        buttonActive: 'active'
+        paginationDropdown: 'btn-group dropdown',
+        pull: 'float',
+        select: 'form-select'
       },
       html: {
         dataToggle: 'data-bs-toggle',
-        toolbarDropdown: ['<div class="dropdown-menu dropdown-menu-end">', '</div>'],
-        toolbarDropdownItem: '<label class="dropdown-item dropdown-item-marker">%s</label>',
-        pageDropdown: ['<div class="dropdown-menu">', '</div>'],
-        pageDropdownItem: '<a class="dropdown-item %s" href="#">%s</a>',
-        toolbarDropdownSeparator: '<div class="dropdown-divider"></div>',
         dropdownCaret: '<span class="caret"></span>',
-        pagination: ['<ul class="pagination%s">', '</ul>'],
-        paginationItem: '<li class="page-item%s"><a class="page-link" aria-label="%s" href="javascript:void(0)">%s</a></li>',
         icon: '<i class="%s %s"></i>',
         inputGroup: '<div class="input-group">%s%s</div>',
-        searchInput: '<input class="%s%s" type="text" placeholder="%s">',
+        pageDropdown: ['<div class="dropdown-menu">', '</div>'],
+        pageDropdownItem: '<a class="dropdown-item %s" href="#">%s</a>',
+        pagination: ['<ul class="pagination%s">', '</ul>'],
+        paginationItem: '<li class="page-item%s"><a class="page-link" aria-label="%s" href="javascript:void(0)">%s</a></li>',
         searchButton: '<button class="%s" type="button" name="search" title="%s">%s %s</button>',
-        searchClearButton: '<button class="%s" type="button" name="clearSearch" title="%s">%s %s</button>'
+        searchClearButton: '<button class="%s" type="button" name="clearSearch" title="%s">%s %s</button>',
+        searchInput: '<input class="%s%s" type="text" placeholder="%s">',
+        toolbarDropdown: ['<div class="dropdown-menu dropdown-menu-end">', '</div>'],
+        toolbarDropdownItem: '<label class="dropdown-item dropdown-item-marker">%s</label>',
+        toolbarDropdownSeparator: '<div class="dropdown-divider"></div>'
       }
     }
   }[bootstrapVersion];
+  var ICONS = {
+    glyphicon: {
+      clearSearch: 'glyphicon-trash',
+      columns: 'glyphicon-th icon-th',
+      detailClose: 'glyphicon-minus icon-minus',
+      detailOpen: 'glyphicon-plus icon-plus',
+      fullscreen: 'glyphicon-fullscreen',
+      paginationSwitchDown: 'glyphicon-collapse-down icon-chevron-down',
+      paginationSwitchUp: 'glyphicon-collapse-up icon-chevron-up',
+      refresh: 'glyphicon-refresh icon-refresh',
+      search: 'glyphicon-search',
+      toggleOff: 'glyphicon-list-alt icon-list-alt',
+      toggleOn: 'glyphicon-list-alt icon-list-alt'
+    },
+    fa: {
+      clearSearch: 'fa-trash',
+      columns: 'fa-th-list',
+      detailClose: 'fa-minus',
+      detailOpen: 'fa-plus',
+      fullscreen: 'fa-arrows-alt',
+      paginationSwitchDown: 'fa-caret-square-down',
+      paginationSwitchUp: 'fa-caret-square-up',
+      refresh: 'fa-sync',
+      search: 'fa-search',
+      toggleOff: 'fa-toggle-off',
+      toggleOn: 'fa-toggle-on'
+    },
+    bi: {
+      clearSearch: 'bi-trash',
+      columns: 'bi-list-ul',
+      detailClose: 'bi-dash',
+      detailOpen: 'bi-plus',
+      fullscreen: 'bi-arrows-move',
+      paginationSwitchDown: 'bi-caret-down-square',
+      paginationSwitchUp: 'bi-caret-up-square',
+      refresh: 'bi-arrow-clockwise',
+      search: 'bi-search',
+      toggleOff: 'bi-toggle-off',
+      toggleOn: 'bi-toggle-on'
+    },
+    icon: {
+      clearSearch: 'icon-trash-2',
+      columns: 'icon-list',
+      detailClose: 'icon-minus',
+      detailOpen: 'icon-plus',
+      fullscreen: 'icon-maximize',
+      paginationSwitchDown: 'icon-arrow-up-circle',
+      paginationSwitchUp: 'icon-arrow-down-circle',
+      refresh: 'icon-refresh-cw',
+      search: 'icon-search',
+      toggleOff: 'icon-toggle-right',
+      toggleOn: 'icon-toggle-right'
+    },
+    'material-icons': {
+      clearSearch: 'delete',
+      columns: 'view_list',
+      detailClose: 'remove',
+      detailOpen: 'add',
+      fullscreen: 'fullscreen',
+      paginationSwitchDown: 'grid_on',
+      paginationSwitchUp: 'grid_off',
+      refresh: 'refresh',
+      search: 'search',
+      sort: 'sort',
+      toggleOff: 'tablet',
+      toggleOn: 'tablet_android'
+    }
+  };
   var DEFAULTS = {
-    height: undefined,
-    classes: 'table table-bordered table-hover',
-    buttons: {},
-    theadClasses: '',
-    headerStyle: function headerStyle(column) {
-      return {};
-    },
-    rowStyle: function rowStyle(row, index) {
-      return {};
-    },
-    rowAttributes: function rowAttributes(row, index) {
-      return {};
-    },
-    undefinedText: '-',
-    locale: undefined,
-    virtualScroll: false,
-    virtualScrollItemHeight: undefined,
-    sortable: true,
-    sortClass: undefined,
-    silentSort: true,
-    sortEmptyLast: false,
-    sortName: undefined,
-    sortOrder: undefined,
-    sortReset: false,
-    sortStable: false,
-    sortResetPage: false,
-    rememberOrder: false,
-    serverSort: true,
-    customSort: undefined,
-    columns: [[]],
-    data: [],
-    url: undefined,
-    method: 'get',
-    cache: true,
-    contentType: 'application/json',
-    dataType: 'json',
     ajax: undefined,
     ajaxOptions: {},
-    queryParams: function queryParams(params) {
-      return params;
-    },
-    queryParamsType: 'limit',
-    // 'limit', undefined
-    responseHandler: function responseHandler(res) {
-      return res;
-    },
-    totalField: 'total',
-    totalNotFilteredField: 'totalNotFiltered',
-    dataField: 'rows',
-    footerField: 'footer',
-    pagination: false,
-    paginationParts: ['pageInfo', 'pageSize', 'pageList'],
-    showExtendedPagination: false,
-    paginationLoop: true,
-    sidePagination: 'client',
-    // client or server
-    totalRows: 0,
-    totalNotFiltered: 0,
-    pageNumber: 1,
-    pageSize: 10,
-    pageList: [10, 25, 50, 100],
-    paginationHAlign: 'right',
-    // right, left
-    paginationVAlign: 'bottom',
-    // bottom, top, both
-    paginationDetailHAlign: 'left',
-    // right, left
-    paginationPreText: '&lsaquo;',
-    paginationNextText: '&rsaquo;',
-    paginationSuccessivelySize: 5,
-    // Maximum successively number of pages in a row
-    paginationPagesBySide: 1,
-    // Number of pages on each side (right, left) of the current page.
-    paginationUseIntermediate: false,
-    // Calculate intermediate pages for quick access
-    paginationLoadMore: false,
-    search: false,
-    searchable: false,
-    searchHighlight: false,
-    searchOnEnterKey: false,
-    strictSearch: false,
-    regexSearch: false,
-    searchSelector: false,
-    visibleSearch: false,
-    showButtonIcons: true,
-    showButtonText: false,
-    showSearchButton: false,
-    showSearchClearButton: false,
-    trimOnSearch: true,
-    searchAlign: 'right',
-    searchTimeOut: 500,
-    searchText: '',
+    buttons: {},
+    buttonsAlign: 'right',
+    buttonsAttributeTitle: 'title',
+    buttonsClass: CONSTANTS.classes.buttons,
+    buttonsOrder: ['paginationSwitch', 'refresh', 'toggle', 'fullscreen', 'columns'],
+    buttonsPrefix: CONSTANTS.classes.buttonsPrefix,
+    buttonsToolbar: undefined,
+    cache: true,
+    cardView: false,
+    checkboxHeader: true,
+    classes: 'table table-bordered table-hover',
+    clickToSelect: false,
+    columns: [[]],
+    contentType: 'application/json',
     customSearch: undefined,
-    showHeader: true,
-    showFooter: false,
-    footerStyle: function footerStyle(column) {
-      return {};
+    customSort: undefined,
+    data: [],
+    dataField: 'rows',
+    dataType: 'json',
+    detailFilter: function detailFilter(index, row) {
+      return true;
     },
-    searchAccentNeutralise: false,
-    showColumns: false,
-    showColumnsToggleAll: false,
-    showColumnsSearch: false,
-    minimumCountColumns: 1,
-    showPaginationSwitch: false,
-    showRefresh: false,
-    showToggle: false,
-    showFullscreen: false,
-    smartDisplay: true,
+    detailFormatter: function detailFormatter(index, row) {
+      return '';
+    },
+    detailView: false,
+    detailViewAlign: 'left',
+    detailViewByClick: false,
+    detailViewIcon: true,
     escape: false,
     escapeTitle: true,
     filterOptions: {
       filterAlgorithm: 'and'
     },
+    fixedScroll: false,
+    footerField: 'footer',
+    footerStyle: function footerStyle(column) {
+      return {};
+    },
+    headerStyle: function headerStyle(column) {
+      return {};
+    },
+    height: undefined,
+    icons: {},
+    // init in initConstants
+    iconSize: undefined,
+    iconsPrefix: undefined,
+    // init in initConstants
     idField: undefined,
-    selectItemName: 'btSelectItem',
-    clickToSelect: false,
     ignoreClickToSelectOn: function ignoreClickToSelectOn(_ref) {
       var tagName = _ref.tagName;
       return ['A', 'BUTTON'].includes(tagName);
     },
-    singleSelect: false,
-    checkboxHeader: true,
-    maintainMetaData: false,
-    multipleSelectRow: false,
-    uniqueId: undefined,
-    cardView: false,
-    detailView: false,
-    detailViewIcon: true,
-    detailViewByClick: false,
-    detailViewAlign: 'left',
-    detailFormatter: function detailFormatter(index, row) {
-      return '';
-    },
-    detailFilter: function detailFilter(index, row) {
-      return true;
-    },
-    toolbar: undefined,
-    toolbarAlign: 'left',
-    buttonsToolbar: undefined,
-    buttonsAlign: 'right',
-    buttonsOrder: ['paginationSwitch', 'refresh', 'toggle', 'fullscreen', 'columns'],
-    buttonsPrefix: CONSTANTS.classes.buttonsPrefix,
-    buttonsClass: CONSTANTS.classes.buttons,
-    iconsPrefix: undefined,
-    // init in initConstants
-    icons: {},
-    // init in initConstants
-    iconSize: undefined,
-    fixedScroll: false,
     loadingFontSize: 'auto',
     loadingTemplate: function loadingTemplate(loadingMessage) {
-      return "<span class=\"loading-wrap\">\n      <span class=\"loading-text\">".concat(loadingMessage, "</span>\n      <span class=\"animation-wrap\"><span class=\"animation-dot\"></span></span>\n      </span>\n    ");
+      return "<span class=\"loading-wrap\">\n    <span class=\"loading-text\">".concat(loadingMessage, "</span>\n    <span class=\"animation-wrap\"><span class=\"animation-dot\"></span></span>\n    </span>\n  ");
     },
+    locale: undefined,
+    maintainMetaData: false,
+    method: 'get',
+    minimumCountColumns: 1,
+    multipleSelectRow: false,
+    pageList: [10, 25, 50, 100],
+    pageNumber: 1,
+    pageSize: 10,
+    pagination: false,
+    paginationDetailHAlign: 'left',
+    // right, left
+    paginationHAlign: 'right',
+    // right, left
+    paginationLoadMore: false,
+    paginationLoop: true,
+    paginationNextText: '&rsaquo;',
+    paginationPagesBySide: 1,
+    // Number of pages on each side (right, left) of the current page.
+    paginationParts: ['pageInfo', 'pageSize', 'pageList'],
+    paginationPreText: '&lsaquo;',
+    paginationSuccessivelySize: 5,
+    // Maximum successively number of pages in a row
+    paginationUseIntermediate: false,
+    // Calculate intermediate pages for quick access
+    paginationVAlign: 'bottom',
+    // bottom, top, both
+    queryParams: function queryParams(params) {
+      return params;
+    },
+    queryParamsType: 'limit',
+    // 'limit', undefined
+    regexSearch: false,
+    rememberOrder: false,
+    responseHandler: function responseHandler(res) {
+      return res;
+    },
+    rowAttributes: function rowAttributes(row, index) {
+      return {};
+    },
+    rowStyle: function rowStyle(row, index) {
+      return {};
+    },
+    search: false,
+    searchable: false,
+    searchAccentNeutralise: false,
+    searchAlign: 'right',
+    searchHighlight: false,
+    searchOnEnterKey: false,
+    searchSelector: false,
+    searchText: '',
+    searchTimeOut: 500,
+    selectItemName: 'btSelectItem',
+    serverSort: true,
+    showButtonIcons: true,
+    showButtonText: false,
+    showColumns: false,
+    showColumnsSearch: false,
+    showColumnsToggleAll: false,
+    showExtendedPagination: false,
+    showFooter: false,
+    showFullscreen: false,
+    showHeader: true,
+    showPaginationSwitch: false,
+    showRefresh: false,
+    showSearchButton: false,
+    showSearchClearButton: false,
+    showToggle: false,
+    sidePagination: 'client',
+    // client or server
+    silentSort: true,
+    singleSelect: false,
+    smartDisplay: true,
+    sortable: true,
+    sortClass: undefined,
+    sortEmptyLast: false,
+    sortName: undefined,
+    sortOrder: undefined,
+    sortReset: false,
+    sortResetPage: false,
+    sortStable: false,
+    strictSearch: false,
+    theadClasses: '',
+    toolbar: undefined,
+    toolbarAlign: 'left',
+    totalField: 'total',
+    totalNotFiltered: 0,
+    totalNotFilteredField: 'totalNotFiltered',
+    totalRows: 0,
+    trimOnSearch: true,
+    undefinedText: '-',
+    uniqueId: undefined,
+    url: undefined,
+    virtualScroll: false,
+    virtualScrollItemHeight: undefined,
+    visibleSearch: false,
     onAll: function onAll(name, args) {
       return false;
     },
-    onClickCell: function onClickCell(field, value, row, $element) {
-      return false;
-    },
-    onDblClickCell: function onDblClickCell(field, value, row, $element) {
-      return false;
-    },
-    onClickRow: function onClickRow(item, $element) {
-      return false;
-    },
-    onDblClickRow: function onDblClickRow(item, $element) {
-      return false;
-    },
-    onSort: function onSort(name, order) {
-      return false;
-    },
     onCheck: function onCheck(row) {
       return false;
     },
-    onUncheck: function onUncheck(row) {
-      return false;
-    },
     onCheckAll: function onCheckAll(rows) {
       return false;
     },
-    onUncheckAll: function onUncheckAll(rows) {
-      return false;
-    },
     onCheckSome: function onCheckSome(rows) {
       return false;
     },
-    onUncheckSome: function onUncheckSome(rows) {
+    onClickCell: function onClickCell(field, value, row, $element) {
       return false;
     },
-    onLoadSuccess: function onLoadSuccess(data) {
+    onClickRow: function onClickRow(item, $element) {
       return false;
     },
-    onLoadError: function onLoadError(status) {
+    onCollapseRow: function onCollapseRow(index, row) {
       return false;
     },
     onColumnSwitch: function onColumnSwitch(field, checked) {
@@ -5591,48 +8079,69 @@
     onColumnSwitchAll: function onColumnSwitchAll(checked) {
       return false;
     },
-    onPageChange: function onPageChange(number, size) {
+    onDblClickCell: function onDblClickCell(field, value, row, $element) {
       return false;
     },
-    onSearch: function onSearch(text) {
-      return false;
-    },
-    onToggle: function onToggle(cardView) {
-      return false;
-    },
-    onPreBody: function onPreBody(data) {
-      return false;
-    },
-    onPostBody: function onPostBody() {
-      return false;
-    },
-    onPostHeader: function onPostHeader() {
-      return false;
-    },
-    onPostFooter: function onPostFooter() {
+    onDblClickRow: function onDblClickRow(item, $element) {
       return false;
     },
     onExpandRow: function onExpandRow(index, row, $detail) {
       return false;
     },
-    onCollapseRow: function onCollapseRow(index, row) {
+    onLoadError: function onLoadError(status) {
       return false;
     },
-    onRefreshOptions: function onRefreshOptions(options) {
+    onLoadSuccess: function onLoadSuccess(data) {
+      return false;
+    },
+    onPageChange: function onPageChange(number, size) {
+      return false;
+    },
+    onPostBody: function onPostBody() {
+      return false;
+    },
+    onPostFooter: function onPostFooter() {
+      return false;
+    },
+    onPostHeader: function onPostHeader() {
+      return false;
+    },
+    onPreBody: function onPreBody(data) {
       return false;
     },
     onRefresh: function onRefresh(params) {
       return false;
     },
+    onRefreshOptions: function onRefreshOptions(options) {
+      return false;
+    },
     onResetView: function onResetView() {
       return false;
     },
     onScrollBody: function onScrollBody() {
       return false;
     },
+    onSearch: function onSearch(text) {
+      return false;
+    },
+    onSort: function onSort(name, order) {
+      return false;
+    },
+    onToggle: function onToggle(cardView) {
+      return false;
+    },
     onTogglePagination: function onTogglePagination(newState) {
       return false;
     },
+    onUncheck: function onUncheck(row) {
+      return false;
+    },
+    onUncheckAll: function onUncheckAll(rows) {
+      return false;
+    },
+    onUncheckSome: function onUncheckSome(rows) {
+      return false;
+    },
     onVirtualScroll: function onVirtualScroll(startIndex, endIndex) {
       return false;
     }
@@ -5703,94 +8212,111 @@
     }
   };
   var COLUMN_DEFAULTS = {
-    field: undefined,
-    title: undefined,
-    titleTooltip: undefined,
-    class: undefined,
-    width: undefined,
-    widthUnit: 'px',
-    rowspan: undefined,
-    colspan: undefined,
     align: undefined,
-    // left, right, center
-    halign: undefined,
-    // left, right, center
-    falign: undefined,
-    // left, right, center
-    valign: undefined,
-    // top, middle, bottom
+    // string: left, right, center
+    cardVisible: true,
     cellStyle: undefined,
-    radio: false,
+    // function
     checkbox: false,
     checkboxEnabled: true,
+    class: undefined,
+    // string
     clickToSelect: true,
-    showSelectTitle: false,
-    sortable: false,
-    sortName: undefined,
+    colspan: undefined,
+    // number
+    detailFormatter: undefined,
+    // function
+    escape: undefined,
+    // boolean
+    events: undefined,
+    falign: undefined,
+    // string: left, right, center
+    field: undefined,
+    // string
+    footerFormatter: undefined,
+    // function
+    footerStyle: undefined,
+    // function
+    formatter: undefined,
+    // function
+    halign: undefined,
+    // left, right, center
     order: 'asc',
     // asc, desc
-    sorter: undefined,
-    visible: true,
-    switchable: true,
-    switchableLabel: undefined,
-    cardVisible: true,
+    radio: false,
+    rowspan: undefined,
+    // number
     searchable: true,
-    formatter: undefined,
-    footerFormatter: undefined,
-    footerStyle: undefined,
-    detailFormatter: undefined,
     searchFormatter: true,
     searchHighlightFormatter: false,
-    escape: undefined,
-    events: undefined
+    showSelectTitle: false,
+    sortable: false,
+    sorter: undefined,
+    // function
+    sortName: undefined,
+    // string
+    switchable: true,
+    switchableLabel: undefined,
+    // string
+    title: undefined,
+    // string
+    titleTooltip: undefined,
+    // string
+    valign: undefined,
+    // top, middle, bottom
+    visible: true,
+    width: undefined,
+    // number
+    widthUnit: 'px'
   };
-  var METHODS = ['getOptions', 'refreshOptions', 'getData', 'getSelections', 'load', 'append', 'prepend', 'remove', 'removeAll', 'insertRow', 'updateRow', 'getRowByUniqueId', 'updateByUniqueId', 'removeByUniqueId', 'updateCell', 'updateCellByUniqueId', 'showRow', 'hideRow', 'getHiddenRows', 'showColumn', 'hideColumn', 'getVisibleColumns', 'getHiddenColumns', 'showAllColumns', 'hideAllColumns', 'mergeCells', 'checkAll', 'uncheckAll', 'checkInvert', 'check', 'uncheck', 'checkBy', 'uncheckBy', 'refresh', 'destroy', 'resetView', 'showLoading', 'hideLoading', 'togglePagination', 'toggleFullscreen', 'toggleView', 'resetSearch', 'filterBy', 'sortBy', 'scrollTo', 'getScrollPosition', 'selectPage', 'prevPage', 'nextPage', 'toggleDetailView', 'expandRow', 'collapseRow', 'expandRowByUniqueId', 'collapseRowByUniqueId', 'expandAllRows', 'collapseAllRows', 'updateColumnTitle', 'updateFormatText'];
+  var METHODS = ['getOptions', 'refreshOptions', 'getData', 'getFooterData', 'getSelections', 'load', 'append', 'prepend', 'remove', 'removeAll', 'insertRow', 'updateRow', 'getRowByUniqueId', 'updateByUniqueId', 'removeByUniqueId', 'updateCell', 'updateCellByUniqueId', 'showRow', 'hideRow', 'getHiddenRows', 'showColumn', 'hideColumn', 'getVisibleColumns', 'getHiddenColumns', 'showAllColumns', 'hideAllColumns', 'mergeCells', 'checkAll', 'uncheckAll', 'checkInvert', 'check', 'uncheck', 'checkBy', 'uncheckBy', 'refresh', 'destroy', 'resetView', 'showLoading', 'hideLoading', 'togglePagination', 'toggleFullscreen', 'toggleView', 'resetSearch', 'filterBy', 'sortBy', 'sortReset', 'scrollTo', 'getScrollPosition', 'selectPage', 'prevPage', 'nextPage', 'toggleDetailView', 'expandRow', 'collapseRow', 'expandRowByUniqueId', 'collapseRowByUniqueId', 'expandAllRows', 'collapseAllRows', 'updateColumnTitle', 'updateFormatText'];
   var EVENTS = {
     'all.bs.table': 'onAll',
-    'click-row.bs.table': 'onClickRow',
-    'dbl-click-row.bs.table': 'onDblClickRow',
-    'click-cell.bs.table': 'onClickCell',
-    'dbl-click-cell.bs.table': 'onDblClickCell',
-    'sort.bs.table': 'onSort',
-    'check.bs.table': 'onCheck',
-    'uncheck.bs.table': 'onUncheck',
     'check-all.bs.table': 'onCheckAll',
-    'uncheck-all.bs.table': 'onUncheckAll',
     'check-some.bs.table': 'onCheckSome',
-    'uncheck-some.bs.table': 'onUncheckSome',
-    'load-success.bs.table': 'onLoadSuccess',
-    'load-error.bs.table': 'onLoadError',
-    'column-switch.bs.table': 'onColumnSwitch',
-    'column-switch-all.bs.table': 'onColumnSwitchAll',
-    'page-change.bs.table': 'onPageChange',
-    'search.bs.table': 'onSearch',
-    'toggle.bs.table': 'onToggle',
-    'pre-body.bs.table': 'onPreBody',
-    'post-body.bs.table': 'onPostBody',
-    'post-header.bs.table': 'onPostHeader',
-    'post-footer.bs.table': 'onPostFooter',
-    'expand-row.bs.table': 'onExpandRow',
+    'check.bs.table': 'onCheck',
+    'click-cell.bs.table': 'onClickCell',
+    'click-row.bs.table': 'onClickRow',
     'collapse-row.bs.table': 'onCollapseRow',
+    'column-switch-all.bs.table': 'onColumnSwitchAll',
+    'column-switch.bs.table': 'onColumnSwitch',
+    'dbl-click-cell.bs.table': 'onDblClickCell',
+    'dbl-click-row.bs.table': 'onDblClickRow',
+    'expand-row.bs.table': 'onExpandRow',
+    'load-error.bs.table': 'onLoadError',
+    'load-success.bs.table': 'onLoadSuccess',
+    'page-change.bs.table': 'onPageChange',
+    'post-body.bs.table': 'onPostBody',
+    'post-footer.bs.table': 'onPostFooter',
+    'post-header.bs.table': 'onPostHeader',
+    'pre-body.bs.table': 'onPreBody',
     'refresh-options.bs.table': 'onRefreshOptions',
-    'reset-view.bs.table': 'onResetView',
     'refresh.bs.table': 'onRefresh',
+    'reset-view.bs.table': 'onResetView',
     'scroll-body.bs.table': 'onScrollBody',
+    'search.bs.table': 'onSearch',
+    'sort.bs.table': 'onSort',
     'toggle-pagination.bs.table': 'onTogglePagination',
+    'toggle.bs.table': 'onToggle',
+    'uncheck-all.bs.table': 'onUncheckAll',
+    'uncheck-some.bs.table': 'onUncheckSome',
+    'uncheck.bs.table': 'onUncheck',
     'virtual-scroll.bs.table': 'onVirtualScroll'
   };
   Object.assign(DEFAULTS, EN);
   var Constants = {
-    VERSION: VERSION,
-    THEME: "bootstrap".concat(bootstrapVersion),
+    COLUMN_DEFAULTS: COLUMN_DEFAULTS,
     CONSTANTS: CONSTANTS,
     DEFAULTS: DEFAULTS,
-    COLUMN_DEFAULTS: COLUMN_DEFAULTS,
-    METHODS: METHODS,
     EVENTS: EVENTS,
+    ICONS: ICONS,
     LOCALES: {
       en: EN,
       'en-US': EN
-    }
+    },
+    METHODS: METHODS,
+    THEME: "bootstrap".concat(bootstrapVersion),
+    VERSION: VERSION
   };
 
   var BLOCK_ROWS = 50;
@@ -5929,7 +8455,7 @@
     function BootstrapTable(el, options) {
       _classCallCheck(this, BootstrapTable);
       this.options = options;
-      this.$el = $$q(el);
+      this.$el = $(el);
       this.$el_ = this.$el.clone();
       this.timeoutId_ = 0;
       this.timeoutFooter_ = 0;
@@ -5955,16 +8481,16 @@
       value: function initConstants() {
         var opts = this.options;
         this.constants = Constants.CONSTANTS;
-        this.constants.theme = $$q.fn.bootstrapTable.theme;
+        this.constants.theme = $.fn.bootstrapTable.theme;
         this.constants.dataToggle = this.constants.html.dataToggle || 'data-toggle';
 
         // init iconsPrefix and icons
-        var iconsPrefix = Utils.getIconsPrefix($$q.fn.bootstrapTable.theme);
+        var iconsPrefix = Utils.getIconsPrefix($.fn.bootstrapTable.theme);
         if (typeof opts.icons === 'string') {
           opts.icons = Utils.calculateObjectValue(null, opts.icons);
         }
-        opts.iconsPrefix = opts.iconsPrefix || $$q.fn.bootstrapTable.defaults.iconsPrefix || iconsPrefix;
-        opts.icons = Object.assign(Utils.getIcons(opts.iconsPrefix), $$q.fn.bootstrapTable.defaults.icons, opts.icons);
+        opts.iconsPrefix = opts.iconsPrefix || $.fn.bootstrapTable.defaults.iconsPrefix || iconsPrefix;
+        opts.icons = Object.assign(Utils.getIcons(Constants.ICONS, opts.iconsPrefix), $.fn.bootstrapTable.defaults.icons, opts.icons);
 
         // init buttons class
         var buttonsPrefix = opts.buttonsPrefix ? "".concat(opts.buttonsPrefix, "-") : '';
@@ -5978,7 +8504,7 @@
       key: "initLocale",
       value: function initLocale() {
         if (this.options.locale) {
-          var locales = $$q.fn.bootstrapTable.locales;
+          var locales = $.fn.bootstrapTable.locales;
           var parts = this.options.locale.split(/-|_/);
           parts[0] = parts[0].toLowerCase();
           if (parts[1]) {
@@ -6012,7 +8538,7 @@
         var topPagination = ['top', 'both'].includes(this.options.paginationVAlign) ? '<div class="fixed-table-pagination clearfix"></div>' : '';
         var bottomPagination = ['bottom', 'both'].includes(this.options.paginationVAlign) ? '<div class="fixed-table-pagination"></div>' : '';
         var loadingTemplate = Utils.calculateObjectValue(this.options, this.options.loadingTemplate, [this.options.formatLoadingMessage()]);
-        this.$container = $$q("\n      <div class=\"bootstrap-table ".concat(this.constants.theme, "\">\n      <div class=\"fixed-table-toolbar\"></div>\n      ").concat(topPagination, "\n      <div class=\"fixed-table-container\">\n      <div class=\"fixed-table-header\"><table></table></div>\n      <div class=\"fixed-table-body\">\n      <div class=\"fixed-table-loading\">\n      ").concat(loadingTemplate, "\n      </div>\n      </div>\n      <div class=\"fixed-table-footer\"></div>\n      </div>\n      ").concat(bottomPagination, "\n      </div>\n    "));
+        this.$container = $("\n      <div class=\"bootstrap-table ".concat(this.constants.theme, "\">\n      <div class=\"fixed-table-toolbar\"></div>\n      ").concat(topPagination, "\n      <div class=\"fixed-table-container\">\n      <div class=\"fixed-table-header\"><table></table></div>\n      <div class=\"fixed-table-body\">\n      <div class=\"fixed-table-loading\">\n      ").concat(loadingTemplate, "\n      </div>\n      </div>\n      <div class=\"fixed-table-footer\"></div>\n      </div>\n      ").concat(bottomPagination, "\n      </div>\n    "));
         this.$container.insertAfter(this.$el);
         this.$tableContainer = this.$container.find('.fixed-table-container');
         this.$tableHeader = this.$container.find('.fixed-table-header');
@@ -6021,7 +8547,7 @@
         this.$tableFooter = this.$el.find('tfoot');
         // checking if custom table-toolbar exists or not
         if (this.options.buttonsToolbar) {
-          this.$toolbar = $$q('body').find(this.options.buttonsToolbar);
+          this.$toolbar = $('body').find(this.options.buttonsToolbar);
         } else {
           this.$toolbar = this.$container.find('.fixed-table-toolbar');
         }
@@ -6050,17 +8576,17 @@
         var columns = [];
         this.$header = this.$el.find('>thead');
         if (!this.$header.length) {
-          this.$header = $$q("<thead class=\"".concat(this.options.theadClasses, "\"></thead>")).appendTo(this.$el);
+          this.$header = $("<thead class=\"".concat(this.options.theadClasses, "\"></thead>")).appendTo(this.$el);
         } else if (this.options.theadClasses) {
           this.$header.addClass(this.options.theadClasses);
         }
         this._headerTrClasses = [];
         this._headerTrStyles = [];
         this.$header.find('tr').each(function (i, el) {
-          var $tr = $$q(el);
+          var $tr = $(el);
           var column = [];
           $tr.find('th').each(function (i, el) {
-            var $th = $$q(el);
+            var $th = $(el);
 
             // #2014: getFieldIndex and elsewhere assume this is string, causes issues if not
             if (typeof $th.data('field') !== 'undefined') {
@@ -6068,7 +8594,7 @@
             }
             var _data = Object.assign({}, $th.data());
             for (var key in _data) {
-              if ($$q.fn.bootstrapTable.columnDefaults.hasOwnProperty(key)) {
+              if ($.fn.bootstrapTable.columnDefaults.hasOwnProperty(key)) {
                 delete _data[key];
               }
             }
@@ -6095,7 +8621,9 @@
         this.options.columns = Utils.extend(true, [], columns, this.options.columns);
         this.columns = [];
         this.fieldsColumnsIndex = [];
-        Utils.setFieldIndex(this.options.columns);
+        if (this.optionsColumnsChanged !== false) {
+          Utils.setFieldIndex(this.options.columns);
+        }
         this.options.columns.forEach(function (columns, i) {
           columns.forEach(function (_column, j) {
             var column = Utils.extend({}, BootstrapTable.COLUMN_DEFAULTS, _column, {
@@ -6160,7 +8688,7 @@
             html.push(detailViewTemplate);
           }
           columns.forEach(function (column, j) {
-            var class_ = Utils.sprintf(' class="%s"', column['class']);
+            var class_ = Utils.sprintf(' class="%s"', column.class);
             var unitWidth = column.widthUnit;
             var width = parseFloat(column.width);
             var columnHalign = column.halign ? column.halign : column.align;
@@ -6189,7 +8717,7 @@
             if (typeof column.fieldIndex !== 'undefined') {
               _this2.header.fields[column.fieldIndex] = column.field;
               _this2.header.styles[column.fieldIndex] = align + style;
-              _this2.header.classes[column.fieldIndex] = class_;
+              _this2.header.classes[column.fieldIndex] = column.class;
               _this2.header.formatters[column.fieldIndex] = column.formatter;
               _this2.header.detailFormatters[column.fieldIndex] = column.detailFormatter;
               _this2.header.events[column.fieldIndex] = column.events;
@@ -6249,10 +8777,10 @@
         });
         this.$header.html(headerHtml.join(''));
         this.$header.find('th[data-field]').each(function (i, el) {
-          $$q(el).data(visibleColumns[$$q(el).data('field')]);
+          $(el).data(visibleColumns[$(el).data('field')]);
         });
         this.$container.off('click', '.th-inner').on('click', '.th-inner', function (e) {
-          var $this = $$q(e.currentTarget);
+          var $this = $(e.currentTarget);
           if (_this2.options.detailView && !$this.parent().hasClass('bs-checkbox')) {
             if ($this.closest('.bootstrap-table')[0] !== _this2.$container[0]) {
               return false;
@@ -6263,7 +8791,7 @@
           }
         });
         var resizeEvent = Utils.getEventName('resize.bootstrap-table', this.$el.attr('id'));
-        $$q(window).off(resizeEvent);
+        $(window).off(resizeEvent);
         if (!this.options.showHeader || this.options.cardView) {
           this.$header.hide();
           this.$tableHeader.hide();
@@ -6274,14 +8802,14 @@
           this.$tableLoading.css('top', this.$header.outerHeight() + 1);
           // Assign the correct sortable arrow
           this.getCaret();
-          $$q(window).on(resizeEvent, function () {
+          $(window).on(resizeEvent, function () {
             return _this2.resetView();
           });
         }
         this.$selectAll = this.$header.find('[name="btSelectAll"]');
         this.$selectAll.off('click').on('click', function (e) {
           e.stopPropagation();
-          var checked = $$q(e.currentTarget).prop('checked');
+          var checked = $(e.currentTarget).prop('checked');
           _this2[checked ? 'checkAll' : 'uncheckAll']();
           _this2.updateSelected();
         });
@@ -6353,6 +8881,13 @@
           this.data = _toConsumableArray(this.unsortedData);
         }
       }
+    }, {
+      key: "sortReset",
+      value: function sortReset() {
+        this.options.sortName = undefined;
+        this.options.sortOrder = undefined;
+        this._sort();
+      }
     }, {
       key: "sortBy",
       value: function sortBy(params) {
@@ -6365,7 +8900,7 @@
       value: function onSort(_ref) {
         var type = _ref.type,
           currentTarget = _ref.currentTarget;
-        var $this = type === 'keypress' ? $$q(currentTarget) : $$q(currentTarget).parent();
+        var $this = type === 'keypress' ? $(currentTarget) : $(currentTarget).parent();
         var $this_ = this.$header.find('th').eq($this.index());
         this.$header.add(this.$header_).find('span.order').remove();
         if (this.options.sortName === $this.data('field')) {
@@ -6422,11 +8957,11 @@
         var $keepOpen;
         var switchableCount = 0;
         if (this.$toolbar.find('.bs-bars').children().length) {
-          $$q('body').append($$q(opts.toolbar));
+          $('body').append($(opts.toolbar));
         }
         this.$toolbar.html('');
         if (typeof opts.toolbar === 'string' || _typeof(opts.toolbar) === 'object') {
-          $$q(Utils.sprintf('<div class="bs-bars %s-%s"></div>', this.constants.classes.pull, opts.toolbarAlign)).appendTo(this.$toolbar).append($$q(opts.toolbar));
+          $(Utils.sprintf('<div class="bs-bars %s-%s"></div>', this.constants.classes.pull, opts.toolbarAlign)).appendTo(this.$toolbar).append($(opts.toolbar));
         }
 
         // showColumns, showToggle, showRefresh
@@ -6479,7 +9014,7 @@
             render: false,
             html: function html() {
               var html = [];
-              html.push("<div class=\"keep-open ".concat(_this4.constants.classes.buttonsDropdown, "\">\n            <button class=\"").concat(_this4.constants.buttonsClass, " dropdown-toggle\" type=\"button\" ").concat(_this4.constants.dataToggle, "=\"dropdown\"\n            aria-label=\"").concat(opts.formatColumns(), "\" title=\"").concat(opts.formatColumns(), "\">\n            ").concat(opts.showButtonIcons ? Utils.sprintf(_this4.constants.html.icon, opts.iconsPrefix, opts.icons.columns) : '', "\n            ").concat(opts.showButtonText ? opts.formatColumns() : '', "\n            ").concat(_this4.constants.html.dropdownCaret, "\n            </button>\n            ").concat(_this4.constants.html.toolbarDropdown[0]));
+              html.push("<div class=\"keep-open ".concat(_this4.constants.classes.buttonsDropdown, "\">\n            <button class=\"").concat(_this4.constants.buttonsClass, " dropdown-toggle\" type=\"button\" ").concat(_this4.constants.dataToggle, "=\"dropdown\"\n            aria-label=\"").concat(opts.formatColumns(), "\" ").concat(opts.buttonsAttributeTitle, "=\"").concat(opts.formatColumns(), "\">\n            ").concat(opts.showButtonIcons ? Utils.sprintf(_this4.constants.html.icon, opts.iconsPrefix, opts.icons.columns) : '', "\n            ").concat(opts.showButtonText ? opts.formatColumns() : '', "\n            ").concat(_this4.constants.html.dropdownCaret, "\n            </button>\n            ").concat(_this4.constants.html.toolbarDropdown[0]));
               if (opts.showColumnsSearch) {
                 html.push(Utils.sprintf(_this4.constants.html.toolbarDropdownItem, Utils.sprintf('<input type="text" class="%s" name="columnsSearch" placeholder="%s" autocomplete="off">', _this4.constants.classes.input, opts.formatSearch())));
                 html.push(_this4.constants.html.toolbarDropdownSeparator);
@@ -6542,7 +9077,8 @@
                 if (attributeName === 'class') {
                   continue;
                 }
-                buttonHtml += " ".concat(attributeName, "=\"").concat(value, "\"");
+                var attribute = attributeName === 'title' ? this.options.buttonsAttributeTitle : attributeName;
+                buttonHtml += " ".concat(attribute, "=\"").concat(value, "\"");
               }
             }
             buttonHtml += '>';
@@ -6628,7 +9164,7 @@
           });
           $checkboxes.off('click').on('click', function (_ref2) {
             var currentTarget = _ref2.currentTarget;
-            var $this = $$q(currentTarget);
+            var $this = $(currentTarget);
             _this4._toggleColumn($this.val(), $this.prop('checked'), false);
             _this4.trigger('column-switch', $this.data('field'), $this.prop('checked'));
             $toggleAll.prop('checked', $checkboxes.filter(':checked').length === _this4.columns.filter(function (column) {
@@ -6637,19 +9173,19 @@
           });
           $toggleAll.off('click').on('click', function (_ref3) {
             var currentTarget = _ref3.currentTarget;
-            _this4._toggleAllColumns($$q(currentTarget).prop('checked'));
-            _this4.trigger('column-switch-all', $$q(currentTarget).prop('checked'));
+            _this4._toggleAllColumns($(currentTarget).prop('checked'));
+            _this4.trigger('column-switch-all', $(currentTarget).prop('checked'));
           });
           if (opts.showColumnsSearch) {
             var $columnsSearch = $keepOpen.find('[name="columnsSearch"]');
             var $listItems = $keepOpen.find('.dropdown-item-marker');
             $columnsSearch.on('keyup paste change', function (_ref4) {
               var currentTarget = _ref4.currentTarget;
-              var $this = $$q(currentTarget);
+              var $this = $(currentTarget);
               var searchValue = $this.val().toLowerCase();
               $listItems.show();
               $checkboxes.each(function (i, el) {
-                var $checkbox = $$q(el);
+                var $checkbox = $(el);
                 var $listItem = $checkbox.parents('.dropdown-item-marker');
                 var text = $listItem.text().toLowerCase();
                 if (!text.includes(searchValue)) {
@@ -6722,16 +9258,16 @@
           currentTarget = _ref5.currentTarget,
           firedByInitSearchText = _ref5.firedByInitSearchText;
         var overwriteSearchText = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : true;
-        if (currentTarget !== undefined && $$q(currentTarget).length && overwriteSearchText) {
-          var text = $$q(currentTarget).val().trim();
-          if (this.options.trimOnSearch && $$q(currentTarget).val() !== text) {
-            $$q(currentTarget).val(text);
+        if (currentTarget !== undefined && $(currentTarget).length && overwriteSearchText) {
+          var text = $(currentTarget).val().trim();
+          if (this.options.trimOnSearch && $(currentTarget).val() !== text) {
+            $(currentTarget).val(text);
           }
           if (this.searchText === text) {
             return;
           }
           var $searchInput = Utils.getSearchInput(this);
-          var $currentTarget = currentTarget instanceof jQuery ? currentTarget : $$q(currentTarget);
+          var $currentTarget = currentTarget instanceof jQuery ? currentTarget : $(currentTarget);
           if ($currentTarget.is($searchInput) || $currentTarget.hasClass('search-input')) {
             this.searchText = text;
             this.options.searchText = text;
@@ -6810,11 +9346,11 @@
                 value = item;
                 var props = key.split('.');
                 for (var _i8 = 0; _i8 < props.length; _i8++) {
-                  if (value[props[_i8]] !== null) {
-                    value = value[props[_i8]];
-                  } else {
+                  if (value[props[_i8]] === null || value[props[_i8]] === undefined) {
                     value = null;
                     break;
+                  } else {
+                    value = value[props[_i8]];
                   }
                 }
               } else {
@@ -6827,44 +9363,55 @@
               // Fix #142: respect searchFormatter boolean
               if (column && column.searchFormatter) {
                 value = Utils.calculateObjectValue(column, _this5.header.formatters[j], [value, item, i, column.field], value);
+                if (_this5.header.formatters[j] && typeof value !== 'number') {
+                  // search innerText
+                  value = $('<div>').html(value).text();
+                }
               }
               if (typeof value === 'string' || typeof value === 'number') {
-                if (_this5.options.strictSearch && "".concat(value).toLowerCase() === searchText || _this5.options.regexSearch && Utils.regexCompare(value, rawSearchText)) {
-                  return true;
-                }
-                var largerSmallerEqualsRegex = /(?:(<=|=>|=<|>=|>|<)(?:\s+)?(-?\d+)?|(-?\d+)?(\s+)?(<=|=>|=<|>=|>|<))/gm;
-                var matches = largerSmallerEqualsRegex.exec(_this5.searchText);
-                var comparisonCheck = false;
-                if (matches) {
-                  var operator = matches[1] || "".concat(matches[5], "l");
-                  var comparisonValue = matches[2] || matches[3];
-                  var int = parseInt(value, 10);
-                  var comparisonInt = parseInt(comparisonValue, 10);
-                  switch (operator) {
-                    case '>':
-                    case '<l':
-                      comparisonCheck = int > comparisonInt;
-                      break;
-                    case '<':
-                    case '>l':
-                      comparisonCheck = int < comparisonInt;
-                      break;
-                    case '<=':
-                    case '=<':
-                    case '>=l':
-                    case '=>l':
-                      comparisonCheck = int <= comparisonInt;
-                      break;
-                    case '>=':
-                    case '=>':
-                    case '<=l':
-                    case '=<l':
-                      comparisonCheck = int >= comparisonInt;
-                      break;
+                if (_this5.options.strictSearch) {
+                  if ("".concat(value).toLowerCase() === searchText) {
+                    return true;
+                  }
+                } else if (_this5.options.regexSearch) {
+                  if (Utils.regexCompare(value, rawSearchText)) {
+                    return true;
+                  }
+                } else {
+                  var largerSmallerEqualsRegex = /(?:(<=|=>|=<|>=|>|<)(?:\s+)?(-?\d+)?|(-?\d+)?(\s+)?(<=|=>|=<|>=|>|<))/gm;
+                  var matches = largerSmallerEqualsRegex.exec(_this5.searchText);
+                  var comparisonCheck = false;
+                  if (matches) {
+                    var operator = matches[1] || "".concat(matches[5], "l");
+                    var comparisonValue = matches[2] || matches[3];
+                    var int = parseInt(value, 10);
+                    var comparisonInt = parseInt(comparisonValue, 10);
+                    switch (operator) {
+                      case '>':
+                      case '<l':
+                        comparisonCheck = int > comparisonInt;
+                        break;
+                      case '<':
+                      case '>l':
+                        comparisonCheck = int < comparisonInt;
+                        break;
+                      case '<=':
+                      case '=<':
+                      case '>=l':
+                      case '=>l':
+                        comparisonCheck = int <= comparisonInt;
+                        break;
+                      case '>=':
+                      case '=>':
+                      case '<=l':
+                      case '=<l':
+                        comparisonCheck = int >= comparisonInt;
+                        break;
+                    }
+                  }
+                  if (comparisonCheck || "".concat(value).toLowerCase().includes(searchText)) {
+                    return true;
                   }
-                }
-                if (comparisonCheck || "".concat(value).toLowerCase().includes(searchText)) {
-                  return true;
                 }
               }
             }
@@ -6942,7 +9489,10 @@
           html.push("<div class=\"".concat(this.constants.classes.pull, "-").concat(opts.paginationDetailHAlign, " pagination-detail\">"));
         }
         if (this.paginationParts.includes('pageInfo') || this.paginationParts.includes('pageInfoShort')) {
-          var totalRows = this.options.totalRows + (this.options.sidePagination === 'client' && this.options.paginationLoadMore && !this._paginationLoaded ? ' +' : '');
+          var totalRows = this.options.totalRows;
+          if (this.options.sidePagination === 'client' && this.options.paginationLoadMore && !this._paginationLoaded && this.totalPages > 1) {
+            totalRows += ' +';
+          }
           var paginationInfo = this.paginationParts.includes('pageInfoShort') ? opts.formatDetailPagination(totalRows) : opts.formatShowingRows(this.pageFrom, this.pageTo, totalRows, opts.totalNotFiltered);
           html.push("<span class=\"pagination-info\">\n      ".concat(paginationInfo, "\n      </span>"));
         }
@@ -7082,7 +9632,7 @@
       key: "updatePagination",
       value: function updatePagination(event) {
         // Fix #171: IE disabled button can be clicked bug.
-        if (event && $$q(event.currentTarget).hasClass('disabled')) {
+        if (event && $(event.currentTarget).hasClass('disabled')) {
           return;
         }
         if (!this.options.maintainMetaData) {
@@ -7100,7 +9650,7 @@
       key: "onPageListChange",
       value: function onPageListChange(event) {
         event.preventDefault();
-        var $this = $$q(event.currentTarget);
+        var $this = $(event.currentTarget);
         $this.parent().addClass(this.constants.classes.dropdownActive).siblings().removeClass(this.constants.classes.dropdownActive);
         this.options.pageSize = $this.text().toUpperCase() === this.options.formatAllRows().toUpperCase() ? this.options.formatAllRows() : +$this.text();
         this.$toolbar.find('.page-size').text(this.options.pageSize);
@@ -7110,7 +9660,7 @@
     }, {
       key: "onPagePre",
       value: function onPagePre(event) {
-        if ($$q(event.target).hasClass('disabled')) {
+        if ($(event.target).hasClass('disabled')) {
           return;
         }
         event.preventDefault();
@@ -7125,7 +9675,7 @@
     }, {
       key: "onPageNext",
       value: function onPageNext(event) {
-        if ($$q(event.target).hasClass('disabled')) {
+        if ($(event.target).hasClass('disabled')) {
           return;
         }
         event.preventDefault();
@@ -7141,10 +9691,10 @@
       key: "onPageNumber",
       value: function onPageNumber(event) {
         event.preventDefault();
-        if (this.options.pageNumber === +$$q(event.currentTarget).text()) {
+        if (this.options.pageNumber === +$(event.currentTarget).text()) {
           return;
         }
-        this.options.pageNumber = +$$q(event.currentTarget).text();
+        this.options.pageNumber = +$(event.currentTarget).text();
         this.updatePagination(event);
         return false;
       }
@@ -7154,75 +9704,56 @@
       key: "initRow",
       value: function initRow(item, i, data, trFragments) {
         var _this7 = this;
-        var html = [];
-        var style = {};
-        var csses = [];
-        var data_ = '';
-        var attributes = {};
-        var htmlAttributes = [];
         if (Utils.findIndex(this.hiddenRows, item) > -1) {
           return;
         }
-        style = Utils.calculateObjectValue(this.options, this.options.rowStyle, [item, i], style);
-        if (style && style.css) {
-          for (var _i9 = 0, _Object$entries8 = Object.entries(style.css); _i9 < _Object$entries8.length; _i9++) {
-            var _Object$entries8$_i = _slicedToArray(_Object$entries8[_i9], 2),
-              key = _Object$entries8$_i[0],
-              value = _Object$entries8$_i[1];
-            csses.push("".concat(key, ": ").concat(value));
-          }
-        }
-        attributes = Utils.calculateObjectValue(this.options, this.options.rowAttributes, [item, i], attributes);
-        if (attributes) {
-          for (var _i10 = 0, _Object$entries9 = Object.entries(attributes); _i10 < _Object$entries9.length; _i10++) {
-            var _Object$entries9$_i = _slicedToArray(_Object$entries9[_i10], 2),
-              _key2 = _Object$entries9$_i[0],
-              _value = _Object$entries9$_i[1];
-            htmlAttributes.push("".concat(_key2, "=\"").concat(Utils.escapeHTML(_value), "\""));
-          }
-        }
+        var style = Utils.calculateObjectValue(this.options, this.options.rowStyle, [item, i], {});
+        var attributes = Utils.calculateObjectValue(this.options, this.options.rowAttributes, [item, i], {});
+        var data_ = {};
         if (item._data && !Utils.isEmptyObject(item._data)) {
-          for (var _i11 = 0, _Object$entries10 = Object.entries(item._data); _i11 < _Object$entries10.length; _i11++) {
-            var _Object$entries10$_i = _slicedToArray(_Object$entries10[_i11], 2),
-              k = _Object$entries10$_i[0],
-              v = _Object$entries10$_i[1];
+          for (var _i9 = 0, _Object$entries8 = Object.entries(item._data); _i9 < _Object$entries8.length; _i9++) {
+            var _Object$entries8$_i = _slicedToArray(_Object$entries8[_i9], 2),
+              k = _Object$entries8$_i[0],
+              v = _Object$entries8$_i[1];
             // ignore data-index
             if (k === 'index') {
               return;
             }
-            data_ += " data-".concat(k, "='").concat(_typeof(v) === 'object' ? JSON.stringify(v) : v, "'");
+            data_["data-".concat(k)] = _typeof(v) === 'object' ? JSON.stringify(v) : v;
           }
         }
-        html.push('<tr', Utils.sprintf(' %s', htmlAttributes.length ? htmlAttributes.join(' ') : undefined), Utils.sprintf(' id="%s"', Array.isArray(item) ? undefined : item._id), Utils.sprintf(' class="%s"', style.classes || (Array.isArray(item) ? undefined : item._class)), Utils.sprintf(' style="%s"', Array.isArray(item) ? undefined : item._style), " data-index=\"".concat(i, "\""), Utils.sprintf(' data-uniqueid="%s"', Utils.getItemField(item, this.options.uniqueId, false)), Utils.sprintf(' data-has-detail-view="%s"', this.options.detailView && Utils.calculateObjectValue(null, this.options.detailFilter, [i, item]) ? 'true' : undefined), Utils.sprintf('%s', data_), '>');
-        if (this.options.cardView) {
-          html.push("<td colspan=\"".concat(this.header.fields.length, "\"><div class=\"card-views\">"));
-        }
+        var tr = Utils.h('tr', _objectSpread2(_objectSpread2({
+          id: Array.isArray(item) ? undefined : item._id,
+          class: style && style.classes || (Array.isArray(item) ? undefined : item._class),
+          style: style && style.css || (Array.isArray(item) ? undefined : item._style),
+          'data-index': i,
+          'data-uniqueid': Utils.getItemField(item, this.options.uniqueId, false),
+          'data-has-detail-view': this.options.detailView && Utils.calculateObjectValue(null, this.options.detailFilter, [i, item]) ? 'true' : undefined
+        }, attributes), data_));
+        var trChildren = [];
         var detailViewTemplate = '';
         if (Utils.hasDetailViewIcon(this.options)) {
-          detailViewTemplate = '<td>';
+          detailViewTemplate = Utils.h('td');
           if (Utils.calculateObjectValue(null, this.options.detailFilter, [i, item])) {
-            detailViewTemplate += "\n          <a class=\"detail-icon\" href=\"#\">\n          ".concat(Utils.sprintf(this.constants.html.icon, this.options.iconsPrefix, this.options.icons.detailOpen), "\n          </a>\n        ");
+            detailViewTemplate.append(Utils.h('a', {
+              class: 'detail-icon',
+              href: '#',
+              html: Utils.sprintf(this.constants.html.icon, this.options.iconsPrefix, this.options.icons.detailOpen)
+            }));
           }
-          detailViewTemplate += '</td>';
         }
         if (detailViewTemplate && this.options.detailViewAlign !== 'right') {
-          html.push(detailViewTemplate);
+          trChildren.push(detailViewTemplate);
         }
-        this.header.fields.forEach(function (field, j) {
+        var tds = this.header.fields.map(function (field, j) {
           var column = _this7.columns[j];
-          var text = '';
           var value_ = Utils.getItemField(item, field, _this7.options.escape, column.escape);
           var value = '';
-          var type = '';
-          var cellStyle = {};
-          var id_ = '';
-          var class_ = _this7.header.classes[j];
-          var style_ = '';
-          var styleToAdd_ = '';
-          var data_ = '';
-          var rowspan_ = '';
-          var colspan_ = '';
-          var title_ = '';
+          var attrs = {
+            class: _this7.header.classes[j] ? [_this7.header.classes[j]] : [],
+            style: _this7.header.styles[j] ? [_this7.header.styles[j]] : []
+          };
+          var cardViewClass = "card-view card-view-field-".concat(field);
           if ((_this7.fromHtml || _this7.autoMergeCells) && typeof value_ === 'undefined') {
             if (!column.checkbox && !column.radio) {
               return;
@@ -7235,116 +9766,108 @@
             return;
           }
 
-          // Style concat
-          if (csses.concat([_this7.header.styles[j]]).length) {
-            styleToAdd_ += "".concat(csses.concat([_this7.header.styles[j]]).join('; '));
+          // handle class, style, id, rowspan, colspan and title of td
+          for (var _i10 = 0, _arr = ['class', 'style', 'id', 'rowspan', 'colspan', 'title']; _i10 < _arr.length; _i10++) {
+            var attr = _arr[_i10];
+            var _value = item["_".concat(field, "_").concat(attr)];
+            if (!_value) {
+              continue;
+            }
+            if (attrs[attr]) {
+              attrs[attr].push(_value);
+            } else {
+              attrs[attr] = _value;
+            }
           }
-          if (item["_".concat(field, "_style")]) {
-            styleToAdd_ += "".concat(item["_".concat(field, "_style")]);
-          }
-          if (styleToAdd_) {
-            style_ = " style=\"".concat(styleToAdd_, "\"");
-          }
-          // Style concat
-
-          // handle id and class of td
-          if (item["_".concat(field, "_id")]) {
-            id_ = Utils.sprintf(' id="%s"', item["_".concat(field, "_id")]);
-          }
-          if (item["_".concat(field, "_class")]) {
-            class_ = Utils.sprintf(' class="%s"', item["_".concat(field, "_class")]);
-          }
-          if (item["_".concat(field, "_rowspan")]) {
-            rowspan_ = Utils.sprintf(' rowspan="%s"', item["_".concat(field, "_rowspan")]);
-          }
-          if (item["_".concat(field, "_colspan")]) {
-            colspan_ = Utils.sprintf(' colspan="%s"', item["_".concat(field, "_colspan")]);
-          }
-          if (item["_".concat(field, "_title")]) {
-            title_ = Utils.sprintf(' title="%s"', item["_".concat(field, "_title")]);
-          }
-          cellStyle = Utils.calculateObjectValue(_this7.header, _this7.header.cellStyles[j], [value_, item, i, field], cellStyle);
+          var cellStyle = Utils.calculateObjectValue(_this7.header, _this7.header.cellStyles[j], [value_, item, i, field], {});
           if (cellStyle.classes) {
-            class_ = " class=\"".concat(cellStyle.classes, "\"");
+            attrs.class.push(cellStyle.classes);
           }
           if (cellStyle.css) {
-            var csses_ = [];
-            for (var _i12 = 0, _Object$entries11 = Object.entries(cellStyle.css); _i12 < _Object$entries11.length; _i12++) {
-              var _Object$entries11$_i = _slicedToArray(_Object$entries11[_i12], 2),
-                _key3 = _Object$entries11$_i[0],
-                _value2 = _Object$entries11$_i[1];
-              csses_.push("".concat(_key3, ": ").concat(_value2));
-            }
-            style_ = " style=\"".concat(csses_.concat(_this7.header.styles[j]).join('; '), "\"");
+            attrs.style.push(cellStyle.css);
           }
           value = Utils.calculateObjectValue(column, _this7.header.formatters[j], [value_, item, i, field], value_);
           if (!(column.checkbox || column.radio)) {
             value = typeof value === 'undefined' || value === null ? _this7.options.undefinedText : value;
           }
           if (column.searchable && _this7.searchText && _this7.options.searchHighlight && !(column.checkbox || column.radio)) {
-            var defValue = '';
             var searchText = _this7.searchText.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
-            if (_this7.options.searchAccentNeutralise) {
+            if (_this7.options.searchAccentNeutralise && typeof value === 'string') {
               var indexRegex = new RegExp("".concat(Utils.normalizeAccent(searchText)), 'gmi');
               var match = indexRegex.exec(Utils.normalizeAccent(value));
               if (match) {
                 searchText = value.substring(match.index, match.index + searchText.length);
               }
             }
-            var regExp = new RegExp("(".concat(searchText, ")"), 'gim');
-            var marker = '<mark>$1</mark>';
-            var isHTML = value && /<(?=.*? .*?\/ ?>|br|hr|input|!--|wbr)[a-z]+.*?>|<([a-z]+).*?<\/\1>/i.test(value);
-            if (isHTML) {
-              // value can contains a HTML tags
-              var textContent = new DOMParser().parseFromString(value.toString(), 'text/html').documentElement.textContent;
-              var textReplaced = textContent.replace(regExp, marker);
-              textContent = textContent.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
-              defValue = value.replace(new RegExp("(>\\s*)(".concat(textContent, ")(\\s*)"), 'gm'), "$1".concat(textReplaced, "$3"));
-            } else {
-              // but usually not
-              defValue = value.toString().replace(regExp, marker);
-            }
+            var defValue = Utils.replaceSearchMark(value, searchText);
             value = Utils.calculateObjectValue(column, column.searchHighlightFormatter, [value, _this7.searchText], defValue);
           }
           if (item["_".concat(field, "_data")] && !Utils.isEmptyObject(item["_".concat(field, "_data")])) {
-            for (var _i13 = 0, _Object$entries12 = Object.entries(item["_".concat(field, "_data")]); _i13 < _Object$entries12.length; _i13++) {
-              var _Object$entries12$_i = _slicedToArray(_Object$entries12[_i13], 2),
-                _k = _Object$entries12$_i[0],
-                _v = _Object$entries12$_i[1];
+            for (var _i11 = 0, _Object$entries9 = Object.entries(item["_".concat(field, "_data")]); _i11 < _Object$entries9.length; _i11++) {
+              var _Object$entries9$_i = _slicedToArray(_Object$entries9[_i11], 2),
+                _k = _Object$entries9$_i[0],
+                _v = _Object$entries9$_i[1];
               // ignore data-index
               if (_k === 'index') {
                 return;
               }
-              data_ += " data-".concat(_k, "=\"").concat(_v, "\"");
+              attrs["data-".concat(_k)] = _v;
             }
           }
           if (column.checkbox || column.radio) {
-            type = column.checkbox ? 'checkbox' : type;
-            type = column.radio ? 'radio' : type;
-            var c = column['class'] || '';
+            var type = column.checkbox ? 'checkbox' : 'radio';
             var isChecked = Utils.isObject(value) && value.hasOwnProperty('checked') ? value.checked : (value === true || value_) && value !== false;
             var isDisabled = !column.checkboxEnabled || value && value.disabled;
-            text = [_this7.options.cardView ? "<div class=\"card-view ".concat(c, "\">") : "<td class=\"bs-checkbox ".concat(c, "\"").concat(class_).concat(style_, ">"), "<label>\n            <input\n            data-index=\"".concat(i, "\"\n            name=\"").concat(_this7.options.selectItemName, "\"\n            type=\"").concat(type, "\"\n            ").concat(Utils.sprintf('value="%s"', item[_this7.options.idField]), "\n            ").concat(Utils.sprintf('checked="%s"', isChecked ? 'checked' : undefined), "\n            ").concat(Utils.sprintf('disabled="%s"', isDisabled ? 'disabled' : undefined), " />\n            <span></span>\n            </label>"), _this7.header.formatters[j] && typeof value === 'string' ? value : '', _this7.options.cardView ? '</div>' : '</td>'].join('');
+            var valueNodes = _this7.header.formatters[j] && (typeof value === 'string' || value instanceof Node || value instanceof $) ? Utils.htmlToNodes(value) : [];
             item[_this7.header.stateField] = value === true || !!value_ || value && value.checked;
-          } else if (_this7.options.cardView) {
-            var cardTitle = _this7.options.showHeader ? "<span class=\"card-view-title ".concat(cellStyle.classes || '', "\"").concat(style_, ">").concat(Utils.getFieldTitle(_this7.columns, field), "</span>") : '';
-            text = "<div class=\"card-view\">".concat(cardTitle, "<span class=\"card-view-value ").concat(cellStyle.classes || '', "\"").concat(style_, ">").concat(value, "</span></div>");
-            if (_this7.options.smartDisplay && value === '') {
-              text = '<div class="card-view"></div>';
-            }
-          } else {
-            text = "<td".concat(id_).concat(class_).concat(style_).concat(data_).concat(rowspan_).concat(colspan_).concat(title_, ">").concat(value, "</td>");
+            return Utils.h(_this7.options.cardView ? 'div' : 'td', {
+              class: [_this7.options.cardView ? cardViewClass : 'bs-checkbox', column.class],
+              style: _this7.options.cardView ? undefined : attrs.style
+            }, [Utils.h('label', {}, [Utils.h('input', {
+              'data-index': i,
+              name: _this7.options.selectItemName,
+              type: type,
+              value: item[_this7.options.idField],
+              checked: isChecked ? 'checked' : undefined,
+              disabled: isDisabled ? 'disabled' : undefined
+            }), Utils.h('span')])].concat(_toConsumableArray(valueNodes)));
           }
-          html.push(text);
+          if (_this7.options.cardView) {
+            if (_this7.options.smartDisplay && value === '') {
+              return Utils.h('div', {
+                class: cardViewClass
+              });
+            }
+            var cardTitle = _this7.options.showHeader ? Utils.h('span', {
+              class: ['card-view-title', cellStyle.classes],
+              style: attrs.style,
+              html: Utils.getFieldTitle(_this7.columns, field)
+            }) : '';
+            return Utils.h('div', {
+              class: cardViewClass
+            }, [cardTitle, Utils.h('span', {
+              class: ['card-view-value', cellStyle.classes],
+              style: attrs.style
+            }, _toConsumableArray(Utils.htmlToNodes(value)))]);
+          }
+          return Utils.h('td', attrs, _toConsumableArray(Utils.htmlToNodes(value)));
+        }).filter(function (x) {
+          return x;
         });
+        trChildren.push.apply(trChildren, _toConsumableArray(tds));
         if (detailViewTemplate && this.options.detailViewAlign === 'right') {
-          html.push(detailViewTemplate);
+          trChildren.push(detailViewTemplate);
         }
         if (this.options.cardView) {
-          html.push('</div></td>');
+          tr.append(Utils.h('td', {
+            colspan: this.header.fields.length
+          }, [Utils.h('div', {
+            class: 'card-views'
+          }, trChildren)]));
+        } else {
+          tr.append.apply(tr, trChildren);
         }
-        html.push('</tr>');
-        return html.join('');
+        return tr;
       }
     }, {
       key: "initBody",
@@ -7354,7 +9877,7 @@
         this.trigger('pre-body', data);
         this.$body = this.$el.find('>tbody');
         if (!this.$body.length) {
-          this.$body = $$q('<tbody></tbody>').appendTo(this.$el);
+          this.$body = $('<tbody></tbody>').appendTo(this.$el);
         }
 
         // Fix #389 Bootstrap-table-flatJSON is not working
@@ -7363,7 +9886,7 @@
           this.pageTo = data.length;
         }
         var rows = [];
-        var trFragments = $$q(document.createDocumentFragment());
+        var trFragments = $(document.createDocumentFragment());
         var hasTr = false;
         var toExpand = [];
         this.autoMergeCells = Utils.checkAutoMergeCells(data.slice(this.pageFrom - 1, this.pageTo));
@@ -7371,8 +9894,9 @@
           var item = data[i];
           var tr = this.initRow(item, i, data, trFragments);
           hasTr = hasTr || !!tr;
-          if (tr && typeof tr === 'string') {
+          if (tr && tr instanceof Node) {
             var uniqueId = this.options.uniqueId;
+            var toAppend = [tr];
             if (uniqueId && item.hasOwnProperty(uniqueId)) {
               var itemUniqueId = item[uniqueId];
               var oldTr = this.$body.find(Utils.sprintf('> tr[data-uniqueid="%s"][data-has-detail-view]', itemUniqueId));
@@ -7380,21 +9904,23 @@
               if (oldTrNext.is('tr.detail-view')) {
                 toExpand.push(i);
                 if (!updatedUid || itemUniqueId !== updatedUid) {
-                  tr += oldTrNext[0].outerHTML;
+                  toAppend.push(oldTrNext[0]);
                 }
               }
             }
             if (!this.options.virtualScroll) {
-              trFragments.append(tr);
+              trFragments.append(toAppend);
             } else {
-              rows.push(tr);
+              rows.push($('<div>').html(toAppend).html());
             }
           }
         }
+        this.$el.removeAttr('role');
 
         // show no records
         if (!hasTr) {
           this.$body.html("<tr class=\"no-records-found\">".concat(Utils.sprintf('<td colspan="%s">%s</td>', this.getVisibleFields().length + Utils.getDetailViewIndexOffset(this.options), this.options.formatNoMatches()), "</tr>"));
+          this.$el.attr('role', 'presentation');
         } else if (!this.options.virtualScroll) {
           this.$body.html(trFragments);
         } else {
@@ -7435,13 +9961,13 @@
         var _this9 = this;
         // click to select by column
         this.$body.find('> tr[data-index] > td').off('click dblclick').on('click dblclick', function (e) {
-          var $td = $$q(e.currentTarget);
+          var $td = $(e.currentTarget);
           if ($td.find('.detail-icon').length || $td.index() - Utils.getDetailViewIndexOffset(_this9.options) < 0) {
             return;
           }
           var $tr = $td.parent();
-          var $cardViewArr = $$q(e.target).parents('.card-views').children();
-          var $cardViewTarget = $$q(e.target).parents('.card-view');
+          var $cardViewArr = $(e.target).parents('.card-views').children();
+          var $cardViewTarget = $(e.target).parents('.card-view');
           var rowIndex = $tr.data('index');
           var item = _this9.data[rowIndex];
           var index = _this9.options.cardView ? $cardViewArr.index($cardViewTarget) : $td[0].cellIndex;
@@ -7469,13 +9995,13 @@
         });
         this.$body.find('> tr[data-index] > td > .detail-icon').off('click').on('click', function (e) {
           e.preventDefault();
-          _this9.toggleDetailView($$q(e.currentTarget).parent().parent().data('index'));
+          _this9.toggleDetailView($(e.currentTarget).parent().parent().data('index'));
           return false;
         });
         this.$selectItem = this.$body.find(Utils.sprintf('[name="%s"]', this.options.selectItemName));
         this.$selectItem.off('click').on('click', function (e) {
           e.stopImmediatePropagation();
-          var $this = $$q(e.currentTarget);
+          var $this = $(e.currentTarget);
           _this9._toggleCheck($this.prop('checked'), $this.data('index'));
         });
         this.header.events.forEach(function (_events, i) {
@@ -7502,7 +10028,7 @@
             }
             var event = events[key];
             _this9.$body.find('>tr:not(.no-records-found)').each(function (i, tr) {
-              var $tr = $$q(tr);
+              var $tr = $(tr);
               var $td = $tr.find(_this9.options.cardView ? '.card-views>.card-view' : '>td').eq(fieldIndex);
               var index = key.indexOf(' ');
               var name = key.substring(0, index);
@@ -7522,7 +10048,7 @@
       }
     }, {
       key: "initServer",
-      value: function initServer(silent, query, url) {
+      value: function initServer(silent, query) {
         var _this10 = this;
         var data = {};
         var index = this.header.fields.indexOf(this.options.sortName);
@@ -7538,7 +10064,7 @@
           params.pageSize = this.options.pageSize === this.options.formatAllRows() ? this.options.totalRows : this.options.pageSize;
           params.pageNumber = this.options.pageNumber;
         }
-        if (!(url || this.options.url) && !this.options.ajax) {
+        if (!this.options.url && !this.options.ajax) {
           return;
         }
         if (this.options.queryParamsType === 'limit') {
@@ -7589,7 +10115,7 @@
         }
         var request = Utils.extend({}, Utils.calculateObjectValue(null, this.options.ajaxOptions), {
           type: this.options.method,
-          url: url || this.options.url,
+          url: this.options.url,
           data: this.options.contentType === 'application/json' && this.options.method === 'post' ? JSON.stringify(data) : data,
           cache: this.options.cache,
           contentType: this.options.contentType,
@@ -7634,7 +10160,7 @@
             this._xhrAbort = true;
             this._xhr.abort();
           }
-          this._xhr = $$q.ajax(request);
+          this._xhr = $.ajax(request);
         }
         return data;
       }
@@ -7658,7 +10184,7 @@
       value: function getCaret() {
         var _this11 = this;
         this.$header.find('th').each(function (i, th) {
-          $$q(th).find('.sortable').removeClass('desc asc').addClass($$q(th).data('field') === _this11.options.sortName ? _this11.options.sortOrder : 'both');
+          $(th).find('.sortable').removeClass('desc asc').addClass($(th).data('field') === _this11.options.sortName ? _this11.options.sortOrder : 'both');
         });
       }
     }, {
@@ -7667,7 +10193,7 @@
         var checkAll = this.$selectItem.filter(':enabled').length && this.$selectItem.filter(':enabled').length === this.$selectItem.filter(':enabled').filter(':checked').length;
         this.$selectAll.add(this.$selectAll_).prop('checked', checkAll);
         this.$selectItem.each(function (i, el) {
-          $$q(el).closest('tr')[$$q(el).prop('checked') ? 'addClass' : 'removeClass']('selected');
+          $(el).closest('tr')[$(el).prop('checked') ? 'addClass' : 'removeClass']('selected');
         });
       }
     }, {
@@ -7675,7 +10201,7 @@
       value: function updateRows() {
         var _this12 = this;
         this.$selectItem.each(function (i, el) {
-          _this12.data[$$q(el).data('index')][_this12.header.stateField] = $$q(el).prop('checked');
+          _this12.data[$(el).data('index')][_this12.header.stateField] = $(el).prop('checked');
         });
       }
     }, {
@@ -7704,15 +10230,15 @@
       value: function trigger(_name) {
         var _this$options, _this$options2;
         var name = "".concat(_name, ".bs.table");
-        for (var _len = arguments.length, args = new Array(_len > 1 ? _len - 1 : 0), _key4 = 1; _key4 < _len; _key4++) {
-          args[_key4 - 1] = arguments[_key4];
+        for (var _len = arguments.length, args = new Array(_len > 1 ? _len - 1 : 0), _key2 = 1; _key2 < _len; _key2++) {
+          args[_key2 - 1] = arguments[_key2];
         }
         (_this$options = this.options)[BootstrapTable.EVENTS[name]].apply(_this$options, [].concat(args, [this]));
-        this.$el.trigger($$q.Event(name, {
+        this.$el.trigger($.Event(name, {
           sender: this
         }), args);
         (_this$options2 = this.options).onAll.apply(_this$options2, [name].concat([].concat(args, [this])));
-        this.$el.trigger($$q.Event('all.bs.table', {
+        this.$el.trigger($.Event('all.bs.table', {
           sender: this
         }), [name, args]);
       }
@@ -7757,7 +10283,7 @@
         this.$selectAll_ = this.$header_.find('[name="btSelectAll"]');
         this.$tableHeader.css('margin-right', scrollWidth).find('table').css('width', this.$el.outerWidth()).html('').attr('class', this.$el.attr('class')).append(this.$header_);
         this.$tableLoading.css('width', this.$el.outerWidth());
-        var focusedTemp = $$q('.focus-temp:visible:eq(0)');
+        var focusedTemp = $('.focus-temp:visible:eq(0)');
         if (focusedTemp.length > 0) {
           focusedTemp.focus();
           this.$header.find('.focus-temp').removeClass('focus-temp');
@@ -7765,7 +10291,7 @@
 
         // fix bug: $.data() is not working as expected after $.append()
         this.$header.find('th[data-field]').each(function (i, el) {
-          _this14.$header_.find(Utils.sprintf('th[data-field="%s"]', $$q(el).data('field'))).data($$q(el).data());
+          _this14.$header_.find(Utils.sprintf('th[data-field="%s"]', $(el).data('field'))).data($(el).data());
         });
         var visibleFields = this.getVisibleFields();
         var $ths = this.$header_.find('th');
@@ -7775,7 +10301,7 @@
         }
         var trLength = $tr.find('> *').length;
         $tr.find('> *').each(function (i, el) {
-          var $this = $$q(el);
+          var $this = $(el);
           if (Utils.hasDetailViewIcon(_this14.options)) {
             if (i === 0 && _this14.options.detailViewAlign !== 'right' || i === trLength - 1 && _this14.options.detailViewAlign === 'right') {
               var $thDetail = $ths.filter('.detail');
@@ -7787,7 +10313,7 @@
           var index = i - Utils.getDetailViewIndexOffset(_this14.options);
           var $th = _this14.$header_.find(Utils.sprintf('th[data-field="%s"]', visibleFields[index]));
           if ($th.length > 1) {
-            $th = $$q($ths[$this[0].cellIndex]);
+            $th = $($ths[$this[0].cellIndex]);
           }
           var zoomWidth = $th.innerWidth() - $th.find('.fht-cell').width();
           $th.find('.fht-cell').width($this.innerWidth() - zoomWidth);
@@ -7806,7 +10332,13 @@
         var html = [];
         var detailTemplate = '';
         if (Utils.hasDetailViewIcon(this.options)) {
-          detailTemplate = '<th class="detail"><div class="th-inner"></div><div class="fht-cell"></div></th>';
+          detailTemplate = Utils.h('th', {
+            class: 'detail'
+          }, [Utils.h('div', {
+            class: 'th-inner'
+          }), Utils.h('div', {
+            class: 'fht-cell'
+          })]);
         }
         if (detailTemplate && this.options.detailViewAlign !== 'right') {
           html.push(detailTemplate);
@@ -7816,50 +10348,30 @@
         try {
           for (_iterator4.s(); !(_step4 = _iterator4.n()).done;) {
             var column = _step4.value;
-            var falign = '';
-            var valign = '';
-            var csses = [];
-            var style = {};
-            var class_ = Utils.sprintf(' class="%s"', column['class']);
-            if (!column.visible || this.footerData && this.footerData.length > 0 && !(column.field in this.footerData[0])) {
+            var hasData = this.footerData && this.footerData.length > 0;
+            if (!column.visible || hasData && !(column.field in this.footerData[0])) {
               continue;
             }
             if (this.options.cardView && !column.cardVisible) {
               return;
             }
-            falign = Utils.sprintf('text-align: %s; ', column.falign ? column.falign : column.align);
-            valign = Utils.sprintf('vertical-align: %s; ', column.valign);
-            style = Utils.calculateObjectValue(null, column.footerStyle || this.options.footerStyle, [column]);
-            if (style && style.css) {
-              for (var _i14 = 0, _Object$entries13 = Object.entries(style.css); _i14 < _Object$entries13.length; _i14++) {
-                var _Object$entries13$_i = _slicedToArray(_Object$entries13[_i14], 2),
-                  key = _Object$entries13$_i[0],
-                  _value3 = _Object$entries13$_i[1];
-                csses.push("".concat(key, ": ").concat(_value3));
-              }
-            }
-            if (style && style.classes) {
-              class_ = Utils.sprintf(' class="%s"', column['class'] ? [column['class'], style.classes].join(' ') : style.classes);
-            }
-            html.push('<th', class_, Utils.sprintf(' style="%s"', falign + valign + csses.concat().join('; ') || undefined));
-            var colspan = 0;
-            if (this.footerData && this.footerData.length > 0) {
-              colspan = this.footerData[0]["_".concat(column.field, "_colspan")] || 0;
-            }
-            if (colspan) {
-              html.push(" colspan=\"".concat(colspan, "\" "));
-            }
-            html.push('>');
-            html.push('<div class="th-inner">');
-            var value = '';
-            if (this.footerData && this.footerData.length > 0) {
-              value = this.footerData[0][column.field] || '';
-            }
-            html.push(Utils.calculateObjectValue(column, column.footerFormatter, [data, value], value));
-            html.push('</div>');
-            html.push('<div class="fht-cell"></div>');
-            html.push('</div>');
-            html.push('</th>');
+            var style = Utils.calculateObjectValue(null, column.footerStyle || this.options.footerStyle, [column]);
+            var csses = style && style.css || {};
+            var colspan = hasData && this.footerData[0]["_".concat(column.field, "_colspan")] || 0;
+            var value = hasData && this.footerData[0][column.field] || '';
+            value = Utils.calculateObjectValue(column, column.footerFormatter, [data, value], value);
+            html.push(Utils.h('th', {
+              class: [column['class'], style && style.classes],
+              style: _objectSpread2({
+                'text-align': column.falign ? column.falign : column.align,
+                'vertical-align': column.valign
+              }, csses),
+              colspan: colspan || undefined
+            }, [Utils.h('div', {
+              class: 'th-inner'
+            }, _toConsumableArray(Utils.htmlToNodes(value))), Utils.h('div', {
+              class: 'fht-cell'
+            })]));
           }
         } catch (err) {
           _iterator4.e(err);
@@ -7876,7 +10388,7 @@
         if (!this.$tableFooter.find('tr').length) {
           this.$tableFooter.html('<table><thead><tr></tr></thead></table>');
         }
-        this.$tableFooter.find('tr').html(html.join(''));
+        this.$tableFooter.find('tr').html(html);
         this.trigger('post-footer', this.$tableFooter);
       }
     }, {
@@ -7900,7 +10412,7 @@
         }
         var trLength = $tr.find('> *').length;
         $tr.find('> *').each(function (i, el) {
-          var $this = $$q(el);
+          var $this = $(el);
           if (Utils.hasDetailViewIcon(_this15.options)) {
             if (i === 0 && _this15.options.detailViewAlign === 'left' || i === trLength - 1 && _this15.options.detailViewAlign === 'right') {
               var $thDetail = $ths.filter('.detail');
@@ -7977,6 +10489,7 @@
         if (Utils.compareObjects(this.options, options, true)) {
           return;
         }
+        this.optionsColumnsChanged = !!options.columns;
         this.options = Utils.extend(this.options, options);
         this.trigger('refresh-options', this.options);
         this.destroy();
@@ -8002,21 +10515,29 @@
           data = data.slice(this.pageFrom - 1, this.pageTo);
         }
         if (params && params.formatted) {
-          data.forEach(function (row) {
-            for (var _i15 = 0, _Object$entries14 = Object.entries(row); _i15 < _Object$entries14.length; _i15++) {
-              var _Object$entries14$_i = _slicedToArray(_Object$entries14[_i15], 2),
-                key = _Object$entries14$_i[0],
-                value = _Object$entries14$_i[1];
+          return data.map(function (row) {
+            var formattedColumns = {};
+            for (var _i12 = 0, _Object$entries10 = Object.entries(row); _i12 < _Object$entries10.length; _i12++) {
+              var _Object$entries10$_i = _slicedToArray(_Object$entries10[_i12], 2),
+                key = _Object$entries10$_i[0],
+                value = _Object$entries10$_i[1];
               var column = _this17.columns[_this17.fieldsColumnsIndex[key]];
               if (!column) {
-                return;
+                continue;
               }
-              row[key] = Utils.calculateObjectValue(column, _this17.header.formatters[column.fieldIndex], [value, row, row.index, column.field], value);
+              formattedColumns[key] = Utils.calculateObjectValue(column, _this17.header.formatters[column.fieldIndex], [value, row, row.index, column.field], value);
             }
+            return formattedColumns;
           });
         }
         return data;
       }
+    }, {
+      key: "getFooterData",
+      value: function getFooterData() {
+        var _this$footerData;
+        return (_this$footerData = this.footerData) !== null && _this$footerData !== void 0 ? _this$footerData : [];
+      }
     }, {
       key: "getSelections",
       value: function getSelections() {
@@ -8093,6 +10614,7 @@
       key: "removeAll",
       value: function removeAll() {
         if (this.options.data.length > 0) {
+          this.data.splice(0, this.data.length);
           this.options.data.splice(0, this.options.data.length);
           this.initSearch();
           this.initPagination();
@@ -8105,7 +10627,14 @@
         if (!params.hasOwnProperty('index') || !params.hasOwnProperty('row')) {
           return;
         }
-        this.options.data.splice(params.index, 0, params.row);
+        var row = this.data[params.index];
+        var originalIndex = this.options.data.indexOf(row);
+        if (originalIndex === -1) {
+          this.append([params.row]);
+          return;
+        }
+        this.data.splice(params.index, 0, params.row);
+        this.options.data.splice(originalIndex, 0, params.row);
         this.initSearch();
         this.initPagination();
         this.initSort();
@@ -8123,10 +10652,14 @@
             if (!_params.hasOwnProperty('index') || !_params.hasOwnProperty('row')) {
               continue;
             }
+            var row = this.data[_params.index];
+            var originalIndex = this.options.data.indexOf(row);
             if (_params.hasOwnProperty('replace') && _params.replace) {
-              this.options.data[_params.index] = _params.row;
+              this.data[_params.index] = _params.row;
+              this.options.data[originalIndex] = _params.row;
             } else {
-              Utils.extend(this.options.data[_params.index], _params.row);
+              Utils.extend(this.data[_params.index], _params.row);
+              Utils.extend(this.options.data[originalIndex], _params.row);
             }
           }
         } catch (err) {
@@ -8226,13 +10759,13 @@
     }, {
       key: "_updateCellOnly",
       value: function _updateCellOnly(field, index) {
-        var rowHtml = this.initRow(this.options.data[index], index);
+        var rowHtml = this.initRow(this.data[index], index);
         var fieldIndex = this.getVisibleFields().indexOf(field);
         if (fieldIndex === -1) {
           return;
         }
         fieldIndex += Utils.getDetailViewIndexOffset(this.options);
-        this.$body.find(">tr[data-index=".concat(index, "]")).find(">td:eq(".concat(fieldIndex, ")")).replaceWith($$q(rowHtml).find(">td:eq(".concat(fieldIndex, ")")));
+        this.$body.find(">tr[data-index=".concat(index, "]")).find(">td:eq(".concat(fieldIndex, ")")).replaceWith($(rowHtml).find(">td:eq(".concat(fieldIndex, ")")));
         this.initBodyEvent();
         this.initFooter();
         this.resetView();
@@ -8244,7 +10777,10 @@
         if (!params.hasOwnProperty('index') || !params.hasOwnProperty('field') || !params.hasOwnProperty('value')) {
           return;
         }
-        this.options.data[params.index][params.field] = params.value;
+        var row = this.data[params.index];
+        var originalIndex = this.options.data.indexOf(row);
+        this.data[params.index][params.field] = params.value;
+        this.options.data[originalIndex][params.field] = params.value;
         if (params.reinit === false) {
           this._updateCellOnly(params.field, params.index);
           return;
@@ -8354,7 +10890,7 @@
     }, {
       key: "_toggleColumn",
       value: function _toggleColumn(index, checked, needUpdate) {
-        if (index === -1 || this.columns[index].visible === checked) {
+        if (index === undefined || this.columns[index].visible === checked) {
           return;
         }
         this.columns[index].visible = checked;
@@ -8437,7 +10973,7 @@
           } else {
             $items.get().reverse().forEach(function (item) {
               if ($items.filter(':checked').length > _this23.options.minimumCountColumns) {
-                $$q(item).prop('checked', visible);
+                $(item).prop('checked', visible);
               }
             });
           }
@@ -8451,8 +10987,8 @@
       value: function mergeCells(options) {
         var row = options.index;
         var col = this.getVisibleFields().indexOf(options.field);
-        var rowspan = options.rowspan || 1;
-        var colspan = options.colspan || 1;
+        var rowspan = +options.rowspan || 1;
+        var colspan = +options.colspan || 1;
         var i;
         var j;
         var $tr = this.$body.find('>tr[data-index]');
@@ -8499,7 +11035,7 @@
         var $items = this.$selectItem.filter(':enabled');
         var checked = $items.filter(':checked');
         $items.each(function (i, el) {
-          $$q(el).prop('checked', !$$q(el).prop('checked'));
+          $(el).prop('checked', !$(el).prop('checked'));
         });
         this.updateRows();
         this.updateSelected();
@@ -8607,19 +11143,23 @@
         if (params && params.pageSize) {
           this.options.pageSize = params.pageSize;
         }
-        this.trigger('refresh', this.initServer(params && params.silent, params && params.query, params && params.url));
+        if (params && params.query) {
+          this.options.url = Utils.addQueryToUrl(this.options.url, params.query);
+        }
+        this.trigger('refresh', this.initServer(params && params.silent));
       }
     }, {
       key: "destroy",
       value: function destroy() {
+        clearTimeout(this.timeoutId_);
         this.$el.insertBefore(this.$container);
-        $$q(this.options.toolbar).insertBefore(this.$el);
+        $(this.options.toolbar).insertBefore(this.$el);
         this.$container.next().remove();
         this.$container.remove();
         this.$el.html(this.$el_.html()).css('margin-top', '0').attr('class', this.$el_.attr('class') || ''); // reset the class
 
         var resizeEvent = Utils.getEventName('resize.bootstrap-table', this.$el.attr('id'));
-        $$q(window).off(resizeEvent);
+        $(window).off(resizeEvent);
       }
     }, {
       key: "resetView",
@@ -8723,8 +11263,8 @@
         this.options.cardView = !this.options.cardView;
         this.initHeader();
         var icon = this.options.showButtonIcons ? this.options.cardView ? this.options.icons.toggleOn : this.options.icons.toggleOff : '';
-        var text = this.options.showButtonText ? this.options.cardView ? this.options.formatToggleOff() : this.options.formatToggleOn() : '';
-        this.$toolbar.find('button[name="toggle"]').html("".concat(Utils.sprintf(this.constants.html.icon, this.options.iconsPrefix, icon), " ").concat(text)).attr('aria-label', text).attr('title', text);
+        var text = this.options.cardView ? this.options.formatToggleOff() : this.options.formatToggleOn();
+        this.$toolbar.find('button[name="toggle"]').html("".concat(Utils.sprintf(this.constants.html.icon, this.options.iconsPrefix, icon), " ").concat(this.options.showButtonText ? text : '')).attr('aria-label', text).attr(this.options.buttonsAttributeTitle, text);
         this.initBody();
         this.trigger('toggle', this.options.cardView);
       }
@@ -8742,7 +11282,7 @@
     }, {
       key: "filterBy",
       value: function filterBy(columns, options) {
-        this.filterOptions = Utils.isEmptyObject(options) ? this.options.filterOptions : Utils.extend(this.options.filterOptions, options);
+        this.filterOptions = Utils.isEmptyObject(options) ? this.options.filterOptions : Utils.extend({}, this.options.filterOptions, options);
         this.filterColumns = Utils.isEmptyObject(columns) ? {} : columns;
         this.options.pageNumber = 1;
         this.initSearch();
@@ -8766,7 +11306,7 @@
         if (options.unit === 'rows') {
           scrollTo = 0;
           this.$body.find("> tr:lt(".concat(options.value, ")")).each(function (i, el) {
-            scrollTo += $$q(el).outerHeight(true);
+            scrollTo += $(el).outerHeight(true);
           });
         }
         this.$tableBody.scrollTop(scrollTo);
@@ -8868,7 +11408,7 @@
       value: function expandAllRows() {
         var trs = this.$body.find('> tr[data-index][data-has-detail-view]');
         for (var i = 0; i < trs.length; i++) {
-          this.expandRow($$q(trs[i]).data('index'));
+          this.expandRow($(trs[i]).data('index'));
         }
       }
     }, {
@@ -8876,7 +11416,7 @@
       value: function collapseAllRows() {
         var trs = this.$body.find('> tr[data-index][data-has-detail-view]');
         for (var i = 0; i < trs.length; i++) {
-          this.collapseRow($$q(trs[i]).data('index'));
+          this.collapseRow($(trs[i]).data('index'));
         }
       }
     }, {
@@ -8888,8 +11428,8 @@
         this.columns[this.fieldsColumnsIndex[params.field]].title = this.options.escape && this.options.escapeTitle ? Utils.escapeHTML(params.title) : params.title;
         if (this.columns[this.fieldsColumnsIndex[params.field]].visible) {
           this.$header.find('th[data-field]').each(function (i, el) {
-            if ($$q(el).data('field') === params.field) {
-              $$q($$q(el).find('.th-inner')[0]).html(params.title);
+            if ($(el).data('field') === params.field) {
+              $($(el).find('.th-inner')[0]).html(params.title);
               return false;
             }
           });
@@ -8925,14 +11465,14 @@
   // BOOTSTRAP TABLE PLUGIN DEFINITION
   // =======================
 
-  $$q.BootstrapTable = BootstrapTable;
-  $$q.fn.bootstrapTable = function (option) {
-    for (var _len2 = arguments.length, args = new Array(_len2 > 1 ? _len2 - 1 : 0), _key5 = 1; _key5 < _len2; _key5++) {
-      args[_key5 - 1] = arguments[_key5];
+  $.BootstrapTable = BootstrapTable;
+  $.fn.bootstrapTable = function (option) {
+    for (var _len2 = arguments.length, args = new Array(_len2 > 1 ? _len2 - 1 : 0), _key3 = 1; _key3 < _len2; _key3++) {
+      args[_key3 - 1] = arguments[_key3];
     }
     var value;
     this.each(function (i, el) {
-      var data = $$q(el).data('bootstrap.table');
+      var data = $(el).data('bootstrap.table');
       if (typeof option === 'string') {
         var _data2;
         if (!Constants.METHODS.includes(option)) {
@@ -8943,7 +11483,7 @@
         }
         value = (_data2 = data)[option].apply(_data2, args);
         if (option === 'destroy') {
-          $$q(el).removeData('bootstrap.table');
+          $(el).removeData('bootstrap.table');
         }
         return;
       }
@@ -8951,28 +11491,29 @@
         console.warn('You cannot initialize the table more than once!');
         return;
       }
-      var options = Utils.extend(true, {}, BootstrapTable.DEFAULTS, $$q(el).data(), _typeof(option) === 'object' && option);
-      data = new $$q.BootstrapTable(el, options);
-      $$q(el).data('bootstrap.table', data);
+      var options = Utils.extend(true, {}, BootstrapTable.DEFAULTS, $(el).data(), _typeof(option) === 'object' && option);
+      data = new $.BootstrapTable(el, options);
+      $(el).data('bootstrap.table', data);
       data.init();
     });
     return typeof value === 'undefined' ? this : value;
   };
-  $$q.fn.bootstrapTable.Constructor = BootstrapTable;
-  $$q.fn.bootstrapTable.theme = Constants.THEME;
-  $$q.fn.bootstrapTable.VERSION = Constants.VERSION;
-  $$q.fn.bootstrapTable.defaults = BootstrapTable.DEFAULTS;
-  $$q.fn.bootstrapTable.columnDefaults = BootstrapTable.COLUMN_DEFAULTS;
-  $$q.fn.bootstrapTable.events = BootstrapTable.EVENTS;
-  $$q.fn.bootstrapTable.locales = BootstrapTable.LOCALES;
-  $$q.fn.bootstrapTable.methods = BootstrapTable.METHODS;
-  $$q.fn.bootstrapTable.utils = Utils;
+  $.fn.bootstrapTable.Constructor = BootstrapTable;
+  $.fn.bootstrapTable.theme = Constants.THEME;
+  $.fn.bootstrapTable.VERSION = Constants.VERSION;
+  $.fn.bootstrapTable.icons = Constants.ICONS;
+  $.fn.bootstrapTable.defaults = BootstrapTable.DEFAULTS;
+  $.fn.bootstrapTable.columnDefaults = BootstrapTable.COLUMN_DEFAULTS;
+  $.fn.bootstrapTable.events = BootstrapTable.EVENTS;
+  $.fn.bootstrapTable.locales = BootstrapTable.LOCALES;
+  $.fn.bootstrapTable.methods = BootstrapTable.METHODS;
+  $.fn.bootstrapTable.utils = Utils;
 
   // BOOTSTRAP TABLE INIT
   // =======================
 
-  $$q(function () {
-    $$q('[data-toggle="table"]').bootstrapTable();
+  $(function () {
+    $('[data-toggle="table"]').bootstrapTable();
   });
 
   return BootstrapTable;
@@ -8983,11 +11524,55 @@
   typeof exports === 'object' && typeof module !== 'undefined' ? factory(require('jquery')) :
   typeof define === 'function' && define.amd ? define(['jquery'], factory) :
   (global = typeof globalThis !== 'undefined' ? globalThis : global || self, factory(global.jQuery));
-})(this, (function ($$4) { 'use strict';
+})(this, (function ($) { 'use strict';
 
+  function _assertThisInitialized(e) {
+    if (void 0 === e) throw new ReferenceError("this hasn't been initialised - super() hasn't been called");
+    return e;
+  }
   function _callSuper(t, o, e) {
     return o = _getPrototypeOf(o), _possibleConstructorReturn(t, _isNativeReflectConstruct() ? Reflect.construct(o, e || [], _getPrototypeOf(t).constructor) : o.apply(t, e));
   }
+  function _classCallCheck(a, n) {
+    if (!(a instanceof n)) throw new TypeError("Cannot call a class as a function");
+  }
+  function _defineProperties(e, r) {
+    for (var t = 0; t < r.length; t++) {
+      var o = r[t];
+      o.enumerable = o.enumerable || !1, o.configurable = !0, "value" in o && (o.writable = !0), Object.defineProperty(e, _toPropertyKey(o.key), o);
+    }
+  }
+  function _createClass(e, r, t) {
+    return _defineProperties(e.prototype, r), Object.defineProperty(e, "prototype", {
+      writable: !1
+    }), e;
+  }
+  function _get() {
+    return _get = "undefined" != typeof Reflect && Reflect.get ? Reflect.get.bind() : function (e, t, r) {
+      var p = _superPropBase(e, t);
+      if (p) {
+        var n = Object.getOwnPropertyDescriptor(p, t);
+        return n.get ? n.get.call(arguments.length < 3 ? e : r) : n.value;
+      }
+    }, _get.apply(null, arguments);
+  }
+  function _getPrototypeOf(t) {
+    return _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf.bind() : function (t) {
+      return t.__proto__ || Object.getPrototypeOf(t);
+    }, _getPrototypeOf(t);
+  }
+  function _inherits(t, e) {
+    if ("function" != typeof e && null !== e) throw new TypeError("Super expression must either be null or a function");
+    t.prototype = Object.create(e && e.prototype, {
+      constructor: {
+        value: t,
+        writable: !0,
+        configurable: !0
+      }
+    }), Object.defineProperty(t, "prototype", {
+      writable: !1
+    }), e && _setPrototypeOf(t, e);
+  }
   function _isNativeReflectConstruct() {
     try {
       var t = !Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {}));
@@ -8996,1838 +11581,2439 @@
       return !!t;
     })();
   }
+  function _possibleConstructorReturn(t, e) {
+    if (e && ("object" == typeof e || "function" == typeof e)) return e;
+    if (void 0 !== e) throw new TypeError("Derived constructors may only return object or undefined");
+    return _assertThisInitialized(t);
+  }
+  function _setPrototypeOf(t, e) {
+    return _setPrototypeOf = Object.setPrototypeOf ? Object.setPrototypeOf.bind() : function (t, e) {
+      return t.__proto__ = e, t;
+    }, _setPrototypeOf(t, e);
+  }
+  function _superPropBase(t, o) {
+    for (; !{}.hasOwnProperty.call(t, o) && null !== (t = _getPrototypeOf(t)););
+    return t;
+  }
+  function _superPropGet(t, o, e, r) {
+    var p = _get(_getPrototypeOf(t.prototype ), o, e);
+    return "function" == typeof p ? function (t) {
+      return p.apply(e, t);
+    } : p;
+  }
   function _toPrimitive(t, r) {
     if ("object" != typeof t || !t) return t;
     var e = t[Symbol.toPrimitive];
     if (void 0 !== e) {
-      var i = e.call(t, r || "default");
+      var i = e.call(t, r);
       if ("object" != typeof i) return i;
       throw new TypeError("@@toPrimitive must return a primitive value.");
     }
-    return ("string" === r ? String : Number)(t);
+    return (String )(t);
   }
   function _toPropertyKey(t) {
     var i = _toPrimitive(t, "string");
     return "symbol" == typeof i ? i : i + "";
   }
-  function _classCallCheck(instance, Constructor) {
-    if (!(instance instanceof Constructor)) {
-      throw new TypeError("Cannot call a class as a function");
-    }
-  }
-  function _defineProperties(target, props) {
-    for (var i = 0; i < props.length; i++) {
-      var descriptor = props[i];
-      descriptor.enumerable = descriptor.enumerable || false;
-      descriptor.configurable = true;
-      if ("value" in descriptor) descriptor.writable = true;
-      Object.defineProperty(target, _toPropertyKey(descriptor.key), descriptor);
-    }
-  }
-  function _createClass(Constructor, protoProps, staticProps) {
-    if (protoProps) _defineProperties(Constructor.prototype, protoProps);
-    if (staticProps) _defineProperties(Constructor, staticProps);
-    Object.defineProperty(Constructor, "prototype", {
-      writable: false
-    });
-    return Constructor;
-  }
-  function _inherits(subClass, superClass) {
-    if (typeof superClass !== "function" && superClass !== null) {
-      throw new TypeError("Super expression must either be null or a function");
-    }
-    subClass.prototype = Object.create(superClass && superClass.prototype, {
-      constructor: {
-        value: subClass,
-        writable: true,
-        configurable: true
-      }
-    });
-    Object.defineProperty(subClass, "prototype", {
-      writable: false
-    });
-    if (superClass) _setPrototypeOf(subClass, superClass);
-  }
-  function _getPrototypeOf(o) {
-    _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf.bind() : function _getPrototypeOf(o) {
-      return o.__proto__ || Object.getPrototypeOf(o);
-    };
-    return _getPrototypeOf(o);
-  }
-  function _setPrototypeOf(o, p) {
-    _setPrototypeOf = Object.setPrototypeOf ? Object.setPrototypeOf.bind() : function _setPrototypeOf(o, p) {
-      o.__proto__ = p;
-      return o;
-    };
-    return _setPrototypeOf(o, p);
-  }
-  function _assertThisInitialized(self) {
-    if (self === void 0) {
-      throw new ReferenceError("this hasn't been initialised - super() hasn't been called");
-    }
-    return self;
-  }
-  function _possibleConstructorReturn(self, call) {
-    if (call && (typeof call === "object" || typeof call === "function")) {
-      return call;
-    } else if (call !== void 0) {
-      throw new TypeError("Derived constructors may only return object or undefined");
-    }
-    return _assertThisInitialized(self);
-  }
-  function _superPropBase(object, property) {
-    while (!Object.prototype.hasOwnProperty.call(object, property)) {
-      object = _getPrototypeOf(object);
-      if (object === null) break;
-    }
-    return object;
-  }
-  function _get() {
-    if (typeof Reflect !== "undefined" && Reflect.get) {
-      _get = Reflect.get.bind();
-    } else {
-      _get = function _get(target, property, receiver) {
-        var base = _superPropBase(target, property);
-        if (!base) return;
-        var desc = Object.getOwnPropertyDescriptor(base, property);
-        if (desc.get) {
-          return desc.get.call(arguments.length < 3 ? target : receiver);
-        }
-        return desc.value;
-      };
-    }
-    return _get.apply(this, arguments);
-  }
 
   var commonjsGlobal = typeof globalThis !== 'undefined' ? globalThis : typeof window !== 'undefined' ? window : typeof global !== 'undefined' ? global : typeof self !== 'undefined' ? self : {};
 
-  var check = function (it) {
-    return it && it.Math === Math && it;
-  };
+  var es_array_includes = {};
 
-  // https://github.com/zloirock/core-js/issues/86#issuecomment-115759028
-  var global$b =
-    // eslint-disable-next-line es/no-global-this -- safe
-    check(typeof globalThis == 'object' && globalThis) ||
-    check(typeof window == 'object' && window) ||
-    // eslint-disable-next-line no-restricted-globals -- safe
-    check(typeof self == 'object' && self) ||
-    check(typeof commonjsGlobal == 'object' && commonjsGlobal) ||
-    check(typeof commonjsGlobal == 'object' && commonjsGlobal) ||
-    // eslint-disable-next-line no-new-func -- fallback
-    (function () { return this; })() || Function('return this')();
+  var globalThis_1;
+  var hasRequiredGlobalThis;
+
+  function requireGlobalThis () {
+  	if (hasRequiredGlobalThis) return globalThis_1;
+  	hasRequiredGlobalThis = 1;
+  	var check = function (it) {
+  	  return it && it.Math === Math && it;
+  	};
+
+  	// https://github.com/zloirock/core-js/issues/86#issuecomment-115759028
+  	globalThis_1 =
+  	  // eslint-disable-next-line es/no-global-this -- safe
+  	  check(typeof globalThis == 'object' && globalThis) ||
+  	  check(typeof window == 'object' && window) ||
+  	  // eslint-disable-next-line no-restricted-globals -- safe
+  	  check(typeof self == 'object' && self) ||
+  	  check(typeof commonjsGlobal == 'object' && commonjsGlobal) ||
+  	  check(typeof globalThis_1 == 'object' && globalThis_1) ||
+  	  // eslint-disable-next-line no-new-func -- fallback
+  	  (function () { return this; })() || Function('return this')();
+  	return globalThis_1;
+  }
 
   var objectGetOwnPropertyDescriptor = {};
 
-  var fails$e = function (exec) {
-    try {
-      return !!exec();
-    } catch (error) {
-      return true;
-    }
-  };
+  var fails;
+  var hasRequiredFails;
 
-  var fails$d = fails$e;
+  function requireFails () {
+  	if (hasRequiredFails) return fails;
+  	hasRequiredFails = 1;
+  	fails = function (exec) {
+  	  try {
+  	    return !!exec();
+  	  } catch (error) {
+  	    return true;
+  	  }
+  	};
+  	return fails;
+  }
 
-  // Detect IE8's incomplete defineProperty implementation
-  var descriptors = !fails$d(function () {
-    // eslint-disable-next-line es/no-object-defineproperty -- required for testing
-    return Object.defineProperty({}, 1, { get: function () { return 7; } })[1] !== 7;
-  });
+  var descriptors;
+  var hasRequiredDescriptors;
 
-  var fails$c = fails$e;
+  function requireDescriptors () {
+  	if (hasRequiredDescriptors) return descriptors;
+  	hasRequiredDescriptors = 1;
+  	var fails = requireFails();
 
-  var functionBindNative = !fails$c(function () {
-    // eslint-disable-next-line es/no-function-prototype-bind -- safe
-    var test = (function () { /* empty */ }).bind();
-    // eslint-disable-next-line no-prototype-builtins -- safe
-    return typeof test != 'function' || test.hasOwnProperty('prototype');
-  });
+  	// Detect IE8's incomplete defineProperty implementation
+  	descriptors = !fails(function () {
+  	  // eslint-disable-next-line es/no-object-defineproperty -- required for testing
+  	  return Object.defineProperty({}, 1, { get: function () { return 7; } })[1] !== 7;
+  	});
+  	return descriptors;
+  }
 
-  var NATIVE_BIND$2 = functionBindNative;
+  var functionBindNative;
+  var hasRequiredFunctionBindNative;
 
-  var call$5 = Function.prototype.call;
+  function requireFunctionBindNative () {
+  	if (hasRequiredFunctionBindNative) return functionBindNative;
+  	hasRequiredFunctionBindNative = 1;
+  	var fails = requireFails();
 
-  var functionCall = NATIVE_BIND$2 ? call$5.bind(call$5) : function () {
-    return call$5.apply(call$5, arguments);
-  };
+  	functionBindNative = !fails(function () {
+  	  // eslint-disable-next-line es/no-function-prototype-bind -- safe
+  	  var test = (function () { /* empty */ }).bind();
+  	  // eslint-disable-next-line no-prototype-builtins -- safe
+  	  return typeof test != 'function' || test.hasOwnProperty('prototype');
+  	});
+  	return functionBindNative;
+  }
+
+  var functionCall;
+  var hasRequiredFunctionCall;
+
+  function requireFunctionCall () {
+  	if (hasRequiredFunctionCall) return functionCall;
+  	hasRequiredFunctionCall = 1;
+  	var NATIVE_BIND = requireFunctionBindNative();
+
+  	var call = Function.prototype.call;
+
+  	functionCall = NATIVE_BIND ? call.bind(call) : function () {
+  	  return call.apply(call, arguments);
+  	};
+  	return functionCall;
+  }
 
   var objectPropertyIsEnumerable = {};
 
-  var $propertyIsEnumerable = {}.propertyIsEnumerable;
-  // eslint-disable-next-line es/no-object-getownpropertydescriptor -- safe
-  var getOwnPropertyDescriptor$1 = Object.getOwnPropertyDescriptor;
+  var hasRequiredObjectPropertyIsEnumerable;
 
-  // Nashorn ~ JDK8 bug
-  var NASHORN_BUG = getOwnPropertyDescriptor$1 && !$propertyIsEnumerable.call({ 1: 2 }, 1);
+  function requireObjectPropertyIsEnumerable () {
+  	if (hasRequiredObjectPropertyIsEnumerable) return objectPropertyIsEnumerable;
+  	hasRequiredObjectPropertyIsEnumerable = 1;
+  	var $propertyIsEnumerable = {}.propertyIsEnumerable;
+  	// eslint-disable-next-line es/no-object-getownpropertydescriptor -- safe
+  	var getOwnPropertyDescriptor = Object.getOwnPropertyDescriptor;
 
-  // `Object.prototype.propertyIsEnumerable` method implementation
-  // https://tc39.es/ecma262/#sec-object.prototype.propertyisenumerable
-  objectPropertyIsEnumerable.f = NASHORN_BUG ? function propertyIsEnumerable(V) {
-    var descriptor = getOwnPropertyDescriptor$1(this, V);
-    return !!descriptor && descriptor.enumerable;
-  } : $propertyIsEnumerable;
+  	// Nashorn ~ JDK8 bug
+  	var NASHORN_BUG = getOwnPropertyDescriptor && !$propertyIsEnumerable.call({ 1: 2 }, 1);
 
-  var createPropertyDescriptor$3 = function (bitmap, value) {
-    return {
-      enumerable: !(bitmap & 1),
-      configurable: !(bitmap & 2),
-      writable: !(bitmap & 4),
-      value: value
-    };
-  };
-
-  var NATIVE_BIND$1 = functionBindNative;
-
-  var FunctionPrototype$1 = Function.prototype;
-  var call$4 = FunctionPrototype$1.call;
-  var uncurryThisWithBind = NATIVE_BIND$1 && FunctionPrototype$1.bind.bind(call$4, call$4);
-
-  var functionUncurryThis = NATIVE_BIND$1 ? uncurryThisWithBind : function (fn) {
-    return function () {
-      return call$4.apply(fn, arguments);
-    };
-  };
-
-  var uncurryThis$e = functionUncurryThis;
-
-  var toString$4 = uncurryThis$e({}.toString);
-  var stringSlice$1 = uncurryThis$e(''.slice);
-
-  var classofRaw$2 = function (it) {
-    return stringSlice$1(toString$4(it), 8, -1);
-  };
-
-  var uncurryThis$d = functionUncurryThis;
-  var fails$b = fails$e;
-  var classof$6 = classofRaw$2;
-
-  var $Object$3 = Object;
-  var split = uncurryThis$d(''.split);
-
-  // fallback for non-array-like ES3 and non-enumerable old V8 strings
-  var indexedObject = fails$b(function () {
-    // throws an error in rhino, see https://github.com/mozilla/rhino/issues/346
-    // eslint-disable-next-line no-prototype-builtins -- safe
-    return !$Object$3('z').propertyIsEnumerable(0);
-  }) ? function (it) {
-    return classof$6(it) === 'String' ? split(it, '') : $Object$3(it);
-  } : $Object$3;
-
-  // we can't use just `it == null` since of `document.all` special case
-  // https://tc39.es/ecma262/#sec-IsHTMLDDA-internal-slot-aec
-  var isNullOrUndefined$2 = function (it) {
-    return it === null || it === undefined;
-  };
-
-  var isNullOrUndefined$1 = isNullOrUndefined$2;
-
-  var $TypeError$7 = TypeError;
-
-  // `RequireObjectCoercible` abstract operation
-  // https://tc39.es/ecma262/#sec-requireobjectcoercible
-  var requireObjectCoercible$3 = function (it) {
-    if (isNullOrUndefined$1(it)) throw new $TypeError$7("Can't call method on " + it);
-    return it;
-  };
-
-  // toObject with fallback for non-array-like ES3 strings
-  var IndexedObject$2 = indexedObject;
-  var requireObjectCoercible$2 = requireObjectCoercible$3;
-
-  var toIndexedObject$4 = function (it) {
-    return IndexedObject$2(requireObjectCoercible$2(it));
-  };
-
-  // https://tc39.es/ecma262/#sec-IsHTMLDDA-internal-slot
-  var documentAll = typeof document == 'object' && document.all;
-
-  // `IsCallable` abstract operation
-  // https://tc39.es/ecma262/#sec-iscallable
-  // eslint-disable-next-line unicorn/no-typeof-undefined -- required for testing
-  var isCallable$c = typeof documentAll == 'undefined' && documentAll !== undefined ? function (argument) {
-    return typeof argument == 'function' || argument === documentAll;
-  } : function (argument) {
-    return typeof argument == 'function';
-  };
-
-  var isCallable$b = isCallable$c;
-
-  var isObject$8 = function (it) {
-    return typeof it == 'object' ? it !== null : isCallable$b(it);
-  };
-
-  var global$a = global$b;
-  var isCallable$a = isCallable$c;
-
-  var aFunction = function (argument) {
-    return isCallable$a(argument) ? argument : undefined;
-  };
-
-  var getBuiltIn$4 = function (namespace, method) {
-    return arguments.length < 2 ? aFunction(global$a[namespace]) : global$a[namespace] && global$a[namespace][method];
-  };
-
-  var uncurryThis$c = functionUncurryThis;
-
-  var objectIsPrototypeOf = uncurryThis$c({}.isPrototypeOf);
-
-  var engineUserAgent = typeof navigator != 'undefined' && String(navigator.userAgent) || '';
-
-  var global$9 = global$b;
-  var userAgent = engineUserAgent;
-
-  var process = global$9.process;
-  var Deno = global$9.Deno;
-  var versions = process && process.versions || Deno && Deno.version;
-  var v8 = versions && versions.v8;
-  var match, version;
-
-  if (v8) {
-    match = v8.split('.');
-    // in old Chrome, versions of V8 isn't V8 = Chrome / 10
-    // but their correct versions are not interesting for us
-    version = match[0] > 0 && match[0] < 4 ? 1 : +(match[0] + match[1]);
+  	// `Object.prototype.propertyIsEnumerable` method implementation
+  	// https://tc39.es/ecma262/#sec-object.prototype.propertyisenumerable
+  	objectPropertyIsEnumerable.f = NASHORN_BUG ? function propertyIsEnumerable(V) {
+  	  var descriptor = getOwnPropertyDescriptor(this, V);
+  	  return !!descriptor && descriptor.enumerable;
+  	} : $propertyIsEnumerable;
+  	return objectPropertyIsEnumerable;
   }
 
-  // BrowserFS NodeJS `process` polyfill incorrectly set `.v8` to `0.0`
-  // so check `userAgent` even if `.v8` exists, but 0
-  if (!version && userAgent) {
-    match = userAgent.match(/Edge\/(\d+)/);
-    if (!match || match[1] >= 74) {
-      match = userAgent.match(/Chrome\/(\d+)/);
-      if (match) version = +match[1];
-    }
+  var createPropertyDescriptor;
+  var hasRequiredCreatePropertyDescriptor;
+
+  function requireCreatePropertyDescriptor () {
+  	if (hasRequiredCreatePropertyDescriptor) return createPropertyDescriptor;
+  	hasRequiredCreatePropertyDescriptor = 1;
+  	createPropertyDescriptor = function (bitmap, value) {
+  	  return {
+  	    enumerable: !(bitmap & 1),
+  	    configurable: !(bitmap & 2),
+  	    writable: !(bitmap & 4),
+  	    value: value
+  	  };
+  	};
+  	return createPropertyDescriptor;
   }
 
-  var engineV8Version = version;
+  var functionUncurryThis;
+  var hasRequiredFunctionUncurryThis;
 
-  /* eslint-disable es/no-symbol -- required for testing */
-  var V8_VERSION$2 = engineV8Version;
-  var fails$a = fails$e;
-  var global$8 = global$b;
+  function requireFunctionUncurryThis () {
+  	if (hasRequiredFunctionUncurryThis) return functionUncurryThis;
+  	hasRequiredFunctionUncurryThis = 1;
+  	var NATIVE_BIND = requireFunctionBindNative();
 
-  var $String$4 = global$8.String;
+  	var FunctionPrototype = Function.prototype;
+  	var call = FunctionPrototype.call;
+  	var uncurryThisWithBind = NATIVE_BIND && FunctionPrototype.bind.bind(call, call);
 
-  // eslint-disable-next-line es/no-object-getownpropertysymbols -- required for testing
-  var symbolConstructorDetection = !!Object.getOwnPropertySymbols && !fails$a(function () {
-    var symbol = Symbol('symbol detection');
-    // Chrome 38 Symbol has incorrect toString conversion
-    // `get-own-property-symbols` polyfill symbols converted to object are not Symbol instances
-    // nb: Do not call `String` directly to avoid this being optimized out to `symbol+''` which will,
-    // of course, fail.
-    return !$String$4(symbol) || !(Object(symbol) instanceof Symbol) ||
-      // Chrome 38-40 symbols are not inherited from DOM collections prototypes to instances
-      !Symbol.sham && V8_VERSION$2 && V8_VERSION$2 < 41;
-  });
+  	functionUncurryThis = NATIVE_BIND ? uncurryThisWithBind : function (fn) {
+  	  return function () {
+  	    return call.apply(fn, arguments);
+  	  };
+  	};
+  	return functionUncurryThis;
+  }
 
-  /* eslint-disable es/no-symbol -- required for testing */
-  var NATIVE_SYMBOL$1 = symbolConstructorDetection;
+  var classofRaw;
+  var hasRequiredClassofRaw;
 
-  var useSymbolAsUid = NATIVE_SYMBOL$1
-    && !Symbol.sham
-    && typeof Symbol.iterator == 'symbol';
+  function requireClassofRaw () {
+  	if (hasRequiredClassofRaw) return classofRaw;
+  	hasRequiredClassofRaw = 1;
+  	var uncurryThis = requireFunctionUncurryThis();
 
-  var getBuiltIn$3 = getBuiltIn$4;
-  var isCallable$9 = isCallable$c;
-  var isPrototypeOf = objectIsPrototypeOf;
-  var USE_SYMBOL_AS_UID$1 = useSymbolAsUid;
+  	var toString = uncurryThis({}.toString);
+  	var stringSlice = uncurryThis(''.slice);
 
-  var $Object$2 = Object;
+  	classofRaw = function (it) {
+  	  return stringSlice(toString(it), 8, -1);
+  	};
+  	return classofRaw;
+  }
 
-  var isSymbol$2 = USE_SYMBOL_AS_UID$1 ? function (it) {
-    return typeof it == 'symbol';
-  } : function (it) {
-    var $Symbol = getBuiltIn$3('Symbol');
-    return isCallable$9($Symbol) && isPrototypeOf($Symbol.prototype, $Object$2(it));
-  };
+  var indexedObject;
+  var hasRequiredIndexedObject;
 
-  var $String$3 = String;
+  function requireIndexedObject () {
+  	if (hasRequiredIndexedObject) return indexedObject;
+  	hasRequiredIndexedObject = 1;
+  	var uncurryThis = requireFunctionUncurryThis();
+  	var fails = requireFails();
+  	var classof = requireClassofRaw();
 
-  var tryToString$1 = function (argument) {
-    try {
-      return $String$3(argument);
-    } catch (error) {
-      return 'Object';
-    }
-  };
+  	var $Object = Object;
+  	var split = uncurryThis(''.split);
 
-  var isCallable$8 = isCallable$c;
-  var tryToString = tryToString$1;
+  	// fallback for non-array-like ES3 and non-enumerable old V8 strings
+  	indexedObject = fails(function () {
+  	  // throws an error in rhino, see https://github.com/mozilla/rhino/issues/346
+  	  // eslint-disable-next-line no-prototype-builtins -- safe
+  	  return !$Object('z').propertyIsEnumerable(0);
+  	}) ? function (it) {
+  	  return classof(it) === 'String' ? split(it, '') : $Object(it);
+  	} : $Object;
+  	return indexedObject;
+  }
 
-  var $TypeError$6 = TypeError;
+  var isNullOrUndefined;
+  var hasRequiredIsNullOrUndefined;
 
-  // `Assert: IsCallable(argument) is true`
-  var aCallable$2 = function (argument) {
-    if (isCallable$8(argument)) return argument;
-    throw new $TypeError$6(tryToString(argument) + ' is not a function');
-  };
+  function requireIsNullOrUndefined () {
+  	if (hasRequiredIsNullOrUndefined) return isNullOrUndefined;
+  	hasRequiredIsNullOrUndefined = 1;
+  	// we can't use just `it == null` since of `document.all` special case
+  	// https://tc39.es/ecma262/#sec-IsHTMLDDA-internal-slot-aec
+  	isNullOrUndefined = function (it) {
+  	  return it === null || it === undefined;
+  	};
+  	return isNullOrUndefined;
+  }
 
-  var aCallable$1 = aCallable$2;
-  var isNullOrUndefined = isNullOrUndefined$2;
+  var requireObjectCoercible;
+  var hasRequiredRequireObjectCoercible;
 
-  // `GetMethod` abstract operation
-  // https://tc39.es/ecma262/#sec-getmethod
-  var getMethod$1 = function (V, P) {
-    var func = V[P];
-    return isNullOrUndefined(func) ? undefined : aCallable$1(func);
-  };
+  function requireRequireObjectCoercible () {
+  	if (hasRequiredRequireObjectCoercible) return requireObjectCoercible;
+  	hasRequiredRequireObjectCoercible = 1;
+  	var isNullOrUndefined = requireIsNullOrUndefined();
 
-  var call$3 = functionCall;
-  var isCallable$7 = isCallable$c;
-  var isObject$7 = isObject$8;
+  	var $TypeError = TypeError;
 
-  var $TypeError$5 = TypeError;
+  	// `RequireObjectCoercible` abstract operation
+  	// https://tc39.es/ecma262/#sec-requireobjectcoercible
+  	requireObjectCoercible = function (it) {
+  	  if (isNullOrUndefined(it)) throw new $TypeError("Can't call method on " + it);
+  	  return it;
+  	};
+  	return requireObjectCoercible;
+  }
 
-  // `OrdinaryToPrimitive` abstract operation
-  // https://tc39.es/ecma262/#sec-ordinarytoprimitive
-  var ordinaryToPrimitive$1 = function (input, pref) {
-    var fn, val;
-    if (pref === 'string' && isCallable$7(fn = input.toString) && !isObject$7(val = call$3(fn, input))) return val;
-    if (isCallable$7(fn = input.valueOf) && !isObject$7(val = call$3(fn, input))) return val;
-    if (pref !== 'string' && isCallable$7(fn = input.toString) && !isObject$7(val = call$3(fn, input))) return val;
-    throw new $TypeError$5("Can't convert object to primitive value");
-  };
+  var toIndexedObject;
+  var hasRequiredToIndexedObject;
+
+  function requireToIndexedObject () {
+  	if (hasRequiredToIndexedObject) return toIndexedObject;
+  	hasRequiredToIndexedObject = 1;
+  	// toObject with fallback for non-array-like ES3 strings
+  	var IndexedObject = requireIndexedObject();
+  	var requireObjectCoercible = requireRequireObjectCoercible();
+
+  	toIndexedObject = function (it) {
+  	  return IndexedObject(requireObjectCoercible(it));
+  	};
+  	return toIndexedObject;
+  }
+
+  var isCallable;
+  var hasRequiredIsCallable;
+
+  function requireIsCallable () {
+  	if (hasRequiredIsCallable) return isCallable;
+  	hasRequiredIsCallable = 1;
+  	// https://tc39.es/ecma262/#sec-IsHTMLDDA-internal-slot
+  	var documentAll = typeof document == 'object' && document.all;
+
+  	// `IsCallable` abstract operation
+  	// https://tc39.es/ecma262/#sec-iscallable
+  	// eslint-disable-next-line unicorn/no-typeof-undefined -- required for testing
+  	isCallable = typeof documentAll == 'undefined' && documentAll !== undefined ? function (argument) {
+  	  return typeof argument == 'function' || argument === documentAll;
+  	} : function (argument) {
+  	  return typeof argument == 'function';
+  	};
+  	return isCallable;
+  }
+
+  var isObject;
+  var hasRequiredIsObject;
+
+  function requireIsObject () {
+  	if (hasRequiredIsObject) return isObject;
+  	hasRequiredIsObject = 1;
+  	var isCallable = requireIsCallable();
+
+  	isObject = function (it) {
+  	  return typeof it == 'object' ? it !== null : isCallable(it);
+  	};
+  	return isObject;
+  }
+
+  var getBuiltIn;
+  var hasRequiredGetBuiltIn;
+
+  function requireGetBuiltIn () {
+  	if (hasRequiredGetBuiltIn) return getBuiltIn;
+  	hasRequiredGetBuiltIn = 1;
+  	var globalThis = requireGlobalThis();
+  	var isCallable = requireIsCallable();
+
+  	var aFunction = function (argument) {
+  	  return isCallable(argument) ? argument : undefined;
+  	};
+
+  	getBuiltIn = function (namespace, method) {
+  	  return arguments.length < 2 ? aFunction(globalThis[namespace]) : globalThis[namespace] && globalThis[namespace][method];
+  	};
+  	return getBuiltIn;
+  }
+
+  var objectIsPrototypeOf;
+  var hasRequiredObjectIsPrototypeOf;
+
+  function requireObjectIsPrototypeOf () {
+  	if (hasRequiredObjectIsPrototypeOf) return objectIsPrototypeOf;
+  	hasRequiredObjectIsPrototypeOf = 1;
+  	var uncurryThis = requireFunctionUncurryThis();
+
+  	objectIsPrototypeOf = uncurryThis({}.isPrototypeOf);
+  	return objectIsPrototypeOf;
+  }
+
+  var environmentUserAgent;
+  var hasRequiredEnvironmentUserAgent;
+
+  function requireEnvironmentUserAgent () {
+  	if (hasRequiredEnvironmentUserAgent) return environmentUserAgent;
+  	hasRequiredEnvironmentUserAgent = 1;
+  	var globalThis = requireGlobalThis();
+
+  	var navigator = globalThis.navigator;
+  	var userAgent = navigator && navigator.userAgent;
+
+  	environmentUserAgent = userAgent ? String(userAgent) : '';
+  	return environmentUserAgent;
+  }
+
+  var environmentV8Version;
+  var hasRequiredEnvironmentV8Version;
+
+  function requireEnvironmentV8Version () {
+  	if (hasRequiredEnvironmentV8Version) return environmentV8Version;
+  	hasRequiredEnvironmentV8Version = 1;
+  	var globalThis = requireGlobalThis();
+  	var userAgent = requireEnvironmentUserAgent();
+
+  	var process = globalThis.process;
+  	var Deno = globalThis.Deno;
+  	var versions = process && process.versions || Deno && Deno.version;
+  	var v8 = versions && versions.v8;
+  	var match, version;
+
+  	if (v8) {
+  	  match = v8.split('.');
+  	  // in old Chrome, versions of V8 isn't V8 = Chrome / 10
+  	  // but their correct versions are not interesting for us
+  	  version = match[0] > 0 && match[0] < 4 ? 1 : +(match[0] + match[1]);
+  	}
+
+  	// BrowserFS NodeJS `process` polyfill incorrectly set `.v8` to `0.0`
+  	// so check `userAgent` even if `.v8` exists, but 0
+  	if (!version && userAgent) {
+  	  match = userAgent.match(/Edge\/(\d+)/);
+  	  if (!match || match[1] >= 74) {
+  	    match = userAgent.match(/Chrome\/(\d+)/);
+  	    if (match) version = +match[1];
+  	  }
+  	}
+
+  	environmentV8Version = version;
+  	return environmentV8Version;
+  }
+
+  var symbolConstructorDetection;
+  var hasRequiredSymbolConstructorDetection;
+
+  function requireSymbolConstructorDetection () {
+  	if (hasRequiredSymbolConstructorDetection) return symbolConstructorDetection;
+  	hasRequiredSymbolConstructorDetection = 1;
+  	/* eslint-disable es/no-symbol -- required for testing */
+  	var V8_VERSION = requireEnvironmentV8Version();
+  	var fails = requireFails();
+  	var globalThis = requireGlobalThis();
+
+  	var $String = globalThis.String;
+
+  	// eslint-disable-next-line es/no-object-getownpropertysymbols -- required for testing
+  	symbolConstructorDetection = !!Object.getOwnPropertySymbols && !fails(function () {
+  	  var symbol = Symbol('symbol detection');
+  	  // Chrome 38 Symbol has incorrect toString conversion
+  	  // `get-own-property-symbols` polyfill symbols converted to object are not Symbol instances
+  	  // nb: Do not call `String` directly to avoid this being optimized out to `symbol+''` which will,
+  	  // of course, fail.
+  	  return !$String(symbol) || !(Object(symbol) instanceof Symbol) ||
+  	    // Chrome 38-40 symbols are not inherited from DOM collections prototypes to instances
+  	    !Symbol.sham && V8_VERSION && V8_VERSION < 41;
+  	});
+  	return symbolConstructorDetection;
+  }
+
+  var useSymbolAsUid;
+  var hasRequiredUseSymbolAsUid;
+
+  function requireUseSymbolAsUid () {
+  	if (hasRequiredUseSymbolAsUid) return useSymbolAsUid;
+  	hasRequiredUseSymbolAsUid = 1;
+  	/* eslint-disable es/no-symbol -- required for testing */
+  	var NATIVE_SYMBOL = requireSymbolConstructorDetection();
+
+  	useSymbolAsUid = NATIVE_SYMBOL &&
+  	  !Symbol.sham &&
+  	  typeof Symbol.iterator == 'symbol';
+  	return useSymbolAsUid;
+  }
+
+  var isSymbol;
+  var hasRequiredIsSymbol;
+
+  function requireIsSymbol () {
+  	if (hasRequiredIsSymbol) return isSymbol;
+  	hasRequiredIsSymbol = 1;
+  	var getBuiltIn = requireGetBuiltIn();
+  	var isCallable = requireIsCallable();
+  	var isPrototypeOf = requireObjectIsPrototypeOf();
+  	var USE_SYMBOL_AS_UID = requireUseSymbolAsUid();
+
+  	var $Object = Object;
+
+  	isSymbol = USE_SYMBOL_AS_UID ? function (it) {
+  	  return typeof it == 'symbol';
+  	} : function (it) {
+  	  var $Symbol = getBuiltIn('Symbol');
+  	  return isCallable($Symbol) && isPrototypeOf($Symbol.prototype, $Object(it));
+  	};
+  	return isSymbol;
+  }
+
+  var tryToString;
+  var hasRequiredTryToString;
+
+  function requireTryToString () {
+  	if (hasRequiredTryToString) return tryToString;
+  	hasRequiredTryToString = 1;
+  	var $String = String;
+
+  	tryToString = function (argument) {
+  	  try {
+  	    return $String(argument);
+  	  } catch (error) {
+  	    return 'Object';
+  	  }
+  	};
+  	return tryToString;
+  }
+
+  var aCallable;
+  var hasRequiredACallable;
+
+  function requireACallable () {
+  	if (hasRequiredACallable) return aCallable;
+  	hasRequiredACallable = 1;
+  	var isCallable = requireIsCallable();
+  	var tryToString = requireTryToString();
+
+  	var $TypeError = TypeError;
+
+  	// `Assert: IsCallable(argument) is true`
+  	aCallable = function (argument) {
+  	  if (isCallable(argument)) return argument;
+  	  throw new $TypeError(tryToString(argument) + ' is not a function');
+  	};
+  	return aCallable;
+  }
+
+  var getMethod;
+  var hasRequiredGetMethod;
+
+  function requireGetMethod () {
+  	if (hasRequiredGetMethod) return getMethod;
+  	hasRequiredGetMethod = 1;
+  	var aCallable = requireACallable();
+  	var isNullOrUndefined = requireIsNullOrUndefined();
+
+  	// `GetMethod` abstract operation
+  	// https://tc39.es/ecma262/#sec-getmethod
+  	getMethod = function (V, P) {
+  	  var func = V[P];
+  	  return isNullOrUndefined(func) ? undefined : aCallable(func);
+  	};
+  	return getMethod;
+  }
+
+  var ordinaryToPrimitive;
+  var hasRequiredOrdinaryToPrimitive;
+
+  function requireOrdinaryToPrimitive () {
+  	if (hasRequiredOrdinaryToPrimitive) return ordinaryToPrimitive;
+  	hasRequiredOrdinaryToPrimitive = 1;
+  	var call = requireFunctionCall();
+  	var isCallable = requireIsCallable();
+  	var isObject = requireIsObject();
+
+  	var $TypeError = TypeError;
+
+  	// `OrdinaryToPrimitive` abstract operation
+  	// https://tc39.es/ecma262/#sec-ordinarytoprimitive
+  	ordinaryToPrimitive = function (input, pref) {
+  	  var fn, val;
+  	  if (pref === 'string' && isCallable(fn = input.toString) && !isObject(val = call(fn, input))) return val;
+  	  if (isCallable(fn = input.valueOf) && !isObject(val = call(fn, input))) return val;
+  	  if (pref !== 'string' && isCallable(fn = input.toString) && !isObject(val = call(fn, input))) return val;
+  	  throw new $TypeError("Can't convert object to primitive value");
+  	};
+  	return ordinaryToPrimitive;
+  }
 
   var sharedStore = {exports: {}};
 
-  var global$7 = global$b;
+  var isPure;
+  var hasRequiredIsPure;
 
-  // eslint-disable-next-line es/no-object-defineproperty -- safe
-  var defineProperty$3 = Object.defineProperty;
+  function requireIsPure () {
+  	if (hasRequiredIsPure) return isPure;
+  	hasRequiredIsPure = 1;
+  	isPure = false;
+  	return isPure;
+  }
 
-  var defineGlobalProperty$3 = function (key, value) {
-    try {
-      defineProperty$3(global$7, key, { value: value, configurable: true, writable: true });
-    } catch (error) {
-      global$7[key] = value;
-    } return value;
-  };
+  var defineGlobalProperty;
+  var hasRequiredDefineGlobalProperty;
 
-  var globalThis$1 = global$b;
-  var defineGlobalProperty$2 = defineGlobalProperty$3;
+  function requireDefineGlobalProperty () {
+  	if (hasRequiredDefineGlobalProperty) return defineGlobalProperty;
+  	hasRequiredDefineGlobalProperty = 1;
+  	var globalThis = requireGlobalThis();
 
-  var SHARED = '__core-js_shared__';
-  var store$3 = sharedStore.exports = globalThis$1[SHARED] || defineGlobalProperty$2(SHARED, {});
+  	// eslint-disable-next-line es/no-object-defineproperty -- safe
+  	var defineProperty = Object.defineProperty;
 
-  (store$3.versions || (store$3.versions = [])).push({
-    version: '3.36.1',
-    mode: 'global',
-    copyright: '© 2014-2024 Denis Pushkarev (zloirock.ru)',
-    license: 'https://github.com/zloirock/core-js/blob/v3.36.1/LICENSE',
-    source: 'https://github.com/zloirock/core-js'
-  });
+  	defineGlobalProperty = function (key, value) {
+  	  try {
+  	    defineProperty(globalThis, key, { value: value, configurable: true, writable: true });
+  	  } catch (error) {
+  	    globalThis[key] = value;
+  	  } return value;
+  	};
+  	return defineGlobalProperty;
+  }
 
-  var sharedStoreExports = sharedStore.exports;
+  var hasRequiredSharedStore;
 
-  var store$2 = sharedStoreExports;
+  function requireSharedStore () {
+  	if (hasRequiredSharedStore) return sharedStore.exports;
+  	hasRequiredSharedStore = 1;
+  	var IS_PURE = requireIsPure();
+  	var globalThis = requireGlobalThis();
+  	var defineGlobalProperty = requireDefineGlobalProperty();
 
-  var shared$3 = function (key, value) {
-    return store$2[key] || (store$2[key] = value || {});
-  };
+  	var SHARED = '__core-js_shared__';
+  	var store = sharedStore.exports = globalThis[SHARED] || defineGlobalProperty(SHARED, {});
 
-  var requireObjectCoercible$1 = requireObjectCoercible$3;
+  	(store.versions || (store.versions = [])).push({
+  	  version: '3.39.0',
+  	  mode: IS_PURE ? 'pure' : 'global',
+  	  copyright: '© 2014-2024 Denis Pushkarev (zloirock.ru)',
+  	  license: 'https://github.com/zloirock/core-js/blob/v3.39.0/LICENSE',
+  	  source: 'https://github.com/zloirock/core-js'
+  	});
+  	return sharedStore.exports;
+  }
 
-  var $Object$1 = Object;
+  var shared;
+  var hasRequiredShared;
 
-  // `ToObject` abstract operation
-  // https://tc39.es/ecma262/#sec-toobject
-  var toObject$4 = function (argument) {
-    return $Object$1(requireObjectCoercible$1(argument));
-  };
+  function requireShared () {
+  	if (hasRequiredShared) return shared;
+  	hasRequiredShared = 1;
+  	var store = requireSharedStore();
 
-  var uncurryThis$b = functionUncurryThis;
-  var toObject$3 = toObject$4;
+  	shared = function (key, value) {
+  	  return store[key] || (store[key] = value || {});
+  	};
+  	return shared;
+  }
 
-  var hasOwnProperty = uncurryThis$b({}.hasOwnProperty);
+  var toObject;
+  var hasRequiredToObject;
 
-  // `HasOwnProperty` abstract operation
-  // https://tc39.es/ecma262/#sec-hasownproperty
-  // eslint-disable-next-line es/no-object-hasown -- safe
-  var hasOwnProperty_1 = Object.hasOwn || function hasOwn(it, key) {
-    return hasOwnProperty(toObject$3(it), key);
-  };
+  function requireToObject () {
+  	if (hasRequiredToObject) return toObject;
+  	hasRequiredToObject = 1;
+  	var requireObjectCoercible = requireRequireObjectCoercible();
 
-  var uncurryThis$a = functionUncurryThis;
+  	var $Object = Object;
 
-  var id = 0;
-  var postfix = Math.random();
-  var toString$3 = uncurryThis$a(1.0.toString);
+  	// `ToObject` abstract operation
+  	// https://tc39.es/ecma262/#sec-toobject
+  	toObject = function (argument) {
+  	  return $Object(requireObjectCoercible(argument));
+  	};
+  	return toObject;
+  }
 
-  var uid$2 = function (key) {
-    return 'Symbol(' + (key === undefined ? '' : key) + ')_' + toString$3(++id + postfix, 36);
-  };
+  var hasOwnProperty_1;
+  var hasRequiredHasOwnProperty;
 
-  var global$6 = global$b;
-  var shared$2 = shared$3;
-  var hasOwn$6 = hasOwnProperty_1;
-  var uid$1 = uid$2;
-  var NATIVE_SYMBOL = symbolConstructorDetection;
-  var USE_SYMBOL_AS_UID = useSymbolAsUid;
+  function requireHasOwnProperty () {
+  	if (hasRequiredHasOwnProperty) return hasOwnProperty_1;
+  	hasRequiredHasOwnProperty = 1;
+  	var uncurryThis = requireFunctionUncurryThis();
+  	var toObject = requireToObject();
 
-  var Symbol$1 = global$6.Symbol;
-  var WellKnownSymbolsStore = shared$2('wks');
-  var createWellKnownSymbol = USE_SYMBOL_AS_UID ? Symbol$1['for'] || Symbol$1 : Symbol$1 && Symbol$1.withoutSetter || uid$1;
+  	var hasOwnProperty = uncurryThis({}.hasOwnProperty);
 
-  var wellKnownSymbol$9 = function (name) {
-    if (!hasOwn$6(WellKnownSymbolsStore, name)) {
-      WellKnownSymbolsStore[name] = NATIVE_SYMBOL && hasOwn$6(Symbol$1, name)
-        ? Symbol$1[name]
-        : createWellKnownSymbol('Symbol.' + name);
-    } return WellKnownSymbolsStore[name];
-  };
+  	// `HasOwnProperty` abstract operation
+  	// https://tc39.es/ecma262/#sec-hasownproperty
+  	// eslint-disable-next-line es/no-object-hasown -- safe
+  	hasOwnProperty_1 = Object.hasOwn || function hasOwn(it, key) {
+  	  return hasOwnProperty(toObject(it), key);
+  	};
+  	return hasOwnProperty_1;
+  }
 
-  var call$2 = functionCall;
-  var isObject$6 = isObject$8;
-  var isSymbol$1 = isSymbol$2;
-  var getMethod = getMethod$1;
-  var ordinaryToPrimitive = ordinaryToPrimitive$1;
-  var wellKnownSymbol$8 = wellKnownSymbol$9;
+  var uid;
+  var hasRequiredUid;
 
-  var $TypeError$4 = TypeError;
-  var TO_PRIMITIVE = wellKnownSymbol$8('toPrimitive');
+  function requireUid () {
+  	if (hasRequiredUid) return uid;
+  	hasRequiredUid = 1;
+  	var uncurryThis = requireFunctionUncurryThis();
 
-  // `ToPrimitive` abstract operation
-  // https://tc39.es/ecma262/#sec-toprimitive
-  var toPrimitive$1 = function (input, pref) {
-    if (!isObject$6(input) || isSymbol$1(input)) return input;
-    var exoticToPrim = getMethod(input, TO_PRIMITIVE);
-    var result;
-    if (exoticToPrim) {
-      if (pref === undefined) pref = 'default';
-      result = call$2(exoticToPrim, input, pref);
-      if (!isObject$6(result) || isSymbol$1(result)) return result;
-      throw new $TypeError$4("Can't convert object to primitive value");
-    }
-    if (pref === undefined) pref = 'number';
-    return ordinaryToPrimitive(input, pref);
-  };
+  	var id = 0;
+  	var postfix = Math.random();
+  	var toString = uncurryThis(1.0.toString);
 
-  var toPrimitive = toPrimitive$1;
-  var isSymbol = isSymbol$2;
+  	uid = function (key) {
+  	  return 'Symbol(' + (key === undefined ? '' : key) + ')_' + toString(++id + postfix, 36);
+  	};
+  	return uid;
+  }
 
-  // `ToPropertyKey` abstract operation
-  // https://tc39.es/ecma262/#sec-topropertykey
-  var toPropertyKey$2 = function (argument) {
-    var key = toPrimitive(argument, 'string');
-    return isSymbol(key) ? key : key + '';
-  };
+  var wellKnownSymbol;
+  var hasRequiredWellKnownSymbol;
 
-  var global$5 = global$b;
-  var isObject$5 = isObject$8;
+  function requireWellKnownSymbol () {
+  	if (hasRequiredWellKnownSymbol) return wellKnownSymbol;
+  	hasRequiredWellKnownSymbol = 1;
+  	var globalThis = requireGlobalThis();
+  	var shared = requireShared();
+  	var hasOwn = requireHasOwnProperty();
+  	var uid = requireUid();
+  	var NATIVE_SYMBOL = requireSymbolConstructorDetection();
+  	var USE_SYMBOL_AS_UID = requireUseSymbolAsUid();
 
-  var document$1 = global$5.document;
-  // typeof document.createElement is 'object' in old IE
-  var EXISTS$1 = isObject$5(document$1) && isObject$5(document$1.createElement);
+  	var Symbol = globalThis.Symbol;
+  	var WellKnownSymbolsStore = shared('wks');
+  	var createWellKnownSymbol = USE_SYMBOL_AS_UID ? Symbol['for'] || Symbol : Symbol && Symbol.withoutSetter || uid;
 
-  var documentCreateElement$2 = function (it) {
-    return EXISTS$1 ? document$1.createElement(it) : {};
-  };
+  	wellKnownSymbol = function (name) {
+  	  if (!hasOwn(WellKnownSymbolsStore, name)) {
+  	    WellKnownSymbolsStore[name] = NATIVE_SYMBOL && hasOwn(Symbol, name)
+  	      ? Symbol[name]
+  	      : createWellKnownSymbol('Symbol.' + name);
+  	  } return WellKnownSymbolsStore[name];
+  	};
+  	return wellKnownSymbol;
+  }
 
-  var DESCRIPTORS$9 = descriptors;
-  var fails$9 = fails$e;
-  var createElement = documentCreateElement$2;
+  var toPrimitive;
+  var hasRequiredToPrimitive;
 
-  // Thanks to IE8 for its funny defineProperty
-  var ie8DomDefine = !DESCRIPTORS$9 && !fails$9(function () {
-    // eslint-disable-next-line es/no-object-defineproperty -- required for testing
-    return Object.defineProperty(createElement('div'), 'a', {
-      get: function () { return 7; }
-    }).a !== 7;
-  });
+  function requireToPrimitive () {
+  	if (hasRequiredToPrimitive) return toPrimitive;
+  	hasRequiredToPrimitive = 1;
+  	var call = requireFunctionCall();
+  	var isObject = requireIsObject();
+  	var isSymbol = requireIsSymbol();
+  	var getMethod = requireGetMethod();
+  	var ordinaryToPrimitive = requireOrdinaryToPrimitive();
+  	var wellKnownSymbol = requireWellKnownSymbol();
 
-  var DESCRIPTORS$8 = descriptors;
-  var call$1 = functionCall;
-  var propertyIsEnumerableModule$1 = objectPropertyIsEnumerable;
-  var createPropertyDescriptor$2 = createPropertyDescriptor$3;
-  var toIndexedObject$3 = toIndexedObject$4;
-  var toPropertyKey$1 = toPropertyKey$2;
-  var hasOwn$5 = hasOwnProperty_1;
-  var IE8_DOM_DEFINE$1 = ie8DomDefine;
+  	var $TypeError = TypeError;
+  	var TO_PRIMITIVE = wellKnownSymbol('toPrimitive');
 
-  // eslint-disable-next-line es/no-object-getownpropertydescriptor -- safe
-  var $getOwnPropertyDescriptor$1 = Object.getOwnPropertyDescriptor;
+  	// `ToPrimitive` abstract operation
+  	// https://tc39.es/ecma262/#sec-toprimitive
+  	toPrimitive = function (input, pref) {
+  	  if (!isObject(input) || isSymbol(input)) return input;
+  	  var exoticToPrim = getMethod(input, TO_PRIMITIVE);
+  	  var result;
+  	  if (exoticToPrim) {
+  	    if (pref === undefined) pref = 'default';
+  	    result = call(exoticToPrim, input, pref);
+  	    if (!isObject(result) || isSymbol(result)) return result;
+  	    throw new $TypeError("Can't convert object to primitive value");
+  	  }
+  	  if (pref === undefined) pref = 'number';
+  	  return ordinaryToPrimitive(input, pref);
+  	};
+  	return toPrimitive;
+  }
 
-  // `Object.getOwnPropertyDescriptor` method
-  // https://tc39.es/ecma262/#sec-object.getownpropertydescriptor
-  objectGetOwnPropertyDescriptor.f = DESCRIPTORS$8 ? $getOwnPropertyDescriptor$1 : function getOwnPropertyDescriptor(O, P) {
-    O = toIndexedObject$3(O);
-    P = toPropertyKey$1(P);
-    if (IE8_DOM_DEFINE$1) try {
-      return $getOwnPropertyDescriptor$1(O, P);
-    } catch (error) { /* empty */ }
-    if (hasOwn$5(O, P)) return createPropertyDescriptor$2(!call$1(propertyIsEnumerableModule$1.f, O, P), O[P]);
-  };
+  var toPropertyKey;
+  var hasRequiredToPropertyKey;
+
+  function requireToPropertyKey () {
+  	if (hasRequiredToPropertyKey) return toPropertyKey;
+  	hasRequiredToPropertyKey = 1;
+  	var toPrimitive = requireToPrimitive();
+  	var isSymbol = requireIsSymbol();
+
+  	// `ToPropertyKey` abstract operation
+  	// https://tc39.es/ecma262/#sec-topropertykey
+  	toPropertyKey = function (argument) {
+  	  var key = toPrimitive(argument, 'string');
+  	  return isSymbol(key) ? key : key + '';
+  	};
+  	return toPropertyKey;
+  }
+
+  var documentCreateElement;
+  var hasRequiredDocumentCreateElement;
+
+  function requireDocumentCreateElement () {
+  	if (hasRequiredDocumentCreateElement) return documentCreateElement;
+  	hasRequiredDocumentCreateElement = 1;
+  	var globalThis = requireGlobalThis();
+  	var isObject = requireIsObject();
+
+  	var document = globalThis.document;
+  	// typeof document.createElement is 'object' in old IE
+  	var EXISTS = isObject(document) && isObject(document.createElement);
+
+  	documentCreateElement = function (it) {
+  	  return EXISTS ? document.createElement(it) : {};
+  	};
+  	return documentCreateElement;
+  }
+
+  var ie8DomDefine;
+  var hasRequiredIe8DomDefine;
+
+  function requireIe8DomDefine () {
+  	if (hasRequiredIe8DomDefine) return ie8DomDefine;
+  	hasRequiredIe8DomDefine = 1;
+  	var DESCRIPTORS = requireDescriptors();
+  	var fails = requireFails();
+  	var createElement = requireDocumentCreateElement();
+
+  	// Thanks to IE8 for its funny defineProperty
+  	ie8DomDefine = !DESCRIPTORS && !fails(function () {
+  	  // eslint-disable-next-line es/no-object-defineproperty -- required for testing
+  	  return Object.defineProperty(createElement('div'), 'a', {
+  	    get: function () { return 7; }
+  	  }).a !== 7;
+  	});
+  	return ie8DomDefine;
+  }
+
+  var hasRequiredObjectGetOwnPropertyDescriptor;
+
+  function requireObjectGetOwnPropertyDescriptor () {
+  	if (hasRequiredObjectGetOwnPropertyDescriptor) return objectGetOwnPropertyDescriptor;
+  	hasRequiredObjectGetOwnPropertyDescriptor = 1;
+  	var DESCRIPTORS = requireDescriptors();
+  	var call = requireFunctionCall();
+  	var propertyIsEnumerableModule = requireObjectPropertyIsEnumerable();
+  	var createPropertyDescriptor = requireCreatePropertyDescriptor();
+  	var toIndexedObject = requireToIndexedObject();
+  	var toPropertyKey = requireToPropertyKey();
+  	var hasOwn = requireHasOwnProperty();
+  	var IE8_DOM_DEFINE = requireIe8DomDefine();
+
+  	// eslint-disable-next-line es/no-object-getownpropertydescriptor -- safe
+  	var $getOwnPropertyDescriptor = Object.getOwnPropertyDescriptor;
+
+  	// `Object.getOwnPropertyDescriptor` method
+  	// https://tc39.es/ecma262/#sec-object.getownpropertydescriptor
+  	objectGetOwnPropertyDescriptor.f = DESCRIPTORS ? $getOwnPropertyDescriptor : function getOwnPropertyDescriptor(O, P) {
+  	  O = toIndexedObject(O);
+  	  P = toPropertyKey(P);
+  	  if (IE8_DOM_DEFINE) try {
+  	    return $getOwnPropertyDescriptor(O, P);
+  	  } catch (error) { /* empty */ }
+  	  if (hasOwn(O, P)) return createPropertyDescriptor(!call(propertyIsEnumerableModule.f, O, P), O[P]);
+  	};
+  	return objectGetOwnPropertyDescriptor;
+  }
 
   var objectDefineProperty = {};
 
-  var DESCRIPTORS$7 = descriptors;
-  var fails$8 = fails$e;
+  var v8PrototypeDefineBug;
+  var hasRequiredV8PrototypeDefineBug;
 
-  // V8 ~ Chrome 36-
-  // https://bugs.chromium.org/p/v8/issues/detail?id=3334
-  var v8PrototypeDefineBug = DESCRIPTORS$7 && fails$8(function () {
-    // eslint-disable-next-line es/no-object-defineproperty -- required for testing
-    return Object.defineProperty(function () { /* empty */ }, 'prototype', {
-      value: 42,
-      writable: false
-    }).prototype !== 42;
-  });
+  function requireV8PrototypeDefineBug () {
+  	if (hasRequiredV8PrototypeDefineBug) return v8PrototypeDefineBug;
+  	hasRequiredV8PrototypeDefineBug = 1;
+  	var DESCRIPTORS = requireDescriptors();
+  	var fails = requireFails();
 
-  var isObject$4 = isObject$8;
-
-  var $String$2 = String;
-  var $TypeError$3 = TypeError;
-
-  // `Assert: Type(argument) is Object`
-  var anObject$4 = function (argument) {
-    if (isObject$4(argument)) return argument;
-    throw new $TypeError$3($String$2(argument) + ' is not an object');
-  };
-
-  var DESCRIPTORS$6 = descriptors;
-  var IE8_DOM_DEFINE = ie8DomDefine;
-  var V8_PROTOTYPE_DEFINE_BUG$1 = v8PrototypeDefineBug;
-  var anObject$3 = anObject$4;
-  var toPropertyKey = toPropertyKey$2;
-
-  var $TypeError$2 = TypeError;
-  // eslint-disable-next-line es/no-object-defineproperty -- safe
-  var $defineProperty = Object.defineProperty;
-  // eslint-disable-next-line es/no-object-getownpropertydescriptor -- safe
-  var $getOwnPropertyDescriptor = Object.getOwnPropertyDescriptor;
-  var ENUMERABLE = 'enumerable';
-  var CONFIGURABLE$1 = 'configurable';
-  var WRITABLE = 'writable';
-
-  // `Object.defineProperty` method
-  // https://tc39.es/ecma262/#sec-object.defineproperty
-  objectDefineProperty.f = DESCRIPTORS$6 ? V8_PROTOTYPE_DEFINE_BUG$1 ? function defineProperty(O, P, Attributes) {
-    anObject$3(O);
-    P = toPropertyKey(P);
-    anObject$3(Attributes);
-    if (typeof O === 'function' && P === 'prototype' && 'value' in Attributes && WRITABLE in Attributes && !Attributes[WRITABLE]) {
-      var current = $getOwnPropertyDescriptor(O, P);
-      if (current && current[WRITABLE]) {
-        O[P] = Attributes.value;
-        Attributes = {
-          configurable: CONFIGURABLE$1 in Attributes ? Attributes[CONFIGURABLE$1] : current[CONFIGURABLE$1],
-          enumerable: ENUMERABLE in Attributes ? Attributes[ENUMERABLE] : current[ENUMERABLE],
-          writable: false
-        };
-      }
-    } return $defineProperty(O, P, Attributes);
-  } : $defineProperty : function defineProperty(O, P, Attributes) {
-    anObject$3(O);
-    P = toPropertyKey(P);
-    anObject$3(Attributes);
-    if (IE8_DOM_DEFINE) try {
-      return $defineProperty(O, P, Attributes);
-    } catch (error) { /* empty */ }
-    if ('get' in Attributes || 'set' in Attributes) throw new $TypeError$2('Accessors not supported');
-    if ('value' in Attributes) O[P] = Attributes.value;
-    return O;
-  };
-
-  var DESCRIPTORS$5 = descriptors;
-  var definePropertyModule$4 = objectDefineProperty;
-  var createPropertyDescriptor$1 = createPropertyDescriptor$3;
-
-  var createNonEnumerableProperty$3 = DESCRIPTORS$5 ? function (object, key, value) {
-    return definePropertyModule$4.f(object, key, createPropertyDescriptor$1(1, value));
-  } : function (object, key, value) {
-    object[key] = value;
-    return object;
-  };
-
-  var makeBuiltIn$2 = {exports: {}};
-
-  var DESCRIPTORS$4 = descriptors;
-  var hasOwn$4 = hasOwnProperty_1;
-
-  var FunctionPrototype = Function.prototype;
-  // eslint-disable-next-line es/no-object-getownpropertydescriptor -- safe
-  var getDescriptor = DESCRIPTORS$4 && Object.getOwnPropertyDescriptor;
-
-  var EXISTS = hasOwn$4(FunctionPrototype, 'name');
-  // additional protection from minified / mangled / dropped function names
-  var PROPER = EXISTS && (function something() { /* empty */ }).name === 'something';
-  var CONFIGURABLE = EXISTS && (!DESCRIPTORS$4 || (DESCRIPTORS$4 && getDescriptor(FunctionPrototype, 'name').configurable));
-
-  var functionName = {
-    EXISTS: EXISTS,
-    PROPER: PROPER,
-    CONFIGURABLE: CONFIGURABLE
-  };
-
-  var uncurryThis$9 = functionUncurryThis;
-  var isCallable$6 = isCallable$c;
-  var store$1 = sharedStoreExports;
-
-  var functionToString = uncurryThis$9(Function.toString);
-
-  // this helper broken in `core-js@3.4.1-3.4.4`, so we can't use `shared` helper
-  if (!isCallable$6(store$1.inspectSource)) {
-    store$1.inspectSource = function (it) {
-      return functionToString(it);
-    };
+  	// V8 ~ Chrome 36-
+  	// https://bugs.chromium.org/p/v8/issues/detail?id=3334
+  	v8PrototypeDefineBug = DESCRIPTORS && fails(function () {
+  	  // eslint-disable-next-line es/no-object-defineproperty -- required for testing
+  	  return Object.defineProperty(function () { /* empty */ }, 'prototype', {
+  	    value: 42,
+  	    writable: false
+  	  }).prototype !== 42;
+  	});
+  	return v8PrototypeDefineBug;
   }
 
-  var inspectSource$2 = store$1.inspectSource;
+  var anObject;
+  var hasRequiredAnObject;
 
-  var global$4 = global$b;
-  var isCallable$5 = isCallable$c;
+  function requireAnObject () {
+  	if (hasRequiredAnObject) return anObject;
+  	hasRequiredAnObject = 1;
+  	var isObject = requireIsObject();
 
-  var WeakMap$1 = global$4.WeakMap;
+  	var $String = String;
+  	var $TypeError = TypeError;
 
-  var weakMapBasicDetection = isCallable$5(WeakMap$1) && /native code/.test(String(WeakMap$1));
-
-  var shared$1 = shared$3;
-  var uid = uid$2;
-
-  var keys = shared$1('keys');
-
-  var sharedKey$2 = function (key) {
-    return keys[key] || (keys[key] = uid(key));
-  };
-
-  var hiddenKeys$4 = {};
-
-  var NATIVE_WEAK_MAP = weakMapBasicDetection;
-  var global$3 = global$b;
-  var isObject$3 = isObject$8;
-  var createNonEnumerableProperty$2 = createNonEnumerableProperty$3;
-  var hasOwn$3 = hasOwnProperty_1;
-  var shared = sharedStoreExports;
-  var sharedKey$1 = sharedKey$2;
-  var hiddenKeys$3 = hiddenKeys$4;
-
-  var OBJECT_ALREADY_INITIALIZED = 'Object already initialized';
-  var TypeError$1 = global$3.TypeError;
-  var WeakMap = global$3.WeakMap;
-  var set, get, has;
-
-  var enforce = function (it) {
-    return has(it) ? get(it) : set(it, {});
-  };
-
-  var getterFor = function (TYPE) {
-    return function (it) {
-      var state;
-      if (!isObject$3(it) || (state = get(it)).type !== TYPE) {
-        throw new TypeError$1('Incompatible receiver, ' + TYPE + ' required');
-      } return state;
-    };
-  };
-
-  if (NATIVE_WEAK_MAP || shared.state) {
-    var store = shared.state || (shared.state = new WeakMap());
-    /* eslint-disable no-self-assign -- prototype methods protection */
-    store.get = store.get;
-    store.has = store.has;
-    store.set = store.set;
-    /* eslint-enable no-self-assign -- prototype methods protection */
-    set = function (it, metadata) {
-      if (store.has(it)) throw new TypeError$1(OBJECT_ALREADY_INITIALIZED);
-      metadata.facade = it;
-      store.set(it, metadata);
-      return metadata;
-    };
-    get = function (it) {
-      return store.get(it) || {};
-    };
-    has = function (it) {
-      return store.has(it);
-    };
-  } else {
-    var STATE = sharedKey$1('state');
-    hiddenKeys$3[STATE] = true;
-    set = function (it, metadata) {
-      if (hasOwn$3(it, STATE)) throw new TypeError$1(OBJECT_ALREADY_INITIALIZED);
-      metadata.facade = it;
-      createNonEnumerableProperty$2(it, STATE, metadata);
-      return metadata;
-    };
-    get = function (it) {
-      return hasOwn$3(it, STATE) ? it[STATE] : {};
-    };
-    has = function (it) {
-      return hasOwn$3(it, STATE);
-    };
+  	// `Assert: Type(argument) is Object`
+  	anObject = function (argument) {
+  	  if (isObject(argument)) return argument;
+  	  throw new $TypeError($String(argument) + ' is not an object');
+  	};
+  	return anObject;
   }
 
-  var internalState = {
-    set: set,
-    get: get,
-    has: has,
-    enforce: enforce,
-    getterFor: getterFor
-  };
+  var hasRequiredObjectDefineProperty;
 
-  var uncurryThis$8 = functionUncurryThis;
-  var fails$7 = fails$e;
-  var isCallable$4 = isCallable$c;
-  var hasOwn$2 = hasOwnProperty_1;
-  var DESCRIPTORS$3 = descriptors;
-  var CONFIGURABLE_FUNCTION_NAME = functionName.CONFIGURABLE;
-  var inspectSource$1 = inspectSource$2;
-  var InternalStateModule = internalState;
+  function requireObjectDefineProperty () {
+  	if (hasRequiredObjectDefineProperty) return objectDefineProperty;
+  	hasRequiredObjectDefineProperty = 1;
+  	var DESCRIPTORS = requireDescriptors();
+  	var IE8_DOM_DEFINE = requireIe8DomDefine();
+  	var V8_PROTOTYPE_DEFINE_BUG = requireV8PrototypeDefineBug();
+  	var anObject = requireAnObject();
+  	var toPropertyKey = requireToPropertyKey();
 
-  var enforceInternalState = InternalStateModule.enforce;
-  var getInternalState = InternalStateModule.get;
-  var $String$1 = String;
-  // eslint-disable-next-line es/no-object-defineproperty -- safe
-  var defineProperty$2 = Object.defineProperty;
-  var stringSlice = uncurryThis$8(''.slice);
-  var replace = uncurryThis$8(''.replace);
-  var join = uncurryThis$8([].join);
+  	var $TypeError = TypeError;
+  	// eslint-disable-next-line es/no-object-defineproperty -- safe
+  	var $defineProperty = Object.defineProperty;
+  	// eslint-disable-next-line es/no-object-getownpropertydescriptor -- safe
+  	var $getOwnPropertyDescriptor = Object.getOwnPropertyDescriptor;
+  	var ENUMERABLE = 'enumerable';
+  	var CONFIGURABLE = 'configurable';
+  	var WRITABLE = 'writable';
 
-  var CONFIGURABLE_LENGTH = DESCRIPTORS$3 && !fails$7(function () {
-    return defineProperty$2(function () { /* empty */ }, 'length', { value: 8 }).length !== 8;
-  });
+  	// `Object.defineProperty` method
+  	// https://tc39.es/ecma262/#sec-object.defineproperty
+  	objectDefineProperty.f = DESCRIPTORS ? V8_PROTOTYPE_DEFINE_BUG ? function defineProperty(O, P, Attributes) {
+  	  anObject(O);
+  	  P = toPropertyKey(P);
+  	  anObject(Attributes);
+  	  if (typeof O === 'function' && P === 'prototype' && 'value' in Attributes && WRITABLE in Attributes && !Attributes[WRITABLE]) {
+  	    var current = $getOwnPropertyDescriptor(O, P);
+  	    if (current && current[WRITABLE]) {
+  	      O[P] = Attributes.value;
+  	      Attributes = {
+  	        configurable: CONFIGURABLE in Attributes ? Attributes[CONFIGURABLE] : current[CONFIGURABLE],
+  	        enumerable: ENUMERABLE in Attributes ? Attributes[ENUMERABLE] : current[ENUMERABLE],
+  	        writable: false
+  	      };
+  	    }
+  	  } return $defineProperty(O, P, Attributes);
+  	} : $defineProperty : function defineProperty(O, P, Attributes) {
+  	  anObject(O);
+  	  P = toPropertyKey(P);
+  	  anObject(Attributes);
+  	  if (IE8_DOM_DEFINE) try {
+  	    return $defineProperty(O, P, Attributes);
+  	  } catch (error) { /* empty */ }
+  	  if ('get' in Attributes || 'set' in Attributes) throw new $TypeError('Accessors not supported');
+  	  if ('value' in Attributes) O[P] = Attributes.value;
+  	  return O;
+  	};
+  	return objectDefineProperty;
+  }
 
-  var TEMPLATE = String(String).split('String');
+  var createNonEnumerableProperty;
+  var hasRequiredCreateNonEnumerableProperty;
 
-  var makeBuiltIn$1 = makeBuiltIn$2.exports = function (value, name, options) {
-    if (stringSlice($String$1(name), 0, 7) === 'Symbol(') {
-      name = '[' + replace($String$1(name), /^Symbol\(([^)]*)\).*$/, '$1') + ']';
-    }
-    if (options && options.getter) name = 'get ' + name;
-    if (options && options.setter) name = 'set ' + name;
-    if (!hasOwn$2(value, 'name') || (CONFIGURABLE_FUNCTION_NAME && value.name !== name)) {
-      if (DESCRIPTORS$3) defineProperty$2(value, 'name', { value: name, configurable: true });
-      else value.name = name;
-    }
-    if (CONFIGURABLE_LENGTH && options && hasOwn$2(options, 'arity') && value.length !== options.arity) {
-      defineProperty$2(value, 'length', { value: options.arity });
-    }
-    try {
-      if (options && hasOwn$2(options, 'constructor') && options.constructor) {
-        if (DESCRIPTORS$3) defineProperty$2(value, 'prototype', { writable: false });
-      // in V8 ~ Chrome 53, prototypes of some methods, like `Array.prototype.values`, are non-writable
-      } else if (value.prototype) value.prototype = undefined;
-    } catch (error) { /* empty */ }
-    var state = enforceInternalState(value);
-    if (!hasOwn$2(state, 'source')) {
-      state.source = join(TEMPLATE, typeof name == 'string' ? name : '');
-    } return value;
-  };
+  function requireCreateNonEnumerableProperty () {
+  	if (hasRequiredCreateNonEnumerableProperty) return createNonEnumerableProperty;
+  	hasRequiredCreateNonEnumerableProperty = 1;
+  	var DESCRIPTORS = requireDescriptors();
+  	var definePropertyModule = requireObjectDefineProperty();
+  	var createPropertyDescriptor = requireCreatePropertyDescriptor();
 
-  // add fake Function#toString for correct work wrapped methods / constructors with methods like LoDash isNative
-  // eslint-disable-next-line no-extend-native -- required
-  Function.prototype.toString = makeBuiltIn$1(function toString() {
-    return isCallable$4(this) && getInternalState(this).source || inspectSource$1(this);
-  }, 'toString');
+  	createNonEnumerableProperty = DESCRIPTORS ? function (object, key, value) {
+  	  return definePropertyModule.f(object, key, createPropertyDescriptor(1, value));
+  	} : function (object, key, value) {
+  	  object[key] = value;
+  	  return object;
+  	};
+  	return createNonEnumerableProperty;
+  }
 
-  var makeBuiltInExports = makeBuiltIn$2.exports;
+  var makeBuiltIn = {exports: {}};
 
-  var isCallable$3 = isCallable$c;
-  var definePropertyModule$3 = objectDefineProperty;
-  var makeBuiltIn = makeBuiltInExports;
-  var defineGlobalProperty$1 = defineGlobalProperty$3;
+  var functionName;
+  var hasRequiredFunctionName;
 
-  var defineBuiltIn$2 = function (O, key, value, options) {
-    if (!options) options = {};
-    var simple = options.enumerable;
-    var name = options.name !== undefined ? options.name : key;
-    if (isCallable$3(value)) makeBuiltIn(value, name, options);
-    if (options.global) {
-      if (simple) O[key] = value;
-      else defineGlobalProperty$1(key, value);
-    } else {
-      try {
-        if (!options.unsafe) delete O[key];
-        else if (O[key]) simple = true;
-      } catch (error) { /* empty */ }
-      if (simple) O[key] = value;
-      else definePropertyModule$3.f(O, key, {
-        value: value,
-        enumerable: false,
-        configurable: !options.nonConfigurable,
-        writable: !options.nonWritable
-      });
-    } return O;
-  };
+  function requireFunctionName () {
+  	if (hasRequiredFunctionName) return functionName;
+  	hasRequiredFunctionName = 1;
+  	var DESCRIPTORS = requireDescriptors();
+  	var hasOwn = requireHasOwnProperty();
+
+  	var FunctionPrototype = Function.prototype;
+  	// eslint-disable-next-line es/no-object-getownpropertydescriptor -- safe
+  	var getDescriptor = DESCRIPTORS && Object.getOwnPropertyDescriptor;
+
+  	var EXISTS = hasOwn(FunctionPrototype, 'name');
+  	// additional protection from minified / mangled / dropped function names
+  	var PROPER = EXISTS && (function something() { /* empty */ }).name === 'something';
+  	var CONFIGURABLE = EXISTS && (!DESCRIPTORS || (DESCRIPTORS && getDescriptor(FunctionPrototype, 'name').configurable));
+
+  	functionName = {
+  	  EXISTS: EXISTS,
+  	  PROPER: PROPER,
+  	  CONFIGURABLE: CONFIGURABLE
+  	};
+  	return functionName;
+  }
+
+  var inspectSource;
+  var hasRequiredInspectSource;
+
+  function requireInspectSource () {
+  	if (hasRequiredInspectSource) return inspectSource;
+  	hasRequiredInspectSource = 1;
+  	var uncurryThis = requireFunctionUncurryThis();
+  	var isCallable = requireIsCallable();
+  	var store = requireSharedStore();
+
+  	var functionToString = uncurryThis(Function.toString);
+
+  	// this helper broken in `core-js@3.4.1-3.4.4`, so we can't use `shared` helper
+  	if (!isCallable(store.inspectSource)) {
+  	  store.inspectSource = function (it) {
+  	    return functionToString(it);
+  	  };
+  	}
+
+  	inspectSource = store.inspectSource;
+  	return inspectSource;
+  }
+
+  var weakMapBasicDetection;
+  var hasRequiredWeakMapBasicDetection;
+
+  function requireWeakMapBasicDetection () {
+  	if (hasRequiredWeakMapBasicDetection) return weakMapBasicDetection;
+  	hasRequiredWeakMapBasicDetection = 1;
+  	var globalThis = requireGlobalThis();
+  	var isCallable = requireIsCallable();
+
+  	var WeakMap = globalThis.WeakMap;
+
+  	weakMapBasicDetection = isCallable(WeakMap) && /native code/.test(String(WeakMap));
+  	return weakMapBasicDetection;
+  }
+
+  var sharedKey;
+  var hasRequiredSharedKey;
+
+  function requireSharedKey () {
+  	if (hasRequiredSharedKey) return sharedKey;
+  	hasRequiredSharedKey = 1;
+  	var shared = requireShared();
+  	var uid = requireUid();
+
+  	var keys = shared('keys');
+
+  	sharedKey = function (key) {
+  	  return keys[key] || (keys[key] = uid(key));
+  	};
+  	return sharedKey;
+  }
+
+  var hiddenKeys;
+  var hasRequiredHiddenKeys;
+
+  function requireHiddenKeys () {
+  	if (hasRequiredHiddenKeys) return hiddenKeys;
+  	hasRequiredHiddenKeys = 1;
+  	hiddenKeys = {};
+  	return hiddenKeys;
+  }
+
+  var internalState;
+  var hasRequiredInternalState;
+
+  function requireInternalState () {
+  	if (hasRequiredInternalState) return internalState;
+  	hasRequiredInternalState = 1;
+  	var NATIVE_WEAK_MAP = requireWeakMapBasicDetection();
+  	var globalThis = requireGlobalThis();
+  	var isObject = requireIsObject();
+  	var createNonEnumerableProperty = requireCreateNonEnumerableProperty();
+  	var hasOwn = requireHasOwnProperty();
+  	var shared = requireSharedStore();
+  	var sharedKey = requireSharedKey();
+  	var hiddenKeys = requireHiddenKeys();
+
+  	var OBJECT_ALREADY_INITIALIZED = 'Object already initialized';
+  	var TypeError = globalThis.TypeError;
+  	var WeakMap = globalThis.WeakMap;
+  	var set, get, has;
+
+  	var enforce = function (it) {
+  	  return has(it) ? get(it) : set(it, {});
+  	};
+
+  	var getterFor = function (TYPE) {
+  	  return function (it) {
+  	    var state;
+  	    if (!isObject(it) || (state = get(it)).type !== TYPE) {
+  	      throw new TypeError('Incompatible receiver, ' + TYPE + ' required');
+  	    } return state;
+  	  };
+  	};
+
+  	if (NATIVE_WEAK_MAP || shared.state) {
+  	  var store = shared.state || (shared.state = new WeakMap());
+  	  /* eslint-disable no-self-assign -- prototype methods protection */
+  	  store.get = store.get;
+  	  store.has = store.has;
+  	  store.set = store.set;
+  	  /* eslint-enable no-self-assign -- prototype methods protection */
+  	  set = function (it, metadata) {
+  	    if (store.has(it)) throw new TypeError(OBJECT_ALREADY_INITIALIZED);
+  	    metadata.facade = it;
+  	    store.set(it, metadata);
+  	    return metadata;
+  	  };
+  	  get = function (it) {
+  	    return store.get(it) || {};
+  	  };
+  	  has = function (it) {
+  	    return store.has(it);
+  	  };
+  	} else {
+  	  var STATE = sharedKey('state');
+  	  hiddenKeys[STATE] = true;
+  	  set = function (it, metadata) {
+  	    if (hasOwn(it, STATE)) throw new TypeError(OBJECT_ALREADY_INITIALIZED);
+  	    metadata.facade = it;
+  	    createNonEnumerableProperty(it, STATE, metadata);
+  	    return metadata;
+  	  };
+  	  get = function (it) {
+  	    return hasOwn(it, STATE) ? it[STATE] : {};
+  	  };
+  	  has = function (it) {
+  	    return hasOwn(it, STATE);
+  	  };
+  	}
+
+  	internalState = {
+  	  set: set,
+  	  get: get,
+  	  has: has,
+  	  enforce: enforce,
+  	  getterFor: getterFor
+  	};
+  	return internalState;
+  }
+
+  var hasRequiredMakeBuiltIn;
+
+  function requireMakeBuiltIn () {
+  	if (hasRequiredMakeBuiltIn) return makeBuiltIn.exports;
+  	hasRequiredMakeBuiltIn = 1;
+  	var uncurryThis = requireFunctionUncurryThis();
+  	var fails = requireFails();
+  	var isCallable = requireIsCallable();
+  	var hasOwn = requireHasOwnProperty();
+  	var DESCRIPTORS = requireDescriptors();
+  	var CONFIGURABLE_FUNCTION_NAME = requireFunctionName().CONFIGURABLE;
+  	var inspectSource = requireInspectSource();
+  	var InternalStateModule = requireInternalState();
+
+  	var enforceInternalState = InternalStateModule.enforce;
+  	var getInternalState = InternalStateModule.get;
+  	var $String = String;
+  	// eslint-disable-next-line es/no-object-defineproperty -- safe
+  	var defineProperty = Object.defineProperty;
+  	var stringSlice = uncurryThis(''.slice);
+  	var replace = uncurryThis(''.replace);
+  	var join = uncurryThis([].join);
+
+  	var CONFIGURABLE_LENGTH = DESCRIPTORS && !fails(function () {
+  	  return defineProperty(function () { /* empty */ }, 'length', { value: 8 }).length !== 8;
+  	});
+
+  	var TEMPLATE = String(String).split('String');
+
+  	var makeBuiltIn$1 = makeBuiltIn.exports = function (value, name, options) {
+  	  if (stringSlice($String(name), 0, 7) === 'Symbol(') {
+  	    name = '[' + replace($String(name), /^Symbol\(([^)]*)\).*$/, '$1') + ']';
+  	  }
+  	  if (options && options.getter) name = 'get ' + name;
+  	  if (options && options.setter) name = 'set ' + name;
+  	  if (!hasOwn(value, 'name') || (CONFIGURABLE_FUNCTION_NAME && value.name !== name)) {
+  	    if (DESCRIPTORS) defineProperty(value, 'name', { value: name, configurable: true });
+  	    else value.name = name;
+  	  }
+  	  if (CONFIGURABLE_LENGTH && options && hasOwn(options, 'arity') && value.length !== options.arity) {
+  	    defineProperty(value, 'length', { value: options.arity });
+  	  }
+  	  try {
+  	    if (options && hasOwn(options, 'constructor') && options.constructor) {
+  	      if (DESCRIPTORS) defineProperty(value, 'prototype', { writable: false });
+  	    // in V8 ~ Chrome 53, prototypes of some methods, like `Array.prototype.values`, are non-writable
+  	    } else if (value.prototype) value.prototype = undefined;
+  	  } catch (error) { /* empty */ }
+  	  var state = enforceInternalState(value);
+  	  if (!hasOwn(state, 'source')) {
+  	    state.source = join(TEMPLATE, typeof name == 'string' ? name : '');
+  	  } return value;
+  	};
+
+  	// add fake Function#toString for correct work wrapped methods / constructors with methods like LoDash isNative
+  	// eslint-disable-next-line no-extend-native -- required
+  	Function.prototype.toString = makeBuiltIn$1(function toString() {
+  	  return isCallable(this) && getInternalState(this).source || inspectSource(this);
+  	}, 'toString');
+  	return makeBuiltIn.exports;
+  }
+
+  var defineBuiltIn;
+  var hasRequiredDefineBuiltIn;
+
+  function requireDefineBuiltIn () {
+  	if (hasRequiredDefineBuiltIn) return defineBuiltIn;
+  	hasRequiredDefineBuiltIn = 1;
+  	var isCallable = requireIsCallable();
+  	var definePropertyModule = requireObjectDefineProperty();
+  	var makeBuiltIn = requireMakeBuiltIn();
+  	var defineGlobalProperty = requireDefineGlobalProperty();
+
+  	defineBuiltIn = function (O, key, value, options) {
+  	  if (!options) options = {};
+  	  var simple = options.enumerable;
+  	  var name = options.name !== undefined ? options.name : key;
+  	  if (isCallable(value)) makeBuiltIn(value, name, options);
+  	  if (options.global) {
+  	    if (simple) O[key] = value;
+  	    else defineGlobalProperty(key, value);
+  	  } else {
+  	    try {
+  	      if (!options.unsafe) delete O[key];
+  	      else if (O[key]) simple = true;
+  	    } catch (error) { /* empty */ }
+  	    if (simple) O[key] = value;
+  	    else definePropertyModule.f(O, key, {
+  	      value: value,
+  	      enumerable: false,
+  	      configurable: !options.nonConfigurable,
+  	      writable: !options.nonWritable
+  	    });
+  	  } return O;
+  	};
+  	return defineBuiltIn;
+  }
 
   var objectGetOwnPropertyNames = {};
 
-  var ceil = Math.ceil;
-  var floor = Math.floor;
+  var mathTrunc;
+  var hasRequiredMathTrunc;
 
-  // `Math.trunc` method
-  // https://tc39.es/ecma262/#sec-math.trunc
-  // eslint-disable-next-line es/no-math-trunc -- safe
-  var mathTrunc = Math.trunc || function trunc(x) {
-    var n = +x;
-    return (n > 0 ? floor : ceil)(n);
-  };
+  function requireMathTrunc () {
+  	if (hasRequiredMathTrunc) return mathTrunc;
+  	hasRequiredMathTrunc = 1;
+  	var ceil = Math.ceil;
+  	var floor = Math.floor;
 
-  var trunc = mathTrunc;
+  	// `Math.trunc` method
+  	// https://tc39.es/ecma262/#sec-math.trunc
+  	// eslint-disable-next-line es/no-math-trunc -- safe
+  	mathTrunc = Math.trunc || function trunc(x) {
+  	  var n = +x;
+  	  return (n > 0 ? floor : ceil)(n);
+  	};
+  	return mathTrunc;
+  }
 
-  // `ToIntegerOrInfinity` abstract operation
-  // https://tc39.es/ecma262/#sec-tointegerorinfinity
-  var toIntegerOrInfinity$2 = function (argument) {
-    var number = +argument;
-    // eslint-disable-next-line no-self-compare -- NaN check
-    return number !== number || number === 0 ? 0 : trunc(number);
-  };
+  var toIntegerOrInfinity;
+  var hasRequiredToIntegerOrInfinity;
 
-  var toIntegerOrInfinity$1 = toIntegerOrInfinity$2;
+  function requireToIntegerOrInfinity () {
+  	if (hasRequiredToIntegerOrInfinity) return toIntegerOrInfinity;
+  	hasRequiredToIntegerOrInfinity = 1;
+  	var trunc = requireMathTrunc();
 
-  var max = Math.max;
-  var min$1 = Math.min;
+  	// `ToIntegerOrInfinity` abstract operation
+  	// https://tc39.es/ecma262/#sec-tointegerorinfinity
+  	toIntegerOrInfinity = function (argument) {
+  	  var number = +argument;
+  	  // eslint-disable-next-line no-self-compare -- NaN check
+  	  return number !== number || number === 0 ? 0 : trunc(number);
+  	};
+  	return toIntegerOrInfinity;
+  }
 
-  // Helper for a popular repeating case of the spec:
-  // Let integer be ? ToInteger(index).
-  // If integer < 0, let result be max((length + integer), 0); else let result be min(integer, length).
-  var toAbsoluteIndex$1 = function (index, length) {
-    var integer = toIntegerOrInfinity$1(index);
-    return integer < 0 ? max(integer + length, 0) : min$1(integer, length);
-  };
+  var toAbsoluteIndex;
+  var hasRequiredToAbsoluteIndex;
 
-  var toIntegerOrInfinity = toIntegerOrInfinity$2;
+  function requireToAbsoluteIndex () {
+  	if (hasRequiredToAbsoluteIndex) return toAbsoluteIndex;
+  	hasRequiredToAbsoluteIndex = 1;
+  	var toIntegerOrInfinity = requireToIntegerOrInfinity();
 
-  var min = Math.min;
+  	var max = Math.max;
+  	var min = Math.min;
 
-  // `ToLength` abstract operation
-  // https://tc39.es/ecma262/#sec-tolength
-  var toLength$1 = function (argument) {
-    var len = toIntegerOrInfinity(argument);
-    return len > 0 ? min(len, 0x1FFFFFFFFFFFFF) : 0; // 2 ** 53 - 1 == 9007199254740991
-  };
+  	// Helper for a popular repeating case of the spec:
+  	// Let integer be ? ToInteger(index).
+  	// If integer < 0, let result be max((length + integer), 0); else let result be min(integer, length).
+  	toAbsoluteIndex = function (index, length) {
+  	  var integer = toIntegerOrInfinity(index);
+  	  return integer < 0 ? max(integer + length, 0) : min(integer, length);
+  	};
+  	return toAbsoluteIndex;
+  }
 
-  var toLength = toLength$1;
+  var toLength;
+  var hasRequiredToLength;
 
-  // `LengthOfArrayLike` abstract operation
-  // https://tc39.es/ecma262/#sec-lengthofarraylike
-  var lengthOfArrayLike$3 = function (obj) {
-    return toLength(obj.length);
-  };
+  function requireToLength () {
+  	if (hasRequiredToLength) return toLength;
+  	hasRequiredToLength = 1;
+  	var toIntegerOrInfinity = requireToIntegerOrInfinity();
 
-  var toIndexedObject$2 = toIndexedObject$4;
-  var toAbsoluteIndex = toAbsoluteIndex$1;
-  var lengthOfArrayLike$2 = lengthOfArrayLike$3;
+  	var min = Math.min;
 
-  // `Array.prototype.{ indexOf, includes }` methods implementation
-  var createMethod$1 = function (IS_INCLUDES) {
-    return function ($this, el, fromIndex) {
-      var O = toIndexedObject$2($this);
-      var length = lengthOfArrayLike$2(O);
-      if (length === 0) return !IS_INCLUDES && -1;
-      var index = toAbsoluteIndex(fromIndex, length);
-      var value;
-      // Array#includes uses SameValueZero equality algorithm
-      // eslint-disable-next-line no-self-compare -- NaN check
-      if (IS_INCLUDES && el !== el) while (length > index) {
-        value = O[index++];
-        // eslint-disable-next-line no-self-compare -- NaN check
-        if (value !== value) return true;
-      // Array#indexOf ignores holes, Array#includes - not
-      } else for (;length > index; index++) {
-        if ((IS_INCLUDES || index in O) && O[index] === el) return IS_INCLUDES || index || 0;
-      } return !IS_INCLUDES && -1;
-    };
-  };
+  	// `ToLength` abstract operation
+  	// https://tc39.es/ecma262/#sec-tolength
+  	toLength = function (argument) {
+  	  var len = toIntegerOrInfinity(argument);
+  	  return len > 0 ? min(len, 0x1FFFFFFFFFFFFF) : 0; // 2 ** 53 - 1 == 9007199254740991
+  	};
+  	return toLength;
+  }
 
-  var arrayIncludes = {
-    // `Array.prototype.includes` method
-    // https://tc39.es/ecma262/#sec-array.prototype.includes
-    includes: createMethod$1(true),
-    // `Array.prototype.indexOf` method
-    // https://tc39.es/ecma262/#sec-array.prototype.indexof
-    indexOf: createMethod$1(false)
-  };
+  var lengthOfArrayLike;
+  var hasRequiredLengthOfArrayLike;
 
-  var uncurryThis$7 = functionUncurryThis;
-  var hasOwn$1 = hasOwnProperty_1;
-  var toIndexedObject$1 = toIndexedObject$4;
-  var indexOf = arrayIncludes.indexOf;
-  var hiddenKeys$2 = hiddenKeys$4;
+  function requireLengthOfArrayLike () {
+  	if (hasRequiredLengthOfArrayLike) return lengthOfArrayLike;
+  	hasRequiredLengthOfArrayLike = 1;
+  	var toLength = requireToLength();
 
-  var push$1 = uncurryThis$7([].push);
+  	// `LengthOfArrayLike` abstract operation
+  	// https://tc39.es/ecma262/#sec-lengthofarraylike
+  	lengthOfArrayLike = function (obj) {
+  	  return toLength(obj.length);
+  	};
+  	return lengthOfArrayLike;
+  }
 
-  var objectKeysInternal = function (object, names) {
-    var O = toIndexedObject$1(object);
-    var i = 0;
-    var result = [];
-    var key;
-    for (key in O) !hasOwn$1(hiddenKeys$2, key) && hasOwn$1(O, key) && push$1(result, key);
-    // Don't enum bug & hidden keys
-    while (names.length > i) if (hasOwn$1(O, key = names[i++])) {
-      ~indexOf(result, key) || push$1(result, key);
-    }
-    return result;
-  };
+  var arrayIncludes;
+  var hasRequiredArrayIncludes;
 
-  // IE8- don't enum bug keys
-  var enumBugKeys$3 = [
-    'constructor',
-    'hasOwnProperty',
-    'isPrototypeOf',
-    'propertyIsEnumerable',
-    'toLocaleString',
-    'toString',
-    'valueOf'
-  ];
+  function requireArrayIncludes () {
+  	if (hasRequiredArrayIncludes) return arrayIncludes;
+  	hasRequiredArrayIncludes = 1;
+  	var toIndexedObject = requireToIndexedObject();
+  	var toAbsoluteIndex = requireToAbsoluteIndex();
+  	var lengthOfArrayLike = requireLengthOfArrayLike();
 
-  var internalObjectKeys$1 = objectKeysInternal;
-  var enumBugKeys$2 = enumBugKeys$3;
+  	// `Array.prototype.{ indexOf, includes }` methods implementation
+  	var createMethod = function (IS_INCLUDES) {
+  	  return function ($this, el, fromIndex) {
+  	    var O = toIndexedObject($this);
+  	    var length = lengthOfArrayLike(O);
+  	    if (length === 0) return !IS_INCLUDES && -1;
+  	    var index = toAbsoluteIndex(fromIndex, length);
+  	    var value;
+  	    // Array#includes uses SameValueZero equality algorithm
+  	    // eslint-disable-next-line no-self-compare -- NaN check
+  	    if (IS_INCLUDES && el !== el) while (length > index) {
+  	      value = O[index++];
+  	      // eslint-disable-next-line no-self-compare -- NaN check
+  	      if (value !== value) return true;
+  	    // Array#indexOf ignores holes, Array#includes - not
+  	    } else for (;length > index; index++) {
+  	      if ((IS_INCLUDES || index in O) && O[index] === el) return IS_INCLUDES || index || 0;
+  	    } return !IS_INCLUDES && -1;
+  	  };
+  	};
 
-  var hiddenKeys$1 = enumBugKeys$2.concat('length', 'prototype');
+  	arrayIncludes = {
+  	  // `Array.prototype.includes` method
+  	  // https://tc39.es/ecma262/#sec-array.prototype.includes
+  	  includes: createMethod(true),
+  	  // `Array.prototype.indexOf` method
+  	  // https://tc39.es/ecma262/#sec-array.prototype.indexof
+  	  indexOf: createMethod(false)
+  	};
+  	return arrayIncludes;
+  }
 
-  // `Object.getOwnPropertyNames` method
-  // https://tc39.es/ecma262/#sec-object.getownpropertynames
-  // eslint-disable-next-line es/no-object-getownpropertynames -- safe
-  objectGetOwnPropertyNames.f = Object.getOwnPropertyNames || function getOwnPropertyNames(O) {
-    return internalObjectKeys$1(O, hiddenKeys$1);
-  };
+  var objectKeysInternal;
+  var hasRequiredObjectKeysInternal;
+
+  function requireObjectKeysInternal () {
+  	if (hasRequiredObjectKeysInternal) return objectKeysInternal;
+  	hasRequiredObjectKeysInternal = 1;
+  	var uncurryThis = requireFunctionUncurryThis();
+  	var hasOwn = requireHasOwnProperty();
+  	var toIndexedObject = requireToIndexedObject();
+  	var indexOf = requireArrayIncludes().indexOf;
+  	var hiddenKeys = requireHiddenKeys();
+
+  	var push = uncurryThis([].push);
+
+  	objectKeysInternal = function (object, names) {
+  	  var O = toIndexedObject(object);
+  	  var i = 0;
+  	  var result = [];
+  	  var key;
+  	  for (key in O) !hasOwn(hiddenKeys, key) && hasOwn(O, key) && push(result, key);
+  	  // Don't enum bug & hidden keys
+  	  while (names.length > i) if (hasOwn(O, key = names[i++])) {
+  	    ~indexOf(result, key) || push(result, key);
+  	  }
+  	  return result;
+  	};
+  	return objectKeysInternal;
+  }
+
+  var enumBugKeys;
+  var hasRequiredEnumBugKeys;
+
+  function requireEnumBugKeys () {
+  	if (hasRequiredEnumBugKeys) return enumBugKeys;
+  	hasRequiredEnumBugKeys = 1;
+  	// IE8- don't enum bug keys
+  	enumBugKeys = [
+  	  'constructor',
+  	  'hasOwnProperty',
+  	  'isPrototypeOf',
+  	  'propertyIsEnumerable',
+  	  'toLocaleString',
+  	  'toString',
+  	  'valueOf'
+  	];
+  	return enumBugKeys;
+  }
+
+  var hasRequiredObjectGetOwnPropertyNames;
+
+  function requireObjectGetOwnPropertyNames () {
+  	if (hasRequiredObjectGetOwnPropertyNames) return objectGetOwnPropertyNames;
+  	hasRequiredObjectGetOwnPropertyNames = 1;
+  	var internalObjectKeys = requireObjectKeysInternal();
+  	var enumBugKeys = requireEnumBugKeys();
+
+  	var hiddenKeys = enumBugKeys.concat('length', 'prototype');
+
+  	// `Object.getOwnPropertyNames` method
+  	// https://tc39.es/ecma262/#sec-object.getownpropertynames
+  	// eslint-disable-next-line es/no-object-getownpropertynames -- safe
+  	objectGetOwnPropertyNames.f = Object.getOwnPropertyNames || function getOwnPropertyNames(O) {
+  	  return internalObjectKeys(O, hiddenKeys);
+  	};
+  	return objectGetOwnPropertyNames;
+  }
 
   var objectGetOwnPropertySymbols = {};
 
-  // eslint-disable-next-line es/no-object-getownpropertysymbols -- safe
-  objectGetOwnPropertySymbols.f = Object.getOwnPropertySymbols;
+  var hasRequiredObjectGetOwnPropertySymbols;
 
-  var getBuiltIn$2 = getBuiltIn$4;
-  var uncurryThis$6 = functionUncurryThis;
-  var getOwnPropertyNamesModule = objectGetOwnPropertyNames;
-  var getOwnPropertySymbolsModule$1 = objectGetOwnPropertySymbols;
-  var anObject$2 = anObject$4;
+  function requireObjectGetOwnPropertySymbols () {
+  	if (hasRequiredObjectGetOwnPropertySymbols) return objectGetOwnPropertySymbols;
+  	hasRequiredObjectGetOwnPropertySymbols = 1;
+  	// eslint-disable-next-line es/no-object-getownpropertysymbols -- safe
+  	objectGetOwnPropertySymbols.f = Object.getOwnPropertySymbols;
+  	return objectGetOwnPropertySymbols;
+  }
 
-  var concat$1 = uncurryThis$6([].concat);
+  var ownKeys;
+  var hasRequiredOwnKeys;
 
-  // all object keys, includes non-enumerable and symbols
-  var ownKeys$1 = getBuiltIn$2('Reflect', 'ownKeys') || function ownKeys(it) {
-    var keys = getOwnPropertyNamesModule.f(anObject$2(it));
-    var getOwnPropertySymbols = getOwnPropertySymbolsModule$1.f;
-    return getOwnPropertySymbols ? concat$1(keys, getOwnPropertySymbols(it)) : keys;
-  };
+  function requireOwnKeys () {
+  	if (hasRequiredOwnKeys) return ownKeys;
+  	hasRequiredOwnKeys = 1;
+  	var getBuiltIn = requireGetBuiltIn();
+  	var uncurryThis = requireFunctionUncurryThis();
+  	var getOwnPropertyNamesModule = requireObjectGetOwnPropertyNames();
+  	var getOwnPropertySymbolsModule = requireObjectGetOwnPropertySymbols();
+  	var anObject = requireAnObject();
 
-  var hasOwn = hasOwnProperty_1;
-  var ownKeys = ownKeys$1;
-  var getOwnPropertyDescriptorModule = objectGetOwnPropertyDescriptor;
-  var definePropertyModule$2 = objectDefineProperty;
+  	var concat = uncurryThis([].concat);
 
-  var copyConstructorProperties$1 = function (target, source, exceptions) {
-    var keys = ownKeys(source);
-    var defineProperty = definePropertyModule$2.f;
-    var getOwnPropertyDescriptor = getOwnPropertyDescriptorModule.f;
-    for (var i = 0; i < keys.length; i++) {
-      var key = keys[i];
-      if (!hasOwn(target, key) && !(exceptions && hasOwn(exceptions, key))) {
-        defineProperty(target, key, getOwnPropertyDescriptor(source, key));
-      }
-    }
-  };
+  	// all object keys, includes non-enumerable and symbols
+  	ownKeys = getBuiltIn('Reflect', 'ownKeys') || function ownKeys(it) {
+  	  var keys = getOwnPropertyNamesModule.f(anObject(it));
+  	  var getOwnPropertySymbols = getOwnPropertySymbolsModule.f;
+  	  return getOwnPropertySymbols ? concat(keys, getOwnPropertySymbols(it)) : keys;
+  	};
+  	return ownKeys;
+  }
 
-  var fails$6 = fails$e;
-  var isCallable$2 = isCallable$c;
+  var copyConstructorProperties;
+  var hasRequiredCopyConstructorProperties;
 
-  var replacement = /#|\.prototype\./;
+  function requireCopyConstructorProperties () {
+  	if (hasRequiredCopyConstructorProperties) return copyConstructorProperties;
+  	hasRequiredCopyConstructorProperties = 1;
+  	var hasOwn = requireHasOwnProperty();
+  	var ownKeys = requireOwnKeys();
+  	var getOwnPropertyDescriptorModule = requireObjectGetOwnPropertyDescriptor();
+  	var definePropertyModule = requireObjectDefineProperty();
 
-  var isForced$1 = function (feature, detection) {
-    var value = data[normalize(feature)];
-    return value === POLYFILL ? true
-      : value === NATIVE ? false
-      : isCallable$2(detection) ? fails$6(detection)
-      : !!detection;
-  };
+  	copyConstructorProperties = function (target, source, exceptions) {
+  	  var keys = ownKeys(source);
+  	  var defineProperty = definePropertyModule.f;
+  	  var getOwnPropertyDescriptor = getOwnPropertyDescriptorModule.f;
+  	  for (var i = 0; i < keys.length; i++) {
+  	    var key = keys[i];
+  	    if (!hasOwn(target, key) && !(exceptions && hasOwn(exceptions, key))) {
+  	      defineProperty(target, key, getOwnPropertyDescriptor(source, key));
+  	    }
+  	  }
+  	};
+  	return copyConstructorProperties;
+  }
 
-  var normalize = isForced$1.normalize = function (string) {
-    return String(string).replace(replacement, '.').toLowerCase();
-  };
+  var isForced_1;
+  var hasRequiredIsForced;
 
-  var data = isForced$1.data = {};
-  var NATIVE = isForced$1.NATIVE = 'N';
-  var POLYFILL = isForced$1.POLYFILL = 'P';
+  function requireIsForced () {
+  	if (hasRequiredIsForced) return isForced_1;
+  	hasRequiredIsForced = 1;
+  	var fails = requireFails();
+  	var isCallable = requireIsCallable();
 
-  var isForced_1 = isForced$1;
+  	var replacement = /#|\.prototype\./;
 
-  var global$2 = global$b;
-  var getOwnPropertyDescriptor = objectGetOwnPropertyDescriptor.f;
-  var createNonEnumerableProperty$1 = createNonEnumerableProperty$3;
-  var defineBuiltIn$1 = defineBuiltIn$2;
-  var defineGlobalProperty = defineGlobalProperty$3;
-  var copyConstructorProperties = copyConstructorProperties$1;
-  var isForced = isForced_1;
+  	var isForced = function (feature, detection) {
+  	  var value = data[normalize(feature)];
+  	  return value === POLYFILL ? true
+  	    : value === NATIVE ? false
+  	    : isCallable(detection) ? fails(detection)
+  	    : !!detection;
+  	};
 
-  /*
-    options.target         - name of the target object
-    options.global         - target is the global object
-    options.stat           - export as static methods of target
-    options.proto          - export as prototype methods of target
-    options.real           - real prototype method for the `pure` version
-    options.forced         - export even if the native feature is available
-    options.bind           - bind methods to the target, required for the `pure` version
-    options.wrap           - wrap constructors to preventing global pollution, required for the `pure` version
-    options.unsafe         - use the simple assignment of property instead of delete + defineProperty
-    options.sham           - add a flag to not completely full polyfills
-    options.enumerable     - export as enumerable property
-    options.dontCallGetSet - prevent calling a getter on target
-    options.name           - the .name of the function if it does not match the key
-  */
-  var _export = function (options, source) {
-    var TARGET = options.target;
-    var GLOBAL = options.global;
-    var STATIC = options.stat;
-    var FORCED, target, key, targetProperty, sourceProperty, descriptor;
-    if (GLOBAL) {
-      target = global$2;
-    } else if (STATIC) {
-      target = global$2[TARGET] || defineGlobalProperty(TARGET, {});
-    } else {
-      target = global$2[TARGET] && global$2[TARGET].prototype;
-    }
-    if (target) for (key in source) {
-      sourceProperty = source[key];
-      if (options.dontCallGetSet) {
-        descriptor = getOwnPropertyDescriptor(target, key);
-        targetProperty = descriptor && descriptor.value;
-      } else targetProperty = target[key];
-      FORCED = isForced(GLOBAL ? key : TARGET + (STATIC ? '.' : '#') + key, options.forced);
-      // contained in target
-      if (!FORCED && targetProperty !== undefined) {
-        if (typeof sourceProperty == typeof targetProperty) continue;
-        copyConstructorProperties(sourceProperty, targetProperty);
-      }
-      // add a flag to not completely full polyfills
-      if (options.sham || (targetProperty && targetProperty.sham)) {
-        createNonEnumerableProperty$1(sourceProperty, 'sham', true);
-      }
-      defineBuiltIn$1(target, key, sourceProperty, options);
-    }
-  };
+  	var normalize = isForced.normalize = function (string) {
+  	  return String(string).replace(replacement, '.').toLowerCase();
+  	};
 
-  var classof$5 = classofRaw$2;
+  	var data = isForced.data = {};
+  	var NATIVE = isForced.NATIVE = 'N';
+  	var POLYFILL = isForced.POLYFILL = 'P';
 
-  // `IsArray` abstract operation
-  // https://tc39.es/ecma262/#sec-isarray
-  // eslint-disable-next-line es/no-array-isarray -- safe
-  var isArray$2 = Array.isArray || function isArray(argument) {
-    return classof$5(argument) === 'Array';
-  };
+  	isForced_1 = isForced;
+  	return isForced_1;
+  }
 
-  var $TypeError$1 = TypeError;
-  var MAX_SAFE_INTEGER = 0x1FFFFFFFFFFFFF; // 2 ** 53 - 1 == 9007199254740991
+  var _export;
+  var hasRequired_export;
 
-  var doesNotExceedSafeInteger$1 = function (it) {
-    if (it > MAX_SAFE_INTEGER) throw $TypeError$1('Maximum allowed index exceeded');
-    return it;
-  };
+  function require_export () {
+  	if (hasRequired_export) return _export;
+  	hasRequired_export = 1;
+  	var globalThis = requireGlobalThis();
+  	var getOwnPropertyDescriptor = requireObjectGetOwnPropertyDescriptor().f;
+  	var createNonEnumerableProperty = requireCreateNonEnumerableProperty();
+  	var defineBuiltIn = requireDefineBuiltIn();
+  	var defineGlobalProperty = requireDefineGlobalProperty();
+  	var copyConstructorProperties = requireCopyConstructorProperties();
+  	var isForced = requireIsForced();
 
-  var DESCRIPTORS$2 = descriptors;
-  var definePropertyModule$1 = objectDefineProperty;
-  var createPropertyDescriptor = createPropertyDescriptor$3;
-
-  var createProperty$1 = function (object, key, value) {
-    if (DESCRIPTORS$2) definePropertyModule$1.f(object, key, createPropertyDescriptor(0, value));
-    else object[key] = value;
-  };
-
-  var wellKnownSymbol$7 = wellKnownSymbol$9;
-
-  var TO_STRING_TAG$1 = wellKnownSymbol$7('toStringTag');
-  var test = {};
-
-  test[TO_STRING_TAG$1] = 'z';
-
-  var toStringTagSupport = String(test) === '[object z]';
-
-  var TO_STRING_TAG_SUPPORT$2 = toStringTagSupport;
-  var isCallable$1 = isCallable$c;
-  var classofRaw$1 = classofRaw$2;
-  var wellKnownSymbol$6 = wellKnownSymbol$9;
-
-  var TO_STRING_TAG = wellKnownSymbol$6('toStringTag');
-  var $Object = Object;
-
-  // ES3 wrong here
-  var CORRECT_ARGUMENTS = classofRaw$1(function () { return arguments; }()) === 'Arguments';
-
-  // fallback for IE11 Script Access Denied error
-  var tryGet = function (it, key) {
-    try {
-      return it[key];
-    } catch (error) { /* empty */ }
-  };
-
-  // getting tag from ES6+ `Object.prototype.toString`
-  var classof$4 = TO_STRING_TAG_SUPPORT$2 ? classofRaw$1 : function (it) {
-    var O, tag, result;
-    return it === undefined ? 'Undefined' : it === null ? 'Null'
-      // @@toStringTag case
-      : typeof (tag = tryGet(O = $Object(it), TO_STRING_TAG)) == 'string' ? tag
-      // builtinTag case
-      : CORRECT_ARGUMENTS ? classofRaw$1(O)
-      // ES3 arguments fallback
-      : (result = classofRaw$1(O)) === 'Object' && isCallable$1(O.callee) ? 'Arguments' : result;
-  };
-
-  var uncurryThis$5 = functionUncurryThis;
-  var fails$5 = fails$e;
-  var isCallable = isCallable$c;
-  var classof$3 = classof$4;
-  var getBuiltIn$1 = getBuiltIn$4;
-  var inspectSource = inspectSource$2;
-
-  var noop = function () { /* empty */ };
-  var construct = getBuiltIn$1('Reflect', 'construct');
-  var constructorRegExp = /^\s*(?:class|function)\b/;
-  var exec = uncurryThis$5(constructorRegExp.exec);
-  var INCORRECT_TO_STRING = !constructorRegExp.test(noop);
-
-  var isConstructorModern = function isConstructor(argument) {
-    if (!isCallable(argument)) return false;
-    try {
-      construct(noop, [], argument);
-      return true;
-    } catch (error) {
-      return false;
-    }
-  };
-
-  var isConstructorLegacy = function isConstructor(argument) {
-    if (!isCallable(argument)) return false;
-    switch (classof$3(argument)) {
-      case 'AsyncFunction':
-      case 'GeneratorFunction':
-      case 'AsyncGeneratorFunction': return false;
-    }
-    try {
-      // we can't check .prototype since constructors produced by .bind haven't it
-      // `Function#toString` throws on some built-it function in some legacy engines
-      // (for example, `DOMQuad` and similar in FF41-)
-      return INCORRECT_TO_STRING || !!exec(constructorRegExp, inspectSource(argument));
-    } catch (error) {
-      return true;
-    }
-  };
-
-  isConstructorLegacy.sham = true;
-
-  // `IsConstructor` abstract operation
-  // https://tc39.es/ecma262/#sec-isconstructor
-  var isConstructor$1 = !construct || fails$5(function () {
-    var called;
-    return isConstructorModern(isConstructorModern.call)
-      || !isConstructorModern(Object)
-      || !isConstructorModern(function () { called = true; })
-      || called;
-  }) ? isConstructorLegacy : isConstructorModern;
-
-  var isArray$1 = isArray$2;
-  var isConstructor = isConstructor$1;
-  var isObject$2 = isObject$8;
-  var wellKnownSymbol$5 = wellKnownSymbol$9;
-
-  var SPECIES$1 = wellKnownSymbol$5('species');
-  var $Array = Array;
-
-  // a part of `ArraySpeciesCreate` abstract operation
-  // https://tc39.es/ecma262/#sec-arrayspeciescreate
-  var arraySpeciesConstructor$1 = function (originalArray) {
-    var C;
-    if (isArray$1(originalArray)) {
-      C = originalArray.constructor;
-      // cross-realm fallback
-      if (isConstructor(C) && (C === $Array || isArray$1(C.prototype))) C = undefined;
-      else if (isObject$2(C)) {
-        C = C[SPECIES$1];
-        if (C === null) C = undefined;
-      }
-    } return C === undefined ? $Array : C;
-  };
-
-  var arraySpeciesConstructor = arraySpeciesConstructor$1;
-
-  // `ArraySpeciesCreate` abstract operation
-  // https://tc39.es/ecma262/#sec-arrayspeciescreate
-  var arraySpeciesCreate$2 = function (originalArray, length) {
-    return new (arraySpeciesConstructor(originalArray))(length === 0 ? 0 : length);
-  };
-
-  var fails$4 = fails$e;
-  var wellKnownSymbol$4 = wellKnownSymbol$9;
-  var V8_VERSION$1 = engineV8Version;
-
-  var SPECIES = wellKnownSymbol$4('species');
-
-  var arrayMethodHasSpeciesSupport$1 = function (METHOD_NAME) {
-    // We can't use this feature detection in V8 since it causes
-    // deoptimization and serious performance degradation
-    // https://github.com/zloirock/core-js/issues/677
-    return V8_VERSION$1 >= 51 || !fails$4(function () {
-      var array = [];
-      var constructor = array.constructor = {};
-      constructor[SPECIES] = function () {
-        return { foo: 1 };
-      };
-      return array[METHOD_NAME](Boolean).foo !== 1;
-    });
-  };
-
-  var $$3 = _export;
-  var fails$3 = fails$e;
-  var isArray = isArray$2;
-  var isObject$1 = isObject$8;
-  var toObject$2 = toObject$4;
-  var lengthOfArrayLike$1 = lengthOfArrayLike$3;
-  var doesNotExceedSafeInteger = doesNotExceedSafeInteger$1;
-  var createProperty = createProperty$1;
-  var arraySpeciesCreate$1 = arraySpeciesCreate$2;
-  var arrayMethodHasSpeciesSupport = arrayMethodHasSpeciesSupport$1;
-  var wellKnownSymbol$3 = wellKnownSymbol$9;
-  var V8_VERSION = engineV8Version;
-
-  var IS_CONCAT_SPREADABLE = wellKnownSymbol$3('isConcatSpreadable');
-
-  // We can't use this feature detection in V8 since it causes
-  // deoptimization and serious performance degradation
-  // https://github.com/zloirock/core-js/issues/679
-  var IS_CONCAT_SPREADABLE_SUPPORT = V8_VERSION >= 51 || !fails$3(function () {
-    var array = [];
-    array[IS_CONCAT_SPREADABLE] = false;
-    return array.concat()[0] !== array;
-  });
-
-  var isConcatSpreadable = function (O) {
-    if (!isObject$1(O)) return false;
-    var spreadable = O[IS_CONCAT_SPREADABLE];
-    return spreadable !== undefined ? !!spreadable : isArray(O);
-  };
-
-  var FORCED = !IS_CONCAT_SPREADABLE_SUPPORT || !arrayMethodHasSpeciesSupport('concat');
-
-  // `Array.prototype.concat` method
-  // https://tc39.es/ecma262/#sec-array.prototype.concat
-  // with adding support of @@isConcatSpreadable and @@species
-  $$3({ target: 'Array', proto: true, arity: 1, forced: FORCED }, {
-    // eslint-disable-next-line no-unused-vars -- required for `.length`
-    concat: function concat(arg) {
-      var O = toObject$2(this);
-      var A = arraySpeciesCreate$1(O, 0);
-      var n = 0;
-      var i, k, length, len, E;
-      for (i = -1, length = arguments.length; i < length; i++) {
-        E = i === -1 ? O : arguments[i];
-        if (isConcatSpreadable(E)) {
-          len = lengthOfArrayLike$1(E);
-          doesNotExceedSafeInteger(n + len);
-          for (k = 0; k < len; k++, n++) if (k in E) createProperty(A, n, E[k]);
-        } else {
-          doesNotExceedSafeInteger(n + 1);
-          createProperty(A, n++, E);
-        }
-      }
-      A.length = n;
-      return A;
-    }
-  });
+  	/*
+  	  options.target         - name of the target object
+  	  options.global         - target is the global object
+  	  options.stat           - export as static methods of target
+  	  options.proto          - export as prototype methods of target
+  	  options.real           - real prototype method for the `pure` version
+  	  options.forced         - export even if the native feature is available
+  	  options.bind           - bind methods to the target, required for the `pure` version
+  	  options.wrap           - wrap constructors to preventing global pollution, required for the `pure` version
+  	  options.unsafe         - use the simple assignment of property instead of delete + defineProperty
+  	  options.sham           - add a flag to not completely full polyfills
+  	  options.enumerable     - export as enumerable property
+  	  options.dontCallGetSet - prevent calling a getter on target
+  	  options.name           - the .name of the function if it does not match the key
+  	*/
+  	_export = function (options, source) {
+  	  var TARGET = options.target;
+  	  var GLOBAL = options.global;
+  	  var STATIC = options.stat;
+  	  var FORCED, target, key, targetProperty, sourceProperty, descriptor;
+  	  if (GLOBAL) {
+  	    target = globalThis;
+  	  } else if (STATIC) {
+  	    target = globalThis[TARGET] || defineGlobalProperty(TARGET, {});
+  	  } else {
+  	    target = globalThis[TARGET] && globalThis[TARGET].prototype;
+  	  }
+  	  if (target) for (key in source) {
+  	    sourceProperty = source[key];
+  	    if (options.dontCallGetSet) {
+  	      descriptor = getOwnPropertyDescriptor(target, key);
+  	      targetProperty = descriptor && descriptor.value;
+  	    } else targetProperty = target[key];
+  	    FORCED = isForced(GLOBAL ? key : TARGET + (STATIC ? '.' : '#') + key, options.forced);
+  	    // contained in target
+  	    if (!FORCED && targetProperty !== undefined) {
+  	      if (typeof sourceProperty == typeof targetProperty) continue;
+  	      copyConstructorProperties(sourceProperty, targetProperty);
+  	    }
+  	    // add a flag to not completely full polyfills
+  	    if (options.sham || (targetProperty && targetProperty.sham)) {
+  	      createNonEnumerableProperty(sourceProperty, 'sham', true);
+  	    }
+  	    defineBuiltIn(target, key, sourceProperty, options);
+  	  }
+  	};
+  	return _export;
+  }
 
   var objectDefineProperties = {};
 
-  var internalObjectKeys = objectKeysInternal;
-  var enumBugKeys$1 = enumBugKeys$3;
+  var objectKeys;
+  var hasRequiredObjectKeys;
 
-  // `Object.keys` method
-  // https://tc39.es/ecma262/#sec-object.keys
-  // eslint-disable-next-line es/no-object-keys -- safe
-  var objectKeys$2 = Object.keys || function keys(O) {
-    return internalObjectKeys(O, enumBugKeys$1);
-  };
+  function requireObjectKeys () {
+  	if (hasRequiredObjectKeys) return objectKeys;
+  	hasRequiredObjectKeys = 1;
+  	var internalObjectKeys = requireObjectKeysInternal();
+  	var enumBugKeys = requireEnumBugKeys();
 
-  var DESCRIPTORS$1 = descriptors;
-  var V8_PROTOTYPE_DEFINE_BUG = v8PrototypeDefineBug;
-  var definePropertyModule = objectDefineProperty;
-  var anObject$1 = anObject$4;
-  var toIndexedObject = toIndexedObject$4;
-  var objectKeys$1 = objectKeys$2;
-
-  // `Object.defineProperties` method
-  // https://tc39.es/ecma262/#sec-object.defineproperties
-  // eslint-disable-next-line es/no-object-defineproperties -- safe
-  objectDefineProperties.f = DESCRIPTORS$1 && !V8_PROTOTYPE_DEFINE_BUG ? Object.defineProperties : function defineProperties(O, Properties) {
-    anObject$1(O);
-    var props = toIndexedObject(Properties);
-    var keys = objectKeys$1(Properties);
-    var length = keys.length;
-    var index = 0;
-    var key;
-    while (length > index) definePropertyModule.f(O, key = keys[index++], props[key]);
-    return O;
-  };
-
-  var getBuiltIn = getBuiltIn$4;
-
-  var html$1 = getBuiltIn('document', 'documentElement');
-
-  /* global ActiveXObject -- old IE, WSH */
-  var anObject = anObject$4;
-  var definePropertiesModule = objectDefineProperties;
-  var enumBugKeys = enumBugKeys$3;
-  var hiddenKeys = hiddenKeys$4;
-  var html = html$1;
-  var documentCreateElement$1 = documentCreateElement$2;
-  var sharedKey = sharedKey$2;
-
-  var GT = '>';
-  var LT = '<';
-  var PROTOTYPE = 'prototype';
-  var SCRIPT = 'script';
-  var IE_PROTO = sharedKey('IE_PROTO');
-
-  var EmptyConstructor = function () { /* empty */ };
-
-  var scriptTag = function (content) {
-    return LT + SCRIPT + GT + content + LT + '/' + SCRIPT + GT;
-  };
-
-  // Create object with fake `null` prototype: use ActiveX Object with cleared prototype
-  var NullProtoObjectViaActiveX = function (activeXDocument) {
-    activeXDocument.write(scriptTag(''));
-    activeXDocument.close();
-    var temp = activeXDocument.parentWindow.Object;
-    activeXDocument = null; // avoid memory leak
-    return temp;
-  };
-
-  // Create object with fake `null` prototype: use iframe Object with cleared prototype
-  var NullProtoObjectViaIFrame = function () {
-    // Thrash, waste and sodomy: IE GC bug
-    var iframe = documentCreateElement$1('iframe');
-    var JS = 'java' + SCRIPT + ':';
-    var iframeDocument;
-    iframe.style.display = 'none';
-    html.appendChild(iframe);
-    // https://github.com/zloirock/core-js/issues/475
-    iframe.src = String(JS);
-    iframeDocument = iframe.contentWindow.document;
-    iframeDocument.open();
-    iframeDocument.write(scriptTag('document.F=Object'));
-    iframeDocument.close();
-    return iframeDocument.F;
-  };
-
-  // Check for document.domain and active x support
-  // No need to use active x approach when document.domain is not set
-  // see https://github.com/es-shims/es5-shim/issues/150
-  // variation of https://github.com/kitcambridge/es5-shim/commit/4f738ac066346
-  // avoid IE GC bug
-  var activeXDocument;
-  var NullProtoObject = function () {
-    try {
-      activeXDocument = new ActiveXObject('htmlfile');
-    } catch (error) { /* ignore */ }
-    NullProtoObject = typeof document != 'undefined'
-      ? document.domain && activeXDocument
-        ? NullProtoObjectViaActiveX(activeXDocument) // old IE
-        : NullProtoObjectViaIFrame()
-      : NullProtoObjectViaActiveX(activeXDocument); // WSH
-    var length = enumBugKeys.length;
-    while (length--) delete NullProtoObject[PROTOTYPE][enumBugKeys[length]];
-    return NullProtoObject();
-  };
-
-  hiddenKeys[IE_PROTO] = true;
-
-  // `Object.create` method
-  // https://tc39.es/ecma262/#sec-object.create
-  // eslint-disable-next-line es/no-object-create -- safe
-  var objectCreate = Object.create || function create(O, Properties) {
-    var result;
-    if (O !== null) {
-      EmptyConstructor[PROTOTYPE] = anObject(O);
-      result = new EmptyConstructor();
-      EmptyConstructor[PROTOTYPE] = null;
-      // add "__proto__" for Object.getPrototypeOf polyfill
-      result[IE_PROTO] = O;
-    } else result = NullProtoObject();
-    return Properties === undefined ? result : definePropertiesModule.f(result, Properties);
-  };
-
-  var wellKnownSymbol$2 = wellKnownSymbol$9;
-  var create = objectCreate;
-  var defineProperty$1 = objectDefineProperty.f;
-
-  var UNSCOPABLES = wellKnownSymbol$2('unscopables');
-  var ArrayPrototype = Array.prototype;
-
-  // Array.prototype[@@unscopables]
-  // https://tc39.es/ecma262/#sec-array.prototype-@@unscopables
-  if (ArrayPrototype[UNSCOPABLES] === undefined) {
-    defineProperty$1(ArrayPrototype, UNSCOPABLES, {
-      configurable: true,
-      value: create(null)
-    });
+  	// `Object.keys` method
+  	// https://tc39.es/ecma262/#sec-object.keys
+  	// eslint-disable-next-line es/no-object-keys -- safe
+  	objectKeys = Object.keys || function keys(O) {
+  	  return internalObjectKeys(O, enumBugKeys);
+  	};
+  	return objectKeys;
   }
 
-  // add a key to Array.prototype[@@unscopables]
-  var addToUnscopables$1 = function (key) {
-    ArrayPrototype[UNSCOPABLES][key] = true;
-  };
+  var hasRequiredObjectDefineProperties;
 
-  var $$2 = _export;
-  var $includes = arrayIncludes.includes;
-  var fails$2 = fails$e;
-  var addToUnscopables = addToUnscopables$1;
+  function requireObjectDefineProperties () {
+  	if (hasRequiredObjectDefineProperties) return objectDefineProperties;
+  	hasRequiredObjectDefineProperties = 1;
+  	var DESCRIPTORS = requireDescriptors();
+  	var V8_PROTOTYPE_DEFINE_BUG = requireV8PrototypeDefineBug();
+  	var definePropertyModule = requireObjectDefineProperty();
+  	var anObject = requireAnObject();
+  	var toIndexedObject = requireToIndexedObject();
+  	var objectKeys = requireObjectKeys();
 
-  // FF99+ bug
-  var BROKEN_ON_SPARSE = fails$2(function () {
-    // eslint-disable-next-line es/no-array-prototype-includes -- detection
-    return !Array(1).includes();
-  });
-
-  // `Array.prototype.includes` method
-  // https://tc39.es/ecma262/#sec-array.prototype.includes
-  $$2({ target: 'Array', proto: true, forced: BROKEN_ON_SPARSE }, {
-    includes: function includes(el /* , fromIndex = 0 */) {
-      return $includes(this, el, arguments.length > 1 ? arguments[1] : undefined);
-    }
-  });
-
-  // https://tc39.es/ecma262/#sec-array.prototype-@@unscopables
-  addToUnscopables('includes');
-
-  var DESCRIPTORS = descriptors;
-  var uncurryThis$4 = functionUncurryThis;
-  var call = functionCall;
-  var fails$1 = fails$e;
-  var objectKeys = objectKeys$2;
-  var getOwnPropertySymbolsModule = objectGetOwnPropertySymbols;
-  var propertyIsEnumerableModule = objectPropertyIsEnumerable;
-  var toObject$1 = toObject$4;
-  var IndexedObject$1 = indexedObject;
-
-  // eslint-disable-next-line es/no-object-assign -- safe
-  var $assign = Object.assign;
-  // eslint-disable-next-line es/no-object-defineproperty -- required for testing
-  var defineProperty = Object.defineProperty;
-  var concat = uncurryThis$4([].concat);
-
-  // `Object.assign` method
-  // https://tc39.es/ecma262/#sec-object.assign
-  var objectAssign = !$assign || fails$1(function () {
-    // should have correct order of operations (Edge bug)
-    if (DESCRIPTORS && $assign({ b: 1 }, $assign(defineProperty({}, 'a', {
-      enumerable: true,
-      get: function () {
-        defineProperty(this, 'b', {
-          value: 3,
-          enumerable: false
-        });
-      }
-    }), { b: 2 })).b !== 1) return true;
-    // should work with symbols and should have deterministic property order (V8 bug)
-    var A = {};
-    var B = {};
-    // eslint-disable-next-line es/no-symbol -- safe
-    var symbol = Symbol('assign detection');
-    var alphabet = 'abcdefghijklmnopqrst';
-    A[symbol] = 7;
-    alphabet.split('').forEach(function (chr) { B[chr] = chr; });
-    return $assign({}, A)[symbol] !== 7 || objectKeys($assign({}, B)).join('') !== alphabet;
-  }) ? function assign(target, source) { // eslint-disable-line no-unused-vars -- required for `.length`
-    var T = toObject$1(target);
-    var argumentsLength = arguments.length;
-    var index = 1;
-    var getOwnPropertySymbols = getOwnPropertySymbolsModule.f;
-    var propertyIsEnumerable = propertyIsEnumerableModule.f;
-    while (argumentsLength > index) {
-      var S = IndexedObject$1(arguments[index++]);
-      var keys = getOwnPropertySymbols ? concat(objectKeys(S), getOwnPropertySymbols(S)) : objectKeys(S);
-      var length = keys.length;
-      var j = 0;
-      var key;
-      while (length > j) {
-        key = keys[j++];
-        if (!DESCRIPTORS || call(propertyIsEnumerable, S, key)) T[key] = S[key];
-      }
-    } return T;
-  } : $assign;
-
-  var $$1 = _export;
-  var assign = objectAssign;
-
-  // `Object.assign` method
-  // https://tc39.es/ecma262/#sec-object.assign
-  // eslint-disable-next-line es/no-object-assign -- required for testing
-  $$1({ target: 'Object', stat: true, arity: 2, forced: Object.assign !== assign }, {
-    assign: assign
-  });
-
-  var TO_STRING_TAG_SUPPORT$1 = toStringTagSupport;
-  var classof$2 = classof$4;
-
-  // `Object.prototype.toString` method implementation
-  // https://tc39.es/ecma262/#sec-object.prototype.tostring
-  var objectToString = TO_STRING_TAG_SUPPORT$1 ? {}.toString : function toString() {
-    return '[object ' + classof$2(this) + ']';
-  };
-
-  var TO_STRING_TAG_SUPPORT = toStringTagSupport;
-  var defineBuiltIn = defineBuiltIn$2;
-  var toString$2 = objectToString;
-
-  // `Object.prototype.toString` method
-  // https://tc39.es/ecma262/#sec-object.prototype.tostring
-  if (!TO_STRING_TAG_SUPPORT) {
-    defineBuiltIn(Object.prototype, 'toString', toString$2, { unsafe: true });
+  	// `Object.defineProperties` method
+  	// https://tc39.es/ecma262/#sec-object.defineproperties
+  	// eslint-disable-next-line es/no-object-defineproperties -- safe
+  	objectDefineProperties.f = DESCRIPTORS && !V8_PROTOTYPE_DEFINE_BUG ? Object.defineProperties : function defineProperties(O, Properties) {
+  	  anObject(O);
+  	  var props = toIndexedObject(Properties);
+  	  var keys = objectKeys(Properties);
+  	  var length = keys.length;
+  	  var index = 0;
+  	  var key;
+  	  while (length > index) definePropertyModule.f(O, key = keys[index++], props[key]);
+  	  return O;
+  	};
+  	return objectDefineProperties;
   }
 
-  var isObject = isObject$8;
-  var classof$1 = classofRaw$2;
-  var wellKnownSymbol$1 = wellKnownSymbol$9;
+  var html;
+  var hasRequiredHtml;
 
-  var MATCH$1 = wellKnownSymbol$1('match');
+  function requireHtml () {
+  	if (hasRequiredHtml) return html;
+  	hasRequiredHtml = 1;
+  	var getBuiltIn = requireGetBuiltIn();
 
-  // `IsRegExp` abstract operation
-  // https://tc39.es/ecma262/#sec-isregexp
-  var isRegexp = function (it) {
-    var isRegExp;
-    return isObject(it) && ((isRegExp = it[MATCH$1]) !== undefined ? !!isRegExp : classof$1(it) === 'RegExp');
-  };
-
-  var isRegExp = isRegexp;
-
-  var $TypeError = TypeError;
-
-  var notARegexp = function (it) {
-    if (isRegExp(it)) {
-      throw new $TypeError("The method doesn't accept regular expressions");
-    } return it;
-  };
-
-  var classof = classof$4;
-
-  var $String = String;
-
-  var toString$1 = function (argument) {
-    if (classof(argument) === 'Symbol') throw new TypeError('Cannot convert a Symbol value to a string');
-    return $String(argument);
-  };
-
-  var wellKnownSymbol = wellKnownSymbol$9;
-
-  var MATCH = wellKnownSymbol('match');
-
-  var correctIsRegexpLogic = function (METHOD_NAME) {
-    var regexp = /./;
-    try {
-      '/./'[METHOD_NAME](regexp);
-    } catch (error1) {
-      try {
-        regexp[MATCH] = false;
-        return '/./'[METHOD_NAME](regexp);
-      } catch (error2) { /* empty */ }
-    } return false;
-  };
-
-  var $ = _export;
-  var uncurryThis$3 = functionUncurryThis;
-  var notARegExp = notARegexp;
-  var requireObjectCoercible = requireObjectCoercible$3;
-  var toString = toString$1;
-  var correctIsRegExpLogic = correctIsRegexpLogic;
-
-  var stringIndexOf = uncurryThis$3(''.indexOf);
-
-  // `String.prototype.includes` method
-  // https://tc39.es/ecma262/#sec-string.prototype.includes
-  $({ target: 'String', proto: true, forced: !correctIsRegExpLogic('includes') }, {
-    includes: function includes(searchString /* , position = 0 */) {
-      return !!~stringIndexOf(
-        toString(requireObjectCoercible(this)),
-        toString(notARegExp(searchString)),
-        arguments.length > 1 ? arguments[1] : undefined
-      );
-    }
-  });
-
-  // iterable DOM collections
-  // flag - `iterable` interface - 'entries', 'keys', 'values', 'forEach' methods
-  var domIterables = {
-    CSSRuleList: 0,
-    CSSStyleDeclaration: 0,
-    CSSValueList: 0,
-    ClientRectList: 0,
-    DOMRectList: 0,
-    DOMStringList: 0,
-    DOMTokenList: 1,
-    DataTransferItemList: 0,
-    FileList: 0,
-    HTMLAllCollection: 0,
-    HTMLCollection: 0,
-    HTMLFormElement: 0,
-    HTMLSelectElement: 0,
-    MediaList: 0,
-    MimeTypeArray: 0,
-    NamedNodeMap: 0,
-    NodeList: 1,
-    PaintRequestList: 0,
-    Plugin: 0,
-    PluginArray: 0,
-    SVGLengthList: 0,
-    SVGNumberList: 0,
-    SVGPathSegList: 0,
-    SVGPointList: 0,
-    SVGStringList: 0,
-    SVGTransformList: 0,
-    SourceBufferList: 0,
-    StyleSheetList: 0,
-    TextTrackCueList: 0,
-    TextTrackList: 0,
-    TouchList: 0
-  };
-
-  // in old WebKit versions, `element.classList` is not an instance of global `DOMTokenList`
-  var documentCreateElement = documentCreateElement$2;
-
-  var classList = documentCreateElement('span').classList;
-  var DOMTokenListPrototype$1 = classList && classList.constructor && classList.constructor.prototype;
-
-  var domTokenListPrototype = DOMTokenListPrototype$1 === Object.prototype ? undefined : DOMTokenListPrototype$1;
-
-  var classofRaw = classofRaw$2;
-  var uncurryThis$2 = functionUncurryThis;
-
-  var functionUncurryThisClause = function (fn) {
-    // Nashorn bug:
-    //   https://github.com/zloirock/core-js/issues/1128
-    //   https://github.com/zloirock/core-js/issues/1130
-    if (classofRaw(fn) === 'Function') return uncurryThis$2(fn);
-  };
-
-  var uncurryThis$1 = functionUncurryThisClause;
-  var aCallable = aCallable$2;
-  var NATIVE_BIND = functionBindNative;
-
-  var bind$1 = uncurryThis$1(uncurryThis$1.bind);
-
-  // optional / simple context binding
-  var functionBindContext = function (fn, that) {
-    aCallable(fn);
-    return that === undefined ? fn : NATIVE_BIND ? bind$1(fn, that) : function (/* ...args */) {
-      return fn.apply(that, arguments);
-    };
-  };
-
-  var bind = functionBindContext;
-  var uncurryThis = functionUncurryThis;
-  var IndexedObject = indexedObject;
-  var toObject = toObject$4;
-  var lengthOfArrayLike = lengthOfArrayLike$3;
-  var arraySpeciesCreate = arraySpeciesCreate$2;
-
-  var push = uncurryThis([].push);
-
-  // `Array.prototype.{ forEach, map, filter, some, every, find, findIndex, filterReject }` methods implementation
-  var createMethod = function (TYPE) {
-    var IS_MAP = TYPE === 1;
-    var IS_FILTER = TYPE === 2;
-    var IS_SOME = TYPE === 3;
-    var IS_EVERY = TYPE === 4;
-    var IS_FIND_INDEX = TYPE === 6;
-    var IS_FILTER_REJECT = TYPE === 7;
-    var NO_HOLES = TYPE === 5 || IS_FIND_INDEX;
-    return function ($this, callbackfn, that, specificCreate) {
-      var O = toObject($this);
-      var self = IndexedObject(O);
-      var length = lengthOfArrayLike(self);
-      var boundFunction = bind(callbackfn, that);
-      var index = 0;
-      var create = specificCreate || arraySpeciesCreate;
-      var target = IS_MAP ? create($this, length) : IS_FILTER || IS_FILTER_REJECT ? create($this, 0) : undefined;
-      var value, result;
-      for (;length > index; index++) if (NO_HOLES || index in self) {
-        value = self[index];
-        result = boundFunction(value, index, O);
-        if (TYPE) {
-          if (IS_MAP) target[index] = result; // map
-          else if (result) switch (TYPE) {
-            case 3: return true;              // some
-            case 5: return value;             // find
-            case 6: return index;             // findIndex
-            case 2: push(target, value);      // filter
-          } else switch (TYPE) {
-            case 4: return false;             // every
-            case 7: push(target, value);      // filterReject
-          }
-        }
-      }
-      return IS_FIND_INDEX ? -1 : IS_SOME || IS_EVERY ? IS_EVERY : target;
-    };
-  };
-
-  var arrayIteration = {
-    // `Array.prototype.forEach` method
-    // https://tc39.es/ecma262/#sec-array.prototype.foreach
-    forEach: createMethod(0),
-    // `Array.prototype.map` method
-    // https://tc39.es/ecma262/#sec-array.prototype.map
-    map: createMethod(1),
-    // `Array.prototype.filter` method
-    // https://tc39.es/ecma262/#sec-array.prototype.filter
-    filter: createMethod(2),
-    // `Array.prototype.some` method
-    // https://tc39.es/ecma262/#sec-array.prototype.some
-    some: createMethod(3),
-    // `Array.prototype.every` method
-    // https://tc39.es/ecma262/#sec-array.prototype.every
-    every: createMethod(4),
-    // `Array.prototype.find` method
-    // https://tc39.es/ecma262/#sec-array.prototype.find
-    find: createMethod(5),
-    // `Array.prototype.findIndex` method
-    // https://tc39.es/ecma262/#sec-array.prototype.findIndex
-    findIndex: createMethod(6),
-    // `Array.prototype.filterReject` method
-    // https://github.com/tc39/proposal-array-filtering
-    filterReject: createMethod(7)
-  };
-
-  var fails = fails$e;
-
-  var arrayMethodIsStrict$1 = function (METHOD_NAME, argument) {
-    var method = [][METHOD_NAME];
-    return !!method && fails(function () {
-      // eslint-disable-next-line no-useless-call -- required for testing
-      method.call(null, argument || function () { return 1; }, 1);
-    });
-  };
-
-  var $forEach = arrayIteration.forEach;
-  var arrayMethodIsStrict = arrayMethodIsStrict$1;
-
-  var STRICT_METHOD = arrayMethodIsStrict('forEach');
-
-  // `Array.prototype.forEach` method implementation
-  // https://tc39.es/ecma262/#sec-array.prototype.foreach
-  var arrayForEach = !STRICT_METHOD ? function forEach(callbackfn /* , thisArg */) {
-    return $forEach(this, callbackfn, arguments.length > 1 ? arguments[1] : undefined);
-  // eslint-disable-next-line es/no-array-prototype-foreach -- safe
-  } : [].forEach;
-
-  var global$1 = global$b;
-  var DOMIterables = domIterables;
-  var DOMTokenListPrototype = domTokenListPrototype;
-  var forEach = arrayForEach;
-  var createNonEnumerableProperty = createNonEnumerableProperty$3;
-
-  var handlePrototype = function (CollectionPrototype) {
-    // some Chrome versions have non-configurable methods on DOMTokenList
-    if (CollectionPrototype && CollectionPrototype.forEach !== forEach) try {
-      createNonEnumerableProperty(CollectionPrototype, 'forEach', forEach);
-    } catch (error) {
-      CollectionPrototype.forEach = forEach;
-    }
-  };
-
-  for (var COLLECTION_NAME in DOMIterables) {
-    if (DOMIterables[COLLECTION_NAME]) {
-      handlePrototype(global$1[COLLECTION_NAME] && global$1[COLLECTION_NAME].prototype);
-    }
+  	html = getBuiltIn('document', 'documentElement');
+  	return html;
   }
 
-  handlePrototype(DOMTokenListPrototype);
+  var objectCreate;
+  var hasRequiredObjectCreate;
+
+  function requireObjectCreate () {
+  	if (hasRequiredObjectCreate) return objectCreate;
+  	hasRequiredObjectCreate = 1;
+  	/* global ActiveXObject -- old IE, WSH */
+  	var anObject = requireAnObject();
+  	var definePropertiesModule = requireObjectDefineProperties();
+  	var enumBugKeys = requireEnumBugKeys();
+  	var hiddenKeys = requireHiddenKeys();
+  	var html = requireHtml();
+  	var documentCreateElement = requireDocumentCreateElement();
+  	var sharedKey = requireSharedKey();
+
+  	var GT = '>';
+  	var LT = '<';
+  	var PROTOTYPE = 'prototype';
+  	var SCRIPT = 'script';
+  	var IE_PROTO = sharedKey('IE_PROTO');
+
+  	var EmptyConstructor = function () { /* empty */ };
+
+  	var scriptTag = function (content) {
+  	  return LT + SCRIPT + GT + content + LT + '/' + SCRIPT + GT;
+  	};
+
+  	// Create object with fake `null` prototype: use ActiveX Object with cleared prototype
+  	var NullProtoObjectViaActiveX = function (activeXDocument) {
+  	  activeXDocument.write(scriptTag(''));
+  	  activeXDocument.close();
+  	  var temp = activeXDocument.parentWindow.Object;
+  	  // eslint-disable-next-line no-useless-assignment -- avoid memory leak
+  	  activeXDocument = null;
+  	  return temp;
+  	};
+
+  	// Create object with fake `null` prototype: use iframe Object with cleared prototype
+  	var NullProtoObjectViaIFrame = function () {
+  	  // Thrash, waste and sodomy: IE GC bug
+  	  var iframe = documentCreateElement('iframe');
+  	  var JS = 'java' + SCRIPT + ':';
+  	  var iframeDocument;
+  	  iframe.style.display = 'none';
+  	  html.appendChild(iframe);
+  	  // https://github.com/zloirock/core-js/issues/475
+  	  iframe.src = String(JS);
+  	  iframeDocument = iframe.contentWindow.document;
+  	  iframeDocument.open();
+  	  iframeDocument.write(scriptTag('document.F=Object'));
+  	  iframeDocument.close();
+  	  return iframeDocument.F;
+  	};
+
+  	// Check for document.domain and active x support
+  	// No need to use active x approach when document.domain is not set
+  	// see https://github.com/es-shims/es5-shim/issues/150
+  	// variation of https://github.com/kitcambridge/es5-shim/commit/4f738ac066346
+  	// avoid IE GC bug
+  	var activeXDocument;
+  	var NullProtoObject = function () {
+  	  try {
+  	    activeXDocument = new ActiveXObject('htmlfile');
+  	  } catch (error) { /* ignore */ }
+  	  NullProtoObject = typeof document != 'undefined'
+  	    ? document.domain && activeXDocument
+  	      ? NullProtoObjectViaActiveX(activeXDocument) // old IE
+  	      : NullProtoObjectViaIFrame()
+  	    : NullProtoObjectViaActiveX(activeXDocument); // WSH
+  	  var length = enumBugKeys.length;
+  	  while (length--) delete NullProtoObject[PROTOTYPE][enumBugKeys[length]];
+  	  return NullProtoObject();
+  	};
+
+  	hiddenKeys[IE_PROTO] = true;
+
+  	// `Object.create` method
+  	// https://tc39.es/ecma262/#sec-object.create
+  	// eslint-disable-next-line es/no-object-create -- safe
+  	objectCreate = Object.create || function create(O, Properties) {
+  	  var result;
+  	  if (O !== null) {
+  	    EmptyConstructor[PROTOTYPE] = anObject(O);
+  	    result = new EmptyConstructor();
+  	    EmptyConstructor[PROTOTYPE] = null;
+  	    // add "__proto__" for Object.getPrototypeOf polyfill
+  	    result[IE_PROTO] = O;
+  	  } else result = NullProtoObject();
+  	  return Properties === undefined ? result : definePropertiesModule.f(result, Properties);
+  	};
+  	return objectCreate;
+  }
+
+  var addToUnscopables;
+  var hasRequiredAddToUnscopables;
+
+  function requireAddToUnscopables () {
+  	if (hasRequiredAddToUnscopables) return addToUnscopables;
+  	hasRequiredAddToUnscopables = 1;
+  	var wellKnownSymbol = requireWellKnownSymbol();
+  	var create = requireObjectCreate();
+  	var defineProperty = requireObjectDefineProperty().f;
+
+  	var UNSCOPABLES = wellKnownSymbol('unscopables');
+  	var ArrayPrototype = Array.prototype;
+
+  	// Array.prototype[@@unscopables]
+  	// https://tc39.es/ecma262/#sec-array.prototype-@@unscopables
+  	if (ArrayPrototype[UNSCOPABLES] === undefined) {
+  	  defineProperty(ArrayPrototype, UNSCOPABLES, {
+  	    configurable: true,
+  	    value: create(null)
+  	  });
+  	}
+
+  	// add a key to Array.prototype[@@unscopables]
+  	addToUnscopables = function (key) {
+  	  ArrayPrototype[UNSCOPABLES][key] = true;
+  	};
+  	return addToUnscopables;
+  }
+
+  var hasRequiredEs_array_includes;
+
+  function requireEs_array_includes () {
+  	if (hasRequiredEs_array_includes) return es_array_includes;
+  	hasRequiredEs_array_includes = 1;
+  	var $ = require_export();
+  	var $includes = requireArrayIncludes().includes;
+  	var fails = requireFails();
+  	var addToUnscopables = requireAddToUnscopables();
+
+  	// FF99+ bug
+  	var BROKEN_ON_SPARSE = fails(function () {
+  	  // eslint-disable-next-line es/no-array-prototype-includes -- detection
+  	  return !Array(1).includes();
+  	});
+
+  	// `Array.prototype.includes` method
+  	// https://tc39.es/ecma262/#sec-array.prototype.includes
+  	$({ target: 'Array', proto: true, forced: BROKEN_ON_SPARSE }, {
+  	  includes: function includes(el /* , fromIndex = 0 */) {
+  	    return $includes(this, el, arguments.length > 1 ? arguments[1] : undefined);
+  	  }
+  	});
+
+  	// https://tc39.es/ecma262/#sec-array.prototype-@@unscopables
+  	addToUnscopables('includes');
+  	return es_array_includes;
+  }
+
+  requireEs_array_includes();
+
+  var es_object_assign = {};
+
+  var objectAssign;
+  var hasRequiredObjectAssign;
+
+  function requireObjectAssign () {
+  	if (hasRequiredObjectAssign) return objectAssign;
+  	hasRequiredObjectAssign = 1;
+  	var DESCRIPTORS = requireDescriptors();
+  	var uncurryThis = requireFunctionUncurryThis();
+  	var call = requireFunctionCall();
+  	var fails = requireFails();
+  	var objectKeys = requireObjectKeys();
+  	var getOwnPropertySymbolsModule = requireObjectGetOwnPropertySymbols();
+  	var propertyIsEnumerableModule = requireObjectPropertyIsEnumerable();
+  	var toObject = requireToObject();
+  	var IndexedObject = requireIndexedObject();
+
+  	// eslint-disable-next-line es/no-object-assign -- safe
+  	var $assign = Object.assign;
+  	// eslint-disable-next-line es/no-object-defineproperty -- required for testing
+  	var defineProperty = Object.defineProperty;
+  	var concat = uncurryThis([].concat);
+
+  	// `Object.assign` method
+  	// https://tc39.es/ecma262/#sec-object.assign
+  	objectAssign = !$assign || fails(function () {
+  	  // should have correct order of operations (Edge bug)
+  	  if (DESCRIPTORS && $assign({ b: 1 }, $assign(defineProperty({}, 'a', {
+  	    enumerable: true,
+  	    get: function () {
+  	      defineProperty(this, 'b', {
+  	        value: 3,
+  	        enumerable: false
+  	      });
+  	    }
+  	  }), { b: 2 })).b !== 1) return true;
+  	  // should work with symbols and should have deterministic property order (V8 bug)
+  	  var A = {};
+  	  var B = {};
+  	  // eslint-disable-next-line es/no-symbol -- safe
+  	  var symbol = Symbol('assign detection');
+  	  var alphabet = 'abcdefghijklmnopqrst';
+  	  A[symbol] = 7;
+  	  alphabet.split('').forEach(function (chr) { B[chr] = chr; });
+  	  return $assign({}, A)[symbol] !== 7 || objectKeys($assign({}, B)).join('') !== alphabet;
+  	}) ? function assign(target, source) { // eslint-disable-line no-unused-vars -- required for `.length`
+  	  var T = toObject(target);
+  	  var argumentsLength = arguments.length;
+  	  var index = 1;
+  	  var getOwnPropertySymbols = getOwnPropertySymbolsModule.f;
+  	  var propertyIsEnumerable = propertyIsEnumerableModule.f;
+  	  while (argumentsLength > index) {
+  	    var S = IndexedObject(arguments[index++]);
+  	    var keys = getOwnPropertySymbols ? concat(objectKeys(S), getOwnPropertySymbols(S)) : objectKeys(S);
+  	    var length = keys.length;
+  	    var j = 0;
+  	    var key;
+  	    while (length > j) {
+  	      key = keys[j++];
+  	      if (!DESCRIPTORS || call(propertyIsEnumerable, S, key)) T[key] = S[key];
+  	    }
+  	  } return T;
+  	} : $assign;
+  	return objectAssign;
+  }
+
+  var hasRequiredEs_object_assign;
+
+  function requireEs_object_assign () {
+  	if (hasRequiredEs_object_assign) return es_object_assign;
+  	hasRequiredEs_object_assign = 1;
+  	var $ = require_export();
+  	var assign = requireObjectAssign();
+
+  	// `Object.assign` method
+  	// https://tc39.es/ecma262/#sec-object.assign
+  	// eslint-disable-next-line es/no-object-assign -- required for testing
+  	$({ target: 'Object', stat: true, arity: 2, forced: Object.assign !== assign }, {
+  	  assign: assign
+  	});
+  	return es_object_assign;
+  }
+
+  requireEs_object_assign();
+
+  var es_object_toString = {};
+
+  var toStringTagSupport;
+  var hasRequiredToStringTagSupport;
+
+  function requireToStringTagSupport () {
+  	if (hasRequiredToStringTagSupport) return toStringTagSupport;
+  	hasRequiredToStringTagSupport = 1;
+  	var wellKnownSymbol = requireWellKnownSymbol();
+
+  	var TO_STRING_TAG = wellKnownSymbol('toStringTag');
+  	var test = {};
+
+  	test[TO_STRING_TAG] = 'z';
+
+  	toStringTagSupport = String(test) === '[object z]';
+  	return toStringTagSupport;
+  }
+
+  var classof;
+  var hasRequiredClassof;
+
+  function requireClassof () {
+  	if (hasRequiredClassof) return classof;
+  	hasRequiredClassof = 1;
+  	var TO_STRING_TAG_SUPPORT = requireToStringTagSupport();
+  	var isCallable = requireIsCallable();
+  	var classofRaw = requireClassofRaw();
+  	var wellKnownSymbol = requireWellKnownSymbol();
+
+  	var TO_STRING_TAG = wellKnownSymbol('toStringTag');
+  	var $Object = Object;
+
+  	// ES3 wrong here
+  	var CORRECT_ARGUMENTS = classofRaw(function () { return arguments; }()) === 'Arguments';
+
+  	// fallback for IE11 Script Access Denied error
+  	var tryGet = function (it, key) {
+  	  try {
+  	    return it[key];
+  	  } catch (error) { /* empty */ }
+  	};
+
+  	// getting tag from ES6+ `Object.prototype.toString`
+  	classof = TO_STRING_TAG_SUPPORT ? classofRaw : function (it) {
+  	  var O, tag, result;
+  	  return it === undefined ? 'Undefined' : it === null ? 'Null'
+  	    // @@toStringTag case
+  	    : typeof (tag = tryGet(O = $Object(it), TO_STRING_TAG)) == 'string' ? tag
+  	    // builtinTag case
+  	    : CORRECT_ARGUMENTS ? classofRaw(O)
+  	    // ES3 arguments fallback
+  	    : (result = classofRaw(O)) === 'Object' && isCallable(O.callee) ? 'Arguments' : result;
+  	};
+  	return classof;
+  }
+
+  var objectToString;
+  var hasRequiredObjectToString;
+
+  function requireObjectToString () {
+  	if (hasRequiredObjectToString) return objectToString;
+  	hasRequiredObjectToString = 1;
+  	var TO_STRING_TAG_SUPPORT = requireToStringTagSupport();
+  	var classof = requireClassof();
+
+  	// `Object.prototype.toString` method implementation
+  	// https://tc39.es/ecma262/#sec-object.prototype.tostring
+  	objectToString = TO_STRING_TAG_SUPPORT ? {}.toString : function toString() {
+  	  return '[object ' + classof(this) + ']';
+  	};
+  	return objectToString;
+  }
+
+  var hasRequiredEs_object_toString;
+
+  function requireEs_object_toString () {
+  	if (hasRequiredEs_object_toString) return es_object_toString;
+  	hasRequiredEs_object_toString = 1;
+  	var TO_STRING_TAG_SUPPORT = requireToStringTagSupport();
+  	var defineBuiltIn = requireDefineBuiltIn();
+  	var toString = requireObjectToString();
+
+  	// `Object.prototype.toString` method
+  	// https://tc39.es/ecma262/#sec-object.prototype.tostring
+  	if (!TO_STRING_TAG_SUPPORT) {
+  	  defineBuiltIn(Object.prototype, 'toString', toString, { unsafe: true });
+  	}
+  	return es_object_toString;
+  }
+
+  requireEs_object_toString();
+
+  var es_string_includes = {};
+
+  var isRegexp;
+  var hasRequiredIsRegexp;
+
+  function requireIsRegexp () {
+  	if (hasRequiredIsRegexp) return isRegexp;
+  	hasRequiredIsRegexp = 1;
+  	var isObject = requireIsObject();
+  	var classof = requireClassofRaw();
+  	var wellKnownSymbol = requireWellKnownSymbol();
+
+  	var MATCH = wellKnownSymbol('match');
+
+  	// `IsRegExp` abstract operation
+  	// https://tc39.es/ecma262/#sec-isregexp
+  	isRegexp = function (it) {
+  	  var isRegExp;
+  	  return isObject(it) && ((isRegExp = it[MATCH]) !== undefined ? !!isRegExp : classof(it) === 'RegExp');
+  	};
+  	return isRegexp;
+  }
+
+  var notARegexp;
+  var hasRequiredNotARegexp;
+
+  function requireNotARegexp () {
+  	if (hasRequiredNotARegexp) return notARegexp;
+  	hasRequiredNotARegexp = 1;
+  	var isRegExp = requireIsRegexp();
+
+  	var $TypeError = TypeError;
+
+  	notARegexp = function (it) {
+  	  if (isRegExp(it)) {
+  	    throw new $TypeError("The method doesn't accept regular expressions");
+  	  } return it;
+  	};
+  	return notARegexp;
+  }
+
+  var toString;
+  var hasRequiredToString;
+
+  function requireToString () {
+  	if (hasRequiredToString) return toString;
+  	hasRequiredToString = 1;
+  	var classof = requireClassof();
+
+  	var $String = String;
+
+  	toString = function (argument) {
+  	  if (classof(argument) === 'Symbol') throw new TypeError('Cannot convert a Symbol value to a string');
+  	  return $String(argument);
+  	};
+  	return toString;
+  }
+
+  var correctIsRegexpLogic;
+  var hasRequiredCorrectIsRegexpLogic;
+
+  function requireCorrectIsRegexpLogic () {
+  	if (hasRequiredCorrectIsRegexpLogic) return correctIsRegexpLogic;
+  	hasRequiredCorrectIsRegexpLogic = 1;
+  	var wellKnownSymbol = requireWellKnownSymbol();
+
+  	var MATCH = wellKnownSymbol('match');
+
+  	correctIsRegexpLogic = function (METHOD_NAME) {
+  	  var regexp = /./;
+  	  try {
+  	    '/./'[METHOD_NAME](regexp);
+  	  } catch (error1) {
+  	    try {
+  	      regexp[MATCH] = false;
+  	      return '/./'[METHOD_NAME](regexp);
+  	    } catch (error2) { /* empty */ }
+  	  } return false;
+  	};
+  	return correctIsRegexpLogic;
+  }
+
+  var hasRequiredEs_string_includes;
+
+  function requireEs_string_includes () {
+  	if (hasRequiredEs_string_includes) return es_string_includes;
+  	hasRequiredEs_string_includes = 1;
+  	var $ = require_export();
+  	var uncurryThis = requireFunctionUncurryThis();
+  	var notARegExp = requireNotARegexp();
+  	var requireObjectCoercible = requireRequireObjectCoercible();
+  	var toString = requireToString();
+  	var correctIsRegExpLogic = requireCorrectIsRegexpLogic();
+
+  	var stringIndexOf = uncurryThis(''.indexOf);
+
+  	// `String.prototype.includes` method
+  	// https://tc39.es/ecma262/#sec-string.prototype.includes
+  	$({ target: 'String', proto: true, forced: !correctIsRegExpLogic('includes') }, {
+  	  includes: function includes(searchString /* , position = 0 */) {
+  	    return !!~stringIndexOf(
+  	      toString(requireObjectCoercible(this)),
+  	      toString(notARegExp(searchString)),
+  	      arguments.length > 1 ? arguments[1] : undefined
+  	    );
+  	  }
+  	});
+  	return es_string_includes;
+  }
+
+  requireEs_string_includes();
+
+  var web_domCollections_forEach = {};
+
+  var domIterables;
+  var hasRequiredDomIterables;
+
+  function requireDomIterables () {
+  	if (hasRequiredDomIterables) return domIterables;
+  	hasRequiredDomIterables = 1;
+  	// iterable DOM collections
+  	// flag - `iterable` interface - 'entries', 'keys', 'values', 'forEach' methods
+  	domIterables = {
+  	  CSSRuleList: 0,
+  	  CSSStyleDeclaration: 0,
+  	  CSSValueList: 0,
+  	  ClientRectList: 0,
+  	  DOMRectList: 0,
+  	  DOMStringList: 0,
+  	  DOMTokenList: 1,
+  	  DataTransferItemList: 0,
+  	  FileList: 0,
+  	  HTMLAllCollection: 0,
+  	  HTMLCollection: 0,
+  	  HTMLFormElement: 0,
+  	  HTMLSelectElement: 0,
+  	  MediaList: 0,
+  	  MimeTypeArray: 0,
+  	  NamedNodeMap: 0,
+  	  NodeList: 1,
+  	  PaintRequestList: 0,
+  	  Plugin: 0,
+  	  PluginArray: 0,
+  	  SVGLengthList: 0,
+  	  SVGNumberList: 0,
+  	  SVGPathSegList: 0,
+  	  SVGPointList: 0,
+  	  SVGStringList: 0,
+  	  SVGTransformList: 0,
+  	  SourceBufferList: 0,
+  	  StyleSheetList: 0,
+  	  TextTrackCueList: 0,
+  	  TextTrackList: 0,
+  	  TouchList: 0
+  	};
+  	return domIterables;
+  }
+
+  var domTokenListPrototype;
+  var hasRequiredDomTokenListPrototype;
+
+  function requireDomTokenListPrototype () {
+  	if (hasRequiredDomTokenListPrototype) return domTokenListPrototype;
+  	hasRequiredDomTokenListPrototype = 1;
+  	// in old WebKit versions, `element.classList` is not an instance of global `DOMTokenList`
+  	var documentCreateElement = requireDocumentCreateElement();
+
+  	var classList = documentCreateElement('span').classList;
+  	var DOMTokenListPrototype = classList && classList.constructor && classList.constructor.prototype;
+
+  	domTokenListPrototype = DOMTokenListPrototype === Object.prototype ? undefined : DOMTokenListPrototype;
+  	return domTokenListPrototype;
+  }
+
+  var functionUncurryThisClause;
+  var hasRequiredFunctionUncurryThisClause;
+
+  function requireFunctionUncurryThisClause () {
+  	if (hasRequiredFunctionUncurryThisClause) return functionUncurryThisClause;
+  	hasRequiredFunctionUncurryThisClause = 1;
+  	var classofRaw = requireClassofRaw();
+  	var uncurryThis = requireFunctionUncurryThis();
+
+  	functionUncurryThisClause = function (fn) {
+  	  // Nashorn bug:
+  	  //   https://github.com/zloirock/core-js/issues/1128
+  	  //   https://github.com/zloirock/core-js/issues/1130
+  	  if (classofRaw(fn) === 'Function') return uncurryThis(fn);
+  	};
+  	return functionUncurryThisClause;
+  }
+
+  var functionBindContext;
+  var hasRequiredFunctionBindContext;
+
+  function requireFunctionBindContext () {
+  	if (hasRequiredFunctionBindContext) return functionBindContext;
+  	hasRequiredFunctionBindContext = 1;
+  	var uncurryThis = requireFunctionUncurryThisClause();
+  	var aCallable = requireACallable();
+  	var NATIVE_BIND = requireFunctionBindNative();
+
+  	var bind = uncurryThis(uncurryThis.bind);
+
+  	// optional / simple context binding
+  	functionBindContext = function (fn, that) {
+  	  aCallable(fn);
+  	  return that === undefined ? fn : NATIVE_BIND ? bind(fn, that) : function (/* ...args */) {
+  	    return fn.apply(that, arguments);
+  	  };
+  	};
+  	return functionBindContext;
+  }
+
+  var isArray;
+  var hasRequiredIsArray;
+
+  function requireIsArray () {
+  	if (hasRequiredIsArray) return isArray;
+  	hasRequiredIsArray = 1;
+  	var classof = requireClassofRaw();
+
+  	// `IsArray` abstract operation
+  	// https://tc39.es/ecma262/#sec-isarray
+  	// eslint-disable-next-line es/no-array-isarray -- safe
+  	isArray = Array.isArray || function isArray(argument) {
+  	  return classof(argument) === 'Array';
+  	};
+  	return isArray;
+  }
+
+  var isConstructor;
+  var hasRequiredIsConstructor;
+
+  function requireIsConstructor () {
+  	if (hasRequiredIsConstructor) return isConstructor;
+  	hasRequiredIsConstructor = 1;
+  	var uncurryThis = requireFunctionUncurryThis();
+  	var fails = requireFails();
+  	var isCallable = requireIsCallable();
+  	var classof = requireClassof();
+  	var getBuiltIn = requireGetBuiltIn();
+  	var inspectSource = requireInspectSource();
+
+  	var noop = function () { /* empty */ };
+  	var construct = getBuiltIn('Reflect', 'construct');
+  	var constructorRegExp = /^\s*(?:class|function)\b/;
+  	var exec = uncurryThis(constructorRegExp.exec);
+  	var INCORRECT_TO_STRING = !constructorRegExp.test(noop);
+
+  	var isConstructorModern = function isConstructor(argument) {
+  	  if (!isCallable(argument)) return false;
+  	  try {
+  	    construct(noop, [], argument);
+  	    return true;
+  	  } catch (error) {
+  	    return false;
+  	  }
+  	};
+
+  	var isConstructorLegacy = function isConstructor(argument) {
+  	  if (!isCallable(argument)) return false;
+  	  switch (classof(argument)) {
+  	    case 'AsyncFunction':
+  	    case 'GeneratorFunction':
+  	    case 'AsyncGeneratorFunction': return false;
+  	  }
+  	  try {
+  	    // we can't check .prototype since constructors produced by .bind haven't it
+  	    // `Function#toString` throws on some built-it function in some legacy engines
+  	    // (for example, `DOMQuad` and similar in FF41-)
+  	    return INCORRECT_TO_STRING || !!exec(constructorRegExp, inspectSource(argument));
+  	  } catch (error) {
+  	    return true;
+  	  }
+  	};
+
+  	isConstructorLegacy.sham = true;
+
+  	// `IsConstructor` abstract operation
+  	// https://tc39.es/ecma262/#sec-isconstructor
+  	isConstructor = !construct || fails(function () {
+  	  var called;
+  	  return isConstructorModern(isConstructorModern.call)
+  	    || !isConstructorModern(Object)
+  	    || !isConstructorModern(function () { called = true; })
+  	    || called;
+  	}) ? isConstructorLegacy : isConstructorModern;
+  	return isConstructor;
+  }
+
+  var arraySpeciesConstructor;
+  var hasRequiredArraySpeciesConstructor;
+
+  function requireArraySpeciesConstructor () {
+  	if (hasRequiredArraySpeciesConstructor) return arraySpeciesConstructor;
+  	hasRequiredArraySpeciesConstructor = 1;
+  	var isArray = requireIsArray();
+  	var isConstructor = requireIsConstructor();
+  	var isObject = requireIsObject();
+  	var wellKnownSymbol = requireWellKnownSymbol();
+
+  	var SPECIES = wellKnownSymbol('species');
+  	var $Array = Array;
+
+  	// a part of `ArraySpeciesCreate` abstract operation
+  	// https://tc39.es/ecma262/#sec-arrayspeciescreate
+  	arraySpeciesConstructor = function (originalArray) {
+  	  var C;
+  	  if (isArray(originalArray)) {
+  	    C = originalArray.constructor;
+  	    // cross-realm fallback
+  	    if (isConstructor(C) && (C === $Array || isArray(C.prototype))) C = undefined;
+  	    else if (isObject(C)) {
+  	      C = C[SPECIES];
+  	      if (C === null) C = undefined;
+  	    }
+  	  } return C === undefined ? $Array : C;
+  	};
+  	return arraySpeciesConstructor;
+  }
+
+  var arraySpeciesCreate;
+  var hasRequiredArraySpeciesCreate;
+
+  function requireArraySpeciesCreate () {
+  	if (hasRequiredArraySpeciesCreate) return arraySpeciesCreate;
+  	hasRequiredArraySpeciesCreate = 1;
+  	var arraySpeciesConstructor = requireArraySpeciesConstructor();
+
+  	// `ArraySpeciesCreate` abstract operation
+  	// https://tc39.es/ecma262/#sec-arrayspeciescreate
+  	arraySpeciesCreate = function (originalArray, length) {
+  	  return new (arraySpeciesConstructor(originalArray))(length === 0 ? 0 : length);
+  	};
+  	return arraySpeciesCreate;
+  }
+
+  var arrayIteration;
+  var hasRequiredArrayIteration;
+
+  function requireArrayIteration () {
+  	if (hasRequiredArrayIteration) return arrayIteration;
+  	hasRequiredArrayIteration = 1;
+  	var bind = requireFunctionBindContext();
+  	var uncurryThis = requireFunctionUncurryThis();
+  	var IndexedObject = requireIndexedObject();
+  	var toObject = requireToObject();
+  	var lengthOfArrayLike = requireLengthOfArrayLike();
+  	var arraySpeciesCreate = requireArraySpeciesCreate();
+
+  	var push = uncurryThis([].push);
+
+  	// `Array.prototype.{ forEach, map, filter, some, every, find, findIndex, filterReject }` methods implementation
+  	var createMethod = function (TYPE) {
+  	  var IS_MAP = TYPE === 1;
+  	  var IS_FILTER = TYPE === 2;
+  	  var IS_SOME = TYPE === 3;
+  	  var IS_EVERY = TYPE === 4;
+  	  var IS_FIND_INDEX = TYPE === 6;
+  	  var IS_FILTER_REJECT = TYPE === 7;
+  	  var NO_HOLES = TYPE === 5 || IS_FIND_INDEX;
+  	  return function ($this, callbackfn, that, specificCreate) {
+  	    var O = toObject($this);
+  	    var self = IndexedObject(O);
+  	    var length = lengthOfArrayLike(self);
+  	    var boundFunction = bind(callbackfn, that);
+  	    var index = 0;
+  	    var create = specificCreate || arraySpeciesCreate;
+  	    var target = IS_MAP ? create($this, length) : IS_FILTER || IS_FILTER_REJECT ? create($this, 0) : undefined;
+  	    var value, result;
+  	    for (;length > index; index++) if (NO_HOLES || index in self) {
+  	      value = self[index];
+  	      result = boundFunction(value, index, O);
+  	      if (TYPE) {
+  	        if (IS_MAP) target[index] = result; // map
+  	        else if (result) switch (TYPE) {
+  	          case 3: return true;              // some
+  	          case 5: return value;             // find
+  	          case 6: return index;             // findIndex
+  	          case 2: push(target, value);      // filter
+  	        } else switch (TYPE) {
+  	          case 4: return false;             // every
+  	          case 7: push(target, value);      // filterReject
+  	        }
+  	      }
+  	    }
+  	    return IS_FIND_INDEX ? -1 : IS_SOME || IS_EVERY ? IS_EVERY : target;
+  	  };
+  	};
+
+  	arrayIteration = {
+  	  // `Array.prototype.forEach` method
+  	  // https://tc39.es/ecma262/#sec-array.prototype.foreach
+  	  forEach: createMethod(0),
+  	  // `Array.prototype.map` method
+  	  // https://tc39.es/ecma262/#sec-array.prototype.map
+  	  map: createMethod(1),
+  	  // `Array.prototype.filter` method
+  	  // https://tc39.es/ecma262/#sec-array.prototype.filter
+  	  filter: createMethod(2),
+  	  // `Array.prototype.some` method
+  	  // https://tc39.es/ecma262/#sec-array.prototype.some
+  	  some: createMethod(3),
+  	  // `Array.prototype.every` method
+  	  // https://tc39.es/ecma262/#sec-array.prototype.every
+  	  every: createMethod(4),
+  	  // `Array.prototype.find` method
+  	  // https://tc39.es/ecma262/#sec-array.prototype.find
+  	  find: createMethod(5),
+  	  // `Array.prototype.findIndex` method
+  	  // https://tc39.es/ecma262/#sec-array.prototype.findIndex
+  	  findIndex: createMethod(6),
+  	  // `Array.prototype.filterReject` method
+  	  // https://github.com/tc39/proposal-array-filtering
+  	  filterReject: createMethod(7)
+  	};
+  	return arrayIteration;
+  }
+
+  var arrayMethodIsStrict;
+  var hasRequiredArrayMethodIsStrict;
+
+  function requireArrayMethodIsStrict () {
+  	if (hasRequiredArrayMethodIsStrict) return arrayMethodIsStrict;
+  	hasRequiredArrayMethodIsStrict = 1;
+  	var fails = requireFails();
+
+  	arrayMethodIsStrict = function (METHOD_NAME, argument) {
+  	  var method = [][METHOD_NAME];
+  	  return !!method && fails(function () {
+  	    // eslint-disable-next-line no-useless-call -- required for testing
+  	    method.call(null, argument || function () { return 1; }, 1);
+  	  });
+  	};
+  	return arrayMethodIsStrict;
+  }
+
+  var arrayForEach;
+  var hasRequiredArrayForEach;
+
+  function requireArrayForEach () {
+  	if (hasRequiredArrayForEach) return arrayForEach;
+  	hasRequiredArrayForEach = 1;
+  	var $forEach = requireArrayIteration().forEach;
+  	var arrayMethodIsStrict = requireArrayMethodIsStrict();
+
+  	var STRICT_METHOD = arrayMethodIsStrict('forEach');
+
+  	// `Array.prototype.forEach` method implementation
+  	// https://tc39.es/ecma262/#sec-array.prototype.foreach
+  	arrayForEach = !STRICT_METHOD ? function forEach(callbackfn /* , thisArg */) {
+  	  return $forEach(this, callbackfn, arguments.length > 1 ? arguments[1] : undefined);
+  	// eslint-disable-next-line es/no-array-prototype-foreach -- safe
+  	} : [].forEach;
+  	return arrayForEach;
+  }
+
+  var hasRequiredWeb_domCollections_forEach;
+
+  function requireWeb_domCollections_forEach () {
+  	if (hasRequiredWeb_domCollections_forEach) return web_domCollections_forEach;
+  	hasRequiredWeb_domCollections_forEach = 1;
+  	var globalThis = requireGlobalThis();
+  	var DOMIterables = requireDomIterables();
+  	var DOMTokenListPrototype = requireDomTokenListPrototype();
+  	var forEach = requireArrayForEach();
+  	var createNonEnumerableProperty = requireCreateNonEnumerableProperty();
+
+  	var handlePrototype = function (CollectionPrototype) {
+  	  // some Chrome versions have non-configurable methods on DOMTokenList
+  	  if (CollectionPrototype && CollectionPrototype.forEach !== forEach) try {
+  	    createNonEnumerableProperty(CollectionPrototype, 'forEach', forEach);
+  	  } catch (error) {
+  	    CollectionPrototype.forEach = forEach;
+  	  }
+  	};
+
+  	for (var COLLECTION_NAME in DOMIterables) {
+  	  if (DOMIterables[COLLECTION_NAME]) {
+  	    handlePrototype(globalThis[COLLECTION_NAME] && globalThis[COLLECTION_NAME].prototype);
+  	  }
+  	}
+
+  	handlePrototype(DOMTokenListPrototype);
+  	return web_domCollections_forEach;
+  }
+
+  requireWeb_domCollections_forEach();
 
   /**
    * @author: Dennis Hernández
@@ -10848,7 +14034,7 @@
       timeout = setTimeout(later, wait);
     };
   };
-  Object.assign($$4.fn.bootstrapTable.defaults, {
+  Object.assign($.fn.bootstrapTable.defaults, {
     mobileResponsive: false,
     minWidth: 562,
     minHeight: undefined,
@@ -10857,7 +14043,7 @@
     checkOnInit: true,
     columnsHidden: []
   });
-  $$4.BootstrapTable = /*#__PURE__*/function (_$$BootstrapTable) {
+  $.BootstrapTable = /*#__PURE__*/function (_$$BootstrapTable) {
     function _class() {
       _classCallCheck(this, _class);
       return _callSuper(this, _class, arguments);
@@ -10866,12 +14052,11 @@
     return _createClass(_class, [{
       key: "init",
       value: function init() {
-        var _get2,
-          _this = this;
+        var _this = this;
         for (var _len2 = arguments.length, args = new Array(_len2), _key2 = 0; _key2 < _len2; _key2++) {
           args[_key2] = arguments[_key2];
         }
-        (_get2 = _get(_getPrototypeOf(_class.prototype), "init", this)).call.apply(_get2, [this].concat(args));
+        _superPropGet(_class, "init", this)(args);
         if (!this.options.mobileResponsive || !this.options.minWidth) {
           return;
         }
@@ -10880,14 +14065,14 @@
           this.options.minWidth = 100;
         }
         var old = {
-          width: $$4(window).width(),
-          height: $$4(window).height()
+          width: $(window).width(),
+          height: $(window).height()
         };
-        $$4(window).on('resize orientationchange', debounce(function () {
+        $(window).on('resize orientationchange', debounce(function () {
           // reset view if height has only changed by at least the threshold.
-          var width = $$4(window).width();
-          var height = $$4(window).height();
-          var $activeElement = $$4(document.activeElement);
+          var width = $(window).width();
+          var height = $(window).height();
+          var $activeElement = $(document.activeElement);
           if ($activeElement.length && ['INPUT', 'SELECT', 'TEXTAREA'].includes($activeElement.prop('nodeName'))) {
             return;
           }
@@ -10900,8 +14085,8 @@
           }
         }, 200));
         if (this.options.checkOnInit) {
-          var width = $$4(window).width();
-          var height = $$4(window).height();
+          var width = $(window).width();
+          var height = $(window).height();
           this.changeView(width, height);
           old = {
             width: width,
@@ -10958,7 +14143,7 @@
         this.resetView();
       }
     }]);
-  }($$4.BootstrapTable);
+  }($.BootstrapTable);
 
 }));
 
@@ -10966,11 +14151,116 @@
   typeof exports === 'object' && typeof module !== 'undefined' ? factory(require('jquery')) :
   typeof define === 'function' && define.amd ? define(['jquery'], factory) :
   (global = typeof globalThis !== 'undefined' ? globalThis : global || self, factory(global.jQuery));
-})(this, (function ($$7) { 'use strict';
+})(this, (function ($) { 'use strict';
 
+  function _arrayLikeToArray(r, a) {
+    (null == a || a > r.length) && (a = r.length);
+    for (var e = 0, n = Array(a); e < a; e++) n[e] = r[e];
+    return n;
+  }
+  function _assertThisInitialized(e) {
+    if (void 0 === e) throw new ReferenceError("this hasn't been initialised - super() hasn't been called");
+    return e;
+  }
   function _callSuper(t, o, e) {
     return o = _getPrototypeOf(o), _possibleConstructorReturn(t, _isNativeReflectConstruct() ? Reflect.construct(o, e || [], _getPrototypeOf(t).constructor) : o.apply(t, e));
   }
+  function _classCallCheck(a, n) {
+    if (!(a instanceof n)) throw new TypeError("Cannot call a class as a function");
+  }
+  function _defineProperties(e, r) {
+    for (var t = 0; t < r.length; t++) {
+      var o = r[t];
+      o.enumerable = o.enumerable || !1, o.configurable = !0, "value" in o && (o.writable = !0), Object.defineProperty(e, _toPropertyKey(o.key), o);
+    }
+  }
+  function _createClass(e, r, t) {
+    return _defineProperties(e.prototype, r), Object.defineProperty(e, "prototype", {
+      writable: !1
+    }), e;
+  }
+  function _createForOfIteratorHelper(r, e) {
+    var t = "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"];
+    if (!t) {
+      if (Array.isArray(r) || (t = _unsupportedIterableToArray(r)) || e) {
+        t && (r = t);
+        var n = 0,
+          F = function () {};
+        return {
+          s: F,
+          n: function () {
+            return n >= r.length ? {
+              done: !0
+            } : {
+              done: !1,
+              value: r[n++]
+            };
+          },
+          e: function (r) {
+            throw r;
+          },
+          f: F
+        };
+      }
+      throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.");
+    }
+    var o,
+      a = !0,
+      u = !1;
+    return {
+      s: function () {
+        t = t.call(r);
+      },
+      n: function () {
+        var r = t.next();
+        return a = r.done, r;
+      },
+      e: function (r) {
+        u = !0, o = r;
+      },
+      f: function () {
+        try {
+          a || null == t.return || t.return();
+        } finally {
+          if (u) throw o;
+        }
+      }
+    };
+  }
+  function _defineProperty(e, r, t) {
+    return (r = _toPropertyKey(r)) in e ? Object.defineProperty(e, r, {
+      value: t,
+      enumerable: !0,
+      configurable: !0,
+      writable: !0
+    }) : e[r] = t, e;
+  }
+  function _get() {
+    return _get = "undefined" != typeof Reflect && Reflect.get ? Reflect.get.bind() : function (e, t, r) {
+      var p = _superPropBase(e, t);
+      if (p) {
+        var n = Object.getOwnPropertyDescriptor(p, t);
+        return n.get ? n.get.call(arguments.length < 3 ? e : r) : n.value;
+      }
+    }, _get.apply(null, arguments);
+  }
+  function _getPrototypeOf(t) {
+    return _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf.bind() : function (t) {
+      return t.__proto__ || Object.getPrototypeOf(t);
+    }, _getPrototypeOf(t);
+  }
+  function _inherits(t, e) {
+    if ("function" != typeof e && null !== e) throw new TypeError("Super expression must either be null or a function");
+    t.prototype = Object.create(e && e.prototype, {
+      constructor: {
+        value: t,
+        writable: !0,
+        configurable: !0
+      }
+    }), Object.defineProperty(t, "prototype", {
+      writable: !1
+    }), e && _setPrototypeOf(t, e);
+  }
   function _isNativeReflectConstruct() {
     try {
       var t = !Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {}));
@@ -10979,2489 +14269,3265 @@
       return !!t;
     })();
   }
+  function _possibleConstructorReturn(t, e) {
+    if (e && ("object" == typeof e || "function" == typeof e)) return e;
+    if (void 0 !== e) throw new TypeError("Derived constructors may only return object or undefined");
+    return _assertThisInitialized(t);
+  }
+  function _setPrototypeOf(t, e) {
+    return _setPrototypeOf = Object.setPrototypeOf ? Object.setPrototypeOf.bind() : function (t, e) {
+      return t.__proto__ = e, t;
+    }, _setPrototypeOf(t, e);
+  }
+  function _superPropBase(t, o) {
+    for (; !{}.hasOwnProperty.call(t, o) && null !== (t = _getPrototypeOf(t)););
+    return t;
+  }
+  function _superPropGet(t, o, e, r) {
+    var p = _get(_getPrototypeOf(1 & r ? t.prototype : t), o, e);
+    return 2 & r && "function" == typeof p ? function (t) {
+      return p.apply(e, t);
+    } : p;
+  }
   function _toPrimitive(t, r) {
     if ("object" != typeof t || !t) return t;
     var e = t[Symbol.toPrimitive];
     if (void 0 !== e) {
-      var i = e.call(t, r || "default");
+      var i = e.call(t, r);
       if ("object" != typeof i) return i;
       throw new TypeError("@@toPrimitive must return a primitive value.");
     }
-    return ("string" === r ? String : Number)(t);
+    return (String )(t);
   }
   function _toPropertyKey(t) {
     var i = _toPrimitive(t, "string");
     return "symbol" == typeof i ? i : i + "";
   }
-  function _classCallCheck(instance, Constructor) {
-    if (!(instance instanceof Constructor)) {
-      throw new TypeError("Cannot call a class as a function");
+  function _unsupportedIterableToArray(r, a) {
+    if (r) {
+      if ("string" == typeof r) return _arrayLikeToArray(r, a);
+      var t = {}.toString.call(r).slice(8, -1);
+      return "Object" === t && r.constructor && (t = r.constructor.name), "Map" === t || "Set" === t ? Array.from(r) : "Arguments" === t || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(t) ? _arrayLikeToArray(r, a) : void 0;
     }
   }
-  function _defineProperties(target, props) {
-    for (var i = 0; i < props.length; i++) {
-      var descriptor = props[i];
-      descriptor.enumerable = descriptor.enumerable || false;
-      descriptor.configurable = true;
-      if ("value" in descriptor) descriptor.writable = true;
-      Object.defineProperty(target, _toPropertyKey(descriptor.key), descriptor);
-    }
-  }
-  function _createClass(Constructor, protoProps, staticProps) {
-    if (protoProps) _defineProperties(Constructor.prototype, protoProps);
-    if (staticProps) _defineProperties(Constructor, staticProps);
-    Object.defineProperty(Constructor, "prototype", {
-      writable: false
-    });
-    return Constructor;
-  }
-  function _defineProperty(obj, key, value) {
-    key = _toPropertyKey(key);
-    if (key in obj) {
-      Object.defineProperty(obj, key, {
-        value: value,
-        enumerable: true,
-        configurable: true,
-        writable: true
-      });
-    } else {
-      obj[key] = value;
-    }
-    return obj;
-  }
-  function _inherits(subClass, superClass) {
-    if (typeof superClass !== "function" && superClass !== null) {
-      throw new TypeError("Super expression must either be null or a function");
-    }
-    subClass.prototype = Object.create(superClass && superClass.prototype, {
-      constructor: {
-        value: subClass,
-        writable: true,
-        configurable: true
-      }
-    });
-    Object.defineProperty(subClass, "prototype", {
-      writable: false
-    });
-    if (superClass) _setPrototypeOf(subClass, superClass);
-  }
-  function _getPrototypeOf(o) {
-    _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf.bind() : function _getPrototypeOf(o) {
-      return o.__proto__ || Object.getPrototypeOf(o);
-    };
-    return _getPrototypeOf(o);
-  }
-  function _setPrototypeOf(o, p) {
-    _setPrototypeOf = Object.setPrototypeOf ? Object.setPrototypeOf.bind() : function _setPrototypeOf(o, p) {
-      o.__proto__ = p;
-      return o;
-    };
-    return _setPrototypeOf(o, p);
-  }
-  function _assertThisInitialized(self) {
-    if (self === void 0) {
-      throw new ReferenceError("this hasn't been initialised - super() hasn't been called");
-    }
-    return self;
-  }
-  function _possibleConstructorReturn(self, call) {
-    if (call && (typeof call === "object" || typeof call === "function")) {
-      return call;
-    } else if (call !== void 0) {
-      throw new TypeError("Derived constructors may only return object or undefined");
-    }
-    return _assertThisInitialized(self);
-  }
-  function _superPropBase(object, property) {
-    while (!Object.prototype.hasOwnProperty.call(object, property)) {
-      object = _getPrototypeOf(object);
-      if (object === null) break;
-    }
-    return object;
-  }
-  function _get() {
-    if (typeof Reflect !== "undefined" && Reflect.get) {
-      _get = Reflect.get.bind();
-    } else {
-      _get = function _get(target, property, receiver) {
-        var base = _superPropBase(target, property);
-        if (!base) return;
-        var desc = Object.getOwnPropertyDescriptor(base, property);
-        if (desc.get) {
-          return desc.get.call(arguments.length < 3 ? target : receiver);
-        }
-        return desc.value;
-      };
-    }
-    return _get.apply(this, arguments);
-  }
-  function _unsupportedIterableToArray(o, minLen) {
-    if (!o) return;
-    if (typeof o === "string") return _arrayLikeToArray(o, minLen);
-    var n = Object.prototype.toString.call(o).slice(8, -1);
-    if (n === "Object" && o.constructor) n = o.constructor.name;
-    if (n === "Map" || n === "Set") return Array.from(o);
-    if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen);
-  }
-  function _arrayLikeToArray(arr, len) {
-    if (len == null || len > arr.length) len = arr.length;
-    for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i];
-    return arr2;
-  }
-  function _createForOfIteratorHelper(o, allowArrayLike) {
-    var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"];
-    if (!it) {
-      if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") {
-        if (it) o = it;
-        var i = 0;
-        var F = function () {};
-        return {
-          s: F,
-          n: function () {
-            if (i >= o.length) return {
-              done: true
-            };
-            return {
-              done: false,
-              value: o[i++]
-            };
-          },
-          e: function (e) {
-            throw e;
-          },
-          f: F
-        };
-      }
-      throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.");
-    }
-    var normalCompletion = true,
-      didErr = false,
-      err;
-    return {
-      s: function () {
-        it = it.call(o);
-      },
-      n: function () {
-        var step = it.next();
-        normalCompletion = step.done;
-        return step;
-      },
-      e: function (e) {
-        didErr = true;
-        err = e;
-      },
-      f: function () {
-        try {
-          if (!normalCompletion && it.return != null) it.return();
-        } finally {
-          if (didErr) throw err;
-        }
-      }
-    };
-  }
 
   var commonjsGlobal = typeof globalThis !== 'undefined' ? globalThis : typeof window !== 'undefined' ? window : typeof global !== 'undefined' ? global : typeof self !== 'undefined' ? self : {};
 
-  var check = function (it) {
-    return it && it.Math === Math && it;
-  };
+  var es_array_concat = {};
 
-  // https://github.com/zloirock/core-js/issues/86#issuecomment-115759028
-  var global$e =
-    // eslint-disable-next-line es/no-global-this -- safe
-    check(typeof globalThis == 'object' && globalThis) ||
-    check(typeof window == 'object' && window) ||
-    // eslint-disable-next-line no-restricted-globals -- safe
-    check(typeof self == 'object' && self) ||
-    check(typeof commonjsGlobal == 'object' && commonjsGlobal) ||
-    check(typeof commonjsGlobal == 'object' && commonjsGlobal) ||
-    // eslint-disable-next-line no-new-func -- fallback
-    (function () { return this; })() || Function('return this')();
+  var globalThis_1;
+  var hasRequiredGlobalThis;
+
+  function requireGlobalThis () {
+  	if (hasRequiredGlobalThis) return globalThis_1;
+  	hasRequiredGlobalThis = 1;
+  	var check = function (it) {
+  	  return it && it.Math === Math && it;
+  	};
+
+  	// https://github.com/zloirock/core-js/issues/86#issuecomment-115759028
+  	globalThis_1 =
+  	  // eslint-disable-next-line es/no-global-this -- safe
+  	  check(typeof globalThis == 'object' && globalThis) ||
+  	  check(typeof window == 'object' && window) ||
+  	  // eslint-disable-next-line no-restricted-globals -- safe
+  	  check(typeof self == 'object' && self) ||
+  	  check(typeof commonjsGlobal == 'object' && commonjsGlobal) ||
+  	  check(typeof globalThis_1 == 'object' && globalThis_1) ||
+  	  // eslint-disable-next-line no-new-func -- fallback
+  	  (function () { return this; })() || Function('return this')();
+  	return globalThis_1;
+  }
 
   var objectGetOwnPropertyDescriptor = {};
 
-  var fails$i = function (exec) {
-    try {
-      return !!exec();
-    } catch (error) {
-      return true;
-    }
-  };
+  var fails;
+  var hasRequiredFails;
 
-  var fails$h = fails$i;
+  function requireFails () {
+  	if (hasRequiredFails) return fails;
+  	hasRequiredFails = 1;
+  	fails = function (exec) {
+  	  try {
+  	    return !!exec();
+  	  } catch (error) {
+  	    return true;
+  	  }
+  	};
+  	return fails;
+  }
 
-  // Detect IE8's incomplete defineProperty implementation
-  var descriptors = !fails$h(function () {
-    // eslint-disable-next-line es/no-object-defineproperty -- required for testing
-    return Object.defineProperty({}, 1, { get: function () { return 7; } })[1] !== 7;
-  });
+  var descriptors;
+  var hasRequiredDescriptors;
 
-  var fails$g = fails$i;
+  function requireDescriptors () {
+  	if (hasRequiredDescriptors) return descriptors;
+  	hasRequiredDescriptors = 1;
+  	var fails = requireFails();
 
-  var functionBindNative = !fails$g(function () {
-    // eslint-disable-next-line es/no-function-prototype-bind -- safe
-    var test = (function () { /* empty */ }).bind();
-    // eslint-disable-next-line no-prototype-builtins -- safe
-    return typeof test != 'function' || test.hasOwnProperty('prototype');
-  });
+  	// Detect IE8's incomplete defineProperty implementation
+  	descriptors = !fails(function () {
+  	  // eslint-disable-next-line es/no-object-defineproperty -- required for testing
+  	  return Object.defineProperty({}, 1, { get: function () { return 7; } })[1] !== 7;
+  	});
+  	return descriptors;
+  }
 
-  var NATIVE_BIND$3 = functionBindNative;
+  var functionBindNative;
+  var hasRequiredFunctionBindNative;
 
-  var call$a = Function.prototype.call;
+  function requireFunctionBindNative () {
+  	if (hasRequiredFunctionBindNative) return functionBindNative;
+  	hasRequiredFunctionBindNative = 1;
+  	var fails = requireFails();
 
-  var functionCall = NATIVE_BIND$3 ? call$a.bind(call$a) : function () {
-    return call$a.apply(call$a, arguments);
-  };
+  	functionBindNative = !fails(function () {
+  	  // eslint-disable-next-line es/no-function-prototype-bind -- safe
+  	  var test = (function () { /* empty */ }).bind();
+  	  // eslint-disable-next-line no-prototype-builtins -- safe
+  	  return typeof test != 'function' || test.hasOwnProperty('prototype');
+  	});
+  	return functionBindNative;
+  }
+
+  var functionCall;
+  var hasRequiredFunctionCall;
+
+  function requireFunctionCall () {
+  	if (hasRequiredFunctionCall) return functionCall;
+  	hasRequiredFunctionCall = 1;
+  	var NATIVE_BIND = requireFunctionBindNative();
+
+  	var call = Function.prototype.call;
+
+  	functionCall = NATIVE_BIND ? call.bind(call) : function () {
+  	  return call.apply(call, arguments);
+  	};
+  	return functionCall;
+  }
 
   var objectPropertyIsEnumerable = {};
 
-  var $propertyIsEnumerable = {}.propertyIsEnumerable;
-  // eslint-disable-next-line es/no-object-getownpropertydescriptor -- safe
-  var getOwnPropertyDescriptor$1 = Object.getOwnPropertyDescriptor;
+  var hasRequiredObjectPropertyIsEnumerable;
 
-  // Nashorn ~ JDK8 bug
-  var NASHORN_BUG = getOwnPropertyDescriptor$1 && !$propertyIsEnumerable.call({ 1: 2 }, 1);
+  function requireObjectPropertyIsEnumerable () {
+  	if (hasRequiredObjectPropertyIsEnumerable) return objectPropertyIsEnumerable;
+  	hasRequiredObjectPropertyIsEnumerable = 1;
+  	var $propertyIsEnumerable = {}.propertyIsEnumerable;
+  	// eslint-disable-next-line es/no-object-getownpropertydescriptor -- safe
+  	var getOwnPropertyDescriptor = Object.getOwnPropertyDescriptor;
 
-  // `Object.prototype.propertyIsEnumerable` method implementation
-  // https://tc39.es/ecma262/#sec-object.prototype.propertyisenumerable
-  objectPropertyIsEnumerable.f = NASHORN_BUG ? function propertyIsEnumerable(V) {
-    var descriptor = getOwnPropertyDescriptor$1(this, V);
-    return !!descriptor && descriptor.enumerable;
-  } : $propertyIsEnumerable;
+  	// Nashorn ~ JDK8 bug
+  	var NASHORN_BUG = getOwnPropertyDescriptor && !$propertyIsEnumerable.call({ 1: 2 }, 1);
 
-  var createPropertyDescriptor$3 = function (bitmap, value) {
-    return {
-      enumerable: !(bitmap & 1),
-      configurable: !(bitmap & 2),
-      writable: !(bitmap & 4),
-      value: value
-    };
-  };
-
-  var NATIVE_BIND$2 = functionBindNative;
-
-  var FunctionPrototype$2 = Function.prototype;
-  var call$9 = FunctionPrototype$2.call;
-  var uncurryThisWithBind = NATIVE_BIND$2 && FunctionPrototype$2.bind.bind(call$9, call$9);
-
-  var functionUncurryThis = NATIVE_BIND$2 ? uncurryThisWithBind : function (fn) {
-    return function () {
-      return call$9.apply(fn, arguments);
-    };
-  };
-
-  var uncurryThis$j = functionUncurryThis;
-
-  var toString$6 = uncurryThis$j({}.toString);
-  var stringSlice$5 = uncurryThis$j(''.slice);
-
-  var classofRaw$2 = function (it) {
-    return stringSlice$5(toString$6(it), 8, -1);
-  };
-
-  var uncurryThis$i = functionUncurryThis;
-  var fails$f = fails$i;
-  var classof$6 = classofRaw$2;
-
-  var $Object$3 = Object;
-  var split = uncurryThis$i(''.split);
-
-  // fallback for non-array-like ES3 and non-enumerable old V8 strings
-  var indexedObject = fails$f(function () {
-    // throws an error in rhino, see https://github.com/mozilla/rhino/issues/346
-    // eslint-disable-next-line no-prototype-builtins -- safe
-    return !$Object$3('z').propertyIsEnumerable(0);
-  }) ? function (it) {
-    return classof$6(it) === 'String' ? split(it, '') : $Object$3(it);
-  } : $Object$3;
-
-  // we can't use just `it == null` since of `document.all` special case
-  // https://tc39.es/ecma262/#sec-IsHTMLDDA-internal-slot-aec
-  var isNullOrUndefined$3 = function (it) {
-    return it === null || it === undefined;
-  };
-
-  var isNullOrUndefined$2 = isNullOrUndefined$3;
-
-  var $TypeError$7 = TypeError;
-
-  // `RequireObjectCoercible` abstract operation
-  // https://tc39.es/ecma262/#sec-requireobjectcoercible
-  var requireObjectCoercible$4 = function (it) {
-    if (isNullOrUndefined$2(it)) throw new $TypeError$7("Can't call method on " + it);
-    return it;
-  };
-
-  // toObject with fallback for non-array-like ES3 strings
-  var IndexedObject$3 = indexedObject;
-  var requireObjectCoercible$3 = requireObjectCoercible$4;
-
-  var toIndexedObject$6 = function (it) {
-    return IndexedObject$3(requireObjectCoercible$3(it));
-  };
-
-  // https://tc39.es/ecma262/#sec-IsHTMLDDA-internal-slot
-  var documentAll = typeof document == 'object' && document.all;
-
-  // `IsCallable` abstract operation
-  // https://tc39.es/ecma262/#sec-iscallable
-  // eslint-disable-next-line unicorn/no-typeof-undefined -- required for testing
-  var isCallable$e = typeof documentAll == 'undefined' && documentAll !== undefined ? function (argument) {
-    return typeof argument == 'function' || argument === documentAll;
-  } : function (argument) {
-    return typeof argument == 'function';
-  };
-
-  var isCallable$d = isCallable$e;
-
-  var isObject$8 = function (it) {
-    return typeof it == 'object' ? it !== null : isCallable$d(it);
-  };
-
-  var global$d = global$e;
-  var isCallable$c = isCallable$e;
-
-  var aFunction = function (argument) {
-    return isCallable$c(argument) ? argument : undefined;
-  };
-
-  var getBuiltIn$4 = function (namespace, method) {
-    return arguments.length < 2 ? aFunction(global$d[namespace]) : global$d[namespace] && global$d[namespace][method];
-  };
-
-  var uncurryThis$h = functionUncurryThis;
-
-  var objectIsPrototypeOf = uncurryThis$h({}.isPrototypeOf);
-
-  var engineUserAgent = typeof navigator != 'undefined' && String(navigator.userAgent) || '';
-
-  var global$c = global$e;
-  var userAgent = engineUserAgent;
-
-  var process = global$c.process;
-  var Deno = global$c.Deno;
-  var versions = process && process.versions || Deno && Deno.version;
-  var v8 = versions && versions.v8;
-  var match, version;
-
-  if (v8) {
-    match = v8.split('.');
-    // in old Chrome, versions of V8 isn't V8 = Chrome / 10
-    // but their correct versions are not interesting for us
-    version = match[0] > 0 && match[0] < 4 ? 1 : +(match[0] + match[1]);
+  	// `Object.prototype.propertyIsEnumerable` method implementation
+  	// https://tc39.es/ecma262/#sec-object.prototype.propertyisenumerable
+  	objectPropertyIsEnumerable.f = NASHORN_BUG ? function propertyIsEnumerable(V) {
+  	  var descriptor = getOwnPropertyDescriptor(this, V);
+  	  return !!descriptor && descriptor.enumerable;
+  	} : $propertyIsEnumerable;
+  	return objectPropertyIsEnumerable;
   }
 
-  // BrowserFS NodeJS `process` polyfill incorrectly set `.v8` to `0.0`
-  // so check `userAgent` even if `.v8` exists, but 0
-  if (!version && userAgent) {
-    match = userAgent.match(/Edge\/(\d+)/);
-    if (!match || match[1] >= 74) {
-      match = userAgent.match(/Chrome\/(\d+)/);
-      if (match) version = +match[1];
-    }
+  var createPropertyDescriptor;
+  var hasRequiredCreatePropertyDescriptor;
+
+  function requireCreatePropertyDescriptor () {
+  	if (hasRequiredCreatePropertyDescriptor) return createPropertyDescriptor;
+  	hasRequiredCreatePropertyDescriptor = 1;
+  	createPropertyDescriptor = function (bitmap, value) {
+  	  return {
+  	    enumerable: !(bitmap & 1),
+  	    configurable: !(bitmap & 2),
+  	    writable: !(bitmap & 4),
+  	    value: value
+  	  };
+  	};
+  	return createPropertyDescriptor;
   }
 
-  var engineV8Version = version;
+  var functionUncurryThis;
+  var hasRequiredFunctionUncurryThis;
 
-  /* eslint-disable es/no-symbol -- required for testing */
-  var V8_VERSION$2 = engineV8Version;
-  var fails$e = fails$i;
-  var global$b = global$e;
+  function requireFunctionUncurryThis () {
+  	if (hasRequiredFunctionUncurryThis) return functionUncurryThis;
+  	hasRequiredFunctionUncurryThis = 1;
+  	var NATIVE_BIND = requireFunctionBindNative();
 
-  var $String$4 = global$b.String;
+  	var FunctionPrototype = Function.prototype;
+  	var call = FunctionPrototype.call;
+  	var uncurryThisWithBind = NATIVE_BIND && FunctionPrototype.bind.bind(call, call);
 
-  // eslint-disable-next-line es/no-object-getownpropertysymbols -- required for testing
-  var symbolConstructorDetection = !!Object.getOwnPropertySymbols && !fails$e(function () {
-    var symbol = Symbol('symbol detection');
-    // Chrome 38 Symbol has incorrect toString conversion
-    // `get-own-property-symbols` polyfill symbols converted to object are not Symbol instances
-    // nb: Do not call `String` directly to avoid this being optimized out to `symbol+''` which will,
-    // of course, fail.
-    return !$String$4(symbol) || !(Object(symbol) instanceof Symbol) ||
-      // Chrome 38-40 symbols are not inherited from DOM collections prototypes to instances
-      !Symbol.sham && V8_VERSION$2 && V8_VERSION$2 < 41;
-  });
+  	functionUncurryThis = NATIVE_BIND ? uncurryThisWithBind : function (fn) {
+  	  return function () {
+  	    return call.apply(fn, arguments);
+  	  };
+  	};
+  	return functionUncurryThis;
+  }
 
-  /* eslint-disable es/no-symbol -- required for testing */
-  var NATIVE_SYMBOL$1 = symbolConstructorDetection;
+  var classofRaw;
+  var hasRequiredClassofRaw;
 
-  var useSymbolAsUid = NATIVE_SYMBOL$1
-    && !Symbol.sham
-    && typeof Symbol.iterator == 'symbol';
+  function requireClassofRaw () {
+  	if (hasRequiredClassofRaw) return classofRaw;
+  	hasRequiredClassofRaw = 1;
+  	var uncurryThis = requireFunctionUncurryThis();
 
-  var getBuiltIn$3 = getBuiltIn$4;
-  var isCallable$b = isCallable$e;
-  var isPrototypeOf = objectIsPrototypeOf;
-  var USE_SYMBOL_AS_UID$1 = useSymbolAsUid;
+  	var toString = uncurryThis({}.toString);
+  	var stringSlice = uncurryThis(''.slice);
 
-  var $Object$2 = Object;
+  	classofRaw = function (it) {
+  	  return stringSlice(toString(it), 8, -1);
+  	};
+  	return classofRaw;
+  }
 
-  var isSymbol$2 = USE_SYMBOL_AS_UID$1 ? function (it) {
-    return typeof it == 'symbol';
-  } : function (it) {
-    var $Symbol = getBuiltIn$3('Symbol');
-    return isCallable$b($Symbol) && isPrototypeOf($Symbol.prototype, $Object$2(it));
-  };
+  var indexedObject;
+  var hasRequiredIndexedObject;
 
-  var $String$3 = String;
+  function requireIndexedObject () {
+  	if (hasRequiredIndexedObject) return indexedObject;
+  	hasRequiredIndexedObject = 1;
+  	var uncurryThis = requireFunctionUncurryThis();
+  	var fails = requireFails();
+  	var classof = requireClassofRaw();
 
-  var tryToString$1 = function (argument) {
-    try {
-      return $String$3(argument);
-    } catch (error) {
-      return 'Object';
-    }
-  };
+  	var $Object = Object;
+  	var split = uncurryThis(''.split);
 
-  var isCallable$a = isCallable$e;
-  var tryToString = tryToString$1;
+  	// fallback for non-array-like ES3 and non-enumerable old V8 strings
+  	indexedObject = fails(function () {
+  	  // throws an error in rhino, see https://github.com/mozilla/rhino/issues/346
+  	  // eslint-disable-next-line no-prototype-builtins -- safe
+  	  return !$Object('z').propertyIsEnumerable(0);
+  	}) ? function (it) {
+  	  return classof(it) === 'String' ? split(it, '') : $Object(it);
+  	} : $Object;
+  	return indexedObject;
+  }
 
-  var $TypeError$6 = TypeError;
+  var isNullOrUndefined;
+  var hasRequiredIsNullOrUndefined;
 
-  // `Assert: IsCallable(argument) is true`
-  var aCallable$2 = function (argument) {
-    if (isCallable$a(argument)) return argument;
-    throw new $TypeError$6(tryToString(argument) + ' is not a function');
-  };
+  function requireIsNullOrUndefined () {
+  	if (hasRequiredIsNullOrUndefined) return isNullOrUndefined;
+  	hasRequiredIsNullOrUndefined = 1;
+  	// we can't use just `it == null` since of `document.all` special case
+  	// https://tc39.es/ecma262/#sec-IsHTMLDDA-internal-slot-aec
+  	isNullOrUndefined = function (it) {
+  	  return it === null || it === undefined;
+  	};
+  	return isNullOrUndefined;
+  }
 
-  var aCallable$1 = aCallable$2;
-  var isNullOrUndefined$1 = isNullOrUndefined$3;
+  var requireObjectCoercible;
+  var hasRequiredRequireObjectCoercible;
 
-  // `GetMethod` abstract operation
-  // https://tc39.es/ecma262/#sec-getmethod
-  var getMethod$2 = function (V, P) {
-    var func = V[P];
-    return isNullOrUndefined$1(func) ? undefined : aCallable$1(func);
-  };
+  function requireRequireObjectCoercible () {
+  	if (hasRequiredRequireObjectCoercible) return requireObjectCoercible;
+  	hasRequiredRequireObjectCoercible = 1;
+  	var isNullOrUndefined = requireIsNullOrUndefined();
 
-  var call$8 = functionCall;
-  var isCallable$9 = isCallable$e;
-  var isObject$7 = isObject$8;
+  	var $TypeError = TypeError;
 
-  var $TypeError$5 = TypeError;
+  	// `RequireObjectCoercible` abstract operation
+  	// https://tc39.es/ecma262/#sec-requireobjectcoercible
+  	requireObjectCoercible = function (it) {
+  	  if (isNullOrUndefined(it)) throw new $TypeError("Can't call method on " + it);
+  	  return it;
+  	};
+  	return requireObjectCoercible;
+  }
 
-  // `OrdinaryToPrimitive` abstract operation
-  // https://tc39.es/ecma262/#sec-ordinarytoprimitive
-  var ordinaryToPrimitive$1 = function (input, pref) {
-    var fn, val;
-    if (pref === 'string' && isCallable$9(fn = input.toString) && !isObject$7(val = call$8(fn, input))) return val;
-    if (isCallable$9(fn = input.valueOf) && !isObject$7(val = call$8(fn, input))) return val;
-    if (pref !== 'string' && isCallable$9(fn = input.toString) && !isObject$7(val = call$8(fn, input))) return val;
-    throw new $TypeError$5("Can't convert object to primitive value");
-  };
+  var toIndexedObject;
+  var hasRequiredToIndexedObject;
+
+  function requireToIndexedObject () {
+  	if (hasRequiredToIndexedObject) return toIndexedObject;
+  	hasRequiredToIndexedObject = 1;
+  	// toObject with fallback for non-array-like ES3 strings
+  	var IndexedObject = requireIndexedObject();
+  	var requireObjectCoercible = requireRequireObjectCoercible();
+
+  	toIndexedObject = function (it) {
+  	  return IndexedObject(requireObjectCoercible(it));
+  	};
+  	return toIndexedObject;
+  }
+
+  var isCallable;
+  var hasRequiredIsCallable;
+
+  function requireIsCallable () {
+  	if (hasRequiredIsCallable) return isCallable;
+  	hasRequiredIsCallable = 1;
+  	// https://tc39.es/ecma262/#sec-IsHTMLDDA-internal-slot
+  	var documentAll = typeof document == 'object' && document.all;
+
+  	// `IsCallable` abstract operation
+  	// https://tc39.es/ecma262/#sec-iscallable
+  	// eslint-disable-next-line unicorn/no-typeof-undefined -- required for testing
+  	isCallable = typeof documentAll == 'undefined' && documentAll !== undefined ? function (argument) {
+  	  return typeof argument == 'function' || argument === documentAll;
+  	} : function (argument) {
+  	  return typeof argument == 'function';
+  	};
+  	return isCallable;
+  }
+
+  var isObject;
+  var hasRequiredIsObject;
+
+  function requireIsObject () {
+  	if (hasRequiredIsObject) return isObject;
+  	hasRequiredIsObject = 1;
+  	var isCallable = requireIsCallable();
+
+  	isObject = function (it) {
+  	  return typeof it == 'object' ? it !== null : isCallable(it);
+  	};
+  	return isObject;
+  }
+
+  var getBuiltIn;
+  var hasRequiredGetBuiltIn;
+
+  function requireGetBuiltIn () {
+  	if (hasRequiredGetBuiltIn) return getBuiltIn;
+  	hasRequiredGetBuiltIn = 1;
+  	var globalThis = requireGlobalThis();
+  	var isCallable = requireIsCallable();
+
+  	var aFunction = function (argument) {
+  	  return isCallable(argument) ? argument : undefined;
+  	};
+
+  	getBuiltIn = function (namespace, method) {
+  	  return arguments.length < 2 ? aFunction(globalThis[namespace]) : globalThis[namespace] && globalThis[namespace][method];
+  	};
+  	return getBuiltIn;
+  }
+
+  var objectIsPrototypeOf;
+  var hasRequiredObjectIsPrototypeOf;
+
+  function requireObjectIsPrototypeOf () {
+  	if (hasRequiredObjectIsPrototypeOf) return objectIsPrototypeOf;
+  	hasRequiredObjectIsPrototypeOf = 1;
+  	var uncurryThis = requireFunctionUncurryThis();
+
+  	objectIsPrototypeOf = uncurryThis({}.isPrototypeOf);
+  	return objectIsPrototypeOf;
+  }
+
+  var environmentUserAgent;
+  var hasRequiredEnvironmentUserAgent;
+
+  function requireEnvironmentUserAgent () {
+  	if (hasRequiredEnvironmentUserAgent) return environmentUserAgent;
+  	hasRequiredEnvironmentUserAgent = 1;
+  	var globalThis = requireGlobalThis();
+
+  	var navigator = globalThis.navigator;
+  	var userAgent = navigator && navigator.userAgent;
+
+  	environmentUserAgent = userAgent ? String(userAgent) : '';
+  	return environmentUserAgent;
+  }
+
+  var environmentV8Version;
+  var hasRequiredEnvironmentV8Version;
+
+  function requireEnvironmentV8Version () {
+  	if (hasRequiredEnvironmentV8Version) return environmentV8Version;
+  	hasRequiredEnvironmentV8Version = 1;
+  	var globalThis = requireGlobalThis();
+  	var userAgent = requireEnvironmentUserAgent();
+
+  	var process = globalThis.process;
+  	var Deno = globalThis.Deno;
+  	var versions = process && process.versions || Deno && Deno.version;
+  	var v8 = versions && versions.v8;
+  	var match, version;
+
+  	if (v8) {
+  	  match = v8.split('.');
+  	  // in old Chrome, versions of V8 isn't V8 = Chrome / 10
+  	  // but their correct versions are not interesting for us
+  	  version = match[0] > 0 && match[0] < 4 ? 1 : +(match[0] + match[1]);
+  	}
+
+  	// BrowserFS NodeJS `process` polyfill incorrectly set `.v8` to `0.0`
+  	// so check `userAgent` even if `.v8` exists, but 0
+  	if (!version && userAgent) {
+  	  match = userAgent.match(/Edge\/(\d+)/);
+  	  if (!match || match[1] >= 74) {
+  	    match = userAgent.match(/Chrome\/(\d+)/);
+  	    if (match) version = +match[1];
+  	  }
+  	}
+
+  	environmentV8Version = version;
+  	return environmentV8Version;
+  }
+
+  var symbolConstructorDetection;
+  var hasRequiredSymbolConstructorDetection;
+
+  function requireSymbolConstructorDetection () {
+  	if (hasRequiredSymbolConstructorDetection) return symbolConstructorDetection;
+  	hasRequiredSymbolConstructorDetection = 1;
+  	/* eslint-disable es/no-symbol -- required for testing */
+  	var V8_VERSION = requireEnvironmentV8Version();
+  	var fails = requireFails();
+  	var globalThis = requireGlobalThis();
+
+  	var $String = globalThis.String;
+
+  	// eslint-disable-next-line es/no-object-getownpropertysymbols -- required for testing
+  	symbolConstructorDetection = !!Object.getOwnPropertySymbols && !fails(function () {
+  	  var symbol = Symbol('symbol detection');
+  	  // Chrome 38 Symbol has incorrect toString conversion
+  	  // `get-own-property-symbols` polyfill symbols converted to object are not Symbol instances
+  	  // nb: Do not call `String` directly to avoid this being optimized out to `symbol+''` which will,
+  	  // of course, fail.
+  	  return !$String(symbol) || !(Object(symbol) instanceof Symbol) ||
+  	    // Chrome 38-40 symbols are not inherited from DOM collections prototypes to instances
+  	    !Symbol.sham && V8_VERSION && V8_VERSION < 41;
+  	});
+  	return symbolConstructorDetection;
+  }
+
+  var useSymbolAsUid;
+  var hasRequiredUseSymbolAsUid;
+
+  function requireUseSymbolAsUid () {
+  	if (hasRequiredUseSymbolAsUid) return useSymbolAsUid;
+  	hasRequiredUseSymbolAsUid = 1;
+  	/* eslint-disable es/no-symbol -- required for testing */
+  	var NATIVE_SYMBOL = requireSymbolConstructorDetection();
+
+  	useSymbolAsUid = NATIVE_SYMBOL &&
+  	  !Symbol.sham &&
+  	  typeof Symbol.iterator == 'symbol';
+  	return useSymbolAsUid;
+  }
+
+  var isSymbol;
+  var hasRequiredIsSymbol;
+
+  function requireIsSymbol () {
+  	if (hasRequiredIsSymbol) return isSymbol;
+  	hasRequiredIsSymbol = 1;
+  	var getBuiltIn = requireGetBuiltIn();
+  	var isCallable = requireIsCallable();
+  	var isPrototypeOf = requireObjectIsPrototypeOf();
+  	var USE_SYMBOL_AS_UID = requireUseSymbolAsUid();
+
+  	var $Object = Object;
+
+  	isSymbol = USE_SYMBOL_AS_UID ? function (it) {
+  	  return typeof it == 'symbol';
+  	} : function (it) {
+  	  var $Symbol = getBuiltIn('Symbol');
+  	  return isCallable($Symbol) && isPrototypeOf($Symbol.prototype, $Object(it));
+  	};
+  	return isSymbol;
+  }
+
+  var tryToString;
+  var hasRequiredTryToString;
+
+  function requireTryToString () {
+  	if (hasRequiredTryToString) return tryToString;
+  	hasRequiredTryToString = 1;
+  	var $String = String;
+
+  	tryToString = function (argument) {
+  	  try {
+  	    return $String(argument);
+  	  } catch (error) {
+  	    return 'Object';
+  	  }
+  	};
+  	return tryToString;
+  }
+
+  var aCallable;
+  var hasRequiredACallable;
+
+  function requireACallable () {
+  	if (hasRequiredACallable) return aCallable;
+  	hasRequiredACallable = 1;
+  	var isCallable = requireIsCallable();
+  	var tryToString = requireTryToString();
+
+  	var $TypeError = TypeError;
+
+  	// `Assert: IsCallable(argument) is true`
+  	aCallable = function (argument) {
+  	  if (isCallable(argument)) return argument;
+  	  throw new $TypeError(tryToString(argument) + ' is not a function');
+  	};
+  	return aCallable;
+  }
+
+  var getMethod;
+  var hasRequiredGetMethod;
+
+  function requireGetMethod () {
+  	if (hasRequiredGetMethod) return getMethod;
+  	hasRequiredGetMethod = 1;
+  	var aCallable = requireACallable();
+  	var isNullOrUndefined = requireIsNullOrUndefined();
+
+  	// `GetMethod` abstract operation
+  	// https://tc39.es/ecma262/#sec-getmethod
+  	getMethod = function (V, P) {
+  	  var func = V[P];
+  	  return isNullOrUndefined(func) ? undefined : aCallable(func);
+  	};
+  	return getMethod;
+  }
+
+  var ordinaryToPrimitive;
+  var hasRequiredOrdinaryToPrimitive;
+
+  function requireOrdinaryToPrimitive () {
+  	if (hasRequiredOrdinaryToPrimitive) return ordinaryToPrimitive;
+  	hasRequiredOrdinaryToPrimitive = 1;
+  	var call = requireFunctionCall();
+  	var isCallable = requireIsCallable();
+  	var isObject = requireIsObject();
+
+  	var $TypeError = TypeError;
+
+  	// `OrdinaryToPrimitive` abstract operation
+  	// https://tc39.es/ecma262/#sec-ordinarytoprimitive
+  	ordinaryToPrimitive = function (input, pref) {
+  	  var fn, val;
+  	  if (pref === 'string' && isCallable(fn = input.toString) && !isObject(val = call(fn, input))) return val;
+  	  if (isCallable(fn = input.valueOf) && !isObject(val = call(fn, input))) return val;
+  	  if (pref !== 'string' && isCallable(fn = input.toString) && !isObject(val = call(fn, input))) return val;
+  	  throw new $TypeError("Can't convert object to primitive value");
+  	};
+  	return ordinaryToPrimitive;
+  }
 
   var sharedStore = {exports: {}};
 
-  var global$a = global$e;
+  var isPure;
+  var hasRequiredIsPure;
 
-  // eslint-disable-next-line es/no-object-defineproperty -- safe
-  var defineProperty$3 = Object.defineProperty;
+  function requireIsPure () {
+  	if (hasRequiredIsPure) return isPure;
+  	hasRequiredIsPure = 1;
+  	isPure = false;
+  	return isPure;
+  }
 
-  var defineGlobalProperty$3 = function (key, value) {
-    try {
-      defineProperty$3(global$a, key, { value: value, configurable: true, writable: true });
-    } catch (error) {
-      global$a[key] = value;
-    } return value;
-  };
+  var defineGlobalProperty;
+  var hasRequiredDefineGlobalProperty;
 
-  var globalThis$1 = global$e;
-  var defineGlobalProperty$2 = defineGlobalProperty$3;
+  function requireDefineGlobalProperty () {
+  	if (hasRequiredDefineGlobalProperty) return defineGlobalProperty;
+  	hasRequiredDefineGlobalProperty = 1;
+  	var globalThis = requireGlobalThis();
 
-  var SHARED = '__core-js_shared__';
-  var store$3 = sharedStore.exports = globalThis$1[SHARED] || defineGlobalProperty$2(SHARED, {});
+  	// eslint-disable-next-line es/no-object-defineproperty -- safe
+  	var defineProperty = Object.defineProperty;
 
-  (store$3.versions || (store$3.versions = [])).push({
-    version: '3.36.1',
-    mode: 'global',
-    copyright: '© 2014-2024 Denis Pushkarev (zloirock.ru)',
-    license: 'https://github.com/zloirock/core-js/blob/v3.36.1/LICENSE',
-    source: 'https://github.com/zloirock/core-js'
-  });
+  	defineGlobalProperty = function (key, value) {
+  	  try {
+  	    defineProperty(globalThis, key, { value: value, configurable: true, writable: true });
+  	  } catch (error) {
+  	    globalThis[key] = value;
+  	  } return value;
+  	};
+  	return defineGlobalProperty;
+  }
 
-  var sharedStoreExports = sharedStore.exports;
+  var hasRequiredSharedStore;
 
-  var store$2 = sharedStoreExports;
+  function requireSharedStore () {
+  	if (hasRequiredSharedStore) return sharedStore.exports;
+  	hasRequiredSharedStore = 1;
+  	var IS_PURE = requireIsPure();
+  	var globalThis = requireGlobalThis();
+  	var defineGlobalProperty = requireDefineGlobalProperty();
 
-  var shared$4 = function (key, value) {
-    return store$2[key] || (store$2[key] = value || {});
-  };
+  	var SHARED = '__core-js_shared__';
+  	var store = sharedStore.exports = globalThis[SHARED] || defineGlobalProperty(SHARED, {});
 
-  var requireObjectCoercible$2 = requireObjectCoercible$4;
+  	(store.versions || (store.versions = [])).push({
+  	  version: '3.39.0',
+  	  mode: IS_PURE ? 'pure' : 'global',
+  	  copyright: '© 2014-2024 Denis Pushkarev (zloirock.ru)',
+  	  license: 'https://github.com/zloirock/core-js/blob/v3.39.0/LICENSE',
+  	  source: 'https://github.com/zloirock/core-js'
+  	});
+  	return sharedStore.exports;
+  }
 
-  var $Object$1 = Object;
+  var shared;
+  var hasRequiredShared;
 
-  // `ToObject` abstract operation
-  // https://tc39.es/ecma262/#sec-toobject
-  var toObject$5 = function (argument) {
-    return $Object$1(requireObjectCoercible$2(argument));
-  };
+  function requireShared () {
+  	if (hasRequiredShared) return shared;
+  	hasRequiredShared = 1;
+  	var store = requireSharedStore();
 
-  var uncurryThis$g = functionUncurryThis;
-  var toObject$4 = toObject$5;
+  	shared = function (key, value) {
+  	  return store[key] || (store[key] = value || {});
+  	};
+  	return shared;
+  }
 
-  var hasOwnProperty = uncurryThis$g({}.hasOwnProperty);
+  var toObject;
+  var hasRequiredToObject;
 
-  // `HasOwnProperty` abstract operation
-  // https://tc39.es/ecma262/#sec-hasownproperty
-  // eslint-disable-next-line es/no-object-hasown -- safe
-  var hasOwnProperty_1 = Object.hasOwn || function hasOwn(it, key) {
-    return hasOwnProperty(toObject$4(it), key);
-  };
+  function requireToObject () {
+  	if (hasRequiredToObject) return toObject;
+  	hasRequiredToObject = 1;
+  	var requireObjectCoercible = requireRequireObjectCoercible();
 
-  var uncurryThis$f = functionUncurryThis;
+  	var $Object = Object;
 
-  var id = 0;
-  var postfix = Math.random();
-  var toString$5 = uncurryThis$f(1.0.toString);
+  	// `ToObject` abstract operation
+  	// https://tc39.es/ecma262/#sec-toobject
+  	toObject = function (argument) {
+  	  return $Object(requireObjectCoercible(argument));
+  	};
+  	return toObject;
+  }
 
-  var uid$2 = function (key) {
-    return 'Symbol(' + (key === undefined ? '' : key) + ')_' + toString$5(++id + postfix, 36);
-  };
+  var hasOwnProperty_1;
+  var hasRequiredHasOwnProperty;
 
-  var global$9 = global$e;
-  var shared$3 = shared$4;
-  var hasOwn$6 = hasOwnProperty_1;
-  var uid$1 = uid$2;
-  var NATIVE_SYMBOL = symbolConstructorDetection;
-  var USE_SYMBOL_AS_UID = useSymbolAsUid;
+  function requireHasOwnProperty () {
+  	if (hasRequiredHasOwnProperty) return hasOwnProperty_1;
+  	hasRequiredHasOwnProperty = 1;
+  	var uncurryThis = requireFunctionUncurryThis();
+  	var toObject = requireToObject();
 
-  var Symbol$1 = global$9.Symbol;
-  var WellKnownSymbolsStore = shared$3('wks');
-  var createWellKnownSymbol = USE_SYMBOL_AS_UID ? Symbol$1['for'] || Symbol$1 : Symbol$1 && Symbol$1.withoutSetter || uid$1;
+  	var hasOwnProperty = uncurryThis({}.hasOwnProperty);
 
-  var wellKnownSymbol$a = function (name) {
-    if (!hasOwn$6(WellKnownSymbolsStore, name)) {
-      WellKnownSymbolsStore[name] = NATIVE_SYMBOL && hasOwn$6(Symbol$1, name)
-        ? Symbol$1[name]
-        : createWellKnownSymbol('Symbol.' + name);
-    } return WellKnownSymbolsStore[name];
-  };
+  	// `HasOwnProperty` abstract operation
+  	// https://tc39.es/ecma262/#sec-hasownproperty
+  	// eslint-disable-next-line es/no-object-hasown -- safe
+  	hasOwnProperty_1 = Object.hasOwn || function hasOwn(it, key) {
+  	  return hasOwnProperty(toObject(it), key);
+  	};
+  	return hasOwnProperty_1;
+  }
 
-  var call$7 = functionCall;
-  var isObject$6 = isObject$8;
-  var isSymbol$1 = isSymbol$2;
-  var getMethod$1 = getMethod$2;
-  var ordinaryToPrimitive = ordinaryToPrimitive$1;
-  var wellKnownSymbol$9 = wellKnownSymbol$a;
+  var uid;
+  var hasRequiredUid;
 
-  var $TypeError$4 = TypeError;
-  var TO_PRIMITIVE = wellKnownSymbol$9('toPrimitive');
+  function requireUid () {
+  	if (hasRequiredUid) return uid;
+  	hasRequiredUid = 1;
+  	var uncurryThis = requireFunctionUncurryThis();
 
-  // `ToPrimitive` abstract operation
-  // https://tc39.es/ecma262/#sec-toprimitive
-  var toPrimitive$1 = function (input, pref) {
-    if (!isObject$6(input) || isSymbol$1(input)) return input;
-    var exoticToPrim = getMethod$1(input, TO_PRIMITIVE);
-    var result;
-    if (exoticToPrim) {
-      if (pref === undefined) pref = 'default';
-      result = call$7(exoticToPrim, input, pref);
-      if (!isObject$6(result) || isSymbol$1(result)) return result;
-      throw new $TypeError$4("Can't convert object to primitive value");
-    }
-    if (pref === undefined) pref = 'number';
-    return ordinaryToPrimitive(input, pref);
-  };
+  	var id = 0;
+  	var postfix = Math.random();
+  	var toString = uncurryThis(1.0.toString);
 
-  var toPrimitive = toPrimitive$1;
-  var isSymbol = isSymbol$2;
+  	uid = function (key) {
+  	  return 'Symbol(' + (key === undefined ? '' : key) + ')_' + toString(++id + postfix, 36);
+  	};
+  	return uid;
+  }
 
-  // `ToPropertyKey` abstract operation
-  // https://tc39.es/ecma262/#sec-topropertykey
-  var toPropertyKey$2 = function (argument) {
-    var key = toPrimitive(argument, 'string');
-    return isSymbol(key) ? key : key + '';
-  };
+  var wellKnownSymbol;
+  var hasRequiredWellKnownSymbol;
 
-  var global$8 = global$e;
-  var isObject$5 = isObject$8;
+  function requireWellKnownSymbol () {
+  	if (hasRequiredWellKnownSymbol) return wellKnownSymbol;
+  	hasRequiredWellKnownSymbol = 1;
+  	var globalThis = requireGlobalThis();
+  	var shared = requireShared();
+  	var hasOwn = requireHasOwnProperty();
+  	var uid = requireUid();
+  	var NATIVE_SYMBOL = requireSymbolConstructorDetection();
+  	var USE_SYMBOL_AS_UID = requireUseSymbolAsUid();
 
-  var document$1 = global$8.document;
-  // typeof document.createElement is 'object' in old IE
-  var EXISTS$1 = isObject$5(document$1) && isObject$5(document$1.createElement);
+  	var Symbol = globalThis.Symbol;
+  	var WellKnownSymbolsStore = shared('wks');
+  	var createWellKnownSymbol = USE_SYMBOL_AS_UID ? Symbol['for'] || Symbol : Symbol && Symbol.withoutSetter || uid;
 
-  var documentCreateElement$2 = function (it) {
-    return EXISTS$1 ? document$1.createElement(it) : {};
-  };
+  	wellKnownSymbol = function (name) {
+  	  if (!hasOwn(WellKnownSymbolsStore, name)) {
+  	    WellKnownSymbolsStore[name] = NATIVE_SYMBOL && hasOwn(Symbol, name)
+  	      ? Symbol[name]
+  	      : createWellKnownSymbol('Symbol.' + name);
+  	  } return WellKnownSymbolsStore[name];
+  	};
+  	return wellKnownSymbol;
+  }
 
-  var DESCRIPTORS$9 = descriptors;
-  var fails$d = fails$i;
-  var createElement = documentCreateElement$2;
+  var toPrimitive;
+  var hasRequiredToPrimitive;
 
-  // Thanks to IE8 for its funny defineProperty
-  var ie8DomDefine = !DESCRIPTORS$9 && !fails$d(function () {
-    // eslint-disable-next-line es/no-object-defineproperty -- required for testing
-    return Object.defineProperty(createElement('div'), 'a', {
-      get: function () { return 7; }
-    }).a !== 7;
-  });
+  function requireToPrimitive () {
+  	if (hasRequiredToPrimitive) return toPrimitive;
+  	hasRequiredToPrimitive = 1;
+  	var call = requireFunctionCall();
+  	var isObject = requireIsObject();
+  	var isSymbol = requireIsSymbol();
+  	var getMethod = requireGetMethod();
+  	var ordinaryToPrimitive = requireOrdinaryToPrimitive();
+  	var wellKnownSymbol = requireWellKnownSymbol();
 
-  var DESCRIPTORS$8 = descriptors;
-  var call$6 = functionCall;
-  var propertyIsEnumerableModule$1 = objectPropertyIsEnumerable;
-  var createPropertyDescriptor$2 = createPropertyDescriptor$3;
-  var toIndexedObject$5 = toIndexedObject$6;
-  var toPropertyKey$1 = toPropertyKey$2;
-  var hasOwn$5 = hasOwnProperty_1;
-  var IE8_DOM_DEFINE$1 = ie8DomDefine;
+  	var $TypeError = TypeError;
+  	var TO_PRIMITIVE = wellKnownSymbol('toPrimitive');
 
-  // eslint-disable-next-line es/no-object-getownpropertydescriptor -- safe
-  var $getOwnPropertyDescriptor$1 = Object.getOwnPropertyDescriptor;
+  	// `ToPrimitive` abstract operation
+  	// https://tc39.es/ecma262/#sec-toprimitive
+  	toPrimitive = function (input, pref) {
+  	  if (!isObject(input) || isSymbol(input)) return input;
+  	  var exoticToPrim = getMethod(input, TO_PRIMITIVE);
+  	  var result;
+  	  if (exoticToPrim) {
+  	    if (pref === undefined) pref = 'default';
+  	    result = call(exoticToPrim, input, pref);
+  	    if (!isObject(result) || isSymbol(result)) return result;
+  	    throw new $TypeError("Can't convert object to primitive value");
+  	  }
+  	  if (pref === undefined) pref = 'number';
+  	  return ordinaryToPrimitive(input, pref);
+  	};
+  	return toPrimitive;
+  }
 
-  // `Object.getOwnPropertyDescriptor` method
-  // https://tc39.es/ecma262/#sec-object.getownpropertydescriptor
-  objectGetOwnPropertyDescriptor.f = DESCRIPTORS$8 ? $getOwnPropertyDescriptor$1 : function getOwnPropertyDescriptor(O, P) {
-    O = toIndexedObject$5(O);
-    P = toPropertyKey$1(P);
-    if (IE8_DOM_DEFINE$1) try {
-      return $getOwnPropertyDescriptor$1(O, P);
-    } catch (error) { /* empty */ }
-    if (hasOwn$5(O, P)) return createPropertyDescriptor$2(!call$6(propertyIsEnumerableModule$1.f, O, P), O[P]);
-  };
+  var toPropertyKey;
+  var hasRequiredToPropertyKey;
+
+  function requireToPropertyKey () {
+  	if (hasRequiredToPropertyKey) return toPropertyKey;
+  	hasRequiredToPropertyKey = 1;
+  	var toPrimitive = requireToPrimitive();
+  	var isSymbol = requireIsSymbol();
+
+  	// `ToPropertyKey` abstract operation
+  	// https://tc39.es/ecma262/#sec-topropertykey
+  	toPropertyKey = function (argument) {
+  	  var key = toPrimitive(argument, 'string');
+  	  return isSymbol(key) ? key : key + '';
+  	};
+  	return toPropertyKey;
+  }
+
+  var documentCreateElement;
+  var hasRequiredDocumentCreateElement;
+
+  function requireDocumentCreateElement () {
+  	if (hasRequiredDocumentCreateElement) return documentCreateElement;
+  	hasRequiredDocumentCreateElement = 1;
+  	var globalThis = requireGlobalThis();
+  	var isObject = requireIsObject();
+
+  	var document = globalThis.document;
+  	// typeof document.createElement is 'object' in old IE
+  	var EXISTS = isObject(document) && isObject(document.createElement);
+
+  	documentCreateElement = function (it) {
+  	  return EXISTS ? document.createElement(it) : {};
+  	};
+  	return documentCreateElement;
+  }
+
+  var ie8DomDefine;
+  var hasRequiredIe8DomDefine;
+
+  function requireIe8DomDefine () {
+  	if (hasRequiredIe8DomDefine) return ie8DomDefine;
+  	hasRequiredIe8DomDefine = 1;
+  	var DESCRIPTORS = requireDescriptors();
+  	var fails = requireFails();
+  	var createElement = requireDocumentCreateElement();
+
+  	// Thanks to IE8 for its funny defineProperty
+  	ie8DomDefine = !DESCRIPTORS && !fails(function () {
+  	  // eslint-disable-next-line es/no-object-defineproperty -- required for testing
+  	  return Object.defineProperty(createElement('div'), 'a', {
+  	    get: function () { return 7; }
+  	  }).a !== 7;
+  	});
+  	return ie8DomDefine;
+  }
+
+  var hasRequiredObjectGetOwnPropertyDescriptor;
+
+  function requireObjectGetOwnPropertyDescriptor () {
+  	if (hasRequiredObjectGetOwnPropertyDescriptor) return objectGetOwnPropertyDescriptor;
+  	hasRequiredObjectGetOwnPropertyDescriptor = 1;
+  	var DESCRIPTORS = requireDescriptors();
+  	var call = requireFunctionCall();
+  	var propertyIsEnumerableModule = requireObjectPropertyIsEnumerable();
+  	var createPropertyDescriptor = requireCreatePropertyDescriptor();
+  	var toIndexedObject = requireToIndexedObject();
+  	var toPropertyKey = requireToPropertyKey();
+  	var hasOwn = requireHasOwnProperty();
+  	var IE8_DOM_DEFINE = requireIe8DomDefine();
+
+  	// eslint-disable-next-line es/no-object-getownpropertydescriptor -- safe
+  	var $getOwnPropertyDescriptor = Object.getOwnPropertyDescriptor;
+
+  	// `Object.getOwnPropertyDescriptor` method
+  	// https://tc39.es/ecma262/#sec-object.getownpropertydescriptor
+  	objectGetOwnPropertyDescriptor.f = DESCRIPTORS ? $getOwnPropertyDescriptor : function getOwnPropertyDescriptor(O, P) {
+  	  O = toIndexedObject(O);
+  	  P = toPropertyKey(P);
+  	  if (IE8_DOM_DEFINE) try {
+  	    return $getOwnPropertyDescriptor(O, P);
+  	  } catch (error) { /* empty */ }
+  	  if (hasOwn(O, P)) return createPropertyDescriptor(!call(propertyIsEnumerableModule.f, O, P), O[P]);
+  	};
+  	return objectGetOwnPropertyDescriptor;
+  }
 
   var objectDefineProperty = {};
 
-  var DESCRIPTORS$7 = descriptors;
-  var fails$c = fails$i;
+  var v8PrototypeDefineBug;
+  var hasRequiredV8PrototypeDefineBug;
 
-  // V8 ~ Chrome 36-
-  // https://bugs.chromium.org/p/v8/issues/detail?id=3334
-  var v8PrototypeDefineBug = DESCRIPTORS$7 && fails$c(function () {
-    // eslint-disable-next-line es/no-object-defineproperty -- required for testing
-    return Object.defineProperty(function () { /* empty */ }, 'prototype', {
-      value: 42,
-      writable: false
-    }).prototype !== 42;
-  });
+  function requireV8PrototypeDefineBug () {
+  	if (hasRequiredV8PrototypeDefineBug) return v8PrototypeDefineBug;
+  	hasRequiredV8PrototypeDefineBug = 1;
+  	var DESCRIPTORS = requireDescriptors();
+  	var fails = requireFails();
 
-  var isObject$4 = isObject$8;
-
-  var $String$2 = String;
-  var $TypeError$3 = TypeError;
-
-  // `Assert: Type(argument) is Object`
-  var anObject$7 = function (argument) {
-    if (isObject$4(argument)) return argument;
-    throw new $TypeError$3($String$2(argument) + ' is not an object');
-  };
-
-  var DESCRIPTORS$6 = descriptors;
-  var IE8_DOM_DEFINE = ie8DomDefine;
-  var V8_PROTOTYPE_DEFINE_BUG$1 = v8PrototypeDefineBug;
-  var anObject$6 = anObject$7;
-  var toPropertyKey = toPropertyKey$2;
-
-  var $TypeError$2 = TypeError;
-  // eslint-disable-next-line es/no-object-defineproperty -- safe
-  var $defineProperty = Object.defineProperty;
-  // eslint-disable-next-line es/no-object-getownpropertydescriptor -- safe
-  var $getOwnPropertyDescriptor = Object.getOwnPropertyDescriptor;
-  var ENUMERABLE = 'enumerable';
-  var CONFIGURABLE$1 = 'configurable';
-  var WRITABLE = 'writable';
-
-  // `Object.defineProperty` method
-  // https://tc39.es/ecma262/#sec-object.defineproperty
-  objectDefineProperty.f = DESCRIPTORS$6 ? V8_PROTOTYPE_DEFINE_BUG$1 ? function defineProperty(O, P, Attributes) {
-    anObject$6(O);
-    P = toPropertyKey(P);
-    anObject$6(Attributes);
-    if (typeof O === 'function' && P === 'prototype' && 'value' in Attributes && WRITABLE in Attributes && !Attributes[WRITABLE]) {
-      var current = $getOwnPropertyDescriptor(O, P);
-      if (current && current[WRITABLE]) {
-        O[P] = Attributes.value;
-        Attributes = {
-          configurable: CONFIGURABLE$1 in Attributes ? Attributes[CONFIGURABLE$1] : current[CONFIGURABLE$1],
-          enumerable: ENUMERABLE in Attributes ? Attributes[ENUMERABLE] : current[ENUMERABLE],
-          writable: false
-        };
-      }
-    } return $defineProperty(O, P, Attributes);
-  } : $defineProperty : function defineProperty(O, P, Attributes) {
-    anObject$6(O);
-    P = toPropertyKey(P);
-    anObject$6(Attributes);
-    if (IE8_DOM_DEFINE) try {
-      return $defineProperty(O, P, Attributes);
-    } catch (error) { /* empty */ }
-    if ('get' in Attributes || 'set' in Attributes) throw new $TypeError$2('Accessors not supported');
-    if ('value' in Attributes) O[P] = Attributes.value;
-    return O;
-  };
-
-  var DESCRIPTORS$5 = descriptors;
-  var definePropertyModule$4 = objectDefineProperty;
-  var createPropertyDescriptor$1 = createPropertyDescriptor$3;
-
-  var createNonEnumerableProperty$4 = DESCRIPTORS$5 ? function (object, key, value) {
-    return definePropertyModule$4.f(object, key, createPropertyDescriptor$1(1, value));
-  } : function (object, key, value) {
-    object[key] = value;
-    return object;
-  };
-
-  var makeBuiltIn$2 = {exports: {}};
-
-  var DESCRIPTORS$4 = descriptors;
-  var hasOwn$4 = hasOwnProperty_1;
-
-  var FunctionPrototype$1 = Function.prototype;
-  // eslint-disable-next-line es/no-object-getownpropertydescriptor -- safe
-  var getDescriptor = DESCRIPTORS$4 && Object.getOwnPropertyDescriptor;
-
-  var EXISTS = hasOwn$4(FunctionPrototype$1, 'name');
-  // additional protection from minified / mangled / dropped function names
-  var PROPER = EXISTS && (function something() { /* empty */ }).name === 'something';
-  var CONFIGURABLE = EXISTS && (!DESCRIPTORS$4 || (DESCRIPTORS$4 && getDescriptor(FunctionPrototype$1, 'name').configurable));
-
-  var functionName = {
-    EXISTS: EXISTS,
-    PROPER: PROPER,
-    CONFIGURABLE: CONFIGURABLE
-  };
-
-  var uncurryThis$e = functionUncurryThis;
-  var isCallable$8 = isCallable$e;
-  var store$1 = sharedStoreExports;
-
-  var functionToString = uncurryThis$e(Function.toString);
-
-  // this helper broken in `core-js@3.4.1-3.4.4`, so we can't use `shared` helper
-  if (!isCallable$8(store$1.inspectSource)) {
-    store$1.inspectSource = function (it) {
-      return functionToString(it);
-    };
+  	// V8 ~ Chrome 36-
+  	// https://bugs.chromium.org/p/v8/issues/detail?id=3334
+  	v8PrototypeDefineBug = DESCRIPTORS && fails(function () {
+  	  // eslint-disable-next-line es/no-object-defineproperty -- required for testing
+  	  return Object.defineProperty(function () { /* empty */ }, 'prototype', {
+  	    value: 42,
+  	    writable: false
+  	  }).prototype !== 42;
+  	});
+  	return v8PrototypeDefineBug;
   }
 
-  var inspectSource$2 = store$1.inspectSource;
+  var anObject;
+  var hasRequiredAnObject;
 
-  var global$7 = global$e;
-  var isCallable$7 = isCallable$e;
+  function requireAnObject () {
+  	if (hasRequiredAnObject) return anObject;
+  	hasRequiredAnObject = 1;
+  	var isObject = requireIsObject();
 
-  var WeakMap$1 = global$7.WeakMap;
+  	var $String = String;
+  	var $TypeError = TypeError;
 
-  var weakMapBasicDetection = isCallable$7(WeakMap$1) && /native code/.test(String(WeakMap$1));
-
-  var shared$2 = shared$4;
-  var uid = uid$2;
-
-  var keys = shared$2('keys');
-
-  var sharedKey$2 = function (key) {
-    return keys[key] || (keys[key] = uid(key));
-  };
-
-  var hiddenKeys$4 = {};
-
-  var NATIVE_WEAK_MAP = weakMapBasicDetection;
-  var global$6 = global$e;
-  var isObject$3 = isObject$8;
-  var createNonEnumerableProperty$3 = createNonEnumerableProperty$4;
-  var hasOwn$3 = hasOwnProperty_1;
-  var shared$1 = sharedStoreExports;
-  var sharedKey$1 = sharedKey$2;
-  var hiddenKeys$3 = hiddenKeys$4;
-
-  var OBJECT_ALREADY_INITIALIZED = 'Object already initialized';
-  var TypeError$1 = global$6.TypeError;
-  var WeakMap = global$6.WeakMap;
-  var set, get, has;
-
-  var enforce = function (it) {
-    return has(it) ? get(it) : set(it, {});
-  };
-
-  var getterFor = function (TYPE) {
-    return function (it) {
-      var state;
-      if (!isObject$3(it) || (state = get(it)).type !== TYPE) {
-        throw new TypeError$1('Incompatible receiver, ' + TYPE + ' required');
-      } return state;
-    };
-  };
-
-  if (NATIVE_WEAK_MAP || shared$1.state) {
-    var store = shared$1.state || (shared$1.state = new WeakMap());
-    /* eslint-disable no-self-assign -- prototype methods protection */
-    store.get = store.get;
-    store.has = store.has;
-    store.set = store.set;
-    /* eslint-enable no-self-assign -- prototype methods protection */
-    set = function (it, metadata) {
-      if (store.has(it)) throw new TypeError$1(OBJECT_ALREADY_INITIALIZED);
-      metadata.facade = it;
-      store.set(it, metadata);
-      return metadata;
-    };
-    get = function (it) {
-      return store.get(it) || {};
-    };
-    has = function (it) {
-      return store.has(it);
-    };
-  } else {
-    var STATE = sharedKey$1('state');
-    hiddenKeys$3[STATE] = true;
-    set = function (it, metadata) {
-      if (hasOwn$3(it, STATE)) throw new TypeError$1(OBJECT_ALREADY_INITIALIZED);
-      metadata.facade = it;
-      createNonEnumerableProperty$3(it, STATE, metadata);
-      return metadata;
-    };
-    get = function (it) {
-      return hasOwn$3(it, STATE) ? it[STATE] : {};
-    };
-    has = function (it) {
-      return hasOwn$3(it, STATE);
-    };
+  	// `Assert: Type(argument) is Object`
+  	anObject = function (argument) {
+  	  if (isObject(argument)) return argument;
+  	  throw new $TypeError($String(argument) + ' is not an object');
+  	};
+  	return anObject;
   }
 
-  var internalState = {
-    set: set,
-    get: get,
-    has: has,
-    enforce: enforce,
-    getterFor: getterFor
-  };
+  var hasRequiredObjectDefineProperty;
 
-  var uncurryThis$d = functionUncurryThis;
-  var fails$b = fails$i;
-  var isCallable$6 = isCallable$e;
-  var hasOwn$2 = hasOwnProperty_1;
-  var DESCRIPTORS$3 = descriptors;
-  var CONFIGURABLE_FUNCTION_NAME = functionName.CONFIGURABLE;
-  var inspectSource$1 = inspectSource$2;
-  var InternalStateModule = internalState;
+  function requireObjectDefineProperty () {
+  	if (hasRequiredObjectDefineProperty) return objectDefineProperty;
+  	hasRequiredObjectDefineProperty = 1;
+  	var DESCRIPTORS = requireDescriptors();
+  	var IE8_DOM_DEFINE = requireIe8DomDefine();
+  	var V8_PROTOTYPE_DEFINE_BUG = requireV8PrototypeDefineBug();
+  	var anObject = requireAnObject();
+  	var toPropertyKey = requireToPropertyKey();
 
-  var enforceInternalState = InternalStateModule.enforce;
-  var getInternalState$1 = InternalStateModule.get;
-  var $String$1 = String;
-  // eslint-disable-next-line es/no-object-defineproperty -- safe
-  var defineProperty$2 = Object.defineProperty;
-  var stringSlice$4 = uncurryThis$d(''.slice);
-  var replace$2 = uncurryThis$d(''.replace);
-  var join = uncurryThis$d([].join);
+  	var $TypeError = TypeError;
+  	// eslint-disable-next-line es/no-object-defineproperty -- safe
+  	var $defineProperty = Object.defineProperty;
+  	// eslint-disable-next-line es/no-object-getownpropertydescriptor -- safe
+  	var $getOwnPropertyDescriptor = Object.getOwnPropertyDescriptor;
+  	var ENUMERABLE = 'enumerable';
+  	var CONFIGURABLE = 'configurable';
+  	var WRITABLE = 'writable';
 
-  var CONFIGURABLE_LENGTH = DESCRIPTORS$3 && !fails$b(function () {
-    return defineProperty$2(function () { /* empty */ }, 'length', { value: 8 }).length !== 8;
-  });
+  	// `Object.defineProperty` method
+  	// https://tc39.es/ecma262/#sec-object.defineproperty
+  	objectDefineProperty.f = DESCRIPTORS ? V8_PROTOTYPE_DEFINE_BUG ? function defineProperty(O, P, Attributes) {
+  	  anObject(O);
+  	  P = toPropertyKey(P);
+  	  anObject(Attributes);
+  	  if (typeof O === 'function' && P === 'prototype' && 'value' in Attributes && WRITABLE in Attributes && !Attributes[WRITABLE]) {
+  	    var current = $getOwnPropertyDescriptor(O, P);
+  	    if (current && current[WRITABLE]) {
+  	      O[P] = Attributes.value;
+  	      Attributes = {
+  	        configurable: CONFIGURABLE in Attributes ? Attributes[CONFIGURABLE] : current[CONFIGURABLE],
+  	        enumerable: ENUMERABLE in Attributes ? Attributes[ENUMERABLE] : current[ENUMERABLE],
+  	        writable: false
+  	      };
+  	    }
+  	  } return $defineProperty(O, P, Attributes);
+  	} : $defineProperty : function defineProperty(O, P, Attributes) {
+  	  anObject(O);
+  	  P = toPropertyKey(P);
+  	  anObject(Attributes);
+  	  if (IE8_DOM_DEFINE) try {
+  	    return $defineProperty(O, P, Attributes);
+  	  } catch (error) { /* empty */ }
+  	  if ('get' in Attributes || 'set' in Attributes) throw new $TypeError('Accessors not supported');
+  	  if ('value' in Attributes) O[P] = Attributes.value;
+  	  return O;
+  	};
+  	return objectDefineProperty;
+  }
 
-  var TEMPLATE = String(String).split('String');
+  var createNonEnumerableProperty;
+  var hasRequiredCreateNonEnumerableProperty;
 
-  var makeBuiltIn$1 = makeBuiltIn$2.exports = function (value, name, options) {
-    if (stringSlice$4($String$1(name), 0, 7) === 'Symbol(') {
-      name = '[' + replace$2($String$1(name), /^Symbol\(([^)]*)\).*$/, '$1') + ']';
-    }
-    if (options && options.getter) name = 'get ' + name;
-    if (options && options.setter) name = 'set ' + name;
-    if (!hasOwn$2(value, 'name') || (CONFIGURABLE_FUNCTION_NAME && value.name !== name)) {
-      if (DESCRIPTORS$3) defineProperty$2(value, 'name', { value: name, configurable: true });
-      else value.name = name;
-    }
-    if (CONFIGURABLE_LENGTH && options && hasOwn$2(options, 'arity') && value.length !== options.arity) {
-      defineProperty$2(value, 'length', { value: options.arity });
-    }
-    try {
-      if (options && hasOwn$2(options, 'constructor') && options.constructor) {
-        if (DESCRIPTORS$3) defineProperty$2(value, 'prototype', { writable: false });
-      // in V8 ~ Chrome 53, prototypes of some methods, like `Array.prototype.values`, are non-writable
-      } else if (value.prototype) value.prototype = undefined;
-    } catch (error) { /* empty */ }
-    var state = enforceInternalState(value);
-    if (!hasOwn$2(state, 'source')) {
-      state.source = join(TEMPLATE, typeof name == 'string' ? name : '');
-    } return value;
-  };
+  function requireCreateNonEnumerableProperty () {
+  	if (hasRequiredCreateNonEnumerableProperty) return createNonEnumerableProperty;
+  	hasRequiredCreateNonEnumerableProperty = 1;
+  	var DESCRIPTORS = requireDescriptors();
+  	var definePropertyModule = requireObjectDefineProperty();
+  	var createPropertyDescriptor = requireCreatePropertyDescriptor();
 
-  // add fake Function#toString for correct work wrapped methods / constructors with methods like LoDash isNative
-  // eslint-disable-next-line no-extend-native -- required
-  Function.prototype.toString = makeBuiltIn$1(function toString() {
-    return isCallable$6(this) && getInternalState$1(this).source || inspectSource$1(this);
-  }, 'toString');
+  	createNonEnumerableProperty = DESCRIPTORS ? function (object, key, value) {
+  	  return definePropertyModule.f(object, key, createPropertyDescriptor(1, value));
+  	} : function (object, key, value) {
+  	  object[key] = value;
+  	  return object;
+  	};
+  	return createNonEnumerableProperty;
+  }
 
-  var makeBuiltInExports = makeBuiltIn$2.exports;
+  var makeBuiltIn = {exports: {}};
 
-  var isCallable$5 = isCallable$e;
-  var definePropertyModule$3 = objectDefineProperty;
-  var makeBuiltIn = makeBuiltInExports;
-  var defineGlobalProperty$1 = defineGlobalProperty$3;
+  var functionName;
+  var hasRequiredFunctionName;
 
-  var defineBuiltIn$3 = function (O, key, value, options) {
-    if (!options) options = {};
-    var simple = options.enumerable;
-    var name = options.name !== undefined ? options.name : key;
-    if (isCallable$5(value)) makeBuiltIn(value, name, options);
-    if (options.global) {
-      if (simple) O[key] = value;
-      else defineGlobalProperty$1(key, value);
-    } else {
-      try {
-        if (!options.unsafe) delete O[key];
-        else if (O[key]) simple = true;
-      } catch (error) { /* empty */ }
-      if (simple) O[key] = value;
-      else definePropertyModule$3.f(O, key, {
-        value: value,
-        enumerable: false,
-        configurable: !options.nonConfigurable,
-        writable: !options.nonWritable
-      });
-    } return O;
-  };
+  function requireFunctionName () {
+  	if (hasRequiredFunctionName) return functionName;
+  	hasRequiredFunctionName = 1;
+  	var DESCRIPTORS = requireDescriptors();
+  	var hasOwn = requireHasOwnProperty();
+
+  	var FunctionPrototype = Function.prototype;
+  	// eslint-disable-next-line es/no-object-getownpropertydescriptor -- safe
+  	var getDescriptor = DESCRIPTORS && Object.getOwnPropertyDescriptor;
+
+  	var EXISTS = hasOwn(FunctionPrototype, 'name');
+  	// additional protection from minified / mangled / dropped function names
+  	var PROPER = EXISTS && (function something() { /* empty */ }).name === 'something';
+  	var CONFIGURABLE = EXISTS && (!DESCRIPTORS || (DESCRIPTORS && getDescriptor(FunctionPrototype, 'name').configurable));
+
+  	functionName = {
+  	  EXISTS: EXISTS,
+  	  PROPER: PROPER,
+  	  CONFIGURABLE: CONFIGURABLE
+  	};
+  	return functionName;
+  }
+
+  var inspectSource;
+  var hasRequiredInspectSource;
+
+  function requireInspectSource () {
+  	if (hasRequiredInspectSource) return inspectSource;
+  	hasRequiredInspectSource = 1;
+  	var uncurryThis = requireFunctionUncurryThis();
+  	var isCallable = requireIsCallable();
+  	var store = requireSharedStore();
+
+  	var functionToString = uncurryThis(Function.toString);
+
+  	// this helper broken in `core-js@3.4.1-3.4.4`, so we can't use `shared` helper
+  	if (!isCallable(store.inspectSource)) {
+  	  store.inspectSource = function (it) {
+  	    return functionToString(it);
+  	  };
+  	}
+
+  	inspectSource = store.inspectSource;
+  	return inspectSource;
+  }
+
+  var weakMapBasicDetection;
+  var hasRequiredWeakMapBasicDetection;
+
+  function requireWeakMapBasicDetection () {
+  	if (hasRequiredWeakMapBasicDetection) return weakMapBasicDetection;
+  	hasRequiredWeakMapBasicDetection = 1;
+  	var globalThis = requireGlobalThis();
+  	var isCallable = requireIsCallable();
+
+  	var WeakMap = globalThis.WeakMap;
+
+  	weakMapBasicDetection = isCallable(WeakMap) && /native code/.test(String(WeakMap));
+  	return weakMapBasicDetection;
+  }
+
+  var sharedKey;
+  var hasRequiredSharedKey;
+
+  function requireSharedKey () {
+  	if (hasRequiredSharedKey) return sharedKey;
+  	hasRequiredSharedKey = 1;
+  	var shared = requireShared();
+  	var uid = requireUid();
+
+  	var keys = shared('keys');
+
+  	sharedKey = function (key) {
+  	  return keys[key] || (keys[key] = uid(key));
+  	};
+  	return sharedKey;
+  }
+
+  var hiddenKeys;
+  var hasRequiredHiddenKeys;
+
+  function requireHiddenKeys () {
+  	if (hasRequiredHiddenKeys) return hiddenKeys;
+  	hasRequiredHiddenKeys = 1;
+  	hiddenKeys = {};
+  	return hiddenKeys;
+  }
+
+  var internalState;
+  var hasRequiredInternalState;
+
+  function requireInternalState () {
+  	if (hasRequiredInternalState) return internalState;
+  	hasRequiredInternalState = 1;
+  	var NATIVE_WEAK_MAP = requireWeakMapBasicDetection();
+  	var globalThis = requireGlobalThis();
+  	var isObject = requireIsObject();
+  	var createNonEnumerableProperty = requireCreateNonEnumerableProperty();
+  	var hasOwn = requireHasOwnProperty();
+  	var shared = requireSharedStore();
+  	var sharedKey = requireSharedKey();
+  	var hiddenKeys = requireHiddenKeys();
+
+  	var OBJECT_ALREADY_INITIALIZED = 'Object already initialized';
+  	var TypeError = globalThis.TypeError;
+  	var WeakMap = globalThis.WeakMap;
+  	var set, get, has;
+
+  	var enforce = function (it) {
+  	  return has(it) ? get(it) : set(it, {});
+  	};
+
+  	var getterFor = function (TYPE) {
+  	  return function (it) {
+  	    var state;
+  	    if (!isObject(it) || (state = get(it)).type !== TYPE) {
+  	      throw new TypeError('Incompatible receiver, ' + TYPE + ' required');
+  	    } return state;
+  	  };
+  	};
+
+  	if (NATIVE_WEAK_MAP || shared.state) {
+  	  var store = shared.state || (shared.state = new WeakMap());
+  	  /* eslint-disable no-self-assign -- prototype methods protection */
+  	  store.get = store.get;
+  	  store.has = store.has;
+  	  store.set = store.set;
+  	  /* eslint-enable no-self-assign -- prototype methods protection */
+  	  set = function (it, metadata) {
+  	    if (store.has(it)) throw new TypeError(OBJECT_ALREADY_INITIALIZED);
+  	    metadata.facade = it;
+  	    store.set(it, metadata);
+  	    return metadata;
+  	  };
+  	  get = function (it) {
+  	    return store.get(it) || {};
+  	  };
+  	  has = function (it) {
+  	    return store.has(it);
+  	  };
+  	} else {
+  	  var STATE = sharedKey('state');
+  	  hiddenKeys[STATE] = true;
+  	  set = function (it, metadata) {
+  	    if (hasOwn(it, STATE)) throw new TypeError(OBJECT_ALREADY_INITIALIZED);
+  	    metadata.facade = it;
+  	    createNonEnumerableProperty(it, STATE, metadata);
+  	    return metadata;
+  	  };
+  	  get = function (it) {
+  	    return hasOwn(it, STATE) ? it[STATE] : {};
+  	  };
+  	  has = function (it) {
+  	    return hasOwn(it, STATE);
+  	  };
+  	}
+
+  	internalState = {
+  	  set: set,
+  	  get: get,
+  	  has: has,
+  	  enforce: enforce,
+  	  getterFor: getterFor
+  	};
+  	return internalState;
+  }
+
+  var hasRequiredMakeBuiltIn;
+
+  function requireMakeBuiltIn () {
+  	if (hasRequiredMakeBuiltIn) return makeBuiltIn.exports;
+  	hasRequiredMakeBuiltIn = 1;
+  	var uncurryThis = requireFunctionUncurryThis();
+  	var fails = requireFails();
+  	var isCallable = requireIsCallable();
+  	var hasOwn = requireHasOwnProperty();
+  	var DESCRIPTORS = requireDescriptors();
+  	var CONFIGURABLE_FUNCTION_NAME = requireFunctionName().CONFIGURABLE;
+  	var inspectSource = requireInspectSource();
+  	var InternalStateModule = requireInternalState();
+
+  	var enforceInternalState = InternalStateModule.enforce;
+  	var getInternalState = InternalStateModule.get;
+  	var $String = String;
+  	// eslint-disable-next-line es/no-object-defineproperty -- safe
+  	var defineProperty = Object.defineProperty;
+  	var stringSlice = uncurryThis(''.slice);
+  	var replace = uncurryThis(''.replace);
+  	var join = uncurryThis([].join);
+
+  	var CONFIGURABLE_LENGTH = DESCRIPTORS && !fails(function () {
+  	  return defineProperty(function () { /* empty */ }, 'length', { value: 8 }).length !== 8;
+  	});
+
+  	var TEMPLATE = String(String).split('String');
+
+  	var makeBuiltIn$1 = makeBuiltIn.exports = function (value, name, options) {
+  	  if (stringSlice($String(name), 0, 7) === 'Symbol(') {
+  	    name = '[' + replace($String(name), /^Symbol\(([^)]*)\).*$/, '$1') + ']';
+  	  }
+  	  if (options && options.getter) name = 'get ' + name;
+  	  if (options && options.setter) name = 'set ' + name;
+  	  if (!hasOwn(value, 'name') || (CONFIGURABLE_FUNCTION_NAME && value.name !== name)) {
+  	    if (DESCRIPTORS) defineProperty(value, 'name', { value: name, configurable: true });
+  	    else value.name = name;
+  	  }
+  	  if (CONFIGURABLE_LENGTH && options && hasOwn(options, 'arity') && value.length !== options.arity) {
+  	    defineProperty(value, 'length', { value: options.arity });
+  	  }
+  	  try {
+  	    if (options && hasOwn(options, 'constructor') && options.constructor) {
+  	      if (DESCRIPTORS) defineProperty(value, 'prototype', { writable: false });
+  	    // in V8 ~ Chrome 53, prototypes of some methods, like `Array.prototype.values`, are non-writable
+  	    } else if (value.prototype) value.prototype = undefined;
+  	  } catch (error) { /* empty */ }
+  	  var state = enforceInternalState(value);
+  	  if (!hasOwn(state, 'source')) {
+  	    state.source = join(TEMPLATE, typeof name == 'string' ? name : '');
+  	  } return value;
+  	};
+
+  	// add fake Function#toString for correct work wrapped methods / constructors with methods like LoDash isNative
+  	// eslint-disable-next-line no-extend-native -- required
+  	Function.prototype.toString = makeBuiltIn$1(function toString() {
+  	  return isCallable(this) && getInternalState(this).source || inspectSource(this);
+  	}, 'toString');
+  	return makeBuiltIn.exports;
+  }
+
+  var defineBuiltIn;
+  var hasRequiredDefineBuiltIn;
+
+  function requireDefineBuiltIn () {
+  	if (hasRequiredDefineBuiltIn) return defineBuiltIn;
+  	hasRequiredDefineBuiltIn = 1;
+  	var isCallable = requireIsCallable();
+  	var definePropertyModule = requireObjectDefineProperty();
+  	var makeBuiltIn = requireMakeBuiltIn();
+  	var defineGlobalProperty = requireDefineGlobalProperty();
+
+  	defineBuiltIn = function (O, key, value, options) {
+  	  if (!options) options = {};
+  	  var simple = options.enumerable;
+  	  var name = options.name !== undefined ? options.name : key;
+  	  if (isCallable(value)) makeBuiltIn(value, name, options);
+  	  if (options.global) {
+  	    if (simple) O[key] = value;
+  	    else defineGlobalProperty(key, value);
+  	  } else {
+  	    try {
+  	      if (!options.unsafe) delete O[key];
+  	      else if (O[key]) simple = true;
+  	    } catch (error) { /* empty */ }
+  	    if (simple) O[key] = value;
+  	    else definePropertyModule.f(O, key, {
+  	      value: value,
+  	      enumerable: false,
+  	      configurable: !options.nonConfigurable,
+  	      writable: !options.nonWritable
+  	    });
+  	  } return O;
+  	};
+  	return defineBuiltIn;
+  }
 
   var objectGetOwnPropertyNames = {};
 
-  var ceil = Math.ceil;
-  var floor$1 = Math.floor;
+  var mathTrunc;
+  var hasRequiredMathTrunc;
 
-  // `Math.trunc` method
-  // https://tc39.es/ecma262/#sec-math.trunc
-  // eslint-disable-next-line es/no-math-trunc -- safe
-  var mathTrunc = Math.trunc || function trunc(x) {
-    var n = +x;
-    return (n > 0 ? floor$1 : ceil)(n);
-  };
+  function requireMathTrunc () {
+  	if (hasRequiredMathTrunc) return mathTrunc;
+  	hasRequiredMathTrunc = 1;
+  	var ceil = Math.ceil;
+  	var floor = Math.floor;
 
-  var trunc = mathTrunc;
+  	// `Math.trunc` method
+  	// https://tc39.es/ecma262/#sec-math.trunc
+  	// eslint-disable-next-line es/no-math-trunc -- safe
+  	mathTrunc = Math.trunc || function trunc(x) {
+  	  var n = +x;
+  	  return (n > 0 ? floor : ceil)(n);
+  	};
+  	return mathTrunc;
+  }
 
-  // `ToIntegerOrInfinity` abstract operation
-  // https://tc39.es/ecma262/#sec-tointegerorinfinity
-  var toIntegerOrInfinity$4 = function (argument) {
-    var number = +argument;
-    // eslint-disable-next-line no-self-compare -- NaN check
-    return number !== number || number === 0 ? 0 : trunc(number);
-  };
+  var toIntegerOrInfinity;
+  var hasRequiredToIntegerOrInfinity;
 
-  var toIntegerOrInfinity$3 = toIntegerOrInfinity$4;
+  function requireToIntegerOrInfinity () {
+  	if (hasRequiredToIntegerOrInfinity) return toIntegerOrInfinity;
+  	hasRequiredToIntegerOrInfinity = 1;
+  	var trunc = requireMathTrunc();
 
-  var max$2 = Math.max;
-  var min$2 = Math.min;
+  	// `ToIntegerOrInfinity` abstract operation
+  	// https://tc39.es/ecma262/#sec-tointegerorinfinity
+  	toIntegerOrInfinity = function (argument) {
+  	  var number = +argument;
+  	  // eslint-disable-next-line no-self-compare -- NaN check
+  	  return number !== number || number === 0 ? 0 : trunc(number);
+  	};
+  	return toIntegerOrInfinity;
+  }
 
-  // Helper for a popular repeating case of the spec:
-  // Let integer be ? ToInteger(index).
-  // If integer < 0, let result be max((length + integer), 0); else let result be min(integer, length).
-  var toAbsoluteIndex$2 = function (index, length) {
-    var integer = toIntegerOrInfinity$3(index);
-    return integer < 0 ? max$2(integer + length, 0) : min$2(integer, length);
-  };
+  var toAbsoluteIndex;
+  var hasRequiredToAbsoluteIndex;
 
-  var toIntegerOrInfinity$2 = toIntegerOrInfinity$4;
+  function requireToAbsoluteIndex () {
+  	if (hasRequiredToAbsoluteIndex) return toAbsoluteIndex;
+  	hasRequiredToAbsoluteIndex = 1;
+  	var toIntegerOrInfinity = requireToIntegerOrInfinity();
 
-  var min$1 = Math.min;
+  	var max = Math.max;
+  	var min = Math.min;
 
-  // `ToLength` abstract operation
-  // https://tc39.es/ecma262/#sec-tolength
-  var toLength$2 = function (argument) {
-    var len = toIntegerOrInfinity$2(argument);
-    return len > 0 ? min$1(len, 0x1FFFFFFFFFFFFF) : 0; // 2 ** 53 - 1 == 9007199254740991
-  };
+  	// Helper for a popular repeating case of the spec:
+  	// Let integer be ? ToInteger(index).
+  	// If integer < 0, let result be max((length + integer), 0); else let result be min(integer, length).
+  	toAbsoluteIndex = function (index, length) {
+  	  var integer = toIntegerOrInfinity(index);
+  	  return integer < 0 ? max(integer + length, 0) : min(integer, length);
+  	};
+  	return toAbsoluteIndex;
+  }
 
-  var toLength$1 = toLength$2;
+  var toLength;
+  var hasRequiredToLength;
 
-  // `LengthOfArrayLike` abstract operation
-  // https://tc39.es/ecma262/#sec-lengthofarraylike
-  var lengthOfArrayLike$4 = function (obj) {
-    return toLength$1(obj.length);
-  };
+  function requireToLength () {
+  	if (hasRequiredToLength) return toLength;
+  	hasRequiredToLength = 1;
+  	var toIntegerOrInfinity = requireToIntegerOrInfinity();
 
-  var toIndexedObject$4 = toIndexedObject$6;
-  var toAbsoluteIndex$1 = toAbsoluteIndex$2;
-  var lengthOfArrayLike$3 = lengthOfArrayLike$4;
+  	var min = Math.min;
 
-  // `Array.prototype.{ indexOf, includes }` methods implementation
-  var createMethod$2 = function (IS_INCLUDES) {
-    return function ($this, el, fromIndex) {
-      var O = toIndexedObject$4($this);
-      var length = lengthOfArrayLike$3(O);
-      if (length === 0) return !IS_INCLUDES && -1;
-      var index = toAbsoluteIndex$1(fromIndex, length);
-      var value;
-      // Array#includes uses SameValueZero equality algorithm
-      // eslint-disable-next-line no-self-compare -- NaN check
-      if (IS_INCLUDES && el !== el) while (length > index) {
-        value = O[index++];
-        // eslint-disable-next-line no-self-compare -- NaN check
-        if (value !== value) return true;
-      // Array#indexOf ignores holes, Array#includes - not
-      } else for (;length > index; index++) {
-        if ((IS_INCLUDES || index in O) && O[index] === el) return IS_INCLUDES || index || 0;
-      } return !IS_INCLUDES && -1;
-    };
-  };
+  	// `ToLength` abstract operation
+  	// https://tc39.es/ecma262/#sec-tolength
+  	toLength = function (argument) {
+  	  var len = toIntegerOrInfinity(argument);
+  	  return len > 0 ? min(len, 0x1FFFFFFFFFFFFF) : 0; // 2 ** 53 - 1 == 9007199254740991
+  	};
+  	return toLength;
+  }
 
-  var arrayIncludes = {
-    // `Array.prototype.includes` method
-    // https://tc39.es/ecma262/#sec-array.prototype.includes
-    includes: createMethod$2(true),
-    // `Array.prototype.indexOf` method
-    // https://tc39.es/ecma262/#sec-array.prototype.indexof
-    indexOf: createMethod$2(false)
-  };
+  var lengthOfArrayLike;
+  var hasRequiredLengthOfArrayLike;
 
-  var uncurryThis$c = functionUncurryThis;
-  var hasOwn$1 = hasOwnProperty_1;
-  var toIndexedObject$3 = toIndexedObject$6;
-  var indexOf$1 = arrayIncludes.indexOf;
-  var hiddenKeys$2 = hiddenKeys$4;
+  function requireLengthOfArrayLike () {
+  	if (hasRequiredLengthOfArrayLike) return lengthOfArrayLike;
+  	hasRequiredLengthOfArrayLike = 1;
+  	var toLength = requireToLength();
 
-  var push$2 = uncurryThis$c([].push);
+  	// `LengthOfArrayLike` abstract operation
+  	// https://tc39.es/ecma262/#sec-lengthofarraylike
+  	lengthOfArrayLike = function (obj) {
+  	  return toLength(obj.length);
+  	};
+  	return lengthOfArrayLike;
+  }
 
-  var objectKeysInternal = function (object, names) {
-    var O = toIndexedObject$3(object);
-    var i = 0;
-    var result = [];
-    var key;
-    for (key in O) !hasOwn$1(hiddenKeys$2, key) && hasOwn$1(O, key) && push$2(result, key);
-    // Don't enum bug & hidden keys
-    while (names.length > i) if (hasOwn$1(O, key = names[i++])) {
-      ~indexOf$1(result, key) || push$2(result, key);
-    }
-    return result;
-  };
+  var arrayIncludes;
+  var hasRequiredArrayIncludes;
 
-  // IE8- don't enum bug keys
-  var enumBugKeys$3 = [
-    'constructor',
-    'hasOwnProperty',
-    'isPrototypeOf',
-    'propertyIsEnumerable',
-    'toLocaleString',
-    'toString',
-    'valueOf'
-  ];
+  function requireArrayIncludes () {
+  	if (hasRequiredArrayIncludes) return arrayIncludes;
+  	hasRequiredArrayIncludes = 1;
+  	var toIndexedObject = requireToIndexedObject();
+  	var toAbsoluteIndex = requireToAbsoluteIndex();
+  	var lengthOfArrayLike = requireLengthOfArrayLike();
 
-  var internalObjectKeys$1 = objectKeysInternal;
-  var enumBugKeys$2 = enumBugKeys$3;
+  	// `Array.prototype.{ indexOf, includes }` methods implementation
+  	var createMethod = function (IS_INCLUDES) {
+  	  return function ($this, el, fromIndex) {
+  	    var O = toIndexedObject($this);
+  	    var length = lengthOfArrayLike(O);
+  	    if (length === 0) return !IS_INCLUDES && -1;
+  	    var index = toAbsoluteIndex(fromIndex, length);
+  	    var value;
+  	    // Array#includes uses SameValueZero equality algorithm
+  	    // eslint-disable-next-line no-self-compare -- NaN check
+  	    if (IS_INCLUDES && el !== el) while (length > index) {
+  	      value = O[index++];
+  	      // eslint-disable-next-line no-self-compare -- NaN check
+  	      if (value !== value) return true;
+  	    // Array#indexOf ignores holes, Array#includes - not
+  	    } else for (;length > index; index++) {
+  	      if ((IS_INCLUDES || index in O) && O[index] === el) return IS_INCLUDES || index || 0;
+  	    } return !IS_INCLUDES && -1;
+  	  };
+  	};
 
-  var hiddenKeys$1 = enumBugKeys$2.concat('length', 'prototype');
+  	arrayIncludes = {
+  	  // `Array.prototype.includes` method
+  	  // https://tc39.es/ecma262/#sec-array.prototype.includes
+  	  includes: createMethod(true),
+  	  // `Array.prototype.indexOf` method
+  	  // https://tc39.es/ecma262/#sec-array.prototype.indexof
+  	  indexOf: createMethod(false)
+  	};
+  	return arrayIncludes;
+  }
 
-  // `Object.getOwnPropertyNames` method
-  // https://tc39.es/ecma262/#sec-object.getownpropertynames
-  // eslint-disable-next-line es/no-object-getownpropertynames -- safe
-  objectGetOwnPropertyNames.f = Object.getOwnPropertyNames || function getOwnPropertyNames(O) {
-    return internalObjectKeys$1(O, hiddenKeys$1);
-  };
+  var objectKeysInternal;
+  var hasRequiredObjectKeysInternal;
+
+  function requireObjectKeysInternal () {
+  	if (hasRequiredObjectKeysInternal) return objectKeysInternal;
+  	hasRequiredObjectKeysInternal = 1;
+  	var uncurryThis = requireFunctionUncurryThis();
+  	var hasOwn = requireHasOwnProperty();
+  	var toIndexedObject = requireToIndexedObject();
+  	var indexOf = requireArrayIncludes().indexOf;
+  	var hiddenKeys = requireHiddenKeys();
+
+  	var push = uncurryThis([].push);
+
+  	objectKeysInternal = function (object, names) {
+  	  var O = toIndexedObject(object);
+  	  var i = 0;
+  	  var result = [];
+  	  var key;
+  	  for (key in O) !hasOwn(hiddenKeys, key) && hasOwn(O, key) && push(result, key);
+  	  // Don't enum bug & hidden keys
+  	  while (names.length > i) if (hasOwn(O, key = names[i++])) {
+  	    ~indexOf(result, key) || push(result, key);
+  	  }
+  	  return result;
+  	};
+  	return objectKeysInternal;
+  }
+
+  var enumBugKeys;
+  var hasRequiredEnumBugKeys;
+
+  function requireEnumBugKeys () {
+  	if (hasRequiredEnumBugKeys) return enumBugKeys;
+  	hasRequiredEnumBugKeys = 1;
+  	// IE8- don't enum bug keys
+  	enumBugKeys = [
+  	  'constructor',
+  	  'hasOwnProperty',
+  	  'isPrototypeOf',
+  	  'propertyIsEnumerable',
+  	  'toLocaleString',
+  	  'toString',
+  	  'valueOf'
+  	];
+  	return enumBugKeys;
+  }
+
+  var hasRequiredObjectGetOwnPropertyNames;
+
+  function requireObjectGetOwnPropertyNames () {
+  	if (hasRequiredObjectGetOwnPropertyNames) return objectGetOwnPropertyNames;
+  	hasRequiredObjectGetOwnPropertyNames = 1;
+  	var internalObjectKeys = requireObjectKeysInternal();
+  	var enumBugKeys = requireEnumBugKeys();
+
+  	var hiddenKeys = enumBugKeys.concat('length', 'prototype');
+
+  	// `Object.getOwnPropertyNames` method
+  	// https://tc39.es/ecma262/#sec-object.getownpropertynames
+  	// eslint-disable-next-line es/no-object-getownpropertynames -- safe
+  	objectGetOwnPropertyNames.f = Object.getOwnPropertyNames || function getOwnPropertyNames(O) {
+  	  return internalObjectKeys(O, hiddenKeys);
+  	};
+  	return objectGetOwnPropertyNames;
+  }
 
   var objectGetOwnPropertySymbols = {};
 
-  // eslint-disable-next-line es/no-object-getownpropertysymbols -- safe
-  objectGetOwnPropertySymbols.f = Object.getOwnPropertySymbols;
+  var hasRequiredObjectGetOwnPropertySymbols;
 
-  var getBuiltIn$2 = getBuiltIn$4;
-  var uncurryThis$b = functionUncurryThis;
-  var getOwnPropertyNamesModule = objectGetOwnPropertyNames;
-  var getOwnPropertySymbolsModule$1 = objectGetOwnPropertySymbols;
-  var anObject$5 = anObject$7;
+  function requireObjectGetOwnPropertySymbols () {
+  	if (hasRequiredObjectGetOwnPropertySymbols) return objectGetOwnPropertySymbols;
+  	hasRequiredObjectGetOwnPropertySymbols = 1;
+  	// eslint-disable-next-line es/no-object-getownpropertysymbols -- safe
+  	objectGetOwnPropertySymbols.f = Object.getOwnPropertySymbols;
+  	return objectGetOwnPropertySymbols;
+  }
 
-  var concat$2 = uncurryThis$b([].concat);
+  var ownKeys;
+  var hasRequiredOwnKeys;
 
-  // all object keys, includes non-enumerable and symbols
-  var ownKeys$1 = getBuiltIn$2('Reflect', 'ownKeys') || function ownKeys(it) {
-    var keys = getOwnPropertyNamesModule.f(anObject$5(it));
-    var getOwnPropertySymbols = getOwnPropertySymbolsModule$1.f;
-    return getOwnPropertySymbols ? concat$2(keys, getOwnPropertySymbols(it)) : keys;
-  };
+  function requireOwnKeys () {
+  	if (hasRequiredOwnKeys) return ownKeys;
+  	hasRequiredOwnKeys = 1;
+  	var getBuiltIn = requireGetBuiltIn();
+  	var uncurryThis = requireFunctionUncurryThis();
+  	var getOwnPropertyNamesModule = requireObjectGetOwnPropertyNames();
+  	var getOwnPropertySymbolsModule = requireObjectGetOwnPropertySymbols();
+  	var anObject = requireAnObject();
 
-  var hasOwn = hasOwnProperty_1;
-  var ownKeys = ownKeys$1;
-  var getOwnPropertyDescriptorModule = objectGetOwnPropertyDescriptor;
-  var definePropertyModule$2 = objectDefineProperty;
+  	var concat = uncurryThis([].concat);
 
-  var copyConstructorProperties$1 = function (target, source, exceptions) {
-    var keys = ownKeys(source);
-    var defineProperty = definePropertyModule$2.f;
-    var getOwnPropertyDescriptor = getOwnPropertyDescriptorModule.f;
-    for (var i = 0; i < keys.length; i++) {
-      var key = keys[i];
-      if (!hasOwn(target, key) && !(exceptions && hasOwn(exceptions, key))) {
-        defineProperty(target, key, getOwnPropertyDescriptor(source, key));
-      }
-    }
-  };
+  	// all object keys, includes non-enumerable and symbols
+  	ownKeys = getBuiltIn('Reflect', 'ownKeys') || function ownKeys(it) {
+  	  var keys = getOwnPropertyNamesModule.f(anObject(it));
+  	  var getOwnPropertySymbols = getOwnPropertySymbolsModule.f;
+  	  return getOwnPropertySymbols ? concat(keys, getOwnPropertySymbols(it)) : keys;
+  	};
+  	return ownKeys;
+  }
 
-  var fails$a = fails$i;
-  var isCallable$4 = isCallable$e;
+  var copyConstructorProperties;
+  var hasRequiredCopyConstructorProperties;
 
-  var replacement = /#|\.prototype\./;
+  function requireCopyConstructorProperties () {
+  	if (hasRequiredCopyConstructorProperties) return copyConstructorProperties;
+  	hasRequiredCopyConstructorProperties = 1;
+  	var hasOwn = requireHasOwnProperty();
+  	var ownKeys = requireOwnKeys();
+  	var getOwnPropertyDescriptorModule = requireObjectGetOwnPropertyDescriptor();
+  	var definePropertyModule = requireObjectDefineProperty();
 
-  var isForced$1 = function (feature, detection) {
-    var value = data[normalize(feature)];
-    return value === POLYFILL ? true
-      : value === NATIVE ? false
-      : isCallable$4(detection) ? fails$a(detection)
-      : !!detection;
-  };
+  	copyConstructorProperties = function (target, source, exceptions) {
+  	  var keys = ownKeys(source);
+  	  var defineProperty = definePropertyModule.f;
+  	  var getOwnPropertyDescriptor = getOwnPropertyDescriptorModule.f;
+  	  for (var i = 0; i < keys.length; i++) {
+  	    var key = keys[i];
+  	    if (!hasOwn(target, key) && !(exceptions && hasOwn(exceptions, key))) {
+  	      defineProperty(target, key, getOwnPropertyDescriptor(source, key));
+  	    }
+  	  }
+  	};
+  	return copyConstructorProperties;
+  }
 
-  var normalize = isForced$1.normalize = function (string) {
-    return String(string).replace(replacement, '.').toLowerCase();
-  };
+  var isForced_1;
+  var hasRequiredIsForced;
 
-  var data = isForced$1.data = {};
-  var NATIVE = isForced$1.NATIVE = 'N';
-  var POLYFILL = isForced$1.POLYFILL = 'P';
+  function requireIsForced () {
+  	if (hasRequiredIsForced) return isForced_1;
+  	hasRequiredIsForced = 1;
+  	var fails = requireFails();
+  	var isCallable = requireIsCallable();
 
-  var isForced_1 = isForced$1;
+  	var replacement = /#|\.prototype\./;
 
-  var global$5 = global$e;
-  var getOwnPropertyDescriptor = objectGetOwnPropertyDescriptor.f;
-  var createNonEnumerableProperty$2 = createNonEnumerableProperty$4;
-  var defineBuiltIn$2 = defineBuiltIn$3;
-  var defineGlobalProperty = defineGlobalProperty$3;
-  var copyConstructorProperties = copyConstructorProperties$1;
-  var isForced = isForced_1;
+  	var isForced = function (feature, detection) {
+  	  var value = data[normalize(feature)];
+  	  return value === POLYFILL ? true
+  	    : value === NATIVE ? false
+  	    : isCallable(detection) ? fails(detection)
+  	    : !!detection;
+  	};
 
-  /*
-    options.target         - name of the target object
-    options.global         - target is the global object
-    options.stat           - export as static methods of target
-    options.proto          - export as prototype methods of target
-    options.real           - real prototype method for the `pure` version
-    options.forced         - export even if the native feature is available
-    options.bind           - bind methods to the target, required for the `pure` version
-    options.wrap           - wrap constructors to preventing global pollution, required for the `pure` version
-    options.unsafe         - use the simple assignment of property instead of delete + defineProperty
-    options.sham           - add a flag to not completely full polyfills
-    options.enumerable     - export as enumerable property
-    options.dontCallGetSet - prevent calling a getter on target
-    options.name           - the .name of the function if it does not match the key
-  */
-  var _export = function (options, source) {
-    var TARGET = options.target;
-    var GLOBAL = options.global;
-    var STATIC = options.stat;
-    var FORCED, target, key, targetProperty, sourceProperty, descriptor;
-    if (GLOBAL) {
-      target = global$5;
-    } else if (STATIC) {
-      target = global$5[TARGET] || defineGlobalProperty(TARGET, {});
-    } else {
-      target = global$5[TARGET] && global$5[TARGET].prototype;
-    }
-    if (target) for (key in source) {
-      sourceProperty = source[key];
-      if (options.dontCallGetSet) {
-        descriptor = getOwnPropertyDescriptor(target, key);
-        targetProperty = descriptor && descriptor.value;
-      } else targetProperty = target[key];
-      FORCED = isForced(GLOBAL ? key : TARGET + (STATIC ? '.' : '#') + key, options.forced);
-      // contained in target
-      if (!FORCED && targetProperty !== undefined) {
-        if (typeof sourceProperty == typeof targetProperty) continue;
-        copyConstructorProperties(sourceProperty, targetProperty);
-      }
-      // add a flag to not completely full polyfills
-      if (options.sham || (targetProperty && targetProperty.sham)) {
-        createNonEnumerableProperty$2(sourceProperty, 'sham', true);
-      }
-      defineBuiltIn$2(target, key, sourceProperty, options);
-    }
-  };
+  	var normalize = isForced.normalize = function (string) {
+  	  return String(string).replace(replacement, '.').toLowerCase();
+  	};
 
-  var classof$5 = classofRaw$2;
+  	var data = isForced.data = {};
+  	var NATIVE = isForced.NATIVE = 'N';
+  	var POLYFILL = isForced.POLYFILL = 'P';
 
-  // `IsArray` abstract operation
-  // https://tc39.es/ecma262/#sec-isarray
-  // eslint-disable-next-line es/no-array-isarray -- safe
-  var isArray$3 = Array.isArray || function isArray(argument) {
-    return classof$5(argument) === 'Array';
-  };
+  	isForced_1 = isForced;
+  	return isForced_1;
+  }
 
-  var $TypeError$1 = TypeError;
-  var MAX_SAFE_INTEGER = 0x1FFFFFFFFFFFFF; // 2 ** 53 - 1 == 9007199254740991
+  var _export;
+  var hasRequired_export;
 
-  var doesNotExceedSafeInteger$1 = function (it) {
-    if (it > MAX_SAFE_INTEGER) throw $TypeError$1('Maximum allowed index exceeded');
-    return it;
-  };
+  function require_export () {
+  	if (hasRequired_export) return _export;
+  	hasRequired_export = 1;
+  	var globalThis = requireGlobalThis();
+  	var getOwnPropertyDescriptor = requireObjectGetOwnPropertyDescriptor().f;
+  	var createNonEnumerableProperty = requireCreateNonEnumerableProperty();
+  	var defineBuiltIn = requireDefineBuiltIn();
+  	var defineGlobalProperty = requireDefineGlobalProperty();
+  	var copyConstructorProperties = requireCopyConstructorProperties();
+  	var isForced = requireIsForced();
 
-  var DESCRIPTORS$2 = descriptors;
-  var definePropertyModule$1 = objectDefineProperty;
-  var createPropertyDescriptor = createPropertyDescriptor$3;
+  	/*
+  	  options.target         - name of the target object
+  	  options.global         - target is the global object
+  	  options.stat           - export as static methods of target
+  	  options.proto          - export as prototype methods of target
+  	  options.real           - real prototype method for the `pure` version
+  	  options.forced         - export even if the native feature is available
+  	  options.bind           - bind methods to the target, required for the `pure` version
+  	  options.wrap           - wrap constructors to preventing global pollution, required for the `pure` version
+  	  options.unsafe         - use the simple assignment of property instead of delete + defineProperty
+  	  options.sham           - add a flag to not completely full polyfills
+  	  options.enumerable     - export as enumerable property
+  	  options.dontCallGetSet - prevent calling a getter on target
+  	  options.name           - the .name of the function if it does not match the key
+  	*/
+  	_export = function (options, source) {
+  	  var TARGET = options.target;
+  	  var GLOBAL = options.global;
+  	  var STATIC = options.stat;
+  	  var FORCED, target, key, targetProperty, sourceProperty, descriptor;
+  	  if (GLOBAL) {
+  	    target = globalThis;
+  	  } else if (STATIC) {
+  	    target = globalThis[TARGET] || defineGlobalProperty(TARGET, {});
+  	  } else {
+  	    target = globalThis[TARGET] && globalThis[TARGET].prototype;
+  	  }
+  	  if (target) for (key in source) {
+  	    sourceProperty = source[key];
+  	    if (options.dontCallGetSet) {
+  	      descriptor = getOwnPropertyDescriptor(target, key);
+  	      targetProperty = descriptor && descriptor.value;
+  	    } else targetProperty = target[key];
+  	    FORCED = isForced(GLOBAL ? key : TARGET + (STATIC ? '.' : '#') + key, options.forced);
+  	    // contained in target
+  	    if (!FORCED && targetProperty !== undefined) {
+  	      if (typeof sourceProperty == typeof targetProperty) continue;
+  	      copyConstructorProperties(sourceProperty, targetProperty);
+  	    }
+  	    // add a flag to not completely full polyfills
+  	    if (options.sham || (targetProperty && targetProperty.sham)) {
+  	      createNonEnumerableProperty(sourceProperty, 'sham', true);
+  	    }
+  	    defineBuiltIn(target, key, sourceProperty, options);
+  	  }
+  	};
+  	return _export;
+  }
 
-  var createProperty$2 = function (object, key, value) {
-    if (DESCRIPTORS$2) definePropertyModule$1.f(object, key, createPropertyDescriptor(0, value));
-    else object[key] = value;
-  };
+  var isArray;
+  var hasRequiredIsArray;
 
-  var wellKnownSymbol$8 = wellKnownSymbol$a;
+  function requireIsArray () {
+  	if (hasRequiredIsArray) return isArray;
+  	hasRequiredIsArray = 1;
+  	var classof = requireClassofRaw();
 
-  var TO_STRING_TAG$1 = wellKnownSymbol$8('toStringTag');
-  var test = {};
+  	// `IsArray` abstract operation
+  	// https://tc39.es/ecma262/#sec-isarray
+  	// eslint-disable-next-line es/no-array-isarray -- safe
+  	isArray = Array.isArray || function isArray(argument) {
+  	  return classof(argument) === 'Array';
+  	};
+  	return isArray;
+  }
 
-  test[TO_STRING_TAG$1] = 'z';
+  var doesNotExceedSafeInteger;
+  var hasRequiredDoesNotExceedSafeInteger;
 
-  var toStringTagSupport = String(test) === '[object z]';
+  function requireDoesNotExceedSafeInteger () {
+  	if (hasRequiredDoesNotExceedSafeInteger) return doesNotExceedSafeInteger;
+  	hasRequiredDoesNotExceedSafeInteger = 1;
+  	var $TypeError = TypeError;
+  	var MAX_SAFE_INTEGER = 0x1FFFFFFFFFFFFF; // 2 ** 53 - 1 == 9007199254740991
 
-  var TO_STRING_TAG_SUPPORT$2 = toStringTagSupport;
-  var isCallable$3 = isCallable$e;
-  var classofRaw$1 = classofRaw$2;
-  var wellKnownSymbol$7 = wellKnownSymbol$a;
+  	doesNotExceedSafeInteger = function (it) {
+  	  if (it > MAX_SAFE_INTEGER) throw $TypeError('Maximum allowed index exceeded');
+  	  return it;
+  	};
+  	return doesNotExceedSafeInteger;
+  }
 
-  var TO_STRING_TAG = wellKnownSymbol$7('toStringTag');
-  var $Object = Object;
+  var createProperty;
+  var hasRequiredCreateProperty;
 
-  // ES3 wrong here
-  var CORRECT_ARGUMENTS = classofRaw$1(function () { return arguments; }()) === 'Arguments';
+  function requireCreateProperty () {
+  	if (hasRequiredCreateProperty) return createProperty;
+  	hasRequiredCreateProperty = 1;
+  	var DESCRIPTORS = requireDescriptors();
+  	var definePropertyModule = requireObjectDefineProperty();
+  	var createPropertyDescriptor = requireCreatePropertyDescriptor();
 
-  // fallback for IE11 Script Access Denied error
-  var tryGet = function (it, key) {
-    try {
-      return it[key];
-    } catch (error) { /* empty */ }
-  };
+  	createProperty = function (object, key, value) {
+  	  if (DESCRIPTORS) definePropertyModule.f(object, key, createPropertyDescriptor(0, value));
+  	  else object[key] = value;
+  	};
+  	return createProperty;
+  }
 
-  // getting tag from ES6+ `Object.prototype.toString`
-  var classof$4 = TO_STRING_TAG_SUPPORT$2 ? classofRaw$1 : function (it) {
-    var O, tag, result;
-    return it === undefined ? 'Undefined' : it === null ? 'Null'
-      // @@toStringTag case
-      : typeof (tag = tryGet(O = $Object(it), TO_STRING_TAG)) == 'string' ? tag
-      // builtinTag case
-      : CORRECT_ARGUMENTS ? classofRaw$1(O)
-      // ES3 arguments fallback
-      : (result = classofRaw$1(O)) === 'Object' && isCallable$3(O.callee) ? 'Arguments' : result;
-  };
+  var toStringTagSupport;
+  var hasRequiredToStringTagSupport;
 
-  var uncurryThis$a = functionUncurryThis;
-  var fails$9 = fails$i;
-  var isCallable$2 = isCallable$e;
-  var classof$3 = classof$4;
-  var getBuiltIn$1 = getBuiltIn$4;
-  var inspectSource = inspectSource$2;
+  function requireToStringTagSupport () {
+  	if (hasRequiredToStringTagSupport) return toStringTagSupport;
+  	hasRequiredToStringTagSupport = 1;
+  	var wellKnownSymbol = requireWellKnownSymbol();
 
-  var noop = function () { /* empty */ };
-  var construct = getBuiltIn$1('Reflect', 'construct');
-  var constructorRegExp = /^\s*(?:class|function)\b/;
-  var exec$1 = uncurryThis$a(constructorRegExp.exec);
-  var INCORRECT_TO_STRING = !constructorRegExp.test(noop);
+  	var TO_STRING_TAG = wellKnownSymbol('toStringTag');
+  	var test = {};
 
-  var isConstructorModern = function isConstructor(argument) {
-    if (!isCallable$2(argument)) return false;
-    try {
-      construct(noop, [], argument);
-      return true;
-    } catch (error) {
-      return false;
-    }
-  };
+  	test[TO_STRING_TAG] = 'z';
 
-  var isConstructorLegacy = function isConstructor(argument) {
-    if (!isCallable$2(argument)) return false;
-    switch (classof$3(argument)) {
-      case 'AsyncFunction':
-      case 'GeneratorFunction':
-      case 'AsyncGeneratorFunction': return false;
-    }
-    try {
-      // we can't check .prototype since constructors produced by .bind haven't it
-      // `Function#toString` throws on some built-it function in some legacy engines
-      // (for example, `DOMQuad` and similar in FF41-)
-      return INCORRECT_TO_STRING || !!exec$1(constructorRegExp, inspectSource(argument));
-    } catch (error) {
-      return true;
-    }
-  };
+  	toStringTagSupport = String(test) === '[object z]';
+  	return toStringTagSupport;
+  }
 
-  isConstructorLegacy.sham = true;
+  var classof;
+  var hasRequiredClassof;
 
-  // `IsConstructor` abstract operation
-  // https://tc39.es/ecma262/#sec-isconstructor
-  var isConstructor$2 = !construct || fails$9(function () {
-    var called;
-    return isConstructorModern(isConstructorModern.call)
-      || !isConstructorModern(Object)
-      || !isConstructorModern(function () { called = true; })
-      || called;
-  }) ? isConstructorLegacy : isConstructorModern;
+  function requireClassof () {
+  	if (hasRequiredClassof) return classof;
+  	hasRequiredClassof = 1;
+  	var TO_STRING_TAG_SUPPORT = requireToStringTagSupport();
+  	var isCallable = requireIsCallable();
+  	var classofRaw = requireClassofRaw();
+  	var wellKnownSymbol = requireWellKnownSymbol();
 
-  var isArray$2 = isArray$3;
-  var isConstructor$1 = isConstructor$2;
-  var isObject$2 = isObject$8;
-  var wellKnownSymbol$6 = wellKnownSymbol$a;
+  	var TO_STRING_TAG = wellKnownSymbol('toStringTag');
+  	var $Object = Object;
 
-  var SPECIES$3 = wellKnownSymbol$6('species');
-  var $Array$1 = Array;
+  	// ES3 wrong here
+  	var CORRECT_ARGUMENTS = classofRaw(function () { return arguments; }()) === 'Arguments';
 
-  // a part of `ArraySpeciesCreate` abstract operation
-  // https://tc39.es/ecma262/#sec-arrayspeciescreate
-  var arraySpeciesConstructor$1 = function (originalArray) {
-    var C;
-    if (isArray$2(originalArray)) {
-      C = originalArray.constructor;
-      // cross-realm fallback
-      if (isConstructor$1(C) && (C === $Array$1 || isArray$2(C.prototype))) C = undefined;
-      else if (isObject$2(C)) {
-        C = C[SPECIES$3];
-        if (C === null) C = undefined;
-      }
-    } return C === undefined ? $Array$1 : C;
-  };
+  	// fallback for IE11 Script Access Denied error
+  	var tryGet = function (it, key) {
+  	  try {
+  	    return it[key];
+  	  } catch (error) { /* empty */ }
+  	};
 
-  var arraySpeciesConstructor = arraySpeciesConstructor$1;
+  	// getting tag from ES6+ `Object.prototype.toString`
+  	classof = TO_STRING_TAG_SUPPORT ? classofRaw : function (it) {
+  	  var O, tag, result;
+  	  return it === undefined ? 'Undefined' : it === null ? 'Null'
+  	    // @@toStringTag case
+  	    : typeof (tag = tryGet(O = $Object(it), TO_STRING_TAG)) == 'string' ? tag
+  	    // builtinTag case
+  	    : CORRECT_ARGUMENTS ? classofRaw(O)
+  	    // ES3 arguments fallback
+  	    : (result = classofRaw(O)) === 'Object' && isCallable(O.callee) ? 'Arguments' : result;
+  	};
+  	return classof;
+  }
 
-  // `ArraySpeciesCreate` abstract operation
-  // https://tc39.es/ecma262/#sec-arrayspeciescreate
-  var arraySpeciesCreate$2 = function (originalArray, length) {
-    return new (arraySpeciesConstructor(originalArray))(length === 0 ? 0 : length);
-  };
+  var isConstructor;
+  var hasRequiredIsConstructor;
 
-  var fails$8 = fails$i;
-  var wellKnownSymbol$5 = wellKnownSymbol$a;
-  var V8_VERSION$1 = engineV8Version;
+  function requireIsConstructor () {
+  	if (hasRequiredIsConstructor) return isConstructor;
+  	hasRequiredIsConstructor = 1;
+  	var uncurryThis = requireFunctionUncurryThis();
+  	var fails = requireFails();
+  	var isCallable = requireIsCallable();
+  	var classof = requireClassof();
+  	var getBuiltIn = requireGetBuiltIn();
+  	var inspectSource = requireInspectSource();
 
-  var SPECIES$2 = wellKnownSymbol$5('species');
+  	var noop = function () { /* empty */ };
+  	var construct = getBuiltIn('Reflect', 'construct');
+  	var constructorRegExp = /^\s*(?:class|function)\b/;
+  	var exec = uncurryThis(constructorRegExp.exec);
+  	var INCORRECT_TO_STRING = !constructorRegExp.test(noop);
 
-  var arrayMethodHasSpeciesSupport$3 = function (METHOD_NAME) {
-    // We can't use this feature detection in V8 since it causes
-    // deoptimization and serious performance degradation
-    // https://github.com/zloirock/core-js/issues/677
-    return V8_VERSION$1 >= 51 || !fails$8(function () {
-      var array = [];
-      var constructor = array.constructor = {};
-      constructor[SPECIES$2] = function () {
-        return { foo: 1 };
-      };
-      return array[METHOD_NAME](Boolean).foo !== 1;
-    });
-  };
+  	var isConstructorModern = function isConstructor(argument) {
+  	  if (!isCallable(argument)) return false;
+  	  try {
+  	    construct(noop, [], argument);
+  	    return true;
+  	  } catch (error) {
+  	    return false;
+  	  }
+  	};
 
-  var $$6 = _export;
-  var fails$7 = fails$i;
-  var isArray$1 = isArray$3;
-  var isObject$1 = isObject$8;
-  var toObject$3 = toObject$5;
-  var lengthOfArrayLike$2 = lengthOfArrayLike$4;
-  var doesNotExceedSafeInteger = doesNotExceedSafeInteger$1;
-  var createProperty$1 = createProperty$2;
-  var arraySpeciesCreate$1 = arraySpeciesCreate$2;
-  var arrayMethodHasSpeciesSupport$2 = arrayMethodHasSpeciesSupport$3;
-  var wellKnownSymbol$4 = wellKnownSymbol$a;
-  var V8_VERSION = engineV8Version;
+  	var isConstructorLegacy = function isConstructor(argument) {
+  	  if (!isCallable(argument)) return false;
+  	  switch (classof(argument)) {
+  	    case 'AsyncFunction':
+  	    case 'GeneratorFunction':
+  	    case 'AsyncGeneratorFunction': return false;
+  	  }
+  	  try {
+  	    // we can't check .prototype since constructors produced by .bind haven't it
+  	    // `Function#toString` throws on some built-it function in some legacy engines
+  	    // (for example, `DOMQuad` and similar in FF41-)
+  	    return INCORRECT_TO_STRING || !!exec(constructorRegExp, inspectSource(argument));
+  	  } catch (error) {
+  	    return true;
+  	  }
+  	};
 
-  var IS_CONCAT_SPREADABLE = wellKnownSymbol$4('isConcatSpreadable');
+  	isConstructorLegacy.sham = true;
 
-  // We can't use this feature detection in V8 since it causes
-  // deoptimization and serious performance degradation
-  // https://github.com/zloirock/core-js/issues/679
-  var IS_CONCAT_SPREADABLE_SUPPORT = V8_VERSION >= 51 || !fails$7(function () {
-    var array = [];
-    array[IS_CONCAT_SPREADABLE] = false;
-    return array.concat()[0] !== array;
-  });
+  	// `IsConstructor` abstract operation
+  	// https://tc39.es/ecma262/#sec-isconstructor
+  	isConstructor = !construct || fails(function () {
+  	  var called;
+  	  return isConstructorModern(isConstructorModern.call)
+  	    || !isConstructorModern(Object)
+  	    || !isConstructorModern(function () { called = true; })
+  	    || called;
+  	}) ? isConstructorLegacy : isConstructorModern;
+  	return isConstructor;
+  }
 
-  var isConcatSpreadable = function (O) {
-    if (!isObject$1(O)) return false;
-    var spreadable = O[IS_CONCAT_SPREADABLE];
-    return spreadable !== undefined ? !!spreadable : isArray$1(O);
-  };
+  var arraySpeciesConstructor;
+  var hasRequiredArraySpeciesConstructor;
 
-  var FORCED$1 = !IS_CONCAT_SPREADABLE_SUPPORT || !arrayMethodHasSpeciesSupport$2('concat');
+  function requireArraySpeciesConstructor () {
+  	if (hasRequiredArraySpeciesConstructor) return arraySpeciesConstructor;
+  	hasRequiredArraySpeciesConstructor = 1;
+  	var isArray = requireIsArray();
+  	var isConstructor = requireIsConstructor();
+  	var isObject = requireIsObject();
+  	var wellKnownSymbol = requireWellKnownSymbol();
 
-  // `Array.prototype.concat` method
-  // https://tc39.es/ecma262/#sec-array.prototype.concat
-  // with adding support of @@isConcatSpreadable and @@species
-  $$6({ target: 'Array', proto: true, arity: 1, forced: FORCED$1 }, {
-    // eslint-disable-next-line no-unused-vars -- required for `.length`
-    concat: function concat(arg) {
-      var O = toObject$3(this);
-      var A = arraySpeciesCreate$1(O, 0);
-      var n = 0;
-      var i, k, length, len, E;
-      for (i = -1, length = arguments.length; i < length; i++) {
-        E = i === -1 ? O : arguments[i];
-        if (isConcatSpreadable(E)) {
-          len = lengthOfArrayLike$2(E);
-          doesNotExceedSafeInteger(n + len);
-          for (k = 0; k < len; k++, n++) if (k in E) createProperty$1(A, n, E[k]);
-        } else {
-          doesNotExceedSafeInteger(n + 1);
-          createProperty$1(A, n++, E);
-        }
-      }
-      A.length = n;
-      return A;
-    }
-  });
+  	var SPECIES = wellKnownSymbol('species');
+  	var $Array = Array;
 
-  var classofRaw = classofRaw$2;
-  var uncurryThis$9 = functionUncurryThis;
+  	// a part of `ArraySpeciesCreate` abstract operation
+  	// https://tc39.es/ecma262/#sec-arrayspeciescreate
+  	arraySpeciesConstructor = function (originalArray) {
+  	  var C;
+  	  if (isArray(originalArray)) {
+  	    C = originalArray.constructor;
+  	    // cross-realm fallback
+  	    if (isConstructor(C) && (C === $Array || isArray(C.prototype))) C = undefined;
+  	    else if (isObject(C)) {
+  	      C = C[SPECIES];
+  	      if (C === null) C = undefined;
+  	    }
+  	  } return C === undefined ? $Array : C;
+  	};
+  	return arraySpeciesConstructor;
+  }
 
-  var functionUncurryThisClause = function (fn) {
-    // Nashorn bug:
-    //   https://github.com/zloirock/core-js/issues/1128
-    //   https://github.com/zloirock/core-js/issues/1130
-    if (classofRaw(fn) === 'Function') return uncurryThis$9(fn);
-  };
+  var arraySpeciesCreate;
+  var hasRequiredArraySpeciesCreate;
 
-  var uncurryThis$8 = functionUncurryThisClause;
-  var aCallable = aCallable$2;
-  var NATIVE_BIND$1 = functionBindNative;
+  function requireArraySpeciesCreate () {
+  	if (hasRequiredArraySpeciesCreate) return arraySpeciesCreate;
+  	hasRequiredArraySpeciesCreate = 1;
+  	var arraySpeciesConstructor = requireArraySpeciesConstructor();
 
-  var bind$1 = uncurryThis$8(uncurryThis$8.bind);
+  	// `ArraySpeciesCreate` abstract operation
+  	// https://tc39.es/ecma262/#sec-arrayspeciescreate
+  	arraySpeciesCreate = function (originalArray, length) {
+  	  return new (arraySpeciesConstructor(originalArray))(length === 0 ? 0 : length);
+  	};
+  	return arraySpeciesCreate;
+  }
 
-  // optional / simple context binding
-  var functionBindContext = function (fn, that) {
-    aCallable(fn);
-    return that === undefined ? fn : NATIVE_BIND$1 ? bind$1(fn, that) : function (/* ...args */) {
-      return fn.apply(that, arguments);
-    };
-  };
+  var arrayMethodHasSpeciesSupport;
+  var hasRequiredArrayMethodHasSpeciesSupport;
 
-  var bind = functionBindContext;
-  var uncurryThis$7 = functionUncurryThis;
-  var IndexedObject$2 = indexedObject;
-  var toObject$2 = toObject$5;
-  var lengthOfArrayLike$1 = lengthOfArrayLike$4;
-  var arraySpeciesCreate = arraySpeciesCreate$2;
+  function requireArrayMethodHasSpeciesSupport () {
+  	if (hasRequiredArrayMethodHasSpeciesSupport) return arrayMethodHasSpeciesSupport;
+  	hasRequiredArrayMethodHasSpeciesSupport = 1;
+  	var fails = requireFails();
+  	var wellKnownSymbol = requireWellKnownSymbol();
+  	var V8_VERSION = requireEnvironmentV8Version();
 
-  var push$1 = uncurryThis$7([].push);
+  	var SPECIES = wellKnownSymbol('species');
 
-  // `Array.prototype.{ forEach, map, filter, some, every, find, findIndex, filterReject }` methods implementation
-  var createMethod$1 = function (TYPE) {
-    var IS_MAP = TYPE === 1;
-    var IS_FILTER = TYPE === 2;
-    var IS_SOME = TYPE === 3;
-    var IS_EVERY = TYPE === 4;
-    var IS_FIND_INDEX = TYPE === 6;
-    var IS_FILTER_REJECT = TYPE === 7;
-    var NO_HOLES = TYPE === 5 || IS_FIND_INDEX;
-    return function ($this, callbackfn, that, specificCreate) {
-      var O = toObject$2($this);
-      var self = IndexedObject$2(O);
-      var length = lengthOfArrayLike$1(self);
-      var boundFunction = bind(callbackfn, that);
-      var index = 0;
-      var create = specificCreate || arraySpeciesCreate;
-      var target = IS_MAP ? create($this, length) : IS_FILTER || IS_FILTER_REJECT ? create($this, 0) : undefined;
-      var value, result;
-      for (;length > index; index++) if (NO_HOLES || index in self) {
-        value = self[index];
-        result = boundFunction(value, index, O);
-        if (TYPE) {
-          if (IS_MAP) target[index] = result; // map
-          else if (result) switch (TYPE) {
-            case 3: return true;              // some
-            case 5: return value;             // find
-            case 6: return index;             // findIndex
-            case 2: push$1(target, value);      // filter
-          } else switch (TYPE) {
-            case 4: return false;             // every
-            case 7: push$1(target, value);      // filterReject
-          }
-        }
-      }
-      return IS_FIND_INDEX ? -1 : IS_SOME || IS_EVERY ? IS_EVERY : target;
-    };
-  };
+  	arrayMethodHasSpeciesSupport = function (METHOD_NAME) {
+  	  // We can't use this feature detection in V8 since it causes
+  	  // deoptimization and serious performance degradation
+  	  // https://github.com/zloirock/core-js/issues/677
+  	  return V8_VERSION >= 51 || !fails(function () {
+  	    var array = [];
+  	    var constructor = array.constructor = {};
+  	    constructor[SPECIES] = function () {
+  	      return { foo: 1 };
+  	    };
+  	    return array[METHOD_NAME](Boolean).foo !== 1;
+  	  });
+  	};
+  	return arrayMethodHasSpeciesSupport;
+  }
 
-  var arrayIteration = {
-    // `Array.prototype.forEach` method
-    // https://tc39.es/ecma262/#sec-array.prototype.foreach
-    forEach: createMethod$1(0),
-    // `Array.prototype.map` method
-    // https://tc39.es/ecma262/#sec-array.prototype.map
-    map: createMethod$1(1),
-    // `Array.prototype.filter` method
-    // https://tc39.es/ecma262/#sec-array.prototype.filter
-    filter: createMethod$1(2),
-    // `Array.prototype.some` method
-    // https://tc39.es/ecma262/#sec-array.prototype.some
-    some: createMethod$1(3),
-    // `Array.prototype.every` method
-    // https://tc39.es/ecma262/#sec-array.prototype.every
-    every: createMethod$1(4),
-    // `Array.prototype.find` method
-    // https://tc39.es/ecma262/#sec-array.prototype.find
-    find: createMethod$1(5),
-    // `Array.prototype.findIndex` method
-    // https://tc39.es/ecma262/#sec-array.prototype.findIndex
-    findIndex: createMethod$1(6),
-    // `Array.prototype.filterReject` method
-    // https://github.com/tc39/proposal-array-filtering
-    filterReject: createMethod$1(7)
-  };
+  var hasRequiredEs_array_concat;
+
+  function requireEs_array_concat () {
+  	if (hasRequiredEs_array_concat) return es_array_concat;
+  	hasRequiredEs_array_concat = 1;
+  	var $ = require_export();
+  	var fails = requireFails();
+  	var isArray = requireIsArray();
+  	var isObject = requireIsObject();
+  	var toObject = requireToObject();
+  	var lengthOfArrayLike = requireLengthOfArrayLike();
+  	var doesNotExceedSafeInteger = requireDoesNotExceedSafeInteger();
+  	var createProperty = requireCreateProperty();
+  	var arraySpeciesCreate = requireArraySpeciesCreate();
+  	var arrayMethodHasSpeciesSupport = requireArrayMethodHasSpeciesSupport();
+  	var wellKnownSymbol = requireWellKnownSymbol();
+  	var V8_VERSION = requireEnvironmentV8Version();
+
+  	var IS_CONCAT_SPREADABLE = wellKnownSymbol('isConcatSpreadable');
+
+  	// We can't use this feature detection in V8 since it causes
+  	// deoptimization and serious performance degradation
+  	// https://github.com/zloirock/core-js/issues/679
+  	var IS_CONCAT_SPREADABLE_SUPPORT = V8_VERSION >= 51 || !fails(function () {
+  	  var array = [];
+  	  array[IS_CONCAT_SPREADABLE] = false;
+  	  return array.concat()[0] !== array;
+  	});
+
+  	var isConcatSpreadable = function (O) {
+  	  if (!isObject(O)) return false;
+  	  var spreadable = O[IS_CONCAT_SPREADABLE];
+  	  return spreadable !== undefined ? !!spreadable : isArray(O);
+  	};
+
+  	var FORCED = !IS_CONCAT_SPREADABLE_SUPPORT || !arrayMethodHasSpeciesSupport('concat');
+
+  	// `Array.prototype.concat` method
+  	// https://tc39.es/ecma262/#sec-array.prototype.concat
+  	// with adding support of @@isConcatSpreadable and @@species
+  	$({ target: 'Array', proto: true, arity: 1, forced: FORCED }, {
+  	  // eslint-disable-next-line no-unused-vars -- required for `.length`
+  	  concat: function concat(arg) {
+  	    var O = toObject(this);
+  	    var A = arraySpeciesCreate(O, 0);
+  	    var n = 0;
+  	    var i, k, length, len, E;
+  	    for (i = -1, length = arguments.length; i < length; i++) {
+  	      E = i === -1 ? O : arguments[i];
+  	      if (isConcatSpreadable(E)) {
+  	        len = lengthOfArrayLike(E);
+  	        doesNotExceedSafeInteger(n + len);
+  	        for (k = 0; k < len; k++, n++) if (k in E) createProperty(A, n, E[k]);
+  	      } else {
+  	        doesNotExceedSafeInteger(n + 1);
+  	        createProperty(A, n++, E);
+  	      }
+  	    }
+  	    A.length = n;
+  	    return A;
+  	  }
+  	});
+  	return es_array_concat;
+  }
+
+  requireEs_array_concat();
+
+  var es_array_find = {};
+
+  var functionUncurryThisClause;
+  var hasRequiredFunctionUncurryThisClause;
+
+  function requireFunctionUncurryThisClause () {
+  	if (hasRequiredFunctionUncurryThisClause) return functionUncurryThisClause;
+  	hasRequiredFunctionUncurryThisClause = 1;
+  	var classofRaw = requireClassofRaw();
+  	var uncurryThis = requireFunctionUncurryThis();
+
+  	functionUncurryThisClause = function (fn) {
+  	  // Nashorn bug:
+  	  //   https://github.com/zloirock/core-js/issues/1128
+  	  //   https://github.com/zloirock/core-js/issues/1130
+  	  if (classofRaw(fn) === 'Function') return uncurryThis(fn);
+  	};
+  	return functionUncurryThisClause;
+  }
+
+  var functionBindContext;
+  var hasRequiredFunctionBindContext;
+
+  function requireFunctionBindContext () {
+  	if (hasRequiredFunctionBindContext) return functionBindContext;
+  	hasRequiredFunctionBindContext = 1;
+  	var uncurryThis = requireFunctionUncurryThisClause();
+  	var aCallable = requireACallable();
+  	var NATIVE_BIND = requireFunctionBindNative();
+
+  	var bind = uncurryThis(uncurryThis.bind);
+
+  	// optional / simple context binding
+  	functionBindContext = function (fn, that) {
+  	  aCallable(fn);
+  	  return that === undefined ? fn : NATIVE_BIND ? bind(fn, that) : function (/* ...args */) {
+  	    return fn.apply(that, arguments);
+  	  };
+  	};
+  	return functionBindContext;
+  }
+
+  var arrayIteration;
+  var hasRequiredArrayIteration;
+
+  function requireArrayIteration () {
+  	if (hasRequiredArrayIteration) return arrayIteration;
+  	hasRequiredArrayIteration = 1;
+  	var bind = requireFunctionBindContext();
+  	var uncurryThis = requireFunctionUncurryThis();
+  	var IndexedObject = requireIndexedObject();
+  	var toObject = requireToObject();
+  	var lengthOfArrayLike = requireLengthOfArrayLike();
+  	var arraySpeciesCreate = requireArraySpeciesCreate();
+
+  	var push = uncurryThis([].push);
+
+  	// `Array.prototype.{ forEach, map, filter, some, every, find, findIndex, filterReject }` methods implementation
+  	var createMethod = function (TYPE) {
+  	  var IS_MAP = TYPE === 1;
+  	  var IS_FILTER = TYPE === 2;
+  	  var IS_SOME = TYPE === 3;
+  	  var IS_EVERY = TYPE === 4;
+  	  var IS_FIND_INDEX = TYPE === 6;
+  	  var IS_FILTER_REJECT = TYPE === 7;
+  	  var NO_HOLES = TYPE === 5 || IS_FIND_INDEX;
+  	  return function ($this, callbackfn, that, specificCreate) {
+  	    var O = toObject($this);
+  	    var self = IndexedObject(O);
+  	    var length = lengthOfArrayLike(self);
+  	    var boundFunction = bind(callbackfn, that);
+  	    var index = 0;
+  	    var create = specificCreate || arraySpeciesCreate;
+  	    var target = IS_MAP ? create($this, length) : IS_FILTER || IS_FILTER_REJECT ? create($this, 0) : undefined;
+  	    var value, result;
+  	    for (;length > index; index++) if (NO_HOLES || index in self) {
+  	      value = self[index];
+  	      result = boundFunction(value, index, O);
+  	      if (TYPE) {
+  	        if (IS_MAP) target[index] = result; // map
+  	        else if (result) switch (TYPE) {
+  	          case 3: return true;              // some
+  	          case 5: return value;             // find
+  	          case 6: return index;             // findIndex
+  	          case 2: push(target, value);      // filter
+  	        } else switch (TYPE) {
+  	          case 4: return false;             // every
+  	          case 7: push(target, value);      // filterReject
+  	        }
+  	      }
+  	    }
+  	    return IS_FIND_INDEX ? -1 : IS_SOME || IS_EVERY ? IS_EVERY : target;
+  	  };
+  	};
+
+  	arrayIteration = {
+  	  // `Array.prototype.forEach` method
+  	  // https://tc39.es/ecma262/#sec-array.prototype.foreach
+  	  forEach: createMethod(0),
+  	  // `Array.prototype.map` method
+  	  // https://tc39.es/ecma262/#sec-array.prototype.map
+  	  map: createMethod(1),
+  	  // `Array.prototype.filter` method
+  	  // https://tc39.es/ecma262/#sec-array.prototype.filter
+  	  filter: createMethod(2),
+  	  // `Array.prototype.some` method
+  	  // https://tc39.es/ecma262/#sec-array.prototype.some
+  	  some: createMethod(3),
+  	  // `Array.prototype.every` method
+  	  // https://tc39.es/ecma262/#sec-array.prototype.every
+  	  every: createMethod(4),
+  	  // `Array.prototype.find` method
+  	  // https://tc39.es/ecma262/#sec-array.prototype.find
+  	  find: createMethod(5),
+  	  // `Array.prototype.findIndex` method
+  	  // https://tc39.es/ecma262/#sec-array.prototype.findIndex
+  	  findIndex: createMethod(6),
+  	  // `Array.prototype.filterReject` method
+  	  // https://github.com/tc39/proposal-array-filtering
+  	  filterReject: createMethod(7)
+  	};
+  	return arrayIteration;
+  }
 
   var objectDefineProperties = {};
 
-  var internalObjectKeys = objectKeysInternal;
-  var enumBugKeys$1 = enumBugKeys$3;
+  var objectKeys;
+  var hasRequiredObjectKeys;
 
-  // `Object.keys` method
-  // https://tc39.es/ecma262/#sec-object.keys
-  // eslint-disable-next-line es/no-object-keys -- safe
-  var objectKeys$2 = Object.keys || function keys(O) {
-    return internalObjectKeys(O, enumBugKeys$1);
-  };
+  function requireObjectKeys () {
+  	if (hasRequiredObjectKeys) return objectKeys;
+  	hasRequiredObjectKeys = 1;
+  	var internalObjectKeys = requireObjectKeysInternal();
+  	var enumBugKeys = requireEnumBugKeys();
 
-  var DESCRIPTORS$1 = descriptors;
-  var V8_PROTOTYPE_DEFINE_BUG = v8PrototypeDefineBug;
-  var definePropertyModule = objectDefineProperty;
-  var anObject$4 = anObject$7;
-  var toIndexedObject$2 = toIndexedObject$6;
-  var objectKeys$1 = objectKeys$2;
-
-  // `Object.defineProperties` method
-  // https://tc39.es/ecma262/#sec-object.defineproperties
-  // eslint-disable-next-line es/no-object-defineproperties -- safe
-  objectDefineProperties.f = DESCRIPTORS$1 && !V8_PROTOTYPE_DEFINE_BUG ? Object.defineProperties : function defineProperties(O, Properties) {
-    anObject$4(O);
-    var props = toIndexedObject$2(Properties);
-    var keys = objectKeys$1(Properties);
-    var length = keys.length;
-    var index = 0;
-    var key;
-    while (length > index) definePropertyModule.f(O, key = keys[index++], props[key]);
-    return O;
-  };
-
-  var getBuiltIn = getBuiltIn$4;
-
-  var html$1 = getBuiltIn('document', 'documentElement');
-
-  /* global ActiveXObject -- old IE, WSH */
-  var anObject$3 = anObject$7;
-  var definePropertiesModule = objectDefineProperties;
-  var enumBugKeys = enumBugKeys$3;
-  var hiddenKeys = hiddenKeys$4;
-  var html = html$1;
-  var documentCreateElement$1 = documentCreateElement$2;
-  var sharedKey = sharedKey$2;
-
-  var GT = '>';
-  var LT = '<';
-  var PROTOTYPE = 'prototype';
-  var SCRIPT = 'script';
-  var IE_PROTO = sharedKey('IE_PROTO');
-
-  var EmptyConstructor = function () { /* empty */ };
-
-  var scriptTag = function (content) {
-    return LT + SCRIPT + GT + content + LT + '/' + SCRIPT + GT;
-  };
-
-  // Create object with fake `null` prototype: use ActiveX Object with cleared prototype
-  var NullProtoObjectViaActiveX = function (activeXDocument) {
-    activeXDocument.write(scriptTag(''));
-    activeXDocument.close();
-    var temp = activeXDocument.parentWindow.Object;
-    activeXDocument = null; // avoid memory leak
-    return temp;
-  };
-
-  // Create object with fake `null` prototype: use iframe Object with cleared prototype
-  var NullProtoObjectViaIFrame = function () {
-    // Thrash, waste and sodomy: IE GC bug
-    var iframe = documentCreateElement$1('iframe');
-    var JS = 'java' + SCRIPT + ':';
-    var iframeDocument;
-    iframe.style.display = 'none';
-    html.appendChild(iframe);
-    // https://github.com/zloirock/core-js/issues/475
-    iframe.src = String(JS);
-    iframeDocument = iframe.contentWindow.document;
-    iframeDocument.open();
-    iframeDocument.write(scriptTag('document.F=Object'));
-    iframeDocument.close();
-    return iframeDocument.F;
-  };
-
-  // Check for document.domain and active x support
-  // No need to use active x approach when document.domain is not set
-  // see https://github.com/es-shims/es5-shim/issues/150
-  // variation of https://github.com/kitcambridge/es5-shim/commit/4f738ac066346
-  // avoid IE GC bug
-  var activeXDocument;
-  var NullProtoObject = function () {
-    try {
-      activeXDocument = new ActiveXObject('htmlfile');
-    } catch (error) { /* ignore */ }
-    NullProtoObject = typeof document != 'undefined'
-      ? document.domain && activeXDocument
-        ? NullProtoObjectViaActiveX(activeXDocument) // old IE
-        : NullProtoObjectViaIFrame()
-      : NullProtoObjectViaActiveX(activeXDocument); // WSH
-    var length = enumBugKeys.length;
-    while (length--) delete NullProtoObject[PROTOTYPE][enumBugKeys[length]];
-    return NullProtoObject();
-  };
-
-  hiddenKeys[IE_PROTO] = true;
-
-  // `Object.create` method
-  // https://tc39.es/ecma262/#sec-object.create
-  // eslint-disable-next-line es/no-object-create -- safe
-  var objectCreate = Object.create || function create(O, Properties) {
-    var result;
-    if (O !== null) {
-      EmptyConstructor[PROTOTYPE] = anObject$3(O);
-      result = new EmptyConstructor();
-      EmptyConstructor[PROTOTYPE] = null;
-      // add "__proto__" for Object.getPrototypeOf polyfill
-      result[IE_PROTO] = O;
-    } else result = NullProtoObject();
-    return Properties === undefined ? result : definePropertiesModule.f(result, Properties);
-  };
-
-  var wellKnownSymbol$3 = wellKnownSymbol$a;
-  var create$1 = objectCreate;
-  var defineProperty$1 = objectDefineProperty.f;
-
-  var UNSCOPABLES = wellKnownSymbol$3('unscopables');
-  var ArrayPrototype = Array.prototype;
-
-  // Array.prototype[@@unscopables]
-  // https://tc39.es/ecma262/#sec-array.prototype-@@unscopables
-  if (ArrayPrototype[UNSCOPABLES] === undefined) {
-    defineProperty$1(ArrayPrototype, UNSCOPABLES, {
-      configurable: true,
-      value: create$1(null)
-    });
+  	// `Object.keys` method
+  	// https://tc39.es/ecma262/#sec-object.keys
+  	// eslint-disable-next-line es/no-object-keys -- safe
+  	objectKeys = Object.keys || function keys(O) {
+  	  return internalObjectKeys(O, enumBugKeys);
+  	};
+  	return objectKeys;
   }
 
-  // add a key to Array.prototype[@@unscopables]
-  var addToUnscopables$1 = function (key) {
-    ArrayPrototype[UNSCOPABLES][key] = true;
-  };
+  var hasRequiredObjectDefineProperties;
 
-  var $$5 = _export;
-  var $find = arrayIteration.find;
-  var addToUnscopables = addToUnscopables$1;
+  function requireObjectDefineProperties () {
+  	if (hasRequiredObjectDefineProperties) return objectDefineProperties;
+  	hasRequiredObjectDefineProperties = 1;
+  	var DESCRIPTORS = requireDescriptors();
+  	var V8_PROTOTYPE_DEFINE_BUG = requireV8PrototypeDefineBug();
+  	var definePropertyModule = requireObjectDefineProperty();
+  	var anObject = requireAnObject();
+  	var toIndexedObject = requireToIndexedObject();
+  	var objectKeys = requireObjectKeys();
 
-  var FIND = 'find';
-  var SKIPS_HOLES = true;
-
-  // Shouldn't skip holes
-  // eslint-disable-next-line es/no-array-prototype-find -- testing
-  if (FIND in []) Array(1)[FIND](function () { SKIPS_HOLES = false; });
-
-  // `Array.prototype.find` method
-  // https://tc39.es/ecma262/#sec-array.prototype.find
-  $$5({ target: 'Array', proto: true, forced: SKIPS_HOLES }, {
-    find: function find(callbackfn /* , that = undefined */) {
-      return $find(this, callbackfn, arguments.length > 1 ? arguments[1] : undefined);
-    }
-  });
-
-  // https://tc39.es/ecma262/#sec-array.prototype-@@unscopables
-  addToUnscopables(FIND);
-
-  var fails$6 = fails$i;
-
-  var arrayMethodIsStrict$2 = function (METHOD_NAME, argument) {
-    var method = [][METHOD_NAME];
-    return !!method && fails$6(function () {
-      // eslint-disable-next-line no-useless-call -- required for testing
-      method.call(null, argument || function () { return 1; }, 1);
-    });
-  };
-
-  var $$4 = _export;
-  var uncurryThis$6 = functionUncurryThis;
-  var IndexedObject$1 = indexedObject;
-  var toIndexedObject$1 = toIndexedObject$6;
-  var arrayMethodIsStrict$1 = arrayMethodIsStrict$2;
-
-  var nativeJoin = uncurryThis$6([].join);
-
-  var ES3_STRINGS = IndexedObject$1 !== Object;
-  var FORCED = ES3_STRINGS || !arrayMethodIsStrict$1('join', ',');
-
-  // `Array.prototype.join` method
-  // https://tc39.es/ecma262/#sec-array.prototype.join
-  $$4({ target: 'Array', proto: true, forced: FORCED }, {
-    join: function join(separator) {
-      return nativeJoin(toIndexedObject$1(this), separator === undefined ? ',' : separator);
-    }
-  });
-
-  var $$3 = _export;
-  var $map = arrayIteration.map;
-  var arrayMethodHasSpeciesSupport$1 = arrayMethodHasSpeciesSupport$3;
-
-  var HAS_SPECIES_SUPPORT$1 = arrayMethodHasSpeciesSupport$1('map');
-
-  // `Array.prototype.map` method
-  // https://tc39.es/ecma262/#sec-array.prototype.map
-  // with adding support of @@species
-  $$3({ target: 'Array', proto: true, forced: !HAS_SPECIES_SUPPORT$1 }, {
-    map: function map(callbackfn /* , thisArg */) {
-      return $map(this, callbackfn, arguments.length > 1 ? arguments[1] : undefined);
-    }
-  });
-
-  var uncurryThis$5 = functionUncurryThis;
-
-  var arraySlice = uncurryThis$5([].slice);
-
-  var $$2 = _export;
-  var isArray = isArray$3;
-  var isConstructor = isConstructor$2;
-  var isObject = isObject$8;
-  var toAbsoluteIndex = toAbsoluteIndex$2;
-  var lengthOfArrayLike = lengthOfArrayLike$4;
-  var toIndexedObject = toIndexedObject$6;
-  var createProperty = createProperty$2;
-  var wellKnownSymbol$2 = wellKnownSymbol$a;
-  var arrayMethodHasSpeciesSupport = arrayMethodHasSpeciesSupport$3;
-  var nativeSlice = arraySlice;
-
-  var HAS_SPECIES_SUPPORT = arrayMethodHasSpeciesSupport('slice');
-
-  var SPECIES$1 = wellKnownSymbol$2('species');
-  var $Array = Array;
-  var max$1 = Math.max;
-
-  // `Array.prototype.slice` method
-  // https://tc39.es/ecma262/#sec-array.prototype.slice
-  // fallback for not array-like ES3 strings and DOM objects
-  $$2({ target: 'Array', proto: true, forced: !HAS_SPECIES_SUPPORT }, {
-    slice: function slice(start, end) {
-      var O = toIndexedObject(this);
-      var length = lengthOfArrayLike(O);
-      var k = toAbsoluteIndex(start, length);
-      var fin = toAbsoluteIndex(end === undefined ? length : end, length);
-      // inline `ArraySpeciesCreate` for usage native `Array#slice` where it's possible
-      var Constructor, result, n;
-      if (isArray(O)) {
-        Constructor = O.constructor;
-        // cross-realm fallback
-        if (isConstructor(Constructor) && (Constructor === $Array || isArray(Constructor.prototype))) {
-          Constructor = undefined;
-        } else if (isObject(Constructor)) {
-          Constructor = Constructor[SPECIES$1];
-          if (Constructor === null) Constructor = undefined;
-        }
-        if (Constructor === $Array || Constructor === undefined) {
-          return nativeSlice(O, k, fin);
-        }
-      }
-      result = new (Constructor === undefined ? $Array : Constructor)(max$1(fin - k, 0));
-      for (n = 0; k < fin; k++, n++) if (k in O) createProperty(result, n, O[k]);
-      result.length = n;
-      return result;
-    }
-  });
-
-  var DESCRIPTORS = descriptors;
-  var uncurryThis$4 = functionUncurryThis;
-  var call$5 = functionCall;
-  var fails$5 = fails$i;
-  var objectKeys = objectKeys$2;
-  var getOwnPropertySymbolsModule = objectGetOwnPropertySymbols;
-  var propertyIsEnumerableModule = objectPropertyIsEnumerable;
-  var toObject$1 = toObject$5;
-  var IndexedObject = indexedObject;
-
-  // eslint-disable-next-line es/no-object-assign -- safe
-  var $assign = Object.assign;
-  // eslint-disable-next-line es/no-object-defineproperty -- required for testing
-  var defineProperty = Object.defineProperty;
-  var concat$1 = uncurryThis$4([].concat);
-
-  // `Object.assign` method
-  // https://tc39.es/ecma262/#sec-object.assign
-  var objectAssign = !$assign || fails$5(function () {
-    // should have correct order of operations (Edge bug)
-    if (DESCRIPTORS && $assign({ b: 1 }, $assign(defineProperty({}, 'a', {
-      enumerable: true,
-      get: function () {
-        defineProperty(this, 'b', {
-          value: 3,
-          enumerable: false
-        });
-      }
-    }), { b: 2 })).b !== 1) return true;
-    // should work with symbols and should have deterministic property order (V8 bug)
-    var A = {};
-    var B = {};
-    // eslint-disable-next-line es/no-symbol -- safe
-    var symbol = Symbol('assign detection');
-    var alphabet = 'abcdefghijklmnopqrst';
-    A[symbol] = 7;
-    alphabet.split('').forEach(function (chr) { B[chr] = chr; });
-    return $assign({}, A)[symbol] !== 7 || objectKeys($assign({}, B)).join('') !== alphabet;
-  }) ? function assign(target, source) { // eslint-disable-line no-unused-vars -- required for `.length`
-    var T = toObject$1(target);
-    var argumentsLength = arguments.length;
-    var index = 1;
-    var getOwnPropertySymbols = getOwnPropertySymbolsModule.f;
-    var propertyIsEnumerable = propertyIsEnumerableModule.f;
-    while (argumentsLength > index) {
-      var S = IndexedObject(arguments[index++]);
-      var keys = getOwnPropertySymbols ? concat$1(objectKeys(S), getOwnPropertySymbols(S)) : objectKeys(S);
-      var length = keys.length;
-      var j = 0;
-      var key;
-      while (length > j) {
-        key = keys[j++];
-        if (!DESCRIPTORS || call$5(propertyIsEnumerable, S, key)) T[key] = S[key];
-      }
-    } return T;
-  } : $assign;
-
-  var $$1 = _export;
-  var assign = objectAssign;
-
-  // `Object.assign` method
-  // https://tc39.es/ecma262/#sec-object.assign
-  // eslint-disable-next-line es/no-object-assign -- required for testing
-  $$1({ target: 'Object', stat: true, arity: 2, forced: Object.assign !== assign }, {
-    assign: assign
-  });
-
-  var TO_STRING_TAG_SUPPORT$1 = toStringTagSupport;
-  var classof$2 = classof$4;
-
-  // `Object.prototype.toString` method implementation
-  // https://tc39.es/ecma262/#sec-object.prototype.tostring
-  var objectToString = TO_STRING_TAG_SUPPORT$1 ? {}.toString : function toString() {
-    return '[object ' + classof$2(this) + ']';
-  };
-
-  var TO_STRING_TAG_SUPPORT = toStringTagSupport;
-  var defineBuiltIn$1 = defineBuiltIn$3;
-  var toString$4 = objectToString;
-
-  // `Object.prototype.toString` method
-  // https://tc39.es/ecma262/#sec-object.prototype.tostring
-  if (!TO_STRING_TAG_SUPPORT) {
-    defineBuiltIn$1(Object.prototype, 'toString', toString$4, { unsafe: true });
+  	// `Object.defineProperties` method
+  	// https://tc39.es/ecma262/#sec-object.defineproperties
+  	// eslint-disable-next-line es/no-object-defineproperties -- safe
+  	objectDefineProperties.f = DESCRIPTORS && !V8_PROTOTYPE_DEFINE_BUG ? Object.defineProperties : function defineProperties(O, Properties) {
+  	  anObject(O);
+  	  var props = toIndexedObject(Properties);
+  	  var keys = objectKeys(Properties);
+  	  var length = keys.length;
+  	  var index = 0;
+  	  var key;
+  	  while (length > index) definePropertyModule.f(O, key = keys[index++], props[key]);
+  	  return O;
+  	};
+  	return objectDefineProperties;
   }
 
-  var classof$1 = classof$4;
+  var html;
+  var hasRequiredHtml;
 
-  var $String = String;
+  function requireHtml () {
+  	if (hasRequiredHtml) return html;
+  	hasRequiredHtml = 1;
+  	var getBuiltIn = requireGetBuiltIn();
 
-  var toString$3 = function (argument) {
-    if (classof$1(argument) === 'Symbol') throw new TypeError('Cannot convert a Symbol value to a string');
-    return $String(argument);
-  };
-
-  var anObject$2 = anObject$7;
-
-  // `RegExp.prototype.flags` getter implementation
-  // https://tc39.es/ecma262/#sec-get-regexp.prototype.flags
-  var regexpFlags$1 = function () {
-    var that = anObject$2(this);
-    var result = '';
-    if (that.hasIndices) result += 'd';
-    if (that.global) result += 'g';
-    if (that.ignoreCase) result += 'i';
-    if (that.multiline) result += 'm';
-    if (that.dotAll) result += 's';
-    if (that.unicode) result += 'u';
-    if (that.unicodeSets) result += 'v';
-    if (that.sticky) result += 'y';
-    return result;
-  };
-
-  var fails$4 = fails$i;
-  var global$4 = global$e;
-
-  // babel-minify and Closure Compiler transpiles RegExp('a', 'y') -> /a/y and it causes SyntaxError
-  var $RegExp$2 = global$4.RegExp;
-
-  var UNSUPPORTED_Y$1 = fails$4(function () {
-    var re = $RegExp$2('a', 'y');
-    re.lastIndex = 2;
-    return re.exec('abcd') !== null;
-  });
-
-  // UC Browser bug
-  // https://github.com/zloirock/core-js/issues/1008
-  var MISSED_STICKY = UNSUPPORTED_Y$1 || fails$4(function () {
-    return !$RegExp$2('a', 'y').sticky;
-  });
-
-  var BROKEN_CARET = UNSUPPORTED_Y$1 || fails$4(function () {
-    // https://bugzilla.mozilla.org/show_bug.cgi?id=773687
-    var re = $RegExp$2('^r', 'gy');
-    re.lastIndex = 2;
-    return re.exec('str') !== null;
-  });
-
-  var regexpStickyHelpers = {
-    BROKEN_CARET: BROKEN_CARET,
-    MISSED_STICKY: MISSED_STICKY,
-    UNSUPPORTED_Y: UNSUPPORTED_Y$1
-  };
-
-  var fails$3 = fails$i;
-  var global$3 = global$e;
-
-  // babel-minify and Closure Compiler transpiles RegExp('.', 's') -> /./s and it causes SyntaxError
-  var $RegExp$1 = global$3.RegExp;
-
-  var regexpUnsupportedDotAll = fails$3(function () {
-    var re = $RegExp$1('.', 's');
-    return !(re.dotAll && re.test('\n') && re.flags === 's');
-  });
-
-  var fails$2 = fails$i;
-  var global$2 = global$e;
-
-  // babel-minify and Closure Compiler transpiles RegExp('(?<a>b)', 'g') -> /(?<a>b)/g and it causes SyntaxError
-  var $RegExp = global$2.RegExp;
-
-  var regexpUnsupportedNcg = fails$2(function () {
-    var re = $RegExp('(?<a>b)', 'g');
-    return re.exec('b').groups.a !== 'b' ||
-      'b'.replace(re, '$<a>c') !== 'bc';
-  });
-
-  /* eslint-disable regexp/no-empty-capturing-group, regexp/no-empty-group, regexp/no-lazy-ends -- testing */
-  /* eslint-disable regexp/no-useless-quantifier -- testing */
-  var call$4 = functionCall;
-  var uncurryThis$3 = functionUncurryThis;
-  var toString$2 = toString$3;
-  var regexpFlags = regexpFlags$1;
-  var stickyHelpers = regexpStickyHelpers;
-  var shared = shared$4;
-  var create = objectCreate;
-  var getInternalState = internalState.get;
-  var UNSUPPORTED_DOT_ALL = regexpUnsupportedDotAll;
-  var UNSUPPORTED_NCG = regexpUnsupportedNcg;
-
-  var nativeReplace = shared('native-string-replace', String.prototype.replace);
-  var nativeExec = RegExp.prototype.exec;
-  var patchedExec = nativeExec;
-  var charAt$3 = uncurryThis$3(''.charAt);
-  var indexOf = uncurryThis$3(''.indexOf);
-  var replace$1 = uncurryThis$3(''.replace);
-  var stringSlice$3 = uncurryThis$3(''.slice);
-
-  var UPDATES_LAST_INDEX_WRONG = (function () {
-    var re1 = /a/;
-    var re2 = /b*/g;
-    call$4(nativeExec, re1, 'a');
-    call$4(nativeExec, re2, 'a');
-    return re1.lastIndex !== 0 || re2.lastIndex !== 0;
-  })();
-
-  var UNSUPPORTED_Y = stickyHelpers.BROKEN_CARET;
-
-  // nonparticipating capturing group, copied from es5-shim's String#split patch.
-  var NPCG_INCLUDED = /()??/.exec('')[1] !== undefined;
-
-  var PATCH = UPDATES_LAST_INDEX_WRONG || NPCG_INCLUDED || UNSUPPORTED_Y || UNSUPPORTED_DOT_ALL || UNSUPPORTED_NCG;
-
-  if (PATCH) {
-    patchedExec = function exec(string) {
-      var re = this;
-      var state = getInternalState(re);
-      var str = toString$2(string);
-      var raw = state.raw;
-      var result, reCopy, lastIndex, match, i, object, group;
-
-      if (raw) {
-        raw.lastIndex = re.lastIndex;
-        result = call$4(patchedExec, raw, str);
-        re.lastIndex = raw.lastIndex;
-        return result;
-      }
-
-      var groups = state.groups;
-      var sticky = UNSUPPORTED_Y && re.sticky;
-      var flags = call$4(regexpFlags, re);
-      var source = re.source;
-      var charsAdded = 0;
-      var strCopy = str;
-
-      if (sticky) {
-        flags = replace$1(flags, 'y', '');
-        if (indexOf(flags, 'g') === -1) {
-          flags += 'g';
-        }
-
-        strCopy = stringSlice$3(str, re.lastIndex);
-        // Support anchored sticky behavior.
-        if (re.lastIndex > 0 && (!re.multiline || re.multiline && charAt$3(str, re.lastIndex - 1) !== '\n')) {
-          source = '(?: ' + source + ')';
-          strCopy = ' ' + strCopy;
-          charsAdded++;
-        }
-        // ^(? + rx + ) is needed, in combination with some str slicing, to
-        // simulate the 'y' flag.
-        reCopy = new RegExp('^(?:' + source + ')', flags);
-      }
-
-      if (NPCG_INCLUDED) {
-        reCopy = new RegExp('^' + source + '$(?!\\s)', flags);
-      }
-      if (UPDATES_LAST_INDEX_WRONG) lastIndex = re.lastIndex;
-
-      match = call$4(nativeExec, sticky ? reCopy : re, strCopy);
-
-      if (sticky) {
-        if (match) {
-          match.input = stringSlice$3(match.input, charsAdded);
-          match[0] = stringSlice$3(match[0], charsAdded);
-          match.index = re.lastIndex;
-          re.lastIndex += match[0].length;
-        } else re.lastIndex = 0;
-      } else if (UPDATES_LAST_INDEX_WRONG && match) {
-        re.lastIndex = re.global ? match.index + match[0].length : lastIndex;
-      }
-      if (NPCG_INCLUDED && match && match.length > 1) {
-        // Fix browsers whose `exec` methods don't consistently return `undefined`
-        // for NPCG, like IE8. NOTE: This doesn't work for /(.?)?/
-        call$4(nativeReplace, match[0], reCopy, function () {
-          for (i = 1; i < arguments.length - 2; i++) {
-            if (arguments[i] === undefined) match[i] = undefined;
-          }
-        });
-      }
-
-      if (match && groups) {
-        match.groups = object = create(null);
-        for (i = 0; i < groups.length; i++) {
-          group = groups[i];
-          object[group[0]] = match[group[1]];
-        }
-      }
-
-      return match;
-    };
+  	html = getBuiltIn('document', 'documentElement');
+  	return html;
   }
 
-  var regexpExec$2 = patchedExec;
+  var objectCreate;
+  var hasRequiredObjectCreate;
 
-  var $ = _export;
-  var exec = regexpExec$2;
+  function requireObjectCreate () {
+  	if (hasRequiredObjectCreate) return objectCreate;
+  	hasRequiredObjectCreate = 1;
+  	/* global ActiveXObject -- old IE, WSH */
+  	var anObject = requireAnObject();
+  	var definePropertiesModule = requireObjectDefineProperties();
+  	var enumBugKeys = requireEnumBugKeys();
+  	var hiddenKeys = requireHiddenKeys();
+  	var html = requireHtml();
+  	var documentCreateElement = requireDocumentCreateElement();
+  	var sharedKey = requireSharedKey();
 
-  // `RegExp.prototype.exec` method
-  // https://tc39.es/ecma262/#sec-regexp.prototype.exec
-  $({ target: 'RegExp', proto: true, forced: /./.exec !== exec }, {
-    exec: exec
-  });
+  	var GT = '>';
+  	var LT = '<';
+  	var PROTOTYPE = 'prototype';
+  	var SCRIPT = 'script';
+  	var IE_PROTO = sharedKey('IE_PROTO');
 
-  var NATIVE_BIND = functionBindNative;
+  	var EmptyConstructor = function () { /* empty */ };
 
-  var FunctionPrototype = Function.prototype;
-  var apply$1 = FunctionPrototype.apply;
-  var call$3 = FunctionPrototype.call;
+  	var scriptTag = function (content) {
+  	  return LT + SCRIPT + GT + content + LT + '/' + SCRIPT + GT;
+  	};
 
-  // eslint-disable-next-line es/no-reflect -- safe
-  var functionApply = typeof Reflect == 'object' && Reflect.apply || (NATIVE_BIND ? call$3.bind(apply$1) : function () {
-    return call$3.apply(apply$1, arguments);
-  });
+  	// Create object with fake `null` prototype: use ActiveX Object with cleared prototype
+  	var NullProtoObjectViaActiveX = function (activeXDocument) {
+  	  activeXDocument.write(scriptTag(''));
+  	  activeXDocument.close();
+  	  var temp = activeXDocument.parentWindow.Object;
+  	  // eslint-disable-next-line no-useless-assignment -- avoid memory leak
+  	  activeXDocument = null;
+  	  return temp;
+  	};
 
-  // TODO: Remove from `core-js@4` since it's moved to entry points
+  	// Create object with fake `null` prototype: use iframe Object with cleared prototype
+  	var NullProtoObjectViaIFrame = function () {
+  	  // Thrash, waste and sodomy: IE GC bug
+  	  var iframe = documentCreateElement('iframe');
+  	  var JS = 'java' + SCRIPT + ':';
+  	  var iframeDocument;
+  	  iframe.style.display = 'none';
+  	  html.appendChild(iframe);
+  	  // https://github.com/zloirock/core-js/issues/475
+  	  iframe.src = String(JS);
+  	  iframeDocument = iframe.contentWindow.document;
+  	  iframeDocument.open();
+  	  iframeDocument.write(scriptTag('document.F=Object'));
+  	  iframeDocument.close();
+  	  return iframeDocument.F;
+  	};
 
-  var call$2 = functionCall;
-  var defineBuiltIn = defineBuiltIn$3;
-  var regexpExec$1 = regexpExec$2;
-  var fails$1 = fails$i;
-  var wellKnownSymbol$1 = wellKnownSymbol$a;
-  var createNonEnumerableProperty$1 = createNonEnumerableProperty$4;
+  	// Check for document.domain and active x support
+  	// No need to use active x approach when document.domain is not set
+  	// see https://github.com/es-shims/es5-shim/issues/150
+  	// variation of https://github.com/kitcambridge/es5-shim/commit/4f738ac066346
+  	// avoid IE GC bug
+  	var activeXDocument;
+  	var NullProtoObject = function () {
+  	  try {
+  	    activeXDocument = new ActiveXObject('htmlfile');
+  	  } catch (error) { /* ignore */ }
+  	  NullProtoObject = typeof document != 'undefined'
+  	    ? document.domain && activeXDocument
+  	      ? NullProtoObjectViaActiveX(activeXDocument) // old IE
+  	      : NullProtoObjectViaIFrame()
+  	    : NullProtoObjectViaActiveX(activeXDocument); // WSH
+  	  var length = enumBugKeys.length;
+  	  while (length--) delete NullProtoObject[PROTOTYPE][enumBugKeys[length]];
+  	  return NullProtoObject();
+  	};
 
-  var SPECIES = wellKnownSymbol$1('species');
-  var RegExpPrototype = RegExp.prototype;
+  	hiddenKeys[IE_PROTO] = true;
 
-  var fixRegexpWellKnownSymbolLogic = function (KEY, exec, FORCED, SHAM) {
-    var SYMBOL = wellKnownSymbol$1(KEY);
-
-    var DELEGATES_TO_SYMBOL = !fails$1(function () {
-      // String methods call symbol-named RegExp methods
-      var O = {};
-      O[SYMBOL] = function () { return 7; };
-      return ''[KEY](O) !== 7;
-    });
-
-    var DELEGATES_TO_EXEC = DELEGATES_TO_SYMBOL && !fails$1(function () {
-      // Symbol-named RegExp methods call .exec
-      var execCalled = false;
-      var re = /a/;
-
-      if (KEY === 'split') {
-        // We can't use real regex here since it causes deoptimization
-        // and serious performance degradation in V8
-        // https://github.com/zloirock/core-js/issues/306
-        re = {};
-        // RegExp[@@split] doesn't call the regex's exec method, but first creates
-        // a new one. We need to return the patched regex when creating the new one.
-        re.constructor = {};
-        re.constructor[SPECIES] = function () { return re; };
-        re.flags = '';
-        re[SYMBOL] = /./[SYMBOL];
-      }
-
-      re.exec = function () {
-        execCalled = true;
-        return null;
-      };
-
-      re[SYMBOL]('');
-      return !execCalled;
-    });
-
-    if (
-      !DELEGATES_TO_SYMBOL ||
-      !DELEGATES_TO_EXEC ||
-      FORCED
-    ) {
-      var nativeRegExpMethod = /./[SYMBOL];
-      var methods = exec(SYMBOL, ''[KEY], function (nativeMethod, regexp, str, arg2, forceStringMethod) {
-        var $exec = regexp.exec;
-        if ($exec === regexpExec$1 || $exec === RegExpPrototype.exec) {
-          if (DELEGATES_TO_SYMBOL && !forceStringMethod) {
-            // The native String method already delegates to @@method (this
-            // polyfilled function), leasing to infinite recursion.
-            // We avoid it by directly calling the native @@method method.
-            return { done: true, value: call$2(nativeRegExpMethod, regexp, str, arg2) };
-          }
-          return { done: true, value: call$2(nativeMethod, str, regexp, arg2) };
-        }
-        return { done: false };
-      });
-
-      defineBuiltIn(String.prototype, KEY, methods[0]);
-      defineBuiltIn(RegExpPrototype, SYMBOL, methods[1]);
-    }
-
-    if (SHAM) createNonEnumerableProperty$1(RegExpPrototype[SYMBOL], 'sham', true);
-  };
-
-  var uncurryThis$2 = functionUncurryThis;
-  var toIntegerOrInfinity$1 = toIntegerOrInfinity$4;
-  var toString$1 = toString$3;
-  var requireObjectCoercible$1 = requireObjectCoercible$4;
-
-  var charAt$2 = uncurryThis$2(''.charAt);
-  var charCodeAt = uncurryThis$2(''.charCodeAt);
-  var stringSlice$2 = uncurryThis$2(''.slice);
-
-  var createMethod = function (CONVERT_TO_STRING) {
-    return function ($this, pos) {
-      var S = toString$1(requireObjectCoercible$1($this));
-      var position = toIntegerOrInfinity$1(pos);
-      var size = S.length;
-      var first, second;
-      if (position < 0 || position >= size) return CONVERT_TO_STRING ? '' : undefined;
-      first = charCodeAt(S, position);
-      return first < 0xD800 || first > 0xDBFF || position + 1 === size
-        || (second = charCodeAt(S, position + 1)) < 0xDC00 || second > 0xDFFF
-          ? CONVERT_TO_STRING
-            ? charAt$2(S, position)
-            : first
-          : CONVERT_TO_STRING
-            ? stringSlice$2(S, position, position + 2)
-            : (first - 0xD800 << 10) + (second - 0xDC00) + 0x10000;
-    };
-  };
-
-  var stringMultibyte = {
-    // `String.prototype.codePointAt` method
-    // https://tc39.es/ecma262/#sec-string.prototype.codepointat
-    codeAt: createMethod(false),
-    // `String.prototype.at` method
-    // https://github.com/mathiasbynens/String.prototype.at
-    charAt: createMethod(true)
-  };
-
-  var charAt$1 = stringMultibyte.charAt;
-
-  // `AdvanceStringIndex` abstract operation
-  // https://tc39.es/ecma262/#sec-advancestringindex
-  var advanceStringIndex$1 = function (S, index, unicode) {
-    return index + (unicode ? charAt$1(S, index).length : 1);
-  };
-
-  var uncurryThis$1 = functionUncurryThis;
-  var toObject = toObject$5;
-
-  var floor = Math.floor;
-  var charAt = uncurryThis$1(''.charAt);
-  var replace = uncurryThis$1(''.replace);
-  var stringSlice$1 = uncurryThis$1(''.slice);
-  // eslint-disable-next-line redos/no-vulnerable -- safe
-  var SUBSTITUTION_SYMBOLS = /\$([$&'`]|\d{1,2}|<[^>]*>)/g;
-  var SUBSTITUTION_SYMBOLS_NO_NAMED = /\$([$&'`]|\d{1,2})/g;
-
-  // `GetSubstitution` abstract operation
-  // https://tc39.es/ecma262/#sec-getsubstitution
-  var getSubstitution$1 = function (matched, str, position, captures, namedCaptures, replacement) {
-    var tailPos = position + matched.length;
-    var m = captures.length;
-    var symbols = SUBSTITUTION_SYMBOLS_NO_NAMED;
-    if (namedCaptures !== undefined) {
-      namedCaptures = toObject(namedCaptures);
-      symbols = SUBSTITUTION_SYMBOLS;
-    }
-    return replace(replacement, symbols, function (match, ch) {
-      var capture;
-      switch (charAt(ch, 0)) {
-        case '$': return '$';
-        case '&': return matched;
-        case '`': return stringSlice$1(str, 0, position);
-        case "'": return stringSlice$1(str, tailPos);
-        case '<':
-          capture = namedCaptures[stringSlice$1(ch, 1, -1)];
-          break;
-        default: // \d\d?
-          var n = +ch;
-          if (n === 0) return match;
-          if (n > m) {
-            var f = floor(n / 10);
-            if (f === 0) return match;
-            if (f <= m) return captures[f - 1] === undefined ? charAt(ch, 1) : captures[f - 1] + charAt(ch, 1);
-            return match;
-          }
-          capture = captures[n - 1];
-      }
-      return capture === undefined ? '' : capture;
-    });
-  };
-
-  var call$1 = functionCall;
-  var anObject$1 = anObject$7;
-  var isCallable$1 = isCallable$e;
-  var classof = classofRaw$2;
-  var regexpExec = regexpExec$2;
-
-  var $TypeError = TypeError;
-
-  // `RegExpExec` abstract operation
-  // https://tc39.es/ecma262/#sec-regexpexec
-  var regexpExecAbstract = function (R, S) {
-    var exec = R.exec;
-    if (isCallable$1(exec)) {
-      var result = call$1(exec, R, S);
-      if (result !== null) anObject$1(result);
-      return result;
-    }
-    if (classof(R) === 'RegExp') return call$1(regexpExec, R, S);
-    throw new $TypeError('RegExp#exec called on incompatible receiver');
-  };
-
-  var apply = functionApply;
-  var call = functionCall;
-  var uncurryThis = functionUncurryThis;
-  var fixRegExpWellKnownSymbolLogic = fixRegexpWellKnownSymbolLogic;
-  var fails = fails$i;
-  var anObject = anObject$7;
-  var isCallable = isCallable$e;
-  var isNullOrUndefined = isNullOrUndefined$3;
-  var toIntegerOrInfinity = toIntegerOrInfinity$4;
-  var toLength = toLength$2;
-  var toString = toString$3;
-  var requireObjectCoercible = requireObjectCoercible$4;
-  var advanceStringIndex = advanceStringIndex$1;
-  var getMethod = getMethod$2;
-  var getSubstitution = getSubstitution$1;
-  var regExpExec = regexpExecAbstract;
-  var wellKnownSymbol = wellKnownSymbol$a;
-
-  var REPLACE = wellKnownSymbol('replace');
-  var max = Math.max;
-  var min = Math.min;
-  var concat = uncurryThis([].concat);
-  var push = uncurryThis([].push);
-  var stringIndexOf = uncurryThis(''.indexOf);
-  var stringSlice = uncurryThis(''.slice);
-
-  var maybeToString = function (it) {
-    return it === undefined ? it : String(it);
-  };
-
-  // IE <= 11 replaces $0 with the whole match, as if it was $&
-  // https://stackoverflow.com/questions/6024666/getting-ie-to-replace-a-regex-with-the-literal-string-0
-  var REPLACE_KEEPS_$0 = (function () {
-    // eslint-disable-next-line regexp/prefer-escape-replacement-dollar-char -- required for testing
-    return 'a'.replace(/./, '$0') === '$0';
-  })();
-
-  // Safari <= 13.0.3(?) substitutes nth capture where n>m with an empty string
-  var REGEXP_REPLACE_SUBSTITUTES_UNDEFINED_CAPTURE = (function () {
-    if (/./[REPLACE]) {
-      return /./[REPLACE]('a', '$0') === '';
-    }
-    return false;
-  })();
-
-  var REPLACE_SUPPORTS_NAMED_GROUPS = !fails(function () {
-    var re = /./;
-    re.exec = function () {
-      var result = [];
-      result.groups = { a: '7' };
-      return result;
-    };
-    // eslint-disable-next-line regexp/no-useless-dollar-replacements -- false positive
-    return ''.replace(re, '$<a>') !== '7';
-  });
-
-  // @@replace logic
-  fixRegExpWellKnownSymbolLogic('replace', function (_, nativeReplace, maybeCallNative) {
-    var UNSAFE_SUBSTITUTE = REGEXP_REPLACE_SUBSTITUTES_UNDEFINED_CAPTURE ? '$' : '$0';
-
-    return [
-      // `String.prototype.replace` method
-      // https://tc39.es/ecma262/#sec-string.prototype.replace
-      function replace(searchValue, replaceValue) {
-        var O = requireObjectCoercible(this);
-        var replacer = isNullOrUndefined(searchValue) ? undefined : getMethod(searchValue, REPLACE);
-        return replacer
-          ? call(replacer, searchValue, O, replaceValue)
-          : call(nativeReplace, toString(O), searchValue, replaceValue);
-      },
-      // `RegExp.prototype[@@replace]` method
-      // https://tc39.es/ecma262/#sec-regexp.prototype-@@replace
-      function (string, replaceValue) {
-        var rx = anObject(this);
-        var S = toString(string);
-
-        if (
-          typeof replaceValue == 'string' &&
-          stringIndexOf(replaceValue, UNSAFE_SUBSTITUTE) === -1 &&
-          stringIndexOf(replaceValue, '$<') === -1
-        ) {
-          var res = maybeCallNative(nativeReplace, rx, S, replaceValue);
-          if (res.done) return res.value;
-        }
-
-        var functionalReplace = isCallable(replaceValue);
-        if (!functionalReplace) replaceValue = toString(replaceValue);
-
-        var global = rx.global;
-        var fullUnicode;
-        if (global) {
-          fullUnicode = rx.unicode;
-          rx.lastIndex = 0;
-        }
-
-        var results = [];
-        var result;
-        while (true) {
-          result = regExpExec(rx, S);
-          if (result === null) break;
-
-          push(results, result);
-          if (!global) break;
-
-          var matchStr = toString(result[0]);
-          if (matchStr === '') rx.lastIndex = advanceStringIndex(S, toLength(rx.lastIndex), fullUnicode);
-        }
-
-        var accumulatedResult = '';
-        var nextSourcePosition = 0;
-        for (var i = 0; i < results.length; i++) {
-          result = results[i];
-
-          var matched = toString(result[0]);
-          var position = max(min(toIntegerOrInfinity(result.index), S.length), 0);
-          var captures = [];
-          var replacement;
-          // NOTE: This is equivalent to
-          //   captures = result.slice(1).map(maybeToString)
-          // but for some reason `nativeSlice.call(result, 1, result.length)` (called in
-          // the slice polyfill when slicing native arrays) "doesn't work" in safari 9 and
-          // causes a crash (https://pastebin.com/N21QzeQA) when trying to debug it.
-          for (var j = 1; j < result.length; j++) push(captures, maybeToString(result[j]));
-          var namedCaptures = result.groups;
-          if (functionalReplace) {
-            var replacerArgs = concat([matched], captures, position, S);
-            if (namedCaptures !== undefined) push(replacerArgs, namedCaptures);
-            replacement = toString(apply(replaceValue, undefined, replacerArgs));
-          } else {
-            replacement = getSubstitution(matched, S, position, captures, namedCaptures, replaceValue);
-          }
-          if (position >= nextSourcePosition) {
-            accumulatedResult += stringSlice(S, nextSourcePosition, position) + replacement;
-            nextSourcePosition = position + matched.length;
-          }
-        }
-
-        return accumulatedResult + stringSlice(S, nextSourcePosition);
-      }
-    ];
-  }, !REPLACE_SUPPORTS_NAMED_GROUPS || !REPLACE_KEEPS_$0 || REGEXP_REPLACE_SUBSTITUTES_UNDEFINED_CAPTURE);
-
-  // iterable DOM collections
-  // flag - `iterable` interface - 'entries', 'keys', 'values', 'forEach' methods
-  var domIterables = {
-    CSSRuleList: 0,
-    CSSStyleDeclaration: 0,
-    CSSValueList: 0,
-    ClientRectList: 0,
-    DOMRectList: 0,
-    DOMStringList: 0,
-    DOMTokenList: 1,
-    DataTransferItemList: 0,
-    FileList: 0,
-    HTMLAllCollection: 0,
-    HTMLCollection: 0,
-    HTMLFormElement: 0,
-    HTMLSelectElement: 0,
-    MediaList: 0,
-    MimeTypeArray: 0,
-    NamedNodeMap: 0,
-    NodeList: 1,
-    PaintRequestList: 0,
-    Plugin: 0,
-    PluginArray: 0,
-    SVGLengthList: 0,
-    SVGNumberList: 0,
-    SVGPathSegList: 0,
-    SVGPointList: 0,
-    SVGStringList: 0,
-    SVGTransformList: 0,
-    SourceBufferList: 0,
-    StyleSheetList: 0,
-    TextTrackCueList: 0,
-    TextTrackList: 0,
-    TouchList: 0
-  };
-
-  // in old WebKit versions, `element.classList` is not an instance of global `DOMTokenList`
-  var documentCreateElement = documentCreateElement$2;
-
-  var classList = documentCreateElement('span').classList;
-  var DOMTokenListPrototype$1 = classList && classList.constructor && classList.constructor.prototype;
-
-  var domTokenListPrototype = DOMTokenListPrototype$1 === Object.prototype ? undefined : DOMTokenListPrototype$1;
-
-  var $forEach = arrayIteration.forEach;
-  var arrayMethodIsStrict = arrayMethodIsStrict$2;
-
-  var STRICT_METHOD = arrayMethodIsStrict('forEach');
-
-  // `Array.prototype.forEach` method implementation
-  // https://tc39.es/ecma262/#sec-array.prototype.foreach
-  var arrayForEach = !STRICT_METHOD ? function forEach(callbackfn /* , thisArg */) {
-    return $forEach(this, callbackfn, arguments.length > 1 ? arguments[1] : undefined);
-  // eslint-disable-next-line es/no-array-prototype-foreach -- safe
-  } : [].forEach;
-
-  var global$1 = global$e;
-  var DOMIterables = domIterables;
-  var DOMTokenListPrototype = domTokenListPrototype;
-  var forEach = arrayForEach;
-  var createNonEnumerableProperty = createNonEnumerableProperty$4;
-
-  var handlePrototype = function (CollectionPrototype) {
-    // some Chrome versions have non-configurable methods on DOMTokenList
-    if (CollectionPrototype && CollectionPrototype.forEach !== forEach) try {
-      createNonEnumerableProperty(CollectionPrototype, 'forEach', forEach);
-    } catch (error) {
-      CollectionPrototype.forEach = forEach;
-    }
-  };
-
-  for (var COLLECTION_NAME in DOMIterables) {
-    if (DOMIterables[COLLECTION_NAME]) {
-      handlePrototype(global$1[COLLECTION_NAME] && global$1[COLLECTION_NAME].prototype);
-    }
+  	// `Object.create` method
+  	// https://tc39.es/ecma262/#sec-object.create
+  	// eslint-disable-next-line es/no-object-create -- safe
+  	objectCreate = Object.create || function create(O, Properties) {
+  	  var result;
+  	  if (O !== null) {
+  	    EmptyConstructor[PROTOTYPE] = anObject(O);
+  	    result = new EmptyConstructor();
+  	    EmptyConstructor[PROTOTYPE] = null;
+  	    // add "__proto__" for Object.getPrototypeOf polyfill
+  	    result[IE_PROTO] = O;
+  	  } else result = NullProtoObject();
+  	  return Properties === undefined ? result : definePropertiesModule.f(result, Properties);
+  	};
+  	return objectCreate;
   }
 
-  handlePrototype(DOMTokenListPrototype);
+  var addToUnscopables;
+  var hasRequiredAddToUnscopables;
+
+  function requireAddToUnscopables () {
+  	if (hasRequiredAddToUnscopables) return addToUnscopables;
+  	hasRequiredAddToUnscopables = 1;
+  	var wellKnownSymbol = requireWellKnownSymbol();
+  	var create = requireObjectCreate();
+  	var defineProperty = requireObjectDefineProperty().f;
+
+  	var UNSCOPABLES = wellKnownSymbol('unscopables');
+  	var ArrayPrototype = Array.prototype;
+
+  	// Array.prototype[@@unscopables]
+  	// https://tc39.es/ecma262/#sec-array.prototype-@@unscopables
+  	if (ArrayPrototype[UNSCOPABLES] === undefined) {
+  	  defineProperty(ArrayPrototype, UNSCOPABLES, {
+  	    configurable: true,
+  	    value: create(null)
+  	  });
+  	}
+
+  	// add a key to Array.prototype[@@unscopables]
+  	addToUnscopables = function (key) {
+  	  ArrayPrototype[UNSCOPABLES][key] = true;
+  	};
+  	return addToUnscopables;
+  }
+
+  var hasRequiredEs_array_find;
+
+  function requireEs_array_find () {
+  	if (hasRequiredEs_array_find) return es_array_find;
+  	hasRequiredEs_array_find = 1;
+  	var $ = require_export();
+  	var $find = requireArrayIteration().find;
+  	var addToUnscopables = requireAddToUnscopables();
+
+  	var FIND = 'find';
+  	var SKIPS_HOLES = true;
+
+  	// Shouldn't skip holes
+  	// eslint-disable-next-line es/no-array-prototype-find -- testing
+  	if (FIND in []) Array(1)[FIND](function () { SKIPS_HOLES = false; });
+
+  	// `Array.prototype.find` method
+  	// https://tc39.es/ecma262/#sec-array.prototype.find
+  	$({ target: 'Array', proto: true, forced: SKIPS_HOLES }, {
+  	  find: function find(callbackfn /* , that = undefined */) {
+  	    return $find(this, callbackfn, arguments.length > 1 ? arguments[1] : undefined);
+  	  }
+  	});
+
+  	// https://tc39.es/ecma262/#sec-array.prototype-@@unscopables
+  	addToUnscopables(FIND);
+  	return es_array_find;
+  }
+
+  requireEs_array_find();
+
+  var es_array_join = {};
+
+  var arrayMethodIsStrict;
+  var hasRequiredArrayMethodIsStrict;
+
+  function requireArrayMethodIsStrict () {
+  	if (hasRequiredArrayMethodIsStrict) return arrayMethodIsStrict;
+  	hasRequiredArrayMethodIsStrict = 1;
+  	var fails = requireFails();
+
+  	arrayMethodIsStrict = function (METHOD_NAME, argument) {
+  	  var method = [][METHOD_NAME];
+  	  return !!method && fails(function () {
+  	    // eslint-disable-next-line no-useless-call -- required for testing
+  	    method.call(null, argument || function () { return 1; }, 1);
+  	  });
+  	};
+  	return arrayMethodIsStrict;
+  }
+
+  var hasRequiredEs_array_join;
+
+  function requireEs_array_join () {
+  	if (hasRequiredEs_array_join) return es_array_join;
+  	hasRequiredEs_array_join = 1;
+  	var $ = require_export();
+  	var uncurryThis = requireFunctionUncurryThis();
+  	var IndexedObject = requireIndexedObject();
+  	var toIndexedObject = requireToIndexedObject();
+  	var arrayMethodIsStrict = requireArrayMethodIsStrict();
+
+  	var nativeJoin = uncurryThis([].join);
+
+  	var ES3_STRINGS = IndexedObject !== Object;
+  	var FORCED = ES3_STRINGS || !arrayMethodIsStrict('join', ',');
+
+  	// `Array.prototype.join` method
+  	// https://tc39.es/ecma262/#sec-array.prototype.join
+  	$({ target: 'Array', proto: true, forced: FORCED }, {
+  	  join: function join(separator) {
+  	    return nativeJoin(toIndexedObject(this), separator === undefined ? ',' : separator);
+  	  }
+  	});
+  	return es_array_join;
+  }
+
+  requireEs_array_join();
+
+  var es_array_map = {};
+
+  var hasRequiredEs_array_map;
+
+  function requireEs_array_map () {
+  	if (hasRequiredEs_array_map) return es_array_map;
+  	hasRequiredEs_array_map = 1;
+  	var $ = require_export();
+  	var $map = requireArrayIteration().map;
+  	var arrayMethodHasSpeciesSupport = requireArrayMethodHasSpeciesSupport();
+
+  	var HAS_SPECIES_SUPPORT = arrayMethodHasSpeciesSupport('map');
+
+  	// `Array.prototype.map` method
+  	// https://tc39.es/ecma262/#sec-array.prototype.map
+  	// with adding support of @@species
+  	$({ target: 'Array', proto: true, forced: !HAS_SPECIES_SUPPORT }, {
+  	  map: function map(callbackfn /* , thisArg */) {
+  	    return $map(this, callbackfn, arguments.length > 1 ? arguments[1] : undefined);
+  	  }
+  	});
+  	return es_array_map;
+  }
+
+  requireEs_array_map();
+
+  var es_array_slice = {};
+
+  var arraySlice;
+  var hasRequiredArraySlice;
+
+  function requireArraySlice () {
+  	if (hasRequiredArraySlice) return arraySlice;
+  	hasRequiredArraySlice = 1;
+  	var uncurryThis = requireFunctionUncurryThis();
+
+  	arraySlice = uncurryThis([].slice);
+  	return arraySlice;
+  }
+
+  var hasRequiredEs_array_slice;
+
+  function requireEs_array_slice () {
+  	if (hasRequiredEs_array_slice) return es_array_slice;
+  	hasRequiredEs_array_slice = 1;
+  	var $ = require_export();
+  	var isArray = requireIsArray();
+  	var isConstructor = requireIsConstructor();
+  	var isObject = requireIsObject();
+  	var toAbsoluteIndex = requireToAbsoluteIndex();
+  	var lengthOfArrayLike = requireLengthOfArrayLike();
+  	var toIndexedObject = requireToIndexedObject();
+  	var createProperty = requireCreateProperty();
+  	var wellKnownSymbol = requireWellKnownSymbol();
+  	var arrayMethodHasSpeciesSupport = requireArrayMethodHasSpeciesSupport();
+  	var nativeSlice = requireArraySlice();
+
+  	var HAS_SPECIES_SUPPORT = arrayMethodHasSpeciesSupport('slice');
+
+  	var SPECIES = wellKnownSymbol('species');
+  	var $Array = Array;
+  	var max = Math.max;
+
+  	// `Array.prototype.slice` method
+  	// https://tc39.es/ecma262/#sec-array.prototype.slice
+  	// fallback for not array-like ES3 strings and DOM objects
+  	$({ target: 'Array', proto: true, forced: !HAS_SPECIES_SUPPORT }, {
+  	  slice: function slice(start, end) {
+  	    var O = toIndexedObject(this);
+  	    var length = lengthOfArrayLike(O);
+  	    var k = toAbsoluteIndex(start, length);
+  	    var fin = toAbsoluteIndex(end === undefined ? length : end, length);
+  	    // inline `ArraySpeciesCreate` for usage native `Array#slice` where it's possible
+  	    var Constructor, result, n;
+  	    if (isArray(O)) {
+  	      Constructor = O.constructor;
+  	      // cross-realm fallback
+  	      if (isConstructor(Constructor) && (Constructor === $Array || isArray(Constructor.prototype))) {
+  	        Constructor = undefined;
+  	      } else if (isObject(Constructor)) {
+  	        Constructor = Constructor[SPECIES];
+  	        if (Constructor === null) Constructor = undefined;
+  	      }
+  	      if (Constructor === $Array || Constructor === undefined) {
+  	        return nativeSlice(O, k, fin);
+  	      }
+  	    }
+  	    result = new (Constructor === undefined ? $Array : Constructor)(max(fin - k, 0));
+  	    for (n = 0; k < fin; k++, n++) if (k in O) createProperty(result, n, O[k]);
+  	    result.length = n;
+  	    return result;
+  	  }
+  	});
+  	return es_array_slice;
+  }
+
+  requireEs_array_slice();
+
+  var es_object_assign = {};
+
+  var objectAssign;
+  var hasRequiredObjectAssign;
+
+  function requireObjectAssign () {
+  	if (hasRequiredObjectAssign) return objectAssign;
+  	hasRequiredObjectAssign = 1;
+  	var DESCRIPTORS = requireDescriptors();
+  	var uncurryThis = requireFunctionUncurryThis();
+  	var call = requireFunctionCall();
+  	var fails = requireFails();
+  	var objectKeys = requireObjectKeys();
+  	var getOwnPropertySymbolsModule = requireObjectGetOwnPropertySymbols();
+  	var propertyIsEnumerableModule = requireObjectPropertyIsEnumerable();
+  	var toObject = requireToObject();
+  	var IndexedObject = requireIndexedObject();
+
+  	// eslint-disable-next-line es/no-object-assign -- safe
+  	var $assign = Object.assign;
+  	// eslint-disable-next-line es/no-object-defineproperty -- required for testing
+  	var defineProperty = Object.defineProperty;
+  	var concat = uncurryThis([].concat);
+
+  	// `Object.assign` method
+  	// https://tc39.es/ecma262/#sec-object.assign
+  	objectAssign = !$assign || fails(function () {
+  	  // should have correct order of operations (Edge bug)
+  	  if (DESCRIPTORS && $assign({ b: 1 }, $assign(defineProperty({}, 'a', {
+  	    enumerable: true,
+  	    get: function () {
+  	      defineProperty(this, 'b', {
+  	        value: 3,
+  	        enumerable: false
+  	      });
+  	    }
+  	  }), { b: 2 })).b !== 1) return true;
+  	  // should work with symbols and should have deterministic property order (V8 bug)
+  	  var A = {};
+  	  var B = {};
+  	  // eslint-disable-next-line es/no-symbol -- safe
+  	  var symbol = Symbol('assign detection');
+  	  var alphabet = 'abcdefghijklmnopqrst';
+  	  A[symbol] = 7;
+  	  alphabet.split('').forEach(function (chr) { B[chr] = chr; });
+  	  return $assign({}, A)[symbol] !== 7 || objectKeys($assign({}, B)).join('') !== alphabet;
+  	}) ? function assign(target, source) { // eslint-disable-line no-unused-vars -- required for `.length`
+  	  var T = toObject(target);
+  	  var argumentsLength = arguments.length;
+  	  var index = 1;
+  	  var getOwnPropertySymbols = getOwnPropertySymbolsModule.f;
+  	  var propertyIsEnumerable = propertyIsEnumerableModule.f;
+  	  while (argumentsLength > index) {
+  	    var S = IndexedObject(arguments[index++]);
+  	    var keys = getOwnPropertySymbols ? concat(objectKeys(S), getOwnPropertySymbols(S)) : objectKeys(S);
+  	    var length = keys.length;
+  	    var j = 0;
+  	    var key;
+  	    while (length > j) {
+  	      key = keys[j++];
+  	      if (!DESCRIPTORS || call(propertyIsEnumerable, S, key)) T[key] = S[key];
+  	    }
+  	  } return T;
+  	} : $assign;
+  	return objectAssign;
+  }
+
+  var hasRequiredEs_object_assign;
+
+  function requireEs_object_assign () {
+  	if (hasRequiredEs_object_assign) return es_object_assign;
+  	hasRequiredEs_object_assign = 1;
+  	var $ = require_export();
+  	var assign = requireObjectAssign();
+
+  	// `Object.assign` method
+  	// https://tc39.es/ecma262/#sec-object.assign
+  	// eslint-disable-next-line es/no-object-assign -- required for testing
+  	$({ target: 'Object', stat: true, arity: 2, forced: Object.assign !== assign }, {
+  	  assign: assign
+  	});
+  	return es_object_assign;
+  }
+
+  requireEs_object_assign();
+
+  var es_object_toString = {};
+
+  var objectToString;
+  var hasRequiredObjectToString;
+
+  function requireObjectToString () {
+  	if (hasRequiredObjectToString) return objectToString;
+  	hasRequiredObjectToString = 1;
+  	var TO_STRING_TAG_SUPPORT = requireToStringTagSupport();
+  	var classof = requireClassof();
+
+  	// `Object.prototype.toString` method implementation
+  	// https://tc39.es/ecma262/#sec-object.prototype.tostring
+  	objectToString = TO_STRING_TAG_SUPPORT ? {}.toString : function toString() {
+  	  return '[object ' + classof(this) + ']';
+  	};
+  	return objectToString;
+  }
+
+  var hasRequiredEs_object_toString;
+
+  function requireEs_object_toString () {
+  	if (hasRequiredEs_object_toString) return es_object_toString;
+  	hasRequiredEs_object_toString = 1;
+  	var TO_STRING_TAG_SUPPORT = requireToStringTagSupport();
+  	var defineBuiltIn = requireDefineBuiltIn();
+  	var toString = requireObjectToString();
+
+  	// `Object.prototype.toString` method
+  	// https://tc39.es/ecma262/#sec-object.prototype.tostring
+  	if (!TO_STRING_TAG_SUPPORT) {
+  	  defineBuiltIn(Object.prototype, 'toString', toString, { unsafe: true });
+  	}
+  	return es_object_toString;
+  }
+
+  requireEs_object_toString();
+
+  var es_regexp_exec = {};
+
+  var toString;
+  var hasRequiredToString;
+
+  function requireToString () {
+  	if (hasRequiredToString) return toString;
+  	hasRequiredToString = 1;
+  	var classof = requireClassof();
+
+  	var $String = String;
+
+  	toString = function (argument) {
+  	  if (classof(argument) === 'Symbol') throw new TypeError('Cannot convert a Symbol value to a string');
+  	  return $String(argument);
+  	};
+  	return toString;
+  }
+
+  var regexpFlags;
+  var hasRequiredRegexpFlags;
+
+  function requireRegexpFlags () {
+  	if (hasRequiredRegexpFlags) return regexpFlags;
+  	hasRequiredRegexpFlags = 1;
+  	var anObject = requireAnObject();
+
+  	// `RegExp.prototype.flags` getter implementation
+  	// https://tc39.es/ecma262/#sec-get-regexp.prototype.flags
+  	regexpFlags = function () {
+  	  var that = anObject(this);
+  	  var result = '';
+  	  if (that.hasIndices) result += 'd';
+  	  if (that.global) result += 'g';
+  	  if (that.ignoreCase) result += 'i';
+  	  if (that.multiline) result += 'm';
+  	  if (that.dotAll) result += 's';
+  	  if (that.unicode) result += 'u';
+  	  if (that.unicodeSets) result += 'v';
+  	  if (that.sticky) result += 'y';
+  	  return result;
+  	};
+  	return regexpFlags;
+  }
+
+  var regexpStickyHelpers;
+  var hasRequiredRegexpStickyHelpers;
+
+  function requireRegexpStickyHelpers () {
+  	if (hasRequiredRegexpStickyHelpers) return regexpStickyHelpers;
+  	hasRequiredRegexpStickyHelpers = 1;
+  	var fails = requireFails();
+  	var globalThis = requireGlobalThis();
+
+  	// babel-minify and Closure Compiler transpiles RegExp('a', 'y') -> /a/y and it causes SyntaxError
+  	var $RegExp = globalThis.RegExp;
+
+  	var UNSUPPORTED_Y = fails(function () {
+  	  var re = $RegExp('a', 'y');
+  	  re.lastIndex = 2;
+  	  return re.exec('abcd') !== null;
+  	});
+
+  	// UC Browser bug
+  	// https://github.com/zloirock/core-js/issues/1008
+  	var MISSED_STICKY = UNSUPPORTED_Y || fails(function () {
+  	  return !$RegExp('a', 'y').sticky;
+  	});
+
+  	var BROKEN_CARET = UNSUPPORTED_Y || fails(function () {
+  	  // https://bugzilla.mozilla.org/show_bug.cgi?id=773687
+  	  var re = $RegExp('^r', 'gy');
+  	  re.lastIndex = 2;
+  	  return re.exec('str') !== null;
+  	});
+
+  	regexpStickyHelpers = {
+  	  BROKEN_CARET: BROKEN_CARET,
+  	  MISSED_STICKY: MISSED_STICKY,
+  	  UNSUPPORTED_Y: UNSUPPORTED_Y
+  	};
+  	return regexpStickyHelpers;
+  }
+
+  var regexpUnsupportedDotAll;
+  var hasRequiredRegexpUnsupportedDotAll;
+
+  function requireRegexpUnsupportedDotAll () {
+  	if (hasRequiredRegexpUnsupportedDotAll) return regexpUnsupportedDotAll;
+  	hasRequiredRegexpUnsupportedDotAll = 1;
+  	var fails = requireFails();
+  	var globalThis = requireGlobalThis();
+
+  	// babel-minify and Closure Compiler transpiles RegExp('.', 's') -> /./s and it causes SyntaxError
+  	var $RegExp = globalThis.RegExp;
+
+  	regexpUnsupportedDotAll = fails(function () {
+  	  var re = $RegExp('.', 's');
+  	  return !(re.dotAll && re.test('\n') && re.flags === 's');
+  	});
+  	return regexpUnsupportedDotAll;
+  }
+
+  var regexpUnsupportedNcg;
+  var hasRequiredRegexpUnsupportedNcg;
+
+  function requireRegexpUnsupportedNcg () {
+  	if (hasRequiredRegexpUnsupportedNcg) return regexpUnsupportedNcg;
+  	hasRequiredRegexpUnsupportedNcg = 1;
+  	var fails = requireFails();
+  	var globalThis = requireGlobalThis();
+
+  	// babel-minify and Closure Compiler transpiles RegExp('(?<a>b)', 'g') -> /(?<a>b)/g and it causes SyntaxError
+  	var $RegExp = globalThis.RegExp;
+
+  	regexpUnsupportedNcg = fails(function () {
+  	  var re = $RegExp('(?<a>b)', 'g');
+  	  return re.exec('b').groups.a !== 'b' ||
+  	    'b'.replace(re, '$<a>c') !== 'bc';
+  	});
+  	return regexpUnsupportedNcg;
+  }
+
+  var regexpExec;
+  var hasRequiredRegexpExec;
+
+  function requireRegexpExec () {
+  	if (hasRequiredRegexpExec) return regexpExec;
+  	hasRequiredRegexpExec = 1;
+  	/* eslint-disable regexp/no-empty-capturing-group, regexp/no-empty-group, regexp/no-lazy-ends -- testing */
+  	/* eslint-disable regexp/no-useless-quantifier -- testing */
+  	var call = requireFunctionCall();
+  	var uncurryThis = requireFunctionUncurryThis();
+  	var toString = requireToString();
+  	var regexpFlags = requireRegexpFlags();
+  	var stickyHelpers = requireRegexpStickyHelpers();
+  	var shared = requireShared();
+  	var create = requireObjectCreate();
+  	var getInternalState = requireInternalState().get;
+  	var UNSUPPORTED_DOT_ALL = requireRegexpUnsupportedDotAll();
+  	var UNSUPPORTED_NCG = requireRegexpUnsupportedNcg();
+
+  	var nativeReplace = shared('native-string-replace', String.prototype.replace);
+  	var nativeExec = RegExp.prototype.exec;
+  	var patchedExec = nativeExec;
+  	var charAt = uncurryThis(''.charAt);
+  	var indexOf = uncurryThis(''.indexOf);
+  	var replace = uncurryThis(''.replace);
+  	var stringSlice = uncurryThis(''.slice);
+
+  	var UPDATES_LAST_INDEX_WRONG = (function () {
+  	  var re1 = /a/;
+  	  var re2 = /b*/g;
+  	  call(nativeExec, re1, 'a');
+  	  call(nativeExec, re2, 'a');
+  	  return re1.lastIndex !== 0 || re2.lastIndex !== 0;
+  	})();
+
+  	var UNSUPPORTED_Y = stickyHelpers.BROKEN_CARET;
+
+  	// nonparticipating capturing group, copied from es5-shim's String#split patch.
+  	var NPCG_INCLUDED = /()??/.exec('')[1] !== undefined;
+
+  	var PATCH = UPDATES_LAST_INDEX_WRONG || NPCG_INCLUDED || UNSUPPORTED_Y || UNSUPPORTED_DOT_ALL || UNSUPPORTED_NCG;
+
+  	if (PATCH) {
+  	  patchedExec = function exec(string) {
+  	    var re = this;
+  	    var state = getInternalState(re);
+  	    var str = toString(string);
+  	    var raw = state.raw;
+  	    var result, reCopy, lastIndex, match, i, object, group;
+
+  	    if (raw) {
+  	      raw.lastIndex = re.lastIndex;
+  	      result = call(patchedExec, raw, str);
+  	      re.lastIndex = raw.lastIndex;
+  	      return result;
+  	    }
+
+  	    var groups = state.groups;
+  	    var sticky = UNSUPPORTED_Y && re.sticky;
+  	    var flags = call(regexpFlags, re);
+  	    var source = re.source;
+  	    var charsAdded = 0;
+  	    var strCopy = str;
+
+  	    if (sticky) {
+  	      flags = replace(flags, 'y', '');
+  	      if (indexOf(flags, 'g') === -1) {
+  	        flags += 'g';
+  	      }
+
+  	      strCopy = stringSlice(str, re.lastIndex);
+  	      // Support anchored sticky behavior.
+  	      if (re.lastIndex > 0 && (!re.multiline || re.multiline && charAt(str, re.lastIndex - 1) !== '\n')) {
+  	        source = '(?: ' + source + ')';
+  	        strCopy = ' ' + strCopy;
+  	        charsAdded++;
+  	      }
+  	      // ^(? + rx + ) is needed, in combination with some str slicing, to
+  	      // simulate the 'y' flag.
+  	      reCopy = new RegExp('^(?:' + source + ')', flags);
+  	    }
+
+  	    if (NPCG_INCLUDED) {
+  	      reCopy = new RegExp('^' + source + '$(?!\\s)', flags);
+  	    }
+  	    if (UPDATES_LAST_INDEX_WRONG) lastIndex = re.lastIndex;
+
+  	    match = call(nativeExec, sticky ? reCopy : re, strCopy);
+
+  	    if (sticky) {
+  	      if (match) {
+  	        match.input = stringSlice(match.input, charsAdded);
+  	        match[0] = stringSlice(match[0], charsAdded);
+  	        match.index = re.lastIndex;
+  	        re.lastIndex += match[0].length;
+  	      } else re.lastIndex = 0;
+  	    } else if (UPDATES_LAST_INDEX_WRONG && match) {
+  	      re.lastIndex = re.global ? match.index + match[0].length : lastIndex;
+  	    }
+  	    if (NPCG_INCLUDED && match && match.length > 1) {
+  	      // Fix browsers whose `exec` methods don't consistently return `undefined`
+  	      // for NPCG, like IE8. NOTE: This doesn't work for /(.?)?/
+  	      call(nativeReplace, match[0], reCopy, function () {
+  	        for (i = 1; i < arguments.length - 2; i++) {
+  	          if (arguments[i] === undefined) match[i] = undefined;
+  	        }
+  	      });
+  	    }
+
+  	    if (match && groups) {
+  	      match.groups = object = create(null);
+  	      for (i = 0; i < groups.length; i++) {
+  	        group = groups[i];
+  	        object[group[0]] = match[group[1]];
+  	      }
+  	    }
+
+  	    return match;
+  	  };
+  	}
+
+  	regexpExec = patchedExec;
+  	return regexpExec;
+  }
+
+  var hasRequiredEs_regexp_exec;
+
+  function requireEs_regexp_exec () {
+  	if (hasRequiredEs_regexp_exec) return es_regexp_exec;
+  	hasRequiredEs_regexp_exec = 1;
+  	var $ = require_export();
+  	var exec = requireRegexpExec();
+
+  	// `RegExp.prototype.exec` method
+  	// https://tc39.es/ecma262/#sec-regexp.prototype.exec
+  	$({ target: 'RegExp', proto: true, forced: /./.exec !== exec }, {
+  	  exec: exec
+  	});
+  	return es_regexp_exec;
+  }
+
+  requireEs_regexp_exec();
+
+  var es_string_replace = {};
+
+  var functionApply;
+  var hasRequiredFunctionApply;
+
+  function requireFunctionApply () {
+  	if (hasRequiredFunctionApply) return functionApply;
+  	hasRequiredFunctionApply = 1;
+  	var NATIVE_BIND = requireFunctionBindNative();
+
+  	var FunctionPrototype = Function.prototype;
+  	var apply = FunctionPrototype.apply;
+  	var call = FunctionPrototype.call;
+
+  	// eslint-disable-next-line es/no-reflect -- safe
+  	functionApply = typeof Reflect == 'object' && Reflect.apply || (NATIVE_BIND ? call.bind(apply) : function () {
+  	  return call.apply(apply, arguments);
+  	});
+  	return functionApply;
+  }
+
+  var fixRegexpWellKnownSymbolLogic;
+  var hasRequiredFixRegexpWellKnownSymbolLogic;
+
+  function requireFixRegexpWellKnownSymbolLogic () {
+  	if (hasRequiredFixRegexpWellKnownSymbolLogic) return fixRegexpWellKnownSymbolLogic;
+  	hasRequiredFixRegexpWellKnownSymbolLogic = 1;
+  	// TODO: Remove from `core-js@4` since it's moved to entry points
+  	requireEs_regexp_exec();
+  	var call = requireFunctionCall();
+  	var defineBuiltIn = requireDefineBuiltIn();
+  	var regexpExec = requireRegexpExec();
+  	var fails = requireFails();
+  	var wellKnownSymbol = requireWellKnownSymbol();
+  	var createNonEnumerableProperty = requireCreateNonEnumerableProperty();
+
+  	var SPECIES = wellKnownSymbol('species');
+  	var RegExpPrototype = RegExp.prototype;
+
+  	fixRegexpWellKnownSymbolLogic = function (KEY, exec, FORCED, SHAM) {
+  	  var SYMBOL = wellKnownSymbol(KEY);
+
+  	  var DELEGATES_TO_SYMBOL = !fails(function () {
+  	    // String methods call symbol-named RegExp methods
+  	    var O = {};
+  	    O[SYMBOL] = function () { return 7; };
+  	    return ''[KEY](O) !== 7;
+  	  });
+
+  	  var DELEGATES_TO_EXEC = DELEGATES_TO_SYMBOL && !fails(function () {
+  	    // Symbol-named RegExp methods call .exec
+  	    var execCalled = false;
+  	    var re = /a/;
+
+  	    if (KEY === 'split') {
+  	      // We can't use real regex here since it causes deoptimization
+  	      // and serious performance degradation in V8
+  	      // https://github.com/zloirock/core-js/issues/306
+  	      re = {};
+  	      // RegExp[@@split] doesn't call the regex's exec method, but first creates
+  	      // a new one. We need to return the patched regex when creating the new one.
+  	      re.constructor = {};
+  	      re.constructor[SPECIES] = function () { return re; };
+  	      re.flags = '';
+  	      re[SYMBOL] = /./[SYMBOL];
+  	    }
+
+  	    re.exec = function () {
+  	      execCalled = true;
+  	      return null;
+  	    };
+
+  	    re[SYMBOL]('');
+  	    return !execCalled;
+  	  });
+
+  	  if (
+  	    !DELEGATES_TO_SYMBOL ||
+  	    !DELEGATES_TO_EXEC ||
+  	    FORCED
+  	  ) {
+  	    var nativeRegExpMethod = /./[SYMBOL];
+  	    var methods = exec(SYMBOL, ''[KEY], function (nativeMethod, regexp, str, arg2, forceStringMethod) {
+  	      var $exec = regexp.exec;
+  	      if ($exec === regexpExec || $exec === RegExpPrototype.exec) {
+  	        if (DELEGATES_TO_SYMBOL && !forceStringMethod) {
+  	          // The native String method already delegates to @@method (this
+  	          // polyfilled function), leasing to infinite recursion.
+  	          // We avoid it by directly calling the native @@method method.
+  	          return { done: true, value: call(nativeRegExpMethod, regexp, str, arg2) };
+  	        }
+  	        return { done: true, value: call(nativeMethod, str, regexp, arg2) };
+  	      }
+  	      return { done: false };
+  	    });
+
+  	    defineBuiltIn(String.prototype, KEY, methods[0]);
+  	    defineBuiltIn(RegExpPrototype, SYMBOL, methods[1]);
+  	  }
+
+  	  if (SHAM) createNonEnumerableProperty(RegExpPrototype[SYMBOL], 'sham', true);
+  	};
+  	return fixRegexpWellKnownSymbolLogic;
+  }
+
+  var stringMultibyte;
+  var hasRequiredStringMultibyte;
+
+  function requireStringMultibyte () {
+  	if (hasRequiredStringMultibyte) return stringMultibyte;
+  	hasRequiredStringMultibyte = 1;
+  	var uncurryThis = requireFunctionUncurryThis();
+  	var toIntegerOrInfinity = requireToIntegerOrInfinity();
+  	var toString = requireToString();
+  	var requireObjectCoercible = requireRequireObjectCoercible();
+
+  	var charAt = uncurryThis(''.charAt);
+  	var charCodeAt = uncurryThis(''.charCodeAt);
+  	var stringSlice = uncurryThis(''.slice);
+
+  	var createMethod = function (CONVERT_TO_STRING) {
+  	  return function ($this, pos) {
+  	    var S = toString(requireObjectCoercible($this));
+  	    var position = toIntegerOrInfinity(pos);
+  	    var size = S.length;
+  	    var first, second;
+  	    if (position < 0 || position >= size) return CONVERT_TO_STRING ? '' : undefined;
+  	    first = charCodeAt(S, position);
+  	    return first < 0xD800 || first > 0xDBFF || position + 1 === size
+  	      || (second = charCodeAt(S, position + 1)) < 0xDC00 || second > 0xDFFF
+  	        ? CONVERT_TO_STRING
+  	          ? charAt(S, position)
+  	          : first
+  	        : CONVERT_TO_STRING
+  	          ? stringSlice(S, position, position + 2)
+  	          : (first - 0xD800 << 10) + (second - 0xDC00) + 0x10000;
+  	  };
+  	};
+
+  	stringMultibyte = {
+  	  // `String.prototype.codePointAt` method
+  	  // https://tc39.es/ecma262/#sec-string.prototype.codepointat
+  	  codeAt: createMethod(false),
+  	  // `String.prototype.at` method
+  	  // https://github.com/mathiasbynens/String.prototype.at
+  	  charAt: createMethod(true)
+  	};
+  	return stringMultibyte;
+  }
+
+  var advanceStringIndex;
+  var hasRequiredAdvanceStringIndex;
+
+  function requireAdvanceStringIndex () {
+  	if (hasRequiredAdvanceStringIndex) return advanceStringIndex;
+  	hasRequiredAdvanceStringIndex = 1;
+  	var charAt = requireStringMultibyte().charAt;
+
+  	// `AdvanceStringIndex` abstract operation
+  	// https://tc39.es/ecma262/#sec-advancestringindex
+  	advanceStringIndex = function (S, index, unicode) {
+  	  return index + (unicode ? charAt(S, index).length : 1);
+  	};
+  	return advanceStringIndex;
+  }
+
+  var getSubstitution;
+  var hasRequiredGetSubstitution;
+
+  function requireGetSubstitution () {
+  	if (hasRequiredGetSubstitution) return getSubstitution;
+  	hasRequiredGetSubstitution = 1;
+  	var uncurryThis = requireFunctionUncurryThis();
+  	var toObject = requireToObject();
+
+  	var floor = Math.floor;
+  	var charAt = uncurryThis(''.charAt);
+  	var replace = uncurryThis(''.replace);
+  	var stringSlice = uncurryThis(''.slice);
+  	// eslint-disable-next-line redos/no-vulnerable -- safe
+  	var SUBSTITUTION_SYMBOLS = /\$([$&'`]|\d{1,2}|<[^>]*>)/g;
+  	var SUBSTITUTION_SYMBOLS_NO_NAMED = /\$([$&'`]|\d{1,2})/g;
+
+  	// `GetSubstitution` abstract operation
+  	// https://tc39.es/ecma262/#sec-getsubstitution
+  	getSubstitution = function (matched, str, position, captures, namedCaptures, replacement) {
+  	  var tailPos = position + matched.length;
+  	  var m = captures.length;
+  	  var symbols = SUBSTITUTION_SYMBOLS_NO_NAMED;
+  	  if (namedCaptures !== undefined) {
+  	    namedCaptures = toObject(namedCaptures);
+  	    symbols = SUBSTITUTION_SYMBOLS;
+  	  }
+  	  return replace(replacement, symbols, function (match, ch) {
+  	    var capture;
+  	    switch (charAt(ch, 0)) {
+  	      case '$': return '$';
+  	      case '&': return matched;
+  	      case '`': return stringSlice(str, 0, position);
+  	      case "'": return stringSlice(str, tailPos);
+  	      case '<':
+  	        capture = namedCaptures[stringSlice(ch, 1, -1)];
+  	        break;
+  	      default: // \d\d?
+  	        var n = +ch;
+  	        if (n === 0) return match;
+  	        if (n > m) {
+  	          var f = floor(n / 10);
+  	          if (f === 0) return match;
+  	          if (f <= m) return captures[f - 1] === undefined ? charAt(ch, 1) : captures[f - 1] + charAt(ch, 1);
+  	          return match;
+  	        }
+  	        capture = captures[n - 1];
+  	    }
+  	    return capture === undefined ? '' : capture;
+  	  });
+  	};
+  	return getSubstitution;
+  }
+
+  var regexpExecAbstract;
+  var hasRequiredRegexpExecAbstract;
+
+  function requireRegexpExecAbstract () {
+  	if (hasRequiredRegexpExecAbstract) return regexpExecAbstract;
+  	hasRequiredRegexpExecAbstract = 1;
+  	var call = requireFunctionCall();
+  	var anObject = requireAnObject();
+  	var isCallable = requireIsCallable();
+  	var classof = requireClassofRaw();
+  	var regexpExec = requireRegexpExec();
+
+  	var $TypeError = TypeError;
+
+  	// `RegExpExec` abstract operation
+  	// https://tc39.es/ecma262/#sec-regexpexec
+  	regexpExecAbstract = function (R, S) {
+  	  var exec = R.exec;
+  	  if (isCallable(exec)) {
+  	    var result = call(exec, R, S);
+  	    if (result !== null) anObject(result);
+  	    return result;
+  	  }
+  	  if (classof(R) === 'RegExp') return call(regexpExec, R, S);
+  	  throw new $TypeError('RegExp#exec called on incompatible receiver');
+  	};
+  	return regexpExecAbstract;
+  }
+
+  var hasRequiredEs_string_replace;
+
+  function requireEs_string_replace () {
+  	if (hasRequiredEs_string_replace) return es_string_replace;
+  	hasRequiredEs_string_replace = 1;
+  	var apply = requireFunctionApply();
+  	var call = requireFunctionCall();
+  	var uncurryThis = requireFunctionUncurryThis();
+  	var fixRegExpWellKnownSymbolLogic = requireFixRegexpWellKnownSymbolLogic();
+  	var fails = requireFails();
+  	var anObject = requireAnObject();
+  	var isCallable = requireIsCallable();
+  	var isNullOrUndefined = requireIsNullOrUndefined();
+  	var toIntegerOrInfinity = requireToIntegerOrInfinity();
+  	var toLength = requireToLength();
+  	var toString = requireToString();
+  	var requireObjectCoercible = requireRequireObjectCoercible();
+  	var advanceStringIndex = requireAdvanceStringIndex();
+  	var getMethod = requireGetMethod();
+  	var getSubstitution = requireGetSubstitution();
+  	var regExpExec = requireRegexpExecAbstract();
+  	var wellKnownSymbol = requireWellKnownSymbol();
+
+  	var REPLACE = wellKnownSymbol('replace');
+  	var max = Math.max;
+  	var min = Math.min;
+  	var concat = uncurryThis([].concat);
+  	var push = uncurryThis([].push);
+  	var stringIndexOf = uncurryThis(''.indexOf);
+  	var stringSlice = uncurryThis(''.slice);
+
+  	var maybeToString = function (it) {
+  	  return it === undefined ? it : String(it);
+  	};
+
+  	// IE <= 11 replaces $0 with the whole match, as if it was $&
+  	// https://stackoverflow.com/questions/6024666/getting-ie-to-replace-a-regex-with-the-literal-string-0
+  	var REPLACE_KEEPS_$0 = (function () {
+  	  // eslint-disable-next-line regexp/prefer-escape-replacement-dollar-char -- required for testing
+  	  return 'a'.replace(/./, '$0') === '$0';
+  	})();
+
+  	// Safari <= 13.0.3(?) substitutes nth capture where n>m with an empty string
+  	var REGEXP_REPLACE_SUBSTITUTES_UNDEFINED_CAPTURE = (function () {
+  	  if (/./[REPLACE]) {
+  	    return /./[REPLACE]('a', '$0') === '';
+  	  }
+  	  return false;
+  	})();
+
+  	var REPLACE_SUPPORTS_NAMED_GROUPS = !fails(function () {
+  	  var re = /./;
+  	  re.exec = function () {
+  	    var result = [];
+  	    result.groups = { a: '7' };
+  	    return result;
+  	  };
+  	  // eslint-disable-next-line regexp/no-useless-dollar-replacements -- false positive
+  	  return ''.replace(re, '$<a>') !== '7';
+  	});
+
+  	// @@replace logic
+  	fixRegExpWellKnownSymbolLogic('replace', function (_, nativeReplace, maybeCallNative) {
+  	  var UNSAFE_SUBSTITUTE = REGEXP_REPLACE_SUBSTITUTES_UNDEFINED_CAPTURE ? '$' : '$0';
+
+  	  return [
+  	    // `String.prototype.replace` method
+  	    // https://tc39.es/ecma262/#sec-string.prototype.replace
+  	    function replace(searchValue, replaceValue) {
+  	      var O = requireObjectCoercible(this);
+  	      var replacer = isNullOrUndefined(searchValue) ? undefined : getMethod(searchValue, REPLACE);
+  	      return replacer
+  	        ? call(replacer, searchValue, O, replaceValue)
+  	        : call(nativeReplace, toString(O), searchValue, replaceValue);
+  	    },
+  	    // `RegExp.prototype[@@replace]` method
+  	    // https://tc39.es/ecma262/#sec-regexp.prototype-@@replace
+  	    function (string, replaceValue) {
+  	      var rx = anObject(this);
+  	      var S = toString(string);
+
+  	      if (
+  	        typeof replaceValue == 'string' &&
+  	        stringIndexOf(replaceValue, UNSAFE_SUBSTITUTE) === -1 &&
+  	        stringIndexOf(replaceValue, '$<') === -1
+  	      ) {
+  	        var res = maybeCallNative(nativeReplace, rx, S, replaceValue);
+  	        if (res.done) return res.value;
+  	      }
+
+  	      var functionalReplace = isCallable(replaceValue);
+  	      if (!functionalReplace) replaceValue = toString(replaceValue);
+
+  	      var global = rx.global;
+  	      var fullUnicode;
+  	      if (global) {
+  	        fullUnicode = rx.unicode;
+  	        rx.lastIndex = 0;
+  	      }
+
+  	      var results = [];
+  	      var result;
+  	      while (true) {
+  	        result = regExpExec(rx, S);
+  	        if (result === null) break;
+
+  	        push(results, result);
+  	        if (!global) break;
+
+  	        var matchStr = toString(result[0]);
+  	        if (matchStr === '') rx.lastIndex = advanceStringIndex(S, toLength(rx.lastIndex), fullUnicode);
+  	      }
+
+  	      var accumulatedResult = '';
+  	      var nextSourcePosition = 0;
+  	      for (var i = 0; i < results.length; i++) {
+  	        result = results[i];
+
+  	        var matched = toString(result[0]);
+  	        var position = max(min(toIntegerOrInfinity(result.index), S.length), 0);
+  	        var captures = [];
+  	        var replacement;
+  	        // NOTE: This is equivalent to
+  	        //   captures = result.slice(1).map(maybeToString)
+  	        // but for some reason `nativeSlice.call(result, 1, result.length)` (called in
+  	        // the slice polyfill when slicing native arrays) "doesn't work" in safari 9 and
+  	        // causes a crash (https://pastebin.com/N21QzeQA) when trying to debug it.
+  	        for (var j = 1; j < result.length; j++) push(captures, maybeToString(result[j]));
+  	        var namedCaptures = result.groups;
+  	        if (functionalReplace) {
+  	          var replacerArgs = concat([matched], captures, position, S);
+  	          if (namedCaptures !== undefined) push(replacerArgs, namedCaptures);
+  	          replacement = toString(apply(replaceValue, undefined, replacerArgs));
+  	        } else {
+  	          replacement = getSubstitution(matched, S, position, captures, namedCaptures, replaceValue);
+  	        }
+  	        if (position >= nextSourcePosition) {
+  	          accumulatedResult += stringSlice(S, nextSourcePosition, position) + replacement;
+  	          nextSourcePosition = position + matched.length;
+  	        }
+  	      }
+
+  	      return accumulatedResult + stringSlice(S, nextSourcePosition);
+  	    }
+  	  ];
+  	}, !REPLACE_SUPPORTS_NAMED_GROUPS || !REPLACE_KEEPS_$0 || REGEXP_REPLACE_SUBSTITUTES_UNDEFINED_CAPTURE);
+  	return es_string_replace;
+  }
+
+  requireEs_string_replace();
+
+  var web_domCollections_forEach = {};
+
+  var domIterables;
+  var hasRequiredDomIterables;
+
+  function requireDomIterables () {
+  	if (hasRequiredDomIterables) return domIterables;
+  	hasRequiredDomIterables = 1;
+  	// iterable DOM collections
+  	// flag - `iterable` interface - 'entries', 'keys', 'values', 'forEach' methods
+  	domIterables = {
+  	  CSSRuleList: 0,
+  	  CSSStyleDeclaration: 0,
+  	  CSSValueList: 0,
+  	  ClientRectList: 0,
+  	  DOMRectList: 0,
+  	  DOMStringList: 0,
+  	  DOMTokenList: 1,
+  	  DataTransferItemList: 0,
+  	  FileList: 0,
+  	  HTMLAllCollection: 0,
+  	  HTMLCollection: 0,
+  	  HTMLFormElement: 0,
+  	  HTMLSelectElement: 0,
+  	  MediaList: 0,
+  	  MimeTypeArray: 0,
+  	  NamedNodeMap: 0,
+  	  NodeList: 1,
+  	  PaintRequestList: 0,
+  	  Plugin: 0,
+  	  PluginArray: 0,
+  	  SVGLengthList: 0,
+  	  SVGNumberList: 0,
+  	  SVGPathSegList: 0,
+  	  SVGPointList: 0,
+  	  SVGStringList: 0,
+  	  SVGTransformList: 0,
+  	  SourceBufferList: 0,
+  	  StyleSheetList: 0,
+  	  TextTrackCueList: 0,
+  	  TextTrackList: 0,
+  	  TouchList: 0
+  	};
+  	return domIterables;
+  }
+
+  var domTokenListPrototype;
+  var hasRequiredDomTokenListPrototype;
+
+  function requireDomTokenListPrototype () {
+  	if (hasRequiredDomTokenListPrototype) return domTokenListPrototype;
+  	hasRequiredDomTokenListPrototype = 1;
+  	// in old WebKit versions, `element.classList` is not an instance of global `DOMTokenList`
+  	var documentCreateElement = requireDocumentCreateElement();
+
+  	var classList = documentCreateElement('span').classList;
+  	var DOMTokenListPrototype = classList && classList.constructor && classList.constructor.prototype;
+
+  	domTokenListPrototype = DOMTokenListPrototype === Object.prototype ? undefined : DOMTokenListPrototype;
+  	return domTokenListPrototype;
+  }
+
+  var arrayForEach;
+  var hasRequiredArrayForEach;
+
+  function requireArrayForEach () {
+  	if (hasRequiredArrayForEach) return arrayForEach;
+  	hasRequiredArrayForEach = 1;
+  	var $forEach = requireArrayIteration().forEach;
+  	var arrayMethodIsStrict = requireArrayMethodIsStrict();
+
+  	var STRICT_METHOD = arrayMethodIsStrict('forEach');
+
+  	// `Array.prototype.forEach` method implementation
+  	// https://tc39.es/ecma262/#sec-array.prototype.foreach
+  	arrayForEach = !STRICT_METHOD ? function forEach(callbackfn /* , thisArg */) {
+  	  return $forEach(this, callbackfn, arguments.length > 1 ? arguments[1] : undefined);
+  	// eslint-disable-next-line es/no-array-prototype-foreach -- safe
+  	} : [].forEach;
+  	return arrayForEach;
+  }
+
+  var hasRequiredWeb_domCollections_forEach;
+
+  function requireWeb_domCollections_forEach () {
+  	if (hasRequiredWeb_domCollections_forEach) return web_domCollections_forEach;
+  	hasRequiredWeb_domCollections_forEach = 1;
+  	var globalThis = requireGlobalThis();
+  	var DOMIterables = requireDomIterables();
+  	var DOMTokenListPrototype = requireDomTokenListPrototype();
+  	var forEach = requireArrayForEach();
+  	var createNonEnumerableProperty = requireCreateNonEnumerableProperty();
+
+  	var handlePrototype = function (CollectionPrototype) {
+  	  // some Chrome versions have non-configurable methods on DOMTokenList
+  	  if (CollectionPrototype && CollectionPrototype.forEach !== forEach) try {
+  	    createNonEnumerableProperty(CollectionPrototype, 'forEach', forEach);
+  	  } catch (error) {
+  	    CollectionPrototype.forEach = forEach;
+  	  }
+  	};
+
+  	for (var COLLECTION_NAME in DOMIterables) {
+  	  if (DOMIterables[COLLECTION_NAME]) {
+  	    handlePrototype(globalThis[COLLECTION_NAME] && globalThis[COLLECTION_NAME].prototype);
+  	  }
+  	}
+
+  	handlePrototype(DOMTokenListPrototype);
+  	return web_domCollections_forEach;
+  }
+
+  requireWeb_domCollections_forEach();
 
   /**
    * @author zhixin wen <wenzhixin2010@gmail.com>
    * extensions: https://github.com/hhurz/tableExport.jquery.plugin
    */
 
-  var Utils = $$7.fn.bootstrapTable.utils;
+  var Utils = $.fn.bootstrapTable.utils;
   var TYPE_NAME = {
     json: 'JSON',
     xml: 'XML',
@@ -13475,7 +17541,7 @@
     powerpoint: 'MS-Powerpoint',
     pdf: 'PDF'
   };
-  Object.assign($$7.fn.bootstrapTable.defaults, {
+  Object.assign($.fn.bootstrapTable.defaults, {
     showExport: false,
     exportDataType: 'basic',
     // basic, all, selected
@@ -13483,26 +17549,25 @@
     exportOptions: {},
     exportFooter: false
   });
-  Object.assign($$7.fn.bootstrapTable.columnDefaults, {
+  Object.assign($.fn.bootstrapTable.columnDefaults, {
     forceExport: false,
     forceHide: false
   });
-  Object.assign($$7.fn.bootstrapTable.defaults.icons, {
-    export: {
-      bootstrap3: 'glyphicon-export icon-share',
-      bootstrap5: 'bi-download',
-      materialize: 'file_download',
-      'bootstrap-table': 'icon-download'
-    }[$$7.fn.bootstrapTable.theme] || 'fa-download'
+  Utils.assignIcons($.fn.bootstrapTable.icons, 'export', {
+    glyphicon: 'glyphicon-export icon-share',
+    fa: 'fa-download',
+    bi: 'bi-download',
+    icon: 'icon-download',
+    'material-icons': 'file_download'
   });
-  Object.assign($$7.fn.bootstrapTable.locales, {
+  Object.assign($.fn.bootstrapTable.locales, {
     formatExport: function formatExport() {
       return 'Export data';
     }
   });
-  Object.assign($$7.fn.bootstrapTable.defaults, $$7.fn.bootstrapTable.locales);
-  $$7.fn.bootstrapTable.methods.push('exportTable');
-  Object.assign($$7.fn.bootstrapTable.defaults, {
+  Object.assign($.fn.bootstrapTable.defaults, $.fn.bootstrapTable.locales);
+  $.fn.bootstrapTable.methods.push('exportTable');
+  Object.assign($.fn.bootstrapTable.defaults, {
     // eslint-disable-next-line no-unused-vars
     onExportSaved: function onExportSaved(exportedRows) {
       return false;
@@ -13511,11 +17576,11 @@
       return false;
     }
   });
-  Object.assign($$7.fn.bootstrapTable.events, {
+  Object.assign($.fn.bootstrapTable.events, {
     'export-saved.bs.table': 'onExportSaved',
     'export-started.bs.table': 'onExportStarted'
   });
-  $$7.BootstrapTable = /*#__PURE__*/function (_$$BootstrapTable) {
+  $.BootstrapTable = /*#__PURE__*/function (_$$BootstrapTable) {
     function _class() {
       _classCallCheck(this, _class);
       return _callSuper(this, _class, arguments);
@@ -13524,8 +17589,7 @@
     return _createClass(_class, [{
       key: "initToolbar",
       value: function initToolbar() {
-        var _this = this,
-          _get2;
+        var _this = this;
         var o = this.options;
         var exportTypes = o.exportTypes;
         this.showToolbar = this.showToolbar || o.showExport;
@@ -13558,7 +17622,7 @@
                   for (_iterator.s(); !(_step = _iterator.n()).done;) {
                     var type = _step.value;
                     if (TYPE_NAME.hasOwnProperty(type)) {
-                      var $item = $$7(Utils.sprintf(_this.constants.html.pageDropdownItem, '', TYPE_NAME[type]));
+                      var $item = $(Utils.sprintf(_this.constants.html.pageDropdownItem, '', TYPE_NAME[type]));
                       $item.attr('data-type', type);
                       html.push($item.prop('outerHTML'));
                     }
@@ -13577,7 +17641,7 @@
         for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
           args[_key] = arguments[_key];
         }
-        (_get2 = _get(_getPrototypeOf(_class.prototype), "initToolbar", this)).call.apply(_get2, [this].concat(args));
+        _superPropGet(_class, "initToolbar", this, 3)(args);
         this.$export = this.$toolbar.find('>.columns div.export');
         if (!this.options.showExport) {
           return;
@@ -13591,7 +17655,7 @@
           e.preventDefault();
           _this.trigger('export-started');
           _this.exportTable({
-            type: $$7(e.currentTarget).data('type')
+            type: $(e.currentTarget).data('type')
           });
         });
         this.handleToolbar();
@@ -13602,8 +17666,8 @@
         if (!this.$export) {
           return;
         }
-        if (_get(_getPrototypeOf(_class.prototype), "handleToolbar", this)) {
-          _get(_getPrototypeOf(_class.prototype), "handleToolbar", this).call(this);
+        if (_superPropGet(_class, "handleToolbar", this, 1)) {
+          _superPropGet(_class, "handleToolbar", this, 3)([]);
         }
       }
     }, {
@@ -13634,8 +17698,8 @@
             var $footerRow = _this2.$tableFooter.find('tr').first();
             var footerData = {};
             var footerHtml = [];
-            $$7.each($footerRow.children(), function (index, footerCell) {
-              var footerCellHtml = $$7(footerCell).children('.th-inner').first().html();
+            $footerRow.children().forEach(function (footerCell, index) {
+              var footerCellHtml = $(footerCell).children('.th-inner').first().html();
               footerData[_this2.columns[index].field] = footerCellHtml === '&nbsp;' ? null : footerCellHtml;
 
               // grab footer cell text into cell index-based array
@@ -13643,8 +17707,8 @@
             });
             _this2.$body.append(_this2.$body.children().last()[0].outerHTML);
             var $lastTableRow = _this2.$body.children().last();
-            $$7.each($lastTableRow.children(), function (index, lastTableRowCell) {
-              $$7(lastTableRowCell).html(footerHtml[index]);
+            $lastTableRow.children().forEach(function (lastTableRowCell, index) {
+              $(lastTableRowCell).html(footerHtml[index]);
             });
           }
           var hiddenColumns = _this2.getHiddenColumns();
@@ -13730,7 +17794,7 @@
     }, {
       key: "updateSelected",
       value: function updateSelected() {
-        _get(_getPrototypeOf(_class.prototype), "updateSelected", this).call(this);
+        _superPropGet(_class, "updateSelected", this, 3)([]);
         this.updateExportButton();
       }
     }, {
@@ -13741,7 +17805,7 @@
         }
       }
     }]);
-  }($$7.BootstrapTable);
+  }($.BootstrapTable);
 
 }));
 
@@ -13749,11 +17813,111 @@
   typeof exports === 'object' && typeof module !== 'undefined' ? factory(require('jquery')) :
   typeof define === 'function' && define.amd ? define(['jquery'], factory) :
   (global = typeof globalThis !== 'undefined' ? globalThis : global || self, factory(global.jQuery));
-})(this, (function ($$c) { 'use strict';
+})(this, (function ($) { 'use strict';
 
+  function _arrayLikeToArray(r, a) {
+    (null == a || a > r.length) && (a = r.length);
+    for (var e = 0, n = Array(a); e < a; e++) n[e] = r[e];
+    return n;
+  }
+  function _arrayWithHoles(r) {
+    if (Array.isArray(r)) return r;
+  }
+  function _assertThisInitialized(e) {
+    if (void 0 === e) throw new ReferenceError("this hasn't been initialised - super() hasn't been called");
+    return e;
+  }
   function _callSuper(t, o, e) {
     return o = _getPrototypeOf(o), _possibleConstructorReturn(t, _isNativeReflectConstruct() ? Reflect.construct(o, e || [], _getPrototypeOf(t).constructor) : o.apply(t, e));
   }
+  function _classCallCheck(a, n) {
+    if (!(a instanceof n)) throw new TypeError("Cannot call a class as a function");
+  }
+  function _defineProperties(e, r) {
+    for (var t = 0; t < r.length; t++) {
+      var o = r[t];
+      o.enumerable = o.enumerable || !1, o.configurable = !0, "value" in o && (o.writable = !0), Object.defineProperty(e, _toPropertyKey(o.key), o);
+    }
+  }
+  function _createClass(e, r, t) {
+    return _defineProperties(e.prototype, r), Object.defineProperty(e, "prototype", {
+      writable: !1
+    }), e;
+  }
+  function _createForOfIteratorHelper(r, e) {
+    var t = "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"];
+    if (!t) {
+      if (Array.isArray(r) || (t = _unsupportedIterableToArray(r)) || e) {
+        t && (r = t);
+        var n = 0,
+          F = function () {};
+        return {
+          s: F,
+          n: function () {
+            return n >= r.length ? {
+              done: !0
+            } : {
+              done: !1,
+              value: r[n++]
+            };
+          },
+          e: function (r) {
+            throw r;
+          },
+          f: F
+        };
+      }
+      throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.");
+    }
+    var o,
+      a = !0,
+      u = !1;
+    return {
+      s: function () {
+        t = t.call(r);
+      },
+      n: function () {
+        var r = t.next();
+        return a = r.done, r;
+      },
+      e: function (r) {
+        u = !0, o = r;
+      },
+      f: function () {
+        try {
+          a || null == t.return || t.return();
+        } finally {
+          if (u) throw o;
+        }
+      }
+    };
+  }
+  function _get() {
+    return _get = "undefined" != typeof Reflect && Reflect.get ? Reflect.get.bind() : function (e, t, r) {
+      var p = _superPropBase(e, t);
+      if (p) {
+        var n = Object.getOwnPropertyDescriptor(p, t);
+        return n.get ? n.get.call(arguments.length < 3 ? e : r) : n.value;
+      }
+    }, _get.apply(null, arguments);
+  }
+  function _getPrototypeOf(t) {
+    return _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf.bind() : function (t) {
+      return t.__proto__ || Object.getPrototypeOf(t);
+    }, _getPrototypeOf(t);
+  }
+  function _inherits(t, e) {
+    if ("function" != typeof e && null !== e) throw new TypeError("Super expression must either be null or a function");
+    t.prototype = Object.create(e && e.prototype, {
+      constructor: {
+        value: t,
+        writable: !0,
+        configurable: !0
+      }
+    }), Object.defineProperty(t, "prototype", {
+      writable: !1
+    }), e && _setPrototypeOf(t, e);
+  }
   function _isNativeReflectConstruct() {
     try {
       var t = !Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {}));
@@ -13773,10 +17937,7 @@
         f = !0,
         o = !1;
       try {
-        if (i = (t = t.call(r)).next, 0 === l) {
-          if (Object(t) !== t) return;
-          f = !1;
-        } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0);
+        if (i = (t = t.call(r)).next, 0 === l) ; else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0);
       } catch (r) {
         o = !0, n = r;
       } finally {
@@ -13789,2739 +17950,3659 @@
       return a;
     }
   }
+  function _nonIterableRest() {
+    throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.");
+  }
+  function _possibleConstructorReturn(t, e) {
+    if (e && ("object" == typeof e || "function" == typeof e)) return e;
+    if (void 0 !== e) throw new TypeError("Derived constructors may only return object or undefined");
+    return _assertThisInitialized(t);
+  }
+  function _setPrototypeOf(t, e) {
+    return _setPrototypeOf = Object.setPrototypeOf ? Object.setPrototypeOf.bind() : function (t, e) {
+      return t.__proto__ = e, t;
+    }, _setPrototypeOf(t, e);
+  }
+  function _slicedToArray(r, e) {
+    return _arrayWithHoles(r) || _iterableToArrayLimit(r, e) || _unsupportedIterableToArray(r, e) || _nonIterableRest();
+  }
+  function _superPropBase(t, o) {
+    for (; !{}.hasOwnProperty.call(t, o) && null !== (t = _getPrototypeOf(t)););
+    return t;
+  }
+  function _superPropGet(t, o, e, r) {
+    var p = _get(_getPrototypeOf(t.prototype ), o, e);
+    return "function" == typeof p ? function (t) {
+      return p.apply(e, t);
+    } : p;
+  }
   function _toPrimitive(t, r) {
     if ("object" != typeof t || !t) return t;
     var e = t[Symbol.toPrimitive];
     if (void 0 !== e) {
-      var i = e.call(t, r || "default");
+      var i = e.call(t, r);
       if ("object" != typeof i) return i;
       throw new TypeError("@@toPrimitive must return a primitive value.");
     }
-    return ("string" === r ? String : Number)(t);
+    return (String )(t);
   }
   function _toPropertyKey(t) {
     var i = _toPrimitive(t, "string");
     return "symbol" == typeof i ? i : i + "";
   }
-  function _classCallCheck(instance, Constructor) {
-    if (!(instance instanceof Constructor)) {
-      throw new TypeError("Cannot call a class as a function");
+  function _unsupportedIterableToArray(r, a) {
+    if (r) {
+      if ("string" == typeof r) return _arrayLikeToArray(r, a);
+      var t = {}.toString.call(r).slice(8, -1);
+      return "Object" === t && r.constructor && (t = r.constructor.name), "Map" === t || "Set" === t ? Array.from(r) : "Arguments" === t || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(t) ? _arrayLikeToArray(r, a) : void 0;
     }
   }
-  function _defineProperties(target, props) {
-    for (var i = 0; i < props.length; i++) {
-      var descriptor = props[i];
-      descriptor.enumerable = descriptor.enumerable || false;
-      descriptor.configurable = true;
-      if ("value" in descriptor) descriptor.writable = true;
-      Object.defineProperty(target, _toPropertyKey(descriptor.key), descriptor);
-    }
-  }
-  function _createClass(Constructor, protoProps, staticProps) {
-    if (protoProps) _defineProperties(Constructor.prototype, protoProps);
-    if (staticProps) _defineProperties(Constructor, staticProps);
-    Object.defineProperty(Constructor, "prototype", {
-      writable: false
-    });
-    return Constructor;
-  }
-  function _inherits(subClass, superClass) {
-    if (typeof superClass !== "function" && superClass !== null) {
-      throw new TypeError("Super expression must either be null or a function");
-    }
-    subClass.prototype = Object.create(superClass && superClass.prototype, {
-      constructor: {
-        value: subClass,
-        writable: true,
-        configurable: true
-      }
-    });
-    Object.defineProperty(subClass, "prototype", {
-      writable: false
-    });
-    if (superClass) _setPrototypeOf(subClass, superClass);
-  }
-  function _getPrototypeOf(o) {
-    _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf.bind() : function _getPrototypeOf(o) {
-      return o.__proto__ || Object.getPrototypeOf(o);
-    };
-    return _getPrototypeOf(o);
-  }
-  function _setPrototypeOf(o, p) {
-    _setPrototypeOf = Object.setPrototypeOf ? Object.setPrototypeOf.bind() : function _setPrototypeOf(o, p) {
-      o.__proto__ = p;
-      return o;
-    };
-    return _setPrototypeOf(o, p);
-  }
-  function _assertThisInitialized(self) {
-    if (self === void 0) {
-      throw new ReferenceError("this hasn't been initialised - super() hasn't been called");
-    }
-    return self;
-  }
-  function _possibleConstructorReturn(self, call) {
-    if (call && (typeof call === "object" || typeof call === "function")) {
-      return call;
-    } else if (call !== void 0) {
-      throw new TypeError("Derived constructors may only return object or undefined");
-    }
-    return _assertThisInitialized(self);
-  }
-  function _superPropBase(object, property) {
-    while (!Object.prototype.hasOwnProperty.call(object, property)) {
-      object = _getPrototypeOf(object);
-      if (object === null) break;
-    }
-    return object;
-  }
-  function _get() {
-    if (typeof Reflect !== "undefined" && Reflect.get) {
-      _get = Reflect.get.bind();
-    } else {
-      _get = function _get(target, property, receiver) {
-        var base = _superPropBase(target, property);
-        if (!base) return;
-        var desc = Object.getOwnPropertyDescriptor(base, property);
-        if (desc.get) {
-          return desc.get.call(arguments.length < 3 ? target : receiver);
-        }
-        return desc.value;
-      };
-    }
-    return _get.apply(this, arguments);
-  }
-  function _slicedToArray(arr, i) {
-    return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest();
-  }
-  function _arrayWithHoles(arr) {
-    if (Array.isArray(arr)) return arr;
-  }
-  function _unsupportedIterableToArray(o, minLen) {
-    if (!o) return;
-    if (typeof o === "string") return _arrayLikeToArray(o, minLen);
-    var n = Object.prototype.toString.call(o).slice(8, -1);
-    if (n === "Object" && o.constructor) n = o.constructor.name;
-    if (n === "Map" || n === "Set") return Array.from(o);
-    if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen);
-  }
-  function _arrayLikeToArray(arr, len) {
-    if (len == null || len > arr.length) len = arr.length;
-    for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i];
-    return arr2;
-  }
-  function _nonIterableRest() {
-    throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.");
-  }
-  function _createForOfIteratorHelper(o, allowArrayLike) {
-    var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"];
-    if (!it) {
-      if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") {
-        if (it) o = it;
-        var i = 0;
-        var F = function () {};
-        return {
-          s: F,
-          n: function () {
-            if (i >= o.length) return {
-              done: true
-            };
-            return {
-              done: false,
-              value: o[i++]
-            };
-          },
-          e: function (e) {
-            throw e;
-          },
-          f: F
-        };
-      }
-      throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.");
-    }
-    var normalCompletion = true,
-      didErr = false,
-      err;
-    return {
-      s: function () {
-        it = it.call(o);
-      },
-      n: function () {
-        var step = it.next();
-        normalCompletion = step.done;
-        return step;
-      },
-      e: function (e) {
-        didErr = true;
-        err = e;
-      },
-      f: function () {
-        try {
-          if (!normalCompletion && it.return != null) it.return();
-        } finally {
-          if (didErr) throw err;
-        }
-      }
-    };
-  }
 
   var commonjsGlobal = typeof globalThis !== 'undefined' ? globalThis : typeof window !== 'undefined' ? window : typeof global !== 'undefined' ? global : typeof self !== 'undefined' ? self : {};
 
-  var check = function (it) {
-    return it && it.Math === Math && it;
-  };
+  var es_array_concat = {};
 
-  // https://github.com/zloirock/core-js/issues/86#issuecomment-115759028
-  var global$e =
-    // eslint-disable-next-line es/no-global-this -- safe
-    check(typeof globalThis == 'object' && globalThis) ||
-    check(typeof window == 'object' && window) ||
-    // eslint-disable-next-line no-restricted-globals -- safe
-    check(typeof self == 'object' && self) ||
-    check(typeof commonjsGlobal == 'object' && commonjsGlobal) ||
-    check(typeof commonjsGlobal == 'object' && commonjsGlobal) ||
-    // eslint-disable-next-line no-new-func -- fallback
-    (function () { return this; })() || Function('return this')();
+  var globalThis_1;
+  var hasRequiredGlobalThis;
+
+  function requireGlobalThis () {
+  	if (hasRequiredGlobalThis) return globalThis_1;
+  	hasRequiredGlobalThis = 1;
+  	var check = function (it) {
+  	  return it && it.Math === Math && it;
+  	};
+
+  	// https://github.com/zloirock/core-js/issues/86#issuecomment-115759028
+  	globalThis_1 =
+  	  // eslint-disable-next-line es/no-global-this -- safe
+  	  check(typeof globalThis == 'object' && globalThis) ||
+  	  check(typeof window == 'object' && window) ||
+  	  // eslint-disable-next-line no-restricted-globals -- safe
+  	  check(typeof self == 'object' && self) ||
+  	  check(typeof commonjsGlobal == 'object' && commonjsGlobal) ||
+  	  check(typeof globalThis_1 == 'object' && globalThis_1) ||
+  	  // eslint-disable-next-line no-new-func -- fallback
+  	  (function () { return this; })() || Function('return this')();
+  	return globalThis_1;
+  }
 
   var objectGetOwnPropertyDescriptor = {};
 
-  var fails$o = function (exec) {
-    try {
-      return !!exec();
-    } catch (error) {
-      return true;
-    }
-  };
+  var fails;
+  var hasRequiredFails;
 
-  var fails$n = fails$o;
+  function requireFails () {
+  	if (hasRequiredFails) return fails;
+  	hasRequiredFails = 1;
+  	fails = function (exec) {
+  	  try {
+  	    return !!exec();
+  	  } catch (error) {
+  	    return true;
+  	  }
+  	};
+  	return fails;
+  }
 
-  // Detect IE8's incomplete defineProperty implementation
-  var descriptors = !fails$n(function () {
-    // eslint-disable-next-line es/no-object-defineproperty -- required for testing
-    return Object.defineProperty({}, 1, { get: function () { return 7; } })[1] !== 7;
-  });
+  var descriptors;
+  var hasRequiredDescriptors;
 
-  var fails$m = fails$o;
+  function requireDescriptors () {
+  	if (hasRequiredDescriptors) return descriptors;
+  	hasRequiredDescriptors = 1;
+  	var fails = requireFails();
 
-  var functionBindNative = !fails$m(function () {
-    // eslint-disable-next-line es/no-function-prototype-bind -- safe
-    var test = (function () { /* empty */ }).bind();
-    // eslint-disable-next-line no-prototype-builtins -- safe
-    return typeof test != 'function' || test.hasOwnProperty('prototype');
-  });
+  	// Detect IE8's incomplete defineProperty implementation
+  	descriptors = !fails(function () {
+  	  // eslint-disable-next-line es/no-object-defineproperty -- required for testing
+  	  return Object.defineProperty({}, 1, { get: function () { return 7; } })[1] !== 7;
+  	});
+  	return descriptors;
+  }
 
-  var NATIVE_BIND$3 = functionBindNative;
+  var functionBindNative;
+  var hasRequiredFunctionBindNative;
 
-  var call$c = Function.prototype.call;
+  function requireFunctionBindNative () {
+  	if (hasRequiredFunctionBindNative) return functionBindNative;
+  	hasRequiredFunctionBindNative = 1;
+  	var fails = requireFails();
 
-  var functionCall = NATIVE_BIND$3 ? call$c.bind(call$c) : function () {
-    return call$c.apply(call$c, arguments);
-  };
+  	functionBindNative = !fails(function () {
+  	  // eslint-disable-next-line es/no-function-prototype-bind -- safe
+  	  var test = (function () { /* empty */ }).bind();
+  	  // eslint-disable-next-line no-prototype-builtins -- safe
+  	  return typeof test != 'function' || test.hasOwnProperty('prototype');
+  	});
+  	return functionBindNative;
+  }
+
+  var functionCall;
+  var hasRequiredFunctionCall;
+
+  function requireFunctionCall () {
+  	if (hasRequiredFunctionCall) return functionCall;
+  	hasRequiredFunctionCall = 1;
+  	var NATIVE_BIND = requireFunctionBindNative();
+
+  	var call = Function.prototype.call;
+
+  	functionCall = NATIVE_BIND ? call.bind(call) : function () {
+  	  return call.apply(call, arguments);
+  	};
+  	return functionCall;
+  }
 
   var objectPropertyIsEnumerable = {};
 
-  var $propertyIsEnumerable$1 = {}.propertyIsEnumerable;
-  // eslint-disable-next-line es/no-object-getownpropertydescriptor -- safe
-  var getOwnPropertyDescriptor$1 = Object.getOwnPropertyDescriptor;
+  var hasRequiredObjectPropertyIsEnumerable;
 
-  // Nashorn ~ JDK8 bug
-  var NASHORN_BUG = getOwnPropertyDescriptor$1 && !$propertyIsEnumerable$1.call({ 1: 2 }, 1);
+  function requireObjectPropertyIsEnumerable () {
+  	if (hasRequiredObjectPropertyIsEnumerable) return objectPropertyIsEnumerable;
+  	hasRequiredObjectPropertyIsEnumerable = 1;
+  	var $propertyIsEnumerable = {}.propertyIsEnumerable;
+  	// eslint-disable-next-line es/no-object-getownpropertydescriptor -- safe
+  	var getOwnPropertyDescriptor = Object.getOwnPropertyDescriptor;
 
-  // `Object.prototype.propertyIsEnumerable` method implementation
-  // https://tc39.es/ecma262/#sec-object.prototype.propertyisenumerable
-  objectPropertyIsEnumerable.f = NASHORN_BUG ? function propertyIsEnumerable(V) {
-    var descriptor = getOwnPropertyDescriptor$1(this, V);
-    return !!descriptor && descriptor.enumerable;
-  } : $propertyIsEnumerable$1;
+  	// Nashorn ~ JDK8 bug
+  	var NASHORN_BUG = getOwnPropertyDescriptor && !$propertyIsEnumerable.call({ 1: 2 }, 1);
 
-  var createPropertyDescriptor$3 = function (bitmap, value) {
-    return {
-      enumerable: !(bitmap & 1),
-      configurable: !(bitmap & 2),
-      writable: !(bitmap & 4),
-      value: value
-    };
-  };
-
-  var NATIVE_BIND$2 = functionBindNative;
-
-  var FunctionPrototype$2 = Function.prototype;
-  var call$b = FunctionPrototype$2.call;
-  var uncurryThisWithBind = NATIVE_BIND$2 && FunctionPrototype$2.bind.bind(call$b, call$b);
-
-  var functionUncurryThis = NATIVE_BIND$2 ? uncurryThisWithBind : function (fn) {
-    return function () {
-      return call$b.apply(fn, arguments);
-    };
-  };
-
-  var uncurryThis$k = functionUncurryThis;
-
-  var toString$8 = uncurryThis$k({}.toString);
-  var stringSlice$5 = uncurryThis$k(''.slice);
-
-  var classofRaw$2 = function (it) {
-    return stringSlice$5(toString$8(it), 8, -1);
-  };
-
-  var uncurryThis$j = functionUncurryThis;
-  var fails$l = fails$o;
-  var classof$7 = classofRaw$2;
-
-  var $Object$4 = Object;
-  var split = uncurryThis$j(''.split);
-
-  // fallback for non-array-like ES3 and non-enumerable old V8 strings
-  var indexedObject = fails$l(function () {
-    // throws an error in rhino, see https://github.com/mozilla/rhino/issues/346
-    // eslint-disable-next-line no-prototype-builtins -- safe
-    return !$Object$4('z').propertyIsEnumerable(0);
-  }) ? function (it) {
-    return classof$7(it) === 'String' ? split(it, '') : $Object$4(it);
-  } : $Object$4;
-
-  // we can't use just `it == null` since of `document.all` special case
-  // https://tc39.es/ecma262/#sec-IsHTMLDDA-internal-slot-aec
-  var isNullOrUndefined$4 = function (it) {
-    return it === null || it === undefined;
-  };
-
-  var isNullOrUndefined$3 = isNullOrUndefined$4;
-
-  var $TypeError$8 = TypeError;
-
-  // `RequireObjectCoercible` abstract operation
-  // https://tc39.es/ecma262/#sec-requireobjectcoercible
-  var requireObjectCoercible$6 = function (it) {
-    if (isNullOrUndefined$3(it)) throw new $TypeError$8("Can't call method on " + it);
-    return it;
-  };
-
-  // toObject with fallback for non-array-like ES3 strings
-  var IndexedObject$3 = indexedObject;
-  var requireObjectCoercible$5 = requireObjectCoercible$6;
-
-  var toIndexedObject$6 = function (it) {
-    return IndexedObject$3(requireObjectCoercible$5(it));
-  };
-
-  // https://tc39.es/ecma262/#sec-IsHTMLDDA-internal-slot
-  var documentAll = typeof document == 'object' && document.all;
-
-  // `IsCallable` abstract operation
-  // https://tc39.es/ecma262/#sec-iscallable
-  // eslint-disable-next-line unicorn/no-typeof-undefined -- required for testing
-  var isCallable$f = typeof documentAll == 'undefined' && documentAll !== undefined ? function (argument) {
-    return typeof argument == 'function' || argument === documentAll;
-  } : function (argument) {
-    return typeof argument == 'function';
-  };
-
-  var isCallable$e = isCallable$f;
-
-  var isObject$8 = function (it) {
-    return typeof it == 'object' ? it !== null : isCallable$e(it);
-  };
-
-  var global$d = global$e;
-  var isCallable$d = isCallable$f;
-
-  var aFunction = function (argument) {
-    return isCallable$d(argument) ? argument : undefined;
-  };
-
-  var getBuiltIn$4 = function (namespace, method) {
-    return arguments.length < 2 ? aFunction(global$d[namespace]) : global$d[namespace] && global$d[namespace][method];
-  };
-
-  var uncurryThis$i = functionUncurryThis;
-
-  var objectIsPrototypeOf = uncurryThis$i({}.isPrototypeOf);
-
-  var engineUserAgent = typeof navigator != 'undefined' && String(navigator.userAgent) || '';
-
-  var global$c = global$e;
-  var userAgent = engineUserAgent;
-
-  var process = global$c.process;
-  var Deno = global$c.Deno;
-  var versions = process && process.versions || Deno && Deno.version;
-  var v8 = versions && versions.v8;
-  var match, version;
-
-  if (v8) {
-    match = v8.split('.');
-    // in old Chrome, versions of V8 isn't V8 = Chrome / 10
-    // but their correct versions are not interesting for us
-    version = match[0] > 0 && match[0] < 4 ? 1 : +(match[0] + match[1]);
+  	// `Object.prototype.propertyIsEnumerable` method implementation
+  	// https://tc39.es/ecma262/#sec-object.prototype.propertyisenumerable
+  	objectPropertyIsEnumerable.f = NASHORN_BUG ? function propertyIsEnumerable(V) {
+  	  var descriptor = getOwnPropertyDescriptor(this, V);
+  	  return !!descriptor && descriptor.enumerable;
+  	} : $propertyIsEnumerable;
+  	return objectPropertyIsEnumerable;
   }
 
-  // BrowserFS NodeJS `process` polyfill incorrectly set `.v8` to `0.0`
-  // so check `userAgent` even if `.v8` exists, but 0
-  if (!version && userAgent) {
-    match = userAgent.match(/Edge\/(\d+)/);
-    if (!match || match[1] >= 74) {
-      match = userAgent.match(/Chrome\/(\d+)/);
-      if (match) version = +match[1];
-    }
+  var createPropertyDescriptor;
+  var hasRequiredCreatePropertyDescriptor;
+
+  function requireCreatePropertyDescriptor () {
+  	if (hasRequiredCreatePropertyDescriptor) return createPropertyDescriptor;
+  	hasRequiredCreatePropertyDescriptor = 1;
+  	createPropertyDescriptor = function (bitmap, value) {
+  	  return {
+  	    enumerable: !(bitmap & 1),
+  	    configurable: !(bitmap & 2),
+  	    writable: !(bitmap & 4),
+  	    value: value
+  	  };
+  	};
+  	return createPropertyDescriptor;
   }
 
-  var engineV8Version = version;
+  var functionUncurryThis;
+  var hasRequiredFunctionUncurryThis;
 
-  /* eslint-disable es/no-symbol -- required for testing */
-  var V8_VERSION$2 = engineV8Version;
-  var fails$k = fails$o;
-  var global$b = global$e;
+  function requireFunctionUncurryThis () {
+  	if (hasRequiredFunctionUncurryThis) return functionUncurryThis;
+  	hasRequiredFunctionUncurryThis = 1;
+  	var NATIVE_BIND = requireFunctionBindNative();
 
-  var $String$4 = global$b.String;
+  	var FunctionPrototype = Function.prototype;
+  	var call = FunctionPrototype.call;
+  	var uncurryThisWithBind = NATIVE_BIND && FunctionPrototype.bind.bind(call, call);
 
-  // eslint-disable-next-line es/no-object-getownpropertysymbols -- required for testing
-  var symbolConstructorDetection = !!Object.getOwnPropertySymbols && !fails$k(function () {
-    var symbol = Symbol('symbol detection');
-    // Chrome 38 Symbol has incorrect toString conversion
-    // `get-own-property-symbols` polyfill symbols converted to object are not Symbol instances
-    // nb: Do not call `String` directly to avoid this being optimized out to `symbol+''` which will,
-    // of course, fail.
-    return !$String$4(symbol) || !(Object(symbol) instanceof Symbol) ||
-      // Chrome 38-40 symbols are not inherited from DOM collections prototypes to instances
-      !Symbol.sham && V8_VERSION$2 && V8_VERSION$2 < 41;
-  });
+  	functionUncurryThis = NATIVE_BIND ? uncurryThisWithBind : function (fn) {
+  	  return function () {
+  	    return call.apply(fn, arguments);
+  	  };
+  	};
+  	return functionUncurryThis;
+  }
 
-  /* eslint-disable es/no-symbol -- required for testing */
-  var NATIVE_SYMBOL$1 = symbolConstructorDetection;
+  var classofRaw;
+  var hasRequiredClassofRaw;
 
-  var useSymbolAsUid = NATIVE_SYMBOL$1
-    && !Symbol.sham
-    && typeof Symbol.iterator == 'symbol';
+  function requireClassofRaw () {
+  	if (hasRequiredClassofRaw) return classofRaw;
+  	hasRequiredClassofRaw = 1;
+  	var uncurryThis = requireFunctionUncurryThis();
 
-  var getBuiltIn$3 = getBuiltIn$4;
-  var isCallable$c = isCallable$f;
-  var isPrototypeOf$1 = objectIsPrototypeOf;
-  var USE_SYMBOL_AS_UID$1 = useSymbolAsUid;
+  	var toString = uncurryThis({}.toString);
+  	var stringSlice = uncurryThis(''.slice);
 
-  var $Object$3 = Object;
+  	classofRaw = function (it) {
+  	  return stringSlice(toString(it), 8, -1);
+  	};
+  	return classofRaw;
+  }
 
-  var isSymbol$2 = USE_SYMBOL_AS_UID$1 ? function (it) {
-    return typeof it == 'symbol';
-  } : function (it) {
-    var $Symbol = getBuiltIn$3('Symbol');
-    return isCallable$c($Symbol) && isPrototypeOf$1($Symbol.prototype, $Object$3(it));
-  };
+  var indexedObject;
+  var hasRequiredIndexedObject;
 
-  var $String$3 = String;
+  function requireIndexedObject () {
+  	if (hasRequiredIndexedObject) return indexedObject;
+  	hasRequiredIndexedObject = 1;
+  	var uncurryThis = requireFunctionUncurryThis();
+  	var fails = requireFails();
+  	var classof = requireClassofRaw();
 
-  var tryToString$1 = function (argument) {
-    try {
-      return $String$3(argument);
-    } catch (error) {
-      return 'Object';
-    }
-  };
+  	var $Object = Object;
+  	var split = uncurryThis(''.split);
 
-  var isCallable$b = isCallable$f;
-  var tryToString = tryToString$1;
+  	// fallback for non-array-like ES3 and non-enumerable old V8 strings
+  	indexedObject = fails(function () {
+  	  // throws an error in rhino, see https://github.com/mozilla/rhino/issues/346
+  	  // eslint-disable-next-line no-prototype-builtins -- safe
+  	  return !$Object('z').propertyIsEnumerable(0);
+  	}) ? function (it) {
+  	  return classof(it) === 'String' ? split(it, '') : $Object(it);
+  	} : $Object;
+  	return indexedObject;
+  }
 
-  var $TypeError$7 = TypeError;
+  var isNullOrUndefined;
+  var hasRequiredIsNullOrUndefined;
 
-  // `Assert: IsCallable(argument) is true`
-  var aCallable$2 = function (argument) {
-    if (isCallable$b(argument)) return argument;
-    throw new $TypeError$7(tryToString(argument) + ' is not a function');
-  };
+  function requireIsNullOrUndefined () {
+  	if (hasRequiredIsNullOrUndefined) return isNullOrUndefined;
+  	hasRequiredIsNullOrUndefined = 1;
+  	// we can't use just `it == null` since of `document.all` special case
+  	// https://tc39.es/ecma262/#sec-IsHTMLDDA-internal-slot-aec
+  	isNullOrUndefined = function (it) {
+  	  return it === null || it === undefined;
+  	};
+  	return isNullOrUndefined;
+  }
 
-  var aCallable$1 = aCallable$2;
-  var isNullOrUndefined$2 = isNullOrUndefined$4;
+  var requireObjectCoercible;
+  var hasRequiredRequireObjectCoercible;
 
-  // `GetMethod` abstract operation
-  // https://tc39.es/ecma262/#sec-getmethod
-  var getMethod$3 = function (V, P) {
-    var func = V[P];
-    return isNullOrUndefined$2(func) ? undefined : aCallable$1(func);
-  };
+  function requireRequireObjectCoercible () {
+  	if (hasRequiredRequireObjectCoercible) return requireObjectCoercible;
+  	hasRequiredRequireObjectCoercible = 1;
+  	var isNullOrUndefined = requireIsNullOrUndefined();
 
-  var call$a = functionCall;
-  var isCallable$a = isCallable$f;
-  var isObject$7 = isObject$8;
+  	var $TypeError = TypeError;
 
-  var $TypeError$6 = TypeError;
+  	// `RequireObjectCoercible` abstract operation
+  	// https://tc39.es/ecma262/#sec-requireobjectcoercible
+  	requireObjectCoercible = function (it) {
+  	  if (isNullOrUndefined(it)) throw new $TypeError("Can't call method on " + it);
+  	  return it;
+  	};
+  	return requireObjectCoercible;
+  }
 
-  // `OrdinaryToPrimitive` abstract operation
-  // https://tc39.es/ecma262/#sec-ordinarytoprimitive
-  var ordinaryToPrimitive$1 = function (input, pref) {
-    var fn, val;
-    if (pref === 'string' && isCallable$a(fn = input.toString) && !isObject$7(val = call$a(fn, input))) return val;
-    if (isCallable$a(fn = input.valueOf) && !isObject$7(val = call$a(fn, input))) return val;
-    if (pref !== 'string' && isCallable$a(fn = input.toString) && !isObject$7(val = call$a(fn, input))) return val;
-    throw new $TypeError$6("Can't convert object to primitive value");
-  };
+  var toIndexedObject;
+  var hasRequiredToIndexedObject;
+
+  function requireToIndexedObject () {
+  	if (hasRequiredToIndexedObject) return toIndexedObject;
+  	hasRequiredToIndexedObject = 1;
+  	// toObject with fallback for non-array-like ES3 strings
+  	var IndexedObject = requireIndexedObject();
+  	var requireObjectCoercible = requireRequireObjectCoercible();
+
+  	toIndexedObject = function (it) {
+  	  return IndexedObject(requireObjectCoercible(it));
+  	};
+  	return toIndexedObject;
+  }
+
+  var isCallable;
+  var hasRequiredIsCallable;
+
+  function requireIsCallable () {
+  	if (hasRequiredIsCallable) return isCallable;
+  	hasRequiredIsCallable = 1;
+  	// https://tc39.es/ecma262/#sec-IsHTMLDDA-internal-slot
+  	var documentAll = typeof document == 'object' && document.all;
+
+  	// `IsCallable` abstract operation
+  	// https://tc39.es/ecma262/#sec-iscallable
+  	// eslint-disable-next-line unicorn/no-typeof-undefined -- required for testing
+  	isCallable = typeof documentAll == 'undefined' && documentAll !== undefined ? function (argument) {
+  	  return typeof argument == 'function' || argument === documentAll;
+  	} : function (argument) {
+  	  return typeof argument == 'function';
+  	};
+  	return isCallable;
+  }
+
+  var isObject;
+  var hasRequiredIsObject;
+
+  function requireIsObject () {
+  	if (hasRequiredIsObject) return isObject;
+  	hasRequiredIsObject = 1;
+  	var isCallable = requireIsCallable();
+
+  	isObject = function (it) {
+  	  return typeof it == 'object' ? it !== null : isCallable(it);
+  	};
+  	return isObject;
+  }
+
+  var getBuiltIn;
+  var hasRequiredGetBuiltIn;
+
+  function requireGetBuiltIn () {
+  	if (hasRequiredGetBuiltIn) return getBuiltIn;
+  	hasRequiredGetBuiltIn = 1;
+  	var globalThis = requireGlobalThis();
+  	var isCallable = requireIsCallable();
+
+  	var aFunction = function (argument) {
+  	  return isCallable(argument) ? argument : undefined;
+  	};
+
+  	getBuiltIn = function (namespace, method) {
+  	  return arguments.length < 2 ? aFunction(globalThis[namespace]) : globalThis[namespace] && globalThis[namespace][method];
+  	};
+  	return getBuiltIn;
+  }
+
+  var objectIsPrototypeOf;
+  var hasRequiredObjectIsPrototypeOf;
+
+  function requireObjectIsPrototypeOf () {
+  	if (hasRequiredObjectIsPrototypeOf) return objectIsPrototypeOf;
+  	hasRequiredObjectIsPrototypeOf = 1;
+  	var uncurryThis = requireFunctionUncurryThis();
+
+  	objectIsPrototypeOf = uncurryThis({}.isPrototypeOf);
+  	return objectIsPrototypeOf;
+  }
+
+  var environmentUserAgent;
+  var hasRequiredEnvironmentUserAgent;
+
+  function requireEnvironmentUserAgent () {
+  	if (hasRequiredEnvironmentUserAgent) return environmentUserAgent;
+  	hasRequiredEnvironmentUserAgent = 1;
+  	var globalThis = requireGlobalThis();
+
+  	var navigator = globalThis.navigator;
+  	var userAgent = navigator && navigator.userAgent;
+
+  	environmentUserAgent = userAgent ? String(userAgent) : '';
+  	return environmentUserAgent;
+  }
+
+  var environmentV8Version;
+  var hasRequiredEnvironmentV8Version;
+
+  function requireEnvironmentV8Version () {
+  	if (hasRequiredEnvironmentV8Version) return environmentV8Version;
+  	hasRequiredEnvironmentV8Version = 1;
+  	var globalThis = requireGlobalThis();
+  	var userAgent = requireEnvironmentUserAgent();
+
+  	var process = globalThis.process;
+  	var Deno = globalThis.Deno;
+  	var versions = process && process.versions || Deno && Deno.version;
+  	var v8 = versions && versions.v8;
+  	var match, version;
+
+  	if (v8) {
+  	  match = v8.split('.');
+  	  // in old Chrome, versions of V8 isn't V8 = Chrome / 10
+  	  // but their correct versions are not interesting for us
+  	  version = match[0] > 0 && match[0] < 4 ? 1 : +(match[0] + match[1]);
+  	}
+
+  	// BrowserFS NodeJS `process` polyfill incorrectly set `.v8` to `0.0`
+  	// so check `userAgent` even if `.v8` exists, but 0
+  	if (!version && userAgent) {
+  	  match = userAgent.match(/Edge\/(\d+)/);
+  	  if (!match || match[1] >= 74) {
+  	    match = userAgent.match(/Chrome\/(\d+)/);
+  	    if (match) version = +match[1];
+  	  }
+  	}
+
+  	environmentV8Version = version;
+  	return environmentV8Version;
+  }
+
+  var symbolConstructorDetection;
+  var hasRequiredSymbolConstructorDetection;
+
+  function requireSymbolConstructorDetection () {
+  	if (hasRequiredSymbolConstructorDetection) return symbolConstructorDetection;
+  	hasRequiredSymbolConstructorDetection = 1;
+  	/* eslint-disable es/no-symbol -- required for testing */
+  	var V8_VERSION = requireEnvironmentV8Version();
+  	var fails = requireFails();
+  	var globalThis = requireGlobalThis();
+
+  	var $String = globalThis.String;
+
+  	// eslint-disable-next-line es/no-object-getownpropertysymbols -- required for testing
+  	symbolConstructorDetection = !!Object.getOwnPropertySymbols && !fails(function () {
+  	  var symbol = Symbol('symbol detection');
+  	  // Chrome 38 Symbol has incorrect toString conversion
+  	  // `get-own-property-symbols` polyfill symbols converted to object are not Symbol instances
+  	  // nb: Do not call `String` directly to avoid this being optimized out to `symbol+''` which will,
+  	  // of course, fail.
+  	  return !$String(symbol) || !(Object(symbol) instanceof Symbol) ||
+  	    // Chrome 38-40 symbols are not inherited from DOM collections prototypes to instances
+  	    !Symbol.sham && V8_VERSION && V8_VERSION < 41;
+  	});
+  	return symbolConstructorDetection;
+  }
+
+  var useSymbolAsUid;
+  var hasRequiredUseSymbolAsUid;
+
+  function requireUseSymbolAsUid () {
+  	if (hasRequiredUseSymbolAsUid) return useSymbolAsUid;
+  	hasRequiredUseSymbolAsUid = 1;
+  	/* eslint-disable es/no-symbol -- required for testing */
+  	var NATIVE_SYMBOL = requireSymbolConstructorDetection();
+
+  	useSymbolAsUid = NATIVE_SYMBOL &&
+  	  !Symbol.sham &&
+  	  typeof Symbol.iterator == 'symbol';
+  	return useSymbolAsUid;
+  }
+
+  var isSymbol;
+  var hasRequiredIsSymbol;
+
+  function requireIsSymbol () {
+  	if (hasRequiredIsSymbol) return isSymbol;
+  	hasRequiredIsSymbol = 1;
+  	var getBuiltIn = requireGetBuiltIn();
+  	var isCallable = requireIsCallable();
+  	var isPrototypeOf = requireObjectIsPrototypeOf();
+  	var USE_SYMBOL_AS_UID = requireUseSymbolAsUid();
+
+  	var $Object = Object;
+
+  	isSymbol = USE_SYMBOL_AS_UID ? function (it) {
+  	  return typeof it == 'symbol';
+  	} : function (it) {
+  	  var $Symbol = getBuiltIn('Symbol');
+  	  return isCallable($Symbol) && isPrototypeOf($Symbol.prototype, $Object(it));
+  	};
+  	return isSymbol;
+  }
+
+  var tryToString;
+  var hasRequiredTryToString;
+
+  function requireTryToString () {
+  	if (hasRequiredTryToString) return tryToString;
+  	hasRequiredTryToString = 1;
+  	var $String = String;
+
+  	tryToString = function (argument) {
+  	  try {
+  	    return $String(argument);
+  	  } catch (error) {
+  	    return 'Object';
+  	  }
+  	};
+  	return tryToString;
+  }
+
+  var aCallable;
+  var hasRequiredACallable;
+
+  function requireACallable () {
+  	if (hasRequiredACallable) return aCallable;
+  	hasRequiredACallable = 1;
+  	var isCallable = requireIsCallable();
+  	var tryToString = requireTryToString();
+
+  	var $TypeError = TypeError;
+
+  	// `Assert: IsCallable(argument) is true`
+  	aCallable = function (argument) {
+  	  if (isCallable(argument)) return argument;
+  	  throw new $TypeError(tryToString(argument) + ' is not a function');
+  	};
+  	return aCallable;
+  }
+
+  var getMethod;
+  var hasRequiredGetMethod;
+
+  function requireGetMethod () {
+  	if (hasRequiredGetMethod) return getMethod;
+  	hasRequiredGetMethod = 1;
+  	var aCallable = requireACallable();
+  	var isNullOrUndefined = requireIsNullOrUndefined();
+
+  	// `GetMethod` abstract operation
+  	// https://tc39.es/ecma262/#sec-getmethod
+  	getMethod = function (V, P) {
+  	  var func = V[P];
+  	  return isNullOrUndefined(func) ? undefined : aCallable(func);
+  	};
+  	return getMethod;
+  }
+
+  var ordinaryToPrimitive;
+  var hasRequiredOrdinaryToPrimitive;
+
+  function requireOrdinaryToPrimitive () {
+  	if (hasRequiredOrdinaryToPrimitive) return ordinaryToPrimitive;
+  	hasRequiredOrdinaryToPrimitive = 1;
+  	var call = requireFunctionCall();
+  	var isCallable = requireIsCallable();
+  	var isObject = requireIsObject();
+
+  	var $TypeError = TypeError;
+
+  	// `OrdinaryToPrimitive` abstract operation
+  	// https://tc39.es/ecma262/#sec-ordinarytoprimitive
+  	ordinaryToPrimitive = function (input, pref) {
+  	  var fn, val;
+  	  if (pref === 'string' && isCallable(fn = input.toString) && !isObject(val = call(fn, input))) return val;
+  	  if (isCallable(fn = input.valueOf) && !isObject(val = call(fn, input))) return val;
+  	  if (pref !== 'string' && isCallable(fn = input.toString) && !isObject(val = call(fn, input))) return val;
+  	  throw new $TypeError("Can't convert object to primitive value");
+  	};
+  	return ordinaryToPrimitive;
+  }
 
   var sharedStore = {exports: {}};
 
-  var global$a = global$e;
+  var isPure;
+  var hasRequiredIsPure;
 
-  // eslint-disable-next-line es/no-object-defineproperty -- safe
-  var defineProperty$3 = Object.defineProperty;
+  function requireIsPure () {
+  	if (hasRequiredIsPure) return isPure;
+  	hasRequiredIsPure = 1;
+  	isPure = false;
+  	return isPure;
+  }
 
-  var defineGlobalProperty$3 = function (key, value) {
-    try {
-      defineProperty$3(global$a, key, { value: value, configurable: true, writable: true });
-    } catch (error) {
-      global$a[key] = value;
-    } return value;
-  };
+  var defineGlobalProperty;
+  var hasRequiredDefineGlobalProperty;
 
-  var globalThis$1 = global$e;
-  var defineGlobalProperty$2 = defineGlobalProperty$3;
+  function requireDefineGlobalProperty () {
+  	if (hasRequiredDefineGlobalProperty) return defineGlobalProperty;
+  	hasRequiredDefineGlobalProperty = 1;
+  	var globalThis = requireGlobalThis();
 
-  var SHARED = '__core-js_shared__';
-  var store$3 = sharedStore.exports = globalThis$1[SHARED] || defineGlobalProperty$2(SHARED, {});
+  	// eslint-disable-next-line es/no-object-defineproperty -- safe
+  	var defineProperty = Object.defineProperty;
 
-  (store$3.versions || (store$3.versions = [])).push({
-    version: '3.36.1',
-    mode: 'global',
-    copyright: '© 2014-2024 Denis Pushkarev (zloirock.ru)',
-    license: 'https://github.com/zloirock/core-js/blob/v3.36.1/LICENSE',
-    source: 'https://github.com/zloirock/core-js'
-  });
+  	defineGlobalProperty = function (key, value) {
+  	  try {
+  	    defineProperty(globalThis, key, { value: value, configurable: true, writable: true });
+  	  } catch (error) {
+  	    globalThis[key] = value;
+  	  } return value;
+  	};
+  	return defineGlobalProperty;
+  }
 
-  var sharedStoreExports = sharedStore.exports;
+  var hasRequiredSharedStore;
 
-  var store$2 = sharedStoreExports;
+  function requireSharedStore () {
+  	if (hasRequiredSharedStore) return sharedStore.exports;
+  	hasRequiredSharedStore = 1;
+  	var IS_PURE = requireIsPure();
+  	var globalThis = requireGlobalThis();
+  	var defineGlobalProperty = requireDefineGlobalProperty();
 
-  var shared$4 = function (key, value) {
-    return store$2[key] || (store$2[key] = value || {});
-  };
+  	var SHARED = '__core-js_shared__';
+  	var store = sharedStore.exports = globalThis[SHARED] || defineGlobalProperty(SHARED, {});
 
-  var requireObjectCoercible$4 = requireObjectCoercible$6;
+  	(store.versions || (store.versions = [])).push({
+  	  version: '3.39.0',
+  	  mode: IS_PURE ? 'pure' : 'global',
+  	  copyright: '© 2014-2024 Denis Pushkarev (zloirock.ru)',
+  	  license: 'https://github.com/zloirock/core-js/blob/v3.39.0/LICENSE',
+  	  source: 'https://github.com/zloirock/core-js'
+  	});
+  	return sharedStore.exports;
+  }
 
-  var $Object$2 = Object;
+  var shared;
+  var hasRequiredShared;
 
-  // `ToObject` abstract operation
-  // https://tc39.es/ecma262/#sec-toobject
-  var toObject$8 = function (argument) {
-    return $Object$2(requireObjectCoercible$4(argument));
-  };
+  function requireShared () {
+  	if (hasRequiredShared) return shared;
+  	hasRequiredShared = 1;
+  	var store = requireSharedStore();
 
-  var uncurryThis$h = functionUncurryThis;
-  var toObject$7 = toObject$8;
+  	shared = function (key, value) {
+  	  return store[key] || (store[key] = value || {});
+  	};
+  	return shared;
+  }
 
-  var hasOwnProperty = uncurryThis$h({}.hasOwnProperty);
+  var toObject;
+  var hasRequiredToObject;
 
-  // `HasOwnProperty` abstract operation
-  // https://tc39.es/ecma262/#sec-hasownproperty
-  // eslint-disable-next-line es/no-object-hasown -- safe
-  var hasOwnProperty_1 = Object.hasOwn || function hasOwn(it, key) {
-    return hasOwnProperty(toObject$7(it), key);
-  };
+  function requireToObject () {
+  	if (hasRequiredToObject) return toObject;
+  	hasRequiredToObject = 1;
+  	var requireObjectCoercible = requireRequireObjectCoercible();
 
-  var uncurryThis$g = functionUncurryThis;
+  	var $Object = Object;
 
-  var id = 0;
-  var postfix = Math.random();
-  var toString$7 = uncurryThis$g(1.0.toString);
+  	// `ToObject` abstract operation
+  	// https://tc39.es/ecma262/#sec-toobject
+  	toObject = function (argument) {
+  	  return $Object(requireObjectCoercible(argument));
+  	};
+  	return toObject;
+  }
 
-  var uid$2 = function (key) {
-    return 'Symbol(' + (key === undefined ? '' : key) + ')_' + toString$7(++id + postfix, 36);
-  };
+  var hasOwnProperty_1;
+  var hasRequiredHasOwnProperty;
 
-  var global$9 = global$e;
-  var shared$3 = shared$4;
-  var hasOwn$8 = hasOwnProperty_1;
-  var uid$1 = uid$2;
-  var NATIVE_SYMBOL = symbolConstructorDetection;
-  var USE_SYMBOL_AS_UID = useSymbolAsUid;
+  function requireHasOwnProperty () {
+  	if (hasRequiredHasOwnProperty) return hasOwnProperty_1;
+  	hasRequiredHasOwnProperty = 1;
+  	var uncurryThis = requireFunctionUncurryThis();
+  	var toObject = requireToObject();
 
-  var Symbol$1 = global$9.Symbol;
-  var WellKnownSymbolsStore = shared$3('wks');
-  var createWellKnownSymbol = USE_SYMBOL_AS_UID ? Symbol$1['for'] || Symbol$1 : Symbol$1 && Symbol$1.withoutSetter || uid$1;
+  	var hasOwnProperty = uncurryThis({}.hasOwnProperty);
 
-  var wellKnownSymbol$b = function (name) {
-    if (!hasOwn$8(WellKnownSymbolsStore, name)) {
-      WellKnownSymbolsStore[name] = NATIVE_SYMBOL && hasOwn$8(Symbol$1, name)
-        ? Symbol$1[name]
-        : createWellKnownSymbol('Symbol.' + name);
-    } return WellKnownSymbolsStore[name];
-  };
+  	// `HasOwnProperty` abstract operation
+  	// https://tc39.es/ecma262/#sec-hasownproperty
+  	// eslint-disable-next-line es/no-object-hasown -- safe
+  	hasOwnProperty_1 = Object.hasOwn || function hasOwn(it, key) {
+  	  return hasOwnProperty(toObject(it), key);
+  	};
+  	return hasOwnProperty_1;
+  }
 
-  var call$9 = functionCall;
-  var isObject$6 = isObject$8;
-  var isSymbol$1 = isSymbol$2;
-  var getMethod$2 = getMethod$3;
-  var ordinaryToPrimitive = ordinaryToPrimitive$1;
-  var wellKnownSymbol$a = wellKnownSymbol$b;
+  var uid;
+  var hasRequiredUid;
 
-  var $TypeError$5 = TypeError;
-  var TO_PRIMITIVE = wellKnownSymbol$a('toPrimitive');
+  function requireUid () {
+  	if (hasRequiredUid) return uid;
+  	hasRequiredUid = 1;
+  	var uncurryThis = requireFunctionUncurryThis();
 
-  // `ToPrimitive` abstract operation
-  // https://tc39.es/ecma262/#sec-toprimitive
-  var toPrimitive$2 = function (input, pref) {
-    if (!isObject$6(input) || isSymbol$1(input)) return input;
-    var exoticToPrim = getMethod$2(input, TO_PRIMITIVE);
-    var result;
-    if (exoticToPrim) {
-      if (pref === undefined) pref = 'default';
-      result = call$9(exoticToPrim, input, pref);
-      if (!isObject$6(result) || isSymbol$1(result)) return result;
-      throw new $TypeError$5("Can't convert object to primitive value");
-    }
-    if (pref === undefined) pref = 'number';
-    return ordinaryToPrimitive(input, pref);
-  };
+  	var id = 0;
+  	var postfix = Math.random();
+  	var toString = uncurryThis(1.0.toString);
 
-  var toPrimitive$1 = toPrimitive$2;
-  var isSymbol = isSymbol$2;
+  	uid = function (key) {
+  	  return 'Symbol(' + (key === undefined ? '' : key) + ')_' + toString(++id + postfix, 36);
+  	};
+  	return uid;
+  }
 
-  // `ToPropertyKey` abstract operation
-  // https://tc39.es/ecma262/#sec-topropertykey
-  var toPropertyKey$2 = function (argument) {
-    var key = toPrimitive$1(argument, 'string');
-    return isSymbol(key) ? key : key + '';
-  };
+  var wellKnownSymbol;
+  var hasRequiredWellKnownSymbol;
 
-  var global$8 = global$e;
-  var isObject$5 = isObject$8;
+  function requireWellKnownSymbol () {
+  	if (hasRequiredWellKnownSymbol) return wellKnownSymbol;
+  	hasRequiredWellKnownSymbol = 1;
+  	var globalThis = requireGlobalThis();
+  	var shared = requireShared();
+  	var hasOwn = requireHasOwnProperty();
+  	var uid = requireUid();
+  	var NATIVE_SYMBOL = requireSymbolConstructorDetection();
+  	var USE_SYMBOL_AS_UID = requireUseSymbolAsUid();
 
-  var document$1 = global$8.document;
-  // typeof document.createElement is 'object' in old IE
-  var EXISTS$1 = isObject$5(document$1) && isObject$5(document$1.createElement);
+  	var Symbol = globalThis.Symbol;
+  	var WellKnownSymbolsStore = shared('wks');
+  	var createWellKnownSymbol = USE_SYMBOL_AS_UID ? Symbol['for'] || Symbol : Symbol && Symbol.withoutSetter || uid;
 
-  var documentCreateElement$2 = function (it) {
-    return EXISTS$1 ? document$1.createElement(it) : {};
-  };
+  	wellKnownSymbol = function (name) {
+  	  if (!hasOwn(WellKnownSymbolsStore, name)) {
+  	    WellKnownSymbolsStore[name] = NATIVE_SYMBOL && hasOwn(Symbol, name)
+  	      ? Symbol[name]
+  	      : createWellKnownSymbol('Symbol.' + name);
+  	  } return WellKnownSymbolsStore[name];
+  	};
+  	return wellKnownSymbol;
+  }
 
-  var DESCRIPTORS$a = descriptors;
-  var fails$j = fails$o;
-  var createElement = documentCreateElement$2;
+  var toPrimitive;
+  var hasRequiredToPrimitive;
 
-  // Thanks to IE8 for its funny defineProperty
-  var ie8DomDefine = !DESCRIPTORS$a && !fails$j(function () {
-    // eslint-disable-next-line es/no-object-defineproperty -- required for testing
-    return Object.defineProperty(createElement('div'), 'a', {
-      get: function () { return 7; }
-    }).a !== 7;
-  });
+  function requireToPrimitive () {
+  	if (hasRequiredToPrimitive) return toPrimitive;
+  	hasRequiredToPrimitive = 1;
+  	var call = requireFunctionCall();
+  	var isObject = requireIsObject();
+  	var isSymbol = requireIsSymbol();
+  	var getMethod = requireGetMethod();
+  	var ordinaryToPrimitive = requireOrdinaryToPrimitive();
+  	var wellKnownSymbol = requireWellKnownSymbol();
 
-  var DESCRIPTORS$9 = descriptors;
-  var call$8 = functionCall;
-  var propertyIsEnumerableModule$1 = objectPropertyIsEnumerable;
-  var createPropertyDescriptor$2 = createPropertyDescriptor$3;
-  var toIndexedObject$5 = toIndexedObject$6;
-  var toPropertyKey$1 = toPropertyKey$2;
-  var hasOwn$7 = hasOwnProperty_1;
-  var IE8_DOM_DEFINE$1 = ie8DomDefine;
+  	var $TypeError = TypeError;
+  	var TO_PRIMITIVE = wellKnownSymbol('toPrimitive');
 
-  // eslint-disable-next-line es/no-object-getownpropertydescriptor -- safe
-  var $getOwnPropertyDescriptor$1 = Object.getOwnPropertyDescriptor;
+  	// `ToPrimitive` abstract operation
+  	// https://tc39.es/ecma262/#sec-toprimitive
+  	toPrimitive = function (input, pref) {
+  	  if (!isObject(input) || isSymbol(input)) return input;
+  	  var exoticToPrim = getMethod(input, TO_PRIMITIVE);
+  	  var result;
+  	  if (exoticToPrim) {
+  	    if (pref === undefined) pref = 'default';
+  	    result = call(exoticToPrim, input, pref);
+  	    if (!isObject(result) || isSymbol(result)) return result;
+  	    throw new $TypeError("Can't convert object to primitive value");
+  	  }
+  	  if (pref === undefined) pref = 'number';
+  	  return ordinaryToPrimitive(input, pref);
+  	};
+  	return toPrimitive;
+  }
 
-  // `Object.getOwnPropertyDescriptor` method
-  // https://tc39.es/ecma262/#sec-object.getownpropertydescriptor
-  objectGetOwnPropertyDescriptor.f = DESCRIPTORS$9 ? $getOwnPropertyDescriptor$1 : function getOwnPropertyDescriptor(O, P) {
-    O = toIndexedObject$5(O);
-    P = toPropertyKey$1(P);
-    if (IE8_DOM_DEFINE$1) try {
-      return $getOwnPropertyDescriptor$1(O, P);
-    } catch (error) { /* empty */ }
-    if (hasOwn$7(O, P)) return createPropertyDescriptor$2(!call$8(propertyIsEnumerableModule$1.f, O, P), O[P]);
-  };
+  var toPropertyKey;
+  var hasRequiredToPropertyKey;
+
+  function requireToPropertyKey () {
+  	if (hasRequiredToPropertyKey) return toPropertyKey;
+  	hasRequiredToPropertyKey = 1;
+  	var toPrimitive = requireToPrimitive();
+  	var isSymbol = requireIsSymbol();
+
+  	// `ToPropertyKey` abstract operation
+  	// https://tc39.es/ecma262/#sec-topropertykey
+  	toPropertyKey = function (argument) {
+  	  var key = toPrimitive(argument, 'string');
+  	  return isSymbol(key) ? key : key + '';
+  	};
+  	return toPropertyKey;
+  }
+
+  var documentCreateElement;
+  var hasRequiredDocumentCreateElement;
+
+  function requireDocumentCreateElement () {
+  	if (hasRequiredDocumentCreateElement) return documentCreateElement;
+  	hasRequiredDocumentCreateElement = 1;
+  	var globalThis = requireGlobalThis();
+  	var isObject = requireIsObject();
+
+  	var document = globalThis.document;
+  	// typeof document.createElement is 'object' in old IE
+  	var EXISTS = isObject(document) && isObject(document.createElement);
+
+  	documentCreateElement = function (it) {
+  	  return EXISTS ? document.createElement(it) : {};
+  	};
+  	return documentCreateElement;
+  }
+
+  var ie8DomDefine;
+  var hasRequiredIe8DomDefine;
+
+  function requireIe8DomDefine () {
+  	if (hasRequiredIe8DomDefine) return ie8DomDefine;
+  	hasRequiredIe8DomDefine = 1;
+  	var DESCRIPTORS = requireDescriptors();
+  	var fails = requireFails();
+  	var createElement = requireDocumentCreateElement();
+
+  	// Thanks to IE8 for its funny defineProperty
+  	ie8DomDefine = !DESCRIPTORS && !fails(function () {
+  	  // eslint-disable-next-line es/no-object-defineproperty -- required for testing
+  	  return Object.defineProperty(createElement('div'), 'a', {
+  	    get: function () { return 7; }
+  	  }).a !== 7;
+  	});
+  	return ie8DomDefine;
+  }
+
+  var hasRequiredObjectGetOwnPropertyDescriptor;
+
+  function requireObjectGetOwnPropertyDescriptor () {
+  	if (hasRequiredObjectGetOwnPropertyDescriptor) return objectGetOwnPropertyDescriptor;
+  	hasRequiredObjectGetOwnPropertyDescriptor = 1;
+  	var DESCRIPTORS = requireDescriptors();
+  	var call = requireFunctionCall();
+  	var propertyIsEnumerableModule = requireObjectPropertyIsEnumerable();
+  	var createPropertyDescriptor = requireCreatePropertyDescriptor();
+  	var toIndexedObject = requireToIndexedObject();
+  	var toPropertyKey = requireToPropertyKey();
+  	var hasOwn = requireHasOwnProperty();
+  	var IE8_DOM_DEFINE = requireIe8DomDefine();
+
+  	// eslint-disable-next-line es/no-object-getownpropertydescriptor -- safe
+  	var $getOwnPropertyDescriptor = Object.getOwnPropertyDescriptor;
+
+  	// `Object.getOwnPropertyDescriptor` method
+  	// https://tc39.es/ecma262/#sec-object.getownpropertydescriptor
+  	objectGetOwnPropertyDescriptor.f = DESCRIPTORS ? $getOwnPropertyDescriptor : function getOwnPropertyDescriptor(O, P) {
+  	  O = toIndexedObject(O);
+  	  P = toPropertyKey(P);
+  	  if (IE8_DOM_DEFINE) try {
+  	    return $getOwnPropertyDescriptor(O, P);
+  	  } catch (error) { /* empty */ }
+  	  if (hasOwn(O, P)) return createPropertyDescriptor(!call(propertyIsEnumerableModule.f, O, P), O[P]);
+  	};
+  	return objectGetOwnPropertyDescriptor;
+  }
 
   var objectDefineProperty = {};
 
-  var DESCRIPTORS$8 = descriptors;
-  var fails$i = fails$o;
+  var v8PrototypeDefineBug;
+  var hasRequiredV8PrototypeDefineBug;
 
-  // V8 ~ Chrome 36-
-  // https://bugs.chromium.org/p/v8/issues/detail?id=3334
-  var v8PrototypeDefineBug = DESCRIPTORS$8 && fails$i(function () {
-    // eslint-disable-next-line es/no-object-defineproperty -- required for testing
-    return Object.defineProperty(function () { /* empty */ }, 'prototype', {
-      value: 42,
-      writable: false
-    }).prototype !== 42;
-  });
+  function requireV8PrototypeDefineBug () {
+  	if (hasRequiredV8PrototypeDefineBug) return v8PrototypeDefineBug;
+  	hasRequiredV8PrototypeDefineBug = 1;
+  	var DESCRIPTORS = requireDescriptors();
+  	var fails = requireFails();
 
-  var isObject$4 = isObject$8;
-
-  var $String$2 = String;
-  var $TypeError$4 = TypeError;
-
-  // `Assert: Type(argument) is Object`
-  var anObject$9 = function (argument) {
-    if (isObject$4(argument)) return argument;
-    throw new $TypeError$4($String$2(argument) + ' is not an object');
-  };
-
-  var DESCRIPTORS$7 = descriptors;
-  var IE8_DOM_DEFINE = ie8DomDefine;
-  var V8_PROTOTYPE_DEFINE_BUG$1 = v8PrototypeDefineBug;
-  var anObject$8 = anObject$9;
-  var toPropertyKey = toPropertyKey$2;
-
-  var $TypeError$3 = TypeError;
-  // eslint-disable-next-line es/no-object-defineproperty -- safe
-  var $defineProperty = Object.defineProperty;
-  // eslint-disable-next-line es/no-object-getownpropertydescriptor -- safe
-  var $getOwnPropertyDescriptor = Object.getOwnPropertyDescriptor;
-  var ENUMERABLE = 'enumerable';
-  var CONFIGURABLE$1 = 'configurable';
-  var WRITABLE = 'writable';
-
-  // `Object.defineProperty` method
-  // https://tc39.es/ecma262/#sec-object.defineproperty
-  objectDefineProperty.f = DESCRIPTORS$7 ? V8_PROTOTYPE_DEFINE_BUG$1 ? function defineProperty(O, P, Attributes) {
-    anObject$8(O);
-    P = toPropertyKey(P);
-    anObject$8(Attributes);
-    if (typeof O === 'function' && P === 'prototype' && 'value' in Attributes && WRITABLE in Attributes && !Attributes[WRITABLE]) {
-      var current = $getOwnPropertyDescriptor(O, P);
-      if (current && current[WRITABLE]) {
-        O[P] = Attributes.value;
-        Attributes = {
-          configurable: CONFIGURABLE$1 in Attributes ? Attributes[CONFIGURABLE$1] : current[CONFIGURABLE$1],
-          enumerable: ENUMERABLE in Attributes ? Attributes[ENUMERABLE] : current[ENUMERABLE],
-          writable: false
-        };
-      }
-    } return $defineProperty(O, P, Attributes);
-  } : $defineProperty : function defineProperty(O, P, Attributes) {
-    anObject$8(O);
-    P = toPropertyKey(P);
-    anObject$8(Attributes);
-    if (IE8_DOM_DEFINE) try {
-      return $defineProperty(O, P, Attributes);
-    } catch (error) { /* empty */ }
-    if ('get' in Attributes || 'set' in Attributes) throw new $TypeError$3('Accessors not supported');
-    if ('value' in Attributes) O[P] = Attributes.value;
-    return O;
-  };
-
-  var DESCRIPTORS$6 = descriptors;
-  var definePropertyModule$4 = objectDefineProperty;
-  var createPropertyDescriptor$1 = createPropertyDescriptor$3;
-
-  var createNonEnumerableProperty$4 = DESCRIPTORS$6 ? function (object, key, value) {
-    return definePropertyModule$4.f(object, key, createPropertyDescriptor$1(1, value));
-  } : function (object, key, value) {
-    object[key] = value;
-    return object;
-  };
-
-  var makeBuiltIn$2 = {exports: {}};
-
-  var DESCRIPTORS$5 = descriptors;
-  var hasOwn$6 = hasOwnProperty_1;
-
-  var FunctionPrototype$1 = Function.prototype;
-  // eslint-disable-next-line es/no-object-getownpropertydescriptor -- safe
-  var getDescriptor = DESCRIPTORS$5 && Object.getOwnPropertyDescriptor;
-
-  var EXISTS = hasOwn$6(FunctionPrototype$1, 'name');
-  // additional protection from minified / mangled / dropped function names
-  var PROPER = EXISTS && (function something() { /* empty */ }).name === 'something';
-  var CONFIGURABLE = EXISTS && (!DESCRIPTORS$5 || (DESCRIPTORS$5 && getDescriptor(FunctionPrototype$1, 'name').configurable));
-
-  var functionName = {
-    EXISTS: EXISTS,
-    PROPER: PROPER,
-    CONFIGURABLE: CONFIGURABLE
-  };
-
-  var uncurryThis$f = functionUncurryThis;
-  var isCallable$9 = isCallable$f;
-  var store$1 = sharedStoreExports;
-
-  var functionToString = uncurryThis$f(Function.toString);
-
-  // this helper broken in `core-js@3.4.1-3.4.4`, so we can't use `shared` helper
-  if (!isCallable$9(store$1.inspectSource)) {
-    store$1.inspectSource = function (it) {
-      return functionToString(it);
-    };
+  	// V8 ~ Chrome 36-
+  	// https://bugs.chromium.org/p/v8/issues/detail?id=3334
+  	v8PrototypeDefineBug = DESCRIPTORS && fails(function () {
+  	  // eslint-disable-next-line es/no-object-defineproperty -- required for testing
+  	  return Object.defineProperty(function () { /* empty */ }, 'prototype', {
+  	    value: 42,
+  	    writable: false
+  	  }).prototype !== 42;
+  	});
+  	return v8PrototypeDefineBug;
   }
 
-  var inspectSource$2 = store$1.inspectSource;
+  var anObject;
+  var hasRequiredAnObject;
 
-  var global$7 = global$e;
-  var isCallable$8 = isCallable$f;
+  function requireAnObject () {
+  	if (hasRequiredAnObject) return anObject;
+  	hasRequiredAnObject = 1;
+  	var isObject = requireIsObject();
 
-  var WeakMap$1 = global$7.WeakMap;
+  	var $String = String;
+  	var $TypeError = TypeError;
 
-  var weakMapBasicDetection = isCallable$8(WeakMap$1) && /native code/.test(String(WeakMap$1));
-
-  var shared$2 = shared$4;
-  var uid = uid$2;
-
-  var keys = shared$2('keys');
-
-  var sharedKey$3 = function (key) {
-    return keys[key] || (keys[key] = uid(key));
-  };
-
-  var hiddenKeys$4 = {};
-
-  var NATIVE_WEAK_MAP = weakMapBasicDetection;
-  var global$6 = global$e;
-  var isObject$3 = isObject$8;
-  var createNonEnumerableProperty$3 = createNonEnumerableProperty$4;
-  var hasOwn$5 = hasOwnProperty_1;
-  var shared$1 = sharedStoreExports;
-  var sharedKey$2 = sharedKey$3;
-  var hiddenKeys$3 = hiddenKeys$4;
-
-  var OBJECT_ALREADY_INITIALIZED = 'Object already initialized';
-  var TypeError$1 = global$6.TypeError;
-  var WeakMap = global$6.WeakMap;
-  var set, get, has;
-
-  var enforce = function (it) {
-    return has(it) ? get(it) : set(it, {});
-  };
-
-  var getterFor = function (TYPE) {
-    return function (it) {
-      var state;
-      if (!isObject$3(it) || (state = get(it)).type !== TYPE) {
-        throw new TypeError$1('Incompatible receiver, ' + TYPE + ' required');
-      } return state;
-    };
-  };
-
-  if (NATIVE_WEAK_MAP || shared$1.state) {
-    var store = shared$1.state || (shared$1.state = new WeakMap());
-    /* eslint-disable no-self-assign -- prototype methods protection */
-    store.get = store.get;
-    store.has = store.has;
-    store.set = store.set;
-    /* eslint-enable no-self-assign -- prototype methods protection */
-    set = function (it, metadata) {
-      if (store.has(it)) throw new TypeError$1(OBJECT_ALREADY_INITIALIZED);
-      metadata.facade = it;
-      store.set(it, metadata);
-      return metadata;
-    };
-    get = function (it) {
-      return store.get(it) || {};
-    };
-    has = function (it) {
-      return store.has(it);
-    };
-  } else {
-    var STATE = sharedKey$2('state');
-    hiddenKeys$3[STATE] = true;
-    set = function (it, metadata) {
-      if (hasOwn$5(it, STATE)) throw new TypeError$1(OBJECT_ALREADY_INITIALIZED);
-      metadata.facade = it;
-      createNonEnumerableProperty$3(it, STATE, metadata);
-      return metadata;
-    };
-    get = function (it) {
-      return hasOwn$5(it, STATE) ? it[STATE] : {};
-    };
-    has = function (it) {
-      return hasOwn$5(it, STATE);
-    };
+  	// `Assert: Type(argument) is Object`
+  	anObject = function (argument) {
+  	  if (isObject(argument)) return argument;
+  	  throw new $TypeError($String(argument) + ' is not an object');
+  	};
+  	return anObject;
   }
 
-  var internalState = {
-    set: set,
-    get: get,
-    has: has,
-    enforce: enforce,
-    getterFor: getterFor
-  };
+  var hasRequiredObjectDefineProperty;
 
-  var uncurryThis$e = functionUncurryThis;
-  var fails$h = fails$o;
-  var isCallable$7 = isCallable$f;
-  var hasOwn$4 = hasOwnProperty_1;
-  var DESCRIPTORS$4 = descriptors;
-  var CONFIGURABLE_FUNCTION_NAME = functionName.CONFIGURABLE;
-  var inspectSource$1 = inspectSource$2;
-  var InternalStateModule = internalState;
+  function requireObjectDefineProperty () {
+  	if (hasRequiredObjectDefineProperty) return objectDefineProperty;
+  	hasRequiredObjectDefineProperty = 1;
+  	var DESCRIPTORS = requireDescriptors();
+  	var IE8_DOM_DEFINE = requireIe8DomDefine();
+  	var V8_PROTOTYPE_DEFINE_BUG = requireV8PrototypeDefineBug();
+  	var anObject = requireAnObject();
+  	var toPropertyKey = requireToPropertyKey();
 
-  var enforceInternalState = InternalStateModule.enforce;
-  var getInternalState$1 = InternalStateModule.get;
-  var $String$1 = String;
-  // eslint-disable-next-line es/no-object-defineproperty -- safe
-  var defineProperty$2 = Object.defineProperty;
-  var stringSlice$4 = uncurryThis$e(''.slice);
-  var replace$2 = uncurryThis$e(''.replace);
-  var join = uncurryThis$e([].join);
+  	var $TypeError = TypeError;
+  	// eslint-disable-next-line es/no-object-defineproperty -- safe
+  	var $defineProperty = Object.defineProperty;
+  	// eslint-disable-next-line es/no-object-getownpropertydescriptor -- safe
+  	var $getOwnPropertyDescriptor = Object.getOwnPropertyDescriptor;
+  	var ENUMERABLE = 'enumerable';
+  	var CONFIGURABLE = 'configurable';
+  	var WRITABLE = 'writable';
 
-  var CONFIGURABLE_LENGTH = DESCRIPTORS$4 && !fails$h(function () {
-    return defineProperty$2(function () { /* empty */ }, 'length', { value: 8 }).length !== 8;
-  });
+  	// `Object.defineProperty` method
+  	// https://tc39.es/ecma262/#sec-object.defineproperty
+  	objectDefineProperty.f = DESCRIPTORS ? V8_PROTOTYPE_DEFINE_BUG ? function defineProperty(O, P, Attributes) {
+  	  anObject(O);
+  	  P = toPropertyKey(P);
+  	  anObject(Attributes);
+  	  if (typeof O === 'function' && P === 'prototype' && 'value' in Attributes && WRITABLE in Attributes && !Attributes[WRITABLE]) {
+  	    var current = $getOwnPropertyDescriptor(O, P);
+  	    if (current && current[WRITABLE]) {
+  	      O[P] = Attributes.value;
+  	      Attributes = {
+  	        configurable: CONFIGURABLE in Attributes ? Attributes[CONFIGURABLE] : current[CONFIGURABLE],
+  	        enumerable: ENUMERABLE in Attributes ? Attributes[ENUMERABLE] : current[ENUMERABLE],
+  	        writable: false
+  	      };
+  	    }
+  	  } return $defineProperty(O, P, Attributes);
+  	} : $defineProperty : function defineProperty(O, P, Attributes) {
+  	  anObject(O);
+  	  P = toPropertyKey(P);
+  	  anObject(Attributes);
+  	  if (IE8_DOM_DEFINE) try {
+  	    return $defineProperty(O, P, Attributes);
+  	  } catch (error) { /* empty */ }
+  	  if ('get' in Attributes || 'set' in Attributes) throw new $TypeError('Accessors not supported');
+  	  if ('value' in Attributes) O[P] = Attributes.value;
+  	  return O;
+  	};
+  	return objectDefineProperty;
+  }
 
-  var TEMPLATE = String(String).split('String');
+  var createNonEnumerableProperty;
+  var hasRequiredCreateNonEnumerableProperty;
 
-  var makeBuiltIn$1 = makeBuiltIn$2.exports = function (value, name, options) {
-    if (stringSlice$4($String$1(name), 0, 7) === 'Symbol(') {
-      name = '[' + replace$2($String$1(name), /^Symbol\(([^)]*)\).*$/, '$1') + ']';
-    }
-    if (options && options.getter) name = 'get ' + name;
-    if (options && options.setter) name = 'set ' + name;
-    if (!hasOwn$4(value, 'name') || (CONFIGURABLE_FUNCTION_NAME && value.name !== name)) {
-      if (DESCRIPTORS$4) defineProperty$2(value, 'name', { value: name, configurable: true });
-      else value.name = name;
-    }
-    if (CONFIGURABLE_LENGTH && options && hasOwn$4(options, 'arity') && value.length !== options.arity) {
-      defineProperty$2(value, 'length', { value: options.arity });
-    }
-    try {
-      if (options && hasOwn$4(options, 'constructor') && options.constructor) {
-        if (DESCRIPTORS$4) defineProperty$2(value, 'prototype', { writable: false });
-      // in V8 ~ Chrome 53, prototypes of some methods, like `Array.prototype.values`, are non-writable
-      } else if (value.prototype) value.prototype = undefined;
-    } catch (error) { /* empty */ }
-    var state = enforceInternalState(value);
-    if (!hasOwn$4(state, 'source')) {
-      state.source = join(TEMPLATE, typeof name == 'string' ? name : '');
-    } return value;
-  };
+  function requireCreateNonEnumerableProperty () {
+  	if (hasRequiredCreateNonEnumerableProperty) return createNonEnumerableProperty;
+  	hasRequiredCreateNonEnumerableProperty = 1;
+  	var DESCRIPTORS = requireDescriptors();
+  	var definePropertyModule = requireObjectDefineProperty();
+  	var createPropertyDescriptor = requireCreatePropertyDescriptor();
 
-  // add fake Function#toString for correct work wrapped methods / constructors with methods like LoDash isNative
-  // eslint-disable-next-line no-extend-native -- required
-  Function.prototype.toString = makeBuiltIn$1(function toString() {
-    return isCallable$7(this) && getInternalState$1(this).source || inspectSource$1(this);
-  }, 'toString');
+  	createNonEnumerableProperty = DESCRIPTORS ? function (object, key, value) {
+  	  return definePropertyModule.f(object, key, createPropertyDescriptor(1, value));
+  	} : function (object, key, value) {
+  	  object[key] = value;
+  	  return object;
+  	};
+  	return createNonEnumerableProperty;
+  }
 
-  var makeBuiltInExports = makeBuiltIn$2.exports;
+  var makeBuiltIn = {exports: {}};
 
-  var isCallable$6 = isCallable$f;
-  var definePropertyModule$3 = objectDefineProperty;
-  var makeBuiltIn = makeBuiltInExports;
-  var defineGlobalProperty$1 = defineGlobalProperty$3;
+  var functionName;
+  var hasRequiredFunctionName;
 
-  var defineBuiltIn$4 = function (O, key, value, options) {
-    if (!options) options = {};
-    var simple = options.enumerable;
-    var name = options.name !== undefined ? options.name : key;
-    if (isCallable$6(value)) makeBuiltIn(value, name, options);
-    if (options.global) {
-      if (simple) O[key] = value;
-      else defineGlobalProperty$1(key, value);
-    } else {
-      try {
-        if (!options.unsafe) delete O[key];
-        else if (O[key]) simple = true;
-      } catch (error) { /* empty */ }
-      if (simple) O[key] = value;
-      else definePropertyModule$3.f(O, key, {
-        value: value,
-        enumerable: false,
-        configurable: !options.nonConfigurable,
-        writable: !options.nonWritable
-      });
-    } return O;
-  };
+  function requireFunctionName () {
+  	if (hasRequiredFunctionName) return functionName;
+  	hasRequiredFunctionName = 1;
+  	var DESCRIPTORS = requireDescriptors();
+  	var hasOwn = requireHasOwnProperty();
+
+  	var FunctionPrototype = Function.prototype;
+  	// eslint-disable-next-line es/no-object-getownpropertydescriptor -- safe
+  	var getDescriptor = DESCRIPTORS && Object.getOwnPropertyDescriptor;
+
+  	var EXISTS = hasOwn(FunctionPrototype, 'name');
+  	// additional protection from minified / mangled / dropped function names
+  	var PROPER = EXISTS && (function something() { /* empty */ }).name === 'something';
+  	var CONFIGURABLE = EXISTS && (!DESCRIPTORS || (DESCRIPTORS && getDescriptor(FunctionPrototype, 'name').configurable));
+
+  	functionName = {
+  	  EXISTS: EXISTS,
+  	  PROPER: PROPER,
+  	  CONFIGURABLE: CONFIGURABLE
+  	};
+  	return functionName;
+  }
+
+  var inspectSource;
+  var hasRequiredInspectSource;
+
+  function requireInspectSource () {
+  	if (hasRequiredInspectSource) return inspectSource;
+  	hasRequiredInspectSource = 1;
+  	var uncurryThis = requireFunctionUncurryThis();
+  	var isCallable = requireIsCallable();
+  	var store = requireSharedStore();
+
+  	var functionToString = uncurryThis(Function.toString);
+
+  	// this helper broken in `core-js@3.4.1-3.4.4`, so we can't use `shared` helper
+  	if (!isCallable(store.inspectSource)) {
+  	  store.inspectSource = function (it) {
+  	    return functionToString(it);
+  	  };
+  	}
+
+  	inspectSource = store.inspectSource;
+  	return inspectSource;
+  }
+
+  var weakMapBasicDetection;
+  var hasRequiredWeakMapBasicDetection;
+
+  function requireWeakMapBasicDetection () {
+  	if (hasRequiredWeakMapBasicDetection) return weakMapBasicDetection;
+  	hasRequiredWeakMapBasicDetection = 1;
+  	var globalThis = requireGlobalThis();
+  	var isCallable = requireIsCallable();
+
+  	var WeakMap = globalThis.WeakMap;
+
+  	weakMapBasicDetection = isCallable(WeakMap) && /native code/.test(String(WeakMap));
+  	return weakMapBasicDetection;
+  }
+
+  var sharedKey;
+  var hasRequiredSharedKey;
+
+  function requireSharedKey () {
+  	if (hasRequiredSharedKey) return sharedKey;
+  	hasRequiredSharedKey = 1;
+  	var shared = requireShared();
+  	var uid = requireUid();
+
+  	var keys = shared('keys');
+
+  	sharedKey = function (key) {
+  	  return keys[key] || (keys[key] = uid(key));
+  	};
+  	return sharedKey;
+  }
+
+  var hiddenKeys;
+  var hasRequiredHiddenKeys;
+
+  function requireHiddenKeys () {
+  	if (hasRequiredHiddenKeys) return hiddenKeys;
+  	hasRequiredHiddenKeys = 1;
+  	hiddenKeys = {};
+  	return hiddenKeys;
+  }
+
+  var internalState;
+  var hasRequiredInternalState;
+
+  function requireInternalState () {
+  	if (hasRequiredInternalState) return internalState;
+  	hasRequiredInternalState = 1;
+  	var NATIVE_WEAK_MAP = requireWeakMapBasicDetection();
+  	var globalThis = requireGlobalThis();
+  	var isObject = requireIsObject();
+  	var createNonEnumerableProperty = requireCreateNonEnumerableProperty();
+  	var hasOwn = requireHasOwnProperty();
+  	var shared = requireSharedStore();
+  	var sharedKey = requireSharedKey();
+  	var hiddenKeys = requireHiddenKeys();
+
+  	var OBJECT_ALREADY_INITIALIZED = 'Object already initialized';
+  	var TypeError = globalThis.TypeError;
+  	var WeakMap = globalThis.WeakMap;
+  	var set, get, has;
+
+  	var enforce = function (it) {
+  	  return has(it) ? get(it) : set(it, {});
+  	};
+
+  	var getterFor = function (TYPE) {
+  	  return function (it) {
+  	    var state;
+  	    if (!isObject(it) || (state = get(it)).type !== TYPE) {
+  	      throw new TypeError('Incompatible receiver, ' + TYPE + ' required');
+  	    } return state;
+  	  };
+  	};
+
+  	if (NATIVE_WEAK_MAP || shared.state) {
+  	  var store = shared.state || (shared.state = new WeakMap());
+  	  /* eslint-disable no-self-assign -- prototype methods protection */
+  	  store.get = store.get;
+  	  store.has = store.has;
+  	  store.set = store.set;
+  	  /* eslint-enable no-self-assign -- prototype methods protection */
+  	  set = function (it, metadata) {
+  	    if (store.has(it)) throw new TypeError(OBJECT_ALREADY_INITIALIZED);
+  	    metadata.facade = it;
+  	    store.set(it, metadata);
+  	    return metadata;
+  	  };
+  	  get = function (it) {
+  	    return store.get(it) || {};
+  	  };
+  	  has = function (it) {
+  	    return store.has(it);
+  	  };
+  	} else {
+  	  var STATE = sharedKey('state');
+  	  hiddenKeys[STATE] = true;
+  	  set = function (it, metadata) {
+  	    if (hasOwn(it, STATE)) throw new TypeError(OBJECT_ALREADY_INITIALIZED);
+  	    metadata.facade = it;
+  	    createNonEnumerableProperty(it, STATE, metadata);
+  	    return metadata;
+  	  };
+  	  get = function (it) {
+  	    return hasOwn(it, STATE) ? it[STATE] : {};
+  	  };
+  	  has = function (it) {
+  	    return hasOwn(it, STATE);
+  	  };
+  	}
+
+  	internalState = {
+  	  set: set,
+  	  get: get,
+  	  has: has,
+  	  enforce: enforce,
+  	  getterFor: getterFor
+  	};
+  	return internalState;
+  }
+
+  var hasRequiredMakeBuiltIn;
+
+  function requireMakeBuiltIn () {
+  	if (hasRequiredMakeBuiltIn) return makeBuiltIn.exports;
+  	hasRequiredMakeBuiltIn = 1;
+  	var uncurryThis = requireFunctionUncurryThis();
+  	var fails = requireFails();
+  	var isCallable = requireIsCallable();
+  	var hasOwn = requireHasOwnProperty();
+  	var DESCRIPTORS = requireDescriptors();
+  	var CONFIGURABLE_FUNCTION_NAME = requireFunctionName().CONFIGURABLE;
+  	var inspectSource = requireInspectSource();
+  	var InternalStateModule = requireInternalState();
+
+  	var enforceInternalState = InternalStateModule.enforce;
+  	var getInternalState = InternalStateModule.get;
+  	var $String = String;
+  	// eslint-disable-next-line es/no-object-defineproperty -- safe
+  	var defineProperty = Object.defineProperty;
+  	var stringSlice = uncurryThis(''.slice);
+  	var replace = uncurryThis(''.replace);
+  	var join = uncurryThis([].join);
+
+  	var CONFIGURABLE_LENGTH = DESCRIPTORS && !fails(function () {
+  	  return defineProperty(function () { /* empty */ }, 'length', { value: 8 }).length !== 8;
+  	});
+
+  	var TEMPLATE = String(String).split('String');
+
+  	var makeBuiltIn$1 = makeBuiltIn.exports = function (value, name, options) {
+  	  if (stringSlice($String(name), 0, 7) === 'Symbol(') {
+  	    name = '[' + replace($String(name), /^Symbol\(([^)]*)\).*$/, '$1') + ']';
+  	  }
+  	  if (options && options.getter) name = 'get ' + name;
+  	  if (options && options.setter) name = 'set ' + name;
+  	  if (!hasOwn(value, 'name') || (CONFIGURABLE_FUNCTION_NAME && value.name !== name)) {
+  	    if (DESCRIPTORS) defineProperty(value, 'name', { value: name, configurable: true });
+  	    else value.name = name;
+  	  }
+  	  if (CONFIGURABLE_LENGTH && options && hasOwn(options, 'arity') && value.length !== options.arity) {
+  	    defineProperty(value, 'length', { value: options.arity });
+  	  }
+  	  try {
+  	    if (options && hasOwn(options, 'constructor') && options.constructor) {
+  	      if (DESCRIPTORS) defineProperty(value, 'prototype', { writable: false });
+  	    // in V8 ~ Chrome 53, prototypes of some methods, like `Array.prototype.values`, are non-writable
+  	    } else if (value.prototype) value.prototype = undefined;
+  	  } catch (error) { /* empty */ }
+  	  var state = enforceInternalState(value);
+  	  if (!hasOwn(state, 'source')) {
+  	    state.source = join(TEMPLATE, typeof name == 'string' ? name : '');
+  	  } return value;
+  	};
+
+  	// add fake Function#toString for correct work wrapped methods / constructors with methods like LoDash isNative
+  	// eslint-disable-next-line no-extend-native -- required
+  	Function.prototype.toString = makeBuiltIn$1(function toString() {
+  	  return isCallable(this) && getInternalState(this).source || inspectSource(this);
+  	}, 'toString');
+  	return makeBuiltIn.exports;
+  }
+
+  var defineBuiltIn;
+  var hasRequiredDefineBuiltIn;
+
+  function requireDefineBuiltIn () {
+  	if (hasRequiredDefineBuiltIn) return defineBuiltIn;
+  	hasRequiredDefineBuiltIn = 1;
+  	var isCallable = requireIsCallable();
+  	var definePropertyModule = requireObjectDefineProperty();
+  	var makeBuiltIn = requireMakeBuiltIn();
+  	var defineGlobalProperty = requireDefineGlobalProperty();
+
+  	defineBuiltIn = function (O, key, value, options) {
+  	  if (!options) options = {};
+  	  var simple = options.enumerable;
+  	  var name = options.name !== undefined ? options.name : key;
+  	  if (isCallable(value)) makeBuiltIn(value, name, options);
+  	  if (options.global) {
+  	    if (simple) O[key] = value;
+  	    else defineGlobalProperty(key, value);
+  	  } else {
+  	    try {
+  	      if (!options.unsafe) delete O[key];
+  	      else if (O[key]) simple = true;
+  	    } catch (error) { /* empty */ }
+  	    if (simple) O[key] = value;
+  	    else definePropertyModule.f(O, key, {
+  	      value: value,
+  	      enumerable: false,
+  	      configurable: !options.nonConfigurable,
+  	      writable: !options.nonWritable
+  	    });
+  	  } return O;
+  	};
+  	return defineBuiltIn;
+  }
 
   var objectGetOwnPropertyNames = {};
 
-  var ceil = Math.ceil;
-  var floor$1 = Math.floor;
+  var mathTrunc;
+  var hasRequiredMathTrunc;
 
-  // `Math.trunc` method
-  // https://tc39.es/ecma262/#sec-math.trunc
-  // eslint-disable-next-line es/no-math-trunc -- safe
-  var mathTrunc = Math.trunc || function trunc(x) {
-    var n = +x;
-    return (n > 0 ? floor$1 : ceil)(n);
-  };
+  function requireMathTrunc () {
+  	if (hasRequiredMathTrunc) return mathTrunc;
+  	hasRequiredMathTrunc = 1;
+  	var ceil = Math.ceil;
+  	var floor = Math.floor;
 
-  var trunc = mathTrunc;
+  	// `Math.trunc` method
+  	// https://tc39.es/ecma262/#sec-math.trunc
+  	// eslint-disable-next-line es/no-math-trunc -- safe
+  	mathTrunc = Math.trunc || function trunc(x) {
+  	  var n = +x;
+  	  return (n > 0 ? floor : ceil)(n);
+  	};
+  	return mathTrunc;
+  }
 
-  // `ToIntegerOrInfinity` abstract operation
-  // https://tc39.es/ecma262/#sec-tointegerorinfinity
-  var toIntegerOrInfinity$4 = function (argument) {
-    var number = +argument;
-    // eslint-disable-next-line no-self-compare -- NaN check
-    return number !== number || number === 0 ? 0 : trunc(number);
-  };
+  var toIntegerOrInfinity;
+  var hasRequiredToIntegerOrInfinity;
 
-  var toIntegerOrInfinity$3 = toIntegerOrInfinity$4;
+  function requireToIntegerOrInfinity () {
+  	if (hasRequiredToIntegerOrInfinity) return toIntegerOrInfinity;
+  	hasRequiredToIntegerOrInfinity = 1;
+  	var trunc = requireMathTrunc();
 
-  var max$1 = Math.max;
-  var min$2 = Math.min;
+  	// `ToIntegerOrInfinity` abstract operation
+  	// https://tc39.es/ecma262/#sec-tointegerorinfinity
+  	toIntegerOrInfinity = function (argument) {
+  	  var number = +argument;
+  	  // eslint-disable-next-line no-self-compare -- NaN check
+  	  return number !== number || number === 0 ? 0 : trunc(number);
+  	};
+  	return toIntegerOrInfinity;
+  }
 
-  // Helper for a popular repeating case of the spec:
-  // Let integer be ? ToInteger(index).
-  // If integer < 0, let result be max((length + integer), 0); else let result be min(integer, length).
-  var toAbsoluteIndex$1 = function (index, length) {
-    var integer = toIntegerOrInfinity$3(index);
-    return integer < 0 ? max$1(integer + length, 0) : min$2(integer, length);
-  };
+  var toAbsoluteIndex;
+  var hasRequiredToAbsoluteIndex;
 
-  var toIntegerOrInfinity$2 = toIntegerOrInfinity$4;
+  function requireToAbsoluteIndex () {
+  	if (hasRequiredToAbsoluteIndex) return toAbsoluteIndex;
+  	hasRequiredToAbsoluteIndex = 1;
+  	var toIntegerOrInfinity = requireToIntegerOrInfinity();
 
-  var min$1 = Math.min;
+  	var max = Math.max;
+  	var min = Math.min;
 
-  // `ToLength` abstract operation
-  // https://tc39.es/ecma262/#sec-tolength
-  var toLength$2 = function (argument) {
-    var len = toIntegerOrInfinity$2(argument);
-    return len > 0 ? min$1(len, 0x1FFFFFFFFFFFFF) : 0; // 2 ** 53 - 1 == 9007199254740991
-  };
+  	// Helper for a popular repeating case of the spec:
+  	// Let integer be ? ToInteger(index).
+  	// If integer < 0, let result be max((length + integer), 0); else let result be min(integer, length).
+  	toAbsoluteIndex = function (index, length) {
+  	  var integer = toIntegerOrInfinity(index);
+  	  return integer < 0 ? max(integer + length, 0) : min(integer, length);
+  	};
+  	return toAbsoluteIndex;
+  }
 
-  var toLength$1 = toLength$2;
+  var toLength;
+  var hasRequiredToLength;
 
-  // `LengthOfArrayLike` abstract operation
-  // https://tc39.es/ecma262/#sec-lengthofarraylike
-  var lengthOfArrayLike$3 = function (obj) {
-    return toLength$1(obj.length);
-  };
+  function requireToLength () {
+  	if (hasRequiredToLength) return toLength;
+  	hasRequiredToLength = 1;
+  	var toIntegerOrInfinity = requireToIntegerOrInfinity();
 
-  var toIndexedObject$4 = toIndexedObject$6;
-  var toAbsoluteIndex = toAbsoluteIndex$1;
-  var lengthOfArrayLike$2 = lengthOfArrayLike$3;
+  	var min = Math.min;
 
-  // `Array.prototype.{ indexOf, includes }` methods implementation
-  var createMethod$3 = function (IS_INCLUDES) {
-    return function ($this, el, fromIndex) {
-      var O = toIndexedObject$4($this);
-      var length = lengthOfArrayLike$2(O);
-      if (length === 0) return !IS_INCLUDES && -1;
-      var index = toAbsoluteIndex(fromIndex, length);
-      var value;
-      // Array#includes uses SameValueZero equality algorithm
-      // eslint-disable-next-line no-self-compare -- NaN check
-      if (IS_INCLUDES && el !== el) while (length > index) {
-        value = O[index++];
-        // eslint-disable-next-line no-self-compare -- NaN check
-        if (value !== value) return true;
-      // Array#indexOf ignores holes, Array#includes - not
-      } else for (;length > index; index++) {
-        if ((IS_INCLUDES || index in O) && O[index] === el) return IS_INCLUDES || index || 0;
-      } return !IS_INCLUDES && -1;
-    };
-  };
+  	// `ToLength` abstract operation
+  	// https://tc39.es/ecma262/#sec-tolength
+  	toLength = function (argument) {
+  	  var len = toIntegerOrInfinity(argument);
+  	  return len > 0 ? min(len, 0x1FFFFFFFFFFFFF) : 0; // 2 ** 53 - 1 == 9007199254740991
+  	};
+  	return toLength;
+  }
 
-  var arrayIncludes = {
-    // `Array.prototype.includes` method
-    // https://tc39.es/ecma262/#sec-array.prototype.includes
-    includes: createMethod$3(true),
-    // `Array.prototype.indexOf` method
-    // https://tc39.es/ecma262/#sec-array.prototype.indexof
-    indexOf: createMethod$3(false)
-  };
+  var lengthOfArrayLike;
+  var hasRequiredLengthOfArrayLike;
 
-  var uncurryThis$d = functionUncurryThis;
-  var hasOwn$3 = hasOwnProperty_1;
-  var toIndexedObject$3 = toIndexedObject$6;
-  var indexOf$1 = arrayIncludes.indexOf;
-  var hiddenKeys$2 = hiddenKeys$4;
+  function requireLengthOfArrayLike () {
+  	if (hasRequiredLengthOfArrayLike) return lengthOfArrayLike;
+  	hasRequiredLengthOfArrayLike = 1;
+  	var toLength = requireToLength();
 
-  var push$3 = uncurryThis$d([].push);
+  	// `LengthOfArrayLike` abstract operation
+  	// https://tc39.es/ecma262/#sec-lengthofarraylike
+  	lengthOfArrayLike = function (obj) {
+  	  return toLength(obj.length);
+  	};
+  	return lengthOfArrayLike;
+  }
 
-  var objectKeysInternal = function (object, names) {
-    var O = toIndexedObject$3(object);
-    var i = 0;
-    var result = [];
-    var key;
-    for (key in O) !hasOwn$3(hiddenKeys$2, key) && hasOwn$3(O, key) && push$3(result, key);
-    // Don't enum bug & hidden keys
-    while (names.length > i) if (hasOwn$3(O, key = names[i++])) {
-      ~indexOf$1(result, key) || push$3(result, key);
-    }
-    return result;
-  };
+  var arrayIncludes;
+  var hasRequiredArrayIncludes;
 
-  // IE8- don't enum bug keys
-  var enumBugKeys$3 = [
-    'constructor',
-    'hasOwnProperty',
-    'isPrototypeOf',
-    'propertyIsEnumerable',
-    'toLocaleString',
-    'toString',
-    'valueOf'
-  ];
+  function requireArrayIncludes () {
+  	if (hasRequiredArrayIncludes) return arrayIncludes;
+  	hasRequiredArrayIncludes = 1;
+  	var toIndexedObject = requireToIndexedObject();
+  	var toAbsoluteIndex = requireToAbsoluteIndex();
+  	var lengthOfArrayLike = requireLengthOfArrayLike();
 
-  var internalObjectKeys$1 = objectKeysInternal;
-  var enumBugKeys$2 = enumBugKeys$3;
+  	// `Array.prototype.{ indexOf, includes }` methods implementation
+  	var createMethod = function (IS_INCLUDES) {
+  	  return function ($this, el, fromIndex) {
+  	    var O = toIndexedObject($this);
+  	    var length = lengthOfArrayLike(O);
+  	    if (length === 0) return !IS_INCLUDES && -1;
+  	    var index = toAbsoluteIndex(fromIndex, length);
+  	    var value;
+  	    // Array#includes uses SameValueZero equality algorithm
+  	    // eslint-disable-next-line no-self-compare -- NaN check
+  	    if (IS_INCLUDES && el !== el) while (length > index) {
+  	      value = O[index++];
+  	      // eslint-disable-next-line no-self-compare -- NaN check
+  	      if (value !== value) return true;
+  	    // Array#indexOf ignores holes, Array#includes - not
+  	    } else for (;length > index; index++) {
+  	      if ((IS_INCLUDES || index in O) && O[index] === el) return IS_INCLUDES || index || 0;
+  	    } return !IS_INCLUDES && -1;
+  	  };
+  	};
 
-  var hiddenKeys$1 = enumBugKeys$2.concat('length', 'prototype');
+  	arrayIncludes = {
+  	  // `Array.prototype.includes` method
+  	  // https://tc39.es/ecma262/#sec-array.prototype.includes
+  	  includes: createMethod(true),
+  	  // `Array.prototype.indexOf` method
+  	  // https://tc39.es/ecma262/#sec-array.prototype.indexof
+  	  indexOf: createMethod(false)
+  	};
+  	return arrayIncludes;
+  }
 
-  // `Object.getOwnPropertyNames` method
-  // https://tc39.es/ecma262/#sec-object.getownpropertynames
-  // eslint-disable-next-line es/no-object-getownpropertynames -- safe
-  objectGetOwnPropertyNames.f = Object.getOwnPropertyNames || function getOwnPropertyNames(O) {
-    return internalObjectKeys$1(O, hiddenKeys$1);
-  };
+  var objectKeysInternal;
+  var hasRequiredObjectKeysInternal;
+
+  function requireObjectKeysInternal () {
+  	if (hasRequiredObjectKeysInternal) return objectKeysInternal;
+  	hasRequiredObjectKeysInternal = 1;
+  	var uncurryThis = requireFunctionUncurryThis();
+  	var hasOwn = requireHasOwnProperty();
+  	var toIndexedObject = requireToIndexedObject();
+  	var indexOf = requireArrayIncludes().indexOf;
+  	var hiddenKeys = requireHiddenKeys();
+
+  	var push = uncurryThis([].push);
+
+  	objectKeysInternal = function (object, names) {
+  	  var O = toIndexedObject(object);
+  	  var i = 0;
+  	  var result = [];
+  	  var key;
+  	  for (key in O) !hasOwn(hiddenKeys, key) && hasOwn(O, key) && push(result, key);
+  	  // Don't enum bug & hidden keys
+  	  while (names.length > i) if (hasOwn(O, key = names[i++])) {
+  	    ~indexOf(result, key) || push(result, key);
+  	  }
+  	  return result;
+  	};
+  	return objectKeysInternal;
+  }
+
+  var enumBugKeys;
+  var hasRequiredEnumBugKeys;
+
+  function requireEnumBugKeys () {
+  	if (hasRequiredEnumBugKeys) return enumBugKeys;
+  	hasRequiredEnumBugKeys = 1;
+  	// IE8- don't enum bug keys
+  	enumBugKeys = [
+  	  'constructor',
+  	  'hasOwnProperty',
+  	  'isPrototypeOf',
+  	  'propertyIsEnumerable',
+  	  'toLocaleString',
+  	  'toString',
+  	  'valueOf'
+  	];
+  	return enumBugKeys;
+  }
+
+  var hasRequiredObjectGetOwnPropertyNames;
+
+  function requireObjectGetOwnPropertyNames () {
+  	if (hasRequiredObjectGetOwnPropertyNames) return objectGetOwnPropertyNames;
+  	hasRequiredObjectGetOwnPropertyNames = 1;
+  	var internalObjectKeys = requireObjectKeysInternal();
+  	var enumBugKeys = requireEnumBugKeys();
+
+  	var hiddenKeys = enumBugKeys.concat('length', 'prototype');
+
+  	// `Object.getOwnPropertyNames` method
+  	// https://tc39.es/ecma262/#sec-object.getownpropertynames
+  	// eslint-disable-next-line es/no-object-getownpropertynames -- safe
+  	objectGetOwnPropertyNames.f = Object.getOwnPropertyNames || function getOwnPropertyNames(O) {
+  	  return internalObjectKeys(O, hiddenKeys);
+  	};
+  	return objectGetOwnPropertyNames;
+  }
 
   var objectGetOwnPropertySymbols = {};
 
-  // eslint-disable-next-line es/no-object-getownpropertysymbols -- safe
-  objectGetOwnPropertySymbols.f = Object.getOwnPropertySymbols;
+  var hasRequiredObjectGetOwnPropertySymbols;
 
-  var getBuiltIn$2 = getBuiltIn$4;
-  var uncurryThis$c = functionUncurryThis;
-  var getOwnPropertyNamesModule = objectGetOwnPropertyNames;
-  var getOwnPropertySymbolsModule$1 = objectGetOwnPropertySymbols;
-  var anObject$7 = anObject$9;
+  function requireObjectGetOwnPropertySymbols () {
+  	if (hasRequiredObjectGetOwnPropertySymbols) return objectGetOwnPropertySymbols;
+  	hasRequiredObjectGetOwnPropertySymbols = 1;
+  	// eslint-disable-next-line es/no-object-getownpropertysymbols -- safe
+  	objectGetOwnPropertySymbols.f = Object.getOwnPropertySymbols;
+  	return objectGetOwnPropertySymbols;
+  }
 
-  var concat$2 = uncurryThis$c([].concat);
+  var ownKeys;
+  var hasRequiredOwnKeys;
 
-  // all object keys, includes non-enumerable and symbols
-  var ownKeys$1 = getBuiltIn$2('Reflect', 'ownKeys') || function ownKeys(it) {
-    var keys = getOwnPropertyNamesModule.f(anObject$7(it));
-    var getOwnPropertySymbols = getOwnPropertySymbolsModule$1.f;
-    return getOwnPropertySymbols ? concat$2(keys, getOwnPropertySymbols(it)) : keys;
-  };
+  function requireOwnKeys () {
+  	if (hasRequiredOwnKeys) return ownKeys;
+  	hasRequiredOwnKeys = 1;
+  	var getBuiltIn = requireGetBuiltIn();
+  	var uncurryThis = requireFunctionUncurryThis();
+  	var getOwnPropertyNamesModule = requireObjectGetOwnPropertyNames();
+  	var getOwnPropertySymbolsModule = requireObjectGetOwnPropertySymbols();
+  	var anObject = requireAnObject();
 
-  var hasOwn$2 = hasOwnProperty_1;
-  var ownKeys = ownKeys$1;
-  var getOwnPropertyDescriptorModule = objectGetOwnPropertyDescriptor;
-  var definePropertyModule$2 = objectDefineProperty;
+  	var concat = uncurryThis([].concat);
 
-  var copyConstructorProperties$1 = function (target, source, exceptions) {
-    var keys = ownKeys(source);
-    var defineProperty = definePropertyModule$2.f;
-    var getOwnPropertyDescriptor = getOwnPropertyDescriptorModule.f;
-    for (var i = 0; i < keys.length; i++) {
-      var key = keys[i];
-      if (!hasOwn$2(target, key) && !(exceptions && hasOwn$2(exceptions, key))) {
-        defineProperty(target, key, getOwnPropertyDescriptor(source, key));
-      }
-    }
-  };
+  	// all object keys, includes non-enumerable and symbols
+  	ownKeys = getBuiltIn('Reflect', 'ownKeys') || function ownKeys(it) {
+  	  var keys = getOwnPropertyNamesModule.f(anObject(it));
+  	  var getOwnPropertySymbols = getOwnPropertySymbolsModule.f;
+  	  return getOwnPropertySymbols ? concat(keys, getOwnPropertySymbols(it)) : keys;
+  	};
+  	return ownKeys;
+  }
 
-  var fails$g = fails$o;
-  var isCallable$5 = isCallable$f;
+  var copyConstructorProperties;
+  var hasRequiredCopyConstructorProperties;
 
-  var replacement = /#|\.prototype\./;
+  function requireCopyConstructorProperties () {
+  	if (hasRequiredCopyConstructorProperties) return copyConstructorProperties;
+  	hasRequiredCopyConstructorProperties = 1;
+  	var hasOwn = requireHasOwnProperty();
+  	var ownKeys = requireOwnKeys();
+  	var getOwnPropertyDescriptorModule = requireObjectGetOwnPropertyDescriptor();
+  	var definePropertyModule = requireObjectDefineProperty();
 
-  var isForced$1 = function (feature, detection) {
-    var value = data[normalize(feature)];
-    return value === POLYFILL ? true
-      : value === NATIVE ? false
-      : isCallable$5(detection) ? fails$g(detection)
-      : !!detection;
-  };
+  	copyConstructorProperties = function (target, source, exceptions) {
+  	  var keys = ownKeys(source);
+  	  var defineProperty = definePropertyModule.f;
+  	  var getOwnPropertyDescriptor = getOwnPropertyDescriptorModule.f;
+  	  for (var i = 0; i < keys.length; i++) {
+  	    var key = keys[i];
+  	    if (!hasOwn(target, key) && !(exceptions && hasOwn(exceptions, key))) {
+  	      defineProperty(target, key, getOwnPropertyDescriptor(source, key));
+  	    }
+  	  }
+  	};
+  	return copyConstructorProperties;
+  }
 
-  var normalize = isForced$1.normalize = function (string) {
-    return String(string).replace(replacement, '.').toLowerCase();
-  };
+  var isForced_1;
+  var hasRequiredIsForced;
 
-  var data = isForced$1.data = {};
-  var NATIVE = isForced$1.NATIVE = 'N';
-  var POLYFILL = isForced$1.POLYFILL = 'P';
+  function requireIsForced () {
+  	if (hasRequiredIsForced) return isForced_1;
+  	hasRequiredIsForced = 1;
+  	var fails = requireFails();
+  	var isCallable = requireIsCallable();
 
-  var isForced_1 = isForced$1;
+  	var replacement = /#|\.prototype\./;
 
-  var global$5 = global$e;
-  var getOwnPropertyDescriptor = objectGetOwnPropertyDescriptor.f;
-  var createNonEnumerableProperty$2 = createNonEnumerableProperty$4;
-  var defineBuiltIn$3 = defineBuiltIn$4;
-  var defineGlobalProperty = defineGlobalProperty$3;
-  var copyConstructorProperties = copyConstructorProperties$1;
-  var isForced = isForced_1;
+  	var isForced = function (feature, detection) {
+  	  var value = data[normalize(feature)];
+  	  return value === POLYFILL ? true
+  	    : value === NATIVE ? false
+  	    : isCallable(detection) ? fails(detection)
+  	    : !!detection;
+  	};
 
-  /*
-    options.target         - name of the target object
-    options.global         - target is the global object
-    options.stat           - export as static methods of target
-    options.proto          - export as prototype methods of target
-    options.real           - real prototype method for the `pure` version
-    options.forced         - export even if the native feature is available
-    options.bind           - bind methods to the target, required for the `pure` version
-    options.wrap           - wrap constructors to preventing global pollution, required for the `pure` version
-    options.unsafe         - use the simple assignment of property instead of delete + defineProperty
-    options.sham           - add a flag to not completely full polyfills
-    options.enumerable     - export as enumerable property
-    options.dontCallGetSet - prevent calling a getter on target
-    options.name           - the .name of the function if it does not match the key
-  */
-  var _export = function (options, source) {
-    var TARGET = options.target;
-    var GLOBAL = options.global;
-    var STATIC = options.stat;
-    var FORCED, target, key, targetProperty, sourceProperty, descriptor;
-    if (GLOBAL) {
-      target = global$5;
-    } else if (STATIC) {
-      target = global$5[TARGET] || defineGlobalProperty(TARGET, {});
-    } else {
-      target = global$5[TARGET] && global$5[TARGET].prototype;
-    }
-    if (target) for (key in source) {
-      sourceProperty = source[key];
-      if (options.dontCallGetSet) {
-        descriptor = getOwnPropertyDescriptor(target, key);
-        targetProperty = descriptor && descriptor.value;
-      } else targetProperty = target[key];
-      FORCED = isForced(GLOBAL ? key : TARGET + (STATIC ? '.' : '#') + key, options.forced);
-      // contained in target
-      if (!FORCED && targetProperty !== undefined) {
-        if (typeof sourceProperty == typeof targetProperty) continue;
-        copyConstructorProperties(sourceProperty, targetProperty);
-      }
-      // add a flag to not completely full polyfills
-      if (options.sham || (targetProperty && targetProperty.sham)) {
-        createNonEnumerableProperty$2(sourceProperty, 'sham', true);
-      }
-      defineBuiltIn$3(target, key, sourceProperty, options);
-    }
-  };
+  	var normalize = isForced.normalize = function (string) {
+  	  return String(string).replace(replacement, '.').toLowerCase();
+  	};
 
-  var classof$6 = classofRaw$2;
+  	var data = isForced.data = {};
+  	var NATIVE = isForced.NATIVE = 'N';
+  	var POLYFILL = isForced.POLYFILL = 'P';
 
-  // `IsArray` abstract operation
-  // https://tc39.es/ecma262/#sec-isarray
-  // eslint-disable-next-line es/no-array-isarray -- safe
-  var isArray$2 = Array.isArray || function isArray(argument) {
-    return classof$6(argument) === 'Array';
-  };
+  	isForced_1 = isForced;
+  	return isForced_1;
+  }
 
-  var $TypeError$2 = TypeError;
-  var MAX_SAFE_INTEGER = 0x1FFFFFFFFFFFFF; // 2 ** 53 - 1 == 9007199254740991
+  var _export;
+  var hasRequired_export;
 
-  var doesNotExceedSafeInteger$1 = function (it) {
-    if (it > MAX_SAFE_INTEGER) throw $TypeError$2('Maximum allowed index exceeded');
-    return it;
-  };
+  function require_export () {
+  	if (hasRequired_export) return _export;
+  	hasRequired_export = 1;
+  	var globalThis = requireGlobalThis();
+  	var getOwnPropertyDescriptor = requireObjectGetOwnPropertyDescriptor().f;
+  	var createNonEnumerableProperty = requireCreateNonEnumerableProperty();
+  	var defineBuiltIn = requireDefineBuiltIn();
+  	var defineGlobalProperty = requireDefineGlobalProperty();
+  	var copyConstructorProperties = requireCopyConstructorProperties();
+  	var isForced = requireIsForced();
 
-  var DESCRIPTORS$3 = descriptors;
-  var definePropertyModule$1 = objectDefineProperty;
-  var createPropertyDescriptor = createPropertyDescriptor$3;
+  	/*
+  	  options.target         - name of the target object
+  	  options.global         - target is the global object
+  	  options.stat           - export as static methods of target
+  	  options.proto          - export as prototype methods of target
+  	  options.real           - real prototype method for the `pure` version
+  	  options.forced         - export even if the native feature is available
+  	  options.bind           - bind methods to the target, required for the `pure` version
+  	  options.wrap           - wrap constructors to preventing global pollution, required for the `pure` version
+  	  options.unsafe         - use the simple assignment of property instead of delete + defineProperty
+  	  options.sham           - add a flag to not completely full polyfills
+  	  options.enumerable     - export as enumerable property
+  	  options.dontCallGetSet - prevent calling a getter on target
+  	  options.name           - the .name of the function if it does not match the key
+  	*/
+  	_export = function (options, source) {
+  	  var TARGET = options.target;
+  	  var GLOBAL = options.global;
+  	  var STATIC = options.stat;
+  	  var FORCED, target, key, targetProperty, sourceProperty, descriptor;
+  	  if (GLOBAL) {
+  	    target = globalThis;
+  	  } else if (STATIC) {
+  	    target = globalThis[TARGET] || defineGlobalProperty(TARGET, {});
+  	  } else {
+  	    target = globalThis[TARGET] && globalThis[TARGET].prototype;
+  	  }
+  	  if (target) for (key in source) {
+  	    sourceProperty = source[key];
+  	    if (options.dontCallGetSet) {
+  	      descriptor = getOwnPropertyDescriptor(target, key);
+  	      targetProperty = descriptor && descriptor.value;
+  	    } else targetProperty = target[key];
+  	    FORCED = isForced(GLOBAL ? key : TARGET + (STATIC ? '.' : '#') + key, options.forced);
+  	    // contained in target
+  	    if (!FORCED && targetProperty !== undefined) {
+  	      if (typeof sourceProperty == typeof targetProperty) continue;
+  	      copyConstructorProperties(sourceProperty, targetProperty);
+  	    }
+  	    // add a flag to not completely full polyfills
+  	    if (options.sham || (targetProperty && targetProperty.sham)) {
+  	      createNonEnumerableProperty(sourceProperty, 'sham', true);
+  	    }
+  	    defineBuiltIn(target, key, sourceProperty, options);
+  	  }
+  	};
+  	return _export;
+  }
 
-  var createProperty$1 = function (object, key, value) {
-    if (DESCRIPTORS$3) definePropertyModule$1.f(object, key, createPropertyDescriptor(0, value));
-    else object[key] = value;
-  };
+  var isArray;
+  var hasRequiredIsArray;
 
-  var wellKnownSymbol$9 = wellKnownSymbol$b;
+  function requireIsArray () {
+  	if (hasRequiredIsArray) return isArray;
+  	hasRequiredIsArray = 1;
+  	var classof = requireClassofRaw();
 
-  var TO_STRING_TAG$1 = wellKnownSymbol$9('toStringTag');
-  var test = {};
+  	// `IsArray` abstract operation
+  	// https://tc39.es/ecma262/#sec-isarray
+  	// eslint-disable-next-line es/no-array-isarray -- safe
+  	isArray = Array.isArray || function isArray(argument) {
+  	  return classof(argument) === 'Array';
+  	};
+  	return isArray;
+  }
 
-  test[TO_STRING_TAG$1] = 'z';
+  var doesNotExceedSafeInteger;
+  var hasRequiredDoesNotExceedSafeInteger;
 
-  var toStringTagSupport = String(test) === '[object z]';
+  function requireDoesNotExceedSafeInteger () {
+  	if (hasRequiredDoesNotExceedSafeInteger) return doesNotExceedSafeInteger;
+  	hasRequiredDoesNotExceedSafeInteger = 1;
+  	var $TypeError = TypeError;
+  	var MAX_SAFE_INTEGER = 0x1FFFFFFFFFFFFF; // 2 ** 53 - 1 == 9007199254740991
 
-  var TO_STRING_TAG_SUPPORT$2 = toStringTagSupport;
-  var isCallable$4 = isCallable$f;
-  var classofRaw$1 = classofRaw$2;
-  var wellKnownSymbol$8 = wellKnownSymbol$b;
+  	doesNotExceedSafeInteger = function (it) {
+  	  if (it > MAX_SAFE_INTEGER) throw $TypeError('Maximum allowed index exceeded');
+  	  return it;
+  	};
+  	return doesNotExceedSafeInteger;
+  }
 
-  var TO_STRING_TAG = wellKnownSymbol$8('toStringTag');
-  var $Object$1 = Object;
+  var createProperty;
+  var hasRequiredCreateProperty;
 
-  // ES3 wrong here
-  var CORRECT_ARGUMENTS = classofRaw$1(function () { return arguments; }()) === 'Arguments';
+  function requireCreateProperty () {
+  	if (hasRequiredCreateProperty) return createProperty;
+  	hasRequiredCreateProperty = 1;
+  	var DESCRIPTORS = requireDescriptors();
+  	var definePropertyModule = requireObjectDefineProperty();
+  	var createPropertyDescriptor = requireCreatePropertyDescriptor();
 
-  // fallback for IE11 Script Access Denied error
-  var tryGet = function (it, key) {
-    try {
-      return it[key];
-    } catch (error) { /* empty */ }
-  };
+  	createProperty = function (object, key, value) {
+  	  if (DESCRIPTORS) definePropertyModule.f(object, key, createPropertyDescriptor(0, value));
+  	  else object[key] = value;
+  	};
+  	return createProperty;
+  }
 
-  // getting tag from ES6+ `Object.prototype.toString`
-  var classof$5 = TO_STRING_TAG_SUPPORT$2 ? classofRaw$1 : function (it) {
-    var O, tag, result;
-    return it === undefined ? 'Undefined' : it === null ? 'Null'
-      // @@toStringTag case
-      : typeof (tag = tryGet(O = $Object$1(it), TO_STRING_TAG)) == 'string' ? tag
-      // builtinTag case
-      : CORRECT_ARGUMENTS ? classofRaw$1(O)
-      // ES3 arguments fallback
-      : (result = classofRaw$1(O)) === 'Object' && isCallable$4(O.callee) ? 'Arguments' : result;
-  };
+  var toStringTagSupport;
+  var hasRequiredToStringTagSupport;
 
-  var uncurryThis$b = functionUncurryThis;
-  var fails$f = fails$o;
-  var isCallable$3 = isCallable$f;
-  var classof$4 = classof$5;
-  var getBuiltIn$1 = getBuiltIn$4;
-  var inspectSource = inspectSource$2;
+  function requireToStringTagSupport () {
+  	if (hasRequiredToStringTagSupport) return toStringTagSupport;
+  	hasRequiredToStringTagSupport = 1;
+  	var wellKnownSymbol = requireWellKnownSymbol();
 
-  var noop = function () { /* empty */ };
-  var construct = getBuiltIn$1('Reflect', 'construct');
-  var constructorRegExp = /^\s*(?:class|function)\b/;
-  var exec$1 = uncurryThis$b(constructorRegExp.exec);
-  var INCORRECT_TO_STRING = !constructorRegExp.test(noop);
+  	var TO_STRING_TAG = wellKnownSymbol('toStringTag');
+  	var test = {};
 
-  var isConstructorModern = function isConstructor(argument) {
-    if (!isCallable$3(argument)) return false;
-    try {
-      construct(noop, [], argument);
-      return true;
-    } catch (error) {
-      return false;
-    }
-  };
+  	test[TO_STRING_TAG] = 'z';
 
-  var isConstructorLegacy = function isConstructor(argument) {
-    if (!isCallable$3(argument)) return false;
-    switch (classof$4(argument)) {
-      case 'AsyncFunction':
-      case 'GeneratorFunction':
-      case 'AsyncGeneratorFunction': return false;
-    }
-    try {
-      // we can't check .prototype since constructors produced by .bind haven't it
-      // `Function#toString` throws on some built-it function in some legacy engines
-      // (for example, `DOMQuad` and similar in FF41-)
-      return INCORRECT_TO_STRING || !!exec$1(constructorRegExp, inspectSource(argument));
-    } catch (error) {
-      return true;
-    }
-  };
+  	toStringTagSupport = String(test) === '[object z]';
+  	return toStringTagSupport;
+  }
 
-  isConstructorLegacy.sham = true;
+  var classof;
+  var hasRequiredClassof;
 
-  // `IsConstructor` abstract operation
-  // https://tc39.es/ecma262/#sec-isconstructor
-  var isConstructor$1 = !construct || fails$f(function () {
-    var called;
-    return isConstructorModern(isConstructorModern.call)
-      || !isConstructorModern(Object)
-      || !isConstructorModern(function () { called = true; })
-      || called;
-  }) ? isConstructorLegacy : isConstructorModern;
+  function requireClassof () {
+  	if (hasRequiredClassof) return classof;
+  	hasRequiredClassof = 1;
+  	var TO_STRING_TAG_SUPPORT = requireToStringTagSupport();
+  	var isCallable = requireIsCallable();
+  	var classofRaw = requireClassofRaw();
+  	var wellKnownSymbol = requireWellKnownSymbol();
 
-  var isArray$1 = isArray$2;
-  var isConstructor = isConstructor$1;
-  var isObject$2 = isObject$8;
-  var wellKnownSymbol$7 = wellKnownSymbol$b;
+  	var TO_STRING_TAG = wellKnownSymbol('toStringTag');
+  	var $Object = Object;
 
-  var SPECIES$2 = wellKnownSymbol$7('species');
-  var $Array = Array;
+  	// ES3 wrong here
+  	var CORRECT_ARGUMENTS = classofRaw(function () { return arguments; }()) === 'Arguments';
 
-  // a part of `ArraySpeciesCreate` abstract operation
-  // https://tc39.es/ecma262/#sec-arrayspeciescreate
-  var arraySpeciesConstructor$1 = function (originalArray) {
-    var C;
-    if (isArray$1(originalArray)) {
-      C = originalArray.constructor;
-      // cross-realm fallback
-      if (isConstructor(C) && (C === $Array || isArray$1(C.prototype))) C = undefined;
-      else if (isObject$2(C)) {
-        C = C[SPECIES$2];
-        if (C === null) C = undefined;
-      }
-    } return C === undefined ? $Array : C;
-  };
+  	// fallback for IE11 Script Access Denied error
+  	var tryGet = function (it, key) {
+  	  try {
+  	    return it[key];
+  	  } catch (error) { /* empty */ }
+  	};
 
-  var arraySpeciesConstructor = arraySpeciesConstructor$1;
+  	// getting tag from ES6+ `Object.prototype.toString`
+  	classof = TO_STRING_TAG_SUPPORT ? classofRaw : function (it) {
+  	  var O, tag, result;
+  	  return it === undefined ? 'Undefined' : it === null ? 'Null'
+  	    // @@toStringTag case
+  	    : typeof (tag = tryGet(O = $Object(it), TO_STRING_TAG)) == 'string' ? tag
+  	    // builtinTag case
+  	    : CORRECT_ARGUMENTS ? classofRaw(O)
+  	    // ES3 arguments fallback
+  	    : (result = classofRaw(O)) === 'Object' && isCallable(O.callee) ? 'Arguments' : result;
+  	};
+  	return classof;
+  }
 
-  // `ArraySpeciesCreate` abstract operation
-  // https://tc39.es/ecma262/#sec-arrayspeciescreate
-  var arraySpeciesCreate$2 = function (originalArray, length) {
-    return new (arraySpeciesConstructor(originalArray))(length === 0 ? 0 : length);
-  };
+  var isConstructor;
+  var hasRequiredIsConstructor;
 
-  var fails$e = fails$o;
-  var wellKnownSymbol$6 = wellKnownSymbol$b;
-  var V8_VERSION$1 = engineV8Version;
+  function requireIsConstructor () {
+  	if (hasRequiredIsConstructor) return isConstructor;
+  	hasRequiredIsConstructor = 1;
+  	var uncurryThis = requireFunctionUncurryThis();
+  	var fails = requireFails();
+  	var isCallable = requireIsCallable();
+  	var classof = requireClassof();
+  	var getBuiltIn = requireGetBuiltIn();
+  	var inspectSource = requireInspectSource();
 
-  var SPECIES$1 = wellKnownSymbol$6('species');
+  	var noop = function () { /* empty */ };
+  	var construct = getBuiltIn('Reflect', 'construct');
+  	var constructorRegExp = /^\s*(?:class|function)\b/;
+  	var exec = uncurryThis(constructorRegExp.exec);
+  	var INCORRECT_TO_STRING = !constructorRegExp.test(noop);
 
-  var arrayMethodHasSpeciesSupport$3 = function (METHOD_NAME) {
-    // We can't use this feature detection in V8 since it causes
-    // deoptimization and serious performance degradation
-    // https://github.com/zloirock/core-js/issues/677
-    return V8_VERSION$1 >= 51 || !fails$e(function () {
-      var array = [];
-      var constructor = array.constructor = {};
-      constructor[SPECIES$1] = function () {
-        return { foo: 1 };
-      };
-      return array[METHOD_NAME](Boolean).foo !== 1;
-    });
-  };
+  	var isConstructorModern = function isConstructor(argument) {
+  	  if (!isCallable(argument)) return false;
+  	  try {
+  	    construct(noop, [], argument);
+  	    return true;
+  	  } catch (error) {
+  	    return false;
+  	  }
+  	};
 
-  var $$b = _export;
-  var fails$d = fails$o;
-  var isArray = isArray$2;
-  var isObject$1 = isObject$8;
-  var toObject$6 = toObject$8;
-  var lengthOfArrayLike$1 = lengthOfArrayLike$3;
-  var doesNotExceedSafeInteger = doesNotExceedSafeInteger$1;
-  var createProperty = createProperty$1;
-  var arraySpeciesCreate$1 = arraySpeciesCreate$2;
-  var arrayMethodHasSpeciesSupport$2 = arrayMethodHasSpeciesSupport$3;
-  var wellKnownSymbol$5 = wellKnownSymbol$b;
-  var V8_VERSION = engineV8Version;
+  	var isConstructorLegacy = function isConstructor(argument) {
+  	  if (!isCallable(argument)) return false;
+  	  switch (classof(argument)) {
+  	    case 'AsyncFunction':
+  	    case 'GeneratorFunction':
+  	    case 'AsyncGeneratorFunction': return false;
+  	  }
+  	  try {
+  	    // we can't check .prototype since constructors produced by .bind haven't it
+  	    // `Function#toString` throws on some built-it function in some legacy engines
+  	    // (for example, `DOMQuad` and similar in FF41-)
+  	    return INCORRECT_TO_STRING || !!exec(constructorRegExp, inspectSource(argument));
+  	  } catch (error) {
+  	    return true;
+  	  }
+  	};
 
-  var IS_CONCAT_SPREADABLE = wellKnownSymbol$5('isConcatSpreadable');
+  	isConstructorLegacy.sham = true;
 
-  // We can't use this feature detection in V8 since it causes
-  // deoptimization and serious performance degradation
-  // https://github.com/zloirock/core-js/issues/679
-  var IS_CONCAT_SPREADABLE_SUPPORT = V8_VERSION >= 51 || !fails$d(function () {
-    var array = [];
-    array[IS_CONCAT_SPREADABLE] = false;
-    return array.concat()[0] !== array;
-  });
+  	// `IsConstructor` abstract operation
+  	// https://tc39.es/ecma262/#sec-isconstructor
+  	isConstructor = !construct || fails(function () {
+  	  var called;
+  	  return isConstructorModern(isConstructorModern.call)
+  	    || !isConstructorModern(Object)
+  	    || !isConstructorModern(function () { called = true; })
+  	    || called;
+  	}) ? isConstructorLegacy : isConstructorModern;
+  	return isConstructor;
+  }
 
-  var isConcatSpreadable = function (O) {
-    if (!isObject$1(O)) return false;
-    var spreadable = O[IS_CONCAT_SPREADABLE];
-    return spreadable !== undefined ? !!spreadable : isArray(O);
-  };
+  var arraySpeciesConstructor;
+  var hasRequiredArraySpeciesConstructor;
 
-  var FORCED$2 = !IS_CONCAT_SPREADABLE_SUPPORT || !arrayMethodHasSpeciesSupport$2('concat');
+  function requireArraySpeciesConstructor () {
+  	if (hasRequiredArraySpeciesConstructor) return arraySpeciesConstructor;
+  	hasRequiredArraySpeciesConstructor = 1;
+  	var isArray = requireIsArray();
+  	var isConstructor = requireIsConstructor();
+  	var isObject = requireIsObject();
+  	var wellKnownSymbol = requireWellKnownSymbol();
 
-  // `Array.prototype.concat` method
-  // https://tc39.es/ecma262/#sec-array.prototype.concat
-  // with adding support of @@isConcatSpreadable and @@species
-  $$b({ target: 'Array', proto: true, arity: 1, forced: FORCED$2 }, {
-    // eslint-disable-next-line no-unused-vars -- required for `.length`
-    concat: function concat(arg) {
-      var O = toObject$6(this);
-      var A = arraySpeciesCreate$1(O, 0);
-      var n = 0;
-      var i, k, length, len, E;
-      for (i = -1, length = arguments.length; i < length; i++) {
-        E = i === -1 ? O : arguments[i];
-        if (isConcatSpreadable(E)) {
-          len = lengthOfArrayLike$1(E);
-          doesNotExceedSafeInteger(n + len);
-          for (k = 0; k < len; k++, n++) if (k in E) createProperty(A, n, E[k]);
-        } else {
-          doesNotExceedSafeInteger(n + 1);
-          createProperty(A, n++, E);
-        }
-      }
-      A.length = n;
-      return A;
-    }
-  });
+  	var SPECIES = wellKnownSymbol('species');
+  	var $Array = Array;
 
-  var classofRaw = classofRaw$2;
-  var uncurryThis$a = functionUncurryThis;
+  	// a part of `ArraySpeciesCreate` abstract operation
+  	// https://tc39.es/ecma262/#sec-arrayspeciescreate
+  	arraySpeciesConstructor = function (originalArray) {
+  	  var C;
+  	  if (isArray(originalArray)) {
+  	    C = originalArray.constructor;
+  	    // cross-realm fallback
+  	    if (isConstructor(C) && (C === $Array || isArray(C.prototype))) C = undefined;
+  	    else if (isObject(C)) {
+  	      C = C[SPECIES];
+  	      if (C === null) C = undefined;
+  	    }
+  	  } return C === undefined ? $Array : C;
+  	};
+  	return arraySpeciesConstructor;
+  }
 
-  var functionUncurryThisClause = function (fn) {
-    // Nashorn bug:
-    //   https://github.com/zloirock/core-js/issues/1128
-    //   https://github.com/zloirock/core-js/issues/1130
-    if (classofRaw(fn) === 'Function') return uncurryThis$a(fn);
-  };
+  var arraySpeciesCreate;
+  var hasRequiredArraySpeciesCreate;
 
-  var uncurryThis$9 = functionUncurryThisClause;
-  var aCallable = aCallable$2;
-  var NATIVE_BIND$1 = functionBindNative;
+  function requireArraySpeciesCreate () {
+  	if (hasRequiredArraySpeciesCreate) return arraySpeciesCreate;
+  	hasRequiredArraySpeciesCreate = 1;
+  	var arraySpeciesConstructor = requireArraySpeciesConstructor();
 
-  var bind$1 = uncurryThis$9(uncurryThis$9.bind);
+  	// `ArraySpeciesCreate` abstract operation
+  	// https://tc39.es/ecma262/#sec-arrayspeciescreate
+  	arraySpeciesCreate = function (originalArray, length) {
+  	  return new (arraySpeciesConstructor(originalArray))(length === 0 ? 0 : length);
+  	};
+  	return arraySpeciesCreate;
+  }
 
-  // optional / simple context binding
-  var functionBindContext = function (fn, that) {
-    aCallable(fn);
-    return that === undefined ? fn : NATIVE_BIND$1 ? bind$1(fn, that) : function (/* ...args */) {
-      return fn.apply(that, arguments);
-    };
-  };
+  var arrayMethodHasSpeciesSupport;
+  var hasRequiredArrayMethodHasSpeciesSupport;
 
-  var bind = functionBindContext;
-  var uncurryThis$8 = functionUncurryThis;
-  var IndexedObject$2 = indexedObject;
-  var toObject$5 = toObject$8;
-  var lengthOfArrayLike = lengthOfArrayLike$3;
-  var arraySpeciesCreate = arraySpeciesCreate$2;
+  function requireArrayMethodHasSpeciesSupport () {
+  	if (hasRequiredArrayMethodHasSpeciesSupport) return arrayMethodHasSpeciesSupport;
+  	hasRequiredArrayMethodHasSpeciesSupport = 1;
+  	var fails = requireFails();
+  	var wellKnownSymbol = requireWellKnownSymbol();
+  	var V8_VERSION = requireEnvironmentV8Version();
 
-  var push$2 = uncurryThis$8([].push);
+  	var SPECIES = wellKnownSymbol('species');
 
-  // `Array.prototype.{ forEach, map, filter, some, every, find, findIndex, filterReject }` methods implementation
-  var createMethod$2 = function (TYPE) {
-    var IS_MAP = TYPE === 1;
-    var IS_FILTER = TYPE === 2;
-    var IS_SOME = TYPE === 3;
-    var IS_EVERY = TYPE === 4;
-    var IS_FIND_INDEX = TYPE === 6;
-    var IS_FILTER_REJECT = TYPE === 7;
-    var NO_HOLES = TYPE === 5 || IS_FIND_INDEX;
-    return function ($this, callbackfn, that, specificCreate) {
-      var O = toObject$5($this);
-      var self = IndexedObject$2(O);
-      var length = lengthOfArrayLike(self);
-      var boundFunction = bind(callbackfn, that);
-      var index = 0;
-      var create = specificCreate || arraySpeciesCreate;
-      var target = IS_MAP ? create($this, length) : IS_FILTER || IS_FILTER_REJECT ? create($this, 0) : undefined;
-      var value, result;
-      for (;length > index; index++) if (NO_HOLES || index in self) {
-        value = self[index];
-        result = boundFunction(value, index, O);
-        if (TYPE) {
-          if (IS_MAP) target[index] = result; // map
-          else if (result) switch (TYPE) {
-            case 3: return true;              // some
-            case 5: return value;             // find
-            case 6: return index;             // findIndex
-            case 2: push$2(target, value);      // filter
-          } else switch (TYPE) {
-            case 4: return false;             // every
-            case 7: push$2(target, value);      // filterReject
-          }
-        }
-      }
-      return IS_FIND_INDEX ? -1 : IS_SOME || IS_EVERY ? IS_EVERY : target;
-    };
-  };
+  	arrayMethodHasSpeciesSupport = function (METHOD_NAME) {
+  	  // We can't use this feature detection in V8 since it causes
+  	  // deoptimization and serious performance degradation
+  	  // https://github.com/zloirock/core-js/issues/677
+  	  return V8_VERSION >= 51 || !fails(function () {
+  	    var array = [];
+  	    var constructor = array.constructor = {};
+  	    constructor[SPECIES] = function () {
+  	      return { foo: 1 };
+  	    };
+  	    return array[METHOD_NAME](Boolean).foo !== 1;
+  	  });
+  	};
+  	return arrayMethodHasSpeciesSupport;
+  }
 
-  var arrayIteration = {
-    // `Array.prototype.forEach` method
-    // https://tc39.es/ecma262/#sec-array.prototype.foreach
-    forEach: createMethod$2(0),
-    // `Array.prototype.map` method
-    // https://tc39.es/ecma262/#sec-array.prototype.map
-    map: createMethod$2(1),
-    // `Array.prototype.filter` method
-    // https://tc39.es/ecma262/#sec-array.prototype.filter
-    filter: createMethod$2(2),
-    // `Array.prototype.some` method
-    // https://tc39.es/ecma262/#sec-array.prototype.some
-    some: createMethod$2(3),
-    // `Array.prototype.every` method
-    // https://tc39.es/ecma262/#sec-array.prototype.every
-    every: createMethod$2(4),
-    // `Array.prototype.find` method
-    // https://tc39.es/ecma262/#sec-array.prototype.find
-    find: createMethod$2(5),
-    // `Array.prototype.findIndex` method
-    // https://tc39.es/ecma262/#sec-array.prototype.findIndex
-    findIndex: createMethod$2(6),
-    // `Array.prototype.filterReject` method
-    // https://github.com/tc39/proposal-array-filtering
-    filterReject: createMethod$2(7)
-  };
+  var hasRequiredEs_array_concat;
 
-  var $$a = _export;
-  var $filter = arrayIteration.filter;
-  var arrayMethodHasSpeciesSupport$1 = arrayMethodHasSpeciesSupport$3;
+  function requireEs_array_concat () {
+  	if (hasRequiredEs_array_concat) return es_array_concat;
+  	hasRequiredEs_array_concat = 1;
+  	var $ = require_export();
+  	var fails = requireFails();
+  	var isArray = requireIsArray();
+  	var isObject = requireIsObject();
+  	var toObject = requireToObject();
+  	var lengthOfArrayLike = requireLengthOfArrayLike();
+  	var doesNotExceedSafeInteger = requireDoesNotExceedSafeInteger();
+  	var createProperty = requireCreateProperty();
+  	var arraySpeciesCreate = requireArraySpeciesCreate();
+  	var arrayMethodHasSpeciesSupport = requireArrayMethodHasSpeciesSupport();
+  	var wellKnownSymbol = requireWellKnownSymbol();
+  	var V8_VERSION = requireEnvironmentV8Version();
 
-  var HAS_SPECIES_SUPPORT$1 = arrayMethodHasSpeciesSupport$1('filter');
+  	var IS_CONCAT_SPREADABLE = wellKnownSymbol('isConcatSpreadable');
 
-  // `Array.prototype.filter` method
-  // https://tc39.es/ecma262/#sec-array.prototype.filter
-  // with adding support of @@species
-  $$a({ target: 'Array', proto: true, forced: !HAS_SPECIES_SUPPORT$1 }, {
-    filter: function filter(callbackfn /* , thisArg */) {
-      return $filter(this, callbackfn, arguments.length > 1 ? arguments[1] : undefined);
-    }
-  });
+  	// We can't use this feature detection in V8 since it causes
+  	// deoptimization and serious performance degradation
+  	// https://github.com/zloirock/core-js/issues/679
+  	var IS_CONCAT_SPREADABLE_SUPPORT = V8_VERSION >= 51 || !fails(function () {
+  	  var array = [];
+  	  array[IS_CONCAT_SPREADABLE] = false;
+  	  return array.concat()[0] !== array;
+  	});
+
+  	var isConcatSpreadable = function (O) {
+  	  if (!isObject(O)) return false;
+  	  var spreadable = O[IS_CONCAT_SPREADABLE];
+  	  return spreadable !== undefined ? !!spreadable : isArray(O);
+  	};
+
+  	var FORCED = !IS_CONCAT_SPREADABLE_SUPPORT || !arrayMethodHasSpeciesSupport('concat');
+
+  	// `Array.prototype.concat` method
+  	// https://tc39.es/ecma262/#sec-array.prototype.concat
+  	// with adding support of @@isConcatSpreadable and @@species
+  	$({ target: 'Array', proto: true, arity: 1, forced: FORCED }, {
+  	  // eslint-disable-next-line no-unused-vars -- required for `.length`
+  	  concat: function concat(arg) {
+  	    var O = toObject(this);
+  	    var A = arraySpeciesCreate(O, 0);
+  	    var n = 0;
+  	    var i, k, length, len, E;
+  	    for (i = -1, length = arguments.length; i < length; i++) {
+  	      E = i === -1 ? O : arguments[i];
+  	      if (isConcatSpreadable(E)) {
+  	        len = lengthOfArrayLike(E);
+  	        doesNotExceedSafeInteger(n + len);
+  	        for (k = 0; k < len; k++, n++) if (k in E) createProperty(A, n, E[k]);
+  	      } else {
+  	        doesNotExceedSafeInteger(n + 1);
+  	        createProperty(A, n++, E);
+  	      }
+  	    }
+  	    A.length = n;
+  	    return A;
+  	  }
+  	});
+  	return es_array_concat;
+  }
+
+  requireEs_array_concat();
+
+  var es_array_filter = {};
+
+  var functionUncurryThisClause;
+  var hasRequiredFunctionUncurryThisClause;
+
+  function requireFunctionUncurryThisClause () {
+  	if (hasRequiredFunctionUncurryThisClause) return functionUncurryThisClause;
+  	hasRequiredFunctionUncurryThisClause = 1;
+  	var classofRaw = requireClassofRaw();
+  	var uncurryThis = requireFunctionUncurryThis();
+
+  	functionUncurryThisClause = function (fn) {
+  	  // Nashorn bug:
+  	  //   https://github.com/zloirock/core-js/issues/1128
+  	  //   https://github.com/zloirock/core-js/issues/1130
+  	  if (classofRaw(fn) === 'Function') return uncurryThis(fn);
+  	};
+  	return functionUncurryThisClause;
+  }
+
+  var functionBindContext;
+  var hasRequiredFunctionBindContext;
+
+  function requireFunctionBindContext () {
+  	if (hasRequiredFunctionBindContext) return functionBindContext;
+  	hasRequiredFunctionBindContext = 1;
+  	var uncurryThis = requireFunctionUncurryThisClause();
+  	var aCallable = requireACallable();
+  	var NATIVE_BIND = requireFunctionBindNative();
+
+  	var bind = uncurryThis(uncurryThis.bind);
+
+  	// optional / simple context binding
+  	functionBindContext = function (fn, that) {
+  	  aCallable(fn);
+  	  return that === undefined ? fn : NATIVE_BIND ? bind(fn, that) : function (/* ...args */) {
+  	    return fn.apply(that, arguments);
+  	  };
+  	};
+  	return functionBindContext;
+  }
+
+  var arrayIteration;
+  var hasRequiredArrayIteration;
+
+  function requireArrayIteration () {
+  	if (hasRequiredArrayIteration) return arrayIteration;
+  	hasRequiredArrayIteration = 1;
+  	var bind = requireFunctionBindContext();
+  	var uncurryThis = requireFunctionUncurryThis();
+  	var IndexedObject = requireIndexedObject();
+  	var toObject = requireToObject();
+  	var lengthOfArrayLike = requireLengthOfArrayLike();
+  	var arraySpeciesCreate = requireArraySpeciesCreate();
+
+  	var push = uncurryThis([].push);
+
+  	// `Array.prototype.{ forEach, map, filter, some, every, find, findIndex, filterReject }` methods implementation
+  	var createMethod = function (TYPE) {
+  	  var IS_MAP = TYPE === 1;
+  	  var IS_FILTER = TYPE === 2;
+  	  var IS_SOME = TYPE === 3;
+  	  var IS_EVERY = TYPE === 4;
+  	  var IS_FIND_INDEX = TYPE === 6;
+  	  var IS_FILTER_REJECT = TYPE === 7;
+  	  var NO_HOLES = TYPE === 5 || IS_FIND_INDEX;
+  	  return function ($this, callbackfn, that, specificCreate) {
+  	    var O = toObject($this);
+  	    var self = IndexedObject(O);
+  	    var length = lengthOfArrayLike(self);
+  	    var boundFunction = bind(callbackfn, that);
+  	    var index = 0;
+  	    var create = specificCreate || arraySpeciesCreate;
+  	    var target = IS_MAP ? create($this, length) : IS_FILTER || IS_FILTER_REJECT ? create($this, 0) : undefined;
+  	    var value, result;
+  	    for (;length > index; index++) if (NO_HOLES || index in self) {
+  	      value = self[index];
+  	      result = boundFunction(value, index, O);
+  	      if (TYPE) {
+  	        if (IS_MAP) target[index] = result; // map
+  	        else if (result) switch (TYPE) {
+  	          case 3: return true;              // some
+  	          case 5: return value;             // find
+  	          case 6: return index;             // findIndex
+  	          case 2: push(target, value);      // filter
+  	        } else switch (TYPE) {
+  	          case 4: return false;             // every
+  	          case 7: push(target, value);      // filterReject
+  	        }
+  	      }
+  	    }
+  	    return IS_FIND_INDEX ? -1 : IS_SOME || IS_EVERY ? IS_EVERY : target;
+  	  };
+  	};
+
+  	arrayIteration = {
+  	  // `Array.prototype.forEach` method
+  	  // https://tc39.es/ecma262/#sec-array.prototype.foreach
+  	  forEach: createMethod(0),
+  	  // `Array.prototype.map` method
+  	  // https://tc39.es/ecma262/#sec-array.prototype.map
+  	  map: createMethod(1),
+  	  // `Array.prototype.filter` method
+  	  // https://tc39.es/ecma262/#sec-array.prototype.filter
+  	  filter: createMethod(2),
+  	  // `Array.prototype.some` method
+  	  // https://tc39.es/ecma262/#sec-array.prototype.some
+  	  some: createMethod(3),
+  	  // `Array.prototype.every` method
+  	  // https://tc39.es/ecma262/#sec-array.prototype.every
+  	  every: createMethod(4),
+  	  // `Array.prototype.find` method
+  	  // https://tc39.es/ecma262/#sec-array.prototype.find
+  	  find: createMethod(5),
+  	  // `Array.prototype.findIndex` method
+  	  // https://tc39.es/ecma262/#sec-array.prototype.findIndex
+  	  findIndex: createMethod(6),
+  	  // `Array.prototype.filterReject` method
+  	  // https://github.com/tc39/proposal-array-filtering
+  	  filterReject: createMethod(7)
+  	};
+  	return arrayIteration;
+  }
+
+  var hasRequiredEs_array_filter;
+
+  function requireEs_array_filter () {
+  	if (hasRequiredEs_array_filter) return es_array_filter;
+  	hasRequiredEs_array_filter = 1;
+  	var $ = require_export();
+  	var $filter = requireArrayIteration().filter;
+  	var arrayMethodHasSpeciesSupport = requireArrayMethodHasSpeciesSupport();
+
+  	var HAS_SPECIES_SUPPORT = arrayMethodHasSpeciesSupport('filter');
+
+  	// `Array.prototype.filter` method
+  	// https://tc39.es/ecma262/#sec-array.prototype.filter
+  	// with adding support of @@species
+  	$({ target: 'Array', proto: true, forced: !HAS_SPECIES_SUPPORT }, {
+  	  filter: function filter(callbackfn /* , thisArg */) {
+  	    return $filter(this, callbackfn, arguments.length > 1 ? arguments[1] : undefined);
+  	  }
+  	});
+  	return es_array_filter;
+  }
+
+  requireEs_array_filter();
+
+  var es_array_find = {};
 
   var objectDefineProperties = {};
 
-  var internalObjectKeys = objectKeysInternal;
-  var enumBugKeys$1 = enumBugKeys$3;
+  var objectKeys;
+  var hasRequiredObjectKeys;
 
-  // `Object.keys` method
-  // https://tc39.es/ecma262/#sec-object.keys
-  // eslint-disable-next-line es/no-object-keys -- safe
-  var objectKeys$3 = Object.keys || function keys(O) {
-    return internalObjectKeys(O, enumBugKeys$1);
-  };
+  function requireObjectKeys () {
+  	if (hasRequiredObjectKeys) return objectKeys;
+  	hasRequiredObjectKeys = 1;
+  	var internalObjectKeys = requireObjectKeysInternal();
+  	var enumBugKeys = requireEnumBugKeys();
 
-  var DESCRIPTORS$2 = descriptors;
-  var V8_PROTOTYPE_DEFINE_BUG = v8PrototypeDefineBug;
-  var definePropertyModule = objectDefineProperty;
-  var anObject$6 = anObject$9;
-  var toIndexedObject$2 = toIndexedObject$6;
-  var objectKeys$2 = objectKeys$3;
-
-  // `Object.defineProperties` method
-  // https://tc39.es/ecma262/#sec-object.defineproperties
-  // eslint-disable-next-line es/no-object-defineproperties -- safe
-  objectDefineProperties.f = DESCRIPTORS$2 && !V8_PROTOTYPE_DEFINE_BUG ? Object.defineProperties : function defineProperties(O, Properties) {
-    anObject$6(O);
-    var props = toIndexedObject$2(Properties);
-    var keys = objectKeys$2(Properties);
-    var length = keys.length;
-    var index = 0;
-    var key;
-    while (length > index) definePropertyModule.f(O, key = keys[index++], props[key]);
-    return O;
-  };
-
-  var getBuiltIn = getBuiltIn$4;
-
-  var html$1 = getBuiltIn('document', 'documentElement');
-
-  /* global ActiveXObject -- old IE, WSH */
-  var anObject$5 = anObject$9;
-  var definePropertiesModule = objectDefineProperties;
-  var enumBugKeys = enumBugKeys$3;
-  var hiddenKeys = hiddenKeys$4;
-  var html = html$1;
-  var documentCreateElement$1 = documentCreateElement$2;
-  var sharedKey$1 = sharedKey$3;
-
-  var GT = '>';
-  var LT = '<';
-  var PROTOTYPE = 'prototype';
-  var SCRIPT = 'script';
-  var IE_PROTO$1 = sharedKey$1('IE_PROTO');
-
-  var EmptyConstructor = function () { /* empty */ };
-
-  var scriptTag = function (content) {
-    return LT + SCRIPT + GT + content + LT + '/' + SCRIPT + GT;
-  };
-
-  // Create object with fake `null` prototype: use ActiveX Object with cleared prototype
-  var NullProtoObjectViaActiveX = function (activeXDocument) {
-    activeXDocument.write(scriptTag(''));
-    activeXDocument.close();
-    var temp = activeXDocument.parentWindow.Object;
-    activeXDocument = null; // avoid memory leak
-    return temp;
-  };
-
-  // Create object with fake `null` prototype: use iframe Object with cleared prototype
-  var NullProtoObjectViaIFrame = function () {
-    // Thrash, waste and sodomy: IE GC bug
-    var iframe = documentCreateElement$1('iframe');
-    var JS = 'java' + SCRIPT + ':';
-    var iframeDocument;
-    iframe.style.display = 'none';
-    html.appendChild(iframe);
-    // https://github.com/zloirock/core-js/issues/475
-    iframe.src = String(JS);
-    iframeDocument = iframe.contentWindow.document;
-    iframeDocument.open();
-    iframeDocument.write(scriptTag('document.F=Object'));
-    iframeDocument.close();
-    return iframeDocument.F;
-  };
-
-  // Check for document.domain and active x support
-  // No need to use active x approach when document.domain is not set
-  // see https://github.com/es-shims/es5-shim/issues/150
-  // variation of https://github.com/kitcambridge/es5-shim/commit/4f738ac066346
-  // avoid IE GC bug
-  var activeXDocument;
-  var NullProtoObject = function () {
-    try {
-      activeXDocument = new ActiveXObject('htmlfile');
-    } catch (error) { /* ignore */ }
-    NullProtoObject = typeof document != 'undefined'
-      ? document.domain && activeXDocument
-        ? NullProtoObjectViaActiveX(activeXDocument) // old IE
-        : NullProtoObjectViaIFrame()
-      : NullProtoObjectViaActiveX(activeXDocument); // WSH
-    var length = enumBugKeys.length;
-    while (length--) delete NullProtoObject[PROTOTYPE][enumBugKeys[length]];
-    return NullProtoObject();
-  };
-
-  hiddenKeys[IE_PROTO$1] = true;
-
-  // `Object.create` method
-  // https://tc39.es/ecma262/#sec-object.create
-  // eslint-disable-next-line es/no-object-create -- safe
-  var objectCreate = Object.create || function create(O, Properties) {
-    var result;
-    if (O !== null) {
-      EmptyConstructor[PROTOTYPE] = anObject$5(O);
-      result = new EmptyConstructor();
-      EmptyConstructor[PROTOTYPE] = null;
-      // add "__proto__" for Object.getPrototypeOf polyfill
-      result[IE_PROTO$1] = O;
-    } else result = NullProtoObject();
-    return Properties === undefined ? result : definePropertiesModule.f(result, Properties);
-  };
-
-  var wellKnownSymbol$4 = wellKnownSymbol$b;
-  var create$1 = objectCreate;
-  var defineProperty$1 = objectDefineProperty.f;
-
-  var UNSCOPABLES = wellKnownSymbol$4('unscopables');
-  var ArrayPrototype = Array.prototype;
-
-  // Array.prototype[@@unscopables]
-  // https://tc39.es/ecma262/#sec-array.prototype-@@unscopables
-  if (ArrayPrototype[UNSCOPABLES] === undefined) {
-    defineProperty$1(ArrayPrototype, UNSCOPABLES, {
-      configurable: true,
-      value: create$1(null)
-    });
+  	// `Object.keys` method
+  	// https://tc39.es/ecma262/#sec-object.keys
+  	// eslint-disable-next-line es/no-object-keys -- safe
+  	objectKeys = Object.keys || function keys(O) {
+  	  return internalObjectKeys(O, enumBugKeys);
+  	};
+  	return objectKeys;
   }
 
-  // add a key to Array.prototype[@@unscopables]
-  var addToUnscopables$2 = function (key) {
-    ArrayPrototype[UNSCOPABLES][key] = true;
-  };
+  var hasRequiredObjectDefineProperties;
 
-  var $$9 = _export;
-  var $find = arrayIteration.find;
-  var addToUnscopables$1 = addToUnscopables$2;
+  function requireObjectDefineProperties () {
+  	if (hasRequiredObjectDefineProperties) return objectDefineProperties;
+  	hasRequiredObjectDefineProperties = 1;
+  	var DESCRIPTORS = requireDescriptors();
+  	var V8_PROTOTYPE_DEFINE_BUG = requireV8PrototypeDefineBug();
+  	var definePropertyModule = requireObjectDefineProperty();
+  	var anObject = requireAnObject();
+  	var toIndexedObject = requireToIndexedObject();
+  	var objectKeys = requireObjectKeys();
 
-  var FIND = 'find';
-  var SKIPS_HOLES = true;
-
-  // Shouldn't skip holes
-  // eslint-disable-next-line es/no-array-prototype-find -- testing
-  if (FIND in []) Array(1)[FIND](function () { SKIPS_HOLES = false; });
-
-  // `Array.prototype.find` method
-  // https://tc39.es/ecma262/#sec-array.prototype.find
-  $$9({ target: 'Array', proto: true, forced: SKIPS_HOLES }, {
-    find: function find(callbackfn /* , that = undefined */) {
-      return $find(this, callbackfn, arguments.length > 1 ? arguments[1] : undefined);
-    }
-  });
-
-  // https://tc39.es/ecma262/#sec-array.prototype-@@unscopables
-  addToUnscopables$1(FIND);
-
-  var $$8 = _export;
-  var $includes = arrayIncludes.includes;
-  var fails$c = fails$o;
-  var addToUnscopables = addToUnscopables$2;
-
-  // FF99+ bug
-  var BROKEN_ON_SPARSE = fails$c(function () {
-    // eslint-disable-next-line es/no-array-prototype-includes -- detection
-    return !Array(1).includes();
-  });
-
-  // `Array.prototype.includes` method
-  // https://tc39.es/ecma262/#sec-array.prototype.includes
-  $$8({ target: 'Array', proto: true, forced: BROKEN_ON_SPARSE }, {
-    includes: function includes(el /* , fromIndex = 0 */) {
-      return $includes(this, el, arguments.length > 1 ? arguments[1] : undefined);
-    }
-  });
-
-  // https://tc39.es/ecma262/#sec-array.prototype-@@unscopables
-  addToUnscopables('includes');
-
-  var fails$b = fails$o;
-
-  var arrayMethodIsStrict$2 = function (METHOD_NAME, argument) {
-    var method = [][METHOD_NAME];
-    return !!method && fails$b(function () {
-      // eslint-disable-next-line no-useless-call -- required for testing
-      method.call(null, argument || function () { return 1; }, 1);
-    });
-  };
-
-  var $$7 = _export;
-  var uncurryThis$7 = functionUncurryThis;
-  var IndexedObject$1 = indexedObject;
-  var toIndexedObject$1 = toIndexedObject$6;
-  var arrayMethodIsStrict$1 = arrayMethodIsStrict$2;
-
-  var nativeJoin = uncurryThis$7([].join);
-
-  var ES3_STRINGS = IndexedObject$1 !== Object;
-  var FORCED$1 = ES3_STRINGS || !arrayMethodIsStrict$1('join', ',');
-
-  // `Array.prototype.join` method
-  // https://tc39.es/ecma262/#sec-array.prototype.join
-  $$7({ target: 'Array', proto: true, forced: FORCED$1 }, {
-    join: function join(separator) {
-      return nativeJoin(toIndexedObject$1(this), separator === undefined ? ',' : separator);
-    }
-  });
-
-  var $$6 = _export;
-  var $map = arrayIteration.map;
-  var arrayMethodHasSpeciesSupport = arrayMethodHasSpeciesSupport$3;
-
-  var HAS_SPECIES_SUPPORT = arrayMethodHasSpeciesSupport('map');
-
-  // `Array.prototype.map` method
-  // https://tc39.es/ecma262/#sec-array.prototype.map
-  // with adding support of @@species
-  $$6({ target: 'Array', proto: true, forced: !HAS_SPECIES_SUPPORT }, {
-    map: function map(callbackfn /* , thisArg */) {
-      return $map(this, callbackfn, arguments.length > 1 ? arguments[1] : undefined);
-    }
-  });
-
-  var $$5 = _export;
-  var fails$a = fails$o;
-  var toObject$4 = toObject$8;
-  var toPrimitive = toPrimitive$2;
-
-  var FORCED = fails$a(function () {
-    return new Date(NaN).toJSON() !== null
-      || Date.prototype.toJSON.call({ toISOString: function () { return 1; } }) !== 1;
-  });
-
-  // `Date.prototype.toJSON` method
-  // https://tc39.es/ecma262/#sec-date.prototype.tojson
-  $$5({ target: 'Date', proto: true, arity: 1, forced: FORCED }, {
-    // eslint-disable-next-line no-unused-vars -- required for `.length`
-    toJSON: function toJSON(key) {
-      var O = toObject$4(this);
-      var pv = toPrimitive(O, 'number');
-      return typeof pv == 'number' && !isFinite(pv) ? null : O.toISOString();
-    }
-  });
-
-  var DESCRIPTORS$1 = descriptors;
-  var uncurryThis$6 = functionUncurryThis;
-  var call$7 = functionCall;
-  var fails$9 = fails$o;
-  var objectKeys$1 = objectKeys$3;
-  var getOwnPropertySymbolsModule = objectGetOwnPropertySymbols;
-  var propertyIsEnumerableModule = objectPropertyIsEnumerable;
-  var toObject$3 = toObject$8;
-  var IndexedObject = indexedObject;
-
-  // eslint-disable-next-line es/no-object-assign -- safe
-  var $assign = Object.assign;
-  // eslint-disable-next-line es/no-object-defineproperty -- required for testing
-  var defineProperty = Object.defineProperty;
-  var concat$1 = uncurryThis$6([].concat);
-
-  // `Object.assign` method
-  // https://tc39.es/ecma262/#sec-object.assign
-  var objectAssign = !$assign || fails$9(function () {
-    // should have correct order of operations (Edge bug)
-    if (DESCRIPTORS$1 && $assign({ b: 1 }, $assign(defineProperty({}, 'a', {
-      enumerable: true,
-      get: function () {
-        defineProperty(this, 'b', {
-          value: 3,
-          enumerable: false
-        });
-      }
-    }), { b: 2 })).b !== 1) return true;
-    // should work with symbols and should have deterministic property order (V8 bug)
-    var A = {};
-    var B = {};
-    // eslint-disable-next-line es/no-symbol -- safe
-    var symbol = Symbol('assign detection');
-    var alphabet = 'abcdefghijklmnopqrst';
-    A[symbol] = 7;
-    alphabet.split('').forEach(function (chr) { B[chr] = chr; });
-    return $assign({}, A)[symbol] !== 7 || objectKeys$1($assign({}, B)).join('') !== alphabet;
-  }) ? function assign(target, source) { // eslint-disable-line no-unused-vars -- required for `.length`
-    var T = toObject$3(target);
-    var argumentsLength = arguments.length;
-    var index = 1;
-    var getOwnPropertySymbols = getOwnPropertySymbolsModule.f;
-    var propertyIsEnumerable = propertyIsEnumerableModule.f;
-    while (argumentsLength > index) {
-      var S = IndexedObject(arguments[index++]);
-      var keys = getOwnPropertySymbols ? concat$1(objectKeys$1(S), getOwnPropertySymbols(S)) : objectKeys$1(S);
-      var length = keys.length;
-      var j = 0;
-      var key;
-      while (length > j) {
-        key = keys[j++];
-        if (!DESCRIPTORS$1 || call$7(propertyIsEnumerable, S, key)) T[key] = S[key];
-      }
-    } return T;
-  } : $assign;
-
-  var $$4 = _export;
-  var assign = objectAssign;
-
-  // `Object.assign` method
-  // https://tc39.es/ecma262/#sec-object.assign
-  // eslint-disable-next-line es/no-object-assign -- required for testing
-  $$4({ target: 'Object', stat: true, arity: 2, forced: Object.assign !== assign }, {
-    assign: assign
-  });
-
-  var fails$8 = fails$o;
-
-  var correctPrototypeGetter = !fails$8(function () {
-    function F() { /* empty */ }
-    F.prototype.constructor = null;
-    // eslint-disable-next-line es/no-object-getprototypeof -- required for testing
-    return Object.getPrototypeOf(new F()) !== F.prototype;
-  });
-
-  var hasOwn$1 = hasOwnProperty_1;
-  var isCallable$2 = isCallable$f;
-  var toObject$2 = toObject$8;
-  var sharedKey = sharedKey$3;
-  var CORRECT_PROTOTYPE_GETTER = correctPrototypeGetter;
-
-  var IE_PROTO = sharedKey('IE_PROTO');
-  var $Object = Object;
-  var ObjectPrototype = $Object.prototype;
-
-  // `Object.getPrototypeOf` method
-  // https://tc39.es/ecma262/#sec-object.getprototypeof
-  // eslint-disable-next-line es/no-object-getprototypeof -- safe
-  var objectGetPrototypeOf$1 = CORRECT_PROTOTYPE_GETTER ? $Object.getPrototypeOf : function (O) {
-    var object = toObject$2(O);
-    if (hasOwn$1(object, IE_PROTO)) return object[IE_PROTO];
-    var constructor = object.constructor;
-    if (isCallable$2(constructor) && object instanceof constructor) {
-      return constructor.prototype;
-    } return object instanceof $Object ? ObjectPrototype : null;
-  };
-
-  var DESCRIPTORS = descriptors;
-  var fails$7 = fails$o;
-  var uncurryThis$5 = functionUncurryThis;
-  var objectGetPrototypeOf = objectGetPrototypeOf$1;
-  var objectKeys = objectKeys$3;
-  var toIndexedObject = toIndexedObject$6;
-  var $propertyIsEnumerable = objectPropertyIsEnumerable.f;
-
-  var propertyIsEnumerable = uncurryThis$5($propertyIsEnumerable);
-  var push$1 = uncurryThis$5([].push);
-
-  // in some IE versions, `propertyIsEnumerable` returns incorrect result on integer keys
-  // of `null` prototype objects
-  var IE_BUG = DESCRIPTORS && fails$7(function () {
-    // eslint-disable-next-line es/no-object-create -- safe
-    var O = Object.create(null);
-    O[2] = 2;
-    return !propertyIsEnumerable(O, 2);
-  });
-
-  // `Object.{ entries, values }` methods implementation
-  var createMethod$1 = function (TO_ENTRIES) {
-    return function (it) {
-      var O = toIndexedObject(it);
-      var keys = objectKeys(O);
-      var IE_WORKAROUND = IE_BUG && objectGetPrototypeOf(O) === null;
-      var length = keys.length;
-      var i = 0;
-      var result = [];
-      var key;
-      while (length > i) {
-        key = keys[i++];
-        if (!DESCRIPTORS || (IE_WORKAROUND ? key in O : propertyIsEnumerable(O, key))) {
-          push$1(result, TO_ENTRIES ? [key, O[key]] : O[key]);
-        }
-      }
-      return result;
-    };
-  };
-
-  var objectToArray = {
-    // `Object.entries` method
-    // https://tc39.es/ecma262/#sec-object.entries
-    entries: createMethod$1(true),
-    // `Object.values` method
-    // https://tc39.es/ecma262/#sec-object.values
-    values: createMethod$1(false)
-  };
-
-  var $$3 = _export;
-  var $entries = objectToArray.entries;
-
-  // `Object.entries` method
-  // https://tc39.es/ecma262/#sec-object.entries
-  $$3({ target: 'Object', stat: true }, {
-    entries: function entries(O) {
-      return $entries(O);
-    }
-  });
-
-  var $$2 = _export;
-  var toObject$1 = toObject$8;
-  var nativeKeys = objectKeys$3;
-  var fails$6 = fails$o;
-
-  var FAILS_ON_PRIMITIVES = fails$6(function () { nativeKeys(1); });
-
-  // `Object.keys` method
-  // https://tc39.es/ecma262/#sec-object.keys
-  $$2({ target: 'Object', stat: true, forced: FAILS_ON_PRIMITIVES }, {
-    keys: function keys(it) {
-      return nativeKeys(toObject$1(it));
-    }
-  });
-
-  var TO_STRING_TAG_SUPPORT$1 = toStringTagSupport;
-  var classof$3 = classof$5;
-
-  // `Object.prototype.toString` method implementation
-  // https://tc39.es/ecma262/#sec-object.prototype.tostring
-  var objectToString = TO_STRING_TAG_SUPPORT$1 ? {}.toString : function toString() {
-    return '[object ' + classof$3(this) + ']';
-  };
-
-  var TO_STRING_TAG_SUPPORT = toStringTagSupport;
-  var defineBuiltIn$2 = defineBuiltIn$4;
-  var toString$6 = objectToString;
-
-  // `Object.prototype.toString` method
-  // https://tc39.es/ecma262/#sec-object.prototype.tostring
-  if (!TO_STRING_TAG_SUPPORT) {
-    defineBuiltIn$2(Object.prototype, 'toString', toString$6, { unsafe: true });
+  	// `Object.defineProperties` method
+  	// https://tc39.es/ecma262/#sec-object.defineproperties
+  	// eslint-disable-next-line es/no-object-defineproperties -- safe
+  	objectDefineProperties.f = DESCRIPTORS && !V8_PROTOTYPE_DEFINE_BUG ? Object.defineProperties : function defineProperties(O, Properties) {
+  	  anObject(O);
+  	  var props = toIndexedObject(Properties);
+  	  var keys = objectKeys(Properties);
+  	  var length = keys.length;
+  	  var index = 0;
+  	  var key;
+  	  while (length > index) definePropertyModule.f(O, key = keys[index++], props[key]);
+  	  return O;
+  	};
+  	return objectDefineProperties;
   }
 
-  var classof$2 = classof$5;
+  var html;
+  var hasRequiredHtml;
 
-  var $String = String;
+  function requireHtml () {
+  	if (hasRequiredHtml) return html;
+  	hasRequiredHtml = 1;
+  	var getBuiltIn = requireGetBuiltIn();
 
-  var toString$5 = function (argument) {
-    if (classof$2(argument) === 'Symbol') throw new TypeError('Cannot convert a Symbol value to a string');
-    return $String(argument);
-  };
-
-  var anObject$4 = anObject$9;
-
-  // `RegExp.prototype.flags` getter implementation
-  // https://tc39.es/ecma262/#sec-get-regexp.prototype.flags
-  var regexpFlags$1 = function () {
-    var that = anObject$4(this);
-    var result = '';
-    if (that.hasIndices) result += 'd';
-    if (that.global) result += 'g';
-    if (that.ignoreCase) result += 'i';
-    if (that.multiline) result += 'm';
-    if (that.dotAll) result += 's';
-    if (that.unicode) result += 'u';
-    if (that.unicodeSets) result += 'v';
-    if (that.sticky) result += 'y';
-    return result;
-  };
-
-  var fails$5 = fails$o;
-  var global$4 = global$e;
-
-  // babel-minify and Closure Compiler transpiles RegExp('a', 'y') -> /a/y and it causes SyntaxError
-  var $RegExp$2 = global$4.RegExp;
-
-  var UNSUPPORTED_Y$1 = fails$5(function () {
-    var re = $RegExp$2('a', 'y');
-    re.lastIndex = 2;
-    return re.exec('abcd') !== null;
-  });
-
-  // UC Browser bug
-  // https://github.com/zloirock/core-js/issues/1008
-  var MISSED_STICKY = UNSUPPORTED_Y$1 || fails$5(function () {
-    return !$RegExp$2('a', 'y').sticky;
-  });
-
-  var BROKEN_CARET = UNSUPPORTED_Y$1 || fails$5(function () {
-    // https://bugzilla.mozilla.org/show_bug.cgi?id=773687
-    var re = $RegExp$2('^r', 'gy');
-    re.lastIndex = 2;
-    return re.exec('str') !== null;
-  });
-
-  var regexpStickyHelpers = {
-    BROKEN_CARET: BROKEN_CARET,
-    MISSED_STICKY: MISSED_STICKY,
-    UNSUPPORTED_Y: UNSUPPORTED_Y$1
-  };
-
-  var fails$4 = fails$o;
-  var global$3 = global$e;
-
-  // babel-minify and Closure Compiler transpiles RegExp('.', 's') -> /./s and it causes SyntaxError
-  var $RegExp$1 = global$3.RegExp;
-
-  var regexpUnsupportedDotAll = fails$4(function () {
-    var re = $RegExp$1('.', 's');
-    return !(re.dotAll && re.test('\n') && re.flags === 's');
-  });
-
-  var fails$3 = fails$o;
-  var global$2 = global$e;
-
-  // babel-minify and Closure Compiler transpiles RegExp('(?<a>b)', 'g') -> /(?<a>b)/g and it causes SyntaxError
-  var $RegExp = global$2.RegExp;
-
-  var regexpUnsupportedNcg = fails$3(function () {
-    var re = $RegExp('(?<a>b)', 'g');
-    return re.exec('b').groups.a !== 'b' ||
-      'b'.replace(re, '$<a>c') !== 'bc';
-  });
-
-  /* eslint-disable regexp/no-empty-capturing-group, regexp/no-empty-group, regexp/no-lazy-ends -- testing */
-  /* eslint-disable regexp/no-useless-quantifier -- testing */
-  var call$6 = functionCall;
-  var uncurryThis$4 = functionUncurryThis;
-  var toString$4 = toString$5;
-  var regexpFlags = regexpFlags$1;
-  var stickyHelpers = regexpStickyHelpers;
-  var shared = shared$4;
-  var create = objectCreate;
-  var getInternalState = internalState.get;
-  var UNSUPPORTED_DOT_ALL = regexpUnsupportedDotAll;
-  var UNSUPPORTED_NCG = regexpUnsupportedNcg;
-
-  var nativeReplace = shared('native-string-replace', String.prototype.replace);
-  var nativeExec = RegExp.prototype.exec;
-  var patchedExec = nativeExec;
-  var charAt$3 = uncurryThis$4(''.charAt);
-  var indexOf = uncurryThis$4(''.indexOf);
-  var replace$1 = uncurryThis$4(''.replace);
-  var stringSlice$3 = uncurryThis$4(''.slice);
-
-  var UPDATES_LAST_INDEX_WRONG = (function () {
-    var re1 = /a/;
-    var re2 = /b*/g;
-    call$6(nativeExec, re1, 'a');
-    call$6(nativeExec, re2, 'a');
-    return re1.lastIndex !== 0 || re2.lastIndex !== 0;
-  })();
-
-  var UNSUPPORTED_Y = stickyHelpers.BROKEN_CARET;
-
-  // nonparticipating capturing group, copied from es5-shim's String#split patch.
-  var NPCG_INCLUDED = /()??/.exec('')[1] !== undefined;
-
-  var PATCH = UPDATES_LAST_INDEX_WRONG || NPCG_INCLUDED || UNSUPPORTED_Y || UNSUPPORTED_DOT_ALL || UNSUPPORTED_NCG;
-
-  if (PATCH) {
-    patchedExec = function exec(string) {
-      var re = this;
-      var state = getInternalState(re);
-      var str = toString$4(string);
-      var raw = state.raw;
-      var result, reCopy, lastIndex, match, i, object, group;
-
-      if (raw) {
-        raw.lastIndex = re.lastIndex;
-        result = call$6(patchedExec, raw, str);
-        re.lastIndex = raw.lastIndex;
-        return result;
-      }
-
-      var groups = state.groups;
-      var sticky = UNSUPPORTED_Y && re.sticky;
-      var flags = call$6(regexpFlags, re);
-      var source = re.source;
-      var charsAdded = 0;
-      var strCopy = str;
-
-      if (sticky) {
-        flags = replace$1(flags, 'y', '');
-        if (indexOf(flags, 'g') === -1) {
-          flags += 'g';
-        }
-
-        strCopy = stringSlice$3(str, re.lastIndex);
-        // Support anchored sticky behavior.
-        if (re.lastIndex > 0 && (!re.multiline || re.multiline && charAt$3(str, re.lastIndex - 1) !== '\n')) {
-          source = '(?: ' + source + ')';
-          strCopy = ' ' + strCopy;
-          charsAdded++;
-        }
-        // ^(? + rx + ) is needed, in combination with some str slicing, to
-        // simulate the 'y' flag.
-        reCopy = new RegExp('^(?:' + source + ')', flags);
-      }
-
-      if (NPCG_INCLUDED) {
-        reCopy = new RegExp('^' + source + '$(?!\\s)', flags);
-      }
-      if (UPDATES_LAST_INDEX_WRONG) lastIndex = re.lastIndex;
-
-      match = call$6(nativeExec, sticky ? reCopy : re, strCopy);
-
-      if (sticky) {
-        if (match) {
-          match.input = stringSlice$3(match.input, charsAdded);
-          match[0] = stringSlice$3(match[0], charsAdded);
-          match.index = re.lastIndex;
-          re.lastIndex += match[0].length;
-        } else re.lastIndex = 0;
-      } else if (UPDATES_LAST_INDEX_WRONG && match) {
-        re.lastIndex = re.global ? match.index + match[0].length : lastIndex;
-      }
-      if (NPCG_INCLUDED && match && match.length > 1) {
-        // Fix browsers whose `exec` methods don't consistently return `undefined`
-        // for NPCG, like IE8. NOTE: This doesn't work for /(.?)?/
-        call$6(nativeReplace, match[0], reCopy, function () {
-          for (i = 1; i < arguments.length - 2; i++) {
-            if (arguments[i] === undefined) match[i] = undefined;
-          }
-        });
-      }
-
-      if (match && groups) {
-        match.groups = object = create(null);
-        for (i = 0; i < groups.length; i++) {
-          group = groups[i];
-          object[group[0]] = match[group[1]];
-        }
-      }
-
-      return match;
-    };
+  	html = getBuiltIn('document', 'documentElement');
+  	return html;
   }
 
-  var regexpExec$2 = patchedExec;
+  var objectCreate;
+  var hasRequiredObjectCreate;
 
-  var $$1 = _export;
-  var exec = regexpExec$2;
+  function requireObjectCreate () {
+  	if (hasRequiredObjectCreate) return objectCreate;
+  	hasRequiredObjectCreate = 1;
+  	/* global ActiveXObject -- old IE, WSH */
+  	var anObject = requireAnObject();
+  	var definePropertiesModule = requireObjectDefineProperties();
+  	var enumBugKeys = requireEnumBugKeys();
+  	var hiddenKeys = requireHiddenKeys();
+  	var html = requireHtml();
+  	var documentCreateElement = requireDocumentCreateElement();
+  	var sharedKey = requireSharedKey();
 
-  // `RegExp.prototype.exec` method
-  // https://tc39.es/ecma262/#sec-regexp.prototype.exec
-  $$1({ target: 'RegExp', proto: true, forced: /./.exec !== exec }, {
-    exec: exec
-  });
+  	var GT = '>';
+  	var LT = '<';
+  	var PROTOTYPE = 'prototype';
+  	var SCRIPT = 'script';
+  	var IE_PROTO = sharedKey('IE_PROTO');
 
-  var call$5 = functionCall;
-  var hasOwn = hasOwnProperty_1;
-  var isPrototypeOf = objectIsPrototypeOf;
-  var regExpFlags = regexpFlags$1;
+  	var EmptyConstructor = function () { /* empty */ };
 
-  var RegExpPrototype$2 = RegExp.prototype;
+  	var scriptTag = function (content) {
+  	  return LT + SCRIPT + GT + content + LT + '/' + SCRIPT + GT;
+  	};
 
-  var regexpGetFlags = function (R) {
-    var flags = R.flags;
-    return flags === undefined && !('flags' in RegExpPrototype$2) && !hasOwn(R, 'flags') && isPrototypeOf(RegExpPrototype$2, R)
-      ? call$5(regExpFlags, R) : flags;
-  };
+  	// Create object with fake `null` prototype: use ActiveX Object with cleared prototype
+  	var NullProtoObjectViaActiveX = function (activeXDocument) {
+  	  activeXDocument.write(scriptTag(''));
+  	  activeXDocument.close();
+  	  var temp = activeXDocument.parentWindow.Object;
+  	  // eslint-disable-next-line no-useless-assignment -- avoid memory leak
+  	  activeXDocument = null;
+  	  return temp;
+  	};
 
-  var PROPER_FUNCTION_NAME = functionName.PROPER;
-  var defineBuiltIn$1 = defineBuiltIn$4;
-  var anObject$3 = anObject$9;
-  var $toString = toString$5;
-  var fails$2 = fails$o;
-  var getRegExpFlags = regexpGetFlags;
+  	// Create object with fake `null` prototype: use iframe Object with cleared prototype
+  	var NullProtoObjectViaIFrame = function () {
+  	  // Thrash, waste and sodomy: IE GC bug
+  	  var iframe = documentCreateElement('iframe');
+  	  var JS = 'java' + SCRIPT + ':';
+  	  var iframeDocument;
+  	  iframe.style.display = 'none';
+  	  html.appendChild(iframe);
+  	  // https://github.com/zloirock/core-js/issues/475
+  	  iframe.src = String(JS);
+  	  iframeDocument = iframe.contentWindow.document;
+  	  iframeDocument.open();
+  	  iframeDocument.write(scriptTag('document.F=Object'));
+  	  iframeDocument.close();
+  	  return iframeDocument.F;
+  	};
 
-  var TO_STRING = 'toString';
-  var RegExpPrototype$1 = RegExp.prototype;
-  var nativeToString = RegExpPrototype$1[TO_STRING];
+  	// Check for document.domain and active x support
+  	// No need to use active x approach when document.domain is not set
+  	// see https://github.com/es-shims/es5-shim/issues/150
+  	// variation of https://github.com/kitcambridge/es5-shim/commit/4f738ac066346
+  	// avoid IE GC bug
+  	var activeXDocument;
+  	var NullProtoObject = function () {
+  	  try {
+  	    activeXDocument = new ActiveXObject('htmlfile');
+  	  } catch (error) { /* ignore */ }
+  	  NullProtoObject = typeof document != 'undefined'
+  	    ? document.domain && activeXDocument
+  	      ? NullProtoObjectViaActiveX(activeXDocument) // old IE
+  	      : NullProtoObjectViaIFrame()
+  	    : NullProtoObjectViaActiveX(activeXDocument); // WSH
+  	  var length = enumBugKeys.length;
+  	  while (length--) delete NullProtoObject[PROTOTYPE][enumBugKeys[length]];
+  	  return NullProtoObject();
+  	};
 
-  var NOT_GENERIC = fails$2(function () { return nativeToString.call({ source: 'a', flags: 'b' }) !== '/a/b'; });
-  // FF44- RegExp#toString has a wrong name
-  var INCORRECT_NAME = PROPER_FUNCTION_NAME && nativeToString.name !== TO_STRING;
+  	hiddenKeys[IE_PROTO] = true;
 
-  // `RegExp.prototype.toString` method
-  // https://tc39.es/ecma262/#sec-regexp.prototype.tostring
-  if (NOT_GENERIC || INCORRECT_NAME) {
-    defineBuiltIn$1(RegExpPrototype$1, TO_STRING, function toString() {
-      var R = anObject$3(this);
-      var pattern = $toString(R.source);
-      var flags = $toString(getRegExpFlags(R));
-      return '/' + pattern + '/' + flags;
-    }, { unsafe: true });
+  	// `Object.create` method
+  	// https://tc39.es/ecma262/#sec-object.create
+  	// eslint-disable-next-line es/no-object-create -- safe
+  	objectCreate = Object.create || function create(O, Properties) {
+  	  var result;
+  	  if (O !== null) {
+  	    EmptyConstructor[PROTOTYPE] = anObject(O);
+  	    result = new EmptyConstructor();
+  	    EmptyConstructor[PROTOTYPE] = null;
+  	    // add "__proto__" for Object.getPrototypeOf polyfill
+  	    result[IE_PROTO] = O;
+  	  } else result = NullProtoObject();
+  	  return Properties === undefined ? result : definePropertiesModule.f(result, Properties);
+  	};
+  	return objectCreate;
   }
 
-  var isObject = isObject$8;
-  var classof$1 = classofRaw$2;
-  var wellKnownSymbol$3 = wellKnownSymbol$b;
-
-  var MATCH$1 = wellKnownSymbol$3('match');
-
-  // `IsRegExp` abstract operation
-  // https://tc39.es/ecma262/#sec-isregexp
-  var isRegexp = function (it) {
-    var isRegExp;
-    return isObject(it) && ((isRegExp = it[MATCH$1]) !== undefined ? !!isRegExp : classof$1(it) === 'RegExp');
-  };
-
-  var isRegExp = isRegexp;
-
-  var $TypeError$1 = TypeError;
-
-  var notARegexp = function (it) {
-    if (isRegExp(it)) {
-      throw new $TypeError$1("The method doesn't accept regular expressions");
-    } return it;
-  };
-
-  var wellKnownSymbol$2 = wellKnownSymbol$b;
-
-  var MATCH = wellKnownSymbol$2('match');
-
-  var correctIsRegexpLogic = function (METHOD_NAME) {
-    var regexp = /./;
-    try {
-      '/./'[METHOD_NAME](regexp);
-    } catch (error1) {
-      try {
-        regexp[MATCH] = false;
-        return '/./'[METHOD_NAME](regexp);
-      } catch (error2) { /* empty */ }
-    } return false;
-  };
-
-  var $ = _export;
-  var uncurryThis$3 = functionUncurryThis;
-  var notARegExp = notARegexp;
-  var requireObjectCoercible$3 = requireObjectCoercible$6;
-  var toString$3 = toString$5;
-  var correctIsRegExpLogic = correctIsRegexpLogic;
-
-  var stringIndexOf$1 = uncurryThis$3(''.indexOf);
-
-  // `String.prototype.includes` method
-  // https://tc39.es/ecma262/#sec-string.prototype.includes
-  $({ target: 'String', proto: true, forced: !correctIsRegExpLogic('includes') }, {
-    includes: function includes(searchString /* , position = 0 */) {
-      return !!~stringIndexOf$1(
-        toString$3(requireObjectCoercible$3(this)),
-        toString$3(notARegExp(searchString)),
-        arguments.length > 1 ? arguments[1] : undefined
-      );
-    }
-  });
-
-  var NATIVE_BIND = functionBindNative;
-
-  var FunctionPrototype = Function.prototype;
-  var apply$1 = FunctionPrototype.apply;
-  var call$4 = FunctionPrototype.call;
-
-  // eslint-disable-next-line es/no-reflect -- safe
-  var functionApply = typeof Reflect == 'object' && Reflect.apply || (NATIVE_BIND ? call$4.bind(apply$1) : function () {
-    return call$4.apply(apply$1, arguments);
-  });
-
-  // TODO: Remove from `core-js@4` since it's moved to entry points
-
-  var call$3 = functionCall;
-  var defineBuiltIn = defineBuiltIn$4;
-  var regexpExec$1 = regexpExec$2;
-  var fails$1 = fails$o;
-  var wellKnownSymbol$1 = wellKnownSymbol$b;
-  var createNonEnumerableProperty$1 = createNonEnumerableProperty$4;
-
-  var SPECIES = wellKnownSymbol$1('species');
-  var RegExpPrototype = RegExp.prototype;
-
-  var fixRegexpWellKnownSymbolLogic = function (KEY, exec, FORCED, SHAM) {
-    var SYMBOL = wellKnownSymbol$1(KEY);
-
-    var DELEGATES_TO_SYMBOL = !fails$1(function () {
-      // String methods call symbol-named RegExp methods
-      var O = {};
-      O[SYMBOL] = function () { return 7; };
-      return ''[KEY](O) !== 7;
-    });
-
-    var DELEGATES_TO_EXEC = DELEGATES_TO_SYMBOL && !fails$1(function () {
-      // Symbol-named RegExp methods call .exec
-      var execCalled = false;
-      var re = /a/;
-
-      if (KEY === 'split') {
-        // We can't use real regex here since it causes deoptimization
-        // and serious performance degradation in V8
-        // https://github.com/zloirock/core-js/issues/306
-        re = {};
-        // RegExp[@@split] doesn't call the regex's exec method, but first creates
-        // a new one. We need to return the patched regex when creating the new one.
-        re.constructor = {};
-        re.constructor[SPECIES] = function () { return re; };
-        re.flags = '';
-        re[SYMBOL] = /./[SYMBOL];
-      }
-
-      re.exec = function () {
-        execCalled = true;
-        return null;
-      };
-
-      re[SYMBOL]('');
-      return !execCalled;
-    });
-
-    if (
-      !DELEGATES_TO_SYMBOL ||
-      !DELEGATES_TO_EXEC ||
-      FORCED
-    ) {
-      var nativeRegExpMethod = /./[SYMBOL];
-      var methods = exec(SYMBOL, ''[KEY], function (nativeMethod, regexp, str, arg2, forceStringMethod) {
-        var $exec = regexp.exec;
-        if ($exec === regexpExec$1 || $exec === RegExpPrototype.exec) {
-          if (DELEGATES_TO_SYMBOL && !forceStringMethod) {
-            // The native String method already delegates to @@method (this
-            // polyfilled function), leasing to infinite recursion.
-            // We avoid it by directly calling the native @@method method.
-            return { done: true, value: call$3(nativeRegExpMethod, regexp, str, arg2) };
-          }
-          return { done: true, value: call$3(nativeMethod, str, regexp, arg2) };
-        }
-        return { done: false };
-      });
-
-      defineBuiltIn(String.prototype, KEY, methods[0]);
-      defineBuiltIn(RegExpPrototype, SYMBOL, methods[1]);
-    }
-
-    if (SHAM) createNonEnumerableProperty$1(RegExpPrototype[SYMBOL], 'sham', true);
-  };
-
-  var uncurryThis$2 = functionUncurryThis;
-  var toIntegerOrInfinity$1 = toIntegerOrInfinity$4;
-  var toString$2 = toString$5;
-  var requireObjectCoercible$2 = requireObjectCoercible$6;
-
-  var charAt$2 = uncurryThis$2(''.charAt);
-  var charCodeAt = uncurryThis$2(''.charCodeAt);
-  var stringSlice$2 = uncurryThis$2(''.slice);
-
-  var createMethod = function (CONVERT_TO_STRING) {
-    return function ($this, pos) {
-      var S = toString$2(requireObjectCoercible$2($this));
-      var position = toIntegerOrInfinity$1(pos);
-      var size = S.length;
-      var first, second;
-      if (position < 0 || position >= size) return CONVERT_TO_STRING ? '' : undefined;
-      first = charCodeAt(S, position);
-      return first < 0xD800 || first > 0xDBFF || position + 1 === size
-        || (second = charCodeAt(S, position + 1)) < 0xDC00 || second > 0xDFFF
-          ? CONVERT_TO_STRING
-            ? charAt$2(S, position)
-            : first
-          : CONVERT_TO_STRING
-            ? stringSlice$2(S, position, position + 2)
-            : (first - 0xD800 << 10) + (second - 0xDC00) + 0x10000;
-    };
-  };
-
-  var stringMultibyte = {
-    // `String.prototype.codePointAt` method
-    // https://tc39.es/ecma262/#sec-string.prototype.codepointat
-    codeAt: createMethod(false),
-    // `String.prototype.at` method
-    // https://github.com/mathiasbynens/String.prototype.at
-    charAt: createMethod(true)
-  };
-
-  var charAt$1 = stringMultibyte.charAt;
-
-  // `AdvanceStringIndex` abstract operation
-  // https://tc39.es/ecma262/#sec-advancestringindex
-  var advanceStringIndex$1 = function (S, index, unicode) {
-    return index + (unicode ? charAt$1(S, index).length : 1);
-  };
-
-  var uncurryThis$1 = functionUncurryThis;
-  var toObject = toObject$8;
-
-  var floor = Math.floor;
-  var charAt = uncurryThis$1(''.charAt);
-  var replace = uncurryThis$1(''.replace);
-  var stringSlice$1 = uncurryThis$1(''.slice);
-  // eslint-disable-next-line redos/no-vulnerable -- safe
-  var SUBSTITUTION_SYMBOLS = /\$([$&'`]|\d{1,2}|<[^>]*>)/g;
-  var SUBSTITUTION_SYMBOLS_NO_NAMED = /\$([$&'`]|\d{1,2})/g;
-
-  // `GetSubstitution` abstract operation
-  // https://tc39.es/ecma262/#sec-getsubstitution
-  var getSubstitution$1 = function (matched, str, position, captures, namedCaptures, replacement) {
-    var tailPos = position + matched.length;
-    var m = captures.length;
-    var symbols = SUBSTITUTION_SYMBOLS_NO_NAMED;
-    if (namedCaptures !== undefined) {
-      namedCaptures = toObject(namedCaptures);
-      symbols = SUBSTITUTION_SYMBOLS;
-    }
-    return replace(replacement, symbols, function (match, ch) {
-      var capture;
-      switch (charAt(ch, 0)) {
-        case '$': return '$';
-        case '&': return matched;
-        case '`': return stringSlice$1(str, 0, position);
-        case "'": return stringSlice$1(str, tailPos);
-        case '<':
-          capture = namedCaptures[stringSlice$1(ch, 1, -1)];
-          break;
-        default: // \d\d?
-          var n = +ch;
-          if (n === 0) return match;
-          if (n > m) {
-            var f = floor(n / 10);
-            if (f === 0) return match;
-            if (f <= m) return captures[f - 1] === undefined ? charAt(ch, 1) : captures[f - 1] + charAt(ch, 1);
-            return match;
-          }
-          capture = captures[n - 1];
-      }
-      return capture === undefined ? '' : capture;
-    });
-  };
-
-  var call$2 = functionCall;
-  var anObject$2 = anObject$9;
-  var isCallable$1 = isCallable$f;
-  var classof = classofRaw$2;
-  var regexpExec = regexpExec$2;
-
-  var $TypeError = TypeError;
-
-  // `RegExpExec` abstract operation
-  // https://tc39.es/ecma262/#sec-regexpexec
-  var regexpExecAbstract = function (R, S) {
-    var exec = R.exec;
-    if (isCallable$1(exec)) {
-      var result = call$2(exec, R, S);
-      if (result !== null) anObject$2(result);
-      return result;
-    }
-    if (classof(R) === 'RegExp') return call$2(regexpExec, R, S);
-    throw new $TypeError('RegExp#exec called on incompatible receiver');
-  };
-
-  var apply = functionApply;
-  var call$1 = functionCall;
-  var uncurryThis = functionUncurryThis;
-  var fixRegExpWellKnownSymbolLogic$1 = fixRegexpWellKnownSymbolLogic;
-  var fails = fails$o;
-  var anObject$1 = anObject$9;
-  var isCallable = isCallable$f;
-  var isNullOrUndefined$1 = isNullOrUndefined$4;
-  var toIntegerOrInfinity = toIntegerOrInfinity$4;
-  var toLength = toLength$2;
-  var toString$1 = toString$5;
-  var requireObjectCoercible$1 = requireObjectCoercible$6;
-  var advanceStringIndex = advanceStringIndex$1;
-  var getMethod$1 = getMethod$3;
-  var getSubstitution = getSubstitution$1;
-  var regExpExec$1 = regexpExecAbstract;
-  var wellKnownSymbol = wellKnownSymbol$b;
-
-  var REPLACE = wellKnownSymbol('replace');
-  var max = Math.max;
-  var min = Math.min;
-  var concat = uncurryThis([].concat);
-  var push = uncurryThis([].push);
-  var stringIndexOf = uncurryThis(''.indexOf);
-  var stringSlice = uncurryThis(''.slice);
-
-  var maybeToString = function (it) {
-    return it === undefined ? it : String(it);
-  };
-
-  // IE <= 11 replaces $0 with the whole match, as if it was $&
-  // https://stackoverflow.com/questions/6024666/getting-ie-to-replace-a-regex-with-the-literal-string-0
-  var REPLACE_KEEPS_$0 = (function () {
-    // eslint-disable-next-line regexp/prefer-escape-replacement-dollar-char -- required for testing
-    return 'a'.replace(/./, '$0') === '$0';
-  })();
-
-  // Safari <= 13.0.3(?) substitutes nth capture where n>m with an empty string
-  var REGEXP_REPLACE_SUBSTITUTES_UNDEFINED_CAPTURE = (function () {
-    if (/./[REPLACE]) {
-      return /./[REPLACE]('a', '$0') === '';
-    }
-    return false;
-  })();
-
-  var REPLACE_SUPPORTS_NAMED_GROUPS = !fails(function () {
-    var re = /./;
-    re.exec = function () {
-      var result = [];
-      result.groups = { a: '7' };
-      return result;
-    };
-    // eslint-disable-next-line regexp/no-useless-dollar-replacements -- false positive
-    return ''.replace(re, '$<a>') !== '7';
-  });
-
-  // @@replace logic
-  fixRegExpWellKnownSymbolLogic$1('replace', function (_, nativeReplace, maybeCallNative) {
-    var UNSAFE_SUBSTITUTE = REGEXP_REPLACE_SUBSTITUTES_UNDEFINED_CAPTURE ? '$' : '$0';
-
-    return [
-      // `String.prototype.replace` method
-      // https://tc39.es/ecma262/#sec-string.prototype.replace
-      function replace(searchValue, replaceValue) {
-        var O = requireObjectCoercible$1(this);
-        var replacer = isNullOrUndefined$1(searchValue) ? undefined : getMethod$1(searchValue, REPLACE);
-        return replacer
-          ? call$1(replacer, searchValue, O, replaceValue)
-          : call$1(nativeReplace, toString$1(O), searchValue, replaceValue);
-      },
-      // `RegExp.prototype[@@replace]` method
-      // https://tc39.es/ecma262/#sec-regexp.prototype-@@replace
-      function (string, replaceValue) {
-        var rx = anObject$1(this);
-        var S = toString$1(string);
-
-        if (
-          typeof replaceValue == 'string' &&
-          stringIndexOf(replaceValue, UNSAFE_SUBSTITUTE) === -1 &&
-          stringIndexOf(replaceValue, '$<') === -1
-        ) {
-          var res = maybeCallNative(nativeReplace, rx, S, replaceValue);
-          if (res.done) return res.value;
-        }
-
-        var functionalReplace = isCallable(replaceValue);
-        if (!functionalReplace) replaceValue = toString$1(replaceValue);
-
-        var global = rx.global;
-        var fullUnicode;
-        if (global) {
-          fullUnicode = rx.unicode;
-          rx.lastIndex = 0;
-        }
-
-        var results = [];
-        var result;
-        while (true) {
-          result = regExpExec$1(rx, S);
-          if (result === null) break;
-
-          push(results, result);
-          if (!global) break;
-
-          var matchStr = toString$1(result[0]);
-          if (matchStr === '') rx.lastIndex = advanceStringIndex(S, toLength(rx.lastIndex), fullUnicode);
-        }
-
-        var accumulatedResult = '';
-        var nextSourcePosition = 0;
-        for (var i = 0; i < results.length; i++) {
-          result = results[i];
-
-          var matched = toString$1(result[0]);
-          var position = max(min(toIntegerOrInfinity(result.index), S.length), 0);
-          var captures = [];
-          var replacement;
-          // NOTE: This is equivalent to
-          //   captures = result.slice(1).map(maybeToString)
-          // but for some reason `nativeSlice.call(result, 1, result.length)` (called in
-          // the slice polyfill when slicing native arrays) "doesn't work" in safari 9 and
-          // causes a crash (https://pastebin.com/N21QzeQA) when trying to debug it.
-          for (var j = 1; j < result.length; j++) push(captures, maybeToString(result[j]));
-          var namedCaptures = result.groups;
-          if (functionalReplace) {
-            var replacerArgs = concat([matched], captures, position, S);
-            if (namedCaptures !== undefined) push(replacerArgs, namedCaptures);
-            replacement = toString$1(apply(replaceValue, undefined, replacerArgs));
-          } else {
-            replacement = getSubstitution(matched, S, position, captures, namedCaptures, replaceValue);
-          }
-          if (position >= nextSourcePosition) {
-            accumulatedResult += stringSlice(S, nextSourcePosition, position) + replacement;
-            nextSourcePosition = position + matched.length;
-          }
-        }
-
-        return accumulatedResult + stringSlice(S, nextSourcePosition);
-      }
-    ];
-  }, !REPLACE_SUPPORTS_NAMED_GROUPS || !REPLACE_KEEPS_$0 || REGEXP_REPLACE_SUBSTITUTES_UNDEFINED_CAPTURE);
-
-  // `SameValue` abstract operation
-  // https://tc39.es/ecma262/#sec-samevalue
-  // eslint-disable-next-line es/no-object-is -- safe
-  var sameValue$1 = Object.is || function is(x, y) {
-    // eslint-disable-next-line no-self-compare -- NaN check
-    return x === y ? x !== 0 || 1 / x === 1 / y : x !== x && y !== y;
-  };
-
-  var call = functionCall;
-  var fixRegExpWellKnownSymbolLogic = fixRegexpWellKnownSymbolLogic;
-  var anObject = anObject$9;
-  var isNullOrUndefined = isNullOrUndefined$4;
-  var requireObjectCoercible = requireObjectCoercible$6;
-  var sameValue = sameValue$1;
-  var toString = toString$5;
-  var getMethod = getMethod$3;
-  var regExpExec = regexpExecAbstract;
-
-  // @@search logic
-  fixRegExpWellKnownSymbolLogic('search', function (SEARCH, nativeSearch, maybeCallNative) {
-    return [
-      // `String.prototype.search` method
-      // https://tc39.es/ecma262/#sec-string.prototype.search
-      function search(regexp) {
-        var O = requireObjectCoercible(this);
-        var searcher = isNullOrUndefined(regexp) ? undefined : getMethod(regexp, SEARCH);
-        return searcher ? call(searcher, regexp, O) : new RegExp(regexp)[SEARCH](toString(O));
-      },
-      // `RegExp.prototype[@@search]` method
-      // https://tc39.es/ecma262/#sec-regexp.prototype-@@search
-      function (string) {
-        var rx = anObject(this);
-        var S = toString(string);
-        var res = maybeCallNative(nativeSearch, rx, S);
-
-        if (res.done) return res.value;
-
-        var previousLastIndex = rx.lastIndex;
-        if (!sameValue(previousLastIndex, 0)) rx.lastIndex = 0;
-        var result = regExpExec(rx, S);
-        if (!sameValue(rx.lastIndex, previousLastIndex)) rx.lastIndex = previousLastIndex;
-        return result === null ? -1 : result.index;
-      }
-    ];
-  });
-
-  // iterable DOM collections
-  // flag - `iterable` interface - 'entries', 'keys', 'values', 'forEach' methods
-  var domIterables = {
-    CSSRuleList: 0,
-    CSSStyleDeclaration: 0,
-    CSSValueList: 0,
-    ClientRectList: 0,
-    DOMRectList: 0,
-    DOMStringList: 0,
-    DOMTokenList: 1,
-    DataTransferItemList: 0,
-    FileList: 0,
-    HTMLAllCollection: 0,
-    HTMLCollection: 0,
-    HTMLFormElement: 0,
-    HTMLSelectElement: 0,
-    MediaList: 0,
-    MimeTypeArray: 0,
-    NamedNodeMap: 0,
-    NodeList: 1,
-    PaintRequestList: 0,
-    Plugin: 0,
-    PluginArray: 0,
-    SVGLengthList: 0,
-    SVGNumberList: 0,
-    SVGPathSegList: 0,
-    SVGPointList: 0,
-    SVGStringList: 0,
-    SVGTransformList: 0,
-    SourceBufferList: 0,
-    StyleSheetList: 0,
-    TextTrackCueList: 0,
-    TextTrackList: 0,
-    TouchList: 0
-  };
-
-  // in old WebKit versions, `element.classList` is not an instance of global `DOMTokenList`
-  var documentCreateElement = documentCreateElement$2;
-
-  var classList = documentCreateElement('span').classList;
-  var DOMTokenListPrototype$1 = classList && classList.constructor && classList.constructor.prototype;
-
-  var domTokenListPrototype = DOMTokenListPrototype$1 === Object.prototype ? undefined : DOMTokenListPrototype$1;
-
-  var $forEach = arrayIteration.forEach;
-  var arrayMethodIsStrict = arrayMethodIsStrict$2;
-
-  var STRICT_METHOD = arrayMethodIsStrict('forEach');
-
-  // `Array.prototype.forEach` method implementation
-  // https://tc39.es/ecma262/#sec-array.prototype.foreach
-  var arrayForEach = !STRICT_METHOD ? function forEach(callbackfn /* , thisArg */) {
-    return $forEach(this, callbackfn, arguments.length > 1 ? arguments[1] : undefined);
-  // eslint-disable-next-line es/no-array-prototype-foreach -- safe
-  } : [].forEach;
-
-  var global$1 = global$e;
-  var DOMIterables = domIterables;
-  var DOMTokenListPrototype = domTokenListPrototype;
-  var forEach = arrayForEach;
-  var createNonEnumerableProperty = createNonEnumerableProperty$4;
-
-  var handlePrototype = function (CollectionPrototype) {
-    // some Chrome versions have non-configurable methods on DOMTokenList
-    if (CollectionPrototype && CollectionPrototype.forEach !== forEach) try {
-      createNonEnumerableProperty(CollectionPrototype, 'forEach', forEach);
-    } catch (error) {
-      CollectionPrototype.forEach = forEach;
-    }
-  };
-
-  for (var COLLECTION_NAME in DOMIterables) {
-    if (DOMIterables[COLLECTION_NAME]) {
-      handlePrototype(global$1[COLLECTION_NAME] && global$1[COLLECTION_NAME].prototype);
-    }
+  var addToUnscopables;
+  var hasRequiredAddToUnscopables;
+
+  function requireAddToUnscopables () {
+  	if (hasRequiredAddToUnscopables) return addToUnscopables;
+  	hasRequiredAddToUnscopables = 1;
+  	var wellKnownSymbol = requireWellKnownSymbol();
+  	var create = requireObjectCreate();
+  	var defineProperty = requireObjectDefineProperty().f;
+
+  	var UNSCOPABLES = wellKnownSymbol('unscopables');
+  	var ArrayPrototype = Array.prototype;
+
+  	// Array.prototype[@@unscopables]
+  	// https://tc39.es/ecma262/#sec-array.prototype-@@unscopables
+  	if (ArrayPrototype[UNSCOPABLES] === undefined) {
+  	  defineProperty(ArrayPrototype, UNSCOPABLES, {
+  	    configurable: true,
+  	    value: create(null)
+  	  });
+  	}
+
+  	// add a key to Array.prototype[@@unscopables]
+  	addToUnscopables = function (key) {
+  	  ArrayPrototype[UNSCOPABLES][key] = true;
+  	};
+  	return addToUnscopables;
   }
 
-  handlePrototype(DOMTokenListPrototype);
+  var hasRequiredEs_array_find;
+
+  function requireEs_array_find () {
+  	if (hasRequiredEs_array_find) return es_array_find;
+  	hasRequiredEs_array_find = 1;
+  	var $ = require_export();
+  	var $find = requireArrayIteration().find;
+  	var addToUnscopables = requireAddToUnscopables();
+
+  	var FIND = 'find';
+  	var SKIPS_HOLES = true;
+
+  	// Shouldn't skip holes
+  	// eslint-disable-next-line es/no-array-prototype-find -- testing
+  	if (FIND in []) Array(1)[FIND](function () { SKIPS_HOLES = false; });
+
+  	// `Array.prototype.find` method
+  	// https://tc39.es/ecma262/#sec-array.prototype.find
+  	$({ target: 'Array', proto: true, forced: SKIPS_HOLES }, {
+  	  find: function find(callbackfn /* , that = undefined */) {
+  	    return $find(this, callbackfn, arguments.length > 1 ? arguments[1] : undefined);
+  	  }
+  	});
+
+  	// https://tc39.es/ecma262/#sec-array.prototype-@@unscopables
+  	addToUnscopables(FIND);
+  	return es_array_find;
+  }
+
+  requireEs_array_find();
+
+  var es_array_includes = {};
+
+  var hasRequiredEs_array_includes;
+
+  function requireEs_array_includes () {
+  	if (hasRequiredEs_array_includes) return es_array_includes;
+  	hasRequiredEs_array_includes = 1;
+  	var $ = require_export();
+  	var $includes = requireArrayIncludes().includes;
+  	var fails = requireFails();
+  	var addToUnscopables = requireAddToUnscopables();
+
+  	// FF99+ bug
+  	var BROKEN_ON_SPARSE = fails(function () {
+  	  // eslint-disable-next-line es/no-array-prototype-includes -- detection
+  	  return !Array(1).includes();
+  	});
+
+  	// `Array.prototype.includes` method
+  	// https://tc39.es/ecma262/#sec-array.prototype.includes
+  	$({ target: 'Array', proto: true, forced: BROKEN_ON_SPARSE }, {
+  	  includes: function includes(el /* , fromIndex = 0 */) {
+  	    return $includes(this, el, arguments.length > 1 ? arguments[1] : undefined);
+  	  }
+  	});
+
+  	// https://tc39.es/ecma262/#sec-array.prototype-@@unscopables
+  	addToUnscopables('includes');
+  	return es_array_includes;
+  }
+
+  requireEs_array_includes();
+
+  var es_array_join = {};
+
+  var arrayMethodIsStrict;
+  var hasRequiredArrayMethodIsStrict;
+
+  function requireArrayMethodIsStrict () {
+  	if (hasRequiredArrayMethodIsStrict) return arrayMethodIsStrict;
+  	hasRequiredArrayMethodIsStrict = 1;
+  	var fails = requireFails();
+
+  	arrayMethodIsStrict = function (METHOD_NAME, argument) {
+  	  var method = [][METHOD_NAME];
+  	  return !!method && fails(function () {
+  	    // eslint-disable-next-line no-useless-call -- required for testing
+  	    method.call(null, argument || function () { return 1; }, 1);
+  	  });
+  	};
+  	return arrayMethodIsStrict;
+  }
+
+  var hasRequiredEs_array_join;
+
+  function requireEs_array_join () {
+  	if (hasRequiredEs_array_join) return es_array_join;
+  	hasRequiredEs_array_join = 1;
+  	var $ = require_export();
+  	var uncurryThis = requireFunctionUncurryThis();
+  	var IndexedObject = requireIndexedObject();
+  	var toIndexedObject = requireToIndexedObject();
+  	var arrayMethodIsStrict = requireArrayMethodIsStrict();
+
+  	var nativeJoin = uncurryThis([].join);
+
+  	var ES3_STRINGS = IndexedObject !== Object;
+  	var FORCED = ES3_STRINGS || !arrayMethodIsStrict('join', ',');
+
+  	// `Array.prototype.join` method
+  	// https://tc39.es/ecma262/#sec-array.prototype.join
+  	$({ target: 'Array', proto: true, forced: FORCED }, {
+  	  join: function join(separator) {
+  	    return nativeJoin(toIndexedObject(this), separator === undefined ? ',' : separator);
+  	  }
+  	});
+  	return es_array_join;
+  }
+
+  requireEs_array_join();
+
+  var es_array_map = {};
+
+  var hasRequiredEs_array_map;
+
+  function requireEs_array_map () {
+  	if (hasRequiredEs_array_map) return es_array_map;
+  	hasRequiredEs_array_map = 1;
+  	var $ = require_export();
+  	var $map = requireArrayIteration().map;
+  	var arrayMethodHasSpeciesSupport = requireArrayMethodHasSpeciesSupport();
+
+  	var HAS_SPECIES_SUPPORT = arrayMethodHasSpeciesSupport('map');
+
+  	// `Array.prototype.map` method
+  	// https://tc39.es/ecma262/#sec-array.prototype.map
+  	// with adding support of @@species
+  	$({ target: 'Array', proto: true, forced: !HAS_SPECIES_SUPPORT }, {
+  	  map: function map(callbackfn /* , thisArg */) {
+  	    return $map(this, callbackfn, arguments.length > 1 ? arguments[1] : undefined);
+  	  }
+  	});
+  	return es_array_map;
+  }
+
+  requireEs_array_map();
+
+  var es_date_toJson = {};
+
+  var hasRequiredEs_date_toJson;
+
+  function requireEs_date_toJson () {
+  	if (hasRequiredEs_date_toJson) return es_date_toJson;
+  	hasRequiredEs_date_toJson = 1;
+  	var $ = require_export();
+  	var fails = requireFails();
+  	var toObject = requireToObject();
+  	var toPrimitive = requireToPrimitive();
+
+  	var FORCED = fails(function () {
+  	  return new Date(NaN).toJSON() !== null
+  	    || Date.prototype.toJSON.call({ toISOString: function () { return 1; } }) !== 1;
+  	});
+
+  	// `Date.prototype.toJSON` method
+  	// https://tc39.es/ecma262/#sec-date.prototype.tojson
+  	$({ target: 'Date', proto: true, arity: 1, forced: FORCED }, {
+  	  // eslint-disable-next-line no-unused-vars -- required for `.length`
+  	  toJSON: function toJSON(key) {
+  	    var O = toObject(this);
+  	    var pv = toPrimitive(O, 'number');
+  	    return typeof pv == 'number' && !isFinite(pv) ? null : O.toISOString();
+  	  }
+  	});
+  	return es_date_toJson;
+  }
+
+  requireEs_date_toJson();
+
+  var es_object_assign = {};
+
+  var objectAssign;
+  var hasRequiredObjectAssign;
+
+  function requireObjectAssign () {
+  	if (hasRequiredObjectAssign) return objectAssign;
+  	hasRequiredObjectAssign = 1;
+  	var DESCRIPTORS = requireDescriptors();
+  	var uncurryThis = requireFunctionUncurryThis();
+  	var call = requireFunctionCall();
+  	var fails = requireFails();
+  	var objectKeys = requireObjectKeys();
+  	var getOwnPropertySymbolsModule = requireObjectGetOwnPropertySymbols();
+  	var propertyIsEnumerableModule = requireObjectPropertyIsEnumerable();
+  	var toObject = requireToObject();
+  	var IndexedObject = requireIndexedObject();
+
+  	// eslint-disable-next-line es/no-object-assign -- safe
+  	var $assign = Object.assign;
+  	// eslint-disable-next-line es/no-object-defineproperty -- required for testing
+  	var defineProperty = Object.defineProperty;
+  	var concat = uncurryThis([].concat);
+
+  	// `Object.assign` method
+  	// https://tc39.es/ecma262/#sec-object.assign
+  	objectAssign = !$assign || fails(function () {
+  	  // should have correct order of operations (Edge bug)
+  	  if (DESCRIPTORS && $assign({ b: 1 }, $assign(defineProperty({}, 'a', {
+  	    enumerable: true,
+  	    get: function () {
+  	      defineProperty(this, 'b', {
+  	        value: 3,
+  	        enumerable: false
+  	      });
+  	    }
+  	  }), { b: 2 })).b !== 1) return true;
+  	  // should work with symbols and should have deterministic property order (V8 bug)
+  	  var A = {};
+  	  var B = {};
+  	  // eslint-disable-next-line es/no-symbol -- safe
+  	  var symbol = Symbol('assign detection');
+  	  var alphabet = 'abcdefghijklmnopqrst';
+  	  A[symbol] = 7;
+  	  alphabet.split('').forEach(function (chr) { B[chr] = chr; });
+  	  return $assign({}, A)[symbol] !== 7 || objectKeys($assign({}, B)).join('') !== alphabet;
+  	}) ? function assign(target, source) { // eslint-disable-line no-unused-vars -- required for `.length`
+  	  var T = toObject(target);
+  	  var argumentsLength = arguments.length;
+  	  var index = 1;
+  	  var getOwnPropertySymbols = getOwnPropertySymbolsModule.f;
+  	  var propertyIsEnumerable = propertyIsEnumerableModule.f;
+  	  while (argumentsLength > index) {
+  	    var S = IndexedObject(arguments[index++]);
+  	    var keys = getOwnPropertySymbols ? concat(objectKeys(S), getOwnPropertySymbols(S)) : objectKeys(S);
+  	    var length = keys.length;
+  	    var j = 0;
+  	    var key;
+  	    while (length > j) {
+  	      key = keys[j++];
+  	      if (!DESCRIPTORS || call(propertyIsEnumerable, S, key)) T[key] = S[key];
+  	    }
+  	  } return T;
+  	} : $assign;
+  	return objectAssign;
+  }
+
+  var hasRequiredEs_object_assign;
+
+  function requireEs_object_assign () {
+  	if (hasRequiredEs_object_assign) return es_object_assign;
+  	hasRequiredEs_object_assign = 1;
+  	var $ = require_export();
+  	var assign = requireObjectAssign();
+
+  	// `Object.assign` method
+  	// https://tc39.es/ecma262/#sec-object.assign
+  	// eslint-disable-next-line es/no-object-assign -- required for testing
+  	$({ target: 'Object', stat: true, arity: 2, forced: Object.assign !== assign }, {
+  	  assign: assign
+  	});
+  	return es_object_assign;
+  }
+
+  requireEs_object_assign();
+
+  var es_object_entries = {};
+
+  var correctPrototypeGetter;
+  var hasRequiredCorrectPrototypeGetter;
+
+  function requireCorrectPrototypeGetter () {
+  	if (hasRequiredCorrectPrototypeGetter) return correctPrototypeGetter;
+  	hasRequiredCorrectPrototypeGetter = 1;
+  	var fails = requireFails();
+
+  	correctPrototypeGetter = !fails(function () {
+  	  function F() { /* empty */ }
+  	  F.prototype.constructor = null;
+  	  // eslint-disable-next-line es/no-object-getprototypeof -- required for testing
+  	  return Object.getPrototypeOf(new F()) !== F.prototype;
+  	});
+  	return correctPrototypeGetter;
+  }
+
+  var objectGetPrototypeOf;
+  var hasRequiredObjectGetPrototypeOf;
+
+  function requireObjectGetPrototypeOf () {
+  	if (hasRequiredObjectGetPrototypeOf) return objectGetPrototypeOf;
+  	hasRequiredObjectGetPrototypeOf = 1;
+  	var hasOwn = requireHasOwnProperty();
+  	var isCallable = requireIsCallable();
+  	var toObject = requireToObject();
+  	var sharedKey = requireSharedKey();
+  	var CORRECT_PROTOTYPE_GETTER = requireCorrectPrototypeGetter();
+
+  	var IE_PROTO = sharedKey('IE_PROTO');
+  	var $Object = Object;
+  	var ObjectPrototype = $Object.prototype;
+
+  	// `Object.getPrototypeOf` method
+  	// https://tc39.es/ecma262/#sec-object.getprototypeof
+  	// eslint-disable-next-line es/no-object-getprototypeof -- safe
+  	objectGetPrototypeOf = CORRECT_PROTOTYPE_GETTER ? $Object.getPrototypeOf : function (O) {
+  	  var object = toObject(O);
+  	  if (hasOwn(object, IE_PROTO)) return object[IE_PROTO];
+  	  var constructor = object.constructor;
+  	  if (isCallable(constructor) && object instanceof constructor) {
+  	    return constructor.prototype;
+  	  } return object instanceof $Object ? ObjectPrototype : null;
+  	};
+  	return objectGetPrototypeOf;
+  }
+
+  var objectToArray;
+  var hasRequiredObjectToArray;
+
+  function requireObjectToArray () {
+  	if (hasRequiredObjectToArray) return objectToArray;
+  	hasRequiredObjectToArray = 1;
+  	var DESCRIPTORS = requireDescriptors();
+  	var fails = requireFails();
+  	var uncurryThis = requireFunctionUncurryThis();
+  	var objectGetPrototypeOf = requireObjectGetPrototypeOf();
+  	var objectKeys = requireObjectKeys();
+  	var toIndexedObject = requireToIndexedObject();
+  	var $propertyIsEnumerable = requireObjectPropertyIsEnumerable().f;
+
+  	var propertyIsEnumerable = uncurryThis($propertyIsEnumerable);
+  	var push = uncurryThis([].push);
+
+  	// in some IE versions, `propertyIsEnumerable` returns incorrect result on integer keys
+  	// of `null` prototype objects
+  	var IE_BUG = DESCRIPTORS && fails(function () {
+  	  // eslint-disable-next-line es/no-object-create -- safe
+  	  var O = Object.create(null);
+  	  O[2] = 2;
+  	  return !propertyIsEnumerable(O, 2);
+  	});
+
+  	// `Object.{ entries, values }` methods implementation
+  	var createMethod = function (TO_ENTRIES) {
+  	  return function (it) {
+  	    var O = toIndexedObject(it);
+  	    var keys = objectKeys(O);
+  	    var IE_WORKAROUND = IE_BUG && objectGetPrototypeOf(O) === null;
+  	    var length = keys.length;
+  	    var i = 0;
+  	    var result = [];
+  	    var key;
+  	    while (length > i) {
+  	      key = keys[i++];
+  	      if (!DESCRIPTORS || (IE_WORKAROUND ? key in O : propertyIsEnumerable(O, key))) {
+  	        push(result, TO_ENTRIES ? [key, O[key]] : O[key]);
+  	      }
+  	    }
+  	    return result;
+  	  };
+  	};
+
+  	objectToArray = {
+  	  // `Object.entries` method
+  	  // https://tc39.es/ecma262/#sec-object.entries
+  	  entries: createMethod(true),
+  	  // `Object.values` method
+  	  // https://tc39.es/ecma262/#sec-object.values
+  	  values: createMethod(false)
+  	};
+  	return objectToArray;
+  }
+
+  var hasRequiredEs_object_entries;
+
+  function requireEs_object_entries () {
+  	if (hasRequiredEs_object_entries) return es_object_entries;
+  	hasRequiredEs_object_entries = 1;
+  	var $ = require_export();
+  	var $entries = requireObjectToArray().entries;
+
+  	// `Object.entries` method
+  	// https://tc39.es/ecma262/#sec-object.entries
+  	$({ target: 'Object', stat: true }, {
+  	  entries: function entries(O) {
+  	    return $entries(O);
+  	  }
+  	});
+  	return es_object_entries;
+  }
+
+  requireEs_object_entries();
+
+  var es_object_keys = {};
+
+  var hasRequiredEs_object_keys;
+
+  function requireEs_object_keys () {
+  	if (hasRequiredEs_object_keys) return es_object_keys;
+  	hasRequiredEs_object_keys = 1;
+  	var $ = require_export();
+  	var toObject = requireToObject();
+  	var nativeKeys = requireObjectKeys();
+  	var fails = requireFails();
+
+  	var FAILS_ON_PRIMITIVES = fails(function () { nativeKeys(1); });
+
+  	// `Object.keys` method
+  	// https://tc39.es/ecma262/#sec-object.keys
+  	$({ target: 'Object', stat: true, forced: FAILS_ON_PRIMITIVES }, {
+  	  keys: function keys(it) {
+  	    return nativeKeys(toObject(it));
+  	  }
+  	});
+  	return es_object_keys;
+  }
+
+  requireEs_object_keys();
+
+  var es_object_toString = {};
+
+  var objectToString;
+  var hasRequiredObjectToString;
+
+  function requireObjectToString () {
+  	if (hasRequiredObjectToString) return objectToString;
+  	hasRequiredObjectToString = 1;
+  	var TO_STRING_TAG_SUPPORT = requireToStringTagSupport();
+  	var classof = requireClassof();
+
+  	// `Object.prototype.toString` method implementation
+  	// https://tc39.es/ecma262/#sec-object.prototype.tostring
+  	objectToString = TO_STRING_TAG_SUPPORT ? {}.toString : function toString() {
+  	  return '[object ' + classof(this) + ']';
+  	};
+  	return objectToString;
+  }
+
+  var hasRequiredEs_object_toString;
+
+  function requireEs_object_toString () {
+  	if (hasRequiredEs_object_toString) return es_object_toString;
+  	hasRequiredEs_object_toString = 1;
+  	var TO_STRING_TAG_SUPPORT = requireToStringTagSupport();
+  	var defineBuiltIn = requireDefineBuiltIn();
+  	var toString = requireObjectToString();
+
+  	// `Object.prototype.toString` method
+  	// https://tc39.es/ecma262/#sec-object.prototype.tostring
+  	if (!TO_STRING_TAG_SUPPORT) {
+  	  defineBuiltIn(Object.prototype, 'toString', toString, { unsafe: true });
+  	}
+  	return es_object_toString;
+  }
+
+  requireEs_object_toString();
+
+  var es_regexp_exec = {};
+
+  var toString;
+  var hasRequiredToString;
+
+  function requireToString () {
+  	if (hasRequiredToString) return toString;
+  	hasRequiredToString = 1;
+  	var classof = requireClassof();
+
+  	var $String = String;
+
+  	toString = function (argument) {
+  	  if (classof(argument) === 'Symbol') throw new TypeError('Cannot convert a Symbol value to a string');
+  	  return $String(argument);
+  	};
+  	return toString;
+  }
+
+  var regexpFlags;
+  var hasRequiredRegexpFlags;
+
+  function requireRegexpFlags () {
+  	if (hasRequiredRegexpFlags) return regexpFlags;
+  	hasRequiredRegexpFlags = 1;
+  	var anObject = requireAnObject();
+
+  	// `RegExp.prototype.flags` getter implementation
+  	// https://tc39.es/ecma262/#sec-get-regexp.prototype.flags
+  	regexpFlags = function () {
+  	  var that = anObject(this);
+  	  var result = '';
+  	  if (that.hasIndices) result += 'd';
+  	  if (that.global) result += 'g';
+  	  if (that.ignoreCase) result += 'i';
+  	  if (that.multiline) result += 'm';
+  	  if (that.dotAll) result += 's';
+  	  if (that.unicode) result += 'u';
+  	  if (that.unicodeSets) result += 'v';
+  	  if (that.sticky) result += 'y';
+  	  return result;
+  	};
+  	return regexpFlags;
+  }
+
+  var regexpStickyHelpers;
+  var hasRequiredRegexpStickyHelpers;
+
+  function requireRegexpStickyHelpers () {
+  	if (hasRequiredRegexpStickyHelpers) return regexpStickyHelpers;
+  	hasRequiredRegexpStickyHelpers = 1;
+  	var fails = requireFails();
+  	var globalThis = requireGlobalThis();
+
+  	// babel-minify and Closure Compiler transpiles RegExp('a', 'y') -> /a/y and it causes SyntaxError
+  	var $RegExp = globalThis.RegExp;
+
+  	var UNSUPPORTED_Y = fails(function () {
+  	  var re = $RegExp('a', 'y');
+  	  re.lastIndex = 2;
+  	  return re.exec('abcd') !== null;
+  	});
+
+  	// UC Browser bug
+  	// https://github.com/zloirock/core-js/issues/1008
+  	var MISSED_STICKY = UNSUPPORTED_Y || fails(function () {
+  	  return !$RegExp('a', 'y').sticky;
+  	});
+
+  	var BROKEN_CARET = UNSUPPORTED_Y || fails(function () {
+  	  // https://bugzilla.mozilla.org/show_bug.cgi?id=773687
+  	  var re = $RegExp('^r', 'gy');
+  	  re.lastIndex = 2;
+  	  return re.exec('str') !== null;
+  	});
+
+  	regexpStickyHelpers = {
+  	  BROKEN_CARET: BROKEN_CARET,
+  	  MISSED_STICKY: MISSED_STICKY,
+  	  UNSUPPORTED_Y: UNSUPPORTED_Y
+  	};
+  	return regexpStickyHelpers;
+  }
+
+  var regexpUnsupportedDotAll;
+  var hasRequiredRegexpUnsupportedDotAll;
+
+  function requireRegexpUnsupportedDotAll () {
+  	if (hasRequiredRegexpUnsupportedDotAll) return regexpUnsupportedDotAll;
+  	hasRequiredRegexpUnsupportedDotAll = 1;
+  	var fails = requireFails();
+  	var globalThis = requireGlobalThis();
+
+  	// babel-minify and Closure Compiler transpiles RegExp('.', 's') -> /./s and it causes SyntaxError
+  	var $RegExp = globalThis.RegExp;
+
+  	regexpUnsupportedDotAll = fails(function () {
+  	  var re = $RegExp('.', 's');
+  	  return !(re.dotAll && re.test('\n') && re.flags === 's');
+  	});
+  	return regexpUnsupportedDotAll;
+  }
+
+  var regexpUnsupportedNcg;
+  var hasRequiredRegexpUnsupportedNcg;
+
+  function requireRegexpUnsupportedNcg () {
+  	if (hasRequiredRegexpUnsupportedNcg) return regexpUnsupportedNcg;
+  	hasRequiredRegexpUnsupportedNcg = 1;
+  	var fails = requireFails();
+  	var globalThis = requireGlobalThis();
+
+  	// babel-minify and Closure Compiler transpiles RegExp('(?<a>b)', 'g') -> /(?<a>b)/g and it causes SyntaxError
+  	var $RegExp = globalThis.RegExp;
+
+  	regexpUnsupportedNcg = fails(function () {
+  	  var re = $RegExp('(?<a>b)', 'g');
+  	  return re.exec('b').groups.a !== 'b' ||
+  	    'b'.replace(re, '$<a>c') !== 'bc';
+  	});
+  	return regexpUnsupportedNcg;
+  }
+
+  var regexpExec;
+  var hasRequiredRegexpExec;
+
+  function requireRegexpExec () {
+  	if (hasRequiredRegexpExec) return regexpExec;
+  	hasRequiredRegexpExec = 1;
+  	/* eslint-disable regexp/no-empty-capturing-group, regexp/no-empty-group, regexp/no-lazy-ends -- testing */
+  	/* eslint-disable regexp/no-useless-quantifier -- testing */
+  	var call = requireFunctionCall();
+  	var uncurryThis = requireFunctionUncurryThis();
+  	var toString = requireToString();
+  	var regexpFlags = requireRegexpFlags();
+  	var stickyHelpers = requireRegexpStickyHelpers();
+  	var shared = requireShared();
+  	var create = requireObjectCreate();
+  	var getInternalState = requireInternalState().get;
+  	var UNSUPPORTED_DOT_ALL = requireRegexpUnsupportedDotAll();
+  	var UNSUPPORTED_NCG = requireRegexpUnsupportedNcg();
+
+  	var nativeReplace = shared('native-string-replace', String.prototype.replace);
+  	var nativeExec = RegExp.prototype.exec;
+  	var patchedExec = nativeExec;
+  	var charAt = uncurryThis(''.charAt);
+  	var indexOf = uncurryThis(''.indexOf);
+  	var replace = uncurryThis(''.replace);
+  	var stringSlice = uncurryThis(''.slice);
+
+  	var UPDATES_LAST_INDEX_WRONG = (function () {
+  	  var re1 = /a/;
+  	  var re2 = /b*/g;
+  	  call(nativeExec, re1, 'a');
+  	  call(nativeExec, re2, 'a');
+  	  return re1.lastIndex !== 0 || re2.lastIndex !== 0;
+  	})();
+
+  	var UNSUPPORTED_Y = stickyHelpers.BROKEN_CARET;
+
+  	// nonparticipating capturing group, copied from es5-shim's String#split patch.
+  	var NPCG_INCLUDED = /()??/.exec('')[1] !== undefined;
+
+  	var PATCH = UPDATES_LAST_INDEX_WRONG || NPCG_INCLUDED || UNSUPPORTED_Y || UNSUPPORTED_DOT_ALL || UNSUPPORTED_NCG;
+
+  	if (PATCH) {
+  	  patchedExec = function exec(string) {
+  	    var re = this;
+  	    var state = getInternalState(re);
+  	    var str = toString(string);
+  	    var raw = state.raw;
+  	    var result, reCopy, lastIndex, match, i, object, group;
+
+  	    if (raw) {
+  	      raw.lastIndex = re.lastIndex;
+  	      result = call(patchedExec, raw, str);
+  	      re.lastIndex = raw.lastIndex;
+  	      return result;
+  	    }
+
+  	    var groups = state.groups;
+  	    var sticky = UNSUPPORTED_Y && re.sticky;
+  	    var flags = call(regexpFlags, re);
+  	    var source = re.source;
+  	    var charsAdded = 0;
+  	    var strCopy = str;
+
+  	    if (sticky) {
+  	      flags = replace(flags, 'y', '');
+  	      if (indexOf(flags, 'g') === -1) {
+  	        flags += 'g';
+  	      }
+
+  	      strCopy = stringSlice(str, re.lastIndex);
+  	      // Support anchored sticky behavior.
+  	      if (re.lastIndex > 0 && (!re.multiline || re.multiline && charAt(str, re.lastIndex - 1) !== '\n')) {
+  	        source = '(?: ' + source + ')';
+  	        strCopy = ' ' + strCopy;
+  	        charsAdded++;
+  	      }
+  	      // ^(? + rx + ) is needed, in combination with some str slicing, to
+  	      // simulate the 'y' flag.
+  	      reCopy = new RegExp('^(?:' + source + ')', flags);
+  	    }
+
+  	    if (NPCG_INCLUDED) {
+  	      reCopy = new RegExp('^' + source + '$(?!\\s)', flags);
+  	    }
+  	    if (UPDATES_LAST_INDEX_WRONG) lastIndex = re.lastIndex;
+
+  	    match = call(nativeExec, sticky ? reCopy : re, strCopy);
+
+  	    if (sticky) {
+  	      if (match) {
+  	        match.input = stringSlice(match.input, charsAdded);
+  	        match[0] = stringSlice(match[0], charsAdded);
+  	        match.index = re.lastIndex;
+  	        re.lastIndex += match[0].length;
+  	      } else re.lastIndex = 0;
+  	    } else if (UPDATES_LAST_INDEX_WRONG && match) {
+  	      re.lastIndex = re.global ? match.index + match[0].length : lastIndex;
+  	    }
+  	    if (NPCG_INCLUDED && match && match.length > 1) {
+  	      // Fix browsers whose `exec` methods don't consistently return `undefined`
+  	      // for NPCG, like IE8. NOTE: This doesn't work for /(.?)?/
+  	      call(nativeReplace, match[0], reCopy, function () {
+  	        for (i = 1; i < arguments.length - 2; i++) {
+  	          if (arguments[i] === undefined) match[i] = undefined;
+  	        }
+  	      });
+  	    }
+
+  	    if (match && groups) {
+  	      match.groups = object = create(null);
+  	      for (i = 0; i < groups.length; i++) {
+  	        group = groups[i];
+  	        object[group[0]] = match[group[1]];
+  	      }
+  	    }
+
+  	    return match;
+  	  };
+  	}
+
+  	regexpExec = patchedExec;
+  	return regexpExec;
+  }
+
+  var hasRequiredEs_regexp_exec;
+
+  function requireEs_regexp_exec () {
+  	if (hasRequiredEs_regexp_exec) return es_regexp_exec;
+  	hasRequiredEs_regexp_exec = 1;
+  	var $ = require_export();
+  	var exec = requireRegexpExec();
+
+  	// `RegExp.prototype.exec` method
+  	// https://tc39.es/ecma262/#sec-regexp.prototype.exec
+  	$({ target: 'RegExp', proto: true, forced: /./.exec !== exec }, {
+  	  exec: exec
+  	});
+  	return es_regexp_exec;
+  }
+
+  requireEs_regexp_exec();
+
+  var es_regexp_toString = {};
+
+  var regexpGetFlags;
+  var hasRequiredRegexpGetFlags;
+
+  function requireRegexpGetFlags () {
+  	if (hasRequiredRegexpGetFlags) return regexpGetFlags;
+  	hasRequiredRegexpGetFlags = 1;
+  	var call = requireFunctionCall();
+  	var hasOwn = requireHasOwnProperty();
+  	var isPrototypeOf = requireObjectIsPrototypeOf();
+  	var regExpFlags = requireRegexpFlags();
+
+  	var RegExpPrototype = RegExp.prototype;
+
+  	regexpGetFlags = function (R) {
+  	  var flags = R.flags;
+  	  return flags === undefined && !('flags' in RegExpPrototype) && !hasOwn(R, 'flags') && isPrototypeOf(RegExpPrototype, R)
+  	    ? call(regExpFlags, R) : flags;
+  	};
+  	return regexpGetFlags;
+  }
+
+  var hasRequiredEs_regexp_toString;
+
+  function requireEs_regexp_toString () {
+  	if (hasRequiredEs_regexp_toString) return es_regexp_toString;
+  	hasRequiredEs_regexp_toString = 1;
+  	var PROPER_FUNCTION_NAME = requireFunctionName().PROPER;
+  	var defineBuiltIn = requireDefineBuiltIn();
+  	var anObject = requireAnObject();
+  	var $toString = requireToString();
+  	var fails = requireFails();
+  	var getRegExpFlags = requireRegexpGetFlags();
+
+  	var TO_STRING = 'toString';
+  	var RegExpPrototype = RegExp.prototype;
+  	var nativeToString = RegExpPrototype[TO_STRING];
+
+  	var NOT_GENERIC = fails(function () { return nativeToString.call({ source: 'a', flags: 'b' }) !== '/a/b'; });
+  	// FF44- RegExp#toString has a wrong name
+  	var INCORRECT_NAME = PROPER_FUNCTION_NAME && nativeToString.name !== TO_STRING;
+
+  	// `RegExp.prototype.toString` method
+  	// https://tc39.es/ecma262/#sec-regexp.prototype.tostring
+  	if (NOT_GENERIC || INCORRECT_NAME) {
+  	  defineBuiltIn(RegExpPrototype, TO_STRING, function toString() {
+  	    var R = anObject(this);
+  	    var pattern = $toString(R.source);
+  	    var flags = $toString(getRegExpFlags(R));
+  	    return '/' + pattern + '/' + flags;
+  	  }, { unsafe: true });
+  	}
+  	return es_regexp_toString;
+  }
+
+  requireEs_regexp_toString();
+
+  var es_string_includes = {};
+
+  var isRegexp;
+  var hasRequiredIsRegexp;
+
+  function requireIsRegexp () {
+  	if (hasRequiredIsRegexp) return isRegexp;
+  	hasRequiredIsRegexp = 1;
+  	var isObject = requireIsObject();
+  	var classof = requireClassofRaw();
+  	var wellKnownSymbol = requireWellKnownSymbol();
+
+  	var MATCH = wellKnownSymbol('match');
+
+  	// `IsRegExp` abstract operation
+  	// https://tc39.es/ecma262/#sec-isregexp
+  	isRegexp = function (it) {
+  	  var isRegExp;
+  	  return isObject(it) && ((isRegExp = it[MATCH]) !== undefined ? !!isRegExp : classof(it) === 'RegExp');
+  	};
+  	return isRegexp;
+  }
+
+  var notARegexp;
+  var hasRequiredNotARegexp;
+
+  function requireNotARegexp () {
+  	if (hasRequiredNotARegexp) return notARegexp;
+  	hasRequiredNotARegexp = 1;
+  	var isRegExp = requireIsRegexp();
+
+  	var $TypeError = TypeError;
+
+  	notARegexp = function (it) {
+  	  if (isRegExp(it)) {
+  	    throw new $TypeError("The method doesn't accept regular expressions");
+  	  } return it;
+  	};
+  	return notARegexp;
+  }
+
+  var correctIsRegexpLogic;
+  var hasRequiredCorrectIsRegexpLogic;
+
+  function requireCorrectIsRegexpLogic () {
+  	if (hasRequiredCorrectIsRegexpLogic) return correctIsRegexpLogic;
+  	hasRequiredCorrectIsRegexpLogic = 1;
+  	var wellKnownSymbol = requireWellKnownSymbol();
+
+  	var MATCH = wellKnownSymbol('match');
+
+  	correctIsRegexpLogic = function (METHOD_NAME) {
+  	  var regexp = /./;
+  	  try {
+  	    '/./'[METHOD_NAME](regexp);
+  	  } catch (error1) {
+  	    try {
+  	      regexp[MATCH] = false;
+  	      return '/./'[METHOD_NAME](regexp);
+  	    } catch (error2) { /* empty */ }
+  	  } return false;
+  	};
+  	return correctIsRegexpLogic;
+  }
+
+  var hasRequiredEs_string_includes;
+
+  function requireEs_string_includes () {
+  	if (hasRequiredEs_string_includes) return es_string_includes;
+  	hasRequiredEs_string_includes = 1;
+  	var $ = require_export();
+  	var uncurryThis = requireFunctionUncurryThis();
+  	var notARegExp = requireNotARegexp();
+  	var requireObjectCoercible = requireRequireObjectCoercible();
+  	var toString = requireToString();
+  	var correctIsRegExpLogic = requireCorrectIsRegexpLogic();
+
+  	var stringIndexOf = uncurryThis(''.indexOf);
+
+  	// `String.prototype.includes` method
+  	// https://tc39.es/ecma262/#sec-string.prototype.includes
+  	$({ target: 'String', proto: true, forced: !correctIsRegExpLogic('includes') }, {
+  	  includes: function includes(searchString /* , position = 0 */) {
+  	    return !!~stringIndexOf(
+  	      toString(requireObjectCoercible(this)),
+  	      toString(notARegExp(searchString)),
+  	      arguments.length > 1 ? arguments[1] : undefined
+  	    );
+  	  }
+  	});
+  	return es_string_includes;
+  }
+
+  requireEs_string_includes();
+
+  var es_string_replace = {};
+
+  var functionApply;
+  var hasRequiredFunctionApply;
+
+  function requireFunctionApply () {
+  	if (hasRequiredFunctionApply) return functionApply;
+  	hasRequiredFunctionApply = 1;
+  	var NATIVE_BIND = requireFunctionBindNative();
+
+  	var FunctionPrototype = Function.prototype;
+  	var apply = FunctionPrototype.apply;
+  	var call = FunctionPrototype.call;
+
+  	// eslint-disable-next-line es/no-reflect -- safe
+  	functionApply = typeof Reflect == 'object' && Reflect.apply || (NATIVE_BIND ? call.bind(apply) : function () {
+  	  return call.apply(apply, arguments);
+  	});
+  	return functionApply;
+  }
+
+  var fixRegexpWellKnownSymbolLogic;
+  var hasRequiredFixRegexpWellKnownSymbolLogic;
+
+  function requireFixRegexpWellKnownSymbolLogic () {
+  	if (hasRequiredFixRegexpWellKnownSymbolLogic) return fixRegexpWellKnownSymbolLogic;
+  	hasRequiredFixRegexpWellKnownSymbolLogic = 1;
+  	// TODO: Remove from `core-js@4` since it's moved to entry points
+  	requireEs_regexp_exec();
+  	var call = requireFunctionCall();
+  	var defineBuiltIn = requireDefineBuiltIn();
+  	var regexpExec = requireRegexpExec();
+  	var fails = requireFails();
+  	var wellKnownSymbol = requireWellKnownSymbol();
+  	var createNonEnumerableProperty = requireCreateNonEnumerableProperty();
+
+  	var SPECIES = wellKnownSymbol('species');
+  	var RegExpPrototype = RegExp.prototype;
+
+  	fixRegexpWellKnownSymbolLogic = function (KEY, exec, FORCED, SHAM) {
+  	  var SYMBOL = wellKnownSymbol(KEY);
+
+  	  var DELEGATES_TO_SYMBOL = !fails(function () {
+  	    // String methods call symbol-named RegExp methods
+  	    var O = {};
+  	    O[SYMBOL] = function () { return 7; };
+  	    return ''[KEY](O) !== 7;
+  	  });
+
+  	  var DELEGATES_TO_EXEC = DELEGATES_TO_SYMBOL && !fails(function () {
+  	    // Symbol-named RegExp methods call .exec
+  	    var execCalled = false;
+  	    var re = /a/;
+
+  	    if (KEY === 'split') {
+  	      // We can't use real regex here since it causes deoptimization
+  	      // and serious performance degradation in V8
+  	      // https://github.com/zloirock/core-js/issues/306
+  	      re = {};
+  	      // RegExp[@@split] doesn't call the regex's exec method, but first creates
+  	      // a new one. We need to return the patched regex when creating the new one.
+  	      re.constructor = {};
+  	      re.constructor[SPECIES] = function () { return re; };
+  	      re.flags = '';
+  	      re[SYMBOL] = /./[SYMBOL];
+  	    }
+
+  	    re.exec = function () {
+  	      execCalled = true;
+  	      return null;
+  	    };
+
+  	    re[SYMBOL]('');
+  	    return !execCalled;
+  	  });
+
+  	  if (
+  	    !DELEGATES_TO_SYMBOL ||
+  	    !DELEGATES_TO_EXEC ||
+  	    FORCED
+  	  ) {
+  	    var nativeRegExpMethod = /./[SYMBOL];
+  	    var methods = exec(SYMBOL, ''[KEY], function (nativeMethod, regexp, str, arg2, forceStringMethod) {
+  	      var $exec = regexp.exec;
+  	      if ($exec === regexpExec || $exec === RegExpPrototype.exec) {
+  	        if (DELEGATES_TO_SYMBOL && !forceStringMethod) {
+  	          // The native String method already delegates to @@method (this
+  	          // polyfilled function), leasing to infinite recursion.
+  	          // We avoid it by directly calling the native @@method method.
+  	          return { done: true, value: call(nativeRegExpMethod, regexp, str, arg2) };
+  	        }
+  	        return { done: true, value: call(nativeMethod, str, regexp, arg2) };
+  	      }
+  	      return { done: false };
+  	    });
+
+  	    defineBuiltIn(String.prototype, KEY, methods[0]);
+  	    defineBuiltIn(RegExpPrototype, SYMBOL, methods[1]);
+  	  }
+
+  	  if (SHAM) createNonEnumerableProperty(RegExpPrototype[SYMBOL], 'sham', true);
+  	};
+  	return fixRegexpWellKnownSymbolLogic;
+  }
+
+  var stringMultibyte;
+  var hasRequiredStringMultibyte;
+
+  function requireStringMultibyte () {
+  	if (hasRequiredStringMultibyte) return stringMultibyte;
+  	hasRequiredStringMultibyte = 1;
+  	var uncurryThis = requireFunctionUncurryThis();
+  	var toIntegerOrInfinity = requireToIntegerOrInfinity();
+  	var toString = requireToString();
+  	var requireObjectCoercible = requireRequireObjectCoercible();
+
+  	var charAt = uncurryThis(''.charAt);
+  	var charCodeAt = uncurryThis(''.charCodeAt);
+  	var stringSlice = uncurryThis(''.slice);
+
+  	var createMethod = function (CONVERT_TO_STRING) {
+  	  return function ($this, pos) {
+  	    var S = toString(requireObjectCoercible($this));
+  	    var position = toIntegerOrInfinity(pos);
+  	    var size = S.length;
+  	    var first, second;
+  	    if (position < 0 || position >= size) return CONVERT_TO_STRING ? '' : undefined;
+  	    first = charCodeAt(S, position);
+  	    return first < 0xD800 || first > 0xDBFF || position + 1 === size
+  	      || (second = charCodeAt(S, position + 1)) < 0xDC00 || second > 0xDFFF
+  	        ? CONVERT_TO_STRING
+  	          ? charAt(S, position)
+  	          : first
+  	        : CONVERT_TO_STRING
+  	          ? stringSlice(S, position, position + 2)
+  	          : (first - 0xD800 << 10) + (second - 0xDC00) + 0x10000;
+  	  };
+  	};
+
+  	stringMultibyte = {
+  	  // `String.prototype.codePointAt` method
+  	  // https://tc39.es/ecma262/#sec-string.prototype.codepointat
+  	  codeAt: createMethod(false),
+  	  // `String.prototype.at` method
+  	  // https://github.com/mathiasbynens/String.prototype.at
+  	  charAt: createMethod(true)
+  	};
+  	return stringMultibyte;
+  }
+
+  var advanceStringIndex;
+  var hasRequiredAdvanceStringIndex;
+
+  function requireAdvanceStringIndex () {
+  	if (hasRequiredAdvanceStringIndex) return advanceStringIndex;
+  	hasRequiredAdvanceStringIndex = 1;
+  	var charAt = requireStringMultibyte().charAt;
+
+  	// `AdvanceStringIndex` abstract operation
+  	// https://tc39.es/ecma262/#sec-advancestringindex
+  	advanceStringIndex = function (S, index, unicode) {
+  	  return index + (unicode ? charAt(S, index).length : 1);
+  	};
+  	return advanceStringIndex;
+  }
+
+  var getSubstitution;
+  var hasRequiredGetSubstitution;
+
+  function requireGetSubstitution () {
+  	if (hasRequiredGetSubstitution) return getSubstitution;
+  	hasRequiredGetSubstitution = 1;
+  	var uncurryThis = requireFunctionUncurryThis();
+  	var toObject = requireToObject();
+
+  	var floor = Math.floor;
+  	var charAt = uncurryThis(''.charAt);
+  	var replace = uncurryThis(''.replace);
+  	var stringSlice = uncurryThis(''.slice);
+  	// eslint-disable-next-line redos/no-vulnerable -- safe
+  	var SUBSTITUTION_SYMBOLS = /\$([$&'`]|\d{1,2}|<[^>]*>)/g;
+  	var SUBSTITUTION_SYMBOLS_NO_NAMED = /\$([$&'`]|\d{1,2})/g;
+
+  	// `GetSubstitution` abstract operation
+  	// https://tc39.es/ecma262/#sec-getsubstitution
+  	getSubstitution = function (matched, str, position, captures, namedCaptures, replacement) {
+  	  var tailPos = position + matched.length;
+  	  var m = captures.length;
+  	  var symbols = SUBSTITUTION_SYMBOLS_NO_NAMED;
+  	  if (namedCaptures !== undefined) {
+  	    namedCaptures = toObject(namedCaptures);
+  	    symbols = SUBSTITUTION_SYMBOLS;
+  	  }
+  	  return replace(replacement, symbols, function (match, ch) {
+  	    var capture;
+  	    switch (charAt(ch, 0)) {
+  	      case '$': return '$';
+  	      case '&': return matched;
+  	      case '`': return stringSlice(str, 0, position);
+  	      case "'": return stringSlice(str, tailPos);
+  	      case '<':
+  	        capture = namedCaptures[stringSlice(ch, 1, -1)];
+  	        break;
+  	      default: // \d\d?
+  	        var n = +ch;
+  	        if (n === 0) return match;
+  	        if (n > m) {
+  	          var f = floor(n / 10);
+  	          if (f === 0) return match;
+  	          if (f <= m) return captures[f - 1] === undefined ? charAt(ch, 1) : captures[f - 1] + charAt(ch, 1);
+  	          return match;
+  	        }
+  	        capture = captures[n - 1];
+  	    }
+  	    return capture === undefined ? '' : capture;
+  	  });
+  	};
+  	return getSubstitution;
+  }
+
+  var regexpExecAbstract;
+  var hasRequiredRegexpExecAbstract;
+
+  function requireRegexpExecAbstract () {
+  	if (hasRequiredRegexpExecAbstract) return regexpExecAbstract;
+  	hasRequiredRegexpExecAbstract = 1;
+  	var call = requireFunctionCall();
+  	var anObject = requireAnObject();
+  	var isCallable = requireIsCallable();
+  	var classof = requireClassofRaw();
+  	var regexpExec = requireRegexpExec();
+
+  	var $TypeError = TypeError;
+
+  	// `RegExpExec` abstract operation
+  	// https://tc39.es/ecma262/#sec-regexpexec
+  	regexpExecAbstract = function (R, S) {
+  	  var exec = R.exec;
+  	  if (isCallable(exec)) {
+  	    var result = call(exec, R, S);
+  	    if (result !== null) anObject(result);
+  	    return result;
+  	  }
+  	  if (classof(R) === 'RegExp') return call(regexpExec, R, S);
+  	  throw new $TypeError('RegExp#exec called on incompatible receiver');
+  	};
+  	return regexpExecAbstract;
+  }
+
+  var hasRequiredEs_string_replace;
+
+  function requireEs_string_replace () {
+  	if (hasRequiredEs_string_replace) return es_string_replace;
+  	hasRequiredEs_string_replace = 1;
+  	var apply = requireFunctionApply();
+  	var call = requireFunctionCall();
+  	var uncurryThis = requireFunctionUncurryThis();
+  	var fixRegExpWellKnownSymbolLogic = requireFixRegexpWellKnownSymbolLogic();
+  	var fails = requireFails();
+  	var anObject = requireAnObject();
+  	var isCallable = requireIsCallable();
+  	var isNullOrUndefined = requireIsNullOrUndefined();
+  	var toIntegerOrInfinity = requireToIntegerOrInfinity();
+  	var toLength = requireToLength();
+  	var toString = requireToString();
+  	var requireObjectCoercible = requireRequireObjectCoercible();
+  	var advanceStringIndex = requireAdvanceStringIndex();
+  	var getMethod = requireGetMethod();
+  	var getSubstitution = requireGetSubstitution();
+  	var regExpExec = requireRegexpExecAbstract();
+  	var wellKnownSymbol = requireWellKnownSymbol();
+
+  	var REPLACE = wellKnownSymbol('replace');
+  	var max = Math.max;
+  	var min = Math.min;
+  	var concat = uncurryThis([].concat);
+  	var push = uncurryThis([].push);
+  	var stringIndexOf = uncurryThis(''.indexOf);
+  	var stringSlice = uncurryThis(''.slice);
+
+  	var maybeToString = function (it) {
+  	  return it === undefined ? it : String(it);
+  	};
+
+  	// IE <= 11 replaces $0 with the whole match, as if it was $&
+  	// https://stackoverflow.com/questions/6024666/getting-ie-to-replace-a-regex-with-the-literal-string-0
+  	var REPLACE_KEEPS_$0 = (function () {
+  	  // eslint-disable-next-line regexp/prefer-escape-replacement-dollar-char -- required for testing
+  	  return 'a'.replace(/./, '$0') === '$0';
+  	})();
+
+  	// Safari <= 13.0.3(?) substitutes nth capture where n>m with an empty string
+  	var REGEXP_REPLACE_SUBSTITUTES_UNDEFINED_CAPTURE = (function () {
+  	  if (/./[REPLACE]) {
+  	    return /./[REPLACE]('a', '$0') === '';
+  	  }
+  	  return false;
+  	})();
+
+  	var REPLACE_SUPPORTS_NAMED_GROUPS = !fails(function () {
+  	  var re = /./;
+  	  re.exec = function () {
+  	    var result = [];
+  	    result.groups = { a: '7' };
+  	    return result;
+  	  };
+  	  // eslint-disable-next-line regexp/no-useless-dollar-replacements -- false positive
+  	  return ''.replace(re, '$<a>') !== '7';
+  	});
+
+  	// @@replace logic
+  	fixRegExpWellKnownSymbolLogic('replace', function (_, nativeReplace, maybeCallNative) {
+  	  var UNSAFE_SUBSTITUTE = REGEXP_REPLACE_SUBSTITUTES_UNDEFINED_CAPTURE ? '$' : '$0';
+
+  	  return [
+  	    // `String.prototype.replace` method
+  	    // https://tc39.es/ecma262/#sec-string.prototype.replace
+  	    function replace(searchValue, replaceValue) {
+  	      var O = requireObjectCoercible(this);
+  	      var replacer = isNullOrUndefined(searchValue) ? undefined : getMethod(searchValue, REPLACE);
+  	      return replacer
+  	        ? call(replacer, searchValue, O, replaceValue)
+  	        : call(nativeReplace, toString(O), searchValue, replaceValue);
+  	    },
+  	    // `RegExp.prototype[@@replace]` method
+  	    // https://tc39.es/ecma262/#sec-regexp.prototype-@@replace
+  	    function (string, replaceValue) {
+  	      var rx = anObject(this);
+  	      var S = toString(string);
+
+  	      if (
+  	        typeof replaceValue == 'string' &&
+  	        stringIndexOf(replaceValue, UNSAFE_SUBSTITUTE) === -1 &&
+  	        stringIndexOf(replaceValue, '$<') === -1
+  	      ) {
+  	        var res = maybeCallNative(nativeReplace, rx, S, replaceValue);
+  	        if (res.done) return res.value;
+  	      }
+
+  	      var functionalReplace = isCallable(replaceValue);
+  	      if (!functionalReplace) replaceValue = toString(replaceValue);
+
+  	      var global = rx.global;
+  	      var fullUnicode;
+  	      if (global) {
+  	        fullUnicode = rx.unicode;
+  	        rx.lastIndex = 0;
+  	      }
+
+  	      var results = [];
+  	      var result;
+  	      while (true) {
+  	        result = regExpExec(rx, S);
+  	        if (result === null) break;
+
+  	        push(results, result);
+  	        if (!global) break;
+
+  	        var matchStr = toString(result[0]);
+  	        if (matchStr === '') rx.lastIndex = advanceStringIndex(S, toLength(rx.lastIndex), fullUnicode);
+  	      }
+
+  	      var accumulatedResult = '';
+  	      var nextSourcePosition = 0;
+  	      for (var i = 0; i < results.length; i++) {
+  	        result = results[i];
+
+  	        var matched = toString(result[0]);
+  	        var position = max(min(toIntegerOrInfinity(result.index), S.length), 0);
+  	        var captures = [];
+  	        var replacement;
+  	        // NOTE: This is equivalent to
+  	        //   captures = result.slice(1).map(maybeToString)
+  	        // but for some reason `nativeSlice.call(result, 1, result.length)` (called in
+  	        // the slice polyfill when slicing native arrays) "doesn't work" in safari 9 and
+  	        // causes a crash (https://pastebin.com/N21QzeQA) when trying to debug it.
+  	        for (var j = 1; j < result.length; j++) push(captures, maybeToString(result[j]));
+  	        var namedCaptures = result.groups;
+  	        if (functionalReplace) {
+  	          var replacerArgs = concat([matched], captures, position, S);
+  	          if (namedCaptures !== undefined) push(replacerArgs, namedCaptures);
+  	          replacement = toString(apply(replaceValue, undefined, replacerArgs));
+  	        } else {
+  	          replacement = getSubstitution(matched, S, position, captures, namedCaptures, replaceValue);
+  	        }
+  	        if (position >= nextSourcePosition) {
+  	          accumulatedResult += stringSlice(S, nextSourcePosition, position) + replacement;
+  	          nextSourcePosition = position + matched.length;
+  	        }
+  	      }
+
+  	      return accumulatedResult + stringSlice(S, nextSourcePosition);
+  	    }
+  	  ];
+  	}, !REPLACE_SUPPORTS_NAMED_GROUPS || !REPLACE_KEEPS_$0 || REGEXP_REPLACE_SUBSTITUTES_UNDEFINED_CAPTURE);
+  	return es_string_replace;
+  }
+
+  requireEs_string_replace();
+
+  var es_string_search = {};
+
+  var sameValue;
+  var hasRequiredSameValue;
+
+  function requireSameValue () {
+  	if (hasRequiredSameValue) return sameValue;
+  	hasRequiredSameValue = 1;
+  	// `SameValue` abstract operation
+  	// https://tc39.es/ecma262/#sec-samevalue
+  	// eslint-disable-next-line es/no-object-is -- safe
+  	sameValue = Object.is || function is(x, y) {
+  	  // eslint-disable-next-line no-self-compare -- NaN check
+  	  return x === y ? x !== 0 || 1 / x === 1 / y : x !== x && y !== y;
+  	};
+  	return sameValue;
+  }
+
+  var hasRequiredEs_string_search;
+
+  function requireEs_string_search () {
+  	if (hasRequiredEs_string_search) return es_string_search;
+  	hasRequiredEs_string_search = 1;
+  	var call = requireFunctionCall();
+  	var fixRegExpWellKnownSymbolLogic = requireFixRegexpWellKnownSymbolLogic();
+  	var anObject = requireAnObject();
+  	var isNullOrUndefined = requireIsNullOrUndefined();
+  	var requireObjectCoercible = requireRequireObjectCoercible();
+  	var sameValue = requireSameValue();
+  	var toString = requireToString();
+  	var getMethod = requireGetMethod();
+  	var regExpExec = requireRegexpExecAbstract();
+
+  	// @@search logic
+  	fixRegExpWellKnownSymbolLogic('search', function (SEARCH, nativeSearch, maybeCallNative) {
+  	  return [
+  	    // `String.prototype.search` method
+  	    // https://tc39.es/ecma262/#sec-string.prototype.search
+  	    function search(regexp) {
+  	      var O = requireObjectCoercible(this);
+  	      var searcher = isNullOrUndefined(regexp) ? undefined : getMethod(regexp, SEARCH);
+  	      return searcher ? call(searcher, regexp, O) : new RegExp(regexp)[SEARCH](toString(O));
+  	    },
+  	    // `RegExp.prototype[@@search]` method
+  	    // https://tc39.es/ecma262/#sec-regexp.prototype-@@search
+  	    function (string) {
+  	      var rx = anObject(this);
+  	      var S = toString(string);
+  	      var res = maybeCallNative(nativeSearch, rx, S);
+
+  	      if (res.done) return res.value;
+
+  	      var previousLastIndex = rx.lastIndex;
+  	      if (!sameValue(previousLastIndex, 0)) rx.lastIndex = 0;
+  	      var result = regExpExec(rx, S);
+  	      if (!sameValue(rx.lastIndex, previousLastIndex)) rx.lastIndex = previousLastIndex;
+  	      return result === null ? -1 : result.index;
+  	    }
+  	  ];
+  	});
+  	return es_string_search;
+  }
+
+  requireEs_string_search();
+
+  var web_domCollections_forEach = {};
+
+  var domIterables;
+  var hasRequiredDomIterables;
+
+  function requireDomIterables () {
+  	if (hasRequiredDomIterables) return domIterables;
+  	hasRequiredDomIterables = 1;
+  	// iterable DOM collections
+  	// flag - `iterable` interface - 'entries', 'keys', 'values', 'forEach' methods
+  	domIterables = {
+  	  CSSRuleList: 0,
+  	  CSSStyleDeclaration: 0,
+  	  CSSValueList: 0,
+  	  ClientRectList: 0,
+  	  DOMRectList: 0,
+  	  DOMStringList: 0,
+  	  DOMTokenList: 1,
+  	  DataTransferItemList: 0,
+  	  FileList: 0,
+  	  HTMLAllCollection: 0,
+  	  HTMLCollection: 0,
+  	  HTMLFormElement: 0,
+  	  HTMLSelectElement: 0,
+  	  MediaList: 0,
+  	  MimeTypeArray: 0,
+  	  NamedNodeMap: 0,
+  	  NodeList: 1,
+  	  PaintRequestList: 0,
+  	  Plugin: 0,
+  	  PluginArray: 0,
+  	  SVGLengthList: 0,
+  	  SVGNumberList: 0,
+  	  SVGPathSegList: 0,
+  	  SVGPointList: 0,
+  	  SVGStringList: 0,
+  	  SVGTransformList: 0,
+  	  SourceBufferList: 0,
+  	  StyleSheetList: 0,
+  	  TextTrackCueList: 0,
+  	  TextTrackList: 0,
+  	  TouchList: 0
+  	};
+  	return domIterables;
+  }
+
+  var domTokenListPrototype;
+  var hasRequiredDomTokenListPrototype;
+
+  function requireDomTokenListPrototype () {
+  	if (hasRequiredDomTokenListPrototype) return domTokenListPrototype;
+  	hasRequiredDomTokenListPrototype = 1;
+  	// in old WebKit versions, `element.classList` is not an instance of global `DOMTokenList`
+  	var documentCreateElement = requireDocumentCreateElement();
+
+  	var classList = documentCreateElement('span').classList;
+  	var DOMTokenListPrototype = classList && classList.constructor && classList.constructor.prototype;
+
+  	domTokenListPrototype = DOMTokenListPrototype === Object.prototype ? undefined : DOMTokenListPrototype;
+  	return domTokenListPrototype;
+  }
+
+  var arrayForEach;
+  var hasRequiredArrayForEach;
+
+  function requireArrayForEach () {
+  	if (hasRequiredArrayForEach) return arrayForEach;
+  	hasRequiredArrayForEach = 1;
+  	var $forEach = requireArrayIteration().forEach;
+  	var arrayMethodIsStrict = requireArrayMethodIsStrict();
+
+  	var STRICT_METHOD = arrayMethodIsStrict('forEach');
+
+  	// `Array.prototype.forEach` method implementation
+  	// https://tc39.es/ecma262/#sec-array.prototype.foreach
+  	arrayForEach = !STRICT_METHOD ? function forEach(callbackfn /* , thisArg */) {
+  	  return $forEach(this, callbackfn, arguments.length > 1 ? arguments[1] : undefined);
+  	// eslint-disable-next-line es/no-array-prototype-foreach -- safe
+  	} : [].forEach;
+  	return arrayForEach;
+  }
+
+  var hasRequiredWeb_domCollections_forEach;
+
+  function requireWeb_domCollections_forEach () {
+  	if (hasRequiredWeb_domCollections_forEach) return web_domCollections_forEach;
+  	hasRequiredWeb_domCollections_forEach = 1;
+  	var globalThis = requireGlobalThis();
+  	var DOMIterables = requireDomIterables();
+  	var DOMTokenListPrototype = requireDomTokenListPrototype();
+  	var forEach = requireArrayForEach();
+  	var createNonEnumerableProperty = requireCreateNonEnumerableProperty();
+
+  	var handlePrototype = function (CollectionPrototype) {
+  	  // some Chrome versions have non-configurable methods on DOMTokenList
+  	  if (CollectionPrototype && CollectionPrototype.forEach !== forEach) try {
+  	    createNonEnumerableProperty(CollectionPrototype, 'forEach', forEach);
+  	  } catch (error) {
+  	    CollectionPrototype.forEach = forEach;
+  	  }
+  	};
+
+  	for (var COLLECTION_NAME in DOMIterables) {
+  	  if (DOMIterables[COLLECTION_NAME]) {
+  	    handlePrototype(globalThis[COLLECTION_NAME] && globalThis[COLLECTION_NAME].prototype);
+  	  }
+  	}
+
+  	handlePrototype(DOMTokenListPrototype);
+  	return web_domCollections_forEach;
+  }
+
+  requireWeb_domCollections_forEach();
 
   /**
    * @author: Dennis Hernández
    * @update zhixin wen <wenzhixin2010@gmail.com>
    */
-  var Utils = $$c.fn.bootstrapTable.utils;
+  var Utils = $.fn.bootstrapTable.utils;
   var UtilsCookie = {
     cookieIds: {
       sortOrder: 'bs.table.sortOrder',
@@ -16530,6 +21611,7 @@
       pageNumber: 'bs.table.pageNumber',
       pageList: 'bs.table.pageList',
       hiddenColumns: 'bs.table.hiddenColumns',
+      columns: 'bs.table.columns',
       cardView: 'bs.table.cardView',
       customView: 'bs.table.customView',
       searchText: 'bs.table.searchText',
@@ -16547,6 +21629,9 @@
       return navigator.cookieEnabled;
     },
     isCookieEnabled: function isCookieEnabled(that, cookieName) {
+      if (cookieName === 'bs.table.columns') {
+        return that.options.cookiesEnabled.includes('bs.table.hiddenColumns');
+      }
       return that.options.cookiesEnabled.includes(cookieName);
     },
     setCookie: function setCookie(that, cookieName, cookieValue) {
@@ -16649,10 +21734,10 @@
           };
           var filterContainer = header;
           if (that.options.filterControlContainer) {
-            filterContainer = $$c("".concat(that.options.filterControlContainer));
+            filterContainer = $("".concat(that.options.filterControlContainer));
           }
           filterContainer.find(searchControls).each(function () {
-            var field = $$c(this).closest('[data-field]').data('field');
+            var field = $(this).closest('[data-field]').data('field');
             var filteredCookies = parsedCookieFilters.filter(function (cookie) {
               return cookie.field === field;
             });
@@ -16665,7 +21750,7 @@
       }, 250);
     }
   };
-  Object.assign($$c.fn.bootstrapTable.defaults, {
+  Object.assign($.fn.bootstrapTable.defaults, {
     cookie: false,
     cookieExpire: '2h',
     cookiePath: null,
@@ -16688,13 +21773,13 @@
       removeItem: undefined
     }
   });
-  $$c.fn.bootstrapTable.methods.push('getCookies');
-  $$c.fn.bootstrapTable.methods.push('deleteCookie');
-  Object.assign($$c.fn.bootstrapTable.utils, {
+  $.fn.bootstrapTable.methods.push('getCookies');
+  $.fn.bootstrapTable.methods.push('deleteCookie');
+  Object.assign($.fn.bootstrapTable.utils, {
     setCookie: UtilsCookie.setCookie,
     getCookie: UtilsCookie.getCookie
   });
-  $$c.BootstrapTable = /*#__PURE__*/function (_$$BootstrapTable) {
+  $.BootstrapTable = /*#__PURE__*/function (_$$BootstrapTable) {
     function _class() {
       _classCallCheck(this, _class);
       return _callSuper(this, _class, arguments);
@@ -16703,6 +21788,7 @@
     return _createClass(_class, [{
       key: "init",
       value: function init() {
+        var _this = this;
         if (this.options.cookie) {
           if (this.options.cookieStorage === 'cookieStorage' && !UtilsCookie.isCookieSupportedByBrowser()) {
             throw new Error('Cookies are not enabled in this browser.');
@@ -16718,6 +21804,7 @@
           try {
             filterByCookie = JSON.parse(filterByCookieValue);
           } catch (e) {
+            console.error(e);
             throw new Error('Could not parse the json of the filterBy cookie!');
           }
           this.filterColumns = filterByCookie ? filterByCookie : {};
@@ -16727,32 +21814,30 @@
           this._filterControlValuesLoaded = false;
           this.options.cookiesEnabled = typeof this.options.cookiesEnabled === 'string' ? this.options.cookiesEnabled.replace('[', '').replace(']', '').replace(/'/g, '').replace(/ /g, '').split(',') : this.options.cookiesEnabled;
           if (this.options.filterControl) {
-            var that = this;
             this.$el.on('column-search.bs.table', function (e, field, text) {
               var isNewField = true;
-              for (var i = 0; i < that._filterControls.length; i++) {
-                if (that._filterControls[i].field === field) {
-                  that._filterControls[i].text = text;
+              for (var i = 0; i < _this._filterControls.length; i++) {
+                if (_this._filterControls[i].field === field) {
+                  _this._filterControls[i].text = text;
                   isNewField = false;
                   break;
                 }
               }
               if (isNewField) {
-                that._filterControls.push({
+                _this._filterControls.push({
                   field: field,
                   text: text
                 });
               }
-              UtilsCookie.setCookie(that, UtilsCookie.cookieIds.filterControl, JSON.stringify(that._filterControls));
-            }).on('created-controls.bs.table', UtilsCookie.initCookieFilters(that));
+              UtilsCookie.setCookie(_this, UtilsCookie.cookieIds.filterControl, JSON.stringify(_this._filterControls));
+            }).on('created-controls.bs.table', UtilsCookie.initCookieFilters(this));
           }
         }
-        _get(_getPrototypeOf(_class.prototype), "init", this).call(this);
+        _superPropGet(_class, "init", this)([]);
       }
     }, {
       key: "initServer",
       value: function initServer() {
-        var _get2;
         if (this.options.cookie && this.options.filterControl && !this._filterControlValuesLoaded) {
           var cookie = JSON.parse(UtilsCookie.getCookie(this, UtilsCookie.cookieIds.filterControl));
           if (cookie) {
@@ -16762,26 +21847,24 @@
         for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
           args[_key] = arguments[_key];
         }
-        (_get2 = _get(_getPrototypeOf(_class.prototype), "initServer", this)).call.apply(_get2, [this].concat(args));
+        _superPropGet(_class, "initServer", this)(args);
       }
     }, {
       key: "initTable",
       value: function initTable() {
-        var _get3;
         for (var _len2 = arguments.length, args = new Array(_len2), _key2 = 0; _key2 < _len2; _key2++) {
           args[_key2] = arguments[_key2];
         }
-        (_get3 = _get(_getPrototypeOf(_class.prototype), "initTable", this)).call.apply(_get3, [this].concat(args));
+        _superPropGet(_class, "initTable", this)(args);
         this.initCookie();
       }
     }, {
       key: "onSort",
       value: function onSort() {
-        var _get4;
         for (var _len3 = arguments.length, args = new Array(_len3), _key3 = 0; _key3 < _len3; _key3++) {
           args[_key3] = arguments[_key3];
         }
-        (_get4 = _get(_getPrototypeOf(_class.prototype), "onSort", this)).call.apply(_get4, [this].concat(args));
+        _superPropGet(_class, "onSort", this)(args);
         if (!this.options.cookie) {
           return;
         }
@@ -16798,11 +21881,10 @@
     }, {
       key: "onMultipleSort",
       value: function onMultipleSort() {
-        var _get5;
         for (var _len4 = arguments.length, args = new Array(_len4), _key4 = 0; _key4 < _len4; _key4++) {
           args[_key4] = arguments[_key4];
         }
-        (_get5 = _get(_getPrototypeOf(_class.prototype), "onMultipleSort", this)).call.apply(_get5, [this].concat(args));
+        _superPropGet(_class, "onMultipleSort", this)(args);
         if (!this.options.cookie) {
           return;
         }
@@ -16819,11 +21901,10 @@
     }, {
       key: "onPageNumber",
       value: function onPageNumber() {
-        var _get6;
         for (var _len5 = arguments.length, args = new Array(_len5), _key5 = 0; _key5 < _len5; _key5++) {
           args[_key5] = arguments[_key5];
         }
-        (_get6 = _get(_getPrototypeOf(_class.prototype), "onPageNumber", this)).call.apply(_get6, [this].concat(args));
+        _superPropGet(_class, "onPageNumber", this)(args);
         if (!this.options.cookie) {
           return;
         }
@@ -16832,25 +21913,23 @@
     }, {
       key: "onPageListChange",
       value: function onPageListChange() {
-        var _get7;
         for (var _len6 = arguments.length, args = new Array(_len6), _key6 = 0; _key6 < _len6; _key6++) {
           args[_key6] = arguments[_key6];
         }
-        (_get7 = _get(_getPrototypeOf(_class.prototype), "onPageListChange", this)).call.apply(_get7, [this].concat(args));
+        _superPropGet(_class, "onPageListChange", this)(args);
         if (!this.options.cookie) {
           return;
         }
-        UtilsCookie.setCookie(this, UtilsCookie.cookieIds.pageList, this.options.pageSize);
+        UtilsCookie.setCookie(this, UtilsCookie.cookieIds.pageList, this.options.pageSize === this.options.formatAllRows() ? 'all' : this.options.pageSize);
         UtilsCookie.setCookie(this, UtilsCookie.cookieIds.pageNumber, this.options.pageNumber);
       }
     }, {
       key: "onPagePre",
       value: function onPagePre() {
-        var _get8;
         for (var _len7 = arguments.length, args = new Array(_len7), _key7 = 0; _key7 < _len7; _key7++) {
           args[_key7] = arguments[_key7];
         }
-        (_get8 = _get(_getPrototypeOf(_class.prototype), "onPagePre", this)).call.apply(_get8, [this].concat(args));
+        _superPropGet(_class, "onPagePre", this)(args);
         if (!this.options.cookie) {
           return;
         }
@@ -16859,11 +21938,10 @@
     }, {
       key: "onPageNext",
       value: function onPageNext() {
-        var _get9;
         for (var _len8 = arguments.length, args = new Array(_len8), _key8 = 0; _key8 < _len8; _key8++) {
           args[_key8] = arguments[_key8];
         }
-        (_get9 = _get(_getPrototypeOf(_class.prototype), "onPageNext", this)).call.apply(_get9, [this].concat(args));
+        _superPropGet(_class, "onPageNext", this)(args);
         if (!this.options.cookie) {
           return;
         }
@@ -16872,49 +21950,53 @@
     }, {
       key: "_toggleColumn",
       value: function _toggleColumn() {
-        var _get10;
         for (var _len9 = arguments.length, args = new Array(_len9), _key9 = 0; _key9 < _len9; _key9++) {
           args[_key9] = arguments[_key9];
         }
-        (_get10 = _get(_getPrototypeOf(_class.prototype), "_toggleColumn", this)).call.apply(_get10, [this].concat(args));
+        _superPropGet(_class, "_toggleColumn", this)(args);
         if (!this.options.cookie) {
           return;
         }
         UtilsCookie.setCookie(this, UtilsCookie.cookieIds.hiddenColumns, JSON.stringify(this.getHiddenColumns().map(function (column) {
           return column.field;
         })));
+        UtilsCookie.setCookie(this, UtilsCookie.cookieIds.columns, JSON.stringify(this.columns.map(function (column) {
+          return column.field;
+        })));
       }
     }, {
       key: "_toggleAllColumns",
       value: function _toggleAllColumns() {
-        var _get11;
         for (var _len10 = arguments.length, args = new Array(_len10), _key10 = 0; _key10 < _len10; _key10++) {
           args[_key10] = arguments[_key10];
         }
-        (_get11 = _get(_getPrototypeOf(_class.prototype), "_toggleAllColumns", this)).call.apply(_get11, [this].concat(args));
+        _superPropGet(_class, "_toggleAllColumns", this)(args);
         if (!this.options.cookie) {
           return;
         }
         UtilsCookie.setCookie(this, UtilsCookie.cookieIds.hiddenColumns, JSON.stringify(this.getHiddenColumns().map(function (column) {
           return column.field;
         })));
+        UtilsCookie.setCookie(this, UtilsCookie.cookieIds.columns, JSON.stringify(this.columns.map(function (column) {
+          return column.field;
+        })));
       }
     }, {
       key: "toggleView",
       value: function toggleView() {
-        _get(_getPrototypeOf(_class.prototype), "toggleView", this).call(this);
+        _superPropGet(_class, "toggleView", this)([]);
         UtilsCookie.setCookie(this, UtilsCookie.cookieIds.cardView, this.options.cardView);
       }
     }, {
       key: "toggleCustomView",
       value: function toggleCustomView() {
-        _get(_getPrototypeOf(_class.prototype), "toggleCustomView", this).call(this);
+        _superPropGet(_class, "toggleCustomView", this)([]);
         UtilsCookie.setCookie(this, UtilsCookie.cookieIds.customView, this.customViewDefaultView);
       }
     }, {
       key: "selectPage",
       value: function selectPage(page) {
-        _get(_getPrototypeOf(_class.prototype), "selectPage", this).call(this, page);
+        _superPropGet(_class, "selectPage", this)([page]);
         if (!this.options.cookie) {
           return;
         }
@@ -16923,7 +22005,7 @@
     }, {
       key: "onSearch",
       value: function onSearch(event) {
-        _get(_getPrototypeOf(_class.prototype), "onSearch", this).call(this, event, arguments.length > 1 ? arguments[1] : true);
+        _superPropGet(_class, "onSearch", this)([event, arguments.length > 1 ? arguments[1] : true]);
         if (!this.options.cookie) {
           return;
         }
@@ -16935,14 +22017,13 @@
     }, {
       key: "initHeader",
       value: function initHeader() {
-        var _get12;
         if (this.options.reorderableColumns && this.options.cookie) {
           this.columnsSortOrder = JSON.parse(UtilsCookie.getCookie(this, UtilsCookie.cookieIds.reorderColumns));
         }
         for (var _len11 = arguments.length, args = new Array(_len11), _key11 = 0; _key11 < _len11; _key11++) {
           args[_key11] = arguments[_key11];
         }
-        (_get12 = _get(_getPrototypeOf(_class.prototype), "initHeader", this)).call.apply(_get12, [this].concat(args));
+        _superPropGet(_class, "initHeader", this)(args);
       }
     }, {
       key: "persistReorderColumnsState",
@@ -16952,11 +22033,10 @@
     }, {
       key: "filterBy",
       value: function filterBy() {
-        var _get13;
         for (var _len12 = arguments.length, args = new Array(_len12), _key12 = 0; _key12 < _len12; _key12++) {
           args[_key12] = arguments[_key12];
         }
-        (_get13 = _get(_getPrototypeOf(_class.prototype), "filterBy", this)).call.apply(_get13, [this].concat(args));
+        _superPropGet(_class, "filterBy", this)(args);
         if (!this.options.cookie) {
           return;
         }
@@ -16982,15 +22062,20 @@
         var cardViewCookie = UtilsCookie.getCookie(this, UtilsCookie.cookieIds.cardView);
         var customViewCookie = UtilsCookie.getCookie(this, UtilsCookie.cookieIds.customView);
         var hiddenColumnsCookieValue = UtilsCookie.getCookie(this, UtilsCookie.cookieIds.hiddenColumns);
+        var columnsCookieValue = UtilsCookie.getCookie(this, UtilsCookie.cookieIds.columns);
         var hiddenColumnsCookie = {};
+        var columnsCookie = {};
         try {
           hiddenColumnsCookie = JSON.parse(hiddenColumnsCookieValue);
+          columnsCookie = JSON.parse(columnsCookieValue);
         } catch (e) {
-          throw new Error('Could not parse the json of the hidden columns cookie!', hiddenColumnsCookieValue);
+          console.error(e);
+          throw new Error('Could not parse the json of the columns cookie!');
         }
         try {
           sortPriorityCookie = JSON.parse(sortPriorityCookie);
         } catch (e) {
+          console.error(e);
           throw new Error('Could not parse the json of the sortPriority cookie!', sortPriorityCookie);
         }
         if (!sortPriorityCookie) {
@@ -17013,7 +22098,7 @@
         // pageNumber
         this.options.pageNumber = pageNumberCookie ? +pageNumberCookie : this.options.pageNumber;
         // pageSize
-        this.options.pageSize = pageListCookie ? pageListCookie === this.options.formatAllRows() ? pageListCookie : +pageListCookie : this.options.pageSize;
+        this.options.pageSize = pageListCookie ? pageListCookie === 'all' ? this.options.formatAllRows() : +pageListCookie : this.options.pageSize;
         // searchText
         if (UtilsCookie.isCookieEnabled(this, UtilsCookie.cookieIds.searchText) && this.options.searchText === '') {
           this.options.searchText = searchTextCookie ? searchTextCookie : '';
@@ -17024,12 +22109,15 @@
         }
         this.customViewDefaultView = customViewCookie === 'true';
         if (hiddenColumnsCookie) {
+          columnsCookie = columnsCookie || this.columns.map(function (column) {
+            return column.field;
+          });
           var _iterator2 = _createForOfIteratorHelper(this.columns),
             _step2;
           try {
             for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
               var column = _step2.value;
-              if (!column.switchable) {
+              if (!column.switchable || !columnsCookie.includes(column.field)) {
                 continue;
               }
               column.visible = this.isSelectionColumn(column) || !hiddenColumnsCookie.includes(column.field);
@@ -17044,14 +22132,13 @@
     }, {
       key: "getCookies",
       value: function getCookies() {
-        var bootstrapTable = this;
         var cookies = {};
         for (var _i = 0, _Object$entries = Object.entries(UtilsCookie.cookieIds); _i < _Object$entries.length; _i++) {
           var _Object$entries$_i = _slicedToArray(_Object$entries[_i], 2),
             key = _Object$entries$_i[0],
             value = _Object$entries$_i[1];
-          cookies[key] = UtilsCookie.getCookie(bootstrapTable, value);
-          if (key === 'columns' || key === 'hiddenColumns' || key === 'sortPriority') {
+          cookies[key] = UtilsCookie.getCookie(this, value);
+          if (['columns', 'hiddenColumns', 'sortPriority'].includes(key)) {
             cookies[key] = JSON.parse(cookies[key]);
           }
         }
@@ -17060,7 +22147,7 @@
     }, {
       key: "deleteCookie",
       value: function deleteCookie(cookieName) {
-        if (!cookieName) {
+        if (!cookieName || !this.options.cookie) {
           return;
         }
         UtilsCookie.deleteCookie(this, UtilsCookie.cookieIds[cookieName]);
@@ -17068,12 +22155,12 @@
     }, {
       key: "configureStorage",
       value: function configureStorage() {
-        var that = this;
+        var _this2 = this;
         this._storage = {};
         switch (this.options.cookieStorage) {
           case 'cookieStorage':
             this._storage.setItem = function (cookieName, cookieValue) {
-              document.cookie = [cookieName, '=', encodeURIComponent(cookieValue), "; expires=".concat(UtilsCookie.calculateExpiration(that.options.cookieExpire)), that.options.cookiePath ? "; path=".concat(that.options.cookiePath) : '', that.options.cookieDomain ? "; domain=".concat(that.options.cookieDomain) : '', that.options.cookieSecure ? '; secure' : '', ";SameSite=".concat(that.options.cookieSameSite)].join('');
+              document.cookie = [cookieName, '=', encodeURIComponent(cookieValue), "; expires=".concat(UtilsCookie.calculateExpiration(_this2.options.cookieExpire)), _this2.options.cookiePath ? "; path=".concat(_this2.options.cookiePath) : '', _this2.options.cookieDomain ? "; domain=".concat(_this2.options.cookieDomain) : '', _this2.options.cookieSecure ? '; secure' : '', ";SameSite=".concat(_this2.options.cookieSameSite)].join('');
             };
             this._storage.getItem = function (cookieName) {
               var value = "; ".concat(document.cookie);
@@ -17081,7 +22168,7 @@
               return parts.length === 2 ? decodeURIComponent(parts.pop().split(';').shift()) : null;
             };
             this._storage.removeItem = function (cookieName) {
-              document.cookie = [encodeURIComponent(cookieName), '=', '; expires=Thu, 01 Jan 1970 00:00:00 GMT', that.options.cookiePath ? "; path=".concat(that.options.cookiePath) : '', that.options.cookieDomain ? "; domain=".concat(that.options.cookieDomain) : '', ";SameSite=".concat(that.options.cookieSameSite)].join('');
+              document.cookie = [encodeURIComponent(cookieName), '=', '; expires=Thu, 01 Jan 1970 00:00:00 GMT', _this2.options.cookiePath ? "; path=".concat(_this2.options.cookiePath) : '', _this2.options.cookieDomain ? "; domain=".concat(_this2.options.cookieDomain) : '', ";SameSite=".concat(_this2.options.cookieSameSite)].join('');
             };
             break;
           case 'localStorage':
@@ -17111,13 +22198,13 @@
               throw new Error('The following options must be set while using the customStorage: cookieCustomStorageSet, cookieCustomStorageGet and cookieCustomStorageDelete');
             }
             this._storage.setItem = function (cookieName, cookieValue) {
-              Utils.calculateObjectValue(that.options, that.options.cookieCustomStorageSet, [cookieName, cookieValue], '');
+              Utils.calculateObjectValue(_this2.options, _this2.options.cookieCustomStorageSet, [cookieName, cookieValue], '');
             };
             this._storage.getItem = function (cookieName) {
-              return Utils.calculateObjectValue(that.options, that.options.cookieCustomStorageGet, [cookieName], '');
+              return Utils.calculateObjectValue(_this2.options, _this2.options.cookieCustomStorageGet, [cookieName], '');
             };
             this._storage.removeItem = function (cookieName) {
-              Utils.calculateObjectValue(that.options, that.options.cookieCustomStorageDelete, [cookieName], '');
+              Utils.calculateObjectValue(_this2.options, _this2.options.cookieCustomStorageDelete, [cookieName], '');
             };
             break;
           default:
@@ -17125,7 +22212,7 @@
         }
       }
     }]);
-  }($$c.BootstrapTable);
+  }($.BootstrapTable);
 
 }));
 
@@ -17133,11 +22220,55 @@
   typeof exports === 'object' && typeof module !== 'undefined' ? factory(require('jquery')) :
   typeof define === 'function' && define.amd ? define(['jquery'], factory) :
   (global = typeof globalThis !== 'undefined' ? globalThis : global || self, factory(global.jQuery));
-})(this, (function ($$3) { 'use strict';
+})(this, (function ($) { 'use strict';
 
+  function _assertThisInitialized(e) {
+    if (void 0 === e) throw new ReferenceError("this hasn't been initialised - super() hasn't been called");
+    return e;
+  }
   function _callSuper(t, o, e) {
     return o = _getPrototypeOf(o), _possibleConstructorReturn(t, _isNativeReflectConstruct() ? Reflect.construct(o, e || [], _getPrototypeOf(t).constructor) : o.apply(t, e));
   }
+  function _classCallCheck(a, n) {
+    if (!(a instanceof n)) throw new TypeError("Cannot call a class as a function");
+  }
+  function _defineProperties(e, r) {
+    for (var t = 0; t < r.length; t++) {
+      var o = r[t];
+      o.enumerable = o.enumerable || !1, o.configurable = !0, "value" in o && (o.writable = !0), Object.defineProperty(e, _toPropertyKey(o.key), o);
+    }
+  }
+  function _createClass(e, r, t) {
+    return _defineProperties(e.prototype, r), Object.defineProperty(e, "prototype", {
+      writable: !1
+    }), e;
+  }
+  function _get() {
+    return _get = "undefined" != typeof Reflect && Reflect.get ? Reflect.get.bind() : function (e, t, r) {
+      var p = _superPropBase(e, t);
+      if (p) {
+        var n = Object.getOwnPropertyDescriptor(p, t);
+        return n.get ? n.get.call(arguments.length < 3 ? e : r) : n.value;
+      }
+    }, _get.apply(null, arguments);
+  }
+  function _getPrototypeOf(t) {
+    return _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf.bind() : function (t) {
+      return t.__proto__ || Object.getPrototypeOf(t);
+    }, _getPrototypeOf(t);
+  }
+  function _inherits(t, e) {
+    if ("function" != typeof e && null !== e) throw new TypeError("Super expression must either be null or a function");
+    t.prototype = Object.create(e && e.prototype, {
+      constructor: {
+        value: t,
+        writable: !0,
+        configurable: !0
+      }
+    }), Object.defineProperty(t, "prototype", {
+      writable: !1
+    }), e && _setPrototypeOf(t, e);
+  }
   function _isNativeReflectConstruct() {
     try {
       var t = !Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {}));
@@ -17146,1695 +22277,2210 @@
       return !!t;
     })();
   }
+  function _possibleConstructorReturn(t, e) {
+    if (e && ("object" == typeof e || "function" == typeof e)) return e;
+    if (void 0 !== e) throw new TypeError("Derived constructors may only return object or undefined");
+    return _assertThisInitialized(t);
+  }
+  function _setPrototypeOf(t, e) {
+    return _setPrototypeOf = Object.setPrototypeOf ? Object.setPrototypeOf.bind() : function (t, e) {
+      return t.__proto__ = e, t;
+    }, _setPrototypeOf(t, e);
+  }
+  function _superPropBase(t, o) {
+    for (; !{}.hasOwnProperty.call(t, o) && null !== (t = _getPrototypeOf(t)););
+    return t;
+  }
+  function _superPropGet(t, o, e, r) {
+    var p = _get(_getPrototypeOf(t.prototype ), o, e);
+    return "function" == typeof p ? function (t) {
+      return p.apply(e, t);
+    } : p;
+  }
   function _toPrimitive(t, r) {
     if ("object" != typeof t || !t) return t;
     var e = t[Symbol.toPrimitive];
     if (void 0 !== e) {
-      var i = e.call(t, r || "default");
+      var i = e.call(t, r);
       if ("object" != typeof i) return i;
       throw new TypeError("@@toPrimitive must return a primitive value.");
     }
-    return ("string" === r ? String : Number)(t);
+    return (String )(t);
   }
   function _toPropertyKey(t) {
     var i = _toPrimitive(t, "string");
     return "symbol" == typeof i ? i : i + "";
   }
-  function _classCallCheck(instance, Constructor) {
-    if (!(instance instanceof Constructor)) {
-      throw new TypeError("Cannot call a class as a function");
-    }
-  }
-  function _defineProperties(target, props) {
-    for (var i = 0; i < props.length; i++) {
-      var descriptor = props[i];
-      descriptor.enumerable = descriptor.enumerable || false;
-      descriptor.configurable = true;
-      if ("value" in descriptor) descriptor.writable = true;
-      Object.defineProperty(target, _toPropertyKey(descriptor.key), descriptor);
-    }
-  }
-  function _createClass(Constructor, protoProps, staticProps) {
-    if (protoProps) _defineProperties(Constructor.prototype, protoProps);
-    if (staticProps) _defineProperties(Constructor, staticProps);
-    Object.defineProperty(Constructor, "prototype", {
-      writable: false
-    });
-    return Constructor;
-  }
-  function _inherits(subClass, superClass) {
-    if (typeof superClass !== "function" && superClass !== null) {
-      throw new TypeError("Super expression must either be null or a function");
-    }
-    subClass.prototype = Object.create(superClass && superClass.prototype, {
-      constructor: {
-        value: subClass,
-        writable: true,
-        configurable: true
-      }
-    });
-    Object.defineProperty(subClass, "prototype", {
-      writable: false
-    });
-    if (superClass) _setPrototypeOf(subClass, superClass);
-  }
-  function _getPrototypeOf(o) {
-    _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf.bind() : function _getPrototypeOf(o) {
-      return o.__proto__ || Object.getPrototypeOf(o);
-    };
-    return _getPrototypeOf(o);
-  }
-  function _setPrototypeOf(o, p) {
-    _setPrototypeOf = Object.setPrototypeOf ? Object.setPrototypeOf.bind() : function _setPrototypeOf(o, p) {
-      o.__proto__ = p;
-      return o;
-    };
-    return _setPrototypeOf(o, p);
-  }
-  function _assertThisInitialized(self) {
-    if (self === void 0) {
-      throw new ReferenceError("this hasn't been initialised - super() hasn't been called");
-    }
-    return self;
-  }
-  function _possibleConstructorReturn(self, call) {
-    if (call && (typeof call === "object" || typeof call === "function")) {
-      return call;
-    } else if (call !== void 0) {
-      throw new TypeError("Derived constructors may only return object or undefined");
-    }
-    return _assertThisInitialized(self);
-  }
-  function _superPropBase(object, property) {
-    while (!Object.prototype.hasOwnProperty.call(object, property)) {
-      object = _getPrototypeOf(object);
-      if (object === null) break;
-    }
-    return object;
-  }
-  function _get() {
-    if (typeof Reflect !== "undefined" && Reflect.get) {
-      _get = Reflect.get.bind();
-    } else {
-      _get = function _get(target, property, receiver) {
-        var base = _superPropBase(target, property);
-        if (!base) return;
-        var desc = Object.getOwnPropertyDescriptor(base, property);
-        if (desc.get) {
-          return desc.get.call(arguments.length < 3 ? target : receiver);
-        }
-        return desc.value;
-      };
-    }
-    return _get.apply(this, arguments);
-  }
 
   var commonjsGlobal = typeof globalThis !== 'undefined' ? globalThis : typeof window !== 'undefined' ? window : typeof global !== 'undefined' ? global : typeof self !== 'undefined' ? self : {};
 
-  var check = function (it) {
-    return it && it.Math === Math && it;
-  };
+  var es_array_find = {};
 
-  // https://github.com/zloirock/core-js/issues/86#issuecomment-115759028
-  var global$a =
-    // eslint-disable-next-line es/no-global-this -- safe
-    check(typeof globalThis == 'object' && globalThis) ||
-    check(typeof window == 'object' && window) ||
-    // eslint-disable-next-line no-restricted-globals -- safe
-    check(typeof self == 'object' && self) ||
-    check(typeof commonjsGlobal == 'object' && commonjsGlobal) ||
-    check(typeof commonjsGlobal == 'object' && commonjsGlobal) ||
-    // eslint-disable-next-line no-new-func -- fallback
-    (function () { return this; })() || Function('return this')();
+  var globalThis_1;
+  var hasRequiredGlobalThis;
+
+  function requireGlobalThis () {
+  	if (hasRequiredGlobalThis) return globalThis_1;
+  	hasRequiredGlobalThis = 1;
+  	var check = function (it) {
+  	  return it && it.Math === Math && it;
+  	};
+
+  	// https://github.com/zloirock/core-js/issues/86#issuecomment-115759028
+  	globalThis_1 =
+  	  // eslint-disable-next-line es/no-global-this -- safe
+  	  check(typeof globalThis == 'object' && globalThis) ||
+  	  check(typeof window == 'object' && window) ||
+  	  // eslint-disable-next-line no-restricted-globals -- safe
+  	  check(typeof self == 'object' && self) ||
+  	  check(typeof commonjsGlobal == 'object' && commonjsGlobal) ||
+  	  check(typeof globalThis_1 == 'object' && globalThis_1) ||
+  	  // eslint-disable-next-line no-new-func -- fallback
+  	  (function () { return this; })() || Function('return this')();
+  	return globalThis_1;
+  }
 
   var objectGetOwnPropertyDescriptor = {};
 
-  var fails$c = function (exec) {
-    try {
-      return !!exec();
-    } catch (error) {
-      return true;
-    }
-  };
+  var fails;
+  var hasRequiredFails;
 
-  var fails$b = fails$c;
+  function requireFails () {
+  	if (hasRequiredFails) return fails;
+  	hasRequiredFails = 1;
+  	fails = function (exec) {
+  	  try {
+  	    return !!exec();
+  	  } catch (error) {
+  	    return true;
+  	  }
+  	};
+  	return fails;
+  }
 
-  // Detect IE8's incomplete defineProperty implementation
-  var descriptors = !fails$b(function () {
-    // eslint-disable-next-line es/no-object-defineproperty -- required for testing
-    return Object.defineProperty({}, 1, { get: function () { return 7; } })[1] !== 7;
-  });
+  var descriptors;
+  var hasRequiredDescriptors;
 
-  var fails$a = fails$c;
+  function requireDescriptors () {
+  	if (hasRequiredDescriptors) return descriptors;
+  	hasRequiredDescriptors = 1;
+  	var fails = requireFails();
 
-  var functionBindNative = !fails$a(function () {
-    // eslint-disable-next-line es/no-function-prototype-bind -- safe
-    var test = (function () { /* empty */ }).bind();
-    // eslint-disable-next-line no-prototype-builtins -- safe
-    return typeof test != 'function' || test.hasOwnProperty('prototype');
-  });
+  	// Detect IE8's incomplete defineProperty implementation
+  	descriptors = !fails(function () {
+  	  // eslint-disable-next-line es/no-object-defineproperty -- required for testing
+  	  return Object.defineProperty({}, 1, { get: function () { return 7; } })[1] !== 7;
+  	});
+  	return descriptors;
+  }
 
-  var NATIVE_BIND$2 = functionBindNative;
+  var functionBindNative;
+  var hasRequiredFunctionBindNative;
 
-  var call$5 = Function.prototype.call;
+  function requireFunctionBindNative () {
+  	if (hasRequiredFunctionBindNative) return functionBindNative;
+  	hasRequiredFunctionBindNative = 1;
+  	var fails = requireFails();
 
-  var functionCall = NATIVE_BIND$2 ? call$5.bind(call$5) : function () {
-    return call$5.apply(call$5, arguments);
-  };
+  	functionBindNative = !fails(function () {
+  	  // eslint-disable-next-line es/no-function-prototype-bind -- safe
+  	  var test = (function () { /* empty */ }).bind();
+  	  // eslint-disable-next-line no-prototype-builtins -- safe
+  	  return typeof test != 'function' || test.hasOwnProperty('prototype');
+  	});
+  	return functionBindNative;
+  }
+
+  var functionCall;
+  var hasRequiredFunctionCall;
+
+  function requireFunctionCall () {
+  	if (hasRequiredFunctionCall) return functionCall;
+  	hasRequiredFunctionCall = 1;
+  	var NATIVE_BIND = requireFunctionBindNative();
+
+  	var call = Function.prototype.call;
+
+  	functionCall = NATIVE_BIND ? call.bind(call) : function () {
+  	  return call.apply(call, arguments);
+  	};
+  	return functionCall;
+  }
 
   var objectPropertyIsEnumerable = {};
 
-  var $propertyIsEnumerable = {}.propertyIsEnumerable;
-  // eslint-disable-next-line es/no-object-getownpropertydescriptor -- safe
-  var getOwnPropertyDescriptor$1 = Object.getOwnPropertyDescriptor;
+  var hasRequiredObjectPropertyIsEnumerable;
 
-  // Nashorn ~ JDK8 bug
-  var NASHORN_BUG = getOwnPropertyDescriptor$1 && !$propertyIsEnumerable.call({ 1: 2 }, 1);
+  function requireObjectPropertyIsEnumerable () {
+  	if (hasRequiredObjectPropertyIsEnumerable) return objectPropertyIsEnumerable;
+  	hasRequiredObjectPropertyIsEnumerable = 1;
+  	var $propertyIsEnumerable = {}.propertyIsEnumerable;
+  	// eslint-disable-next-line es/no-object-getownpropertydescriptor -- safe
+  	var getOwnPropertyDescriptor = Object.getOwnPropertyDescriptor;
 
-  // `Object.prototype.propertyIsEnumerable` method implementation
-  // https://tc39.es/ecma262/#sec-object.prototype.propertyisenumerable
-  objectPropertyIsEnumerable.f = NASHORN_BUG ? function propertyIsEnumerable(V) {
-    var descriptor = getOwnPropertyDescriptor$1(this, V);
-    return !!descriptor && descriptor.enumerable;
-  } : $propertyIsEnumerable;
+  	// Nashorn ~ JDK8 bug
+  	var NASHORN_BUG = getOwnPropertyDescriptor && !$propertyIsEnumerable.call({ 1: 2 }, 1);
 
-  var createPropertyDescriptor$3 = function (bitmap, value) {
-    return {
-      enumerable: !(bitmap & 1),
-      configurable: !(bitmap & 2),
-      writable: !(bitmap & 4),
-      value: value
-    };
-  };
-
-  var NATIVE_BIND$1 = functionBindNative;
-
-  var FunctionPrototype$1 = Function.prototype;
-  var call$4 = FunctionPrototype$1.call;
-  var uncurryThisWithBind = NATIVE_BIND$1 && FunctionPrototype$1.bind.bind(call$4, call$4);
-
-  var functionUncurryThis = NATIVE_BIND$1 ? uncurryThisWithBind : function (fn) {
-    return function () {
-      return call$4.apply(fn, arguments);
-    };
-  };
-
-  var uncurryThis$d = functionUncurryThis;
-
-  var toString$2 = uncurryThis$d({}.toString);
-  var stringSlice$1 = uncurryThis$d(''.slice);
-
-  var classofRaw$2 = function (it) {
-    return stringSlice$1(toString$2(it), 8, -1);
-  };
-
-  var uncurryThis$c = functionUncurryThis;
-  var fails$9 = fails$c;
-  var classof$4 = classofRaw$2;
-
-  var $Object$3 = Object;
-  var split = uncurryThis$c(''.split);
-
-  // fallback for non-array-like ES3 and non-enumerable old V8 strings
-  var indexedObject = fails$9(function () {
-    // throws an error in rhino, see https://github.com/mozilla/rhino/issues/346
-    // eslint-disable-next-line no-prototype-builtins -- safe
-    return !$Object$3('z').propertyIsEnumerable(0);
-  }) ? function (it) {
-    return classof$4(it) === 'String' ? split(it, '') : $Object$3(it);
-  } : $Object$3;
-
-  // we can't use just `it == null` since of `document.all` special case
-  // https://tc39.es/ecma262/#sec-IsHTMLDDA-internal-slot-aec
-  var isNullOrUndefined$2 = function (it) {
-    return it === null || it === undefined;
-  };
-
-  var isNullOrUndefined$1 = isNullOrUndefined$2;
-
-  var $TypeError$6 = TypeError;
-
-  // `RequireObjectCoercible` abstract operation
-  // https://tc39.es/ecma262/#sec-requireobjectcoercible
-  var requireObjectCoercible$2 = function (it) {
-    if (isNullOrUndefined$1(it)) throw new $TypeError$6("Can't call method on " + it);
-    return it;
-  };
-
-  // toObject with fallback for non-array-like ES3 strings
-  var IndexedObject$2 = indexedObject;
-  var requireObjectCoercible$1 = requireObjectCoercible$2;
-
-  var toIndexedObject$4 = function (it) {
-    return IndexedObject$2(requireObjectCoercible$1(it));
-  };
-
-  // https://tc39.es/ecma262/#sec-IsHTMLDDA-internal-slot
-  var documentAll = typeof document == 'object' && document.all;
-
-  // `IsCallable` abstract operation
-  // https://tc39.es/ecma262/#sec-iscallable
-  // eslint-disable-next-line unicorn/no-typeof-undefined -- required for testing
-  var isCallable$c = typeof documentAll == 'undefined' && documentAll !== undefined ? function (argument) {
-    return typeof argument == 'function' || argument === documentAll;
-  } : function (argument) {
-    return typeof argument == 'function';
-  };
-
-  var isCallable$b = isCallable$c;
-
-  var isObject$7 = function (it) {
-    return typeof it == 'object' ? it !== null : isCallable$b(it);
-  };
-
-  var global$9 = global$a;
-  var isCallable$a = isCallable$c;
-
-  var aFunction = function (argument) {
-    return isCallable$a(argument) ? argument : undefined;
-  };
-
-  var getBuiltIn$4 = function (namespace, method) {
-    return arguments.length < 2 ? aFunction(global$9[namespace]) : global$9[namespace] && global$9[namespace][method];
-  };
-
-  var uncurryThis$b = functionUncurryThis;
-
-  var objectIsPrototypeOf = uncurryThis$b({}.isPrototypeOf);
-
-  var engineUserAgent = typeof navigator != 'undefined' && String(navigator.userAgent) || '';
-
-  var global$8 = global$a;
-  var userAgent = engineUserAgent;
-
-  var process = global$8.process;
-  var Deno = global$8.Deno;
-  var versions = process && process.versions || Deno && Deno.version;
-  var v8 = versions && versions.v8;
-  var match, version;
-
-  if (v8) {
-    match = v8.split('.');
-    // in old Chrome, versions of V8 isn't V8 = Chrome / 10
-    // but their correct versions are not interesting for us
-    version = match[0] > 0 && match[0] < 4 ? 1 : +(match[0] + match[1]);
+  	// `Object.prototype.propertyIsEnumerable` method implementation
+  	// https://tc39.es/ecma262/#sec-object.prototype.propertyisenumerable
+  	objectPropertyIsEnumerable.f = NASHORN_BUG ? function propertyIsEnumerable(V) {
+  	  var descriptor = getOwnPropertyDescriptor(this, V);
+  	  return !!descriptor && descriptor.enumerable;
+  	} : $propertyIsEnumerable;
+  	return objectPropertyIsEnumerable;
   }
 
-  // BrowserFS NodeJS `process` polyfill incorrectly set `.v8` to `0.0`
-  // so check `userAgent` even if `.v8` exists, but 0
-  if (!version && userAgent) {
-    match = userAgent.match(/Edge\/(\d+)/);
-    if (!match || match[1] >= 74) {
-      match = userAgent.match(/Chrome\/(\d+)/);
-      if (match) version = +match[1];
-    }
+  var createPropertyDescriptor;
+  var hasRequiredCreatePropertyDescriptor;
+
+  function requireCreatePropertyDescriptor () {
+  	if (hasRequiredCreatePropertyDescriptor) return createPropertyDescriptor;
+  	hasRequiredCreatePropertyDescriptor = 1;
+  	createPropertyDescriptor = function (bitmap, value) {
+  	  return {
+  	    enumerable: !(bitmap & 1),
+  	    configurable: !(bitmap & 2),
+  	    writable: !(bitmap & 4),
+  	    value: value
+  	  };
+  	};
+  	return createPropertyDescriptor;
   }
 
-  var engineV8Version = version;
+  var functionUncurryThis;
+  var hasRequiredFunctionUncurryThis;
 
-  /* eslint-disable es/no-symbol -- required for testing */
-  var V8_VERSION$2 = engineV8Version;
-  var fails$8 = fails$c;
-  var global$7 = global$a;
+  function requireFunctionUncurryThis () {
+  	if (hasRequiredFunctionUncurryThis) return functionUncurryThis;
+  	hasRequiredFunctionUncurryThis = 1;
+  	var NATIVE_BIND = requireFunctionBindNative();
 
-  var $String$3 = global$7.String;
+  	var FunctionPrototype = Function.prototype;
+  	var call = FunctionPrototype.call;
+  	var uncurryThisWithBind = NATIVE_BIND && FunctionPrototype.bind.bind(call, call);
 
-  // eslint-disable-next-line es/no-object-getownpropertysymbols -- required for testing
-  var symbolConstructorDetection = !!Object.getOwnPropertySymbols && !fails$8(function () {
-    var symbol = Symbol('symbol detection');
-    // Chrome 38 Symbol has incorrect toString conversion
-    // `get-own-property-symbols` polyfill symbols converted to object are not Symbol instances
-    // nb: Do not call `String` directly to avoid this being optimized out to `symbol+''` which will,
-    // of course, fail.
-    return !$String$3(symbol) || !(Object(symbol) instanceof Symbol) ||
-      // Chrome 38-40 symbols are not inherited from DOM collections prototypes to instances
-      !Symbol.sham && V8_VERSION$2 && V8_VERSION$2 < 41;
-  });
+  	functionUncurryThis = NATIVE_BIND ? uncurryThisWithBind : function (fn) {
+  	  return function () {
+  	    return call.apply(fn, arguments);
+  	  };
+  	};
+  	return functionUncurryThis;
+  }
 
-  /* eslint-disable es/no-symbol -- required for testing */
-  var NATIVE_SYMBOL$1 = symbolConstructorDetection;
+  var classofRaw;
+  var hasRequiredClassofRaw;
 
-  var useSymbolAsUid = NATIVE_SYMBOL$1
-    && !Symbol.sham
-    && typeof Symbol.iterator == 'symbol';
+  function requireClassofRaw () {
+  	if (hasRequiredClassofRaw) return classofRaw;
+  	hasRequiredClassofRaw = 1;
+  	var uncurryThis = requireFunctionUncurryThis();
 
-  var getBuiltIn$3 = getBuiltIn$4;
-  var isCallable$9 = isCallable$c;
-  var isPrototypeOf = objectIsPrototypeOf;
-  var USE_SYMBOL_AS_UID$1 = useSymbolAsUid;
+  	var toString = uncurryThis({}.toString);
+  	var stringSlice = uncurryThis(''.slice);
 
-  var $Object$2 = Object;
+  	classofRaw = function (it) {
+  	  return stringSlice(toString(it), 8, -1);
+  	};
+  	return classofRaw;
+  }
 
-  var isSymbol$2 = USE_SYMBOL_AS_UID$1 ? function (it) {
-    return typeof it == 'symbol';
-  } : function (it) {
-    var $Symbol = getBuiltIn$3('Symbol');
-    return isCallable$9($Symbol) && isPrototypeOf($Symbol.prototype, $Object$2(it));
-  };
+  var indexedObject;
+  var hasRequiredIndexedObject;
 
-  var $String$2 = String;
+  function requireIndexedObject () {
+  	if (hasRequiredIndexedObject) return indexedObject;
+  	hasRequiredIndexedObject = 1;
+  	var uncurryThis = requireFunctionUncurryThis();
+  	var fails = requireFails();
+  	var classof = requireClassofRaw();
 
-  var tryToString$1 = function (argument) {
-    try {
-      return $String$2(argument);
-    } catch (error) {
-      return 'Object';
-    }
-  };
+  	var $Object = Object;
+  	var split = uncurryThis(''.split);
 
-  var isCallable$8 = isCallable$c;
-  var tryToString = tryToString$1;
+  	// fallback for non-array-like ES3 and non-enumerable old V8 strings
+  	indexedObject = fails(function () {
+  	  // throws an error in rhino, see https://github.com/mozilla/rhino/issues/346
+  	  // eslint-disable-next-line no-prototype-builtins -- safe
+  	  return !$Object('z').propertyIsEnumerable(0);
+  	}) ? function (it) {
+  	  return classof(it) === 'String' ? split(it, '') : $Object(it);
+  	} : $Object;
+  	return indexedObject;
+  }
 
-  var $TypeError$5 = TypeError;
+  var isNullOrUndefined;
+  var hasRequiredIsNullOrUndefined;
 
-  // `Assert: IsCallable(argument) is true`
-  var aCallable$2 = function (argument) {
-    if (isCallable$8(argument)) return argument;
-    throw new $TypeError$5(tryToString(argument) + ' is not a function');
-  };
+  function requireIsNullOrUndefined () {
+  	if (hasRequiredIsNullOrUndefined) return isNullOrUndefined;
+  	hasRequiredIsNullOrUndefined = 1;
+  	// we can't use just `it == null` since of `document.all` special case
+  	// https://tc39.es/ecma262/#sec-IsHTMLDDA-internal-slot-aec
+  	isNullOrUndefined = function (it) {
+  	  return it === null || it === undefined;
+  	};
+  	return isNullOrUndefined;
+  }
 
-  var aCallable$1 = aCallable$2;
-  var isNullOrUndefined = isNullOrUndefined$2;
+  var requireObjectCoercible;
+  var hasRequiredRequireObjectCoercible;
 
-  // `GetMethod` abstract operation
-  // https://tc39.es/ecma262/#sec-getmethod
-  var getMethod$1 = function (V, P) {
-    var func = V[P];
-    return isNullOrUndefined(func) ? undefined : aCallable$1(func);
-  };
+  function requireRequireObjectCoercible () {
+  	if (hasRequiredRequireObjectCoercible) return requireObjectCoercible;
+  	hasRequiredRequireObjectCoercible = 1;
+  	var isNullOrUndefined = requireIsNullOrUndefined();
 
-  var call$3 = functionCall;
-  var isCallable$7 = isCallable$c;
-  var isObject$6 = isObject$7;
+  	var $TypeError = TypeError;
 
-  var $TypeError$4 = TypeError;
+  	// `RequireObjectCoercible` abstract operation
+  	// https://tc39.es/ecma262/#sec-requireobjectcoercible
+  	requireObjectCoercible = function (it) {
+  	  if (isNullOrUndefined(it)) throw new $TypeError("Can't call method on " + it);
+  	  return it;
+  	};
+  	return requireObjectCoercible;
+  }
 
-  // `OrdinaryToPrimitive` abstract operation
-  // https://tc39.es/ecma262/#sec-ordinarytoprimitive
-  var ordinaryToPrimitive$1 = function (input, pref) {
-    var fn, val;
-    if (pref === 'string' && isCallable$7(fn = input.toString) && !isObject$6(val = call$3(fn, input))) return val;
-    if (isCallable$7(fn = input.valueOf) && !isObject$6(val = call$3(fn, input))) return val;
-    if (pref !== 'string' && isCallable$7(fn = input.toString) && !isObject$6(val = call$3(fn, input))) return val;
-    throw new $TypeError$4("Can't convert object to primitive value");
-  };
+  var toIndexedObject;
+  var hasRequiredToIndexedObject;
+
+  function requireToIndexedObject () {
+  	if (hasRequiredToIndexedObject) return toIndexedObject;
+  	hasRequiredToIndexedObject = 1;
+  	// toObject with fallback for non-array-like ES3 strings
+  	var IndexedObject = requireIndexedObject();
+  	var requireObjectCoercible = requireRequireObjectCoercible();
+
+  	toIndexedObject = function (it) {
+  	  return IndexedObject(requireObjectCoercible(it));
+  	};
+  	return toIndexedObject;
+  }
+
+  var isCallable;
+  var hasRequiredIsCallable;
+
+  function requireIsCallable () {
+  	if (hasRequiredIsCallable) return isCallable;
+  	hasRequiredIsCallable = 1;
+  	// https://tc39.es/ecma262/#sec-IsHTMLDDA-internal-slot
+  	var documentAll = typeof document == 'object' && document.all;
+
+  	// `IsCallable` abstract operation
+  	// https://tc39.es/ecma262/#sec-iscallable
+  	// eslint-disable-next-line unicorn/no-typeof-undefined -- required for testing
+  	isCallable = typeof documentAll == 'undefined' && documentAll !== undefined ? function (argument) {
+  	  return typeof argument == 'function' || argument === documentAll;
+  	} : function (argument) {
+  	  return typeof argument == 'function';
+  	};
+  	return isCallable;
+  }
+
+  var isObject;
+  var hasRequiredIsObject;
+
+  function requireIsObject () {
+  	if (hasRequiredIsObject) return isObject;
+  	hasRequiredIsObject = 1;
+  	var isCallable = requireIsCallable();
+
+  	isObject = function (it) {
+  	  return typeof it == 'object' ? it !== null : isCallable(it);
+  	};
+  	return isObject;
+  }
+
+  var getBuiltIn;
+  var hasRequiredGetBuiltIn;
+
+  function requireGetBuiltIn () {
+  	if (hasRequiredGetBuiltIn) return getBuiltIn;
+  	hasRequiredGetBuiltIn = 1;
+  	var globalThis = requireGlobalThis();
+  	var isCallable = requireIsCallable();
+
+  	var aFunction = function (argument) {
+  	  return isCallable(argument) ? argument : undefined;
+  	};
+
+  	getBuiltIn = function (namespace, method) {
+  	  return arguments.length < 2 ? aFunction(globalThis[namespace]) : globalThis[namespace] && globalThis[namespace][method];
+  	};
+  	return getBuiltIn;
+  }
+
+  var objectIsPrototypeOf;
+  var hasRequiredObjectIsPrototypeOf;
+
+  function requireObjectIsPrototypeOf () {
+  	if (hasRequiredObjectIsPrototypeOf) return objectIsPrototypeOf;
+  	hasRequiredObjectIsPrototypeOf = 1;
+  	var uncurryThis = requireFunctionUncurryThis();
+
+  	objectIsPrototypeOf = uncurryThis({}.isPrototypeOf);
+  	return objectIsPrototypeOf;
+  }
+
+  var environmentUserAgent;
+  var hasRequiredEnvironmentUserAgent;
+
+  function requireEnvironmentUserAgent () {
+  	if (hasRequiredEnvironmentUserAgent) return environmentUserAgent;
+  	hasRequiredEnvironmentUserAgent = 1;
+  	var globalThis = requireGlobalThis();
+
+  	var navigator = globalThis.navigator;
+  	var userAgent = navigator && navigator.userAgent;
+
+  	environmentUserAgent = userAgent ? String(userAgent) : '';
+  	return environmentUserAgent;
+  }
+
+  var environmentV8Version;
+  var hasRequiredEnvironmentV8Version;
+
+  function requireEnvironmentV8Version () {
+  	if (hasRequiredEnvironmentV8Version) return environmentV8Version;
+  	hasRequiredEnvironmentV8Version = 1;
+  	var globalThis = requireGlobalThis();
+  	var userAgent = requireEnvironmentUserAgent();
+
+  	var process = globalThis.process;
+  	var Deno = globalThis.Deno;
+  	var versions = process && process.versions || Deno && Deno.version;
+  	var v8 = versions && versions.v8;
+  	var match, version;
+
+  	if (v8) {
+  	  match = v8.split('.');
+  	  // in old Chrome, versions of V8 isn't V8 = Chrome / 10
+  	  // but their correct versions are not interesting for us
+  	  version = match[0] > 0 && match[0] < 4 ? 1 : +(match[0] + match[1]);
+  	}
+
+  	// BrowserFS NodeJS `process` polyfill incorrectly set `.v8` to `0.0`
+  	// so check `userAgent` even if `.v8` exists, but 0
+  	if (!version && userAgent) {
+  	  match = userAgent.match(/Edge\/(\d+)/);
+  	  if (!match || match[1] >= 74) {
+  	    match = userAgent.match(/Chrome\/(\d+)/);
+  	    if (match) version = +match[1];
+  	  }
+  	}
+
+  	environmentV8Version = version;
+  	return environmentV8Version;
+  }
+
+  var symbolConstructorDetection;
+  var hasRequiredSymbolConstructorDetection;
+
+  function requireSymbolConstructorDetection () {
+  	if (hasRequiredSymbolConstructorDetection) return symbolConstructorDetection;
+  	hasRequiredSymbolConstructorDetection = 1;
+  	/* eslint-disable es/no-symbol -- required for testing */
+  	var V8_VERSION = requireEnvironmentV8Version();
+  	var fails = requireFails();
+  	var globalThis = requireGlobalThis();
+
+  	var $String = globalThis.String;
+
+  	// eslint-disable-next-line es/no-object-getownpropertysymbols -- required for testing
+  	symbolConstructorDetection = !!Object.getOwnPropertySymbols && !fails(function () {
+  	  var symbol = Symbol('symbol detection');
+  	  // Chrome 38 Symbol has incorrect toString conversion
+  	  // `get-own-property-symbols` polyfill symbols converted to object are not Symbol instances
+  	  // nb: Do not call `String` directly to avoid this being optimized out to `symbol+''` which will,
+  	  // of course, fail.
+  	  return !$String(symbol) || !(Object(symbol) instanceof Symbol) ||
+  	    // Chrome 38-40 symbols are not inherited from DOM collections prototypes to instances
+  	    !Symbol.sham && V8_VERSION && V8_VERSION < 41;
+  	});
+  	return symbolConstructorDetection;
+  }
+
+  var useSymbolAsUid;
+  var hasRequiredUseSymbolAsUid;
+
+  function requireUseSymbolAsUid () {
+  	if (hasRequiredUseSymbolAsUid) return useSymbolAsUid;
+  	hasRequiredUseSymbolAsUid = 1;
+  	/* eslint-disable es/no-symbol -- required for testing */
+  	var NATIVE_SYMBOL = requireSymbolConstructorDetection();
+
+  	useSymbolAsUid = NATIVE_SYMBOL &&
+  	  !Symbol.sham &&
+  	  typeof Symbol.iterator == 'symbol';
+  	return useSymbolAsUid;
+  }
+
+  var isSymbol;
+  var hasRequiredIsSymbol;
+
+  function requireIsSymbol () {
+  	if (hasRequiredIsSymbol) return isSymbol;
+  	hasRequiredIsSymbol = 1;
+  	var getBuiltIn = requireGetBuiltIn();
+  	var isCallable = requireIsCallable();
+  	var isPrototypeOf = requireObjectIsPrototypeOf();
+  	var USE_SYMBOL_AS_UID = requireUseSymbolAsUid();
+
+  	var $Object = Object;
+
+  	isSymbol = USE_SYMBOL_AS_UID ? function (it) {
+  	  return typeof it == 'symbol';
+  	} : function (it) {
+  	  var $Symbol = getBuiltIn('Symbol');
+  	  return isCallable($Symbol) && isPrototypeOf($Symbol.prototype, $Object(it));
+  	};
+  	return isSymbol;
+  }
+
+  var tryToString;
+  var hasRequiredTryToString;
+
+  function requireTryToString () {
+  	if (hasRequiredTryToString) return tryToString;
+  	hasRequiredTryToString = 1;
+  	var $String = String;
+
+  	tryToString = function (argument) {
+  	  try {
+  	    return $String(argument);
+  	  } catch (error) {
+  	    return 'Object';
+  	  }
+  	};
+  	return tryToString;
+  }
+
+  var aCallable;
+  var hasRequiredACallable;
+
+  function requireACallable () {
+  	if (hasRequiredACallable) return aCallable;
+  	hasRequiredACallable = 1;
+  	var isCallable = requireIsCallable();
+  	var tryToString = requireTryToString();
+
+  	var $TypeError = TypeError;
+
+  	// `Assert: IsCallable(argument) is true`
+  	aCallable = function (argument) {
+  	  if (isCallable(argument)) return argument;
+  	  throw new $TypeError(tryToString(argument) + ' is not a function');
+  	};
+  	return aCallable;
+  }
+
+  var getMethod;
+  var hasRequiredGetMethod;
+
+  function requireGetMethod () {
+  	if (hasRequiredGetMethod) return getMethod;
+  	hasRequiredGetMethod = 1;
+  	var aCallable = requireACallable();
+  	var isNullOrUndefined = requireIsNullOrUndefined();
+
+  	// `GetMethod` abstract operation
+  	// https://tc39.es/ecma262/#sec-getmethod
+  	getMethod = function (V, P) {
+  	  var func = V[P];
+  	  return isNullOrUndefined(func) ? undefined : aCallable(func);
+  	};
+  	return getMethod;
+  }
+
+  var ordinaryToPrimitive;
+  var hasRequiredOrdinaryToPrimitive;
+
+  function requireOrdinaryToPrimitive () {
+  	if (hasRequiredOrdinaryToPrimitive) return ordinaryToPrimitive;
+  	hasRequiredOrdinaryToPrimitive = 1;
+  	var call = requireFunctionCall();
+  	var isCallable = requireIsCallable();
+  	var isObject = requireIsObject();
+
+  	var $TypeError = TypeError;
+
+  	// `OrdinaryToPrimitive` abstract operation
+  	// https://tc39.es/ecma262/#sec-ordinarytoprimitive
+  	ordinaryToPrimitive = function (input, pref) {
+  	  var fn, val;
+  	  if (pref === 'string' && isCallable(fn = input.toString) && !isObject(val = call(fn, input))) return val;
+  	  if (isCallable(fn = input.valueOf) && !isObject(val = call(fn, input))) return val;
+  	  if (pref !== 'string' && isCallable(fn = input.toString) && !isObject(val = call(fn, input))) return val;
+  	  throw new $TypeError("Can't convert object to primitive value");
+  	};
+  	return ordinaryToPrimitive;
+  }
 
   var sharedStore = {exports: {}};
 
-  var global$6 = global$a;
+  var isPure;
+  var hasRequiredIsPure;
 
-  // eslint-disable-next-line es/no-object-defineproperty -- safe
-  var defineProperty$3 = Object.defineProperty;
+  function requireIsPure () {
+  	if (hasRequiredIsPure) return isPure;
+  	hasRequiredIsPure = 1;
+  	isPure = false;
+  	return isPure;
+  }
 
-  var defineGlobalProperty$3 = function (key, value) {
-    try {
-      defineProperty$3(global$6, key, { value: value, configurable: true, writable: true });
-    } catch (error) {
-      global$6[key] = value;
-    } return value;
-  };
+  var defineGlobalProperty;
+  var hasRequiredDefineGlobalProperty;
 
-  var globalThis$1 = global$a;
-  var defineGlobalProperty$2 = defineGlobalProperty$3;
+  function requireDefineGlobalProperty () {
+  	if (hasRequiredDefineGlobalProperty) return defineGlobalProperty;
+  	hasRequiredDefineGlobalProperty = 1;
+  	var globalThis = requireGlobalThis();
 
-  var SHARED = '__core-js_shared__';
-  var store$3 = sharedStore.exports = globalThis$1[SHARED] || defineGlobalProperty$2(SHARED, {});
+  	// eslint-disable-next-line es/no-object-defineproperty -- safe
+  	var defineProperty = Object.defineProperty;
 
-  (store$3.versions || (store$3.versions = [])).push({
-    version: '3.36.1',
-    mode: 'global',
-    copyright: '© 2014-2024 Denis Pushkarev (zloirock.ru)',
-    license: 'https://github.com/zloirock/core-js/blob/v3.36.1/LICENSE',
-    source: 'https://github.com/zloirock/core-js'
-  });
+  	defineGlobalProperty = function (key, value) {
+  	  try {
+  	    defineProperty(globalThis, key, { value: value, configurable: true, writable: true });
+  	  } catch (error) {
+  	    globalThis[key] = value;
+  	  } return value;
+  	};
+  	return defineGlobalProperty;
+  }
 
-  var sharedStoreExports = sharedStore.exports;
+  var hasRequiredSharedStore;
 
-  var store$2 = sharedStoreExports;
+  function requireSharedStore () {
+  	if (hasRequiredSharedStore) return sharedStore.exports;
+  	hasRequiredSharedStore = 1;
+  	var IS_PURE = requireIsPure();
+  	var globalThis = requireGlobalThis();
+  	var defineGlobalProperty = requireDefineGlobalProperty();
 
-  var shared$3 = function (key, value) {
-    return store$2[key] || (store$2[key] = value || {});
-  };
+  	var SHARED = '__core-js_shared__';
+  	var store = sharedStore.exports = globalThis[SHARED] || defineGlobalProperty(SHARED, {});
 
-  var requireObjectCoercible = requireObjectCoercible$2;
+  	(store.versions || (store.versions = [])).push({
+  	  version: '3.39.0',
+  	  mode: IS_PURE ? 'pure' : 'global',
+  	  copyright: '© 2014-2024 Denis Pushkarev (zloirock.ru)',
+  	  license: 'https://github.com/zloirock/core-js/blob/v3.39.0/LICENSE',
+  	  source: 'https://github.com/zloirock/core-js'
+  	});
+  	return sharedStore.exports;
+  }
 
-  var $Object$1 = Object;
+  var shared;
+  var hasRequiredShared;
 
-  // `ToObject` abstract operation
-  // https://tc39.es/ecma262/#sec-toobject
-  var toObject$4 = function (argument) {
-    return $Object$1(requireObjectCoercible(argument));
-  };
+  function requireShared () {
+  	if (hasRequiredShared) return shared;
+  	hasRequiredShared = 1;
+  	var store = requireSharedStore();
 
-  var uncurryThis$a = functionUncurryThis;
-  var toObject$3 = toObject$4;
+  	shared = function (key, value) {
+  	  return store[key] || (store[key] = value || {});
+  	};
+  	return shared;
+  }
 
-  var hasOwnProperty = uncurryThis$a({}.hasOwnProperty);
+  var toObject;
+  var hasRequiredToObject;
 
-  // `HasOwnProperty` abstract operation
-  // https://tc39.es/ecma262/#sec-hasownproperty
-  // eslint-disable-next-line es/no-object-hasown -- safe
-  var hasOwnProperty_1 = Object.hasOwn || function hasOwn(it, key) {
-    return hasOwnProperty(toObject$3(it), key);
-  };
+  function requireToObject () {
+  	if (hasRequiredToObject) return toObject;
+  	hasRequiredToObject = 1;
+  	var requireObjectCoercible = requireRequireObjectCoercible();
 
-  var uncurryThis$9 = functionUncurryThis;
+  	var $Object = Object;
 
-  var id = 0;
-  var postfix = Math.random();
-  var toString$1 = uncurryThis$9(1.0.toString);
+  	// `ToObject` abstract operation
+  	// https://tc39.es/ecma262/#sec-toobject
+  	toObject = function (argument) {
+  	  return $Object(requireObjectCoercible(argument));
+  	};
+  	return toObject;
+  }
 
-  var uid$2 = function (key) {
-    return 'Symbol(' + (key === undefined ? '' : key) + ')_' + toString$1(++id + postfix, 36);
-  };
+  var hasOwnProperty_1;
+  var hasRequiredHasOwnProperty;
 
-  var global$5 = global$a;
-  var shared$2 = shared$3;
-  var hasOwn$6 = hasOwnProperty_1;
-  var uid$1 = uid$2;
-  var NATIVE_SYMBOL = symbolConstructorDetection;
-  var USE_SYMBOL_AS_UID = useSymbolAsUid;
+  function requireHasOwnProperty () {
+  	if (hasRequiredHasOwnProperty) return hasOwnProperty_1;
+  	hasRequiredHasOwnProperty = 1;
+  	var uncurryThis = requireFunctionUncurryThis();
+  	var toObject = requireToObject();
 
-  var Symbol$1 = global$5.Symbol;
-  var WellKnownSymbolsStore = shared$2('wks');
-  var createWellKnownSymbol = USE_SYMBOL_AS_UID ? Symbol$1['for'] || Symbol$1 : Symbol$1 && Symbol$1.withoutSetter || uid$1;
+  	var hasOwnProperty = uncurryThis({}.hasOwnProperty);
 
-  var wellKnownSymbol$7 = function (name) {
-    if (!hasOwn$6(WellKnownSymbolsStore, name)) {
-      WellKnownSymbolsStore[name] = NATIVE_SYMBOL && hasOwn$6(Symbol$1, name)
-        ? Symbol$1[name]
-        : createWellKnownSymbol('Symbol.' + name);
-    } return WellKnownSymbolsStore[name];
-  };
+  	// `HasOwnProperty` abstract operation
+  	// https://tc39.es/ecma262/#sec-hasownproperty
+  	// eslint-disable-next-line es/no-object-hasown -- safe
+  	hasOwnProperty_1 = Object.hasOwn || function hasOwn(it, key) {
+  	  return hasOwnProperty(toObject(it), key);
+  	};
+  	return hasOwnProperty_1;
+  }
 
-  var call$2 = functionCall;
-  var isObject$5 = isObject$7;
-  var isSymbol$1 = isSymbol$2;
-  var getMethod = getMethod$1;
-  var ordinaryToPrimitive = ordinaryToPrimitive$1;
-  var wellKnownSymbol$6 = wellKnownSymbol$7;
+  var uid;
+  var hasRequiredUid;
 
-  var $TypeError$3 = TypeError;
-  var TO_PRIMITIVE = wellKnownSymbol$6('toPrimitive');
+  function requireUid () {
+  	if (hasRequiredUid) return uid;
+  	hasRequiredUid = 1;
+  	var uncurryThis = requireFunctionUncurryThis();
 
-  // `ToPrimitive` abstract operation
-  // https://tc39.es/ecma262/#sec-toprimitive
-  var toPrimitive$1 = function (input, pref) {
-    if (!isObject$5(input) || isSymbol$1(input)) return input;
-    var exoticToPrim = getMethod(input, TO_PRIMITIVE);
-    var result;
-    if (exoticToPrim) {
-      if (pref === undefined) pref = 'default';
-      result = call$2(exoticToPrim, input, pref);
-      if (!isObject$5(result) || isSymbol$1(result)) return result;
-      throw new $TypeError$3("Can't convert object to primitive value");
-    }
-    if (pref === undefined) pref = 'number';
-    return ordinaryToPrimitive(input, pref);
-  };
+  	var id = 0;
+  	var postfix = Math.random();
+  	var toString = uncurryThis(1.0.toString);
 
-  var toPrimitive = toPrimitive$1;
-  var isSymbol = isSymbol$2;
+  	uid = function (key) {
+  	  return 'Symbol(' + (key === undefined ? '' : key) + ')_' + toString(++id + postfix, 36);
+  	};
+  	return uid;
+  }
 
-  // `ToPropertyKey` abstract operation
-  // https://tc39.es/ecma262/#sec-topropertykey
-  var toPropertyKey$2 = function (argument) {
-    var key = toPrimitive(argument, 'string');
-    return isSymbol(key) ? key : key + '';
-  };
+  var wellKnownSymbol;
+  var hasRequiredWellKnownSymbol;
 
-  var global$4 = global$a;
-  var isObject$4 = isObject$7;
+  function requireWellKnownSymbol () {
+  	if (hasRequiredWellKnownSymbol) return wellKnownSymbol;
+  	hasRequiredWellKnownSymbol = 1;
+  	var globalThis = requireGlobalThis();
+  	var shared = requireShared();
+  	var hasOwn = requireHasOwnProperty();
+  	var uid = requireUid();
+  	var NATIVE_SYMBOL = requireSymbolConstructorDetection();
+  	var USE_SYMBOL_AS_UID = requireUseSymbolAsUid();
 
-  var document$1 = global$4.document;
-  // typeof document.createElement is 'object' in old IE
-  var EXISTS$1 = isObject$4(document$1) && isObject$4(document$1.createElement);
+  	var Symbol = globalThis.Symbol;
+  	var WellKnownSymbolsStore = shared('wks');
+  	var createWellKnownSymbol = USE_SYMBOL_AS_UID ? Symbol['for'] || Symbol : Symbol && Symbol.withoutSetter || uid;
 
-  var documentCreateElement$1 = function (it) {
-    return EXISTS$1 ? document$1.createElement(it) : {};
-  };
+  	wellKnownSymbol = function (name) {
+  	  if (!hasOwn(WellKnownSymbolsStore, name)) {
+  	    WellKnownSymbolsStore[name] = NATIVE_SYMBOL && hasOwn(Symbol, name)
+  	      ? Symbol[name]
+  	      : createWellKnownSymbol('Symbol.' + name);
+  	  } return WellKnownSymbolsStore[name];
+  	};
+  	return wellKnownSymbol;
+  }
 
-  var DESCRIPTORS$9 = descriptors;
-  var fails$7 = fails$c;
-  var createElement = documentCreateElement$1;
+  var toPrimitive;
+  var hasRequiredToPrimitive;
 
-  // Thanks to IE8 for its funny defineProperty
-  var ie8DomDefine = !DESCRIPTORS$9 && !fails$7(function () {
-    // eslint-disable-next-line es/no-object-defineproperty -- required for testing
-    return Object.defineProperty(createElement('div'), 'a', {
-      get: function () { return 7; }
-    }).a !== 7;
-  });
+  function requireToPrimitive () {
+  	if (hasRequiredToPrimitive) return toPrimitive;
+  	hasRequiredToPrimitive = 1;
+  	var call = requireFunctionCall();
+  	var isObject = requireIsObject();
+  	var isSymbol = requireIsSymbol();
+  	var getMethod = requireGetMethod();
+  	var ordinaryToPrimitive = requireOrdinaryToPrimitive();
+  	var wellKnownSymbol = requireWellKnownSymbol();
 
-  var DESCRIPTORS$8 = descriptors;
-  var call$1 = functionCall;
-  var propertyIsEnumerableModule$1 = objectPropertyIsEnumerable;
-  var createPropertyDescriptor$2 = createPropertyDescriptor$3;
-  var toIndexedObject$3 = toIndexedObject$4;
-  var toPropertyKey$1 = toPropertyKey$2;
-  var hasOwn$5 = hasOwnProperty_1;
-  var IE8_DOM_DEFINE$1 = ie8DomDefine;
+  	var $TypeError = TypeError;
+  	var TO_PRIMITIVE = wellKnownSymbol('toPrimitive');
 
-  // eslint-disable-next-line es/no-object-getownpropertydescriptor -- safe
-  var $getOwnPropertyDescriptor$1 = Object.getOwnPropertyDescriptor;
+  	// `ToPrimitive` abstract operation
+  	// https://tc39.es/ecma262/#sec-toprimitive
+  	toPrimitive = function (input, pref) {
+  	  if (!isObject(input) || isSymbol(input)) return input;
+  	  var exoticToPrim = getMethod(input, TO_PRIMITIVE);
+  	  var result;
+  	  if (exoticToPrim) {
+  	    if (pref === undefined) pref = 'default';
+  	    result = call(exoticToPrim, input, pref);
+  	    if (!isObject(result) || isSymbol(result)) return result;
+  	    throw new $TypeError("Can't convert object to primitive value");
+  	  }
+  	  if (pref === undefined) pref = 'number';
+  	  return ordinaryToPrimitive(input, pref);
+  	};
+  	return toPrimitive;
+  }
 
-  // `Object.getOwnPropertyDescriptor` method
-  // https://tc39.es/ecma262/#sec-object.getownpropertydescriptor
-  objectGetOwnPropertyDescriptor.f = DESCRIPTORS$8 ? $getOwnPropertyDescriptor$1 : function getOwnPropertyDescriptor(O, P) {
-    O = toIndexedObject$3(O);
-    P = toPropertyKey$1(P);
-    if (IE8_DOM_DEFINE$1) try {
-      return $getOwnPropertyDescriptor$1(O, P);
-    } catch (error) { /* empty */ }
-    if (hasOwn$5(O, P)) return createPropertyDescriptor$2(!call$1(propertyIsEnumerableModule$1.f, O, P), O[P]);
-  };
+  var toPropertyKey;
+  var hasRequiredToPropertyKey;
+
+  function requireToPropertyKey () {
+  	if (hasRequiredToPropertyKey) return toPropertyKey;
+  	hasRequiredToPropertyKey = 1;
+  	var toPrimitive = requireToPrimitive();
+  	var isSymbol = requireIsSymbol();
+
+  	// `ToPropertyKey` abstract operation
+  	// https://tc39.es/ecma262/#sec-topropertykey
+  	toPropertyKey = function (argument) {
+  	  var key = toPrimitive(argument, 'string');
+  	  return isSymbol(key) ? key : key + '';
+  	};
+  	return toPropertyKey;
+  }
+
+  var documentCreateElement;
+  var hasRequiredDocumentCreateElement;
+
+  function requireDocumentCreateElement () {
+  	if (hasRequiredDocumentCreateElement) return documentCreateElement;
+  	hasRequiredDocumentCreateElement = 1;
+  	var globalThis = requireGlobalThis();
+  	var isObject = requireIsObject();
+
+  	var document = globalThis.document;
+  	// typeof document.createElement is 'object' in old IE
+  	var EXISTS = isObject(document) && isObject(document.createElement);
+
+  	documentCreateElement = function (it) {
+  	  return EXISTS ? document.createElement(it) : {};
+  	};
+  	return documentCreateElement;
+  }
+
+  var ie8DomDefine;
+  var hasRequiredIe8DomDefine;
+
+  function requireIe8DomDefine () {
+  	if (hasRequiredIe8DomDefine) return ie8DomDefine;
+  	hasRequiredIe8DomDefine = 1;
+  	var DESCRIPTORS = requireDescriptors();
+  	var fails = requireFails();
+  	var createElement = requireDocumentCreateElement();
+
+  	// Thanks to IE8 for its funny defineProperty
+  	ie8DomDefine = !DESCRIPTORS && !fails(function () {
+  	  // eslint-disable-next-line es/no-object-defineproperty -- required for testing
+  	  return Object.defineProperty(createElement('div'), 'a', {
+  	    get: function () { return 7; }
+  	  }).a !== 7;
+  	});
+  	return ie8DomDefine;
+  }
+
+  var hasRequiredObjectGetOwnPropertyDescriptor;
+
+  function requireObjectGetOwnPropertyDescriptor () {
+  	if (hasRequiredObjectGetOwnPropertyDescriptor) return objectGetOwnPropertyDescriptor;
+  	hasRequiredObjectGetOwnPropertyDescriptor = 1;
+  	var DESCRIPTORS = requireDescriptors();
+  	var call = requireFunctionCall();
+  	var propertyIsEnumerableModule = requireObjectPropertyIsEnumerable();
+  	var createPropertyDescriptor = requireCreatePropertyDescriptor();
+  	var toIndexedObject = requireToIndexedObject();
+  	var toPropertyKey = requireToPropertyKey();
+  	var hasOwn = requireHasOwnProperty();
+  	var IE8_DOM_DEFINE = requireIe8DomDefine();
+
+  	// eslint-disable-next-line es/no-object-getownpropertydescriptor -- safe
+  	var $getOwnPropertyDescriptor = Object.getOwnPropertyDescriptor;
+
+  	// `Object.getOwnPropertyDescriptor` method
+  	// https://tc39.es/ecma262/#sec-object.getownpropertydescriptor
+  	objectGetOwnPropertyDescriptor.f = DESCRIPTORS ? $getOwnPropertyDescriptor : function getOwnPropertyDescriptor(O, P) {
+  	  O = toIndexedObject(O);
+  	  P = toPropertyKey(P);
+  	  if (IE8_DOM_DEFINE) try {
+  	    return $getOwnPropertyDescriptor(O, P);
+  	  } catch (error) { /* empty */ }
+  	  if (hasOwn(O, P)) return createPropertyDescriptor(!call(propertyIsEnumerableModule.f, O, P), O[P]);
+  	};
+  	return objectGetOwnPropertyDescriptor;
+  }
 
   var objectDefineProperty = {};
 
-  var DESCRIPTORS$7 = descriptors;
-  var fails$6 = fails$c;
+  var v8PrototypeDefineBug;
+  var hasRequiredV8PrototypeDefineBug;
 
-  // V8 ~ Chrome 36-
-  // https://bugs.chromium.org/p/v8/issues/detail?id=3334
-  var v8PrototypeDefineBug = DESCRIPTORS$7 && fails$6(function () {
-    // eslint-disable-next-line es/no-object-defineproperty -- required for testing
-    return Object.defineProperty(function () { /* empty */ }, 'prototype', {
-      value: 42,
-      writable: false
-    }).prototype !== 42;
-  });
+  function requireV8PrototypeDefineBug () {
+  	if (hasRequiredV8PrototypeDefineBug) return v8PrototypeDefineBug;
+  	hasRequiredV8PrototypeDefineBug = 1;
+  	var DESCRIPTORS = requireDescriptors();
+  	var fails = requireFails();
 
-  var isObject$3 = isObject$7;
-
-  var $String$1 = String;
-  var $TypeError$2 = TypeError;
-
-  // `Assert: Type(argument) is Object`
-  var anObject$4 = function (argument) {
-    if (isObject$3(argument)) return argument;
-    throw new $TypeError$2($String$1(argument) + ' is not an object');
-  };
-
-  var DESCRIPTORS$6 = descriptors;
-  var IE8_DOM_DEFINE = ie8DomDefine;
-  var V8_PROTOTYPE_DEFINE_BUG$1 = v8PrototypeDefineBug;
-  var anObject$3 = anObject$4;
-  var toPropertyKey = toPropertyKey$2;
-
-  var $TypeError$1 = TypeError;
-  // eslint-disable-next-line es/no-object-defineproperty -- safe
-  var $defineProperty = Object.defineProperty;
-  // eslint-disable-next-line es/no-object-getownpropertydescriptor -- safe
-  var $getOwnPropertyDescriptor = Object.getOwnPropertyDescriptor;
-  var ENUMERABLE = 'enumerable';
-  var CONFIGURABLE$1 = 'configurable';
-  var WRITABLE = 'writable';
-
-  // `Object.defineProperty` method
-  // https://tc39.es/ecma262/#sec-object.defineproperty
-  objectDefineProperty.f = DESCRIPTORS$6 ? V8_PROTOTYPE_DEFINE_BUG$1 ? function defineProperty(O, P, Attributes) {
-    anObject$3(O);
-    P = toPropertyKey(P);
-    anObject$3(Attributes);
-    if (typeof O === 'function' && P === 'prototype' && 'value' in Attributes && WRITABLE in Attributes && !Attributes[WRITABLE]) {
-      var current = $getOwnPropertyDescriptor(O, P);
-      if (current && current[WRITABLE]) {
-        O[P] = Attributes.value;
-        Attributes = {
-          configurable: CONFIGURABLE$1 in Attributes ? Attributes[CONFIGURABLE$1] : current[CONFIGURABLE$1],
-          enumerable: ENUMERABLE in Attributes ? Attributes[ENUMERABLE] : current[ENUMERABLE],
-          writable: false
-        };
-      }
-    } return $defineProperty(O, P, Attributes);
-  } : $defineProperty : function defineProperty(O, P, Attributes) {
-    anObject$3(O);
-    P = toPropertyKey(P);
-    anObject$3(Attributes);
-    if (IE8_DOM_DEFINE) try {
-      return $defineProperty(O, P, Attributes);
-    } catch (error) { /* empty */ }
-    if ('get' in Attributes || 'set' in Attributes) throw new $TypeError$1('Accessors not supported');
-    if ('value' in Attributes) O[P] = Attributes.value;
-    return O;
-  };
-
-  var DESCRIPTORS$5 = descriptors;
-  var definePropertyModule$4 = objectDefineProperty;
-  var createPropertyDescriptor$1 = createPropertyDescriptor$3;
-
-  var createNonEnumerableProperty$2 = DESCRIPTORS$5 ? function (object, key, value) {
-    return definePropertyModule$4.f(object, key, createPropertyDescriptor$1(1, value));
-  } : function (object, key, value) {
-    object[key] = value;
-    return object;
-  };
-
-  var makeBuiltIn$2 = {exports: {}};
-
-  var DESCRIPTORS$4 = descriptors;
-  var hasOwn$4 = hasOwnProperty_1;
-
-  var FunctionPrototype = Function.prototype;
-  // eslint-disable-next-line es/no-object-getownpropertydescriptor -- safe
-  var getDescriptor = DESCRIPTORS$4 && Object.getOwnPropertyDescriptor;
-
-  var EXISTS = hasOwn$4(FunctionPrototype, 'name');
-  // additional protection from minified / mangled / dropped function names
-  var PROPER = EXISTS && (function something() { /* empty */ }).name === 'something';
-  var CONFIGURABLE = EXISTS && (!DESCRIPTORS$4 || (DESCRIPTORS$4 && getDescriptor(FunctionPrototype, 'name').configurable));
-
-  var functionName = {
-    EXISTS: EXISTS,
-    PROPER: PROPER,
-    CONFIGURABLE: CONFIGURABLE
-  };
-
-  var uncurryThis$8 = functionUncurryThis;
-  var isCallable$6 = isCallable$c;
-  var store$1 = sharedStoreExports;
-
-  var functionToString = uncurryThis$8(Function.toString);
-
-  // this helper broken in `core-js@3.4.1-3.4.4`, so we can't use `shared` helper
-  if (!isCallable$6(store$1.inspectSource)) {
-    store$1.inspectSource = function (it) {
-      return functionToString(it);
-    };
+  	// V8 ~ Chrome 36-
+  	// https://bugs.chromium.org/p/v8/issues/detail?id=3334
+  	v8PrototypeDefineBug = DESCRIPTORS && fails(function () {
+  	  // eslint-disable-next-line es/no-object-defineproperty -- required for testing
+  	  return Object.defineProperty(function () { /* empty */ }, 'prototype', {
+  	    value: 42,
+  	    writable: false
+  	  }).prototype !== 42;
+  	});
+  	return v8PrototypeDefineBug;
   }
 
-  var inspectSource$2 = store$1.inspectSource;
+  var anObject;
+  var hasRequiredAnObject;
 
-  var global$3 = global$a;
-  var isCallable$5 = isCallable$c;
+  function requireAnObject () {
+  	if (hasRequiredAnObject) return anObject;
+  	hasRequiredAnObject = 1;
+  	var isObject = requireIsObject();
 
-  var WeakMap$1 = global$3.WeakMap;
+  	var $String = String;
+  	var $TypeError = TypeError;
 
-  var weakMapBasicDetection = isCallable$5(WeakMap$1) && /native code/.test(String(WeakMap$1));
-
-  var shared$1 = shared$3;
-  var uid = uid$2;
-
-  var keys = shared$1('keys');
-
-  var sharedKey$2 = function (key) {
-    return keys[key] || (keys[key] = uid(key));
-  };
-
-  var hiddenKeys$4 = {};
-
-  var NATIVE_WEAK_MAP = weakMapBasicDetection;
-  var global$2 = global$a;
-  var isObject$2 = isObject$7;
-  var createNonEnumerableProperty$1 = createNonEnumerableProperty$2;
-  var hasOwn$3 = hasOwnProperty_1;
-  var shared = sharedStoreExports;
-  var sharedKey$1 = sharedKey$2;
-  var hiddenKeys$3 = hiddenKeys$4;
-
-  var OBJECT_ALREADY_INITIALIZED = 'Object already initialized';
-  var TypeError$1 = global$2.TypeError;
-  var WeakMap = global$2.WeakMap;
-  var set, get, has;
-
-  var enforce = function (it) {
-    return has(it) ? get(it) : set(it, {});
-  };
-
-  var getterFor = function (TYPE) {
-    return function (it) {
-      var state;
-      if (!isObject$2(it) || (state = get(it)).type !== TYPE) {
-        throw new TypeError$1('Incompatible receiver, ' + TYPE + ' required');
-      } return state;
-    };
-  };
-
-  if (NATIVE_WEAK_MAP || shared.state) {
-    var store = shared.state || (shared.state = new WeakMap());
-    /* eslint-disable no-self-assign -- prototype methods protection */
-    store.get = store.get;
-    store.has = store.has;
-    store.set = store.set;
-    /* eslint-enable no-self-assign -- prototype methods protection */
-    set = function (it, metadata) {
-      if (store.has(it)) throw new TypeError$1(OBJECT_ALREADY_INITIALIZED);
-      metadata.facade = it;
-      store.set(it, metadata);
-      return metadata;
-    };
-    get = function (it) {
-      return store.get(it) || {};
-    };
-    has = function (it) {
-      return store.has(it);
-    };
-  } else {
-    var STATE = sharedKey$1('state');
-    hiddenKeys$3[STATE] = true;
-    set = function (it, metadata) {
-      if (hasOwn$3(it, STATE)) throw new TypeError$1(OBJECT_ALREADY_INITIALIZED);
-      metadata.facade = it;
-      createNonEnumerableProperty$1(it, STATE, metadata);
-      return metadata;
-    };
-    get = function (it) {
-      return hasOwn$3(it, STATE) ? it[STATE] : {};
-    };
-    has = function (it) {
-      return hasOwn$3(it, STATE);
-    };
+  	// `Assert: Type(argument) is Object`
+  	anObject = function (argument) {
+  	  if (isObject(argument)) return argument;
+  	  throw new $TypeError($String(argument) + ' is not an object');
+  	};
+  	return anObject;
   }
 
-  var internalState = {
-    set: set,
-    get: get,
-    has: has,
-    enforce: enforce,
-    getterFor: getterFor
-  };
+  var hasRequiredObjectDefineProperty;
 
-  var uncurryThis$7 = functionUncurryThis;
-  var fails$5 = fails$c;
-  var isCallable$4 = isCallable$c;
-  var hasOwn$2 = hasOwnProperty_1;
-  var DESCRIPTORS$3 = descriptors;
-  var CONFIGURABLE_FUNCTION_NAME = functionName.CONFIGURABLE;
-  var inspectSource$1 = inspectSource$2;
-  var InternalStateModule = internalState;
+  function requireObjectDefineProperty () {
+  	if (hasRequiredObjectDefineProperty) return objectDefineProperty;
+  	hasRequiredObjectDefineProperty = 1;
+  	var DESCRIPTORS = requireDescriptors();
+  	var IE8_DOM_DEFINE = requireIe8DomDefine();
+  	var V8_PROTOTYPE_DEFINE_BUG = requireV8PrototypeDefineBug();
+  	var anObject = requireAnObject();
+  	var toPropertyKey = requireToPropertyKey();
 
-  var enforceInternalState = InternalStateModule.enforce;
-  var getInternalState = InternalStateModule.get;
-  var $String = String;
-  // eslint-disable-next-line es/no-object-defineproperty -- safe
-  var defineProperty$2 = Object.defineProperty;
-  var stringSlice = uncurryThis$7(''.slice);
-  var replace = uncurryThis$7(''.replace);
-  var join = uncurryThis$7([].join);
+  	var $TypeError = TypeError;
+  	// eslint-disable-next-line es/no-object-defineproperty -- safe
+  	var $defineProperty = Object.defineProperty;
+  	// eslint-disable-next-line es/no-object-getownpropertydescriptor -- safe
+  	var $getOwnPropertyDescriptor = Object.getOwnPropertyDescriptor;
+  	var ENUMERABLE = 'enumerable';
+  	var CONFIGURABLE = 'configurable';
+  	var WRITABLE = 'writable';
 
-  var CONFIGURABLE_LENGTH = DESCRIPTORS$3 && !fails$5(function () {
-    return defineProperty$2(function () { /* empty */ }, 'length', { value: 8 }).length !== 8;
-  });
+  	// `Object.defineProperty` method
+  	// https://tc39.es/ecma262/#sec-object.defineproperty
+  	objectDefineProperty.f = DESCRIPTORS ? V8_PROTOTYPE_DEFINE_BUG ? function defineProperty(O, P, Attributes) {
+  	  anObject(O);
+  	  P = toPropertyKey(P);
+  	  anObject(Attributes);
+  	  if (typeof O === 'function' && P === 'prototype' && 'value' in Attributes && WRITABLE in Attributes && !Attributes[WRITABLE]) {
+  	    var current = $getOwnPropertyDescriptor(O, P);
+  	    if (current && current[WRITABLE]) {
+  	      O[P] = Attributes.value;
+  	      Attributes = {
+  	        configurable: CONFIGURABLE in Attributes ? Attributes[CONFIGURABLE] : current[CONFIGURABLE],
+  	        enumerable: ENUMERABLE in Attributes ? Attributes[ENUMERABLE] : current[ENUMERABLE],
+  	        writable: false
+  	      };
+  	    }
+  	  } return $defineProperty(O, P, Attributes);
+  	} : $defineProperty : function defineProperty(O, P, Attributes) {
+  	  anObject(O);
+  	  P = toPropertyKey(P);
+  	  anObject(Attributes);
+  	  if (IE8_DOM_DEFINE) try {
+  	    return $defineProperty(O, P, Attributes);
+  	  } catch (error) { /* empty */ }
+  	  if ('get' in Attributes || 'set' in Attributes) throw new $TypeError('Accessors not supported');
+  	  if ('value' in Attributes) O[P] = Attributes.value;
+  	  return O;
+  	};
+  	return objectDefineProperty;
+  }
 
-  var TEMPLATE = String(String).split('String');
+  var createNonEnumerableProperty;
+  var hasRequiredCreateNonEnumerableProperty;
 
-  var makeBuiltIn$1 = makeBuiltIn$2.exports = function (value, name, options) {
-    if (stringSlice($String(name), 0, 7) === 'Symbol(') {
-      name = '[' + replace($String(name), /^Symbol\(([^)]*)\).*$/, '$1') + ']';
-    }
-    if (options && options.getter) name = 'get ' + name;
-    if (options && options.setter) name = 'set ' + name;
-    if (!hasOwn$2(value, 'name') || (CONFIGURABLE_FUNCTION_NAME && value.name !== name)) {
-      if (DESCRIPTORS$3) defineProperty$2(value, 'name', { value: name, configurable: true });
-      else value.name = name;
-    }
-    if (CONFIGURABLE_LENGTH && options && hasOwn$2(options, 'arity') && value.length !== options.arity) {
-      defineProperty$2(value, 'length', { value: options.arity });
-    }
-    try {
-      if (options && hasOwn$2(options, 'constructor') && options.constructor) {
-        if (DESCRIPTORS$3) defineProperty$2(value, 'prototype', { writable: false });
-      // in V8 ~ Chrome 53, prototypes of some methods, like `Array.prototype.values`, are non-writable
-      } else if (value.prototype) value.prototype = undefined;
-    } catch (error) { /* empty */ }
-    var state = enforceInternalState(value);
-    if (!hasOwn$2(state, 'source')) {
-      state.source = join(TEMPLATE, typeof name == 'string' ? name : '');
-    } return value;
-  };
+  function requireCreateNonEnumerableProperty () {
+  	if (hasRequiredCreateNonEnumerableProperty) return createNonEnumerableProperty;
+  	hasRequiredCreateNonEnumerableProperty = 1;
+  	var DESCRIPTORS = requireDescriptors();
+  	var definePropertyModule = requireObjectDefineProperty();
+  	var createPropertyDescriptor = requireCreatePropertyDescriptor();
 
-  // add fake Function#toString for correct work wrapped methods / constructors with methods like LoDash isNative
-  // eslint-disable-next-line no-extend-native -- required
-  Function.prototype.toString = makeBuiltIn$1(function toString() {
-    return isCallable$4(this) && getInternalState(this).source || inspectSource$1(this);
-  }, 'toString');
+  	createNonEnumerableProperty = DESCRIPTORS ? function (object, key, value) {
+  	  return definePropertyModule.f(object, key, createPropertyDescriptor(1, value));
+  	} : function (object, key, value) {
+  	  object[key] = value;
+  	  return object;
+  	};
+  	return createNonEnumerableProperty;
+  }
 
-  var makeBuiltInExports = makeBuiltIn$2.exports;
+  var makeBuiltIn = {exports: {}};
 
-  var isCallable$3 = isCallable$c;
-  var definePropertyModule$3 = objectDefineProperty;
-  var makeBuiltIn = makeBuiltInExports;
-  var defineGlobalProperty$1 = defineGlobalProperty$3;
+  var functionName;
+  var hasRequiredFunctionName;
 
-  var defineBuiltIn$2 = function (O, key, value, options) {
-    if (!options) options = {};
-    var simple = options.enumerable;
-    var name = options.name !== undefined ? options.name : key;
-    if (isCallable$3(value)) makeBuiltIn(value, name, options);
-    if (options.global) {
-      if (simple) O[key] = value;
-      else defineGlobalProperty$1(key, value);
-    } else {
-      try {
-        if (!options.unsafe) delete O[key];
-        else if (O[key]) simple = true;
-      } catch (error) { /* empty */ }
-      if (simple) O[key] = value;
-      else definePropertyModule$3.f(O, key, {
-        value: value,
-        enumerable: false,
-        configurable: !options.nonConfigurable,
-        writable: !options.nonWritable
-      });
-    } return O;
-  };
+  function requireFunctionName () {
+  	if (hasRequiredFunctionName) return functionName;
+  	hasRequiredFunctionName = 1;
+  	var DESCRIPTORS = requireDescriptors();
+  	var hasOwn = requireHasOwnProperty();
+
+  	var FunctionPrototype = Function.prototype;
+  	// eslint-disable-next-line es/no-object-getownpropertydescriptor -- safe
+  	var getDescriptor = DESCRIPTORS && Object.getOwnPropertyDescriptor;
+
+  	var EXISTS = hasOwn(FunctionPrototype, 'name');
+  	// additional protection from minified / mangled / dropped function names
+  	var PROPER = EXISTS && (function something() { /* empty */ }).name === 'something';
+  	var CONFIGURABLE = EXISTS && (!DESCRIPTORS || (DESCRIPTORS && getDescriptor(FunctionPrototype, 'name').configurable));
+
+  	functionName = {
+  	  EXISTS: EXISTS,
+  	  PROPER: PROPER,
+  	  CONFIGURABLE: CONFIGURABLE
+  	};
+  	return functionName;
+  }
+
+  var inspectSource;
+  var hasRequiredInspectSource;
+
+  function requireInspectSource () {
+  	if (hasRequiredInspectSource) return inspectSource;
+  	hasRequiredInspectSource = 1;
+  	var uncurryThis = requireFunctionUncurryThis();
+  	var isCallable = requireIsCallable();
+  	var store = requireSharedStore();
+
+  	var functionToString = uncurryThis(Function.toString);
+
+  	// this helper broken in `core-js@3.4.1-3.4.4`, so we can't use `shared` helper
+  	if (!isCallable(store.inspectSource)) {
+  	  store.inspectSource = function (it) {
+  	    return functionToString(it);
+  	  };
+  	}
+
+  	inspectSource = store.inspectSource;
+  	return inspectSource;
+  }
+
+  var weakMapBasicDetection;
+  var hasRequiredWeakMapBasicDetection;
+
+  function requireWeakMapBasicDetection () {
+  	if (hasRequiredWeakMapBasicDetection) return weakMapBasicDetection;
+  	hasRequiredWeakMapBasicDetection = 1;
+  	var globalThis = requireGlobalThis();
+  	var isCallable = requireIsCallable();
+
+  	var WeakMap = globalThis.WeakMap;
+
+  	weakMapBasicDetection = isCallable(WeakMap) && /native code/.test(String(WeakMap));
+  	return weakMapBasicDetection;
+  }
+
+  var sharedKey;
+  var hasRequiredSharedKey;
+
+  function requireSharedKey () {
+  	if (hasRequiredSharedKey) return sharedKey;
+  	hasRequiredSharedKey = 1;
+  	var shared = requireShared();
+  	var uid = requireUid();
+
+  	var keys = shared('keys');
+
+  	sharedKey = function (key) {
+  	  return keys[key] || (keys[key] = uid(key));
+  	};
+  	return sharedKey;
+  }
+
+  var hiddenKeys;
+  var hasRequiredHiddenKeys;
+
+  function requireHiddenKeys () {
+  	if (hasRequiredHiddenKeys) return hiddenKeys;
+  	hasRequiredHiddenKeys = 1;
+  	hiddenKeys = {};
+  	return hiddenKeys;
+  }
+
+  var internalState;
+  var hasRequiredInternalState;
+
+  function requireInternalState () {
+  	if (hasRequiredInternalState) return internalState;
+  	hasRequiredInternalState = 1;
+  	var NATIVE_WEAK_MAP = requireWeakMapBasicDetection();
+  	var globalThis = requireGlobalThis();
+  	var isObject = requireIsObject();
+  	var createNonEnumerableProperty = requireCreateNonEnumerableProperty();
+  	var hasOwn = requireHasOwnProperty();
+  	var shared = requireSharedStore();
+  	var sharedKey = requireSharedKey();
+  	var hiddenKeys = requireHiddenKeys();
+
+  	var OBJECT_ALREADY_INITIALIZED = 'Object already initialized';
+  	var TypeError = globalThis.TypeError;
+  	var WeakMap = globalThis.WeakMap;
+  	var set, get, has;
+
+  	var enforce = function (it) {
+  	  return has(it) ? get(it) : set(it, {});
+  	};
+
+  	var getterFor = function (TYPE) {
+  	  return function (it) {
+  	    var state;
+  	    if (!isObject(it) || (state = get(it)).type !== TYPE) {
+  	      throw new TypeError('Incompatible receiver, ' + TYPE + ' required');
+  	    } return state;
+  	  };
+  	};
+
+  	if (NATIVE_WEAK_MAP || shared.state) {
+  	  var store = shared.state || (shared.state = new WeakMap());
+  	  /* eslint-disable no-self-assign -- prototype methods protection */
+  	  store.get = store.get;
+  	  store.has = store.has;
+  	  store.set = store.set;
+  	  /* eslint-enable no-self-assign -- prototype methods protection */
+  	  set = function (it, metadata) {
+  	    if (store.has(it)) throw new TypeError(OBJECT_ALREADY_INITIALIZED);
+  	    metadata.facade = it;
+  	    store.set(it, metadata);
+  	    return metadata;
+  	  };
+  	  get = function (it) {
+  	    return store.get(it) || {};
+  	  };
+  	  has = function (it) {
+  	    return store.has(it);
+  	  };
+  	} else {
+  	  var STATE = sharedKey('state');
+  	  hiddenKeys[STATE] = true;
+  	  set = function (it, metadata) {
+  	    if (hasOwn(it, STATE)) throw new TypeError(OBJECT_ALREADY_INITIALIZED);
+  	    metadata.facade = it;
+  	    createNonEnumerableProperty(it, STATE, metadata);
+  	    return metadata;
+  	  };
+  	  get = function (it) {
+  	    return hasOwn(it, STATE) ? it[STATE] : {};
+  	  };
+  	  has = function (it) {
+  	    return hasOwn(it, STATE);
+  	  };
+  	}
+
+  	internalState = {
+  	  set: set,
+  	  get: get,
+  	  has: has,
+  	  enforce: enforce,
+  	  getterFor: getterFor
+  	};
+  	return internalState;
+  }
+
+  var hasRequiredMakeBuiltIn;
+
+  function requireMakeBuiltIn () {
+  	if (hasRequiredMakeBuiltIn) return makeBuiltIn.exports;
+  	hasRequiredMakeBuiltIn = 1;
+  	var uncurryThis = requireFunctionUncurryThis();
+  	var fails = requireFails();
+  	var isCallable = requireIsCallable();
+  	var hasOwn = requireHasOwnProperty();
+  	var DESCRIPTORS = requireDescriptors();
+  	var CONFIGURABLE_FUNCTION_NAME = requireFunctionName().CONFIGURABLE;
+  	var inspectSource = requireInspectSource();
+  	var InternalStateModule = requireInternalState();
+
+  	var enforceInternalState = InternalStateModule.enforce;
+  	var getInternalState = InternalStateModule.get;
+  	var $String = String;
+  	// eslint-disable-next-line es/no-object-defineproperty -- safe
+  	var defineProperty = Object.defineProperty;
+  	var stringSlice = uncurryThis(''.slice);
+  	var replace = uncurryThis(''.replace);
+  	var join = uncurryThis([].join);
+
+  	var CONFIGURABLE_LENGTH = DESCRIPTORS && !fails(function () {
+  	  return defineProperty(function () { /* empty */ }, 'length', { value: 8 }).length !== 8;
+  	});
+
+  	var TEMPLATE = String(String).split('String');
+
+  	var makeBuiltIn$1 = makeBuiltIn.exports = function (value, name, options) {
+  	  if (stringSlice($String(name), 0, 7) === 'Symbol(') {
+  	    name = '[' + replace($String(name), /^Symbol\(([^)]*)\).*$/, '$1') + ']';
+  	  }
+  	  if (options && options.getter) name = 'get ' + name;
+  	  if (options && options.setter) name = 'set ' + name;
+  	  if (!hasOwn(value, 'name') || (CONFIGURABLE_FUNCTION_NAME && value.name !== name)) {
+  	    if (DESCRIPTORS) defineProperty(value, 'name', { value: name, configurable: true });
+  	    else value.name = name;
+  	  }
+  	  if (CONFIGURABLE_LENGTH && options && hasOwn(options, 'arity') && value.length !== options.arity) {
+  	    defineProperty(value, 'length', { value: options.arity });
+  	  }
+  	  try {
+  	    if (options && hasOwn(options, 'constructor') && options.constructor) {
+  	      if (DESCRIPTORS) defineProperty(value, 'prototype', { writable: false });
+  	    // in V8 ~ Chrome 53, prototypes of some methods, like `Array.prototype.values`, are non-writable
+  	    } else if (value.prototype) value.prototype = undefined;
+  	  } catch (error) { /* empty */ }
+  	  var state = enforceInternalState(value);
+  	  if (!hasOwn(state, 'source')) {
+  	    state.source = join(TEMPLATE, typeof name == 'string' ? name : '');
+  	  } return value;
+  	};
+
+  	// add fake Function#toString for correct work wrapped methods / constructors with methods like LoDash isNative
+  	// eslint-disable-next-line no-extend-native -- required
+  	Function.prototype.toString = makeBuiltIn$1(function toString() {
+  	  return isCallable(this) && getInternalState(this).source || inspectSource(this);
+  	}, 'toString');
+  	return makeBuiltIn.exports;
+  }
+
+  var defineBuiltIn;
+  var hasRequiredDefineBuiltIn;
+
+  function requireDefineBuiltIn () {
+  	if (hasRequiredDefineBuiltIn) return defineBuiltIn;
+  	hasRequiredDefineBuiltIn = 1;
+  	var isCallable = requireIsCallable();
+  	var definePropertyModule = requireObjectDefineProperty();
+  	var makeBuiltIn = requireMakeBuiltIn();
+  	var defineGlobalProperty = requireDefineGlobalProperty();
+
+  	defineBuiltIn = function (O, key, value, options) {
+  	  if (!options) options = {};
+  	  var simple = options.enumerable;
+  	  var name = options.name !== undefined ? options.name : key;
+  	  if (isCallable(value)) makeBuiltIn(value, name, options);
+  	  if (options.global) {
+  	    if (simple) O[key] = value;
+  	    else defineGlobalProperty(key, value);
+  	  } else {
+  	    try {
+  	      if (!options.unsafe) delete O[key];
+  	      else if (O[key]) simple = true;
+  	    } catch (error) { /* empty */ }
+  	    if (simple) O[key] = value;
+  	    else definePropertyModule.f(O, key, {
+  	      value: value,
+  	      enumerable: false,
+  	      configurable: !options.nonConfigurable,
+  	      writable: !options.nonWritable
+  	    });
+  	  } return O;
+  	};
+  	return defineBuiltIn;
+  }
 
   var objectGetOwnPropertyNames = {};
 
-  var ceil = Math.ceil;
-  var floor = Math.floor;
+  var mathTrunc;
+  var hasRequiredMathTrunc;
 
-  // `Math.trunc` method
-  // https://tc39.es/ecma262/#sec-math.trunc
-  // eslint-disable-next-line es/no-math-trunc -- safe
-  var mathTrunc = Math.trunc || function trunc(x) {
-    var n = +x;
-    return (n > 0 ? floor : ceil)(n);
-  };
+  function requireMathTrunc () {
+  	if (hasRequiredMathTrunc) return mathTrunc;
+  	hasRequiredMathTrunc = 1;
+  	var ceil = Math.ceil;
+  	var floor = Math.floor;
 
-  var trunc = mathTrunc;
+  	// `Math.trunc` method
+  	// https://tc39.es/ecma262/#sec-math.trunc
+  	// eslint-disable-next-line es/no-math-trunc -- safe
+  	mathTrunc = Math.trunc || function trunc(x) {
+  	  var n = +x;
+  	  return (n > 0 ? floor : ceil)(n);
+  	};
+  	return mathTrunc;
+  }
 
-  // `ToIntegerOrInfinity` abstract operation
-  // https://tc39.es/ecma262/#sec-tointegerorinfinity
-  var toIntegerOrInfinity$2 = function (argument) {
-    var number = +argument;
-    // eslint-disable-next-line no-self-compare -- NaN check
-    return number !== number || number === 0 ? 0 : trunc(number);
-  };
+  var toIntegerOrInfinity;
+  var hasRequiredToIntegerOrInfinity;
 
-  var toIntegerOrInfinity$1 = toIntegerOrInfinity$2;
+  function requireToIntegerOrInfinity () {
+  	if (hasRequiredToIntegerOrInfinity) return toIntegerOrInfinity;
+  	hasRequiredToIntegerOrInfinity = 1;
+  	var trunc = requireMathTrunc();
 
-  var max = Math.max;
-  var min$1 = Math.min;
+  	// `ToIntegerOrInfinity` abstract operation
+  	// https://tc39.es/ecma262/#sec-tointegerorinfinity
+  	toIntegerOrInfinity = function (argument) {
+  	  var number = +argument;
+  	  // eslint-disable-next-line no-self-compare -- NaN check
+  	  return number !== number || number === 0 ? 0 : trunc(number);
+  	};
+  	return toIntegerOrInfinity;
+  }
 
-  // Helper for a popular repeating case of the spec:
-  // Let integer be ? ToInteger(index).
-  // If integer < 0, let result be max((length + integer), 0); else let result be min(integer, length).
-  var toAbsoluteIndex$1 = function (index, length) {
-    var integer = toIntegerOrInfinity$1(index);
-    return integer < 0 ? max(integer + length, 0) : min$1(integer, length);
-  };
+  var toAbsoluteIndex;
+  var hasRequiredToAbsoluteIndex;
 
-  var toIntegerOrInfinity = toIntegerOrInfinity$2;
+  function requireToAbsoluteIndex () {
+  	if (hasRequiredToAbsoluteIndex) return toAbsoluteIndex;
+  	hasRequiredToAbsoluteIndex = 1;
+  	var toIntegerOrInfinity = requireToIntegerOrInfinity();
 
-  var min = Math.min;
+  	var max = Math.max;
+  	var min = Math.min;
 
-  // `ToLength` abstract operation
-  // https://tc39.es/ecma262/#sec-tolength
-  var toLength$1 = function (argument) {
-    var len = toIntegerOrInfinity(argument);
-    return len > 0 ? min(len, 0x1FFFFFFFFFFFFF) : 0; // 2 ** 53 - 1 == 9007199254740991
-  };
+  	// Helper for a popular repeating case of the spec:
+  	// Let integer be ? ToInteger(index).
+  	// If integer < 0, let result be max((length + integer), 0); else let result be min(integer, length).
+  	toAbsoluteIndex = function (index, length) {
+  	  var integer = toIntegerOrInfinity(index);
+  	  return integer < 0 ? max(integer + length, 0) : min(integer, length);
+  	};
+  	return toAbsoluteIndex;
+  }
 
-  var toLength = toLength$1;
+  var toLength;
+  var hasRequiredToLength;
 
-  // `LengthOfArrayLike` abstract operation
-  // https://tc39.es/ecma262/#sec-lengthofarraylike
-  var lengthOfArrayLike$3 = function (obj) {
-    return toLength(obj.length);
-  };
+  function requireToLength () {
+  	if (hasRequiredToLength) return toLength;
+  	hasRequiredToLength = 1;
+  	var toIntegerOrInfinity = requireToIntegerOrInfinity();
 
-  var toIndexedObject$2 = toIndexedObject$4;
-  var toAbsoluteIndex = toAbsoluteIndex$1;
-  var lengthOfArrayLike$2 = lengthOfArrayLike$3;
+  	var min = Math.min;
 
-  // `Array.prototype.{ indexOf, includes }` methods implementation
-  var createMethod$1 = function (IS_INCLUDES) {
-    return function ($this, el, fromIndex) {
-      var O = toIndexedObject$2($this);
-      var length = lengthOfArrayLike$2(O);
-      if (length === 0) return !IS_INCLUDES && -1;
-      var index = toAbsoluteIndex(fromIndex, length);
-      var value;
-      // Array#includes uses SameValueZero equality algorithm
-      // eslint-disable-next-line no-self-compare -- NaN check
-      if (IS_INCLUDES && el !== el) while (length > index) {
-        value = O[index++];
-        // eslint-disable-next-line no-self-compare -- NaN check
-        if (value !== value) return true;
-      // Array#indexOf ignores holes, Array#includes - not
-      } else for (;length > index; index++) {
-        if ((IS_INCLUDES || index in O) && O[index] === el) return IS_INCLUDES || index || 0;
-      } return !IS_INCLUDES && -1;
-    };
-  };
+  	// `ToLength` abstract operation
+  	// https://tc39.es/ecma262/#sec-tolength
+  	toLength = function (argument) {
+  	  var len = toIntegerOrInfinity(argument);
+  	  return len > 0 ? min(len, 0x1FFFFFFFFFFFFF) : 0; // 2 ** 53 - 1 == 9007199254740991
+  	};
+  	return toLength;
+  }
 
-  var arrayIncludes = {
-    // `Array.prototype.includes` method
-    // https://tc39.es/ecma262/#sec-array.prototype.includes
-    includes: createMethod$1(true),
-    // `Array.prototype.indexOf` method
-    // https://tc39.es/ecma262/#sec-array.prototype.indexof
-    indexOf: createMethod$1(false)
-  };
+  var lengthOfArrayLike;
+  var hasRequiredLengthOfArrayLike;
 
-  var uncurryThis$6 = functionUncurryThis;
-  var hasOwn$1 = hasOwnProperty_1;
-  var toIndexedObject$1 = toIndexedObject$4;
-  var indexOf = arrayIncludes.indexOf;
-  var hiddenKeys$2 = hiddenKeys$4;
+  function requireLengthOfArrayLike () {
+  	if (hasRequiredLengthOfArrayLike) return lengthOfArrayLike;
+  	hasRequiredLengthOfArrayLike = 1;
+  	var toLength = requireToLength();
 
-  var push$1 = uncurryThis$6([].push);
+  	// `LengthOfArrayLike` abstract operation
+  	// https://tc39.es/ecma262/#sec-lengthofarraylike
+  	lengthOfArrayLike = function (obj) {
+  	  return toLength(obj.length);
+  	};
+  	return lengthOfArrayLike;
+  }
 
-  var objectKeysInternal = function (object, names) {
-    var O = toIndexedObject$1(object);
-    var i = 0;
-    var result = [];
-    var key;
-    for (key in O) !hasOwn$1(hiddenKeys$2, key) && hasOwn$1(O, key) && push$1(result, key);
-    // Don't enum bug & hidden keys
-    while (names.length > i) if (hasOwn$1(O, key = names[i++])) {
-      ~indexOf(result, key) || push$1(result, key);
-    }
-    return result;
-  };
+  var arrayIncludes;
+  var hasRequiredArrayIncludes;
 
-  // IE8- don't enum bug keys
-  var enumBugKeys$3 = [
-    'constructor',
-    'hasOwnProperty',
-    'isPrototypeOf',
-    'propertyIsEnumerable',
-    'toLocaleString',
-    'toString',
-    'valueOf'
-  ];
+  function requireArrayIncludes () {
+  	if (hasRequiredArrayIncludes) return arrayIncludes;
+  	hasRequiredArrayIncludes = 1;
+  	var toIndexedObject = requireToIndexedObject();
+  	var toAbsoluteIndex = requireToAbsoluteIndex();
+  	var lengthOfArrayLike = requireLengthOfArrayLike();
 
-  var internalObjectKeys$1 = objectKeysInternal;
-  var enumBugKeys$2 = enumBugKeys$3;
+  	// `Array.prototype.{ indexOf, includes }` methods implementation
+  	var createMethod = function (IS_INCLUDES) {
+  	  return function ($this, el, fromIndex) {
+  	    var O = toIndexedObject($this);
+  	    var length = lengthOfArrayLike(O);
+  	    if (length === 0) return !IS_INCLUDES && -1;
+  	    var index = toAbsoluteIndex(fromIndex, length);
+  	    var value;
+  	    // Array#includes uses SameValueZero equality algorithm
+  	    // eslint-disable-next-line no-self-compare -- NaN check
+  	    if (IS_INCLUDES && el !== el) while (length > index) {
+  	      value = O[index++];
+  	      // eslint-disable-next-line no-self-compare -- NaN check
+  	      if (value !== value) return true;
+  	    // Array#indexOf ignores holes, Array#includes - not
+  	    } else for (;length > index; index++) {
+  	      if ((IS_INCLUDES || index in O) && O[index] === el) return IS_INCLUDES || index || 0;
+  	    } return !IS_INCLUDES && -1;
+  	  };
+  	};
 
-  var hiddenKeys$1 = enumBugKeys$2.concat('length', 'prototype');
+  	arrayIncludes = {
+  	  // `Array.prototype.includes` method
+  	  // https://tc39.es/ecma262/#sec-array.prototype.includes
+  	  includes: createMethod(true),
+  	  // `Array.prototype.indexOf` method
+  	  // https://tc39.es/ecma262/#sec-array.prototype.indexof
+  	  indexOf: createMethod(false)
+  	};
+  	return arrayIncludes;
+  }
 
-  // `Object.getOwnPropertyNames` method
-  // https://tc39.es/ecma262/#sec-object.getownpropertynames
-  // eslint-disable-next-line es/no-object-getownpropertynames -- safe
-  objectGetOwnPropertyNames.f = Object.getOwnPropertyNames || function getOwnPropertyNames(O) {
-    return internalObjectKeys$1(O, hiddenKeys$1);
-  };
+  var objectKeysInternal;
+  var hasRequiredObjectKeysInternal;
+
+  function requireObjectKeysInternal () {
+  	if (hasRequiredObjectKeysInternal) return objectKeysInternal;
+  	hasRequiredObjectKeysInternal = 1;
+  	var uncurryThis = requireFunctionUncurryThis();
+  	var hasOwn = requireHasOwnProperty();
+  	var toIndexedObject = requireToIndexedObject();
+  	var indexOf = requireArrayIncludes().indexOf;
+  	var hiddenKeys = requireHiddenKeys();
+
+  	var push = uncurryThis([].push);
+
+  	objectKeysInternal = function (object, names) {
+  	  var O = toIndexedObject(object);
+  	  var i = 0;
+  	  var result = [];
+  	  var key;
+  	  for (key in O) !hasOwn(hiddenKeys, key) && hasOwn(O, key) && push(result, key);
+  	  // Don't enum bug & hidden keys
+  	  while (names.length > i) if (hasOwn(O, key = names[i++])) {
+  	    ~indexOf(result, key) || push(result, key);
+  	  }
+  	  return result;
+  	};
+  	return objectKeysInternal;
+  }
+
+  var enumBugKeys;
+  var hasRequiredEnumBugKeys;
+
+  function requireEnumBugKeys () {
+  	if (hasRequiredEnumBugKeys) return enumBugKeys;
+  	hasRequiredEnumBugKeys = 1;
+  	// IE8- don't enum bug keys
+  	enumBugKeys = [
+  	  'constructor',
+  	  'hasOwnProperty',
+  	  'isPrototypeOf',
+  	  'propertyIsEnumerable',
+  	  'toLocaleString',
+  	  'toString',
+  	  'valueOf'
+  	];
+  	return enumBugKeys;
+  }
+
+  var hasRequiredObjectGetOwnPropertyNames;
+
+  function requireObjectGetOwnPropertyNames () {
+  	if (hasRequiredObjectGetOwnPropertyNames) return objectGetOwnPropertyNames;
+  	hasRequiredObjectGetOwnPropertyNames = 1;
+  	var internalObjectKeys = requireObjectKeysInternal();
+  	var enumBugKeys = requireEnumBugKeys();
+
+  	var hiddenKeys = enumBugKeys.concat('length', 'prototype');
+
+  	// `Object.getOwnPropertyNames` method
+  	// https://tc39.es/ecma262/#sec-object.getownpropertynames
+  	// eslint-disable-next-line es/no-object-getownpropertynames -- safe
+  	objectGetOwnPropertyNames.f = Object.getOwnPropertyNames || function getOwnPropertyNames(O) {
+  	  return internalObjectKeys(O, hiddenKeys);
+  	};
+  	return objectGetOwnPropertyNames;
+  }
 
   var objectGetOwnPropertySymbols = {};
 
-  // eslint-disable-next-line es/no-object-getownpropertysymbols -- safe
-  objectGetOwnPropertySymbols.f = Object.getOwnPropertySymbols;
+  var hasRequiredObjectGetOwnPropertySymbols;
 
-  var getBuiltIn$2 = getBuiltIn$4;
-  var uncurryThis$5 = functionUncurryThis;
-  var getOwnPropertyNamesModule = objectGetOwnPropertyNames;
-  var getOwnPropertySymbolsModule$1 = objectGetOwnPropertySymbols;
-  var anObject$2 = anObject$4;
+  function requireObjectGetOwnPropertySymbols () {
+  	if (hasRequiredObjectGetOwnPropertySymbols) return objectGetOwnPropertySymbols;
+  	hasRequiredObjectGetOwnPropertySymbols = 1;
+  	// eslint-disable-next-line es/no-object-getownpropertysymbols -- safe
+  	objectGetOwnPropertySymbols.f = Object.getOwnPropertySymbols;
+  	return objectGetOwnPropertySymbols;
+  }
 
-  var concat$1 = uncurryThis$5([].concat);
+  var ownKeys;
+  var hasRequiredOwnKeys;
 
-  // all object keys, includes non-enumerable and symbols
-  var ownKeys$1 = getBuiltIn$2('Reflect', 'ownKeys') || function ownKeys(it) {
-    var keys = getOwnPropertyNamesModule.f(anObject$2(it));
-    var getOwnPropertySymbols = getOwnPropertySymbolsModule$1.f;
-    return getOwnPropertySymbols ? concat$1(keys, getOwnPropertySymbols(it)) : keys;
-  };
+  function requireOwnKeys () {
+  	if (hasRequiredOwnKeys) return ownKeys;
+  	hasRequiredOwnKeys = 1;
+  	var getBuiltIn = requireGetBuiltIn();
+  	var uncurryThis = requireFunctionUncurryThis();
+  	var getOwnPropertyNamesModule = requireObjectGetOwnPropertyNames();
+  	var getOwnPropertySymbolsModule = requireObjectGetOwnPropertySymbols();
+  	var anObject = requireAnObject();
 
-  var hasOwn = hasOwnProperty_1;
-  var ownKeys = ownKeys$1;
-  var getOwnPropertyDescriptorModule = objectGetOwnPropertyDescriptor;
-  var definePropertyModule$2 = objectDefineProperty;
+  	var concat = uncurryThis([].concat);
 
-  var copyConstructorProperties$1 = function (target, source, exceptions) {
-    var keys = ownKeys(source);
-    var defineProperty = definePropertyModule$2.f;
-    var getOwnPropertyDescriptor = getOwnPropertyDescriptorModule.f;
-    for (var i = 0; i < keys.length; i++) {
-      var key = keys[i];
-      if (!hasOwn(target, key) && !(exceptions && hasOwn(exceptions, key))) {
-        defineProperty(target, key, getOwnPropertyDescriptor(source, key));
-      }
-    }
-  };
+  	// all object keys, includes non-enumerable and symbols
+  	ownKeys = getBuiltIn('Reflect', 'ownKeys') || function ownKeys(it) {
+  	  var keys = getOwnPropertyNamesModule.f(anObject(it));
+  	  var getOwnPropertySymbols = getOwnPropertySymbolsModule.f;
+  	  return getOwnPropertySymbols ? concat(keys, getOwnPropertySymbols(it)) : keys;
+  	};
+  	return ownKeys;
+  }
 
-  var fails$4 = fails$c;
-  var isCallable$2 = isCallable$c;
+  var copyConstructorProperties;
+  var hasRequiredCopyConstructorProperties;
 
-  var replacement = /#|\.prototype\./;
+  function requireCopyConstructorProperties () {
+  	if (hasRequiredCopyConstructorProperties) return copyConstructorProperties;
+  	hasRequiredCopyConstructorProperties = 1;
+  	var hasOwn = requireHasOwnProperty();
+  	var ownKeys = requireOwnKeys();
+  	var getOwnPropertyDescriptorModule = requireObjectGetOwnPropertyDescriptor();
+  	var definePropertyModule = requireObjectDefineProperty();
 
-  var isForced$1 = function (feature, detection) {
-    var value = data[normalize(feature)];
-    return value === POLYFILL ? true
-      : value === NATIVE ? false
-      : isCallable$2(detection) ? fails$4(detection)
-      : !!detection;
-  };
+  	copyConstructorProperties = function (target, source, exceptions) {
+  	  var keys = ownKeys(source);
+  	  var defineProperty = definePropertyModule.f;
+  	  var getOwnPropertyDescriptor = getOwnPropertyDescriptorModule.f;
+  	  for (var i = 0; i < keys.length; i++) {
+  	    var key = keys[i];
+  	    if (!hasOwn(target, key) && !(exceptions && hasOwn(exceptions, key))) {
+  	      defineProperty(target, key, getOwnPropertyDescriptor(source, key));
+  	    }
+  	  }
+  	};
+  	return copyConstructorProperties;
+  }
 
-  var normalize = isForced$1.normalize = function (string) {
-    return String(string).replace(replacement, '.').toLowerCase();
-  };
+  var isForced_1;
+  var hasRequiredIsForced;
 
-  var data = isForced$1.data = {};
-  var NATIVE = isForced$1.NATIVE = 'N';
-  var POLYFILL = isForced$1.POLYFILL = 'P';
+  function requireIsForced () {
+  	if (hasRequiredIsForced) return isForced_1;
+  	hasRequiredIsForced = 1;
+  	var fails = requireFails();
+  	var isCallable = requireIsCallable();
 
-  var isForced_1 = isForced$1;
+  	var replacement = /#|\.prototype\./;
 
-  var global$1 = global$a;
-  var getOwnPropertyDescriptor = objectGetOwnPropertyDescriptor.f;
-  var createNonEnumerableProperty = createNonEnumerableProperty$2;
-  var defineBuiltIn$1 = defineBuiltIn$2;
-  var defineGlobalProperty = defineGlobalProperty$3;
-  var copyConstructorProperties = copyConstructorProperties$1;
-  var isForced = isForced_1;
+  	var isForced = function (feature, detection) {
+  	  var value = data[normalize(feature)];
+  	  return value === POLYFILL ? true
+  	    : value === NATIVE ? false
+  	    : isCallable(detection) ? fails(detection)
+  	    : !!detection;
+  	};
 
-  /*
-    options.target         - name of the target object
-    options.global         - target is the global object
-    options.stat           - export as static methods of target
-    options.proto          - export as prototype methods of target
-    options.real           - real prototype method for the `pure` version
-    options.forced         - export even if the native feature is available
-    options.bind           - bind methods to the target, required for the `pure` version
-    options.wrap           - wrap constructors to preventing global pollution, required for the `pure` version
-    options.unsafe         - use the simple assignment of property instead of delete + defineProperty
-    options.sham           - add a flag to not completely full polyfills
-    options.enumerable     - export as enumerable property
-    options.dontCallGetSet - prevent calling a getter on target
-    options.name           - the .name of the function if it does not match the key
-  */
-  var _export = function (options, source) {
-    var TARGET = options.target;
-    var GLOBAL = options.global;
-    var STATIC = options.stat;
-    var FORCED, target, key, targetProperty, sourceProperty, descriptor;
-    if (GLOBAL) {
-      target = global$1;
-    } else if (STATIC) {
-      target = global$1[TARGET] || defineGlobalProperty(TARGET, {});
-    } else {
-      target = global$1[TARGET] && global$1[TARGET].prototype;
-    }
-    if (target) for (key in source) {
-      sourceProperty = source[key];
-      if (options.dontCallGetSet) {
-        descriptor = getOwnPropertyDescriptor(target, key);
-        targetProperty = descriptor && descriptor.value;
-      } else targetProperty = target[key];
-      FORCED = isForced(GLOBAL ? key : TARGET + (STATIC ? '.' : '#') + key, options.forced);
-      // contained in target
-      if (!FORCED && targetProperty !== undefined) {
-        if (typeof sourceProperty == typeof targetProperty) continue;
-        copyConstructorProperties(sourceProperty, targetProperty);
-      }
-      // add a flag to not completely full polyfills
-      if (options.sham || (targetProperty && targetProperty.sham)) {
-        createNonEnumerableProperty(sourceProperty, 'sham', true);
-      }
-      defineBuiltIn$1(target, key, sourceProperty, options);
-    }
-  };
+  	var normalize = isForced.normalize = function (string) {
+  	  return String(string).replace(replacement, '.').toLowerCase();
+  	};
 
-  var classof$3 = classofRaw$2;
+  	var data = isForced.data = {};
+  	var NATIVE = isForced.NATIVE = 'N';
+  	var POLYFILL = isForced.POLYFILL = 'P';
 
-  // `IsArray` abstract operation
-  // https://tc39.es/ecma262/#sec-isarray
-  // eslint-disable-next-line es/no-array-isarray -- safe
-  var isArray$2 = Array.isArray || function isArray(argument) {
-    return classof$3(argument) === 'Array';
-  };
+  	isForced_1 = isForced;
+  	return isForced_1;
+  }
 
-  var $TypeError = TypeError;
-  var MAX_SAFE_INTEGER = 0x1FFFFFFFFFFFFF; // 2 ** 53 - 1 == 9007199254740991
+  var _export;
+  var hasRequired_export;
 
-  var doesNotExceedSafeInteger$1 = function (it) {
-    if (it > MAX_SAFE_INTEGER) throw $TypeError('Maximum allowed index exceeded');
-    return it;
-  };
+  function require_export () {
+  	if (hasRequired_export) return _export;
+  	hasRequired_export = 1;
+  	var globalThis = requireGlobalThis();
+  	var getOwnPropertyDescriptor = requireObjectGetOwnPropertyDescriptor().f;
+  	var createNonEnumerableProperty = requireCreateNonEnumerableProperty();
+  	var defineBuiltIn = requireDefineBuiltIn();
+  	var defineGlobalProperty = requireDefineGlobalProperty();
+  	var copyConstructorProperties = requireCopyConstructorProperties();
+  	var isForced = requireIsForced();
 
-  var DESCRIPTORS$2 = descriptors;
-  var definePropertyModule$1 = objectDefineProperty;
-  var createPropertyDescriptor = createPropertyDescriptor$3;
+  	/*
+  	  options.target         - name of the target object
+  	  options.global         - target is the global object
+  	  options.stat           - export as static methods of target
+  	  options.proto          - export as prototype methods of target
+  	  options.real           - real prototype method for the `pure` version
+  	  options.forced         - export even if the native feature is available
+  	  options.bind           - bind methods to the target, required for the `pure` version
+  	  options.wrap           - wrap constructors to preventing global pollution, required for the `pure` version
+  	  options.unsafe         - use the simple assignment of property instead of delete + defineProperty
+  	  options.sham           - add a flag to not completely full polyfills
+  	  options.enumerable     - export as enumerable property
+  	  options.dontCallGetSet - prevent calling a getter on target
+  	  options.name           - the .name of the function if it does not match the key
+  	*/
+  	_export = function (options, source) {
+  	  var TARGET = options.target;
+  	  var GLOBAL = options.global;
+  	  var STATIC = options.stat;
+  	  var FORCED, target, key, targetProperty, sourceProperty, descriptor;
+  	  if (GLOBAL) {
+  	    target = globalThis;
+  	  } else if (STATIC) {
+  	    target = globalThis[TARGET] || defineGlobalProperty(TARGET, {});
+  	  } else {
+  	    target = globalThis[TARGET] && globalThis[TARGET].prototype;
+  	  }
+  	  if (target) for (key in source) {
+  	    sourceProperty = source[key];
+  	    if (options.dontCallGetSet) {
+  	      descriptor = getOwnPropertyDescriptor(target, key);
+  	      targetProperty = descriptor && descriptor.value;
+  	    } else targetProperty = target[key];
+  	    FORCED = isForced(GLOBAL ? key : TARGET + (STATIC ? '.' : '#') + key, options.forced);
+  	    // contained in target
+  	    if (!FORCED && targetProperty !== undefined) {
+  	      if (typeof sourceProperty == typeof targetProperty) continue;
+  	      copyConstructorProperties(sourceProperty, targetProperty);
+  	    }
+  	    // add a flag to not completely full polyfills
+  	    if (options.sham || (targetProperty && targetProperty.sham)) {
+  	      createNonEnumerableProperty(sourceProperty, 'sham', true);
+  	    }
+  	    defineBuiltIn(target, key, sourceProperty, options);
+  	  }
+  	};
+  	return _export;
+  }
 
-  var createProperty$1 = function (object, key, value) {
-    if (DESCRIPTORS$2) definePropertyModule$1.f(object, key, createPropertyDescriptor(0, value));
-    else object[key] = value;
-  };
+  var functionUncurryThisClause;
+  var hasRequiredFunctionUncurryThisClause;
 
-  var wellKnownSymbol$5 = wellKnownSymbol$7;
+  function requireFunctionUncurryThisClause () {
+  	if (hasRequiredFunctionUncurryThisClause) return functionUncurryThisClause;
+  	hasRequiredFunctionUncurryThisClause = 1;
+  	var classofRaw = requireClassofRaw();
+  	var uncurryThis = requireFunctionUncurryThis();
 
-  var TO_STRING_TAG$1 = wellKnownSymbol$5('toStringTag');
-  var test = {};
+  	functionUncurryThisClause = function (fn) {
+  	  // Nashorn bug:
+  	  //   https://github.com/zloirock/core-js/issues/1128
+  	  //   https://github.com/zloirock/core-js/issues/1130
+  	  if (classofRaw(fn) === 'Function') return uncurryThis(fn);
+  	};
+  	return functionUncurryThisClause;
+  }
 
-  test[TO_STRING_TAG$1] = 'z';
+  var functionBindContext;
+  var hasRequiredFunctionBindContext;
 
-  var toStringTagSupport = String(test) === '[object z]';
+  function requireFunctionBindContext () {
+  	if (hasRequiredFunctionBindContext) return functionBindContext;
+  	hasRequiredFunctionBindContext = 1;
+  	var uncurryThis = requireFunctionUncurryThisClause();
+  	var aCallable = requireACallable();
+  	var NATIVE_BIND = requireFunctionBindNative();
 
-  var TO_STRING_TAG_SUPPORT$2 = toStringTagSupport;
-  var isCallable$1 = isCallable$c;
-  var classofRaw$1 = classofRaw$2;
-  var wellKnownSymbol$4 = wellKnownSymbol$7;
+  	var bind = uncurryThis(uncurryThis.bind);
 
-  var TO_STRING_TAG = wellKnownSymbol$4('toStringTag');
-  var $Object = Object;
+  	// optional / simple context binding
+  	functionBindContext = function (fn, that) {
+  	  aCallable(fn);
+  	  return that === undefined ? fn : NATIVE_BIND ? bind(fn, that) : function (/* ...args */) {
+  	    return fn.apply(that, arguments);
+  	  };
+  	};
+  	return functionBindContext;
+  }
 
-  // ES3 wrong here
-  var CORRECT_ARGUMENTS = classofRaw$1(function () { return arguments; }()) === 'Arguments';
+  var isArray;
+  var hasRequiredIsArray;
 
-  // fallback for IE11 Script Access Denied error
-  var tryGet = function (it, key) {
-    try {
-      return it[key];
-    } catch (error) { /* empty */ }
-  };
+  function requireIsArray () {
+  	if (hasRequiredIsArray) return isArray;
+  	hasRequiredIsArray = 1;
+  	var classof = requireClassofRaw();
 
-  // getting tag from ES6+ `Object.prototype.toString`
-  var classof$2 = TO_STRING_TAG_SUPPORT$2 ? classofRaw$1 : function (it) {
-    var O, tag, result;
-    return it === undefined ? 'Undefined' : it === null ? 'Null'
-      // @@toStringTag case
-      : typeof (tag = tryGet(O = $Object(it), TO_STRING_TAG)) == 'string' ? tag
-      // builtinTag case
-      : CORRECT_ARGUMENTS ? classofRaw$1(O)
-      // ES3 arguments fallback
-      : (result = classofRaw$1(O)) === 'Object' && isCallable$1(O.callee) ? 'Arguments' : result;
-  };
+  	// `IsArray` abstract operation
+  	// https://tc39.es/ecma262/#sec-isarray
+  	// eslint-disable-next-line es/no-array-isarray -- safe
+  	isArray = Array.isArray || function isArray(argument) {
+  	  return classof(argument) === 'Array';
+  	};
+  	return isArray;
+  }
 
-  var uncurryThis$4 = functionUncurryThis;
-  var fails$3 = fails$c;
-  var isCallable = isCallable$c;
-  var classof$1 = classof$2;
-  var getBuiltIn$1 = getBuiltIn$4;
-  var inspectSource = inspectSource$2;
+  var toStringTagSupport;
+  var hasRequiredToStringTagSupport;
 
-  var noop = function () { /* empty */ };
-  var construct = getBuiltIn$1('Reflect', 'construct');
-  var constructorRegExp = /^\s*(?:class|function)\b/;
-  var exec = uncurryThis$4(constructorRegExp.exec);
-  var INCORRECT_TO_STRING = !constructorRegExp.test(noop);
+  function requireToStringTagSupport () {
+  	if (hasRequiredToStringTagSupport) return toStringTagSupport;
+  	hasRequiredToStringTagSupport = 1;
+  	var wellKnownSymbol = requireWellKnownSymbol();
 
-  var isConstructorModern = function isConstructor(argument) {
-    if (!isCallable(argument)) return false;
-    try {
-      construct(noop, [], argument);
-      return true;
-    } catch (error) {
-      return false;
-    }
-  };
+  	var TO_STRING_TAG = wellKnownSymbol('toStringTag');
+  	var test = {};
 
-  var isConstructorLegacy = function isConstructor(argument) {
-    if (!isCallable(argument)) return false;
-    switch (classof$1(argument)) {
-      case 'AsyncFunction':
-      case 'GeneratorFunction':
-      case 'AsyncGeneratorFunction': return false;
-    }
-    try {
-      // we can't check .prototype since constructors produced by .bind haven't it
-      // `Function#toString` throws on some built-it function in some legacy engines
-      // (for example, `DOMQuad` and similar in FF41-)
-      return INCORRECT_TO_STRING || !!exec(constructorRegExp, inspectSource(argument));
-    } catch (error) {
-      return true;
-    }
-  };
+  	test[TO_STRING_TAG] = 'z';
 
-  isConstructorLegacy.sham = true;
+  	toStringTagSupport = String(test) === '[object z]';
+  	return toStringTagSupport;
+  }
 
-  // `IsConstructor` abstract operation
-  // https://tc39.es/ecma262/#sec-isconstructor
-  var isConstructor$1 = !construct || fails$3(function () {
-    var called;
-    return isConstructorModern(isConstructorModern.call)
-      || !isConstructorModern(Object)
-      || !isConstructorModern(function () { called = true; })
-      || called;
-  }) ? isConstructorLegacy : isConstructorModern;
+  var classof;
+  var hasRequiredClassof;
 
-  var isArray$1 = isArray$2;
-  var isConstructor = isConstructor$1;
-  var isObject$1 = isObject$7;
-  var wellKnownSymbol$3 = wellKnownSymbol$7;
+  function requireClassof () {
+  	if (hasRequiredClassof) return classof;
+  	hasRequiredClassof = 1;
+  	var TO_STRING_TAG_SUPPORT = requireToStringTagSupport();
+  	var isCallable = requireIsCallable();
+  	var classofRaw = requireClassofRaw();
+  	var wellKnownSymbol = requireWellKnownSymbol();
 
-  var SPECIES$1 = wellKnownSymbol$3('species');
-  var $Array = Array;
+  	var TO_STRING_TAG = wellKnownSymbol('toStringTag');
+  	var $Object = Object;
 
-  // a part of `ArraySpeciesCreate` abstract operation
-  // https://tc39.es/ecma262/#sec-arrayspeciescreate
-  var arraySpeciesConstructor$1 = function (originalArray) {
-    var C;
-    if (isArray$1(originalArray)) {
-      C = originalArray.constructor;
-      // cross-realm fallback
-      if (isConstructor(C) && (C === $Array || isArray$1(C.prototype))) C = undefined;
-      else if (isObject$1(C)) {
-        C = C[SPECIES$1];
-        if (C === null) C = undefined;
-      }
-    } return C === undefined ? $Array : C;
-  };
+  	// ES3 wrong here
+  	var CORRECT_ARGUMENTS = classofRaw(function () { return arguments; }()) === 'Arguments';
 
-  var arraySpeciesConstructor = arraySpeciesConstructor$1;
+  	// fallback for IE11 Script Access Denied error
+  	var tryGet = function (it, key) {
+  	  try {
+  	    return it[key];
+  	  } catch (error) { /* empty */ }
+  	};
 
-  // `ArraySpeciesCreate` abstract operation
-  // https://tc39.es/ecma262/#sec-arrayspeciescreate
-  var arraySpeciesCreate$2 = function (originalArray, length) {
-    return new (arraySpeciesConstructor(originalArray))(length === 0 ? 0 : length);
-  };
+  	// getting tag from ES6+ `Object.prototype.toString`
+  	classof = TO_STRING_TAG_SUPPORT ? classofRaw : function (it) {
+  	  var O, tag, result;
+  	  return it === undefined ? 'Undefined' : it === null ? 'Null'
+  	    // @@toStringTag case
+  	    : typeof (tag = tryGet(O = $Object(it), TO_STRING_TAG)) == 'string' ? tag
+  	    // builtinTag case
+  	    : CORRECT_ARGUMENTS ? classofRaw(O)
+  	    // ES3 arguments fallback
+  	    : (result = classofRaw(O)) === 'Object' && isCallable(O.callee) ? 'Arguments' : result;
+  	};
+  	return classof;
+  }
 
-  var fails$2 = fails$c;
-  var wellKnownSymbol$2 = wellKnownSymbol$7;
-  var V8_VERSION$1 = engineV8Version;
+  var isConstructor;
+  var hasRequiredIsConstructor;
 
-  var SPECIES = wellKnownSymbol$2('species');
+  function requireIsConstructor () {
+  	if (hasRequiredIsConstructor) return isConstructor;
+  	hasRequiredIsConstructor = 1;
+  	var uncurryThis = requireFunctionUncurryThis();
+  	var fails = requireFails();
+  	var isCallable = requireIsCallable();
+  	var classof = requireClassof();
+  	var getBuiltIn = requireGetBuiltIn();
+  	var inspectSource = requireInspectSource();
 
-  var arrayMethodHasSpeciesSupport$1 = function (METHOD_NAME) {
-    // We can't use this feature detection in V8 since it causes
-    // deoptimization and serious performance degradation
-    // https://github.com/zloirock/core-js/issues/677
-    return V8_VERSION$1 >= 51 || !fails$2(function () {
-      var array = [];
-      var constructor = array.constructor = {};
-      constructor[SPECIES] = function () {
-        return { foo: 1 };
-      };
-      return array[METHOD_NAME](Boolean).foo !== 1;
-    });
-  };
+  	var noop = function () { /* empty */ };
+  	var construct = getBuiltIn('Reflect', 'construct');
+  	var constructorRegExp = /^\s*(?:class|function)\b/;
+  	var exec = uncurryThis(constructorRegExp.exec);
+  	var INCORRECT_TO_STRING = !constructorRegExp.test(noop);
 
-  var $$2 = _export;
-  var fails$1 = fails$c;
-  var isArray = isArray$2;
-  var isObject = isObject$7;
-  var toObject$2 = toObject$4;
-  var lengthOfArrayLike$1 = lengthOfArrayLike$3;
-  var doesNotExceedSafeInteger = doesNotExceedSafeInteger$1;
-  var createProperty = createProperty$1;
-  var arraySpeciesCreate$1 = arraySpeciesCreate$2;
-  var arrayMethodHasSpeciesSupport = arrayMethodHasSpeciesSupport$1;
-  var wellKnownSymbol$1 = wellKnownSymbol$7;
-  var V8_VERSION = engineV8Version;
+  	var isConstructorModern = function isConstructor(argument) {
+  	  if (!isCallable(argument)) return false;
+  	  try {
+  	    construct(noop, [], argument);
+  	    return true;
+  	  } catch (error) {
+  	    return false;
+  	  }
+  	};
 
-  var IS_CONCAT_SPREADABLE = wellKnownSymbol$1('isConcatSpreadable');
+  	var isConstructorLegacy = function isConstructor(argument) {
+  	  if (!isCallable(argument)) return false;
+  	  switch (classof(argument)) {
+  	    case 'AsyncFunction':
+  	    case 'GeneratorFunction':
+  	    case 'AsyncGeneratorFunction': return false;
+  	  }
+  	  try {
+  	    // we can't check .prototype since constructors produced by .bind haven't it
+  	    // `Function#toString` throws on some built-it function in some legacy engines
+  	    // (for example, `DOMQuad` and similar in FF41-)
+  	    return INCORRECT_TO_STRING || !!exec(constructorRegExp, inspectSource(argument));
+  	  } catch (error) {
+  	    return true;
+  	  }
+  	};
 
-  // We can't use this feature detection in V8 since it causes
-  // deoptimization and serious performance degradation
-  // https://github.com/zloirock/core-js/issues/679
-  var IS_CONCAT_SPREADABLE_SUPPORT = V8_VERSION >= 51 || !fails$1(function () {
-    var array = [];
-    array[IS_CONCAT_SPREADABLE] = false;
-    return array.concat()[0] !== array;
-  });
+  	isConstructorLegacy.sham = true;
 
-  var isConcatSpreadable = function (O) {
-    if (!isObject(O)) return false;
-    var spreadable = O[IS_CONCAT_SPREADABLE];
-    return spreadable !== undefined ? !!spreadable : isArray(O);
-  };
+  	// `IsConstructor` abstract operation
+  	// https://tc39.es/ecma262/#sec-isconstructor
+  	isConstructor = !construct || fails(function () {
+  	  var called;
+  	  return isConstructorModern(isConstructorModern.call)
+  	    || !isConstructorModern(Object)
+  	    || !isConstructorModern(function () { called = true; })
+  	    || called;
+  	}) ? isConstructorLegacy : isConstructorModern;
+  	return isConstructor;
+  }
 
-  var FORCED = !IS_CONCAT_SPREADABLE_SUPPORT || !arrayMethodHasSpeciesSupport('concat');
+  var arraySpeciesConstructor;
+  var hasRequiredArraySpeciesConstructor;
 
-  // `Array.prototype.concat` method
-  // https://tc39.es/ecma262/#sec-array.prototype.concat
-  // with adding support of @@isConcatSpreadable and @@species
-  $$2({ target: 'Array', proto: true, arity: 1, forced: FORCED }, {
-    // eslint-disable-next-line no-unused-vars -- required for `.length`
-    concat: function concat(arg) {
-      var O = toObject$2(this);
-      var A = arraySpeciesCreate$1(O, 0);
-      var n = 0;
-      var i, k, length, len, E;
-      for (i = -1, length = arguments.length; i < length; i++) {
-        E = i === -1 ? O : arguments[i];
-        if (isConcatSpreadable(E)) {
-          len = lengthOfArrayLike$1(E);
-          doesNotExceedSafeInteger(n + len);
-          for (k = 0; k < len; k++, n++) if (k in E) createProperty(A, n, E[k]);
-        } else {
-          doesNotExceedSafeInteger(n + 1);
-          createProperty(A, n++, E);
-        }
-      }
-      A.length = n;
-      return A;
-    }
-  });
+  function requireArraySpeciesConstructor () {
+  	if (hasRequiredArraySpeciesConstructor) return arraySpeciesConstructor;
+  	hasRequiredArraySpeciesConstructor = 1;
+  	var isArray = requireIsArray();
+  	var isConstructor = requireIsConstructor();
+  	var isObject = requireIsObject();
+  	var wellKnownSymbol = requireWellKnownSymbol();
 
-  var classofRaw = classofRaw$2;
-  var uncurryThis$3 = functionUncurryThis;
+  	var SPECIES = wellKnownSymbol('species');
+  	var $Array = Array;
 
-  var functionUncurryThisClause = function (fn) {
-    // Nashorn bug:
-    //   https://github.com/zloirock/core-js/issues/1128
-    //   https://github.com/zloirock/core-js/issues/1130
-    if (classofRaw(fn) === 'Function') return uncurryThis$3(fn);
-  };
+  	// a part of `ArraySpeciesCreate` abstract operation
+  	// https://tc39.es/ecma262/#sec-arrayspeciescreate
+  	arraySpeciesConstructor = function (originalArray) {
+  	  var C;
+  	  if (isArray(originalArray)) {
+  	    C = originalArray.constructor;
+  	    // cross-realm fallback
+  	    if (isConstructor(C) && (C === $Array || isArray(C.prototype))) C = undefined;
+  	    else if (isObject(C)) {
+  	      C = C[SPECIES];
+  	      if (C === null) C = undefined;
+  	    }
+  	  } return C === undefined ? $Array : C;
+  	};
+  	return arraySpeciesConstructor;
+  }
 
-  var uncurryThis$2 = functionUncurryThisClause;
-  var aCallable = aCallable$2;
-  var NATIVE_BIND = functionBindNative;
+  var arraySpeciesCreate;
+  var hasRequiredArraySpeciesCreate;
 
-  var bind$1 = uncurryThis$2(uncurryThis$2.bind);
+  function requireArraySpeciesCreate () {
+  	if (hasRequiredArraySpeciesCreate) return arraySpeciesCreate;
+  	hasRequiredArraySpeciesCreate = 1;
+  	var arraySpeciesConstructor = requireArraySpeciesConstructor();
 
-  // optional / simple context binding
-  var functionBindContext = function (fn, that) {
-    aCallable(fn);
-    return that === undefined ? fn : NATIVE_BIND ? bind$1(fn, that) : function (/* ...args */) {
-      return fn.apply(that, arguments);
-    };
-  };
+  	// `ArraySpeciesCreate` abstract operation
+  	// https://tc39.es/ecma262/#sec-arrayspeciescreate
+  	arraySpeciesCreate = function (originalArray, length) {
+  	  return new (arraySpeciesConstructor(originalArray))(length === 0 ? 0 : length);
+  	};
+  	return arraySpeciesCreate;
+  }
 
-  var bind = functionBindContext;
-  var uncurryThis$1 = functionUncurryThis;
-  var IndexedObject$1 = indexedObject;
-  var toObject$1 = toObject$4;
-  var lengthOfArrayLike = lengthOfArrayLike$3;
-  var arraySpeciesCreate = arraySpeciesCreate$2;
+  var arrayIteration;
+  var hasRequiredArrayIteration;
 
-  var push = uncurryThis$1([].push);
+  function requireArrayIteration () {
+  	if (hasRequiredArrayIteration) return arrayIteration;
+  	hasRequiredArrayIteration = 1;
+  	var bind = requireFunctionBindContext();
+  	var uncurryThis = requireFunctionUncurryThis();
+  	var IndexedObject = requireIndexedObject();
+  	var toObject = requireToObject();
+  	var lengthOfArrayLike = requireLengthOfArrayLike();
+  	var arraySpeciesCreate = requireArraySpeciesCreate();
 
-  // `Array.prototype.{ forEach, map, filter, some, every, find, findIndex, filterReject }` methods implementation
-  var createMethod = function (TYPE) {
-    var IS_MAP = TYPE === 1;
-    var IS_FILTER = TYPE === 2;
-    var IS_SOME = TYPE === 3;
-    var IS_EVERY = TYPE === 4;
-    var IS_FIND_INDEX = TYPE === 6;
-    var IS_FILTER_REJECT = TYPE === 7;
-    var NO_HOLES = TYPE === 5 || IS_FIND_INDEX;
-    return function ($this, callbackfn, that, specificCreate) {
-      var O = toObject$1($this);
-      var self = IndexedObject$1(O);
-      var length = lengthOfArrayLike(self);
-      var boundFunction = bind(callbackfn, that);
-      var index = 0;
-      var create = specificCreate || arraySpeciesCreate;
-      var target = IS_MAP ? create($this, length) : IS_FILTER || IS_FILTER_REJECT ? create($this, 0) : undefined;
-      var value, result;
-      for (;length > index; index++) if (NO_HOLES || index in self) {
-        value = self[index];
-        result = boundFunction(value, index, O);
-        if (TYPE) {
-          if (IS_MAP) target[index] = result; // map
-          else if (result) switch (TYPE) {
-            case 3: return true;              // some
-            case 5: return value;             // find
-            case 6: return index;             // findIndex
-            case 2: push(target, value);      // filter
-          } else switch (TYPE) {
-            case 4: return false;             // every
-            case 7: push(target, value);      // filterReject
-          }
-        }
-      }
-      return IS_FIND_INDEX ? -1 : IS_SOME || IS_EVERY ? IS_EVERY : target;
-    };
-  };
+  	var push = uncurryThis([].push);
 
-  var arrayIteration = {
-    // `Array.prototype.forEach` method
-    // https://tc39.es/ecma262/#sec-array.prototype.foreach
-    forEach: createMethod(0),
-    // `Array.prototype.map` method
-    // https://tc39.es/ecma262/#sec-array.prototype.map
-    map: createMethod(1),
-    // `Array.prototype.filter` method
-    // https://tc39.es/ecma262/#sec-array.prototype.filter
-    filter: createMethod(2),
-    // `Array.prototype.some` method
-    // https://tc39.es/ecma262/#sec-array.prototype.some
-    some: createMethod(3),
-    // `Array.prototype.every` method
-    // https://tc39.es/ecma262/#sec-array.prototype.every
-    every: createMethod(4),
-    // `Array.prototype.find` method
-    // https://tc39.es/ecma262/#sec-array.prototype.find
-    find: createMethod(5),
-    // `Array.prototype.findIndex` method
-    // https://tc39.es/ecma262/#sec-array.prototype.findIndex
-    findIndex: createMethod(6),
-    // `Array.prototype.filterReject` method
-    // https://github.com/tc39/proposal-array-filtering
-    filterReject: createMethod(7)
-  };
+  	// `Array.prototype.{ forEach, map, filter, some, every, find, findIndex, filterReject }` methods implementation
+  	var createMethod = function (TYPE) {
+  	  var IS_MAP = TYPE === 1;
+  	  var IS_FILTER = TYPE === 2;
+  	  var IS_SOME = TYPE === 3;
+  	  var IS_EVERY = TYPE === 4;
+  	  var IS_FIND_INDEX = TYPE === 6;
+  	  var IS_FILTER_REJECT = TYPE === 7;
+  	  var NO_HOLES = TYPE === 5 || IS_FIND_INDEX;
+  	  return function ($this, callbackfn, that, specificCreate) {
+  	    var O = toObject($this);
+  	    var self = IndexedObject(O);
+  	    var length = lengthOfArrayLike(self);
+  	    var boundFunction = bind(callbackfn, that);
+  	    var index = 0;
+  	    var create = specificCreate || arraySpeciesCreate;
+  	    var target = IS_MAP ? create($this, length) : IS_FILTER || IS_FILTER_REJECT ? create($this, 0) : undefined;
+  	    var value, result;
+  	    for (;length > index; index++) if (NO_HOLES || index in self) {
+  	      value = self[index];
+  	      result = boundFunction(value, index, O);
+  	      if (TYPE) {
+  	        if (IS_MAP) target[index] = result; // map
+  	        else if (result) switch (TYPE) {
+  	          case 3: return true;              // some
+  	          case 5: return value;             // find
+  	          case 6: return index;             // findIndex
+  	          case 2: push(target, value);      // filter
+  	        } else switch (TYPE) {
+  	          case 4: return false;             // every
+  	          case 7: push(target, value);      // filterReject
+  	        }
+  	      }
+  	    }
+  	    return IS_FIND_INDEX ? -1 : IS_SOME || IS_EVERY ? IS_EVERY : target;
+  	  };
+  	};
+
+  	arrayIteration = {
+  	  // `Array.prototype.forEach` method
+  	  // https://tc39.es/ecma262/#sec-array.prototype.foreach
+  	  forEach: createMethod(0),
+  	  // `Array.prototype.map` method
+  	  // https://tc39.es/ecma262/#sec-array.prototype.map
+  	  map: createMethod(1),
+  	  // `Array.prototype.filter` method
+  	  // https://tc39.es/ecma262/#sec-array.prototype.filter
+  	  filter: createMethod(2),
+  	  // `Array.prototype.some` method
+  	  // https://tc39.es/ecma262/#sec-array.prototype.some
+  	  some: createMethod(3),
+  	  // `Array.prototype.every` method
+  	  // https://tc39.es/ecma262/#sec-array.prototype.every
+  	  every: createMethod(4),
+  	  // `Array.prototype.find` method
+  	  // https://tc39.es/ecma262/#sec-array.prototype.find
+  	  find: createMethod(5),
+  	  // `Array.prototype.findIndex` method
+  	  // https://tc39.es/ecma262/#sec-array.prototype.findIndex
+  	  findIndex: createMethod(6),
+  	  // `Array.prototype.filterReject` method
+  	  // https://github.com/tc39/proposal-array-filtering
+  	  filterReject: createMethod(7)
+  	};
+  	return arrayIteration;
+  }
 
   var objectDefineProperties = {};
 
-  var internalObjectKeys = objectKeysInternal;
-  var enumBugKeys$1 = enumBugKeys$3;
+  var objectKeys;
+  var hasRequiredObjectKeys;
 
-  // `Object.keys` method
-  // https://tc39.es/ecma262/#sec-object.keys
-  // eslint-disable-next-line es/no-object-keys -- safe
-  var objectKeys$2 = Object.keys || function keys(O) {
-    return internalObjectKeys(O, enumBugKeys$1);
-  };
+  function requireObjectKeys () {
+  	if (hasRequiredObjectKeys) return objectKeys;
+  	hasRequiredObjectKeys = 1;
+  	var internalObjectKeys = requireObjectKeysInternal();
+  	var enumBugKeys = requireEnumBugKeys();
 
-  var DESCRIPTORS$1 = descriptors;
-  var V8_PROTOTYPE_DEFINE_BUG = v8PrototypeDefineBug;
-  var definePropertyModule = objectDefineProperty;
-  var anObject$1 = anObject$4;
-  var toIndexedObject = toIndexedObject$4;
-  var objectKeys$1 = objectKeys$2;
-
-  // `Object.defineProperties` method
-  // https://tc39.es/ecma262/#sec-object.defineproperties
-  // eslint-disable-next-line es/no-object-defineproperties -- safe
-  objectDefineProperties.f = DESCRIPTORS$1 && !V8_PROTOTYPE_DEFINE_BUG ? Object.defineProperties : function defineProperties(O, Properties) {
-    anObject$1(O);
-    var props = toIndexedObject(Properties);
-    var keys = objectKeys$1(Properties);
-    var length = keys.length;
-    var index = 0;
-    var key;
-    while (length > index) definePropertyModule.f(O, key = keys[index++], props[key]);
-    return O;
-  };
-
-  var getBuiltIn = getBuiltIn$4;
-
-  var html$1 = getBuiltIn('document', 'documentElement');
-
-  /* global ActiveXObject -- old IE, WSH */
-  var anObject = anObject$4;
-  var definePropertiesModule = objectDefineProperties;
-  var enumBugKeys = enumBugKeys$3;
-  var hiddenKeys = hiddenKeys$4;
-  var html = html$1;
-  var documentCreateElement = documentCreateElement$1;
-  var sharedKey = sharedKey$2;
-
-  var GT = '>';
-  var LT = '<';
-  var PROTOTYPE = 'prototype';
-  var SCRIPT = 'script';
-  var IE_PROTO = sharedKey('IE_PROTO');
-
-  var EmptyConstructor = function () { /* empty */ };
-
-  var scriptTag = function (content) {
-    return LT + SCRIPT + GT + content + LT + '/' + SCRIPT + GT;
-  };
-
-  // Create object with fake `null` prototype: use ActiveX Object with cleared prototype
-  var NullProtoObjectViaActiveX = function (activeXDocument) {
-    activeXDocument.write(scriptTag(''));
-    activeXDocument.close();
-    var temp = activeXDocument.parentWindow.Object;
-    activeXDocument = null; // avoid memory leak
-    return temp;
-  };
-
-  // Create object with fake `null` prototype: use iframe Object with cleared prototype
-  var NullProtoObjectViaIFrame = function () {
-    // Thrash, waste and sodomy: IE GC bug
-    var iframe = documentCreateElement('iframe');
-    var JS = 'java' + SCRIPT + ':';
-    var iframeDocument;
-    iframe.style.display = 'none';
-    html.appendChild(iframe);
-    // https://github.com/zloirock/core-js/issues/475
-    iframe.src = String(JS);
-    iframeDocument = iframe.contentWindow.document;
-    iframeDocument.open();
-    iframeDocument.write(scriptTag('document.F=Object'));
-    iframeDocument.close();
-    return iframeDocument.F;
-  };
-
-  // Check for document.domain and active x support
-  // No need to use active x approach when document.domain is not set
-  // see https://github.com/es-shims/es5-shim/issues/150
-  // variation of https://github.com/kitcambridge/es5-shim/commit/4f738ac066346
-  // avoid IE GC bug
-  var activeXDocument;
-  var NullProtoObject = function () {
-    try {
-      activeXDocument = new ActiveXObject('htmlfile');
-    } catch (error) { /* ignore */ }
-    NullProtoObject = typeof document != 'undefined'
-      ? document.domain && activeXDocument
-        ? NullProtoObjectViaActiveX(activeXDocument) // old IE
-        : NullProtoObjectViaIFrame()
-      : NullProtoObjectViaActiveX(activeXDocument); // WSH
-    var length = enumBugKeys.length;
-    while (length--) delete NullProtoObject[PROTOTYPE][enumBugKeys[length]];
-    return NullProtoObject();
-  };
-
-  hiddenKeys[IE_PROTO] = true;
-
-  // `Object.create` method
-  // https://tc39.es/ecma262/#sec-object.create
-  // eslint-disable-next-line es/no-object-create -- safe
-  var objectCreate = Object.create || function create(O, Properties) {
-    var result;
-    if (O !== null) {
-      EmptyConstructor[PROTOTYPE] = anObject(O);
-      result = new EmptyConstructor();
-      EmptyConstructor[PROTOTYPE] = null;
-      // add "__proto__" for Object.getPrototypeOf polyfill
-      result[IE_PROTO] = O;
-    } else result = NullProtoObject();
-    return Properties === undefined ? result : definePropertiesModule.f(result, Properties);
-  };
-
-  var wellKnownSymbol = wellKnownSymbol$7;
-  var create = objectCreate;
-  var defineProperty$1 = objectDefineProperty.f;
-
-  var UNSCOPABLES = wellKnownSymbol('unscopables');
-  var ArrayPrototype = Array.prototype;
-
-  // Array.prototype[@@unscopables]
-  // https://tc39.es/ecma262/#sec-array.prototype-@@unscopables
-  if (ArrayPrototype[UNSCOPABLES] === undefined) {
-    defineProperty$1(ArrayPrototype, UNSCOPABLES, {
-      configurable: true,
-      value: create(null)
-    });
+  	// `Object.keys` method
+  	// https://tc39.es/ecma262/#sec-object.keys
+  	// eslint-disable-next-line es/no-object-keys -- safe
+  	objectKeys = Object.keys || function keys(O) {
+  	  return internalObjectKeys(O, enumBugKeys);
+  	};
+  	return objectKeys;
   }
 
-  // add a key to Array.prototype[@@unscopables]
-  var addToUnscopables$1 = function (key) {
-    ArrayPrototype[UNSCOPABLES][key] = true;
-  };
+  var hasRequiredObjectDefineProperties;
 
-  var $$1 = _export;
-  var $find = arrayIteration.find;
-  var addToUnscopables = addToUnscopables$1;
+  function requireObjectDefineProperties () {
+  	if (hasRequiredObjectDefineProperties) return objectDefineProperties;
+  	hasRequiredObjectDefineProperties = 1;
+  	var DESCRIPTORS = requireDescriptors();
+  	var V8_PROTOTYPE_DEFINE_BUG = requireV8PrototypeDefineBug();
+  	var definePropertyModule = requireObjectDefineProperty();
+  	var anObject = requireAnObject();
+  	var toIndexedObject = requireToIndexedObject();
+  	var objectKeys = requireObjectKeys();
 
-  var FIND = 'find';
-  var SKIPS_HOLES = true;
-
-  // Shouldn't skip holes
-  // eslint-disable-next-line es/no-array-prototype-find -- testing
-  if (FIND in []) Array(1)[FIND](function () { SKIPS_HOLES = false; });
-
-  // `Array.prototype.find` method
-  // https://tc39.es/ecma262/#sec-array.prototype.find
-  $$1({ target: 'Array', proto: true, forced: SKIPS_HOLES }, {
-    find: function find(callbackfn /* , that = undefined */) {
-      return $find(this, callbackfn, arguments.length > 1 ? arguments[1] : undefined);
-    }
-  });
-
-  // https://tc39.es/ecma262/#sec-array.prototype-@@unscopables
-  addToUnscopables(FIND);
-
-  var DESCRIPTORS = descriptors;
-  var uncurryThis = functionUncurryThis;
-  var call = functionCall;
-  var fails = fails$c;
-  var objectKeys = objectKeys$2;
-  var getOwnPropertySymbolsModule = objectGetOwnPropertySymbols;
-  var propertyIsEnumerableModule = objectPropertyIsEnumerable;
-  var toObject = toObject$4;
-  var IndexedObject = indexedObject;
-
-  // eslint-disable-next-line es/no-object-assign -- safe
-  var $assign = Object.assign;
-  // eslint-disable-next-line es/no-object-defineproperty -- required for testing
-  var defineProperty = Object.defineProperty;
-  var concat = uncurryThis([].concat);
-
-  // `Object.assign` method
-  // https://tc39.es/ecma262/#sec-object.assign
-  var objectAssign = !$assign || fails(function () {
-    // should have correct order of operations (Edge bug)
-    if (DESCRIPTORS && $assign({ b: 1 }, $assign(defineProperty({}, 'a', {
-      enumerable: true,
-      get: function () {
-        defineProperty(this, 'b', {
-          value: 3,
-          enumerable: false
-        });
-      }
-    }), { b: 2 })).b !== 1) return true;
-    // should work with symbols and should have deterministic property order (V8 bug)
-    var A = {};
-    var B = {};
-    // eslint-disable-next-line es/no-symbol -- safe
-    var symbol = Symbol('assign detection');
-    var alphabet = 'abcdefghijklmnopqrst';
-    A[symbol] = 7;
-    alphabet.split('').forEach(function (chr) { B[chr] = chr; });
-    return $assign({}, A)[symbol] !== 7 || objectKeys($assign({}, B)).join('') !== alphabet;
-  }) ? function assign(target, source) { // eslint-disable-line no-unused-vars -- required for `.length`
-    var T = toObject(target);
-    var argumentsLength = arguments.length;
-    var index = 1;
-    var getOwnPropertySymbols = getOwnPropertySymbolsModule.f;
-    var propertyIsEnumerable = propertyIsEnumerableModule.f;
-    while (argumentsLength > index) {
-      var S = IndexedObject(arguments[index++]);
-      var keys = getOwnPropertySymbols ? concat(objectKeys(S), getOwnPropertySymbols(S)) : objectKeys(S);
-      var length = keys.length;
-      var j = 0;
-      var key;
-      while (length > j) {
-        key = keys[j++];
-        if (!DESCRIPTORS || call(propertyIsEnumerable, S, key)) T[key] = S[key];
-      }
-    } return T;
-  } : $assign;
-
-  var $ = _export;
-  var assign = objectAssign;
-
-  // `Object.assign` method
-  // https://tc39.es/ecma262/#sec-object.assign
-  // eslint-disable-next-line es/no-object-assign -- required for testing
-  $({ target: 'Object', stat: true, arity: 2, forced: Object.assign !== assign }, {
-    assign: assign
-  });
-
-  var TO_STRING_TAG_SUPPORT$1 = toStringTagSupport;
-  var classof = classof$2;
-
-  // `Object.prototype.toString` method implementation
-  // https://tc39.es/ecma262/#sec-object.prototype.tostring
-  var objectToString = TO_STRING_TAG_SUPPORT$1 ? {}.toString : function toString() {
-    return '[object ' + classof(this) + ']';
-  };
-
-  var TO_STRING_TAG_SUPPORT = toStringTagSupport;
-  var defineBuiltIn = defineBuiltIn$2;
-  var toString = objectToString;
-
-  // `Object.prototype.toString` method
-  // https://tc39.es/ecma262/#sec-object.prototype.tostring
-  if (!TO_STRING_TAG_SUPPORT) {
-    defineBuiltIn(Object.prototype, 'toString', toString, { unsafe: true });
+  	// `Object.defineProperties` method
+  	// https://tc39.es/ecma262/#sec-object.defineproperties
+  	// eslint-disable-next-line es/no-object-defineproperties -- safe
+  	objectDefineProperties.f = DESCRIPTORS && !V8_PROTOTYPE_DEFINE_BUG ? Object.defineProperties : function defineProperties(O, Properties) {
+  	  anObject(O);
+  	  var props = toIndexedObject(Properties);
+  	  var keys = objectKeys(Properties);
+  	  var length = keys.length;
+  	  var index = 0;
+  	  var key;
+  	  while (length > index) definePropertyModule.f(O, key = keys[index++], props[key]);
+  	  return O;
+  	};
+  	return objectDefineProperties;
   }
 
+  var html;
+  var hasRequiredHtml;
+
+  function requireHtml () {
+  	if (hasRequiredHtml) return html;
+  	hasRequiredHtml = 1;
+  	var getBuiltIn = requireGetBuiltIn();
+
+  	html = getBuiltIn('document', 'documentElement');
+  	return html;
+  }
+
+  var objectCreate;
+  var hasRequiredObjectCreate;
+
+  function requireObjectCreate () {
+  	if (hasRequiredObjectCreate) return objectCreate;
+  	hasRequiredObjectCreate = 1;
+  	/* global ActiveXObject -- old IE, WSH */
+  	var anObject = requireAnObject();
+  	var definePropertiesModule = requireObjectDefineProperties();
+  	var enumBugKeys = requireEnumBugKeys();
+  	var hiddenKeys = requireHiddenKeys();
+  	var html = requireHtml();
+  	var documentCreateElement = requireDocumentCreateElement();
+  	var sharedKey = requireSharedKey();
+
+  	var GT = '>';
+  	var LT = '<';
+  	var PROTOTYPE = 'prototype';
+  	var SCRIPT = 'script';
+  	var IE_PROTO = sharedKey('IE_PROTO');
+
+  	var EmptyConstructor = function () { /* empty */ };
+
+  	var scriptTag = function (content) {
+  	  return LT + SCRIPT + GT + content + LT + '/' + SCRIPT + GT;
+  	};
+
+  	// Create object with fake `null` prototype: use ActiveX Object with cleared prototype
+  	var NullProtoObjectViaActiveX = function (activeXDocument) {
+  	  activeXDocument.write(scriptTag(''));
+  	  activeXDocument.close();
+  	  var temp = activeXDocument.parentWindow.Object;
+  	  // eslint-disable-next-line no-useless-assignment -- avoid memory leak
+  	  activeXDocument = null;
+  	  return temp;
+  	};
+
+  	// Create object with fake `null` prototype: use iframe Object with cleared prototype
+  	var NullProtoObjectViaIFrame = function () {
+  	  // Thrash, waste and sodomy: IE GC bug
+  	  var iframe = documentCreateElement('iframe');
+  	  var JS = 'java' + SCRIPT + ':';
+  	  var iframeDocument;
+  	  iframe.style.display = 'none';
+  	  html.appendChild(iframe);
+  	  // https://github.com/zloirock/core-js/issues/475
+  	  iframe.src = String(JS);
+  	  iframeDocument = iframe.contentWindow.document;
+  	  iframeDocument.open();
+  	  iframeDocument.write(scriptTag('document.F=Object'));
+  	  iframeDocument.close();
+  	  return iframeDocument.F;
+  	};
+
+  	// Check for document.domain and active x support
+  	// No need to use active x approach when document.domain is not set
+  	// see https://github.com/es-shims/es5-shim/issues/150
+  	// variation of https://github.com/kitcambridge/es5-shim/commit/4f738ac066346
+  	// avoid IE GC bug
+  	var activeXDocument;
+  	var NullProtoObject = function () {
+  	  try {
+  	    activeXDocument = new ActiveXObject('htmlfile');
+  	  } catch (error) { /* ignore */ }
+  	  NullProtoObject = typeof document != 'undefined'
+  	    ? document.domain && activeXDocument
+  	      ? NullProtoObjectViaActiveX(activeXDocument) // old IE
+  	      : NullProtoObjectViaIFrame()
+  	    : NullProtoObjectViaActiveX(activeXDocument); // WSH
+  	  var length = enumBugKeys.length;
+  	  while (length--) delete NullProtoObject[PROTOTYPE][enumBugKeys[length]];
+  	  return NullProtoObject();
+  	};
+
+  	hiddenKeys[IE_PROTO] = true;
+
+  	// `Object.create` method
+  	// https://tc39.es/ecma262/#sec-object.create
+  	// eslint-disable-next-line es/no-object-create -- safe
+  	objectCreate = Object.create || function create(O, Properties) {
+  	  var result;
+  	  if (O !== null) {
+  	    EmptyConstructor[PROTOTYPE] = anObject(O);
+  	    result = new EmptyConstructor();
+  	    EmptyConstructor[PROTOTYPE] = null;
+  	    // add "__proto__" for Object.getPrototypeOf polyfill
+  	    result[IE_PROTO] = O;
+  	  } else result = NullProtoObject();
+  	  return Properties === undefined ? result : definePropertiesModule.f(result, Properties);
+  	};
+  	return objectCreate;
+  }
+
+  var addToUnscopables;
+  var hasRequiredAddToUnscopables;
+
+  function requireAddToUnscopables () {
+  	if (hasRequiredAddToUnscopables) return addToUnscopables;
+  	hasRequiredAddToUnscopables = 1;
+  	var wellKnownSymbol = requireWellKnownSymbol();
+  	var create = requireObjectCreate();
+  	var defineProperty = requireObjectDefineProperty().f;
+
+  	var UNSCOPABLES = wellKnownSymbol('unscopables');
+  	var ArrayPrototype = Array.prototype;
+
+  	// Array.prototype[@@unscopables]
+  	// https://tc39.es/ecma262/#sec-array.prototype-@@unscopables
+  	if (ArrayPrototype[UNSCOPABLES] === undefined) {
+  	  defineProperty(ArrayPrototype, UNSCOPABLES, {
+  	    configurable: true,
+  	    value: create(null)
+  	  });
+  	}
+
+  	// add a key to Array.prototype[@@unscopables]
+  	addToUnscopables = function (key) {
+  	  ArrayPrototype[UNSCOPABLES][key] = true;
+  	};
+  	return addToUnscopables;
+  }
+
+  var hasRequiredEs_array_find;
+
+  function requireEs_array_find () {
+  	if (hasRequiredEs_array_find) return es_array_find;
+  	hasRequiredEs_array_find = 1;
+  	var $ = require_export();
+  	var $find = requireArrayIteration().find;
+  	var addToUnscopables = requireAddToUnscopables();
+
+  	var FIND = 'find';
+  	var SKIPS_HOLES = true;
+
+  	// Shouldn't skip holes
+  	// eslint-disable-next-line es/no-array-prototype-find -- testing
+  	if (FIND in []) Array(1)[FIND](function () { SKIPS_HOLES = false; });
+
+  	// `Array.prototype.find` method
+  	// https://tc39.es/ecma262/#sec-array.prototype.find
+  	$({ target: 'Array', proto: true, forced: SKIPS_HOLES }, {
+  	  find: function find(callbackfn /* , that = undefined */) {
+  	    return $find(this, callbackfn, arguments.length > 1 ? arguments[1] : undefined);
+  	  }
+  	});
+
+  	// https://tc39.es/ecma262/#sec-array.prototype-@@unscopables
+  	addToUnscopables(FIND);
+  	return es_array_find;
+  }
+
+  requireEs_array_find();
+
+  var es_object_assign = {};
+
+  var objectAssign;
+  var hasRequiredObjectAssign;
+
+  function requireObjectAssign () {
+  	if (hasRequiredObjectAssign) return objectAssign;
+  	hasRequiredObjectAssign = 1;
+  	var DESCRIPTORS = requireDescriptors();
+  	var uncurryThis = requireFunctionUncurryThis();
+  	var call = requireFunctionCall();
+  	var fails = requireFails();
+  	var objectKeys = requireObjectKeys();
+  	var getOwnPropertySymbolsModule = requireObjectGetOwnPropertySymbols();
+  	var propertyIsEnumerableModule = requireObjectPropertyIsEnumerable();
+  	var toObject = requireToObject();
+  	var IndexedObject = requireIndexedObject();
+
+  	// eslint-disable-next-line es/no-object-assign -- safe
+  	var $assign = Object.assign;
+  	// eslint-disable-next-line es/no-object-defineproperty -- required for testing
+  	var defineProperty = Object.defineProperty;
+  	var concat = uncurryThis([].concat);
+
+  	// `Object.assign` method
+  	// https://tc39.es/ecma262/#sec-object.assign
+  	objectAssign = !$assign || fails(function () {
+  	  // should have correct order of operations (Edge bug)
+  	  if (DESCRIPTORS && $assign({ b: 1 }, $assign(defineProperty({}, 'a', {
+  	    enumerable: true,
+  	    get: function () {
+  	      defineProperty(this, 'b', {
+  	        value: 3,
+  	        enumerable: false
+  	      });
+  	    }
+  	  }), { b: 2 })).b !== 1) return true;
+  	  // should work with symbols and should have deterministic property order (V8 bug)
+  	  var A = {};
+  	  var B = {};
+  	  // eslint-disable-next-line es/no-symbol -- safe
+  	  var symbol = Symbol('assign detection');
+  	  var alphabet = 'abcdefghijklmnopqrst';
+  	  A[symbol] = 7;
+  	  alphabet.split('').forEach(function (chr) { B[chr] = chr; });
+  	  return $assign({}, A)[symbol] !== 7 || objectKeys($assign({}, B)).join('') !== alphabet;
+  	}) ? function assign(target, source) { // eslint-disable-line no-unused-vars -- required for `.length`
+  	  var T = toObject(target);
+  	  var argumentsLength = arguments.length;
+  	  var index = 1;
+  	  var getOwnPropertySymbols = getOwnPropertySymbolsModule.f;
+  	  var propertyIsEnumerable = propertyIsEnumerableModule.f;
+  	  while (argumentsLength > index) {
+  	    var S = IndexedObject(arguments[index++]);
+  	    var keys = getOwnPropertySymbols ? concat(objectKeys(S), getOwnPropertySymbols(S)) : objectKeys(S);
+  	    var length = keys.length;
+  	    var j = 0;
+  	    var key;
+  	    while (length > j) {
+  	      key = keys[j++];
+  	      if (!DESCRIPTORS || call(propertyIsEnumerable, S, key)) T[key] = S[key];
+  	    }
+  	  } return T;
+  	} : $assign;
+  	return objectAssign;
+  }
+
+  var hasRequiredEs_object_assign;
+
+  function requireEs_object_assign () {
+  	if (hasRequiredEs_object_assign) return es_object_assign;
+  	hasRequiredEs_object_assign = 1;
+  	var $ = require_export();
+  	var assign = requireObjectAssign();
+
+  	// `Object.assign` method
+  	// https://tc39.es/ecma262/#sec-object.assign
+  	// eslint-disable-next-line es/no-object-assign -- required for testing
+  	$({ target: 'Object', stat: true, arity: 2, forced: Object.assign !== assign }, {
+  	  assign: assign
+  	});
+  	return es_object_assign;
+  }
+
+  requireEs_object_assign();
+
+  var es_object_toString = {};
+
+  var objectToString;
+  var hasRequiredObjectToString;
+
+  function requireObjectToString () {
+  	if (hasRequiredObjectToString) return objectToString;
+  	hasRequiredObjectToString = 1;
+  	var TO_STRING_TAG_SUPPORT = requireToStringTagSupport();
+  	var classof = requireClassof();
+
+  	// `Object.prototype.toString` method implementation
+  	// https://tc39.es/ecma262/#sec-object.prototype.tostring
+  	objectToString = TO_STRING_TAG_SUPPORT ? {}.toString : function toString() {
+  	  return '[object ' + classof(this) + ']';
+  	};
+  	return objectToString;
+  }
+
+  var hasRequiredEs_object_toString;
+
+  function requireEs_object_toString () {
+  	if (hasRequiredEs_object_toString) return es_object_toString;
+  	hasRequiredEs_object_toString = 1;
+  	var TO_STRING_TAG_SUPPORT = requireToStringTagSupport();
+  	var defineBuiltIn = requireDefineBuiltIn();
+  	var toString = requireObjectToString();
+
+  	// `Object.prototype.toString` method
+  	// https://tc39.es/ecma262/#sec-object.prototype.tostring
+  	if (!TO_STRING_TAG_SUPPORT) {
+  	  defineBuiltIn(Object.prototype, 'toString', toString, { unsafe: true });
+  	}
+  	return es_object_toString;
+  }
+
+  requireEs_object_toString();
+
   /**
    * @author vincent loh <vincent.ml@gmail.com>
    * @update J Manuel Corona <jmcg92@gmail.com>
    * @update zhixin wen <wenzhixin2010@gmail.com>
    */
 
-  var Utils = $$3.fn.bootstrapTable.utils;
-  Object.assign($$3.fn.bootstrapTable.defaults, {
+  var Utils = $.fn.bootstrapTable.utils;
+  Object.assign($.fn.bootstrapTable.defaults, {
     stickyHeader: false,
     stickyHeaderOffsetY: 0,
     stickyHeaderOffsetLeft: 0,
     stickyHeaderOffsetRight: 0
   });
-  $$3.BootstrapTable = /*#__PURE__*/function (_$$BootstrapTable) {
+  $.BootstrapTable = /*#__PURE__*/function (_$$BootstrapTable) {
     function _class() {
       _classCallCheck(this, _class);
       return _callSuper(this, _class, arguments);
@@ -18843,12 +24489,11 @@
     return _createClass(_class, [{
       key: "initHeader",
       value: function initHeader() {
-        var _get2,
-          _this = this;
+        var _this = this;
         for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
           args[_key] = arguments[_key];
         }
-        (_get2 = _get(_getPrototypeOf(_class.prototype), "initHeader", this)).call.apply(_get2, [this].concat(args));
+        _superPropGet(_class, "initHeader", this)(args);
         if (!this.options.stickyHeader) {
           return;
         }
@@ -18868,10 +24513,10 @@
         // render sticky on window scroll or resize
         var resizeEvent = Utils.getEventName('resize.sticky-header-table', this.$el.attr('id'));
         var scrollEvent = Utils.getEventName('scroll.sticky-header-table', this.$el.attr('id'));
-        $$3(window).off(resizeEvent).on(resizeEvent, function () {
+        $(window).off(resizeEvent).on(resizeEvent, function () {
           return _this.renderStickyHeader();
         });
-        $$3(window).off(scrollEvent).on(scrollEvent, function () {
+        $(window).off(scrollEvent).on(scrollEvent, function () {
           return _this.renderStickyHeader();
         });
         this.$tableBody.off('scroll').on('scroll', function () {
@@ -18883,37 +24528,44 @@
       value: function onColumnSearch(_ref) {
         var currentTarget = _ref.currentTarget,
           keyCode = _ref.keyCode;
-        _get(_getPrototypeOf(_class.prototype), "onColumnSearch", this).call(this, {
+        _superPropGet(_class, "onColumnSearch", this)([{
           currentTarget: currentTarget,
           keyCode: keyCode
-        });
+        }]);
+        if (!this.options.stickyHeader) {
+          return;
+        }
         this.renderStickyHeader();
       }
     }, {
       key: "resetView",
       value: function resetView() {
-        var _get3,
-          _this2 = this;
+        var _this2 = this;
         for (var _len2 = arguments.length, args = new Array(_len2), _key2 = 0; _key2 < _len2; _key2++) {
           args[_key2] = arguments[_key2];
         }
-        (_get3 = _get(_getPrototypeOf(_class.prototype), "resetView", this)).call.apply(_get3, [this].concat(args));
-        $$3('.bootstrap-table.fullscreen').off('scroll').on('scroll', function () {
+        _superPropGet(_class, "resetView", this)(args);
+        if (!this.options.stickyHeader) {
+          return;
+        }
+        $('.bootstrap-table.fullscreen').off('scroll').on('scroll', function () {
           return _this2.renderStickyHeader();
         });
       }
     }, {
       key: "getCaret",
       value: function getCaret() {
-        var _get4;
         for (var _len3 = arguments.length, args = new Array(_len3), _key3 = 0; _key3 < _len3; _key3++) {
           args[_key3] = arguments[_key3];
         }
-        (_get4 = _get(_getPrototypeOf(_class.prototype), "getCaret", this)).call.apply(_get4, [this].concat(args));
+        _superPropGet(_class, "getCaret", this)(args);
+        if (!this.options.stickyHeader) {
+          return;
+        }
         if (this.$stickyHeader) {
           var $ths = this.$stickyHeader.find('th');
           this.$header.find('th').each(function (i, th) {
-            $ths.eq(i).find('.sortable').attr('class', $$3(th).find('.sortable').attr('class'));
+            $ths.eq(i).find('.sortable').attr('class', $(th).find('.sortable').attr('class'));
           });
         }
       }
@@ -18921,7 +24573,10 @@
       key: "horizontalScroll",
       value: function horizontalScroll() {
         var _this3 = this;
-        _get(_getPrototypeOf(_class.prototype), "horizontalScroll", this).call(this);
+        _superPropGet(_class, "horizontalScroll", this)([]);
+        if (!this.options.stickyHeader) {
+          return;
+        }
         this.$tableBody.on('scroll', function () {
           return _this3.matchPositionX();
         });
@@ -18933,8 +24588,8 @@
         var that = this;
         this.$stickyHeader = this.$header.clone(true, true);
         if (this.options.filterControl) {
-          $$3(this.$stickyHeader).off('keyup change mouseup').on('keyup change mouse', function (e) {
-            var $target = $$3(e.target);
+          $(this.$stickyHeader).off('keyup change mouseup').on('keyup change mouse', function (e) {
+            var $target = $(e.target);
             var value = $target.val();
             var field = $target.parents('th').data('field');
             var $coreTh = that.$header.find("th[data-field=\"".concat(field, "\"]"));
@@ -18948,7 +24603,7 @@
             that.triggerSearch();
           });
         }
-        var top = $$3(window).scrollTop();
+        var top = $(window).scrollTop();
         // top anchor scroll position, minus header height
         var start = this.$stickyBegin.offset().top - this.options.stickyHeaderOffsetY;
         // bottom anchor scroll position, minus header height, minus sticky height
@@ -18958,8 +24613,8 @@
         if (top > start && top <= end) {
           // ensure clone and source column widths are the same
           this.$stickyHeader.find('tr').each(function (indexRows, rows) {
-            $$3(rows).find('th').each(function (index, el) {
-              $$3(el).css('min-width', _this4.$header.find("tr:eq(".concat(indexRows, ")")).find("th:eq(".concat(index, ")")).css('width'));
+            $(rows).find('th').each(function (index, el) {
+              $(el).css('min-width', _this4.$header.find("tr:eq(".concat(indexRows, ")")).find("th:eq(".concat(index, ")")).css('width'));
             });
           });
           // match bootstrap table style
@@ -18985,7 +24640,7 @@
           this.$stickyContainer.css('right', "".concat(stickyHeaderOffsetRight, "px"));
           this.$stickyContainer.css('width', "".concat(width));
           // create scrollable container for header
-          this.$stickyTable = $$3('<table/>');
+          this.$stickyTable = $('<table/>');
           this.$stickyTable.addClass(this.options.classes);
           // append cloned header to dom
           this.$stickyContainer.html(this.$stickyTable.append(this.$stickyHeader));
@@ -19001,7 +24656,7 @@
         this.$stickyContainer.scrollLeft(this.$tableBody.scrollLeft());
       }
     }]);
-  }($$3.BootstrapTable);
+  }($.BootstrapTable);
 
 }));
 
@@ -19009,11 +24664,63 @@
   typeof exports === 'object' && typeof module !== 'undefined' ? factory(require('jquery')) :
   typeof define === 'function' && define.amd ? define(['jquery'], factory) :
   (global = typeof globalThis !== 'undefined' ? globalThis : global || self, factory(global.jQuery));
-})(this, (function ($$6) { 'use strict';
+})(this, (function ($) { 'use strict';
 
+  function _arrayLikeToArray(r, a) {
+    (null == a || a > r.length) && (a = r.length);
+    for (var e = 0, n = Array(a); e < a; e++) n[e] = r[e];
+    return n;
+  }
+  function _arrayWithHoles(r) {
+    if (Array.isArray(r)) return r;
+  }
+  function _assertThisInitialized(e) {
+    if (void 0 === e) throw new ReferenceError("this hasn't been initialised - super() hasn't been called");
+    return e;
+  }
   function _callSuper(t, o, e) {
     return o = _getPrototypeOf(o), _possibleConstructorReturn(t, _isNativeReflectConstruct() ? Reflect.construct(o, e || [], _getPrototypeOf(t).constructor) : o.apply(t, e));
   }
+  function _classCallCheck(a, n) {
+    if (!(a instanceof n)) throw new TypeError("Cannot call a class as a function");
+  }
+  function _defineProperties(e, r) {
+    for (var t = 0; t < r.length; t++) {
+      var o = r[t];
+      o.enumerable = o.enumerable || !1, o.configurable = !0, "value" in o && (o.writable = !0), Object.defineProperty(e, _toPropertyKey(o.key), o);
+    }
+  }
+  function _createClass(e, r, t) {
+    return _defineProperties(e.prototype, r), Object.defineProperty(e, "prototype", {
+      writable: !1
+    }), e;
+  }
+  function _get() {
+    return _get = "undefined" != typeof Reflect && Reflect.get ? Reflect.get.bind() : function (e, t, r) {
+      var p = _superPropBase(e, t);
+      if (p) {
+        var n = Object.getOwnPropertyDescriptor(p, t);
+        return n.get ? n.get.call(arguments.length < 3 ? e : r) : n.value;
+      }
+    }, _get.apply(null, arguments);
+  }
+  function _getPrototypeOf(t) {
+    return _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf.bind() : function (t) {
+      return t.__proto__ || Object.getPrototypeOf(t);
+    }, _getPrototypeOf(t);
+  }
+  function _inherits(t, e) {
+    if ("function" != typeof e && null !== e) throw new TypeError("Super expression must either be null or a function");
+    t.prototype = Object.create(e && e.prototype, {
+      constructor: {
+        value: t,
+        writable: !0,
+        configurable: !0
+      }
+    }), Object.defineProperty(t, "prototype", {
+      writable: !1
+    }), e && _setPrototypeOf(t, e);
+  }
   function _isNativeReflectConstruct() {
     try {
       var t = !Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {}));
@@ -19033,10 +24740,7 @@
         f = !0,
         o = !1;
       try {
-        if (i = (t = t.call(r)).next, 0 === l) {
-          if (Object(t) !== t) return;
-          f = !1;
-        } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0);
+        if (i = (t = t.call(r)).next, 0 === l) ; else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0);
       } catch (r) {
         o = !0, n = r;
       } finally {
@@ -19049,3109 +24753,4257 @@
       return a;
     }
   }
+  function _nonIterableRest() {
+    throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.");
+  }
+  function _possibleConstructorReturn(t, e) {
+    if (e && ("object" == typeof e || "function" == typeof e)) return e;
+    if (void 0 !== e) throw new TypeError("Derived constructors may only return object or undefined");
+    return _assertThisInitialized(t);
+  }
+  function _setPrototypeOf(t, e) {
+    return _setPrototypeOf = Object.setPrototypeOf ? Object.setPrototypeOf.bind() : function (t, e) {
+      return t.__proto__ = e, t;
+    }, _setPrototypeOf(t, e);
+  }
+  function _slicedToArray(r, e) {
+    return _arrayWithHoles(r) || _iterableToArrayLimit(r, e) || _unsupportedIterableToArray(r, e) || _nonIterableRest();
+  }
+  function _superPropBase(t, o) {
+    for (; !{}.hasOwnProperty.call(t, o) && null !== (t = _getPrototypeOf(t)););
+    return t;
+  }
+  function _superPropGet(t, o, e, r) {
+    var p = _get(_getPrototypeOf(t.prototype ), o, e);
+    return "function" == typeof p ? function (t) {
+      return p.apply(e, t);
+    } : p;
+  }
   function _toPrimitive(t, r) {
     if ("object" != typeof t || !t) return t;
     var e = t[Symbol.toPrimitive];
     if (void 0 !== e) {
-      var i = e.call(t, r || "default");
+      var i = e.call(t, r);
       if ("object" != typeof i) return i;
       throw new TypeError("@@toPrimitive must return a primitive value.");
     }
-    return ("string" === r ? String : Number)(t);
+    return (String )(t);
   }
   function _toPropertyKey(t) {
     var i = _toPrimitive(t, "string");
     return "symbol" == typeof i ? i : i + "";
   }
-  function _classCallCheck(instance, Constructor) {
-    if (!(instance instanceof Constructor)) {
-      throw new TypeError("Cannot call a class as a function");
+  function _unsupportedIterableToArray(r, a) {
+    if (r) {
+      if ("string" == typeof r) return _arrayLikeToArray(r, a);
+      var t = {}.toString.call(r).slice(8, -1);
+      return "Object" === t && r.constructor && (t = r.constructor.name), "Map" === t || "Set" === t ? Array.from(r) : "Arguments" === t || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(t) ? _arrayLikeToArray(r, a) : void 0;
     }
   }
-  function _defineProperties(target, props) {
-    for (var i = 0; i < props.length; i++) {
-      var descriptor = props[i];
-      descriptor.enumerable = descriptor.enumerable || false;
-      descriptor.configurable = true;
-      if ("value" in descriptor) descriptor.writable = true;
-      Object.defineProperty(target, _toPropertyKey(descriptor.key), descriptor);
-    }
-  }
-  function _createClass(Constructor, protoProps, staticProps) {
-    if (protoProps) _defineProperties(Constructor.prototype, protoProps);
-    if (staticProps) _defineProperties(Constructor, staticProps);
-    Object.defineProperty(Constructor, "prototype", {
-      writable: false
-    });
-    return Constructor;
-  }
-  function _inherits(subClass, superClass) {
-    if (typeof superClass !== "function" && superClass !== null) {
-      throw new TypeError("Super expression must either be null or a function");
-    }
-    subClass.prototype = Object.create(superClass && superClass.prototype, {
-      constructor: {
-        value: subClass,
-        writable: true,
-        configurable: true
-      }
-    });
-    Object.defineProperty(subClass, "prototype", {
-      writable: false
-    });
-    if (superClass) _setPrototypeOf(subClass, superClass);
-  }
-  function _getPrototypeOf(o) {
-    _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf.bind() : function _getPrototypeOf(o) {
-      return o.__proto__ || Object.getPrototypeOf(o);
-    };
-    return _getPrototypeOf(o);
-  }
-  function _setPrototypeOf(o, p) {
-    _setPrototypeOf = Object.setPrototypeOf ? Object.setPrototypeOf.bind() : function _setPrototypeOf(o, p) {
-      o.__proto__ = p;
-      return o;
-    };
-    return _setPrototypeOf(o, p);
-  }
-  function _assertThisInitialized(self) {
-    if (self === void 0) {
-      throw new ReferenceError("this hasn't been initialised - super() hasn't been called");
-    }
-    return self;
-  }
-  function _possibleConstructorReturn(self, call) {
-    if (call && (typeof call === "object" || typeof call === "function")) {
-      return call;
-    } else if (call !== void 0) {
-      throw new TypeError("Derived constructors may only return object or undefined");
-    }
-    return _assertThisInitialized(self);
-  }
-  function _superPropBase(object, property) {
-    while (!Object.prototype.hasOwnProperty.call(object, property)) {
-      object = _getPrototypeOf(object);
-      if (object === null) break;
-    }
-    return object;
-  }
-  function _get() {
-    if (typeof Reflect !== "undefined" && Reflect.get) {
-      _get = Reflect.get.bind();
-    } else {
-      _get = function _get(target, property, receiver) {
-        var base = _superPropBase(target, property);
-        if (!base) return;
-        var desc = Object.getOwnPropertyDescriptor(base, property);
-        if (desc.get) {
-          return desc.get.call(arguments.length < 3 ? target : receiver);
-        }
-        return desc.value;
-      };
-    }
-    return _get.apply(this, arguments);
-  }
-  function _slicedToArray(arr, i) {
-    return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest();
-  }
-  function _arrayWithHoles(arr) {
-    if (Array.isArray(arr)) return arr;
-  }
-  function _unsupportedIterableToArray(o, minLen) {
-    if (!o) return;
-    if (typeof o === "string") return _arrayLikeToArray(o, minLen);
-    var n = Object.prototype.toString.call(o).slice(8, -1);
-    if (n === "Object" && o.constructor) n = o.constructor.name;
-    if (n === "Map" || n === "Set") return Array.from(o);
-    if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen);
-  }
-  function _arrayLikeToArray(arr, len) {
-    if (len == null || len > arr.length) len = arr.length;
-    for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i];
-    return arr2;
-  }
-  function _nonIterableRest() {
-    throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.");
-  }
 
   var commonjsGlobal = typeof globalThis !== 'undefined' ? globalThis : typeof window !== 'undefined' ? window : typeof global !== 'undefined' ? global : typeof self !== 'undefined' ? self : {};
 
-  var check = function (it) {
-    return it && it.Math === Math && it;
-  };
+  var es_array_concat = {};
 
-  // https://github.com/zloirock/core-js/issues/86#issuecomment-115759028
-  var global$g =
-    // eslint-disable-next-line es/no-global-this -- safe
-    check(typeof globalThis == 'object' && globalThis) ||
-    check(typeof window == 'object' && window) ||
-    // eslint-disable-next-line no-restricted-globals -- safe
-    check(typeof self == 'object' && self) ||
-    check(typeof commonjsGlobal == 'object' && commonjsGlobal) ||
-    check(typeof commonjsGlobal == 'object' && commonjsGlobal) ||
-    // eslint-disable-next-line no-new-func -- fallback
-    (function () { return this; })() || Function('return this')();
+  var globalThis_1;
+  var hasRequiredGlobalThis;
+
+  function requireGlobalThis () {
+  	if (hasRequiredGlobalThis) return globalThis_1;
+  	hasRequiredGlobalThis = 1;
+  	var check = function (it) {
+  	  return it && it.Math === Math && it;
+  	};
+
+  	// https://github.com/zloirock/core-js/issues/86#issuecomment-115759028
+  	globalThis_1 =
+  	  // eslint-disable-next-line es/no-global-this -- safe
+  	  check(typeof globalThis == 'object' && globalThis) ||
+  	  check(typeof window == 'object' && window) ||
+  	  // eslint-disable-next-line no-restricted-globals -- safe
+  	  check(typeof self == 'object' && self) ||
+  	  check(typeof commonjsGlobal == 'object' && commonjsGlobal) ||
+  	  check(typeof globalThis_1 == 'object' && globalThis_1) ||
+  	  // eslint-disable-next-line no-new-func -- fallback
+  	  (function () { return this; })() || Function('return this')();
+  	return globalThis_1;
+  }
 
   var objectGetOwnPropertyDescriptor = {};
 
-  var fails$l = function (exec) {
-    try {
-      return !!exec();
-    } catch (error) {
-      return true;
-    }
-  };
+  var fails;
+  var hasRequiredFails;
 
-  var fails$k = fails$l;
+  function requireFails () {
+  	if (hasRequiredFails) return fails;
+  	hasRequiredFails = 1;
+  	fails = function (exec) {
+  	  try {
+  	    return !!exec();
+  	  } catch (error) {
+  	    return true;
+  	  }
+  	};
+  	return fails;
+  }
 
-  // Detect IE8's incomplete defineProperty implementation
-  var descriptors = !fails$k(function () {
-    // eslint-disable-next-line es/no-object-defineproperty -- required for testing
-    return Object.defineProperty({}, 1, { get: function () { return 7; } })[1] !== 7;
-  });
+  var descriptors;
+  var hasRequiredDescriptors;
 
-  var fails$j = fails$l;
+  function requireDescriptors () {
+  	if (hasRequiredDescriptors) return descriptors;
+  	hasRequiredDescriptors = 1;
+  	var fails = requireFails();
 
-  var functionBindNative = !fails$j(function () {
-    // eslint-disable-next-line es/no-function-prototype-bind -- safe
-    var test = (function () { /* empty */ }).bind();
-    // eslint-disable-next-line no-prototype-builtins -- safe
-    return typeof test != 'function' || test.hasOwnProperty('prototype');
-  });
+  	// Detect IE8's incomplete defineProperty implementation
+  	descriptors = !fails(function () {
+  	  // eslint-disable-next-line es/no-object-defineproperty -- required for testing
+  	  return Object.defineProperty({}, 1, { get: function () { return 7; } })[1] !== 7;
+  	});
+  	return descriptors;
+  }
 
-  var NATIVE_BIND$2 = functionBindNative;
+  var functionBindNative;
+  var hasRequiredFunctionBindNative;
 
-  var call$d = Function.prototype.call;
+  function requireFunctionBindNative () {
+  	if (hasRequiredFunctionBindNative) return functionBindNative;
+  	hasRequiredFunctionBindNative = 1;
+  	var fails = requireFails();
 
-  var functionCall = NATIVE_BIND$2 ? call$d.bind(call$d) : function () {
-    return call$d.apply(call$d, arguments);
-  };
+  	functionBindNative = !fails(function () {
+  	  // eslint-disable-next-line es/no-function-prototype-bind -- safe
+  	  var test = (function () { /* empty */ }).bind();
+  	  // eslint-disable-next-line no-prototype-builtins -- safe
+  	  return typeof test != 'function' || test.hasOwnProperty('prototype');
+  	});
+  	return functionBindNative;
+  }
+
+  var functionCall;
+  var hasRequiredFunctionCall;
+
+  function requireFunctionCall () {
+  	if (hasRequiredFunctionCall) return functionCall;
+  	hasRequiredFunctionCall = 1;
+  	var NATIVE_BIND = requireFunctionBindNative();
+
+  	var call = Function.prototype.call;
+
+  	functionCall = NATIVE_BIND ? call.bind(call) : function () {
+  	  return call.apply(call, arguments);
+  	};
+  	return functionCall;
+  }
 
   var objectPropertyIsEnumerable = {};
 
-  var $propertyIsEnumerable$1 = {}.propertyIsEnumerable;
-  // eslint-disable-next-line es/no-object-getownpropertydescriptor -- safe
-  var getOwnPropertyDescriptor$2 = Object.getOwnPropertyDescriptor;
+  var hasRequiredObjectPropertyIsEnumerable;
 
-  // Nashorn ~ JDK8 bug
-  var NASHORN_BUG = getOwnPropertyDescriptor$2 && !$propertyIsEnumerable$1.call({ 1: 2 }, 1);
+  function requireObjectPropertyIsEnumerable () {
+  	if (hasRequiredObjectPropertyIsEnumerable) return objectPropertyIsEnumerable;
+  	hasRequiredObjectPropertyIsEnumerable = 1;
+  	var $propertyIsEnumerable = {}.propertyIsEnumerable;
+  	// eslint-disable-next-line es/no-object-getownpropertydescriptor -- safe
+  	var getOwnPropertyDescriptor = Object.getOwnPropertyDescriptor;
 
-  // `Object.prototype.propertyIsEnumerable` method implementation
-  // https://tc39.es/ecma262/#sec-object.prototype.propertyisenumerable
-  objectPropertyIsEnumerable.f = NASHORN_BUG ? function propertyIsEnumerable(V) {
-    var descriptor = getOwnPropertyDescriptor$2(this, V);
-    return !!descriptor && descriptor.enumerable;
-  } : $propertyIsEnumerable$1;
+  	// Nashorn ~ JDK8 bug
+  	var NASHORN_BUG = getOwnPropertyDescriptor && !$propertyIsEnumerable.call({ 1: 2 }, 1);
 
-  var createPropertyDescriptor$5 = function (bitmap, value) {
-    return {
-      enumerable: !(bitmap & 1),
-      configurable: !(bitmap & 2),
-      writable: !(bitmap & 4),
-      value: value
-    };
-  };
-
-  var NATIVE_BIND$1 = functionBindNative;
-
-  var FunctionPrototype$1 = Function.prototype;
-  var call$c = FunctionPrototype$1.call;
-  var uncurryThisWithBind = NATIVE_BIND$1 && FunctionPrototype$1.bind.bind(call$c, call$c);
-
-  var functionUncurryThis = NATIVE_BIND$1 ? uncurryThisWithBind : function (fn) {
-    return function () {
-      return call$c.apply(fn, arguments);
-    };
-  };
-
-  var uncurryThis$i = functionUncurryThis;
-
-  var toString$7 = uncurryThis$i({}.toString);
-  var stringSlice$4 = uncurryThis$i(''.slice);
-
-  var classofRaw$2 = function (it) {
-    return stringSlice$4(toString$7(it), 8, -1);
-  };
-
-  var uncurryThis$h = functionUncurryThis;
-  var fails$i = fails$l;
-  var classof$8 = classofRaw$2;
-
-  var $Object$4 = Object;
-  var split$1 = uncurryThis$h(''.split);
-
-  // fallback for non-array-like ES3 and non-enumerable old V8 strings
-  var indexedObject = fails$i(function () {
-    // throws an error in rhino, see https://github.com/mozilla/rhino/issues/346
-    // eslint-disable-next-line no-prototype-builtins -- safe
-    return !$Object$4('z').propertyIsEnumerable(0);
-  }) ? function (it) {
-    return classof$8(it) === 'String' ? split$1(it, '') : $Object$4(it);
-  } : $Object$4;
-
-  // we can't use just `it == null` since of `document.all` special case
-  // https://tc39.es/ecma262/#sec-IsHTMLDDA-internal-slot-aec
-  var isNullOrUndefined$4 = function (it) {
-    return it === null || it === undefined;
-  };
-
-  var isNullOrUndefined$3 = isNullOrUndefined$4;
-
-  var $TypeError$b = TypeError;
-
-  // `RequireObjectCoercible` abstract operation
-  // https://tc39.es/ecma262/#sec-requireobjectcoercible
-  var requireObjectCoercible$5 = function (it) {
-    if (isNullOrUndefined$3(it)) throw new $TypeError$b("Can't call method on " + it);
-    return it;
-  };
-
-  // toObject with fallback for non-array-like ES3 strings
-  var IndexedObject$1 = indexedObject;
-  var requireObjectCoercible$4 = requireObjectCoercible$5;
-
-  var toIndexedObject$6 = function (it) {
-    return IndexedObject$1(requireObjectCoercible$4(it));
-  };
-
-  // https://tc39.es/ecma262/#sec-IsHTMLDDA-internal-slot
-  var documentAll = typeof document == 'object' && document.all;
-
-  // `IsCallable` abstract operation
-  // https://tc39.es/ecma262/#sec-iscallable
-  // eslint-disable-next-line unicorn/no-typeof-undefined -- required for testing
-  var isCallable$h = typeof documentAll == 'undefined' && documentAll !== undefined ? function (argument) {
-    return typeof argument == 'function' || argument === documentAll;
-  } : function (argument) {
-    return typeof argument == 'function';
-  };
-
-  var isCallable$g = isCallable$h;
-
-  var isObject$b = function (it) {
-    return typeof it == 'object' ? it !== null : isCallable$g(it);
-  };
-
-  var global$f = global$g;
-  var isCallable$f = isCallable$h;
-
-  var aFunction = function (argument) {
-    return isCallable$f(argument) ? argument : undefined;
-  };
-
-  var getBuiltIn$4 = function (namespace, method) {
-    return arguments.length < 2 ? aFunction(global$f[namespace]) : global$f[namespace] && global$f[namespace][method];
-  };
-
-  var uncurryThis$g = functionUncurryThis;
-
-  var objectIsPrototypeOf = uncurryThis$g({}.isPrototypeOf);
-
-  var engineUserAgent = typeof navigator != 'undefined' && String(navigator.userAgent) || '';
-
-  var global$e = global$g;
-  var userAgent = engineUserAgent;
-
-  var process = global$e.process;
-  var Deno = global$e.Deno;
-  var versions = process && process.versions || Deno && Deno.version;
-  var v8 = versions && versions.v8;
-  var match, version;
-
-  if (v8) {
-    match = v8.split('.');
-    // in old Chrome, versions of V8 isn't V8 = Chrome / 10
-    // but their correct versions are not interesting for us
-    version = match[0] > 0 && match[0] < 4 ? 1 : +(match[0] + match[1]);
+  	// `Object.prototype.propertyIsEnumerable` method implementation
+  	// https://tc39.es/ecma262/#sec-object.prototype.propertyisenumerable
+  	objectPropertyIsEnumerable.f = NASHORN_BUG ? function propertyIsEnumerable(V) {
+  	  var descriptor = getOwnPropertyDescriptor(this, V);
+  	  return !!descriptor && descriptor.enumerable;
+  	} : $propertyIsEnumerable;
+  	return objectPropertyIsEnumerable;
   }
 
-  // BrowserFS NodeJS `process` polyfill incorrectly set `.v8` to `0.0`
-  // so check `userAgent` even if `.v8` exists, but 0
-  if (!version && userAgent) {
-    match = userAgent.match(/Edge\/(\d+)/);
-    if (!match || match[1] >= 74) {
-      match = userAgent.match(/Chrome\/(\d+)/);
-      if (match) version = +match[1];
-    }
+  var createPropertyDescriptor;
+  var hasRequiredCreatePropertyDescriptor;
+
+  function requireCreatePropertyDescriptor () {
+  	if (hasRequiredCreatePropertyDescriptor) return createPropertyDescriptor;
+  	hasRequiredCreatePropertyDescriptor = 1;
+  	createPropertyDescriptor = function (bitmap, value) {
+  	  return {
+  	    enumerable: !(bitmap & 1),
+  	    configurable: !(bitmap & 2),
+  	    writable: !(bitmap & 4),
+  	    value: value
+  	  };
+  	};
+  	return createPropertyDescriptor;
   }
 
-  var engineV8Version = version;
+  var functionUncurryThis;
+  var hasRequiredFunctionUncurryThis;
 
-  /* eslint-disable es/no-symbol -- required for testing */
-  var V8_VERSION$2 = engineV8Version;
-  var fails$h = fails$l;
-  var global$d = global$g;
+  function requireFunctionUncurryThis () {
+  	if (hasRequiredFunctionUncurryThis) return functionUncurryThis;
+  	hasRequiredFunctionUncurryThis = 1;
+  	var NATIVE_BIND = requireFunctionBindNative();
 
-  var $String$5 = global$d.String;
+  	var FunctionPrototype = Function.prototype;
+  	var call = FunctionPrototype.call;
+  	var uncurryThisWithBind = NATIVE_BIND && FunctionPrototype.bind.bind(call, call);
 
-  // eslint-disable-next-line es/no-object-getownpropertysymbols -- required for testing
-  var symbolConstructorDetection = !!Object.getOwnPropertySymbols && !fails$h(function () {
-    var symbol = Symbol('symbol detection');
-    // Chrome 38 Symbol has incorrect toString conversion
-    // `get-own-property-symbols` polyfill symbols converted to object are not Symbol instances
-    // nb: Do not call `String` directly to avoid this being optimized out to `symbol+''` which will,
-    // of course, fail.
-    return !$String$5(symbol) || !(Object(symbol) instanceof Symbol) ||
-      // Chrome 38-40 symbols are not inherited from DOM collections prototypes to instances
-      !Symbol.sham && V8_VERSION$2 && V8_VERSION$2 < 41;
-  });
+  	functionUncurryThis = NATIVE_BIND ? uncurryThisWithBind : function (fn) {
+  	  return function () {
+  	    return call.apply(fn, arguments);
+  	  };
+  	};
+  	return functionUncurryThis;
+  }
 
-  /* eslint-disable es/no-symbol -- required for testing */
-  var NATIVE_SYMBOL$1 = symbolConstructorDetection;
+  var classofRaw;
+  var hasRequiredClassofRaw;
 
-  var useSymbolAsUid = NATIVE_SYMBOL$1
-    && !Symbol.sham
-    && typeof Symbol.iterator == 'symbol';
+  function requireClassofRaw () {
+  	if (hasRequiredClassofRaw) return classofRaw;
+  	hasRequiredClassofRaw = 1;
+  	var uncurryThis = requireFunctionUncurryThis();
 
-  var getBuiltIn$3 = getBuiltIn$4;
-  var isCallable$e = isCallable$h;
-  var isPrototypeOf$2 = objectIsPrototypeOf;
-  var USE_SYMBOL_AS_UID$1 = useSymbolAsUid;
+  	var toString = uncurryThis({}.toString);
+  	var stringSlice = uncurryThis(''.slice);
 
-  var $Object$3 = Object;
+  	classofRaw = function (it) {
+  	  return stringSlice(toString(it), 8, -1);
+  	};
+  	return classofRaw;
+  }
 
-  var isSymbol$2 = USE_SYMBOL_AS_UID$1 ? function (it) {
-    return typeof it == 'symbol';
-  } : function (it) {
-    var $Symbol = getBuiltIn$3('Symbol');
-    return isCallable$e($Symbol) && isPrototypeOf$2($Symbol.prototype, $Object$3(it));
-  };
+  var indexedObject;
+  var hasRequiredIndexedObject;
 
-  var $String$4 = String;
+  function requireIndexedObject () {
+  	if (hasRequiredIndexedObject) return indexedObject;
+  	hasRequiredIndexedObject = 1;
+  	var uncurryThis = requireFunctionUncurryThis();
+  	var fails = requireFails();
+  	var classof = requireClassofRaw();
 
-  var tryToString$2 = function (argument) {
-    try {
-      return $String$4(argument);
-    } catch (error) {
-      return 'Object';
-    }
-  };
+  	var $Object = Object;
+  	var split = uncurryThis(''.split);
 
-  var isCallable$d = isCallable$h;
-  var tryToString$1 = tryToString$2;
+  	// fallback for non-array-like ES3 and non-enumerable old V8 strings
+  	indexedObject = fails(function () {
+  	  // throws an error in rhino, see https://github.com/mozilla/rhino/issues/346
+  	  // eslint-disable-next-line no-prototype-builtins -- safe
+  	  return !$Object('z').propertyIsEnumerable(0);
+  	}) ? function (it) {
+  	  return classof(it) === 'String' ? split(it, '') : $Object(it);
+  	} : $Object;
+  	return indexedObject;
+  }
 
-  var $TypeError$a = TypeError;
+  var isNullOrUndefined;
+  var hasRequiredIsNullOrUndefined;
 
-  // `Assert: IsCallable(argument) is true`
-  var aCallable$4 = function (argument) {
-    if (isCallable$d(argument)) return argument;
-    throw new $TypeError$a(tryToString$1(argument) + ' is not a function');
-  };
+  function requireIsNullOrUndefined () {
+  	if (hasRequiredIsNullOrUndefined) return isNullOrUndefined;
+  	hasRequiredIsNullOrUndefined = 1;
+  	// we can't use just `it == null` since of `document.all` special case
+  	// https://tc39.es/ecma262/#sec-IsHTMLDDA-internal-slot-aec
+  	isNullOrUndefined = function (it) {
+  	  return it === null || it === undefined;
+  	};
+  	return isNullOrUndefined;
+  }
 
-  var aCallable$3 = aCallable$4;
-  var isNullOrUndefined$2 = isNullOrUndefined$4;
+  var requireObjectCoercible;
+  var hasRequiredRequireObjectCoercible;
 
-  // `GetMethod` abstract operation
-  // https://tc39.es/ecma262/#sec-getmethod
-  var getMethod$3 = function (V, P) {
-    var func = V[P];
-    return isNullOrUndefined$2(func) ? undefined : aCallable$3(func);
-  };
+  function requireRequireObjectCoercible () {
+  	if (hasRequiredRequireObjectCoercible) return requireObjectCoercible;
+  	hasRequiredRequireObjectCoercible = 1;
+  	var isNullOrUndefined = requireIsNullOrUndefined();
 
-  var call$b = functionCall;
-  var isCallable$c = isCallable$h;
-  var isObject$a = isObject$b;
+  	var $TypeError = TypeError;
 
-  var $TypeError$9 = TypeError;
+  	// `RequireObjectCoercible` abstract operation
+  	// https://tc39.es/ecma262/#sec-requireobjectcoercible
+  	requireObjectCoercible = function (it) {
+  	  if (isNullOrUndefined(it)) throw new $TypeError("Can't call method on " + it);
+  	  return it;
+  	};
+  	return requireObjectCoercible;
+  }
 
-  // `OrdinaryToPrimitive` abstract operation
-  // https://tc39.es/ecma262/#sec-ordinarytoprimitive
-  var ordinaryToPrimitive$1 = function (input, pref) {
-    var fn, val;
-    if (pref === 'string' && isCallable$c(fn = input.toString) && !isObject$a(val = call$b(fn, input))) return val;
-    if (isCallable$c(fn = input.valueOf) && !isObject$a(val = call$b(fn, input))) return val;
-    if (pref !== 'string' && isCallable$c(fn = input.toString) && !isObject$a(val = call$b(fn, input))) return val;
-    throw new $TypeError$9("Can't convert object to primitive value");
-  };
+  var toIndexedObject;
+  var hasRequiredToIndexedObject;
+
+  function requireToIndexedObject () {
+  	if (hasRequiredToIndexedObject) return toIndexedObject;
+  	hasRequiredToIndexedObject = 1;
+  	// toObject with fallback for non-array-like ES3 strings
+  	var IndexedObject = requireIndexedObject();
+  	var requireObjectCoercible = requireRequireObjectCoercible();
+
+  	toIndexedObject = function (it) {
+  	  return IndexedObject(requireObjectCoercible(it));
+  	};
+  	return toIndexedObject;
+  }
+
+  var isCallable;
+  var hasRequiredIsCallable;
+
+  function requireIsCallable () {
+  	if (hasRequiredIsCallable) return isCallable;
+  	hasRequiredIsCallable = 1;
+  	// https://tc39.es/ecma262/#sec-IsHTMLDDA-internal-slot
+  	var documentAll = typeof document == 'object' && document.all;
+
+  	// `IsCallable` abstract operation
+  	// https://tc39.es/ecma262/#sec-iscallable
+  	// eslint-disable-next-line unicorn/no-typeof-undefined -- required for testing
+  	isCallable = typeof documentAll == 'undefined' && documentAll !== undefined ? function (argument) {
+  	  return typeof argument == 'function' || argument === documentAll;
+  	} : function (argument) {
+  	  return typeof argument == 'function';
+  	};
+  	return isCallable;
+  }
+
+  var isObject;
+  var hasRequiredIsObject;
+
+  function requireIsObject () {
+  	if (hasRequiredIsObject) return isObject;
+  	hasRequiredIsObject = 1;
+  	var isCallable = requireIsCallable();
+
+  	isObject = function (it) {
+  	  return typeof it == 'object' ? it !== null : isCallable(it);
+  	};
+  	return isObject;
+  }
+
+  var getBuiltIn;
+  var hasRequiredGetBuiltIn;
+
+  function requireGetBuiltIn () {
+  	if (hasRequiredGetBuiltIn) return getBuiltIn;
+  	hasRequiredGetBuiltIn = 1;
+  	var globalThis = requireGlobalThis();
+  	var isCallable = requireIsCallable();
+
+  	var aFunction = function (argument) {
+  	  return isCallable(argument) ? argument : undefined;
+  	};
+
+  	getBuiltIn = function (namespace, method) {
+  	  return arguments.length < 2 ? aFunction(globalThis[namespace]) : globalThis[namespace] && globalThis[namespace][method];
+  	};
+  	return getBuiltIn;
+  }
+
+  var objectIsPrototypeOf;
+  var hasRequiredObjectIsPrototypeOf;
+
+  function requireObjectIsPrototypeOf () {
+  	if (hasRequiredObjectIsPrototypeOf) return objectIsPrototypeOf;
+  	hasRequiredObjectIsPrototypeOf = 1;
+  	var uncurryThis = requireFunctionUncurryThis();
+
+  	objectIsPrototypeOf = uncurryThis({}.isPrototypeOf);
+  	return objectIsPrototypeOf;
+  }
+
+  var environmentUserAgent;
+  var hasRequiredEnvironmentUserAgent;
+
+  function requireEnvironmentUserAgent () {
+  	if (hasRequiredEnvironmentUserAgent) return environmentUserAgent;
+  	hasRequiredEnvironmentUserAgent = 1;
+  	var globalThis = requireGlobalThis();
+
+  	var navigator = globalThis.navigator;
+  	var userAgent = navigator && navigator.userAgent;
+
+  	environmentUserAgent = userAgent ? String(userAgent) : '';
+  	return environmentUserAgent;
+  }
+
+  var environmentV8Version;
+  var hasRequiredEnvironmentV8Version;
+
+  function requireEnvironmentV8Version () {
+  	if (hasRequiredEnvironmentV8Version) return environmentV8Version;
+  	hasRequiredEnvironmentV8Version = 1;
+  	var globalThis = requireGlobalThis();
+  	var userAgent = requireEnvironmentUserAgent();
+
+  	var process = globalThis.process;
+  	var Deno = globalThis.Deno;
+  	var versions = process && process.versions || Deno && Deno.version;
+  	var v8 = versions && versions.v8;
+  	var match, version;
+
+  	if (v8) {
+  	  match = v8.split('.');
+  	  // in old Chrome, versions of V8 isn't V8 = Chrome / 10
+  	  // but their correct versions are not interesting for us
+  	  version = match[0] > 0 && match[0] < 4 ? 1 : +(match[0] + match[1]);
+  	}
+
+  	// BrowserFS NodeJS `process` polyfill incorrectly set `.v8` to `0.0`
+  	// so check `userAgent` even if `.v8` exists, but 0
+  	if (!version && userAgent) {
+  	  match = userAgent.match(/Edge\/(\d+)/);
+  	  if (!match || match[1] >= 74) {
+  	    match = userAgent.match(/Chrome\/(\d+)/);
+  	    if (match) version = +match[1];
+  	  }
+  	}
+
+  	environmentV8Version = version;
+  	return environmentV8Version;
+  }
+
+  var symbolConstructorDetection;
+  var hasRequiredSymbolConstructorDetection;
+
+  function requireSymbolConstructorDetection () {
+  	if (hasRequiredSymbolConstructorDetection) return symbolConstructorDetection;
+  	hasRequiredSymbolConstructorDetection = 1;
+  	/* eslint-disable es/no-symbol -- required for testing */
+  	var V8_VERSION = requireEnvironmentV8Version();
+  	var fails = requireFails();
+  	var globalThis = requireGlobalThis();
+
+  	var $String = globalThis.String;
+
+  	// eslint-disable-next-line es/no-object-getownpropertysymbols -- required for testing
+  	symbolConstructorDetection = !!Object.getOwnPropertySymbols && !fails(function () {
+  	  var symbol = Symbol('symbol detection');
+  	  // Chrome 38 Symbol has incorrect toString conversion
+  	  // `get-own-property-symbols` polyfill symbols converted to object are not Symbol instances
+  	  // nb: Do not call `String` directly to avoid this being optimized out to `symbol+''` which will,
+  	  // of course, fail.
+  	  return !$String(symbol) || !(Object(symbol) instanceof Symbol) ||
+  	    // Chrome 38-40 symbols are not inherited from DOM collections prototypes to instances
+  	    !Symbol.sham && V8_VERSION && V8_VERSION < 41;
+  	});
+  	return symbolConstructorDetection;
+  }
+
+  var useSymbolAsUid;
+  var hasRequiredUseSymbolAsUid;
+
+  function requireUseSymbolAsUid () {
+  	if (hasRequiredUseSymbolAsUid) return useSymbolAsUid;
+  	hasRequiredUseSymbolAsUid = 1;
+  	/* eslint-disable es/no-symbol -- required for testing */
+  	var NATIVE_SYMBOL = requireSymbolConstructorDetection();
+
+  	useSymbolAsUid = NATIVE_SYMBOL &&
+  	  !Symbol.sham &&
+  	  typeof Symbol.iterator == 'symbol';
+  	return useSymbolAsUid;
+  }
+
+  var isSymbol;
+  var hasRequiredIsSymbol;
+
+  function requireIsSymbol () {
+  	if (hasRequiredIsSymbol) return isSymbol;
+  	hasRequiredIsSymbol = 1;
+  	var getBuiltIn = requireGetBuiltIn();
+  	var isCallable = requireIsCallable();
+  	var isPrototypeOf = requireObjectIsPrototypeOf();
+  	var USE_SYMBOL_AS_UID = requireUseSymbolAsUid();
+
+  	var $Object = Object;
+
+  	isSymbol = USE_SYMBOL_AS_UID ? function (it) {
+  	  return typeof it == 'symbol';
+  	} : function (it) {
+  	  var $Symbol = getBuiltIn('Symbol');
+  	  return isCallable($Symbol) && isPrototypeOf($Symbol.prototype, $Object(it));
+  	};
+  	return isSymbol;
+  }
+
+  var tryToString;
+  var hasRequiredTryToString;
+
+  function requireTryToString () {
+  	if (hasRequiredTryToString) return tryToString;
+  	hasRequiredTryToString = 1;
+  	var $String = String;
+
+  	tryToString = function (argument) {
+  	  try {
+  	    return $String(argument);
+  	  } catch (error) {
+  	    return 'Object';
+  	  }
+  	};
+  	return tryToString;
+  }
+
+  var aCallable;
+  var hasRequiredACallable;
+
+  function requireACallable () {
+  	if (hasRequiredACallable) return aCallable;
+  	hasRequiredACallable = 1;
+  	var isCallable = requireIsCallable();
+  	var tryToString = requireTryToString();
+
+  	var $TypeError = TypeError;
+
+  	// `Assert: IsCallable(argument) is true`
+  	aCallable = function (argument) {
+  	  if (isCallable(argument)) return argument;
+  	  throw new $TypeError(tryToString(argument) + ' is not a function');
+  	};
+  	return aCallable;
+  }
+
+  var getMethod;
+  var hasRequiredGetMethod;
+
+  function requireGetMethod () {
+  	if (hasRequiredGetMethod) return getMethod;
+  	hasRequiredGetMethod = 1;
+  	var aCallable = requireACallable();
+  	var isNullOrUndefined = requireIsNullOrUndefined();
+
+  	// `GetMethod` abstract operation
+  	// https://tc39.es/ecma262/#sec-getmethod
+  	getMethod = function (V, P) {
+  	  var func = V[P];
+  	  return isNullOrUndefined(func) ? undefined : aCallable(func);
+  	};
+  	return getMethod;
+  }
+
+  var ordinaryToPrimitive;
+  var hasRequiredOrdinaryToPrimitive;
+
+  function requireOrdinaryToPrimitive () {
+  	if (hasRequiredOrdinaryToPrimitive) return ordinaryToPrimitive;
+  	hasRequiredOrdinaryToPrimitive = 1;
+  	var call = requireFunctionCall();
+  	var isCallable = requireIsCallable();
+  	var isObject = requireIsObject();
+
+  	var $TypeError = TypeError;
+
+  	// `OrdinaryToPrimitive` abstract operation
+  	// https://tc39.es/ecma262/#sec-ordinarytoprimitive
+  	ordinaryToPrimitive = function (input, pref) {
+  	  var fn, val;
+  	  if (pref === 'string' && isCallable(fn = input.toString) && !isObject(val = call(fn, input))) return val;
+  	  if (isCallable(fn = input.valueOf) && !isObject(val = call(fn, input))) return val;
+  	  if (pref !== 'string' && isCallable(fn = input.toString) && !isObject(val = call(fn, input))) return val;
+  	  throw new $TypeError("Can't convert object to primitive value");
+  	};
+  	return ordinaryToPrimitive;
+  }
 
   var sharedStore = {exports: {}};
 
-  var isPure = false;
+  var isPure;
+  var hasRequiredIsPure;
 
-  var global$c = global$g;
+  function requireIsPure () {
+  	if (hasRequiredIsPure) return isPure;
+  	hasRequiredIsPure = 1;
+  	isPure = false;
+  	return isPure;
+  }
 
-  // eslint-disable-next-line es/no-object-defineproperty -- safe
-  var defineProperty$6 = Object.defineProperty;
+  var defineGlobalProperty;
+  var hasRequiredDefineGlobalProperty;
 
-  var defineGlobalProperty$3 = function (key, value) {
-    try {
-      defineProperty$6(global$c, key, { value: value, configurable: true, writable: true });
-    } catch (error) {
-      global$c[key] = value;
-    } return value;
-  };
+  function requireDefineGlobalProperty () {
+  	if (hasRequiredDefineGlobalProperty) return defineGlobalProperty;
+  	hasRequiredDefineGlobalProperty = 1;
+  	var globalThis = requireGlobalThis();
 
-  var globalThis$1 = global$g;
-  var defineGlobalProperty$2 = defineGlobalProperty$3;
+  	// eslint-disable-next-line es/no-object-defineproperty -- safe
+  	var defineProperty = Object.defineProperty;
 
-  var SHARED = '__core-js_shared__';
-  var store$3 = sharedStore.exports = globalThis$1[SHARED] || defineGlobalProperty$2(SHARED, {});
+  	defineGlobalProperty = function (key, value) {
+  	  try {
+  	    defineProperty(globalThis, key, { value: value, configurable: true, writable: true });
+  	  } catch (error) {
+  	    globalThis[key] = value;
+  	  } return value;
+  	};
+  	return defineGlobalProperty;
+  }
 
-  (store$3.versions || (store$3.versions = [])).push({
-    version: '3.36.1',
-    mode: 'global',
-    copyright: '© 2014-2024 Denis Pushkarev (zloirock.ru)',
-    license: 'https://github.com/zloirock/core-js/blob/v3.36.1/LICENSE',
-    source: 'https://github.com/zloirock/core-js'
-  });
+  var hasRequiredSharedStore;
 
-  var sharedStoreExports = sharedStore.exports;
+  function requireSharedStore () {
+  	if (hasRequiredSharedStore) return sharedStore.exports;
+  	hasRequiredSharedStore = 1;
+  	var IS_PURE = requireIsPure();
+  	var globalThis = requireGlobalThis();
+  	var defineGlobalProperty = requireDefineGlobalProperty();
 
-  var store$2 = sharedStoreExports;
+  	var SHARED = '__core-js_shared__';
+  	var store = sharedStore.exports = globalThis[SHARED] || defineGlobalProperty(SHARED, {});
 
-  var shared$4 = function (key, value) {
-    return store$2[key] || (store$2[key] = value || {});
-  };
+  	(store.versions || (store.versions = [])).push({
+  	  version: '3.39.0',
+  	  mode: IS_PURE ? 'pure' : 'global',
+  	  copyright: '© 2014-2024 Denis Pushkarev (zloirock.ru)',
+  	  license: 'https://github.com/zloirock/core-js/blob/v3.39.0/LICENSE',
+  	  source: 'https://github.com/zloirock/core-js'
+  	});
+  	return sharedStore.exports;
+  }
 
-  var requireObjectCoercible$3 = requireObjectCoercible$5;
+  var shared;
+  var hasRequiredShared;
 
-  var $Object$2 = Object;
+  function requireShared () {
+  	if (hasRequiredShared) return shared;
+  	hasRequiredShared = 1;
+  	var store = requireSharedStore();
 
-  // `ToObject` abstract operation
-  // https://tc39.es/ecma262/#sec-toobject
-  var toObject$4 = function (argument) {
-    return $Object$2(requireObjectCoercible$3(argument));
-  };
+  	shared = function (key, value) {
+  	  return store[key] || (store[key] = value || {});
+  	};
+  	return shared;
+  }
 
-  var uncurryThis$f = functionUncurryThis;
-  var toObject$3 = toObject$4;
+  var toObject;
+  var hasRequiredToObject;
 
-  var hasOwnProperty = uncurryThis$f({}.hasOwnProperty);
+  function requireToObject () {
+  	if (hasRequiredToObject) return toObject;
+  	hasRequiredToObject = 1;
+  	var requireObjectCoercible = requireRequireObjectCoercible();
 
-  // `HasOwnProperty` abstract operation
-  // https://tc39.es/ecma262/#sec-hasownproperty
-  // eslint-disable-next-line es/no-object-hasown -- safe
-  var hasOwnProperty_1 = Object.hasOwn || function hasOwn(it, key) {
-    return hasOwnProperty(toObject$3(it), key);
-  };
+  	var $Object = Object;
 
-  var uncurryThis$e = functionUncurryThis;
+  	// `ToObject` abstract operation
+  	// https://tc39.es/ecma262/#sec-toobject
+  	toObject = function (argument) {
+  	  return $Object(requireObjectCoercible(argument));
+  	};
+  	return toObject;
+  }
 
-  var id = 0;
-  var postfix = Math.random();
-  var toString$6 = uncurryThis$e(1.0.toString);
+  var hasOwnProperty_1;
+  var hasRequiredHasOwnProperty;
 
-  var uid$2 = function (key) {
-    return 'Symbol(' + (key === undefined ? '' : key) + ')_' + toString$6(++id + postfix, 36);
-  };
+  function requireHasOwnProperty () {
+  	if (hasRequiredHasOwnProperty) return hasOwnProperty_1;
+  	hasRequiredHasOwnProperty = 1;
+  	var uncurryThis = requireFunctionUncurryThis();
+  	var toObject = requireToObject();
 
-  var global$b = global$g;
-  var shared$3 = shared$4;
-  var hasOwn$a = hasOwnProperty_1;
-  var uid$1 = uid$2;
-  var NATIVE_SYMBOL = symbolConstructorDetection;
-  var USE_SYMBOL_AS_UID = useSymbolAsUid;
+  	var hasOwnProperty = uncurryThis({}.hasOwnProperty);
 
-  var Symbol$1 = global$b.Symbol;
-  var WellKnownSymbolsStore = shared$3('wks');
-  var createWellKnownSymbol = USE_SYMBOL_AS_UID ? Symbol$1['for'] || Symbol$1 : Symbol$1 && Symbol$1.withoutSetter || uid$1;
+  	// `HasOwnProperty` abstract operation
+  	// https://tc39.es/ecma262/#sec-hasownproperty
+  	// eslint-disable-next-line es/no-object-hasown -- safe
+  	hasOwnProperty_1 = Object.hasOwn || function hasOwn(it, key) {
+  	  return hasOwnProperty(toObject(it), key);
+  	};
+  	return hasOwnProperty_1;
+  }
 
-  var wellKnownSymbol$f = function (name) {
-    if (!hasOwn$a(WellKnownSymbolsStore, name)) {
-      WellKnownSymbolsStore[name] = NATIVE_SYMBOL && hasOwn$a(Symbol$1, name)
-        ? Symbol$1[name]
-        : createWellKnownSymbol('Symbol.' + name);
-    } return WellKnownSymbolsStore[name];
-  };
+  var uid;
+  var hasRequiredUid;
 
-  var call$a = functionCall;
-  var isObject$9 = isObject$b;
-  var isSymbol$1 = isSymbol$2;
-  var getMethod$2 = getMethod$3;
-  var ordinaryToPrimitive = ordinaryToPrimitive$1;
-  var wellKnownSymbol$e = wellKnownSymbol$f;
+  function requireUid () {
+  	if (hasRequiredUid) return uid;
+  	hasRequiredUid = 1;
+  	var uncurryThis = requireFunctionUncurryThis();
 
-  var $TypeError$8 = TypeError;
-  var TO_PRIMITIVE = wellKnownSymbol$e('toPrimitive');
+  	var id = 0;
+  	var postfix = Math.random();
+  	var toString = uncurryThis(1.0.toString);
 
-  // `ToPrimitive` abstract operation
-  // https://tc39.es/ecma262/#sec-toprimitive
-  var toPrimitive$1 = function (input, pref) {
-    if (!isObject$9(input) || isSymbol$1(input)) return input;
-    var exoticToPrim = getMethod$2(input, TO_PRIMITIVE);
-    var result;
-    if (exoticToPrim) {
-      if (pref === undefined) pref = 'default';
-      result = call$a(exoticToPrim, input, pref);
-      if (!isObject$9(result) || isSymbol$1(result)) return result;
-      throw new $TypeError$8("Can't convert object to primitive value");
-    }
-    if (pref === undefined) pref = 'number';
-    return ordinaryToPrimitive(input, pref);
-  };
+  	uid = function (key) {
+  	  return 'Symbol(' + (key === undefined ? '' : key) + ')_' + toString(++id + postfix, 36);
+  	};
+  	return uid;
+  }
 
-  var toPrimitive = toPrimitive$1;
-  var isSymbol = isSymbol$2;
+  var wellKnownSymbol;
+  var hasRequiredWellKnownSymbol;
 
-  // `ToPropertyKey` abstract operation
-  // https://tc39.es/ecma262/#sec-topropertykey
-  var toPropertyKey$2 = function (argument) {
-    var key = toPrimitive(argument, 'string');
-    return isSymbol(key) ? key : key + '';
-  };
+  function requireWellKnownSymbol () {
+  	if (hasRequiredWellKnownSymbol) return wellKnownSymbol;
+  	hasRequiredWellKnownSymbol = 1;
+  	var globalThis = requireGlobalThis();
+  	var shared = requireShared();
+  	var hasOwn = requireHasOwnProperty();
+  	var uid = requireUid();
+  	var NATIVE_SYMBOL = requireSymbolConstructorDetection();
+  	var USE_SYMBOL_AS_UID = requireUseSymbolAsUid();
 
-  var global$a = global$g;
-  var isObject$8 = isObject$b;
+  	var Symbol = globalThis.Symbol;
+  	var WellKnownSymbolsStore = shared('wks');
+  	var createWellKnownSymbol = USE_SYMBOL_AS_UID ? Symbol['for'] || Symbol : Symbol && Symbol.withoutSetter || uid;
 
-  var document$1 = global$a.document;
-  // typeof document.createElement is 'object' in old IE
-  var EXISTS$1 = isObject$8(document$1) && isObject$8(document$1.createElement);
+  	wellKnownSymbol = function (name) {
+  	  if (!hasOwn(WellKnownSymbolsStore, name)) {
+  	    WellKnownSymbolsStore[name] = NATIVE_SYMBOL && hasOwn(Symbol, name)
+  	      ? Symbol[name]
+  	      : createWellKnownSymbol('Symbol.' + name);
+  	  } return WellKnownSymbolsStore[name];
+  	};
+  	return wellKnownSymbol;
+  }
 
-  var documentCreateElement$2 = function (it) {
-    return EXISTS$1 ? document$1.createElement(it) : {};
-  };
+  var toPrimitive;
+  var hasRequiredToPrimitive;
 
-  var DESCRIPTORS$e = descriptors;
-  var fails$g = fails$l;
-  var createElement = documentCreateElement$2;
+  function requireToPrimitive () {
+  	if (hasRequiredToPrimitive) return toPrimitive;
+  	hasRequiredToPrimitive = 1;
+  	var call = requireFunctionCall();
+  	var isObject = requireIsObject();
+  	var isSymbol = requireIsSymbol();
+  	var getMethod = requireGetMethod();
+  	var ordinaryToPrimitive = requireOrdinaryToPrimitive();
+  	var wellKnownSymbol = requireWellKnownSymbol();
 
-  // Thanks to IE8 for its funny defineProperty
-  var ie8DomDefine = !DESCRIPTORS$e && !fails$g(function () {
-    // eslint-disable-next-line es/no-object-defineproperty -- required for testing
-    return Object.defineProperty(createElement('div'), 'a', {
-      get: function () { return 7; }
-    }).a !== 7;
-  });
+  	var $TypeError = TypeError;
+  	var TO_PRIMITIVE = wellKnownSymbol('toPrimitive');
 
-  var DESCRIPTORS$d = descriptors;
-  var call$9 = functionCall;
-  var propertyIsEnumerableModule$1 = objectPropertyIsEnumerable;
-  var createPropertyDescriptor$4 = createPropertyDescriptor$5;
-  var toIndexedObject$5 = toIndexedObject$6;
-  var toPropertyKey$1 = toPropertyKey$2;
-  var hasOwn$9 = hasOwnProperty_1;
-  var IE8_DOM_DEFINE$1 = ie8DomDefine;
+  	// `ToPrimitive` abstract operation
+  	// https://tc39.es/ecma262/#sec-toprimitive
+  	toPrimitive = function (input, pref) {
+  	  if (!isObject(input) || isSymbol(input)) return input;
+  	  var exoticToPrim = getMethod(input, TO_PRIMITIVE);
+  	  var result;
+  	  if (exoticToPrim) {
+  	    if (pref === undefined) pref = 'default';
+  	    result = call(exoticToPrim, input, pref);
+  	    if (!isObject(result) || isSymbol(result)) return result;
+  	    throw new $TypeError("Can't convert object to primitive value");
+  	  }
+  	  if (pref === undefined) pref = 'number';
+  	  return ordinaryToPrimitive(input, pref);
+  	};
+  	return toPrimitive;
+  }
 
-  // eslint-disable-next-line es/no-object-getownpropertydescriptor -- safe
-  var $getOwnPropertyDescriptor$1 = Object.getOwnPropertyDescriptor;
+  var toPropertyKey;
+  var hasRequiredToPropertyKey;
 
-  // `Object.getOwnPropertyDescriptor` method
-  // https://tc39.es/ecma262/#sec-object.getownpropertydescriptor
-  objectGetOwnPropertyDescriptor.f = DESCRIPTORS$d ? $getOwnPropertyDescriptor$1 : function getOwnPropertyDescriptor(O, P) {
-    O = toIndexedObject$5(O);
-    P = toPropertyKey$1(P);
-    if (IE8_DOM_DEFINE$1) try {
-      return $getOwnPropertyDescriptor$1(O, P);
-    } catch (error) { /* empty */ }
-    if (hasOwn$9(O, P)) return createPropertyDescriptor$4(!call$9(propertyIsEnumerableModule$1.f, O, P), O[P]);
-  };
+  function requireToPropertyKey () {
+  	if (hasRequiredToPropertyKey) return toPropertyKey;
+  	hasRequiredToPropertyKey = 1;
+  	var toPrimitive = requireToPrimitive();
+  	var isSymbol = requireIsSymbol();
+
+  	// `ToPropertyKey` abstract operation
+  	// https://tc39.es/ecma262/#sec-topropertykey
+  	toPropertyKey = function (argument) {
+  	  var key = toPrimitive(argument, 'string');
+  	  return isSymbol(key) ? key : key + '';
+  	};
+  	return toPropertyKey;
+  }
+
+  var documentCreateElement;
+  var hasRequiredDocumentCreateElement;
+
+  function requireDocumentCreateElement () {
+  	if (hasRequiredDocumentCreateElement) return documentCreateElement;
+  	hasRequiredDocumentCreateElement = 1;
+  	var globalThis = requireGlobalThis();
+  	var isObject = requireIsObject();
+
+  	var document = globalThis.document;
+  	// typeof document.createElement is 'object' in old IE
+  	var EXISTS = isObject(document) && isObject(document.createElement);
+
+  	documentCreateElement = function (it) {
+  	  return EXISTS ? document.createElement(it) : {};
+  	};
+  	return documentCreateElement;
+  }
+
+  var ie8DomDefine;
+  var hasRequiredIe8DomDefine;
+
+  function requireIe8DomDefine () {
+  	if (hasRequiredIe8DomDefine) return ie8DomDefine;
+  	hasRequiredIe8DomDefine = 1;
+  	var DESCRIPTORS = requireDescriptors();
+  	var fails = requireFails();
+  	var createElement = requireDocumentCreateElement();
+
+  	// Thanks to IE8 for its funny defineProperty
+  	ie8DomDefine = !DESCRIPTORS && !fails(function () {
+  	  // eslint-disable-next-line es/no-object-defineproperty -- required for testing
+  	  return Object.defineProperty(createElement('div'), 'a', {
+  	    get: function () { return 7; }
+  	  }).a !== 7;
+  	});
+  	return ie8DomDefine;
+  }
+
+  var hasRequiredObjectGetOwnPropertyDescriptor;
+
+  function requireObjectGetOwnPropertyDescriptor () {
+  	if (hasRequiredObjectGetOwnPropertyDescriptor) return objectGetOwnPropertyDescriptor;
+  	hasRequiredObjectGetOwnPropertyDescriptor = 1;
+  	var DESCRIPTORS = requireDescriptors();
+  	var call = requireFunctionCall();
+  	var propertyIsEnumerableModule = requireObjectPropertyIsEnumerable();
+  	var createPropertyDescriptor = requireCreatePropertyDescriptor();
+  	var toIndexedObject = requireToIndexedObject();
+  	var toPropertyKey = requireToPropertyKey();
+  	var hasOwn = requireHasOwnProperty();
+  	var IE8_DOM_DEFINE = requireIe8DomDefine();
+
+  	// eslint-disable-next-line es/no-object-getownpropertydescriptor -- safe
+  	var $getOwnPropertyDescriptor = Object.getOwnPropertyDescriptor;
+
+  	// `Object.getOwnPropertyDescriptor` method
+  	// https://tc39.es/ecma262/#sec-object.getownpropertydescriptor
+  	objectGetOwnPropertyDescriptor.f = DESCRIPTORS ? $getOwnPropertyDescriptor : function getOwnPropertyDescriptor(O, P) {
+  	  O = toIndexedObject(O);
+  	  P = toPropertyKey(P);
+  	  if (IE8_DOM_DEFINE) try {
+  	    return $getOwnPropertyDescriptor(O, P);
+  	  } catch (error) { /* empty */ }
+  	  if (hasOwn(O, P)) return createPropertyDescriptor(!call(propertyIsEnumerableModule.f, O, P), O[P]);
+  	};
+  	return objectGetOwnPropertyDescriptor;
+  }
 
   var objectDefineProperty = {};
 
-  var DESCRIPTORS$c = descriptors;
-  var fails$f = fails$l;
+  var v8PrototypeDefineBug;
+  var hasRequiredV8PrototypeDefineBug;
 
-  // V8 ~ Chrome 36-
-  // https://bugs.chromium.org/p/v8/issues/detail?id=3334
-  var v8PrototypeDefineBug = DESCRIPTORS$c && fails$f(function () {
-    // eslint-disable-next-line es/no-object-defineproperty -- required for testing
-    return Object.defineProperty(function () { /* empty */ }, 'prototype', {
-      value: 42,
-      writable: false
-    }).prototype !== 42;
-  });
+  function requireV8PrototypeDefineBug () {
+  	if (hasRequiredV8PrototypeDefineBug) return v8PrototypeDefineBug;
+  	hasRequiredV8PrototypeDefineBug = 1;
+  	var DESCRIPTORS = requireDescriptors();
+  	var fails = requireFails();
 
-  var isObject$7 = isObject$b;
-
-  var $String$3 = String;
-  var $TypeError$7 = TypeError;
-
-  // `Assert: Type(argument) is Object`
-  var anObject$a = function (argument) {
-    if (isObject$7(argument)) return argument;
-    throw new $TypeError$7($String$3(argument) + ' is not an object');
-  };
-
-  var DESCRIPTORS$b = descriptors;
-  var IE8_DOM_DEFINE = ie8DomDefine;
-  var V8_PROTOTYPE_DEFINE_BUG$1 = v8PrototypeDefineBug;
-  var anObject$9 = anObject$a;
-  var toPropertyKey = toPropertyKey$2;
-
-  var $TypeError$6 = TypeError;
-  // eslint-disable-next-line es/no-object-defineproperty -- safe
-  var $defineProperty = Object.defineProperty;
-  // eslint-disable-next-line es/no-object-getownpropertydescriptor -- safe
-  var $getOwnPropertyDescriptor = Object.getOwnPropertyDescriptor;
-  var ENUMERABLE = 'enumerable';
-  var CONFIGURABLE$1 = 'configurable';
-  var WRITABLE = 'writable';
-
-  // `Object.defineProperty` method
-  // https://tc39.es/ecma262/#sec-object.defineproperty
-  objectDefineProperty.f = DESCRIPTORS$b ? V8_PROTOTYPE_DEFINE_BUG$1 ? function defineProperty(O, P, Attributes) {
-    anObject$9(O);
-    P = toPropertyKey(P);
-    anObject$9(Attributes);
-    if (typeof O === 'function' && P === 'prototype' && 'value' in Attributes && WRITABLE in Attributes && !Attributes[WRITABLE]) {
-      var current = $getOwnPropertyDescriptor(O, P);
-      if (current && current[WRITABLE]) {
-        O[P] = Attributes.value;
-        Attributes = {
-          configurable: CONFIGURABLE$1 in Attributes ? Attributes[CONFIGURABLE$1] : current[CONFIGURABLE$1],
-          enumerable: ENUMERABLE in Attributes ? Attributes[ENUMERABLE] : current[ENUMERABLE],
-          writable: false
-        };
-      }
-    } return $defineProperty(O, P, Attributes);
-  } : $defineProperty : function defineProperty(O, P, Attributes) {
-    anObject$9(O);
-    P = toPropertyKey(P);
-    anObject$9(Attributes);
-    if (IE8_DOM_DEFINE) try {
-      return $defineProperty(O, P, Attributes);
-    } catch (error) { /* empty */ }
-    if ('get' in Attributes || 'set' in Attributes) throw new $TypeError$6('Accessors not supported');
-    if ('value' in Attributes) O[P] = Attributes.value;
-    return O;
-  };
-
-  var DESCRIPTORS$a = descriptors;
-  var definePropertyModule$4 = objectDefineProperty;
-  var createPropertyDescriptor$3 = createPropertyDescriptor$5;
-
-  var createNonEnumerableProperty$5 = DESCRIPTORS$a ? function (object, key, value) {
-    return definePropertyModule$4.f(object, key, createPropertyDescriptor$3(1, value));
-  } : function (object, key, value) {
-    object[key] = value;
-    return object;
-  };
-
-  var makeBuiltIn$3 = {exports: {}};
-
-  var DESCRIPTORS$9 = descriptors;
-  var hasOwn$8 = hasOwnProperty_1;
-
-  var FunctionPrototype = Function.prototype;
-  // eslint-disable-next-line es/no-object-getownpropertydescriptor -- safe
-  var getDescriptor = DESCRIPTORS$9 && Object.getOwnPropertyDescriptor;
-
-  var EXISTS = hasOwn$8(FunctionPrototype, 'name');
-  // additional protection from minified / mangled / dropped function names
-  var PROPER = EXISTS && (function something() { /* empty */ }).name === 'something';
-  var CONFIGURABLE = EXISTS && (!DESCRIPTORS$9 || (DESCRIPTORS$9 && getDescriptor(FunctionPrototype, 'name').configurable));
-
-  var functionName = {
-    EXISTS: EXISTS,
-    PROPER: PROPER,
-    CONFIGURABLE: CONFIGURABLE
-  };
-
-  var uncurryThis$d = functionUncurryThis;
-  var isCallable$b = isCallable$h;
-  var store$1 = sharedStoreExports;
-
-  var functionToString = uncurryThis$d(Function.toString);
-
-  // this helper broken in `core-js@3.4.1-3.4.4`, so we can't use `shared` helper
-  if (!isCallable$b(store$1.inspectSource)) {
-    store$1.inspectSource = function (it) {
-      return functionToString(it);
-    };
+  	// V8 ~ Chrome 36-
+  	// https://bugs.chromium.org/p/v8/issues/detail?id=3334
+  	v8PrototypeDefineBug = DESCRIPTORS && fails(function () {
+  	  // eslint-disable-next-line es/no-object-defineproperty -- required for testing
+  	  return Object.defineProperty(function () { /* empty */ }, 'prototype', {
+  	    value: 42,
+  	    writable: false
+  	  }).prototype !== 42;
+  	});
+  	return v8PrototypeDefineBug;
   }
 
-  var inspectSource$2 = store$1.inspectSource;
+  var anObject;
+  var hasRequiredAnObject;
 
-  var global$9 = global$g;
-  var isCallable$a = isCallable$h;
+  function requireAnObject () {
+  	if (hasRequiredAnObject) return anObject;
+  	hasRequiredAnObject = 1;
+  	var isObject = requireIsObject();
 
-  var WeakMap$1 = global$9.WeakMap;
+  	var $String = String;
+  	var $TypeError = TypeError;
 
-  var weakMapBasicDetection = isCallable$a(WeakMap$1) && /native code/.test(String(WeakMap$1));
-
-  var shared$2 = shared$4;
-  var uid = uid$2;
-
-  var keys = shared$2('keys');
-
-  var sharedKey$3 = function (key) {
-    return keys[key] || (keys[key] = uid(key));
-  };
-
-  var hiddenKeys$4 = {};
-
-  var NATIVE_WEAK_MAP = weakMapBasicDetection;
-  var global$8 = global$g;
-  var isObject$6 = isObject$b;
-  var createNonEnumerableProperty$4 = createNonEnumerableProperty$5;
-  var hasOwn$7 = hasOwnProperty_1;
-  var shared$1 = sharedStoreExports;
-  var sharedKey$2 = sharedKey$3;
-  var hiddenKeys$3 = hiddenKeys$4;
-
-  var OBJECT_ALREADY_INITIALIZED = 'Object already initialized';
-  var TypeError$2 = global$8.TypeError;
-  var WeakMap = global$8.WeakMap;
-  var set, get, has;
-
-  var enforce = function (it) {
-    return has(it) ? get(it) : set(it, {});
-  };
-
-  var getterFor = function (TYPE) {
-    return function (it) {
-      var state;
-      if (!isObject$6(it) || (state = get(it)).type !== TYPE) {
-        throw new TypeError$2('Incompatible receiver, ' + TYPE + ' required');
-      } return state;
-    };
-  };
-
-  if (NATIVE_WEAK_MAP || shared$1.state) {
-    var store = shared$1.state || (shared$1.state = new WeakMap());
-    /* eslint-disable no-self-assign -- prototype methods protection */
-    store.get = store.get;
-    store.has = store.has;
-    store.set = store.set;
-    /* eslint-enable no-self-assign -- prototype methods protection */
-    set = function (it, metadata) {
-      if (store.has(it)) throw new TypeError$2(OBJECT_ALREADY_INITIALIZED);
-      metadata.facade = it;
-      store.set(it, metadata);
-      return metadata;
-    };
-    get = function (it) {
-      return store.get(it) || {};
-    };
-    has = function (it) {
-      return store.has(it);
-    };
-  } else {
-    var STATE = sharedKey$2('state');
-    hiddenKeys$3[STATE] = true;
-    set = function (it, metadata) {
-      if (hasOwn$7(it, STATE)) throw new TypeError$2(OBJECT_ALREADY_INITIALIZED);
-      metadata.facade = it;
-      createNonEnumerableProperty$4(it, STATE, metadata);
-      return metadata;
-    };
-    get = function (it) {
-      return hasOwn$7(it, STATE) ? it[STATE] : {};
-    };
-    has = function (it) {
-      return hasOwn$7(it, STATE);
-    };
+  	// `Assert: Type(argument) is Object`
+  	anObject = function (argument) {
+  	  if (isObject(argument)) return argument;
+  	  throw new $TypeError($String(argument) + ' is not an object');
+  	};
+  	return anObject;
   }
 
-  var internalState = {
-    set: set,
-    get: get,
-    has: has,
-    enforce: enforce,
-    getterFor: getterFor
-  };
+  var hasRequiredObjectDefineProperty;
 
-  var uncurryThis$c = functionUncurryThis;
-  var fails$e = fails$l;
-  var isCallable$9 = isCallable$h;
-  var hasOwn$6 = hasOwnProperty_1;
-  var DESCRIPTORS$8 = descriptors;
-  var CONFIGURABLE_FUNCTION_NAME$1 = functionName.CONFIGURABLE;
-  var inspectSource$1 = inspectSource$2;
-  var InternalStateModule$3 = internalState;
+  function requireObjectDefineProperty () {
+  	if (hasRequiredObjectDefineProperty) return objectDefineProperty;
+  	hasRequiredObjectDefineProperty = 1;
+  	var DESCRIPTORS = requireDescriptors();
+  	var IE8_DOM_DEFINE = requireIe8DomDefine();
+  	var V8_PROTOTYPE_DEFINE_BUG = requireV8PrototypeDefineBug();
+  	var anObject = requireAnObject();
+  	var toPropertyKey = requireToPropertyKey();
 
-  var enforceInternalState = InternalStateModule$3.enforce;
-  var getInternalState$3 = InternalStateModule$3.get;
-  var $String$2 = String;
-  // eslint-disable-next-line es/no-object-defineproperty -- safe
-  var defineProperty$5 = Object.defineProperty;
-  var stringSlice$3 = uncurryThis$c(''.slice);
-  var replace$2 = uncurryThis$c(''.replace);
-  var join$1 = uncurryThis$c([].join);
+  	var $TypeError = TypeError;
+  	// eslint-disable-next-line es/no-object-defineproperty -- safe
+  	var $defineProperty = Object.defineProperty;
+  	// eslint-disable-next-line es/no-object-getownpropertydescriptor -- safe
+  	var $getOwnPropertyDescriptor = Object.getOwnPropertyDescriptor;
+  	var ENUMERABLE = 'enumerable';
+  	var CONFIGURABLE = 'configurable';
+  	var WRITABLE = 'writable';
 
-  var CONFIGURABLE_LENGTH = DESCRIPTORS$8 && !fails$e(function () {
-    return defineProperty$5(function () { /* empty */ }, 'length', { value: 8 }).length !== 8;
-  });
+  	// `Object.defineProperty` method
+  	// https://tc39.es/ecma262/#sec-object.defineproperty
+  	objectDefineProperty.f = DESCRIPTORS ? V8_PROTOTYPE_DEFINE_BUG ? function defineProperty(O, P, Attributes) {
+  	  anObject(O);
+  	  P = toPropertyKey(P);
+  	  anObject(Attributes);
+  	  if (typeof O === 'function' && P === 'prototype' && 'value' in Attributes && WRITABLE in Attributes && !Attributes[WRITABLE]) {
+  	    var current = $getOwnPropertyDescriptor(O, P);
+  	    if (current && current[WRITABLE]) {
+  	      O[P] = Attributes.value;
+  	      Attributes = {
+  	        configurable: CONFIGURABLE in Attributes ? Attributes[CONFIGURABLE] : current[CONFIGURABLE],
+  	        enumerable: ENUMERABLE in Attributes ? Attributes[ENUMERABLE] : current[ENUMERABLE],
+  	        writable: false
+  	      };
+  	    }
+  	  } return $defineProperty(O, P, Attributes);
+  	} : $defineProperty : function defineProperty(O, P, Attributes) {
+  	  anObject(O);
+  	  P = toPropertyKey(P);
+  	  anObject(Attributes);
+  	  if (IE8_DOM_DEFINE) try {
+  	    return $defineProperty(O, P, Attributes);
+  	  } catch (error) { /* empty */ }
+  	  if ('get' in Attributes || 'set' in Attributes) throw new $TypeError('Accessors not supported');
+  	  if ('value' in Attributes) O[P] = Attributes.value;
+  	  return O;
+  	};
+  	return objectDefineProperty;
+  }
 
-  var TEMPLATE = String(String).split('String');
+  var createNonEnumerableProperty;
+  var hasRequiredCreateNonEnumerableProperty;
 
-  var makeBuiltIn$2 = makeBuiltIn$3.exports = function (value, name, options) {
-    if (stringSlice$3($String$2(name), 0, 7) === 'Symbol(') {
-      name = '[' + replace$2($String$2(name), /^Symbol\(([^)]*)\).*$/, '$1') + ']';
-    }
-    if (options && options.getter) name = 'get ' + name;
-    if (options && options.setter) name = 'set ' + name;
-    if (!hasOwn$6(value, 'name') || (CONFIGURABLE_FUNCTION_NAME$1 && value.name !== name)) {
-      if (DESCRIPTORS$8) defineProperty$5(value, 'name', { value: name, configurable: true });
-      else value.name = name;
-    }
-    if (CONFIGURABLE_LENGTH && options && hasOwn$6(options, 'arity') && value.length !== options.arity) {
-      defineProperty$5(value, 'length', { value: options.arity });
-    }
-    try {
-      if (options && hasOwn$6(options, 'constructor') && options.constructor) {
-        if (DESCRIPTORS$8) defineProperty$5(value, 'prototype', { writable: false });
-      // in V8 ~ Chrome 53, prototypes of some methods, like `Array.prototype.values`, are non-writable
-      } else if (value.prototype) value.prototype = undefined;
-    } catch (error) { /* empty */ }
-    var state = enforceInternalState(value);
-    if (!hasOwn$6(state, 'source')) {
-      state.source = join$1(TEMPLATE, typeof name == 'string' ? name : '');
-    } return value;
-  };
+  function requireCreateNonEnumerableProperty () {
+  	if (hasRequiredCreateNonEnumerableProperty) return createNonEnumerableProperty;
+  	hasRequiredCreateNonEnumerableProperty = 1;
+  	var DESCRIPTORS = requireDescriptors();
+  	var definePropertyModule = requireObjectDefineProperty();
+  	var createPropertyDescriptor = requireCreatePropertyDescriptor();
 
-  // add fake Function#toString for correct work wrapped methods / constructors with methods like LoDash isNative
-  // eslint-disable-next-line no-extend-native -- required
-  Function.prototype.toString = makeBuiltIn$2(function toString() {
-    return isCallable$9(this) && getInternalState$3(this).source || inspectSource$1(this);
-  }, 'toString');
+  	createNonEnumerableProperty = DESCRIPTORS ? function (object, key, value) {
+  	  return definePropertyModule.f(object, key, createPropertyDescriptor(1, value));
+  	} : function (object, key, value) {
+  	  object[key] = value;
+  	  return object;
+  	};
+  	return createNonEnumerableProperty;
+  }
 
-  var makeBuiltInExports = makeBuiltIn$3.exports;
+  var makeBuiltIn = {exports: {}};
 
-  var isCallable$8 = isCallable$h;
-  var definePropertyModule$3 = objectDefineProperty;
-  var makeBuiltIn$1 = makeBuiltInExports;
-  var defineGlobalProperty$1 = defineGlobalProperty$3;
+  var functionName;
+  var hasRequiredFunctionName;
 
-  var defineBuiltIn$8 = function (O, key, value, options) {
-    if (!options) options = {};
-    var simple = options.enumerable;
-    var name = options.name !== undefined ? options.name : key;
-    if (isCallable$8(value)) makeBuiltIn$1(value, name, options);
-    if (options.global) {
-      if (simple) O[key] = value;
-      else defineGlobalProperty$1(key, value);
-    } else {
-      try {
-        if (!options.unsafe) delete O[key];
-        else if (O[key]) simple = true;
-      } catch (error) { /* empty */ }
-      if (simple) O[key] = value;
-      else definePropertyModule$3.f(O, key, {
-        value: value,
-        enumerable: false,
-        configurable: !options.nonConfigurable,
-        writable: !options.nonWritable
-      });
-    } return O;
-  };
+  function requireFunctionName () {
+  	if (hasRequiredFunctionName) return functionName;
+  	hasRequiredFunctionName = 1;
+  	var DESCRIPTORS = requireDescriptors();
+  	var hasOwn = requireHasOwnProperty();
+
+  	var FunctionPrototype = Function.prototype;
+  	// eslint-disable-next-line es/no-object-getownpropertydescriptor -- safe
+  	var getDescriptor = DESCRIPTORS && Object.getOwnPropertyDescriptor;
+
+  	var EXISTS = hasOwn(FunctionPrototype, 'name');
+  	// additional protection from minified / mangled / dropped function names
+  	var PROPER = EXISTS && (function something() { /* empty */ }).name === 'something';
+  	var CONFIGURABLE = EXISTS && (!DESCRIPTORS || (DESCRIPTORS && getDescriptor(FunctionPrototype, 'name').configurable));
+
+  	functionName = {
+  	  EXISTS: EXISTS,
+  	  PROPER: PROPER,
+  	  CONFIGURABLE: CONFIGURABLE
+  	};
+  	return functionName;
+  }
+
+  var inspectSource;
+  var hasRequiredInspectSource;
+
+  function requireInspectSource () {
+  	if (hasRequiredInspectSource) return inspectSource;
+  	hasRequiredInspectSource = 1;
+  	var uncurryThis = requireFunctionUncurryThis();
+  	var isCallable = requireIsCallable();
+  	var store = requireSharedStore();
+
+  	var functionToString = uncurryThis(Function.toString);
+
+  	// this helper broken in `core-js@3.4.1-3.4.4`, so we can't use `shared` helper
+  	if (!isCallable(store.inspectSource)) {
+  	  store.inspectSource = function (it) {
+  	    return functionToString(it);
+  	  };
+  	}
+
+  	inspectSource = store.inspectSource;
+  	return inspectSource;
+  }
+
+  var weakMapBasicDetection;
+  var hasRequiredWeakMapBasicDetection;
+
+  function requireWeakMapBasicDetection () {
+  	if (hasRequiredWeakMapBasicDetection) return weakMapBasicDetection;
+  	hasRequiredWeakMapBasicDetection = 1;
+  	var globalThis = requireGlobalThis();
+  	var isCallable = requireIsCallable();
+
+  	var WeakMap = globalThis.WeakMap;
+
+  	weakMapBasicDetection = isCallable(WeakMap) && /native code/.test(String(WeakMap));
+  	return weakMapBasicDetection;
+  }
+
+  var sharedKey;
+  var hasRequiredSharedKey;
+
+  function requireSharedKey () {
+  	if (hasRequiredSharedKey) return sharedKey;
+  	hasRequiredSharedKey = 1;
+  	var shared = requireShared();
+  	var uid = requireUid();
+
+  	var keys = shared('keys');
+
+  	sharedKey = function (key) {
+  	  return keys[key] || (keys[key] = uid(key));
+  	};
+  	return sharedKey;
+  }
+
+  var hiddenKeys;
+  var hasRequiredHiddenKeys;
+
+  function requireHiddenKeys () {
+  	if (hasRequiredHiddenKeys) return hiddenKeys;
+  	hasRequiredHiddenKeys = 1;
+  	hiddenKeys = {};
+  	return hiddenKeys;
+  }
+
+  var internalState;
+  var hasRequiredInternalState;
+
+  function requireInternalState () {
+  	if (hasRequiredInternalState) return internalState;
+  	hasRequiredInternalState = 1;
+  	var NATIVE_WEAK_MAP = requireWeakMapBasicDetection();
+  	var globalThis = requireGlobalThis();
+  	var isObject = requireIsObject();
+  	var createNonEnumerableProperty = requireCreateNonEnumerableProperty();
+  	var hasOwn = requireHasOwnProperty();
+  	var shared = requireSharedStore();
+  	var sharedKey = requireSharedKey();
+  	var hiddenKeys = requireHiddenKeys();
+
+  	var OBJECT_ALREADY_INITIALIZED = 'Object already initialized';
+  	var TypeError = globalThis.TypeError;
+  	var WeakMap = globalThis.WeakMap;
+  	var set, get, has;
+
+  	var enforce = function (it) {
+  	  return has(it) ? get(it) : set(it, {});
+  	};
+
+  	var getterFor = function (TYPE) {
+  	  return function (it) {
+  	    var state;
+  	    if (!isObject(it) || (state = get(it)).type !== TYPE) {
+  	      throw new TypeError('Incompatible receiver, ' + TYPE + ' required');
+  	    } return state;
+  	  };
+  	};
+
+  	if (NATIVE_WEAK_MAP || shared.state) {
+  	  var store = shared.state || (shared.state = new WeakMap());
+  	  /* eslint-disable no-self-assign -- prototype methods protection */
+  	  store.get = store.get;
+  	  store.has = store.has;
+  	  store.set = store.set;
+  	  /* eslint-enable no-self-assign -- prototype methods protection */
+  	  set = function (it, metadata) {
+  	    if (store.has(it)) throw new TypeError(OBJECT_ALREADY_INITIALIZED);
+  	    metadata.facade = it;
+  	    store.set(it, metadata);
+  	    return metadata;
+  	  };
+  	  get = function (it) {
+  	    return store.get(it) || {};
+  	  };
+  	  has = function (it) {
+  	    return store.has(it);
+  	  };
+  	} else {
+  	  var STATE = sharedKey('state');
+  	  hiddenKeys[STATE] = true;
+  	  set = function (it, metadata) {
+  	    if (hasOwn(it, STATE)) throw new TypeError(OBJECT_ALREADY_INITIALIZED);
+  	    metadata.facade = it;
+  	    createNonEnumerableProperty(it, STATE, metadata);
+  	    return metadata;
+  	  };
+  	  get = function (it) {
+  	    return hasOwn(it, STATE) ? it[STATE] : {};
+  	  };
+  	  has = function (it) {
+  	    return hasOwn(it, STATE);
+  	  };
+  	}
+
+  	internalState = {
+  	  set: set,
+  	  get: get,
+  	  has: has,
+  	  enforce: enforce,
+  	  getterFor: getterFor
+  	};
+  	return internalState;
+  }
+
+  var hasRequiredMakeBuiltIn;
+
+  function requireMakeBuiltIn () {
+  	if (hasRequiredMakeBuiltIn) return makeBuiltIn.exports;
+  	hasRequiredMakeBuiltIn = 1;
+  	var uncurryThis = requireFunctionUncurryThis();
+  	var fails = requireFails();
+  	var isCallable = requireIsCallable();
+  	var hasOwn = requireHasOwnProperty();
+  	var DESCRIPTORS = requireDescriptors();
+  	var CONFIGURABLE_FUNCTION_NAME = requireFunctionName().CONFIGURABLE;
+  	var inspectSource = requireInspectSource();
+  	var InternalStateModule = requireInternalState();
+
+  	var enforceInternalState = InternalStateModule.enforce;
+  	var getInternalState = InternalStateModule.get;
+  	var $String = String;
+  	// eslint-disable-next-line es/no-object-defineproperty -- safe
+  	var defineProperty = Object.defineProperty;
+  	var stringSlice = uncurryThis(''.slice);
+  	var replace = uncurryThis(''.replace);
+  	var join = uncurryThis([].join);
+
+  	var CONFIGURABLE_LENGTH = DESCRIPTORS && !fails(function () {
+  	  return defineProperty(function () { /* empty */ }, 'length', { value: 8 }).length !== 8;
+  	});
+
+  	var TEMPLATE = String(String).split('String');
+
+  	var makeBuiltIn$1 = makeBuiltIn.exports = function (value, name, options) {
+  	  if (stringSlice($String(name), 0, 7) === 'Symbol(') {
+  	    name = '[' + replace($String(name), /^Symbol\(([^)]*)\).*$/, '$1') + ']';
+  	  }
+  	  if (options && options.getter) name = 'get ' + name;
+  	  if (options && options.setter) name = 'set ' + name;
+  	  if (!hasOwn(value, 'name') || (CONFIGURABLE_FUNCTION_NAME && value.name !== name)) {
+  	    if (DESCRIPTORS) defineProperty(value, 'name', { value: name, configurable: true });
+  	    else value.name = name;
+  	  }
+  	  if (CONFIGURABLE_LENGTH && options && hasOwn(options, 'arity') && value.length !== options.arity) {
+  	    defineProperty(value, 'length', { value: options.arity });
+  	  }
+  	  try {
+  	    if (options && hasOwn(options, 'constructor') && options.constructor) {
+  	      if (DESCRIPTORS) defineProperty(value, 'prototype', { writable: false });
+  	    // in V8 ~ Chrome 53, prototypes of some methods, like `Array.prototype.values`, are non-writable
+  	    } else if (value.prototype) value.prototype = undefined;
+  	  } catch (error) { /* empty */ }
+  	  var state = enforceInternalState(value);
+  	  if (!hasOwn(state, 'source')) {
+  	    state.source = join(TEMPLATE, typeof name == 'string' ? name : '');
+  	  } return value;
+  	};
+
+  	// add fake Function#toString for correct work wrapped methods / constructors with methods like LoDash isNative
+  	// eslint-disable-next-line no-extend-native -- required
+  	Function.prototype.toString = makeBuiltIn$1(function toString() {
+  	  return isCallable(this) && getInternalState(this).source || inspectSource(this);
+  	}, 'toString');
+  	return makeBuiltIn.exports;
+  }
+
+  var defineBuiltIn;
+  var hasRequiredDefineBuiltIn;
+
+  function requireDefineBuiltIn () {
+  	if (hasRequiredDefineBuiltIn) return defineBuiltIn;
+  	hasRequiredDefineBuiltIn = 1;
+  	var isCallable = requireIsCallable();
+  	var definePropertyModule = requireObjectDefineProperty();
+  	var makeBuiltIn = requireMakeBuiltIn();
+  	var defineGlobalProperty = requireDefineGlobalProperty();
+
+  	defineBuiltIn = function (O, key, value, options) {
+  	  if (!options) options = {};
+  	  var simple = options.enumerable;
+  	  var name = options.name !== undefined ? options.name : key;
+  	  if (isCallable(value)) makeBuiltIn(value, name, options);
+  	  if (options.global) {
+  	    if (simple) O[key] = value;
+  	    else defineGlobalProperty(key, value);
+  	  } else {
+  	    try {
+  	      if (!options.unsafe) delete O[key];
+  	      else if (O[key]) simple = true;
+  	    } catch (error) { /* empty */ }
+  	    if (simple) O[key] = value;
+  	    else definePropertyModule.f(O, key, {
+  	      value: value,
+  	      enumerable: false,
+  	      configurable: !options.nonConfigurable,
+  	      writable: !options.nonWritable
+  	    });
+  	  } return O;
+  	};
+  	return defineBuiltIn;
+  }
 
   var objectGetOwnPropertyNames = {};
 
-  var ceil = Math.ceil;
-  var floor$1 = Math.floor;
+  var mathTrunc;
+  var hasRequiredMathTrunc;
 
-  // `Math.trunc` method
-  // https://tc39.es/ecma262/#sec-math.trunc
-  // eslint-disable-next-line es/no-math-trunc -- safe
-  var mathTrunc = Math.trunc || function trunc(x) {
-    var n = +x;
-    return (n > 0 ? floor$1 : ceil)(n);
-  };
+  function requireMathTrunc () {
+  	if (hasRequiredMathTrunc) return mathTrunc;
+  	hasRequiredMathTrunc = 1;
+  	var ceil = Math.ceil;
+  	var floor = Math.floor;
 
-  var trunc = mathTrunc;
+  	// `Math.trunc` method
+  	// https://tc39.es/ecma262/#sec-math.trunc
+  	// eslint-disable-next-line es/no-math-trunc -- safe
+  	mathTrunc = Math.trunc || function trunc(x) {
+  	  var n = +x;
+  	  return (n > 0 ? floor : ceil)(n);
+  	};
+  	return mathTrunc;
+  }
 
-  // `ToIntegerOrInfinity` abstract operation
-  // https://tc39.es/ecma262/#sec-tointegerorinfinity
-  var toIntegerOrInfinity$3 = function (argument) {
-    var number = +argument;
-    // eslint-disable-next-line no-self-compare -- NaN check
-    return number !== number || number === 0 ? 0 : trunc(number);
-  };
+  var toIntegerOrInfinity;
+  var hasRequiredToIntegerOrInfinity;
 
-  var toIntegerOrInfinity$2 = toIntegerOrInfinity$3;
+  function requireToIntegerOrInfinity () {
+  	if (hasRequiredToIntegerOrInfinity) return toIntegerOrInfinity;
+  	hasRequiredToIntegerOrInfinity = 1;
+  	var trunc = requireMathTrunc();
 
-  var max = Math.max;
-  var min$1 = Math.min;
+  	// `ToIntegerOrInfinity` abstract operation
+  	// https://tc39.es/ecma262/#sec-tointegerorinfinity
+  	toIntegerOrInfinity = function (argument) {
+  	  var number = +argument;
+  	  // eslint-disable-next-line no-self-compare -- NaN check
+  	  return number !== number || number === 0 ? 0 : trunc(number);
+  	};
+  	return toIntegerOrInfinity;
+  }
 
-  // Helper for a popular repeating case of the spec:
-  // Let integer be ? ToInteger(index).
-  // If integer < 0, let result be max((length + integer), 0); else let result be min(integer, length).
-  var toAbsoluteIndex$1 = function (index, length) {
-    var integer = toIntegerOrInfinity$2(index);
-    return integer < 0 ? max(integer + length, 0) : min$1(integer, length);
-  };
+  var toAbsoluteIndex;
+  var hasRequiredToAbsoluteIndex;
 
-  var toIntegerOrInfinity$1 = toIntegerOrInfinity$3;
+  function requireToAbsoluteIndex () {
+  	if (hasRequiredToAbsoluteIndex) return toAbsoluteIndex;
+  	hasRequiredToAbsoluteIndex = 1;
+  	var toIntegerOrInfinity = requireToIntegerOrInfinity();
 
-  var min = Math.min;
+  	var max = Math.max;
+  	var min = Math.min;
 
-  // `ToLength` abstract operation
-  // https://tc39.es/ecma262/#sec-tolength
-  var toLength$1 = function (argument) {
-    var len = toIntegerOrInfinity$1(argument);
-    return len > 0 ? min(len, 0x1FFFFFFFFFFFFF) : 0; // 2 ** 53 - 1 == 9007199254740991
-  };
+  	// Helper for a popular repeating case of the spec:
+  	// Let integer be ? ToInteger(index).
+  	// If integer < 0, let result be max((length + integer), 0); else let result be min(integer, length).
+  	toAbsoluteIndex = function (index, length) {
+  	  var integer = toIntegerOrInfinity(index);
+  	  return integer < 0 ? max(integer + length, 0) : min(integer, length);
+  	};
+  	return toAbsoluteIndex;
+  }
 
-  var toLength = toLength$1;
+  var toLength;
+  var hasRequiredToLength;
 
-  // `LengthOfArrayLike` abstract operation
-  // https://tc39.es/ecma262/#sec-lengthofarraylike
-  var lengthOfArrayLike$2 = function (obj) {
-    return toLength(obj.length);
-  };
+  function requireToLength () {
+  	if (hasRequiredToLength) return toLength;
+  	hasRequiredToLength = 1;
+  	var toIntegerOrInfinity = requireToIntegerOrInfinity();
 
-  var toIndexedObject$4 = toIndexedObject$6;
-  var toAbsoluteIndex = toAbsoluteIndex$1;
-  var lengthOfArrayLike$1 = lengthOfArrayLike$2;
+  	var min = Math.min;
 
-  // `Array.prototype.{ indexOf, includes }` methods implementation
-  var createMethod$2 = function (IS_INCLUDES) {
-    return function ($this, el, fromIndex) {
-      var O = toIndexedObject$4($this);
-      var length = lengthOfArrayLike$1(O);
-      if (length === 0) return !IS_INCLUDES && -1;
-      var index = toAbsoluteIndex(fromIndex, length);
-      var value;
-      // Array#includes uses SameValueZero equality algorithm
-      // eslint-disable-next-line no-self-compare -- NaN check
-      if (IS_INCLUDES && el !== el) while (length > index) {
-        value = O[index++];
-        // eslint-disable-next-line no-self-compare -- NaN check
-        if (value !== value) return true;
-      // Array#indexOf ignores holes, Array#includes - not
-      } else for (;length > index; index++) {
-        if ((IS_INCLUDES || index in O) && O[index] === el) return IS_INCLUDES || index || 0;
-      } return !IS_INCLUDES && -1;
-    };
-  };
+  	// `ToLength` abstract operation
+  	// https://tc39.es/ecma262/#sec-tolength
+  	toLength = function (argument) {
+  	  var len = toIntegerOrInfinity(argument);
+  	  return len > 0 ? min(len, 0x1FFFFFFFFFFFFF) : 0; // 2 ** 53 - 1 == 9007199254740991
+  	};
+  	return toLength;
+  }
 
-  var arrayIncludes = {
-    // `Array.prototype.includes` method
-    // https://tc39.es/ecma262/#sec-array.prototype.includes
-    includes: createMethod$2(true),
-    // `Array.prototype.indexOf` method
-    // https://tc39.es/ecma262/#sec-array.prototype.indexof
-    indexOf: createMethod$2(false)
-  };
+  var lengthOfArrayLike;
+  var hasRequiredLengthOfArrayLike;
 
-  var uncurryThis$b = functionUncurryThis;
-  var hasOwn$5 = hasOwnProperty_1;
-  var toIndexedObject$3 = toIndexedObject$6;
-  var indexOf$1 = arrayIncludes.indexOf;
-  var hiddenKeys$2 = hiddenKeys$4;
+  function requireLengthOfArrayLike () {
+  	if (hasRequiredLengthOfArrayLike) return lengthOfArrayLike;
+  	hasRequiredLengthOfArrayLike = 1;
+  	var toLength = requireToLength();
 
-  var push$2 = uncurryThis$b([].push);
+  	// `LengthOfArrayLike` abstract operation
+  	// https://tc39.es/ecma262/#sec-lengthofarraylike
+  	lengthOfArrayLike = function (obj) {
+  	  return toLength(obj.length);
+  	};
+  	return lengthOfArrayLike;
+  }
 
-  var objectKeysInternal = function (object, names) {
-    var O = toIndexedObject$3(object);
-    var i = 0;
-    var result = [];
-    var key;
-    for (key in O) !hasOwn$5(hiddenKeys$2, key) && hasOwn$5(O, key) && push$2(result, key);
-    // Don't enum bug & hidden keys
-    while (names.length > i) if (hasOwn$5(O, key = names[i++])) {
-      ~indexOf$1(result, key) || push$2(result, key);
-    }
-    return result;
-  };
+  var arrayIncludes;
+  var hasRequiredArrayIncludes;
 
-  // IE8- don't enum bug keys
-  var enumBugKeys$3 = [
-    'constructor',
-    'hasOwnProperty',
-    'isPrototypeOf',
-    'propertyIsEnumerable',
-    'toLocaleString',
-    'toString',
-    'valueOf'
-  ];
+  function requireArrayIncludes () {
+  	if (hasRequiredArrayIncludes) return arrayIncludes;
+  	hasRequiredArrayIncludes = 1;
+  	var toIndexedObject = requireToIndexedObject();
+  	var toAbsoluteIndex = requireToAbsoluteIndex();
+  	var lengthOfArrayLike = requireLengthOfArrayLike();
 
-  var internalObjectKeys$1 = objectKeysInternal;
-  var enumBugKeys$2 = enumBugKeys$3;
+  	// `Array.prototype.{ indexOf, includes }` methods implementation
+  	var createMethod = function (IS_INCLUDES) {
+  	  return function ($this, el, fromIndex) {
+  	    var O = toIndexedObject($this);
+  	    var length = lengthOfArrayLike(O);
+  	    if (length === 0) return !IS_INCLUDES && -1;
+  	    var index = toAbsoluteIndex(fromIndex, length);
+  	    var value;
+  	    // Array#includes uses SameValueZero equality algorithm
+  	    // eslint-disable-next-line no-self-compare -- NaN check
+  	    if (IS_INCLUDES && el !== el) while (length > index) {
+  	      value = O[index++];
+  	      // eslint-disable-next-line no-self-compare -- NaN check
+  	      if (value !== value) return true;
+  	    // Array#indexOf ignores holes, Array#includes - not
+  	    } else for (;length > index; index++) {
+  	      if ((IS_INCLUDES || index in O) && O[index] === el) return IS_INCLUDES || index || 0;
+  	    } return !IS_INCLUDES && -1;
+  	  };
+  	};
 
-  var hiddenKeys$1 = enumBugKeys$2.concat('length', 'prototype');
+  	arrayIncludes = {
+  	  // `Array.prototype.includes` method
+  	  // https://tc39.es/ecma262/#sec-array.prototype.includes
+  	  includes: createMethod(true),
+  	  // `Array.prototype.indexOf` method
+  	  // https://tc39.es/ecma262/#sec-array.prototype.indexof
+  	  indexOf: createMethod(false)
+  	};
+  	return arrayIncludes;
+  }
 
-  // `Object.getOwnPropertyNames` method
-  // https://tc39.es/ecma262/#sec-object.getownpropertynames
-  // eslint-disable-next-line es/no-object-getownpropertynames -- safe
-  objectGetOwnPropertyNames.f = Object.getOwnPropertyNames || function getOwnPropertyNames(O) {
-    return internalObjectKeys$1(O, hiddenKeys$1);
-  };
+  var objectKeysInternal;
+  var hasRequiredObjectKeysInternal;
+
+  function requireObjectKeysInternal () {
+  	if (hasRequiredObjectKeysInternal) return objectKeysInternal;
+  	hasRequiredObjectKeysInternal = 1;
+  	var uncurryThis = requireFunctionUncurryThis();
+  	var hasOwn = requireHasOwnProperty();
+  	var toIndexedObject = requireToIndexedObject();
+  	var indexOf = requireArrayIncludes().indexOf;
+  	var hiddenKeys = requireHiddenKeys();
+
+  	var push = uncurryThis([].push);
+
+  	objectKeysInternal = function (object, names) {
+  	  var O = toIndexedObject(object);
+  	  var i = 0;
+  	  var result = [];
+  	  var key;
+  	  for (key in O) !hasOwn(hiddenKeys, key) && hasOwn(O, key) && push(result, key);
+  	  // Don't enum bug & hidden keys
+  	  while (names.length > i) if (hasOwn(O, key = names[i++])) {
+  	    ~indexOf(result, key) || push(result, key);
+  	  }
+  	  return result;
+  	};
+  	return objectKeysInternal;
+  }
+
+  var enumBugKeys;
+  var hasRequiredEnumBugKeys;
+
+  function requireEnumBugKeys () {
+  	if (hasRequiredEnumBugKeys) return enumBugKeys;
+  	hasRequiredEnumBugKeys = 1;
+  	// IE8- don't enum bug keys
+  	enumBugKeys = [
+  	  'constructor',
+  	  'hasOwnProperty',
+  	  'isPrototypeOf',
+  	  'propertyIsEnumerable',
+  	  'toLocaleString',
+  	  'toString',
+  	  'valueOf'
+  	];
+  	return enumBugKeys;
+  }
+
+  var hasRequiredObjectGetOwnPropertyNames;
+
+  function requireObjectGetOwnPropertyNames () {
+  	if (hasRequiredObjectGetOwnPropertyNames) return objectGetOwnPropertyNames;
+  	hasRequiredObjectGetOwnPropertyNames = 1;
+  	var internalObjectKeys = requireObjectKeysInternal();
+  	var enumBugKeys = requireEnumBugKeys();
+
+  	var hiddenKeys = enumBugKeys.concat('length', 'prototype');
+
+  	// `Object.getOwnPropertyNames` method
+  	// https://tc39.es/ecma262/#sec-object.getownpropertynames
+  	// eslint-disable-next-line es/no-object-getownpropertynames -- safe
+  	objectGetOwnPropertyNames.f = Object.getOwnPropertyNames || function getOwnPropertyNames(O) {
+  	  return internalObjectKeys(O, hiddenKeys);
+  	};
+  	return objectGetOwnPropertyNames;
+  }
 
   var objectGetOwnPropertySymbols = {};
 
-  // eslint-disable-next-line es/no-object-getownpropertysymbols -- safe
-  objectGetOwnPropertySymbols.f = Object.getOwnPropertySymbols;
+  var hasRequiredObjectGetOwnPropertySymbols;
 
-  var getBuiltIn$2 = getBuiltIn$4;
-  var uncurryThis$a = functionUncurryThis;
-  var getOwnPropertyNamesModule = objectGetOwnPropertyNames;
-  var getOwnPropertySymbolsModule$1 = objectGetOwnPropertySymbols;
-  var anObject$8 = anObject$a;
+  function requireObjectGetOwnPropertySymbols () {
+  	if (hasRequiredObjectGetOwnPropertySymbols) return objectGetOwnPropertySymbols;
+  	hasRequiredObjectGetOwnPropertySymbols = 1;
+  	// eslint-disable-next-line es/no-object-getownpropertysymbols -- safe
+  	objectGetOwnPropertySymbols.f = Object.getOwnPropertySymbols;
+  	return objectGetOwnPropertySymbols;
+  }
 
-  var concat$1 = uncurryThis$a([].concat);
+  var ownKeys;
+  var hasRequiredOwnKeys;
 
-  // all object keys, includes non-enumerable and symbols
-  var ownKeys$1 = getBuiltIn$2('Reflect', 'ownKeys') || function ownKeys(it) {
-    var keys = getOwnPropertyNamesModule.f(anObject$8(it));
-    var getOwnPropertySymbols = getOwnPropertySymbolsModule$1.f;
-    return getOwnPropertySymbols ? concat$1(keys, getOwnPropertySymbols(it)) : keys;
-  };
+  function requireOwnKeys () {
+  	if (hasRequiredOwnKeys) return ownKeys;
+  	hasRequiredOwnKeys = 1;
+  	var getBuiltIn = requireGetBuiltIn();
+  	var uncurryThis = requireFunctionUncurryThis();
+  	var getOwnPropertyNamesModule = requireObjectGetOwnPropertyNames();
+  	var getOwnPropertySymbolsModule = requireObjectGetOwnPropertySymbols();
+  	var anObject = requireAnObject();
 
-  var hasOwn$4 = hasOwnProperty_1;
-  var ownKeys = ownKeys$1;
-  var getOwnPropertyDescriptorModule = objectGetOwnPropertyDescriptor;
-  var definePropertyModule$2 = objectDefineProperty;
+  	var concat = uncurryThis([].concat);
 
-  var copyConstructorProperties$1 = function (target, source, exceptions) {
-    var keys = ownKeys(source);
-    var defineProperty = definePropertyModule$2.f;
-    var getOwnPropertyDescriptor = getOwnPropertyDescriptorModule.f;
-    for (var i = 0; i < keys.length; i++) {
-      var key = keys[i];
-      if (!hasOwn$4(target, key) && !(exceptions && hasOwn$4(exceptions, key))) {
-        defineProperty(target, key, getOwnPropertyDescriptor(source, key));
-      }
-    }
-  };
+  	// all object keys, includes non-enumerable and symbols
+  	ownKeys = getBuiltIn('Reflect', 'ownKeys') || function ownKeys(it) {
+  	  var keys = getOwnPropertyNamesModule.f(anObject(it));
+  	  var getOwnPropertySymbols = getOwnPropertySymbolsModule.f;
+  	  return getOwnPropertySymbols ? concat(keys, getOwnPropertySymbols(it)) : keys;
+  	};
+  	return ownKeys;
+  }
 
-  var fails$d = fails$l;
-  var isCallable$7 = isCallable$h;
+  var copyConstructorProperties;
+  var hasRequiredCopyConstructorProperties;
 
-  var replacement = /#|\.prototype\./;
+  function requireCopyConstructorProperties () {
+  	if (hasRequiredCopyConstructorProperties) return copyConstructorProperties;
+  	hasRequiredCopyConstructorProperties = 1;
+  	var hasOwn = requireHasOwnProperty();
+  	var ownKeys = requireOwnKeys();
+  	var getOwnPropertyDescriptorModule = requireObjectGetOwnPropertyDescriptor();
+  	var definePropertyModule = requireObjectDefineProperty();
 
-  var isForced$1 = function (feature, detection) {
-    var value = data[normalize(feature)];
-    return value === POLYFILL ? true
-      : value === NATIVE ? false
-      : isCallable$7(detection) ? fails$d(detection)
-      : !!detection;
-  };
+  	copyConstructorProperties = function (target, source, exceptions) {
+  	  var keys = ownKeys(source);
+  	  var defineProperty = definePropertyModule.f;
+  	  var getOwnPropertyDescriptor = getOwnPropertyDescriptorModule.f;
+  	  for (var i = 0; i < keys.length; i++) {
+  	    var key = keys[i];
+  	    if (!hasOwn(target, key) && !(exceptions && hasOwn(exceptions, key))) {
+  	      defineProperty(target, key, getOwnPropertyDescriptor(source, key));
+  	    }
+  	  }
+  	};
+  	return copyConstructorProperties;
+  }
 
-  var normalize = isForced$1.normalize = function (string) {
-    return String(string).replace(replacement, '.').toLowerCase();
-  };
+  var isForced_1;
+  var hasRequiredIsForced;
 
-  var data = isForced$1.data = {};
-  var NATIVE = isForced$1.NATIVE = 'N';
-  var POLYFILL = isForced$1.POLYFILL = 'P';
+  function requireIsForced () {
+  	if (hasRequiredIsForced) return isForced_1;
+  	hasRequiredIsForced = 1;
+  	var fails = requireFails();
+  	var isCallable = requireIsCallable();
 
-  var isForced_1 = isForced$1;
+  	var replacement = /#|\.prototype\./;
 
-  var global$7 = global$g;
-  var getOwnPropertyDescriptor$1 = objectGetOwnPropertyDescriptor.f;
-  var createNonEnumerableProperty$3 = createNonEnumerableProperty$5;
-  var defineBuiltIn$7 = defineBuiltIn$8;
-  var defineGlobalProperty = defineGlobalProperty$3;
-  var copyConstructorProperties = copyConstructorProperties$1;
-  var isForced = isForced_1;
+  	var isForced = function (feature, detection) {
+  	  var value = data[normalize(feature)];
+  	  return value === POLYFILL ? true
+  	    : value === NATIVE ? false
+  	    : isCallable(detection) ? fails(detection)
+  	    : !!detection;
+  	};
 
-  /*
-    options.target         - name of the target object
-    options.global         - target is the global object
-    options.stat           - export as static methods of target
-    options.proto          - export as prototype methods of target
-    options.real           - real prototype method for the `pure` version
-    options.forced         - export even if the native feature is available
-    options.bind           - bind methods to the target, required for the `pure` version
-    options.wrap           - wrap constructors to preventing global pollution, required for the `pure` version
-    options.unsafe         - use the simple assignment of property instead of delete + defineProperty
-    options.sham           - add a flag to not completely full polyfills
-    options.enumerable     - export as enumerable property
-    options.dontCallGetSet - prevent calling a getter on target
-    options.name           - the .name of the function if it does not match the key
-  */
-  var _export = function (options, source) {
-    var TARGET = options.target;
-    var GLOBAL = options.global;
-    var STATIC = options.stat;
-    var FORCED, target, key, targetProperty, sourceProperty, descriptor;
-    if (GLOBAL) {
-      target = global$7;
-    } else if (STATIC) {
-      target = global$7[TARGET] || defineGlobalProperty(TARGET, {});
-    } else {
-      target = global$7[TARGET] && global$7[TARGET].prototype;
-    }
-    if (target) for (key in source) {
-      sourceProperty = source[key];
-      if (options.dontCallGetSet) {
-        descriptor = getOwnPropertyDescriptor$1(target, key);
-        targetProperty = descriptor && descriptor.value;
-      } else targetProperty = target[key];
-      FORCED = isForced(GLOBAL ? key : TARGET + (STATIC ? '.' : '#') + key, options.forced);
-      // contained in target
-      if (!FORCED && targetProperty !== undefined) {
-        if (typeof sourceProperty == typeof targetProperty) continue;
-        copyConstructorProperties(sourceProperty, targetProperty);
-      }
-      // add a flag to not completely full polyfills
-      if (options.sham || (targetProperty && targetProperty.sham)) {
-        createNonEnumerableProperty$3(sourceProperty, 'sham', true);
-      }
-      defineBuiltIn$7(target, key, sourceProperty, options);
-    }
-  };
+  	var normalize = isForced.normalize = function (string) {
+  	  return String(string).replace(replacement, '.').toLowerCase();
+  	};
 
-  var classof$7 = classofRaw$2;
+  	var data = isForced.data = {};
+  	var NATIVE = isForced.NATIVE = 'N';
+  	var POLYFILL = isForced.POLYFILL = 'P';
 
-  // `IsArray` abstract operation
-  // https://tc39.es/ecma262/#sec-isarray
-  // eslint-disable-next-line es/no-array-isarray -- safe
-  var isArray$2 = Array.isArray || function isArray(argument) {
-    return classof$7(argument) === 'Array';
-  };
+  	isForced_1 = isForced;
+  	return isForced_1;
+  }
 
-  var $TypeError$5 = TypeError;
-  var MAX_SAFE_INTEGER = 0x1FFFFFFFFFFFFF; // 2 ** 53 - 1 == 9007199254740991
+  var _export;
+  var hasRequired_export;
 
-  var doesNotExceedSafeInteger$1 = function (it) {
-    if (it > MAX_SAFE_INTEGER) throw $TypeError$5('Maximum allowed index exceeded');
-    return it;
-  };
+  function require_export () {
+  	if (hasRequired_export) return _export;
+  	hasRequired_export = 1;
+  	var globalThis = requireGlobalThis();
+  	var getOwnPropertyDescriptor = requireObjectGetOwnPropertyDescriptor().f;
+  	var createNonEnumerableProperty = requireCreateNonEnumerableProperty();
+  	var defineBuiltIn = requireDefineBuiltIn();
+  	var defineGlobalProperty = requireDefineGlobalProperty();
+  	var copyConstructorProperties = requireCopyConstructorProperties();
+  	var isForced = requireIsForced();
 
-  var DESCRIPTORS$7 = descriptors;
-  var definePropertyModule$1 = objectDefineProperty;
-  var createPropertyDescriptor$2 = createPropertyDescriptor$5;
+  	/*
+  	  options.target         - name of the target object
+  	  options.global         - target is the global object
+  	  options.stat           - export as static methods of target
+  	  options.proto          - export as prototype methods of target
+  	  options.real           - real prototype method for the `pure` version
+  	  options.forced         - export even if the native feature is available
+  	  options.bind           - bind methods to the target, required for the `pure` version
+  	  options.wrap           - wrap constructors to preventing global pollution, required for the `pure` version
+  	  options.unsafe         - use the simple assignment of property instead of delete + defineProperty
+  	  options.sham           - add a flag to not completely full polyfills
+  	  options.enumerable     - export as enumerable property
+  	  options.dontCallGetSet - prevent calling a getter on target
+  	  options.name           - the .name of the function if it does not match the key
+  	*/
+  	_export = function (options, source) {
+  	  var TARGET = options.target;
+  	  var GLOBAL = options.global;
+  	  var STATIC = options.stat;
+  	  var FORCED, target, key, targetProperty, sourceProperty, descriptor;
+  	  if (GLOBAL) {
+  	    target = globalThis;
+  	  } else if (STATIC) {
+  	    target = globalThis[TARGET] || defineGlobalProperty(TARGET, {});
+  	  } else {
+  	    target = globalThis[TARGET] && globalThis[TARGET].prototype;
+  	  }
+  	  if (target) for (key in source) {
+  	    sourceProperty = source[key];
+  	    if (options.dontCallGetSet) {
+  	      descriptor = getOwnPropertyDescriptor(target, key);
+  	      targetProperty = descriptor && descriptor.value;
+  	    } else targetProperty = target[key];
+  	    FORCED = isForced(GLOBAL ? key : TARGET + (STATIC ? '.' : '#') + key, options.forced);
+  	    // contained in target
+  	    if (!FORCED && targetProperty !== undefined) {
+  	      if (typeof sourceProperty == typeof targetProperty) continue;
+  	      copyConstructorProperties(sourceProperty, targetProperty);
+  	    }
+  	    // add a flag to not completely full polyfills
+  	    if (options.sham || (targetProperty && targetProperty.sham)) {
+  	      createNonEnumerableProperty(sourceProperty, 'sham', true);
+  	    }
+  	    defineBuiltIn(target, key, sourceProperty, options);
+  	  }
+  	};
+  	return _export;
+  }
 
-  var createProperty$1 = function (object, key, value) {
-    if (DESCRIPTORS$7) definePropertyModule$1.f(object, key, createPropertyDescriptor$2(0, value));
-    else object[key] = value;
-  };
+  var isArray;
+  var hasRequiredIsArray;
 
-  var wellKnownSymbol$d = wellKnownSymbol$f;
+  function requireIsArray () {
+  	if (hasRequiredIsArray) return isArray;
+  	hasRequiredIsArray = 1;
+  	var classof = requireClassofRaw();
 
-  var TO_STRING_TAG$2 = wellKnownSymbol$d('toStringTag');
-  var test = {};
+  	// `IsArray` abstract operation
+  	// https://tc39.es/ecma262/#sec-isarray
+  	// eslint-disable-next-line es/no-array-isarray -- safe
+  	isArray = Array.isArray || function isArray(argument) {
+  	  return classof(argument) === 'Array';
+  	};
+  	return isArray;
+  }
 
-  test[TO_STRING_TAG$2] = 'z';
+  var doesNotExceedSafeInteger;
+  var hasRequiredDoesNotExceedSafeInteger;
 
-  var toStringTagSupport = String(test) === '[object z]';
+  function requireDoesNotExceedSafeInteger () {
+  	if (hasRequiredDoesNotExceedSafeInteger) return doesNotExceedSafeInteger;
+  	hasRequiredDoesNotExceedSafeInteger = 1;
+  	var $TypeError = TypeError;
+  	var MAX_SAFE_INTEGER = 0x1FFFFFFFFFFFFF; // 2 ** 53 - 1 == 9007199254740991
 
-  var TO_STRING_TAG_SUPPORT$2 = toStringTagSupport;
-  var isCallable$6 = isCallable$h;
-  var classofRaw$1 = classofRaw$2;
-  var wellKnownSymbol$c = wellKnownSymbol$f;
+  	doesNotExceedSafeInteger = function (it) {
+  	  if (it > MAX_SAFE_INTEGER) throw $TypeError('Maximum allowed index exceeded');
+  	  return it;
+  	};
+  	return doesNotExceedSafeInteger;
+  }
 
-  var TO_STRING_TAG$1 = wellKnownSymbol$c('toStringTag');
-  var $Object$1 = Object;
+  var createProperty;
+  var hasRequiredCreateProperty;
 
-  // ES3 wrong here
-  var CORRECT_ARGUMENTS = classofRaw$1(function () { return arguments; }()) === 'Arguments';
+  function requireCreateProperty () {
+  	if (hasRequiredCreateProperty) return createProperty;
+  	hasRequiredCreateProperty = 1;
+  	var DESCRIPTORS = requireDescriptors();
+  	var definePropertyModule = requireObjectDefineProperty();
+  	var createPropertyDescriptor = requireCreatePropertyDescriptor();
 
-  // fallback for IE11 Script Access Denied error
-  var tryGet = function (it, key) {
-    try {
-      return it[key];
-    } catch (error) { /* empty */ }
-  };
+  	createProperty = function (object, key, value) {
+  	  if (DESCRIPTORS) definePropertyModule.f(object, key, createPropertyDescriptor(0, value));
+  	  else object[key] = value;
+  	};
+  	return createProperty;
+  }
 
-  // getting tag from ES6+ `Object.prototype.toString`
-  var classof$6 = TO_STRING_TAG_SUPPORT$2 ? classofRaw$1 : function (it) {
-    var O, tag, result;
-    return it === undefined ? 'Undefined' : it === null ? 'Null'
-      // @@toStringTag case
-      : typeof (tag = tryGet(O = $Object$1(it), TO_STRING_TAG$1)) == 'string' ? tag
-      // builtinTag case
-      : CORRECT_ARGUMENTS ? classofRaw$1(O)
-      // ES3 arguments fallback
-      : (result = classofRaw$1(O)) === 'Object' && isCallable$6(O.callee) ? 'Arguments' : result;
-  };
+  var toStringTagSupport;
+  var hasRequiredToStringTagSupport;
 
-  var uncurryThis$9 = functionUncurryThis;
-  var fails$c = fails$l;
-  var isCallable$5 = isCallable$h;
-  var classof$5 = classof$6;
-  var getBuiltIn$1 = getBuiltIn$4;
-  var inspectSource = inspectSource$2;
+  function requireToStringTagSupport () {
+  	if (hasRequiredToStringTagSupport) return toStringTagSupport;
+  	hasRequiredToStringTagSupport = 1;
+  	var wellKnownSymbol = requireWellKnownSymbol();
 
-  var noop = function () { /* empty */ };
-  var construct = getBuiltIn$1('Reflect', 'construct');
-  var constructorRegExp = /^\s*(?:class|function)\b/;
-  var exec$1 = uncurryThis$9(constructorRegExp.exec);
-  var INCORRECT_TO_STRING = !constructorRegExp.test(noop);
+  	var TO_STRING_TAG = wellKnownSymbol('toStringTag');
+  	var test = {};
 
-  var isConstructorModern = function isConstructor(argument) {
-    if (!isCallable$5(argument)) return false;
-    try {
-      construct(noop, [], argument);
-      return true;
-    } catch (error) {
-      return false;
-    }
-  };
+  	test[TO_STRING_TAG] = 'z';
 
-  var isConstructorLegacy = function isConstructor(argument) {
-    if (!isCallable$5(argument)) return false;
-    switch (classof$5(argument)) {
-      case 'AsyncFunction':
-      case 'GeneratorFunction':
-      case 'AsyncGeneratorFunction': return false;
-    }
-    try {
-      // we can't check .prototype since constructors produced by .bind haven't it
-      // `Function#toString` throws on some built-it function in some legacy engines
-      // (for example, `DOMQuad` and similar in FF41-)
-      return INCORRECT_TO_STRING || !!exec$1(constructorRegExp, inspectSource(argument));
-    } catch (error) {
-      return true;
-    }
-  };
+  	toStringTagSupport = String(test) === '[object z]';
+  	return toStringTagSupport;
+  }
 
-  isConstructorLegacy.sham = true;
+  var classof;
+  var hasRequiredClassof;
 
-  // `IsConstructor` abstract operation
-  // https://tc39.es/ecma262/#sec-isconstructor
-  var isConstructor$1 = !construct || fails$c(function () {
-    var called;
-    return isConstructorModern(isConstructorModern.call)
-      || !isConstructorModern(Object)
-      || !isConstructorModern(function () { called = true; })
-      || called;
-  }) ? isConstructorLegacy : isConstructorModern;
+  function requireClassof () {
+  	if (hasRequiredClassof) return classof;
+  	hasRequiredClassof = 1;
+  	var TO_STRING_TAG_SUPPORT = requireToStringTagSupport();
+  	var isCallable = requireIsCallable();
+  	var classofRaw = requireClassofRaw();
+  	var wellKnownSymbol = requireWellKnownSymbol();
 
-  var isArray$1 = isArray$2;
-  var isConstructor = isConstructor$1;
-  var isObject$5 = isObject$b;
-  var wellKnownSymbol$b = wellKnownSymbol$f;
+  	var TO_STRING_TAG = wellKnownSymbol('toStringTag');
+  	var $Object = Object;
 
-  var SPECIES$2 = wellKnownSymbol$b('species');
-  var $Array = Array;
+  	// ES3 wrong here
+  	var CORRECT_ARGUMENTS = classofRaw(function () { return arguments; }()) === 'Arguments';
 
-  // a part of `ArraySpeciesCreate` abstract operation
-  // https://tc39.es/ecma262/#sec-arrayspeciescreate
-  var arraySpeciesConstructor$1 = function (originalArray) {
-    var C;
-    if (isArray$1(originalArray)) {
-      C = originalArray.constructor;
-      // cross-realm fallback
-      if (isConstructor(C) && (C === $Array || isArray$1(C.prototype))) C = undefined;
-      else if (isObject$5(C)) {
-        C = C[SPECIES$2];
-        if (C === null) C = undefined;
-      }
-    } return C === undefined ? $Array : C;
-  };
+  	// fallback for IE11 Script Access Denied error
+  	var tryGet = function (it, key) {
+  	  try {
+  	    return it[key];
+  	  } catch (error) { /* empty */ }
+  	};
 
-  var arraySpeciesConstructor = arraySpeciesConstructor$1;
+  	// getting tag from ES6+ `Object.prototype.toString`
+  	classof = TO_STRING_TAG_SUPPORT ? classofRaw : function (it) {
+  	  var O, tag, result;
+  	  return it === undefined ? 'Undefined' : it === null ? 'Null'
+  	    // @@toStringTag case
+  	    : typeof (tag = tryGet(O = $Object(it), TO_STRING_TAG)) == 'string' ? tag
+  	    // builtinTag case
+  	    : CORRECT_ARGUMENTS ? classofRaw(O)
+  	    // ES3 arguments fallback
+  	    : (result = classofRaw(O)) === 'Object' && isCallable(O.callee) ? 'Arguments' : result;
+  	};
+  	return classof;
+  }
 
-  // `ArraySpeciesCreate` abstract operation
-  // https://tc39.es/ecma262/#sec-arrayspeciescreate
-  var arraySpeciesCreate$1 = function (originalArray, length) {
-    return new (arraySpeciesConstructor(originalArray))(length === 0 ? 0 : length);
-  };
+  var isConstructor;
+  var hasRequiredIsConstructor;
 
-  var fails$b = fails$l;
-  var wellKnownSymbol$a = wellKnownSymbol$f;
-  var V8_VERSION$1 = engineV8Version;
+  function requireIsConstructor () {
+  	if (hasRequiredIsConstructor) return isConstructor;
+  	hasRequiredIsConstructor = 1;
+  	var uncurryThis = requireFunctionUncurryThis();
+  	var fails = requireFails();
+  	var isCallable = requireIsCallable();
+  	var classof = requireClassof();
+  	var getBuiltIn = requireGetBuiltIn();
+  	var inspectSource = requireInspectSource();
 
-  var SPECIES$1 = wellKnownSymbol$a('species');
+  	var noop = function () { /* empty */ };
+  	var construct = getBuiltIn('Reflect', 'construct');
+  	var constructorRegExp = /^\s*(?:class|function)\b/;
+  	var exec = uncurryThis(constructorRegExp.exec);
+  	var INCORRECT_TO_STRING = !constructorRegExp.test(noop);
 
-  var arrayMethodHasSpeciesSupport$1 = function (METHOD_NAME) {
-    // We can't use this feature detection in V8 since it causes
-    // deoptimization and serious performance degradation
-    // https://github.com/zloirock/core-js/issues/677
-    return V8_VERSION$1 >= 51 || !fails$b(function () {
-      var array = [];
-      var constructor = array.constructor = {};
-      constructor[SPECIES$1] = function () {
-        return { foo: 1 };
-      };
-      return array[METHOD_NAME](Boolean).foo !== 1;
-    });
-  };
+  	var isConstructorModern = function isConstructor(argument) {
+  	  if (!isCallable(argument)) return false;
+  	  try {
+  	    construct(noop, [], argument);
+  	    return true;
+  	  } catch (error) {
+  	    return false;
+  	  }
+  	};
 
-  var $$5 = _export;
-  var fails$a = fails$l;
-  var isArray = isArray$2;
-  var isObject$4 = isObject$b;
-  var toObject$2 = toObject$4;
-  var lengthOfArrayLike = lengthOfArrayLike$2;
-  var doesNotExceedSafeInteger = doesNotExceedSafeInteger$1;
-  var createProperty = createProperty$1;
-  var arraySpeciesCreate = arraySpeciesCreate$1;
-  var arrayMethodHasSpeciesSupport = arrayMethodHasSpeciesSupport$1;
-  var wellKnownSymbol$9 = wellKnownSymbol$f;
-  var V8_VERSION = engineV8Version;
+  	var isConstructorLegacy = function isConstructor(argument) {
+  	  if (!isCallable(argument)) return false;
+  	  switch (classof(argument)) {
+  	    case 'AsyncFunction':
+  	    case 'GeneratorFunction':
+  	    case 'AsyncGeneratorFunction': return false;
+  	  }
+  	  try {
+  	    // we can't check .prototype since constructors produced by .bind haven't it
+  	    // `Function#toString` throws on some built-it function in some legacy engines
+  	    // (for example, `DOMQuad` and similar in FF41-)
+  	    return INCORRECT_TO_STRING || !!exec(constructorRegExp, inspectSource(argument));
+  	  } catch (error) {
+  	    return true;
+  	  }
+  	};
 
-  var IS_CONCAT_SPREADABLE = wellKnownSymbol$9('isConcatSpreadable');
+  	isConstructorLegacy.sham = true;
 
-  // We can't use this feature detection in V8 since it causes
-  // deoptimization and serious performance degradation
-  // https://github.com/zloirock/core-js/issues/679
-  var IS_CONCAT_SPREADABLE_SUPPORT = V8_VERSION >= 51 || !fails$a(function () {
-    var array = [];
-    array[IS_CONCAT_SPREADABLE] = false;
-    return array.concat()[0] !== array;
-  });
+  	// `IsConstructor` abstract operation
+  	// https://tc39.es/ecma262/#sec-isconstructor
+  	isConstructor = !construct || fails(function () {
+  	  var called;
+  	  return isConstructorModern(isConstructorModern.call)
+  	    || !isConstructorModern(Object)
+  	    || !isConstructorModern(function () { called = true; })
+  	    || called;
+  	}) ? isConstructorLegacy : isConstructorModern;
+  	return isConstructor;
+  }
 
-  var isConcatSpreadable = function (O) {
-    if (!isObject$4(O)) return false;
-    var spreadable = O[IS_CONCAT_SPREADABLE];
-    return spreadable !== undefined ? !!spreadable : isArray(O);
-  };
+  var arraySpeciesConstructor;
+  var hasRequiredArraySpeciesConstructor;
 
-  var FORCED = !IS_CONCAT_SPREADABLE_SUPPORT || !arrayMethodHasSpeciesSupport('concat');
+  function requireArraySpeciesConstructor () {
+  	if (hasRequiredArraySpeciesConstructor) return arraySpeciesConstructor;
+  	hasRequiredArraySpeciesConstructor = 1;
+  	var isArray = requireIsArray();
+  	var isConstructor = requireIsConstructor();
+  	var isObject = requireIsObject();
+  	var wellKnownSymbol = requireWellKnownSymbol();
 
-  // `Array.prototype.concat` method
-  // https://tc39.es/ecma262/#sec-array.prototype.concat
-  // with adding support of @@isConcatSpreadable and @@species
-  $$5({ target: 'Array', proto: true, arity: 1, forced: FORCED }, {
-    // eslint-disable-next-line no-unused-vars -- required for `.length`
-    concat: function concat(arg) {
-      var O = toObject$2(this);
-      var A = arraySpeciesCreate(O, 0);
-      var n = 0;
-      var i, k, length, len, E;
-      for (i = -1, length = arguments.length; i < length; i++) {
-        E = i === -1 ? O : arguments[i];
-        if (isConcatSpreadable(E)) {
-          len = lengthOfArrayLike(E);
-          doesNotExceedSafeInteger(n + len);
-          for (k = 0; k < len; k++, n++) if (k in E) createProperty(A, n, E[k]);
-        } else {
-          doesNotExceedSafeInteger(n + 1);
-          createProperty(A, n++, E);
-        }
-      }
-      A.length = n;
-      return A;
-    }
-  });
+  	var SPECIES = wellKnownSymbol('species');
+  	var $Array = Array;
+
+  	// a part of `ArraySpeciesCreate` abstract operation
+  	// https://tc39.es/ecma262/#sec-arrayspeciescreate
+  	arraySpeciesConstructor = function (originalArray) {
+  	  var C;
+  	  if (isArray(originalArray)) {
+  	    C = originalArray.constructor;
+  	    // cross-realm fallback
+  	    if (isConstructor(C) && (C === $Array || isArray(C.prototype))) C = undefined;
+  	    else if (isObject(C)) {
+  	      C = C[SPECIES];
+  	      if (C === null) C = undefined;
+  	    }
+  	  } return C === undefined ? $Array : C;
+  	};
+  	return arraySpeciesConstructor;
+  }
+
+  var arraySpeciesCreate;
+  var hasRequiredArraySpeciesCreate;
+
+  function requireArraySpeciesCreate () {
+  	if (hasRequiredArraySpeciesCreate) return arraySpeciesCreate;
+  	hasRequiredArraySpeciesCreate = 1;
+  	var arraySpeciesConstructor = requireArraySpeciesConstructor();
+
+  	// `ArraySpeciesCreate` abstract operation
+  	// https://tc39.es/ecma262/#sec-arrayspeciescreate
+  	arraySpeciesCreate = function (originalArray, length) {
+  	  return new (arraySpeciesConstructor(originalArray))(length === 0 ? 0 : length);
+  	};
+  	return arraySpeciesCreate;
+  }
+
+  var arrayMethodHasSpeciesSupport;
+  var hasRequiredArrayMethodHasSpeciesSupport;
+
+  function requireArrayMethodHasSpeciesSupport () {
+  	if (hasRequiredArrayMethodHasSpeciesSupport) return arrayMethodHasSpeciesSupport;
+  	hasRequiredArrayMethodHasSpeciesSupport = 1;
+  	var fails = requireFails();
+  	var wellKnownSymbol = requireWellKnownSymbol();
+  	var V8_VERSION = requireEnvironmentV8Version();
+
+  	var SPECIES = wellKnownSymbol('species');
+
+  	arrayMethodHasSpeciesSupport = function (METHOD_NAME) {
+  	  // We can't use this feature detection in V8 since it causes
+  	  // deoptimization and serious performance degradation
+  	  // https://github.com/zloirock/core-js/issues/677
+  	  return V8_VERSION >= 51 || !fails(function () {
+  	    var array = [];
+  	    var constructor = array.constructor = {};
+  	    constructor[SPECIES] = function () {
+  	      return { foo: 1 };
+  	    };
+  	    return array[METHOD_NAME](Boolean).foo !== 1;
+  	  });
+  	};
+  	return arrayMethodHasSpeciesSupport;
+  }
+
+  var hasRequiredEs_array_concat;
+
+  function requireEs_array_concat () {
+  	if (hasRequiredEs_array_concat) return es_array_concat;
+  	hasRequiredEs_array_concat = 1;
+  	var $ = require_export();
+  	var fails = requireFails();
+  	var isArray = requireIsArray();
+  	var isObject = requireIsObject();
+  	var toObject = requireToObject();
+  	var lengthOfArrayLike = requireLengthOfArrayLike();
+  	var doesNotExceedSafeInteger = requireDoesNotExceedSafeInteger();
+  	var createProperty = requireCreateProperty();
+  	var arraySpeciesCreate = requireArraySpeciesCreate();
+  	var arrayMethodHasSpeciesSupport = requireArrayMethodHasSpeciesSupport();
+  	var wellKnownSymbol = requireWellKnownSymbol();
+  	var V8_VERSION = requireEnvironmentV8Version();
+
+  	var IS_CONCAT_SPREADABLE = wellKnownSymbol('isConcatSpreadable');
+
+  	// We can't use this feature detection in V8 since it causes
+  	// deoptimization and serious performance degradation
+  	// https://github.com/zloirock/core-js/issues/679
+  	var IS_CONCAT_SPREADABLE_SUPPORT = V8_VERSION >= 51 || !fails(function () {
+  	  var array = [];
+  	  array[IS_CONCAT_SPREADABLE] = false;
+  	  return array.concat()[0] !== array;
+  	});
+
+  	var isConcatSpreadable = function (O) {
+  	  if (!isObject(O)) return false;
+  	  var spreadable = O[IS_CONCAT_SPREADABLE];
+  	  return spreadable !== undefined ? !!spreadable : isArray(O);
+  	};
+
+  	var FORCED = !IS_CONCAT_SPREADABLE_SUPPORT || !arrayMethodHasSpeciesSupport('concat');
+
+  	// `Array.prototype.concat` method
+  	// https://tc39.es/ecma262/#sec-array.prototype.concat
+  	// with adding support of @@isConcatSpreadable and @@species
+  	$({ target: 'Array', proto: true, arity: 1, forced: FORCED }, {
+  	  // eslint-disable-next-line no-unused-vars -- required for `.length`
+  	  concat: function concat(arg) {
+  	    var O = toObject(this);
+  	    var A = arraySpeciesCreate(O, 0);
+  	    var n = 0;
+  	    var i, k, length, len, E;
+  	    for (i = -1, length = arguments.length; i < length; i++) {
+  	      E = i === -1 ? O : arguments[i];
+  	      if (isConcatSpreadable(E)) {
+  	        len = lengthOfArrayLike(E);
+  	        doesNotExceedSafeInteger(n + len);
+  	        for (k = 0; k < len; k++, n++) if (k in E) createProperty(A, n, E[k]);
+  	      } else {
+  	        doesNotExceedSafeInteger(n + 1);
+  	        createProperty(A, n++, E);
+  	      }
+  	    }
+  	    A.length = n;
+  	    return A;
+  	  }
+  	});
+  	return es_array_concat;
+  }
+
+  requireEs_array_concat();
 
   var objectDefineProperties = {};
 
-  var internalObjectKeys = objectKeysInternal;
-  var enumBugKeys$1 = enumBugKeys$3;
+  var objectKeys;
+  var hasRequiredObjectKeys;
 
-  // `Object.keys` method
-  // https://tc39.es/ecma262/#sec-object.keys
-  // eslint-disable-next-line es/no-object-keys -- safe
-  var objectKeys$3 = Object.keys || function keys(O) {
-    return internalObjectKeys(O, enumBugKeys$1);
-  };
+  function requireObjectKeys () {
+  	if (hasRequiredObjectKeys) return objectKeys;
+  	hasRequiredObjectKeys = 1;
+  	var internalObjectKeys = requireObjectKeysInternal();
+  	var enumBugKeys = requireEnumBugKeys();
 
-  var DESCRIPTORS$6 = descriptors;
-  var V8_PROTOTYPE_DEFINE_BUG = v8PrototypeDefineBug;
-  var definePropertyModule = objectDefineProperty;
-  var anObject$7 = anObject$a;
-  var toIndexedObject$2 = toIndexedObject$6;
-  var objectKeys$2 = objectKeys$3;
-
-  // `Object.defineProperties` method
-  // https://tc39.es/ecma262/#sec-object.defineproperties
-  // eslint-disable-next-line es/no-object-defineproperties -- safe
-  objectDefineProperties.f = DESCRIPTORS$6 && !V8_PROTOTYPE_DEFINE_BUG ? Object.defineProperties : function defineProperties(O, Properties) {
-    anObject$7(O);
-    var props = toIndexedObject$2(Properties);
-    var keys = objectKeys$2(Properties);
-    var length = keys.length;
-    var index = 0;
-    var key;
-    while (length > index) definePropertyModule.f(O, key = keys[index++], props[key]);
-    return O;
-  };
-
-  var getBuiltIn = getBuiltIn$4;
-
-  var html$1 = getBuiltIn('document', 'documentElement');
-
-  /* global ActiveXObject -- old IE, WSH */
-  var anObject$6 = anObject$a;
-  var definePropertiesModule = objectDefineProperties;
-  var enumBugKeys = enumBugKeys$3;
-  var hiddenKeys = hiddenKeys$4;
-  var html = html$1;
-  var documentCreateElement$1 = documentCreateElement$2;
-  var sharedKey$1 = sharedKey$3;
-
-  var GT = '>';
-  var LT = '<';
-  var PROTOTYPE = 'prototype';
-  var SCRIPT = 'script';
-  var IE_PROTO$1 = sharedKey$1('IE_PROTO');
-
-  var EmptyConstructor = function () { /* empty */ };
-
-  var scriptTag = function (content) {
-    return LT + SCRIPT + GT + content + LT + '/' + SCRIPT + GT;
-  };
-
-  // Create object with fake `null` prototype: use ActiveX Object with cleared prototype
-  var NullProtoObjectViaActiveX = function (activeXDocument) {
-    activeXDocument.write(scriptTag(''));
-    activeXDocument.close();
-    var temp = activeXDocument.parentWindow.Object;
-    activeXDocument = null; // avoid memory leak
-    return temp;
-  };
-
-  // Create object with fake `null` prototype: use iframe Object with cleared prototype
-  var NullProtoObjectViaIFrame = function () {
-    // Thrash, waste and sodomy: IE GC bug
-    var iframe = documentCreateElement$1('iframe');
-    var JS = 'java' + SCRIPT + ':';
-    var iframeDocument;
-    iframe.style.display = 'none';
-    html.appendChild(iframe);
-    // https://github.com/zloirock/core-js/issues/475
-    iframe.src = String(JS);
-    iframeDocument = iframe.contentWindow.document;
-    iframeDocument.open();
-    iframeDocument.write(scriptTag('document.F=Object'));
-    iframeDocument.close();
-    return iframeDocument.F;
-  };
-
-  // Check for document.domain and active x support
-  // No need to use active x approach when document.domain is not set
-  // see https://github.com/es-shims/es5-shim/issues/150
-  // variation of https://github.com/kitcambridge/es5-shim/commit/4f738ac066346
-  // avoid IE GC bug
-  var activeXDocument;
-  var NullProtoObject = function () {
-    try {
-      activeXDocument = new ActiveXObject('htmlfile');
-    } catch (error) { /* ignore */ }
-    NullProtoObject = typeof document != 'undefined'
-      ? document.domain && activeXDocument
-        ? NullProtoObjectViaActiveX(activeXDocument) // old IE
-        : NullProtoObjectViaIFrame()
-      : NullProtoObjectViaActiveX(activeXDocument); // WSH
-    var length = enumBugKeys.length;
-    while (length--) delete NullProtoObject[PROTOTYPE][enumBugKeys[length]];
-    return NullProtoObject();
-  };
-
-  hiddenKeys[IE_PROTO$1] = true;
-
-  // `Object.create` method
-  // https://tc39.es/ecma262/#sec-object.create
-  // eslint-disable-next-line es/no-object-create -- safe
-  var objectCreate = Object.create || function create(O, Properties) {
-    var result;
-    if (O !== null) {
-      EmptyConstructor[PROTOTYPE] = anObject$6(O);
-      result = new EmptyConstructor();
-      EmptyConstructor[PROTOTYPE] = null;
-      // add "__proto__" for Object.getPrototypeOf polyfill
-      result[IE_PROTO$1] = O;
-    } else result = NullProtoObject();
-    return Properties === undefined ? result : definePropertiesModule.f(result, Properties);
-  };
-
-  var wellKnownSymbol$8 = wellKnownSymbol$f;
-  var create$3 = objectCreate;
-  var defineProperty$4 = objectDefineProperty.f;
-
-  var UNSCOPABLES = wellKnownSymbol$8('unscopables');
-  var ArrayPrototype = Array.prototype;
-
-  // Array.prototype[@@unscopables]
-  // https://tc39.es/ecma262/#sec-array.prototype-@@unscopables
-  if (ArrayPrototype[UNSCOPABLES] === undefined) {
-    defineProperty$4(ArrayPrototype, UNSCOPABLES, {
-      configurable: true,
-      value: create$3(null)
-    });
+  	// `Object.keys` method
+  	// https://tc39.es/ecma262/#sec-object.keys
+  	// eslint-disable-next-line es/no-object-keys -- safe
+  	objectKeys = Object.keys || function keys(O) {
+  	  return internalObjectKeys(O, enumBugKeys);
+  	};
+  	return objectKeys;
   }
 
-  // add a key to Array.prototype[@@unscopables]
-  var addToUnscopables$1 = function (key) {
-    ArrayPrototype[UNSCOPABLES][key] = true;
-  };
+  var hasRequiredObjectDefineProperties;
 
-  var iterators = {};
+  function requireObjectDefineProperties () {
+  	if (hasRequiredObjectDefineProperties) return objectDefineProperties;
+  	hasRequiredObjectDefineProperties = 1;
+  	var DESCRIPTORS = requireDescriptors();
+  	var V8_PROTOTYPE_DEFINE_BUG = requireV8PrototypeDefineBug();
+  	var definePropertyModule = requireObjectDefineProperty();
+  	var anObject = requireAnObject();
+  	var toIndexedObject = requireToIndexedObject();
+  	var objectKeys = requireObjectKeys();
 
-  var fails$9 = fails$l;
-
-  var correctPrototypeGetter = !fails$9(function () {
-    function F() { /* empty */ }
-    F.prototype.constructor = null;
-    // eslint-disable-next-line es/no-object-getprototypeof -- required for testing
-    return Object.getPrototypeOf(new F()) !== F.prototype;
-  });
-
-  var hasOwn$3 = hasOwnProperty_1;
-  var isCallable$4 = isCallable$h;
-  var toObject$1 = toObject$4;
-  var sharedKey = sharedKey$3;
-  var CORRECT_PROTOTYPE_GETTER = correctPrototypeGetter;
-
-  var IE_PROTO = sharedKey('IE_PROTO');
-  var $Object = Object;
-  var ObjectPrototype = $Object.prototype;
-
-  // `Object.getPrototypeOf` method
-  // https://tc39.es/ecma262/#sec-object.getprototypeof
-  // eslint-disable-next-line es/no-object-getprototypeof -- safe
-  var objectGetPrototypeOf$1 = CORRECT_PROTOTYPE_GETTER ? $Object.getPrototypeOf : function (O) {
-    var object = toObject$1(O);
-    if (hasOwn$3(object, IE_PROTO)) return object[IE_PROTO];
-    var constructor = object.constructor;
-    if (isCallable$4(constructor) && object instanceof constructor) {
-      return constructor.prototype;
-    } return object instanceof $Object ? ObjectPrototype : null;
-  };
-
-  var fails$8 = fails$l;
-  var isCallable$3 = isCallable$h;
-  var isObject$3 = isObject$b;
-  var getPrototypeOf$1 = objectGetPrototypeOf$1;
-  var defineBuiltIn$6 = defineBuiltIn$8;
-  var wellKnownSymbol$7 = wellKnownSymbol$f;
-
-  var ITERATOR$5 = wellKnownSymbol$7('iterator');
-  var BUGGY_SAFARI_ITERATORS$1 = false;
-
-  // `%IteratorPrototype%` object
-  // https://tc39.es/ecma262/#sec-%iteratorprototype%-object
-  var IteratorPrototype$2, PrototypeOfArrayIteratorPrototype, arrayIterator;
-
-  /* eslint-disable es/no-array-prototype-keys -- safe */
-  if ([].keys) {
-    arrayIterator = [].keys();
-    // Safari 8 has buggy iterators w/o `next`
-    if (!('next' in arrayIterator)) BUGGY_SAFARI_ITERATORS$1 = true;
-    else {
-      PrototypeOfArrayIteratorPrototype = getPrototypeOf$1(getPrototypeOf$1(arrayIterator));
-      if (PrototypeOfArrayIteratorPrototype !== Object.prototype) IteratorPrototype$2 = PrototypeOfArrayIteratorPrototype;
-    }
+  	// `Object.defineProperties` method
+  	// https://tc39.es/ecma262/#sec-object.defineproperties
+  	// eslint-disable-next-line es/no-object-defineproperties -- safe
+  	objectDefineProperties.f = DESCRIPTORS && !V8_PROTOTYPE_DEFINE_BUG ? Object.defineProperties : function defineProperties(O, Properties) {
+  	  anObject(O);
+  	  var props = toIndexedObject(Properties);
+  	  var keys = objectKeys(Properties);
+  	  var length = keys.length;
+  	  var index = 0;
+  	  var key;
+  	  while (length > index) definePropertyModule.f(O, key = keys[index++], props[key]);
+  	  return O;
+  	};
+  	return objectDefineProperties;
   }
 
-  var NEW_ITERATOR_PROTOTYPE = !isObject$3(IteratorPrototype$2) || fails$8(function () {
-    var test = {};
-    // FF44- legacy iterators case
-    return IteratorPrototype$2[ITERATOR$5].call(test) !== test;
-  });
+  var html;
+  var hasRequiredHtml;
 
-  if (NEW_ITERATOR_PROTOTYPE) IteratorPrototype$2 = {};
+  function requireHtml () {
+  	if (hasRequiredHtml) return html;
+  	hasRequiredHtml = 1;
+  	var getBuiltIn = requireGetBuiltIn();
 
-  // `%IteratorPrototype%[@@iterator]()` method
-  // https://tc39.es/ecma262/#sec-%iteratorprototype%-@@iterator
-  if (!isCallable$3(IteratorPrototype$2[ITERATOR$5])) {
-    defineBuiltIn$6(IteratorPrototype$2, ITERATOR$5, function () {
-      return this;
-    });
+  	html = getBuiltIn('document', 'documentElement');
+  	return html;
   }
 
-  var iteratorsCore = {
-    IteratorPrototype: IteratorPrototype$2,
-    BUGGY_SAFARI_ITERATORS: BUGGY_SAFARI_ITERATORS$1
-  };
+  var objectCreate;
+  var hasRequiredObjectCreate;
 
-  var defineProperty$3 = objectDefineProperty.f;
-  var hasOwn$2 = hasOwnProperty_1;
-  var wellKnownSymbol$6 = wellKnownSymbol$f;
+  function requireObjectCreate () {
+  	if (hasRequiredObjectCreate) return objectCreate;
+  	hasRequiredObjectCreate = 1;
+  	/* global ActiveXObject -- old IE, WSH */
+  	var anObject = requireAnObject();
+  	var definePropertiesModule = requireObjectDefineProperties();
+  	var enumBugKeys = requireEnumBugKeys();
+  	var hiddenKeys = requireHiddenKeys();
+  	var html = requireHtml();
+  	var documentCreateElement = requireDocumentCreateElement();
+  	var sharedKey = requireSharedKey();
 
-  var TO_STRING_TAG = wellKnownSymbol$6('toStringTag');
+  	var GT = '>';
+  	var LT = '<';
+  	var PROTOTYPE = 'prototype';
+  	var SCRIPT = 'script';
+  	var IE_PROTO = sharedKey('IE_PROTO');
 
-  var setToStringTag$4 = function (target, TAG, STATIC) {
-    if (target && !STATIC) target = target.prototype;
-    if (target && !hasOwn$2(target, TO_STRING_TAG)) {
-      defineProperty$3(target, TO_STRING_TAG, { configurable: true, value: TAG });
-    }
-  };
+  	var EmptyConstructor = function () { /* empty */ };
 
-  var IteratorPrototype$1 = iteratorsCore.IteratorPrototype;
-  var create$2 = objectCreate;
-  var createPropertyDescriptor$1 = createPropertyDescriptor$5;
-  var setToStringTag$3 = setToStringTag$4;
-  var Iterators$3 = iterators;
+  	var scriptTag = function (content) {
+  	  return LT + SCRIPT + GT + content + LT + '/' + SCRIPT + GT;
+  	};
 
-  var returnThis$1 = function () { return this; };
+  	// Create object with fake `null` prototype: use ActiveX Object with cleared prototype
+  	var NullProtoObjectViaActiveX = function (activeXDocument) {
+  	  activeXDocument.write(scriptTag(''));
+  	  activeXDocument.close();
+  	  var temp = activeXDocument.parentWindow.Object;
+  	  // eslint-disable-next-line no-useless-assignment -- avoid memory leak
+  	  activeXDocument = null;
+  	  return temp;
+  	};
 
-  var iteratorCreateConstructor = function (IteratorConstructor, NAME, next, ENUMERABLE_NEXT) {
-    var TO_STRING_TAG = NAME + ' Iterator';
-    IteratorConstructor.prototype = create$2(IteratorPrototype$1, { next: createPropertyDescriptor$1(+!ENUMERABLE_NEXT, next) });
-    setToStringTag$3(IteratorConstructor, TO_STRING_TAG, false);
-    Iterators$3[TO_STRING_TAG] = returnThis$1;
-    return IteratorConstructor;
-  };
+  	// Create object with fake `null` prototype: use iframe Object with cleared prototype
+  	var NullProtoObjectViaIFrame = function () {
+  	  // Thrash, waste and sodomy: IE GC bug
+  	  var iframe = documentCreateElement('iframe');
+  	  var JS = 'java' + SCRIPT + ':';
+  	  var iframeDocument;
+  	  iframe.style.display = 'none';
+  	  html.appendChild(iframe);
+  	  // https://github.com/zloirock/core-js/issues/475
+  	  iframe.src = String(JS);
+  	  iframeDocument = iframe.contentWindow.document;
+  	  iframeDocument.open();
+  	  iframeDocument.write(scriptTag('document.F=Object'));
+  	  iframeDocument.close();
+  	  return iframeDocument.F;
+  	};
 
-  var uncurryThis$8 = functionUncurryThis;
-  var aCallable$2 = aCallable$4;
+  	// Check for document.domain and active x support
+  	// No need to use active x approach when document.domain is not set
+  	// see https://github.com/es-shims/es5-shim/issues/150
+  	// variation of https://github.com/kitcambridge/es5-shim/commit/4f738ac066346
+  	// avoid IE GC bug
+  	var activeXDocument;
+  	var NullProtoObject = function () {
+  	  try {
+  	    activeXDocument = new ActiveXObject('htmlfile');
+  	  } catch (error) { /* ignore */ }
+  	  NullProtoObject = typeof document != 'undefined'
+  	    ? document.domain && activeXDocument
+  	      ? NullProtoObjectViaActiveX(activeXDocument) // old IE
+  	      : NullProtoObjectViaIFrame()
+  	    : NullProtoObjectViaActiveX(activeXDocument); // WSH
+  	  var length = enumBugKeys.length;
+  	  while (length--) delete NullProtoObject[PROTOTYPE][enumBugKeys[length]];
+  	  return NullProtoObject();
+  	};
 
-  var functionUncurryThisAccessor = function (object, key, method) {
-    try {
-      // eslint-disable-next-line es/no-object-getownpropertydescriptor -- safe
-      return uncurryThis$8(aCallable$2(Object.getOwnPropertyDescriptor(object, key)[method]));
-    } catch (error) { /* empty */ }
-  };
+  	hiddenKeys[IE_PROTO] = true;
 
-  var isObject$2 = isObject$b;
-
-  var isPossiblePrototype$1 = function (argument) {
-    return isObject$2(argument) || argument === null;
-  };
-
-  var isPossiblePrototype = isPossiblePrototype$1;
-
-  var $String$1 = String;
-  var $TypeError$4 = TypeError;
-
-  var aPossiblePrototype$1 = function (argument) {
-    if (isPossiblePrototype(argument)) return argument;
-    throw new $TypeError$4("Can't set " + $String$1(argument) + ' as a prototype');
-  };
-
-  /* eslint-disable no-proto -- safe */
-  var uncurryThisAccessor = functionUncurryThisAccessor;
-  var isObject$1 = isObject$b;
-  var requireObjectCoercible$2 = requireObjectCoercible$5;
-  var aPossiblePrototype = aPossiblePrototype$1;
-
-  // `Object.setPrototypeOf` method
-  // https://tc39.es/ecma262/#sec-object.setprototypeof
-  // Works with __proto__ only. Old v8 can't work with null proto objects.
-  // eslint-disable-next-line es/no-object-setprototypeof -- safe
-  var objectSetPrototypeOf = Object.setPrototypeOf || ('__proto__' in {} ? function () {
-    var CORRECT_SETTER = false;
-    var test = {};
-    var setter;
-    try {
-      setter = uncurryThisAccessor(Object.prototype, '__proto__', 'set');
-      setter(test, []);
-      CORRECT_SETTER = test instanceof Array;
-    } catch (error) { /* empty */ }
-    return function setPrototypeOf(O, proto) {
-      requireObjectCoercible$2(O);
-      aPossiblePrototype(proto);
-      if (!isObject$1(O)) return O;
-      if (CORRECT_SETTER) setter(O, proto);
-      else O.__proto__ = proto;
-      return O;
-    };
-  }() : undefined);
-
-  var $$4 = _export;
-  var call$8 = functionCall;
-  var FunctionName = functionName;
-  var isCallable$2 = isCallable$h;
-  var createIteratorConstructor$1 = iteratorCreateConstructor;
-  var getPrototypeOf = objectGetPrototypeOf$1;
-  var setPrototypeOf = objectSetPrototypeOf;
-  var setToStringTag$2 = setToStringTag$4;
-  var createNonEnumerableProperty$2 = createNonEnumerableProperty$5;
-  var defineBuiltIn$5 = defineBuiltIn$8;
-  var wellKnownSymbol$5 = wellKnownSymbol$f;
-  var Iterators$2 = iterators;
-  var IteratorsCore = iteratorsCore;
-
-  var PROPER_FUNCTION_NAME$1 = FunctionName.PROPER;
-  var CONFIGURABLE_FUNCTION_NAME = FunctionName.CONFIGURABLE;
-  var IteratorPrototype = IteratorsCore.IteratorPrototype;
-  var BUGGY_SAFARI_ITERATORS = IteratorsCore.BUGGY_SAFARI_ITERATORS;
-  var ITERATOR$4 = wellKnownSymbol$5('iterator');
-  var KEYS = 'keys';
-  var VALUES = 'values';
-  var ENTRIES = 'entries';
-
-  var returnThis = function () { return this; };
-
-  var iteratorDefine = function (Iterable, NAME, IteratorConstructor, next, DEFAULT, IS_SET, FORCED) {
-    createIteratorConstructor$1(IteratorConstructor, NAME, next);
-
-    var getIterationMethod = function (KIND) {
-      if (KIND === DEFAULT && defaultIterator) return defaultIterator;
-      if (!BUGGY_SAFARI_ITERATORS && KIND && KIND in IterablePrototype) return IterablePrototype[KIND];
-
-      switch (KIND) {
-        case KEYS: return function keys() { return new IteratorConstructor(this, KIND); };
-        case VALUES: return function values() { return new IteratorConstructor(this, KIND); };
-        case ENTRIES: return function entries() { return new IteratorConstructor(this, KIND); };
-      }
-
-      return function () { return new IteratorConstructor(this); };
-    };
-
-    var TO_STRING_TAG = NAME + ' Iterator';
-    var INCORRECT_VALUES_NAME = false;
-    var IterablePrototype = Iterable.prototype;
-    var nativeIterator = IterablePrototype[ITERATOR$4]
-      || IterablePrototype['@@iterator']
-      || DEFAULT && IterablePrototype[DEFAULT];
-    var defaultIterator = !BUGGY_SAFARI_ITERATORS && nativeIterator || getIterationMethod(DEFAULT);
-    var anyNativeIterator = NAME === 'Array' ? IterablePrototype.entries || nativeIterator : nativeIterator;
-    var CurrentIteratorPrototype, methods, KEY;
-
-    // fix native
-    if (anyNativeIterator) {
-      CurrentIteratorPrototype = getPrototypeOf(anyNativeIterator.call(new Iterable()));
-      if (CurrentIteratorPrototype !== Object.prototype && CurrentIteratorPrototype.next) {
-        if (getPrototypeOf(CurrentIteratorPrototype) !== IteratorPrototype) {
-          if (setPrototypeOf) {
-            setPrototypeOf(CurrentIteratorPrototype, IteratorPrototype);
-          } else if (!isCallable$2(CurrentIteratorPrototype[ITERATOR$4])) {
-            defineBuiltIn$5(CurrentIteratorPrototype, ITERATOR$4, returnThis);
-          }
-        }
-        // Set @@toStringTag to native iterators
-        setToStringTag$2(CurrentIteratorPrototype, TO_STRING_TAG, true);
-      }
-    }
-
-    // fix Array.prototype.{ values, @@iterator }.name in V8 / FF
-    if (PROPER_FUNCTION_NAME$1 && DEFAULT === VALUES && nativeIterator && nativeIterator.name !== VALUES) {
-      if (CONFIGURABLE_FUNCTION_NAME) {
-        createNonEnumerableProperty$2(IterablePrototype, 'name', VALUES);
-      } else {
-        INCORRECT_VALUES_NAME = true;
-        defaultIterator = function values() { return call$8(nativeIterator, this); };
-      }
-    }
-
-    // export additional methods
-    if (DEFAULT) {
-      methods = {
-        values: getIterationMethod(VALUES),
-        keys: IS_SET ? defaultIterator : getIterationMethod(KEYS),
-        entries: getIterationMethod(ENTRIES)
-      };
-      if (FORCED) for (KEY in methods) {
-        if (BUGGY_SAFARI_ITERATORS || INCORRECT_VALUES_NAME || !(KEY in IterablePrototype)) {
-          defineBuiltIn$5(IterablePrototype, KEY, methods[KEY]);
-        }
-      } else $$4({ target: NAME, proto: true, forced: BUGGY_SAFARI_ITERATORS || INCORRECT_VALUES_NAME }, methods);
-    }
-
-    // define iterator
-    if (IterablePrototype[ITERATOR$4] !== defaultIterator) {
-      defineBuiltIn$5(IterablePrototype, ITERATOR$4, defaultIterator, { name: DEFAULT });
-    }
-    Iterators$2[NAME] = defaultIterator;
-
-    return methods;
-  };
-
-  // `CreateIterResultObject` abstract operation
-  // https://tc39.es/ecma262/#sec-createiterresultobject
-  var createIterResultObject$3 = function (value, done) {
-    return { value: value, done: done };
-  };
-
-  var toIndexedObject$1 = toIndexedObject$6;
-  var addToUnscopables = addToUnscopables$1;
-  var Iterators$1 = iterators;
-  var InternalStateModule$2 = internalState;
-  var defineProperty$2 = objectDefineProperty.f;
-  var defineIterator$1 = iteratorDefine;
-  var createIterResultObject$2 = createIterResultObject$3;
-  var DESCRIPTORS$5 = descriptors;
-
-  var ARRAY_ITERATOR = 'Array Iterator';
-  var setInternalState$2 = InternalStateModule$2.set;
-  var getInternalState$2 = InternalStateModule$2.getterFor(ARRAY_ITERATOR);
-
-  // `Array.prototype.entries` method
-  // https://tc39.es/ecma262/#sec-array.prototype.entries
-  // `Array.prototype.keys` method
-  // https://tc39.es/ecma262/#sec-array.prototype.keys
-  // `Array.prototype.values` method
-  // https://tc39.es/ecma262/#sec-array.prototype.values
-  // `Array.prototype[@@iterator]` method
-  // https://tc39.es/ecma262/#sec-array.prototype-@@iterator
-  // `CreateArrayIterator` internal method
-  // https://tc39.es/ecma262/#sec-createarrayiterator
-  var es_array_iterator = defineIterator$1(Array, 'Array', function (iterated, kind) {
-    setInternalState$2(this, {
-      type: ARRAY_ITERATOR,
-      target: toIndexedObject$1(iterated), // target
-      index: 0,                          // next index
-      kind: kind                         // kind
-    });
-  // `%ArrayIteratorPrototype%.next` method
-  // https://tc39.es/ecma262/#sec-%arrayiteratorprototype%.next
-  }, function () {
-    var state = getInternalState$2(this);
-    var target = state.target;
-    var index = state.index++;
-    if (!target || index >= target.length) {
-      state.target = undefined;
-      return createIterResultObject$2(undefined, true);
-    }
-    switch (state.kind) {
-      case 'keys': return createIterResultObject$2(index, false);
-      case 'values': return createIterResultObject$2(target[index], false);
-    } return createIterResultObject$2([index, target[index]], false);
-  }, 'values');
-
-  // argumentsList[@@iterator] is %ArrayProto_values%
-  // https://tc39.es/ecma262/#sec-createunmappedargumentsobject
-  // https://tc39.es/ecma262/#sec-createmappedargumentsobject
-  var values = Iterators$1.Arguments = Iterators$1.Array;
-
-  // https://tc39.es/ecma262/#sec-array.prototype-@@unscopables
-  addToUnscopables('keys');
-  addToUnscopables('values');
-  addToUnscopables('entries');
-
-  // V8 ~ Chrome 45- bug
-  if (DESCRIPTORS$5 && values.name !== 'values') try {
-    defineProperty$2(values, 'name', { value: 'values' });
-  } catch (error) { /* empty */ }
-
-  var DESCRIPTORS$4 = descriptors;
-  var uncurryThis$7 = functionUncurryThis;
-  var call$7 = functionCall;
-  var fails$7 = fails$l;
-  var objectKeys$1 = objectKeys$3;
-  var getOwnPropertySymbolsModule = objectGetOwnPropertySymbols;
-  var propertyIsEnumerableModule = objectPropertyIsEnumerable;
-  var toObject = toObject$4;
-  var IndexedObject = indexedObject;
-
-  // eslint-disable-next-line es/no-object-assign -- safe
-  var $assign = Object.assign;
-  // eslint-disable-next-line es/no-object-defineproperty -- required for testing
-  var defineProperty$1 = Object.defineProperty;
-  var concat = uncurryThis$7([].concat);
-
-  // `Object.assign` method
-  // https://tc39.es/ecma262/#sec-object.assign
-  var objectAssign = !$assign || fails$7(function () {
-    // should have correct order of operations (Edge bug)
-    if (DESCRIPTORS$4 && $assign({ b: 1 }, $assign(defineProperty$1({}, 'a', {
-      enumerable: true,
-      get: function () {
-        defineProperty$1(this, 'b', {
-          value: 3,
-          enumerable: false
-        });
-      }
-    }), { b: 2 })).b !== 1) return true;
-    // should work with symbols and should have deterministic property order (V8 bug)
-    var A = {};
-    var B = {};
-    // eslint-disable-next-line es/no-symbol -- safe
-    var symbol = Symbol('assign detection');
-    var alphabet = 'abcdefghijklmnopqrst';
-    A[symbol] = 7;
-    alphabet.split('').forEach(function (chr) { B[chr] = chr; });
-    return $assign({}, A)[symbol] !== 7 || objectKeys$1($assign({}, B)).join('') !== alphabet;
-  }) ? function assign(target, source) { // eslint-disable-line no-unused-vars -- required for `.length`
-    var T = toObject(target);
-    var argumentsLength = arguments.length;
-    var index = 1;
-    var getOwnPropertySymbols = getOwnPropertySymbolsModule.f;
-    var propertyIsEnumerable = propertyIsEnumerableModule.f;
-    while (argumentsLength > index) {
-      var S = IndexedObject(arguments[index++]);
-      var keys = getOwnPropertySymbols ? concat(objectKeys$1(S), getOwnPropertySymbols(S)) : objectKeys$1(S);
-      var length = keys.length;
-      var j = 0;
-      var key;
-      while (length > j) {
-        key = keys[j++];
-        if (!DESCRIPTORS$4 || call$7(propertyIsEnumerable, S, key)) T[key] = S[key];
-      }
-    } return T;
-  } : $assign;
-
-  var $$3 = _export;
-  var assign = objectAssign;
-
-  // `Object.assign` method
-  // https://tc39.es/ecma262/#sec-object.assign
-  // eslint-disable-next-line es/no-object-assign -- required for testing
-  $$3({ target: 'Object', stat: true, arity: 2, forced: Object.assign !== assign }, {
-    assign: assign
-  });
-
-  var DESCRIPTORS$3 = descriptors;
-  var fails$6 = fails$l;
-  var uncurryThis$6 = functionUncurryThis;
-  var objectGetPrototypeOf = objectGetPrototypeOf$1;
-  var objectKeys = objectKeys$3;
-  var toIndexedObject = toIndexedObject$6;
-  var $propertyIsEnumerable = objectPropertyIsEnumerable.f;
-
-  var propertyIsEnumerable = uncurryThis$6($propertyIsEnumerable);
-  var push$1 = uncurryThis$6([].push);
-
-  // in some IE versions, `propertyIsEnumerable` returns incorrect result on integer keys
-  // of `null` prototype objects
-  var IE_BUG = DESCRIPTORS$3 && fails$6(function () {
-    // eslint-disable-next-line es/no-object-create -- safe
-    var O = Object.create(null);
-    O[2] = 2;
-    return !propertyIsEnumerable(O, 2);
-  });
-
-  // `Object.{ entries, values }` methods implementation
-  var createMethod$1 = function (TO_ENTRIES) {
-    return function (it) {
-      var O = toIndexedObject(it);
-      var keys = objectKeys(O);
-      var IE_WORKAROUND = IE_BUG && objectGetPrototypeOf(O) === null;
-      var length = keys.length;
-      var i = 0;
-      var result = [];
-      var key;
-      while (length > i) {
-        key = keys[i++];
-        if (!DESCRIPTORS$3 || (IE_WORKAROUND ? key in O : propertyIsEnumerable(O, key))) {
-          push$1(result, TO_ENTRIES ? [key, O[key]] : O[key]);
-        }
-      }
-      return result;
-    };
-  };
-
-  var objectToArray = {
-    // `Object.entries` method
-    // https://tc39.es/ecma262/#sec-object.entries
-    entries: createMethod$1(true),
-    // `Object.values` method
-    // https://tc39.es/ecma262/#sec-object.values
-    values: createMethod$1(false)
-  };
-
-  var $$2 = _export;
-  var $entries = objectToArray.entries;
-
-  // `Object.entries` method
-  // https://tc39.es/ecma262/#sec-object.entries
-  $$2({ target: 'Object', stat: true }, {
-    entries: function entries(O) {
-      return $entries(O);
-    }
-  });
-
-  var TO_STRING_TAG_SUPPORT$1 = toStringTagSupport;
-  var classof$4 = classof$6;
-
-  // `Object.prototype.toString` method implementation
-  // https://tc39.es/ecma262/#sec-object.prototype.tostring
-  var objectToString = TO_STRING_TAG_SUPPORT$1 ? {}.toString : function toString() {
-    return '[object ' + classof$4(this) + ']';
-  };
-
-  var TO_STRING_TAG_SUPPORT = toStringTagSupport;
-  var defineBuiltIn$4 = defineBuiltIn$8;
-  var toString$5 = objectToString;
-
-  // `Object.prototype.toString` method
-  // https://tc39.es/ecma262/#sec-object.prototype.tostring
-  if (!TO_STRING_TAG_SUPPORT) {
-    defineBuiltIn$4(Object.prototype, 'toString', toString$5, { unsafe: true });
+  	// `Object.create` method
+  	// https://tc39.es/ecma262/#sec-object.create
+  	// eslint-disable-next-line es/no-object-create -- safe
+  	objectCreate = Object.create || function create(O, Properties) {
+  	  var result;
+  	  if (O !== null) {
+  	    EmptyConstructor[PROTOTYPE] = anObject(O);
+  	    result = new EmptyConstructor();
+  	    EmptyConstructor[PROTOTYPE] = null;
+  	    // add "__proto__" for Object.getPrototypeOf polyfill
+  	    result[IE_PROTO] = O;
+  	  } else result = NullProtoObject();
+  	  return Properties === undefined ? result : definePropertiesModule.f(result, Properties);
+  	};
+  	return objectCreate;
   }
 
-  var classof$3 = classof$6;
+  var addToUnscopables;
+  var hasRequiredAddToUnscopables;
 
-  var $String = String;
+  function requireAddToUnscopables () {
+  	if (hasRequiredAddToUnscopables) return addToUnscopables;
+  	hasRequiredAddToUnscopables = 1;
+  	var wellKnownSymbol = requireWellKnownSymbol();
+  	var create = requireObjectCreate();
+  	var defineProperty = requireObjectDefineProperty().f;
 
-  var toString$4 = function (argument) {
-    if (classof$3(argument) === 'Symbol') throw new TypeError('Cannot convert a Symbol value to a string');
-    return $String(argument);
-  };
+  	var UNSCOPABLES = wellKnownSymbol('unscopables');
+  	var ArrayPrototype = Array.prototype;
 
-  var anObject$5 = anObject$a;
+  	// Array.prototype[@@unscopables]
+  	// https://tc39.es/ecma262/#sec-array.prototype-@@unscopables
+  	if (ArrayPrototype[UNSCOPABLES] === undefined) {
+  	  defineProperty(ArrayPrototype, UNSCOPABLES, {
+  	    configurable: true,
+  	    value: create(null)
+  	  });
+  	}
 
-  // `RegExp.prototype.flags` getter implementation
-  // https://tc39.es/ecma262/#sec-get-regexp.prototype.flags
-  var regexpFlags$1 = function () {
-    var that = anObject$5(this);
-    var result = '';
-    if (that.hasIndices) result += 'd';
-    if (that.global) result += 'g';
-    if (that.ignoreCase) result += 'i';
-    if (that.multiline) result += 'm';
-    if (that.dotAll) result += 's';
-    if (that.unicode) result += 'u';
-    if (that.unicodeSets) result += 'v';
-    if (that.sticky) result += 'y';
-    return result;
-  };
-
-  var fails$5 = fails$l;
-  var global$6 = global$g;
-
-  // babel-minify and Closure Compiler transpiles RegExp('a', 'y') -> /a/y and it causes SyntaxError
-  var $RegExp$2 = global$6.RegExp;
-
-  var UNSUPPORTED_Y$1 = fails$5(function () {
-    var re = $RegExp$2('a', 'y');
-    re.lastIndex = 2;
-    return re.exec('abcd') !== null;
-  });
-
-  // UC Browser bug
-  // https://github.com/zloirock/core-js/issues/1008
-  var MISSED_STICKY = UNSUPPORTED_Y$1 || fails$5(function () {
-    return !$RegExp$2('a', 'y').sticky;
-  });
-
-  var BROKEN_CARET = UNSUPPORTED_Y$1 || fails$5(function () {
-    // https://bugzilla.mozilla.org/show_bug.cgi?id=773687
-    var re = $RegExp$2('^r', 'gy');
-    re.lastIndex = 2;
-    return re.exec('str') !== null;
-  });
-
-  var regexpStickyHelpers = {
-    BROKEN_CARET: BROKEN_CARET,
-    MISSED_STICKY: MISSED_STICKY,
-    UNSUPPORTED_Y: UNSUPPORTED_Y$1
-  };
-
-  var fails$4 = fails$l;
-  var global$5 = global$g;
-
-  // babel-minify and Closure Compiler transpiles RegExp('.', 's') -> /./s and it causes SyntaxError
-  var $RegExp$1 = global$5.RegExp;
-
-  var regexpUnsupportedDotAll = fails$4(function () {
-    var re = $RegExp$1('.', 's');
-    return !(re.dotAll && re.test('\n') && re.flags === 's');
-  });
-
-  var fails$3 = fails$l;
-  var global$4 = global$g;
-
-  // babel-minify and Closure Compiler transpiles RegExp('(?<a>b)', 'g') -> /(?<a>b)/g and it causes SyntaxError
-  var $RegExp = global$4.RegExp;
-
-  var regexpUnsupportedNcg = fails$3(function () {
-    var re = $RegExp('(?<a>b)', 'g');
-    return re.exec('b').groups.a !== 'b' ||
-      'b'.replace(re, '$<a>c') !== 'bc';
-  });
-
-  /* eslint-disable regexp/no-empty-capturing-group, regexp/no-empty-group, regexp/no-lazy-ends -- testing */
-  /* eslint-disable regexp/no-useless-quantifier -- testing */
-  var call$6 = functionCall;
-  var uncurryThis$5 = functionUncurryThis;
-  var toString$3 = toString$4;
-  var regexpFlags = regexpFlags$1;
-  var stickyHelpers = regexpStickyHelpers;
-  var shared = shared$4;
-  var create$1 = objectCreate;
-  var getInternalState$1 = internalState.get;
-  var UNSUPPORTED_DOT_ALL = regexpUnsupportedDotAll;
-  var UNSUPPORTED_NCG = regexpUnsupportedNcg;
-
-  var nativeReplace = shared('native-string-replace', String.prototype.replace);
-  var nativeExec = RegExp.prototype.exec;
-  var patchedExec = nativeExec;
-  var charAt$3 = uncurryThis$5(''.charAt);
-  var indexOf = uncurryThis$5(''.indexOf);
-  var replace$1 = uncurryThis$5(''.replace);
-  var stringSlice$2 = uncurryThis$5(''.slice);
-
-  var UPDATES_LAST_INDEX_WRONG = (function () {
-    var re1 = /a/;
-    var re2 = /b*/g;
-    call$6(nativeExec, re1, 'a');
-    call$6(nativeExec, re2, 'a');
-    return re1.lastIndex !== 0 || re2.lastIndex !== 0;
-  })();
-
-  var UNSUPPORTED_Y = stickyHelpers.BROKEN_CARET;
-
-  // nonparticipating capturing group, copied from es5-shim's String#split patch.
-  var NPCG_INCLUDED = /()??/.exec('')[1] !== undefined;
-
-  var PATCH = UPDATES_LAST_INDEX_WRONG || NPCG_INCLUDED || UNSUPPORTED_Y || UNSUPPORTED_DOT_ALL || UNSUPPORTED_NCG;
-
-  if (PATCH) {
-    patchedExec = function exec(string) {
-      var re = this;
-      var state = getInternalState$1(re);
-      var str = toString$3(string);
-      var raw = state.raw;
-      var result, reCopy, lastIndex, match, i, object, group;
-
-      if (raw) {
-        raw.lastIndex = re.lastIndex;
-        result = call$6(patchedExec, raw, str);
-        re.lastIndex = raw.lastIndex;
-        return result;
-      }
-
-      var groups = state.groups;
-      var sticky = UNSUPPORTED_Y && re.sticky;
-      var flags = call$6(regexpFlags, re);
-      var source = re.source;
-      var charsAdded = 0;
-      var strCopy = str;
-
-      if (sticky) {
-        flags = replace$1(flags, 'y', '');
-        if (indexOf(flags, 'g') === -1) {
-          flags += 'g';
-        }
-
-        strCopy = stringSlice$2(str, re.lastIndex);
-        // Support anchored sticky behavior.
-        if (re.lastIndex > 0 && (!re.multiline || re.multiline && charAt$3(str, re.lastIndex - 1) !== '\n')) {
-          source = '(?: ' + source + ')';
-          strCopy = ' ' + strCopy;
-          charsAdded++;
-        }
-        // ^(? + rx + ) is needed, in combination with some str slicing, to
-        // simulate the 'y' flag.
-        reCopy = new RegExp('^(?:' + source + ')', flags);
-      }
-
-      if (NPCG_INCLUDED) {
-        reCopy = new RegExp('^' + source + '$(?!\\s)', flags);
-      }
-      if (UPDATES_LAST_INDEX_WRONG) lastIndex = re.lastIndex;
-
-      match = call$6(nativeExec, sticky ? reCopy : re, strCopy);
-
-      if (sticky) {
-        if (match) {
-          match.input = stringSlice$2(match.input, charsAdded);
-          match[0] = stringSlice$2(match[0], charsAdded);
-          match.index = re.lastIndex;
-          re.lastIndex += match[0].length;
-        } else re.lastIndex = 0;
-      } else if (UPDATES_LAST_INDEX_WRONG && match) {
-        re.lastIndex = re.global ? match.index + match[0].length : lastIndex;
-      }
-      if (NPCG_INCLUDED && match && match.length > 1) {
-        // Fix browsers whose `exec` methods don't consistently return `undefined`
-        // for NPCG, like IE8. NOTE: This doesn't work for /(.?)?/
-        call$6(nativeReplace, match[0], reCopy, function () {
-          for (i = 1; i < arguments.length - 2; i++) {
-            if (arguments[i] === undefined) match[i] = undefined;
-          }
-        });
-      }
-
-      if (match && groups) {
-        match.groups = object = create$1(null);
-        for (i = 0; i < groups.length; i++) {
-          group = groups[i];
-          object[group[0]] = match[group[1]];
-        }
-      }
-
-      return match;
-    };
+  	// add a key to Array.prototype[@@unscopables]
+  	addToUnscopables = function (key) {
+  	  ArrayPrototype[UNSCOPABLES][key] = true;
+  	};
+  	return addToUnscopables;
   }
 
-  var regexpExec$2 = patchedExec;
+  var iterators;
+  var hasRequiredIterators;
 
-  var $$1 = _export;
-  var exec = regexpExec$2;
-
-  // `RegExp.prototype.exec` method
-  // https://tc39.es/ecma262/#sec-regexp.prototype.exec
-  $$1({ target: 'RegExp', proto: true, forced: /./.exec !== exec }, {
-    exec: exec
-  });
-
-  var call$5 = functionCall;
-  var hasOwn$1 = hasOwnProperty_1;
-  var isPrototypeOf$1 = objectIsPrototypeOf;
-  var regExpFlags = regexpFlags$1;
-
-  var RegExpPrototype$2 = RegExp.prototype;
-
-  var regexpGetFlags = function (R) {
-    var flags = R.flags;
-    return flags === undefined && !('flags' in RegExpPrototype$2) && !hasOwn$1(R, 'flags') && isPrototypeOf$1(RegExpPrototype$2, R)
-      ? call$5(regExpFlags, R) : flags;
-  };
-
-  var PROPER_FUNCTION_NAME = functionName.PROPER;
-  var defineBuiltIn$3 = defineBuiltIn$8;
-  var anObject$4 = anObject$a;
-  var $toString$1 = toString$4;
-  var fails$2 = fails$l;
-  var getRegExpFlags = regexpGetFlags;
-
-  var TO_STRING = 'toString';
-  var RegExpPrototype$1 = RegExp.prototype;
-  var nativeToString = RegExpPrototype$1[TO_STRING];
-
-  var NOT_GENERIC = fails$2(function () { return nativeToString.call({ source: 'a', flags: 'b' }) !== '/a/b'; });
-  // FF44- RegExp#toString has a wrong name
-  var INCORRECT_NAME = PROPER_FUNCTION_NAME && nativeToString.name !== TO_STRING;
-
-  // `RegExp.prototype.toString` method
-  // https://tc39.es/ecma262/#sec-regexp.prototype.tostring
-  if (NOT_GENERIC || INCORRECT_NAME) {
-    defineBuiltIn$3(RegExpPrototype$1, TO_STRING, function toString() {
-      var R = anObject$4(this);
-      var pattern = $toString$1(R.source);
-      var flags = $toString$1(getRegExpFlags(R));
-      return '/' + pattern + '/' + flags;
-    }, { unsafe: true });
+  function requireIterators () {
+  	if (hasRequiredIterators) return iterators;
+  	hasRequiredIterators = 1;
+  	iterators = {};
+  	return iterators;
   }
 
-  var uncurryThis$4 = functionUncurryThis;
-  var toIntegerOrInfinity = toIntegerOrInfinity$3;
-  var toString$2 = toString$4;
-  var requireObjectCoercible$1 = requireObjectCoercible$5;
+  var correctPrototypeGetter;
+  var hasRequiredCorrectPrototypeGetter;
 
-  var charAt$2 = uncurryThis$4(''.charAt);
-  var charCodeAt = uncurryThis$4(''.charCodeAt);
-  var stringSlice$1 = uncurryThis$4(''.slice);
+  function requireCorrectPrototypeGetter () {
+  	if (hasRequiredCorrectPrototypeGetter) return correctPrototypeGetter;
+  	hasRequiredCorrectPrototypeGetter = 1;
+  	var fails = requireFails();
 
-  var createMethod = function (CONVERT_TO_STRING) {
-    return function ($this, pos) {
-      var S = toString$2(requireObjectCoercible$1($this));
-      var position = toIntegerOrInfinity(pos);
-      var size = S.length;
-      var first, second;
-      if (position < 0 || position >= size) return CONVERT_TO_STRING ? '' : undefined;
-      first = charCodeAt(S, position);
-      return first < 0xD800 || first > 0xDBFF || position + 1 === size
-        || (second = charCodeAt(S, position + 1)) < 0xDC00 || second > 0xDFFF
-          ? CONVERT_TO_STRING
-            ? charAt$2(S, position)
-            : first
-          : CONVERT_TO_STRING
-            ? stringSlice$1(S, position, position + 2)
-            : (first - 0xD800 << 10) + (second - 0xDC00) + 0x10000;
-    };
-  };
-
-  var stringMultibyte = {
-    // `String.prototype.codePointAt` method
-    // https://tc39.es/ecma262/#sec-string.prototype.codepointat
-    codeAt: createMethod(false),
-    // `String.prototype.at` method
-    // https://github.com/mathiasbynens/String.prototype.at
-    charAt: createMethod(true)
-  };
-
-  var charAt$1 = stringMultibyte.charAt;
-  var toString$1 = toString$4;
-  var InternalStateModule$1 = internalState;
-  var defineIterator = iteratorDefine;
-  var createIterResultObject$1 = createIterResultObject$3;
-
-  var STRING_ITERATOR = 'String Iterator';
-  var setInternalState$1 = InternalStateModule$1.set;
-  var getInternalState = InternalStateModule$1.getterFor(STRING_ITERATOR);
-
-  // `String.prototype[@@iterator]` method
-  // https://tc39.es/ecma262/#sec-string.prototype-@@iterator
-  defineIterator(String, 'String', function (iterated) {
-    setInternalState$1(this, {
-      type: STRING_ITERATOR,
-      string: toString$1(iterated),
-      index: 0
-    });
-  // `%StringIteratorPrototype%.next` method
-  // https://tc39.es/ecma262/#sec-%stringiteratorprototype%.next
-  }, function next() {
-    var state = getInternalState(this);
-    var string = state.string;
-    var index = state.index;
-    var point;
-    if (index >= string.length) return createIterResultObject$1(undefined, true);
-    point = charAt$1(string, index);
-    state.index += point.length;
-    return createIterResultObject$1(point, false);
-  });
-
-  // TODO: Remove from `core-js@4` since it's moved to entry points
-
-  var call$4 = functionCall;
-  var defineBuiltIn$2 = defineBuiltIn$8;
-  var regexpExec$1 = regexpExec$2;
-  var fails$1 = fails$l;
-  var wellKnownSymbol$4 = wellKnownSymbol$f;
-  var createNonEnumerableProperty$1 = createNonEnumerableProperty$5;
-
-  var SPECIES = wellKnownSymbol$4('species');
-  var RegExpPrototype = RegExp.prototype;
-
-  var fixRegexpWellKnownSymbolLogic = function (KEY, exec, FORCED, SHAM) {
-    var SYMBOL = wellKnownSymbol$4(KEY);
-
-    var DELEGATES_TO_SYMBOL = !fails$1(function () {
-      // String methods call symbol-named RegExp methods
-      var O = {};
-      O[SYMBOL] = function () { return 7; };
-      return ''[KEY](O) !== 7;
-    });
-
-    var DELEGATES_TO_EXEC = DELEGATES_TO_SYMBOL && !fails$1(function () {
-      // Symbol-named RegExp methods call .exec
-      var execCalled = false;
-      var re = /a/;
-
-      if (KEY === 'split') {
-        // We can't use real regex here since it causes deoptimization
-        // and serious performance degradation in V8
-        // https://github.com/zloirock/core-js/issues/306
-        re = {};
-        // RegExp[@@split] doesn't call the regex's exec method, but first creates
-        // a new one. We need to return the patched regex when creating the new one.
-        re.constructor = {};
-        re.constructor[SPECIES] = function () { return re; };
-        re.flags = '';
-        re[SYMBOL] = /./[SYMBOL];
-      }
-
-      re.exec = function () {
-        execCalled = true;
-        return null;
-      };
-
-      re[SYMBOL]('');
-      return !execCalled;
-    });
-
-    if (
-      !DELEGATES_TO_SYMBOL ||
-      !DELEGATES_TO_EXEC ||
-      FORCED
-    ) {
-      var nativeRegExpMethod = /./[SYMBOL];
-      var methods = exec(SYMBOL, ''[KEY], function (nativeMethod, regexp, str, arg2, forceStringMethod) {
-        var $exec = regexp.exec;
-        if ($exec === regexpExec$1 || $exec === RegExpPrototype.exec) {
-          if (DELEGATES_TO_SYMBOL && !forceStringMethod) {
-            // The native String method already delegates to @@method (this
-            // polyfilled function), leasing to infinite recursion.
-            // We avoid it by directly calling the native @@method method.
-            return { done: true, value: call$4(nativeRegExpMethod, regexp, str, arg2) };
-          }
-          return { done: true, value: call$4(nativeMethod, str, regexp, arg2) };
-        }
-        return { done: false };
-      });
-
-      defineBuiltIn$2(String.prototype, KEY, methods[0]);
-      defineBuiltIn$2(RegExpPrototype, SYMBOL, methods[1]);
-    }
-
-    if (SHAM) createNonEnumerableProperty$1(RegExpPrototype[SYMBOL], 'sham', true);
-  };
-
-  // `SameValue` abstract operation
-  // https://tc39.es/ecma262/#sec-samevalue
-  // eslint-disable-next-line es/no-object-is -- safe
-  var sameValue$1 = Object.is || function is(x, y) {
-    // eslint-disable-next-line no-self-compare -- NaN check
-    return x === y ? x !== 0 || 1 / x === 1 / y : x !== x && y !== y;
-  };
-
-  var call$3 = functionCall;
-  var anObject$3 = anObject$a;
-  var isCallable$1 = isCallable$h;
-  var classof$2 = classofRaw$2;
-  var regexpExec = regexpExec$2;
-
-  var $TypeError$3 = TypeError;
-
-  // `RegExpExec` abstract operation
-  // https://tc39.es/ecma262/#sec-regexpexec
-  var regexpExecAbstract = function (R, S) {
-    var exec = R.exec;
-    if (isCallable$1(exec)) {
-      var result = call$3(exec, R, S);
-      if (result !== null) anObject$3(result);
-      return result;
-    }
-    if (classof$2(R) === 'RegExp') return call$3(regexpExec, R, S);
-    throw new $TypeError$3('RegExp#exec called on incompatible receiver');
-  };
-
-  var call$2 = functionCall;
-  var fixRegExpWellKnownSymbolLogic = fixRegexpWellKnownSymbolLogic;
-  var anObject$2 = anObject$a;
-  var isNullOrUndefined$1 = isNullOrUndefined$4;
-  var requireObjectCoercible = requireObjectCoercible$5;
-  var sameValue = sameValue$1;
-  var toString = toString$4;
-  var getMethod$1 = getMethod$3;
-  var regExpExec = regexpExecAbstract;
-
-  // @@search logic
-  fixRegExpWellKnownSymbolLogic('search', function (SEARCH, nativeSearch, maybeCallNative) {
-    return [
-      // `String.prototype.search` method
-      // https://tc39.es/ecma262/#sec-string.prototype.search
-      function search(regexp) {
-        var O = requireObjectCoercible(this);
-        var searcher = isNullOrUndefined$1(regexp) ? undefined : getMethod$1(regexp, SEARCH);
-        return searcher ? call$2(searcher, regexp, O) : new RegExp(regexp)[SEARCH](toString(O));
-      },
-      // `RegExp.prototype[@@search]` method
-      // https://tc39.es/ecma262/#sec-regexp.prototype-@@search
-      function (string) {
-        var rx = anObject$2(this);
-        var S = toString(string);
-        var res = maybeCallNative(nativeSearch, rx, S);
-
-        if (res.done) return res.value;
-
-        var previousLastIndex = rx.lastIndex;
-        if (!sameValue(previousLastIndex, 0)) rx.lastIndex = 0;
-        var result = regExpExec(rx, S);
-        if (!sameValue(rx.lastIndex, previousLastIndex)) rx.lastIndex = previousLastIndex;
-        return result === null ? -1 : result.index;
-      }
-    ];
-  });
-
-  // iterable DOM collections
-  // flag - `iterable` interface - 'entries', 'keys', 'values', 'forEach' methods
-  var domIterables = {
-    CSSRuleList: 0,
-    CSSStyleDeclaration: 0,
-    CSSValueList: 0,
-    ClientRectList: 0,
-    DOMRectList: 0,
-    DOMStringList: 0,
-    DOMTokenList: 1,
-    DataTransferItemList: 0,
-    FileList: 0,
-    HTMLAllCollection: 0,
-    HTMLCollection: 0,
-    HTMLFormElement: 0,
-    HTMLSelectElement: 0,
-    MediaList: 0,
-    MimeTypeArray: 0,
-    NamedNodeMap: 0,
-    NodeList: 1,
-    PaintRequestList: 0,
-    Plugin: 0,
-    PluginArray: 0,
-    SVGLengthList: 0,
-    SVGNumberList: 0,
-    SVGPathSegList: 0,
-    SVGPointList: 0,
-    SVGStringList: 0,
-    SVGTransformList: 0,
-    SourceBufferList: 0,
-    StyleSheetList: 0,
-    TextTrackCueList: 0,
-    TextTrackList: 0,
-    TouchList: 0
-  };
-
-  // in old WebKit versions, `element.classList` is not an instance of global `DOMTokenList`
-  var documentCreateElement = documentCreateElement$2;
-
-  var classList = documentCreateElement('span').classList;
-  var DOMTokenListPrototype$1 = classList && classList.constructor && classList.constructor.prototype;
-
-  var domTokenListPrototype = DOMTokenListPrototype$1 === Object.prototype ? undefined : DOMTokenListPrototype$1;
-
-  var global$3 = global$g;
-  var DOMIterables = domIterables;
-  var DOMTokenListPrototype = domTokenListPrototype;
-  var ArrayIteratorMethods = es_array_iterator;
-  var createNonEnumerableProperty = createNonEnumerableProperty$5;
-  var setToStringTag$1 = setToStringTag$4;
-  var wellKnownSymbol$3 = wellKnownSymbol$f;
-
-  var ITERATOR$3 = wellKnownSymbol$3('iterator');
-  var ArrayValues = ArrayIteratorMethods.values;
-
-  var handlePrototype = function (CollectionPrototype, COLLECTION_NAME) {
-    if (CollectionPrototype) {
-      // some Chrome versions have non-configurable methods on DOMTokenList
-      if (CollectionPrototype[ITERATOR$3] !== ArrayValues) try {
-        createNonEnumerableProperty(CollectionPrototype, ITERATOR$3, ArrayValues);
-      } catch (error) {
-        CollectionPrototype[ITERATOR$3] = ArrayValues;
-      }
-      setToStringTag$1(CollectionPrototype, COLLECTION_NAME, true);
-      if (DOMIterables[COLLECTION_NAME]) for (var METHOD_NAME in ArrayIteratorMethods) {
-        // some Chrome versions have non-configurable methods on DOMTokenList
-        if (CollectionPrototype[METHOD_NAME] !== ArrayIteratorMethods[METHOD_NAME]) try {
-          createNonEnumerableProperty(CollectionPrototype, METHOD_NAME, ArrayIteratorMethods[METHOD_NAME]);
-        } catch (error) {
-          CollectionPrototype[METHOD_NAME] = ArrayIteratorMethods[METHOD_NAME];
-        }
-      }
-    }
-  };
-
-  for (var COLLECTION_NAME in DOMIterables) {
-    handlePrototype(global$3[COLLECTION_NAME] && global$3[COLLECTION_NAME].prototype, COLLECTION_NAME);
+  	correctPrototypeGetter = !fails(function () {
+  	  function F() { /* empty */ }
+  	  F.prototype.constructor = null;
+  	  // eslint-disable-next-line es/no-object-getprototypeof -- required for testing
+  	  return Object.getPrototypeOf(new F()) !== F.prototype;
+  	});
+  	return correctPrototypeGetter;
   }
 
-  handlePrototype(DOMTokenListPrototype, 'DOMTokenList');
-
-  var global$2 = global$g;
-  var DESCRIPTORS$2 = descriptors;
-
-  // eslint-disable-next-line es/no-object-getownpropertydescriptor -- safe
-  var getOwnPropertyDescriptor = Object.getOwnPropertyDescriptor;
-
-  // Avoid NodeJS experimental warning
-  var safeGetBuiltIn$1 = function (name) {
-    if (!DESCRIPTORS$2) return global$2[name];
-    var descriptor = getOwnPropertyDescriptor(global$2, name);
-    return descriptor && descriptor.value;
-  };
-
-  var fails = fails$l;
-  var wellKnownSymbol$2 = wellKnownSymbol$f;
-  var DESCRIPTORS$1 = descriptors;
-  var IS_PURE = isPure;
-
-  var ITERATOR$2 = wellKnownSymbol$2('iterator');
-
-  var urlConstructorDetection = !fails(function () {
-    // eslint-disable-next-line unicorn/relative-url-style -- required for testing
-    var url = new URL('b?a=1&b=2&c=3', 'http://a');
-    var params = url.searchParams;
-    var params2 = new URLSearchParams('a=1&a=2&b=3');
-    var result = '';
-    url.pathname = 'c%20d';
-    params.forEach(function (value, key) {
-      params['delete']('b');
-      result += key + value;
-    });
-    params2['delete']('a', 2);
-    // `undefined` case is a Chromium 117 bug
-    // https://bugs.chromium.org/p/v8/issues/detail?id=14222
-    params2['delete']('b', undefined);
-    return (IS_PURE && (!url.toJSON || !params2.has('a', 1) || params2.has('a', 2) || !params2.has('a', undefined) || params2.has('b')))
-      || (!params.size && (IS_PURE || !DESCRIPTORS$1))
-      || !params.sort
-      || url.href !== 'http://a/c%20d?a=1&c=3'
-      || params.get('c') !== '3'
-      || String(new URLSearchParams('?a=1')) !== 'a=1'
-      || !params[ITERATOR$2]
-      // throws in Edge
-      || new URL('https://a@b').username !== 'a'
-      || new URLSearchParams(new URLSearchParams('a=b')).get('a') !== 'b'
-      // not punycoded in Edge
-      || new URL('http://тест').host !== 'xn--e1aybc'
-      // not escaped in Chrome 62-
-      || new URL('http://a#б').hash !== '#%D0%B1'
-      // fails in Chrome 66-
-      || result !== 'a1c3'
-      // throws in Safari
-      || new URL('http://x', undefined).host !== 'x';
-  });
-
-  var makeBuiltIn = makeBuiltInExports;
-  var defineProperty = objectDefineProperty;
-
-  var defineBuiltInAccessor$1 = function (target, name, descriptor) {
-    if (descriptor.get) makeBuiltIn(descriptor.get, name, { getter: true });
-    if (descriptor.set) makeBuiltIn(descriptor.set, name, { setter: true });
-    return defineProperty.f(target, name, descriptor);
-  };
-
-  var defineBuiltIn$1 = defineBuiltIn$8;
-
-  var defineBuiltIns$1 = function (target, src, options) {
-    for (var key in src) defineBuiltIn$1(target, key, src[key], options);
-    return target;
-  };
-
-  var isPrototypeOf = objectIsPrototypeOf;
-
-  var $TypeError$2 = TypeError;
-
-  var anInstance$1 = function (it, Prototype) {
-    if (isPrototypeOf(Prototype, it)) return it;
-    throw new $TypeError$2('Incorrect invocation');
-  };
-
-  var classofRaw = classofRaw$2;
-  var uncurryThis$3 = functionUncurryThis;
-
-  var functionUncurryThisClause = function (fn) {
-    // Nashorn bug:
-    //   https://github.com/zloirock/core-js/issues/1128
-    //   https://github.com/zloirock/core-js/issues/1130
-    if (classofRaw(fn) === 'Function') return uncurryThis$3(fn);
-  };
-
-  var uncurryThis$2 = functionUncurryThisClause;
-  var aCallable$1 = aCallable$4;
-  var NATIVE_BIND = functionBindNative;
-
-  var bind$1 = uncurryThis$2(uncurryThis$2.bind);
-
-  // optional / simple context binding
-  var functionBindContext = function (fn, that) {
-    aCallable$1(fn);
-    return that === undefined ? fn : NATIVE_BIND ? bind$1(fn, that) : function (/* ...args */) {
-      return fn.apply(that, arguments);
-    };
-  };
-
-  var classof$1 = classof$6;
-  var getMethod = getMethod$3;
-  var isNullOrUndefined = isNullOrUndefined$4;
-  var Iterators = iterators;
-  var wellKnownSymbol$1 = wellKnownSymbol$f;
-
-  var ITERATOR$1 = wellKnownSymbol$1('iterator');
-
-  var getIteratorMethod$2 = function (it) {
-    if (!isNullOrUndefined(it)) return getMethod(it, ITERATOR$1)
-      || getMethod(it, '@@iterator')
-      || Iterators[classof$1(it)];
-  };
-
-  var call$1 = functionCall;
-  var aCallable = aCallable$4;
-  var anObject$1 = anObject$a;
-  var tryToString = tryToString$2;
-  var getIteratorMethod$1 = getIteratorMethod$2;
-
-  var $TypeError$1 = TypeError;
-
-  var getIterator$1 = function (argument, usingIterator) {
-    var iteratorMethod = arguments.length < 2 ? getIteratorMethod$1(argument) : usingIterator;
-    if (aCallable(iteratorMethod)) return anObject$1(call$1(iteratorMethod, argument));
-    throw new $TypeError$1(tryToString(argument) + ' is not iterable');
-  };
-
-  var $TypeError = TypeError;
-
-  var validateArgumentsLength$1 = function (passed, required) {
-    if (passed < required) throw new $TypeError('Not enough arguments');
-    return passed;
-  };
-
-  var uncurryThis$1 = functionUncurryThis;
-
-  var arraySlice$1 = uncurryThis$1([].slice);
-
-  var arraySlice = arraySlice$1;
-
-  var floor = Math.floor;
-
-  var sort = function (array, comparefn) {
-    var length = array.length;
-
-    if (length < 8) {
-      // insertion sort
-      var i = 1;
-      var element, j;
-
-      while (i < length) {
-        j = i;
-        element = array[i];
-        while (j && comparefn(array[j - 1], element) > 0) {
-          array[j] = array[--j];
-        }
-        if (j !== i++) array[j] = element;
-      }
-    } else {
-      // merge sort
-      var middle = floor(length / 2);
-      var left = sort(arraySlice(array, 0, middle), comparefn);
-      var right = sort(arraySlice(array, middle), comparefn);
-      var llength = left.length;
-      var rlength = right.length;
-      var lindex = 0;
-      var rindex = 0;
-
-      while (lindex < llength || rindex < rlength) {
-        array[lindex + rindex] = (lindex < llength && rindex < rlength)
-          ? comparefn(left[lindex], right[rindex]) <= 0 ? left[lindex++] : right[rindex++]
-          : lindex < llength ? left[lindex++] : right[rindex++];
-      }
-    }
-
-    return array;
-  };
-
-  var arraySort$1 = sort;
-
-  // TODO: in core-js@4, move /modules/ dependencies to public entries for better optimization by tools like `preset-env`
-
-  var $ = _export;
-  var global$1 = global$g;
-  var safeGetBuiltIn = safeGetBuiltIn$1;
-  var call = functionCall;
-  var uncurryThis = functionUncurryThis;
-  var DESCRIPTORS = descriptors;
-  var USE_NATIVE_URL = urlConstructorDetection;
-  var defineBuiltIn = defineBuiltIn$8;
-  var defineBuiltInAccessor = defineBuiltInAccessor$1;
-  var defineBuiltIns = defineBuiltIns$1;
-  var setToStringTag = setToStringTag$4;
-  var createIteratorConstructor = iteratorCreateConstructor;
-  var InternalStateModule = internalState;
-  var anInstance = anInstance$1;
-  var isCallable = isCallable$h;
-  var hasOwn = hasOwnProperty_1;
-  var bind = functionBindContext;
-  var classof = classof$6;
-  var anObject = anObject$a;
-  var isObject = isObject$b;
-  var $toString = toString$4;
-  var create = objectCreate;
-  var createPropertyDescriptor = createPropertyDescriptor$5;
-  var getIterator = getIterator$1;
-  var getIteratorMethod = getIteratorMethod$2;
-  var createIterResultObject = createIterResultObject$3;
-  var validateArgumentsLength = validateArgumentsLength$1;
-  var wellKnownSymbol = wellKnownSymbol$f;
-  var arraySort = arraySort$1;
-
-  var ITERATOR = wellKnownSymbol('iterator');
-  var URL_SEARCH_PARAMS = 'URLSearchParams';
-  var URL_SEARCH_PARAMS_ITERATOR = URL_SEARCH_PARAMS + 'Iterator';
-  var setInternalState = InternalStateModule.set;
-  var getInternalParamsState = InternalStateModule.getterFor(URL_SEARCH_PARAMS);
-  var getInternalIteratorState = InternalStateModule.getterFor(URL_SEARCH_PARAMS_ITERATOR);
-
-  var nativeFetch = safeGetBuiltIn('fetch');
-  var NativeRequest = safeGetBuiltIn('Request');
-  var Headers = safeGetBuiltIn('Headers');
-  var RequestPrototype = NativeRequest && NativeRequest.prototype;
-  var HeadersPrototype = Headers && Headers.prototype;
-  var RegExp$1 = global$1.RegExp;
-  var TypeError$1 = global$1.TypeError;
-  var decodeURIComponent = global$1.decodeURIComponent;
-  var encodeURIComponent = global$1.encodeURIComponent;
-  var charAt = uncurryThis(''.charAt);
-  var join = uncurryThis([].join);
-  var push = uncurryThis([].push);
-  var replace = uncurryThis(''.replace);
-  var shift = uncurryThis([].shift);
-  var splice = uncurryThis([].splice);
-  var split = uncurryThis(''.split);
-  var stringSlice = uncurryThis(''.slice);
-
-  var plus = /\+/g;
-  var sequences = Array(4);
-
-  var percentSequence = function (bytes) {
-    return sequences[bytes - 1] || (sequences[bytes - 1] = RegExp$1('((?:%[\\da-f]{2}){' + bytes + '})', 'gi'));
-  };
-
-  var percentDecode = function (sequence) {
-    try {
-      return decodeURIComponent(sequence);
-    } catch (error) {
-      return sequence;
-    }
-  };
-
-  var deserialize = function (it) {
-    var result = replace(it, plus, ' ');
-    var bytes = 4;
-    try {
-      return decodeURIComponent(result);
-    } catch (error) {
-      while (bytes) {
-        result = replace(result, percentSequence(bytes--), percentDecode);
-      }
-      return result;
-    }
-  };
-
-  var find = /[!'()~]|%20/g;
-
-  var replacements = {
-    '!': '%21',
-    "'": '%27',
-    '(': '%28',
-    ')': '%29',
-    '~': '%7E',
-    '%20': '+'
-  };
-
-  var replacer = function (match) {
-    return replacements[match];
-  };
-
-  var serialize = function (it) {
-    return replace(encodeURIComponent(it), find, replacer);
-  };
-
-  var URLSearchParamsIterator = createIteratorConstructor(function Iterator(params, kind) {
-    setInternalState(this, {
-      type: URL_SEARCH_PARAMS_ITERATOR,
-      target: getInternalParamsState(params).entries,
-      index: 0,
-      kind: kind
-    });
-  }, URL_SEARCH_PARAMS, function next() {
-    var state = getInternalIteratorState(this);
-    var target = state.target;
-    var index = state.index++;
-    if (!target || index >= target.length) {
-      state.target = undefined;
-      return createIterResultObject(undefined, true);
-    }
-    var entry = target[index];
-    switch (state.kind) {
-      case 'keys': return createIterResultObject(entry.key, false);
-      case 'values': return createIterResultObject(entry.value, false);
-    } return createIterResultObject([entry.key, entry.value], false);
-  }, true);
-
-  var URLSearchParamsState = function (init) {
-    this.entries = [];
-    this.url = null;
-
-    if (init !== undefined) {
-      if (isObject(init)) this.parseObject(init);
-      else this.parseQuery(typeof init == 'string' ? charAt(init, 0) === '?' ? stringSlice(init, 1) : init : $toString(init));
-    }
-  };
-
-  URLSearchParamsState.prototype = {
-    type: URL_SEARCH_PARAMS,
-    bindURL: function (url) {
-      this.url = url;
-      this.update();
-    },
-    parseObject: function (object) {
-      var entries = this.entries;
-      var iteratorMethod = getIteratorMethod(object);
-      var iterator, next, step, entryIterator, entryNext, first, second;
-
-      if (iteratorMethod) {
-        iterator = getIterator(object, iteratorMethod);
-        next = iterator.next;
-        while (!(step = call(next, iterator)).done) {
-          entryIterator = getIterator(anObject(step.value));
-          entryNext = entryIterator.next;
-          if (
-            (first = call(entryNext, entryIterator)).done ||
-            (second = call(entryNext, entryIterator)).done ||
-            !call(entryNext, entryIterator).done
-          ) throw new TypeError$1('Expected sequence with length 2');
-          push(entries, { key: $toString(first.value), value: $toString(second.value) });
-        }
-      } else for (var key in object) if (hasOwn(object, key)) {
-        push(entries, { key: key, value: $toString(object[key]) });
-      }
-    },
-    parseQuery: function (query) {
-      if (query) {
-        var entries = this.entries;
-        var attributes = split(query, '&');
-        var index = 0;
-        var attribute, entry;
-        while (index < attributes.length) {
-          attribute = attributes[index++];
-          if (attribute.length) {
-            entry = split(attribute, '=');
-            push(entries, {
-              key: deserialize(shift(entry)),
-              value: deserialize(join(entry, '='))
-            });
-          }
-        }
-      }
-    },
-    serialize: function () {
-      var entries = this.entries;
-      var result = [];
-      var index = 0;
-      var entry;
-      while (index < entries.length) {
-        entry = entries[index++];
-        push(result, serialize(entry.key) + '=' + serialize(entry.value));
-      } return join(result, '&');
-    },
-    update: function () {
-      this.entries.length = 0;
-      this.parseQuery(this.url.query);
-    },
-    updateURL: function () {
-      if (this.url) this.url.update();
-    }
-  };
-
-  // `URLSearchParams` constructor
-  // https://url.spec.whatwg.org/#interface-urlsearchparams
-  var URLSearchParamsConstructor = function URLSearchParams(/* init */) {
-    anInstance(this, URLSearchParamsPrototype);
-    var init = arguments.length > 0 ? arguments[0] : undefined;
-    var state = setInternalState(this, new URLSearchParamsState(init));
-    if (!DESCRIPTORS) this.size = state.entries.length;
-  };
-
-  var URLSearchParamsPrototype = URLSearchParamsConstructor.prototype;
-
-  defineBuiltIns(URLSearchParamsPrototype, {
-    // `URLSearchParams.prototype.append` method
-    // https://url.spec.whatwg.org/#dom-urlsearchparams-append
-    append: function append(name, value) {
-      var state = getInternalParamsState(this);
-      validateArgumentsLength(arguments.length, 2);
-      push(state.entries, { key: $toString(name), value: $toString(value) });
-      if (!DESCRIPTORS) this.length++;
-      state.updateURL();
-    },
-    // `URLSearchParams.prototype.delete` method
-    // https://url.spec.whatwg.org/#dom-urlsearchparams-delete
-    'delete': function (name /* , value */) {
-      var state = getInternalParamsState(this);
-      var length = validateArgumentsLength(arguments.length, 1);
-      var entries = state.entries;
-      var key = $toString(name);
-      var $value = length < 2 ? undefined : arguments[1];
-      var value = $value === undefined ? $value : $toString($value);
-      var index = 0;
-      while (index < entries.length) {
-        var entry = entries[index];
-        if (entry.key === key && (value === undefined || entry.value === value)) {
-          splice(entries, index, 1);
-          if (value !== undefined) break;
-        } else index++;
-      }
-      if (!DESCRIPTORS) this.size = entries.length;
-      state.updateURL();
-    },
-    // `URLSearchParams.prototype.get` method
-    // https://url.spec.whatwg.org/#dom-urlsearchparams-get
-    get: function get(name) {
-      var entries = getInternalParamsState(this).entries;
-      validateArgumentsLength(arguments.length, 1);
-      var key = $toString(name);
-      var index = 0;
-      for (; index < entries.length; index++) {
-        if (entries[index].key === key) return entries[index].value;
-      }
-      return null;
-    },
-    // `URLSearchParams.prototype.getAll` method
-    // https://url.spec.whatwg.org/#dom-urlsearchparams-getall
-    getAll: function getAll(name) {
-      var entries = getInternalParamsState(this).entries;
-      validateArgumentsLength(arguments.length, 1);
-      var key = $toString(name);
-      var result = [];
-      var index = 0;
-      for (; index < entries.length; index++) {
-        if (entries[index].key === key) push(result, entries[index].value);
-      }
-      return result;
-    },
-    // `URLSearchParams.prototype.has` method
-    // https://url.spec.whatwg.org/#dom-urlsearchparams-has
-    has: function has(name /* , value */) {
-      var entries = getInternalParamsState(this).entries;
-      var length = validateArgumentsLength(arguments.length, 1);
-      var key = $toString(name);
-      var $value = length < 2 ? undefined : arguments[1];
-      var value = $value === undefined ? $value : $toString($value);
-      var index = 0;
-      while (index < entries.length) {
-        var entry = entries[index++];
-        if (entry.key === key && (value === undefined || entry.value === value)) return true;
-      }
-      return false;
-    },
-    // `URLSearchParams.prototype.set` method
-    // https://url.spec.whatwg.org/#dom-urlsearchparams-set
-    set: function set(name, value) {
-      var state = getInternalParamsState(this);
-      validateArgumentsLength(arguments.length, 1);
-      var entries = state.entries;
-      var found = false;
-      var key = $toString(name);
-      var val = $toString(value);
-      var index = 0;
-      var entry;
-      for (; index < entries.length; index++) {
-        entry = entries[index];
-        if (entry.key === key) {
-          if (found) splice(entries, index--, 1);
-          else {
-            found = true;
-            entry.value = val;
-          }
-        }
-      }
-      if (!found) push(entries, { key: key, value: val });
-      if (!DESCRIPTORS) this.size = entries.length;
-      state.updateURL();
-    },
-    // `URLSearchParams.prototype.sort` method
-    // https://url.spec.whatwg.org/#dom-urlsearchparams-sort
-    sort: function sort() {
-      var state = getInternalParamsState(this);
-      arraySort(state.entries, function (a, b) {
-        return a.key > b.key ? 1 : -1;
-      });
-      state.updateURL();
-    },
-    // `URLSearchParams.prototype.forEach` method
-    forEach: function forEach(callback /* , thisArg */) {
-      var entries = getInternalParamsState(this).entries;
-      var boundFunction = bind(callback, arguments.length > 1 ? arguments[1] : undefined);
-      var index = 0;
-      var entry;
-      while (index < entries.length) {
-        entry = entries[index++];
-        boundFunction(entry.value, entry.key, this);
-      }
-    },
-    // `URLSearchParams.prototype.keys` method
-    keys: function keys() {
-      return new URLSearchParamsIterator(this, 'keys');
-    },
-    // `URLSearchParams.prototype.values` method
-    values: function values() {
-      return new URLSearchParamsIterator(this, 'values');
-    },
-    // `URLSearchParams.prototype.entries` method
-    entries: function entries() {
-      return new URLSearchParamsIterator(this, 'entries');
-    }
-  }, { enumerable: true });
-
-  // `URLSearchParams.prototype[@@iterator]` method
-  defineBuiltIn(URLSearchParamsPrototype, ITERATOR, URLSearchParamsPrototype.entries, { name: 'entries' });
-
-  // `URLSearchParams.prototype.toString` method
-  // https://url.spec.whatwg.org/#urlsearchparams-stringification-behavior
-  defineBuiltIn(URLSearchParamsPrototype, 'toString', function toString() {
-    return getInternalParamsState(this).serialize();
-  }, { enumerable: true });
-
-  // `URLSearchParams.prototype.size` getter
-  // https://github.com/whatwg/url/pull/734
-  if (DESCRIPTORS) defineBuiltInAccessor(URLSearchParamsPrototype, 'size', {
-    get: function size() {
-      return getInternalParamsState(this).entries.length;
-    },
-    configurable: true,
-    enumerable: true
-  });
-
-  setToStringTag(URLSearchParamsConstructor, URL_SEARCH_PARAMS);
-
-  $({ global: true, constructor: true, forced: !USE_NATIVE_URL }, {
-    URLSearchParams: URLSearchParamsConstructor
-  });
-
-  // Wrap `fetch` and `Request` for correct work with polyfilled `URLSearchParams`
-  if (!USE_NATIVE_URL && isCallable(Headers)) {
-    var headersHas = uncurryThis(HeadersPrototype.has);
-    var headersSet = uncurryThis(HeadersPrototype.set);
-
-    var wrapRequestOptions = function (init) {
-      if (isObject(init)) {
-        var body = init.body;
-        var headers;
-        if (classof(body) === URL_SEARCH_PARAMS) {
-          headers = init.headers ? new Headers(init.headers) : new Headers();
-          if (!headersHas(headers, 'content-type')) {
-            headersSet(headers, 'content-type', 'application/x-www-form-urlencoded;charset=UTF-8');
-          }
-          return create(init, {
-            body: createPropertyDescriptor(0, $toString(body)),
-            headers: createPropertyDescriptor(0, headers)
-          });
-        }
-      } return init;
-    };
-
-    if (isCallable(nativeFetch)) {
-      $({ global: true, enumerable: true, dontCallGetSet: true, forced: true }, {
-        fetch: function fetch(input /* , init */) {
-          return nativeFetch(input, arguments.length > 1 ? wrapRequestOptions(arguments[1]) : {});
-        }
-      });
-    }
-
-    if (isCallable(NativeRequest)) {
-      var RequestConstructor = function Request(input /* , init */) {
-        anInstance(this, RequestPrototype);
-        return new NativeRequest(input, arguments.length > 1 ? wrapRequestOptions(arguments[1]) : {});
-      };
-
-      RequestPrototype.constructor = RequestConstructor;
-      RequestConstructor.prototype = RequestPrototype;
-
-      $({ global: true, constructor: true, dontCallGetSet: true, forced: true }, {
-        Request: RequestConstructor
-      });
-    }
+  var objectGetPrototypeOf;
+  var hasRequiredObjectGetPrototypeOf;
+
+  function requireObjectGetPrototypeOf () {
+  	if (hasRequiredObjectGetPrototypeOf) return objectGetPrototypeOf;
+  	hasRequiredObjectGetPrototypeOf = 1;
+  	var hasOwn = requireHasOwnProperty();
+  	var isCallable = requireIsCallable();
+  	var toObject = requireToObject();
+  	var sharedKey = requireSharedKey();
+  	var CORRECT_PROTOTYPE_GETTER = requireCorrectPrototypeGetter();
+
+  	var IE_PROTO = sharedKey('IE_PROTO');
+  	var $Object = Object;
+  	var ObjectPrototype = $Object.prototype;
+
+  	// `Object.getPrototypeOf` method
+  	// https://tc39.es/ecma262/#sec-object.getprototypeof
+  	// eslint-disable-next-line es/no-object-getprototypeof -- safe
+  	objectGetPrototypeOf = CORRECT_PROTOTYPE_GETTER ? $Object.getPrototypeOf : function (O) {
+  	  var object = toObject(O);
+  	  if (hasOwn(object, IE_PROTO)) return object[IE_PROTO];
+  	  var constructor = object.constructor;
+  	  if (isCallable(constructor) && object instanceof constructor) {
+  	    return constructor.prototype;
+  	  } return object instanceof $Object ? ObjectPrototype : null;
+  	};
+  	return objectGetPrototypeOf;
   }
 
+  var iteratorsCore;
+  var hasRequiredIteratorsCore;
+
+  function requireIteratorsCore () {
+  	if (hasRequiredIteratorsCore) return iteratorsCore;
+  	hasRequiredIteratorsCore = 1;
+  	var fails = requireFails();
+  	var isCallable = requireIsCallable();
+  	var isObject = requireIsObject();
+  	var create = requireObjectCreate();
+  	var getPrototypeOf = requireObjectGetPrototypeOf();
+  	var defineBuiltIn = requireDefineBuiltIn();
+  	var wellKnownSymbol = requireWellKnownSymbol();
+  	var IS_PURE = requireIsPure();
+
+  	var ITERATOR = wellKnownSymbol('iterator');
+  	var BUGGY_SAFARI_ITERATORS = false;
+
+  	// `%IteratorPrototype%` object
+  	// https://tc39.es/ecma262/#sec-%iteratorprototype%-object
+  	var IteratorPrototype, PrototypeOfArrayIteratorPrototype, arrayIterator;
+
+  	/* eslint-disable es/no-array-prototype-keys -- safe */
+  	if ([].keys) {
+  	  arrayIterator = [].keys();
+  	  // Safari 8 has buggy iterators w/o `next`
+  	  if (!('next' in arrayIterator)) BUGGY_SAFARI_ITERATORS = true;
+  	  else {
+  	    PrototypeOfArrayIteratorPrototype = getPrototypeOf(getPrototypeOf(arrayIterator));
+  	    if (PrototypeOfArrayIteratorPrototype !== Object.prototype) IteratorPrototype = PrototypeOfArrayIteratorPrototype;
+  	  }
+  	}
+
+  	var NEW_ITERATOR_PROTOTYPE = !isObject(IteratorPrototype) || fails(function () {
+  	  var test = {};
+  	  // FF44- legacy iterators case
+  	  return IteratorPrototype[ITERATOR].call(test) !== test;
+  	});
+
+  	if (NEW_ITERATOR_PROTOTYPE) IteratorPrototype = {};
+  	else if (IS_PURE) IteratorPrototype = create(IteratorPrototype);
+
+  	// `%IteratorPrototype%[@@iterator]()` method
+  	// https://tc39.es/ecma262/#sec-%iteratorprototype%-@@iterator
+  	if (!isCallable(IteratorPrototype[ITERATOR])) {
+  	  defineBuiltIn(IteratorPrototype, ITERATOR, function () {
+  	    return this;
+  	  });
+  	}
+
+  	iteratorsCore = {
+  	  IteratorPrototype: IteratorPrototype,
+  	  BUGGY_SAFARI_ITERATORS: BUGGY_SAFARI_ITERATORS
+  	};
+  	return iteratorsCore;
+  }
+
+  var setToStringTag;
+  var hasRequiredSetToStringTag;
+
+  function requireSetToStringTag () {
+  	if (hasRequiredSetToStringTag) return setToStringTag;
+  	hasRequiredSetToStringTag = 1;
+  	var defineProperty = requireObjectDefineProperty().f;
+  	var hasOwn = requireHasOwnProperty();
+  	var wellKnownSymbol = requireWellKnownSymbol();
+
+  	var TO_STRING_TAG = wellKnownSymbol('toStringTag');
+
+  	setToStringTag = function (target, TAG, STATIC) {
+  	  if (target && !STATIC) target = target.prototype;
+  	  if (target && !hasOwn(target, TO_STRING_TAG)) {
+  	    defineProperty(target, TO_STRING_TAG, { configurable: true, value: TAG });
+  	  }
+  	};
+  	return setToStringTag;
+  }
+
+  var iteratorCreateConstructor;
+  var hasRequiredIteratorCreateConstructor;
+
+  function requireIteratorCreateConstructor () {
+  	if (hasRequiredIteratorCreateConstructor) return iteratorCreateConstructor;
+  	hasRequiredIteratorCreateConstructor = 1;
+  	var IteratorPrototype = requireIteratorsCore().IteratorPrototype;
+  	var create = requireObjectCreate();
+  	var createPropertyDescriptor = requireCreatePropertyDescriptor();
+  	var setToStringTag = requireSetToStringTag();
+  	var Iterators = requireIterators();
+
+  	var returnThis = function () { return this; };
+
+  	iteratorCreateConstructor = function (IteratorConstructor, NAME, next, ENUMERABLE_NEXT) {
+  	  var TO_STRING_TAG = NAME + ' Iterator';
+  	  IteratorConstructor.prototype = create(IteratorPrototype, { next: createPropertyDescriptor(+!ENUMERABLE_NEXT, next) });
+  	  setToStringTag(IteratorConstructor, TO_STRING_TAG, false, true);
+  	  Iterators[TO_STRING_TAG] = returnThis;
+  	  return IteratorConstructor;
+  	};
+  	return iteratorCreateConstructor;
+  }
+
+  var functionUncurryThisAccessor;
+  var hasRequiredFunctionUncurryThisAccessor;
+
+  function requireFunctionUncurryThisAccessor () {
+  	if (hasRequiredFunctionUncurryThisAccessor) return functionUncurryThisAccessor;
+  	hasRequiredFunctionUncurryThisAccessor = 1;
+  	var uncurryThis = requireFunctionUncurryThis();
+  	var aCallable = requireACallable();
+
+  	functionUncurryThisAccessor = function (object, key, method) {
+  	  try {
+  	    // eslint-disable-next-line es/no-object-getownpropertydescriptor -- safe
+  	    return uncurryThis(aCallable(Object.getOwnPropertyDescriptor(object, key)[method]));
+  	  } catch (error) { /* empty */ }
+  	};
+  	return functionUncurryThisAccessor;
+  }
+
+  var isPossiblePrototype;
+  var hasRequiredIsPossiblePrototype;
+
+  function requireIsPossiblePrototype () {
+  	if (hasRequiredIsPossiblePrototype) return isPossiblePrototype;
+  	hasRequiredIsPossiblePrototype = 1;
+  	var isObject = requireIsObject();
+
+  	isPossiblePrototype = function (argument) {
+  	  return isObject(argument) || argument === null;
+  	};
+  	return isPossiblePrototype;
+  }
+
+  var aPossiblePrototype;
+  var hasRequiredAPossiblePrototype;
+
+  function requireAPossiblePrototype () {
+  	if (hasRequiredAPossiblePrototype) return aPossiblePrototype;
+  	hasRequiredAPossiblePrototype = 1;
+  	var isPossiblePrototype = requireIsPossiblePrototype();
+
+  	var $String = String;
+  	var $TypeError = TypeError;
+
+  	aPossiblePrototype = function (argument) {
+  	  if (isPossiblePrototype(argument)) return argument;
+  	  throw new $TypeError("Can't set " + $String(argument) + ' as a prototype');
+  	};
+  	return aPossiblePrototype;
+  }
+
+  var objectSetPrototypeOf;
+  var hasRequiredObjectSetPrototypeOf;
+
+  function requireObjectSetPrototypeOf () {
+  	if (hasRequiredObjectSetPrototypeOf) return objectSetPrototypeOf;
+  	hasRequiredObjectSetPrototypeOf = 1;
+  	/* eslint-disable no-proto -- safe */
+  	var uncurryThisAccessor = requireFunctionUncurryThisAccessor();
+  	var isObject = requireIsObject();
+  	var requireObjectCoercible = requireRequireObjectCoercible();
+  	var aPossiblePrototype = requireAPossiblePrototype();
+
+  	// `Object.setPrototypeOf` method
+  	// https://tc39.es/ecma262/#sec-object.setprototypeof
+  	// Works with __proto__ only. Old v8 can't work with null proto objects.
+  	// eslint-disable-next-line es/no-object-setprototypeof -- safe
+  	objectSetPrototypeOf = Object.setPrototypeOf || ('__proto__' in {} ? function () {
+  	  var CORRECT_SETTER = false;
+  	  var test = {};
+  	  var setter;
+  	  try {
+  	    setter = uncurryThisAccessor(Object.prototype, '__proto__', 'set');
+  	    setter(test, []);
+  	    CORRECT_SETTER = test instanceof Array;
+  	  } catch (error) { /* empty */ }
+  	  return function setPrototypeOf(O, proto) {
+  	    requireObjectCoercible(O);
+  	    aPossiblePrototype(proto);
+  	    if (!isObject(O)) return O;
+  	    if (CORRECT_SETTER) setter(O, proto);
+  	    else O.__proto__ = proto;
+  	    return O;
+  	  };
+  	}() : undefined);
+  	return objectSetPrototypeOf;
+  }
+
+  var iteratorDefine;
+  var hasRequiredIteratorDefine;
+
+  function requireIteratorDefine () {
+  	if (hasRequiredIteratorDefine) return iteratorDefine;
+  	hasRequiredIteratorDefine = 1;
+  	var $ = require_export();
+  	var call = requireFunctionCall();
+  	var IS_PURE = requireIsPure();
+  	var FunctionName = requireFunctionName();
+  	var isCallable = requireIsCallable();
+  	var createIteratorConstructor = requireIteratorCreateConstructor();
+  	var getPrototypeOf = requireObjectGetPrototypeOf();
+  	var setPrototypeOf = requireObjectSetPrototypeOf();
+  	var setToStringTag = requireSetToStringTag();
+  	var createNonEnumerableProperty = requireCreateNonEnumerableProperty();
+  	var defineBuiltIn = requireDefineBuiltIn();
+  	var wellKnownSymbol = requireWellKnownSymbol();
+  	var Iterators = requireIterators();
+  	var IteratorsCore = requireIteratorsCore();
+
+  	var PROPER_FUNCTION_NAME = FunctionName.PROPER;
+  	var CONFIGURABLE_FUNCTION_NAME = FunctionName.CONFIGURABLE;
+  	var IteratorPrototype = IteratorsCore.IteratorPrototype;
+  	var BUGGY_SAFARI_ITERATORS = IteratorsCore.BUGGY_SAFARI_ITERATORS;
+  	var ITERATOR = wellKnownSymbol('iterator');
+  	var KEYS = 'keys';
+  	var VALUES = 'values';
+  	var ENTRIES = 'entries';
+
+  	var returnThis = function () { return this; };
+
+  	iteratorDefine = function (Iterable, NAME, IteratorConstructor, next, DEFAULT, IS_SET, FORCED) {
+  	  createIteratorConstructor(IteratorConstructor, NAME, next);
+
+  	  var getIterationMethod = function (KIND) {
+  	    if (KIND === DEFAULT && defaultIterator) return defaultIterator;
+  	    if (!BUGGY_SAFARI_ITERATORS && KIND && KIND in IterablePrototype) return IterablePrototype[KIND];
+
+  	    switch (KIND) {
+  	      case KEYS: return function keys() { return new IteratorConstructor(this, KIND); };
+  	      case VALUES: return function values() { return new IteratorConstructor(this, KIND); };
+  	      case ENTRIES: return function entries() { return new IteratorConstructor(this, KIND); };
+  	    }
+
+  	    return function () { return new IteratorConstructor(this); };
+  	  };
+
+  	  var TO_STRING_TAG = NAME + ' Iterator';
+  	  var INCORRECT_VALUES_NAME = false;
+  	  var IterablePrototype = Iterable.prototype;
+  	  var nativeIterator = IterablePrototype[ITERATOR]
+  	    || IterablePrototype['@@iterator']
+  	    || DEFAULT && IterablePrototype[DEFAULT];
+  	  var defaultIterator = !BUGGY_SAFARI_ITERATORS && nativeIterator || getIterationMethod(DEFAULT);
+  	  var anyNativeIterator = NAME === 'Array' ? IterablePrototype.entries || nativeIterator : nativeIterator;
+  	  var CurrentIteratorPrototype, methods, KEY;
+
+  	  // fix native
+  	  if (anyNativeIterator) {
+  	    CurrentIteratorPrototype = getPrototypeOf(anyNativeIterator.call(new Iterable()));
+  	    if (CurrentIteratorPrototype !== Object.prototype && CurrentIteratorPrototype.next) {
+  	      if (!IS_PURE && getPrototypeOf(CurrentIteratorPrototype) !== IteratorPrototype) {
+  	        if (setPrototypeOf) {
+  	          setPrototypeOf(CurrentIteratorPrototype, IteratorPrototype);
+  	        } else if (!isCallable(CurrentIteratorPrototype[ITERATOR])) {
+  	          defineBuiltIn(CurrentIteratorPrototype, ITERATOR, returnThis);
+  	        }
+  	      }
+  	      // Set @@toStringTag to native iterators
+  	      setToStringTag(CurrentIteratorPrototype, TO_STRING_TAG, true, true);
+  	      if (IS_PURE) Iterators[TO_STRING_TAG] = returnThis;
+  	    }
+  	  }
+
+  	  // fix Array.prototype.{ values, @@iterator }.name in V8 / FF
+  	  if (PROPER_FUNCTION_NAME && DEFAULT === VALUES && nativeIterator && nativeIterator.name !== VALUES) {
+  	    if (!IS_PURE && CONFIGURABLE_FUNCTION_NAME) {
+  	      createNonEnumerableProperty(IterablePrototype, 'name', VALUES);
+  	    } else {
+  	      INCORRECT_VALUES_NAME = true;
+  	      defaultIterator = function values() { return call(nativeIterator, this); };
+  	    }
+  	  }
+
+  	  // export additional methods
+  	  if (DEFAULT) {
+  	    methods = {
+  	      values: getIterationMethod(VALUES),
+  	      keys: IS_SET ? defaultIterator : getIterationMethod(KEYS),
+  	      entries: getIterationMethod(ENTRIES)
+  	    };
+  	    if (FORCED) for (KEY in methods) {
+  	      if (BUGGY_SAFARI_ITERATORS || INCORRECT_VALUES_NAME || !(KEY in IterablePrototype)) {
+  	        defineBuiltIn(IterablePrototype, KEY, methods[KEY]);
+  	      }
+  	    } else $({ target: NAME, proto: true, forced: BUGGY_SAFARI_ITERATORS || INCORRECT_VALUES_NAME }, methods);
+  	  }
+
+  	  // define iterator
+  	  if ((!IS_PURE || FORCED) && IterablePrototype[ITERATOR] !== defaultIterator) {
+  	    defineBuiltIn(IterablePrototype, ITERATOR, defaultIterator, { name: DEFAULT });
+  	  }
+  	  Iterators[NAME] = defaultIterator;
+
+  	  return methods;
+  	};
+  	return iteratorDefine;
+  }
+
+  var createIterResultObject;
+  var hasRequiredCreateIterResultObject;
+
+  function requireCreateIterResultObject () {
+  	if (hasRequiredCreateIterResultObject) return createIterResultObject;
+  	hasRequiredCreateIterResultObject = 1;
+  	// `CreateIterResultObject` abstract operation
+  	// https://tc39.es/ecma262/#sec-createiterresultobject
+  	createIterResultObject = function (value, done) {
+  	  return { value: value, done: done };
+  	};
+  	return createIterResultObject;
+  }
+
+  var es_array_iterator;
+  var hasRequiredEs_array_iterator;
+
+  function requireEs_array_iterator () {
+  	if (hasRequiredEs_array_iterator) return es_array_iterator;
+  	hasRequiredEs_array_iterator = 1;
+  	var toIndexedObject = requireToIndexedObject();
+  	var addToUnscopables = requireAddToUnscopables();
+  	var Iterators = requireIterators();
+  	var InternalStateModule = requireInternalState();
+  	var defineProperty = requireObjectDefineProperty().f;
+  	var defineIterator = requireIteratorDefine();
+  	var createIterResultObject = requireCreateIterResultObject();
+  	var IS_PURE = requireIsPure();
+  	var DESCRIPTORS = requireDescriptors();
+
+  	var ARRAY_ITERATOR = 'Array Iterator';
+  	var setInternalState = InternalStateModule.set;
+  	var getInternalState = InternalStateModule.getterFor(ARRAY_ITERATOR);
+
+  	// `Array.prototype.entries` method
+  	// https://tc39.es/ecma262/#sec-array.prototype.entries
+  	// `Array.prototype.keys` method
+  	// https://tc39.es/ecma262/#sec-array.prototype.keys
+  	// `Array.prototype.values` method
+  	// https://tc39.es/ecma262/#sec-array.prototype.values
+  	// `Array.prototype[@@iterator]` method
+  	// https://tc39.es/ecma262/#sec-array.prototype-@@iterator
+  	// `CreateArrayIterator` internal method
+  	// https://tc39.es/ecma262/#sec-createarrayiterator
+  	es_array_iterator = defineIterator(Array, 'Array', function (iterated, kind) {
+  	  setInternalState(this, {
+  	    type: ARRAY_ITERATOR,
+  	    target: toIndexedObject(iterated), // target
+  	    index: 0,                          // next index
+  	    kind: kind                         // kind
+  	  });
+  	// `%ArrayIteratorPrototype%.next` method
+  	// https://tc39.es/ecma262/#sec-%arrayiteratorprototype%.next
+  	}, function () {
+  	  var state = getInternalState(this);
+  	  var target = state.target;
+  	  var index = state.index++;
+  	  if (!target || index >= target.length) {
+  	    state.target = null;
+  	    return createIterResultObject(undefined, true);
+  	  }
+  	  switch (state.kind) {
+  	    case 'keys': return createIterResultObject(index, false);
+  	    case 'values': return createIterResultObject(target[index], false);
+  	  } return createIterResultObject([index, target[index]], false);
+  	}, 'values');
+
+  	// argumentsList[@@iterator] is %ArrayProto_values%
+  	// https://tc39.es/ecma262/#sec-createunmappedargumentsobject
+  	// https://tc39.es/ecma262/#sec-createmappedargumentsobject
+  	var values = Iterators.Arguments = Iterators.Array;
+
+  	// https://tc39.es/ecma262/#sec-array.prototype-@@unscopables
+  	addToUnscopables('keys');
+  	addToUnscopables('values');
+  	addToUnscopables('entries');
+
+  	// V8 ~ Chrome 45- bug
+  	if (!IS_PURE && DESCRIPTORS && values.name !== 'values') try {
+  	  defineProperty(values, 'name', { value: 'values' });
+  	} catch (error) { /* empty */ }
+  	return es_array_iterator;
+  }
+
+  requireEs_array_iterator();
+
+  var es_object_assign = {};
+
+  var objectAssign;
+  var hasRequiredObjectAssign;
+
+  function requireObjectAssign () {
+  	if (hasRequiredObjectAssign) return objectAssign;
+  	hasRequiredObjectAssign = 1;
+  	var DESCRIPTORS = requireDescriptors();
+  	var uncurryThis = requireFunctionUncurryThis();
+  	var call = requireFunctionCall();
+  	var fails = requireFails();
+  	var objectKeys = requireObjectKeys();
+  	var getOwnPropertySymbolsModule = requireObjectGetOwnPropertySymbols();
+  	var propertyIsEnumerableModule = requireObjectPropertyIsEnumerable();
+  	var toObject = requireToObject();
+  	var IndexedObject = requireIndexedObject();
+
+  	// eslint-disable-next-line es/no-object-assign -- safe
+  	var $assign = Object.assign;
+  	// eslint-disable-next-line es/no-object-defineproperty -- required for testing
+  	var defineProperty = Object.defineProperty;
+  	var concat = uncurryThis([].concat);
+
+  	// `Object.assign` method
+  	// https://tc39.es/ecma262/#sec-object.assign
+  	objectAssign = !$assign || fails(function () {
+  	  // should have correct order of operations (Edge bug)
+  	  if (DESCRIPTORS && $assign({ b: 1 }, $assign(defineProperty({}, 'a', {
+  	    enumerable: true,
+  	    get: function () {
+  	      defineProperty(this, 'b', {
+  	        value: 3,
+  	        enumerable: false
+  	      });
+  	    }
+  	  }), { b: 2 })).b !== 1) return true;
+  	  // should work with symbols and should have deterministic property order (V8 bug)
+  	  var A = {};
+  	  var B = {};
+  	  // eslint-disable-next-line es/no-symbol -- safe
+  	  var symbol = Symbol('assign detection');
+  	  var alphabet = 'abcdefghijklmnopqrst';
+  	  A[symbol] = 7;
+  	  alphabet.split('').forEach(function (chr) { B[chr] = chr; });
+  	  return $assign({}, A)[symbol] !== 7 || objectKeys($assign({}, B)).join('') !== alphabet;
+  	}) ? function assign(target, source) { // eslint-disable-line no-unused-vars -- required for `.length`
+  	  var T = toObject(target);
+  	  var argumentsLength = arguments.length;
+  	  var index = 1;
+  	  var getOwnPropertySymbols = getOwnPropertySymbolsModule.f;
+  	  var propertyIsEnumerable = propertyIsEnumerableModule.f;
+  	  while (argumentsLength > index) {
+  	    var S = IndexedObject(arguments[index++]);
+  	    var keys = getOwnPropertySymbols ? concat(objectKeys(S), getOwnPropertySymbols(S)) : objectKeys(S);
+  	    var length = keys.length;
+  	    var j = 0;
+  	    var key;
+  	    while (length > j) {
+  	      key = keys[j++];
+  	      if (!DESCRIPTORS || call(propertyIsEnumerable, S, key)) T[key] = S[key];
+  	    }
+  	  } return T;
+  	} : $assign;
+  	return objectAssign;
+  }
+
+  var hasRequiredEs_object_assign;
+
+  function requireEs_object_assign () {
+  	if (hasRequiredEs_object_assign) return es_object_assign;
+  	hasRequiredEs_object_assign = 1;
+  	var $ = require_export();
+  	var assign = requireObjectAssign();
+
+  	// `Object.assign` method
+  	// https://tc39.es/ecma262/#sec-object.assign
+  	// eslint-disable-next-line es/no-object-assign -- required for testing
+  	$({ target: 'Object', stat: true, arity: 2, forced: Object.assign !== assign }, {
+  	  assign: assign
+  	});
+  	return es_object_assign;
+  }
+
+  requireEs_object_assign();
+
+  var es_object_entries = {};
+
+  var objectToArray;
+  var hasRequiredObjectToArray;
+
+  function requireObjectToArray () {
+  	if (hasRequiredObjectToArray) return objectToArray;
+  	hasRequiredObjectToArray = 1;
+  	var DESCRIPTORS = requireDescriptors();
+  	var fails = requireFails();
+  	var uncurryThis = requireFunctionUncurryThis();
+  	var objectGetPrototypeOf = requireObjectGetPrototypeOf();
+  	var objectKeys = requireObjectKeys();
+  	var toIndexedObject = requireToIndexedObject();
+  	var $propertyIsEnumerable = requireObjectPropertyIsEnumerable().f;
+
+  	var propertyIsEnumerable = uncurryThis($propertyIsEnumerable);
+  	var push = uncurryThis([].push);
+
+  	// in some IE versions, `propertyIsEnumerable` returns incorrect result on integer keys
+  	// of `null` prototype objects
+  	var IE_BUG = DESCRIPTORS && fails(function () {
+  	  // eslint-disable-next-line es/no-object-create -- safe
+  	  var O = Object.create(null);
+  	  O[2] = 2;
+  	  return !propertyIsEnumerable(O, 2);
+  	});
+
+  	// `Object.{ entries, values }` methods implementation
+  	var createMethod = function (TO_ENTRIES) {
+  	  return function (it) {
+  	    var O = toIndexedObject(it);
+  	    var keys = objectKeys(O);
+  	    var IE_WORKAROUND = IE_BUG && objectGetPrototypeOf(O) === null;
+  	    var length = keys.length;
+  	    var i = 0;
+  	    var result = [];
+  	    var key;
+  	    while (length > i) {
+  	      key = keys[i++];
+  	      if (!DESCRIPTORS || (IE_WORKAROUND ? key in O : propertyIsEnumerable(O, key))) {
+  	        push(result, TO_ENTRIES ? [key, O[key]] : O[key]);
+  	      }
+  	    }
+  	    return result;
+  	  };
+  	};
+
+  	objectToArray = {
+  	  // `Object.entries` method
+  	  // https://tc39.es/ecma262/#sec-object.entries
+  	  entries: createMethod(true),
+  	  // `Object.values` method
+  	  // https://tc39.es/ecma262/#sec-object.values
+  	  values: createMethod(false)
+  	};
+  	return objectToArray;
+  }
+
+  var hasRequiredEs_object_entries;
+
+  function requireEs_object_entries () {
+  	if (hasRequiredEs_object_entries) return es_object_entries;
+  	hasRequiredEs_object_entries = 1;
+  	var $ = require_export();
+  	var $entries = requireObjectToArray().entries;
+
+  	// `Object.entries` method
+  	// https://tc39.es/ecma262/#sec-object.entries
+  	$({ target: 'Object', stat: true }, {
+  	  entries: function entries(O) {
+  	    return $entries(O);
+  	  }
+  	});
+  	return es_object_entries;
+  }
+
+  requireEs_object_entries();
+
+  var es_object_toString = {};
+
+  var objectToString;
+  var hasRequiredObjectToString;
+
+  function requireObjectToString () {
+  	if (hasRequiredObjectToString) return objectToString;
+  	hasRequiredObjectToString = 1;
+  	var TO_STRING_TAG_SUPPORT = requireToStringTagSupport();
+  	var classof = requireClassof();
+
+  	// `Object.prototype.toString` method implementation
+  	// https://tc39.es/ecma262/#sec-object.prototype.tostring
+  	objectToString = TO_STRING_TAG_SUPPORT ? {}.toString : function toString() {
+  	  return '[object ' + classof(this) + ']';
+  	};
+  	return objectToString;
+  }
+
+  var hasRequiredEs_object_toString;
+
+  function requireEs_object_toString () {
+  	if (hasRequiredEs_object_toString) return es_object_toString;
+  	hasRequiredEs_object_toString = 1;
+  	var TO_STRING_TAG_SUPPORT = requireToStringTagSupport();
+  	var defineBuiltIn = requireDefineBuiltIn();
+  	var toString = requireObjectToString();
+
+  	// `Object.prototype.toString` method
+  	// https://tc39.es/ecma262/#sec-object.prototype.tostring
+  	if (!TO_STRING_TAG_SUPPORT) {
+  	  defineBuiltIn(Object.prototype, 'toString', toString, { unsafe: true });
+  	}
+  	return es_object_toString;
+  }
+
+  requireEs_object_toString();
+
+  var es_regexp_exec = {};
+
+  var toString;
+  var hasRequiredToString;
+
+  function requireToString () {
+  	if (hasRequiredToString) return toString;
+  	hasRequiredToString = 1;
+  	var classof = requireClassof();
+
+  	var $String = String;
+
+  	toString = function (argument) {
+  	  if (classof(argument) === 'Symbol') throw new TypeError('Cannot convert a Symbol value to a string');
+  	  return $String(argument);
+  	};
+  	return toString;
+  }
+
+  var regexpFlags;
+  var hasRequiredRegexpFlags;
+
+  function requireRegexpFlags () {
+  	if (hasRequiredRegexpFlags) return regexpFlags;
+  	hasRequiredRegexpFlags = 1;
+  	var anObject = requireAnObject();
+
+  	// `RegExp.prototype.flags` getter implementation
+  	// https://tc39.es/ecma262/#sec-get-regexp.prototype.flags
+  	regexpFlags = function () {
+  	  var that = anObject(this);
+  	  var result = '';
+  	  if (that.hasIndices) result += 'd';
+  	  if (that.global) result += 'g';
+  	  if (that.ignoreCase) result += 'i';
+  	  if (that.multiline) result += 'm';
+  	  if (that.dotAll) result += 's';
+  	  if (that.unicode) result += 'u';
+  	  if (that.unicodeSets) result += 'v';
+  	  if (that.sticky) result += 'y';
+  	  return result;
+  	};
+  	return regexpFlags;
+  }
+
+  var regexpStickyHelpers;
+  var hasRequiredRegexpStickyHelpers;
+
+  function requireRegexpStickyHelpers () {
+  	if (hasRequiredRegexpStickyHelpers) return regexpStickyHelpers;
+  	hasRequiredRegexpStickyHelpers = 1;
+  	var fails = requireFails();
+  	var globalThis = requireGlobalThis();
+
+  	// babel-minify and Closure Compiler transpiles RegExp('a', 'y') -> /a/y and it causes SyntaxError
+  	var $RegExp = globalThis.RegExp;
+
+  	var UNSUPPORTED_Y = fails(function () {
+  	  var re = $RegExp('a', 'y');
+  	  re.lastIndex = 2;
+  	  return re.exec('abcd') !== null;
+  	});
+
+  	// UC Browser bug
+  	// https://github.com/zloirock/core-js/issues/1008
+  	var MISSED_STICKY = UNSUPPORTED_Y || fails(function () {
+  	  return !$RegExp('a', 'y').sticky;
+  	});
+
+  	var BROKEN_CARET = UNSUPPORTED_Y || fails(function () {
+  	  // https://bugzilla.mozilla.org/show_bug.cgi?id=773687
+  	  var re = $RegExp('^r', 'gy');
+  	  re.lastIndex = 2;
+  	  return re.exec('str') !== null;
+  	});
+
+  	regexpStickyHelpers = {
+  	  BROKEN_CARET: BROKEN_CARET,
+  	  MISSED_STICKY: MISSED_STICKY,
+  	  UNSUPPORTED_Y: UNSUPPORTED_Y
+  	};
+  	return regexpStickyHelpers;
+  }
+
+  var regexpUnsupportedDotAll;
+  var hasRequiredRegexpUnsupportedDotAll;
+
+  function requireRegexpUnsupportedDotAll () {
+  	if (hasRequiredRegexpUnsupportedDotAll) return regexpUnsupportedDotAll;
+  	hasRequiredRegexpUnsupportedDotAll = 1;
+  	var fails = requireFails();
+  	var globalThis = requireGlobalThis();
+
+  	// babel-minify and Closure Compiler transpiles RegExp('.', 's') -> /./s and it causes SyntaxError
+  	var $RegExp = globalThis.RegExp;
+
+  	regexpUnsupportedDotAll = fails(function () {
+  	  var re = $RegExp('.', 's');
+  	  return !(re.dotAll && re.test('\n') && re.flags === 's');
+  	});
+  	return regexpUnsupportedDotAll;
+  }
+
+  var regexpUnsupportedNcg;
+  var hasRequiredRegexpUnsupportedNcg;
+
+  function requireRegexpUnsupportedNcg () {
+  	if (hasRequiredRegexpUnsupportedNcg) return regexpUnsupportedNcg;
+  	hasRequiredRegexpUnsupportedNcg = 1;
+  	var fails = requireFails();
+  	var globalThis = requireGlobalThis();
+
+  	// babel-minify and Closure Compiler transpiles RegExp('(?<a>b)', 'g') -> /(?<a>b)/g and it causes SyntaxError
+  	var $RegExp = globalThis.RegExp;
+
+  	regexpUnsupportedNcg = fails(function () {
+  	  var re = $RegExp('(?<a>b)', 'g');
+  	  return re.exec('b').groups.a !== 'b' ||
+  	    'b'.replace(re, '$<a>c') !== 'bc';
+  	});
+  	return regexpUnsupportedNcg;
+  }
+
+  var regexpExec;
+  var hasRequiredRegexpExec;
+
+  function requireRegexpExec () {
+  	if (hasRequiredRegexpExec) return regexpExec;
+  	hasRequiredRegexpExec = 1;
+  	/* eslint-disable regexp/no-empty-capturing-group, regexp/no-empty-group, regexp/no-lazy-ends -- testing */
+  	/* eslint-disable regexp/no-useless-quantifier -- testing */
+  	var call = requireFunctionCall();
+  	var uncurryThis = requireFunctionUncurryThis();
+  	var toString = requireToString();
+  	var regexpFlags = requireRegexpFlags();
+  	var stickyHelpers = requireRegexpStickyHelpers();
+  	var shared = requireShared();
+  	var create = requireObjectCreate();
+  	var getInternalState = requireInternalState().get;
+  	var UNSUPPORTED_DOT_ALL = requireRegexpUnsupportedDotAll();
+  	var UNSUPPORTED_NCG = requireRegexpUnsupportedNcg();
+
+  	var nativeReplace = shared('native-string-replace', String.prototype.replace);
+  	var nativeExec = RegExp.prototype.exec;
+  	var patchedExec = nativeExec;
+  	var charAt = uncurryThis(''.charAt);
+  	var indexOf = uncurryThis(''.indexOf);
+  	var replace = uncurryThis(''.replace);
+  	var stringSlice = uncurryThis(''.slice);
+
+  	var UPDATES_LAST_INDEX_WRONG = (function () {
+  	  var re1 = /a/;
+  	  var re2 = /b*/g;
+  	  call(nativeExec, re1, 'a');
+  	  call(nativeExec, re2, 'a');
+  	  return re1.lastIndex !== 0 || re2.lastIndex !== 0;
+  	})();
+
+  	var UNSUPPORTED_Y = stickyHelpers.BROKEN_CARET;
+
+  	// nonparticipating capturing group, copied from es5-shim's String#split patch.
+  	var NPCG_INCLUDED = /()??/.exec('')[1] !== undefined;
+
+  	var PATCH = UPDATES_LAST_INDEX_WRONG || NPCG_INCLUDED || UNSUPPORTED_Y || UNSUPPORTED_DOT_ALL || UNSUPPORTED_NCG;
+
+  	if (PATCH) {
+  	  patchedExec = function exec(string) {
+  	    var re = this;
+  	    var state = getInternalState(re);
+  	    var str = toString(string);
+  	    var raw = state.raw;
+  	    var result, reCopy, lastIndex, match, i, object, group;
+
+  	    if (raw) {
+  	      raw.lastIndex = re.lastIndex;
+  	      result = call(patchedExec, raw, str);
+  	      re.lastIndex = raw.lastIndex;
+  	      return result;
+  	    }
+
+  	    var groups = state.groups;
+  	    var sticky = UNSUPPORTED_Y && re.sticky;
+  	    var flags = call(regexpFlags, re);
+  	    var source = re.source;
+  	    var charsAdded = 0;
+  	    var strCopy = str;
+
+  	    if (sticky) {
+  	      flags = replace(flags, 'y', '');
+  	      if (indexOf(flags, 'g') === -1) {
+  	        flags += 'g';
+  	      }
+
+  	      strCopy = stringSlice(str, re.lastIndex);
+  	      // Support anchored sticky behavior.
+  	      if (re.lastIndex > 0 && (!re.multiline || re.multiline && charAt(str, re.lastIndex - 1) !== '\n')) {
+  	        source = '(?: ' + source + ')';
+  	        strCopy = ' ' + strCopy;
+  	        charsAdded++;
+  	      }
+  	      // ^(? + rx + ) is needed, in combination with some str slicing, to
+  	      // simulate the 'y' flag.
+  	      reCopy = new RegExp('^(?:' + source + ')', flags);
+  	    }
+
+  	    if (NPCG_INCLUDED) {
+  	      reCopy = new RegExp('^' + source + '$(?!\\s)', flags);
+  	    }
+  	    if (UPDATES_LAST_INDEX_WRONG) lastIndex = re.lastIndex;
+
+  	    match = call(nativeExec, sticky ? reCopy : re, strCopy);
+
+  	    if (sticky) {
+  	      if (match) {
+  	        match.input = stringSlice(match.input, charsAdded);
+  	        match[0] = stringSlice(match[0], charsAdded);
+  	        match.index = re.lastIndex;
+  	        re.lastIndex += match[0].length;
+  	      } else re.lastIndex = 0;
+  	    } else if (UPDATES_LAST_INDEX_WRONG && match) {
+  	      re.lastIndex = re.global ? match.index + match[0].length : lastIndex;
+  	    }
+  	    if (NPCG_INCLUDED && match && match.length > 1) {
+  	      // Fix browsers whose `exec` methods don't consistently return `undefined`
+  	      // for NPCG, like IE8. NOTE: This doesn't work for /(.?)?/
+  	      call(nativeReplace, match[0], reCopy, function () {
+  	        for (i = 1; i < arguments.length - 2; i++) {
+  	          if (arguments[i] === undefined) match[i] = undefined;
+  	        }
+  	      });
+  	    }
+
+  	    if (match && groups) {
+  	      match.groups = object = create(null);
+  	      for (i = 0; i < groups.length; i++) {
+  	        group = groups[i];
+  	        object[group[0]] = match[group[1]];
+  	      }
+  	    }
+
+  	    return match;
+  	  };
+  	}
+
+  	regexpExec = patchedExec;
+  	return regexpExec;
+  }
+
+  var hasRequiredEs_regexp_exec;
+
+  function requireEs_regexp_exec () {
+  	if (hasRequiredEs_regexp_exec) return es_regexp_exec;
+  	hasRequiredEs_regexp_exec = 1;
+  	var $ = require_export();
+  	var exec = requireRegexpExec();
+
+  	// `RegExp.prototype.exec` method
+  	// https://tc39.es/ecma262/#sec-regexp.prototype.exec
+  	$({ target: 'RegExp', proto: true, forced: /./.exec !== exec }, {
+  	  exec: exec
+  	});
+  	return es_regexp_exec;
+  }
+
+  requireEs_regexp_exec();
+
+  var es_regexp_toString = {};
+
+  var regexpGetFlags;
+  var hasRequiredRegexpGetFlags;
+
+  function requireRegexpGetFlags () {
+  	if (hasRequiredRegexpGetFlags) return regexpGetFlags;
+  	hasRequiredRegexpGetFlags = 1;
+  	var call = requireFunctionCall();
+  	var hasOwn = requireHasOwnProperty();
+  	var isPrototypeOf = requireObjectIsPrototypeOf();
+  	var regExpFlags = requireRegexpFlags();
+
+  	var RegExpPrototype = RegExp.prototype;
+
+  	regexpGetFlags = function (R) {
+  	  var flags = R.flags;
+  	  return flags === undefined && !('flags' in RegExpPrototype) && !hasOwn(R, 'flags') && isPrototypeOf(RegExpPrototype, R)
+  	    ? call(regExpFlags, R) : flags;
+  	};
+  	return regexpGetFlags;
+  }
+
+  var hasRequiredEs_regexp_toString;
+
+  function requireEs_regexp_toString () {
+  	if (hasRequiredEs_regexp_toString) return es_regexp_toString;
+  	hasRequiredEs_regexp_toString = 1;
+  	var PROPER_FUNCTION_NAME = requireFunctionName().PROPER;
+  	var defineBuiltIn = requireDefineBuiltIn();
+  	var anObject = requireAnObject();
+  	var $toString = requireToString();
+  	var fails = requireFails();
+  	var getRegExpFlags = requireRegexpGetFlags();
+
+  	var TO_STRING = 'toString';
+  	var RegExpPrototype = RegExp.prototype;
+  	var nativeToString = RegExpPrototype[TO_STRING];
+
+  	var NOT_GENERIC = fails(function () { return nativeToString.call({ source: 'a', flags: 'b' }) !== '/a/b'; });
+  	// FF44- RegExp#toString has a wrong name
+  	var INCORRECT_NAME = PROPER_FUNCTION_NAME && nativeToString.name !== TO_STRING;
+
+  	// `RegExp.prototype.toString` method
+  	// https://tc39.es/ecma262/#sec-regexp.prototype.tostring
+  	if (NOT_GENERIC || INCORRECT_NAME) {
+  	  defineBuiltIn(RegExpPrototype, TO_STRING, function toString() {
+  	    var R = anObject(this);
+  	    var pattern = $toString(R.source);
+  	    var flags = $toString(getRegExpFlags(R));
+  	    return '/' + pattern + '/' + flags;
+  	  }, { unsafe: true });
+  	}
+  	return es_regexp_toString;
+  }
+
+  requireEs_regexp_toString();
+
+  var es_string_iterator = {};
+
+  var stringMultibyte;
+  var hasRequiredStringMultibyte;
+
+  function requireStringMultibyte () {
+  	if (hasRequiredStringMultibyte) return stringMultibyte;
+  	hasRequiredStringMultibyte = 1;
+  	var uncurryThis = requireFunctionUncurryThis();
+  	var toIntegerOrInfinity = requireToIntegerOrInfinity();
+  	var toString = requireToString();
+  	var requireObjectCoercible = requireRequireObjectCoercible();
+
+  	var charAt = uncurryThis(''.charAt);
+  	var charCodeAt = uncurryThis(''.charCodeAt);
+  	var stringSlice = uncurryThis(''.slice);
+
+  	var createMethod = function (CONVERT_TO_STRING) {
+  	  return function ($this, pos) {
+  	    var S = toString(requireObjectCoercible($this));
+  	    var position = toIntegerOrInfinity(pos);
+  	    var size = S.length;
+  	    var first, second;
+  	    if (position < 0 || position >= size) return CONVERT_TO_STRING ? '' : undefined;
+  	    first = charCodeAt(S, position);
+  	    return first < 0xD800 || first > 0xDBFF || position + 1 === size
+  	      || (second = charCodeAt(S, position + 1)) < 0xDC00 || second > 0xDFFF
+  	        ? CONVERT_TO_STRING
+  	          ? charAt(S, position)
+  	          : first
+  	        : CONVERT_TO_STRING
+  	          ? stringSlice(S, position, position + 2)
+  	          : (first - 0xD800 << 10) + (second - 0xDC00) + 0x10000;
+  	  };
+  	};
+
+  	stringMultibyte = {
+  	  // `String.prototype.codePointAt` method
+  	  // https://tc39.es/ecma262/#sec-string.prototype.codepointat
+  	  codeAt: createMethod(false),
+  	  // `String.prototype.at` method
+  	  // https://github.com/mathiasbynens/String.prototype.at
+  	  charAt: createMethod(true)
+  	};
+  	return stringMultibyte;
+  }
+
+  var hasRequiredEs_string_iterator;
+
+  function requireEs_string_iterator () {
+  	if (hasRequiredEs_string_iterator) return es_string_iterator;
+  	hasRequiredEs_string_iterator = 1;
+  	var charAt = requireStringMultibyte().charAt;
+  	var toString = requireToString();
+  	var InternalStateModule = requireInternalState();
+  	var defineIterator = requireIteratorDefine();
+  	var createIterResultObject = requireCreateIterResultObject();
+
+  	var STRING_ITERATOR = 'String Iterator';
+  	var setInternalState = InternalStateModule.set;
+  	var getInternalState = InternalStateModule.getterFor(STRING_ITERATOR);
+
+  	// `String.prototype[@@iterator]` method
+  	// https://tc39.es/ecma262/#sec-string.prototype-@@iterator
+  	defineIterator(String, 'String', function (iterated) {
+  	  setInternalState(this, {
+  	    type: STRING_ITERATOR,
+  	    string: toString(iterated),
+  	    index: 0
+  	  });
+  	// `%StringIteratorPrototype%.next` method
+  	// https://tc39.es/ecma262/#sec-%stringiteratorprototype%.next
+  	}, function next() {
+  	  var state = getInternalState(this);
+  	  var string = state.string;
+  	  var index = state.index;
+  	  var point;
+  	  if (index >= string.length) return createIterResultObject(undefined, true);
+  	  point = charAt(string, index);
+  	  state.index += point.length;
+  	  return createIterResultObject(point, false);
+  	});
+  	return es_string_iterator;
+  }
+
+  requireEs_string_iterator();
+
+  var es_string_search = {};
+
+  var fixRegexpWellKnownSymbolLogic;
+  var hasRequiredFixRegexpWellKnownSymbolLogic;
+
+  function requireFixRegexpWellKnownSymbolLogic () {
+  	if (hasRequiredFixRegexpWellKnownSymbolLogic) return fixRegexpWellKnownSymbolLogic;
+  	hasRequiredFixRegexpWellKnownSymbolLogic = 1;
+  	// TODO: Remove from `core-js@4` since it's moved to entry points
+  	requireEs_regexp_exec();
+  	var call = requireFunctionCall();
+  	var defineBuiltIn = requireDefineBuiltIn();
+  	var regexpExec = requireRegexpExec();
+  	var fails = requireFails();
+  	var wellKnownSymbol = requireWellKnownSymbol();
+  	var createNonEnumerableProperty = requireCreateNonEnumerableProperty();
+
+  	var SPECIES = wellKnownSymbol('species');
+  	var RegExpPrototype = RegExp.prototype;
+
+  	fixRegexpWellKnownSymbolLogic = function (KEY, exec, FORCED, SHAM) {
+  	  var SYMBOL = wellKnownSymbol(KEY);
+
+  	  var DELEGATES_TO_SYMBOL = !fails(function () {
+  	    // String methods call symbol-named RegExp methods
+  	    var O = {};
+  	    O[SYMBOL] = function () { return 7; };
+  	    return ''[KEY](O) !== 7;
+  	  });
+
+  	  var DELEGATES_TO_EXEC = DELEGATES_TO_SYMBOL && !fails(function () {
+  	    // Symbol-named RegExp methods call .exec
+  	    var execCalled = false;
+  	    var re = /a/;
+
+  	    if (KEY === 'split') {
+  	      // We can't use real regex here since it causes deoptimization
+  	      // and serious performance degradation in V8
+  	      // https://github.com/zloirock/core-js/issues/306
+  	      re = {};
+  	      // RegExp[@@split] doesn't call the regex's exec method, but first creates
+  	      // a new one. We need to return the patched regex when creating the new one.
+  	      re.constructor = {};
+  	      re.constructor[SPECIES] = function () { return re; };
+  	      re.flags = '';
+  	      re[SYMBOL] = /./[SYMBOL];
+  	    }
+
+  	    re.exec = function () {
+  	      execCalled = true;
+  	      return null;
+  	    };
+
+  	    re[SYMBOL]('');
+  	    return !execCalled;
+  	  });
+
+  	  if (
+  	    !DELEGATES_TO_SYMBOL ||
+  	    !DELEGATES_TO_EXEC ||
+  	    FORCED
+  	  ) {
+  	    var nativeRegExpMethod = /./[SYMBOL];
+  	    var methods = exec(SYMBOL, ''[KEY], function (nativeMethod, regexp, str, arg2, forceStringMethod) {
+  	      var $exec = regexp.exec;
+  	      if ($exec === regexpExec || $exec === RegExpPrototype.exec) {
+  	        if (DELEGATES_TO_SYMBOL && !forceStringMethod) {
+  	          // The native String method already delegates to @@method (this
+  	          // polyfilled function), leasing to infinite recursion.
+  	          // We avoid it by directly calling the native @@method method.
+  	          return { done: true, value: call(nativeRegExpMethod, regexp, str, arg2) };
+  	        }
+  	        return { done: true, value: call(nativeMethod, str, regexp, arg2) };
+  	      }
+  	      return { done: false };
+  	    });
+
+  	    defineBuiltIn(String.prototype, KEY, methods[0]);
+  	    defineBuiltIn(RegExpPrototype, SYMBOL, methods[1]);
+  	  }
+
+  	  if (SHAM) createNonEnumerableProperty(RegExpPrototype[SYMBOL], 'sham', true);
+  	};
+  	return fixRegexpWellKnownSymbolLogic;
+  }
+
+  var sameValue;
+  var hasRequiredSameValue;
+
+  function requireSameValue () {
+  	if (hasRequiredSameValue) return sameValue;
+  	hasRequiredSameValue = 1;
+  	// `SameValue` abstract operation
+  	// https://tc39.es/ecma262/#sec-samevalue
+  	// eslint-disable-next-line es/no-object-is -- safe
+  	sameValue = Object.is || function is(x, y) {
+  	  // eslint-disable-next-line no-self-compare -- NaN check
+  	  return x === y ? x !== 0 || 1 / x === 1 / y : x !== x && y !== y;
+  	};
+  	return sameValue;
+  }
+
+  var regexpExecAbstract;
+  var hasRequiredRegexpExecAbstract;
+
+  function requireRegexpExecAbstract () {
+  	if (hasRequiredRegexpExecAbstract) return regexpExecAbstract;
+  	hasRequiredRegexpExecAbstract = 1;
+  	var call = requireFunctionCall();
+  	var anObject = requireAnObject();
+  	var isCallable = requireIsCallable();
+  	var classof = requireClassofRaw();
+  	var regexpExec = requireRegexpExec();
+
+  	var $TypeError = TypeError;
+
+  	// `RegExpExec` abstract operation
+  	// https://tc39.es/ecma262/#sec-regexpexec
+  	regexpExecAbstract = function (R, S) {
+  	  var exec = R.exec;
+  	  if (isCallable(exec)) {
+  	    var result = call(exec, R, S);
+  	    if (result !== null) anObject(result);
+  	    return result;
+  	  }
+  	  if (classof(R) === 'RegExp') return call(regexpExec, R, S);
+  	  throw new $TypeError('RegExp#exec called on incompatible receiver');
+  	};
+  	return regexpExecAbstract;
+  }
+
+  var hasRequiredEs_string_search;
+
+  function requireEs_string_search () {
+  	if (hasRequiredEs_string_search) return es_string_search;
+  	hasRequiredEs_string_search = 1;
+  	var call = requireFunctionCall();
+  	var fixRegExpWellKnownSymbolLogic = requireFixRegexpWellKnownSymbolLogic();
+  	var anObject = requireAnObject();
+  	var isNullOrUndefined = requireIsNullOrUndefined();
+  	var requireObjectCoercible = requireRequireObjectCoercible();
+  	var sameValue = requireSameValue();
+  	var toString = requireToString();
+  	var getMethod = requireGetMethod();
+  	var regExpExec = requireRegexpExecAbstract();
+
+  	// @@search logic
+  	fixRegExpWellKnownSymbolLogic('search', function (SEARCH, nativeSearch, maybeCallNative) {
+  	  return [
+  	    // `String.prototype.search` method
+  	    // https://tc39.es/ecma262/#sec-string.prototype.search
+  	    function search(regexp) {
+  	      var O = requireObjectCoercible(this);
+  	      var searcher = isNullOrUndefined(regexp) ? undefined : getMethod(regexp, SEARCH);
+  	      return searcher ? call(searcher, regexp, O) : new RegExp(regexp)[SEARCH](toString(O));
+  	    },
+  	    // `RegExp.prototype[@@search]` method
+  	    // https://tc39.es/ecma262/#sec-regexp.prototype-@@search
+  	    function (string) {
+  	      var rx = anObject(this);
+  	      var S = toString(string);
+  	      var res = maybeCallNative(nativeSearch, rx, S);
+
+  	      if (res.done) return res.value;
+
+  	      var previousLastIndex = rx.lastIndex;
+  	      if (!sameValue(previousLastIndex, 0)) rx.lastIndex = 0;
+  	      var result = regExpExec(rx, S);
+  	      if (!sameValue(rx.lastIndex, previousLastIndex)) rx.lastIndex = previousLastIndex;
+  	      return result === null ? -1 : result.index;
+  	    }
+  	  ];
+  	});
+  	return es_string_search;
+  }
+
+  requireEs_string_search();
+
+  var web_domCollections_iterator = {};
+
+  var domIterables;
+  var hasRequiredDomIterables;
+
+  function requireDomIterables () {
+  	if (hasRequiredDomIterables) return domIterables;
+  	hasRequiredDomIterables = 1;
+  	// iterable DOM collections
+  	// flag - `iterable` interface - 'entries', 'keys', 'values', 'forEach' methods
+  	domIterables = {
+  	  CSSRuleList: 0,
+  	  CSSStyleDeclaration: 0,
+  	  CSSValueList: 0,
+  	  ClientRectList: 0,
+  	  DOMRectList: 0,
+  	  DOMStringList: 0,
+  	  DOMTokenList: 1,
+  	  DataTransferItemList: 0,
+  	  FileList: 0,
+  	  HTMLAllCollection: 0,
+  	  HTMLCollection: 0,
+  	  HTMLFormElement: 0,
+  	  HTMLSelectElement: 0,
+  	  MediaList: 0,
+  	  MimeTypeArray: 0,
+  	  NamedNodeMap: 0,
+  	  NodeList: 1,
+  	  PaintRequestList: 0,
+  	  Plugin: 0,
+  	  PluginArray: 0,
+  	  SVGLengthList: 0,
+  	  SVGNumberList: 0,
+  	  SVGPathSegList: 0,
+  	  SVGPointList: 0,
+  	  SVGStringList: 0,
+  	  SVGTransformList: 0,
+  	  SourceBufferList: 0,
+  	  StyleSheetList: 0,
+  	  TextTrackCueList: 0,
+  	  TextTrackList: 0,
+  	  TouchList: 0
+  	};
+  	return domIterables;
+  }
+
+  var domTokenListPrototype;
+  var hasRequiredDomTokenListPrototype;
+
+  function requireDomTokenListPrototype () {
+  	if (hasRequiredDomTokenListPrototype) return domTokenListPrototype;
+  	hasRequiredDomTokenListPrototype = 1;
+  	// in old WebKit versions, `element.classList` is not an instance of global `DOMTokenList`
+  	var documentCreateElement = requireDocumentCreateElement();
+
+  	var classList = documentCreateElement('span').classList;
+  	var DOMTokenListPrototype = classList && classList.constructor && classList.constructor.prototype;
+
+  	domTokenListPrototype = DOMTokenListPrototype === Object.prototype ? undefined : DOMTokenListPrototype;
+  	return domTokenListPrototype;
+  }
+
+  var hasRequiredWeb_domCollections_iterator;
+
+  function requireWeb_domCollections_iterator () {
+  	if (hasRequiredWeb_domCollections_iterator) return web_domCollections_iterator;
+  	hasRequiredWeb_domCollections_iterator = 1;
+  	var globalThis = requireGlobalThis();
+  	var DOMIterables = requireDomIterables();
+  	var DOMTokenListPrototype = requireDomTokenListPrototype();
+  	var ArrayIteratorMethods = requireEs_array_iterator();
+  	var createNonEnumerableProperty = requireCreateNonEnumerableProperty();
+  	var setToStringTag = requireSetToStringTag();
+  	var wellKnownSymbol = requireWellKnownSymbol();
+
+  	var ITERATOR = wellKnownSymbol('iterator');
+  	var ArrayValues = ArrayIteratorMethods.values;
+
+  	var handlePrototype = function (CollectionPrototype, COLLECTION_NAME) {
+  	  if (CollectionPrototype) {
+  	    // some Chrome versions have non-configurable methods on DOMTokenList
+  	    if (CollectionPrototype[ITERATOR] !== ArrayValues) try {
+  	      createNonEnumerableProperty(CollectionPrototype, ITERATOR, ArrayValues);
+  	    } catch (error) {
+  	      CollectionPrototype[ITERATOR] = ArrayValues;
+  	    }
+  	    setToStringTag(CollectionPrototype, COLLECTION_NAME, true);
+  	    if (DOMIterables[COLLECTION_NAME]) for (var METHOD_NAME in ArrayIteratorMethods) {
+  	      // some Chrome versions have non-configurable methods on DOMTokenList
+  	      if (CollectionPrototype[METHOD_NAME] !== ArrayIteratorMethods[METHOD_NAME]) try {
+  	        createNonEnumerableProperty(CollectionPrototype, METHOD_NAME, ArrayIteratorMethods[METHOD_NAME]);
+  	      } catch (error) {
+  	        CollectionPrototype[METHOD_NAME] = ArrayIteratorMethods[METHOD_NAME];
+  	      }
+  	    }
+  	  }
+  	};
+
+  	for (var COLLECTION_NAME in DOMIterables) {
+  	  handlePrototype(globalThis[COLLECTION_NAME] && globalThis[COLLECTION_NAME].prototype, COLLECTION_NAME);
+  	}
+
+  	handlePrototype(DOMTokenListPrototype, 'DOMTokenList');
+  	return web_domCollections_iterator;
+  }
+
+  requireWeb_domCollections_iterator();
+
+  var web_urlSearchParams = {};
+
+  var es_string_fromCodePoint = {};
+
+  var hasRequiredEs_string_fromCodePoint;
+
+  function requireEs_string_fromCodePoint () {
+  	if (hasRequiredEs_string_fromCodePoint) return es_string_fromCodePoint;
+  	hasRequiredEs_string_fromCodePoint = 1;
+  	var $ = require_export();
+  	var uncurryThis = requireFunctionUncurryThis();
+  	var toAbsoluteIndex = requireToAbsoluteIndex();
+
+  	var $RangeError = RangeError;
+  	var fromCharCode = String.fromCharCode;
+  	// eslint-disable-next-line es/no-string-fromcodepoint -- required for testing
+  	var $fromCodePoint = String.fromCodePoint;
+  	var join = uncurryThis([].join);
+
+  	// length should be 1, old FF problem
+  	var INCORRECT_LENGTH = !!$fromCodePoint && $fromCodePoint.length !== 1;
+
+  	// `String.fromCodePoint` method
+  	// https://tc39.es/ecma262/#sec-string.fromcodepoint
+  	$({ target: 'String', stat: true, arity: 1, forced: INCORRECT_LENGTH }, {
+  	  // eslint-disable-next-line no-unused-vars -- required for `.length`
+  	  fromCodePoint: function fromCodePoint(x) {
+  	    var elements = [];
+  	    var length = arguments.length;
+  	    var i = 0;
+  	    var code;
+  	    while (length > i) {
+  	      code = +arguments[i++];
+  	      if (toAbsoluteIndex(code, 0x10FFFF) !== code) throw new $RangeError(code + ' is not a valid code point');
+  	      elements[i] = code < 0x10000
+  	        ? fromCharCode(code)
+  	        : fromCharCode(((code -= 0x10000) >> 10) + 0xD800, code % 0x400 + 0xDC00);
+  	    } return join(elements, '');
+  	  }
+  	});
+  	return es_string_fromCodePoint;
+  }
+
+  var safeGetBuiltIn;
+  var hasRequiredSafeGetBuiltIn;
+
+  function requireSafeGetBuiltIn () {
+  	if (hasRequiredSafeGetBuiltIn) return safeGetBuiltIn;
+  	hasRequiredSafeGetBuiltIn = 1;
+  	var globalThis = requireGlobalThis();
+  	var DESCRIPTORS = requireDescriptors();
+
+  	// eslint-disable-next-line es/no-object-getownpropertydescriptor -- safe
+  	var getOwnPropertyDescriptor = Object.getOwnPropertyDescriptor;
+
+  	// Avoid NodeJS experimental warning
+  	safeGetBuiltIn = function (name) {
+  	  if (!DESCRIPTORS) return globalThis[name];
+  	  var descriptor = getOwnPropertyDescriptor(globalThis, name);
+  	  return descriptor && descriptor.value;
+  	};
+  	return safeGetBuiltIn;
+  }
+
+  var urlConstructorDetection;
+  var hasRequiredUrlConstructorDetection;
+
+  function requireUrlConstructorDetection () {
+  	if (hasRequiredUrlConstructorDetection) return urlConstructorDetection;
+  	hasRequiredUrlConstructorDetection = 1;
+  	var fails = requireFails();
+  	var wellKnownSymbol = requireWellKnownSymbol();
+  	var DESCRIPTORS = requireDescriptors();
+  	var IS_PURE = requireIsPure();
+
+  	var ITERATOR = wellKnownSymbol('iterator');
+
+  	urlConstructorDetection = !fails(function () {
+  	  // eslint-disable-next-line unicorn/relative-url-style -- required for testing
+  	  var url = new URL('b?a=1&b=2&c=3', 'https://a');
+  	  var params = url.searchParams;
+  	  var params2 = new URLSearchParams('a=1&a=2&b=3');
+  	  var result = '';
+  	  url.pathname = 'c%20d';
+  	  params.forEach(function (value, key) {
+  	    params['delete']('b');
+  	    result += key + value;
+  	  });
+  	  params2['delete']('a', 2);
+  	  // `undefined` case is a Chromium 117 bug
+  	  // https://bugs.chromium.org/p/v8/issues/detail?id=14222
+  	  params2['delete']('b', undefined);
+  	  return (IS_PURE && (!url.toJSON || !params2.has('a', 1) || params2.has('a', 2) || !params2.has('a', undefined) || params2.has('b')))
+  	    || (!params.size && (IS_PURE || !DESCRIPTORS))
+  	    || !params.sort
+  	    || url.href !== 'https://a/c%20d?a=1&c=3'
+  	    || params.get('c') !== '3'
+  	    || String(new URLSearchParams('?a=1')) !== 'a=1'
+  	    || !params[ITERATOR]
+  	    // throws in Edge
+  	    || new URL('https://a@b').username !== 'a'
+  	    || new URLSearchParams(new URLSearchParams('a=b')).get('a') !== 'b'
+  	    // not punycoded in Edge
+  	    || new URL('https://тест').host !== 'xn--e1aybc'
+  	    // not escaped in Chrome 62-
+  	    || new URL('https://a#б').hash !== '#%D0%B1'
+  	    // fails in Chrome 66-
+  	    || result !== 'a1c3'
+  	    // throws in Safari
+  	    || new URL('https://x', undefined).host !== 'x';
+  	});
+  	return urlConstructorDetection;
+  }
+
+  var defineBuiltInAccessor;
+  var hasRequiredDefineBuiltInAccessor;
+
+  function requireDefineBuiltInAccessor () {
+  	if (hasRequiredDefineBuiltInAccessor) return defineBuiltInAccessor;
+  	hasRequiredDefineBuiltInAccessor = 1;
+  	var makeBuiltIn = requireMakeBuiltIn();
+  	var defineProperty = requireObjectDefineProperty();
+
+  	defineBuiltInAccessor = function (target, name, descriptor) {
+  	  if (descriptor.get) makeBuiltIn(descriptor.get, name, { getter: true });
+  	  if (descriptor.set) makeBuiltIn(descriptor.set, name, { setter: true });
+  	  return defineProperty.f(target, name, descriptor);
+  	};
+  	return defineBuiltInAccessor;
+  }
+
+  var defineBuiltIns;
+  var hasRequiredDefineBuiltIns;
+
+  function requireDefineBuiltIns () {
+  	if (hasRequiredDefineBuiltIns) return defineBuiltIns;
+  	hasRequiredDefineBuiltIns = 1;
+  	var defineBuiltIn = requireDefineBuiltIn();
+
+  	defineBuiltIns = function (target, src, options) {
+  	  for (var key in src) defineBuiltIn(target, key, src[key], options);
+  	  return target;
+  	};
+  	return defineBuiltIns;
+  }
+
+  var anInstance;
+  var hasRequiredAnInstance;
+
+  function requireAnInstance () {
+  	if (hasRequiredAnInstance) return anInstance;
+  	hasRequiredAnInstance = 1;
+  	var isPrototypeOf = requireObjectIsPrototypeOf();
+
+  	var $TypeError = TypeError;
+
+  	anInstance = function (it, Prototype) {
+  	  if (isPrototypeOf(Prototype, it)) return it;
+  	  throw new $TypeError('Incorrect invocation');
+  	};
+  	return anInstance;
+  }
+
+  var functionUncurryThisClause;
+  var hasRequiredFunctionUncurryThisClause;
+
+  function requireFunctionUncurryThisClause () {
+  	if (hasRequiredFunctionUncurryThisClause) return functionUncurryThisClause;
+  	hasRequiredFunctionUncurryThisClause = 1;
+  	var classofRaw = requireClassofRaw();
+  	var uncurryThis = requireFunctionUncurryThis();
+
+  	functionUncurryThisClause = function (fn) {
+  	  // Nashorn bug:
+  	  //   https://github.com/zloirock/core-js/issues/1128
+  	  //   https://github.com/zloirock/core-js/issues/1130
+  	  if (classofRaw(fn) === 'Function') return uncurryThis(fn);
+  	};
+  	return functionUncurryThisClause;
+  }
+
+  var functionBindContext;
+  var hasRequiredFunctionBindContext;
+
+  function requireFunctionBindContext () {
+  	if (hasRequiredFunctionBindContext) return functionBindContext;
+  	hasRequiredFunctionBindContext = 1;
+  	var uncurryThis = requireFunctionUncurryThisClause();
+  	var aCallable = requireACallable();
+  	var NATIVE_BIND = requireFunctionBindNative();
+
+  	var bind = uncurryThis(uncurryThis.bind);
+
+  	// optional / simple context binding
+  	functionBindContext = function (fn, that) {
+  	  aCallable(fn);
+  	  return that === undefined ? fn : NATIVE_BIND ? bind(fn, that) : function (/* ...args */) {
+  	    return fn.apply(that, arguments);
+  	  };
+  	};
+  	return functionBindContext;
+  }
+
+  var getIteratorMethod;
+  var hasRequiredGetIteratorMethod;
+
+  function requireGetIteratorMethod () {
+  	if (hasRequiredGetIteratorMethod) return getIteratorMethod;
+  	hasRequiredGetIteratorMethod = 1;
+  	var classof = requireClassof();
+  	var getMethod = requireGetMethod();
+  	var isNullOrUndefined = requireIsNullOrUndefined();
+  	var Iterators = requireIterators();
+  	var wellKnownSymbol = requireWellKnownSymbol();
+
+  	var ITERATOR = wellKnownSymbol('iterator');
+
+  	getIteratorMethod = function (it) {
+  	  if (!isNullOrUndefined(it)) return getMethod(it, ITERATOR)
+  	    || getMethod(it, '@@iterator')
+  	    || Iterators[classof(it)];
+  	};
+  	return getIteratorMethod;
+  }
+
+  var getIterator;
+  var hasRequiredGetIterator;
+
+  function requireGetIterator () {
+  	if (hasRequiredGetIterator) return getIterator;
+  	hasRequiredGetIterator = 1;
+  	var call = requireFunctionCall();
+  	var aCallable = requireACallable();
+  	var anObject = requireAnObject();
+  	var tryToString = requireTryToString();
+  	var getIteratorMethod = requireGetIteratorMethod();
+
+  	var $TypeError = TypeError;
+
+  	getIterator = function (argument, usingIterator) {
+  	  var iteratorMethod = arguments.length < 2 ? getIteratorMethod(argument) : usingIterator;
+  	  if (aCallable(iteratorMethod)) return anObject(call(iteratorMethod, argument));
+  	  throw new $TypeError(tryToString(argument) + ' is not iterable');
+  	};
+  	return getIterator;
+  }
+
+  var validateArgumentsLength;
+  var hasRequiredValidateArgumentsLength;
+
+  function requireValidateArgumentsLength () {
+  	if (hasRequiredValidateArgumentsLength) return validateArgumentsLength;
+  	hasRequiredValidateArgumentsLength = 1;
+  	var $TypeError = TypeError;
+
+  	validateArgumentsLength = function (passed, required) {
+  	  if (passed < required) throw new $TypeError('Not enough arguments');
+  	  return passed;
+  	};
+  	return validateArgumentsLength;
+  }
+
+  var arraySlice;
+  var hasRequiredArraySlice;
+
+  function requireArraySlice () {
+  	if (hasRequiredArraySlice) return arraySlice;
+  	hasRequiredArraySlice = 1;
+  	var uncurryThis = requireFunctionUncurryThis();
+
+  	arraySlice = uncurryThis([].slice);
+  	return arraySlice;
+  }
+
+  var arraySort;
+  var hasRequiredArraySort;
+
+  function requireArraySort () {
+  	if (hasRequiredArraySort) return arraySort;
+  	hasRequiredArraySort = 1;
+  	var arraySlice = requireArraySlice();
+
+  	var floor = Math.floor;
+
+  	var sort = function (array, comparefn) {
+  	  var length = array.length;
+
+  	  if (length < 8) {
+  	    // insertion sort
+  	    var i = 1;
+  	    var element, j;
+
+  	    while (i < length) {
+  	      j = i;
+  	      element = array[i];
+  	      while (j && comparefn(array[j - 1], element) > 0) {
+  	        array[j] = array[--j];
+  	      }
+  	      if (j !== i++) array[j] = element;
+  	    }
+  	  } else {
+  	    // merge sort
+  	    var middle = floor(length / 2);
+  	    var left = sort(arraySlice(array, 0, middle), comparefn);
+  	    var right = sort(arraySlice(array, middle), comparefn);
+  	    var llength = left.length;
+  	    var rlength = right.length;
+  	    var lindex = 0;
+  	    var rindex = 0;
+
+  	    while (lindex < llength || rindex < rlength) {
+  	      array[lindex + rindex] = (lindex < llength && rindex < rlength)
+  	        ? comparefn(left[lindex], right[rindex]) <= 0 ? left[lindex++] : right[rindex++]
+  	        : lindex < llength ? left[lindex++] : right[rindex++];
+  	    }
+  	  }
+
+  	  return array;
+  	};
+
+  	arraySort = sort;
+  	return arraySort;
+  }
+
+  var web_urlSearchParams_constructor;
+  var hasRequiredWeb_urlSearchParams_constructor;
+
+  function requireWeb_urlSearchParams_constructor () {
+  	if (hasRequiredWeb_urlSearchParams_constructor) return web_urlSearchParams_constructor;
+  	hasRequiredWeb_urlSearchParams_constructor = 1;
+  	// TODO: in core-js@4, move /modules/ dependencies to public entries for better optimization by tools like `preset-env`
+  	requireEs_array_iterator();
+  	requireEs_string_fromCodePoint();
+  	var $ = require_export();
+  	var globalThis = requireGlobalThis();
+  	var safeGetBuiltIn = requireSafeGetBuiltIn();
+  	var getBuiltIn = requireGetBuiltIn();
+  	var call = requireFunctionCall();
+  	var uncurryThis = requireFunctionUncurryThis();
+  	var DESCRIPTORS = requireDescriptors();
+  	var USE_NATIVE_URL = requireUrlConstructorDetection();
+  	var defineBuiltIn = requireDefineBuiltIn();
+  	var defineBuiltInAccessor = requireDefineBuiltInAccessor();
+  	var defineBuiltIns = requireDefineBuiltIns();
+  	var setToStringTag = requireSetToStringTag();
+  	var createIteratorConstructor = requireIteratorCreateConstructor();
+  	var InternalStateModule = requireInternalState();
+  	var anInstance = requireAnInstance();
+  	var isCallable = requireIsCallable();
+  	var hasOwn = requireHasOwnProperty();
+  	var bind = requireFunctionBindContext();
+  	var classof = requireClassof();
+  	var anObject = requireAnObject();
+  	var isObject = requireIsObject();
+  	var $toString = requireToString();
+  	var create = requireObjectCreate();
+  	var createPropertyDescriptor = requireCreatePropertyDescriptor();
+  	var getIterator = requireGetIterator();
+  	var getIteratorMethod = requireGetIteratorMethod();
+  	var createIterResultObject = requireCreateIterResultObject();
+  	var validateArgumentsLength = requireValidateArgumentsLength();
+  	var wellKnownSymbol = requireWellKnownSymbol();
+  	var arraySort = requireArraySort();
+
+  	var ITERATOR = wellKnownSymbol('iterator');
+  	var URL_SEARCH_PARAMS = 'URLSearchParams';
+  	var URL_SEARCH_PARAMS_ITERATOR = URL_SEARCH_PARAMS + 'Iterator';
+  	var setInternalState = InternalStateModule.set;
+  	var getInternalParamsState = InternalStateModule.getterFor(URL_SEARCH_PARAMS);
+  	var getInternalIteratorState = InternalStateModule.getterFor(URL_SEARCH_PARAMS_ITERATOR);
+
+  	var nativeFetch = safeGetBuiltIn('fetch');
+  	var NativeRequest = safeGetBuiltIn('Request');
+  	var Headers = safeGetBuiltIn('Headers');
+  	var RequestPrototype = NativeRequest && NativeRequest.prototype;
+  	var HeadersPrototype = Headers && Headers.prototype;
+  	var TypeError = globalThis.TypeError;
+  	var encodeURIComponent = globalThis.encodeURIComponent;
+  	var fromCharCode = String.fromCharCode;
+  	var fromCodePoint = getBuiltIn('String', 'fromCodePoint');
+  	var $parseInt = parseInt;
+  	var charAt = uncurryThis(''.charAt);
+  	var join = uncurryThis([].join);
+  	var push = uncurryThis([].push);
+  	var replace = uncurryThis(''.replace);
+  	var shift = uncurryThis([].shift);
+  	var splice = uncurryThis([].splice);
+  	var split = uncurryThis(''.split);
+  	var stringSlice = uncurryThis(''.slice);
+  	var exec = uncurryThis(/./.exec);
+
+  	var plus = /\+/g;
+  	var FALLBACK_REPLACER = '\uFFFD';
+  	var VALID_HEX = /^[0-9a-f]+$/i;
+
+  	var parseHexOctet = function (string, start) {
+  	  var substr = stringSlice(string, start, start + 2);
+  	  if (!exec(VALID_HEX, substr)) return NaN;
+
+  	  return $parseInt(substr, 16);
+  	};
+
+  	var getLeadingOnes = function (octet) {
+  	  var count = 0;
+  	  for (var mask = 0x80; mask > 0 && (octet & mask) !== 0; mask >>= 1) {
+  	    count++;
+  	  }
+  	  return count;
+  	};
+
+  	var utf8Decode = function (octets) {
+  	  var codePoint = null;
+
+  	  switch (octets.length) {
+  	    case 1:
+  	      codePoint = octets[0];
+  	      break;
+  	    case 2:
+  	      codePoint = (octets[0] & 0x1F) << 6 | (octets[1] & 0x3F);
+  	      break;
+  	    case 3:
+  	      codePoint = (octets[0] & 0x0F) << 12 | (octets[1] & 0x3F) << 6 | (octets[2] & 0x3F);
+  	      break;
+  	    case 4:
+  	      codePoint = (octets[0] & 0x07) << 18 | (octets[1] & 0x3F) << 12 | (octets[2] & 0x3F) << 6 | (octets[3] & 0x3F);
+  	      break;
+  	  }
+
+  	  return codePoint > 0x10FFFF ? null : codePoint;
+  	};
+
+  	var decode = function (input) {
+  	  input = replace(input, plus, ' ');
+  	  var length = input.length;
+  	  var result = '';
+  	  var i = 0;
+
+  	  while (i < length) {
+  	    var decodedChar = charAt(input, i);
+
+  	    if (decodedChar === '%') {
+  	      if (charAt(input, i + 1) === '%' || i + 3 > length) {
+  	        result += '%';
+  	        i++;
+  	        continue;
+  	      }
+
+  	      var octet = parseHexOctet(input, i + 1);
+
+  	      // eslint-disable-next-line no-self-compare -- NaN check
+  	      if (octet !== octet) {
+  	        result += decodedChar;
+  	        i++;
+  	        continue;
+  	      }
+
+  	      i += 2;
+  	      var byteSequenceLength = getLeadingOnes(octet);
+
+  	      if (byteSequenceLength === 0) {
+  	        decodedChar = fromCharCode(octet);
+  	      } else {
+  	        if (byteSequenceLength === 1 || byteSequenceLength > 4) {
+  	          result += FALLBACK_REPLACER;
+  	          i++;
+  	          continue;
+  	        }
+
+  	        var octets = [octet];
+  	        var sequenceIndex = 1;
+
+  	        while (sequenceIndex < byteSequenceLength) {
+  	          i++;
+  	          if (i + 3 > length || charAt(input, i) !== '%') break;
+
+  	          var nextByte = parseHexOctet(input, i + 1);
+
+  	          // eslint-disable-next-line no-self-compare -- NaN check
+  	          if (nextByte !== nextByte) {
+  	            i += 3;
+  	            break;
+  	          }
+  	          if (nextByte > 191 || nextByte < 128) break;
+
+  	          push(octets, nextByte);
+  	          i += 2;
+  	          sequenceIndex++;
+  	        }
+
+  	        if (octets.length !== byteSequenceLength) {
+  	          result += FALLBACK_REPLACER;
+  	          continue;
+  	        }
+
+  	        var codePoint = utf8Decode(octets);
+  	        if (codePoint === null) {
+  	          result += FALLBACK_REPLACER;
+  	        } else {
+  	          decodedChar = fromCodePoint(codePoint);
+  	        }
+  	      }
+  	    }
+
+  	    result += decodedChar;
+  	    i++;
+  	  }
+
+  	  return result;
+  	};
+
+  	var find = /[!'()~]|%20/g;
+
+  	var replacements = {
+  	  '!': '%21',
+  	  "'": '%27',
+  	  '(': '%28',
+  	  ')': '%29',
+  	  '~': '%7E',
+  	  '%20': '+'
+  	};
+
+  	var replacer = function (match) {
+  	  return replacements[match];
+  	};
+
+  	var serialize = function (it) {
+  	  return replace(encodeURIComponent(it), find, replacer);
+  	};
+
+  	var URLSearchParamsIterator = createIteratorConstructor(function Iterator(params, kind) {
+  	  setInternalState(this, {
+  	    type: URL_SEARCH_PARAMS_ITERATOR,
+  	    target: getInternalParamsState(params).entries,
+  	    index: 0,
+  	    kind: kind
+  	  });
+  	}, URL_SEARCH_PARAMS, function next() {
+  	  var state = getInternalIteratorState(this);
+  	  var target = state.target;
+  	  var index = state.index++;
+  	  if (!target || index >= target.length) {
+  	    state.target = null;
+  	    return createIterResultObject(undefined, true);
+  	  }
+  	  var entry = target[index];
+  	  switch (state.kind) {
+  	    case 'keys': return createIterResultObject(entry.key, false);
+  	    case 'values': return createIterResultObject(entry.value, false);
+  	  } return createIterResultObject([entry.key, entry.value], false);
+  	}, true);
+
+  	var URLSearchParamsState = function (init) {
+  	  this.entries = [];
+  	  this.url = null;
+
+  	  if (init !== undefined) {
+  	    if (isObject(init)) this.parseObject(init);
+  	    else this.parseQuery(typeof init == 'string' ? charAt(init, 0) === '?' ? stringSlice(init, 1) : init : $toString(init));
+  	  }
+  	};
+
+  	URLSearchParamsState.prototype = {
+  	  type: URL_SEARCH_PARAMS,
+  	  bindURL: function (url) {
+  	    this.url = url;
+  	    this.update();
+  	  },
+  	  parseObject: function (object) {
+  	    var entries = this.entries;
+  	    var iteratorMethod = getIteratorMethod(object);
+  	    var iterator, next, step, entryIterator, entryNext, first, second;
+
+  	    if (iteratorMethod) {
+  	      iterator = getIterator(object, iteratorMethod);
+  	      next = iterator.next;
+  	      while (!(step = call(next, iterator)).done) {
+  	        entryIterator = getIterator(anObject(step.value));
+  	        entryNext = entryIterator.next;
+  	        if (
+  	          (first = call(entryNext, entryIterator)).done ||
+  	          (second = call(entryNext, entryIterator)).done ||
+  	          !call(entryNext, entryIterator).done
+  	        ) throw new TypeError('Expected sequence with length 2');
+  	        push(entries, { key: $toString(first.value), value: $toString(second.value) });
+  	      }
+  	    } else for (var key in object) if (hasOwn(object, key)) {
+  	      push(entries, { key: key, value: $toString(object[key]) });
+  	    }
+  	  },
+  	  parseQuery: function (query) {
+  	    if (query) {
+  	      var entries = this.entries;
+  	      var attributes = split(query, '&');
+  	      var index = 0;
+  	      var attribute, entry;
+  	      while (index < attributes.length) {
+  	        attribute = attributes[index++];
+  	        if (attribute.length) {
+  	          entry = split(attribute, '=');
+  	          push(entries, {
+  	            key: decode(shift(entry)),
+  	            value: decode(join(entry, '='))
+  	          });
+  	        }
+  	      }
+  	    }
+  	  },
+  	  serialize: function () {
+  	    var entries = this.entries;
+  	    var result = [];
+  	    var index = 0;
+  	    var entry;
+  	    while (index < entries.length) {
+  	      entry = entries[index++];
+  	      push(result, serialize(entry.key) + '=' + serialize(entry.value));
+  	    } return join(result, '&');
+  	  },
+  	  update: function () {
+  	    this.entries.length = 0;
+  	    this.parseQuery(this.url.query);
+  	  },
+  	  updateURL: function () {
+  	    if (this.url) this.url.update();
+  	  }
+  	};
+
+  	// `URLSearchParams` constructor
+  	// https://url.spec.whatwg.org/#interface-urlsearchparams
+  	var URLSearchParamsConstructor = function URLSearchParams(/* init */) {
+  	  anInstance(this, URLSearchParamsPrototype);
+  	  var init = arguments.length > 0 ? arguments[0] : undefined;
+  	  var state = setInternalState(this, new URLSearchParamsState(init));
+  	  if (!DESCRIPTORS) this.size = state.entries.length;
+  	};
+
+  	var URLSearchParamsPrototype = URLSearchParamsConstructor.prototype;
+
+  	defineBuiltIns(URLSearchParamsPrototype, {
+  	  // `URLSearchParams.prototype.append` method
+  	  // https://url.spec.whatwg.org/#dom-urlsearchparams-append
+  	  append: function append(name, value) {
+  	    var state = getInternalParamsState(this);
+  	    validateArgumentsLength(arguments.length, 2);
+  	    push(state.entries, { key: $toString(name), value: $toString(value) });
+  	    if (!DESCRIPTORS) this.length++;
+  	    state.updateURL();
+  	  },
+  	  // `URLSearchParams.prototype.delete` method
+  	  // https://url.spec.whatwg.org/#dom-urlsearchparams-delete
+  	  'delete': function (name /* , value */) {
+  	    var state = getInternalParamsState(this);
+  	    var length = validateArgumentsLength(arguments.length, 1);
+  	    var entries = state.entries;
+  	    var key = $toString(name);
+  	    var $value = length < 2 ? undefined : arguments[1];
+  	    var value = $value === undefined ? $value : $toString($value);
+  	    var index = 0;
+  	    while (index < entries.length) {
+  	      var entry = entries[index];
+  	      if (entry.key === key && (value === undefined || entry.value === value)) {
+  	        splice(entries, index, 1);
+  	        if (value !== undefined) break;
+  	      } else index++;
+  	    }
+  	    if (!DESCRIPTORS) this.size = entries.length;
+  	    state.updateURL();
+  	  },
+  	  // `URLSearchParams.prototype.get` method
+  	  // https://url.spec.whatwg.org/#dom-urlsearchparams-get
+  	  get: function get(name) {
+  	    var entries = getInternalParamsState(this).entries;
+  	    validateArgumentsLength(arguments.length, 1);
+  	    var key = $toString(name);
+  	    var index = 0;
+  	    for (; index < entries.length; index++) {
+  	      if (entries[index].key === key) return entries[index].value;
+  	    }
+  	    return null;
+  	  },
+  	  // `URLSearchParams.prototype.getAll` method
+  	  // https://url.spec.whatwg.org/#dom-urlsearchparams-getall
+  	  getAll: function getAll(name) {
+  	    var entries = getInternalParamsState(this).entries;
+  	    validateArgumentsLength(arguments.length, 1);
+  	    var key = $toString(name);
+  	    var result = [];
+  	    var index = 0;
+  	    for (; index < entries.length; index++) {
+  	      if (entries[index].key === key) push(result, entries[index].value);
+  	    }
+  	    return result;
+  	  },
+  	  // `URLSearchParams.prototype.has` method
+  	  // https://url.spec.whatwg.org/#dom-urlsearchparams-has
+  	  has: function has(name /* , value */) {
+  	    var entries = getInternalParamsState(this).entries;
+  	    var length = validateArgumentsLength(arguments.length, 1);
+  	    var key = $toString(name);
+  	    var $value = length < 2 ? undefined : arguments[1];
+  	    var value = $value === undefined ? $value : $toString($value);
+  	    var index = 0;
+  	    while (index < entries.length) {
+  	      var entry = entries[index++];
+  	      if (entry.key === key && (value === undefined || entry.value === value)) return true;
+  	    }
+  	    return false;
+  	  },
+  	  // `URLSearchParams.prototype.set` method
+  	  // https://url.spec.whatwg.org/#dom-urlsearchparams-set
+  	  set: function set(name, value) {
+  	    var state = getInternalParamsState(this);
+  	    validateArgumentsLength(arguments.length, 1);
+  	    var entries = state.entries;
+  	    var found = false;
+  	    var key = $toString(name);
+  	    var val = $toString(value);
+  	    var index = 0;
+  	    var entry;
+  	    for (; index < entries.length; index++) {
+  	      entry = entries[index];
+  	      if (entry.key === key) {
+  	        if (found) splice(entries, index--, 1);
+  	        else {
+  	          found = true;
+  	          entry.value = val;
+  	        }
+  	      }
+  	    }
+  	    if (!found) push(entries, { key: key, value: val });
+  	    if (!DESCRIPTORS) this.size = entries.length;
+  	    state.updateURL();
+  	  },
+  	  // `URLSearchParams.prototype.sort` method
+  	  // https://url.spec.whatwg.org/#dom-urlsearchparams-sort
+  	  sort: function sort() {
+  	    var state = getInternalParamsState(this);
+  	    arraySort(state.entries, function (a, b) {
+  	      return a.key > b.key ? 1 : -1;
+  	    });
+  	    state.updateURL();
+  	  },
+  	  // `URLSearchParams.prototype.forEach` method
+  	  forEach: function forEach(callback /* , thisArg */) {
+  	    var entries = getInternalParamsState(this).entries;
+  	    var boundFunction = bind(callback, arguments.length > 1 ? arguments[1] : undefined);
+  	    var index = 0;
+  	    var entry;
+  	    while (index < entries.length) {
+  	      entry = entries[index++];
+  	      boundFunction(entry.value, entry.key, this);
+  	    }
+  	  },
+  	  // `URLSearchParams.prototype.keys` method
+  	  keys: function keys() {
+  	    return new URLSearchParamsIterator(this, 'keys');
+  	  },
+  	  // `URLSearchParams.prototype.values` method
+  	  values: function values() {
+  	    return new URLSearchParamsIterator(this, 'values');
+  	  },
+  	  // `URLSearchParams.prototype.entries` method
+  	  entries: function entries() {
+  	    return new URLSearchParamsIterator(this, 'entries');
+  	  }
+  	}, { enumerable: true });
+
+  	// `URLSearchParams.prototype[@@iterator]` method
+  	defineBuiltIn(URLSearchParamsPrototype, ITERATOR, URLSearchParamsPrototype.entries, { name: 'entries' });
+
+  	// `URLSearchParams.prototype.toString` method
+  	// https://url.spec.whatwg.org/#urlsearchparams-stringification-behavior
+  	defineBuiltIn(URLSearchParamsPrototype, 'toString', function toString() {
+  	  return getInternalParamsState(this).serialize();
+  	}, { enumerable: true });
+
+  	// `URLSearchParams.prototype.size` getter
+  	// https://github.com/whatwg/url/pull/734
+  	if (DESCRIPTORS) defineBuiltInAccessor(URLSearchParamsPrototype, 'size', {
+  	  get: function size() {
+  	    return getInternalParamsState(this).entries.length;
+  	  },
+  	  configurable: true,
+  	  enumerable: true
+  	});
+
+  	setToStringTag(URLSearchParamsConstructor, URL_SEARCH_PARAMS);
+
+  	$({ global: true, constructor: true, forced: !USE_NATIVE_URL }, {
+  	  URLSearchParams: URLSearchParamsConstructor
+  	});
+
+  	// Wrap `fetch` and `Request` for correct work with polyfilled `URLSearchParams`
+  	if (!USE_NATIVE_URL && isCallable(Headers)) {
+  	  var headersHas = uncurryThis(HeadersPrototype.has);
+  	  var headersSet = uncurryThis(HeadersPrototype.set);
+
+  	  var wrapRequestOptions = function (init) {
+  	    if (isObject(init)) {
+  	      var body = init.body;
+  	      var headers;
+  	      if (classof(body) === URL_SEARCH_PARAMS) {
+  	        headers = init.headers ? new Headers(init.headers) : new Headers();
+  	        if (!headersHas(headers, 'content-type')) {
+  	          headersSet(headers, 'content-type', 'application/x-www-form-urlencoded;charset=UTF-8');
+  	        }
+  	        return create(init, {
+  	          body: createPropertyDescriptor(0, $toString(body)),
+  	          headers: createPropertyDescriptor(0, headers)
+  	        });
+  	      }
+  	    } return init;
+  	  };
+
+  	  if (isCallable(nativeFetch)) {
+  	    $({ global: true, enumerable: true, dontCallGetSet: true, forced: true }, {
+  	      fetch: function fetch(input /* , init */) {
+  	        return nativeFetch(input, arguments.length > 1 ? wrapRequestOptions(arguments[1]) : {});
+  	      }
+  	    });
+  	  }
+
+  	  if (isCallable(NativeRequest)) {
+  	    var RequestConstructor = function Request(input /* , init */) {
+  	      anInstance(this, RequestPrototype);
+  	      return new NativeRequest(input, arguments.length > 1 ? wrapRequestOptions(arguments[1]) : {});
+  	    };
+
+  	    RequestPrototype.constructor = RequestConstructor;
+  	    RequestConstructor.prototype = RequestPrototype;
+
+  	    $({ global: true, constructor: true, dontCallGetSet: true, forced: true }, {
+  	      Request: RequestConstructor
+  	    });
+  	  }
+  	}
+
+  	web_urlSearchParams_constructor = {
+  	  URLSearchParams: URLSearchParamsConstructor,
+  	  getState: getInternalParamsState
+  	};
+  	return web_urlSearchParams_constructor;
+  }
+
+  var hasRequiredWeb_urlSearchParams;
+
+  function requireWeb_urlSearchParams () {
+  	if (hasRequiredWeb_urlSearchParams) return web_urlSearchParams;
+  	hasRequiredWeb_urlSearchParams = 1;
+  	// TODO: Remove this module from `core-js@4` since it's replaced to module below
+  	requireWeb_urlSearchParams_constructor();
+  	return web_urlSearchParams;
+  }
+
+  requireWeb_urlSearchParams();
+
   /**
    * @author: general
    * @website: note.generals.space
@@ -22160,11 +29012,13 @@
    * @update: zhixin wen <wenzhixin2010@gmail.com>
    */
 
-  Object.assign($$6.fn.bootstrapTable.defaults, {
+  var Utils = $.fn.bootstrapTable.utils;
+  Object.assign($.fn.bootstrapTable.defaults, {
     addrbar: false,
-    addrPrefix: ''
+    addrPrefix: '',
+    addrCustomParams: {}
   });
-  $$6.BootstrapTable = /*#__PURE__*/function (_$$BootstrapTable) {
+  $.BootstrapTable = /*#__PURE__*/function (_$$BootstrapTable) {
     function _class() {
       _classCallCheck(this, _class);
       return _callSuper(this, _class, arguments);
@@ -22173,14 +29027,13 @@
     return _createClass(_class, [{
       key: "init",
       value: function init() {
-        var _get2;
         if (this.options.pagination && this.options.addrbar) {
           this.initAddrbar();
         }
         for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
           args[_key] = arguments[_key];
         }
-        (_get2 = _get(_getPrototypeOf(_class.prototype), "init", this)).call.apply(_get2, [this].concat(args));
+        _superPropGet(_class, "init", this)(args);
       }
 
       /*
@@ -22192,10 +29045,10 @@
     }, {
       key: "getDefaultOptionValue",
       value: function getDefaultOptionValue(optionName, prefixName) {
-        if (this.options[optionName] !== $$6.BootstrapTable.DEFAULTS[optionName]) {
+        if (this.options[optionName] !== $.BootstrapTable.DEFAULTS[optionName]) {
           return this.options[optionName];
         }
-        return this.searchParams.get("".concat(this.options.addrPrefix || '').concat(prefixName)) || $$6.BootstrapTable.DEFAULTS[optionName];
+        return this.searchParams.get("".concat(this.options.addrPrefix || '').concat(prefixName)) || $.BootstrapTable.DEFAULTS[optionName];
       }
     }, {
       key: "initAddrbar",
@@ -22248,6 +29101,13 @@
             this.searchParams.set(key, value);
           }
         }
+        var customParams = Utils.calculateObjectValue(this.options, this.options.addrCustomParams, [], {});
+        for (var _i2 = 0, _Object$entries2 = Object.entries(customParams); _i2 < _Object$entries2.length; _i2++) {
+          var _Object$entries2$_i = _slicedToArray(_Object$entries2[_i2], 2),
+            _key2 = _Object$entries2$_i[0],
+            _value = _Object$entries2$_i[1];
+          this.searchParams.set(_key2, _value);
+        }
         var url = "?".concat(this.searchParams.toString());
         if (location.hash) {
           url += location.hash;
@@ -22257,14 +29117,25 @@
     }, {
       key: "resetSearch",
       value: function resetSearch(text) {
-        _get(_getPrototypeOf(_class.prototype), "resetSearch", this).call(this, text);
+        _superPropGet(_class, "resetSearch", this)([text]);
         this.options.searchText = text || '';
       }
     }]);
-  }($$6.BootstrapTable);
+  }($.BootstrapTable);
 
 }));
 
+/**
+  * bootstrap-table - An extended table to integration with some of the most widely used CSS frameworks. (Supports Bootstrap, Semantic UI, Bulma, Material Design, Foundation)
+  *
+  * @version v1.24.1
+  * @homepage https://bootstrap-table.com
+  * @author wenzhixin <wenzhixin2010@gmail.com> (http://wenzhixin.net.cn/)
+  * @license MIT
+  */
+
+!function(r,t){"object"==typeof exports&&"undefined"!=typeof module?t(require("jquery")):"function"==typeof define&&define.amd?define(["jquery"],t):t((r="undefined"!=typeof globalThis?globalThis:r||self).jQuery)}(this,(function(r){"use strict";function t(r,t){(null==t||t>r.length)&&(t=r.length);for(var n=0,e=Array(t);n<t;n++)e[n]=r[n];return e}function n(r,t,n){return t=u(t),function(r,t){if(t&&("object"==typeof t||"function"==typeof t))return t;if(void 0!==t)throw new TypeError("Derived constructors may only return object or undefined");return function(r){if(void 0===r)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return r}(r)}(r,a()?Reflect.construct(t,n||[],u(r).constructor):t.apply(r,n))}function e(r,t,n){return function(r,t){for(var n=0;n<t.length;n++){var e=t[n];e.enumerable=e.enumerable||!1,e.configurable=!0,"value"in e&&(e.writable=!0),Object.defineProperty(r,l(e.key),e)}}(r.prototype,t),Object.defineProperty(r,"prototype",{writable:!1}),r}function o(r,n){var e="undefined"!=typeof Symbol&&r[Symbol.iterator]||r["@@iterator"];if(!e){if(Array.isArray(r)||(e=function(r,n){if(r){if("string"==typeof r)return t(r,n);var e={}.toString.call(r).slice(8,-1);return"Object"===e&&r.constructor&&(e=r.constructor.name),"Map"===e||"Set"===e?Array.from(r):"Arguments"===e||/^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(e)?t(r,n):void 0}}(r))||n){e&&(r=e);var o=0,i=function(){};return{s:i,n:function(){return o>=r.length?{done:!0}:{done:!1,value:r[o++]}},e:function(r){throw r},f:i}}throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.")}var u,a=!0,c=!1;return{s:function(){e=e.call(r)},n:function(){var r=e.next();return a=r.done,r},e:function(r){c=!0,u=r},f:function(){try{a||null==e.return||e.return()}finally{if(c)throw u}}}}function i(){return i="undefined"!=typeof Reflect&&Reflect.get?Reflect.get.bind():function(r,t,n){var e=function(r,t){for(;!{}.hasOwnProperty.call(r,t)&&null!==(r=u(r)););return r}(r,t);if(e){var o=Object.getOwnPropertyDescriptor(e,t);return o.get?o.get.call(arguments.length<3?r:n):o.value}},i.apply(null,arguments)}function u(r){return u=Object.setPrototypeOf?Object.getPrototypeOf.bind():function(r){return r.__proto__||Object.getPrototypeOf(r)},u(r)}function a(){try{var r=!Boolean.prototype.valueOf.call(Reflect.construct(Boolean,[],(function(){})))}catch(r){}return(a=function(){return!!r})()}function c(r,t){return c=Object.setPrototypeOf?Object.setPrototypeOf.bind():function(r,t){return r.__proto__=t,r},c(r,t)}function f(r,t,n,e){var o=i(u(r.prototype),t,n);return"function"==typeof o?function(r){return o.apply(n,r)}:o}function l(r){var t=function(r,t){if("object"!=typeof r||!r)return r;var n=r[Symbol.toPrimitive];if(void 0!==n){var e=n.call(r,t);if("object"!=typeof e)return e;throw new TypeError("@@toPrimitive must return a primitive value.")}return String(r)}(r,"string");return"symbol"==typeof t?t:t+""}var s,p,v="undefined"!=typeof globalThis?globalThis:"undefined"!=typeof window?window:"undefined"!=typeof global?global:"undefined"!=typeof self?self:{},d={};function h(){if(p)return s;p=1;var r=function(r){return r&&r.Math===Math&&r};return s=r("object"==typeof globalThis&&globalThis)||r("object"==typeof window&&window)||r("object"==typeof self&&self)||r("object"==typeof v&&v)||r("object"==typeof s&&s)||function(){return this}()||Function("return this")()}var y,g,b,m,w,O,j,x,S={};function P(){return g?y:(g=1,y=function(r){try{return!!r()}catch(r){return!0}})}function A(){if(m)return b;m=1;var r=P();return b=!r((function(){return 7!==Object.defineProperty({},1,{get:function(){return 7}})[1]}))}function E(){if(O)return w;O=1;var r=P();return w=!r((function(){var r=function(){}.bind();return"function"!=typeof r||r.hasOwnProperty("prototype")}))}function T(){if(x)return j;x=1;var r=E(),t=Function.prototype.call;return j=r?t.bind(t):function(){return t.apply(t,arguments)},j}var I,C,R,F,k,M,$,_,D,B,N,z,L,U,G,K,V,W,q,Y,X,H,J,Q,Z,rr,tr,nr,er,or,ir,ur,ar,cr,fr,lr,sr,pr,vr,dr,hr,yr={};function gr(){if(I)return yr;I=1;var r={}.propertyIsEnumerable,t=Object.getOwnPropertyDescriptor,n=t&&!r.call({1:2},1);return yr.f=n?function(r){var n=t(this,r);return!!n&&n.enumerable}:r,yr}function br(){return R?C:(R=1,C=function(r,t){return{enumerable:!(1&r),configurable:!(2&r),writable:!(4&r),value:t}})}function mr(){if(k)return F;k=1;var r=E(),t=Function.prototype,n=t.call,e=r&&t.bind.bind(n,n);return F=r?e:function(r){return function(){return n.apply(r,arguments)}},F}function wr(){if($)return M;$=1;var r=mr(),t=r({}.toString),n=r("".slice);return M=function(r){return n(t(r),8,-1)}}function Or(){if(D)return _;D=1;var r=mr(),t=P(),n=wr(),e=Object,o=r("".split);return _=t((function(){return!e("z").propertyIsEnumerable(0)}))?function(r){return"String"===n(r)?o(r,""):e(r)}:e}function jr(){return N?B:(N=1,B=function(r){return null==r})}function xr(){if(L)return z;L=1;var r=jr(),t=TypeError;return z=function(n){if(r(n))throw new t("Can't call method on "+n);return n}}function Sr(){if(G)return U;G=1;var r=Or(),t=xr();return U=function(n){return r(t(n))}}function Pr(){if(V)return K;V=1;var r="object"==typeof document&&document.all;return K=void 0===r&&void 0!==r?function(t){return"function"==typeof t||t===r}:function(r){return"function"==typeof r}}function Ar(){if(q)return W;q=1;var r=Pr();return W=function(t){return"object"==typeof t?null!==t:r(t)}}function Er(){if(X)return Y;X=1;var r=h(),t=Pr();return Y=function(n,e){return arguments.length<2?(o=r[n],t(o)?o:void 0):r[n]&&r[n][e];var o},Y}function Tr(){if(Z)return Q;Z=1;var r=h().navigator,t=r&&r.userAgent;return Q=t?String(t):""}function Ir(){if(tr)return rr;tr=1;var r,t,n=h(),e=Tr(),o=n.process,i=n.Deno,u=o&&o.versions||i&&i.version,a=u&&u.v8;return a&&(t=(r=a.split("."))[0]>0&&r[0]<4?1:+(r[0]+r[1])),!t&&e&&(!(r=e.match(/Edge\/(\d+)/))||r[1]>=74)&&(r=e.match(/Chrome\/(\d+)/))&&(t=+r[1]),rr=t}function Cr(){if(er)return nr;er=1;var r=Ir(),t=P(),n=h().String;return nr=!!Object.getOwnPropertySymbols&&!t((function(){var t=Symbol("symbol detection");return!n(t)||!(Object(t)instanceof Symbol)||!Symbol.sham&&r&&r<41}))}function Rr(){if(ir)return or;ir=1;var r=Cr();return or=r&&!Symbol.sham&&"symbol"==typeof Symbol.iterator}function Fr(){if(ar)return ur;ar=1;var r=Er(),t=Pr(),n=function(){if(J)return H;J=1;var r=mr();return H=r({}.isPrototypeOf)}(),e=Rr(),o=Object;return ur=e?function(r){return"symbol"==typeof r}:function(e){var i=r("Symbol");return t(i)&&n(i.prototype,o(e))}}function kr(){if(fr)return cr;fr=1;var r=String;return cr=function(t){try{return r(t)}catch(r){return"Object"}}}function Mr(){if(sr)return lr;sr=1;var r=Pr(),t=kr(),n=TypeError;return lr=function(e){if(r(e))return e;throw new n(t(e)+" is not a function")}}function $r(){if(vr)return pr;vr=1;var r=Mr(),t=jr();return pr=function(n,e){var o=n[e];return t(o)?void 0:r(o)}}function _r(){if(hr)return dr;hr=1;var r=T(),t=Pr(),n=Ar(),e=TypeError;return dr=function(o,i){var u,a;if("string"===i&&t(u=o.toString)&&!n(a=r(u,o)))return a;if(t(u=o.valueOf)&&!n(a=r(u,o)))return a;if("string"!==i&&t(u=o.toString)&&!n(a=r(u,o)))return a;throw new e("Can't convert object to primitive value")}}var Dr,Br,Nr,zr,Lr,Ur,Gr,Kr,Vr,Wr,qr,Yr,Xr,Hr,Jr,Qr,Zr,rt,tt,nt,et,ot,it,ut,at={exports:{}};function ct(){if(zr)return Nr;zr=1;var r=h(),t=Object.defineProperty;return Nr=function(n,e){try{t(r,n,{value:e,configurable:!0,writable:!0})}catch(t){r[n]=e}return e}}function ft(){if(Lr)return at.exports;Lr=1;var r=Br?Dr:(Br=1,Dr=!1),t=h(),n=ct(),e="__core-js_shared__",o=at.exports=t[e]||n(e,{});return(o.versions||(o.versions=[])).push({version:"3.39.0",mode:r?"pure":"global",copyright:"© 2014-2024 Denis Pushkarev (zloirock.ru)",license:"https://github.com/zloirock/core-js/blob/v3.39.0/LICENSE",source:"https://github.com/zloirock/core-js"}),at.exports}function lt(){if(Gr)return Ur;Gr=1;var r=ft();return Ur=function(t,n){return r[t]||(r[t]=n||{})}}function st(){if(Vr)return Kr;Vr=1;var r=xr(),t=Object;return Kr=function(n){return t(r(n))}}function pt(){if(qr)return Wr;qr=1;var r=mr(),t=st(),n=r({}.hasOwnProperty);return Wr=Object.hasOwn||function(r,e){return n(t(r),e)}}function vt(){if(Xr)return Yr;Xr=1;var r=mr(),t=0,n=Math.random(),e=r(1..toString);return Yr=function(r){return"Symbol("+(void 0===r?"":r)+")_"+e(++t+n,36)}}function dt(){if(Jr)return Hr;Jr=1;var r=h(),t=lt(),n=pt(),e=vt(),o=Cr(),i=Rr(),u=r.Symbol,a=t("wks"),c=i?u.for||u:u&&u.withoutSetter||e;return Hr=function(r){return n(a,r)||(a[r]=o&&n(u,r)?u[r]:c("Symbol."+r)),a[r]}}function ht(){if(Zr)return Qr;Zr=1;var r=T(),t=Ar(),n=Fr(),e=$r(),o=_r(),i=dt(),u=TypeError,a=i("toPrimitive");return Qr=function(i,c){if(!t(i)||n(i))return i;var f,l=e(i,a);if(l){if(void 0===c&&(c="default"),f=r(l,i,c),!t(f)||n(f))return f;throw new u("Can't convert object to primitive value")}return void 0===c&&(c="number"),o(i,c)}}function yt(){if(tt)return rt;tt=1;var r=ht(),t=Fr();return rt=function(n){var e=r(n,"string");return t(e)?e:e+""}}function gt(){if(et)return nt;et=1;var r=h(),t=Ar(),n=r.document,e=t(n)&&t(n.createElement);return nt=function(r){return e?n.createElement(r):{}}}function bt(){if(it)return ot;it=1;var r=A(),t=P(),n=gt();return ot=!r&&!t((function(){return 7!==Object.defineProperty(n("div"),"a",{get:function(){return 7}}).a}))}function mt(){if(ut)return S;ut=1;var r=A(),t=T(),n=gr(),e=br(),o=Sr(),i=yt(),u=pt(),a=bt(),c=Object.getOwnPropertyDescriptor;return S.f=r?c:function(r,f){if(r=o(r),f=i(f),a)try{return c(r,f)}catch(r){}if(u(r,f))return e(!t(n.f,r,f),r[f])},S}var wt,Ot,jt,xt,St,Pt,At,Et={};function Tt(){if(Ot)return wt;Ot=1;var r=A(),t=P();return wt=r&&t((function(){return 42!==Object.defineProperty((function(){}),"prototype",{value:42,writable:!1}).prototype}))}function It(){if(xt)return jt;xt=1;var r=Ar(),t=String,n=TypeError;return jt=function(e){if(r(e))return e;throw new n(t(e)+" is not an object")}}function Ct(){if(St)return Et;St=1;var r=A(),t=bt(),n=Tt(),e=It(),o=yt(),i=TypeError,u=Object.defineProperty,a=Object.getOwnPropertyDescriptor,c="enumerable",f="configurable",l="writable";return Et.f=r?n?function(r,t,n){if(e(r),t=o(t),e(n),"function"==typeof r&&"prototype"===t&&"value"in n&&l in n&&!n[l]){var i=a(r,t);i&&i[l]&&(r[t]=n.value,n={configurable:f in n?n[f]:i[f],enumerable:c in n?n[c]:i[c],writable:!1})}return u(r,t,n)}:u:function(r,n,a){if(e(r),n=o(n),e(a),t)try{return u(r,n,a)}catch(r){}if("get"in a||"set"in a)throw new i("Accessors not supported");return"value"in a&&(r[n]=a.value),r},Et}function Rt(){if(At)return Pt;At=1;var r=A(),t=Ct(),n=br();return Pt=r?function(r,e,o){return t.f(r,e,n(1,o))}:function(r,t,n){return r[t]=n,r}}var Ft,kt,Mt,$t,_t,Dt,Bt,Nt,zt,Lt,Ut,Gt,Kt,Vt,Wt,qt={exports:{}};function Yt(){if($t)return Mt;$t=1;var r=mr(),t=Pr(),n=ft(),e=r(Function.toString);return t(n.inspectSource)||(n.inspectSource=function(r){return e(r)}),Mt=n.inspectSource}function Xt(){if(Nt)return Bt;Nt=1;var r=lt(),t=vt(),n=r("keys");return Bt=function(r){return n[r]||(n[r]=t(r))}}function Ht(){return Lt?zt:(Lt=1,zt={})}function Jt(){if(Gt)return Ut;Gt=1;var r,t,n,e=function(){if(Dt)return _t;Dt=1;var r=h(),t=Pr(),n=r.WeakMap;return _t=t(n)&&/native code/.test(String(n))}(),o=h(),i=Ar(),u=Rt(),a=pt(),c=ft(),f=Xt(),l=Ht(),s="Object already initialized",p=o.TypeError,v=o.WeakMap;if(e||c.state){var d=c.state||(c.state=new v);d.get=d.get,d.has=d.has,d.set=d.set,r=function(r,t){if(d.has(r))throw new p(s);return t.facade=r,d.set(r,t),t},t=function(r){return d.get(r)||{}},n=function(r){return d.has(r)}}else{var y=f("state");l[y]=!0,r=function(r,t){if(a(r,y))throw new p(s);return t.facade=r,u(r,y,t),t},t=function(r){return a(r,y)?r[y]:{}},n=function(r){return a(r,y)}}return Ut={set:r,get:t,has:n,enforce:function(e){return n(e)?t(e):r(e,{})},getterFor:function(r){return function(n){var e;if(!i(n)||(e=t(n)).type!==r)throw new p("Incompatible receiver, "+r+" required");return e}}}}function Qt(){if(Kt)return qt.exports;Kt=1;var r=mr(),t=P(),n=Pr(),e=pt(),o=A(),i=function(){if(kt)return Ft;kt=1;var r=A(),t=pt(),n=Function.prototype,e=r&&Object.getOwnPropertyDescriptor,o=t(n,"name"),i=o&&"something"===function(){}.name,u=o&&(!r||r&&e(n,"name").configurable);return Ft={EXISTS:o,PROPER:i,CONFIGURABLE:u}}().CONFIGURABLE,u=Yt(),a=Jt(),c=a.enforce,f=a.get,l=String,s=Object.defineProperty,p=r("".slice),v=r("".replace),d=r([].join),h=o&&!t((function(){return 8!==s((function(){}),"length",{value:8}).length})),y=String(String).split("String"),g=qt.exports=function(r,t,n){"Symbol("===p(l(t),0,7)&&(t="["+v(l(t),/^Symbol\(([^)]*)\).*$/,"$1")+"]"),n&&n.getter&&(t="get "+t),n&&n.setter&&(t="set "+t),(!e(r,"name")||i&&r.name!==t)&&(o?s(r,"name",{value:t,configurable:!0}):r.name=t),h&&n&&e(n,"arity")&&r.length!==n.arity&&s(r,"length",{value:n.arity});try{n&&e(n,"constructor")&&n.constructor?o&&s(r,"prototype",{writable:!1}):r.prototype&&(r.prototype=void 0)}catch(r){}var u=c(r);return e(u,"source")||(u.source=d(y,"string"==typeof t?t:"")),r};return Function.prototype.toString=g((function(){return n(this)&&f(this).source||u(this)}),"toString"),qt.exports}function Zt(){if(Wt)return Vt;Wt=1;var r=Pr(),t=Ct(),n=Qt(),e=ct();return Vt=function(o,i,u,a){a||(a={});var c=a.enumerable,f=void 0!==a.name?a.name:i;if(r(u)&&n(u,f,a),a.global)c?o[i]=u:e(i,u);else{try{a.unsafe?o[i]&&(c=!0):delete o[i]}catch(r){}c?o[i]=u:t.f(o,i,{value:u,enumerable:!1,configurable:!a.nonConfigurable,writable:!a.nonWritable})}return o}}var rn,tn,nn,en,on,un,an,cn,fn,ln,sn,pn,vn,dn,hn,yn,gn,bn={};function mn(){if(en)return nn;en=1;var r=function(){if(tn)return rn;tn=1;var r=Math.ceil,t=Math.floor;return rn=Math.trunc||function(n){var e=+n;return(e>0?t:r)(e)}}();return nn=function(t){var n=+t;return n!=n||0===n?0:r(n)}}function wn(){if(un)return on;un=1;var r=mn(),t=Math.max,n=Math.min;return on=function(e,o){var i=r(e);return i<0?t(i+o,0):n(i,o)}}function On(){if(cn)return an;cn=1;var r=mn(),t=Math.min;return an=function(n){var e=r(n);return e>0?t(e,9007199254740991):0}}function jn(){if(ln)return fn;ln=1;var r=On();return fn=function(t){return r(t.length)}}function xn(){if(pn)return sn;pn=1;var r=Sr(),t=wn(),n=jn(),e=function(e){return function(o,i,u){var a=r(o),c=n(a);if(0===c)return!e&&-1;var f,l=t(u,c);if(e&&i!=i){for(;c>l;)if((f=a[l++])!=f)return!0}else for(;c>l;l++)if((e||l in a)&&a[l]===i)return e||l||0;return!e&&-1}};return sn={includes:e(!0),indexOf:e(!1)}}function Sn(){if(dn)return vn;dn=1;var r=mr(),t=pt(),n=Sr(),e=xn().indexOf,o=Ht(),i=r([].push);return vn=function(r,u){var a,c=n(r),f=0,l=[];for(a in c)!t(o,a)&&t(c,a)&&i(l,a);for(;u.length>f;)t(c,a=u[f++])&&(~e(l,a)||i(l,a));return l}}function Pn(){return yn?hn:(yn=1,hn=["constructor","hasOwnProperty","isPrototypeOf","propertyIsEnumerable","toLocaleString","toString","valueOf"])}var An,En,Tn,In,Cn,Rn,Fn,kn,Mn,$n,_n,Dn,Bn,Nn,zn,Ln,Un,Gn,Kn,Vn,Wn,qn,Yn,Xn,Hn,Jn,Qn,Zn,re={};function te(){return An||(An=1,re.f=Object.getOwnPropertySymbols),re}function ne(){if(Tn)return En;Tn=1;var r=Er(),t=mr(),n=function(){if(gn)return bn;gn=1;var r=Sn(),t=Pn().concat("length","prototype");return bn.f=Object.getOwnPropertyNames||function(n){return r(n,t)},bn}(),e=te(),o=It(),i=t([].concat);return En=r("Reflect","ownKeys")||function(r){var t=n.f(o(r)),u=e.f;return u?i(t,u(r)):t}}function ee(){if(Cn)return In;Cn=1;var r=pt(),t=ne(),n=mt(),e=Ct();return In=function(o,i,u){for(var a=t(i),c=e.f,f=n.f,l=0;l<a.length;l++){var s=a[l];r(o,s)||u&&r(u,s)||c(o,s,f(i,s))}}}function oe(){if(Mn)return kn;Mn=1;var r=h(),t=mt().f,n=Rt(),e=Zt(),o=ct(),i=ee(),u=function(){if(Fn)return Rn;Fn=1;var r=P(),t=Pr(),n=/#|\.prototype\./,e=function(n,e){var c=i[o(n)];return c===a||c!==u&&(t(e)?r(e):!!e)},o=e.normalize=function(r){return String(r).replace(n,".").toLowerCase()},i=e.data={},u=e.NATIVE="N",a=e.POLYFILL="P";return Rn=e}();return kn=function(a,c){var f,l,s,p,v,d=a.target,h=a.global,y=a.stat;if(f=h?r:y?r[d]||o(d,{}):r[d]&&r[d].prototype)for(l in c){if(p=c[l],s=a.dontCallGetSet?(v=t(f,l))&&v.value:f[l],!u(h?l:d+(y?".":"#")+l,a.forced)&&void 0!==s){if(typeof p==typeof s)continue;i(p,s)}(a.sham||s&&s.sham)&&n(p,"sham",!0),e(f,l,p,a)}}}function ie(){if(_n)return $n;_n=1;var r=wr();return $n=Array.isArray||function(t){return"Array"===r(t)}}function ue(){if(Bn)return Dn;Bn=1;var r=TypeError;return Dn=function(t){if(t>9007199254740991)throw r("Maximum allowed index exceeded");return t}}function ae(){if(zn)return Nn;zn=1;var r=A(),t=Ct(),n=br();return Nn=function(e,o,i){r?t.f(e,o,n(0,i)):e[o]=i}}function ce(){if(Un)return Ln;Un=1;var r={};return r[dt()("toStringTag")]="z",Ln="[object z]"===String(r)}function fe(){if(Kn)return Gn;Kn=1;var r=ce(),t=Pr(),n=wr(),e=dt()("toStringTag"),o=Object,i="Arguments"===n(function(){return arguments}());return Gn=r?n:function(r){var u,a,c;return void 0===r?"Undefined":null===r?"Null":"string"==typeof(a=function(r,t){try{return r[t]}catch(r){}}(u=o(r),e))?a:i?n(u):"Object"===(c=n(u))&&t(u.callee)?"Arguments":c}}function le(){if(Wn)return Vn;Wn=1;var r=mr(),t=P(),n=Pr(),e=fe(),o=Er(),i=Yt(),u=function(){},a=o("Reflect","construct"),c=/^\s*(?:class|function)\b/,f=r(c.exec),l=!c.test(u),s=function(r){if(!n(r))return!1;try{return a(u,[],r),!0}catch(r){return!1}},p=function(r){if(!n(r))return!1;switch(e(r)){case"AsyncFunction":case"GeneratorFunction":case"AsyncGeneratorFunction":return!1}try{return l||!!f(c,i(r))}catch(r){return!0}};return p.sham=!0,Vn=!a||t((function(){var r;return s(s.call)||!s(Object)||!s((function(){r=!0}))||r}))?p:s}function se(){if(Yn)return qn;Yn=1;var r=ie(),t=le(),n=Ar(),e=dt()("species"),o=Array;return qn=function(i){var u;return r(i)&&(u=i.constructor,(t(u)&&(u===o||r(u.prototype))||n(u)&&null===(u=u[e]))&&(u=void 0)),void 0===u?o:u}}function pe(){if(Hn)return Xn;Hn=1;var r=se();return Xn=function(t,n){return new(r(t))(0===n?0:n)}}function ve(){if(Qn)return Jn;Qn=1;var r=P(),t=dt(),n=Ir(),e=t("species");return Jn=function(t){return n>=51||!r((function(){var r=[];return(r.constructor={})[e]=function(){return{foo:1}},1!==r[t](Boolean).foo}))}}!function(){if(Zn)return d;Zn=1;var r=oe(),t=P(),n=ie(),e=Ar(),o=st(),i=jn(),u=ue(),a=ae(),c=pe(),f=ve(),l=dt(),s=Ir(),p=l("isConcatSpreadable"),v=s>=51||!t((function(){var r=[];return r[p]=!1,r.concat()[0]!==r})),h=function(r){if(!e(r))return!1;var t=r[p];return void 0!==t?!!t:n(r)};r({target:"Array",proto:!0,arity:1,forced:!v||!f("concat")},{concat:function(r){var t,n,e,f,l,s=o(this),p=c(s,0),v=0;for(t=-1,e=arguments.length;t<e;t++)if(h(l=-1===t?s:arguments[t]))for(f=i(l),u(v+f),n=0;n<f;n++,v++)n in l&&a(p,v,l[n]);else u(v+1),a(p,v++,l);return p.length=v,p}})}();var de,he,ye,ge,be,me,we,Oe={};function je(){if(he)return de;he=1;var r=wr(),t=mr();return de=function(n){if("Function"===r(n))return t(n)}}function xe(){if(ge)return ye;ge=1;var r=je(),t=Mr(),n=E(),e=r(r.bind);return ye=function(r,o){return t(r),void 0===o?r:n?e(r,o):function(){return r.apply(o,arguments)}},ye}function Se(){if(me)return be;me=1;var r=xe(),t=mr(),n=Or(),e=st(),o=jn(),i=pe(),u=t([].push),a=function(t){var a=1===t,c=2===t,f=3===t,l=4===t,s=6===t,p=7===t,v=5===t||s;return function(d,h,y,g){for(var b,m,w=e(d),O=n(w),j=o(O),x=r(h,y),S=0,P=g||i,A=a?P(d,j):c||p?P(d,0):void 0;j>S;S++)if((v||S in O)&&(m=x(b=O[S],S,w),t))if(a)A[S]=m;else if(m)switch(t){case 3:return!0;case 5:return b;case 6:return S;case 2:u(A,b)}else switch(t){case 4:return!1;case 7:u(A,b)}return s?-1:f||l?l:A}};return be={forEach:a(0),map:a(1),filter:a(2),some:a(3),every:a(4),find:a(5),findIndex:a(6),filterReject:a(7)}}!function(){if(we)return Oe;we=1;var r=oe(),t=Se().filter;r({target:"Array",proto:!0,forced:!ve()("filter")},{filter:function(r){return t(this,r,arguments.length>1?arguments[1]:void 0)}})}();var Pe,Ae,Ee,Te,Ie,Ce,Re,Fe,ke,Me,$e={},_e={};function De(){if(Ae)return Pe;Ae=1;var r=Sn(),t=Pn();return Pe=Object.keys||function(n){return r(n,t)}}function Be(){if(Ie)return Te;Ie=1;var r=Er();return Te=r("document","documentElement")}function Ne(){if(Re)return Ce;Re=1;var r,t=It(),n=function(){if(Ee)return _e;Ee=1;var r=A(),t=Tt(),n=Ct(),e=It(),o=Sr(),i=De();return _e.f=r&&!t?Object.defineProperties:function(r,t){e(r);for(var u,a=o(t),c=i(t),f=c.length,l=0;f>l;)n.f(r,u=c[l++],a[u]);return r},_e}(),e=Pn(),o=Ht(),i=Be(),u=gt(),a=Xt(),c="prototype",f="script",l=a("IE_PROTO"),s=function(){},p=function(r){return"<"+f+">"+r+"</"+f+">"},v=function(r){r.write(p("")),r.close();var t=r.parentWindow.Object;return r=null,t},d=function(){try{r=new ActiveXObject("htmlfile")}catch(r){}var t,n,o;d="undefined"!=typeof document?document.domain&&r?v(r):(n=u("iframe"),o="java"+f+":",n.style.display="none",i.appendChild(n),n.src=String(o),(t=n.contentWindow.document).open(),t.write(p("document.F=Object")),t.close(),t.F):v(r);for(var a=e.length;a--;)delete d[c][e[a]];return d()};return o[l]=!0,Ce=Object.create||function(r,e){var o;return null!==r?(s[c]=t(r),o=new s,s[c]=null,o[l]=r):o=d(),void 0===e?o:n.f(o,e)}}function ze(){if(ke)return Fe;ke=1;var r=dt(),t=Ne(),n=Ct().f,e=r("unscopables"),o=Array.prototype;return void 0===o[e]&&n(o,e,{configurable:!0,value:t(null)}),Fe=function(r){o[e][r]=!0}}!function(){if(Me)return $e;Me=1;var r=oe(),t=Se().find,n=ze(),e="find",o=!0;e in[]&&Array(1)[e]((function(){o=!1})),r({target:"Array",proto:!0,forced:o},{find:function(r){return t(this,r,arguments.length>1?arguments[1]:void 0)}}),n(e)}();var Le,Ue,Ge,Ke={};!function(){if(Ge)return Ke;Ge=1;var r=oe(),t=function(){if(Ue)return Le;Ue=1;var r=ie(),t=jn(),n=ue(),e=xe(),o=function(i,u,a,c,f,l,s,p){for(var v,d,h=f,y=0,g=!!s&&e(s,p);y<c;)y in a&&(v=g?g(a[y],y,u):a[y],l>0&&r(v)?(d=t(v),h=o(i,u,v,d,h,l-1)-1):(n(h+1),i[h]=v),h++),y++;return h};return Le=o}(),n=st(),e=jn(),o=mn(),i=pe();r({target:"Array",proto:!0},{flat:function(){var r=arguments.length?arguments[0]:void 0,u=n(this),a=e(u),c=i(u,0);return c.length=t(c,u,u,a,0,void 0===r?1:o(r)),c}})}();var Ve,We={};!function(){if(Ve)return We;Ve=1;var r=oe(),t=xn().includes,n=P(),e=ze();r({target:"Array",proto:!0,forced:n((function(){return!Array(1).includes()}))},{includes:function(r){return t(this,r,arguments.length>1?arguments[1]:void 0)}}),e("includes")}();var qe,Ye,Xe,He={};function Je(){if(Ye)return qe;Ye=1;var r=P();return qe=function(t,n){var e=[][t];return!!e&&r((function(){e.call(null,n||function(){return 1},1)}))}}!function(){if(Xe)return He;Xe=1;var r=oe(),t=je(),n=xn().indexOf,e=Je(),o=t([].indexOf),i=!!o&&1/o([1],1,-0)<0;r({target:"Array",proto:!0,forced:i||!e("indexOf")},{indexOf:function(r){var t=arguments.length>1?arguments[1]:void 0;return i?o(this,r,t)||0:n(this,r,t)}})}();var Qe,Ze={};!function(){if(Qe)return Ze;Qe=1;var r=oe(),t=mr(),n=Or(),e=Sr(),o=Je(),i=t([].join);r({target:"Array",proto:!0,forced:n!==Object||!o("join",",")},{join:function(r){return i(e(this),void 0===r?",":r)}})}();var ro,to={};!function(){if(ro)return to;ro=1;var r=oe(),t=Se().map;r({target:"Array",proto:!0,forced:!ve()("map")},{map:function(r){return t(this,r,arguments.length>1?arguments[1]:void 0)}})}();var no,eo,oo,io={};function uo(){if(eo)return no;eo=1;var r=mr();return no=r([].slice)}!function(){if(oo)return io;oo=1;var r=oe(),t=ie(),n=le(),e=Ar(),o=wn(),i=jn(),u=Sr(),a=ae(),c=dt(),f=ve(),l=uo(),s=f("slice"),p=c("species"),v=Array,d=Math.max;r({target:"Array",proto:!0,forced:!s},{slice:function(r,c){var f,s,h,y=u(this),g=i(y),b=o(r,g),m=o(void 0===c?g:c,g);if(t(y)&&(f=y.constructor,(n(f)&&(f===v||t(f.prototype))||e(f)&&null===(f=f[p]))&&(f=void 0),f===v||void 0===f))return l(y,b,m);for(s=new(void 0===f?v:f)(d(m-b,0)),h=0;b<m;b++,h++)b in y&&a(s,h,y[b]);return s.length=h,s}})}();var ao,co,fo,lo,so,po,vo,ho,yo,go,bo,mo,wo,Oo={};function jo(){if(co)return ao;co=1;var r=kr(),t=TypeError;return ao=function(n,e){if(!delete n[e])throw new t("Cannot delete property "+r(e)+" of "+r(n))}}function xo(){if(lo)return fo;lo=1;var r=fe(),t=String;return fo=function(n){if("Symbol"===r(n))throw new TypeError("Cannot convert a Symbol value to a string");return t(n)}}!function(){if(wo)return Oo;wo=1;var r=oe(),t=mr(),n=Mr(),e=st(),o=jn(),i=jo(),u=xo(),a=P(),c=function(){if(po)return so;po=1;var r=uo(),t=Math.floor,n=function(e,o){var i=e.length;if(i<8)for(var u,a,c=1;c<i;){for(a=c,u=e[c];a&&o(e[a-1],u)>0;)e[a]=e[--a];a!==c++&&(e[a]=u)}else for(var f=t(i/2),l=n(r(e,0,f),o),s=n(r(e,f),o),p=l.length,v=s.length,d=0,h=0;d<p||h<v;)e[d+h]=d<p&&h<v?o(l[d],s[h])<=0?l[d++]:s[h++]:d<p?l[d++]:s[h++];return e};return so=n}(),f=Je(),l=function(){if(ho)return vo;ho=1;var r=Tr().match(/firefox\/(\d+)/i);return vo=!!r&&+r[1]}(),s=function(){if(go)return yo;go=1;var r=Tr();return yo=/MSIE|Trident/.test(r)}(),p=Ir(),v=function(){if(mo)return bo;mo=1;var r=Tr().match(/AppleWebKit\/(\d+)\./);return bo=!!r&&+r[1]}(),d=[],h=t(d.sort),y=t(d.push),g=a((function(){d.sort(void 0)})),b=a((function(){d.sort(null)})),m=f("sort"),w=!a((function(){if(p)return p<70;if(!(l&&l>3)){if(s)return!0;if(v)return v<603;var r,t,n,e,o="";for(r=65;r<76;r++){switch(t=String.fromCharCode(r),r){case 66:case 69:case 70:case 72:n=3;break;case 68:case 71:n=4;break;default:n=2}for(e=0;e<47;e++)d.push({k:t+e,v:n})}for(d.sort((function(r,t){return t.v-r.v})),e=0;e<d.length;e++)t=d[e].k.charAt(0),o.charAt(o.length-1)!==t&&(o+=t);return"DGBEFHACIJK"!==o}}));r({target:"Array",proto:!0,forced:g||!b||!m||!w},{sort:function(r){void 0!==r&&n(r);var t=e(this);if(w)return void 0===r?h(t):h(t,r);var a,f,l=[],s=o(t);for(f=0;f<s;f++)f in t&&y(l,t[f]);for(c(l,function(r){return function(t,n){return void 0===n?-1:void 0===t?1:void 0!==r?+r(t,n)||0:u(t)>u(n)?1:-1}}(r)),a=o(l),f=0;f<a;)t[f]=l[f++];for(;f<s;)i(t,f++);return t}})}();var So;So||(So=1,ze()("flat"));var Po,Ao,Eo,To={};!function(){if(Eo)return To;Eo=1;var r=oe(),t=function(){if(Ao)return Po;Ao=1;var r=A(),t=mr(),n=T(),e=P(),o=De(),i=te(),u=gr(),a=st(),c=Or(),f=Object.assign,l=Object.defineProperty,s=t([].concat);return Po=!f||e((function(){if(r&&1!==f({b:1},f(l({},"a",{enumerable:!0,get:function(){l(this,"b",{value:3,enumerable:!1})}}),{b:2})).b)return!0;var t={},n={},e=Symbol("assign detection"),i="abcdefghijklmnopqrst";return t[e]=7,i.split("").forEach((function(r){n[r]=r})),7!==f({},t)[e]||o(f({},n)).join("")!==i}))?function(t,e){for(var f=a(t),l=arguments.length,p=1,v=i.f,d=u.f;l>p;)for(var h,y=c(arguments[p++]),g=v?s(o(y),v(y)):o(y),b=g.length,m=0;b>m;)h=g[m++],r&&!n(d,y,h)||(f[h]=y[h]);return f}:f,Po}();r({target:"Object",stat:!0,arity:2,forced:Object.assign!==t},{assign:t})}();var Io,Co,Ro,Fo={};!function(){if(Ro)return Fo;Ro=1;var r=ce(),t=Zt(),n=function(){if(Co)return Io;Co=1;var r=ce(),t=fe();return Io=r?{}.toString:function(){return"[object "+t(this)+"]"}}();r||t(Object.prototype,"toString",n,{unsafe:!0})}();var ko,Mo,$o,_o,Do,Bo,No,zo,Lo,Uo,Go,Ko={};function Vo(){if(Mo)return ko;Mo=1;var r=It();return ko=function(){var t=r(this),n="";return t.hasIndices&&(n+="d"),t.global&&(n+="g"),t.ignoreCase&&(n+="i"),t.multiline&&(n+="m"),t.dotAll&&(n+="s"),t.unicode&&(n+="u"),t.unicodeSets&&(n+="v"),t.sticky&&(n+="y"),n}}function Wo(){if(Uo)return Lo;Uo=1;var r,t,n=T(),e=mr(),o=xo(),i=Vo(),u=function(){if(_o)return $o;_o=1;var r=P(),t=h().RegExp,n=r((function(){var r=t("a","y");return r.lastIndex=2,null!==r.exec("abcd")})),e=n||r((function(){return!t("a","y").sticky})),o=n||r((function(){var r=t("^r","gy");return r.lastIndex=2,null!==r.exec("str")}));return $o={BROKEN_CARET:o,MISSED_STICKY:e,UNSUPPORTED_Y:n}}(),a=lt(),c=Ne(),f=Jt().get,l=function(){if(Bo)return Do;Bo=1;var r=P(),t=h().RegExp;return Do=r((function(){var r=t(".","s");return!(r.dotAll&&r.test("\n")&&"s"===r.flags)}))}(),s=function(){if(zo)return No;zo=1;var r=P(),t=h().RegExp;return No=r((function(){var r=t("(?<a>b)","g");return"b"!==r.exec("b").groups.a||"bc"!=="b".replace(r,"$<a>c")}))}(),p=a("native-string-replace",String.prototype.replace),v=RegExp.prototype.exec,d=v,y=e("".charAt),g=e("".indexOf),b=e("".replace),m=e("".slice),w=(t=/b*/g,n(v,r=/a/,"a"),n(v,t,"a"),0!==r.lastIndex||0!==t.lastIndex),O=u.BROKEN_CARET,j=void 0!==/()??/.exec("")[1];return(w||j||O||l||s)&&(d=function(r){var t,e,u,a,l,s,h,x=this,S=f(x),P=o(r),A=S.raw;if(A)return A.lastIndex=x.lastIndex,t=n(d,A,P),x.lastIndex=A.lastIndex,t;var E=S.groups,T=O&&x.sticky,I=n(i,x),C=x.source,R=0,F=P;if(T&&(I=b(I,"y",""),-1===g(I,"g")&&(I+="g"),F=m(P,x.lastIndex),x.lastIndex>0&&(!x.multiline||x.multiline&&"\n"!==y(P,x.lastIndex-1))&&(C="(?: "+C+")",F=" "+F,R++),e=new RegExp("^(?:"+C+")",I)),j&&(e=new RegExp("^"+C+"$(?!\\s)",I)),w&&(u=x.lastIndex),a=n(v,T?e:x,F),T?a?(a.input=m(a.input,R),a[0]=m(a[0],R),a.index=x.lastIndex,x.lastIndex+=a[0].length):x.lastIndex=0:w&&a&&(x.lastIndex=x.global?a.index+a[0].length:u),j&&a&&a.length>1&&n(p,a[0],e,(function(){for(l=1;l<arguments.length-2;l++)void 0===arguments[l]&&(a[l]=void 0)})),a&&E)for(a.groups=s=c(null),l=0;l<E.length;l++)s[(h=E[l])[0]]=a[h[1]];return a}),Lo=d}function qo(){if(Go)return Ko;Go=1;var r=oe(),t=Wo();return r({target:"RegExp",proto:!0,forced:/./.exec!==t},{exec:t}),Ko}qo();var Yo,Xo,Ho,Jo,Qo,Zo,ri,ti,ni,ei,oi,ii,ui,ai={};function ci(){if(ti)return ri;ti=1;var r=function(){if(Zo)return Qo;Zo=1;var r=mr(),t=mn(),n=xo(),e=xr(),o=r("".charAt),i=r("".charCodeAt),u=r("".slice),a=function(r){return function(a,c){var f,l,s=n(e(a)),p=t(c),v=s.length;return p<0||p>=v?r?"":void 0:(f=i(s,p))<55296||f>56319||p+1===v||(l=i(s,p+1))<56320||l>57343?r?o(s,p):f:r?u(s,p,p+2):l-56320+(f-55296<<10)+65536}};return Qo={codeAt:a(!1),charAt:a(!0)}}().charAt;return ri=function(t,n,e){return n+(e?r(t,n).length:1)}}function fi(){if(ei)return ni;ei=1;var r=mr(),t=st(),n=Math.floor,e=r("".charAt),o=r("".replace),i=r("".slice),u=/\$([$&'`]|\d{1,2}|<[^>]*>)/g,a=/\$([$&'`]|\d{1,2})/g;return ni=function(r,c,f,l,s,p){var v=f+r.length,d=l.length,h=a;return void 0!==s&&(s=t(s),h=u),o(p,h,(function(t,o){var u;switch(e(o,0)){case"$":return"$";case"&":return r;case"`":return i(c,0,f);case"'":return i(c,v);case"<":u=s[i(o,1,-1)];break;default:var a=+o;if(0===a)return t;if(a>d){var p=n(a/10);return 0===p?t:p<=d?void 0===l[p-1]?e(o,1):l[p-1]+e(o,1):t}u=l[a-1]}return void 0===u?"":u}))}}!function(){if(ui)return ai;ui=1;var r=function(){if(Xo)return Yo;Xo=1;var r=E(),t=Function.prototype,n=t.apply,e=t.call;return Yo="object"==typeof Reflect&&Reflect.apply||(r?e.bind(n):function(){return e.apply(n,arguments)}),Yo}(),t=T(),n=mr(),e=function(){if(Jo)return Ho;Jo=1,qo();var r=T(),t=Zt(),n=Wo(),e=P(),o=dt(),i=Rt(),u=o("species"),a=RegExp.prototype;return Ho=function(c,f,l,s){var p=o(c),v=!e((function(){var r={};return r[p]=function(){return 7},7!==""[c](r)})),d=v&&!e((function(){var r=!1,t=/a/;return"split"===c&&((t={}).constructor={},t.constructor[u]=function(){return t},t.flags="",t[p]=/./[p]),t.exec=function(){return r=!0,null},t[p](""),!r}));if(!v||!d||l){var h=/./[p],y=f(p,""[c],(function(t,e,o,i,u){var c=e.exec;return c===n||c===a.exec?v&&!u?{done:!0,value:r(h,e,o,i)}:{done:!0,value:r(t,o,e,i)}:{done:!1}}));t(String.prototype,c,y[0]),t(a,p,y[1])}s&&i(a[p],"sham",!0)}}(),o=P(),i=It(),u=Pr(),a=jr(),c=mn(),f=On(),l=xo(),s=xr(),p=ci(),v=$r(),d=fi(),h=function(){if(ii)return oi;ii=1;var r=T(),t=It(),n=Pr(),e=wr(),o=Wo(),i=TypeError;return oi=function(u,a){var c=u.exec;if(n(c)){var f=r(c,u,a);return null!==f&&t(f),f}if("RegExp"===e(u))return r(o,u,a);throw new i("RegExp#exec called on incompatible receiver")}}(),y=dt()("replace"),g=Math.max,b=Math.min,m=n([].concat),w=n([].push),O=n("".indexOf),j=n("".slice),x="$0"==="a".replace(/./,"$0"),S=!!/./[y]&&""===/./[y]("a","$0");e("replace",(function(n,e,o){var x=S?"$":"$0";return[function(r,n){var o=s(this),i=a(r)?void 0:v(r,y);return i?t(i,r,o,n):t(e,l(o),r,n)},function(t,n){var a=i(this),s=l(t);if("string"==typeof n&&-1===O(n,x)&&-1===O(n,"$<")){var v=o(e,a,s,n);if(v.done)return v.value}var y=u(n);y||(n=l(n));var S,P=a.global;P&&(S=a.unicode,a.lastIndex=0);for(var A,E=[];null!==(A=h(a,s))&&(w(E,A),P);){""===l(A[0])&&(a.lastIndex=p(s,f(a.lastIndex),S))}for(var T,I="",C=0,R=0;R<E.length;R++){for(var F,k=l((A=E[R])[0]),M=g(b(c(A.index),s.length),0),$=[],_=1;_<A.length;_++)w($,void 0===(T=A[_])?T:String(T));var D=A.groups;if(y){var B=m([k],$,M,s);void 0!==D&&w(B,D),F=l(r(n,void 0,B))}else F=d(k,s,M,$,D,n);M>=C&&(I+=j(s,C,M)+F,C=M+k.length)}return I+j(s,C)}]}),!!o((function(){var r=/./;return r.exec=function(){var r=[];return r.groups={a:"7"},r},"7"!=="".replace(r,"$<a>")}))||!x||S)}();var li=r.fn.bootstrapTable.utils;function si(r,t){return"\n    <html>\n    <head>\n    ".concat(t,'\n    <style type="text/css" media="print">\n    @page {\n      size: auto;\n      margin: 25px 0 25px 0;\n    }\n    </style>\n    <style type="text/css" media="all">\n    table {\n      border-collapse: collapse;\n      font-size: 12px;\n    }\n    table, th, td {\n      border: 1px solid grey;\n    }\n    th, td {\n      text-align: center;\n      vertical-align: middle;\n    }\n    p {\n      font-weight: bold;\n      margin-left:20px;\n    }\n    table {\n      width: 94%;\n      margin-left: 3%;\n      margin-right: 3%;\n    }\n    div.bs-table-print {\n      text-align: center;\n    }\n    </style>\n    </head>\n    <title>Print Table</title>\n    <body>\n    <p>Printed on: ').concat(new Date,' </p>\n    <div class="bs-table-print">').concat(r,"</div>\n    </body>\n    </html>\n  ")}Object.assign(r.fn.bootstrapTable.locales,{formatPrint:function(){return"Print"}}),Object.assign(r.fn.bootstrapTable.defaults,r.fn.bootstrapTable.locales),Object.assign(r.fn.bootstrapTable.defaults,{showPrint:!1,printAsFilteredAndSortedOnUI:!0,printSortColumn:void 0,printSortOrder:"asc",printStyles:[],printPageBuilder:function(r,t){return si(r,t)}}),Object.assign(r.fn.bootstrapTable.columnDefaults,{printFilter:void 0,printIgnore:!1,printFormatter:void 0}),li.assignIcons(r.fn.bootstrapTable.icons,"print",{glyphicon:"glyphicon-print icon-share",fa:"fa-print",bi:"bi-printer",icon:"icon-printer","material-icons":"print"}),r.BootstrapTable=function(t){function i(){return function(r,t){if(!(r instanceof t))throw new TypeError("Cannot call a class as a function")}(this,i),n(this,i,arguments)}return function(r,t){if("function"!=typeof t&&null!==t)throw new TypeError("Super expression must either be null or a function");r.prototype=Object.create(t&&t.prototype,{constructor:{value:r,writable:!0,configurable:!0}}),Object.defineProperty(r,"prototype",{writable:!1}),t&&c(r,t)}(i,t),e(i,[{key:"init",value:function(){for(var r=arguments.length,t=new Array(r),n=0;n<r;n++)t[n]=arguments[n];f(i,"init",this)(t),this.options.showPrint&&(this.mergedCells=[])}},{key:"initToolbar",value:function(){var r=this;this.showToolbar=this.showToolbar||this.options.showPrint,this.options.showPrint&&(this.buttons=Object.assign(this.buttons,{print:{text:this.options.formatPrint(),icon:this.options.icons.print,event:function(){r.doPrint(r.options.printAsFilteredAndSortedOnUI?r.getData():r.options.data.slice(0))},attributes:{"aria-label":this.options.formatPrint(),title:this.options.formatPrint()}}}));for(var t=arguments.length,n=new Array(t),e=0;e<t;e++)n[e]=arguments[e];f(i,"initToolbar",this)(n)}},{key:"mergeCells",value:function(r){if(f(i,"mergeCells",this)([r]),this.options.showPrint){var t=this.getVisibleFields().indexOf(r.field);li.hasDetailViewIcon(this.options)&&(t+=1),this.mergedCells.push({row:r.index,col:t,rowspan:+r.rowspan||1,colspan:+r.colspan||1})}}},{key:"doPrint",value:function(t){var n,e=this,i=function(r){return!r.printIgnore&&r.visible},u=function(t,n,o){var i=li.getItemField(t,o.field,e.options.escape,o.escape),u=li.calculateObjectValue(o,o.printFormatter||o.formatter,[i,t,n],i);return null==u?e.options.undefinedText:r("<div>").html(u).html()},a=function(r,t){var n,a=e.$el.attr("dir")||"ltr",c=['<table dir="'.concat(a,'"><thead>')],f=o(t);try{for(f.s();!(n=f.n()).done;){var l=n.value;c.push("<tr>");for(var s=0;s<l.length;s++)i(l[s])&&c.push("<th\n              ".concat(li.sprintf(' rowspan="%s"',l[s].rowspan),"\n              ").concat(li.sprintf(' colspan="%s"',l[s].colspan),"\n              >").concat(l[s].title,"</th>"));c.push("</tr>")}}catch(r){f.e(r)}finally{f.f()}c.push("</thead><tbody>");var p=[];if(e.mergedCells)for(var v=0;v<e.mergedCells.length;v++)for(var d=e.mergedCells[v],h=0;h<d.rowspan;h++)for(var y=d.row+h,g=0;g<d.colspan;g++){var b=d.col+g;p.push("".concat(y,",").concat(b))}for(var m=0;m<r.length;m++){c.push("<tr>");var w=t.flat(1);w.sort((function(r,t){return r.colspanIndex-t.colspanIndex}));for(var O=0;O<w.length;O++)if(!(w[O].colspanGroup>0)){var j=0,x=0;if(e.mergedCells)for(var S=0;S<e.mergedCells.length;S++){var P=e.mergedCells[S];P.col===O&&P.row===m&&(j=P.rowspan,x=P.colspan)}i(w[O])&&(!p.includes("".concat(m,",").concat(O))||j>0&&x>0)&&(j>0&&x>0?c.push("<td ".concat(li.sprintf(' rowspan="%s"',j)," ").concat(li.sprintf(' colspan="%s"',x),">"),u(r[m],m,w[O]),"</td>"):c.push("<td>",u(r[m],m,w[O]),"</td>"))}c.push("</tr>")}if(c.push("</tbody>"),e.options.showFooter){c.push("<footer><tr>");var A,E=o(t);try{for(E.s();!(A=E.n()).done;)for(var T=A.value,I=0;I<T.length;I++)if(i(T)){var C=li.trToData(T,e.$el.find(">tfoot>tr")),R=li.calculateObjectValue(T[I],T[I].footerFormatter,[r],C[0]&&C[0][T[I].field]||"");c.push("<th>".concat(R,"</th>"))}}catch(r){E.e(r)}finally{E.f()}c.push("</tr></footer>")}return c.push("</table>"),c.join("")}(t=function(r,t,n){if(!t)return r;var e="asc"!==n;return e=-(+e||-1),r.sort((function(r,n){return e*r[t].localeCompare(n[t])}))}(t=function(r,t){return r.filter((function(r){return function(r,t){for(var n=0;n<t.length;++n)if(r[t[n].colName]!==t[n].value)return!1;return!0}(r,t)}))}(t,(n=this.options.columns)&&n[0]?n[0].filter((function(r){return r.printFilter})).map((function(r){return{colName:r.field,value:r.printFilter}})):[]),this.options.printSortColumn,this.options.printSortOrder),this.options.columns),c=window.open(""),f="string"==typeof this.options.printStyles?this.options.printStyles.replace(/\[|\]| /g,"").toLowerCase().split(","):this.options.printStyles,l=f.map((function(r){return'<link rel="stylesheet" href="'.concat(r,'" />')})).join(""),s=li.calculateObjectValue(this,this.options.printPageBuilder,[a,l],si(a,l)),p=function(){c.focus(),c.print(),c.close()};if(c.document.write(s),c.document.close(),f.length){var v=document.getElementsByTagName("link");v[v.length-1].onload=p}else p()}}])}(r.BootstrapTable)}));
+
 jQuery.base64 = (function($) {
 
     // private property
@@ -22327,9 +29198,9 @@ jQuery.base64 = (function($) {
 /*
  tableExport.jquery.plugin
 
- Version 1.30.0
+ Version 1.32.0
 
- Copyright (c) 2015-2024 hhurz,
+ Copyright (c) 2015-2025 hhurz,
    https://github.com/hhurz/tableExport.jquery.plugin
 
  Based on https://github.com/kayalshri/tableExport.jquery.plugin
@@ -22340,108 +29211,108 @@ var $jscomp=$jscomp||{};$jscomp.scope={};$jscomp.findInternal=function(d,F,t){d
 $jscomp.getGlobal=function(d){return"undefined"!=typeof window&&window===d?d:"undefined"!=typeof global&&null!=global?global:d};$jscomp.global=$jscomp.getGlobal(this);$jscomp.polyfill=function(d,F,t,D){if(F){t=$jscomp.global;d=d.split(".");for(D=0;D<d.length-1;D++){var K=d[D];K in t||(t[K]={});t=t[K]}d=d[d.length-1];D=t[d];F=F(D);F!=D&&null!=F&&$jscomp.defineProperty(t,d,{configurable:!0,writable:!0,value:F})}};
 $jscomp.polyfill("Array.prototype.find",function(d){return d?d:function(d,t){return $jscomp.findInternal(this,d,t).v}},"es6","es3");$jscomp.polyfill("Object.is",function(d){return d?d:function(d,t){return d===t?0!==d||1/d===1/t:d!==d&&t!==t}},"es6","es3");$jscomp.polyfill("Array.prototype.includes",function(d){return d?d:function(d,t){var D=this;D instanceof String&&(D=String(D));var F=D.length;for(t=t||0;t<F;t++)if(D[t]==d||Object.is(D[t],d))return!0;return!1}},"es7","es3");
 $jscomp.checkStringArgs=function(d,F,t){if(null==d)throw new TypeError("The 'this' value for String.prototype."+t+" must not be null or undefined");if(F instanceof RegExp)throw new TypeError("First argument to String.prototype."+t+" must not be a regular expression");return d+""};$jscomp.polyfill("String.prototype.includes",function(d){return d?d:function(d,t){return-1!==$jscomp.checkStringArgs(this,d,"includes").indexOf(d,t||0)}},"es6","es3");
-(function(d){function F(){return{theme:"striped",styles:{},headerStyles:{},bodyStyles:{},alternateRowStyles:{},columnStyles:{},startY:!1,margin:40,pageBreak:"auto",tableWidth:"auto",createdHeaderCell:function(d,t){},createdCell:function(d,t){},drawHeaderRow:function(d,t){},drawRow:function(d,t){},drawHeaderCell:function(d,t){},drawCell:function(d,t){},beforePageContent:function(d){},afterPageContent:function(d){}}}d.fn.tableExport=function(lb){function W(a){var c=[];P(a,"thead").each(function(){c.push.apply(c,
+(function(d){function F(){return{theme:"striped",styles:{},headerStyles:{},bodyStyles:{},alternateRowStyles:{},columnStyles:{},startY:!1,margin:40,pageBreak:"auto",tableWidth:"auto",createdHeaderCell:function(d,t){},createdCell:function(d,t){},drawHeaderRow:function(d,t){},drawRow:function(d,t){},drawHeaderCell:function(d,t){},drawCell:function(d,t){},beforePageContent:function(d){},afterPageContent:function(d){}}}d.fn.tableExport=function(mb){function W(a){var c=[];P(a,"thead").each(function(){c.push.apply(c,
 P(d(this),b.theadSelector).toArray())});return c}function X(a){var c=[];P(a,"tbody").each(function(){c.push.apply(c,P(d(this),b.tbodySelector).toArray())});b.tfootSelector.length&&P(a,"tfoot").each(function(){c.push.apply(c,P(d(this),b.tfootSelector).toArray())});return c}function P(a,c){var b=a[0].tagName,h=a.parents(b).length;return a.find(c).filter(function(){return h===d(this).closest(b).parents(b).length})}function xa(a){var c=[],b=0,h=0,f=0;d(a).find("thead").first().find("th").each(function(a,
-e){a=void 0!==d(e).attr("data-field");"undefined"!==typeof e.parentNode.rowIndex&&h!==e.parentNode.rowIndex&&(h=e.parentNode.rowIndex,b=f=0);var g=Y(e);for(b+=g?g:1;f<b;)c[f]=a?d(e).attr("data-field"):f.toString(),f++});return c}function O(a){var c="undefined"!==typeof a[0].rowIndex,b=!1===c&&"undefined"!==typeof a[0].cellIndex,h=b||c?mb(a):a.is(":visible"),f=a.attr("data-tableexport-display");b&&"none"!==f&&"always"!==f&&(a=d(a[0].parentNode),c="undefined"!==typeof a[0].rowIndex,f=a.attr("data-tableexport-display"));
-c&&"none"!==f&&"always"!==f&&(f=a.closest("table").attr("data-tableexport-display"));return"none"!==f&&(!0===h||"always"===f)}function mb(a){var c=[];ja&&(c=Q.filter(function(){var c=!1;this.nodeType===a[0].nodeType&&("undefined"!==typeof this.rowIndex&&this.rowIndex===a[0].rowIndex?c=!0:"undefined"!==typeof this.cellIndex&&this.cellIndex===a[0].cellIndex&&"undefined"!==typeof this.parentNode.rowIndex&&"undefined"!==typeof a[0].parentNode.rowIndex&&this.parentNode.rowIndex===a[0].parentNode.rowIndex&&
-(c=!0));return c}));return!1===ja||0===c.length}function Wa(a,c,e){var h=!1;O(a)?0<b.ignoreColumn.length&&(-1!==d.inArray(e,b.ignoreColumn)||-1!==d.inArray(e-c,b.ignoreColumn)||fa.length>e&&"undefined"!==typeof fa[e]&&-1!==d.inArray(fa[e],b.ignoreColumn))&&(h=!0):h=!0;return h}function I(a,c,e,h,f){if("function"===typeof f){var w=!1;"function"===typeof b.onIgnoreRow&&(w=b.onIgnoreRow(d(a),e));if(!1===w&&(0===b.ignoreRow.length||-1===d.inArray(e,b.ignoreRow)&&-1===d.inArray(e-h,b.ignoreRow))&&O(d(a))){a=
-P(d(a),c);var m=a.length,g=0,p=0;a.each(function(){var a=d(this),c=Y(this),b=ka(this),h;d.each(N,function(){if(e>this.s.r&&e<=this.e.r&&g>=this.s.c&&g<=this.e.c)for(h=0;h<=this.e.c-this.s.c;++h)m++,p++,f(null,e,g++)});if(b||c)c=c||1,N.push({s:{r:e,c:g},e:{r:e+(b||1)-1,c:g+c-1}});!1===Wa(a,m,p++)&&f(this,e,g++);if(1<c)for(h=0;h<c-1;++h)p++,f(null,e,g++)});d.each(N,function(){if(e>=this.s.r&&e<=this.e.r&&g>=this.s.c&&g<=this.e.c)for(var a=0;a<=this.e.c-this.s.c;++a)f(null,e,g++)})}}}function Xa(a,c,
-b,h){if("undefined"!==typeof h.images&&(b=h.images[b],"undefined"!==typeof b)){c=c.getBoundingClientRect();var e=a.width/a.height,d=c.width/c.height,m=a.width,g=a.height,p=19.049976/25.4,B=0;d<=e?(g=Math.min(a.height,c.height),m=c.width*g/c.height):d>e&&(m=Math.min(a.width,c.width),g=c.height*m/c.width);m*=p;g*=p;g<a.height&&(B=(a.height-g)/2);try{h.doc.addImage(b.src,a.textPos.x,a.y+B,m,g)}catch(A){}a.textPos.x+=m}}function Ya(a,c){if("string"===b.outputMode)return a.output();if("base64"===b.outputMode)return R(a.output());
-if("window"===b.outputMode)window.URL=window.URL||window.webkitURL,window.open(window.URL.createObjectURL(a.output("blob")));else{var e=b.fileName+".pdf";try{var d=a.output("blob");saveAs(d,e);if("function"===typeof b.onAfterSaveToFile)b.onAfterSaveToFile(d,e)}catch(f){Ga(e,"data:application/pdf"+(c?"":";base64")+",",c?a.output("blob"):a.output())}}}function Za(a,c,b){var e=0;"undefined"!==typeof b&&(e=b.colspan);if(0<=e){for(var d=a.width,w=a.textPos.x,m=c.table.columns.indexOf(c.column),g=1;g<e;g++)d+=
-c.table.columns[m+g].width;1<e&&("right"===a.styles.halign?w=a.textPos.x+d-a.width:"center"===a.styles.halign&&(w=a.textPos.x+(d-a.width)/2));a.width=d;a.textPos.x=w;"undefined"!==typeof b&&1<b.rowspan&&(a.height*=b.rowspan);if("middle"===a.styles.valign||"bottom"===a.styles.valign)b=("string"===typeof a.text?a.text.split(/\r\n|\r|\n/g):a.text).length||1,2<b&&(a.textPos.y-=(2-1.15)/2*c.row.styles.fontSize*(b-2)/3);return!0}return!1}function $a(a,c,b){"undefined"!==typeof a&&null!==a&&(a.hasAttribute("data-tableexport-canvas")?
-(c=(new Date).getTime(),d(a).attr("data-tableexport-canvas",c),b.images[c]={url:'[data-tableexport-canvas="'+c+'"]',src:null}):"undefined"!==c&&null!=c&&c.each(function(){if(d(this).is("img")){var c=ab(this.src);b.images[c]={url:this.src,src:this.src}}$a(a,d(this).children(),b)}))}function nb(a,c){function b(a){if(a.url)if(a.src){var b=new Image;h=++f;b.crossOrigin="Anonymous";b.onerror=b.onload=function(){if(b.complete&&(0===b.src.indexOf("data:image/")&&(b.width=a.width||b.width||0,b.height=a.height||
-b.height||0),b.width+b.height)){var e=document.createElement("canvas"),d=e.getContext("2d");e.width=b.width;e.height=b.height;d.drawImage(b,0,0);a.src=e.toDataURL("image/png")}--f||c(h)};b.src=a.url}else{var e=d(a.url);e.length&&(h=++f,html2canvas(e[0]).then(function(b){a.src=b.toDataURL("image/png");--f||c(h)}))}}var h=0,f=0;if("undefined"!==typeof a.images)for(var w in a.images)a.images.hasOwnProperty(w)&&b(a.images[w]);(a=f)||(c(h),a=void 0);return a}function bb(a,c,e){c.each(function(){if(d(this).is("div")){var c=
-ya(J(this,"background-color"),[255,255,255]),f=ya(J(this,"border-top-color"),[0,0,0]),w=cb(this,"border-top-width",b.jspdf.unit),m=this.getBoundingClientRect(),g=this.offsetLeft*e.wScaleFactor,p=this.offsetTop*e.hScaleFactor,B=m.width*e.wScaleFactor;m=m.height*e.hScaleFactor;e.doc.setDrawColor.apply(void 0,f);e.doc.setFillColor.apply(void 0,c);e.doc.setLineWidth(w);e.doc.rect(a.x+g,a.y+p,B,m,w?"FD":"F")}else d(this).is("img")&&(c=ab(this.src),Xa(a,this,c,e));bb(a,d(this).children(),e)})}function db(a,
-c,e){if("function"===typeof e.onAutotableText)e.onAutotableText(e.doc,a,c);else{var h=a.textPos.x,f=a.textPos.y,w={halign:a.styles.halign,valign:a.styles.valign};if(c.length){for(c=c[0];c.previousSibling;)c=c.previousSibling;for(var m=!1,g=!1;c;){var p=c.innerText||c.textContent||"",B=p.length&&" "===p[0]?" ":"",A=1<p.length&&" "===p[p.length-1]?" ":"";!0!==b.preserve.leadingWS&&(p=B+Ha(p));!0!==b.preserve.trailingWS&&(p=Ia(p)+A);d(c).is("br")&&(h=a.textPos.x,f+=e.doc.internal.getFontSize());d(c).is("b")?
-m=!0:d(c).is("i")&&(g=!0);(m||g)&&e.doc.setFont("undefined ",m&&g?"bolditalic":m?"bold":"italic");if(B=e.doc.getStringUnitWidth(p)*e.doc.internal.getFontSize()){"linebreak"===a.styles.overflow&&h>a.textPos.x&&h+B>a.textPos.x+a.width&&(0<=".,!%*;:=-".indexOf(p.charAt(0))&&(A=p.charAt(0),B=e.doc.getStringUnitWidth(A)*e.doc.internal.getFontSize(),h+B<=a.textPos.x+a.width&&(za(A,h,f,w),p=p.substring(1,p.length)),B=e.doc.getStringUnitWidth(p)*e.doc.internal.getFontSize()),h=a.textPos.x,f+=e.doc.internal.getFontSize());
-if("visible"!==a.styles.overflow)for(;p.length&&h+B>a.textPos.x+a.width;)p=p.substring(0,p.length-1),B=e.doc.getStringUnitWidth(p)*e.doc.internal.getFontSize();za(p,h,f,w);h+=B}if(m||g)d(c).is("b")?m=!1:d(c).is("i")&&(g=!1),e.doc.setFont("undefined ",m||g?m?"bold":"italic":"normal");c=c.nextSibling}a.textPos.x=h;a.textPos.y=f}else za(a.text,a.textPos.x,a.textPos.y,w)}}function la(a,c,b){return null==a?"":a.toString().replace(new RegExp(null==c?"":c.toString().replace(/([.*+?^=!:${}()|\[\]\/\\])/g,
-"\\$1"),"g"),b)}function Ha(a){return null==a?"":a.toString().replace(/^\s+/,"")}function Ia(a){return null==a?"":a.toString().replace(/\s+$/,"")}function ob(a){if(0===b.date.html.length)return!1;b.date.pattern.lastIndex=0;var c=b.date.pattern.exec(a);if(null==c)return!1;a=+c[b.date.match_y];if(0>a||8099<a)return!1;var e=1*c[b.date.match_m];c=1*c[b.date.match_d];if(!isFinite(c))return!1;var d=new Date(a,e-1,c,0,0,0);return d.getFullYear()===a&&d.getMonth()===e-1&&d.getDate()===c?new Date(Date.UTC(a,
-e-1,c,0,0,0)):!1}function Ja(a){a=a||"0";""!==b.numbers.html.thousandsSeparator&&(a=la(a,b.numbers.html.thousandsSeparator,""));"."!==b.numbers.html.decimalMark&&(a=la(a,b.numbers.html.decimalMark,"."));return"number"===typeof a||!1!==jQuery.isNumeric(a)?a:!1}function pb(a){-1<a.indexOf("%")?(a=Ja(a.replace(/%/g,"")),!1!==a&&(a/=100)):a=!1;return a}function G(a,c,e,h){var f="",w="text";if(null!==a){var m=d(a);m.removeData("teUserDefText");if(m[0].hasAttribute("data-tableexport-canvas"))var g="";else if(m[0].hasAttribute("data-tableexport-value"))g=
-(g=m.attr("data-tableexport-value"))?g+"":"",m.data("teUserDefText",1);else if(g=m.html(),"function"===typeof b.onCellHtmlData)g=b.onCellHtmlData(m,c,e,g),m.data("teUserDefText",1);else if(""!==g){a=d.parseHTML("<div>"+g+"</div>",null,!1);var p=0,B=0;g="";d.each(a,function(){if(d(this).is("input"))g+=m.find("input").eq(p++).val();else if(d(this).is("select"))g+=m.find("select option:selected").eq(B++).text();else if(d(this).is("br"))g+="<br>";else{if("undefined"===typeof d(this).html())g+=d(this).text();
-else if(void 0===jQuery().bootstrapTable||!1===d(this).hasClass("fht-cell")&&!1===d(this).hasClass("filterControl")&&0===m.parents(".detail-view").length)g+=d(this).html();if(d(this).is("a")){var a=m.find("a").attr("href")||"";f="function"===typeof b.onCellHtmlHyperlink?f+b.onCellHtmlHyperlink(m,c,e,a,g):"href"===b.htmlHyperlink?f+a:f+g;g=""}}})}if(g&&""!==g&&!0===b.htmlContent)f=d.trim(g);else if(g&&""!==g)if(""!==m.attr("data-tableexport-cellformat")){var A=g.replace(/\n/g,"\u2028").replace(/(<\s*br([^>]*)>)/gi,
-"\u2060"),k=d("<div/>").html(A).contents();a=!1;A="";d.each(k.text().split("\u2028"),function(a,c){0<a&&(A+=" ");!0!==b.preserve.leadingWS&&(c=Ha(c));A+=!0!==b.preserve.trailingWS?Ia(c):c});d.each(A.split("\u2060"),function(a,c){0<a&&(f+="\n");!0!==b.preserve.leadingWS&&(c=Ha(c));!0!==b.preserve.trailingWS&&(c=Ia(c));f+=c.replace(/\u00AD/g,"")});f=f.replace(/\u00A0/g," ");if("json"===b.type||"excel"===b.type&&"xmlss"===b.mso.fileFormat||!1===b.numbers.output)a=Ja(f),!1!==a&&(w="number",f=Number(a));
-else if(b.numbers.html.decimalMark!==b.numbers.output.decimalMark||b.numbers.html.thousandsSeparator!==b.numbers.output.thousandsSeparator)if(a=Ja(f),!1!==a){k=(""+a.substr(0>a?1:0)).split(".");1===k.length&&(k[1]="");var l=3<k[0].length?k[0].length%3:0;w="number";f=(0>a?"-":"")+(b.numbers.output.thousandsSeparator?(l?k[0].substr(0,l)+b.numbers.output.thousandsSeparator:"")+k[0].substr(l).replace(/(\d{3})(?=\d)/g,"$1"+b.numbers.output.thousandsSeparator):k[0])+(k[1].length?b.numbers.output.decimalMark+
-k[1]:"")}}else f=g;!0===b.escape&&(f=escape(f));"function"===typeof b.onCellData&&(f=b.onCellData(m,c,e,f,w),m.data("teUserDefText",1))}void 0!==h&&(h.type=w);return f}function eb(a){return 0<a.length&&!0===b.preventInjection&&0<="=+-@".indexOf(a.charAt(0))?"'"+a:a}function qb(a,c,b){return c+"-"+b.toLowerCase()}function ya(a,c){(a=/^rgb\((\d{1,3}),\s*(\d{1,3}),\s*(\d{1,3})\)$/.exec(a))&&(c=[parseInt(a[1]),parseInt(a[2]),parseInt(a[3])]);return c}function Ka(a){var c=J(a,"text-align"),b=J(a,"font-weight"),
-d=J(a,"font-style"),f="";"start"===c&&(c="rtl"===J(a,"direction")?"right":"left");700<=b&&(f="bold");"italic"===d&&(f+=d);""===f&&(f="normal");c={style:{align:c,bcolor:ya(J(a,"background-color"),[255,255,255]),color:ya(J(a,"color"),[0,0,0]),fstyle:f},colspan:Y(a),rowspan:ka(a)};null!==a&&(a=a.getBoundingClientRect(),c.rect={width:a.width,height:a.height});return c}function Y(a){var c=d(a).attr("data-tableexport-colspan");"undefined"===typeof c&&d(a).is("[colspan]")&&(c=d(a).attr("colspan"));return parseInt(c)||
-0}function ka(a){var c=d(a).attr("data-tableexport-rowspan");"undefined"===typeof c&&d(a).is("[rowspan]")&&(c=d(a).attr("rowspan"));return parseInt(c)||0}function J(a,c){try{return window.getComputedStyle?(c=c.replace(/([a-z])([A-Z])/,qb),"object"===typeof a&&void 0!==a.nodeType?window.getComputedStyle(a,null).getPropertyValue(c):"object"===typeof a&&a.length?a.getPropertyValue(c):""):a.currentStyle?a.currentStyle[c]:a.style[c]}catch(e){}return""}function cb(a,c,b){c=J(a,c).match(/\d+/);if(null!==
-c){c=c[0];a=a.parentElement;var e=document.createElement("div");e.style.overflow="hidden";e.style.visibility="hidden";a.appendChild(e);e.style.width=100+b;b=100/e.offsetWidth;a.removeChild(e);return c*b}return 0}function rb(a){for(var c=new ArrayBuffer(a.length),b=new Uint8Array(c),d=0;d!==a.length;++d)b[d]=a.charCodeAt(d)&255;return c}function La(a){var c=a.c,b="";for(++c;c;c=Math.floor((c-1)/26))b=String.fromCharCode((c-1)%26+65)+b;return b+(""+(a.r+1))}function Ma(a,c){if("undefined"===typeof c||
-"number"===typeof c)return Ma(a.s,a.e);"string"!==typeof a&&(a=La(a));"string"!==typeof c&&(c=La(c));return a===c?a:a+":"+c}function fb(a,c){var b=Number(a);if(isFinite(b))return b;var d=1;""!==c.thousandsSeparator&&(a=a.replace(new RegExp("([\\d])"+c.thousandsSeparator+"([\\d])","g"),"$1$2"));"."!==c.decimalMark&&(a=a.replace(new RegExp("([\\d])"+c.decimalMark+"([\\d])","g"),"$1.$2"));a=a.replace(/[$]/g,"").replace(/[%]/g,function(){d*=100;return""});if(isFinite(b=Number(a)))return b/d;a=a.replace(/[(](.*)[)]/,
-function(a,c){d=-d;return c});return isFinite(b=Number(a))?b/d:b}function ab(a){var c=0,b;if(0===a.length)return c;var d=0;for(b=a.length;d<b;d++){var f=a.charCodeAt(d);c=(c<<5)-c+f;c|=0}return c}function S(a,c,d,h,f,w){var e=!0;"function"===typeof b.onBeforeSaveToFile&&(e=b.onBeforeSaveToFile(a,c,d,h,f),"boolean"!==typeof e&&(e=!0));if(e)try{if(gb=w?new Blob([String.fromCharCode(65279),[a]],{type:d+";charset="+h}):new Blob([a],{type:d+";charset="+h}),saveAs(gb,c,{autoBom:!1}),"function"===typeof b.onAfterSaveToFile)b.onAfterSaveToFile(a,
-c)}catch(g){Ga(c,"data:"+d+(h.length?";charset="+h:"")+(f.length?";"+f:"")+",",w?"\ufeff"+a:a)}}function Ga(a,c,d){var e=window.navigator.userAgent;if(!1!==a&&window.navigator.msSaveOrOpenBlob)window.navigator.msSaveOrOpenBlob(new Blob([d]),a);else if(!1!==a&&(0<e.indexOf("MSIE ")||e.match(/Trident.*rv\:11\./))){if(c=document.createElement("iframe")){document.body.appendChild(c);c.setAttribute("style","display:none");c.contentDocument.open("txt/plain","replace");c.contentDocument.write(d);c.contentDocument.close();
+e){a=void 0!==d(e).attr("data-field");"undefined"!==typeof e.parentNode.rowIndex&&h!==e.parentNode.rowIndex&&(h=e.parentNode.rowIndex,b=f=0);var g=Y(e);for(b+=g?g:1;f<b;)c[f]=a?d(e).attr("data-field"):f.toString(),f++});return c}function O(a){var c="undefined"!==typeof a[0].rowIndex,b=!1===c&&"undefined"!==typeof a[0].cellIndex,h=b||c?nb(a):a.is(":visible"),f=a.attr("data-tableexport-display");b&&"none"!==f&&"always"!==f&&(a=d(a[0].parentNode),c="undefined"!==typeof a[0].rowIndex,f=a.attr("data-tableexport-display"));
+c&&"none"!==f&&"always"!==f&&(f=a.closest("table").attr("data-tableexport-display"));return"none"!==f&&(!0===h||"always"===f)}function nb(a){var c=[];ia&&(c=Q.filter(function(){var c=!1;this.nodeType===a[0].nodeType&&("undefined"!==typeof this.rowIndex&&this.rowIndex===a[0].rowIndex?c=!0:"undefined"!==typeof this.cellIndex&&this.cellIndex===a[0].cellIndex&&"undefined"!==typeof this.parentNode.rowIndex&&"undefined"!==typeof a[0].parentNode.rowIndex&&this.parentNode.rowIndex===a[0].parentNode.rowIndex&&
+(c=!0));return c}));return!1===ia||0===c.length}function Xa(a,c,e){var h=!1;O(a)?0<b.ignoreColumn.length&&(-1!==d.inArray(e,b.ignoreColumn)||-1!==d.inArray(e-c,b.ignoreColumn)||fa.length>e&&"undefined"!==typeof fa[e]&&-1!==d.inArray(fa[e],b.ignoreColumn))&&(h=!0):h=!0;return h}function I(a,c,e,h,f){if("function"===typeof f){var w=!1;"function"===typeof b.onIgnoreRow&&(w=b.onIgnoreRow(d(a),e));if(!1===w&&(0===b.ignoreRow.length||-1===d.inArray(e,b.ignoreRow)&&-1===d.inArray(e-h,b.ignoreRow))&&O(d(a))){a=
+P(d(a),c);var l=a.length,g=0,p=0;a.each(function(){var a=d(this),c=Y(this),b=ja(this),h;d.each(N,function(){if(e>this.s.r&&e<=this.e.r&&g>=this.s.c&&g<=this.e.c)for(h=0;h<=this.e.c-this.s.c;++h)l++,p++,f(null,e,g++)});if(b||c)c=c||1,N.push({s:{r:e,c:g},e:{r:e+(b||1)-1,c:g+c-1}});!1===Xa(a,l,p++)&&f(this,e,g++);if(1<c)for(h=0;h<c-1;++h)p++,f(null,e,g++)});d.each(N,function(){if(e>=this.s.r&&e<=this.e.r&&g>=this.s.c&&g<=this.e.c)for(var a=0;a<=this.e.c-this.s.c;++a)f(null,e,g++)})}}}function Ya(a,c,
+b,h){if("undefined"!==typeof h.images&&(b=h.images[b],"undefined"!==typeof b)){c=c.getBoundingClientRect();var e=a.width/a.height,d=c.width/c.height,l=a.width,g=a.height,p=19.049976/25.4,C=0;d<=e?(g=Math.min(a.height,c.height),l=c.width*g/c.height):d>e&&(l=Math.min(a.width,c.width),g=c.height*l/c.width);l*=p;g*=p;g<a.height&&(C=(a.height-g)/2);try{h.doc.addImage(b.src,a.textPos.x,a.y+C,l,g)}catch(B){}a.textPos.x+=l}}function Za(a,c){if("string"===b.outputMode)return a.output();if("base64"===b.outputMode)return R(a.output());
+if("window"===b.outputMode)window.URL=window.URL||window.webkitURL,window.open(window.URL.createObjectURL(a.output("blob")));else{var e=b.fileName+".pdf";try{var d=a.output("blob");saveAs(d,e);if("function"===typeof b.onAfterSaveToFile)b.onAfterSaveToFile(d,e)}catch(f){Ha(e,"data:application/pdf"+(c?"":";base64")+",",c?a.output("blob"):a.output())}}}function $a(a,c,b){var e=0;"undefined"!==typeof b&&(e=b.colspan);if(0<=e){for(var d=a.width,w=a.textPos.x,l=c.table.columns.indexOf(c.column),g=1;g<e;g++)d+=
+c.table.columns[l+g].width;1<e&&("right"===a.styles.halign?w=a.textPos.x+d-a.width:"center"===a.styles.halign&&(w=a.textPos.x+(d-a.width)/2));a.width=d;a.textPos.x=w;"undefined"!==typeof b&&1<b.rowspan&&(a.height*=b.rowspan);if("middle"===a.styles.valign||"bottom"===a.styles.valign)b=("string"===typeof a.text?a.text.split(/\r\n|\r|\n/g):a.text).length||1,2<b&&(a.textPos.y-=(2-1.15)/2*c.row.styles.fontSize*(b-2)/3);return!0}return!1}function ab(a,c,b){"undefined"!==typeof a&&null!==a&&(a.hasAttribute("data-tableexport-canvas")?
+(c=(new Date).getTime(),d(a).attr("data-tableexport-canvas",c),b.images[c]={url:'[data-tableexport-canvas="'+c+'"]',src:null}):"undefined"!==c&&null!=c&&c.each(function(){if(d(this).is("img")){var c=bb(this.src);b.images[c]={url:this.src,src:this.src}}ab(a,d(this).children(),b)}))}function ob(a,c){function b(a){if(a.url)if(a.src){var b=new Image;h=++f;b.crossOrigin="Anonymous";b.onerror=b.onload=function(){if(b.complete&&(0===b.src.indexOf("data:image/")&&(b.width=a.width||b.width||0,b.height=a.height||
+b.height||0),b.width+b.height)){var e=document.createElement("canvas"),d=e.getContext("2d");e.width=b.width;e.height=b.height;d.drawImage(b,0,0);a.src=e.toDataURL("image/png")}--f||c(h)};b.src=a.url}else{var e=d(a.url);e.length&&(h=++f,html2canvas(e[0]).then(function(b){a.src=b.toDataURL("image/png");--f||c(h)}))}}var h=0,f=0;if("undefined"!==typeof a.images)for(var w in a.images)a.images.hasOwnProperty(w)&&b(a.images[w]);(a=f)||(c(h),a=void 0);return a}function cb(a,c,e){c.each(function(){if(d(this).is("div")){var c=
+ya(J(this,"background-color"),[255,255,255]),f=ya(J(this,"border-top-color"),[0,0,0]),w=db(this,"border-top-width",b.jspdf.unit),l=this.getBoundingClientRect(),g=this.offsetLeft*e.wScaleFactor,p=this.offsetTop*e.hScaleFactor,C=l.width*e.wScaleFactor;l=l.height*e.hScaleFactor;e.doc.setDrawColor.apply(void 0,f);e.doc.setFillColor.apply(void 0,c);e.doc.setLineWidth(w);e.doc.rect(a.x+g,a.y+p,C,l,w?"FD":"F")}else d(this).is("img")&&(c=bb(this.src),Ya(a,this,c,e));cb(a,d(this).children(),e)})}function eb(a,
+c,e){if("function"===typeof e.onAutotableText)e.onAutotableText(e.doc,a,c);else{var h=a.textPos.x,f=a.textPos.y,w={halign:a.styles.halign,valign:a.styles.valign};if(c.length){for(c=c[0];c.previousSibling;)c=c.previousSibling;for(var l=!1,g=!1;c;){var p=c.innerText||c.textContent||"",C=p.length&&" "===p[0]?" ":"",B=1<p.length&&" "===p[p.length-1]?" ":"";!0!==b.preserve.leadingWS&&(p=C+Ia(p));!0!==b.preserve.trailingWS&&(p=Ja(p)+B);d(c).is("br")&&(h=a.textPos.x,f+=e.doc.internal.getFontSize());d(c).is("b")?
+l=!0:d(c).is("i")&&(g=!0);(l||g)&&e.doc.setFont("undefined ",l&&g?"bolditalic":l?"bold":"italic");if(C=e.doc.getStringUnitWidth(p)*e.doc.internal.getFontSize()){"linebreak"===a.styles.overflow&&h>a.textPos.x&&h+C>a.textPos.x+a.width&&(0<=".,!%*;:=-".indexOf(p.charAt(0))&&(B=p.charAt(0),C=e.doc.getStringUnitWidth(B)*e.doc.internal.getFontSize(),h+C<=a.textPos.x+a.width&&(za(B,h,f,w),p=p.substring(1,p.length)),C=e.doc.getStringUnitWidth(p)*e.doc.internal.getFontSize()),h=a.textPos.x,f+=e.doc.internal.getFontSize());
+if("visible"!==a.styles.overflow)for(;p.length&&h+C>a.textPos.x+a.width;)p=p.substring(0,p.length-1),C=e.doc.getStringUnitWidth(p)*e.doc.internal.getFontSize();za(p,h,f,w);h+=C}if(l||g)d(c).is("b")?l=!1:d(c).is("i")&&(g=!1),e.doc.setFont("undefined ",l||g?l?"bold":"italic":"normal");c=c.nextSibling}a.textPos.x=h;a.textPos.y=f}else za(a.text,a.textPos.x,a.textPos.y,w)}}function ka(a,c,b){return null==a?"":a.toString().replace(new RegExp(null==c?"":c.toString().replace(/([.*+?^=!:${}()|\[\]\/\\])/g,
+"\\$1"),"g"),b)}function Ia(a){return null==a?"":a.toString().replace(/^\s+/,"")}function Ja(a){return null==a?"":a.toString().replace(/\s+$/,"")}function pb(a){if(0===b.date.html.length)return!1;b.date.pattern.lastIndex=0;var c=b.date.pattern.exec(a);if(null==c)return!1;a=+c[b.date.match_y];if(0>a||8099<a)return!1;var e=1*c[b.date.match_m];c=1*c[b.date.match_d];if(!isFinite(c))return!1;var d=new Date(a,e-1,c,0,0,0);return d.getFullYear()===a&&d.getMonth()===e-1&&d.getDate()===c?new Date(Date.UTC(a,
+e-1,c,0,0,0)):!1}function Ka(a){a=a||"0";""!==b.numbers.html.thousandsSeparator&&(a=ka(a,b.numbers.html.thousandsSeparator,""));"."!==b.numbers.html.decimalMark&&(a=ka(a,b.numbers.html.decimalMark,"."));return"number"===typeof a||!1!==jQuery.isNumeric(a)?a:!1}function qb(a){-1<a.indexOf("%")?(a=Ka(a.replace(/%/g,"")),!1!==a&&(a/=100)):a=!1;return a}function G(a,c,e,h){var f="",w="text";if(null!==a){var l=d(a);l.removeData("teUserDefText");if(l[0].hasAttribute("data-tableexport-canvas"))var g="";else if(l[0].hasAttribute("data-tableexport-value"))g=
+(g=l.attr("data-tableexport-value"))?g+"":"",l.data("teUserDefText",1);else if(g=l.html(),"function"===typeof b.onCellHtmlData)g=b.onCellHtmlData(l,c,e,g),l.data("teUserDefText",1);else if(""!==g){a=d.parseHTML("<div>"+g+"</div>",null,!1);var p=0,C=0;g="";d.each(a,function(){if(d(this).is("input"))g+=l.find("input").eq(p++).val();else if(d(this).is("select"))g+=l.find("select option:selected").eq(C++).text();else if(d(this).is("br"))g+="<br>";else{if("undefined"===typeof d(this).html())g+=d(this).text();
+else if(void 0===jQuery().bootstrapTable||!1===d(this).hasClass("fht-cell")&&!1===d(this).hasClass("filterControl")&&0===l.parents(".detail-view").length)g+=d(this).html();if(d(this).is("a")){var a=l.find("a").attr("href")||"";f="function"===typeof b.onCellHtmlHyperlink?f+b.onCellHtmlHyperlink(l,c,e,a,g):"href"===b.htmlHyperlink?f+a:f+g;g=""}}})}if(g&&""!==g&&!0===b.htmlContent)f=d.trim(g);else if(g&&""!==g)if(""!==l.attr("data-tableexport-cellformat")){var B=g.replace(/\n/g,"\u2028").replace(/(<\s*br([^>]*)>)/gi,
+"\u2060"),k=d("<div/>").html(B).contents();a=!1;B="";d.each(k.text().split("\u2028"),function(a,c){0<a&&(B+=" ");!0!==b.preserve.leadingWS&&(c=Ia(c));B+=!0!==b.preserve.trailingWS?Ja(c):c});d.each(B.split("\u2060"),function(a,c){0<a&&(f+="\n");!0!==b.preserve.leadingWS&&(c=Ia(c));!0!==b.preserve.trailingWS&&(c=Ja(c));f+=c.replace(/\u00AD/g,"")});f=f.replace(/\u00A0/g," ");if("json"===b.type||"excel"===b.type&&"xmlss"===b.mso.fileFormat||!1===b.numbers.output)a=Ka(f),!1!==a&&(w="number",f=Number(a));
+else if(b.numbers.html.decimalMark!==b.numbers.output.decimalMark||b.numbers.html.thousandsSeparator!==b.numbers.output.thousandsSeparator)if(a=Ka(f),!1!==a){k=(""+a.substr(0>a?1:0)).split(".");1===k.length&&(k[1]="");var Ga=3<k[0].length?k[0].length%3:0;w="number";f=(0>a?"-":"")+(b.numbers.output.thousandsSeparator?(Ga?k[0].substr(0,Ga)+b.numbers.output.thousandsSeparator:"")+k[0].substr(Ga).replace(/(\d{3})(?=\d)/g,"$1"+b.numbers.output.thousandsSeparator):k[0])+(k[1].length?b.numbers.output.decimalMark+
+k[1]:"")}}else f=g;!0===b.escape&&(f=escape(f));"function"===typeof b.onCellData&&(f=b.onCellData(l,c,e,f,w),l.data("teUserDefText",1))}void 0!==h&&(h.type=w);return f}function fb(a){return 0<a.length&&!0===b.preventInjection&&0<="=+-@".indexOf(a.charAt(0))?"'"+a:a}function rb(a,c,b){return c+"-"+b.toLowerCase()}function ya(a,c){(a=/^rgb\((\d{1,3}),\s*(\d{1,3}),\s*(\d{1,3})\)$/.exec(a))&&(c=[parseInt(a[1]),parseInt(a[2]),parseInt(a[3])]);return c}function La(a){var c=J(a,"text-align"),b=J(a,"font-weight"),
+d=J(a,"font-style"),f="";"start"===c&&(c="rtl"===J(a,"direction")?"right":"left");700<=b&&(f="bold");"italic"===d&&(f+=d);""===f&&(f="normal");c={style:{align:c,bcolor:ya(J(a,"background-color"),[255,255,255]),color:ya(J(a,"color"),[0,0,0]),fstyle:f},colspan:Y(a),rowspan:ja(a)};null!==a&&(a=a.getBoundingClientRect(),c.rect={width:a.width,height:a.height});return c}function Y(a){var c=d(a).attr("data-tableexport-colspan");"undefined"===typeof c&&d(a).is("[colspan]")&&(c=d(a).attr("colspan"));return parseInt(c)||
+0}function ja(a){var c=d(a).attr("data-tableexport-rowspan");"undefined"===typeof c&&d(a).is("[rowspan]")&&(c=d(a).attr("rowspan"));return parseInt(c)||0}function J(a,c){try{return window.getComputedStyle?(c=c.replace(/([a-z])([A-Z])/,rb),"object"===typeof a&&void 0!==a.nodeType?window.getComputedStyle(a,null).getPropertyValue(c):"object"===typeof a&&a.length?a.getPropertyValue(c):""):a.currentStyle?a.currentStyle[c]:a.style[c]}catch(e){}return""}function db(a,c,b){c=J(a,c).match(/\d+/);if(null!==
+c){c=c[0];a=a.parentElement;var e=document.createElement("div");e.style.overflow="hidden";e.style.visibility="hidden";a.appendChild(e);e.style.width=100+b;b=100/e.offsetWidth;a.removeChild(e);return c*b}return 0}function sb(a){for(var c=new ArrayBuffer(a.length),b=new Uint8Array(c),d=0;d!==a.length;++d)b[d]=a.charCodeAt(d)&255;return c}function Ma(a){var c=a.c,b="";for(++c;c;c=Math.floor((c-1)/26))b=String.fromCharCode((c-1)%26+65)+b;return b+(""+(a.r+1))}function Na(a,c){if("undefined"===typeof c||
+"number"===typeof c)return Na(a.s,a.e);"string"!==typeof a&&(a=Ma(a));"string"!==typeof c&&(c=Ma(c));return a===c?a:a+":"+c}function gb(a,c){var b=Number(a);if(isFinite(b))return b;var d=1;""!==c.thousandsSeparator&&(a=a.replace(new RegExp("([\\d])"+c.thousandsSeparator+"([\\d])","g"),"$1$2"));"."!==c.decimalMark&&(a=a.replace(new RegExp("([\\d])"+c.decimalMark+"([\\d])","g"),"$1.$2"));a=a.replace(/[$]/g,"").replace(/[%]/g,function(){d*=100;return""});if(isFinite(b=Number(a)))return b/d;a=a.replace(/[(](.*)[)]/,
+function(a,c){d=-d;return c});return isFinite(b=Number(a))?b/d:b}function bb(a){var c=0,b;if(0===a.length)return c;var d=0;for(b=a.length;d<b;d++){var f=a.charCodeAt(d);c=(c<<5)-c+f;c|=0}return c}function S(a,c,d,h,f,w){var e=!0;"function"===typeof b.onBeforeSaveToFile&&(e=b.onBeforeSaveToFile(a,c,d,h,f),"boolean"!==typeof e&&(e=!0));if(e)try{if(hb=w?new Blob([String.fromCharCode(65279),[a]],{type:d+";charset="+h}):new Blob([a],{type:d+";charset="+h}),saveAs(hb,c,{autoBom:!1}),"function"===typeof b.onAfterSaveToFile)b.onAfterSaveToFile(a,
+c)}catch(g){Ha(c,"data:"+d+(h.length?";charset="+h:"")+(f.length?";"+f:"")+",",w?"\ufeff"+a:a)}}function Ha(a,c,d){var e=window.navigator.userAgent;if(!1!==a&&window.navigator.msSaveOrOpenBlob)window.navigator.msSaveOrOpenBlob(new Blob([d]),a);else if(!1!==a&&(0<e.indexOf("MSIE ")||e.match(/Trident.*rv\:11\./))){if(c=document.createElement("iframe")){document.body.appendChild(c);c.setAttribute("style","display:none");c.contentDocument.open("txt/plain","replace");c.contentDocument.write(d);c.contentDocument.close();
 c.contentWindow.focus();switch(a.substr(a.lastIndexOf(".")+1)){case "doc":case "json":case "png":case "pdf":case "xls":case "xlsx":a+=".txt"}c.contentDocument.execCommand("SaveAs",!0,a);document.body.removeChild(c)}}else{var f=document.createElement("a");if(f){var w=null;f.style.display="none";!1!==a?f.download=a:f.target="_blank";"object"===typeof d?(window.URL=window.URL||window.webkitURL,e=[],e.push(d),w=window.URL.createObjectURL(new Blob(e,{type:c})),f.href=w):0<=c.toLowerCase().indexOf("base64,")?
 f.href=c+R(d):f.href=c+encodeURIComponent(d);document.body.appendChild(f);if(document.createEvent)null===Aa&&(Aa=document.createEvent("MouseEvents")),Aa.initEvent("click",!0,!1),f.dispatchEvent(Aa);else if(document.createEventObject)f.fireEvent("onclick");else if("function"===typeof f.onclick)f.onclick();setTimeout(function(){w&&window.URL.revokeObjectURL(w);document.body.removeChild(f);if("function"===typeof b.onAfterSaveToFile)b.onAfterSaveToFile(d,a)},100)}}}function R(a){var c,b="",d=0;if("string"===
-typeof a){a=a.replace(/\x0d\x0a/g,"\n");var f="";for(c=0;c<a.length;c++){var w=a.charCodeAt(c);128>w?f+=String.fromCharCode(w):(127<w&&2048>w?f+=String.fromCharCode(w>>6|192):(f+=String.fromCharCode(w>>12|224),f+=String.fromCharCode(w>>6&63|128)),f+=String.fromCharCode(w&63|128))}a=f}for(;d<a.length;){var m=a.charCodeAt(d++);f=a.charCodeAt(d++);c=a.charCodeAt(d++);w=m>>2;m=(m&3)<<4|f>>4;var g=(f&15)<<2|c>>6;var p=c&63;isNaN(f)?g=p=64:isNaN(c)&&(p=64);b=b+"ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=".charAt(w)+
-"ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=".charAt(m)+"ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=".charAt(g)+"ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=".charAt(p)}return b}function sb(a,c,b,d){c&&"object"===typeof c||console.error("The headers should be an object or array, is: "+typeof c);b&&"object"===typeof b||console.error("The data should be an object or array, is: "+typeof b);d&&"object"!==typeof d&&console.error("The data should be an object or array, is: "+
-typeof b);Array.prototype.forEach||console.error("The current browser does not support Array.prototype.forEach which is required for jsPDF-AutoTable");x=a;l=tb(d||{});Na=1;H={y:!1===l.startY?l.margin.top:l.startY};a={textColor:30,fontSize:x.internal.getFontSize(),fontStyle:x.internal.getFont().fontStyle,fontName:x.internal.getFont().fontName};ub(c,b);vb();c=l.startY+l.margin.bottom+q.headerRow.height+(q.rows[0]&&"auto"===l.pageBreak?q.rows[0].height:0);"avoid"===l.pageBreak&&(c+=q.height);if("always"===
-l.pageBreak&&!1!==l.startY||!1!==l.startY&&c>x.internal.pageSize.height)x.addPage(),H.y=l.margin.top;ma(a);l.beforePageContent(T());!1!==l.drawHeaderRow(q.headerRow,T({row:q.headerRow}))&&Oa(q.headerRow,l.drawHeaderCell);ma(a);wb();l.afterPageContent(T());ma(a);return x}function za(a,c,b,d){"number"===typeof c&&"number"===typeof b||console.error("The x and y parameters are required. Missing for the text: ",a);var e=x.internal.getFontSize()/x.internal.scaleFactor,h=/\r\n|\r|\n/g,m=null,g=1;if("middle"===
-d.valign||"bottom"===d.valign||"center"===d.halign||"right"===d.halign)m="string"===typeof a?a.split(h):a,g=m.length||1;b+=e*(2-1.15);"middle"===d.valign?b-=g/2*e:"bottom"===d.valign&&(b-=g*e);if("center"===d.halign||"right"===d.halign){h=e;"center"===d.halign&&(h*=.5);if(m&&1<=g){for(a=0;a<m.length;a++)x.text(m[a],c-x.getStringUnitWidth(m[a])*h,b),b+=e;return x}c-=x.getStringUnitWidth(a)*h}x.text(a,c,b);return x}function tb(a){var c=Z(F(),a);"undefined"!==typeof c.extendWidth&&(c.tableWidth=c.extendWidth?
+typeof a){a=a.replace(/\x0d\x0a/g,"\n");var f="";for(c=0;c<a.length;c++){var w=a.charCodeAt(c);128>w?f+=String.fromCharCode(w):(127<w&&2048>w?f+=String.fromCharCode(w>>6|192):(f+=String.fromCharCode(w>>12|224),f+=String.fromCharCode(w>>6&63|128)),f+=String.fromCharCode(w&63|128))}a=f}for(;d<a.length;){var l=a.charCodeAt(d++);f=a.charCodeAt(d++);c=a.charCodeAt(d++);w=l>>2;l=(l&3)<<4|f>>4;var g=(f&15)<<2|c>>6;var p=c&63;isNaN(f)?g=p=64:isNaN(c)&&(p=64);b=b+"ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=".charAt(w)+
+"ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=".charAt(l)+"ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=".charAt(g)+"ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=".charAt(p)}return b}function tb(a,c,b,d){c&&"object"===typeof c||console.error("The headers should be an object or array, is: "+typeof c);b&&"object"===typeof b||console.error("The data should be an object or array, is: "+typeof b);d&&"object"!==typeof d&&console.error("The data should be an object or array, is: "+
+typeof b);Array.prototype.forEach||console.error("The current browser does not support Array.prototype.forEach which is required for jsPDF-AutoTable");x=a;m=ub(d||{});Oa=1;H={y:!1===m.startY?m.margin.top:m.startY};a={textColor:30,fontSize:x.internal.getFontSize(),fontStyle:x.internal.getFont().fontStyle,fontName:x.internal.getFont().fontName};vb(c,b);wb();c=m.startY+m.margin.bottom+q.headerRow.height+(q.rows[0]&&"auto"===m.pageBreak?q.rows[0].height:0);"avoid"===m.pageBreak&&(c+=q.height);if("always"===
+m.pageBreak&&!1!==m.startY||!1!==m.startY&&c>x.internal.pageSize.height)x.addPage(),H.y=m.margin.top;la(a);m.beforePageContent(T());!1!==m.drawHeaderRow(q.headerRow,T({row:q.headerRow}))&&Pa(q.headerRow,m.drawHeaderCell);la(a);xb();m.afterPageContent(T());la(a);return x}function za(a,c,b,d){"number"===typeof c&&"number"===typeof b||console.error("The x and y parameters are required. Missing for the text: ",a);var e=x.internal.getFontSize()/x.internal.scaleFactor,h=/\r\n|\r|\n/g,l=null,g=1;if("middle"===
+d.valign||"bottom"===d.valign||"center"===d.halign||"right"===d.halign)l="string"===typeof a?a.split(h):a,g=l.length||1;b+=e*(2-1.15);"middle"===d.valign?b-=g/2*e:"bottom"===d.valign&&(b-=g*e);if("center"===d.halign||"right"===d.halign){h=e;"center"===d.halign&&(h*=.5);if(l&&1<=g){for(a=0;a<l.length;a++)x.text(l[a],c-x.getStringUnitWidth(l[a])*h,b),b+=e;return x}c-=x.getStringUnitWidth(a)*h}x.text(a,c,b);return x}function ub(a){var c=Z(F(),a);"undefined"!==typeof c.extendWidth&&(c.tableWidth=c.extendWidth?
 "auto":"wrap",console.error("Use of deprecated option: extendWidth, use tableWidth instead."));"undefined"!==typeof c.margins&&("undefined"===typeof c.margin&&(c.margin=c.margins),console.error("Use of deprecated option: margins, use margin instead."));[["padding","cellPadding"],["lineHeight","rowHeight"],"fontSize","overflow"].forEach(function(a){var b="string"===typeof a?a:a[0];a="string"===typeof a?a:a[1];"undefined"!==typeof c[b]&&("undefined"===typeof c.styles[a]&&(c.styles[a]=c[b]),console.error("Use of deprecated option: "+
-b+", use the style "+a+" instead."))});var b=c.margin;c.margin={};"number"===typeof b.horizontal&&(b.right=b.horizontal,b.left=b.horizontal);"number"===typeof b.vertical&&(b.top=b.vertical,b.bottom=b.vertical);["top","right","bottom","left"].forEach(function(a,d){"number"===typeof b?c.margin[a]=b:(d=Array.isArray(b)?d:a,c.margin[a]="number"===typeof b[d]?b[d]:40)});return c}function ub(a,b){q=new t;q.x=l.margin.left;var c=/\r\n|\r|\n/g,h=new D(a);h.index=-1;var f=Z(Ba,pa[l.theme].table,pa[l.theme].header);
-h.styles=Z(f,l.styles,l.headerStyles);a.forEach(function(a,b){"object"===typeof a&&(b="undefined"!==typeof a.dataKey?a.dataKey:a.key);"undefined"!==typeof a.width&&console.error("Use of deprecated option: column.width, use column.styles.columnWidth instead.");var g=new wa(b);g.styles=l.columnStyles[g.dataKey]||{};q.columns.push(g);var e=new K;e.raw="object"===typeof a?a.title:a;e.styles=d.extend({},h.styles);e.text=""+e.raw;e.contentWidth=2*e.styles.cellPadding+Ca(e.text,e.styles);e.text=e.text.split(c);
-h.cells[b]=e;l.createdHeaderCell(e,{column:g,row:h,settings:l})});q.headerRow=h;b.forEach(function(a,b){var d=new D(a),e=0===b%2,f=Z(Ba,pa[l.theme].table,e?pa[l.theme].alternateRow:{});e=Z(l.styles,l.bodyStyles,e?l.alternateRowStyles:{});d.styles=Z(f,e);d.index=b;q.columns.forEach(function(b){var g=new K;g.raw=a[b.dataKey];g.styles=Z(d.styles,b.styles);g.text="undefined"!==typeof g.raw?""+g.raw:"";d.cells[b.dataKey]=g;l.createdCell(g,T({column:b,row:d}));g.contentWidth=2*g.styles.cellPadding+Ca(g.text,
-g.styles);g.text=g.text.split(c)});q.rows.push(d)})}function vb(){var a=0;q.columns.forEach(function(b){b.contentWidth=q.headerRow.cells[b.dataKey].contentWidth;q.rows.forEach(function(a){a=a.cells[b.dataKey].contentWidth;a>b.contentWidth&&(b.contentWidth=a)});b.width=b.contentWidth;a+=b.contentWidth});q.contentWidth=a;var b=x.internal.pageSize.width-l.margin.left-l.margin.right,d=b;"number"===typeof l.tableWidth?d=l.tableWidth:"wrap"===l.tableWidth&&(d=q.contentWidth);q.width=d<b?d:b;var h=[],f=
-0,k=q.width/q.columns.length,m=0;q.columns.forEach(function(a){var b=Z(Ba,pa[l.theme].table,l.styles,a.styles);"wrap"===b.columnWidth?a.width=a.contentWidth:"number"===typeof b.columnWidth?a.width=b.columnWidth:a.contentWidth<=k&&q.contentWidth>q.width?a.width=a.contentWidth:(h.push(a),f+=a.contentWidth,a.width=0);m+=a.width});hb(h,m,f,k);q.height=0;q.rows.concat(q.headerRow).forEach(function(a,b){var c=0,d=q.x;q.columns.forEach(function(b){var e=a.cells[b.dataKey];b.x=d;ma(e.styles);var g=b.width-
-2*e.styles.cellPadding;"linebreak"===e.styles.overflow?e.text=x.splitTextToSize(e.text,g+1,{fontSize:e.styles.fontSize}):"ellipsize"===e.styles.overflow?e.text=Pa(e.text,g,e.styles):"visible"!==e.styles.overflow&&("hidden"===e.styles.overflow?e.text=Pa(e.text,g,e.styles,""):"function"===typeof e.styles.overflow?e.text=e.styles.overflow(e.text,g):console.error("Unrecognized overflow type: "+e.styles.overflow));e=Array.isArray(e.text)?e.text.length-1:0;e>c&&(c=e);d+=b.width});a.heightStyle=a.styles.rowHeight;
-a.height=a.heightStyle+c*a.styles.fontSize*1.15+(2-1.15)/2*a.styles.fontSize;q.height+=a.height})}function hb(a,b,d,h){for(var c=q.width-b-d,e=0;e<a.length;e++){var m=a[e],g=m.contentWidth/d,p=m.contentWidth+c*g<h;if(0>c&&p){a.splice(e,1);d-=m.contentWidth;m.width=h;b+=m.width;hb(a,b,d,h);break}else m.width=m.contentWidth+c*g}}function wb(){q.rows.forEach(function(a,b){H.y+a.height+l.margin.bottom>=x.internal.pageSize.height&&(l.afterPageContent(T()),x.addPage(),Na++,H={x:l.margin.left,y:l.margin.top},
-l.beforePageContent(T()),!1!==l.drawHeaderRow(q.headerRow,T({row:q.headerRow}))&&Oa(q.headerRow,l.drawHeaderCell));a.y=H.y;!1!==l.drawRow(a,T({row:a}))&&Oa(a,l.drawCell)})}function Oa(a,b){for(var c=0;c<q.columns.length;c++){var d=q.columns[c],f=a.cells[d.dataKey];f&&(ma(f.styles),f.x=d.x,f.y=H.y,f.height=a.height,f.width=d.width,f.textPos.y="top"===f.styles.valign?H.y+f.styles.cellPadding:"bottom"===f.styles.valign?H.y+a.height-f.styles.cellPadding:H.y+a.height/2,f.textPos.x="right"===f.styles.halign?
-f.x+f.width-f.styles.cellPadding:"center"===f.styles.halign?f.x+f.width/2:f.x+f.styles.cellPadding,d=T({column:d,row:a}),!1!==b(f,d)&&(x.rect(f.x,f.y,f.width,f.height,f.styles.fillStyle),za(f.text,f.textPos.x,f.textPos.y,{halign:f.styles.halign,valign:f.styles.valign})))}H.y+=a.height}function ma(a){[{func:x.setFillColor,value:a.fillColor},{func:x.setTextColor,value:a.textColor},{func:x.setFont,value:a.font,style:a.fontStyle},{func:x.setDrawColor,value:a.lineColor},{func:x.setLineWidth,value:a.lineWidth},
-{func:x.setFont,value:a.font},{func:x.setFontSize,value:a.fontSize}].forEach(function(a){"undefined"!==typeof a.value&&(a.value.constructor===Array?a.func.apply(x,a.value):"undefined"!==typeof a.style?a.func(a.value,a.style):a.func(a.value))})}function T(a){a=a||{};var b={pageCount:Na,settings:l,table:q,cursor:H},d;for(d in a)a.hasOwnProperty(d)&&(b[d]=a[d]);return b}function Pa(a,b,d,h){h="undefined"!==typeof h?h:"...";if(Array.isArray(a))return a.forEach(function(c,e){a[e]=Pa(c,b,d,h)}),a;if(b>=
-Ca(a,d))return a;for(;b<Ca(a+h,d)&&!(2>a.length);)a=a.substring(0,a.length-1);return a.trim()+h}function Ca(a,b){ma(b);return x.getStringUnitWidth(a)*b.fontSize}function Z(a){var b={},d;for(d in a)a.hasOwnProperty(d)&&(b[d]=a[d]);for(var h=1;h<arguments.length;h++){var f=arguments[h];for(d in f)f.hasOwnProperty(d)&&(b[d]=f[d])}return b}var L,b={csvEnclosure:'"',csvSeparator:",",csvUseBOM:!0,date:{html:"dd/mm/yyyy"},displayTableName:!1,escape:!1,exportHiddenCells:!1,fileName:"tableExport",htmlContent:!1,
+b+", use the style "+a+" instead."))});var b=c.margin;c.margin={};"number"===typeof b.horizontal&&(b.right=b.horizontal,b.left=b.horizontal);"number"===typeof b.vertical&&(b.top=b.vertical,b.bottom=b.vertical);["top","right","bottom","left"].forEach(function(a,d){"number"===typeof b?c.margin[a]=b:(d=Array.isArray(b)?d:a,c.margin[a]="number"===typeof b[d]?b[d]:40)});return c}function vb(a,b){q=new t;q.x=m.margin.left;var c=/\r\n|\r|\n/g,h=new D(a);h.index=-1;var f=Z(Ba,pa[m.theme].table,pa[m.theme].header);
+h.styles=Z(f,m.styles,m.headerStyles);a.forEach(function(a,b){"object"===typeof a&&(b="undefined"!==typeof a.dataKey?a.dataKey:a.key);"undefined"!==typeof a.width&&console.error("Use of deprecated option: column.width, use column.styles.columnWidth instead.");var g=new wa(b);g.styles=m.columnStyles[g.dataKey]||{};q.columns.push(g);var e=new K;e.raw="object"===typeof a?a.title:a;e.styles=d.extend({},h.styles);e.text=""+e.raw;e.contentWidth=2*e.styles.cellPadding+Ca(e.text,e.styles);e.text=e.text.split(c);
+h.cells[b]=e;m.createdHeaderCell(e,{column:g,row:h,settings:m})});q.headerRow=h;b.forEach(function(a,b){var d=new D(a),e=0===b%2,f=Z(Ba,pa[m.theme].table,e?pa[m.theme].alternateRow:{});e=Z(m.styles,m.bodyStyles,e?m.alternateRowStyles:{});d.styles=Z(f,e);d.index=b;q.columns.forEach(function(b){var e=new K;e.raw=a[b.dataKey];e.styles=Z(d.styles,b.styles);e.text="undefined"!==typeof e.raw?""+e.raw:"";d.cells[b.dataKey]=e;m.createdCell(e,T({column:b,row:d}));e.contentWidth=2*e.styles.cellPadding+Ca(e.text,
+e.styles);e.text=e.text.split(c)});q.rows.push(d)})}function wb(){var a=0;q.columns.forEach(function(b){b.contentWidth=q.headerRow.cells[b.dataKey].contentWidth;q.rows.forEach(function(a){a=a.cells[b.dataKey].contentWidth;a>b.contentWidth&&(b.contentWidth=a)});b.width=b.contentWidth;a+=b.contentWidth});q.contentWidth=a;var b=x.internal.pageSize.width-m.margin.left-m.margin.right,d=b;"number"===typeof m.tableWidth?d=m.tableWidth:"wrap"===m.tableWidth&&(d=q.contentWidth);q.width=d<b?d:b;var h=[],f=
+0,k=q.width/q.columns.length,l=0;q.columns.forEach(function(a){var b=Z(Ba,pa[m.theme].table,m.styles,a.styles);"wrap"===b.columnWidth?a.width=a.contentWidth:"number"===typeof b.columnWidth?a.width=b.columnWidth:a.contentWidth<=k&&q.contentWidth>q.width?a.width=a.contentWidth:(h.push(a),f+=a.contentWidth,a.width=0);l+=a.width});ib(h,l,f,k);q.height=0;q.rows.concat(q.headerRow).forEach(function(a,b){var c=0,d=q.x;q.columns.forEach(function(b){var e=a.cells[b.dataKey];b.x=d;la(e.styles);var g=b.width-
+2*e.styles.cellPadding;"linebreak"===e.styles.overflow?e.text=x.splitTextToSize(e.text,g+1,{fontSize:e.styles.fontSize}):"ellipsize"===e.styles.overflow?e.text=Qa(e.text,g,e.styles):"visible"!==e.styles.overflow&&("hidden"===e.styles.overflow?e.text=Qa(e.text,g,e.styles,""):"function"===typeof e.styles.overflow?e.text=e.styles.overflow(e.text,g):console.error("Unrecognized overflow type: "+e.styles.overflow));e=Array.isArray(e.text)?e.text.length-1:0;e>c&&(c=e);d+=b.width});a.heightStyle=a.styles.rowHeight;
+a.height=a.heightStyle+c*a.styles.fontSize*1.15+(2-1.15)/2*a.styles.fontSize;q.height+=a.height})}function ib(a,b,d,h){for(var c=q.width-b-d,e=0;e<a.length;e++){var l=a[e],g=l.contentWidth/d,p=l.contentWidth+c*g<h;if(0>c&&p){a.splice(e,1);d-=l.contentWidth;l.width=h;b+=l.width;ib(a,b,d,h);break}else l.width=l.contentWidth+c*g}}function xb(){q.rows.forEach(function(a,b){H.y+a.height+m.margin.bottom>=x.internal.pageSize.height&&(m.afterPageContent(T()),x.addPage(),Oa++,H={x:m.margin.left,y:m.margin.top},
+m.beforePageContent(T()),!1!==m.drawHeaderRow(q.headerRow,T({row:q.headerRow}))&&Pa(q.headerRow,m.drawHeaderCell));a.y=H.y;!1!==m.drawRow(a,T({row:a}))&&Pa(a,m.drawCell)})}function Pa(a,b){for(var c=0;c<q.columns.length;c++){var d=q.columns[c],f=a.cells[d.dataKey];f&&(la(f.styles),f.x=d.x,f.y=H.y,f.height=a.height,f.width=d.width,f.textPos.y="top"===f.styles.valign?H.y+f.styles.cellPadding:"bottom"===f.styles.valign?H.y+a.height-f.styles.cellPadding:H.y+a.height/2,f.textPos.x="right"===f.styles.halign?
+f.x+f.width-f.styles.cellPadding:"center"===f.styles.halign?f.x+f.width/2:f.x+f.styles.cellPadding,d=T({column:d,row:a}),!1!==b(f,d)&&(x.rect(f.x,f.y,f.width,f.height,f.styles.fillStyle),za(f.text,f.textPos.x,f.textPos.y,{halign:f.styles.halign,valign:f.styles.valign})))}H.y+=a.height}function la(a){[{func:x.setFillColor,value:a.fillColor},{func:x.setTextColor,value:a.textColor},{func:x.setFont,value:a.font,style:a.fontStyle},{func:x.setDrawColor,value:a.lineColor},{func:x.setLineWidth,value:a.lineWidth},
+{func:x.setFont,value:a.font},{func:x.setFontSize,value:a.fontSize}].forEach(function(a){"undefined"!==typeof a.value&&(a.value.constructor===Array?a.func.apply(x,a.value):"undefined"!==typeof a.style?a.func(a.value,a.style):a.func(a.value))})}function T(a){a=a||{};var b={pageCount:Oa,settings:m,table:q,cursor:H},d;for(d in a)a.hasOwnProperty(d)&&(b[d]=a[d]);return b}function Qa(a,b,d,h){h="undefined"!==typeof h?h:"...";if(Array.isArray(a))return a.forEach(function(c,e){a[e]=Qa(c,b,d,h)}),a;if(b>=
+Ca(a,d))return a;for(;b<Ca(a+h,d)&&!(2>a.length);)a=a.substring(0,a.length-1);return a.trim()+h}function Ca(a,b){la(b);return x.getStringUnitWidth(a)*b.fontSize}function Z(a){var b={},d;for(d in a)a.hasOwnProperty(d)&&(b[d]=a[d]);for(var h=1;h<arguments.length;h++){var f=arguments[h];for(d in f)f.hasOwnProperty(d)&&(b[d]=f[d])}return b}var L,b={csvEnclosure:'"',csvSeparator:",",csvUseBOM:!0,date:{html:"dd/mm/yyyy"},displayTableName:!1,escape:!1,exportHiddenCells:!1,fileName:"tableExport",htmlContent:!1,
 htmlHyperlink:"content",ignoreColumn:[],ignoreRow:[],jsonScope:"all",jspdf:{orientation:"p",unit:"pt",format:"a4",margins:{left:20,right:10,top:10,bottom:10},onDocCreated:null,autotable:{styles:{cellPadding:2,rowHeight:12,fontSize:8,fillColor:255,textColor:50,fontStyle:"normal",overflow:"ellipsize",halign:"inherit",valign:"middle"},headerStyles:{fillColor:[52,73,94],textColor:255,fontStyle:"bold",halign:"inherit",valign:"middle"},alternateRowStyles:{fillColor:245},tableExport:{doc:null,onAfterAutotable:null,
 onBeforeAutotable:null,onAutotableText:null,onTable:null,outputImages:!0}}},mso:{fileFormat:"xlshtml",onMsoNumberFormat:null,pageFormat:"a4",pageOrientation:"portrait",rtl:!1,styles:[],worksheetName:"",xlsx:{formatId:{date:14,numbers:2,currency:164},format:{currency:"$#,##0.00;[Red]-$#,##0.00"},onHyperlink:null}},numbers:{html:{decimalMark:".",thousandsSeparator:","},output:{decimalMark:".",thousandsSeparator:","}},onAfterSaveToFile:null,onBeforeSaveToFile:null,onCellData:null,onCellHtmlData:null,
 onCellHtmlHyperlink:null,onIgnoreRow:null,onTableExportBegin:null,onTableExportEnd:null,outputMode:"file",pdfmake:{enabled:!1,docDefinition:{pageSize:"A4",pageOrientation:"portrait",styles:{header:{background:"#34495E",color:"#FFFFFF",bold:!0,alignment:"center",fillColor:"#34495E"},alternateRow:{fillColor:"#f5f5f5"}},defaultStyle:{color:"#000000",fontSize:8,font:"Roboto"}},fonts:{},widths:"*"},preserve:{leadingWS:!1,trailingWS:!1},preventInjection:!0,sql:{tableEnclosure:"`",columnEnclosure:"`"},tbodySelector:"tr",
 tfootSelector:"tr",theadSelector:"tr",tableName:"Table",type:"csv"},U={a0:[2383.94,3370.39],a1:[1683.78,2383.94],a2:[1190.55,1683.78],a3:[841.89,1190.55],a4:[595.28,841.89],a5:[419.53,595.28],a6:[297.64,419.53],a7:[209.76,297.64],a8:[147.4,209.76],a9:[104.88,147.4],a10:[73.7,104.88],b0:[2834.65,4008.19],b1:[2004.09,2834.65],b2:[1417.32,2004.09],b3:[1000.63,1417.32],b4:[708.66,1000.63],b5:[498.9,708.66],b6:[354.33,498.9],b7:[249.45,354.33],b8:[175.75,249.45],b9:[124.72,175.75],b10:[87.87,124.72],c0:[2599.37,
 3676.54],c1:[1836.85,2599.37],c2:[1298.27,1836.85],c3:[918.43,1298.27],c4:[649.13,918.43],c5:[459.21,649.13],c6:[323.15,459.21],c7:[229.61,323.15],c8:[161.57,229.61],c9:[113.39,161.57],c10:[79.37,113.39],dl:[311.81,623.62],letter:[612,792],"government-letter":[576,756],legal:[612,1008],"junior-legal":[576,360],ledger:[1224,792],tabloid:[792,1224],"credit-card":[153,243]},pa={striped:{table:{fillColor:255,textColor:80,fontStyle:"normal",fillStyle:"F"},header:{textColor:255,fillColor:[41,128,185],rowHeight:23,
 fontStyle:"bold"},body:{},alternateRow:{fillColor:245}},grid:{table:{fillColor:255,textColor:80,fontStyle:"normal",lineWidth:.1,fillStyle:"DF"},header:{textColor:255,fillColor:[26,188,156],rowHeight:23,fillStyle:"F",fontStyle:"bold"},body:{},alternateRow:{}},plain:{header:{fontStyle:"bold"}}},Ba={cellPadding:5,fontSize:10,fontName:"helvetica",lineColor:200,lineWidth:.1,fontStyle:"normal",overflow:"ellipsize",fillColor:255,textColor:20,halign:"left",valign:"top",fillStyle:"F",rowHeight:20,columnWidth:"auto"},
-v=this,Aa=null,z=[],y=[],r=0,u="",fa=[],N=[],gb,Q=[],ja=!1;d.extend(!0,b,lb);"xlsx"===b.type&&(b.mso.fileFormat=b.type,b.type="excel");"undefined"!==typeof b.excelFileFormat&&"undefined"===typeof b.mso.fileFormat&&(b.mso.fileFormat=b.excelFileFormat);"undefined"!==typeof b.excelPageFormat&&"undefined"===typeof b.mso.pageFormat&&(b.mso.pageFormat=b.excelPageFormat);"undefined"!==typeof b.excelPageOrientation&&"undefined"===typeof b.mso.pageOrientation&&(b.mso.pageOrientation=b.excelPageOrientation);
+v=this,Aa=null,z=[],y=[],r=0,u="",fa=[],N=[],hb,Q=[],ia=!1;d.extend(!0,b,mb);"xlsx"===b.type&&(b.mso.fileFormat=b.type,b.type="excel");"undefined"!==typeof b.excelFileFormat&&"undefined"===typeof b.mso.fileFormat&&(b.mso.fileFormat=b.excelFileFormat);"undefined"!==typeof b.excelPageFormat&&"undefined"===typeof b.mso.pageFormat&&(b.mso.pageFormat=b.excelPageFormat);"undefined"!==typeof b.excelPageOrientation&&"undefined"===typeof b.mso.pageOrientation&&(b.mso.pageOrientation=b.excelPageOrientation);
 "undefined"!==typeof b.excelRTL&&"undefined"===typeof b.mso.rtl&&(b.mso.rtl=b.excelRTL);"undefined"!==typeof b.excelstyles&&"undefined"===typeof b.mso.styles&&(b.mso.styles=b.excelstyles);"undefined"!==typeof b.onMsoNumberFormat&&"undefined"===typeof b.mso.onMsoNumberFormat&&(b.mso.onMsoNumberFormat=b.onMsoNumberFormat);"undefined"!==typeof b.worksheetName&&"undefined"===typeof b.mso.worksheetName&&(b.mso.worksheetName=b.worksheetName);"undefined"!==typeof b.mso.xslx&&"undefined"===typeof b.mso.xlsx&&
-(b.mso.xlsx=b.mso.xslx);b.mso.pageOrientation="l"===b.mso.pageOrientation.substr(0,1)?"landscape":"portrait";b.date.html=b.date.html||"";if(b.date.html.length){var ha=[];ha.dd="(3[01]|[12][0-9]|0?[1-9])";ha.mm="(1[012]|0?[1-9])";ha.yyyy="((?:1[6-9]|2[0-2])\\d{2})";ha.yy="(\\d{2})";var xb=b.date.html.match(/[^a-zA-Z0-9]/)[0],aa=b.date.html.toLowerCase().split(xb);b.date.regex="^\\s*";b.date.regex+=ha[aa[0]];b.date.regex+="(.)";b.date.regex+=ha[aa[1]];b.date.regex+="\\2";b.date.regex+=ha[aa[2]];b.date.regex+=
-"\\s*$";b.date.pattern=new RegExp(b.date.regex,"g");var ba=aa.indexOf("dd")+1;b.date.match_d=ba+(1<ba?1:0);ba=aa.indexOf("mm")+1;b.date.match_m=ba+(1<ba?1:0);ba=(0<=aa.indexOf("yyyy")?aa.indexOf("yyyy"):aa.indexOf("yy"))+1;b.date.match_y=ba+(1<ba?1:0)}fa=xa(v);if("function"===typeof b.onTableExportBegin)b.onTableExportBegin();if("csv"===b.type||"tsv"===b.type||"txt"===b.type){var ca="",qa=0;N=[];r=0;var Qa=function(a,c,e){a.each(function(){u="";I(this,c,r,e+a.length,function(a,c,d){var e=u,g="";if(null!==
-a)if(a=G(a,c,d),c=null===a||""===a?"":a.toString(),"tsv"===b.type)a instanceof Date&&a.toLocaleString(),g=la(c,"\t"," ");else if(a instanceof Date)g=b.csvEnclosure+a.toLocaleString()+b.csvEnclosure;else if(g=eb(c),g=la(g,b.csvEnclosure,b.csvEnclosure+b.csvEnclosure),0<=g.indexOf(b.csvSeparator)||/[\r\n ]/g.test(g))g=b.csvEnclosure+g+b.csvEnclosure;u=e+(g+("tsv"===b.type?"\t":b.csvSeparator))});u=d.trim(u).substring(0,u.length-1);0<u.length&&(0<ca.length&&(ca+="\n"),ca+=u);r++});return a.length};qa+=
-Qa(d(v).find("thead").first().find(b.theadSelector),"th,td",qa);P(d(v),"tbody").each(function(){qa+=Qa(P(d(this),b.tbodySelector),"td,th",qa)});b.tfootSelector.length&&Qa(d(v).find("tfoot").first().find(b.tfootSelector),"td,th",qa);ca+="\n";if("string"===b.outputMode)return ca;if("base64"===b.outputMode)return R(ca);if("window"===b.outputMode){Ga(!1,"data:text/"+("csv"===b.type?"csv":"plain")+";charset=utf-8,",ca);return}S(ca,b.fileName+"."+b.type,"text/"+("csv"===b.type?"csv":"plain"),"utf-8","",
-"csv"===b.type&&b.csvUseBOM)}else if("sql"===b.type){r=0;N=[];var E="INSERT INTO "+b.sql.tableEnclosure+b.tableName+b.sql.tableEnclosure+" (";z=W(d(v));d(z).each(function(){I(this,"th,td",r,z.length,function(a,c,d){a=G(a,c,d)||"";-1<a.indexOf(b.sql.columnEnclosure)&&(a=la(a.toString(),b.sql.columnEnclosure,b.sql.columnEnclosure+b.sql.columnEnclosure));E+=b.sql.columnEnclosure+a+b.sql.columnEnclosure+","});r++;E=d.trim(E).substring(0,E.length-1)});E+=") VALUES ";y=X(d(v));d(y).each(function(){u="";
-I(this,"td,th",r,z.length+y.length,function(a,b,d){a=G(a,b,d)||"";-1<a.indexOf("'")&&(a=la(a.toString(),"'","''"));u+="'"+a+"',"});3<u.length&&(E+="("+u,E=d.trim(E).substring(0,E.length-1),E+="),");r++});E=d.trim(E).substring(0,E.length-1);E+=";";if("string"===b.outputMode)return E;if("base64"===b.outputMode)return R(E);S(E,b.fileName+".sql","application/sql","utf-8","",!1)}else if("json"===b.type){var na=[];N=[];z=W(d(v));d(z).each(function(){var a=[];I(this,"th,td",r,z.length,function(b,d,h){a.push(G(b,
-d,h))});na.push(a)});var Ra=[];y=X(d(v));d(y).each(function(){var a={},b=0;I(this,"td,th",r,z.length+y.length,function(c,d,f){na.length?a[na[na.length-1][b]]=G(c,d,f):a[b]=G(c,d,f);b++});!1===d.isEmptyObject(a)&&Ra.push(a);r++});var Sa="head"===b.jsonScope?JSON.stringify(na):"data"===b.jsonScope?JSON.stringify(Ra):JSON.stringify({header:na,data:Ra});if("string"===b.outputMode)return Sa;if("base64"===b.outputMode)return R(Sa);S(Sa,b.fileName+".json","application/json","utf-8","base64",!1)}else if("xml"===
-b.type){r=0;N=[];var da='<?xml version="1.0" encoding="utf-8"?>';da+="<tabledata><fields>";z=W(d(v));d(z).each(function(){I(this,"th,td",r,z.length,function(a,b,d){da+="<field>"+G(a,b,d)+"</field>"});r++});da+="</fields><data>";var ib=1;y=X(d(v));d(y).each(function(){var a=1;u="";I(this,"td,th",r,z.length+y.length,function(b,d,h){u+="<column-"+a+">"+G(b,d,h)+"</column-"+a+">";a++});0<u.length&&"<column-1></column-1>"!==u&&(da+='<row id="'+ib+'">'+u+"</row>",ib++);r++});da+="</data></tabledata>";if("string"===
-b.outputMode)return da;if("base64"===b.outputMode)return R(da);S(da,b.fileName+".xml","application/xml","utf-8","base64",!1)}else if("excel"===b.type&&"xmlss"===b.mso.fileFormat){var Ta=[],M=[];d(v).filter(function(){return O(d(this))}).each(function(){function a(a,b,c){var e=[];d(a).each(function(){var b=0,f=0;u="";I(this,"td,th",r,c+a.length,function(a,c,g){if(null!==a){var m="";c=G(a,c,g);g="String";if(!1!==jQuery.isNumeric(c))g="Number";else{var h=pb(c);!1!==h&&(c=h,g="Number",m+=' ss:StyleID="pct1"')}"Number"!==
-g&&(c=c.replace(/\n/g,"<br>"));h=Y(a);a=ka(a);d.each(e,function(){if(r>=this.s.r&&r<=this.e.r&&f>=this.s.c&&f<=this.e.c)for(var a=0;a<=this.e.c-this.s.c;++a)f++,b++});if(a||h)a=a||1,h=h||1,e.push({s:{r:r,c:f},e:{r:r+a-1,c:f+h-1}});1<h&&(m+=' ss:MergeAcross="'+(h-1)+'"',f+=h-1);1<a&&(m+=' ss:MergeDown="'+(a-1)+'" ss:StyleID="rsp1"');0<b&&(m+=' ss:Index="'+(f+1)+'"',b=0);u+="<Cell"+m+'><Data ss:Type="'+g+'">'+d("<div />").text(c).html()+"</Data></Cell>\r";f++}});0<u.length&&(L+='<Row ss:AutoFitHeight="0">\r'+
-u+"</Row>\r");r++});return a.length}var c=d(this),e="";"string"===typeof b.mso.worksheetName&&b.mso.worksheetName.length?e=b.mso.worksheetName+" "+(M.length+1):"undefined"!==typeof b.mso.worksheetName[M.length]&&(e=b.mso.worksheetName[M.length]);e.length||(e=c.find("caption").text()||"");e.length||(e="Table "+(M.length+1));e=d.trim(e.replace(/[\\\/[\]*:?'"]/g,"").substring(0,31));M.push(d("<div />").text(e).html());!1===b.exportHiddenCells&&(Q=c.find("tr, th, td").filter(":hidden"),ja=0<Q.length);
-r=0;fa=xa(this);L="<Table>\r";e=a(W(c),"th,td",0);a(X(c),"td,th",e);L+="</Table>\r";Ta.push(L)});for(var Da={},Ua={},ea,ra,oa=0,yb=M.length;oa<yb;oa++)ea=M[oa],ra=Da[ea],ra=Da[ea]=null==ra?1:ra+1,2===ra&&(M[Ua[ea]]=M[Ua[ea]].substring(0,29)+"-1"),1<Da[ea]?M[oa]=M[oa].substring(0,29)+"-"+Da[ea]:Ua[ea]=oa;for(var V='<?xml version="1.0" encoding="UTF-8"?>\r<?mso-application progid="Excel.Sheet"?>\r<Workbook xmlns="urn:schemas-microsoft-com:office:spreadsheet"\r xmlns:o="urn:schemas-microsoft-com:office:office"\r xmlns:x="urn:schemas-microsoft-com:office:excel"\r xmlns:ss="urn:schemas-microsoft-com:office:spreadsheet"\r xmlns:html="http://www.w3.org/TR/REC-html40">\r<DocumentProperties xmlns="urn:schemas-microsoft-com:office:office">\r  <Created>'+
+(b.mso.xlsx=b.mso.xslx);b.mso.pageOrientation="l"===b.mso.pageOrientation.substr(0,1)?"landscape":"portrait";b.date.html=b.date.html||"";if(b.date.html.length){var ha=[];ha.dd="(3[01]|[12][0-9]|0?[1-9])";ha.mm="(1[012]|0?[1-9])";ha.yyyy="((?:1[6-9]|2[0-2])\\d{2})";ha.yy="(\\d{2})";var yb=b.date.html.match(/[^a-zA-Z0-9]/)[0],aa=b.date.html.toLowerCase().split(yb);b.date.regex="^\\s*";b.date.regex+=ha[aa[0]];b.date.regex+="(.)";b.date.regex+=ha[aa[1]];b.date.regex+="\\2";b.date.regex+=ha[aa[2]];b.date.regex+=
+"\\s*$";b.date.pattern=new RegExp(b.date.regex,"g");var ba=aa.indexOf("dd")+1;b.date.match_d=ba+(1<ba?1:0);ba=aa.indexOf("mm")+1;b.date.match_m=ba+(1<ba?1:0);ba=(0<=aa.indexOf("yyyy")?aa.indexOf("yyyy"):aa.indexOf("yy"))+1;b.date.match_y=ba+(1<ba?1:0)}fa=xa(v);if("function"===typeof b.onTableExportBegin)b.onTableExportBegin();if("csv"===b.type||"tsv"===b.type||"txt"===b.type){var ca="",qa=0;N=[];r=0;var Ra=function(a,c,e){a.each(function(){u="";I(this,c,r,e+a.length,function(a,c,d){var e=u,g="";if(null!==
+a)if(a=G(a,c,d),c=null===a||""===a?"":a.toString(),"tsv"===b.type)a instanceof Date&&a.toLocaleString(),g=ka(c,"\t"," ");else if(a instanceof Date)g=b.csvEnclosure+a.toLocaleString()+b.csvEnclosure;else if(g=fb(c),g=ka(g,b.csvEnclosure,b.csvEnclosure+b.csvEnclosure),0<=g.indexOf(b.csvSeparator)||/[\r\n ]/g.test(g))g=b.csvEnclosure+g+b.csvEnclosure;u=e+(g+("tsv"===b.type?"\t":b.csvSeparator))});u=d.trim(u).substring(0,u.length-1);0<u.length&&(0<ca.length&&(ca+="\n"),ca+=u);r++});return a.length};qa+=
+Ra(d(v).find("thead").first().find(b.theadSelector),"th,td",qa);P(d(v),"tbody").each(function(){qa+=Ra(P(d(this),b.tbodySelector),"td,th",qa)});b.tfootSelector.length&&Ra(d(v).find("tfoot").first().find(b.tfootSelector),"td,th",qa);ca+="\n";if("string"===b.outputMode)return ca;if("base64"===b.outputMode)return R(ca);if("window"===b.outputMode){Ha(!1,"data:text/"+("csv"===b.type?"csv":"plain")+";charset=utf-8,",ca);return}S(ca,b.fileName+"."+b.type,"text/"+("csv"===b.type?"csv":"plain"),"utf-8","",
+"csv"===b.type&&b.csvUseBOM)}else if("sql"===b.type){r=0;N=[];var E="INSERT INTO "+b.sql.tableEnclosure+b.tableName+b.sql.tableEnclosure+" (";z=W(d(v));d(z).each(function(){I(this,"th,td",r,z.length,function(a,c,d){a=G(a,c,d)||"";-1<a.indexOf(b.sql.columnEnclosure)&&(a=ka(a.toString(),b.sql.columnEnclosure,b.sql.columnEnclosure+b.sql.columnEnclosure));E+=b.sql.columnEnclosure+a+b.sql.columnEnclosure+","});r++;E=d.trim(E).substring(0,E.length-1)});E+=") VALUES ";y=X(d(v));d(y).each(function(){u="";
+I(this,"td,th",r,z.length+y.length,function(a,b,d){a=G(a,b,d)||"";-1<a.indexOf("'")&&(a=ka(a.toString(),"'","''"));u+="'"+a+"',"});3<u.length&&(E+="("+u,E=d.trim(E).substring(0,E.length-1),E+="),");r++});E=d.trim(E).substring(0,E.length-1);E+=";";if("string"===b.outputMode)return E;if("base64"===b.outputMode)return R(E);S(E,b.fileName+".sql","application/sql","utf-8","",!1)}else if("json"===b.type){var ma=[];N=[];z=W(d(v));d(z).each(function(){var a=[];I(this,"th,td",r,z.length,function(b,d,h){a.push(G(b,
+d,h))});ma.push(a)});var Sa=[];y=X(d(v));d(y).each(function(){var a={},b=0;I(this,"td,th",r,z.length+y.length,function(c,d,f){ma.length?a[ma[ma.length-1][b]]=G(c,d,f):a[b]=G(c,d,f);b++});!1===d.isEmptyObject(a)&&Sa.push(a);r++});var Ta="head"===b.jsonScope?JSON.stringify(ma):"data"===b.jsonScope?JSON.stringify(Sa):JSON.stringify({header:ma,data:Sa});if("string"===b.outputMode)return Ta;if("base64"===b.outputMode)return R(Ta);S(Ta,b.fileName+".json","application/json","utf-8","base64",!1)}else if("xml"===
+b.type){r=0;N=[];var da='<?xml version="1.0" encoding="utf-8"?>';da+="<tabledata><fields>";z=W(d(v));d(z).each(function(){I(this,"th,td",r,z.length,function(a,b,d){da+="<field>"+G(a,b,d)+"</field>"});r++});da+="</fields><data>";var jb=1;y=X(d(v));d(y).each(function(){var a=1;u="";I(this,"td,th",r,z.length+y.length,function(b,d,h){u+="<column-"+a+">"+G(b,d,h)+"</column-"+a+">";a++});0<u.length&&"<column-1></column-1>"!==u&&(da+='<row id="'+jb+'">'+u+"</row>",jb++);r++});da+="</data></tabledata>";if("string"===
+b.outputMode)return da;if("base64"===b.outputMode)return R(da);S(da,b.fileName+".xml","application/xml","utf-8","base64",!1)}else if("excel"===b.type&&"xmlss"===b.mso.fileFormat){var Ua=[],M=[];d(v).filter(function(){return O(d(this))}).each(function(){function a(a,b,c){var e=[];d(a).each(function(){var b=0,f=0;u="";I(this,"td,th",r,c+a.length,function(a,c,g){if(null!==a){var l="";c=G(a,c,g);g="String";if(!1!==jQuery.isNumeric(c))g="Number";else{var h=qb(c);!1!==h&&(c=h,g="Number",l+=' ss:StyleID="pct1"')}"Number"!==
+g&&(c=c.replace(/\n/g,"<br>"));h=Y(a);a=ja(a);d.each(e,function(){if(r>=this.s.r&&r<=this.e.r&&f>=this.s.c&&f<=this.e.c)for(var a=0;a<=this.e.c-this.s.c;++a)f++,b++});if(a||h)a=a||1,h=h||1,e.push({s:{r:r,c:f},e:{r:r+a-1,c:f+h-1}});1<h&&(l+=' ss:MergeAcross="'+(h-1)+'"',f+=h-1);1<a&&(l+=' ss:MergeDown="'+(a-1)+'" ss:StyleID="rsp1"');0<b&&(l+=' ss:Index="'+(f+1)+'"',b=0);u+="<Cell"+l+'><Data ss:Type="'+g+'">'+d("<div />").text(c).html()+"</Data></Cell>\r";f++}});0<u.length&&(L+='<Row ss:AutoFitHeight="0">\r'+
+u+"</Row>\r");r++});return a.length}var c=d(this),e="";"string"===typeof b.mso.worksheetName&&b.mso.worksheetName.length?e=b.mso.worksheetName+" "+(M.length+1):"undefined"!==typeof b.mso.worksheetName[M.length]&&(e=b.mso.worksheetName[M.length]);e.length||(e=c.find("caption").text()||"");e.length||(e="Table "+(M.length+1));e=d.trim(e.replace(/[\\\/[\]*:?'"]/g,"").substring(0,31));M.push(d("<div />").text(e).html());!1===b.exportHiddenCells&&(Q=c.find("tr, th, td").filter(":hidden"),ia=0<Q.length);
+r=0;fa=xa(this);L="<Table>\r";e=a(W(c),"th,td",0);a(X(c),"td,th",e);L+="</Table>\r";Ua.push(L)});for(var Da={},Va={},ea,ra,na=0,zb=M.length;na<zb;na++)ea=M[na],ra=Da[ea],ra=Da[ea]=null==ra?1:ra+1,2===ra&&(M[Va[ea]]=M[Va[ea]].substring(0,29)+"-1"),1<Da[ea]?M[na]=M[na].substring(0,29)+"-"+Da[ea]:Va[ea]=na;for(var V='<?xml version="1.0" encoding="UTF-8"?>\r<?mso-application progid="Excel.Sheet"?>\r<Workbook xmlns="urn:schemas-microsoft-com:office:spreadsheet"\r xmlns:o="urn:schemas-microsoft-com:office:office"\r xmlns:x="urn:schemas-microsoft-com:office:excel"\r xmlns:ss="urn:schemas-microsoft-com:office:spreadsheet"\r xmlns:html="http://www.w3.org/TR/REC-html40">\r<DocumentProperties xmlns="urn:schemas-microsoft-com:office:office">\r  <Created>'+
 (new Date).toISOString()+'</Created>\r</DocumentProperties>\r<OfficeDocumentSettings xmlns="urn:schemas-microsoft-com:office:office">\r  <AllowPNG/>\r</OfficeDocumentSettings>\r<ExcelWorkbook xmlns="urn:schemas-microsoft-com:office:excel">\r  <WindowHeight>9000</WindowHeight>\r  <WindowWidth>13860</WindowWidth>\r  <WindowTopX>0</WindowTopX>\r  <WindowTopY>0</WindowTopY>\r  <ProtectStructure>False</ProtectStructure>\r  <ProtectWindows>False</ProtectWindows>\r</ExcelWorkbook>\r<Styles>\r  <Style ss:ID="Default" ss:Name="Normal">\r    <Alignment ss:Vertical="Bottom"/>\r    <Borders/>\r    <Font/>\r    <Interior/>\r    <NumberFormat/>\r    <Protection/>\r  </Style>\r  <Style ss:ID="rsp1">\r    <Alignment ss:Vertical="Center"/>\r  </Style>\r  <Style ss:ID="pct1">\r    <NumberFormat ss:Format="Percent"/>\r  </Style>\r</Styles>\r',
-Ea=0;Ea<Ta.length;Ea++)V+='<Worksheet ss:Name="'+M[Ea]+'" ss:RightToLeft="'+(b.mso.rtl?"1":"0")+'">\r'+Ta[Ea],V=b.mso.rtl?V+'<WorksheetOptions xmlns="urn:schemas-microsoft-com:office:excel">\r<DisplayRightToLeft/>\r</WorksheetOptions>\r':V+'<WorksheetOptions xmlns="urn:schemas-microsoft-com:office:excel"/>\r',V+="</Worksheet>\r";V+="</Workbook>\r";if("string"===b.outputMode)return V;if("base64"===b.outputMode)return R(V);S(V,b.fileName+".xml","application/xml","utf-8","base64",!1)}else if("excel"===
-b.type&&"xlsx"===b.mso.fileFormat){var sa=[],jb=XLSX.utils.book_new();d(v).filter(function(){return O(d(this))}).each(function(){for(var a=d(this),c,e={},h=this.getElementsByTagName("tr"),f=Math.min(1E7,h.length),k={s:{r:0,c:0},e:{r:0,c:0}},m=[],g,p=0,B=0,A,l,r,q,n,t=XLSX.SSF.get_table();p<h.length&&B<f;++p)if(A=h[p],l=!1,"function"===typeof b.onIgnoreRow&&(l=b.onIgnoreRow(d(A),p)),!0!==l&&(0===b.ignoreRow.length||-1===d.inArray(p,b.ignoreRow)&&-1===d.inArray(p-h.length,b.ignoreRow))&&!1!==O(d(A))){var u=
-A.children,z=0;for(A=0;A<u.length;++A)n=u[A],q=+Y(n)||1,z+=q;var x=0;for(A=l=0;A<u.length;++A)if(n=u[A],q=+Y(n)||1,g=A+x,!Wa(d(n),z,g+(g<l?l-g:0))){x+=q-1;for(g=0;g<m.length;++g){var C=m[g];C.s.c==l&&C.s.r<=B&&B<=C.e.r&&(l=C.e.c+1,g=-1)}(0<(r=+ka(n))||1<q)&&m.push({s:{r:B,c:l},e:{r:B+(r||1)-1,c:l+q-1}});var y={type:""};C=G(n,p,A+x,y);g={t:"s",v:C};var v="";if(""!==(d(n).attr("data-tableexport-cellformat")||void 0))if(c=parseInt(d(n).attr("data-tableexport-xlsxformatid")||0),0===c&&"function"===typeof b.mso.xlsx.formatId.numbers&&
-(c=b.mso.xlsx.formatId.numbers(d(n),p,A+x)),0===c&&"function"===typeof b.mso.xlsx.formatId.date&&(c=b.mso.xlsx.formatId.date(d(n),p,A+x)),49===c||"@"===c)v="s";else if("number"===y.type||0<c&&14>c||36<c&&41>c||48===c)v="n";else{if("date"===y.type||13<c&&37>c||44<c&&48>c||56===c)v="d"}else v="s";if(null!=C){if(0===C.length)g.t="z";else if(0!==C.trim().length&&"s"!==v)if("function"===y.type)g={f:C};else if("TRUE"===C)g={t:"b",v:!0};else if("FALSE"===C)g={t:"b",v:!1};else if("n"===v||isFinite(fb(C,b.numbers.output))){if(v=
-fb(C,b.numbers.output),0===c&&"function"!==typeof b.mso.xlsx.formatId.numbers&&(c=b.mso.xlsx.formatId.numbers),isFinite(v)||isFinite(C))g={t:"n",v:isFinite(v)?v:C,z:"string"===typeof c?c:c in t?t[c]:c===b.mso.xlsx.formatId.currency?b.mso.xlsx.format.currency:"0.00"}}else if(!1!==(y=ob(C))||"d"===v)0===c&&"function"!==typeof b.mso.xlsx.formatId.date&&(c=b.mso.xlsx.formatId.date),g={t:"d",v:!1!==y?y:C,z:"string"===typeof c?c:c in t?t[c]:"m/d/yy"};(v=d(n).find("a"))&&v.length&&(v=v[0].hasAttribute("href")?
-v.attr("href"):"",C="href"!==b.htmlHyperlink||""===v?C:"",y=""!==v?'=HYPERLINK("'+v+(C.length?'","'+C:"")+'")':"",""!==y&&("function"===typeof b.mso.xlsx.onHyperlink?(C=b.mso.xlsx.onHyperlink(d(n),p,A,v,C,y),g=0!==C.indexOf("=HYPERLINK")?{t:"s",v:C}:{f:C}):g={f:y}))}e[La({c:l,r:B})]=g;k.e.c<l&&(k.e.c=l);l+=q}++B}m.length&&(e["!merges"]=(e["!merges"]||[]).concat(m));k.e.r=Math.max(k.e.r,B-1);e["!ref"]=Ma(k);B>=f&&(e["!fullref"]=Ma((k.e.r=h.length-p+B-1,k)));c="";"string"===typeof b.mso.worksheetName&&
-b.mso.worksheetName.length?c=b.mso.worksheetName+" "+(sa.length+1):"undefined"!==typeof b.mso.worksheetName[sa.length]&&(c=b.mso.worksheetName[sa.length]);c.length||(c=a.find("caption").text()||"");c.length||(c="Table "+(sa.length+1));c=d.trim(c.replace(/[\\\/[\]*:?'"]/g,"").substring(0,31));sa.push(c);XLSX.utils.book_append_sheet(jb,e,c)});var zb=XLSX.write(jb,{type:"binary",bookType:b.mso.fileFormat,bookSST:!1});S(rb(zb),b.fileName+"."+b.mso.fileFormat,"application/vnd.openxmlformats-officedocument.spreadsheetml.sheet",
-"UTF-8","",!1)}else if("excel"===b.type||"xls"===b.type||"word"===b.type||"doc"===b.type){var ta="excel"===b.type||"xls"===b.type?"excel":"word",Ab="excel"===ta?"xls":"doc",Bb='xmlns:x="urn:schemas-microsoft-com:office:'+ta+'"',ua=L="";d(v).filter(function(){return O(d(this))}).each(function(){var a=d(this);""===ua&&(ua=b.mso.worksheetName||a.find("caption").text()||"Table",ua=d.trim(ua.replace(/[\\\/[\]*:?'"]/g,"").substring(0,31)));!1===b.exportHiddenCells&&(Q=a.find("tr, th, td").filter(":hidden"),
-ja=0<Q.length);r=0;N=[];fa=xa(this);L+="<table><thead>";z=W(a);d(z).each(function(){var a=d(this),e=document.defaultView.getComputedStyle(a[0],null);u="";I(this,"th,td",r,z.length,function(a,c,d){if(null!==a){var f="";u+="<th";if(b.mso.styles.length){var g=document.defaultView.getComputedStyle(a,null),h;for(h in b.mso.styles){var k=b.mso.styles[h],l=J(g,k);""===l&&(l=J(e,k));""!==l&&"0px none rgb(0, 0, 0)"!==l&&"rgba(0, 0, 0, 0)"!==l&&(f+=""===f?'style="':";",f+=k+":"+l)}}""!==f&&(u+=" "+f+'"');f=
-Y(a);0<f&&(u+=' colspan="'+f+'"');f=ka(a);0<f&&(u+=' rowspan="'+f+'"');u+=">"+G(a,c,d)+"</th>"}});0<u.length&&(L+="<tr>"+u+"</tr>");r++});L+="</thead><tbody>";y=X(a);d(y).each(function(){var a=d(this),e=null,h=null;u="";I(this,"td,th",r,z.length+y.length,function(c,k,m){if(null!==c){var g=G(c,k,m),f="",l=d(c).attr("data-tableexport-msonumberformat");"undefined"===typeof l&&"function"===typeof b.mso.onMsoNumberFormat&&(l=b.mso.onMsoNumberFormat(c,k,m));"undefined"!==typeof l&&""!==l&&(f="style=\"mso-number-format:'"+
-l+"'");if(b.mso.styles.length){e=document.defaultView.getComputedStyle(c,null);h=null;for(var n in b.mso.styles)k=b.mso.styles[n],l=J(e,k),""===l&&(null===h&&(h=document.defaultView.getComputedStyle(a[0],null)),l=J(h,k)),""!==l&&"0px none rgb(0, 0, 0)"!==l&&"rgba(0, 0, 0, 0)"!==l&&(f+=""===f?'style="':";",f+=k+":"+l)}u+="<td";""!==f&&(u+=" "+f+'"');f=Y(c);0<f&&(u+=' colspan="'+f+'"');c=ka(c);0<c&&(u+=' rowspan="'+c+'"');"string"===typeof g&&""!==g&&(g=eb(g),g=g.replace(/\n/g,"<br>"));u+=">"+g+"</td>"}});
-0<u.length&&(L+="<tr>"+u+"</tr>");r++});b.displayTableName&&(L+="<tr><td></td></tr><tr><td></td></tr><tr><td>"+G(d("<p>"+b.tableName+"</p>"))+"</td></tr>");L+="</tbody></table>"});var n='<html xmlns:o="urn:schemas-microsoft-com:office:office" '+Bb+' xmlns="http://www.w3.org/TR/REC-html40">';n+="<head>";n+='<meta http-equiv="content-type" content="application/vnd.ms-'+ta+'; charset=UTF-8">';"excel"===ta&&(n+="\x3c!--[if gte mso 9]>",n+="<xml>",n+="<x:ExcelWorkbook>",n+="<x:ExcelWorksheets>",n+="<x:ExcelWorksheet>",
-n+="<x:Name>",n+=ua,n+="</x:Name>",n+="<x:WorksheetOptions>",n+="<x:DisplayGridlines/>",b.mso.rtl&&(n+="<x:DisplayRightToLeft/>"),n+="</x:WorksheetOptions>",n+="</x:ExcelWorksheet>",n+="</x:ExcelWorksheets>",n+="</x:ExcelWorkbook>",n+="</xml>",n+="<![endif]--\x3e");n+="<style>";n+="@page { size:"+b.mso.pageOrientation+"; mso-page-orientation:"+b.mso.pageOrientation+"; }";n+="@page Section1 {size:"+U[b.mso.pageFormat][0]+"pt "+U[b.mso.pageFormat][1]+"pt";n+="; margin:1.0in 1.25in 1.0in 1.25in;mso-header-margin:.5in;mso-footer-margin:.5in;mso-paper-source:0;}";
-n+="div.Section1 {page:Section1;}";n+="@page Section2 {size:"+U[b.mso.pageFormat][1]+"pt "+U[b.mso.pageFormat][0]+"pt";n+=";mso-page-orientation:"+b.mso.pageOrientation+";margin:1.25in 1.0in 1.25in 1.0in;mso-header-margin:.5in;mso-footer-margin:.5in;mso-paper-source:0;}";n+="div.Section2 {page:Section2;}";n+="br {mso-data-placement:same-cell;}";n+="</style>";n+="</head>";n+="<body>";n+='<div class="Section'+("landscape"===b.mso.pageOrientation?"2":"1")+'">';n+=L;n+="</div>";n+="</body>";n+="</html>";
-if("string"===b.outputMode)return n;if("base64"===b.outputMode)return R(n);S(n,b.fileName+"."+Ab,"application/vnd.ms-"+ta,"","base64",!1)}else if("png"===b.type)html2canvas(d(v)[0]).then(function(a){a=a.toDataURL();for(var c=atob(a.substring(22)),d=new ArrayBuffer(c.length),h=new Uint8Array(d),f=0;f<c.length;f++)h[f]=c.charCodeAt(f);if("string"===b.outputMode)return c;if("base64"===b.outputMode)return R(a);"window"===b.outputMode?window.open(a):S(d,b.fileName+".png","image/png","","",!1)});else if("pdf"===
-b.type)if(!0===b.pdfmake.enabled){var ia={content:[]};d.extend(!0,ia,b.pdfmake.docDefinition);N=[];d(v).filter(function(){return O(d(this))}).each(function(){var a=d(this),c=[],e="*",h=[];r=0;"string"!==typeof b.pdfmake.widths||"*"!==b.pdfmake.widths.trim()&&"auto"!==b.pdfmake.widths.trim()?Array.isArray(b.pdfmake.widths)&&(c=b.pdfmake.widths):e=b.pdfmake.widths.trim();var f=function(a,b,c){var e=0;d(a).each(function(){var a=[];I(this,b,r,c,function(c,d,e){if("undefined"!==typeof c&&null!==c){var g=
-Ka(c),f=function(a){a=Math.min(255,Math.max(0,a)).toString(16);return 1===a.length?"0"+a:a};c={text:G(c,d,e)||" ",alignment:g.style.align,backgroundColor:"#"+f(g.style.bcolor[0])+f(g.style.bcolor[1])+f(g.style.bcolor[2]),color:"#"+f(g.style.color[0])+f(g.style.color[1])+f(g.style.color[2])};g.style.fstyle.includes("italic")&&(c.fontStyle="italic");g.style.fstyle.includes("bold")&&(c.bold=!0);if(1<g.colspan||1<g.rowspan)c.colSpan=g.colspan||1,c.rowSpan=g.rowspan||1}else c={text:" "};0<=b.indexOf("th")&&
-(c.style="header");a.push(c)});a.length&&h.push(a);e<a.length&&(e=a.length);r++});return e};z=W(a);var k=f(z,"th,td",z.length);y=X(a);a=f(y,"td",z.length+y.length);k=k>a?k:a;for(a=c.length;a<k;a++)c.push(e);ia.content.push({table:{headerRows:z.length?z.length:null,widths:c,body:h},layout:{layout:"noBorders",hLineStyle:function(a,b){return 0},vLineWidth:function(a,b){return 0},hLineColor:function(a,c){return a<c.table.headerRows?b.pdfmake.docDefinition.styles.header.background:b.pdfmake.docDefinition.styles.alternateRow.fillColor},
-vLineColor:function(a,c){return a<c.table.headerRows?b.pdfmake.docDefinition.styles.header.background:b.pdfmake.docDefinition.styles.alternateRow.fillColor},fillColor:function(a,c,d){return 0===a%2?b.pdfmake.docDefinition.styles.alternateRow.fillColor:null}},pageBreak:ia.content.length?"before":void 0})});"undefined"!==typeof pdfMake&&"undefined"!==typeof pdfMake.createPdf&&(pdfMake.fonts={Roboto:{normal:"Roboto-Regular.ttf",bold:"Roboto-Medium.ttf",italics:"Roboto-Italic.ttf",bolditalics:"Roboto-MediumItalic.ttf"}},
-pdfMake.vfs.hasOwnProperty("Mirza-Regular.ttf")?(ia.defaultStyle.font="Mirza",d.extend(!0,pdfMake.fonts,{Mirza:{normal:"Mirza-Regular.ttf",bold:"Mirza-Bold.ttf",italics:"Mirza-Medium.ttf",bolditalics:"Mirza-SemiBold.ttf"}})):pdfMake.vfs.hasOwnProperty("gbsn00lp.ttf")?(ia.defaultStyle.font="gbsn00lp",d.extend(!0,pdfMake.fonts,{gbsn00lp:{normal:"gbsn00lp.ttf",bold:"gbsn00lp.ttf",italics:"gbsn00lp.ttf",bolditalics:"gbsn00lp.ttf"}})):pdfMake.vfs.hasOwnProperty("ZCOOLXiaoWei-Regular.ttf")&&(ia.defaultStyle.font=
-"ZCOOLXiaoWei",d.extend(!0,pdfMake.fonts,{ZCOOLXiaoWei:{normal:"ZCOOLXiaoWei-Regular.ttf",bold:"ZCOOLXiaoWei-Regular.ttf",italics:"ZCOOLXiaoWei-Regular.ttf",bolditalics:"ZCOOLXiaoWei-Regular.ttf"}})),d.extend(!0,pdfMake.fonts,b.pdfmake.fonts),pdfMake.createPdf(ia).getBuffer(function(a){S(a,b.fileName+".pdf","application/pdf","","",!1)}))}else if(!1===b.jspdf.autotable){var Va=new jspdf.jsPDF({orientation:b.jspdf.orientation,unit:b.jspdf.unit,format:b.jspdf.format});Va.html(v[0],{callback:function(){Ya(Va,
-!1)},html2canvas:{scale:(Va.internal.pageSize.width-2*b.jspdf.margins.left)/v[0].scrollWidth},x:b.jspdf.margins.left,y:b.jspdf.margins.top})}else{var k=b.jspdf.autotable.tableExport;if("string"===typeof b.jspdf.format&&"bestfit"===b.jspdf.format.toLowerCase()){var Fa="",va="",kb=0;d(v).each(function(){if(O(d(this))){var a=cb(d(this).get(0),"width","pt");if(a>kb){a>U.a0[0]&&(Fa="a0",va="l");for(var b in U)U.hasOwnProperty(b)&&U[b][1]>a&&(Fa=b,va="l",U[b][0]>a&&(va="p"));kb=a}}});b.jspdf.format=""===
-Fa?"a4":Fa;b.jspdf.orientation=""===va?"w":va}if(null==k.doc&&(k.doc=new jspdf.jsPDF(b.jspdf.orientation,b.jspdf.unit,b.jspdf.format),k.wScaleFactor=1,k.hScaleFactor=1,"function"===typeof b.jspdf.onDocCreated))b.jspdf.onDocCreated(k.doc);Ba.fontName=k.doc.getFont().fontName;!0===k.outputImages&&(k.images={});"undefined"!==typeof k.images&&(d(v).filter(function(){return O(d(this))}).each(function(){var a=0;N=[];!1===b.exportHiddenCells&&(Q=d(this).find("tr, th, td").filter(":hidden"),ja=0<Q.length);
-z=W(d(this));y=X(d(this));d(y).each(function(){I(this,"td,th",z.length+a,z.length+y.length,function(a){$a(a,d(a).children(),k)});a++})}),z=[],y=[]);nb(k,function(){d(v).filter(function(){return O(d(this))}).each(function(){var a;r=0;N=[];!1===b.exportHiddenCells&&(Q=d(this).find("tr, th, td").filter(":hidden"),ja=0<Q.length);fa=xa(this);k.columns=[];k.rows=[];k.teCells={};if("function"===typeof k.onTable&&!1===k.onTable(d(this),b))return!0;b.jspdf.autotable.tableExport=null;var c=d.extend(!0,{},b.jspdf.autotable);
-b.jspdf.autotable.tableExport=k;c.margin={};d.extend(!0,c.margin,b.jspdf.margins);c.tableExport=k;"function"!==typeof c.createdHeaderCell&&(c.createdHeaderCell=function(a,b){if("undefined"!==typeof k.columns[b.column.dataKey]){var d=k.columns[b.column.dataKey];if("undefined"!==typeof d.rect){a.contentWidth=d.rect.width;if("undefined"===typeof k.heightRatio||0===k.heightRatio){var e=b.row.raw[b.column.dataKey].rowspan?b.row.raw[b.column.dataKey].rect.height/b.row.raw[b.column.dataKey].rowspan:b.row.raw[b.column.dataKey].rect.height;
-k.heightRatio=a.styles.rowHeight/e}e=b.row.raw[b.column.dataKey].rect.height*k.heightRatio;e>a.styles.rowHeight&&(a.styles.rowHeight=e)}a.styles.halign="inherit"===c.headerStyles.halign?"center":c.headerStyles.halign;a.styles.valign=c.headerStyles.valign;"undefined"!==typeof d.style&&!0!==d.style.hidden&&("inherit"===c.headerStyles.halign&&(a.styles.halign=d.style.align),"inherit"===c.styles.fillColor&&(a.styles.fillColor=d.style.bcolor),"inherit"===c.styles.textColor&&(a.styles.textColor=d.style.color),
-"inherit"===c.styles.fontStyle&&(a.styles.fontStyle=d.style.fstyle))}});"function"!==typeof c.createdCell&&(c.createdCell=function(a,b){b=k.teCells[b.row.index+":"+b.column.dataKey];a.styles.halign="inherit"===c.styles.halign?"center":c.styles.halign;a.styles.valign=c.styles.valign;"undefined"!==typeof b&&"undefined"!==typeof b.style&&!0!==b.style.hidden&&("inherit"===c.styles.halign&&(a.styles.halign=b.style.align),"inherit"===c.styles.fillColor&&(a.styles.fillColor=b.style.bcolor),"inherit"===c.styles.textColor&&
-(a.styles.textColor=b.style.color),"inherit"===c.styles.fontStyle&&(a.styles.fontStyle=b.style.fstyle))});"function"!==typeof c.drawHeaderCell&&(c.drawHeaderCell=function(a,b){var c=k.columns[b.column.dataKey];return(!0!==c.style.hasOwnProperty("hidden")||!0!==c.style.hidden)&&0<=c.rowIndex?Za(a,b,c):!1});"function"!==typeof c.drawCell&&(c.drawCell=function(a,b){var c=k.teCells[b.row.index+":"+b.column.dataKey];if(!0!==("undefined"!==typeof c&&c.isCanvas))Za(a,b,c)&&(k.doc.rect(a.x,a.y,a.width,a.height,
-a.styles.fillStyle),"undefined"===typeof c||"undefined"!==typeof c.hasUserDefText&&!0===c.hasUserDefText||"undefined"===typeof c.elements||!c.elements.length?db(a,{},k):(b=a.height/c.rect.height,b>k.hScaleFactor&&(k.hScaleFactor=b),k.wScaleFactor=a.width/c.rect.width,b=a.textPos.y,bb(a,c.elements,k),a.textPos.y=b,db(a,c.elements,k)));else{c=c.elements[0];var e=d(c).attr("data-tableexport-canvas"),f=c.getBoundingClientRect();a.width=f.width*k.wScaleFactor;a.height=f.height*k.hScaleFactor;b.row.height=
-a.height;Xa(a,c,e,k)}return!1});k.headerrows=[];z=W(d(this));d(z).each(function(){a=0;k.headerrows[r]=[];I(this,"th,td",r,z.length,function(b,c,d){var e=Ka(b);e.title=G(b,c,d);e.key=a++;e.rowIndex=r;k.headerrows[r].push(e)});r++});if(0<r)for(var e=r-1;0<=e;)d.each(k.headerrows[e],function(){var a=this;0<e&&null===this.rect&&(a=k.headerrows[e-1][this.key]);null!==a&&0<=a.rowIndex&&(!0!==a.style.hasOwnProperty("hidden")||!0!==a.style.hidden)&&k.columns.push(a)}),e=0<k.columns.length?-1:e-1;var h=0;
-y=[];y=X(d(this));d(y).each(function(){var b=[];a=0;I(this,"td,th",r,z.length+y.length,function(c,e,f){if("undefined"===typeof k.columns[a]){var g={title:"",key:a,style:{hidden:!0}};k.columns.push(g)}b.push(G(c,e,f));"undefined"!==typeof c&&null!==c?(g=Ka(c),g.isCanvas=c.hasAttribute("data-tableexport-canvas"),g.elements=g.isCanvas?d(c):d(c).children(),"undefined"!==typeof d(c).data("teUserDefText")&&(g.hasUserDefText=!0)):(g=d.extend(!0,{},k.teCells[h+":"+(a-1)]),g.colspan=-1);k.teCells[h+":"+a++]=
-g});b.length&&(k.rows.push(b),h++);r++});if("function"===typeof k.onBeforeAutotable)k.onBeforeAutotable(d(this),k.columns,k.rows,c);sb(c.tableExport.doc,k.columns,k.rows,c);if("function"===typeof k.onAfterAutotable)k.onAfterAutotable(d(this),c);var f=b.jspdf.autotable;var l="undefined"===typeof H||"undefined"===typeof H.y?0:H.y;f.startY=l+c.margin.top});Ya(k.doc,"undefined"!==typeof k.images&&!1===jQuery.isEmptyObject(k.images));"undefined"!==typeof k.headerrows&&(k.headerrows.length=0);"undefined"!==
-typeof k.columns&&(k.columns.length=0);"undefined"!==typeof k.rows&&(k.rows.length=0);delete k.doc;k.doc=null})}var x,H,l,Na,q;if("function"===typeof b.onTableExportEnd)b.onTableExportEnd();return this};var t=function(){return function(){this.contentWidth=this.y=this.x=this.width=this.height=0;this.rows=[];this.columns=[];this.headerRow=null;this.settings={}}}(),D=function(){return function(d){this.raw=d||{};this.index=0;this.styles={};this.cells={};this.y=this.height=0}}(),K=function(){return function(d){this.raw=
-d;this.styles={};this.text="";this.contentWidth=0;this.textPos={};this.y=this.x=this.width=this.height=0}}(),wa=function(){return function(d){this.dataKey=d;this.options={};this.styles={};this.x=this.width=this.contentWidth=0}}()})(jQuery);
+Ea=0;Ea<Ua.length;Ea++)V+='<Worksheet ss:Name="'+M[Ea]+'" ss:RightToLeft="'+(b.mso.rtl?"1":"0")+'">\r'+Ua[Ea],V=b.mso.rtl?V+'<WorksheetOptions xmlns="urn:schemas-microsoft-com:office:excel">\r<DisplayRightToLeft/>\r</WorksheetOptions>\r':V+'<WorksheetOptions xmlns="urn:schemas-microsoft-com:office:excel"/>\r',V+="</Worksheet>\r";V+="</Workbook>\r";if("string"===b.outputMode)return V;if("base64"===b.outputMode)return R(V);S(V,b.fileName+".xml","application/xml","utf-8","base64",!1)}else if("excel"===
+b.type&&"xlsx"===b.mso.fileFormat){var sa=[],kb=XLSX.utils.book_new();d(v).filter(function(){return O(d(this))}).each(function(){for(var a=d(this),c,e={},h=this.getElementsByTagName("tr"),f=Math.min(1E7,h.length),k={s:{r:0,c:0},e:{r:0,c:0}},l=[],g,p=0,C=0,B,m,r,q,n,t=XLSX.SSF.get_table();p<h.length&&C<f;++p)if(B=h[p],m=!1,"function"===typeof b.onIgnoreRow&&(m=b.onIgnoreRow(d(B),p)),!0!==m&&(0===b.ignoreRow.length||-1===d.inArray(p,b.ignoreRow)&&-1===d.inArray(p-h.length,b.ignoreRow))&&!1!==O(d(B))){var u=
+B.children,z=0;for(B=0;B<u.length;++B)n=u[B],q=+Y(n)||1,z+=q;var x=0;for(B=m=0;B<u.length;++B)if(n=u[B],q=+Y(n)||1,g=B+x,!Xa(d(n),z,g+(g<m?m-g:0))){x+=q-1;for(g=0;g<l.length;++g){var A=l[g];A.s.c==m&&A.s.r<=C&&C<=A.e.r&&(m=A.e.c+1,g=-1)}(0<(r=+ja(n))||1<q)&&l.push({s:{r:C,c:m},e:{r:C+(r||1)-1,c:m+q-1}});var y={type:""};A=G(n,p,B+x,y);g={t:"s",v:A};var v="";if(""!==(d(n).attr("data-tableexport-cellformat")||void 0))if(c=parseInt(d(n).attr("data-tableexport-xlsxformatid")||0),0===c&&"function"===typeof b.mso.xlsx.formatId.numbers&&
+(c=b.mso.xlsx.formatId.numbers(d(n),p,B+x)),0===c&&"function"===typeof b.mso.xlsx.formatId.date&&(c=b.mso.xlsx.formatId.date(d(n),p,B+x)),49===c||"@"===c)v="s";else if("number"===y.type||0<c&&14>c||36<c&&41>c||48===c)v="n";else{if("date"===y.type||13<c&&37>c||44<c&&48>c||56===c)v="d"}else v="s";if(null!==A&&void 0!==A){if("string"===typeof A&&0===A.length)g.t="z";else if(("string"!==typeof A||0!==A.trim().length)&&"s"!==v)if("function"===y.type)g={f:A};else if("string"===typeof A&&"TRUE"===A.toUpperCase())g=
+{t:"b",v:!0};else if("string"===typeof A&&"FALSE"===A.toUpperCase())g={t:"b",v:!1};else if("n"===v||isFinite(gb(A,b.numbers.output))){if(v=gb(A,b.numbers.output),0===c&&"function"!==typeof b.mso.xlsx.formatId.numbers&&(c=b.mso.xlsx.formatId.numbers),isFinite(v)||isFinite(A))g={t:"n",v:isFinite(v)?v:A,z:"string"===typeof c?c:c in t?t[c]:c===b.mso.xlsx.formatId.currency?b.mso.xlsx.format.currency:"0.00"}}else if(!1!==(y=pb(A))||"d"===v)0===c&&"function"!==typeof b.mso.xlsx.formatId.date&&(c=b.mso.xlsx.formatId.date),
+g={t:"d",v:!1!==y?y:A,z:"string"===typeof c?c:c in t?t[c]:"m/d/yy"};(v=d(n).find("a"))&&v.length&&(v=v[0].hasAttribute("href")?v.attr("href"):"",A="href"!==b.htmlHyperlink||""===v?A:"",y=""!==v?'=HYPERLINK("'+v+(A.length?'","'+A:"")+'")':"",""!==y&&("function"===typeof b.mso.xlsx.onHyperlink?(A=b.mso.xlsx.onHyperlink(d(n),p,B,v,A,y),g=0!==A.indexOf("=HYPERLINK")?{t:"s",v:A}:{f:A}):g={f:y}))}e[Ma({c:m,r:C})]=g;k.e.c<m&&(k.e.c=m);m+=q}++C}l.length&&(e["!merges"]=(e["!merges"]||[]).concat(l));k.e.r=
+Math.max(k.e.r,C-1);e["!ref"]=Na(k);C>=f&&(e["!fullref"]=Na((k.e.r=h.length-p+C-1,k)));c="";"string"===typeof b.mso.worksheetName&&b.mso.worksheetName.length?c=b.mso.worksheetName+" "+(sa.length+1):"undefined"!==typeof b.mso.worksheetName[sa.length]&&(c=b.mso.worksheetName[sa.length]);c.length||(c=a.find("caption").text()||"");c.length||(c="Table "+(sa.length+1));c=d.trim(c.replace(/[\\\/[\]*:?'"]/g,"").substring(0,31));sa.push(c);XLSX.utils.book_append_sheet(kb,e,c)});var Ab=XLSX.write(kb,{type:"binary",
+bookType:b.mso.fileFormat,bookSST:!1});S(sb(Ab),b.fileName+"."+b.mso.fileFormat,"application/vnd.openxmlformats-officedocument.spreadsheetml.sheet","UTF-8","",!1)}else if("excel"===b.type||"xls"===b.type||"word"===b.type||"doc"===b.type){var ta="excel"===b.type||"xls"===b.type?"excel":"word",Bb="excel"===ta?"xls":"doc",Cb='xmlns:x="urn:schemas-microsoft-com:office:'+ta+'"',ua=L="";d(v).filter(function(){return O(d(this))}).each(function(){var a=d(this);""===ua&&(ua=b.mso.worksheetName||a.find("caption").text()||
+"Table",ua=d.trim(ua.replace(/[\\\/[\]*:?'"]/g,"").substring(0,31)));!1===b.exportHiddenCells&&(Q=a.find("tr, th, td").filter(":hidden"),ia=0<Q.length);r=0;N=[];fa=xa(this);L+="<table><thead>";z=W(a);d(z).each(function(){var a=d(this),e=document.defaultView.getComputedStyle(a[0],null);u="";I(this,"th,td",r,z.length,function(a,c,d){if(null!==a){var f="";u+="<th";if(b.mso.styles.length){var g=document.defaultView.getComputedStyle(a,null),h;for(h in b.mso.styles){var k=b.mso.styles[h],m=J(g,k);""===
+m&&(m=J(e,k));""!==m&&"0px none rgb(0, 0, 0)"!==m&&"rgba(0, 0, 0, 0)"!==m&&(f+=""===f?'style="':";",f+=k+":"+m)}}""!==f&&(u+=" "+f+'"');f=Y(a);0<f&&(u+=' colspan="'+f+'"');f=ja(a);0<f&&(u+=' rowspan="'+f+'"');u+=">"+G(a,c,d)+"</th>"}});0<u.length&&(L+="<tr>"+u+"</tr>");r++});L+="</thead><tbody>";y=X(a);d(y).each(function(){var a=d(this),e=null,h=null;u="";I(this,"td,th",r,z.length+y.length,function(c,k,l){if(null!==c){var g=G(c,k,l),f="",m=d(c).attr("data-tableexport-msonumberformat");"undefined"===
+typeof m&&"function"===typeof b.mso.onMsoNumberFormat&&(m=b.mso.onMsoNumberFormat(c,k,l));"undefined"!==typeof m&&""!==m&&(f="style=\"mso-number-format:'"+m+"'");if(b.mso.styles.length){e=document.defaultView.getComputedStyle(c,null);h=null;for(var n in b.mso.styles)k=b.mso.styles[n],m=J(e,k),""===m&&(null===h&&(h=document.defaultView.getComputedStyle(a[0],null)),m=J(h,k)),""!==m&&"0px none rgb(0, 0, 0)"!==m&&"rgba(0, 0, 0, 0)"!==m&&(f+=""===f?'style="':";",f+=k+":"+m)}u+="<td";""!==f&&(u+=" "+f+
+'"');f=Y(c);0<f&&(u+=' colspan="'+f+'"');c=ja(c);0<c&&(u+=' rowspan="'+c+'"');"string"===typeof g&&""!==g&&(g=fb(g),g=g.replace(/\n/g,"<br>"));u+=">"+g+"</td>"}});0<u.length&&(L+="<tr>"+u+"</tr>");r++});b.displayTableName&&(L+="<tr><td></td></tr><tr><td></td></tr><tr><td>"+G(d("<p>"+b.tableName+"</p>"))+"</td></tr>");L+="</tbody></table>"});var n='<html xmlns:o="urn:schemas-microsoft-com:office:office" '+Cb+' xmlns="http://www.w3.org/TR/REC-html40">';n+="<head>";n+='<meta http-equiv="content-type" content="application/vnd.ms-'+
+ta+'; charset=UTF-8">';"excel"===ta&&(n+="\x3c!--[if gte mso 9]>",n+="<xml>",n+="<x:ExcelWorkbook>",n+="<x:ExcelWorksheets>",n+="<x:ExcelWorksheet>",n+="<x:Name>",n+=ua,n+="</x:Name>",n+="<x:WorksheetOptions>",n+="<x:DisplayGridlines/>",b.mso.rtl&&(n+="<x:DisplayRightToLeft/>"),n+="</x:WorksheetOptions>",n+="</x:ExcelWorksheet>",n+="</x:ExcelWorksheets>",n+="</x:ExcelWorkbook>",n+="</xml>",n+="<![endif]--\x3e");n+="<style>";n+="@page { size:"+b.mso.pageOrientation+"; mso-page-orientation:"+b.mso.pageOrientation+
+"; }";n+="@page Section1 {size:"+U[b.mso.pageFormat][0]+"pt "+U[b.mso.pageFormat][1]+"pt";n+="; margin:1.0in 1.25in 1.0in 1.25in;mso-header-margin:.5in;mso-footer-margin:.5in;mso-paper-source:0;}";n+="div.Section1 {page:Section1;}";n+="@page Section2 {size:"+U[b.mso.pageFormat][1]+"pt "+U[b.mso.pageFormat][0]+"pt";n+=";mso-page-orientation:"+b.mso.pageOrientation+";margin:1.25in 1.0in 1.25in 1.0in;mso-header-margin:.5in;mso-footer-margin:.5in;mso-paper-source:0;}";n+="div.Section2 {page:Section2;}";
+n+="br {mso-data-placement:same-cell;}";n+="</style>";n+="</head>";n+="<body>";n+='<div class="Section'+("landscape"===b.mso.pageOrientation?"2":"1")+'">';n+=L;n+="</div>";n+="</body>";n+="</html>";if("string"===b.outputMode)return n;if("base64"===b.outputMode)return R(n);S(n,b.fileName+"."+Bb,"application/vnd.ms-"+ta,"","base64",!1)}else if("png"===b.type)html2canvas(d(v)[0]).then(function(a){a=a.toDataURL();for(var c=atob(a.substring(22)),d=new ArrayBuffer(c.length),h=new Uint8Array(d),f=0;f<c.length;f++)h[f]=
+c.charCodeAt(f);if("string"===b.outputMode)return c;if("base64"===b.outputMode)return R(a);"window"===b.outputMode?window.open(a):S(d,b.fileName+".png","image/png","","",!1)});else if("pdf"===b.type)if(!0===b.pdfmake.enabled){var oa={content:[]};d.extend(!0,oa,b.pdfmake.docDefinition);N=[];d(v).filter(function(){return O(d(this))}).each(function(a){var c=d(this),e=[],h="*",f=[];r=0;"string"!==typeof b.pdfmake.widths||"*"!==b.pdfmake.widths.trim()&&"auto"!==b.pdfmake.widths.trim()?Array.isArray(b.pdfmake.widths)&&
+(e=b.pdfmake.widths):h=b.pdfmake.widths.trim();var k=function(a,b,c){var e=0;d(a).each(function(){var a=[];I(this,b,r,c,function(c,d,e){if("undefined"!==typeof c&&null!==c){var g=La(c),f=function(a){a=Math.min(255,Math.max(0,a)).toString(16);return 1===a.length?"0"+a:a};c={text:G(c,d,e)||" ",alignment:g.style.align,backgroundColor:"#"+f(g.style.bcolor[0])+f(g.style.bcolor[1])+f(g.style.bcolor[2]),color:"#"+f(g.style.color[0])+f(g.style.color[1])+f(g.style.color[2])};g.style.fstyle.includes("italic")&&
+(c.fontStyle="italic");g.style.fstyle.includes("bold")&&(c.bold=!0);if(1<g.colspan||1<g.rowspan)c.colSpan=g.colspan||1,c.rowSpan=g.rowspan||1}else c={text:" "};0<=b.indexOf("th")&&(c.style="header");a.push(c)});a.length&&f.push(a);e<a.length&&(e=a.length);r++});return e};z=W(c);var l=k(z,"th,td",z.length);y=X(c);c=k(y,"td",z.length+y.length);l=l>c?l:c;for(c=e.length;c<l;c++)e.push(h);oa.content.push({table:{headerRows:z.length?z.length:null,widths:e,body:f},layout:{layout:"noBorders",hLineStyle:function(a,
+b){return 0},vLineWidth:function(a,b){return 0},hLineColor:function(a,c){return a<c.table.headerRows?b.pdfmake.docDefinition.styles.header.background:b.pdfmake.docDefinition.styles.alternateRow.fillColor},vLineColor:function(a,c){return a<c.table.headerRows?b.pdfmake.docDefinition.styles.header.background:b.pdfmake.docDefinition.styles.alternateRow.fillColor},fillColor:function(a,c,d){return 0===a%2?b.pdfmake.docDefinition.styles.alternateRow.fillColor:null}},pageBreak:0<a?"before":void 0})});"undefined"!==
+typeof pdfMake&&"undefined"!==typeof pdfMake.createPdf&&(pdfMake.fonts={Roboto:{normal:"Roboto-Regular.ttf",bold:"Roboto-Medium.ttf",italics:"Roboto-Italic.ttf",bolditalics:"Roboto-MediumItalic.ttf"}},pdfMake.vfs.hasOwnProperty("Mirza-Regular.ttf")?(oa.defaultStyle.font="Mirza",d.extend(!0,pdfMake.fonts,{Mirza:{normal:"Mirza-Regular.ttf",bold:"Mirza-Bold.ttf",italics:"Mirza-Medium.ttf",bolditalics:"Mirza-SemiBold.ttf"}})):pdfMake.vfs.hasOwnProperty("gbsn00lp.ttf")?(oa.defaultStyle.font="gbsn00lp",
+d.extend(!0,pdfMake.fonts,{gbsn00lp:{normal:"gbsn00lp.ttf",bold:"gbsn00lp.ttf",italics:"gbsn00lp.ttf",bolditalics:"gbsn00lp.ttf"}})):pdfMake.vfs.hasOwnProperty("ZCOOLXiaoWei-Regular.ttf")&&(oa.defaultStyle.font="ZCOOLXiaoWei",d.extend(!0,pdfMake.fonts,{ZCOOLXiaoWei:{normal:"ZCOOLXiaoWei-Regular.ttf",bold:"ZCOOLXiaoWei-Regular.ttf",italics:"ZCOOLXiaoWei-Regular.ttf",bolditalics:"ZCOOLXiaoWei-Regular.ttf"}})),d.extend(!0,pdfMake.fonts,b.pdfmake.fonts),pdfMake.createPdf(oa).getBuffer(function(a){S(a,
+b.fileName+".pdf","application/pdf","","",!1)}))}else if(!1===b.jspdf.autotable){var Wa=new jspdf.jsPDF({orientation:b.jspdf.orientation,unit:b.jspdf.unit,format:b.jspdf.format});Wa.html(v[0],{callback:function(){Za(Wa,!1)},html2canvas:{scale:(Wa.internal.pageSize.width-2*b.jspdf.margins.left)/v[0].scrollWidth},x:b.jspdf.margins.left,y:b.jspdf.margins.top})}else{var k=b.jspdf.autotable.tableExport;if("string"===typeof b.jspdf.format&&"bestfit"===b.jspdf.format.toLowerCase()){var Fa="",va="",lb=0;
+d(v).each(function(){if(O(d(this))){var a=db(d(this).get(0),"width","pt");if(a>lb){a>U.a0[0]&&(Fa="a0",va="l");for(var b in U)U.hasOwnProperty(b)&&U[b][1]>a&&(Fa=b,va="l",U[b][0]>a&&(va="p"));lb=a}}});b.jspdf.format=""===Fa?"a4":Fa;b.jspdf.orientation=""===va?"w":va}if(null==k.doc&&(k.doc=new jspdf.jsPDF(b.jspdf.orientation,b.jspdf.unit,b.jspdf.format),k.wScaleFactor=1,k.hScaleFactor=1,"function"===typeof b.jspdf.onDocCreated))b.jspdf.onDocCreated(k.doc);Ba.fontName=k.doc.getFont().fontName;!0===
+k.outputImages&&(k.images={});"undefined"!==typeof k.images&&(d(v).filter(function(){return O(d(this))}).each(function(){var a=0;N=[];!1===b.exportHiddenCells&&(Q=d(this).find("tr, th, td").filter(":hidden"),ia=0<Q.length);z=W(d(this));y=X(d(this));d(y).each(function(){I(this,"td,th",z.length+a,z.length+y.length,function(a){ab(a,d(a).children(),k)});a++})}),z=[],y=[]);ob(k,function(){d(v).filter(function(){return O(d(this))}).each(function(){var a;r=0;N=[];!1===b.exportHiddenCells&&(Q=d(this).find("tr, th, td").filter(":hidden"),
+ia=0<Q.length);fa=xa(this);k.columns=[];k.rows=[];k.teCells={};if("function"===typeof k.onTable&&!1===k.onTable(d(this),b))return!0;b.jspdf.autotable.tableExport=null;var c=d.extend(!0,{},b.jspdf.autotable);b.jspdf.autotable.tableExport=k;c.margin={};d.extend(!0,c.margin,b.jspdf.margins);c.tableExport=k;"function"!==typeof c.createdHeaderCell&&(c.createdHeaderCell=function(a,b){if("undefined"!==typeof k.columns[b.column.dataKey]){var d=k.columns[b.column.dataKey];if("undefined"!==typeof d.rect){a.contentWidth=
+d.rect.width;if("undefined"===typeof k.heightRatio||0===k.heightRatio){var e=b.row.raw[b.column.dataKey].rowspan?b.row.raw[b.column.dataKey].rect.height/b.row.raw[b.column.dataKey].rowspan:b.row.raw[b.column.dataKey].rect.height;k.heightRatio=a.styles.rowHeight/e}e=b.row.raw[b.column.dataKey].rect.height*k.heightRatio;e>a.styles.rowHeight&&(a.styles.rowHeight=e)}a.styles.halign="inherit"===c.headerStyles.halign?"center":c.headerStyles.halign;a.styles.valign=c.headerStyles.valign;"undefined"!==typeof d.style&&
+!0!==d.style.hidden&&("inherit"===c.headerStyles.halign&&(a.styles.halign=d.style.align),"inherit"===c.styles.fillColor&&(a.styles.fillColor=d.style.bcolor),"inherit"===c.styles.textColor&&(a.styles.textColor=d.style.color),"inherit"===c.styles.fontStyle&&(a.styles.fontStyle=d.style.fstyle))}});"function"!==typeof c.createdCell&&(c.createdCell=function(a,b){b=k.teCells[b.row.index+":"+b.column.dataKey];a.styles.halign="inherit"===c.styles.halign?"center":c.styles.halign;a.styles.valign=c.styles.valign;
+"undefined"!==typeof b&&"undefined"!==typeof b.style&&!0!==b.style.hidden&&("inherit"===c.styles.halign&&(a.styles.halign=b.style.align),"inherit"===c.styles.fillColor&&(a.styles.fillColor=b.style.bcolor),"inherit"===c.styles.textColor&&(a.styles.textColor=b.style.color),"inherit"===c.styles.fontStyle&&(a.styles.fontStyle=b.style.fstyle))});"function"!==typeof c.drawHeaderCell&&(c.drawHeaderCell=function(a,b){var c=k.columns[b.column.dataKey];return(!0!==c.style.hasOwnProperty("hidden")||!0!==c.style.hidden)&&
+0<=c.rowIndex?$a(a,b,c):!1});"function"!==typeof c.drawCell&&(c.drawCell=function(a,b){var c=k.teCells[b.row.index+":"+b.column.dataKey];if(!0!==("undefined"!==typeof c&&c.isCanvas))$a(a,b,c)&&(k.doc.rect(a.x,a.y,a.width,a.height,a.styles.fillStyle),"undefined"===typeof c||"undefined"!==typeof c.hasUserDefText&&!0===c.hasUserDefText||"undefined"===typeof c.elements||!c.elements.length?eb(a,{},k):(b=a.height/c.rect.height,b>k.hScaleFactor&&(k.hScaleFactor=b),k.wScaleFactor=a.width/c.rect.width,b=a.textPos.y,
+cb(a,c.elements,k),a.textPos.y=b,eb(a,c.elements,k)));else{c=c.elements[0];var e=d(c).attr("data-tableexport-canvas"),f=c.getBoundingClientRect();a.width=f.width*k.wScaleFactor;a.height=f.height*k.hScaleFactor;b.row.height=a.height;Ya(a,c,e,k)}return!1});k.headerrows=[];z=W(d(this));d(z).each(function(){a=0;k.headerrows[r]=[];I(this,"th,td",r,z.length,function(b,c,d){var e=La(b);e.title=G(b,c,d);e.key=a++;e.rowIndex=r;k.headerrows[r].push(e)});r++});if(0<r)for(var e=r-1;0<=e;)d.each(k.headerrows[e],
+function(){var a=this;0<e&&null===this.rect&&(a=k.headerrows[e-1][this.key]);null!==a&&0<=a.rowIndex&&(!0!==a.style.hasOwnProperty("hidden")||!0!==a.style.hidden)&&k.columns.push(a)}),e=0<k.columns.length?-1:e-1;var h=0;y=[];y=X(d(this));d(y).each(function(){var b=[];a=0;I(this,"td,th",r,z.length+y.length,function(c,e,f){if("undefined"===typeof k.columns[a]){var g={title:"",key:a,style:{hidden:!0}};k.columns.push(g)}b.push(G(c,e,f));"undefined"!==typeof c&&null!==c?(g=La(c),g.isCanvas=c.hasAttribute("data-tableexport-canvas"),
+g.elements=g.isCanvas?d(c):d(c).children(),"undefined"!==typeof d(c).data("teUserDefText")&&(g.hasUserDefText=!0)):(g=d.extend(!0,{},k.teCells[h+":"+(a-1)]),g.colspan=-1);k.teCells[h+":"+a++]=g});b.length&&(k.rows.push(b),h++);r++});if("function"===typeof k.onBeforeAutotable)k.onBeforeAutotable(d(this),k.columns,k.rows,c);tb(c.tableExport.doc,k.columns,k.rows,c);if("function"===typeof k.onAfterAutotable)k.onAfterAutotable(d(this),c);var f=b.jspdf.autotable;var m="undefined"===typeof H||"undefined"===
+typeof H.y?0:H.y;f.startY=m+c.margin.top});Za(k.doc,"undefined"!==typeof k.images&&!1===jQuery.isEmptyObject(k.images));"undefined"!==typeof k.headerrows&&(k.headerrows.length=0);"undefined"!==typeof k.columns&&(k.columns.length=0);"undefined"!==typeof k.rows&&(k.rows.length=0);delete k.doc;k.doc=null})}var x,H,m,Oa,q;if("function"===typeof b.onTableExportEnd)b.onTableExportEnd();return this};var t=function(){return function(){this.contentWidth=this.y=this.x=this.width=this.height=0;this.rows=[];
+this.columns=[];this.headerRow=null;this.settings={}}}(),D=function(){return function(d){this.raw=d||{};this.index=0;this.styles={};this.cells={};this.y=this.height=0}}(),K=function(){return function(d){this.raw=d;this.styles={};this.text="";this.contentWidth=0;this.textPos={};this.y=this.x=this.width=this.height=0}}(),wa=function(){return function(d){this.dataKey=d;this.options={};this.styles={};this.x=this.width=this.contentWidth=0}}()})(jQuery);
 
 /** @license
  *
@@ -23005,11 +29876,55 @@ if(xr(e,"index.xml"))throw new Error("Unsupported NUMBERS 09 file");throw new Er
   typeof exports === 'object' && typeof module !== 'undefined' ? factory(require('jquery')) :
   typeof define === 'function' && define.amd ? define(['jquery'], factory) :
   (global = typeof globalThis !== 'undefined' ? globalThis : global || self, factory(global.jQuery));
-})(this, (function ($$3) { 'use strict';
+})(this, (function ($) { 'use strict';
 
+  function _assertThisInitialized(e) {
+    if (void 0 === e) throw new ReferenceError("this hasn't been initialised - super() hasn't been called");
+    return e;
+  }
   function _callSuper(t, o, e) {
     return o = _getPrototypeOf(o), _possibleConstructorReturn(t, _isNativeReflectConstruct() ? Reflect.construct(o, e || [], _getPrototypeOf(t).constructor) : o.apply(t, e));
   }
+  function _classCallCheck(a, n) {
+    if (!(a instanceof n)) throw new TypeError("Cannot call a class as a function");
+  }
+  function _defineProperties(e, r) {
+    for (var t = 0; t < r.length; t++) {
+      var o = r[t];
+      o.enumerable = o.enumerable || !1, o.configurable = !0, "value" in o && (o.writable = !0), Object.defineProperty(e, _toPropertyKey(o.key), o);
+    }
+  }
+  function _createClass(e, r, t) {
+    return _defineProperties(e.prototype, r), Object.defineProperty(e, "prototype", {
+      writable: !1
+    }), e;
+  }
+  function _get() {
+    return _get = "undefined" != typeof Reflect && Reflect.get ? Reflect.get.bind() : function (e, t, r) {
+      var p = _superPropBase(e, t);
+      if (p) {
+        var n = Object.getOwnPropertyDescriptor(p, t);
+        return n.get ? n.get.call(arguments.length < 3 ? e : r) : n.value;
+      }
+    }, _get.apply(null, arguments);
+  }
+  function _getPrototypeOf(t) {
+    return _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf.bind() : function (t) {
+      return t.__proto__ || Object.getPrototypeOf(t);
+    }, _getPrototypeOf(t);
+  }
+  function _inherits(t, e) {
+    if ("function" != typeof e && null !== e) throw new TypeError("Super expression must either be null or a function");
+    t.prototype = Object.create(e && e.prototype, {
+      constructor: {
+        value: t,
+        writable: !0,
+        configurable: !0
+      }
+    }), Object.defineProperty(t, "prototype", {
+      writable: !1
+    }), e && _setPrototypeOf(t, e);
+  }
   function _isNativeReflectConstruct() {
     try {
       var t = !Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {}));
@@ -23018,1695 +29933,2210 @@ if(xr(e,"index.xml"))throw new Error("Unsupported NUMBERS 09 file");throw new Er
       return !!t;
     })();
   }
+  function _possibleConstructorReturn(t, e) {
+    if (e && ("object" == typeof e || "function" == typeof e)) return e;
+    if (void 0 !== e) throw new TypeError("Derived constructors may only return object or undefined");
+    return _assertThisInitialized(t);
+  }
+  function _setPrototypeOf(t, e) {
+    return _setPrototypeOf = Object.setPrototypeOf ? Object.setPrototypeOf.bind() : function (t, e) {
+      return t.__proto__ = e, t;
+    }, _setPrototypeOf(t, e);
+  }
+  function _superPropBase(t, o) {
+    for (; !{}.hasOwnProperty.call(t, o) && null !== (t = _getPrototypeOf(t)););
+    return t;
+  }
+  function _superPropGet(t, o, e, r) {
+    var p = _get(_getPrototypeOf(t.prototype ), o, e);
+    return "function" == typeof p ? function (t) {
+      return p.apply(e, t);
+    } : p;
+  }
   function _toPrimitive(t, r) {
     if ("object" != typeof t || !t) return t;
     var e = t[Symbol.toPrimitive];
     if (void 0 !== e) {
-      var i = e.call(t, r || "default");
+      var i = e.call(t, r);
       if ("object" != typeof i) return i;
       throw new TypeError("@@toPrimitive must return a primitive value.");
     }
-    return ("string" === r ? String : Number)(t);
+    return (String )(t);
   }
   function _toPropertyKey(t) {
     var i = _toPrimitive(t, "string");
     return "symbol" == typeof i ? i : i + "";
   }
-  function _classCallCheck(instance, Constructor) {
-    if (!(instance instanceof Constructor)) {
-      throw new TypeError("Cannot call a class as a function");
-    }
-  }
-  function _defineProperties(target, props) {
-    for (var i = 0; i < props.length; i++) {
-      var descriptor = props[i];
-      descriptor.enumerable = descriptor.enumerable || false;
-      descriptor.configurable = true;
-      if ("value" in descriptor) descriptor.writable = true;
-      Object.defineProperty(target, _toPropertyKey(descriptor.key), descriptor);
-    }
-  }
-  function _createClass(Constructor, protoProps, staticProps) {
-    if (protoProps) _defineProperties(Constructor.prototype, protoProps);
-    if (staticProps) _defineProperties(Constructor, staticProps);
-    Object.defineProperty(Constructor, "prototype", {
-      writable: false
-    });
-    return Constructor;
-  }
-  function _inherits(subClass, superClass) {
-    if (typeof superClass !== "function" && superClass !== null) {
-      throw new TypeError("Super expression must either be null or a function");
-    }
-    subClass.prototype = Object.create(superClass && superClass.prototype, {
-      constructor: {
-        value: subClass,
-        writable: true,
-        configurable: true
-      }
-    });
-    Object.defineProperty(subClass, "prototype", {
-      writable: false
-    });
-    if (superClass) _setPrototypeOf(subClass, superClass);
-  }
-  function _getPrototypeOf(o) {
-    _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf.bind() : function _getPrototypeOf(o) {
-      return o.__proto__ || Object.getPrototypeOf(o);
-    };
-    return _getPrototypeOf(o);
-  }
-  function _setPrototypeOf(o, p) {
-    _setPrototypeOf = Object.setPrototypeOf ? Object.setPrototypeOf.bind() : function _setPrototypeOf(o, p) {
-      o.__proto__ = p;
-      return o;
-    };
-    return _setPrototypeOf(o, p);
-  }
-  function _assertThisInitialized(self) {
-    if (self === void 0) {
-      throw new ReferenceError("this hasn't been initialised - super() hasn't been called");
-    }
-    return self;
-  }
-  function _possibleConstructorReturn(self, call) {
-    if (call && (typeof call === "object" || typeof call === "function")) {
-      return call;
-    } else if (call !== void 0) {
-      throw new TypeError("Derived constructors may only return object or undefined");
-    }
-    return _assertThisInitialized(self);
-  }
-  function _superPropBase(object, property) {
-    while (!Object.prototype.hasOwnProperty.call(object, property)) {
-      object = _getPrototypeOf(object);
-      if (object === null) break;
-    }
-    return object;
-  }
-  function _get() {
-    if (typeof Reflect !== "undefined" && Reflect.get) {
-      _get = Reflect.get.bind();
-    } else {
-      _get = function _get(target, property, receiver) {
-        var base = _superPropBase(target, property);
-        if (!base) return;
-        var desc = Object.getOwnPropertyDescriptor(base, property);
-        if (desc.get) {
-          return desc.get.call(arguments.length < 3 ? target : receiver);
-        }
-        return desc.value;
-      };
-    }
-    return _get.apply(this, arguments);
-  }
 
   var commonjsGlobal = typeof globalThis !== 'undefined' ? globalThis : typeof window !== 'undefined' ? window : typeof global !== 'undefined' ? global : typeof self !== 'undefined' ? self : {};
 
-  var check = function (it) {
-    return it && it.Math === Math && it;
-  };
+  var es_array_find = {};
 
-  // https://github.com/zloirock/core-js/issues/86#issuecomment-115759028
-  var global$a =
-    // eslint-disable-next-line es/no-global-this -- safe
-    check(typeof globalThis == 'object' && globalThis) ||
-    check(typeof window == 'object' && window) ||
-    // eslint-disable-next-line no-restricted-globals -- safe
-    check(typeof self == 'object' && self) ||
-    check(typeof commonjsGlobal == 'object' && commonjsGlobal) ||
-    check(typeof commonjsGlobal == 'object' && commonjsGlobal) ||
-    // eslint-disable-next-line no-new-func -- fallback
-    (function () { return this; })() || Function('return this')();
+  var globalThis_1;
+  var hasRequiredGlobalThis;
+
+  function requireGlobalThis () {
+  	if (hasRequiredGlobalThis) return globalThis_1;
+  	hasRequiredGlobalThis = 1;
+  	var check = function (it) {
+  	  return it && it.Math === Math && it;
+  	};
+
+  	// https://github.com/zloirock/core-js/issues/86#issuecomment-115759028
+  	globalThis_1 =
+  	  // eslint-disable-next-line es/no-global-this -- safe
+  	  check(typeof globalThis == 'object' && globalThis) ||
+  	  check(typeof window == 'object' && window) ||
+  	  // eslint-disable-next-line no-restricted-globals -- safe
+  	  check(typeof self == 'object' && self) ||
+  	  check(typeof commonjsGlobal == 'object' && commonjsGlobal) ||
+  	  check(typeof globalThis_1 == 'object' && globalThis_1) ||
+  	  // eslint-disable-next-line no-new-func -- fallback
+  	  (function () { return this; })() || Function('return this')();
+  	return globalThis_1;
+  }
 
   var objectGetOwnPropertyDescriptor = {};
 
-  var fails$c = function (exec) {
-    try {
-      return !!exec();
-    } catch (error) {
-      return true;
-    }
-  };
+  var fails;
+  var hasRequiredFails;
 
-  var fails$b = fails$c;
+  function requireFails () {
+  	if (hasRequiredFails) return fails;
+  	hasRequiredFails = 1;
+  	fails = function (exec) {
+  	  try {
+  	    return !!exec();
+  	  } catch (error) {
+  	    return true;
+  	  }
+  	};
+  	return fails;
+  }
 
-  // Detect IE8's incomplete defineProperty implementation
-  var descriptors = !fails$b(function () {
-    // eslint-disable-next-line es/no-object-defineproperty -- required for testing
-    return Object.defineProperty({}, 1, { get: function () { return 7; } })[1] !== 7;
-  });
+  var descriptors;
+  var hasRequiredDescriptors;
 
-  var fails$a = fails$c;
+  function requireDescriptors () {
+  	if (hasRequiredDescriptors) return descriptors;
+  	hasRequiredDescriptors = 1;
+  	var fails = requireFails();
 
-  var functionBindNative = !fails$a(function () {
-    // eslint-disable-next-line es/no-function-prototype-bind -- safe
-    var test = (function () { /* empty */ }).bind();
-    // eslint-disable-next-line no-prototype-builtins -- safe
-    return typeof test != 'function' || test.hasOwnProperty('prototype');
-  });
+  	// Detect IE8's incomplete defineProperty implementation
+  	descriptors = !fails(function () {
+  	  // eslint-disable-next-line es/no-object-defineproperty -- required for testing
+  	  return Object.defineProperty({}, 1, { get: function () { return 7; } })[1] !== 7;
+  	});
+  	return descriptors;
+  }
 
-  var NATIVE_BIND$2 = functionBindNative;
+  var functionBindNative;
+  var hasRequiredFunctionBindNative;
 
-  var call$5 = Function.prototype.call;
+  function requireFunctionBindNative () {
+  	if (hasRequiredFunctionBindNative) return functionBindNative;
+  	hasRequiredFunctionBindNative = 1;
+  	var fails = requireFails();
 
-  var functionCall = NATIVE_BIND$2 ? call$5.bind(call$5) : function () {
-    return call$5.apply(call$5, arguments);
-  };
+  	functionBindNative = !fails(function () {
+  	  // eslint-disable-next-line es/no-function-prototype-bind -- safe
+  	  var test = (function () { /* empty */ }).bind();
+  	  // eslint-disable-next-line no-prototype-builtins -- safe
+  	  return typeof test != 'function' || test.hasOwnProperty('prototype');
+  	});
+  	return functionBindNative;
+  }
+
+  var functionCall;
+  var hasRequiredFunctionCall;
+
+  function requireFunctionCall () {
+  	if (hasRequiredFunctionCall) return functionCall;
+  	hasRequiredFunctionCall = 1;
+  	var NATIVE_BIND = requireFunctionBindNative();
+
+  	var call = Function.prototype.call;
+
+  	functionCall = NATIVE_BIND ? call.bind(call) : function () {
+  	  return call.apply(call, arguments);
+  	};
+  	return functionCall;
+  }
 
   var objectPropertyIsEnumerable = {};
 
-  var $propertyIsEnumerable = {}.propertyIsEnumerable;
-  // eslint-disable-next-line es/no-object-getownpropertydescriptor -- safe
-  var getOwnPropertyDescriptor$1 = Object.getOwnPropertyDescriptor;
+  var hasRequiredObjectPropertyIsEnumerable;
 
-  // Nashorn ~ JDK8 bug
-  var NASHORN_BUG = getOwnPropertyDescriptor$1 && !$propertyIsEnumerable.call({ 1: 2 }, 1);
+  function requireObjectPropertyIsEnumerable () {
+  	if (hasRequiredObjectPropertyIsEnumerable) return objectPropertyIsEnumerable;
+  	hasRequiredObjectPropertyIsEnumerable = 1;
+  	var $propertyIsEnumerable = {}.propertyIsEnumerable;
+  	// eslint-disable-next-line es/no-object-getownpropertydescriptor -- safe
+  	var getOwnPropertyDescriptor = Object.getOwnPropertyDescriptor;
 
-  // `Object.prototype.propertyIsEnumerable` method implementation
-  // https://tc39.es/ecma262/#sec-object.prototype.propertyisenumerable
-  objectPropertyIsEnumerable.f = NASHORN_BUG ? function propertyIsEnumerable(V) {
-    var descriptor = getOwnPropertyDescriptor$1(this, V);
-    return !!descriptor && descriptor.enumerable;
-  } : $propertyIsEnumerable;
+  	// Nashorn ~ JDK8 bug
+  	var NASHORN_BUG = getOwnPropertyDescriptor && !$propertyIsEnumerable.call({ 1: 2 }, 1);
 
-  var createPropertyDescriptor$3 = function (bitmap, value) {
-    return {
-      enumerable: !(bitmap & 1),
-      configurable: !(bitmap & 2),
-      writable: !(bitmap & 4),
-      value: value
-    };
-  };
-
-  var NATIVE_BIND$1 = functionBindNative;
-
-  var FunctionPrototype$1 = Function.prototype;
-  var call$4 = FunctionPrototype$1.call;
-  var uncurryThisWithBind = NATIVE_BIND$1 && FunctionPrototype$1.bind.bind(call$4, call$4);
-
-  var functionUncurryThis = NATIVE_BIND$1 ? uncurryThisWithBind : function (fn) {
-    return function () {
-      return call$4.apply(fn, arguments);
-    };
-  };
-
-  var uncurryThis$d = functionUncurryThis;
-
-  var toString$2 = uncurryThis$d({}.toString);
-  var stringSlice$1 = uncurryThis$d(''.slice);
-
-  var classofRaw$2 = function (it) {
-    return stringSlice$1(toString$2(it), 8, -1);
-  };
-
-  var uncurryThis$c = functionUncurryThis;
-  var fails$9 = fails$c;
-  var classof$4 = classofRaw$2;
-
-  var $Object$3 = Object;
-  var split = uncurryThis$c(''.split);
-
-  // fallback for non-array-like ES3 and non-enumerable old V8 strings
-  var indexedObject = fails$9(function () {
-    // throws an error in rhino, see https://github.com/mozilla/rhino/issues/346
-    // eslint-disable-next-line no-prototype-builtins -- safe
-    return !$Object$3('z').propertyIsEnumerable(0);
-  }) ? function (it) {
-    return classof$4(it) === 'String' ? split(it, '') : $Object$3(it);
-  } : $Object$3;
-
-  // we can't use just `it == null` since of `document.all` special case
-  // https://tc39.es/ecma262/#sec-IsHTMLDDA-internal-slot-aec
-  var isNullOrUndefined$2 = function (it) {
-    return it === null || it === undefined;
-  };
-
-  var isNullOrUndefined$1 = isNullOrUndefined$2;
-
-  var $TypeError$6 = TypeError;
-
-  // `RequireObjectCoercible` abstract operation
-  // https://tc39.es/ecma262/#sec-requireobjectcoercible
-  var requireObjectCoercible$2 = function (it) {
-    if (isNullOrUndefined$1(it)) throw new $TypeError$6("Can't call method on " + it);
-    return it;
-  };
-
-  // toObject with fallback for non-array-like ES3 strings
-  var IndexedObject$2 = indexedObject;
-  var requireObjectCoercible$1 = requireObjectCoercible$2;
-
-  var toIndexedObject$4 = function (it) {
-    return IndexedObject$2(requireObjectCoercible$1(it));
-  };
-
-  // https://tc39.es/ecma262/#sec-IsHTMLDDA-internal-slot
-  var documentAll = typeof document == 'object' && document.all;
-
-  // `IsCallable` abstract operation
-  // https://tc39.es/ecma262/#sec-iscallable
-  // eslint-disable-next-line unicorn/no-typeof-undefined -- required for testing
-  var isCallable$c = typeof documentAll == 'undefined' && documentAll !== undefined ? function (argument) {
-    return typeof argument == 'function' || argument === documentAll;
-  } : function (argument) {
-    return typeof argument == 'function';
-  };
-
-  var isCallable$b = isCallable$c;
-
-  var isObject$7 = function (it) {
-    return typeof it == 'object' ? it !== null : isCallable$b(it);
-  };
-
-  var global$9 = global$a;
-  var isCallable$a = isCallable$c;
-
-  var aFunction = function (argument) {
-    return isCallable$a(argument) ? argument : undefined;
-  };
-
-  var getBuiltIn$4 = function (namespace, method) {
-    return arguments.length < 2 ? aFunction(global$9[namespace]) : global$9[namespace] && global$9[namespace][method];
-  };
-
-  var uncurryThis$b = functionUncurryThis;
-
-  var objectIsPrototypeOf = uncurryThis$b({}.isPrototypeOf);
-
-  var engineUserAgent = typeof navigator != 'undefined' && String(navigator.userAgent) || '';
-
-  var global$8 = global$a;
-  var userAgent = engineUserAgent;
-
-  var process = global$8.process;
-  var Deno = global$8.Deno;
-  var versions = process && process.versions || Deno && Deno.version;
-  var v8 = versions && versions.v8;
-  var match, version;
-
-  if (v8) {
-    match = v8.split('.');
-    // in old Chrome, versions of V8 isn't V8 = Chrome / 10
-    // but their correct versions are not interesting for us
-    version = match[0] > 0 && match[0] < 4 ? 1 : +(match[0] + match[1]);
+  	// `Object.prototype.propertyIsEnumerable` method implementation
+  	// https://tc39.es/ecma262/#sec-object.prototype.propertyisenumerable
+  	objectPropertyIsEnumerable.f = NASHORN_BUG ? function propertyIsEnumerable(V) {
+  	  var descriptor = getOwnPropertyDescriptor(this, V);
+  	  return !!descriptor && descriptor.enumerable;
+  	} : $propertyIsEnumerable;
+  	return objectPropertyIsEnumerable;
   }
 
-  // BrowserFS NodeJS `process` polyfill incorrectly set `.v8` to `0.0`
-  // so check `userAgent` even if `.v8` exists, but 0
-  if (!version && userAgent) {
-    match = userAgent.match(/Edge\/(\d+)/);
-    if (!match || match[1] >= 74) {
-      match = userAgent.match(/Chrome\/(\d+)/);
-      if (match) version = +match[1];
-    }
+  var createPropertyDescriptor;
+  var hasRequiredCreatePropertyDescriptor;
+
+  function requireCreatePropertyDescriptor () {
+  	if (hasRequiredCreatePropertyDescriptor) return createPropertyDescriptor;
+  	hasRequiredCreatePropertyDescriptor = 1;
+  	createPropertyDescriptor = function (bitmap, value) {
+  	  return {
+  	    enumerable: !(bitmap & 1),
+  	    configurable: !(bitmap & 2),
+  	    writable: !(bitmap & 4),
+  	    value: value
+  	  };
+  	};
+  	return createPropertyDescriptor;
   }
 
-  var engineV8Version = version;
+  var functionUncurryThis;
+  var hasRequiredFunctionUncurryThis;
 
-  /* eslint-disable es/no-symbol -- required for testing */
-  var V8_VERSION$2 = engineV8Version;
-  var fails$8 = fails$c;
-  var global$7 = global$a;
+  function requireFunctionUncurryThis () {
+  	if (hasRequiredFunctionUncurryThis) return functionUncurryThis;
+  	hasRequiredFunctionUncurryThis = 1;
+  	var NATIVE_BIND = requireFunctionBindNative();
 
-  var $String$3 = global$7.String;
+  	var FunctionPrototype = Function.prototype;
+  	var call = FunctionPrototype.call;
+  	var uncurryThisWithBind = NATIVE_BIND && FunctionPrototype.bind.bind(call, call);
 
-  // eslint-disable-next-line es/no-object-getownpropertysymbols -- required for testing
-  var symbolConstructorDetection = !!Object.getOwnPropertySymbols && !fails$8(function () {
-    var symbol = Symbol('symbol detection');
-    // Chrome 38 Symbol has incorrect toString conversion
-    // `get-own-property-symbols` polyfill symbols converted to object are not Symbol instances
-    // nb: Do not call `String` directly to avoid this being optimized out to `symbol+''` which will,
-    // of course, fail.
-    return !$String$3(symbol) || !(Object(symbol) instanceof Symbol) ||
-      // Chrome 38-40 symbols are not inherited from DOM collections prototypes to instances
-      !Symbol.sham && V8_VERSION$2 && V8_VERSION$2 < 41;
-  });
+  	functionUncurryThis = NATIVE_BIND ? uncurryThisWithBind : function (fn) {
+  	  return function () {
+  	    return call.apply(fn, arguments);
+  	  };
+  	};
+  	return functionUncurryThis;
+  }
 
-  /* eslint-disable es/no-symbol -- required for testing */
-  var NATIVE_SYMBOL$1 = symbolConstructorDetection;
+  var classofRaw;
+  var hasRequiredClassofRaw;
 
-  var useSymbolAsUid = NATIVE_SYMBOL$1
-    && !Symbol.sham
-    && typeof Symbol.iterator == 'symbol';
+  function requireClassofRaw () {
+  	if (hasRequiredClassofRaw) return classofRaw;
+  	hasRequiredClassofRaw = 1;
+  	var uncurryThis = requireFunctionUncurryThis();
 
-  var getBuiltIn$3 = getBuiltIn$4;
-  var isCallable$9 = isCallable$c;
-  var isPrototypeOf = objectIsPrototypeOf;
-  var USE_SYMBOL_AS_UID$1 = useSymbolAsUid;
+  	var toString = uncurryThis({}.toString);
+  	var stringSlice = uncurryThis(''.slice);
 
-  var $Object$2 = Object;
+  	classofRaw = function (it) {
+  	  return stringSlice(toString(it), 8, -1);
+  	};
+  	return classofRaw;
+  }
 
-  var isSymbol$2 = USE_SYMBOL_AS_UID$1 ? function (it) {
-    return typeof it == 'symbol';
-  } : function (it) {
-    var $Symbol = getBuiltIn$3('Symbol');
-    return isCallable$9($Symbol) && isPrototypeOf($Symbol.prototype, $Object$2(it));
-  };
+  var indexedObject;
+  var hasRequiredIndexedObject;
 
-  var $String$2 = String;
+  function requireIndexedObject () {
+  	if (hasRequiredIndexedObject) return indexedObject;
+  	hasRequiredIndexedObject = 1;
+  	var uncurryThis = requireFunctionUncurryThis();
+  	var fails = requireFails();
+  	var classof = requireClassofRaw();
 
-  var tryToString$1 = function (argument) {
-    try {
-      return $String$2(argument);
-    } catch (error) {
-      return 'Object';
-    }
-  };
+  	var $Object = Object;
+  	var split = uncurryThis(''.split);
 
-  var isCallable$8 = isCallable$c;
-  var tryToString = tryToString$1;
+  	// fallback for non-array-like ES3 and non-enumerable old V8 strings
+  	indexedObject = fails(function () {
+  	  // throws an error in rhino, see https://github.com/mozilla/rhino/issues/346
+  	  // eslint-disable-next-line no-prototype-builtins -- safe
+  	  return !$Object('z').propertyIsEnumerable(0);
+  	}) ? function (it) {
+  	  return classof(it) === 'String' ? split(it, '') : $Object(it);
+  	} : $Object;
+  	return indexedObject;
+  }
 
-  var $TypeError$5 = TypeError;
+  var isNullOrUndefined;
+  var hasRequiredIsNullOrUndefined;
 
-  // `Assert: IsCallable(argument) is true`
-  var aCallable$2 = function (argument) {
-    if (isCallable$8(argument)) return argument;
-    throw new $TypeError$5(tryToString(argument) + ' is not a function');
-  };
+  function requireIsNullOrUndefined () {
+  	if (hasRequiredIsNullOrUndefined) return isNullOrUndefined;
+  	hasRequiredIsNullOrUndefined = 1;
+  	// we can't use just `it == null` since of `document.all` special case
+  	// https://tc39.es/ecma262/#sec-IsHTMLDDA-internal-slot-aec
+  	isNullOrUndefined = function (it) {
+  	  return it === null || it === undefined;
+  	};
+  	return isNullOrUndefined;
+  }
 
-  var aCallable$1 = aCallable$2;
-  var isNullOrUndefined = isNullOrUndefined$2;
+  var requireObjectCoercible;
+  var hasRequiredRequireObjectCoercible;
 
-  // `GetMethod` abstract operation
-  // https://tc39.es/ecma262/#sec-getmethod
-  var getMethod$1 = function (V, P) {
-    var func = V[P];
-    return isNullOrUndefined(func) ? undefined : aCallable$1(func);
-  };
+  function requireRequireObjectCoercible () {
+  	if (hasRequiredRequireObjectCoercible) return requireObjectCoercible;
+  	hasRequiredRequireObjectCoercible = 1;
+  	var isNullOrUndefined = requireIsNullOrUndefined();
 
-  var call$3 = functionCall;
-  var isCallable$7 = isCallable$c;
-  var isObject$6 = isObject$7;
+  	var $TypeError = TypeError;
 
-  var $TypeError$4 = TypeError;
+  	// `RequireObjectCoercible` abstract operation
+  	// https://tc39.es/ecma262/#sec-requireobjectcoercible
+  	requireObjectCoercible = function (it) {
+  	  if (isNullOrUndefined(it)) throw new $TypeError("Can't call method on " + it);
+  	  return it;
+  	};
+  	return requireObjectCoercible;
+  }
 
-  // `OrdinaryToPrimitive` abstract operation
-  // https://tc39.es/ecma262/#sec-ordinarytoprimitive
-  var ordinaryToPrimitive$1 = function (input, pref) {
-    var fn, val;
-    if (pref === 'string' && isCallable$7(fn = input.toString) && !isObject$6(val = call$3(fn, input))) return val;
-    if (isCallable$7(fn = input.valueOf) && !isObject$6(val = call$3(fn, input))) return val;
-    if (pref !== 'string' && isCallable$7(fn = input.toString) && !isObject$6(val = call$3(fn, input))) return val;
-    throw new $TypeError$4("Can't convert object to primitive value");
-  };
+  var toIndexedObject;
+  var hasRequiredToIndexedObject;
+
+  function requireToIndexedObject () {
+  	if (hasRequiredToIndexedObject) return toIndexedObject;
+  	hasRequiredToIndexedObject = 1;
+  	// toObject with fallback for non-array-like ES3 strings
+  	var IndexedObject = requireIndexedObject();
+  	var requireObjectCoercible = requireRequireObjectCoercible();
+
+  	toIndexedObject = function (it) {
+  	  return IndexedObject(requireObjectCoercible(it));
+  	};
+  	return toIndexedObject;
+  }
+
+  var isCallable;
+  var hasRequiredIsCallable;
+
+  function requireIsCallable () {
+  	if (hasRequiredIsCallable) return isCallable;
+  	hasRequiredIsCallable = 1;
+  	// https://tc39.es/ecma262/#sec-IsHTMLDDA-internal-slot
+  	var documentAll = typeof document == 'object' && document.all;
+
+  	// `IsCallable` abstract operation
+  	// https://tc39.es/ecma262/#sec-iscallable
+  	// eslint-disable-next-line unicorn/no-typeof-undefined -- required for testing
+  	isCallable = typeof documentAll == 'undefined' && documentAll !== undefined ? function (argument) {
+  	  return typeof argument == 'function' || argument === documentAll;
+  	} : function (argument) {
+  	  return typeof argument == 'function';
+  	};
+  	return isCallable;
+  }
+
+  var isObject;
+  var hasRequiredIsObject;
+
+  function requireIsObject () {
+  	if (hasRequiredIsObject) return isObject;
+  	hasRequiredIsObject = 1;
+  	var isCallable = requireIsCallable();
+
+  	isObject = function (it) {
+  	  return typeof it == 'object' ? it !== null : isCallable(it);
+  	};
+  	return isObject;
+  }
+
+  var getBuiltIn;
+  var hasRequiredGetBuiltIn;
+
+  function requireGetBuiltIn () {
+  	if (hasRequiredGetBuiltIn) return getBuiltIn;
+  	hasRequiredGetBuiltIn = 1;
+  	var globalThis = requireGlobalThis();
+  	var isCallable = requireIsCallable();
+
+  	var aFunction = function (argument) {
+  	  return isCallable(argument) ? argument : undefined;
+  	};
+
+  	getBuiltIn = function (namespace, method) {
+  	  return arguments.length < 2 ? aFunction(globalThis[namespace]) : globalThis[namespace] && globalThis[namespace][method];
+  	};
+  	return getBuiltIn;
+  }
+
+  var objectIsPrototypeOf;
+  var hasRequiredObjectIsPrototypeOf;
+
+  function requireObjectIsPrototypeOf () {
+  	if (hasRequiredObjectIsPrototypeOf) return objectIsPrototypeOf;
+  	hasRequiredObjectIsPrototypeOf = 1;
+  	var uncurryThis = requireFunctionUncurryThis();
+
+  	objectIsPrototypeOf = uncurryThis({}.isPrototypeOf);
+  	return objectIsPrototypeOf;
+  }
+
+  var environmentUserAgent;
+  var hasRequiredEnvironmentUserAgent;
+
+  function requireEnvironmentUserAgent () {
+  	if (hasRequiredEnvironmentUserAgent) return environmentUserAgent;
+  	hasRequiredEnvironmentUserAgent = 1;
+  	var globalThis = requireGlobalThis();
+
+  	var navigator = globalThis.navigator;
+  	var userAgent = navigator && navigator.userAgent;
+
+  	environmentUserAgent = userAgent ? String(userAgent) : '';
+  	return environmentUserAgent;
+  }
+
+  var environmentV8Version;
+  var hasRequiredEnvironmentV8Version;
+
+  function requireEnvironmentV8Version () {
+  	if (hasRequiredEnvironmentV8Version) return environmentV8Version;
+  	hasRequiredEnvironmentV8Version = 1;
+  	var globalThis = requireGlobalThis();
+  	var userAgent = requireEnvironmentUserAgent();
+
+  	var process = globalThis.process;
+  	var Deno = globalThis.Deno;
+  	var versions = process && process.versions || Deno && Deno.version;
+  	var v8 = versions && versions.v8;
+  	var match, version;
+
+  	if (v8) {
+  	  match = v8.split('.');
+  	  // in old Chrome, versions of V8 isn't V8 = Chrome / 10
+  	  // but their correct versions are not interesting for us
+  	  version = match[0] > 0 && match[0] < 4 ? 1 : +(match[0] + match[1]);
+  	}
+
+  	// BrowserFS NodeJS `process` polyfill incorrectly set `.v8` to `0.0`
+  	// so check `userAgent` even if `.v8` exists, but 0
+  	if (!version && userAgent) {
+  	  match = userAgent.match(/Edge\/(\d+)/);
+  	  if (!match || match[1] >= 74) {
+  	    match = userAgent.match(/Chrome\/(\d+)/);
+  	    if (match) version = +match[1];
+  	  }
+  	}
+
+  	environmentV8Version = version;
+  	return environmentV8Version;
+  }
+
+  var symbolConstructorDetection;
+  var hasRequiredSymbolConstructorDetection;
+
+  function requireSymbolConstructorDetection () {
+  	if (hasRequiredSymbolConstructorDetection) return symbolConstructorDetection;
+  	hasRequiredSymbolConstructorDetection = 1;
+  	/* eslint-disable es/no-symbol -- required for testing */
+  	var V8_VERSION = requireEnvironmentV8Version();
+  	var fails = requireFails();
+  	var globalThis = requireGlobalThis();
+
+  	var $String = globalThis.String;
+
+  	// eslint-disable-next-line es/no-object-getownpropertysymbols -- required for testing
+  	symbolConstructorDetection = !!Object.getOwnPropertySymbols && !fails(function () {
+  	  var symbol = Symbol('symbol detection');
+  	  // Chrome 38 Symbol has incorrect toString conversion
+  	  // `get-own-property-symbols` polyfill symbols converted to object are not Symbol instances
+  	  // nb: Do not call `String` directly to avoid this being optimized out to `symbol+''` which will,
+  	  // of course, fail.
+  	  return !$String(symbol) || !(Object(symbol) instanceof Symbol) ||
+  	    // Chrome 38-40 symbols are not inherited from DOM collections prototypes to instances
+  	    !Symbol.sham && V8_VERSION && V8_VERSION < 41;
+  	});
+  	return symbolConstructorDetection;
+  }
+
+  var useSymbolAsUid;
+  var hasRequiredUseSymbolAsUid;
+
+  function requireUseSymbolAsUid () {
+  	if (hasRequiredUseSymbolAsUid) return useSymbolAsUid;
+  	hasRequiredUseSymbolAsUid = 1;
+  	/* eslint-disable es/no-symbol -- required for testing */
+  	var NATIVE_SYMBOL = requireSymbolConstructorDetection();
+
+  	useSymbolAsUid = NATIVE_SYMBOL &&
+  	  !Symbol.sham &&
+  	  typeof Symbol.iterator == 'symbol';
+  	return useSymbolAsUid;
+  }
+
+  var isSymbol;
+  var hasRequiredIsSymbol;
+
+  function requireIsSymbol () {
+  	if (hasRequiredIsSymbol) return isSymbol;
+  	hasRequiredIsSymbol = 1;
+  	var getBuiltIn = requireGetBuiltIn();
+  	var isCallable = requireIsCallable();
+  	var isPrototypeOf = requireObjectIsPrototypeOf();
+  	var USE_SYMBOL_AS_UID = requireUseSymbolAsUid();
+
+  	var $Object = Object;
+
+  	isSymbol = USE_SYMBOL_AS_UID ? function (it) {
+  	  return typeof it == 'symbol';
+  	} : function (it) {
+  	  var $Symbol = getBuiltIn('Symbol');
+  	  return isCallable($Symbol) && isPrototypeOf($Symbol.prototype, $Object(it));
+  	};
+  	return isSymbol;
+  }
+
+  var tryToString;
+  var hasRequiredTryToString;
+
+  function requireTryToString () {
+  	if (hasRequiredTryToString) return tryToString;
+  	hasRequiredTryToString = 1;
+  	var $String = String;
+
+  	tryToString = function (argument) {
+  	  try {
+  	    return $String(argument);
+  	  } catch (error) {
+  	    return 'Object';
+  	  }
+  	};
+  	return tryToString;
+  }
+
+  var aCallable;
+  var hasRequiredACallable;
+
+  function requireACallable () {
+  	if (hasRequiredACallable) return aCallable;
+  	hasRequiredACallable = 1;
+  	var isCallable = requireIsCallable();
+  	var tryToString = requireTryToString();
+
+  	var $TypeError = TypeError;
+
+  	// `Assert: IsCallable(argument) is true`
+  	aCallable = function (argument) {
+  	  if (isCallable(argument)) return argument;
+  	  throw new $TypeError(tryToString(argument) + ' is not a function');
+  	};
+  	return aCallable;
+  }
+
+  var getMethod;
+  var hasRequiredGetMethod;
+
+  function requireGetMethod () {
+  	if (hasRequiredGetMethod) return getMethod;
+  	hasRequiredGetMethod = 1;
+  	var aCallable = requireACallable();
+  	var isNullOrUndefined = requireIsNullOrUndefined();
+
+  	// `GetMethod` abstract operation
+  	// https://tc39.es/ecma262/#sec-getmethod
+  	getMethod = function (V, P) {
+  	  var func = V[P];
+  	  return isNullOrUndefined(func) ? undefined : aCallable(func);
+  	};
+  	return getMethod;
+  }
+
+  var ordinaryToPrimitive;
+  var hasRequiredOrdinaryToPrimitive;
+
+  function requireOrdinaryToPrimitive () {
+  	if (hasRequiredOrdinaryToPrimitive) return ordinaryToPrimitive;
+  	hasRequiredOrdinaryToPrimitive = 1;
+  	var call = requireFunctionCall();
+  	var isCallable = requireIsCallable();
+  	var isObject = requireIsObject();
+
+  	var $TypeError = TypeError;
+
+  	// `OrdinaryToPrimitive` abstract operation
+  	// https://tc39.es/ecma262/#sec-ordinarytoprimitive
+  	ordinaryToPrimitive = function (input, pref) {
+  	  var fn, val;
+  	  if (pref === 'string' && isCallable(fn = input.toString) && !isObject(val = call(fn, input))) return val;
+  	  if (isCallable(fn = input.valueOf) && !isObject(val = call(fn, input))) return val;
+  	  if (pref !== 'string' && isCallable(fn = input.toString) && !isObject(val = call(fn, input))) return val;
+  	  throw new $TypeError("Can't convert object to primitive value");
+  	};
+  	return ordinaryToPrimitive;
+  }
 
   var sharedStore = {exports: {}};
 
-  var global$6 = global$a;
+  var isPure;
+  var hasRequiredIsPure;
 
-  // eslint-disable-next-line es/no-object-defineproperty -- safe
-  var defineProperty$3 = Object.defineProperty;
+  function requireIsPure () {
+  	if (hasRequiredIsPure) return isPure;
+  	hasRequiredIsPure = 1;
+  	isPure = false;
+  	return isPure;
+  }
 
-  var defineGlobalProperty$3 = function (key, value) {
-    try {
-      defineProperty$3(global$6, key, { value: value, configurable: true, writable: true });
-    } catch (error) {
-      global$6[key] = value;
-    } return value;
-  };
+  var defineGlobalProperty;
+  var hasRequiredDefineGlobalProperty;
 
-  var globalThis$1 = global$a;
-  var defineGlobalProperty$2 = defineGlobalProperty$3;
+  function requireDefineGlobalProperty () {
+  	if (hasRequiredDefineGlobalProperty) return defineGlobalProperty;
+  	hasRequiredDefineGlobalProperty = 1;
+  	var globalThis = requireGlobalThis();
 
-  var SHARED = '__core-js_shared__';
-  var store$3 = sharedStore.exports = globalThis$1[SHARED] || defineGlobalProperty$2(SHARED, {});
+  	// eslint-disable-next-line es/no-object-defineproperty -- safe
+  	var defineProperty = Object.defineProperty;
 
-  (store$3.versions || (store$3.versions = [])).push({
-    version: '3.36.1',
-    mode: 'global',
-    copyright: '© 2014-2024 Denis Pushkarev (zloirock.ru)',
-    license: 'https://github.com/zloirock/core-js/blob/v3.36.1/LICENSE',
-    source: 'https://github.com/zloirock/core-js'
-  });
+  	defineGlobalProperty = function (key, value) {
+  	  try {
+  	    defineProperty(globalThis, key, { value: value, configurable: true, writable: true });
+  	  } catch (error) {
+  	    globalThis[key] = value;
+  	  } return value;
+  	};
+  	return defineGlobalProperty;
+  }
 
-  var sharedStoreExports = sharedStore.exports;
+  var hasRequiredSharedStore;
 
-  var store$2 = sharedStoreExports;
+  function requireSharedStore () {
+  	if (hasRequiredSharedStore) return sharedStore.exports;
+  	hasRequiredSharedStore = 1;
+  	var IS_PURE = requireIsPure();
+  	var globalThis = requireGlobalThis();
+  	var defineGlobalProperty = requireDefineGlobalProperty();
 
-  var shared$3 = function (key, value) {
-    return store$2[key] || (store$2[key] = value || {});
-  };
+  	var SHARED = '__core-js_shared__';
+  	var store = sharedStore.exports = globalThis[SHARED] || defineGlobalProperty(SHARED, {});
 
-  var requireObjectCoercible = requireObjectCoercible$2;
+  	(store.versions || (store.versions = [])).push({
+  	  version: '3.39.0',
+  	  mode: IS_PURE ? 'pure' : 'global',
+  	  copyright: '© 2014-2024 Denis Pushkarev (zloirock.ru)',
+  	  license: 'https://github.com/zloirock/core-js/blob/v3.39.0/LICENSE',
+  	  source: 'https://github.com/zloirock/core-js'
+  	});
+  	return sharedStore.exports;
+  }
 
-  var $Object$1 = Object;
+  var shared;
+  var hasRequiredShared;
 
-  // `ToObject` abstract operation
-  // https://tc39.es/ecma262/#sec-toobject
-  var toObject$4 = function (argument) {
-    return $Object$1(requireObjectCoercible(argument));
-  };
+  function requireShared () {
+  	if (hasRequiredShared) return shared;
+  	hasRequiredShared = 1;
+  	var store = requireSharedStore();
 
-  var uncurryThis$a = functionUncurryThis;
-  var toObject$3 = toObject$4;
+  	shared = function (key, value) {
+  	  return store[key] || (store[key] = value || {});
+  	};
+  	return shared;
+  }
 
-  var hasOwnProperty = uncurryThis$a({}.hasOwnProperty);
+  var toObject;
+  var hasRequiredToObject;
 
-  // `HasOwnProperty` abstract operation
-  // https://tc39.es/ecma262/#sec-hasownproperty
-  // eslint-disable-next-line es/no-object-hasown -- safe
-  var hasOwnProperty_1 = Object.hasOwn || function hasOwn(it, key) {
-    return hasOwnProperty(toObject$3(it), key);
-  };
+  function requireToObject () {
+  	if (hasRequiredToObject) return toObject;
+  	hasRequiredToObject = 1;
+  	var requireObjectCoercible = requireRequireObjectCoercible();
 
-  var uncurryThis$9 = functionUncurryThis;
+  	var $Object = Object;
 
-  var id = 0;
-  var postfix = Math.random();
-  var toString$1 = uncurryThis$9(1.0.toString);
+  	// `ToObject` abstract operation
+  	// https://tc39.es/ecma262/#sec-toobject
+  	toObject = function (argument) {
+  	  return $Object(requireObjectCoercible(argument));
+  	};
+  	return toObject;
+  }
 
-  var uid$2 = function (key) {
-    return 'Symbol(' + (key === undefined ? '' : key) + ')_' + toString$1(++id + postfix, 36);
-  };
+  var hasOwnProperty_1;
+  var hasRequiredHasOwnProperty;
 
-  var global$5 = global$a;
-  var shared$2 = shared$3;
-  var hasOwn$6 = hasOwnProperty_1;
-  var uid$1 = uid$2;
-  var NATIVE_SYMBOL = symbolConstructorDetection;
-  var USE_SYMBOL_AS_UID = useSymbolAsUid;
+  function requireHasOwnProperty () {
+  	if (hasRequiredHasOwnProperty) return hasOwnProperty_1;
+  	hasRequiredHasOwnProperty = 1;
+  	var uncurryThis = requireFunctionUncurryThis();
+  	var toObject = requireToObject();
 
-  var Symbol$1 = global$5.Symbol;
-  var WellKnownSymbolsStore = shared$2('wks');
-  var createWellKnownSymbol = USE_SYMBOL_AS_UID ? Symbol$1['for'] || Symbol$1 : Symbol$1 && Symbol$1.withoutSetter || uid$1;
+  	var hasOwnProperty = uncurryThis({}.hasOwnProperty);
 
-  var wellKnownSymbol$7 = function (name) {
-    if (!hasOwn$6(WellKnownSymbolsStore, name)) {
-      WellKnownSymbolsStore[name] = NATIVE_SYMBOL && hasOwn$6(Symbol$1, name)
-        ? Symbol$1[name]
-        : createWellKnownSymbol('Symbol.' + name);
-    } return WellKnownSymbolsStore[name];
-  };
+  	// `HasOwnProperty` abstract operation
+  	// https://tc39.es/ecma262/#sec-hasownproperty
+  	// eslint-disable-next-line es/no-object-hasown -- safe
+  	hasOwnProperty_1 = Object.hasOwn || function hasOwn(it, key) {
+  	  return hasOwnProperty(toObject(it), key);
+  	};
+  	return hasOwnProperty_1;
+  }
 
-  var call$2 = functionCall;
-  var isObject$5 = isObject$7;
-  var isSymbol$1 = isSymbol$2;
-  var getMethod = getMethod$1;
-  var ordinaryToPrimitive = ordinaryToPrimitive$1;
-  var wellKnownSymbol$6 = wellKnownSymbol$7;
+  var uid;
+  var hasRequiredUid;
 
-  var $TypeError$3 = TypeError;
-  var TO_PRIMITIVE = wellKnownSymbol$6('toPrimitive');
+  function requireUid () {
+  	if (hasRequiredUid) return uid;
+  	hasRequiredUid = 1;
+  	var uncurryThis = requireFunctionUncurryThis();
 
-  // `ToPrimitive` abstract operation
-  // https://tc39.es/ecma262/#sec-toprimitive
-  var toPrimitive$1 = function (input, pref) {
-    if (!isObject$5(input) || isSymbol$1(input)) return input;
-    var exoticToPrim = getMethod(input, TO_PRIMITIVE);
-    var result;
-    if (exoticToPrim) {
-      if (pref === undefined) pref = 'default';
-      result = call$2(exoticToPrim, input, pref);
-      if (!isObject$5(result) || isSymbol$1(result)) return result;
-      throw new $TypeError$3("Can't convert object to primitive value");
-    }
-    if (pref === undefined) pref = 'number';
-    return ordinaryToPrimitive(input, pref);
-  };
+  	var id = 0;
+  	var postfix = Math.random();
+  	var toString = uncurryThis(1.0.toString);
 
-  var toPrimitive = toPrimitive$1;
-  var isSymbol = isSymbol$2;
+  	uid = function (key) {
+  	  return 'Symbol(' + (key === undefined ? '' : key) + ')_' + toString(++id + postfix, 36);
+  	};
+  	return uid;
+  }
 
-  // `ToPropertyKey` abstract operation
-  // https://tc39.es/ecma262/#sec-topropertykey
-  var toPropertyKey$2 = function (argument) {
-    var key = toPrimitive(argument, 'string');
-    return isSymbol(key) ? key : key + '';
-  };
+  var wellKnownSymbol;
+  var hasRequiredWellKnownSymbol;
 
-  var global$4 = global$a;
-  var isObject$4 = isObject$7;
+  function requireWellKnownSymbol () {
+  	if (hasRequiredWellKnownSymbol) return wellKnownSymbol;
+  	hasRequiredWellKnownSymbol = 1;
+  	var globalThis = requireGlobalThis();
+  	var shared = requireShared();
+  	var hasOwn = requireHasOwnProperty();
+  	var uid = requireUid();
+  	var NATIVE_SYMBOL = requireSymbolConstructorDetection();
+  	var USE_SYMBOL_AS_UID = requireUseSymbolAsUid();
 
-  var document$1 = global$4.document;
-  // typeof document.createElement is 'object' in old IE
-  var EXISTS$1 = isObject$4(document$1) && isObject$4(document$1.createElement);
+  	var Symbol = globalThis.Symbol;
+  	var WellKnownSymbolsStore = shared('wks');
+  	var createWellKnownSymbol = USE_SYMBOL_AS_UID ? Symbol['for'] || Symbol : Symbol && Symbol.withoutSetter || uid;
 
-  var documentCreateElement$1 = function (it) {
-    return EXISTS$1 ? document$1.createElement(it) : {};
-  };
+  	wellKnownSymbol = function (name) {
+  	  if (!hasOwn(WellKnownSymbolsStore, name)) {
+  	    WellKnownSymbolsStore[name] = NATIVE_SYMBOL && hasOwn(Symbol, name)
+  	      ? Symbol[name]
+  	      : createWellKnownSymbol('Symbol.' + name);
+  	  } return WellKnownSymbolsStore[name];
+  	};
+  	return wellKnownSymbol;
+  }
 
-  var DESCRIPTORS$9 = descriptors;
-  var fails$7 = fails$c;
-  var createElement = documentCreateElement$1;
+  var toPrimitive;
+  var hasRequiredToPrimitive;
 
-  // Thanks to IE8 for its funny defineProperty
-  var ie8DomDefine = !DESCRIPTORS$9 && !fails$7(function () {
-    // eslint-disable-next-line es/no-object-defineproperty -- required for testing
-    return Object.defineProperty(createElement('div'), 'a', {
-      get: function () { return 7; }
-    }).a !== 7;
-  });
+  function requireToPrimitive () {
+  	if (hasRequiredToPrimitive) return toPrimitive;
+  	hasRequiredToPrimitive = 1;
+  	var call = requireFunctionCall();
+  	var isObject = requireIsObject();
+  	var isSymbol = requireIsSymbol();
+  	var getMethod = requireGetMethod();
+  	var ordinaryToPrimitive = requireOrdinaryToPrimitive();
+  	var wellKnownSymbol = requireWellKnownSymbol();
 
-  var DESCRIPTORS$8 = descriptors;
-  var call$1 = functionCall;
-  var propertyIsEnumerableModule$1 = objectPropertyIsEnumerable;
-  var createPropertyDescriptor$2 = createPropertyDescriptor$3;
-  var toIndexedObject$3 = toIndexedObject$4;
-  var toPropertyKey$1 = toPropertyKey$2;
-  var hasOwn$5 = hasOwnProperty_1;
-  var IE8_DOM_DEFINE$1 = ie8DomDefine;
+  	var $TypeError = TypeError;
+  	var TO_PRIMITIVE = wellKnownSymbol('toPrimitive');
 
-  // eslint-disable-next-line es/no-object-getownpropertydescriptor -- safe
-  var $getOwnPropertyDescriptor$1 = Object.getOwnPropertyDescriptor;
+  	// `ToPrimitive` abstract operation
+  	// https://tc39.es/ecma262/#sec-toprimitive
+  	toPrimitive = function (input, pref) {
+  	  if (!isObject(input) || isSymbol(input)) return input;
+  	  var exoticToPrim = getMethod(input, TO_PRIMITIVE);
+  	  var result;
+  	  if (exoticToPrim) {
+  	    if (pref === undefined) pref = 'default';
+  	    result = call(exoticToPrim, input, pref);
+  	    if (!isObject(result) || isSymbol(result)) return result;
+  	    throw new $TypeError("Can't convert object to primitive value");
+  	  }
+  	  if (pref === undefined) pref = 'number';
+  	  return ordinaryToPrimitive(input, pref);
+  	};
+  	return toPrimitive;
+  }
 
-  // `Object.getOwnPropertyDescriptor` method
-  // https://tc39.es/ecma262/#sec-object.getownpropertydescriptor
-  objectGetOwnPropertyDescriptor.f = DESCRIPTORS$8 ? $getOwnPropertyDescriptor$1 : function getOwnPropertyDescriptor(O, P) {
-    O = toIndexedObject$3(O);
-    P = toPropertyKey$1(P);
-    if (IE8_DOM_DEFINE$1) try {
-      return $getOwnPropertyDescriptor$1(O, P);
-    } catch (error) { /* empty */ }
-    if (hasOwn$5(O, P)) return createPropertyDescriptor$2(!call$1(propertyIsEnumerableModule$1.f, O, P), O[P]);
-  };
+  var toPropertyKey;
+  var hasRequiredToPropertyKey;
+
+  function requireToPropertyKey () {
+  	if (hasRequiredToPropertyKey) return toPropertyKey;
+  	hasRequiredToPropertyKey = 1;
+  	var toPrimitive = requireToPrimitive();
+  	var isSymbol = requireIsSymbol();
+
+  	// `ToPropertyKey` abstract operation
+  	// https://tc39.es/ecma262/#sec-topropertykey
+  	toPropertyKey = function (argument) {
+  	  var key = toPrimitive(argument, 'string');
+  	  return isSymbol(key) ? key : key + '';
+  	};
+  	return toPropertyKey;
+  }
+
+  var documentCreateElement;
+  var hasRequiredDocumentCreateElement;
+
+  function requireDocumentCreateElement () {
+  	if (hasRequiredDocumentCreateElement) return documentCreateElement;
+  	hasRequiredDocumentCreateElement = 1;
+  	var globalThis = requireGlobalThis();
+  	var isObject = requireIsObject();
+
+  	var document = globalThis.document;
+  	// typeof document.createElement is 'object' in old IE
+  	var EXISTS = isObject(document) && isObject(document.createElement);
+
+  	documentCreateElement = function (it) {
+  	  return EXISTS ? document.createElement(it) : {};
+  	};
+  	return documentCreateElement;
+  }
+
+  var ie8DomDefine;
+  var hasRequiredIe8DomDefine;
+
+  function requireIe8DomDefine () {
+  	if (hasRequiredIe8DomDefine) return ie8DomDefine;
+  	hasRequiredIe8DomDefine = 1;
+  	var DESCRIPTORS = requireDescriptors();
+  	var fails = requireFails();
+  	var createElement = requireDocumentCreateElement();
+
+  	// Thanks to IE8 for its funny defineProperty
+  	ie8DomDefine = !DESCRIPTORS && !fails(function () {
+  	  // eslint-disable-next-line es/no-object-defineproperty -- required for testing
+  	  return Object.defineProperty(createElement('div'), 'a', {
+  	    get: function () { return 7; }
+  	  }).a !== 7;
+  	});
+  	return ie8DomDefine;
+  }
+
+  var hasRequiredObjectGetOwnPropertyDescriptor;
+
+  function requireObjectGetOwnPropertyDescriptor () {
+  	if (hasRequiredObjectGetOwnPropertyDescriptor) return objectGetOwnPropertyDescriptor;
+  	hasRequiredObjectGetOwnPropertyDescriptor = 1;
+  	var DESCRIPTORS = requireDescriptors();
+  	var call = requireFunctionCall();
+  	var propertyIsEnumerableModule = requireObjectPropertyIsEnumerable();
+  	var createPropertyDescriptor = requireCreatePropertyDescriptor();
+  	var toIndexedObject = requireToIndexedObject();
+  	var toPropertyKey = requireToPropertyKey();
+  	var hasOwn = requireHasOwnProperty();
+  	var IE8_DOM_DEFINE = requireIe8DomDefine();
+
+  	// eslint-disable-next-line es/no-object-getownpropertydescriptor -- safe
+  	var $getOwnPropertyDescriptor = Object.getOwnPropertyDescriptor;
+
+  	// `Object.getOwnPropertyDescriptor` method
+  	// https://tc39.es/ecma262/#sec-object.getownpropertydescriptor
+  	objectGetOwnPropertyDescriptor.f = DESCRIPTORS ? $getOwnPropertyDescriptor : function getOwnPropertyDescriptor(O, P) {
+  	  O = toIndexedObject(O);
+  	  P = toPropertyKey(P);
+  	  if (IE8_DOM_DEFINE) try {
+  	    return $getOwnPropertyDescriptor(O, P);
+  	  } catch (error) { /* empty */ }
+  	  if (hasOwn(O, P)) return createPropertyDescriptor(!call(propertyIsEnumerableModule.f, O, P), O[P]);
+  	};
+  	return objectGetOwnPropertyDescriptor;
+  }
 
   var objectDefineProperty = {};
 
-  var DESCRIPTORS$7 = descriptors;
-  var fails$6 = fails$c;
+  var v8PrototypeDefineBug;
+  var hasRequiredV8PrototypeDefineBug;
 
-  // V8 ~ Chrome 36-
-  // https://bugs.chromium.org/p/v8/issues/detail?id=3334
-  var v8PrototypeDefineBug = DESCRIPTORS$7 && fails$6(function () {
-    // eslint-disable-next-line es/no-object-defineproperty -- required for testing
-    return Object.defineProperty(function () { /* empty */ }, 'prototype', {
-      value: 42,
-      writable: false
-    }).prototype !== 42;
-  });
+  function requireV8PrototypeDefineBug () {
+  	if (hasRequiredV8PrototypeDefineBug) return v8PrototypeDefineBug;
+  	hasRequiredV8PrototypeDefineBug = 1;
+  	var DESCRIPTORS = requireDescriptors();
+  	var fails = requireFails();
 
-  var isObject$3 = isObject$7;
-
-  var $String$1 = String;
-  var $TypeError$2 = TypeError;
-
-  // `Assert: Type(argument) is Object`
-  var anObject$4 = function (argument) {
-    if (isObject$3(argument)) return argument;
-    throw new $TypeError$2($String$1(argument) + ' is not an object');
-  };
-
-  var DESCRIPTORS$6 = descriptors;
-  var IE8_DOM_DEFINE = ie8DomDefine;
-  var V8_PROTOTYPE_DEFINE_BUG$1 = v8PrototypeDefineBug;
-  var anObject$3 = anObject$4;
-  var toPropertyKey = toPropertyKey$2;
-
-  var $TypeError$1 = TypeError;
-  // eslint-disable-next-line es/no-object-defineproperty -- safe
-  var $defineProperty = Object.defineProperty;
-  // eslint-disable-next-line es/no-object-getownpropertydescriptor -- safe
-  var $getOwnPropertyDescriptor = Object.getOwnPropertyDescriptor;
-  var ENUMERABLE = 'enumerable';
-  var CONFIGURABLE$1 = 'configurable';
-  var WRITABLE = 'writable';
-
-  // `Object.defineProperty` method
-  // https://tc39.es/ecma262/#sec-object.defineproperty
-  objectDefineProperty.f = DESCRIPTORS$6 ? V8_PROTOTYPE_DEFINE_BUG$1 ? function defineProperty(O, P, Attributes) {
-    anObject$3(O);
-    P = toPropertyKey(P);
-    anObject$3(Attributes);
-    if (typeof O === 'function' && P === 'prototype' && 'value' in Attributes && WRITABLE in Attributes && !Attributes[WRITABLE]) {
-      var current = $getOwnPropertyDescriptor(O, P);
-      if (current && current[WRITABLE]) {
-        O[P] = Attributes.value;
-        Attributes = {
-          configurable: CONFIGURABLE$1 in Attributes ? Attributes[CONFIGURABLE$1] : current[CONFIGURABLE$1],
-          enumerable: ENUMERABLE in Attributes ? Attributes[ENUMERABLE] : current[ENUMERABLE],
-          writable: false
-        };
-      }
-    } return $defineProperty(O, P, Attributes);
-  } : $defineProperty : function defineProperty(O, P, Attributes) {
-    anObject$3(O);
-    P = toPropertyKey(P);
-    anObject$3(Attributes);
-    if (IE8_DOM_DEFINE) try {
-      return $defineProperty(O, P, Attributes);
-    } catch (error) { /* empty */ }
-    if ('get' in Attributes || 'set' in Attributes) throw new $TypeError$1('Accessors not supported');
-    if ('value' in Attributes) O[P] = Attributes.value;
-    return O;
-  };
-
-  var DESCRIPTORS$5 = descriptors;
-  var definePropertyModule$4 = objectDefineProperty;
-  var createPropertyDescriptor$1 = createPropertyDescriptor$3;
-
-  var createNonEnumerableProperty$2 = DESCRIPTORS$5 ? function (object, key, value) {
-    return definePropertyModule$4.f(object, key, createPropertyDescriptor$1(1, value));
-  } : function (object, key, value) {
-    object[key] = value;
-    return object;
-  };
-
-  var makeBuiltIn$2 = {exports: {}};
-
-  var DESCRIPTORS$4 = descriptors;
-  var hasOwn$4 = hasOwnProperty_1;
-
-  var FunctionPrototype = Function.prototype;
-  // eslint-disable-next-line es/no-object-getownpropertydescriptor -- safe
-  var getDescriptor = DESCRIPTORS$4 && Object.getOwnPropertyDescriptor;
-
-  var EXISTS = hasOwn$4(FunctionPrototype, 'name');
-  // additional protection from minified / mangled / dropped function names
-  var PROPER = EXISTS && (function something() { /* empty */ }).name === 'something';
-  var CONFIGURABLE = EXISTS && (!DESCRIPTORS$4 || (DESCRIPTORS$4 && getDescriptor(FunctionPrototype, 'name').configurable));
-
-  var functionName = {
-    EXISTS: EXISTS,
-    PROPER: PROPER,
-    CONFIGURABLE: CONFIGURABLE
-  };
-
-  var uncurryThis$8 = functionUncurryThis;
-  var isCallable$6 = isCallable$c;
-  var store$1 = sharedStoreExports;
-
-  var functionToString = uncurryThis$8(Function.toString);
-
-  // this helper broken in `core-js@3.4.1-3.4.4`, so we can't use `shared` helper
-  if (!isCallable$6(store$1.inspectSource)) {
-    store$1.inspectSource = function (it) {
-      return functionToString(it);
-    };
+  	// V8 ~ Chrome 36-
+  	// https://bugs.chromium.org/p/v8/issues/detail?id=3334
+  	v8PrototypeDefineBug = DESCRIPTORS && fails(function () {
+  	  // eslint-disable-next-line es/no-object-defineproperty -- required for testing
+  	  return Object.defineProperty(function () { /* empty */ }, 'prototype', {
+  	    value: 42,
+  	    writable: false
+  	  }).prototype !== 42;
+  	});
+  	return v8PrototypeDefineBug;
   }
 
-  var inspectSource$2 = store$1.inspectSource;
+  var anObject;
+  var hasRequiredAnObject;
 
-  var global$3 = global$a;
-  var isCallable$5 = isCallable$c;
+  function requireAnObject () {
+  	if (hasRequiredAnObject) return anObject;
+  	hasRequiredAnObject = 1;
+  	var isObject = requireIsObject();
 
-  var WeakMap$1 = global$3.WeakMap;
+  	var $String = String;
+  	var $TypeError = TypeError;
 
-  var weakMapBasicDetection = isCallable$5(WeakMap$1) && /native code/.test(String(WeakMap$1));
-
-  var shared$1 = shared$3;
-  var uid = uid$2;
-
-  var keys = shared$1('keys');
-
-  var sharedKey$2 = function (key) {
-    return keys[key] || (keys[key] = uid(key));
-  };
-
-  var hiddenKeys$4 = {};
-
-  var NATIVE_WEAK_MAP = weakMapBasicDetection;
-  var global$2 = global$a;
-  var isObject$2 = isObject$7;
-  var createNonEnumerableProperty$1 = createNonEnumerableProperty$2;
-  var hasOwn$3 = hasOwnProperty_1;
-  var shared = sharedStoreExports;
-  var sharedKey$1 = sharedKey$2;
-  var hiddenKeys$3 = hiddenKeys$4;
-
-  var OBJECT_ALREADY_INITIALIZED = 'Object already initialized';
-  var TypeError$1 = global$2.TypeError;
-  var WeakMap = global$2.WeakMap;
-  var set, get, has;
-
-  var enforce = function (it) {
-    return has(it) ? get(it) : set(it, {});
-  };
-
-  var getterFor = function (TYPE) {
-    return function (it) {
-      var state;
-      if (!isObject$2(it) || (state = get(it)).type !== TYPE) {
-        throw new TypeError$1('Incompatible receiver, ' + TYPE + ' required');
-      } return state;
-    };
-  };
-
-  if (NATIVE_WEAK_MAP || shared.state) {
-    var store = shared.state || (shared.state = new WeakMap());
-    /* eslint-disable no-self-assign -- prototype methods protection */
-    store.get = store.get;
-    store.has = store.has;
-    store.set = store.set;
-    /* eslint-enable no-self-assign -- prototype methods protection */
-    set = function (it, metadata) {
-      if (store.has(it)) throw new TypeError$1(OBJECT_ALREADY_INITIALIZED);
-      metadata.facade = it;
-      store.set(it, metadata);
-      return metadata;
-    };
-    get = function (it) {
-      return store.get(it) || {};
-    };
-    has = function (it) {
-      return store.has(it);
-    };
-  } else {
-    var STATE = sharedKey$1('state');
-    hiddenKeys$3[STATE] = true;
-    set = function (it, metadata) {
-      if (hasOwn$3(it, STATE)) throw new TypeError$1(OBJECT_ALREADY_INITIALIZED);
-      metadata.facade = it;
-      createNonEnumerableProperty$1(it, STATE, metadata);
-      return metadata;
-    };
-    get = function (it) {
-      return hasOwn$3(it, STATE) ? it[STATE] : {};
-    };
-    has = function (it) {
-      return hasOwn$3(it, STATE);
-    };
+  	// `Assert: Type(argument) is Object`
+  	anObject = function (argument) {
+  	  if (isObject(argument)) return argument;
+  	  throw new $TypeError($String(argument) + ' is not an object');
+  	};
+  	return anObject;
   }
 
-  var internalState = {
-    set: set,
-    get: get,
-    has: has,
-    enforce: enforce,
-    getterFor: getterFor
-  };
+  var hasRequiredObjectDefineProperty;
 
-  var uncurryThis$7 = functionUncurryThis;
-  var fails$5 = fails$c;
-  var isCallable$4 = isCallable$c;
-  var hasOwn$2 = hasOwnProperty_1;
-  var DESCRIPTORS$3 = descriptors;
-  var CONFIGURABLE_FUNCTION_NAME = functionName.CONFIGURABLE;
-  var inspectSource$1 = inspectSource$2;
-  var InternalStateModule = internalState;
+  function requireObjectDefineProperty () {
+  	if (hasRequiredObjectDefineProperty) return objectDefineProperty;
+  	hasRequiredObjectDefineProperty = 1;
+  	var DESCRIPTORS = requireDescriptors();
+  	var IE8_DOM_DEFINE = requireIe8DomDefine();
+  	var V8_PROTOTYPE_DEFINE_BUG = requireV8PrototypeDefineBug();
+  	var anObject = requireAnObject();
+  	var toPropertyKey = requireToPropertyKey();
 
-  var enforceInternalState = InternalStateModule.enforce;
-  var getInternalState = InternalStateModule.get;
-  var $String = String;
-  // eslint-disable-next-line es/no-object-defineproperty -- safe
-  var defineProperty$2 = Object.defineProperty;
-  var stringSlice = uncurryThis$7(''.slice);
-  var replace = uncurryThis$7(''.replace);
-  var join = uncurryThis$7([].join);
+  	var $TypeError = TypeError;
+  	// eslint-disable-next-line es/no-object-defineproperty -- safe
+  	var $defineProperty = Object.defineProperty;
+  	// eslint-disable-next-line es/no-object-getownpropertydescriptor -- safe
+  	var $getOwnPropertyDescriptor = Object.getOwnPropertyDescriptor;
+  	var ENUMERABLE = 'enumerable';
+  	var CONFIGURABLE = 'configurable';
+  	var WRITABLE = 'writable';
 
-  var CONFIGURABLE_LENGTH = DESCRIPTORS$3 && !fails$5(function () {
-    return defineProperty$2(function () { /* empty */ }, 'length', { value: 8 }).length !== 8;
-  });
+  	// `Object.defineProperty` method
+  	// https://tc39.es/ecma262/#sec-object.defineproperty
+  	objectDefineProperty.f = DESCRIPTORS ? V8_PROTOTYPE_DEFINE_BUG ? function defineProperty(O, P, Attributes) {
+  	  anObject(O);
+  	  P = toPropertyKey(P);
+  	  anObject(Attributes);
+  	  if (typeof O === 'function' && P === 'prototype' && 'value' in Attributes && WRITABLE in Attributes && !Attributes[WRITABLE]) {
+  	    var current = $getOwnPropertyDescriptor(O, P);
+  	    if (current && current[WRITABLE]) {
+  	      O[P] = Attributes.value;
+  	      Attributes = {
+  	        configurable: CONFIGURABLE in Attributes ? Attributes[CONFIGURABLE] : current[CONFIGURABLE],
+  	        enumerable: ENUMERABLE in Attributes ? Attributes[ENUMERABLE] : current[ENUMERABLE],
+  	        writable: false
+  	      };
+  	    }
+  	  } return $defineProperty(O, P, Attributes);
+  	} : $defineProperty : function defineProperty(O, P, Attributes) {
+  	  anObject(O);
+  	  P = toPropertyKey(P);
+  	  anObject(Attributes);
+  	  if (IE8_DOM_DEFINE) try {
+  	    return $defineProperty(O, P, Attributes);
+  	  } catch (error) { /* empty */ }
+  	  if ('get' in Attributes || 'set' in Attributes) throw new $TypeError('Accessors not supported');
+  	  if ('value' in Attributes) O[P] = Attributes.value;
+  	  return O;
+  	};
+  	return objectDefineProperty;
+  }
 
-  var TEMPLATE = String(String).split('String');
+  var createNonEnumerableProperty;
+  var hasRequiredCreateNonEnumerableProperty;
 
-  var makeBuiltIn$1 = makeBuiltIn$2.exports = function (value, name, options) {
-    if (stringSlice($String(name), 0, 7) === 'Symbol(') {
-      name = '[' + replace($String(name), /^Symbol\(([^)]*)\).*$/, '$1') + ']';
-    }
-    if (options && options.getter) name = 'get ' + name;
-    if (options && options.setter) name = 'set ' + name;
-    if (!hasOwn$2(value, 'name') || (CONFIGURABLE_FUNCTION_NAME && value.name !== name)) {
-      if (DESCRIPTORS$3) defineProperty$2(value, 'name', { value: name, configurable: true });
-      else value.name = name;
-    }
-    if (CONFIGURABLE_LENGTH && options && hasOwn$2(options, 'arity') && value.length !== options.arity) {
-      defineProperty$2(value, 'length', { value: options.arity });
-    }
-    try {
-      if (options && hasOwn$2(options, 'constructor') && options.constructor) {
-        if (DESCRIPTORS$3) defineProperty$2(value, 'prototype', { writable: false });
-      // in V8 ~ Chrome 53, prototypes of some methods, like `Array.prototype.values`, are non-writable
-      } else if (value.prototype) value.prototype = undefined;
-    } catch (error) { /* empty */ }
-    var state = enforceInternalState(value);
-    if (!hasOwn$2(state, 'source')) {
-      state.source = join(TEMPLATE, typeof name == 'string' ? name : '');
-    } return value;
-  };
+  function requireCreateNonEnumerableProperty () {
+  	if (hasRequiredCreateNonEnumerableProperty) return createNonEnumerableProperty;
+  	hasRequiredCreateNonEnumerableProperty = 1;
+  	var DESCRIPTORS = requireDescriptors();
+  	var definePropertyModule = requireObjectDefineProperty();
+  	var createPropertyDescriptor = requireCreatePropertyDescriptor();
 
-  // add fake Function#toString for correct work wrapped methods / constructors with methods like LoDash isNative
-  // eslint-disable-next-line no-extend-native -- required
-  Function.prototype.toString = makeBuiltIn$1(function toString() {
-    return isCallable$4(this) && getInternalState(this).source || inspectSource$1(this);
-  }, 'toString');
+  	createNonEnumerableProperty = DESCRIPTORS ? function (object, key, value) {
+  	  return definePropertyModule.f(object, key, createPropertyDescriptor(1, value));
+  	} : function (object, key, value) {
+  	  object[key] = value;
+  	  return object;
+  	};
+  	return createNonEnumerableProperty;
+  }
 
-  var makeBuiltInExports = makeBuiltIn$2.exports;
+  var makeBuiltIn = {exports: {}};
 
-  var isCallable$3 = isCallable$c;
-  var definePropertyModule$3 = objectDefineProperty;
-  var makeBuiltIn = makeBuiltInExports;
-  var defineGlobalProperty$1 = defineGlobalProperty$3;
+  var functionName;
+  var hasRequiredFunctionName;
 
-  var defineBuiltIn$2 = function (O, key, value, options) {
-    if (!options) options = {};
-    var simple = options.enumerable;
-    var name = options.name !== undefined ? options.name : key;
-    if (isCallable$3(value)) makeBuiltIn(value, name, options);
-    if (options.global) {
-      if (simple) O[key] = value;
-      else defineGlobalProperty$1(key, value);
-    } else {
-      try {
-        if (!options.unsafe) delete O[key];
-        else if (O[key]) simple = true;
-      } catch (error) { /* empty */ }
-      if (simple) O[key] = value;
-      else definePropertyModule$3.f(O, key, {
-        value: value,
-        enumerable: false,
-        configurable: !options.nonConfigurable,
-        writable: !options.nonWritable
-      });
-    } return O;
-  };
+  function requireFunctionName () {
+  	if (hasRequiredFunctionName) return functionName;
+  	hasRequiredFunctionName = 1;
+  	var DESCRIPTORS = requireDescriptors();
+  	var hasOwn = requireHasOwnProperty();
+
+  	var FunctionPrototype = Function.prototype;
+  	// eslint-disable-next-line es/no-object-getownpropertydescriptor -- safe
+  	var getDescriptor = DESCRIPTORS && Object.getOwnPropertyDescriptor;
+
+  	var EXISTS = hasOwn(FunctionPrototype, 'name');
+  	// additional protection from minified / mangled / dropped function names
+  	var PROPER = EXISTS && (function something() { /* empty */ }).name === 'something';
+  	var CONFIGURABLE = EXISTS && (!DESCRIPTORS || (DESCRIPTORS && getDescriptor(FunctionPrototype, 'name').configurable));
+
+  	functionName = {
+  	  EXISTS: EXISTS,
+  	  PROPER: PROPER,
+  	  CONFIGURABLE: CONFIGURABLE
+  	};
+  	return functionName;
+  }
+
+  var inspectSource;
+  var hasRequiredInspectSource;
+
+  function requireInspectSource () {
+  	if (hasRequiredInspectSource) return inspectSource;
+  	hasRequiredInspectSource = 1;
+  	var uncurryThis = requireFunctionUncurryThis();
+  	var isCallable = requireIsCallable();
+  	var store = requireSharedStore();
+
+  	var functionToString = uncurryThis(Function.toString);
+
+  	// this helper broken in `core-js@3.4.1-3.4.4`, so we can't use `shared` helper
+  	if (!isCallable(store.inspectSource)) {
+  	  store.inspectSource = function (it) {
+  	    return functionToString(it);
+  	  };
+  	}
+
+  	inspectSource = store.inspectSource;
+  	return inspectSource;
+  }
+
+  var weakMapBasicDetection;
+  var hasRequiredWeakMapBasicDetection;
+
+  function requireWeakMapBasicDetection () {
+  	if (hasRequiredWeakMapBasicDetection) return weakMapBasicDetection;
+  	hasRequiredWeakMapBasicDetection = 1;
+  	var globalThis = requireGlobalThis();
+  	var isCallable = requireIsCallable();
+
+  	var WeakMap = globalThis.WeakMap;
+
+  	weakMapBasicDetection = isCallable(WeakMap) && /native code/.test(String(WeakMap));
+  	return weakMapBasicDetection;
+  }
+
+  var sharedKey;
+  var hasRequiredSharedKey;
+
+  function requireSharedKey () {
+  	if (hasRequiredSharedKey) return sharedKey;
+  	hasRequiredSharedKey = 1;
+  	var shared = requireShared();
+  	var uid = requireUid();
+
+  	var keys = shared('keys');
+
+  	sharedKey = function (key) {
+  	  return keys[key] || (keys[key] = uid(key));
+  	};
+  	return sharedKey;
+  }
+
+  var hiddenKeys;
+  var hasRequiredHiddenKeys;
+
+  function requireHiddenKeys () {
+  	if (hasRequiredHiddenKeys) return hiddenKeys;
+  	hasRequiredHiddenKeys = 1;
+  	hiddenKeys = {};
+  	return hiddenKeys;
+  }
+
+  var internalState;
+  var hasRequiredInternalState;
+
+  function requireInternalState () {
+  	if (hasRequiredInternalState) return internalState;
+  	hasRequiredInternalState = 1;
+  	var NATIVE_WEAK_MAP = requireWeakMapBasicDetection();
+  	var globalThis = requireGlobalThis();
+  	var isObject = requireIsObject();
+  	var createNonEnumerableProperty = requireCreateNonEnumerableProperty();
+  	var hasOwn = requireHasOwnProperty();
+  	var shared = requireSharedStore();
+  	var sharedKey = requireSharedKey();
+  	var hiddenKeys = requireHiddenKeys();
+
+  	var OBJECT_ALREADY_INITIALIZED = 'Object already initialized';
+  	var TypeError = globalThis.TypeError;
+  	var WeakMap = globalThis.WeakMap;
+  	var set, get, has;
+
+  	var enforce = function (it) {
+  	  return has(it) ? get(it) : set(it, {});
+  	};
+
+  	var getterFor = function (TYPE) {
+  	  return function (it) {
+  	    var state;
+  	    if (!isObject(it) || (state = get(it)).type !== TYPE) {
+  	      throw new TypeError('Incompatible receiver, ' + TYPE + ' required');
+  	    } return state;
+  	  };
+  	};
+
+  	if (NATIVE_WEAK_MAP || shared.state) {
+  	  var store = shared.state || (shared.state = new WeakMap());
+  	  /* eslint-disable no-self-assign -- prototype methods protection */
+  	  store.get = store.get;
+  	  store.has = store.has;
+  	  store.set = store.set;
+  	  /* eslint-enable no-self-assign -- prototype methods protection */
+  	  set = function (it, metadata) {
+  	    if (store.has(it)) throw new TypeError(OBJECT_ALREADY_INITIALIZED);
+  	    metadata.facade = it;
+  	    store.set(it, metadata);
+  	    return metadata;
+  	  };
+  	  get = function (it) {
+  	    return store.get(it) || {};
+  	  };
+  	  has = function (it) {
+  	    return store.has(it);
+  	  };
+  	} else {
+  	  var STATE = sharedKey('state');
+  	  hiddenKeys[STATE] = true;
+  	  set = function (it, metadata) {
+  	    if (hasOwn(it, STATE)) throw new TypeError(OBJECT_ALREADY_INITIALIZED);
+  	    metadata.facade = it;
+  	    createNonEnumerableProperty(it, STATE, metadata);
+  	    return metadata;
+  	  };
+  	  get = function (it) {
+  	    return hasOwn(it, STATE) ? it[STATE] : {};
+  	  };
+  	  has = function (it) {
+  	    return hasOwn(it, STATE);
+  	  };
+  	}
+
+  	internalState = {
+  	  set: set,
+  	  get: get,
+  	  has: has,
+  	  enforce: enforce,
+  	  getterFor: getterFor
+  	};
+  	return internalState;
+  }
+
+  var hasRequiredMakeBuiltIn;
+
+  function requireMakeBuiltIn () {
+  	if (hasRequiredMakeBuiltIn) return makeBuiltIn.exports;
+  	hasRequiredMakeBuiltIn = 1;
+  	var uncurryThis = requireFunctionUncurryThis();
+  	var fails = requireFails();
+  	var isCallable = requireIsCallable();
+  	var hasOwn = requireHasOwnProperty();
+  	var DESCRIPTORS = requireDescriptors();
+  	var CONFIGURABLE_FUNCTION_NAME = requireFunctionName().CONFIGURABLE;
+  	var inspectSource = requireInspectSource();
+  	var InternalStateModule = requireInternalState();
+
+  	var enforceInternalState = InternalStateModule.enforce;
+  	var getInternalState = InternalStateModule.get;
+  	var $String = String;
+  	// eslint-disable-next-line es/no-object-defineproperty -- safe
+  	var defineProperty = Object.defineProperty;
+  	var stringSlice = uncurryThis(''.slice);
+  	var replace = uncurryThis(''.replace);
+  	var join = uncurryThis([].join);
+
+  	var CONFIGURABLE_LENGTH = DESCRIPTORS && !fails(function () {
+  	  return defineProperty(function () { /* empty */ }, 'length', { value: 8 }).length !== 8;
+  	});
+
+  	var TEMPLATE = String(String).split('String');
+
+  	var makeBuiltIn$1 = makeBuiltIn.exports = function (value, name, options) {
+  	  if (stringSlice($String(name), 0, 7) === 'Symbol(') {
+  	    name = '[' + replace($String(name), /^Symbol\(([^)]*)\).*$/, '$1') + ']';
+  	  }
+  	  if (options && options.getter) name = 'get ' + name;
+  	  if (options && options.setter) name = 'set ' + name;
+  	  if (!hasOwn(value, 'name') || (CONFIGURABLE_FUNCTION_NAME && value.name !== name)) {
+  	    if (DESCRIPTORS) defineProperty(value, 'name', { value: name, configurable: true });
+  	    else value.name = name;
+  	  }
+  	  if (CONFIGURABLE_LENGTH && options && hasOwn(options, 'arity') && value.length !== options.arity) {
+  	    defineProperty(value, 'length', { value: options.arity });
+  	  }
+  	  try {
+  	    if (options && hasOwn(options, 'constructor') && options.constructor) {
+  	      if (DESCRIPTORS) defineProperty(value, 'prototype', { writable: false });
+  	    // in V8 ~ Chrome 53, prototypes of some methods, like `Array.prototype.values`, are non-writable
+  	    } else if (value.prototype) value.prototype = undefined;
+  	  } catch (error) { /* empty */ }
+  	  var state = enforceInternalState(value);
+  	  if (!hasOwn(state, 'source')) {
+  	    state.source = join(TEMPLATE, typeof name == 'string' ? name : '');
+  	  } return value;
+  	};
+
+  	// add fake Function#toString for correct work wrapped methods / constructors with methods like LoDash isNative
+  	// eslint-disable-next-line no-extend-native -- required
+  	Function.prototype.toString = makeBuiltIn$1(function toString() {
+  	  return isCallable(this) && getInternalState(this).source || inspectSource(this);
+  	}, 'toString');
+  	return makeBuiltIn.exports;
+  }
+
+  var defineBuiltIn;
+  var hasRequiredDefineBuiltIn;
+
+  function requireDefineBuiltIn () {
+  	if (hasRequiredDefineBuiltIn) return defineBuiltIn;
+  	hasRequiredDefineBuiltIn = 1;
+  	var isCallable = requireIsCallable();
+  	var definePropertyModule = requireObjectDefineProperty();
+  	var makeBuiltIn = requireMakeBuiltIn();
+  	var defineGlobalProperty = requireDefineGlobalProperty();
+
+  	defineBuiltIn = function (O, key, value, options) {
+  	  if (!options) options = {};
+  	  var simple = options.enumerable;
+  	  var name = options.name !== undefined ? options.name : key;
+  	  if (isCallable(value)) makeBuiltIn(value, name, options);
+  	  if (options.global) {
+  	    if (simple) O[key] = value;
+  	    else defineGlobalProperty(key, value);
+  	  } else {
+  	    try {
+  	      if (!options.unsafe) delete O[key];
+  	      else if (O[key]) simple = true;
+  	    } catch (error) { /* empty */ }
+  	    if (simple) O[key] = value;
+  	    else definePropertyModule.f(O, key, {
+  	      value: value,
+  	      enumerable: false,
+  	      configurable: !options.nonConfigurable,
+  	      writable: !options.nonWritable
+  	    });
+  	  } return O;
+  	};
+  	return defineBuiltIn;
+  }
 
   var objectGetOwnPropertyNames = {};
 
-  var ceil = Math.ceil;
-  var floor = Math.floor;
+  var mathTrunc;
+  var hasRequiredMathTrunc;
 
-  // `Math.trunc` method
-  // https://tc39.es/ecma262/#sec-math.trunc
-  // eslint-disable-next-line es/no-math-trunc -- safe
-  var mathTrunc = Math.trunc || function trunc(x) {
-    var n = +x;
-    return (n > 0 ? floor : ceil)(n);
-  };
+  function requireMathTrunc () {
+  	if (hasRequiredMathTrunc) return mathTrunc;
+  	hasRequiredMathTrunc = 1;
+  	var ceil = Math.ceil;
+  	var floor = Math.floor;
 
-  var trunc = mathTrunc;
+  	// `Math.trunc` method
+  	// https://tc39.es/ecma262/#sec-math.trunc
+  	// eslint-disable-next-line es/no-math-trunc -- safe
+  	mathTrunc = Math.trunc || function trunc(x) {
+  	  var n = +x;
+  	  return (n > 0 ? floor : ceil)(n);
+  	};
+  	return mathTrunc;
+  }
 
-  // `ToIntegerOrInfinity` abstract operation
-  // https://tc39.es/ecma262/#sec-tointegerorinfinity
-  var toIntegerOrInfinity$2 = function (argument) {
-    var number = +argument;
-    // eslint-disable-next-line no-self-compare -- NaN check
-    return number !== number || number === 0 ? 0 : trunc(number);
-  };
+  var toIntegerOrInfinity;
+  var hasRequiredToIntegerOrInfinity;
 
-  var toIntegerOrInfinity$1 = toIntegerOrInfinity$2;
+  function requireToIntegerOrInfinity () {
+  	if (hasRequiredToIntegerOrInfinity) return toIntegerOrInfinity;
+  	hasRequiredToIntegerOrInfinity = 1;
+  	var trunc = requireMathTrunc();
 
-  var max = Math.max;
-  var min$1 = Math.min;
+  	// `ToIntegerOrInfinity` abstract operation
+  	// https://tc39.es/ecma262/#sec-tointegerorinfinity
+  	toIntegerOrInfinity = function (argument) {
+  	  var number = +argument;
+  	  // eslint-disable-next-line no-self-compare -- NaN check
+  	  return number !== number || number === 0 ? 0 : trunc(number);
+  	};
+  	return toIntegerOrInfinity;
+  }
 
-  // Helper for a popular repeating case of the spec:
-  // Let integer be ? ToInteger(index).
-  // If integer < 0, let result be max((length + integer), 0); else let result be min(integer, length).
-  var toAbsoluteIndex$1 = function (index, length) {
-    var integer = toIntegerOrInfinity$1(index);
-    return integer < 0 ? max(integer + length, 0) : min$1(integer, length);
-  };
+  var toAbsoluteIndex;
+  var hasRequiredToAbsoluteIndex;
 
-  var toIntegerOrInfinity = toIntegerOrInfinity$2;
+  function requireToAbsoluteIndex () {
+  	if (hasRequiredToAbsoluteIndex) return toAbsoluteIndex;
+  	hasRequiredToAbsoluteIndex = 1;
+  	var toIntegerOrInfinity = requireToIntegerOrInfinity();
 
-  var min = Math.min;
+  	var max = Math.max;
+  	var min = Math.min;
 
-  // `ToLength` abstract operation
-  // https://tc39.es/ecma262/#sec-tolength
-  var toLength$1 = function (argument) {
-    var len = toIntegerOrInfinity(argument);
-    return len > 0 ? min(len, 0x1FFFFFFFFFFFFF) : 0; // 2 ** 53 - 1 == 9007199254740991
-  };
+  	// Helper for a popular repeating case of the spec:
+  	// Let integer be ? ToInteger(index).
+  	// If integer < 0, let result be max((length + integer), 0); else let result be min(integer, length).
+  	toAbsoluteIndex = function (index, length) {
+  	  var integer = toIntegerOrInfinity(index);
+  	  return integer < 0 ? max(integer + length, 0) : min(integer, length);
+  	};
+  	return toAbsoluteIndex;
+  }
 
-  var toLength = toLength$1;
+  var toLength;
+  var hasRequiredToLength;
 
-  // `LengthOfArrayLike` abstract operation
-  // https://tc39.es/ecma262/#sec-lengthofarraylike
-  var lengthOfArrayLike$3 = function (obj) {
-    return toLength(obj.length);
-  };
+  function requireToLength () {
+  	if (hasRequiredToLength) return toLength;
+  	hasRequiredToLength = 1;
+  	var toIntegerOrInfinity = requireToIntegerOrInfinity();
 
-  var toIndexedObject$2 = toIndexedObject$4;
-  var toAbsoluteIndex = toAbsoluteIndex$1;
-  var lengthOfArrayLike$2 = lengthOfArrayLike$3;
+  	var min = Math.min;
 
-  // `Array.prototype.{ indexOf, includes }` methods implementation
-  var createMethod$1 = function (IS_INCLUDES) {
-    return function ($this, el, fromIndex) {
-      var O = toIndexedObject$2($this);
-      var length = lengthOfArrayLike$2(O);
-      if (length === 0) return !IS_INCLUDES && -1;
-      var index = toAbsoluteIndex(fromIndex, length);
-      var value;
-      // Array#includes uses SameValueZero equality algorithm
-      // eslint-disable-next-line no-self-compare -- NaN check
-      if (IS_INCLUDES && el !== el) while (length > index) {
-        value = O[index++];
-        // eslint-disable-next-line no-self-compare -- NaN check
-        if (value !== value) return true;
-      // Array#indexOf ignores holes, Array#includes - not
-      } else for (;length > index; index++) {
-        if ((IS_INCLUDES || index in O) && O[index] === el) return IS_INCLUDES || index || 0;
-      } return !IS_INCLUDES && -1;
-    };
-  };
+  	// `ToLength` abstract operation
+  	// https://tc39.es/ecma262/#sec-tolength
+  	toLength = function (argument) {
+  	  var len = toIntegerOrInfinity(argument);
+  	  return len > 0 ? min(len, 0x1FFFFFFFFFFFFF) : 0; // 2 ** 53 - 1 == 9007199254740991
+  	};
+  	return toLength;
+  }
 
-  var arrayIncludes = {
-    // `Array.prototype.includes` method
-    // https://tc39.es/ecma262/#sec-array.prototype.includes
-    includes: createMethod$1(true),
-    // `Array.prototype.indexOf` method
-    // https://tc39.es/ecma262/#sec-array.prototype.indexof
-    indexOf: createMethod$1(false)
-  };
+  var lengthOfArrayLike;
+  var hasRequiredLengthOfArrayLike;
 
-  var uncurryThis$6 = functionUncurryThis;
-  var hasOwn$1 = hasOwnProperty_1;
-  var toIndexedObject$1 = toIndexedObject$4;
-  var indexOf = arrayIncludes.indexOf;
-  var hiddenKeys$2 = hiddenKeys$4;
+  function requireLengthOfArrayLike () {
+  	if (hasRequiredLengthOfArrayLike) return lengthOfArrayLike;
+  	hasRequiredLengthOfArrayLike = 1;
+  	var toLength = requireToLength();
 
-  var push$1 = uncurryThis$6([].push);
+  	// `LengthOfArrayLike` abstract operation
+  	// https://tc39.es/ecma262/#sec-lengthofarraylike
+  	lengthOfArrayLike = function (obj) {
+  	  return toLength(obj.length);
+  	};
+  	return lengthOfArrayLike;
+  }
 
-  var objectKeysInternal = function (object, names) {
-    var O = toIndexedObject$1(object);
-    var i = 0;
-    var result = [];
-    var key;
-    for (key in O) !hasOwn$1(hiddenKeys$2, key) && hasOwn$1(O, key) && push$1(result, key);
-    // Don't enum bug & hidden keys
-    while (names.length > i) if (hasOwn$1(O, key = names[i++])) {
-      ~indexOf(result, key) || push$1(result, key);
-    }
-    return result;
-  };
+  var arrayIncludes;
+  var hasRequiredArrayIncludes;
 
-  // IE8- don't enum bug keys
-  var enumBugKeys$3 = [
-    'constructor',
-    'hasOwnProperty',
-    'isPrototypeOf',
-    'propertyIsEnumerable',
-    'toLocaleString',
-    'toString',
-    'valueOf'
-  ];
+  function requireArrayIncludes () {
+  	if (hasRequiredArrayIncludes) return arrayIncludes;
+  	hasRequiredArrayIncludes = 1;
+  	var toIndexedObject = requireToIndexedObject();
+  	var toAbsoluteIndex = requireToAbsoluteIndex();
+  	var lengthOfArrayLike = requireLengthOfArrayLike();
 
-  var internalObjectKeys$1 = objectKeysInternal;
-  var enumBugKeys$2 = enumBugKeys$3;
+  	// `Array.prototype.{ indexOf, includes }` methods implementation
+  	var createMethod = function (IS_INCLUDES) {
+  	  return function ($this, el, fromIndex) {
+  	    var O = toIndexedObject($this);
+  	    var length = lengthOfArrayLike(O);
+  	    if (length === 0) return !IS_INCLUDES && -1;
+  	    var index = toAbsoluteIndex(fromIndex, length);
+  	    var value;
+  	    // Array#includes uses SameValueZero equality algorithm
+  	    // eslint-disable-next-line no-self-compare -- NaN check
+  	    if (IS_INCLUDES && el !== el) while (length > index) {
+  	      value = O[index++];
+  	      // eslint-disable-next-line no-self-compare -- NaN check
+  	      if (value !== value) return true;
+  	    // Array#indexOf ignores holes, Array#includes - not
+  	    } else for (;length > index; index++) {
+  	      if ((IS_INCLUDES || index in O) && O[index] === el) return IS_INCLUDES || index || 0;
+  	    } return !IS_INCLUDES && -1;
+  	  };
+  	};
 
-  var hiddenKeys$1 = enumBugKeys$2.concat('length', 'prototype');
+  	arrayIncludes = {
+  	  // `Array.prototype.includes` method
+  	  // https://tc39.es/ecma262/#sec-array.prototype.includes
+  	  includes: createMethod(true),
+  	  // `Array.prototype.indexOf` method
+  	  // https://tc39.es/ecma262/#sec-array.prototype.indexof
+  	  indexOf: createMethod(false)
+  	};
+  	return arrayIncludes;
+  }
 
-  // `Object.getOwnPropertyNames` method
-  // https://tc39.es/ecma262/#sec-object.getownpropertynames
-  // eslint-disable-next-line es/no-object-getownpropertynames -- safe
-  objectGetOwnPropertyNames.f = Object.getOwnPropertyNames || function getOwnPropertyNames(O) {
-    return internalObjectKeys$1(O, hiddenKeys$1);
-  };
+  var objectKeysInternal;
+  var hasRequiredObjectKeysInternal;
+
+  function requireObjectKeysInternal () {
+  	if (hasRequiredObjectKeysInternal) return objectKeysInternal;
+  	hasRequiredObjectKeysInternal = 1;
+  	var uncurryThis = requireFunctionUncurryThis();
+  	var hasOwn = requireHasOwnProperty();
+  	var toIndexedObject = requireToIndexedObject();
+  	var indexOf = requireArrayIncludes().indexOf;
+  	var hiddenKeys = requireHiddenKeys();
+
+  	var push = uncurryThis([].push);
+
+  	objectKeysInternal = function (object, names) {
+  	  var O = toIndexedObject(object);
+  	  var i = 0;
+  	  var result = [];
+  	  var key;
+  	  for (key in O) !hasOwn(hiddenKeys, key) && hasOwn(O, key) && push(result, key);
+  	  // Don't enum bug & hidden keys
+  	  while (names.length > i) if (hasOwn(O, key = names[i++])) {
+  	    ~indexOf(result, key) || push(result, key);
+  	  }
+  	  return result;
+  	};
+  	return objectKeysInternal;
+  }
+
+  var enumBugKeys;
+  var hasRequiredEnumBugKeys;
+
+  function requireEnumBugKeys () {
+  	if (hasRequiredEnumBugKeys) return enumBugKeys;
+  	hasRequiredEnumBugKeys = 1;
+  	// IE8- don't enum bug keys
+  	enumBugKeys = [
+  	  'constructor',
+  	  'hasOwnProperty',
+  	  'isPrototypeOf',
+  	  'propertyIsEnumerable',
+  	  'toLocaleString',
+  	  'toString',
+  	  'valueOf'
+  	];
+  	return enumBugKeys;
+  }
+
+  var hasRequiredObjectGetOwnPropertyNames;
+
+  function requireObjectGetOwnPropertyNames () {
+  	if (hasRequiredObjectGetOwnPropertyNames) return objectGetOwnPropertyNames;
+  	hasRequiredObjectGetOwnPropertyNames = 1;
+  	var internalObjectKeys = requireObjectKeysInternal();
+  	var enumBugKeys = requireEnumBugKeys();
+
+  	var hiddenKeys = enumBugKeys.concat('length', 'prototype');
+
+  	// `Object.getOwnPropertyNames` method
+  	// https://tc39.es/ecma262/#sec-object.getownpropertynames
+  	// eslint-disable-next-line es/no-object-getownpropertynames -- safe
+  	objectGetOwnPropertyNames.f = Object.getOwnPropertyNames || function getOwnPropertyNames(O) {
+  	  return internalObjectKeys(O, hiddenKeys);
+  	};
+  	return objectGetOwnPropertyNames;
+  }
 
   var objectGetOwnPropertySymbols = {};
 
-  // eslint-disable-next-line es/no-object-getownpropertysymbols -- safe
-  objectGetOwnPropertySymbols.f = Object.getOwnPropertySymbols;
+  var hasRequiredObjectGetOwnPropertySymbols;
 
-  var getBuiltIn$2 = getBuiltIn$4;
-  var uncurryThis$5 = functionUncurryThis;
-  var getOwnPropertyNamesModule = objectGetOwnPropertyNames;
-  var getOwnPropertySymbolsModule$1 = objectGetOwnPropertySymbols;
-  var anObject$2 = anObject$4;
+  function requireObjectGetOwnPropertySymbols () {
+  	if (hasRequiredObjectGetOwnPropertySymbols) return objectGetOwnPropertySymbols;
+  	hasRequiredObjectGetOwnPropertySymbols = 1;
+  	// eslint-disable-next-line es/no-object-getownpropertysymbols -- safe
+  	objectGetOwnPropertySymbols.f = Object.getOwnPropertySymbols;
+  	return objectGetOwnPropertySymbols;
+  }
 
-  var concat$1 = uncurryThis$5([].concat);
+  var ownKeys;
+  var hasRequiredOwnKeys;
 
-  // all object keys, includes non-enumerable and symbols
-  var ownKeys$1 = getBuiltIn$2('Reflect', 'ownKeys') || function ownKeys(it) {
-    var keys = getOwnPropertyNamesModule.f(anObject$2(it));
-    var getOwnPropertySymbols = getOwnPropertySymbolsModule$1.f;
-    return getOwnPropertySymbols ? concat$1(keys, getOwnPropertySymbols(it)) : keys;
-  };
+  function requireOwnKeys () {
+  	if (hasRequiredOwnKeys) return ownKeys;
+  	hasRequiredOwnKeys = 1;
+  	var getBuiltIn = requireGetBuiltIn();
+  	var uncurryThis = requireFunctionUncurryThis();
+  	var getOwnPropertyNamesModule = requireObjectGetOwnPropertyNames();
+  	var getOwnPropertySymbolsModule = requireObjectGetOwnPropertySymbols();
+  	var anObject = requireAnObject();
 
-  var hasOwn = hasOwnProperty_1;
-  var ownKeys = ownKeys$1;
-  var getOwnPropertyDescriptorModule = objectGetOwnPropertyDescriptor;
-  var definePropertyModule$2 = objectDefineProperty;
+  	var concat = uncurryThis([].concat);
 
-  var copyConstructorProperties$1 = function (target, source, exceptions) {
-    var keys = ownKeys(source);
-    var defineProperty = definePropertyModule$2.f;
-    var getOwnPropertyDescriptor = getOwnPropertyDescriptorModule.f;
-    for (var i = 0; i < keys.length; i++) {
-      var key = keys[i];
-      if (!hasOwn(target, key) && !(exceptions && hasOwn(exceptions, key))) {
-        defineProperty(target, key, getOwnPropertyDescriptor(source, key));
-      }
-    }
-  };
+  	// all object keys, includes non-enumerable and symbols
+  	ownKeys = getBuiltIn('Reflect', 'ownKeys') || function ownKeys(it) {
+  	  var keys = getOwnPropertyNamesModule.f(anObject(it));
+  	  var getOwnPropertySymbols = getOwnPropertySymbolsModule.f;
+  	  return getOwnPropertySymbols ? concat(keys, getOwnPropertySymbols(it)) : keys;
+  	};
+  	return ownKeys;
+  }
 
-  var fails$4 = fails$c;
-  var isCallable$2 = isCallable$c;
+  var copyConstructorProperties;
+  var hasRequiredCopyConstructorProperties;
 
-  var replacement = /#|\.prototype\./;
+  function requireCopyConstructorProperties () {
+  	if (hasRequiredCopyConstructorProperties) return copyConstructorProperties;
+  	hasRequiredCopyConstructorProperties = 1;
+  	var hasOwn = requireHasOwnProperty();
+  	var ownKeys = requireOwnKeys();
+  	var getOwnPropertyDescriptorModule = requireObjectGetOwnPropertyDescriptor();
+  	var definePropertyModule = requireObjectDefineProperty();
 
-  var isForced$1 = function (feature, detection) {
-    var value = data[normalize(feature)];
-    return value === POLYFILL ? true
-      : value === NATIVE ? false
-      : isCallable$2(detection) ? fails$4(detection)
-      : !!detection;
-  };
+  	copyConstructorProperties = function (target, source, exceptions) {
+  	  var keys = ownKeys(source);
+  	  var defineProperty = definePropertyModule.f;
+  	  var getOwnPropertyDescriptor = getOwnPropertyDescriptorModule.f;
+  	  for (var i = 0; i < keys.length; i++) {
+  	    var key = keys[i];
+  	    if (!hasOwn(target, key) && !(exceptions && hasOwn(exceptions, key))) {
+  	      defineProperty(target, key, getOwnPropertyDescriptor(source, key));
+  	    }
+  	  }
+  	};
+  	return copyConstructorProperties;
+  }
 
-  var normalize = isForced$1.normalize = function (string) {
-    return String(string).replace(replacement, '.').toLowerCase();
-  };
+  var isForced_1;
+  var hasRequiredIsForced;
 
-  var data = isForced$1.data = {};
-  var NATIVE = isForced$1.NATIVE = 'N';
-  var POLYFILL = isForced$1.POLYFILL = 'P';
+  function requireIsForced () {
+  	if (hasRequiredIsForced) return isForced_1;
+  	hasRequiredIsForced = 1;
+  	var fails = requireFails();
+  	var isCallable = requireIsCallable();
 
-  var isForced_1 = isForced$1;
+  	var replacement = /#|\.prototype\./;
 
-  var global$1 = global$a;
-  var getOwnPropertyDescriptor = objectGetOwnPropertyDescriptor.f;
-  var createNonEnumerableProperty = createNonEnumerableProperty$2;
-  var defineBuiltIn$1 = defineBuiltIn$2;
-  var defineGlobalProperty = defineGlobalProperty$3;
-  var copyConstructorProperties = copyConstructorProperties$1;
-  var isForced = isForced_1;
+  	var isForced = function (feature, detection) {
+  	  var value = data[normalize(feature)];
+  	  return value === POLYFILL ? true
+  	    : value === NATIVE ? false
+  	    : isCallable(detection) ? fails(detection)
+  	    : !!detection;
+  	};
 
-  /*
-    options.target         - name of the target object
-    options.global         - target is the global object
-    options.stat           - export as static methods of target
-    options.proto          - export as prototype methods of target
-    options.real           - real prototype method for the `pure` version
-    options.forced         - export even if the native feature is available
-    options.bind           - bind methods to the target, required for the `pure` version
-    options.wrap           - wrap constructors to preventing global pollution, required for the `pure` version
-    options.unsafe         - use the simple assignment of property instead of delete + defineProperty
-    options.sham           - add a flag to not completely full polyfills
-    options.enumerable     - export as enumerable property
-    options.dontCallGetSet - prevent calling a getter on target
-    options.name           - the .name of the function if it does not match the key
-  */
-  var _export = function (options, source) {
-    var TARGET = options.target;
-    var GLOBAL = options.global;
-    var STATIC = options.stat;
-    var FORCED, target, key, targetProperty, sourceProperty, descriptor;
-    if (GLOBAL) {
-      target = global$1;
-    } else if (STATIC) {
-      target = global$1[TARGET] || defineGlobalProperty(TARGET, {});
-    } else {
-      target = global$1[TARGET] && global$1[TARGET].prototype;
-    }
-    if (target) for (key in source) {
-      sourceProperty = source[key];
-      if (options.dontCallGetSet) {
-        descriptor = getOwnPropertyDescriptor(target, key);
-        targetProperty = descriptor && descriptor.value;
-      } else targetProperty = target[key];
-      FORCED = isForced(GLOBAL ? key : TARGET + (STATIC ? '.' : '#') + key, options.forced);
-      // contained in target
-      if (!FORCED && targetProperty !== undefined) {
-        if (typeof sourceProperty == typeof targetProperty) continue;
-        copyConstructorProperties(sourceProperty, targetProperty);
-      }
-      // add a flag to not completely full polyfills
-      if (options.sham || (targetProperty && targetProperty.sham)) {
-        createNonEnumerableProperty(sourceProperty, 'sham', true);
-      }
-      defineBuiltIn$1(target, key, sourceProperty, options);
-    }
-  };
+  	var normalize = isForced.normalize = function (string) {
+  	  return String(string).replace(replacement, '.').toLowerCase();
+  	};
 
-  var classof$3 = classofRaw$2;
+  	var data = isForced.data = {};
+  	var NATIVE = isForced.NATIVE = 'N';
+  	var POLYFILL = isForced.POLYFILL = 'P';
 
-  // `IsArray` abstract operation
-  // https://tc39.es/ecma262/#sec-isarray
-  // eslint-disable-next-line es/no-array-isarray -- safe
-  var isArray$2 = Array.isArray || function isArray(argument) {
-    return classof$3(argument) === 'Array';
-  };
+  	isForced_1 = isForced;
+  	return isForced_1;
+  }
 
-  var $TypeError = TypeError;
-  var MAX_SAFE_INTEGER = 0x1FFFFFFFFFFFFF; // 2 ** 53 - 1 == 9007199254740991
+  var _export;
+  var hasRequired_export;
 
-  var doesNotExceedSafeInteger$1 = function (it) {
-    if (it > MAX_SAFE_INTEGER) throw $TypeError('Maximum allowed index exceeded');
-    return it;
-  };
+  function require_export () {
+  	if (hasRequired_export) return _export;
+  	hasRequired_export = 1;
+  	var globalThis = requireGlobalThis();
+  	var getOwnPropertyDescriptor = requireObjectGetOwnPropertyDescriptor().f;
+  	var createNonEnumerableProperty = requireCreateNonEnumerableProperty();
+  	var defineBuiltIn = requireDefineBuiltIn();
+  	var defineGlobalProperty = requireDefineGlobalProperty();
+  	var copyConstructorProperties = requireCopyConstructorProperties();
+  	var isForced = requireIsForced();
 
-  var DESCRIPTORS$2 = descriptors;
-  var definePropertyModule$1 = objectDefineProperty;
-  var createPropertyDescriptor = createPropertyDescriptor$3;
+  	/*
+  	  options.target         - name of the target object
+  	  options.global         - target is the global object
+  	  options.stat           - export as static methods of target
+  	  options.proto          - export as prototype methods of target
+  	  options.real           - real prototype method for the `pure` version
+  	  options.forced         - export even if the native feature is available
+  	  options.bind           - bind methods to the target, required for the `pure` version
+  	  options.wrap           - wrap constructors to preventing global pollution, required for the `pure` version
+  	  options.unsafe         - use the simple assignment of property instead of delete + defineProperty
+  	  options.sham           - add a flag to not completely full polyfills
+  	  options.enumerable     - export as enumerable property
+  	  options.dontCallGetSet - prevent calling a getter on target
+  	  options.name           - the .name of the function if it does not match the key
+  	*/
+  	_export = function (options, source) {
+  	  var TARGET = options.target;
+  	  var GLOBAL = options.global;
+  	  var STATIC = options.stat;
+  	  var FORCED, target, key, targetProperty, sourceProperty, descriptor;
+  	  if (GLOBAL) {
+  	    target = globalThis;
+  	  } else if (STATIC) {
+  	    target = globalThis[TARGET] || defineGlobalProperty(TARGET, {});
+  	  } else {
+  	    target = globalThis[TARGET] && globalThis[TARGET].prototype;
+  	  }
+  	  if (target) for (key in source) {
+  	    sourceProperty = source[key];
+  	    if (options.dontCallGetSet) {
+  	      descriptor = getOwnPropertyDescriptor(target, key);
+  	      targetProperty = descriptor && descriptor.value;
+  	    } else targetProperty = target[key];
+  	    FORCED = isForced(GLOBAL ? key : TARGET + (STATIC ? '.' : '#') + key, options.forced);
+  	    // contained in target
+  	    if (!FORCED && targetProperty !== undefined) {
+  	      if (typeof sourceProperty == typeof targetProperty) continue;
+  	      copyConstructorProperties(sourceProperty, targetProperty);
+  	    }
+  	    // add a flag to not completely full polyfills
+  	    if (options.sham || (targetProperty && targetProperty.sham)) {
+  	      createNonEnumerableProperty(sourceProperty, 'sham', true);
+  	    }
+  	    defineBuiltIn(target, key, sourceProperty, options);
+  	  }
+  	};
+  	return _export;
+  }
 
-  var createProperty$1 = function (object, key, value) {
-    if (DESCRIPTORS$2) definePropertyModule$1.f(object, key, createPropertyDescriptor(0, value));
-    else object[key] = value;
-  };
+  var functionUncurryThisClause;
+  var hasRequiredFunctionUncurryThisClause;
 
-  var wellKnownSymbol$5 = wellKnownSymbol$7;
+  function requireFunctionUncurryThisClause () {
+  	if (hasRequiredFunctionUncurryThisClause) return functionUncurryThisClause;
+  	hasRequiredFunctionUncurryThisClause = 1;
+  	var classofRaw = requireClassofRaw();
+  	var uncurryThis = requireFunctionUncurryThis();
 
-  var TO_STRING_TAG$1 = wellKnownSymbol$5('toStringTag');
-  var test = {};
+  	functionUncurryThisClause = function (fn) {
+  	  // Nashorn bug:
+  	  //   https://github.com/zloirock/core-js/issues/1128
+  	  //   https://github.com/zloirock/core-js/issues/1130
+  	  if (classofRaw(fn) === 'Function') return uncurryThis(fn);
+  	};
+  	return functionUncurryThisClause;
+  }
 
-  test[TO_STRING_TAG$1] = 'z';
+  var functionBindContext;
+  var hasRequiredFunctionBindContext;
 
-  var toStringTagSupport = String(test) === '[object z]';
+  function requireFunctionBindContext () {
+  	if (hasRequiredFunctionBindContext) return functionBindContext;
+  	hasRequiredFunctionBindContext = 1;
+  	var uncurryThis = requireFunctionUncurryThisClause();
+  	var aCallable = requireACallable();
+  	var NATIVE_BIND = requireFunctionBindNative();
 
-  var TO_STRING_TAG_SUPPORT$2 = toStringTagSupport;
-  var isCallable$1 = isCallable$c;
-  var classofRaw$1 = classofRaw$2;
-  var wellKnownSymbol$4 = wellKnownSymbol$7;
+  	var bind = uncurryThis(uncurryThis.bind);
 
-  var TO_STRING_TAG = wellKnownSymbol$4('toStringTag');
-  var $Object = Object;
+  	// optional / simple context binding
+  	functionBindContext = function (fn, that) {
+  	  aCallable(fn);
+  	  return that === undefined ? fn : NATIVE_BIND ? bind(fn, that) : function (/* ...args */) {
+  	    return fn.apply(that, arguments);
+  	  };
+  	};
+  	return functionBindContext;
+  }
 
-  // ES3 wrong here
-  var CORRECT_ARGUMENTS = classofRaw$1(function () { return arguments; }()) === 'Arguments';
+  var isArray;
+  var hasRequiredIsArray;
 
-  // fallback for IE11 Script Access Denied error
-  var tryGet = function (it, key) {
-    try {
-      return it[key];
-    } catch (error) { /* empty */ }
-  };
+  function requireIsArray () {
+  	if (hasRequiredIsArray) return isArray;
+  	hasRequiredIsArray = 1;
+  	var classof = requireClassofRaw();
 
-  // getting tag from ES6+ `Object.prototype.toString`
-  var classof$2 = TO_STRING_TAG_SUPPORT$2 ? classofRaw$1 : function (it) {
-    var O, tag, result;
-    return it === undefined ? 'Undefined' : it === null ? 'Null'
-      // @@toStringTag case
-      : typeof (tag = tryGet(O = $Object(it), TO_STRING_TAG)) == 'string' ? tag
-      // builtinTag case
-      : CORRECT_ARGUMENTS ? classofRaw$1(O)
-      // ES3 arguments fallback
-      : (result = classofRaw$1(O)) === 'Object' && isCallable$1(O.callee) ? 'Arguments' : result;
-  };
+  	// `IsArray` abstract operation
+  	// https://tc39.es/ecma262/#sec-isarray
+  	// eslint-disable-next-line es/no-array-isarray -- safe
+  	isArray = Array.isArray || function isArray(argument) {
+  	  return classof(argument) === 'Array';
+  	};
+  	return isArray;
+  }
 
-  var uncurryThis$4 = functionUncurryThis;
-  var fails$3 = fails$c;
-  var isCallable = isCallable$c;
-  var classof$1 = classof$2;
-  var getBuiltIn$1 = getBuiltIn$4;
-  var inspectSource = inspectSource$2;
+  var toStringTagSupport;
+  var hasRequiredToStringTagSupport;
 
-  var noop = function () { /* empty */ };
-  var construct = getBuiltIn$1('Reflect', 'construct');
-  var constructorRegExp = /^\s*(?:class|function)\b/;
-  var exec = uncurryThis$4(constructorRegExp.exec);
-  var INCORRECT_TO_STRING = !constructorRegExp.test(noop);
+  function requireToStringTagSupport () {
+  	if (hasRequiredToStringTagSupport) return toStringTagSupport;
+  	hasRequiredToStringTagSupport = 1;
+  	var wellKnownSymbol = requireWellKnownSymbol();
 
-  var isConstructorModern = function isConstructor(argument) {
-    if (!isCallable(argument)) return false;
-    try {
-      construct(noop, [], argument);
-      return true;
-    } catch (error) {
-      return false;
-    }
-  };
+  	var TO_STRING_TAG = wellKnownSymbol('toStringTag');
+  	var test = {};
 
-  var isConstructorLegacy = function isConstructor(argument) {
-    if (!isCallable(argument)) return false;
-    switch (classof$1(argument)) {
-      case 'AsyncFunction':
-      case 'GeneratorFunction':
-      case 'AsyncGeneratorFunction': return false;
-    }
-    try {
-      // we can't check .prototype since constructors produced by .bind haven't it
-      // `Function#toString` throws on some built-it function in some legacy engines
-      // (for example, `DOMQuad` and similar in FF41-)
-      return INCORRECT_TO_STRING || !!exec(constructorRegExp, inspectSource(argument));
-    } catch (error) {
-      return true;
-    }
-  };
+  	test[TO_STRING_TAG] = 'z';
 
-  isConstructorLegacy.sham = true;
+  	toStringTagSupport = String(test) === '[object z]';
+  	return toStringTagSupport;
+  }
 
-  // `IsConstructor` abstract operation
-  // https://tc39.es/ecma262/#sec-isconstructor
-  var isConstructor$1 = !construct || fails$3(function () {
-    var called;
-    return isConstructorModern(isConstructorModern.call)
-      || !isConstructorModern(Object)
-      || !isConstructorModern(function () { called = true; })
-      || called;
-  }) ? isConstructorLegacy : isConstructorModern;
+  var classof;
+  var hasRequiredClassof;
 
-  var isArray$1 = isArray$2;
-  var isConstructor = isConstructor$1;
-  var isObject$1 = isObject$7;
-  var wellKnownSymbol$3 = wellKnownSymbol$7;
+  function requireClassof () {
+  	if (hasRequiredClassof) return classof;
+  	hasRequiredClassof = 1;
+  	var TO_STRING_TAG_SUPPORT = requireToStringTagSupport();
+  	var isCallable = requireIsCallable();
+  	var classofRaw = requireClassofRaw();
+  	var wellKnownSymbol = requireWellKnownSymbol();
 
-  var SPECIES$1 = wellKnownSymbol$3('species');
-  var $Array = Array;
+  	var TO_STRING_TAG = wellKnownSymbol('toStringTag');
+  	var $Object = Object;
 
-  // a part of `ArraySpeciesCreate` abstract operation
-  // https://tc39.es/ecma262/#sec-arrayspeciescreate
-  var arraySpeciesConstructor$1 = function (originalArray) {
-    var C;
-    if (isArray$1(originalArray)) {
-      C = originalArray.constructor;
-      // cross-realm fallback
-      if (isConstructor(C) && (C === $Array || isArray$1(C.prototype))) C = undefined;
-      else if (isObject$1(C)) {
-        C = C[SPECIES$1];
-        if (C === null) C = undefined;
-      }
-    } return C === undefined ? $Array : C;
-  };
+  	// ES3 wrong here
+  	var CORRECT_ARGUMENTS = classofRaw(function () { return arguments; }()) === 'Arguments';
 
-  var arraySpeciesConstructor = arraySpeciesConstructor$1;
+  	// fallback for IE11 Script Access Denied error
+  	var tryGet = function (it, key) {
+  	  try {
+  	    return it[key];
+  	  } catch (error) { /* empty */ }
+  	};
 
-  // `ArraySpeciesCreate` abstract operation
-  // https://tc39.es/ecma262/#sec-arrayspeciescreate
-  var arraySpeciesCreate$2 = function (originalArray, length) {
-    return new (arraySpeciesConstructor(originalArray))(length === 0 ? 0 : length);
-  };
+  	// getting tag from ES6+ `Object.prototype.toString`
+  	classof = TO_STRING_TAG_SUPPORT ? classofRaw : function (it) {
+  	  var O, tag, result;
+  	  return it === undefined ? 'Undefined' : it === null ? 'Null'
+  	    // @@toStringTag case
+  	    : typeof (tag = tryGet(O = $Object(it), TO_STRING_TAG)) == 'string' ? tag
+  	    // builtinTag case
+  	    : CORRECT_ARGUMENTS ? classofRaw(O)
+  	    // ES3 arguments fallback
+  	    : (result = classofRaw(O)) === 'Object' && isCallable(O.callee) ? 'Arguments' : result;
+  	};
+  	return classof;
+  }
 
-  var fails$2 = fails$c;
-  var wellKnownSymbol$2 = wellKnownSymbol$7;
-  var V8_VERSION$1 = engineV8Version;
+  var isConstructor;
+  var hasRequiredIsConstructor;
 
-  var SPECIES = wellKnownSymbol$2('species');
+  function requireIsConstructor () {
+  	if (hasRequiredIsConstructor) return isConstructor;
+  	hasRequiredIsConstructor = 1;
+  	var uncurryThis = requireFunctionUncurryThis();
+  	var fails = requireFails();
+  	var isCallable = requireIsCallable();
+  	var classof = requireClassof();
+  	var getBuiltIn = requireGetBuiltIn();
+  	var inspectSource = requireInspectSource();
 
-  var arrayMethodHasSpeciesSupport$1 = function (METHOD_NAME) {
-    // We can't use this feature detection in V8 since it causes
-    // deoptimization and serious performance degradation
-    // https://github.com/zloirock/core-js/issues/677
-    return V8_VERSION$1 >= 51 || !fails$2(function () {
-      var array = [];
-      var constructor = array.constructor = {};
-      constructor[SPECIES] = function () {
-        return { foo: 1 };
-      };
-      return array[METHOD_NAME](Boolean).foo !== 1;
-    });
-  };
+  	var noop = function () { /* empty */ };
+  	var construct = getBuiltIn('Reflect', 'construct');
+  	var constructorRegExp = /^\s*(?:class|function)\b/;
+  	var exec = uncurryThis(constructorRegExp.exec);
+  	var INCORRECT_TO_STRING = !constructorRegExp.test(noop);
 
-  var $$2 = _export;
-  var fails$1 = fails$c;
-  var isArray = isArray$2;
-  var isObject = isObject$7;
-  var toObject$2 = toObject$4;
-  var lengthOfArrayLike$1 = lengthOfArrayLike$3;
-  var doesNotExceedSafeInteger = doesNotExceedSafeInteger$1;
-  var createProperty = createProperty$1;
-  var arraySpeciesCreate$1 = arraySpeciesCreate$2;
-  var arrayMethodHasSpeciesSupport = arrayMethodHasSpeciesSupport$1;
-  var wellKnownSymbol$1 = wellKnownSymbol$7;
-  var V8_VERSION = engineV8Version;
+  	var isConstructorModern = function isConstructor(argument) {
+  	  if (!isCallable(argument)) return false;
+  	  try {
+  	    construct(noop, [], argument);
+  	    return true;
+  	  } catch (error) {
+  	    return false;
+  	  }
+  	};
 
-  var IS_CONCAT_SPREADABLE = wellKnownSymbol$1('isConcatSpreadable');
+  	var isConstructorLegacy = function isConstructor(argument) {
+  	  if (!isCallable(argument)) return false;
+  	  switch (classof(argument)) {
+  	    case 'AsyncFunction':
+  	    case 'GeneratorFunction':
+  	    case 'AsyncGeneratorFunction': return false;
+  	  }
+  	  try {
+  	    // we can't check .prototype since constructors produced by .bind haven't it
+  	    // `Function#toString` throws on some built-it function in some legacy engines
+  	    // (for example, `DOMQuad` and similar in FF41-)
+  	    return INCORRECT_TO_STRING || !!exec(constructorRegExp, inspectSource(argument));
+  	  } catch (error) {
+  	    return true;
+  	  }
+  	};
 
-  // We can't use this feature detection in V8 since it causes
-  // deoptimization and serious performance degradation
-  // https://github.com/zloirock/core-js/issues/679
-  var IS_CONCAT_SPREADABLE_SUPPORT = V8_VERSION >= 51 || !fails$1(function () {
-    var array = [];
-    array[IS_CONCAT_SPREADABLE] = false;
-    return array.concat()[0] !== array;
-  });
+  	isConstructorLegacy.sham = true;
 
-  var isConcatSpreadable = function (O) {
-    if (!isObject(O)) return false;
-    var spreadable = O[IS_CONCAT_SPREADABLE];
-    return spreadable !== undefined ? !!spreadable : isArray(O);
-  };
+  	// `IsConstructor` abstract operation
+  	// https://tc39.es/ecma262/#sec-isconstructor
+  	isConstructor = !construct || fails(function () {
+  	  var called;
+  	  return isConstructorModern(isConstructorModern.call)
+  	    || !isConstructorModern(Object)
+  	    || !isConstructorModern(function () { called = true; })
+  	    || called;
+  	}) ? isConstructorLegacy : isConstructorModern;
+  	return isConstructor;
+  }
 
-  var FORCED = !IS_CONCAT_SPREADABLE_SUPPORT || !arrayMethodHasSpeciesSupport('concat');
+  var arraySpeciesConstructor;
+  var hasRequiredArraySpeciesConstructor;
 
-  // `Array.prototype.concat` method
-  // https://tc39.es/ecma262/#sec-array.prototype.concat
-  // with adding support of @@isConcatSpreadable and @@species
-  $$2({ target: 'Array', proto: true, arity: 1, forced: FORCED }, {
-    // eslint-disable-next-line no-unused-vars -- required for `.length`
-    concat: function concat(arg) {
-      var O = toObject$2(this);
-      var A = arraySpeciesCreate$1(O, 0);
-      var n = 0;
-      var i, k, length, len, E;
-      for (i = -1, length = arguments.length; i < length; i++) {
-        E = i === -1 ? O : arguments[i];
-        if (isConcatSpreadable(E)) {
-          len = lengthOfArrayLike$1(E);
-          doesNotExceedSafeInteger(n + len);
-          for (k = 0; k < len; k++, n++) if (k in E) createProperty(A, n, E[k]);
-        } else {
-          doesNotExceedSafeInteger(n + 1);
-          createProperty(A, n++, E);
-        }
-      }
-      A.length = n;
-      return A;
-    }
-  });
+  function requireArraySpeciesConstructor () {
+  	if (hasRequiredArraySpeciesConstructor) return arraySpeciesConstructor;
+  	hasRequiredArraySpeciesConstructor = 1;
+  	var isArray = requireIsArray();
+  	var isConstructor = requireIsConstructor();
+  	var isObject = requireIsObject();
+  	var wellKnownSymbol = requireWellKnownSymbol();
 
-  var classofRaw = classofRaw$2;
-  var uncurryThis$3 = functionUncurryThis;
+  	var SPECIES = wellKnownSymbol('species');
+  	var $Array = Array;
 
-  var functionUncurryThisClause = function (fn) {
-    // Nashorn bug:
-    //   https://github.com/zloirock/core-js/issues/1128
-    //   https://github.com/zloirock/core-js/issues/1130
-    if (classofRaw(fn) === 'Function') return uncurryThis$3(fn);
-  };
+  	// a part of `ArraySpeciesCreate` abstract operation
+  	// https://tc39.es/ecma262/#sec-arrayspeciescreate
+  	arraySpeciesConstructor = function (originalArray) {
+  	  var C;
+  	  if (isArray(originalArray)) {
+  	    C = originalArray.constructor;
+  	    // cross-realm fallback
+  	    if (isConstructor(C) && (C === $Array || isArray(C.prototype))) C = undefined;
+  	    else if (isObject(C)) {
+  	      C = C[SPECIES];
+  	      if (C === null) C = undefined;
+  	    }
+  	  } return C === undefined ? $Array : C;
+  	};
+  	return arraySpeciesConstructor;
+  }
 
-  var uncurryThis$2 = functionUncurryThisClause;
-  var aCallable = aCallable$2;
-  var NATIVE_BIND = functionBindNative;
+  var arraySpeciesCreate;
+  var hasRequiredArraySpeciesCreate;
 
-  var bind$1 = uncurryThis$2(uncurryThis$2.bind);
+  function requireArraySpeciesCreate () {
+  	if (hasRequiredArraySpeciesCreate) return arraySpeciesCreate;
+  	hasRequiredArraySpeciesCreate = 1;
+  	var arraySpeciesConstructor = requireArraySpeciesConstructor();
 
-  // optional / simple context binding
-  var functionBindContext = function (fn, that) {
-    aCallable(fn);
-    return that === undefined ? fn : NATIVE_BIND ? bind$1(fn, that) : function (/* ...args */) {
-      return fn.apply(that, arguments);
-    };
-  };
+  	// `ArraySpeciesCreate` abstract operation
+  	// https://tc39.es/ecma262/#sec-arrayspeciescreate
+  	arraySpeciesCreate = function (originalArray, length) {
+  	  return new (arraySpeciesConstructor(originalArray))(length === 0 ? 0 : length);
+  	};
+  	return arraySpeciesCreate;
+  }
 
-  var bind = functionBindContext;
-  var uncurryThis$1 = functionUncurryThis;
-  var IndexedObject$1 = indexedObject;
-  var toObject$1 = toObject$4;
-  var lengthOfArrayLike = lengthOfArrayLike$3;
-  var arraySpeciesCreate = arraySpeciesCreate$2;
+  var arrayIteration;
+  var hasRequiredArrayIteration;
 
-  var push = uncurryThis$1([].push);
+  function requireArrayIteration () {
+  	if (hasRequiredArrayIteration) return arrayIteration;
+  	hasRequiredArrayIteration = 1;
+  	var bind = requireFunctionBindContext();
+  	var uncurryThis = requireFunctionUncurryThis();
+  	var IndexedObject = requireIndexedObject();
+  	var toObject = requireToObject();
+  	var lengthOfArrayLike = requireLengthOfArrayLike();
+  	var arraySpeciesCreate = requireArraySpeciesCreate();
 
-  // `Array.prototype.{ forEach, map, filter, some, every, find, findIndex, filterReject }` methods implementation
-  var createMethod = function (TYPE) {
-    var IS_MAP = TYPE === 1;
-    var IS_FILTER = TYPE === 2;
-    var IS_SOME = TYPE === 3;
-    var IS_EVERY = TYPE === 4;
-    var IS_FIND_INDEX = TYPE === 6;
-    var IS_FILTER_REJECT = TYPE === 7;
-    var NO_HOLES = TYPE === 5 || IS_FIND_INDEX;
-    return function ($this, callbackfn, that, specificCreate) {
-      var O = toObject$1($this);
-      var self = IndexedObject$1(O);
-      var length = lengthOfArrayLike(self);
-      var boundFunction = bind(callbackfn, that);
-      var index = 0;
-      var create = specificCreate || arraySpeciesCreate;
-      var target = IS_MAP ? create($this, length) : IS_FILTER || IS_FILTER_REJECT ? create($this, 0) : undefined;
-      var value, result;
-      for (;length > index; index++) if (NO_HOLES || index in self) {
-        value = self[index];
-        result = boundFunction(value, index, O);
-        if (TYPE) {
-          if (IS_MAP) target[index] = result; // map
-          else if (result) switch (TYPE) {
-            case 3: return true;              // some
-            case 5: return value;             // find
-            case 6: return index;             // findIndex
-            case 2: push(target, value);      // filter
-          } else switch (TYPE) {
-            case 4: return false;             // every
-            case 7: push(target, value);      // filterReject
-          }
-        }
-      }
-      return IS_FIND_INDEX ? -1 : IS_SOME || IS_EVERY ? IS_EVERY : target;
-    };
-  };
+  	var push = uncurryThis([].push);
 
-  var arrayIteration = {
-    // `Array.prototype.forEach` method
-    // https://tc39.es/ecma262/#sec-array.prototype.foreach
-    forEach: createMethod(0),
-    // `Array.prototype.map` method
-    // https://tc39.es/ecma262/#sec-array.prototype.map
-    map: createMethod(1),
-    // `Array.prototype.filter` method
-    // https://tc39.es/ecma262/#sec-array.prototype.filter
-    filter: createMethod(2),
-    // `Array.prototype.some` method
-    // https://tc39.es/ecma262/#sec-array.prototype.some
-    some: createMethod(3),
-    // `Array.prototype.every` method
-    // https://tc39.es/ecma262/#sec-array.prototype.every
-    every: createMethod(4),
-    // `Array.prototype.find` method
-    // https://tc39.es/ecma262/#sec-array.prototype.find
-    find: createMethod(5),
-    // `Array.prototype.findIndex` method
-    // https://tc39.es/ecma262/#sec-array.prototype.findIndex
-    findIndex: createMethod(6),
-    // `Array.prototype.filterReject` method
-    // https://github.com/tc39/proposal-array-filtering
-    filterReject: createMethod(7)
-  };
+  	// `Array.prototype.{ forEach, map, filter, some, every, find, findIndex, filterReject }` methods implementation
+  	var createMethod = function (TYPE) {
+  	  var IS_MAP = TYPE === 1;
+  	  var IS_FILTER = TYPE === 2;
+  	  var IS_SOME = TYPE === 3;
+  	  var IS_EVERY = TYPE === 4;
+  	  var IS_FIND_INDEX = TYPE === 6;
+  	  var IS_FILTER_REJECT = TYPE === 7;
+  	  var NO_HOLES = TYPE === 5 || IS_FIND_INDEX;
+  	  return function ($this, callbackfn, that, specificCreate) {
+  	    var O = toObject($this);
+  	    var self = IndexedObject(O);
+  	    var length = lengthOfArrayLike(self);
+  	    var boundFunction = bind(callbackfn, that);
+  	    var index = 0;
+  	    var create = specificCreate || arraySpeciesCreate;
+  	    var target = IS_MAP ? create($this, length) : IS_FILTER || IS_FILTER_REJECT ? create($this, 0) : undefined;
+  	    var value, result;
+  	    for (;length > index; index++) if (NO_HOLES || index in self) {
+  	      value = self[index];
+  	      result = boundFunction(value, index, O);
+  	      if (TYPE) {
+  	        if (IS_MAP) target[index] = result; // map
+  	        else if (result) switch (TYPE) {
+  	          case 3: return true;              // some
+  	          case 5: return value;             // find
+  	          case 6: return index;             // findIndex
+  	          case 2: push(target, value);      // filter
+  	        } else switch (TYPE) {
+  	          case 4: return false;             // every
+  	          case 7: push(target, value);      // filterReject
+  	        }
+  	      }
+  	    }
+  	    return IS_FIND_INDEX ? -1 : IS_SOME || IS_EVERY ? IS_EVERY : target;
+  	  };
+  	};
+
+  	arrayIteration = {
+  	  // `Array.prototype.forEach` method
+  	  // https://tc39.es/ecma262/#sec-array.prototype.foreach
+  	  forEach: createMethod(0),
+  	  // `Array.prototype.map` method
+  	  // https://tc39.es/ecma262/#sec-array.prototype.map
+  	  map: createMethod(1),
+  	  // `Array.prototype.filter` method
+  	  // https://tc39.es/ecma262/#sec-array.prototype.filter
+  	  filter: createMethod(2),
+  	  // `Array.prototype.some` method
+  	  // https://tc39.es/ecma262/#sec-array.prototype.some
+  	  some: createMethod(3),
+  	  // `Array.prototype.every` method
+  	  // https://tc39.es/ecma262/#sec-array.prototype.every
+  	  every: createMethod(4),
+  	  // `Array.prototype.find` method
+  	  // https://tc39.es/ecma262/#sec-array.prototype.find
+  	  find: createMethod(5),
+  	  // `Array.prototype.findIndex` method
+  	  // https://tc39.es/ecma262/#sec-array.prototype.findIndex
+  	  findIndex: createMethod(6),
+  	  // `Array.prototype.filterReject` method
+  	  // https://github.com/tc39/proposal-array-filtering
+  	  filterReject: createMethod(7)
+  	};
+  	return arrayIteration;
+  }
 
   var objectDefineProperties = {};
 
-  var internalObjectKeys = objectKeysInternal;
-  var enumBugKeys$1 = enumBugKeys$3;
+  var objectKeys;
+  var hasRequiredObjectKeys;
 
-  // `Object.keys` method
-  // https://tc39.es/ecma262/#sec-object.keys
-  // eslint-disable-next-line es/no-object-keys -- safe
-  var objectKeys$2 = Object.keys || function keys(O) {
-    return internalObjectKeys(O, enumBugKeys$1);
-  };
+  function requireObjectKeys () {
+  	if (hasRequiredObjectKeys) return objectKeys;
+  	hasRequiredObjectKeys = 1;
+  	var internalObjectKeys = requireObjectKeysInternal();
+  	var enumBugKeys = requireEnumBugKeys();
 
-  var DESCRIPTORS$1 = descriptors;
-  var V8_PROTOTYPE_DEFINE_BUG = v8PrototypeDefineBug;
-  var definePropertyModule = objectDefineProperty;
-  var anObject$1 = anObject$4;
-  var toIndexedObject = toIndexedObject$4;
-  var objectKeys$1 = objectKeys$2;
-
-  // `Object.defineProperties` method
-  // https://tc39.es/ecma262/#sec-object.defineproperties
-  // eslint-disable-next-line es/no-object-defineproperties -- safe
-  objectDefineProperties.f = DESCRIPTORS$1 && !V8_PROTOTYPE_DEFINE_BUG ? Object.defineProperties : function defineProperties(O, Properties) {
-    anObject$1(O);
-    var props = toIndexedObject(Properties);
-    var keys = objectKeys$1(Properties);
-    var length = keys.length;
-    var index = 0;
-    var key;
-    while (length > index) definePropertyModule.f(O, key = keys[index++], props[key]);
-    return O;
-  };
-
-  var getBuiltIn = getBuiltIn$4;
-
-  var html$1 = getBuiltIn('document', 'documentElement');
-
-  /* global ActiveXObject -- old IE, WSH */
-  var anObject = anObject$4;
-  var definePropertiesModule = objectDefineProperties;
-  var enumBugKeys = enumBugKeys$3;
-  var hiddenKeys = hiddenKeys$4;
-  var html = html$1;
-  var documentCreateElement = documentCreateElement$1;
-  var sharedKey = sharedKey$2;
-
-  var GT = '>';
-  var LT = '<';
-  var PROTOTYPE = 'prototype';
-  var SCRIPT = 'script';
-  var IE_PROTO = sharedKey('IE_PROTO');
-
-  var EmptyConstructor = function () { /* empty */ };
-
-  var scriptTag = function (content) {
-    return LT + SCRIPT + GT + content + LT + '/' + SCRIPT + GT;
-  };
-
-  // Create object with fake `null` prototype: use ActiveX Object with cleared prototype
-  var NullProtoObjectViaActiveX = function (activeXDocument) {
-    activeXDocument.write(scriptTag(''));
-    activeXDocument.close();
-    var temp = activeXDocument.parentWindow.Object;
-    activeXDocument = null; // avoid memory leak
-    return temp;
-  };
-
-  // Create object with fake `null` prototype: use iframe Object with cleared prototype
-  var NullProtoObjectViaIFrame = function () {
-    // Thrash, waste and sodomy: IE GC bug
-    var iframe = documentCreateElement('iframe');
-    var JS = 'java' + SCRIPT + ':';
-    var iframeDocument;
-    iframe.style.display = 'none';
-    html.appendChild(iframe);
-    // https://github.com/zloirock/core-js/issues/475
-    iframe.src = String(JS);
-    iframeDocument = iframe.contentWindow.document;
-    iframeDocument.open();
-    iframeDocument.write(scriptTag('document.F=Object'));
-    iframeDocument.close();
-    return iframeDocument.F;
-  };
-
-  // Check for document.domain and active x support
-  // No need to use active x approach when document.domain is not set
-  // see https://github.com/es-shims/es5-shim/issues/150
-  // variation of https://github.com/kitcambridge/es5-shim/commit/4f738ac066346
-  // avoid IE GC bug
-  var activeXDocument;
-  var NullProtoObject = function () {
-    try {
-      activeXDocument = new ActiveXObject('htmlfile');
-    } catch (error) { /* ignore */ }
-    NullProtoObject = typeof document != 'undefined'
-      ? document.domain && activeXDocument
-        ? NullProtoObjectViaActiveX(activeXDocument) // old IE
-        : NullProtoObjectViaIFrame()
-      : NullProtoObjectViaActiveX(activeXDocument); // WSH
-    var length = enumBugKeys.length;
-    while (length--) delete NullProtoObject[PROTOTYPE][enumBugKeys[length]];
-    return NullProtoObject();
-  };
-
-  hiddenKeys[IE_PROTO] = true;
-
-  // `Object.create` method
-  // https://tc39.es/ecma262/#sec-object.create
-  // eslint-disable-next-line es/no-object-create -- safe
-  var objectCreate = Object.create || function create(O, Properties) {
-    var result;
-    if (O !== null) {
-      EmptyConstructor[PROTOTYPE] = anObject(O);
-      result = new EmptyConstructor();
-      EmptyConstructor[PROTOTYPE] = null;
-      // add "__proto__" for Object.getPrototypeOf polyfill
-      result[IE_PROTO] = O;
-    } else result = NullProtoObject();
-    return Properties === undefined ? result : definePropertiesModule.f(result, Properties);
-  };
-
-  var wellKnownSymbol = wellKnownSymbol$7;
-  var create = objectCreate;
-  var defineProperty$1 = objectDefineProperty.f;
-
-  var UNSCOPABLES = wellKnownSymbol('unscopables');
-  var ArrayPrototype = Array.prototype;
-
-  // Array.prototype[@@unscopables]
-  // https://tc39.es/ecma262/#sec-array.prototype-@@unscopables
-  if (ArrayPrototype[UNSCOPABLES] === undefined) {
-    defineProperty$1(ArrayPrototype, UNSCOPABLES, {
-      configurable: true,
-      value: create(null)
-    });
+  	// `Object.keys` method
+  	// https://tc39.es/ecma262/#sec-object.keys
+  	// eslint-disable-next-line es/no-object-keys -- safe
+  	objectKeys = Object.keys || function keys(O) {
+  	  return internalObjectKeys(O, enumBugKeys);
+  	};
+  	return objectKeys;
   }
 
-  // add a key to Array.prototype[@@unscopables]
-  var addToUnscopables$1 = function (key) {
-    ArrayPrototype[UNSCOPABLES][key] = true;
-  };
+  var hasRequiredObjectDefineProperties;
 
-  var $$1 = _export;
-  var $find = arrayIteration.find;
-  var addToUnscopables = addToUnscopables$1;
+  function requireObjectDefineProperties () {
+  	if (hasRequiredObjectDefineProperties) return objectDefineProperties;
+  	hasRequiredObjectDefineProperties = 1;
+  	var DESCRIPTORS = requireDescriptors();
+  	var V8_PROTOTYPE_DEFINE_BUG = requireV8PrototypeDefineBug();
+  	var definePropertyModule = requireObjectDefineProperty();
+  	var anObject = requireAnObject();
+  	var toIndexedObject = requireToIndexedObject();
+  	var objectKeys = requireObjectKeys();
 
-  var FIND = 'find';
-  var SKIPS_HOLES = true;
-
-  // Shouldn't skip holes
-  // eslint-disable-next-line es/no-array-prototype-find -- testing
-  if (FIND in []) Array(1)[FIND](function () { SKIPS_HOLES = false; });
-
-  // `Array.prototype.find` method
-  // https://tc39.es/ecma262/#sec-array.prototype.find
-  $$1({ target: 'Array', proto: true, forced: SKIPS_HOLES }, {
-    find: function find(callbackfn /* , that = undefined */) {
-      return $find(this, callbackfn, arguments.length > 1 ? arguments[1] : undefined);
-    }
-  });
-
-  // https://tc39.es/ecma262/#sec-array.prototype-@@unscopables
-  addToUnscopables(FIND);
-
-  var DESCRIPTORS = descriptors;
-  var uncurryThis = functionUncurryThis;
-  var call = functionCall;
-  var fails = fails$c;
-  var objectKeys = objectKeys$2;
-  var getOwnPropertySymbolsModule = objectGetOwnPropertySymbols;
-  var propertyIsEnumerableModule = objectPropertyIsEnumerable;
-  var toObject = toObject$4;
-  var IndexedObject = indexedObject;
-
-  // eslint-disable-next-line es/no-object-assign -- safe
-  var $assign = Object.assign;
-  // eslint-disable-next-line es/no-object-defineproperty -- required for testing
-  var defineProperty = Object.defineProperty;
-  var concat = uncurryThis([].concat);
-
-  // `Object.assign` method
-  // https://tc39.es/ecma262/#sec-object.assign
-  var objectAssign = !$assign || fails(function () {
-    // should have correct order of operations (Edge bug)
-    if (DESCRIPTORS && $assign({ b: 1 }, $assign(defineProperty({}, 'a', {
-      enumerable: true,
-      get: function () {
-        defineProperty(this, 'b', {
-          value: 3,
-          enumerable: false
-        });
-      }
-    }), { b: 2 })).b !== 1) return true;
-    // should work with symbols and should have deterministic property order (V8 bug)
-    var A = {};
-    var B = {};
-    // eslint-disable-next-line es/no-symbol -- safe
-    var symbol = Symbol('assign detection');
-    var alphabet = 'abcdefghijklmnopqrst';
-    A[symbol] = 7;
-    alphabet.split('').forEach(function (chr) { B[chr] = chr; });
-    return $assign({}, A)[symbol] !== 7 || objectKeys($assign({}, B)).join('') !== alphabet;
-  }) ? function assign(target, source) { // eslint-disable-line no-unused-vars -- required for `.length`
-    var T = toObject(target);
-    var argumentsLength = arguments.length;
-    var index = 1;
-    var getOwnPropertySymbols = getOwnPropertySymbolsModule.f;
-    var propertyIsEnumerable = propertyIsEnumerableModule.f;
-    while (argumentsLength > index) {
-      var S = IndexedObject(arguments[index++]);
-      var keys = getOwnPropertySymbols ? concat(objectKeys(S), getOwnPropertySymbols(S)) : objectKeys(S);
-      var length = keys.length;
-      var j = 0;
-      var key;
-      while (length > j) {
-        key = keys[j++];
-        if (!DESCRIPTORS || call(propertyIsEnumerable, S, key)) T[key] = S[key];
-      }
-    } return T;
-  } : $assign;
-
-  var $ = _export;
-  var assign = objectAssign;
-
-  // `Object.assign` method
-  // https://tc39.es/ecma262/#sec-object.assign
-  // eslint-disable-next-line es/no-object-assign -- required for testing
-  $({ target: 'Object', stat: true, arity: 2, forced: Object.assign !== assign }, {
-    assign: assign
-  });
-
-  var TO_STRING_TAG_SUPPORT$1 = toStringTagSupport;
-  var classof = classof$2;
-
-  // `Object.prototype.toString` method implementation
-  // https://tc39.es/ecma262/#sec-object.prototype.tostring
-  var objectToString = TO_STRING_TAG_SUPPORT$1 ? {}.toString : function toString() {
-    return '[object ' + classof(this) + ']';
-  };
-
-  var TO_STRING_TAG_SUPPORT = toStringTagSupport;
-  var defineBuiltIn = defineBuiltIn$2;
-  var toString = objectToString;
-
-  // `Object.prototype.toString` method
-  // https://tc39.es/ecma262/#sec-object.prototype.tostring
-  if (!TO_STRING_TAG_SUPPORT) {
-    defineBuiltIn(Object.prototype, 'toString', toString, { unsafe: true });
+  	// `Object.defineProperties` method
+  	// https://tc39.es/ecma262/#sec-object.defineproperties
+  	// eslint-disable-next-line es/no-object-defineproperties -- safe
+  	objectDefineProperties.f = DESCRIPTORS && !V8_PROTOTYPE_DEFINE_BUG ? Object.defineProperties : function defineProperties(O, Properties) {
+  	  anObject(O);
+  	  var props = toIndexedObject(Properties);
+  	  var keys = objectKeys(Properties);
+  	  var length = keys.length;
+  	  var index = 0;
+  	  var key;
+  	  while (length > index) definePropertyModule.f(O, key = keys[index++], props[key]);
+  	  return O;
+  	};
+  	return objectDefineProperties;
   }
 
+  var html;
+  var hasRequiredHtml;
+
+  function requireHtml () {
+  	if (hasRequiredHtml) return html;
+  	hasRequiredHtml = 1;
+  	var getBuiltIn = requireGetBuiltIn();
+
+  	html = getBuiltIn('document', 'documentElement');
+  	return html;
+  }
+
+  var objectCreate;
+  var hasRequiredObjectCreate;
+
+  function requireObjectCreate () {
+  	if (hasRequiredObjectCreate) return objectCreate;
+  	hasRequiredObjectCreate = 1;
+  	/* global ActiveXObject -- old IE, WSH */
+  	var anObject = requireAnObject();
+  	var definePropertiesModule = requireObjectDefineProperties();
+  	var enumBugKeys = requireEnumBugKeys();
+  	var hiddenKeys = requireHiddenKeys();
+  	var html = requireHtml();
+  	var documentCreateElement = requireDocumentCreateElement();
+  	var sharedKey = requireSharedKey();
+
+  	var GT = '>';
+  	var LT = '<';
+  	var PROTOTYPE = 'prototype';
+  	var SCRIPT = 'script';
+  	var IE_PROTO = sharedKey('IE_PROTO');
+
+  	var EmptyConstructor = function () { /* empty */ };
+
+  	var scriptTag = function (content) {
+  	  return LT + SCRIPT + GT + content + LT + '/' + SCRIPT + GT;
+  	};
+
+  	// Create object with fake `null` prototype: use ActiveX Object with cleared prototype
+  	var NullProtoObjectViaActiveX = function (activeXDocument) {
+  	  activeXDocument.write(scriptTag(''));
+  	  activeXDocument.close();
+  	  var temp = activeXDocument.parentWindow.Object;
+  	  // eslint-disable-next-line no-useless-assignment -- avoid memory leak
+  	  activeXDocument = null;
+  	  return temp;
+  	};
+
+  	// Create object with fake `null` prototype: use iframe Object with cleared prototype
+  	var NullProtoObjectViaIFrame = function () {
+  	  // Thrash, waste and sodomy: IE GC bug
+  	  var iframe = documentCreateElement('iframe');
+  	  var JS = 'java' + SCRIPT + ':';
+  	  var iframeDocument;
+  	  iframe.style.display = 'none';
+  	  html.appendChild(iframe);
+  	  // https://github.com/zloirock/core-js/issues/475
+  	  iframe.src = String(JS);
+  	  iframeDocument = iframe.contentWindow.document;
+  	  iframeDocument.open();
+  	  iframeDocument.write(scriptTag('document.F=Object'));
+  	  iframeDocument.close();
+  	  return iframeDocument.F;
+  	};
+
+  	// Check for document.domain and active x support
+  	// No need to use active x approach when document.domain is not set
+  	// see https://github.com/es-shims/es5-shim/issues/150
+  	// variation of https://github.com/kitcambridge/es5-shim/commit/4f738ac066346
+  	// avoid IE GC bug
+  	var activeXDocument;
+  	var NullProtoObject = function () {
+  	  try {
+  	    activeXDocument = new ActiveXObject('htmlfile');
+  	  } catch (error) { /* ignore */ }
+  	  NullProtoObject = typeof document != 'undefined'
+  	    ? document.domain && activeXDocument
+  	      ? NullProtoObjectViaActiveX(activeXDocument) // old IE
+  	      : NullProtoObjectViaIFrame()
+  	    : NullProtoObjectViaActiveX(activeXDocument); // WSH
+  	  var length = enumBugKeys.length;
+  	  while (length--) delete NullProtoObject[PROTOTYPE][enumBugKeys[length]];
+  	  return NullProtoObject();
+  	};
+
+  	hiddenKeys[IE_PROTO] = true;
+
+  	// `Object.create` method
+  	// https://tc39.es/ecma262/#sec-object.create
+  	// eslint-disable-next-line es/no-object-create -- safe
+  	objectCreate = Object.create || function create(O, Properties) {
+  	  var result;
+  	  if (O !== null) {
+  	    EmptyConstructor[PROTOTYPE] = anObject(O);
+  	    result = new EmptyConstructor();
+  	    EmptyConstructor[PROTOTYPE] = null;
+  	    // add "__proto__" for Object.getPrototypeOf polyfill
+  	    result[IE_PROTO] = O;
+  	  } else result = NullProtoObject();
+  	  return Properties === undefined ? result : definePropertiesModule.f(result, Properties);
+  	};
+  	return objectCreate;
+  }
+
+  var addToUnscopables;
+  var hasRequiredAddToUnscopables;
+
+  function requireAddToUnscopables () {
+  	if (hasRequiredAddToUnscopables) return addToUnscopables;
+  	hasRequiredAddToUnscopables = 1;
+  	var wellKnownSymbol = requireWellKnownSymbol();
+  	var create = requireObjectCreate();
+  	var defineProperty = requireObjectDefineProperty().f;
+
+  	var UNSCOPABLES = wellKnownSymbol('unscopables');
+  	var ArrayPrototype = Array.prototype;
+
+  	// Array.prototype[@@unscopables]
+  	// https://tc39.es/ecma262/#sec-array.prototype-@@unscopables
+  	if (ArrayPrototype[UNSCOPABLES] === undefined) {
+  	  defineProperty(ArrayPrototype, UNSCOPABLES, {
+  	    configurable: true,
+  	    value: create(null)
+  	  });
+  	}
+
+  	// add a key to Array.prototype[@@unscopables]
+  	addToUnscopables = function (key) {
+  	  ArrayPrototype[UNSCOPABLES][key] = true;
+  	};
+  	return addToUnscopables;
+  }
+
+  var hasRequiredEs_array_find;
+
+  function requireEs_array_find () {
+  	if (hasRequiredEs_array_find) return es_array_find;
+  	hasRequiredEs_array_find = 1;
+  	var $ = require_export();
+  	var $find = requireArrayIteration().find;
+  	var addToUnscopables = requireAddToUnscopables();
+
+  	var FIND = 'find';
+  	var SKIPS_HOLES = true;
+
+  	// Shouldn't skip holes
+  	// eslint-disable-next-line es/no-array-prototype-find -- testing
+  	if (FIND in []) Array(1)[FIND](function () { SKIPS_HOLES = false; });
+
+  	// `Array.prototype.find` method
+  	// https://tc39.es/ecma262/#sec-array.prototype.find
+  	$({ target: 'Array', proto: true, forced: SKIPS_HOLES }, {
+  	  find: function find(callbackfn /* , that = undefined */) {
+  	    return $find(this, callbackfn, arguments.length > 1 ? arguments[1] : undefined);
+  	  }
+  	});
+
+  	// https://tc39.es/ecma262/#sec-array.prototype-@@unscopables
+  	addToUnscopables(FIND);
+  	return es_array_find;
+  }
+
+  requireEs_array_find();
+
+  var es_object_assign = {};
+
+  var objectAssign;
+  var hasRequiredObjectAssign;
+
+  function requireObjectAssign () {
+  	if (hasRequiredObjectAssign) return objectAssign;
+  	hasRequiredObjectAssign = 1;
+  	var DESCRIPTORS = requireDescriptors();
+  	var uncurryThis = requireFunctionUncurryThis();
+  	var call = requireFunctionCall();
+  	var fails = requireFails();
+  	var objectKeys = requireObjectKeys();
+  	var getOwnPropertySymbolsModule = requireObjectGetOwnPropertySymbols();
+  	var propertyIsEnumerableModule = requireObjectPropertyIsEnumerable();
+  	var toObject = requireToObject();
+  	var IndexedObject = requireIndexedObject();
+
+  	// eslint-disable-next-line es/no-object-assign -- safe
+  	var $assign = Object.assign;
+  	// eslint-disable-next-line es/no-object-defineproperty -- required for testing
+  	var defineProperty = Object.defineProperty;
+  	var concat = uncurryThis([].concat);
+
+  	// `Object.assign` method
+  	// https://tc39.es/ecma262/#sec-object.assign
+  	objectAssign = !$assign || fails(function () {
+  	  // should have correct order of operations (Edge bug)
+  	  if (DESCRIPTORS && $assign({ b: 1 }, $assign(defineProperty({}, 'a', {
+  	    enumerable: true,
+  	    get: function () {
+  	      defineProperty(this, 'b', {
+  	        value: 3,
+  	        enumerable: false
+  	      });
+  	    }
+  	  }), { b: 2 })).b !== 1) return true;
+  	  // should work with symbols and should have deterministic property order (V8 bug)
+  	  var A = {};
+  	  var B = {};
+  	  // eslint-disable-next-line es/no-symbol -- safe
+  	  var symbol = Symbol('assign detection');
+  	  var alphabet = 'abcdefghijklmnopqrst';
+  	  A[symbol] = 7;
+  	  alphabet.split('').forEach(function (chr) { B[chr] = chr; });
+  	  return $assign({}, A)[symbol] !== 7 || objectKeys($assign({}, B)).join('') !== alphabet;
+  	}) ? function assign(target, source) { // eslint-disable-line no-unused-vars -- required for `.length`
+  	  var T = toObject(target);
+  	  var argumentsLength = arguments.length;
+  	  var index = 1;
+  	  var getOwnPropertySymbols = getOwnPropertySymbolsModule.f;
+  	  var propertyIsEnumerable = propertyIsEnumerableModule.f;
+  	  while (argumentsLength > index) {
+  	    var S = IndexedObject(arguments[index++]);
+  	    var keys = getOwnPropertySymbols ? concat(objectKeys(S), getOwnPropertySymbols(S)) : objectKeys(S);
+  	    var length = keys.length;
+  	    var j = 0;
+  	    var key;
+  	    while (length > j) {
+  	      key = keys[j++];
+  	      if (!DESCRIPTORS || call(propertyIsEnumerable, S, key)) T[key] = S[key];
+  	    }
+  	  } return T;
+  	} : $assign;
+  	return objectAssign;
+  }
+
+  var hasRequiredEs_object_assign;
+
+  function requireEs_object_assign () {
+  	if (hasRequiredEs_object_assign) return es_object_assign;
+  	hasRequiredEs_object_assign = 1;
+  	var $ = require_export();
+  	var assign = requireObjectAssign();
+
+  	// `Object.assign` method
+  	// https://tc39.es/ecma262/#sec-object.assign
+  	// eslint-disable-next-line es/no-object-assign -- required for testing
+  	$({ target: 'Object', stat: true, arity: 2, forced: Object.assign !== assign }, {
+  	  assign: assign
+  	});
+  	return es_object_assign;
+  }
+
+  requireEs_object_assign();
+
+  var es_object_toString = {};
+
+  var objectToString;
+  var hasRequiredObjectToString;
+
+  function requireObjectToString () {
+  	if (hasRequiredObjectToString) return objectToString;
+  	hasRequiredObjectToString = 1;
+  	var TO_STRING_TAG_SUPPORT = requireToStringTagSupport();
+  	var classof = requireClassof();
+
+  	// `Object.prototype.toString` method implementation
+  	// https://tc39.es/ecma262/#sec-object.prototype.tostring
+  	objectToString = TO_STRING_TAG_SUPPORT ? {}.toString : function toString() {
+  	  return '[object ' + classof(this) + ']';
+  	};
+  	return objectToString;
+  }
+
+  var hasRequiredEs_object_toString;
+
+  function requireEs_object_toString () {
+  	if (hasRequiredEs_object_toString) return es_object_toString;
+  	hasRequiredEs_object_toString = 1;
+  	var TO_STRING_TAG_SUPPORT = requireToStringTagSupport();
+  	var defineBuiltIn = requireDefineBuiltIn();
+  	var toString = requireObjectToString();
+
+  	// `Object.prototype.toString` method
+  	// https://tc39.es/ecma262/#sec-object.prototype.tostring
+  	if (!TO_STRING_TAG_SUPPORT) {
+  	  defineBuiltIn(Object.prototype, 'toString', toString, { unsafe: true });
+  	}
+  	return es_object_toString;
+  }
+
+  requireEs_object_toString();
+
   /**
    * @author vincent loh <vincent.ml@gmail.com>
    * @update J Manuel Corona <jmcg92@gmail.com>
    * @update zhixin wen <wenzhixin2010@gmail.com>
    */
 
-  var Utils = $$3.fn.bootstrapTable.utils;
-  Object.assign($$3.fn.bootstrapTable.defaults, {
+  var Utils = $.fn.bootstrapTable.utils;
+  Object.assign($.fn.bootstrapTable.defaults, {
     stickyHeader: false,
     stickyHeaderOffsetY: 0,
     stickyHeaderOffsetLeft: 0,
     stickyHeaderOffsetRight: 0
   });
-  $$3.BootstrapTable = /*#__PURE__*/function (_$$BootstrapTable) {
+  $.BootstrapTable = /*#__PURE__*/function (_$$BootstrapTable) {
     function _class() {
       _classCallCheck(this, _class);
       return _callSuper(this, _class, arguments);
@@ -24715,12 +32145,11 @@ if(xr(e,"index.xml"))throw new Error("Unsupported NUMBERS 09 file");throw new Er
     return _createClass(_class, [{
       key: "initHeader",
       value: function initHeader() {
-        var _get2,
-          _this = this;
+        var _this = this;
         for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
           args[_key] = arguments[_key];
         }
-        (_get2 = _get(_getPrototypeOf(_class.prototype), "initHeader", this)).call.apply(_get2, [this].concat(args));
+        _superPropGet(_class, "initHeader", this)(args);
         if (!this.options.stickyHeader) {
           return;
         }
@@ -24740,10 +32169,10 @@ if(xr(e,"index.xml"))throw new Error("Unsupported NUMBERS 09 file");throw new Er
         // render sticky on window scroll or resize
         var resizeEvent = Utils.getEventName('resize.sticky-header-table', this.$el.attr('id'));
         var scrollEvent = Utils.getEventName('scroll.sticky-header-table', this.$el.attr('id'));
-        $$3(window).off(resizeEvent).on(resizeEvent, function () {
+        $(window).off(resizeEvent).on(resizeEvent, function () {
           return _this.renderStickyHeader();
         });
-        $$3(window).off(scrollEvent).on(scrollEvent, function () {
+        $(window).off(scrollEvent).on(scrollEvent, function () {
           return _this.renderStickyHeader();
         });
         this.$tableBody.off('scroll').on('scroll', function () {
@@ -24755,37 +32184,44 @@ if(xr(e,"index.xml"))throw new Error("Unsupported NUMBERS 09 file");throw new Er
       value: function onColumnSearch(_ref) {
         var currentTarget = _ref.currentTarget,
           keyCode = _ref.keyCode;
-        _get(_getPrototypeOf(_class.prototype), "onColumnSearch", this).call(this, {
+        _superPropGet(_class, "onColumnSearch", this)([{
           currentTarget: currentTarget,
           keyCode: keyCode
-        });
+        }]);
+        if (!this.options.stickyHeader) {
+          return;
+        }
         this.renderStickyHeader();
       }
     }, {
       key: "resetView",
       value: function resetView() {
-        var _get3,
-          _this2 = this;
+        var _this2 = this;
         for (var _len2 = arguments.length, args = new Array(_len2), _key2 = 0; _key2 < _len2; _key2++) {
           args[_key2] = arguments[_key2];
         }
-        (_get3 = _get(_getPrototypeOf(_class.prototype), "resetView", this)).call.apply(_get3, [this].concat(args));
-        $$3('.bootstrap-table.fullscreen').off('scroll').on('scroll', function () {
+        _superPropGet(_class, "resetView", this)(args);
+        if (!this.options.stickyHeader) {
+          return;
+        }
+        $('.bootstrap-table.fullscreen').off('scroll').on('scroll', function () {
           return _this2.renderStickyHeader();
         });
       }
     }, {
       key: "getCaret",
       value: function getCaret() {
-        var _get4;
         for (var _len3 = arguments.length, args = new Array(_len3), _key3 = 0; _key3 < _len3; _key3++) {
           args[_key3] = arguments[_key3];
         }
-        (_get4 = _get(_getPrototypeOf(_class.prototype), "getCaret", this)).call.apply(_get4, [this].concat(args));
+        _superPropGet(_class, "getCaret", this)(args);
+        if (!this.options.stickyHeader) {
+          return;
+        }
         if (this.$stickyHeader) {
           var $ths = this.$stickyHeader.find('th');
           this.$header.find('th').each(function (i, th) {
-            $ths.eq(i).find('.sortable').attr('class', $$3(th).find('.sortable').attr('class'));
+            $ths.eq(i).find('.sortable').attr('class', $(th).find('.sortable').attr('class'));
           });
         }
       }
@@ -24793,7 +32229,10 @@ if(xr(e,"index.xml"))throw new Error("Unsupported NUMBERS 09 file");throw new Er
       key: "horizontalScroll",
       value: function horizontalScroll() {
         var _this3 = this;
-        _get(_getPrototypeOf(_class.prototype), "horizontalScroll", this).call(this);
+        _superPropGet(_class, "horizontalScroll", this)([]);
+        if (!this.options.stickyHeader) {
+          return;
+        }
         this.$tableBody.on('scroll', function () {
           return _this3.matchPositionX();
         });
@@ -24805,8 +32244,8 @@ if(xr(e,"index.xml"))throw new Error("Unsupported NUMBERS 09 file");throw new Er
         var that = this;
         this.$stickyHeader = this.$header.clone(true, true);
         if (this.options.filterControl) {
-          $$3(this.$stickyHeader).off('keyup change mouseup').on('keyup change mouse', function (e) {
-            var $target = $$3(e.target);
+          $(this.$stickyHeader).off('keyup change mouseup').on('keyup change mouse', function (e) {
+            var $target = $(e.target);
             var value = $target.val();
             var field = $target.parents('th').data('field');
             var $coreTh = that.$header.find("th[data-field=\"".concat(field, "\"]"));
@@ -24820,7 +32259,7 @@ if(xr(e,"index.xml"))throw new Error("Unsupported NUMBERS 09 file");throw new Er
             that.triggerSearch();
           });
         }
-        var top = $$3(window).scrollTop();
+        var top = $(window).scrollTop();
         // top anchor scroll position, minus header height
         var start = this.$stickyBegin.offset().top - this.options.stickyHeaderOffsetY;
         // bottom anchor scroll position, minus header height, minus sticky height
@@ -24830,8 +32269,8 @@ if(xr(e,"index.xml"))throw new Error("Unsupported NUMBERS 09 file");throw new Er
         if (top > start && top <= end) {
           // ensure clone and source column widths are the same
           this.$stickyHeader.find('tr').each(function (indexRows, rows) {
-            $$3(rows).find('th').each(function (index, el) {
-              $$3(el).css('min-width', _this4.$header.find("tr:eq(".concat(indexRows, ")")).find("th:eq(".concat(index, ")")).css('width'));
+            $(rows).find('th').each(function (index, el) {
+              $(el).css('min-width', _this4.$header.find("tr:eq(".concat(indexRows, ")")).find("th:eq(".concat(index, ")")).css('width'));
             });
           });
           // match bootstrap table style
@@ -24857,7 +32296,7 @@ if(xr(e,"index.xml"))throw new Error("Unsupported NUMBERS 09 file");throw new Er
           this.$stickyContainer.css('right', "".concat(stickyHeaderOffsetRight, "px"));
           this.$stickyContainer.css('width', "".concat(width));
           // create scrollable container for header
-          this.$stickyTable = $$3('<table/>');
+          this.$stickyTable = $('<table/>');
           this.$stickyTable.addClass(this.options.classes);
           // append cloned header to dom
           this.$stickyContainer.html(this.$stickyTable.append(this.$stickyHeader));
@@ -24873,7 +32312,7 @@ if(xr(e,"index.xml"))throw new Error("Unsupported NUMBERS 09 file");throw new Er
         this.$stickyContainer.scrollLeft(this.$tableBody.scrollLeft());
       }
     }]);
-  }($$3.BootstrapTable);
+  }($.BootstrapTable);
 
 }));
 
@@ -24881,11 +32320,114 @@ if(xr(e,"index.xml"))throw new Error("Unsupported NUMBERS 09 file");throw new Er
   typeof exports === 'object' && typeof module !== 'undefined' ? factory(require('jquery')) :
   typeof define === 'function' && define.amd ? define(['jquery'], factory) :
   (global = typeof globalThis !== 'undefined' ? globalThis : global || self, factory(global.jQuery));
-})(this, (function ($$b) { 'use strict';
+})(this, (function ($) { 'use strict';
 
+  function _arrayLikeToArray(r, a) {
+    (null == a || a > r.length) && (a = r.length);
+    for (var e = 0, n = Array(a); e < a; e++) n[e] = r[e];
+    return n;
+  }
+  function _arrayWithHoles(r) {
+    if (Array.isArray(r)) return r;
+  }
+  function _arrayWithoutHoles(r) {
+    if (Array.isArray(r)) return _arrayLikeToArray(r);
+  }
+  function _assertThisInitialized(e) {
+    if (void 0 === e) throw new ReferenceError("this hasn't been initialised - super() hasn't been called");
+    return e;
+  }
   function _callSuper(t, o, e) {
     return o = _getPrototypeOf(o), _possibleConstructorReturn(t, _isNativeReflectConstruct() ? Reflect.construct(o, e || [], _getPrototypeOf(t).constructor) : o.apply(t, e));
   }
+  function _classCallCheck(a, n) {
+    if (!(a instanceof n)) throw new TypeError("Cannot call a class as a function");
+  }
+  function _defineProperties(e, r) {
+    for (var t = 0; t < r.length; t++) {
+      var o = r[t];
+      o.enumerable = o.enumerable || !1, o.configurable = !0, "value" in o && (o.writable = !0), Object.defineProperty(e, _toPropertyKey(o.key), o);
+    }
+  }
+  function _createClass(e, r, t) {
+    return _defineProperties(e.prototype, r), Object.defineProperty(e, "prototype", {
+      writable: !1
+    }), e;
+  }
+  function _createForOfIteratorHelper(r, e) {
+    var t = "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"];
+    if (!t) {
+      if (Array.isArray(r) || (t = _unsupportedIterableToArray(r)) || e) {
+        t && (r = t);
+        var n = 0,
+          F = function () {};
+        return {
+          s: F,
+          n: function () {
+            return n >= r.length ? {
+              done: !0
+            } : {
+              done: !1,
+              value: r[n++]
+            };
+          },
+          e: function (r) {
+            throw r;
+          },
+          f: F
+        };
+      }
+      throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.");
+    }
+    var o,
+      a = !0,
+      u = !1;
+    return {
+      s: function () {
+        t = t.call(r);
+      },
+      n: function () {
+        var r = t.next();
+        return a = r.done, r;
+      },
+      e: function (r) {
+        u = !0, o = r;
+      },
+      f: function () {
+        try {
+          a || null == t.return || t.return();
+        } finally {
+          if (u) throw o;
+        }
+      }
+    };
+  }
+  function _get() {
+    return _get = "undefined" != typeof Reflect && Reflect.get ? Reflect.get.bind() : function (e, t, r) {
+      var p = _superPropBase(e, t);
+      if (p) {
+        var n = Object.getOwnPropertyDescriptor(p, t);
+        return n.get ? n.get.call(arguments.length < 3 ? e : r) : n.value;
+      }
+    }, _get.apply(null, arguments);
+  }
+  function _getPrototypeOf(t) {
+    return _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf.bind() : function (t) {
+      return t.__proto__ || Object.getPrototypeOf(t);
+    }, _getPrototypeOf(t);
+  }
+  function _inherits(t, e) {
+    if ("function" != typeof e && null !== e) throw new TypeError("Super expression must either be null or a function");
+    t.prototype = Object.create(e && e.prototype, {
+      constructor: {
+        value: t,
+        writable: !0,
+        configurable: !0
+      }
+    }), Object.defineProperty(t, "prototype", {
+      writable: !1
+    }), e && _setPrototypeOf(t, e);
+  }
   function _isNativeReflectConstruct() {
     try {
       var t = !Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {}));
@@ -24894,6 +32436,9 @@ if(xr(e,"index.xml"))throw new Error("Unsupported NUMBERS 09 file");throw new Er
       return !!t;
     })();
   }
+  function _iterableToArray(r) {
+    if ("undefined" != typeof Symbol && null != r[Symbol.iterator] || null != r["@@iterator"]) return Array.from(r);
+  }
   function _iterableToArrayLimit(r, l) {
     var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"];
     if (null != t) {
@@ -24905,10 +32450,7 @@ if(xr(e,"index.xml"))throw new Error("Unsupported NUMBERS 09 file");throw new Er
         f = !0,
         o = !1;
       try {
-        if (i = (t = t.call(r)).next, 0 === l) {
-          if (Object(t) !== t) return;
-          f = !1;
-        } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0);
+        if (i = (t = t.call(r)).next, 0 === l) ; else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0);
       } catch (r) {
         o = !0, n = r;
       } finally {
@@ -24921,2418 +32463,3248 @@ if(xr(e,"index.xml"))throw new Error("Unsupported NUMBERS 09 file");throw new Er
       return a;
     }
   }
+  function _nonIterableRest() {
+    throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.");
+  }
+  function _nonIterableSpread() {
+    throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.");
+  }
+  function _possibleConstructorReturn(t, e) {
+    if (e && ("object" == typeof e || "function" == typeof e)) return e;
+    if (void 0 !== e) throw new TypeError("Derived constructors may only return object or undefined");
+    return _assertThisInitialized(t);
+  }
+  function _setPrototypeOf(t, e) {
+    return _setPrototypeOf = Object.setPrototypeOf ? Object.setPrototypeOf.bind() : function (t, e) {
+      return t.__proto__ = e, t;
+    }, _setPrototypeOf(t, e);
+  }
+  function _slicedToArray(r, e) {
+    return _arrayWithHoles(r) || _iterableToArrayLimit(r, e) || _unsupportedIterableToArray(r, e) || _nonIterableRest();
+  }
+  function _superPropBase(t, o) {
+    for (; !{}.hasOwnProperty.call(t, o) && null !== (t = _getPrototypeOf(t)););
+    return t;
+  }
+  function _superPropGet(t, o, e, r) {
+    var p = _get(_getPrototypeOf(t.prototype ), o, e);
+    return "function" == typeof p ? function (t) {
+      return p.apply(e, t);
+    } : p;
+  }
+  function _toConsumableArray(r) {
+    return _arrayWithoutHoles(r) || _iterableToArray(r) || _unsupportedIterableToArray(r) || _nonIterableSpread();
+  }
   function _toPrimitive(t, r) {
     if ("object" != typeof t || !t) return t;
     var e = t[Symbol.toPrimitive];
     if (void 0 !== e) {
-      var i = e.call(t, r || "default");
+      var i = e.call(t, r);
       if ("object" != typeof i) return i;
       throw new TypeError("@@toPrimitive must return a primitive value.");
     }
-    return ("string" === r ? String : Number)(t);
+    return (String )(t);
   }
   function _toPropertyKey(t) {
     var i = _toPrimitive(t, "string");
     return "symbol" == typeof i ? i : i + "";
   }
-  function _classCallCheck(instance, Constructor) {
-    if (!(instance instanceof Constructor)) {
-      throw new TypeError("Cannot call a class as a function");
+  function _unsupportedIterableToArray(r, a) {
+    if (r) {
+      if ("string" == typeof r) return _arrayLikeToArray(r, a);
+      var t = {}.toString.call(r).slice(8, -1);
+      return "Object" === t && r.constructor && (t = r.constructor.name), "Map" === t || "Set" === t ? Array.from(r) : "Arguments" === t || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(t) ? _arrayLikeToArray(r, a) : void 0;
     }
   }
-  function _defineProperties(target, props) {
-    for (var i = 0; i < props.length; i++) {
-      var descriptor = props[i];
-      descriptor.enumerable = descriptor.enumerable || false;
-      descriptor.configurable = true;
-      if ("value" in descriptor) descriptor.writable = true;
-      Object.defineProperty(target, _toPropertyKey(descriptor.key), descriptor);
-    }
-  }
-  function _createClass(Constructor, protoProps, staticProps) {
-    if (protoProps) _defineProperties(Constructor.prototype, protoProps);
-    if (staticProps) _defineProperties(Constructor, staticProps);
-    Object.defineProperty(Constructor, "prototype", {
-      writable: false
-    });
-    return Constructor;
-  }
-  function _inherits(subClass, superClass) {
-    if (typeof superClass !== "function" && superClass !== null) {
-      throw new TypeError("Super expression must either be null or a function");
-    }
-    subClass.prototype = Object.create(superClass && superClass.prototype, {
-      constructor: {
-        value: subClass,
-        writable: true,
-        configurable: true
-      }
-    });
-    Object.defineProperty(subClass, "prototype", {
-      writable: false
-    });
-    if (superClass) _setPrototypeOf(subClass, superClass);
-  }
-  function _getPrototypeOf(o) {
-    _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf.bind() : function _getPrototypeOf(o) {
-      return o.__proto__ || Object.getPrototypeOf(o);
-    };
-    return _getPrototypeOf(o);
-  }
-  function _setPrototypeOf(o, p) {
-    _setPrototypeOf = Object.setPrototypeOf ? Object.setPrototypeOf.bind() : function _setPrototypeOf(o, p) {
-      o.__proto__ = p;
-      return o;
-    };
-    return _setPrototypeOf(o, p);
-  }
-  function _assertThisInitialized(self) {
-    if (self === void 0) {
-      throw new ReferenceError("this hasn't been initialised - super() hasn't been called");
-    }
-    return self;
-  }
-  function _possibleConstructorReturn(self, call) {
-    if (call && (typeof call === "object" || typeof call === "function")) {
-      return call;
-    } else if (call !== void 0) {
-      throw new TypeError("Derived constructors may only return object or undefined");
-    }
-    return _assertThisInitialized(self);
-  }
-  function _superPropBase(object, property) {
-    while (!Object.prototype.hasOwnProperty.call(object, property)) {
-      object = _getPrototypeOf(object);
-      if (object === null) break;
-    }
-    return object;
-  }
-  function _get() {
-    if (typeof Reflect !== "undefined" && Reflect.get) {
-      _get = Reflect.get.bind();
-    } else {
-      _get = function _get(target, property, receiver) {
-        var base = _superPropBase(target, property);
-        if (!base) return;
-        var desc = Object.getOwnPropertyDescriptor(base, property);
-        if (desc.get) {
-          return desc.get.call(arguments.length < 3 ? target : receiver);
-        }
-        return desc.value;
-      };
-    }
-    return _get.apply(this, arguments);
-  }
-  function _slicedToArray(arr, i) {
-    return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest();
-  }
-  function _toConsumableArray(arr) {
-    return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread();
-  }
-  function _arrayWithoutHoles(arr) {
-    if (Array.isArray(arr)) return _arrayLikeToArray(arr);
-  }
-  function _arrayWithHoles(arr) {
-    if (Array.isArray(arr)) return arr;
-  }
-  function _iterableToArray(iter) {
-    if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter);
-  }
-  function _unsupportedIterableToArray(o, minLen) {
-    if (!o) return;
-    if (typeof o === "string") return _arrayLikeToArray(o, minLen);
-    var n = Object.prototype.toString.call(o).slice(8, -1);
-    if (n === "Object" && o.constructor) n = o.constructor.name;
-    if (n === "Map" || n === "Set") return Array.from(o);
-    if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen);
-  }
-  function _arrayLikeToArray(arr, len) {
-    if (len == null || len > arr.length) len = arr.length;
-    for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i];
-    return arr2;
-  }
-  function _nonIterableSpread() {
-    throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.");
-  }
-  function _nonIterableRest() {
-    throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.");
-  }
-  function _createForOfIteratorHelper(o, allowArrayLike) {
-    var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"];
-    if (!it) {
-      if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") {
-        if (it) o = it;
-        var i = 0;
-        var F = function () {};
-        return {
-          s: F,
-          n: function () {
-            if (i >= o.length) return {
-              done: true
-            };
-            return {
-              done: false,
-              value: o[i++]
-            };
-          },
-          e: function (e) {
-            throw e;
-          },
-          f: F
-        };
-      }
-      throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.");
-    }
-    var normalCompletion = true,
-      didErr = false,
-      err;
-    return {
-      s: function () {
-        it = it.call(o);
-      },
-      n: function () {
-        var step = it.next();
-        normalCompletion = step.done;
-        return step;
-      },
-      e: function (e) {
-        didErr = true;
-        err = e;
-      },
-      f: function () {
-        try {
-          if (!normalCompletion && it.return != null) it.return();
-        } finally {
-          if (didErr) throw err;
-        }
-      }
-    };
-  }
 
   var commonjsGlobal = typeof globalThis !== 'undefined' ? globalThis : typeof window !== 'undefined' ? window : typeof global !== 'undefined' ? global : typeof self !== 'undefined' ? self : {};
 
-  var check = function (it) {
-    return it && it.Math === Math && it;
-  };
+  var es_array_concat = {};
 
-  // https://github.com/zloirock/core-js/issues/86#issuecomment-115759028
-  var global$d =
-    // eslint-disable-next-line es/no-global-this -- safe
-    check(typeof globalThis == 'object' && globalThis) ||
-    check(typeof window == 'object' && window) ||
-    // eslint-disable-next-line no-restricted-globals -- safe
-    check(typeof self == 'object' && self) ||
-    check(typeof commonjsGlobal == 'object' && commonjsGlobal) ||
-    check(typeof commonjsGlobal == 'object' && commonjsGlobal) ||
-    // eslint-disable-next-line no-new-func -- fallback
-    (function () { return this; })() || Function('return this')();
+  var globalThis_1;
+  var hasRequiredGlobalThis;
+
+  function requireGlobalThis () {
+  	if (hasRequiredGlobalThis) return globalThis_1;
+  	hasRequiredGlobalThis = 1;
+  	var check = function (it) {
+  	  return it && it.Math === Math && it;
+  	};
+
+  	// https://github.com/zloirock/core-js/issues/86#issuecomment-115759028
+  	globalThis_1 =
+  	  // eslint-disable-next-line es/no-global-this -- safe
+  	  check(typeof globalThis == 'object' && globalThis) ||
+  	  check(typeof window == 'object' && window) ||
+  	  // eslint-disable-next-line no-restricted-globals -- safe
+  	  check(typeof self == 'object' && self) ||
+  	  check(typeof commonjsGlobal == 'object' && commonjsGlobal) ||
+  	  check(typeof globalThis_1 == 'object' && globalThis_1) ||
+  	  // eslint-disable-next-line no-new-func -- fallback
+  	  (function () { return this; })() || Function('return this')();
+  	return globalThis_1;
+  }
 
   var objectGetOwnPropertyDescriptor = {};
 
-  var fails$l = function (exec) {
-    try {
-      return !!exec();
-    } catch (error) {
-      return true;
-    }
-  };
+  var fails;
+  var hasRequiredFails;
 
-  var fails$k = fails$l;
+  function requireFails () {
+  	if (hasRequiredFails) return fails;
+  	hasRequiredFails = 1;
+  	fails = function (exec) {
+  	  try {
+  	    return !!exec();
+  	  } catch (error) {
+  	    return true;
+  	  }
+  	};
+  	return fails;
+  }
 
-  // Detect IE8's incomplete defineProperty implementation
-  var descriptors = !fails$k(function () {
-    // eslint-disable-next-line es/no-object-defineproperty -- required for testing
-    return Object.defineProperty({}, 1, { get: function () { return 7; } })[1] !== 7;
-  });
+  var descriptors;
+  var hasRequiredDescriptors;
 
-  var fails$j = fails$l;
+  function requireDescriptors () {
+  	if (hasRequiredDescriptors) return descriptors;
+  	hasRequiredDescriptors = 1;
+  	var fails = requireFails();
 
-  var functionBindNative = !fails$j(function () {
-    // eslint-disable-next-line es/no-function-prototype-bind -- safe
-    var test = (function () { /* empty */ }).bind();
-    // eslint-disable-next-line no-prototype-builtins -- safe
-    return typeof test != 'function' || test.hasOwnProperty('prototype');
-  });
+  	// Detect IE8's incomplete defineProperty implementation
+  	descriptors = !fails(function () {
+  	  // eslint-disable-next-line es/no-object-defineproperty -- required for testing
+  	  return Object.defineProperty({}, 1, { get: function () { return 7; } })[1] !== 7;
+  	});
+  	return descriptors;
+  }
 
-  var NATIVE_BIND$2 = functionBindNative;
+  var functionBindNative;
+  var hasRequiredFunctionBindNative;
 
-  var call$9 = Function.prototype.call;
+  function requireFunctionBindNative () {
+  	if (hasRequiredFunctionBindNative) return functionBindNative;
+  	hasRequiredFunctionBindNative = 1;
+  	var fails = requireFails();
 
-  var functionCall = NATIVE_BIND$2 ? call$9.bind(call$9) : function () {
-    return call$9.apply(call$9, arguments);
-  };
+  	functionBindNative = !fails(function () {
+  	  // eslint-disable-next-line es/no-function-prototype-bind -- safe
+  	  var test = (function () { /* empty */ }).bind();
+  	  // eslint-disable-next-line no-prototype-builtins -- safe
+  	  return typeof test != 'function' || test.hasOwnProperty('prototype');
+  	});
+  	return functionBindNative;
+  }
+
+  var functionCall;
+  var hasRequiredFunctionCall;
+
+  function requireFunctionCall () {
+  	if (hasRequiredFunctionCall) return functionCall;
+  	hasRequiredFunctionCall = 1;
+  	var NATIVE_BIND = requireFunctionBindNative();
+
+  	var call = Function.prototype.call;
+
+  	functionCall = NATIVE_BIND ? call.bind(call) : function () {
+  	  return call.apply(call, arguments);
+  	};
+  	return functionCall;
+  }
 
   var objectPropertyIsEnumerable = {};
 
-  var $propertyIsEnumerable$1 = {}.propertyIsEnumerable;
-  // eslint-disable-next-line es/no-object-getownpropertydescriptor -- safe
-  var getOwnPropertyDescriptor$1 = Object.getOwnPropertyDescriptor;
+  var hasRequiredObjectPropertyIsEnumerable;
 
-  // Nashorn ~ JDK8 bug
-  var NASHORN_BUG = getOwnPropertyDescriptor$1 && !$propertyIsEnumerable$1.call({ 1: 2 }, 1);
+  function requireObjectPropertyIsEnumerable () {
+  	if (hasRequiredObjectPropertyIsEnumerable) return objectPropertyIsEnumerable;
+  	hasRequiredObjectPropertyIsEnumerable = 1;
+  	var $propertyIsEnumerable = {}.propertyIsEnumerable;
+  	// eslint-disable-next-line es/no-object-getownpropertydescriptor -- safe
+  	var getOwnPropertyDescriptor = Object.getOwnPropertyDescriptor;
 
-  // `Object.prototype.propertyIsEnumerable` method implementation
-  // https://tc39.es/ecma262/#sec-object.prototype.propertyisenumerable
-  objectPropertyIsEnumerable.f = NASHORN_BUG ? function propertyIsEnumerable(V) {
-    var descriptor = getOwnPropertyDescriptor$1(this, V);
-    return !!descriptor && descriptor.enumerable;
-  } : $propertyIsEnumerable$1;
+  	// Nashorn ~ JDK8 bug
+  	var NASHORN_BUG = getOwnPropertyDescriptor && !$propertyIsEnumerable.call({ 1: 2 }, 1);
 
-  var createPropertyDescriptor$3 = function (bitmap, value) {
-    return {
-      enumerable: !(bitmap & 1),
-      configurable: !(bitmap & 2),
-      writable: !(bitmap & 4),
-      value: value
-    };
-  };
-
-  var NATIVE_BIND$1 = functionBindNative;
-
-  var FunctionPrototype$1 = Function.prototype;
-  var call$8 = FunctionPrototype$1.call;
-  var uncurryThisWithBind = NATIVE_BIND$1 && FunctionPrototype$1.bind.bind(call$8, call$8);
-
-  var functionUncurryThis = NATIVE_BIND$1 ? uncurryThisWithBind : function (fn) {
-    return function () {
-      return call$8.apply(fn, arguments);
-    };
-  };
-
-  var uncurryThis$j = functionUncurryThis;
-
-  var toString$7 = uncurryThis$j({}.toString);
-  var stringSlice$2 = uncurryThis$j(''.slice);
-
-  var classofRaw$2 = function (it) {
-    return stringSlice$2(toString$7(it), 8, -1);
-  };
-
-  var uncurryThis$i = functionUncurryThis;
-  var fails$i = fails$l;
-  var classof$7 = classofRaw$2;
-
-  var $Object$4 = Object;
-  var split = uncurryThis$i(''.split);
-
-  // fallback for non-array-like ES3 and non-enumerable old V8 strings
-  var indexedObject = fails$i(function () {
-    // throws an error in rhino, see https://github.com/mozilla/rhino/issues/346
-    // eslint-disable-next-line no-prototype-builtins -- safe
-    return !$Object$4('z').propertyIsEnumerable(0);
-  }) ? function (it) {
-    return classof$7(it) === 'String' ? split(it, '') : $Object$4(it);
-  } : $Object$4;
-
-  // we can't use just `it == null` since of `document.all` special case
-  // https://tc39.es/ecma262/#sec-IsHTMLDDA-internal-slot-aec
-  var isNullOrUndefined$3 = function (it) {
-    return it === null || it === undefined;
-  };
-
-  var isNullOrUndefined$2 = isNullOrUndefined$3;
-
-  var $TypeError$8 = TypeError;
-
-  // `RequireObjectCoercible` abstract operation
-  // https://tc39.es/ecma262/#sec-requireobjectcoercible
-  var requireObjectCoercible$5 = function (it) {
-    if (isNullOrUndefined$2(it)) throw new $TypeError$8("Can't call method on " + it);
-    return it;
-  };
-
-  // toObject with fallback for non-array-like ES3 strings
-  var IndexedObject$3 = indexedObject;
-  var requireObjectCoercible$4 = requireObjectCoercible$5;
-
-  var toIndexedObject$6 = function (it) {
-    return IndexedObject$3(requireObjectCoercible$4(it));
-  };
-
-  // https://tc39.es/ecma262/#sec-IsHTMLDDA-internal-slot
-  var documentAll = typeof document == 'object' && document.all;
-
-  // `IsCallable` abstract operation
-  // https://tc39.es/ecma262/#sec-iscallable
-  // eslint-disable-next-line unicorn/no-typeof-undefined -- required for testing
-  var isCallable$e = typeof documentAll == 'undefined' && documentAll !== undefined ? function (argument) {
-    return typeof argument == 'function' || argument === documentAll;
-  } : function (argument) {
-    return typeof argument == 'function';
-  };
-
-  var isCallable$d = isCallable$e;
-
-  var isObject$8 = function (it) {
-    return typeof it == 'object' ? it !== null : isCallable$d(it);
-  };
-
-  var global$c = global$d;
-  var isCallable$c = isCallable$e;
-
-  var aFunction = function (argument) {
-    return isCallable$c(argument) ? argument : undefined;
-  };
-
-  var getBuiltIn$4 = function (namespace, method) {
-    return arguments.length < 2 ? aFunction(global$c[namespace]) : global$c[namespace] && global$c[namespace][method];
-  };
-
-  var uncurryThis$h = functionUncurryThis;
-
-  var objectIsPrototypeOf = uncurryThis$h({}.isPrototypeOf);
-
-  var engineUserAgent = typeof navigator != 'undefined' && String(navigator.userAgent) || '';
-
-  var global$b = global$d;
-  var userAgent = engineUserAgent;
-
-  var process = global$b.process;
-  var Deno = global$b.Deno;
-  var versions = process && process.versions || Deno && Deno.version;
-  var v8 = versions && versions.v8;
-  var match, version;
-
-  if (v8) {
-    match = v8.split('.');
-    // in old Chrome, versions of V8 isn't V8 = Chrome / 10
-    // but their correct versions are not interesting for us
-    version = match[0] > 0 && match[0] < 4 ? 1 : +(match[0] + match[1]);
+  	// `Object.prototype.propertyIsEnumerable` method implementation
+  	// https://tc39.es/ecma262/#sec-object.prototype.propertyisenumerable
+  	objectPropertyIsEnumerable.f = NASHORN_BUG ? function propertyIsEnumerable(V) {
+  	  var descriptor = getOwnPropertyDescriptor(this, V);
+  	  return !!descriptor && descriptor.enumerable;
+  	} : $propertyIsEnumerable;
+  	return objectPropertyIsEnumerable;
   }
 
-  // BrowserFS NodeJS `process` polyfill incorrectly set `.v8` to `0.0`
-  // so check `userAgent` even if `.v8` exists, but 0
-  if (!version && userAgent) {
-    match = userAgent.match(/Edge\/(\d+)/);
-    if (!match || match[1] >= 74) {
-      match = userAgent.match(/Chrome\/(\d+)/);
-      if (match) version = +match[1];
-    }
+  var createPropertyDescriptor;
+  var hasRequiredCreatePropertyDescriptor;
+
+  function requireCreatePropertyDescriptor () {
+  	if (hasRequiredCreatePropertyDescriptor) return createPropertyDescriptor;
+  	hasRequiredCreatePropertyDescriptor = 1;
+  	createPropertyDescriptor = function (bitmap, value) {
+  	  return {
+  	    enumerable: !(bitmap & 1),
+  	    configurable: !(bitmap & 2),
+  	    writable: !(bitmap & 4),
+  	    value: value
+  	  };
+  	};
+  	return createPropertyDescriptor;
   }
 
-  var engineV8Version = version;
+  var functionUncurryThis;
+  var hasRequiredFunctionUncurryThis;
 
-  /* eslint-disable es/no-symbol -- required for testing */
-  var V8_VERSION$2 = engineV8Version;
-  var fails$h = fails$l;
-  var global$a = global$d;
+  function requireFunctionUncurryThis () {
+  	if (hasRequiredFunctionUncurryThis) return functionUncurryThis;
+  	hasRequiredFunctionUncurryThis = 1;
+  	var NATIVE_BIND = requireFunctionBindNative();
 
-  var $String$4 = global$a.String;
+  	var FunctionPrototype = Function.prototype;
+  	var call = FunctionPrototype.call;
+  	var uncurryThisWithBind = NATIVE_BIND && FunctionPrototype.bind.bind(call, call);
 
-  // eslint-disable-next-line es/no-object-getownpropertysymbols -- required for testing
-  var symbolConstructorDetection = !!Object.getOwnPropertySymbols && !fails$h(function () {
-    var symbol = Symbol('symbol detection');
-    // Chrome 38 Symbol has incorrect toString conversion
-    // `get-own-property-symbols` polyfill symbols converted to object are not Symbol instances
-    // nb: Do not call `String` directly to avoid this being optimized out to `symbol+''` which will,
-    // of course, fail.
-    return !$String$4(symbol) || !(Object(symbol) instanceof Symbol) ||
-      // Chrome 38-40 symbols are not inherited from DOM collections prototypes to instances
-      !Symbol.sham && V8_VERSION$2 && V8_VERSION$2 < 41;
-  });
+  	functionUncurryThis = NATIVE_BIND ? uncurryThisWithBind : function (fn) {
+  	  return function () {
+  	    return call.apply(fn, arguments);
+  	  };
+  	};
+  	return functionUncurryThis;
+  }
 
-  /* eslint-disable es/no-symbol -- required for testing */
-  var NATIVE_SYMBOL$1 = symbolConstructorDetection;
+  var classofRaw;
+  var hasRequiredClassofRaw;
 
-  var useSymbolAsUid = NATIVE_SYMBOL$1
-    && !Symbol.sham
-    && typeof Symbol.iterator == 'symbol';
+  function requireClassofRaw () {
+  	if (hasRequiredClassofRaw) return classofRaw;
+  	hasRequiredClassofRaw = 1;
+  	var uncurryThis = requireFunctionUncurryThis();
 
-  var getBuiltIn$3 = getBuiltIn$4;
-  var isCallable$b = isCallable$e;
-  var isPrototypeOf = objectIsPrototypeOf;
-  var USE_SYMBOL_AS_UID$1 = useSymbolAsUid;
+  	var toString = uncurryThis({}.toString);
+  	var stringSlice = uncurryThis(''.slice);
 
-  var $Object$3 = Object;
+  	classofRaw = function (it) {
+  	  return stringSlice(toString(it), 8, -1);
+  	};
+  	return classofRaw;
+  }
 
-  var isSymbol$2 = USE_SYMBOL_AS_UID$1 ? function (it) {
-    return typeof it == 'symbol';
-  } : function (it) {
-    var $Symbol = getBuiltIn$3('Symbol');
-    return isCallable$b($Symbol) && isPrototypeOf($Symbol.prototype, $Object$3(it));
-  };
+  var indexedObject;
+  var hasRequiredIndexedObject;
 
-  var $String$3 = String;
+  function requireIndexedObject () {
+  	if (hasRequiredIndexedObject) return indexedObject;
+  	hasRequiredIndexedObject = 1;
+  	var uncurryThis = requireFunctionUncurryThis();
+  	var fails = requireFails();
+  	var classof = requireClassofRaw();
 
-  var tryToString$1 = function (argument) {
-    try {
-      return $String$3(argument);
-    } catch (error) {
-      return 'Object';
-    }
-  };
+  	var $Object = Object;
+  	var split = uncurryThis(''.split);
 
-  var isCallable$a = isCallable$e;
-  var tryToString = tryToString$1;
+  	// fallback for non-array-like ES3 and non-enumerable old V8 strings
+  	indexedObject = fails(function () {
+  	  // throws an error in rhino, see https://github.com/mozilla/rhino/issues/346
+  	  // eslint-disable-next-line no-prototype-builtins -- safe
+  	  return !$Object('z').propertyIsEnumerable(0);
+  	}) ? function (it) {
+  	  return classof(it) === 'String' ? split(it, '') : $Object(it);
+  	} : $Object;
+  	return indexedObject;
+  }
 
-  var $TypeError$7 = TypeError;
+  var isNullOrUndefined;
+  var hasRequiredIsNullOrUndefined;
 
-  // `Assert: IsCallable(argument) is true`
-  var aCallable$2 = function (argument) {
-    if (isCallable$a(argument)) return argument;
-    throw new $TypeError$7(tryToString(argument) + ' is not a function');
-  };
+  function requireIsNullOrUndefined () {
+  	if (hasRequiredIsNullOrUndefined) return isNullOrUndefined;
+  	hasRequiredIsNullOrUndefined = 1;
+  	// we can't use just `it == null` since of `document.all` special case
+  	// https://tc39.es/ecma262/#sec-IsHTMLDDA-internal-slot-aec
+  	isNullOrUndefined = function (it) {
+  	  return it === null || it === undefined;
+  	};
+  	return isNullOrUndefined;
+  }
 
-  var aCallable$1 = aCallable$2;
-  var isNullOrUndefined$1 = isNullOrUndefined$3;
+  var requireObjectCoercible;
+  var hasRequiredRequireObjectCoercible;
 
-  // `GetMethod` abstract operation
-  // https://tc39.es/ecma262/#sec-getmethod
-  var getMethod$2 = function (V, P) {
-    var func = V[P];
-    return isNullOrUndefined$1(func) ? undefined : aCallable$1(func);
-  };
+  function requireRequireObjectCoercible () {
+  	if (hasRequiredRequireObjectCoercible) return requireObjectCoercible;
+  	hasRequiredRequireObjectCoercible = 1;
+  	var isNullOrUndefined = requireIsNullOrUndefined();
 
-  var call$7 = functionCall;
-  var isCallable$9 = isCallable$e;
-  var isObject$7 = isObject$8;
+  	var $TypeError = TypeError;
 
-  var $TypeError$6 = TypeError;
+  	// `RequireObjectCoercible` abstract operation
+  	// https://tc39.es/ecma262/#sec-requireobjectcoercible
+  	requireObjectCoercible = function (it) {
+  	  if (isNullOrUndefined(it)) throw new $TypeError("Can't call method on " + it);
+  	  return it;
+  	};
+  	return requireObjectCoercible;
+  }
 
-  // `OrdinaryToPrimitive` abstract operation
-  // https://tc39.es/ecma262/#sec-ordinarytoprimitive
-  var ordinaryToPrimitive$1 = function (input, pref) {
-    var fn, val;
-    if (pref === 'string' && isCallable$9(fn = input.toString) && !isObject$7(val = call$7(fn, input))) return val;
-    if (isCallable$9(fn = input.valueOf) && !isObject$7(val = call$7(fn, input))) return val;
-    if (pref !== 'string' && isCallable$9(fn = input.toString) && !isObject$7(val = call$7(fn, input))) return val;
-    throw new $TypeError$6("Can't convert object to primitive value");
-  };
+  var toIndexedObject;
+  var hasRequiredToIndexedObject;
+
+  function requireToIndexedObject () {
+  	if (hasRequiredToIndexedObject) return toIndexedObject;
+  	hasRequiredToIndexedObject = 1;
+  	// toObject with fallback for non-array-like ES3 strings
+  	var IndexedObject = requireIndexedObject();
+  	var requireObjectCoercible = requireRequireObjectCoercible();
+
+  	toIndexedObject = function (it) {
+  	  return IndexedObject(requireObjectCoercible(it));
+  	};
+  	return toIndexedObject;
+  }
+
+  var isCallable;
+  var hasRequiredIsCallable;
+
+  function requireIsCallable () {
+  	if (hasRequiredIsCallable) return isCallable;
+  	hasRequiredIsCallable = 1;
+  	// https://tc39.es/ecma262/#sec-IsHTMLDDA-internal-slot
+  	var documentAll = typeof document == 'object' && document.all;
+
+  	// `IsCallable` abstract operation
+  	// https://tc39.es/ecma262/#sec-iscallable
+  	// eslint-disable-next-line unicorn/no-typeof-undefined -- required for testing
+  	isCallable = typeof documentAll == 'undefined' && documentAll !== undefined ? function (argument) {
+  	  return typeof argument == 'function' || argument === documentAll;
+  	} : function (argument) {
+  	  return typeof argument == 'function';
+  	};
+  	return isCallable;
+  }
+
+  var isObject;
+  var hasRequiredIsObject;
+
+  function requireIsObject () {
+  	if (hasRequiredIsObject) return isObject;
+  	hasRequiredIsObject = 1;
+  	var isCallable = requireIsCallable();
+
+  	isObject = function (it) {
+  	  return typeof it == 'object' ? it !== null : isCallable(it);
+  	};
+  	return isObject;
+  }
+
+  var getBuiltIn;
+  var hasRequiredGetBuiltIn;
+
+  function requireGetBuiltIn () {
+  	if (hasRequiredGetBuiltIn) return getBuiltIn;
+  	hasRequiredGetBuiltIn = 1;
+  	var globalThis = requireGlobalThis();
+  	var isCallable = requireIsCallable();
+
+  	var aFunction = function (argument) {
+  	  return isCallable(argument) ? argument : undefined;
+  	};
+
+  	getBuiltIn = function (namespace, method) {
+  	  return arguments.length < 2 ? aFunction(globalThis[namespace]) : globalThis[namespace] && globalThis[namespace][method];
+  	};
+  	return getBuiltIn;
+  }
+
+  var objectIsPrototypeOf;
+  var hasRequiredObjectIsPrototypeOf;
+
+  function requireObjectIsPrototypeOf () {
+  	if (hasRequiredObjectIsPrototypeOf) return objectIsPrototypeOf;
+  	hasRequiredObjectIsPrototypeOf = 1;
+  	var uncurryThis = requireFunctionUncurryThis();
+
+  	objectIsPrototypeOf = uncurryThis({}.isPrototypeOf);
+  	return objectIsPrototypeOf;
+  }
+
+  var environmentUserAgent;
+  var hasRequiredEnvironmentUserAgent;
+
+  function requireEnvironmentUserAgent () {
+  	if (hasRequiredEnvironmentUserAgent) return environmentUserAgent;
+  	hasRequiredEnvironmentUserAgent = 1;
+  	var globalThis = requireGlobalThis();
+
+  	var navigator = globalThis.navigator;
+  	var userAgent = navigator && navigator.userAgent;
+
+  	environmentUserAgent = userAgent ? String(userAgent) : '';
+  	return environmentUserAgent;
+  }
+
+  var environmentV8Version;
+  var hasRequiredEnvironmentV8Version;
+
+  function requireEnvironmentV8Version () {
+  	if (hasRequiredEnvironmentV8Version) return environmentV8Version;
+  	hasRequiredEnvironmentV8Version = 1;
+  	var globalThis = requireGlobalThis();
+  	var userAgent = requireEnvironmentUserAgent();
+
+  	var process = globalThis.process;
+  	var Deno = globalThis.Deno;
+  	var versions = process && process.versions || Deno && Deno.version;
+  	var v8 = versions && versions.v8;
+  	var match, version;
+
+  	if (v8) {
+  	  match = v8.split('.');
+  	  // in old Chrome, versions of V8 isn't V8 = Chrome / 10
+  	  // but their correct versions are not interesting for us
+  	  version = match[0] > 0 && match[0] < 4 ? 1 : +(match[0] + match[1]);
+  	}
+
+  	// BrowserFS NodeJS `process` polyfill incorrectly set `.v8` to `0.0`
+  	// so check `userAgent` even if `.v8` exists, but 0
+  	if (!version && userAgent) {
+  	  match = userAgent.match(/Edge\/(\d+)/);
+  	  if (!match || match[1] >= 74) {
+  	    match = userAgent.match(/Chrome\/(\d+)/);
+  	    if (match) version = +match[1];
+  	  }
+  	}
+
+  	environmentV8Version = version;
+  	return environmentV8Version;
+  }
+
+  var symbolConstructorDetection;
+  var hasRequiredSymbolConstructorDetection;
+
+  function requireSymbolConstructorDetection () {
+  	if (hasRequiredSymbolConstructorDetection) return symbolConstructorDetection;
+  	hasRequiredSymbolConstructorDetection = 1;
+  	/* eslint-disable es/no-symbol -- required for testing */
+  	var V8_VERSION = requireEnvironmentV8Version();
+  	var fails = requireFails();
+  	var globalThis = requireGlobalThis();
+
+  	var $String = globalThis.String;
+
+  	// eslint-disable-next-line es/no-object-getownpropertysymbols -- required for testing
+  	symbolConstructorDetection = !!Object.getOwnPropertySymbols && !fails(function () {
+  	  var symbol = Symbol('symbol detection');
+  	  // Chrome 38 Symbol has incorrect toString conversion
+  	  // `get-own-property-symbols` polyfill symbols converted to object are not Symbol instances
+  	  // nb: Do not call `String` directly to avoid this being optimized out to `symbol+''` which will,
+  	  // of course, fail.
+  	  return !$String(symbol) || !(Object(symbol) instanceof Symbol) ||
+  	    // Chrome 38-40 symbols are not inherited from DOM collections prototypes to instances
+  	    !Symbol.sham && V8_VERSION && V8_VERSION < 41;
+  	});
+  	return symbolConstructorDetection;
+  }
+
+  var useSymbolAsUid;
+  var hasRequiredUseSymbolAsUid;
+
+  function requireUseSymbolAsUid () {
+  	if (hasRequiredUseSymbolAsUid) return useSymbolAsUid;
+  	hasRequiredUseSymbolAsUid = 1;
+  	/* eslint-disable es/no-symbol -- required for testing */
+  	var NATIVE_SYMBOL = requireSymbolConstructorDetection();
+
+  	useSymbolAsUid = NATIVE_SYMBOL &&
+  	  !Symbol.sham &&
+  	  typeof Symbol.iterator == 'symbol';
+  	return useSymbolAsUid;
+  }
+
+  var isSymbol;
+  var hasRequiredIsSymbol;
+
+  function requireIsSymbol () {
+  	if (hasRequiredIsSymbol) return isSymbol;
+  	hasRequiredIsSymbol = 1;
+  	var getBuiltIn = requireGetBuiltIn();
+  	var isCallable = requireIsCallable();
+  	var isPrototypeOf = requireObjectIsPrototypeOf();
+  	var USE_SYMBOL_AS_UID = requireUseSymbolAsUid();
+
+  	var $Object = Object;
+
+  	isSymbol = USE_SYMBOL_AS_UID ? function (it) {
+  	  return typeof it == 'symbol';
+  	} : function (it) {
+  	  var $Symbol = getBuiltIn('Symbol');
+  	  return isCallable($Symbol) && isPrototypeOf($Symbol.prototype, $Object(it));
+  	};
+  	return isSymbol;
+  }
+
+  var tryToString;
+  var hasRequiredTryToString;
+
+  function requireTryToString () {
+  	if (hasRequiredTryToString) return tryToString;
+  	hasRequiredTryToString = 1;
+  	var $String = String;
+
+  	tryToString = function (argument) {
+  	  try {
+  	    return $String(argument);
+  	  } catch (error) {
+  	    return 'Object';
+  	  }
+  	};
+  	return tryToString;
+  }
+
+  var aCallable;
+  var hasRequiredACallable;
+
+  function requireACallable () {
+  	if (hasRequiredACallable) return aCallable;
+  	hasRequiredACallable = 1;
+  	var isCallable = requireIsCallable();
+  	var tryToString = requireTryToString();
+
+  	var $TypeError = TypeError;
+
+  	// `Assert: IsCallable(argument) is true`
+  	aCallable = function (argument) {
+  	  if (isCallable(argument)) return argument;
+  	  throw new $TypeError(tryToString(argument) + ' is not a function');
+  	};
+  	return aCallable;
+  }
+
+  var getMethod;
+  var hasRequiredGetMethod;
+
+  function requireGetMethod () {
+  	if (hasRequiredGetMethod) return getMethod;
+  	hasRequiredGetMethod = 1;
+  	var aCallable = requireACallable();
+  	var isNullOrUndefined = requireIsNullOrUndefined();
+
+  	// `GetMethod` abstract operation
+  	// https://tc39.es/ecma262/#sec-getmethod
+  	getMethod = function (V, P) {
+  	  var func = V[P];
+  	  return isNullOrUndefined(func) ? undefined : aCallable(func);
+  	};
+  	return getMethod;
+  }
+
+  var ordinaryToPrimitive;
+  var hasRequiredOrdinaryToPrimitive;
+
+  function requireOrdinaryToPrimitive () {
+  	if (hasRequiredOrdinaryToPrimitive) return ordinaryToPrimitive;
+  	hasRequiredOrdinaryToPrimitive = 1;
+  	var call = requireFunctionCall();
+  	var isCallable = requireIsCallable();
+  	var isObject = requireIsObject();
+
+  	var $TypeError = TypeError;
+
+  	// `OrdinaryToPrimitive` abstract operation
+  	// https://tc39.es/ecma262/#sec-ordinarytoprimitive
+  	ordinaryToPrimitive = function (input, pref) {
+  	  var fn, val;
+  	  if (pref === 'string' && isCallable(fn = input.toString) && !isObject(val = call(fn, input))) return val;
+  	  if (isCallable(fn = input.valueOf) && !isObject(val = call(fn, input))) return val;
+  	  if (pref !== 'string' && isCallable(fn = input.toString) && !isObject(val = call(fn, input))) return val;
+  	  throw new $TypeError("Can't convert object to primitive value");
+  	};
+  	return ordinaryToPrimitive;
+  }
 
   var sharedStore = {exports: {}};
 
-  var global$9 = global$d;
+  var isPure;
+  var hasRequiredIsPure;
 
-  // eslint-disable-next-line es/no-object-defineproperty -- safe
-  var defineProperty$3 = Object.defineProperty;
+  function requireIsPure () {
+  	if (hasRequiredIsPure) return isPure;
+  	hasRequiredIsPure = 1;
+  	isPure = false;
+  	return isPure;
+  }
 
-  var defineGlobalProperty$3 = function (key, value) {
-    try {
-      defineProperty$3(global$9, key, { value: value, configurable: true, writable: true });
-    } catch (error) {
-      global$9[key] = value;
-    } return value;
-  };
+  var defineGlobalProperty;
+  var hasRequiredDefineGlobalProperty;
 
-  var globalThis$1 = global$d;
-  var defineGlobalProperty$2 = defineGlobalProperty$3;
+  function requireDefineGlobalProperty () {
+  	if (hasRequiredDefineGlobalProperty) return defineGlobalProperty;
+  	hasRequiredDefineGlobalProperty = 1;
+  	var globalThis = requireGlobalThis();
 
-  var SHARED = '__core-js_shared__';
-  var store$3 = sharedStore.exports = globalThis$1[SHARED] || defineGlobalProperty$2(SHARED, {});
+  	// eslint-disable-next-line es/no-object-defineproperty -- safe
+  	var defineProperty = Object.defineProperty;
 
-  (store$3.versions || (store$3.versions = [])).push({
-    version: '3.36.1',
-    mode: 'global',
-    copyright: '© 2014-2024 Denis Pushkarev (zloirock.ru)',
-    license: 'https://github.com/zloirock/core-js/blob/v3.36.1/LICENSE',
-    source: 'https://github.com/zloirock/core-js'
-  });
+  	defineGlobalProperty = function (key, value) {
+  	  try {
+  	    defineProperty(globalThis, key, { value: value, configurable: true, writable: true });
+  	  } catch (error) {
+  	    globalThis[key] = value;
+  	  } return value;
+  	};
+  	return defineGlobalProperty;
+  }
 
-  var sharedStoreExports = sharedStore.exports;
+  var hasRequiredSharedStore;
 
-  var store$2 = sharedStoreExports;
+  function requireSharedStore () {
+  	if (hasRequiredSharedStore) return sharedStore.exports;
+  	hasRequiredSharedStore = 1;
+  	var IS_PURE = requireIsPure();
+  	var globalThis = requireGlobalThis();
+  	var defineGlobalProperty = requireDefineGlobalProperty();
 
-  var shared$4 = function (key, value) {
-    return store$2[key] || (store$2[key] = value || {});
-  };
+  	var SHARED = '__core-js_shared__';
+  	var store = sharedStore.exports = globalThis[SHARED] || defineGlobalProperty(SHARED, {});
 
-  var requireObjectCoercible$3 = requireObjectCoercible$5;
+  	(store.versions || (store.versions = [])).push({
+  	  version: '3.39.0',
+  	  mode: IS_PURE ? 'pure' : 'global',
+  	  copyright: '© 2014-2024 Denis Pushkarev (zloirock.ru)',
+  	  license: 'https://github.com/zloirock/core-js/blob/v3.39.0/LICENSE',
+  	  source: 'https://github.com/zloirock/core-js'
+  	});
+  	return sharedStore.exports;
+  }
 
-  var $Object$2 = Object;
+  var shared;
+  var hasRequiredShared;
 
-  // `ToObject` abstract operation
-  // https://tc39.es/ecma262/#sec-toobject
-  var toObject$5 = function (argument) {
-    return $Object$2(requireObjectCoercible$3(argument));
-  };
+  function requireShared () {
+  	if (hasRequiredShared) return shared;
+  	hasRequiredShared = 1;
+  	var store = requireSharedStore();
 
-  var uncurryThis$g = functionUncurryThis;
-  var toObject$4 = toObject$5;
+  	shared = function (key, value) {
+  	  return store[key] || (store[key] = value || {});
+  	};
+  	return shared;
+  }
 
-  var hasOwnProperty = uncurryThis$g({}.hasOwnProperty);
+  var toObject;
+  var hasRequiredToObject;
 
-  // `HasOwnProperty` abstract operation
-  // https://tc39.es/ecma262/#sec-hasownproperty
-  // eslint-disable-next-line es/no-object-hasown -- safe
-  var hasOwnProperty_1 = Object.hasOwn || function hasOwn(it, key) {
-    return hasOwnProperty(toObject$4(it), key);
-  };
+  function requireToObject () {
+  	if (hasRequiredToObject) return toObject;
+  	hasRequiredToObject = 1;
+  	var requireObjectCoercible = requireRequireObjectCoercible();
 
-  var uncurryThis$f = functionUncurryThis;
+  	var $Object = Object;
 
-  var id = 0;
-  var postfix = Math.random();
-  var toString$6 = uncurryThis$f(1.0.toString);
+  	// `ToObject` abstract operation
+  	// https://tc39.es/ecma262/#sec-toobject
+  	toObject = function (argument) {
+  	  return $Object(requireObjectCoercible(argument));
+  	};
+  	return toObject;
+  }
 
-  var uid$2 = function (key) {
-    return 'Symbol(' + (key === undefined ? '' : key) + ')_' + toString$6(++id + postfix, 36);
-  };
+  var hasOwnProperty_1;
+  var hasRequiredHasOwnProperty;
 
-  var global$8 = global$d;
-  var shared$3 = shared$4;
-  var hasOwn$7 = hasOwnProperty_1;
-  var uid$1 = uid$2;
-  var NATIVE_SYMBOL = symbolConstructorDetection;
-  var USE_SYMBOL_AS_UID = useSymbolAsUid;
+  function requireHasOwnProperty () {
+  	if (hasRequiredHasOwnProperty) return hasOwnProperty_1;
+  	hasRequiredHasOwnProperty = 1;
+  	var uncurryThis = requireFunctionUncurryThis();
+  	var toObject = requireToObject();
 
-  var Symbol$1 = global$8.Symbol;
-  var WellKnownSymbolsStore = shared$3('wks');
-  var createWellKnownSymbol = USE_SYMBOL_AS_UID ? Symbol$1['for'] || Symbol$1 : Symbol$1 && Symbol$1.withoutSetter || uid$1;
+  	var hasOwnProperty = uncurryThis({}.hasOwnProperty);
 
-  var wellKnownSymbol$a = function (name) {
-    if (!hasOwn$7(WellKnownSymbolsStore, name)) {
-      WellKnownSymbolsStore[name] = NATIVE_SYMBOL && hasOwn$7(Symbol$1, name)
-        ? Symbol$1[name]
-        : createWellKnownSymbol('Symbol.' + name);
-    } return WellKnownSymbolsStore[name];
-  };
+  	// `HasOwnProperty` abstract operation
+  	// https://tc39.es/ecma262/#sec-hasownproperty
+  	// eslint-disable-next-line es/no-object-hasown -- safe
+  	hasOwnProperty_1 = Object.hasOwn || function hasOwn(it, key) {
+  	  return hasOwnProperty(toObject(it), key);
+  	};
+  	return hasOwnProperty_1;
+  }
 
-  var call$6 = functionCall;
-  var isObject$6 = isObject$8;
-  var isSymbol$1 = isSymbol$2;
-  var getMethod$1 = getMethod$2;
-  var ordinaryToPrimitive = ordinaryToPrimitive$1;
-  var wellKnownSymbol$9 = wellKnownSymbol$a;
+  var uid;
+  var hasRequiredUid;
 
-  var $TypeError$5 = TypeError;
-  var TO_PRIMITIVE = wellKnownSymbol$9('toPrimitive');
+  function requireUid () {
+  	if (hasRequiredUid) return uid;
+  	hasRequiredUid = 1;
+  	var uncurryThis = requireFunctionUncurryThis();
 
-  // `ToPrimitive` abstract operation
-  // https://tc39.es/ecma262/#sec-toprimitive
-  var toPrimitive$1 = function (input, pref) {
-    if (!isObject$6(input) || isSymbol$1(input)) return input;
-    var exoticToPrim = getMethod$1(input, TO_PRIMITIVE);
-    var result;
-    if (exoticToPrim) {
-      if (pref === undefined) pref = 'default';
-      result = call$6(exoticToPrim, input, pref);
-      if (!isObject$6(result) || isSymbol$1(result)) return result;
-      throw new $TypeError$5("Can't convert object to primitive value");
-    }
-    if (pref === undefined) pref = 'number';
-    return ordinaryToPrimitive(input, pref);
-  };
+  	var id = 0;
+  	var postfix = Math.random();
+  	var toString = uncurryThis(1.0.toString);
 
-  var toPrimitive = toPrimitive$1;
-  var isSymbol = isSymbol$2;
+  	uid = function (key) {
+  	  return 'Symbol(' + (key === undefined ? '' : key) + ')_' + toString(++id + postfix, 36);
+  	};
+  	return uid;
+  }
 
-  // `ToPropertyKey` abstract operation
-  // https://tc39.es/ecma262/#sec-topropertykey
-  var toPropertyKey$2 = function (argument) {
-    var key = toPrimitive(argument, 'string');
-    return isSymbol(key) ? key : key + '';
-  };
+  var wellKnownSymbol;
+  var hasRequiredWellKnownSymbol;
 
-  var global$7 = global$d;
-  var isObject$5 = isObject$8;
+  function requireWellKnownSymbol () {
+  	if (hasRequiredWellKnownSymbol) return wellKnownSymbol;
+  	hasRequiredWellKnownSymbol = 1;
+  	var globalThis = requireGlobalThis();
+  	var shared = requireShared();
+  	var hasOwn = requireHasOwnProperty();
+  	var uid = requireUid();
+  	var NATIVE_SYMBOL = requireSymbolConstructorDetection();
+  	var USE_SYMBOL_AS_UID = requireUseSymbolAsUid();
 
-  var document$1 = global$7.document;
-  // typeof document.createElement is 'object' in old IE
-  var EXISTS$1 = isObject$5(document$1) && isObject$5(document$1.createElement);
+  	var Symbol = globalThis.Symbol;
+  	var WellKnownSymbolsStore = shared('wks');
+  	var createWellKnownSymbol = USE_SYMBOL_AS_UID ? Symbol['for'] || Symbol : Symbol && Symbol.withoutSetter || uid;
 
-  var documentCreateElement$1 = function (it) {
-    return EXISTS$1 ? document$1.createElement(it) : {};
-  };
+  	wellKnownSymbol = function (name) {
+  	  if (!hasOwn(WellKnownSymbolsStore, name)) {
+  	    WellKnownSymbolsStore[name] = NATIVE_SYMBOL && hasOwn(Symbol, name)
+  	      ? Symbol[name]
+  	      : createWellKnownSymbol('Symbol.' + name);
+  	  } return WellKnownSymbolsStore[name];
+  	};
+  	return wellKnownSymbol;
+  }
 
-  var DESCRIPTORS$a = descriptors;
-  var fails$g = fails$l;
-  var createElement = documentCreateElement$1;
+  var toPrimitive;
+  var hasRequiredToPrimitive;
 
-  // Thanks to IE8 for its funny defineProperty
-  var ie8DomDefine = !DESCRIPTORS$a && !fails$g(function () {
-    // eslint-disable-next-line es/no-object-defineproperty -- required for testing
-    return Object.defineProperty(createElement('div'), 'a', {
-      get: function () { return 7; }
-    }).a !== 7;
-  });
+  function requireToPrimitive () {
+  	if (hasRequiredToPrimitive) return toPrimitive;
+  	hasRequiredToPrimitive = 1;
+  	var call = requireFunctionCall();
+  	var isObject = requireIsObject();
+  	var isSymbol = requireIsSymbol();
+  	var getMethod = requireGetMethod();
+  	var ordinaryToPrimitive = requireOrdinaryToPrimitive();
+  	var wellKnownSymbol = requireWellKnownSymbol();
 
-  var DESCRIPTORS$9 = descriptors;
-  var call$5 = functionCall;
-  var propertyIsEnumerableModule$1 = objectPropertyIsEnumerable;
-  var createPropertyDescriptor$2 = createPropertyDescriptor$3;
-  var toIndexedObject$5 = toIndexedObject$6;
-  var toPropertyKey$1 = toPropertyKey$2;
-  var hasOwn$6 = hasOwnProperty_1;
-  var IE8_DOM_DEFINE$1 = ie8DomDefine;
+  	var $TypeError = TypeError;
+  	var TO_PRIMITIVE = wellKnownSymbol('toPrimitive');
 
-  // eslint-disable-next-line es/no-object-getownpropertydescriptor -- safe
-  var $getOwnPropertyDescriptor$1 = Object.getOwnPropertyDescriptor;
+  	// `ToPrimitive` abstract operation
+  	// https://tc39.es/ecma262/#sec-toprimitive
+  	toPrimitive = function (input, pref) {
+  	  if (!isObject(input) || isSymbol(input)) return input;
+  	  var exoticToPrim = getMethod(input, TO_PRIMITIVE);
+  	  var result;
+  	  if (exoticToPrim) {
+  	    if (pref === undefined) pref = 'default';
+  	    result = call(exoticToPrim, input, pref);
+  	    if (!isObject(result) || isSymbol(result)) return result;
+  	    throw new $TypeError("Can't convert object to primitive value");
+  	  }
+  	  if (pref === undefined) pref = 'number';
+  	  return ordinaryToPrimitive(input, pref);
+  	};
+  	return toPrimitive;
+  }
 
-  // `Object.getOwnPropertyDescriptor` method
-  // https://tc39.es/ecma262/#sec-object.getownpropertydescriptor
-  objectGetOwnPropertyDescriptor.f = DESCRIPTORS$9 ? $getOwnPropertyDescriptor$1 : function getOwnPropertyDescriptor(O, P) {
-    O = toIndexedObject$5(O);
-    P = toPropertyKey$1(P);
-    if (IE8_DOM_DEFINE$1) try {
-      return $getOwnPropertyDescriptor$1(O, P);
-    } catch (error) { /* empty */ }
-    if (hasOwn$6(O, P)) return createPropertyDescriptor$2(!call$5(propertyIsEnumerableModule$1.f, O, P), O[P]);
-  };
+  var toPropertyKey;
+  var hasRequiredToPropertyKey;
+
+  function requireToPropertyKey () {
+  	if (hasRequiredToPropertyKey) return toPropertyKey;
+  	hasRequiredToPropertyKey = 1;
+  	var toPrimitive = requireToPrimitive();
+  	var isSymbol = requireIsSymbol();
+
+  	// `ToPropertyKey` abstract operation
+  	// https://tc39.es/ecma262/#sec-topropertykey
+  	toPropertyKey = function (argument) {
+  	  var key = toPrimitive(argument, 'string');
+  	  return isSymbol(key) ? key : key + '';
+  	};
+  	return toPropertyKey;
+  }
+
+  var documentCreateElement;
+  var hasRequiredDocumentCreateElement;
+
+  function requireDocumentCreateElement () {
+  	if (hasRequiredDocumentCreateElement) return documentCreateElement;
+  	hasRequiredDocumentCreateElement = 1;
+  	var globalThis = requireGlobalThis();
+  	var isObject = requireIsObject();
+
+  	var document = globalThis.document;
+  	// typeof document.createElement is 'object' in old IE
+  	var EXISTS = isObject(document) && isObject(document.createElement);
+
+  	documentCreateElement = function (it) {
+  	  return EXISTS ? document.createElement(it) : {};
+  	};
+  	return documentCreateElement;
+  }
+
+  var ie8DomDefine;
+  var hasRequiredIe8DomDefine;
+
+  function requireIe8DomDefine () {
+  	if (hasRequiredIe8DomDefine) return ie8DomDefine;
+  	hasRequiredIe8DomDefine = 1;
+  	var DESCRIPTORS = requireDescriptors();
+  	var fails = requireFails();
+  	var createElement = requireDocumentCreateElement();
+
+  	// Thanks to IE8 for its funny defineProperty
+  	ie8DomDefine = !DESCRIPTORS && !fails(function () {
+  	  // eslint-disable-next-line es/no-object-defineproperty -- required for testing
+  	  return Object.defineProperty(createElement('div'), 'a', {
+  	    get: function () { return 7; }
+  	  }).a !== 7;
+  	});
+  	return ie8DomDefine;
+  }
+
+  var hasRequiredObjectGetOwnPropertyDescriptor;
+
+  function requireObjectGetOwnPropertyDescriptor () {
+  	if (hasRequiredObjectGetOwnPropertyDescriptor) return objectGetOwnPropertyDescriptor;
+  	hasRequiredObjectGetOwnPropertyDescriptor = 1;
+  	var DESCRIPTORS = requireDescriptors();
+  	var call = requireFunctionCall();
+  	var propertyIsEnumerableModule = requireObjectPropertyIsEnumerable();
+  	var createPropertyDescriptor = requireCreatePropertyDescriptor();
+  	var toIndexedObject = requireToIndexedObject();
+  	var toPropertyKey = requireToPropertyKey();
+  	var hasOwn = requireHasOwnProperty();
+  	var IE8_DOM_DEFINE = requireIe8DomDefine();
+
+  	// eslint-disable-next-line es/no-object-getownpropertydescriptor -- safe
+  	var $getOwnPropertyDescriptor = Object.getOwnPropertyDescriptor;
+
+  	// `Object.getOwnPropertyDescriptor` method
+  	// https://tc39.es/ecma262/#sec-object.getownpropertydescriptor
+  	objectGetOwnPropertyDescriptor.f = DESCRIPTORS ? $getOwnPropertyDescriptor : function getOwnPropertyDescriptor(O, P) {
+  	  O = toIndexedObject(O);
+  	  P = toPropertyKey(P);
+  	  if (IE8_DOM_DEFINE) try {
+  	    return $getOwnPropertyDescriptor(O, P);
+  	  } catch (error) { /* empty */ }
+  	  if (hasOwn(O, P)) return createPropertyDescriptor(!call(propertyIsEnumerableModule.f, O, P), O[P]);
+  	};
+  	return objectGetOwnPropertyDescriptor;
+  }
 
   var objectDefineProperty = {};
 
-  var DESCRIPTORS$8 = descriptors;
-  var fails$f = fails$l;
+  var v8PrototypeDefineBug;
+  var hasRequiredV8PrototypeDefineBug;
 
-  // V8 ~ Chrome 36-
-  // https://bugs.chromium.org/p/v8/issues/detail?id=3334
-  var v8PrototypeDefineBug = DESCRIPTORS$8 && fails$f(function () {
-    // eslint-disable-next-line es/no-object-defineproperty -- required for testing
-    return Object.defineProperty(function () { /* empty */ }, 'prototype', {
-      value: 42,
-      writable: false
-    }).prototype !== 42;
-  });
+  function requireV8PrototypeDefineBug () {
+  	if (hasRequiredV8PrototypeDefineBug) return v8PrototypeDefineBug;
+  	hasRequiredV8PrototypeDefineBug = 1;
+  	var DESCRIPTORS = requireDescriptors();
+  	var fails = requireFails();
 
-  var isObject$4 = isObject$8;
-
-  var $String$2 = String;
-  var $TypeError$4 = TypeError;
-
-  // `Assert: Type(argument) is Object`
-  var anObject$7 = function (argument) {
-    if (isObject$4(argument)) return argument;
-    throw new $TypeError$4($String$2(argument) + ' is not an object');
-  };
-
-  var DESCRIPTORS$7 = descriptors;
-  var IE8_DOM_DEFINE = ie8DomDefine;
-  var V8_PROTOTYPE_DEFINE_BUG$1 = v8PrototypeDefineBug;
-  var anObject$6 = anObject$7;
-  var toPropertyKey = toPropertyKey$2;
-
-  var $TypeError$3 = TypeError;
-  // eslint-disable-next-line es/no-object-defineproperty -- safe
-  var $defineProperty = Object.defineProperty;
-  // eslint-disable-next-line es/no-object-getownpropertydescriptor -- safe
-  var $getOwnPropertyDescriptor = Object.getOwnPropertyDescriptor;
-  var ENUMERABLE = 'enumerable';
-  var CONFIGURABLE$1 = 'configurable';
-  var WRITABLE = 'writable';
-
-  // `Object.defineProperty` method
-  // https://tc39.es/ecma262/#sec-object.defineproperty
-  objectDefineProperty.f = DESCRIPTORS$7 ? V8_PROTOTYPE_DEFINE_BUG$1 ? function defineProperty(O, P, Attributes) {
-    anObject$6(O);
-    P = toPropertyKey(P);
-    anObject$6(Attributes);
-    if (typeof O === 'function' && P === 'prototype' && 'value' in Attributes && WRITABLE in Attributes && !Attributes[WRITABLE]) {
-      var current = $getOwnPropertyDescriptor(O, P);
-      if (current && current[WRITABLE]) {
-        O[P] = Attributes.value;
-        Attributes = {
-          configurable: CONFIGURABLE$1 in Attributes ? Attributes[CONFIGURABLE$1] : current[CONFIGURABLE$1],
-          enumerable: ENUMERABLE in Attributes ? Attributes[ENUMERABLE] : current[ENUMERABLE],
-          writable: false
-        };
-      }
-    } return $defineProperty(O, P, Attributes);
-  } : $defineProperty : function defineProperty(O, P, Attributes) {
-    anObject$6(O);
-    P = toPropertyKey(P);
-    anObject$6(Attributes);
-    if (IE8_DOM_DEFINE) try {
-      return $defineProperty(O, P, Attributes);
-    } catch (error) { /* empty */ }
-    if ('get' in Attributes || 'set' in Attributes) throw new $TypeError$3('Accessors not supported');
-    if ('value' in Attributes) O[P] = Attributes.value;
-    return O;
-  };
-
-  var DESCRIPTORS$6 = descriptors;
-  var definePropertyModule$4 = objectDefineProperty;
-  var createPropertyDescriptor$1 = createPropertyDescriptor$3;
-
-  var createNonEnumerableProperty$3 = DESCRIPTORS$6 ? function (object, key, value) {
-    return definePropertyModule$4.f(object, key, createPropertyDescriptor$1(1, value));
-  } : function (object, key, value) {
-    object[key] = value;
-    return object;
-  };
-
-  var makeBuiltIn$2 = {exports: {}};
-
-  var DESCRIPTORS$5 = descriptors;
-  var hasOwn$5 = hasOwnProperty_1;
-
-  var FunctionPrototype = Function.prototype;
-  // eslint-disable-next-line es/no-object-getownpropertydescriptor -- safe
-  var getDescriptor = DESCRIPTORS$5 && Object.getOwnPropertyDescriptor;
-
-  var EXISTS = hasOwn$5(FunctionPrototype, 'name');
-  // additional protection from minified / mangled / dropped function names
-  var PROPER = EXISTS && (function something() { /* empty */ }).name === 'something';
-  var CONFIGURABLE = EXISTS && (!DESCRIPTORS$5 || (DESCRIPTORS$5 && getDescriptor(FunctionPrototype, 'name').configurable));
-
-  var functionName = {
-    EXISTS: EXISTS,
-    PROPER: PROPER,
-    CONFIGURABLE: CONFIGURABLE
-  };
-
-  var uncurryThis$e = functionUncurryThis;
-  var isCallable$8 = isCallable$e;
-  var store$1 = sharedStoreExports;
-
-  var functionToString = uncurryThis$e(Function.toString);
-
-  // this helper broken in `core-js@3.4.1-3.4.4`, so we can't use `shared` helper
-  if (!isCallable$8(store$1.inspectSource)) {
-    store$1.inspectSource = function (it) {
-      return functionToString(it);
-    };
+  	// V8 ~ Chrome 36-
+  	// https://bugs.chromium.org/p/v8/issues/detail?id=3334
+  	v8PrototypeDefineBug = DESCRIPTORS && fails(function () {
+  	  // eslint-disable-next-line es/no-object-defineproperty -- required for testing
+  	  return Object.defineProperty(function () { /* empty */ }, 'prototype', {
+  	    value: 42,
+  	    writable: false
+  	  }).prototype !== 42;
+  	});
+  	return v8PrototypeDefineBug;
   }
 
-  var inspectSource$2 = store$1.inspectSource;
+  var anObject;
+  var hasRequiredAnObject;
 
-  var global$6 = global$d;
-  var isCallable$7 = isCallable$e;
+  function requireAnObject () {
+  	if (hasRequiredAnObject) return anObject;
+  	hasRequiredAnObject = 1;
+  	var isObject = requireIsObject();
 
-  var WeakMap$1 = global$6.WeakMap;
+  	var $String = String;
+  	var $TypeError = TypeError;
 
-  var weakMapBasicDetection = isCallable$7(WeakMap$1) && /native code/.test(String(WeakMap$1));
-
-  var shared$2 = shared$4;
-  var uid = uid$2;
-
-  var keys = shared$2('keys');
-
-  var sharedKey$3 = function (key) {
-    return keys[key] || (keys[key] = uid(key));
-  };
-
-  var hiddenKeys$4 = {};
-
-  var NATIVE_WEAK_MAP = weakMapBasicDetection;
-  var global$5 = global$d;
-  var isObject$3 = isObject$8;
-  var createNonEnumerableProperty$2 = createNonEnumerableProperty$3;
-  var hasOwn$4 = hasOwnProperty_1;
-  var shared$1 = sharedStoreExports;
-  var sharedKey$2 = sharedKey$3;
-  var hiddenKeys$3 = hiddenKeys$4;
-
-  var OBJECT_ALREADY_INITIALIZED = 'Object already initialized';
-  var TypeError$1 = global$5.TypeError;
-  var WeakMap = global$5.WeakMap;
-  var set, get, has;
-
-  var enforce = function (it) {
-    return has(it) ? get(it) : set(it, {});
-  };
-
-  var getterFor = function (TYPE) {
-    return function (it) {
-      var state;
-      if (!isObject$3(it) || (state = get(it)).type !== TYPE) {
-        throw new TypeError$1('Incompatible receiver, ' + TYPE + ' required');
-      } return state;
-    };
-  };
-
-  if (NATIVE_WEAK_MAP || shared$1.state) {
-    var store = shared$1.state || (shared$1.state = new WeakMap());
-    /* eslint-disable no-self-assign -- prototype methods protection */
-    store.get = store.get;
-    store.has = store.has;
-    store.set = store.set;
-    /* eslint-enable no-self-assign -- prototype methods protection */
-    set = function (it, metadata) {
-      if (store.has(it)) throw new TypeError$1(OBJECT_ALREADY_INITIALIZED);
-      metadata.facade = it;
-      store.set(it, metadata);
-      return metadata;
-    };
-    get = function (it) {
-      return store.get(it) || {};
-    };
-    has = function (it) {
-      return store.has(it);
-    };
-  } else {
-    var STATE = sharedKey$2('state');
-    hiddenKeys$3[STATE] = true;
-    set = function (it, metadata) {
-      if (hasOwn$4(it, STATE)) throw new TypeError$1(OBJECT_ALREADY_INITIALIZED);
-      metadata.facade = it;
-      createNonEnumerableProperty$2(it, STATE, metadata);
-      return metadata;
-    };
-    get = function (it) {
-      return hasOwn$4(it, STATE) ? it[STATE] : {};
-    };
-    has = function (it) {
-      return hasOwn$4(it, STATE);
-    };
+  	// `Assert: Type(argument) is Object`
+  	anObject = function (argument) {
+  	  if (isObject(argument)) return argument;
+  	  throw new $TypeError($String(argument) + ' is not an object');
+  	};
+  	return anObject;
   }
 
-  var internalState = {
-    set: set,
-    get: get,
-    has: has,
-    enforce: enforce,
-    getterFor: getterFor
-  };
+  var hasRequiredObjectDefineProperty;
 
-  var uncurryThis$d = functionUncurryThis;
-  var fails$e = fails$l;
-  var isCallable$6 = isCallable$e;
-  var hasOwn$3 = hasOwnProperty_1;
-  var DESCRIPTORS$4 = descriptors;
-  var CONFIGURABLE_FUNCTION_NAME = functionName.CONFIGURABLE;
-  var inspectSource$1 = inspectSource$2;
-  var InternalStateModule = internalState;
+  function requireObjectDefineProperty () {
+  	if (hasRequiredObjectDefineProperty) return objectDefineProperty;
+  	hasRequiredObjectDefineProperty = 1;
+  	var DESCRIPTORS = requireDescriptors();
+  	var IE8_DOM_DEFINE = requireIe8DomDefine();
+  	var V8_PROTOTYPE_DEFINE_BUG = requireV8PrototypeDefineBug();
+  	var anObject = requireAnObject();
+  	var toPropertyKey = requireToPropertyKey();
 
-  var enforceInternalState = InternalStateModule.enforce;
-  var getInternalState$1 = InternalStateModule.get;
-  var $String$1 = String;
-  // eslint-disable-next-line es/no-object-defineproperty -- safe
-  var defineProperty$2 = Object.defineProperty;
-  var stringSlice$1 = uncurryThis$d(''.slice);
-  var replace$2 = uncurryThis$d(''.replace);
-  var join = uncurryThis$d([].join);
+  	var $TypeError = TypeError;
+  	// eslint-disable-next-line es/no-object-defineproperty -- safe
+  	var $defineProperty = Object.defineProperty;
+  	// eslint-disable-next-line es/no-object-getownpropertydescriptor -- safe
+  	var $getOwnPropertyDescriptor = Object.getOwnPropertyDescriptor;
+  	var ENUMERABLE = 'enumerable';
+  	var CONFIGURABLE = 'configurable';
+  	var WRITABLE = 'writable';
 
-  var CONFIGURABLE_LENGTH = DESCRIPTORS$4 && !fails$e(function () {
-    return defineProperty$2(function () { /* empty */ }, 'length', { value: 8 }).length !== 8;
-  });
+  	// `Object.defineProperty` method
+  	// https://tc39.es/ecma262/#sec-object.defineproperty
+  	objectDefineProperty.f = DESCRIPTORS ? V8_PROTOTYPE_DEFINE_BUG ? function defineProperty(O, P, Attributes) {
+  	  anObject(O);
+  	  P = toPropertyKey(P);
+  	  anObject(Attributes);
+  	  if (typeof O === 'function' && P === 'prototype' && 'value' in Attributes && WRITABLE in Attributes && !Attributes[WRITABLE]) {
+  	    var current = $getOwnPropertyDescriptor(O, P);
+  	    if (current && current[WRITABLE]) {
+  	      O[P] = Attributes.value;
+  	      Attributes = {
+  	        configurable: CONFIGURABLE in Attributes ? Attributes[CONFIGURABLE] : current[CONFIGURABLE],
+  	        enumerable: ENUMERABLE in Attributes ? Attributes[ENUMERABLE] : current[ENUMERABLE],
+  	        writable: false
+  	      };
+  	    }
+  	  } return $defineProperty(O, P, Attributes);
+  	} : $defineProperty : function defineProperty(O, P, Attributes) {
+  	  anObject(O);
+  	  P = toPropertyKey(P);
+  	  anObject(Attributes);
+  	  if (IE8_DOM_DEFINE) try {
+  	    return $defineProperty(O, P, Attributes);
+  	  } catch (error) { /* empty */ }
+  	  if ('get' in Attributes || 'set' in Attributes) throw new $TypeError('Accessors not supported');
+  	  if ('value' in Attributes) O[P] = Attributes.value;
+  	  return O;
+  	};
+  	return objectDefineProperty;
+  }
 
-  var TEMPLATE = String(String).split('String');
+  var createNonEnumerableProperty;
+  var hasRequiredCreateNonEnumerableProperty;
 
-  var makeBuiltIn$1 = makeBuiltIn$2.exports = function (value, name, options) {
-    if (stringSlice$1($String$1(name), 0, 7) === 'Symbol(') {
-      name = '[' + replace$2($String$1(name), /^Symbol\(([^)]*)\).*$/, '$1') + ']';
-    }
-    if (options && options.getter) name = 'get ' + name;
-    if (options && options.setter) name = 'set ' + name;
-    if (!hasOwn$3(value, 'name') || (CONFIGURABLE_FUNCTION_NAME && value.name !== name)) {
-      if (DESCRIPTORS$4) defineProperty$2(value, 'name', { value: name, configurable: true });
-      else value.name = name;
-    }
-    if (CONFIGURABLE_LENGTH && options && hasOwn$3(options, 'arity') && value.length !== options.arity) {
-      defineProperty$2(value, 'length', { value: options.arity });
-    }
-    try {
-      if (options && hasOwn$3(options, 'constructor') && options.constructor) {
-        if (DESCRIPTORS$4) defineProperty$2(value, 'prototype', { writable: false });
-      // in V8 ~ Chrome 53, prototypes of some methods, like `Array.prototype.values`, are non-writable
-      } else if (value.prototype) value.prototype = undefined;
-    } catch (error) { /* empty */ }
-    var state = enforceInternalState(value);
-    if (!hasOwn$3(state, 'source')) {
-      state.source = join(TEMPLATE, typeof name == 'string' ? name : '');
-    } return value;
-  };
+  function requireCreateNonEnumerableProperty () {
+  	if (hasRequiredCreateNonEnumerableProperty) return createNonEnumerableProperty;
+  	hasRequiredCreateNonEnumerableProperty = 1;
+  	var DESCRIPTORS = requireDescriptors();
+  	var definePropertyModule = requireObjectDefineProperty();
+  	var createPropertyDescriptor = requireCreatePropertyDescriptor();
 
-  // add fake Function#toString for correct work wrapped methods / constructors with methods like LoDash isNative
-  // eslint-disable-next-line no-extend-native -- required
-  Function.prototype.toString = makeBuiltIn$1(function toString() {
-    return isCallable$6(this) && getInternalState$1(this).source || inspectSource$1(this);
-  }, 'toString');
+  	createNonEnumerableProperty = DESCRIPTORS ? function (object, key, value) {
+  	  return definePropertyModule.f(object, key, createPropertyDescriptor(1, value));
+  	} : function (object, key, value) {
+  	  object[key] = value;
+  	  return object;
+  	};
+  	return createNonEnumerableProperty;
+  }
 
-  var makeBuiltInExports = makeBuiltIn$2.exports;
+  var makeBuiltIn = {exports: {}};
 
-  var isCallable$5 = isCallable$e;
-  var definePropertyModule$3 = objectDefineProperty;
-  var makeBuiltIn = makeBuiltInExports;
-  var defineGlobalProperty$1 = defineGlobalProperty$3;
+  var functionName;
+  var hasRequiredFunctionName;
 
-  var defineBuiltIn$3 = function (O, key, value, options) {
-    if (!options) options = {};
-    var simple = options.enumerable;
-    var name = options.name !== undefined ? options.name : key;
-    if (isCallable$5(value)) makeBuiltIn(value, name, options);
-    if (options.global) {
-      if (simple) O[key] = value;
-      else defineGlobalProperty$1(key, value);
-    } else {
-      try {
-        if (!options.unsafe) delete O[key];
-        else if (O[key]) simple = true;
-      } catch (error) { /* empty */ }
-      if (simple) O[key] = value;
-      else definePropertyModule$3.f(O, key, {
-        value: value,
-        enumerable: false,
-        configurable: !options.nonConfigurable,
-        writable: !options.nonWritable
-      });
-    } return O;
-  };
+  function requireFunctionName () {
+  	if (hasRequiredFunctionName) return functionName;
+  	hasRequiredFunctionName = 1;
+  	var DESCRIPTORS = requireDescriptors();
+  	var hasOwn = requireHasOwnProperty();
+
+  	var FunctionPrototype = Function.prototype;
+  	// eslint-disable-next-line es/no-object-getownpropertydescriptor -- safe
+  	var getDescriptor = DESCRIPTORS && Object.getOwnPropertyDescriptor;
+
+  	var EXISTS = hasOwn(FunctionPrototype, 'name');
+  	// additional protection from minified / mangled / dropped function names
+  	var PROPER = EXISTS && (function something() { /* empty */ }).name === 'something';
+  	var CONFIGURABLE = EXISTS && (!DESCRIPTORS || (DESCRIPTORS && getDescriptor(FunctionPrototype, 'name').configurable));
+
+  	functionName = {
+  	  EXISTS: EXISTS,
+  	  PROPER: PROPER,
+  	  CONFIGURABLE: CONFIGURABLE
+  	};
+  	return functionName;
+  }
+
+  var inspectSource;
+  var hasRequiredInspectSource;
+
+  function requireInspectSource () {
+  	if (hasRequiredInspectSource) return inspectSource;
+  	hasRequiredInspectSource = 1;
+  	var uncurryThis = requireFunctionUncurryThis();
+  	var isCallable = requireIsCallable();
+  	var store = requireSharedStore();
+
+  	var functionToString = uncurryThis(Function.toString);
+
+  	// this helper broken in `core-js@3.4.1-3.4.4`, so we can't use `shared` helper
+  	if (!isCallable(store.inspectSource)) {
+  	  store.inspectSource = function (it) {
+  	    return functionToString(it);
+  	  };
+  	}
+
+  	inspectSource = store.inspectSource;
+  	return inspectSource;
+  }
+
+  var weakMapBasicDetection;
+  var hasRequiredWeakMapBasicDetection;
+
+  function requireWeakMapBasicDetection () {
+  	if (hasRequiredWeakMapBasicDetection) return weakMapBasicDetection;
+  	hasRequiredWeakMapBasicDetection = 1;
+  	var globalThis = requireGlobalThis();
+  	var isCallable = requireIsCallable();
+
+  	var WeakMap = globalThis.WeakMap;
+
+  	weakMapBasicDetection = isCallable(WeakMap) && /native code/.test(String(WeakMap));
+  	return weakMapBasicDetection;
+  }
+
+  var sharedKey;
+  var hasRequiredSharedKey;
+
+  function requireSharedKey () {
+  	if (hasRequiredSharedKey) return sharedKey;
+  	hasRequiredSharedKey = 1;
+  	var shared = requireShared();
+  	var uid = requireUid();
+
+  	var keys = shared('keys');
+
+  	sharedKey = function (key) {
+  	  return keys[key] || (keys[key] = uid(key));
+  	};
+  	return sharedKey;
+  }
+
+  var hiddenKeys;
+  var hasRequiredHiddenKeys;
+
+  function requireHiddenKeys () {
+  	if (hasRequiredHiddenKeys) return hiddenKeys;
+  	hasRequiredHiddenKeys = 1;
+  	hiddenKeys = {};
+  	return hiddenKeys;
+  }
+
+  var internalState;
+  var hasRequiredInternalState;
+
+  function requireInternalState () {
+  	if (hasRequiredInternalState) return internalState;
+  	hasRequiredInternalState = 1;
+  	var NATIVE_WEAK_MAP = requireWeakMapBasicDetection();
+  	var globalThis = requireGlobalThis();
+  	var isObject = requireIsObject();
+  	var createNonEnumerableProperty = requireCreateNonEnumerableProperty();
+  	var hasOwn = requireHasOwnProperty();
+  	var shared = requireSharedStore();
+  	var sharedKey = requireSharedKey();
+  	var hiddenKeys = requireHiddenKeys();
+
+  	var OBJECT_ALREADY_INITIALIZED = 'Object already initialized';
+  	var TypeError = globalThis.TypeError;
+  	var WeakMap = globalThis.WeakMap;
+  	var set, get, has;
+
+  	var enforce = function (it) {
+  	  return has(it) ? get(it) : set(it, {});
+  	};
+
+  	var getterFor = function (TYPE) {
+  	  return function (it) {
+  	    var state;
+  	    if (!isObject(it) || (state = get(it)).type !== TYPE) {
+  	      throw new TypeError('Incompatible receiver, ' + TYPE + ' required');
+  	    } return state;
+  	  };
+  	};
+
+  	if (NATIVE_WEAK_MAP || shared.state) {
+  	  var store = shared.state || (shared.state = new WeakMap());
+  	  /* eslint-disable no-self-assign -- prototype methods protection */
+  	  store.get = store.get;
+  	  store.has = store.has;
+  	  store.set = store.set;
+  	  /* eslint-enable no-self-assign -- prototype methods protection */
+  	  set = function (it, metadata) {
+  	    if (store.has(it)) throw new TypeError(OBJECT_ALREADY_INITIALIZED);
+  	    metadata.facade = it;
+  	    store.set(it, metadata);
+  	    return metadata;
+  	  };
+  	  get = function (it) {
+  	    return store.get(it) || {};
+  	  };
+  	  has = function (it) {
+  	    return store.has(it);
+  	  };
+  	} else {
+  	  var STATE = sharedKey('state');
+  	  hiddenKeys[STATE] = true;
+  	  set = function (it, metadata) {
+  	    if (hasOwn(it, STATE)) throw new TypeError(OBJECT_ALREADY_INITIALIZED);
+  	    metadata.facade = it;
+  	    createNonEnumerableProperty(it, STATE, metadata);
+  	    return metadata;
+  	  };
+  	  get = function (it) {
+  	    return hasOwn(it, STATE) ? it[STATE] : {};
+  	  };
+  	  has = function (it) {
+  	    return hasOwn(it, STATE);
+  	  };
+  	}
+
+  	internalState = {
+  	  set: set,
+  	  get: get,
+  	  has: has,
+  	  enforce: enforce,
+  	  getterFor: getterFor
+  	};
+  	return internalState;
+  }
+
+  var hasRequiredMakeBuiltIn;
+
+  function requireMakeBuiltIn () {
+  	if (hasRequiredMakeBuiltIn) return makeBuiltIn.exports;
+  	hasRequiredMakeBuiltIn = 1;
+  	var uncurryThis = requireFunctionUncurryThis();
+  	var fails = requireFails();
+  	var isCallable = requireIsCallable();
+  	var hasOwn = requireHasOwnProperty();
+  	var DESCRIPTORS = requireDescriptors();
+  	var CONFIGURABLE_FUNCTION_NAME = requireFunctionName().CONFIGURABLE;
+  	var inspectSource = requireInspectSource();
+  	var InternalStateModule = requireInternalState();
+
+  	var enforceInternalState = InternalStateModule.enforce;
+  	var getInternalState = InternalStateModule.get;
+  	var $String = String;
+  	// eslint-disable-next-line es/no-object-defineproperty -- safe
+  	var defineProperty = Object.defineProperty;
+  	var stringSlice = uncurryThis(''.slice);
+  	var replace = uncurryThis(''.replace);
+  	var join = uncurryThis([].join);
+
+  	var CONFIGURABLE_LENGTH = DESCRIPTORS && !fails(function () {
+  	  return defineProperty(function () { /* empty */ }, 'length', { value: 8 }).length !== 8;
+  	});
+
+  	var TEMPLATE = String(String).split('String');
+
+  	var makeBuiltIn$1 = makeBuiltIn.exports = function (value, name, options) {
+  	  if (stringSlice($String(name), 0, 7) === 'Symbol(') {
+  	    name = '[' + replace($String(name), /^Symbol\(([^)]*)\).*$/, '$1') + ']';
+  	  }
+  	  if (options && options.getter) name = 'get ' + name;
+  	  if (options && options.setter) name = 'set ' + name;
+  	  if (!hasOwn(value, 'name') || (CONFIGURABLE_FUNCTION_NAME && value.name !== name)) {
+  	    if (DESCRIPTORS) defineProperty(value, 'name', { value: name, configurable: true });
+  	    else value.name = name;
+  	  }
+  	  if (CONFIGURABLE_LENGTH && options && hasOwn(options, 'arity') && value.length !== options.arity) {
+  	    defineProperty(value, 'length', { value: options.arity });
+  	  }
+  	  try {
+  	    if (options && hasOwn(options, 'constructor') && options.constructor) {
+  	      if (DESCRIPTORS) defineProperty(value, 'prototype', { writable: false });
+  	    // in V8 ~ Chrome 53, prototypes of some methods, like `Array.prototype.values`, are non-writable
+  	    } else if (value.prototype) value.prototype = undefined;
+  	  } catch (error) { /* empty */ }
+  	  var state = enforceInternalState(value);
+  	  if (!hasOwn(state, 'source')) {
+  	    state.source = join(TEMPLATE, typeof name == 'string' ? name : '');
+  	  } return value;
+  	};
+
+  	// add fake Function#toString for correct work wrapped methods / constructors with methods like LoDash isNative
+  	// eslint-disable-next-line no-extend-native -- required
+  	Function.prototype.toString = makeBuiltIn$1(function toString() {
+  	  return isCallable(this) && getInternalState(this).source || inspectSource(this);
+  	}, 'toString');
+  	return makeBuiltIn.exports;
+  }
+
+  var defineBuiltIn;
+  var hasRequiredDefineBuiltIn;
+
+  function requireDefineBuiltIn () {
+  	if (hasRequiredDefineBuiltIn) return defineBuiltIn;
+  	hasRequiredDefineBuiltIn = 1;
+  	var isCallable = requireIsCallable();
+  	var definePropertyModule = requireObjectDefineProperty();
+  	var makeBuiltIn = requireMakeBuiltIn();
+  	var defineGlobalProperty = requireDefineGlobalProperty();
+
+  	defineBuiltIn = function (O, key, value, options) {
+  	  if (!options) options = {};
+  	  var simple = options.enumerable;
+  	  var name = options.name !== undefined ? options.name : key;
+  	  if (isCallable(value)) makeBuiltIn(value, name, options);
+  	  if (options.global) {
+  	    if (simple) O[key] = value;
+  	    else defineGlobalProperty(key, value);
+  	  } else {
+  	    try {
+  	      if (!options.unsafe) delete O[key];
+  	      else if (O[key]) simple = true;
+  	    } catch (error) { /* empty */ }
+  	    if (simple) O[key] = value;
+  	    else definePropertyModule.f(O, key, {
+  	      value: value,
+  	      enumerable: false,
+  	      configurable: !options.nonConfigurable,
+  	      writable: !options.nonWritable
+  	    });
+  	  } return O;
+  	};
+  	return defineBuiltIn;
+  }
 
   var objectGetOwnPropertyNames = {};
 
-  var ceil = Math.ceil;
-  var floor = Math.floor;
+  var mathTrunc;
+  var hasRequiredMathTrunc;
 
-  // `Math.trunc` method
-  // https://tc39.es/ecma262/#sec-math.trunc
-  // eslint-disable-next-line es/no-math-trunc -- safe
-  var mathTrunc = Math.trunc || function trunc(x) {
-    var n = +x;
-    return (n > 0 ? floor : ceil)(n);
-  };
+  function requireMathTrunc () {
+  	if (hasRequiredMathTrunc) return mathTrunc;
+  	hasRequiredMathTrunc = 1;
+  	var ceil = Math.ceil;
+  	var floor = Math.floor;
 
-  var trunc = mathTrunc;
+  	// `Math.trunc` method
+  	// https://tc39.es/ecma262/#sec-math.trunc
+  	// eslint-disable-next-line es/no-math-trunc -- safe
+  	mathTrunc = Math.trunc || function trunc(x) {
+  	  var n = +x;
+  	  return (n > 0 ? floor : ceil)(n);
+  	};
+  	return mathTrunc;
+  }
 
-  // `ToIntegerOrInfinity` abstract operation
-  // https://tc39.es/ecma262/#sec-tointegerorinfinity
-  var toIntegerOrInfinity$2 = function (argument) {
-    var number = +argument;
-    // eslint-disable-next-line no-self-compare -- NaN check
-    return number !== number || number === 0 ? 0 : trunc(number);
-  };
+  var toIntegerOrInfinity;
+  var hasRequiredToIntegerOrInfinity;
 
-  var toIntegerOrInfinity$1 = toIntegerOrInfinity$2;
+  function requireToIntegerOrInfinity () {
+  	if (hasRequiredToIntegerOrInfinity) return toIntegerOrInfinity;
+  	hasRequiredToIntegerOrInfinity = 1;
+  	var trunc = requireMathTrunc();
 
-  var max = Math.max;
-  var min$1 = Math.min;
+  	// `ToIntegerOrInfinity` abstract operation
+  	// https://tc39.es/ecma262/#sec-tointegerorinfinity
+  	toIntegerOrInfinity = function (argument) {
+  	  var number = +argument;
+  	  // eslint-disable-next-line no-self-compare -- NaN check
+  	  return number !== number || number === 0 ? 0 : trunc(number);
+  	};
+  	return toIntegerOrInfinity;
+  }
 
-  // Helper for a popular repeating case of the spec:
-  // Let integer be ? ToInteger(index).
-  // If integer < 0, let result be max((length + integer), 0); else let result be min(integer, length).
-  var toAbsoluteIndex$1 = function (index, length) {
-    var integer = toIntegerOrInfinity$1(index);
-    return integer < 0 ? max(integer + length, 0) : min$1(integer, length);
-  };
+  var toAbsoluteIndex;
+  var hasRequiredToAbsoluteIndex;
 
-  var toIntegerOrInfinity = toIntegerOrInfinity$2;
+  function requireToAbsoluteIndex () {
+  	if (hasRequiredToAbsoluteIndex) return toAbsoluteIndex;
+  	hasRequiredToAbsoluteIndex = 1;
+  	var toIntegerOrInfinity = requireToIntegerOrInfinity();
 
-  var min = Math.min;
+  	var max = Math.max;
+  	var min = Math.min;
 
-  // `ToLength` abstract operation
-  // https://tc39.es/ecma262/#sec-tolength
-  var toLength$1 = function (argument) {
-    var len = toIntegerOrInfinity(argument);
-    return len > 0 ? min(len, 0x1FFFFFFFFFFFFF) : 0; // 2 ** 53 - 1 == 9007199254740991
-  };
+  	// Helper for a popular repeating case of the spec:
+  	// Let integer be ? ToInteger(index).
+  	// If integer < 0, let result be max((length + integer), 0); else let result be min(integer, length).
+  	toAbsoluteIndex = function (index, length) {
+  	  var integer = toIntegerOrInfinity(index);
+  	  return integer < 0 ? max(integer + length, 0) : min(integer, length);
+  	};
+  	return toAbsoluteIndex;
+  }
 
-  var toLength = toLength$1;
+  var toLength;
+  var hasRequiredToLength;
 
-  // `LengthOfArrayLike` abstract operation
-  // https://tc39.es/ecma262/#sec-lengthofarraylike
-  var lengthOfArrayLike$3 = function (obj) {
-    return toLength(obj.length);
-  };
+  function requireToLength () {
+  	if (hasRequiredToLength) return toLength;
+  	hasRequiredToLength = 1;
+  	var toIntegerOrInfinity = requireToIntegerOrInfinity();
 
-  var toIndexedObject$4 = toIndexedObject$6;
-  var toAbsoluteIndex = toAbsoluteIndex$1;
-  var lengthOfArrayLike$2 = lengthOfArrayLike$3;
+  	var min = Math.min;
 
-  // `Array.prototype.{ indexOf, includes }` methods implementation
-  var createMethod$3 = function (IS_INCLUDES) {
-    return function ($this, el, fromIndex) {
-      var O = toIndexedObject$4($this);
-      var length = lengthOfArrayLike$2(O);
-      if (length === 0) return !IS_INCLUDES && -1;
-      var index = toAbsoluteIndex(fromIndex, length);
-      var value;
-      // Array#includes uses SameValueZero equality algorithm
-      // eslint-disable-next-line no-self-compare -- NaN check
-      if (IS_INCLUDES && el !== el) while (length > index) {
-        value = O[index++];
-        // eslint-disable-next-line no-self-compare -- NaN check
-        if (value !== value) return true;
-      // Array#indexOf ignores holes, Array#includes - not
-      } else for (;length > index; index++) {
-        if ((IS_INCLUDES || index in O) && O[index] === el) return IS_INCLUDES || index || 0;
-      } return !IS_INCLUDES && -1;
-    };
-  };
+  	// `ToLength` abstract operation
+  	// https://tc39.es/ecma262/#sec-tolength
+  	toLength = function (argument) {
+  	  var len = toIntegerOrInfinity(argument);
+  	  return len > 0 ? min(len, 0x1FFFFFFFFFFFFF) : 0; // 2 ** 53 - 1 == 9007199254740991
+  	};
+  	return toLength;
+  }
 
-  var arrayIncludes = {
-    // `Array.prototype.includes` method
-    // https://tc39.es/ecma262/#sec-array.prototype.includes
-    includes: createMethod$3(true),
-    // `Array.prototype.indexOf` method
-    // https://tc39.es/ecma262/#sec-array.prototype.indexof
-    indexOf: createMethod$3(false)
-  };
+  var lengthOfArrayLike;
+  var hasRequiredLengthOfArrayLike;
 
-  var uncurryThis$c = functionUncurryThis;
-  var hasOwn$2 = hasOwnProperty_1;
-  var toIndexedObject$3 = toIndexedObject$6;
-  var indexOf$1 = arrayIncludes.indexOf;
-  var hiddenKeys$2 = hiddenKeys$4;
+  function requireLengthOfArrayLike () {
+  	if (hasRequiredLengthOfArrayLike) return lengthOfArrayLike;
+  	hasRequiredLengthOfArrayLike = 1;
+  	var toLength = requireToLength();
 
-  var push$2 = uncurryThis$c([].push);
+  	// `LengthOfArrayLike` abstract operation
+  	// https://tc39.es/ecma262/#sec-lengthofarraylike
+  	lengthOfArrayLike = function (obj) {
+  	  return toLength(obj.length);
+  	};
+  	return lengthOfArrayLike;
+  }
 
-  var objectKeysInternal = function (object, names) {
-    var O = toIndexedObject$3(object);
-    var i = 0;
-    var result = [];
-    var key;
-    for (key in O) !hasOwn$2(hiddenKeys$2, key) && hasOwn$2(O, key) && push$2(result, key);
-    // Don't enum bug & hidden keys
-    while (names.length > i) if (hasOwn$2(O, key = names[i++])) {
-      ~indexOf$1(result, key) || push$2(result, key);
-    }
-    return result;
-  };
+  var arrayIncludes;
+  var hasRequiredArrayIncludes;
 
-  // IE8- don't enum bug keys
-  var enumBugKeys$3 = [
-    'constructor',
-    'hasOwnProperty',
-    'isPrototypeOf',
-    'propertyIsEnumerable',
-    'toLocaleString',
-    'toString',
-    'valueOf'
-  ];
+  function requireArrayIncludes () {
+  	if (hasRequiredArrayIncludes) return arrayIncludes;
+  	hasRequiredArrayIncludes = 1;
+  	var toIndexedObject = requireToIndexedObject();
+  	var toAbsoluteIndex = requireToAbsoluteIndex();
+  	var lengthOfArrayLike = requireLengthOfArrayLike();
 
-  var internalObjectKeys$1 = objectKeysInternal;
-  var enumBugKeys$2 = enumBugKeys$3;
+  	// `Array.prototype.{ indexOf, includes }` methods implementation
+  	var createMethod = function (IS_INCLUDES) {
+  	  return function ($this, el, fromIndex) {
+  	    var O = toIndexedObject($this);
+  	    var length = lengthOfArrayLike(O);
+  	    if (length === 0) return !IS_INCLUDES && -1;
+  	    var index = toAbsoluteIndex(fromIndex, length);
+  	    var value;
+  	    // Array#includes uses SameValueZero equality algorithm
+  	    // eslint-disable-next-line no-self-compare -- NaN check
+  	    if (IS_INCLUDES && el !== el) while (length > index) {
+  	      value = O[index++];
+  	      // eslint-disable-next-line no-self-compare -- NaN check
+  	      if (value !== value) return true;
+  	    // Array#indexOf ignores holes, Array#includes - not
+  	    } else for (;length > index; index++) {
+  	      if ((IS_INCLUDES || index in O) && O[index] === el) return IS_INCLUDES || index || 0;
+  	    } return !IS_INCLUDES && -1;
+  	  };
+  	};
 
-  var hiddenKeys$1 = enumBugKeys$2.concat('length', 'prototype');
+  	arrayIncludes = {
+  	  // `Array.prototype.includes` method
+  	  // https://tc39.es/ecma262/#sec-array.prototype.includes
+  	  includes: createMethod(true),
+  	  // `Array.prototype.indexOf` method
+  	  // https://tc39.es/ecma262/#sec-array.prototype.indexof
+  	  indexOf: createMethod(false)
+  	};
+  	return arrayIncludes;
+  }
 
-  // `Object.getOwnPropertyNames` method
-  // https://tc39.es/ecma262/#sec-object.getownpropertynames
-  // eslint-disable-next-line es/no-object-getownpropertynames -- safe
-  objectGetOwnPropertyNames.f = Object.getOwnPropertyNames || function getOwnPropertyNames(O) {
-    return internalObjectKeys$1(O, hiddenKeys$1);
-  };
+  var objectKeysInternal;
+  var hasRequiredObjectKeysInternal;
+
+  function requireObjectKeysInternal () {
+  	if (hasRequiredObjectKeysInternal) return objectKeysInternal;
+  	hasRequiredObjectKeysInternal = 1;
+  	var uncurryThis = requireFunctionUncurryThis();
+  	var hasOwn = requireHasOwnProperty();
+  	var toIndexedObject = requireToIndexedObject();
+  	var indexOf = requireArrayIncludes().indexOf;
+  	var hiddenKeys = requireHiddenKeys();
+
+  	var push = uncurryThis([].push);
+
+  	objectKeysInternal = function (object, names) {
+  	  var O = toIndexedObject(object);
+  	  var i = 0;
+  	  var result = [];
+  	  var key;
+  	  for (key in O) !hasOwn(hiddenKeys, key) && hasOwn(O, key) && push(result, key);
+  	  // Don't enum bug & hidden keys
+  	  while (names.length > i) if (hasOwn(O, key = names[i++])) {
+  	    ~indexOf(result, key) || push(result, key);
+  	  }
+  	  return result;
+  	};
+  	return objectKeysInternal;
+  }
+
+  var enumBugKeys;
+  var hasRequiredEnumBugKeys;
+
+  function requireEnumBugKeys () {
+  	if (hasRequiredEnumBugKeys) return enumBugKeys;
+  	hasRequiredEnumBugKeys = 1;
+  	// IE8- don't enum bug keys
+  	enumBugKeys = [
+  	  'constructor',
+  	  'hasOwnProperty',
+  	  'isPrototypeOf',
+  	  'propertyIsEnumerable',
+  	  'toLocaleString',
+  	  'toString',
+  	  'valueOf'
+  	];
+  	return enumBugKeys;
+  }
+
+  var hasRequiredObjectGetOwnPropertyNames;
+
+  function requireObjectGetOwnPropertyNames () {
+  	if (hasRequiredObjectGetOwnPropertyNames) return objectGetOwnPropertyNames;
+  	hasRequiredObjectGetOwnPropertyNames = 1;
+  	var internalObjectKeys = requireObjectKeysInternal();
+  	var enumBugKeys = requireEnumBugKeys();
+
+  	var hiddenKeys = enumBugKeys.concat('length', 'prototype');
+
+  	// `Object.getOwnPropertyNames` method
+  	// https://tc39.es/ecma262/#sec-object.getownpropertynames
+  	// eslint-disable-next-line es/no-object-getownpropertynames -- safe
+  	objectGetOwnPropertyNames.f = Object.getOwnPropertyNames || function getOwnPropertyNames(O) {
+  	  return internalObjectKeys(O, hiddenKeys);
+  	};
+  	return objectGetOwnPropertyNames;
+  }
 
   var objectGetOwnPropertySymbols = {};
 
-  // eslint-disable-next-line es/no-object-getownpropertysymbols -- safe
-  objectGetOwnPropertySymbols.f = Object.getOwnPropertySymbols;
+  var hasRequiredObjectGetOwnPropertySymbols;
 
-  var getBuiltIn$2 = getBuiltIn$4;
-  var uncurryThis$b = functionUncurryThis;
-  var getOwnPropertyNamesModule = objectGetOwnPropertyNames;
-  var getOwnPropertySymbolsModule$1 = objectGetOwnPropertySymbols;
-  var anObject$5 = anObject$7;
+  function requireObjectGetOwnPropertySymbols () {
+  	if (hasRequiredObjectGetOwnPropertySymbols) return objectGetOwnPropertySymbols;
+  	hasRequiredObjectGetOwnPropertySymbols = 1;
+  	// eslint-disable-next-line es/no-object-getownpropertysymbols -- safe
+  	objectGetOwnPropertySymbols.f = Object.getOwnPropertySymbols;
+  	return objectGetOwnPropertySymbols;
+  }
 
-  var concat$1 = uncurryThis$b([].concat);
+  var ownKeys;
+  var hasRequiredOwnKeys;
 
-  // all object keys, includes non-enumerable and symbols
-  var ownKeys$1 = getBuiltIn$2('Reflect', 'ownKeys') || function ownKeys(it) {
-    var keys = getOwnPropertyNamesModule.f(anObject$5(it));
-    var getOwnPropertySymbols = getOwnPropertySymbolsModule$1.f;
-    return getOwnPropertySymbols ? concat$1(keys, getOwnPropertySymbols(it)) : keys;
-  };
+  function requireOwnKeys () {
+  	if (hasRequiredOwnKeys) return ownKeys;
+  	hasRequiredOwnKeys = 1;
+  	var getBuiltIn = requireGetBuiltIn();
+  	var uncurryThis = requireFunctionUncurryThis();
+  	var getOwnPropertyNamesModule = requireObjectGetOwnPropertyNames();
+  	var getOwnPropertySymbolsModule = requireObjectGetOwnPropertySymbols();
+  	var anObject = requireAnObject();
 
-  var hasOwn$1 = hasOwnProperty_1;
-  var ownKeys = ownKeys$1;
-  var getOwnPropertyDescriptorModule = objectGetOwnPropertyDescriptor;
-  var definePropertyModule$2 = objectDefineProperty;
+  	var concat = uncurryThis([].concat);
 
-  var copyConstructorProperties$1 = function (target, source, exceptions) {
-    var keys = ownKeys(source);
-    var defineProperty = definePropertyModule$2.f;
-    var getOwnPropertyDescriptor = getOwnPropertyDescriptorModule.f;
-    for (var i = 0; i < keys.length; i++) {
-      var key = keys[i];
-      if (!hasOwn$1(target, key) && !(exceptions && hasOwn$1(exceptions, key))) {
-        defineProperty(target, key, getOwnPropertyDescriptor(source, key));
-      }
-    }
-  };
+  	// all object keys, includes non-enumerable and symbols
+  	ownKeys = getBuiltIn('Reflect', 'ownKeys') || function ownKeys(it) {
+  	  var keys = getOwnPropertyNamesModule.f(anObject(it));
+  	  var getOwnPropertySymbols = getOwnPropertySymbolsModule.f;
+  	  return getOwnPropertySymbols ? concat(keys, getOwnPropertySymbols(it)) : keys;
+  	};
+  	return ownKeys;
+  }
 
-  var fails$d = fails$l;
-  var isCallable$4 = isCallable$e;
+  var copyConstructorProperties;
+  var hasRequiredCopyConstructorProperties;
 
-  var replacement = /#|\.prototype\./;
+  function requireCopyConstructorProperties () {
+  	if (hasRequiredCopyConstructorProperties) return copyConstructorProperties;
+  	hasRequiredCopyConstructorProperties = 1;
+  	var hasOwn = requireHasOwnProperty();
+  	var ownKeys = requireOwnKeys();
+  	var getOwnPropertyDescriptorModule = requireObjectGetOwnPropertyDescriptor();
+  	var definePropertyModule = requireObjectDefineProperty();
 
-  var isForced$1 = function (feature, detection) {
-    var value = data[normalize(feature)];
-    return value === POLYFILL ? true
-      : value === NATIVE ? false
-      : isCallable$4(detection) ? fails$d(detection)
-      : !!detection;
-  };
+  	copyConstructorProperties = function (target, source, exceptions) {
+  	  var keys = ownKeys(source);
+  	  var defineProperty = definePropertyModule.f;
+  	  var getOwnPropertyDescriptor = getOwnPropertyDescriptorModule.f;
+  	  for (var i = 0; i < keys.length; i++) {
+  	    var key = keys[i];
+  	    if (!hasOwn(target, key) && !(exceptions && hasOwn(exceptions, key))) {
+  	      defineProperty(target, key, getOwnPropertyDescriptor(source, key));
+  	    }
+  	  }
+  	};
+  	return copyConstructorProperties;
+  }
 
-  var normalize = isForced$1.normalize = function (string) {
-    return String(string).replace(replacement, '.').toLowerCase();
-  };
+  var isForced_1;
+  var hasRequiredIsForced;
 
-  var data = isForced$1.data = {};
-  var NATIVE = isForced$1.NATIVE = 'N';
-  var POLYFILL = isForced$1.POLYFILL = 'P';
+  function requireIsForced () {
+  	if (hasRequiredIsForced) return isForced_1;
+  	hasRequiredIsForced = 1;
+  	var fails = requireFails();
+  	var isCallable = requireIsCallable();
 
-  var isForced_1 = isForced$1;
+  	var replacement = /#|\.prototype\./;
 
-  var global$4 = global$d;
-  var getOwnPropertyDescriptor = objectGetOwnPropertyDescriptor.f;
-  var createNonEnumerableProperty$1 = createNonEnumerableProperty$3;
-  var defineBuiltIn$2 = defineBuiltIn$3;
-  var defineGlobalProperty = defineGlobalProperty$3;
-  var copyConstructorProperties = copyConstructorProperties$1;
-  var isForced = isForced_1;
+  	var isForced = function (feature, detection) {
+  	  var value = data[normalize(feature)];
+  	  return value === POLYFILL ? true
+  	    : value === NATIVE ? false
+  	    : isCallable(detection) ? fails(detection)
+  	    : !!detection;
+  	};
 
-  /*
-    options.target         - name of the target object
-    options.global         - target is the global object
-    options.stat           - export as static methods of target
-    options.proto          - export as prototype methods of target
-    options.real           - real prototype method for the `pure` version
-    options.forced         - export even if the native feature is available
-    options.bind           - bind methods to the target, required for the `pure` version
-    options.wrap           - wrap constructors to preventing global pollution, required for the `pure` version
-    options.unsafe         - use the simple assignment of property instead of delete + defineProperty
-    options.sham           - add a flag to not completely full polyfills
-    options.enumerable     - export as enumerable property
-    options.dontCallGetSet - prevent calling a getter on target
-    options.name           - the .name of the function if it does not match the key
-  */
-  var _export = function (options, source) {
-    var TARGET = options.target;
-    var GLOBAL = options.global;
-    var STATIC = options.stat;
-    var FORCED, target, key, targetProperty, sourceProperty, descriptor;
-    if (GLOBAL) {
-      target = global$4;
-    } else if (STATIC) {
-      target = global$4[TARGET] || defineGlobalProperty(TARGET, {});
-    } else {
-      target = global$4[TARGET] && global$4[TARGET].prototype;
-    }
-    if (target) for (key in source) {
-      sourceProperty = source[key];
-      if (options.dontCallGetSet) {
-        descriptor = getOwnPropertyDescriptor(target, key);
-        targetProperty = descriptor && descriptor.value;
-      } else targetProperty = target[key];
-      FORCED = isForced(GLOBAL ? key : TARGET + (STATIC ? '.' : '#') + key, options.forced);
-      // contained in target
-      if (!FORCED && targetProperty !== undefined) {
-        if (typeof sourceProperty == typeof targetProperty) continue;
-        copyConstructorProperties(sourceProperty, targetProperty);
-      }
-      // add a flag to not completely full polyfills
-      if (options.sham || (targetProperty && targetProperty.sham)) {
-        createNonEnumerableProperty$1(sourceProperty, 'sham', true);
-      }
-      defineBuiltIn$2(target, key, sourceProperty, options);
-    }
-  };
+  	var normalize = isForced.normalize = function (string) {
+  	  return String(string).replace(replacement, '.').toLowerCase();
+  	};
 
-  var classof$6 = classofRaw$2;
+  	var data = isForced.data = {};
+  	var NATIVE = isForced.NATIVE = 'N';
+  	var POLYFILL = isForced.POLYFILL = 'P';
 
-  // `IsArray` abstract operation
-  // https://tc39.es/ecma262/#sec-isarray
-  // eslint-disable-next-line es/no-array-isarray -- safe
-  var isArray$2 = Array.isArray || function isArray(argument) {
-    return classof$6(argument) === 'Array';
-  };
+  	isForced_1 = isForced;
+  	return isForced_1;
+  }
 
-  var $TypeError$2 = TypeError;
-  var MAX_SAFE_INTEGER = 0x1FFFFFFFFFFFFF; // 2 ** 53 - 1 == 9007199254740991
+  var _export;
+  var hasRequired_export;
 
-  var doesNotExceedSafeInteger$1 = function (it) {
-    if (it > MAX_SAFE_INTEGER) throw $TypeError$2('Maximum allowed index exceeded');
-    return it;
-  };
+  function require_export () {
+  	if (hasRequired_export) return _export;
+  	hasRequired_export = 1;
+  	var globalThis = requireGlobalThis();
+  	var getOwnPropertyDescriptor = requireObjectGetOwnPropertyDescriptor().f;
+  	var createNonEnumerableProperty = requireCreateNonEnumerableProperty();
+  	var defineBuiltIn = requireDefineBuiltIn();
+  	var defineGlobalProperty = requireDefineGlobalProperty();
+  	var copyConstructorProperties = requireCopyConstructorProperties();
+  	var isForced = requireIsForced();
 
-  var DESCRIPTORS$3 = descriptors;
-  var definePropertyModule$1 = objectDefineProperty;
-  var createPropertyDescriptor = createPropertyDescriptor$3;
+  	/*
+  	  options.target         - name of the target object
+  	  options.global         - target is the global object
+  	  options.stat           - export as static methods of target
+  	  options.proto          - export as prototype methods of target
+  	  options.real           - real prototype method for the `pure` version
+  	  options.forced         - export even if the native feature is available
+  	  options.bind           - bind methods to the target, required for the `pure` version
+  	  options.wrap           - wrap constructors to preventing global pollution, required for the `pure` version
+  	  options.unsafe         - use the simple assignment of property instead of delete + defineProperty
+  	  options.sham           - add a flag to not completely full polyfills
+  	  options.enumerable     - export as enumerable property
+  	  options.dontCallGetSet - prevent calling a getter on target
+  	  options.name           - the .name of the function if it does not match the key
+  	*/
+  	_export = function (options, source) {
+  	  var TARGET = options.target;
+  	  var GLOBAL = options.global;
+  	  var STATIC = options.stat;
+  	  var FORCED, target, key, targetProperty, sourceProperty, descriptor;
+  	  if (GLOBAL) {
+  	    target = globalThis;
+  	  } else if (STATIC) {
+  	    target = globalThis[TARGET] || defineGlobalProperty(TARGET, {});
+  	  } else {
+  	    target = globalThis[TARGET] && globalThis[TARGET].prototype;
+  	  }
+  	  if (target) for (key in source) {
+  	    sourceProperty = source[key];
+  	    if (options.dontCallGetSet) {
+  	      descriptor = getOwnPropertyDescriptor(target, key);
+  	      targetProperty = descriptor && descriptor.value;
+  	    } else targetProperty = target[key];
+  	    FORCED = isForced(GLOBAL ? key : TARGET + (STATIC ? '.' : '#') + key, options.forced);
+  	    // contained in target
+  	    if (!FORCED && targetProperty !== undefined) {
+  	      if (typeof sourceProperty == typeof targetProperty) continue;
+  	      copyConstructorProperties(sourceProperty, targetProperty);
+  	    }
+  	    // add a flag to not completely full polyfills
+  	    if (options.sham || (targetProperty && targetProperty.sham)) {
+  	      createNonEnumerableProperty(sourceProperty, 'sham', true);
+  	    }
+  	    defineBuiltIn(target, key, sourceProperty, options);
+  	  }
+  	};
+  	return _export;
+  }
 
-  var createProperty$1 = function (object, key, value) {
-    if (DESCRIPTORS$3) definePropertyModule$1.f(object, key, createPropertyDescriptor(0, value));
-    else object[key] = value;
-  };
+  var isArray;
+  var hasRequiredIsArray;
 
-  var wellKnownSymbol$8 = wellKnownSymbol$a;
+  function requireIsArray () {
+  	if (hasRequiredIsArray) return isArray;
+  	hasRequiredIsArray = 1;
+  	var classof = requireClassofRaw();
 
-  var TO_STRING_TAG$1 = wellKnownSymbol$8('toStringTag');
-  var test = {};
+  	// `IsArray` abstract operation
+  	// https://tc39.es/ecma262/#sec-isarray
+  	// eslint-disable-next-line es/no-array-isarray -- safe
+  	isArray = Array.isArray || function isArray(argument) {
+  	  return classof(argument) === 'Array';
+  	};
+  	return isArray;
+  }
 
-  test[TO_STRING_TAG$1] = 'z';
+  var doesNotExceedSafeInteger;
+  var hasRequiredDoesNotExceedSafeInteger;
 
-  var toStringTagSupport = String(test) === '[object z]';
+  function requireDoesNotExceedSafeInteger () {
+  	if (hasRequiredDoesNotExceedSafeInteger) return doesNotExceedSafeInteger;
+  	hasRequiredDoesNotExceedSafeInteger = 1;
+  	var $TypeError = TypeError;
+  	var MAX_SAFE_INTEGER = 0x1FFFFFFFFFFFFF; // 2 ** 53 - 1 == 9007199254740991
 
-  var TO_STRING_TAG_SUPPORT$2 = toStringTagSupport;
-  var isCallable$3 = isCallable$e;
-  var classofRaw$1 = classofRaw$2;
-  var wellKnownSymbol$7 = wellKnownSymbol$a;
+  	doesNotExceedSafeInteger = function (it) {
+  	  if (it > MAX_SAFE_INTEGER) throw $TypeError('Maximum allowed index exceeded');
+  	  return it;
+  	};
+  	return doesNotExceedSafeInteger;
+  }
 
-  var TO_STRING_TAG = wellKnownSymbol$7('toStringTag');
-  var $Object$1 = Object;
+  var createProperty;
+  var hasRequiredCreateProperty;
 
-  // ES3 wrong here
-  var CORRECT_ARGUMENTS = classofRaw$1(function () { return arguments; }()) === 'Arguments';
+  function requireCreateProperty () {
+  	if (hasRequiredCreateProperty) return createProperty;
+  	hasRequiredCreateProperty = 1;
+  	var DESCRIPTORS = requireDescriptors();
+  	var definePropertyModule = requireObjectDefineProperty();
+  	var createPropertyDescriptor = requireCreatePropertyDescriptor();
 
-  // fallback for IE11 Script Access Denied error
-  var tryGet = function (it, key) {
-    try {
-      return it[key];
-    } catch (error) { /* empty */ }
-  };
+  	createProperty = function (object, key, value) {
+  	  if (DESCRIPTORS) definePropertyModule.f(object, key, createPropertyDescriptor(0, value));
+  	  else object[key] = value;
+  	};
+  	return createProperty;
+  }
 
-  // getting tag from ES6+ `Object.prototype.toString`
-  var classof$5 = TO_STRING_TAG_SUPPORT$2 ? classofRaw$1 : function (it) {
-    var O, tag, result;
-    return it === undefined ? 'Undefined' : it === null ? 'Null'
-      // @@toStringTag case
-      : typeof (tag = tryGet(O = $Object$1(it), TO_STRING_TAG)) == 'string' ? tag
-      // builtinTag case
-      : CORRECT_ARGUMENTS ? classofRaw$1(O)
-      // ES3 arguments fallback
-      : (result = classofRaw$1(O)) === 'Object' && isCallable$3(O.callee) ? 'Arguments' : result;
-  };
+  var toStringTagSupport;
+  var hasRequiredToStringTagSupport;
 
-  var uncurryThis$a = functionUncurryThis;
-  var fails$c = fails$l;
-  var isCallable$2 = isCallable$e;
-  var classof$4 = classof$5;
-  var getBuiltIn$1 = getBuiltIn$4;
-  var inspectSource = inspectSource$2;
+  function requireToStringTagSupport () {
+  	if (hasRequiredToStringTagSupport) return toStringTagSupport;
+  	hasRequiredToStringTagSupport = 1;
+  	var wellKnownSymbol = requireWellKnownSymbol();
 
-  var noop = function () { /* empty */ };
-  var construct = getBuiltIn$1('Reflect', 'construct');
-  var constructorRegExp = /^\s*(?:class|function)\b/;
-  var exec$1 = uncurryThis$a(constructorRegExp.exec);
-  var INCORRECT_TO_STRING = !constructorRegExp.test(noop);
+  	var TO_STRING_TAG = wellKnownSymbol('toStringTag');
+  	var test = {};
 
-  var isConstructorModern = function isConstructor(argument) {
-    if (!isCallable$2(argument)) return false;
-    try {
-      construct(noop, [], argument);
-      return true;
-    } catch (error) {
-      return false;
-    }
-  };
+  	test[TO_STRING_TAG] = 'z';
 
-  var isConstructorLegacy = function isConstructor(argument) {
-    if (!isCallable$2(argument)) return false;
-    switch (classof$4(argument)) {
-      case 'AsyncFunction':
-      case 'GeneratorFunction':
-      case 'AsyncGeneratorFunction': return false;
-    }
-    try {
-      // we can't check .prototype since constructors produced by .bind haven't it
-      // `Function#toString` throws on some built-it function in some legacy engines
-      // (for example, `DOMQuad` and similar in FF41-)
-      return INCORRECT_TO_STRING || !!exec$1(constructorRegExp, inspectSource(argument));
-    } catch (error) {
-      return true;
-    }
-  };
+  	toStringTagSupport = String(test) === '[object z]';
+  	return toStringTagSupport;
+  }
 
-  isConstructorLegacy.sham = true;
+  var classof;
+  var hasRequiredClassof;
 
-  // `IsConstructor` abstract operation
-  // https://tc39.es/ecma262/#sec-isconstructor
-  var isConstructor$1 = !construct || fails$c(function () {
-    var called;
-    return isConstructorModern(isConstructorModern.call)
-      || !isConstructorModern(Object)
-      || !isConstructorModern(function () { called = true; })
-      || called;
-  }) ? isConstructorLegacy : isConstructorModern;
+  function requireClassof () {
+  	if (hasRequiredClassof) return classof;
+  	hasRequiredClassof = 1;
+  	var TO_STRING_TAG_SUPPORT = requireToStringTagSupport();
+  	var isCallable = requireIsCallable();
+  	var classofRaw = requireClassofRaw();
+  	var wellKnownSymbol = requireWellKnownSymbol();
 
-  var isArray$1 = isArray$2;
-  var isConstructor = isConstructor$1;
-  var isObject$2 = isObject$8;
-  var wellKnownSymbol$6 = wellKnownSymbol$a;
+  	var TO_STRING_TAG = wellKnownSymbol('toStringTag');
+  	var $Object = Object;
 
-  var SPECIES$2 = wellKnownSymbol$6('species');
-  var $Array = Array;
+  	// ES3 wrong here
+  	var CORRECT_ARGUMENTS = classofRaw(function () { return arguments; }()) === 'Arguments';
 
-  // a part of `ArraySpeciesCreate` abstract operation
-  // https://tc39.es/ecma262/#sec-arrayspeciescreate
-  var arraySpeciesConstructor$1 = function (originalArray) {
-    var C;
-    if (isArray$1(originalArray)) {
-      C = originalArray.constructor;
-      // cross-realm fallback
-      if (isConstructor(C) && (C === $Array || isArray$1(C.prototype))) C = undefined;
-      else if (isObject$2(C)) {
-        C = C[SPECIES$2];
-        if (C === null) C = undefined;
-      }
-    } return C === undefined ? $Array : C;
-  };
+  	// fallback for IE11 Script Access Denied error
+  	var tryGet = function (it, key) {
+  	  try {
+  	    return it[key];
+  	  } catch (error) { /* empty */ }
+  	};
 
-  var arraySpeciesConstructor = arraySpeciesConstructor$1;
+  	// getting tag from ES6+ `Object.prototype.toString`
+  	classof = TO_STRING_TAG_SUPPORT ? classofRaw : function (it) {
+  	  var O, tag, result;
+  	  return it === undefined ? 'Undefined' : it === null ? 'Null'
+  	    // @@toStringTag case
+  	    : typeof (tag = tryGet(O = $Object(it), TO_STRING_TAG)) == 'string' ? tag
+  	    // builtinTag case
+  	    : CORRECT_ARGUMENTS ? classofRaw(O)
+  	    // ES3 arguments fallback
+  	    : (result = classofRaw(O)) === 'Object' && isCallable(O.callee) ? 'Arguments' : result;
+  	};
+  	return classof;
+  }
 
-  // `ArraySpeciesCreate` abstract operation
-  // https://tc39.es/ecma262/#sec-arrayspeciescreate
-  var arraySpeciesCreate$2 = function (originalArray, length) {
-    return new (arraySpeciesConstructor(originalArray))(length === 0 ? 0 : length);
-  };
+  var isConstructor;
+  var hasRequiredIsConstructor;
 
-  var fails$b = fails$l;
-  var wellKnownSymbol$5 = wellKnownSymbol$a;
-  var V8_VERSION$1 = engineV8Version;
+  function requireIsConstructor () {
+  	if (hasRequiredIsConstructor) return isConstructor;
+  	hasRequiredIsConstructor = 1;
+  	var uncurryThis = requireFunctionUncurryThis();
+  	var fails = requireFails();
+  	var isCallable = requireIsCallable();
+  	var classof = requireClassof();
+  	var getBuiltIn = requireGetBuiltIn();
+  	var inspectSource = requireInspectSource();
 
-  var SPECIES$1 = wellKnownSymbol$5('species');
+  	var noop = function () { /* empty */ };
+  	var construct = getBuiltIn('Reflect', 'construct');
+  	var constructorRegExp = /^\s*(?:class|function)\b/;
+  	var exec = uncurryThis(constructorRegExp.exec);
+  	var INCORRECT_TO_STRING = !constructorRegExp.test(noop);
 
-  var arrayMethodHasSpeciesSupport$2 = function (METHOD_NAME) {
-    // We can't use this feature detection in V8 since it causes
-    // deoptimization and serious performance degradation
-    // https://github.com/zloirock/core-js/issues/677
-    return V8_VERSION$1 >= 51 || !fails$b(function () {
-      var array = [];
-      var constructor = array.constructor = {};
-      constructor[SPECIES$1] = function () {
-        return { foo: 1 };
-      };
-      return array[METHOD_NAME](Boolean).foo !== 1;
-    });
-  };
+  	var isConstructorModern = function isConstructor(argument) {
+  	  if (!isCallable(argument)) return false;
+  	  try {
+  	    construct(noop, [], argument);
+  	    return true;
+  	  } catch (error) {
+  	    return false;
+  	  }
+  	};
 
-  var $$a = _export;
-  var fails$a = fails$l;
-  var isArray = isArray$2;
-  var isObject$1 = isObject$8;
-  var toObject$3 = toObject$5;
-  var lengthOfArrayLike$1 = lengthOfArrayLike$3;
-  var doesNotExceedSafeInteger = doesNotExceedSafeInteger$1;
-  var createProperty = createProperty$1;
-  var arraySpeciesCreate$1 = arraySpeciesCreate$2;
-  var arrayMethodHasSpeciesSupport$1 = arrayMethodHasSpeciesSupport$2;
-  var wellKnownSymbol$4 = wellKnownSymbol$a;
-  var V8_VERSION = engineV8Version;
+  	var isConstructorLegacy = function isConstructor(argument) {
+  	  if (!isCallable(argument)) return false;
+  	  switch (classof(argument)) {
+  	    case 'AsyncFunction':
+  	    case 'GeneratorFunction':
+  	    case 'AsyncGeneratorFunction': return false;
+  	  }
+  	  try {
+  	    // we can't check .prototype since constructors produced by .bind haven't it
+  	    // `Function#toString` throws on some built-it function in some legacy engines
+  	    // (for example, `DOMQuad` and similar in FF41-)
+  	    return INCORRECT_TO_STRING || !!exec(constructorRegExp, inspectSource(argument));
+  	  } catch (error) {
+  	    return true;
+  	  }
+  	};
 
-  var IS_CONCAT_SPREADABLE = wellKnownSymbol$4('isConcatSpreadable');
+  	isConstructorLegacy.sham = true;
 
-  // We can't use this feature detection in V8 since it causes
-  // deoptimization and serious performance degradation
-  // https://github.com/zloirock/core-js/issues/679
-  var IS_CONCAT_SPREADABLE_SUPPORT = V8_VERSION >= 51 || !fails$a(function () {
-    var array = [];
-    array[IS_CONCAT_SPREADABLE] = false;
-    return array.concat()[0] !== array;
-  });
+  	// `IsConstructor` abstract operation
+  	// https://tc39.es/ecma262/#sec-isconstructor
+  	isConstructor = !construct || fails(function () {
+  	  var called;
+  	  return isConstructorModern(isConstructorModern.call)
+  	    || !isConstructorModern(Object)
+  	    || !isConstructorModern(function () { called = true; })
+  	    || called;
+  	}) ? isConstructorLegacy : isConstructorModern;
+  	return isConstructor;
+  }
 
-  var isConcatSpreadable = function (O) {
-    if (!isObject$1(O)) return false;
-    var spreadable = O[IS_CONCAT_SPREADABLE];
-    return spreadable !== undefined ? !!spreadable : isArray(O);
-  };
+  var arraySpeciesConstructor;
+  var hasRequiredArraySpeciesConstructor;
 
-  var FORCED$2 = !IS_CONCAT_SPREADABLE_SUPPORT || !arrayMethodHasSpeciesSupport$1('concat');
+  function requireArraySpeciesConstructor () {
+  	if (hasRequiredArraySpeciesConstructor) return arraySpeciesConstructor;
+  	hasRequiredArraySpeciesConstructor = 1;
+  	var isArray = requireIsArray();
+  	var isConstructor = requireIsConstructor();
+  	var isObject = requireIsObject();
+  	var wellKnownSymbol = requireWellKnownSymbol();
 
-  // `Array.prototype.concat` method
-  // https://tc39.es/ecma262/#sec-array.prototype.concat
-  // with adding support of @@isConcatSpreadable and @@species
-  $$a({ target: 'Array', proto: true, arity: 1, forced: FORCED$2 }, {
-    // eslint-disable-next-line no-unused-vars -- required for `.length`
-    concat: function concat(arg) {
-      var O = toObject$3(this);
-      var A = arraySpeciesCreate$1(O, 0);
-      var n = 0;
-      var i, k, length, len, E;
-      for (i = -1, length = arguments.length; i < length; i++) {
-        E = i === -1 ? O : arguments[i];
-        if (isConcatSpreadable(E)) {
-          len = lengthOfArrayLike$1(E);
-          doesNotExceedSafeInteger(n + len);
-          for (k = 0; k < len; k++, n++) if (k in E) createProperty(A, n, E[k]);
-        } else {
-          doesNotExceedSafeInteger(n + 1);
-          createProperty(A, n++, E);
-        }
-      }
-      A.length = n;
-      return A;
-    }
-  });
+  	var SPECIES = wellKnownSymbol('species');
+  	var $Array = Array;
 
-  var classofRaw = classofRaw$2;
-  var uncurryThis$9 = functionUncurryThis;
+  	// a part of `ArraySpeciesCreate` abstract operation
+  	// https://tc39.es/ecma262/#sec-arrayspeciescreate
+  	arraySpeciesConstructor = function (originalArray) {
+  	  var C;
+  	  if (isArray(originalArray)) {
+  	    C = originalArray.constructor;
+  	    // cross-realm fallback
+  	    if (isConstructor(C) && (C === $Array || isArray(C.prototype))) C = undefined;
+  	    else if (isObject(C)) {
+  	      C = C[SPECIES];
+  	      if (C === null) C = undefined;
+  	    }
+  	  } return C === undefined ? $Array : C;
+  	};
+  	return arraySpeciesConstructor;
+  }
 
-  var functionUncurryThisClause = function (fn) {
-    // Nashorn bug:
-    //   https://github.com/zloirock/core-js/issues/1128
-    //   https://github.com/zloirock/core-js/issues/1130
-    if (classofRaw(fn) === 'Function') return uncurryThis$9(fn);
-  };
+  var arraySpeciesCreate;
+  var hasRequiredArraySpeciesCreate;
 
-  var uncurryThis$8 = functionUncurryThisClause;
-  var aCallable = aCallable$2;
-  var NATIVE_BIND = functionBindNative;
+  function requireArraySpeciesCreate () {
+  	if (hasRequiredArraySpeciesCreate) return arraySpeciesCreate;
+  	hasRequiredArraySpeciesCreate = 1;
+  	var arraySpeciesConstructor = requireArraySpeciesConstructor();
 
-  var bind$1 = uncurryThis$8(uncurryThis$8.bind);
+  	// `ArraySpeciesCreate` abstract operation
+  	// https://tc39.es/ecma262/#sec-arrayspeciescreate
+  	arraySpeciesCreate = function (originalArray, length) {
+  	  return new (arraySpeciesConstructor(originalArray))(length === 0 ? 0 : length);
+  	};
+  	return arraySpeciesCreate;
+  }
 
-  // optional / simple context binding
-  var functionBindContext = function (fn, that) {
-    aCallable(fn);
-    return that === undefined ? fn : NATIVE_BIND ? bind$1(fn, that) : function (/* ...args */) {
-      return fn.apply(that, arguments);
-    };
-  };
+  var arrayMethodHasSpeciesSupport;
+  var hasRequiredArrayMethodHasSpeciesSupport;
 
-  var bind = functionBindContext;
-  var uncurryThis$7 = functionUncurryThis;
-  var IndexedObject$2 = indexedObject;
-  var toObject$2 = toObject$5;
-  var lengthOfArrayLike = lengthOfArrayLike$3;
-  var arraySpeciesCreate = arraySpeciesCreate$2;
+  function requireArrayMethodHasSpeciesSupport () {
+  	if (hasRequiredArrayMethodHasSpeciesSupport) return arrayMethodHasSpeciesSupport;
+  	hasRequiredArrayMethodHasSpeciesSupport = 1;
+  	var fails = requireFails();
+  	var wellKnownSymbol = requireWellKnownSymbol();
+  	var V8_VERSION = requireEnvironmentV8Version();
 
-  var push$1 = uncurryThis$7([].push);
+  	var SPECIES = wellKnownSymbol('species');
 
-  // `Array.prototype.{ forEach, map, filter, some, every, find, findIndex, filterReject }` methods implementation
-  var createMethod$2 = function (TYPE) {
-    var IS_MAP = TYPE === 1;
-    var IS_FILTER = TYPE === 2;
-    var IS_SOME = TYPE === 3;
-    var IS_EVERY = TYPE === 4;
-    var IS_FIND_INDEX = TYPE === 6;
-    var IS_FILTER_REJECT = TYPE === 7;
-    var NO_HOLES = TYPE === 5 || IS_FIND_INDEX;
-    return function ($this, callbackfn, that, specificCreate) {
-      var O = toObject$2($this);
-      var self = IndexedObject$2(O);
-      var length = lengthOfArrayLike(self);
-      var boundFunction = bind(callbackfn, that);
-      var index = 0;
-      var create = specificCreate || arraySpeciesCreate;
-      var target = IS_MAP ? create($this, length) : IS_FILTER || IS_FILTER_REJECT ? create($this, 0) : undefined;
-      var value, result;
-      for (;length > index; index++) if (NO_HOLES || index in self) {
-        value = self[index];
-        result = boundFunction(value, index, O);
-        if (TYPE) {
-          if (IS_MAP) target[index] = result; // map
-          else if (result) switch (TYPE) {
-            case 3: return true;              // some
-            case 5: return value;             // find
-            case 6: return index;             // findIndex
-            case 2: push$1(target, value);      // filter
-          } else switch (TYPE) {
-            case 4: return false;             // every
-            case 7: push$1(target, value);      // filterReject
-          }
-        }
-      }
-      return IS_FIND_INDEX ? -1 : IS_SOME || IS_EVERY ? IS_EVERY : target;
-    };
-  };
+  	arrayMethodHasSpeciesSupport = function (METHOD_NAME) {
+  	  // We can't use this feature detection in V8 since it causes
+  	  // deoptimization and serious performance degradation
+  	  // https://github.com/zloirock/core-js/issues/677
+  	  return V8_VERSION >= 51 || !fails(function () {
+  	    var array = [];
+  	    var constructor = array.constructor = {};
+  	    constructor[SPECIES] = function () {
+  	      return { foo: 1 };
+  	    };
+  	    return array[METHOD_NAME](Boolean).foo !== 1;
+  	  });
+  	};
+  	return arrayMethodHasSpeciesSupport;
+  }
 
-  var arrayIteration = {
-    // `Array.prototype.forEach` method
-    // https://tc39.es/ecma262/#sec-array.prototype.foreach
-    forEach: createMethod$2(0),
-    // `Array.prototype.map` method
-    // https://tc39.es/ecma262/#sec-array.prototype.map
-    map: createMethod$2(1),
-    // `Array.prototype.filter` method
-    // https://tc39.es/ecma262/#sec-array.prototype.filter
-    filter: createMethod$2(2),
-    // `Array.prototype.some` method
-    // https://tc39.es/ecma262/#sec-array.prototype.some
-    some: createMethod$2(3),
-    // `Array.prototype.every` method
-    // https://tc39.es/ecma262/#sec-array.prototype.every
-    every: createMethod$2(4),
-    // `Array.prototype.find` method
-    // https://tc39.es/ecma262/#sec-array.prototype.find
-    find: createMethod$2(5),
-    // `Array.prototype.findIndex` method
-    // https://tc39.es/ecma262/#sec-array.prototype.findIndex
-    findIndex: createMethod$2(6),
-    // `Array.prototype.filterReject` method
-    // https://github.com/tc39/proposal-array-filtering
-    filterReject: createMethod$2(7)
-  };
+  var hasRequiredEs_array_concat;
 
-  var $$9 = _export;
-  var $filter = arrayIteration.filter;
-  var arrayMethodHasSpeciesSupport = arrayMethodHasSpeciesSupport$2;
+  function requireEs_array_concat () {
+  	if (hasRequiredEs_array_concat) return es_array_concat;
+  	hasRequiredEs_array_concat = 1;
+  	var $ = require_export();
+  	var fails = requireFails();
+  	var isArray = requireIsArray();
+  	var isObject = requireIsObject();
+  	var toObject = requireToObject();
+  	var lengthOfArrayLike = requireLengthOfArrayLike();
+  	var doesNotExceedSafeInteger = requireDoesNotExceedSafeInteger();
+  	var createProperty = requireCreateProperty();
+  	var arraySpeciesCreate = requireArraySpeciesCreate();
+  	var arrayMethodHasSpeciesSupport = requireArrayMethodHasSpeciesSupport();
+  	var wellKnownSymbol = requireWellKnownSymbol();
+  	var V8_VERSION = requireEnvironmentV8Version();
 
-  var HAS_SPECIES_SUPPORT = arrayMethodHasSpeciesSupport('filter');
+  	var IS_CONCAT_SPREADABLE = wellKnownSymbol('isConcatSpreadable');
 
-  // `Array.prototype.filter` method
-  // https://tc39.es/ecma262/#sec-array.prototype.filter
-  // with adding support of @@species
-  $$9({ target: 'Array', proto: true, forced: !HAS_SPECIES_SUPPORT }, {
-    filter: function filter(callbackfn /* , thisArg */) {
-      return $filter(this, callbackfn, arguments.length > 1 ? arguments[1] : undefined);
-    }
-  });
+  	// We can't use this feature detection in V8 since it causes
+  	// deoptimization and serious performance degradation
+  	// https://github.com/zloirock/core-js/issues/679
+  	var IS_CONCAT_SPREADABLE_SUPPORT = V8_VERSION >= 51 || !fails(function () {
+  	  var array = [];
+  	  array[IS_CONCAT_SPREADABLE] = false;
+  	  return array.concat()[0] !== array;
+  	});
+
+  	var isConcatSpreadable = function (O) {
+  	  if (!isObject(O)) return false;
+  	  var spreadable = O[IS_CONCAT_SPREADABLE];
+  	  return spreadable !== undefined ? !!spreadable : isArray(O);
+  	};
+
+  	var FORCED = !IS_CONCAT_SPREADABLE_SUPPORT || !arrayMethodHasSpeciesSupport('concat');
+
+  	// `Array.prototype.concat` method
+  	// https://tc39.es/ecma262/#sec-array.prototype.concat
+  	// with adding support of @@isConcatSpreadable and @@species
+  	$({ target: 'Array', proto: true, arity: 1, forced: FORCED }, {
+  	  // eslint-disable-next-line no-unused-vars -- required for `.length`
+  	  concat: function concat(arg) {
+  	    var O = toObject(this);
+  	    var A = arraySpeciesCreate(O, 0);
+  	    var n = 0;
+  	    var i, k, length, len, E;
+  	    for (i = -1, length = arguments.length; i < length; i++) {
+  	      E = i === -1 ? O : arguments[i];
+  	      if (isConcatSpreadable(E)) {
+  	        len = lengthOfArrayLike(E);
+  	        doesNotExceedSafeInteger(n + len);
+  	        for (k = 0; k < len; k++, n++) if (k in E) createProperty(A, n, E[k]);
+  	      } else {
+  	        doesNotExceedSafeInteger(n + 1);
+  	        createProperty(A, n++, E);
+  	      }
+  	    }
+  	    A.length = n;
+  	    return A;
+  	  }
+  	});
+  	return es_array_concat;
+  }
+
+  requireEs_array_concat();
+
+  var es_array_filter = {};
+
+  var functionUncurryThisClause;
+  var hasRequiredFunctionUncurryThisClause;
+
+  function requireFunctionUncurryThisClause () {
+  	if (hasRequiredFunctionUncurryThisClause) return functionUncurryThisClause;
+  	hasRequiredFunctionUncurryThisClause = 1;
+  	var classofRaw = requireClassofRaw();
+  	var uncurryThis = requireFunctionUncurryThis();
+
+  	functionUncurryThisClause = function (fn) {
+  	  // Nashorn bug:
+  	  //   https://github.com/zloirock/core-js/issues/1128
+  	  //   https://github.com/zloirock/core-js/issues/1130
+  	  if (classofRaw(fn) === 'Function') return uncurryThis(fn);
+  	};
+  	return functionUncurryThisClause;
+  }
+
+  var functionBindContext;
+  var hasRequiredFunctionBindContext;
+
+  function requireFunctionBindContext () {
+  	if (hasRequiredFunctionBindContext) return functionBindContext;
+  	hasRequiredFunctionBindContext = 1;
+  	var uncurryThis = requireFunctionUncurryThisClause();
+  	var aCallable = requireACallable();
+  	var NATIVE_BIND = requireFunctionBindNative();
+
+  	var bind = uncurryThis(uncurryThis.bind);
+
+  	// optional / simple context binding
+  	functionBindContext = function (fn, that) {
+  	  aCallable(fn);
+  	  return that === undefined ? fn : NATIVE_BIND ? bind(fn, that) : function (/* ...args */) {
+  	    return fn.apply(that, arguments);
+  	  };
+  	};
+  	return functionBindContext;
+  }
+
+  var arrayIteration;
+  var hasRequiredArrayIteration;
+
+  function requireArrayIteration () {
+  	if (hasRequiredArrayIteration) return arrayIteration;
+  	hasRequiredArrayIteration = 1;
+  	var bind = requireFunctionBindContext();
+  	var uncurryThis = requireFunctionUncurryThis();
+  	var IndexedObject = requireIndexedObject();
+  	var toObject = requireToObject();
+  	var lengthOfArrayLike = requireLengthOfArrayLike();
+  	var arraySpeciesCreate = requireArraySpeciesCreate();
+
+  	var push = uncurryThis([].push);
+
+  	// `Array.prototype.{ forEach, map, filter, some, every, find, findIndex, filterReject }` methods implementation
+  	var createMethod = function (TYPE) {
+  	  var IS_MAP = TYPE === 1;
+  	  var IS_FILTER = TYPE === 2;
+  	  var IS_SOME = TYPE === 3;
+  	  var IS_EVERY = TYPE === 4;
+  	  var IS_FIND_INDEX = TYPE === 6;
+  	  var IS_FILTER_REJECT = TYPE === 7;
+  	  var NO_HOLES = TYPE === 5 || IS_FIND_INDEX;
+  	  return function ($this, callbackfn, that, specificCreate) {
+  	    var O = toObject($this);
+  	    var self = IndexedObject(O);
+  	    var length = lengthOfArrayLike(self);
+  	    var boundFunction = bind(callbackfn, that);
+  	    var index = 0;
+  	    var create = specificCreate || arraySpeciesCreate;
+  	    var target = IS_MAP ? create($this, length) : IS_FILTER || IS_FILTER_REJECT ? create($this, 0) : undefined;
+  	    var value, result;
+  	    for (;length > index; index++) if (NO_HOLES || index in self) {
+  	      value = self[index];
+  	      result = boundFunction(value, index, O);
+  	      if (TYPE) {
+  	        if (IS_MAP) target[index] = result; // map
+  	        else if (result) switch (TYPE) {
+  	          case 3: return true;              // some
+  	          case 5: return value;             // find
+  	          case 6: return index;             // findIndex
+  	          case 2: push(target, value);      // filter
+  	        } else switch (TYPE) {
+  	          case 4: return false;             // every
+  	          case 7: push(target, value);      // filterReject
+  	        }
+  	      }
+  	    }
+  	    return IS_FIND_INDEX ? -1 : IS_SOME || IS_EVERY ? IS_EVERY : target;
+  	  };
+  	};
+
+  	arrayIteration = {
+  	  // `Array.prototype.forEach` method
+  	  // https://tc39.es/ecma262/#sec-array.prototype.foreach
+  	  forEach: createMethod(0),
+  	  // `Array.prototype.map` method
+  	  // https://tc39.es/ecma262/#sec-array.prototype.map
+  	  map: createMethod(1),
+  	  // `Array.prototype.filter` method
+  	  // https://tc39.es/ecma262/#sec-array.prototype.filter
+  	  filter: createMethod(2),
+  	  // `Array.prototype.some` method
+  	  // https://tc39.es/ecma262/#sec-array.prototype.some
+  	  some: createMethod(3),
+  	  // `Array.prototype.every` method
+  	  // https://tc39.es/ecma262/#sec-array.prototype.every
+  	  every: createMethod(4),
+  	  // `Array.prototype.find` method
+  	  // https://tc39.es/ecma262/#sec-array.prototype.find
+  	  find: createMethod(5),
+  	  // `Array.prototype.findIndex` method
+  	  // https://tc39.es/ecma262/#sec-array.prototype.findIndex
+  	  findIndex: createMethod(6),
+  	  // `Array.prototype.filterReject` method
+  	  // https://github.com/tc39/proposal-array-filtering
+  	  filterReject: createMethod(7)
+  	};
+  	return arrayIteration;
+  }
+
+  var hasRequiredEs_array_filter;
+
+  function requireEs_array_filter () {
+  	if (hasRequiredEs_array_filter) return es_array_filter;
+  	hasRequiredEs_array_filter = 1;
+  	var $ = require_export();
+  	var $filter = requireArrayIteration().filter;
+  	var arrayMethodHasSpeciesSupport = requireArrayMethodHasSpeciesSupport();
+
+  	var HAS_SPECIES_SUPPORT = arrayMethodHasSpeciesSupport('filter');
+
+  	// `Array.prototype.filter` method
+  	// https://tc39.es/ecma262/#sec-array.prototype.filter
+  	// with adding support of @@species
+  	$({ target: 'Array', proto: true, forced: !HAS_SPECIES_SUPPORT }, {
+  	  filter: function filter(callbackfn /* , thisArg */) {
+  	    return $filter(this, callbackfn, arguments.length > 1 ? arguments[1] : undefined);
+  	  }
+  	});
+  	return es_array_filter;
+  }
+
+  requireEs_array_filter();
+
+  var es_array_find = {};
 
   var objectDefineProperties = {};
 
-  var internalObjectKeys = objectKeysInternal;
-  var enumBugKeys$1 = enumBugKeys$3;
+  var objectKeys;
+  var hasRequiredObjectKeys;
 
-  // `Object.keys` method
-  // https://tc39.es/ecma262/#sec-object.keys
-  // eslint-disable-next-line es/no-object-keys -- safe
-  var objectKeys$3 = Object.keys || function keys(O) {
-    return internalObjectKeys(O, enumBugKeys$1);
-  };
+  function requireObjectKeys () {
+  	if (hasRequiredObjectKeys) return objectKeys;
+  	hasRequiredObjectKeys = 1;
+  	var internalObjectKeys = requireObjectKeysInternal();
+  	var enumBugKeys = requireEnumBugKeys();
 
-  var DESCRIPTORS$2 = descriptors;
-  var V8_PROTOTYPE_DEFINE_BUG = v8PrototypeDefineBug;
-  var definePropertyModule = objectDefineProperty;
-  var anObject$4 = anObject$7;
-  var toIndexedObject$2 = toIndexedObject$6;
-  var objectKeys$2 = objectKeys$3;
-
-  // `Object.defineProperties` method
-  // https://tc39.es/ecma262/#sec-object.defineproperties
-  // eslint-disable-next-line es/no-object-defineproperties -- safe
-  objectDefineProperties.f = DESCRIPTORS$2 && !V8_PROTOTYPE_DEFINE_BUG ? Object.defineProperties : function defineProperties(O, Properties) {
-    anObject$4(O);
-    var props = toIndexedObject$2(Properties);
-    var keys = objectKeys$2(Properties);
-    var length = keys.length;
-    var index = 0;
-    var key;
-    while (length > index) definePropertyModule.f(O, key = keys[index++], props[key]);
-    return O;
-  };
-
-  var getBuiltIn = getBuiltIn$4;
-
-  var html$1 = getBuiltIn('document', 'documentElement');
-
-  /* global ActiveXObject -- old IE, WSH */
-  var anObject$3 = anObject$7;
-  var definePropertiesModule = objectDefineProperties;
-  var enumBugKeys = enumBugKeys$3;
-  var hiddenKeys = hiddenKeys$4;
-  var html = html$1;
-  var documentCreateElement = documentCreateElement$1;
-  var sharedKey$1 = sharedKey$3;
-
-  var GT = '>';
-  var LT = '<';
-  var PROTOTYPE = 'prototype';
-  var SCRIPT = 'script';
-  var IE_PROTO$1 = sharedKey$1('IE_PROTO');
-
-  var EmptyConstructor = function () { /* empty */ };
-
-  var scriptTag = function (content) {
-    return LT + SCRIPT + GT + content + LT + '/' + SCRIPT + GT;
-  };
-
-  // Create object with fake `null` prototype: use ActiveX Object with cleared prototype
-  var NullProtoObjectViaActiveX = function (activeXDocument) {
-    activeXDocument.write(scriptTag(''));
-    activeXDocument.close();
-    var temp = activeXDocument.parentWindow.Object;
-    activeXDocument = null; // avoid memory leak
-    return temp;
-  };
-
-  // Create object with fake `null` prototype: use iframe Object with cleared prototype
-  var NullProtoObjectViaIFrame = function () {
-    // Thrash, waste and sodomy: IE GC bug
-    var iframe = documentCreateElement('iframe');
-    var JS = 'java' + SCRIPT + ':';
-    var iframeDocument;
-    iframe.style.display = 'none';
-    html.appendChild(iframe);
-    // https://github.com/zloirock/core-js/issues/475
-    iframe.src = String(JS);
-    iframeDocument = iframe.contentWindow.document;
-    iframeDocument.open();
-    iframeDocument.write(scriptTag('document.F=Object'));
-    iframeDocument.close();
-    return iframeDocument.F;
-  };
-
-  // Check for document.domain and active x support
-  // No need to use active x approach when document.domain is not set
-  // see https://github.com/es-shims/es5-shim/issues/150
-  // variation of https://github.com/kitcambridge/es5-shim/commit/4f738ac066346
-  // avoid IE GC bug
-  var activeXDocument;
-  var NullProtoObject = function () {
-    try {
-      activeXDocument = new ActiveXObject('htmlfile');
-    } catch (error) { /* ignore */ }
-    NullProtoObject = typeof document != 'undefined'
-      ? document.domain && activeXDocument
-        ? NullProtoObjectViaActiveX(activeXDocument) // old IE
-        : NullProtoObjectViaIFrame()
-      : NullProtoObjectViaActiveX(activeXDocument); // WSH
-    var length = enumBugKeys.length;
-    while (length--) delete NullProtoObject[PROTOTYPE][enumBugKeys[length]];
-    return NullProtoObject();
-  };
-
-  hiddenKeys[IE_PROTO$1] = true;
-
-  // `Object.create` method
-  // https://tc39.es/ecma262/#sec-object.create
-  // eslint-disable-next-line es/no-object-create -- safe
-  var objectCreate = Object.create || function create(O, Properties) {
-    var result;
-    if (O !== null) {
-      EmptyConstructor[PROTOTYPE] = anObject$3(O);
-      result = new EmptyConstructor();
-      EmptyConstructor[PROTOTYPE] = null;
-      // add "__proto__" for Object.getPrototypeOf polyfill
-      result[IE_PROTO$1] = O;
-    } else result = NullProtoObject();
-    return Properties === undefined ? result : definePropertiesModule.f(result, Properties);
-  };
-
-  var wellKnownSymbol$3 = wellKnownSymbol$a;
-  var create$1 = objectCreate;
-  var defineProperty$1 = objectDefineProperty.f;
-
-  var UNSCOPABLES = wellKnownSymbol$3('unscopables');
-  var ArrayPrototype = Array.prototype;
-
-  // Array.prototype[@@unscopables]
-  // https://tc39.es/ecma262/#sec-array.prototype-@@unscopables
-  if (ArrayPrototype[UNSCOPABLES] === undefined) {
-    defineProperty$1(ArrayPrototype, UNSCOPABLES, {
-      configurable: true,
-      value: create$1(null)
-    });
+  	// `Object.keys` method
+  	// https://tc39.es/ecma262/#sec-object.keys
+  	// eslint-disable-next-line es/no-object-keys -- safe
+  	objectKeys = Object.keys || function keys(O) {
+  	  return internalObjectKeys(O, enumBugKeys);
+  	};
+  	return objectKeys;
   }
 
-  // add a key to Array.prototype[@@unscopables]
-  var addToUnscopables$2 = function (key) {
-    ArrayPrototype[UNSCOPABLES][key] = true;
-  };
+  var hasRequiredObjectDefineProperties;
 
-  var $$8 = _export;
-  var $find = arrayIteration.find;
-  var addToUnscopables$1 = addToUnscopables$2;
+  function requireObjectDefineProperties () {
+  	if (hasRequiredObjectDefineProperties) return objectDefineProperties;
+  	hasRequiredObjectDefineProperties = 1;
+  	var DESCRIPTORS = requireDescriptors();
+  	var V8_PROTOTYPE_DEFINE_BUG = requireV8PrototypeDefineBug();
+  	var definePropertyModule = requireObjectDefineProperty();
+  	var anObject = requireAnObject();
+  	var toIndexedObject = requireToIndexedObject();
+  	var objectKeys = requireObjectKeys();
 
-  var FIND = 'find';
-  var SKIPS_HOLES = true;
-
-  // Shouldn't skip holes
-  // eslint-disable-next-line es/no-array-prototype-find -- testing
-  if (FIND in []) Array(1)[FIND](function () { SKIPS_HOLES = false; });
-
-  // `Array.prototype.find` method
-  // https://tc39.es/ecma262/#sec-array.prototype.find
-  $$8({ target: 'Array', proto: true, forced: SKIPS_HOLES }, {
-    find: function find(callbackfn /* , that = undefined */) {
-      return $find(this, callbackfn, arguments.length > 1 ? arguments[1] : undefined);
-    }
-  });
-
-  // https://tc39.es/ecma262/#sec-array.prototype-@@unscopables
-  addToUnscopables$1(FIND);
-
-  var $$7 = _export;
-  var $includes = arrayIncludes.includes;
-  var fails$9 = fails$l;
-  var addToUnscopables = addToUnscopables$2;
-
-  // FF99+ bug
-  var BROKEN_ON_SPARSE = fails$9(function () {
-    // eslint-disable-next-line es/no-array-prototype-includes -- detection
-    return !Array(1).includes();
-  });
-
-  // `Array.prototype.includes` method
-  // https://tc39.es/ecma262/#sec-array.prototype.includes
-  $$7({ target: 'Array', proto: true, forced: BROKEN_ON_SPARSE }, {
-    includes: function includes(el /* , fromIndex = 0 */) {
-      return $includes(this, el, arguments.length > 1 ? arguments[1] : undefined);
-    }
-  });
-
-  // https://tc39.es/ecma262/#sec-array.prototype-@@unscopables
-  addToUnscopables('includes');
-
-  var fails$8 = fails$l;
-
-  var arrayMethodIsStrict$2 = function (METHOD_NAME, argument) {
-    var method = [][METHOD_NAME];
-    return !!method && fails$8(function () {
-      // eslint-disable-next-line no-useless-call -- required for testing
-      method.call(null, argument || function () { return 1; }, 1);
-    });
-  };
-
-  /* eslint-disable es/no-array-prototype-indexof -- required for testing */
-  var $$6 = _export;
-  var uncurryThis$6 = functionUncurryThisClause;
-  var $indexOf = arrayIncludes.indexOf;
-  var arrayMethodIsStrict$1 = arrayMethodIsStrict$2;
-
-  var nativeIndexOf = uncurryThis$6([].indexOf);
-
-  var NEGATIVE_ZERO = !!nativeIndexOf && 1 / nativeIndexOf([1], 1, -0) < 0;
-  var FORCED$1 = NEGATIVE_ZERO || !arrayMethodIsStrict$1('indexOf');
-
-  // `Array.prototype.indexOf` method
-  // https://tc39.es/ecma262/#sec-array.prototype.indexof
-  $$6({ target: 'Array', proto: true, forced: FORCED$1 }, {
-    indexOf: function indexOf(searchElement /* , fromIndex = 0 */) {
-      var fromIndex = arguments.length > 1 ? arguments[1] : undefined;
-      return NEGATIVE_ZERO
-        // convert -0 to +0
-        ? nativeIndexOf(this, searchElement, fromIndex) || 0
-        : $indexOf(this, searchElement, fromIndex);
-    }
-  });
-
-  var $$5 = _export;
-  var uncurryThis$5 = functionUncurryThis;
-  var IndexedObject$1 = indexedObject;
-  var toIndexedObject$1 = toIndexedObject$6;
-  var arrayMethodIsStrict = arrayMethodIsStrict$2;
-
-  var nativeJoin = uncurryThis$5([].join);
-
-  var ES3_STRINGS = IndexedObject$1 !== Object;
-  var FORCED = ES3_STRINGS || !arrayMethodIsStrict('join', ',');
-
-  // `Array.prototype.join` method
-  // https://tc39.es/ecma262/#sec-array.prototype.join
-  $$5({ target: 'Array', proto: true, forced: FORCED }, {
-    join: function join(separator) {
-      return nativeJoin(toIndexedObject$1(this), separator === undefined ? ',' : separator);
-    }
-  });
-
-  var DESCRIPTORS$1 = descriptors;
-  var uncurryThis$4 = functionUncurryThis;
-  var call$4 = functionCall;
-  var fails$7 = fails$l;
-  var objectKeys$1 = objectKeys$3;
-  var getOwnPropertySymbolsModule = objectGetOwnPropertySymbols;
-  var propertyIsEnumerableModule = objectPropertyIsEnumerable;
-  var toObject$1 = toObject$5;
-  var IndexedObject = indexedObject;
-
-  // eslint-disable-next-line es/no-object-assign -- safe
-  var $assign = Object.assign;
-  // eslint-disable-next-line es/no-object-defineproperty -- required for testing
-  var defineProperty = Object.defineProperty;
-  var concat = uncurryThis$4([].concat);
-
-  // `Object.assign` method
-  // https://tc39.es/ecma262/#sec-object.assign
-  var objectAssign = !$assign || fails$7(function () {
-    // should have correct order of operations (Edge bug)
-    if (DESCRIPTORS$1 && $assign({ b: 1 }, $assign(defineProperty({}, 'a', {
-      enumerable: true,
-      get: function () {
-        defineProperty(this, 'b', {
-          value: 3,
-          enumerable: false
-        });
-      }
-    }), { b: 2 })).b !== 1) return true;
-    // should work with symbols and should have deterministic property order (V8 bug)
-    var A = {};
-    var B = {};
-    // eslint-disable-next-line es/no-symbol -- safe
-    var symbol = Symbol('assign detection');
-    var alphabet = 'abcdefghijklmnopqrst';
-    A[symbol] = 7;
-    alphabet.split('').forEach(function (chr) { B[chr] = chr; });
-    return $assign({}, A)[symbol] !== 7 || objectKeys$1($assign({}, B)).join('') !== alphabet;
-  }) ? function assign(target, source) { // eslint-disable-line no-unused-vars -- required for `.length`
-    var T = toObject$1(target);
-    var argumentsLength = arguments.length;
-    var index = 1;
-    var getOwnPropertySymbols = getOwnPropertySymbolsModule.f;
-    var propertyIsEnumerable = propertyIsEnumerableModule.f;
-    while (argumentsLength > index) {
-      var S = IndexedObject(arguments[index++]);
-      var keys = getOwnPropertySymbols ? concat(objectKeys$1(S), getOwnPropertySymbols(S)) : objectKeys$1(S);
-      var length = keys.length;
-      var j = 0;
-      var key;
-      while (length > j) {
-        key = keys[j++];
-        if (!DESCRIPTORS$1 || call$4(propertyIsEnumerable, S, key)) T[key] = S[key];
-      }
-    } return T;
-  } : $assign;
-
-  var $$4 = _export;
-  var assign = objectAssign;
-
-  // `Object.assign` method
-  // https://tc39.es/ecma262/#sec-object.assign
-  // eslint-disable-next-line es/no-object-assign -- required for testing
-  $$4({ target: 'Object', stat: true, arity: 2, forced: Object.assign !== assign }, {
-    assign: assign
-  });
-
-  var fails$6 = fails$l;
-
-  var correctPrototypeGetter = !fails$6(function () {
-    function F() { /* empty */ }
-    F.prototype.constructor = null;
-    // eslint-disable-next-line es/no-object-getprototypeof -- required for testing
-    return Object.getPrototypeOf(new F()) !== F.prototype;
-  });
-
-  var hasOwn = hasOwnProperty_1;
-  var isCallable$1 = isCallable$e;
-  var toObject = toObject$5;
-  var sharedKey = sharedKey$3;
-  var CORRECT_PROTOTYPE_GETTER = correctPrototypeGetter;
-
-  var IE_PROTO = sharedKey('IE_PROTO');
-  var $Object = Object;
-  var ObjectPrototype = $Object.prototype;
-
-  // `Object.getPrototypeOf` method
-  // https://tc39.es/ecma262/#sec-object.getprototypeof
-  // eslint-disable-next-line es/no-object-getprototypeof -- safe
-  var objectGetPrototypeOf$1 = CORRECT_PROTOTYPE_GETTER ? $Object.getPrototypeOf : function (O) {
-    var object = toObject(O);
-    if (hasOwn(object, IE_PROTO)) return object[IE_PROTO];
-    var constructor = object.constructor;
-    if (isCallable$1(constructor) && object instanceof constructor) {
-      return constructor.prototype;
-    } return object instanceof $Object ? ObjectPrototype : null;
-  };
-
-  var DESCRIPTORS = descriptors;
-  var fails$5 = fails$l;
-  var uncurryThis$3 = functionUncurryThis;
-  var objectGetPrototypeOf = objectGetPrototypeOf$1;
-  var objectKeys = objectKeys$3;
-  var toIndexedObject = toIndexedObject$6;
-  var $propertyIsEnumerable = objectPropertyIsEnumerable.f;
-
-  var propertyIsEnumerable = uncurryThis$3($propertyIsEnumerable);
-  var push = uncurryThis$3([].push);
-
-  // in some IE versions, `propertyIsEnumerable` returns incorrect result on integer keys
-  // of `null` prototype objects
-  var IE_BUG = DESCRIPTORS && fails$5(function () {
-    // eslint-disable-next-line es/no-object-create -- safe
-    var O = Object.create(null);
-    O[2] = 2;
-    return !propertyIsEnumerable(O, 2);
-  });
-
-  // `Object.{ entries, values }` methods implementation
-  var createMethod$1 = function (TO_ENTRIES) {
-    return function (it) {
-      var O = toIndexedObject(it);
-      var keys = objectKeys(O);
-      var IE_WORKAROUND = IE_BUG && objectGetPrototypeOf(O) === null;
-      var length = keys.length;
-      var i = 0;
-      var result = [];
-      var key;
-      while (length > i) {
-        key = keys[i++];
-        if (!DESCRIPTORS || (IE_WORKAROUND ? key in O : propertyIsEnumerable(O, key))) {
-          push(result, TO_ENTRIES ? [key, O[key]] : O[key]);
-        }
-      }
-      return result;
-    };
-  };
-
-  var objectToArray = {
-    // `Object.entries` method
-    // https://tc39.es/ecma262/#sec-object.entries
-    entries: createMethod$1(true),
-    // `Object.values` method
-    // https://tc39.es/ecma262/#sec-object.values
-    values: createMethod$1(false)
-  };
-
-  var $$3 = _export;
-  var $entries = objectToArray.entries;
-
-  // `Object.entries` method
-  // https://tc39.es/ecma262/#sec-object.entries
-  $$3({ target: 'Object', stat: true }, {
-    entries: function entries(O) {
-      return $entries(O);
-    }
-  });
-
-  var TO_STRING_TAG_SUPPORT$1 = toStringTagSupport;
-  var classof$3 = classof$5;
-
-  // `Object.prototype.toString` method implementation
-  // https://tc39.es/ecma262/#sec-object.prototype.tostring
-  var objectToString = TO_STRING_TAG_SUPPORT$1 ? {}.toString : function toString() {
-    return '[object ' + classof$3(this) + ']';
-  };
-
-  var TO_STRING_TAG_SUPPORT = toStringTagSupport;
-  var defineBuiltIn$1 = defineBuiltIn$3;
-  var toString$5 = objectToString;
-
-  // `Object.prototype.toString` method
-  // https://tc39.es/ecma262/#sec-object.prototype.tostring
-  if (!TO_STRING_TAG_SUPPORT) {
-    defineBuiltIn$1(Object.prototype, 'toString', toString$5, { unsafe: true });
+  	// `Object.defineProperties` method
+  	// https://tc39.es/ecma262/#sec-object.defineproperties
+  	// eslint-disable-next-line es/no-object-defineproperties -- safe
+  	objectDefineProperties.f = DESCRIPTORS && !V8_PROTOTYPE_DEFINE_BUG ? Object.defineProperties : function defineProperties(O, Properties) {
+  	  anObject(O);
+  	  var props = toIndexedObject(Properties);
+  	  var keys = objectKeys(Properties);
+  	  var length = keys.length;
+  	  var index = 0;
+  	  var key;
+  	  while (length > index) definePropertyModule.f(O, key = keys[index++], props[key]);
+  	  return O;
+  	};
+  	return objectDefineProperties;
   }
 
-  var classof$2 = classof$5;
+  var html;
+  var hasRequiredHtml;
 
-  var $String = String;
+  function requireHtml () {
+  	if (hasRequiredHtml) return html;
+  	hasRequiredHtml = 1;
+  	var getBuiltIn = requireGetBuiltIn();
 
-  var toString$4 = function (argument) {
-    if (classof$2(argument) === 'Symbol') throw new TypeError('Cannot convert a Symbol value to a string');
-    return $String(argument);
-  };
-
-  var anObject$2 = anObject$7;
-
-  // `RegExp.prototype.flags` getter implementation
-  // https://tc39.es/ecma262/#sec-get-regexp.prototype.flags
-  var regexpFlags$1 = function () {
-    var that = anObject$2(this);
-    var result = '';
-    if (that.hasIndices) result += 'd';
-    if (that.global) result += 'g';
-    if (that.ignoreCase) result += 'i';
-    if (that.multiline) result += 'm';
-    if (that.dotAll) result += 's';
-    if (that.unicode) result += 'u';
-    if (that.unicodeSets) result += 'v';
-    if (that.sticky) result += 'y';
-    return result;
-  };
-
-  var fails$4 = fails$l;
-  var global$3 = global$d;
-
-  // babel-minify and Closure Compiler transpiles RegExp('a', 'y') -> /a/y and it causes SyntaxError
-  var $RegExp$2 = global$3.RegExp;
-
-  var UNSUPPORTED_Y$1 = fails$4(function () {
-    var re = $RegExp$2('a', 'y');
-    re.lastIndex = 2;
-    return re.exec('abcd') !== null;
-  });
-
-  // UC Browser bug
-  // https://github.com/zloirock/core-js/issues/1008
-  var MISSED_STICKY = UNSUPPORTED_Y$1 || fails$4(function () {
-    return !$RegExp$2('a', 'y').sticky;
-  });
-
-  var BROKEN_CARET = UNSUPPORTED_Y$1 || fails$4(function () {
-    // https://bugzilla.mozilla.org/show_bug.cgi?id=773687
-    var re = $RegExp$2('^r', 'gy');
-    re.lastIndex = 2;
-    return re.exec('str') !== null;
-  });
-
-  var regexpStickyHelpers = {
-    BROKEN_CARET: BROKEN_CARET,
-    MISSED_STICKY: MISSED_STICKY,
-    UNSUPPORTED_Y: UNSUPPORTED_Y$1
-  };
-
-  var fails$3 = fails$l;
-  var global$2 = global$d;
-
-  // babel-minify and Closure Compiler transpiles RegExp('.', 's') -> /./s and it causes SyntaxError
-  var $RegExp$1 = global$2.RegExp;
-
-  var regexpUnsupportedDotAll = fails$3(function () {
-    var re = $RegExp$1('.', 's');
-    return !(re.dotAll && re.test('\n') && re.flags === 's');
-  });
-
-  var fails$2 = fails$l;
-  var global$1 = global$d;
-
-  // babel-minify and Closure Compiler transpiles RegExp('(?<a>b)', 'g') -> /(?<a>b)/g and it causes SyntaxError
-  var $RegExp = global$1.RegExp;
-
-  var regexpUnsupportedNcg = fails$2(function () {
-    var re = $RegExp('(?<a>b)', 'g');
-    return re.exec('b').groups.a !== 'b' ||
-      'b'.replace(re, '$<a>c') !== 'bc';
-  });
-
-  /* eslint-disable regexp/no-empty-capturing-group, regexp/no-empty-group, regexp/no-lazy-ends -- testing */
-  /* eslint-disable regexp/no-useless-quantifier -- testing */
-  var call$3 = functionCall;
-  var uncurryThis$2 = functionUncurryThis;
-  var toString$3 = toString$4;
-  var regexpFlags = regexpFlags$1;
-  var stickyHelpers = regexpStickyHelpers;
-  var shared = shared$4;
-  var create = objectCreate;
-  var getInternalState = internalState.get;
-  var UNSUPPORTED_DOT_ALL = regexpUnsupportedDotAll;
-  var UNSUPPORTED_NCG = regexpUnsupportedNcg;
-
-  var nativeReplace = shared('native-string-replace', String.prototype.replace);
-  var nativeExec = RegExp.prototype.exec;
-  var patchedExec = nativeExec;
-  var charAt = uncurryThis$2(''.charAt);
-  var indexOf = uncurryThis$2(''.indexOf);
-  var replace$1 = uncurryThis$2(''.replace);
-  var stringSlice = uncurryThis$2(''.slice);
-
-  var UPDATES_LAST_INDEX_WRONG = (function () {
-    var re1 = /a/;
-    var re2 = /b*/g;
-    call$3(nativeExec, re1, 'a');
-    call$3(nativeExec, re2, 'a');
-    return re1.lastIndex !== 0 || re2.lastIndex !== 0;
-  })();
-
-  var UNSUPPORTED_Y = stickyHelpers.BROKEN_CARET;
-
-  // nonparticipating capturing group, copied from es5-shim's String#split patch.
-  var NPCG_INCLUDED = /()??/.exec('')[1] !== undefined;
-
-  var PATCH = UPDATES_LAST_INDEX_WRONG || NPCG_INCLUDED || UNSUPPORTED_Y || UNSUPPORTED_DOT_ALL || UNSUPPORTED_NCG;
-
-  if (PATCH) {
-    patchedExec = function exec(string) {
-      var re = this;
-      var state = getInternalState(re);
-      var str = toString$3(string);
-      var raw = state.raw;
-      var result, reCopy, lastIndex, match, i, object, group;
-
-      if (raw) {
-        raw.lastIndex = re.lastIndex;
-        result = call$3(patchedExec, raw, str);
-        re.lastIndex = raw.lastIndex;
-        return result;
-      }
-
-      var groups = state.groups;
-      var sticky = UNSUPPORTED_Y && re.sticky;
-      var flags = call$3(regexpFlags, re);
-      var source = re.source;
-      var charsAdded = 0;
-      var strCopy = str;
-
-      if (sticky) {
-        flags = replace$1(flags, 'y', '');
-        if (indexOf(flags, 'g') === -1) {
-          flags += 'g';
-        }
-
-        strCopy = stringSlice(str, re.lastIndex);
-        // Support anchored sticky behavior.
-        if (re.lastIndex > 0 && (!re.multiline || re.multiline && charAt(str, re.lastIndex - 1) !== '\n')) {
-          source = '(?: ' + source + ')';
-          strCopy = ' ' + strCopy;
-          charsAdded++;
-        }
-        // ^(? + rx + ) is needed, in combination with some str slicing, to
-        // simulate the 'y' flag.
-        reCopy = new RegExp('^(?:' + source + ')', flags);
-      }
-
-      if (NPCG_INCLUDED) {
-        reCopy = new RegExp('^' + source + '$(?!\\s)', flags);
-      }
-      if (UPDATES_LAST_INDEX_WRONG) lastIndex = re.lastIndex;
-
-      match = call$3(nativeExec, sticky ? reCopy : re, strCopy);
-
-      if (sticky) {
-        if (match) {
-          match.input = stringSlice(match.input, charsAdded);
-          match[0] = stringSlice(match[0], charsAdded);
-          match.index = re.lastIndex;
-          re.lastIndex += match[0].length;
-        } else re.lastIndex = 0;
-      } else if (UPDATES_LAST_INDEX_WRONG && match) {
-        re.lastIndex = re.global ? match.index + match[0].length : lastIndex;
-      }
-      if (NPCG_INCLUDED && match && match.length > 1) {
-        // Fix browsers whose `exec` methods don't consistently return `undefined`
-        // for NPCG, like IE8. NOTE: This doesn't work for /(.?)?/
-        call$3(nativeReplace, match[0], reCopy, function () {
-          for (i = 1; i < arguments.length - 2; i++) {
-            if (arguments[i] === undefined) match[i] = undefined;
-          }
-        });
-      }
-
-      if (match && groups) {
-        match.groups = object = create(null);
-        for (i = 0; i < groups.length; i++) {
-          group = groups[i];
-          object[group[0]] = match[group[1]];
-        }
-      }
-
-      return match;
-    };
+  	html = getBuiltIn('document', 'documentElement');
+  	return html;
   }
 
-  var regexpExec$2 = patchedExec;
+  var objectCreate;
+  var hasRequiredObjectCreate;
 
-  var $$2 = _export;
-  var exec = regexpExec$2;
+  function requireObjectCreate () {
+  	if (hasRequiredObjectCreate) return objectCreate;
+  	hasRequiredObjectCreate = 1;
+  	/* global ActiveXObject -- old IE, WSH */
+  	var anObject = requireAnObject();
+  	var definePropertiesModule = requireObjectDefineProperties();
+  	var enumBugKeys = requireEnumBugKeys();
+  	var hiddenKeys = requireHiddenKeys();
+  	var html = requireHtml();
+  	var documentCreateElement = requireDocumentCreateElement();
+  	var sharedKey = requireSharedKey();
 
-  // `RegExp.prototype.exec` method
-  // https://tc39.es/ecma262/#sec-regexp.prototype.exec
-  $$2({ target: 'RegExp', proto: true, forced: /./.exec !== exec }, {
-    exec: exec
-  });
+  	var GT = '>';
+  	var LT = '<';
+  	var PROTOTYPE = 'prototype';
+  	var SCRIPT = 'script';
+  	var IE_PROTO = sharedKey('IE_PROTO');
 
-  var isObject = isObject$8;
-  var classof$1 = classofRaw$2;
-  var wellKnownSymbol$2 = wellKnownSymbol$a;
+  	var EmptyConstructor = function () { /* empty */ };
 
-  var MATCH$1 = wellKnownSymbol$2('match');
+  	var scriptTag = function (content) {
+  	  return LT + SCRIPT + GT + content + LT + '/' + SCRIPT + GT;
+  	};
 
-  // `IsRegExp` abstract operation
-  // https://tc39.es/ecma262/#sec-isregexp
-  var isRegexp = function (it) {
-    var isRegExp;
-    return isObject(it) && ((isRegExp = it[MATCH$1]) !== undefined ? !!isRegExp : classof$1(it) === 'RegExp');
-  };
+  	// Create object with fake `null` prototype: use ActiveX Object with cleared prototype
+  	var NullProtoObjectViaActiveX = function (activeXDocument) {
+  	  activeXDocument.write(scriptTag(''));
+  	  activeXDocument.close();
+  	  var temp = activeXDocument.parentWindow.Object;
+  	  // eslint-disable-next-line no-useless-assignment -- avoid memory leak
+  	  activeXDocument = null;
+  	  return temp;
+  	};
 
-  var isRegExp = isRegexp;
+  	// Create object with fake `null` prototype: use iframe Object with cleared prototype
+  	var NullProtoObjectViaIFrame = function () {
+  	  // Thrash, waste and sodomy: IE GC bug
+  	  var iframe = documentCreateElement('iframe');
+  	  var JS = 'java' + SCRIPT + ':';
+  	  var iframeDocument;
+  	  iframe.style.display = 'none';
+  	  html.appendChild(iframe);
+  	  // https://github.com/zloirock/core-js/issues/475
+  	  iframe.src = String(JS);
+  	  iframeDocument = iframe.contentWindow.document;
+  	  iframeDocument.open();
+  	  iframeDocument.write(scriptTag('document.F=Object'));
+  	  iframeDocument.close();
+  	  return iframeDocument.F;
+  	};
 
-  var $TypeError$1 = TypeError;
+  	// Check for document.domain and active x support
+  	// No need to use active x approach when document.domain is not set
+  	// see https://github.com/es-shims/es5-shim/issues/150
+  	// variation of https://github.com/kitcambridge/es5-shim/commit/4f738ac066346
+  	// avoid IE GC bug
+  	var activeXDocument;
+  	var NullProtoObject = function () {
+  	  try {
+  	    activeXDocument = new ActiveXObject('htmlfile');
+  	  } catch (error) { /* ignore */ }
+  	  NullProtoObject = typeof document != 'undefined'
+  	    ? document.domain && activeXDocument
+  	      ? NullProtoObjectViaActiveX(activeXDocument) // old IE
+  	      : NullProtoObjectViaIFrame()
+  	    : NullProtoObjectViaActiveX(activeXDocument); // WSH
+  	  var length = enumBugKeys.length;
+  	  while (length--) delete NullProtoObject[PROTOTYPE][enumBugKeys[length]];
+  	  return NullProtoObject();
+  	};
 
-  var notARegexp = function (it) {
-    if (isRegExp(it)) {
-      throw new $TypeError$1("The method doesn't accept regular expressions");
-    } return it;
-  };
+  	hiddenKeys[IE_PROTO] = true;
 
-  var wellKnownSymbol$1 = wellKnownSymbol$a;
+  	// `Object.create` method
+  	// https://tc39.es/ecma262/#sec-object.create
+  	// eslint-disable-next-line es/no-object-create -- safe
+  	objectCreate = Object.create || function create(O, Properties) {
+  	  var result;
+  	  if (O !== null) {
+  	    EmptyConstructor[PROTOTYPE] = anObject(O);
+  	    result = new EmptyConstructor();
+  	    EmptyConstructor[PROTOTYPE] = null;
+  	    // add "__proto__" for Object.getPrototypeOf polyfill
+  	    result[IE_PROTO] = O;
+  	  } else result = NullProtoObject();
+  	  return Properties === undefined ? result : definePropertiesModule.f(result, Properties);
+  	};
+  	return objectCreate;
+  }
 
-  var MATCH = wellKnownSymbol$1('match');
+  var addToUnscopables;
+  var hasRequiredAddToUnscopables;
 
-  var correctIsRegexpLogic = function (METHOD_NAME) {
-    var regexp = /./;
-    try {
-      '/./'[METHOD_NAME](regexp);
-    } catch (error1) {
-      try {
-        regexp[MATCH] = false;
-        return '/./'[METHOD_NAME](regexp);
-      } catch (error2) { /* empty */ }
-    } return false;
-  };
+  function requireAddToUnscopables () {
+  	if (hasRequiredAddToUnscopables) return addToUnscopables;
+  	hasRequiredAddToUnscopables = 1;
+  	var wellKnownSymbol = requireWellKnownSymbol();
+  	var create = requireObjectCreate();
+  	var defineProperty = requireObjectDefineProperty().f;
 
-  var $$1 = _export;
-  var uncurryThis$1 = functionUncurryThis;
-  var notARegExp = notARegexp;
-  var requireObjectCoercible$2 = requireObjectCoercible$5;
-  var toString$2 = toString$4;
-  var correctIsRegExpLogic = correctIsRegexpLogic;
+  	var UNSCOPABLES = wellKnownSymbol('unscopables');
+  	var ArrayPrototype = Array.prototype;
 
-  var stringIndexOf = uncurryThis$1(''.indexOf);
+  	// Array.prototype[@@unscopables]
+  	// https://tc39.es/ecma262/#sec-array.prototype-@@unscopables
+  	if (ArrayPrototype[UNSCOPABLES] === undefined) {
+  	  defineProperty(ArrayPrototype, UNSCOPABLES, {
+  	    configurable: true,
+  	    value: create(null)
+  	  });
+  	}
 
-  // `String.prototype.includes` method
-  // https://tc39.es/ecma262/#sec-string.prototype.includes
-  $$1({ target: 'String', proto: true, forced: !correctIsRegExpLogic('includes') }, {
-    includes: function includes(searchString /* , position = 0 */) {
-      return !!~stringIndexOf(
-        toString$2(requireObjectCoercible$2(this)),
-        toString$2(notARegExp(searchString)),
-        arguments.length > 1 ? arguments[1] : undefined
-      );
-    }
-  });
+  	// add a key to Array.prototype[@@unscopables]
+  	addToUnscopables = function (key) {
+  	  ArrayPrototype[UNSCOPABLES][key] = true;
+  	};
+  	return addToUnscopables;
+  }
 
-  // TODO: Remove from `core-js@4` since it's moved to entry points
+  var hasRequiredEs_array_find;
 
-  var call$2 = functionCall;
-  var defineBuiltIn = defineBuiltIn$3;
-  var regexpExec$1 = regexpExec$2;
-  var fails$1 = fails$l;
-  var wellKnownSymbol = wellKnownSymbol$a;
-  var createNonEnumerableProperty = createNonEnumerableProperty$3;
+  function requireEs_array_find () {
+  	if (hasRequiredEs_array_find) return es_array_find;
+  	hasRequiredEs_array_find = 1;
+  	var $ = require_export();
+  	var $find = requireArrayIteration().find;
+  	var addToUnscopables = requireAddToUnscopables();
 
-  var SPECIES = wellKnownSymbol('species');
-  var RegExpPrototype = RegExp.prototype;
+  	var FIND = 'find';
+  	var SKIPS_HOLES = true;
 
-  var fixRegexpWellKnownSymbolLogic = function (KEY, exec, FORCED, SHAM) {
-    var SYMBOL = wellKnownSymbol(KEY);
+  	// Shouldn't skip holes
+  	// eslint-disable-next-line es/no-array-prototype-find -- testing
+  	if (FIND in []) Array(1)[FIND](function () { SKIPS_HOLES = false; });
 
-    var DELEGATES_TO_SYMBOL = !fails$1(function () {
-      // String methods call symbol-named RegExp methods
-      var O = {};
-      O[SYMBOL] = function () { return 7; };
-      return ''[KEY](O) !== 7;
-    });
+  	// `Array.prototype.find` method
+  	// https://tc39.es/ecma262/#sec-array.prototype.find
+  	$({ target: 'Array', proto: true, forced: SKIPS_HOLES }, {
+  	  find: function find(callbackfn /* , that = undefined */) {
+  	    return $find(this, callbackfn, arguments.length > 1 ? arguments[1] : undefined);
+  	  }
+  	});
 
-    var DELEGATES_TO_EXEC = DELEGATES_TO_SYMBOL && !fails$1(function () {
-      // Symbol-named RegExp methods call .exec
-      var execCalled = false;
-      var re = /a/;
+  	// https://tc39.es/ecma262/#sec-array.prototype-@@unscopables
+  	addToUnscopables(FIND);
+  	return es_array_find;
+  }
 
-      if (KEY === 'split') {
-        // We can't use real regex here since it causes deoptimization
-        // and serious performance degradation in V8
-        // https://github.com/zloirock/core-js/issues/306
-        re = {};
-        // RegExp[@@split] doesn't call the regex's exec method, but first creates
-        // a new one. We need to return the patched regex when creating the new one.
-        re.constructor = {};
-        re.constructor[SPECIES] = function () { return re; };
-        re.flags = '';
-        re[SYMBOL] = /./[SYMBOL];
-      }
+  requireEs_array_find();
 
-      re.exec = function () {
-        execCalled = true;
-        return null;
-      };
+  var es_array_includes = {};
 
-      re[SYMBOL]('');
-      return !execCalled;
-    });
+  var hasRequiredEs_array_includes;
 
-    if (
-      !DELEGATES_TO_SYMBOL ||
-      !DELEGATES_TO_EXEC ||
-      FORCED
-    ) {
-      var nativeRegExpMethod = /./[SYMBOL];
-      var methods = exec(SYMBOL, ''[KEY], function (nativeMethod, regexp, str, arg2, forceStringMethod) {
-        var $exec = regexp.exec;
-        if ($exec === regexpExec$1 || $exec === RegExpPrototype.exec) {
-          if (DELEGATES_TO_SYMBOL && !forceStringMethod) {
-            // The native String method already delegates to @@method (this
-            // polyfilled function), leasing to infinite recursion.
-            // We avoid it by directly calling the native @@method method.
-            return { done: true, value: call$2(nativeRegExpMethod, regexp, str, arg2) };
-          }
-          return { done: true, value: call$2(nativeMethod, str, regexp, arg2) };
-        }
-        return { done: false };
-      });
+  function requireEs_array_includes () {
+  	if (hasRequiredEs_array_includes) return es_array_includes;
+  	hasRequiredEs_array_includes = 1;
+  	var $ = require_export();
+  	var $includes = requireArrayIncludes().includes;
+  	var fails = requireFails();
+  	var addToUnscopables = requireAddToUnscopables();
 
-      defineBuiltIn(String.prototype, KEY, methods[0]);
-      defineBuiltIn(RegExpPrototype, SYMBOL, methods[1]);
-    }
+  	// FF99+ bug
+  	var BROKEN_ON_SPARSE = fails(function () {
+  	  // eslint-disable-next-line es/no-array-prototype-includes -- detection
+  	  return !Array(1).includes();
+  	});
 
-    if (SHAM) createNonEnumerableProperty(RegExpPrototype[SYMBOL], 'sham', true);
-  };
+  	// `Array.prototype.includes` method
+  	// https://tc39.es/ecma262/#sec-array.prototype.includes
+  	$({ target: 'Array', proto: true, forced: BROKEN_ON_SPARSE }, {
+  	  includes: function includes(el /* , fromIndex = 0 */) {
+  	    return $includes(this, el, arguments.length > 1 ? arguments[1] : undefined);
+  	  }
+  	});
 
-  // `SameValue` abstract operation
-  // https://tc39.es/ecma262/#sec-samevalue
-  // eslint-disable-next-line es/no-object-is -- safe
-  var sameValue$1 = Object.is || function is(x, y) {
-    // eslint-disable-next-line no-self-compare -- NaN check
-    return x === y ? x !== 0 || 1 / x === 1 / y : x !== x && y !== y;
-  };
+  	// https://tc39.es/ecma262/#sec-array.prototype-@@unscopables
+  	addToUnscopables('includes');
+  	return es_array_includes;
+  }
 
-  var call$1 = functionCall;
-  var anObject$1 = anObject$7;
-  var isCallable = isCallable$e;
-  var classof = classofRaw$2;
-  var regexpExec = regexpExec$2;
+  requireEs_array_includes();
 
-  var $TypeError = TypeError;
+  var es_array_indexOf = {};
 
-  // `RegExpExec` abstract operation
-  // https://tc39.es/ecma262/#sec-regexpexec
-  var regexpExecAbstract = function (R, S) {
-    var exec = R.exec;
-    if (isCallable(exec)) {
-      var result = call$1(exec, R, S);
-      if (result !== null) anObject$1(result);
-      return result;
-    }
-    if (classof(R) === 'RegExp') return call$1(regexpExec, R, S);
-    throw new $TypeError('RegExp#exec called on incompatible receiver');
-  };
+  var arrayMethodIsStrict;
+  var hasRequiredArrayMethodIsStrict;
 
-  var call = functionCall;
-  var fixRegExpWellKnownSymbolLogic = fixRegexpWellKnownSymbolLogic;
-  var anObject = anObject$7;
-  var isNullOrUndefined = isNullOrUndefined$3;
-  var requireObjectCoercible$1 = requireObjectCoercible$5;
-  var sameValue = sameValue$1;
-  var toString$1 = toString$4;
-  var getMethod = getMethod$2;
-  var regExpExec = regexpExecAbstract;
+  function requireArrayMethodIsStrict () {
+  	if (hasRequiredArrayMethodIsStrict) return arrayMethodIsStrict;
+  	hasRequiredArrayMethodIsStrict = 1;
+  	var fails = requireFails();
 
-  // @@search logic
-  fixRegExpWellKnownSymbolLogic('search', function (SEARCH, nativeSearch, maybeCallNative) {
-    return [
-      // `String.prototype.search` method
-      // https://tc39.es/ecma262/#sec-string.prototype.search
-      function search(regexp) {
-        var O = requireObjectCoercible$1(this);
-        var searcher = isNullOrUndefined(regexp) ? undefined : getMethod(regexp, SEARCH);
-        return searcher ? call(searcher, regexp, O) : new RegExp(regexp)[SEARCH](toString$1(O));
-      },
-      // `RegExp.prototype[@@search]` method
-      // https://tc39.es/ecma262/#sec-regexp.prototype-@@search
-      function (string) {
-        var rx = anObject(this);
-        var S = toString$1(string);
-        var res = maybeCallNative(nativeSearch, rx, S);
+  	arrayMethodIsStrict = function (METHOD_NAME, argument) {
+  	  var method = [][METHOD_NAME];
+  	  return !!method && fails(function () {
+  	    // eslint-disable-next-line no-useless-call -- required for testing
+  	    method.call(null, argument || function () { return 1; }, 1);
+  	  });
+  	};
+  	return arrayMethodIsStrict;
+  }
 
-        if (res.done) return res.value;
+  var hasRequiredEs_array_indexOf;
 
-        var previousLastIndex = rx.lastIndex;
-        if (!sameValue(previousLastIndex, 0)) rx.lastIndex = 0;
-        var result = regExpExec(rx, S);
-        if (!sameValue(rx.lastIndex, previousLastIndex)) rx.lastIndex = previousLastIndex;
-        return result === null ? -1 : result.index;
-      }
-    ];
-  });
+  function requireEs_array_indexOf () {
+  	if (hasRequiredEs_array_indexOf) return es_array_indexOf;
+  	hasRequiredEs_array_indexOf = 1;
+  	/* eslint-disable es/no-array-prototype-indexof -- required for testing */
+  	var $ = require_export();
+  	var uncurryThis = requireFunctionUncurryThisClause();
+  	var $indexOf = requireArrayIncludes().indexOf;
+  	var arrayMethodIsStrict = requireArrayMethodIsStrict();
 
-  // a string of all valid unicode whitespaces
-  var whitespaces$2 = '\u0009\u000A\u000B\u000C\u000D\u0020\u00A0\u1680\u2000\u2001\u2002' +
-    '\u2003\u2004\u2005\u2006\u2007\u2008\u2009\u200A\u202F\u205F\u3000\u2028\u2029\uFEFF';
+  	var nativeIndexOf = uncurryThis([].indexOf);
 
-  var uncurryThis = functionUncurryThis;
-  var requireObjectCoercible = requireObjectCoercible$5;
-  var toString = toString$4;
-  var whitespaces$1 = whitespaces$2;
+  	var NEGATIVE_ZERO = !!nativeIndexOf && 1 / nativeIndexOf([1], 1, -0) < 0;
+  	var FORCED = NEGATIVE_ZERO || !arrayMethodIsStrict('indexOf');
 
-  var replace = uncurryThis(''.replace);
-  var ltrim = RegExp('^[' + whitespaces$1 + ']+');
-  var rtrim = RegExp('(^|[^' + whitespaces$1 + '])[' + whitespaces$1 + ']+$');
+  	// `Array.prototype.indexOf` method
+  	// https://tc39.es/ecma262/#sec-array.prototype.indexof
+  	$({ target: 'Array', proto: true, forced: FORCED }, {
+  	  indexOf: function indexOf(searchElement /* , fromIndex = 0 */) {
+  	    var fromIndex = arguments.length > 1 ? arguments[1] : undefined;
+  	    return NEGATIVE_ZERO
+  	      // convert -0 to +0
+  	      ? nativeIndexOf(this, searchElement, fromIndex) || 0
+  	      : $indexOf(this, searchElement, fromIndex);
+  	  }
+  	});
+  	return es_array_indexOf;
+  }
 
-  // `String.prototype.{ trim, trimStart, trimEnd, trimLeft, trimRight }` methods implementation
-  var createMethod = function (TYPE) {
-    return function ($this) {
-      var string = toString(requireObjectCoercible($this));
-      if (TYPE & 1) string = replace(string, ltrim, '');
-      if (TYPE & 2) string = replace(string, rtrim, '$1');
-      return string;
-    };
-  };
+  requireEs_array_indexOf();
 
-  var stringTrim = {
-    // `String.prototype.{ trimLeft, trimStart }` methods
-    // https://tc39.es/ecma262/#sec-string.prototype.trimstart
-    start: createMethod(1),
-    // `String.prototype.{ trimRight, trimEnd }` methods
-    // https://tc39.es/ecma262/#sec-string.prototype.trimend
-    end: createMethod(2),
-    // `String.prototype.trim` method
-    // https://tc39.es/ecma262/#sec-string.prototype.trim
-    trim: createMethod(3)
-  };
+  var es_array_join = {};
 
-  var PROPER_FUNCTION_NAME = functionName.PROPER;
-  var fails = fails$l;
-  var whitespaces = whitespaces$2;
+  var hasRequiredEs_array_join;
 
-  var non = '\u200B\u0085\u180E';
+  function requireEs_array_join () {
+  	if (hasRequiredEs_array_join) return es_array_join;
+  	hasRequiredEs_array_join = 1;
+  	var $ = require_export();
+  	var uncurryThis = requireFunctionUncurryThis();
+  	var IndexedObject = requireIndexedObject();
+  	var toIndexedObject = requireToIndexedObject();
+  	var arrayMethodIsStrict = requireArrayMethodIsStrict();
 
-  // check that a method works with the correct list
-  // of whitespaces and has a correct name
-  var stringTrimForced = function (METHOD_NAME) {
-    return fails(function () {
-      return !!whitespaces[METHOD_NAME]()
-        || non[METHOD_NAME]() !== non
-        || (PROPER_FUNCTION_NAME && whitespaces[METHOD_NAME].name !== METHOD_NAME);
-    });
-  };
+  	var nativeJoin = uncurryThis([].join);
 
-  var $ = _export;
-  var $trim = stringTrim.trim;
-  var forcedStringTrimMethod = stringTrimForced;
+  	var ES3_STRINGS = IndexedObject !== Object;
+  	var FORCED = ES3_STRINGS || !arrayMethodIsStrict('join', ',');
 
-  // `String.prototype.trim` method
-  // https://tc39.es/ecma262/#sec-string.prototype.trim
-  $({ target: 'String', proto: true, forced: forcedStringTrimMethod('trim') }, {
-    trim: function trim() {
-      return $trim(this);
-    }
-  });
+  	// `Array.prototype.join` method
+  	// https://tc39.es/ecma262/#sec-array.prototype.join
+  	$({ target: 'Array', proto: true, forced: FORCED }, {
+  	  join: function join(separator) {
+  	    return nativeJoin(toIndexedObject(this), separator === undefined ? ',' : separator);
+  	  }
+  	});
+  	return es_array_join;
+  }
+
+  requireEs_array_join();
+
+  var es_object_assign = {};
+
+  var objectAssign;
+  var hasRequiredObjectAssign;
+
+  function requireObjectAssign () {
+  	if (hasRequiredObjectAssign) return objectAssign;
+  	hasRequiredObjectAssign = 1;
+  	var DESCRIPTORS = requireDescriptors();
+  	var uncurryThis = requireFunctionUncurryThis();
+  	var call = requireFunctionCall();
+  	var fails = requireFails();
+  	var objectKeys = requireObjectKeys();
+  	var getOwnPropertySymbolsModule = requireObjectGetOwnPropertySymbols();
+  	var propertyIsEnumerableModule = requireObjectPropertyIsEnumerable();
+  	var toObject = requireToObject();
+  	var IndexedObject = requireIndexedObject();
+
+  	// eslint-disable-next-line es/no-object-assign -- safe
+  	var $assign = Object.assign;
+  	// eslint-disable-next-line es/no-object-defineproperty -- required for testing
+  	var defineProperty = Object.defineProperty;
+  	var concat = uncurryThis([].concat);
+
+  	// `Object.assign` method
+  	// https://tc39.es/ecma262/#sec-object.assign
+  	objectAssign = !$assign || fails(function () {
+  	  // should have correct order of operations (Edge bug)
+  	  if (DESCRIPTORS && $assign({ b: 1 }, $assign(defineProperty({}, 'a', {
+  	    enumerable: true,
+  	    get: function () {
+  	      defineProperty(this, 'b', {
+  	        value: 3,
+  	        enumerable: false
+  	      });
+  	    }
+  	  }), { b: 2 })).b !== 1) return true;
+  	  // should work with symbols and should have deterministic property order (V8 bug)
+  	  var A = {};
+  	  var B = {};
+  	  // eslint-disable-next-line es/no-symbol -- safe
+  	  var symbol = Symbol('assign detection');
+  	  var alphabet = 'abcdefghijklmnopqrst';
+  	  A[symbol] = 7;
+  	  alphabet.split('').forEach(function (chr) { B[chr] = chr; });
+  	  return $assign({}, A)[symbol] !== 7 || objectKeys($assign({}, B)).join('') !== alphabet;
+  	}) ? function assign(target, source) { // eslint-disable-line no-unused-vars -- required for `.length`
+  	  var T = toObject(target);
+  	  var argumentsLength = arguments.length;
+  	  var index = 1;
+  	  var getOwnPropertySymbols = getOwnPropertySymbolsModule.f;
+  	  var propertyIsEnumerable = propertyIsEnumerableModule.f;
+  	  while (argumentsLength > index) {
+  	    var S = IndexedObject(arguments[index++]);
+  	    var keys = getOwnPropertySymbols ? concat(objectKeys(S), getOwnPropertySymbols(S)) : objectKeys(S);
+  	    var length = keys.length;
+  	    var j = 0;
+  	    var key;
+  	    while (length > j) {
+  	      key = keys[j++];
+  	      if (!DESCRIPTORS || call(propertyIsEnumerable, S, key)) T[key] = S[key];
+  	    }
+  	  } return T;
+  	} : $assign;
+  	return objectAssign;
+  }
+
+  var hasRequiredEs_object_assign;
+
+  function requireEs_object_assign () {
+  	if (hasRequiredEs_object_assign) return es_object_assign;
+  	hasRequiredEs_object_assign = 1;
+  	var $ = require_export();
+  	var assign = requireObjectAssign();
+
+  	// `Object.assign` method
+  	// https://tc39.es/ecma262/#sec-object.assign
+  	// eslint-disable-next-line es/no-object-assign -- required for testing
+  	$({ target: 'Object', stat: true, arity: 2, forced: Object.assign !== assign }, {
+  	  assign: assign
+  	});
+  	return es_object_assign;
+  }
+
+  requireEs_object_assign();
+
+  var es_object_entries = {};
+
+  var correctPrototypeGetter;
+  var hasRequiredCorrectPrototypeGetter;
+
+  function requireCorrectPrototypeGetter () {
+  	if (hasRequiredCorrectPrototypeGetter) return correctPrototypeGetter;
+  	hasRequiredCorrectPrototypeGetter = 1;
+  	var fails = requireFails();
+
+  	correctPrototypeGetter = !fails(function () {
+  	  function F() { /* empty */ }
+  	  F.prototype.constructor = null;
+  	  // eslint-disable-next-line es/no-object-getprototypeof -- required for testing
+  	  return Object.getPrototypeOf(new F()) !== F.prototype;
+  	});
+  	return correctPrototypeGetter;
+  }
+
+  var objectGetPrototypeOf;
+  var hasRequiredObjectGetPrototypeOf;
+
+  function requireObjectGetPrototypeOf () {
+  	if (hasRequiredObjectGetPrototypeOf) return objectGetPrototypeOf;
+  	hasRequiredObjectGetPrototypeOf = 1;
+  	var hasOwn = requireHasOwnProperty();
+  	var isCallable = requireIsCallable();
+  	var toObject = requireToObject();
+  	var sharedKey = requireSharedKey();
+  	var CORRECT_PROTOTYPE_GETTER = requireCorrectPrototypeGetter();
+
+  	var IE_PROTO = sharedKey('IE_PROTO');
+  	var $Object = Object;
+  	var ObjectPrototype = $Object.prototype;
+
+  	// `Object.getPrototypeOf` method
+  	// https://tc39.es/ecma262/#sec-object.getprototypeof
+  	// eslint-disable-next-line es/no-object-getprototypeof -- safe
+  	objectGetPrototypeOf = CORRECT_PROTOTYPE_GETTER ? $Object.getPrototypeOf : function (O) {
+  	  var object = toObject(O);
+  	  if (hasOwn(object, IE_PROTO)) return object[IE_PROTO];
+  	  var constructor = object.constructor;
+  	  if (isCallable(constructor) && object instanceof constructor) {
+  	    return constructor.prototype;
+  	  } return object instanceof $Object ? ObjectPrototype : null;
+  	};
+  	return objectGetPrototypeOf;
+  }
+
+  var objectToArray;
+  var hasRequiredObjectToArray;
+
+  function requireObjectToArray () {
+  	if (hasRequiredObjectToArray) return objectToArray;
+  	hasRequiredObjectToArray = 1;
+  	var DESCRIPTORS = requireDescriptors();
+  	var fails = requireFails();
+  	var uncurryThis = requireFunctionUncurryThis();
+  	var objectGetPrototypeOf = requireObjectGetPrototypeOf();
+  	var objectKeys = requireObjectKeys();
+  	var toIndexedObject = requireToIndexedObject();
+  	var $propertyIsEnumerable = requireObjectPropertyIsEnumerable().f;
+
+  	var propertyIsEnumerable = uncurryThis($propertyIsEnumerable);
+  	var push = uncurryThis([].push);
+
+  	// in some IE versions, `propertyIsEnumerable` returns incorrect result on integer keys
+  	// of `null` prototype objects
+  	var IE_BUG = DESCRIPTORS && fails(function () {
+  	  // eslint-disable-next-line es/no-object-create -- safe
+  	  var O = Object.create(null);
+  	  O[2] = 2;
+  	  return !propertyIsEnumerable(O, 2);
+  	});
+
+  	// `Object.{ entries, values }` methods implementation
+  	var createMethod = function (TO_ENTRIES) {
+  	  return function (it) {
+  	    var O = toIndexedObject(it);
+  	    var keys = objectKeys(O);
+  	    var IE_WORKAROUND = IE_BUG && objectGetPrototypeOf(O) === null;
+  	    var length = keys.length;
+  	    var i = 0;
+  	    var result = [];
+  	    var key;
+  	    while (length > i) {
+  	      key = keys[i++];
+  	      if (!DESCRIPTORS || (IE_WORKAROUND ? key in O : propertyIsEnumerable(O, key))) {
+  	        push(result, TO_ENTRIES ? [key, O[key]] : O[key]);
+  	      }
+  	    }
+  	    return result;
+  	  };
+  	};
+
+  	objectToArray = {
+  	  // `Object.entries` method
+  	  // https://tc39.es/ecma262/#sec-object.entries
+  	  entries: createMethod(true),
+  	  // `Object.values` method
+  	  // https://tc39.es/ecma262/#sec-object.values
+  	  values: createMethod(false)
+  	};
+  	return objectToArray;
+  }
+
+  var hasRequiredEs_object_entries;
+
+  function requireEs_object_entries () {
+  	if (hasRequiredEs_object_entries) return es_object_entries;
+  	hasRequiredEs_object_entries = 1;
+  	var $ = require_export();
+  	var $entries = requireObjectToArray().entries;
+
+  	// `Object.entries` method
+  	// https://tc39.es/ecma262/#sec-object.entries
+  	$({ target: 'Object', stat: true }, {
+  	  entries: function entries(O) {
+  	    return $entries(O);
+  	  }
+  	});
+  	return es_object_entries;
+  }
+
+  requireEs_object_entries();
+
+  var es_object_toString = {};
+
+  var objectToString;
+  var hasRequiredObjectToString;
+
+  function requireObjectToString () {
+  	if (hasRequiredObjectToString) return objectToString;
+  	hasRequiredObjectToString = 1;
+  	var TO_STRING_TAG_SUPPORT = requireToStringTagSupport();
+  	var classof = requireClassof();
+
+  	// `Object.prototype.toString` method implementation
+  	// https://tc39.es/ecma262/#sec-object.prototype.tostring
+  	objectToString = TO_STRING_TAG_SUPPORT ? {}.toString : function toString() {
+  	  return '[object ' + classof(this) + ']';
+  	};
+  	return objectToString;
+  }
+
+  var hasRequiredEs_object_toString;
+
+  function requireEs_object_toString () {
+  	if (hasRequiredEs_object_toString) return es_object_toString;
+  	hasRequiredEs_object_toString = 1;
+  	var TO_STRING_TAG_SUPPORT = requireToStringTagSupport();
+  	var defineBuiltIn = requireDefineBuiltIn();
+  	var toString = requireObjectToString();
+
+  	// `Object.prototype.toString` method
+  	// https://tc39.es/ecma262/#sec-object.prototype.tostring
+  	if (!TO_STRING_TAG_SUPPORT) {
+  	  defineBuiltIn(Object.prototype, 'toString', toString, { unsafe: true });
+  	}
+  	return es_object_toString;
+  }
+
+  requireEs_object_toString();
+
+  var es_regexp_exec = {};
+
+  var toString;
+  var hasRequiredToString;
+
+  function requireToString () {
+  	if (hasRequiredToString) return toString;
+  	hasRequiredToString = 1;
+  	var classof = requireClassof();
+
+  	var $String = String;
+
+  	toString = function (argument) {
+  	  if (classof(argument) === 'Symbol') throw new TypeError('Cannot convert a Symbol value to a string');
+  	  return $String(argument);
+  	};
+  	return toString;
+  }
+
+  var regexpFlags;
+  var hasRequiredRegexpFlags;
+
+  function requireRegexpFlags () {
+  	if (hasRequiredRegexpFlags) return regexpFlags;
+  	hasRequiredRegexpFlags = 1;
+  	var anObject = requireAnObject();
+
+  	// `RegExp.prototype.flags` getter implementation
+  	// https://tc39.es/ecma262/#sec-get-regexp.prototype.flags
+  	regexpFlags = function () {
+  	  var that = anObject(this);
+  	  var result = '';
+  	  if (that.hasIndices) result += 'd';
+  	  if (that.global) result += 'g';
+  	  if (that.ignoreCase) result += 'i';
+  	  if (that.multiline) result += 'm';
+  	  if (that.dotAll) result += 's';
+  	  if (that.unicode) result += 'u';
+  	  if (that.unicodeSets) result += 'v';
+  	  if (that.sticky) result += 'y';
+  	  return result;
+  	};
+  	return regexpFlags;
+  }
+
+  var regexpStickyHelpers;
+  var hasRequiredRegexpStickyHelpers;
+
+  function requireRegexpStickyHelpers () {
+  	if (hasRequiredRegexpStickyHelpers) return regexpStickyHelpers;
+  	hasRequiredRegexpStickyHelpers = 1;
+  	var fails = requireFails();
+  	var globalThis = requireGlobalThis();
+
+  	// babel-minify and Closure Compiler transpiles RegExp('a', 'y') -> /a/y and it causes SyntaxError
+  	var $RegExp = globalThis.RegExp;
+
+  	var UNSUPPORTED_Y = fails(function () {
+  	  var re = $RegExp('a', 'y');
+  	  re.lastIndex = 2;
+  	  return re.exec('abcd') !== null;
+  	});
+
+  	// UC Browser bug
+  	// https://github.com/zloirock/core-js/issues/1008
+  	var MISSED_STICKY = UNSUPPORTED_Y || fails(function () {
+  	  return !$RegExp('a', 'y').sticky;
+  	});
+
+  	var BROKEN_CARET = UNSUPPORTED_Y || fails(function () {
+  	  // https://bugzilla.mozilla.org/show_bug.cgi?id=773687
+  	  var re = $RegExp('^r', 'gy');
+  	  re.lastIndex = 2;
+  	  return re.exec('str') !== null;
+  	});
+
+  	regexpStickyHelpers = {
+  	  BROKEN_CARET: BROKEN_CARET,
+  	  MISSED_STICKY: MISSED_STICKY,
+  	  UNSUPPORTED_Y: UNSUPPORTED_Y
+  	};
+  	return regexpStickyHelpers;
+  }
+
+  var regexpUnsupportedDotAll;
+  var hasRequiredRegexpUnsupportedDotAll;
+
+  function requireRegexpUnsupportedDotAll () {
+  	if (hasRequiredRegexpUnsupportedDotAll) return regexpUnsupportedDotAll;
+  	hasRequiredRegexpUnsupportedDotAll = 1;
+  	var fails = requireFails();
+  	var globalThis = requireGlobalThis();
+
+  	// babel-minify and Closure Compiler transpiles RegExp('.', 's') -> /./s and it causes SyntaxError
+  	var $RegExp = globalThis.RegExp;
+
+  	regexpUnsupportedDotAll = fails(function () {
+  	  var re = $RegExp('.', 's');
+  	  return !(re.dotAll && re.test('\n') && re.flags === 's');
+  	});
+  	return regexpUnsupportedDotAll;
+  }
+
+  var regexpUnsupportedNcg;
+  var hasRequiredRegexpUnsupportedNcg;
+
+  function requireRegexpUnsupportedNcg () {
+  	if (hasRequiredRegexpUnsupportedNcg) return regexpUnsupportedNcg;
+  	hasRequiredRegexpUnsupportedNcg = 1;
+  	var fails = requireFails();
+  	var globalThis = requireGlobalThis();
+
+  	// babel-minify and Closure Compiler transpiles RegExp('(?<a>b)', 'g') -> /(?<a>b)/g and it causes SyntaxError
+  	var $RegExp = globalThis.RegExp;
+
+  	regexpUnsupportedNcg = fails(function () {
+  	  var re = $RegExp('(?<a>b)', 'g');
+  	  return re.exec('b').groups.a !== 'b' ||
+  	    'b'.replace(re, '$<a>c') !== 'bc';
+  	});
+  	return regexpUnsupportedNcg;
+  }
+
+  var regexpExec;
+  var hasRequiredRegexpExec;
+
+  function requireRegexpExec () {
+  	if (hasRequiredRegexpExec) return regexpExec;
+  	hasRequiredRegexpExec = 1;
+  	/* eslint-disable regexp/no-empty-capturing-group, regexp/no-empty-group, regexp/no-lazy-ends -- testing */
+  	/* eslint-disable regexp/no-useless-quantifier -- testing */
+  	var call = requireFunctionCall();
+  	var uncurryThis = requireFunctionUncurryThis();
+  	var toString = requireToString();
+  	var regexpFlags = requireRegexpFlags();
+  	var stickyHelpers = requireRegexpStickyHelpers();
+  	var shared = requireShared();
+  	var create = requireObjectCreate();
+  	var getInternalState = requireInternalState().get;
+  	var UNSUPPORTED_DOT_ALL = requireRegexpUnsupportedDotAll();
+  	var UNSUPPORTED_NCG = requireRegexpUnsupportedNcg();
+
+  	var nativeReplace = shared('native-string-replace', String.prototype.replace);
+  	var nativeExec = RegExp.prototype.exec;
+  	var patchedExec = nativeExec;
+  	var charAt = uncurryThis(''.charAt);
+  	var indexOf = uncurryThis(''.indexOf);
+  	var replace = uncurryThis(''.replace);
+  	var stringSlice = uncurryThis(''.slice);
+
+  	var UPDATES_LAST_INDEX_WRONG = (function () {
+  	  var re1 = /a/;
+  	  var re2 = /b*/g;
+  	  call(nativeExec, re1, 'a');
+  	  call(nativeExec, re2, 'a');
+  	  return re1.lastIndex !== 0 || re2.lastIndex !== 0;
+  	})();
+
+  	var UNSUPPORTED_Y = stickyHelpers.BROKEN_CARET;
+
+  	// nonparticipating capturing group, copied from es5-shim's String#split patch.
+  	var NPCG_INCLUDED = /()??/.exec('')[1] !== undefined;
+
+  	var PATCH = UPDATES_LAST_INDEX_WRONG || NPCG_INCLUDED || UNSUPPORTED_Y || UNSUPPORTED_DOT_ALL || UNSUPPORTED_NCG;
+
+  	if (PATCH) {
+  	  patchedExec = function exec(string) {
+  	    var re = this;
+  	    var state = getInternalState(re);
+  	    var str = toString(string);
+  	    var raw = state.raw;
+  	    var result, reCopy, lastIndex, match, i, object, group;
+
+  	    if (raw) {
+  	      raw.lastIndex = re.lastIndex;
+  	      result = call(patchedExec, raw, str);
+  	      re.lastIndex = raw.lastIndex;
+  	      return result;
+  	    }
+
+  	    var groups = state.groups;
+  	    var sticky = UNSUPPORTED_Y && re.sticky;
+  	    var flags = call(regexpFlags, re);
+  	    var source = re.source;
+  	    var charsAdded = 0;
+  	    var strCopy = str;
+
+  	    if (sticky) {
+  	      flags = replace(flags, 'y', '');
+  	      if (indexOf(flags, 'g') === -1) {
+  	        flags += 'g';
+  	      }
+
+  	      strCopy = stringSlice(str, re.lastIndex);
+  	      // Support anchored sticky behavior.
+  	      if (re.lastIndex > 0 && (!re.multiline || re.multiline && charAt(str, re.lastIndex - 1) !== '\n')) {
+  	        source = '(?: ' + source + ')';
+  	        strCopy = ' ' + strCopy;
+  	        charsAdded++;
+  	      }
+  	      // ^(? + rx + ) is needed, in combination with some str slicing, to
+  	      // simulate the 'y' flag.
+  	      reCopy = new RegExp('^(?:' + source + ')', flags);
+  	    }
+
+  	    if (NPCG_INCLUDED) {
+  	      reCopy = new RegExp('^' + source + '$(?!\\s)', flags);
+  	    }
+  	    if (UPDATES_LAST_INDEX_WRONG) lastIndex = re.lastIndex;
+
+  	    match = call(nativeExec, sticky ? reCopy : re, strCopy);
+
+  	    if (sticky) {
+  	      if (match) {
+  	        match.input = stringSlice(match.input, charsAdded);
+  	        match[0] = stringSlice(match[0], charsAdded);
+  	        match.index = re.lastIndex;
+  	        re.lastIndex += match[0].length;
+  	      } else re.lastIndex = 0;
+  	    } else if (UPDATES_LAST_INDEX_WRONG && match) {
+  	      re.lastIndex = re.global ? match.index + match[0].length : lastIndex;
+  	    }
+  	    if (NPCG_INCLUDED && match && match.length > 1) {
+  	      // Fix browsers whose `exec` methods don't consistently return `undefined`
+  	      // for NPCG, like IE8. NOTE: This doesn't work for /(.?)?/
+  	      call(nativeReplace, match[0], reCopy, function () {
+  	        for (i = 1; i < arguments.length - 2; i++) {
+  	          if (arguments[i] === undefined) match[i] = undefined;
+  	        }
+  	      });
+  	    }
+
+  	    if (match && groups) {
+  	      match.groups = object = create(null);
+  	      for (i = 0; i < groups.length; i++) {
+  	        group = groups[i];
+  	        object[group[0]] = match[group[1]];
+  	      }
+  	    }
+
+  	    return match;
+  	  };
+  	}
+
+  	regexpExec = patchedExec;
+  	return regexpExec;
+  }
+
+  var hasRequiredEs_regexp_exec;
+
+  function requireEs_regexp_exec () {
+  	if (hasRequiredEs_regexp_exec) return es_regexp_exec;
+  	hasRequiredEs_regexp_exec = 1;
+  	var $ = require_export();
+  	var exec = requireRegexpExec();
+
+  	// `RegExp.prototype.exec` method
+  	// https://tc39.es/ecma262/#sec-regexp.prototype.exec
+  	$({ target: 'RegExp', proto: true, forced: /./.exec !== exec }, {
+  	  exec: exec
+  	});
+  	return es_regexp_exec;
+  }
+
+  requireEs_regexp_exec();
+
+  var es_string_includes = {};
+
+  var isRegexp;
+  var hasRequiredIsRegexp;
+
+  function requireIsRegexp () {
+  	if (hasRequiredIsRegexp) return isRegexp;
+  	hasRequiredIsRegexp = 1;
+  	var isObject = requireIsObject();
+  	var classof = requireClassofRaw();
+  	var wellKnownSymbol = requireWellKnownSymbol();
+
+  	var MATCH = wellKnownSymbol('match');
+
+  	// `IsRegExp` abstract operation
+  	// https://tc39.es/ecma262/#sec-isregexp
+  	isRegexp = function (it) {
+  	  var isRegExp;
+  	  return isObject(it) && ((isRegExp = it[MATCH]) !== undefined ? !!isRegExp : classof(it) === 'RegExp');
+  	};
+  	return isRegexp;
+  }
+
+  var notARegexp;
+  var hasRequiredNotARegexp;
+
+  function requireNotARegexp () {
+  	if (hasRequiredNotARegexp) return notARegexp;
+  	hasRequiredNotARegexp = 1;
+  	var isRegExp = requireIsRegexp();
+
+  	var $TypeError = TypeError;
+
+  	notARegexp = function (it) {
+  	  if (isRegExp(it)) {
+  	    throw new $TypeError("The method doesn't accept regular expressions");
+  	  } return it;
+  	};
+  	return notARegexp;
+  }
+
+  var correctIsRegexpLogic;
+  var hasRequiredCorrectIsRegexpLogic;
+
+  function requireCorrectIsRegexpLogic () {
+  	if (hasRequiredCorrectIsRegexpLogic) return correctIsRegexpLogic;
+  	hasRequiredCorrectIsRegexpLogic = 1;
+  	var wellKnownSymbol = requireWellKnownSymbol();
+
+  	var MATCH = wellKnownSymbol('match');
+
+  	correctIsRegexpLogic = function (METHOD_NAME) {
+  	  var regexp = /./;
+  	  try {
+  	    '/./'[METHOD_NAME](regexp);
+  	  } catch (error1) {
+  	    try {
+  	      regexp[MATCH] = false;
+  	      return '/./'[METHOD_NAME](regexp);
+  	    } catch (error2) { /* empty */ }
+  	  } return false;
+  	};
+  	return correctIsRegexpLogic;
+  }
+
+  var hasRequiredEs_string_includes;
+
+  function requireEs_string_includes () {
+  	if (hasRequiredEs_string_includes) return es_string_includes;
+  	hasRequiredEs_string_includes = 1;
+  	var $ = require_export();
+  	var uncurryThis = requireFunctionUncurryThis();
+  	var notARegExp = requireNotARegexp();
+  	var requireObjectCoercible = requireRequireObjectCoercible();
+  	var toString = requireToString();
+  	var correctIsRegExpLogic = requireCorrectIsRegexpLogic();
+
+  	var stringIndexOf = uncurryThis(''.indexOf);
+
+  	// `String.prototype.includes` method
+  	// https://tc39.es/ecma262/#sec-string.prototype.includes
+  	$({ target: 'String', proto: true, forced: !correctIsRegExpLogic('includes') }, {
+  	  includes: function includes(searchString /* , position = 0 */) {
+  	    return !!~stringIndexOf(
+  	      toString(requireObjectCoercible(this)),
+  	      toString(notARegExp(searchString)),
+  	      arguments.length > 1 ? arguments[1] : undefined
+  	    );
+  	  }
+  	});
+  	return es_string_includes;
+  }
+
+  requireEs_string_includes();
+
+  var es_string_search = {};
+
+  var fixRegexpWellKnownSymbolLogic;
+  var hasRequiredFixRegexpWellKnownSymbolLogic;
+
+  function requireFixRegexpWellKnownSymbolLogic () {
+  	if (hasRequiredFixRegexpWellKnownSymbolLogic) return fixRegexpWellKnownSymbolLogic;
+  	hasRequiredFixRegexpWellKnownSymbolLogic = 1;
+  	// TODO: Remove from `core-js@4` since it's moved to entry points
+  	requireEs_regexp_exec();
+  	var call = requireFunctionCall();
+  	var defineBuiltIn = requireDefineBuiltIn();
+  	var regexpExec = requireRegexpExec();
+  	var fails = requireFails();
+  	var wellKnownSymbol = requireWellKnownSymbol();
+  	var createNonEnumerableProperty = requireCreateNonEnumerableProperty();
+
+  	var SPECIES = wellKnownSymbol('species');
+  	var RegExpPrototype = RegExp.prototype;
+
+  	fixRegexpWellKnownSymbolLogic = function (KEY, exec, FORCED, SHAM) {
+  	  var SYMBOL = wellKnownSymbol(KEY);
+
+  	  var DELEGATES_TO_SYMBOL = !fails(function () {
+  	    // String methods call symbol-named RegExp methods
+  	    var O = {};
+  	    O[SYMBOL] = function () { return 7; };
+  	    return ''[KEY](O) !== 7;
+  	  });
+
+  	  var DELEGATES_TO_EXEC = DELEGATES_TO_SYMBOL && !fails(function () {
+  	    // Symbol-named RegExp methods call .exec
+  	    var execCalled = false;
+  	    var re = /a/;
+
+  	    if (KEY === 'split') {
+  	      // We can't use real regex here since it causes deoptimization
+  	      // and serious performance degradation in V8
+  	      // https://github.com/zloirock/core-js/issues/306
+  	      re = {};
+  	      // RegExp[@@split] doesn't call the regex's exec method, but first creates
+  	      // a new one. We need to return the patched regex when creating the new one.
+  	      re.constructor = {};
+  	      re.constructor[SPECIES] = function () { return re; };
+  	      re.flags = '';
+  	      re[SYMBOL] = /./[SYMBOL];
+  	    }
+
+  	    re.exec = function () {
+  	      execCalled = true;
+  	      return null;
+  	    };
+
+  	    re[SYMBOL]('');
+  	    return !execCalled;
+  	  });
+
+  	  if (
+  	    !DELEGATES_TO_SYMBOL ||
+  	    !DELEGATES_TO_EXEC ||
+  	    FORCED
+  	  ) {
+  	    var nativeRegExpMethod = /./[SYMBOL];
+  	    var methods = exec(SYMBOL, ''[KEY], function (nativeMethod, regexp, str, arg2, forceStringMethod) {
+  	      var $exec = regexp.exec;
+  	      if ($exec === regexpExec || $exec === RegExpPrototype.exec) {
+  	        if (DELEGATES_TO_SYMBOL && !forceStringMethod) {
+  	          // The native String method already delegates to @@method (this
+  	          // polyfilled function), leasing to infinite recursion.
+  	          // We avoid it by directly calling the native @@method method.
+  	          return { done: true, value: call(nativeRegExpMethod, regexp, str, arg2) };
+  	        }
+  	        return { done: true, value: call(nativeMethod, str, regexp, arg2) };
+  	      }
+  	      return { done: false };
+  	    });
+
+  	    defineBuiltIn(String.prototype, KEY, methods[0]);
+  	    defineBuiltIn(RegExpPrototype, SYMBOL, methods[1]);
+  	  }
+
+  	  if (SHAM) createNonEnumerableProperty(RegExpPrototype[SYMBOL], 'sham', true);
+  	};
+  	return fixRegexpWellKnownSymbolLogic;
+  }
+
+  var sameValue;
+  var hasRequiredSameValue;
+
+  function requireSameValue () {
+  	if (hasRequiredSameValue) return sameValue;
+  	hasRequiredSameValue = 1;
+  	// `SameValue` abstract operation
+  	// https://tc39.es/ecma262/#sec-samevalue
+  	// eslint-disable-next-line es/no-object-is -- safe
+  	sameValue = Object.is || function is(x, y) {
+  	  // eslint-disable-next-line no-self-compare -- NaN check
+  	  return x === y ? x !== 0 || 1 / x === 1 / y : x !== x && y !== y;
+  	};
+  	return sameValue;
+  }
+
+  var regexpExecAbstract;
+  var hasRequiredRegexpExecAbstract;
+
+  function requireRegexpExecAbstract () {
+  	if (hasRequiredRegexpExecAbstract) return regexpExecAbstract;
+  	hasRequiredRegexpExecAbstract = 1;
+  	var call = requireFunctionCall();
+  	var anObject = requireAnObject();
+  	var isCallable = requireIsCallable();
+  	var classof = requireClassofRaw();
+  	var regexpExec = requireRegexpExec();
+
+  	var $TypeError = TypeError;
+
+  	// `RegExpExec` abstract operation
+  	// https://tc39.es/ecma262/#sec-regexpexec
+  	regexpExecAbstract = function (R, S) {
+  	  var exec = R.exec;
+  	  if (isCallable(exec)) {
+  	    var result = call(exec, R, S);
+  	    if (result !== null) anObject(result);
+  	    return result;
+  	  }
+  	  if (classof(R) === 'RegExp') return call(regexpExec, R, S);
+  	  throw new $TypeError('RegExp#exec called on incompatible receiver');
+  	};
+  	return regexpExecAbstract;
+  }
+
+  var hasRequiredEs_string_search;
+
+  function requireEs_string_search () {
+  	if (hasRequiredEs_string_search) return es_string_search;
+  	hasRequiredEs_string_search = 1;
+  	var call = requireFunctionCall();
+  	var fixRegExpWellKnownSymbolLogic = requireFixRegexpWellKnownSymbolLogic();
+  	var anObject = requireAnObject();
+  	var isNullOrUndefined = requireIsNullOrUndefined();
+  	var requireObjectCoercible = requireRequireObjectCoercible();
+  	var sameValue = requireSameValue();
+  	var toString = requireToString();
+  	var getMethod = requireGetMethod();
+  	var regExpExec = requireRegexpExecAbstract();
+
+  	// @@search logic
+  	fixRegExpWellKnownSymbolLogic('search', function (SEARCH, nativeSearch, maybeCallNative) {
+  	  return [
+  	    // `String.prototype.search` method
+  	    // https://tc39.es/ecma262/#sec-string.prototype.search
+  	    function search(regexp) {
+  	      var O = requireObjectCoercible(this);
+  	      var searcher = isNullOrUndefined(regexp) ? undefined : getMethod(regexp, SEARCH);
+  	      return searcher ? call(searcher, regexp, O) : new RegExp(regexp)[SEARCH](toString(O));
+  	    },
+  	    // `RegExp.prototype[@@search]` method
+  	    // https://tc39.es/ecma262/#sec-regexp.prototype-@@search
+  	    function (string) {
+  	      var rx = anObject(this);
+  	      var S = toString(string);
+  	      var res = maybeCallNative(nativeSearch, rx, S);
+
+  	      if (res.done) return res.value;
+
+  	      var previousLastIndex = rx.lastIndex;
+  	      if (!sameValue(previousLastIndex, 0)) rx.lastIndex = 0;
+  	      var result = regExpExec(rx, S);
+  	      if (!sameValue(rx.lastIndex, previousLastIndex)) rx.lastIndex = previousLastIndex;
+  	      return result === null ? -1 : result.index;
+  	    }
+  	  ];
+  	});
+  	return es_string_search;
+  }
+
+  requireEs_string_search();
+
+  var es_string_trim = {};
+
+  var whitespaces;
+  var hasRequiredWhitespaces;
+
+  function requireWhitespaces () {
+  	if (hasRequiredWhitespaces) return whitespaces;
+  	hasRequiredWhitespaces = 1;
+  	// a string of all valid unicode whitespaces
+  	whitespaces = '\u0009\u000A\u000B\u000C\u000D\u0020\u00A0\u1680\u2000\u2001\u2002' +
+  	  '\u2003\u2004\u2005\u2006\u2007\u2008\u2009\u200A\u202F\u205F\u3000\u2028\u2029\uFEFF';
+  	return whitespaces;
+  }
+
+  var stringTrim;
+  var hasRequiredStringTrim;
+
+  function requireStringTrim () {
+  	if (hasRequiredStringTrim) return stringTrim;
+  	hasRequiredStringTrim = 1;
+  	var uncurryThis = requireFunctionUncurryThis();
+  	var requireObjectCoercible = requireRequireObjectCoercible();
+  	var toString = requireToString();
+  	var whitespaces = requireWhitespaces();
+
+  	var replace = uncurryThis(''.replace);
+  	var ltrim = RegExp('^[' + whitespaces + ']+');
+  	var rtrim = RegExp('(^|[^' + whitespaces + '])[' + whitespaces + ']+$');
+
+  	// `String.prototype.{ trim, trimStart, trimEnd, trimLeft, trimRight }` methods implementation
+  	var createMethod = function (TYPE) {
+  	  return function ($this) {
+  	    var string = toString(requireObjectCoercible($this));
+  	    if (TYPE & 1) string = replace(string, ltrim, '');
+  	    if (TYPE & 2) string = replace(string, rtrim, '$1');
+  	    return string;
+  	  };
+  	};
+
+  	stringTrim = {
+  	  // `String.prototype.{ trimLeft, trimStart }` methods
+  	  // https://tc39.es/ecma262/#sec-string.prototype.trimstart
+  	  start: createMethod(1),
+  	  // `String.prototype.{ trimRight, trimEnd }` methods
+  	  // https://tc39.es/ecma262/#sec-string.prototype.trimend
+  	  end: createMethod(2),
+  	  // `String.prototype.trim` method
+  	  // https://tc39.es/ecma262/#sec-string.prototype.trim
+  	  trim: createMethod(3)
+  	};
+  	return stringTrim;
+  }
+
+  var stringTrimForced;
+  var hasRequiredStringTrimForced;
+
+  function requireStringTrimForced () {
+  	if (hasRequiredStringTrimForced) return stringTrimForced;
+  	hasRequiredStringTrimForced = 1;
+  	var PROPER_FUNCTION_NAME = requireFunctionName().PROPER;
+  	var fails = requireFails();
+  	var whitespaces = requireWhitespaces();
+
+  	var non = '\u200B\u0085\u180E';
+
+  	// check that a method works with the correct list
+  	// of whitespaces and has a correct name
+  	stringTrimForced = function (METHOD_NAME) {
+  	  return fails(function () {
+  	    return !!whitespaces[METHOD_NAME]()
+  	      || non[METHOD_NAME]() !== non
+  	      || (PROPER_FUNCTION_NAME && whitespaces[METHOD_NAME].name !== METHOD_NAME);
+  	  });
+  	};
+  	return stringTrimForced;
+  }
+
+  var hasRequiredEs_string_trim;
+
+  function requireEs_string_trim () {
+  	if (hasRequiredEs_string_trim) return es_string_trim;
+  	hasRequiredEs_string_trim = 1;
+  	var $ = require_export();
+  	var $trim = requireStringTrim().trim;
+  	var forcedStringTrimMethod = requireStringTrimForced();
+
+  	// `String.prototype.trim` method
+  	// https://tc39.es/ecma262/#sec-string.prototype.trim
+  	$({ target: 'String', proto: true, forced: forcedStringTrimMethod('trim') }, {
+  	  trim: function trim() {
+  	    return $trim(this);
+  	  }
+  	});
+  	return es_string_trim;
+  }
+
+  requireEs_string_trim();
 
   /**
    * @author: aperez <aperez@datadec.es>
@@ -27342,75 +35714,54 @@ if(xr(e,"index.xml"))throw new Error("Unsupported NUMBERS 09 file");throw new Er
    * @update zhixin wen <wenzhixin2010@gmail.com>
    */
 
-  var Utils = $$b.fn.bootstrapTable.utils;
+  var Utils = $.fn.bootstrapTable.utils;
   var theme = {
     bootstrap3: {
-      icons: {
-        advancedSearchIcon: 'glyphicon-chevron-down'
-      },
       classes: {},
       html: {
-        modal: "\n        <div id=\"avdSearchModal_%s\"  class=\"modal fade\" tabindex=\"-1\" role=\"dialog\" aria-labelledby=\"mySmallModalLabel\" aria-hidden=\"true\">\n          <div class=\"modal-dialog modal-xs\">\n            <div class=\"modal-content\">\n              <div class=\"modal-header\">\n                <button type=\"button\" class=\"close\" data-dismiss=\"modal\" aria-label=\"Close\">\n                  <span aria-hidden=\"true\">&times;</span>\n                </button>\n                <h4 class=\"modal-title\">%s</h4>\n              </div>\n              <div class=\"modal-body modal-body-custom\">\n                <div class=\"container-fluid\" id=\"avdSearchModalContent_%s\"\n                  style=\"padding-right: 0px; padding-left: 0px;\" >\n                </div>\n              </div>\n              <div class=\"modal-footer\">\n                <button type=\"button\" id=\"btnCloseAvd_%s\" class=\"btn btn-%s\">%s</button>\n              </div>\n            </div>\n          </div>\n        </div>\n      "
+        modal: "\n        <div id=\"avdSearchModal_%s\" class=\"modal fade\" tabindex=\"-1\" role=\"dialog\" aria-hidden=\"true\">\n          <div class=\"modal-dialog modal-xs\">\n            <div class=\"modal-content\">\n              <div class=\"modal-header\">\n                <button class=\"close toolbar-modal-close\" data-dismiss=\"modal\" aria-label=\"Close\">\n                  <span aria-hidden=\"true\">&times;</span>\n                </button>\n                <h4 class=\"modal-title toolbar-modal-title\"></h4>\n              </div>\n              <div class=\"modal-body toolbar-modal-body\"></div>\n              <div class=\"modal-footer toolbar-modal-footer\">\n                <button class=\"btn btn-%s toolbar-modal-close\"></button>\n              </div>\n            </div>\n          </div>\n        </div>\n      "
       }
     },
     bootstrap4: {
-      icons: {
-        advancedSearchIcon: 'fa-chevron-down'
-      },
       classes: {},
       html: {
-        modal: "\n        <div id=\"avdSearchModal_%s\"  class=\"modal fade\" tabindex=\"-1\" role=\"dialog\" aria-labelledby=\"mySmallModalLabel\" aria-hidden=\"true\">\n          <div class=\"modal-dialog modal-xs\">\n            <div class=\"modal-content\">\n              <div class=\"modal-header\">\n                <h4 class=\"modal-title\">%s</h4>\n                <button type=\"button\" class=\"close\" data-dismiss=\"modal\" aria-label=\"Close\">\n                  <span aria-hidden=\"true\">&times;</span>\n                </button>\n              </div>\n              <div class=\"modal-body modal-body-custom\">\n                <div class=\"container-fluid\" id=\"avdSearchModalContent_%s\"\n                  style=\"padding-right: 0; padding-left: 0;\" >\n                </div>\n              </div>\n              <div class=\"modal-footer\">\n                <button type=\"button\" id=\"btnCloseAvd_%s\" class=\"btn btn-%s\">%s</button>\n              </div>\n            </div>\n          </div>\n        </div>\n      "
+        modal: "\n        <div id=\"avdSearchModal_%s\" class=\"modal fade\" tabindex=\"-1\" role=\"dialog\" aria-hidden=\"true\">\n          <div class=\"modal-dialog modal-xs\">\n            <div class=\"modal-content\">\n              <div class=\"modal-header\">\n                <h4 class=\"modal-title toolbar-modal-title\"></h4>\n                <button class=\"close toolbar-modal-close\" data-dismiss=\"modal\" aria-label=\"Close\">\n                  <span aria-hidden=\"true\">&times;</span>\n                </button>\n              </div>\n              <div class=\"modal-body toolbar-modal-body\"></div>\n              <div class=\"modal-footer toolbar-modal-footer\">\n                <button class=\"btn btn-%s toolbar-modal-close\"></button>\n              </div>\n            </div>\n          </div>\n        </div>\n      "
       }
     },
     bootstrap5: {
-      icons: {
-        advancedSearchIcon: 'bi-chevron-down'
-      },
       classes: {
         formGroup: 'mb-3'
       },
       html: {
-        modal: "\n        <div id=\"avdSearchModal_%s\" class=\"modal fade\" tabindex=\"-1\" aria-labelledby=\"mySmallModalLabel\" aria-hidden=\"true\">\n          <div class=\"modal-dialog modal-xs\">\n            <div class=\"modal-content\">\n              <div class=\"modal-header\">\n                <h5 class=\"modal-title\">%s</h5>\n                <button type=\"button\" class=\"btn-close\" data-bs-dismiss=\"modal\" aria-label=\"Close\"></button>\n              </div>\n              <div class=\"modal-body modal-body-custom\">\n                <div class=\"container-fluid\" id=\"avdSearchModalContent_%s\"\n                  style=\"padding-right: 0; padding-left: 0;\" >\n                </div>\n              </div>\n              <div class=\"modal-footer\">\n                <button type=\"button\" id=\"btnCloseAvd_%s\" class=\"btn btn-%s\">%s</button>\n              </div>\n            </div>\n          </div>\n        </div>\n      "
+        modal: "\n        <div id=\"avdSearchModal_%s\" class=\"modal fade\" tabindex=\"-1\" aria-hidden=\"true\">\n          <div class=\"modal-dialog modal-xs\">\n            <div class=\"modal-content\">\n              <div class=\"modal-header\">\n                <h5 class=\"modal-title toolbar-modal-title\"></h5>\n                <button class=\"btn-close toolbar-modal-close\" data-bs-dismiss=\"modal\" aria-label=\"Close\"></button>\n              </div>\n              <div class=\"modal-body toolbar-modal-body\"></div>\n              <div class=\"modal-footer toolbar-modal-footer\">\n                <button class=\"btn btn-%s toolbar-modal-close\"></button>\n              </div>\n            </div>\n          </div>\n        </div>\n      "
       }
     },
     bulma: {
-      icons: {
-        advancedSearchIcon: 'fa-chevron-down'
-      },
       classes: {},
       html: {
-        modal: "\n        <div class=\"modal\" id=\"avdSearchModal_%s\">\n          <div class=\"modal-background\"></div>\n          <div class=\"modal-card\">\n            <header class=\"modal-card-head\">\n              <p class=\"modal-card-title\">%s</p>\n              <button class=\"delete\" aria-label=\"close\"></button>\n            </header>\n            <section class=\"modal-card-body\" id=\"avdSearchModalContent_%s\"></section>\n            <footer class=\"modal-card-foot\">\n              <button class=\"button\" id=\"btnCloseAvd_%s\" data-close=\"btn btn-%s\">%s</button>\n            </footer>\n          </div>\n        </div>\n      "
+        modal: "\n        <div class=\"modal\" id=\"avdSearchModal_%s\">\n          <div class=\"modal-background\"></div>\n          <div class=\"modal-card\">\n            <header class=\"modal-card-head\">\n              <p class=\"modal-card-title toolbar-modal-title\"></p>\n              <button class=\"delete toolbar-modal-close\"></button>\n            </header>\n            <section class=\"modal-card-body toolbar-modal-body\"></section>\n            <footer class=\"modal-card-foot toolbar-modal-footer\">\n              <button class=\"button button-%s toolbar-modal-close\"></button>\n            </footer>\n          </div>\n        </div>\n      "
       }
     },
     foundation: {
-      icons: {
-        advancedSearchIcon: 'fa-chevron-down'
-      },
       classes: {},
       html: {
-        modal: "\n        <div class=\"reveal\" id=\"avdSearchModal_%s\" data-reveal>\n          <h1>%s</h1>\n          <div id=\"avdSearchModalContent_%s\">\n\n          </div>\n          <button class=\"close-button\" data-close aria-label=\"Close modal\" type=\"button\">\n            <span aria-hidden=\"true\">&times;</span>\n          </button>\n\n          <button id=\"btnCloseAvd_%s\" class=\"%s\" type=\"button\">%s</button>\n        </div>\n      "
+        modal: "\n        <div class=\"reveal\" id=\"avdSearchModal_%s\" data-reveal>\n          <h1 class=\"toolbar-modal-title\"></h1>\n          <div class=\"toolbar-modal-body\"></div>\n          <button class=\"close-button toolbar-modal-close\" data-close aria-label=\"Close modal\">\n            <span aria-hidden=\"true\">&times;</span>\n          </button>\n          <div class=\"toolbar-modal-footer\">\n            <button class=\"button button-%s toolbar-modal-close\"></button>\n          </div>\n        </div>\n      "
       }
     },
     materialize: {
-      icons: {
-        advancedSearchIcon: 'expand_more'
-      },
       classes: {},
       html: {
-        modal: "\n        <div id=\"avdSearchModal_%s\" class=\"modal\">\n          <div class=\"modal-content\">\n            <h4>%s</h4>\n            <div id=\"avdSearchModalContent_%s\">\n\n            </div>\n          </div>\n          <div class=\"modal-footer\">\n            <a href=\"javascript:void(0)\"\" id=\"btnCloseAvd_%s\" class=\"modal-close waves-effect waves-green btn-flat %s\">%s</a>\n          </div>\n        </div>\n      "
+        modal: "\n        <div id=\"avdSearchModal_%s\" class=\"modal\">\n          <div class=\"modal-content\">\n            <h4 class=\"toolbar-modal-title\"></h4>\n            <div class=\"toolbar-modal-body\"></div>\n          </div>\n          <div class=\"modal-footer toolbar-modal-footer\">\n            <a href=\"javascript:void(0)\" class=\"modal-close waves-effect waves-green btn-flat btn-%s toolbar-modal-close\"></a>\n          </div>\n        </div>\n      "
       }
     },
     semantic: {
-      icons: {
-        advancedSearchIcon: 'fa-chevron-down'
-      },
       classes: {},
       html: {
-        modal: "\n        <div class=\"ui modal\" id=\"avdSearchModal_%s\">\n          <i class=\"close icon\"></i>\n          <div class=\"header\">\n            %s\n          </div>\n          <div class=\"image content ui form\" id=\"avdSearchModalContent_%s\"></div>\n          <div class=\"actions\">\n            <div id=\"btnCloseAvd_%s\" class=\"ui black deny button %s\">%s</div>\n          </div>\n        </div>\n      "
+        modal: "\n        <div class=\"ui modal\" id=\"avdSearchModal_%s\">\n          <i class=\"close icon toolbar-modal-close\"></i>\n          <div class=\"header toolbar-modal-title\"\"></div>\n          <div class=\"image content ui form toolbar-modal-body\"></div>\n          <div class=\"actions toolbar-modal-footer\">\n            <div class=\"ui black deny button button-%s toolbar-modal-close\"></div>\n          </div>\n        </div>\n      "
       }
     }
-  }[$$b.fn.bootstrapTable.theme];
-  Object.assign($$b.fn.bootstrapTable.defaults, {
+  }[$.fn.bootstrapTable.theme];
+  Object.assign($.fn.bootstrapTable.defaults, {
     advancedSearch: false,
     idForm: 'advancedSearch',
     actionForm: '',
@@ -27420,13 +35771,16 @@ if(xr(e,"index.xml"))throw new Error("Unsupported NUMBERS 09 file");throw new Er
       return false;
     }
   });
-  Object.assign($$b.fn.bootstrapTable.defaults.icons, {
-    advancedSearchIcon: theme.icons.advancedSearchIcon
+  Utils.assignIcons($.fn.bootstrapTable.icons, 'advancedSearchIcon', {
+    glyphicon: 'glyphicon-chevron-down',
+    fa: 'fa-chevron-down',
+    bi: 'bi-chevron-down',
+    'material-icons': 'expand_more'
   });
-  Object.assign($$b.fn.bootstrapTable.events, {
+  Object.assign($.fn.bootstrapTable.events, {
     'column-advanced-search.bs.table': 'onColumnAdvancedSearch'
   });
-  Object.assign($$b.fn.bootstrapTable.locales, {
+  Object.assign($.fn.bootstrapTable.locales, {
     formatAdvancedSearch: function formatAdvancedSearch() {
       return 'Advanced search';
     },
@@ -27434,8 +35788,8 @@ if(xr(e,"index.xml"))throw new Error("Unsupported NUMBERS 09 file");throw new Er
       return 'Close';
     }
   });
-  Object.assign($$b.fn.bootstrapTable.defaults, $$b.fn.bootstrapTable.locales);
-  $$b.BootstrapTable = /*#__PURE__*/function (_$$BootstrapTable) {
+  Object.assign($.fn.bootstrapTable.defaults, $.fn.bootstrapTable.locales);
+  $.BootstrapTable = /*#__PURE__*/function (_$$BootstrapTable) {
     function _class() {
       _classCallCheck(this, _class);
       return _callSuper(this, _class, arguments);
@@ -27444,101 +35798,91 @@ if(xr(e,"index.xml"))throw new Error("Unsupported NUMBERS 09 file");throw new Er
     return _createClass(_class, [{
       key: "initToolbar",
       value: function initToolbar() {
-        var o = this.options;
-        this.showToolbar = this.showToolbar || o.search && o.advancedSearch && o.idTable;
-        if (o.search && o.advancedSearch && o.idTable) {
+        this.showToolbar = this.showToolbar || this.options.search && this.options.advancedSearch && this.options.idTable;
+        if (this.showToolbar) {
           this.buttons = Object.assign(this.buttons, {
             advancedSearch: {
               text: this.options.formatAdvancedSearch(),
               icon: this.options.icons.advancedSearchIcon,
-              event: this.showAvdSearch,
+              event: this.showAdvancedSearch,
               attributes: {
                 'aria-label': this.options.formatAdvancedSearch(),
                 title: this.options.formatAdvancedSearch()
               }
             }
           });
-        }
-        _get(_getPrototypeOf(_class.prototype), "initToolbar", this).call(this);
-      }
-    }, {
-      key: "showAvdSearch",
-      value: function showAvdSearch() {
-        var _this = this;
-        var o = this.options;
-        var modalSelector = "#avdSearchModal_".concat(o.idTable);
-        if ($$b(modalSelector).length <= 0) {
-          $$b('body').append(Utils.sprintf(theme.html.modal, o.idTable, o.formatAdvancedSearch(), o.idTable, o.idTable, o.buttonsClass, o.formatAdvancedCloseButton()));
-          var timeoutId = 0;
-          $$b("#avdSearchModalContent_".concat(o.idTable)).append(this.createFormAvd().join(''));
-          $$b("#".concat(o.idForm)).off('keyup blur', 'input').on('keyup blur', 'input', function (e) {
-            if (o.sidePagination === 'server') {
-              _this.onColumnAdvancedSearch(e);
-            } else {
-              clearTimeout(timeoutId);
-              timeoutId = setTimeout(function () {
-                _this.onColumnAdvancedSearch(e);
-              }, o.searchTimeOut);
-            }
-          });
-          $$b("#btnCloseAvd_".concat(o.idTable)).click(function () {
-            return _this.hideModal();
-          });
-          if ($$b.fn.bootstrapTable.theme === 'bulma') {
-            $$b(modalSelector).find('.delete').off('click').on('click', function () {
-              return _this.hideModal();
-            });
+          if (Utils.isEmptyObject(this.filterColumnsPartial)) {
+            this.filterColumnsPartial = {};
           }
-          this.showModal();
-        } else {
-          this.showModal();
         }
+        _superPropGet(_class, "initToolbar", this)([]);
       }
     }, {
-      key: "showModal",
-      value: function showModal() {
-        var modalSelector = "#avdSearchModal_".concat(this.options.idTable);
-        if ($$b.inArray($$b.fn.bootstrapTable.theme, ['bootstrap3', 'bootstrap4']) !== -1) {
-          $$b(modalSelector).modal();
-        } else if ($$b.fn.bootstrapTable.theme === 'bootstrap5') {
+      key: "showAdvancedSearch",
+      value: function showAdvancedSearch() {
+        var _this = this;
+        this.$toolbarModal = $("#avdSearchModal_".concat(this.options.idTable));
+        if (this.$toolbarModal.length <= 0) {
+          $('body').append(Utils.sprintf(theme.html.modal, this.options.idTable, this.options.buttonsClass));
+          this.$toolbarModal = $("#avdSearchModal_".concat(this.options.idTable));
+          this.$toolbarModal.find('.toolbar-modal-close').off('click').on('click', function () {
+            return _this.hideToolbarModal();
+          });
+        }
+        this.initToolbarModalBody();
+        this.showToolbarModal();
+      }
+    }, {
+      key: "initToolbarModalBody",
+      value: function initToolbarModalBody() {
+        var _this2 = this;
+        this.$toolbarModal.find('.toolbar-modal-title').html(this.options.formatAdvancedSearch());
+        this.$toolbarModal.find('.toolbar-modal-footer .toolbar-modal-close').html(this.options.formatAdvancedCloseButton());
+        this.$toolbarModal.find('.toolbar-modal-body').html(this.createToolbarForm()).off('keyup blur', 'input').on('keyup blur', 'input', function (e) {
+          _this2.onColumnAdvancedSearch(e);
+        });
+      }
+    }, {
+      key: "showToolbarModal",
+      value: function showToolbarModal() {
+        var theme = $.fn.bootstrapTable.theme;
+        if (['bootstrap3', 'bootstrap4'].includes(theme)) {
+          this.$toolbarModal.modal();
+        } else if (theme === 'bootstrap5') {
           if (!this.toolbarModal) {
-            //   eslint-disable-next-line no-undef
-            this.toolbarModal = new bootstrap.Modal(document.getElementById("avdSearchModal_".concat(this.options.idTable)), {});
+            this.toolbarModal = new window.bootstrap.Modal(this.$toolbarModal[0], {});
           }
           this.toolbarModal.show();
-        } else if ($$b.fn.bootstrapTable.theme === 'bulma') {
-          $$b(modalSelector).toggleClass('is-active');
-        } else if ($$b.fn.bootstrapTable.theme === 'foundation') {
+        } else if (theme === 'bulma') {
+          this.$toolbarModal.toggleClass('is-active');
+        } else if (theme === 'foundation') {
           if (!this.toolbarModal) {
-            // eslint-disable-next-line no-undef
-            this.toolbarModal = new Foundation.Reveal($$b(modalSelector));
+            this.toolbarModal = new window.Foundation.Reveal(this.$toolbarModal);
           }
           this.toolbarModal.open();
-        } else if ($$b.fn.bootstrapTable.theme === 'materialize') {
-          $$b(modalSelector).modal();
-          $$b(modalSelector).modal('open');
-        } else if ($$b.fn.bootstrapTable.theme === 'semantic') {
-          $$b(modalSelector).modal('show');
+        } else if (theme === 'materialize') {
+          this.$toolbarModal.modal().modal('open');
+        } else if (theme === 'semantic') {
+          this.$toolbarModal.modal('show');
         }
       }
     }, {
-      key: "hideModal",
-      value: function hideModal() {
-        var $closeModalButton = $$b("#avdSearchModal_".concat(this.options.idTable));
-        var modalSelector = "#avdSearchModal_".concat(this.options.idTable);
-        if ($$b.inArray($$b.fn.bootstrapTable.theme, ['bootstrap3', 'bootstrap4']) !== -1) {
-          $closeModalButton.modal('hide');
-        } else if ($$b.fn.bootstrapTable.theme === 'bootstrap5') {
+      key: "hideToolbarModal",
+      value: function hideToolbarModal() {
+        var theme = $.fn.bootstrapTable.theme;
+        if (['bootstrap3', 'bootstrap4'].includes(theme)) {
+          this.$toolbarModal.modal('hide');
+        } else if (theme === 'bootstrap5') {
           this.toolbarModal.hide();
-        } else if ($$b.fn.bootstrapTable.theme === 'bulma') {
-          $$b('html').toggleClass('is-clipped');
-          $$b(modalSelector).toggleClass('is-active');
-        } else if ($$b.fn.bootstrapTable.theme === 'foundation') {
+        } else if (theme === 'bulma') {
+          $('html').toggleClass('is-clipped');
+          this.$toolbarModal.toggleClass('is-active');
+        } else if (theme === 'foundation') {
           this.toolbarModal.close();
-        } else if ($$b.fn.bootstrapTable.theme === 'materialize') {
-          $$b(modalSelector).modal('open');
-        } else if ($$b.fn.bootstrapTable.theme === 'semantic') {
-          $$b(modalSelector).modal('close');
+        } else if (theme === 'materialize') {
+          this.$toolbarModal.modal('open');
+        } else if (theme === 'semantic') {
+          this.$toolbarModal.modal('close');
         }
         if (this.options.sidePagination === 'server') {
           this.options.pageNumber = 1;
@@ -27547,17 +35891,18 @@ if(xr(e,"index.xml"))throw new Error("Unsupported NUMBERS 09 file");throw new Er
         }
       }
     }, {
-      key: "createFormAvd",
-      value: function createFormAvd() {
-        var o = this.options;
-        var html = ["<form class=\"form-horizontal\" id=\"".concat(o.idForm, "\" action=\"").concat(o.actionForm, "\">")];
+      key: "createToolbarForm",
+      value: function createToolbarForm() {
+        var html = ["<form class=\"form-horizontal toolbar-model-form\" action=\"".concat(this.options.actionForm, "\">")];
         var _iterator = _createForOfIteratorHelper(this.columns),
           _step;
         try {
           for (_iterator.s(); !(_step = _iterator.n()).done;) {
             var column = _step.value;
             if (!column.checkbox && column.visible && column.searchable) {
-              html.push("\n          <div class=\"form-group row ".concat(theme.classes.formGroup || '', "\">\n            <label class=\"col-sm-4 control-label\">").concat(column.title, "</label>\n            <div class=\"col-sm-6\">\n              <input type=\"text\" class=\"form-control ").concat(this.constants.classes.input, "\" name=\"").concat(column.field, "\" placeholder=\"").concat(column.title, "\" id=\"").concat(column.field, "\">\n            </div>\n          </div>\n        "));
+              var title = $('<div/>').html(column.title).text().trim();
+              var value = this.filterColumnsPartial[column.field] || '';
+              html.push("\n          <div class=\"form-group row ".concat(theme.classes.formGroup || '', "\">\n            <label class=\"col-sm-4 control-label\">").concat(title, "</label>\n            <div class=\"col-sm-6\">\n              <input type=\"text\" class=\"form-control ").concat(this.constants.classes.input, "\"\n                name=\"").concat(column.field, "\" placeholder=\"").concat(title, "\" value=\"").concat(value, "\">\n            </div>\n          </div>\n        "));
             }
           }
         } catch (err) {
@@ -27566,17 +35911,17 @@ if(xr(e,"index.xml"))throw new Error("Unsupported NUMBERS 09 file");throw new Er
           _iterator.f();
         }
         html.push('</form>');
-        return html;
+        return html.join('');
       }
     }, {
       key: "initSearch",
       value: function initSearch() {
-        var _this2 = this;
-        _get(_getPrototypeOf(_class.prototype), "initSearch", this).call(this);
+        var _this3 = this;
+        _superPropGet(_class, "initSearch", this)([]);
         if (!this.options.advancedSearch || this.options.sidePagination === 'server') {
           return;
         }
-        var fp = $$b.isEmptyObject(this.filterColumnsPartial) ? null : this.filterColumnsPartial;
+        var fp = Utils.isEmptyObject(this.filterColumnsPartial) ? null : this.filterColumnsPartial;
         this.data = fp ? this.data.filter(function (item, i) {
           for (var _i = 0, _Object$entries = Object.entries(fp); _i < _Object$entries.length; _i++) {
             var _Object$entries$_i = _slicedToArray(_Object$entries[_i], 2),
@@ -27584,8 +35929,12 @@ if(xr(e,"index.xml"))throw new Error("Unsupported NUMBERS 09 file");throw new Er
               v = _Object$entries$_i[1];
             var val = v.toLowerCase();
             var value = item[key];
-            var index = _this2.header.fields.indexOf(key);
-            value = Utils.calculateObjectValue(_this2.header, _this2.header.formatters[index], [value, item, i], value);
+            var index = _this3.header.fields.indexOf(key);
+            value = Utils.calculateObjectValue(_this3.header, _this3.header.formatters[index], [value, item, i], value);
+            if (_this3.header.formatters[index]) {
+              // search innerText
+              value = $('<div>').html(value).text();
+            }
             if (!(index !== -1 && (typeof value === 'string' || typeof value === 'number') && "".concat(value).toLowerCase().includes(val))) {
               return false;
             }
@@ -27597,24 +35946,21 @@ if(xr(e,"index.xml"))throw new Error("Unsupported NUMBERS 09 file");throw new Er
     }, {
       key: "onColumnAdvancedSearch",
       value: function onColumnAdvancedSearch(e) {
-        var text = $$b(e.currentTarget).val().trim();
-        var $field = $$b(e.currentTarget)[0].id;
-        if ($$b.isEmptyObject(this.filterColumnsPartial)) {
-          this.filterColumnsPartial = {};
-        }
+        var text = $(e.currentTarget).val().trim();
+        var field = $(e.currentTarget).attr('name');
         if (text) {
-          this.filterColumnsPartial[$field] = text;
+          this.filterColumnsPartial[field] = text;
         } else {
-          delete this.filterColumnsPartial[$field];
+          delete this.filterColumnsPartial[field];
         }
         if (this.options.sidePagination !== 'server') {
           this.options.pageNumber = 1;
           this.initSearch();
           this.updatePagination();
-          this.trigger('column-advanced-search', $field, text);
+          this.trigger('column-advanced-search', field, text);
         }
       }
     }]);
-  }($$b.BootstrapTable);
+  }($.BootstrapTable);
 
 }));
diff --git a/public/js/select2/i18n/af.js b/public/js/select2/i18n/af.js
new file mode 100644
index 0000000000..32e5ac7de8
--- /dev/null
+++ b/public/js/select2/i18n/af.js
@@ -0,0 +1,3 @@
+/*! Select2 4.0.13 | https://github.com/select2/select2/blob/master/LICENSE.md */
+
+!function(){if(jQuery&&jQuery.fn&&jQuery.fn.select2&&jQuery.fn.select2.amd)var e=jQuery.fn.select2.amd;e.define("select2/i18n/af",[],function(){return{errorLoading:function(){return"Die resultate kon nie gelaai word nie."},inputTooLong:function(e){var n=e.input.length-e.maximum,r="Verwyders asseblief "+n+" character";return 1!=n&&(r+="s"),r},inputTooShort:function(e){return"Voer asseblief "+(e.minimum-e.input.length)+" of meer karakters"},loadingMore:function(){return"Meer resultate word gelaai…"},maximumSelected:function(e){var n="Kies asseblief net "+e.maximum+" item";return 1!=e.maximum&&(n+="s"),n},noResults:function(){return"Geen resultate gevind"},searching:function(){return"Besig…"},removeAllItems:function(){return"Verwyder alle items"}}}),e.define,e.require}();
\ No newline at end of file
diff --git a/public/js/select2/i18n/ar.js b/public/js/select2/i18n/ar.js
new file mode 100644
index 0000000000..64e1caad34
--- /dev/null
+++ b/public/js/select2/i18n/ar.js
@@ -0,0 +1,3 @@
+/*! Select2 4.0.13 | https://github.com/select2/select2/blob/master/LICENSE.md */
+
+!function(){if(jQuery&&jQuery.fn&&jQuery.fn.select2&&jQuery.fn.select2.amd)var n=jQuery.fn.select2.amd;n.define("select2/i18n/ar",[],function(){return{errorLoading:function(){return"لا يمكن تحميل النتائج"},inputTooLong:function(n){return"الرجاء حذف "+(n.input.length-n.maximum)+" عناصر"},inputTooShort:function(n){return"الرجاء إضافة "+(n.minimum-n.input.length)+" عناصر"},loadingMore:function(){return"جاري تحميل نتائج إضافية..."},maximumSelected:function(n){return"تستطيع إختيار "+n.maximum+" بنود فقط"},noResults:function(){return"لم يتم العثور على أي نتائج"},searching:function(){return"جاري البحث…"},removeAllItems:function(){return"قم بإزالة كل العناصر"}}}),n.define,n.require}();
\ No newline at end of file
diff --git a/public/js/select2/i18n/az.js b/public/js/select2/i18n/az.js
new file mode 100644
index 0000000000..1d52c260f2
--- /dev/null
+++ b/public/js/select2/i18n/az.js
@@ -0,0 +1,3 @@
+/*! Select2 4.0.13 | https://github.com/select2/select2/blob/master/LICENSE.md */
+
+!function(){if(jQuery&&jQuery.fn&&jQuery.fn.select2&&jQuery.fn.select2.amd)var n=jQuery.fn.select2.amd;n.define("select2/i18n/az",[],function(){return{inputTooLong:function(n){return n.input.length-n.maximum+" simvol silin"},inputTooShort:function(n){return n.minimum-n.input.length+" simvol daxil edin"},loadingMore:function(){return"Daha çox nəticə yüklənir…"},maximumSelected:function(n){return"Sadəcə "+n.maximum+" element seçə bilərsiniz"},noResults:function(){return"Nəticə tapılmadı"},searching:function(){return"Axtarılır…"},removeAllItems:function(){return"Bütün elementləri sil"}}}),n.define,n.require}();
\ No newline at end of file
diff --git a/public/js/select2/i18n/bg.js b/public/js/select2/i18n/bg.js
new file mode 100644
index 0000000000..73b730a705
--- /dev/null
+++ b/public/js/select2/i18n/bg.js
@@ -0,0 +1,3 @@
+/*! Select2 4.0.13 | https://github.com/select2/select2/blob/master/LICENSE.md */
+
+!function(){if(jQuery&&jQuery.fn&&jQuery.fn.select2&&jQuery.fn.select2.amd)var n=jQuery.fn.select2.amd;n.define("select2/i18n/bg",[],function(){return{inputTooLong:function(n){var e=n.input.length-n.maximum,u="Моля въведете с "+e+" по-малко символ";return e>1&&(u+="a"),u},inputTooShort:function(n){var e=n.minimum-n.input.length,u="Моля въведете още "+e+" символ";return e>1&&(u+="a"),u},loadingMore:function(){return"Зареждат се още…"},maximumSelected:function(n){var e="Можете да направите до "+n.maximum+" ";return n.maximum>1?e+="избора":e+="избор",e},noResults:function(){return"Няма намерени съвпадения"},searching:function(){return"Търсене…"},removeAllItems:function(){return"Премахнете всички елементи"}}}),n.define,n.require}();
\ No newline at end of file
diff --git a/public/js/select2/i18n/bn.js b/public/js/select2/i18n/bn.js
new file mode 100644
index 0000000000..2d17b9d8e0
--- /dev/null
+++ b/public/js/select2/i18n/bn.js
@@ -0,0 +1,3 @@
+/*! Select2 4.0.13 | https://github.com/select2/select2/blob/master/LICENSE.md */
+
+!function(){if(jQuery&&jQuery.fn&&jQuery.fn.select2&&jQuery.fn.select2.amd)var n=jQuery.fn.select2.amd;n.define("select2/i18n/bn",[],function(){return{errorLoading:function(){return"ফলাফলগুলি লোড করা যায়নি।"},inputTooLong:function(n){var e=n.input.length-n.maximum,u="অনুগ্রহ করে "+e+" টি অক্ষর মুছে দিন।";return 1!=e&&(u="অনুগ্রহ করে "+e+" টি অক্ষর মুছে দিন।"),u},inputTooShort:function(n){return n.minimum-n.input.length+" টি অক্ষর অথবা অধিক অক্ষর লিখুন।"},loadingMore:function(){return"আরো ফলাফল লোড হচ্ছে ..."},maximumSelected:function(n){var e=n.maximum+" টি আইটেম নির্বাচন করতে পারবেন।";return 1!=n.maximum&&(e=n.maximum+" টি আইটেম নির্বাচন করতে পারবেন।"),e},noResults:function(){return"কোন ফলাফল পাওয়া যায়নি।"},searching:function(){return"অনুসন্ধান করা হচ্ছে ..."}}}),n.define,n.require}();
\ No newline at end of file
diff --git a/public/js/select2/i18n/bs.js b/public/js/select2/i18n/bs.js
new file mode 100644
index 0000000000..46b084d758
--- /dev/null
+++ b/public/js/select2/i18n/bs.js
@@ -0,0 +1,3 @@
+/*! Select2 4.0.13 | https://github.com/select2/select2/blob/master/LICENSE.md */
+
+!function(){if(jQuery&&jQuery.fn&&jQuery.fn.select2&&jQuery.fn.select2.amd)var e=jQuery.fn.select2.amd;e.define("select2/i18n/bs",[],function(){function e(e,n,r,t){return e%10==1&&e%100!=11?n:e%10>=2&&e%10<=4&&(e%100<12||e%100>14)?r:t}return{errorLoading:function(){return"Preuzimanje nije uspijelo."},inputTooLong:function(n){var r=n.input.length-n.maximum,t="Obrišite "+r+" simbol";return t+=e(r,"","a","a")},inputTooShort:function(n){var r=n.minimum-n.input.length,t="Ukucajte bar još "+r+" simbol";return t+=e(r,"","a","a")},loadingMore:function(){return"Preuzimanje još rezultata…"},maximumSelected:function(n){var r="Možete izabrati samo "+n.maximum+" stavk";return r+=e(n.maximum,"u","e","i")},noResults:function(){return"Ništa nije pronađeno"},searching:function(){return"Pretraga…"},removeAllItems:function(){return"Uklonite sve stavke"}}}),e.define,e.require}();
\ No newline at end of file
diff --git a/public/js/select2/i18n/build.txt b/public/js/select2/i18n/build.txt
new file mode 100644
index 0000000000..8f319f29c3
--- /dev/null
+++ b/public/js/select2/i18n/build.txt
@@ -0,0 +1,236 @@
+
+af.js
+----------------
+af.js
+
+ar.js
+----------------
+ar.js
+
+az.js
+----------------
+az.js
+
+bg.js
+----------------
+bg.js
+
+bn.js
+----------------
+bn.js
+
+bs.js
+----------------
+bs.js
+
+ca.js
+----------------
+ca.js
+
+cs.js
+----------------
+cs.js
+
+da.js
+----------------
+da.js
+
+de.js
+----------------
+de.js
+
+dsb.js
+----------------
+dsb.js
+
+el.js
+----------------
+el.js
+
+en.js
+----------------
+en.js
+
+es.js
+----------------
+es.js
+
+et.js
+----------------
+et.js
+
+eu.js
+----------------
+eu.js
+
+fa.js
+----------------
+fa.js
+
+fi.js
+----------------
+fi.js
+
+fr.js
+----------------
+fr.js
+
+gl.js
+----------------
+gl.js
+
+he.js
+----------------
+he.js
+
+hi.js
+----------------
+hi.js
+
+hr.js
+----------------
+hr.js
+
+hsb.js
+----------------
+hsb.js
+
+hu.js
+----------------
+hu.js
+
+hy.js
+----------------
+hy.js
+
+id.js
+----------------
+id.js
+
+is.js
+----------------
+is.js
+
+it.js
+----------------
+it.js
+
+ja.js
+----------------
+ja.js
+
+ka.js
+----------------
+ka.js
+
+km.js
+----------------
+km.js
+
+ko.js
+----------------
+ko.js
+
+lt.js
+----------------
+lt.js
+
+lv.js
+----------------
+lv.js
+
+mk.js
+----------------
+mk.js
+
+ms.js
+----------------
+ms.js
+
+nb.js
+----------------
+nb.js
+
+ne.js
+----------------
+ne.js
+
+nl.js
+----------------
+nl.js
+
+pl.js
+----------------
+pl.js
+
+ps.js
+----------------
+ps.js
+
+pt-BR.js
+----------------
+pt-BR.js
+
+pt.js
+----------------
+pt.js
+
+ro.js
+----------------
+ro.js
+
+ru.js
+----------------
+ru.js
+
+sk.js
+----------------
+sk.js
+
+sl.js
+----------------
+sl.js
+
+sq.js
+----------------
+sq.js
+
+sr-Cyrl.js
+----------------
+sr-Cyrl.js
+
+sr.js
+----------------
+sr.js
+
+sv.js
+----------------
+sv.js
+
+th.js
+----------------
+th.js
+
+tk.js
+----------------
+tk.js
+
+tr.js
+----------------
+tr.js
+
+uk.js
+----------------
+uk.js
+
+vi.js
+----------------
+vi.js
+
+zh-CN.js
+----------------
+zh-CN.js
+
+zh-TW.js
+----------------
+zh-TW.js
diff --git a/public/js/select2/i18n/ca.js b/public/js/select2/i18n/ca.js
new file mode 100644
index 0000000000..82dbbb7a21
--- /dev/null
+++ b/public/js/select2/i18n/ca.js
@@ -0,0 +1,3 @@
+/*! Select2 4.0.13 | https://github.com/select2/select2/blob/master/LICENSE.md */
+
+!function(){if(jQuery&&jQuery.fn&&jQuery.fn.select2&&jQuery.fn.select2.amd)var e=jQuery.fn.select2.amd;e.define("select2/i18n/ca",[],function(){return{errorLoading:function(){return"La càrrega ha fallat"},inputTooLong:function(e){var n=e.input.length-e.maximum,r="Si us plau, elimina "+n+" car";return r+=1==n?"àcter":"àcters"},inputTooShort:function(e){var n=e.minimum-e.input.length,r="Si us plau, introdueix "+n+" car";return r+=1==n?"àcter":"àcters"},loadingMore:function(){return"Carregant més resultats…"},maximumSelected:function(e){var n="Només es pot seleccionar "+e.maximum+" element";return 1!=e.maximum&&(n+="s"),n},noResults:function(){return"No s'han trobat resultats"},searching:function(){return"Cercant…"},removeAllItems:function(){return"Treu tots els elements"}}}),e.define,e.require}();
\ No newline at end of file
diff --git a/public/js/select2/i18n/cs.js b/public/js/select2/i18n/cs.js
new file mode 100644
index 0000000000..7116d6c1df
--- /dev/null
+++ b/public/js/select2/i18n/cs.js
@@ -0,0 +1,3 @@
+/*! Select2 4.0.13 | https://github.com/select2/select2/blob/master/LICENSE.md */
+
+!function(){if(jQuery&&jQuery.fn&&jQuery.fn.select2&&jQuery.fn.select2.amd)var e=jQuery.fn.select2.amd;e.define("select2/i18n/cs",[],function(){function e(e,n){switch(e){case 2:return n?"dva":"dvě";case 3:return"tři";case 4:return"čtyři"}return""}return{errorLoading:function(){return"Výsledky nemohly být načteny."},inputTooLong:function(n){var t=n.input.length-n.maximum;return 1==t?"Prosím, zadejte o jeden znak méně.":t<=4?"Prosím, zadejte o "+e(t,!0)+" znaky méně.":"Prosím, zadejte o "+t+" znaků méně."},inputTooShort:function(n){var t=n.minimum-n.input.length;return 1==t?"Prosím, zadejte ještě jeden znak.":t<=4?"Prosím, zadejte ještě další "+e(t,!0)+" znaky.":"Prosím, zadejte ještě dalších "+t+" znaků."},loadingMore:function(){return"Načítají se další výsledky…"},maximumSelected:function(n){var t=n.maximum;return 1==t?"Můžete zvolit jen jednu položku.":t<=4?"Můžete zvolit maximálně "+e(t,!1)+" položky.":"Můžete zvolit maximálně "+t+" položek."},noResults:function(){return"Nenalezeny žádné položky."},searching:function(){return"Vyhledávání…"},removeAllItems:function(){return"Odstraňte všechny položky"}}}),e.define,e.require}();
\ No newline at end of file
diff --git a/public/js/select2/i18n/da.js b/public/js/select2/i18n/da.js
new file mode 100644
index 0000000000..cda32c34aa
--- /dev/null
+++ b/public/js/select2/i18n/da.js
@@ -0,0 +1,3 @@
+/*! Select2 4.0.13 | https://github.com/select2/select2/blob/master/LICENSE.md */
+
+!function(){if(jQuery&&jQuery.fn&&jQuery.fn.select2&&jQuery.fn.select2.amd)var e=jQuery.fn.select2.amd;e.define("select2/i18n/da",[],function(){return{errorLoading:function(){return"Resultaterne kunne ikke indlæses."},inputTooLong:function(e){return"Angiv venligst "+(e.input.length-e.maximum)+" tegn mindre"},inputTooShort:function(e){return"Angiv venligst "+(e.minimum-e.input.length)+" tegn mere"},loadingMore:function(){return"Indlæser flere resultater…"},maximumSelected:function(e){var n="Du kan kun vælge "+e.maximum+" emne";return 1!=e.maximum&&(n+="r"),n},noResults:function(){return"Ingen resultater fundet"},searching:function(){return"Søger…"},removeAllItems:function(){return"Fjern alle elementer"}}}),e.define,e.require}();
\ No newline at end of file
diff --git a/public/js/select2/i18n/de.js b/public/js/select2/i18n/de.js
new file mode 100644
index 0000000000..c2e61e5800
--- /dev/null
+++ b/public/js/select2/i18n/de.js
@@ -0,0 +1,3 @@
+/*! Select2 4.0.13 | https://github.com/select2/select2/blob/master/LICENSE.md */
+
+!function(){if(jQuery&&jQuery.fn&&jQuery.fn.select2&&jQuery.fn.select2.amd)var e=jQuery.fn.select2.amd;e.define("select2/i18n/de",[],function(){return{errorLoading:function(){return"Die Ergebnisse konnten nicht geladen werden."},inputTooLong:function(e){return"Bitte "+(e.input.length-e.maximum)+" Zeichen weniger eingeben"},inputTooShort:function(e){return"Bitte "+(e.minimum-e.input.length)+" Zeichen mehr eingeben"},loadingMore:function(){return"Lade mehr Ergebnisse…"},maximumSelected:function(e){var n="Sie können nur "+e.maximum+" Element";return 1!=e.maximum&&(n+="e"),n+=" auswählen"},noResults:function(){return"Keine Übereinstimmungen gefunden"},searching:function(){return"Suche…"},removeAllItems:function(){return"Entferne alle Elemente"}}}),e.define,e.require}();
\ No newline at end of file
diff --git a/public/js/select2/i18n/dsb.js b/public/js/select2/i18n/dsb.js
new file mode 100644
index 0000000000..02f283abad
--- /dev/null
+++ b/public/js/select2/i18n/dsb.js
@@ -0,0 +1,3 @@
+/*! Select2 4.0.13 | https://github.com/select2/select2/blob/master/LICENSE.md */
+
+!function(){if(jQuery&&jQuery.fn&&jQuery.fn.select2&&jQuery.fn.select2.amd)var n=jQuery.fn.select2.amd;n.define("select2/i18n/dsb",[],function(){var n=["znamuško","znamušce","znamuška","znamuškow"],e=["zapisk","zapiska","zapiski","zapiskow"],u=function(n,e){return 1===n?e[0]:2===n?e[1]:n>2&&n<=4?e[2]:n>=5?e[3]:void 0};return{errorLoading:function(){return"Wuslědki njejsu se dali zacytaś."},inputTooLong:function(e){var a=e.input.length-e.maximum;return"Pšosym lašuj "+a+" "+u(a,n)},inputTooShort:function(e){var a=e.minimum-e.input.length;return"Pšosym zapódaj nanejmjenjej "+a+" "+u(a,n)},loadingMore:function(){return"Dalšne wuslědki se zacytaju…"},maximumSelected:function(n){return"Móžoš jano "+n.maximum+" "+u(n.maximum,e)+"wubraś."},noResults:function(){return"Žedne wuslědki namakane"},searching:function(){return"Pyta se…"},removeAllItems:function(){return"Remove all items"}}}),n.define,n.require}();
\ No newline at end of file
diff --git a/public/js/select2/i18n/el.js b/public/js/select2/i18n/el.js
new file mode 100644
index 0000000000..d4922a1df5
--- /dev/null
+++ b/public/js/select2/i18n/el.js
@@ -0,0 +1,3 @@
+/*! Select2 4.0.13 | https://github.com/select2/select2/blob/master/LICENSE.md */
+
+!function(){if(jQuery&&jQuery.fn&&jQuery.fn.select2&&jQuery.fn.select2.amd)var n=jQuery.fn.select2.amd;n.define("select2/i18n/el",[],function(){return{errorLoading:function(){return"Τα αποτελέσματα δεν μπόρεσαν να φορτώσουν."},inputTooLong:function(n){var e=n.input.length-n.maximum,u="Παρακαλώ διαγράψτε "+e+" χαρακτήρ";return 1==e&&(u+="α"),1!=e&&(u+="ες"),u},inputTooShort:function(n){return"Παρακαλώ συμπληρώστε "+(n.minimum-n.input.length)+" ή περισσότερους χαρακτήρες"},loadingMore:function(){return"Φόρτωση περισσότερων αποτελεσμάτων…"},maximumSelected:function(n){var e="Μπορείτε να επιλέξετε μόνο "+n.maximum+" επιλογ";return 1==n.maximum&&(e+="ή"),1!=n.maximum&&(e+="ές"),e},noResults:function(){return"Δεν βρέθηκαν αποτελέσματα"},searching:function(){return"Αναζήτηση…"},removeAllItems:function(){return"Καταργήστε όλα τα στοιχεία"}}}),n.define,n.require}();
\ No newline at end of file
diff --git a/public/js/select2/i18n/en.js b/public/js/select2/i18n/en.js
new file mode 100644
index 0000000000..3b19285734
--- /dev/null
+++ b/public/js/select2/i18n/en.js
@@ -0,0 +1,3 @@
+/*! Select2 4.0.13 | https://github.com/select2/select2/blob/master/LICENSE.md */
+
+!function(){if(jQuery&&jQuery.fn&&jQuery.fn.select2&&jQuery.fn.select2.amd)var e=jQuery.fn.select2.amd;e.define("select2/i18n/en",[],function(){return{errorLoading:function(){return"The results could not be loaded."},inputTooLong:function(e){var n=e.input.length-e.maximum,r="Please delete "+n+" character";return 1!=n&&(r+="s"),r},inputTooShort:function(e){return"Please enter "+(e.minimum-e.input.length)+" or more characters"},loadingMore:function(){return"Loading more results…"},maximumSelected:function(e){var n="You can only select "+e.maximum+" item";return 1!=e.maximum&&(n+="s"),n},noResults:function(){return"No results found"},searching:function(){return"Searching…"},removeAllItems:function(){return"Remove all items"}}}),e.define,e.require}();
\ No newline at end of file
diff --git a/public/js/select2/i18n/es.js b/public/js/select2/i18n/es.js
new file mode 100644
index 0000000000..68afd6d259
--- /dev/null
+++ b/public/js/select2/i18n/es.js
@@ -0,0 +1,3 @@
+/*! Select2 4.0.13 | https://github.com/select2/select2/blob/master/LICENSE.md */
+
+!function(){if(jQuery&&jQuery.fn&&jQuery.fn.select2&&jQuery.fn.select2.amd)var e=jQuery.fn.select2.amd;e.define("select2/i18n/es",[],function(){return{errorLoading:function(){return"No se pudieron cargar los resultados"},inputTooLong:function(e){var n=e.input.length-e.maximum,r="Por favor, elimine "+n+" car";return r+=1==n?"ácter":"acteres"},inputTooShort:function(e){var n=e.minimum-e.input.length,r="Por favor, introduzca "+n+" car";return r+=1==n?"ácter":"acteres"},loadingMore:function(){return"Cargando más resultados…"},maximumSelected:function(e){var n="Sólo puede seleccionar "+e.maximum+" elemento";return 1!=e.maximum&&(n+="s"),n},noResults:function(){return"No se encontraron resultados"},searching:function(){return"Buscando…"},removeAllItems:function(){return"Eliminar todos los elementos"}}}),e.define,e.require}();
\ No newline at end of file
diff --git a/public/js/select2/i18n/et.js b/public/js/select2/i18n/et.js
new file mode 100644
index 0000000000..070b61a26d
--- /dev/null
+++ b/public/js/select2/i18n/et.js
@@ -0,0 +1,3 @@
+/*! Select2 4.0.13 | https://github.com/select2/select2/blob/master/LICENSE.md */
+
+!function(){if(jQuery&&jQuery.fn&&jQuery.fn.select2&&jQuery.fn.select2.amd)var e=jQuery.fn.select2.amd;e.define("select2/i18n/et",[],function(){return{inputTooLong:function(e){var n=e.input.length-e.maximum,t="Sisesta "+n+" täht";return 1!=n&&(t+="e"),t+=" vähem"},inputTooShort:function(e){var n=e.minimum-e.input.length,t="Sisesta "+n+" täht";return 1!=n&&(t+="e"),t+=" rohkem"},loadingMore:function(){return"Laen tulemusi…"},maximumSelected:function(e){var n="Saad vaid "+e.maximum+" tulemus";return 1==e.maximum?n+="e":n+="t",n+=" valida"},noResults:function(){return"Tulemused puuduvad"},searching:function(){return"Otsin…"},removeAllItems:function(){return"Eemalda kõik esemed"}}}),e.define,e.require}();
\ No newline at end of file
diff --git a/public/js/select2/i18n/eu.js b/public/js/select2/i18n/eu.js
new file mode 100644
index 0000000000..90d5e73f8a
--- /dev/null
+++ b/public/js/select2/i18n/eu.js
@@ -0,0 +1,3 @@
+/*! Select2 4.0.13 | https://github.com/select2/select2/blob/master/LICENSE.md */
+
+!function(){if(jQuery&&jQuery.fn&&jQuery.fn.select2&&jQuery.fn.select2.amd)var e=jQuery.fn.select2.amd;e.define("select2/i18n/eu",[],function(){return{inputTooLong:function(e){var t=e.input.length-e.maximum,n="Idatzi ";return n+=1==t?"karaktere bat":t+" karaktere",n+=" gutxiago"},inputTooShort:function(e){var t=e.minimum-e.input.length,n="Idatzi ";return n+=1==t?"karaktere bat":t+" karaktere",n+=" gehiago"},loadingMore:function(){return"Emaitza gehiago kargatzen…"},maximumSelected:function(e){return 1===e.maximum?"Elementu bakarra hauta dezakezu":e.maximum+" elementu hauta ditzakezu soilik"},noResults:function(){return"Ez da bat datorrenik aurkitu"},searching:function(){return"Bilatzen…"},removeAllItems:function(){return"Kendu elementu guztiak"}}}),e.define,e.require}();
\ No newline at end of file
diff --git a/public/js/select2/i18n/fa.js b/public/js/select2/i18n/fa.js
new file mode 100644
index 0000000000..e1ffdbed0d
--- /dev/null
+++ b/public/js/select2/i18n/fa.js
@@ -0,0 +1,3 @@
+/*! Select2 4.0.13 | https://github.com/select2/select2/blob/master/LICENSE.md */
+
+!function(){if(jQuery&&jQuery.fn&&jQuery.fn.select2&&jQuery.fn.select2.amd)var n=jQuery.fn.select2.amd;n.define("select2/i18n/fa",[],function(){return{errorLoading:function(){return"امکان بارگذاری نتایج وجود ندارد."},inputTooLong:function(n){return"لطفاً "+(n.input.length-n.maximum)+" کاراکتر را حذف نمایید"},inputTooShort:function(n){return"لطفاً تعداد "+(n.minimum-n.input.length)+" کاراکتر یا بیشتر وارد نمایید"},loadingMore:function(){return"در حال بارگذاری نتایج بیشتر..."},maximumSelected:function(n){return"شما تنها می‌توانید "+n.maximum+" آیتم را انتخاب نمایید"},noResults:function(){return"هیچ نتیجه‌ای یافت نشد"},searching:function(){return"در حال جستجو..."},removeAllItems:function(){return"همه موارد را حذف کنید"}}}),n.define,n.require}();
\ No newline at end of file
diff --git a/public/js/select2/i18n/fi.js b/public/js/select2/i18n/fi.js
new file mode 100644
index 0000000000..ffed1247dd
--- /dev/null
+++ b/public/js/select2/i18n/fi.js
@@ -0,0 +1,3 @@
+/*! Select2 4.0.13 | https://github.com/select2/select2/blob/master/LICENSE.md */
+
+!function(){if(jQuery&&jQuery.fn&&jQuery.fn.select2&&jQuery.fn.select2.amd)var n=jQuery.fn.select2.amd;n.define("select2/i18n/fi",[],function(){return{errorLoading:function(){return"Tuloksia ei saatu ladattua."},inputTooLong:function(n){return"Ole hyvä ja anna "+(n.input.length-n.maximum)+" merkkiä vähemmän"},inputTooShort:function(n){return"Ole hyvä ja anna "+(n.minimum-n.input.length)+" merkkiä lisää"},loadingMore:function(){return"Ladataan lisää tuloksia…"},maximumSelected:function(n){return"Voit valita ainoastaan "+n.maximum+" kpl"},noResults:function(){return"Ei tuloksia"},searching:function(){return"Haetaan…"},removeAllItems:function(){return"Poista kaikki kohteet"}}}),n.define,n.require}();
\ No newline at end of file
diff --git a/public/js/select2/i18n/fr.js b/public/js/select2/i18n/fr.js
new file mode 100644
index 0000000000..dd02f973ff
--- /dev/null
+++ b/public/js/select2/i18n/fr.js
@@ -0,0 +1,3 @@
+/*! Select2 4.0.13 | https://github.com/select2/select2/blob/master/LICENSE.md */
+
+!function(){if(jQuery&&jQuery.fn&&jQuery.fn.select2&&jQuery.fn.select2.amd)var e=jQuery.fn.select2.amd;e.define("select2/i18n/fr",[],function(){return{errorLoading:function(){return"Les résultats ne peuvent pas être chargés."},inputTooLong:function(e){var n=e.input.length-e.maximum;return"Supprimez "+n+" caractère"+(n>1?"s":"")},inputTooShort:function(e){var n=e.minimum-e.input.length;return"Saisissez au moins "+n+" caractère"+(n>1?"s":"")},loadingMore:function(){return"Chargement de résultats supplémentaires…"},maximumSelected:function(e){return"Vous pouvez seulement sélectionner "+e.maximum+" élément"+(e.maximum>1?"s":"")},noResults:function(){return"Aucun résultat trouvé"},searching:function(){return"Recherche en cours…"},removeAllItems:function(){return"Supprimer tous les éléments"}}}),e.define,e.require}();
\ No newline at end of file
diff --git a/public/js/select2/i18n/gl.js b/public/js/select2/i18n/gl.js
new file mode 100644
index 0000000000..208a005705
--- /dev/null
+++ b/public/js/select2/i18n/gl.js
@@ -0,0 +1,3 @@
+/*! Select2 4.0.13 | https://github.com/select2/select2/blob/master/LICENSE.md */
+
+!function(){if(jQuery&&jQuery.fn&&jQuery.fn.select2&&jQuery.fn.select2.amd)var e=jQuery.fn.select2.amd;e.define("select2/i18n/gl",[],function(){return{errorLoading:function(){return"Non foi posíbel cargar os resultados."},inputTooLong:function(e){var n=e.input.length-e.maximum;return 1===n?"Elimine un carácter":"Elimine "+n+" caracteres"},inputTooShort:function(e){var n=e.minimum-e.input.length;return 1===n?"Engada un carácter":"Engada "+n+" caracteres"},loadingMore:function(){return"Cargando máis resultados…"},maximumSelected:function(e){return 1===e.maximum?"Só pode seleccionar un elemento":"Só pode seleccionar "+e.maximum+" elementos"},noResults:function(){return"Non se atoparon resultados"},searching:function(){return"Buscando…"},removeAllItems:function(){return"Elimina todos os elementos"}}}),e.define,e.require}();
\ No newline at end of file
diff --git a/public/js/select2/i18n/he.js b/public/js/select2/i18n/he.js
new file mode 100644
index 0000000000..25a8805aa0
--- /dev/null
+++ b/public/js/select2/i18n/he.js
@@ -0,0 +1,3 @@
+/*! Select2 4.0.13 | https://github.com/select2/select2/blob/master/LICENSE.md */
+
+!function(){if(jQuery&&jQuery.fn&&jQuery.fn.select2&&jQuery.fn.select2.amd)var n=jQuery.fn.select2.amd;n.define("select2/i18n/he",[],function(){return{errorLoading:function(){return"שגיאה בטעינת התוצאות"},inputTooLong:function(n){var e=n.input.length-n.maximum,r="נא למחוק ";return r+=1===e?"תו אחד":e+" תווים"},inputTooShort:function(n){var e=n.minimum-n.input.length,r="נא להכניס ";return r+=1===e?"תו אחד":e+" תווים",r+=" או יותר"},loadingMore:function(){return"טוען תוצאות נוספות…"},maximumSelected:function(n){var e="באפשרותך לבחור עד ";return 1===n.maximum?e+="פריט אחד":e+=n.maximum+" פריטים",e},noResults:function(){return"לא נמצאו תוצאות"},searching:function(){return"מחפש…"},removeAllItems:function(){return"הסר את כל הפריטים"}}}),n.define,n.require}();
\ No newline at end of file
diff --git a/public/js/select2/i18n/hi.js b/public/js/select2/i18n/hi.js
new file mode 100644
index 0000000000..f3ed798434
--- /dev/null
+++ b/public/js/select2/i18n/hi.js
@@ -0,0 +1,3 @@
+/*! Select2 4.0.13 | https://github.com/select2/select2/blob/master/LICENSE.md */
+
+!function(){if(jQuery&&jQuery.fn&&jQuery.fn.select2&&jQuery.fn.select2.amd)var n=jQuery.fn.select2.amd;n.define("select2/i18n/hi",[],function(){return{errorLoading:function(){return"परिणामों को लोड नहीं किया जा सका।"},inputTooLong:function(n){var e=n.input.length-n.maximum,r=e+" अक्षर को हटा दें";return e>1&&(r=e+" अक्षरों को हटा दें "),r},inputTooShort:function(n){return"कृपया "+(n.minimum-n.input.length)+" या अधिक अक्षर दर्ज करें"},loadingMore:function(){return"अधिक परिणाम लोड हो रहे है..."},maximumSelected:function(n){return"आप केवल "+n.maximum+" आइटम का चयन कर सकते हैं"},noResults:function(){return"कोई परिणाम नहीं मिला"},searching:function(){return"खोज रहा है..."},removeAllItems:function(){return"सभी वस्तुओं को हटा दें"}}}),n.define,n.require}();
\ No newline at end of file
diff --git a/public/js/select2/i18n/hr.js b/public/js/select2/i18n/hr.js
new file mode 100644
index 0000000000..cb3268db16
--- /dev/null
+++ b/public/js/select2/i18n/hr.js
@@ -0,0 +1,3 @@
+/*! Select2 4.0.13 | https://github.com/select2/select2/blob/master/LICENSE.md */
+
+!function(){if(jQuery&&jQuery.fn&&jQuery.fn.select2&&jQuery.fn.select2.amd)var n=jQuery.fn.select2.amd;n.define("select2/i18n/hr",[],function(){function n(n){var e=" "+n+" znak";return n%10<5&&n%10>0&&(n%100<5||n%100>19)?n%10>1&&(e+="a"):e+="ova",e}return{errorLoading:function(){return"Preuzimanje nije uspjelo."},inputTooLong:function(e){return"Unesite "+n(e.input.length-e.maximum)},inputTooShort:function(e){return"Unesite još "+n(e.minimum-e.input.length)},loadingMore:function(){return"Učitavanje rezultata…"},maximumSelected:function(n){return"Maksimalan broj odabranih stavki je "+n.maximum},noResults:function(){return"Nema rezultata"},searching:function(){return"Pretraga…"},removeAllItems:function(){return"Ukloni sve stavke"}}}),n.define,n.require}();
\ No newline at end of file
diff --git a/public/js/select2/i18n/hsb.js b/public/js/select2/i18n/hsb.js
new file mode 100644
index 0000000000..3d5bf09dbd
--- /dev/null
+++ b/public/js/select2/i18n/hsb.js
@@ -0,0 +1,3 @@
+/*! Select2 4.0.13 | https://github.com/select2/select2/blob/master/LICENSE.md */
+
+!function(){if(jQuery&&jQuery.fn&&jQuery.fn.select2&&jQuery.fn.select2.amd)var n=jQuery.fn.select2.amd;n.define("select2/i18n/hsb",[],function(){var n=["znamješko","znamješce","znamješka","znamješkow"],e=["zapisk","zapiskaj","zapiski","zapiskow"],u=function(n,e){return 1===n?e[0]:2===n?e[1]:n>2&&n<=4?e[2]:n>=5?e[3]:void 0};return{errorLoading:function(){return"Wuslědki njedachu so začitać."},inputTooLong:function(e){var a=e.input.length-e.maximum;return"Prošu zhašej "+a+" "+u(a,n)},inputTooShort:function(e){var a=e.minimum-e.input.length;return"Prošu zapodaj znajmjeńša "+a+" "+u(a,n)},loadingMore:function(){return"Dalše wuslědki so začitaja…"},maximumSelected:function(n){return"Móžeš jenož "+n.maximum+" "+u(n.maximum,e)+"wubrać"},noResults:function(){return"Žane wuslědki namakane"},searching:function(){return"Pyta so…"},removeAllItems:function(){return"Remove all items"}}}),n.define,n.require}();
\ No newline at end of file
diff --git a/public/js/select2/i18n/hu.js b/public/js/select2/i18n/hu.js
new file mode 100644
index 0000000000..4893aa2f70
--- /dev/null
+++ b/public/js/select2/i18n/hu.js
@@ -0,0 +1,3 @@
+/*! Select2 4.0.13 | https://github.com/select2/select2/blob/master/LICENSE.md */
+
+!function(){if(jQuery&&jQuery.fn&&jQuery.fn.select2&&jQuery.fn.select2.amd)var e=jQuery.fn.select2.amd;e.define("select2/i18n/hu",[],function(){return{errorLoading:function(){return"Az eredmények betöltése nem sikerült."},inputTooLong:function(e){return"Túl hosszú. "+(e.input.length-e.maximum)+" karakterrel több, mint kellene."},inputTooShort:function(e){return"Túl rövid. Még "+(e.minimum-e.input.length)+" karakter hiányzik."},loadingMore:function(){return"Töltés…"},maximumSelected:function(e){return"Csak "+e.maximum+" elemet lehet kiválasztani."},noResults:function(){return"Nincs találat."},searching:function(){return"Keresés…"},removeAllItems:function(){return"Távolítson el minden elemet"}}}),e.define,e.require}();
\ No newline at end of file
diff --git a/public/js/select2/i18n/hy.js b/public/js/select2/i18n/hy.js
new file mode 100644
index 0000000000..8230007141
--- /dev/null
+++ b/public/js/select2/i18n/hy.js
@@ -0,0 +1,3 @@
+/*! Select2 4.0.13 | https://github.com/select2/select2/blob/master/LICENSE.md */
+
+!function(){if(jQuery&&jQuery.fn&&jQuery.fn.select2&&jQuery.fn.select2.amd)var n=jQuery.fn.select2.amd;n.define("select2/i18n/hy",[],function(){return{errorLoading:function(){return"Արդյունքները հնարավոր չէ բեռնել։"},inputTooLong:function(n){return"Խնդրում ենք հեռացնել "+(n.input.length-n.maximum)+" նշան"},inputTooShort:function(n){return"Խնդրում ենք մուտքագրել "+(n.minimum-n.input.length)+" կամ ավել նշաններ"},loadingMore:function(){return"Բեռնվում են նոր արդյունքներ․․․"},maximumSelected:function(n){return"Դուք կարող եք ընտրել առավելագույնը "+n.maximum+" կետ"},noResults:function(){return"Արդյունքներ չեն գտնվել"},searching:function(){return"Որոնում․․․"},removeAllItems:function(){return"Հեռացնել բոլոր տարրերը"}}}),n.define,n.require}();
\ No newline at end of file
diff --git a/public/js/select2/i18n/id.js b/public/js/select2/i18n/id.js
new file mode 100644
index 0000000000..4a0b3bf009
--- /dev/null
+++ b/public/js/select2/i18n/id.js
@@ -0,0 +1,3 @@
+/*! Select2 4.0.13 | https://github.com/select2/select2/blob/master/LICENSE.md */
+
+!function(){if(jQuery&&jQuery.fn&&jQuery.fn.select2&&jQuery.fn.select2.amd)var n=jQuery.fn.select2.amd;n.define("select2/i18n/id",[],function(){return{errorLoading:function(){return"Data tidak boleh diambil."},inputTooLong:function(n){return"Hapuskan "+(n.input.length-n.maximum)+" huruf"},inputTooShort:function(n){return"Masukkan "+(n.minimum-n.input.length)+" huruf lagi"},loadingMore:function(){return"Mengambil data…"},maximumSelected:function(n){return"Anda hanya dapat memilih "+n.maximum+" pilihan"},noResults:function(){return"Tidak ada data yang sesuai"},searching:function(){return"Mencari…"},removeAllItems:function(){return"Hapus semua item"}}}),n.define,n.require}();
\ No newline at end of file
diff --git a/public/js/select2/i18n/is.js b/public/js/select2/i18n/is.js
new file mode 100644
index 0000000000..cca5bbecf0
--- /dev/null
+++ b/public/js/select2/i18n/is.js
@@ -0,0 +1,3 @@
+/*! Select2 4.0.13 | https://github.com/select2/select2/blob/master/LICENSE.md */
+
+!function(){if(jQuery&&jQuery.fn&&jQuery.fn.select2&&jQuery.fn.select2.amd)var n=jQuery.fn.select2.amd;n.define("select2/i18n/is",[],function(){return{inputTooLong:function(n){var t=n.input.length-n.maximum,e="Vinsamlegast styttið texta um "+t+" staf";return t<=1?e:e+"i"},inputTooShort:function(n){var t=n.minimum-n.input.length,e="Vinsamlegast skrifið "+t+" staf";return t>1&&(e+="i"),e+=" í viðbót"},loadingMore:function(){return"Sæki fleiri niðurstöður…"},maximumSelected:function(n){return"Þú getur aðeins valið "+n.maximum+" atriði"},noResults:function(){return"Ekkert fannst"},searching:function(){return"Leita…"},removeAllItems:function(){return"Fjarlægðu öll atriði"}}}),n.define,n.require}();
\ No newline at end of file
diff --git a/public/js/select2/i18n/it.js b/public/js/select2/i18n/it.js
new file mode 100644
index 0000000000..507c7d9f29
--- /dev/null
+++ b/public/js/select2/i18n/it.js
@@ -0,0 +1,3 @@
+/*! Select2 4.0.13 | https://github.com/select2/select2/blob/master/LICENSE.md */
+
+!function(){if(jQuery&&jQuery.fn&&jQuery.fn.select2&&jQuery.fn.select2.amd)var e=jQuery.fn.select2.amd;e.define("select2/i18n/it",[],function(){return{errorLoading:function(){return"I risultati non possono essere caricati."},inputTooLong:function(e){var n=e.input.length-e.maximum,t="Per favore cancella "+n+" caratter";return t+=1!==n?"i":"e"},inputTooShort:function(e){return"Per favore inserisci "+(e.minimum-e.input.length)+" o più caratteri"},loadingMore:function(){return"Caricando più risultati…"},maximumSelected:function(e){var n="Puoi selezionare solo "+e.maximum+" element";return 1!==e.maximum?n+="i":n+="o",n},noResults:function(){return"Nessun risultato trovato"},searching:function(){return"Sto cercando…"},removeAllItems:function(){return"Rimuovi tutti gli oggetti"}}}),e.define,e.require}();
\ No newline at end of file
diff --git a/public/js/select2/i18n/ja.js b/public/js/select2/i18n/ja.js
new file mode 100644
index 0000000000..451025e2c7
--- /dev/null
+++ b/public/js/select2/i18n/ja.js
@@ -0,0 +1,3 @@
+/*! Select2 4.0.13 | https://github.com/select2/select2/blob/master/LICENSE.md */
+
+!function(){if(jQuery&&jQuery.fn&&jQuery.fn.select2&&jQuery.fn.select2.amd)var n=jQuery.fn.select2.amd;n.define("select2/i18n/ja",[],function(){return{errorLoading:function(){return"結果が読み込まれませんでした"},inputTooLong:function(n){return n.input.length-n.maximum+" 文字を削除してください"},inputTooShort:function(n){return"少なくとも "+(n.minimum-n.input.length)+" 文字を入力してください"},loadingMore:function(){return"読み込み中…"},maximumSelected:function(n){return n.maximum+" 件しか選択できません"},noResults:function(){return"対象が見つかりません"},searching:function(){return"検索しています…"},removeAllItems:function(){return"すべてのアイテムを削除"}}}),n.define,n.require}();
\ No newline at end of file
diff --git a/public/js/select2/i18n/ka.js b/public/js/select2/i18n/ka.js
new file mode 100644
index 0000000000..60c593b705
--- /dev/null
+++ b/public/js/select2/i18n/ka.js
@@ -0,0 +1,3 @@
+/*! Select2 4.0.13 | https://github.com/select2/select2/blob/master/LICENSE.md */
+
+!function(){if(jQuery&&jQuery.fn&&jQuery.fn.select2&&jQuery.fn.select2.amd)var n=jQuery.fn.select2.amd;n.define("select2/i18n/ka",[],function(){return{errorLoading:function(){return"მონაცემების ჩატვირთვა შეუძლებელია."},inputTooLong:function(n){return"გთხოვთ აკრიფეთ "+(n.input.length-n.maximum)+" სიმბოლოთი ნაკლები"},inputTooShort:function(n){return"გთხოვთ აკრიფეთ "+(n.minimum-n.input.length)+" სიმბოლო ან მეტი"},loadingMore:function(){return"მონაცემების ჩატვირთვა…"},maximumSelected:function(n){return"თქვენ შეგიძლიათ აირჩიოთ არაუმეტეს "+n.maximum+" ელემენტი"},noResults:function(){return"რეზულტატი არ მოიძებნა"},searching:function(){return"ძიება…"},removeAllItems:function(){return"ამოიღე ყველა ელემენტი"}}}),n.define,n.require}();
\ No newline at end of file
diff --git a/public/js/select2/i18n/km.js b/public/js/select2/i18n/km.js
new file mode 100644
index 0000000000..4dca94f414
--- /dev/null
+++ b/public/js/select2/i18n/km.js
@@ -0,0 +1,3 @@
+/*! Select2 4.0.13 | https://github.com/select2/select2/blob/master/LICENSE.md */
+
+!function(){if(jQuery&&jQuery.fn&&jQuery.fn.select2&&jQuery.fn.select2.amd)var n=jQuery.fn.select2.amd;n.define("select2/i18n/km",[],function(){return{errorLoading:function(){return"មិនអាចទាញយកទិន្នន័យ"},inputTooLong:function(n){return"សូមលុបចេញ  "+(n.input.length-n.maximum)+" អក្សរ"},inputTooShort:function(n){return"សូមបញ្ចូល"+(n.minimum-n.input.length)+" អក្សរ រឺ ច្រើនជាងនេះ"},loadingMore:function(){return"កំពុងទាញយកទិន្នន័យបន្ថែម..."},maximumSelected:function(n){return"អ្នកអាចជ្រើសរើសបានតែ "+n.maximum+" ជម្រើសប៉ុណ្ណោះ"},noResults:function(){return"មិនមានលទ្ធផល"},searching:function(){return"កំពុងស្វែងរក..."},removeAllItems:function(){return"លុបធាតុទាំងអស់"}}}),n.define,n.require}();
\ No newline at end of file
diff --git a/public/js/select2/i18n/ko.js b/public/js/select2/i18n/ko.js
new file mode 100644
index 0000000000..f2880fb004
--- /dev/null
+++ b/public/js/select2/i18n/ko.js
@@ -0,0 +1,3 @@
+/*! Select2 4.0.13 | https://github.com/select2/select2/blob/master/LICENSE.md */
+
+!function(){if(jQuery&&jQuery.fn&&jQuery.fn.select2&&jQuery.fn.select2.amd)var n=jQuery.fn.select2.amd;n.define("select2/i18n/ko",[],function(){return{errorLoading:function(){return"결과를 불러올 수 없습니다."},inputTooLong:function(n){return"너무 깁니다. "+(n.input.length-n.maximum)+" 글자 지워주세요."},inputTooShort:function(n){return"너무 짧습니다. "+(n.minimum-n.input.length)+" 글자 더 입력해주세요."},loadingMore:function(){return"불러오는 중…"},maximumSelected:function(n){return"최대 "+n.maximum+"개까지만 선택 가능합니다."},noResults:function(){return"결과가 없습니다."},searching:function(){return"검색 중…"},removeAllItems:function(){return"모든 항목 삭제"}}}),n.define,n.require}();
\ No newline at end of file
diff --git a/public/js/select2/i18n/lt.js b/public/js/select2/i18n/lt.js
new file mode 100644
index 0000000000..f6a42155ad
--- /dev/null
+++ b/public/js/select2/i18n/lt.js
@@ -0,0 +1,3 @@
+/*! Select2 4.0.13 | https://github.com/select2/select2/blob/master/LICENSE.md */
+
+!function(){if(jQuery&&jQuery.fn&&jQuery.fn.select2&&jQuery.fn.select2.amd)var n=jQuery.fn.select2.amd;n.define("select2/i18n/lt",[],function(){function n(n,e,i,t){return n%10==1&&(n%100<11||n%100>19)?e:n%10>=2&&n%10<=9&&(n%100<11||n%100>19)?i:t}return{inputTooLong:function(e){var i=e.input.length-e.maximum,t="Pašalinkite "+i+" simbol";return t+=n(i,"į","ius","ių")},inputTooShort:function(e){var i=e.minimum-e.input.length,t="Įrašykite dar "+i+" simbol";return t+=n(i,"į","ius","ių")},loadingMore:function(){return"Kraunama daugiau rezultatų…"},maximumSelected:function(e){var i="Jūs galite pasirinkti tik "+e.maximum+" element";return i+=n(e.maximum,"ą","us","ų")},noResults:function(){return"Atitikmenų nerasta"},searching:function(){return"Ieškoma…"},removeAllItems:function(){return"Pašalinti visus elementus"}}}),n.define,n.require}();
\ No newline at end of file
diff --git a/public/js/select2/i18n/lv.js b/public/js/select2/i18n/lv.js
new file mode 100644
index 0000000000..806dc5c433
--- /dev/null
+++ b/public/js/select2/i18n/lv.js
@@ -0,0 +1,3 @@
+/*! Select2 4.0.13 | https://github.com/select2/select2/blob/master/LICENSE.md */
+
+!function(){if(jQuery&&jQuery.fn&&jQuery.fn.select2&&jQuery.fn.select2.amd)var e=jQuery.fn.select2.amd;e.define("select2/i18n/lv",[],function(){function e(e,n,u,i){return 11===e?n:e%10==1?u:i}return{inputTooLong:function(n){var u=n.input.length-n.maximum,i="Lūdzu ievadiet par  "+u;return(i+=" simbol"+e(u,"iem","u","iem"))+" mazāk"},inputTooShort:function(n){var u=n.minimum-n.input.length,i="Lūdzu ievadiet vēl "+u;return i+=" simbol"+e(u,"us","u","us")},loadingMore:function(){return"Datu ielāde…"},maximumSelected:function(n){var u="Jūs varat izvēlēties ne vairāk kā "+n.maximum;return u+=" element"+e(n.maximum,"us","u","us")},noResults:function(){return"Sakritību nav"},searching:function(){return"Meklēšana…"},removeAllItems:function(){return"Noņemt visus vienumus"}}}),e.define,e.require}();
\ No newline at end of file
diff --git a/public/js/select2/i18n/mk.js b/public/js/select2/i18n/mk.js
new file mode 100644
index 0000000000..cb7b84a263
--- /dev/null
+++ b/public/js/select2/i18n/mk.js
@@ -0,0 +1,3 @@
+/*! Select2 4.0.13 | https://github.com/select2/select2/blob/master/LICENSE.md */
+
+!function(){if(jQuery&&jQuery.fn&&jQuery.fn.select2&&jQuery.fn.select2.amd)var n=jQuery.fn.select2.amd;n.define("select2/i18n/mk",[],function(){return{inputTooLong:function(n){var e=(n.input.length,n.maximum,"Ве молиме внесете "+n.maximum+" помалку карактер");return 1!==n.maximum&&(e+="и"),e},inputTooShort:function(n){var e=(n.minimum,n.input.length,"Ве молиме внесете уште "+n.maximum+" карактер");return 1!==n.maximum&&(e+="и"),e},loadingMore:function(){return"Вчитување резултати…"},maximumSelected:function(n){var e="Можете да изберете само "+n.maximum+" ставк";return 1===n.maximum?e+="а":e+="и",e},noResults:function(){return"Нема пронајдено совпаѓања"},searching:function(){return"Пребарување…"},removeAllItems:function(){return"Отстрани ги сите предмети"}}}),n.define,n.require}();
\ No newline at end of file
diff --git a/public/js/select2/i18n/ms.js b/public/js/select2/i18n/ms.js
new file mode 100644
index 0000000000..6bd7eaa3e0
--- /dev/null
+++ b/public/js/select2/i18n/ms.js
@@ -0,0 +1,3 @@
+/*! Select2 4.0.13 | https://github.com/select2/select2/blob/master/LICENSE.md */
+
+!function(){if(jQuery&&jQuery.fn&&jQuery.fn.select2&&jQuery.fn.select2.amd)var n=jQuery.fn.select2.amd;n.define("select2/i18n/ms",[],function(){return{errorLoading:function(){return"Keputusan tidak berjaya dimuatkan."},inputTooLong:function(n){return"Sila hapuskan "+(n.input.length-n.maximum)+" aksara"},inputTooShort:function(n){return"Sila masukkan "+(n.minimum-n.input.length)+" atau lebih aksara"},loadingMore:function(){return"Sedang memuatkan keputusan…"},maximumSelected:function(n){return"Anda hanya boleh memilih "+n.maximum+" pilihan"},noResults:function(){return"Tiada padanan yang ditemui"},searching:function(){return"Mencari…"},removeAllItems:function(){return"Keluarkan semua item"}}}),n.define,n.require}();
\ No newline at end of file
diff --git a/public/js/select2/i18n/nb.js b/public/js/select2/i18n/nb.js
new file mode 100644
index 0000000000..25d89c6870
--- /dev/null
+++ b/public/js/select2/i18n/nb.js
@@ -0,0 +1,3 @@
+/*! Select2 4.0.13 | https://github.com/select2/select2/blob/master/LICENSE.md */
+
+!function(){if(jQuery&&jQuery.fn&&jQuery.fn.select2&&jQuery.fn.select2.amd)var e=jQuery.fn.select2.amd;e.define("select2/i18n/nb",[],function(){return{errorLoading:function(){return"Kunne ikke hente resultater."},inputTooLong:function(e){return"Vennligst fjern "+(e.input.length-e.maximum)+" tegn"},inputTooShort:function(e){return"Vennligst skriv inn "+(e.minimum-e.input.length)+" tegn til"},loadingMore:function(){return"Laster flere resultater…"},maximumSelected:function(e){return"Du kan velge maks "+e.maximum+" elementer"},noResults:function(){return"Ingen treff"},searching:function(){return"Søker…"},removeAllItems:function(){return"Fjern alle elementer"}}}),e.define,e.require}();
\ No newline at end of file
diff --git a/public/js/select2/i18n/ne.js b/public/js/select2/i18n/ne.js
new file mode 100644
index 0000000000..1c39f67210
--- /dev/null
+++ b/public/js/select2/i18n/ne.js
@@ -0,0 +1,3 @@
+/*! Select2 4.0.13 | https://github.com/select2/select2/blob/master/LICENSE.md */
+
+!function(){if(jQuery&&jQuery.fn&&jQuery.fn.select2&&jQuery.fn.select2.amd)var n=jQuery.fn.select2.amd;n.define("select2/i18n/ne",[],function(){return{errorLoading:function(){return"नतिजाहरु देखाउन सकिएन।"},inputTooLong:function(n){var e=n.input.length-n.maximum,u="कृपया "+e+" अक्षर मेटाउनुहोस्।";return 1!=e&&(u+="कृपया "+e+" अक्षरहरु मेटाउनुहोस्।"),u},inputTooShort:function(n){return"कृपया बाँकी रहेका "+(n.minimum-n.input.length)+" वा अरु धेरै अक्षरहरु भर्नुहोस्।"},loadingMore:function(){return"अरु नतिजाहरु भरिँदैछन् …"},maximumSelected:function(n){var e="तँपाई "+n.maximum+" वस्तु मात्र छान्न पाउँनुहुन्छ।";return 1!=n.maximum&&(e="तँपाई "+n.maximum+" वस्तुहरु मात्र छान्न पाउँनुहुन्छ।"),e},noResults:function(){return"कुनै पनि नतिजा भेटिएन।"},searching:function(){return"खोजि हुँदैछ…"}}}),n.define,n.require}();
\ No newline at end of file
diff --git a/public/js/select2/i18n/nl.js b/public/js/select2/i18n/nl.js
new file mode 100644
index 0000000000..2b74058d23
--- /dev/null
+++ b/public/js/select2/i18n/nl.js
@@ -0,0 +1,3 @@
+/*! Select2 4.0.13 | https://github.com/select2/select2/blob/master/LICENSE.md */
+
+!function(){if(jQuery&&jQuery.fn&&jQuery.fn.select2&&jQuery.fn.select2.amd)var e=jQuery.fn.select2.amd;e.define("select2/i18n/nl",[],function(){return{errorLoading:function(){return"De resultaten konden niet worden geladen."},inputTooLong:function(e){return"Gelieve "+(e.input.length-e.maximum)+" karakters te verwijderen"},inputTooShort:function(e){return"Gelieve "+(e.minimum-e.input.length)+" of meer karakters in te voeren"},loadingMore:function(){return"Meer resultaten laden…"},maximumSelected:function(e){var n=1==e.maximum?"kan":"kunnen",r="Er "+n+" maar "+e.maximum+" item";return 1!=e.maximum&&(r+="s"),r+=" worden geselecteerd"},noResults:function(){return"Geen resultaten gevonden…"},searching:function(){return"Zoeken…"},removeAllItems:function(){return"Verwijder alle items"}}}),e.define,e.require}();
\ No newline at end of file
diff --git a/public/js/select2/i18n/pl.js b/public/js/select2/i18n/pl.js
new file mode 100644
index 0000000000..4ca5748c38
--- /dev/null
+++ b/public/js/select2/i18n/pl.js
@@ -0,0 +1,3 @@
+/*! Select2 4.0.13 | https://github.com/select2/select2/blob/master/LICENSE.md */
+
+!function(){if(jQuery&&jQuery.fn&&jQuery.fn.select2&&jQuery.fn.select2.amd)var n=jQuery.fn.select2.amd;n.define("select2/i18n/pl",[],function(){var n=["znak","znaki","znaków"],e=["element","elementy","elementów"],r=function(n,e){return 1===n?e[0]:n>1&&n<=4?e[1]:n>=5?e[2]:void 0};return{errorLoading:function(){return"Nie można załadować wyników."},inputTooLong:function(e){var t=e.input.length-e.maximum;return"Usuń "+t+" "+r(t,n)},inputTooShort:function(e){var t=e.minimum-e.input.length;return"Podaj przynajmniej "+t+" "+r(t,n)},loadingMore:function(){return"Trwa ładowanie…"},maximumSelected:function(n){return"Możesz zaznaczyć tylko "+n.maximum+" "+r(n.maximum,e)},noResults:function(){return"Brak wyników"},searching:function(){return"Trwa wyszukiwanie…"},removeAllItems:function(){return"Usuń wszystkie przedmioty"}}}),n.define,n.require}();
\ No newline at end of file
diff --git a/public/js/select2/i18n/ps.js b/public/js/select2/i18n/ps.js
new file mode 100644
index 0000000000..9b008e4c14
--- /dev/null
+++ b/public/js/select2/i18n/ps.js
@@ -0,0 +1,3 @@
+/*! Select2 4.0.13 | https://github.com/select2/select2/blob/master/LICENSE.md */
+
+!function(){if(jQuery&&jQuery.fn&&jQuery.fn.select2&&jQuery.fn.select2.amd)var n=jQuery.fn.select2.amd;n.define("select2/i18n/ps",[],function(){return{errorLoading:function(){return"پايلي نه سي ترلاسه کېدای"},inputTooLong:function(n){var e=n.input.length-n.maximum,r="د مهربانۍ لمخي "+e+" توری ړنګ کړئ";return 1!=e&&(r=r.replace("توری","توري")),r},inputTooShort:function(n){return"لږ تر لږه "+(n.minimum-n.input.length)+" يا ډېر توري وليکئ"},loadingMore:function(){return"نوري پايلي ترلاسه کيږي..."},maximumSelected:function(n){var e="تاسو يوازي "+n.maximum+" قلم په نښه کولای سی";return 1!=n.maximum&&(e=e.replace("قلم","قلمونه")),e},noResults:function(){return"پايلي و نه موندل سوې"},searching:function(){return"لټول کيږي..."},removeAllItems:function(){return"ټول توکي لرې کړئ"}}}),n.define,n.require}();
\ No newline at end of file
diff --git a/public/js/select2/i18n/pt-BR.js b/public/js/select2/i18n/pt-BR.js
new file mode 100644
index 0000000000..c991e2550a
--- /dev/null
+++ b/public/js/select2/i18n/pt-BR.js
@@ -0,0 +1,3 @@
+/*! Select2 4.0.13 | https://github.com/select2/select2/blob/master/LICENSE.md */
+
+!function(){if(jQuery&&jQuery.fn&&jQuery.fn.select2&&jQuery.fn.select2.amd)var e=jQuery.fn.select2.amd;e.define("select2/i18n/pt-BR",[],function(){return{errorLoading:function(){return"Os resultados não puderam ser carregados."},inputTooLong:function(e){var n=e.input.length-e.maximum,r="Apague "+n+" caracter";return 1!=n&&(r+="es"),r},inputTooShort:function(e){return"Digite "+(e.minimum-e.input.length)+" ou mais caracteres"},loadingMore:function(){return"Carregando mais resultados…"},maximumSelected:function(e){var n="Você só pode selecionar "+e.maximum+" ite";return 1==e.maximum?n+="m":n+="ns",n},noResults:function(){return"Nenhum resultado encontrado"},searching:function(){return"Buscando…"},removeAllItems:function(){return"Remover todos os itens"}}}),e.define,e.require}();
\ No newline at end of file
diff --git a/public/js/select2/i18n/pt.js b/public/js/select2/i18n/pt.js
new file mode 100644
index 0000000000..b5da1a6b49
--- /dev/null
+++ b/public/js/select2/i18n/pt.js
@@ -0,0 +1,3 @@
+/*! Select2 4.0.13 | https://github.com/select2/select2/blob/master/LICENSE.md */
+
+!function(){if(jQuery&&jQuery.fn&&jQuery.fn.select2&&jQuery.fn.select2.amd)var e=jQuery.fn.select2.amd;e.define("select2/i18n/pt",[],function(){return{errorLoading:function(){return"Os resultados não puderam ser carregados."},inputTooLong:function(e){var r=e.input.length-e.maximum,n="Por favor apague "+r+" ";return n+=1!=r?"caracteres":"caractere"},inputTooShort:function(e){return"Introduza "+(e.minimum-e.input.length)+" ou mais caracteres"},loadingMore:function(){return"A carregar mais resultados…"},maximumSelected:function(e){var r="Apenas pode seleccionar "+e.maximum+" ";return r+=1!=e.maximum?"itens":"item"},noResults:function(){return"Sem resultados"},searching:function(){return"A procurar…"},removeAllItems:function(){return"Remover todos os itens"}}}),e.define,e.require}();
\ No newline at end of file
diff --git a/public/js/select2/i18n/ro.js b/public/js/select2/i18n/ro.js
new file mode 100644
index 0000000000..1ba7b40bef
--- /dev/null
+++ b/public/js/select2/i18n/ro.js
@@ -0,0 +1,3 @@
+/*! Select2 4.0.13 | https://github.com/select2/select2/blob/master/LICENSE.md */
+
+!function(){if(jQuery&&jQuery.fn&&jQuery.fn.select2&&jQuery.fn.select2.amd)var e=jQuery.fn.select2.amd;e.define("select2/i18n/ro",[],function(){return{errorLoading:function(){return"Rezultatele nu au putut fi incărcate."},inputTooLong:function(e){var t=e.input.length-e.maximum,n="Vă rugăm să ștergeți"+t+" caracter";return 1!==t&&(n+="e"),n},inputTooShort:function(e){return"Vă rugăm să introduceți "+(e.minimum-e.input.length)+" sau mai multe caractere"},loadingMore:function(){return"Se încarcă mai multe rezultate…"},maximumSelected:function(e){var t="Aveți voie să selectați cel mult "+e.maximum;return t+=" element",1!==e.maximum&&(t+="e"),t},noResults:function(){return"Nu au fost găsite rezultate"},searching:function(){return"Căutare…"},removeAllItems:function(){return"Eliminați toate elementele"}}}),e.define,e.require}();
\ No newline at end of file
diff --git a/public/js/select2/i18n/ru.js b/public/js/select2/i18n/ru.js
new file mode 100644
index 0000000000..63a7d66c3b
--- /dev/null
+++ b/public/js/select2/i18n/ru.js
@@ -0,0 +1,3 @@
+/*! Select2 4.0.13 | https://github.com/select2/select2/blob/master/LICENSE.md */
+
+!function(){if(jQuery&&jQuery.fn&&jQuery.fn.select2&&jQuery.fn.select2.amd)var n=jQuery.fn.select2.amd;n.define("select2/i18n/ru",[],function(){function n(n,e,r,u){return n%10<5&&n%10>0&&n%100<5||n%100>20?n%10>1?r:e:u}return{errorLoading:function(){return"Невозможно загрузить результаты"},inputTooLong:function(e){var r=e.input.length-e.maximum,u="Пожалуйста, введите на "+r+" символ";return u+=n(r,"","a","ов"),u+=" меньше"},inputTooShort:function(e){var r=e.minimum-e.input.length,u="Пожалуйста, введите ещё хотя бы "+r+" символ";return u+=n(r,"","a","ов")},loadingMore:function(){return"Загрузка данных…"},maximumSelected:function(e){var r="Вы можете выбрать не более "+e.maximum+" элемент";return r+=n(e.maximum,"","a","ов")},noResults:function(){return"Совпадений не найдено"},searching:function(){return"Поиск…"},removeAllItems:function(){return"Удалить все элементы"}}}),n.define,n.require}();
\ No newline at end of file
diff --git a/public/js/select2/i18n/sk.js b/public/js/select2/i18n/sk.js
new file mode 100644
index 0000000000..5049528ad0
--- /dev/null
+++ b/public/js/select2/i18n/sk.js
@@ -0,0 +1,3 @@
+/*! Select2 4.0.13 | https://github.com/select2/select2/blob/master/LICENSE.md */
+
+!function(){if(jQuery&&jQuery.fn&&jQuery.fn.select2&&jQuery.fn.select2.amd)var e=jQuery.fn.select2.amd;e.define("select2/i18n/sk",[],function(){var e={2:function(e){return e?"dva":"dve"},3:function(){return"tri"},4:function(){return"štyri"}};return{errorLoading:function(){return"Výsledky sa nepodarilo načítať."},inputTooLong:function(n){var t=n.input.length-n.maximum;return 1==t?"Prosím, zadajte o jeden znak menej":t>=2&&t<=4?"Prosím, zadajte o "+e[t](!0)+" znaky menej":"Prosím, zadajte o "+t+" znakov menej"},inputTooShort:function(n){var t=n.minimum-n.input.length;return 1==t?"Prosím, zadajte ešte jeden znak":t<=4?"Prosím, zadajte ešte ďalšie "+e[t](!0)+" znaky":"Prosím, zadajte ešte ďalších "+t+" znakov"},loadingMore:function(){return"Načítanie ďalších výsledkov…"},maximumSelected:function(n){return 1==n.maximum?"Môžete zvoliť len jednu položku":n.maximum>=2&&n.maximum<=4?"Môžete zvoliť najviac "+e[n.maximum](!1)+" položky":"Môžete zvoliť najviac "+n.maximum+" položiek"},noResults:function(){return"Nenašli sa žiadne položky"},searching:function(){return"Vyhľadávanie…"},removeAllItems:function(){return"Odstráňte všetky položky"}}}),e.define,e.require}();
\ No newline at end of file
diff --git a/public/js/select2/i18n/sl.js b/public/js/select2/i18n/sl.js
new file mode 100644
index 0000000000..4d0b7d3e34
--- /dev/null
+++ b/public/js/select2/i18n/sl.js
@@ -0,0 +1,3 @@
+/*! Select2 4.0.13 | https://github.com/select2/select2/blob/master/LICENSE.md */
+
+!function(){if(jQuery&&jQuery.fn&&jQuery.fn.select2&&jQuery.fn.select2.amd)var e=jQuery.fn.select2.amd;e.define("select2/i18n/sl",[],function(){return{errorLoading:function(){return"Zadetkov iskanja ni bilo mogoče naložiti."},inputTooLong:function(e){var n=e.input.length-e.maximum,t="Prosim zbrišite "+n+" znak";return 2==n?t+="a":1!=n&&(t+="e"),t},inputTooShort:function(e){var n=e.minimum-e.input.length,t="Prosim vpišite še "+n+" znak";return 2==n?t+="a":1!=n&&(t+="e"),t},loadingMore:function(){return"Nalagam več zadetkov…"},maximumSelected:function(e){var n="Označite lahko največ "+e.maximum+" predmet";return 2==e.maximum?n+="a":1!=e.maximum&&(n+="e"),n},noResults:function(){return"Ni zadetkov."},searching:function(){return"Iščem…"},removeAllItems:function(){return"Odstranite vse elemente"}}}),e.define,e.require}();
\ No newline at end of file
diff --git a/public/js/select2/i18n/sq.js b/public/js/select2/i18n/sq.js
new file mode 100644
index 0000000000..59162024ed
--- /dev/null
+++ b/public/js/select2/i18n/sq.js
@@ -0,0 +1,3 @@
+/*! Select2 4.0.13 | https://github.com/select2/select2/blob/master/LICENSE.md */
+
+!function(){if(jQuery&&jQuery.fn&&jQuery.fn.select2&&jQuery.fn.select2.amd)var e=jQuery.fn.select2.amd;e.define("select2/i18n/sq",[],function(){return{errorLoading:function(){return"Rezultatet nuk mund të ngarkoheshin."},inputTooLong:function(e){var n=e.input.length-e.maximum,t="Të lutem fshi "+n+" karakter";return 1!=n&&(t+="e"),t},inputTooShort:function(e){return"Të lutem shkruaj "+(e.minimum-e.input.length)+" ose më shumë karaktere"},loadingMore:function(){return"Duke ngarkuar më shumë rezultate…"},maximumSelected:function(e){var n="Mund të zgjedhësh vetëm "+e.maximum+" element";return 1!=e.maximum&&(n+="e"),n},noResults:function(){return"Nuk u gjet asnjë rezultat"},searching:function(){return"Duke kërkuar…"},removeAllItems:function(){return"Hiq të gjitha sendet"}}}),e.define,e.require}();
\ No newline at end of file
diff --git a/public/js/select2/i18n/sr-Cyrl.js b/public/js/select2/i18n/sr-Cyrl.js
new file mode 100644
index 0000000000..ce13ce8f9a
--- /dev/null
+++ b/public/js/select2/i18n/sr-Cyrl.js
@@ -0,0 +1,3 @@
+/*! Select2 4.0.13 | https://github.com/select2/select2/blob/master/LICENSE.md */
+
+!function(){if(jQuery&&jQuery.fn&&jQuery.fn.select2&&jQuery.fn.select2.amd)var n=jQuery.fn.select2.amd;n.define("select2/i18n/sr-Cyrl",[],function(){function n(n,e,r,u){return n%10==1&&n%100!=11?e:n%10>=2&&n%10<=4&&(n%100<12||n%100>14)?r:u}return{errorLoading:function(){return"Преузимање није успело."},inputTooLong:function(e){var r=e.input.length-e.maximum,u="Обришите "+r+" симбол";return u+=n(r,"","а","а")},inputTooShort:function(e){var r=e.minimum-e.input.length,u="Укуцајте бар још "+r+" симбол";return u+=n(r,"","а","а")},loadingMore:function(){return"Преузимање још резултата…"},maximumSelected:function(e){var r="Можете изабрати само "+e.maximum+" ставк";return r+=n(e.maximum,"у","е","и")},noResults:function(){return"Ништа није пронађено"},searching:function(){return"Претрага…"},removeAllItems:function(){return"Уклоните све ставке"}}}),n.define,n.require}();
\ No newline at end of file
diff --git a/public/js/select2/i18n/sr.js b/public/js/select2/i18n/sr.js
new file mode 100644
index 0000000000..dd407a06dc
--- /dev/null
+++ b/public/js/select2/i18n/sr.js
@@ -0,0 +1,3 @@
+/*! Select2 4.0.13 | https://github.com/select2/select2/blob/master/LICENSE.md */
+
+!function(){if(jQuery&&jQuery.fn&&jQuery.fn.select2&&jQuery.fn.select2.amd)var n=jQuery.fn.select2.amd;n.define("select2/i18n/sr",[],function(){function n(n,e,r,t){return n%10==1&&n%100!=11?e:n%10>=2&&n%10<=4&&(n%100<12||n%100>14)?r:t}return{errorLoading:function(){return"Preuzimanje nije uspelo."},inputTooLong:function(e){var r=e.input.length-e.maximum,t="Obrišite "+r+" simbol";return t+=n(r,"","a","a")},inputTooShort:function(e){var r=e.minimum-e.input.length,t="Ukucajte bar još "+r+" simbol";return t+=n(r,"","a","a")},loadingMore:function(){return"Preuzimanje još rezultata…"},maximumSelected:function(e){var r="Možete izabrati samo "+e.maximum+" stavk";return r+=n(e.maximum,"u","e","i")},noResults:function(){return"Ništa nije pronađeno"},searching:function(){return"Pretraga…"},removeAllItems:function(){return"Уклоните све ставке"}}}),n.define,n.require}();
\ No newline at end of file
diff --git a/public/js/select2/i18n/sv.js b/public/js/select2/i18n/sv.js
new file mode 100644
index 0000000000..1bc8724a79
--- /dev/null
+++ b/public/js/select2/i18n/sv.js
@@ -0,0 +1,3 @@
+/*! Select2 4.0.13 | https://github.com/select2/select2/blob/master/LICENSE.md */
+
+!function(){if(jQuery&&jQuery.fn&&jQuery.fn.select2&&jQuery.fn.select2.amd)var n=jQuery.fn.select2.amd;n.define("select2/i18n/sv",[],function(){return{errorLoading:function(){return"Resultat kunde inte laddas."},inputTooLong:function(n){return"Vänligen sudda ut "+(n.input.length-n.maximum)+" tecken"},inputTooShort:function(n){return"Vänligen skriv in "+(n.minimum-n.input.length)+" eller fler tecken"},loadingMore:function(){return"Laddar fler resultat…"},maximumSelected:function(n){return"Du kan max välja "+n.maximum+" element"},noResults:function(){return"Inga träffar"},searching:function(){return"Söker…"},removeAllItems:function(){return"Ta bort alla objekt"}}}),n.define,n.require}();
\ No newline at end of file
diff --git a/public/js/select2/i18n/th.js b/public/js/select2/i18n/th.js
new file mode 100644
index 0000000000..63eab7114b
--- /dev/null
+++ b/public/js/select2/i18n/th.js
@@ -0,0 +1,3 @@
+/*! Select2 4.0.13 | https://github.com/select2/select2/blob/master/LICENSE.md */
+
+!function(){if(jQuery&&jQuery.fn&&jQuery.fn.select2&&jQuery.fn.select2.amd)var n=jQuery.fn.select2.amd;n.define("select2/i18n/th",[],function(){return{errorLoading:function(){return"ไม่สามารถค้นข้อมูลได้"},inputTooLong:function(n){return"โปรดลบออก "+(n.input.length-n.maximum)+" ตัวอักษร"},inputTooShort:function(n){return"โปรดพิมพ์เพิ่มอีก "+(n.minimum-n.input.length)+" ตัวอักษร"},loadingMore:function(){return"กำลังค้นข้อมูลเพิ่ม…"},maximumSelected:function(n){return"คุณสามารถเลือกได้ไม่เกิน "+n.maximum+" รายการ"},noResults:function(){return"ไม่พบข้อมูล"},searching:function(){return"กำลังค้นข้อมูล…"},removeAllItems:function(){return"ลบรายการทั้งหมด"}}}),n.define,n.require}();
\ No newline at end of file
diff --git a/public/js/select2/i18n/tk.js b/public/js/select2/i18n/tk.js
new file mode 100644
index 0000000000..30255ff377
--- /dev/null
+++ b/public/js/select2/i18n/tk.js
@@ -0,0 +1,3 @@
+/*! Select2 4.0.13 | https://github.com/select2/select2/blob/master/LICENSE.md */
+
+!function(){if(jQuery&&jQuery.fn&&jQuery.fn.select2&&jQuery.fn.select2.amd)var e=jQuery.fn.select2.amd;e.define("select2/i18n/tk",[],function(){return{errorLoading:function(){return"Netije ýüklenmedi."},inputTooLong:function(e){return e.input.length-e.maximum+" harp bozuň."},inputTooShort:function(e){return"Ýene-de iň az "+(e.minimum-e.input.length)+" harp ýazyň."},loadingMore:function(){return"Köpräk netije görkezilýär…"},maximumSelected:function(e){return"Diňe "+e.maximum+" sanysyny saýlaň."},noResults:function(){return"Netije tapylmady."},searching:function(){return"Gözlenýär…"},removeAllItems:function(){return"Remove all items"}}}),e.define,e.require}();
\ No newline at end of file
diff --git a/public/js/select2/i18n/tr.js b/public/js/select2/i18n/tr.js
new file mode 100644
index 0000000000..fc4c0bf051
--- /dev/null
+++ b/public/js/select2/i18n/tr.js
@@ -0,0 +1,3 @@
+/*! Select2 4.0.13 | https://github.com/select2/select2/blob/master/LICENSE.md */
+
+!function(){if(jQuery&&jQuery.fn&&jQuery.fn.select2&&jQuery.fn.select2.amd)var n=jQuery.fn.select2.amd;n.define("select2/i18n/tr",[],function(){return{errorLoading:function(){return"Sonuç yüklenemedi"},inputTooLong:function(n){return n.input.length-n.maximum+" karakter daha girmelisiniz"},inputTooShort:function(n){return"En az "+(n.minimum-n.input.length)+" karakter daha girmelisiniz"},loadingMore:function(){return"Daha fazla…"},maximumSelected:function(n){return"Sadece "+n.maximum+" seçim yapabilirsiniz"},noResults:function(){return"Sonuç bulunamadı"},searching:function(){return"Aranıyor…"},removeAllItems:function(){return"Tüm öğeleri kaldır"}}}),n.define,n.require}();
\ No newline at end of file
diff --git a/public/js/select2/i18n/uk.js b/public/js/select2/i18n/uk.js
new file mode 100644
index 0000000000..63697e3884
--- /dev/null
+++ b/public/js/select2/i18n/uk.js
@@ -0,0 +1,3 @@
+/*! Select2 4.0.13 | https://github.com/select2/select2/blob/master/LICENSE.md */
+
+!function(){if(jQuery&&jQuery.fn&&jQuery.fn.select2&&jQuery.fn.select2.amd)var n=jQuery.fn.select2.amd;n.define("select2/i18n/uk",[],function(){function n(n,e,u,r){return n%100>10&&n%100<15?r:n%10==1?e:n%10>1&&n%10<5?u:r}return{errorLoading:function(){return"Неможливо завантажити результати"},inputTooLong:function(e){return"Будь ласка, видаліть "+(e.input.length-e.maximum)+" "+n(e.maximum,"літеру","літери","літер")},inputTooShort:function(n){return"Будь ласка, введіть "+(n.minimum-n.input.length)+" або більше літер"},loadingMore:function(){return"Завантаження інших результатів…"},maximumSelected:function(e){return"Ви можете вибрати лише "+e.maximum+" "+n(e.maximum,"пункт","пункти","пунктів")},noResults:function(){return"Нічого не знайдено"},searching:function(){return"Пошук…"},removeAllItems:function(){return"Видалити всі елементи"}}}),n.define,n.require}();
\ No newline at end of file
diff --git a/public/js/select2/i18n/vi.js b/public/js/select2/i18n/vi.js
new file mode 100644
index 0000000000..24f3bc2d61
--- /dev/null
+++ b/public/js/select2/i18n/vi.js
@@ -0,0 +1,3 @@
+/*! Select2 4.0.13 | https://github.com/select2/select2/blob/master/LICENSE.md */
+
+!function(){if(jQuery&&jQuery.fn&&jQuery.fn.select2&&jQuery.fn.select2.amd)var n=jQuery.fn.select2.amd;n.define("select2/i18n/vi",[],function(){return{inputTooLong:function(n){return"Vui lòng xóa bớt "+(n.input.length-n.maximum)+" ký tự"},inputTooShort:function(n){return"Vui lòng nhập thêm từ "+(n.minimum-n.input.length)+" ký tự trở lên"},loadingMore:function(){return"Đang lấy thêm kết quả…"},maximumSelected:function(n){return"Chỉ có thể chọn được "+n.maximum+" lựa chọn"},noResults:function(){return"Không tìm thấy kết quả"},searching:function(){return"Đang tìm…"},removeAllItems:function(){return"Xóa tất cả các mục"}}}),n.define,n.require}();
\ No newline at end of file
diff --git a/public/js/select2/i18n/zh-CN.js b/public/js/select2/i18n/zh-CN.js
new file mode 100644
index 0000000000..2c5649d310
--- /dev/null
+++ b/public/js/select2/i18n/zh-CN.js
@@ -0,0 +1,3 @@
+/*! Select2 4.0.13 | https://github.com/select2/select2/blob/master/LICENSE.md */
+
+!function(){if(jQuery&&jQuery.fn&&jQuery.fn.select2&&jQuery.fn.select2.amd)var n=jQuery.fn.select2.amd;n.define("select2/i18n/zh-CN",[],function(){return{errorLoading:function(){return"无法载入结果。"},inputTooLong:function(n){return"请删除"+(n.input.length-n.maximum)+"个字符"},inputTooShort:function(n){return"请再输入至少"+(n.minimum-n.input.length)+"个字符"},loadingMore:function(){return"载入更多结果…"},maximumSelected:function(n){return"最多只能选择"+n.maximum+"个项目"},noResults:function(){return"未找到结果"},searching:function(){return"搜索中…"},removeAllItems:function(){return"删除所有项目"}}}),n.define,n.require}();
\ No newline at end of file
diff --git a/public/js/select2/i18n/zh-TW.js b/public/js/select2/i18n/zh-TW.js
new file mode 100644
index 0000000000..570a566937
--- /dev/null
+++ b/public/js/select2/i18n/zh-TW.js
@@ -0,0 +1,3 @@
+/*! Select2 4.0.13 | https://github.com/select2/select2/blob/master/LICENSE.md */
+
+!function(){if(jQuery&&jQuery.fn&&jQuery.fn.select2&&jQuery.fn.select2.amd)var n=jQuery.fn.select2.amd;n.define("select2/i18n/zh-TW",[],function(){return{inputTooLong:function(n){return"請刪掉"+(n.input.length-n.maximum)+"個字元"},inputTooShort:function(n){return"請再輸入"+(n.minimum-n.input.length)+"個字元"},loadingMore:function(){return"載入中…"},maximumSelected:function(n){return"你只能選擇最多"+n.maximum+"項"},noResults:function(){return"沒有找到相符的項目"},searching:function(){return"搜尋中…"},removeAllItems:function(){return"刪除所有項目"}}}),n.define,n.require}();
\ No newline at end of file
diff --git a/public/mix-manifest.json b/public/mix-manifest.json
index b48530bf85..e4dee94e3d 100644
--- a/public/mix-manifest.json
+++ b/public/mix-manifest.json
@@ -1,51 +1,115 @@
 {
-    "/js/build/app.js": "/js/build/app.js?id=d47043e03f80612693d9b9034d94e28f",
-    "/css/dist/skins/skin-red.css": "/css/dist/skins/skin-red.css?id=44bf834f2110504a793dadec132a5898",
-    "/css/dist/skins/skin-blue.css": "/css/dist/skins/skin-blue.css?id=f677207c6cf9678eb539abecb408c374",
-    "/css/build/overrides.css": "/css/build/overrides.css?id=004835e70ed3ae2e2340162b7a37c752",
-    "/css/build/app.css": "/css/build/app.css?id=7ecac57fc8cf6fdbe447c18d5f2ae7bc",
+    "/js/build/app.js": "/js/build/app.js?id=19253af36b58ed3fb6770c7bb944f079",
+    "/css/dist/skins/skin-black-dark.css": "/css/dist/skins/skin-black-dark.css?id=78bfb1c7b5782df4fb0ac7e36f80f847",
+    "/css/dist/skins/_all-skins.css": "/css/dist/skins/_all-skins.css?id=503d0b09e157a22f555e3670d1ec9bb5",
+    "/css/build/overrides.css": "/css/build/overrides.css?id=2bfc7b71d951c5ac026dbc034f7373b1",
+    "/css/build/app.css": "/css/build/app.css?id=4b4c2f1225d59efa7a22b76f7bbe39d8",
     "/css/build/AdminLTE.css": "/css/build/AdminLTE.css?id=4ea0068716c1bb2434d87a16d51b98c9",
-    "/css/dist/skins/skin-orange.css": "/css/dist/skins/skin-orange.css?id=6f0563e726c2fe4fab4026daaa5bfdf2",
-    "/css/dist/skins/skin-orange-dark.css": "/css/dist/skins/skin-orange-dark.css?id=4fa7aa3ba499c8f4e390eb8549da3f74",
-    "/css/dist/skins/skin-blue-dark.css": "/css/dist/skins/skin-blue-dark.css?id=0640e45bad692dcf62873c6e85904899",
-    "/css/dist/skins/skin-yellow-dark.css": "/css/dist/skins/skin-yellow-dark.css?id=393aaa7b368b0670fc42434c8cca7dc7",
     "/css/dist/skins/skin-yellow.css": "/css/dist/skins/skin-yellow.css?id=7b315b9612b8fde8f9c5b0ddb6bba690",
-    "/css/dist/skins/skin-purple-dark.css": "/css/dist/skins/skin-purple-dark.css?id=f8b26018a1533b9db864247daaf06daa",
+    "/css/dist/skins/skin-yellow-dark.css": "/css/dist/skins/skin-yellow-dark.css?id=f6b2e7fa795596ac4754500c9c30eacc",
+    "/css/dist/skins/skin-red.css": "/css/dist/skins/skin-red.css?id=44bf834f2110504a793dadec132a5898",
+    "/css/dist/skins/skin-red-dark.css": "/css/dist/skins/skin-red-dark.css?id=bcba8a437f59c2334f9bd32f668ff9bb",
     "/css/dist/skins/skin-purple.css": "/css/dist/skins/skin-purple.css?id=6fe68325d5356197672c27bc77cedcb4",
-    "/css/dist/skins/skin-red-dark.css": "/css/dist/skins/skin-red-dark.css?id=ad39859637dafa781288630f9d6d6523",
-    "/css/dist/skins/skin-black-dark.css": "/css/dist/skins/skin-black-dark.css?id=f0b08873a06bb54daeee176a9459f4a9",
-    "/css/dist/skins/skin-black.css": "/css/dist/skins/skin-black.css?id=76482123f6c70e866d6b971ba91de7bb",
-    "/css/dist/skins/skin-green-dark.css": "/css/dist/skins/skin-green-dark.css?id=553ee68741b5a392037abcf04da80adc",
+    "/css/dist/skins/skin-purple-dark.css": "/css/dist/skins/skin-purple-dark.css?id=093bd9d22c19a903b826bb4a1c819263",
+    "/css/dist/skins/skin-orange.css": "/css/dist/skins/skin-orange.css?id=6f0563e726c2fe4fab4026daaa5bfdf2",
+    "/css/dist/skins/skin-orange-dark.css": "/css/dist/skins/skin-orange-dark.css?id=723ac4a390d628c9253d5416494cdaf4",
     "/css/dist/skins/skin-green.css": "/css/dist/skins/skin-green.css?id=0a82a6ae6bb4e58fe62d162c4fb50397",
+    "/css/dist/skins/skin-green-dark.css": "/css/dist/skins/skin-green-dark.css?id=624d1d9b9bf141a593cfe835fdfc85cc",
     "/css/dist/skins/skin-contrast.css": "/css/dist/skins/skin-contrast.css?id=da6c7997d9de2f8329142399f0ce50da",
-    "/css/dist/all.css": "/css/dist/all.css?id=0f9956c66f93c6417f69f0134c6ae128",
+    "/css/dist/skins/skin-blue.css": "/css/dist/skins/skin-blue.css?id=a82b065847bf3cd5d713c04ee8dc86c6",
+    "/css/dist/skins/skin-blue-dark.css": "/css/dist/skins/skin-blue-dark.css?id=7aacfabbafd138c5af6420609f97820d",
+    "/css/dist/skins/skin-black.css": "/css/dist/skins/skin-black.css?id=76482123f6c70e866d6b971ba91de7bb",
+    "/css/dist/all.css": "/css/dist/all.css?id=12e96a25d0dc3ee39e9d3ce97044fbbf",
     "/css/dist/signature-pad.css": "/css/dist/signature-pad.css?id=6a89d3cd901305e66ced1cf5f13147f7",
     "/css/dist/signature-pad.min.css": "/css/dist/signature-pad.min.css?id=6a89d3cd901305e66ced1cf5f13147f7",
-    "/css/webfonts/fa-brands-400.ttf": "/css/webfonts/fa-brands-400.ttf?id=0141634c24336be626e05c8b77d1fa27",
-    "/css/webfonts/fa-brands-400.woff2": "/css/webfonts/fa-brands-400.woff2?id=b3cf7a6dd618bd392f3ddcc61343a463",
-    "/css/webfonts/fa-regular-400.ttf": "/css/webfonts/fa-regular-400.ttf?id=9cf69d99de9d83f82466a647f5cb1f94",
-    "/css/webfonts/fa-regular-400.woff2": "/css/webfonts/fa-regular-400.woff2?id=f0549181a126fe40849a53792bb0e077",
-    "/css/webfonts/fa-solid-900.ttf": "/css/webfonts/fa-solid-900.ttf?id=509c0e46de844df754d10179cf03c953",
-    "/css/webfonts/fa-solid-900.woff2": "/css/webfonts/fa-solid-900.woff2?id=96d16b1bdb177fd796c810b9e706c780",
-    "/css/webfonts/fa-v4compatibility.ttf": "/css/webfonts/fa-v4compatibility.ttf?id=8994b282f9f3b7a00380bb1e2731a4bf",
-    "/css/webfonts/fa-v4compatibility.woff2": "/css/webfonts/fa-v4compatibility.woff2?id=111e341dba724e1df946e8d1f406a7bd",
-    "/css/dist/bootstrap-table.css": "/css/dist/bootstrap-table.css?id=5f79123a6750afd34dbf565faec3dda3",
-    "/js/build/vendor.js": "/js/build/vendor.js?id=179bfe20e8767f7df32658c6b5a10ca3",
-    "/js/dist/bootstrap-table.js": "/js/dist/bootstrap-table.js?id=e5918703a22f8992c4c98f1dbbecb8f7",
-    "/js/dist/all.js": "/js/dist/all.js?id=a5164c1c20074421f561fade29d392c3",
-    "/css/dist/skins/skin-green.min.css": "/css/dist/skins/skin-green.min.css?id=0a82a6ae6bb4e58fe62d162c4fb50397",
-    "/css/dist/skins/skin-green-dark.min.css": "/css/dist/skins/skin-green-dark.min.css?id=553ee68741b5a392037abcf04da80adc",
+    "/js/select2/i18n/af.js": "/js/select2/i18n/af.js?id=4f6fcd73488ce79fae1b7a90aceaecde",
+    "/js/select2/i18n/ar.js": "/js/select2/i18n/ar.js?id=65aa8e36bf5da57ff4e3f22a835ab035",
+    "/js/select2/i18n/az.js": "/js/select2/i18n/az.js?id=270c257daf8140a0cf23ad5de6f8ed1b",
+    "/js/select2/i18n/bg.js": "/js/select2/i18n/bg.js?id=39b8be30d4f06779839cfaaa415d0690",
+    "/js/select2/i18n/bn.js": "/js/select2/i18n/bn.js?id=6d42b4dd5665d0fa28f06994eedb4899",
+    "/js/select2/i18n/bs.js": "/js/select2/i18n/bs.js?id=91624382358e95086b80f00fa0bd6955",
+    "/js/select2/i18n/build.txt": "/js/select2/i18n/build.txt?id=c9fb9399ed170dfbc76c0d3b26267c1f",
+    "/js/select2/i18n/ca.js": "/js/select2/i18n/ca.js?id=a166b745933a48ce3d0580a74210617d",
+    "/js/select2/i18n/cs.js": "/js/select2/i18n/cs.js?id=4f43e8e7d33aa1e6aadf3286c7e379e9",
+    "/js/select2/i18n/da.js": "/js/select2/i18n/da.js?id=766346afe4dd72c003242cfb1cbe2617",
+    "/js/select2/i18n/de.js": "/js/select2/i18n/de.js?id=8a1c222b0204c8faaf6d3c07c961d8aa",
+    "/js/select2/i18n/dsb.js": "/js/select2/i18n/dsb.js?id=56372c92d2f1bcb2b8e382981dca0546",
+    "/js/select2/i18n/el.js": "/js/select2/i18n/el.js?id=27097f071856a0f4e82298fe407d1eac",
+    "/js/select2/i18n/en.js": "/js/select2/i18n/en.js?id=cf932ba09a98fe11bde8e1f3dd5e2cfa",
+    "/js/select2/i18n/es.js": "/js/select2/i18n/es.js?id=66dbc2652fb1b769bf29058e707b43c8",
+    "/js/select2/i18n/et.js": "/js/select2/i18n/et.js?id=2b96fd98289dc3fc5e61f21e6e1a7d52",
+    "/js/select2/i18n/eu.js": "/js/select2/i18n/eu.js?id=adfe5c97b72c20bb0afbc0968b440e50",
+    "/js/select2/i18n/fa.js": "/js/select2/i18n/fa.js?id=3b5bd1961cfd0a6f96ac4cd2ea16c243",
+    "/js/select2/i18n/fi.js": "/js/select2/i18n/fi.js?id=614ec42aa9baaf687ab9ff44705dfd2e",
+    "/js/select2/i18n/fr.js": "/js/select2/i18n/fr.js?id=05e0542fcfe6df5ab074a377dc1a5a9b",
+    "/js/select2/i18n/gl.js": "/js/select2/i18n/gl.js?id=d99b1fedaa86d011818cfbab11dd355c",
+    "/js/select2/i18n/he.js": "/js/select2/i18n/he.js?id=e420ff6cd3ed77ab9271c9b3d441442c",
+    "/js/select2/i18n/hi.js": "/js/select2/i18n/hi.js?id=70640d41628f36284af78b22ea8b283b",
+    "/js/select2/i18n/hr.js": "/js/select2/i18n/hr.js?id=a2b092cc1147f07b978145d407c67fa1",
+    "/js/select2/i18n/hsb.js": "/js/select2/i18n/hsb.js?id=fa3b55265efe8f4182d5e65a1a506252",
+    "/js/select2/i18n/hu.js": "/js/select2/i18n/hu.js?id=6ec6039cb8a354e2bc6a1794f729caae",
+    "/js/select2/i18n/hy.js": "/js/select2/i18n/hy.js?id=c7babaeef5a625566434ea79b19d4c7e",
+    "/js/select2/i18n/id.js": "/js/select2/i18n/id.js?id=04debded514d3962bb74f05532e793d4",
+    "/js/select2/i18n/is.js": "/js/select2/i18n/is.js?id=3ddd9a6a97e93e1910210c9eefc1bca1",
+    "/js/select2/i18n/it.js": "/js/select2/i18n/it.js?id=be4fe8d365b5916432504d1f98e2e0af",
+    "/js/select2/i18n/ja.js": "/js/select2/i18n/ja.js?id=170ae885d74f1634271e1eb470cb4621",
+    "/js/select2/i18n/ka.js": "/js/select2/i18n/ka.js?id=2083264a54f0873f55468affa796d61e",
+    "/js/select2/i18n/km.js": "/js/select2/i18n/km.js?id=c23089cb06ca871153ba9bfe8458a378",
+    "/js/select2/i18n/ko.js": "/js/select2/i18n/ko.js?id=e7be6c20e67393698a0f05971e9720c1",
+    "/js/select2/i18n/lt.js": "/js/select2/i18n/lt.js?id=23c7ce903300fc118947994b9cdd16cb",
+    "/js/select2/i18n/lv.js": "/js/select2/i18n/lv.js?id=08e62128eac1d0e8ac32cfaf75f2ec9f",
+    "/js/select2/i18n/mk.js": "/js/select2/i18n/mk.js?id=dabbb90871300ce3a295969bc0260420",
+    "/js/select2/i18n/ms.js": "/js/select2/i18n/ms.js?id=4ba82c9a51ce975fe0e4eff5f6eece65",
+    "/js/select2/i18n/nb.js": "/js/select2/i18n/nb.js?id=da2fce143f2794208e36dc8520e4c36a",
+    "/js/select2/i18n/ne.js": "/js/select2/i18n/ne.js?id=3d79fd3f08dbfd0973cf91dd6a62bccd",
+    "/js/select2/i18n/nl.js": "/js/select2/i18n/nl.js?id=997868a37ed89062ad7b19c9a88f1bb0",
+    "/js/select2/i18n/pl.js": "/js/select2/i18n/pl.js?id=6031b4f164521f58dfec7d1e46238861",
+    "/js/select2/i18n/ps.js": "/js/select2/i18n/ps.js?id=38dfa47af9e086eece5a333d711abc79",
+    "/js/select2/i18n/pt-BR.js": "/js/select2/i18n/pt-BR.js?id=e1b294433e7fc3175842ce37b9f15014",
+    "/js/select2/i18n/pt.js": "/js/select2/i18n/pt.js?id=33b4a3b44d437614b83497e36c138ca9",
+    "/js/select2/i18n/ro.js": "/js/select2/i18n/ro.js?id=f75cb460ec3b98b4b9017e9513ca20cf",
+    "/js/select2/i18n/ru.js": "/js/select2/i18n/ru.js?id=934aa95f5b5f32c72c80857bb2622074",
+    "/js/select2/i18n/sk.js": "/js/select2/i18n/sk.js?id=33d02cef8d110f358acd1624f7f79ffe",
+    "/js/select2/i18n/sl.js": "/js/select2/i18n/sl.js?id=131a78bc075237a13750ead3807683d2",
+    "/js/select2/i18n/sq.js": "/js/select2/i18n/sq.js?id=5636b60d29c9bdd55f18a4585746b6d1",
+    "/js/select2/i18n/sr-Cyrl.js": "/js/select2/i18n/sr-Cyrl.js?id=f254bb8c4c7ce00d9d17e9e91945ad9b",
+    "/js/select2/i18n/sr.js": "/js/select2/i18n/sr.js?id=5ed85a48f483d17a7ad102832cb11ea1",
+    "/js/select2/i18n/sv.js": "/js/select2/i18n/sv.js?id=7a9c2f71e7779a263b2cf3520b1aa611",
+    "/js/select2/i18n/th.js": "/js/select2/i18n/th.js?id=f38c20b0221b68924d6c8f0773cb252d",
+    "/js/select2/i18n/tk.js": "/js/select2/i18n/tk.js?id=7c572a68c78fb798f11f7d8c78ebb9d6",
+    "/js/select2/i18n/tr.js": "/js/select2/i18n/tr.js?id=b5a0643d1545f4a3e1622e65e46ddc7c",
+    "/js/select2/i18n/uk.js": "/js/select2/i18n/uk.js?id=8cede7f4803c7dbd1e8261bfa1932b7c",
+    "/js/select2/i18n/vi.js": "/js/select2/i18n/vi.js?id=097a5b75b3e146e2d94ab8e1510be607",
+    "/js/select2/i18n/zh-CN.js": "/js/select2/i18n/zh-CN.js?id=2cff662ec5f972b4613566cf5988cda2",
+    "/js/select2/i18n/zh-TW.js": "/js/select2/i18n/zh-TW.js?id=04554a227c2ba0f3bb6ca3d2e01e5440",
+    "/css/webfonts/fa-brands-400.ttf": "/css/webfonts/fa-brands-400.ttf?id=7c8d1eaa468e8de72642d3fc43ee5ed2",
+    "/css/webfonts/fa-brands-400.woff2": "/css/webfonts/fa-brands-400.woff2?id=552e767fb6056f7f34a4783c2933556e",
+    "/css/webfonts/fa-regular-400.ttf": "/css/webfonts/fa-regular-400.ttf?id=96c3064e8868339b4aa6473968bdd464",
+    "/css/webfonts/fa-regular-400.woff2": "/css/webfonts/fa-regular-400.woff2?id=25bde24dc00e5dce8f1bfa8164b3b7b1",
+    "/css/webfonts/fa-solid-900.ttf": "/css/webfonts/fa-solid-900.ttf?id=8218477819a31609afa351933eebcdb4",
+    "/css/webfonts/fa-solid-900.woff2": "/css/webfonts/fa-solid-900.woff2?id=109ad919b74a62a8a223361da1651bbc",
+    "/css/webfonts/fa-v4compatibility.ttf": "/css/webfonts/fa-v4compatibility.ttf?id=53c2e50ef821f7b8dd514611d5e0772c",
+    "/css/webfonts/fa-v4compatibility.woff2": "/css/webfonts/fa-v4compatibility.woff2?id=331c85bd61ffa93af09273d1bc2add5a",
+    "/js/dist/bootstrap-table-locale-all.min.js": "/js/dist/bootstrap-table-locale-all.min.js?id=5e93ef0a1889bed3f92a705dc1e92c9b",
+    "/js/dist/bootstrap-table-en-US.min.js": "/js/dist/bootstrap-table-en-US.min.js?id=c0f21fb7e62d6f0a0153f1cdbf26782a",
+    "/css/dist/skins/_all-skins.min.css": "/css/dist/skins/_all-skins.min.css?id=503d0b09e157a22f555e3670d1ec9bb5",
+    "/css/dist/skins/skin-black-dark.min.css": "/css/dist/skins/skin-black-dark.min.css?id=78bfb1c7b5782df4fb0ac7e36f80f847",
     "/css/dist/skins/skin-black.min.css": "/css/dist/skins/skin-black.min.css?id=76482123f6c70e866d6b971ba91de7bb",
-    "/css/dist/skins/skin-black-dark.min.css": "/css/dist/skins/skin-black-dark.min.css?id=f0b08873a06bb54daeee176a9459f4a9",
-    "/css/dist/skins/skin-blue.min.css": "/css/dist/skins/skin-blue.min.css?id=f677207c6cf9678eb539abecb408c374",
-    "/css/dist/skins/skin-blue-dark.min.css": "/css/dist/skins/skin-blue-dark.min.css?id=0640e45bad692dcf62873c6e85904899",
-    "/css/dist/skins/skin-yellow.min.css": "/css/dist/skins/skin-yellow.min.css?id=7b315b9612b8fde8f9c5b0ddb6bba690",
-    "/css/dist/skins/skin-yellow-dark.min.css": "/css/dist/skins/skin-yellow-dark.min.css?id=393aaa7b368b0670fc42434c8cca7dc7",
-    "/css/dist/skins/skin-red.min.css": "/css/dist/skins/skin-red.min.css?id=44bf834f2110504a793dadec132a5898",
-    "/css/dist/skins/skin-red-dark.min.css": "/css/dist/skins/skin-red-dark.min.css?id=ad39859637dafa781288630f9d6d6523",
-    "/css/dist/skins/skin-purple.min.css": "/css/dist/skins/skin-purple.min.css?id=6fe68325d5356197672c27bc77cedcb4",
-    "/css/dist/skins/skin-purple-dark.min.css": "/css/dist/skins/skin-purple-dark.min.css?id=f8b26018a1533b9db864247daaf06daa",
+    "/css/dist/skins/skin-blue-dark.min.css": "/css/dist/skins/skin-blue-dark.min.css?id=7aacfabbafd138c5af6420609f97820d",
+    "/css/dist/skins/skin-blue.min.css": "/css/dist/skins/skin-blue.min.css?id=a82b065847bf3cd5d713c04ee8dc86c6",
+    "/css/dist/skins/skin-contrast.min.css": "/css/dist/skins/skin-contrast.min.css?id=da6c7997d9de2f8329142399f0ce50da",
+    "/css/dist/skins/skin-green-dark.min.css": "/css/dist/skins/skin-green-dark.min.css?id=624d1d9b9bf141a593cfe835fdfc85cc",
+    "/css/dist/skins/skin-green.min.css": "/css/dist/skins/skin-green.min.css?id=0a82a6ae6bb4e58fe62d162c4fb50397",
+    "/css/dist/skins/skin-orange-dark.min.css": "/css/dist/skins/skin-orange-dark.min.css?id=723ac4a390d628c9253d5416494cdaf4",
     "/css/dist/skins/skin-orange.min.css": "/css/dist/skins/skin-orange.min.css?id=6f0563e726c2fe4fab4026daaa5bfdf2",
-    "/css/dist/skins/skin-orange-dark.min.css": "/css/dist/skins/skin-orange-dark.min.css?id=4fa7aa3ba499c8f4e390eb8549da3f74",
-    "/css/dist/skins/skin-contrast.min.css": "/css/dist/skins/skin-contrast.min.css?id=da6c7997d9de2f8329142399f0ce50da"
+    "/css/dist/skins/skin-purple-dark.min.css": "/css/dist/skins/skin-purple-dark.min.css?id=093bd9d22c19a903b826bb4a1c819263",
+    "/css/dist/skins/skin-purple.min.css": "/css/dist/skins/skin-purple.min.css?id=6fe68325d5356197672c27bc77cedcb4",
+    "/css/dist/skins/skin-red-dark.min.css": "/css/dist/skins/skin-red-dark.min.css?id=bcba8a437f59c2334f9bd32f668ff9bb",
+    "/css/dist/skins/skin-red.min.css": "/css/dist/skins/skin-red.min.css?id=44bf834f2110504a793dadec132a5898",
+    "/css/dist/skins/skin-yellow-dark.min.css": "/css/dist/skins/skin-yellow-dark.min.css?id=f6b2e7fa795596ac4754500c9c30eacc",
+    "/css/dist/skins/skin-yellow.min.css": "/css/dist/skins/skin-yellow.min.css?id=7b315b9612b8fde8f9c5b0ddb6bba690",
+    "/css/dist/bootstrap-table.css": "/css/dist/bootstrap-table.css?id=54d676a6ea8677dd48f6c4b3041292cf",
+    "/js/build/vendor.js": "/js/build/vendor.js?id=89dffa552c6e3abe3a2aac6c9c7b466b",
+    "/js/dist/bootstrap-table.js": "/js/dist/bootstrap-table.js?id=60097b6b56d80cbc76257d4ecf6f57b4",
+    "/js/dist/all.js": "/js/dist/all.js?id=8c6d7286f667eeb62a0a28a09851a6c3"
 }
diff --git a/public/sounds/error.mp3 b/public/sounds/error.mp3
new file mode 100644
index 0000000000..6a86ef02e5
Binary files /dev/null and b/public/sounds/error.mp3 differ
diff --git a/public/sounds/lock.mp3 b/public/sounds/lock.mp3
new file mode 100644
index 0000000000..8628f2fd3c
Binary files /dev/null and b/public/sounds/lock.mp3 differ
diff --git a/public/sounds/success.mp3 b/public/sounds/success.mp3
new file mode 100644
index 0000000000..de51d68b3b
Binary files /dev/null and b/public/sounds/success.mp3 differ
diff --git a/public/uploads/.gitignore b/public/uploads/.gitignore
index 73edf0327e..e841eefe2f 100755
--- a/public/uploads/.gitignore
+++ b/public/uploads/.gitignore
@@ -1,2 +1,3 @@
+*
 !.gitignore
-*
\ No newline at end of file
+!default.png
\ No newline at end of file
diff --git a/public/uploads/avatars/.gitignore b/public/uploads/avatars/.gitignore
index f935021a8f..7f5853c769 100755
--- a/public/uploads/avatars/.gitignore
+++ b/public/uploads/avatars/.gitignore
@@ -1 +1,2 @@
 !.gitignore
+!default.png
\ No newline at end of file
diff --git a/public/uploads/default.png b/public/uploads/default.png
new file mode 100644
index 0000000000..6a39280543
Binary files /dev/null and b/public/uploads/default.png differ
diff --git a/public/vendor/livewire/livewire.esm.js b/public/vendor/livewire/livewire.esm.js
index 0f6daa54ec..0a2a037235 100644
--- a/public/vendor/livewire/livewire.esm.js
+++ b/public/vendor/livewire/livewire.esm.js
@@ -1432,10 +1432,10 @@ var require_module_cjs = __commonJS({
       });
     }
     function cleanupElement(el) {
-      if (el._x_cleanups) {
-        while (el._x_cleanups.length)
-          el._x_cleanups.pop()();
-      }
+      var _a, _b;
+      (_a = el._x_effects) == null ? void 0 : _a.forEach(dequeueJob);
+      while ((_b = el._x_cleanups) == null ? void 0 : _b.length)
+        el._x_cleanups.pop()();
     }
     var observer = new MutationObserver(onMutate);
     var currentlyObserving = false;
@@ -1483,7 +1483,7 @@ var require_module_cjs = __commonJS({
         deferredMutations = deferredMutations.concat(mutations);
         return;
       }
-      let addedNodes = /* @__PURE__ */ new Set();
+      let addedNodes = [];
       let removedNodes = /* @__PURE__ */ new Set();
       let addedAttributes = /* @__PURE__ */ new Map();
       let removedAttributes = /* @__PURE__ */ new Map();
@@ -1491,8 +1491,24 @@ var require_module_cjs = __commonJS({
         if (mutations[i].target._x_ignoreMutationObserver)
           continue;
         if (mutations[i].type === "childList") {
-          mutations[i].addedNodes.forEach((node) => node.nodeType === 1 && addedNodes.add(node));
-          mutations[i].removedNodes.forEach((node) => node.nodeType === 1 && removedNodes.add(node));
+          mutations[i].removedNodes.forEach((node) => {
+            if (node.nodeType !== 1)
+              return;
+            if (!node._x_marker)
+              return;
+            removedNodes.add(node);
+          });
+          mutations[i].addedNodes.forEach((node) => {
+            if (node.nodeType !== 1)
+              return;
+            if (removedNodes.has(node)) {
+              removedNodes.delete(node);
+              return;
+            }
+            if (node._x_marker)
+              return;
+            addedNodes.push(node);
+          });
         }
         if (mutations[i].type === "attributes") {
           let el = mutations[i].target;
@@ -1525,29 +1541,15 @@ var require_module_cjs = __commonJS({
         onAttributeAddeds.forEach((i) => i(el, attrs));
       });
       for (let node of removedNodes) {
-        if (addedNodes.has(node))
+        if (addedNodes.some((i) => i.contains(node)))
           continue;
         onElRemoveds.forEach((i) => i(node));
       }
-      addedNodes.forEach((node) => {
-        node._x_ignoreSelf = true;
-        node._x_ignore = true;
-      });
       for (let node of addedNodes) {
-        if (removedNodes.has(node))
-          continue;
         if (!node.isConnected)
           continue;
-        delete node._x_ignoreSelf;
-        delete node._x_ignore;
         onElAddeds.forEach((i) => i(node));
-        node._x_ignore = true;
-        node._x_ignoreSelf = true;
       }
-      addedNodes.forEach((node) => {
-        delete node._x_ignoreSelf;
-        delete node._x_ignore;
-      });
       addedNodes = null;
       removedNodes = null;
       addedAttributes = null;
@@ -1673,27 +1675,23 @@ var require_module_cjs = __commonJS({
       magics[name] = callback;
     }
     function injectMagics(obj, el) {
+      let memoizedUtilities = getUtilities(el);
       Object.entries(magics).forEach(([name, callback]) => {
-        let memoizedUtilities = null;
-        function getUtilities() {
-          if (memoizedUtilities) {
-            return memoizedUtilities;
-          } else {
-            let [utilities, cleanup] = getElementBoundUtilities(el);
-            memoizedUtilities = { interceptor, ...utilities };
-            onElRemoved(el, cleanup);
-            return memoizedUtilities;
-          }
-        }
         Object.defineProperty(obj, `$${name}`, {
           get() {
-            return callback(el, getUtilities());
+            return callback(el, memoizedUtilities);
           },
           enumerable: false
         });
       });
       return obj;
     }
+    function getUtilities(el) {
+      let [utilities, cleanup] = getElementBoundUtilities(el);
+      let utils = { interceptor, ...utilities };
+      onElRemoved(el, cleanup);
+      return utils;
+    }
     function tryCatch(el, expression, callback, ...args) {
       try {
         return callback(...args);
@@ -2054,21 +2052,29 @@ ${expression ? 'Expression: "' + expression + '"\n\n' : ""}`, el);
     function interceptInit(callback) {
       initInterceptors2.push(callback);
     }
+    var markerDispenser = 1;
     function initTree(el, walker = walk, intercept = () => {
     }) {
+      if (findClosest(el, (i) => i._x_ignore))
+        return;
       deferHandlingDirectives(() => {
         walker(el, (el2, skip) => {
+          if (el2._x_marker)
+            return;
           intercept(el2, skip);
           initInterceptors2.forEach((i) => i(el2, skip));
           directives(el2, el2.attributes).forEach((handle) => handle());
+          if (!el2._x_ignore)
+            el2._x_marker = markerDispenser++;
           el2._x_ignore && skip();
         });
       });
     }
     function destroyTree(root, walker = walk) {
       walker(root, (el) => {
-        cleanupAttributes(el);
         cleanupElement(el);
+        cleanupAttributes(el);
+        delete el._x_marker;
       });
     }
     function warnAboutMissingPlugins() {
@@ -2561,7 +2567,7 @@ ${expression ? 'Expression: "' + expression + '"\n\n' : ""}`, el);
       }
     }
     function bindInputValue(el, value) {
-      if (el.type === "radio") {
+      if (isRadio(el)) {
         if (el.attributes.value === void 0) {
           el.value = value;
         }
@@ -2572,7 +2578,7 @@ ${expression ? 'Expression: "' + expression + '"\n\n' : ""}`, el);
             el.checked = checkedAttrLooseCompare(el.value, value);
           }
         }
-      } else if (el.type === "checkbox") {
+      } else if (isCheckbox(el)) {
         if (Number.isInteger(value)) {
           el.value = value;
         } else if (!Array.isArray(value) && typeof value !== "boolean" && ![null, void 0].includes(value)) {
@@ -2648,34 +2654,37 @@ ${expression ? 'Expression: "' + expression + '"\n\n' : ""}`, el);
       }
       return rawValue ? Boolean(rawValue) : null;
     }
+    var booleanAttributes = /* @__PURE__ */ new Set([
+      "allowfullscreen",
+      "async",
+      "autofocus",
+      "autoplay",
+      "checked",
+      "controls",
+      "default",
+      "defer",
+      "disabled",
+      "formnovalidate",
+      "inert",
+      "ismap",
+      "itemscope",
+      "loop",
+      "multiple",
+      "muted",
+      "nomodule",
+      "novalidate",
+      "open",
+      "playsinline",
+      "readonly",
+      "required",
+      "reversed",
+      "selected",
+      "shadowrootclonable",
+      "shadowrootdelegatesfocus",
+      "shadowrootserializable"
+    ]);
     function isBooleanAttr(attrName) {
-      const booleanAttributes = [
-        "disabled",
-        "checked",
-        "required",
-        "readonly",
-        "open",
-        "selected",
-        "autofocus",
-        "itemscope",
-        "multiple",
-        "novalidate",
-        "allowfullscreen",
-        "allowpaymentrequest",
-        "formnovalidate",
-        "autoplay",
-        "controls",
-        "loop",
-        "muted",
-        "playsinline",
-        "default",
-        "ismap",
-        "reversed",
-        "async",
-        "defer",
-        "nomodule"
-      ];
-      return booleanAttributes.includes(attrName);
+      return booleanAttributes.has(attrName);
     }
     function attributeShouldntBePreservedIfFalsy(name) {
       return !["aria-pressed", "aria-checked", "aria-expanded", "aria-selected"].includes(name);
@@ -2708,6 +2717,12 @@ ${expression ? 'Expression: "' + expression + '"\n\n' : ""}`, el);
       }
       return attr;
     }
+    function isCheckbox(el) {
+      return el.type === "checkbox" || el.localName === "ui-checkbox" || el.localName === "ui-switch";
+    }
+    function isRadio(el) {
+      return el.type === "radio" || el.localName === "ui-radio";
+    }
     function debounce2(func, wait) {
       var timeout;
       return function() {
@@ -2776,10 +2791,10 @@ ${expression ? 'Expression: "' + expression + '"\n\n' : ""}`, el);
         return stores[name];
       }
       stores[name] = value;
+      initInterceptors(stores[name]);
       if (typeof value === "object" && value !== null && value.hasOwnProperty("init") && typeof value.init === "function") {
         stores[name].init();
       }
-      initInterceptors(stores[name]);
     }
     function getStores() {
       return stores;
@@ -2848,7 +2863,7 @@ ${expression ? 'Expression: "' + expression + '"\n\n' : ""}`, el);
       });
       return obj;
     }
-    var Alpine19 = {
+    var Alpine20 = {
       get reactive() {
         return reactive;
       },
@@ -2861,7 +2876,7 @@ ${expression ? 'Expression: "' + expression + '"\n\n' : ""}`, el);
       get raw() {
         return raw;
       },
-      version: "3.14.1",
+      version: "3.14.8",
       flushAndStopDeferringMutations,
       dontAutoEvaluateFunctions,
       disableEffectScheduling,
@@ -2914,7 +2929,7 @@ ${expression ? 'Expression: "' + expression + '"\n\n' : ""}`, el);
       data,
       bind: bind2
     };
-    var alpine_default = Alpine19;
+    var alpine_default = Alpine20;
     var import_reactivity10 = __toESM2(require_reactivity());
     magic("nextTick", () => nextTick);
     magic("dispatch", (el) => dispatch3.bind(dispatch3, el));
@@ -3061,7 +3076,6 @@ ${expression ? 'Expression: "' + expression + '"\n\n' : ""}`, el);
         placeInDom(clone2, target, modifiers);
         skipDuringClone(() => {
           initTree(clone2);
-          clone2._x_ignore = true;
         })();
       });
       el._x_teleportPutBack = () => {
@@ -3070,7 +3084,10 @@ ${expression ? 'Expression: "' + expression + '"\n\n' : ""}`, el);
           placeInDom(el._x_teleport, target2, modifiers);
         });
       };
-      cleanup(() => clone2.remove());
+      cleanup(() => mutateDom(() => {
+        clone2.remove();
+        destroyTree(clone2);
+      }));
     });
     var teleportContainerDuringClone = document.createElement("div");
     function getTarget(expression) {
@@ -3294,7 +3311,7 @@ ${expression ? 'Expression: "' + expression + '"\n\n' : ""}`, el);
         setValue(getInputValue(el, modifiers, e, getValue()));
       });
       if (modifiers.includes("fill")) {
-        if ([void 0, null, ""].includes(getValue()) || el.type === "checkbox" && Array.isArray(getValue()) || el.tagName.toLowerCase() === "select" && el.multiple) {
+        if ([void 0, null, ""].includes(getValue()) || isCheckbox(el) && Array.isArray(getValue()) || el.tagName.toLowerCase() === "select" && el.multiple) {
           setValue(getInputValue(el, modifiers, { target: el }, getValue()));
         }
       }
@@ -3334,7 +3351,7 @@ ${expression ? 'Expression: "' + expression + '"\n\n' : ""}`, el);
       return mutateDom(() => {
         if (event instanceof CustomEvent && event.detail !== void 0)
           return event.detail !== null && event.detail !== void 0 ? event.detail : event.target.value;
-        else if (el.type === "checkbox") {
+        else if (isCheckbox(el)) {
           if (Array.isArray(currentValue)) {
             let newValue = null;
             if (modifiers.includes("number")) {
@@ -3365,7 +3382,7 @@ ${expression ? 'Expression: "' + expression + '"\n\n' : ""}`, el);
           });
         } else {
           let newValue;
-          if (el.type === "radio") {
+          if (isRadio(el)) {
             if (event.target.checked) {
               newValue = event.target.value;
             } else {
@@ -3558,7 +3575,10 @@ ${expression ? 'Expression: "' + expression + '"\n\n' : ""}`, el);
       el._x_lookup = {};
       effect3(() => loop(el, iteratorNames, evaluateItems, evaluateKey));
       cleanup(() => {
-        Object.values(el._x_lookup).forEach((el2) => el2.remove());
+        Object.values(el._x_lookup).forEach((el2) => mutateDom(() => {
+          destroyTree(el2);
+          el2.remove();
+        }));
         delete el._x_prevKeys;
         delete el._x_lookup;
       });
@@ -3627,11 +3647,12 @@ ${expression ? 'Expression: "' + expression + '"\n\n' : ""}`, el);
         }
         for (let i = 0; i < removes.length; i++) {
           let key = removes[i];
-          if (!!lookup[key]._x_effects) {
-            lookup[key]._x_effects.forEach(dequeueJob);
-          }
-          lookup[key].remove();
-          lookup[key] = null;
+          if (!(key in lookup))
+            continue;
+          mutateDom(() => {
+            destroyTree(lookup[key]);
+            lookup[key].remove();
+          });
           delete lookup[key];
         }
         for (let i = 0; i < moves.length; i++) {
@@ -3752,12 +3773,10 @@ ${expression ? 'Expression: "' + expression + '"\n\n' : ""}`, el);
         });
         el._x_currentIfEl = clone2;
         el._x_undoIf = () => {
-          walk(clone2, (node) => {
-            if (!!node._x_effects) {
-              node._x_effects.forEach(dequeueJob);
-            }
+          mutateDom(() => {
+            destroyTree(clone2);
+            clone2.remove();
           });
-          clone2.remove();
           delete el._x_currentIfEl;
         };
         return clone2;
@@ -3838,8 +3857,8 @@ var require_module_cjs2 = __commonJS({
       default: () => module_default
     });
     module.exports = __toCommonJS(module_exports);
-    function src_default(Alpine19) {
-      Alpine19.directive("collapse", collapse3);
+    function src_default(Alpine20) {
+      Alpine20.directive("collapse", collapse3);
       collapse3.inline = (el, { modifiers }) => {
         if (!modifiers.includes("min"))
           return;
@@ -3859,7 +3878,7 @@ var require_module_cjs2 = __commonJS({
         if (!el._x_isShown)
           el.style.overflow = "hidden";
         let setFunction = (el2, styles) => {
-          let revertFunction = Alpine19.setStyles(el2, styles);
+          let revertFunction = Alpine20.setStyles(el2, styles);
           return styles.height ? () => {
           } : revertFunction;
         };
@@ -3882,7 +3901,7 @@ var require_module_cjs2 = __commonJS({
             if (current === full) {
               current = floor;
             }
-            Alpine19.transition(el, Alpine19.setStyles, {
+            Alpine20.transition(el, Alpine20.setStyles, {
               during: transitionStyles,
               start: { height: current + "px" },
               end: { height: full + "px" }
@@ -3896,7 +3915,7 @@ var require_module_cjs2 = __commonJS({
           }, after = () => {
           }) {
             let full = el.getBoundingClientRect().height;
-            Alpine19.transition(el, setFunction, {
+            Alpine20.transition(el, setFunction, {
               during: transitionStyles,
               start: { height: full + "px" },
               end: { height: floor + "px" }
@@ -4732,14 +4751,14 @@ var require_module_cjs3 = __commonJS({
     module.exports = __toCommonJS(module_exports);
     var import_focus_trap = __toESM2(require_focus_trap());
     var import_tabbable = __toESM2(require_dist());
-    function src_default(Alpine19) {
+    function src_default(Alpine20) {
       let lastFocused;
       let currentFocused;
       window.addEventListener("focusin", () => {
         lastFocused = currentFocused;
         currentFocused = document.activeElement;
       });
-      Alpine19.magic("focus", (el) => {
+      Alpine20.magic("focus", (el) => {
         let within = el;
         return {
           __noscroll: false,
@@ -4843,7 +4862,7 @@ var require_module_cjs3 = __commonJS({
           }
         };
       });
-      Alpine19.directive("trap", Alpine19.skipDuringClone((el, { expression, modifiers }, { effect, evaluateLater, cleanup }) => {
+      Alpine20.directive("trap", Alpine20.skipDuringClone((el, { expression, modifiers }, { effect, evaluateLater, cleanup }) => {
         let evaluator = evaluateLater(expression);
         let oldValue = false;
         let options = {
@@ -4961,7 +4980,7 @@ var require_module_cjs4 = __commonJS({
       persist: () => src_default
     });
     module.exports = __toCommonJS(module_exports);
-    function src_default(Alpine19) {
+    function src_default(Alpine20) {
       let persist3 = () => {
         let alias;
         let storage;
@@ -4976,11 +4995,11 @@ var require_module_cjs4 = __commonJS({
             setItem: dummy.set.bind(dummy)
           };
         }
-        return Alpine19.interceptor((initialValue, getter, setter, path, key) => {
+        return Alpine20.interceptor((initialValue, getter, setter, path, key) => {
           let lookup = alias || `_x_${path}`;
           let initial = storageHas(lookup, storage) ? storageGet(lookup, storage) : initialValue;
           setter(initial);
-          Alpine19.effect(() => {
+          Alpine20.effect(() => {
             let value = getter();
             storageSet(lookup, value, storage);
             setter(value);
@@ -4996,12 +5015,12 @@ var require_module_cjs4 = __commonJS({
           };
         });
       };
-      Object.defineProperty(Alpine19, "$persist", { get: () => persist3() });
-      Alpine19.magic("persist", persist3);
-      Alpine19.persist = (key, { get, set }, storage = localStorage) => {
+      Object.defineProperty(Alpine20, "$persist", { get: () => persist3() });
+      Alpine20.magic("persist", persist3);
+      Alpine20.persist = (key, { get, set }, storage = localStorage) => {
         let initial = storageHas(key, storage) ? storageGet(key, storage) : get();
         set(initial);
-        Alpine19.effect(() => {
+        Alpine20.effect(() => {
           let value = get();
           storageSet(key, value, storage);
           set(value);
@@ -5050,8 +5069,8 @@ var require_module_cjs5 = __commonJS({
       intersect: () => src_default
     });
     module.exports = __toCommonJS(module_exports);
-    function src_default(Alpine19) {
-      Alpine19.directive("intersect", Alpine19.skipDuringClone((el, { value, expression, modifiers }, { evaluateLater, cleanup }) => {
+    function src_default(Alpine20) {
+      Alpine20.directive("intersect", Alpine20.skipDuringClone((el, { value, expression, modifiers }, { evaluateLater, cleanup }) => {
         let evaluate = evaluateLater(expression);
         let options = {
           rootMargin: getRootMargin(modifiers),
@@ -5106,8 +5125,80 @@ var require_module_cjs5 = __commonJS({
   }
 });
 
-// ../alpine/packages/anchor/dist/module.cjs.js
+// node_modules/@alpinejs/resize/dist/module.cjs.js
 var require_module_cjs6 = __commonJS({
+  "node_modules/@alpinejs/resize/dist/module.cjs.js"(exports, module) {
+    var __defProp2 = Object.defineProperty;
+    var __getOwnPropDesc2 = Object.getOwnPropertyDescriptor;
+    var __getOwnPropNames2 = Object.getOwnPropertyNames;
+    var __hasOwnProp2 = Object.prototype.hasOwnProperty;
+    var __export = (target, all2) => {
+      for (var name in all2)
+        __defProp2(target, name, { get: all2[name], enumerable: true });
+    };
+    var __copyProps2 = (to, from, except, desc) => {
+      if (from && typeof from === "object" || typeof from === "function") {
+        for (let key of __getOwnPropNames2(from))
+          if (!__hasOwnProp2.call(to, key) && key !== except)
+            __defProp2(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc2(from, key)) || desc.enumerable });
+      }
+      return to;
+    };
+    var __toCommonJS = (mod) => __copyProps2(__defProp2({}, "__esModule", { value: true }), mod);
+    var module_exports = {};
+    __export(module_exports, {
+      default: () => module_default,
+      resize: () => src_default
+    });
+    module.exports = __toCommonJS(module_exports);
+    function src_default(Alpine20) {
+      Alpine20.directive("resize", Alpine20.skipDuringClone((el, { value, expression, modifiers }, { evaluateLater, cleanup }) => {
+        let evaluator = evaluateLater(expression);
+        let evaluate = (width, height) => {
+          evaluator(() => {
+          }, { scope: { "$width": width, "$height": height } });
+        };
+        let off = modifiers.includes("document") ? onDocumentResize(evaluate) : onElResize(el, evaluate);
+        cleanup(() => off());
+      }));
+    }
+    function onElResize(el, callback) {
+      let observer = new ResizeObserver((entries) => {
+        let [width, height] = dimensions(entries);
+        callback(width, height);
+      });
+      observer.observe(el);
+      return () => observer.disconnect();
+    }
+    var documentResizeObserver;
+    var documentResizeObserverCallbacks = /* @__PURE__ */ new Set();
+    function onDocumentResize(callback) {
+      documentResizeObserverCallbacks.add(callback);
+      if (!documentResizeObserver) {
+        documentResizeObserver = new ResizeObserver((entries) => {
+          let [width, height] = dimensions(entries);
+          documentResizeObserverCallbacks.forEach((i) => i(width, height));
+        });
+        documentResizeObserver.observe(document.documentElement);
+      }
+      return () => {
+        documentResizeObserverCallbacks.delete(callback);
+      };
+    }
+    function dimensions(entries) {
+      let width, height;
+      for (let entry of entries) {
+        width = entry.borderBoxSize[0].inlineSize;
+        height = entry.borderBoxSize[0].blockSize;
+      }
+      return [width, height];
+    }
+    var module_default = src_default;
+  }
+});
+
+// ../alpine/packages/anchor/dist/module.cjs.js
+var require_module_cjs7 = __commonJS({
   "../alpine/packages/anchor/dist/module.cjs.js"(exports, module) {
     var __defProp2 = Object.defineProperty;
     var __getOwnPropDesc2 = Object.getOwnPropertyDescriptor;
@@ -6305,20 +6396,20 @@ var require_module_cjs6 = __commonJS({
         platform: platformWithCache
       });
     };
-    function src_default(Alpine19) {
-      Alpine19.magic("anchor", (el) => {
+    function src_default(Alpine20) {
+      Alpine20.magic("anchor", (el) => {
         if (!el._x_anchor)
           throw "Alpine: No x-anchor directive found on element using $anchor...";
         return el._x_anchor;
       });
-      Alpine19.interceptClone((from, to) => {
+      Alpine20.interceptClone((from, to) => {
         if (from && from._x_anchor && !to._x_anchor) {
           to._x_anchor = from._x_anchor;
         }
       });
-      Alpine19.directive("anchor", Alpine19.skipDuringClone((el, { expression, modifiers, value }, { cleanup, evaluate: evaluate2 }) => {
+      Alpine20.directive("anchor", Alpine20.skipDuringClone((el, { expression, modifiers, value }, { cleanup, evaluate: evaluate2 }) => {
         let { placement, offsetValue, unstyled } = getOptions(modifiers);
-        el._x_anchor = Alpine19.reactive({ x: 0, y: 0 });
+        el._x_anchor = Alpine20.reactive({ x: 0, y: 0 });
         let reference = evaluate2(expression);
         if (!reference)
           throw "Alpine: no element provided to x-anchor...";
@@ -6645,7 +6736,7 @@ var require_nprogress = __commonJS({
 });
 
 // ../alpine/packages/morph/dist/module.cjs.js
-var require_module_cjs7 = __commonJS({
+var require_module_cjs8 = __commonJS({
   "../alpine/packages/morph/dist/module.cjs.js"(exports, module) {
     var __defProp2 = Object.defineProperty;
     var __getOwnPropDesc2 = Object.getOwnPropertyDescriptor;
@@ -6770,6 +6861,7 @@ var require_module_cjs7 = __commonJS({
               let holdover = fromKeyHoldovers[toKey];
               from2.appendChild(holdover);
               currentFrom = holdover;
+              fromKey = getKey(currentFrom);
             } else {
               if (!shouldSkip(adding, currentTo)) {
                 let clone = currentTo.cloneNode(true);
@@ -6843,6 +6935,7 @@ var require_module_cjs7 = __commonJS({
               if (fromKeys[toKey]) {
                 currentFrom.replaceWith(fromKeys[toKey]);
                 currentFrom = fromKeys[toKey];
+                fromKey = getKey(currentFrom);
               }
             }
             if (toKey && fromKey) {
@@ -6851,6 +6944,7 @@ var require_module_cjs7 = __commonJS({
                 fromKeyHoldovers[fromKey] = currentFrom;
                 currentFrom.replaceWith(fromKeyNode);
                 currentFrom = fromKeyNode;
+                fromKey = getKey(currentFrom);
               } else {
                 fromKeyHoldovers[fromKey] = currentFrom;
                 currentFrom = addNodeBefore(from2, currentTo, currentFrom);
@@ -6996,18 +7090,20 @@ var require_module_cjs7 = __commonJS({
       let fromId = from && from._x_bindings && from._x_bindings.id;
       if (!fromId)
         return;
+      if (!to.setAttribute)
+        return;
       to.setAttribute("id", fromId);
       to.id = fromId;
     }
-    function src_default(Alpine19) {
-      Alpine19.morph = morph3;
+    function src_default(Alpine20) {
+      Alpine20.morph = morph3;
     }
     var module_default = src_default;
   }
 });
 
 // ../alpine/packages/mask/dist/module.cjs.js
-var require_module_cjs8 = __commonJS({
+var require_module_cjs9 = __commonJS({
   "../alpine/packages/mask/dist/module.cjs.js"(exports, module) {
     var __defProp2 = Object.defineProperty;
     var __getOwnPropDesc2 = Object.getOwnPropertyDescriptor;
@@ -7033,8 +7129,8 @@ var require_module_cjs8 = __commonJS({
       stripDown: () => stripDown
     });
     module.exports = __toCommonJS(module_exports);
-    function src_default(Alpine19) {
-      Alpine19.directive("mask", (el, { value, expression }, { effect, evaluateLater, cleanup }) => {
+    function src_default(Alpine20) {
+      Alpine20.directive("mask", (el, { value, expression }, { effect, evaluateLater, cleanup }) => {
         let templateFn = () => expression;
         let lastInputValue = "";
         queueMicrotask(() => {
@@ -7043,7 +7139,7 @@ var require_module_cjs8 = __commonJS({
             effect(() => {
               templateFn = (input) => {
                 let result;
-                Alpine19.dontAutoEvaluateFunctions(() => {
+                Alpine20.dontAutoEvaluateFunctions(() => {
                   evaluator((value2) => {
                     result = typeof value2 === "function" ? value2(input) : value2;
                   }, { scope: {
@@ -7058,8 +7154,13 @@ var require_module_cjs8 = __commonJS({
           } else {
             processInputValue(el, false);
           }
-          if (el._x_model)
+          if (el._x_model) {
+            if (el._x_model.get() === el.value)
+              return;
+            if (el._x_model.get() === null && el.value === "")
+              return;
             el._x_model.set(el.value);
+          }
         });
         const controller = new AbortController();
         cleanup(() => {
@@ -7274,9 +7375,7 @@ function dataGet(object, key) {
   if (key === "")
     return object;
   return key.split(".").reduce((carry, i) => {
-    if (carry === void 0)
-      return void 0;
-    return carry[i];
+    return carry?.[i];
   }, object);
 }
 function dataSet(object, key, value) {
@@ -7403,6 +7502,9 @@ function handleFileUpload(el, property, component, cleanup) {
     if (value === null || value === "") {
       el.value = "";
     }
+    if (el.multiple && Array.isArray(value) && value.length === 0) {
+      el.value = "";
+    }
   });
   let clearFileInputValue = () => {
     el.value = null;
@@ -8089,6 +8191,7 @@ var aliases = {
   "get": "$get",
   "set": "$set",
   "call": "$call",
+  "hook": "$hook",
   "commit": "$commit",
   "watch": "$watch",
   "entangle": "$entangle",
@@ -8183,6 +8286,16 @@ wireProperty("$watch", (component) => (path, callback) => {
 wireProperty("$refresh", (component) => component.$wire.$commit);
 wireProperty("$commit", (component) => async () => await requestCommit(component));
 wireProperty("$on", (component) => (...params) => listen2(component, ...params));
+wireProperty("$hook", (component) => (name, callback) => {
+  let unhook = on(name, ({ component: hookComponent, ...params }) => {
+    if (hookComponent === void 0)
+      return callback(params);
+    if (hookComponent.id === component.id)
+      return callback({ component: hookComponent, ...params });
+  });
+  component.addCleanup(unhook);
+  return unhook;
+});
 wireProperty("$dispatch", (component) => (...params) => dispatch2(component, ...params));
 wireProperty("$dispatchSelf", (component) => (...params) => dispatchSelf(component, ...params));
 wireProperty("$dispatchTo", () => (...params) => dispatchTo(...params));
@@ -8442,6 +8555,16 @@ function directive(name, callback) {
     }
   });
 }
+function globalDirective(name, callback) {
+  if (customDirectiveNames.has(name))
+    return;
+  customDirectiveNames.add(name);
+  on("directive.global.init", ({ el, directive: directive2, cleanup }) => {
+    if (directive2.value === name) {
+      callback({ el, directive: directive2, cleanup });
+    }
+  });
+}
 function getDirectives(el) {
   return new DirectiveManager(el);
 }
@@ -8509,7 +8632,8 @@ var import_collapse = __toESM(require_module_cjs2());
 var import_focus = __toESM(require_module_cjs3());
 var import_persist2 = __toESM(require_module_cjs4());
 var import_intersect = __toESM(require_module_cjs5());
-var import_anchor = __toESM(require_module_cjs6());
+var import_resize = __toESM(require_module_cjs6());
+var import_anchor = __toESM(require_module_cjs7());
 
 // js/plugins/navigate/history.js
 var Snapshot = class {
@@ -8660,7 +8784,7 @@ function extractDestinationFromLink(linkEl) {
   return createUrlObjectFromString(linkEl.getAttribute("href"));
 }
 function createUrlObjectFromString(urlString) {
-  return new URL(urlString, document.baseURI);
+  return urlString !== null && new URL(urlString, document.baseURI);
 }
 function getUriStringFromUrlObject(urlObject) {
   return urlObject.pathname + urlObject.search + urlObject.hash;
@@ -8782,8 +8906,10 @@ function restoreScrollPositionOrScrollToTop() {
     }
   };
   queueMicrotask(() => {
-    scroll(document.body);
-    document.querySelectorAll(["[x-navigate\\:scroll]", "[wire\\:scroll]"]).forEach(scroll);
+    queueMicrotask(() => {
+      scroll(document.body);
+      document.querySelectorAll(["[x-navigate\\:scroll]", "[wire\\:scroll]"]).forEach(scroll);
+    });
   });
 }
 
@@ -8932,6 +9058,51 @@ function injectStyles() {
   document.head.appendChild(style);
 }
 
+// js/plugins/navigate/popover.js
+function packUpPersistedPopovers(persistedEl) {
+  if (!isPopoverSupported())
+    return;
+  persistedEl.querySelectorAll(":popover-open").forEach((el) => {
+    el.setAttribute("data-navigate-popover-open", "");
+    let animations = el.getAnimations();
+    el._pausedAnimations = animations.map((animation) => ({
+      keyframes: animation.effect.getKeyframes(),
+      options: {
+        duration: animation.effect.getTiming().duration,
+        easing: animation.effect.getTiming().easing,
+        fill: animation.effect.getTiming().fill,
+        iterations: animation.effect.getTiming().iterations
+      },
+      currentTime: animation.currentTime,
+      playState: animation.playState
+    }));
+    animations.forEach((i) => i.pause());
+  });
+}
+function unPackPersistedPopovers(persistedEl) {
+  if (!isPopoverSupported())
+    return;
+  persistedEl.querySelectorAll("[data-navigate-popover-open]").forEach((el) => {
+    el.removeAttribute("data-navigate-popover-open");
+    queueMicrotask(() => {
+      if (!el.isConnected)
+        return;
+      el.showPopover();
+      el.getAnimations().forEach((i) => i.finish());
+      if (el._pausedAnimations) {
+        el._pausedAnimations.forEach(({ keyframes, options, currentTime, now, playState }) => {
+          let animation = el.animate(keyframes, options);
+          animation.currentTime = currentTime;
+        });
+        delete el._pausedAnimations;
+      }
+    });
+  });
+}
+function isPopoverSupported() {
+  return typeof document.createElement("div").showPopover === "function";
+}
+
 // js/plugins/navigate/page.js
 var oldBodyScriptTagHashes = [];
 var attributesExemptFromScriptTagHashing = [
@@ -8999,6 +9170,8 @@ function mergeNewHead(newHead) {
       child.remove();
   }
   for (let child of Array.from(newHead.children)) {
+    if (child.tagName.toLowerCase() === "noscript")
+      continue;
     document.head.appendChild(child);
   }
   return Promise.all(remoteScriptsPromises);
@@ -9067,10 +9240,10 @@ var enablePersist = true;
 var showProgressBar = true;
 var restoreScroll = true;
 var autofocus = false;
-function navigate_default(Alpine19) {
-  Alpine19.navigate = (url) => {
+function navigate_default(Alpine20) {
+  Alpine20.navigate = (url) => {
     let destination = createUrlObjectFromString(url);
-    let prevented = fireEventForOtherLibariesToHookInto("alpine:navigate", {
+    let prevented = fireEventForOtherLibrariesToHookInto("alpine:navigate", {
       url: destination,
       history: false,
       cached: false
@@ -9079,25 +9252,29 @@ function navigate_default(Alpine19) {
       return;
     navigateTo(destination);
   };
-  Alpine19.navigate.disableProgressBar = () => {
+  Alpine20.navigate.disableProgressBar = () => {
     showProgressBar = false;
   };
-  Alpine19.addInitSelector(() => `[${Alpine19.prefixed("navigate")}]`);
-  Alpine19.directive("navigate", (el, { modifiers }) => {
+  Alpine20.addInitSelector(() => `[${Alpine20.prefixed("navigate")}]`);
+  Alpine20.directive("navigate", (el, { modifiers }) => {
     let shouldPrefetchOnHover = modifiers.includes("hover");
     shouldPrefetchOnHover && whenThisLinkIsHoveredFor(el, 60, () => {
       let destination = extractDestinationFromLink(el);
+      if (!destination)
+        return;
       prefetchHtml(destination, (html, finalDestination) => {
         storeThePrefetchedHtmlForWhenALinkIsClicked(html, destination, finalDestination);
       });
     });
     whenThisLinkIsPressed(el, (whenItIsReleased) => {
       let destination = extractDestinationFromLink(el);
+      if (!destination)
+        return;
       prefetchHtml(destination, (html, finalDestination) => {
         storeThePrefetchedHtmlForWhenALinkIsClicked(html, destination, finalDestination);
       });
       whenItIsReleased(() => {
-        let prevented = fireEventForOtherLibariesToHookInto("alpine:navigate", {
+        let prevented = fireEventForOtherLibrariesToHookInto("alpine:navigate", {
           url: destination,
           history: false,
           cached: false
@@ -9111,14 +9288,15 @@ function navigate_default(Alpine19) {
   function navigateTo(destination, shouldPushToHistoryState = true) {
     showProgressBar && showAndStartProgressBar();
     fetchHtmlOrUsePrefetchedHtml(destination, (html, finalDestination) => {
-      fireEventForOtherLibariesToHookInto("alpine:navigating");
+      fireEventForOtherLibrariesToHookInto("alpine:navigating");
       restoreScroll && storeScrollInformationInHtmlBeforeNavigatingAway();
       showProgressBar && finishAndHideProgressBar();
       cleanupAlpineElementsOnThePageThatArentInsideAPersistedElement();
       updateCurrentPageHtmlInHistoryStateForLaterBackButtonClicks();
-      preventAlpineFromPickingUpDomChanges(Alpine19, (andAfterAllThis) => {
+      preventAlpineFromPickingUpDomChanges(Alpine20, (andAfterAllThis) => {
         enablePersist && storePersistantElementsForLater((persistedEl) => {
           packUpPersistedTeleports(persistedEl);
+          packUpPersistedPopovers(persistedEl);
         });
         if (shouldPushToHistoryState) {
           updateUrlAndStoreLatestHtmlForFutureBackButtons(html, finalDestination);
@@ -9129,6 +9307,7 @@ function navigate_default(Alpine19) {
           removeAnyLeftOverStaleTeleportTargets(document.body);
           enablePersist && putPersistantElementsBack((persistedEl, newStub) => {
             unPackPersistedTeleports(persistedEl);
+            unPackPersistedPopovers(persistedEl);
           });
           restoreScrollPositionOrScrollToTop();
           afterNewScriptsAreDoneLoading(() => {
@@ -9136,8 +9315,8 @@ function navigate_default(Alpine19) {
               setTimeout(() => {
                 autofocus && autofocusElementsWithTheAutofocusAttribute();
               });
-              nowInitializeAlpineOnTheNewPage(Alpine19);
-              fireEventForOtherLibariesToHookInto("alpine:navigated");
+              nowInitializeAlpineOnTheNewPage(Alpine20);
+              fireEventForOtherLibrariesToHookInto("alpine:navigated");
             });
           });
         });
@@ -9147,7 +9326,7 @@ function navigate_default(Alpine19) {
   whenTheBackOrForwardButtonIsClicked((ifThePageBeingVisitedHasntBeenCached) => {
     ifThePageBeingVisitedHasntBeenCached((url) => {
       let destination = createUrlObjectFromString(url);
-      let prevented = fireEventForOtherLibariesToHookInto("alpine:navigate", {
+      let prevented = fireEventForOtherLibrariesToHookInto("alpine:navigate", {
         url: destination,
         history: true,
         cached: false
@@ -9159,7 +9338,7 @@ function navigate_default(Alpine19) {
     });
   }, (html, url, currentPageUrl, currentPageKey) => {
     let destination = createUrlObjectFromString(url);
-    let prevented = fireEventForOtherLibariesToHookInto("alpine:navigate", {
+    let prevented = fireEventForOtherLibrariesToHookInto("alpine:navigate", {
       url: destination,
       history: true,
       cached: true
@@ -9167,29 +9346,31 @@ function navigate_default(Alpine19) {
     if (prevented)
       return;
     storeScrollInformationInHtmlBeforeNavigatingAway();
-    fireEventForOtherLibariesToHookInto("alpine:navigating");
+    fireEventForOtherLibrariesToHookInto("alpine:navigating");
     updateCurrentPageHtmlInSnapshotCacheForLaterBackButtonClicks(currentPageUrl, currentPageKey);
-    preventAlpineFromPickingUpDomChanges(Alpine19, (andAfterAllThis) => {
+    preventAlpineFromPickingUpDomChanges(Alpine20, (andAfterAllThis) => {
       enablePersist && storePersistantElementsForLater((persistedEl) => {
         packUpPersistedTeleports(persistedEl);
+        packUpPersistedPopovers(persistedEl);
       });
       swapCurrentPageWithNewHtml(html, () => {
         removeAnyLeftOverStaleProgressBars();
         removeAnyLeftOverStaleTeleportTargets(document.body);
         enablePersist && putPersistantElementsBack((persistedEl, newStub) => {
           unPackPersistedTeleports(persistedEl);
+          unPackPersistedPopovers(persistedEl);
         });
         restoreScrollPositionOrScrollToTop();
         andAfterAllThis(() => {
           autofocus && autofocusElementsWithTheAutofocusAttribute();
-          nowInitializeAlpineOnTheNewPage(Alpine19);
-          fireEventForOtherLibariesToHookInto("alpine:navigated");
+          nowInitializeAlpineOnTheNewPage(Alpine20);
+          fireEventForOtherLibrariesToHookInto("alpine:navigated");
         });
       });
     });
   });
   setTimeout(() => {
-    fireEventForOtherLibariesToHookInto("alpine:navigated");
+    fireEventForOtherLibrariesToHookInto("alpine:navigated");
   });
 }
 function fetchHtmlOrUsePrefetchedHtml(fromDestination, callback) {
@@ -9197,16 +9378,16 @@ function fetchHtmlOrUsePrefetchedHtml(fromDestination, callback) {
     fetchHtml(fromDestination, callback);
   });
 }
-function preventAlpineFromPickingUpDomChanges(Alpine19, callback) {
-  Alpine19.stopObservingMutations();
+function preventAlpineFromPickingUpDomChanges(Alpine20, callback) {
+  Alpine20.stopObservingMutations();
   callback((afterAllThis) => {
-    Alpine19.startObservingMutations();
+    Alpine20.startObservingMutations();
     queueMicrotask(() => {
       afterAllThis();
     });
   });
 }
-function fireEventForOtherLibariesToHookInto(name, detail) {
+function fireEventForOtherLibrariesToHookInto(name, detail) {
   let event = new CustomEvent(name, {
     cancelable: true,
     bubbles: true,
@@ -9215,8 +9396,8 @@ function fireEventForOtherLibariesToHookInto(name, detail) {
   document.dispatchEvent(event);
   return event.defaultPrevented;
 }
-function nowInitializeAlpineOnTheNewPage(Alpine19) {
-  Alpine19.initTree(document.body, void 0, (el, skip) => {
+function nowInitializeAlpineOnTheNewPage(Alpine20) {
+  Alpine20.initTree(document.body, void 0, (el, skip) => {
     if (el._x_wasPersisted)
       skip();
   });
@@ -9239,8 +9420,8 @@ function cleanupAlpineElementsOnThePageThatArentInsideAPersistedElement() {
 }
 
 // js/plugins/history/index.js
-function history2(Alpine19) {
-  Alpine19.magic("queryString", (el, { interceptor }) => {
+function history2(Alpine20) {
+  Alpine20.magic("queryString", (el, { interceptor }) => {
     let alias;
     let alwaysShow = false;
     let usePush = false;
@@ -9249,9 +9430,9 @@ function history2(Alpine19) {
       let { initial, replace: replace2, push: push2, pop } = track(queryKey, initialSeedValue, alwaysShow);
       setter(initial);
       if (!usePush) {
-        Alpine19.effect(() => replace2(getter()));
+        Alpine20.effect(() => replace2(getter()));
       } else {
-        Alpine19.effect(() => push2(getter()));
+        Alpine20.effect(() => push2(getter()));
         pop(async (newValue) => {
           setter(newValue);
           let tillTheEndOfTheMicrotaskQueue = () => Promise.resolve();
@@ -9274,7 +9455,7 @@ function history2(Alpine19) {
       };
     });
   });
-  Alpine19.history = { track };
+  Alpine20.history = { track };
 }
 function track(name, initialSeedValue, alwaysShow = false, except = null) {
   let { has, get, set, remove } = queryStringUtils();
@@ -9358,24 +9539,24 @@ function queryStringUtils() {
       let search = url.search;
       if (!search)
         return false;
-      let data = fromQueryString(search);
+      let data = fromQueryString(search, key);
       return Object.keys(data).includes(key);
     },
     get(url, key) {
       let search = url.search;
       if (!search)
         return false;
-      let data = fromQueryString(search);
+      let data = fromQueryString(search, key);
       return data[key];
     },
     set(url, key, value) {
-      let data = fromQueryString(url.search);
+      let data = fromQueryString(url.search, key);
       data[key] = stripNulls(unwrap(value));
       url.search = toQueryString(data);
       return url;
     },
     remove(url, key) {
-      let data = fromQueryString(url.search);
+      let data = fromQueryString(url.search, key);
       delete data[key];
       url.search = toQueryString(data);
       return url;
@@ -9411,7 +9592,7 @@ function toQueryString(data) {
   let entries = buildQueryStringEntries(data);
   return Object.entries(entries).map(([key, value]) => `${key}=${value}`).join("&");
 }
-function fromQueryString(search) {
+function fromQueryString(search, queryKey) {
   search = search.replace("?", "");
   if (search === "")
     return {};
@@ -9430,10 +9611,12 @@ function fromQueryString(search) {
     if (typeof value == "undefined")
       return;
     value = decodeURIComponent(value.replaceAll("+", "%20"));
-    if (!key.includes("[")) {
+    let decodedKey = decodeURIComponent(key);
+    let shouldBeHandledAsArray = decodedKey.includes("[") && decodedKey.startsWith(queryKey);
+    if (!shouldBeHandledAsArray) {
       data[key] = value;
     } else {
-      let dotNotatedKey = key.replaceAll("[", ".").replaceAll("]", "");
+      let dotNotatedKey = decodedKey.replaceAll("[", ".").replaceAll("]", "");
       insertDotNotatedValueIntoData(dotNotatedKey, value, data);
     }
   });
@@ -9441,8 +9624,8 @@ function fromQueryString(search) {
 }
 
 // js/lifecycle.js
-var import_morph = __toESM(require_module_cjs7());
-var import_mask = __toESM(require_module_cjs8());
+var import_morph = __toESM(require_module_cjs8());
+var import_mask = __toESM(require_module_cjs9());
 var import_alpinejs5 = __toESM(require_module_cjs());
 function start() {
   setTimeout(() => ensureLivewireScriptIsntMisplaced());
@@ -9451,6 +9634,7 @@ function start() {
   import_alpinejs5.default.plugin(import_morph.default);
   import_alpinejs5.default.plugin(history2);
   import_alpinejs5.default.plugin(import_intersect.default);
+  import_alpinejs5.default.plugin(import_resize.default);
   import_alpinejs5.default.plugin(import_collapse.default);
   import_alpinejs5.default.plugin(import_anchor.default);
   import_alpinejs5.default.plugin(import_focus.default);
@@ -9482,10 +9666,15 @@ function start() {
         destroyComponent(component2.id);
       });
     }
+    let directives = Array.from(el.getAttributeNames()).filter((name) => matchesForLivewireDirective(name)).map((name) => extractDirective(el, name));
+    directives.forEach((directive2) => {
+      trigger("directive.global.init", { el, directive: directive2, cleanup: (callback) => {
+        import_alpinejs5.default.onAttributeRemoved(el, directive2.raw, callback);
+      } });
+    });
     let component = closestComponent(el, false);
     if (component) {
       trigger("element.init", { el, component });
-      let directives = Array.from(el.getAttributeNames()).filter((name) => matchesForLivewireDirective(name)).map((name) => extractDirective(el, name));
       directives.forEach((directive2) => {
         trigger("directive.init", { el, component, directive: directive2, cleanup: (callback) => {
           import_alpinejs5.default.onAttributeRemoved(el, directive2.raw, callback);
@@ -9508,7 +9697,7 @@ function ensureLivewireScriptIsntMisplaced() {
 }
 
 // js/index.js
-var import_alpinejs17 = __toESM(require_module_cjs());
+var import_alpinejs18 = __toESM(require_module_cjs());
 
 // js/features/supportListeners.js
 on("effect", ({ component, effects }) => {
@@ -9721,6 +9910,7 @@ function morph2(component, el, html) {
     },
     lookahead: false
   });
+  trigger("morphed", { el, component });
 }
 function isntElement(el) {
   return typeof el.hasAttribute !== "function";
@@ -10233,6 +10423,54 @@ directive("confirm", ({ el, directive: directive2 }) => {
   };
 });
 
+// js/directives/wire-current.js
+var import_alpinejs14 = __toESM(require_module_cjs());
+import_alpinejs14.default.addInitSelector(() => `[wire\\:current]`);
+var onPageChanges = /* @__PURE__ */ new Map();
+document.addEventListener("livewire:navigated", () => {
+  onPageChanges.forEach((i) => i(new URL(window.location.href)));
+});
+globalDirective("current", ({ el, directive: directive2, cleanup }) => {
+  let expression = directive2.expression;
+  let options = {
+    exact: directive2.modifiers.includes("exact"),
+    strict: directive2.modifiers.includes("strict")
+  };
+  if (expression.startsWith("#"))
+    return;
+  if (!el.hasAttribute("href"))
+    return;
+  let href = el.getAttribute("href");
+  let hrefUrl = new URL(href, window.location.href);
+  let classes = expression.split(" ").filter(String);
+  let refreshCurrent = (url) => {
+    if (pathMatches(hrefUrl, url, options)) {
+      el.classList.add(...classes);
+    } else {
+      el.classList.remove(...classes);
+    }
+  };
+  refreshCurrent(new URL(window.location.href));
+  onPageChanges.set(el, refreshCurrent);
+  cleanup(() => onPageChanges.delete(el));
+});
+function pathMatches(hrefUrl, actualUrl, options) {
+  if (hrefUrl.hostname !== actualUrl.hostname)
+    return false;
+  let hrefPath = options.strict ? hrefUrl.pathname : hrefUrl.pathname.replace(/\/+$/, "");
+  let actualPath = options.strict ? actualUrl.pathname : actualUrl.pathname.replace(/\/+$/, "");
+  if (options.exact) {
+    return hrefPath === actualPath;
+  }
+  let hrefPathSegments = hrefPath.split("/");
+  let actualPathSegments = actualPath.split("/");
+  for (let i = 0; i < hrefPathSegments.length; i++) {
+    if (hrefPathSegments[i] !== actualPathSegments[i])
+      return false;
+  }
+  return true;
+}
+
 // js/directives/shared.js
 function toggleBooleanStateDirective(el, directive2, isTruthy, cachedDisplay = null) {
   isTruthy = directive2.modifiers.includes("remove") ? !isTruthy : isTruthy;
@@ -10504,8 +10742,8 @@ directive("ignore", ({ el, directive: directive2 }) => {
 
 // js/directives/wire-dirty.js
 var refreshDirtyStatesByComponent = new WeakBag();
-on("commit", ({ component, respond }) => {
-  respond(() => {
+on("commit", ({ component, succeed }) => {
+  succeed(() => {
     setTimeout(() => {
       refreshDirtyStatesByComponent.each(component, (i) => i(false));
     });
@@ -10552,7 +10790,7 @@ function dirtyTargets(el) {
 }
 
 // js/directives/wire-model.js
-var import_alpinejs14 = __toESM(require_module_cjs());
+var import_alpinejs15 = __toESM(require_module_cjs());
 directive("model", ({ el, directive: directive2, component, cleanup }) => {
   let { expression, modifiers } = directive2;
   if (!expression) {
@@ -10570,7 +10808,7 @@ directive("model", ({ el, directive: directive2, component, cleanup }) => {
   let isDebounced = modifiers.includes("debounce");
   let update = expression.startsWith("$parent") ? () => component.$wire.$parent.$commit() : () => component.$wire.$commit();
   let debouncedUpdate = isTextInput(el) && !isDebounced && isLive ? debounce(update, 150) : update;
-  import_alpinejs14.default.bind(el, {
+  import_alpinejs15.default.bind(el, {
     ["@change"]() {
       isLazy && update();
     },
@@ -10626,14 +10864,14 @@ function debounce(func, wait) {
 }
 
 // js/directives/wire-init.js
-var import_alpinejs15 = __toESM(require_module_cjs());
+var import_alpinejs16 = __toESM(require_module_cjs());
 directive("init", ({ el, directive: directive2 }) => {
   let fullMethod = directive2.expression ?? "$refresh";
-  import_alpinejs15.default.evaluate(el, `$wire.${fullMethod}`);
+  import_alpinejs16.default.evaluate(el, `$wire.${fullMethod}`);
 });
 
 // js/directives/wire-poll.js
-var import_alpinejs16 = __toESM(require_module_cjs());
+var import_alpinejs17 = __toESM(require_module_cjs());
 directive("poll", ({ el, directive: directive2 }) => {
   let interval = extractDurationFrom(directive2.modifiers, 2e3);
   let { start: start2, pauseWhile, throttleWhile, stopWhen } = poll(() => {
@@ -10647,7 +10885,7 @@ directive("poll", ({ el, directive: directive2 }) => {
   stopWhen(() => theElementIsDisconnected(el));
 });
 function triggerComponentRequest(el, directive2) {
-  import_alpinejs16.default.evaluate(el, directive2.expression ? "$wire." + directive2.expression : "$wire.$commit()");
+  import_alpinejs17.default.evaluate(el, directive2.expression ? "$wire." + directive2.expression : "$wire.$commit()");
 }
 function poll(callback, interval = 2e3) {
   let pauseConditions = [];
@@ -10750,7 +10988,7 @@ var Livewire2 = {
   dispatch: dispatchGlobal,
   on: on2,
   get navigate() {
-    return import_alpinejs17.default.navigate;
+    return import_alpinejs18.default.navigate;
   }
 };
 var warnAboutMultipleInstancesOf = (entity) => console.warn(`Detected multiple instances of ${entity} running`);
@@ -10759,7 +10997,7 @@ if (window.Livewire)
 if (window.Alpine)
   warnAboutMultipleInstancesOf("Alpine");
 window.Livewire = Livewire2;
-window.Alpine = import_alpinejs17.default;
+window.Alpine = import_alpinejs18.default;
 if (window.livewireScriptConfig === void 0) {
   window.Alpine.__fromLivewire = true;
   document.addEventListener("DOMContentLoaded", () => {
@@ -10769,7 +11007,7 @@ if (window.livewireScriptConfig === void 0) {
     Livewire2.start();
   });
 }
-var export_Alpine = import_alpinejs17.default;
+var export_Alpine = import_alpinejs18.default;
 export {
   export_Alpine as Alpine,
   Livewire2 as Livewire
@@ -10790,3 +11028,4 @@ focus-trap/dist/focus-trap.js:
   * @license MIT, https://github.com/focus-trap/focus-trap/blob/master/LICENSE
   *)
 */
+//# sourceMappingURL=livewire.esm.js.map
diff --git a/public/vendor/livewire/livewire.esm.js.map b/public/vendor/livewire/livewire.esm.js.map
new file mode 100644
index 0000000000..199f512a5d
--- /dev/null
+++ b/public/vendor/livewire/livewire.esm.js.map
@@ -0,0 +1,7 @@
+{
+  "version": 3,
+  "sources": ["../../alpine/packages/alpinejs/dist/module.cjs.js", "../../alpine/packages/collapse/dist/module.cjs.js", "../../alpine/packages/focus/dist/module.cjs.js", "../../alpine/packages/persist/dist/module.cjs.js", "../../alpine/packages/intersect/dist/module.cjs.js", "../node_modules/@alpinejs/resize/dist/module.cjs.js", "../../alpine/packages/anchor/dist/module.cjs.js", "../node_modules/nprogress/nprogress.js", "../../alpine/packages/morph/dist/module.cjs.js", "../../alpine/packages/mask/dist/module.cjs.js", "../js/utils.js", "../js/features/supportFileUploads.js", "../js/features/supportEntangle.js", "../js/hooks.js", "../js/request/modal.js", "../js/request/pool.js", "../js/request/commit.js", "../js/request/bus.js", "../js/request/index.js", "../js/$wire.js", "../js/component.js", "../js/store.js", "../js/events.js", "../js/directives.js", "../js/lifecycle.js", "../js/plugins/navigate/history.js", "../js/plugins/navigate/links.js", "../js/plugins/navigate/fetch.js", "../js/plugins/navigate/prefetch.js", "../js/plugins/navigate/teleport.js", "../js/plugins/navigate/scroll.js", "../js/plugins/navigate/persist.js", "../js/plugins/navigate/bar.js", "../js/plugins/navigate/popover.js", "../js/plugins/navigate/page.js", "../js/plugins/navigate/index.js", "../js/plugins/history/index.js", "../js/index.js", "../js/features/supportListeners.js", "../js/features/supportScriptsAndAssets.js", "../js/features/supportJsEvaluation.js", "../js/morph.js", "../js/features/supportMorphDom.js", "../js/features/supportDispatches.js", "../js/features/supportDisablingFormsDuringRequest.js", "../js/features/supportPropsAndModelables.js", "../js/features/supportFileDownloads.js", "../js/features/supportLazyLoading.js", "../js/features/supportQueryString.js", "../js/features/supportLaravelEcho.js", "../js/features/supportIsolating.js", "../js/features/supportNavigate.js", "../js/features/supportRedirects.js", "../js/directives/wire-transition.js", "../js/debounce.js", "../js/directives/wire-wildcard.js", "../js/directives/wire-navigate.js", "../js/directives/wire-confirm.js", "../js/directives/wire-current.js", "../js/directives/shared.js", "../js/directives/wire-offline.js", "../js/directives/wire-loading.js", "../js/directives/wire-stream.js", "../js/directives/wire-replace.js", "../js/directives/wire-ignore.js", "../js/directives/wire-dirty.js", "../js/directives/wire-model.js", "../js/directives/wire-init.js", "../js/directives/wire-poll.js"],
+  "sourcesContent": ["var __create = Object.create;\nvar __defProp = Object.defineProperty;\nvar __getOwnPropDesc = Object.getOwnPropertyDescriptor;\nvar __getOwnPropNames = Object.getOwnPropertyNames;\nvar __getProtoOf = Object.getPrototypeOf;\nvar __hasOwnProp = Object.prototype.hasOwnProperty;\nvar __commonJS = (cb, mod) => function __require() {\n  return mod || (0, cb[__getOwnPropNames(cb)[0]])((mod = { exports: {} }).exports, mod), mod.exports;\n};\nvar __export = (target, all) => {\n  for (var name in all)\n    __defProp(target, name, { get: all[name], enumerable: true });\n};\nvar __copyProps = (to, from, except, desc) => {\n  if (from && typeof from === \"object\" || typeof from === \"function\") {\n    for (let key of __getOwnPropNames(from))\n      if (!__hasOwnProp.call(to, key) && key !== except)\n        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });\n  }\n  return to;\n};\nvar __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(\n  // If the importer is in node compatibility mode or this is not an ESM\n  // file that has been converted to a CommonJS file using a Babel-\n  // compatible transform (i.e. \"__esModule\" has not been set), then set\n  // \"default\" to the CommonJS \"module.exports\" for node compatibility.\n  isNodeMode || !mod || !mod.__esModule ? __defProp(target, \"default\", { value: mod, enumerable: true }) : target,\n  mod\n));\nvar __toCommonJS = (mod) => __copyProps(__defProp({}, \"__esModule\", { value: true }), mod);\n\n// node_modules/@vue/shared/dist/shared.cjs.js\nvar require_shared_cjs = __commonJS({\n  \"node_modules/@vue/shared/dist/shared.cjs.js\"(exports) {\n    \"use strict\";\n    Object.defineProperty(exports, \"__esModule\", { value: true });\n    function makeMap(str, expectsLowerCase) {\n      const map = /* @__PURE__ */ Object.create(null);\n      const list = str.split(\",\");\n      for (let i = 0; i < list.length; i++) {\n        map[list[i]] = true;\n      }\n      return expectsLowerCase ? (val) => !!map[val.toLowerCase()] : (val) => !!map[val];\n    }\n    var PatchFlagNames = {\n      [\n        1\n        /* TEXT */\n      ]: `TEXT`,\n      [\n        2\n        /* CLASS */\n      ]: `CLASS`,\n      [\n        4\n        /* STYLE */\n      ]: `STYLE`,\n      [\n        8\n        /* PROPS */\n      ]: `PROPS`,\n      [\n        16\n        /* FULL_PROPS */\n      ]: `FULL_PROPS`,\n      [\n        32\n        /* HYDRATE_EVENTS */\n      ]: `HYDRATE_EVENTS`,\n      [\n        64\n        /* STABLE_FRAGMENT */\n      ]: `STABLE_FRAGMENT`,\n      [\n        128\n        /* KEYED_FRAGMENT */\n      ]: `KEYED_FRAGMENT`,\n      [\n        256\n        /* UNKEYED_FRAGMENT */\n      ]: `UNKEYED_FRAGMENT`,\n      [\n        512\n        /* NEED_PATCH */\n      ]: `NEED_PATCH`,\n      [\n        1024\n        /* DYNAMIC_SLOTS */\n      ]: `DYNAMIC_SLOTS`,\n      [\n        2048\n        /* DEV_ROOT_FRAGMENT */\n      ]: `DEV_ROOT_FRAGMENT`,\n      [\n        -1\n        /* HOISTED */\n      ]: `HOISTED`,\n      [\n        -2\n        /* BAIL */\n      ]: `BAIL`\n    };\n    var slotFlagsText = {\n      [\n        1\n        /* STABLE */\n      ]: \"STABLE\",\n      [\n        2\n        /* DYNAMIC */\n      ]: \"DYNAMIC\",\n      [\n        3\n        /* FORWARDED */\n      ]: \"FORWARDED\"\n    };\n    var GLOBALS_WHITE_LISTED = \"Infinity,undefined,NaN,isFinite,isNaN,parseFloat,parseInt,decodeURI,decodeURIComponent,encodeURI,encodeURIComponent,Math,Number,Date,Array,Object,Boolean,String,RegExp,Map,Set,JSON,Intl,BigInt\";\n    var isGloballyWhitelisted = /* @__PURE__ */ makeMap(GLOBALS_WHITE_LISTED);\n    var range = 2;\n    function generateCodeFrame(source, start2 = 0, end = source.length) {\n      let lines = source.split(/(\\r?\\n)/);\n      const newlineSequences = lines.filter((_, idx) => idx % 2 === 1);\n      lines = lines.filter((_, idx) => idx % 2 === 0);\n      let count = 0;\n      const res = [];\n      for (let i = 0; i < lines.length; i++) {\n        count += lines[i].length + (newlineSequences[i] && newlineSequences[i].length || 0);\n        if (count >= start2) {\n          for (let j = i - range; j <= i + range || end > count; j++) {\n            if (j < 0 || j >= lines.length)\n              continue;\n            const line = j + 1;\n            res.push(`${line}${\" \".repeat(Math.max(3 - String(line).length, 0))}|  ${lines[j]}`);\n            const lineLength = lines[j].length;\n            const newLineSeqLength = newlineSequences[j] && newlineSequences[j].length || 0;\n            if (j === i) {\n              const pad = start2 - (count - (lineLength + newLineSeqLength));\n              const length = Math.max(1, end > count ? lineLength - pad : end - start2);\n              res.push(`   |  ` + \" \".repeat(pad) + \"^\".repeat(length));\n            } else if (j > i) {\n              if (end > count) {\n                const length = Math.max(Math.min(end - count, lineLength), 1);\n                res.push(`   |  ` + \"^\".repeat(length));\n              }\n              count += lineLength + newLineSeqLength;\n            }\n          }\n          break;\n        }\n      }\n      return res.join(\"\\n\");\n    }\n    var specialBooleanAttrs = `itemscope,allowfullscreen,formnovalidate,ismap,nomodule,novalidate,readonly`;\n    var isSpecialBooleanAttr = /* @__PURE__ */ makeMap(specialBooleanAttrs);\n    var isBooleanAttr2 = /* @__PURE__ */ makeMap(specialBooleanAttrs + `,async,autofocus,autoplay,controls,default,defer,disabled,hidden,loop,open,required,reversed,scoped,seamless,checked,muted,multiple,selected`);\n    var unsafeAttrCharRE = /[>/=\"'\\u0009\\u000a\\u000c\\u0020]/;\n    var attrValidationCache = {};\n    function isSSRSafeAttrName(name) {\n      if (attrValidationCache.hasOwnProperty(name)) {\n        return attrValidationCache[name];\n      }\n      const isUnsafe = unsafeAttrCharRE.test(name);\n      if (isUnsafe) {\n        console.error(`unsafe attribute name: ${name}`);\n      }\n      return attrValidationCache[name] = !isUnsafe;\n    }\n    var propsToAttrMap = {\n      acceptCharset: \"accept-charset\",\n      className: \"class\",\n      htmlFor: \"for\",\n      httpEquiv: \"http-equiv\"\n    };\n    var isNoUnitNumericStyleProp = /* @__PURE__ */ makeMap(`animation-iteration-count,border-image-outset,border-image-slice,border-image-width,box-flex,box-flex-group,box-ordinal-group,column-count,columns,flex,flex-grow,flex-positive,flex-shrink,flex-negative,flex-order,grid-row,grid-row-end,grid-row-span,grid-row-start,grid-column,grid-column-end,grid-column-span,grid-column-start,font-weight,line-clamp,line-height,opacity,order,orphans,tab-size,widows,z-index,zoom,fill-opacity,flood-opacity,stop-opacity,stroke-dasharray,stroke-dashoffset,stroke-miterlimit,stroke-opacity,stroke-width`);\n    var isKnownAttr = /* @__PURE__ */ makeMap(`accept,accept-charset,accesskey,action,align,allow,alt,async,autocapitalize,autocomplete,autofocus,autoplay,background,bgcolor,border,buffered,capture,challenge,charset,checked,cite,class,code,codebase,color,cols,colspan,content,contenteditable,contextmenu,controls,coords,crossorigin,csp,data,datetime,decoding,default,defer,dir,dirname,disabled,download,draggable,dropzone,enctype,enterkeyhint,for,form,formaction,formenctype,formmethod,formnovalidate,formtarget,headers,height,hidden,high,href,hreflang,http-equiv,icon,id,importance,integrity,ismap,itemprop,keytype,kind,label,lang,language,loading,list,loop,low,manifest,max,maxlength,minlength,media,min,multiple,muted,name,novalidate,open,optimum,pattern,ping,placeholder,poster,preload,radiogroup,readonly,referrerpolicy,rel,required,reversed,rows,rowspan,sandbox,scope,scoped,selected,shape,size,sizes,slot,span,spellcheck,src,srcdoc,srclang,srcset,start,step,style,summary,tabindex,target,title,translate,type,usemap,value,width,wrap`);\n    function normalizeStyle(value) {\n      if (isArray(value)) {\n        const res = {};\n        for (let i = 0; i < value.length; i++) {\n          const item = value[i];\n          const normalized = normalizeStyle(isString(item) ? parseStringStyle(item) : item);\n          if (normalized) {\n            for (const key in normalized) {\n              res[key] = normalized[key];\n            }\n          }\n        }\n        return res;\n      } else if (isObject(value)) {\n        return value;\n      }\n    }\n    var listDelimiterRE = /;(?![^(]*\\))/g;\n    var propertyDelimiterRE = /:(.+)/;\n    function parseStringStyle(cssText) {\n      const ret = {};\n      cssText.split(listDelimiterRE).forEach((item) => {\n        if (item) {\n          const tmp = item.split(propertyDelimiterRE);\n          tmp.length > 1 && (ret[tmp[0].trim()] = tmp[1].trim());\n        }\n      });\n      return ret;\n    }\n    function stringifyStyle(styles) {\n      let ret = \"\";\n      if (!styles) {\n        return ret;\n      }\n      for (const key in styles) {\n        const value = styles[key];\n        const normalizedKey = key.startsWith(`--`) ? key : hyphenate(key);\n        if (isString(value) || typeof value === \"number\" && isNoUnitNumericStyleProp(normalizedKey)) {\n          ret += `${normalizedKey}:${value};`;\n        }\n      }\n      return ret;\n    }\n    function normalizeClass(value) {\n      let res = \"\";\n      if (isString(value)) {\n        res = value;\n      } else if (isArray(value)) {\n        for (let i = 0; i < value.length; i++) {\n          const normalized = normalizeClass(value[i]);\n          if (normalized) {\n            res += normalized + \" \";\n          }\n        }\n      } else if (isObject(value)) {\n        for (const name in value) {\n          if (value[name]) {\n            res += name + \" \";\n          }\n        }\n      }\n      return res.trim();\n    }\n    var HTML_TAGS = \"html,body,base,head,link,meta,style,title,address,article,aside,footer,header,h1,h2,h3,h4,h5,h6,hgroup,nav,section,div,dd,dl,dt,figcaption,figure,picture,hr,img,li,main,ol,p,pre,ul,a,b,abbr,bdi,bdo,br,cite,code,data,dfn,em,i,kbd,mark,q,rp,rt,rtc,ruby,s,samp,small,span,strong,sub,sup,time,u,var,wbr,area,audio,map,track,video,embed,object,param,source,canvas,script,noscript,del,ins,caption,col,colgroup,table,thead,tbody,td,th,tr,button,datalist,fieldset,form,input,label,legend,meter,optgroup,option,output,progress,select,textarea,details,dialog,menu,summary,template,blockquote,iframe,tfoot\";\n    var SVG_TAGS = \"svg,animate,animateMotion,animateTransform,circle,clipPath,color-profile,defs,desc,discard,ellipse,feBlend,feColorMatrix,feComponentTransfer,feComposite,feConvolveMatrix,feDiffuseLighting,feDisplacementMap,feDistanceLight,feDropShadow,feFlood,feFuncA,feFuncB,feFuncG,feFuncR,feGaussianBlur,feImage,feMerge,feMergeNode,feMorphology,feOffset,fePointLight,feSpecularLighting,feSpotLight,feTile,feTurbulence,filter,foreignObject,g,hatch,hatchpath,image,line,linearGradient,marker,mask,mesh,meshgradient,meshpatch,meshrow,metadata,mpath,path,pattern,polygon,polyline,radialGradient,rect,set,solidcolor,stop,switch,symbol,text,textPath,title,tspan,unknown,use,view\";\n    var VOID_TAGS = \"area,base,br,col,embed,hr,img,input,link,meta,param,source,track,wbr\";\n    var isHTMLTag = /* @__PURE__ */ makeMap(HTML_TAGS);\n    var isSVGTag = /* @__PURE__ */ makeMap(SVG_TAGS);\n    var isVoidTag = /* @__PURE__ */ makeMap(VOID_TAGS);\n    var escapeRE = /[\"'&<>]/;\n    function escapeHtml(string) {\n      const str = \"\" + string;\n      const match = escapeRE.exec(str);\n      if (!match) {\n        return str;\n      }\n      let html = \"\";\n      let escaped;\n      let index;\n      let lastIndex = 0;\n      for (index = match.index; index < str.length; index++) {\n        switch (str.charCodeAt(index)) {\n          case 34:\n            escaped = \"&quot;\";\n            break;\n          case 38:\n            escaped = \"&amp;\";\n            break;\n          case 39:\n            escaped = \"&#39;\";\n            break;\n          case 60:\n            escaped = \"&lt;\";\n            break;\n          case 62:\n            escaped = \"&gt;\";\n            break;\n          default:\n            continue;\n        }\n        if (lastIndex !== index) {\n          html += str.substring(lastIndex, index);\n        }\n        lastIndex = index + 1;\n        html += escaped;\n      }\n      return lastIndex !== index ? html + str.substring(lastIndex, index) : html;\n    }\n    var commentStripRE = /^-?>|<!--|-->|--!>|<!-$/g;\n    function escapeHtmlComment(src) {\n      return src.replace(commentStripRE, \"\");\n    }\n    function looseCompareArrays(a, b) {\n      if (a.length !== b.length)\n        return false;\n      let equal = true;\n      for (let i = 0; equal && i < a.length; i++) {\n        equal = looseEqual(a[i], b[i]);\n      }\n      return equal;\n    }\n    function looseEqual(a, b) {\n      if (a === b)\n        return true;\n      let aValidType = isDate(a);\n      let bValidType = isDate(b);\n      if (aValidType || bValidType) {\n        return aValidType && bValidType ? a.getTime() === b.getTime() : false;\n      }\n      aValidType = isArray(a);\n      bValidType = isArray(b);\n      if (aValidType || bValidType) {\n        return aValidType && bValidType ? looseCompareArrays(a, b) : false;\n      }\n      aValidType = isObject(a);\n      bValidType = isObject(b);\n      if (aValidType || bValidType) {\n        if (!aValidType || !bValidType) {\n          return false;\n        }\n        const aKeysCount = Object.keys(a).length;\n        const bKeysCount = Object.keys(b).length;\n        if (aKeysCount !== bKeysCount) {\n          return false;\n        }\n        for (const key in a) {\n          const aHasKey = a.hasOwnProperty(key);\n          const bHasKey = b.hasOwnProperty(key);\n          if (aHasKey && !bHasKey || !aHasKey && bHasKey || !looseEqual(a[key], b[key])) {\n            return false;\n          }\n        }\n      }\n      return String(a) === String(b);\n    }\n    function looseIndexOf(arr, val) {\n      return arr.findIndex((item) => looseEqual(item, val));\n    }\n    var toDisplayString = (val) => {\n      return val == null ? \"\" : isObject(val) ? JSON.stringify(val, replacer, 2) : String(val);\n    };\n    var replacer = (_key, val) => {\n      if (isMap(val)) {\n        return {\n          [`Map(${val.size})`]: [...val.entries()].reduce((entries, [key, val2]) => {\n            entries[`${key} =>`] = val2;\n            return entries;\n          }, {})\n        };\n      } else if (isSet(val)) {\n        return {\n          [`Set(${val.size})`]: [...val.values()]\n        };\n      } else if (isObject(val) && !isArray(val) && !isPlainObject(val)) {\n        return String(val);\n      }\n      return val;\n    };\n    var babelParserDefaultPlugins = [\n      \"bigInt\",\n      \"optionalChaining\",\n      \"nullishCoalescingOperator\"\n    ];\n    var EMPTY_OBJ = Object.freeze({});\n    var EMPTY_ARR = Object.freeze([]);\n    var NOOP = () => {\n    };\n    var NO = () => false;\n    var onRE = /^on[^a-z]/;\n    var isOn = (key) => onRE.test(key);\n    var isModelListener = (key) => key.startsWith(\"onUpdate:\");\n    var extend = Object.assign;\n    var remove = (arr, el) => {\n      const i = arr.indexOf(el);\n      if (i > -1) {\n        arr.splice(i, 1);\n      }\n    };\n    var hasOwnProperty = Object.prototype.hasOwnProperty;\n    var hasOwn = (val, key) => hasOwnProperty.call(val, key);\n    var isArray = Array.isArray;\n    var isMap = (val) => toTypeString(val) === \"[object Map]\";\n    var isSet = (val) => toTypeString(val) === \"[object Set]\";\n    var isDate = (val) => val instanceof Date;\n    var isFunction = (val) => typeof val === \"function\";\n    var isString = (val) => typeof val === \"string\";\n    var isSymbol = (val) => typeof val === \"symbol\";\n    var isObject = (val) => val !== null && typeof val === \"object\";\n    var isPromise = (val) => {\n      return isObject(val) && isFunction(val.then) && isFunction(val.catch);\n    };\n    var objectToString = Object.prototype.toString;\n    var toTypeString = (value) => objectToString.call(value);\n    var toRawType = (value) => {\n      return toTypeString(value).slice(8, -1);\n    };\n    var isPlainObject = (val) => toTypeString(val) === \"[object Object]\";\n    var isIntegerKey = (key) => isString(key) && key !== \"NaN\" && key[0] !== \"-\" && \"\" + parseInt(key, 10) === key;\n    var isReservedProp = /* @__PURE__ */ makeMap(\n      // the leading comma is intentional so empty string \"\" is also included\n      \",key,ref,onVnodeBeforeMount,onVnodeMounted,onVnodeBeforeUpdate,onVnodeUpdated,onVnodeBeforeUnmount,onVnodeUnmounted\"\n    );\n    var cacheStringFunction = (fn) => {\n      const cache = /* @__PURE__ */ Object.create(null);\n      return (str) => {\n        const hit = cache[str];\n        return hit || (cache[str] = fn(str));\n      };\n    };\n    var camelizeRE = /-(\\w)/g;\n    var camelize = cacheStringFunction((str) => {\n      return str.replace(camelizeRE, (_, c) => c ? c.toUpperCase() : \"\");\n    });\n    var hyphenateRE = /\\B([A-Z])/g;\n    var hyphenate = cacheStringFunction((str) => str.replace(hyphenateRE, \"-$1\").toLowerCase());\n    var capitalize = cacheStringFunction((str) => str.charAt(0).toUpperCase() + str.slice(1));\n    var toHandlerKey = cacheStringFunction((str) => str ? `on${capitalize(str)}` : ``);\n    var hasChanged = (value, oldValue) => value !== oldValue && (value === value || oldValue === oldValue);\n    var invokeArrayFns = (fns, arg) => {\n      for (let i = 0; i < fns.length; i++) {\n        fns[i](arg);\n      }\n    };\n    var def = (obj, key, value) => {\n      Object.defineProperty(obj, key, {\n        configurable: true,\n        enumerable: false,\n        value\n      });\n    };\n    var toNumber = (val) => {\n      const n = parseFloat(val);\n      return isNaN(n) ? val : n;\n    };\n    var _globalThis;\n    var getGlobalThis = () => {\n      return _globalThis || (_globalThis = typeof globalThis !== \"undefined\" ? globalThis : typeof self !== \"undefined\" ? self : typeof window !== \"undefined\" ? window : typeof global !== \"undefined\" ? global : {});\n    };\n    exports.EMPTY_ARR = EMPTY_ARR;\n    exports.EMPTY_OBJ = EMPTY_OBJ;\n    exports.NO = NO;\n    exports.NOOP = NOOP;\n    exports.PatchFlagNames = PatchFlagNames;\n    exports.babelParserDefaultPlugins = babelParserDefaultPlugins;\n    exports.camelize = camelize;\n    exports.capitalize = capitalize;\n    exports.def = def;\n    exports.escapeHtml = escapeHtml;\n    exports.escapeHtmlComment = escapeHtmlComment;\n    exports.extend = extend;\n    exports.generateCodeFrame = generateCodeFrame;\n    exports.getGlobalThis = getGlobalThis;\n    exports.hasChanged = hasChanged;\n    exports.hasOwn = hasOwn;\n    exports.hyphenate = hyphenate;\n    exports.invokeArrayFns = invokeArrayFns;\n    exports.isArray = isArray;\n    exports.isBooleanAttr = isBooleanAttr2;\n    exports.isDate = isDate;\n    exports.isFunction = isFunction;\n    exports.isGloballyWhitelisted = isGloballyWhitelisted;\n    exports.isHTMLTag = isHTMLTag;\n    exports.isIntegerKey = isIntegerKey;\n    exports.isKnownAttr = isKnownAttr;\n    exports.isMap = isMap;\n    exports.isModelListener = isModelListener;\n    exports.isNoUnitNumericStyleProp = isNoUnitNumericStyleProp;\n    exports.isObject = isObject;\n    exports.isOn = isOn;\n    exports.isPlainObject = isPlainObject;\n    exports.isPromise = isPromise;\n    exports.isReservedProp = isReservedProp;\n    exports.isSSRSafeAttrName = isSSRSafeAttrName;\n    exports.isSVGTag = isSVGTag;\n    exports.isSet = isSet;\n    exports.isSpecialBooleanAttr = isSpecialBooleanAttr;\n    exports.isString = isString;\n    exports.isSymbol = isSymbol;\n    exports.isVoidTag = isVoidTag;\n    exports.looseEqual = looseEqual;\n    exports.looseIndexOf = looseIndexOf;\n    exports.makeMap = makeMap;\n    exports.normalizeClass = normalizeClass;\n    exports.normalizeStyle = normalizeStyle;\n    exports.objectToString = objectToString;\n    exports.parseStringStyle = parseStringStyle;\n    exports.propsToAttrMap = propsToAttrMap;\n    exports.remove = remove;\n    exports.slotFlagsText = slotFlagsText;\n    exports.stringifyStyle = stringifyStyle;\n    exports.toDisplayString = toDisplayString;\n    exports.toHandlerKey = toHandlerKey;\n    exports.toNumber = toNumber;\n    exports.toRawType = toRawType;\n    exports.toTypeString = toTypeString;\n  }\n});\n\n// node_modules/@vue/shared/index.js\nvar require_shared = __commonJS({\n  \"node_modules/@vue/shared/index.js\"(exports, module2) {\n    \"use strict\";\n    if (false) {\n      module2.exports = null;\n    } else {\n      module2.exports = require_shared_cjs();\n    }\n  }\n});\n\n// node_modules/@vue/reactivity/dist/reactivity.cjs.js\nvar require_reactivity_cjs = __commonJS({\n  \"node_modules/@vue/reactivity/dist/reactivity.cjs.js\"(exports) {\n    \"use strict\";\n    Object.defineProperty(exports, \"__esModule\", { value: true });\n    var shared = require_shared();\n    var targetMap = /* @__PURE__ */ new WeakMap();\n    var effectStack = [];\n    var activeEffect;\n    var ITERATE_KEY = Symbol(\"iterate\");\n    var MAP_KEY_ITERATE_KEY = Symbol(\"Map key iterate\");\n    function isEffect(fn) {\n      return fn && fn._isEffect === true;\n    }\n    function effect3(fn, options = shared.EMPTY_OBJ) {\n      if (isEffect(fn)) {\n        fn = fn.raw;\n      }\n      const effect4 = createReactiveEffect(fn, options);\n      if (!options.lazy) {\n        effect4();\n      }\n      return effect4;\n    }\n    function stop2(effect4) {\n      if (effect4.active) {\n        cleanup(effect4);\n        if (effect4.options.onStop) {\n          effect4.options.onStop();\n        }\n        effect4.active = false;\n      }\n    }\n    var uid = 0;\n    function createReactiveEffect(fn, options) {\n      const effect4 = function reactiveEffect() {\n        if (!effect4.active) {\n          return fn();\n        }\n        if (!effectStack.includes(effect4)) {\n          cleanup(effect4);\n          try {\n            enableTracking();\n            effectStack.push(effect4);\n            activeEffect = effect4;\n            return fn();\n          } finally {\n            effectStack.pop();\n            resetTracking();\n            activeEffect = effectStack[effectStack.length - 1];\n          }\n        }\n      };\n      effect4.id = uid++;\n      effect4.allowRecurse = !!options.allowRecurse;\n      effect4._isEffect = true;\n      effect4.active = true;\n      effect4.raw = fn;\n      effect4.deps = [];\n      effect4.options = options;\n      return effect4;\n    }\n    function cleanup(effect4) {\n      const { deps } = effect4;\n      if (deps.length) {\n        for (let i = 0; i < deps.length; i++) {\n          deps[i].delete(effect4);\n        }\n        deps.length = 0;\n      }\n    }\n    var shouldTrack = true;\n    var trackStack = [];\n    function pauseTracking() {\n      trackStack.push(shouldTrack);\n      shouldTrack = false;\n    }\n    function enableTracking() {\n      trackStack.push(shouldTrack);\n      shouldTrack = true;\n    }\n    function resetTracking() {\n      const last = trackStack.pop();\n      shouldTrack = last === void 0 ? true : last;\n    }\n    function track(target, type, key) {\n      if (!shouldTrack || activeEffect === void 0) {\n        return;\n      }\n      let depsMap = targetMap.get(target);\n      if (!depsMap) {\n        targetMap.set(target, depsMap = /* @__PURE__ */ new Map());\n      }\n      let dep = depsMap.get(key);\n      if (!dep) {\n        depsMap.set(key, dep = /* @__PURE__ */ new Set());\n      }\n      if (!dep.has(activeEffect)) {\n        dep.add(activeEffect);\n        activeEffect.deps.push(dep);\n        if (activeEffect.options.onTrack) {\n          activeEffect.options.onTrack({\n            effect: activeEffect,\n            target,\n            type,\n            key\n          });\n        }\n      }\n    }\n    function trigger(target, type, key, newValue, oldValue, oldTarget) {\n      const depsMap = targetMap.get(target);\n      if (!depsMap) {\n        return;\n      }\n      const effects = /* @__PURE__ */ new Set();\n      const add2 = (effectsToAdd) => {\n        if (effectsToAdd) {\n          effectsToAdd.forEach((effect4) => {\n            if (effect4 !== activeEffect || effect4.allowRecurse) {\n              effects.add(effect4);\n            }\n          });\n        }\n      };\n      if (type === \"clear\") {\n        depsMap.forEach(add2);\n      } else if (key === \"length\" && shared.isArray(target)) {\n        depsMap.forEach((dep, key2) => {\n          if (key2 === \"length\" || key2 >= newValue) {\n            add2(dep);\n          }\n        });\n      } else {\n        if (key !== void 0) {\n          add2(depsMap.get(key));\n        }\n        switch (type) {\n          case \"add\":\n            if (!shared.isArray(target)) {\n              add2(depsMap.get(ITERATE_KEY));\n              if (shared.isMap(target)) {\n                add2(depsMap.get(MAP_KEY_ITERATE_KEY));\n              }\n            } else if (shared.isIntegerKey(key)) {\n              add2(depsMap.get(\"length\"));\n            }\n            break;\n          case \"delete\":\n            if (!shared.isArray(target)) {\n              add2(depsMap.get(ITERATE_KEY));\n              if (shared.isMap(target)) {\n                add2(depsMap.get(MAP_KEY_ITERATE_KEY));\n              }\n            }\n            break;\n          case \"set\":\n            if (shared.isMap(target)) {\n              add2(depsMap.get(ITERATE_KEY));\n            }\n            break;\n        }\n      }\n      const run = (effect4) => {\n        if (effect4.options.onTrigger) {\n          effect4.options.onTrigger({\n            effect: effect4,\n            target,\n            key,\n            type,\n            newValue,\n            oldValue,\n            oldTarget\n          });\n        }\n        if (effect4.options.scheduler) {\n          effect4.options.scheduler(effect4);\n        } else {\n          effect4();\n        }\n      };\n      effects.forEach(run);\n    }\n    var isNonTrackableKeys = /* @__PURE__ */ shared.makeMap(`__proto__,__v_isRef,__isVue`);\n    var builtInSymbols = new Set(Object.getOwnPropertyNames(Symbol).map((key) => Symbol[key]).filter(shared.isSymbol));\n    var get2 = /* @__PURE__ */ createGetter();\n    var shallowGet = /* @__PURE__ */ createGetter(false, true);\n    var readonlyGet = /* @__PURE__ */ createGetter(true);\n    var shallowReadonlyGet = /* @__PURE__ */ createGetter(true, true);\n    var arrayInstrumentations = /* @__PURE__ */ createArrayInstrumentations();\n    function createArrayInstrumentations() {\n      const instrumentations = {};\n      [\"includes\", \"indexOf\", \"lastIndexOf\"].forEach((key) => {\n        instrumentations[key] = function(...args) {\n          const arr = toRaw2(this);\n          for (let i = 0, l = this.length; i < l; i++) {\n            track(arr, \"get\", i + \"\");\n          }\n          const res = arr[key](...args);\n          if (res === -1 || res === false) {\n            return arr[key](...args.map(toRaw2));\n          } else {\n            return res;\n          }\n        };\n      });\n      [\"push\", \"pop\", \"shift\", \"unshift\", \"splice\"].forEach((key) => {\n        instrumentations[key] = function(...args) {\n          pauseTracking();\n          const res = toRaw2(this)[key].apply(this, args);\n          resetTracking();\n          return res;\n        };\n      });\n      return instrumentations;\n    }\n    function createGetter(isReadonly2 = false, shallow = false) {\n      return function get3(target, key, receiver) {\n        if (key === \"__v_isReactive\") {\n          return !isReadonly2;\n        } else if (key === \"__v_isReadonly\") {\n          return isReadonly2;\n        } else if (key === \"__v_raw\" && receiver === (isReadonly2 ? shallow ? shallowReadonlyMap : readonlyMap : shallow ? shallowReactiveMap : reactiveMap).get(target)) {\n          return target;\n        }\n        const targetIsArray = shared.isArray(target);\n        if (!isReadonly2 && targetIsArray && shared.hasOwn(arrayInstrumentations, key)) {\n          return Reflect.get(arrayInstrumentations, key, receiver);\n        }\n        const res = Reflect.get(target, key, receiver);\n        if (shared.isSymbol(key) ? builtInSymbols.has(key) : isNonTrackableKeys(key)) {\n          return res;\n        }\n        if (!isReadonly2) {\n          track(target, \"get\", key);\n        }\n        if (shallow) {\n          return res;\n        }\n        if (isRef(res)) {\n          const shouldUnwrap = !targetIsArray || !shared.isIntegerKey(key);\n          return shouldUnwrap ? res.value : res;\n        }\n        if (shared.isObject(res)) {\n          return isReadonly2 ? readonly(res) : reactive3(res);\n        }\n        return res;\n      };\n    }\n    var set2 = /* @__PURE__ */ createSetter();\n    var shallowSet = /* @__PURE__ */ createSetter(true);\n    function createSetter(shallow = false) {\n      return function set3(target, key, value, receiver) {\n        let oldValue = target[key];\n        if (!shallow) {\n          value = toRaw2(value);\n          oldValue = toRaw2(oldValue);\n          if (!shared.isArray(target) && isRef(oldValue) && !isRef(value)) {\n            oldValue.value = value;\n            return true;\n          }\n        }\n        const hadKey = shared.isArray(target) && shared.isIntegerKey(key) ? Number(key) < target.length : shared.hasOwn(target, key);\n        const result = Reflect.set(target, key, value, receiver);\n        if (target === toRaw2(receiver)) {\n          if (!hadKey) {\n            trigger(target, \"add\", key, value);\n          } else if (shared.hasChanged(value, oldValue)) {\n            trigger(target, \"set\", key, value, oldValue);\n          }\n        }\n        return result;\n      };\n    }\n    function deleteProperty(target, key) {\n      const hadKey = shared.hasOwn(target, key);\n      const oldValue = target[key];\n      const result = Reflect.deleteProperty(target, key);\n      if (result && hadKey) {\n        trigger(target, \"delete\", key, void 0, oldValue);\n      }\n      return result;\n    }\n    function has(target, key) {\n      const result = Reflect.has(target, key);\n      if (!shared.isSymbol(key) || !builtInSymbols.has(key)) {\n        track(target, \"has\", key);\n      }\n      return result;\n    }\n    function ownKeys(target) {\n      track(target, \"iterate\", shared.isArray(target) ? \"length\" : ITERATE_KEY);\n      return Reflect.ownKeys(target);\n    }\n    var mutableHandlers = {\n      get: get2,\n      set: set2,\n      deleteProperty,\n      has,\n      ownKeys\n    };\n    var readonlyHandlers = {\n      get: readonlyGet,\n      set(target, key) {\n        {\n          console.warn(`Set operation on key \"${String(key)}\" failed: target is readonly.`, target);\n        }\n        return true;\n      },\n      deleteProperty(target, key) {\n        {\n          console.warn(`Delete operation on key \"${String(key)}\" failed: target is readonly.`, target);\n        }\n        return true;\n      }\n    };\n    var shallowReactiveHandlers = /* @__PURE__ */ shared.extend({}, mutableHandlers, {\n      get: shallowGet,\n      set: shallowSet\n    });\n    var shallowReadonlyHandlers = /* @__PURE__ */ shared.extend({}, readonlyHandlers, {\n      get: shallowReadonlyGet\n    });\n    var toReactive = (value) => shared.isObject(value) ? reactive3(value) : value;\n    var toReadonly = (value) => shared.isObject(value) ? readonly(value) : value;\n    var toShallow = (value) => value;\n    var getProto = (v) => Reflect.getPrototypeOf(v);\n    function get$1(target, key, isReadonly2 = false, isShallow = false) {\n      target = target[\n        \"__v_raw\"\n        /* RAW */\n      ];\n      const rawTarget = toRaw2(target);\n      const rawKey = toRaw2(key);\n      if (key !== rawKey) {\n        !isReadonly2 && track(rawTarget, \"get\", key);\n      }\n      !isReadonly2 && track(rawTarget, \"get\", rawKey);\n      const { has: has2 } = getProto(rawTarget);\n      const wrap = isShallow ? toShallow : isReadonly2 ? toReadonly : toReactive;\n      if (has2.call(rawTarget, key)) {\n        return wrap(target.get(key));\n      } else if (has2.call(rawTarget, rawKey)) {\n        return wrap(target.get(rawKey));\n      } else if (target !== rawTarget) {\n        target.get(key);\n      }\n    }\n    function has$1(key, isReadonly2 = false) {\n      const target = this[\n        \"__v_raw\"\n        /* RAW */\n      ];\n      const rawTarget = toRaw2(target);\n      const rawKey = toRaw2(key);\n      if (key !== rawKey) {\n        !isReadonly2 && track(rawTarget, \"has\", key);\n      }\n      !isReadonly2 && track(rawTarget, \"has\", rawKey);\n      return key === rawKey ? target.has(key) : target.has(key) || target.has(rawKey);\n    }\n    function size(target, isReadonly2 = false) {\n      target = target[\n        \"__v_raw\"\n        /* RAW */\n      ];\n      !isReadonly2 && track(toRaw2(target), \"iterate\", ITERATE_KEY);\n      return Reflect.get(target, \"size\", target);\n    }\n    function add(value) {\n      value = toRaw2(value);\n      const target = toRaw2(this);\n      const proto = getProto(target);\n      const hadKey = proto.has.call(target, value);\n      if (!hadKey) {\n        target.add(value);\n        trigger(target, \"add\", value, value);\n      }\n      return this;\n    }\n    function set$1(key, value) {\n      value = toRaw2(value);\n      const target = toRaw2(this);\n      const { has: has2, get: get3 } = getProto(target);\n      let hadKey = has2.call(target, key);\n      if (!hadKey) {\n        key = toRaw2(key);\n        hadKey = has2.call(target, key);\n      } else {\n        checkIdentityKeys(target, has2, key);\n      }\n      const oldValue = get3.call(target, key);\n      target.set(key, value);\n      if (!hadKey) {\n        trigger(target, \"add\", key, value);\n      } else if (shared.hasChanged(value, oldValue)) {\n        trigger(target, \"set\", key, value, oldValue);\n      }\n      return this;\n    }\n    function deleteEntry(key) {\n      const target = toRaw2(this);\n      const { has: has2, get: get3 } = getProto(target);\n      let hadKey = has2.call(target, key);\n      if (!hadKey) {\n        key = toRaw2(key);\n        hadKey = has2.call(target, key);\n      } else {\n        checkIdentityKeys(target, has2, key);\n      }\n      const oldValue = get3 ? get3.call(target, key) : void 0;\n      const result = target.delete(key);\n      if (hadKey) {\n        trigger(target, \"delete\", key, void 0, oldValue);\n      }\n      return result;\n    }\n    function clear() {\n      const target = toRaw2(this);\n      const hadItems = target.size !== 0;\n      const oldTarget = shared.isMap(target) ? new Map(target) : new Set(target);\n      const result = target.clear();\n      if (hadItems) {\n        trigger(target, \"clear\", void 0, void 0, oldTarget);\n      }\n      return result;\n    }\n    function createForEach(isReadonly2, isShallow) {\n      return function forEach(callback, thisArg) {\n        const observed = this;\n        const target = observed[\n          \"__v_raw\"\n          /* RAW */\n        ];\n        const rawTarget = toRaw2(target);\n        const wrap = isShallow ? toShallow : isReadonly2 ? toReadonly : toReactive;\n        !isReadonly2 && track(rawTarget, \"iterate\", ITERATE_KEY);\n        return target.forEach((value, key) => {\n          return callback.call(thisArg, wrap(value), wrap(key), observed);\n        });\n      };\n    }\n    function createIterableMethod(method, isReadonly2, isShallow) {\n      return function(...args) {\n        const target = this[\n          \"__v_raw\"\n          /* RAW */\n        ];\n        const rawTarget = toRaw2(target);\n        const targetIsMap = shared.isMap(rawTarget);\n        const isPair = method === \"entries\" || method === Symbol.iterator && targetIsMap;\n        const isKeyOnly = method === \"keys\" && targetIsMap;\n        const innerIterator = target[method](...args);\n        const wrap = isShallow ? toShallow : isReadonly2 ? toReadonly : toReactive;\n        !isReadonly2 && track(rawTarget, \"iterate\", isKeyOnly ? MAP_KEY_ITERATE_KEY : ITERATE_KEY);\n        return {\n          // iterator protocol\n          next() {\n            const { value, done } = innerIterator.next();\n            return done ? { value, done } : {\n              value: isPair ? [wrap(value[0]), wrap(value[1])] : wrap(value),\n              done\n            };\n          },\n          // iterable protocol\n          [Symbol.iterator]() {\n            return this;\n          }\n        };\n      };\n    }\n    function createReadonlyMethod(type) {\n      return function(...args) {\n        {\n          const key = args[0] ? `on key \"${args[0]}\" ` : ``;\n          console.warn(`${shared.capitalize(type)} operation ${key}failed: target is readonly.`, toRaw2(this));\n        }\n        return type === \"delete\" ? false : this;\n      };\n    }\n    function createInstrumentations() {\n      const mutableInstrumentations2 = {\n        get(key) {\n          return get$1(this, key);\n        },\n        get size() {\n          return size(this);\n        },\n        has: has$1,\n        add,\n        set: set$1,\n        delete: deleteEntry,\n        clear,\n        forEach: createForEach(false, false)\n      };\n      const shallowInstrumentations2 = {\n        get(key) {\n          return get$1(this, key, false, true);\n        },\n        get size() {\n          return size(this);\n        },\n        has: has$1,\n        add,\n        set: set$1,\n        delete: deleteEntry,\n        clear,\n        forEach: createForEach(false, true)\n      };\n      const readonlyInstrumentations2 = {\n        get(key) {\n          return get$1(this, key, true);\n        },\n        get size() {\n          return size(this, true);\n        },\n        has(key) {\n          return has$1.call(this, key, true);\n        },\n        add: createReadonlyMethod(\n          \"add\"\n          /* ADD */\n        ),\n        set: createReadonlyMethod(\n          \"set\"\n          /* SET */\n        ),\n        delete: createReadonlyMethod(\n          \"delete\"\n          /* DELETE */\n        ),\n        clear: createReadonlyMethod(\n          \"clear\"\n          /* CLEAR */\n        ),\n        forEach: createForEach(true, false)\n      };\n      const shallowReadonlyInstrumentations2 = {\n        get(key) {\n          return get$1(this, key, true, true);\n        },\n        get size() {\n          return size(this, true);\n        },\n        has(key) {\n          return has$1.call(this, key, true);\n        },\n        add: createReadonlyMethod(\n          \"add\"\n          /* ADD */\n        ),\n        set: createReadonlyMethod(\n          \"set\"\n          /* SET */\n        ),\n        delete: createReadonlyMethod(\n          \"delete\"\n          /* DELETE */\n        ),\n        clear: createReadonlyMethod(\n          \"clear\"\n          /* CLEAR */\n        ),\n        forEach: createForEach(true, true)\n      };\n      const iteratorMethods = [\"keys\", \"values\", \"entries\", Symbol.iterator];\n      iteratorMethods.forEach((method) => {\n        mutableInstrumentations2[method] = createIterableMethod(method, false, false);\n        readonlyInstrumentations2[method] = createIterableMethod(method, true, false);\n        shallowInstrumentations2[method] = createIterableMethod(method, false, true);\n        shallowReadonlyInstrumentations2[method] = createIterableMethod(method, true, true);\n      });\n      return [\n        mutableInstrumentations2,\n        readonlyInstrumentations2,\n        shallowInstrumentations2,\n        shallowReadonlyInstrumentations2\n      ];\n    }\n    var [mutableInstrumentations, readonlyInstrumentations, shallowInstrumentations, shallowReadonlyInstrumentations] = /* @__PURE__ */ createInstrumentations();\n    function createInstrumentationGetter(isReadonly2, shallow) {\n      const instrumentations = shallow ? isReadonly2 ? shallowReadonlyInstrumentations : shallowInstrumentations : isReadonly2 ? readonlyInstrumentations : mutableInstrumentations;\n      return (target, key, receiver) => {\n        if (key === \"__v_isReactive\") {\n          return !isReadonly2;\n        } else if (key === \"__v_isReadonly\") {\n          return isReadonly2;\n        } else if (key === \"__v_raw\") {\n          return target;\n        }\n        return Reflect.get(shared.hasOwn(instrumentations, key) && key in target ? instrumentations : target, key, receiver);\n      };\n    }\n    var mutableCollectionHandlers = {\n      get: /* @__PURE__ */ createInstrumentationGetter(false, false)\n    };\n    var shallowCollectionHandlers = {\n      get: /* @__PURE__ */ createInstrumentationGetter(false, true)\n    };\n    var readonlyCollectionHandlers = {\n      get: /* @__PURE__ */ createInstrumentationGetter(true, false)\n    };\n    var shallowReadonlyCollectionHandlers = {\n      get: /* @__PURE__ */ createInstrumentationGetter(true, true)\n    };\n    function checkIdentityKeys(target, has2, key) {\n      const rawKey = toRaw2(key);\n      if (rawKey !== key && has2.call(target, rawKey)) {\n        const type = shared.toRawType(target);\n        console.warn(`Reactive ${type} contains both the raw and reactive versions of the same object${type === `Map` ? ` as keys` : ``}, which can lead to inconsistencies. Avoid differentiating between the raw and reactive versions of an object and only use the reactive version if possible.`);\n      }\n    }\n    var reactiveMap = /* @__PURE__ */ new WeakMap();\n    var shallowReactiveMap = /* @__PURE__ */ new WeakMap();\n    var readonlyMap = /* @__PURE__ */ new WeakMap();\n    var shallowReadonlyMap = /* @__PURE__ */ new WeakMap();\n    function targetTypeMap(rawType) {\n      switch (rawType) {\n        case \"Object\":\n        case \"Array\":\n          return 1;\n        case \"Map\":\n        case \"Set\":\n        case \"WeakMap\":\n        case \"WeakSet\":\n          return 2;\n        default:\n          return 0;\n      }\n    }\n    function getTargetType(value) {\n      return value[\n        \"__v_skip\"\n        /* SKIP */\n      ] || !Object.isExtensible(value) ? 0 : targetTypeMap(shared.toRawType(value));\n    }\n    function reactive3(target) {\n      if (target && target[\n        \"__v_isReadonly\"\n        /* IS_READONLY */\n      ]) {\n        return target;\n      }\n      return createReactiveObject(target, false, mutableHandlers, mutableCollectionHandlers, reactiveMap);\n    }\n    function shallowReactive(target) {\n      return createReactiveObject(target, false, shallowReactiveHandlers, shallowCollectionHandlers, shallowReactiveMap);\n    }\n    function readonly(target) {\n      return createReactiveObject(target, true, readonlyHandlers, readonlyCollectionHandlers, readonlyMap);\n    }\n    function shallowReadonly(target) {\n      return createReactiveObject(target, true, shallowReadonlyHandlers, shallowReadonlyCollectionHandlers, shallowReadonlyMap);\n    }\n    function createReactiveObject(target, isReadonly2, baseHandlers, collectionHandlers, proxyMap) {\n      if (!shared.isObject(target)) {\n        {\n          console.warn(`value cannot be made reactive: ${String(target)}`);\n        }\n        return target;\n      }\n      if (target[\n        \"__v_raw\"\n        /* RAW */\n      ] && !(isReadonly2 && target[\n        \"__v_isReactive\"\n        /* IS_REACTIVE */\n      ])) {\n        return target;\n      }\n      const existingProxy = proxyMap.get(target);\n      if (existingProxy) {\n        return existingProxy;\n      }\n      const targetType = getTargetType(target);\n      if (targetType === 0) {\n        return target;\n      }\n      const proxy = new Proxy(target, targetType === 2 ? collectionHandlers : baseHandlers);\n      proxyMap.set(target, proxy);\n      return proxy;\n    }\n    function isReactive2(value) {\n      if (isReadonly(value)) {\n        return isReactive2(value[\n          \"__v_raw\"\n          /* RAW */\n        ]);\n      }\n      return !!(value && value[\n        \"__v_isReactive\"\n        /* IS_REACTIVE */\n      ]);\n    }\n    function isReadonly(value) {\n      return !!(value && value[\n        \"__v_isReadonly\"\n        /* IS_READONLY */\n      ]);\n    }\n    function isProxy(value) {\n      return isReactive2(value) || isReadonly(value);\n    }\n    function toRaw2(observed) {\n      return observed && toRaw2(observed[\n        \"__v_raw\"\n        /* RAW */\n      ]) || observed;\n    }\n    function markRaw(value) {\n      shared.def(value, \"__v_skip\", true);\n      return value;\n    }\n    var convert = (val) => shared.isObject(val) ? reactive3(val) : val;\n    function isRef(r) {\n      return Boolean(r && r.__v_isRef === true);\n    }\n    function ref(value) {\n      return createRef(value);\n    }\n    function shallowRef(value) {\n      return createRef(value, true);\n    }\n    var RefImpl = class {\n      constructor(value, _shallow = false) {\n        this._shallow = _shallow;\n        this.__v_isRef = true;\n        this._rawValue = _shallow ? value : toRaw2(value);\n        this._value = _shallow ? value : convert(value);\n      }\n      get value() {\n        track(toRaw2(this), \"get\", \"value\");\n        return this._value;\n      }\n      set value(newVal) {\n        newVal = this._shallow ? newVal : toRaw2(newVal);\n        if (shared.hasChanged(newVal, this._rawValue)) {\n          this._rawValue = newVal;\n          this._value = this._shallow ? newVal : convert(newVal);\n          trigger(toRaw2(this), \"set\", \"value\", newVal);\n        }\n      }\n    };\n    function createRef(rawValue, shallow = false) {\n      if (isRef(rawValue)) {\n        return rawValue;\n      }\n      return new RefImpl(rawValue, shallow);\n    }\n    function triggerRef(ref2) {\n      trigger(toRaw2(ref2), \"set\", \"value\", ref2.value);\n    }\n    function unref(ref2) {\n      return isRef(ref2) ? ref2.value : ref2;\n    }\n    var shallowUnwrapHandlers = {\n      get: (target, key, receiver) => unref(Reflect.get(target, key, receiver)),\n      set: (target, key, value, receiver) => {\n        const oldValue = target[key];\n        if (isRef(oldValue) && !isRef(value)) {\n          oldValue.value = value;\n          return true;\n        } else {\n          return Reflect.set(target, key, value, receiver);\n        }\n      }\n    };\n    function proxyRefs(objectWithRefs) {\n      return isReactive2(objectWithRefs) ? objectWithRefs : new Proxy(objectWithRefs, shallowUnwrapHandlers);\n    }\n    var CustomRefImpl = class {\n      constructor(factory) {\n        this.__v_isRef = true;\n        const { get: get3, set: set3 } = factory(() => track(this, \"get\", \"value\"), () => trigger(this, \"set\", \"value\"));\n        this._get = get3;\n        this._set = set3;\n      }\n      get value() {\n        return this._get();\n      }\n      set value(newVal) {\n        this._set(newVal);\n      }\n    };\n    function customRef(factory) {\n      return new CustomRefImpl(factory);\n    }\n    function toRefs(object) {\n      if (!isProxy(object)) {\n        console.warn(`toRefs() expects a reactive object but received a plain one.`);\n      }\n      const ret = shared.isArray(object) ? new Array(object.length) : {};\n      for (const key in object) {\n        ret[key] = toRef(object, key);\n      }\n      return ret;\n    }\n    var ObjectRefImpl = class {\n      constructor(_object, _key) {\n        this._object = _object;\n        this._key = _key;\n        this.__v_isRef = true;\n      }\n      get value() {\n        return this._object[this._key];\n      }\n      set value(newVal) {\n        this._object[this._key] = newVal;\n      }\n    };\n    function toRef(object, key) {\n      return isRef(object[key]) ? object[key] : new ObjectRefImpl(object, key);\n    }\n    var ComputedRefImpl = class {\n      constructor(getter, _setter, isReadonly2) {\n        this._setter = _setter;\n        this._dirty = true;\n        this.__v_isRef = true;\n        this.effect = effect3(getter, {\n          lazy: true,\n          scheduler: () => {\n            if (!this._dirty) {\n              this._dirty = true;\n              trigger(toRaw2(this), \"set\", \"value\");\n            }\n          }\n        });\n        this[\n          \"__v_isReadonly\"\n          /* IS_READONLY */\n        ] = isReadonly2;\n      }\n      get value() {\n        const self2 = toRaw2(this);\n        if (self2._dirty) {\n          self2._value = this.effect();\n          self2._dirty = false;\n        }\n        track(self2, \"get\", \"value\");\n        return self2._value;\n      }\n      set value(newValue) {\n        this._setter(newValue);\n      }\n    };\n    function computed(getterOrOptions) {\n      let getter;\n      let setter;\n      if (shared.isFunction(getterOrOptions)) {\n        getter = getterOrOptions;\n        setter = () => {\n          console.warn(\"Write operation failed: computed value is readonly\");\n        };\n      } else {\n        getter = getterOrOptions.get;\n        setter = getterOrOptions.set;\n      }\n      return new ComputedRefImpl(getter, setter, shared.isFunction(getterOrOptions) || !getterOrOptions.set);\n    }\n    exports.ITERATE_KEY = ITERATE_KEY;\n    exports.computed = computed;\n    exports.customRef = customRef;\n    exports.effect = effect3;\n    exports.enableTracking = enableTracking;\n    exports.isProxy = isProxy;\n    exports.isReactive = isReactive2;\n    exports.isReadonly = isReadonly;\n    exports.isRef = isRef;\n    exports.markRaw = markRaw;\n    exports.pauseTracking = pauseTracking;\n    exports.proxyRefs = proxyRefs;\n    exports.reactive = reactive3;\n    exports.readonly = readonly;\n    exports.ref = ref;\n    exports.resetTracking = resetTracking;\n    exports.shallowReactive = shallowReactive;\n    exports.shallowReadonly = shallowReadonly;\n    exports.shallowRef = shallowRef;\n    exports.stop = stop2;\n    exports.toRaw = toRaw2;\n    exports.toRef = toRef;\n    exports.toRefs = toRefs;\n    exports.track = track;\n    exports.trigger = trigger;\n    exports.triggerRef = triggerRef;\n    exports.unref = unref;\n  }\n});\n\n// node_modules/@vue/reactivity/index.js\nvar require_reactivity = __commonJS({\n  \"node_modules/@vue/reactivity/index.js\"(exports, module2) {\n    \"use strict\";\n    if (false) {\n      module2.exports = null;\n    } else {\n      module2.exports = require_reactivity_cjs();\n    }\n  }\n});\n\n// packages/alpinejs/builds/module.js\nvar module_exports = {};\n__export(module_exports, {\n  Alpine: () => src_default,\n  default: () => module_default\n});\nmodule.exports = __toCommonJS(module_exports);\n\n// packages/alpinejs/src/scheduler.js\nvar flushPending = false;\nvar flushing = false;\nvar queue = [];\nvar lastFlushedIndex = -1;\nfunction scheduler(callback) {\n  queueJob(callback);\n}\nfunction queueJob(job) {\n  if (!queue.includes(job))\n    queue.push(job);\n  queueFlush();\n}\nfunction dequeueJob(job) {\n  let index = queue.indexOf(job);\n  if (index !== -1 && index > lastFlushedIndex)\n    queue.splice(index, 1);\n}\nfunction queueFlush() {\n  if (!flushing && !flushPending) {\n    flushPending = true;\n    queueMicrotask(flushJobs);\n  }\n}\nfunction flushJobs() {\n  flushPending = false;\n  flushing = true;\n  for (let i = 0; i < queue.length; i++) {\n    queue[i]();\n    lastFlushedIndex = i;\n  }\n  queue.length = 0;\n  lastFlushedIndex = -1;\n  flushing = false;\n}\n\n// packages/alpinejs/src/reactivity.js\nvar reactive;\nvar effect;\nvar release;\nvar raw;\nvar shouldSchedule = true;\nfunction disableEffectScheduling(callback) {\n  shouldSchedule = false;\n  callback();\n  shouldSchedule = true;\n}\nfunction setReactivityEngine(engine) {\n  reactive = engine.reactive;\n  release = engine.release;\n  effect = (callback) => engine.effect(callback, { scheduler: (task) => {\n    if (shouldSchedule) {\n      scheduler(task);\n    } else {\n      task();\n    }\n  } });\n  raw = engine.raw;\n}\nfunction overrideEffect(override) {\n  effect = override;\n}\nfunction elementBoundEffect(el) {\n  let cleanup = () => {\n  };\n  let wrappedEffect = (callback) => {\n    let effectReference = effect(callback);\n    if (!el._x_effects) {\n      el._x_effects = /* @__PURE__ */ new Set();\n      el._x_runEffects = () => {\n        el._x_effects.forEach((i) => i());\n      };\n    }\n    el._x_effects.add(effectReference);\n    cleanup = () => {\n      if (effectReference === void 0)\n        return;\n      el._x_effects.delete(effectReference);\n      release(effectReference);\n    };\n    return effectReference;\n  };\n  return [wrappedEffect, () => {\n    cleanup();\n  }];\n}\nfunction watch(getter, callback) {\n  let firstTime = true;\n  let oldValue;\n  let effectReference = effect(() => {\n    let value = getter();\n    JSON.stringify(value);\n    if (!firstTime) {\n      queueMicrotask(() => {\n        callback(value, oldValue);\n        oldValue = value;\n      });\n    } else {\n      oldValue = value;\n    }\n    firstTime = false;\n  });\n  return () => release(effectReference);\n}\n\n// packages/alpinejs/src/mutation.js\nvar onAttributeAddeds = [];\nvar onElRemoveds = [];\nvar onElAddeds = [];\nfunction onElAdded(callback) {\n  onElAddeds.push(callback);\n}\nfunction onElRemoved(el, callback) {\n  if (typeof callback === \"function\") {\n    if (!el._x_cleanups)\n      el._x_cleanups = [];\n    el._x_cleanups.push(callback);\n  } else {\n    callback = el;\n    onElRemoveds.push(callback);\n  }\n}\nfunction onAttributesAdded(callback) {\n  onAttributeAddeds.push(callback);\n}\nfunction onAttributeRemoved(el, name, callback) {\n  if (!el._x_attributeCleanups)\n    el._x_attributeCleanups = {};\n  if (!el._x_attributeCleanups[name])\n    el._x_attributeCleanups[name] = [];\n  el._x_attributeCleanups[name].push(callback);\n}\nfunction cleanupAttributes(el, names) {\n  if (!el._x_attributeCleanups)\n    return;\n  Object.entries(el._x_attributeCleanups).forEach(([name, value]) => {\n    if (names === void 0 || names.includes(name)) {\n      value.forEach((i) => i());\n      delete el._x_attributeCleanups[name];\n    }\n  });\n}\nfunction cleanupElement(el) {\n  var _a, _b;\n  (_a = el._x_effects) == null ? void 0 : _a.forEach(dequeueJob);\n  while ((_b = el._x_cleanups) == null ? void 0 : _b.length)\n    el._x_cleanups.pop()();\n}\nvar observer = new MutationObserver(onMutate);\nvar currentlyObserving = false;\nfunction startObservingMutations() {\n  observer.observe(document, { subtree: true, childList: true, attributes: true, attributeOldValue: true });\n  currentlyObserving = true;\n}\nfunction stopObservingMutations() {\n  flushObserver();\n  observer.disconnect();\n  currentlyObserving = false;\n}\nvar queuedMutations = [];\nfunction flushObserver() {\n  let records = observer.takeRecords();\n  queuedMutations.push(() => records.length > 0 && onMutate(records));\n  let queueLengthWhenTriggered = queuedMutations.length;\n  queueMicrotask(() => {\n    if (queuedMutations.length === queueLengthWhenTriggered) {\n      while (queuedMutations.length > 0)\n        queuedMutations.shift()();\n    }\n  });\n}\nfunction mutateDom(callback) {\n  if (!currentlyObserving)\n    return callback();\n  stopObservingMutations();\n  let result = callback();\n  startObservingMutations();\n  return result;\n}\nvar isCollecting = false;\nvar deferredMutations = [];\nfunction deferMutations() {\n  isCollecting = true;\n}\nfunction flushAndStopDeferringMutations() {\n  isCollecting = false;\n  onMutate(deferredMutations);\n  deferredMutations = [];\n}\nfunction onMutate(mutations) {\n  if (isCollecting) {\n    deferredMutations = deferredMutations.concat(mutations);\n    return;\n  }\n  let addedNodes = [];\n  let removedNodes = /* @__PURE__ */ new Set();\n  let addedAttributes = /* @__PURE__ */ new Map();\n  let removedAttributes = /* @__PURE__ */ new Map();\n  for (let i = 0; i < mutations.length; i++) {\n    if (mutations[i].target._x_ignoreMutationObserver)\n      continue;\n    if (mutations[i].type === \"childList\") {\n      mutations[i].removedNodes.forEach((node) => {\n        if (node.nodeType !== 1)\n          return;\n        if (!node._x_marker)\n          return;\n        removedNodes.add(node);\n      });\n      mutations[i].addedNodes.forEach((node) => {\n        if (node.nodeType !== 1)\n          return;\n        if (removedNodes.has(node)) {\n          removedNodes.delete(node);\n          return;\n        }\n        if (node._x_marker)\n          return;\n        addedNodes.push(node);\n      });\n    }\n    if (mutations[i].type === \"attributes\") {\n      let el = mutations[i].target;\n      let name = mutations[i].attributeName;\n      let oldValue = mutations[i].oldValue;\n      let add = () => {\n        if (!addedAttributes.has(el))\n          addedAttributes.set(el, []);\n        addedAttributes.get(el).push({ name, value: el.getAttribute(name) });\n      };\n      let remove = () => {\n        if (!removedAttributes.has(el))\n          removedAttributes.set(el, []);\n        removedAttributes.get(el).push(name);\n      };\n      if (el.hasAttribute(name) && oldValue === null) {\n        add();\n      } else if (el.hasAttribute(name)) {\n        remove();\n        add();\n      } else {\n        remove();\n      }\n    }\n  }\n  removedAttributes.forEach((attrs, el) => {\n    cleanupAttributes(el, attrs);\n  });\n  addedAttributes.forEach((attrs, el) => {\n    onAttributeAddeds.forEach((i) => i(el, attrs));\n  });\n  for (let node of removedNodes) {\n    if (addedNodes.some((i) => i.contains(node)))\n      continue;\n    onElRemoveds.forEach((i) => i(node));\n  }\n  for (let node of addedNodes) {\n    if (!node.isConnected)\n      continue;\n    onElAddeds.forEach((i) => i(node));\n  }\n  addedNodes = null;\n  removedNodes = null;\n  addedAttributes = null;\n  removedAttributes = null;\n}\n\n// packages/alpinejs/src/scope.js\nfunction scope(node) {\n  return mergeProxies(closestDataStack(node));\n}\nfunction addScopeToNode(node, data2, referenceNode) {\n  node._x_dataStack = [data2, ...closestDataStack(referenceNode || node)];\n  return () => {\n    node._x_dataStack = node._x_dataStack.filter((i) => i !== data2);\n  };\n}\nfunction closestDataStack(node) {\n  if (node._x_dataStack)\n    return node._x_dataStack;\n  if (typeof ShadowRoot === \"function\" && node instanceof ShadowRoot) {\n    return closestDataStack(node.host);\n  }\n  if (!node.parentNode) {\n    return [];\n  }\n  return closestDataStack(node.parentNode);\n}\nfunction mergeProxies(objects) {\n  return new Proxy({ objects }, mergeProxyTrap);\n}\nvar mergeProxyTrap = {\n  ownKeys({ objects }) {\n    return Array.from(\n      new Set(objects.flatMap((i) => Object.keys(i)))\n    );\n  },\n  has({ objects }, name) {\n    if (name == Symbol.unscopables)\n      return false;\n    return objects.some(\n      (obj) => Object.prototype.hasOwnProperty.call(obj, name) || Reflect.has(obj, name)\n    );\n  },\n  get({ objects }, name, thisProxy) {\n    if (name == \"toJSON\")\n      return collapseProxies;\n    return Reflect.get(\n      objects.find(\n        (obj) => Reflect.has(obj, name)\n      ) || {},\n      name,\n      thisProxy\n    );\n  },\n  set({ objects }, name, value, thisProxy) {\n    const target = objects.find(\n      (obj) => Object.prototype.hasOwnProperty.call(obj, name)\n    ) || objects[objects.length - 1];\n    const descriptor = Object.getOwnPropertyDescriptor(target, name);\n    if ((descriptor == null ? void 0 : descriptor.set) && (descriptor == null ? void 0 : descriptor.get))\n      return descriptor.set.call(thisProxy, value) || true;\n    return Reflect.set(target, name, value);\n  }\n};\nfunction collapseProxies() {\n  let keys = Reflect.ownKeys(this);\n  return keys.reduce((acc, key) => {\n    acc[key] = Reflect.get(this, key);\n    return acc;\n  }, {});\n}\n\n// packages/alpinejs/src/interceptor.js\nfunction initInterceptors(data2) {\n  let isObject = (val) => typeof val === \"object\" && !Array.isArray(val) && val !== null;\n  let recurse = (obj, basePath = \"\") => {\n    Object.entries(Object.getOwnPropertyDescriptors(obj)).forEach(([key, { value, enumerable }]) => {\n      if (enumerable === false || value === void 0)\n        return;\n      if (typeof value === \"object\" && value !== null && value.__v_skip)\n        return;\n      let path = basePath === \"\" ? key : `${basePath}.${key}`;\n      if (typeof value === \"object\" && value !== null && value._x_interceptor) {\n        obj[key] = value.initialize(data2, path, key);\n      } else {\n        if (isObject(value) && value !== obj && !(value instanceof Element)) {\n          recurse(value, path);\n        }\n      }\n    });\n  };\n  return recurse(data2);\n}\nfunction interceptor(callback, mutateObj = () => {\n}) {\n  let obj = {\n    initialValue: void 0,\n    _x_interceptor: true,\n    initialize(data2, path, key) {\n      return callback(this.initialValue, () => get(data2, path), (value) => set(data2, path, value), path, key);\n    }\n  };\n  mutateObj(obj);\n  return (initialValue) => {\n    if (typeof initialValue === \"object\" && initialValue !== null && initialValue._x_interceptor) {\n      let initialize = obj.initialize.bind(obj);\n      obj.initialize = (data2, path, key) => {\n        let innerValue = initialValue.initialize(data2, path, key);\n        obj.initialValue = innerValue;\n        return initialize(data2, path, key);\n      };\n    } else {\n      obj.initialValue = initialValue;\n    }\n    return obj;\n  };\n}\nfunction get(obj, path) {\n  return path.split(\".\").reduce((carry, segment) => carry[segment], obj);\n}\nfunction set(obj, path, value) {\n  if (typeof path === \"string\")\n    path = path.split(\".\");\n  if (path.length === 1)\n    obj[path[0]] = value;\n  else if (path.length === 0)\n    throw error;\n  else {\n    if (obj[path[0]])\n      return set(obj[path[0]], path.slice(1), value);\n    else {\n      obj[path[0]] = {};\n      return set(obj[path[0]], path.slice(1), value);\n    }\n  }\n}\n\n// packages/alpinejs/src/magics.js\nvar magics = {};\nfunction magic(name, callback) {\n  magics[name] = callback;\n}\nfunction injectMagics(obj, el) {\n  let memoizedUtilities = getUtilities(el);\n  Object.entries(magics).forEach(([name, callback]) => {\n    Object.defineProperty(obj, `$${name}`, {\n      get() {\n        return callback(el, memoizedUtilities);\n      },\n      enumerable: false\n    });\n  });\n  return obj;\n}\nfunction getUtilities(el) {\n  let [utilities, cleanup] = getElementBoundUtilities(el);\n  let utils = { interceptor, ...utilities };\n  onElRemoved(el, cleanup);\n  return utils;\n}\n\n// packages/alpinejs/src/utils/error.js\nfunction tryCatch(el, expression, callback, ...args) {\n  try {\n    return callback(...args);\n  } catch (e) {\n    handleError(e, el, expression);\n  }\n}\nfunction handleError(error2, el, expression = void 0) {\n  error2 = Object.assign(\n    error2 != null ? error2 : { message: \"No error message given.\" },\n    { el, expression }\n  );\n  console.warn(`Alpine Expression Error: ${error2.message}\n\n${expression ? 'Expression: \"' + expression + '\"\\n\\n' : \"\"}`, el);\n  setTimeout(() => {\n    throw error2;\n  }, 0);\n}\n\n// packages/alpinejs/src/evaluator.js\nvar shouldAutoEvaluateFunctions = true;\nfunction dontAutoEvaluateFunctions(callback) {\n  let cache = shouldAutoEvaluateFunctions;\n  shouldAutoEvaluateFunctions = false;\n  let result = callback();\n  shouldAutoEvaluateFunctions = cache;\n  return result;\n}\nfunction evaluate(el, expression, extras = {}) {\n  let result;\n  evaluateLater(el, expression)((value) => result = value, extras);\n  return result;\n}\nfunction evaluateLater(...args) {\n  return theEvaluatorFunction(...args);\n}\nvar theEvaluatorFunction = normalEvaluator;\nfunction setEvaluator(newEvaluator) {\n  theEvaluatorFunction = newEvaluator;\n}\nfunction normalEvaluator(el, expression) {\n  let overriddenMagics = {};\n  injectMagics(overriddenMagics, el);\n  let dataStack = [overriddenMagics, ...closestDataStack(el)];\n  let evaluator = typeof expression === \"function\" ? generateEvaluatorFromFunction(dataStack, expression) : generateEvaluatorFromString(dataStack, expression, el);\n  return tryCatch.bind(null, el, expression, evaluator);\n}\nfunction generateEvaluatorFromFunction(dataStack, func) {\n  return (receiver = () => {\n  }, { scope: scope2 = {}, params = [] } = {}) => {\n    let result = func.apply(mergeProxies([scope2, ...dataStack]), params);\n    runIfTypeOfFunction(receiver, result);\n  };\n}\nvar evaluatorMemo = {};\nfunction generateFunctionFromString(expression, el) {\n  if (evaluatorMemo[expression]) {\n    return evaluatorMemo[expression];\n  }\n  let AsyncFunction = Object.getPrototypeOf(async function() {\n  }).constructor;\n  let rightSideSafeExpression = /^[\\n\\s]*if.*\\(.*\\)/.test(expression.trim()) || /^(let|const)\\s/.test(expression.trim()) ? `(async()=>{ ${expression} })()` : expression;\n  const safeAsyncFunction = () => {\n    try {\n      let func2 = new AsyncFunction(\n        [\"__self\", \"scope\"],\n        `with (scope) { __self.result = ${rightSideSafeExpression} }; __self.finished = true; return __self.result;`\n      );\n      Object.defineProperty(func2, \"name\", {\n        value: `[Alpine] ${expression}`\n      });\n      return func2;\n    } catch (error2) {\n      handleError(error2, el, expression);\n      return Promise.resolve();\n    }\n  };\n  let func = safeAsyncFunction();\n  evaluatorMemo[expression] = func;\n  return func;\n}\nfunction generateEvaluatorFromString(dataStack, expression, el) {\n  let func = generateFunctionFromString(expression, el);\n  return (receiver = () => {\n  }, { scope: scope2 = {}, params = [] } = {}) => {\n    func.result = void 0;\n    func.finished = false;\n    let completeScope = mergeProxies([scope2, ...dataStack]);\n    if (typeof func === \"function\") {\n      let promise = func(func, completeScope).catch((error2) => handleError(error2, el, expression));\n      if (func.finished) {\n        runIfTypeOfFunction(receiver, func.result, completeScope, params, el);\n        func.result = void 0;\n      } else {\n        promise.then((result) => {\n          runIfTypeOfFunction(receiver, result, completeScope, params, el);\n        }).catch((error2) => handleError(error2, el, expression)).finally(() => func.result = void 0);\n      }\n    }\n  };\n}\nfunction runIfTypeOfFunction(receiver, value, scope2, params, el) {\n  if (shouldAutoEvaluateFunctions && typeof value === \"function\") {\n    let result = value.apply(scope2, params);\n    if (result instanceof Promise) {\n      result.then((i) => runIfTypeOfFunction(receiver, i, scope2, params)).catch((error2) => handleError(error2, el, value));\n    } else {\n      receiver(result);\n    }\n  } else if (typeof value === \"object\" && value instanceof Promise) {\n    value.then((i) => receiver(i));\n  } else {\n    receiver(value);\n  }\n}\n\n// packages/alpinejs/src/directives.js\nvar prefixAsString = \"x-\";\nfunction prefix(subject = \"\") {\n  return prefixAsString + subject;\n}\nfunction setPrefix(newPrefix) {\n  prefixAsString = newPrefix;\n}\nvar directiveHandlers = {};\nfunction directive(name, callback) {\n  directiveHandlers[name] = callback;\n  return {\n    before(directive2) {\n      if (!directiveHandlers[directive2]) {\n        console.warn(String.raw`Cannot find directive \\`${directive2}\\`. \\`${name}\\` will use the default order of execution`);\n        return;\n      }\n      const pos = directiveOrder.indexOf(directive2);\n      directiveOrder.splice(pos >= 0 ? pos : directiveOrder.indexOf(\"DEFAULT\"), 0, name);\n    }\n  };\n}\nfunction directiveExists(name) {\n  return Object.keys(directiveHandlers).includes(name);\n}\nfunction directives(el, attributes, originalAttributeOverride) {\n  attributes = Array.from(attributes);\n  if (el._x_virtualDirectives) {\n    let vAttributes = Object.entries(el._x_virtualDirectives).map(([name, value]) => ({ name, value }));\n    let staticAttributes = attributesOnly(vAttributes);\n    vAttributes = vAttributes.map((attribute) => {\n      if (staticAttributes.find((attr) => attr.name === attribute.name)) {\n        return {\n          name: `x-bind:${attribute.name}`,\n          value: `\"${attribute.value}\"`\n        };\n      }\n      return attribute;\n    });\n    attributes = attributes.concat(vAttributes);\n  }\n  let transformedAttributeMap = {};\n  let directives2 = attributes.map(toTransformedAttributes((newName, oldName) => transformedAttributeMap[newName] = oldName)).filter(outNonAlpineAttributes).map(toParsedDirectives(transformedAttributeMap, originalAttributeOverride)).sort(byPriority);\n  return directives2.map((directive2) => {\n    return getDirectiveHandler(el, directive2);\n  });\n}\nfunction attributesOnly(attributes) {\n  return Array.from(attributes).map(toTransformedAttributes()).filter((attr) => !outNonAlpineAttributes(attr));\n}\nvar isDeferringHandlers = false;\nvar directiveHandlerStacks = /* @__PURE__ */ new Map();\nvar currentHandlerStackKey = Symbol();\nfunction deferHandlingDirectives(callback) {\n  isDeferringHandlers = true;\n  let key = Symbol();\n  currentHandlerStackKey = key;\n  directiveHandlerStacks.set(key, []);\n  let flushHandlers = () => {\n    while (directiveHandlerStacks.get(key).length)\n      directiveHandlerStacks.get(key).shift()();\n    directiveHandlerStacks.delete(key);\n  };\n  let stopDeferring = () => {\n    isDeferringHandlers = false;\n    flushHandlers();\n  };\n  callback(flushHandlers);\n  stopDeferring();\n}\nfunction getElementBoundUtilities(el) {\n  let cleanups = [];\n  let cleanup = (callback) => cleanups.push(callback);\n  let [effect3, cleanupEffect] = elementBoundEffect(el);\n  cleanups.push(cleanupEffect);\n  let utilities = {\n    Alpine: alpine_default,\n    effect: effect3,\n    cleanup,\n    evaluateLater: evaluateLater.bind(evaluateLater, el),\n    evaluate: evaluate.bind(evaluate, el)\n  };\n  let doCleanup = () => cleanups.forEach((i) => i());\n  return [utilities, doCleanup];\n}\nfunction getDirectiveHandler(el, directive2) {\n  let noop = () => {\n  };\n  let handler4 = directiveHandlers[directive2.type] || noop;\n  let [utilities, cleanup] = getElementBoundUtilities(el);\n  onAttributeRemoved(el, directive2.original, cleanup);\n  let fullHandler = () => {\n    if (el._x_ignore || el._x_ignoreSelf)\n      return;\n    handler4.inline && handler4.inline(el, directive2, utilities);\n    handler4 = handler4.bind(handler4, el, directive2, utilities);\n    isDeferringHandlers ? directiveHandlerStacks.get(currentHandlerStackKey).push(handler4) : handler4();\n  };\n  fullHandler.runCleanups = cleanup;\n  return fullHandler;\n}\nvar startingWith = (subject, replacement) => ({ name, value }) => {\n  if (name.startsWith(subject))\n    name = name.replace(subject, replacement);\n  return { name, value };\n};\nvar into = (i) => i;\nfunction toTransformedAttributes(callback = () => {\n}) {\n  return ({ name, value }) => {\n    let { name: newName, value: newValue } = attributeTransformers.reduce((carry, transform) => {\n      return transform(carry);\n    }, { name, value });\n    if (newName !== name)\n      callback(newName, name);\n    return { name: newName, value: newValue };\n  };\n}\nvar attributeTransformers = [];\nfunction mapAttributes(callback) {\n  attributeTransformers.push(callback);\n}\nfunction outNonAlpineAttributes({ name }) {\n  return alpineAttributeRegex().test(name);\n}\nvar alpineAttributeRegex = () => new RegExp(`^${prefixAsString}([^:^.]+)\\\\b`);\nfunction toParsedDirectives(transformedAttributeMap, originalAttributeOverride) {\n  return ({ name, value }) => {\n    let typeMatch = name.match(alpineAttributeRegex());\n    let valueMatch = name.match(/:([a-zA-Z0-9\\-_:]+)/);\n    let modifiers = name.match(/\\.[^.\\]]+(?=[^\\]]*$)/g) || [];\n    let original = originalAttributeOverride || transformedAttributeMap[name] || name;\n    return {\n      type: typeMatch ? typeMatch[1] : null,\n      value: valueMatch ? valueMatch[1] : null,\n      modifiers: modifiers.map((i) => i.replace(\".\", \"\")),\n      expression: value,\n      original\n    };\n  };\n}\nvar DEFAULT = \"DEFAULT\";\nvar directiveOrder = [\n  \"ignore\",\n  \"ref\",\n  \"data\",\n  \"id\",\n  \"anchor\",\n  \"bind\",\n  \"init\",\n  \"for\",\n  \"model\",\n  \"modelable\",\n  \"transition\",\n  \"show\",\n  \"if\",\n  DEFAULT,\n  \"teleport\"\n];\nfunction byPriority(a, b) {\n  let typeA = directiveOrder.indexOf(a.type) === -1 ? DEFAULT : a.type;\n  let typeB = directiveOrder.indexOf(b.type) === -1 ? DEFAULT : b.type;\n  return directiveOrder.indexOf(typeA) - directiveOrder.indexOf(typeB);\n}\n\n// packages/alpinejs/src/utils/dispatch.js\nfunction dispatch(el, name, detail = {}) {\n  el.dispatchEvent(\n    new CustomEvent(name, {\n      detail,\n      bubbles: true,\n      // Allows events to pass the shadow DOM barrier.\n      composed: true,\n      cancelable: true\n    })\n  );\n}\n\n// packages/alpinejs/src/utils/walk.js\nfunction walk(el, callback) {\n  if (typeof ShadowRoot === \"function\" && el instanceof ShadowRoot) {\n    Array.from(el.children).forEach((el2) => walk(el2, callback));\n    return;\n  }\n  let skip = false;\n  callback(el, () => skip = true);\n  if (skip)\n    return;\n  let node = el.firstElementChild;\n  while (node) {\n    walk(node, callback, false);\n    node = node.nextElementSibling;\n  }\n}\n\n// packages/alpinejs/src/utils/warn.js\nfunction warn(message, ...args) {\n  console.warn(`Alpine Warning: ${message}`, ...args);\n}\n\n// packages/alpinejs/src/lifecycle.js\nvar started = false;\nfunction start() {\n  if (started)\n    warn(\"Alpine has already been initialized on this page. Calling Alpine.start() more than once can cause problems.\");\n  started = true;\n  if (!document.body)\n    warn(\"Unable to initialize. Trying to load Alpine before `<body>` is available. Did you forget to add `defer` in Alpine's `<script>` tag?\");\n  dispatch(document, \"alpine:init\");\n  dispatch(document, \"alpine:initializing\");\n  startObservingMutations();\n  onElAdded((el) => initTree(el, walk));\n  onElRemoved((el) => destroyTree(el));\n  onAttributesAdded((el, attrs) => {\n    directives(el, attrs).forEach((handle) => handle());\n  });\n  let outNestedComponents = (el) => !closestRoot(el.parentElement, true);\n  Array.from(document.querySelectorAll(allSelectors().join(\",\"))).filter(outNestedComponents).forEach((el) => {\n    initTree(el);\n  });\n  dispatch(document, \"alpine:initialized\");\n  setTimeout(() => {\n    warnAboutMissingPlugins();\n  });\n}\nvar rootSelectorCallbacks = [];\nvar initSelectorCallbacks = [];\nfunction rootSelectors() {\n  return rootSelectorCallbacks.map((fn) => fn());\n}\nfunction allSelectors() {\n  return rootSelectorCallbacks.concat(initSelectorCallbacks).map((fn) => fn());\n}\nfunction addRootSelector(selectorCallback) {\n  rootSelectorCallbacks.push(selectorCallback);\n}\nfunction addInitSelector(selectorCallback) {\n  initSelectorCallbacks.push(selectorCallback);\n}\nfunction closestRoot(el, includeInitSelectors = false) {\n  return findClosest(el, (element) => {\n    const selectors = includeInitSelectors ? allSelectors() : rootSelectors();\n    if (selectors.some((selector) => element.matches(selector)))\n      return true;\n  });\n}\nfunction findClosest(el, callback) {\n  if (!el)\n    return;\n  if (callback(el))\n    return el;\n  if (el._x_teleportBack)\n    el = el._x_teleportBack;\n  if (!el.parentElement)\n    return;\n  return findClosest(el.parentElement, callback);\n}\nfunction isRoot(el) {\n  return rootSelectors().some((selector) => el.matches(selector));\n}\nvar initInterceptors2 = [];\nfunction interceptInit(callback) {\n  initInterceptors2.push(callback);\n}\nvar markerDispenser = 1;\nfunction initTree(el, walker = walk, intercept = () => {\n}) {\n  if (findClosest(el, (i) => i._x_ignore))\n    return;\n  deferHandlingDirectives(() => {\n    walker(el, (el2, skip) => {\n      if (el2._x_marker)\n        return;\n      intercept(el2, skip);\n      initInterceptors2.forEach((i) => i(el2, skip));\n      directives(el2, el2.attributes).forEach((handle) => handle());\n      if (!el2._x_ignore)\n        el2._x_marker = markerDispenser++;\n      el2._x_ignore && skip();\n    });\n  });\n}\nfunction destroyTree(root, walker = walk) {\n  walker(root, (el) => {\n    cleanupElement(el);\n    cleanupAttributes(el);\n    delete el._x_marker;\n  });\n}\nfunction warnAboutMissingPlugins() {\n  let pluginDirectives = [\n    [\"ui\", \"dialog\", [\"[x-dialog], [x-popover]\"]],\n    [\"anchor\", \"anchor\", [\"[x-anchor]\"]],\n    [\"sort\", \"sort\", [\"[x-sort]\"]]\n  ];\n  pluginDirectives.forEach(([plugin2, directive2, selectors]) => {\n    if (directiveExists(directive2))\n      return;\n    selectors.some((selector) => {\n      if (document.querySelector(selector)) {\n        warn(`found \"${selector}\", but missing ${plugin2} plugin`);\n        return true;\n      }\n    });\n  });\n}\n\n// packages/alpinejs/src/nextTick.js\nvar tickStack = [];\nvar isHolding = false;\nfunction nextTick(callback = () => {\n}) {\n  queueMicrotask(() => {\n    isHolding || setTimeout(() => {\n      releaseNextTicks();\n    });\n  });\n  return new Promise((res) => {\n    tickStack.push(() => {\n      callback();\n      res();\n    });\n  });\n}\nfunction releaseNextTicks() {\n  isHolding = false;\n  while (tickStack.length)\n    tickStack.shift()();\n}\nfunction holdNextTicks() {\n  isHolding = true;\n}\n\n// packages/alpinejs/src/utils/classes.js\nfunction setClasses(el, value) {\n  if (Array.isArray(value)) {\n    return setClassesFromString(el, value.join(\" \"));\n  } else if (typeof value === \"object\" && value !== null) {\n    return setClassesFromObject(el, value);\n  } else if (typeof value === \"function\") {\n    return setClasses(el, value());\n  }\n  return setClassesFromString(el, value);\n}\nfunction setClassesFromString(el, classString) {\n  let split = (classString2) => classString2.split(\" \").filter(Boolean);\n  let missingClasses = (classString2) => classString2.split(\" \").filter((i) => !el.classList.contains(i)).filter(Boolean);\n  let addClassesAndReturnUndo = (classes) => {\n    el.classList.add(...classes);\n    return () => {\n      el.classList.remove(...classes);\n    };\n  };\n  classString = classString === true ? classString = \"\" : classString || \"\";\n  return addClassesAndReturnUndo(missingClasses(classString));\n}\nfunction setClassesFromObject(el, classObject) {\n  let split = (classString) => classString.split(\" \").filter(Boolean);\n  let forAdd = Object.entries(classObject).flatMap(([classString, bool]) => bool ? split(classString) : false).filter(Boolean);\n  let forRemove = Object.entries(classObject).flatMap(([classString, bool]) => !bool ? split(classString) : false).filter(Boolean);\n  let added = [];\n  let removed = [];\n  forRemove.forEach((i) => {\n    if (el.classList.contains(i)) {\n      el.classList.remove(i);\n      removed.push(i);\n    }\n  });\n  forAdd.forEach((i) => {\n    if (!el.classList.contains(i)) {\n      el.classList.add(i);\n      added.push(i);\n    }\n  });\n  return () => {\n    removed.forEach((i) => el.classList.add(i));\n    added.forEach((i) => el.classList.remove(i));\n  };\n}\n\n// packages/alpinejs/src/utils/styles.js\nfunction setStyles(el, value) {\n  if (typeof value === \"object\" && value !== null) {\n    return setStylesFromObject(el, value);\n  }\n  return setStylesFromString(el, value);\n}\nfunction setStylesFromObject(el, value) {\n  let previousStyles = {};\n  Object.entries(value).forEach(([key, value2]) => {\n    previousStyles[key] = el.style[key];\n    if (!key.startsWith(\"--\")) {\n      key = kebabCase(key);\n    }\n    el.style.setProperty(key, value2);\n  });\n  setTimeout(() => {\n    if (el.style.length === 0) {\n      el.removeAttribute(\"style\");\n    }\n  });\n  return () => {\n    setStyles(el, previousStyles);\n  };\n}\nfunction setStylesFromString(el, value) {\n  let cache = el.getAttribute(\"style\", value);\n  el.setAttribute(\"style\", value);\n  return () => {\n    el.setAttribute(\"style\", cache || \"\");\n  };\n}\nfunction kebabCase(subject) {\n  return subject.replace(/([a-z])([A-Z])/g, \"$1-$2\").toLowerCase();\n}\n\n// packages/alpinejs/src/utils/once.js\nfunction once(callback, fallback = () => {\n}) {\n  let called = false;\n  return function() {\n    if (!called) {\n      called = true;\n      callback.apply(this, arguments);\n    } else {\n      fallback.apply(this, arguments);\n    }\n  };\n}\n\n// packages/alpinejs/src/directives/x-transition.js\ndirective(\"transition\", (el, { value, modifiers, expression }, { evaluate: evaluate2 }) => {\n  if (typeof expression === \"function\")\n    expression = evaluate2(expression);\n  if (expression === false)\n    return;\n  if (!expression || typeof expression === \"boolean\") {\n    registerTransitionsFromHelper(el, modifiers, value);\n  } else {\n    registerTransitionsFromClassString(el, expression, value);\n  }\n});\nfunction registerTransitionsFromClassString(el, classString, stage) {\n  registerTransitionObject(el, setClasses, \"\");\n  let directiveStorageMap = {\n    \"enter\": (classes) => {\n      el._x_transition.enter.during = classes;\n    },\n    \"enter-start\": (classes) => {\n      el._x_transition.enter.start = classes;\n    },\n    \"enter-end\": (classes) => {\n      el._x_transition.enter.end = classes;\n    },\n    \"leave\": (classes) => {\n      el._x_transition.leave.during = classes;\n    },\n    \"leave-start\": (classes) => {\n      el._x_transition.leave.start = classes;\n    },\n    \"leave-end\": (classes) => {\n      el._x_transition.leave.end = classes;\n    }\n  };\n  directiveStorageMap[stage](classString);\n}\nfunction registerTransitionsFromHelper(el, modifiers, stage) {\n  registerTransitionObject(el, setStyles);\n  let doesntSpecify = !modifiers.includes(\"in\") && !modifiers.includes(\"out\") && !stage;\n  let transitioningIn = doesntSpecify || modifiers.includes(\"in\") || [\"enter\"].includes(stage);\n  let transitioningOut = doesntSpecify || modifiers.includes(\"out\") || [\"leave\"].includes(stage);\n  if (modifiers.includes(\"in\") && !doesntSpecify) {\n    modifiers = modifiers.filter((i, index) => index < modifiers.indexOf(\"out\"));\n  }\n  if (modifiers.includes(\"out\") && !doesntSpecify) {\n    modifiers = modifiers.filter((i, index) => index > modifiers.indexOf(\"out\"));\n  }\n  let wantsAll = !modifiers.includes(\"opacity\") && !modifiers.includes(\"scale\");\n  let wantsOpacity = wantsAll || modifiers.includes(\"opacity\");\n  let wantsScale = wantsAll || modifiers.includes(\"scale\");\n  let opacityValue = wantsOpacity ? 0 : 1;\n  let scaleValue = wantsScale ? modifierValue(modifiers, \"scale\", 95) / 100 : 1;\n  let delay = modifierValue(modifiers, \"delay\", 0) / 1e3;\n  let origin = modifierValue(modifiers, \"origin\", \"center\");\n  let property = \"opacity, transform\";\n  let durationIn = modifierValue(modifiers, \"duration\", 150) / 1e3;\n  let durationOut = modifierValue(modifiers, \"duration\", 75) / 1e3;\n  let easing = `cubic-bezier(0.4, 0.0, 0.2, 1)`;\n  if (transitioningIn) {\n    el._x_transition.enter.during = {\n      transformOrigin: origin,\n      transitionDelay: `${delay}s`,\n      transitionProperty: property,\n      transitionDuration: `${durationIn}s`,\n      transitionTimingFunction: easing\n    };\n    el._x_transition.enter.start = {\n      opacity: opacityValue,\n      transform: `scale(${scaleValue})`\n    };\n    el._x_transition.enter.end = {\n      opacity: 1,\n      transform: `scale(1)`\n    };\n  }\n  if (transitioningOut) {\n    el._x_transition.leave.during = {\n      transformOrigin: origin,\n      transitionDelay: `${delay}s`,\n      transitionProperty: property,\n      transitionDuration: `${durationOut}s`,\n      transitionTimingFunction: easing\n    };\n    el._x_transition.leave.start = {\n      opacity: 1,\n      transform: `scale(1)`\n    };\n    el._x_transition.leave.end = {\n      opacity: opacityValue,\n      transform: `scale(${scaleValue})`\n    };\n  }\n}\nfunction registerTransitionObject(el, setFunction, defaultValue = {}) {\n  if (!el._x_transition)\n    el._x_transition = {\n      enter: { during: defaultValue, start: defaultValue, end: defaultValue },\n      leave: { during: defaultValue, start: defaultValue, end: defaultValue },\n      in(before = () => {\n      }, after = () => {\n      }) {\n        transition(el, setFunction, {\n          during: this.enter.during,\n          start: this.enter.start,\n          end: this.enter.end\n        }, before, after);\n      },\n      out(before = () => {\n      }, after = () => {\n      }) {\n        transition(el, setFunction, {\n          during: this.leave.during,\n          start: this.leave.start,\n          end: this.leave.end\n        }, before, after);\n      }\n    };\n}\nwindow.Element.prototype._x_toggleAndCascadeWithTransitions = function(el, value, show, hide) {\n  const nextTick2 = document.visibilityState === \"visible\" ? requestAnimationFrame : setTimeout;\n  let clickAwayCompatibleShow = () => nextTick2(show);\n  if (value) {\n    if (el._x_transition && (el._x_transition.enter || el._x_transition.leave)) {\n      el._x_transition.enter && (Object.entries(el._x_transition.enter.during).length || Object.entries(el._x_transition.enter.start).length || Object.entries(el._x_transition.enter.end).length) ? el._x_transition.in(show) : clickAwayCompatibleShow();\n    } else {\n      el._x_transition ? el._x_transition.in(show) : clickAwayCompatibleShow();\n    }\n    return;\n  }\n  el._x_hidePromise = el._x_transition ? new Promise((resolve, reject) => {\n    el._x_transition.out(() => {\n    }, () => resolve(hide));\n    el._x_transitioning && el._x_transitioning.beforeCancel(() => reject({ isFromCancelledTransition: true }));\n  }) : Promise.resolve(hide);\n  queueMicrotask(() => {\n    let closest = closestHide(el);\n    if (closest) {\n      if (!closest._x_hideChildren)\n        closest._x_hideChildren = [];\n      closest._x_hideChildren.push(el);\n    } else {\n      nextTick2(() => {\n        let hideAfterChildren = (el2) => {\n          let carry = Promise.all([\n            el2._x_hidePromise,\n            ...(el2._x_hideChildren || []).map(hideAfterChildren)\n          ]).then(([i]) => i == null ? void 0 : i());\n          delete el2._x_hidePromise;\n          delete el2._x_hideChildren;\n          return carry;\n        };\n        hideAfterChildren(el).catch((e) => {\n          if (!e.isFromCancelledTransition)\n            throw e;\n        });\n      });\n    }\n  });\n};\nfunction closestHide(el) {\n  let parent = el.parentNode;\n  if (!parent)\n    return;\n  return parent._x_hidePromise ? parent : closestHide(parent);\n}\nfunction transition(el, setFunction, { during, start: start2, end } = {}, before = () => {\n}, after = () => {\n}) {\n  if (el._x_transitioning)\n    el._x_transitioning.cancel();\n  if (Object.keys(during).length === 0 && Object.keys(start2).length === 0 && Object.keys(end).length === 0) {\n    before();\n    after();\n    return;\n  }\n  let undoStart, undoDuring, undoEnd;\n  performTransition(el, {\n    start() {\n      undoStart = setFunction(el, start2);\n    },\n    during() {\n      undoDuring = setFunction(el, during);\n    },\n    before,\n    end() {\n      undoStart();\n      undoEnd = setFunction(el, end);\n    },\n    after,\n    cleanup() {\n      undoDuring();\n      undoEnd();\n    }\n  });\n}\nfunction performTransition(el, stages) {\n  let interrupted, reachedBefore, reachedEnd;\n  let finish = once(() => {\n    mutateDom(() => {\n      interrupted = true;\n      if (!reachedBefore)\n        stages.before();\n      if (!reachedEnd) {\n        stages.end();\n        releaseNextTicks();\n      }\n      stages.after();\n      if (el.isConnected)\n        stages.cleanup();\n      delete el._x_transitioning;\n    });\n  });\n  el._x_transitioning = {\n    beforeCancels: [],\n    beforeCancel(callback) {\n      this.beforeCancels.push(callback);\n    },\n    cancel: once(function() {\n      while (this.beforeCancels.length) {\n        this.beforeCancels.shift()();\n      }\n      ;\n      finish();\n    }),\n    finish\n  };\n  mutateDom(() => {\n    stages.start();\n    stages.during();\n  });\n  holdNextTicks();\n  requestAnimationFrame(() => {\n    if (interrupted)\n      return;\n    let duration = Number(getComputedStyle(el).transitionDuration.replace(/,.*/, \"\").replace(\"s\", \"\")) * 1e3;\n    let delay = Number(getComputedStyle(el).transitionDelay.replace(/,.*/, \"\").replace(\"s\", \"\")) * 1e3;\n    if (duration === 0)\n      duration = Number(getComputedStyle(el).animationDuration.replace(\"s\", \"\")) * 1e3;\n    mutateDom(() => {\n      stages.before();\n    });\n    reachedBefore = true;\n    requestAnimationFrame(() => {\n      if (interrupted)\n        return;\n      mutateDom(() => {\n        stages.end();\n      });\n      releaseNextTicks();\n      setTimeout(el._x_transitioning.finish, duration + delay);\n      reachedEnd = true;\n    });\n  });\n}\nfunction modifierValue(modifiers, key, fallback) {\n  if (modifiers.indexOf(key) === -1)\n    return fallback;\n  const rawValue = modifiers[modifiers.indexOf(key) + 1];\n  if (!rawValue)\n    return fallback;\n  if (key === \"scale\") {\n    if (isNaN(rawValue))\n      return fallback;\n  }\n  if (key === \"duration\" || key === \"delay\") {\n    let match = rawValue.match(/([0-9]+)ms/);\n    if (match)\n      return match[1];\n  }\n  if (key === \"origin\") {\n    if ([\"top\", \"right\", \"left\", \"center\", \"bottom\"].includes(modifiers[modifiers.indexOf(key) + 2])) {\n      return [rawValue, modifiers[modifiers.indexOf(key) + 2]].join(\" \");\n    }\n  }\n  return rawValue;\n}\n\n// packages/alpinejs/src/clone.js\nvar isCloning = false;\nfunction skipDuringClone(callback, fallback = () => {\n}) {\n  return (...args) => isCloning ? fallback(...args) : callback(...args);\n}\nfunction onlyDuringClone(callback) {\n  return (...args) => isCloning && callback(...args);\n}\nvar interceptors = [];\nfunction interceptClone(callback) {\n  interceptors.push(callback);\n}\nfunction cloneNode(from, to) {\n  interceptors.forEach((i) => i(from, to));\n  isCloning = true;\n  dontRegisterReactiveSideEffects(() => {\n    initTree(to, (el, callback) => {\n      callback(el, () => {\n      });\n    });\n  });\n  isCloning = false;\n}\nvar isCloningLegacy = false;\nfunction clone(oldEl, newEl) {\n  if (!newEl._x_dataStack)\n    newEl._x_dataStack = oldEl._x_dataStack;\n  isCloning = true;\n  isCloningLegacy = true;\n  dontRegisterReactiveSideEffects(() => {\n    cloneTree(newEl);\n  });\n  isCloning = false;\n  isCloningLegacy = false;\n}\nfunction cloneTree(el) {\n  let hasRunThroughFirstEl = false;\n  let shallowWalker = (el2, callback) => {\n    walk(el2, (el3, skip) => {\n      if (hasRunThroughFirstEl && isRoot(el3))\n        return skip();\n      hasRunThroughFirstEl = true;\n      callback(el3, skip);\n    });\n  };\n  initTree(el, shallowWalker);\n}\nfunction dontRegisterReactiveSideEffects(callback) {\n  let cache = effect;\n  overrideEffect((callback2, el) => {\n    let storedEffect = cache(callback2);\n    release(storedEffect);\n    return () => {\n    };\n  });\n  callback();\n  overrideEffect(cache);\n}\n\n// packages/alpinejs/src/utils/bind.js\nfunction bind(el, name, value, modifiers = []) {\n  if (!el._x_bindings)\n    el._x_bindings = reactive({});\n  el._x_bindings[name] = value;\n  name = modifiers.includes(\"camel\") ? camelCase(name) : name;\n  switch (name) {\n    case \"value\":\n      bindInputValue(el, value);\n      break;\n    case \"style\":\n      bindStyles(el, value);\n      break;\n    case \"class\":\n      bindClasses(el, value);\n      break;\n    case \"selected\":\n    case \"checked\":\n      bindAttributeAndProperty(el, name, value);\n      break;\n    default:\n      bindAttribute(el, name, value);\n      break;\n  }\n}\nfunction bindInputValue(el, value) {\n  if (isRadio(el)) {\n    if (el.attributes.value === void 0) {\n      el.value = value;\n    }\n    if (window.fromModel) {\n      if (typeof value === \"boolean\") {\n        el.checked = safeParseBoolean(el.value) === value;\n      } else {\n        el.checked = checkedAttrLooseCompare(el.value, value);\n      }\n    }\n  } else if (isCheckbox(el)) {\n    if (Number.isInteger(value)) {\n      el.value = value;\n    } else if (!Array.isArray(value) && typeof value !== \"boolean\" && ![null, void 0].includes(value)) {\n      el.value = String(value);\n    } else {\n      if (Array.isArray(value)) {\n        el.checked = value.some((val) => checkedAttrLooseCompare(val, el.value));\n      } else {\n        el.checked = !!value;\n      }\n    }\n  } else if (el.tagName === \"SELECT\") {\n    updateSelect(el, value);\n  } else {\n    if (el.value === value)\n      return;\n    el.value = value === void 0 ? \"\" : value;\n  }\n}\nfunction bindClasses(el, value) {\n  if (el._x_undoAddedClasses)\n    el._x_undoAddedClasses();\n  el._x_undoAddedClasses = setClasses(el, value);\n}\nfunction bindStyles(el, value) {\n  if (el._x_undoAddedStyles)\n    el._x_undoAddedStyles();\n  el._x_undoAddedStyles = setStyles(el, value);\n}\nfunction bindAttributeAndProperty(el, name, value) {\n  bindAttribute(el, name, value);\n  setPropertyIfChanged(el, name, value);\n}\nfunction bindAttribute(el, name, value) {\n  if ([null, void 0, false].includes(value) && attributeShouldntBePreservedIfFalsy(name)) {\n    el.removeAttribute(name);\n  } else {\n    if (isBooleanAttr(name))\n      value = name;\n    setIfChanged(el, name, value);\n  }\n}\nfunction setIfChanged(el, attrName, value) {\n  if (el.getAttribute(attrName) != value) {\n    el.setAttribute(attrName, value);\n  }\n}\nfunction setPropertyIfChanged(el, propName, value) {\n  if (el[propName] !== value) {\n    el[propName] = value;\n  }\n}\nfunction updateSelect(el, value) {\n  const arrayWrappedValue = [].concat(value).map((value2) => {\n    return value2 + \"\";\n  });\n  Array.from(el.options).forEach((option) => {\n    option.selected = arrayWrappedValue.includes(option.value);\n  });\n}\nfunction camelCase(subject) {\n  return subject.toLowerCase().replace(/-(\\w)/g, (match, char) => char.toUpperCase());\n}\nfunction checkedAttrLooseCompare(valueA, valueB) {\n  return valueA == valueB;\n}\nfunction safeParseBoolean(rawValue) {\n  if ([1, \"1\", \"true\", \"on\", \"yes\", true].includes(rawValue)) {\n    return true;\n  }\n  if ([0, \"0\", \"false\", \"off\", \"no\", false].includes(rawValue)) {\n    return false;\n  }\n  return rawValue ? Boolean(rawValue) : null;\n}\nvar booleanAttributes = /* @__PURE__ */ new Set([\n  \"allowfullscreen\",\n  \"async\",\n  \"autofocus\",\n  \"autoplay\",\n  \"checked\",\n  \"controls\",\n  \"default\",\n  \"defer\",\n  \"disabled\",\n  \"formnovalidate\",\n  \"inert\",\n  \"ismap\",\n  \"itemscope\",\n  \"loop\",\n  \"multiple\",\n  \"muted\",\n  \"nomodule\",\n  \"novalidate\",\n  \"open\",\n  \"playsinline\",\n  \"readonly\",\n  \"required\",\n  \"reversed\",\n  \"selected\",\n  \"shadowrootclonable\",\n  \"shadowrootdelegatesfocus\",\n  \"shadowrootserializable\"\n]);\nfunction isBooleanAttr(attrName) {\n  return booleanAttributes.has(attrName);\n}\nfunction attributeShouldntBePreservedIfFalsy(name) {\n  return ![\"aria-pressed\", \"aria-checked\", \"aria-expanded\", \"aria-selected\"].includes(name);\n}\nfunction getBinding(el, name, fallback) {\n  if (el._x_bindings && el._x_bindings[name] !== void 0)\n    return el._x_bindings[name];\n  return getAttributeBinding(el, name, fallback);\n}\nfunction extractProp(el, name, fallback, extract = true) {\n  if (el._x_bindings && el._x_bindings[name] !== void 0)\n    return el._x_bindings[name];\n  if (el._x_inlineBindings && el._x_inlineBindings[name] !== void 0) {\n    let binding = el._x_inlineBindings[name];\n    binding.extract = extract;\n    return dontAutoEvaluateFunctions(() => {\n      return evaluate(el, binding.expression);\n    });\n  }\n  return getAttributeBinding(el, name, fallback);\n}\nfunction getAttributeBinding(el, name, fallback) {\n  let attr = el.getAttribute(name);\n  if (attr === null)\n    return typeof fallback === \"function\" ? fallback() : fallback;\n  if (attr === \"\")\n    return true;\n  if (isBooleanAttr(name)) {\n    return !![name, \"true\"].includes(attr);\n  }\n  return attr;\n}\nfunction isCheckbox(el) {\n  return el.type === \"checkbox\" || el.localName === \"ui-checkbox\" || el.localName === \"ui-switch\";\n}\nfunction isRadio(el) {\n  return el.type === \"radio\" || el.localName === \"ui-radio\";\n}\n\n// packages/alpinejs/src/utils/debounce.js\nfunction debounce(func, wait) {\n  var timeout;\n  return function() {\n    var context = this, args = arguments;\n    var later = function() {\n      timeout = null;\n      func.apply(context, args);\n    };\n    clearTimeout(timeout);\n    timeout = setTimeout(later, wait);\n  };\n}\n\n// packages/alpinejs/src/utils/throttle.js\nfunction throttle(func, limit) {\n  let inThrottle;\n  return function() {\n    let context = this, args = arguments;\n    if (!inThrottle) {\n      func.apply(context, args);\n      inThrottle = true;\n      setTimeout(() => inThrottle = false, limit);\n    }\n  };\n}\n\n// packages/alpinejs/src/entangle.js\nfunction entangle({ get: outerGet, set: outerSet }, { get: innerGet, set: innerSet }) {\n  let firstRun = true;\n  let outerHash;\n  let innerHash;\n  let reference = effect(() => {\n    let outer = outerGet();\n    let inner = innerGet();\n    if (firstRun) {\n      innerSet(cloneIfObject(outer));\n      firstRun = false;\n    } else {\n      let outerHashLatest = JSON.stringify(outer);\n      let innerHashLatest = JSON.stringify(inner);\n      if (outerHashLatest !== outerHash) {\n        innerSet(cloneIfObject(outer));\n      } else if (outerHashLatest !== innerHashLatest) {\n        outerSet(cloneIfObject(inner));\n      } else {\n      }\n    }\n    outerHash = JSON.stringify(outerGet());\n    innerHash = JSON.stringify(innerGet());\n  });\n  return () => {\n    release(reference);\n  };\n}\nfunction cloneIfObject(value) {\n  return typeof value === \"object\" ? JSON.parse(JSON.stringify(value)) : value;\n}\n\n// packages/alpinejs/src/plugin.js\nfunction plugin(callback) {\n  let callbacks = Array.isArray(callback) ? callback : [callback];\n  callbacks.forEach((i) => i(alpine_default));\n}\n\n// packages/alpinejs/src/store.js\nvar stores = {};\nvar isReactive = false;\nfunction store(name, value) {\n  if (!isReactive) {\n    stores = reactive(stores);\n    isReactive = true;\n  }\n  if (value === void 0) {\n    return stores[name];\n  }\n  stores[name] = value;\n  initInterceptors(stores[name]);\n  if (typeof value === \"object\" && value !== null && value.hasOwnProperty(\"init\") && typeof value.init === \"function\") {\n    stores[name].init();\n  }\n}\nfunction getStores() {\n  return stores;\n}\n\n// packages/alpinejs/src/binds.js\nvar binds = {};\nfunction bind2(name, bindings) {\n  let getBindings = typeof bindings !== \"function\" ? () => bindings : bindings;\n  if (name instanceof Element) {\n    return applyBindingsObject(name, getBindings());\n  } else {\n    binds[name] = getBindings;\n  }\n  return () => {\n  };\n}\nfunction injectBindingProviders(obj) {\n  Object.entries(binds).forEach(([name, callback]) => {\n    Object.defineProperty(obj, name, {\n      get() {\n        return (...args) => {\n          return callback(...args);\n        };\n      }\n    });\n  });\n  return obj;\n}\nfunction applyBindingsObject(el, obj, original) {\n  let cleanupRunners = [];\n  while (cleanupRunners.length)\n    cleanupRunners.pop()();\n  let attributes = Object.entries(obj).map(([name, value]) => ({ name, value }));\n  let staticAttributes = attributesOnly(attributes);\n  attributes = attributes.map((attribute) => {\n    if (staticAttributes.find((attr) => attr.name === attribute.name)) {\n      return {\n        name: `x-bind:${attribute.name}`,\n        value: `\"${attribute.value}\"`\n      };\n    }\n    return attribute;\n  });\n  directives(el, attributes, original).map((handle) => {\n    cleanupRunners.push(handle.runCleanups);\n    handle();\n  });\n  return () => {\n    while (cleanupRunners.length)\n      cleanupRunners.pop()();\n  };\n}\n\n// packages/alpinejs/src/datas.js\nvar datas = {};\nfunction data(name, callback) {\n  datas[name] = callback;\n}\nfunction injectDataProviders(obj, context) {\n  Object.entries(datas).forEach(([name, callback]) => {\n    Object.defineProperty(obj, name, {\n      get() {\n        return (...args) => {\n          return callback.bind(context)(...args);\n        };\n      },\n      enumerable: false\n    });\n  });\n  return obj;\n}\n\n// packages/alpinejs/src/alpine.js\nvar Alpine = {\n  get reactive() {\n    return reactive;\n  },\n  get release() {\n    return release;\n  },\n  get effect() {\n    return effect;\n  },\n  get raw() {\n    return raw;\n  },\n  version: \"3.14.8\",\n  flushAndStopDeferringMutations,\n  dontAutoEvaluateFunctions,\n  disableEffectScheduling,\n  startObservingMutations,\n  stopObservingMutations,\n  setReactivityEngine,\n  onAttributeRemoved,\n  onAttributesAdded,\n  closestDataStack,\n  skipDuringClone,\n  onlyDuringClone,\n  addRootSelector,\n  addInitSelector,\n  interceptClone,\n  addScopeToNode,\n  deferMutations,\n  mapAttributes,\n  evaluateLater,\n  interceptInit,\n  setEvaluator,\n  mergeProxies,\n  extractProp,\n  findClosest,\n  onElRemoved,\n  closestRoot,\n  destroyTree,\n  interceptor,\n  // INTERNAL: not public API and is subject to change without major release.\n  transition,\n  // INTERNAL\n  setStyles,\n  // INTERNAL\n  mutateDom,\n  directive,\n  entangle,\n  throttle,\n  debounce,\n  evaluate,\n  initTree,\n  nextTick,\n  prefixed: prefix,\n  prefix: setPrefix,\n  plugin,\n  magic,\n  store,\n  start,\n  clone,\n  // INTERNAL\n  cloneNode,\n  // INTERNAL\n  bound: getBinding,\n  $data: scope,\n  watch,\n  walk,\n  data,\n  bind: bind2\n};\nvar alpine_default = Alpine;\n\n// packages/alpinejs/src/index.js\nvar import_reactivity10 = __toESM(require_reactivity());\n\n// packages/alpinejs/src/magics/$nextTick.js\nmagic(\"nextTick\", () => nextTick);\n\n// packages/alpinejs/src/magics/$dispatch.js\nmagic(\"dispatch\", (el) => dispatch.bind(dispatch, el));\n\n// packages/alpinejs/src/magics/$watch.js\nmagic(\"watch\", (el, { evaluateLater: evaluateLater2, cleanup }) => (key, callback) => {\n  let evaluate2 = evaluateLater2(key);\n  let getter = () => {\n    let value;\n    evaluate2((i) => value = i);\n    return value;\n  };\n  let unwatch = watch(getter, callback);\n  cleanup(unwatch);\n});\n\n// packages/alpinejs/src/magics/$store.js\nmagic(\"store\", getStores);\n\n// packages/alpinejs/src/magics/$data.js\nmagic(\"data\", (el) => scope(el));\n\n// packages/alpinejs/src/magics/$root.js\nmagic(\"root\", (el) => closestRoot(el));\n\n// packages/alpinejs/src/magics/$refs.js\nmagic(\"refs\", (el) => {\n  if (el._x_refs_proxy)\n    return el._x_refs_proxy;\n  el._x_refs_proxy = mergeProxies(getArrayOfRefObject(el));\n  return el._x_refs_proxy;\n});\nfunction getArrayOfRefObject(el) {\n  let refObjects = [];\n  findClosest(el, (i) => {\n    if (i._x_refs)\n      refObjects.push(i._x_refs);\n  });\n  return refObjects;\n}\n\n// packages/alpinejs/src/ids.js\nvar globalIdMemo = {};\nfunction findAndIncrementId(name) {\n  if (!globalIdMemo[name])\n    globalIdMemo[name] = 0;\n  return ++globalIdMemo[name];\n}\nfunction closestIdRoot(el, name) {\n  return findClosest(el, (element) => {\n    if (element._x_ids && element._x_ids[name])\n      return true;\n  });\n}\nfunction setIdRoot(el, name) {\n  if (!el._x_ids)\n    el._x_ids = {};\n  if (!el._x_ids[name])\n    el._x_ids[name] = findAndIncrementId(name);\n}\n\n// packages/alpinejs/src/magics/$id.js\nmagic(\"id\", (el, { cleanup }) => (name, key = null) => {\n  let cacheKey = `${name}${key ? `-${key}` : \"\"}`;\n  return cacheIdByNameOnElement(el, cacheKey, cleanup, () => {\n    let root = closestIdRoot(el, name);\n    let id = root ? root._x_ids[name] : findAndIncrementId(name);\n    return key ? `${name}-${id}-${key}` : `${name}-${id}`;\n  });\n});\ninterceptClone((from, to) => {\n  if (from._x_id) {\n    to._x_id = from._x_id;\n  }\n});\nfunction cacheIdByNameOnElement(el, cacheKey, cleanup, callback) {\n  if (!el._x_id)\n    el._x_id = {};\n  if (el._x_id[cacheKey])\n    return el._x_id[cacheKey];\n  let output = callback();\n  el._x_id[cacheKey] = output;\n  cleanup(() => {\n    delete el._x_id[cacheKey];\n  });\n  return output;\n}\n\n// packages/alpinejs/src/magics/$el.js\nmagic(\"el\", (el) => el);\n\n// packages/alpinejs/src/magics/index.js\nwarnMissingPluginMagic(\"Focus\", \"focus\", \"focus\");\nwarnMissingPluginMagic(\"Persist\", \"persist\", \"persist\");\nfunction warnMissingPluginMagic(name, magicName, slug) {\n  magic(magicName, (el) => warn(`You can't use [$${magicName}] without first installing the \"${name}\" plugin here: https://alpinejs.dev/plugins/${slug}`, el));\n}\n\n// packages/alpinejs/src/directives/x-modelable.js\ndirective(\"modelable\", (el, { expression }, { effect: effect3, evaluateLater: evaluateLater2, cleanup }) => {\n  let func = evaluateLater2(expression);\n  let innerGet = () => {\n    let result;\n    func((i) => result = i);\n    return result;\n  };\n  let evaluateInnerSet = evaluateLater2(`${expression} = __placeholder`);\n  let innerSet = (val) => evaluateInnerSet(() => {\n  }, { scope: { \"__placeholder\": val } });\n  let initialValue = innerGet();\n  innerSet(initialValue);\n  queueMicrotask(() => {\n    if (!el._x_model)\n      return;\n    el._x_removeModelListeners[\"default\"]();\n    let outerGet = el._x_model.get;\n    let outerSet = el._x_model.set;\n    let releaseEntanglement = entangle(\n      {\n        get() {\n          return outerGet();\n        },\n        set(value) {\n          outerSet(value);\n        }\n      },\n      {\n        get() {\n          return innerGet();\n        },\n        set(value) {\n          innerSet(value);\n        }\n      }\n    );\n    cleanup(releaseEntanglement);\n  });\n});\n\n// packages/alpinejs/src/directives/x-teleport.js\ndirective(\"teleport\", (el, { modifiers, expression }, { cleanup }) => {\n  if (el.tagName.toLowerCase() !== \"template\")\n    warn(\"x-teleport can only be used on a <template> tag\", el);\n  let target = getTarget(expression);\n  let clone2 = el.content.cloneNode(true).firstElementChild;\n  el._x_teleport = clone2;\n  clone2._x_teleportBack = el;\n  el.setAttribute(\"data-teleport-template\", true);\n  clone2.setAttribute(\"data-teleport-target\", true);\n  if (el._x_forwardEvents) {\n    el._x_forwardEvents.forEach((eventName) => {\n      clone2.addEventListener(eventName, (e) => {\n        e.stopPropagation();\n        el.dispatchEvent(new e.constructor(e.type, e));\n      });\n    });\n  }\n  addScopeToNode(clone2, {}, el);\n  let placeInDom = (clone3, target2, modifiers2) => {\n    if (modifiers2.includes(\"prepend\")) {\n      target2.parentNode.insertBefore(clone3, target2);\n    } else if (modifiers2.includes(\"append\")) {\n      target2.parentNode.insertBefore(clone3, target2.nextSibling);\n    } else {\n      target2.appendChild(clone3);\n    }\n  };\n  mutateDom(() => {\n    placeInDom(clone2, target, modifiers);\n    skipDuringClone(() => {\n      initTree(clone2);\n    })();\n  });\n  el._x_teleportPutBack = () => {\n    let target2 = getTarget(expression);\n    mutateDom(() => {\n      placeInDom(el._x_teleport, target2, modifiers);\n    });\n  };\n  cleanup(\n    () => mutateDom(() => {\n      clone2.remove();\n      destroyTree(clone2);\n    })\n  );\n});\nvar teleportContainerDuringClone = document.createElement(\"div\");\nfunction getTarget(expression) {\n  let target = skipDuringClone(() => {\n    return document.querySelector(expression);\n  }, () => {\n    return teleportContainerDuringClone;\n  })();\n  if (!target)\n    warn(`Cannot find x-teleport element for selector: \"${expression}\"`);\n  return target;\n}\n\n// packages/alpinejs/src/directives/x-ignore.js\nvar handler = () => {\n};\nhandler.inline = (el, { modifiers }, { cleanup }) => {\n  modifiers.includes(\"self\") ? el._x_ignoreSelf = true : el._x_ignore = true;\n  cleanup(() => {\n    modifiers.includes(\"self\") ? delete el._x_ignoreSelf : delete el._x_ignore;\n  });\n};\ndirective(\"ignore\", handler);\n\n// packages/alpinejs/src/directives/x-effect.js\ndirective(\"effect\", skipDuringClone((el, { expression }, { effect: effect3 }) => {\n  effect3(evaluateLater(el, expression));\n}));\n\n// packages/alpinejs/src/utils/on.js\nfunction on(el, event, modifiers, callback) {\n  let listenerTarget = el;\n  let handler4 = (e) => callback(e);\n  let options = {};\n  let wrapHandler = (callback2, wrapper) => (e) => wrapper(callback2, e);\n  if (modifiers.includes(\"dot\"))\n    event = dotSyntax(event);\n  if (modifiers.includes(\"camel\"))\n    event = camelCase2(event);\n  if (modifiers.includes(\"passive\"))\n    options.passive = true;\n  if (modifiers.includes(\"capture\"))\n    options.capture = true;\n  if (modifiers.includes(\"window\"))\n    listenerTarget = window;\n  if (modifiers.includes(\"document\"))\n    listenerTarget = document;\n  if (modifiers.includes(\"debounce\")) {\n    let nextModifier = modifiers[modifiers.indexOf(\"debounce\") + 1] || \"invalid-wait\";\n    let wait = isNumeric(nextModifier.split(\"ms\")[0]) ? Number(nextModifier.split(\"ms\")[0]) : 250;\n    handler4 = debounce(handler4, wait);\n  }\n  if (modifiers.includes(\"throttle\")) {\n    let nextModifier = modifiers[modifiers.indexOf(\"throttle\") + 1] || \"invalid-wait\";\n    let wait = isNumeric(nextModifier.split(\"ms\")[0]) ? Number(nextModifier.split(\"ms\")[0]) : 250;\n    handler4 = throttle(handler4, wait);\n  }\n  if (modifiers.includes(\"prevent\"))\n    handler4 = wrapHandler(handler4, (next, e) => {\n      e.preventDefault();\n      next(e);\n    });\n  if (modifiers.includes(\"stop\"))\n    handler4 = wrapHandler(handler4, (next, e) => {\n      e.stopPropagation();\n      next(e);\n    });\n  if (modifiers.includes(\"once\")) {\n    handler4 = wrapHandler(handler4, (next, e) => {\n      next(e);\n      listenerTarget.removeEventListener(event, handler4, options);\n    });\n  }\n  if (modifiers.includes(\"away\") || modifiers.includes(\"outside\")) {\n    listenerTarget = document;\n    handler4 = wrapHandler(handler4, (next, e) => {\n      if (el.contains(e.target))\n        return;\n      if (e.target.isConnected === false)\n        return;\n      if (el.offsetWidth < 1 && el.offsetHeight < 1)\n        return;\n      if (el._x_isShown === false)\n        return;\n      next(e);\n    });\n  }\n  if (modifiers.includes(\"self\"))\n    handler4 = wrapHandler(handler4, (next, e) => {\n      e.target === el && next(e);\n    });\n  if (isKeyEvent(event) || isClickEvent(event)) {\n    handler4 = wrapHandler(handler4, (next, e) => {\n      if (isListeningForASpecificKeyThatHasntBeenPressed(e, modifiers)) {\n        return;\n      }\n      next(e);\n    });\n  }\n  listenerTarget.addEventListener(event, handler4, options);\n  return () => {\n    listenerTarget.removeEventListener(event, handler4, options);\n  };\n}\nfunction dotSyntax(subject) {\n  return subject.replace(/-/g, \".\");\n}\nfunction camelCase2(subject) {\n  return subject.toLowerCase().replace(/-(\\w)/g, (match, char) => char.toUpperCase());\n}\nfunction isNumeric(subject) {\n  return !Array.isArray(subject) && !isNaN(subject);\n}\nfunction kebabCase2(subject) {\n  if ([\" \", \"_\"].includes(\n    subject\n  ))\n    return subject;\n  return subject.replace(/([a-z])([A-Z])/g, \"$1-$2\").replace(/[_\\s]/, \"-\").toLowerCase();\n}\nfunction isKeyEvent(event) {\n  return [\"keydown\", \"keyup\"].includes(event);\n}\nfunction isClickEvent(event) {\n  return [\"contextmenu\", \"click\", \"mouse\"].some((i) => event.includes(i));\n}\nfunction isListeningForASpecificKeyThatHasntBeenPressed(e, modifiers) {\n  let keyModifiers = modifiers.filter((i) => {\n    return ![\"window\", \"document\", \"prevent\", \"stop\", \"once\", \"capture\", \"self\", \"away\", \"outside\", \"passive\"].includes(i);\n  });\n  if (keyModifiers.includes(\"debounce\")) {\n    let debounceIndex = keyModifiers.indexOf(\"debounce\");\n    keyModifiers.splice(debounceIndex, isNumeric((keyModifiers[debounceIndex + 1] || \"invalid-wait\").split(\"ms\")[0]) ? 2 : 1);\n  }\n  if (keyModifiers.includes(\"throttle\")) {\n    let debounceIndex = keyModifiers.indexOf(\"throttle\");\n    keyModifiers.splice(debounceIndex, isNumeric((keyModifiers[debounceIndex + 1] || \"invalid-wait\").split(\"ms\")[0]) ? 2 : 1);\n  }\n  if (keyModifiers.length === 0)\n    return false;\n  if (keyModifiers.length === 1 && keyToModifiers(e.key).includes(keyModifiers[0]))\n    return false;\n  const systemKeyModifiers = [\"ctrl\", \"shift\", \"alt\", \"meta\", \"cmd\", \"super\"];\n  const selectedSystemKeyModifiers = systemKeyModifiers.filter((modifier) => keyModifiers.includes(modifier));\n  keyModifiers = keyModifiers.filter((i) => !selectedSystemKeyModifiers.includes(i));\n  if (selectedSystemKeyModifiers.length > 0) {\n    const activelyPressedKeyModifiers = selectedSystemKeyModifiers.filter((modifier) => {\n      if (modifier === \"cmd\" || modifier === \"super\")\n        modifier = \"meta\";\n      return e[`${modifier}Key`];\n    });\n    if (activelyPressedKeyModifiers.length === selectedSystemKeyModifiers.length) {\n      if (isClickEvent(e.type))\n        return false;\n      if (keyToModifiers(e.key).includes(keyModifiers[0]))\n        return false;\n    }\n  }\n  return true;\n}\nfunction keyToModifiers(key) {\n  if (!key)\n    return [];\n  key = kebabCase2(key);\n  let modifierToKeyMap = {\n    \"ctrl\": \"control\",\n    \"slash\": \"/\",\n    \"space\": \" \",\n    \"spacebar\": \" \",\n    \"cmd\": \"meta\",\n    \"esc\": \"escape\",\n    \"up\": \"arrow-up\",\n    \"down\": \"arrow-down\",\n    \"left\": \"arrow-left\",\n    \"right\": \"arrow-right\",\n    \"period\": \".\",\n    \"comma\": \",\",\n    \"equal\": \"=\",\n    \"minus\": \"-\",\n    \"underscore\": \"_\"\n  };\n  modifierToKeyMap[key] = key;\n  return Object.keys(modifierToKeyMap).map((modifier) => {\n    if (modifierToKeyMap[modifier] === key)\n      return modifier;\n  }).filter((modifier) => modifier);\n}\n\n// packages/alpinejs/src/directives/x-model.js\ndirective(\"model\", (el, { modifiers, expression }, { effect: effect3, cleanup }) => {\n  let scopeTarget = el;\n  if (modifiers.includes(\"parent\")) {\n    scopeTarget = el.parentNode;\n  }\n  let evaluateGet = evaluateLater(scopeTarget, expression);\n  let evaluateSet;\n  if (typeof expression === \"string\") {\n    evaluateSet = evaluateLater(scopeTarget, `${expression} = __placeholder`);\n  } else if (typeof expression === \"function\" && typeof expression() === \"string\") {\n    evaluateSet = evaluateLater(scopeTarget, `${expression()} = __placeholder`);\n  } else {\n    evaluateSet = () => {\n    };\n  }\n  let getValue = () => {\n    let result;\n    evaluateGet((value) => result = value);\n    return isGetterSetter(result) ? result.get() : result;\n  };\n  let setValue = (value) => {\n    let result;\n    evaluateGet((value2) => result = value2);\n    if (isGetterSetter(result)) {\n      result.set(value);\n    } else {\n      evaluateSet(() => {\n      }, {\n        scope: { \"__placeholder\": value }\n      });\n    }\n  };\n  if (typeof expression === \"string\" && el.type === \"radio\") {\n    mutateDom(() => {\n      if (!el.hasAttribute(\"name\"))\n        el.setAttribute(\"name\", expression);\n    });\n  }\n  var event = el.tagName.toLowerCase() === \"select\" || [\"checkbox\", \"radio\"].includes(el.type) || modifiers.includes(\"lazy\") ? \"change\" : \"input\";\n  let removeListener = isCloning ? () => {\n  } : on(el, event, modifiers, (e) => {\n    setValue(getInputValue(el, modifiers, e, getValue()));\n  });\n  if (modifiers.includes(\"fill\")) {\n    if ([void 0, null, \"\"].includes(getValue()) || isCheckbox(el) && Array.isArray(getValue()) || el.tagName.toLowerCase() === \"select\" && el.multiple) {\n      setValue(\n        getInputValue(el, modifiers, { target: el }, getValue())\n      );\n    }\n  }\n  if (!el._x_removeModelListeners)\n    el._x_removeModelListeners = {};\n  el._x_removeModelListeners[\"default\"] = removeListener;\n  cleanup(() => el._x_removeModelListeners[\"default\"]());\n  if (el.form) {\n    let removeResetListener = on(el.form, \"reset\", [], (e) => {\n      nextTick(() => el._x_model && el._x_model.set(getInputValue(el, modifiers, { target: el }, getValue())));\n    });\n    cleanup(() => removeResetListener());\n  }\n  el._x_model = {\n    get() {\n      return getValue();\n    },\n    set(value) {\n      setValue(value);\n    }\n  };\n  el._x_forceModelUpdate = (value) => {\n    if (value === void 0 && typeof expression === \"string\" && expression.match(/\\./))\n      value = \"\";\n    window.fromModel = true;\n    mutateDom(() => bind(el, \"value\", value));\n    delete window.fromModel;\n  };\n  effect3(() => {\n    let value = getValue();\n    if (modifiers.includes(\"unintrusive\") && document.activeElement.isSameNode(el))\n      return;\n    el._x_forceModelUpdate(value);\n  });\n});\nfunction getInputValue(el, modifiers, event, currentValue) {\n  return mutateDom(() => {\n    if (event instanceof CustomEvent && event.detail !== void 0)\n      return event.detail !== null && event.detail !== void 0 ? event.detail : event.target.value;\n    else if (isCheckbox(el)) {\n      if (Array.isArray(currentValue)) {\n        let newValue = null;\n        if (modifiers.includes(\"number\")) {\n          newValue = safeParseNumber(event.target.value);\n        } else if (modifiers.includes(\"boolean\")) {\n          newValue = safeParseBoolean(event.target.value);\n        } else {\n          newValue = event.target.value;\n        }\n        return event.target.checked ? currentValue.includes(newValue) ? currentValue : currentValue.concat([newValue]) : currentValue.filter((el2) => !checkedAttrLooseCompare2(el2, newValue));\n      } else {\n        return event.target.checked;\n      }\n    } else if (el.tagName.toLowerCase() === \"select\" && el.multiple) {\n      if (modifiers.includes(\"number\")) {\n        return Array.from(event.target.selectedOptions).map((option) => {\n          let rawValue = option.value || option.text;\n          return safeParseNumber(rawValue);\n        });\n      } else if (modifiers.includes(\"boolean\")) {\n        return Array.from(event.target.selectedOptions).map((option) => {\n          let rawValue = option.value || option.text;\n          return safeParseBoolean(rawValue);\n        });\n      }\n      return Array.from(event.target.selectedOptions).map((option) => {\n        return option.value || option.text;\n      });\n    } else {\n      let newValue;\n      if (isRadio(el)) {\n        if (event.target.checked) {\n          newValue = event.target.value;\n        } else {\n          newValue = currentValue;\n        }\n      } else {\n        newValue = event.target.value;\n      }\n      if (modifiers.includes(\"number\")) {\n        return safeParseNumber(newValue);\n      } else if (modifiers.includes(\"boolean\")) {\n        return safeParseBoolean(newValue);\n      } else if (modifiers.includes(\"trim\")) {\n        return newValue.trim();\n      } else {\n        return newValue;\n      }\n    }\n  });\n}\nfunction safeParseNumber(rawValue) {\n  let number = rawValue ? parseFloat(rawValue) : null;\n  return isNumeric2(number) ? number : rawValue;\n}\nfunction checkedAttrLooseCompare2(valueA, valueB) {\n  return valueA == valueB;\n}\nfunction isNumeric2(subject) {\n  return !Array.isArray(subject) && !isNaN(subject);\n}\nfunction isGetterSetter(value) {\n  return value !== null && typeof value === \"object\" && typeof value.get === \"function\" && typeof value.set === \"function\";\n}\n\n// packages/alpinejs/src/directives/x-cloak.js\ndirective(\"cloak\", (el) => queueMicrotask(() => mutateDom(() => el.removeAttribute(prefix(\"cloak\")))));\n\n// packages/alpinejs/src/directives/x-init.js\naddInitSelector(() => `[${prefix(\"init\")}]`);\ndirective(\"init\", skipDuringClone((el, { expression }, { evaluate: evaluate2 }) => {\n  if (typeof expression === \"string\") {\n    return !!expression.trim() && evaluate2(expression, {}, false);\n  }\n  return evaluate2(expression, {}, false);\n}));\n\n// packages/alpinejs/src/directives/x-text.js\ndirective(\"text\", (el, { expression }, { effect: effect3, evaluateLater: evaluateLater2 }) => {\n  let evaluate2 = evaluateLater2(expression);\n  effect3(() => {\n    evaluate2((value) => {\n      mutateDom(() => {\n        el.textContent = value;\n      });\n    });\n  });\n});\n\n// packages/alpinejs/src/directives/x-html.js\ndirective(\"html\", (el, { expression }, { effect: effect3, evaluateLater: evaluateLater2 }) => {\n  let evaluate2 = evaluateLater2(expression);\n  effect3(() => {\n    evaluate2((value) => {\n      mutateDom(() => {\n        el.innerHTML = value;\n        el._x_ignoreSelf = true;\n        initTree(el);\n        delete el._x_ignoreSelf;\n      });\n    });\n  });\n});\n\n// packages/alpinejs/src/directives/x-bind.js\nmapAttributes(startingWith(\":\", into(prefix(\"bind:\"))));\nvar handler2 = (el, { value, modifiers, expression, original }, { effect: effect3, cleanup }) => {\n  if (!value) {\n    let bindingProviders = {};\n    injectBindingProviders(bindingProviders);\n    let getBindings = evaluateLater(el, expression);\n    getBindings((bindings) => {\n      applyBindingsObject(el, bindings, original);\n    }, { scope: bindingProviders });\n    return;\n  }\n  if (value === \"key\")\n    return storeKeyForXFor(el, expression);\n  if (el._x_inlineBindings && el._x_inlineBindings[value] && el._x_inlineBindings[value].extract) {\n    return;\n  }\n  let evaluate2 = evaluateLater(el, expression);\n  effect3(() => evaluate2((result) => {\n    if (result === void 0 && typeof expression === \"string\" && expression.match(/\\./)) {\n      result = \"\";\n    }\n    mutateDom(() => bind(el, value, result, modifiers));\n  }));\n  cleanup(() => {\n    el._x_undoAddedClasses && el._x_undoAddedClasses();\n    el._x_undoAddedStyles && el._x_undoAddedStyles();\n  });\n};\nhandler2.inline = (el, { value, modifiers, expression }) => {\n  if (!value)\n    return;\n  if (!el._x_inlineBindings)\n    el._x_inlineBindings = {};\n  el._x_inlineBindings[value] = { expression, extract: false };\n};\ndirective(\"bind\", handler2);\nfunction storeKeyForXFor(el, expression) {\n  el._x_keyExpression = expression;\n}\n\n// packages/alpinejs/src/directives/x-data.js\naddRootSelector(() => `[${prefix(\"data\")}]`);\ndirective(\"data\", (el, { expression }, { cleanup }) => {\n  if (shouldSkipRegisteringDataDuringClone(el))\n    return;\n  expression = expression === \"\" ? \"{}\" : expression;\n  let magicContext = {};\n  injectMagics(magicContext, el);\n  let dataProviderContext = {};\n  injectDataProviders(dataProviderContext, magicContext);\n  let data2 = evaluate(el, expression, { scope: dataProviderContext });\n  if (data2 === void 0 || data2 === true)\n    data2 = {};\n  injectMagics(data2, el);\n  let reactiveData = reactive(data2);\n  initInterceptors(reactiveData);\n  let undo = addScopeToNode(el, reactiveData);\n  reactiveData[\"init\"] && evaluate(el, reactiveData[\"init\"]);\n  cleanup(() => {\n    reactiveData[\"destroy\"] && evaluate(el, reactiveData[\"destroy\"]);\n    undo();\n  });\n});\ninterceptClone((from, to) => {\n  if (from._x_dataStack) {\n    to._x_dataStack = from._x_dataStack;\n    to.setAttribute(\"data-has-alpine-state\", true);\n  }\n});\nfunction shouldSkipRegisteringDataDuringClone(el) {\n  if (!isCloning)\n    return false;\n  if (isCloningLegacy)\n    return true;\n  return el.hasAttribute(\"data-has-alpine-state\");\n}\n\n// packages/alpinejs/src/directives/x-show.js\ndirective(\"show\", (el, { modifiers, expression }, { effect: effect3 }) => {\n  let evaluate2 = evaluateLater(el, expression);\n  if (!el._x_doHide)\n    el._x_doHide = () => {\n      mutateDom(() => {\n        el.style.setProperty(\"display\", \"none\", modifiers.includes(\"important\") ? \"important\" : void 0);\n      });\n    };\n  if (!el._x_doShow)\n    el._x_doShow = () => {\n      mutateDom(() => {\n        if (el.style.length === 1 && el.style.display === \"none\") {\n          el.removeAttribute(\"style\");\n        } else {\n          el.style.removeProperty(\"display\");\n        }\n      });\n    };\n  let hide = () => {\n    el._x_doHide();\n    el._x_isShown = false;\n  };\n  let show = () => {\n    el._x_doShow();\n    el._x_isShown = true;\n  };\n  let clickAwayCompatibleShow = () => setTimeout(show);\n  let toggle = once(\n    (value) => value ? show() : hide(),\n    (value) => {\n      if (typeof el._x_toggleAndCascadeWithTransitions === \"function\") {\n        el._x_toggleAndCascadeWithTransitions(el, value, show, hide);\n      } else {\n        value ? clickAwayCompatibleShow() : hide();\n      }\n    }\n  );\n  let oldValue;\n  let firstTime = true;\n  effect3(() => evaluate2((value) => {\n    if (!firstTime && value === oldValue)\n      return;\n    if (modifiers.includes(\"immediate\"))\n      value ? clickAwayCompatibleShow() : hide();\n    toggle(value);\n    oldValue = value;\n    firstTime = false;\n  }));\n});\n\n// packages/alpinejs/src/directives/x-for.js\ndirective(\"for\", (el, { expression }, { effect: effect3, cleanup }) => {\n  let iteratorNames = parseForExpression(expression);\n  let evaluateItems = evaluateLater(el, iteratorNames.items);\n  let evaluateKey = evaluateLater(\n    el,\n    // the x-bind:key expression is stored for our use instead of evaluated.\n    el._x_keyExpression || \"index\"\n  );\n  el._x_prevKeys = [];\n  el._x_lookup = {};\n  effect3(() => loop(el, iteratorNames, evaluateItems, evaluateKey));\n  cleanup(() => {\n    Object.values(el._x_lookup).forEach((el2) => mutateDom(\n      () => {\n        destroyTree(el2);\n        el2.remove();\n      }\n    ));\n    delete el._x_prevKeys;\n    delete el._x_lookup;\n  });\n});\nfunction loop(el, iteratorNames, evaluateItems, evaluateKey) {\n  let isObject = (i) => typeof i === \"object\" && !Array.isArray(i);\n  let templateEl = el;\n  evaluateItems((items) => {\n    if (isNumeric3(items) && items >= 0) {\n      items = Array.from(Array(items).keys(), (i) => i + 1);\n    }\n    if (items === void 0)\n      items = [];\n    let lookup = el._x_lookup;\n    let prevKeys = el._x_prevKeys;\n    let scopes = [];\n    let keys = [];\n    if (isObject(items)) {\n      items = Object.entries(items).map(([key, value]) => {\n        let scope2 = getIterationScopeVariables(iteratorNames, value, key, items);\n        evaluateKey((value2) => {\n          if (keys.includes(value2))\n            warn(\"Duplicate key on x-for\", el);\n          keys.push(value2);\n        }, { scope: { index: key, ...scope2 } });\n        scopes.push(scope2);\n      });\n    } else {\n      for (let i = 0; i < items.length; i++) {\n        let scope2 = getIterationScopeVariables(iteratorNames, items[i], i, items);\n        evaluateKey((value) => {\n          if (keys.includes(value))\n            warn(\"Duplicate key on x-for\", el);\n          keys.push(value);\n        }, { scope: { index: i, ...scope2 } });\n        scopes.push(scope2);\n      }\n    }\n    let adds = [];\n    let moves = [];\n    let removes = [];\n    let sames = [];\n    for (let i = 0; i < prevKeys.length; i++) {\n      let key = prevKeys[i];\n      if (keys.indexOf(key) === -1)\n        removes.push(key);\n    }\n    prevKeys = prevKeys.filter((key) => !removes.includes(key));\n    let lastKey = \"template\";\n    for (let i = 0; i < keys.length; i++) {\n      let key = keys[i];\n      let prevIndex = prevKeys.indexOf(key);\n      if (prevIndex === -1) {\n        prevKeys.splice(i, 0, key);\n        adds.push([lastKey, i]);\n      } else if (prevIndex !== i) {\n        let keyInSpot = prevKeys.splice(i, 1)[0];\n        let keyForSpot = prevKeys.splice(prevIndex - 1, 1)[0];\n        prevKeys.splice(i, 0, keyForSpot);\n        prevKeys.splice(prevIndex, 0, keyInSpot);\n        moves.push([keyInSpot, keyForSpot]);\n      } else {\n        sames.push(key);\n      }\n      lastKey = key;\n    }\n    for (let i = 0; i < removes.length; i++) {\n      let key = removes[i];\n      if (!(key in lookup))\n        continue;\n      mutateDom(() => {\n        destroyTree(lookup[key]);\n        lookup[key].remove();\n      });\n      delete lookup[key];\n    }\n    for (let i = 0; i < moves.length; i++) {\n      let [keyInSpot, keyForSpot] = moves[i];\n      let elInSpot = lookup[keyInSpot];\n      let elForSpot = lookup[keyForSpot];\n      let marker = document.createElement(\"div\");\n      mutateDom(() => {\n        if (!elForSpot)\n          warn(`x-for \":key\" is undefined or invalid`, templateEl, keyForSpot, lookup);\n        elForSpot.after(marker);\n        elInSpot.after(elForSpot);\n        elForSpot._x_currentIfEl && elForSpot.after(elForSpot._x_currentIfEl);\n        marker.before(elInSpot);\n        elInSpot._x_currentIfEl && elInSpot.after(elInSpot._x_currentIfEl);\n        marker.remove();\n      });\n      elForSpot._x_refreshXForScope(scopes[keys.indexOf(keyForSpot)]);\n    }\n    for (let i = 0; i < adds.length; i++) {\n      let [lastKey2, index] = adds[i];\n      let lastEl = lastKey2 === \"template\" ? templateEl : lookup[lastKey2];\n      if (lastEl._x_currentIfEl)\n        lastEl = lastEl._x_currentIfEl;\n      let scope2 = scopes[index];\n      let key = keys[index];\n      let clone2 = document.importNode(templateEl.content, true).firstElementChild;\n      let reactiveScope = reactive(scope2);\n      addScopeToNode(clone2, reactiveScope, templateEl);\n      clone2._x_refreshXForScope = (newScope) => {\n        Object.entries(newScope).forEach(([key2, value]) => {\n          reactiveScope[key2] = value;\n        });\n      };\n      mutateDom(() => {\n        lastEl.after(clone2);\n        skipDuringClone(() => initTree(clone2))();\n      });\n      if (typeof key === \"object\") {\n        warn(\"x-for key cannot be an object, it must be a string or an integer\", templateEl);\n      }\n      lookup[key] = clone2;\n    }\n    for (let i = 0; i < sames.length; i++) {\n      lookup[sames[i]]._x_refreshXForScope(scopes[keys.indexOf(sames[i])]);\n    }\n    templateEl._x_prevKeys = keys;\n  });\n}\nfunction parseForExpression(expression) {\n  let forIteratorRE = /,([^,\\}\\]]*)(?:,([^,\\}\\]]*))?$/;\n  let stripParensRE = /^\\s*\\(|\\)\\s*$/g;\n  let forAliasRE = /([\\s\\S]*?)\\s+(?:in|of)\\s+([\\s\\S]*)/;\n  let inMatch = expression.match(forAliasRE);\n  if (!inMatch)\n    return;\n  let res = {};\n  res.items = inMatch[2].trim();\n  let item = inMatch[1].replace(stripParensRE, \"\").trim();\n  let iteratorMatch = item.match(forIteratorRE);\n  if (iteratorMatch) {\n    res.item = item.replace(forIteratorRE, \"\").trim();\n    res.index = iteratorMatch[1].trim();\n    if (iteratorMatch[2]) {\n      res.collection = iteratorMatch[2].trim();\n    }\n  } else {\n    res.item = item;\n  }\n  return res;\n}\nfunction getIterationScopeVariables(iteratorNames, item, index, items) {\n  let scopeVariables = {};\n  if (/^\\[.*\\]$/.test(iteratorNames.item) && Array.isArray(item)) {\n    let names = iteratorNames.item.replace(\"[\", \"\").replace(\"]\", \"\").split(\",\").map((i) => i.trim());\n    names.forEach((name, i) => {\n      scopeVariables[name] = item[i];\n    });\n  } else if (/^\\{.*\\}$/.test(iteratorNames.item) && !Array.isArray(item) && typeof item === \"object\") {\n    let names = iteratorNames.item.replace(\"{\", \"\").replace(\"}\", \"\").split(\",\").map((i) => i.trim());\n    names.forEach((name) => {\n      scopeVariables[name] = item[name];\n    });\n  } else {\n    scopeVariables[iteratorNames.item] = item;\n  }\n  if (iteratorNames.index)\n    scopeVariables[iteratorNames.index] = index;\n  if (iteratorNames.collection)\n    scopeVariables[iteratorNames.collection] = items;\n  return scopeVariables;\n}\nfunction isNumeric3(subject) {\n  return !Array.isArray(subject) && !isNaN(subject);\n}\n\n// packages/alpinejs/src/directives/x-ref.js\nfunction handler3() {\n}\nhandler3.inline = (el, { expression }, { cleanup }) => {\n  let root = closestRoot(el);\n  if (!root._x_refs)\n    root._x_refs = {};\n  root._x_refs[expression] = el;\n  cleanup(() => delete root._x_refs[expression]);\n};\ndirective(\"ref\", handler3);\n\n// packages/alpinejs/src/directives/x-if.js\ndirective(\"if\", (el, { expression }, { effect: effect3, cleanup }) => {\n  if (el.tagName.toLowerCase() !== \"template\")\n    warn(\"x-if can only be used on a <template> tag\", el);\n  let evaluate2 = evaluateLater(el, expression);\n  let show = () => {\n    if (el._x_currentIfEl)\n      return el._x_currentIfEl;\n    let clone2 = el.content.cloneNode(true).firstElementChild;\n    addScopeToNode(clone2, {}, el);\n    mutateDom(() => {\n      el.after(clone2);\n      skipDuringClone(() => initTree(clone2))();\n    });\n    el._x_currentIfEl = clone2;\n    el._x_undoIf = () => {\n      mutateDom(() => {\n        destroyTree(clone2);\n        clone2.remove();\n      });\n      delete el._x_currentIfEl;\n    };\n    return clone2;\n  };\n  let hide = () => {\n    if (!el._x_undoIf)\n      return;\n    el._x_undoIf();\n    delete el._x_undoIf;\n  };\n  effect3(() => evaluate2((value) => {\n    value ? show() : hide();\n  }));\n  cleanup(() => el._x_undoIf && el._x_undoIf());\n});\n\n// packages/alpinejs/src/directives/x-id.js\ndirective(\"id\", (el, { expression }, { evaluate: evaluate2 }) => {\n  let names = evaluate2(expression);\n  names.forEach((name) => setIdRoot(el, name));\n});\ninterceptClone((from, to) => {\n  if (from._x_ids) {\n    to._x_ids = from._x_ids;\n  }\n});\n\n// packages/alpinejs/src/directives/x-on.js\nmapAttributes(startingWith(\"@\", into(prefix(\"on:\"))));\ndirective(\"on\", skipDuringClone((el, { value, modifiers, expression }, { cleanup }) => {\n  let evaluate2 = expression ? evaluateLater(el, expression) : () => {\n  };\n  if (el.tagName.toLowerCase() === \"template\") {\n    if (!el._x_forwardEvents)\n      el._x_forwardEvents = [];\n    if (!el._x_forwardEvents.includes(value))\n      el._x_forwardEvents.push(value);\n  }\n  let removeListener = on(el, value, modifiers, (e) => {\n    evaluate2(() => {\n    }, { scope: { \"$event\": e }, params: [e] });\n  });\n  cleanup(() => removeListener());\n}));\n\n// packages/alpinejs/src/directives/index.js\nwarnMissingPluginDirective(\"Collapse\", \"collapse\", \"collapse\");\nwarnMissingPluginDirective(\"Intersect\", \"intersect\", \"intersect\");\nwarnMissingPluginDirective(\"Focus\", \"trap\", \"focus\");\nwarnMissingPluginDirective(\"Mask\", \"mask\", \"mask\");\nfunction warnMissingPluginDirective(name, directiveName, slug) {\n  directive(directiveName, (el) => warn(`You can't use [x-${directiveName}] without first installing the \"${name}\" plugin here: https://alpinejs.dev/plugins/${slug}`, el));\n}\n\n// packages/alpinejs/src/index.js\nalpine_default.setEvaluator(normalEvaluator);\nalpine_default.setReactivityEngine({ reactive: import_reactivity10.reactive, effect: import_reactivity10.effect, release: import_reactivity10.stop, raw: import_reactivity10.toRaw });\nvar src_default = alpine_default;\n\n// packages/alpinejs/builds/module.js\nvar module_default = src_default;\n// Annotate the CommonJS export names for ESM import in node:\n0 && (module.exports = {\n  Alpine\n});\n", "var __defProp = Object.defineProperty;\nvar __getOwnPropDesc = Object.getOwnPropertyDescriptor;\nvar __getOwnPropNames = Object.getOwnPropertyNames;\nvar __hasOwnProp = Object.prototype.hasOwnProperty;\nvar __export = (target, all) => {\n  for (var name in all)\n    __defProp(target, name, { get: all[name], enumerable: true });\n};\nvar __copyProps = (to, from, except, desc) => {\n  if (from && typeof from === \"object\" || typeof from === \"function\") {\n    for (let key of __getOwnPropNames(from))\n      if (!__hasOwnProp.call(to, key) && key !== except)\n        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });\n  }\n  return to;\n};\nvar __toCommonJS = (mod) => __copyProps(__defProp({}, \"__esModule\", { value: true }), mod);\n\n// packages/collapse/builds/module.js\nvar module_exports = {};\n__export(module_exports, {\n  collapse: () => src_default,\n  default: () => module_default\n});\nmodule.exports = __toCommonJS(module_exports);\n\n// packages/collapse/src/index.js\nfunction src_default(Alpine) {\n  Alpine.directive(\"collapse\", collapse);\n  collapse.inline = (el, { modifiers }) => {\n    if (!modifiers.includes(\"min\"))\n      return;\n    el._x_doShow = () => {\n    };\n    el._x_doHide = () => {\n    };\n  };\n  function collapse(el, { modifiers }) {\n    let duration = modifierValue(modifiers, \"duration\", 250) / 1e3;\n    let floor = modifierValue(modifiers, \"min\", 0);\n    let fullyHide = !modifiers.includes(\"min\");\n    if (!el._x_isShown)\n      el.style.height = `${floor}px`;\n    if (!el._x_isShown && fullyHide)\n      el.hidden = true;\n    if (!el._x_isShown)\n      el.style.overflow = \"hidden\";\n    let setFunction = (el2, styles) => {\n      let revertFunction = Alpine.setStyles(el2, styles);\n      return styles.height ? () => {\n      } : revertFunction;\n    };\n    let transitionStyles = {\n      transitionProperty: \"height\",\n      transitionDuration: `${duration}s`,\n      transitionTimingFunction: \"cubic-bezier(0.4, 0.0, 0.2, 1)\"\n    };\n    el._x_transition = {\n      in(before = () => {\n      }, after = () => {\n      }) {\n        if (fullyHide)\n          el.hidden = false;\n        if (fullyHide)\n          el.style.display = null;\n        let current = el.getBoundingClientRect().height;\n        el.style.height = \"auto\";\n        let full = el.getBoundingClientRect().height;\n        if (current === full) {\n          current = floor;\n        }\n        Alpine.transition(el, Alpine.setStyles, {\n          during: transitionStyles,\n          start: { height: current + \"px\" },\n          end: { height: full + \"px\" }\n        }, () => el._x_isShown = true, () => {\n          if (Math.abs(el.getBoundingClientRect().height - full) < 1) {\n            el.style.overflow = null;\n          }\n        });\n      },\n      out(before = () => {\n      }, after = () => {\n      }) {\n        let full = el.getBoundingClientRect().height;\n        Alpine.transition(el, setFunction, {\n          during: transitionStyles,\n          start: { height: full + \"px\" },\n          end: { height: floor + \"px\" }\n        }, () => el.style.overflow = \"hidden\", () => {\n          el._x_isShown = false;\n          if (el.style.height == `${floor}px` && fullyHide) {\n            el.style.display = \"none\";\n            el.hidden = true;\n          }\n        });\n      }\n    };\n  }\n}\nfunction modifierValue(modifiers, key, fallback) {\n  if (modifiers.indexOf(key) === -1)\n    return fallback;\n  const rawValue = modifiers[modifiers.indexOf(key) + 1];\n  if (!rawValue)\n    return fallback;\n  if (key === \"duration\") {\n    let match = rawValue.match(/([0-9]+)ms/);\n    if (match)\n      return match[1];\n  }\n  if (key === \"min\") {\n    let match = rawValue.match(/([0-9]+)px/);\n    if (match)\n      return match[1];\n  }\n  return rawValue;\n}\n\n// packages/collapse/builds/module.js\nvar module_default = src_default;\n// Annotate the CommonJS export names for ESM import in node:\n0 && (module.exports = {\n  collapse\n});\n", "var __create = Object.create;\nvar __defProp = Object.defineProperty;\nvar __getOwnPropDesc = Object.getOwnPropertyDescriptor;\nvar __getOwnPropNames = Object.getOwnPropertyNames;\nvar __getProtoOf = Object.getPrototypeOf;\nvar __hasOwnProp = Object.prototype.hasOwnProperty;\nvar __commonJS = (cb, mod) => function __require() {\n  return mod || (0, cb[__getOwnPropNames(cb)[0]])((mod = { exports: {} }).exports, mod), mod.exports;\n};\nvar __export = (target, all) => {\n  for (var name in all)\n    __defProp(target, name, { get: all[name], enumerable: true });\n};\nvar __copyProps = (to, from, except, desc) => {\n  if (from && typeof from === \"object\" || typeof from === \"function\") {\n    for (let key of __getOwnPropNames(from))\n      if (!__hasOwnProp.call(to, key) && key !== except)\n        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });\n  }\n  return to;\n};\nvar __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(\n  // If the importer is in node compatibility mode or this is not an ESM\n  // file that has been converted to a CommonJS file using a Babel-\n  // compatible transform (i.e. \"__esModule\" has not been set), then set\n  // \"default\" to the CommonJS \"module.exports\" for node compatibility.\n  isNodeMode || !mod || !mod.__esModule ? __defProp(target, \"default\", { value: mod, enumerable: true }) : target,\n  mod\n));\nvar __toCommonJS = (mod) => __copyProps(__defProp({}, \"__esModule\", { value: true }), mod);\n\n// node_modules/tabbable/dist/index.js\nvar require_dist = __commonJS({\n  \"node_modules/tabbable/dist/index.js\"(exports) {\n    \"use strict\";\n    Object.defineProperty(exports, \"__esModule\", { value: true });\n    var candidateSelectors = [\"input\", \"select\", \"textarea\", \"a[href]\", \"button\", \"[tabindex]:not(slot)\", \"audio[controls]\", \"video[controls]\", '[contenteditable]:not([contenteditable=\"false\"])', \"details>summary:first-of-type\", \"details\"];\n    var candidateSelector = /* @__PURE__ */ candidateSelectors.join(\",\");\n    var NoElement = typeof Element === \"undefined\";\n    var matches = NoElement ? function() {\n    } : Element.prototype.matches || Element.prototype.msMatchesSelector || Element.prototype.webkitMatchesSelector;\n    var getRootNode = !NoElement && Element.prototype.getRootNode ? function(element) {\n      return element.getRootNode();\n    } : function(element) {\n      return element.ownerDocument;\n    };\n    var getCandidates = function getCandidates2(el, includeContainer, filter) {\n      var candidates = Array.prototype.slice.apply(el.querySelectorAll(candidateSelector));\n      if (includeContainer && matches.call(el, candidateSelector)) {\n        candidates.unshift(el);\n      }\n      candidates = candidates.filter(filter);\n      return candidates;\n    };\n    var getCandidatesIteratively = function getCandidatesIteratively2(elements, includeContainer, options) {\n      var candidates = [];\n      var elementsToCheck = Array.from(elements);\n      while (elementsToCheck.length) {\n        var element = elementsToCheck.shift();\n        if (element.tagName === \"SLOT\") {\n          var assigned = element.assignedElements();\n          var content = assigned.length ? assigned : element.children;\n          var nestedCandidates = getCandidatesIteratively2(content, true, options);\n          if (options.flatten) {\n            candidates.push.apply(candidates, nestedCandidates);\n          } else {\n            candidates.push({\n              scope: element,\n              candidates: nestedCandidates\n            });\n          }\n        } else {\n          var validCandidate = matches.call(element, candidateSelector);\n          if (validCandidate && options.filter(element) && (includeContainer || !elements.includes(element))) {\n            candidates.push(element);\n          }\n          var shadowRoot = element.shadowRoot || // check for an undisclosed shadow\n          typeof options.getShadowRoot === \"function\" && options.getShadowRoot(element);\n          var validShadowRoot = !options.shadowRootFilter || options.shadowRootFilter(element);\n          if (shadowRoot && validShadowRoot) {\n            var _nestedCandidates = getCandidatesIteratively2(shadowRoot === true ? element.children : shadowRoot.children, true, options);\n            if (options.flatten) {\n              candidates.push.apply(candidates, _nestedCandidates);\n            } else {\n              candidates.push({\n                scope: element,\n                candidates: _nestedCandidates\n              });\n            }\n          } else {\n            elementsToCheck.unshift.apply(elementsToCheck, element.children);\n          }\n        }\n      }\n      return candidates;\n    };\n    var getTabindex = function getTabindex2(node, isScope) {\n      if (node.tabIndex < 0) {\n        if ((isScope || /^(AUDIO|VIDEO|DETAILS)$/.test(node.tagName) || node.isContentEditable) && isNaN(parseInt(node.getAttribute(\"tabindex\"), 10))) {\n          return 0;\n        }\n      }\n      return node.tabIndex;\n    };\n    var sortOrderedTabbables = function sortOrderedTabbables2(a, b) {\n      return a.tabIndex === b.tabIndex ? a.documentOrder - b.documentOrder : a.tabIndex - b.tabIndex;\n    };\n    var isInput = function isInput2(node) {\n      return node.tagName === \"INPUT\";\n    };\n    var isHiddenInput = function isHiddenInput2(node) {\n      return isInput(node) && node.type === \"hidden\";\n    };\n    var isDetailsWithSummary = function isDetailsWithSummary2(node) {\n      var r = node.tagName === \"DETAILS\" && Array.prototype.slice.apply(node.children).some(function(child) {\n        return child.tagName === \"SUMMARY\";\n      });\n      return r;\n    };\n    var getCheckedRadio = function getCheckedRadio2(nodes, form) {\n      for (var i = 0; i < nodes.length; i++) {\n        if (nodes[i].checked && nodes[i].form === form) {\n          return nodes[i];\n        }\n      }\n    };\n    var isTabbableRadio = function isTabbableRadio2(node) {\n      if (!node.name) {\n        return true;\n      }\n      var radioScope = node.form || getRootNode(node);\n      var queryRadios = function queryRadios2(name) {\n        return radioScope.querySelectorAll('input[type=\"radio\"][name=\"' + name + '\"]');\n      };\n      var radioSet;\n      if (typeof window !== \"undefined\" && typeof window.CSS !== \"undefined\" && typeof window.CSS.escape === \"function\") {\n        radioSet = queryRadios(window.CSS.escape(node.name));\n      } else {\n        try {\n          radioSet = queryRadios(node.name);\n        } catch (err) {\n          console.error(\"Looks like you have a radio button with a name attribute containing invalid CSS selector characters and need the CSS.escape polyfill: %s\", err.message);\n          return false;\n        }\n      }\n      var checked = getCheckedRadio(radioSet, node.form);\n      return !checked || checked === node;\n    };\n    var isRadio = function isRadio2(node) {\n      return isInput(node) && node.type === \"radio\";\n    };\n    var isNonTabbableRadio = function isNonTabbableRadio2(node) {\n      return isRadio(node) && !isTabbableRadio(node);\n    };\n    var isZeroArea = function isZeroArea2(node) {\n      var _node$getBoundingClie = node.getBoundingClientRect(), width = _node$getBoundingClie.width, height = _node$getBoundingClie.height;\n      return width === 0 && height === 0;\n    };\n    var isHidden = function isHidden2(node, _ref) {\n      var displayCheck = _ref.displayCheck, getShadowRoot = _ref.getShadowRoot;\n      if (getComputedStyle(node).visibility === \"hidden\") {\n        return true;\n      }\n      var isDirectSummary = matches.call(node, \"details>summary:first-of-type\");\n      var nodeUnderDetails = isDirectSummary ? node.parentElement : node;\n      if (matches.call(nodeUnderDetails, \"details:not([open]) *\")) {\n        return true;\n      }\n      var nodeRootHost = getRootNode(node).host;\n      var nodeIsAttached = (nodeRootHost === null || nodeRootHost === void 0 ? void 0 : nodeRootHost.ownerDocument.contains(nodeRootHost)) || node.ownerDocument.contains(node);\n      if (!displayCheck || displayCheck === \"full\") {\n        if (typeof getShadowRoot === \"function\") {\n          var originalNode = node;\n          while (node) {\n            var parentElement = node.parentElement;\n            var rootNode = getRootNode(node);\n            if (parentElement && !parentElement.shadowRoot && getShadowRoot(parentElement) === true) {\n              return isZeroArea(node);\n            } else if (node.assignedSlot) {\n              node = node.assignedSlot;\n            } else if (!parentElement && rootNode !== node.ownerDocument) {\n              node = rootNode.host;\n            } else {\n              node = parentElement;\n            }\n          }\n          node = originalNode;\n        }\n        if (nodeIsAttached) {\n          return !node.getClientRects().length;\n        }\n      } else if (displayCheck === \"non-zero-area\") {\n        return isZeroArea(node);\n      }\n      return false;\n    };\n    var isDisabledFromFieldset = function isDisabledFromFieldset2(node) {\n      if (/^(INPUT|BUTTON|SELECT|TEXTAREA)$/.test(node.tagName)) {\n        var parentNode = node.parentElement;\n        while (parentNode) {\n          if (parentNode.tagName === \"FIELDSET\" && parentNode.disabled) {\n            for (var i = 0; i < parentNode.children.length; i++) {\n              var child = parentNode.children.item(i);\n              if (child.tagName === \"LEGEND\") {\n                return matches.call(parentNode, \"fieldset[disabled] *\") ? true : !child.contains(node);\n              }\n            }\n            return true;\n          }\n          parentNode = parentNode.parentElement;\n        }\n      }\n      return false;\n    };\n    var isNodeMatchingSelectorFocusable = function isNodeMatchingSelectorFocusable2(options, node) {\n      if (node.disabled || isHiddenInput(node) || isHidden(node, options) || // For a details element with a summary, the summary element gets the focus\n      isDetailsWithSummary(node) || isDisabledFromFieldset(node)) {\n        return false;\n      }\n      return true;\n    };\n    var isNodeMatchingSelectorTabbable = function isNodeMatchingSelectorTabbable2(options, node) {\n      if (isNonTabbableRadio(node) || getTabindex(node) < 0 || !isNodeMatchingSelectorFocusable(options, node)) {\n        return false;\n      }\n      return true;\n    };\n    var isValidShadowRootTabbable = function isValidShadowRootTabbable2(shadowHostNode) {\n      var tabIndex = parseInt(shadowHostNode.getAttribute(\"tabindex\"), 10);\n      if (isNaN(tabIndex) || tabIndex >= 0) {\n        return true;\n      }\n      return false;\n    };\n    var sortByOrder = function sortByOrder2(candidates) {\n      var regularTabbables = [];\n      var orderedTabbables = [];\n      candidates.forEach(function(item, i) {\n        var isScope = !!item.scope;\n        var element = isScope ? item.scope : item;\n        var candidateTabindex = getTabindex(element, isScope);\n        var elements = isScope ? sortByOrder2(item.candidates) : element;\n        if (candidateTabindex === 0) {\n          isScope ? regularTabbables.push.apply(regularTabbables, elements) : regularTabbables.push(element);\n        } else {\n          orderedTabbables.push({\n            documentOrder: i,\n            tabIndex: candidateTabindex,\n            item,\n            isScope,\n            content: elements\n          });\n        }\n      });\n      return orderedTabbables.sort(sortOrderedTabbables).reduce(function(acc, sortable) {\n        sortable.isScope ? acc.push.apply(acc, sortable.content) : acc.push(sortable.content);\n        return acc;\n      }, []).concat(regularTabbables);\n    };\n    var tabbable = function tabbable2(el, options) {\n      options = options || {};\n      var candidates;\n      if (options.getShadowRoot) {\n        candidates = getCandidatesIteratively([el], options.includeContainer, {\n          filter: isNodeMatchingSelectorTabbable.bind(null, options),\n          flatten: false,\n          getShadowRoot: options.getShadowRoot,\n          shadowRootFilter: isValidShadowRootTabbable\n        });\n      } else {\n        candidates = getCandidates(el, options.includeContainer, isNodeMatchingSelectorTabbable.bind(null, options));\n      }\n      return sortByOrder(candidates);\n    };\n    var focusable2 = function focusable3(el, options) {\n      options = options || {};\n      var candidates;\n      if (options.getShadowRoot) {\n        candidates = getCandidatesIteratively([el], options.includeContainer, {\n          filter: isNodeMatchingSelectorFocusable.bind(null, options),\n          flatten: true,\n          getShadowRoot: options.getShadowRoot\n        });\n      } else {\n        candidates = getCandidates(el, options.includeContainer, isNodeMatchingSelectorFocusable.bind(null, options));\n      }\n      return candidates;\n    };\n    var isTabbable = function isTabbable2(node, options) {\n      options = options || {};\n      if (!node) {\n        throw new Error(\"No node provided\");\n      }\n      if (matches.call(node, candidateSelector) === false) {\n        return false;\n      }\n      return isNodeMatchingSelectorTabbable(options, node);\n    };\n    var focusableCandidateSelector = /* @__PURE__ */ candidateSelectors.concat(\"iframe\").join(\",\");\n    var isFocusable2 = function isFocusable3(node, options) {\n      options = options || {};\n      if (!node) {\n        throw new Error(\"No node provided\");\n      }\n      if (matches.call(node, focusableCandidateSelector) === false) {\n        return false;\n      }\n      return isNodeMatchingSelectorFocusable(options, node);\n    };\n    exports.focusable = focusable2;\n    exports.isFocusable = isFocusable2;\n    exports.isTabbable = isTabbable;\n    exports.tabbable = tabbable;\n  }\n});\n\n// node_modules/focus-trap/dist/focus-trap.js\nvar require_focus_trap = __commonJS({\n  \"node_modules/focus-trap/dist/focus-trap.js\"(exports) {\n    \"use strict\";\n    Object.defineProperty(exports, \"__esModule\", { value: true });\n    var tabbable = require_dist();\n    function ownKeys(object, enumerableOnly) {\n      var keys = Object.keys(object);\n      if (Object.getOwnPropertySymbols) {\n        var symbols = Object.getOwnPropertySymbols(object);\n        enumerableOnly && (symbols = symbols.filter(function(sym) {\n          return Object.getOwnPropertyDescriptor(object, sym).enumerable;\n        })), keys.push.apply(keys, symbols);\n      }\n      return keys;\n    }\n    function _objectSpread2(target) {\n      for (var i = 1; i < arguments.length; i++) {\n        var source = null != arguments[i] ? arguments[i] : {};\n        i % 2 ? ownKeys(Object(source), true).forEach(function(key) {\n          _defineProperty(target, key, source[key]);\n        }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function(key) {\n          Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key));\n        });\n      }\n      return target;\n    }\n    function _defineProperty(obj, key, value) {\n      if (key in obj) {\n        Object.defineProperty(obj, key, {\n          value,\n          enumerable: true,\n          configurable: true,\n          writable: true\n        });\n      } else {\n        obj[key] = value;\n      }\n      return obj;\n    }\n    var activeFocusTraps = function() {\n      var trapQueue = [];\n      return {\n        activateTrap: function activateTrap(trap) {\n          if (trapQueue.length > 0) {\n            var activeTrap = trapQueue[trapQueue.length - 1];\n            if (activeTrap !== trap) {\n              activeTrap.pause();\n            }\n          }\n          var trapIndex = trapQueue.indexOf(trap);\n          if (trapIndex === -1) {\n            trapQueue.push(trap);\n          } else {\n            trapQueue.splice(trapIndex, 1);\n            trapQueue.push(trap);\n          }\n        },\n        deactivateTrap: function deactivateTrap(trap) {\n          var trapIndex = trapQueue.indexOf(trap);\n          if (trapIndex !== -1) {\n            trapQueue.splice(trapIndex, 1);\n          }\n          if (trapQueue.length > 0) {\n            trapQueue[trapQueue.length - 1].unpause();\n          }\n        }\n      };\n    }();\n    var isSelectableInput = function isSelectableInput2(node) {\n      return node.tagName && node.tagName.toLowerCase() === \"input\" && typeof node.select === \"function\";\n    };\n    var isEscapeEvent = function isEscapeEvent2(e) {\n      return e.key === \"Escape\" || e.key === \"Esc\" || e.keyCode === 27;\n    };\n    var isTabEvent = function isTabEvent2(e) {\n      return e.key === \"Tab\" || e.keyCode === 9;\n    };\n    var delay = function delay2(fn) {\n      return setTimeout(fn, 0);\n    };\n    var findIndex = function findIndex2(arr, fn) {\n      var idx = -1;\n      arr.every(function(value, i) {\n        if (fn(value)) {\n          idx = i;\n          return false;\n        }\n        return true;\n      });\n      return idx;\n    };\n    var valueOrHandler = function valueOrHandler2(value) {\n      for (var _len = arguments.length, params = new Array(_len > 1 ? _len - 1 : 0), _key = 1; _key < _len; _key++) {\n        params[_key - 1] = arguments[_key];\n      }\n      return typeof value === \"function\" ? value.apply(void 0, params) : value;\n    };\n    var getActualTarget = function getActualTarget2(event) {\n      return event.target.shadowRoot && typeof event.composedPath === \"function\" ? event.composedPath()[0] : event.target;\n    };\n    var createFocusTrap2 = function createFocusTrap3(elements, userOptions) {\n      var doc = (userOptions === null || userOptions === void 0 ? void 0 : userOptions.document) || document;\n      var config = _objectSpread2({\n        returnFocusOnDeactivate: true,\n        escapeDeactivates: true,\n        delayInitialFocus: true\n      }, userOptions);\n      var state = {\n        // containers given to createFocusTrap()\n        // @type {Array<HTMLElement>}\n        containers: [],\n        // list of objects identifying tabbable nodes in `containers` in the trap\n        // NOTE: it's possible that a group has no tabbable nodes if nodes get removed while the trap\n        //  is active, but the trap should never get to a state where there isn't at least one group\n        //  with at least one tabbable node in it (that would lead to an error condition that would\n        //  result in an error being thrown)\n        // @type {Array<{\n        //   container: HTMLElement,\n        //   tabbableNodes: Array<HTMLElement>, // empty if none\n        //   focusableNodes: Array<HTMLElement>, // empty if none\n        //   firstTabbableNode: HTMLElement|null,\n        //   lastTabbableNode: HTMLElement|null,\n        //   nextTabbableNode: (node: HTMLElement, forward: boolean) => HTMLElement|undefined\n        // }>}\n        containerGroups: [],\n        // same order/length as `containers` list\n        // references to objects in `containerGroups`, but only those that actually have\n        //  tabbable nodes in them\n        // NOTE: same order as `containers` and `containerGroups`, but __not necessarily__\n        //  the same length\n        tabbableGroups: [],\n        nodeFocusedBeforeActivation: null,\n        mostRecentlyFocusedNode: null,\n        active: false,\n        paused: false,\n        // timer ID for when delayInitialFocus is true and initial focus in this trap\n        //  has been delayed during activation\n        delayInitialFocusTimer: void 0\n      };\n      var trap;\n      var getOption = function getOption2(configOverrideOptions, optionName, configOptionName) {\n        return configOverrideOptions && configOverrideOptions[optionName] !== void 0 ? configOverrideOptions[optionName] : config[configOptionName || optionName];\n      };\n      var findContainerIndex = function findContainerIndex2(element) {\n        return state.containerGroups.findIndex(function(_ref) {\n          var container = _ref.container, tabbableNodes = _ref.tabbableNodes;\n          return container.contains(element) || // fall back to explicit tabbable search which will take into consideration any\n          //  web components if the `tabbableOptions.getShadowRoot` option was used for\n          //  the trap, enabling shadow DOM support in tabbable (`Node.contains()` doesn't\n          //  look inside web components even if open)\n          tabbableNodes.find(function(node) {\n            return node === element;\n          });\n        });\n      };\n      var getNodeForOption = function getNodeForOption2(optionName) {\n        var optionValue = config[optionName];\n        if (typeof optionValue === \"function\") {\n          for (var _len2 = arguments.length, params = new Array(_len2 > 1 ? _len2 - 1 : 0), _key2 = 1; _key2 < _len2; _key2++) {\n            params[_key2 - 1] = arguments[_key2];\n          }\n          optionValue = optionValue.apply(void 0, params);\n        }\n        if (optionValue === true) {\n          optionValue = void 0;\n        }\n        if (!optionValue) {\n          if (optionValue === void 0 || optionValue === false) {\n            return optionValue;\n          }\n          throw new Error(\"`\".concat(optionName, \"` was specified but was not a node, or did not return a node\"));\n        }\n        var node = optionValue;\n        if (typeof optionValue === \"string\") {\n          node = doc.querySelector(optionValue);\n          if (!node) {\n            throw new Error(\"`\".concat(optionName, \"` as selector refers to no known node\"));\n          }\n        }\n        return node;\n      };\n      var getInitialFocusNode = function getInitialFocusNode2() {\n        var node = getNodeForOption(\"initialFocus\");\n        if (node === false) {\n          return false;\n        }\n        if (node === void 0) {\n          if (findContainerIndex(doc.activeElement) >= 0) {\n            node = doc.activeElement;\n          } else {\n            var firstTabbableGroup = state.tabbableGroups[0];\n            var firstTabbableNode = firstTabbableGroup && firstTabbableGroup.firstTabbableNode;\n            node = firstTabbableNode || getNodeForOption(\"fallbackFocus\");\n          }\n        }\n        if (!node) {\n          throw new Error(\"Your focus-trap needs to have at least one focusable element\");\n        }\n        return node;\n      };\n      var updateTabbableNodes = function updateTabbableNodes2() {\n        state.containerGroups = state.containers.map(function(container) {\n          var tabbableNodes = tabbable.tabbable(container, config.tabbableOptions);\n          var focusableNodes = tabbable.focusable(container, config.tabbableOptions);\n          return {\n            container,\n            tabbableNodes,\n            focusableNodes,\n            firstTabbableNode: tabbableNodes.length > 0 ? tabbableNodes[0] : null,\n            lastTabbableNode: tabbableNodes.length > 0 ? tabbableNodes[tabbableNodes.length - 1] : null,\n            /**\n             * Finds the __tabbable__ node that follows the given node in the specified direction,\n             *  in this container, if any.\n             * @param {HTMLElement} node\n             * @param {boolean} [forward] True if going in forward tab order; false if going\n             *  in reverse.\n             * @returns {HTMLElement|undefined} The next tabbable node, if any.\n             */\n            nextTabbableNode: function nextTabbableNode(node) {\n              var forward = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : true;\n              var nodeIdx = focusableNodes.findIndex(function(n) {\n                return n === node;\n              });\n              if (nodeIdx < 0) {\n                return void 0;\n              }\n              if (forward) {\n                return focusableNodes.slice(nodeIdx + 1).find(function(n) {\n                  return tabbable.isTabbable(n, config.tabbableOptions);\n                });\n              }\n              return focusableNodes.slice(0, nodeIdx).reverse().find(function(n) {\n                return tabbable.isTabbable(n, config.tabbableOptions);\n              });\n            }\n          };\n        });\n        state.tabbableGroups = state.containerGroups.filter(function(group) {\n          return group.tabbableNodes.length > 0;\n        });\n        if (state.tabbableGroups.length <= 0 && !getNodeForOption(\"fallbackFocus\")) {\n          throw new Error(\"Your focus-trap must have at least one container with at least one tabbable node in it at all times\");\n        }\n      };\n      var tryFocus = function tryFocus2(node) {\n        if (node === false) {\n          return;\n        }\n        if (node === doc.activeElement) {\n          return;\n        }\n        if (!node || !node.focus) {\n          tryFocus2(getInitialFocusNode());\n          return;\n        }\n        node.focus({\n          preventScroll: !!config.preventScroll\n        });\n        state.mostRecentlyFocusedNode = node;\n        if (isSelectableInput(node)) {\n          node.select();\n        }\n      };\n      var getReturnFocusNode = function getReturnFocusNode2(previousActiveElement) {\n        var node = getNodeForOption(\"setReturnFocus\", previousActiveElement);\n        return node ? node : node === false ? false : previousActiveElement;\n      };\n      var checkPointerDown = function checkPointerDown2(e) {\n        var target = getActualTarget(e);\n        if (findContainerIndex(target) >= 0) {\n          return;\n        }\n        if (valueOrHandler(config.clickOutsideDeactivates, e)) {\n          trap.deactivate({\n            // if, on deactivation, we should return focus to the node originally-focused\n            //  when the trap was activated (or the configured `setReturnFocus` node),\n            //  then assume it's also OK to return focus to the outside node that was\n            //  just clicked, causing deactivation, as long as that node is focusable;\n            //  if it isn't focusable, then return focus to the original node focused\n            //  on activation (or the configured `setReturnFocus` node)\n            // NOTE: by setting `returnFocus: false`, deactivate() will do nothing,\n            //  which will result in the outside click setting focus to the node\n            //  that was clicked, whether it's focusable or not; by setting\n            //  `returnFocus: true`, we'll attempt to re-focus the node originally-focused\n            //  on activation (or the configured `setReturnFocus` node)\n            returnFocus: config.returnFocusOnDeactivate && !tabbable.isFocusable(target, config.tabbableOptions)\n          });\n          return;\n        }\n        if (valueOrHandler(config.allowOutsideClick, e)) {\n          return;\n        }\n        e.preventDefault();\n      };\n      var checkFocusIn = function checkFocusIn2(e) {\n        var target = getActualTarget(e);\n        var targetContained = findContainerIndex(target) >= 0;\n        if (targetContained || target instanceof Document) {\n          if (targetContained) {\n            state.mostRecentlyFocusedNode = target;\n          }\n        } else {\n          e.stopImmediatePropagation();\n          tryFocus(state.mostRecentlyFocusedNode || getInitialFocusNode());\n        }\n      };\n      var checkTab = function checkTab2(e) {\n        var target = getActualTarget(e);\n        updateTabbableNodes();\n        var destinationNode = null;\n        if (state.tabbableGroups.length > 0) {\n          var containerIndex = findContainerIndex(target);\n          var containerGroup = containerIndex >= 0 ? state.containerGroups[containerIndex] : void 0;\n          if (containerIndex < 0) {\n            if (e.shiftKey) {\n              destinationNode = state.tabbableGroups[state.tabbableGroups.length - 1].lastTabbableNode;\n            } else {\n              destinationNode = state.tabbableGroups[0].firstTabbableNode;\n            }\n          } else if (e.shiftKey) {\n            var startOfGroupIndex = findIndex(state.tabbableGroups, function(_ref2) {\n              var firstTabbableNode = _ref2.firstTabbableNode;\n              return target === firstTabbableNode;\n            });\n            if (startOfGroupIndex < 0 && (containerGroup.container === target || tabbable.isFocusable(target, config.tabbableOptions) && !tabbable.isTabbable(target, config.tabbableOptions) && !containerGroup.nextTabbableNode(target, false))) {\n              startOfGroupIndex = containerIndex;\n            }\n            if (startOfGroupIndex >= 0) {\n              var destinationGroupIndex = startOfGroupIndex === 0 ? state.tabbableGroups.length - 1 : startOfGroupIndex - 1;\n              var destinationGroup = state.tabbableGroups[destinationGroupIndex];\n              destinationNode = destinationGroup.lastTabbableNode;\n            }\n          } else {\n            var lastOfGroupIndex = findIndex(state.tabbableGroups, function(_ref3) {\n              var lastTabbableNode = _ref3.lastTabbableNode;\n              return target === lastTabbableNode;\n            });\n            if (lastOfGroupIndex < 0 && (containerGroup.container === target || tabbable.isFocusable(target, config.tabbableOptions) && !tabbable.isTabbable(target, config.tabbableOptions) && !containerGroup.nextTabbableNode(target))) {\n              lastOfGroupIndex = containerIndex;\n            }\n            if (lastOfGroupIndex >= 0) {\n              var _destinationGroupIndex = lastOfGroupIndex === state.tabbableGroups.length - 1 ? 0 : lastOfGroupIndex + 1;\n              var _destinationGroup = state.tabbableGroups[_destinationGroupIndex];\n              destinationNode = _destinationGroup.firstTabbableNode;\n            }\n          }\n        } else {\n          destinationNode = getNodeForOption(\"fallbackFocus\");\n        }\n        if (destinationNode) {\n          e.preventDefault();\n          tryFocus(destinationNode);\n        }\n      };\n      var checkKey = function checkKey2(e) {\n        if (isEscapeEvent(e) && valueOrHandler(config.escapeDeactivates, e) !== false) {\n          e.preventDefault();\n          trap.deactivate();\n          return;\n        }\n        if (isTabEvent(e)) {\n          checkTab(e);\n          return;\n        }\n      };\n      var checkClick = function checkClick2(e) {\n        var target = getActualTarget(e);\n        if (findContainerIndex(target) >= 0) {\n          return;\n        }\n        if (valueOrHandler(config.clickOutsideDeactivates, e)) {\n          return;\n        }\n        if (valueOrHandler(config.allowOutsideClick, e)) {\n          return;\n        }\n        e.preventDefault();\n        e.stopImmediatePropagation();\n      };\n      var addListeners = function addListeners2() {\n        if (!state.active) {\n          return;\n        }\n        activeFocusTraps.activateTrap(trap);\n        state.delayInitialFocusTimer = config.delayInitialFocus ? delay(function() {\n          tryFocus(getInitialFocusNode());\n        }) : tryFocus(getInitialFocusNode());\n        doc.addEventListener(\"focusin\", checkFocusIn, true);\n        doc.addEventListener(\"mousedown\", checkPointerDown, {\n          capture: true,\n          passive: false\n        });\n        doc.addEventListener(\"touchstart\", checkPointerDown, {\n          capture: true,\n          passive: false\n        });\n        doc.addEventListener(\"click\", checkClick, {\n          capture: true,\n          passive: false\n        });\n        doc.addEventListener(\"keydown\", checkKey, {\n          capture: true,\n          passive: false\n        });\n        return trap;\n      };\n      var removeListeners = function removeListeners2() {\n        if (!state.active) {\n          return;\n        }\n        doc.removeEventListener(\"focusin\", checkFocusIn, true);\n        doc.removeEventListener(\"mousedown\", checkPointerDown, true);\n        doc.removeEventListener(\"touchstart\", checkPointerDown, true);\n        doc.removeEventListener(\"click\", checkClick, true);\n        doc.removeEventListener(\"keydown\", checkKey, true);\n        return trap;\n      };\n      trap = {\n        get active() {\n          return state.active;\n        },\n        get paused() {\n          return state.paused;\n        },\n        activate: function activate(activateOptions) {\n          if (state.active) {\n            return this;\n          }\n          var onActivate = getOption(activateOptions, \"onActivate\");\n          var onPostActivate = getOption(activateOptions, \"onPostActivate\");\n          var checkCanFocusTrap = getOption(activateOptions, \"checkCanFocusTrap\");\n          if (!checkCanFocusTrap) {\n            updateTabbableNodes();\n          }\n          state.active = true;\n          state.paused = false;\n          state.nodeFocusedBeforeActivation = doc.activeElement;\n          if (onActivate) {\n            onActivate();\n          }\n          var finishActivation = function finishActivation2() {\n            if (checkCanFocusTrap) {\n              updateTabbableNodes();\n            }\n            addListeners();\n            if (onPostActivate) {\n              onPostActivate();\n            }\n          };\n          if (checkCanFocusTrap) {\n            checkCanFocusTrap(state.containers.concat()).then(finishActivation, finishActivation);\n            return this;\n          }\n          finishActivation();\n          return this;\n        },\n        deactivate: function deactivate(deactivateOptions) {\n          if (!state.active) {\n            return this;\n          }\n          var options = _objectSpread2({\n            onDeactivate: config.onDeactivate,\n            onPostDeactivate: config.onPostDeactivate,\n            checkCanReturnFocus: config.checkCanReturnFocus\n          }, deactivateOptions);\n          clearTimeout(state.delayInitialFocusTimer);\n          state.delayInitialFocusTimer = void 0;\n          removeListeners();\n          state.active = false;\n          state.paused = false;\n          activeFocusTraps.deactivateTrap(trap);\n          var onDeactivate = getOption(options, \"onDeactivate\");\n          var onPostDeactivate = getOption(options, \"onPostDeactivate\");\n          var checkCanReturnFocus = getOption(options, \"checkCanReturnFocus\");\n          var returnFocus = getOption(options, \"returnFocus\", \"returnFocusOnDeactivate\");\n          if (onDeactivate) {\n            onDeactivate();\n          }\n          var finishDeactivation = function finishDeactivation2() {\n            delay(function() {\n              if (returnFocus) {\n                tryFocus(getReturnFocusNode(state.nodeFocusedBeforeActivation));\n              }\n              if (onPostDeactivate) {\n                onPostDeactivate();\n              }\n            });\n          };\n          if (returnFocus && checkCanReturnFocus) {\n            checkCanReturnFocus(getReturnFocusNode(state.nodeFocusedBeforeActivation)).then(finishDeactivation, finishDeactivation);\n            return this;\n          }\n          finishDeactivation();\n          return this;\n        },\n        pause: function pause() {\n          if (state.paused || !state.active) {\n            return this;\n          }\n          state.paused = true;\n          removeListeners();\n          return this;\n        },\n        unpause: function unpause() {\n          if (!state.paused || !state.active) {\n            return this;\n          }\n          state.paused = false;\n          updateTabbableNodes();\n          addListeners();\n          return this;\n        },\n        updateContainerElements: function updateContainerElements(containerElements) {\n          var elementsAsArray = [].concat(containerElements).filter(Boolean);\n          state.containers = elementsAsArray.map(function(element) {\n            return typeof element === \"string\" ? doc.querySelector(element) : element;\n          });\n          if (state.active) {\n            updateTabbableNodes();\n          }\n          return this;\n        }\n      };\n      trap.updateContainerElements(elements);\n      return trap;\n    };\n    exports.createFocusTrap = createFocusTrap2;\n  }\n});\n\n// packages/focus/builds/module.js\nvar module_exports = {};\n__export(module_exports, {\n  default: () => module_default,\n  focus: () => src_default\n});\nmodule.exports = __toCommonJS(module_exports);\n\n// packages/focus/src/index.js\nvar import_focus_trap = __toESM(require_focus_trap());\nvar import_tabbable = __toESM(require_dist());\nfunction src_default(Alpine) {\n  let lastFocused;\n  let currentFocused;\n  window.addEventListener(\"focusin\", () => {\n    lastFocused = currentFocused;\n    currentFocused = document.activeElement;\n  });\n  Alpine.magic(\"focus\", (el) => {\n    let within = el;\n    return {\n      __noscroll: false,\n      __wrapAround: false,\n      within(el2) {\n        within = el2;\n        return this;\n      },\n      withoutScrolling() {\n        this.__noscroll = true;\n        return this;\n      },\n      noscroll() {\n        this.__noscroll = true;\n        return this;\n      },\n      withWrapAround() {\n        this.__wrapAround = true;\n        return this;\n      },\n      wrap() {\n        return this.withWrapAround();\n      },\n      focusable(el2) {\n        return (0, import_tabbable.isFocusable)(el2);\n      },\n      previouslyFocused() {\n        return lastFocused;\n      },\n      lastFocused() {\n        return lastFocused;\n      },\n      focused() {\n        return currentFocused;\n      },\n      focusables() {\n        if (Array.isArray(within))\n          return within;\n        return (0, import_tabbable.focusable)(within, { displayCheck: \"none\" });\n      },\n      all() {\n        return this.focusables();\n      },\n      isFirst(el2) {\n        let els = this.all();\n        return els[0] && els[0].isSameNode(el2);\n      },\n      isLast(el2) {\n        let els = this.all();\n        return els.length && els.slice(-1)[0].isSameNode(el2);\n      },\n      getFirst() {\n        return this.all()[0];\n      },\n      getLast() {\n        return this.all().slice(-1)[0];\n      },\n      getNext() {\n        let list = this.all();\n        let current = document.activeElement;\n        if (list.indexOf(current) === -1)\n          return;\n        if (this.__wrapAround && list.indexOf(current) === list.length - 1) {\n          return list[0];\n        }\n        return list[list.indexOf(current) + 1];\n      },\n      getPrevious() {\n        let list = this.all();\n        let current = document.activeElement;\n        if (list.indexOf(current) === -1)\n          return;\n        if (this.__wrapAround && list.indexOf(current) === 0) {\n          return list.slice(-1)[0];\n        }\n        return list[list.indexOf(current) - 1];\n      },\n      first() {\n        this.focus(this.getFirst());\n      },\n      last() {\n        this.focus(this.getLast());\n      },\n      next() {\n        this.focus(this.getNext());\n      },\n      previous() {\n        this.focus(this.getPrevious());\n      },\n      prev() {\n        return this.previous();\n      },\n      focus(el2) {\n        if (!el2)\n          return;\n        setTimeout(() => {\n          if (!el2.hasAttribute(\"tabindex\"))\n            el2.setAttribute(\"tabindex\", \"0\");\n          el2.focus({ preventScroll: this.__noscroll });\n        });\n      }\n    };\n  });\n  Alpine.directive(\"trap\", Alpine.skipDuringClone(\n    (el, { expression, modifiers }, { effect, evaluateLater, cleanup }) => {\n      let evaluator = evaluateLater(expression);\n      let oldValue = false;\n      let options = {\n        escapeDeactivates: false,\n        allowOutsideClick: true,\n        fallbackFocus: () => el\n      };\n      if (modifiers.includes(\"noautofocus\")) {\n        options.initialFocus = false;\n      } else {\n        let autofocusEl = el.querySelector(\"[autofocus]\");\n        if (autofocusEl)\n          options.initialFocus = autofocusEl;\n      }\n      let trap = (0, import_focus_trap.createFocusTrap)(el, options);\n      let undoInert = () => {\n      };\n      let undoDisableScrolling = () => {\n      };\n      const releaseFocus = () => {\n        undoInert();\n        undoInert = () => {\n        };\n        undoDisableScrolling();\n        undoDisableScrolling = () => {\n        };\n        trap.deactivate({\n          returnFocus: !modifiers.includes(\"noreturn\")\n        });\n      };\n      effect(() => evaluator((value) => {\n        if (oldValue === value)\n          return;\n        if (value && !oldValue) {\n          if (modifiers.includes(\"noscroll\"))\n            undoDisableScrolling = disableScrolling();\n          if (modifiers.includes(\"inert\"))\n            undoInert = setInert(el);\n          setTimeout(() => {\n            trap.activate();\n          }, 15);\n        }\n        if (!value && oldValue) {\n          releaseFocus();\n        }\n        oldValue = !!value;\n      }));\n      cleanup(releaseFocus);\n    },\n    // When cloning, we only want to add aria-hidden attributes to the\n    // DOM and not try to actually trap, as trapping can mess with the\n    // live DOM and isn't just isolated to the cloned DOM.\n    (el, { expression, modifiers }, { evaluate }) => {\n      if (modifiers.includes(\"inert\") && evaluate(expression))\n        setInert(el);\n    }\n  ));\n}\nfunction setInert(el) {\n  let undos = [];\n  crawlSiblingsUp(el, (sibling) => {\n    let cache = sibling.hasAttribute(\"aria-hidden\");\n    sibling.setAttribute(\"aria-hidden\", \"true\");\n    undos.push(() => cache || sibling.removeAttribute(\"aria-hidden\"));\n  });\n  return () => {\n    while (undos.length)\n      undos.pop()();\n  };\n}\nfunction crawlSiblingsUp(el, callback) {\n  if (el.isSameNode(document.body) || !el.parentNode)\n    return;\n  Array.from(el.parentNode.children).forEach((sibling) => {\n    if (sibling.isSameNode(el)) {\n      crawlSiblingsUp(el.parentNode, callback);\n    } else {\n      callback(sibling);\n    }\n  });\n}\nfunction disableScrolling() {\n  let overflow = document.documentElement.style.overflow;\n  let paddingRight = document.documentElement.style.paddingRight;\n  let scrollbarWidth = window.innerWidth - document.documentElement.clientWidth;\n  document.documentElement.style.overflow = \"hidden\";\n  document.documentElement.style.paddingRight = `${scrollbarWidth}px`;\n  return () => {\n    document.documentElement.style.overflow = overflow;\n    document.documentElement.style.paddingRight = paddingRight;\n  };\n}\n\n// packages/focus/builds/module.js\nvar module_default = src_default;\n// Annotate the CommonJS export names for ESM import in node:\n0 && (module.exports = {\n  focus\n});\n/*! Bundled license information:\n\ntabbable/dist/index.js:\n  (*!\n  * tabbable 5.3.3\n  * @license MIT, https://github.com/focus-trap/tabbable/blob/master/LICENSE\n  *)\n\nfocus-trap/dist/focus-trap.js:\n  (*!\n  * focus-trap 6.9.4\n  * @license MIT, https://github.com/focus-trap/focus-trap/blob/master/LICENSE\n  *)\n*/\n", "var __defProp = Object.defineProperty;\nvar __getOwnPropDesc = Object.getOwnPropertyDescriptor;\nvar __getOwnPropNames = Object.getOwnPropertyNames;\nvar __hasOwnProp = Object.prototype.hasOwnProperty;\nvar __export = (target, all) => {\n  for (var name in all)\n    __defProp(target, name, { get: all[name], enumerable: true });\n};\nvar __copyProps = (to, from, except, desc) => {\n  if (from && typeof from === \"object\" || typeof from === \"function\") {\n    for (let key of __getOwnPropNames(from))\n      if (!__hasOwnProp.call(to, key) && key !== except)\n        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });\n  }\n  return to;\n};\nvar __toCommonJS = (mod) => __copyProps(__defProp({}, \"__esModule\", { value: true }), mod);\n\n// packages/persist/builds/module.js\nvar module_exports = {};\n__export(module_exports, {\n  default: () => module_default,\n  persist: () => src_default\n});\nmodule.exports = __toCommonJS(module_exports);\n\n// packages/persist/src/index.js\nfunction src_default(Alpine) {\n  let persist = () => {\n    let alias;\n    let storage;\n    try {\n      storage = localStorage;\n    } catch (e) {\n      console.error(e);\n      console.warn(\"Alpine: $persist is using temporary storage since localStorage is unavailable.\");\n      let dummy = /* @__PURE__ */ new Map();\n      storage = {\n        getItem: dummy.get.bind(dummy),\n        setItem: dummy.set.bind(dummy)\n      };\n    }\n    return Alpine.interceptor((initialValue, getter, setter, path, key) => {\n      let lookup = alias || `_x_${path}`;\n      let initial = storageHas(lookup, storage) ? storageGet(lookup, storage) : initialValue;\n      setter(initial);\n      Alpine.effect(() => {\n        let value = getter();\n        storageSet(lookup, value, storage);\n        setter(value);\n      });\n      return initial;\n    }, (func) => {\n      func.as = (key) => {\n        alias = key;\n        return func;\n      }, func.using = (target) => {\n        storage = target;\n        return func;\n      };\n    });\n  };\n  Object.defineProperty(Alpine, \"$persist\", { get: () => persist() });\n  Alpine.magic(\"persist\", persist);\n  Alpine.persist = (key, { get, set }, storage = localStorage) => {\n    let initial = storageHas(key, storage) ? storageGet(key, storage) : get();\n    set(initial);\n    Alpine.effect(() => {\n      let value = get();\n      storageSet(key, value, storage);\n      set(value);\n    });\n  };\n}\nfunction storageHas(key, storage) {\n  return storage.getItem(key) !== null;\n}\nfunction storageGet(key, storage) {\n  let value = storage.getItem(key, storage);\n  if (value === void 0)\n    return;\n  return JSON.parse(value);\n}\nfunction storageSet(key, value, storage) {\n  storage.setItem(key, JSON.stringify(value));\n}\n\n// packages/persist/builds/module.js\nvar module_default = src_default;\n// Annotate the CommonJS export names for ESM import in node:\n0 && (module.exports = {\n  persist\n});\n", "var __defProp = Object.defineProperty;\nvar __getOwnPropDesc = Object.getOwnPropertyDescriptor;\nvar __getOwnPropNames = Object.getOwnPropertyNames;\nvar __hasOwnProp = Object.prototype.hasOwnProperty;\nvar __export = (target, all) => {\n  for (var name in all)\n    __defProp(target, name, { get: all[name], enumerable: true });\n};\nvar __copyProps = (to, from, except, desc) => {\n  if (from && typeof from === \"object\" || typeof from === \"function\") {\n    for (let key of __getOwnPropNames(from))\n      if (!__hasOwnProp.call(to, key) && key !== except)\n        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });\n  }\n  return to;\n};\nvar __toCommonJS = (mod) => __copyProps(__defProp({}, \"__esModule\", { value: true }), mod);\n\n// packages/intersect/builds/module.js\nvar module_exports = {};\n__export(module_exports, {\n  default: () => module_default,\n  intersect: () => src_default\n});\nmodule.exports = __toCommonJS(module_exports);\n\n// packages/intersect/src/index.js\nfunction src_default(Alpine) {\n  Alpine.directive(\"intersect\", Alpine.skipDuringClone((el, { value, expression, modifiers }, { evaluateLater, cleanup }) => {\n    let evaluate = evaluateLater(expression);\n    let options = {\n      rootMargin: getRootMargin(modifiers),\n      threshold: getThreshold(modifiers)\n    };\n    let observer = new IntersectionObserver((entries) => {\n      entries.forEach((entry) => {\n        if (entry.isIntersecting === (value === \"leave\"))\n          return;\n        evaluate();\n        modifiers.includes(\"once\") && observer.disconnect();\n      });\n    }, options);\n    observer.observe(el);\n    cleanup(() => {\n      observer.disconnect();\n    });\n  }));\n}\nfunction getThreshold(modifiers) {\n  if (modifiers.includes(\"full\"))\n    return 0.99;\n  if (modifiers.includes(\"half\"))\n    return 0.5;\n  if (!modifiers.includes(\"threshold\"))\n    return 0;\n  let threshold = modifiers[modifiers.indexOf(\"threshold\") + 1];\n  if (threshold === \"100\")\n    return 1;\n  if (threshold === \"0\")\n    return 0;\n  return Number(`.${threshold}`);\n}\nfunction getLengthValue(rawValue) {\n  let match = rawValue.match(/^(-?[0-9]+)(px|%)?$/);\n  return match ? match[1] + (match[2] || \"px\") : void 0;\n}\nfunction getRootMargin(modifiers) {\n  const key = \"margin\";\n  const fallback = \"0px 0px 0px 0px\";\n  const index = modifiers.indexOf(key);\n  if (index === -1)\n    return fallback;\n  let values = [];\n  for (let i = 1; i < 5; i++) {\n    values.push(getLengthValue(modifiers[index + i] || \"\"));\n  }\n  values = values.filter((v) => v !== void 0);\n  return values.length ? values.join(\" \").trim() : fallback;\n}\n\n// packages/intersect/builds/module.js\nvar module_default = src_default;\n// Annotate the CommonJS export names for ESM import in node:\n0 && (module.exports = {\n  intersect\n});\n", "var __defProp = Object.defineProperty;\nvar __getOwnPropDesc = Object.getOwnPropertyDescriptor;\nvar __getOwnPropNames = Object.getOwnPropertyNames;\nvar __hasOwnProp = Object.prototype.hasOwnProperty;\nvar __export = (target, all) => {\n  for (var name in all)\n    __defProp(target, name, { get: all[name], enumerable: true });\n};\nvar __copyProps = (to, from, except, desc) => {\n  if (from && typeof from === \"object\" || typeof from === \"function\") {\n    for (let key of __getOwnPropNames(from))\n      if (!__hasOwnProp.call(to, key) && key !== except)\n        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });\n  }\n  return to;\n};\nvar __toCommonJS = (mod) => __copyProps(__defProp({}, \"__esModule\", { value: true }), mod);\n\n// packages/resize/builds/module.js\nvar module_exports = {};\n__export(module_exports, {\n  default: () => module_default,\n  resize: () => src_default\n});\nmodule.exports = __toCommonJS(module_exports);\n\n// packages/resize/src/index.js\nfunction src_default(Alpine) {\n  Alpine.directive(\"resize\", Alpine.skipDuringClone((el, { value, expression, modifiers }, { evaluateLater, cleanup }) => {\n    let evaluator = evaluateLater(expression);\n    let evaluate = (width, height) => {\n      evaluator(() => {\n      }, { scope: { \"$width\": width, \"$height\": height } });\n    };\n    let off = modifiers.includes(\"document\") ? onDocumentResize(evaluate) : onElResize(el, evaluate);\n    cleanup(() => off());\n  }));\n}\nfunction onElResize(el, callback) {\n  let observer = new ResizeObserver((entries) => {\n    let [width, height] = dimensions(entries);\n    callback(width, height);\n  });\n  observer.observe(el);\n  return () => observer.disconnect();\n}\nvar documentResizeObserver;\nvar documentResizeObserverCallbacks = /* @__PURE__ */ new Set();\nfunction onDocumentResize(callback) {\n  documentResizeObserverCallbacks.add(callback);\n  if (!documentResizeObserver) {\n    documentResizeObserver = new ResizeObserver((entries) => {\n      let [width, height] = dimensions(entries);\n      documentResizeObserverCallbacks.forEach((i) => i(width, height));\n    });\n    documentResizeObserver.observe(document.documentElement);\n  }\n  return () => {\n    documentResizeObserverCallbacks.delete(callback);\n  };\n}\nfunction dimensions(entries) {\n  let width, height;\n  for (let entry of entries) {\n    width = entry.borderBoxSize[0].inlineSize;\n    height = entry.borderBoxSize[0].blockSize;\n  }\n  return [width, height];\n}\n\n// packages/resize/builds/module.js\nvar module_default = src_default;\n// Annotate the CommonJS export names for ESM import in node:\n0 && (module.exports = {\n  resize\n});\n", "var __defProp = Object.defineProperty;\nvar __getOwnPropDesc = Object.getOwnPropertyDescriptor;\nvar __getOwnPropNames = Object.getOwnPropertyNames;\nvar __hasOwnProp = Object.prototype.hasOwnProperty;\nvar __export = (target, all) => {\n  for (var name in all)\n    __defProp(target, name, { get: all[name], enumerable: true });\n};\nvar __copyProps = (to, from, except, desc) => {\n  if (from && typeof from === \"object\" || typeof from === \"function\") {\n    for (let key of __getOwnPropNames(from))\n      if (!__hasOwnProp.call(to, key) && key !== except)\n        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });\n  }\n  return to;\n};\nvar __toCommonJS = (mod) => __copyProps(__defProp({}, \"__esModule\", { value: true }), mod);\n\n// packages/anchor/builds/module.js\nvar module_exports = {};\n__export(module_exports, {\n  anchor: () => src_default,\n  default: () => module_default\n});\nmodule.exports = __toCommonJS(module_exports);\n\n// node_modules/@floating-ui/utils/dist/floating-ui.utils.mjs\nvar min = Math.min;\nvar max = Math.max;\nvar round = Math.round;\nvar floor = Math.floor;\nvar createCoords = (v) => ({\n  x: v,\n  y: v\n});\nvar oppositeSideMap = {\n  left: \"right\",\n  right: \"left\",\n  bottom: \"top\",\n  top: \"bottom\"\n};\nvar oppositeAlignmentMap = {\n  start: \"end\",\n  end: \"start\"\n};\nfunction clamp(start, value, end) {\n  return max(start, min(value, end));\n}\nfunction evaluate(value, param) {\n  return typeof value === \"function\" ? value(param) : value;\n}\nfunction getSide(placement) {\n  return placement.split(\"-\")[0];\n}\nfunction getAlignment(placement) {\n  return placement.split(\"-\")[1];\n}\nfunction getOppositeAxis(axis) {\n  return axis === \"x\" ? \"y\" : \"x\";\n}\nfunction getAxisLength(axis) {\n  return axis === \"y\" ? \"height\" : \"width\";\n}\nfunction getSideAxis(placement) {\n  return [\"top\", \"bottom\"].includes(getSide(placement)) ? \"y\" : \"x\";\n}\nfunction getAlignmentAxis(placement) {\n  return getOppositeAxis(getSideAxis(placement));\n}\nfunction getAlignmentSides(placement, rects, rtl) {\n  if (rtl === void 0) {\n    rtl = false;\n  }\n  const alignment = getAlignment(placement);\n  const alignmentAxis = getAlignmentAxis(placement);\n  const length = getAxisLength(alignmentAxis);\n  let mainAlignmentSide = alignmentAxis === \"x\" ? alignment === (rtl ? \"end\" : \"start\") ? \"right\" : \"left\" : alignment === \"start\" ? \"bottom\" : \"top\";\n  if (rects.reference[length] > rects.floating[length]) {\n    mainAlignmentSide = getOppositePlacement(mainAlignmentSide);\n  }\n  return [mainAlignmentSide, getOppositePlacement(mainAlignmentSide)];\n}\nfunction getExpandedPlacements(placement) {\n  const oppositePlacement = getOppositePlacement(placement);\n  return [getOppositeAlignmentPlacement(placement), oppositePlacement, getOppositeAlignmentPlacement(oppositePlacement)];\n}\nfunction getOppositeAlignmentPlacement(placement) {\n  return placement.replace(/start|end/g, (alignment) => oppositeAlignmentMap[alignment]);\n}\nfunction getSideList(side, isStart, rtl) {\n  const lr = [\"left\", \"right\"];\n  const rl = [\"right\", \"left\"];\n  const tb = [\"top\", \"bottom\"];\n  const bt = [\"bottom\", \"top\"];\n  switch (side) {\n    case \"top\":\n    case \"bottom\":\n      if (rtl)\n        return isStart ? rl : lr;\n      return isStart ? lr : rl;\n    case \"left\":\n    case \"right\":\n      return isStart ? tb : bt;\n    default:\n      return [];\n  }\n}\nfunction getOppositeAxisPlacements(placement, flipAlignment, direction, rtl) {\n  const alignment = getAlignment(placement);\n  let list = getSideList(getSide(placement), direction === \"start\", rtl);\n  if (alignment) {\n    list = list.map((side) => side + \"-\" + alignment);\n    if (flipAlignment) {\n      list = list.concat(list.map(getOppositeAlignmentPlacement));\n    }\n  }\n  return list;\n}\nfunction getOppositePlacement(placement) {\n  return placement.replace(/left|right|bottom|top/g, (side) => oppositeSideMap[side]);\n}\nfunction expandPaddingObject(padding) {\n  return {\n    top: 0,\n    right: 0,\n    bottom: 0,\n    left: 0,\n    ...padding\n  };\n}\nfunction getPaddingObject(padding) {\n  return typeof padding !== \"number\" ? expandPaddingObject(padding) : {\n    top: padding,\n    right: padding,\n    bottom: padding,\n    left: padding\n  };\n}\nfunction rectToClientRect(rect) {\n  return {\n    ...rect,\n    top: rect.y,\n    left: rect.x,\n    right: rect.x + rect.width,\n    bottom: rect.y + rect.height\n  };\n}\n\n// node_modules/@floating-ui/core/dist/floating-ui.core.mjs\nfunction computeCoordsFromPlacement(_ref, placement, rtl) {\n  let {\n    reference,\n    floating\n  } = _ref;\n  const sideAxis = getSideAxis(placement);\n  const alignmentAxis = getAlignmentAxis(placement);\n  const alignLength = getAxisLength(alignmentAxis);\n  const side = getSide(placement);\n  const isVertical = sideAxis === \"y\";\n  const commonX = reference.x + reference.width / 2 - floating.width / 2;\n  const commonY = reference.y + reference.height / 2 - floating.height / 2;\n  const commonAlign = reference[alignLength] / 2 - floating[alignLength] / 2;\n  let coords;\n  switch (side) {\n    case \"top\":\n      coords = {\n        x: commonX,\n        y: reference.y - floating.height\n      };\n      break;\n    case \"bottom\":\n      coords = {\n        x: commonX,\n        y: reference.y + reference.height\n      };\n      break;\n    case \"right\":\n      coords = {\n        x: reference.x + reference.width,\n        y: commonY\n      };\n      break;\n    case \"left\":\n      coords = {\n        x: reference.x - floating.width,\n        y: commonY\n      };\n      break;\n    default:\n      coords = {\n        x: reference.x,\n        y: reference.y\n      };\n  }\n  switch (getAlignment(placement)) {\n    case \"start\":\n      coords[alignmentAxis] -= commonAlign * (rtl && isVertical ? -1 : 1);\n      break;\n    case \"end\":\n      coords[alignmentAxis] += commonAlign * (rtl && isVertical ? -1 : 1);\n      break;\n  }\n  return coords;\n}\nvar computePosition = async (reference, floating, config) => {\n  const {\n    placement = \"bottom\",\n    strategy = \"absolute\",\n    middleware = [],\n    platform: platform2\n  } = config;\n  const validMiddleware = middleware.filter(Boolean);\n  const rtl = await (platform2.isRTL == null ? void 0 : platform2.isRTL(floating));\n  let rects = await platform2.getElementRects({\n    reference,\n    floating,\n    strategy\n  });\n  let {\n    x,\n    y\n  } = computeCoordsFromPlacement(rects, placement, rtl);\n  let statefulPlacement = placement;\n  let middlewareData = {};\n  let resetCount = 0;\n  for (let i = 0; i < validMiddleware.length; i++) {\n    const {\n      name,\n      fn\n    } = validMiddleware[i];\n    const {\n      x: nextX,\n      y: nextY,\n      data,\n      reset\n    } = await fn({\n      x,\n      y,\n      initialPlacement: placement,\n      placement: statefulPlacement,\n      strategy,\n      middlewareData,\n      rects,\n      platform: platform2,\n      elements: {\n        reference,\n        floating\n      }\n    });\n    x = nextX != null ? nextX : x;\n    y = nextY != null ? nextY : y;\n    middlewareData = {\n      ...middlewareData,\n      [name]: {\n        ...middlewareData[name],\n        ...data\n      }\n    };\n    if (reset && resetCount <= 50) {\n      resetCount++;\n      if (typeof reset === \"object\") {\n        if (reset.placement) {\n          statefulPlacement = reset.placement;\n        }\n        if (reset.rects) {\n          rects = reset.rects === true ? await platform2.getElementRects({\n            reference,\n            floating,\n            strategy\n          }) : reset.rects;\n        }\n        ({\n          x,\n          y\n        } = computeCoordsFromPlacement(rects, statefulPlacement, rtl));\n      }\n      i = -1;\n      continue;\n    }\n  }\n  return {\n    x,\n    y,\n    placement: statefulPlacement,\n    strategy,\n    middlewareData\n  };\n};\nasync function detectOverflow(state, options) {\n  var _await$platform$isEle;\n  if (options === void 0) {\n    options = {};\n  }\n  const {\n    x,\n    y,\n    platform: platform2,\n    rects,\n    elements,\n    strategy\n  } = state;\n  const {\n    boundary = \"clippingAncestors\",\n    rootBoundary = \"viewport\",\n    elementContext = \"floating\",\n    altBoundary = false,\n    padding = 0\n  } = evaluate(options, state);\n  const paddingObject = getPaddingObject(padding);\n  const altContext = elementContext === \"floating\" ? \"reference\" : \"floating\";\n  const element = elements[altBoundary ? altContext : elementContext];\n  const clippingClientRect = rectToClientRect(await platform2.getClippingRect({\n    element: ((_await$platform$isEle = await (platform2.isElement == null ? void 0 : platform2.isElement(element))) != null ? _await$platform$isEle : true) ? element : element.contextElement || await (platform2.getDocumentElement == null ? void 0 : platform2.getDocumentElement(elements.floating)),\n    boundary,\n    rootBoundary,\n    strategy\n  }));\n  const rect = elementContext === \"floating\" ? {\n    ...rects.floating,\n    x,\n    y\n  } : rects.reference;\n  const offsetParent = await (platform2.getOffsetParent == null ? void 0 : platform2.getOffsetParent(elements.floating));\n  const offsetScale = await (platform2.isElement == null ? void 0 : platform2.isElement(offsetParent)) ? await (platform2.getScale == null ? void 0 : platform2.getScale(offsetParent)) || {\n    x: 1,\n    y: 1\n  } : {\n    x: 1,\n    y: 1\n  };\n  const elementClientRect = rectToClientRect(platform2.convertOffsetParentRelativeRectToViewportRelativeRect ? await platform2.convertOffsetParentRelativeRectToViewportRelativeRect({\n    rect,\n    offsetParent,\n    strategy\n  }) : rect);\n  return {\n    top: (clippingClientRect.top - elementClientRect.top + paddingObject.top) / offsetScale.y,\n    bottom: (elementClientRect.bottom - clippingClientRect.bottom + paddingObject.bottom) / offsetScale.y,\n    left: (clippingClientRect.left - elementClientRect.left + paddingObject.left) / offsetScale.x,\n    right: (elementClientRect.right - clippingClientRect.right + paddingObject.right) / offsetScale.x\n  };\n}\nvar flip = function(options) {\n  if (options === void 0) {\n    options = {};\n  }\n  return {\n    name: \"flip\",\n    options,\n    async fn(state) {\n      var _middlewareData$arrow, _middlewareData$flip;\n      const {\n        placement,\n        middlewareData,\n        rects,\n        initialPlacement,\n        platform: platform2,\n        elements\n      } = state;\n      const {\n        mainAxis: checkMainAxis = true,\n        crossAxis: checkCrossAxis = true,\n        fallbackPlacements: specifiedFallbackPlacements,\n        fallbackStrategy = \"bestFit\",\n        fallbackAxisSideDirection = \"none\",\n        flipAlignment = true,\n        ...detectOverflowOptions\n      } = evaluate(options, state);\n      if ((_middlewareData$arrow = middlewareData.arrow) != null && _middlewareData$arrow.alignmentOffset) {\n        return {};\n      }\n      const side = getSide(placement);\n      const isBasePlacement = getSide(initialPlacement) === initialPlacement;\n      const rtl = await (platform2.isRTL == null ? void 0 : platform2.isRTL(elements.floating));\n      const fallbackPlacements = specifiedFallbackPlacements || (isBasePlacement || !flipAlignment ? [getOppositePlacement(initialPlacement)] : getExpandedPlacements(initialPlacement));\n      if (!specifiedFallbackPlacements && fallbackAxisSideDirection !== \"none\") {\n        fallbackPlacements.push(...getOppositeAxisPlacements(initialPlacement, flipAlignment, fallbackAxisSideDirection, rtl));\n      }\n      const placements2 = [initialPlacement, ...fallbackPlacements];\n      const overflow = await detectOverflow(state, detectOverflowOptions);\n      const overflows = [];\n      let overflowsData = ((_middlewareData$flip = middlewareData.flip) == null ? void 0 : _middlewareData$flip.overflows) || [];\n      if (checkMainAxis) {\n        overflows.push(overflow[side]);\n      }\n      if (checkCrossAxis) {\n        const sides2 = getAlignmentSides(placement, rects, rtl);\n        overflows.push(overflow[sides2[0]], overflow[sides2[1]]);\n      }\n      overflowsData = [...overflowsData, {\n        placement,\n        overflows\n      }];\n      if (!overflows.every((side2) => side2 <= 0)) {\n        var _middlewareData$flip2, _overflowsData$filter;\n        const nextIndex = (((_middlewareData$flip2 = middlewareData.flip) == null ? void 0 : _middlewareData$flip2.index) || 0) + 1;\n        const nextPlacement = placements2[nextIndex];\n        if (nextPlacement) {\n          return {\n            data: {\n              index: nextIndex,\n              overflows: overflowsData\n            },\n            reset: {\n              placement: nextPlacement\n            }\n          };\n        }\n        let resetPlacement = (_overflowsData$filter = overflowsData.filter((d) => d.overflows[0] <= 0).sort((a, b) => a.overflows[1] - b.overflows[1])[0]) == null ? void 0 : _overflowsData$filter.placement;\n        if (!resetPlacement) {\n          switch (fallbackStrategy) {\n            case \"bestFit\": {\n              var _overflowsData$map$so;\n              const placement2 = (_overflowsData$map$so = overflowsData.map((d) => [d.placement, d.overflows.filter((overflow2) => overflow2 > 0).reduce((acc, overflow2) => acc + overflow2, 0)]).sort((a, b) => a[1] - b[1])[0]) == null ? void 0 : _overflowsData$map$so[0];\n              if (placement2) {\n                resetPlacement = placement2;\n              }\n              break;\n            }\n            case \"initialPlacement\":\n              resetPlacement = initialPlacement;\n              break;\n          }\n        }\n        if (placement !== resetPlacement) {\n          return {\n            reset: {\n              placement: resetPlacement\n            }\n          };\n        }\n      }\n      return {};\n    }\n  };\n};\nasync function convertValueToCoords(state, options) {\n  const {\n    placement,\n    platform: platform2,\n    elements\n  } = state;\n  const rtl = await (platform2.isRTL == null ? void 0 : platform2.isRTL(elements.floating));\n  const side = getSide(placement);\n  const alignment = getAlignment(placement);\n  const isVertical = getSideAxis(placement) === \"y\";\n  const mainAxisMulti = [\"left\", \"top\"].includes(side) ? -1 : 1;\n  const crossAxisMulti = rtl && isVertical ? -1 : 1;\n  const rawValue = evaluate(options, state);\n  let {\n    mainAxis,\n    crossAxis,\n    alignmentAxis\n  } = typeof rawValue === \"number\" ? {\n    mainAxis: rawValue,\n    crossAxis: 0,\n    alignmentAxis: null\n  } : {\n    mainAxis: 0,\n    crossAxis: 0,\n    alignmentAxis: null,\n    ...rawValue\n  };\n  if (alignment && typeof alignmentAxis === \"number\") {\n    crossAxis = alignment === \"end\" ? alignmentAxis * -1 : alignmentAxis;\n  }\n  return isVertical ? {\n    x: crossAxis * crossAxisMulti,\n    y: mainAxis * mainAxisMulti\n  } : {\n    x: mainAxis * mainAxisMulti,\n    y: crossAxis * crossAxisMulti\n  };\n}\nvar offset = function(options) {\n  if (options === void 0) {\n    options = 0;\n  }\n  return {\n    name: \"offset\",\n    options,\n    async fn(state) {\n      const {\n        x,\n        y\n      } = state;\n      const diffCoords = await convertValueToCoords(state, options);\n      return {\n        x: x + diffCoords.x,\n        y: y + diffCoords.y,\n        data: diffCoords\n      };\n    }\n  };\n};\nvar shift = function(options) {\n  if (options === void 0) {\n    options = {};\n  }\n  return {\n    name: \"shift\",\n    options,\n    async fn(state) {\n      const {\n        x,\n        y,\n        placement\n      } = state;\n      const {\n        mainAxis: checkMainAxis = true,\n        crossAxis: checkCrossAxis = false,\n        limiter = {\n          fn: (_ref) => {\n            let {\n              x: x2,\n              y: y2\n            } = _ref;\n            return {\n              x: x2,\n              y: y2\n            };\n          }\n        },\n        ...detectOverflowOptions\n      } = evaluate(options, state);\n      const coords = {\n        x,\n        y\n      };\n      const overflow = await detectOverflow(state, detectOverflowOptions);\n      const crossAxis = getSideAxis(getSide(placement));\n      const mainAxis = getOppositeAxis(crossAxis);\n      let mainAxisCoord = coords[mainAxis];\n      let crossAxisCoord = coords[crossAxis];\n      if (checkMainAxis) {\n        const minSide = mainAxis === \"y\" ? \"top\" : \"left\";\n        const maxSide = mainAxis === \"y\" ? \"bottom\" : \"right\";\n        const min2 = mainAxisCoord + overflow[minSide];\n        const max2 = mainAxisCoord - overflow[maxSide];\n        mainAxisCoord = clamp(min2, mainAxisCoord, max2);\n      }\n      if (checkCrossAxis) {\n        const minSide = crossAxis === \"y\" ? \"top\" : \"left\";\n        const maxSide = crossAxis === \"y\" ? \"bottom\" : \"right\";\n        const min2 = crossAxisCoord + overflow[minSide];\n        const max2 = crossAxisCoord - overflow[maxSide];\n        crossAxisCoord = clamp(min2, crossAxisCoord, max2);\n      }\n      const limitedCoords = limiter.fn({\n        ...state,\n        [mainAxis]: mainAxisCoord,\n        [crossAxis]: crossAxisCoord\n      });\n      return {\n        ...limitedCoords,\n        data: {\n          x: limitedCoords.x - x,\n          y: limitedCoords.y - y\n        }\n      };\n    }\n  };\n};\n\n// node_modules/@floating-ui/utils/dom/dist/floating-ui.utils.dom.mjs\nfunction getNodeName(node) {\n  if (isNode(node)) {\n    return (node.nodeName || \"\").toLowerCase();\n  }\n  return \"#document\";\n}\nfunction getWindow(node) {\n  var _node$ownerDocument;\n  return (node == null ? void 0 : (_node$ownerDocument = node.ownerDocument) == null ? void 0 : _node$ownerDocument.defaultView) || window;\n}\nfunction getDocumentElement(node) {\n  var _ref;\n  return (_ref = (isNode(node) ? node.ownerDocument : node.document) || window.document) == null ? void 0 : _ref.documentElement;\n}\nfunction isNode(value) {\n  return value instanceof Node || value instanceof getWindow(value).Node;\n}\nfunction isElement(value) {\n  return value instanceof Element || value instanceof getWindow(value).Element;\n}\nfunction isHTMLElement(value) {\n  return value instanceof HTMLElement || value instanceof getWindow(value).HTMLElement;\n}\nfunction isShadowRoot(value) {\n  if (typeof ShadowRoot === \"undefined\") {\n    return false;\n  }\n  return value instanceof ShadowRoot || value instanceof getWindow(value).ShadowRoot;\n}\nfunction isOverflowElement(element) {\n  const {\n    overflow,\n    overflowX,\n    overflowY,\n    display\n  } = getComputedStyle(element);\n  return /auto|scroll|overlay|hidden|clip/.test(overflow + overflowY + overflowX) && ![\"inline\", \"contents\"].includes(display);\n}\nfunction isTableElement(element) {\n  return [\"table\", \"td\", \"th\"].includes(getNodeName(element));\n}\nfunction isContainingBlock(element) {\n  const webkit = isWebKit();\n  const css = getComputedStyle(element);\n  return css.transform !== \"none\" || css.perspective !== \"none\" || (css.containerType ? css.containerType !== \"normal\" : false) || !webkit && (css.backdropFilter ? css.backdropFilter !== \"none\" : false) || !webkit && (css.filter ? css.filter !== \"none\" : false) || [\"transform\", \"perspective\", \"filter\"].some((value) => (css.willChange || \"\").includes(value)) || [\"paint\", \"layout\", \"strict\", \"content\"].some((value) => (css.contain || \"\").includes(value));\n}\nfunction getContainingBlock(element) {\n  let currentNode = getParentNode(element);\n  while (isHTMLElement(currentNode) && !isLastTraversableNode(currentNode)) {\n    if (isContainingBlock(currentNode)) {\n      return currentNode;\n    } else {\n      currentNode = getParentNode(currentNode);\n    }\n  }\n  return null;\n}\nfunction isWebKit() {\n  if (typeof CSS === \"undefined\" || !CSS.supports)\n    return false;\n  return CSS.supports(\"-webkit-backdrop-filter\", \"none\");\n}\nfunction isLastTraversableNode(node) {\n  return [\"html\", \"body\", \"#document\"].includes(getNodeName(node));\n}\nfunction getComputedStyle(element) {\n  return getWindow(element).getComputedStyle(element);\n}\nfunction getNodeScroll(element) {\n  if (isElement(element)) {\n    return {\n      scrollLeft: element.scrollLeft,\n      scrollTop: element.scrollTop\n    };\n  }\n  return {\n    scrollLeft: element.pageXOffset,\n    scrollTop: element.pageYOffset\n  };\n}\nfunction getParentNode(node) {\n  if (getNodeName(node) === \"html\") {\n    return node;\n  }\n  const result = (\n    // Step into the shadow DOM of the parent of a slotted node.\n    node.assignedSlot || // DOM Element detected.\n    node.parentNode || // ShadowRoot detected.\n    isShadowRoot(node) && node.host || // Fallback.\n    getDocumentElement(node)\n  );\n  return isShadowRoot(result) ? result.host : result;\n}\nfunction getNearestOverflowAncestor(node) {\n  const parentNode = getParentNode(node);\n  if (isLastTraversableNode(parentNode)) {\n    return node.ownerDocument ? node.ownerDocument.body : node.body;\n  }\n  if (isHTMLElement(parentNode) && isOverflowElement(parentNode)) {\n    return parentNode;\n  }\n  return getNearestOverflowAncestor(parentNode);\n}\nfunction getOverflowAncestors(node, list, traverseIframes) {\n  var _node$ownerDocument2;\n  if (list === void 0) {\n    list = [];\n  }\n  if (traverseIframes === void 0) {\n    traverseIframes = true;\n  }\n  const scrollableAncestor = getNearestOverflowAncestor(node);\n  const isBody = scrollableAncestor === ((_node$ownerDocument2 = node.ownerDocument) == null ? void 0 : _node$ownerDocument2.body);\n  const win = getWindow(scrollableAncestor);\n  if (isBody) {\n    return list.concat(win, win.visualViewport || [], isOverflowElement(scrollableAncestor) ? scrollableAncestor : [], win.frameElement && traverseIframes ? getOverflowAncestors(win.frameElement) : []);\n  }\n  return list.concat(scrollableAncestor, getOverflowAncestors(scrollableAncestor, [], traverseIframes));\n}\n\n// node_modules/@floating-ui/dom/dist/floating-ui.dom.mjs\nfunction getCssDimensions(element) {\n  const css = getComputedStyle(element);\n  let width = parseFloat(css.width) || 0;\n  let height = parseFloat(css.height) || 0;\n  const hasOffset = isHTMLElement(element);\n  const offsetWidth = hasOffset ? element.offsetWidth : width;\n  const offsetHeight = hasOffset ? element.offsetHeight : height;\n  const shouldFallback = round(width) !== offsetWidth || round(height) !== offsetHeight;\n  if (shouldFallback) {\n    width = offsetWidth;\n    height = offsetHeight;\n  }\n  return {\n    width,\n    height,\n    $: shouldFallback\n  };\n}\nfunction unwrapElement(element) {\n  return !isElement(element) ? element.contextElement : element;\n}\nfunction getScale(element) {\n  const domElement = unwrapElement(element);\n  if (!isHTMLElement(domElement)) {\n    return createCoords(1);\n  }\n  const rect = domElement.getBoundingClientRect();\n  const {\n    width,\n    height,\n    $\n  } = getCssDimensions(domElement);\n  let x = ($ ? round(rect.width) : rect.width) / width;\n  let y = ($ ? round(rect.height) : rect.height) / height;\n  if (!x || !Number.isFinite(x)) {\n    x = 1;\n  }\n  if (!y || !Number.isFinite(y)) {\n    y = 1;\n  }\n  return {\n    x,\n    y\n  };\n}\nvar noOffsets = /* @__PURE__ */ createCoords(0);\nfunction getVisualOffsets(element) {\n  const win = getWindow(element);\n  if (!isWebKit() || !win.visualViewport) {\n    return noOffsets;\n  }\n  return {\n    x: win.visualViewport.offsetLeft,\n    y: win.visualViewport.offsetTop\n  };\n}\nfunction shouldAddVisualOffsets(element, isFixed, floatingOffsetParent) {\n  if (isFixed === void 0) {\n    isFixed = false;\n  }\n  if (!floatingOffsetParent || isFixed && floatingOffsetParent !== getWindow(element)) {\n    return false;\n  }\n  return isFixed;\n}\nfunction getBoundingClientRect(element, includeScale, isFixedStrategy, offsetParent) {\n  if (includeScale === void 0) {\n    includeScale = false;\n  }\n  if (isFixedStrategy === void 0) {\n    isFixedStrategy = false;\n  }\n  const clientRect = element.getBoundingClientRect();\n  const domElement = unwrapElement(element);\n  let scale = createCoords(1);\n  if (includeScale) {\n    if (offsetParent) {\n      if (isElement(offsetParent)) {\n        scale = getScale(offsetParent);\n      }\n    } else {\n      scale = getScale(element);\n    }\n  }\n  const visualOffsets = shouldAddVisualOffsets(domElement, isFixedStrategy, offsetParent) ? getVisualOffsets(domElement) : createCoords(0);\n  let x = (clientRect.left + visualOffsets.x) / scale.x;\n  let y = (clientRect.top + visualOffsets.y) / scale.y;\n  let width = clientRect.width / scale.x;\n  let height = clientRect.height / scale.y;\n  if (domElement) {\n    const win = getWindow(domElement);\n    const offsetWin = offsetParent && isElement(offsetParent) ? getWindow(offsetParent) : offsetParent;\n    let currentIFrame = win.frameElement;\n    while (currentIFrame && offsetParent && offsetWin !== win) {\n      const iframeScale = getScale(currentIFrame);\n      const iframeRect = currentIFrame.getBoundingClientRect();\n      const css = getComputedStyle(currentIFrame);\n      const left = iframeRect.left + (currentIFrame.clientLeft + parseFloat(css.paddingLeft)) * iframeScale.x;\n      const top = iframeRect.top + (currentIFrame.clientTop + parseFloat(css.paddingTop)) * iframeScale.y;\n      x *= iframeScale.x;\n      y *= iframeScale.y;\n      width *= iframeScale.x;\n      height *= iframeScale.y;\n      x += left;\n      y += top;\n      currentIFrame = getWindow(currentIFrame).frameElement;\n    }\n  }\n  return rectToClientRect({\n    width,\n    height,\n    x,\n    y\n  });\n}\nfunction convertOffsetParentRelativeRectToViewportRelativeRect(_ref) {\n  let {\n    rect,\n    offsetParent,\n    strategy\n  } = _ref;\n  const isOffsetParentAnElement = isHTMLElement(offsetParent);\n  const documentElement = getDocumentElement(offsetParent);\n  if (offsetParent === documentElement) {\n    return rect;\n  }\n  let scroll = {\n    scrollLeft: 0,\n    scrollTop: 0\n  };\n  let scale = createCoords(1);\n  const offsets = createCoords(0);\n  if (isOffsetParentAnElement || !isOffsetParentAnElement && strategy !== \"fixed\") {\n    if (getNodeName(offsetParent) !== \"body\" || isOverflowElement(documentElement)) {\n      scroll = getNodeScroll(offsetParent);\n    }\n    if (isHTMLElement(offsetParent)) {\n      const offsetRect = getBoundingClientRect(offsetParent);\n      scale = getScale(offsetParent);\n      offsets.x = offsetRect.x + offsetParent.clientLeft;\n      offsets.y = offsetRect.y + offsetParent.clientTop;\n    }\n  }\n  return {\n    width: rect.width * scale.x,\n    height: rect.height * scale.y,\n    x: rect.x * scale.x - scroll.scrollLeft * scale.x + offsets.x,\n    y: rect.y * scale.y - scroll.scrollTop * scale.y + offsets.y\n  };\n}\nfunction getClientRects(element) {\n  return Array.from(element.getClientRects());\n}\nfunction getWindowScrollBarX(element) {\n  return getBoundingClientRect(getDocumentElement(element)).left + getNodeScroll(element).scrollLeft;\n}\nfunction getDocumentRect(element) {\n  const html = getDocumentElement(element);\n  const scroll = getNodeScroll(element);\n  const body = element.ownerDocument.body;\n  const width = max(html.scrollWidth, html.clientWidth, body.scrollWidth, body.clientWidth);\n  const height = max(html.scrollHeight, html.clientHeight, body.scrollHeight, body.clientHeight);\n  let x = -scroll.scrollLeft + getWindowScrollBarX(element);\n  const y = -scroll.scrollTop;\n  if (getComputedStyle(body).direction === \"rtl\") {\n    x += max(html.clientWidth, body.clientWidth) - width;\n  }\n  return {\n    width,\n    height,\n    x,\n    y\n  };\n}\nfunction getViewportRect(element, strategy) {\n  const win = getWindow(element);\n  const html = getDocumentElement(element);\n  const visualViewport = win.visualViewport;\n  let width = html.clientWidth;\n  let height = html.clientHeight;\n  let x = 0;\n  let y = 0;\n  if (visualViewport) {\n    width = visualViewport.width;\n    height = visualViewport.height;\n    const visualViewportBased = isWebKit();\n    if (!visualViewportBased || visualViewportBased && strategy === \"fixed\") {\n      x = visualViewport.offsetLeft;\n      y = visualViewport.offsetTop;\n    }\n  }\n  return {\n    width,\n    height,\n    x,\n    y\n  };\n}\nfunction getInnerBoundingClientRect(element, strategy) {\n  const clientRect = getBoundingClientRect(element, true, strategy === \"fixed\");\n  const top = clientRect.top + element.clientTop;\n  const left = clientRect.left + element.clientLeft;\n  const scale = isHTMLElement(element) ? getScale(element) : createCoords(1);\n  const width = element.clientWidth * scale.x;\n  const height = element.clientHeight * scale.y;\n  const x = left * scale.x;\n  const y = top * scale.y;\n  return {\n    width,\n    height,\n    x,\n    y\n  };\n}\nfunction getClientRectFromClippingAncestor(element, clippingAncestor, strategy) {\n  let rect;\n  if (clippingAncestor === \"viewport\") {\n    rect = getViewportRect(element, strategy);\n  } else if (clippingAncestor === \"document\") {\n    rect = getDocumentRect(getDocumentElement(element));\n  } else if (isElement(clippingAncestor)) {\n    rect = getInnerBoundingClientRect(clippingAncestor, strategy);\n  } else {\n    const visualOffsets = getVisualOffsets(element);\n    rect = {\n      ...clippingAncestor,\n      x: clippingAncestor.x - visualOffsets.x,\n      y: clippingAncestor.y - visualOffsets.y\n    };\n  }\n  return rectToClientRect(rect);\n}\nfunction hasFixedPositionAncestor(element, stopNode) {\n  const parentNode = getParentNode(element);\n  if (parentNode === stopNode || !isElement(parentNode) || isLastTraversableNode(parentNode)) {\n    return false;\n  }\n  return getComputedStyle(parentNode).position === \"fixed\" || hasFixedPositionAncestor(parentNode, stopNode);\n}\nfunction getClippingElementAncestors(element, cache) {\n  const cachedResult = cache.get(element);\n  if (cachedResult) {\n    return cachedResult;\n  }\n  let result = getOverflowAncestors(element, [], false).filter((el) => isElement(el) && getNodeName(el) !== \"body\");\n  let currentContainingBlockComputedStyle = null;\n  const elementIsFixed = getComputedStyle(element).position === \"fixed\";\n  let currentNode = elementIsFixed ? getParentNode(element) : element;\n  while (isElement(currentNode) && !isLastTraversableNode(currentNode)) {\n    const computedStyle = getComputedStyle(currentNode);\n    const currentNodeIsContaining = isContainingBlock(currentNode);\n    if (!currentNodeIsContaining && computedStyle.position === \"fixed\") {\n      currentContainingBlockComputedStyle = null;\n    }\n    const shouldDropCurrentNode = elementIsFixed ? !currentNodeIsContaining && !currentContainingBlockComputedStyle : !currentNodeIsContaining && computedStyle.position === \"static\" && !!currentContainingBlockComputedStyle && [\"absolute\", \"fixed\"].includes(currentContainingBlockComputedStyle.position) || isOverflowElement(currentNode) && !currentNodeIsContaining && hasFixedPositionAncestor(element, currentNode);\n    if (shouldDropCurrentNode) {\n      result = result.filter((ancestor) => ancestor !== currentNode);\n    } else {\n      currentContainingBlockComputedStyle = computedStyle;\n    }\n    currentNode = getParentNode(currentNode);\n  }\n  cache.set(element, result);\n  return result;\n}\nfunction getClippingRect(_ref) {\n  let {\n    element,\n    boundary,\n    rootBoundary,\n    strategy\n  } = _ref;\n  const elementClippingAncestors = boundary === \"clippingAncestors\" ? getClippingElementAncestors(element, this._c) : [].concat(boundary);\n  const clippingAncestors = [...elementClippingAncestors, rootBoundary];\n  const firstClippingAncestor = clippingAncestors[0];\n  const clippingRect = clippingAncestors.reduce((accRect, clippingAncestor) => {\n    const rect = getClientRectFromClippingAncestor(element, clippingAncestor, strategy);\n    accRect.top = max(rect.top, accRect.top);\n    accRect.right = min(rect.right, accRect.right);\n    accRect.bottom = min(rect.bottom, accRect.bottom);\n    accRect.left = max(rect.left, accRect.left);\n    return accRect;\n  }, getClientRectFromClippingAncestor(element, firstClippingAncestor, strategy));\n  return {\n    width: clippingRect.right - clippingRect.left,\n    height: clippingRect.bottom - clippingRect.top,\n    x: clippingRect.left,\n    y: clippingRect.top\n  };\n}\nfunction getDimensions(element) {\n  return getCssDimensions(element);\n}\nfunction getRectRelativeToOffsetParent(element, offsetParent, strategy) {\n  const isOffsetParentAnElement = isHTMLElement(offsetParent);\n  const documentElement = getDocumentElement(offsetParent);\n  const isFixed = strategy === \"fixed\";\n  const rect = getBoundingClientRect(element, true, isFixed, offsetParent);\n  let scroll = {\n    scrollLeft: 0,\n    scrollTop: 0\n  };\n  const offsets = createCoords(0);\n  if (isOffsetParentAnElement || !isOffsetParentAnElement && !isFixed) {\n    if (getNodeName(offsetParent) !== \"body\" || isOverflowElement(documentElement)) {\n      scroll = getNodeScroll(offsetParent);\n    }\n    if (isOffsetParentAnElement) {\n      const offsetRect = getBoundingClientRect(offsetParent, true, isFixed, offsetParent);\n      offsets.x = offsetRect.x + offsetParent.clientLeft;\n      offsets.y = offsetRect.y + offsetParent.clientTop;\n    } else if (documentElement) {\n      offsets.x = getWindowScrollBarX(documentElement);\n    }\n  }\n  return {\n    x: rect.left + scroll.scrollLeft - offsets.x,\n    y: rect.top + scroll.scrollTop - offsets.y,\n    width: rect.width,\n    height: rect.height\n  };\n}\nfunction getTrueOffsetParent(element, polyfill) {\n  if (!isHTMLElement(element) || getComputedStyle(element).position === \"fixed\") {\n    return null;\n  }\n  if (polyfill) {\n    return polyfill(element);\n  }\n  return element.offsetParent;\n}\nfunction getOffsetParent(element, polyfill) {\n  const window2 = getWindow(element);\n  if (!isHTMLElement(element)) {\n    return window2;\n  }\n  let offsetParent = getTrueOffsetParent(element, polyfill);\n  while (offsetParent && isTableElement(offsetParent) && getComputedStyle(offsetParent).position === \"static\") {\n    offsetParent = getTrueOffsetParent(offsetParent, polyfill);\n  }\n  if (offsetParent && (getNodeName(offsetParent) === \"html\" || getNodeName(offsetParent) === \"body\" && getComputedStyle(offsetParent).position === \"static\" && !isContainingBlock(offsetParent))) {\n    return window2;\n  }\n  return offsetParent || getContainingBlock(element) || window2;\n}\nvar getElementRects = async function(_ref) {\n  let {\n    reference,\n    floating,\n    strategy\n  } = _ref;\n  const getOffsetParentFn = this.getOffsetParent || getOffsetParent;\n  const getDimensionsFn = this.getDimensions;\n  return {\n    reference: getRectRelativeToOffsetParent(reference, await getOffsetParentFn(floating), strategy),\n    floating: {\n      x: 0,\n      y: 0,\n      ...await getDimensionsFn(floating)\n    }\n  };\n};\nfunction isRTL(element) {\n  return getComputedStyle(element).direction === \"rtl\";\n}\nvar platform = {\n  convertOffsetParentRelativeRectToViewportRelativeRect,\n  getDocumentElement,\n  getClippingRect,\n  getOffsetParent,\n  getElementRects,\n  getClientRects,\n  getDimensions,\n  getScale,\n  isElement,\n  isRTL\n};\nfunction observeMove(element, onMove) {\n  let io = null;\n  let timeoutId;\n  const root = getDocumentElement(element);\n  function cleanup() {\n    clearTimeout(timeoutId);\n    io && io.disconnect();\n    io = null;\n  }\n  function refresh(skip, threshold) {\n    if (skip === void 0) {\n      skip = false;\n    }\n    if (threshold === void 0) {\n      threshold = 1;\n    }\n    cleanup();\n    const {\n      left,\n      top,\n      width,\n      height\n    } = element.getBoundingClientRect();\n    if (!skip) {\n      onMove();\n    }\n    if (!width || !height) {\n      return;\n    }\n    const insetTop = floor(top);\n    const insetRight = floor(root.clientWidth - (left + width));\n    const insetBottom = floor(root.clientHeight - (top + height));\n    const insetLeft = floor(left);\n    const rootMargin = -insetTop + \"px \" + -insetRight + \"px \" + -insetBottom + \"px \" + -insetLeft + \"px\";\n    const options = {\n      rootMargin,\n      threshold: max(0, min(1, threshold)) || 1\n    };\n    let isFirstUpdate = true;\n    function handleObserve(entries) {\n      const ratio = entries[0].intersectionRatio;\n      if (ratio !== threshold) {\n        if (!isFirstUpdate) {\n          return refresh();\n        }\n        if (!ratio) {\n          timeoutId = setTimeout(() => {\n            refresh(false, 1e-7);\n          }, 100);\n        } else {\n          refresh(false, ratio);\n        }\n      }\n      isFirstUpdate = false;\n    }\n    try {\n      io = new IntersectionObserver(handleObserve, {\n        ...options,\n        // Handle <iframe>s\n        root: root.ownerDocument\n      });\n    } catch (e) {\n      io = new IntersectionObserver(handleObserve, options);\n    }\n    io.observe(element);\n  }\n  refresh(true);\n  return cleanup;\n}\nfunction autoUpdate(reference, floating, update, options) {\n  if (options === void 0) {\n    options = {};\n  }\n  const {\n    ancestorScroll = true,\n    ancestorResize = true,\n    elementResize = typeof ResizeObserver === \"function\",\n    layoutShift = typeof IntersectionObserver === \"function\",\n    animationFrame = false\n  } = options;\n  const referenceEl = unwrapElement(reference);\n  const ancestors = ancestorScroll || ancestorResize ? [...referenceEl ? getOverflowAncestors(referenceEl) : [], ...getOverflowAncestors(floating)] : [];\n  ancestors.forEach((ancestor) => {\n    ancestorScroll && ancestor.addEventListener(\"scroll\", update, {\n      passive: true\n    });\n    ancestorResize && ancestor.addEventListener(\"resize\", update);\n  });\n  const cleanupIo = referenceEl && layoutShift ? observeMove(referenceEl, update) : null;\n  let reobserveFrame = -1;\n  let resizeObserver = null;\n  if (elementResize) {\n    resizeObserver = new ResizeObserver((_ref) => {\n      let [firstEntry] = _ref;\n      if (firstEntry && firstEntry.target === referenceEl && resizeObserver) {\n        resizeObserver.unobserve(floating);\n        cancelAnimationFrame(reobserveFrame);\n        reobserveFrame = requestAnimationFrame(() => {\n          resizeObserver && resizeObserver.observe(floating);\n        });\n      }\n      update();\n    });\n    if (referenceEl && !animationFrame) {\n      resizeObserver.observe(referenceEl);\n    }\n    resizeObserver.observe(floating);\n  }\n  let frameId;\n  let prevRefRect = animationFrame ? getBoundingClientRect(reference) : null;\n  if (animationFrame) {\n    frameLoop();\n  }\n  function frameLoop() {\n    const nextRefRect = getBoundingClientRect(reference);\n    if (prevRefRect && (nextRefRect.x !== prevRefRect.x || nextRefRect.y !== prevRefRect.y || nextRefRect.width !== prevRefRect.width || nextRefRect.height !== prevRefRect.height)) {\n      update();\n    }\n    prevRefRect = nextRefRect;\n    frameId = requestAnimationFrame(frameLoop);\n  }\n  update();\n  return () => {\n    ancestors.forEach((ancestor) => {\n      ancestorScroll && ancestor.removeEventListener(\"scroll\", update);\n      ancestorResize && ancestor.removeEventListener(\"resize\", update);\n    });\n    cleanupIo && cleanupIo();\n    resizeObserver && resizeObserver.disconnect();\n    resizeObserver = null;\n    if (animationFrame) {\n      cancelAnimationFrame(frameId);\n    }\n  };\n}\nvar computePosition2 = (reference, floating, options) => {\n  const cache = /* @__PURE__ */ new Map();\n  const mergedOptions = {\n    platform,\n    ...options\n  };\n  const platformWithCache = {\n    ...mergedOptions.platform,\n    _c: cache\n  };\n  return computePosition(reference, floating, {\n    ...mergedOptions,\n    platform: platformWithCache\n  });\n};\n\n// packages/anchor/src/index.js\nfunction src_default(Alpine) {\n  Alpine.magic(\"anchor\", (el) => {\n    if (!el._x_anchor)\n      throw \"Alpine: No x-anchor directive found on element using $anchor...\";\n    return el._x_anchor;\n  });\n  Alpine.interceptClone((from, to) => {\n    if (from && from._x_anchor && !to._x_anchor) {\n      to._x_anchor = from._x_anchor;\n    }\n  });\n  Alpine.directive(\"anchor\", Alpine.skipDuringClone(\n    (el, { expression, modifiers, value }, { cleanup, evaluate: evaluate2 }) => {\n      let { placement, offsetValue, unstyled } = getOptions(modifiers);\n      el._x_anchor = Alpine.reactive({ x: 0, y: 0 });\n      let reference = evaluate2(expression);\n      if (!reference)\n        throw \"Alpine: no element provided to x-anchor...\";\n      let compute = () => {\n        let previousValue;\n        computePosition2(reference, el, {\n          placement,\n          middleware: [flip(), shift({ padding: 5 }), offset(offsetValue)]\n        }).then(({ x, y }) => {\n          unstyled || setStyles(el, x, y);\n          if (JSON.stringify({ x, y }) !== previousValue) {\n            el._x_anchor.x = x;\n            el._x_anchor.y = y;\n          }\n          previousValue = JSON.stringify({ x, y });\n        });\n      };\n      let release = autoUpdate(reference, el, () => compute());\n      cleanup(() => release());\n    },\n    // When cloning (or \"morphing\"), we will graft the style and position data from the live tree...\n    (el, { expression, modifiers, value }, { cleanup, evaluate: evaluate2 }) => {\n      let { placement, offsetValue, unstyled } = getOptions(modifiers);\n      if (el._x_anchor) {\n        unstyled || setStyles(el, el._x_anchor.x, el._x_anchor.y);\n      }\n    }\n  ));\n}\nfunction setStyles(el, x, y) {\n  Object.assign(el.style, {\n    left: x + \"px\",\n    top: y + \"px\",\n    position: \"absolute\"\n  });\n}\nfunction getOptions(modifiers) {\n  let positions = [\"top\", \"top-start\", \"top-end\", \"right\", \"right-start\", \"right-end\", \"bottom\", \"bottom-start\", \"bottom-end\", \"left\", \"left-start\", \"left-end\"];\n  let placement = positions.find((i) => modifiers.includes(i));\n  let offsetValue = 0;\n  if (modifiers.includes(\"offset\")) {\n    let idx = modifiers.findIndex((i) => i === \"offset\");\n    offsetValue = modifiers[idx + 1] !== void 0 ? Number(modifiers[idx + 1]) : offsetValue;\n  }\n  let unstyled = modifiers.includes(\"no-style\");\n  return { placement, offsetValue, unstyled };\n}\n\n// packages/anchor/builds/module.js\nvar module_default = src_default;\n// Annotate the CommonJS export names for ESM import in node:\n0 && (module.exports = {\n  anchor\n});\n", "/* NProgress, (c) 2013, 2014 Rico Sta. Cruz - http://ricostacruz.com/nprogress\n * @license MIT */\n\n;(function(root, factory) {\n\n  if (typeof define === 'function' && define.amd) {\n    define(factory);\n  } else if (typeof exports === 'object') {\n    module.exports = factory();\n  } else {\n    root.NProgress = factory();\n  }\n\n})(this, function() {\n  var NProgress = {};\n\n  NProgress.version = '0.2.0';\n\n  var Settings = NProgress.settings = {\n    minimum: 0.08,\n    easing: 'ease',\n    positionUsing: '',\n    speed: 200,\n    trickle: true,\n    trickleRate: 0.02,\n    trickleSpeed: 800,\n    showSpinner: true,\n    barSelector: '[role=\"bar\"]',\n    spinnerSelector: '[role=\"spinner\"]',\n    parent: 'body',\n    template: '<div class=\"bar\" role=\"bar\"><div class=\"peg\"></div></div><div class=\"spinner\" role=\"spinner\"><div class=\"spinner-icon\"></div></div>'\n  };\n\n  /**\n   * Updates configuration.\n   *\n   *     NProgress.configure({\n   *       minimum: 0.1\n   *     });\n   */\n  NProgress.configure = function(options) {\n    var key, value;\n    for (key in options) {\n      value = options[key];\n      if (value !== undefined && options.hasOwnProperty(key)) Settings[key] = value;\n    }\n\n    return this;\n  };\n\n  /**\n   * Last number.\n   */\n\n  NProgress.status = null;\n\n  /**\n   * Sets the progress bar status, where `n` is a number from `0.0` to `1.0`.\n   *\n   *     NProgress.set(0.4);\n   *     NProgress.set(1.0);\n   */\n\n  NProgress.set = function(n) {\n    var started = NProgress.isStarted();\n\n    n = clamp(n, Settings.minimum, 1);\n    NProgress.status = (n === 1 ? null : n);\n\n    var progress = NProgress.render(!started),\n        bar      = progress.querySelector(Settings.barSelector),\n        speed    = Settings.speed,\n        ease     = Settings.easing;\n\n    progress.offsetWidth; /* Repaint */\n\n    queue(function(next) {\n      // Set positionUsing if it hasn't already been set\n      if (Settings.positionUsing === '') Settings.positionUsing = NProgress.getPositioningCSS();\n\n      // Add transition\n      css(bar, barPositionCSS(n, speed, ease));\n\n      if (n === 1) {\n        // Fade out\n        css(progress, { \n          transition: 'none', \n          opacity: 1 \n        });\n        progress.offsetWidth; /* Repaint */\n\n        setTimeout(function() {\n          css(progress, { \n            transition: 'all ' + speed + 'ms linear', \n            opacity: 0 \n          });\n          setTimeout(function() {\n            NProgress.remove();\n            next();\n          }, speed);\n        }, speed);\n      } else {\n        setTimeout(next, speed);\n      }\n    });\n\n    return this;\n  };\n\n  NProgress.isStarted = function() {\n    return typeof NProgress.status === 'number';\n  };\n\n  /**\n   * Shows the progress bar.\n   * This is the same as setting the status to 0%, except that it doesn't go backwards.\n   *\n   *     NProgress.start();\n   *\n   */\n  NProgress.start = function() {\n    if (!NProgress.status) NProgress.set(0);\n\n    var work = function() {\n      setTimeout(function() {\n        if (!NProgress.status) return;\n        NProgress.trickle();\n        work();\n      }, Settings.trickleSpeed);\n    };\n\n    if (Settings.trickle) work();\n\n    return this;\n  };\n\n  /**\n   * Hides the progress bar.\n   * This is the *sort of* the same as setting the status to 100%, with the\n   * difference being `done()` makes some placebo effect of some realistic motion.\n   *\n   *     NProgress.done();\n   *\n   * If `true` is passed, it will show the progress bar even if its hidden.\n   *\n   *     NProgress.done(true);\n   */\n\n  NProgress.done = function(force) {\n    if (!force && !NProgress.status) return this;\n\n    return NProgress.inc(0.3 + 0.5 * Math.random()).set(1);\n  };\n\n  /**\n   * Increments by a random amount.\n   */\n\n  NProgress.inc = function(amount) {\n    var n = NProgress.status;\n\n    if (!n) {\n      return NProgress.start();\n    } else {\n      if (typeof amount !== 'number') {\n        amount = (1 - n) * clamp(Math.random() * n, 0.1, 0.95);\n      }\n\n      n = clamp(n + amount, 0, 0.994);\n      return NProgress.set(n);\n    }\n  };\n\n  NProgress.trickle = function() {\n    return NProgress.inc(Math.random() * Settings.trickleRate);\n  };\n\n  /**\n   * Waits for all supplied jQuery promises and\n   * increases the progress as the promises resolve.\n   *\n   * @param $promise jQUery Promise\n   */\n  (function() {\n    var initial = 0, current = 0;\n\n    NProgress.promise = function($promise) {\n      if (!$promise || $promise.state() === \"resolved\") {\n        return this;\n      }\n\n      if (current === 0) {\n        NProgress.start();\n      }\n\n      initial++;\n      current++;\n\n      $promise.always(function() {\n        current--;\n        if (current === 0) {\n            initial = 0;\n            NProgress.done();\n        } else {\n            NProgress.set((initial - current) / initial);\n        }\n      });\n\n      return this;\n    };\n\n  })();\n\n  /**\n   * (Internal) renders the progress bar markup based on the `template`\n   * setting.\n   */\n\n  NProgress.render = function(fromStart) {\n    if (NProgress.isRendered()) return document.getElementById('nprogress');\n\n    addClass(document.documentElement, 'nprogress-busy');\n    \n    var progress = document.createElement('div');\n    progress.id = 'nprogress';\n    progress.innerHTML = Settings.template;\n\n    var bar      = progress.querySelector(Settings.barSelector),\n        perc     = fromStart ? '-100' : toBarPerc(NProgress.status || 0),\n        parent   = document.querySelector(Settings.parent),\n        spinner;\n    \n    css(bar, {\n      transition: 'all 0 linear',\n      transform: 'translate3d(' + perc + '%,0,0)'\n    });\n\n    if (!Settings.showSpinner) {\n      spinner = progress.querySelector(Settings.spinnerSelector);\n      spinner && removeElement(spinner);\n    }\n\n    if (parent != document.body) {\n      addClass(parent, 'nprogress-custom-parent');\n    }\n\n    parent.appendChild(progress);\n    return progress;\n  };\n\n  /**\n   * Removes the element. Opposite of render().\n   */\n\n  NProgress.remove = function() {\n    removeClass(document.documentElement, 'nprogress-busy');\n    removeClass(document.querySelector(Settings.parent), 'nprogress-custom-parent');\n    var progress = document.getElementById('nprogress');\n    progress && removeElement(progress);\n  };\n\n  /**\n   * Checks if the progress bar is rendered.\n   */\n\n  NProgress.isRendered = function() {\n    return !!document.getElementById('nprogress');\n  };\n\n  /**\n   * Determine which positioning CSS rule to use.\n   */\n\n  NProgress.getPositioningCSS = function() {\n    // Sniff on document.body.style\n    var bodyStyle = document.body.style;\n\n    // Sniff prefixes\n    var vendorPrefix = ('WebkitTransform' in bodyStyle) ? 'Webkit' :\n                       ('MozTransform' in bodyStyle) ? 'Moz' :\n                       ('msTransform' in bodyStyle) ? 'ms' :\n                       ('OTransform' in bodyStyle) ? 'O' : '';\n\n    if (vendorPrefix + 'Perspective' in bodyStyle) {\n      // Modern browsers with 3D support, e.g. Webkit, IE10\n      return 'translate3d';\n    } else if (vendorPrefix + 'Transform' in bodyStyle) {\n      // Browsers without 3D support, e.g. IE9\n      return 'translate';\n    } else {\n      // Browsers without translate() support, e.g. IE7-8\n      return 'margin';\n    }\n  };\n\n  /**\n   * Helpers\n   */\n\n  function clamp(n, min, max) {\n    if (n < min) return min;\n    if (n > max) return max;\n    return n;\n  }\n\n  /**\n   * (Internal) converts a percentage (`0..1`) to a bar translateX\n   * percentage (`-100%..0%`).\n   */\n\n  function toBarPerc(n) {\n    return (-1 + n) * 100;\n  }\n\n\n  /**\n   * (Internal) returns the correct CSS for changing the bar's\n   * position given an n percentage, and speed and ease from Settings\n   */\n\n  function barPositionCSS(n, speed, ease) {\n    var barCSS;\n\n    if (Settings.positionUsing === 'translate3d') {\n      barCSS = { transform: 'translate3d('+toBarPerc(n)+'%,0,0)' };\n    } else if (Settings.positionUsing === 'translate') {\n      barCSS = { transform: 'translate('+toBarPerc(n)+'%,0)' };\n    } else {\n      barCSS = { 'margin-left': toBarPerc(n)+'%' };\n    }\n\n    barCSS.transition = 'all '+speed+'ms '+ease;\n\n    return barCSS;\n  }\n\n  /**\n   * (Internal) Queues a function to be executed.\n   */\n\n  var queue = (function() {\n    var pending = [];\n    \n    function next() {\n      var fn = pending.shift();\n      if (fn) {\n        fn(next);\n      }\n    }\n\n    return function(fn) {\n      pending.push(fn);\n      if (pending.length == 1) next();\n    };\n  })();\n\n  /**\n   * (Internal) Applies css properties to an element, similar to the jQuery \n   * css method.\n   *\n   * While this helper does assist with vendor prefixed property names, it \n   * does not perform any manipulation of values prior to setting styles.\n   */\n\n  var css = (function() {\n    var cssPrefixes = [ 'Webkit', 'O', 'Moz', 'ms' ],\n        cssProps    = {};\n\n    function camelCase(string) {\n      return string.replace(/^-ms-/, 'ms-').replace(/-([\\da-z])/gi, function(match, letter) {\n        return letter.toUpperCase();\n      });\n    }\n\n    function getVendorProp(name) {\n      var style = document.body.style;\n      if (name in style) return name;\n\n      var i = cssPrefixes.length,\n          capName = name.charAt(0).toUpperCase() + name.slice(1),\n          vendorName;\n      while (i--) {\n        vendorName = cssPrefixes[i] + capName;\n        if (vendorName in style) return vendorName;\n      }\n\n      return name;\n    }\n\n    function getStyleProp(name) {\n      name = camelCase(name);\n      return cssProps[name] || (cssProps[name] = getVendorProp(name));\n    }\n\n    function applyCss(element, prop, value) {\n      prop = getStyleProp(prop);\n      element.style[prop] = value;\n    }\n\n    return function(element, properties) {\n      var args = arguments,\n          prop, \n          value;\n\n      if (args.length == 2) {\n        for (prop in properties) {\n          value = properties[prop];\n          if (value !== undefined && properties.hasOwnProperty(prop)) applyCss(element, prop, value);\n        }\n      } else {\n        applyCss(element, args[1], args[2]);\n      }\n    }\n  })();\n\n  /**\n   * (Internal) Determines if an element or space separated list of class names contains a class name.\n   */\n\n  function hasClass(element, name) {\n    var list = typeof element == 'string' ? element : classList(element);\n    return list.indexOf(' ' + name + ' ') >= 0;\n  }\n\n  /**\n   * (Internal) Adds a class to an element.\n   */\n\n  function addClass(element, name) {\n    var oldList = classList(element),\n        newList = oldList + name;\n\n    if (hasClass(oldList, name)) return; \n\n    // Trim the opening space.\n    element.className = newList.substring(1);\n  }\n\n  /**\n   * (Internal) Removes a class from an element.\n   */\n\n  function removeClass(element, name) {\n    var oldList = classList(element),\n        newList;\n\n    if (!hasClass(element, name)) return;\n\n    // Replace the class name.\n    newList = oldList.replace(' ' + name + ' ', ' ');\n\n    // Trim the opening and closing spaces.\n    element.className = newList.substring(1, newList.length - 1);\n  }\n\n  /**\n   * (Internal) Gets a space separated list of the class names on the element. \n   * The list is wrapped with a single space on each end to facilitate finding \n   * matches within the list.\n   */\n\n  function classList(element) {\n    return (' ' + (element.className || '') + ' ').replace(/\\s+/gi, ' ');\n  }\n\n  /**\n   * (Internal) Removes an element from the DOM.\n   */\n\n  function removeElement(element) {\n    element && element.parentNode && element.parentNode.removeChild(element);\n  }\n\n  return NProgress;\n});\n\n", "var __defProp = Object.defineProperty;\nvar __getOwnPropDesc = Object.getOwnPropertyDescriptor;\nvar __getOwnPropNames = Object.getOwnPropertyNames;\nvar __hasOwnProp = Object.prototype.hasOwnProperty;\nvar __export = (target, all) => {\n  for (var name in all)\n    __defProp(target, name, { get: all[name], enumerable: true });\n};\nvar __copyProps = (to, from, except, desc) => {\n  if (from && typeof from === \"object\" || typeof from === \"function\") {\n    for (let key of __getOwnPropNames(from))\n      if (!__hasOwnProp.call(to, key) && key !== except)\n        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });\n  }\n  return to;\n};\nvar __toCommonJS = (mod) => __copyProps(__defProp({}, \"__esModule\", { value: true }), mod);\n\n// packages/morph/builds/module.js\nvar module_exports = {};\n__export(module_exports, {\n  default: () => module_default,\n  morph: () => src_default\n});\nmodule.exports = __toCommonJS(module_exports);\n\n// packages/morph/src/morph.js\nfunction morph(from, toHtml, options) {\n  monkeyPatchDomSetAttributeToAllowAtSymbols();\n  let fromEl;\n  let toEl;\n  let key, lookahead, updating, updated, removing, removed, adding, added;\n  function assignOptions(options2 = {}) {\n    let defaultGetKey = (el) => el.getAttribute(\"key\");\n    let noop = () => {\n    };\n    updating = options2.updating || noop;\n    updated = options2.updated || noop;\n    removing = options2.removing || noop;\n    removed = options2.removed || noop;\n    adding = options2.adding || noop;\n    added = options2.added || noop;\n    key = options2.key || defaultGetKey;\n    lookahead = options2.lookahead || false;\n  }\n  function patch(from2, to) {\n    if (differentElementNamesTypesOrKeys(from2, to)) {\n      return swapElements(from2, to);\n    }\n    let updateChildrenOnly = false;\n    if (shouldSkip(updating, from2, to, () => updateChildrenOnly = true))\n      return;\n    if (from2.nodeType === 1 && window.Alpine) {\n      window.Alpine.cloneNode(from2, to);\n      if (from2._x_teleport && to._x_teleport) {\n        patch(from2._x_teleport, to._x_teleport);\n      }\n    }\n    if (textOrComment(to)) {\n      patchNodeValue(from2, to);\n      updated(from2, to);\n      return;\n    }\n    if (!updateChildrenOnly) {\n      patchAttributes(from2, to);\n    }\n    updated(from2, to);\n    patchChildren(from2, to);\n  }\n  function differentElementNamesTypesOrKeys(from2, to) {\n    return from2.nodeType != to.nodeType || from2.nodeName != to.nodeName || getKey(from2) != getKey(to);\n  }\n  function swapElements(from2, to) {\n    if (shouldSkip(removing, from2))\n      return;\n    let toCloned = to.cloneNode(true);\n    if (shouldSkip(adding, toCloned))\n      return;\n    from2.replaceWith(toCloned);\n    removed(from2);\n    added(toCloned);\n  }\n  function patchNodeValue(from2, to) {\n    let value = to.nodeValue;\n    if (from2.nodeValue !== value) {\n      from2.nodeValue = value;\n    }\n  }\n  function patchAttributes(from2, to) {\n    if (from2._x_transitioning)\n      return;\n    if (from2._x_isShown && !to._x_isShown) {\n      return;\n    }\n    if (!from2._x_isShown && to._x_isShown) {\n      return;\n    }\n    let domAttributes = Array.from(from2.attributes);\n    let toAttributes = Array.from(to.attributes);\n    for (let i = domAttributes.length - 1; i >= 0; i--) {\n      let name = domAttributes[i].name;\n      if (!to.hasAttribute(name)) {\n        from2.removeAttribute(name);\n      }\n    }\n    for (let i = toAttributes.length - 1; i >= 0; i--) {\n      let name = toAttributes[i].name;\n      let value = toAttributes[i].value;\n      if (from2.getAttribute(name) !== value) {\n        from2.setAttribute(name, value);\n      }\n    }\n  }\n  function patchChildren(from2, to) {\n    let fromKeys = keyToMap(from2.children);\n    let fromKeyHoldovers = {};\n    let currentTo = getFirstNode(to);\n    let currentFrom = getFirstNode(from2);\n    while (currentTo) {\n      seedingMatchingId(currentTo, currentFrom);\n      let toKey = getKey(currentTo);\n      let fromKey = getKey(currentFrom);\n      if (!currentFrom) {\n        if (toKey && fromKeyHoldovers[toKey]) {\n          let holdover = fromKeyHoldovers[toKey];\n          from2.appendChild(holdover);\n          currentFrom = holdover;\n          fromKey = getKey(currentFrom);\n        } else {\n          if (!shouldSkip(adding, currentTo)) {\n            let clone = currentTo.cloneNode(true);\n            from2.appendChild(clone);\n            added(clone);\n          }\n          currentTo = getNextSibling(to, currentTo);\n          continue;\n        }\n      }\n      let isIf = (node) => node && node.nodeType === 8 && node.textContent === \"[if BLOCK]><![endif]\";\n      let isEnd = (node) => node && node.nodeType === 8 && node.textContent === \"[if ENDBLOCK]><![endif]\";\n      if (isIf(currentTo) && isIf(currentFrom)) {\n        let nestedIfCount = 0;\n        let fromBlockStart = currentFrom;\n        while (currentFrom) {\n          let next = getNextSibling(from2, currentFrom);\n          if (isIf(next)) {\n            nestedIfCount++;\n          } else if (isEnd(next) && nestedIfCount > 0) {\n            nestedIfCount--;\n          } else if (isEnd(next) && nestedIfCount === 0) {\n            currentFrom = next;\n            break;\n          }\n          currentFrom = next;\n        }\n        let fromBlockEnd = currentFrom;\n        nestedIfCount = 0;\n        let toBlockStart = currentTo;\n        while (currentTo) {\n          let next = getNextSibling(to, currentTo);\n          if (isIf(next)) {\n            nestedIfCount++;\n          } else if (isEnd(next) && nestedIfCount > 0) {\n            nestedIfCount--;\n          } else if (isEnd(next) && nestedIfCount === 0) {\n            currentTo = next;\n            break;\n          }\n          currentTo = next;\n        }\n        let toBlockEnd = currentTo;\n        let fromBlock = new Block(fromBlockStart, fromBlockEnd);\n        let toBlock = new Block(toBlockStart, toBlockEnd);\n        patchChildren(fromBlock, toBlock);\n        continue;\n      }\n      if (currentFrom.nodeType === 1 && lookahead && !currentFrom.isEqualNode(currentTo)) {\n        let nextToElementSibling = getNextSibling(to, currentTo);\n        let found = false;\n        while (!found && nextToElementSibling) {\n          if (nextToElementSibling.nodeType === 1 && currentFrom.isEqualNode(nextToElementSibling)) {\n            found = true;\n            currentFrom = addNodeBefore(from2, currentTo, currentFrom);\n            fromKey = getKey(currentFrom);\n          }\n          nextToElementSibling = getNextSibling(to, nextToElementSibling);\n        }\n      }\n      if (toKey !== fromKey) {\n        if (!toKey && fromKey) {\n          fromKeyHoldovers[fromKey] = currentFrom;\n          currentFrom = addNodeBefore(from2, currentTo, currentFrom);\n          fromKeyHoldovers[fromKey].remove();\n          currentFrom = getNextSibling(from2, currentFrom);\n          currentTo = getNextSibling(to, currentTo);\n          continue;\n        }\n        if (toKey && !fromKey) {\n          if (fromKeys[toKey]) {\n            currentFrom.replaceWith(fromKeys[toKey]);\n            currentFrom = fromKeys[toKey];\n            fromKey = getKey(currentFrom);\n          }\n        }\n        if (toKey && fromKey) {\n          let fromKeyNode = fromKeys[toKey];\n          if (fromKeyNode) {\n            fromKeyHoldovers[fromKey] = currentFrom;\n            currentFrom.replaceWith(fromKeyNode);\n            currentFrom = fromKeyNode;\n            fromKey = getKey(currentFrom);\n          } else {\n            fromKeyHoldovers[fromKey] = currentFrom;\n            currentFrom = addNodeBefore(from2, currentTo, currentFrom);\n            fromKeyHoldovers[fromKey].remove();\n            currentFrom = getNextSibling(from2, currentFrom);\n            currentTo = getNextSibling(to, currentTo);\n            continue;\n          }\n        }\n      }\n      let currentFromNext = currentFrom && getNextSibling(from2, currentFrom);\n      patch(currentFrom, currentTo);\n      currentTo = currentTo && getNextSibling(to, currentTo);\n      currentFrom = currentFromNext;\n    }\n    let removals = [];\n    while (currentFrom) {\n      if (!shouldSkip(removing, currentFrom))\n        removals.push(currentFrom);\n      currentFrom = getNextSibling(from2, currentFrom);\n    }\n    while (removals.length) {\n      let domForRemoval = removals.shift();\n      domForRemoval.remove();\n      removed(domForRemoval);\n    }\n  }\n  function getKey(el) {\n    return el && el.nodeType === 1 && key(el);\n  }\n  function keyToMap(els) {\n    let map = {};\n    for (let el of els) {\n      let theKey = getKey(el);\n      if (theKey) {\n        map[theKey] = el;\n      }\n    }\n    return map;\n  }\n  function addNodeBefore(parent, node, beforeMe) {\n    if (!shouldSkip(adding, node)) {\n      let clone = node.cloneNode(true);\n      parent.insertBefore(clone, beforeMe);\n      added(clone);\n      return clone;\n    }\n    return node;\n  }\n  assignOptions(options);\n  fromEl = from;\n  toEl = typeof toHtml === \"string\" ? createElement(toHtml) : toHtml;\n  if (window.Alpine && window.Alpine.closestDataStack && !from._x_dataStack) {\n    toEl._x_dataStack = window.Alpine.closestDataStack(from);\n    toEl._x_dataStack && window.Alpine.cloneNode(from, toEl);\n  }\n  patch(from, toEl);\n  fromEl = void 0;\n  toEl = void 0;\n  return from;\n}\nmorph.step = () => {\n};\nmorph.log = () => {\n};\nfunction shouldSkip(hook, ...args) {\n  let skip = false;\n  hook(...args, () => skip = true);\n  return skip;\n}\nvar patched = false;\nfunction createElement(html) {\n  const template = document.createElement(\"template\");\n  template.innerHTML = html;\n  return template.content.firstElementChild;\n}\nfunction textOrComment(el) {\n  return el.nodeType === 3 || el.nodeType === 8;\n}\nvar Block = class {\n  constructor(start, end) {\n    this.startComment = start;\n    this.endComment = end;\n  }\n  get children() {\n    let children = [];\n    let currentNode = this.startComment.nextSibling;\n    while (currentNode && currentNode !== this.endComment) {\n      children.push(currentNode);\n      currentNode = currentNode.nextSibling;\n    }\n    return children;\n  }\n  appendChild(child) {\n    this.endComment.before(child);\n  }\n  get firstChild() {\n    let first = this.startComment.nextSibling;\n    if (first === this.endComment)\n      return;\n    return first;\n  }\n  nextNode(reference) {\n    let next = reference.nextSibling;\n    if (next === this.endComment)\n      return;\n    return next;\n  }\n  insertBefore(newNode, reference) {\n    reference.before(newNode);\n    return newNode;\n  }\n};\nfunction getFirstNode(parent) {\n  return parent.firstChild;\n}\nfunction getNextSibling(parent, reference) {\n  let next;\n  if (parent instanceof Block) {\n    next = parent.nextNode(reference);\n  } else {\n    next = reference.nextSibling;\n  }\n  return next;\n}\nfunction monkeyPatchDomSetAttributeToAllowAtSymbols() {\n  if (patched)\n    return;\n  patched = true;\n  let original = Element.prototype.setAttribute;\n  let hostDiv = document.createElement(\"div\");\n  Element.prototype.setAttribute = function newSetAttribute(name, value) {\n    if (!name.includes(\"@\")) {\n      return original.call(this, name, value);\n    }\n    hostDiv.innerHTML = `<span ${name}=\"${value}\"></span>`;\n    let attr = hostDiv.firstElementChild.getAttributeNode(name);\n    hostDiv.firstElementChild.removeAttributeNode(attr);\n    this.setAttributeNode(attr);\n  };\n}\nfunction seedingMatchingId(to, from) {\n  let fromId = from && from._x_bindings && from._x_bindings.id;\n  if (!fromId)\n    return;\n  if (!to.setAttribute)\n    return;\n  to.setAttribute(\"id\", fromId);\n  to.id = fromId;\n}\n\n// packages/morph/src/index.js\nfunction src_default(Alpine) {\n  Alpine.morph = morph;\n}\n\n// packages/morph/builds/module.js\nvar module_default = src_default;\n// Annotate the CommonJS export names for ESM import in node:\n0 && (module.exports = {\n  morph\n});\n", "var __defProp = Object.defineProperty;\nvar __getOwnPropDesc = Object.getOwnPropertyDescriptor;\nvar __getOwnPropNames = Object.getOwnPropertyNames;\nvar __hasOwnProp = Object.prototype.hasOwnProperty;\nvar __export = (target, all) => {\n  for (var name in all)\n    __defProp(target, name, { get: all[name], enumerable: true });\n};\nvar __copyProps = (to, from, except, desc) => {\n  if (from && typeof from === \"object\" || typeof from === \"function\") {\n    for (let key of __getOwnPropNames(from))\n      if (!__hasOwnProp.call(to, key) && key !== except)\n        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });\n  }\n  return to;\n};\nvar __toCommonJS = (mod) => __copyProps(__defProp({}, \"__esModule\", { value: true }), mod);\n\n// packages/mask/builds/module.js\nvar module_exports = {};\n__export(module_exports, {\n  default: () => module_default,\n  mask: () => src_default,\n  stripDown: () => stripDown\n});\nmodule.exports = __toCommonJS(module_exports);\n\n// packages/mask/src/index.js\nfunction src_default(Alpine) {\n  Alpine.directive(\"mask\", (el, { value, expression }, { effect, evaluateLater, cleanup }) => {\n    let templateFn = () => expression;\n    let lastInputValue = \"\";\n    queueMicrotask(() => {\n      if ([\"function\", \"dynamic\"].includes(value)) {\n        let evaluator = evaluateLater(expression);\n        effect(() => {\n          templateFn = (input) => {\n            let result;\n            Alpine.dontAutoEvaluateFunctions(() => {\n              evaluator((value2) => {\n                result = typeof value2 === \"function\" ? value2(input) : value2;\n              }, { scope: {\n                // These are \"magics\" we'll make available to the x-mask:function:\n                \"$input\": input,\n                \"$money\": formatMoney.bind({ el })\n              } });\n            });\n            return result;\n          };\n          processInputValue(el, false);\n        });\n      } else {\n        processInputValue(el, false);\n      }\n      if (el._x_model) {\n        if (el._x_model.get() === el.value)\n          return;\n        if (el._x_model.get() === null && el.value === \"\")\n          return;\n        el._x_model.set(el.value);\n      }\n    });\n    const controller = new AbortController();\n    cleanup(() => {\n      controller.abort();\n    });\n    el.addEventListener(\"input\", () => processInputValue(el), {\n      signal: controller.signal,\n      // Setting this as a capture phase listener to ensure it runs\n      // before wire:model or x-model added as a latent binding...\n      capture: true\n    });\n    el.addEventListener(\"blur\", () => processInputValue(el, false), { signal: controller.signal });\n    function processInputValue(el2, shouldRestoreCursor = true) {\n      let input = el2.value;\n      let template = templateFn(input);\n      if (!template || template === \"false\")\n        return false;\n      if (lastInputValue.length - el2.value.length === 1) {\n        return lastInputValue = el2.value;\n      }\n      let setInput = () => {\n        lastInputValue = el2.value = formatInput(input, template);\n      };\n      if (shouldRestoreCursor) {\n        restoreCursorPosition(el2, template, () => {\n          setInput();\n        });\n      } else {\n        setInput();\n      }\n    }\n    function formatInput(input, template) {\n      if (input === \"\")\n        return \"\";\n      let strippedDownInput = stripDown(template, input);\n      let rebuiltInput = buildUp(template, strippedDownInput);\n      return rebuiltInput;\n    }\n  }).before(\"model\");\n}\nfunction restoreCursorPosition(el, template, callback) {\n  let cursorPosition = el.selectionStart;\n  let unformattedValue = el.value;\n  callback();\n  let beforeLeftOfCursorBeforeFormatting = unformattedValue.slice(0, cursorPosition);\n  let newPosition = buildUp(\n    template,\n    stripDown(\n      template,\n      beforeLeftOfCursorBeforeFormatting\n    )\n  ).length;\n  el.setSelectionRange(newPosition, newPosition);\n}\nfunction stripDown(template, input) {\n  let inputToBeStripped = input;\n  let output = \"\";\n  let regexes = {\n    \"9\": /[0-9]/,\n    \"a\": /[a-zA-Z]/,\n    \"*\": /[a-zA-Z0-9]/\n  };\n  let wildcardTemplate = \"\";\n  for (let i = 0; i < template.length; i++) {\n    if ([\"9\", \"a\", \"*\"].includes(template[i])) {\n      wildcardTemplate += template[i];\n      continue;\n    }\n    for (let j = 0; j < inputToBeStripped.length; j++) {\n      if (inputToBeStripped[j] === template[i]) {\n        inputToBeStripped = inputToBeStripped.slice(0, j) + inputToBeStripped.slice(j + 1);\n        break;\n      }\n    }\n  }\n  for (let i = 0; i < wildcardTemplate.length; i++) {\n    let found = false;\n    for (let j = 0; j < inputToBeStripped.length; j++) {\n      if (regexes[wildcardTemplate[i]].test(inputToBeStripped[j])) {\n        output += inputToBeStripped[j];\n        inputToBeStripped = inputToBeStripped.slice(0, j) + inputToBeStripped.slice(j + 1);\n        found = true;\n        break;\n      }\n    }\n    if (!found)\n      break;\n  }\n  return output;\n}\nfunction buildUp(template, input) {\n  let clean = Array.from(input);\n  let output = \"\";\n  for (let i = 0; i < template.length; i++) {\n    if (![\"9\", \"a\", \"*\"].includes(template[i])) {\n      output += template[i];\n      continue;\n    }\n    if (clean.length === 0)\n      break;\n    output += clean.shift();\n  }\n  return output;\n}\nfunction formatMoney(input, delimiter = \".\", thousands, precision = 2) {\n  if (input === \"-\")\n    return \"-\";\n  if (/^\\D+$/.test(input))\n    return \"9\";\n  if (thousands === null || thousands === void 0) {\n    thousands = delimiter === \",\" ? \".\" : \",\";\n  }\n  let addThousands = (input2, thousands2) => {\n    let output = \"\";\n    let counter = 0;\n    for (let i = input2.length - 1; i >= 0; i--) {\n      if (input2[i] === thousands2)\n        continue;\n      if (counter === 3) {\n        output = input2[i] + thousands2 + output;\n        counter = 0;\n      } else {\n        output = input2[i] + output;\n      }\n      counter++;\n    }\n    return output;\n  };\n  let minus = input.startsWith(\"-\") ? \"-\" : \"\";\n  let strippedInput = input.replaceAll(new RegExp(`[^0-9\\\\${delimiter}]`, \"g\"), \"\");\n  let template = Array.from({ length: strippedInput.split(delimiter)[0].length }).fill(\"9\").join(\"\");\n  template = `${minus}${addThousands(template, thousands)}`;\n  if (precision > 0 && input.includes(delimiter))\n    template += `${delimiter}` + \"9\".repeat(precision);\n  queueMicrotask(() => {\n    if (this.el.value.endsWith(delimiter))\n      return;\n    if (this.el.value[this.el.selectionStart - 1] === delimiter) {\n      this.el.setSelectionRange(this.el.selectionStart - 1, this.el.selectionStart - 1);\n    }\n  });\n  return template;\n}\n\n// packages/mask/builds/module.js\nvar module_default = src_default;\n// Annotate the CommonJS export names for ESM import in node:\n0 && (module.exports = {\n  mask,\n  stripDown\n});\n", "\nexport class Bag {\n    constructor() { this.arrays = {} }\n\n    add(key, value) {\n        if (! this.arrays[key]) this.arrays[key] = []\n        this.arrays[key].push(value)\n    }\n\n    remove(key) {\n        if (this.arrays[key]) delete this.arrays[key]\n    }\n\n    get(key) { return this.arrays[key] || [] }\n\n    each(key, callback) { return this.get(key).forEach(callback) }\n}\n\nexport class WeakBag {\n    constructor() { this.arrays = new WeakMap }\n\n    add(key, value) {\n        if (! this.arrays.has(key)) this.arrays.set(key, [])\n        this.arrays.get(key).push(value)\n    }\n\n    remove(key) {\n        if (this.arrays.has(key)) this.arrays.delete(key, [])\n    }\n\n    get(key) { return this.arrays.has(key) ? this.arrays.get(key) : [] }\n\n    each(key, callback) { return this.get(key).forEach(callback) }\n}\n\nexport function dispatch(target, name, detail = {}, bubbles = true) {\n    target.dispatchEvent(\n        new CustomEvent(name, {\n            detail,\n            bubbles,\n            // Allows events to pass the shadow DOM barrier.\n            composed: true,\n            cancelable: true,\n        })\n    )\n}\n\nexport function listen(target, name, handler) {\n    target.addEventListener(name, handler)\n\n    return () => target.removeEventListener(name, handler)\n}\n\n/**\n * Type-checking in JS is weird and annoying, these are better.\n */\nexport function isObjecty(subject) { return (typeof subject === 'object' && subject !== null) }\nexport function isObject(subject) { return (isObjecty(subject) && ! isArray(subject)) }\nexport function isArray(subject) { return Array.isArray(subject) }\nexport function isFunction(subject) { return typeof subject === 'function' }\nexport function isPrimitive(subject) { return typeof subject !== 'object' || subject === null }\n\n/**\n * Clone an object deeply to wipe out any shared references.\n */\nexport function deepClone(obj) { return JSON.parse(JSON.stringify(obj)) }\n\n/**\n * Determine if two objects take the exact same shape.\n */\nexport function deeplyEqual(a, b) { return JSON.stringify(a) === JSON.stringify(b) }\n\n/**\n * An easy way to loop through arrays and objects.\n */\nexport function each(subject, callback) {\n    Object.entries(subject).forEach(([key, value]) => callback(key, value))\n}\n\n/**\n * Get a property from an object with support for dot-notation.\n */\nexport function dataGet(object, key) {\n    if (key === '') return object\n\n    return key.split('.').reduce((carry, i) => {\n        return carry?.[i]\n    }, object)\n}\n\n/**\n * Set a property on an object with support for dot-notation.\n */\nexport function dataSet(object, key, value) {\n    let segments = key.split('.')\n\n    if (segments.length === 1) {\n        return object[key] = value\n    }\n\n    let firstSegment = segments.shift()\n    let restOfSegments = segments.join('.')\n\n    if (object[firstSegment] === undefined) {\n        object[firstSegment] = {}\n    }\n\n    dataSet(object[firstSegment], restOfSegments, value)\n}\n\n/**\n * Create a flat, dot-notated diff of two obejcts.\n */\nexport function diff(left, right, diffs = {}, path = '') {\n    // Are they the same?\n    if (left === right) return diffs\n\n    // Are they COMPLETELY different?\n    if (typeof left !== typeof right || (isObject(left) && isArray(right)) || (isArray(left) && isObject(right))) {\n        diffs[path] = right;\n        return diffs\n    }\n\n    // Is the right or left side a primitive value (a leaf node)?\n    if (isPrimitive(left) || isPrimitive(right)) {\n        diffs[path] = right\n        return diffs\n    }\n\n    // We now know both are objects...\n    let leftKeys = Object.keys(left)\n\n    // Recursively diff the object's properties...\n    Object.entries(right).forEach(([key, value]) => {\n        diffs = {...diffs, ...diff(left[key], right[key], diffs, path === '' ? key : `${path}.${key}`)}\n        leftKeys = leftKeys.filter(i => i !== key)\n    })\n\n    // Mark any items for removal...\n    leftKeys.forEach(key => {\n        diffs[`${path}.${key}`] = '__rm__'\n    })\n\n    return diffs\n}\n\n/**\n * The data that's passed between the browser and server is in the form of\n * nested tuples consisting of the schema: [rawValue, metadata]. In this\n * method we're extracting the plain JS object of only the raw values.\n */\nexport function extractData(payload) {\n    let value = isSynthetic(payload) ? payload[0] : payload\n    let meta = isSynthetic(payload) ? payload[1] : undefined\n\n    if (isObjecty(value)) {\n        Object.entries(value).forEach(([key, iValue]) => {\n            value[key] = extractData(iValue)\n        })\n    }\n\n    return value\n}\n\n/**\n * Determine if the variable passed in is a node in a nested metadata\n * tuple tree. (Meaning it takes the form of: [rawData, metadata])\n */\nexport function isSynthetic(subject) {\n    return Array.isArray(subject)\n        && subject.length === 2\n        && typeof subject[1] === 'object'\n        && Object.keys(subject[1]).includes('s')\n}\n\n/**\n * Post requests in Laravel require a csrf token to be passed\n * along with the payload. Here, we'll try and locate one.\n */\nexport function getCsrfToken() {\n    // Purposely not caching. Fetching it fresh every time ensures we're\n    // not depending on a stale session's CSRF token...\n\n    if (document.querySelector('meta[name=\"csrf-token\"]')) {\n        return document.querySelector('meta[name=\"csrf-token\"]').getAttribute('content')\n    }\n\n    if (document.querySelector('[data-csrf]')) {\n        return document.querySelector('[data-csrf]').getAttribute('data-csrf')\n    }\n\n    if (window.livewireScriptConfig['csrf'] ?? false) {\n        return window.livewireScriptConfig['csrf']\n    }\n\n    throw 'Livewire: No CSRF token detected'\n}\n\nlet nonce;\n\nexport function getNonce() {\n    if (nonce) return nonce\n\n\n    if (window.livewireScriptConfig && (window.livewireScriptConfig['nonce'] ?? false)) {\n        nonce = window.livewireScriptConfig['nonce']\n\n        return nonce\n    }\n\n    const elWithNonce = document.querySelector('style[data-livewire-style][nonce]')\n\n    if (elWithNonce) {\n        nonce = elWithNonce.nonce\n\n        return nonce\n    }\n\n    return null\n}\n\n/**\n * Livewire's update URI. This is configurable via Livewire::setUpdateRoute(...)\n */\nexport function getUpdateUri() {\n    return document.querySelector('[data-update-uri]')?.getAttribute('data-update-uri') ?? window.livewireScriptConfig['uri'] ?? null\n}\n\nexport function contentIsFromDump(content) {\n    return !! content.match(/<script>Sfdump\\(\".+\"\\)<\\/script>/)\n}\n\nexport function splitDumpFromContent(content) {\n    let dump = content.match(/.*<script>Sfdump\\(\".+\"\\)<\\/script>/s)\n\n    return [dump, content.replace(dump, '')]\n}\n", "import { getCsrfToken } from '@/utils';\n\nlet uploadManagers = new WeakMap\n\nfunction getUploadManager(component) {\n    if (! uploadManagers.has(component)) {\n        let manager = new UploadManager(component)\n\n        uploadManagers.set(component, manager)\n\n        manager.registerListeners()\n    }\n\n    return uploadManagers.get(component)\n}\n\nexport function handleFileUpload(el, property, component, cleanup) {\n    let manager = getUploadManager(component)\n\n    let start = () => el.dispatchEvent(new CustomEvent('livewire-upload-start', { bubbles: true, detail: { id: component.id, property} }))\n    let finish = () => el.dispatchEvent(new CustomEvent('livewire-upload-finish', { bubbles: true, detail: { id: component.id, property} }))\n    let error = () => el.dispatchEvent(new CustomEvent('livewire-upload-error', { bubbles: true, detail: { id: component.id, property} }))\n    let cancel = () => el.dispatchEvent(new CustomEvent('livewire-upload-cancel', { bubbles: true, detail: { id: component.id, property} }))\n    let progress = (progressEvent) => {\n        var percentCompleted = Math.round( (progressEvent.loaded * 100) / progressEvent.total )\n\n        el.dispatchEvent(\n            new CustomEvent('livewire-upload-progress', {\n                bubbles: true, detail: { progress: percentCompleted }\n            })\n        )\n    }\n\n    let eventHandler = e => {\n        if (e.target.files.length === 0) return\n\n        start()\n\n        if (e.target.multiple) {\n            manager.uploadMultiple(property, e.target.files, finish, error, progress, cancel)\n        } else {\n            manager.upload(property, e.target.files[0], finish, error, progress, cancel)\n        }\n    }\n\n    el.addEventListener('change', eventHandler)\n\n    // If the Livewire property has changed to null or an empty string, then reset the input...\n    component.$wire.$watch(property, (value) => {\n        // This watch will only be released when the component is removed. However, the\n        // actual file-upload element may be removed from the DOM withou the entire\n        // component being removed. In this case, let's just bail early on this.\n        if (! el.isConnected) return\n\n        if (value === null || value === '') {\n            el.value = ''\n        }\n        \n        // If the file input is a multiple file input and the value has been reset to an empty array, then reset the input...\n        if (el.multiple && Array.isArray(value) && value.length === 0) {\n            el.value = ''\n        }\n    })\n\n    // There's a bug in browsers where selecting a file, removing it,\n    // then re-adding it doesn't fire the change event. This fixes it.\n    // Reference: https://stackoverflow.com/questions/12030686/html-input-file-selection-event-not-firing-upon-selecting-the-same-file\n    let clearFileInputValue = () => { el.value = null }\n    el.addEventListener('click', clearFileInputValue)\n\n    // Clear the input if the uploaded is cancelled...\n    el.addEventListener('livewire-upload-cancel', clearFileInputValue)\n\n    cleanup(() => {\n        el.removeEventListener('change', eventHandler)\n        el.removeEventListener('click', clearFileInputValue)\n    })\n}\n\nclass UploadManager {\n    constructor(component) {\n        this.component = component\n        this.uploadBag = new MessageBag\n        this.removeBag = new MessageBag\n    }\n\n    registerListeners() {\n        this.component.$wire.$on('upload:generatedSignedUrl', ({ name, url }) => {\n            // We have to add reduntant \"setLoading\" calls because the dom-patch\n            // from the first response will clear the setUploadLoading call\n            // from the first upload call.\n            setUploadLoading(this.component, name)\n\n            this.handleSignedUrl(name, url)\n        })\n\n        this.component.$wire.$on('upload:generatedSignedUrlForS3', ({ name, payload }) => {\n            setUploadLoading(this.component, name)\n\n            this.handleS3PreSignedUrl(name, payload)\n        })\n\n        this.component.$wire.$on('upload:finished', ({ name, tmpFilenames }) => this.markUploadFinished(name, tmpFilenames))\n        this.component.$wire.$on('upload:errored', ({ name }) => this.markUploadErrored(name))\n        this.component.$wire.$on('upload:removed', ({ name, tmpFilename }) => this.removeBag.shift(name).finishCallback(tmpFilename))\n    }\n\n    upload(name, file, finishCallback, errorCallback, progressCallback, cancelledCallback) {\n        this.setUpload(name, {\n            files: [file],\n            multiple: false,\n            finishCallback,\n            errorCallback,\n            progressCallback,\n            cancelledCallback,\n        })\n    }\n\n    uploadMultiple(name, files, finishCallback, errorCallback, progressCallback, cancelledCallback) {\n        this.setUpload(name, {\n            files: Array.from(files),\n            multiple: true,\n            finishCallback,\n            errorCallback,\n            progressCallback,\n            cancelledCallback,\n        })\n    }\n\n    removeUpload(name, tmpFilename, finishCallback) {\n        this.removeBag.push(name, {\n            tmpFilename, finishCallback\n        })\n\n        this.component.$wire.call('_removeUpload', name, tmpFilename);\n    }\n\n    setUpload(name, uploadObject) {\n        this.uploadBag.add(name, uploadObject)\n\n        if (this.uploadBag.get(name).length === 1) {\n            this.startUpload(name, uploadObject)\n        }\n    }\n\n    handleSignedUrl(name, url) {\n        let formData = new FormData()\n        Array.from(this.uploadBag.first(name).files).forEach(file => formData.append('files[]', file, file.name))\n\n        let headers = {\n            'Accept': 'application/json',\n        }\n\n        let csrfToken = getCsrfToken()\n\n        if (csrfToken) headers['X-CSRF-TOKEN'] = csrfToken\n\n        this.makeRequest(name, formData, 'post', url, headers, response => {\n            return response.paths\n        })\n    }\n\n    handleS3PreSignedUrl(name, payload) {\n        let formData = this.uploadBag.first(name).files[0]\n\n        let headers = payload.headers\n        if ('Host' in headers) delete headers.Host\n        let url = payload.url\n\n        this.makeRequest(name, formData, 'put', url, headers, response => {\n            return [payload.path]\n        })\n    }\n\n    makeRequest(name, formData, method, url, headers, retrievePaths) {\n        let request = new XMLHttpRequest()\n\n        request.open(method, url)\n\n        Object.entries(headers).forEach(([key, value]) => {\n            request.setRequestHeader(key, value)\n        })\n\n        request.upload.addEventListener('progress', e => {\n            e.detail = {}\n            e.detail.progress = Math.floor((e.loaded * 100) / e.total)\n\n            this.uploadBag.first(name).progressCallback(e)\n        })\n\n        request.addEventListener('load', () => {\n            if ((request.status+'')[0] === '2') {\n                let paths = retrievePaths(request.response && JSON.parse(request.response))\n\n                this.component.$wire.call('_finishUpload', name, paths, this.uploadBag.first(name).multiple)\n\n                return\n            }\n\n            let errors = null\n\n            if (request.status === 422) {\n                errors = request.response\n            }\n\n            this.component.$wire.call('_uploadErrored', name, errors, this.uploadBag.first(name).multiple)\n        })\n\n        this.uploadBag.first(name).request = request\n\n        request.send(formData)\n    }\n\n    startUpload(name, uploadObject) {\n        let fileInfos = uploadObject.files.map(file => {\n            return { name: file.name, size: file.size, type: file.type }\n        })\n\n        this.component.$wire.call('_startUpload', name, fileInfos, uploadObject.multiple);\n\n        setUploadLoading(this.component, name)\n    }\n\n    markUploadFinished(name, tmpFilenames) {\n        unsetUploadLoading(this.component)\n\n        let uploadObject = this.uploadBag.shift(name)\n        uploadObject.finishCallback(uploadObject.multiple ? tmpFilenames : tmpFilenames[0])\n\n        if (this.uploadBag.get(name).length > 0) this.startUpload(name, this.uploadBag.last(name))\n    }\n\n    markUploadErrored(name) {\n        unsetUploadLoading(this.component)\n\n        this.uploadBag.shift(name).errorCallback()\n\n        if (this.uploadBag.get(name).length > 0) this.startUpload(name, this.uploadBag.last(name))\n    }\n\n    cancelUpload(name, cancelledCallback = null) {\n        unsetUploadLoading(this.component)\n\n        let uploadItem = this.uploadBag.first(name);\n\n        if (uploadItem) {\n            if (uploadItem.request) {\n                uploadItem.request.abort();\n            }\n\n            this.uploadBag.shift(name).cancelledCallback();\n\n            if (cancelledCallback) cancelledCallback()\n        }\n    }\n}\n\nexport default class MessageBag {\n    constructor() {\n        this.bag = {}\n    }\n\n    add(name, thing) {\n        if (! this.bag[name]) {\n            this.bag[name] = []\n        }\n\n        this.bag[name].push(thing)\n    }\n\n    push(name, thing) {\n        this.add(name, thing)\n    }\n\n    first(name) {\n        if (! this.bag[name]) return null\n\n        return this.bag[name][0]\n    }\n\n    last(name) {\n        return this.bag[name].slice(-1)[0]\n    }\n\n    get(name) {\n        return this.bag[name]\n    }\n\n    shift(name) {\n        return this.bag[name].shift()\n    }\n\n    call(name, ...params) {\n        (this.listeners[name] || []).forEach(callback => {\n            callback(...params)\n        })\n    }\n\n    has(name) {\n        return Object.keys(this.listeners).includes(name)\n    }\n}\n\nfunction setUploadLoading() {\n    // @todo\n}\n\nfunction unsetUploadLoading() {\n    // @todo\n}\n\nexport function upload(\n    component,\n    name,\n    file,\n    finishCallback = () => { },\n    errorCallback = () => { },\n    progressCallback = () => { },\n    cancelledCallback = () => { },\n) {\n    let uploadManager = getUploadManager(component)\n\n    uploadManager.upload(\n        name,\n        file,\n        finishCallback,\n        errorCallback,\n        progressCallback,\n        cancelledCallback,\n    )\n}\n\nexport function uploadMultiple(\n    component,\n    name,\n    files,\n    finishCallback = () => { },\n    errorCallback = () => { },\n    progressCallback = () => { },\n    cancelledCallback = () => { },\n) {\n    let uploadManager = getUploadManager(component)\n\n    uploadManager.uploadMultiple(\n        name,\n        files,\n        finishCallback,\n        errorCallback,\n        progressCallback,\n        cancelledCallback,\n    )\n}\n\nexport function removeUpload(\n    component,\n    name,\n    tmpFilename,\n    finishCallback = () => { },\n    errorCallback = () => { }\n) {\n    let uploadManager = getUploadManager(component)\n\n    uploadManager.removeUpload(\n        name,\n        tmpFilename,\n        finishCallback,\n        errorCallback\n    )\n}\n\nexport function cancelUpload(\n    component,\n    name,\n    cancelledCallback = () => { }\n) {\n    let uploadManager = getUploadManager(component)\n\n    uploadManager.cancelUpload(\n        name,\n        cancelledCallback\n    )\n}\n", "import Alpine from 'alpinejs'\n\nexport function generateEntangleFunction(component, cleanup) {\n    if (! cleanup) cleanup = () => {}\n\n    return (name, live = false) => {\n        let isLive = live\n        let livewireProperty = name\n        let livewireComponent = component.$wire\n        let livewirePropertyValue = livewireComponent.get(livewireProperty)\n\n        let interceptor = Alpine.interceptor((initialValue, getter, setter, path, key) => {\n            // Check to see if the Livewire property exists and if not log a console error\n            // and return so everything else keeps running.\n            if (typeof livewirePropertyValue === 'undefined') {\n                console.error(`Livewire Entangle Error: Livewire property ['${livewireProperty}'] cannot be found on component: ['${component.name}']`)\n                return\n            }\n\n                let release = Alpine.entangle({\n                    // Outer scope...\n                    get() {\n                        return livewireComponent.get(name)\n                    },\n                    set(value) {\n                        livewireComponent.set(name, value, isLive)\n                    }\n                }, {\n                    // Inner scope...\n                    get() {\n                        return getter()\n                    },\n                    set(value) {\n                        setter(value)\n                    }\n                })\n\n                cleanup(() => release())\n\n            return cloneIfObject(livewireComponent.get(name))\n        }, obj => {\n            Object.defineProperty(obj, 'live', {\n                get() {\n                    isLive = true\n\n                    return obj\n                }\n            })\n        })\n\n        return interceptor(livewirePropertyValue)\n    }\n}\n\nfunction cloneIfObject(value) {\n    return typeof value === 'object'\n        ? JSON.parse(JSON.stringify(value))\n        : value\n}\n", "import { isFunction } from '@/utils'\n\n/**\n * Our internal event listener bus...\n */\nlet listeners = []\n\n/**\n * Register a callback to run when an event is triggered...\n */\nexport function on(name, callback) {\n    if (! listeners[name]) listeners[name] = []\n\n    listeners[name].push(callback)\n\n    // Return an \"off\" callback to remove the listener...\n    return () => {\n        listeners[name] = listeners[name].filter(i => i !== callback)\n    }\n}\n\n/**\n * In addition to triggering an event, this method allows you to\n * defer running callbacks returned from listeners and pass a\n * value through each one so they can act like middleware.\n *\n * An example of using this combination to the fullest:\n *\n * // First let's look at the triggering phase:\n * let finish = trigger([event name], ...[event params])\n *\n * return finish([pass-through value])\n *\n * // Now, let's look at the \"listening\" phase:\n * on([event name], (...[event params]) => {\n *     // The contents of this callback will be run immediately on trigger.\n *\n *     return ([pass-through value]) => {\n *         // This callback will be run when \"finish()\" is called.\n *\n *         // The [pass-through value] can be mutated and must\n *         // be returned for the next callback to process.\n *         return [pass-through value]\n *     }\n * })\n */\nexport function trigger(name, ...params) {\n    let callbacks = listeners[name] || []\n\n    let finishers = []\n\n    for (let i = 0; i < callbacks.length; i++) {\n        let finisher = callbacks[i](...params)\n\n        if (isFunction(finisher)) finishers.push(finisher)\n    }\n\n    return (result) => {\n       return runFinishers(finishers, result)\n    }\n}\n\nexport async function triggerAsync(name, ...params) {\n    let callbacks = listeners[name] || []\n\n    let finishers = []\n\n    for (let i = 0; i < callbacks.length; i++) {\n        let finisher = await callbacks[i](...params)\n\n        if (isFunction(finisher)) finishers.push(finisher)\n    }\n\n    return (result) => {\n       return runFinishers(finishers, result)\n    }\n}\n\nexport function runFinishers(finishers, result)\n{\n    let latest = result\n\n    for (let i = 0; i < finishers.length; i++) {\n        let iResult = finishers[i](latest)\n\n        if (iResult !== undefined) {\n            latest = iResult\n        }\n    }\n\n    return latest\n}\n", "\n// This code and concept is all Jonathan Reinink - thanks main!\nexport function showHtmlModal(html) {\n    let page = document.createElement('html')\n    page.innerHTML = html\n    page.querySelectorAll('a').forEach(a =>\n        a.setAttribute('target', '_top')\n    )\n\n    let modal = document.getElementById('livewire-error')\n\n    if (typeof modal != 'undefined' && modal != null) {\n        // Modal already exists.\n        modal.innerHTML = ''\n    } else {\n        modal = document.createElement('div')\n        modal.id = 'livewire-error'\n        modal.style.position = 'fixed'\n        modal.style.width = '100vw'\n        modal.style.height = '100vh'\n        modal.style.padding = '50px'\n        modal.style.backgroundColor = 'rgba(0, 0, 0, .6)'\n        modal.style.zIndex = 200000\n    }\n\n    let iframe = document.createElement('iframe')\n    iframe.style.backgroundColor = '#17161A'\n    iframe.style.borderRadius = '5px'\n    iframe.style.width = '100%'\n    iframe.style.height = '100%'\n    modal.appendChild(iframe)\n\n    document.body.prepend(modal)\n    document.body.style.overflow = 'hidden'\n    iframe.contentWindow.document.open()\n    iframe.contentWindow.document.write(page.outerHTML)\n    iframe.contentWindow.document.close()\n\n    // Close on click.\n    modal.addEventListener('click', () => hideHtmlModal(modal))\n\n    // Close on escape key press.\n    modal.setAttribute('tabindex', 0)\n    modal.addEventListener('keydown', e => {\n        if (e.key === 'Escape') hideHtmlModal(modal)\n    })\n    modal.focus()\n}\n\nexport function hideHtmlModal(modal) {\n    modal.outerHTML = ''\n    document.body.style.overflow = 'visible'\n}\n", "import { sendRequest } from \"@/request\"\n\n/**\n * The RequestPool contains a list of commits to be sent to the server...\n */\nexport class RequestPool {\n    constructor() {\n        this.commits = new Set\n    }\n\n    add(commit) {\n        this.commits.add(commit)\n    }\n\n    delete(commit) {\n        this.commits.delete(commit)\n    }\n\n    hasCommitFor(component) {\n        return !! this.findCommitByComponent(component)\n    }\n\n    findCommitByComponent(component) {\n        // Determine if this pool already has a commit for this component...\n        for (let [idx, commit] of this.commits.entries()) {\n            if (commit.component === component) return commit\n        }\n    }\n\n    // Determine if a commit should be added to this pool or isolated into its own...\n    shouldHoldCommit(commit) {\n        return ! commit.isolate\n    }\n\n    empty() {\n        return this.commits.size === 0\n    }\n\n    async send() {\n        this.prepare()\n\n        // Send this pool of commits to the server and let the commits\n        // Manage their own response actions...\n        await sendRequest(this)\n    }\n\n    prepare() {\n        // Give each commit a chance to do any last-minute prep\n        // before being sent to the server.\n        this.commits.forEach(i => i.prepare())\n    }\n\n    payload() {\n        // Extract a request payload from each of the commits in this pool...\n        let commitPayloads = []\n\n        // Collect success and failure callbacks to be used inside aggregated callbacks...\n        let successReceivers = []\n        let failureReceivers = []\n\n        this.commits.forEach(commit => {\n            let [payload, succeed, fail] = commit.toRequestPayload()\n\n            commitPayloads.push(payload)\n            successReceivers.push(succeed)\n            failureReceivers.push(fail)\n        })\n\n        // Aggregate the success and failure callbacks for individual commits\n        // into something that can be called singularly...\n        let succeed = components => successReceivers.forEach(receiver => receiver(components.shift()))\n\n        let fail = () => failureReceivers.forEach(receiver => receiver())\n\n        return [ commitPayloads, succeed, fail ]\n    }\n}\n", "import { diff } from '@/utils'\nimport { on, trigger } from '@/hooks'\n\n/**\n * A commit represents an individual component updating itself server-side...\n */\nexport class Commit {\n    constructor(component) {\n        this.component = component\n        this.isolate = false\n        this.calls = []\n        this.receivers = []\n        this.resolvers = []\n    }\n\n    // Add a new resolver to be resolved when a commit is returned from the server...\n    addResolver(resolver) {\n        this.resolvers.push(resolver)\n    }\n\n    // Add a new action \"call\" to the commit payload...\n    addCall(method, params, receiver) {\n        this.calls.push({\n            path: '', method, params,\n            handleReturn(value) {\n                receiver(value)\n            },\n        })\n    }\n\n    prepare() {\n        trigger('commit.prepare', { component: this.component })\n    }\n\n    // Generate a JSON-friendly server-request payload...\n    toRequestPayload() {\n        // Generate a \"diff\" of the current last known server-side state, and\n        // the new front-end state so that we can update the server atomically...\n        let propertiesDiff = diff(this.component.canonical, this.component.ephemeral)\n\n        let updates = this.component.mergeQueuedUpdates(propertiesDiff)\n\n        let payload = {\n            snapshot: this.component.snapshotEncoded,\n            updates: updates,\n            calls: this.calls.map(i => ({\n                path: i.path,\n                method: i.method,\n                params: i.params,\n            }))\n        }\n\n        // Store success and failure hooks from commit listeners\n        // so they can be aggregated into a singular callback later...\n        let succeedCallbacks = []\n        let failCallbacks = []\n        let respondCallbacks = []\n\n        let succeed = (fwd) => succeedCallbacks.forEach(i => i(fwd))\n        let fail = () => failCallbacks.forEach(i => i())\n        let respond = () => respondCallbacks.forEach(i => i())\n\n        // Allow other areas of the codebase to hook into the lifecycle\n        // of an individual commit...\n        let finishTarget = trigger('commit', {\n            component: this.component,\n            commit: payload,\n            succeed: (callback) => {\n                succeedCallbacks.push(callback)\n            },\n            fail: (callback) => {\n                failCallbacks.push(callback)\n            },\n            respond: (callback) => {\n                respondCallbacks.push(callback)\n            },\n        })\n\n        // Handle the response payload for a commit...\n        let handleResponse = (response) => {\n            let { snapshot, effects } = response\n\n            respond()\n\n            // Take the new snapshot and merge it into the existing one...\n            this.component.mergeNewSnapshot(snapshot, effects, updates)\n\n            // Trigger any side effects from the payload like \"morph\" and \"dispatch event\"...\n            this.component.processEffects(this.component.effects)\n\n            if (effects['returns']) {\n                let returns = effects['returns']\n\n                // Here we'll match up returned values with their method call handlers. We need to build up\n                // two \"stacks\" of the same length and walk through them together to handle them properly...\n                let returnHandlerStack = this.calls.map(({ handleReturn }) => (handleReturn))\n\n                returnHandlerStack.forEach((handleReturn, index) => {\n                    handleReturn(returns[index])\n                })\n            }\n\n            let parsedSnapshot = JSON.parse(snapshot)\n\n            finishTarget({ snapshot: parsedSnapshot, effects })\n\n            this.resolvers.forEach(i => i())\n\n            succeed(response)\n        }\n\n        let handleFailure = () => {\n            respond()\n\n            fail()\n        }\n\n        return [payload, handleResponse, handleFailure]\n    }\n}\n", "import { trigger } from '@/hooks'\nimport { RequestPool } from './pool'\nimport { Commit } from './commit'\n\n/**\n * This bus manages the pooling of multiple commits and sending\n * those pools of commits to the server...\n */\nexport class CommitBus {\n    constructor() {\n        // A list of loose, un-pooled, commits ready to be pooled and sent to the server...\n        this.commits = new Set\n\n        // A list of commit pools currently out to the server...\n        this.pools = new Set\n    }\n\n    add(component) {\n        // If this component already has a commit, leave it, otherwise,\n        // create a new commit and add it to the list...\n        let commit = this.findCommitOr(component, () => {\n            let newCommit = new Commit(component)\n\n            this.commits.add(newCommit)\n\n            return newCommit\n        })\n\n        // Buffer the sending of a pool for 5ms to account for UI interactions\n        // that will trigger multiple events within a few milliseconds of each other.\n        // For example, clicking on a button that both unfocuses a field and registers a mousedown...\n        bufferPoolingForFiveMs(commit, () => {\n            // If this commit is already in a pool, leave it be...\n            let pool = this.findPoolWithComponent(commit.component)\n\n            if (! pool) {\n                // If it's not, create a new pool or add it to an existing one and trigger a network request...\n                this.createAndSendNewPool()\n            }\n        })\n\n        return commit\n    }\n\n    findCommitOr(component, callback) {\n        for (let [idx, commit] of this.commits.entries()) {\n            if (commit.component === component) {\n                return commit\n            }\n        }\n\n        return callback()\n    }\n\n    findPoolWithComponent(component) {\n        for (let [idx, pool] of this.pools.entries()) {\n            if (pool.hasCommitFor(component)) return pool\n        }\n    }\n\n    createAndSendNewPool() {\n        // Allow features like \"reactive properties\" to initiate associated\n        // commits before those commits are pooled for a network request...\n        trigger('commit.pooling', { commits: this.commits })\n\n        // Split commits up across one or multiple pools to be sent as seperate network requests...\n        let pools = this.corraleCommitsIntoPools()\n\n        // Clear all commits in the queue now that they're in pools...\n        this.commits.clear()\n\n        trigger('commit.pooled', { pools })\n\n        // Go through each pool and...\n        pools.forEach(pool => {\n            // Ignore empty pools (if other parts of the system have moved commits around different pools)...\n            if (pool.empty()) return\n\n            // Add it to the list of pending pools...\n            this.pools.add(pool)\n\n            // Send it's payload along to the server...\n            pool.send().then(() => {\n                // When it comes back, remove it from the list...\n                this.pools.delete(pool)\n\n                // Trigger another pooling phase in case commits have\n                // been added while the current request was out...\n                this.sendAnyQueuedCommits()\n            })\n        })\n    }\n\n    corraleCommitsIntoPools() {\n        let pools = new Set\n\n        // Go through each commit and assess wether it should be bundled\n        // with other commits or sperated into it's own pool (network request)...\n        for (let [idx, commit] of this.commits.entries()) {\n            let hasFoundPool = false\n\n            // If an existing pool wants to claim a commit, let it...\n            pools.forEach(pool => {\n                if (pool.shouldHoldCommit(commit)) {\n                    pool.add(commit)\n\n                    hasFoundPool = true\n                }\n            })\n\n            // Otherwise, create a new pool and seed it with this commit...\n            if (! hasFoundPool) {\n                let newPool = new RequestPool\n\n                newPool.add(commit)\n\n                pools.add(newPool)\n            }\n        }\n\n        return pools\n    }\n\n    sendAnyQueuedCommits() {\n        if (this.commits.size > 0) {\n            this.createAndSendNewPool()\n        }\n    }\n}\n\nlet buffersByCommit = new WeakMap\n\nfunction bufferPoolingForFiveMs(commit, callback) {\n    if (buffersByCommit.has(commit)) return\n\n    buffersByCommit.set(commit, setTimeout(() => {\n        callback()\n\n        buffersByCommit.delete(commit)\n    }, 5))\n}\n", "import { getCsrfToken, contentIsFromDump, splitDumpFromContent, getUpdateUri } from '@/utils'\nimport { trigger, triggerAsync } from '@/hooks'\nimport { showHtmlModal } from './modal'\nimport { CommitBus } from './bus'\n\n/**\n * This is the bus that manages pooling and sending\n * commits to the server as network requests...\n */\nlet commitBus = new CommitBus\n\n/**\n * Create a commit and trigger a network request...\n */\nexport async function requestCommit(component) {\n    let commit = commitBus.add(component)\n\n    let promise = new Promise((resolve) => {\n        commit.addResolver(resolve)\n    })\n\n    promise.commit = commit\n\n    return promise\n}\n\n/**\n * Create a commit with an \"action\" call and trigger a network request...\n */\nexport async function requestCall(component, method, params) {\n    let commit = commitBus.add(component)\n\n    let promise = new Promise((resolve) => {\n        commit.addCall(method, params, value => resolve(value))\n    })\n\n    promise.commit = commit\n\n    return promise\n}\n\n/**\n * Send a pool of commits to the server over HTTP...\n */\nexport async function sendRequest(pool) {\n    let [payload, handleSuccess, handleFailure] = pool.payload()\n\n    let options = {\n        method: 'POST',\n        body: JSON.stringify({\n            _token: getCsrfToken(),\n            components: payload,\n        }),\n        headers: {\n            'Content-type': 'application/json',\n            'X-Livewire': '',\n        },\n    }\n\n    let succeedCallbacks = []\n    let failCallbacks = []\n    let respondCallbacks = []\n\n    let succeed = (fwd) => succeedCallbacks.forEach(i => i(fwd))\n    let fail = (fwd) => failCallbacks.forEach(i => i(fwd))\n    let respond = (fwd) => respondCallbacks.forEach(i => i(fwd))\n\n    let finishProfile = trigger('request.profile', options)\n\n    let updateUri = getUpdateUri()\n\n    trigger('request', {\n        url: updateUri,\n        options,\n        payload: options.body,\n        respond: i => respondCallbacks.push(i),\n        succeed: i => succeedCallbacks.push(i),\n        fail: i => failCallbacks.push(i),\n    })\n\n    let response\n\n    try {\n        response = await fetch(updateUri, options)\n    } catch (e) {\n        // If something went wrong with the fetch (particularly\n        // this would happen if the connection went offline)\n        // fail with a 503 and allow Livewire to clean up\n\n        finishProfile({ content: '{}', failed: true })\n\n        handleFailure()\n\n        fail({\n            status: 503,\n            content: null,\n            preventDefault: () => {},\n        })\n\n        return\n    }\n\n    let mutableObject = {\n        status: response.status,\n        response,\n    }\n\n    respond(mutableObject)\n\n    response = mutableObject.response\n\n    let content = await response.text()\n\n    // Handle error response...\n    if (! response.ok) {\n        finishProfile({ content: '{}', failed: true })\n\n        let preventDefault = false\n\n        handleFailure()\n\n        fail({\n            status: response.status,\n            content,\n            preventDefault: () => preventDefault = true,\n        })\n\n        if (preventDefault) return\n\n        if (response.status === 419) {\n            handlePageExpiry()\n        }\n\n        return showFailureModal(content)\n    }\n\n    /**\n     * Sometimes a redirect happens on the backend outside of Livewire's control,\n     * for example to a login page from a middleware, so we will just redirect\n     * to that page.\n     */\n    if (response.redirected) {\n        window.location.href = response.url\n    }\n\n    /**\n     * Sometimes a response will be prepended with html to render a dump, so we\n     * will seperate the dump html from Livewire's JSON response content and\n     * render the dump in a modal and allow Livewire to continue with the\n     * request.\n     */\n    if (contentIsFromDump(content)) {\n        let dump\n        [dump, content] = splitDumpFromContent(content)\n\n        showHtmlModal(dump)\n\n        finishProfile({ content: '{}', failed: true })\n    } else {\n        finishProfile({ content, failed: false })\n    }\n\n    let { components, assets } = JSON.parse(content)\n\n    await triggerAsync('payload.intercept', { components, assets })\n\n    await handleSuccess(components)\n\n    succeed({ status: response.status, json: JSON.parse(content) })\n}\n\nfunction handlePageExpiry() {\n    confirm(\n        'This page has expired.\\nWould you like to refresh the page?'\n    ) && window.location.reload()\n}\n\nfunction showFailureModal(content) {\n    let html = content\n\n    showHtmlModal(html)\n}\n", "import { cancelUpload, removeUpload, upload, uploadMultiple } from './features/supportFileUploads'\nimport { dispatch, dispatchSelf, dispatchTo, listen } from '@/events'\nimport { generateEntangleFunction } from '@/features/supportEntangle'\nimport { closestComponent } from '@/store'\nimport { requestCommit, requestCall } from '@/request'\nimport { dataGet, dataSet } from '@/utils'\nimport Alpine from 'alpinejs'\nimport { on as hook } from './hooks'\n\nlet properties = {}\nlet fallback\n\nfunction wireProperty(name, callback, component = null) {\n    properties[name] = callback\n}\n\nfunction wireFallback(callback) {\n    fallback = callback\n}\n\n// For V2 backwards compatibility...\n// And I actually like both depending on the scenario...\nlet aliases = {\n    'on': '$on',\n    'el': '$el',\n    'id': '$id',\n    'get': '$get',\n    'set': '$set',\n    'call': '$call',\n    'hook': '$hook',\n    'commit': '$commit',\n    'watch': '$watch',\n    'entangle': '$entangle',\n    'dispatch': '$dispatch',\n    'dispatchTo': '$dispatchTo',\n    'dispatchSelf': '$dispatchSelf',\n    'upload': '$upload',\n    'uploadMultiple': '$uploadMultiple',\n    'removeUpload': '$removeUpload',\n    'cancelUpload': '$cancelUpload',\n}\n\nexport function generateWireObject(component, state) {\n    return new Proxy({}, {\n        get(target, property) {\n            if (property === '__instance') return component\n\n            if (property in aliases) {\n                return getProperty(component, aliases[property])\n            } else if (property in properties) {\n                return getProperty(component, property)\n            } else if (property in state) {\n                return state[property]\n            } else if (! ['then'].includes(property)) {\n                return getFallback(component)(property)\n            }\n        },\n\n        set(target, property, value) {\n            if (property in state) {\n                state[property] = value\n            }\n\n            return true\n        },\n    })\n}\n\nfunction getProperty(component, name) {\n    return properties[name](component)\n}\n\nfunction getFallback(component) {\n    return fallback(component)\n}\n\nAlpine.magic('wire', (el, { cleanup }) => {\n    // Purposely initializing an empty variable here is a \"memo\"\n    // so that a component is lazy-loaded when using $wire from Alpine...\n    let component\n\n    // Override $wire methods that need to be cleaned up when\n    // and element is removed. For example, `x-data=\"{ foo: $wire.entangle(...) }\"`:\n    // we would want the entangle effect freed if the element was removed from the DOM...\n    return new Proxy({}, {\n        get(target, property) {\n            if (! component) component = closestComponent(el)\n\n            if (['$entangle', 'entangle'].includes(property)) {\n                return generateEntangleFunction(component, cleanup)\n            }\n\n            return component.$wire[property]\n        },\n\n        set(target, property, value) {\n            if (! component) component = closestComponent(el)\n\n            component.$wire[property] = value\n\n            return true\n        },\n    })\n})\n\nwireProperty('__instance', (component) => component)\n\nwireProperty('$get', (component) => (property, reactive = true) => dataGet(reactive ? component.reactive : component.ephemeral, property))\n\nwireProperty('$el', (component) => {\n    return component.el\n})\n\nwireProperty('$id', (component) => {\n    return component.id\n})\n\nwireProperty('$set', (component) => async (property, value, live = true) => {\n    dataSet(component.reactive, property, value)\n\n    // If \"live\", send a request, queueing the property update to happen first\n    // on the server, then trickle back down to the client and get merged...\n    if (live) {\n        component.queueUpdate(property, value)\n\n        return await requestCommit(component)\n    }\n\n    return Promise.resolve()\n})\n\nwireProperty('$call', (component) => async (method, ...params) => {\n    return await component.$wire[method](...params)\n})\n\nwireProperty('$entangle', (component) => (name, live = false) => {\n    return generateEntangleFunction(component)(name, live)\n})\n\nwireProperty('$toggle', (component) => (name, live = true) => {\n    return component.$wire.set(name, ! component.$wire.get(name), live)\n})\n\nwireProperty('$watch', (component) => (path, callback) => {\n    let getter = () => {\n        return dataGet(component.reactive, path)\n    }\n\n    let unwatch = Alpine.watch(getter, callback)\n\n    component.addCleanup(unwatch)\n})\n\nwireProperty('$refresh', (component) => component.$wire.$commit)\nwireProperty('$commit', (component) => async () => await requestCommit(component))\n\nwireProperty('$on', (component) => (...params) => listen(component, ...params))\n\nwireProperty('$hook', (component) => (name, callback) => {\n    let unhook = hook(name, ({component: hookComponent, ...params}) => {\n        // Request level hooks don't have a component, so just run the callback\n        if (hookComponent === undefined) return callback(params)\n\n        // Run the callback if the component in the hook matches the $wire component\n        if (hookComponent.id === component.id) return callback({component: hookComponent, ...params})\n    })\n\n    component.addCleanup(unhook)\n\n    // Return the unhook function so it can be called manually if needed\n    return unhook\n})\n\nwireProperty('$dispatch', (component) => (...params) => dispatch(component, ...params))\nwireProperty('$dispatchSelf', (component) => (...params) => dispatchSelf(component, ...params))\nwireProperty('$dispatchTo', () => (...params) => dispatchTo(...params))\nwireProperty('$upload', (component) => (...params) => upload(component, ...params))\nwireProperty('$uploadMultiple', (component) => (...params) => uploadMultiple(component, ...params))\nwireProperty('$removeUpload', (component) => (...params) => removeUpload(component, ...params))\nwireProperty('$cancelUpload', (component) => (...params) => cancelUpload(component, ...params))\n\nlet parentMemo = new WeakMap\n\nwireProperty('$parent', component => {\n    if (parentMemo.has(component)) return parentMemo.get(component).$wire\n\n    let parent = component.parent\n\n    parentMemo.set(component, parent)\n\n    return parent.$wire\n})\n\nlet overriddenMethods = new WeakMap\n\nexport function overrideMethod(component, method, callback) {\n    if (! overriddenMethods.has(component)) {\n        overriddenMethods.set(component, {})\n    }\n\n    let obj = overriddenMethods.get(component)\n\n    obj[method] = callback\n\n    overriddenMethods.set(component, obj)\n}\n\nwireFallback((component) => (property) => async (...params) => {\n    // If this method is passed directly to a Vue or Alpine\n    // event listener (@click=\"someMethod\") without using\n    // parens, strip out the automatically added event.\n    if (params.length === 1 && params[0] instanceof Event) {\n        params = []\n    }\n\n    if (overriddenMethods.has(component)) {\n        let overrides = overriddenMethods.get(component)\n\n        if (typeof overrides[property] === 'function') {\n            return overrides[property](params)\n        }\n    }\n\n    return await requestCall(component, property, params)\n})\n", "import { dataSet, deepClone, diff, extractData} from '@/utils'\nimport { generateWireObject } from '@/$wire'\nimport { closestComponent, findComponent } from '@/store'\nimport { trigger } from '@/hooks'\n\nexport class Component {\n    constructor(el) {\n        if (el.__livewire) throw 'Component already initialized';\n\n        el.__livewire = this\n\n        this.el = el\n\n        this.id = el.getAttribute('wire:id')\n\n        this.__livewireId = this.id // @legacy\n\n        this.snapshotEncoded = el.getAttribute('wire:snapshot')\n\n        this.snapshot = JSON.parse(this.snapshotEncoded)\n\n        if (! this.snapshot) {\n            throw `Snapshot missing on Livewire component with id: ` + this.id\n        }\n\n        this.name = this.snapshot.memo.name\n\n        this.effects = JSON.parse(el.getAttribute('wire:effects'))\n        this.originalEffects = deepClone(this.effects)\n\n        // \"canonical\" data represents the last known server state.\n        this.canonical = extractData(deepClone(this.snapshot.data))\n        // \"ephemeral\" represents the most current state. (This can be freely manipulated by end users)\n        this.ephemeral = extractData(deepClone(this.snapshot.data))\n        // \"reactive\" is just ephemeral, except when you mutate it, front-ends like Vue react.\n        this.reactive = Alpine.reactive(this.ephemeral)\n\n        this.queuedUpdates = {}\n\n        // this.$wire = this.reactive\n        this.$wire = generateWireObject(this, this.reactive)\n\n        this.cleanups = []\n\n        // Effects will be processed after every request, but we'll also handle them on initialization.\n        this.processEffects(this.effects)\n    }\n\n    mergeNewSnapshot(snapshotEncoded, effects, updates = {}) {\n        let snapshot = JSON.parse(snapshotEncoded)\n\n        let oldCanonical = deepClone(this.canonical)\n        let updatedOldCanonical = this.applyUpdates(oldCanonical, updates)\n\n        let newCanonical = extractData(deepClone(snapshot.data))\n\n        let dirty = diff(updatedOldCanonical, newCanonical)\n\n        this.snapshotEncoded = snapshotEncoded\n\n        this.snapshot = snapshot\n\n        this.effects = effects\n\n        this.canonical = extractData(deepClone(snapshot.data))\n\n        let newData = extractData(deepClone(snapshot.data))\n\n        Object.entries(dirty).forEach(([key, value]) => {\n            let rootKey = key.split('.')[0]\n            this.reactive[rootKey] = newData[rootKey]\n        })\n        // Object.entries(this.ephemeral).forEach(([key, value]) => {\n        //     if (! deeplyEqual(this.ephemeral[key], newData[key])) {\n        //         this.reactive[key] = newData[key]\n        //     }\n        // })\n\n        return dirty\n    }\n\n    queueUpdate(propertyName, value) {\n        // These updates will be applied first on the server\n        // on the next request, then trickle back to the\n        // client on the next request that gets sent.\n        this.queuedUpdates[propertyName] = value\n    }\n\n    mergeQueuedUpdates(diff) {\n        // Before adding queuedUpdates into the diff list, we will remove any diffs\n        // that will be overriden by the queued update. Queued updates will take\n        // priority against ephemeral updates that have happend since them...\n        Object.entries(this.queuedUpdates).forEach(([updateKey, updateValue]) => {\n            Object.entries(diff).forEach(([diffKey, diffValue]) => {\n                if (diffKey.startsWith(updateValue)) {\n                    delete diff[diffKey]\n                }\n            })\n\n            diff[updateKey] = updateValue\n        })\n\n        this.queuedUpdates = []\n\n        return diff\n    }\n\n    applyUpdates(object, updates) {\n        for (let key in updates) {\n            dataSet(object, key, updates[key])\n        }\n\n        return object\n    }\n\n    replayUpdate(snapshot, html) {\n        let effects = { ...this.effects, html}\n\n        this.mergeNewSnapshot(JSON.stringify(snapshot), effects)\n\n        this.processEffects({ html })\n    }\n\n    /**\n     * Here we'll take the new state and side effects from the\n     * server and use them to update the existing data that\n     * users interact with, triggering reactive effects.\n     */\n    processEffects(effects) {\n        // This is for BC.\n        trigger('effects', this, effects)\n\n        trigger('effect', {\n            component: this,\n            effects,\n            cleanup: i => this.addCleanup(i)\n        })\n    }\n\n    get children() {\n        let meta = this.snapshot.memo\n        let childIds = Object.values(meta.children).map(i => i[1])\n\n        return childIds.map(id => findComponent(id))\n    }\n\n    get parent() {\n        return closestComponent(this.el.parentElement)\n    }\n\n    inscribeSnapshotAndEffectsOnElement() {\n        let el = this.el\n\n        el.setAttribute('wire:snapshot', this.snapshotEncoded)\n\n        // We need to re-register any event listeners that were originally registered...\n        let effects = this.originalEffects.listeners\n            ? { listeners: this.originalEffects.listeners }\n            : {}\n\n        // We need to re-register any url/query-string bindings...\n        if (this.originalEffects.url) {\n            effects.url = this.originalEffects.url\n        }\n\n        // We need to re-register any scripts that were originally registered...\n        if (this.originalEffects.scripts) {\n            effects.scripts = this.originalEffects.scripts;\n        }\n\n        el.setAttribute('wire:effects', JSON.stringify(effects))\n    }\n\n    addCleanup(cleanup) {\n        this.cleanups.push(cleanup)\n    }\n\n    cleanup() {\n        delete this.el.__livewire\n\n        while (this.cleanups.length > 0) {\n            this.cleanups.pop()()\n        }\n    }\n}\n", "import { Component } from \"@/component\";\nimport { trigger } from \"@/hooks\";\n\nlet components = {}\n\nexport function initComponent(el) {\n    let component = new Component(el)\n\n    if (components[component.id]) throw 'Component already registered'\n\n    let cleanup = (i) => component.addCleanup(i)\n\n    trigger('component.init', { component, cleanup })\n\n    components[component.id] = component\n\n    return component\n}\n\nexport function destroyComponent(id) {\n    let component = components[id]\n\n    if (! component) return\n\n    component.cleanup()\n\n    delete components[id]\n}\n\nexport function hasComponent(id) {\n    return !! components[id]\n}\n\nexport function findComponent(id) {\n    let component = components[id]\n\n    if (! component) throw 'Component not found: ' + id\n\n    return component\n}\n\nexport function closestComponent(el, strict = true) {\n    let closestRoot = Alpine.findClosest(el, i => i.__livewire)\n\n    if (! closestRoot) {\n        if (strict) throw \"Could not find Livewire component in DOM tree\"\n\n        return\n    }\n\n    return closestRoot.__livewire\n}\n\nexport function componentsByName(name) {\n    return Object.values(components).filter(component => {\n        return name == component.name\n    })\n}\n\nexport function getByName(name) {\n    return componentsByName(name).map(i => i.$wire)\n}\n\nexport function find(id) {\n    let component = components[id]\n\n    return component && component.$wire\n}\n\nexport function first() {\n    return Object.values(components)[0].$wire\n}\n\nexport function all() {\n    return Object.values(components)\n}\n", "import { componentsByName } from \"@/store\"\n\nexport function dispatch(component, name, params) {\n    dispatchEvent(component.el, name, params)\n}\n\nexport function dispatchGlobal(name, params) {\n    dispatchEvent(window, name, params)\n}\n\nexport function dispatchSelf(component, name, params) {\n    dispatchEvent(component.el, name, params, false)\n}\n\nexport function dispatchTo(componentName, name, params) {\n    let targets = componentsByName(componentName)\n\n    targets.forEach(target => {\n        dispatchEvent(target.el, name, params, false)\n    })\n}\n\nexport function listen(component, name, callback) {\n    component.el.addEventListener(name, e => {\n        callback(e.detail)\n    })\n}\n\nexport function on(eventName, callback) {\n    let handler = (e) => {\n        // Implemented for backwards compatibility...\n        if (! e.__livewire) return\n\n        callback(e.detail)\n    }\n\n    window.addEventListener(eventName, handler)\n\n    return () => {\n        window.removeEventListener(eventName, handler)\n    }\n}\n\nfunction dispatchEvent(target, name, params, bubbles = true) {\n    let e = new CustomEvent(name, { bubbles, detail: params })\n\n    e.__livewire = { name, params, receivedBy: [] }\n\n    target.dispatchEvent(e)\n}\n", "import { on } from './hooks'\n\nlet customDirectiveNames = new Set\n\nexport function matchesForLivewireDirective(attributeName) {\n    return attributeName.match(new RegExp('wire:'))\n}\n\nexport function extractDirective(el, name) {\n    let [value, ...modifiers] = name.replace(new RegExp('wire:'), '').split('.')\n\n    return new Directive(value, modifiers, name, el)\n}\n\nexport function directive(name, callback) {\n    // Prevent the same directive from registering multiple initialization listeners...\n    if (customDirectiveNames.has(name)) return\n\n    customDirectiveNames.add(name)\n\n    on('directive.init', ({ el, component, directive, cleanup }) => {\n        if (directive.value === name) {\n            callback({\n                el, directive, component, $wire: component.$wire, cleanup\n            })\n        }\n    })\n}\n\nexport function globalDirective(name, callback) {\n    // Prevent the same directive from registering multiple initialization listeners...\n    if (customDirectiveNames.has(name)) return\n\n    customDirectiveNames.add(name)\n\n    on('directive.global.init', ({ el, directive, cleanup }) => {\n        if (directive.value === name) {\n            callback({ el, directive, cleanup })\n        }\n    })\n}\n\nexport function getDirectives(el) {\n    return new DirectiveManager(el)\n}\n\nexport function customDirectiveHasBeenRegistered(name) {\n    return customDirectiveNames.has(name)\n}\n\nclass DirectiveManager {\n    constructor(el) {\n        this.el = el\n        this.directives = this.extractTypeModifiersAndValue()\n    }\n\n    all() {\n        return this.directives\n    }\n\n    has(value) {\n        return this.directives.map(directive => directive.value).includes(value)\n    }\n\n    missing(value) {\n        return ! this.has(value)\n    }\n\n    get(value) {\n        return this.directives.find(directive => directive.value === value)\n    }\n\n    extractTypeModifiersAndValue() {\n        return Array.from(this.el.getAttributeNames()\n            // Filter only the livewire directives.\n            .filter(name => matchesForLivewireDirective(name))\n            // Parse out the type, modifiers, and value from it.\n            .map(name => extractDirective(this.el, name)))\n    }\n}\n\nexport class Directive {\n    constructor(value, modifiers, rawName, el) {\n        this.rawName = this.raw = rawName\n        this.el = el\n        this.eventContext\n\n        this.value = value\n        this.modifiers = modifiers\n        this.expression = this.el.getAttribute(this.rawName)\n    }\n\n    get method() {\n        const { method } = this.parseOutMethodAndParams(this.expression)\n\n        return method\n    }\n\n    get params() {\n        const { params } = this.parseOutMethodAndParams(this.expression)\n\n        return params\n    }\n\n    parseOutMethodAndParams(rawMethod) {\n        let method = rawMethod\n        let params = []\n        const methodAndParamString = method.match(/(.*?)\\((.*)\\)/s)\n\n        if (methodAndParamString) {\n            method = methodAndParamString[1]\n\n            // Use a function that returns it's arguments to parse and eval all params\n            // This \"$event\" is for use inside the livewire event handler.\n            let func = new Function('$event', `return (function () {\n                for (var l=arguments.length, p=new Array(l), k=0; k<l; k++) {\n                    p[k] = arguments[k];\n                }\n                return [].concat(p);\n            })(${methodAndParamString[2]})`)\n\n            params = func(this.eventContext)\n        }\n\n        return { method, params }\n    }\n}\n", "import { closestComponent, destroyComponent, initComponent } from './store'\nimport { matchesForLivewireDirective, extractDirective } from './directives'\nimport { trigger } from './hooks'\nimport collapse from '@alpinejs/collapse'\nimport focus from '@alpinejs/focus'\nimport persist from '@alpinejs/persist'\nimport intersect from '@alpinejs/intersect'\nimport resize from '@alpinejs/resize'\nimport anchor from '@alpinejs/anchor'\nimport navigate from './plugins/navigate'\nimport history from './plugins/history'\nimport morph from '@alpinejs/morph'\nimport mask from '@alpinejs/mask'\nimport Alpine from 'alpinejs'\nimport { dispatch } from './utils'\n\nexport function start() {\n    setTimeout(() => ensureLivewireScriptIsntMisplaced())\n\n    dispatch(document, 'livewire:init')\n    dispatch(document, 'livewire:initializing')\n\n    Alpine.plugin(morph)\n    Alpine.plugin(history)\n    Alpine.plugin(intersect)\n    Alpine.plugin(resize)\n    Alpine.plugin(collapse)\n    Alpine.plugin(anchor)\n    Alpine.plugin(focus)\n    Alpine.plugin(persist)\n    Alpine.plugin(navigate)\n    Alpine.plugin(mask)\n\n    Alpine.addRootSelector(() => '[wire\\\\:id]')\n\n    Alpine.onAttributesAdded((el, attributes) => {\n        // if there are no \"wire:\" directives we don't need to process this element any further.\n        // This prevents Livewire from causing general slowness for other Alpine elements on the page...\n        if (! Array.from(attributes).some(attribute => matchesForLivewireDirective(attribute.name))) return\n\n        let component = closestComponent(el, false)\n\n        if (! component) return\n\n        attributes.forEach(attribute => {\n            if (! matchesForLivewireDirective(attribute.name)) return;\n\n            let directive = extractDirective(el, attribute.name)\n\n            trigger('directive.init', { el, component, directive, cleanup: (callback) => {\n                Alpine.onAttributeRemoved(el, directive.raw, callback)\n            } })\n        })\n    })\n\n    Alpine.interceptInit(\n        Alpine.skipDuringClone(el => {\n            // if there are no \"wire:\" directives we don't need to process this element any further.\n            // This prevents Livewire from causing general slowness for other Alpine elements on the page...\n            if (! Array.from(el.attributes).some(attribute => matchesForLivewireDirective(attribute.name))) return\n\n            if (el.hasAttribute('wire:id')) {\n                let component = initComponent(el)\n\n                Alpine.onAttributeRemoved(el, 'wire:id', () => {\n                    destroyComponent(component.id)\n                })\n            }\n\n            let directives = Array.from(el.getAttributeNames())\n                .filter(name => matchesForLivewireDirective(name))\n                .map(name => extractDirective(el, name))\n\n            directives.forEach(directive => {\n                trigger('directive.global.init', { el, directive, cleanup: (callback) => {\n                    Alpine.onAttributeRemoved(el, directive.raw, callback)\n                } })\n            })\n\n            let component = closestComponent(el, false)\n\n            if (component) {\n                trigger('element.init', { el, component })\n\n                directives.forEach(directive => {\n                    trigger('directive.init', { el, component, directive, cleanup: (callback) => {\n                        Alpine.onAttributeRemoved(el, directive.raw, callback)\n                    } })\n                })\n            }\n        })\n    )\n\n    Alpine.start()\n\n    setTimeout(() => window.Livewire.initialRenderIsFinished = true)\n\n    dispatch(document, 'livewire:initialized')\n}\n\nfunction ensureLivewireScriptIsntMisplaced() {\n    let el = document.querySelector('script[data-update-uri][data-csrf]')\n\n    // If there is no Livewire-injected script on the page, move on...\n    if (! el) return\n\n    // If there is, let's ensure it's at the top-level. If it's nested\n    // inside a normal element, that probably means that a closing\n    // tag was missing in the template and Chrome moved the tag.\n\n    // We're only checking for \"div\" here because it's quick and useful...\n    let livewireEl = el.closest('[wire\\\\:id]')\n\n    if (livewireEl) {\n        console.warn('Livewire: missing closing tags found. Ensure your template elements contain matching closing tags.', livewireEl)\n    }\n}\n", "\nclass Snapshot {\n    constructor(url, html) {\n        this.url = url\n        this.html = html\n    }\n}\n\nlet snapshotCache = {\n    currentKey: null,\n    currentUrl: null,\n    keys: [],\n    lookup: {},\n\n    limit: 10,\n\n    has(location) {\n        return this.lookup[location] !== undefined\n    },\n\n    retrieve(location) {\n        let snapshot = this.lookup[location]\n\n        if (snapshot === undefined)\n            throw (\n                'No back button cache found for current location: ' +\n                location\n            )\n\n        return snapshot\n    },\n\n    replace(key, snapshot) {\n        if (this.has(key)) {\n            this.lookup[key] = snapshot\n        } else {\n            this.push(key, snapshot)\n        }\n    },\n\n    push(key, snapshot) {\n        this.lookup[key] = snapshot\n\n        let index = this.keys.indexOf(key)\n\n        if (index > -1) this.keys.splice(index, 1)\n\n        this.keys.unshift(key)\n\n        this.trim()\n    },\n\n    trim() {\n        for (let key of this.keys.splice(this.limit)) {\n          delete this.lookup[key]\n        }\n    }\n}\n\nexport function updateCurrentPageHtmlInHistoryStateForLaterBackButtonClicks() {\n    // Create a history state entry for the initial page load.\n    // (This is so later hitting back can restore this page).\n    let url = new URL(window.location.href, document.baseURI)\n\n    replaceUrl(url, document.documentElement.outerHTML)\n}\n\nexport function updateCurrentPageHtmlInSnapshotCacheForLaterBackButtonClicks(key, url) {\n    let html = document.documentElement.outerHTML\n\n    snapshotCache.replace(key, new Snapshot(url, html))\n}\n\nexport function whenTheBackOrForwardButtonIsClicked(\n    registerFallback,\n    handleHtml\n) {\n    let fallback\n\n    registerFallback(i => (fallback = i))\n\n    window.addEventListener('popstate', e => {\n        let state = e.state || {}\n\n        let alpine = state.alpine || {}\n\n        // If state is an empty object, then the popstate has probably been triggered\n        // by anchor tags `#my-heading`, so we don't want to handle them.\n        if (Object.keys(state).length === 0) return\n\n        if (! alpine.snapshotIdx) return\n\n        if (snapshotCache.has(alpine.snapshotIdx)) {\n            let snapshot = snapshotCache.retrieve(alpine.snapshotIdx)\n\n            handleHtml(snapshot.html, snapshot.url, snapshotCache.currentUrl, snapshotCache.currentKey)\n        } else {\n            fallback(alpine.url)\n        }\n    })\n}\n\nexport function updateUrlAndStoreLatestHtmlForFutureBackButtons(\n    html,\n    destination\n) {\n    pushUrl(destination, html)\n}\n\nexport function pushUrl(url, html) {\n    updateUrl('pushState', url, html)\n}\n\nexport function replaceUrl(url, html) {\n    updateUrl('replaceState', url, html)\n}\n\nfunction updateUrl(method, url, html) {\n    let key = url.toString() + '-' + Math.random()\n\n    method === 'pushState'\n        ? snapshotCache.push(key, new Snapshot(url, html))\n        : snapshotCache.replace(key = (snapshotCache.currentKey ?? key), new Snapshot(url, html))\n\n    let state = history.state || {}\n\n    if (!state.alpine) state.alpine = {}\n\n    state.alpine.snapshotIdx = key\n    state.alpine.url = url.toString()\n\n    try {\n        // 640k character limit:\n        history[method](state, JSON.stringify(document.title), url)\n\n        snapshotCache.currentKey = key\n        snapshotCache.currentUrl = url\n    } catch (error) {\n        if (error instanceof DOMException && error.name === 'SecurityError') {\n            console.error(\n                \"Livewire: You can't use wire:navigate with a link to a different root domain: \" +\n                    url\n            )\n        }\n\n        console.error(error)\n    }\n}\n", "\nexport function whenThisLinkIsPressed(el, callback) {\n    let isProgrammaticClick = e => ! e.isTrusted\n    let isNotPlainLeftClick = e => (e.which > 1) || (e.altKey) || (e.ctrlKey) || (e.metaKey) || (e.shiftKey)\n    let isNotPlainEnterKey = (e) => (e.which !== 13) || (e.altKey) || (e.ctrlKey) || (e.metaKey) || (e.shiftKey)\n\n    el.addEventListener('click', e => {\n        // This allows programmatic clicking of links via: `$0.click()`...\n        if (isProgrammaticClick(e)) {\n            e.preventDefault()\n\n            callback(whenReleased => whenReleased())\n\n            return\n        }\n\n        // This allows cmd+click and such to still work as expected...\n        if (isNotPlainLeftClick(e)) return;\n\n        // If it's a plain left click, we want to prevent \"click\" and let \"mouseup\" do its thing...\n        e.preventDefault()\n    })\n\n    el.addEventListener('mousedown', e => {\n        // We only care about left clicks for wire:navigate...\n        if (isNotPlainLeftClick(e)) return;\n\n        e.preventDefault()\n\n        callback((whenReleased) => {\n            let handler = e => {\n                e.preventDefault()\n\n                whenReleased()\n\n                el.removeEventListener('mouseup', handler)\n            }\n\n            el.addEventListener('mouseup', handler)\n        })\n    })\n\n    el.addEventListener(\"keydown\", e => {\n        // We only care about the enter key...\n        if (isNotPlainEnterKey(e)) return;\n\n        e.preventDefault()\n\n        callback(whenReleased => whenReleased())\n    })\n}\n\nexport function whenThisLinkIsHoveredFor(el, ms = 60, callback) {\n    el.addEventListener('mouseenter', e => {\n        let timeout = setTimeout(() => {\n            callback(e)\n        }, ms)\n\n        let handler = () => {\n            clearTimeout(timeout)\n            el.removeEventListener('mouseleave', handler)\n        }\n\n        el.addEventListener('mouseleave', handler)\n    })\n}\n\nexport function extractDestinationFromLink(linkEl) {\n    return createUrlObjectFromString(linkEl.getAttribute('href'))\n}\n\nexport function createUrlObjectFromString(urlString) {\n    return urlString !== null && new URL(urlString, document.baseURI)\n}\n\nexport function getUriStringFromUrlObject(urlObject) {\n    return urlObject.pathname + urlObject.search + urlObject.hash\n}\n", "import { trigger } from \"@/hooks\"\nimport { createUrlObjectFromString, getUriStringFromUrlObject } from \"./links\"\n\nexport function fetchHtml(destination, callback) {\n    let uri = getUriStringFromUrlObject(destination)\n\n    performFetch(uri, (html, finalDestination) => {\n        callback(html, finalDestination)\n    })\n}\n\nexport function performFetch(uri, callback) {\n    let options = {\n        headers: {\n            'X-Livewire-Navigate': ''\n        }\n    }\n\n    trigger('navigate.request', {\n        url: uri,\n        options,\n    })\n\n    let finalDestination\n\n    fetch(uri, options).then(response => {\n        let destination = createUrlObjectFromString(uri)\n        finalDestination = createUrlObjectFromString(response.url)\n\n        // If there was no redirect triggered by the URL that was fetched...\n        if ((destination.pathname + destination.search) === (finalDestination.pathname + finalDestination.search)) {\n            // Then let's cary over any \"hash\" entries on the URL.\n            // We have to do this because hashes aren't sent to\n            // the server by \"fetch\", so it needs to get added\n            finalDestination.hash = destination.hash\n        }\n\n        return response.text()\n    }).then(html => {\n        callback(html, finalDestination)\n    });\n}\n", "import { performFetch } from \"@/plugins/navigate/fetch\";\nimport { getUriStringFromUrlObject } from \"./links\";\n\n// Warning: this could cause some memory leaks\nlet prefetches = {}\n\nexport function prefetchHtml(destination, callback) {\n    let uri = getUriStringFromUrlObject(destination)\n\n    if (prefetches[uri]) return\n\n    prefetches[uri] = { finished: false, html: null, whenFinished: () => {} }\n\n    performFetch(uri, (html, routedUri) => {\n        callback(html, routedUri)\n    })\n}\n\nexport function storeThePrefetchedHtmlForWhenALinkIsClicked(html, destination, finalDestination) {\n    let state = prefetches[getUriStringFromUrlObject(destination)]\n    state.html = html\n    state.finished = true\n    state.finalDestination = finalDestination\n    state.whenFinished()\n}\n\nexport function getPretchedHtmlOr(destination, receive, ifNoPrefetchExists) {\n    let uri = getUriStringFromUrlObject(destination)\n\n    if (! prefetches[uri]) return ifNoPrefetchExists()\n\n    if (prefetches[uri].finished) {\n        let html = prefetches[uri].html\n        let finalDestination = prefetches[uri].finalDestination\n\n        delete prefetches[uri]\n\n        return receive(html, finalDestination)\n    } else {\n        prefetches[uri].whenFinished = () => {\n            let html = prefetches[uri].html\n            let finalDestination = prefetches[uri].finalDestination\n\n            delete prefetches[uri]\n\n            receive(html, finalDestination)\n        }\n    }\n}\n\n", "import Alpine from \"alpinejs\"\n\nexport function packUpPersistedTeleports(persistedEl) {\n    // Persisted elements get removed from the DOM and then re-added later. We need to do the same\n    // with any `x-teleport`ed elements...\n    Alpine.mutateDom(() => {\n        persistedEl.querySelectorAll('[data-teleport-template]').forEach(i => i._x_teleport.remove())\n    })\n}\n\nexport function removeAnyLeftOverStaleTeleportTargets(body) {\n    // We need to remove any left-over teleported elements form the page\n    // as they are stale and will be re-initialized when Alpine boots up on this page...\n    Alpine.mutateDom(() => {\n        body.querySelectorAll('[data-teleport-target]').forEach(i => i.remove())\n    })\n}\n\nexport function unPackPersistedTeleports(persistedEl) {\n    // Before we put back any persisted elements, we're going to\n    // find any \"x-teleports\" and put their targets back on the page...\n    Alpine.walk(persistedEl, (el, skip) => {\n        if (! el._x_teleport) return;\n\n        el._x_teleportPutBack()\n\n        skip()\n    })\n}\n\nexport function isTeleportTarget(el) {\n    return el.hasAttribute('data-teleport-target')\n}\n", "\nexport function storeScrollInformationInHtmlBeforeNavigatingAway() {\n    document.body.setAttribute('data-scroll-x', document.body.scrollLeft)\n    document.body.setAttribute('data-scroll-y', document.body.scrollTop)\n\n    document.querySelectorAll(['[x-navigate\\\\:scroll]', '[wire\\\\:scroll]']).forEach(el => {\n        el.setAttribute('data-scroll-x', el.scrollLeft)\n        el.setAttribute('data-scroll-y', el.scrollTop)\n    })\n}\n\nexport function restoreScrollPositionOrScrollToTop() {\n    let scroll = el => {\n        if (! el.hasAttribute('data-scroll-x')) {\n            window.scrollTo({ top: 0, left: 0, behavior: 'instant' })\n        } else {\n            el.scrollTo({\n                top: Number(el.getAttribute('data-scroll-y')),\n                left: Number(el.getAttribute('data-scroll-x')),\n                behavior: 'instant',\n            })\n            el.removeAttribute('data-scroll-x')\n            el.removeAttribute('data-scroll-y')\n        }\n    }\n\n    queueMicrotask(() => {\n        queueMicrotask(() => { // Double microtask here to make sure scrolling restoration is the LAST thing to happen. (Even after Alpine's x-init functions)...\n            scroll(document.body)\n\n            document.querySelectorAll(['[x-navigate\\\\:scroll]', '[wire\\\\:scroll]']).forEach(scroll)\n        })\n    })\n}\n", "import Alpine from 'alpinejs'\n\nlet els = {}\n\nexport function storePersistantElementsForLater(callback) {\n    els = {}\n\n    document.querySelectorAll('[x-persist]').forEach(i => {\n        els[i.getAttribute('x-persist')] = i\n\n        callback(i)\n\n        Alpine.mutateDom(() => {\n            i.remove()\n        })\n    })\n}\n\nexport function putPersistantElementsBack(callback) {\n    let usedPersists = []\n\n    document.querySelectorAll('[x-persist]').forEach(i => {\n        let old = els[i.getAttribute('x-persist')]\n\n        // There might be a brand new x-persist element...\n        if (! old) return\n\n        usedPersists.push(i.getAttribute('x-persist'))\n\n        old._x_wasPersisted = true\n\n        callback(old, i)\n\n        Alpine.mutateDom(() => {\n            i.replaceWith(old)\n        })\n    })\n\n    Object.entries(els).forEach(([key, el]) => {\n        if (usedPersists.includes(key)) return\n\n        // Destory the un-used persist DOM trees before releasing them...\n        Alpine.destroyTree(el)\n    })\n\n    // Release unused persists for garbage collection...\n    els = {}\n}\n\nexport function isPersistedElement(el) {\n    return el.hasAttribute('x-persist')\n}\n", "import NProgress from 'nprogress'\nimport { getNonce } from '@/utils'\n\nNProgress.configure({\n    minimum: 0.1,\n    trickleSpeed: 200,\n    showSpinner: false,\n    parent: 'body',\n})\n\ninjectStyles()\n\nlet inProgress = false\n\nexport function showAndStartProgressBar() {\n    inProgress = true\n\n    // Only show progress bar if it's been a little bit...\n    setTimeout(() => {\n        if (! inProgress) return\n\n        NProgress.start()\n    }, 150)\n}\n\nexport function finishAndHideProgressBar() {\n    inProgress = false\n\n    NProgress.done()\n}\n\nexport function removeAnyLeftOverStaleProgressBars() {\n    NProgress.remove()\n}\n\nfunction injectStyles() {\n    let style = document.createElement('style')\n\n    style.innerHTML = `/* Make clicks pass-through */\n\n    #nprogress {\n      pointer-events: none;\n    }\n\n    #nprogress .bar {\n      background: var(--livewire-progress-bar-color, #29d);\n\n      position: fixed;\n      z-index: 1031;\n      top: 0;\n      left: 0;\n\n      width: 100%;\n      height: 2px;\n    }\n\n    /* Fancy blur effect */\n    #nprogress .peg {\n      display: block;\n      position: absolute;\n      right: 0px;\n      width: 100px;\n      height: 100%;\n      box-shadow: 0 0 10px var(--livewire-progress-bar-color, #29d), 0 0 5px var(--livewire-progress-bar-color, #29d);\n      opacity: 1.0;\n\n      -webkit-transform: rotate(3deg) translate(0px, -4px);\n          -ms-transform: rotate(3deg) translate(0px, -4px);\n              transform: rotate(3deg) translate(0px, -4px);\n    }\n\n    /* Remove these to get rid of the spinner */\n    #nprogress .spinner {\n      display: block;\n      position: fixed;\n      z-index: 1031;\n      top: 15px;\n      right: 15px;\n    }\n\n    #nprogress .spinner-icon {\n      width: 18px;\n      height: 18px;\n      box-sizing: border-box;\n\n      border: solid 2px transparent;\n      border-top-color: var(--livewire-progress-bar-color, #29d);\n      border-left-color: var(--livewire-progress-bar-color, #29d);\n      border-radius: 50%;\n\n      -webkit-animation: nprogress-spinner 400ms linear infinite;\n              animation: nprogress-spinner 400ms linear infinite;\n    }\n\n    .nprogress-custom-parent {\n      overflow: hidden;\n      position: relative;\n    }\n\n    .nprogress-custom-parent #nprogress .spinner,\n    .nprogress-custom-parent #nprogress .bar {\n      position: absolute;\n    }\n\n    @-webkit-keyframes nprogress-spinner {\n      0%   { -webkit-transform: rotate(0deg); }\n      100% { -webkit-transform: rotate(360deg); }\n    }\n    @keyframes nprogress-spinner {\n      0%   { transform: rotate(0deg); }\n      100% { transform: rotate(360deg); }\n    }\n    `\n\n    let nonce = getNonce()\n\n    if (nonce) style.nonce = nonce\n\n    document.head.appendChild(style)\n}\n", "\nexport function packUpPersistedPopovers(persistedEl) {\n    if (!isPopoverSupported()) return;\n\n    persistedEl.querySelectorAll(':popover-open').forEach(el => {\n        el.setAttribute('data-navigate-popover-open', '')\n\n        let animations = el.getAnimations()\n\n        // Gather any in-progress animations, serialize them, and pause them, for later re-triggering...\n        el._pausedAnimations = animations.map(animation => ({\n            keyframes: animation.effect.getKeyframes(),\n            options: {\n                duration: animation.effect.getTiming().duration,\n                easing: animation.effect.getTiming().easing,\n                fill: animation.effect.getTiming().fill,\n                iterations: animation.effect.getTiming().iterations\n            },\n            currentTime: animation.currentTime,\n            playState: animation.playState\n        }))\n\n        animations.forEach(i => i.pause())\n    })\n}\n\nexport function unPackPersistedPopovers(persistedEl) {\n    if (!isPopoverSupported()) return;\n\n    persistedEl.querySelectorAll('[data-navigate-popover-open]').forEach(el => {\n        el.removeAttribute('data-navigate-popover-open')\n\n        // Wait for the popovers to be fully connected to the DOM...\n        queueMicrotask(() => {\n            if (! el.isConnected) return\n\n            // Show them because disconnected popovers are force-hidden...\n            el.showPopover()\n\n            // End the out-of-the-box animations...\n            el.getAnimations().forEach(i => i.finish())\n\n            // If there are any paused animations, we need to re-trigger them...\n            if (el._pausedAnimations) {\n                el._pausedAnimations.forEach(({keyframes, options, currentTime, now, playState}) => {\n                    let animation = el.animate(keyframes, options);\n\n                    animation.currentTime = currentTime;\n                })\n\n                delete el._pausedAnimations\n            }\n        })\n    })\n}\n\nfunction isPopoverSupported() {\n    return typeof document.createElement('div').showPopover === 'function';\n}\n", "let oldBodyScriptTagHashes = []\n\nlet attributesExemptFromScriptTagHashing = [\n    'data-csrf',\n    'aria-hidden',\n]\n\nexport function swapCurrentPageWithNewHtml(html, andThen) {\n    let newDocument = (new DOMParser()).parseFromString(html, \"text/html\")\n    let newBody = document.adoptNode(newDocument.body)\n    let newHead = document.adoptNode(newDocument.head)\n\n    oldBodyScriptTagHashes = oldBodyScriptTagHashes.concat(Array.from(document.body.querySelectorAll('script')).map(i => {\n        return simpleHash(ignoreAttributes(i.outerHTML, attributesExemptFromScriptTagHashing))\n    }))\n\n    let afterRemoteScriptsHaveLoaded = () => {}\n\n    mergeNewHead(newHead).finally(() => {\n        afterRemoteScriptsHaveLoaded()\n    })\n\n    prepNewBodyScriptTagsToRun(newBody, oldBodyScriptTagHashes)\n\n    let oldBody = document.body\n\n    document.body.replaceWith(newBody)\n\n    Alpine.destroyTree(oldBody)\n\n    andThen(i => afterRemoteScriptsHaveLoaded = i)\n}\n\nfunction prepNewBodyScriptTagsToRun(newBody, oldBodyScriptTagHashes) {\n    newBody.querySelectorAll('script').forEach(i => {\n        // We don't want to re-run script tags marked as \"data-navigate-once\"...\n        if (i.hasAttribute('data-navigate-once')) {\n            // However, if they didn't exist on the previous page, we do.\n            // Therefore, we'll check the \"old body script hashes\" to\n            // see if it was already there before skipping it...\n\n            let hash = simpleHash(\n                ignoreAttributes(i.outerHTML, attributesExemptFromScriptTagHashing)\n            )\n\n            if (oldBodyScriptTagHashes.includes(hash)) return\n        }\n\n        i.replaceWith(cloneScriptTag(i))\n    })\n}\n\nfunction mergeNewHead(newHead) {\n    let children = Array.from(document.head.children)\n    let headChildrenHtmlLookup = children.map(i => i.outerHTML)\n\n    // Only add scripts and styles that aren't already loaded on the page.\n    let garbageCollector = document.createDocumentFragment()\n\n    let touchedHeadElements = []\n\n    let remoteScriptsPromises = []\n\n    for (let child of Array.from(newHead.children)) {\n        if (isAsset(child)) {\n            if (! headChildrenHtmlLookup.includes(child.outerHTML)) {\n                if (isTracked(child)) {\n                    if (ifTheQueryStringChangedSinceLastRequest(child, children)) {\n                        setTimeout(() => window.location.reload())\n                    }\n                }\n\n                if (isScript(child)) {\n                    try {\n                        remoteScriptsPromises.push(\n                            injectScriptTagAndWaitForItToFullyLoad(\n                                cloneScriptTag(child)\n                            )\n                        )\n                    } catch (error) {\n                        // Let's eat any promise rejects so that we don't\n                        // break the rest of the Alpine intializing...\n                        // Any errors triggered by adding the script tag to the page\n                        // will still be thrown...\n                    }\n                } else {\n                    document.head.appendChild(child)\n                }\n            } else {\n                garbageCollector.appendChild(child)\n            }\n\n            touchedHeadElements.push(child)\n        }\n    }\n\n    // Remove any assets that aren't on the new page...\n    // @todo: Re-enable this code and find a better way to managed injected stylesheets. See livewire/livewire#6824\n    // for (let child of Array.from(document.head.children)) {\n    //     if (isAsset(child)) {\n    //         if (! touchedHeadElements.some(i => i.outerHTML === child.outerHTML)) {\n    //             child.remove()\n    //         }\n    //     }\n    // }\n\n    // How to free up the garbage collector?\n\n    // Remove existing non-asset elements like meta, base, title, template.\n    for (let child of Array.from(document.head.children)) {\n        if (! isAsset(child)) child.remove()\n    }\n\n    // Add new non-asset elements left over in the new head element.\n    for (let child of Array.from(newHead.children)) {\n        if (child.tagName.toLowerCase() === 'noscript') continue\n\n        document.head.appendChild(child)\n    }\n\n    return Promise.all(remoteScriptsPromises)\n}\n\nasync function injectScriptTagAndWaitForItToFullyLoad(script) {\n    return new Promise((resolve, reject) => {\n        // Script assets need to be loaded synchronously so that scripts have\n        // their global variables available...\n        if (script.src) {\n            script.onload = () => resolve()\n            script.onerror = () => reject()\n        } else {\n            resolve()\n        }\n\n        document.head.appendChild(script)\n    })\n}\n\nfunction cloneScriptTag(el) {\n    let script = document.createElement('script')\n\n    script.textContent = el.textContent\n    script.async = el.async\n\n    for (let attr of el.attributes) {\n        script.setAttribute(attr.name, attr.value)\n    }\n\n    return script\n}\n\nfunction isTracked(el) {\n    return el.hasAttribute('data-navigate-track')\n}\n\nfunction ifTheQueryStringChangedSinceLastRequest(el, currentHeadChildren) {\n    let [uri, queryString] = extractUriAndQueryString(el)\n\n    return currentHeadChildren.some(child => {\n        if (! isTracked(child)) return false\n\n        let [currentUri, currentQueryString] = extractUriAndQueryString(child)\n\n        // Only consider a data-navigate-track element changed if the query string has changed (not the URI)...\n        if (currentUri === uri && queryString !== currentQueryString) return true\n    })\n}\n\nfunction extractUriAndQueryString(el) {\n    let url = isScript(el) ? el.src : el.href\n\n    return url.split('?')\n}\n\nfunction isAsset(el) {\n    return (el.tagName.toLowerCase() === 'link' && el.getAttribute('rel').toLowerCase() === 'stylesheet')\n        || el.tagName.toLowerCase() === 'style'\n        || el.tagName.toLowerCase() === 'script'\n}\n\nfunction isScript(el)   {\n    return el.tagName.toLowerCase() === 'script'\n}\n\nfunction simpleHash(str) {\n    return str.split('').reduce((a, b) => {\n        a = ((a << 5) - a) + b.charCodeAt(0)\n\n        return a & a\n    }, 0);\n}\n\nfunction ignoreAttributes(subject, attributesToRemove) {\n    let result = subject\n\n    attributesToRemove.forEach(attr => {\n        // Create a regex pattern to match the attribute and its value.\n        // The regex handles attributes that have values surrounded by either single or double quotes.\n        const regex = new RegExp(`${attr}=\"[^\"]*\"|${attr}='[^']*'`, 'g')\n\n        result = result.replace(regex, '')\n    })\n\n    // Remove all whitespace to make things less flaky...\n    result = result.replaceAll(' ', '')\n\n    return result.trim()\n}\n", "import { replaceUrl, updateCurrentPageHtmlInHistoryStateForLaterBackButtonClicks, updateCurrentPageHtmlInSnapshotCacheForLaterBackButtonClicks, updateUrlAndStoreLatestHtmlForFutureBackButtons, whenTheBackOrForwardButtonIsClicked } from \"./history\"\nimport { getPretchedHtmlOr, prefetchHtml, storeThePrefetchedHtmlForWhenALinkIsClicked } from \"./prefetch\"\nimport { createUrlObjectFromString, extractDestinationFromLink, whenThisLinkIsHoveredFor, whenThisLinkIsPressed } from \"./links\"\nimport { isTeleportTarget, packUpPersistedTeleports, removeAnyLeftOverStaleTeleportTargets, unPackPersistedTeleports } from \"./teleport\"\nimport { restoreScrollPositionOrScrollToTop, storeScrollInformationInHtmlBeforeNavigatingAway } from \"./scroll\"\nimport { isPersistedElement, putPersistantElementsBack, storePersistantElementsForLater } from \"./persist\"\nimport { finishAndHideProgressBar, removeAnyLeftOverStaleProgressBars, showAndStartProgressBar } from \"./bar\"\nimport { packUpPersistedPopovers, unPackPersistedPopovers } from \"./popover\"\nimport { swapCurrentPageWithNewHtml } from \"./page\"\nimport { fetchHtml } from \"./fetch\"\n\nlet enablePersist = true\nlet showProgressBar = true\nlet restoreScroll = true\nlet autofocus = false\n\nexport default function (Alpine) {\n\n    Alpine.navigate = (url) => {\n        let destination = createUrlObjectFromString(url)\n\n        let prevented = fireEventForOtherLibrariesToHookInto('alpine:navigate', {\n            url: destination, history: false, cached: false,\n         })\n\n        if (prevented) return\n\n        navigateTo(destination)\n    }\n\n    Alpine.navigate.disableProgressBar = () => {\n        showProgressBar = false\n    }\n\n    Alpine.addInitSelector(() => `[${Alpine.prefixed('navigate')}]`)\n\n    Alpine.directive('navigate', (el, { modifiers }) => {\n        let shouldPrefetchOnHover = modifiers.includes('hover')\n\n        shouldPrefetchOnHover && whenThisLinkIsHoveredFor(el, 60, () => {\n            let destination = extractDestinationFromLink(el)\n\n            if (! destination) return\n\n            prefetchHtml(destination, (html, finalDestination) => {\n                storeThePrefetchedHtmlForWhenALinkIsClicked(html, destination, finalDestination)\n            })\n        })\n\n        whenThisLinkIsPressed(el, (whenItIsReleased) => {\n            let destination = extractDestinationFromLink(el)\n\n            if (! destination) return\n\n            prefetchHtml(destination, (html, finalDestination) => {\n                storeThePrefetchedHtmlForWhenALinkIsClicked(html, destination, finalDestination)\n            })\n\n            whenItIsReleased(() => {\n                let prevented = fireEventForOtherLibrariesToHookInto('alpine:navigate', {\n                    url: destination, history: false, cached: false,\n                 })\n\n                if (prevented) return\n\n                navigateTo(destination);\n            })\n        })\n    })\n\n    function navigateTo(destination, shouldPushToHistoryState = true) {\n        showProgressBar && showAndStartProgressBar()\n\n        fetchHtmlOrUsePrefetchedHtml(destination, (html, finalDestination) => {\n            fireEventForOtherLibrariesToHookInto('alpine:navigating')\n\n            restoreScroll && storeScrollInformationInHtmlBeforeNavigatingAway()\n\n            showProgressBar && finishAndHideProgressBar()\n\n            cleanupAlpineElementsOnThePageThatArentInsideAPersistedElement()\n\n            updateCurrentPageHtmlInHistoryStateForLaterBackButtonClicks()\n\n            preventAlpineFromPickingUpDomChanges(Alpine, andAfterAllThis => {\n                enablePersist && storePersistantElementsForLater(persistedEl => {\n                    packUpPersistedTeleports(persistedEl)\n                    packUpPersistedPopovers(persistedEl)\n                })\n\n                if (shouldPushToHistoryState) {\n                    updateUrlAndStoreLatestHtmlForFutureBackButtons(html, finalDestination)\n                } else {\n                    replaceUrl(finalDestination, html)\n                }\n\n                swapCurrentPageWithNewHtml(html, (afterNewScriptsAreDoneLoading) => {\n                    removeAnyLeftOverStaleTeleportTargets(document.body)\n\n                    enablePersist && putPersistantElementsBack((persistedEl, newStub) => {\n                        unPackPersistedTeleports(persistedEl)\n                        unPackPersistedPopovers(persistedEl)\n                    })\n\n                    restoreScrollPositionOrScrollToTop()\n\n                    afterNewScriptsAreDoneLoading(() => {\n                        andAfterAllThis(() => {\n                            setTimeout(() => {\n                                autofocus && autofocusElementsWithTheAutofocusAttribute()\n                            })\n\n                            nowInitializeAlpineOnTheNewPage(Alpine)\n\n                            fireEventForOtherLibrariesToHookInto('alpine:navigated')\n                        })\n                    })\n                })\n            })\n        })\n    }\n\n    whenTheBackOrForwardButtonIsClicked(\n        (ifThePageBeingVisitedHasntBeenCached) => {\n            ifThePageBeingVisitedHasntBeenCached((url) => {\n                let destination = createUrlObjectFromString(url)\n\n                let prevented = fireEventForOtherLibrariesToHookInto('alpine:navigate', {\n                    url: destination, history: true, cached: false,\n                 })\n\n                if (prevented) return\n\n                let shouldPushToHistoryState = false\n\n                navigateTo(destination, shouldPushToHistoryState)\n            })\n        },\n        (html, url, currentPageUrl, currentPageKey) => {\n            let destination = createUrlObjectFromString(url)\n\n            let prevented = fireEventForOtherLibrariesToHookInto('alpine:navigate', {\n                url: destination, history: true, cached: true,\n            })\n\n            if (prevented) return\n\n            // @todo: see if there's a way to update the current HTML BEFORE\n            // the back button is hit, and not AFTER:\n            storeScrollInformationInHtmlBeforeNavigatingAway()\n\n            // This ensures the current HTML has the latest snapshot\n            fireEventForOtherLibrariesToHookInto('alpine:navigating')\n\n            // Only update the snapshot and not the history state as the history state\n            // has already changed to the new page due to the popstate event\n            updateCurrentPageHtmlInSnapshotCacheForLaterBackButtonClicks(currentPageUrl, currentPageKey)\n\n            preventAlpineFromPickingUpDomChanges(Alpine, andAfterAllThis => {\n                enablePersist && storePersistantElementsForLater(persistedEl => {\n                    packUpPersistedTeleports(persistedEl)\n                    packUpPersistedPopovers(persistedEl)\n                })\n\n                swapCurrentPageWithNewHtml(html, () => {\n                    removeAnyLeftOverStaleProgressBars()\n\n                    removeAnyLeftOverStaleTeleportTargets(document.body)\n\n                    enablePersist && putPersistantElementsBack((persistedEl, newStub) => {\n                        unPackPersistedTeleports(persistedEl)\n                        unPackPersistedPopovers(persistedEl)\n                    })\n\n                    restoreScrollPositionOrScrollToTop()\n\n                    andAfterAllThis(() => {\n                        autofocus && autofocusElementsWithTheAutofocusAttribute()\n\n                        nowInitializeAlpineOnTheNewPage(Alpine)\n\n                        fireEventForOtherLibrariesToHookInto('alpine:navigated')\n                    })\n                })\n            })\n        },\n    )\n\n    // Because DOMContentLoaded is fired on first load,\n    // we should fire alpine:navigated as a replacement as well...\n    setTimeout(() => {\n        fireEventForOtherLibrariesToHookInto('alpine:navigated')\n    })\n}\n\nfunction fetchHtmlOrUsePrefetchedHtml(fromDestination, callback) {\n    getPretchedHtmlOr(fromDestination, callback, () => {\n        fetchHtml(fromDestination, callback)\n    })\n}\n\nfunction preventAlpineFromPickingUpDomChanges(Alpine, callback) {\n    Alpine.stopObservingMutations()\n\n    callback((afterAllThis) => {\n        Alpine.startObservingMutations()\n\n        queueMicrotask(() => {\n            afterAllThis()\n        })\n    })\n}\n\nfunction fireEventForOtherLibrariesToHookInto(name, detail) {\n    let event = new CustomEvent(name, {\n        cancelable: true,\n        bubbles: true,\n        detail,\n    })\n\n    document.dispatchEvent(event)\n\n    return event.defaultPrevented\n}\n\nfunction nowInitializeAlpineOnTheNewPage(Alpine) {\n    Alpine.initTree(document.body, undefined, (el, skip) => {\n        if (el._x_wasPersisted) skip()\n    })\n}\n\nfunction autofocusElementsWithTheAutofocusAttribute() {\n    document.querySelector('[autofocus]') && document.querySelector('[autofocus]').focus()\n}\n\nfunction cleanupAlpineElementsOnThePageThatArentInsideAPersistedElement() {\n    // Create a new tree walker that skips persisted elements...\n    let walker = function (root, callback) {\n        Alpine.walk(root, (el, skip) => {\n            if (isPersistedElement(el)) skip()\n            if (isTeleportTarget(el)) skip()\n            else callback(el, skip)\n        })\n    }\n\n    // Set Alpine in motion to destroy itself on the page. If this proves\n    // to be a performance issue at some point (walking the DOM tree),\n    // we can be more surgical about cleaning up x-for/if instead...\n    Alpine.destroyTree(document.body, walker)\n}\n", "import { isObjecty } from \"@/utils\"\n\nexport default function history(Alpine) {\n    Alpine.magic('queryString', (el, { interceptor }) =>  {\n        let alias\n        let alwaysShow = false\n        let usePush = false\n\n        return interceptor((initialSeedValue, getter, setter, path, key) => {\n            let queryKey = alias || path\n\n            let { initial, replace, push, pop } = track(queryKey, initialSeedValue, alwaysShow)\n\n            setter(initial)\n\n            if (! usePush) {\n                Alpine.effect(() => replace(getter()))\n            } else {\n                Alpine.effect(() => push(getter()))\n\n                pop(async newValue => {\n                    setter(newValue)\n\n                    let tillTheEndOfTheMicrotaskQueue = () => Promise.resolve()\n\n                    await tillTheEndOfTheMicrotaskQueue() // ...so that we preserve the internal lock...\n                })\n            }\n\n            return initial\n        }, func => {\n            func.alwaysShow = () => { alwaysShow = true; return func }\n            func.usePush = () => { usePush = true; return func }\n            func.as = key => { alias = key; return func }\n        })\n    })\n\n    Alpine.history = { track }\n}\n\nexport function track(name, initialSeedValue, alwaysShow = false, except = null) {\n    let { has, get, set, remove } = queryStringUtils()\n\n    let url = new URL(window.location.href)\n    let isInitiallyPresentInUrl = has(url, name)\n    let initialValue = isInitiallyPresentInUrl ? get(url, name) : initialSeedValue\n    let initialValueMemo = JSON.stringify(initialValue)\n    let exceptValueMemo = [false, null, undefined].includes(except) ? initialSeedValue : JSON.stringify(except)\n\n    let hasReturnedToInitialValue = (newValue) => JSON.stringify(newValue) === initialValueMemo\n    let hasReturnedToExceptValue = (newValue) =>  JSON.stringify(newValue) === exceptValueMemo\n\n    if (alwaysShow) url = set(url, name, initialValue)\n\n    replace(url, name, { value: initialValue })\n\n    let lock = false\n\n    let update = (strategy, newValue) => {\n        if (lock) return\n\n        let url = new URL(window.location.href)\n\n        // This block of code is what needs to be changed for this failing test to pass:\n        if (! alwaysShow && ! isInitiallyPresentInUrl && hasReturnedToInitialValue(newValue)) {\n            url = remove(url, name)\n        // This is so that when deeply nested values are tracked, but their parent array/object\n        // is removed, we can handle it gracefully by removing the entry from the URL instead\n        // of letting it get set to `?someKey=undefined` which causes issues on refresh...\n        } else if (newValue === undefined) {\n            url = remove(url, name)\n        } else if (! alwaysShow && hasReturnedToExceptValue(newValue)) {\n            url = remove(url, name)\n        } else {\n            url = set(url, name, newValue)\n        }\n\n        // Right now, the above block, checks a few conditions and updates/removes an entry from the query string.\n        // The new strategy needs to be something like:\n        // - If \"alwaysShow\" is toggled on, then just \"set\" the whole thing with no deep diff\n        // - Otherwise, run a deep comparison callback (given the original value and new value).\n        //   - The callback recieves two params (leaf name and value)\n        //   - Check leaf name and value for existance in the original URL from page load. If it's there, just call \"set\"\n        //   - Check leaf name and value for equivelance to original name and value, if equal, call \"remove\", otherwise, \"set\"\n\n        // That code will look something like this:\n\n        // if (alwaysShow) {\n        //     set(url, name, newValue)\n        // } else {\n        //     deepCompare(name, newValue, originalValue, (leafName, leafValue) => {\n        //         // ....\n        //     })\n        // }\n\n        strategy(url, name, { value: newValue})\n    }\n\n    return {\n        initial: initialValue,\n\n        replace(newValue) { // Update via replaceState...\n            update(replace, newValue)\n        },\n\n        push(newValue) { // Update via pushState...\n            update(push, newValue)\n        },\n\n        pop(receiver) { // \"popstate\" handler...\n            let handler = (e) => {\n                if (! e.state || ! e.state.alpine) return\n\n                Object.entries(e.state.alpine).forEach(([iName, { value: newValue }]) => {\n                    if (iName !== name) return\n\n                    lock = true\n\n                    // Allow the \"receiver\" to be an async function in case a non-syncronous\n                    // operation (like an ajax) requests needs to happen while preserving\n                    // the \"locking\" mechanism (\"lock = true\" in this case)...\n                    let result = receiver(newValue)\n\n                    if (result instanceof Promise) {\n                        result.finally(() => lock = false)\n                    } else {\n                        lock = false\n                    }\n                })\n            }\n\n            window.addEventListener('popstate', handler)\n\n            return () => window.removeEventListener('popstate', handler)\n        }\n    }\n}\n\nfunction replace(url, key, object) {\n    let state = window.history.state || {}\n\n    if (! state.alpine) state.alpine = {}\n\n    state.alpine[key] = unwrap(object)\n\n    window.history.replaceState(state, '', url.toString())\n}\n\nfunction push(url, key, object) {\n    let state = window.history.state || {}\n\n    if (! state.alpine) state.alpine = {}\n\n    state = { alpine: {...state.alpine, ...{[key]: unwrap(object)}} }\n\n    window.history.pushState(state, '', url.toString())\n}\n\nfunction unwrap(object) {\n    if (object === undefined) return undefined\n\n    return JSON.parse(JSON.stringify(object))\n}\n\nfunction queryStringUtils() {\n    return {\n        has(url, key) {\n            let search = url.search\n\n            if (! search) return false\n\n            let data = fromQueryString(search, key)\n\n            return Object.keys(data).includes(key)\n        },\n        get(url, key) {\n            let search = url.search\n\n            if (! search) return false\n\n            let data = fromQueryString(search, key)\n\n            return data[key]\n        },\n        set(url, key, value) {\n            let data = fromQueryString(url.search, key)\n\n            data[key] = stripNulls(unwrap(value))\n\n            url.search = toQueryString(data)\n\n            return url\n        },\n        remove(url, key) {\n            let data = fromQueryString(url.search, key)\n\n            delete data[key]\n\n            url.search = toQueryString(data)\n\n            return url\n        },\n    }\n}\n\nfunction stripNulls(value) {\n    if (! isObjecty(value)) return value\n\n    for (let key in value) {\n        if (value[key] === null) delete value[key]\n        else value[key] = stripNulls(value[key])\n    }\n\n    return value\n}\n\n// This function converts JavaScript data to bracketed query string notation...\n// { items: [['foo']] } -> \"items[0][0]=foo\"\nfunction toQueryString(data) {\n    let isObjecty = (subject) => typeof subject === 'object' && subject !== null\n\n    let buildQueryStringEntries = (data, entries = {}, baseKey = '') => {\n        Object.entries(data).forEach(([iKey, iValue]) => {\n            let key = baseKey === '' ? iKey : `${baseKey}[${iKey}]`\n\n            if (iValue === null) {\n                entries[key] = '';\n            } else if (! isObjecty(iValue)) {\n                entries[key] = encodeURIComponent(iValue)\n                    .replaceAll('%20', '+') // Conform to RFC1738\n                    .replaceAll('%2C', ',')\n            } else {\n                entries = {...entries, ...buildQueryStringEntries(iValue, entries, key)}\n            }\n        })\n\n        return entries\n    }\n\n    let entries = buildQueryStringEntries(data)\n\n    return Object.entries(entries).map(([key, value]) => `${key}=${value}`).join('&')\n}\n\n// This function converts bracketed query string notation back to JS data...\n// \"items[0][0]=foo\" -> { items: [['foo']] }\nfunction fromQueryString(search, queryKey) {\n    search = search.replace('?', '')\n\n    if (search === '') return {}\n\n    let insertDotNotatedValueIntoData = (key, value, data) => {\n        let [first, second, ...rest] = key.split('.')\n\n        // We're at a leaf node, let's make the assigment...\n        if (! second) return data[key] = value\n\n        // This is where we fill in empty arrays/objects allong the way to the assigment...\n        if (data[first] === undefined) {\n            data[first] = isNaN(second) ? {} : []\n        }\n\n        // Keep deferring assignment until the full key is built up...\n        insertDotNotatedValueIntoData([second, ...rest].join('.'), value, data[first])\n    }\n\n    let entries = search.split('&').map(i => i.split('='))\n\n    // let data = {} creates a security (XSS) vulnerability here. We need to use\n    // Object.create(null) instead so that we have a \"pure\" object that doesnt\n    // inherit Object.prototype and expose the js internals to manipulation.\n    let data = Object.create(null)\n\n    entries.forEach(([key, value]) => {\n        // Query string params don't always have values... (`?foo=`)\n        if ( typeof value == 'undefined' ) return;\n\n        value = decodeURIComponent(value.replaceAll('+', '%20'))\n\n        let decodedKey = decodeURIComponent(key)\n\n        let shouldBeHandledAsArray = decodedKey.includes('[') && decodedKey.startsWith(queryKey)\n\n        if (!shouldBeHandledAsArray) {\n            data[key] = value\n        } else {\n            // Convert to dot notation because it's easier...\n            let dotNotatedKey = decodedKey.replaceAll('[', '.').replaceAll(']', '')\n\n            insertDotNotatedValueIntoData(dotNotatedKey, value, data)\n        }\n    })\n\n    return data\n}\n", "import { dispatchGlobal as dispatch, dispatchTo, on } from './events'\nimport { find, first, getByName, all } from './store'\nimport { start } from './lifecycle'\nimport { on as hook, trigger, triggerAsync } from './hooks'\nimport { directive } from './directives'\nimport Alpine from 'alpinejs'\n\nlet Livewire = {\n    directive,\n    dispatchTo,\n    start,\n    first,\n    find,\n    getByName,\n    all,\n    hook,\n    trigger,\n    triggerAsync,\n    dispatch,\n    on,\n    get navigate() {\n        return Alpine.navigate\n    }\n}\n\nlet warnAboutMultipleInstancesOf = entity => console.warn(`Detected multiple instances of ${entity} running`)\n\nif (window.Livewire) warnAboutMultipleInstancesOf('Livewire')\nif (window.Alpine) warnAboutMultipleInstancesOf('Alpine')\n\n// Register features...\nimport './features/index'\n\n// Register directives...\nimport './directives/index'\n\n// Make globals...\nwindow.Livewire = Livewire\nwindow.Alpine = Alpine\n\nif (window.livewireScriptConfig === undefined) {\n    window.Alpine.__fromLivewire = true\n\n    document.addEventListener('DOMContentLoaded', () => {\n        if (window.Alpine.__fromLivewire === undefined) {\n            // If this is undefined, we know that an outside Alpine bundle\n            // has been included on the page and will cause problems...\n            warnAboutMultipleInstancesOf('Alpine')\n        }\n\n        // Start Livewire...\n        Livewire.start()\n    })\n}\n\nexport { Livewire, Alpine }\n", "import { on as hook } from '@/hooks'\n\nhook('effect', ({ component, effects }) => {\n    registerListeners(component, effects.listeners || [])\n})\n\nfunction registerListeners(component, listeners) {\n    listeners.forEach(name => {\n        // Register a global listener...\n        let handler = (e) => {\n            if (e.__livewire) e.__livewire.receivedBy.push(component)\n\n            component.$wire.call('__dispatch', name, e.detail || {})\n        }\n\n        window.addEventListener(name, handler)\n\n        component.addCleanup(() => window.removeEventListener(name, handler))\n\n        // Register a listener for when \"to\" or \"self\"\n        component.el.addEventListener(name, (e) => {\n            // We don't care about non-Livewire dispatches...\n            if (! e.__livewire) return\n\n            // We don't care about Livewire bubbling dispatches (only \"to\" and \"self\")...\n            if (e.bubbles) return\n\n            if (e.__livewire) e.__livewire.receivedBy.push(component.id)\n\n            component.$wire.call('__dispatch', name, e.detail || {})\n        })\n    })\n}\n\n\n", "import { on } from '@/hooks'\nimport Alpine from 'alpinejs'\n\nlet executedScripts = new WeakMap\n\nlet executedAssets = new Set\n\non('payload.intercept', async ({ assets }) => {\n    if(! assets) return\n\n    for (let [key, asset] of Object.entries(assets)) {\n        await onlyIfAssetsHaventBeenLoadedAlreadyOnThisPage(key, async () => {\n            await addAssetsToHeadTagOfPage(asset)\n        })\n    }\n})\n\n// Assets that were injected into the HTML need to be registered so that\n// they aren't loaded again...\non('component.init', ({ component }) => {\n    let assets = component.snapshot.memo.assets\n\n    if (assets) {\n        assets.forEach((key) => {\n            if (executedAssets.has(key)) return\n            executedAssets.add(key)\n        })\n    }\n})\n\non('effect', ({ component, effects }) => {\n    let scripts = effects.scripts\n\n    if (scripts) {\n        Object.entries(scripts).forEach(([key, content]) => {\n            onlyIfScriptHasntBeenRunAlreadyForThisComponent(component, key, () => {\n                let scriptContent = extractScriptTagContent(content)\n\n                Alpine.dontAutoEvaluateFunctions(() => {\n                    Alpine.evaluate(component.el, scriptContent, { '$wire': component.$wire })\n                })\n            })\n        })\n    }\n})\n\nfunction onlyIfScriptHasntBeenRunAlreadyForThisComponent(component, key, callback) {\n    if (executedScripts.has(component)) {\n        let alreadyRunKeys = executedScripts.get(component)\n\n        if (alreadyRunKeys.includes(key)) return\n    }\n\n    callback()\n\n    if (! executedScripts.has(component)) executedScripts.set(component, [])\n\n    let alreadyRunKeys = executedScripts.get(component)\n\n    alreadyRunKeys.push(key)\n\n    executedScripts.set(component, alreadyRunKeys)\n}\n\nfunction extractScriptTagContent(rawHtml) {\n    let scriptRegex = /<script\\b[^>]*>([\\s\\S]*?)<\\/script>/gm\n    let matches = scriptRegex.exec(rawHtml)\n    let innards =  matches && matches[1] ? matches[1].trim() : ''\n\n    return innards\n}\n\nasync function onlyIfAssetsHaventBeenLoadedAlreadyOnThisPage(key, callback) {\n    if (executedAssets.has(key)) return\n\n    await callback()\n\n    executedAssets.add(key)\n}\n\nasync function addAssetsToHeadTagOfPage(rawHtml) {\n    let newDocument = (new DOMParser()).parseFromString(rawHtml, \"text/html\")\n    let newHead = document.adoptNode(newDocument.head)\n\n    for (let child of newHead.children) {\n        try {\n            await runAssetSynchronously(child)\n        } catch (error) {\n            // Let's eat any promise rejects so that we don't\n            // break the rest of Livewire's handling of the response...\n            // Any errors triggered by adding the script tag to the page\n            // will still be thrown...\n        }\n    }\n}\n\nasync function runAssetSynchronously(child) {\n    return new Promise((resolve, reject) => {\n        if (isScript(child)) {\n            let script = cloneScriptTag(child)\n\n            // Script assets need to be loaded synchronously so that scripts have\n            // their global variables available...\n            if (script.src) {\n                script.onload = () => resolve()\n                script.onerror = () => reject()\n            } else {\n                resolve()\n            }\n\n            document.head.appendChild(script)\n        } else {\n            document.head.appendChild(child)\n\n            resolve()\n        }\n    })\n}\n\nfunction isScript(el)   {\n    return el.tagName.toLowerCase() === 'script'\n}\n\nfunction cloneScriptTag(el) {\n    let script = document.createElement('script')\n\n    script.textContent = el.textContent\n    script.async = el.async\n\n    for (let attr of el.attributes) {\n        script.setAttribute(attr.name, attr.value)\n    }\n\n    return script\n}\n", "import { overrideMethod } from '@/$wire'\nimport { on } from '@/hooks'\nimport Alpine from 'alpinejs'\n\non('effect', ({ component, effects }) => {\n    let js = effects.js\n    let xjs = effects.xjs\n\n    if (js) {\n        Object.entries(js).forEach(([method, body]) => {\n            overrideMethod(component, method, () => {\n                Alpine.evaluate(component.el, body)\n            })\n        })\n    }\n\n    if (xjs) {\n        xjs.forEach(expression => {\n            Alpine.evaluate(component.el, expression)\n        })\n    }\n})\n\n", "import { trigger } from \"@/hooks\"\nimport { closestComponent } from \"@/store\"\nimport Alpine from 'alpinejs'\n\nexport function morph(component, el, html) {\n    let wrapperTag = el.parentElement\n        // If the root element is a \"tr\", we need the wrapper to be a \"table\"...\n        ? el.parentElement.tagName.toLowerCase()\n        : 'div'\n\n    let wrapper = document.createElement(wrapperTag)\n\n    wrapper.innerHTML = html\n    let parentComponent\n\n    try {\n        parentComponent = closestComponent(el.parentElement)\n    } catch (e) {}\n\n    parentComponent && (wrapper.__livewire = parentComponent)\n\n    let to = wrapper.firstElementChild\n\n    to.__livewire = component\n\n    trigger('morph', { el, toEl: to, component })\n\n    Alpine.morph(el, to, {\n        updating: (el, toEl, childrenOnly, skip) => {\n            if (isntElement(el)) return\n\n            trigger('morph.updating', { el, toEl, component, skip, childrenOnly })\n\n            // bypass DOM diffing for children by overwriting the content\n            if (el.__livewire_replace === true) el.innerHTML = toEl.innerHTML;\n            // completely bypass DOM diffing for this element and all children\n            if (el.__livewire_replace_self === true) { el.outerHTML = toEl.outerHTML; return skip(); }\n\n            if (el.__livewire_ignore === true) return skip()\n            if (el.__livewire_ignore_self === true) childrenOnly()\n\n            // Children will update themselves.\n            if (isComponentRootEl(el) && el.getAttribute('wire:id') !== component.id) return skip()\n\n            // Give the root Livewire \"to\" element, the same object reference as the \"from\"\n            // element. This ensures new Alpine magics like $wire and @entangle can\n            // initialize in the context of a real Livewire component object.\n            if (isComponentRootEl(el)) toEl.__livewire = component\n        },\n\n        updated: (el) => {\n            if (isntElement(el)) return\n\n            trigger('morph.updated', { el, component })\n        },\n\n        removing: (el, skip) => {\n            if (isntElement(el)) return\n\n            trigger('morph.removing', { el, component, skip })\n        },\n\n        removed: (el) => {\n            if (isntElement(el)) return\n\n            trigger('morph.removed', { el, component })\n        },\n\n        adding: (el) => {\n            trigger('morph.adding', { el, component })\n        },\n\n        added: (el) => {\n            if (isntElement(el)) return\n\n            const closestComponentId = closestComponent(el).id\n\n            trigger('morph.added', { el })\n        },\n\n        key: (el) => {\n            if (isntElement(el)) return\n\n            return el.hasAttribute(`wire:key`)\n                ? el.getAttribute(`wire:key`)\n                : // If no \"key\", then first check for \"wire:id\", then \"id\"\n                el.hasAttribute(`wire:id`)\n                    ? el.getAttribute(`wire:id`)\n                    : el.id\n        },\n\n        lookahead: false,\n    })\n\n    trigger('morphed', { el, component })\n}\n\nfunction isntElement(el) {\n    return typeof el.hasAttribute !== 'function'\n}\n\nfunction isComponentRootEl(el) {\n    return el.hasAttribute('wire:id')\n}\n", "import { morph } from '@/morph'\nimport { on } from '@/hooks'\n\non('effect', ({ component, effects }) => {\n    let html = effects.html\n    if (! html) return\n\n    // Wrapping this in a double queueMicrotask. The first one puts it after all\n    // other \"effect\" hooks, and the second one puts it after all reactive\n    // Alpine effects (that are processed via flushJobs in scheduler).\n    queueMicrotask(() => {\n        queueMicrotask(() => {\n            morph(component, component.el, html)\n        })\n    })\n})\n", "import { dispatch, dispatchSelf, dispatchTo } from '@/events'\nimport { on } from '@/hooks'\n\non('effect', ({ component, effects }) => {\n    dispatchEvents(component, effects.dispatches || [])\n})\n\nfunction dispatchEvents(component, dispatches) {\n    dispatches.forEach(({ name, params = {}, self = false, to }) => {\n        if (self) dispatchSelf(component, name, params)\n        else if (to) dispatchTo(to, name, params)\n        else dispatch(component, name, params)\n    })\n}\n\n\n", "import { getDirectives } from '@/directives'\nimport { on } from '@/hooks'\nimport { Bag } from '@/utils'\nimport Alpine from 'alpinejs'\n\nlet cleanups = new Bag\n\n// Adding a setTimeout here so that these event listeners are\n// registered AFTER most other event listenrs, this way, we\n// can call \"stopPropagation\" for things like wire:confirm\non('directive.init', ({ el, directive, cleanup, component }) => setTimeout(() => {\n    if (directive.value !== 'submit') return\n\n    // Livewire will clean it all up automatically when the form\n    // submission returns and the new DOM lacks these additions...\n    el.addEventListener('submit', () => {\n        // If using wire:submit=\"$parent...\", we will need to use\n        // the parent ID as a reference for undoing because it's\n        // the ID that will come back from the network request.\n        let componentId = directive.expression.startsWith('$parent')\n            ? component.parent.id\n            : component.id\n\n        let cleanup = disableForm(el)\n\n        cleanups.add(componentId, cleanup)\n    })\n}))\n\non('commit', ({ component, respond }) => {\n    respond(() => {\n        cleanups.each(component.id, i => i())\n        cleanups.remove(component.id)\n    })\n})\n\nfunction disableForm(formEl) {\n    let undos = []\n\n    Alpine.walk(formEl, (el, skip) => {\n        if (! formEl.contains(el)) return\n\n        if (el.hasAttribute('wire:ignore')) return skip()\n\n        if (shouldMarkDisabled(el)) {\n            undos.push(markDisabled(el))\n        } else if (shouldMarkReadOnly(el)) {\n            undos.push(markReadOnly(el))\n        }\n    })\n\n    return () => {\n        while (undos.length > 0) undos.shift()()\n    }\n}\n\nfunction shouldMarkDisabled(el) {\n    let tag = el.tagName.toLowerCase()\n\n    if (tag === 'select') return true\n    if (tag === 'button' && el.type === 'submit') return true\n    if (tag === 'input' && (el.type === 'checkbox' || el.type === 'radio')) return true\n\n    return false\n}\n\nfunction shouldMarkReadOnly(el) {\n    return ['input', 'textarea'].includes(el.tagName.toLowerCase())\n}\n\nfunction markDisabled(el) {\n    let undo = el.disabled\n        ? () => {}\n        : () => el.disabled = false\n\n    el.disabled = true\n\n    return undo\n}\n\nfunction markReadOnly(el) {\n    let undo = el.readOnly\n        ? () => {}\n        : () => el.readOnly = false\n\n    el.readOnly = true\n\n    return undo\n}\n", "import { on } from '@/hooks'\n\n// Ensure that all child components with reactive props (even deeply nested)\n// are included in the network request...\non('commit.pooling', ({ commits }) => {\n    commits.forEach(commit => {\n        let component = commit.component\n\n        getDeepChildrenWithBindings(component, child => {\n            child.$wire.$commit()\n        })\n    })\n})\n\n// Ensure that related components are pooled together, even if they chose\n// to be isolated normally...\non('commit.pooled', ({ pools }) => {\n    let commits = getPooledCommits(pools)\n\n    commits.forEach(commit => {\n        let component = commit.component\n\n        getDeepChildrenWithBindings(component, child => {\n            colocateCommitsByComponent(pools, component, child)\n        })\n    })\n})\n\nfunction getPooledCommits(pools) {\n    let commits = []\n\n    pools.forEach(pool => {\n        pool.commits.forEach(commit => {\n            commits.push(commit)\n        })\n    })\n\n    return commits\n}\n\nfunction colocateCommitsByComponent(pools, component, foreignComponent) {\n    let pool = findPoolWithComponent(pools, component)\n\n    let foreignPool = findPoolWithComponent(pools, foreignComponent)\n\n    let foreignCommit = foreignPool.findCommitByComponent(foreignComponent)\n\n    // Delete needs to come before add in case there are the same pool...\n    foreignPool.delete(foreignCommit)\n\n    pool.add(foreignCommit)\n\n    // Cleanup empty pools...\n    pools.forEach(pool => {\n        if (pool.empty()) pools.delete(pool)\n    })\n}\n\nfunction findPoolWithComponent(pools, component) {\n    for (let [idx, pool] of pools.entries()) {\n        if (pool.hasCommitFor(component)) return pool\n    }\n}\n\nfunction getDeepChildrenWithBindings(component, callback) {\n    getDeepChildren(component, child => {\n        if (hasReactiveProps(child) || hasWireModelableBindings(child)) {\n            callback(child)\n        }\n    })\n}\n\nfunction hasReactiveProps(component) {\n    let meta = component.snapshot.memo\n    let props = meta.props\n\n    return !! props\n}\n\nfunction hasWireModelableBindings(component) {\n    let meta = component.snapshot.memo\n    let bindings = meta.bindings\n\n    return !! bindings\n}\n\nfunction getDeepChildren(component, callback) {\n    component.children.forEach(child => {\n        callback(child)\n\n        getDeepChildren(child, callback)\n    })\n}\n", "import { on } from '@/hooks'\n\non('commit', ({ succeed }) => {\n    succeed(({ effects }) => {\n        let download = effects.download\n\n        if (! download) return\n\n        // We need to use window.webkitURL so downloads work on iOS Safari.\n        let urlObject = window.webkitURL || window.URL\n\n        let url = urlObject.createObjectURL(\n            base64toBlob(download.content, download.contentType)\n        )\n\n        let invisibleLink = document.createElement('a')\n\n        invisibleLink.style.display = 'none'\n        invisibleLink.href = url\n        invisibleLink.download = download.name\n\n        document.body.appendChild(invisibleLink)\n\n        invisibleLink.click()\n\n        setTimeout(function() {\n            urlObject.revokeObjectURL(url)\n        }, 0);\n    })\n})\n\nfunction base64toBlob(b64Data, contentType = '', sliceSize = 512) {\n    const byteCharacters = atob(b64Data)\n    const byteArrays = []\n\n    if (contentType === null) contentType = ''\n\n    for (let offset = 0; offset < byteCharacters.length; offset += sliceSize) {\n        let slice = byteCharacters.slice(offset, offset + sliceSize)\n\n        let byteNumbers = new Array(slice.length)\n\n        for (let i = 0; i < slice.length; i++) {\n            byteNumbers[i] = slice.charCodeAt(i)\n        }\n\n        let byteArray = new Uint8Array(byteNumbers)\n\n        byteArrays.push(byteArray)\n    }\n\n    return new Blob(byteArrays, { type: contentType });\n}\n", "import { on } from '@/hooks'\n\nlet componentsThatWantToBeBundled = new WeakSet\n\nlet componentsThatAreLazy = new WeakSet\n\non('component.init', ({ component }) => {\n    let memo = component.snapshot.memo\n\n    // We only care about lazy components...\n    if (memo.lazyLoaded === undefined) return\n\n    componentsThatAreLazy.add(component)\n\n    // The component doesn't want its lazy load to be an isolated request\n    // then we'll mark it to detect at \"pool\" time to make sure it gets bundled...\n    if (memo.lazyIsolated !== undefined && memo.lazyIsolated === false) {\n        componentsThatWantToBeBundled.add(component)\n    }\n})\n\non('commit.pooling', ({ commits }) => {\n    commits.forEach(commit => {\n        // We only care about lazy components...\n        if (! componentsThatAreLazy.has(commit.component)) return\n\n        if (componentsThatWantToBeBundled.has(commit.component)) {\n            commit.isolate = false\n\n            componentsThatWantToBeBundled.delete(commit.component)\n        } else {\n            commit.isolate = true\n        }\n\n        // Component is no longer lazy after the first full request, so remove it...\n        componentsThatAreLazy.delete(commit.component)\n    })\n})\n", "import { on } from '@/hooks'\nimport { dataGet } from '@/utils'\nimport Alpine from 'alpinejs'\nimport { track } from '@/plugins/history'\n\non('effect', ({ component, effects, cleanup }) => {\n    let queryString = effects['url']\n\n    if (! queryString) return\n\n    Object.entries(queryString).forEach(([key, value]) => {\n        let { name, as, use, alwaysShow, except } = normalizeQueryStringEntry(key, value)\n\n        if (! as) as = name\n\n        let initialValue = [false, null, undefined].includes(except) ? dataGet(component.ephemeral, name) : except\n\n        let { replace, push, pop } = track(as, initialValue, alwaysShow, except)\n\n        if (use === 'replace') {\n            let effectReference = Alpine.effect(() => {\n                replace(dataGet(component.reactive, name))\n            })\n\n            cleanup(() => Alpine.release(effectReference))\n        } else if (use === 'push') {\n            let forgetCommitHandler = on('commit', ({ component: commitComponent, succeed }) => {\n                if (component !== commitComponent) return\n\n                let beforeValue = dataGet(component.canonical, name)\n\n                succeed(() => {\n                    let afterValue = dataGet(component.canonical, name)\n\n                    if (JSON.stringify(beforeValue) === JSON.stringify(afterValue)) return\n\n                    push(afterValue)\n                })\n            })\n\n            let forgetPopHandler = pop(async newValue => {\n                await component.$wire.set(name, newValue)\n\n                // @todo: this is the absolute worst thing ever I'm so sorry this needs to be refactored stat:\n                document.querySelectorAll('input').forEach(el => {\n                    el._x_forceModelUpdate && el._x_forceModelUpdate(el._x_model.get())\n                })\n            })\n\n            cleanup(() => {\n                forgetCommitHandler()\n                forgetPopHandler()\n            })\n        }\n    })\n})\n\nfunction normalizeQueryStringEntry(key, value) {\n    let defaults = { use: 'replace', alwaysShow: false }\n\n    if (typeof value === 'string') {\n        return {...defaults, name: value, as: value }\n    } else {\n        let fullerDefaults = {...defaults, name: key, as: key }\n\n        return {...fullerDefaults, ...value }\n    }\n}\n", "import { on } from '@/hooks'\nimport { dispatchSelf } from '@/events'\n\non('request', ({ options }) => {\n    if (window.Echo) {\n        options.headers['X-Socket-ID'] = window.Echo.socketId()\n    }\n})\n\non('effect', ({ component, effects }) => {\n    let listeners = effects.listeners || []\n\n    listeners.forEach(event => {\n        if (event.startsWith('echo')) {\n            if (typeof window.Echo === 'undefined') {\n                console.warn('Laravel Echo cannot be found')\n\n                return\n            }\n\n            let event_parts = event.split(/(echo:|echo-)|:|,/)\n\n            if (event_parts[1] == 'echo:') {\n                event_parts.splice(2, 0, 'channel', undefined)\n            }\n\n            if (event_parts[2] == 'notification') {\n                event_parts.push(undefined, undefined)\n            }\n\n            let [\n                s1,\n                signature,\n                channel_type,\n                s2,\n                channel,\n                s3,\n                event_name,\n            ] = event_parts\n\n            if (['channel', 'private', 'encryptedPrivate'].includes(channel_type)) {\n                let handler = e => dispatchSelf(component, event, [e])\n\n                window.Echo[channel_type](channel).listen(event_name, handler)\n\n                component.addCleanup(() => {\n                    window.Echo[channel_type](channel).stopListening(event_name, handler)\n                })\n            } else if (channel_type == 'presence') {\n                if (['here', 'joining', 'leaving'].includes(event_name)) {\n                    window.Echo.join(channel)[event_name](e => {\n                        dispatchSelf(component, event, [e])\n                    })\n\n                    // @todo: add listener cleanup...\n                } else{\n                    let handler = e => dispatchSelf(component, event, [e])\n\n                    window.Echo.join(channel).listen(event_name, handler)\n\n                    component.addCleanup(() => {\n                        window.Echo.leaveChannel(channel)\n                    })\n                }\n            } else if (channel_type == 'notification') {\n                window.Echo.private(channel).notification(notification => {\n                    dispatchSelf(component, event, [notification])\n                })\n\n                // @todo: add listener cleanup...\n            } else {\n                console.warn('Echo channel type not yet supported')\n            }\n        }\n    })\n})\n", "import { on } from '@/hooks'\n\nlet componentsThatAreIsolated = new WeakSet\n\non('component.init', ({ component }) => {\n    let memo = component.snapshot.memo\n\n    // We only care about isolated components...\n    if (memo.isolate !== true) return\n\n    componentsThatAreIsolated.add(component)\n})\n\non('commit.pooling', ({ commits }) => {\n    commits.forEach(commit => {\n        // We only care about isolated components...\n        if (! componentsThatAreIsolated.has(commit.component)) return\n\n        commit.isolate = true\n    })\n})\n", "\nshouldHideProgressBar() && Alpine.navigate.disableProgressBar()\n\ndocument.addEventListener('alpine:navigate', e => forwardEvent('livewire:navigate', e))\ndocument.addEventListener('alpine:navigating', e => forwardEvent('livewire:navigating', e))\ndocument.addEventListener('alpine:navigated', e => forwardEvent('livewire:navigated', e))\n\nfunction forwardEvent(name, original) {\n    let event = new CustomEvent(name, { cancelable: true, bubbles: true, detail: original.detail })\n\n    document.dispatchEvent(event)\n\n    if (event.defaultPrevented) {\n        original.preventDefault()\n    }\n}\n\nexport function shouldRedirectUsingNavigateOr(effects, url, or) {\n    let forceNavigate = effects.redirectUsingNavigate\n\n    if (forceNavigate) {\n        Alpine.navigate(url)\n    } else {\n        or()\n    }\n}\n\nfunction shouldHideProgressBar() {\n    if (!! document.querySelector('[data-no-progress-bar]')) return true\n\n    if (window.livewireScriptConfig && window.livewireScriptConfig.progressBar === false) return true\n\n    return false\n}\n", "import { on } from \"@/hooks\"\nimport { shouldRedirectUsingNavigateOr } from \"./supportNavigate\"\n\non('effect', ({ effects }) => {\n    if (! effects['redirect']) return\n\n    let url = effects['redirect']\n\n    shouldRedirectUsingNavigateOr(effects, url, () => {\n        window.location.href = url\n    })\n})\n", "import { directive } from \"@/directives\"\nimport { on } from '@/hooks'\nimport Alpine from 'alpinejs'\n\non('morph.added', ({ el }) => {\n    el.__addedByMorph = true\n})\n\ndirective('transition', ({ el, directive, component, cleanup }) => {\n    let visibility = Alpine.reactive({ state: el.__addedByMorph ? false : true })\n\n    // We're going to control the element's transition with Alpine transitions...\n    Alpine.bind(el, {\n        [directive.rawName.replace('wire:', 'x-')]: '',\n        'x-show'() { return visibility.state },\n    })\n\n    // If it's not the initial page load, transition the element in...\n    el.__addedByMorph && setTimeout(() => visibility.state = true)\n\n    let cleanups = []\n\n    cleanups.push(on('morph.removing', ({ el, skip }) => {\n        // Here we interupt morphdom from removing an element...\n        skip()\n\n        // When the transition ends...\n        el.addEventListener('transitionend', () => {\n            // We can actually remove the element and all the listeners along with it...\n            el.remove()\n        })\n\n        // Now we can trigger a transition:\n        visibility.state = false\n\n        cleanups.push(on('morph', ({ component: morphComponent }) => {\n            if (morphComponent !== component) return\n\n            // While this element is transitioning out, a new morph is about to occur.\n            // Let's expidite this one and clean it up so it doesn't interfere...\n            el.remove()\n\n            cleanups.forEach(i => i())\n        }))\n    }))\n\n    cleanup(() => cleanups.forEach(i => i()))\n})\n\n\n\n", "import { WeakBag } from './utils'\n\nlet callbacksByComponent = new WeakBag\n\nexport function debounceByComponent(component, callback, time) {\n    // Prepare yourself for what's happening here.\n    // Any text input with wire:model on it should be \"debounced\" by ~150ms by default.\n    // We can't use a simple debounce function because we need a way to clear all the pending\n    // debounces if a user submits a form or performs some other action.\n    // This is a modified debounce function that acts just like a debounce, except it stores\n    // the pending callbacks in a global property so we can \"clear them\" on command instead\n    // of waiting for their setTimeouts to expire. I know.\n\n    // This is a \"null\" callback. Each wire:model will resister one of these upon initialization.\n    let callbackRegister = { callback: () => { } }\n    callbacksByComponent.add(component, callbackRegister)\n\n    // This is a normal \"timeout\" for a debounce function.\n    var timeout\n\n    return e => {\n        clearTimeout(timeout)\n\n        timeout = setTimeout(() => {\n            callback(e)\n            timeout = undefined\n\n            // Because we just called the callback, let's return the\n            // callback register to it's normal \"null\" state.\n            callbackRegister.callback = () => { }\n        }, time)\n\n        // Register the current callback in the register as a kind-of \"escape-hatch\".\n        callbackRegister.callback = () => {\n            clearTimeout(timeout)\n            callback(e)\n        }\n    }\n}\n\nexport function callAndClearComponentDebounces(component, callback) {\n    // This is to protect against the following scenario:\n    // A user is typing into a debounced input, and hits the enter key.\n    // If the enter key submits a form or something, the submission\n    // will happen BEFORE the model input finishes syncing because\n    // of the debounce. This makes sure to clear anything in the debounce queue.\n\n    callbacksByComponent.each(component, callbackRegister => {\n        callbackRegister.callback()\n        callbackRegister.callback = () => { }\n    })\n\n    callback()\n}\n", "import { callAndClearComponentDebounces } from '@/debounce'\nimport { customDirectiveHasBeenRegistered } from '@/directives'\nimport { on } from '@/hooks'\nimport Alpine from 'alpinejs'\n\non('directive.init', ({ el, directive, cleanup, component }) => {\n    if (['snapshot', 'effects', 'model', 'init', 'loading', 'poll', 'ignore', 'id', 'data', 'key', 'target', 'dirty'].includes(directive.value)) return\n    if (customDirectiveHasBeenRegistered(directive.value)) return\n\n    let attribute = directive.rawName.replace('wire:', 'x-on:')\n\n    // Automatically add .prevent to wire:submit, if they didn't add it themselves...\n    if (directive.value === 'submit' && ! directive.modifiers.includes('prevent')) {\n        attribute = attribute + '.prevent'\n    }\n\n    let cleanupBinding = Alpine.bind(el, {\n        [attribute](e) {\n            let execute = () => {\n                callAndClearComponentDebounces(component, () => {\n                    // Forward these calls directly to $wire. Let them handle firing the request.\n                    Alpine.evaluate(el, '$wire.'+directive.expression, { scope: { $event: e }})\n                })\n            }\n\n            // Account for the existance of wire:confirm=\"...\" on the action...\n            if (el.__livewire_confirm) {\n                el.__livewire_confirm(() => {\n                    execute()\n                }, () => {\n                    e.stopImmediatePropagation()\n                })\n            } else {\n                execute()\n            }\n        }\n    })\n\n    cleanup(cleanupBinding)\n})\n", "import Alpine from 'alpinejs'\n\nAlpine.addInitSelector(() => `[wire\\\\:navigate]`)\nAlpine.addInitSelector(() => `[wire\\\\:navigate\\\\.hover]`)\n\nAlpine.interceptInit(\n    Alpine.skipDuringClone(el => {\n        if (el.hasAttribute('wire:navigate')) {\n            Alpine.bind(el, { ['x-navigate']: true })\n        } else if (el.hasAttribute('wire:navigate.hover')) {\n            Alpine.bind(el, { ['x-navigate.hover']: true })\n        }\n    })\n)\n\ndocument.addEventListener('alpine:navigating', () => {\n    // Before navigating away, we'll inscribe the latest state of each component\n    // in their HTML so that upon return, they will have the latest state...\n    Livewire.all().forEach(component => {\n        component.inscribeSnapshotAndEffectsOnElement()\n    })\n})\n", "import { directive } from \"@/directives\"\n\ndirective('confirm', ({ el, directive }) => {\n    let message = directive.expression\n    let shouldPrompt = directive.modifiers.includes('prompt')\n\n    // Convert sanitized linebreaks (\"\\n\") to real line breaks...\n    message = message.replaceAll('\\\\n', '\\n')\n\n    if (message === '') message = 'Are you sure?'\n\n    el.__livewire_confirm = (action, instead) => {\n        if (shouldPrompt) {\n            let [question, expected] = message.split('|')\n\n            if (! expected) {\n                console.warn('Livewire: Must provide expectation with wire:confirm.prompt')\n            } else {\n                let input = prompt(question)\n\n                if (input === expected) {\n                    action()\n                } else {\n                    instead()\n                }\n            }\n        } else {\n            if (confirm(message)) action()\n            else instead()\n        }\n    }\n})\n", "import { globalDirective } from \"@/directives\"\nimport Alpine from 'alpinejs'\n\nAlpine.addInitSelector(() => `[wire\\\\:current]`)\n\nlet onPageChanges = new Map\n\ndocument.addEventListener('livewire:navigated', () => {\n    onPageChanges.forEach(i => i(new URL(window.location.href)))\n})\n\nglobalDirective('current', ({ el, directive, cleanup }) => {\n    let expression = directive.expression\n\n    let options = {\n        exact: directive.modifiers.includes('exact'),\n        strict: directive.modifiers.includes('strict'),\n    }\n\n    // Fragment hrefs aren't supported as of yet...\n    if (expression.startsWith('#')) return\n\n    // If there is no href, let's not do anything...\n    if (! el.hasAttribute('href')) return\n\n    let href = el.getAttribute('href')\n\n    let hrefUrl = new URL(href, window.location.href)\n\n    let classes = expression.split(' ').filter(String)\n\n    let refreshCurrent = url => {\n        if (pathMatches(hrefUrl, url, options)) {\n            el.classList.add(...classes)\n        } else {\n            el.classList.remove(...classes)\n        }\n    }\n\n    refreshCurrent(new URL(window.location.href))\n\n    onPageChanges.set(el, refreshCurrent)\n\n    cleanup(() => onPageChanges.delete(el))\n})\n\nfunction pathMatches(hrefUrl, actualUrl, options) {\n    // If the domains/hostnames don't match, we are not going to match...\n    if (hrefUrl.hostname !== actualUrl.hostname) return false\n\n    // Remove trailing slashes for consistency (if not .strict)...\n    let hrefPath = options.strict ? hrefUrl.pathname : hrefUrl.pathname.replace(/\\/+$/, '')\n    let actualPath = options.strict ? actualUrl.pathname : actualUrl.pathname.replace(/\\/+$/, '')\n\n    if (options.exact) {\n        return hrefPath === actualPath\n    }\n\n    let hrefPathSegments = hrefPath.split('/')\n    let actualPathSegments = actualPath.split('/')\n\n\n    for (let i = 0; i < hrefPathSegments.length; i++) {\n        if (hrefPathSegments[i] !== actualPathSegments[i]) return false\n    }\n\n    return true\n}\n", "\nexport function toggleBooleanStateDirective(el, directive, isTruthy, cachedDisplay = null) {\n    isTruthy = directive.modifiers.includes('remove') ? ! isTruthy : isTruthy\n\n    if (directive.modifiers.includes('class')) {\n        let classes = directive.expression.split(' ').filter(String)\n\n        if (isTruthy) {\n            el.classList.add(...classes)\n        } else {\n            el.classList.remove(...classes)\n        }\n    } else if (directive.modifiers.includes('attr')) {\n        if (isTruthy) {\n            el.setAttribute(directive.expression, true)\n        } else {\n            el.removeAttribute(directive.expression)\n        }\n    } else {\n        let cache = cachedDisplay ?? window\n            .getComputedStyle(el, null)\n            .getPropertyValue('display')\n\n        let display = (['inline', 'block', 'table', 'flex', 'grid', 'inline-flex']\n            .filter(i => directive.modifiers.includes(i))[0] || 'inline-block')\n\n        // If element is to be removed, set display to its current value...\n        // display = (directive.modifiers.includes('remove') && ! isTruthy)\n        display = (directive.modifiers.includes('remove') && ! isTruthy)\n            ? cache : display\n\n        el.style.display = isTruthy ? display : 'none'\n    }\n}\n", "import { toggleBooleanStateDirective } from './shared'\nimport { directive } from '@/directives'\n\nlet offlineHandlers = new Set\nlet onlineHandlers = new Set\n\nwindow.addEventListener('offline', () => offlineHandlers.forEach(i => i()))\nwindow.addEventListener('online', () => onlineHandlers.forEach(i => i()))\n\ndirective('offline', ({ el, directive, cleanup }) => {\n    let setOffline = () => toggleBooleanStateDirective(el, directive, true)\n    let setOnline = () => toggleBooleanStateDirective(el, directive, false)\n\n    offlineHandlers.add(setOffline)\n    onlineHandlers.add(setOnline)\n\n    cleanup(() => {\n        offlineHandlers.delete(setOffline)\n        onlineHandlers.delete(setOnline)\n    })\n})\n", "import { toggleBooleanStateDirective } from './shared'\nimport { directive, getDirectives } from \"@/directives\"\nimport { on } from '@/hooks'\nimport { listen } from '@/utils'\n\ndirective('loading', ({ el, directive, component, cleanup }) => {\n    let { targets, inverted } = getTargets(el)\n\n    let [delay, abortDelay] = applyDelay(directive)\n\n    let cleanupA = whenTargetsArePartOfRequest(component, targets, inverted, [\n        () => delay(() => toggleBooleanStateDirective(el, directive, true)),\n        () => abortDelay(() => toggleBooleanStateDirective(el, directive, false)),\n    ])\n\n    let cleanupB = whenTargetsArePartOfFileUpload(component, targets, [\n        () => delay(() => toggleBooleanStateDirective(el, directive, true)),\n        () => abortDelay(() => toggleBooleanStateDirective(el, directive, false)),\n    ])\n\n    cleanup(() => {\n        cleanupA()\n        cleanupB()\n    })\n})\n\nfunction applyDelay(directive) {\n    if (! directive.modifiers.includes('delay') || directive.modifiers.includes('none')) return [i => i(), i => i()]\n\n    let duration = 200\n\n    let delayModifiers = {\n        'shortest': 50,\n        'shorter': 100,\n        'short': 150,\n        'default': 200,\n        'long': 300,\n        'longer': 500,\n        'longest': 1000,\n    }\n\n    Object.keys(delayModifiers).some(key => {\n        if (directive.modifiers.includes(key)) {\n            duration = delayModifiers[key]\n\n            return true\n        }\n    })\n\n    let timeout\n    let started = false\n\n    return [\n        (callback) => { // Initiate delay...\n            timeout = setTimeout(() => {\n                callback()\n\n                started = true\n            }, duration)\n        },\n        async (callback) => { // Execute or abort...\n            if (started) {\n                await callback()\n                started = false\n            } else {\n                clearTimeout(timeout)\n            }\n        },\n    ]\n}\n\nfunction whenTargetsArePartOfRequest(component, targets, inverted, [ startLoading, endLoading ]) {\n    return on('commit', ({ component: iComponent, commit: payload, respond }) => {\n        if (iComponent !== component) return\n\n        if (targets.length > 0 && containsTargets(payload, targets) === inverted) return\n\n        startLoading()\n\n        respond(() => {\n            endLoading()\n        })\n    })\n}\n\nfunction whenTargetsArePartOfFileUpload(component, targets, [ startLoading, endLoading ]) {\n    let eventMismatch = e => {\n        let { id, property } = e.detail\n\n        if (id !== component.id) return true\n        if (targets.length > 0 && ! targets.map(i => i.target).includes(property)) return true\n\n        return false\n    }\n\n    let cleanupA = listen(window, 'livewire-upload-start', e => {\n        if (eventMismatch(e)) return\n\n        startLoading()\n    })\n\n    let cleanupB = listen(window, 'livewire-upload-finish', e => {\n        if (eventMismatch(e)) return\n\n        endLoading()\n    })\n\n    let cleanupC = listen(window, 'livewire-upload-error', e => {\n        if (eventMismatch(e)) return\n\n        endLoading()\n    })\n\n    return () => {\n        cleanupA()\n        cleanupB()\n        cleanupC()\n    }\n}\n\nfunction containsTargets(payload, targets) {\n    let { updates, calls } = payload\n\n    return targets.some(({ target, params }) => {\n        if (params) {\n            return calls.some(({ method, params: methodParams }) => {\n                return target === method\n                    && params === quickHash(JSON.stringify(methodParams))\n            })\n        }\n\n        let hasMatchingUpdate = Object.keys(updates).some(property => {\n            // If the property is nested, like `foo.bar`, we need to check if the root `foo` is the target.\n            if (property.includes('.')) {\n                let propertyRoot = property.split('.')[0]\n\n                if (propertyRoot === target) return true\n            }\n\n            return property === target\n        })\n\n        if (hasMatchingUpdate) return true\n\n        if (calls.map(i => i.method).includes(target)) return true\n    })\n}\n\nfunction getTargets(el) {\n    let directives = getDirectives(el)\n\n    let targets = []\n\n    let inverted = false\n\n    if (directives.has('target')) {\n        let directive = directives.get('target')\n\n        let raw = directive.expression\n\n        if (directive.modifiers.includes(\"except\")) inverted = true\n\n        if (raw.includes('(') && raw.includes(')')) {\n            targets.push({ target: directive.method, params: quickHash(JSON.stringify(directive.params)) })\n        } else if (raw.includes(',')) {\n            raw.split(',').map(i => i.trim()).forEach(target => {\n                targets.push({ target })\n            })\n        } else {\n            targets.push({ target: raw })\n        }\n    } else {\n        // If there is no wire:target, let's check for the existance of a wire:click=\"foo\" or something,\n        // and automatically scope this loading directive to that action.\n        let nonActionOrModelLivewireDirectives = [ 'init', 'dirty', 'offline', 'target', 'loading', 'poll', 'ignore', 'key', 'id' ]\n\n        directives\n            .all()\n            .filter(i => ! nonActionOrModelLivewireDirectives.includes(i.value))\n            .map(i => i.expression.split('(')[0])\n            .forEach(target => targets.push({ target }))\n    }\n\n    return { targets, inverted }\n}\n\nfunction quickHash(subject) {\n    return btoa(encodeURIComponent(subject))\n}\n", "import { contentIsFromDump } from '@/utils'\nimport { directive } from '@/directives'\nimport { on, trigger } from '@/hooks'\n\ndirective('stream', ({el, directive, cleanup }) => {\n    let { expression, modifiers } = directive\n\n    let off = on('stream', ({ name, content, replace }) => {\n        if (name !== expression) return\n\n        if (modifiers.includes('replace') || replace) {\n            el.innerHTML = content\n        } else {\n            el.innerHTML = el.innerHTML + content\n        }\n    })\n\n    cleanup(off)\n})\n\non('request', ({ respond }) => {\n    respond(mutableObject => {\n        let response = mutableObject.response\n\n        if (! response.headers.has('X-Livewire-Stream')) return\n\n        mutableObject.response = {\n            ok: true,\n            redirected: false,\n            status: 200,\n\n            async text() {\n                let finalResponse = await interceptStreamAndReturnFinalResponse(response, streamed => {\n                    trigger('stream', streamed)\n                })\n\n                if (contentIsFromDump(finalResponse)) {\n                    this.ok = false\n                }\n\n                return finalResponse\n            }\n        }\n    })\n})\n\nasync function interceptStreamAndReturnFinalResponse(response, callback) {\n    let reader = response.body.getReader()\n    let remainingResponse = ''\n\n    while (true) {\n        let { done, value: chunk } = await reader.read()\n\n        let decoder = new TextDecoder\n        let output = decoder.decode(chunk)\n\n        let [ streams, remaining ] = extractStreamObjects(remainingResponse + output)\n\n        streams.forEach(stream => {\n            callback(stream)\n        })\n\n        remainingResponse = remaining\n\n        if (done) return remainingResponse\n    }\n}\n\nfunction extractStreamObjects(raw) {\n    let regex = /({\"stream\":true.*?\"endStream\":true})/g\n\n    let matches = raw.match(regex)\n\n    let parsed = []\n\n    if (matches) {\n        for (let i = 0; i < matches.length; i++) {\n            parsed.push(JSON.parse(matches[i]).body)\n        }\n    }\n\n    let remaining = raw.replace(regex, '');\n\n    return [ parsed, remaining ];\n}\n", "import { directive } from \"@/directives\"\n\ndirective('replace', ({ el, directive }) => {\n    if (directive.modifiers.includes('self')) {\n        el.__livewire_replace_self = true\n    } else {\n        el.__livewire_replace = true\n    }\n})\n", "import { directive } from \"@/directives\"\n\ndirective('ignore', ({ el, directive }) => {\n    if (directive.modifiers.includes('self')) {\n        el.__livewire_ignore_self = true\n    } else {\n        el.__livewire_ignore = true\n    }\n})\n", "import { toggleBooleanStateDirective } from './shared'\nimport { directive, getDirectives } from '@/directives'\nimport { dataGet, WeakBag } from '@/utils'\nimport { on } from '@/hooks'\n\nlet refreshDirtyStatesByComponent = new WeakBag\n\non('commit', ({ component, succeed }) => {\n    succeed(() => {\n        setTimeout(() => { // Doing a \"setTimeout\" to let morphdom do its thing first...\n            refreshDirtyStatesByComponent.each(component, i => i(false))\n        })\n    })\n})\n\ndirective('dirty', ({ el, directive, component }) => {\n    let targets = dirtyTargets(el)\n\n    let dirty = Alpine.reactive({ state: false })\n\n    let oldIsDirty = false\n\n    let initialDisplay = el.style.display\n\n    let refreshDirtyState = (isDirty) => {\n        toggleBooleanStateDirective(el, directive, isDirty, initialDisplay)\n\n        oldIsDirty = isDirty\n    }\n\n    refreshDirtyStatesByComponent.add(component, refreshDirtyState)\n\n    Alpine.effect(() => {\n        let isDirty = false\n\n        if (targets.length === 0) {\n            isDirty = JSON.stringify(component.canonical) !== JSON.stringify(component.reactive)\n        } else {\n            for (let i = 0; i < targets.length; i++) {\n                if (isDirty) break;\n\n                let target = targets[i]\n\n                isDirty = JSON.stringify(dataGet(component.canonical, target)) !== JSON.stringify(dataGet(component.reactive, target))\n            }\n        }\n\n        if (oldIsDirty !== isDirty) {\n            refreshDirtyState(isDirty)\n        }\n\n        oldIsDirty = isDirty\n    })\n})\n\nfunction dirtyTargets(el) {\n    let directives = getDirectives(el)\n    let targets = []\n\n    if (directives.has('model')) {\n        targets.push(directives.get('model').expression)\n    }\n\n    if (directives.has('target')) {\n        targets = targets.concat(\n            directives\n            .get('target')\n            .expression.split(',')\n            .map(s => s.trim())\n        )\n    }\n\n    return targets\n}\n", "import { directive } from '@/directives'\nimport { handleFileUpload } from '@/features/supportFileUploads'\nimport { closestComponent } from '@/store'\nimport { dataGet, dataSet } from '@/utils'\nimport Alpine from 'alpinejs'\n\ndirective('model', ({ el, directive, component, cleanup }) => {\n    let { expression, modifiers } = directive\n\n    if (! expression) {\n        return console.warn('Livewire: [wire:model] is missing a value.', el)\n    }\n\n    if (componentIsMissingProperty(component, expression)) {\n        return console.warn('Livewire: [wire:model=\"'+expression+'\"] property does not exist on component: ['+component.name+']', el)\n    }\n\n    // Handle file uploads differently...\n    if (el.type && el.type.toLowerCase() === 'file') {\n        return handleFileUpload(el, expression, component, cleanup)\n    }\n\n    let isLive = modifiers.includes('live')\n    let isLazy = modifiers.includes('lazy') || modifiers.includes('change')\n    let onBlur = modifiers.includes('blur')\n    let isDebounced = modifiers.includes('debounce')\n\n    // Trigger a network request (only if .live or .lazy is added to wire:model)...\n    let update = expression.startsWith('$parent')\n        ? () => component.$wire.$parent.$commit()\n        : () => component.$wire.$commit()\n\n    // If a plain wire:model is added to a text input, debounce the\n    // trigerring of network requests.\n    let debouncedUpdate = isTextInput(el) && ! isDebounced && isLive\n        ? debounce(update, 150)\n        : update\n\n    Alpine.bind(el, {\n        ['@change']() {\n            isLazy && update()\n        },\n        ['@blur']() {\n            onBlur && update()\n        },\n        ['x-model' + getModifierTail(modifiers)]() {\n            return {\n                get() {\n                    return dataGet(component.$wire, expression)\n                },\n                set(value) {\n                    dataSet(component.$wire, expression, value)\n\n                    isLive && (! isLazy) && (! onBlur) && debouncedUpdate()\n                },\n            }\n        }\n    })\n})\n\nfunction getModifierTail(modifiers) {\n    modifiers = modifiers.filter(i => ! [\n        'lazy', 'defer'\n    ].includes(i))\n\n    if (modifiers.length === 0) return ''\n\n    return '.' + modifiers.join('.')\n}\n\nfunction isTextInput(el) {\n    return (\n        ['INPUT', 'TEXTAREA'].includes(el.tagName.toUpperCase()) &&\n        !['checkbox', 'radio'].includes(el.type)\n    )\n}\n\nfunction isDirty(subject, dirty) {\n    // Check for exact match: wire:model=\"bob\" in ['bob']\n    if (dirty.includes(subject)) return true\n\n    // Check case of parent: wire:model=\"bob.1\" in ['bob']\n    return dirty.some(i => subject.startsWith(i))\n}\n\nfunction componentIsMissingProperty(component, property) {\n    if (property.startsWith('$parent')) {\n        let parent = closestComponent(component.el.parentElement, false)\n\n        if (! parent) return true\n\n        return componentIsMissingProperty(parent, property.split('$parent.')[1])\n    }\n\n    let baseProperty = property.split('.')[0]\n\n    return ! Object.keys(component.canonical).includes(baseProperty)\n}\n\nfunction debounce(func, wait) {\n    var timeout;\n\n    return function() {\n      var context = this, args = arguments;\n\n      var later = function() {\n            timeout = null\n\n            func.apply(context, args)\n      }\n\n      clearTimeout(timeout)\n\n      timeout = setTimeout(later, wait)\n    }\n}\n", "import { directive } from \"@/directives\"\nimport Alpine from 'alpinejs'\n\ndirective('init', ({ el, directive }) => {\n    let fullMethod = directive.expression ?? '$refresh'\n\n    Alpine.evaluate(el, `$wire.${fullMethod}`)\n})\n\n", "import { directive, getDirectives } from \"@/directives\"\nimport Alpine from 'alpinejs'\n\ndirective('poll', ({ el, directive }) => {\n    let interval = extractDurationFrom(directive.modifiers, 2000)\n\n    let { start, pauseWhile, throttleWhile, stopWhen } = poll(() => {\n        triggerComponentRequest(el, directive)\n    }, interval)\n\n    start()\n\n    throttleWhile(() => theTabIsInTheBackground() && theDirectiveIsMissingKeepAlive(directive))\n    pauseWhile(() => theDirectiveHasVisible(directive) && theElementIsNotInTheViewport(el))\n    pauseWhile(() => theDirectiveIsOffTheElement(el))\n    pauseWhile(() => livewireIsOffline())\n    stopWhen(() => theElementIsDisconnected(el))\n})\n\nfunction triggerComponentRequest(el, directive) {\n    Alpine.evaluate(el,\n        directive.expression ? '$wire.' + directive.expression : '$wire.$commit()'\n    )\n}\n\nfunction poll(callback, interval = 2000) {\n    let pauseConditions = []\n    let throttleConditions = []\n    let stopConditions = []\n\n    return {\n        start() {\n            let clear = syncronizedInterval(interval, () => {\n                if (stopConditions.some(i => i())) return clear()\n                if (pauseConditions.some(i => i())) return\n                if (throttleConditions.some(i => i()) && Math.random() < .95) return\n\n                callback()\n            })\n        },\n        pauseWhile(condition) {\n            pauseConditions.push(condition)\n        },\n        throttleWhile(condition) {\n            throttleConditions.push(condition)\n        },\n        stopWhen(condition) {\n            stopConditions.push(condition)\n        }\n    }\n}\n\nlet clocks = []\n\nfunction syncronizedInterval(ms, callback) {\n    if (! clocks[ms]) {\n        let clock = {\n            timer: setInterval(() => clock.callbacks.forEach(i => i()), ms),\n            callbacks: new Set,\n        }\n\n        clocks[ms] = clock\n    }\n\n    clocks[ms].callbacks.add(callback)\n\n    return () => {\n        clocks[ms].callbacks.delete(callback)\n\n        if (clocks[ms].callbacks.size === 0) {\n            clearInterval(clocks[ms].timer)\n            delete clocks[ms]\n        }\n    }\n}\n\nlet isOffline = false\n\nwindow.addEventListener('offline', () => isOffline = true)\nwindow.addEventListener('online', () => isOffline = false)\n\nfunction livewireIsOffline() {\n    return isOffline\n}\n\nlet inBackground = false\n\ndocument.addEventListener('visibilitychange', () => { inBackground = document.hidden }, false)\n\nfunction theTabIsInTheBackground() {\n    return inBackground\n}\n\nfunction theDirectiveIsOffTheElement(el) {\n    return ! getDirectives(el).has('poll')\n}\n\nfunction theDirectiveIsMissingKeepAlive(directive) {\n    return ! directive.modifiers.includes('keep-alive')\n}\n\nfunction theDirectiveHasVisible(directive) {\n    return directive.modifiers.includes('visible')\n}\n\nfunction theElementIsNotInTheViewport(el) {\n    let bounding = el.getBoundingClientRect()\n\n    return ! (\n        bounding.top < (window.innerHeight || document.documentElement.clientHeight) &&\n        bounding.left < (window.innerWidth || document.documentElement.clientWidth) &&\n        bounding.bottom > 0 &&\n        bounding.right > 0\n    )\n}\n\nfunction theElementIsDisconnected(el) {\n    return el.isConnected === false\n}\n\nfunction extractDurationFrom(modifiers, defaultDuration) {\n    let durationInMilliSeconds\n    let durationInMilliSecondsString = modifiers.find(mod => mod.match(/([0-9]+)ms/))\n    let durationInSecondsString = modifiers.find(mod => mod.match(/([0-9]+)s/))\n\n    if (durationInMilliSecondsString) {\n        durationInMilliSeconds = Number(durationInMilliSecondsString.replace('ms', ''))\n    } else if (durationInSecondsString) {\n        durationInMilliSeconds = Number(durationInSecondsString.replace('s', '')) * 1000\n    }\n\n    return durationInMilliSeconds || defaultDuration\n}\n"],
+  "mappings": ";;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA,QAAI,YAAW,OAAO;AACtB,QAAI,aAAY,OAAO;AACvB,QAAI,oBAAmB,OAAO;AAC9B,QAAI,qBAAoB,OAAO;AAC/B,QAAI,gBAAe,OAAO;AAC1B,QAAI,gBAAe,OAAO,UAAU;AACpC,QAAI,cAAa,CAAC,IAAI,QAAQ,qBAAqB;AACjD,aAAO,OAAQ,IAAG,GAAG,mBAAkB,EAAE,EAAE,KAAM,OAAM,EAAE,SAAS,CAAC,EAAE,GAAG,SAAS,GAAG,GAAG,IAAI;AAAA,IAC7F;AACA,QAAI,WAAW,CAAC,QAAQ,SAAQ;AAC9B,eAAS,QAAQ;AACf,mBAAU,QAAQ,MAAM,EAAE,KAAK,KAAI,OAAO,YAAY,KAAK,CAAC;AAAA,IAChE;AACA,QAAI,eAAc,CAAC,IAAI,MAAM,QAAQ,SAAS;AAC5C,UAAI,QAAQ,OAAO,SAAS,YAAY,OAAO,SAAS,YAAY;AAClE,iBAAS,OAAO,mBAAkB,IAAI;AACpC,cAAI,CAAC,cAAa,KAAK,IAAI,GAAG,KAAK,QAAQ;AACzC,uBAAU,IAAI,KAAK,EAAE,KAAK,MAAM,KAAK,MAAM,YAAY,CAAE,QAAO,kBAAiB,MAAM,GAAG,MAAM,KAAK,WAAW,CAAC;AAAA,MACvH;AACA,aAAO;AAAA,IACT;AACA,QAAI,WAAU,CAAC,KAAK,YAAY,WAAY,UAAS,OAAO,OAAO,UAAS,cAAa,GAAG,CAAC,IAAI,CAAC,GAAG,aAKnG,cAAc,CAAC,OAAO,CAAC,IAAI,aAAa,WAAU,QAAQ,WAAW,EAAE,OAAO,KAAK,YAAY,KAAK,CAAC,IAAI,QACzG,GACF;AACA,QAAI,eAAe,CAAC,QAAQ,aAAY,WAAU,CAAC,GAAG,cAAc,EAAE,OAAO,KAAK,CAAC,GAAG,GAAG;AAGzF,QAAI,qBAAqB,YAAW;AAAA,MAClC,8CAA8C,UAAS;AACrD;AACA,eAAO,eAAe,UAAS,cAAc,EAAE,OAAO,KAAK,CAAC;AAC5D,yBAAiB,KAAK,kBAAkB;AACtC,gBAAM,MAAsB,uBAAO,OAAO,IAAI;AAC9C,gBAAM,OAAO,IAAI,MAAM,GAAG;AAC1B,mBAAS,IAAI,GAAG,IAAI,KAAK,QAAQ,KAAK;AACpC,gBAAI,KAAK,MAAM;AAAA,UACjB;AACA,iBAAO,mBAAmB,CAAC,QAAQ,CAAC,CAAC,IAAI,IAAI,YAAY,KAAK,CAAC,QAAQ,CAAC,CAAC,IAAI;AAAA,QAC/E;AACA,YAAI,iBAAiB;AAAA,UACnB,CACE,IAEC;AAAA,UACH,CACE,IAEC;AAAA,UACH,CACE,IAEC;AAAA,UACH,CACE,IAEC;AAAA,UACH,CACE,KAEC;AAAA,UACH,CACE,KAEC;AAAA,UACH,CACE,KAEC;AAAA,UACH,CACE,MAEC;AAAA,UACH,CACE,MAEC;AAAA,UACH,CACE,MAEC;AAAA,UACH,CACE,OAEC;AAAA,UACH,CACE,OAEC;AAAA,UACH,CACE,KAEC;AAAA,UACH,CACE,KAEC;AAAA,QACL;AACA,YAAI,gBAAgB;AAAA,UAClB,CACE,IAEC;AAAA,UACH,CACE,IAEC;AAAA,UACH,CACE,IAEC;AAAA,QACL;AACA,YAAI,uBAAuB;AAC3B,YAAI,wBAAwC,wBAAQ,oBAAoB;AACxE,YAAI,QAAQ;AACZ,mCAA2B,QAAQ,UAAS,GAAG,MAAM,OAAO,QAAQ;AAClE,cAAI,QAAQ,OAAO,MAAM,SAAS;AAClC,gBAAM,mBAAmB,MAAM,OAAO,CAAC,GAAG,QAAQ,MAAM,MAAM,CAAC;AAC/D,kBAAQ,MAAM,OAAO,CAAC,GAAG,QAAQ,MAAM,MAAM,CAAC;AAC9C,cAAI,QAAQ;AACZ,gBAAM,MAAM,CAAC;AACb,mBAAS,IAAI,GAAG,IAAI,MAAM,QAAQ,KAAK;AACrC,qBAAS,MAAM,GAAG,SAAU,kBAAiB,MAAM,iBAAiB,GAAG,UAAU;AACjF,gBAAI,SAAS,SAAQ;AACnB,uBAAS,IAAI,IAAI,OAAO,KAAK,IAAI,SAAS,MAAM,OAAO,KAAK;AAC1D,oBAAI,IAAI,KAAK,KAAK,MAAM;AACtB;AACF,sBAAM,OAAO,IAAI;AACjB,oBAAI,KAAK,GAAG,OAAO,IAAI,OAAO,KAAK,IAAI,IAAI,OAAO,IAAI,EAAE,QAAQ,CAAC,CAAC,OAAO,MAAM,IAAI;AACnF,sBAAM,aAAa,MAAM,GAAG;AAC5B,sBAAM,mBAAmB,iBAAiB,MAAM,iBAAiB,GAAG,UAAU;AAC9E,oBAAI,MAAM,GAAG;AACX,wBAAM,MAAM,UAAU,SAAS,cAAa;AAC5C,wBAAM,SAAS,KAAK,IAAI,GAAG,MAAM,QAAQ,aAAa,MAAM,MAAM,OAAM;AACxE,sBAAI,KAAK,WAAW,IAAI,OAAO,GAAG,IAAI,IAAI,OAAO,MAAM,CAAC;AAAA,gBAC1D,WAAW,IAAI,GAAG;AAChB,sBAAI,MAAM,OAAO;AACf,0BAAM,SAAS,KAAK,IAAI,KAAK,IAAI,MAAM,OAAO,UAAU,GAAG,CAAC;AAC5D,wBAAI,KAAK,WAAW,IAAI,OAAO,MAAM,CAAC;AAAA,kBACxC;AACA,2BAAS,aAAa;AAAA,gBACxB;AAAA,cACF;AACA;AAAA,YACF;AAAA,UACF;AACA,iBAAO,IAAI,KAAK,IAAI;AAAA,QACtB;AACA,YAAI,sBAAsB;AAC1B,YAAI,uBAAuC,wBAAQ,mBAAmB;AACtE,YAAI,iBAAiC,wBAAQ,sBAAsB,8IAA8I;AACjN,YAAI,mBAAmB;AACvB,YAAI,sBAAsB,CAAC;AAC3B,mCAA2B,MAAM;AAC/B,cAAI,oBAAoB,eAAe,IAAI,GAAG;AAC5C,mBAAO,oBAAoB;AAAA,UAC7B;AACA,gBAAM,WAAW,iBAAiB,KAAK,IAAI;AAC3C,cAAI,UAAU;AACZ,oBAAQ,MAAM,0BAA0B,MAAM;AAAA,UAChD;AACA,iBAAO,oBAAoB,QAAQ,CAAC;AAAA,QACtC;AACA,YAAI,iBAAiB;AAAA,UACnB,eAAe;AAAA,UACf,WAAW;AAAA,UACX,SAAS;AAAA,UACT,WAAW;AAAA,QACb;AACA,YAAI,2BAA2C,wBAAQ,uhBAAuhB;AAC9kB,YAAI,cAA8B,wBAAQ,k+BAAk+B;AAC5gC,gCAAwB,OAAO;AAC7B,cAAI,SAAQ,KAAK,GAAG;AAClB,kBAAM,MAAM,CAAC;AACb,qBAAS,IAAI,GAAG,IAAI,MAAM,QAAQ,KAAK;AACrC,oBAAM,OAAO,MAAM;AACnB,oBAAM,aAAa,eAAe,SAAS,IAAI,IAAI,iBAAiB,IAAI,IAAI,IAAI;AAChF,kBAAI,YAAY;AACd,2BAAW,OAAO,YAAY;AAC5B,sBAAI,OAAO,WAAW;AAAA,gBACxB;AAAA,cACF;AAAA,YACF;AACA,mBAAO;AAAA,UACT,WAAW,UAAS,KAAK,GAAG;AAC1B,mBAAO;AAAA,UACT;AAAA,QACF;AACA,YAAI,kBAAkB;AACtB,YAAI,sBAAsB;AAC1B,kCAA0B,SAAS;AACjC,gBAAM,MAAM,CAAC;AACb,kBAAQ,MAAM,eAAe,EAAE,QAAQ,CAAC,SAAS;AAC/C,gBAAI,MAAM;AACR,oBAAM,MAAM,KAAK,MAAM,mBAAmB;AAC1C,kBAAI,SAAS,KAAM,KAAI,IAAI,GAAG,KAAK,KAAK,IAAI,GAAG,KAAK;AAAA,YACtD;AAAA,UACF,CAAC;AACD,iBAAO;AAAA,QACT;AACA,gCAAwB,QAAQ;AAC9B,cAAI,MAAM;AACV,cAAI,CAAC,QAAQ;AACX,mBAAO;AAAA,UACT;AACA,qBAAW,OAAO,QAAQ;AACxB,kBAAM,QAAQ,OAAO;AACrB,kBAAM,gBAAgB,IAAI,WAAW,IAAI,IAAI,MAAM,UAAU,GAAG;AAChE,gBAAI,SAAS,KAAK,KAAK,OAAO,UAAU,YAAY,yBAAyB,aAAa,GAAG;AAC3F,qBAAO,GAAG,iBAAiB;AAAA,YAC7B;AAAA,UACF;AACA,iBAAO;AAAA,QACT;AACA,gCAAwB,OAAO;AAC7B,cAAI,MAAM;AACV,cAAI,SAAS,KAAK,GAAG;AACnB,kBAAM;AAAA,UACR,WAAW,SAAQ,KAAK,GAAG;AACzB,qBAAS,IAAI,GAAG,IAAI,MAAM,QAAQ,KAAK;AACrC,oBAAM,aAAa,eAAe,MAAM,EAAE;AAC1C,kBAAI,YAAY;AACd,uBAAO,aAAa;AAAA,cACtB;AAAA,YACF;AAAA,UACF,WAAW,UAAS,KAAK,GAAG;AAC1B,uBAAW,QAAQ,OAAO;AACxB,kBAAI,MAAM,OAAO;AACf,uBAAO,OAAO;AAAA,cAChB;AAAA,YACF;AAAA,UACF;AACA,iBAAO,IAAI,KAAK;AAAA,QAClB;AACA,YAAI,YAAY;AAChB,YAAI,WAAW;AACf,YAAI,YAAY;AAChB,YAAI,YAA4B,wBAAQ,SAAS;AACjD,YAAI,WAA2B,wBAAQ,QAAQ;AAC/C,YAAI,YAA4B,wBAAQ,SAAS;AACjD,YAAI,WAAW;AACf,4BAAoB,QAAQ;AAC1B,gBAAM,MAAM,KAAK;AACjB,gBAAM,QAAQ,SAAS,KAAK,GAAG;AAC/B,cAAI,CAAC,OAAO;AACV,mBAAO;AAAA,UACT;AACA,cAAI,OAAO;AACX,cAAI;AACJ,cAAI;AACJ,cAAI,YAAY;AAChB,eAAK,QAAQ,MAAM,OAAO,QAAQ,IAAI,QAAQ,SAAS;AACrD,oBAAQ,IAAI,WAAW,KAAK;AAAA,mBACrB;AACH,0BAAU;AACV;AAAA,mBACG;AACH,0BAAU;AACV;AAAA,mBACG;AACH,0BAAU;AACV;AAAA,mBACG;AACH,0BAAU;AACV;AAAA,mBACG;AACH,0BAAU;AACV;AAAA;AAEA;AAAA;AAEJ,gBAAI,cAAc,OAAO;AACvB,sBAAQ,IAAI,UAAU,WAAW,KAAK;AAAA,YACxC;AACA,wBAAY,QAAQ;AACpB,oBAAQ;AAAA,UACV;AACA,iBAAO,cAAc,QAAQ,OAAO,IAAI,UAAU,WAAW,KAAK,IAAI;AAAA,QACxE;AACA,YAAI,iBAAiB;AACrB,mCAA2B,KAAK;AAC9B,iBAAO,IAAI,QAAQ,gBAAgB,EAAE;AAAA,QACvC;AACA,oCAA4B,GAAG,GAAG;AAChC,cAAI,EAAE,WAAW,EAAE;AACjB,mBAAO;AACT,cAAI,QAAQ;AACZ,mBAAS,IAAI,GAAG,SAAS,IAAI,EAAE,QAAQ,KAAK;AAC1C,oBAAQ,WAAW,EAAE,IAAI,EAAE,EAAE;AAAA,UAC/B;AACA,iBAAO;AAAA,QACT;AACA,4BAAoB,GAAG,GAAG;AACxB,cAAI,MAAM;AACR,mBAAO;AACT,cAAI,aAAa,OAAO,CAAC;AACzB,cAAI,aAAa,OAAO,CAAC;AACzB,cAAI,cAAc,YAAY;AAC5B,mBAAO,cAAc,aAAa,EAAE,QAAQ,MAAM,EAAE,QAAQ,IAAI;AAAA,UAClE;AACA,uBAAa,SAAQ,CAAC;AACtB,uBAAa,SAAQ,CAAC;AACtB,cAAI,cAAc,YAAY;AAC5B,mBAAO,cAAc,aAAa,mBAAmB,GAAG,CAAC,IAAI;AAAA,UAC/D;AACA,uBAAa,UAAS,CAAC;AACvB,uBAAa,UAAS,CAAC;AACvB,cAAI,cAAc,YAAY;AAC5B,gBAAI,CAAC,cAAc,CAAC,YAAY;AAC9B,qBAAO;AAAA,YACT;AACA,kBAAM,aAAa,OAAO,KAAK,CAAC,EAAE;AAClC,kBAAM,aAAa,OAAO,KAAK,CAAC,EAAE;AAClC,gBAAI,eAAe,YAAY;AAC7B,qBAAO;AAAA,YACT;AACA,uBAAW,OAAO,GAAG;AACnB,oBAAM,UAAU,EAAE,eAAe,GAAG;AACpC,oBAAM,UAAU,EAAE,eAAe,GAAG;AACpC,kBAAI,WAAW,CAAC,WAAW,CAAC,WAAW,WAAW,CAAC,WAAW,EAAE,MAAM,EAAE,IAAI,GAAG;AAC7E,uBAAO;AAAA,cACT;AAAA,YACF;AAAA,UACF;AACA,iBAAO,OAAO,CAAC,MAAM,OAAO,CAAC;AAAA,QAC/B;AACA,8BAAsB,KAAK,KAAK;AAC9B,iBAAO,IAAI,UAAU,CAAC,SAAS,WAAW,MAAM,GAAG,CAAC;AAAA,QACtD;AACA,YAAI,kBAAkB,CAAC,QAAQ;AAC7B,iBAAO,OAAO,OAAO,KAAK,UAAS,GAAG,IAAI,KAAK,UAAU,KAAK,UAAU,CAAC,IAAI,OAAO,GAAG;AAAA,QACzF;AACA,YAAI,WAAW,CAAC,MAAM,QAAQ;AAC5B,cAAI,MAAM,GAAG,GAAG;AACd,mBAAO;AAAA,cACL,CAAC,OAAO,IAAI,UAAU,CAAC,GAAG,IAAI,QAAQ,CAAC,EAAE,OAAO,CAAC,SAAS,CAAC,KAAK,UAAU;AACxE,wBAAQ,GAAG,YAAY;AACvB,uBAAO;AAAA,cACT,GAAG,CAAC,CAAC;AAAA,YACP;AAAA,UACF,WAAW,MAAM,GAAG,GAAG;AACrB,mBAAO;AAAA,cACL,CAAC,OAAO,IAAI,UAAU,CAAC,GAAG,IAAI,OAAO,CAAC;AAAA,YACxC;AAAA,UACF,WAAW,UAAS,GAAG,KAAK,CAAC,SAAQ,GAAG,KAAK,CAAC,cAAc,GAAG,GAAG;AAChE,mBAAO,OAAO,GAAG;AAAA,UACnB;AACA,iBAAO;AAAA,QACT;AACA,YAAI,4BAA4B;AAAA,UAC9B;AAAA,UACA;AAAA,UACA;AAAA,QACF;AACA,YAAI,YAAY,OAAO,OAAO,CAAC,CAAC;AAChC,YAAI,YAAY,OAAO,OAAO,CAAC,CAAC;AAChC,YAAI,OAAO,MAAM;AAAA,QACjB;AACA,YAAI,KAAK,MAAM;AACf,YAAI,OAAO;AACX,YAAI,OAAO,CAAC,QAAQ,KAAK,KAAK,GAAG;AACjC,YAAI,kBAAkB,CAAC,QAAQ,IAAI,WAAW,WAAW;AACzD,YAAI,SAAS,OAAO;AACpB,YAAI,SAAS,CAAC,KAAK,OAAO;AACxB,gBAAM,IAAI,IAAI,QAAQ,EAAE;AACxB,cAAI,IAAI,IAAI;AACV,gBAAI,OAAO,GAAG,CAAC;AAAA,UACjB;AAAA,QACF;AACA,YAAI,iBAAiB,OAAO,UAAU;AACtC,YAAI,SAAS,CAAC,KAAK,QAAQ,eAAe,KAAK,KAAK,GAAG;AACvD,YAAI,WAAU,MAAM;AACpB,YAAI,QAAQ,CAAC,QAAQ,aAAa,GAAG,MAAM;AAC3C,YAAI,QAAQ,CAAC,QAAQ,aAAa,GAAG,MAAM;AAC3C,YAAI,SAAS,CAAC,QAAQ,eAAe;AACrC,YAAI,cAAa,CAAC,QAAQ,OAAO,QAAQ;AACzC,YAAI,WAAW,CAAC,QAAQ,OAAO,QAAQ;AACvC,YAAI,WAAW,CAAC,QAAQ,OAAO,QAAQ;AACvC,YAAI,YAAW,CAAC,QAAQ,QAAQ,QAAQ,OAAO,QAAQ;AACvD,YAAI,YAAY,CAAC,QAAQ;AACvB,iBAAO,UAAS,GAAG,KAAK,YAAW,IAAI,IAAI,KAAK,YAAW,IAAI,KAAK;AAAA,QACtE;AACA,YAAI,iBAAiB,OAAO,UAAU;AACtC,YAAI,eAAe,CAAC,UAAU,eAAe,KAAK,KAAK;AACvD,YAAI,YAAY,CAAC,UAAU;AACzB,iBAAO,aAAa,KAAK,EAAE,MAAM,GAAG,EAAE;AAAA,QACxC;AACA,YAAI,gBAAgB,CAAC,QAAQ,aAAa,GAAG,MAAM;AACnD,YAAI,eAAe,CAAC,QAAQ,SAAS,GAAG,KAAK,QAAQ,SAAS,IAAI,OAAO,OAAO,KAAK,SAAS,KAAK,EAAE,MAAM;AAC3G,YAAI,iBAAiC,wBAEnC,qHACF;AACA,YAAI,sBAAsB,CAAC,OAAO;AAChC,gBAAM,QAAwB,uBAAO,OAAO,IAAI;AAChD,iBAAO,CAAC,QAAQ;AACd,kBAAM,MAAM,MAAM;AAClB,mBAAO,OAAQ,OAAM,OAAO,GAAG,GAAG;AAAA,UACpC;AAAA,QACF;AACA,YAAI,aAAa;AACjB,YAAI,WAAW,oBAAoB,CAAC,QAAQ;AAC1C,iBAAO,IAAI,QAAQ,YAAY,CAAC,GAAG,MAAM,IAAI,EAAE,YAAY,IAAI,EAAE;AAAA,QACnE,CAAC;AACD,YAAI,cAAc;AAClB,YAAI,YAAY,oBAAoB,CAAC,QAAQ,IAAI,QAAQ,aAAa,KAAK,EAAE,YAAY,CAAC;AAC1F,YAAI,aAAa,oBAAoB,CAAC,QAAQ,IAAI,OAAO,CAAC,EAAE,YAAY,IAAI,IAAI,MAAM,CAAC,CAAC;AACxF,YAAI,eAAe,oBAAoB,CAAC,QAAQ,MAAM,KAAK,WAAW,GAAG,MAAM,EAAE;AACjF,YAAI,aAAa,CAAC,OAAO,aAAa,UAAU,YAAa,WAAU,SAAS,aAAa;AAC7F,YAAI,iBAAiB,CAAC,KAAK,QAAQ;AACjC,mBAAS,IAAI,GAAG,IAAI,IAAI,QAAQ,KAAK;AACnC,gBAAI,GAAG,GAAG;AAAA,UACZ;AAAA,QACF;AACA,YAAI,MAAM,CAAC,KAAK,KAAK,UAAU;AAC7B,iBAAO,eAAe,KAAK,KAAK;AAAA,YAC9B,cAAc;AAAA,YACd,YAAY;AAAA,YACZ;AAAA,UACF,CAAC;AAAA,QACH;AACA,YAAI,WAAW,CAAC,QAAQ;AACtB,gBAAM,IAAI,WAAW,GAAG;AACxB,iBAAO,MAAM,CAAC,IAAI,MAAM;AAAA,QAC1B;AACA,YAAI;AACJ,YAAI,gBAAgB,MAAM;AACxB,iBAAO,eAAgB,eAAc,OAAO,eAAe,cAAc,aAAa,OAAO,SAAS,cAAc,OAAO,OAAO,WAAW,cAAc,SAAS,OAAO,WAAW,cAAc,SAAS,CAAC;AAAA,QAChN;AACA,iBAAQ,YAAY;AACpB,iBAAQ,YAAY;AACpB,iBAAQ,KAAK;AACb,iBAAQ,OAAO;AACf,iBAAQ,iBAAiB;AACzB,iBAAQ,4BAA4B;AACpC,iBAAQ,WAAW;AACnB,iBAAQ,aAAa;AACrB,iBAAQ,MAAM;AACd,iBAAQ,aAAa;AACrB,iBAAQ,oBAAoB;AAC5B,iBAAQ,SAAS;AACjB,iBAAQ,oBAAoB;AAC5B,iBAAQ,gBAAgB;AACxB,iBAAQ,aAAa;AACrB,iBAAQ,SAAS;AACjB,iBAAQ,YAAY;AACpB,iBAAQ,iBAAiB;AACzB,iBAAQ,UAAU;AAClB,iBAAQ,gBAAgB;AACxB,iBAAQ,SAAS;AACjB,iBAAQ,aAAa;AACrB,iBAAQ,wBAAwB;AAChC,iBAAQ,YAAY;AACpB,iBAAQ,eAAe;AACvB,iBAAQ,cAAc;AACtB,iBAAQ,QAAQ;AAChB,iBAAQ,kBAAkB;AAC1B,iBAAQ,2BAA2B;AACnC,iBAAQ,WAAW;AACnB,iBAAQ,OAAO;AACf,iBAAQ,gBAAgB;AACxB,iBAAQ,YAAY;AACpB,iBAAQ,iBAAiB;AACzB,iBAAQ,oBAAoB;AAC5B,iBAAQ,WAAW;AACnB,iBAAQ,QAAQ;AAChB,iBAAQ,uBAAuB;AAC/B,iBAAQ,WAAW;AACnB,iBAAQ,WAAW;AACnB,iBAAQ,YAAY;AACpB,iBAAQ,aAAa;AACrB,iBAAQ,eAAe;AACvB,iBAAQ,UAAU;AAClB,iBAAQ,iBAAiB;AACzB,iBAAQ,iBAAiB;AACzB,iBAAQ,iBAAiB;AACzB,iBAAQ,mBAAmB;AAC3B,iBAAQ,iBAAiB;AACzB,iBAAQ,SAAS;AACjB,iBAAQ,gBAAgB;AACxB,iBAAQ,iBAAiB;AACzB,iBAAQ,kBAAkB;AAC1B,iBAAQ,eAAe;AACvB,iBAAQ,WAAW;AACnB,iBAAQ,YAAY;AACpB,iBAAQ,eAAe;AAAA,MACzB;AAAA,IACF,CAAC;AAGD,QAAI,iBAAiB,YAAW;AAAA,MAC9B,oCAAoC,UAAS,SAAS;AACpD;AACA,YAAI,OAAO;AACT,kBAAQ,UAAU;AAAA,QACpB,OAAO;AACL,kBAAQ,UAAU,mBAAmB;AAAA,QACvC;AAAA,MACF;AAAA,IACF,CAAC;AAGD,QAAI,yBAAyB,YAAW;AAAA,MACtC,sDAAsD,UAAS;AAC7D;AACA,eAAO,eAAe,UAAS,cAAc,EAAE,OAAO,KAAK,CAAC;AAC5D,YAAI,SAAS,eAAe;AAC5B,YAAI,YAA4B,oBAAI,QAAQ;AAC5C,YAAI,cAAc,CAAC;AACnB,YAAI;AACJ,YAAI,cAAc,OAAO,SAAS;AAClC,YAAI,sBAAsB,OAAO,iBAAiB;AAClD,0BAAkB,IAAI;AACpB,iBAAO,MAAM,GAAG,cAAc;AAAA,QAChC;AACA,yBAAiB,IAAI,UAAU,OAAO,WAAW;AAC/C,cAAI,SAAS,EAAE,GAAG;AAChB,iBAAK,GAAG;AAAA,UACV;AACA,gBAAM,UAAU,qBAAqB,IAAI,OAAO;AAChD,cAAI,CAAC,QAAQ,MAAM;AACjB,oBAAQ;AAAA,UACV;AACA,iBAAO;AAAA,QACT;AACA,uBAAe,SAAS;AACtB,cAAI,QAAQ,QAAQ;AAClB,oBAAQ,OAAO;AACf,gBAAI,QAAQ,QAAQ,QAAQ;AAC1B,sBAAQ,QAAQ,OAAO;AAAA,YACzB;AACA,oBAAQ,SAAS;AAAA,UACnB;AAAA,QACF;AACA,YAAI,MAAM;AACV,sCAA8B,IAAI,SAAS;AACzC,gBAAM,UAAU,0BAA0B;AACxC,gBAAI,CAAC,QAAQ,QAAQ;AACnB,qBAAO,GAAG;AAAA,YACZ;AACA,gBAAI,CAAC,YAAY,SAAS,OAAO,GAAG;AAClC,sBAAQ,OAAO;AACf,kBAAI;AACF,+BAAe;AACf,4BAAY,KAAK,OAAO;AACxB,+BAAe;AACf,uBAAO,GAAG;AAAA,cACZ,UAAE;AACA,4BAAY,IAAI;AAChB,8BAAc;AACd,+BAAe,YAAY,YAAY,SAAS;AAAA,cAClD;AAAA,YACF;AAAA,UACF;AACA,kBAAQ,KAAK;AACb,kBAAQ,eAAe,CAAC,CAAC,QAAQ;AACjC,kBAAQ,YAAY;AACpB,kBAAQ,SAAS;AACjB,kBAAQ,MAAM;AACd,kBAAQ,OAAO,CAAC;AAChB,kBAAQ,UAAU;AAClB,iBAAO;AAAA,QACT;AACA,yBAAiB,SAAS;AACxB,gBAAM,EAAE,SAAS;AACjB,cAAI,KAAK,QAAQ;AACf,qBAAS,IAAI,GAAG,IAAI,KAAK,QAAQ,KAAK;AACpC,mBAAK,GAAG,OAAO,OAAO;AAAA,YACxB;AACA,iBAAK,SAAS;AAAA,UAChB;AAAA,QACF;AACA,YAAI,cAAc;AAClB,YAAI,aAAa,CAAC;AAClB,iCAAyB;AACvB,qBAAW,KAAK,WAAW;AAC3B,wBAAc;AAAA,QAChB;AACA,kCAA0B;AACxB,qBAAW,KAAK,WAAW;AAC3B,wBAAc;AAAA,QAChB;AACA,iCAAyB;AACvB,gBAAM,OAAO,WAAW,IAAI;AAC5B,wBAAc,SAAS,SAAS,OAAO;AAAA,QACzC;AACA,wBAAe,QAAQ,MAAM,KAAK;AAChC,cAAI,CAAC,eAAe,iBAAiB,QAAQ;AAC3C;AAAA,UACF;AACA,cAAI,UAAU,UAAU,IAAI,MAAM;AAClC,cAAI,CAAC,SAAS;AACZ,sBAAU,IAAI,QAAQ,UAA0B,oBAAI,IAAI,CAAC;AAAA,UAC3D;AACA,cAAI,MAAM,QAAQ,IAAI,GAAG;AACzB,cAAI,CAAC,KAAK;AACR,oBAAQ,IAAI,KAAK,MAAsB,oBAAI,IAAI,CAAC;AAAA,UAClD;AACA,cAAI,CAAC,IAAI,IAAI,YAAY,GAAG;AAC1B,gBAAI,IAAI,YAAY;AACpB,yBAAa,KAAK,KAAK,GAAG;AAC1B,gBAAI,aAAa,QAAQ,SAAS;AAChC,2BAAa,QAAQ,QAAQ;AAAA,gBAC3B,QAAQ;AAAA,gBACR;AAAA,gBACA;AAAA,gBACA;AAAA,cACF,CAAC;AAAA,YACH;AAAA,UACF;AAAA,QACF;AACA,0BAAiB,QAAQ,MAAM,KAAK,UAAU,UAAU,WAAW;AACjE,gBAAM,UAAU,UAAU,IAAI,MAAM;AACpC,cAAI,CAAC,SAAS;AACZ;AAAA,UACF;AACA,gBAAM,UAA0B,oBAAI,IAAI;AACxC,gBAAM,OAAO,CAAC,iBAAiB;AAC7B,gBAAI,cAAc;AAChB,2BAAa,QAAQ,CAAC,YAAY;AAChC,oBAAI,YAAY,gBAAgB,QAAQ,cAAc;AACpD,0BAAQ,IAAI,OAAO;AAAA,gBACrB;AAAA,cACF,CAAC;AAAA,YACH;AAAA,UACF;AACA,cAAI,SAAS,SAAS;AACpB,oBAAQ,QAAQ,IAAI;AAAA,UACtB,WAAW,QAAQ,YAAY,OAAO,QAAQ,MAAM,GAAG;AACrD,oBAAQ,QAAQ,CAAC,KAAK,SAAS;AAC7B,kBAAI,SAAS,YAAY,QAAQ,UAAU;AACzC,qBAAK,GAAG;AAAA,cACV;AAAA,YACF,CAAC;AAAA,UACH,OAAO;AACL,gBAAI,QAAQ,QAAQ;AAClB,mBAAK,QAAQ,IAAI,GAAG,CAAC;AAAA,YACvB;AACA,oBAAQ;AAAA,mBACD;AACH,oBAAI,CAAC,OAAO,QAAQ,MAAM,GAAG;AAC3B,uBAAK,QAAQ,IAAI,WAAW,CAAC;AAC7B,sBAAI,OAAO,MAAM,MAAM,GAAG;AACxB,yBAAK,QAAQ,IAAI,mBAAmB,CAAC;AAAA,kBACvC;AAAA,gBACF,WAAW,OAAO,aAAa,GAAG,GAAG;AACnC,uBAAK,QAAQ,IAAI,QAAQ,CAAC;AAAA,gBAC5B;AACA;AAAA,mBACG;AACH,oBAAI,CAAC,OAAO,QAAQ,MAAM,GAAG;AAC3B,uBAAK,QAAQ,IAAI,WAAW,CAAC;AAC7B,sBAAI,OAAO,MAAM,MAAM,GAAG;AACxB,yBAAK,QAAQ,IAAI,mBAAmB,CAAC;AAAA,kBACvC;AAAA,gBACF;AACA;AAAA,mBACG;AACH,oBAAI,OAAO,MAAM,MAAM,GAAG;AACxB,uBAAK,QAAQ,IAAI,WAAW,CAAC;AAAA,gBAC/B;AACA;AAAA;AAAA,UAEN;AACA,gBAAM,MAAM,CAAC,YAAY;AACvB,gBAAI,QAAQ,QAAQ,WAAW;AAC7B,sBAAQ,QAAQ,UAAU;AAAA,gBACxB,QAAQ;AAAA,gBACR;AAAA,gBACA;AAAA,gBACA;AAAA,gBACA;AAAA,gBACA;AAAA,gBACA;AAAA,cACF,CAAC;AAAA,YACH;AACA,gBAAI,QAAQ,QAAQ,WAAW;AAC7B,sBAAQ,QAAQ,UAAU,OAAO;AAAA,YACnC,OAAO;AACL,sBAAQ;AAAA,YACV;AAAA,UACF;AACA,kBAAQ,QAAQ,GAAG;AAAA,QACrB;AACA,YAAI,qBAAqC,uBAAO,QAAQ,6BAA6B;AACrF,YAAI,iBAAiB,IAAI,IAAI,OAAO,oBAAoB,MAAM,EAAE,IAAI,CAAC,QAAQ,OAAO,IAAI,EAAE,OAAO,OAAO,QAAQ,CAAC;AACjH,YAAI,OAAuB,6BAAa;AACxC,YAAI,aAA6B,6BAAa,OAAO,IAAI;AACzD,YAAI,cAA8B,6BAAa,IAAI;AACnD,YAAI,qBAAqC,6BAAa,MAAM,IAAI;AAChE,YAAI,wBAAwC,4CAA4B;AACxE,+CAAuC;AACrC,gBAAM,mBAAmB,CAAC;AAC1B,WAAC,YAAY,WAAW,aAAa,EAAE,QAAQ,CAAC,QAAQ;AACtD,6BAAiB,OAAO,YAAY,MAAM;AACxC,oBAAM,MAAM,OAAO,IAAI;AACvB,uBAAS,IAAI,GAAG,IAAI,KAAK,QAAQ,IAAI,GAAG,KAAK;AAC3C,uBAAM,KAAK,OAAO,IAAI,EAAE;AAAA,cAC1B;AACA,oBAAM,MAAM,IAAI,KAAK,GAAG,IAAI;AAC5B,kBAAI,QAAQ,MAAM,QAAQ,OAAO;AAC/B,uBAAO,IAAI,KAAK,GAAG,KAAK,IAAI,MAAM,CAAC;AAAA,cACrC,OAAO;AACL,uBAAO;AAAA,cACT;AAAA,YACF;AAAA,UACF,CAAC;AACD,WAAC,QAAQ,OAAO,SAAS,WAAW,QAAQ,EAAE,QAAQ,CAAC,QAAQ;AAC7D,6BAAiB,OAAO,YAAY,MAAM;AACxC,4BAAc;AACd,oBAAM,MAAM,OAAO,IAAI,EAAE,KAAK,MAAM,MAAM,IAAI;AAC9C,4BAAc;AACd,qBAAO;AAAA,YACT;AAAA,UACF,CAAC;AACD,iBAAO;AAAA,QACT;AACA,8BAAsB,cAAc,OAAO,UAAU,OAAO;AAC1D,iBAAO,cAAc,QAAQ,KAAK,UAAU;AAC1C,gBAAI,QAAQ,kBAAkB;AAC5B,qBAAO,CAAC;AAAA,YACV,WAAW,QAAQ,kBAAkB;AACnC,qBAAO;AAAA,YACT,WAAW,QAAQ,aAAa,aAAc,eAAc,UAAU,qBAAqB,cAAc,UAAU,qBAAqB,aAAa,IAAI,MAAM,GAAG;AAChK,qBAAO;AAAA,YACT;AACA,kBAAM,gBAAgB,OAAO,QAAQ,MAAM;AAC3C,gBAAI,CAAC,eAAe,iBAAiB,OAAO,OAAO,uBAAuB,GAAG,GAAG;AAC9E,qBAAO,QAAQ,IAAI,uBAAuB,KAAK,QAAQ;AAAA,YACzD;AACA,kBAAM,MAAM,QAAQ,IAAI,QAAQ,KAAK,QAAQ;AAC7C,gBAAI,OAAO,SAAS,GAAG,IAAI,eAAe,IAAI,GAAG,IAAI,mBAAmB,GAAG,GAAG;AAC5E,qBAAO;AAAA,YACT;AACA,gBAAI,CAAC,aAAa;AAChB,qBAAM,QAAQ,OAAO,GAAG;AAAA,YAC1B;AACA,gBAAI,SAAS;AACX,qBAAO;AAAA,YACT;AACA,gBAAI,MAAM,GAAG,GAAG;AACd,oBAAM,eAAe,CAAC,iBAAiB,CAAC,OAAO,aAAa,GAAG;AAC/D,qBAAO,eAAe,IAAI,QAAQ;AAAA,YACpC;AACA,gBAAI,OAAO,SAAS,GAAG,GAAG;AACxB,qBAAO,cAAc,SAAS,GAAG,IAAI,UAAU,GAAG;AAAA,YACpD;AACA,mBAAO;AAAA,UACT;AAAA,QACF;AACA,YAAI,OAAuB,6BAAa;AACxC,YAAI,aAA6B,6BAAa,IAAI;AAClD,8BAAsB,UAAU,OAAO;AACrC,iBAAO,cAAc,QAAQ,KAAK,OAAO,UAAU;AACjD,gBAAI,WAAW,OAAO;AACtB,gBAAI,CAAC,SAAS;AACZ,sBAAQ,OAAO,KAAK;AACpB,yBAAW,OAAO,QAAQ;AAC1B,kBAAI,CAAC,OAAO,QAAQ,MAAM,KAAK,MAAM,QAAQ,KAAK,CAAC,MAAM,KAAK,GAAG;AAC/D,yBAAS,QAAQ;AACjB,uBAAO;AAAA,cACT;AAAA,YACF;AACA,kBAAM,SAAS,OAAO,QAAQ,MAAM,KAAK,OAAO,aAAa,GAAG,IAAI,OAAO,GAAG,IAAI,OAAO,SAAS,OAAO,OAAO,QAAQ,GAAG;AAC3H,kBAAM,SAAS,QAAQ,IAAI,QAAQ,KAAK,OAAO,QAAQ;AACvD,gBAAI,WAAW,OAAO,QAAQ,GAAG;AAC/B,kBAAI,CAAC,QAAQ;AACX,yBAAQ,QAAQ,OAAO,KAAK,KAAK;AAAA,cACnC,WAAW,OAAO,WAAW,OAAO,QAAQ,GAAG;AAC7C,yBAAQ,QAAQ,OAAO,KAAK,OAAO,QAAQ;AAAA,cAC7C;AAAA,YACF;AACA,mBAAO;AAAA,UACT;AAAA,QACF;AACA,gCAAwB,QAAQ,KAAK;AACnC,gBAAM,SAAS,OAAO,OAAO,QAAQ,GAAG;AACxC,gBAAM,WAAW,OAAO;AACxB,gBAAM,SAAS,QAAQ,eAAe,QAAQ,GAAG;AACjD,cAAI,UAAU,QAAQ;AACpB,qBAAQ,QAAQ,UAAU,KAAK,QAAQ,QAAQ;AAAA,UACjD;AACA,iBAAO;AAAA,QACT;AACA,qBAAa,QAAQ,KAAK;AACxB,gBAAM,SAAS,QAAQ,IAAI,QAAQ,GAAG;AACtC,cAAI,CAAC,OAAO,SAAS,GAAG,KAAK,CAAC,eAAe,IAAI,GAAG,GAAG;AACrD,mBAAM,QAAQ,OAAO,GAAG;AAAA,UAC1B;AACA,iBAAO;AAAA,QACT;AACA,yBAAiB,QAAQ;AACvB,iBAAM,QAAQ,WAAW,OAAO,QAAQ,MAAM,IAAI,WAAW,WAAW;AACxE,iBAAO,QAAQ,QAAQ,MAAM;AAAA,QAC/B;AACA,YAAI,kBAAkB;AAAA,UACpB,KAAK;AAAA,UACL,KAAK;AAAA,UACL;AAAA,UACA;AAAA,UACA;AAAA,QACF;AACA,YAAI,mBAAmB;AAAA,UACrB,KAAK;AAAA,UACL,IAAI,QAAQ,KAAK;AACf;AACE,sBAAQ,KAAK,yBAAyB,OAAO,GAAG,kCAAkC,MAAM;AAAA,YAC1F;AACA,mBAAO;AAAA,UACT;AAAA,UACA,eAAe,QAAQ,KAAK;AAC1B;AACE,sBAAQ,KAAK,4BAA4B,OAAO,GAAG,kCAAkC,MAAM;AAAA,YAC7F;AACA,mBAAO;AAAA,UACT;AAAA,QACF;AACA,YAAI,0BAA0C,uBAAO,OAAO,CAAC,GAAG,iBAAiB;AAAA,UAC/E,KAAK;AAAA,UACL,KAAK;AAAA,QACP,CAAC;AACD,YAAI,0BAA0C,uBAAO,OAAO,CAAC,GAAG,kBAAkB;AAAA,UAChF,KAAK;AAAA,QACP,CAAC;AACD,YAAI,aAAa,CAAC,UAAU,OAAO,SAAS,KAAK,IAAI,UAAU,KAAK,IAAI;AACxE,YAAI,aAAa,CAAC,UAAU,OAAO,SAAS,KAAK,IAAI,SAAS,KAAK,IAAI;AACvE,YAAI,YAAY,CAAC,UAAU;AAC3B,YAAI,WAAW,CAAC,MAAM,QAAQ,eAAe,CAAC;AAC9C,uBAAe,QAAQ,KAAK,cAAc,OAAO,YAAY,OAAO;AAClE,mBAAS,OACP;AAGF,gBAAM,YAAY,OAAO,MAAM;AAC/B,gBAAM,SAAS,OAAO,GAAG;AACzB,cAAI,QAAQ,QAAQ;AAClB,aAAC,eAAe,OAAM,WAAW,OAAO,GAAG;AAAA,UAC7C;AACA,WAAC,eAAe,OAAM,WAAW,OAAO,MAAM;AAC9C,gBAAM,EAAE,KAAK,SAAS,SAAS,SAAS;AACxC,gBAAM,OAAO,YAAY,YAAY,cAAc,aAAa;AAChE,cAAI,KAAK,KAAK,WAAW,GAAG,GAAG;AAC7B,mBAAO,KAAK,OAAO,IAAI,GAAG,CAAC;AAAA,UAC7B,WAAW,KAAK,KAAK,WAAW,MAAM,GAAG;AACvC,mBAAO,KAAK,OAAO,IAAI,MAAM,CAAC;AAAA,UAChC,WAAW,WAAW,WAAW;AAC/B,mBAAO,IAAI,GAAG;AAAA,UAChB;AAAA,QACF;AACA,uBAAe,KAAK,cAAc,OAAO;AACvC,gBAAM,SAAS,KACb;AAGF,gBAAM,YAAY,OAAO,MAAM;AAC/B,gBAAM,SAAS,OAAO,GAAG;AACzB,cAAI,QAAQ,QAAQ;AAClB,aAAC,eAAe,OAAM,WAAW,OAAO,GAAG;AAAA,UAC7C;AACA,WAAC,eAAe,OAAM,WAAW,OAAO,MAAM;AAC9C,iBAAO,QAAQ,SAAS,OAAO,IAAI,GAAG,IAAI,OAAO,IAAI,GAAG,KAAK,OAAO,IAAI,MAAM;AAAA,QAChF;AACA,sBAAc,QAAQ,cAAc,OAAO;AACzC,mBAAS,OACP;AAGF,WAAC,eAAe,OAAM,OAAO,MAAM,GAAG,WAAW,WAAW;AAC5D,iBAAO,QAAQ,IAAI,QAAQ,QAAQ,MAAM;AAAA,QAC3C;AACA,qBAAa,OAAO;AAClB,kBAAQ,OAAO,KAAK;AACpB,gBAAM,SAAS,OAAO,IAAI;AAC1B,gBAAM,QAAQ,SAAS,MAAM;AAC7B,gBAAM,SAAS,MAAM,IAAI,KAAK,QAAQ,KAAK;AAC3C,cAAI,CAAC,QAAQ;AACX,mBAAO,IAAI,KAAK;AAChB,qBAAQ,QAAQ,OAAO,OAAO,KAAK;AAAA,UACrC;AACA,iBAAO;AAAA,QACT;AACA,uBAAe,KAAK,OAAO;AACzB,kBAAQ,OAAO,KAAK;AACpB,gBAAM,SAAS,OAAO,IAAI;AAC1B,gBAAM,EAAE,KAAK,MAAM,KAAK,SAAS,SAAS,MAAM;AAChD,cAAI,SAAS,KAAK,KAAK,QAAQ,GAAG;AAClC,cAAI,CAAC,QAAQ;AACX,kBAAM,OAAO,GAAG;AAChB,qBAAS,KAAK,KAAK,QAAQ,GAAG;AAAA,UAChC,OAAO;AACL,8BAAkB,QAAQ,MAAM,GAAG;AAAA,UACrC;AACA,gBAAM,WAAW,KAAK,KAAK,QAAQ,GAAG;AACtC,iBAAO,IAAI,KAAK,KAAK;AACrB,cAAI,CAAC,QAAQ;AACX,qBAAQ,QAAQ,OAAO,KAAK,KAAK;AAAA,UACnC,WAAW,OAAO,WAAW,OAAO,QAAQ,GAAG;AAC7C,qBAAQ,QAAQ,OAAO,KAAK,OAAO,QAAQ;AAAA,UAC7C;AACA,iBAAO;AAAA,QACT;AACA,6BAAqB,KAAK;AACxB,gBAAM,SAAS,OAAO,IAAI;AAC1B,gBAAM,EAAE,KAAK,MAAM,KAAK,SAAS,SAAS,MAAM;AAChD,cAAI,SAAS,KAAK,KAAK,QAAQ,GAAG;AAClC,cAAI,CAAC,QAAQ;AACX,kBAAM,OAAO,GAAG;AAChB,qBAAS,KAAK,KAAK,QAAQ,GAAG;AAAA,UAChC,OAAO;AACL,8BAAkB,QAAQ,MAAM,GAAG;AAAA,UACrC;AACA,gBAAM,WAAW,OAAO,KAAK,KAAK,QAAQ,GAAG,IAAI;AACjD,gBAAM,SAAS,OAAO,OAAO,GAAG;AAChC,cAAI,QAAQ;AACV,qBAAQ,QAAQ,UAAU,KAAK,QAAQ,QAAQ;AAAA,UACjD;AACA,iBAAO;AAAA,QACT;AACA,yBAAiB;AACf,gBAAM,SAAS,OAAO,IAAI;AAC1B,gBAAM,WAAW,OAAO,SAAS;AACjC,gBAAM,YAAY,OAAO,MAAM,MAAM,IAAI,IAAI,IAAI,MAAM,IAAI,IAAI,IAAI,MAAM;AACzE,gBAAM,SAAS,OAAO,MAAM;AAC5B,cAAI,UAAU;AACZ,qBAAQ,QAAQ,SAAS,QAAQ,QAAQ,SAAS;AAAA,UACpD;AACA,iBAAO;AAAA,QACT;AACA,+BAAuB,aAAa,WAAW;AAC7C,iBAAO,iBAAiB,UAAU,SAAS;AACzC,kBAAM,WAAW;AACjB,kBAAM,SAAS,SACb;AAGF,kBAAM,YAAY,OAAO,MAAM;AAC/B,kBAAM,OAAO,YAAY,YAAY,cAAc,aAAa;AAChE,aAAC,eAAe,OAAM,WAAW,WAAW,WAAW;AACvD,mBAAO,OAAO,QAAQ,CAAC,OAAO,QAAQ;AACpC,qBAAO,SAAS,KAAK,SAAS,KAAK,KAAK,GAAG,KAAK,GAAG,GAAG,QAAQ;AAAA,YAChE,CAAC;AAAA,UACH;AAAA,QACF;AACA,sCAA8B,QAAQ,aAAa,WAAW;AAC5D,iBAAO,YAAY,MAAM;AACvB,kBAAM,SAAS,KACb;AAGF,kBAAM,YAAY,OAAO,MAAM;AAC/B,kBAAM,cAAc,OAAO,MAAM,SAAS;AAC1C,kBAAM,SAAS,WAAW,aAAa,WAAW,OAAO,YAAY;AACrE,kBAAM,YAAY,WAAW,UAAU;AACvC,kBAAM,gBAAgB,OAAO,QAAQ,GAAG,IAAI;AAC5C,kBAAM,OAAO,YAAY,YAAY,cAAc,aAAa;AAChE,aAAC,eAAe,OAAM,WAAW,WAAW,YAAY,sBAAsB,WAAW;AACzF,mBAAO;AAAA,cAEL,OAAO;AACL,sBAAM,EAAE,OAAO,SAAS,cAAc,KAAK;AAC3C,uBAAO,OAAO,EAAE,OAAO,KAAK,IAAI;AAAA,kBAC9B,OAAO,SAAS,CAAC,KAAK,MAAM,EAAE,GAAG,KAAK,MAAM,EAAE,CAAC,IAAI,KAAK,KAAK;AAAA,kBAC7D;AAAA,gBACF;AAAA,cACF;AAAA,cAEA,CAAC,OAAO,YAAY;AAClB,uBAAO;AAAA,cACT;AAAA,YACF;AAAA,UACF;AAAA,QACF;AACA,sCAA8B,MAAM;AAClC,iBAAO,YAAY,MAAM;AACvB;AACE,oBAAM,MAAM,KAAK,KAAK,WAAW,KAAK,SAAS;AAC/C,sBAAQ,KAAK,GAAG,OAAO,WAAW,IAAI,eAAe,kCAAkC,OAAO,IAAI,CAAC;AAAA,YACrG;AACA,mBAAO,SAAS,WAAW,QAAQ;AAAA,UACrC;AAAA,QACF;AACA,0CAAkC;AAChC,gBAAM,2BAA2B;AAAA,YAC/B,IAAI,KAAK;AACP,qBAAO,MAAM,MAAM,GAAG;AAAA,YACxB;AAAA,YACA,IAAI,OAAO;AACT,qBAAO,KAAK,IAAI;AAAA,YAClB;AAAA,YACA,KAAK;AAAA,YACL;AAAA,YACA,KAAK;AAAA,YACL,QAAQ;AAAA,YACR;AAAA,YACA,SAAS,cAAc,OAAO,KAAK;AAAA,UACrC;AACA,gBAAM,2BAA2B;AAAA,YAC/B,IAAI,KAAK;AACP,qBAAO,MAAM,MAAM,KAAK,OAAO,IAAI;AAAA,YACrC;AAAA,YACA,IAAI,OAAO;AACT,qBAAO,KAAK,IAAI;AAAA,YAClB;AAAA,YACA,KAAK;AAAA,YACL;AAAA,YACA,KAAK;AAAA,YACL,QAAQ;AAAA,YACR;AAAA,YACA,SAAS,cAAc,OAAO,IAAI;AAAA,UACpC;AACA,gBAAM,4BAA4B;AAAA,YAChC,IAAI,KAAK;AACP,qBAAO,MAAM,MAAM,KAAK,IAAI;AAAA,YAC9B;AAAA,YACA,IAAI,OAAO;AACT,qBAAO,KAAK,MAAM,IAAI;AAAA,YACxB;AAAA,YACA,IAAI,KAAK;AACP,qBAAO,MAAM,KAAK,MAAM,KAAK,IAAI;AAAA,YACnC;AAAA,YACA,KAAK,qBACH,KAEF;AAAA,YACA,KAAK,qBACH,KAEF;AAAA,YACA,QAAQ,qBACN,QAEF;AAAA,YACA,OAAO,qBACL,OAEF;AAAA,YACA,SAAS,cAAc,MAAM,KAAK;AAAA,UACpC;AACA,gBAAM,mCAAmC;AAAA,YACvC,IAAI,KAAK;AACP,qBAAO,MAAM,MAAM,KAAK,MAAM,IAAI;AAAA,YACpC;AAAA,YACA,IAAI,OAAO;AACT,qBAAO,KAAK,MAAM,IAAI;AAAA,YACxB;AAAA,YACA,IAAI,KAAK;AACP,qBAAO,MAAM,KAAK,MAAM,KAAK,IAAI;AAAA,YACnC;AAAA,YACA,KAAK,qBACH,KAEF;AAAA,YACA,KAAK,qBACH,KAEF;AAAA,YACA,QAAQ,qBACN,QAEF;AAAA,YACA,OAAO,qBACL,OAEF;AAAA,YACA,SAAS,cAAc,MAAM,IAAI;AAAA,UACnC;AACA,gBAAM,kBAAkB,CAAC,QAAQ,UAAU,WAAW,OAAO,QAAQ;AACrE,0BAAgB,QAAQ,CAAC,WAAW;AAClC,qCAAyB,UAAU,qBAAqB,QAAQ,OAAO,KAAK;AAC5E,sCAA0B,UAAU,qBAAqB,QAAQ,MAAM,KAAK;AAC5E,qCAAyB,UAAU,qBAAqB,QAAQ,OAAO,IAAI;AAC3E,6CAAiC,UAAU,qBAAqB,QAAQ,MAAM,IAAI;AAAA,UACpF,CAAC;AACD,iBAAO;AAAA,YACL;AAAA,YACA;AAAA,YACA;AAAA,YACA;AAAA,UACF;AAAA,QACF;AACA,YAAI,CAAC,yBAAyB,0BAA0B,yBAAyB,mCAAmD,uCAAuB;AAC3J,6CAAqC,aAAa,SAAS;AACzD,gBAAM,mBAAmB,UAAU,cAAc,kCAAkC,0BAA0B,cAAc,2BAA2B;AACtJ,iBAAO,CAAC,QAAQ,KAAK,aAAa;AAChC,gBAAI,QAAQ,kBAAkB;AAC5B,qBAAO,CAAC;AAAA,YACV,WAAW,QAAQ,kBAAkB;AACnC,qBAAO;AAAA,YACT,WAAW,QAAQ,WAAW;AAC5B,qBAAO;AAAA,YACT;AACA,mBAAO,QAAQ,IAAI,OAAO,OAAO,kBAAkB,GAAG,KAAK,OAAO,SAAS,mBAAmB,QAAQ,KAAK,QAAQ;AAAA,UACrH;AAAA,QACF;AACA,YAAI,4BAA4B;AAAA,UAC9B,KAAqB,4CAA4B,OAAO,KAAK;AAAA,QAC/D;AACA,YAAI,4BAA4B;AAAA,UAC9B,KAAqB,4CAA4B,OAAO,IAAI;AAAA,QAC9D;AACA,YAAI,6BAA6B;AAAA,UAC/B,KAAqB,4CAA4B,MAAM,KAAK;AAAA,QAC9D;AACA,YAAI,oCAAoC;AAAA,UACtC,KAAqB,4CAA4B,MAAM,IAAI;AAAA,QAC7D;AACA,mCAA2B,QAAQ,MAAM,KAAK;AAC5C,gBAAM,SAAS,OAAO,GAAG;AACzB,cAAI,WAAW,OAAO,KAAK,KAAK,QAAQ,MAAM,GAAG;AAC/C,kBAAM,OAAO,OAAO,UAAU,MAAM;AACpC,oBAAQ,KAAK,YAAY,sEAAsE,SAAS,QAAQ,aAAa,gKAAgK;AAAA,UAC/R;AAAA,QACF;AACA,YAAI,cAA8B,oBAAI,QAAQ;AAC9C,YAAI,qBAAqC,oBAAI,QAAQ;AACrD,YAAI,cAA8B,oBAAI,QAAQ;AAC9C,YAAI,qBAAqC,oBAAI,QAAQ;AACrD,+BAAuB,SAAS;AAC9B,kBAAQ;AAAA,iBACD;AAAA,iBACA;AACH,qBAAO;AAAA,iBACJ;AAAA,iBACA;AAAA,iBACA;AAAA,iBACA;AACH,qBAAO;AAAA;AAEP,qBAAO;AAAA;AAAA,QAEb;AACA,+BAAuB,OAAO;AAC5B,iBAAO,MACL,eAEG,CAAC,OAAO,aAAa,KAAK,IAAI,IAAI,cAAc,OAAO,UAAU,KAAK,CAAC;AAAA,QAC9E;AACA,2BAAmB,QAAQ;AACzB,cAAI,UAAU,OACZ,mBAEC;AACD,mBAAO;AAAA,UACT;AACA,iBAAO,qBAAqB,QAAQ,OAAO,iBAAiB,2BAA2B,WAAW;AAAA,QACpG;AACA,iCAAyB,QAAQ;AAC/B,iBAAO,qBAAqB,QAAQ,OAAO,yBAAyB,2BAA2B,kBAAkB;AAAA,QACnH;AACA,0BAAkB,QAAQ;AACxB,iBAAO,qBAAqB,QAAQ,MAAM,kBAAkB,4BAA4B,WAAW;AAAA,QACrG;AACA,iCAAyB,QAAQ;AAC/B,iBAAO,qBAAqB,QAAQ,MAAM,yBAAyB,mCAAmC,kBAAkB;AAAA,QAC1H;AACA,sCAA8B,QAAQ,aAAa,cAAc,oBAAoB,UAAU;AAC7F,cAAI,CAAC,OAAO,SAAS,MAAM,GAAG;AAC5B;AACE,sBAAQ,KAAK,kCAAkC,OAAO,MAAM,GAAG;AAAA,YACjE;AACA,mBAAO;AAAA,UACT;AACA,cAAI,OACF,cAEG,CAAE,gBAAe,OACpB,oBAEE;AACF,mBAAO;AAAA,UACT;AACA,gBAAM,gBAAgB,SAAS,IAAI,MAAM;AACzC,cAAI,eAAe;AACjB,mBAAO;AAAA,UACT;AACA,gBAAM,aAAa,cAAc,MAAM;AACvC,cAAI,eAAe,GAAG;AACpB,mBAAO;AAAA,UACT;AACA,gBAAM,QAAQ,IAAI,MAAM,QAAQ,eAAe,IAAI,qBAAqB,YAAY;AACpF,mBAAS,IAAI,QAAQ,KAAK;AAC1B,iBAAO;AAAA,QACT;AACA,6BAAqB,OAAO;AAC1B,cAAI,WAAW,KAAK,GAAG;AACrB,mBAAO,YAAY,MACjB,UAED;AAAA,UACH;AACA,iBAAO,CAAC,CAAE,UAAS,MACjB;AAAA,QAGJ;AACA,4BAAoB,OAAO;AACzB,iBAAO,CAAC,CAAE,UAAS,MACjB;AAAA,QAGJ;AACA,yBAAiB,OAAO;AACtB,iBAAO,YAAY,KAAK,KAAK,WAAW,KAAK;AAAA,QAC/C;AACA,wBAAgB,UAAU;AACxB,iBAAO,YAAY,OAAO,SACxB,UAED,KAAK;AAAA,QACR;AACA,yBAAiB,OAAO;AACtB,iBAAO,IAAI,OAAO,YAAY,IAAI;AAClC,iBAAO;AAAA,QACT;AACA,YAAI,UAAU,CAAC,QAAQ,OAAO,SAAS,GAAG,IAAI,UAAU,GAAG,IAAI;AAC/D,uBAAe,GAAG;AAChB,iBAAO,QAAQ,KAAK,EAAE,cAAc,IAAI;AAAA,QAC1C;AACA,qBAAa,OAAO;AAClB,iBAAO,UAAU,KAAK;AAAA,QACxB;AACA,4BAAoB,OAAO;AACzB,iBAAO,UAAU,OAAO,IAAI;AAAA,QAC9B;AACA,YAAI,UAAU,MAAM;AAAA,UAClB,YAAY,OAAO,WAAW,OAAO;AACnC,iBAAK,WAAW;AAChB,iBAAK,YAAY;AACjB,iBAAK,YAAY,WAAW,QAAQ,OAAO,KAAK;AAChD,iBAAK,SAAS,WAAW,QAAQ,QAAQ,KAAK;AAAA,UAChD;AAAA,UACA,IAAI,QAAQ;AACV,mBAAM,OAAO,IAAI,GAAG,OAAO,OAAO;AAClC,mBAAO,KAAK;AAAA,UACd;AAAA,UACA,IAAI,MAAM,QAAQ;AAChB,qBAAS,KAAK,WAAW,SAAS,OAAO,MAAM;AAC/C,gBAAI,OAAO,WAAW,QAAQ,KAAK,SAAS,GAAG;AAC7C,mBAAK,YAAY;AACjB,mBAAK,SAAS,KAAK,WAAW,SAAS,QAAQ,MAAM;AACrD,uBAAQ,OAAO,IAAI,GAAG,OAAO,SAAS,MAAM;AAAA,YAC9C;AAAA,UACF;AAAA,QACF;AACA,2BAAmB,UAAU,UAAU,OAAO;AAC5C,cAAI,MAAM,QAAQ,GAAG;AACnB,mBAAO;AAAA,UACT;AACA,iBAAO,IAAI,QAAQ,UAAU,OAAO;AAAA,QACtC;AACA,4BAAoB,MAAM;AACxB,mBAAQ,OAAO,IAAI,GAAG,OAAO,SAAS,KAAK,KAAK;AAAA,QAClD;AACA,uBAAe,MAAM;AACnB,iBAAO,MAAM,IAAI,IAAI,KAAK,QAAQ;AAAA,QACpC;AACA,YAAI,wBAAwB;AAAA,UAC1B,KAAK,CAAC,QAAQ,KAAK,aAAa,MAAM,QAAQ,IAAI,QAAQ,KAAK,QAAQ,CAAC;AAAA,UACxE,KAAK,CAAC,QAAQ,KAAK,OAAO,aAAa;AACrC,kBAAM,WAAW,OAAO;AACxB,gBAAI,MAAM,QAAQ,KAAK,CAAC,MAAM,KAAK,GAAG;AACpC,uBAAS,QAAQ;AACjB,qBAAO;AAAA,YACT,OAAO;AACL,qBAAO,QAAQ,IAAI,QAAQ,KAAK,OAAO,QAAQ;AAAA,YACjD;AAAA,UACF;AAAA,QACF;AACA,2BAAmB,gBAAgB;AACjC,iBAAO,YAAY,cAAc,IAAI,iBAAiB,IAAI,MAAM,gBAAgB,qBAAqB;AAAA,QACvG;AACA,YAAI,gBAAgB,MAAM;AAAA,UACxB,YAAY,SAAS;AACnB,iBAAK,YAAY;AACjB,kBAAM,EAAE,KAAK,MAAM,KAAK,SAAS,QAAQ,MAAM,OAAM,MAAM,OAAO,OAAO,GAAG,MAAM,SAAQ,MAAM,OAAO,OAAO,CAAC;AAC/G,iBAAK,OAAO;AACZ,iBAAK,OAAO;AAAA,UACd;AAAA,UACA,IAAI,QAAQ;AACV,mBAAO,KAAK,KAAK;AAAA,UACnB;AAAA,UACA,IAAI,MAAM,QAAQ;AAChB,iBAAK,KAAK,MAAM;AAAA,UAClB;AAAA,QACF;AACA,2BAAmB,SAAS;AAC1B,iBAAO,IAAI,cAAc,OAAO;AAAA,QAClC;AACA,wBAAgB,QAAQ;AACtB,cAAI,CAAC,QAAQ,MAAM,GAAG;AACpB,oBAAQ,KAAK,8DAA8D;AAAA,UAC7E;AACA,gBAAM,MAAM,OAAO,QAAQ,MAAM,IAAI,IAAI,MAAM,OAAO,MAAM,IAAI,CAAC;AACjE,qBAAW,OAAO,QAAQ;AACxB,gBAAI,OAAO,MAAM,QAAQ,GAAG;AAAA,UAC9B;AACA,iBAAO;AAAA,QACT;AACA,YAAI,gBAAgB,MAAM;AAAA,UACxB,YAAY,SAAS,MAAM;AACzB,iBAAK,UAAU;AACf,iBAAK,OAAO;AACZ,iBAAK,YAAY;AAAA,UACnB;AAAA,UACA,IAAI,QAAQ;AACV,mBAAO,KAAK,QAAQ,KAAK;AAAA,UAC3B;AAAA,UACA,IAAI,MAAM,QAAQ;AAChB,iBAAK,QAAQ,KAAK,QAAQ;AAAA,UAC5B;AAAA,QACF;AACA,uBAAe,QAAQ,KAAK;AAC1B,iBAAO,MAAM,OAAO,IAAI,IAAI,OAAO,OAAO,IAAI,cAAc,QAAQ,GAAG;AAAA,QACzE;AACA,YAAI,kBAAkB,MAAM;AAAA,UAC1B,YAAY,QAAQ,SAAS,aAAa;AACxC,iBAAK,UAAU;AACf,iBAAK,SAAS;AACd,iBAAK,YAAY;AACjB,iBAAK,SAAS,QAAQ,QAAQ;AAAA,cAC5B,MAAM;AAAA,cACN,WAAW,MAAM;AACf,oBAAI,CAAC,KAAK,QAAQ;AAChB,uBAAK,SAAS;AACd,2BAAQ,OAAO,IAAI,GAAG,OAAO,OAAO;AAAA,gBACtC;AAAA,cACF;AAAA,YACF,CAAC;AACD,iBACE,oBAEE;AAAA,UACN;AAAA,UACA,IAAI,QAAQ;AACV,kBAAM,QAAQ,OAAO,IAAI;AACzB,gBAAI,MAAM,QAAQ;AAChB,oBAAM,SAAS,KAAK,OAAO;AAC3B,oBAAM,SAAS;AAAA,YACjB;AACA,mBAAM,OAAO,OAAO,OAAO;AAC3B,mBAAO,MAAM;AAAA,UACf;AAAA,UACA,IAAI,MAAM,UAAU;AAClB,iBAAK,QAAQ,QAAQ;AAAA,UACvB;AAAA,QACF;AACA,0BAAkB,iBAAiB;AACjC,cAAI;AACJ,cAAI;AACJ,cAAI,OAAO,WAAW,eAAe,GAAG;AACtC,qBAAS;AACT,qBAAS,MAAM;AACb,sBAAQ,KAAK,oDAAoD;AAAA,YACnE;AAAA,UACF,OAAO;AACL,qBAAS,gBAAgB;AACzB,qBAAS,gBAAgB;AAAA,UAC3B;AACA,iBAAO,IAAI,gBAAgB,QAAQ,QAAQ,OAAO,WAAW,eAAe,KAAK,CAAC,gBAAgB,GAAG;AAAA,QACvG;AACA,iBAAQ,cAAc;AACtB,iBAAQ,WAAW;AACnB,iBAAQ,YAAY;AACpB,iBAAQ,SAAS;AACjB,iBAAQ,iBAAiB;AACzB,iBAAQ,UAAU;AAClB,iBAAQ,aAAa;AACrB,iBAAQ,aAAa;AACrB,iBAAQ,QAAQ;AAChB,iBAAQ,UAAU;AAClB,iBAAQ,gBAAgB;AACxB,iBAAQ,YAAY;AACpB,iBAAQ,WAAW;AACnB,iBAAQ,WAAW;AACnB,iBAAQ,MAAM;AACd,iBAAQ,gBAAgB;AACxB,iBAAQ,kBAAkB;AAC1B,iBAAQ,kBAAkB;AAC1B,iBAAQ,aAAa;AACrB,iBAAQ,OAAO;AACf,iBAAQ,QAAQ;AAChB,iBAAQ,QAAQ;AAChB,iBAAQ,SAAS;AACjB,iBAAQ,QAAQ;AAChB,iBAAQ,UAAU;AAClB,iBAAQ,aAAa;AACrB,iBAAQ,QAAQ;AAAA,MAClB;AAAA,IACF,CAAC;AAGD,QAAI,qBAAqB,YAAW;AAAA,MAClC,wCAAwC,UAAS,SAAS;AACxD;AACA,YAAI,OAAO;AACT,kBAAQ,UAAU;AAAA,QACpB,OAAO;AACL,kBAAQ,UAAU,uBAAuB;AAAA,QAC3C;AAAA,MACF;AAAA,IACF,CAAC;AAGD,QAAI,iBAAiB,CAAC;AACtB,aAAS,gBAAgB;AAAA,MACvB,QAAQ,MAAM;AAAA,MACd,SAAS,MAAM;AAAA,IACjB,CAAC;AACD,WAAO,UAAU,aAAa,cAAc;AAG5C,QAAI,eAAe;AACnB,QAAI,WAAW;AACf,QAAI,QAAQ,CAAC;AACb,QAAI,mBAAmB;AACvB,uBAAmB,UAAU;AAC3B,eAAS,QAAQ;AAAA,IACnB;AACA,sBAAkB,KAAK;AACrB,UAAI,CAAC,MAAM,SAAS,GAAG;AACrB,cAAM,KAAK,GAAG;AAChB,iBAAW;AAAA,IACb;AACA,wBAAoB,KAAK;AACvB,UAAI,QAAQ,MAAM,QAAQ,GAAG;AAC7B,UAAI,UAAU,MAAM,QAAQ;AAC1B,cAAM,OAAO,OAAO,CAAC;AAAA,IACzB;AACA,0BAAsB;AACpB,UAAI,CAAC,YAAY,CAAC,cAAc;AAC9B,uBAAe;AACf,uBAAe,SAAS;AAAA,MAC1B;AAAA,IACF;AACA,yBAAqB;AACnB,qBAAe;AACf,iBAAW;AACX,eAAS,IAAI,GAAG,IAAI,MAAM,QAAQ,KAAK;AACrC,cAAM,GAAG;AACT,2BAAmB;AAAA,MACrB;AACA,YAAM,SAAS;AACf,yBAAmB;AACnB,iBAAW;AAAA,IACb;AAGA,QAAI;AACJ,QAAI;AACJ,QAAI;AACJ,QAAI;AACJ,QAAI,iBAAiB;AACrB,qCAAiC,UAAU;AACzC,uBAAiB;AACjB,eAAS;AACT,uBAAiB;AAAA,IACnB;AACA,iCAA6B,QAAQ;AACnC,iBAAW,OAAO;AAClB,gBAAU,OAAO;AACjB,eAAS,CAAC,aAAa,OAAO,OAAO,UAAU,EAAE,WAAW,CAAC,SAAS;AACpE,YAAI,gBAAgB;AAClB,oBAAU,IAAI;AAAA,QAChB,OAAO;AACL,eAAK;AAAA,QACP;AAAA,MACF,EAAE,CAAC;AACH,YAAM,OAAO;AAAA,IACf;AACA,4BAAwB,UAAU;AAChC,eAAS;AAAA,IACX;AACA,gCAA4B,IAAI;AAC9B,UAAI,UAAU,MAAM;AAAA,MACpB;AACA,UAAI,gBAAgB,CAAC,aAAa;AAChC,YAAI,kBAAkB,OAAO,QAAQ;AACrC,YAAI,CAAC,GAAG,YAAY;AAClB,aAAG,aAA6B,oBAAI,IAAI;AACxC,aAAG,gBAAgB,MAAM;AACvB,eAAG,WAAW,QAAQ,CAAC,MAAM,EAAE,CAAC;AAAA,UAClC;AAAA,QACF;AACA,WAAG,WAAW,IAAI,eAAe;AACjC,kBAAU,MAAM;AACd,cAAI,oBAAoB;AACtB;AACF,aAAG,WAAW,OAAO,eAAe;AACpC,kBAAQ,eAAe;AAAA,QACzB;AACA,eAAO;AAAA,MACT;AACA,aAAO,CAAC,eAAe,MAAM;AAC3B,gBAAQ;AAAA,MACV,CAAC;AAAA,IACH;AACA,mBAAe,QAAQ,UAAU;AAC/B,UAAI,YAAY;AAChB,UAAI;AACJ,UAAI,kBAAkB,OAAO,MAAM;AACjC,YAAI,QAAQ,OAAO;AACnB,aAAK,UAAU,KAAK;AACpB,YAAI,CAAC,WAAW;AACd,yBAAe,MAAM;AACnB,qBAAS,OAAO,QAAQ;AACxB,uBAAW;AAAA,UACb,CAAC;AAAA,QACH,OAAO;AACL,qBAAW;AAAA,QACb;AACA,oBAAY;AAAA,MACd,CAAC;AACD,aAAO,MAAM,QAAQ,eAAe;AAAA,IACtC;AAGA,QAAI,oBAAoB,CAAC;AACzB,QAAI,eAAe,CAAC;AACpB,QAAI,aAAa,CAAC;AAClB,uBAAmB,UAAU;AAC3B,iBAAW,KAAK,QAAQ;AAAA,IAC1B;AACA,yBAAqB,IAAI,UAAU;AACjC,UAAI,OAAO,aAAa,YAAY;AAClC,YAAI,CAAC,GAAG;AACN,aAAG,cAAc,CAAC;AACpB,WAAG,YAAY,KAAK,QAAQ;AAAA,MAC9B,OAAO;AACL,mBAAW;AACX,qBAAa,KAAK,QAAQ;AAAA,MAC5B;AAAA,IACF;AACA,+BAA2B,UAAU;AACnC,wBAAkB,KAAK,QAAQ;AAAA,IACjC;AACA,gCAA4B,IAAI,MAAM,UAAU;AAC9C,UAAI,CAAC,GAAG;AACN,WAAG,uBAAuB,CAAC;AAC7B,UAAI,CAAC,GAAG,qBAAqB;AAC3B,WAAG,qBAAqB,QAAQ,CAAC;AACnC,SAAG,qBAAqB,MAAM,KAAK,QAAQ;AAAA,IAC7C;AACA,+BAA2B,IAAI,OAAO;AACpC,UAAI,CAAC,GAAG;AACN;AACF,aAAO,QAAQ,GAAG,oBAAoB,EAAE,QAAQ,CAAC,CAAC,MAAM,WAAW;AACjE,YAAI,UAAU,UAAU,MAAM,SAAS,IAAI,GAAG;AAC5C,gBAAM,QAAQ,CAAC,MAAM,EAAE,CAAC;AACxB,iBAAO,GAAG,qBAAqB;AAAA,QACjC;AAAA,MACF,CAAC;AAAA,IACH;AACA,4BAAwB,IAAI;AAC1B,UAAI,IAAI;AACR,MAAC,MAAK,GAAG,eAAe,OAAO,SAAS,GAAG,QAAQ,UAAU;AAC7D,aAAQ,MAAK,GAAG,gBAAgB,OAAO,SAAS,GAAG;AACjD,WAAG,YAAY,IAAI,EAAE;AAAA,IACzB;AACA,QAAI,WAAW,IAAI,iBAAiB,QAAQ;AAC5C,QAAI,qBAAqB;AACzB,uCAAmC;AACjC,eAAS,QAAQ,UAAU,EAAE,SAAS,MAAM,WAAW,MAAM,YAAY,MAAM,mBAAmB,KAAK,CAAC;AACxG,2BAAqB;AAAA,IACvB;AACA,sCAAkC;AAChC,oBAAc;AACd,eAAS,WAAW;AACpB,2BAAqB;AAAA,IACvB;AACA,QAAI,kBAAkB,CAAC;AACvB,6BAAyB;AACvB,UAAI,UAAU,SAAS,YAAY;AACnC,sBAAgB,KAAK,MAAM,QAAQ,SAAS,KAAK,SAAS,OAAO,CAAC;AAClE,UAAI,2BAA2B,gBAAgB;AAC/C,qBAAe,MAAM;AACnB,YAAI,gBAAgB,WAAW,0BAA0B;AACvD,iBAAO,gBAAgB,SAAS;AAC9B,4BAAgB,MAAM,EAAE;AAAA,QAC5B;AAAA,MACF,CAAC;AAAA,IACH;AACA,uBAAmB,UAAU;AAC3B,UAAI,CAAC;AACH,eAAO,SAAS;AAClB,6BAAuB;AACvB,UAAI,SAAS,SAAS;AACtB,8BAAwB;AACxB,aAAO;AAAA,IACT;AACA,QAAI,eAAe;AACnB,QAAI,oBAAoB,CAAC;AACzB,8BAA0B;AACxB,qBAAe;AAAA,IACjB;AACA,8CAA0C;AACxC,qBAAe;AACf,eAAS,iBAAiB;AAC1B,0BAAoB,CAAC;AAAA,IACvB;AACA,sBAAkB,WAAW;AAC3B,UAAI,cAAc;AAChB,4BAAoB,kBAAkB,OAAO,SAAS;AACtD;AAAA,MACF;AACA,UAAI,aAAa,CAAC;AAClB,UAAI,eAA+B,oBAAI,IAAI;AAC3C,UAAI,kBAAkC,oBAAI,IAAI;AAC9C,UAAI,oBAAoC,oBAAI,IAAI;AAChD,eAAS,IAAI,GAAG,IAAI,UAAU,QAAQ,KAAK;AACzC,YAAI,UAAU,GAAG,OAAO;AACtB;AACF,YAAI,UAAU,GAAG,SAAS,aAAa;AACrC,oBAAU,GAAG,aAAa,QAAQ,CAAC,SAAS;AAC1C,gBAAI,KAAK,aAAa;AACpB;AACF,gBAAI,CAAC,KAAK;AACR;AACF,yBAAa,IAAI,IAAI;AAAA,UACvB,CAAC;AACD,oBAAU,GAAG,WAAW,QAAQ,CAAC,SAAS;AACxC,gBAAI,KAAK,aAAa;AACpB;AACF,gBAAI,aAAa,IAAI,IAAI,GAAG;AAC1B,2BAAa,OAAO,IAAI;AACxB;AAAA,YACF;AACA,gBAAI,KAAK;AACP;AACF,uBAAW,KAAK,IAAI;AAAA,UACtB,CAAC;AAAA,QACH;AACA,YAAI,UAAU,GAAG,SAAS,cAAc;AACtC,cAAI,KAAK,UAAU,GAAG;AACtB,cAAI,OAAO,UAAU,GAAG;AACxB,cAAI,WAAW,UAAU,GAAG;AAC5B,cAAI,MAAM,MAAM;AACd,gBAAI,CAAC,gBAAgB,IAAI,EAAE;AACzB,8BAAgB,IAAI,IAAI,CAAC,CAAC;AAC5B,4BAAgB,IAAI,EAAE,EAAE,KAAK,EAAE,MAAM,OAAO,GAAG,aAAa,IAAI,EAAE,CAAC;AAAA,UACrE;AACA,cAAI,SAAS,MAAM;AACjB,gBAAI,CAAC,kBAAkB,IAAI,EAAE;AAC3B,gCAAkB,IAAI,IAAI,CAAC,CAAC;AAC9B,8BAAkB,IAAI,EAAE,EAAE,KAAK,IAAI;AAAA,UACrC;AACA,cAAI,GAAG,aAAa,IAAI,KAAK,aAAa,MAAM;AAC9C,gBAAI;AAAA,UACN,WAAW,GAAG,aAAa,IAAI,GAAG;AAChC,mBAAO;AACP,gBAAI;AAAA,UACN,OAAO;AACL,mBAAO;AAAA,UACT;AAAA,QACF;AAAA,MACF;AACA,wBAAkB,QAAQ,CAAC,OAAO,OAAO;AACvC,0BAAkB,IAAI,KAAK;AAAA,MAC7B,CAAC;AACD,sBAAgB,QAAQ,CAAC,OAAO,OAAO;AACrC,0BAAkB,QAAQ,CAAC,MAAM,EAAE,IAAI,KAAK,CAAC;AAAA,MAC/C,CAAC;AACD,eAAS,QAAQ,cAAc;AAC7B,YAAI,WAAW,KAAK,CAAC,MAAM,EAAE,SAAS,IAAI,CAAC;AACzC;AACF,qBAAa,QAAQ,CAAC,MAAM,EAAE,IAAI,CAAC;AAAA,MACrC;AACA,eAAS,QAAQ,YAAY;AAC3B,YAAI,CAAC,KAAK;AACR;AACF,mBAAW,QAAQ,CAAC,MAAM,EAAE,IAAI,CAAC;AAAA,MACnC;AACA,mBAAa;AACb,qBAAe;AACf,wBAAkB;AAClB,0BAAoB;AAAA,IACtB;AAGA,mBAAe,MAAM;AACnB,aAAO,aAAa,iBAAiB,IAAI,CAAC;AAAA,IAC5C;AACA,4BAAwB,MAAM,OAAO,eAAe;AAClD,WAAK,eAAe,CAAC,OAAO,GAAG,iBAAiB,iBAAiB,IAAI,CAAC;AACtE,aAAO,MAAM;AACX,aAAK,eAAe,KAAK,aAAa,OAAO,CAAC,MAAM,MAAM,KAAK;AAAA,MACjE;AAAA,IACF;AACA,8BAA0B,MAAM;AAC9B,UAAI,KAAK;AACP,eAAO,KAAK;AACd,UAAI,OAAO,eAAe,cAAc,gBAAgB,YAAY;AAClE,eAAO,iBAAiB,KAAK,IAAI;AAAA,MACnC;AACA,UAAI,CAAC,KAAK,YAAY;AACpB,eAAO,CAAC;AAAA,MACV;AACA,aAAO,iBAAiB,KAAK,UAAU;AAAA,IACzC;AACA,0BAAsB,SAAS;AAC7B,aAAO,IAAI,MAAM,EAAE,QAAQ,GAAG,cAAc;AAAA,IAC9C;AACA,QAAI,iBAAiB;AAAA,MACnB,QAAQ,EAAE,WAAW;AACnB,eAAO,MAAM,KACX,IAAI,IAAI,QAAQ,QAAQ,CAAC,MAAM,OAAO,KAAK,CAAC,CAAC,CAAC,CAChD;AAAA,MACF;AAAA,MACA,IAAI,EAAE,WAAW,MAAM;AACrB,YAAI,QAAQ,OAAO;AACjB,iBAAO;AACT,eAAO,QAAQ,KACb,CAAC,QAAQ,OAAO,UAAU,eAAe,KAAK,KAAK,IAAI,KAAK,QAAQ,IAAI,KAAK,IAAI,CACnF;AAAA,MACF;AAAA,MACA,IAAI,EAAE,WAAW,MAAM,WAAW;AAChC,YAAI,QAAQ;AACV,iBAAO;AACT,eAAO,QAAQ,IACb,QAAQ,KACN,CAAC,QAAQ,QAAQ,IAAI,KAAK,IAAI,CAChC,KAAK,CAAC,GACN,MACA,SACF;AAAA,MACF;AAAA,MACA,IAAI,EAAE,WAAW,MAAM,OAAO,WAAW;AACvC,cAAM,SAAS,QAAQ,KACrB,CAAC,QAAQ,OAAO,UAAU,eAAe,KAAK,KAAK,IAAI,CACzD,KAAK,QAAQ,QAAQ,SAAS;AAC9B,cAAM,aAAa,OAAO,yBAAyB,QAAQ,IAAI;AAC/D,YAAK,eAAc,OAAO,SAAS,WAAW,QAAS,eAAc,OAAO,SAAS,WAAW;AAC9F,iBAAO,WAAW,IAAI,KAAK,WAAW,KAAK,KAAK;AAClD,eAAO,QAAQ,IAAI,QAAQ,MAAM,KAAK;AAAA,MACxC;AAAA,IACF;AACA,+BAA2B;AACzB,UAAI,OAAO,QAAQ,QAAQ,IAAI;AAC/B,aAAO,KAAK,OAAO,CAAC,KAAK,QAAQ;AAC/B,YAAI,OAAO,QAAQ,IAAI,MAAM,GAAG;AAChC,eAAO;AAAA,MACT,GAAG,CAAC,CAAC;AAAA,IACP;AAGA,8BAA0B,OAAO;AAC/B,UAAI,YAAW,CAAC,QAAQ,OAAO,QAAQ,YAAY,CAAC,MAAM,QAAQ,GAAG,KAAK,QAAQ;AAClF,UAAI,UAAU,CAAC,KAAK,WAAW,OAAO;AACpC,eAAO,QAAQ,OAAO,0BAA0B,GAAG,CAAC,EAAE,QAAQ,CAAC,CAAC,KAAK,EAAE,OAAO,kBAAkB;AAC9F,cAAI,eAAe,SAAS,UAAU;AACpC;AACF,cAAI,OAAO,UAAU,YAAY,UAAU,QAAQ,MAAM;AACvD;AACF,cAAI,OAAO,aAAa,KAAK,MAAM,GAAG,YAAY;AAClD,cAAI,OAAO,UAAU,YAAY,UAAU,QAAQ,MAAM,gBAAgB;AACvE,gBAAI,OAAO,MAAM,WAAW,OAAO,MAAM,GAAG;AAAA,UAC9C,OAAO;AACL,gBAAI,UAAS,KAAK,KAAK,UAAU,OAAO,CAAE,kBAAiB,UAAU;AACnE,sBAAQ,OAAO,IAAI;AAAA,YACrB;AAAA,UACF;AAAA,QACF,CAAC;AAAA,MACH;AACA,aAAO,QAAQ,KAAK;AAAA,IACtB;AACA,yBAAqB,UAAU,YAAY,MAAM;AAAA,IACjD,GAAG;AACD,UAAI,MAAM;AAAA,QACR,cAAc;AAAA,QACd,gBAAgB;AAAA,QAChB,WAAW,OAAO,MAAM,KAAK;AAC3B,iBAAO,SAAS,KAAK,cAAc,MAAM,IAAI,OAAO,IAAI,GAAG,CAAC,UAAU,IAAI,OAAO,MAAM,KAAK,GAAG,MAAM,GAAG;AAAA,QAC1G;AAAA,MACF;AACA,gBAAU,GAAG;AACb,aAAO,CAAC,iBAAiB;AACvB,YAAI,OAAO,iBAAiB,YAAY,iBAAiB,QAAQ,aAAa,gBAAgB;AAC5F,cAAI,aAAa,IAAI,WAAW,KAAK,GAAG;AACxC,cAAI,aAAa,CAAC,OAAO,MAAM,QAAQ;AACrC,gBAAI,aAAa,aAAa,WAAW,OAAO,MAAM,GAAG;AACzD,gBAAI,eAAe;AACnB,mBAAO,WAAW,OAAO,MAAM,GAAG;AAAA,UACpC;AAAA,QACF,OAAO;AACL,cAAI,eAAe;AAAA,QACrB;AACA,eAAO;AAAA,MACT;AAAA,IACF;AACA,iBAAa,KAAK,MAAM;AACtB,aAAO,KAAK,MAAM,GAAG,EAAE,OAAO,CAAC,OAAO,YAAY,MAAM,UAAU,GAAG;AAAA,IACvE;AACA,iBAAa,KAAK,MAAM,OAAO;AAC7B,UAAI,OAAO,SAAS;AAClB,eAAO,KAAK,MAAM,GAAG;AACvB,UAAI,KAAK,WAAW;AAClB,YAAI,KAAK,MAAM;AAAA,eACR,KAAK,WAAW;AACvB,cAAM;AAAA,WACH;AACH,YAAI,IAAI,KAAK;AACX,iBAAO,IAAI,IAAI,KAAK,KAAK,KAAK,MAAM,CAAC,GAAG,KAAK;AAAA,aAC1C;AACH,cAAI,KAAK,MAAM,CAAC;AAChB,iBAAO,IAAI,IAAI,KAAK,KAAK,KAAK,MAAM,CAAC,GAAG,KAAK;AAAA,QAC/C;AAAA,MACF;AAAA,IACF;AAGA,QAAI,SAAS,CAAC;AACd,mBAAe,MAAM,UAAU;AAC7B,aAAO,QAAQ;AAAA,IACjB;AACA,0BAAsB,KAAK,IAAI;AAC7B,UAAI,oBAAoB,aAAa,EAAE;AACvC,aAAO,QAAQ,MAAM,EAAE,QAAQ,CAAC,CAAC,MAAM,cAAc;AACnD,eAAO,eAAe,KAAK,IAAI,QAAQ;AAAA,UACrC,MAAM;AACJ,mBAAO,SAAS,IAAI,iBAAiB;AAAA,UACvC;AAAA,UACA,YAAY;AAAA,QACd,CAAC;AAAA,MACH,CAAC;AACD,aAAO;AAAA,IACT;AACA,0BAAsB,IAAI;AACxB,UAAI,CAAC,WAAW,WAAW,yBAAyB,EAAE;AACtD,UAAI,QAAQ,EAAE,aAAa,GAAG,UAAU;AACxC,kBAAY,IAAI,OAAO;AACvB,aAAO;AAAA,IACT;AAGA,sBAAkB,IAAI,YAAY,aAAa,MAAM;AACnD,UAAI;AACF,eAAO,SAAS,GAAG,IAAI;AAAA,MACzB,SAAS,GAAP;AACA,oBAAY,GAAG,IAAI,UAAU;AAAA,MAC/B;AAAA,IACF;AACA,yBAAqB,QAAQ,IAAI,aAAa,QAAQ;AACpD,eAAS,OAAO,OACd,UAAU,OAAO,SAAS,EAAE,SAAS,0BAA0B,GAC/D,EAAE,IAAI,WAAW,CACnB;AACA,cAAQ,KAAK,4BAA4B,OAAO;AAAA;AAAA,EAEhD,aAAa,kBAAkB,aAAa,UAAU,MAAM,EAAE;AAC9D,iBAAW,MAAM;AACf,cAAM;AAAA,MACR,GAAG,CAAC;AAAA,IACN;AAGA,QAAI,8BAA8B;AAClC,uCAAmC,UAAU;AAC3C,UAAI,QAAQ;AACZ,oCAA8B;AAC9B,UAAI,SAAS,SAAS;AACtB,oCAA8B;AAC9B,aAAO;AAAA,IACT;AACA,sBAAkB,IAAI,YAAY,SAAS,CAAC,GAAG;AAC7C,UAAI;AACJ,oBAAc,IAAI,UAAU,EAAE,CAAC,UAAU,SAAS,OAAO,MAAM;AAC/D,aAAO;AAAA,IACT;AACA,8BAA0B,MAAM;AAC9B,aAAO,qBAAqB,GAAG,IAAI;AAAA,IACrC;AACA,QAAI,uBAAuB;AAC3B,0BAAsB,cAAc;AAClC,6BAAuB;AAAA,IACzB;AACA,6BAAyB,IAAI,YAAY;AACvC,UAAI,mBAAmB,CAAC;AACxB,mBAAa,kBAAkB,EAAE;AACjC,UAAI,YAAY,CAAC,kBAAkB,GAAG,iBAAiB,EAAE,CAAC;AAC1D,UAAI,YAAY,OAAO,eAAe,aAAa,8BAA8B,WAAW,UAAU,IAAI,4BAA4B,WAAW,YAAY,EAAE;AAC/J,aAAO,SAAS,KAAK,MAAM,IAAI,YAAY,SAAS;AAAA,IACtD;AACA,2CAAuC,WAAW,MAAM;AACtD,aAAO,CAAC,WAAW,MAAM;AAAA,MACzB,GAAG,EAAE,OAAO,SAAS,CAAC,GAAG,SAAS,CAAC,MAAM,CAAC,MAAM;AAC9C,YAAI,SAAS,KAAK,MAAM,aAAa,CAAC,QAAQ,GAAG,SAAS,CAAC,GAAG,MAAM;AACpE,4BAAoB,UAAU,MAAM;AAAA,MACtC;AAAA,IACF;AACA,QAAI,gBAAgB,CAAC;AACrB,wCAAoC,YAAY,IAAI;AAClD,UAAI,cAAc,aAAa;AAC7B,eAAO,cAAc;AAAA,MACvB;AACA,UAAI,gBAAgB,OAAO,eAAe,iBAAiB;AAAA,MAC3D,CAAC,EAAE;AACH,UAAI,0BAA0B,qBAAqB,KAAK,WAAW,KAAK,CAAC,KAAK,iBAAiB,KAAK,WAAW,KAAK,CAAC,IAAI,eAAe,oBAAoB;AAC5J,YAAM,oBAAoB,MAAM;AAC9B,YAAI;AACF,cAAI,QAAQ,IAAI,cACd,CAAC,UAAU,OAAO,GAClB,kCAAkC,0EACpC;AACA,iBAAO,eAAe,OAAO,QAAQ;AAAA,YACnC,OAAO,YAAY;AAAA,UACrB,CAAC;AACD,iBAAO;AAAA,QACT,SAAS,QAAP;AACA,sBAAY,QAAQ,IAAI,UAAU;AAClC,iBAAO,QAAQ,QAAQ;AAAA,QACzB;AAAA,MACF;AACA,UAAI,OAAO,kBAAkB;AAC7B,oBAAc,cAAc;AAC5B,aAAO;AAAA,IACT;AACA,yCAAqC,WAAW,YAAY,IAAI;AAC9D,UAAI,OAAO,2BAA2B,YAAY,EAAE;AACpD,aAAO,CAAC,WAAW,MAAM;AAAA,MACzB,GAAG,EAAE,OAAO,SAAS,CAAC,GAAG,SAAS,CAAC,MAAM,CAAC,MAAM;AAC9C,aAAK,SAAS;AACd,aAAK,WAAW;AAChB,YAAI,gBAAgB,aAAa,CAAC,QAAQ,GAAG,SAAS,CAAC;AACvD,YAAI,OAAO,SAAS,YAAY;AAC9B,cAAI,UAAU,KAAK,MAAM,aAAa,EAAE,MAAM,CAAC,WAAW,YAAY,QAAQ,IAAI,UAAU,CAAC;AAC7F,cAAI,KAAK,UAAU;AACjB,gCAAoB,UAAU,KAAK,QAAQ,eAAe,QAAQ,EAAE;AACpE,iBAAK,SAAS;AAAA,UAChB,OAAO;AACL,oBAAQ,KAAK,CAAC,WAAW;AACvB,kCAAoB,UAAU,QAAQ,eAAe,QAAQ,EAAE;AAAA,YACjE,CAAC,EAAE,MAAM,CAAC,WAAW,YAAY,QAAQ,IAAI,UAAU,CAAC,EAAE,QAAQ,MAAM,KAAK,SAAS,MAAM;AAAA,UAC9F;AAAA,QACF;AAAA,MACF;AAAA,IACF;AACA,iCAA6B,UAAU,OAAO,QAAQ,QAAQ,IAAI;AAChE,UAAI,+BAA+B,OAAO,UAAU,YAAY;AAC9D,YAAI,SAAS,MAAM,MAAM,QAAQ,MAAM;AACvC,YAAI,kBAAkB,SAAS;AAC7B,iBAAO,KAAK,CAAC,MAAM,oBAAoB,UAAU,GAAG,QAAQ,MAAM,CAAC,EAAE,MAAM,CAAC,WAAW,YAAY,QAAQ,IAAI,KAAK,CAAC;AAAA,QACvH,OAAO;AACL,mBAAS,MAAM;AAAA,QACjB;AAAA,MACF,WAAW,OAAO,UAAU,YAAY,iBAAiB,SAAS;AAChE,cAAM,KAAK,CAAC,MAAM,SAAS,CAAC,CAAC;AAAA,MAC/B,OAAO;AACL,iBAAS,KAAK;AAAA,MAChB;AAAA,IACF;AAGA,QAAI,iBAAiB;AACrB,oBAAgB,UAAU,IAAI;AAC5B,aAAO,iBAAiB;AAAA,IAC1B;AACA,uBAAmB,WAAW;AAC5B,uBAAiB;AAAA,IACnB;AACA,QAAI,oBAAoB,CAAC;AACzB,wBAAmB,MAAM,UAAU;AACjC,wBAAkB,QAAQ;AAC1B,aAAO;AAAA,QACL,OAAO,aAAY;AACjB,cAAI,CAAC,kBAAkB,cAAa;AAClC,oBAAQ,KAAK,OAAO,8BAA8B,oBAAmB,gDAAgD;AACrH;AAAA,UACF;AACA,gBAAM,MAAM,eAAe,QAAQ,WAAU;AAC7C,yBAAe,OAAO,OAAO,IAAI,MAAM,eAAe,QAAQ,SAAS,GAAG,GAAG,IAAI;AAAA,QACnF;AAAA,MACF;AAAA,IACF;AACA,6BAAyB,MAAM;AAC7B,aAAO,OAAO,KAAK,iBAAiB,EAAE,SAAS,IAAI;AAAA,IACrD;AACA,wBAAoB,IAAI,YAAY,2BAA2B;AAC7D,mBAAa,MAAM,KAAK,UAAU;AAClC,UAAI,GAAG,sBAAsB;AAC3B,YAAI,cAAc,OAAO,QAAQ,GAAG,oBAAoB,EAAE,IAAI,CAAC,CAAC,MAAM,WAAY,GAAE,MAAM,MAAM,EAAE;AAClG,YAAI,mBAAmB,eAAe,WAAW;AACjD,sBAAc,YAAY,IAAI,CAAC,cAAc;AAC3C,cAAI,iBAAiB,KAAK,CAAC,SAAS,KAAK,SAAS,UAAU,IAAI,GAAG;AACjE,mBAAO;AAAA,cACL,MAAM,UAAU,UAAU;AAAA,cAC1B,OAAO,IAAI,UAAU;AAAA,YACvB;AAAA,UACF;AACA,iBAAO;AAAA,QACT,CAAC;AACD,qBAAa,WAAW,OAAO,WAAW;AAAA,MAC5C;AACA,UAAI,0BAA0B,CAAC;AAC/B,UAAI,cAAc,WAAW,IAAI,wBAAwB,CAAC,SAAS,YAAY,wBAAwB,WAAW,OAAO,CAAC,EAAE,OAAO,sBAAsB,EAAE,IAAI,mBAAmB,yBAAyB,yBAAyB,CAAC,EAAE,KAAK,UAAU;AACtP,aAAO,YAAY,IAAI,CAAC,gBAAe;AACrC,eAAO,oBAAoB,IAAI,WAAU;AAAA,MAC3C,CAAC;AAAA,IACH;AACA,4BAAwB,YAAY;AAClC,aAAO,MAAM,KAAK,UAAU,EAAE,IAAI,wBAAwB,CAAC,EAAE,OAAO,CAAC,SAAS,CAAC,uBAAuB,IAAI,CAAC;AAAA,IAC7G;AACA,QAAI,sBAAsB;AAC1B,QAAI,yBAAyC,oBAAI,IAAI;AACrD,QAAI,yBAAyB,OAAO;AACpC,qCAAiC,UAAU;AACzC,4BAAsB;AACtB,UAAI,MAAM,OAAO;AACjB,+BAAyB;AACzB,6BAAuB,IAAI,KAAK,CAAC,CAAC;AAClC,UAAI,gBAAgB,MAAM;AACxB,eAAO,uBAAuB,IAAI,GAAG,EAAE;AACrC,iCAAuB,IAAI,GAAG,EAAE,MAAM,EAAE;AAC1C,+BAAuB,OAAO,GAAG;AAAA,MACnC;AACA,UAAI,gBAAgB,MAAM;AACxB,8BAAsB;AACtB,sBAAc;AAAA,MAChB;AACA,eAAS,aAAa;AACtB,oBAAc;AAAA,IAChB;AACA,sCAAkC,IAAI;AACpC,UAAI,YAAW,CAAC;AAChB,UAAI,UAAU,CAAC,aAAa,UAAS,KAAK,QAAQ;AAClD,UAAI,CAAC,SAAS,iBAAiB,mBAAmB,EAAE;AACpD,gBAAS,KAAK,aAAa;AAC3B,UAAI,YAAY;AAAA,QACd,QAAQ;AAAA,QACR,QAAQ;AAAA,QACR;AAAA,QACA,eAAe,cAAc,KAAK,eAAe,EAAE;AAAA,QACnD,UAAU,SAAS,KAAK,UAAU,EAAE;AAAA,MACtC;AACA,UAAI,YAAY,MAAM,UAAS,QAAQ,CAAC,MAAM,EAAE,CAAC;AACjD,aAAO,CAAC,WAAW,SAAS;AAAA,IAC9B;AACA,iCAA6B,IAAI,aAAY;AAC3C,UAAI,OAAO,MAAM;AAAA,MACjB;AACA,UAAI,WAAW,kBAAkB,YAAW,SAAS;AACrD,UAAI,CAAC,WAAW,WAAW,yBAAyB,EAAE;AACtD,yBAAmB,IAAI,YAAW,UAAU,OAAO;AACnD,UAAI,cAAc,MAAM;AACtB,YAAI,GAAG,aAAa,GAAG;AACrB;AACF,iBAAS,UAAU,SAAS,OAAO,IAAI,aAAY,SAAS;AAC5D,mBAAW,SAAS,KAAK,UAAU,IAAI,aAAY,SAAS;AAC5D,8BAAsB,uBAAuB,IAAI,sBAAsB,EAAE,KAAK,QAAQ,IAAI,SAAS;AAAA,MACrG;AACA,kBAAY,cAAc;AAC1B,aAAO;AAAA,IACT;AACA,QAAI,eAAe,CAAC,SAAS,gBAAgB,CAAC,EAAE,MAAM,YAAY;AAChE,UAAI,KAAK,WAAW,OAAO;AACzB,eAAO,KAAK,QAAQ,SAAS,WAAW;AAC1C,aAAO,EAAE,MAAM,MAAM;AAAA,IACvB;AACA,QAAI,OAAO,CAAC,MAAM;AAClB,qCAAiC,WAAW,MAAM;AAAA,IAClD,GAAG;AACD,aAAO,CAAC,EAAE,MAAM,YAAY;AAC1B,YAAI,EAAE,MAAM,SAAS,OAAO,aAAa,sBAAsB,OAAO,CAAC,OAAO,cAAc;AAC1F,iBAAO,UAAU,KAAK;AAAA,QACxB,GAAG,EAAE,MAAM,MAAM,CAAC;AAClB,YAAI,YAAY;AACd,mBAAS,SAAS,IAAI;AACxB,eAAO,EAAE,MAAM,SAAS,OAAO,SAAS;AAAA,MAC1C;AAAA,IACF;AACA,QAAI,wBAAwB,CAAC;AAC7B,2BAAuB,UAAU;AAC/B,4BAAsB,KAAK,QAAQ;AAAA,IACrC;AACA,oCAAgC,EAAE,QAAQ;AACxC,aAAO,qBAAqB,EAAE,KAAK,IAAI;AAAA,IACzC;AACA,QAAI,uBAAuB,MAAM,IAAI,OAAO,IAAI,4BAA4B;AAC5E,gCAA4B,yBAAyB,2BAA2B;AAC9E,aAAO,CAAC,EAAE,MAAM,YAAY;AAC1B,YAAI,YAAY,KAAK,MAAM,qBAAqB,CAAC;AACjD,YAAI,aAAa,KAAK,MAAM,qBAAqB;AACjD,YAAI,YAAY,KAAK,MAAM,uBAAuB,KAAK,CAAC;AACxD,YAAI,WAAW,6BAA6B,wBAAwB,SAAS;AAC7E,eAAO;AAAA,UACL,MAAM,YAAY,UAAU,KAAK;AAAA,UACjC,OAAO,aAAa,WAAW,KAAK;AAAA,UACpC,WAAW,UAAU,IAAI,CAAC,MAAM,EAAE,QAAQ,KAAK,EAAE,CAAC;AAAA,UAClD,YAAY;AAAA,UACZ;AAAA,QACF;AAAA,MACF;AAAA,IACF;AACA,QAAI,UAAU;AACd,QAAI,iBAAiB;AAAA,MACnB;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,IACF;AACA,wBAAoB,GAAG,GAAG;AACxB,UAAI,QAAQ,eAAe,QAAQ,EAAE,IAAI,MAAM,KAAK,UAAU,EAAE;AAChE,UAAI,QAAQ,eAAe,QAAQ,EAAE,IAAI,MAAM,KAAK,UAAU,EAAE;AAChE,aAAO,eAAe,QAAQ,KAAK,IAAI,eAAe,QAAQ,KAAK;AAAA,IACrE;AAGA,uBAAkB,IAAI,MAAM,SAAS,CAAC,GAAG;AACvC,SAAG,cACD,IAAI,YAAY,MAAM;AAAA,QACpB;AAAA,QACA,SAAS;AAAA,QAET,UAAU;AAAA,QACV,YAAY;AAAA,MACd,CAAC,CACH;AAAA,IACF;AAGA,kBAAc,IAAI,UAAU;AAC1B,UAAI,OAAO,eAAe,cAAc,cAAc,YAAY;AAChE,cAAM,KAAK,GAAG,QAAQ,EAAE,QAAQ,CAAC,QAAQ,KAAK,KAAK,QAAQ,CAAC;AAC5D;AAAA,MACF;AACA,UAAI,OAAO;AACX,eAAS,IAAI,MAAM,OAAO,IAAI;AAC9B,UAAI;AACF;AACF,UAAI,OAAO,GAAG;AACd,aAAO,MAAM;AACX,aAAK,MAAM,UAAU,KAAK;AAC1B,eAAO,KAAK;AAAA,MACd;AAAA,IACF;AAGA,kBAAc,YAAY,MAAM;AAC9B,cAAQ,KAAK,mBAAmB,WAAW,GAAG,IAAI;AAAA,IACpD;AAGA,QAAI,UAAU;AACd,sBAAiB;AACf,UAAI;AACF,aAAK,6GAA6G;AACpH,gBAAU;AACV,UAAI,CAAC,SAAS;AACZ,aAAK,qIAAqI;AAC5I,gBAAS,UAAU,aAAa;AAChC,gBAAS,UAAU,qBAAqB;AACxC,8BAAwB;AACxB,gBAAU,CAAC,OAAO,SAAS,IAAI,IAAI,CAAC;AACpC,kBAAY,CAAC,OAAO,YAAY,EAAE,CAAC;AACnC,wBAAkB,CAAC,IAAI,UAAU;AAC/B,mBAAW,IAAI,KAAK,EAAE,QAAQ,CAAC,WAAW,OAAO,CAAC;AAAA,MACpD,CAAC;AACD,UAAI,sBAAsB,CAAC,OAAO,CAAC,YAAY,GAAG,eAAe,IAAI;AACrE,YAAM,KAAK,SAAS,iBAAiB,aAAa,EAAE,KAAK,GAAG,CAAC,CAAC,EAAE,OAAO,mBAAmB,EAAE,QAAQ,CAAC,OAAO;AAC1G,iBAAS,EAAE;AAAA,MACb,CAAC;AACD,gBAAS,UAAU,oBAAoB;AACvC,iBAAW,MAAM;AACf,gCAAwB;AAAA,MAC1B,CAAC;AAAA,IACH;AACA,QAAI,wBAAwB,CAAC;AAC7B,QAAI,wBAAwB,CAAC;AAC7B,6BAAyB;AACvB,aAAO,sBAAsB,IAAI,CAAC,OAAO,GAAG,CAAC;AAAA,IAC/C;AACA,4BAAwB;AACtB,aAAO,sBAAsB,OAAO,qBAAqB,EAAE,IAAI,CAAC,OAAO,GAAG,CAAC;AAAA,IAC7E;AACA,6BAAyB,kBAAkB;AACzC,4BAAsB,KAAK,gBAAgB;AAAA,IAC7C;AACA,6BAAyB,kBAAkB;AACzC,4BAAsB,KAAK,gBAAgB;AAAA,IAC7C;AACA,yBAAqB,IAAI,uBAAuB,OAAO;AACrD,aAAO,YAAY,IAAI,CAAC,YAAY;AAClC,cAAM,YAAY,uBAAuB,aAAa,IAAI,cAAc;AACxE,YAAI,UAAU,KAAK,CAAC,aAAa,QAAQ,QAAQ,QAAQ,CAAC;AACxD,iBAAO;AAAA,MACX,CAAC;AAAA,IACH;AACA,yBAAqB,IAAI,UAAU;AACjC,UAAI,CAAC;AACH;AACF,UAAI,SAAS,EAAE;AACb,eAAO;AACT,UAAI,GAAG;AACL,aAAK,GAAG;AACV,UAAI,CAAC,GAAG;AACN;AACF,aAAO,YAAY,GAAG,eAAe,QAAQ;AAAA,IAC/C;AACA,oBAAgB,IAAI;AAClB,aAAO,cAAc,EAAE,KAAK,CAAC,aAAa,GAAG,QAAQ,QAAQ,CAAC;AAAA,IAChE;AACA,QAAI,oBAAoB,CAAC;AACzB,2BAAuB,UAAU;AAC/B,wBAAkB,KAAK,QAAQ;AAAA,IACjC;AACA,QAAI,kBAAkB;AACtB,sBAAkB,IAAI,SAAS,MAAM,YAAY,MAAM;AAAA,IACvD,GAAG;AACD,UAAI,YAAY,IAAI,CAAC,MAAM,EAAE,SAAS;AACpC;AACF,8BAAwB,MAAM;AAC5B,eAAO,IAAI,CAAC,KAAK,SAAS;AACxB,cAAI,IAAI;AACN;AACF,oBAAU,KAAK,IAAI;AACnB,4BAAkB,QAAQ,CAAC,MAAM,EAAE,KAAK,IAAI,CAAC;AAC7C,qBAAW,KAAK,IAAI,UAAU,EAAE,QAAQ,CAAC,WAAW,OAAO,CAAC;AAC5D,cAAI,CAAC,IAAI;AACP,gBAAI,YAAY;AAClB,cAAI,aAAa,KAAK;AAAA,QACxB,CAAC;AAAA,MACH,CAAC;AAAA,IACH;AACA,yBAAqB,MAAM,SAAS,MAAM;AACxC,aAAO,MAAM,CAAC,OAAO;AACnB,uBAAe,EAAE;AACjB,0BAAkB,EAAE;AACpB,eAAO,GAAG;AAAA,MACZ,CAAC;AAAA,IACH;AACA,uCAAmC;AACjC,UAAI,mBAAmB;AAAA,QACrB,CAAC,MAAM,UAAU,CAAC,yBAAyB,CAAC;AAAA,QAC5C,CAAC,UAAU,UAAU,CAAC,YAAY,CAAC;AAAA,QACnC,CAAC,QAAQ,QAAQ,CAAC,UAAU,CAAC;AAAA,MAC/B;AACA,uBAAiB,QAAQ,CAAC,CAAC,SAAS,aAAY,eAAe;AAC7D,YAAI,gBAAgB,WAAU;AAC5B;AACF,kBAAU,KAAK,CAAC,aAAa;AAC3B,cAAI,SAAS,cAAc,QAAQ,GAAG;AACpC,iBAAK,UAAU,0BAA0B,gBAAgB;AACzD,mBAAO;AAAA,UACT;AAAA,QACF,CAAC;AAAA,MACH,CAAC;AAAA,IACH;AAGA,QAAI,YAAY,CAAC;AACjB,QAAI,YAAY;AAChB,sBAAkB,WAAW,MAAM;AAAA,IACnC,GAAG;AACD,qBAAe,MAAM;AACnB,qBAAa,WAAW,MAAM;AAC5B,2BAAiB;AAAA,QACnB,CAAC;AAAA,MACH,CAAC;AACD,aAAO,IAAI,QAAQ,CAAC,QAAQ;AAC1B,kBAAU,KAAK,MAAM;AACnB,mBAAS;AACT,cAAI;AAAA,QACN,CAAC;AAAA,MACH,CAAC;AAAA,IACH;AACA,gCAA4B;AAC1B,kBAAY;AACZ,aAAO,UAAU;AACf,kBAAU,MAAM,EAAE;AAAA,IACtB;AACA,6BAAyB;AACvB,kBAAY;AAAA,IACd;AAGA,wBAAoB,IAAI,OAAO;AAC7B,UAAI,MAAM,QAAQ,KAAK,GAAG;AACxB,eAAO,qBAAqB,IAAI,MAAM,KAAK,GAAG,CAAC;AAAA,MACjD,WAAW,OAAO,UAAU,YAAY,UAAU,MAAM;AACtD,eAAO,qBAAqB,IAAI,KAAK;AAAA,MACvC,WAAW,OAAO,UAAU,YAAY;AACtC,eAAO,WAAW,IAAI,MAAM,CAAC;AAAA,MAC/B;AACA,aAAO,qBAAqB,IAAI,KAAK;AAAA,IACvC;AACA,kCAA8B,IAAI,aAAa;AAC7C,UAAI,QAAQ,CAAC,iBAAiB,aAAa,MAAM,GAAG,EAAE,OAAO,OAAO;AACpE,UAAI,iBAAiB,CAAC,iBAAiB,aAAa,MAAM,GAAG,EAAE,OAAO,CAAC,MAAM,CAAC,GAAG,UAAU,SAAS,CAAC,CAAC,EAAE,OAAO,OAAO;AACtH,UAAI,0BAA0B,CAAC,YAAY;AACzC,WAAG,UAAU,IAAI,GAAG,OAAO;AAC3B,eAAO,MAAM;AACX,aAAG,UAAU,OAAO,GAAG,OAAO;AAAA,QAChC;AAAA,MACF;AACA,oBAAc,gBAAgB,OAAO,cAAc,KAAK,eAAe;AACvE,aAAO,wBAAwB,eAAe,WAAW,CAAC;AAAA,IAC5D;AACA,kCAA8B,IAAI,aAAa;AAC7C,UAAI,QAAQ,CAAC,gBAAgB,YAAY,MAAM,GAAG,EAAE,OAAO,OAAO;AAClE,UAAI,SAAS,OAAO,QAAQ,WAAW,EAAE,QAAQ,CAAC,CAAC,aAAa,UAAU,OAAO,MAAM,WAAW,IAAI,KAAK,EAAE,OAAO,OAAO;AAC3H,UAAI,YAAY,OAAO,QAAQ,WAAW,EAAE,QAAQ,CAAC,CAAC,aAAa,UAAU,CAAC,OAAO,MAAM,WAAW,IAAI,KAAK,EAAE,OAAO,OAAO;AAC/H,UAAI,QAAQ,CAAC;AACb,UAAI,UAAU,CAAC;AACf,gBAAU,QAAQ,CAAC,MAAM;AACvB,YAAI,GAAG,UAAU,SAAS,CAAC,GAAG;AAC5B,aAAG,UAAU,OAAO,CAAC;AACrB,kBAAQ,KAAK,CAAC;AAAA,QAChB;AAAA,MACF,CAAC;AACD,aAAO,QAAQ,CAAC,MAAM;AACpB,YAAI,CAAC,GAAG,UAAU,SAAS,CAAC,GAAG;AAC7B,aAAG,UAAU,IAAI,CAAC;AAClB,gBAAM,KAAK,CAAC;AAAA,QACd;AAAA,MACF,CAAC;AACD,aAAO,MAAM;AACX,gBAAQ,QAAQ,CAAC,MAAM,GAAG,UAAU,IAAI,CAAC,CAAC;AAC1C,cAAM,QAAQ,CAAC,MAAM,GAAG,UAAU,OAAO,CAAC,CAAC;AAAA,MAC7C;AAAA,IACF;AAGA,uBAAmB,IAAI,OAAO;AAC5B,UAAI,OAAO,UAAU,YAAY,UAAU,MAAM;AAC/C,eAAO,oBAAoB,IAAI,KAAK;AAAA,MACtC;AACA,aAAO,oBAAoB,IAAI,KAAK;AAAA,IACtC;AACA,iCAA6B,IAAI,OAAO;AACtC,UAAI,iBAAiB,CAAC;AACtB,aAAO,QAAQ,KAAK,EAAE,QAAQ,CAAC,CAAC,KAAK,YAAY;AAC/C,uBAAe,OAAO,GAAG,MAAM;AAC/B,YAAI,CAAC,IAAI,WAAW,IAAI,GAAG;AACzB,gBAAM,UAAU,GAAG;AAAA,QACrB;AACA,WAAG,MAAM,YAAY,KAAK,MAAM;AAAA,MAClC,CAAC;AACD,iBAAW,MAAM;AACf,YAAI,GAAG,MAAM,WAAW,GAAG;AACzB,aAAG,gBAAgB,OAAO;AAAA,QAC5B;AAAA,MACF,CAAC;AACD,aAAO,MAAM;AACX,kBAAU,IAAI,cAAc;AAAA,MAC9B;AAAA,IACF;AACA,iCAA6B,IAAI,OAAO;AACtC,UAAI,QAAQ,GAAG,aAAa,SAAS,KAAK;AAC1C,SAAG,aAAa,SAAS,KAAK;AAC9B,aAAO,MAAM;AACX,WAAG,aAAa,SAAS,SAAS,EAAE;AAAA,MACtC;AAAA,IACF;AACA,uBAAmB,SAAS;AAC1B,aAAO,QAAQ,QAAQ,mBAAmB,OAAO,EAAE,YAAY;AAAA,IACjE;AAGA,kBAAc,UAAU,YAAW,MAAM;AAAA,IACzC,GAAG;AACD,UAAI,SAAS;AACb,aAAO,WAAW;AAChB,YAAI,CAAC,QAAQ;AACX,mBAAS;AACT,mBAAS,MAAM,MAAM,SAAS;AAAA,QAChC,OAAO;AACL,oBAAS,MAAM,MAAM,SAAS;AAAA,QAChC;AAAA,MACF;AAAA,IACF;AAGA,eAAU,cAAc,CAAC,IAAI,EAAE,OAAO,WAAW,cAAc,EAAE,UAAU,gBAAgB;AACzF,UAAI,OAAO,eAAe;AACxB,qBAAa,UAAU,UAAU;AACnC,UAAI,eAAe;AACjB;AACF,UAAI,CAAC,cAAc,OAAO,eAAe,WAAW;AAClD,sCAA8B,IAAI,WAAW,KAAK;AAAA,MACpD,OAAO;AACL,2CAAmC,IAAI,YAAY,KAAK;AAAA,MAC1D;AAAA,IACF,CAAC;AACD,gDAA4C,IAAI,aAAa,OAAO;AAClE,+BAAyB,IAAI,YAAY,EAAE;AAC3C,UAAI,sBAAsB;AAAA,QACxB,SAAS,CAAC,YAAY;AACpB,aAAG,cAAc,MAAM,SAAS;AAAA,QAClC;AAAA,QACA,eAAe,CAAC,YAAY;AAC1B,aAAG,cAAc,MAAM,QAAQ;AAAA,QACjC;AAAA,QACA,aAAa,CAAC,YAAY;AACxB,aAAG,cAAc,MAAM,MAAM;AAAA,QAC/B;AAAA,QACA,SAAS,CAAC,YAAY;AACpB,aAAG,cAAc,MAAM,SAAS;AAAA,QAClC;AAAA,QACA,eAAe,CAAC,YAAY;AAC1B,aAAG,cAAc,MAAM,QAAQ;AAAA,QACjC;AAAA,QACA,aAAa,CAAC,YAAY;AACxB,aAAG,cAAc,MAAM,MAAM;AAAA,QAC/B;AAAA,MACF;AACA,0BAAoB,OAAO,WAAW;AAAA,IACxC;AACA,2CAAuC,IAAI,WAAW,OAAO;AAC3D,+BAAyB,IAAI,SAAS;AACtC,UAAI,gBAAgB,CAAC,UAAU,SAAS,IAAI,KAAK,CAAC,UAAU,SAAS,KAAK,KAAK,CAAC;AAChF,UAAI,kBAAkB,iBAAiB,UAAU,SAAS,IAAI,KAAK,CAAC,OAAO,EAAE,SAAS,KAAK;AAC3F,UAAI,mBAAmB,iBAAiB,UAAU,SAAS,KAAK,KAAK,CAAC,OAAO,EAAE,SAAS,KAAK;AAC7F,UAAI,UAAU,SAAS,IAAI,KAAK,CAAC,eAAe;AAC9C,oBAAY,UAAU,OAAO,CAAC,GAAG,UAAU,QAAQ,UAAU,QAAQ,KAAK,CAAC;AAAA,MAC7E;AACA,UAAI,UAAU,SAAS,KAAK,KAAK,CAAC,eAAe;AAC/C,oBAAY,UAAU,OAAO,CAAC,GAAG,UAAU,QAAQ,UAAU,QAAQ,KAAK,CAAC;AAAA,MAC7E;AACA,UAAI,WAAW,CAAC,UAAU,SAAS,SAAS,KAAK,CAAC,UAAU,SAAS,OAAO;AAC5E,UAAI,eAAe,YAAY,UAAU,SAAS,SAAS;AAC3D,UAAI,aAAa,YAAY,UAAU,SAAS,OAAO;AACvD,UAAI,eAAe,eAAe,IAAI;AACtC,UAAI,aAAa,aAAa,cAAc,WAAW,SAAS,EAAE,IAAI,MAAM;AAC5E,UAAI,QAAQ,cAAc,WAAW,SAAS,CAAC,IAAI;AACnD,UAAI,SAAS,cAAc,WAAW,UAAU,QAAQ;AACxD,UAAI,WAAW;AACf,UAAI,aAAa,cAAc,WAAW,YAAY,GAAG,IAAI;AAC7D,UAAI,cAAc,cAAc,WAAW,YAAY,EAAE,IAAI;AAC7D,UAAI,SAAS;AACb,UAAI,iBAAiB;AACnB,WAAG,cAAc,MAAM,SAAS;AAAA,UAC9B,iBAAiB;AAAA,UACjB,iBAAiB,GAAG;AAAA,UACpB,oBAAoB;AAAA,UACpB,oBAAoB,GAAG;AAAA,UACvB,0BAA0B;AAAA,QAC5B;AACA,WAAG,cAAc,MAAM,QAAQ;AAAA,UAC7B,SAAS;AAAA,UACT,WAAW,SAAS;AAAA,QACtB;AACA,WAAG,cAAc,MAAM,MAAM;AAAA,UAC3B,SAAS;AAAA,UACT,WAAW;AAAA,QACb;AAAA,MACF;AACA,UAAI,kBAAkB;AACpB,WAAG,cAAc,MAAM,SAAS;AAAA,UAC9B,iBAAiB;AAAA,UACjB,iBAAiB,GAAG;AAAA,UACpB,oBAAoB;AAAA,UACpB,oBAAoB,GAAG;AAAA,UACvB,0BAA0B;AAAA,QAC5B;AACA,WAAG,cAAc,MAAM,QAAQ;AAAA,UAC7B,SAAS;AAAA,UACT,WAAW;AAAA,QACb;AACA,WAAG,cAAc,MAAM,MAAM;AAAA,UAC3B,SAAS;AAAA,UACT,WAAW,SAAS;AAAA,QACtB;AAAA,MACF;AAAA,IACF;AACA,sCAAkC,IAAI,aAAa,eAAe,CAAC,GAAG;AACpE,UAAI,CAAC,GAAG;AACN,WAAG,gBAAgB;AAAA,UACjB,OAAO,EAAE,QAAQ,cAAc,OAAO,cAAc,KAAK,aAAa;AAAA,UACtE,OAAO,EAAE,QAAQ,cAAc,OAAO,cAAc,KAAK,aAAa;AAAA,UACtE,GAAG,SAAS,MAAM;AAAA,UAClB,GAAG,QAAQ,MAAM;AAAA,UACjB,GAAG;AACD,uBAAW,IAAI,aAAa;AAAA,cAC1B,QAAQ,KAAK,MAAM;AAAA,cACnB,OAAO,KAAK,MAAM;AAAA,cAClB,KAAK,KAAK,MAAM;AAAA,YAClB,GAAG,QAAQ,KAAK;AAAA,UAClB;AAAA,UACA,IAAI,SAAS,MAAM;AAAA,UACnB,GAAG,QAAQ,MAAM;AAAA,UACjB,GAAG;AACD,uBAAW,IAAI,aAAa;AAAA,cAC1B,QAAQ,KAAK,MAAM;AAAA,cACnB,OAAO,KAAK,MAAM;AAAA,cAClB,KAAK,KAAK,MAAM;AAAA,YAClB,GAAG,QAAQ,KAAK;AAAA,UAClB;AAAA,QACF;AAAA,IACJ;AACA,WAAO,QAAQ,UAAU,qCAAqC,SAAS,IAAI,OAAO,MAAM,MAAM;AAC5F,YAAM,YAAY,SAAS,oBAAoB,YAAY,wBAAwB;AACnF,UAAI,0BAA0B,MAAM,UAAU,IAAI;AAClD,UAAI,OAAO;AACT,YAAI,GAAG,iBAAkB,IAAG,cAAc,SAAS,GAAG,cAAc,QAAQ;AAC1E,aAAG,cAAc,SAAU,QAAO,QAAQ,GAAG,cAAc,MAAM,MAAM,EAAE,UAAU,OAAO,QAAQ,GAAG,cAAc,MAAM,KAAK,EAAE,UAAU,OAAO,QAAQ,GAAG,cAAc,MAAM,GAAG,EAAE,UAAU,GAAG,cAAc,GAAG,IAAI,IAAI,wBAAwB;AAAA,QACrP,OAAO;AACL,aAAG,gBAAgB,GAAG,cAAc,GAAG,IAAI,IAAI,wBAAwB;AAAA,QACzE;AACA;AAAA,MACF;AACA,SAAG,iBAAiB,GAAG,gBAAgB,IAAI,QAAQ,CAAC,SAAS,WAAW;AACtE,WAAG,cAAc,IAAI,MAAM;AAAA,QAC3B,GAAG,MAAM,QAAQ,IAAI,CAAC;AACtB,WAAG,oBAAoB,GAAG,iBAAiB,aAAa,MAAM,OAAO,EAAE,2BAA2B,KAAK,CAAC,CAAC;AAAA,MAC3G,CAAC,IAAI,QAAQ,QAAQ,IAAI;AACzB,qBAAe,MAAM;AACnB,YAAI,UAAU,YAAY,EAAE;AAC5B,YAAI,SAAS;AACX,cAAI,CAAC,QAAQ;AACX,oBAAQ,kBAAkB,CAAC;AAC7B,kBAAQ,gBAAgB,KAAK,EAAE;AAAA,QACjC,OAAO;AACL,oBAAU,MAAM;AACd,gBAAI,oBAAoB,CAAC,QAAQ;AAC/B,kBAAI,QAAQ,QAAQ,IAAI;AAAA,gBACtB,IAAI;AAAA,gBACJ,GAAI,KAAI,mBAAmB,CAAC,GAAG,IAAI,iBAAiB;AAAA,cACtD,CAAC,EAAE,KAAK,CAAC,CAAC,OAAO,KAAK,OAAO,SAAS,EAAE,CAAC;AACzC,qBAAO,IAAI;AACX,qBAAO,IAAI;AACX,qBAAO;AAAA,YACT;AACA,8BAAkB,EAAE,EAAE,MAAM,CAAC,MAAM;AACjC,kBAAI,CAAC,EAAE;AACL,sBAAM;AAAA,YACV,CAAC;AAAA,UACH,CAAC;AAAA,QACH;AAAA,MACF,CAAC;AAAA,IACH;AACA,yBAAqB,IAAI;AACvB,UAAI,SAAS,GAAG;AAChB,UAAI,CAAC;AACH;AACF,aAAO,OAAO,iBAAiB,SAAS,YAAY,MAAM;AAAA,IAC5D;AACA,wBAAoB,IAAI,aAAa,EAAE,QAAQ,OAAO,SAAQ,QAAQ,CAAC,GAAG,SAAS,MAAM;AAAA,IACzF,GAAG,QAAQ,MAAM;AAAA,IACjB,GAAG;AACD,UAAI,GAAG;AACL,WAAG,iBAAiB,OAAO;AAC7B,UAAI,OAAO,KAAK,MAAM,EAAE,WAAW,KAAK,OAAO,KAAK,OAAM,EAAE,WAAW,KAAK,OAAO,KAAK,GAAG,EAAE,WAAW,GAAG;AACzG,eAAO;AACP,cAAM;AACN;AAAA,MACF;AACA,UAAI,WAAW,YAAY;AAC3B,wBAAkB,IAAI;AAAA,QACpB,QAAQ;AACN,sBAAY,YAAY,IAAI,OAAM;AAAA,QACpC;AAAA,QACA,SAAS;AACP,uBAAa,YAAY,IAAI,MAAM;AAAA,QACrC;AAAA,QACA;AAAA,QACA,MAAM;AACJ,oBAAU;AACV,oBAAU,YAAY,IAAI,GAAG;AAAA,QAC/B;AAAA,QACA;AAAA,QACA,UAAU;AACR,qBAAW;AACX,kBAAQ;AAAA,QACV;AAAA,MACF,CAAC;AAAA,IACH;AACA,+BAA2B,IAAI,QAAQ;AACrC,UAAI,aAAa,eAAe;AAChC,UAAI,SAAS,KAAK,MAAM;AACtB,kBAAU,MAAM;AACd,wBAAc;AACd,cAAI,CAAC;AACH,mBAAO,OAAO;AAChB,cAAI,CAAC,YAAY;AACf,mBAAO,IAAI;AACX,6BAAiB;AAAA,UACnB;AACA,iBAAO,MAAM;AACb,cAAI,GAAG;AACL,mBAAO,QAAQ;AACjB,iBAAO,GAAG;AAAA,QACZ,CAAC;AAAA,MACH,CAAC;AACD,SAAG,mBAAmB;AAAA,QACpB,eAAe,CAAC;AAAA,QAChB,aAAa,UAAU;AACrB,eAAK,cAAc,KAAK,QAAQ;AAAA,QAClC;AAAA,QACA,QAAQ,KAAK,WAAW;AACtB,iBAAO,KAAK,cAAc,QAAQ;AAChC,iBAAK,cAAc,MAAM,EAAE;AAAA,UAC7B;AACA;AACA,iBAAO;AAAA,QACT,CAAC;AAAA,QACD;AAAA,MACF;AACA,gBAAU,MAAM;AACd,eAAO,MAAM;AACb,eAAO,OAAO;AAAA,MAChB,CAAC;AACD,oBAAc;AACd,4BAAsB,MAAM;AAC1B,YAAI;AACF;AACF,YAAI,WAAW,OAAO,iBAAiB,EAAE,EAAE,mBAAmB,QAAQ,OAAO,EAAE,EAAE,QAAQ,KAAK,EAAE,CAAC,IAAI;AACrG,YAAI,QAAQ,OAAO,iBAAiB,EAAE,EAAE,gBAAgB,QAAQ,OAAO,EAAE,EAAE,QAAQ,KAAK,EAAE,CAAC,IAAI;AAC/F,YAAI,aAAa;AACf,qBAAW,OAAO,iBAAiB,EAAE,EAAE,kBAAkB,QAAQ,KAAK,EAAE,CAAC,IAAI;AAC/E,kBAAU,MAAM;AACd,iBAAO,OAAO;AAAA,QAChB,CAAC;AACD,wBAAgB;AAChB,8BAAsB,MAAM;AAC1B,cAAI;AACF;AACF,oBAAU,MAAM;AACd,mBAAO,IAAI;AAAA,UACb,CAAC;AACD,2BAAiB;AACjB,qBAAW,GAAG,iBAAiB,QAAQ,WAAW,KAAK;AACvD,uBAAa;AAAA,QACf,CAAC;AAAA,MACH,CAAC;AAAA,IACH;AACA,2BAAuB,WAAW,KAAK,WAAU;AAC/C,UAAI,UAAU,QAAQ,GAAG,MAAM;AAC7B,eAAO;AACT,YAAM,WAAW,UAAU,UAAU,QAAQ,GAAG,IAAI;AACpD,UAAI,CAAC;AACH,eAAO;AACT,UAAI,QAAQ,SAAS;AACnB,YAAI,MAAM,QAAQ;AAChB,iBAAO;AAAA,MACX;AACA,UAAI,QAAQ,cAAc,QAAQ,SAAS;AACzC,YAAI,QAAQ,SAAS,MAAM,YAAY;AACvC,YAAI;AACF,iBAAO,MAAM;AAAA,MACjB;AACA,UAAI,QAAQ,UAAU;AACpB,YAAI,CAAC,OAAO,SAAS,QAAQ,UAAU,QAAQ,EAAE,SAAS,UAAU,UAAU,QAAQ,GAAG,IAAI,EAAE,GAAG;AAChG,iBAAO,CAAC,UAAU,UAAU,UAAU,QAAQ,GAAG,IAAI,EAAE,EAAE,KAAK,GAAG;AAAA,QACnE;AAAA,MACF;AACA,aAAO;AAAA,IACT;AAGA,QAAI,YAAY;AAChB,6BAAyB,UAAU,YAAW,MAAM;AAAA,IACpD,GAAG;AACD,aAAO,IAAI,SAAS,YAAY,UAAS,GAAG,IAAI,IAAI,SAAS,GAAG,IAAI;AAAA,IACtE;AACA,6BAAyB,UAAU;AACjC,aAAO,IAAI,SAAS,aAAa,SAAS,GAAG,IAAI;AAAA,IACnD;AACA,QAAI,eAAe,CAAC;AACpB,4BAAwB,UAAU;AAChC,mBAAa,KAAK,QAAQ;AAAA,IAC5B;AACA,uBAAmB,MAAM,IAAI;AAC3B,mBAAa,QAAQ,CAAC,MAAM,EAAE,MAAM,EAAE,CAAC;AACvC,kBAAY;AACZ,sCAAgC,MAAM;AACpC,iBAAS,IAAI,CAAC,IAAI,aAAa;AAC7B,mBAAS,IAAI,MAAM;AAAA,UACnB,CAAC;AAAA,QACH,CAAC;AAAA,MACH,CAAC;AACD,kBAAY;AAAA,IACd;AACA,QAAI,kBAAkB;AACtB,mBAAe,OAAO,OAAO;AAC3B,UAAI,CAAC,MAAM;AACT,cAAM,eAAe,MAAM;AAC7B,kBAAY;AACZ,wBAAkB;AAClB,sCAAgC,MAAM;AACpC,kBAAU,KAAK;AAAA,MACjB,CAAC;AACD,kBAAY;AACZ,wBAAkB;AAAA,IACpB;AACA,uBAAmB,IAAI;AACrB,UAAI,uBAAuB;AAC3B,UAAI,gBAAgB,CAAC,KAAK,aAAa;AACrC,aAAK,KAAK,CAAC,KAAK,SAAS;AACvB,cAAI,wBAAwB,OAAO,GAAG;AACpC,mBAAO,KAAK;AACd,iCAAuB;AACvB,mBAAS,KAAK,IAAI;AAAA,QACpB,CAAC;AAAA,MACH;AACA,eAAS,IAAI,aAAa;AAAA,IAC5B;AACA,6CAAyC,UAAU;AACjD,UAAI,QAAQ;AACZ,qBAAe,CAAC,WAAW,OAAO;AAChC,YAAI,eAAe,MAAM,SAAS;AAClC,gBAAQ,YAAY;AACpB,eAAO,MAAM;AAAA,QACb;AAAA,MACF,CAAC;AACD,eAAS;AACT,qBAAe,KAAK;AAAA,IACtB;AAGA,kBAAc,IAAI,MAAM,OAAO,YAAY,CAAC,GAAG;AAC7C,UAAI,CAAC,GAAG;AACN,WAAG,cAAc,SAAS,CAAC,CAAC;AAC9B,SAAG,YAAY,QAAQ;AACvB,aAAO,UAAU,SAAS,OAAO,IAAI,UAAU,IAAI,IAAI;AACvD,cAAQ;AAAA,aACD;AACH,yBAAe,IAAI,KAAK;AACxB;AAAA,aACG;AACH,qBAAW,IAAI,KAAK;AACpB;AAAA,aACG;AACH,sBAAY,IAAI,KAAK;AACrB;AAAA,aACG;AAAA,aACA;AACH,mCAAyB,IAAI,MAAM,KAAK;AACxC;AAAA;AAEA,wBAAc,IAAI,MAAM,KAAK;AAC7B;AAAA;AAAA,IAEN;AACA,4BAAwB,IAAI,OAAO;AACjC,UAAI,QAAQ,EAAE,GAAG;AACf,YAAI,GAAG,WAAW,UAAU,QAAQ;AAClC,aAAG,QAAQ;AAAA,QACb;AACA,YAAI,OAAO,WAAW;AACpB,cAAI,OAAO,UAAU,WAAW;AAC9B,eAAG,UAAU,iBAAiB,GAAG,KAAK,MAAM;AAAA,UAC9C,OAAO;AACL,eAAG,UAAU,wBAAwB,GAAG,OAAO,KAAK;AAAA,UACtD;AAAA,QACF;AAAA,MACF,WAAW,WAAW,EAAE,GAAG;AACzB,YAAI,OAAO,UAAU,KAAK,GAAG;AAC3B,aAAG,QAAQ;AAAA,QACb,WAAW,CAAC,MAAM,QAAQ,KAAK,KAAK,OAAO,UAAU,aAAa,CAAC,CAAC,MAAM,MAAM,EAAE,SAAS,KAAK,GAAG;AACjG,aAAG,QAAQ,OAAO,KAAK;AAAA,QACzB,OAAO;AACL,cAAI,MAAM,QAAQ,KAAK,GAAG;AACxB,eAAG,UAAU,MAAM,KAAK,CAAC,QAAQ,wBAAwB,KAAK,GAAG,KAAK,CAAC;AAAA,UACzE,OAAO;AACL,eAAG,UAAU,CAAC,CAAC;AAAA,UACjB;AAAA,QACF;AAAA,MACF,WAAW,GAAG,YAAY,UAAU;AAClC,qBAAa,IAAI,KAAK;AAAA,MACxB,OAAO;AACL,YAAI,GAAG,UAAU;AACf;AACF,WAAG,QAAQ,UAAU,SAAS,KAAK;AAAA,MACrC;AAAA,IACF;AACA,yBAAqB,IAAI,OAAO;AAC9B,UAAI,GAAG;AACL,WAAG,oBAAoB;AACzB,SAAG,sBAAsB,WAAW,IAAI,KAAK;AAAA,IAC/C;AACA,wBAAoB,IAAI,OAAO;AAC7B,UAAI,GAAG;AACL,WAAG,mBAAmB;AACxB,SAAG,qBAAqB,UAAU,IAAI,KAAK;AAAA,IAC7C;AACA,sCAAkC,IAAI,MAAM,OAAO;AACjD,oBAAc,IAAI,MAAM,KAAK;AAC7B,2BAAqB,IAAI,MAAM,KAAK;AAAA,IACtC;AACA,2BAAuB,IAAI,MAAM,OAAO;AACtC,UAAI,CAAC,MAAM,QAAQ,KAAK,EAAE,SAAS,KAAK,KAAK,oCAAoC,IAAI,GAAG;AACtF,WAAG,gBAAgB,IAAI;AAAA,MACzB,OAAO;AACL,YAAI,cAAc,IAAI;AACpB,kBAAQ;AACV,qBAAa,IAAI,MAAM,KAAK;AAAA,MAC9B;AAAA,IACF;AACA,0BAAsB,IAAI,UAAU,OAAO;AACzC,UAAI,GAAG,aAAa,QAAQ,KAAK,OAAO;AACtC,WAAG,aAAa,UAAU,KAAK;AAAA,MACjC;AAAA,IACF;AACA,kCAA8B,IAAI,UAAU,OAAO;AACjD,UAAI,GAAG,cAAc,OAAO;AAC1B,WAAG,YAAY;AAAA,MACjB;AAAA,IACF;AACA,0BAAsB,IAAI,OAAO;AAC/B,YAAM,oBAAoB,CAAC,EAAE,OAAO,KAAK,EAAE,IAAI,CAAC,WAAW;AACzD,eAAO,SAAS;AAAA,MAClB,CAAC;AACD,YAAM,KAAK,GAAG,OAAO,EAAE,QAAQ,CAAC,WAAW;AACzC,eAAO,WAAW,kBAAkB,SAAS,OAAO,KAAK;AAAA,MAC3D,CAAC;AAAA,IACH;AACA,uBAAmB,SAAS;AAC1B,aAAO,QAAQ,YAAY,EAAE,QAAQ,UAAU,CAAC,OAAO,SAAS,KAAK,YAAY,CAAC;AAAA,IACpF;AACA,qCAAiC,QAAQ,QAAQ;AAC/C,aAAO,UAAU;AAAA,IACnB;AACA,8BAA0B,UAAU;AAClC,UAAI,CAAC,GAAG,KAAK,QAAQ,MAAM,OAAO,IAAI,EAAE,SAAS,QAAQ,GAAG;AAC1D,eAAO;AAAA,MACT;AACA,UAAI,CAAC,GAAG,KAAK,SAAS,OAAO,MAAM,KAAK,EAAE,SAAS,QAAQ,GAAG;AAC5D,eAAO;AAAA,MACT;AACA,aAAO,WAAW,QAAQ,QAAQ,IAAI;AAAA,IACxC;AACA,QAAI,oBAAoC,oBAAI,IAAI;AAAA,MAC9C;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,IACF,CAAC;AACD,2BAAuB,UAAU;AAC/B,aAAO,kBAAkB,IAAI,QAAQ;AAAA,IACvC;AACA,iDAA6C,MAAM;AACjD,aAAO,CAAC,CAAC,gBAAgB,gBAAgB,iBAAiB,eAAe,EAAE,SAAS,IAAI;AAAA,IAC1F;AACA,wBAAoB,IAAI,MAAM,WAAU;AACtC,UAAI,GAAG,eAAe,GAAG,YAAY,UAAU;AAC7C,eAAO,GAAG,YAAY;AACxB,aAAO,oBAAoB,IAAI,MAAM,SAAQ;AAAA,IAC/C;AACA,yBAAqB,IAAI,MAAM,WAAU,UAAU,MAAM;AACvD,UAAI,GAAG,eAAe,GAAG,YAAY,UAAU;AAC7C,eAAO,GAAG,YAAY;AACxB,UAAI,GAAG,qBAAqB,GAAG,kBAAkB,UAAU,QAAQ;AACjE,YAAI,UAAU,GAAG,kBAAkB;AACnC,gBAAQ,UAAU;AAClB,eAAO,0BAA0B,MAAM;AACrC,iBAAO,SAAS,IAAI,QAAQ,UAAU;AAAA,QACxC,CAAC;AAAA,MACH;AACA,aAAO,oBAAoB,IAAI,MAAM,SAAQ;AAAA,IAC/C;AACA,iCAA6B,IAAI,MAAM,WAAU;AAC/C,UAAI,OAAO,GAAG,aAAa,IAAI;AAC/B,UAAI,SAAS;AACX,eAAO,OAAO,cAAa,aAAa,UAAS,IAAI;AACvD,UAAI,SAAS;AACX,eAAO;AACT,UAAI,cAAc,IAAI,GAAG;AACvB,eAAO,CAAC,CAAC,CAAC,MAAM,MAAM,EAAE,SAAS,IAAI;AAAA,MACvC;AACA,aAAO;AAAA,IACT;AACA,wBAAoB,IAAI;AACtB,aAAO,GAAG,SAAS,cAAc,GAAG,cAAc,iBAAiB,GAAG,cAAc;AAAA,IACtF;AACA,qBAAiB,IAAI;AACnB,aAAO,GAAG,SAAS,WAAW,GAAG,cAAc;AAAA,IACjD;AAGA,uBAAkB,MAAM,MAAM;AAC5B,UAAI;AACJ,aAAO,WAAW;AAChB,YAAI,UAAU,MAAM,OAAO;AAC3B,YAAI,QAAQ,WAAW;AACrB,oBAAU;AACV,eAAK,MAAM,SAAS,IAAI;AAAA,QAC1B;AACA,qBAAa,OAAO;AACpB,kBAAU,WAAW,OAAO,IAAI;AAAA,MAClC;AAAA,IACF;AAGA,sBAAkB,MAAM,OAAO;AAC7B,UAAI;AACJ,aAAO,WAAW;AAChB,YAAI,UAAU,MAAM,OAAO;AAC3B,YAAI,CAAC,YAAY;AACf,eAAK,MAAM,SAAS,IAAI;AACxB,uBAAa;AACb,qBAAW,MAAM,aAAa,OAAO,KAAK;AAAA,QAC5C;AAAA,MACF;AAAA,IACF;AAGA,sBAAkB,EAAE,KAAK,UAAU,KAAK,YAAY,EAAE,KAAK,UAAU,KAAK,YAAY;AACpF,UAAI,WAAW;AACf,UAAI;AACJ,UAAI;AACJ,UAAI,YAAY,OAAO,MAAM;AAC3B,YAAI,QAAQ,SAAS;AACrB,YAAI,QAAQ,SAAS;AACrB,YAAI,UAAU;AACZ,mBAAS,eAAc,KAAK,CAAC;AAC7B,qBAAW;AAAA,QACb,OAAO;AACL,cAAI,kBAAkB,KAAK,UAAU,KAAK;AAC1C,cAAI,kBAAkB,KAAK,UAAU,KAAK;AAC1C,cAAI,oBAAoB,WAAW;AACjC,qBAAS,eAAc,KAAK,CAAC;AAAA,UAC/B,WAAW,oBAAoB,iBAAiB;AAC9C,qBAAS,eAAc,KAAK,CAAC;AAAA,UAC/B,OAAO;AAAA,UACP;AAAA,QACF;AACA,oBAAY,KAAK,UAAU,SAAS,CAAC;AACrC,oBAAY,KAAK,UAAU,SAAS,CAAC;AAAA,MACvC,CAAC;AACD,aAAO,MAAM;AACX,gBAAQ,SAAS;AAAA,MACnB;AAAA,IACF;AACA,4BAAuB,OAAO;AAC5B,aAAO,OAAO,UAAU,WAAW,KAAK,MAAM,KAAK,UAAU,KAAK,CAAC,IAAI;AAAA,IACzE;AAGA,oBAAgB,UAAU;AACxB,UAAI,YAAY,MAAM,QAAQ,QAAQ,IAAI,WAAW,CAAC,QAAQ;AAC9D,gBAAU,QAAQ,CAAC,MAAM,EAAE,cAAc,CAAC;AAAA,IAC5C;AAGA,QAAI,SAAS,CAAC;AACd,QAAI,aAAa;AACjB,mBAAe,MAAM,OAAO;AAC1B,UAAI,CAAC,YAAY;AACf,iBAAS,SAAS,MAAM;AACxB,qBAAa;AAAA,MACf;AACA,UAAI,UAAU,QAAQ;AACpB,eAAO,OAAO;AAAA,MAChB;AACA,aAAO,QAAQ;AACf,uBAAiB,OAAO,KAAK;AAC7B,UAAI,OAAO,UAAU,YAAY,UAAU,QAAQ,MAAM,eAAe,MAAM,KAAK,OAAO,MAAM,SAAS,YAAY;AACnH,eAAO,MAAM,KAAK;AAAA,MACpB;AAAA,IACF;AACA,yBAAqB;AACnB,aAAO;AAAA,IACT;AAGA,QAAI,QAAQ,CAAC;AACb,mBAAe,MAAM,UAAU;AAC7B,UAAI,cAAc,OAAO,aAAa,aAAa,MAAM,WAAW;AACpE,UAAI,gBAAgB,SAAS;AAC3B,eAAO,oBAAoB,MAAM,YAAY,CAAC;AAAA,MAChD,OAAO;AACL,cAAM,QAAQ;AAAA,MAChB;AACA,aAAO,MAAM;AAAA,MACb;AAAA,IACF;AACA,oCAAgC,KAAK;AACnC,aAAO,QAAQ,KAAK,EAAE,QAAQ,CAAC,CAAC,MAAM,cAAc;AAClD,eAAO,eAAe,KAAK,MAAM;AAAA,UAC/B,MAAM;AACJ,mBAAO,IAAI,SAAS;AAClB,qBAAO,SAAS,GAAG,IAAI;AAAA,YACzB;AAAA,UACF;AAAA,QACF,CAAC;AAAA,MACH,CAAC;AACD,aAAO;AAAA,IACT;AACA,iCAA6B,IAAI,KAAK,UAAU;AAC9C,UAAI,iBAAiB,CAAC;AACtB,aAAO,eAAe;AACpB,uBAAe,IAAI,EAAE;AACvB,UAAI,aAAa,OAAO,QAAQ,GAAG,EAAE,IAAI,CAAC,CAAC,MAAM,WAAY,GAAE,MAAM,MAAM,EAAE;AAC7E,UAAI,mBAAmB,eAAe,UAAU;AAChD,mBAAa,WAAW,IAAI,CAAC,cAAc;AACzC,YAAI,iBAAiB,KAAK,CAAC,SAAS,KAAK,SAAS,UAAU,IAAI,GAAG;AACjE,iBAAO;AAAA,YACL,MAAM,UAAU,UAAU;AAAA,YAC1B,OAAO,IAAI,UAAU;AAAA,UACvB;AAAA,QACF;AACA,eAAO;AAAA,MACT,CAAC;AACD,iBAAW,IAAI,YAAY,QAAQ,EAAE,IAAI,CAAC,WAAW;AACnD,uBAAe,KAAK,OAAO,WAAW;AACtC,eAAO;AAAA,MACT,CAAC;AACD,aAAO,MAAM;AACX,eAAO,eAAe;AACpB,yBAAe,IAAI,EAAE;AAAA,MACzB;AAAA,IACF;AAGA,QAAI,QAAQ,CAAC;AACb,kBAAc,MAAM,UAAU;AAC5B,YAAM,QAAQ;AAAA,IAChB;AACA,iCAA6B,KAAK,SAAS;AACzC,aAAO,QAAQ,KAAK,EAAE,QAAQ,CAAC,CAAC,MAAM,cAAc;AAClD,eAAO,eAAe,KAAK,MAAM;AAAA,UAC/B,MAAM;AACJ,mBAAO,IAAI,SAAS;AAClB,qBAAO,SAAS,KAAK,OAAO,EAAE,GAAG,IAAI;AAAA,YACvC;AAAA,UACF;AAAA,UACA,YAAY;AAAA,QACd,CAAC;AAAA,MACH,CAAC;AACD,aAAO;AAAA,IACT;AAGA,QAAI,WAAS;AAAA,MACX,IAAI,WAAW;AACb,eAAO;AAAA,MACT;AAAA,MACA,IAAI,UAAU;AACZ,eAAO;AAAA,MACT;AAAA,MACA,IAAI,SAAS;AACX,eAAO;AAAA,MACT;AAAA,MACA,IAAI,MAAM;AACR,eAAO;AAAA,MACT;AAAA,MACA,SAAS;AAAA,MACT;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MAEA;AAAA,MAEA;AAAA,MAEA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA,UAAU;AAAA,MACV,QAAQ;AAAA,MACR;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MAEA;AAAA,MAEA,OAAO;AAAA,MACP,OAAO;AAAA,MACP;AAAA,MACA;AAAA,MACA;AAAA,MACA,MAAM;AAAA,IACR;AACA,QAAI,iBAAiB;AAGrB,QAAI,sBAAsB,SAAQ,mBAAmB,CAAC;AAGtD,UAAM,YAAY,MAAM,QAAQ;AAGhC,UAAM,YAAY,CAAC,OAAO,UAAS,KAAK,WAAU,EAAE,CAAC;AAGrD,UAAM,SAAS,CAAC,IAAI,EAAE,eAAe,gBAAgB,cAAc,CAAC,KAAK,aAAa;AACpF,UAAI,YAAY,eAAe,GAAG;AAClC,UAAI,SAAS,MAAM;AACjB,YAAI;AACJ,kBAAU,CAAC,MAAM,QAAQ,CAAC;AAC1B,eAAO;AAAA,MACT;AACA,UAAI,UAAU,MAAM,QAAQ,QAAQ;AACpC,cAAQ,OAAO;AAAA,IACjB,CAAC;AAGD,UAAM,SAAS,SAAS;AAGxB,UAAM,QAAQ,CAAC,OAAO,MAAM,EAAE,CAAC;AAG/B,UAAM,QAAQ,CAAC,OAAO,YAAY,EAAE,CAAC;AAGrC,UAAM,QAAQ,CAAC,OAAO;AACpB,UAAI,GAAG;AACL,eAAO,GAAG;AACZ,SAAG,gBAAgB,aAAa,oBAAoB,EAAE,CAAC;AACvD,aAAO,GAAG;AAAA,IACZ,CAAC;AACD,iCAA6B,IAAI;AAC/B,UAAI,aAAa,CAAC;AAClB,kBAAY,IAAI,CAAC,MAAM;AACrB,YAAI,EAAE;AACJ,qBAAW,KAAK,EAAE,OAAO;AAAA,MAC7B,CAAC;AACD,aAAO;AAAA,IACT;AAGA,QAAI,eAAe,CAAC;AACpB,gCAA4B,MAAM;AAChC,UAAI,CAAC,aAAa;AAChB,qBAAa,QAAQ;AACvB,aAAO,EAAE,aAAa;AAAA,IACxB;AACA,2BAAuB,IAAI,MAAM;AAC/B,aAAO,YAAY,IAAI,CAAC,YAAY;AAClC,YAAI,QAAQ,UAAU,QAAQ,OAAO;AACnC,iBAAO;AAAA,MACX,CAAC;AAAA,IACH;AACA,uBAAmB,IAAI,MAAM;AAC3B,UAAI,CAAC,GAAG;AACN,WAAG,SAAS,CAAC;AACf,UAAI,CAAC,GAAG,OAAO;AACb,WAAG,OAAO,QAAQ,mBAAmB,IAAI;AAAA,IAC7C;AAGA,UAAM,MAAM,CAAC,IAAI,EAAE,cAAc,CAAC,MAAM,MAAM,SAAS;AACrD,UAAI,WAAW,GAAG,OAAO,MAAM,IAAI,QAAQ;AAC3C,aAAO,uBAAuB,IAAI,UAAU,SAAS,MAAM;AACzD,YAAI,OAAO,cAAc,IAAI,IAAI;AACjC,YAAI,KAAK,OAAO,KAAK,OAAO,QAAQ,mBAAmB,IAAI;AAC3D,eAAO,MAAM,GAAG,QAAQ,MAAM,QAAQ,GAAG,QAAQ;AAAA,MACnD,CAAC;AAAA,IACH,CAAC;AACD,mBAAe,CAAC,MAAM,OAAO;AAC3B,UAAI,KAAK,OAAO;AACd,WAAG,QAAQ,KAAK;AAAA,MAClB;AAAA,IACF,CAAC;AACD,oCAAgC,IAAI,UAAU,SAAS,UAAU;AAC/D,UAAI,CAAC,GAAG;AACN,WAAG,QAAQ,CAAC;AACd,UAAI,GAAG,MAAM;AACX,eAAO,GAAG,MAAM;AAClB,UAAI,SAAS,SAAS;AACtB,SAAG,MAAM,YAAY;AACrB,cAAQ,MAAM;AACZ,eAAO,GAAG,MAAM;AAAA,MAClB,CAAC;AACD,aAAO;AAAA,IACT;AAGA,UAAM,MAAM,CAAC,OAAO,EAAE;AAGtB,2BAAuB,SAAS,SAAS,OAAO;AAChD,2BAAuB,WAAW,WAAW,SAAS;AACtD,oCAAgC,MAAM,WAAW,MAAM;AACrD,YAAM,WAAW,CAAC,OAAO,KAAK,mBAAmB,4CAA4C,mDAAmD,QAAQ,EAAE,CAAC;AAAA,IAC7J;AAGA,eAAU,aAAa,CAAC,IAAI,EAAE,cAAc,EAAE,QAAQ,SAAS,eAAe,gBAAgB,cAAc;AAC1G,UAAI,OAAO,eAAe,UAAU;AACpC,UAAI,WAAW,MAAM;AACnB,YAAI;AACJ,aAAK,CAAC,MAAM,SAAS,CAAC;AACtB,eAAO;AAAA,MACT;AACA,UAAI,mBAAmB,eAAe,GAAG,4BAA4B;AACrE,UAAI,WAAW,CAAC,QAAQ,iBAAiB,MAAM;AAAA,MAC/C,GAAG,EAAE,OAAO,EAAE,iBAAiB,IAAI,EAAE,CAAC;AACtC,UAAI,eAAe,SAAS;AAC5B,eAAS,YAAY;AACrB,qBAAe,MAAM;AACnB,YAAI,CAAC,GAAG;AACN;AACF,WAAG,wBAAwB,WAAW;AACtC,YAAI,WAAW,GAAG,SAAS;AAC3B,YAAI,WAAW,GAAG,SAAS;AAC3B,YAAI,sBAAsB,SACxB;AAAA,UACE,MAAM;AACJ,mBAAO,SAAS;AAAA,UAClB;AAAA,UACA,IAAI,OAAO;AACT,qBAAS,KAAK;AAAA,UAChB;AAAA,QACF,GACA;AAAA,UACE,MAAM;AACJ,mBAAO,SAAS;AAAA,UAClB;AAAA,UACA,IAAI,OAAO;AACT,qBAAS,KAAK;AAAA,UAChB;AAAA,QACF,CACF;AACA,gBAAQ,mBAAmB;AAAA,MAC7B,CAAC;AAAA,IACH,CAAC;AAGD,eAAU,YAAY,CAAC,IAAI,EAAE,WAAW,cAAc,EAAE,cAAc;AACpE,UAAI,GAAG,QAAQ,YAAY,MAAM;AAC/B,aAAK,mDAAmD,EAAE;AAC5D,UAAI,SAAS,UAAU,UAAU;AACjC,UAAI,SAAS,GAAG,QAAQ,UAAU,IAAI,EAAE;AACxC,SAAG,cAAc;AACjB,aAAO,kBAAkB;AACzB,SAAG,aAAa,0BAA0B,IAAI;AAC9C,aAAO,aAAa,wBAAwB,IAAI;AAChD,UAAI,GAAG,kBAAkB;AACvB,WAAG,iBAAiB,QAAQ,CAAC,cAAc;AACzC,iBAAO,iBAAiB,WAAW,CAAC,MAAM;AACxC,cAAE,gBAAgB;AAClB,eAAG,cAAc,IAAI,EAAE,YAAY,EAAE,MAAM,CAAC,CAAC;AAAA,UAC/C,CAAC;AAAA,QACH,CAAC;AAAA,MACH;AACA,qBAAe,QAAQ,CAAC,GAAG,EAAE;AAC7B,UAAI,aAAa,CAAC,QAAQ,SAAS,eAAe;AAChD,YAAI,WAAW,SAAS,SAAS,GAAG;AAClC,kBAAQ,WAAW,aAAa,QAAQ,OAAO;AAAA,QACjD,WAAW,WAAW,SAAS,QAAQ,GAAG;AACxC,kBAAQ,WAAW,aAAa,QAAQ,QAAQ,WAAW;AAAA,QAC7D,OAAO;AACL,kBAAQ,YAAY,MAAM;AAAA,QAC5B;AAAA,MACF;AACA,gBAAU,MAAM;AACd,mBAAW,QAAQ,QAAQ,SAAS;AACpC,wBAAgB,MAAM;AACpB,mBAAS,MAAM;AAAA,QACjB,CAAC,EAAE;AAAA,MACL,CAAC;AACD,SAAG,qBAAqB,MAAM;AAC5B,YAAI,UAAU,UAAU,UAAU;AAClC,kBAAU,MAAM;AACd,qBAAW,GAAG,aAAa,SAAS,SAAS;AAAA,QAC/C,CAAC;AAAA,MACH;AACA,cACE,MAAM,UAAU,MAAM;AACpB,eAAO,OAAO;AACd,oBAAY,MAAM;AAAA,MACpB,CAAC,CACH;AAAA,IACF,CAAC;AACD,QAAI,+BAA+B,SAAS,cAAc,KAAK;AAC/D,uBAAmB,YAAY;AAC7B,UAAI,SAAS,gBAAgB,MAAM;AACjC,eAAO,SAAS,cAAc,UAAU;AAAA,MAC1C,GAAG,MAAM;AACP,eAAO;AAAA,MACT,CAAC,EAAE;AACH,UAAI,CAAC;AACH,aAAK,iDAAiD,aAAa;AACrE,aAAO;AAAA,IACT;AAGA,QAAI,UAAU,MAAM;AAAA,IACpB;AACA,YAAQ,SAAS,CAAC,IAAI,EAAE,aAAa,EAAE,cAAc;AACnD,gBAAU,SAAS,MAAM,IAAI,GAAG,gBAAgB,OAAO,GAAG,YAAY;AACtE,cAAQ,MAAM;AACZ,kBAAU,SAAS,MAAM,IAAI,OAAO,GAAG,gBAAgB,OAAO,GAAG;AAAA,MACnE,CAAC;AAAA,IACH;AACA,eAAU,UAAU,OAAO;AAG3B,eAAU,UAAU,gBAAgB,CAAC,IAAI,EAAE,cAAc,EAAE,QAAQ,cAAc;AAC/E,cAAQ,cAAc,IAAI,UAAU,CAAC;AAAA,IACvC,CAAC,CAAC;AAGF,iBAAY,IAAI,OAAO,WAAW,UAAU;AAC1C,UAAI,iBAAiB;AACrB,UAAI,WAAW,CAAC,MAAM,SAAS,CAAC;AAChC,UAAI,UAAU,CAAC;AACf,UAAI,cAAc,CAAC,WAAW,YAAY,CAAC,MAAM,QAAQ,WAAW,CAAC;AACrE,UAAI,UAAU,SAAS,KAAK;AAC1B,gBAAQ,UAAU,KAAK;AACzB,UAAI,UAAU,SAAS,OAAO;AAC5B,gBAAQ,WAAW,KAAK;AAC1B,UAAI,UAAU,SAAS,SAAS;AAC9B,gBAAQ,UAAU;AACpB,UAAI,UAAU,SAAS,SAAS;AAC9B,gBAAQ,UAAU;AACpB,UAAI,UAAU,SAAS,QAAQ;AAC7B,yBAAiB;AACnB,UAAI,UAAU,SAAS,UAAU;AAC/B,yBAAiB;AACnB,UAAI,UAAU,SAAS,UAAU,GAAG;AAClC,YAAI,eAAe,UAAU,UAAU,QAAQ,UAAU,IAAI,MAAM;AACnE,YAAI,OAAO,UAAU,aAAa,MAAM,IAAI,EAAE,EAAE,IAAI,OAAO,aAAa,MAAM,IAAI,EAAE,EAAE,IAAI;AAC1F,mBAAW,UAAS,UAAU,IAAI;AAAA,MACpC;AACA,UAAI,UAAU,SAAS,UAAU,GAAG;AAClC,YAAI,eAAe,UAAU,UAAU,QAAQ,UAAU,IAAI,MAAM;AACnE,YAAI,OAAO,UAAU,aAAa,MAAM,IAAI,EAAE,EAAE,IAAI,OAAO,aAAa,MAAM,IAAI,EAAE,EAAE,IAAI;AAC1F,mBAAW,SAAS,UAAU,IAAI;AAAA,MACpC;AACA,UAAI,UAAU,SAAS,SAAS;AAC9B,mBAAW,YAAY,UAAU,CAAC,MAAM,MAAM;AAC5C,YAAE,eAAe;AACjB,eAAK,CAAC;AAAA,QACR,CAAC;AACH,UAAI,UAAU,SAAS,MAAM;AAC3B,mBAAW,YAAY,UAAU,CAAC,MAAM,MAAM;AAC5C,YAAE,gBAAgB;AAClB,eAAK,CAAC;AAAA,QACR,CAAC;AACH,UAAI,UAAU,SAAS,MAAM,GAAG;AAC9B,mBAAW,YAAY,UAAU,CAAC,MAAM,MAAM;AAC5C,eAAK,CAAC;AACN,yBAAe,oBAAoB,OAAO,UAAU,OAAO;AAAA,QAC7D,CAAC;AAAA,MACH;AACA,UAAI,UAAU,SAAS,MAAM,KAAK,UAAU,SAAS,SAAS,GAAG;AAC/D,yBAAiB;AACjB,mBAAW,YAAY,UAAU,CAAC,MAAM,MAAM;AAC5C,cAAI,GAAG,SAAS,EAAE,MAAM;AACtB;AACF,cAAI,EAAE,OAAO,gBAAgB;AAC3B;AACF,cAAI,GAAG,cAAc,KAAK,GAAG,eAAe;AAC1C;AACF,cAAI,GAAG,eAAe;AACpB;AACF,eAAK,CAAC;AAAA,QACR,CAAC;AAAA,MACH;AACA,UAAI,UAAU,SAAS,MAAM;AAC3B,mBAAW,YAAY,UAAU,CAAC,MAAM,MAAM;AAC5C,YAAE,WAAW,MAAM,KAAK,CAAC;AAAA,QAC3B,CAAC;AACH,UAAI,WAAW,KAAK,KAAK,aAAa,KAAK,GAAG;AAC5C,mBAAW,YAAY,UAAU,CAAC,MAAM,MAAM;AAC5C,cAAI,+CAA+C,GAAG,SAAS,GAAG;AAChE;AAAA,UACF;AACA,eAAK,CAAC;AAAA,QACR,CAAC;AAAA,MACH;AACA,qBAAe,iBAAiB,OAAO,UAAU,OAAO;AACxD,aAAO,MAAM;AACX,uBAAe,oBAAoB,OAAO,UAAU,OAAO;AAAA,MAC7D;AAAA,IACF;AACA,uBAAmB,SAAS;AAC1B,aAAO,QAAQ,QAAQ,MAAM,GAAG;AAAA,IAClC;AACA,wBAAoB,SAAS;AAC3B,aAAO,QAAQ,YAAY,EAAE,QAAQ,UAAU,CAAC,OAAO,SAAS,KAAK,YAAY,CAAC;AAAA,IACpF;AACA,uBAAmB,SAAS;AAC1B,aAAO,CAAC,MAAM,QAAQ,OAAO,KAAK,CAAC,MAAM,OAAO;AAAA,IAClD;AACA,wBAAoB,SAAS;AAC3B,UAAI,CAAC,KAAK,GAAG,EAAE,SACb,OACF;AACE,eAAO;AACT,aAAO,QAAQ,QAAQ,mBAAmB,OAAO,EAAE,QAAQ,SAAS,GAAG,EAAE,YAAY;AAAA,IACvF;AACA,wBAAoB,OAAO;AACzB,aAAO,CAAC,WAAW,OAAO,EAAE,SAAS,KAAK;AAAA,IAC5C;AACA,0BAAsB,OAAO;AAC3B,aAAO,CAAC,eAAe,SAAS,OAAO,EAAE,KAAK,CAAC,MAAM,MAAM,SAAS,CAAC,CAAC;AAAA,IACxE;AACA,4DAAwD,GAAG,WAAW;AACpE,UAAI,eAAe,UAAU,OAAO,CAAC,MAAM;AACzC,eAAO,CAAC,CAAC,UAAU,YAAY,WAAW,QAAQ,QAAQ,WAAW,QAAQ,QAAQ,WAAW,SAAS,EAAE,SAAS,CAAC;AAAA,MACvH,CAAC;AACD,UAAI,aAAa,SAAS,UAAU,GAAG;AACrC,YAAI,gBAAgB,aAAa,QAAQ,UAAU;AACnD,qBAAa,OAAO,eAAe,UAAW,cAAa,gBAAgB,MAAM,gBAAgB,MAAM,IAAI,EAAE,EAAE,IAAI,IAAI,CAAC;AAAA,MAC1H;AACA,UAAI,aAAa,SAAS,UAAU,GAAG;AACrC,YAAI,gBAAgB,aAAa,QAAQ,UAAU;AACnD,qBAAa,OAAO,eAAe,UAAW,cAAa,gBAAgB,MAAM,gBAAgB,MAAM,IAAI,EAAE,EAAE,IAAI,IAAI,CAAC;AAAA,MAC1H;AACA,UAAI,aAAa,WAAW;AAC1B,eAAO;AACT,UAAI,aAAa,WAAW,KAAK,eAAe,EAAE,GAAG,EAAE,SAAS,aAAa,EAAE;AAC7E,eAAO;AACT,YAAM,qBAAqB,CAAC,QAAQ,SAAS,OAAO,QAAQ,OAAO,OAAO;AAC1E,YAAM,6BAA6B,mBAAmB,OAAO,CAAC,aAAa,aAAa,SAAS,QAAQ,CAAC;AAC1G,qBAAe,aAAa,OAAO,CAAC,MAAM,CAAC,2BAA2B,SAAS,CAAC,CAAC;AACjF,UAAI,2BAA2B,SAAS,GAAG;AACzC,cAAM,8BAA8B,2BAA2B,OAAO,CAAC,aAAa;AAClF,cAAI,aAAa,SAAS,aAAa;AACrC,uBAAW;AACb,iBAAO,EAAE,GAAG;AAAA,QACd,CAAC;AACD,YAAI,4BAA4B,WAAW,2BAA2B,QAAQ;AAC5E,cAAI,aAAa,EAAE,IAAI;AACrB,mBAAO;AACT,cAAI,eAAe,EAAE,GAAG,EAAE,SAAS,aAAa,EAAE;AAChD,mBAAO;AAAA,QACX;AAAA,MACF;AACA,aAAO;AAAA,IACT;AACA,4BAAwB,KAAK;AAC3B,UAAI,CAAC;AACH,eAAO,CAAC;AACV,YAAM,WAAW,GAAG;AACpB,UAAI,mBAAmB;AAAA,QACrB,QAAQ;AAAA,QACR,SAAS;AAAA,QACT,SAAS;AAAA,QACT,YAAY;AAAA,QACZ,OAAO;AAAA,QACP,OAAO;AAAA,QACP,MAAM;AAAA,QACN,QAAQ;AAAA,QACR,QAAQ;AAAA,QACR,SAAS;AAAA,QACT,UAAU;AAAA,QACV,SAAS;AAAA,QACT,SAAS;AAAA,QACT,SAAS;AAAA,QACT,cAAc;AAAA,MAChB;AACA,uBAAiB,OAAO;AACxB,aAAO,OAAO,KAAK,gBAAgB,EAAE,IAAI,CAAC,aAAa;AACrD,YAAI,iBAAiB,cAAc;AACjC,iBAAO;AAAA,MACX,CAAC,EAAE,OAAO,CAAC,aAAa,QAAQ;AAAA,IAClC;AAGA,eAAU,SAAS,CAAC,IAAI,EAAE,WAAW,cAAc,EAAE,QAAQ,SAAS,cAAc;AAClF,UAAI,cAAc;AAClB,UAAI,UAAU,SAAS,QAAQ,GAAG;AAChC,sBAAc,GAAG;AAAA,MACnB;AACA,UAAI,cAAc,cAAc,aAAa,UAAU;AACvD,UAAI;AACJ,UAAI,OAAO,eAAe,UAAU;AAClC,sBAAc,cAAc,aAAa,GAAG,4BAA4B;AAAA,MAC1E,WAAW,OAAO,eAAe,cAAc,OAAO,WAAW,MAAM,UAAU;AAC/E,sBAAc,cAAc,aAAa,GAAG,WAAW,mBAAmB;AAAA,MAC5E,OAAO;AACL,sBAAc,MAAM;AAAA,QACpB;AAAA,MACF;AACA,UAAI,WAAW,MAAM;AACnB,YAAI;AACJ,oBAAY,CAAC,UAAU,SAAS,KAAK;AACrC,eAAO,eAAe,MAAM,IAAI,OAAO,IAAI,IAAI;AAAA,MACjD;AACA,UAAI,WAAW,CAAC,UAAU;AACxB,YAAI;AACJ,oBAAY,CAAC,WAAW,SAAS,MAAM;AACvC,YAAI,eAAe,MAAM,GAAG;AAC1B,iBAAO,IAAI,KAAK;AAAA,QAClB,OAAO;AACL,sBAAY,MAAM;AAAA,UAClB,GAAG;AAAA,YACD,OAAO,EAAE,iBAAiB,MAAM;AAAA,UAClC,CAAC;AAAA,QACH;AAAA,MACF;AACA,UAAI,OAAO,eAAe,YAAY,GAAG,SAAS,SAAS;AACzD,kBAAU,MAAM;AACd,cAAI,CAAC,GAAG,aAAa,MAAM;AACzB,eAAG,aAAa,QAAQ,UAAU;AAAA,QACtC,CAAC;AAAA,MACH;AACA,UAAI,QAAQ,GAAG,QAAQ,YAAY,MAAM,YAAY,CAAC,YAAY,OAAO,EAAE,SAAS,GAAG,IAAI,KAAK,UAAU,SAAS,MAAM,IAAI,WAAW;AACxI,UAAI,iBAAiB,YAAY,MAAM;AAAA,MACvC,IAAI,IAAG,IAAI,OAAO,WAAW,CAAC,MAAM;AAClC,iBAAS,cAAc,IAAI,WAAW,GAAG,SAAS,CAAC,CAAC;AAAA,MACtD,CAAC;AACD,UAAI,UAAU,SAAS,MAAM,GAAG;AAC9B,YAAI,CAAC,QAAQ,MAAM,EAAE,EAAE,SAAS,SAAS,CAAC,KAAK,WAAW,EAAE,KAAK,MAAM,QAAQ,SAAS,CAAC,KAAK,GAAG,QAAQ,YAAY,MAAM,YAAY,GAAG,UAAU;AAClJ,mBACE,cAAc,IAAI,WAAW,EAAE,QAAQ,GAAG,GAAG,SAAS,CAAC,CACzD;AAAA,QACF;AAAA,MACF;AACA,UAAI,CAAC,GAAG;AACN,WAAG,0BAA0B,CAAC;AAChC,SAAG,wBAAwB,aAAa;AACxC,cAAQ,MAAM,GAAG,wBAAwB,WAAW,CAAC;AACrD,UAAI,GAAG,MAAM;AACX,YAAI,sBAAsB,IAAG,GAAG,MAAM,SAAS,CAAC,GAAG,CAAC,MAAM;AACxD,mBAAS,MAAM,GAAG,YAAY,GAAG,SAAS,IAAI,cAAc,IAAI,WAAW,EAAE,QAAQ,GAAG,GAAG,SAAS,CAAC,CAAC,CAAC;AAAA,QACzG,CAAC;AACD,gBAAQ,MAAM,oBAAoB,CAAC;AAAA,MACrC;AACA,SAAG,WAAW;AAAA,QACZ,MAAM;AACJ,iBAAO,SAAS;AAAA,QAClB;AAAA,QACA,IAAI,OAAO;AACT,mBAAS,KAAK;AAAA,QAChB;AAAA,MACF;AACA,SAAG,sBAAsB,CAAC,UAAU;AAClC,YAAI,UAAU,UAAU,OAAO,eAAe,YAAY,WAAW,MAAM,IAAI;AAC7E,kBAAQ;AACV,eAAO,YAAY;AACnB,kBAAU,MAAM,KAAK,IAAI,SAAS,KAAK,CAAC;AACxC,eAAO,OAAO;AAAA,MAChB;AACA,cAAQ,MAAM;AACZ,YAAI,QAAQ,SAAS;AACrB,YAAI,UAAU,SAAS,aAAa,KAAK,SAAS,cAAc,WAAW,EAAE;AAC3E;AACF,WAAG,oBAAoB,KAAK;AAAA,MAC9B,CAAC;AAAA,IACH,CAAC;AACD,2BAAuB,IAAI,WAAW,OAAO,cAAc;AACzD,aAAO,UAAU,MAAM;AACrB,YAAI,iBAAiB,eAAe,MAAM,WAAW;AACnD,iBAAO,MAAM,WAAW,QAAQ,MAAM,WAAW,SAAS,MAAM,SAAS,MAAM,OAAO;AAAA,iBAC/E,WAAW,EAAE,GAAG;AACvB,cAAI,MAAM,QAAQ,YAAY,GAAG;AAC/B,gBAAI,WAAW;AACf,gBAAI,UAAU,SAAS,QAAQ,GAAG;AAChC,yBAAW,gBAAgB,MAAM,OAAO,KAAK;AAAA,YAC/C,WAAW,UAAU,SAAS,SAAS,GAAG;AACxC,yBAAW,iBAAiB,MAAM,OAAO,KAAK;AAAA,YAChD,OAAO;AACL,yBAAW,MAAM,OAAO;AAAA,YAC1B;AACA,mBAAO,MAAM,OAAO,UAAU,aAAa,SAAS,QAAQ,IAAI,eAAe,aAAa,OAAO,CAAC,QAAQ,CAAC,IAAI,aAAa,OAAO,CAAC,QAAQ,CAAC,yBAAyB,KAAK,QAAQ,CAAC;AAAA,UACxL,OAAO;AACL,mBAAO,MAAM,OAAO;AAAA,UACtB;AAAA,QACF,WAAW,GAAG,QAAQ,YAAY,MAAM,YAAY,GAAG,UAAU;AAC/D,cAAI,UAAU,SAAS,QAAQ,GAAG;AAChC,mBAAO,MAAM,KAAK,MAAM,OAAO,eAAe,EAAE,IAAI,CAAC,WAAW;AAC9D,kBAAI,WAAW,OAAO,SAAS,OAAO;AACtC,qBAAO,gBAAgB,QAAQ;AAAA,YACjC,CAAC;AAAA,UACH,WAAW,UAAU,SAAS,SAAS,GAAG;AACxC,mBAAO,MAAM,KAAK,MAAM,OAAO,eAAe,EAAE,IAAI,CAAC,WAAW;AAC9D,kBAAI,WAAW,OAAO,SAAS,OAAO;AACtC,qBAAO,iBAAiB,QAAQ;AAAA,YAClC,CAAC;AAAA,UACH;AACA,iBAAO,MAAM,KAAK,MAAM,OAAO,eAAe,EAAE,IAAI,CAAC,WAAW;AAC9D,mBAAO,OAAO,SAAS,OAAO;AAAA,UAChC,CAAC;AAAA,QACH,OAAO;AACL,cAAI;AACJ,cAAI,QAAQ,EAAE,GAAG;AACf,gBAAI,MAAM,OAAO,SAAS;AACxB,yBAAW,MAAM,OAAO;AAAA,YAC1B,OAAO;AACL,yBAAW;AAAA,YACb;AAAA,UACF,OAAO;AACL,uBAAW,MAAM,OAAO;AAAA,UAC1B;AACA,cAAI,UAAU,SAAS,QAAQ,GAAG;AAChC,mBAAO,gBAAgB,QAAQ;AAAA,UACjC,WAAW,UAAU,SAAS,SAAS,GAAG;AACxC,mBAAO,iBAAiB,QAAQ;AAAA,UAClC,WAAW,UAAU,SAAS,MAAM,GAAG;AACrC,mBAAO,SAAS,KAAK;AAAA,UACvB,OAAO;AACL,mBAAO;AAAA,UACT;AAAA,QACF;AAAA,MACF,CAAC;AAAA,IACH;AACA,6BAAyB,UAAU;AACjC,UAAI,SAAS,WAAW,WAAW,QAAQ,IAAI;AAC/C,aAAO,WAAW,MAAM,IAAI,SAAS;AAAA,IACvC;AACA,sCAAkC,QAAQ,QAAQ;AAChD,aAAO,UAAU;AAAA,IACnB;AACA,wBAAoB,SAAS;AAC3B,aAAO,CAAC,MAAM,QAAQ,OAAO,KAAK,CAAC,MAAM,OAAO;AAAA,IAClD;AACA,4BAAwB,OAAO;AAC7B,aAAO,UAAU,QAAQ,OAAO,UAAU,YAAY,OAAO,MAAM,QAAQ,cAAc,OAAO,MAAM,QAAQ;AAAA,IAChH;AAGA,eAAU,SAAS,CAAC,OAAO,eAAe,MAAM,UAAU,MAAM,GAAG,gBAAgB,OAAO,OAAO,CAAC,CAAC,CAAC,CAAC;AAGrG,oBAAgB,MAAM,IAAI,OAAO,MAAM,IAAI;AAC3C,eAAU,QAAQ,gBAAgB,CAAC,IAAI,EAAE,cAAc,EAAE,UAAU,gBAAgB;AACjF,UAAI,OAAO,eAAe,UAAU;AAClC,eAAO,CAAC,CAAC,WAAW,KAAK,KAAK,UAAU,YAAY,CAAC,GAAG,KAAK;AAAA,MAC/D;AACA,aAAO,UAAU,YAAY,CAAC,GAAG,KAAK;AAAA,IACxC,CAAC,CAAC;AAGF,eAAU,QAAQ,CAAC,IAAI,EAAE,cAAc,EAAE,QAAQ,SAAS,eAAe,qBAAqB;AAC5F,UAAI,YAAY,eAAe,UAAU;AACzC,cAAQ,MAAM;AACZ,kBAAU,CAAC,UAAU;AACnB,oBAAU,MAAM;AACd,eAAG,cAAc;AAAA,UACnB,CAAC;AAAA,QACH,CAAC;AAAA,MACH,CAAC;AAAA,IACH,CAAC;AAGD,eAAU,QAAQ,CAAC,IAAI,EAAE,cAAc,EAAE,QAAQ,SAAS,eAAe,qBAAqB;AAC5F,UAAI,YAAY,eAAe,UAAU;AACzC,cAAQ,MAAM;AACZ,kBAAU,CAAC,UAAU;AACnB,oBAAU,MAAM;AACd,eAAG,YAAY;AACf,eAAG,gBAAgB;AACnB,qBAAS,EAAE;AACX,mBAAO,GAAG;AAAA,UACZ,CAAC;AAAA,QACH,CAAC;AAAA,MACH,CAAC;AAAA,IACH,CAAC;AAGD,kBAAc,aAAa,KAAK,KAAK,OAAO,OAAO,CAAC,CAAC,CAAC;AACtD,QAAI,WAAW,CAAC,IAAI,EAAE,OAAO,WAAW,YAAY,YAAY,EAAE,QAAQ,SAAS,cAAc;AAC/F,UAAI,CAAC,OAAO;AACV,YAAI,mBAAmB,CAAC;AACxB,+BAAuB,gBAAgB;AACvC,YAAI,cAAc,cAAc,IAAI,UAAU;AAC9C,oBAAY,CAAC,aAAa;AACxB,8BAAoB,IAAI,UAAU,QAAQ;AAAA,QAC5C,GAAG,EAAE,OAAO,iBAAiB,CAAC;AAC9B;AAAA,MACF;AACA,UAAI,UAAU;AACZ,eAAO,gBAAgB,IAAI,UAAU;AACvC,UAAI,GAAG,qBAAqB,GAAG,kBAAkB,UAAU,GAAG,kBAAkB,OAAO,SAAS;AAC9F;AAAA,MACF;AACA,UAAI,YAAY,cAAc,IAAI,UAAU;AAC5C,cAAQ,MAAM,UAAU,CAAC,WAAW;AAClC,YAAI,WAAW,UAAU,OAAO,eAAe,YAAY,WAAW,MAAM,IAAI,GAAG;AACjF,mBAAS;AAAA,QACX;AACA,kBAAU,MAAM,KAAK,IAAI,OAAO,QAAQ,SAAS,CAAC;AAAA,MACpD,CAAC,CAAC;AACF,cAAQ,MAAM;AACZ,WAAG,uBAAuB,GAAG,oBAAoB;AACjD,WAAG,sBAAsB,GAAG,mBAAmB;AAAA,MACjD,CAAC;AAAA,IACH;AACA,aAAS,SAAS,CAAC,IAAI,EAAE,OAAO,WAAW,iBAAiB;AAC1D,UAAI,CAAC;AACH;AACF,UAAI,CAAC,GAAG;AACN,WAAG,oBAAoB,CAAC;AAC1B,SAAG,kBAAkB,SAAS,EAAE,YAAY,SAAS,MAAM;AAAA,IAC7D;AACA,eAAU,QAAQ,QAAQ;AAC1B,6BAAyB,IAAI,YAAY;AACvC,SAAG,mBAAmB;AAAA,IACxB;AAGA,oBAAgB,MAAM,IAAI,OAAO,MAAM,IAAI;AAC3C,eAAU,QAAQ,CAAC,IAAI,EAAE,cAAc,EAAE,cAAc;AACrD,UAAI,qCAAqC,EAAE;AACzC;AACF,mBAAa,eAAe,KAAK,OAAO;AACxC,UAAI,eAAe,CAAC;AACpB,mBAAa,cAAc,EAAE;AAC7B,UAAI,sBAAsB,CAAC;AAC3B,0BAAoB,qBAAqB,YAAY;AACrD,UAAI,QAAQ,SAAS,IAAI,YAAY,EAAE,OAAO,oBAAoB,CAAC;AACnE,UAAI,UAAU,UAAU,UAAU;AAChC,gBAAQ,CAAC;AACX,mBAAa,OAAO,EAAE;AACtB,UAAI,eAAe,SAAS,KAAK;AACjC,uBAAiB,YAAY;AAC7B,UAAI,OAAO,eAAe,IAAI,YAAY;AAC1C,mBAAa,WAAW,SAAS,IAAI,aAAa,OAAO;AACzD,cAAQ,MAAM;AACZ,qBAAa,cAAc,SAAS,IAAI,aAAa,UAAU;AAC/D,aAAK;AAAA,MACP,CAAC;AAAA,IACH,CAAC;AACD,mBAAe,CAAC,MAAM,OAAO;AAC3B,UAAI,KAAK,cAAc;AACrB,WAAG,eAAe,KAAK;AACvB,WAAG,aAAa,yBAAyB,IAAI;AAAA,MAC/C;AAAA,IACF,CAAC;AACD,kDAA8C,IAAI;AAChD,UAAI,CAAC;AACH,eAAO;AACT,UAAI;AACF,eAAO;AACT,aAAO,GAAG,aAAa,uBAAuB;AAAA,IAChD;AAGA,eAAU,QAAQ,CAAC,IAAI,EAAE,WAAW,cAAc,EAAE,QAAQ,cAAc;AACxE,UAAI,YAAY,cAAc,IAAI,UAAU;AAC5C,UAAI,CAAC,GAAG;AACN,WAAG,YAAY,MAAM;AACnB,oBAAU,MAAM;AACd,eAAG,MAAM,YAAY,WAAW,QAAQ,UAAU,SAAS,WAAW,IAAI,cAAc,MAAM;AAAA,UAChG,CAAC;AAAA,QACH;AACF,UAAI,CAAC,GAAG;AACN,WAAG,YAAY,MAAM;AACnB,oBAAU,MAAM;AACd,gBAAI,GAAG,MAAM,WAAW,KAAK,GAAG,MAAM,YAAY,QAAQ;AACxD,iBAAG,gBAAgB,OAAO;AAAA,YAC5B,OAAO;AACL,iBAAG,MAAM,eAAe,SAAS;AAAA,YACnC;AAAA,UACF,CAAC;AAAA,QACH;AACF,UAAI,OAAO,MAAM;AACf,WAAG,UAAU;AACb,WAAG,aAAa;AAAA,MAClB;AACA,UAAI,OAAO,MAAM;AACf,WAAG,UAAU;AACb,WAAG,aAAa;AAAA,MAClB;AACA,UAAI,0BAA0B,MAAM,WAAW,IAAI;AACnD,UAAI,SAAS,KACX,CAAC,UAAU,QAAQ,KAAK,IAAI,KAAK,GACjC,CAAC,UAAU;AACT,YAAI,OAAO,GAAG,uCAAuC,YAAY;AAC/D,aAAG,mCAAmC,IAAI,OAAO,MAAM,IAAI;AAAA,QAC7D,OAAO;AACL,kBAAQ,wBAAwB,IAAI,KAAK;AAAA,QAC3C;AAAA,MACF,CACF;AACA,UAAI;AACJ,UAAI,YAAY;AAChB,cAAQ,MAAM,UAAU,CAAC,UAAU;AACjC,YAAI,CAAC,aAAa,UAAU;AAC1B;AACF,YAAI,UAAU,SAAS,WAAW;AAChC,kBAAQ,wBAAwB,IAAI,KAAK;AAC3C,eAAO,KAAK;AACZ,mBAAW;AACX,oBAAY;AAAA,MACd,CAAC,CAAC;AAAA,IACJ,CAAC;AAGD,eAAU,OAAO,CAAC,IAAI,EAAE,cAAc,EAAE,QAAQ,SAAS,cAAc;AACrE,UAAI,gBAAgB,mBAAmB,UAAU;AACjD,UAAI,gBAAgB,cAAc,IAAI,cAAc,KAAK;AACzD,UAAI,cAAc,cAChB,IAEA,GAAG,oBAAoB,OACzB;AACA,SAAG,cAAc,CAAC;AAClB,SAAG,YAAY,CAAC;AAChB,cAAQ,MAAM,KAAK,IAAI,eAAe,eAAe,WAAW,CAAC;AACjE,cAAQ,MAAM;AACZ,eAAO,OAAO,GAAG,SAAS,EAAE,QAAQ,CAAC,QAAQ,UAC3C,MAAM;AACJ,sBAAY,GAAG;AACf,cAAI,OAAO;AAAA,QACb,CACF,CAAC;AACD,eAAO,GAAG;AACV,eAAO,GAAG;AAAA,MACZ,CAAC;AAAA,IACH,CAAC;AACD,kBAAc,IAAI,eAAe,eAAe,aAAa;AAC3D,UAAI,YAAW,CAAC,MAAM,OAAO,MAAM,YAAY,CAAC,MAAM,QAAQ,CAAC;AAC/D,UAAI,aAAa;AACjB,oBAAc,CAAC,UAAU;AACvB,YAAI,WAAW,KAAK,KAAK,SAAS,GAAG;AACnC,kBAAQ,MAAM,KAAK,MAAM,KAAK,EAAE,KAAK,GAAG,CAAC,MAAM,IAAI,CAAC;AAAA,QACtD;AACA,YAAI,UAAU;AACZ,kBAAQ,CAAC;AACX,YAAI,SAAS,GAAG;AAChB,YAAI,WAAW,GAAG;AAClB,YAAI,SAAS,CAAC;AACd,YAAI,OAAO,CAAC;AACZ,YAAI,UAAS,KAAK,GAAG;AACnB,kBAAQ,OAAO,QAAQ,KAAK,EAAE,IAAI,CAAC,CAAC,KAAK,WAAW;AAClD,gBAAI,SAAS,2BAA2B,eAAe,OAAO,KAAK,KAAK;AACxE,wBAAY,CAAC,WAAW;AACtB,kBAAI,KAAK,SAAS,MAAM;AACtB,qBAAK,0BAA0B,EAAE;AACnC,mBAAK,KAAK,MAAM;AAAA,YAClB,GAAG,EAAE,OAAO,EAAE,OAAO,KAAK,GAAG,OAAO,EAAE,CAAC;AACvC,mBAAO,KAAK,MAAM;AAAA,UACpB,CAAC;AAAA,QACH,OAAO;AACL,mBAAS,IAAI,GAAG,IAAI,MAAM,QAAQ,KAAK;AACrC,gBAAI,SAAS,2BAA2B,eAAe,MAAM,IAAI,GAAG,KAAK;AACzE,wBAAY,CAAC,UAAU;AACrB,kBAAI,KAAK,SAAS,KAAK;AACrB,qBAAK,0BAA0B,EAAE;AACnC,mBAAK,KAAK,KAAK;AAAA,YACjB,GAAG,EAAE,OAAO,EAAE,OAAO,GAAG,GAAG,OAAO,EAAE,CAAC;AACrC,mBAAO,KAAK,MAAM;AAAA,UACpB;AAAA,QACF;AACA,YAAI,OAAO,CAAC;AACZ,YAAI,QAAQ,CAAC;AACb,YAAI,UAAU,CAAC;AACf,YAAI,QAAQ,CAAC;AACb,iBAAS,IAAI,GAAG,IAAI,SAAS,QAAQ,KAAK;AACxC,cAAI,MAAM,SAAS;AACnB,cAAI,KAAK,QAAQ,GAAG,MAAM;AACxB,oBAAQ,KAAK,GAAG;AAAA,QACpB;AACA,mBAAW,SAAS,OAAO,CAAC,QAAQ,CAAC,QAAQ,SAAS,GAAG,CAAC;AAC1D,YAAI,UAAU;AACd,iBAAS,IAAI,GAAG,IAAI,KAAK,QAAQ,KAAK;AACpC,cAAI,MAAM,KAAK;AACf,cAAI,YAAY,SAAS,QAAQ,GAAG;AACpC,cAAI,cAAc,IAAI;AACpB,qBAAS,OAAO,GAAG,GAAG,GAAG;AACzB,iBAAK,KAAK,CAAC,SAAS,CAAC,CAAC;AAAA,UACxB,WAAW,cAAc,GAAG;AAC1B,gBAAI,YAAY,SAAS,OAAO,GAAG,CAAC,EAAE;AACtC,gBAAI,aAAa,SAAS,OAAO,YAAY,GAAG,CAAC,EAAE;AACnD,qBAAS,OAAO,GAAG,GAAG,UAAU;AAChC,qBAAS,OAAO,WAAW,GAAG,SAAS;AACvC,kBAAM,KAAK,CAAC,WAAW,UAAU,CAAC;AAAA,UACpC,OAAO;AACL,kBAAM,KAAK,GAAG;AAAA,UAChB;AACA,oBAAU;AAAA,QACZ;AACA,iBAAS,IAAI,GAAG,IAAI,QAAQ,QAAQ,KAAK;AACvC,cAAI,MAAM,QAAQ;AAClB,cAAI,CAAE,QAAO;AACX;AACF,oBAAU,MAAM;AACd,wBAAY,OAAO,IAAI;AACvB,mBAAO,KAAK,OAAO;AAAA,UACrB,CAAC;AACD,iBAAO,OAAO;AAAA,QAChB;AACA,iBAAS,IAAI,GAAG,IAAI,MAAM,QAAQ,KAAK;AACrC,cAAI,CAAC,WAAW,cAAc,MAAM;AACpC,cAAI,WAAW,OAAO;AACtB,cAAI,YAAY,OAAO;AACvB,cAAI,SAAS,SAAS,cAAc,KAAK;AACzC,oBAAU,MAAM;AACd,gBAAI,CAAC;AACH,mBAAK,wCAAwC,YAAY,YAAY,MAAM;AAC7E,sBAAU,MAAM,MAAM;AACtB,qBAAS,MAAM,SAAS;AACxB,sBAAU,kBAAkB,UAAU,MAAM,UAAU,cAAc;AACpE,mBAAO,OAAO,QAAQ;AACtB,qBAAS,kBAAkB,SAAS,MAAM,SAAS,cAAc;AACjE,mBAAO,OAAO;AAAA,UAChB,CAAC;AACD,oBAAU,oBAAoB,OAAO,KAAK,QAAQ,UAAU,EAAE;AAAA,QAChE;AACA,iBAAS,IAAI,GAAG,IAAI,KAAK,QAAQ,KAAK;AACpC,cAAI,CAAC,UAAU,SAAS,KAAK;AAC7B,cAAI,SAAS,aAAa,aAAa,aAAa,OAAO;AAC3D,cAAI,OAAO;AACT,qBAAS,OAAO;AAClB,cAAI,SAAS,OAAO;AACpB,cAAI,MAAM,KAAK;AACf,cAAI,SAAS,SAAS,WAAW,WAAW,SAAS,IAAI,EAAE;AAC3D,cAAI,gBAAgB,SAAS,MAAM;AACnC,yBAAe,QAAQ,eAAe,UAAU;AAChD,iBAAO,sBAAsB,CAAC,aAAa;AACzC,mBAAO,QAAQ,QAAQ,EAAE,QAAQ,CAAC,CAAC,MAAM,WAAW;AAClD,4BAAc,QAAQ;AAAA,YACxB,CAAC;AAAA,UACH;AACA,oBAAU,MAAM;AACd,mBAAO,MAAM,MAAM;AACnB,4BAAgB,MAAM,SAAS,MAAM,CAAC,EAAE;AAAA,UAC1C,CAAC;AACD,cAAI,OAAO,QAAQ,UAAU;AAC3B,iBAAK,oEAAoE,UAAU;AAAA,UACrF;AACA,iBAAO,OAAO;AAAA,QAChB;AACA,iBAAS,IAAI,GAAG,IAAI,MAAM,QAAQ,KAAK;AACrC,iBAAO,MAAM,IAAI,oBAAoB,OAAO,KAAK,QAAQ,MAAM,EAAE,EAAE;AAAA,QACrE;AACA,mBAAW,cAAc;AAAA,MAC3B,CAAC;AAAA,IACH;AACA,gCAA4B,YAAY;AACtC,UAAI,gBAAgB;AACpB,UAAI,gBAAgB;AACpB,UAAI,aAAa;AACjB,UAAI,UAAU,WAAW,MAAM,UAAU;AACzC,UAAI,CAAC;AACH;AACF,UAAI,MAAM,CAAC;AACX,UAAI,QAAQ,QAAQ,GAAG,KAAK;AAC5B,UAAI,OAAO,QAAQ,GAAG,QAAQ,eAAe,EAAE,EAAE,KAAK;AACtD,UAAI,gBAAgB,KAAK,MAAM,aAAa;AAC5C,UAAI,eAAe;AACjB,YAAI,OAAO,KAAK,QAAQ,eAAe,EAAE,EAAE,KAAK;AAChD,YAAI,QAAQ,cAAc,GAAG,KAAK;AAClC,YAAI,cAAc,IAAI;AACpB,cAAI,aAAa,cAAc,GAAG,KAAK;AAAA,QACzC;AAAA,MACF,OAAO;AACL,YAAI,OAAO;AAAA,MACb;AACA,aAAO;AAAA,IACT;AACA,wCAAoC,eAAe,MAAM,OAAO,OAAO;AACrE,UAAI,iBAAiB,CAAC;AACtB,UAAI,WAAW,KAAK,cAAc,IAAI,KAAK,MAAM,QAAQ,IAAI,GAAG;AAC9D,YAAI,QAAQ,cAAc,KAAK,QAAQ,KAAK,EAAE,EAAE,QAAQ,KAAK,EAAE,EAAE,MAAM,GAAG,EAAE,IAAI,CAAC,MAAM,EAAE,KAAK,CAAC;AAC/F,cAAM,QAAQ,CAAC,MAAM,MAAM;AACzB,yBAAe,QAAQ,KAAK;AAAA,QAC9B,CAAC;AAAA,MACH,WAAW,WAAW,KAAK,cAAc,IAAI,KAAK,CAAC,MAAM,QAAQ,IAAI,KAAK,OAAO,SAAS,UAAU;AAClG,YAAI,QAAQ,cAAc,KAAK,QAAQ,KAAK,EAAE,EAAE,QAAQ,KAAK,EAAE,EAAE,MAAM,GAAG,EAAE,IAAI,CAAC,MAAM,EAAE,KAAK,CAAC;AAC/F,cAAM,QAAQ,CAAC,SAAS;AACtB,yBAAe,QAAQ,KAAK;AAAA,QAC9B,CAAC;AAAA,MACH,OAAO;AACL,uBAAe,cAAc,QAAQ;AAAA,MACvC;AACA,UAAI,cAAc;AAChB,uBAAe,cAAc,SAAS;AACxC,UAAI,cAAc;AAChB,uBAAe,cAAc,cAAc;AAC7C,aAAO;AAAA,IACT;AACA,wBAAoB,SAAS;AAC3B,aAAO,CAAC,MAAM,QAAQ,OAAO,KAAK,CAAC,MAAM,OAAO;AAAA,IAClD;AAGA,wBAAoB;AAAA,IACpB;AACA,aAAS,SAAS,CAAC,IAAI,EAAE,cAAc,EAAE,cAAc;AACrD,UAAI,OAAO,YAAY,EAAE;AACzB,UAAI,CAAC,KAAK;AACR,aAAK,UAAU,CAAC;AAClB,WAAK,QAAQ,cAAc;AAC3B,cAAQ,MAAM,OAAO,KAAK,QAAQ,WAAW;AAAA,IAC/C;AACA,eAAU,OAAO,QAAQ;AAGzB,eAAU,MAAM,CAAC,IAAI,EAAE,cAAc,EAAE,QAAQ,SAAS,cAAc;AACpE,UAAI,GAAG,QAAQ,YAAY,MAAM;AAC/B,aAAK,6CAA6C,EAAE;AACtD,UAAI,YAAY,cAAc,IAAI,UAAU;AAC5C,UAAI,OAAO,MAAM;AACf,YAAI,GAAG;AACL,iBAAO,GAAG;AACZ,YAAI,SAAS,GAAG,QAAQ,UAAU,IAAI,EAAE;AACxC,uBAAe,QAAQ,CAAC,GAAG,EAAE;AAC7B,kBAAU,MAAM;AACd,aAAG,MAAM,MAAM;AACf,0BAAgB,MAAM,SAAS,MAAM,CAAC,EAAE;AAAA,QAC1C,CAAC;AACD,WAAG,iBAAiB;AACpB,WAAG,YAAY,MAAM;AACnB,oBAAU,MAAM;AACd,wBAAY,MAAM;AAClB,mBAAO,OAAO;AAAA,UAChB,CAAC;AACD,iBAAO,GAAG;AAAA,QACZ;AACA,eAAO;AAAA,MACT;AACA,UAAI,OAAO,MAAM;AACf,YAAI,CAAC,GAAG;AACN;AACF,WAAG,UAAU;AACb,eAAO,GAAG;AAAA,MACZ;AACA,cAAQ,MAAM,UAAU,CAAC,UAAU;AACjC,gBAAQ,KAAK,IAAI,KAAK;AAAA,MACxB,CAAC,CAAC;AACF,cAAQ,MAAM,GAAG,aAAa,GAAG,UAAU,CAAC;AAAA,IAC9C,CAAC;AAGD,eAAU,MAAM,CAAC,IAAI,EAAE,cAAc,EAAE,UAAU,gBAAgB;AAC/D,UAAI,QAAQ,UAAU,UAAU;AAChC,YAAM,QAAQ,CAAC,SAAS,UAAU,IAAI,IAAI,CAAC;AAAA,IAC7C,CAAC;AACD,mBAAe,CAAC,MAAM,OAAO;AAC3B,UAAI,KAAK,QAAQ;AACf,WAAG,SAAS,KAAK;AAAA,MACnB;AAAA,IACF,CAAC;AAGD,kBAAc,aAAa,KAAK,KAAK,OAAO,KAAK,CAAC,CAAC,CAAC;AACpD,eAAU,MAAM,gBAAgB,CAAC,IAAI,EAAE,OAAO,WAAW,cAAc,EAAE,cAAc;AACrF,UAAI,YAAY,aAAa,cAAc,IAAI,UAAU,IAAI,MAAM;AAAA,MACnE;AACA,UAAI,GAAG,QAAQ,YAAY,MAAM,YAAY;AAC3C,YAAI,CAAC,GAAG;AACN,aAAG,mBAAmB,CAAC;AACzB,YAAI,CAAC,GAAG,iBAAiB,SAAS,KAAK;AACrC,aAAG,iBAAiB,KAAK,KAAK;AAAA,MAClC;AACA,UAAI,iBAAiB,IAAG,IAAI,OAAO,WAAW,CAAC,MAAM;AACnD,kBAAU,MAAM;AAAA,QAChB,GAAG,EAAE,OAAO,EAAE,UAAU,EAAE,GAAG,QAAQ,CAAC,CAAC,EAAE,CAAC;AAAA,MAC5C,CAAC;AACD,cAAQ,MAAM,eAAe,CAAC;AAAA,IAChC,CAAC,CAAC;AAGF,+BAA2B,YAAY,YAAY,UAAU;AAC7D,+BAA2B,aAAa,aAAa,WAAW;AAChE,+BAA2B,SAAS,QAAQ,OAAO;AACnD,+BAA2B,QAAQ,QAAQ,MAAM;AACjD,wCAAoC,MAAM,eAAe,MAAM;AAC7D,iBAAU,eAAe,CAAC,OAAO,KAAK,oBAAoB,gDAAgD,mDAAmD,QAAQ,EAAE,CAAC;AAAA,IAC1K;AAGA,mBAAe,aAAa,eAAe;AAC3C,mBAAe,oBAAoB,EAAE,UAAU,oBAAoB,UAAU,QAAQ,oBAAoB,QAAQ,SAAS,oBAAoB,MAAM,KAAK,oBAAoB,MAAM,CAAC;AACpL,QAAI,cAAc;AAGlB,QAAI,iBAAiB;AAAA;AAAA;;;AChhIrB;AAAA;AAAA,QAAI,aAAY,OAAO;AACvB,QAAI,oBAAmB,OAAO;AAC9B,QAAI,qBAAoB,OAAO;AAC/B,QAAI,gBAAe,OAAO,UAAU;AACpC,QAAI,WAAW,CAAC,QAAQ,SAAQ;AAC9B,eAAS,QAAQ;AACf,mBAAU,QAAQ,MAAM,EAAE,KAAK,KAAI,OAAO,YAAY,KAAK,CAAC;AAAA,IAChE;AACA,QAAI,eAAc,CAAC,IAAI,MAAM,QAAQ,SAAS;AAC5C,UAAI,QAAQ,OAAO,SAAS,YAAY,OAAO,SAAS,YAAY;AAClE,iBAAS,OAAO,mBAAkB,IAAI;AACpC,cAAI,CAAC,cAAa,KAAK,IAAI,GAAG,KAAK,QAAQ;AACzC,uBAAU,IAAI,KAAK,EAAE,KAAK,MAAM,KAAK,MAAM,YAAY,CAAE,QAAO,kBAAiB,MAAM,GAAG,MAAM,KAAK,WAAW,CAAC;AAAA,MACvH;AACA,aAAO;AAAA,IACT;AACA,QAAI,eAAe,CAAC,QAAQ,aAAY,WAAU,CAAC,GAAG,cAAc,EAAE,OAAO,KAAK,CAAC,GAAG,GAAG;AAGzF,QAAI,iBAAiB,CAAC;AACtB,aAAS,gBAAgB;AAAA,MACvB,UAAU,MAAM;AAAA,MAChB,SAAS,MAAM;AAAA,IACjB,CAAC;AACD,WAAO,UAAU,aAAa,cAAc;AAG5C,yBAAqB,UAAQ;AAC3B,eAAO,UAAU,YAAY,SAAQ;AACrC,gBAAS,SAAS,CAAC,IAAI,EAAE,gBAAgB;AACvC,YAAI,CAAC,UAAU,SAAS,KAAK;AAC3B;AACF,WAAG,YAAY,MAAM;AAAA,QACrB;AACA,WAAG,YAAY,MAAM;AAAA,QACrB;AAAA,MACF;AACA,yBAAkB,IAAI,EAAE,aAAa;AACnC,YAAI,WAAW,cAAc,WAAW,YAAY,GAAG,IAAI;AAC3D,YAAI,QAAQ,cAAc,WAAW,OAAO,CAAC;AAC7C,YAAI,YAAY,CAAC,UAAU,SAAS,KAAK;AACzC,YAAI,CAAC,GAAG;AACN,aAAG,MAAM,SAAS,GAAG;AACvB,YAAI,CAAC,GAAG,cAAc;AACpB,aAAG,SAAS;AACd,YAAI,CAAC,GAAG;AACN,aAAG,MAAM,WAAW;AACtB,YAAI,cAAc,CAAC,KAAK,WAAW;AACjC,cAAI,iBAAiB,SAAO,UAAU,KAAK,MAAM;AACjD,iBAAO,OAAO,SAAS,MAAM;AAAA,UAC7B,IAAI;AAAA,QACN;AACA,YAAI,mBAAmB;AAAA,UACrB,oBAAoB;AAAA,UACpB,oBAAoB,GAAG;AAAA,UACvB,0BAA0B;AAAA,QAC5B;AACA,WAAG,gBAAgB;AAAA,UACjB,GAAG,SAAS,MAAM;AAAA,UAClB,GAAG,QAAQ,MAAM;AAAA,UACjB,GAAG;AACD,gBAAI;AACF,iBAAG,SAAS;AACd,gBAAI;AACF,iBAAG,MAAM,UAAU;AACrB,gBAAI,UAAU,GAAG,sBAAsB,EAAE;AACzC,eAAG,MAAM,SAAS;AAClB,gBAAI,OAAO,GAAG,sBAAsB,EAAE;AACtC,gBAAI,YAAY,MAAM;AACpB,wBAAU;AAAA,YACZ;AACA,qBAAO,WAAW,IAAI,SAAO,WAAW;AAAA,cACtC,QAAQ;AAAA,cACR,OAAO,EAAE,QAAQ,UAAU,KAAK;AAAA,cAChC,KAAK,EAAE,QAAQ,OAAO,KAAK;AAAA,YAC7B,GAAG,MAAM,GAAG,aAAa,MAAM,MAAM;AACnC,kBAAI,KAAK,IAAI,GAAG,sBAAsB,EAAE,SAAS,IAAI,IAAI,GAAG;AAC1D,mBAAG,MAAM,WAAW;AAAA,cACtB;AAAA,YACF,CAAC;AAAA,UACH;AAAA,UACA,IAAI,SAAS,MAAM;AAAA,UACnB,GAAG,QAAQ,MAAM;AAAA,UACjB,GAAG;AACD,gBAAI,OAAO,GAAG,sBAAsB,EAAE;AACtC,qBAAO,WAAW,IAAI,aAAa;AAAA,cACjC,QAAQ;AAAA,cACR,OAAO,EAAE,QAAQ,OAAO,KAAK;AAAA,cAC7B,KAAK,EAAE,QAAQ,QAAQ,KAAK;AAAA,YAC9B,GAAG,MAAM,GAAG,MAAM,WAAW,UAAU,MAAM;AAC3C,iBAAG,aAAa;AAChB,kBAAI,GAAG,MAAM,UAAU,GAAG,aAAa,WAAW;AAChD,mBAAG,MAAM,UAAU;AACnB,mBAAG,SAAS;AAAA,cACd;AAAA,YACF,CAAC;AAAA,UACH;AAAA,QACF;AAAA,MACF;AAAA,IACF;AACA,2BAAuB,WAAW,KAAK,WAAU;AAC/C,UAAI,UAAU,QAAQ,GAAG,MAAM;AAC7B,eAAO;AACT,YAAM,WAAW,UAAU,UAAU,QAAQ,GAAG,IAAI;AACpD,UAAI,CAAC;AACH,eAAO;AACT,UAAI,QAAQ,YAAY;AACtB,YAAI,QAAQ,SAAS,MAAM,YAAY;AACvC,YAAI;AACF,iBAAO,MAAM;AAAA,MACjB;AACA,UAAI,QAAQ,OAAO;AACjB,YAAI,QAAQ,SAAS,MAAM,YAAY;AACvC,YAAI;AACF,iBAAO,MAAM;AAAA,MACjB;AACA,aAAO;AAAA,IACT;AAGA,QAAI,iBAAiB;AAAA;AAAA;;;ACxHrB;AAAA;AAAA,QAAI,YAAW,OAAO;AACtB,QAAI,aAAY,OAAO;AACvB,QAAI,oBAAmB,OAAO;AAC9B,QAAI,qBAAoB,OAAO;AAC/B,QAAI,gBAAe,OAAO;AAC1B,QAAI,gBAAe,OAAO,UAAU;AACpC,QAAI,cAAa,CAAC,IAAI,QAAQ,qBAAqB;AACjD,aAAO,OAAQ,IAAG,GAAG,mBAAkB,EAAE,EAAE,KAAM,OAAM,EAAE,SAAS,CAAC,EAAE,GAAG,SAAS,GAAG,GAAG,IAAI;AAAA,IAC7F;AACA,QAAI,WAAW,CAAC,QAAQ,SAAQ;AAC9B,eAAS,QAAQ;AACf,mBAAU,QAAQ,MAAM,EAAE,KAAK,KAAI,OAAO,YAAY,KAAK,CAAC;AAAA,IAChE;AACA,QAAI,eAAc,CAAC,IAAI,MAAM,QAAQ,SAAS;AAC5C,UAAI,QAAQ,OAAO,SAAS,YAAY,OAAO,SAAS,YAAY;AAClE,iBAAS,OAAO,mBAAkB,IAAI;AACpC,cAAI,CAAC,cAAa,KAAK,IAAI,GAAG,KAAK,QAAQ;AACzC,uBAAU,IAAI,KAAK,EAAE,KAAK,MAAM,KAAK,MAAM,YAAY,CAAE,QAAO,kBAAiB,MAAM,GAAG,MAAM,KAAK,WAAW,CAAC;AAAA,MACvH;AACA,aAAO;AAAA,IACT;AACA,QAAI,WAAU,CAAC,KAAK,YAAY,WAAY,UAAS,OAAO,OAAO,UAAS,cAAa,GAAG,CAAC,IAAI,CAAC,GAAG,aAKnG,cAAc,CAAC,OAAO,CAAC,IAAI,aAAa,WAAU,QAAQ,WAAW,EAAE,OAAO,KAAK,YAAY,KAAK,CAAC,IAAI,QACzG,GACF;AACA,QAAI,eAAe,CAAC,QAAQ,aAAY,WAAU,CAAC,GAAG,cAAc,EAAE,OAAO,KAAK,CAAC,GAAG,GAAG;AAGzF,QAAI,eAAe,YAAW;AAAA,MAC5B,sCAAsC,UAAS;AAC7C;AACA,eAAO,eAAe,UAAS,cAAc,EAAE,OAAO,KAAK,CAAC;AAC5D,YAAI,qBAAqB,CAAC,SAAS,UAAU,YAAY,WAAW,UAAU,wBAAwB,mBAAmB,mBAAmB,oDAAoD,iCAAiC,SAAS;AAC1O,YAAI,oBAAoC,mCAAmB,KAAK,GAAG;AACnE,YAAI,YAAY,OAAO,YAAY;AACnC,YAAI,UAAU,YAAY,WAAW;AAAA,QACrC,IAAI,QAAQ,UAAU,WAAW,QAAQ,UAAU,qBAAqB,QAAQ,UAAU;AAC1F,YAAI,cAAc,CAAC,aAAa,QAAQ,UAAU,cAAc,SAAS,SAAS;AAChF,iBAAO,QAAQ,YAAY;AAAA,QAC7B,IAAI,SAAS,SAAS;AACpB,iBAAO,QAAQ;AAAA,QACjB;AACA,YAAI,gBAAgB,wBAAwB,IAAI,kBAAkB,QAAQ;AACxE,cAAI,aAAa,MAAM,UAAU,MAAM,MAAM,GAAG,iBAAiB,iBAAiB,CAAC;AACnF,cAAI,oBAAoB,QAAQ,KAAK,IAAI,iBAAiB,GAAG;AAC3D,uBAAW,QAAQ,EAAE;AAAA,UACvB;AACA,uBAAa,WAAW,OAAO,MAAM;AACrC,iBAAO;AAAA,QACT;AACA,YAAI,2BAA2B,mCAAmC,UAAU,kBAAkB,SAAS;AACrG,cAAI,aAAa,CAAC;AAClB,cAAI,kBAAkB,MAAM,KAAK,QAAQ;AACzC,iBAAO,gBAAgB,QAAQ;AAC7B,gBAAI,UAAU,gBAAgB,MAAM;AACpC,gBAAI,QAAQ,YAAY,QAAQ;AAC9B,kBAAI,WAAW,QAAQ,iBAAiB;AACxC,kBAAI,UAAU,SAAS,SAAS,WAAW,QAAQ;AACnD,kBAAI,mBAAmB,0BAA0B,SAAS,MAAM,OAAO;AACvE,kBAAI,QAAQ,SAAS;AACnB,2BAAW,KAAK,MAAM,YAAY,gBAAgB;AAAA,cACpD,OAAO;AACL,2BAAW,KAAK;AAAA,kBACd,OAAO;AAAA,kBACP,YAAY;AAAA,gBACd,CAAC;AAAA,cACH;AAAA,YACF,OAAO;AACL,kBAAI,iBAAiB,QAAQ,KAAK,SAAS,iBAAiB;AAC5D,kBAAI,kBAAkB,QAAQ,OAAO,OAAO,KAAM,qBAAoB,CAAC,SAAS,SAAS,OAAO,IAAI;AAClG,2BAAW,KAAK,OAAO;AAAA,cACzB;AACA,kBAAI,aAAa,QAAQ,cACzB,OAAO,QAAQ,kBAAkB,cAAc,QAAQ,cAAc,OAAO;AAC5E,kBAAI,kBAAkB,CAAC,QAAQ,oBAAoB,QAAQ,iBAAiB,OAAO;AACnF,kBAAI,cAAc,iBAAiB;AACjC,oBAAI,oBAAoB,0BAA0B,eAAe,OAAO,QAAQ,WAAW,WAAW,UAAU,MAAM,OAAO;AAC7H,oBAAI,QAAQ,SAAS;AACnB,6BAAW,KAAK,MAAM,YAAY,iBAAiB;AAAA,gBACrD,OAAO;AACL,6BAAW,KAAK;AAAA,oBACd,OAAO;AAAA,oBACP,YAAY;AAAA,kBACd,CAAC;AAAA,gBACH;AAAA,cACF,OAAO;AACL,gCAAgB,QAAQ,MAAM,iBAAiB,QAAQ,QAAQ;AAAA,cACjE;AAAA,YACF;AAAA,UACF;AACA,iBAAO;AAAA,QACT;AACA,YAAI,cAAc,sBAAsB,MAAM,SAAS;AACrD,cAAI,KAAK,WAAW,GAAG;AACrB,gBAAK,YAAW,0BAA0B,KAAK,KAAK,OAAO,KAAK,KAAK,sBAAsB,MAAM,SAAS,KAAK,aAAa,UAAU,GAAG,EAAE,CAAC,GAAG;AAC7I,qBAAO;AAAA,YACT;AAAA,UACF;AACA,iBAAO,KAAK;AAAA,QACd;AACA,YAAI,uBAAuB,+BAA+B,GAAG,GAAG;AAC9D,iBAAO,EAAE,aAAa,EAAE,WAAW,EAAE,gBAAgB,EAAE,gBAAgB,EAAE,WAAW,EAAE;AAAA,QACxF;AACA,YAAI,UAAU,kBAAkB,MAAM;AACpC,iBAAO,KAAK,YAAY;AAAA,QAC1B;AACA,YAAI,gBAAgB,wBAAwB,MAAM;AAChD,iBAAO,QAAQ,IAAI,KAAK,KAAK,SAAS;AAAA,QACxC;AACA,YAAI,uBAAuB,+BAA+B,MAAM;AAC9D,cAAI,IAAI,KAAK,YAAY,aAAa,MAAM,UAAU,MAAM,MAAM,KAAK,QAAQ,EAAE,KAAK,SAAS,OAAO;AACpG,mBAAO,MAAM,YAAY;AAAA,UAC3B,CAAC;AACD,iBAAO;AAAA,QACT;AACA,YAAI,kBAAkB,0BAA0B,OAAO,MAAM;AAC3D,mBAAS,IAAI,GAAG,IAAI,MAAM,QAAQ,KAAK;AACrC,gBAAI,MAAM,GAAG,WAAW,MAAM,GAAG,SAAS,MAAM;AAC9C,qBAAO,MAAM;AAAA,YACf;AAAA,UACF;AAAA,QACF;AACA,YAAI,kBAAkB,0BAA0B,MAAM;AACpD,cAAI,CAAC,KAAK,MAAM;AACd,mBAAO;AAAA,UACT;AACA,cAAI,aAAa,KAAK,QAAQ,YAAY,IAAI;AAC9C,cAAI,cAAc,sBAAsB,MAAM;AAC5C,mBAAO,WAAW,iBAAiB,+BAA+B,OAAO,IAAI;AAAA,UAC/E;AACA,cAAI;AACJ,cAAI,OAAO,WAAW,eAAe,OAAO,OAAO,QAAQ,eAAe,OAAO,OAAO,IAAI,WAAW,YAAY;AACjH,uBAAW,YAAY,OAAO,IAAI,OAAO,KAAK,IAAI,CAAC;AAAA,UACrD,OAAO;AACL,gBAAI;AACF,yBAAW,YAAY,KAAK,IAAI;AAAA,YAClC,SAAS,KAAP;AACA,sBAAQ,MAAM,4IAA4I,IAAI,OAAO;AACrK,qBAAO;AAAA,YACT;AAAA,UACF;AACA,cAAI,UAAU,gBAAgB,UAAU,KAAK,IAAI;AACjD,iBAAO,CAAC,WAAW,YAAY;AAAA,QACjC;AACA,YAAI,UAAU,kBAAkB,MAAM;AACpC,iBAAO,QAAQ,IAAI,KAAK,KAAK,SAAS;AAAA,QACxC;AACA,YAAI,qBAAqB,6BAA6B,MAAM;AAC1D,iBAAO,QAAQ,IAAI,KAAK,CAAC,gBAAgB,IAAI;AAAA,QAC/C;AACA,YAAI,aAAa,qBAAqB,MAAM;AAC1C,cAAI,wBAAwB,KAAK,sBAAsB,GAAG,QAAQ,sBAAsB,OAAO,SAAS,sBAAsB;AAC9H,iBAAO,UAAU,KAAK,WAAW;AAAA,QACnC;AACA,YAAI,WAAW,mBAAmB,MAAM,MAAM;AAC5C,cAAI,eAAe,KAAK,cAAc,gBAAgB,KAAK;AAC3D,cAAI,iBAAiB,IAAI,EAAE,eAAe,UAAU;AAClD,mBAAO;AAAA,UACT;AACA,cAAI,kBAAkB,QAAQ,KAAK,MAAM,+BAA+B;AACxE,cAAI,mBAAmB,kBAAkB,KAAK,gBAAgB;AAC9D,cAAI,QAAQ,KAAK,kBAAkB,uBAAuB,GAAG;AAC3D,mBAAO;AAAA,UACT;AACA,cAAI,eAAe,YAAY,IAAI,EAAE;AACrC,cAAI,iBAAkB,kBAAiB,QAAQ,iBAAiB,SAAS,SAAS,aAAa,cAAc,SAAS,YAAY,MAAM,KAAK,cAAc,SAAS,IAAI;AACxK,cAAI,CAAC,gBAAgB,iBAAiB,QAAQ;AAC5C,gBAAI,OAAO,kBAAkB,YAAY;AACvC,kBAAI,eAAe;AACnB,qBAAO,MAAM;AACX,oBAAI,gBAAgB,KAAK;AACzB,oBAAI,WAAW,YAAY,IAAI;AAC/B,oBAAI,iBAAiB,CAAC,cAAc,cAAc,cAAc,aAAa,MAAM,MAAM;AACvF,yBAAO,WAAW,IAAI;AAAA,gBACxB,WAAW,KAAK,cAAc;AAC5B,yBAAO,KAAK;AAAA,gBACd,WAAW,CAAC,iBAAiB,aAAa,KAAK,eAAe;AAC5D,yBAAO,SAAS;AAAA,gBAClB,OAAO;AACL,yBAAO;AAAA,gBACT;AAAA,cACF;AACA,qBAAO;AAAA,YACT;AACA,gBAAI,gBAAgB;AAClB,qBAAO,CAAC,KAAK,eAAe,EAAE;AAAA,YAChC;AAAA,UACF,WAAW,iBAAiB,iBAAiB;AAC3C,mBAAO,WAAW,IAAI;AAAA,UACxB;AACA,iBAAO;AAAA,QACT;AACA,YAAI,yBAAyB,iCAAiC,MAAM;AAClE,cAAI,mCAAmC,KAAK,KAAK,OAAO,GAAG;AACzD,gBAAI,aAAa,KAAK;AACtB,mBAAO,YAAY;AACjB,kBAAI,WAAW,YAAY,cAAc,WAAW,UAAU;AAC5D,yBAAS,IAAI,GAAG,IAAI,WAAW,SAAS,QAAQ,KAAK;AACnD,sBAAI,QAAQ,WAAW,SAAS,KAAK,CAAC;AACtC,sBAAI,MAAM,YAAY,UAAU;AAC9B,2BAAO,QAAQ,KAAK,YAAY,sBAAsB,IAAI,OAAO,CAAC,MAAM,SAAS,IAAI;AAAA,kBACvF;AAAA,gBACF;AACA,uBAAO;AAAA,cACT;AACA,2BAAa,WAAW;AAAA,YAC1B;AAAA,UACF;AACA,iBAAO;AAAA,QACT;AACA,YAAI,kCAAkC,0CAA0C,SAAS,MAAM;AAC7F,cAAI,KAAK,YAAY,cAAc,IAAI,KAAK,SAAS,MAAM,OAAO,KAClE,qBAAqB,IAAI,KAAK,uBAAuB,IAAI,GAAG;AAC1D,mBAAO;AAAA,UACT;AACA,iBAAO;AAAA,QACT;AACA,YAAI,iCAAiC,yCAAyC,SAAS,MAAM;AAC3F,cAAI,mBAAmB,IAAI,KAAK,YAAY,IAAI,IAAI,KAAK,CAAC,gCAAgC,SAAS,IAAI,GAAG;AACxG,mBAAO;AAAA,UACT;AACA,iBAAO;AAAA,QACT;AACA,YAAI,4BAA4B,oCAAoC,gBAAgB;AAClF,cAAI,WAAW,SAAS,eAAe,aAAa,UAAU,GAAG,EAAE;AACnE,cAAI,MAAM,QAAQ,KAAK,YAAY,GAAG;AACpC,mBAAO;AAAA,UACT;AACA,iBAAO;AAAA,QACT;AACA,YAAI,cAAc,sBAAsB,YAAY;AAClD,cAAI,mBAAmB,CAAC;AACxB,cAAI,mBAAmB,CAAC;AACxB,qBAAW,QAAQ,SAAS,MAAM,GAAG;AACnC,gBAAI,UAAU,CAAC,CAAC,KAAK;AACrB,gBAAI,UAAU,UAAU,KAAK,QAAQ;AACrC,gBAAI,oBAAoB,YAAY,SAAS,OAAO;AACpD,gBAAI,WAAW,UAAU,aAAa,KAAK,UAAU,IAAI;AACzD,gBAAI,sBAAsB,GAAG;AAC3B,wBAAU,iBAAiB,KAAK,MAAM,kBAAkB,QAAQ,IAAI,iBAAiB,KAAK,OAAO;AAAA,YACnG,OAAO;AACL,+BAAiB,KAAK;AAAA,gBACpB,eAAe;AAAA,gBACf,UAAU;AAAA,gBACV;AAAA,gBACA;AAAA,gBACA,SAAS;AAAA,cACX,CAAC;AAAA,YACH;AAAA,UACF,CAAC;AACD,iBAAO,iBAAiB,KAAK,oBAAoB,EAAE,OAAO,SAAS,KAAK,UAAU;AAChF,qBAAS,UAAU,IAAI,KAAK,MAAM,KAAK,SAAS,OAAO,IAAI,IAAI,KAAK,SAAS,OAAO;AACpF,mBAAO;AAAA,UACT,GAAG,CAAC,CAAC,EAAE,OAAO,gBAAgB;AAAA,QAChC;AACA,YAAI,WAAW,mBAAmB,IAAI,SAAS;AAC7C,oBAAU,WAAW,CAAC;AACtB,cAAI;AACJ,cAAI,QAAQ,eAAe;AACzB,yBAAa,yBAAyB,CAAC,EAAE,GAAG,QAAQ,kBAAkB;AAAA,cACpE,QAAQ,+BAA+B,KAAK,MAAM,OAAO;AAAA,cACzD,SAAS;AAAA,cACT,eAAe,QAAQ;AAAA,cACvB,kBAAkB;AAAA,YACpB,CAAC;AAAA,UACH,OAAO;AACL,yBAAa,cAAc,IAAI,QAAQ,kBAAkB,+BAA+B,KAAK,MAAM,OAAO,CAAC;AAAA,UAC7G;AACA,iBAAO,YAAY,UAAU;AAAA,QAC/B;AACA,YAAI,aAAa,oBAAoB,IAAI,SAAS;AAChD,oBAAU,WAAW,CAAC;AACtB,cAAI;AACJ,cAAI,QAAQ,eAAe;AACzB,yBAAa,yBAAyB,CAAC,EAAE,GAAG,QAAQ,kBAAkB;AAAA,cACpE,QAAQ,gCAAgC,KAAK,MAAM,OAAO;AAAA,cAC1D,SAAS;AAAA,cACT,eAAe,QAAQ;AAAA,YACzB,CAAC;AAAA,UACH,OAAO;AACL,yBAAa,cAAc,IAAI,QAAQ,kBAAkB,gCAAgC,KAAK,MAAM,OAAO,CAAC;AAAA,UAC9G;AACA,iBAAO;AAAA,QACT;AACA,YAAI,aAAa,qBAAqB,MAAM,SAAS;AACnD,oBAAU,WAAW,CAAC;AACtB,cAAI,CAAC,MAAM;AACT,kBAAM,IAAI,MAAM,kBAAkB;AAAA,UACpC;AACA,cAAI,QAAQ,KAAK,MAAM,iBAAiB,MAAM,OAAO;AACnD,mBAAO;AAAA,UACT;AACA,iBAAO,+BAA+B,SAAS,IAAI;AAAA,QACrD;AACA,YAAI,6BAA6C,mCAAmB,OAAO,QAAQ,EAAE,KAAK,GAAG;AAC7F,YAAI,eAAe,sBAAsB,MAAM,SAAS;AACtD,oBAAU,WAAW,CAAC;AACtB,cAAI,CAAC,MAAM;AACT,kBAAM,IAAI,MAAM,kBAAkB;AAAA,UACpC;AACA,cAAI,QAAQ,KAAK,MAAM,0BAA0B,MAAM,OAAO;AAC5D,mBAAO;AAAA,UACT;AACA,iBAAO,gCAAgC,SAAS,IAAI;AAAA,QACtD;AACA,iBAAQ,YAAY;AACpB,iBAAQ,cAAc;AACtB,iBAAQ,aAAa;AACrB,iBAAQ,WAAW;AAAA,MACrB;AAAA,IACF,CAAC;AAGD,QAAI,qBAAqB,YAAW;AAAA,MAClC,6CAA6C,UAAS;AACpD;AACA,eAAO,eAAe,UAAS,cAAc,EAAE,OAAO,KAAK,CAAC;AAC5D,YAAI,WAAW,aAAa;AAC5B,yBAAiB,QAAQ,gBAAgB;AACvC,cAAI,OAAO,OAAO,KAAK,MAAM;AAC7B,cAAI,OAAO,uBAAuB;AAChC,gBAAI,UAAU,OAAO,sBAAsB,MAAM;AACjD,8BAAmB,WAAU,QAAQ,OAAO,SAAS,KAAK;AACxD,qBAAO,OAAO,yBAAyB,QAAQ,GAAG,EAAE;AAAA,YACtD,CAAC,IAAI,KAAK,KAAK,MAAM,MAAM,OAAO;AAAA,UACpC;AACA,iBAAO;AAAA,QACT;AACA,gCAAwB,QAAQ;AAC9B,mBAAS,IAAI,GAAG,IAAI,UAAU,QAAQ,KAAK;AACzC,gBAAI,SAAS,QAAQ,UAAU,KAAK,UAAU,KAAK,CAAC;AACpD,gBAAI,IAAI,QAAQ,OAAO,MAAM,GAAG,IAAI,EAAE,QAAQ,SAAS,KAAK;AAC1D,8BAAgB,QAAQ,KAAK,OAAO,IAAI;AAAA,YAC1C,CAAC,IAAI,OAAO,4BAA4B,OAAO,iBAAiB,QAAQ,OAAO,0BAA0B,MAAM,CAAC,IAAI,QAAQ,OAAO,MAAM,CAAC,EAAE,QAAQ,SAAS,KAAK;AAChK,qBAAO,eAAe,QAAQ,KAAK,OAAO,yBAAyB,QAAQ,GAAG,CAAC;AAAA,YACjF,CAAC;AAAA,UACH;AACA,iBAAO;AAAA,QACT;AACA,iCAAyB,KAAK,KAAK,OAAO;AACxC,cAAI,OAAO,KAAK;AACd,mBAAO,eAAe,KAAK,KAAK;AAAA,cAC9B;AAAA,cACA,YAAY;AAAA,cACZ,cAAc;AAAA,cACd,UAAU;AAAA,YACZ,CAAC;AAAA,UACH,OAAO;AACL,gBAAI,OAAO;AAAA,UACb;AACA,iBAAO;AAAA,QACT;AACA,YAAI,mBAAmB,WAAW;AAChC,cAAI,YAAY,CAAC;AACjB,iBAAO;AAAA,YACL,cAAc,sBAAsB,MAAM;AACxC,kBAAI,UAAU,SAAS,GAAG;AACxB,oBAAI,aAAa,UAAU,UAAU,SAAS;AAC9C,oBAAI,eAAe,MAAM;AACvB,6BAAW,MAAM;AAAA,gBACnB;AAAA,cACF;AACA,kBAAI,YAAY,UAAU,QAAQ,IAAI;AACtC,kBAAI,cAAc,IAAI;AACpB,0BAAU,KAAK,IAAI;AAAA,cACrB,OAAO;AACL,0BAAU,OAAO,WAAW,CAAC;AAC7B,0BAAU,KAAK,IAAI;AAAA,cACrB;AAAA,YACF;AAAA,YACA,gBAAgB,wBAAwB,MAAM;AAC5C,kBAAI,YAAY,UAAU,QAAQ,IAAI;AACtC,kBAAI,cAAc,IAAI;AACpB,0BAAU,OAAO,WAAW,CAAC;AAAA,cAC/B;AACA,kBAAI,UAAU,SAAS,GAAG;AACxB,0BAAU,UAAU,SAAS,GAAG,QAAQ;AAAA,cAC1C;AAAA,YACF;AAAA,UACF;AAAA,QACF,EAAE;AACF,YAAI,oBAAoB,4BAA4B,MAAM;AACxD,iBAAO,KAAK,WAAW,KAAK,QAAQ,YAAY,MAAM,WAAW,OAAO,KAAK,WAAW;AAAA,QAC1F;AACA,YAAI,gBAAgB,wBAAwB,GAAG;AAC7C,iBAAO,EAAE,QAAQ,YAAY,EAAE,QAAQ,SAAS,EAAE,YAAY;AAAA,QAChE;AACA,YAAI,aAAa,qBAAqB,GAAG;AACvC,iBAAO,EAAE,QAAQ,SAAS,EAAE,YAAY;AAAA,QAC1C;AACA,YAAI,QAAQ,gBAAgB,IAAI;AAC9B,iBAAO,WAAW,IAAI,CAAC;AAAA,QACzB;AACA,YAAI,YAAY,oBAAoB,KAAK,IAAI;AAC3C,cAAI,MAAM;AACV,cAAI,MAAM,SAAS,OAAO,GAAG;AAC3B,gBAAI,GAAG,KAAK,GAAG;AACb,oBAAM;AACN,qBAAO;AAAA,YACT;AACA,mBAAO;AAAA,UACT,CAAC;AACD,iBAAO;AAAA,QACT;AACA,YAAI,iBAAiB,yBAAyB,OAAO;AACnD,mBAAS,OAAO,UAAU,QAAQ,SAAS,IAAI,MAAM,OAAO,IAAI,OAAO,IAAI,CAAC,GAAG,OAAO,GAAG,OAAO,MAAM,QAAQ;AAC5G,mBAAO,OAAO,KAAK,UAAU;AAAA,UAC/B;AACA,iBAAO,OAAO,UAAU,aAAa,MAAM,MAAM,QAAQ,MAAM,IAAI;AAAA,QACrE;AACA,YAAI,kBAAkB,0BAA0B,OAAO;AACrD,iBAAO,MAAM,OAAO,cAAc,OAAO,MAAM,iBAAiB,aAAa,MAAM,aAAa,EAAE,KAAK,MAAM;AAAA,QAC/G;AACA,YAAI,mBAAmB,0BAA0B,UAAU,aAAa;AACtE,cAAI,MAAO,iBAAgB,QAAQ,gBAAgB,SAAS,SAAS,YAAY,aAAa;AAC9F,cAAI,SAAS,eAAe;AAAA,YAC1B,yBAAyB;AAAA,YACzB,mBAAmB;AAAA,YACnB,mBAAmB;AAAA,UACrB,GAAG,WAAW;AACd,cAAI,QAAQ;AAAA,YAGV,YAAY,CAAC;AAAA,YAcb,iBAAiB,CAAC;AAAA,YAMlB,gBAAgB,CAAC;AAAA,YACjB,6BAA6B;AAAA,YAC7B,yBAAyB;AAAA,YACzB,QAAQ;AAAA,YACR,QAAQ;AAAA,YAGR,wBAAwB;AAAA,UAC1B;AACA,cAAI;AACJ,cAAI,YAAY,oBAAoB,uBAAuB,YAAY,kBAAkB;AACvF,mBAAO,yBAAyB,sBAAsB,gBAAgB,SAAS,sBAAsB,cAAc,OAAO,oBAAoB;AAAA,UAChJ;AACA,cAAI,qBAAqB,6BAA6B,SAAS;AAC7D,mBAAO,MAAM,gBAAgB,UAAU,SAAS,MAAM;AACpD,kBAAI,YAAY,KAAK,WAAW,gBAAgB,KAAK;AACrD,qBAAO,UAAU,SAAS,OAAO,KAIjC,cAAc,KAAK,SAAS,MAAM;AAChC,uBAAO,SAAS;AAAA,cAClB,CAAC;AAAA,YACH,CAAC;AAAA,UACH;AACA,cAAI,mBAAmB,2BAA2B,YAAY;AAC5D,gBAAI,cAAc,OAAO;AACzB,gBAAI,OAAO,gBAAgB,YAAY;AACrC,uBAAS,QAAQ,UAAU,QAAQ,SAAS,IAAI,MAAM,QAAQ,IAAI,QAAQ,IAAI,CAAC,GAAG,QAAQ,GAAG,QAAQ,OAAO,SAAS;AACnH,uBAAO,QAAQ,KAAK,UAAU;AAAA,cAChC;AACA,4BAAc,YAAY,MAAM,QAAQ,MAAM;AAAA,YAChD;AACA,gBAAI,gBAAgB,MAAM;AACxB,4BAAc;AAAA,YAChB;AACA,gBAAI,CAAC,aAAa;AAChB,kBAAI,gBAAgB,UAAU,gBAAgB,OAAO;AACnD,uBAAO;AAAA,cACT;AACA,oBAAM,IAAI,MAAM,IAAI,OAAO,YAAY,8DAA8D,CAAC;AAAA,YACxG;AACA,gBAAI,OAAO;AACX,gBAAI,OAAO,gBAAgB,UAAU;AACnC,qBAAO,IAAI,cAAc,WAAW;AACpC,kBAAI,CAAC,MAAM;AACT,sBAAM,IAAI,MAAM,IAAI,OAAO,YAAY,uCAAuC,CAAC;AAAA,cACjF;AAAA,YACF;AACA,mBAAO;AAAA,UACT;AACA,cAAI,sBAAsB,gCAAgC;AACxD,gBAAI,OAAO,iBAAiB,cAAc;AAC1C,gBAAI,SAAS,OAAO;AAClB,qBAAO;AAAA,YACT;AACA,gBAAI,SAAS,QAAQ;AACnB,kBAAI,mBAAmB,IAAI,aAAa,KAAK,GAAG;AAC9C,uBAAO,IAAI;AAAA,cACb,OAAO;AACL,oBAAI,qBAAqB,MAAM,eAAe;AAC9C,oBAAI,oBAAoB,sBAAsB,mBAAmB;AACjE,uBAAO,qBAAqB,iBAAiB,eAAe;AAAA,cAC9D;AAAA,YACF;AACA,gBAAI,CAAC,MAAM;AACT,oBAAM,IAAI,MAAM,8DAA8D;AAAA,YAChF;AACA,mBAAO;AAAA,UACT;AACA,cAAI,sBAAsB,gCAAgC;AACxD,kBAAM,kBAAkB,MAAM,WAAW,IAAI,SAAS,WAAW;AAC/D,kBAAI,gBAAgB,SAAS,SAAS,WAAW,OAAO,eAAe;AACvE,kBAAI,iBAAiB,SAAS,UAAU,WAAW,OAAO,eAAe;AACzE,qBAAO;AAAA,gBACL;AAAA,gBACA;AAAA,gBACA;AAAA,gBACA,mBAAmB,cAAc,SAAS,IAAI,cAAc,KAAK;AAAA,gBACjE,kBAAkB,cAAc,SAAS,IAAI,cAAc,cAAc,SAAS,KAAK;AAAA,gBASvF,kBAAkB,0BAA0B,MAAM;AAChD,sBAAI,UAAU,UAAU,SAAS,KAAK,UAAU,OAAO,SAAS,UAAU,KAAK;AAC/E,sBAAI,UAAU,eAAe,UAAU,SAAS,GAAG;AACjD,2BAAO,MAAM;AAAA,kBACf,CAAC;AACD,sBAAI,UAAU,GAAG;AACf,2BAAO;AAAA,kBACT;AACA,sBAAI,SAAS;AACX,2BAAO,eAAe,MAAM,UAAU,CAAC,EAAE,KAAK,SAAS,GAAG;AACxD,6BAAO,SAAS,WAAW,GAAG,OAAO,eAAe;AAAA,oBACtD,CAAC;AAAA,kBACH;AACA,yBAAO,eAAe,MAAM,GAAG,OAAO,EAAE,QAAQ,EAAE,KAAK,SAAS,GAAG;AACjE,2BAAO,SAAS,WAAW,GAAG,OAAO,eAAe;AAAA,kBACtD,CAAC;AAAA,gBACH;AAAA,cACF;AAAA,YACF,CAAC;AACD,kBAAM,iBAAiB,MAAM,gBAAgB,OAAO,SAAS,OAAO;AAClE,qBAAO,MAAM,cAAc,SAAS;AAAA,YACtC,CAAC;AACD,gBAAI,MAAM,eAAe,UAAU,KAAK,CAAC,iBAAiB,eAAe,GAAG;AAC1E,oBAAM,IAAI,MAAM,qGAAqG;AAAA,YACvH;AAAA,UACF;AACA,cAAI,WAAW,mBAAmB,MAAM;AACtC,gBAAI,SAAS,OAAO;AAClB;AAAA,YACF;AACA,gBAAI,SAAS,IAAI,eAAe;AAC9B;AAAA,YACF;AACA,gBAAI,CAAC,QAAQ,CAAC,KAAK,OAAO;AACxB,wBAAU,oBAAoB,CAAC;AAC/B;AAAA,YACF;AACA,iBAAK,MAAM;AAAA,cACT,eAAe,CAAC,CAAC,OAAO;AAAA,YAC1B,CAAC;AACD,kBAAM,0BAA0B;AAChC,gBAAI,kBAAkB,IAAI,GAAG;AAC3B,mBAAK,OAAO;AAAA,YACd;AAAA,UACF;AACA,cAAI,qBAAqB,6BAA6B,uBAAuB;AAC3E,gBAAI,OAAO,iBAAiB,kBAAkB,qBAAqB;AACnE,mBAAO,OAAO,OAAO,SAAS,QAAQ,QAAQ;AAAA,UAChD;AACA,cAAI,mBAAmB,2BAA2B,GAAG;AACnD,gBAAI,SAAS,gBAAgB,CAAC;AAC9B,gBAAI,mBAAmB,MAAM,KAAK,GAAG;AACnC;AAAA,YACF;AACA,gBAAI,eAAe,OAAO,yBAAyB,CAAC,GAAG;AACrD,mBAAK,WAAW;AAAA,gBAYd,aAAa,OAAO,2BAA2B,CAAC,SAAS,YAAY,QAAQ,OAAO,eAAe;AAAA,cACrG,CAAC;AACD;AAAA,YACF;AACA,gBAAI,eAAe,OAAO,mBAAmB,CAAC,GAAG;AAC/C;AAAA,YACF;AACA,cAAE,eAAe;AAAA,UACnB;AACA,cAAI,eAAe,uBAAuB,GAAG;AAC3C,gBAAI,SAAS,gBAAgB,CAAC;AAC9B,gBAAI,kBAAkB,mBAAmB,MAAM,KAAK;AACpD,gBAAI,mBAAmB,kBAAkB,UAAU;AACjD,kBAAI,iBAAiB;AACnB,sBAAM,0BAA0B;AAAA,cAClC;AAAA,YACF,OAAO;AACL,gBAAE,yBAAyB;AAC3B,uBAAS,MAAM,2BAA2B,oBAAoB,CAAC;AAAA,YACjE;AAAA,UACF;AACA,cAAI,WAAW,mBAAmB,GAAG;AACnC,gBAAI,SAAS,gBAAgB,CAAC;AAC9B,gCAAoB;AACpB,gBAAI,kBAAkB;AACtB,gBAAI,MAAM,eAAe,SAAS,GAAG;AACnC,kBAAI,iBAAiB,mBAAmB,MAAM;AAC9C,kBAAI,iBAAiB,kBAAkB,IAAI,MAAM,gBAAgB,kBAAkB;AACnF,kBAAI,iBAAiB,GAAG;AACtB,oBAAI,EAAE,UAAU;AACd,oCAAkB,MAAM,eAAe,MAAM,eAAe,SAAS,GAAG;AAAA,gBAC1E,OAAO;AACL,oCAAkB,MAAM,eAAe,GAAG;AAAA,gBAC5C;AAAA,cACF,WAAW,EAAE,UAAU;AACrB,oBAAI,oBAAoB,UAAU,MAAM,gBAAgB,SAAS,OAAO;AACtE,sBAAI,oBAAoB,MAAM;AAC9B,yBAAO,WAAW;AAAA,gBACpB,CAAC;AACD,oBAAI,oBAAoB,KAAM,gBAAe,cAAc,UAAU,SAAS,YAAY,QAAQ,OAAO,eAAe,KAAK,CAAC,SAAS,WAAW,QAAQ,OAAO,eAAe,KAAK,CAAC,eAAe,iBAAiB,QAAQ,KAAK,IAAI;AACrO,sCAAoB;AAAA,gBACtB;AACA,oBAAI,qBAAqB,GAAG;AAC1B,sBAAI,wBAAwB,sBAAsB,IAAI,MAAM,eAAe,SAAS,IAAI,oBAAoB;AAC5G,sBAAI,mBAAmB,MAAM,eAAe;AAC5C,oCAAkB,iBAAiB;AAAA,gBACrC;AAAA,cACF,OAAO;AACL,oBAAI,mBAAmB,UAAU,MAAM,gBAAgB,SAAS,OAAO;AACrE,sBAAI,mBAAmB,MAAM;AAC7B,yBAAO,WAAW;AAAA,gBACpB,CAAC;AACD,oBAAI,mBAAmB,KAAM,gBAAe,cAAc,UAAU,SAAS,YAAY,QAAQ,OAAO,eAAe,KAAK,CAAC,SAAS,WAAW,QAAQ,OAAO,eAAe,KAAK,CAAC,eAAe,iBAAiB,MAAM,IAAI;AAC7N,qCAAmB;AAAA,gBACrB;AACA,oBAAI,oBAAoB,GAAG;AACzB,sBAAI,yBAAyB,qBAAqB,MAAM,eAAe,SAAS,IAAI,IAAI,mBAAmB;AAC3G,sBAAI,oBAAoB,MAAM,eAAe;AAC7C,oCAAkB,kBAAkB;AAAA,gBACtC;AAAA,cACF;AAAA,YACF,OAAO;AACL,gCAAkB,iBAAiB,eAAe;AAAA,YACpD;AACA,gBAAI,iBAAiB;AACnB,gBAAE,eAAe;AACjB,uBAAS,eAAe;AAAA,YAC1B;AAAA,UACF;AACA,cAAI,WAAW,mBAAmB,GAAG;AACnC,gBAAI,cAAc,CAAC,KAAK,eAAe,OAAO,mBAAmB,CAAC,MAAM,OAAO;AAC7E,gBAAE,eAAe;AACjB,mBAAK,WAAW;AAChB;AAAA,YACF;AACA,gBAAI,WAAW,CAAC,GAAG;AACjB,uBAAS,CAAC;AACV;AAAA,YACF;AAAA,UACF;AACA,cAAI,aAAa,qBAAqB,GAAG;AACvC,gBAAI,SAAS,gBAAgB,CAAC;AAC9B,gBAAI,mBAAmB,MAAM,KAAK,GAAG;AACnC;AAAA,YACF;AACA,gBAAI,eAAe,OAAO,yBAAyB,CAAC,GAAG;AACrD;AAAA,YACF;AACA,gBAAI,eAAe,OAAO,mBAAmB,CAAC,GAAG;AAC/C;AAAA,YACF;AACA,cAAE,eAAe;AACjB,cAAE,yBAAyB;AAAA,UAC7B;AACA,cAAI,eAAe,yBAAyB;AAC1C,gBAAI,CAAC,MAAM,QAAQ;AACjB;AAAA,YACF;AACA,6BAAiB,aAAa,IAAI;AAClC,kBAAM,yBAAyB,OAAO,oBAAoB,MAAM,WAAW;AACzE,uBAAS,oBAAoB,CAAC;AAAA,YAChC,CAAC,IAAI,SAAS,oBAAoB,CAAC;AACnC,gBAAI,iBAAiB,WAAW,cAAc,IAAI;AAClD,gBAAI,iBAAiB,aAAa,kBAAkB;AAAA,cAClD,SAAS;AAAA,cACT,SAAS;AAAA,YACX,CAAC;AACD,gBAAI,iBAAiB,cAAc,kBAAkB;AAAA,cACnD,SAAS;AAAA,cACT,SAAS;AAAA,YACX,CAAC;AACD,gBAAI,iBAAiB,SAAS,YAAY;AAAA,cACxC,SAAS;AAAA,cACT,SAAS;AAAA,YACX,CAAC;AACD,gBAAI,iBAAiB,WAAW,UAAU;AAAA,cACxC,SAAS;AAAA,cACT,SAAS;AAAA,YACX,CAAC;AACD,mBAAO;AAAA,UACT;AACA,cAAI,kBAAkB,4BAA4B;AAChD,gBAAI,CAAC,MAAM,QAAQ;AACjB;AAAA,YACF;AACA,gBAAI,oBAAoB,WAAW,cAAc,IAAI;AACrD,gBAAI,oBAAoB,aAAa,kBAAkB,IAAI;AAC3D,gBAAI,oBAAoB,cAAc,kBAAkB,IAAI;AAC5D,gBAAI,oBAAoB,SAAS,YAAY,IAAI;AACjD,gBAAI,oBAAoB,WAAW,UAAU,IAAI;AACjD,mBAAO;AAAA,UACT;AACA,iBAAO;AAAA,YACL,IAAI,SAAS;AACX,qBAAO,MAAM;AAAA,YACf;AAAA,YACA,IAAI,SAAS;AACX,qBAAO,MAAM;AAAA,YACf;AAAA,YACA,UAAU,kBAAkB,iBAAiB;AAC3C,kBAAI,MAAM,QAAQ;AAChB,uBAAO;AAAA,cACT;AACA,kBAAI,aAAa,UAAU,iBAAiB,YAAY;AACxD,kBAAI,iBAAiB,UAAU,iBAAiB,gBAAgB;AAChE,kBAAI,oBAAoB,UAAU,iBAAiB,mBAAmB;AACtE,kBAAI,CAAC,mBAAmB;AACtB,oCAAoB;AAAA,cACtB;AACA,oBAAM,SAAS;AACf,oBAAM,SAAS;AACf,oBAAM,8BAA8B,IAAI;AACxC,kBAAI,YAAY;AACd,2BAAW;AAAA,cACb;AACA,kBAAI,mBAAmB,6BAA6B;AAClD,oBAAI,mBAAmB;AACrB,sCAAoB;AAAA,gBACtB;AACA,6BAAa;AACb,oBAAI,gBAAgB;AAClB,iCAAe;AAAA,gBACjB;AAAA,cACF;AACA,kBAAI,mBAAmB;AACrB,kCAAkB,MAAM,WAAW,OAAO,CAAC,EAAE,KAAK,kBAAkB,gBAAgB;AACpF,uBAAO;AAAA,cACT;AACA,+BAAiB;AACjB,qBAAO;AAAA,YACT;AAAA,YACA,YAAY,oBAAoB,mBAAmB;AACjD,kBAAI,CAAC,MAAM,QAAQ;AACjB,uBAAO;AAAA,cACT;AACA,kBAAI,UAAU,eAAe;AAAA,gBAC3B,cAAc,OAAO;AAAA,gBACrB,kBAAkB,OAAO;AAAA,gBACzB,qBAAqB,OAAO;AAAA,cAC9B,GAAG,iBAAiB;AACpB,2BAAa,MAAM,sBAAsB;AACzC,oBAAM,yBAAyB;AAC/B,8BAAgB;AAChB,oBAAM,SAAS;AACf,oBAAM,SAAS;AACf,+BAAiB,eAAe,IAAI;AACpC,kBAAI,eAAe,UAAU,SAAS,cAAc;AACpD,kBAAI,mBAAmB,UAAU,SAAS,kBAAkB;AAC5D,kBAAI,sBAAsB,UAAU,SAAS,qBAAqB;AAClE,kBAAI,cAAc,UAAU,SAAS,eAAe,yBAAyB;AAC7E,kBAAI,cAAc;AAChB,6BAAa;AAAA,cACf;AACA,kBAAI,qBAAqB,+BAA+B;AACtD,sBAAM,WAAW;AACf,sBAAI,aAAa;AACf,6BAAS,mBAAmB,MAAM,2BAA2B,CAAC;AAAA,kBAChE;AACA,sBAAI,kBAAkB;AACpB,qCAAiB;AAAA,kBACnB;AAAA,gBACF,CAAC;AAAA,cACH;AACA,kBAAI,eAAe,qBAAqB;AACtC,oCAAoB,mBAAmB,MAAM,2BAA2B,CAAC,EAAE,KAAK,oBAAoB,kBAAkB;AACtH,uBAAO;AAAA,cACT;AACA,iCAAmB;AACnB,qBAAO;AAAA,YACT;AAAA,YACA,OAAO,iBAAiB;AACtB,kBAAI,MAAM,UAAU,CAAC,MAAM,QAAQ;AACjC,uBAAO;AAAA,cACT;AACA,oBAAM,SAAS;AACf,8BAAgB;AAChB,qBAAO;AAAA,YACT;AAAA,YACA,SAAS,mBAAmB;AAC1B,kBAAI,CAAC,MAAM,UAAU,CAAC,MAAM,QAAQ;AAClC,uBAAO;AAAA,cACT;AACA,oBAAM,SAAS;AACf,kCAAoB;AACpB,2BAAa;AACb,qBAAO;AAAA,YACT;AAAA,YACA,yBAAyB,iCAAiC,mBAAmB;AAC3E,kBAAI,kBAAkB,CAAC,EAAE,OAAO,iBAAiB,EAAE,OAAO,OAAO;AACjE,oBAAM,aAAa,gBAAgB,IAAI,SAAS,SAAS;AACvD,uBAAO,OAAO,YAAY,WAAW,IAAI,cAAc,OAAO,IAAI;AAAA,cACpE,CAAC;AACD,kBAAI,MAAM,QAAQ;AAChB,oCAAoB;AAAA,cACtB;AACA,qBAAO;AAAA,YACT;AAAA,UACF;AACA,eAAK,wBAAwB,QAAQ;AACrC,iBAAO;AAAA,QACT;AACA,iBAAQ,kBAAkB;AAAA,MAC5B;AAAA,IACF,CAAC;AAGD,QAAI,iBAAiB,CAAC;AACtB,aAAS,gBAAgB;AAAA,MACvB,SAAS,MAAM;AAAA,MACf,OAAO,MAAM;AAAA,IACf,CAAC;AACD,WAAO,UAAU,aAAa,cAAc;AAG5C,QAAI,oBAAoB,SAAQ,mBAAmB,CAAC;AACpD,QAAI,kBAAkB,SAAQ,aAAa,CAAC;AAC5C,yBAAqB,UAAQ;AAC3B,UAAI;AACJ,UAAI;AACJ,aAAO,iBAAiB,WAAW,MAAM;AACvC,sBAAc;AACd,yBAAiB,SAAS;AAAA,MAC5B,CAAC;AACD,eAAO,MAAM,SAAS,CAAC,OAAO;AAC5B,YAAI,SAAS;AACb,eAAO;AAAA,UACL,YAAY;AAAA,UACZ,cAAc;AAAA,UACd,OAAO,KAAK;AACV,qBAAS;AACT,mBAAO;AAAA,UACT;AAAA,UACA,mBAAmB;AACjB,iBAAK,aAAa;AAClB,mBAAO;AAAA,UACT;AAAA,UACA,WAAW;AACT,iBAAK,aAAa;AAClB,mBAAO;AAAA,UACT;AAAA,UACA,iBAAiB;AACf,iBAAK,eAAe;AACpB,mBAAO;AAAA,UACT;AAAA,UACA,OAAO;AACL,mBAAO,KAAK,eAAe;AAAA,UAC7B;AAAA,UACA,UAAU,KAAK;AACb,mBAAQ,IAAG,gBAAgB,aAAa,GAAG;AAAA,UAC7C;AAAA,UACA,oBAAoB;AAClB,mBAAO;AAAA,UACT;AAAA,UACA,cAAc;AACZ,mBAAO;AAAA,UACT;AAAA,UACA,UAAU;AACR,mBAAO;AAAA,UACT;AAAA,UACA,aAAa;AACX,gBAAI,MAAM,QAAQ,MAAM;AACtB,qBAAO;AACT,mBAAQ,IAAG,gBAAgB,WAAW,QAAQ,EAAE,cAAc,OAAO,CAAC;AAAA,UACxE;AAAA,UACA,MAAM;AACJ,mBAAO,KAAK,WAAW;AAAA,UACzB;AAAA,UACA,QAAQ,KAAK;AACX,gBAAI,OAAM,KAAK,IAAI;AACnB,mBAAO,KAAI,MAAM,KAAI,GAAG,WAAW,GAAG;AAAA,UACxC;AAAA,UACA,OAAO,KAAK;AACV,gBAAI,OAAM,KAAK,IAAI;AACnB,mBAAO,KAAI,UAAU,KAAI,MAAM,EAAE,EAAE,GAAG,WAAW,GAAG;AAAA,UACtD;AAAA,UACA,WAAW;AACT,mBAAO,KAAK,IAAI,EAAE;AAAA,UACpB;AAAA,UACA,UAAU;AACR,mBAAO,KAAK,IAAI,EAAE,MAAM,EAAE,EAAE;AAAA,UAC9B;AAAA,UACA,UAAU;AACR,gBAAI,OAAO,KAAK,IAAI;AACpB,gBAAI,UAAU,SAAS;AACvB,gBAAI,KAAK,QAAQ,OAAO,MAAM;AAC5B;AACF,gBAAI,KAAK,gBAAgB,KAAK,QAAQ,OAAO,MAAM,KAAK,SAAS,GAAG;AAClE,qBAAO,KAAK;AAAA,YACd;AACA,mBAAO,KAAK,KAAK,QAAQ,OAAO,IAAI;AAAA,UACtC;AAAA,UACA,cAAc;AACZ,gBAAI,OAAO,KAAK,IAAI;AACpB,gBAAI,UAAU,SAAS;AACvB,gBAAI,KAAK,QAAQ,OAAO,MAAM;AAC5B;AACF,gBAAI,KAAK,gBAAgB,KAAK,QAAQ,OAAO,MAAM,GAAG;AACpD,qBAAO,KAAK,MAAM,EAAE,EAAE;AAAA,YACxB;AACA,mBAAO,KAAK,KAAK,QAAQ,OAAO,IAAI;AAAA,UACtC;AAAA,UACA,QAAQ;AACN,iBAAK,MAAM,KAAK,SAAS,CAAC;AAAA,UAC5B;AAAA,UACA,OAAO;AACL,iBAAK,MAAM,KAAK,QAAQ,CAAC;AAAA,UAC3B;AAAA,UACA,OAAO;AACL,iBAAK,MAAM,KAAK,QAAQ,CAAC;AAAA,UAC3B;AAAA,UACA,WAAW;AACT,iBAAK,MAAM,KAAK,YAAY,CAAC;AAAA,UAC/B;AAAA,UACA,OAAO;AACL,mBAAO,KAAK,SAAS;AAAA,UACvB;AAAA,UACA,MAAM,KAAK;AACT,gBAAI,CAAC;AACH;AACF,uBAAW,MAAM;AACf,kBAAI,CAAC,IAAI,aAAa,UAAU;AAC9B,oBAAI,aAAa,YAAY,GAAG;AAClC,kBAAI,MAAM,EAAE,eAAe,KAAK,WAAW,CAAC;AAAA,YAC9C,CAAC;AAAA,UACH;AAAA,QACF;AAAA,MACF,CAAC;AACD,eAAO,UAAU,QAAQ,SAAO,gBAC9B,CAAC,IAAI,EAAE,YAAY,aAAa,EAAE,QAAQ,eAAe,cAAc;AACrE,YAAI,YAAY,cAAc,UAAU;AACxC,YAAI,WAAW;AACf,YAAI,UAAU;AAAA,UACZ,mBAAmB;AAAA,UACnB,mBAAmB;AAAA,UACnB,eAAe,MAAM;AAAA,QACvB;AACA,YAAI,UAAU,SAAS,aAAa,GAAG;AACrC,kBAAQ,eAAe;AAAA,QACzB,OAAO;AACL,cAAI,cAAc,GAAG,cAAc,aAAa;AAChD,cAAI;AACF,oBAAQ,eAAe;AAAA,QAC3B;AACA,YAAI,OAAQ,IAAG,kBAAkB,iBAAiB,IAAI,OAAO;AAC7D,YAAI,YAAY,MAAM;AAAA,QACtB;AACA,YAAI,uBAAuB,MAAM;AAAA,QACjC;AACA,cAAM,eAAe,MAAM;AACzB,oBAAU;AACV,sBAAY,MAAM;AAAA,UAClB;AACA,+BAAqB;AACrB,iCAAuB,MAAM;AAAA,UAC7B;AACA,eAAK,WAAW;AAAA,YACd,aAAa,CAAC,UAAU,SAAS,UAAU;AAAA,UAC7C,CAAC;AAAA,QACH;AACA,eAAO,MAAM,UAAU,CAAC,UAAU;AAChC,cAAI,aAAa;AACf;AACF,cAAI,SAAS,CAAC,UAAU;AACtB,gBAAI,UAAU,SAAS,UAAU;AAC/B,qCAAuB,iBAAiB;AAC1C,gBAAI,UAAU,SAAS,OAAO;AAC5B,0BAAY,SAAS,EAAE;AACzB,uBAAW,MAAM;AACf,mBAAK,SAAS;AAAA,YAChB,GAAG,EAAE;AAAA,UACP;AACA,cAAI,CAAC,SAAS,UAAU;AACtB,yBAAa;AAAA,UACf;AACA,qBAAW,CAAC,CAAC;AAAA,QACf,CAAC,CAAC;AACF,gBAAQ,YAAY;AAAA,MACtB,GAIA,CAAC,IAAI,EAAE,YAAY,aAAa,EAAE,eAAe;AAC/C,YAAI,UAAU,SAAS,OAAO,KAAK,SAAS,UAAU;AACpD,mBAAS,EAAE;AAAA,MACf,CACF,CAAC;AAAA,IACH;AACA,sBAAkB,IAAI;AACpB,UAAI,QAAQ,CAAC;AACb,sBAAgB,IAAI,CAAC,YAAY;AAC/B,YAAI,QAAQ,QAAQ,aAAa,aAAa;AAC9C,gBAAQ,aAAa,eAAe,MAAM;AAC1C,cAAM,KAAK,MAAM,SAAS,QAAQ,gBAAgB,aAAa,CAAC;AAAA,MAClE,CAAC;AACD,aAAO,MAAM;AACX,eAAO,MAAM;AACX,gBAAM,IAAI,EAAE;AAAA,MAChB;AAAA,IACF;AACA,6BAAyB,IAAI,UAAU;AACrC,UAAI,GAAG,WAAW,SAAS,IAAI,KAAK,CAAC,GAAG;AACtC;AACF,YAAM,KAAK,GAAG,WAAW,QAAQ,EAAE,QAAQ,CAAC,YAAY;AACtD,YAAI,QAAQ,WAAW,EAAE,GAAG;AAC1B,0BAAgB,GAAG,YAAY,QAAQ;AAAA,QACzC,OAAO;AACL,mBAAS,OAAO;AAAA,QAClB;AAAA,MACF,CAAC;AAAA,IACH;AACA,gCAA4B;AAC1B,UAAI,WAAW,SAAS,gBAAgB,MAAM;AAC9C,UAAI,eAAe,SAAS,gBAAgB,MAAM;AAClD,UAAI,iBAAiB,OAAO,aAAa,SAAS,gBAAgB;AAClE,eAAS,gBAAgB,MAAM,WAAW;AAC1C,eAAS,gBAAgB,MAAM,eAAe,GAAG;AACjD,aAAO,MAAM;AACX,iBAAS,gBAAgB,MAAM,WAAW;AAC1C,iBAAS,gBAAgB,MAAM,eAAe;AAAA,MAChD;AAAA,IACF;AAGA,QAAI,iBAAiB;AAKrB;AAAA;;;AC9iCA;AAAA;AAAA,QAAI,aAAY,OAAO;AACvB,QAAI,oBAAmB,OAAO;AAC9B,QAAI,qBAAoB,OAAO;AAC/B,QAAI,gBAAe,OAAO,UAAU;AACpC,QAAI,WAAW,CAAC,QAAQ,SAAQ;AAC9B,eAAS,QAAQ;AACf,mBAAU,QAAQ,MAAM,EAAE,KAAK,KAAI,OAAO,YAAY,KAAK,CAAC;AAAA,IAChE;AACA,QAAI,eAAc,CAAC,IAAI,MAAM,QAAQ,SAAS;AAC5C,UAAI,QAAQ,OAAO,SAAS,YAAY,OAAO,SAAS,YAAY;AAClE,iBAAS,OAAO,mBAAkB,IAAI;AACpC,cAAI,CAAC,cAAa,KAAK,IAAI,GAAG,KAAK,QAAQ;AACzC,uBAAU,IAAI,KAAK,EAAE,KAAK,MAAM,KAAK,MAAM,YAAY,CAAE,QAAO,kBAAiB,MAAM,GAAG,MAAM,KAAK,WAAW,CAAC;AAAA,MACvH;AACA,aAAO;AAAA,IACT;AACA,QAAI,eAAe,CAAC,QAAQ,aAAY,WAAU,CAAC,GAAG,cAAc,EAAE,OAAO,KAAK,CAAC,GAAG,GAAG;AAGzF,QAAI,iBAAiB,CAAC;AACtB,aAAS,gBAAgB;AAAA,MACvB,SAAS,MAAM;AAAA,MACf,SAAS,MAAM;AAAA,IACjB,CAAC;AACD,WAAO,UAAU,aAAa,cAAc;AAG5C,yBAAqB,UAAQ;AAC3B,UAAI,WAAU,MAAM;AAClB,YAAI;AACJ,YAAI;AACJ,YAAI;AACF,oBAAU;AAAA,QACZ,SAAS,GAAP;AACA,kBAAQ,MAAM,CAAC;AACf,kBAAQ,KAAK,gFAAgF;AAC7F,cAAI,QAAwB,oBAAI,IAAI;AACpC,oBAAU;AAAA,YACR,SAAS,MAAM,IAAI,KAAK,KAAK;AAAA,YAC7B,SAAS,MAAM,IAAI,KAAK,KAAK;AAAA,UAC/B;AAAA,QACF;AACA,eAAO,SAAO,YAAY,CAAC,cAAc,QAAQ,QAAQ,MAAM,QAAQ;AACrE,cAAI,SAAS,SAAS,MAAM;AAC5B,cAAI,UAAU,WAAW,QAAQ,OAAO,IAAI,WAAW,QAAQ,OAAO,IAAI;AAC1E,iBAAO,OAAO;AACd,mBAAO,OAAO,MAAM;AAClB,gBAAI,QAAQ,OAAO;AACnB,uBAAW,QAAQ,OAAO,OAAO;AACjC,mBAAO,KAAK;AAAA,UACd,CAAC;AACD,iBAAO;AAAA,QACT,GAAG,CAAC,SAAS;AACX,eAAK,KAAK,CAAC,QAAQ;AACjB,oBAAQ;AACR,mBAAO;AAAA,UACT,GAAG,KAAK,QAAQ,CAAC,WAAW;AAC1B,sBAAU;AACV,mBAAO;AAAA,UACT;AAAA,QACF,CAAC;AAAA,MACH;AACA,aAAO,eAAe,UAAQ,YAAY,EAAE,KAAK,MAAM,SAAQ,EAAE,CAAC;AAClE,eAAO,MAAM,WAAW,QAAO;AAC/B,eAAO,UAAU,CAAC,KAAK,EAAE,KAAK,OAAO,UAAU,iBAAiB;AAC9D,YAAI,UAAU,WAAW,KAAK,OAAO,IAAI,WAAW,KAAK,OAAO,IAAI,IAAI;AACxE,YAAI,OAAO;AACX,iBAAO,OAAO,MAAM;AAClB,cAAI,QAAQ,IAAI;AAChB,qBAAW,KAAK,OAAO,OAAO;AAC9B,cAAI,KAAK;AAAA,QACX,CAAC;AAAA,MACH;AAAA,IACF;AACA,wBAAoB,KAAK,SAAS;AAChC,aAAO,QAAQ,QAAQ,GAAG,MAAM;AAAA,IAClC;AACA,wBAAoB,KAAK,SAAS;AAChC,UAAI,QAAQ,QAAQ,QAAQ,KAAK,OAAO;AACxC,UAAI,UAAU;AACZ;AACF,aAAO,KAAK,MAAM,KAAK;AAAA,IACzB;AACA,wBAAoB,KAAK,OAAO,SAAS;AACvC,cAAQ,QAAQ,KAAK,KAAK,UAAU,KAAK,CAAC;AAAA,IAC5C;AAGA,QAAI,iBAAiB;AAAA;AAAA;;;ACxFrB;AAAA;AAAA,QAAI,aAAY,OAAO;AACvB,QAAI,oBAAmB,OAAO;AAC9B,QAAI,qBAAoB,OAAO;AAC/B,QAAI,gBAAe,OAAO,UAAU;AACpC,QAAI,WAAW,CAAC,QAAQ,SAAQ;AAC9B,eAAS,QAAQ;AACf,mBAAU,QAAQ,MAAM,EAAE,KAAK,KAAI,OAAO,YAAY,KAAK,CAAC;AAAA,IAChE;AACA,QAAI,eAAc,CAAC,IAAI,MAAM,QAAQ,SAAS;AAC5C,UAAI,QAAQ,OAAO,SAAS,YAAY,OAAO,SAAS,YAAY;AAClE,iBAAS,OAAO,mBAAkB,IAAI;AACpC,cAAI,CAAC,cAAa,KAAK,IAAI,GAAG,KAAK,QAAQ;AACzC,uBAAU,IAAI,KAAK,EAAE,KAAK,MAAM,KAAK,MAAM,YAAY,CAAE,QAAO,kBAAiB,MAAM,GAAG,MAAM,KAAK,WAAW,CAAC;AAAA,MACvH;AACA,aAAO;AAAA,IACT;AACA,QAAI,eAAe,CAAC,QAAQ,aAAY,WAAU,CAAC,GAAG,cAAc,EAAE,OAAO,KAAK,CAAC,GAAG,GAAG;AAGzF,QAAI,iBAAiB,CAAC;AACtB,aAAS,gBAAgB;AAAA,MACvB,SAAS,MAAM;AAAA,MACf,WAAW,MAAM;AAAA,IACnB,CAAC;AACD,WAAO,UAAU,aAAa,cAAc;AAG5C,yBAAqB,UAAQ;AAC3B,eAAO,UAAU,aAAa,SAAO,gBAAgB,CAAC,IAAI,EAAE,OAAO,YAAY,aAAa,EAAE,eAAe,cAAc;AACzH,YAAI,WAAW,cAAc,UAAU;AACvC,YAAI,UAAU;AAAA,UACZ,YAAY,cAAc,SAAS;AAAA,UACnC,WAAW,aAAa,SAAS;AAAA,QACnC;AACA,YAAI,WAAW,IAAI,qBAAqB,CAAC,YAAY;AACnD,kBAAQ,QAAQ,CAAC,UAAU;AACzB,gBAAI,MAAM,mBAAoB,WAAU;AACtC;AACF,qBAAS;AACT,sBAAU,SAAS,MAAM,KAAK,SAAS,WAAW;AAAA,UACpD,CAAC;AAAA,QACH,GAAG,OAAO;AACV,iBAAS,QAAQ,EAAE;AACnB,gBAAQ,MAAM;AACZ,mBAAS,WAAW;AAAA,QACtB,CAAC;AAAA,MACH,CAAC,CAAC;AAAA,IACJ;AACA,0BAAsB,WAAW;AAC/B,UAAI,UAAU,SAAS,MAAM;AAC3B,eAAO;AACT,UAAI,UAAU,SAAS,MAAM;AAC3B,eAAO;AACT,UAAI,CAAC,UAAU,SAAS,WAAW;AACjC,eAAO;AACT,UAAI,YAAY,UAAU,UAAU,QAAQ,WAAW,IAAI;AAC3D,UAAI,cAAc;AAChB,eAAO;AACT,UAAI,cAAc;AAChB,eAAO;AACT,aAAO,OAAO,IAAI,WAAW;AAAA,IAC/B;AACA,4BAAwB,UAAU;AAChC,UAAI,QAAQ,SAAS,MAAM,qBAAqB;AAChD,aAAO,QAAQ,MAAM,KAAM,OAAM,MAAM,QAAQ;AAAA,IACjD;AACA,2BAAuB,WAAW;AAChC,YAAM,MAAM;AACZ,YAAM,YAAW;AACjB,YAAM,QAAQ,UAAU,QAAQ,GAAG;AACnC,UAAI,UAAU;AACZ,eAAO;AACT,UAAI,SAAS,CAAC;AACd,eAAS,IAAI,GAAG,IAAI,GAAG,KAAK;AAC1B,eAAO,KAAK,eAAe,UAAU,QAAQ,MAAM,EAAE,CAAC;AAAA,MACxD;AACA,eAAS,OAAO,OAAO,CAAC,MAAM,MAAM,MAAM;AAC1C,aAAO,OAAO,SAAS,OAAO,KAAK,GAAG,EAAE,KAAK,IAAI;AAAA,IACnD;AAGA,QAAI,iBAAiB;AAAA;AAAA;;;ACjFrB;AAAA;AAAA,QAAI,aAAY,OAAO;AACvB,QAAI,oBAAmB,OAAO;AAC9B,QAAI,qBAAoB,OAAO;AAC/B,QAAI,gBAAe,OAAO,UAAU;AACpC,QAAI,WAAW,CAAC,QAAQ,SAAQ;AAC9B,eAAS,QAAQ;AACf,mBAAU,QAAQ,MAAM,EAAE,KAAK,KAAI,OAAO,YAAY,KAAK,CAAC;AAAA,IAChE;AACA,QAAI,eAAc,CAAC,IAAI,MAAM,QAAQ,SAAS;AAC5C,UAAI,QAAQ,OAAO,SAAS,YAAY,OAAO,SAAS,YAAY;AAClE,iBAAS,OAAO,mBAAkB,IAAI;AACpC,cAAI,CAAC,cAAa,KAAK,IAAI,GAAG,KAAK,QAAQ;AACzC,uBAAU,IAAI,KAAK,EAAE,KAAK,MAAM,KAAK,MAAM,YAAY,CAAE,QAAO,kBAAiB,MAAM,GAAG,MAAM,KAAK,WAAW,CAAC;AAAA,MACvH;AACA,aAAO;AAAA,IACT;AACA,QAAI,eAAe,CAAC,QAAQ,aAAY,WAAU,CAAC,GAAG,cAAc,EAAE,OAAO,KAAK,CAAC,GAAG,GAAG;AAGzF,QAAI,iBAAiB,CAAC;AACtB,aAAS,gBAAgB;AAAA,MACvB,SAAS,MAAM;AAAA,MACf,QAAQ,MAAM;AAAA,IAChB,CAAC;AACD,WAAO,UAAU,aAAa,cAAc;AAG5C,yBAAqB,UAAQ;AAC3B,eAAO,UAAU,UAAU,SAAO,gBAAgB,CAAC,IAAI,EAAE,OAAO,YAAY,aAAa,EAAE,eAAe,cAAc;AACtH,YAAI,YAAY,cAAc,UAAU;AACxC,YAAI,WAAW,CAAC,OAAO,WAAW;AAChC,oBAAU,MAAM;AAAA,UAChB,GAAG,EAAE,OAAO,EAAE,UAAU,OAAO,WAAW,OAAO,EAAE,CAAC;AAAA,QACtD;AACA,YAAI,MAAM,UAAU,SAAS,UAAU,IAAI,iBAAiB,QAAQ,IAAI,WAAW,IAAI,QAAQ;AAC/F,gBAAQ,MAAM,IAAI,CAAC;AAAA,MACrB,CAAC,CAAC;AAAA,IACJ;AACA,wBAAoB,IAAI,UAAU;AAChC,UAAI,WAAW,IAAI,eAAe,CAAC,YAAY;AAC7C,YAAI,CAAC,OAAO,UAAU,WAAW,OAAO;AACxC,iBAAS,OAAO,MAAM;AAAA,MACxB,CAAC;AACD,eAAS,QAAQ,EAAE;AACnB,aAAO,MAAM,SAAS,WAAW;AAAA,IACnC;AACA,QAAI;AACJ,QAAI,kCAAkD,oBAAI,IAAI;AAC9D,8BAA0B,UAAU;AAClC,sCAAgC,IAAI,QAAQ;AAC5C,UAAI,CAAC,wBAAwB;AAC3B,iCAAyB,IAAI,eAAe,CAAC,YAAY;AACvD,cAAI,CAAC,OAAO,UAAU,WAAW,OAAO;AACxC,0CAAgC,QAAQ,CAAC,MAAM,EAAE,OAAO,MAAM,CAAC;AAAA,QACjE,CAAC;AACD,+BAAuB,QAAQ,SAAS,eAAe;AAAA,MACzD;AACA,aAAO,MAAM;AACX,wCAAgC,OAAO,QAAQ;AAAA,MACjD;AAAA,IACF;AACA,wBAAoB,SAAS;AAC3B,UAAI,OAAO;AACX,eAAS,SAAS,SAAS;AACzB,gBAAQ,MAAM,cAAc,GAAG;AAC/B,iBAAS,MAAM,cAAc,GAAG;AAAA,MAClC;AACA,aAAO,CAAC,OAAO,MAAM;AAAA,IACvB;AAGA,QAAI,iBAAiB;AAAA;AAAA;;;ACvErB;AAAA;AAAA,QAAI,aAAY,OAAO;AACvB,QAAI,oBAAmB,OAAO;AAC9B,QAAI,qBAAoB,OAAO;AAC/B,QAAI,gBAAe,OAAO,UAAU;AACpC,QAAI,WAAW,CAAC,QAAQ,SAAQ;AAC9B,eAAS,QAAQ;AACf,mBAAU,QAAQ,MAAM,EAAE,KAAK,KAAI,OAAO,YAAY,KAAK,CAAC;AAAA,IAChE;AACA,QAAI,eAAc,CAAC,IAAI,MAAM,QAAQ,SAAS;AAC5C,UAAI,QAAQ,OAAO,SAAS,YAAY,OAAO,SAAS,YAAY;AAClE,iBAAS,OAAO,mBAAkB,IAAI;AACpC,cAAI,CAAC,cAAa,KAAK,IAAI,GAAG,KAAK,QAAQ;AACzC,uBAAU,IAAI,KAAK,EAAE,KAAK,MAAM,KAAK,MAAM,YAAY,CAAE,QAAO,kBAAiB,MAAM,GAAG,MAAM,KAAK,WAAW,CAAC;AAAA,MACvH;AACA,aAAO;AAAA,IACT;AACA,QAAI,eAAe,CAAC,QAAQ,aAAY,WAAU,CAAC,GAAG,cAAc,EAAE,OAAO,KAAK,CAAC,GAAG,GAAG;AAGzF,QAAI,iBAAiB,CAAC;AACtB,aAAS,gBAAgB;AAAA,MACvB,QAAQ,MAAM;AAAA,MACd,SAAS,MAAM;AAAA,IACjB,CAAC;AACD,WAAO,UAAU,aAAa,cAAc;AAG5C,QAAI,MAAM,KAAK;AACf,QAAI,MAAM,KAAK;AACf,QAAI,QAAQ,KAAK;AACjB,QAAI,QAAQ,KAAK;AACjB,QAAI,eAAe,CAAC,MAAO;AAAA,MACzB,GAAG;AAAA,MACH,GAAG;AAAA,IACL;AACA,QAAI,kBAAkB;AAAA,MACpB,MAAM;AAAA,MACN,OAAO;AAAA,MACP,QAAQ;AAAA,MACR,KAAK;AAAA,IACP;AACA,QAAI,uBAAuB;AAAA,MACzB,OAAO;AAAA,MACP,KAAK;AAAA,IACP;AACA,mBAAe,QAAO,OAAO,KAAK;AAChC,aAAO,IAAI,QAAO,IAAI,OAAO,GAAG,CAAC;AAAA,IACnC;AACA,sBAAkB,OAAO,OAAO;AAC9B,aAAO,OAAO,UAAU,aAAa,MAAM,KAAK,IAAI;AAAA,IACtD;AACA,qBAAiB,WAAW;AAC1B,aAAO,UAAU,MAAM,GAAG,EAAE;AAAA,IAC9B;AACA,0BAAsB,WAAW;AAC/B,aAAO,UAAU,MAAM,GAAG,EAAE;AAAA,IAC9B;AACA,6BAAyB,MAAM;AAC7B,aAAO,SAAS,MAAM,MAAM;AAAA,IAC9B;AACA,2BAAuB,MAAM;AAC3B,aAAO,SAAS,MAAM,WAAW;AAAA,IACnC;AACA,yBAAqB,WAAW;AAC9B,aAAO,CAAC,OAAO,QAAQ,EAAE,SAAS,QAAQ,SAAS,CAAC,IAAI,MAAM;AAAA,IAChE;AACA,8BAA0B,WAAW;AACnC,aAAO,gBAAgB,YAAY,SAAS,CAAC;AAAA,IAC/C;AACA,+BAA2B,WAAW,OAAO,KAAK;AAChD,UAAI,QAAQ,QAAQ;AAClB,cAAM;AAAA,MACR;AACA,YAAM,YAAY,aAAa,SAAS;AACxC,YAAM,gBAAgB,iBAAiB,SAAS;AAChD,YAAM,SAAS,cAAc,aAAa;AAC1C,UAAI,oBAAoB,kBAAkB,MAAM,cAAe,OAAM,QAAQ,WAAW,UAAU,SAAS,cAAc,UAAU,WAAW;AAC9I,UAAI,MAAM,UAAU,UAAU,MAAM,SAAS,SAAS;AACpD,4BAAoB,qBAAqB,iBAAiB;AAAA,MAC5D;AACA,aAAO,CAAC,mBAAmB,qBAAqB,iBAAiB,CAAC;AAAA,IACpE;AACA,mCAA+B,WAAW;AACxC,YAAM,oBAAoB,qBAAqB,SAAS;AACxD,aAAO,CAAC,8BAA8B,SAAS,GAAG,mBAAmB,8BAA8B,iBAAiB,CAAC;AAAA,IACvH;AACA,2CAAuC,WAAW;AAChD,aAAO,UAAU,QAAQ,cAAc,CAAC,cAAc,qBAAqB,UAAU;AAAA,IACvF;AACA,yBAAqB,MAAM,SAAS,KAAK;AACvC,YAAM,KAAK,CAAC,QAAQ,OAAO;AAC3B,YAAM,KAAK,CAAC,SAAS,MAAM;AAC3B,YAAM,KAAK,CAAC,OAAO,QAAQ;AAC3B,YAAM,KAAK,CAAC,UAAU,KAAK;AAC3B,cAAQ;AAAA,aACD;AAAA,aACA;AACH,cAAI;AACF,mBAAO,UAAU,KAAK;AACxB,iBAAO,UAAU,KAAK;AAAA,aACnB;AAAA,aACA;AACH,iBAAO,UAAU,KAAK;AAAA;AAEtB,iBAAO,CAAC;AAAA;AAAA,IAEd;AACA,uCAAmC,WAAW,eAAe,WAAW,KAAK;AAC3E,YAAM,YAAY,aAAa,SAAS;AACxC,UAAI,OAAO,YAAY,QAAQ,SAAS,GAAG,cAAc,SAAS,GAAG;AACrE,UAAI,WAAW;AACb,eAAO,KAAK,IAAI,CAAC,SAAS,OAAO,MAAM,SAAS;AAChD,YAAI,eAAe;AACjB,iBAAO,KAAK,OAAO,KAAK,IAAI,6BAA6B,CAAC;AAAA,QAC5D;AAAA,MACF;AACA,aAAO;AAAA,IACT;AACA,kCAA8B,WAAW;AACvC,aAAO,UAAU,QAAQ,0BAA0B,CAAC,SAAS,gBAAgB,KAAK;AAAA,IACpF;AACA,iCAA6B,SAAS;AACpC,aAAO;AAAA,QACL,KAAK;AAAA,QACL,OAAO;AAAA,QACP,QAAQ;AAAA,QACR,MAAM;AAAA,QACN,GAAG;AAAA,MACL;AAAA,IACF;AACA,8BAA0B,SAAS;AACjC,aAAO,OAAO,YAAY,WAAW,oBAAoB,OAAO,IAAI;AAAA,QAClE,KAAK;AAAA,QACL,OAAO;AAAA,QACP,QAAQ;AAAA,QACR,MAAM;AAAA,MACR;AAAA,IACF;AACA,8BAA0B,MAAM;AAC9B,aAAO;AAAA,QACL,GAAG;AAAA,QACH,KAAK,KAAK;AAAA,QACV,MAAM,KAAK;AAAA,QACX,OAAO,KAAK,IAAI,KAAK;AAAA,QACrB,QAAQ,KAAK,IAAI,KAAK;AAAA,MACxB;AAAA,IACF;AAGA,wCAAoC,MAAM,WAAW,KAAK;AACxD,UAAI;AAAA,QACF;AAAA,QACA;AAAA,UACE;AACJ,YAAM,WAAW,YAAY,SAAS;AACtC,YAAM,gBAAgB,iBAAiB,SAAS;AAChD,YAAM,cAAc,cAAc,aAAa;AAC/C,YAAM,OAAO,QAAQ,SAAS;AAC9B,YAAM,aAAa,aAAa;AAChC,YAAM,UAAU,UAAU,IAAI,UAAU,QAAQ,IAAI,SAAS,QAAQ;AACrE,YAAM,UAAU,UAAU,IAAI,UAAU,SAAS,IAAI,SAAS,SAAS;AACvE,YAAM,cAAc,UAAU,eAAe,IAAI,SAAS,eAAe;AACzE,UAAI;AACJ,cAAQ;AAAA,aACD;AACH,mBAAS;AAAA,YACP,GAAG;AAAA,YACH,GAAG,UAAU,IAAI,SAAS;AAAA,UAC5B;AACA;AAAA,aACG;AACH,mBAAS;AAAA,YACP,GAAG;AAAA,YACH,GAAG,UAAU,IAAI,UAAU;AAAA,UAC7B;AACA;AAAA,aACG;AACH,mBAAS;AAAA,YACP,GAAG,UAAU,IAAI,UAAU;AAAA,YAC3B,GAAG;AAAA,UACL;AACA;AAAA,aACG;AACH,mBAAS;AAAA,YACP,GAAG,UAAU,IAAI,SAAS;AAAA,YAC1B,GAAG;AAAA,UACL;AACA;AAAA;AAEA,mBAAS;AAAA,YACP,GAAG,UAAU;AAAA,YACb,GAAG,UAAU;AAAA,UACf;AAAA;AAEJ,cAAQ,aAAa,SAAS;AAAA,aACvB;AACH,iBAAO,kBAAkB,cAAe,QAAO,aAAa,KAAK;AACjE;AAAA,aACG;AACH,iBAAO,kBAAkB,cAAe,QAAO,aAAa,KAAK;AACjE;AAAA;AAEJ,aAAO;AAAA,IACT;AACA,QAAI,kBAAkB,OAAO,WAAW,UAAU,WAAW;AAC3D,YAAM;AAAA,QACJ,YAAY;AAAA,QACZ,WAAW;AAAA,QACX,aAAa,CAAC;AAAA,QACd,UAAU;AAAA,UACR;AACJ,YAAM,kBAAkB,WAAW,OAAO,OAAO;AACjD,YAAM,MAAM,MAAO,WAAU,SAAS,OAAO,SAAS,UAAU,MAAM,QAAQ;AAC9E,UAAI,QAAQ,MAAM,UAAU,gBAAgB;AAAA,QAC1C;AAAA,QACA;AAAA,QACA;AAAA,MACF,CAAC;AACD,UAAI;AAAA,QACF;AAAA,QACA;AAAA,UACE,2BAA2B,OAAO,WAAW,GAAG;AACpD,UAAI,oBAAoB;AACxB,UAAI,iBAAiB,CAAC;AACtB,UAAI,aAAa;AACjB,eAAS,IAAI,GAAG,IAAI,gBAAgB,QAAQ,KAAK;AAC/C,cAAM;AAAA,UACJ;AAAA,UACA;AAAA,YACE,gBAAgB;AACpB,cAAM;AAAA,UACJ,GAAG;AAAA,UACH,GAAG;AAAA,UACH;AAAA,UACA;AAAA,YACE,MAAM,GAAG;AAAA,UACX;AAAA,UACA;AAAA,UACA,kBAAkB;AAAA,UAClB,WAAW;AAAA,UACX;AAAA,UACA;AAAA,UACA;AAAA,UACA,UAAU;AAAA,UACV,UAAU;AAAA,YACR;AAAA,YACA;AAAA,UACF;AAAA,QACF,CAAC;AACD,YAAI,SAAS,OAAO,QAAQ;AAC5B,YAAI,SAAS,OAAO,QAAQ;AAC5B,yBAAiB;AAAA,UACf,GAAG;AAAA,UACH,CAAC,OAAO;AAAA,YACN,GAAG,eAAe;AAAA,YAClB,GAAG;AAAA,UACL;AAAA,QACF;AACA,YAAI,SAAS,cAAc,IAAI;AAC7B;AACA,cAAI,OAAO,UAAU,UAAU;AAC7B,gBAAI,MAAM,WAAW;AACnB,kCAAoB,MAAM;AAAA,YAC5B;AACA,gBAAI,MAAM,OAAO;AACf,sBAAQ,MAAM,UAAU,OAAO,MAAM,UAAU,gBAAgB;AAAA,gBAC7D;AAAA,gBACA;AAAA,gBACA;AAAA,cACF,CAAC,IAAI,MAAM;AAAA,YACb;AACA,YAAC;AAAA,cACC;AAAA,cACA;AAAA,YACF,IAAI,2BAA2B,OAAO,mBAAmB,GAAG;AAAA,UAC9D;AACA,cAAI;AACJ;AAAA,QACF;AAAA,MACF;AACA,aAAO;AAAA,QACL;AAAA,QACA;AAAA,QACA,WAAW;AAAA,QACX;AAAA,QACA;AAAA,MACF;AAAA,IACF;AACA,kCAA8B,OAAO,SAAS;AAC5C,UAAI;AACJ,UAAI,YAAY,QAAQ;AACtB,kBAAU,CAAC;AAAA,MACb;AACA,YAAM;AAAA,QACJ;AAAA,QACA;AAAA,QACA,UAAU;AAAA,QACV;AAAA,QACA;AAAA,QACA;AAAA,UACE;AACJ,YAAM;AAAA,QACJ,WAAW;AAAA,QACX,eAAe;AAAA,QACf,iBAAiB;AAAA,QACjB,cAAc;AAAA,QACd,UAAU;AAAA,UACR,SAAS,SAAS,KAAK;AAC3B,YAAM,gBAAgB,iBAAiB,OAAO;AAC9C,YAAM,aAAa,mBAAmB,aAAa,cAAc;AACjE,YAAM,UAAU,SAAS,cAAc,aAAa;AACpD,YAAM,qBAAqB,iBAAiB,MAAM,UAAU,gBAAgB;AAAA,QAC1E,SAAW,0BAAwB,MAAO,WAAU,aAAa,OAAO,SAAS,UAAU,UAAU,OAAO,OAAO,OAAO,wBAAwB,QAAQ,UAAU,QAAQ,kBAAkB,MAAO,WAAU,sBAAsB,OAAO,SAAS,UAAU,mBAAmB,SAAS,QAAQ;AAAA,QACnS;AAAA,QACA;AAAA,QACA;AAAA,MACF,CAAC,CAAC;AACF,YAAM,OAAO,mBAAmB,aAAa;AAAA,QAC3C,GAAG,MAAM;AAAA,QACT;AAAA,QACA;AAAA,MACF,IAAI,MAAM;AACV,YAAM,eAAe,MAAO,WAAU,mBAAmB,OAAO,SAAS,UAAU,gBAAgB,SAAS,QAAQ;AACpH,YAAM,cAAc,MAAO,WAAU,aAAa,OAAO,SAAS,UAAU,UAAU,YAAY,KAAK,MAAO,WAAU,YAAY,OAAO,SAAS,UAAU,SAAS,YAAY,MAAM;AAAA,QACvL,GAAG;AAAA,QACH,GAAG;AAAA,MACL,IAAI;AAAA,QACF,GAAG;AAAA,QACH,GAAG;AAAA,MACL;AACA,YAAM,oBAAoB,iBAAiB,UAAU,wDAAwD,MAAM,UAAU,sDAAsD;AAAA,QACjL;AAAA,QACA;AAAA,QACA;AAAA,MACF,CAAC,IAAI,IAAI;AACT,aAAO;AAAA,QACL,KAAM,oBAAmB,MAAM,kBAAkB,MAAM,cAAc,OAAO,YAAY;AAAA,QACxF,QAAS,mBAAkB,SAAS,mBAAmB,SAAS,cAAc,UAAU,YAAY;AAAA,QACpG,MAAO,oBAAmB,OAAO,kBAAkB,OAAO,cAAc,QAAQ,YAAY;AAAA,QAC5F,OAAQ,mBAAkB,QAAQ,mBAAmB,QAAQ,cAAc,SAAS,YAAY;AAAA,MAClG;AAAA,IACF;AACA,QAAI,OAAO,SAAS,SAAS;AAC3B,UAAI,YAAY,QAAQ;AACtB,kBAAU,CAAC;AAAA,MACb;AACA,aAAO;AAAA,QACL,MAAM;AAAA,QACN;AAAA,QACA,MAAM,GAAG,OAAO;AACd,cAAI,uBAAuB;AAC3B,gBAAM;AAAA,YACJ;AAAA,YACA;AAAA,YACA;AAAA,YACA;AAAA,YACA,UAAU;AAAA,YACV;AAAA,cACE;AACJ,gBAAM;AAAA,YACJ,UAAU,gBAAgB;AAAA,YAC1B,WAAW,iBAAiB;AAAA,YAC5B,oBAAoB;AAAA,YACpB,mBAAmB;AAAA,YACnB,4BAA4B;AAAA,YAC5B,gBAAgB;AAAA,eACb;AAAA,cACD,SAAS,SAAS,KAAK;AAC3B,cAAK,yBAAwB,eAAe,UAAU,QAAQ,sBAAsB,iBAAiB;AACnG,mBAAO,CAAC;AAAA,UACV;AACA,gBAAM,OAAO,QAAQ,SAAS;AAC9B,gBAAM,kBAAkB,QAAQ,gBAAgB,MAAM;AACtD,gBAAM,MAAM,MAAO,WAAU,SAAS,OAAO,SAAS,UAAU,MAAM,SAAS,QAAQ;AACvF,gBAAM,qBAAqB,+BAAgC,oBAAmB,CAAC,gBAAgB,CAAC,qBAAqB,gBAAgB,CAAC,IAAI,sBAAsB,gBAAgB;AAChL,cAAI,CAAC,+BAA+B,8BAA8B,QAAQ;AACxE,+BAAmB,KAAK,GAAG,0BAA0B,kBAAkB,eAAe,2BAA2B,GAAG,CAAC;AAAA,UACvH;AACA,gBAAM,cAAc,CAAC,kBAAkB,GAAG,kBAAkB;AAC5D,gBAAM,WAAW,MAAM,eAAe,OAAO,qBAAqB;AAClE,gBAAM,YAAY,CAAC;AACnB,cAAI,gBAAkB,yBAAuB,eAAe,SAAS,OAAO,SAAS,qBAAqB,cAAc,CAAC;AACzH,cAAI,eAAe;AACjB,sBAAU,KAAK,SAAS,KAAK;AAAA,UAC/B;AACA,cAAI,gBAAgB;AAClB,kBAAM,SAAS,kBAAkB,WAAW,OAAO,GAAG;AACtD,sBAAU,KAAK,SAAS,OAAO,KAAK,SAAS,OAAO,GAAG;AAAA,UACzD;AACA,0BAAgB,CAAC,GAAG,eAAe;AAAA,YACjC;AAAA,YACA;AAAA,UACF,CAAC;AACD,cAAI,CAAC,UAAU,MAAM,CAAC,UAAU,SAAS,CAAC,GAAG;AAC3C,gBAAI,uBAAuB;AAC3B,kBAAM,YAAe,2BAAwB,eAAe,SAAS,OAAO,SAAS,sBAAsB,UAAU,KAAK;AAC1H,kBAAM,gBAAgB,YAAY;AAClC,gBAAI,eAAe;AACjB,qBAAO;AAAA,gBACL,MAAM;AAAA,kBACJ,OAAO;AAAA,kBACP,WAAW;AAAA,gBACb;AAAA,gBACA,OAAO;AAAA,kBACL,WAAW;AAAA,gBACb;AAAA,cACF;AAAA,YACF;AACA,gBAAI,iBAAkB,yBAAwB,cAAc,OAAO,CAAC,MAAM,EAAE,UAAU,MAAM,CAAC,EAAE,KAAK,CAAC,GAAG,MAAM,EAAE,UAAU,KAAK,EAAE,UAAU,EAAE,EAAE,OAAO,OAAO,SAAS,sBAAsB;AAC5L,gBAAI,CAAC,gBAAgB;AACnB,sBAAQ;AAAA,qBACD,WAAW;AACd,sBAAI;AACJ,wBAAM,aAAc,yBAAwB,cAAc,IAAI,CAAC,MAAM,CAAC,EAAE,WAAW,EAAE,UAAU,OAAO,CAAC,cAAc,YAAY,CAAC,EAAE,OAAO,CAAC,KAAK,cAAc,MAAM,WAAW,CAAC,CAAC,CAAC,EAAE,KAAK,CAAC,GAAG,MAAM,EAAE,KAAK,EAAE,EAAE,EAAE,OAAO,OAAO,SAAS,sBAAsB;AAC9P,sBAAI,YAAY;AACd,qCAAiB;AAAA,kBACnB;AACA;AAAA,gBACF;AAAA,qBACK;AACH,mCAAiB;AACjB;AAAA;AAAA,YAEN;AACA,gBAAI,cAAc,gBAAgB;AAChC,qBAAO;AAAA,gBACL,OAAO;AAAA,kBACL,WAAW;AAAA,gBACb;AAAA,cACF;AAAA,YACF;AAAA,UACF;AACA,iBAAO,CAAC;AAAA,QACV;AAAA,MACF;AAAA,IACF;AACA,wCAAoC,OAAO,SAAS;AAClD,YAAM;AAAA,QACJ;AAAA,QACA,UAAU;AAAA,QACV;AAAA,UACE;AACJ,YAAM,MAAM,MAAO,WAAU,SAAS,OAAO,SAAS,UAAU,MAAM,SAAS,QAAQ;AACvF,YAAM,OAAO,QAAQ,SAAS;AAC9B,YAAM,YAAY,aAAa,SAAS;AACxC,YAAM,aAAa,YAAY,SAAS,MAAM;AAC9C,YAAM,gBAAgB,CAAC,QAAQ,KAAK,EAAE,SAAS,IAAI,IAAI,KAAK;AAC5D,YAAM,iBAAiB,OAAO,aAAa,KAAK;AAChD,YAAM,WAAW,SAAS,SAAS,KAAK;AACxC,UAAI;AAAA,QACF;AAAA,QACA;AAAA,QACA;AAAA,UACE,OAAO,aAAa,WAAW;AAAA,QACjC,UAAU;AAAA,QACV,WAAW;AAAA,QACX,eAAe;AAAA,MACjB,IAAI;AAAA,QACF,UAAU;AAAA,QACV,WAAW;AAAA,QACX,eAAe;AAAA,QACf,GAAG;AAAA,MACL;AACA,UAAI,aAAa,OAAO,kBAAkB,UAAU;AAClD,oBAAY,cAAc,QAAQ,gBAAgB,KAAK;AAAA,MACzD;AACA,aAAO,aAAa;AAAA,QAClB,GAAG,YAAY;AAAA,QACf,GAAG,WAAW;AAAA,MAChB,IAAI;AAAA,QACF,GAAG,WAAW;AAAA,QACd,GAAG,YAAY;AAAA,MACjB;AAAA,IACF;AACA,QAAI,SAAS,SAAS,SAAS;AAC7B,UAAI,YAAY,QAAQ;AACtB,kBAAU;AAAA,MACZ;AACA,aAAO;AAAA,QACL,MAAM;AAAA,QACN;AAAA,QACA,MAAM,GAAG,OAAO;AACd,gBAAM;AAAA,YACJ;AAAA,YACA;AAAA,cACE;AACJ,gBAAM,aAAa,MAAM,qBAAqB,OAAO,OAAO;AAC5D,iBAAO;AAAA,YACL,GAAG,IAAI,WAAW;AAAA,YAClB,GAAG,IAAI,WAAW;AAAA,YAClB,MAAM;AAAA,UACR;AAAA,QACF;AAAA,MACF;AAAA,IACF;AACA,QAAI,QAAQ,SAAS,SAAS;AAC5B,UAAI,YAAY,QAAQ;AACtB,kBAAU,CAAC;AAAA,MACb;AACA,aAAO;AAAA,QACL,MAAM;AAAA,QACN;AAAA,QACA,MAAM,GAAG,OAAO;AACd,gBAAM;AAAA,YACJ;AAAA,YACA;AAAA,YACA;AAAA,cACE;AACJ,gBAAM;AAAA,YACJ,UAAU,gBAAgB;AAAA,YAC1B,WAAW,iBAAiB;AAAA,YAC5B,UAAU;AAAA,cACR,IAAI,CAAC,SAAS;AACZ,oBAAI;AAAA,kBACF,GAAG;AAAA,kBACH,GAAG;AAAA,oBACD;AACJ,uBAAO;AAAA,kBACL,GAAG;AAAA,kBACH,GAAG;AAAA,gBACL;AAAA,cACF;AAAA,YACF;AAAA,eACG;AAAA,cACD,SAAS,SAAS,KAAK;AAC3B,gBAAM,SAAS;AAAA,YACb;AAAA,YACA;AAAA,UACF;AACA,gBAAM,WAAW,MAAM,eAAe,OAAO,qBAAqB;AAClE,gBAAM,YAAY,YAAY,QAAQ,SAAS,CAAC;AAChD,gBAAM,WAAW,gBAAgB,SAAS;AAC1C,cAAI,gBAAgB,OAAO;AAC3B,cAAI,iBAAiB,OAAO;AAC5B,cAAI,eAAe;AACjB,kBAAM,UAAU,aAAa,MAAM,QAAQ;AAC3C,kBAAM,UAAU,aAAa,MAAM,WAAW;AAC9C,kBAAM,OAAO,gBAAgB,SAAS;AACtC,kBAAM,OAAO,gBAAgB,SAAS;AACtC,4BAAgB,MAAM,MAAM,eAAe,IAAI;AAAA,UACjD;AACA,cAAI,gBAAgB;AAClB,kBAAM,UAAU,cAAc,MAAM,QAAQ;AAC5C,kBAAM,UAAU,cAAc,MAAM,WAAW;AAC/C,kBAAM,OAAO,iBAAiB,SAAS;AACvC,kBAAM,OAAO,iBAAiB,SAAS;AACvC,6BAAiB,MAAM,MAAM,gBAAgB,IAAI;AAAA,UACnD;AACA,gBAAM,gBAAgB,QAAQ,GAAG;AAAA,YAC/B,GAAG;AAAA,YACH,CAAC,WAAW;AAAA,YACZ,CAAC,YAAY;AAAA,UACf,CAAC;AACD,iBAAO;AAAA,YACL,GAAG;AAAA,YACH,MAAM;AAAA,cACJ,GAAG,cAAc,IAAI;AAAA,cACrB,GAAG,cAAc,IAAI;AAAA,YACvB;AAAA,UACF;AAAA,QACF;AAAA,MACF;AAAA,IACF;AAGA,yBAAqB,MAAM;AACzB,UAAI,OAAO,IAAI,GAAG;AAChB,eAAQ,MAAK,YAAY,IAAI,YAAY;AAAA,MAC3C;AACA,aAAO;AAAA,IACT;AACA,uBAAmB,MAAM;AACvB,UAAI;AACJ,aAAQ,SAAQ,OAAO,SAAU,uBAAsB,KAAK,kBAAkB,OAAO,SAAS,oBAAoB,gBAAgB;AAAA,IACpI;AACA,gCAA4B,MAAM;AAChC,UAAI;AACJ,aAAQ,QAAQ,QAAO,IAAI,IAAI,KAAK,gBAAgB,KAAK,aAAa,OAAO,aAAa,OAAO,SAAS,KAAK;AAAA,IACjH;AACA,oBAAgB,OAAO;AACrB,aAAO,iBAAiB,QAAQ,iBAAiB,UAAU,KAAK,EAAE;AAAA,IACpE;AACA,uBAAmB,OAAO;AACxB,aAAO,iBAAiB,WAAW,iBAAiB,UAAU,KAAK,EAAE;AAAA,IACvE;AACA,2BAAuB,OAAO;AAC5B,aAAO,iBAAiB,eAAe,iBAAiB,UAAU,KAAK,EAAE;AAAA,IAC3E;AACA,0BAAsB,OAAO;AAC3B,UAAI,OAAO,eAAe,aAAa;AACrC,eAAO;AAAA,MACT;AACA,aAAO,iBAAiB,cAAc,iBAAiB,UAAU,KAAK,EAAE;AAAA,IAC1E;AACA,+BAA2B,SAAS;AAClC,YAAM;AAAA,QACJ;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,UACE,kBAAiB,OAAO;AAC5B,aAAO,kCAAkC,KAAK,WAAW,YAAY,SAAS,KAAK,CAAC,CAAC,UAAU,UAAU,EAAE,SAAS,OAAO;AAAA,IAC7H;AACA,4BAAwB,SAAS;AAC/B,aAAO,CAAC,SAAS,MAAM,IAAI,EAAE,SAAS,YAAY,OAAO,CAAC;AAAA,IAC5D;AACA,+BAA2B,SAAS;AAClC,YAAM,SAAS,SAAS;AACxB,YAAM,MAAM,kBAAiB,OAAO;AACpC,aAAO,IAAI,cAAc,UAAU,IAAI,gBAAgB,UAAW,KAAI,gBAAgB,IAAI,kBAAkB,WAAW,UAAU,CAAC,UAAW,KAAI,iBAAiB,IAAI,mBAAmB,SAAS,UAAU,CAAC,UAAW,KAAI,SAAS,IAAI,WAAW,SAAS,UAAU,CAAC,aAAa,eAAe,QAAQ,EAAE,KAAK,CAAC,UAAW,KAAI,cAAc,IAAI,SAAS,KAAK,CAAC,KAAK,CAAC,SAAS,UAAU,UAAU,SAAS,EAAE,KAAK,CAAC,UAAW,KAAI,WAAW,IAAI,SAAS,KAAK,CAAC;AAAA,IACvc;AACA,gCAA4B,SAAS;AACnC,UAAI,cAAc,cAAc,OAAO;AACvC,aAAO,cAAc,WAAW,KAAK,CAAC,sBAAsB,WAAW,GAAG;AACxE,YAAI,kBAAkB,WAAW,GAAG;AAClC,iBAAO;AAAA,QACT,OAAO;AACL,wBAAc,cAAc,WAAW;AAAA,QACzC;AAAA,MACF;AACA,aAAO;AAAA,IACT;AACA,wBAAoB;AAClB,UAAI,OAAO,QAAQ,eAAe,CAAC,IAAI;AACrC,eAAO;AACT,aAAO,IAAI,SAAS,2BAA2B,MAAM;AAAA,IACvD;AACA,mCAA+B,MAAM;AACnC,aAAO,CAAC,QAAQ,QAAQ,WAAW,EAAE,SAAS,YAAY,IAAI,CAAC;AAAA,IACjE;AACA,+BAA0B,SAAS;AACjC,aAAO,UAAU,OAAO,EAAE,iBAAiB,OAAO;AAAA,IACpD;AACA,2BAAuB,SAAS;AAC9B,UAAI,UAAU,OAAO,GAAG;AACtB,eAAO;AAAA,UACL,YAAY,QAAQ;AAAA,UACpB,WAAW,QAAQ;AAAA,QACrB;AAAA,MACF;AACA,aAAO;AAAA,QACL,YAAY,QAAQ;AAAA,QACpB,WAAW,QAAQ;AAAA,MACrB;AAAA,IACF;AACA,2BAAuB,MAAM;AAC3B,UAAI,YAAY,IAAI,MAAM,QAAQ;AAChC,eAAO;AAAA,MACT;AACA,YAAM,SAEJ,KAAK,gBACL,KAAK,cACL,aAAa,IAAI,KAAK,KAAK,QAC3B,mBAAmB,IAAI;AAEzB,aAAO,aAAa,MAAM,IAAI,OAAO,OAAO;AAAA,IAC9C;AACA,wCAAoC,MAAM;AACxC,YAAM,aAAa,cAAc,IAAI;AACrC,UAAI,sBAAsB,UAAU,GAAG;AACrC,eAAO,KAAK,gBAAgB,KAAK,cAAc,OAAO,KAAK;AAAA,MAC7D;AACA,UAAI,cAAc,UAAU,KAAK,kBAAkB,UAAU,GAAG;AAC9D,eAAO;AAAA,MACT;AACA,aAAO,2BAA2B,UAAU;AAAA,IAC9C;AACA,kCAA8B,MAAM,MAAM,iBAAiB;AACzD,UAAI;AACJ,UAAI,SAAS,QAAQ;AACnB,eAAO,CAAC;AAAA,MACV;AACA,UAAI,oBAAoB,QAAQ;AAC9B,0BAAkB;AAAA,MACpB;AACA,YAAM,qBAAqB,2BAA2B,IAAI;AAC1D,YAAM,SAAS,uBAAyB,yBAAuB,KAAK,kBAAkB,OAAO,SAAS,qBAAqB;AAC3H,YAAM,MAAM,UAAU,kBAAkB;AACxC,UAAI,QAAQ;AACV,eAAO,KAAK,OAAO,KAAK,IAAI,kBAAkB,CAAC,GAAG,kBAAkB,kBAAkB,IAAI,qBAAqB,CAAC,GAAG,IAAI,gBAAgB,kBAAkB,qBAAqB,IAAI,YAAY,IAAI,CAAC,CAAC;AAAA,MACtM;AACA,aAAO,KAAK,OAAO,oBAAoB,qBAAqB,oBAAoB,CAAC,GAAG,eAAe,CAAC;AAAA,IACtG;AAGA,8BAA0B,SAAS;AACjC,YAAM,MAAM,kBAAiB,OAAO;AACpC,UAAI,QAAQ,WAAW,IAAI,KAAK,KAAK;AACrC,UAAI,SAAS,WAAW,IAAI,MAAM,KAAK;AACvC,YAAM,YAAY,cAAc,OAAO;AACvC,YAAM,cAAc,YAAY,QAAQ,cAAc;AACtD,YAAM,eAAe,YAAY,QAAQ,eAAe;AACxD,YAAM,iBAAiB,MAAM,KAAK,MAAM,eAAe,MAAM,MAAM,MAAM;AACzE,UAAI,gBAAgB;AAClB,gBAAQ;AACR,iBAAS;AAAA,MACX;AACA,aAAO;AAAA,QACL;AAAA,QACA;AAAA,QACA,GAAG;AAAA,MACL;AAAA,IACF;AACA,2BAAuB,SAAS;AAC9B,aAAO,CAAC,UAAU,OAAO,IAAI,QAAQ,iBAAiB;AAAA,IACxD;AACA,sBAAkB,SAAS;AACzB,YAAM,aAAa,cAAc,OAAO;AACxC,UAAI,CAAC,cAAc,UAAU,GAAG;AAC9B,eAAO,aAAa,CAAC;AAAA,MACvB;AACA,YAAM,OAAO,WAAW,sBAAsB;AAC9C,YAAM;AAAA,QACJ;AAAA,QACA;AAAA,QACA;AAAA,UACE,iBAAiB,UAAU;AAC/B,UAAI,IAAK,KAAI,MAAM,KAAK,KAAK,IAAI,KAAK,SAAS;AAC/C,UAAI,IAAK,KAAI,MAAM,KAAK,MAAM,IAAI,KAAK,UAAU;AACjD,UAAI,CAAC,KAAK,CAAC,OAAO,SAAS,CAAC,GAAG;AAC7B,YAAI;AAAA,MACN;AACA,UAAI,CAAC,KAAK,CAAC,OAAO,SAAS,CAAC,GAAG;AAC7B,YAAI;AAAA,MACN;AACA,aAAO;AAAA,QACL;AAAA,QACA;AAAA,MACF;AAAA,IACF;AACA,QAAI,YAA4B,6BAAa,CAAC;AAC9C,8BAA0B,SAAS;AACjC,YAAM,MAAM,UAAU,OAAO;AAC7B,UAAI,CAAC,SAAS,KAAK,CAAC,IAAI,gBAAgB;AACtC,eAAO;AAAA,MACT;AACA,aAAO;AAAA,QACL,GAAG,IAAI,eAAe;AAAA,QACtB,GAAG,IAAI,eAAe;AAAA,MACxB;AAAA,IACF;AACA,oCAAgC,SAAS,SAAS,sBAAsB;AACtE,UAAI,YAAY,QAAQ;AACtB,kBAAU;AAAA,MACZ;AACA,UAAI,CAAC,wBAAwB,WAAW,yBAAyB,UAAU,OAAO,GAAG;AACnF,eAAO;AAAA,MACT;AACA,aAAO;AAAA,IACT;AACA,mCAA+B,SAAS,cAAc,iBAAiB,cAAc;AACnF,UAAI,iBAAiB,QAAQ;AAC3B,uBAAe;AAAA,MACjB;AACA,UAAI,oBAAoB,QAAQ;AAC9B,0BAAkB;AAAA,MACpB;AACA,YAAM,aAAa,QAAQ,sBAAsB;AACjD,YAAM,aAAa,cAAc,OAAO;AACxC,UAAI,QAAQ,aAAa,CAAC;AAC1B,UAAI,cAAc;AAChB,YAAI,cAAc;AAChB,cAAI,UAAU,YAAY,GAAG;AAC3B,oBAAQ,SAAS,YAAY;AAAA,UAC/B;AAAA,QACF,OAAO;AACL,kBAAQ,SAAS,OAAO;AAAA,QAC1B;AAAA,MACF;AACA,YAAM,gBAAgB,uBAAuB,YAAY,iBAAiB,YAAY,IAAI,iBAAiB,UAAU,IAAI,aAAa,CAAC;AACvI,UAAI,IAAK,YAAW,OAAO,cAAc,KAAK,MAAM;AACpD,UAAI,IAAK,YAAW,MAAM,cAAc,KAAK,MAAM;AACnD,UAAI,QAAQ,WAAW,QAAQ,MAAM;AACrC,UAAI,SAAS,WAAW,SAAS,MAAM;AACvC,UAAI,YAAY;AACd,cAAM,MAAM,UAAU,UAAU;AAChC,cAAM,YAAY,gBAAgB,UAAU,YAAY,IAAI,UAAU,YAAY,IAAI;AACtF,YAAI,gBAAgB,IAAI;AACxB,eAAO,iBAAiB,gBAAgB,cAAc,KAAK;AACzD,gBAAM,cAAc,SAAS,aAAa;AAC1C,gBAAM,aAAa,cAAc,sBAAsB;AACvD,gBAAM,MAAM,kBAAiB,aAAa;AAC1C,gBAAM,OAAO,WAAW,OAAQ,eAAc,aAAa,WAAW,IAAI,WAAW,KAAK,YAAY;AACtG,gBAAM,MAAM,WAAW,MAAO,eAAc,YAAY,WAAW,IAAI,UAAU,KAAK,YAAY;AAClG,eAAK,YAAY;AACjB,eAAK,YAAY;AACjB,mBAAS,YAAY;AACrB,oBAAU,YAAY;AACtB,eAAK;AACL,eAAK;AACL,0BAAgB,UAAU,aAAa,EAAE;AAAA,QAC3C;AAAA,MACF;AACA,aAAO,iBAAiB;AAAA,QACtB;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,MACF,CAAC;AAAA,IACH;AACA,mEAA+D,MAAM;AACnE,UAAI;AAAA,QACF;AAAA,QACA;AAAA,QACA;AAAA,UACE;AACJ,YAAM,0BAA0B,cAAc,YAAY;AAC1D,YAAM,kBAAkB,mBAAmB,YAAY;AACvD,UAAI,iBAAiB,iBAAiB;AACpC,eAAO;AAAA,MACT;AACA,UAAI,SAAS;AAAA,QACX,YAAY;AAAA,QACZ,WAAW;AAAA,MACb;AACA,UAAI,QAAQ,aAAa,CAAC;AAC1B,YAAM,UAAU,aAAa,CAAC;AAC9B,UAAI,2BAA2B,CAAC,2BAA2B,aAAa,SAAS;AAC/E,YAAI,YAAY,YAAY,MAAM,UAAU,kBAAkB,eAAe,GAAG;AAC9E,mBAAS,cAAc,YAAY;AAAA,QACrC;AACA,YAAI,cAAc,YAAY,GAAG;AAC/B,gBAAM,aAAa,sBAAsB,YAAY;AACrD,kBAAQ,SAAS,YAAY;AAC7B,kBAAQ,IAAI,WAAW,IAAI,aAAa;AACxC,kBAAQ,IAAI,WAAW,IAAI,aAAa;AAAA,QAC1C;AAAA,MACF;AACA,aAAO;AAAA,QACL,OAAO,KAAK,QAAQ,MAAM;AAAA,QAC1B,QAAQ,KAAK,SAAS,MAAM;AAAA,QAC5B,GAAG,KAAK,IAAI,MAAM,IAAI,OAAO,aAAa,MAAM,IAAI,QAAQ;AAAA,QAC5D,GAAG,KAAK,IAAI,MAAM,IAAI,OAAO,YAAY,MAAM,IAAI,QAAQ;AAAA,MAC7D;AAAA,IACF;AACA,4BAAwB,SAAS;AAC/B,aAAO,MAAM,KAAK,QAAQ,eAAe,CAAC;AAAA,IAC5C;AACA,iCAA6B,SAAS;AACpC,aAAO,sBAAsB,mBAAmB,OAAO,CAAC,EAAE,OAAO,cAAc,OAAO,EAAE;AAAA,IAC1F;AACA,6BAAyB,SAAS;AAChC,YAAM,OAAO,mBAAmB,OAAO;AACvC,YAAM,SAAS,cAAc,OAAO;AACpC,YAAM,OAAO,QAAQ,cAAc;AACnC,YAAM,QAAQ,IAAI,KAAK,aAAa,KAAK,aAAa,KAAK,aAAa,KAAK,WAAW;AACxF,YAAM,SAAS,IAAI,KAAK,cAAc,KAAK,cAAc,KAAK,cAAc,KAAK,YAAY;AAC7F,UAAI,IAAI,CAAC,OAAO,aAAa,oBAAoB,OAAO;AACxD,YAAM,IAAI,CAAC,OAAO;AAClB,UAAI,kBAAiB,IAAI,EAAE,cAAc,OAAO;AAC9C,aAAK,IAAI,KAAK,aAAa,KAAK,WAAW,IAAI;AAAA,MACjD;AACA,aAAO;AAAA,QACL;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,MACF;AAAA,IACF;AACA,6BAAyB,SAAS,UAAU;AAC1C,YAAM,MAAM,UAAU,OAAO;AAC7B,YAAM,OAAO,mBAAmB,OAAO;AACvC,YAAM,iBAAiB,IAAI;AAC3B,UAAI,QAAQ,KAAK;AACjB,UAAI,SAAS,KAAK;AAClB,UAAI,IAAI;AACR,UAAI,IAAI;AACR,UAAI,gBAAgB;AAClB,gBAAQ,eAAe;AACvB,iBAAS,eAAe;AACxB,cAAM,sBAAsB,SAAS;AACrC,YAAI,CAAC,uBAAuB,uBAAuB,aAAa,SAAS;AACvE,cAAI,eAAe;AACnB,cAAI,eAAe;AAAA,QACrB;AAAA,MACF;AACA,aAAO;AAAA,QACL;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,MACF;AAAA,IACF;AACA,wCAAoC,SAAS,UAAU;AACrD,YAAM,aAAa,sBAAsB,SAAS,MAAM,aAAa,OAAO;AAC5E,YAAM,MAAM,WAAW,MAAM,QAAQ;AACrC,YAAM,OAAO,WAAW,OAAO,QAAQ;AACvC,YAAM,QAAQ,cAAc,OAAO,IAAI,SAAS,OAAO,IAAI,aAAa,CAAC;AACzE,YAAM,QAAQ,QAAQ,cAAc,MAAM;AAC1C,YAAM,SAAS,QAAQ,eAAe,MAAM;AAC5C,YAAM,IAAI,OAAO,MAAM;AACvB,YAAM,IAAI,MAAM,MAAM;AACtB,aAAO;AAAA,QACL;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,MACF;AAAA,IACF;AACA,+CAA2C,SAAS,kBAAkB,UAAU;AAC9E,UAAI;AACJ,UAAI,qBAAqB,YAAY;AACnC,eAAO,gBAAgB,SAAS,QAAQ;AAAA,MAC1C,WAAW,qBAAqB,YAAY;AAC1C,eAAO,gBAAgB,mBAAmB,OAAO,CAAC;AAAA,MACpD,WAAW,UAAU,gBAAgB,GAAG;AACtC,eAAO,2BAA2B,kBAAkB,QAAQ;AAAA,MAC9D,OAAO;AACL,cAAM,gBAAgB,iBAAiB,OAAO;AAC9C,eAAO;AAAA,UACL,GAAG;AAAA,UACH,GAAG,iBAAiB,IAAI,cAAc;AAAA,UACtC,GAAG,iBAAiB,IAAI,cAAc;AAAA,QACxC;AAAA,MACF;AACA,aAAO,iBAAiB,IAAI;AAAA,IAC9B;AACA,sCAAkC,SAAS,UAAU;AACnD,YAAM,aAAa,cAAc,OAAO;AACxC,UAAI,eAAe,YAAY,CAAC,UAAU,UAAU,KAAK,sBAAsB,UAAU,GAAG;AAC1F,eAAO;AAAA,MACT;AACA,aAAO,kBAAiB,UAAU,EAAE,aAAa,WAAW,yBAAyB,YAAY,QAAQ;AAAA,IAC3G;AACA,yCAAqC,SAAS,OAAO;AACnD,YAAM,eAAe,MAAM,IAAI,OAAO;AACtC,UAAI,cAAc;AAChB,eAAO;AAAA,MACT;AACA,UAAI,SAAS,qBAAqB,SAAS,CAAC,GAAG,KAAK,EAAE,OAAO,CAAC,OAAO,UAAU,EAAE,KAAK,YAAY,EAAE,MAAM,MAAM;AAChH,UAAI,sCAAsC;AAC1C,YAAM,iBAAiB,kBAAiB,OAAO,EAAE,aAAa;AAC9D,UAAI,cAAc,iBAAiB,cAAc,OAAO,IAAI;AAC5D,aAAO,UAAU,WAAW,KAAK,CAAC,sBAAsB,WAAW,GAAG;AACpE,cAAM,gBAAgB,kBAAiB,WAAW;AAClD,cAAM,0BAA0B,kBAAkB,WAAW;AAC7D,YAAI,CAAC,2BAA2B,cAAc,aAAa,SAAS;AAClE,gDAAsC;AAAA,QACxC;AACA,cAAM,wBAAwB,iBAAiB,CAAC,2BAA2B,CAAC,sCAAsC,CAAC,2BAA2B,cAAc,aAAa,YAAY,CAAC,CAAC,uCAAuC,CAAC,YAAY,OAAO,EAAE,SAAS,oCAAoC,QAAQ,KAAK,kBAAkB,WAAW,KAAK,CAAC,2BAA2B,yBAAyB,SAAS,WAAW;AACzZ,YAAI,uBAAuB;AACzB,mBAAS,OAAO,OAAO,CAAC,aAAa,aAAa,WAAW;AAAA,QAC/D,OAAO;AACL,gDAAsC;AAAA,QACxC;AACA,sBAAc,cAAc,WAAW;AAAA,MACzC;AACA,YAAM,IAAI,SAAS,MAAM;AACzB,aAAO;AAAA,IACT;AACA,6BAAyB,MAAM;AAC7B,UAAI;AAAA,QACF;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,UACE;AACJ,YAAM,2BAA2B,aAAa,sBAAsB,4BAA4B,SAAS,KAAK,EAAE,IAAI,CAAC,EAAE,OAAO,QAAQ;AACtI,YAAM,oBAAoB,CAAC,GAAG,0BAA0B,YAAY;AACpE,YAAM,wBAAwB,kBAAkB;AAChD,YAAM,eAAe,kBAAkB,OAAO,CAAC,SAAS,qBAAqB;AAC3E,cAAM,OAAO,kCAAkC,SAAS,kBAAkB,QAAQ;AAClF,gBAAQ,MAAM,IAAI,KAAK,KAAK,QAAQ,GAAG;AACvC,gBAAQ,QAAQ,IAAI,KAAK,OAAO,QAAQ,KAAK;AAC7C,gBAAQ,SAAS,IAAI,KAAK,QAAQ,QAAQ,MAAM;AAChD,gBAAQ,OAAO,IAAI,KAAK,MAAM,QAAQ,IAAI;AAC1C,eAAO;AAAA,MACT,GAAG,kCAAkC,SAAS,uBAAuB,QAAQ,CAAC;AAC9E,aAAO;AAAA,QACL,OAAO,aAAa,QAAQ,aAAa;AAAA,QACzC,QAAQ,aAAa,SAAS,aAAa;AAAA,QAC3C,GAAG,aAAa;AAAA,QAChB,GAAG,aAAa;AAAA,MAClB;AAAA,IACF;AACA,2BAAuB,SAAS;AAC9B,aAAO,iBAAiB,OAAO;AAAA,IACjC;AACA,2CAAuC,SAAS,cAAc,UAAU;AACtE,YAAM,0BAA0B,cAAc,YAAY;AAC1D,YAAM,kBAAkB,mBAAmB,YAAY;AACvD,YAAM,UAAU,aAAa;AAC7B,YAAM,OAAO,sBAAsB,SAAS,MAAM,SAAS,YAAY;AACvE,UAAI,SAAS;AAAA,QACX,YAAY;AAAA,QACZ,WAAW;AAAA,MACb;AACA,YAAM,UAAU,aAAa,CAAC;AAC9B,UAAI,2BAA2B,CAAC,2BAA2B,CAAC,SAAS;AACnE,YAAI,YAAY,YAAY,MAAM,UAAU,kBAAkB,eAAe,GAAG;AAC9E,mBAAS,cAAc,YAAY;AAAA,QACrC;AACA,YAAI,yBAAyB;AAC3B,gBAAM,aAAa,sBAAsB,cAAc,MAAM,SAAS,YAAY;AAClF,kBAAQ,IAAI,WAAW,IAAI,aAAa;AACxC,kBAAQ,IAAI,WAAW,IAAI,aAAa;AAAA,QAC1C,WAAW,iBAAiB;AAC1B,kBAAQ,IAAI,oBAAoB,eAAe;AAAA,QACjD;AAAA,MACF;AACA,aAAO;AAAA,QACL,GAAG,KAAK,OAAO,OAAO,aAAa,QAAQ;AAAA,QAC3C,GAAG,KAAK,MAAM,OAAO,YAAY,QAAQ;AAAA,QACzC,OAAO,KAAK;AAAA,QACZ,QAAQ,KAAK;AAAA,MACf;AAAA,IACF;AACA,iCAA6B,SAAS,UAAU;AAC9C,UAAI,CAAC,cAAc,OAAO,KAAK,kBAAiB,OAAO,EAAE,aAAa,SAAS;AAC7E,eAAO;AAAA,MACT;AACA,UAAI,UAAU;AACZ,eAAO,SAAS,OAAO;AAAA,MACzB;AACA,aAAO,QAAQ;AAAA,IACjB;AACA,6BAAyB,SAAS,UAAU;AAC1C,YAAM,UAAU,UAAU,OAAO;AACjC,UAAI,CAAC,cAAc,OAAO,GAAG;AAC3B,eAAO;AAAA,MACT;AACA,UAAI,eAAe,oBAAoB,SAAS,QAAQ;AACxD,aAAO,gBAAgB,eAAe,YAAY,KAAK,kBAAiB,YAAY,EAAE,aAAa,UAAU;AAC3G,uBAAe,oBAAoB,cAAc,QAAQ;AAAA,MAC3D;AACA,UAAI,gBAAiB,aAAY,YAAY,MAAM,UAAU,YAAY,YAAY,MAAM,UAAU,kBAAiB,YAAY,EAAE,aAAa,YAAY,CAAC,kBAAkB,YAAY,IAAI;AAC9L,eAAO;AAAA,MACT;AACA,aAAO,gBAAgB,mBAAmB,OAAO,KAAK;AAAA,IACxD;AACA,QAAI,kBAAkB,eAAe,MAAM;AACzC,UAAI;AAAA,QACF;AAAA,QACA;AAAA,QACA;AAAA,UACE;AACJ,YAAM,oBAAoB,KAAK,mBAAmB;AAClD,YAAM,kBAAkB,KAAK;AAC7B,aAAO;AAAA,QACL,WAAW,8BAA8B,WAAW,MAAM,kBAAkB,QAAQ,GAAG,QAAQ;AAAA,QAC/F,UAAU;AAAA,UACR,GAAG;AAAA,UACH,GAAG;AAAA,UACH,GAAG,MAAM,gBAAgB,QAAQ;AAAA,QACnC;AAAA,MACF;AAAA,IACF;AACA,mBAAe,SAAS;AACtB,aAAO,kBAAiB,OAAO,EAAE,cAAc;AAAA,IACjD;AACA,QAAI,WAAW;AAAA,MACb;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,IACF;AACA,yBAAqB,SAAS,QAAQ;AACpC,UAAI,KAAK;AACT,UAAI;AACJ,YAAM,OAAO,mBAAmB,OAAO;AACvC,yBAAmB;AACjB,qBAAa,SAAS;AACtB,cAAM,GAAG,WAAW;AACpB,aAAK;AAAA,MACP;AACA,uBAAiB,MAAM,WAAW;AAChC,YAAI,SAAS,QAAQ;AACnB,iBAAO;AAAA,QACT;AACA,YAAI,cAAc,QAAQ;AACxB,sBAAY;AAAA,QACd;AACA,gBAAQ;AACR,cAAM;AAAA,UACJ;AAAA,UACA;AAAA,UACA;AAAA,UACA;AAAA,YACE,QAAQ,sBAAsB;AAClC,YAAI,CAAC,MAAM;AACT,iBAAO;AAAA,QACT;AACA,YAAI,CAAC,SAAS,CAAC,QAAQ;AACrB;AAAA,QACF;AACA,cAAM,WAAW,MAAM,GAAG;AAC1B,cAAM,aAAa,MAAM,KAAK,cAAe,QAAO,MAAM;AAC1D,cAAM,cAAc,MAAM,KAAK,eAAgB,OAAM,OAAO;AAC5D,cAAM,YAAY,MAAM,IAAI;AAC5B,cAAM,aAAa,CAAC,WAAW,QAAQ,CAAC,aAAa,QAAQ,CAAC,cAAc,QAAQ,CAAC,YAAY;AACjG,cAAM,UAAU;AAAA,UACd;AAAA,UACA,WAAW,IAAI,GAAG,IAAI,GAAG,SAAS,CAAC,KAAK;AAAA,QAC1C;AACA,YAAI,gBAAgB;AACpB,+BAAuB,SAAS;AAC9B,gBAAM,QAAQ,QAAQ,GAAG;AACzB,cAAI,UAAU,WAAW;AACvB,gBAAI,CAAC,eAAe;AAClB,qBAAO,QAAQ;AAAA,YACjB;AACA,gBAAI,CAAC,OAAO;AACV,0BAAY,WAAW,MAAM;AAC3B,wBAAQ,OAAO,IAAI;AAAA,cACrB,GAAG,GAAG;AAAA,YACR,OAAO;AACL,sBAAQ,OAAO,KAAK;AAAA,YACtB;AAAA,UACF;AACA,0BAAgB;AAAA,QAClB;AACA,YAAI;AACF,eAAK,IAAI,qBAAqB,eAAe;AAAA,YAC3C,GAAG;AAAA,YAEH,MAAM,KAAK;AAAA,UACb,CAAC;AAAA,QACH,SAAS,GAAP;AACA,eAAK,IAAI,qBAAqB,eAAe,OAAO;AAAA,QACtD;AACA,WAAG,QAAQ,OAAO;AAAA,MACpB;AACA,cAAQ,IAAI;AACZ,aAAO;AAAA,IACT;AACA,wBAAoB,WAAW,UAAU,QAAQ,SAAS;AACxD,UAAI,YAAY,QAAQ;AACtB,kBAAU,CAAC;AAAA,MACb;AACA,YAAM;AAAA,QACJ,iBAAiB;AAAA,QACjB,iBAAiB;AAAA,QACjB,gBAAgB,OAAO,mBAAmB;AAAA,QAC1C,cAAc,OAAO,yBAAyB;AAAA,QAC9C,iBAAiB;AAAA,UACf;AACJ,YAAM,cAAc,cAAc,SAAS;AAC3C,YAAM,YAAY,kBAAkB,iBAAiB,CAAC,GAAG,cAAc,qBAAqB,WAAW,IAAI,CAAC,GAAG,GAAG,qBAAqB,QAAQ,CAAC,IAAI,CAAC;AACrJ,gBAAU,QAAQ,CAAC,aAAa;AAC9B,0BAAkB,SAAS,iBAAiB,UAAU,QAAQ;AAAA,UAC5D,SAAS;AAAA,QACX,CAAC;AACD,0BAAkB,SAAS,iBAAiB,UAAU,MAAM;AAAA,MAC9D,CAAC;AACD,YAAM,YAAY,eAAe,cAAc,YAAY,aAAa,MAAM,IAAI;AAClF,UAAI,iBAAiB;AACrB,UAAI,iBAAiB;AACrB,UAAI,eAAe;AACjB,yBAAiB,IAAI,eAAe,CAAC,SAAS;AAC5C,cAAI,CAAC,cAAc;AACnB,cAAI,cAAc,WAAW,WAAW,eAAe,gBAAgB;AACrE,2BAAe,UAAU,QAAQ;AACjC,iCAAqB,cAAc;AACnC,6BAAiB,sBAAsB,MAAM;AAC3C,gCAAkB,eAAe,QAAQ,QAAQ;AAAA,YACnD,CAAC;AAAA,UACH;AACA,iBAAO;AAAA,QACT,CAAC;AACD,YAAI,eAAe,CAAC,gBAAgB;AAClC,yBAAe,QAAQ,WAAW;AAAA,QACpC;AACA,uBAAe,QAAQ,QAAQ;AAAA,MACjC;AACA,UAAI;AACJ,UAAI,cAAc,iBAAiB,sBAAsB,SAAS,IAAI;AACtE,UAAI,gBAAgB;AAClB,kBAAU;AAAA,MACZ;AACA,2BAAqB;AACnB,cAAM,cAAc,sBAAsB,SAAS;AACnD,YAAI,eAAgB,aAAY,MAAM,YAAY,KAAK,YAAY,MAAM,YAAY,KAAK,YAAY,UAAU,YAAY,SAAS,YAAY,WAAW,YAAY,SAAS;AAC/K,iBAAO;AAAA,QACT;AACA,sBAAc;AACd,kBAAU,sBAAsB,SAAS;AAAA,MAC3C;AACA,aAAO;AACP,aAAO,MAAM;AACX,kBAAU,QAAQ,CAAC,aAAa;AAC9B,4BAAkB,SAAS,oBAAoB,UAAU,MAAM;AAC/D,4BAAkB,SAAS,oBAAoB,UAAU,MAAM;AAAA,QACjE,CAAC;AACD,qBAAa,UAAU;AACvB,0BAAkB,eAAe,WAAW;AAC5C,yBAAiB;AACjB,YAAI,gBAAgB;AAClB,+BAAqB,OAAO;AAAA,QAC9B;AAAA,MACF;AAAA,IACF;AACA,QAAI,mBAAmB,CAAC,WAAW,UAAU,YAAY;AACvD,YAAM,QAAwB,oBAAI,IAAI;AACtC,YAAM,gBAAgB;AAAA,QACpB;AAAA,QACA,GAAG;AAAA,MACL;AACA,YAAM,oBAAoB;AAAA,QACxB,GAAG,cAAc;AAAA,QACjB,IAAI;AAAA,MACN;AACA,aAAO,gBAAgB,WAAW,UAAU;AAAA,QAC1C,GAAG;AAAA,QACH,UAAU;AAAA,MACZ,CAAC;AAAA,IACH;AAGA,yBAAqB,UAAQ;AAC3B,eAAO,MAAM,UAAU,CAAC,OAAO;AAC7B,YAAI,CAAC,GAAG;AACN,gBAAM;AACR,eAAO,GAAG;AAAA,MACZ,CAAC;AACD,eAAO,eAAe,CAAC,MAAM,OAAO;AAClC,YAAI,QAAQ,KAAK,aAAa,CAAC,GAAG,WAAW;AAC3C,aAAG,YAAY,KAAK;AAAA,QACtB;AAAA,MACF,CAAC;AACD,eAAO,UAAU,UAAU,SAAO,gBAChC,CAAC,IAAI,EAAE,YAAY,WAAW,SAAS,EAAE,SAAS,UAAU,gBAAgB;AAC1E,YAAI,EAAE,WAAW,aAAa,aAAa,WAAW,SAAS;AAC/D,WAAG,YAAY,SAAO,SAAS,EAAE,GAAG,GAAG,GAAG,EAAE,CAAC;AAC7C,YAAI,YAAY,UAAU,UAAU;AACpC,YAAI,CAAC;AACH,gBAAM;AACR,YAAI,UAAU,MAAM;AAClB,cAAI;AACJ,2BAAiB,WAAW,IAAI;AAAA,YAC9B;AAAA,YACA,YAAY,CAAC,KAAK,GAAG,MAAM,EAAE,SAAS,EAAE,CAAC,GAAG,OAAO,WAAW,CAAC;AAAA,UACjE,CAAC,EAAE,KAAK,CAAC,EAAE,GAAG,QAAQ;AACpB,wBAAY,UAAU,IAAI,GAAG,CAAC;AAC9B,gBAAI,KAAK,UAAU,EAAE,GAAG,EAAE,CAAC,MAAM,eAAe;AAC9C,iBAAG,UAAU,IAAI;AACjB,iBAAG,UAAU,IAAI;AAAA,YACnB;AACA,4BAAgB,KAAK,UAAU,EAAE,GAAG,EAAE,CAAC;AAAA,UACzC,CAAC;AAAA,QACH;AACA,YAAI,UAAU,WAAW,WAAW,IAAI,MAAM,QAAQ,CAAC;AACvD,gBAAQ,MAAM,QAAQ,CAAC;AAAA,MACzB,GAEA,CAAC,IAAI,EAAE,YAAY,WAAW,SAAS,EAAE,SAAS,UAAU,gBAAgB;AAC1E,YAAI,EAAE,WAAW,aAAa,aAAa,WAAW,SAAS;AAC/D,YAAI,GAAG,WAAW;AAChB,sBAAY,UAAU,IAAI,GAAG,UAAU,GAAG,GAAG,UAAU,CAAC;AAAA,QAC1D;AAAA,MACF,CACF,CAAC;AAAA,IACH;AACA,uBAAmB,IAAI,GAAG,GAAG;AAC3B,aAAO,OAAO,GAAG,OAAO;AAAA,QACtB,MAAM,IAAI;AAAA,QACV,KAAK,IAAI;AAAA,QACT,UAAU;AAAA,MACZ,CAAC;AAAA,IACH;AACA,wBAAoB,WAAW;AAC7B,UAAI,YAAY,CAAC,OAAO,aAAa,WAAW,SAAS,eAAe,aAAa,UAAU,gBAAgB,cAAc,QAAQ,cAAc,UAAU;AAC7J,UAAI,YAAY,UAAU,KAAK,CAAC,MAAM,UAAU,SAAS,CAAC,CAAC;AAC3D,UAAI,cAAc;AAClB,UAAI,UAAU,SAAS,QAAQ,GAAG;AAChC,YAAI,MAAM,UAAU,UAAU,CAAC,MAAM,MAAM,QAAQ;AACnD,sBAAc,UAAU,MAAM,OAAO,SAAS,OAAO,UAAU,MAAM,EAAE,IAAI;AAAA,MAC7E;AACA,UAAI,WAAW,UAAU,SAAS,UAAU;AAC5C,aAAO,EAAE,WAAW,aAAa,SAAS;AAAA,IAC5C;AAGA,QAAI,iBAAiB;AAAA;AAAA;;;AC/vCrB;AAAA;AAGC,IAAC,UAAS,MAAM,SAAS;AAExB,UAAI,OAAO,WAAW,cAAc,OAAO,KAAK;AAC9C,eAAO,OAAO;AAAA,MAChB,WAAW,OAAO,YAAY,UAAU;AACtC,eAAO,UAAU,QAAQ;AAAA,MAC3B,OAAO;AACL,aAAK,YAAY,QAAQ;AAAA,MAC3B;AAAA,IAEF,GAAG,SAAM,WAAW;AAClB,UAAI,aAAY,CAAC;AAEjB,iBAAU,UAAU;AAEpB,UAAI,WAAW,WAAU,WAAW;AAAA,QAClC,SAAS;AAAA,QACT,QAAQ;AAAA,QACR,eAAe;AAAA,QACf,OAAO;AAAA,QACP,SAAS;AAAA,QACT,aAAa;AAAA,QACb,cAAc;AAAA,QACd,aAAa;AAAA,QACb,aAAa;AAAA,QACb,iBAAiB;AAAA,QACjB,QAAQ;AAAA,QACR,UAAU;AAAA,MACZ;AASA,iBAAU,YAAY,SAAS,SAAS;AACtC,YAAI,KAAK;AACT,aAAK,OAAO,SAAS;AACnB,kBAAQ,QAAQ;AAChB,cAAI,UAAU,UAAa,QAAQ,eAAe,GAAG;AAAG,qBAAS,OAAO;AAAA,QAC1E;AAEA,eAAO;AAAA,MACT;AAMA,iBAAU,SAAS;AASnB,iBAAU,MAAM,SAAS,GAAG;AAC1B,YAAI,UAAU,WAAU,UAAU;AAElC,YAAI,MAAM,GAAG,SAAS,SAAS,CAAC;AAChC,mBAAU,SAAU,MAAM,IAAI,OAAO;AAErC,YAAI,WAAW,WAAU,OAAO,CAAC,OAAO,GACpC,MAAW,SAAS,cAAc,SAAS,WAAW,GACtD,QAAW,SAAS,OACpB,OAAW,SAAS;AAExB,iBAAS;AAET,cAAM,SAAS,MAAM;AAEnB,cAAI,SAAS,kBAAkB;AAAI,qBAAS,gBAAgB,WAAU,kBAAkB;AAGxF,cAAI,KAAK,eAAe,GAAG,OAAO,IAAI,CAAC;AAEvC,cAAI,MAAM,GAAG;AAEX,gBAAI,UAAU;AAAA,cACZ,YAAY;AAAA,cACZ,SAAS;AAAA,YACX,CAAC;AACD,qBAAS;AAET,uBAAW,WAAW;AACpB,kBAAI,UAAU;AAAA,gBACZ,YAAY,SAAS,QAAQ;AAAA,gBAC7B,SAAS;AAAA,cACX,CAAC;AACD,yBAAW,WAAW;AACpB,2BAAU,OAAO;AACjB,qBAAK;AAAA,cACP,GAAG,KAAK;AAAA,YACV,GAAG,KAAK;AAAA,UACV,OAAO;AACL,uBAAW,MAAM,KAAK;AAAA,UACxB;AAAA,QACF,CAAC;AAED,eAAO;AAAA,MACT;AAEA,iBAAU,YAAY,WAAW;AAC/B,eAAO,OAAO,WAAU,WAAW;AAAA,MACrC;AASA,iBAAU,QAAQ,WAAW;AAC3B,YAAI,CAAC,WAAU;AAAQ,qBAAU,IAAI,CAAC;AAEtC,YAAI,OAAO,WAAW;AACpB,qBAAW,WAAW;AACpB,gBAAI,CAAC,WAAU;AAAQ;AACvB,uBAAU,QAAQ;AAClB,iBAAK;AAAA,UACP,GAAG,SAAS,YAAY;AAAA,QAC1B;AAEA,YAAI,SAAS;AAAS,eAAK;AAE3B,eAAO;AAAA,MACT;AAcA,iBAAU,OAAO,SAAS,OAAO;AAC/B,YAAI,CAAC,SAAS,CAAC,WAAU;AAAQ,iBAAO;AAExC,eAAO,WAAU,IAAI,MAAM,MAAM,KAAK,OAAO,CAAC,EAAE,IAAI,CAAC;AAAA,MACvD;AAMA,iBAAU,MAAM,SAAS,QAAQ;AAC/B,YAAI,IAAI,WAAU;AAElB,YAAI,CAAC,GAAG;AACN,iBAAO,WAAU,MAAM;AAAA,QACzB,OAAO;AACL,cAAI,OAAO,WAAW,UAAU;AAC9B,qBAAU,KAAI,KAAK,MAAM,KAAK,OAAO,IAAI,GAAG,KAAK,IAAI;AAAA,UACvD;AAEA,cAAI,MAAM,IAAI,QAAQ,GAAG,KAAK;AAC9B,iBAAO,WAAU,IAAI,CAAC;AAAA,QACxB;AAAA,MACF;AAEA,iBAAU,UAAU,WAAW;AAC7B,eAAO,WAAU,IAAI,KAAK,OAAO,IAAI,SAAS,WAAW;AAAA,MAC3D;AAQA,MAAC,YAAW;AACV,YAAI,UAAU,GAAG,UAAU;AAE3B,mBAAU,UAAU,SAAS,UAAU;AACrC,cAAI,CAAC,YAAY,SAAS,MAAM,MAAM,YAAY;AAChD,mBAAO;AAAA,UACT;AAEA,cAAI,YAAY,GAAG;AACjB,uBAAU,MAAM;AAAA,UAClB;AAEA;AACA;AAEA,mBAAS,OAAO,WAAW;AACzB;AACA,gBAAI,YAAY,GAAG;AACf,wBAAU;AACV,yBAAU,KAAK;AAAA,YACnB,OAAO;AACH,yBAAU,IAAK,WAAU,WAAW,OAAO;AAAA,YAC/C;AAAA,UACF,CAAC;AAED,iBAAO;AAAA,QACT;AAAA,MAEF,GAAG;AAOH,iBAAU,SAAS,SAAS,WAAW;AACrC,YAAI,WAAU,WAAW;AAAG,iBAAO,SAAS,eAAe,WAAW;AAEtE,iBAAS,SAAS,iBAAiB,gBAAgB;AAEnD,YAAI,WAAW,SAAS,cAAc,KAAK;AAC3C,iBAAS,KAAK;AACd,iBAAS,YAAY,SAAS;AAE9B,YAAI,MAAW,SAAS,cAAc,SAAS,WAAW,GACtD,OAAW,YAAY,SAAS,UAAU,WAAU,UAAU,CAAC,GAC/D,SAAW,SAAS,cAAc,SAAS,MAAM,GACjD;AAEJ,YAAI,KAAK;AAAA,UACP,YAAY;AAAA,UACZ,WAAW,iBAAiB,OAAO;AAAA,QACrC,CAAC;AAED,YAAI,CAAC,SAAS,aAAa;AACzB,oBAAU,SAAS,cAAc,SAAS,eAAe;AACzD,qBAAW,cAAc,OAAO;AAAA,QAClC;AAEA,YAAI,UAAU,SAAS,MAAM;AAC3B,mBAAS,QAAQ,yBAAyB;AAAA,QAC5C;AAEA,eAAO,YAAY,QAAQ;AAC3B,eAAO;AAAA,MACT;AAMA,iBAAU,SAAS,WAAW;AAC5B,oBAAY,SAAS,iBAAiB,gBAAgB;AACtD,oBAAY,SAAS,cAAc,SAAS,MAAM,GAAG,yBAAyB;AAC9E,YAAI,WAAW,SAAS,eAAe,WAAW;AAClD,oBAAY,cAAc,QAAQ;AAAA,MACpC;AAMA,iBAAU,aAAa,WAAW;AAChC,eAAO,CAAC,CAAC,SAAS,eAAe,WAAW;AAAA,MAC9C;AAMA,iBAAU,oBAAoB,WAAW;AAEvC,YAAI,YAAY,SAAS,KAAK;AAG9B,YAAI,eAAgB,qBAAqB,YAAa,WAClC,kBAAkB,YAAa,QAC/B,iBAAiB,YAAa,OAC9B,gBAAgB,YAAa,MAAM;AAEvD,YAAI,eAAe,iBAAiB,WAAW;AAE7C,iBAAO;AAAA,QACT,WAAW,eAAe,eAAe,WAAW;AAElD,iBAAO;AAAA,QACT,OAAO;AAEL,iBAAO;AAAA,QACT;AAAA,MACF;AAMA,qBAAe,GAAG,KAAK,KAAK;AAC1B,YAAI,IAAI;AAAK,iBAAO;AACpB,YAAI,IAAI;AAAK,iBAAO;AACpB,eAAO;AAAA,MACT;AAOA,yBAAmB,GAAG;AACpB,eAAQ,MAAK,KAAK;AAAA,MACpB;AAQA,8BAAwB,GAAG,OAAO,MAAM;AACtC,YAAI;AAEJ,YAAI,SAAS,kBAAkB,eAAe;AAC5C,mBAAS,EAAE,WAAW,iBAAe,UAAU,CAAC,IAAE,SAAS;AAAA,QAC7D,WAAW,SAAS,kBAAkB,aAAa;AACjD,mBAAS,EAAE,WAAW,eAAa,UAAU,CAAC,IAAE,OAAO;AAAA,QACzD,OAAO;AACL,mBAAS,EAAE,eAAe,UAAU,CAAC,IAAE,IAAI;AAAA,QAC7C;AAEA,eAAO,aAAa,SAAO,QAAM,QAAM;AAEvC,eAAO;AAAA,MACT;AAMA,UAAI,QAAS,WAAW;AACtB,YAAI,UAAU,CAAC;AAEf,wBAAgB;AACd,cAAI,KAAK,QAAQ,MAAM;AACvB,cAAI,IAAI;AACN,eAAG,IAAI;AAAA,UACT;AAAA,QACF;AAEA,eAAO,SAAS,IAAI;AAClB,kBAAQ,KAAK,EAAE;AACf,cAAI,QAAQ,UAAU;AAAG,iBAAK;AAAA,QAChC;AAAA,MACF,EAAG;AAUH,UAAI,MAAO,WAAW;AACpB,YAAI,cAAc,CAAE,UAAU,KAAK,OAAO,IAAK,GAC3C,WAAc,CAAC;AAEnB,2BAAmB,QAAQ;AACzB,iBAAO,OAAO,QAAQ,SAAS,KAAK,EAAE,QAAQ,gBAAgB,SAAS,OAAO,QAAQ;AACpF,mBAAO,OAAO,YAAY;AAAA,UAC5B,CAAC;AAAA,QACH;AAEA,+BAAuB,MAAM;AAC3B,cAAI,QAAQ,SAAS,KAAK;AAC1B,cAAI,QAAQ;AAAO,mBAAO;AAE1B,cAAI,IAAI,YAAY,QAChB,UAAU,KAAK,OAAO,CAAC,EAAE,YAAY,IAAI,KAAK,MAAM,CAAC,GACrD;AACJ,iBAAO,KAAK;AACV,yBAAa,YAAY,KAAK;AAC9B,gBAAI,cAAc;AAAO,qBAAO;AAAA,UAClC;AAEA,iBAAO;AAAA,QACT;AAEA,8BAAsB,MAAM;AAC1B,iBAAO,UAAU,IAAI;AACrB,iBAAO,SAAS,SAAU,UAAS,QAAQ,cAAc,IAAI;AAAA,QAC/D;AAEA,0BAAkB,SAAS,MAAM,OAAO;AACtC,iBAAO,aAAa,IAAI;AACxB,kBAAQ,MAAM,QAAQ;AAAA,QACxB;AAEA,eAAO,SAAS,SAAS,aAAY;AACnC,cAAI,OAAO,WACP,MACA;AAEJ,cAAI,KAAK,UAAU,GAAG;AACpB,iBAAK,QAAQ,aAAY;AACvB,sBAAQ,YAAW;AACnB,kBAAI,UAAU,UAAa,YAAW,eAAe,IAAI;AAAG,yBAAS,SAAS,MAAM,KAAK;AAAA,YAC3F;AAAA,UACF,OAAO;AACL,qBAAS,SAAS,KAAK,IAAI,KAAK,EAAE;AAAA,UACpC;AAAA,QACF;AAAA,MACF,EAAG;AAMH,wBAAkB,SAAS,MAAM;AAC/B,YAAI,OAAO,OAAO,WAAW,WAAW,UAAU,UAAU,OAAO;AACnE,eAAO,KAAK,QAAQ,MAAM,OAAO,GAAG,KAAK;AAAA,MAC3C;AAMA,wBAAkB,SAAS,MAAM;AAC/B,YAAI,UAAU,UAAU,OAAO,GAC3B,UAAU,UAAU;AAExB,YAAI,SAAS,SAAS,IAAI;AAAG;AAG7B,gBAAQ,YAAY,QAAQ,UAAU,CAAC;AAAA,MACzC;AAMA,2BAAqB,SAAS,MAAM;AAClC,YAAI,UAAU,UAAU,OAAO,GAC3B;AAEJ,YAAI,CAAC,SAAS,SAAS,IAAI;AAAG;AAG9B,kBAAU,QAAQ,QAAQ,MAAM,OAAO,KAAK,GAAG;AAG/C,gBAAQ,YAAY,QAAQ,UAAU,GAAG,QAAQ,SAAS,CAAC;AAAA,MAC7D;AAQA,yBAAmB,SAAS;AAC1B,eAAQ,OAAO,SAAQ,aAAa,MAAM,KAAK,QAAQ,SAAS,GAAG;AAAA,MACrE;AAMA,6BAAuB,SAAS;AAC9B,mBAAW,QAAQ,cAAc,QAAQ,WAAW,YAAY,OAAO;AAAA,MACzE;AAEA,aAAO;AAAA,IACT,CAAC;AAAA;AAAA;;;AC1dD;AAAA;AAAA,QAAI,aAAY,OAAO;AACvB,QAAI,oBAAmB,OAAO;AAC9B,QAAI,qBAAoB,OAAO;AAC/B,QAAI,gBAAe,OAAO,UAAU;AACpC,QAAI,WAAW,CAAC,QAAQ,SAAQ;AAC9B,eAAS,QAAQ;AACf,mBAAU,QAAQ,MAAM,EAAE,KAAK,KAAI,OAAO,YAAY,KAAK,CAAC;AAAA,IAChE;AACA,QAAI,eAAc,CAAC,IAAI,MAAM,QAAQ,SAAS;AAC5C,UAAI,QAAQ,OAAO,SAAS,YAAY,OAAO,SAAS,YAAY;AAClE,iBAAS,OAAO,mBAAkB,IAAI;AACpC,cAAI,CAAC,cAAa,KAAK,IAAI,GAAG,KAAK,QAAQ;AACzC,uBAAU,IAAI,KAAK,EAAE,KAAK,MAAM,KAAK,MAAM,YAAY,CAAE,QAAO,kBAAiB,MAAM,GAAG,MAAM,KAAK,WAAW,CAAC;AAAA,MACvH;AACA,aAAO;AAAA,IACT;AACA,QAAI,eAAe,CAAC,QAAQ,aAAY,WAAU,CAAC,GAAG,cAAc,EAAE,OAAO,KAAK,CAAC,GAAG,GAAG;AAGzF,QAAI,iBAAiB,CAAC;AACtB,aAAS,gBAAgB;AAAA,MACvB,SAAS,MAAM;AAAA,MACf,OAAO,MAAM;AAAA,IACf,CAAC;AACD,WAAO,UAAU,aAAa,cAAc;AAG5C,oBAAe,MAAM,QAAQ,SAAS;AACpC,iDAA2C;AAC3C,UAAI;AACJ,UAAI;AACJ,UAAI,KAAK,WAAW,UAAU,SAAS,UAAU,SAAS,QAAQ;AAClE,6BAAuB,WAAW,CAAC,GAAG;AACpC,YAAI,gBAAgB,CAAC,OAAO,GAAG,aAAa,KAAK;AACjD,YAAI,OAAO,MAAM;AAAA,QACjB;AACA,mBAAW,SAAS,YAAY;AAChC,kBAAU,SAAS,WAAW;AAC9B,mBAAW,SAAS,YAAY;AAChC,kBAAU,SAAS,WAAW;AAC9B,iBAAS,SAAS,UAAU;AAC5B,gBAAQ,SAAS,SAAS;AAC1B,cAAM,SAAS,OAAO;AACtB,oBAAY,SAAS,aAAa;AAAA,MACpC;AACA,qBAAe,OAAO,IAAI;AACxB,YAAI,iCAAiC,OAAO,EAAE,GAAG;AAC/C,iBAAO,aAAa,OAAO,EAAE;AAAA,QAC/B;AACA,YAAI,qBAAqB;AACzB,YAAI,WAAW,UAAU,OAAO,IAAI,MAAM,qBAAqB,IAAI;AACjE;AACF,YAAI,MAAM,aAAa,KAAK,OAAO,QAAQ;AACzC,iBAAO,OAAO,UAAU,OAAO,EAAE;AACjC,cAAI,MAAM,eAAe,GAAG,aAAa;AACvC,kBAAM,MAAM,aAAa,GAAG,WAAW;AAAA,UACzC;AAAA,QACF;AACA,YAAI,cAAc,EAAE,GAAG;AACrB,yBAAe,OAAO,EAAE;AACxB,kBAAQ,OAAO,EAAE;AACjB;AAAA,QACF;AACA,YAAI,CAAC,oBAAoB;AACvB,0BAAgB,OAAO,EAAE;AAAA,QAC3B;AACA,gBAAQ,OAAO,EAAE;AACjB,sBAAc,OAAO,EAAE;AAAA,MACzB;AACA,gDAA0C,OAAO,IAAI;AACnD,eAAO,MAAM,YAAY,GAAG,YAAY,MAAM,YAAY,GAAG,YAAY,OAAO,KAAK,KAAK,OAAO,EAAE;AAAA,MACrG;AACA,4BAAsB,OAAO,IAAI;AAC/B,YAAI,WAAW,UAAU,KAAK;AAC5B;AACF,YAAI,WAAW,GAAG,UAAU,IAAI;AAChC,YAAI,WAAW,QAAQ,QAAQ;AAC7B;AACF,cAAM,YAAY,QAAQ;AAC1B,gBAAQ,KAAK;AACb,cAAM,QAAQ;AAAA,MAChB;AACA,8BAAwB,OAAO,IAAI;AACjC,YAAI,QAAQ,GAAG;AACf,YAAI,MAAM,cAAc,OAAO;AAC7B,gBAAM,YAAY;AAAA,QACpB;AAAA,MACF;AACA,+BAAyB,OAAO,IAAI;AAClC,YAAI,MAAM;AACR;AACF,YAAI,MAAM,cAAc,CAAC,GAAG,YAAY;AACtC;AAAA,QACF;AACA,YAAI,CAAC,MAAM,cAAc,GAAG,YAAY;AACtC;AAAA,QACF;AACA,YAAI,gBAAgB,MAAM,KAAK,MAAM,UAAU;AAC/C,YAAI,eAAe,MAAM,KAAK,GAAG,UAAU;AAC3C,iBAAS,IAAI,cAAc,SAAS,GAAG,KAAK,GAAG,KAAK;AAClD,cAAI,OAAO,cAAc,GAAG;AAC5B,cAAI,CAAC,GAAG,aAAa,IAAI,GAAG;AAC1B,kBAAM,gBAAgB,IAAI;AAAA,UAC5B;AAAA,QACF;AACA,iBAAS,IAAI,aAAa,SAAS,GAAG,KAAK,GAAG,KAAK;AACjD,cAAI,OAAO,aAAa,GAAG;AAC3B,cAAI,QAAQ,aAAa,GAAG;AAC5B,cAAI,MAAM,aAAa,IAAI,MAAM,OAAO;AACtC,kBAAM,aAAa,MAAM,KAAK;AAAA,UAChC;AAAA,QACF;AAAA,MACF;AACA,6BAAuB,OAAO,IAAI;AAChC,YAAI,WAAW,SAAS,MAAM,QAAQ;AACtC,YAAI,mBAAmB,CAAC;AACxB,YAAI,YAAY,aAAa,EAAE;AAC/B,YAAI,cAAc,aAAa,KAAK;AACpC,eAAO,WAAW;AAChB,4BAAkB,WAAW,WAAW;AACxC,cAAI,QAAQ,OAAO,SAAS;AAC5B,cAAI,UAAU,OAAO,WAAW;AAChC,cAAI,CAAC,aAAa;AAChB,gBAAI,SAAS,iBAAiB,QAAQ;AACpC,kBAAI,WAAW,iBAAiB;AAChC,oBAAM,YAAY,QAAQ;AAC1B,4BAAc;AACd,wBAAU,OAAO,WAAW;AAAA,YAC9B,OAAO;AACL,kBAAI,CAAC,WAAW,QAAQ,SAAS,GAAG;AAClC,oBAAI,QAAQ,UAAU,UAAU,IAAI;AACpC,sBAAM,YAAY,KAAK;AACvB,sBAAM,KAAK;AAAA,cACb;AACA,0BAAY,eAAe,IAAI,SAAS;AACxC;AAAA,YACF;AAAA,UACF;AACA,cAAI,OAAO,CAAC,SAAS,QAAQ,KAAK,aAAa,KAAK,KAAK,gBAAgB;AACzE,cAAI,QAAQ,CAAC,SAAS,QAAQ,KAAK,aAAa,KAAK,KAAK,gBAAgB;AAC1E,cAAI,KAAK,SAAS,KAAK,KAAK,WAAW,GAAG;AACxC,gBAAI,gBAAgB;AACpB,gBAAI,iBAAiB;AACrB,mBAAO,aAAa;AAClB,kBAAI,OAAO,eAAe,OAAO,WAAW;AAC5C,kBAAI,KAAK,IAAI,GAAG;AACd;AAAA,cACF,WAAW,MAAM,IAAI,KAAK,gBAAgB,GAAG;AAC3C;AAAA,cACF,WAAW,MAAM,IAAI,KAAK,kBAAkB,GAAG;AAC7C,8BAAc;AACd;AAAA,cACF;AACA,4BAAc;AAAA,YAChB;AACA,gBAAI,eAAe;AACnB,4BAAgB;AAChB,gBAAI,eAAe;AACnB,mBAAO,WAAW;AAChB,kBAAI,OAAO,eAAe,IAAI,SAAS;AACvC,kBAAI,KAAK,IAAI,GAAG;AACd;AAAA,cACF,WAAW,MAAM,IAAI,KAAK,gBAAgB,GAAG;AAC3C;AAAA,cACF,WAAW,MAAM,IAAI,KAAK,kBAAkB,GAAG;AAC7C,4BAAY;AACZ;AAAA,cACF;AACA,0BAAY;AAAA,YACd;AACA,gBAAI,aAAa;AACjB,gBAAI,YAAY,IAAI,MAAM,gBAAgB,YAAY;AACtD,gBAAI,UAAU,IAAI,MAAM,cAAc,UAAU;AAChD,0BAAc,WAAW,OAAO;AAChC;AAAA,UACF;AACA,cAAI,YAAY,aAAa,KAAK,aAAa,CAAC,YAAY,YAAY,SAAS,GAAG;AAClF,gBAAI,uBAAuB,eAAe,IAAI,SAAS;AACvD,gBAAI,QAAQ;AACZ,mBAAO,CAAC,SAAS,sBAAsB;AACrC,kBAAI,qBAAqB,aAAa,KAAK,YAAY,YAAY,oBAAoB,GAAG;AACxF,wBAAQ;AACR,8BAAc,cAAc,OAAO,WAAW,WAAW;AACzD,0BAAU,OAAO,WAAW;AAAA,cAC9B;AACA,qCAAuB,eAAe,IAAI,oBAAoB;AAAA,YAChE;AAAA,UACF;AACA,cAAI,UAAU,SAAS;AACrB,gBAAI,CAAC,SAAS,SAAS;AACrB,+BAAiB,WAAW;AAC5B,4BAAc,cAAc,OAAO,WAAW,WAAW;AACzD,+BAAiB,SAAS,OAAO;AACjC,4BAAc,eAAe,OAAO,WAAW;AAC/C,0BAAY,eAAe,IAAI,SAAS;AACxC;AAAA,YACF;AACA,gBAAI,SAAS,CAAC,SAAS;AACrB,kBAAI,SAAS,QAAQ;AACnB,4BAAY,YAAY,SAAS,MAAM;AACvC,8BAAc,SAAS;AACvB,0BAAU,OAAO,WAAW;AAAA,cAC9B;AAAA,YACF;AACA,gBAAI,SAAS,SAAS;AACpB,kBAAI,cAAc,SAAS;AAC3B,kBAAI,aAAa;AACf,iCAAiB,WAAW;AAC5B,4BAAY,YAAY,WAAW;AACnC,8BAAc;AACd,0BAAU,OAAO,WAAW;AAAA,cAC9B,OAAO;AACL,iCAAiB,WAAW;AAC5B,8BAAc,cAAc,OAAO,WAAW,WAAW;AACzD,iCAAiB,SAAS,OAAO;AACjC,8BAAc,eAAe,OAAO,WAAW;AAC/C,4BAAY,eAAe,IAAI,SAAS;AACxC;AAAA,cACF;AAAA,YACF;AAAA,UACF;AACA,cAAI,kBAAkB,eAAe,eAAe,OAAO,WAAW;AACtE,gBAAM,aAAa,SAAS;AAC5B,sBAAY,aAAa,eAAe,IAAI,SAAS;AACrD,wBAAc;AAAA,QAChB;AACA,YAAI,WAAW,CAAC;AAChB,eAAO,aAAa;AAClB,cAAI,CAAC,WAAW,UAAU,WAAW;AACnC,qBAAS,KAAK,WAAW;AAC3B,wBAAc,eAAe,OAAO,WAAW;AAAA,QACjD;AACA,eAAO,SAAS,QAAQ;AACtB,cAAI,gBAAgB,SAAS,MAAM;AACnC,wBAAc,OAAO;AACrB,kBAAQ,aAAa;AAAA,QACvB;AAAA,MACF;AACA,sBAAgB,IAAI;AAClB,eAAO,MAAM,GAAG,aAAa,KAAK,IAAI,EAAE;AAAA,MAC1C;AACA,wBAAkB,MAAK;AACrB,YAAI,MAAM,CAAC;AACX,iBAAS,MAAM,MAAK;AAClB,cAAI,SAAS,OAAO,EAAE;AACtB,cAAI,QAAQ;AACV,gBAAI,UAAU;AAAA,UAChB;AAAA,QACF;AACA,eAAO;AAAA,MACT;AACA,6BAAuB,QAAQ,MAAM,UAAU;AAC7C,YAAI,CAAC,WAAW,QAAQ,IAAI,GAAG;AAC7B,cAAI,QAAQ,KAAK,UAAU,IAAI;AAC/B,iBAAO,aAAa,OAAO,QAAQ;AACnC,gBAAM,KAAK;AACX,iBAAO;AAAA,QACT;AACA,eAAO;AAAA,MACT;AACA,oBAAc,OAAO;AACrB,eAAS;AACT,aAAO,OAAO,WAAW,WAAW,cAAc,MAAM,IAAI;AAC5D,UAAI,OAAO,UAAU,OAAO,OAAO,oBAAoB,CAAC,KAAK,cAAc;AACzE,aAAK,eAAe,OAAO,OAAO,iBAAiB,IAAI;AACvD,aAAK,gBAAgB,OAAO,OAAO,UAAU,MAAM,IAAI;AAAA,MACzD;AACA,YAAM,MAAM,IAAI;AAChB,eAAS;AACT,aAAO;AACP,aAAO;AAAA,IACT;AACA,WAAM,OAAO,MAAM;AAAA,IACnB;AACA,WAAM,MAAM,MAAM;AAAA,IAClB;AACA,wBAAoB,SAAS,MAAM;AACjC,UAAI,OAAO;AACX,WAAK,GAAG,MAAM,MAAM,OAAO,IAAI;AAC/B,aAAO;AAAA,IACT;AACA,QAAI,UAAU;AACd,2BAAuB,MAAM;AAC3B,YAAM,WAAW,SAAS,cAAc,UAAU;AAClD,eAAS,YAAY;AACrB,aAAO,SAAS,QAAQ;AAAA,IAC1B;AACA,2BAAuB,IAAI;AACzB,aAAO,GAAG,aAAa,KAAK,GAAG,aAAa;AAAA,IAC9C;AACA,QAAI,QAAQ,MAAM;AAAA,MAChB,YAAY,QAAO,KAAK;AACtB,aAAK,eAAe;AACpB,aAAK,aAAa;AAAA,MACpB;AAAA,MACA,IAAI,WAAW;AACb,YAAI,WAAW,CAAC;AAChB,YAAI,cAAc,KAAK,aAAa;AACpC,eAAO,eAAe,gBAAgB,KAAK,YAAY;AACrD,mBAAS,KAAK,WAAW;AACzB,wBAAc,YAAY;AAAA,QAC5B;AACA,eAAO;AAAA,MACT;AAAA,MACA,YAAY,OAAO;AACjB,aAAK,WAAW,OAAO,KAAK;AAAA,MAC9B;AAAA,MACA,IAAI,aAAa;AACf,YAAI,SAAQ,KAAK,aAAa;AAC9B,YAAI,WAAU,KAAK;AACjB;AACF,eAAO;AAAA,MACT;AAAA,MACA,SAAS,WAAW;AAClB,YAAI,OAAO,UAAU;AACrB,YAAI,SAAS,KAAK;AAChB;AACF,eAAO;AAAA,MACT;AAAA,MACA,aAAa,SAAS,WAAW;AAC/B,kBAAU,OAAO,OAAO;AACxB,eAAO;AAAA,MACT;AAAA,IACF;AACA,0BAAsB,QAAQ;AAC5B,aAAO,OAAO;AAAA,IAChB;AACA,4BAAwB,QAAQ,WAAW;AACzC,UAAI;AACJ,UAAI,kBAAkB,OAAO;AAC3B,eAAO,OAAO,SAAS,SAAS;AAAA,MAClC,OAAO;AACL,eAAO,UAAU;AAAA,MACnB;AACA,aAAO;AAAA,IACT;AACA,0DAAsD;AACpD,UAAI;AACF;AACF,gBAAU;AACV,UAAI,WAAW,QAAQ,UAAU;AACjC,UAAI,UAAU,SAAS,cAAc,KAAK;AAC1C,cAAQ,UAAU,eAAe,yBAAyB,MAAM,OAAO;AACrE,YAAI,CAAC,KAAK,SAAS,GAAG,GAAG;AACvB,iBAAO,SAAS,KAAK,MAAM,MAAM,KAAK;AAAA,QACxC;AACA,gBAAQ,YAAY,SAAS,SAAS;AACtC,YAAI,OAAO,QAAQ,kBAAkB,iBAAiB,IAAI;AAC1D,gBAAQ,kBAAkB,oBAAoB,IAAI;AAClD,aAAK,iBAAiB,IAAI;AAAA,MAC5B;AAAA,IACF;AACA,+BAA2B,IAAI,MAAM;AACnC,UAAI,SAAS,QAAQ,KAAK,eAAe,KAAK,YAAY;AAC1D,UAAI,CAAC;AACH;AACF,UAAI,CAAC,GAAG;AACN;AACF,SAAG,aAAa,MAAM,MAAM;AAC5B,SAAG,KAAK;AAAA,IACV;AAGA,yBAAqB,UAAQ;AAC3B,eAAO,QAAQ;AAAA,IACjB;AAGA,QAAI,iBAAiB;AAAA;AAAA;;;AChXrB;AAAA;AAAA,QAAI,aAAY,OAAO;AACvB,QAAI,oBAAmB,OAAO;AAC9B,QAAI,qBAAoB,OAAO;AAC/B,QAAI,gBAAe,OAAO,UAAU;AACpC,QAAI,WAAW,CAAC,QAAQ,SAAQ;AAC9B,eAAS,QAAQ;AACf,mBAAU,QAAQ,MAAM,EAAE,KAAK,KAAI,OAAO,YAAY,KAAK,CAAC;AAAA,IAChE;AACA,QAAI,eAAc,CAAC,IAAI,MAAM,QAAQ,SAAS;AAC5C,UAAI,QAAQ,OAAO,SAAS,YAAY,OAAO,SAAS,YAAY;AAClE,iBAAS,OAAO,mBAAkB,IAAI;AACpC,cAAI,CAAC,cAAa,KAAK,IAAI,GAAG,KAAK,QAAQ;AACzC,uBAAU,IAAI,KAAK,EAAE,KAAK,MAAM,KAAK,MAAM,YAAY,CAAE,QAAO,kBAAiB,MAAM,GAAG,MAAM,KAAK,WAAW,CAAC;AAAA,MACvH;AACA,aAAO;AAAA,IACT;AACA,QAAI,eAAe,CAAC,QAAQ,aAAY,WAAU,CAAC,GAAG,cAAc,EAAE,OAAO,KAAK,CAAC,GAAG,GAAG;AAGzF,QAAI,iBAAiB,CAAC;AACtB,aAAS,gBAAgB;AAAA,MACvB,SAAS,MAAM;AAAA,MACf,MAAM,MAAM;AAAA,MACZ,WAAW,MAAM;AAAA,IACnB,CAAC;AACD,WAAO,UAAU,aAAa,cAAc;AAG5C,yBAAqB,UAAQ;AAC3B,eAAO,UAAU,QAAQ,CAAC,IAAI,EAAE,OAAO,cAAc,EAAE,QAAQ,eAAe,cAAc;AAC1F,YAAI,aAAa,MAAM;AACvB,YAAI,iBAAiB;AACrB,uBAAe,MAAM;AACnB,cAAI,CAAC,YAAY,SAAS,EAAE,SAAS,KAAK,GAAG;AAC3C,gBAAI,YAAY,cAAc,UAAU;AACxC,mBAAO,MAAM;AACX,2BAAa,CAAC,UAAU;AACtB,oBAAI;AACJ,yBAAO,0BAA0B,MAAM;AACrC,4BAAU,CAAC,WAAW;AACpB,6BAAS,OAAO,WAAW,aAAa,OAAO,KAAK,IAAI;AAAA,kBAC1D,GAAG,EAAE,OAAO;AAAA,oBAEV,UAAU;AAAA,oBACV,UAAU,YAAY,KAAK,EAAE,GAAG,CAAC;AAAA,kBACnC,EAAE,CAAC;AAAA,gBACL,CAAC;AACD,uBAAO;AAAA,cACT;AACA,gCAAkB,IAAI,KAAK;AAAA,YAC7B,CAAC;AAAA,UACH,OAAO;AACL,8BAAkB,IAAI,KAAK;AAAA,UAC7B;AACA,cAAI,GAAG,UAAU;AACf,gBAAI,GAAG,SAAS,IAAI,MAAM,GAAG;AAC3B;AACF,gBAAI,GAAG,SAAS,IAAI,MAAM,QAAQ,GAAG,UAAU;AAC7C;AACF,eAAG,SAAS,IAAI,GAAG,KAAK;AAAA,UAC1B;AAAA,QACF,CAAC;AACD,cAAM,aAAa,IAAI,gBAAgB;AACvC,gBAAQ,MAAM;AACZ,qBAAW,MAAM;AAAA,QACnB,CAAC;AACD,WAAG,iBAAiB,SAAS,MAAM,kBAAkB,EAAE,GAAG;AAAA,UACxD,QAAQ,WAAW;AAAA,UAGnB,SAAS;AAAA,QACX,CAAC;AACD,WAAG,iBAAiB,QAAQ,MAAM,kBAAkB,IAAI,KAAK,GAAG,EAAE,QAAQ,WAAW,OAAO,CAAC;AAC7F,mCAA2B,KAAK,sBAAsB,MAAM;AAC1D,cAAI,QAAQ,IAAI;AAChB,cAAI,WAAW,WAAW,KAAK;AAC/B,cAAI,CAAC,YAAY,aAAa;AAC5B,mBAAO;AACT,cAAI,eAAe,SAAS,IAAI,MAAM,WAAW,GAAG;AAClD,mBAAO,iBAAiB,IAAI;AAAA,UAC9B;AACA,cAAI,WAAW,MAAM;AACnB,6BAAiB,IAAI,QAAQ,YAAY,OAAO,QAAQ;AAAA,UAC1D;AACA,cAAI,qBAAqB;AACvB,kCAAsB,KAAK,UAAU,MAAM;AACzC,uBAAS;AAAA,YACX,CAAC;AAAA,UACH,OAAO;AACL,qBAAS;AAAA,UACX;AAAA,QACF;AACA,6BAAqB,OAAO,UAAU;AACpC,cAAI,UAAU;AACZ,mBAAO;AACT,cAAI,oBAAoB,UAAU,UAAU,KAAK;AACjD,cAAI,eAAe,QAAQ,UAAU,iBAAiB;AACtD,iBAAO;AAAA,QACT;AAAA,MACF,CAAC,EAAE,OAAO,OAAO;AAAA,IACnB;AACA,mCAA+B,IAAI,UAAU,UAAU;AACrD,UAAI,iBAAiB,GAAG;AACxB,UAAI,mBAAmB,GAAG;AAC1B,eAAS;AACT,UAAI,qCAAqC,iBAAiB,MAAM,GAAG,cAAc;AACjF,UAAI,cAAc,QAChB,UACA,UACE,UACA,kCACF,CACF,EAAE;AACF,SAAG,kBAAkB,aAAa,WAAW;AAAA,IAC/C;AACA,uBAAmB,UAAU,OAAO;AAClC,UAAI,oBAAoB;AACxB,UAAI,SAAS;AACb,UAAI,UAAU;AAAA,QACZ,KAAK;AAAA,QACL,KAAK;AAAA,QACL,KAAK;AAAA,MACP;AACA,UAAI,mBAAmB;AACvB,eAAS,IAAI,GAAG,IAAI,SAAS,QAAQ,KAAK;AACxC,YAAI,CAAC,KAAK,KAAK,GAAG,EAAE,SAAS,SAAS,EAAE,GAAG;AACzC,8BAAoB,SAAS;AAC7B;AAAA,QACF;AACA,iBAAS,IAAI,GAAG,IAAI,kBAAkB,QAAQ,KAAK;AACjD,cAAI,kBAAkB,OAAO,SAAS,IAAI;AACxC,gCAAoB,kBAAkB,MAAM,GAAG,CAAC,IAAI,kBAAkB,MAAM,IAAI,CAAC;AACjF;AAAA,UACF;AAAA,QACF;AAAA,MACF;AACA,eAAS,IAAI,GAAG,IAAI,iBAAiB,QAAQ,KAAK;AAChD,YAAI,QAAQ;AACZ,iBAAS,IAAI,GAAG,IAAI,kBAAkB,QAAQ,KAAK;AACjD,cAAI,QAAQ,iBAAiB,IAAI,KAAK,kBAAkB,EAAE,GAAG;AAC3D,sBAAU,kBAAkB;AAC5B,gCAAoB,kBAAkB,MAAM,GAAG,CAAC,IAAI,kBAAkB,MAAM,IAAI,CAAC;AACjF,oBAAQ;AACR;AAAA,UACF;AAAA,QACF;AACA,YAAI,CAAC;AACH;AAAA,MACJ;AACA,aAAO;AAAA,IACT;AACA,qBAAiB,UAAU,OAAO;AAChC,UAAI,QAAQ,MAAM,KAAK,KAAK;AAC5B,UAAI,SAAS;AACb,eAAS,IAAI,GAAG,IAAI,SAAS,QAAQ,KAAK;AACxC,YAAI,CAAC,CAAC,KAAK,KAAK,GAAG,EAAE,SAAS,SAAS,EAAE,GAAG;AAC1C,oBAAU,SAAS;AACnB;AAAA,QACF;AACA,YAAI,MAAM,WAAW;AACnB;AACF,kBAAU,MAAM,MAAM;AAAA,MACxB;AACA,aAAO;AAAA,IACT;AACA,yBAAqB,OAAO,YAAY,KAAK,WAAW,YAAY,GAAG;AACrE,UAAI,UAAU;AACZ,eAAO;AACT,UAAI,QAAQ,KAAK,KAAK;AACpB,eAAO;AACT,UAAI,cAAc,QAAQ,cAAc,QAAQ;AAC9C,oBAAY,cAAc,MAAM,MAAM;AAAA,MACxC;AACA,UAAI,eAAe,CAAC,QAAQ,eAAe;AACzC,YAAI,SAAS;AACb,YAAI,UAAU;AACd,iBAAS,IAAI,OAAO,SAAS,GAAG,KAAK,GAAG,KAAK;AAC3C,cAAI,OAAO,OAAO;AAChB;AACF,cAAI,YAAY,GAAG;AACjB,qBAAS,OAAO,KAAK,aAAa;AAClC,sBAAU;AAAA,UACZ,OAAO;AACL,qBAAS,OAAO,KAAK;AAAA,UACvB;AACA;AAAA,QACF;AACA,eAAO;AAAA,MACT;AACA,UAAI,QAAQ,MAAM,WAAW,GAAG,IAAI,MAAM;AAC1C,UAAI,gBAAgB,MAAM,WAAW,IAAI,OAAO,UAAU,cAAc,GAAG,GAAG,EAAE;AAChF,UAAI,WAAW,MAAM,KAAK,EAAE,QAAQ,cAAc,MAAM,SAAS,EAAE,GAAG,OAAO,CAAC,EAAE,KAAK,GAAG,EAAE,KAAK,EAAE;AACjG,iBAAW,GAAG,QAAQ,aAAa,UAAU,SAAS;AACtD,UAAI,YAAY,KAAK,MAAM,SAAS,SAAS;AAC3C,oBAAY,GAAG,cAAc,IAAI,OAAO,SAAS;AACnD,qBAAe,MAAM;AACnB,YAAI,KAAK,GAAG,MAAM,SAAS,SAAS;AAClC;AACF,YAAI,KAAK,GAAG,MAAM,KAAK,GAAG,iBAAiB,OAAO,WAAW;AAC3D,eAAK,GAAG,kBAAkB,KAAK,GAAG,iBAAiB,GAAG,KAAK,GAAG,iBAAiB,CAAC;AAAA,QAClF;AAAA,MACF,CAAC;AACD,aAAO;AAAA,IACT;AAGA,QAAI,iBAAiB;AAAA;AAAA;;;AC7Md,IAAM,MAAN,MAAU;AAAA,EACb,cAAc;AAAE,SAAK,SAAS,CAAC;AAAA,EAAE;AAAA,EAEjC,IAAI,KAAK,OAAO;AACZ,QAAI,CAAE,KAAK,OAAO;AAAM,WAAK,OAAO,OAAO,CAAC;AAC5C,SAAK,OAAO,KAAK,KAAK,KAAK;AAAA,EAC/B;AAAA,EAEA,OAAO,KAAK;AACR,QAAI,KAAK,OAAO;AAAM,aAAO,KAAK,OAAO;AAAA,EAC7C;AAAA,EAEA,IAAI,KAAK;AAAE,WAAO,KAAK,OAAO,QAAQ,CAAC;AAAA,EAAE;AAAA,EAEzC,KAAK,KAAK,UAAU;AAAE,WAAO,KAAK,IAAI,GAAG,EAAE,QAAQ,QAAQ;AAAA,EAAE;AACjE;AAEO,IAAM,UAAN,MAAc;AAAA,EACjB,cAAc;AAAE,SAAK,SAAS,oBAAI;AAAA,EAAQ;AAAA,EAE1C,IAAI,KAAK,OAAO;AACZ,QAAI,CAAE,KAAK,OAAO,IAAI,GAAG;AAAG,WAAK,OAAO,IAAI,KAAK,CAAC,CAAC;AACnD,SAAK,OAAO,IAAI,GAAG,EAAE,KAAK,KAAK;AAAA,EACnC;AAAA,EAEA,OAAO,KAAK;AACR,QAAI,KAAK,OAAO,IAAI,GAAG;AAAG,WAAK,OAAO,OAAO,KAAK,CAAC,CAAC;AAAA,EACxD;AAAA,EAEA,IAAI,KAAK;AAAE,WAAO,KAAK,OAAO,IAAI,GAAG,IAAI,KAAK,OAAO,IAAI,GAAG,IAAI,CAAC;AAAA,EAAE;AAAA,EAEnE,KAAK,KAAK,UAAU;AAAE,WAAO,KAAK,IAAI,GAAG,EAAE,QAAQ,QAAQ;AAAA,EAAE;AACjE;AAEO,kBAAkB,QAAQ,MAAM,SAAS,CAAC,GAAG,UAAU,MAAM;AAChE,SAAO,cACH,IAAI,YAAY,MAAM;AAAA,IAClB;AAAA,IACA;AAAA,IAEA,UAAU;AAAA,IACV,YAAY;AAAA,EAChB,CAAC,CACL;AACJ;AAEO,gBAAgB,QAAQ,MAAM,SAAS;AAC1C,SAAO,iBAAiB,MAAM,OAAO;AAErC,SAAO,MAAM,OAAO,oBAAoB,MAAM,OAAO;AACzD;AAKO,mBAAmB,SAAS;AAAE,SAAQ,OAAO,YAAY,YAAY,YAAY;AAAM;AACvF,kBAAkB,SAAS;AAAE,SAAQ,UAAU,OAAO,KAAK,CAAE,QAAQ,OAAO;AAAG;AAC/E,iBAAiB,SAAS;AAAE,SAAO,MAAM,QAAQ,OAAO;AAAE;AAC1D,oBAAoB,SAAS;AAAE,SAAO,OAAO,YAAY;AAAW;AACpE,qBAAqB,SAAS;AAAE,SAAO,OAAO,YAAY,YAAY,YAAY;AAAK;AAKvF,mBAAmB,KAAK;AAAE,SAAO,KAAK,MAAM,KAAK,UAAU,GAAG,CAAC;AAAE;AAiBjE,iBAAiB,QAAQ,KAAK;AACjC,MAAI,QAAQ;AAAI,WAAO;AAEvB,SAAO,IAAI,MAAM,GAAG,EAAE,OAAO,CAAC,OAAO,MAAM;AACvC,WAAO,QAAQ;AAAA,EACnB,GAAG,MAAM;AACb;AAKO,iBAAiB,QAAQ,KAAK,OAAO;AACxC,MAAI,WAAW,IAAI,MAAM,GAAG;AAE5B,MAAI,SAAS,WAAW,GAAG;AACvB,WAAO,OAAO,OAAO;AAAA,EACzB;AAEA,MAAI,eAAe,SAAS,MAAM;AAClC,MAAI,iBAAiB,SAAS,KAAK,GAAG;AAEtC,MAAI,OAAO,kBAAkB,QAAW;AACpC,WAAO,gBAAgB,CAAC;AAAA,EAC5B;AAEA,UAAQ,OAAO,eAAe,gBAAgB,KAAK;AACvD;AAKO,cAAc,MAAM,OAAO,QAAQ,CAAC,GAAG,OAAO,IAAI;AAErD,MAAI,SAAS;AAAO,WAAO;AAG3B,MAAI,OAAO,SAAS,OAAO,SAAU,SAAS,IAAI,KAAK,QAAQ,KAAK,KAAO,QAAQ,IAAI,KAAK,SAAS,KAAK,GAAI;AAC1G,UAAM,QAAQ;AACd,WAAO;AAAA,EACX;AAGA,MAAI,YAAY,IAAI,KAAK,YAAY,KAAK,GAAG;AACzC,UAAM,QAAQ;AACd,WAAO;AAAA,EACX;AAGA,MAAI,WAAW,OAAO,KAAK,IAAI;AAG/B,SAAO,QAAQ,KAAK,EAAE,QAAQ,CAAC,CAAC,KAAK,WAAW;AAC5C,YAAQ,EAAC,GAAG,OAAO,GAAG,KAAK,KAAK,MAAM,MAAM,MAAM,OAAO,SAAS,KAAK,MAAM,GAAG,QAAQ,KAAK,EAAC;AAC9F,eAAW,SAAS,OAAO,OAAK,MAAM,GAAG;AAAA,EAC7C,CAAC;AAGD,WAAS,QAAQ,SAAO;AACpB,UAAM,GAAG,QAAQ,SAAS;AAAA,EAC9B,CAAC;AAED,SAAO;AACX;AAOO,qBAAqB,SAAS;AACjC,MAAI,QAAQ,YAAY,OAAO,IAAI,QAAQ,KAAK;AAChD,MAAI,OAAO,YAAY,OAAO,IAAI,QAAQ,KAAK;AAE/C,MAAI,UAAU,KAAK,GAAG;AAClB,WAAO,QAAQ,KAAK,EAAE,QAAQ,CAAC,CAAC,KAAK,YAAY;AAC7C,YAAM,OAAO,YAAY,MAAM;AAAA,IACnC,CAAC;AAAA,EACL;AAEA,SAAO;AACX;AAMO,qBAAqB,SAAS;AACjC,SAAO,MAAM,QAAQ,OAAO,KACrB,QAAQ,WAAW,KACnB,OAAO,QAAQ,OAAO,YACtB,OAAO,KAAK,QAAQ,EAAE,EAAE,SAAS,GAAG;AAC/C;AAMO,wBAAwB;AAI3B,MAAI,SAAS,cAAc,yBAAyB,GAAG;AACnD,WAAO,SAAS,cAAc,yBAAyB,EAAE,aAAa,SAAS;AAAA,EACnF;AAEA,MAAI,SAAS,cAAc,aAAa,GAAG;AACvC,WAAO,SAAS,cAAc,aAAa,EAAE,aAAa,WAAW;AAAA,EACzE;AAEA,MAAI,OAAO,qBAAqB,WAAW,OAAO;AAC9C,WAAO,OAAO,qBAAqB;AAAA,EACvC;AAEA,QAAM;AACV;AAEA,IAAI;AAEG,oBAAoB;AACvB,MAAI;AAAO,WAAO;AAGlB,MAAI,OAAO,wBAAyB,QAAO,qBAAqB,YAAY,QAAQ;AAChF,YAAQ,OAAO,qBAAqB;AAEpC,WAAO;AAAA,EACX;AAEA,QAAM,cAAc,SAAS,cAAc,mCAAmC;AAE9E,MAAI,aAAa;AACb,YAAQ,YAAY;AAEpB,WAAO;AAAA,EACX;AAEA,SAAO;AACX;AAKO,wBAAwB;AAC3B,SAAO,SAAS,cAAc,mBAAmB,GAAG,aAAa,iBAAiB,KAAK,OAAO,qBAAqB,UAAU;AACjI;AAEO,2BAA2B,SAAS;AACvC,SAAO,CAAC,CAAE,QAAQ,MAAM,kCAAkC;AAC9D;AAEO,8BAA8B,SAAS;AAC1C,MAAI,OAAO,QAAQ,MAAM,qCAAqC;AAE9D,SAAO,CAAC,MAAM,QAAQ,QAAQ,MAAM,EAAE,CAAC;AAC3C;;;AC1OA,IAAI,iBAAiB,oBAAI;AAEzB,0BAA0B,WAAW;AACjC,MAAI,CAAE,eAAe,IAAI,SAAS,GAAG;AACjC,QAAI,UAAU,IAAI,cAAc,SAAS;AAEzC,mBAAe,IAAI,WAAW,OAAO;AAErC,YAAQ,kBAAkB;AAAA,EAC9B;AAEA,SAAO,eAAe,IAAI,SAAS;AACvC;AAEO,0BAA0B,IAAI,UAAU,WAAW,SAAS;AAC/D,MAAI,UAAU,iBAAiB,SAAS;AAExC,MAAI,SAAQ,MAAM,GAAG,cAAc,IAAI,YAAY,yBAAyB,EAAE,SAAS,MAAM,QAAQ,EAAE,IAAI,UAAU,IAAI,SAAQ,EAAE,CAAC,CAAC;AACrI,MAAI,SAAS,MAAM,GAAG,cAAc,IAAI,YAAY,0BAA0B,EAAE,SAAS,MAAM,QAAQ,EAAE,IAAI,UAAU,IAAI,SAAQ,EAAE,CAAC,CAAC;AACvI,MAAI,SAAQ,MAAM,GAAG,cAAc,IAAI,YAAY,yBAAyB,EAAE,SAAS,MAAM,QAAQ,EAAE,IAAI,UAAU,IAAI,SAAQ,EAAE,CAAC,CAAC;AACrI,MAAI,SAAS,MAAM,GAAG,cAAc,IAAI,YAAY,0BAA0B,EAAE,SAAS,MAAM,QAAQ,EAAE,IAAI,UAAU,IAAI,SAAQ,EAAE,CAAC,CAAC;AACvI,MAAI,WAAW,CAAC,kBAAkB;AAC9B,QAAI,mBAAmB,KAAK,MAAQ,cAAc,SAAS,MAAO,cAAc,KAAM;AAEtF,OAAG,cACC,IAAI,YAAY,4BAA4B;AAAA,MACxC,SAAS;AAAA,MAAM,QAAQ,EAAE,UAAU,iBAAiB;AAAA,IACxD,CAAC,CACL;AAAA,EACJ;AAEA,MAAI,eAAe,OAAK;AACpB,QAAI,EAAE,OAAO,MAAM,WAAW;AAAG;AAEjC,WAAM;AAEN,QAAI,EAAE,OAAO,UAAU;AACnB,cAAQ,eAAe,UAAU,EAAE,OAAO,OAAO,QAAQ,QAAO,UAAU,MAAM;AAAA,IACpF,OAAO;AACH,cAAQ,OAAO,UAAU,EAAE,OAAO,MAAM,IAAI,QAAQ,QAAO,UAAU,MAAM;AAAA,IAC/E;AAAA,EACJ;AAEA,KAAG,iBAAiB,UAAU,YAAY;AAG1C,YAAU,MAAM,OAAO,UAAU,CAAC,UAAU;AAIxC,QAAI,CAAE,GAAG;AAAa;AAEtB,QAAI,UAAU,QAAQ,UAAU,IAAI;AAChC,SAAG,QAAQ;AAAA,IACf;AAGA,QAAI,GAAG,YAAY,MAAM,QAAQ,KAAK,KAAK,MAAM,WAAW,GAAG;AAC3D,SAAG,QAAQ;AAAA,IACf;AAAA,EACJ,CAAC;AAKD,MAAI,sBAAsB,MAAM;AAAE,OAAG,QAAQ;AAAA,EAAK;AAClD,KAAG,iBAAiB,SAAS,mBAAmB;AAGhD,KAAG,iBAAiB,0BAA0B,mBAAmB;AAEjE,UAAQ,MAAM;AACV,OAAG,oBAAoB,UAAU,YAAY;AAC7C,OAAG,oBAAoB,SAAS,mBAAmB;AAAA,EACvD,CAAC;AACL;AAEA,IAAM,gBAAN,MAAoB;AAAA,EAChB,YAAY,WAAW;AACnB,SAAK,YAAY;AACjB,SAAK,YAAY,IAAI;AACrB,SAAK,YAAY,IAAI;AAAA,EACzB;AAAA,EAEA,oBAAoB;AAChB,SAAK,UAAU,MAAM,IAAI,6BAA6B,CAAC,EAAE,MAAM,UAAU;AAIrE,uBAAiB,KAAK,WAAW,IAAI;AAErC,WAAK,gBAAgB,MAAM,GAAG;AAAA,IAClC,CAAC;AAED,SAAK,UAAU,MAAM,IAAI,kCAAkC,CAAC,EAAE,MAAM,cAAc;AAC9E,uBAAiB,KAAK,WAAW,IAAI;AAErC,WAAK,qBAAqB,MAAM,OAAO;AAAA,IAC3C,CAAC;AAED,SAAK,UAAU,MAAM,IAAI,mBAAmB,CAAC,EAAE,MAAM,mBAAmB,KAAK,mBAAmB,MAAM,YAAY,CAAC;AACnH,SAAK,UAAU,MAAM,IAAI,kBAAkB,CAAC,EAAE,WAAW,KAAK,kBAAkB,IAAI,CAAC;AACrF,SAAK,UAAU,MAAM,IAAI,kBAAkB,CAAC,EAAE,MAAM,kBAAkB,KAAK,UAAU,MAAM,IAAI,EAAE,eAAe,WAAW,CAAC;AAAA,EAChI;AAAA,EAEA,OAAO,MAAM,MAAM,gBAAgB,eAAe,kBAAkB,mBAAmB;AACnF,SAAK,UAAU,MAAM;AAAA,MACjB,OAAO,CAAC,IAAI;AAAA,MACZ,UAAU;AAAA,MACV;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,IACJ,CAAC;AAAA,EACL;AAAA,EAEA,eAAe,MAAM,OAAO,gBAAgB,eAAe,kBAAkB,mBAAmB;AAC5F,SAAK,UAAU,MAAM;AAAA,MACjB,OAAO,MAAM,KAAK,KAAK;AAAA,MACvB,UAAU;AAAA,MACV;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,IACJ,CAAC;AAAA,EACL;AAAA,EAEA,aAAa,MAAM,aAAa,gBAAgB;AAC5C,SAAK,UAAU,KAAK,MAAM;AAAA,MACtB;AAAA,MAAa;AAAA,IACjB,CAAC;AAED,SAAK,UAAU,MAAM,KAAK,iBAAiB,MAAM,WAAW;AAAA,EAChE;AAAA,EAEA,UAAU,MAAM,cAAc;AAC1B,SAAK,UAAU,IAAI,MAAM,YAAY;AAErC,QAAI,KAAK,UAAU,IAAI,IAAI,EAAE,WAAW,GAAG;AACvC,WAAK,YAAY,MAAM,YAAY;AAAA,IACvC;AAAA,EACJ;AAAA,EAEA,gBAAgB,MAAM,KAAK;AACvB,QAAI,WAAW,IAAI,SAAS;AAC5B,UAAM,KAAK,KAAK,UAAU,MAAM,IAAI,EAAE,KAAK,EAAE,QAAQ,UAAQ,SAAS,OAAO,WAAW,MAAM,KAAK,IAAI,CAAC;AAExG,QAAI,UAAU;AAAA,MACV,UAAU;AAAA,IACd;AAEA,QAAI,YAAY,aAAa;AAE7B,QAAI;AAAW,cAAQ,kBAAkB;AAEzC,SAAK,YAAY,MAAM,UAAU,QAAQ,KAAK,SAAS,cAAY;AAC/D,aAAO,SAAS;AAAA,IACpB,CAAC;AAAA,EACL;AAAA,EAEA,qBAAqB,MAAM,SAAS;AAChC,QAAI,WAAW,KAAK,UAAU,MAAM,IAAI,EAAE,MAAM;AAEhD,QAAI,UAAU,QAAQ;AACtB,QAAI,UAAU;AAAS,aAAO,QAAQ;AACtC,QAAI,MAAM,QAAQ;AAElB,SAAK,YAAY,MAAM,UAAU,OAAO,KAAK,SAAS,cAAY;AAC9D,aAAO,CAAC,QAAQ,IAAI;AAAA,IACxB,CAAC;AAAA,EACL;AAAA,EAEA,YAAY,MAAM,UAAU,QAAQ,KAAK,SAAS,eAAe;AAC7D,QAAI,UAAU,IAAI,eAAe;AAEjC,YAAQ,KAAK,QAAQ,GAAG;AAExB,WAAO,QAAQ,OAAO,EAAE,QAAQ,CAAC,CAAC,KAAK,WAAW;AAC9C,cAAQ,iBAAiB,KAAK,KAAK;AAAA,IACvC,CAAC;AAED,YAAQ,OAAO,iBAAiB,YAAY,OAAK;AAC7C,QAAE,SAAS,CAAC;AACZ,QAAE,OAAO,WAAW,KAAK,MAAO,EAAE,SAAS,MAAO,EAAE,KAAK;AAEzD,WAAK,UAAU,MAAM,IAAI,EAAE,iBAAiB,CAAC;AAAA,IACjD,CAAC;AAED,YAAQ,iBAAiB,QAAQ,MAAM;AACnC,UAAK,SAAQ,SAAO,IAAI,OAAO,KAAK;AAChC,YAAI,QAAQ,cAAc,QAAQ,YAAY,KAAK,MAAM,QAAQ,QAAQ,CAAC;AAE1E,aAAK,UAAU,MAAM,KAAK,iBAAiB,MAAM,OAAO,KAAK,UAAU,MAAM,IAAI,EAAE,QAAQ;AAE3F;AAAA,MACJ;AAEA,UAAI,SAAS;AAEb,UAAI,QAAQ,WAAW,KAAK;AACxB,iBAAS,QAAQ;AAAA,MACrB;AAEA,WAAK,UAAU,MAAM,KAAK,kBAAkB,MAAM,QAAQ,KAAK,UAAU,MAAM,IAAI,EAAE,QAAQ;AAAA,IACjG,CAAC;AAED,SAAK,UAAU,MAAM,IAAI,EAAE,UAAU;AAErC,YAAQ,KAAK,QAAQ;AAAA,EACzB;AAAA,EAEA,YAAY,MAAM,cAAc;AAC5B,QAAI,YAAY,aAAa,MAAM,IAAI,UAAQ;AAC3C,aAAO,EAAE,MAAM,KAAK,MAAM,MAAM,KAAK,MAAM,MAAM,KAAK,KAAK;AAAA,IAC/D,CAAC;AAED,SAAK,UAAU,MAAM,KAAK,gBAAgB,MAAM,WAAW,aAAa,QAAQ;AAEhF,qBAAiB,KAAK,WAAW,IAAI;AAAA,EACzC;AAAA,EAEA,mBAAmB,MAAM,cAAc;AACnC,uBAAmB,KAAK,SAAS;AAEjC,QAAI,eAAe,KAAK,UAAU,MAAM,IAAI;AAC5C,iBAAa,eAAe,aAAa,WAAW,eAAe,aAAa,EAAE;AAElF,QAAI,KAAK,UAAU,IAAI,IAAI,EAAE,SAAS;AAAG,WAAK,YAAY,MAAM,KAAK,UAAU,KAAK,IAAI,CAAC;AAAA,EAC7F;AAAA,EAEA,kBAAkB,MAAM;AACpB,uBAAmB,KAAK,SAAS;AAEjC,SAAK,UAAU,MAAM,IAAI,EAAE,cAAc;AAEzC,QAAI,KAAK,UAAU,IAAI,IAAI,EAAE,SAAS;AAAG,WAAK,YAAY,MAAM,KAAK,UAAU,KAAK,IAAI,CAAC;AAAA,EAC7F;AAAA,EAEA,aAAa,MAAM,oBAAoB,MAAM;AACzC,uBAAmB,KAAK,SAAS;AAEjC,QAAI,aAAa,KAAK,UAAU,MAAM,IAAI;AAE1C,QAAI,YAAY;AACZ,UAAI,WAAW,SAAS;AACpB,mBAAW,QAAQ,MAAM;AAAA,MAC7B;AAEA,WAAK,UAAU,MAAM,IAAI,EAAE,kBAAkB;AAE7C,UAAI;AAAmB,0BAAkB;AAAA,IAC7C;AAAA,EACJ;AACJ;AAEA,IAAqB,aAArB,MAAgC;AAAA,EAC5B,cAAc;AACV,SAAK,MAAM,CAAC;AAAA,EAChB;AAAA,EAEA,IAAI,MAAM,OAAO;AACb,QAAI,CAAE,KAAK,IAAI,OAAO;AAClB,WAAK,IAAI,QAAQ,CAAC;AAAA,IACtB;AAEA,SAAK,IAAI,MAAM,KAAK,KAAK;AAAA,EAC7B;AAAA,EAEA,KAAK,MAAM,OAAO;AACd,SAAK,IAAI,MAAM,KAAK;AAAA,EACxB;AAAA,EAEA,MAAM,MAAM;AACR,QAAI,CAAE,KAAK,IAAI;AAAO,aAAO;AAE7B,WAAO,KAAK,IAAI,MAAM;AAAA,EAC1B;AAAA,EAEA,KAAK,MAAM;AACP,WAAO,KAAK,IAAI,MAAM,MAAM,EAAE,EAAE;AAAA,EACpC;AAAA,EAEA,IAAI,MAAM;AACN,WAAO,KAAK,IAAI;AAAA,EACpB;AAAA,EAEA,MAAM,MAAM;AACR,WAAO,KAAK,IAAI,MAAM,MAAM;AAAA,EAChC;AAAA,EAEA,KAAK,SAAS,QAAQ;AAClB,IAAC,MAAK,UAAU,SAAS,CAAC,GAAG,QAAQ,cAAY;AAC7C,eAAS,GAAG,MAAM;AAAA,IACtB,CAAC;AAAA,EACL;AAAA,EAEA,IAAI,MAAM;AACN,WAAO,OAAO,KAAK,KAAK,SAAS,EAAE,SAAS,IAAI;AAAA,EACpD;AACJ;AAEA,4BAA4B;AAE5B;AAEA,8BAA8B;AAE9B;AAEO,gBACH,WACA,MACA,MACA,iBAAiB,MAAM;AAAE,GACzB,gBAAgB,MAAM;AAAE,GACxB,mBAAmB,MAAM;AAAE,GAC3B,oBAAoB,MAAM;AAAE,GAC9B;AACE,MAAI,gBAAgB,iBAAiB,SAAS;AAE9C,gBAAc,OACV,MACA,MACA,gBACA,eACA,kBACA,iBACJ;AACJ;AAEO,wBACH,WACA,MACA,OACA,iBAAiB,MAAM;AAAE,GACzB,gBAAgB,MAAM;AAAE,GACxB,mBAAmB,MAAM;AAAE,GAC3B,oBAAoB,MAAM;AAAE,GAC9B;AACE,MAAI,gBAAgB,iBAAiB,SAAS;AAE9C,gBAAc,eACV,MACA,OACA,gBACA,eACA,kBACA,iBACJ;AACJ;AAEO,sBACH,WACA,MACA,aACA,iBAAiB,MAAM;AAAE,GACzB,gBAAgB,MAAM;AAAE,GAC1B;AACE,MAAI,gBAAgB,iBAAiB,SAAS;AAE9C,gBAAc,aACV,MACA,aACA,gBACA,aACJ;AACJ;AAEO,sBACH,WACA,MACA,oBAAoB,MAAM;AAAE,GAC9B;AACE,MAAI,gBAAgB,iBAAiB,SAAS;AAE9C,gBAAc,aACV,MACA,iBACJ;AACJ;;;AC7XA,sBAAmB;AAEZ,kCAAkC,WAAW,SAAS;AACzD,MAAI,CAAE;AAAS,cAAU,MAAM;AAAA,IAAC;AAEhC,SAAO,CAAC,MAAM,OAAO,UAAU;AAC3B,QAAI,SAAS;AACb,QAAI,mBAAmB;AACvB,QAAI,oBAAoB,UAAU;AAClC,QAAI,wBAAwB,kBAAkB,IAAI,gBAAgB;AAElE,QAAI,cAAc,wBAAO,YAAY,CAAC,cAAc,QAAQ,QAAQ,MAAM,QAAQ;AAG9E,UAAI,OAAO,0BAA0B,aAAa;AAC9C,gBAAQ,MAAM,gDAAgD,sDAAsD,UAAU,QAAQ;AACtI;AAAA,MACJ;AAEI,UAAI,UAAU,wBAAO,SAAS;AAAA,QAE1B,MAAM;AACF,iBAAO,kBAAkB,IAAI,IAAI;AAAA,QACrC;AAAA,QACA,IAAI,OAAO;AACP,4BAAkB,IAAI,MAAM,OAAO,MAAM;AAAA,QAC7C;AAAA,MACJ,GAAG;AAAA,QAEC,MAAM;AACF,iBAAO,OAAO;AAAA,QAClB;AAAA,QACA,IAAI,OAAO;AACP,iBAAO,KAAK;AAAA,QAChB;AAAA,MACJ,CAAC;AAED,cAAQ,MAAM,QAAQ,CAAC;AAE3B,aAAO,cAAc,kBAAkB,IAAI,IAAI,CAAC;AAAA,IACpD,GAAG,SAAO;AACN,aAAO,eAAe,KAAK,QAAQ;AAAA,QAC/B,MAAM;AACF,mBAAS;AAET,iBAAO;AAAA,QACX;AAAA,MACJ,CAAC;AAAA,IACL,CAAC;AAED,WAAO,YAAY,qBAAqB;AAAA,EAC5C;AACJ;AAEA,uBAAuB,OAAO;AAC1B,SAAO,OAAO,UAAU,WAClB,KAAK,MAAM,KAAK,UAAU,KAAK,CAAC,IAChC;AACV;;;ACrDA,IAAI,YAAY,CAAC;AAKV,YAAY,MAAM,UAAU;AAC/B,MAAI,CAAE,UAAU;AAAO,cAAU,QAAQ,CAAC;AAE1C,YAAU,MAAM,KAAK,QAAQ;AAG7B,SAAO,MAAM;AACT,cAAU,QAAQ,UAAU,MAAM,OAAO,OAAK,MAAM,QAAQ;AAAA,EAChE;AACJ;AA2BO,iBAAiB,SAAS,QAAQ;AACrC,MAAI,YAAY,UAAU,SAAS,CAAC;AAEpC,MAAI,YAAY,CAAC;AAEjB,WAAS,IAAI,GAAG,IAAI,UAAU,QAAQ,KAAK;AACvC,QAAI,WAAW,UAAU,GAAG,GAAG,MAAM;AAErC,QAAI,WAAW,QAAQ;AAAG,gBAAU,KAAK,QAAQ;AAAA,EACrD;AAEA,SAAO,CAAC,WAAW;AAChB,WAAO,aAAa,WAAW,MAAM;AAAA,EACxC;AACJ;AAEA,4BAAmC,SAAS,QAAQ;AAChD,MAAI,YAAY,UAAU,SAAS,CAAC;AAEpC,MAAI,YAAY,CAAC;AAEjB,WAAS,IAAI,GAAG,IAAI,UAAU,QAAQ,KAAK;AACvC,QAAI,WAAW,MAAM,UAAU,GAAG,GAAG,MAAM;AAE3C,QAAI,WAAW,QAAQ;AAAG,gBAAU,KAAK,QAAQ;AAAA,EACrD;AAEA,SAAO,CAAC,WAAW;AAChB,WAAO,aAAa,WAAW,MAAM;AAAA,EACxC;AACJ;AAEO,sBAAsB,WAAW,QACxC;AACI,MAAI,SAAS;AAEb,WAAS,IAAI,GAAG,IAAI,UAAU,QAAQ,KAAK;AACvC,QAAI,UAAU,UAAU,GAAG,MAAM;AAEjC,QAAI,YAAY,QAAW;AACvB,eAAS;AAAA,IACb;AAAA,EACJ;AAEA,SAAO;AACX;;;ACzFO,uBAAuB,MAAM;AAChC,MAAI,OAAO,SAAS,cAAc,MAAM;AACxC,OAAK,YAAY;AACjB,OAAK,iBAAiB,GAAG,EAAE,QAAQ,OAC/B,EAAE,aAAa,UAAU,MAAM,CACnC;AAEA,MAAI,QAAQ,SAAS,eAAe,gBAAgB;AAEpD,MAAI,OAAO,SAAS,eAAe,SAAS,MAAM;AAE9C,UAAM,YAAY;AAAA,EACtB,OAAO;AACH,YAAQ,SAAS,cAAc,KAAK;AACpC,UAAM,KAAK;AACX,UAAM,MAAM,WAAW;AACvB,UAAM,MAAM,QAAQ;AACpB,UAAM,MAAM,SAAS;AACrB,UAAM,MAAM,UAAU;AACtB,UAAM,MAAM,kBAAkB;AAC9B,UAAM,MAAM,SAAS;AAAA,EACzB;AAEA,MAAI,SAAS,SAAS,cAAc,QAAQ;AAC5C,SAAO,MAAM,kBAAkB;AAC/B,SAAO,MAAM,eAAe;AAC5B,SAAO,MAAM,QAAQ;AACrB,SAAO,MAAM,SAAS;AACtB,QAAM,YAAY,MAAM;AAExB,WAAS,KAAK,QAAQ,KAAK;AAC3B,WAAS,KAAK,MAAM,WAAW;AAC/B,SAAO,cAAc,SAAS,KAAK;AACnC,SAAO,cAAc,SAAS,MAAM,KAAK,SAAS;AAClD,SAAO,cAAc,SAAS,MAAM;AAGpC,QAAM,iBAAiB,SAAS,MAAM,cAAc,KAAK,CAAC;AAG1D,QAAM,aAAa,YAAY,CAAC;AAChC,QAAM,iBAAiB,WAAW,OAAK;AACnC,QAAI,EAAE,QAAQ;AAAU,oBAAc,KAAK;AAAA,EAC/C,CAAC;AACD,QAAM,MAAM;AAChB;AAEO,uBAAuB,OAAO;AACjC,QAAM,YAAY;AAClB,WAAS,KAAK,MAAM,WAAW;AACnC;;;AC/CO,IAAM,cAAN,MAAkB;AAAA,EACrB,cAAc;AACV,SAAK,UAAU,oBAAI;AAAA,EACvB;AAAA,EAEA,IAAI,QAAQ;AACR,SAAK,QAAQ,IAAI,MAAM;AAAA,EAC3B;AAAA,EAEA,OAAO,QAAQ;AACX,SAAK,QAAQ,OAAO,MAAM;AAAA,EAC9B;AAAA,EAEA,aAAa,WAAW;AACpB,WAAO,CAAC,CAAE,KAAK,sBAAsB,SAAS;AAAA,EAClD;AAAA,EAEA,sBAAsB,WAAW;AAE7B,aAAS,CAAC,KAAK,WAAW,KAAK,QAAQ,QAAQ,GAAG;AAC9C,UAAI,OAAO,cAAc;AAAW,eAAO;AAAA,IAC/C;AAAA,EACJ;AAAA,EAGA,iBAAiB,QAAQ;AACrB,WAAO,CAAE,OAAO;AAAA,EACpB;AAAA,EAEA,QAAQ;AACJ,WAAO,KAAK,QAAQ,SAAS;AAAA,EACjC;AAAA,EAEA,MAAM,OAAO;AACT,SAAK,QAAQ;AAIb,UAAM,YAAY,IAAI;AAAA,EAC1B;AAAA,EAEA,UAAU;AAGN,SAAK,QAAQ,QAAQ,OAAK,EAAE,QAAQ,CAAC;AAAA,EACzC;AAAA,EAEA,UAAU;AAEN,QAAI,iBAAiB,CAAC;AAGtB,QAAI,mBAAmB,CAAC;AACxB,QAAI,mBAAmB,CAAC;AAExB,SAAK,QAAQ,QAAQ,YAAU;AAC3B,UAAI,CAAC,SAAS,UAAS,SAAQ,OAAO,iBAAiB;AAEvD,qBAAe,KAAK,OAAO;AAC3B,uBAAiB,KAAK,QAAO;AAC7B,uBAAiB,KAAK,KAAI;AAAA,IAC9B,CAAC;AAID,QAAI,UAAU,iBAAc,iBAAiB,QAAQ,cAAY,SAAS,YAAW,MAAM,CAAC,CAAC;AAE7F,QAAI,OAAO,MAAM,iBAAiB,QAAQ,cAAY,SAAS,CAAC;AAEhE,WAAO,CAAE,gBAAgB,SAAS,IAAK;AAAA,EAC3C;AACJ;;;ACtEO,IAAM,SAAN,MAAa;AAAA,EAChB,YAAY,WAAW;AACnB,SAAK,YAAY;AACjB,SAAK,UAAU;AACf,SAAK,QAAQ,CAAC;AACd,SAAK,YAAY,CAAC;AAClB,SAAK,YAAY,CAAC;AAAA,EACtB;AAAA,EAGA,YAAY,UAAU;AAClB,SAAK,UAAU,KAAK,QAAQ;AAAA,EAChC;AAAA,EAGA,QAAQ,QAAQ,QAAQ,UAAU;AAC9B,SAAK,MAAM,KAAK;AAAA,MACZ,MAAM;AAAA,MAAI;AAAA,MAAQ;AAAA,MAClB,aAAa,OAAO;AAChB,iBAAS,KAAK;AAAA,MAClB;AAAA,IACJ,CAAC;AAAA,EACL;AAAA,EAEA,UAAU;AACN,YAAQ,kBAAkB,EAAE,WAAW,KAAK,UAAU,CAAC;AAAA,EAC3D;AAAA,EAGA,mBAAmB;AAGf,QAAI,iBAAiB,KAAK,KAAK,UAAU,WAAW,KAAK,UAAU,SAAS;AAE5E,QAAI,UAAU,KAAK,UAAU,mBAAmB,cAAc;AAE9D,QAAI,UAAU;AAAA,MACV,UAAU,KAAK,UAAU;AAAA,MACzB;AAAA,MACA,OAAO,KAAK,MAAM,IAAI,OAAM;AAAA,QACxB,MAAM,EAAE;AAAA,QACR,QAAQ,EAAE;AAAA,QACV,QAAQ,EAAE;AAAA,MACd,EAAE;AAAA,IACN;AAIA,QAAI,mBAAmB,CAAC;AACxB,QAAI,gBAAgB,CAAC;AACrB,QAAI,mBAAmB,CAAC;AAExB,QAAI,UAAU,CAAC,QAAQ,iBAAiB,QAAQ,OAAK,EAAE,GAAG,CAAC;AAC3D,QAAI,OAAO,MAAM,cAAc,QAAQ,OAAK,EAAE,CAAC;AAC/C,QAAI,UAAU,MAAM,iBAAiB,QAAQ,OAAK,EAAE,CAAC;AAIrD,QAAI,eAAe,QAAQ,UAAU;AAAA,MACjC,WAAW,KAAK;AAAA,MAChB,QAAQ;AAAA,MACR,SAAS,CAAC,aAAa;AACnB,yBAAiB,KAAK,QAAQ;AAAA,MAClC;AAAA,MACA,MAAM,CAAC,aAAa;AAChB,sBAAc,KAAK,QAAQ;AAAA,MAC/B;AAAA,MACA,SAAS,CAAC,aAAa;AACnB,yBAAiB,KAAK,QAAQ;AAAA,MAClC;AAAA,IACJ,CAAC;AAGD,QAAI,iBAAiB,CAAC,aAAa;AAC/B,UAAI,EAAE,UAAU,YAAY;AAE5B,cAAQ;AAGR,WAAK,UAAU,iBAAiB,UAAU,SAAS,OAAO;AAG1D,WAAK,UAAU,eAAe,KAAK,UAAU,OAAO;AAEpD,UAAI,QAAQ,YAAY;AACpB,YAAI,UAAU,QAAQ;AAItB,YAAI,qBAAqB,KAAK,MAAM,IAAI,CAAC,EAAE,mBAAoB,YAAa;AAE5E,2BAAmB,QAAQ,CAAC,cAAc,UAAU;AAChD,uBAAa,QAAQ,MAAM;AAAA,QAC/B,CAAC;AAAA,MACL;AAEA,UAAI,iBAAiB,KAAK,MAAM,QAAQ;AAExC,mBAAa,EAAE,UAAU,gBAAgB,QAAQ,CAAC;AAElD,WAAK,UAAU,QAAQ,OAAK,EAAE,CAAC;AAE/B,cAAQ,QAAQ;AAAA,IACpB;AAEA,QAAI,gBAAgB,MAAM;AACtB,cAAQ;AAER,WAAK;AAAA,IACT;AAEA,WAAO,CAAC,SAAS,gBAAgB,aAAa;AAAA,EAClD;AACJ;;;AC/GO,IAAM,YAAN,MAAgB;AAAA,EACnB,cAAc;AAEV,SAAK,UAAU,oBAAI;AAGnB,SAAK,QAAQ,oBAAI;AAAA,EACrB;AAAA,EAEA,IAAI,WAAW;AAGX,QAAI,SAAS,KAAK,aAAa,WAAW,MAAM;AAC5C,UAAI,YAAY,IAAI,OAAO,SAAS;AAEpC,WAAK,QAAQ,IAAI,SAAS;AAE1B,aAAO;AAAA,IACX,CAAC;AAKD,2BAAuB,QAAQ,MAAM;AAEjC,UAAI,OAAO,KAAK,sBAAsB,OAAO,SAAS;AAEtD,UAAI,CAAE,MAAM;AAER,aAAK,qBAAqB;AAAA,MAC9B;AAAA,IACJ,CAAC;AAED,WAAO;AAAA,EACX;AAAA,EAEA,aAAa,WAAW,UAAU;AAC9B,aAAS,CAAC,KAAK,WAAW,KAAK,QAAQ,QAAQ,GAAG;AAC9C,UAAI,OAAO,cAAc,WAAW;AAChC,eAAO;AAAA,MACX;AAAA,IACJ;AAEA,WAAO,SAAS;AAAA,EACpB;AAAA,EAEA,sBAAsB,WAAW;AAC7B,aAAS,CAAC,KAAK,SAAS,KAAK,MAAM,QAAQ,GAAG;AAC1C,UAAI,KAAK,aAAa,SAAS;AAAG,eAAO;AAAA,IAC7C;AAAA,EACJ;AAAA,EAEA,uBAAuB;AAGnB,YAAQ,kBAAkB,EAAE,SAAS,KAAK,QAAQ,CAAC;AAGnD,QAAI,QAAQ,KAAK,wBAAwB;AAGzC,SAAK,QAAQ,MAAM;AAEnB,YAAQ,iBAAiB,EAAE,MAAM,CAAC;AAGlC,UAAM,QAAQ,UAAQ;AAElB,UAAI,KAAK,MAAM;AAAG;AAGlB,WAAK,MAAM,IAAI,IAAI;AAGnB,WAAK,KAAK,EAAE,KAAK,MAAM;AAEnB,aAAK,MAAM,OAAO,IAAI;AAItB,aAAK,qBAAqB;AAAA,MAC9B,CAAC;AAAA,IACL,CAAC;AAAA,EACL;AAAA,EAEA,0BAA0B;AACtB,QAAI,QAAQ,oBAAI;AAIhB,aAAS,CAAC,KAAK,WAAW,KAAK,QAAQ,QAAQ,GAAG;AAC9C,UAAI,eAAe;AAGnB,YAAM,QAAQ,UAAQ;AAClB,YAAI,KAAK,iBAAiB,MAAM,GAAG;AAC/B,eAAK,IAAI,MAAM;AAEf,yBAAe;AAAA,QACnB;AAAA,MACJ,CAAC;AAGD,UAAI,CAAE,cAAc;AAChB,YAAI,UAAU,IAAI;AAElB,gBAAQ,IAAI,MAAM;AAElB,cAAM,IAAI,OAAO;AAAA,MACrB;AAAA,IACJ;AAEA,WAAO;AAAA,EACX;AAAA,EAEA,uBAAuB;AACnB,QAAI,KAAK,QAAQ,OAAO,GAAG;AACvB,WAAK,qBAAqB;AAAA,IAC9B;AAAA,EACJ;AACJ;AAEA,IAAI,kBAAkB,oBAAI;AAE1B,gCAAgC,QAAQ,UAAU;AAC9C,MAAI,gBAAgB,IAAI,MAAM;AAAG;AAEjC,kBAAgB,IAAI,QAAQ,WAAW,MAAM;AACzC,aAAS;AAET,oBAAgB,OAAO,MAAM;AAAA,EACjC,GAAG,CAAC,CAAC;AACT;;;ACnIA,IAAI,YAAY,IAAI;AAKpB,6BAAoC,WAAW;AAC3C,MAAI,SAAS,UAAU,IAAI,SAAS;AAEpC,MAAI,UAAU,IAAI,QAAQ,CAAC,YAAY;AACnC,WAAO,YAAY,OAAO;AAAA,EAC9B,CAAC;AAED,UAAQ,SAAS;AAEjB,SAAO;AACX;AAKA,2BAAkC,WAAW,QAAQ,QAAQ;AACzD,MAAI,SAAS,UAAU,IAAI,SAAS;AAEpC,MAAI,UAAU,IAAI,QAAQ,CAAC,YAAY;AACnC,WAAO,QAAQ,QAAQ,QAAQ,WAAS,QAAQ,KAAK,CAAC;AAAA,EAC1D,CAAC;AAED,UAAQ,SAAS;AAEjB,SAAO;AACX;AAKA,2BAAkC,MAAM;AACpC,MAAI,CAAC,SAAS,eAAe,iBAAiB,KAAK,QAAQ;AAE3D,MAAI,UAAU;AAAA,IACV,QAAQ;AAAA,IACR,MAAM,KAAK,UAAU;AAAA,MACjB,QAAQ,aAAa;AAAA,MACrB,YAAY;AAAA,IAChB,CAAC;AAAA,IACD,SAAS;AAAA,MACL,gBAAgB;AAAA,MAChB,cAAc;AAAA,IAClB;AAAA,EACJ;AAEA,MAAI,mBAAmB,CAAC;AACxB,MAAI,gBAAgB,CAAC;AACrB,MAAI,mBAAmB,CAAC;AAExB,MAAI,UAAU,CAAC,QAAQ,iBAAiB,QAAQ,OAAK,EAAE,GAAG,CAAC;AAC3D,MAAI,OAAO,CAAC,QAAQ,cAAc,QAAQ,OAAK,EAAE,GAAG,CAAC;AACrD,MAAI,UAAU,CAAC,QAAQ,iBAAiB,QAAQ,OAAK,EAAE,GAAG,CAAC;AAE3D,MAAI,gBAAgB,QAAQ,mBAAmB,OAAO;AAEtD,MAAI,YAAY,aAAa;AAE7B,UAAQ,WAAW;AAAA,IACf,KAAK;AAAA,IACL;AAAA,IACA,SAAS,QAAQ;AAAA,IACjB,SAAS,OAAK,iBAAiB,KAAK,CAAC;AAAA,IACrC,SAAS,OAAK,iBAAiB,KAAK,CAAC;AAAA,IACrC,MAAM,OAAK,cAAc,KAAK,CAAC;AAAA,EACnC,CAAC;AAED,MAAI;AAEJ,MAAI;AACA,eAAW,MAAM,MAAM,WAAW,OAAO;AAAA,EAC7C,SAAS,GAAP;AAKE,kBAAc,EAAE,SAAS,MAAM,QAAQ,KAAK,CAAC;AAE7C,kBAAc;AAEd,SAAK;AAAA,MACD,QAAQ;AAAA,MACR,SAAS;AAAA,MACT,gBAAgB,MAAM;AAAA,MAAC;AAAA,IAC3B,CAAC;AAED;AAAA,EACJ;AAEA,MAAI,gBAAgB;AAAA,IAChB,QAAQ,SAAS;AAAA,IACjB;AAAA,EACJ;AAEA,UAAQ,aAAa;AAErB,aAAW,cAAc;AAEzB,MAAI,UAAU,MAAM,SAAS,KAAK;AAGlC,MAAI,CAAE,SAAS,IAAI;AACf,kBAAc,EAAE,SAAS,MAAM,QAAQ,KAAK,CAAC;AAE7C,QAAI,iBAAiB;AAErB,kBAAc;AAEd,SAAK;AAAA,MACD,QAAQ,SAAS;AAAA,MACjB;AAAA,MACA,gBAAgB,MAAM,iBAAiB;AAAA,IAC3C,CAAC;AAED,QAAI;AAAgB;AAEpB,QAAI,SAAS,WAAW,KAAK;AACzB,uBAAiB;AAAA,IACrB;AAEA,WAAO,iBAAiB,OAAO;AAAA,EACnC;AAOA,MAAI,SAAS,YAAY;AACrB,WAAO,SAAS,OAAO,SAAS;AAAA,EACpC;AAQA,MAAI,kBAAkB,OAAO,GAAG;AAC5B,QAAI;AACJ,KAAC,MAAM,OAAO,IAAI,qBAAqB,OAAO;AAE9C,kBAAc,IAAI;AAElB,kBAAc,EAAE,SAAS,MAAM,QAAQ,KAAK,CAAC;AAAA,EACjD,OAAO;AACH,kBAAc,EAAE,SAAS,QAAQ,MAAM,CAAC;AAAA,EAC5C;AAEA,MAAI,EAAE,yBAAY,WAAW,KAAK,MAAM,OAAO;AAE/C,QAAM,aAAa,qBAAqB,EAAE,yBAAY,OAAO,CAAC;AAE9D,QAAM,cAAc,WAAU;AAE9B,UAAQ,EAAE,QAAQ,SAAS,QAAQ,MAAM,KAAK,MAAM,OAAO,EAAE,CAAC;AAClE;AAEA,4BAA4B;AACxB,UACI,6DACJ,KAAK,OAAO,SAAS,OAAO;AAChC;AAEA,0BAA0B,SAAS;AAC/B,MAAI,OAAO;AAEX,gBAAc,IAAI;AACtB;;;AC/KA,uBAAmB;AAGnB,IAAI,aAAa,CAAC;AAClB,IAAI;AAEJ,sBAAsB,MAAM,UAAU,YAAY,MAAM;AACpD,aAAW,QAAQ;AACvB;AAEA,sBAAsB,UAAU;AAC5B,aAAW;AACf;AAIA,IAAI,UAAU;AAAA,EACV,MAAM;AAAA,EACN,MAAM;AAAA,EACN,MAAM;AAAA,EACN,OAAO;AAAA,EACP,OAAO;AAAA,EACP,QAAQ;AAAA,EACR,QAAQ;AAAA,EACR,UAAU;AAAA,EACV,SAAS;AAAA,EACT,YAAY;AAAA,EACZ,YAAY;AAAA,EACZ,cAAc;AAAA,EACd,gBAAgB;AAAA,EAChB,UAAU;AAAA,EACV,kBAAkB;AAAA,EAClB,gBAAgB;AAAA,EAChB,gBAAgB;AACpB;AAEO,4BAA4B,WAAW,OAAO;AACjD,SAAO,IAAI,MAAM,CAAC,GAAG;AAAA,IACjB,IAAI,QAAQ,UAAU;AAClB,UAAI,aAAa;AAAc,eAAO;AAEtC,UAAI,YAAY,SAAS;AACrB,eAAO,YAAY,WAAW,QAAQ,SAAS;AAAA,MACnD,WAAW,YAAY,YAAY;AAC/B,eAAO,YAAY,WAAW,QAAQ;AAAA,MAC1C,WAAW,YAAY,OAAO;AAC1B,eAAO,MAAM;AAAA,MACjB,WAAW,CAAE,CAAC,MAAM,EAAE,SAAS,QAAQ,GAAG;AACtC,eAAO,YAAY,SAAS,EAAE,QAAQ;AAAA,MAC1C;AAAA,IACJ;AAAA,IAEA,IAAI,QAAQ,UAAU,OAAO;AACzB,UAAI,YAAY,OAAO;AACnB,cAAM,YAAY;AAAA,MACtB;AAEA,aAAO;AAAA,IACX;AAAA,EACJ,CAAC;AACL;AAEA,qBAAqB,WAAW,MAAM;AAClC,SAAO,WAAW,MAAM,SAAS;AACrC;AAEA,qBAAqB,WAAW;AAC5B,SAAO,SAAS,SAAS;AAC7B;AAEA,yBAAO,MAAM,QAAQ,CAAC,IAAI,EAAE,cAAc;AAGtC,MAAI;AAKJ,SAAO,IAAI,MAAM,CAAC,GAAG;AAAA,IACjB,IAAI,QAAQ,UAAU;AAClB,UAAI,CAAE;AAAW,oBAAY,iBAAiB,EAAE;AAEhD,UAAI,CAAC,aAAa,UAAU,EAAE,SAAS,QAAQ,GAAG;AAC9C,eAAO,yBAAyB,WAAW,OAAO;AAAA,MACtD;AAEA,aAAO,UAAU,MAAM;AAAA,IAC3B;AAAA,IAEA,IAAI,QAAQ,UAAU,OAAO;AACzB,UAAI,CAAE;AAAW,oBAAY,iBAAiB,EAAE;AAEhD,gBAAU,MAAM,YAAY;AAE5B,aAAO;AAAA,IACX;AAAA,EACJ,CAAC;AACL,CAAC;AAED,aAAa,cAAc,CAAC,cAAc,SAAS;AAEnD,aAAa,QAAQ,CAAC,cAAc,CAAC,UAAU,WAAW,SAAS,QAAQ,WAAW,UAAU,WAAW,UAAU,WAAW,QAAQ,CAAC;AAEzI,aAAa,OAAO,CAAC,cAAc;AAC/B,SAAO,UAAU;AACrB,CAAC;AAED,aAAa,OAAO,CAAC,cAAc;AAC/B,SAAO,UAAU;AACrB,CAAC;AAED,aAAa,QAAQ,CAAC,cAAc,OAAO,UAAU,OAAO,OAAO,SAAS;AACxE,UAAQ,UAAU,UAAU,UAAU,KAAK;AAI3C,MAAI,MAAM;AACN,cAAU,YAAY,UAAU,KAAK;AAErC,WAAO,MAAM,cAAc,SAAS;AAAA,EACxC;AAEA,SAAO,QAAQ,QAAQ;AAC3B,CAAC;AAED,aAAa,SAAS,CAAC,cAAc,OAAO,WAAW,WAAW;AAC9D,SAAO,MAAM,UAAU,MAAM,QAAQ,GAAG,MAAM;AAClD,CAAC;AAED,aAAa,aAAa,CAAC,cAAc,CAAC,MAAM,OAAO,UAAU;AAC7D,SAAO,yBAAyB,SAAS,EAAE,MAAM,IAAI;AACzD,CAAC;AAED,aAAa,WAAW,CAAC,cAAc,CAAC,MAAM,OAAO,SAAS;AAC1D,SAAO,UAAU,MAAM,IAAI,MAAM,CAAE,UAAU,MAAM,IAAI,IAAI,GAAG,IAAI;AACtE,CAAC;AAED,aAAa,UAAU,CAAC,cAAc,CAAC,MAAM,aAAa;AACtD,MAAI,SAAS,MAAM;AACf,WAAO,QAAQ,UAAU,UAAU,IAAI;AAAA,EAC3C;AAEA,MAAI,UAAU,yBAAO,MAAM,QAAQ,QAAQ;AAE3C,YAAU,WAAW,OAAO;AAChC,CAAC;AAED,aAAa,YAAY,CAAC,cAAc,UAAU,MAAM,OAAO;AAC/D,aAAa,WAAW,CAAC,cAAc,YAAY,MAAM,cAAc,SAAS,CAAC;AAEjF,aAAa,OAAO,CAAC,cAAc,IAAI,WAAW,QAAO,WAAW,GAAG,MAAM,CAAC;AAE9E,aAAa,SAAS,CAAC,cAAc,CAAC,MAAM,aAAa;AACrD,MAAI,SAAS,GAAK,MAAM,CAAC,EAAC,WAAW,kBAAkB,aAAY;AAE/D,QAAI,kBAAkB;AAAW,aAAO,SAAS,MAAM;AAGvD,QAAI,cAAc,OAAO,UAAU;AAAI,aAAO,SAAS,EAAC,WAAW,eAAe,GAAG,OAAM,CAAC;AAAA,EAChG,CAAC;AAED,YAAU,WAAW,MAAM;AAG3B,SAAO;AACX,CAAC;AAED,aAAa,aAAa,CAAC,cAAc,IAAI,WAAW,UAAS,WAAW,GAAG,MAAM,CAAC;AACtF,aAAa,iBAAiB,CAAC,cAAc,IAAI,WAAW,aAAa,WAAW,GAAG,MAAM,CAAC;AAC9F,aAAa,eAAe,MAAM,IAAI,WAAW,WAAW,GAAG,MAAM,CAAC;AACtE,aAAa,WAAW,CAAC,cAAc,IAAI,WAAW,OAAO,WAAW,GAAG,MAAM,CAAC;AAClF,aAAa,mBAAmB,CAAC,cAAc,IAAI,WAAW,eAAe,WAAW,GAAG,MAAM,CAAC;AAClG,aAAa,iBAAiB,CAAC,cAAc,IAAI,WAAW,aAAa,WAAW,GAAG,MAAM,CAAC;AAC9F,aAAa,iBAAiB,CAAC,cAAc,IAAI,WAAW,aAAa,WAAW,GAAG,MAAM,CAAC;AAE9F,IAAI,aAAa,oBAAI;AAErB,aAAa,WAAW,eAAa;AACjC,MAAI,WAAW,IAAI,SAAS;AAAG,WAAO,WAAW,IAAI,SAAS,EAAE;AAEhE,MAAI,SAAS,UAAU;AAEvB,aAAW,IAAI,WAAW,MAAM;AAEhC,SAAO,OAAO;AAClB,CAAC;AAED,IAAI,oBAAoB,oBAAI;AAErB,wBAAwB,WAAW,QAAQ,UAAU;AACxD,MAAI,CAAE,kBAAkB,IAAI,SAAS,GAAG;AACpC,sBAAkB,IAAI,WAAW,CAAC,CAAC;AAAA,EACvC;AAEA,MAAI,MAAM,kBAAkB,IAAI,SAAS;AAEzC,MAAI,UAAU;AAEd,oBAAkB,IAAI,WAAW,GAAG;AACxC;AAEA,aAAa,CAAC,cAAc,CAAC,aAAa,UAAU,WAAW;AAI3D,MAAI,OAAO,WAAW,KAAK,OAAO,cAAc,OAAO;AACnD,aAAS,CAAC;AAAA,EACd;AAEA,MAAI,kBAAkB,IAAI,SAAS,GAAG;AAClC,QAAI,YAAY,kBAAkB,IAAI,SAAS;AAE/C,QAAI,OAAO,UAAU,cAAc,YAAY;AAC3C,aAAO,UAAU,UAAU,MAAM;AAAA,IACrC;AAAA,EACJ;AAEA,SAAO,MAAM,YAAY,WAAW,UAAU,MAAM;AACxD,CAAC;;;AC3NM,IAAM,YAAN,MAAgB;AAAA,EACnB,YAAY,IAAI;AACZ,QAAI,GAAG;AAAY,YAAM;AAEzB,OAAG,aAAa;AAEhB,SAAK,KAAK;AAEV,SAAK,KAAK,GAAG,aAAa,SAAS;AAEnC,SAAK,eAAe,KAAK;AAEzB,SAAK,kBAAkB,GAAG,aAAa,eAAe;AAEtD,SAAK,WAAW,KAAK,MAAM,KAAK,eAAe;AAE/C,QAAI,CAAE,KAAK,UAAU;AACjB,YAAM,qDAAqD,KAAK;AAAA,IACpE;AAEA,SAAK,OAAO,KAAK,SAAS,KAAK;AAE/B,SAAK,UAAU,KAAK,MAAM,GAAG,aAAa,cAAc,CAAC;AACzD,SAAK,kBAAkB,UAAU,KAAK,OAAO;AAG7C,SAAK,YAAY,YAAY,UAAU,KAAK,SAAS,IAAI,CAAC;AAE1D,SAAK,YAAY,YAAY,UAAU,KAAK,SAAS,IAAI,CAAC;AAE1D,SAAK,WAAW,OAAO,SAAS,KAAK,SAAS;AAE9C,SAAK,gBAAgB,CAAC;AAGtB,SAAK,QAAQ,mBAAmB,MAAM,KAAK,QAAQ;AAEnD,SAAK,WAAW,CAAC;AAGjB,SAAK,eAAe,KAAK,OAAO;AAAA,EACpC;AAAA,EAEA,iBAAiB,iBAAiB,SAAS,UAAU,CAAC,GAAG;AACrD,QAAI,WAAW,KAAK,MAAM,eAAe;AAEzC,QAAI,eAAe,UAAU,KAAK,SAAS;AAC3C,QAAI,sBAAsB,KAAK,aAAa,cAAc,OAAO;AAEjE,QAAI,eAAe,YAAY,UAAU,SAAS,IAAI,CAAC;AAEvD,QAAI,QAAQ,KAAK,qBAAqB,YAAY;AAElD,SAAK,kBAAkB;AAEvB,SAAK,WAAW;AAEhB,SAAK,UAAU;AAEf,SAAK,YAAY,YAAY,UAAU,SAAS,IAAI,CAAC;AAErD,QAAI,UAAU,YAAY,UAAU,SAAS,IAAI,CAAC;AAElD,WAAO,QAAQ,KAAK,EAAE,QAAQ,CAAC,CAAC,KAAK,WAAW;AAC5C,UAAI,UAAU,IAAI,MAAM,GAAG,EAAE;AAC7B,WAAK,SAAS,WAAW,QAAQ;AAAA,IACrC,CAAC;AAOD,WAAO;AAAA,EACX;AAAA,EAEA,YAAY,cAAc,OAAO;AAI7B,SAAK,cAAc,gBAAgB;AAAA,EACvC;AAAA,EAEA,mBAAmB,OAAM;AAIrB,WAAO,QAAQ,KAAK,aAAa,EAAE,QAAQ,CAAC,CAAC,WAAW,iBAAiB;AACrE,aAAO,QAAQ,KAAI,EAAE,QAAQ,CAAC,CAAC,SAAS,eAAe;AACnD,YAAI,QAAQ,WAAW,WAAW,GAAG;AACjC,iBAAO,MAAK;AAAA,QAChB;AAAA,MACJ,CAAC;AAED,YAAK,aAAa;AAAA,IACtB,CAAC;AAED,SAAK,gBAAgB,CAAC;AAEtB,WAAO;AAAA,EACX;AAAA,EAEA,aAAa,QAAQ,SAAS;AAC1B,aAAS,OAAO,SAAS;AACrB,cAAQ,QAAQ,KAAK,QAAQ,IAAI;AAAA,IACrC;AAEA,WAAO;AAAA,EACX;AAAA,EAEA,aAAa,UAAU,MAAM;AACzB,QAAI,UAAU,EAAE,GAAG,KAAK,SAAS,KAAI;AAErC,SAAK,iBAAiB,KAAK,UAAU,QAAQ,GAAG,OAAO;AAEvD,SAAK,eAAe,EAAE,KAAK,CAAC;AAAA,EAChC;AAAA,EAOA,eAAe,SAAS;AAEpB,YAAQ,WAAW,MAAM,OAAO;AAEhC,YAAQ,UAAU;AAAA,MACd,WAAW;AAAA,MACX;AAAA,MACA,SAAS,OAAK,KAAK,WAAW,CAAC;AAAA,IACnC,CAAC;AAAA,EACL;AAAA,EAEA,IAAI,WAAW;AACX,QAAI,OAAO,KAAK,SAAS;AACzB,QAAI,WAAW,OAAO,OAAO,KAAK,QAAQ,EAAE,IAAI,OAAK,EAAE,EAAE;AAEzD,WAAO,SAAS,IAAI,QAAM,cAAc,EAAE,CAAC;AAAA,EAC/C;AAAA,EAEA,IAAI,SAAS;AACT,WAAO,iBAAiB,KAAK,GAAG,aAAa;AAAA,EACjD;AAAA,EAEA,sCAAsC;AAClC,QAAI,KAAK,KAAK;AAEd,OAAG,aAAa,iBAAiB,KAAK,eAAe;AAGrD,QAAI,UAAU,KAAK,gBAAgB,YAC7B,EAAE,WAAW,KAAK,gBAAgB,UAAU,IAC5C,CAAC;AAGP,QAAI,KAAK,gBAAgB,KAAK;AAC1B,cAAQ,MAAM,KAAK,gBAAgB;AAAA,IACvC;AAGA,QAAI,KAAK,gBAAgB,SAAS;AAC9B,cAAQ,UAAU,KAAK,gBAAgB;AAAA,IAC3C;AAEA,OAAG,aAAa,gBAAgB,KAAK,UAAU,OAAO,CAAC;AAAA,EAC3D;AAAA,EAEA,WAAW,SAAS;AAChB,SAAK,SAAS,KAAK,OAAO;AAAA,EAC9B;AAAA,EAEA,UAAU;AACN,WAAO,KAAK,GAAG;AAEf,WAAO,KAAK,SAAS,SAAS,GAAG;AAC7B,WAAK,SAAS,IAAI,EAAE;AAAA,IACxB;AAAA,EACJ;AACJ;;;ACrLA,IAAI,aAAa,CAAC;AAEX,uBAAuB,IAAI;AAC9B,MAAI,YAAY,IAAI,UAAU,EAAE;AAEhC,MAAI,WAAW,UAAU;AAAK,UAAM;AAEpC,MAAI,UAAU,CAAC,MAAM,UAAU,WAAW,CAAC;AAE3C,UAAQ,kBAAkB,EAAE,WAAW,QAAQ,CAAC;AAEhD,aAAW,UAAU,MAAM;AAE3B,SAAO;AACX;AAEO,0BAA0B,IAAI;AACjC,MAAI,YAAY,WAAW;AAE3B,MAAI,CAAE;AAAW;AAEjB,YAAU,QAAQ;AAElB,SAAO,WAAW;AACtB;AAMO,uBAAuB,IAAI;AAC9B,MAAI,YAAY,WAAW;AAE3B,MAAI,CAAE;AAAW,UAAM,0BAA0B;AAEjD,SAAO;AACX;AAEO,0BAA0B,IAAI,SAAS,MAAM;AAChD,MAAI,cAAc,OAAO,YAAY,IAAI,OAAK,EAAE,UAAU;AAE1D,MAAI,CAAE,aAAa;AACf,QAAI;AAAQ,YAAM;AAElB;AAAA,EACJ;AAEA,SAAO,YAAY;AACvB;AAEO,0BAA0B,MAAM;AACnC,SAAO,OAAO,OAAO,UAAU,EAAE,OAAO,eAAa;AACjD,WAAO,QAAQ,UAAU;AAAA,EAC7B,CAAC;AACL;AAEO,mBAAmB,MAAM;AAC5B,SAAO,iBAAiB,IAAI,EAAE,IAAI,OAAK,EAAE,KAAK;AAClD;AAEO,cAAc,IAAI;AACrB,MAAI,YAAY,WAAW;AAE3B,SAAO,aAAa,UAAU;AAClC;AAEO,iBAAiB;AACpB,SAAO,OAAO,OAAO,UAAU,EAAE,GAAG;AACxC;AAEO,eAAe;AAClB,SAAO,OAAO,OAAO,UAAU;AACnC;;;ACzEO,mBAAkB,WAAW,MAAM,QAAQ;AAC9C,gBAAc,UAAU,IAAI,MAAM,MAAM;AAC5C;AAEO,wBAAwB,MAAM,QAAQ;AACzC,gBAAc,QAAQ,MAAM,MAAM;AACtC;AAEO,sBAAsB,WAAW,MAAM,QAAQ;AAClD,gBAAc,UAAU,IAAI,MAAM,QAAQ,KAAK;AACnD;AAEO,oBAAoB,eAAe,MAAM,QAAQ;AACpD,MAAI,UAAU,iBAAiB,aAAa;AAE5C,UAAQ,QAAQ,YAAU;AACtB,kBAAc,OAAO,IAAI,MAAM,QAAQ,KAAK;AAAA,EAChD,CAAC;AACL;AAEO,iBAAgB,WAAW,MAAM,UAAU;AAC9C,YAAU,GAAG,iBAAiB,MAAM,OAAK;AACrC,aAAS,EAAE,MAAM;AAAA,EACrB,CAAC;AACL;AAEO,aAAY,WAAW,UAAU;AACpC,MAAI,UAAU,CAAC,MAAM;AAEjB,QAAI,CAAE,EAAE;AAAY;AAEpB,aAAS,EAAE,MAAM;AAAA,EACrB;AAEA,SAAO,iBAAiB,WAAW,OAAO;AAE1C,SAAO,MAAM;AACT,WAAO,oBAAoB,WAAW,OAAO;AAAA,EACjD;AACJ;AAEA,uBAAuB,QAAQ,MAAM,QAAQ,UAAU,MAAM;AACzD,MAAI,IAAI,IAAI,YAAY,MAAM,EAAE,SAAS,QAAQ,OAAO,CAAC;AAEzD,IAAE,aAAa,EAAE,MAAM,QAAQ,YAAY,CAAC,EAAE;AAE9C,SAAO,cAAc,CAAC;AAC1B;;;AC/CA,IAAI,uBAAuB,oBAAI;AAExB,qCAAqC,eAAe;AACvD,SAAO,cAAc,MAAM,IAAI,OAAO,OAAO,CAAC;AAClD;AAEO,0BAA0B,IAAI,MAAM;AACvC,MAAI,CAAC,UAAU,aAAa,KAAK,QAAQ,IAAI,OAAO,OAAO,GAAG,EAAE,EAAE,MAAM,GAAG;AAE3E,SAAO,IAAI,UAAU,OAAO,WAAW,MAAM,EAAE;AACnD;AAEO,mBAAmB,MAAM,UAAU;AAEtC,MAAI,qBAAqB,IAAI,IAAI;AAAG;AAEpC,uBAAqB,IAAI,IAAI;AAE7B,KAAG,kBAAkB,CAAC,EAAE,IAAI,WAAW,uBAAW,cAAc;AAC5D,QAAI,WAAU,UAAU,MAAM;AAC1B,eAAS;AAAA,QACL;AAAA,QAAI;AAAA,QAAW;AAAA,QAAW,OAAO,UAAU;AAAA,QAAO;AAAA,MACtD,CAAC;AAAA,IACL;AAAA,EACJ,CAAC;AACL;AAEO,yBAAyB,MAAM,UAAU;AAE5C,MAAI,qBAAqB,IAAI,IAAI;AAAG;AAEpC,uBAAqB,IAAI,IAAI;AAE7B,KAAG,yBAAyB,CAAC,EAAE,IAAI,uBAAW,cAAc;AACxD,QAAI,WAAU,UAAU,MAAM;AAC1B,eAAS,EAAE,IAAI,uBAAW,QAAQ,CAAC;AAAA,IACvC;AAAA,EACJ,CAAC;AACL;AAEO,uBAAuB,IAAI;AAC9B,SAAO,IAAI,iBAAiB,EAAE;AAClC;AAEO,0CAA0C,MAAM;AACnD,SAAO,qBAAqB,IAAI,IAAI;AACxC;AAEA,IAAM,mBAAN,MAAuB;AAAA,EACnB,YAAY,IAAI;AACZ,SAAK,KAAK;AACV,SAAK,aAAa,KAAK,6BAA6B;AAAA,EACxD;AAAA,EAEA,MAAM;AACF,WAAO,KAAK;AAAA,EAChB;AAAA,EAEA,IAAI,OAAO;AACP,WAAO,KAAK,WAAW,IAAI,gBAAa,WAAU,KAAK,EAAE,SAAS,KAAK;AAAA,EAC3E;AAAA,EAEA,QAAQ,OAAO;AACX,WAAO,CAAE,KAAK,IAAI,KAAK;AAAA,EAC3B;AAAA,EAEA,IAAI,OAAO;AACP,WAAO,KAAK,WAAW,KAAK,gBAAa,WAAU,UAAU,KAAK;AAAA,EACtE;AAAA,EAEA,+BAA+B;AAC3B,WAAO,MAAM,KAAK,KAAK,GAAG,kBAAkB,EAEvC,OAAO,UAAQ,4BAA4B,IAAI,CAAC,EAEhD,IAAI,UAAQ,iBAAiB,KAAK,IAAI,IAAI,CAAC,CAAC;AAAA,EACrD;AACJ;AAEO,IAAM,YAAN,MAAgB;AAAA,EACnB,YAAY,OAAO,WAAW,SAAS,IAAI;AACvC,SAAK,UAAU,KAAK,MAAM;AAC1B,SAAK,KAAK;AACV,SAAK;AAEL,SAAK,QAAQ;AACb,SAAK,YAAY;AACjB,SAAK,aAAa,KAAK,GAAG,aAAa,KAAK,OAAO;AAAA,EACvD;AAAA,EAEA,IAAI,SAAS;AACT,UAAM,EAAE,WAAW,KAAK,wBAAwB,KAAK,UAAU;AAE/D,WAAO;AAAA,EACX;AAAA,EAEA,IAAI,SAAS;AACT,UAAM,EAAE,WAAW,KAAK,wBAAwB,KAAK,UAAU;AAE/D,WAAO;AAAA,EACX;AAAA,EAEA,wBAAwB,WAAW;AAC/B,QAAI,SAAS;AACb,QAAI,SAAS,CAAC;AACd,UAAM,uBAAuB,OAAO,MAAM,gBAAgB;AAE1D,QAAI,sBAAsB;AACtB,eAAS,qBAAqB;AAI9B,UAAI,OAAO,IAAI,SAAS,UAAU;AAAA;AAAA;AAAA;AAAA;AAAA,iBAK7B,qBAAqB,KAAK;AAE/B,eAAS,KAAK,KAAK,YAAY;AAAA,IACnC;AAEA,WAAO,EAAE,QAAQ,OAAO;AAAA,EAC5B;AACJ;;;AC3HA,sBAAqB;AACrB,mBAAkB;AAClB,sBAAoB;AACpB,uBAAsB;AACtB,oBAAmB;AACnB,oBAAmB;;;ACPnB,IAAM,WAAN,MAAe;AAAA,EACX,YAAY,KAAK,MAAM;AACnB,SAAK,MAAM;AACX,SAAK,OAAO;AAAA,EAChB;AACJ;AAEA,IAAI,gBAAgB;AAAA,EAChB,YAAY;AAAA,EACZ,YAAY;AAAA,EACZ,MAAM,CAAC;AAAA,EACP,QAAQ,CAAC;AAAA,EAET,OAAO;AAAA,EAEP,IAAI,UAAU;AACV,WAAO,KAAK,OAAO,cAAc;AAAA,EACrC;AAAA,EAEA,SAAS,UAAU;AACf,QAAI,WAAW,KAAK,OAAO;AAE3B,QAAI,aAAa;AACb,YACI,sDACA;AAGR,WAAO;AAAA,EACX;AAAA,EAEA,QAAQ,KAAK,UAAU;AACnB,QAAI,KAAK,IAAI,GAAG,GAAG;AACf,WAAK,OAAO,OAAO;AAAA,IACvB,OAAO;AACH,WAAK,KAAK,KAAK,QAAQ;AAAA,IAC3B;AAAA,EACJ;AAAA,EAEA,KAAK,KAAK,UAAU;AAChB,SAAK,OAAO,OAAO;AAEnB,QAAI,QAAQ,KAAK,KAAK,QAAQ,GAAG;AAEjC,QAAI,QAAQ;AAAI,WAAK,KAAK,OAAO,OAAO,CAAC;AAEzC,SAAK,KAAK,QAAQ,GAAG;AAErB,SAAK,KAAK;AAAA,EACd;AAAA,EAEA,OAAO;AACH,aAAS,OAAO,KAAK,KAAK,OAAO,KAAK,KAAK,GAAG;AAC5C,aAAO,KAAK,OAAO;AAAA,IACrB;AAAA,EACJ;AACJ;AAEO,uEAAuE;AAG1E,MAAI,MAAM,IAAI,IAAI,OAAO,SAAS,MAAM,SAAS,OAAO;AAExD,aAAW,KAAK,SAAS,gBAAgB,SAAS;AACtD;AAEO,sEAAsE,KAAK,KAAK;AACnF,MAAI,OAAO,SAAS,gBAAgB;AAEpC,gBAAc,QAAQ,KAAK,IAAI,SAAS,KAAK,IAAI,CAAC;AACtD;AAEO,6CACH,kBACA,YACF;AACE,MAAI;AAEJ,mBAAiB,OAAM,YAAW,CAAE;AAEpC,SAAO,iBAAiB,YAAY,OAAK;AACrC,QAAI,QAAQ,EAAE,SAAS,CAAC;AAExB,QAAI,SAAS,MAAM,UAAU,CAAC;AAI9B,QAAI,OAAO,KAAK,KAAK,EAAE,WAAW;AAAG;AAErC,QAAI,CAAE,OAAO;AAAa;AAE1B,QAAI,cAAc,IAAI,OAAO,WAAW,GAAG;AACvC,UAAI,WAAW,cAAc,SAAS,OAAO,WAAW;AAExD,iBAAW,SAAS,MAAM,SAAS,KAAK,cAAc,YAAY,cAAc,UAAU;AAAA,IAC9F,OAAO;AACH,gBAAS,OAAO,GAAG;AAAA,IACvB;AAAA,EACJ,CAAC;AACL;AAEO,yDACH,MACA,aACF;AACE,UAAQ,aAAa,IAAI;AAC7B;AAEO,iBAAiB,KAAK,MAAM;AAC/B,YAAU,aAAa,KAAK,IAAI;AACpC;AAEO,oBAAoB,KAAK,MAAM;AAClC,YAAU,gBAAgB,KAAK,IAAI;AACvC;AAEA,mBAAmB,QAAQ,KAAK,MAAM;AAClC,MAAI,MAAM,IAAI,SAAS,IAAI,MAAM,KAAK,OAAO;AAE7C,aAAW,cACL,cAAc,KAAK,KAAK,IAAI,SAAS,KAAK,IAAI,CAAC,IAC/C,cAAc,QAAQ,MAAO,cAAc,cAAc,KAAM,IAAI,SAAS,KAAK,IAAI,CAAC;AAE5F,MAAI,QAAQ,QAAQ,SAAS,CAAC;AAE9B,MAAI,CAAC,MAAM;AAAQ,UAAM,SAAS,CAAC;AAEnC,QAAM,OAAO,cAAc;AAC3B,QAAM,OAAO,MAAM,IAAI,SAAS;AAEhC,MAAI;AAEA,YAAQ,QAAQ,OAAO,KAAK,UAAU,SAAS,KAAK,GAAG,GAAG;AAE1D,kBAAc,aAAa;AAC3B,kBAAc,aAAa;AAAA,EAC/B,SAAS,QAAP;AACE,QAAI,kBAAiB,gBAAgB,OAAM,SAAS,iBAAiB;AACjE,cAAQ,MACJ,mFACI,GACR;AAAA,IACJ;AAEA,YAAQ,MAAM,MAAK;AAAA,EACvB;AACJ;;;AClJO,+BAA+B,IAAI,UAAU;AAChD,MAAI,sBAAsB,OAAK,CAAE,EAAE;AACnC,MAAI,sBAAsB,OAAM,EAAE,QAAQ,KAAO,EAAE,UAAY,EAAE,WAAa,EAAE,WAAa,EAAE;AAC/F,MAAI,qBAAqB,CAAC,MAAO,EAAE,UAAU,MAAQ,EAAE,UAAY,EAAE,WAAa,EAAE,WAAa,EAAE;AAEnG,KAAG,iBAAiB,SAAS,OAAK;AAE9B,QAAI,oBAAoB,CAAC,GAAG;AACxB,QAAE,eAAe;AAEjB,eAAS,kBAAgB,aAAa,CAAC;AAEvC;AAAA,IACJ;AAGA,QAAI,oBAAoB,CAAC;AAAG;AAG5B,MAAE,eAAe;AAAA,EACrB,CAAC;AAED,KAAG,iBAAiB,aAAa,OAAK;AAElC,QAAI,oBAAoB,CAAC;AAAG;AAE5B,MAAE,eAAe;AAEjB,aAAS,CAAC,iBAAiB;AACvB,UAAI,UAAU,QAAK;AACf,WAAE,eAAe;AAEjB,qBAAa;AAEb,WAAG,oBAAoB,WAAW,OAAO;AAAA,MAC7C;AAEA,SAAG,iBAAiB,WAAW,OAAO;AAAA,IAC1C,CAAC;AAAA,EACL,CAAC;AAED,KAAG,iBAAiB,WAAW,OAAK;AAEhC,QAAI,mBAAmB,CAAC;AAAG;AAE3B,MAAE,eAAe;AAEjB,aAAS,kBAAgB,aAAa,CAAC;AAAA,EAC3C,CAAC;AACL;AAEO,kCAAkC,IAAI,KAAK,IAAI,UAAU;AAC5D,KAAG,iBAAiB,cAAc,OAAK;AACnC,QAAI,UAAU,WAAW,MAAM;AAC3B,eAAS,CAAC;AAAA,IACd,GAAG,EAAE;AAEL,QAAI,UAAU,MAAM;AAChB,mBAAa,OAAO;AACpB,SAAG,oBAAoB,cAAc,OAAO;AAAA,IAChD;AAEA,OAAG,iBAAiB,cAAc,OAAO;AAAA,EAC7C,CAAC;AACL;AAEO,oCAAoC,QAAQ;AAC/C,SAAO,0BAA0B,OAAO,aAAa,MAAM,CAAC;AAChE;AAEO,mCAAmC,WAAW;AACjD,SAAO,cAAc,QAAQ,IAAI,IAAI,WAAW,SAAS,OAAO;AACpE;AAEO,mCAAmC,WAAW;AACjD,SAAO,UAAU,WAAW,UAAU,SAAS,UAAU;AAC7D;;;AC1EO,mBAAmB,aAAa,UAAU;AAC7C,MAAI,MAAM,0BAA0B,WAAW;AAE/C,eAAa,KAAK,CAAC,MAAM,qBAAqB;AAC1C,aAAS,MAAM,gBAAgB;AAAA,EACnC,CAAC;AACL;AAEO,sBAAsB,KAAK,UAAU;AACxC,MAAI,UAAU;AAAA,IACV,SAAS;AAAA,MACL,uBAAuB;AAAA,IAC3B;AAAA,EACJ;AAEA,UAAQ,oBAAoB;AAAA,IACxB,KAAK;AAAA,IACL;AAAA,EACJ,CAAC;AAED,MAAI;AAEJ,QAAM,KAAK,OAAO,EAAE,KAAK,cAAY;AACjC,QAAI,cAAc,0BAA0B,GAAG;AAC/C,uBAAmB,0BAA0B,SAAS,GAAG;AAGzD,QAAK,YAAY,WAAW,YAAY,WAAa,iBAAiB,WAAW,iBAAiB,QAAS;AAIvG,uBAAiB,OAAO,YAAY;AAAA,IACxC;AAEA,WAAO,SAAS,KAAK;AAAA,EACzB,CAAC,EAAE,KAAK,UAAQ;AACZ,aAAS,MAAM,gBAAgB;AAAA,EACnC,CAAC;AACL;;;ACrCA,IAAI,aAAa,CAAC;AAEX,sBAAsB,aAAa,UAAU;AAChD,MAAI,MAAM,0BAA0B,WAAW;AAE/C,MAAI,WAAW;AAAM;AAErB,aAAW,OAAO,EAAE,UAAU,OAAO,MAAM,MAAM,cAAc,MAAM;AAAA,EAAC,EAAE;AAExE,eAAa,KAAK,CAAC,MAAM,cAAc;AACnC,aAAS,MAAM,SAAS;AAAA,EAC5B,CAAC;AACL;AAEO,qDAAqD,MAAM,aAAa,kBAAkB;AAC7F,MAAI,QAAQ,WAAW,0BAA0B,WAAW;AAC5D,QAAM,OAAO;AACb,QAAM,WAAW;AACjB,QAAM,mBAAmB;AACzB,QAAM,aAAa;AACvB;AAEO,2BAA2B,aAAa,SAAS,oBAAoB;AACxE,MAAI,MAAM,0BAA0B,WAAW;AAE/C,MAAI,CAAE,WAAW;AAAM,WAAO,mBAAmB;AAEjD,MAAI,WAAW,KAAK,UAAU;AAC1B,QAAI,OAAO,WAAW,KAAK;AAC3B,QAAI,mBAAmB,WAAW,KAAK;AAEvC,WAAO,WAAW;AAElB,WAAO,QAAQ,MAAM,gBAAgB;AAAA,EACzC,OAAO;AACH,eAAW,KAAK,eAAe,MAAM;AACjC,UAAI,OAAO,WAAW,KAAK;AAC3B,UAAI,mBAAmB,WAAW,KAAK;AAEvC,aAAO,WAAW;AAElB,cAAQ,MAAM,gBAAgB;AAAA,IAClC;AAAA,EACJ;AACJ;;;AChDA,uBAAmB;AAEZ,kCAAkC,aAAa;AAGlD,2BAAO,UAAU,MAAM;AACnB,gBAAY,iBAAiB,0BAA0B,EAAE,QAAQ,OAAK,EAAE,YAAY,OAAO,CAAC;AAAA,EAChG,CAAC;AACL;AAEO,+CAA+C,MAAM;AAGxD,2BAAO,UAAU,MAAM;AACnB,SAAK,iBAAiB,wBAAwB,EAAE,QAAQ,OAAK,EAAE,OAAO,CAAC;AAAA,EAC3E,CAAC;AACL;AAEO,kCAAkC,aAAa;AAGlD,2BAAO,KAAK,aAAa,CAAC,IAAI,SAAS;AACnC,QAAI,CAAE,GAAG;AAAa;AAEtB,OAAG,mBAAmB;AAEtB,SAAK;AAAA,EACT,CAAC;AACL;AAEO,0BAA0B,IAAI;AACjC,SAAO,GAAG,aAAa,sBAAsB;AACjD;;;AC/BO,4DAA4D;AAC/D,WAAS,KAAK,aAAa,iBAAiB,SAAS,KAAK,UAAU;AACpE,WAAS,KAAK,aAAa,iBAAiB,SAAS,KAAK,SAAS;AAEnE,WAAS,iBAAiB,CAAC,yBAAyB,iBAAiB,CAAC,EAAE,QAAQ,QAAM;AAClF,OAAG,aAAa,iBAAiB,GAAG,UAAU;AAC9C,OAAG,aAAa,iBAAiB,GAAG,SAAS;AAAA,EACjD,CAAC;AACL;AAEO,8CAA8C;AACjD,MAAI,SAAS,QAAM;AACf,QAAI,CAAE,GAAG,aAAa,eAAe,GAAG;AACpC,aAAO,SAAS,EAAE,KAAK,GAAG,MAAM,GAAG,UAAU,UAAU,CAAC;AAAA,IAC5D,OAAO;AACH,SAAG,SAAS;AAAA,QACR,KAAK,OAAO,GAAG,aAAa,eAAe,CAAC;AAAA,QAC5C,MAAM,OAAO,GAAG,aAAa,eAAe,CAAC;AAAA,QAC7C,UAAU;AAAA,MACd,CAAC;AACD,SAAG,gBAAgB,eAAe;AAClC,SAAG,gBAAgB,eAAe;AAAA,IACtC;AAAA,EACJ;AAEA,iBAAe,MAAM;AACjB,mBAAe,MAAM;AACjB,aAAO,SAAS,IAAI;AAEpB,eAAS,iBAAiB,CAAC,yBAAyB,iBAAiB,CAAC,EAAE,QAAQ,MAAM;AAAA,IAC1F,CAAC;AAAA,EACL,CAAC;AACL;;;ACjCA,uBAAmB;AAEnB,IAAI,MAAM,CAAC;AAEJ,yCAAyC,UAAU;AACtD,QAAM,CAAC;AAEP,WAAS,iBAAiB,aAAa,EAAE,QAAQ,OAAK;AAClD,QAAI,EAAE,aAAa,WAAW,KAAK;AAEnC,aAAS,CAAC;AAEV,6BAAO,UAAU,MAAM;AACnB,QAAE,OAAO;AAAA,IACb,CAAC;AAAA,EACL,CAAC;AACL;AAEO,mCAAmC,UAAU;AAChD,MAAI,eAAe,CAAC;AAEpB,WAAS,iBAAiB,aAAa,EAAE,QAAQ,OAAK;AAClD,QAAI,MAAM,IAAI,EAAE,aAAa,WAAW;AAGxC,QAAI,CAAE;AAAK;AAEX,iBAAa,KAAK,EAAE,aAAa,WAAW,CAAC;AAE7C,QAAI,kBAAkB;AAEtB,aAAS,KAAK,CAAC;AAEf,6BAAO,UAAU,MAAM;AACnB,QAAE,YAAY,GAAG;AAAA,IACrB,CAAC;AAAA,EACL,CAAC;AAED,SAAO,QAAQ,GAAG,EAAE,QAAQ,CAAC,CAAC,KAAK,QAAQ;AACvC,QAAI,aAAa,SAAS,GAAG;AAAG;AAGhC,6BAAO,YAAY,EAAE;AAAA,EACzB,CAAC;AAGD,QAAM,CAAC;AACX;AAEO,4BAA4B,IAAI;AACnC,SAAO,GAAG,aAAa,WAAW;AACtC;;;ACnDA,uBAAsB;AAGtB,yBAAU,UAAU;AAAA,EAChB,SAAS;AAAA,EACT,cAAc;AAAA,EACd,aAAa;AAAA,EACb,QAAQ;AACZ,CAAC;AAED,aAAa;AAEb,IAAI,aAAa;AAEV,mCAAmC;AACtC,eAAa;AAGb,aAAW,MAAM;AACb,QAAI,CAAE;AAAY;AAElB,6BAAU,MAAM;AAAA,EACpB,GAAG,GAAG;AACV;AAEO,oCAAoC;AACvC,eAAa;AAEb,2BAAU,KAAK;AACnB;AAEO,8CAA8C;AACjD,2BAAU,OAAO;AACrB;AAEA,wBAAwB;AACpB,MAAI,QAAQ,SAAS,cAAc,OAAO;AAE1C,QAAM,YAAY;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AA4ElB,MAAI,SAAQ,SAAS;AAErB,MAAI;AAAO,UAAM,QAAQ;AAEzB,WAAS,KAAK,YAAY,KAAK;AACnC;;;ACtHO,iCAAiC,aAAa;AACjD,MAAI,CAAC,mBAAmB;AAAG;AAE3B,cAAY,iBAAiB,eAAe,EAAE,QAAQ,QAAM;AACxD,OAAG,aAAa,8BAA8B,EAAE;AAEhD,QAAI,aAAa,GAAG,cAAc;AAGlC,OAAG,oBAAoB,WAAW,IAAI,eAAc;AAAA,MAChD,WAAW,UAAU,OAAO,aAAa;AAAA,MACzC,SAAS;AAAA,QACL,UAAU,UAAU,OAAO,UAAU,EAAE;AAAA,QACvC,QAAQ,UAAU,OAAO,UAAU,EAAE;AAAA,QACrC,MAAM,UAAU,OAAO,UAAU,EAAE;AAAA,QACnC,YAAY,UAAU,OAAO,UAAU,EAAE;AAAA,MAC7C;AAAA,MACA,aAAa,UAAU;AAAA,MACvB,WAAW,UAAU;AAAA,IACzB,EAAE;AAEF,eAAW,QAAQ,OAAK,EAAE,MAAM,CAAC;AAAA,EACrC,CAAC;AACL;AAEO,iCAAiC,aAAa;AACjD,MAAI,CAAC,mBAAmB;AAAG;AAE3B,cAAY,iBAAiB,8BAA8B,EAAE,QAAQ,QAAM;AACvE,OAAG,gBAAgB,4BAA4B;AAG/C,mBAAe,MAAM;AACjB,UAAI,CAAE,GAAG;AAAa;AAGtB,SAAG,YAAY;AAGf,SAAG,cAAc,EAAE,QAAQ,OAAK,EAAE,OAAO,CAAC;AAG1C,UAAI,GAAG,mBAAmB;AACtB,WAAG,kBAAkB,QAAQ,CAAC,EAAC,WAAW,SAAS,aAAa,KAAK,gBAAe;AAChF,cAAI,YAAY,GAAG,QAAQ,WAAW,OAAO;AAE7C,oBAAU,cAAc;AAAA,QAC5B,CAAC;AAED,eAAO,GAAG;AAAA,MACd;AAAA,IACJ,CAAC;AAAA,EACL,CAAC;AACL;AAEA,8BAA8B;AAC1B,SAAO,OAAO,SAAS,cAAc,KAAK,EAAE,gBAAgB;AAChE;;;AC1DA,IAAI,yBAAyB,CAAC;AAE9B,IAAI,uCAAuC;AAAA,EACvC;AAAA,EACA;AACJ;AAEO,oCAAoC,MAAM,SAAS;AACtD,MAAI,cAAe,IAAI,UAAU,EAAG,gBAAgB,MAAM,WAAW;AACrE,MAAI,UAAU,SAAS,UAAU,YAAY,IAAI;AACjD,MAAI,UAAU,SAAS,UAAU,YAAY,IAAI;AAEjD,2BAAyB,uBAAuB,OAAO,MAAM,KAAK,SAAS,KAAK,iBAAiB,QAAQ,CAAC,EAAE,IAAI,OAAK;AACjH,WAAO,WAAW,iBAAiB,EAAE,WAAW,oCAAoC,CAAC;AAAA,EACzF,CAAC,CAAC;AAEF,MAAI,+BAA+B,MAAM;AAAA,EAAC;AAE1C,eAAa,OAAO,EAAE,QAAQ,MAAM;AAChC,iCAA6B;AAAA,EACjC,CAAC;AAED,6BAA2B,SAAS,sBAAsB;AAE1D,MAAI,UAAU,SAAS;AAEvB,WAAS,KAAK,YAAY,OAAO;AAEjC,SAAO,YAAY,OAAO;AAE1B,UAAQ,OAAK,+BAA+B,CAAC;AACjD;AAEA,oCAAoC,SAAS,yBAAwB;AACjE,UAAQ,iBAAiB,QAAQ,EAAE,QAAQ,OAAK;AAE5C,QAAI,EAAE,aAAa,oBAAoB,GAAG;AAKtC,UAAI,OAAO,WACP,iBAAiB,EAAE,WAAW,oCAAoC,CACtE;AAEA,UAAI,wBAAuB,SAAS,IAAI;AAAG;AAAA,IAC/C;AAEA,MAAE,YAAY,eAAe,CAAC,CAAC;AAAA,EACnC,CAAC;AACL;AAEA,sBAAsB,SAAS;AAC3B,MAAI,WAAW,MAAM,KAAK,SAAS,KAAK,QAAQ;AAChD,MAAI,yBAAyB,SAAS,IAAI,OAAK,EAAE,SAAS;AAG1D,MAAI,mBAAmB,SAAS,uBAAuB;AAEvD,MAAI,sBAAsB,CAAC;AAE3B,MAAI,wBAAwB,CAAC;AAE7B,WAAS,SAAS,MAAM,KAAK,QAAQ,QAAQ,GAAG;AAC5C,QAAI,QAAQ,KAAK,GAAG;AAChB,UAAI,CAAE,uBAAuB,SAAS,MAAM,SAAS,GAAG;AACpD,YAAI,UAAU,KAAK,GAAG;AAClB,cAAI,wCAAwC,OAAO,QAAQ,GAAG;AAC1D,uBAAW,MAAM,OAAO,SAAS,OAAO,CAAC;AAAA,UAC7C;AAAA,QACJ;AAEA,YAAI,SAAS,KAAK,GAAG;AACjB,cAAI;AACA,kCAAsB,KAClB,uCACI,eAAe,KAAK,CACxB,CACJ;AAAA,UACJ,SAAS,QAAP;AAAA,UAKF;AAAA,QACJ,OAAO;AACH,mBAAS,KAAK,YAAY,KAAK;AAAA,QACnC;AAAA,MACJ,OAAO;AACH,yBAAiB,YAAY,KAAK;AAAA,MACtC;AAEA,0BAAoB,KAAK,KAAK;AAAA,IAClC;AAAA,EACJ;AAeA,WAAS,SAAS,MAAM,KAAK,SAAS,KAAK,QAAQ,GAAG;AAClD,QAAI,CAAE,QAAQ,KAAK;AAAG,YAAM,OAAO;AAAA,EACvC;AAGA,WAAS,SAAS,MAAM,KAAK,QAAQ,QAAQ,GAAG;AAC5C,QAAI,MAAM,QAAQ,YAAY,MAAM;AAAY;AAEhD,aAAS,KAAK,YAAY,KAAK;AAAA,EACnC;AAEA,SAAO,QAAQ,IAAI,qBAAqB;AAC5C;AAEA,sDAAsD,QAAQ;AAC1D,SAAO,IAAI,QAAQ,CAAC,SAAS,WAAW;AAGpC,QAAI,OAAO,KAAK;AACZ,aAAO,SAAS,MAAM,QAAQ;AAC9B,aAAO,UAAU,MAAM,OAAO;AAAA,IAClC,OAAO;AACH,cAAQ;AAAA,IACZ;AAEA,aAAS,KAAK,YAAY,MAAM;AAAA,EACpC,CAAC;AACL;AAEA,wBAAwB,IAAI;AACxB,MAAI,SAAS,SAAS,cAAc,QAAQ;AAE5C,SAAO,cAAc,GAAG;AACxB,SAAO,QAAQ,GAAG;AAElB,WAAS,QAAQ,GAAG,YAAY;AAC5B,WAAO,aAAa,KAAK,MAAM,KAAK,KAAK;AAAA,EAC7C;AAEA,SAAO;AACX;AAEA,mBAAmB,IAAI;AACnB,SAAO,GAAG,aAAa,qBAAqB;AAChD;AAEA,iDAAiD,IAAI,qBAAqB;AACtE,MAAI,CAAC,KAAK,eAAe,yBAAyB,EAAE;AAEpD,SAAO,oBAAoB,KAAK,WAAS;AACrC,QAAI,CAAE,UAAU,KAAK;AAAG,aAAO;AAE/B,QAAI,CAAC,YAAY,sBAAsB,yBAAyB,KAAK;AAGrE,QAAI,eAAe,OAAO,gBAAgB;AAAoB,aAAO;AAAA,EACzE,CAAC;AACL;AAEA,kCAAkC,IAAI;AAClC,MAAI,MAAM,SAAS,EAAE,IAAI,GAAG,MAAM,GAAG;AAErC,SAAO,IAAI,MAAM,GAAG;AACxB;AAEA,iBAAiB,IAAI;AACjB,SAAQ,GAAG,QAAQ,YAAY,MAAM,UAAU,GAAG,aAAa,KAAK,EAAE,YAAY,MAAM,gBACjF,GAAG,QAAQ,YAAY,MAAM,WAC7B,GAAG,QAAQ,YAAY,MAAM;AACxC;AAEA,kBAAkB,IAAM;AACpB,SAAO,GAAG,QAAQ,YAAY,MAAM;AACxC;AAEA,oBAAoB,KAAK;AACrB,SAAO,IAAI,MAAM,EAAE,EAAE,OAAO,CAAC,GAAG,MAAM;AAClC,QAAM,MAAK,KAAK,IAAK,EAAE,WAAW,CAAC;AAEnC,WAAO,IAAI;AAAA,EACf,GAAG,CAAC;AACR;AAEA,0BAA0B,SAAS,oBAAoB;AACnD,MAAI,SAAS;AAEb,qBAAmB,QAAQ,UAAQ;AAG/B,UAAM,QAAQ,IAAI,OAAO,GAAG,gBAAgB,gBAAgB,GAAG;AAE/D,aAAS,OAAO,QAAQ,OAAO,EAAE;AAAA,EACrC,CAAC;AAGD,WAAS,OAAO,WAAW,KAAK,EAAE;AAElC,SAAO,OAAO,KAAK;AACvB;;;ACpMA,IAAI,gBAAgB;AACpB,IAAI,kBAAkB;AACtB,IAAI,gBAAgB;AACpB,IAAI,YAAY;AAED,0BAAU,UAAQ;AAE7B,WAAO,WAAW,CAAC,QAAQ;AACvB,QAAI,cAAc,0BAA0B,GAAG;AAE/C,QAAI,YAAY,qCAAqC,mBAAmB;AAAA,MACpE,KAAK;AAAA,MAAa,SAAS;AAAA,MAAO,QAAQ;AAAA,IAC7C,CAAC;AAEF,QAAI;AAAW;AAEf,eAAW,WAAW;AAAA,EAC1B;AAEA,WAAO,SAAS,qBAAqB,MAAM;AACvC,sBAAkB;AAAA,EACtB;AAEA,WAAO,gBAAgB,MAAM,IAAI,SAAO,SAAS,UAAU,IAAI;AAE/D,WAAO,UAAU,YAAY,CAAC,IAAI,EAAE,gBAAgB;AAChD,QAAI,wBAAwB,UAAU,SAAS,OAAO;AAEtD,6BAAyB,yBAAyB,IAAI,IAAI,MAAM;AAC5D,UAAI,cAAc,2BAA2B,EAAE;AAE/C,UAAI,CAAE;AAAa;AAEnB,mBAAa,aAAa,CAAC,MAAM,qBAAqB;AAClD,oDAA4C,MAAM,aAAa,gBAAgB;AAAA,MACnF,CAAC;AAAA,IACL,CAAC;AAED,0BAAsB,IAAI,CAAC,qBAAqB;AAC5C,UAAI,cAAc,2BAA2B,EAAE;AAE/C,UAAI,CAAE;AAAa;AAEnB,mBAAa,aAAa,CAAC,MAAM,qBAAqB;AAClD,oDAA4C,MAAM,aAAa,gBAAgB;AAAA,MACnF,CAAC;AAED,uBAAiB,MAAM;AACnB,YAAI,YAAY,qCAAqC,mBAAmB;AAAA,UACpE,KAAK;AAAA,UAAa,SAAS;AAAA,UAAO,QAAQ;AAAA,QAC7C,CAAC;AAEF,YAAI;AAAW;AAEf,mBAAW,WAAW;AAAA,MAC1B,CAAC;AAAA,IACL,CAAC;AAAA,EACL,CAAC;AAED,sBAAoB,aAAa,2BAA2B,MAAM;AAC9D,uBAAmB,wBAAwB;AAE3C,iCAA6B,aAAa,CAAC,MAAM,qBAAqB;AAClE,2CAAqC,mBAAmB;AAExD,uBAAiB,iDAAiD;AAElE,yBAAmB,yBAAyB;AAE5C,qEAA+D;AAE/D,kEAA4D;AAE5D,2CAAqC,UAAQ,qBAAmB;AAC5D,yBAAiB,gCAAgC,iBAAe;AAC5D,mCAAyB,WAAW;AACpC,kCAAwB,WAAW;AAAA,QACvC,CAAC;AAED,YAAI,0BAA0B;AAC1B,0DAAgD,MAAM,gBAAgB;AAAA,QAC1E,OAAO;AACH,qBAAW,kBAAkB,IAAI;AAAA,QACrC;AAEA,mCAA2B,MAAM,CAAC,kCAAkC;AAChE,gDAAsC,SAAS,IAAI;AAEnD,2BAAiB,0BAA0B,CAAC,aAAa,YAAY;AACjE,qCAAyB,WAAW;AACpC,oCAAwB,WAAW;AAAA,UACvC,CAAC;AAED,6CAAmC;AAEnC,wCAA8B,MAAM;AAChC,4BAAgB,MAAM;AAClB,yBAAW,MAAM;AACb,6BAAa,2CAA2C;AAAA,cAC5D,CAAC;AAED,8CAAgC,QAAM;AAEtC,mDAAqC,kBAAkB;AAAA,YAC3D,CAAC;AAAA,UACL,CAAC;AAAA,QACL,CAAC;AAAA,MACL,CAAC;AAAA,IACL,CAAC;AAAA,EACL;AAEA,sCACI,CAAC,yCAAyC;AACtC,yCAAqC,CAAC,QAAQ;AAC1C,UAAI,cAAc,0BAA0B,GAAG;AAE/C,UAAI,YAAY,qCAAqC,mBAAmB;AAAA,QACpE,KAAK;AAAA,QAAa,SAAS;AAAA,QAAM,QAAQ;AAAA,MAC5C,CAAC;AAEF,UAAI;AAAW;AAEf,UAAI,2BAA2B;AAE/B,iBAAW,aAAa,wBAAwB;AAAA,IACpD,CAAC;AAAA,EACL,GACA,CAAC,MAAM,KAAK,gBAAgB,mBAAmB;AAC3C,QAAI,cAAc,0BAA0B,GAAG;AAE/C,QAAI,YAAY,qCAAqC,mBAAmB;AAAA,MACpE,KAAK;AAAA,MAAa,SAAS;AAAA,MAAM,QAAQ;AAAA,IAC7C,CAAC;AAED,QAAI;AAAW;AAIf,qDAAiD;AAGjD,yCAAqC,mBAAmB;AAIxD,iEAA6D,gBAAgB,cAAc;AAE3F,yCAAqC,UAAQ,qBAAmB;AAC5D,uBAAiB,gCAAgC,iBAAe;AAC5D,iCAAyB,WAAW;AACpC,gCAAwB,WAAW;AAAA,MACvC,CAAC;AAED,iCAA2B,MAAM,MAAM;AACnC,2CAAmC;AAEnC,8CAAsC,SAAS,IAAI;AAEnD,yBAAiB,0BAA0B,CAAC,aAAa,YAAY;AACjE,mCAAyB,WAAW;AACpC,kCAAwB,WAAW;AAAA,QACvC,CAAC;AAED,2CAAmC;AAEnC,wBAAgB,MAAM;AAClB,uBAAa,2CAA2C;AAExD,0CAAgC,QAAM;AAEtC,+CAAqC,kBAAkB;AAAA,QAC3D,CAAC;AAAA,MACL,CAAC;AAAA,IACL,CAAC;AAAA,EACL,CACJ;AAIA,aAAW,MAAM;AACb,yCAAqC,kBAAkB;AAAA,EAC3D,CAAC;AACL;AAEA,sCAAsC,iBAAiB,UAAU;AAC7D,oBAAkB,iBAAiB,UAAU,MAAM;AAC/C,cAAU,iBAAiB,QAAQ;AAAA,EACvC,CAAC;AACL;AAEA,8CAA8C,UAAQ,UAAU;AAC5D,WAAO,uBAAuB;AAE9B,WAAS,CAAC,iBAAiB;AACvB,aAAO,wBAAwB;AAE/B,mBAAe,MAAM;AACjB,mBAAa;AAAA,IACjB,CAAC;AAAA,EACL,CAAC;AACL;AAEA,8CAA8C,MAAM,QAAQ;AACxD,MAAI,QAAQ,IAAI,YAAY,MAAM;AAAA,IAC9B,YAAY;AAAA,IACZ,SAAS;AAAA,IACT;AAAA,EACJ,CAAC;AAED,WAAS,cAAc,KAAK;AAE5B,SAAO,MAAM;AACjB;AAEA,yCAAyC,UAAQ;AAC7C,WAAO,SAAS,SAAS,MAAM,QAAW,CAAC,IAAI,SAAS;AACpD,QAAI,GAAG;AAAiB,WAAK;AAAA,EACjC,CAAC;AACL;AAEA,sDAAsD;AAClD,WAAS,cAAc,aAAa,KAAK,SAAS,cAAc,aAAa,EAAE,MAAM;AACzF;AAEA,0EAA0E;AAEtE,MAAI,SAAS,SAAU,MAAM,UAAU;AACnC,WAAO,KAAK,MAAM,CAAC,IAAI,SAAS;AAC5B,UAAI,mBAAmB,EAAE;AAAG,aAAK;AACjC,UAAI,iBAAiB,EAAE;AAAG,aAAK;AAAA;AAC1B,iBAAS,IAAI,IAAI;AAAA,IAC1B,CAAC;AAAA,EACL;AAKA,SAAO,YAAY,SAAS,MAAM,MAAM;AAC5C;;;ACvPe,kBAAiB,UAAQ;AACpC,WAAO,MAAM,eAAe,CAAC,IAAI,EAAE,kBAAmB;AAClD,QAAI;AACJ,QAAI,aAAa;AACjB,QAAI,UAAU;AAEd,WAAO,YAAY,CAAC,kBAAkB,QAAQ,QAAQ,MAAM,QAAQ;AAChE,UAAI,WAAW,SAAS;AAExB,UAAI,EAAE,SAAS,mBAAS,aAAM,QAAQ,MAAM,UAAU,kBAAkB,UAAU;AAElF,aAAO,OAAO;AAEd,UAAI,CAAE,SAAS;AACX,iBAAO,OAAO,MAAM,SAAQ,OAAO,CAAC,CAAC;AAAA,MACzC,OAAO;AACH,iBAAO,OAAO,MAAM,MAAK,OAAO,CAAC,CAAC;AAElC,YAAI,OAAM,aAAY;AAClB,iBAAO,QAAQ;AAEf,cAAI,gCAAgC,MAAM,QAAQ,QAAQ;AAE1D,gBAAM,8BAA8B;AAAA,QACxC,CAAC;AAAA,MACL;AAEA,aAAO;AAAA,IACX,GAAG,UAAQ;AACP,WAAK,aAAa,MAAM;AAAE,qBAAa;AAAM,eAAO;AAAA,MAAK;AACzD,WAAK,UAAU,MAAM;AAAE,kBAAU;AAAM,eAAO;AAAA,MAAK;AACnD,WAAK,KAAK,SAAO;AAAE,gBAAQ;AAAK,eAAO;AAAA,MAAK;AAAA,IAChD,CAAC;AAAA,EACL,CAAC;AAED,WAAO,UAAU,EAAE,MAAM;AAC7B;AAEO,eAAe,MAAM,kBAAkB,aAAa,OAAO,SAAS,MAAM;AAC7E,MAAI,EAAE,KAAK,KAAK,KAAK,WAAW,iBAAiB;AAEjD,MAAI,MAAM,IAAI,IAAI,OAAO,SAAS,IAAI;AACtC,MAAI,0BAA0B,IAAI,KAAK,IAAI;AAC3C,MAAI,eAAe,0BAA0B,IAAI,KAAK,IAAI,IAAI;AAC9D,MAAI,mBAAmB,KAAK,UAAU,YAAY;AAClD,MAAI,kBAAkB,CAAC,OAAO,MAAM,MAAS,EAAE,SAAS,MAAM,IAAI,mBAAmB,KAAK,UAAU,MAAM;AAE1G,MAAI,4BAA4B,CAAC,aAAa,KAAK,UAAU,QAAQ,MAAM;AAC3E,MAAI,2BAA2B,CAAC,aAAc,KAAK,UAAU,QAAQ,MAAM;AAE3E,MAAI;AAAY,UAAM,IAAI,KAAK,MAAM,YAAY;AAEjD,UAAQ,KAAK,MAAM,EAAE,OAAO,aAAa,CAAC;AAE1C,MAAI,OAAO;AAEX,MAAI,SAAS,CAAC,UAAU,aAAa;AACjC,QAAI;AAAM;AAEV,QAAI,OAAM,IAAI,IAAI,OAAO,SAAS,IAAI;AAGtC,QAAI,CAAE,cAAc,CAAE,2BAA2B,0BAA0B,QAAQ,GAAG;AAClF,aAAM,OAAO,MAAK,IAAI;AAAA,IAI1B,WAAW,aAAa,QAAW;AAC/B,aAAM,OAAO,MAAK,IAAI;AAAA,IAC1B,WAAW,CAAE,cAAc,yBAAyB,QAAQ,GAAG;AAC3D,aAAM,OAAO,MAAK,IAAI;AAAA,IAC1B,OAAO;AACH,aAAM,IAAI,MAAK,MAAM,QAAQ;AAAA,IACjC;AAoBA,aAAS,MAAK,MAAM,EAAE,OAAO,SAAQ,CAAC;AAAA,EAC1C;AAEA,SAAO;AAAA,IACH,SAAS;AAAA,IAET,QAAQ,UAAU;AACd,aAAO,SAAS,QAAQ;AAAA,IAC5B;AAAA,IAEA,KAAK,UAAU;AACX,aAAO,MAAM,QAAQ;AAAA,IACzB;AAAA,IAEA,IAAI,UAAU;AACV,UAAI,UAAU,CAAC,MAAM;AACjB,YAAI,CAAE,EAAE,SAAS,CAAE,EAAE,MAAM;AAAQ;AAEnC,eAAO,QAAQ,EAAE,MAAM,MAAM,EAAE,QAAQ,CAAC,CAAC,OAAO,EAAE,OAAO,gBAAgB;AACrE,cAAI,UAAU;AAAM;AAEpB,iBAAO;AAKP,cAAI,SAAS,SAAS,QAAQ;AAE9B,cAAI,kBAAkB,SAAS;AAC3B,mBAAO,QAAQ,MAAM,OAAO,KAAK;AAAA,UACrC,OAAO;AACH,mBAAO;AAAA,UACX;AAAA,QACJ,CAAC;AAAA,MACL;AAEA,aAAO,iBAAiB,YAAY,OAAO;AAE3C,aAAO,MAAM,OAAO,oBAAoB,YAAY,OAAO;AAAA,IAC/D;AAAA,EACJ;AACJ;AAEA,iBAAiB,KAAK,KAAK,QAAQ;AAC/B,MAAI,QAAQ,OAAO,QAAQ,SAAS,CAAC;AAErC,MAAI,CAAE,MAAM;AAAQ,UAAM,SAAS,CAAC;AAEpC,QAAM,OAAO,OAAO,OAAO,MAAM;AAEjC,SAAO,QAAQ,aAAa,OAAO,IAAI,IAAI,SAAS,CAAC;AACzD;AAEA,cAAc,KAAK,KAAK,QAAQ;AAC5B,MAAI,QAAQ,OAAO,QAAQ,SAAS,CAAC;AAErC,MAAI,CAAE,MAAM;AAAQ,UAAM,SAAS,CAAC;AAEpC,UAAQ,EAAE,QAAQ,EAAC,GAAG,MAAM,QAAQ,GAAG,EAAC,CAAC,MAAM,OAAO,MAAM,EAAC,EAAC,EAAE;AAEhE,SAAO,QAAQ,UAAU,OAAO,IAAI,IAAI,SAAS,CAAC;AACtD;AAEA,gBAAgB,QAAQ;AACpB,MAAI,WAAW;AAAW,WAAO;AAEjC,SAAO,KAAK,MAAM,KAAK,UAAU,MAAM,CAAC;AAC5C;AAEA,4BAA4B;AACxB,SAAO;AAAA,IACH,IAAI,KAAK,KAAK;AACV,UAAI,SAAS,IAAI;AAEjB,UAAI,CAAE;AAAQ,eAAO;AAErB,UAAI,OAAO,gBAAgB,QAAQ,GAAG;AAEtC,aAAO,OAAO,KAAK,IAAI,EAAE,SAAS,GAAG;AAAA,IACzC;AAAA,IACA,IAAI,KAAK,KAAK;AACV,UAAI,SAAS,IAAI;AAEjB,UAAI,CAAE;AAAQ,eAAO;AAErB,UAAI,OAAO,gBAAgB,QAAQ,GAAG;AAEtC,aAAO,KAAK;AAAA,IAChB;AAAA,IACA,IAAI,KAAK,KAAK,OAAO;AACjB,UAAI,OAAO,gBAAgB,IAAI,QAAQ,GAAG;AAE1C,WAAK,OAAO,WAAW,OAAO,KAAK,CAAC;AAEpC,UAAI,SAAS,cAAc,IAAI;AAE/B,aAAO;AAAA,IACX;AAAA,IACA,OAAO,KAAK,KAAK;AACb,UAAI,OAAO,gBAAgB,IAAI,QAAQ,GAAG;AAE1C,aAAO,KAAK;AAEZ,UAAI,SAAS,cAAc,IAAI;AAE/B,aAAO;AAAA,IACX;AAAA,EACJ;AACJ;AAEA,oBAAoB,OAAO;AACvB,MAAI,CAAE,UAAU,KAAK;AAAG,WAAO;AAE/B,WAAS,OAAO,OAAO;AACnB,QAAI,MAAM,SAAS;AAAM,aAAO,MAAM;AAAA;AACjC,YAAM,OAAO,WAAW,MAAM,IAAI;AAAA,EAC3C;AAEA,SAAO;AACX;AAIA,uBAAuB,MAAM;AACzB,MAAI,aAAY,CAAC,YAAY,OAAO,YAAY,YAAY,YAAY;AAExE,MAAI,0BAA0B,CAAC,OAAM,WAAU,CAAC,GAAG,UAAU,OAAO;AAChE,WAAO,QAAQ,KAAI,EAAE,QAAQ,CAAC,CAAC,MAAM,YAAY;AAC7C,UAAI,MAAM,YAAY,KAAK,OAAO,GAAG,WAAW;AAEhD,UAAI,WAAW,MAAM;AACjB,iBAAQ,OAAO;AAAA,MACnB,WAAW,CAAE,WAAU,MAAM,GAAG;AAC5B,iBAAQ,OAAO,mBAAmB,MAAM,EACnC,WAAW,OAAO,GAAG,EACrB,WAAW,OAAO,GAAG;AAAA,MAC9B,OAAO;AACH,mBAAU,EAAC,GAAG,UAAS,GAAG,wBAAwB,QAAQ,UAAS,GAAG,EAAC;AAAA,MAC3E;AAAA,IACJ,CAAC;AAED,WAAO;AAAA,EACX;AAEA,MAAI,UAAU,wBAAwB,IAAI;AAE1C,SAAO,OAAO,QAAQ,OAAO,EAAE,IAAI,CAAC,CAAC,KAAK,WAAW,GAAG,OAAO,OAAO,EAAE,KAAK,GAAG;AACpF;AAIA,yBAAyB,QAAQ,UAAU;AACvC,WAAS,OAAO,QAAQ,KAAK,EAAE;AAE/B,MAAI,WAAW;AAAI,WAAO,CAAC;AAE3B,MAAI,gCAAgC,CAAC,KAAK,OAAO,UAAS;AACtD,QAAI,CAAC,QAAO,WAAW,QAAQ,IAAI,MAAM,GAAG;AAG5C,QAAI,CAAE;AAAQ,aAAO,MAAK,OAAO;AAGjC,QAAI,MAAK,YAAW,QAAW;AAC3B,YAAK,UAAS,MAAM,MAAM,IAAI,CAAC,IAAI,CAAC;AAAA,IACxC;AAGA,kCAA8B,CAAC,QAAQ,GAAG,IAAI,EAAE,KAAK,GAAG,GAAG,OAAO,MAAK,OAAM;AAAA,EACjF;AAEA,MAAI,UAAU,OAAO,MAAM,GAAG,EAAE,IAAI,OAAK,EAAE,MAAM,GAAG,CAAC;AAKrD,MAAI,OAAO,uBAAO,OAAO,IAAI;AAE7B,UAAQ,QAAQ,CAAC,CAAC,KAAK,WAAW;AAE9B,QAAK,OAAO,SAAS;AAAc;AAEnC,YAAQ,mBAAmB,MAAM,WAAW,KAAK,KAAK,CAAC;AAEvD,QAAI,aAAa,mBAAmB,GAAG;AAEvC,QAAI,yBAAyB,WAAW,SAAS,GAAG,KAAK,WAAW,WAAW,QAAQ;AAEvF,QAAI,CAAC,wBAAwB;AACzB,WAAK,OAAO;AAAA,IAChB,OAAO;AAEH,UAAI,gBAAgB,WAAW,WAAW,KAAK,GAAG,EAAE,WAAW,KAAK,EAAE;AAEtE,oCAA8B,eAAe,OAAO,IAAI;AAAA,IAC5D;AAAA,EACJ,CAAC;AAED,SAAO;AACX;;;AZ3RA,mBAAkB;AAClB,kBAAiB;AACjB,uBAAmB;AAGZ,iBAAiB;AACpB,aAAW,MAAM,kCAAkC,CAAC;AAEpD,WAAS,UAAU,eAAe;AAClC,WAAS,UAAU,uBAAuB;AAE1C,2BAAO,OAAO,oBAAK;AACnB,2BAAO,OAAO,QAAO;AACrB,2BAAO,OAAO,wBAAS;AACvB,2BAAO,OAAO,qBAAM;AACpB,2BAAO,OAAO,uBAAQ;AACtB,2BAAO,OAAO,qBAAM;AACpB,2BAAO,OAAO,oBAAK;AACnB,2BAAO,OAAO,uBAAO;AACrB,2BAAO,OAAO,gBAAQ;AACtB,2BAAO,OAAO,mBAAI;AAElB,2BAAO,gBAAgB,MAAM,aAAa;AAE1C,2BAAO,kBAAkB,CAAC,IAAI,eAAe;AAGzC,QAAI,CAAE,MAAM,KAAK,UAAU,EAAE,KAAK,eAAa,4BAA4B,UAAU,IAAI,CAAC;AAAG;AAE7F,QAAI,YAAY,iBAAiB,IAAI,KAAK;AAE1C,QAAI,CAAE;AAAW;AAEjB,eAAW,QAAQ,eAAa;AAC5B,UAAI,CAAE,4BAA4B,UAAU,IAAI;AAAG;AAEnD,UAAI,aAAY,iBAAiB,IAAI,UAAU,IAAI;AAEnD,cAAQ,kBAAkB,EAAE,IAAI,WAAW,uBAAW,SAAS,CAAC,aAAa;AACzE,iCAAO,mBAAmB,IAAI,WAAU,KAAK,QAAQ;AAAA,MACzD,EAAE,CAAC;AAAA,IACP,CAAC;AAAA,EACL,CAAC;AAED,2BAAO,cACH,yBAAO,gBAAgB,QAAM;AAGzB,QAAI,CAAE,MAAM,KAAK,GAAG,UAAU,EAAE,KAAK,eAAa,4BAA4B,UAAU,IAAI,CAAC;AAAG;AAEhG,QAAI,GAAG,aAAa,SAAS,GAAG;AAC5B,UAAI,aAAY,cAAc,EAAE;AAEhC,+BAAO,mBAAmB,IAAI,WAAW,MAAM;AAC3C,yBAAiB,WAAU,EAAE;AAAA,MACjC,CAAC;AAAA,IACL;AAEA,QAAI,aAAa,MAAM,KAAK,GAAG,kBAAkB,CAAC,EAC7C,OAAO,UAAQ,4BAA4B,IAAI,CAAC,EAChD,IAAI,UAAQ,iBAAiB,IAAI,IAAI,CAAC;AAE3C,eAAW,QAAQ,gBAAa;AAC5B,cAAQ,yBAAyB,EAAE,IAAI,uBAAW,SAAS,CAAC,aAAa;AACrE,iCAAO,mBAAmB,IAAI,WAAU,KAAK,QAAQ;AAAA,MACzD,EAAE,CAAC;AAAA,IACP,CAAC;AAED,QAAI,YAAY,iBAAiB,IAAI,KAAK;AAE1C,QAAI,WAAW;AACX,cAAQ,gBAAgB,EAAE,IAAI,UAAU,CAAC;AAEzC,iBAAW,QAAQ,gBAAa;AAC5B,gBAAQ,kBAAkB,EAAE,IAAI,WAAW,uBAAW,SAAS,CAAC,aAAa;AACzE,mCAAO,mBAAmB,IAAI,WAAU,KAAK,QAAQ;AAAA,QACzD,EAAE,CAAC;AAAA,MACP,CAAC;AAAA,IACL;AAAA,EACJ,CAAC,CACL;AAEA,2BAAO,MAAM;AAEb,aAAW,MAAM,OAAO,SAAS,0BAA0B,IAAI;AAE/D,WAAS,UAAU,sBAAsB;AAC7C;AAEA,6CAA6C;AACzC,MAAI,KAAK,SAAS,cAAc,oCAAoC;AAGpE,MAAI,CAAE;AAAI;AAOV,MAAI,aAAa,GAAG,QAAQ,aAAa;AAEzC,MAAI,YAAY;AACZ,YAAQ,KAAK,sGAAsG,UAAU;AAAA,EACjI;AACJ;;;Aa/GA,wBAAmB;;;ACHnB,GAAK,UAAU,CAAC,EAAE,WAAW,cAAc;AACvC,oBAAkB,WAAW,QAAQ,aAAa,CAAC,CAAC;AACxD,CAAC;AAED,2BAA2B,WAAW,YAAW;AAC7C,aAAU,QAAQ,UAAQ;AAEtB,QAAI,UAAU,CAAC,MAAM;AACjB,UAAI,EAAE;AAAY,UAAE,WAAW,WAAW,KAAK,SAAS;AAExD,gBAAU,MAAM,KAAK,cAAc,MAAM,EAAE,UAAU,CAAC,CAAC;AAAA,IAC3D;AAEA,WAAO,iBAAiB,MAAM,OAAO;AAErC,cAAU,WAAW,MAAM,OAAO,oBAAoB,MAAM,OAAO,CAAC;AAGpE,cAAU,GAAG,iBAAiB,MAAM,CAAC,MAAM;AAEvC,UAAI,CAAE,EAAE;AAAY;AAGpB,UAAI,EAAE;AAAS;AAEf,UAAI,EAAE;AAAY,UAAE,WAAW,WAAW,KAAK,UAAU,EAAE;AAE3D,gBAAU,MAAM,KAAK,cAAc,MAAM,EAAE,UAAU,CAAC,CAAC;AAAA,IAC3D,CAAC;AAAA,EACL,CAAC;AACL;;;AC/BA,uBAAmB;AAEnB,IAAI,kBAAkB,oBAAI;AAE1B,IAAI,iBAAiB,oBAAI;AAEzB,GAAG,qBAAqB,OAAO,EAAE,aAAa;AAC1C,MAAG,CAAE;AAAQ;AAEb,WAAS,CAAC,KAAK,UAAU,OAAO,QAAQ,MAAM,GAAG;AAC7C,UAAM,8CAA8C,KAAK,YAAY;AACjE,YAAM,yBAAyB,KAAK;AAAA,IACxC,CAAC;AAAA,EACL;AACJ,CAAC;AAID,GAAG,kBAAkB,CAAC,EAAE,gBAAgB;AACpC,MAAI,SAAS,UAAU,SAAS,KAAK;AAErC,MAAI,QAAQ;AACR,WAAO,QAAQ,CAAC,QAAQ;AACpB,UAAI,eAAe,IAAI,GAAG;AAAG;AAC7B,qBAAe,IAAI,GAAG;AAAA,IAC1B,CAAC;AAAA,EACL;AACJ,CAAC;AAED,GAAG,UAAU,CAAC,EAAE,WAAW,cAAc;AACrC,MAAI,UAAU,QAAQ;AAEtB,MAAI,SAAS;AACT,WAAO,QAAQ,OAAO,EAAE,QAAQ,CAAC,CAAC,KAAK,aAAa;AAChD,sDAAgD,WAAW,KAAK,MAAM;AAClE,YAAI,gBAAgB,wBAAwB,OAAO;AAEnD,iCAAO,0BAA0B,MAAM;AACnC,mCAAO,SAAS,UAAU,IAAI,eAAe,EAAE,SAAS,UAAU,MAAM,CAAC;AAAA,QAC7E,CAAC;AAAA,MACL,CAAC;AAAA,IACL,CAAC;AAAA,EACL;AACJ,CAAC;AAED,yDAAyD,WAAW,KAAK,UAAU;AAC/E,MAAI,gBAAgB,IAAI,SAAS,GAAG;AAChC,QAAI,kBAAiB,gBAAgB,IAAI,SAAS;AAElD,QAAI,gBAAe,SAAS,GAAG;AAAG;AAAA,EACtC;AAEA,WAAS;AAET,MAAI,CAAE,gBAAgB,IAAI,SAAS;AAAG,oBAAgB,IAAI,WAAW,CAAC,CAAC;AAEvE,MAAI,iBAAiB,gBAAgB,IAAI,SAAS;AAElD,iBAAe,KAAK,GAAG;AAEvB,kBAAgB,IAAI,WAAW,cAAc;AACjD;AAEA,iCAAiC,SAAS;AACtC,MAAI,cAAc;AAClB,MAAI,UAAU,YAAY,KAAK,OAAO;AACtC,MAAI,UAAW,WAAW,QAAQ,KAAK,QAAQ,GAAG,KAAK,IAAI;AAE3D,SAAO;AACX;AAEA,6DAA6D,KAAK,UAAU;AACxE,MAAI,eAAe,IAAI,GAAG;AAAG;AAE7B,QAAM,SAAS;AAEf,iBAAe,IAAI,GAAG;AAC1B;AAEA,wCAAwC,SAAS;AAC7C,MAAI,cAAe,IAAI,UAAU,EAAG,gBAAgB,SAAS,WAAW;AACxE,MAAI,UAAU,SAAS,UAAU,YAAY,IAAI;AAEjD,WAAS,SAAS,QAAQ,UAAU;AAChC,QAAI;AACA,YAAM,sBAAsB,KAAK;AAAA,IACrC,SAAS,QAAP;AAAA,IAKF;AAAA,EACJ;AACJ;AAEA,qCAAqC,OAAO;AACxC,SAAO,IAAI,QAAQ,CAAC,SAAS,WAAW;AACpC,QAAI,UAAS,KAAK,GAAG;AACjB,UAAI,SAAS,gBAAe,KAAK;AAIjC,UAAI,OAAO,KAAK;AACZ,eAAO,SAAS,MAAM,QAAQ;AAC9B,eAAO,UAAU,MAAM,OAAO;AAAA,MAClC,OAAO;AACH,gBAAQ;AAAA,MACZ;AAEA,eAAS,KAAK,YAAY,MAAM;AAAA,IACpC,OAAO;AACH,eAAS,KAAK,YAAY,KAAK;AAE/B,cAAQ;AAAA,IACZ;AAAA,EACJ,CAAC;AACL;AAEA,mBAAkB,IAAM;AACpB,SAAO,GAAG,QAAQ,YAAY,MAAM;AACxC;AAEA,yBAAwB,IAAI;AACxB,MAAI,SAAS,SAAS,cAAc,QAAQ;AAE5C,SAAO,cAAc,GAAG;AACxB,SAAO,QAAQ,GAAG;AAElB,WAAS,QAAQ,GAAG,YAAY;AAC5B,WAAO,aAAa,KAAK,MAAM,KAAK,KAAK;AAAA,EAC7C;AAEA,SAAO;AACX;;;ACpIA,uBAAmB;AAEnB,GAAG,UAAU,CAAC,EAAE,WAAW,cAAc;AACrC,MAAI,KAAK,QAAQ;AACjB,MAAI,MAAM,QAAQ;AAElB,MAAI,IAAI;AACJ,WAAO,QAAQ,EAAE,EAAE,QAAQ,CAAC,CAAC,QAAQ,UAAU;AAC3C,qBAAe,WAAW,QAAQ,MAAM;AACpC,iCAAO,SAAS,UAAU,IAAI,IAAI;AAAA,MACtC,CAAC;AAAA,IACL,CAAC;AAAA,EACL;AAEA,MAAI,KAAK;AACL,QAAI,QAAQ,gBAAc;AACtB,+BAAO,SAAS,UAAU,IAAI,UAAU;AAAA,IAC5C,CAAC;AAAA,EACL;AACJ,CAAC;;;ACnBD,uBAAmB;AAEZ,gBAAe,WAAW,IAAI,MAAM;AACvC,MAAI,aAAa,GAAG,gBAEd,GAAG,cAAc,QAAQ,YAAY,IACrC;AAEN,MAAI,UAAU,SAAS,cAAc,UAAU;AAE/C,UAAQ,YAAY;AACpB,MAAI;AAEJ,MAAI;AACA,sBAAkB,iBAAiB,GAAG,aAAa;AAAA,EACvD,SAAS,GAAP;AAAA,EAAW;AAEb,qBAAoB,SAAQ,aAAa;AAEzC,MAAI,KAAK,QAAQ;AAEjB,KAAG,aAAa;AAEhB,UAAQ,SAAS,EAAE,IAAI,MAAM,IAAI,UAAU,CAAC;AAE5C,2BAAO,MAAM,IAAI,IAAI;AAAA,IACjB,UAAU,CAAC,KAAI,MAAM,cAAc,SAAS;AACxC,UAAI,YAAY,GAAE;AAAG;AAErB,cAAQ,kBAAkB,EAAE,SAAI,MAAM,WAAW,MAAM,aAAa,CAAC;AAGrE,UAAI,IAAG,uBAAuB;AAAM,YAAG,YAAY,KAAK;AAExD,UAAI,IAAG,4BAA4B,MAAM;AAAE,YAAG,YAAY,KAAK;AAAW,eAAO,KAAK;AAAA,MAAG;AAEzF,UAAI,IAAG,sBAAsB;AAAM,eAAO,KAAK;AAC/C,UAAI,IAAG,2BAA2B;AAAM,qBAAa;AAGrD,UAAI,kBAAkB,GAAE,KAAK,IAAG,aAAa,SAAS,MAAM,UAAU;AAAI,eAAO,KAAK;AAKtF,UAAI,kBAAkB,GAAE;AAAG,aAAK,aAAa;AAAA,IACjD;AAAA,IAEA,SAAS,CAAC,QAAO;AACb,UAAI,YAAY,GAAE;AAAG;AAErB,cAAQ,iBAAiB,EAAE,SAAI,UAAU,CAAC;AAAA,IAC9C;AAAA,IAEA,UAAU,CAAC,KAAI,SAAS;AACpB,UAAI,YAAY,GAAE;AAAG;AAErB,cAAQ,kBAAkB,EAAE,SAAI,WAAW,KAAK,CAAC;AAAA,IACrD;AAAA,IAEA,SAAS,CAAC,QAAO;AACb,UAAI,YAAY,GAAE;AAAG;AAErB,cAAQ,iBAAiB,EAAE,SAAI,UAAU,CAAC;AAAA,IAC9C;AAAA,IAEA,QAAQ,CAAC,QAAO;AACZ,cAAQ,gBAAgB,EAAE,SAAI,UAAU,CAAC;AAAA,IAC7C;AAAA,IAEA,OAAO,CAAC,QAAO;AACX,UAAI,YAAY,GAAE;AAAG;AAErB,YAAM,qBAAqB,iBAAiB,GAAE,EAAE;AAEhD,cAAQ,eAAe,EAAE,QAAG,CAAC;AAAA,IACjC;AAAA,IAEA,KAAK,CAAC,QAAO;AACT,UAAI,YAAY,GAAE;AAAG;AAErB,aAAO,IAAG,aAAa,UAAU,IAC3B,IAAG,aAAa,UAAU,IAE5B,IAAG,aAAa,SAAS,IACnB,IAAG,aAAa,SAAS,IACzB,IAAG;AAAA,IACjB;AAAA,IAEA,WAAW;AAAA,EACf,CAAC;AAED,UAAQ,WAAW,EAAE,IAAI,UAAU,CAAC;AACxC;AAEA,qBAAqB,IAAI;AACrB,SAAO,OAAO,GAAG,iBAAiB;AACtC;AAEA,2BAA2B,IAAI;AAC3B,SAAO,GAAG,aAAa,SAAS;AACpC;;;ACpGA,GAAG,UAAU,CAAC,EAAE,WAAW,cAAc;AACrC,MAAI,OAAO,QAAQ;AACnB,MAAI,CAAE;AAAM;AAKZ,iBAAe,MAAM;AACjB,mBAAe,MAAM;AACjB,aAAM,WAAW,UAAU,IAAI,IAAI;AAAA,IACvC,CAAC;AAAA,EACL,CAAC;AACL,CAAC;;;ACZD,GAAG,UAAU,CAAC,EAAE,WAAW,cAAc;AACrC,iBAAe,WAAW,QAAQ,cAAc,CAAC,CAAC;AACtD,CAAC;AAED,wBAAwB,WAAW,YAAY;AAC3C,aAAW,QAAQ,CAAC,EAAE,MAAM,SAAS,CAAC,GAAG,cAAO,OAAO,SAAS;AAC5D,QAAI;AAAM,mBAAa,WAAW,MAAM,MAAM;AAAA,aACrC;AAAI,iBAAW,IAAI,MAAM,MAAM;AAAA;AACnC,gBAAS,WAAW,MAAM,MAAM;AAAA,EACzC,CAAC;AACL;;;ACVA,uBAAmB;AAEnB,IAAI,WAAW,IAAI;AAKnB,GAAG,kBAAkB,CAAC,EAAE,IAAI,uBAAW,SAAS,gBAAgB,WAAW,MAAM;AAC7E,MAAI,WAAU,UAAU;AAAU;AAIlC,KAAG,iBAAiB,UAAU,MAAM;AAIhC,QAAI,cAAc,WAAU,WAAW,WAAW,SAAS,IACrD,UAAU,OAAO,KACjB,UAAU;AAEhB,QAAI,WAAU,YAAY,EAAE;AAE5B,aAAS,IAAI,aAAa,QAAO;AAAA,EACrC,CAAC;AACL,CAAC,CAAC;AAEF,GAAG,UAAU,CAAC,EAAE,WAAW,cAAc;AACrC,UAAQ,MAAM;AACV,aAAS,KAAK,UAAU,IAAI,OAAK,EAAE,CAAC;AACpC,aAAS,OAAO,UAAU,EAAE;AAAA,EAChC,CAAC;AACL,CAAC;AAED,qBAAqB,QAAQ;AACzB,MAAI,QAAQ,CAAC;AAEb,2BAAO,KAAK,QAAQ,CAAC,IAAI,SAAS;AAC9B,QAAI,CAAE,OAAO,SAAS,EAAE;AAAG;AAE3B,QAAI,GAAG,aAAa,aAAa;AAAG,aAAO,KAAK;AAEhD,QAAI,mBAAmB,EAAE,GAAG;AACxB,YAAM,KAAK,aAAa,EAAE,CAAC;AAAA,IAC/B,WAAW,mBAAmB,EAAE,GAAG;AAC/B,YAAM,KAAK,aAAa,EAAE,CAAC;AAAA,IAC/B;AAAA,EACJ,CAAC;AAED,SAAO,MAAM;AACT,WAAO,MAAM,SAAS;AAAG,YAAM,MAAM,EAAE;AAAA,EAC3C;AACJ;AAEA,4BAA4B,IAAI;AAC5B,MAAI,MAAM,GAAG,QAAQ,YAAY;AAEjC,MAAI,QAAQ;AAAU,WAAO;AAC7B,MAAI,QAAQ,YAAY,GAAG,SAAS;AAAU,WAAO;AACrD,MAAI,QAAQ,WAAY,IAAG,SAAS,cAAc,GAAG,SAAS;AAAU,WAAO;AAE/E,SAAO;AACX;AAEA,4BAA4B,IAAI;AAC5B,SAAO,CAAC,SAAS,UAAU,EAAE,SAAS,GAAG,QAAQ,YAAY,CAAC;AAClE;AAEA,sBAAsB,IAAI;AACtB,MAAI,OAAO,GAAG,WACR,MAAM;AAAA,EAAC,IACP,MAAM,GAAG,WAAW;AAE1B,KAAG,WAAW;AAEd,SAAO;AACX;AAEA,sBAAsB,IAAI;AACtB,MAAI,OAAO,GAAG,WACR,MAAM;AAAA,EAAC,IACP,MAAM,GAAG,WAAW;AAE1B,KAAG,WAAW;AAEd,SAAO;AACX;;;ACpFA,GAAG,kBAAkB,CAAC,EAAE,cAAc;AAClC,UAAQ,QAAQ,YAAU;AACtB,QAAI,YAAY,OAAO;AAEvB,gCAA4B,WAAW,WAAS;AAC5C,YAAM,MAAM,QAAQ;AAAA,IACxB,CAAC;AAAA,EACL,CAAC;AACL,CAAC;AAID,GAAG,iBAAiB,CAAC,EAAE,YAAY;AAC/B,MAAI,UAAU,iBAAiB,KAAK;AAEpC,UAAQ,QAAQ,YAAU;AACtB,QAAI,YAAY,OAAO;AAEvB,gCAA4B,WAAW,WAAS;AAC5C,iCAA2B,OAAO,WAAW,KAAK;AAAA,IACtD,CAAC;AAAA,EACL,CAAC;AACL,CAAC;AAED,0BAA0B,OAAO;AAC7B,MAAI,UAAU,CAAC;AAEf,QAAM,QAAQ,UAAQ;AAClB,SAAK,QAAQ,QAAQ,YAAU;AAC3B,cAAQ,KAAK,MAAM;AAAA,IACvB,CAAC;AAAA,EACL,CAAC;AAED,SAAO;AACX;AAEA,oCAAoC,OAAO,WAAW,kBAAkB;AACpE,MAAI,OAAO,sBAAsB,OAAO,SAAS;AAEjD,MAAI,cAAc,sBAAsB,OAAO,gBAAgB;AAE/D,MAAI,gBAAgB,YAAY,sBAAsB,gBAAgB;AAGtE,cAAY,OAAO,aAAa;AAEhC,OAAK,IAAI,aAAa;AAGtB,QAAM,QAAQ,WAAQ;AAClB,QAAI,MAAK,MAAM;AAAG,YAAM,OAAO,KAAI;AAAA,EACvC,CAAC;AACL;AAEA,+BAA+B,OAAO,WAAW;AAC7C,WAAS,CAAC,KAAK,SAAS,MAAM,QAAQ,GAAG;AACrC,QAAI,KAAK,aAAa,SAAS;AAAG,aAAO;AAAA,EAC7C;AACJ;AAEA,qCAAqC,WAAW,UAAU;AACtD,kBAAgB,WAAW,WAAS;AAChC,QAAI,iBAAiB,KAAK,KAAK,yBAAyB,KAAK,GAAG;AAC5D,eAAS,KAAK;AAAA,IAClB;AAAA,EACJ,CAAC;AACL;AAEA,0BAA0B,WAAW;AACjC,MAAI,OAAO,UAAU,SAAS;AAC9B,MAAI,QAAQ,KAAK;AAEjB,SAAO,CAAC,CAAE;AACd;AAEA,kCAAkC,WAAW;AACzC,MAAI,OAAO,UAAU,SAAS;AAC9B,MAAI,WAAW,KAAK;AAEpB,SAAO,CAAC,CAAE;AACd;AAEA,yBAAyB,WAAW,UAAU;AAC1C,YAAU,SAAS,QAAQ,WAAS;AAChC,aAAS,KAAK;AAEd,oBAAgB,OAAO,QAAQ;AAAA,EACnC,CAAC;AACL;;;AC1FA,GAAG,UAAU,CAAC,EAAE,cAAc;AAC1B,UAAQ,CAAC,EAAE,cAAc;AACrB,QAAI,WAAW,QAAQ;AAEvB,QAAI,CAAE;AAAU;AAGhB,QAAI,YAAY,OAAO,aAAa,OAAO;AAE3C,QAAI,MAAM,UAAU,gBAChB,aAAa,SAAS,SAAS,SAAS,WAAW,CACvD;AAEA,QAAI,gBAAgB,SAAS,cAAc,GAAG;AAE9C,kBAAc,MAAM,UAAU;AAC9B,kBAAc,OAAO;AACrB,kBAAc,WAAW,SAAS;AAElC,aAAS,KAAK,YAAY,aAAa;AAEvC,kBAAc,MAAM;AAEpB,eAAW,WAAW;AAClB,gBAAU,gBAAgB,GAAG;AAAA,IACjC,GAAG,CAAC;AAAA,EACR,CAAC;AACL,CAAC;AAED,sBAAsB,SAAS,cAAc,IAAI,YAAY,KAAK;AAC9D,QAAM,iBAAiB,KAAK,OAAO;AACnC,QAAM,aAAa,CAAC;AAEpB,MAAI,gBAAgB;AAAM,kBAAc;AAExC,WAAS,SAAS,GAAG,SAAS,eAAe,QAAQ,UAAU,WAAW;AACtE,QAAI,QAAQ,eAAe,MAAM,QAAQ,SAAS,SAAS;AAE3D,QAAI,cAAc,IAAI,MAAM,MAAM,MAAM;AAExC,aAAS,IAAI,GAAG,IAAI,MAAM,QAAQ,KAAK;AACnC,kBAAY,KAAK,MAAM,WAAW,CAAC;AAAA,IACvC;AAEA,QAAI,YAAY,IAAI,WAAW,WAAW;AAE1C,eAAW,KAAK,SAAS;AAAA,EAC7B;AAEA,SAAO,IAAI,KAAK,YAAY,EAAE,MAAM,YAAY,CAAC;AACrD;;;AClDA,IAAI,gCAAgC,oBAAI;AAExC,IAAI,wBAAwB,oBAAI;AAEhC,GAAG,kBAAkB,CAAC,EAAE,gBAAgB;AACpC,MAAI,OAAO,UAAU,SAAS;AAG9B,MAAI,KAAK,eAAe;AAAW;AAEnC,wBAAsB,IAAI,SAAS;AAInC,MAAI,KAAK,iBAAiB,UAAa,KAAK,iBAAiB,OAAO;AAChE,kCAA8B,IAAI,SAAS;AAAA,EAC/C;AACJ,CAAC;AAED,GAAG,kBAAkB,CAAC,EAAE,cAAc;AAClC,UAAQ,QAAQ,YAAU;AAEtB,QAAI,CAAE,sBAAsB,IAAI,OAAO,SAAS;AAAG;AAEnD,QAAI,8BAA8B,IAAI,OAAO,SAAS,GAAG;AACrD,aAAO,UAAU;AAEjB,oCAA8B,OAAO,OAAO,SAAS;AAAA,IACzD,OAAO;AACH,aAAO,UAAU;AAAA,IACrB;AAGA,0BAAsB,OAAO,OAAO,SAAS;AAAA,EACjD,CAAC;AACL,CAAC;;;ACnCD,wBAAmB;AAGnB,GAAG,UAAU,CAAC,EAAE,WAAW,SAAS,cAAc;AAC9C,MAAI,cAAc,QAAQ;AAE1B,MAAI,CAAE;AAAa;AAEnB,SAAO,QAAQ,WAAW,EAAE,QAAQ,CAAC,CAAC,KAAK,WAAW;AAClD,QAAI,EAAE,MAAM,IAAI,KAAK,YAAY,WAAW,0BAA0B,KAAK,KAAK;AAEhF,QAAI,CAAE;AAAI,WAAK;AAEf,QAAI,eAAe,CAAC,OAAO,MAAM,MAAS,EAAE,SAAS,MAAM,IAAI,QAAQ,UAAU,WAAW,IAAI,IAAI;AAEpG,QAAI,EAAE,mBAAS,aAAM,QAAQ,MAAM,IAAI,cAAc,YAAY,MAAM;AAEvE,QAAI,QAAQ,WAAW;AACnB,UAAI,kBAAkB,0BAAO,OAAO,MAAM;AACtC,iBAAQ,QAAQ,UAAU,UAAU,IAAI,CAAC;AAAA,MAC7C,CAAC;AAED,cAAQ,MAAM,0BAAO,QAAQ,eAAe,CAAC;AAAA,IACjD,WAAW,QAAQ,QAAQ;AACvB,UAAI,sBAAsB,GAAG,UAAU,CAAC,EAAE,WAAW,iBAAiB,cAAc;AAChF,YAAI,cAAc;AAAiB;AAEnC,YAAI,cAAc,QAAQ,UAAU,WAAW,IAAI;AAEnD,gBAAQ,MAAM;AACV,cAAI,aAAa,QAAQ,UAAU,WAAW,IAAI;AAElD,cAAI,KAAK,UAAU,WAAW,MAAM,KAAK,UAAU,UAAU;AAAG;AAEhE,gBAAK,UAAU;AAAA,QACnB,CAAC;AAAA,MACL,CAAC;AAED,UAAI,mBAAmB,IAAI,OAAM,aAAY;AACzC,cAAM,UAAU,MAAM,IAAI,MAAM,QAAQ;AAGxC,iBAAS,iBAAiB,OAAO,EAAE,QAAQ,QAAM;AAC7C,aAAG,uBAAuB,GAAG,oBAAoB,GAAG,SAAS,IAAI,CAAC;AAAA,QACtE,CAAC;AAAA,MACL,CAAC;AAED,cAAQ,MAAM;AACV,4BAAoB;AACpB,yBAAiB;AAAA,MACrB,CAAC;AAAA,IACL;AAAA,EACJ,CAAC;AACL,CAAC;AAED,mCAAmC,KAAK,OAAO;AAC3C,MAAI,WAAW,EAAE,KAAK,WAAW,YAAY,MAAM;AAEnD,MAAI,OAAO,UAAU,UAAU;AAC3B,WAAO,EAAC,GAAG,UAAU,MAAM,OAAO,IAAI,MAAM;AAAA,EAChD,OAAO;AACH,QAAI,iBAAiB,EAAC,GAAG,UAAU,MAAM,KAAK,IAAI,IAAI;AAEtD,WAAO,EAAC,GAAG,gBAAgB,GAAG,MAAM;AAAA,EACxC;AACJ;;;AChEA,GAAG,WAAW,CAAC,EAAE,cAAc;AAC3B,MAAI,OAAO,MAAM;AACb,YAAQ,QAAQ,iBAAiB,OAAO,KAAK,SAAS;AAAA,EAC1D;AACJ,CAAC;AAED,GAAG,UAAU,CAAC,EAAE,WAAW,cAAc;AACrC,MAAI,aAAY,QAAQ,aAAa,CAAC;AAEtC,aAAU,QAAQ,WAAS;AACvB,QAAI,MAAM,WAAW,MAAM,GAAG;AAC1B,UAAI,OAAO,OAAO,SAAS,aAAa;AACpC,gBAAQ,KAAK,8BAA8B;AAE3C;AAAA,MACJ;AAEA,UAAI,cAAc,MAAM,MAAM,mBAAmB;AAEjD,UAAI,YAAY,MAAM,SAAS;AAC3B,oBAAY,OAAO,GAAG,GAAG,WAAW,MAAS;AAAA,MACjD;AAEA,UAAI,YAAY,MAAM,gBAAgB;AAClC,oBAAY,KAAK,QAAW,MAAS;AAAA,MACzC;AAEA,UAAI;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,UACA;AAEJ,UAAI,CAAC,WAAW,WAAW,kBAAkB,EAAE,SAAS,YAAY,GAAG;AACnE,YAAI,UAAU,OAAK,aAAa,WAAW,OAAO,CAAC,CAAC,CAAC;AAErD,eAAO,KAAK,cAAc,OAAO,EAAE,OAAO,YAAY,OAAO;AAE7D,kBAAU,WAAW,MAAM;AACvB,iBAAO,KAAK,cAAc,OAAO,EAAE,cAAc,YAAY,OAAO;AAAA,QACxE,CAAC;AAAA,MACL,WAAW,gBAAgB,YAAY;AACnC,YAAI,CAAC,QAAQ,WAAW,SAAS,EAAE,SAAS,UAAU,GAAG;AACrD,iBAAO,KAAK,KAAK,OAAO,EAAE,YAAY,OAAK;AACvC,yBAAa,WAAW,OAAO,CAAC,CAAC,CAAC;AAAA,UACtC,CAAC;AAAA,QAGL,OAAM;AACF,cAAI,UAAU,OAAK,aAAa,WAAW,OAAO,CAAC,CAAC,CAAC;AAErD,iBAAO,KAAK,KAAK,OAAO,EAAE,OAAO,YAAY,OAAO;AAEpD,oBAAU,WAAW,MAAM;AACvB,mBAAO,KAAK,aAAa,OAAO;AAAA,UACpC,CAAC;AAAA,QACL;AAAA,MACJ,WAAW,gBAAgB,gBAAgB;AACvC,eAAO,KAAK,QAAQ,OAAO,EAAE,aAAa,kBAAgB;AACtD,uBAAa,WAAW,OAAO,CAAC,YAAY,CAAC;AAAA,QACjD,CAAC;AAAA,MAGL,OAAO;AACH,gBAAQ,KAAK,qCAAqC;AAAA,MACtD;AAAA,IACJ;AAAA,EACJ,CAAC;AACL,CAAC;;;ACzED,IAAI,4BAA4B,oBAAI;AAEpC,GAAG,kBAAkB,CAAC,EAAE,gBAAgB;AACpC,MAAI,OAAO,UAAU,SAAS;AAG9B,MAAI,KAAK,YAAY;AAAM;AAE3B,4BAA0B,IAAI,SAAS;AAC3C,CAAC;AAED,GAAG,kBAAkB,CAAC,EAAE,cAAc;AAClC,UAAQ,QAAQ,YAAU;AAEtB,QAAI,CAAE,0BAA0B,IAAI,OAAO,SAAS;AAAG;AAEvD,WAAO,UAAU;AAAA,EACrB,CAAC;AACL,CAAC;;;ACnBD,sBAAsB,KAAK,OAAO,SAAS,mBAAmB;AAE9D,SAAS,iBAAiB,mBAAmB,OAAK,aAAa,qBAAqB,CAAC,CAAC;AACtF,SAAS,iBAAiB,qBAAqB,OAAK,aAAa,uBAAuB,CAAC,CAAC;AAC1F,SAAS,iBAAiB,oBAAoB,OAAK,aAAa,sBAAsB,CAAC,CAAC;AAExF,sBAAsB,MAAM,UAAU;AAClC,MAAI,QAAQ,IAAI,YAAY,MAAM,EAAE,YAAY,MAAM,SAAS,MAAM,QAAQ,SAAS,OAAO,CAAC;AAE9F,WAAS,cAAc,KAAK;AAE5B,MAAI,MAAM,kBAAkB;AACxB,aAAS,eAAe;AAAA,EAC5B;AACJ;AAEO,uCAAuC,SAAS,KAAK,IAAI;AAC5D,MAAI,gBAAgB,QAAQ;AAE5B,MAAI,eAAe;AACf,WAAO,SAAS,GAAG;AAAA,EACvB,OAAO;AACH,OAAG;AAAA,EACP;AACJ;AAEA,iCAAiC;AAC7B,MAAI,CAAC,CAAE,SAAS,cAAc,wBAAwB;AAAG,WAAO;AAEhE,MAAI,OAAO,wBAAwB,OAAO,qBAAqB,gBAAgB;AAAO,WAAO;AAE7F,SAAO;AACX;;;AC9BA,GAAG,UAAU,CAAC,EAAE,cAAc;AAC1B,MAAI,CAAE,QAAQ;AAAa;AAE3B,MAAI,MAAM,QAAQ;AAElB,gCAA8B,SAAS,KAAK,MAAM;AAC9C,WAAO,SAAS,OAAO;AAAA,EAC3B,CAAC;AACL,CAAC;;;ACTD,wBAAmB;AAEnB,GAAG,eAAe,CAAC,EAAE,SAAS;AAC1B,KAAG,iBAAiB;AACxB,CAAC;AAED,UAAU,cAAc,CAAC,EAAE,IAAI,uBAAW,WAAW,cAAc;AAC/D,MAAI,aAAa,0BAAO,SAAS,EAAE,OAAO,GAAG,iBAAiB,QAAQ,KAAK,CAAC;AAG5E,4BAAO,KAAK,IAAI;AAAA,IACZ,CAAC,WAAU,QAAQ,QAAQ,SAAS,IAAI,IAAI;AAAA,IAC5C,WAAW;AAAE,aAAO,WAAW;AAAA,IAAM;AAAA,EACzC,CAAC;AAGD,KAAG,kBAAkB,WAAW,MAAM,WAAW,QAAQ,IAAI;AAE7D,MAAI,YAAW,CAAC;AAEhB,YAAS,KAAK,GAAG,kBAAkB,CAAC,EAAE,SAAI,WAAW;AAEjD,SAAK;AAGL,QAAG,iBAAiB,iBAAiB,MAAM;AAEvC,UAAG,OAAO;AAAA,IACd,CAAC;AAGD,eAAW,QAAQ;AAEnB,cAAS,KAAK,GAAG,SAAS,CAAC,EAAE,WAAW,qBAAqB;AACzD,UAAI,mBAAmB;AAAW;AAIlC,UAAG,OAAO;AAEV,gBAAS,QAAQ,OAAK,EAAE,CAAC;AAAA,IAC7B,CAAC,CAAC;AAAA,EACN,CAAC,CAAC;AAEF,UAAQ,MAAM,UAAS,QAAQ,OAAK,EAAE,CAAC,CAAC;AAC5C,CAAC;;;AC7CD,IAAI,uBAAuB,IAAI;AAsCxB,wCAAwC,WAAW,UAAU;AAOhE,uBAAqB,KAAK,WAAW,sBAAoB;AACrD,qBAAiB,SAAS;AAC1B,qBAAiB,WAAW,MAAM;AAAA,IAAE;AAAA,EACxC,CAAC;AAED,WAAS;AACb;;;AClDA,wBAAmB;AAEnB,GAAG,kBAAkB,CAAC,EAAE,IAAI,uBAAW,SAAS,gBAAgB;AAC5D,MAAI,CAAC,YAAY,WAAW,SAAS,QAAQ,WAAW,QAAQ,UAAU,MAAM,QAAQ,OAAO,UAAU,OAAO,EAAE,SAAS,WAAU,KAAK;AAAG;AAC7I,MAAI,iCAAiC,WAAU,KAAK;AAAG;AAEvD,MAAI,YAAY,WAAU,QAAQ,QAAQ,SAAS,OAAO;AAG1D,MAAI,WAAU,UAAU,YAAY,CAAE,WAAU,UAAU,SAAS,SAAS,GAAG;AAC3E,gBAAY,YAAY;AAAA,EAC5B;AAEA,MAAI,iBAAiB,0BAAO,KAAK,IAAI;AAAA,IACjC,CAAC,WAAW,GAAG;AACX,UAAI,UAAU,MAAM;AAChB,uCAA+B,WAAW,MAAM;AAE5C,oCAAO,SAAS,IAAI,WAAS,WAAU,YAAY,EAAE,OAAO,EAAE,QAAQ,EAAE,EAAC,CAAC;AAAA,QAC9E,CAAC;AAAA,MACL;AAGA,UAAI,GAAG,oBAAoB;AACvB,WAAG,mBAAmB,MAAM;AACxB,kBAAQ;AAAA,QACZ,GAAG,MAAM;AACL,YAAE,yBAAyB;AAAA,QAC/B,CAAC;AAAA,MACL,OAAO;AACH,gBAAQ;AAAA,MACZ;AAAA,IACJ;AAAA,EACJ,CAAC;AAED,UAAQ,cAAc;AAC1B,CAAC;;;ACvCD,wBAAmB;AAEnB,0BAAO,gBAAgB,MAAM,mBAAmB;AAChD,0BAAO,gBAAgB,MAAM,2BAA2B;AAExD,0BAAO,cACH,0BAAO,gBAAgB,QAAM;AACzB,MAAI,GAAG,aAAa,eAAe,GAAG;AAClC,8BAAO,KAAK,IAAI,EAAE,CAAC,eAAe,KAAK,CAAC;AAAA,EAC5C,WAAW,GAAG,aAAa,qBAAqB,GAAG;AAC/C,8BAAO,KAAK,IAAI,EAAE,CAAC,qBAAqB,KAAK,CAAC;AAAA,EAClD;AACJ,CAAC,CACL;AAEA,SAAS,iBAAiB,qBAAqB,MAAM;AAGjD,WAAS,IAAI,EAAE,QAAQ,eAAa;AAChC,cAAU,oCAAoC;AAAA,EAClD,CAAC;AACL,CAAC;;;ACnBD,UAAU,WAAW,CAAC,EAAE,IAAI,4BAAgB;AACxC,MAAI,UAAU,WAAU;AACxB,MAAI,eAAe,WAAU,UAAU,SAAS,QAAQ;AAGxD,YAAU,QAAQ,WAAW,OAAO,IAAI;AAExC,MAAI,YAAY;AAAI,cAAU;AAE9B,KAAG,qBAAqB,CAAC,QAAQ,YAAY;AACzC,QAAI,cAAc;AACd,UAAI,CAAC,UAAU,YAAY,QAAQ,MAAM,GAAG;AAE5C,UAAI,CAAE,UAAU;AACZ,gBAAQ,KAAK,6DAA6D;AAAA,MAC9E,OAAO;AACH,YAAI,QAAQ,OAAO,QAAQ;AAE3B,YAAI,UAAU,UAAU;AACpB,iBAAO;AAAA,QACX,OAAO;AACH,kBAAQ;AAAA,QACZ;AAAA,MACJ;AAAA,IACJ,OAAO;AACH,UAAI,QAAQ,OAAO;AAAG,eAAO;AAAA;AACxB,gBAAQ;AAAA,IACjB;AAAA,EACJ;AACJ,CAAC;;;AC9BD,wBAAmB;AAEnB,0BAAO,gBAAgB,MAAM,kBAAkB;AAE/C,IAAI,gBAAgB,oBAAI;AAExB,SAAS,iBAAiB,sBAAsB,MAAM;AAClD,gBAAc,QAAQ,OAAK,EAAE,IAAI,IAAI,OAAO,SAAS,IAAI,CAAC,CAAC;AAC/D,CAAC;AAED,gBAAgB,WAAW,CAAC,EAAE,IAAI,uBAAW,cAAc;AACvD,MAAI,aAAa,WAAU;AAE3B,MAAI,UAAU;AAAA,IACV,OAAO,WAAU,UAAU,SAAS,OAAO;AAAA,IAC3C,QAAQ,WAAU,UAAU,SAAS,QAAQ;AAAA,EACjD;AAGA,MAAI,WAAW,WAAW,GAAG;AAAG;AAGhC,MAAI,CAAE,GAAG,aAAa,MAAM;AAAG;AAE/B,MAAI,OAAO,GAAG,aAAa,MAAM;AAEjC,MAAI,UAAU,IAAI,IAAI,MAAM,OAAO,SAAS,IAAI;AAEhD,MAAI,UAAU,WAAW,MAAM,GAAG,EAAE,OAAO,MAAM;AAEjD,MAAI,iBAAiB,SAAO;AACxB,QAAI,YAAY,SAAS,KAAK,OAAO,GAAG;AACpC,SAAG,UAAU,IAAI,GAAG,OAAO;AAAA,IAC/B,OAAO;AACH,SAAG,UAAU,OAAO,GAAG,OAAO;AAAA,IAClC;AAAA,EACJ;AAEA,iBAAe,IAAI,IAAI,OAAO,SAAS,IAAI,CAAC;AAE5C,gBAAc,IAAI,IAAI,cAAc;AAEpC,UAAQ,MAAM,cAAc,OAAO,EAAE,CAAC;AAC1C,CAAC;AAED,qBAAqB,SAAS,WAAW,SAAS;AAE9C,MAAI,QAAQ,aAAa,UAAU;AAAU,WAAO;AAGpD,MAAI,WAAW,QAAQ,SAAS,QAAQ,WAAW,QAAQ,SAAS,QAAQ,QAAQ,EAAE;AACtF,MAAI,aAAa,QAAQ,SAAS,UAAU,WAAW,UAAU,SAAS,QAAQ,QAAQ,EAAE;AAE5F,MAAI,QAAQ,OAAO;AACf,WAAO,aAAa;AAAA,EACxB;AAEA,MAAI,mBAAmB,SAAS,MAAM,GAAG;AACzC,MAAI,qBAAqB,WAAW,MAAM,GAAG;AAG7C,WAAS,IAAI,GAAG,IAAI,iBAAiB,QAAQ,KAAK;AAC9C,QAAI,iBAAiB,OAAO,mBAAmB;AAAI,aAAO;AAAA,EAC9D;AAEA,SAAO;AACX;;;AClEO,qCAAqC,IAAI,YAAW,UAAU,gBAAgB,MAAM;AACvF,aAAW,WAAU,UAAU,SAAS,QAAQ,IAAI,CAAE,WAAW;AAEjE,MAAI,WAAU,UAAU,SAAS,OAAO,GAAG;AACvC,QAAI,UAAU,WAAU,WAAW,MAAM,GAAG,EAAE,OAAO,MAAM;AAE3D,QAAI,UAAU;AACV,SAAG,UAAU,IAAI,GAAG,OAAO;AAAA,IAC/B,OAAO;AACH,SAAG,UAAU,OAAO,GAAG,OAAO;AAAA,IAClC;AAAA,EACJ,WAAW,WAAU,UAAU,SAAS,MAAM,GAAG;AAC7C,QAAI,UAAU;AACV,SAAG,aAAa,WAAU,YAAY,IAAI;AAAA,IAC9C,OAAO;AACH,SAAG,gBAAgB,WAAU,UAAU;AAAA,IAC3C;AAAA,EACJ,OAAO;AACH,QAAI,QAAQ,iBAAiB,OACxB,iBAAiB,IAAI,IAAI,EACzB,iBAAiB,SAAS;AAE/B,QAAI,UAAW,CAAC,UAAU,SAAS,SAAS,QAAQ,QAAQ,aAAa,EACpE,OAAO,OAAK,WAAU,UAAU,SAAS,CAAC,CAAC,EAAE,MAAM;AAIxD,cAAW,WAAU,UAAU,SAAS,QAAQ,KAAK,CAAE,WACjD,QAAQ;AAEd,OAAG,MAAM,UAAU,WAAW,UAAU;AAAA,EAC5C;AACJ;;;AC9BA,IAAI,kBAAkB,oBAAI;AAC1B,IAAI,iBAAiB,oBAAI;AAEzB,OAAO,iBAAiB,WAAW,MAAM,gBAAgB,QAAQ,OAAK,EAAE,CAAC,CAAC;AAC1E,OAAO,iBAAiB,UAAU,MAAM,eAAe,QAAQ,OAAK,EAAE,CAAC,CAAC;AAExE,UAAU,WAAW,CAAC,EAAE,IAAI,uBAAW,cAAc;AACjD,MAAI,aAAa,MAAM,4BAA4B,IAAI,YAAW,IAAI;AACtE,MAAI,YAAY,MAAM,4BAA4B,IAAI,YAAW,KAAK;AAEtE,kBAAgB,IAAI,UAAU;AAC9B,iBAAe,IAAI,SAAS;AAE5B,UAAQ,MAAM;AACV,oBAAgB,OAAO,UAAU;AACjC,mBAAe,OAAO,SAAS;AAAA,EACnC,CAAC;AACL,CAAC;;;ACfD,UAAU,WAAW,CAAC,EAAE,IAAI,uBAAW,WAAW,cAAc;AAC5D,MAAI,EAAE,SAAS,aAAa,WAAW,EAAE;AAEzC,MAAI,CAAC,OAAO,cAAc,WAAW,UAAS;AAE9C,MAAI,WAAW,4BAA4B,WAAW,SAAS,UAAU;AAAA,IACrE,MAAM,MAAM,MAAM,4BAA4B,IAAI,YAAW,IAAI,CAAC;AAAA,IAClE,MAAM,WAAW,MAAM,4BAA4B,IAAI,YAAW,KAAK,CAAC;AAAA,EAC5E,CAAC;AAED,MAAI,WAAW,+BAA+B,WAAW,SAAS;AAAA,IAC9D,MAAM,MAAM,MAAM,4BAA4B,IAAI,YAAW,IAAI,CAAC;AAAA,IAClE,MAAM,WAAW,MAAM,4BAA4B,IAAI,YAAW,KAAK,CAAC;AAAA,EAC5E,CAAC;AAED,UAAQ,MAAM;AACV,aAAS;AACT,aAAS;AAAA,EACb,CAAC;AACL,CAAC;AAED,oBAAoB,YAAW;AAC3B,MAAI,CAAE,WAAU,UAAU,SAAS,OAAO,KAAK,WAAU,UAAU,SAAS,MAAM;AAAG,WAAO,CAAC,OAAK,EAAE,GAAG,OAAK,EAAE,CAAC;AAE/G,MAAI,WAAW;AAEf,MAAI,iBAAiB;AAAA,IACjB,YAAY;AAAA,IACZ,WAAW;AAAA,IACX,SAAS;AAAA,IACT,WAAW;AAAA,IACX,QAAQ;AAAA,IACR,UAAU;AAAA,IACV,WAAW;AAAA,EACf;AAEA,SAAO,KAAK,cAAc,EAAE,KAAK,SAAO;AACpC,QAAI,WAAU,UAAU,SAAS,GAAG,GAAG;AACnC,iBAAW,eAAe;AAE1B,aAAO;AAAA,IACX;AAAA,EACJ,CAAC;AAED,MAAI;AACJ,MAAI,UAAU;AAEd,SAAO;AAAA,IACH,CAAC,aAAa;AACV,gBAAU,WAAW,MAAM;AACvB,iBAAS;AAET,kBAAU;AAAA,MACd,GAAG,QAAQ;AAAA,IACf;AAAA,IACA,OAAO,aAAa;AAChB,UAAI,SAAS;AACT,cAAM,SAAS;AACf,kBAAU;AAAA,MACd,OAAO;AACH,qBAAa,OAAO;AAAA,MACxB;AAAA,IACJ;AAAA,EACJ;AACJ;AAEA,qCAAqC,WAAW,SAAS,UAAU,CAAE,cAAc,aAAc;AAC7F,SAAO,GAAG,UAAU,CAAC,EAAE,WAAW,YAAY,QAAQ,SAAS,cAAc;AACzE,QAAI,eAAe;AAAW;AAE9B,QAAI,QAAQ,SAAS,KAAK,gBAAgB,SAAS,OAAO,MAAM;AAAU;AAE1E,iBAAa;AAEb,YAAQ,MAAM;AACV,iBAAW;AAAA,IACf,CAAC;AAAA,EACL,CAAC;AACL;AAEA,wCAAwC,WAAW,SAAS,CAAE,cAAc,aAAc;AACtF,MAAI,gBAAgB,OAAK;AACrB,QAAI,EAAE,IAAI,aAAa,EAAE;AAEzB,QAAI,OAAO,UAAU;AAAI,aAAO;AAChC,QAAI,QAAQ,SAAS,KAAK,CAAE,QAAQ,IAAI,OAAK,EAAE,MAAM,EAAE,SAAS,QAAQ;AAAG,aAAO;AAElF,WAAO;AAAA,EACX;AAEA,MAAI,WAAW,OAAO,QAAQ,yBAAyB,OAAK;AACxD,QAAI,cAAc,CAAC;AAAG;AAEtB,iBAAa;AAAA,EACjB,CAAC;AAED,MAAI,WAAW,OAAO,QAAQ,0BAA0B,OAAK;AACzD,QAAI,cAAc,CAAC;AAAG;AAEtB,eAAW;AAAA,EACf,CAAC;AAED,MAAI,WAAW,OAAO,QAAQ,yBAAyB,OAAK;AACxD,QAAI,cAAc,CAAC;AAAG;AAEtB,eAAW;AAAA,EACf,CAAC;AAED,SAAO,MAAM;AACT,aAAS;AACT,aAAS;AACT,aAAS;AAAA,EACb;AACJ;AAEA,yBAAyB,SAAS,SAAS;AACvC,MAAI,EAAE,SAAS,UAAU;AAEzB,SAAO,QAAQ,KAAK,CAAC,EAAE,QAAQ,aAAa;AACxC,QAAI,QAAQ;AACR,aAAO,MAAM,KAAK,CAAC,EAAE,QAAQ,QAAQ,mBAAmB;AACpD,eAAO,WAAW,UACX,WAAW,UAAU,KAAK,UAAU,YAAY,CAAC;AAAA,MAC5D,CAAC;AAAA,IACL;AAEA,QAAI,oBAAoB,OAAO,KAAK,OAAO,EAAE,KAAK,cAAY;AAE1D,UAAI,SAAS,SAAS,GAAG,GAAG;AACxB,YAAI,eAAe,SAAS,MAAM,GAAG,EAAE;AAEvC,YAAI,iBAAiB;AAAQ,iBAAO;AAAA,MACxC;AAEA,aAAO,aAAa;AAAA,IACxB,CAAC;AAED,QAAI;AAAmB,aAAO;AAE9B,QAAI,MAAM,IAAI,OAAK,EAAE,MAAM,EAAE,SAAS,MAAM;AAAG,aAAO;AAAA,EAC1D,CAAC;AACL;AAEA,oBAAoB,IAAI;AACpB,MAAI,aAAa,cAAc,EAAE;AAEjC,MAAI,UAAU,CAAC;AAEf,MAAI,WAAW;AAEf,MAAI,WAAW,IAAI,QAAQ,GAAG;AAC1B,QAAI,aAAY,WAAW,IAAI,QAAQ;AAEvC,QAAI,MAAM,WAAU;AAEpB,QAAI,WAAU,UAAU,SAAS,QAAQ;AAAG,iBAAW;AAEvD,QAAI,IAAI,SAAS,GAAG,KAAK,IAAI,SAAS,GAAG,GAAG;AACxC,cAAQ,KAAK,EAAE,QAAQ,WAAU,QAAQ,QAAQ,UAAU,KAAK,UAAU,WAAU,MAAM,CAAC,EAAE,CAAC;AAAA,IAClG,WAAW,IAAI,SAAS,GAAG,GAAG;AAC1B,UAAI,MAAM,GAAG,EAAE,IAAI,OAAK,EAAE,KAAK,CAAC,EAAE,QAAQ,YAAU;AAChD,gBAAQ,KAAK,EAAE,OAAO,CAAC;AAAA,MAC3B,CAAC;AAAA,IACL,OAAO;AACH,cAAQ,KAAK,EAAE,QAAQ,IAAI,CAAC;AAAA,IAChC;AAAA,EACJ,OAAO;AAGH,QAAI,qCAAqC,CAAE,QAAQ,SAAS,WAAW,UAAU,WAAW,QAAQ,UAAU,OAAO,IAAK;AAE1H,eACK,IAAI,EACJ,OAAO,OAAK,CAAE,mCAAmC,SAAS,EAAE,KAAK,CAAC,EAClE,IAAI,OAAK,EAAE,WAAW,MAAM,GAAG,EAAE,EAAE,EACnC,QAAQ,YAAU,QAAQ,KAAK,EAAE,OAAO,CAAC,CAAC;AAAA,EACnD;AAEA,SAAO,EAAE,SAAS,SAAS;AAC/B;AAEA,mBAAmB,SAAS;AACxB,SAAO,KAAK,mBAAmB,OAAO,CAAC;AAC3C;;;ACxLA,UAAU,UAAU,CAAC,EAAC,IAAI,uBAAW,cAAc;AAC/C,MAAI,EAAE,YAAY,cAAc;AAEhC,MAAI,MAAM,GAAG,UAAU,CAAC,EAAE,MAAM,SAAS,wBAAc;AACnD,QAAI,SAAS;AAAY;AAEzB,QAAI,UAAU,SAAS,SAAS,KAAK,UAAS;AAC1C,SAAG,YAAY;AAAA,IACnB,OAAO;AACH,SAAG,YAAY,GAAG,YAAY;AAAA,IAClC;AAAA,EACJ,CAAC;AAED,UAAQ,GAAG;AACf,CAAC;AAED,GAAG,WAAW,CAAC,EAAE,cAAc;AAC3B,UAAQ,mBAAiB;AACrB,QAAI,WAAW,cAAc;AAE7B,QAAI,CAAE,SAAS,QAAQ,IAAI,mBAAmB;AAAG;AAEjD,kBAAc,WAAW;AAAA,MACrB,IAAI;AAAA,MACJ,YAAY;AAAA,MACZ,QAAQ;AAAA,MAER,MAAM,OAAO;AACT,YAAI,gBAAgB,MAAM,sCAAsC,UAAU,cAAY;AAClF,kBAAQ,UAAU,QAAQ;AAAA,QAC9B,CAAC;AAED,YAAI,kBAAkB,aAAa,GAAG;AAClC,eAAK,KAAK;AAAA,QACd;AAEA,eAAO;AAAA,MACX;AAAA,IACJ;AAAA,EACJ,CAAC;AACL,CAAC;AAED,qDAAqD,UAAU,UAAU;AACrE,MAAI,SAAS,SAAS,KAAK,UAAU;AACrC,MAAI,oBAAoB;AAExB,SAAO,MAAM;AACT,QAAI,EAAE,MAAM,OAAO,UAAU,MAAM,OAAO,KAAK;AAE/C,QAAI,UAAU,IAAI;AAClB,QAAI,SAAS,QAAQ,OAAO,KAAK;AAEjC,QAAI,CAAE,SAAS,aAAc,qBAAqB,oBAAoB,MAAM;AAE5E,YAAQ,QAAQ,YAAU;AACtB,eAAS,MAAM;AAAA,IACnB,CAAC;AAED,wBAAoB;AAEpB,QAAI;AAAM,aAAO;AAAA,EACrB;AACJ;AAEA,8BAA8B,KAAK;AAC/B,MAAI,QAAQ;AAEZ,MAAI,UAAU,IAAI,MAAM,KAAK;AAE7B,MAAI,SAAS,CAAC;AAEd,MAAI,SAAS;AACT,aAAS,IAAI,GAAG,IAAI,QAAQ,QAAQ,KAAK;AACrC,aAAO,KAAK,KAAK,MAAM,QAAQ,EAAE,EAAE,IAAI;AAAA,IAC3C;AAAA,EACJ;AAEA,MAAI,YAAY,IAAI,QAAQ,OAAO,EAAE;AAErC,SAAO,CAAE,QAAQ,SAAU;AAC/B;;;AClFA,UAAU,WAAW,CAAC,EAAE,IAAI,4BAAgB;AACxC,MAAI,WAAU,UAAU,SAAS,MAAM,GAAG;AACtC,OAAG,0BAA0B;AAAA,EACjC,OAAO;AACH,OAAG,qBAAqB;AAAA,EAC5B;AACJ,CAAC;;;ACND,UAAU,UAAU,CAAC,EAAE,IAAI,4BAAgB;AACvC,MAAI,WAAU,UAAU,SAAS,MAAM,GAAG;AACtC,OAAG,yBAAyB;AAAA,EAChC,OAAO;AACH,OAAG,oBAAoB;AAAA,EAC3B;AACJ,CAAC;;;ACHD,IAAI,gCAAgC,IAAI;AAExC,GAAG,UAAU,CAAC,EAAE,WAAW,cAAc;AACrC,UAAQ,MAAM;AACV,eAAW,MAAM;AACb,oCAA8B,KAAK,WAAW,OAAK,EAAE,KAAK,CAAC;AAAA,IAC/D,CAAC;AAAA,EACL,CAAC;AACL,CAAC;AAED,UAAU,SAAS,CAAC,EAAE,IAAI,uBAAW,gBAAgB;AACjD,MAAI,UAAU,aAAa,EAAE;AAE7B,MAAI,QAAQ,OAAO,SAAS,EAAE,OAAO,MAAM,CAAC;AAE5C,MAAI,aAAa;AAEjB,MAAI,iBAAiB,GAAG,MAAM;AAE9B,MAAI,oBAAoB,CAAC,YAAY;AACjC,gCAA4B,IAAI,YAAW,SAAS,cAAc;AAElE,iBAAa;AAAA,EACjB;AAEA,gCAA8B,IAAI,WAAW,iBAAiB;AAE9D,SAAO,OAAO,MAAM;AAChB,QAAI,UAAU;AAEd,QAAI,QAAQ,WAAW,GAAG;AACtB,gBAAU,KAAK,UAAU,UAAU,SAAS,MAAM,KAAK,UAAU,UAAU,QAAQ;AAAA,IACvF,OAAO;AACH,eAAS,IAAI,GAAG,IAAI,QAAQ,QAAQ,KAAK;AACrC,YAAI;AAAS;AAEb,YAAI,SAAS,QAAQ;AAErB,kBAAU,KAAK,UAAU,QAAQ,UAAU,WAAW,MAAM,CAAC,MAAM,KAAK,UAAU,QAAQ,UAAU,UAAU,MAAM,CAAC;AAAA,MACzH;AAAA,IACJ;AAEA,QAAI,eAAe,SAAS;AACxB,wBAAkB,OAAO;AAAA,IAC7B;AAEA,iBAAa;AAAA,EACjB,CAAC;AACL,CAAC;AAED,sBAAsB,IAAI;AACtB,MAAI,aAAa,cAAc,EAAE;AACjC,MAAI,UAAU,CAAC;AAEf,MAAI,WAAW,IAAI,OAAO,GAAG;AACzB,YAAQ,KAAK,WAAW,IAAI,OAAO,EAAE,UAAU;AAAA,EACnD;AAEA,MAAI,WAAW,IAAI,QAAQ,GAAG;AAC1B,cAAU,QAAQ,OACd,WACC,IAAI,QAAQ,EACZ,WAAW,MAAM,GAAG,EACpB,IAAI,OAAK,EAAE,KAAK,CAAC,CACtB;AAAA,EACJ;AAEA,SAAO;AACX;;;ACrEA,wBAAmB;AAEnB,UAAU,SAAS,CAAC,EAAE,IAAI,uBAAW,WAAW,cAAc;AAC1D,MAAI,EAAE,YAAY,cAAc;AAEhC,MAAI,CAAE,YAAY;AACd,WAAO,QAAQ,KAAK,8CAA8C,EAAE;AAAA,EACxE;AAEA,MAAI,2BAA2B,WAAW,UAAU,GAAG;AACnD,WAAO,QAAQ,KAAK,4BAA0B,aAAW,+CAA6C,UAAU,OAAK,KAAK,EAAE;AAAA,EAChI;AAGA,MAAI,GAAG,QAAQ,GAAG,KAAK,YAAY,MAAM,QAAQ;AAC7C,WAAO,iBAAiB,IAAI,YAAY,WAAW,OAAO;AAAA,EAC9D;AAEA,MAAI,SAAS,UAAU,SAAS,MAAM;AACtC,MAAI,SAAS,UAAU,SAAS,MAAM,KAAK,UAAU,SAAS,QAAQ;AACtE,MAAI,SAAS,UAAU,SAAS,MAAM;AACtC,MAAI,cAAc,UAAU,SAAS,UAAU;AAG/C,MAAI,SAAS,WAAW,WAAW,SAAS,IACtC,MAAM,UAAU,MAAM,QAAQ,QAAQ,IACtC,MAAM,UAAU,MAAM,QAAQ;AAIpC,MAAI,kBAAkB,YAAY,EAAE,KAAK,CAAE,eAAe,SACpD,SAAS,QAAQ,GAAG,IACpB;AAEN,4BAAO,KAAK,IAAI;AAAA,IACZ,CAAC,aAAa;AACV,gBAAU,OAAO;AAAA,IACrB;AAAA,IACA,CAAC,WAAW;AACR,gBAAU,OAAO;AAAA,IACrB;AAAA,IACA,CAAC,YAAY,gBAAgB,SAAS,KAAK;AACvC,aAAO;AAAA,QACH,MAAM;AACF,iBAAO,QAAQ,UAAU,OAAO,UAAU;AAAA,QAC9C;AAAA,QACA,IAAI,OAAO;AACP,kBAAQ,UAAU,OAAO,YAAY,KAAK;AAE1C,oBAAW,CAAE,UAAY,CAAE,UAAW,gBAAgB;AAAA,QAC1D;AAAA,MACJ;AAAA,IACJ;AAAA,EACJ,CAAC;AACL,CAAC;AAED,yBAAyB,WAAW;AAChC,cAAY,UAAU,OAAO,OAAK,CAAE;AAAA,IAChC;AAAA,IAAQ;AAAA,EACZ,EAAE,SAAS,CAAC,CAAC;AAEb,MAAI,UAAU,WAAW;AAAG,WAAO;AAEnC,SAAO,MAAM,UAAU,KAAK,GAAG;AACnC;AAEA,qBAAqB,IAAI;AACrB,SACI,CAAC,SAAS,UAAU,EAAE,SAAS,GAAG,QAAQ,YAAY,CAAC,KACvD,CAAC,CAAC,YAAY,OAAO,EAAE,SAAS,GAAG,IAAI;AAE/C;AAUA,oCAAoC,WAAW,UAAU;AACrD,MAAI,SAAS,WAAW,SAAS,GAAG;AAChC,QAAI,SAAS,iBAAiB,UAAU,GAAG,eAAe,KAAK;AAE/D,QAAI,CAAE;AAAQ,aAAO;AAErB,WAAO,2BAA2B,QAAQ,SAAS,MAAM,UAAU,EAAE,EAAE;AAAA,EAC3E;AAEA,MAAI,eAAe,SAAS,MAAM,GAAG,EAAE;AAEvC,SAAO,CAAE,OAAO,KAAK,UAAU,SAAS,EAAE,SAAS,YAAY;AACnE;AAEA,kBAAkB,MAAM,MAAM;AAC1B,MAAI;AAEJ,SAAO,WAAW;AAChB,QAAI,UAAU,MAAM,OAAO;AAE3B,QAAI,QAAQ,WAAW;AACjB,gBAAU;AAEV,WAAK,MAAM,SAAS,IAAI;AAAA,IAC9B;AAEA,iBAAa,OAAO;AAEpB,cAAU,WAAW,OAAO,IAAI;AAAA,EAClC;AACJ;;;AClHA,wBAAmB;AAEnB,UAAU,QAAQ,CAAC,EAAE,IAAI,4BAAgB;AACrC,MAAI,aAAa,WAAU,cAAc;AAEzC,4BAAO,SAAS,IAAI,SAAS,YAAY;AAC7C,CAAC;;;ACND,wBAAmB;AAEnB,UAAU,QAAQ,CAAC,EAAE,IAAI,4BAAgB;AACrC,MAAI,WAAW,oBAAoB,WAAU,WAAW,GAAI;AAE5D,MAAI,EAAE,eAAO,YAAY,eAAe,aAAa,KAAK,MAAM;AAC5D,4BAAwB,IAAI,UAAS;AAAA,EACzC,GAAG,QAAQ;AAEX,SAAM;AAEN,gBAAc,MAAM,wBAAwB,KAAK,+BAA+B,UAAS,CAAC;AAC1F,aAAW,MAAM,uBAAuB,UAAS,KAAK,6BAA6B,EAAE,CAAC;AACtF,aAAW,MAAM,4BAA4B,EAAE,CAAC;AAChD,aAAW,MAAM,kBAAkB,CAAC;AACpC,WAAS,MAAM,yBAAyB,EAAE,CAAC;AAC/C,CAAC;AAED,iCAAiC,IAAI,YAAW;AAC5C,4BAAO,SAAS,IACZ,WAAU,aAAa,WAAW,WAAU,aAAa,iBAC7D;AACJ;AAEA,cAAc,UAAU,WAAW,KAAM;AACrC,MAAI,kBAAkB,CAAC;AACvB,MAAI,qBAAqB,CAAC;AAC1B,MAAI,iBAAiB,CAAC;AAEtB,SAAO;AAAA,IACH,QAAQ;AACJ,UAAI,QAAQ,oBAAoB,UAAU,MAAM;AAC5C,YAAI,eAAe,KAAK,OAAK,EAAE,CAAC;AAAG,iBAAO,MAAM;AAChD,YAAI,gBAAgB,KAAK,OAAK,EAAE,CAAC;AAAG;AACpC,YAAI,mBAAmB,KAAK,OAAK,EAAE,CAAC,KAAK,KAAK,OAAO,IAAI;AAAK;AAE9D,iBAAS;AAAA,MACb,CAAC;AAAA,IACL;AAAA,IACA,WAAW,WAAW;AAClB,sBAAgB,KAAK,SAAS;AAAA,IAClC;AAAA,IACA,cAAc,WAAW;AACrB,yBAAmB,KAAK,SAAS;AAAA,IACrC;AAAA,IACA,SAAS,WAAW;AAChB,qBAAe,KAAK,SAAS;AAAA,IACjC;AAAA,EACJ;AACJ;AAEA,IAAI,SAAS,CAAC;AAEd,6BAA6B,IAAI,UAAU;AACvC,MAAI,CAAE,OAAO,KAAK;AACd,QAAI,QAAQ;AAAA,MACR,OAAO,YAAY,MAAM,MAAM,UAAU,QAAQ,OAAK,EAAE,CAAC,GAAG,EAAE;AAAA,MAC9D,WAAW,oBAAI;AAAA,IACnB;AAEA,WAAO,MAAM;AAAA,EACjB;AAEA,SAAO,IAAI,UAAU,IAAI,QAAQ;AAEjC,SAAO,MAAM;AACT,WAAO,IAAI,UAAU,OAAO,QAAQ;AAEpC,QAAI,OAAO,IAAI,UAAU,SAAS,GAAG;AACjC,oBAAc,OAAO,IAAI,KAAK;AAC9B,aAAO,OAAO;AAAA,IAClB;AAAA,EACJ;AACJ;AAEA,IAAI,YAAY;AAEhB,OAAO,iBAAiB,WAAW,MAAM,YAAY,IAAI;AACzD,OAAO,iBAAiB,UAAU,MAAM,YAAY,KAAK;AAEzD,6BAA6B;AACzB,SAAO;AACX;AAEA,IAAI,eAAe;AAEnB,SAAS,iBAAiB,oBAAoB,MAAM;AAAE,iBAAe,SAAS;AAAO,GAAG,KAAK;AAE7F,mCAAmC;AAC/B,SAAO;AACX;AAEA,qCAAqC,IAAI;AACrC,SAAO,CAAE,cAAc,EAAE,EAAE,IAAI,MAAM;AACzC;AAEA,wCAAwC,YAAW;AAC/C,SAAO,CAAE,WAAU,UAAU,SAAS,YAAY;AACtD;AAEA,gCAAgC,YAAW;AACvC,SAAO,WAAU,UAAU,SAAS,SAAS;AACjD;AAEA,sCAAsC,IAAI;AACtC,MAAI,WAAW,GAAG,sBAAsB;AAExC,SAAO,CACH,UAAS,MAAO,QAAO,eAAe,SAAS,gBAAgB,iBAC/D,SAAS,OAAQ,QAAO,cAAc,SAAS,gBAAgB,gBAC/D,SAAS,SAAS,KAClB,SAAS,QAAQ;AAEzB;AAEA,kCAAkC,IAAI;AAClC,SAAO,GAAG,gBAAgB;AAC9B;AAEA,6BAA6B,WAAW,iBAAiB;AACrD,MAAI;AACJ,MAAI,+BAA+B,UAAU,KAAK,SAAO,IAAI,MAAM,YAAY,CAAC;AAChF,MAAI,0BAA0B,UAAU,KAAK,SAAO,IAAI,MAAM,WAAW,CAAC;AAE1E,MAAI,8BAA8B;AAC9B,6BAAyB,OAAO,6BAA6B,QAAQ,MAAM,EAAE,CAAC;AAAA,EAClF,WAAW,yBAAyB;AAChC,6BAAyB,OAAO,wBAAwB,QAAQ,KAAK,EAAE,CAAC,IAAI;AAAA,EAChF;AAEA,SAAO,0BAA0B;AACrC;;;A/B7HA,IAAI,YAAW;AAAA,EACX;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA,IAAI,WAAW;AACX,WAAO,0BAAO;AAAA,EAClB;AACJ;AAEA,IAAI,+BAA+B,YAAU,QAAQ,KAAK,kCAAkC,gBAAgB;AAE5G,IAAI,OAAO;AAAU,+BAA6B,UAAU;AAC5D,IAAI,OAAO;AAAQ,+BAA6B,QAAQ;AASxD,OAAO,WAAW;AAClB,OAAO,SAAS;AAEhB,IAAI,OAAO,yBAAyB,QAAW;AAC3C,SAAO,OAAO,iBAAiB;AAE/B,WAAS,iBAAiB,oBAAoB,MAAM;AAChD,QAAI,OAAO,OAAO,mBAAmB,QAAW;AAG5C,mCAA6B,QAAQ;AAAA,IACzC;AAGA,cAAS,MAAM;AAAA,EACnB,CAAC;AACL;",
+  "names": []
+}
diff --git a/public/vendor/livewire/livewire.js b/public/vendor/livewire/livewire.js
index 8eef48fadf..494d2d4982 100644
--- a/public/vendor/livewire/livewire.js
+++ b/public/vendor/livewire/livewire.js
@@ -370,9 +370,7 @@
     if (key === "")
       return object;
     return key.split(".").reduce((carry, i) => {
-      if (carry === void 0)
-        return void 0;
-      return carry[i];
+      return carry?.[i];
     }, object);
   }
   function dataSet(object, key, value) {
@@ -499,6 +497,9 @@
       if (value === null || value === "") {
         el.value = "";
       }
+      if (el.multiple && Array.isArray(value) && value.length === 0) {
+        el.value = "";
+      }
     });
     let clearFileInputValue = () => {
       el.value = null;
@@ -851,10 +852,9 @@
     });
   }
   function cleanupElement(el) {
-    if (el._x_cleanups) {
-      while (el._x_cleanups.length)
-        el._x_cleanups.pop()();
-    }
+    el._x_effects?.forEach(dequeueJob);
+    while (el._x_cleanups?.length)
+      el._x_cleanups.pop()();
   }
   var observer = new MutationObserver(onMutate);
   var currentlyObserving = false;
@@ -902,7 +902,7 @@
       deferredMutations = deferredMutations.concat(mutations);
       return;
     }
-    let addedNodes = /* @__PURE__ */ new Set();
+    let addedNodes = [];
     let removedNodes = /* @__PURE__ */ new Set();
     let addedAttributes = /* @__PURE__ */ new Map();
     let removedAttributes = /* @__PURE__ */ new Map();
@@ -910,8 +910,24 @@
       if (mutations[i].target._x_ignoreMutationObserver)
         continue;
       if (mutations[i].type === "childList") {
-        mutations[i].addedNodes.forEach((node) => node.nodeType === 1 && addedNodes.add(node));
-        mutations[i].removedNodes.forEach((node) => node.nodeType === 1 && removedNodes.add(node));
+        mutations[i].removedNodes.forEach((node) => {
+          if (node.nodeType !== 1)
+            return;
+          if (!node._x_marker)
+            return;
+          removedNodes.add(node);
+        });
+        mutations[i].addedNodes.forEach((node) => {
+          if (node.nodeType !== 1)
+            return;
+          if (removedNodes.has(node)) {
+            removedNodes.delete(node);
+            return;
+          }
+          if (node._x_marker)
+            return;
+          addedNodes.push(node);
+        });
       }
       if (mutations[i].type === "attributes") {
         let el = mutations[i].target;
@@ -944,29 +960,15 @@
       onAttributeAddeds.forEach((i) => i(el, attrs));
     });
     for (let node of removedNodes) {
-      if (addedNodes.has(node))
+      if (addedNodes.some((i) => i.contains(node)))
         continue;
       onElRemoveds.forEach((i) => i(node));
     }
-    addedNodes.forEach((node) => {
-      node._x_ignoreSelf = true;
-      node._x_ignore = true;
-    });
     for (let node of addedNodes) {
-      if (removedNodes.has(node))
-        continue;
       if (!node.isConnected)
         continue;
-      delete node._x_ignoreSelf;
-      delete node._x_ignore;
       onElAddeds.forEach((i) => i(node));
-      node._x_ignore = true;
-      node._x_ignoreSelf = true;
     }
-    addedNodes.forEach((node) => {
-      delete node._x_ignoreSelf;
-      delete node._x_ignore;
-    });
     addedNodes = null;
     removedNodes = null;
     addedAttributes = null;
@@ -1092,27 +1094,23 @@
     magics[name] = callback;
   }
   function injectMagics(obj, el) {
+    let memoizedUtilities = getUtilities(el);
     Object.entries(magics).forEach(([name, callback]) => {
-      let memoizedUtilities = null;
-      function getUtilities() {
-        if (memoizedUtilities) {
-          return memoizedUtilities;
-        } else {
-          let [utilities, cleanup2] = getElementBoundUtilities(el);
-          memoizedUtilities = { interceptor, ...utilities };
-          onElRemoved(el, cleanup2);
-          return memoizedUtilities;
-        }
-      }
       Object.defineProperty(obj, `$${name}`, {
         get() {
-          return callback(el, getUtilities());
+          return callback(el, memoizedUtilities);
         },
         enumerable: false
       });
     });
     return obj;
   }
+  function getUtilities(el) {
+    let [utilities, cleanup2] = getElementBoundUtilities(el);
+    let utils = { interceptor, ...utilities };
+    onElRemoved(el, cleanup2);
+    return utils;
+  }
   function tryCatch(el, expression, callback, ...args) {
     try {
       return callback(...args);
@@ -1473,21 +1471,29 @@ ${expression ? 'Expression: "' + expression + '"\n\n' : ""}`, el);
   function interceptInit(callback) {
     initInterceptors2.push(callback);
   }
+  var markerDispenser = 1;
   function initTree(el, walker = walk, intercept = () => {
   }) {
+    if (findClosest(el, (i) => i._x_ignore))
+      return;
     deferHandlingDirectives(() => {
       walker(el, (el2, skip) => {
+        if (el2._x_marker)
+          return;
         intercept(el2, skip);
         initInterceptors2.forEach((i) => i(el2, skip));
         directives(el2, el2.attributes).forEach((handle) => handle());
+        if (!el2._x_ignore)
+          el2._x_marker = markerDispenser++;
         el2._x_ignore && skip();
       });
     });
   }
   function destroyTree(root, walker = walk) {
     walker(root, (el) => {
-      cleanupAttributes(el);
       cleanupElement(el);
+      cleanupAttributes(el);
+      delete el._x_marker;
     });
   }
   function warnAboutMissingPlugins() {
@@ -1980,7 +1986,7 @@ ${expression ? 'Expression: "' + expression + '"\n\n' : ""}`, el);
     }
   }
   function bindInputValue(el, value) {
-    if (el.type === "radio") {
+    if (isRadio(el)) {
       if (el.attributes.value === void 0) {
         el.value = value;
       }
@@ -1991,7 +1997,7 @@ ${expression ? 'Expression: "' + expression + '"\n\n' : ""}`, el);
           el.checked = checkedAttrLooseCompare(el.value, value);
         }
       }
-    } else if (el.type === "checkbox") {
+    } else if (isCheckbox(el)) {
       if (Number.isInteger(value)) {
         el.value = value;
       } else if (!Array.isArray(value) && typeof value !== "boolean" && ![null, void 0].includes(value)) {
@@ -2067,34 +2073,37 @@ ${expression ? 'Expression: "' + expression + '"\n\n' : ""}`, el);
     }
     return rawValue ? Boolean(rawValue) : null;
   }
+  var booleanAttributes = /* @__PURE__ */ new Set([
+    "allowfullscreen",
+    "async",
+    "autofocus",
+    "autoplay",
+    "checked",
+    "controls",
+    "default",
+    "defer",
+    "disabled",
+    "formnovalidate",
+    "inert",
+    "ismap",
+    "itemscope",
+    "loop",
+    "multiple",
+    "muted",
+    "nomodule",
+    "novalidate",
+    "open",
+    "playsinline",
+    "readonly",
+    "required",
+    "reversed",
+    "selected",
+    "shadowrootclonable",
+    "shadowrootdelegatesfocus",
+    "shadowrootserializable"
+  ]);
   function isBooleanAttr(attrName) {
-    const booleanAttributes = [
-      "disabled",
-      "checked",
-      "required",
-      "readonly",
-      "open",
-      "selected",
-      "autofocus",
-      "itemscope",
-      "multiple",
-      "novalidate",
-      "allowfullscreen",
-      "allowpaymentrequest",
-      "formnovalidate",
-      "autoplay",
-      "controls",
-      "loop",
-      "muted",
-      "playsinline",
-      "default",
-      "ismap",
-      "reversed",
-      "async",
-      "defer",
-      "nomodule"
-    ];
-    return booleanAttributes.includes(attrName);
+    return booleanAttributes.has(attrName);
   }
   function attributeShouldntBePreservedIfFalsy(name) {
     return !["aria-pressed", "aria-checked", "aria-expanded", "aria-selected"].includes(name);
@@ -2127,6 +2136,12 @@ ${expression ? 'Expression: "' + expression + '"\n\n' : ""}`, el);
     }
     return attr;
   }
+  function isCheckbox(el) {
+    return el.type === "checkbox" || el.localName === "ui-checkbox" || el.localName === "ui-switch";
+  }
+  function isRadio(el) {
+    return el.type === "radio" || el.localName === "ui-radio";
+  }
   function debounce(func, wait) {
     var timeout;
     return function() {
@@ -2195,10 +2210,10 @@ ${expression ? 'Expression: "' + expression + '"\n\n' : ""}`, el);
       return stores[name];
     }
     stores[name] = value;
+    initInterceptors(stores[name]);
     if (typeof value === "object" && value !== null && value.hasOwnProperty("init") && typeof value.init === "function") {
       stores[name].init();
     }
-    initInterceptors(stores[name]);
   }
   function getStores() {
     return stores;
@@ -2280,7 +2295,7 @@ ${expression ? 'Expression: "' + expression + '"\n\n' : ""}`, el);
     get raw() {
       return raw;
     },
-    version: "3.14.1",
+    version: "3.14.8",
     flushAndStopDeferringMutations,
     dontAutoEvaluateFunctions,
     disableEffectScheduling,
@@ -3127,7 +3142,6 @@ ${expression ? 'Expression: "' + expression + '"\n\n' : ""}`, el);
       placeInDom(clone2, target, modifiers);
       skipDuringClone(() => {
         initTree(clone2);
-        clone2._x_ignore = true;
       })();
     });
     el._x_teleportPutBack = () => {
@@ -3136,7 +3150,10 @@ ${expression ? 'Expression: "' + expression + '"\n\n' : ""}`, el);
         placeInDom(el._x_teleport, target2, modifiers);
       });
     };
-    cleanup2(() => clone2.remove());
+    cleanup2(() => mutateDom(() => {
+      clone2.remove();
+      destroyTree(clone2);
+    }));
   });
   var teleportContainerDuringClone = document.createElement("div");
   function getTarget(expression) {
@@ -3360,7 +3377,7 @@ ${expression ? 'Expression: "' + expression + '"\n\n' : ""}`, el);
       setValue(getInputValue(el, modifiers, e, getValue()));
     });
     if (modifiers.includes("fill")) {
-      if ([void 0, null, ""].includes(getValue()) || el.type === "checkbox" && Array.isArray(getValue()) || el.tagName.toLowerCase() === "select" && el.multiple) {
+      if ([void 0, null, ""].includes(getValue()) || isCheckbox(el) && Array.isArray(getValue()) || el.tagName.toLowerCase() === "select" && el.multiple) {
         setValue(getInputValue(el, modifiers, { target: el }, getValue()));
       }
     }
@@ -3400,7 +3417,7 @@ ${expression ? 'Expression: "' + expression + '"\n\n' : ""}`, el);
     return mutateDom(() => {
       if (event instanceof CustomEvent && event.detail !== void 0)
         return event.detail !== null && event.detail !== void 0 ? event.detail : event.target.value;
-      else if (el.type === "checkbox") {
+      else if (isCheckbox(el)) {
         if (Array.isArray(currentValue)) {
           let newValue = null;
           if (modifiers.includes("number")) {
@@ -3431,7 +3448,7 @@ ${expression ? 'Expression: "' + expression + '"\n\n' : ""}`, el);
         });
       } else {
         let newValue;
-        if (el.type === "radio") {
+        if (isRadio(el)) {
           if (event.target.checked) {
             newValue = event.target.value;
           } else {
@@ -3624,7 +3641,10 @@ ${expression ? 'Expression: "' + expression + '"\n\n' : ""}`, el);
     el._x_lookup = {};
     effect3(() => loop(el, iteratorNames, evaluateItems, evaluateKey));
     cleanup2(() => {
-      Object.values(el._x_lookup).forEach((el2) => el2.remove());
+      Object.values(el._x_lookup).forEach((el2) => mutateDom(() => {
+        destroyTree(el2);
+        el2.remove();
+      }));
       delete el._x_prevKeys;
       delete el._x_lookup;
     });
@@ -3693,11 +3713,12 @@ ${expression ? 'Expression: "' + expression + '"\n\n' : ""}`, el);
       }
       for (let i = 0; i < removes.length; i++) {
         let key = removes[i];
-        if (!!lookup[key]._x_effects) {
-          lookup[key]._x_effects.forEach(dequeueJob);
-        }
-        lookup[key].remove();
-        lookup[key] = null;
+        if (!(key in lookup))
+          continue;
+        mutateDom(() => {
+          destroyTree(lookup[key]);
+          lookup[key].remove();
+        });
         delete lookup[key];
       }
       for (let i = 0; i < moves.length; i++) {
@@ -3818,12 +3839,10 @@ ${expression ? 'Expression: "' + expression + '"\n\n' : ""}`, el);
       });
       el._x_currentIfEl = clone2;
       el._x_undoIf = () => {
-        walk(clone2, (node) => {
-          if (!!node._x_effects) {
-            node._x_effects.forEach(dequeueJob);
-          }
+        mutateDom(() => {
+          destroyTree(clone2);
+          clone2.remove();
         });
-        clone2.remove();
         delete el._x_currentIfEl;
       };
       return clone2;
@@ -4347,6 +4366,7 @@ ${expression ? 'Expression: "' + expression + '"\n\n' : ""}`, el);
     "get": "$get",
     "set": "$set",
     "call": "$call",
+    "hook": "$hook",
     "commit": "$commit",
     "watch": "$watch",
     "entangle": "$entangle",
@@ -4441,6 +4461,16 @@ ${expression ? 'Expression: "' + expression + '"\n\n' : ""}`, el);
   wireProperty("$refresh", (component) => component.$wire.$commit);
   wireProperty("$commit", (component) => async () => await requestCommit(component));
   wireProperty("$on", (component) => (...params) => listen2(component, ...params));
+  wireProperty("$hook", (component) => (name, callback) => {
+    let unhook = on2(name, ({ component: hookComponent, ...params }) => {
+      if (hookComponent === void 0)
+        return callback(params);
+      if (hookComponent.id === component.id)
+        return callback({ component: hookComponent, ...params });
+    });
+    component.addCleanup(unhook);
+    return unhook;
+  });
   wireProperty("$dispatch", (component) => (...params) => dispatch3(component, ...params));
   wireProperty("$dispatchSelf", (component) => (...params) => dispatchSelf(component, ...params));
   wireProperty("$dispatchTo", () => (...params) => dispatchTo(...params));
@@ -4700,6 +4730,16 @@ ${expression ? 'Expression: "' + expression + '"\n\n' : ""}`, el);
       }
     });
   }
+  function globalDirective(name, callback) {
+    if (customDirectiveNames.has(name))
+      return;
+    customDirectiveNames.add(name);
+    on2("directive.global.init", ({ el, directive: directive3, cleanup: cleanup2 }) => {
+      if (directive3.value === name) {
+        callback({ el, directive: directive3, cleanup: cleanup2 });
+      }
+    });
+  }
   function getDirectives(el) {
     return new DirectiveManager(el);
   }
@@ -4968,11 +5008,11 @@ ${expression ? 'Expression: "' + expression + '"\n\n' : ""}`, el);
     var checked = getCheckedRadio(radioSet, node.form);
     return !checked || checked === node;
   };
-  var isRadio = function isRadio2(node) {
+  var isRadio2 = function isRadio22(node) {
     return isInput(node) && node.type === "radio";
   };
   var isNonTabbableRadio = function isNonTabbableRadio2(node) {
-    return isRadio(node) && !isTabbableRadio(node);
+    return isRadio2(node) && !isTabbableRadio(node);
   };
   var isZeroArea = function isZeroArea2(node) {
     var _node$getBoundingClie = node.getBoundingClientRect(), width = _node$getBoundingClie.width, height = _node$getBoundingClie.height;
@@ -5922,6 +5962,51 @@ ${expression ? 'Expression: "' + expression + '"\n\n' : ""}`, el);
   }
   var module_default5 = src_default5;
 
+  // node_modules/@alpinejs/resize/dist/module.esm.js
+  function src_default6(Alpine3) {
+    Alpine3.directive("resize", Alpine3.skipDuringClone((el, { value, expression, modifiers }, { evaluateLater: evaluateLater2, cleanup: cleanup2 }) => {
+      let evaluator = evaluateLater2(expression);
+      let evaluate3 = (width, height) => {
+        evaluator(() => {
+        }, { scope: { "$width": width, "$height": height } });
+      };
+      let off = modifiers.includes("document") ? onDocumentResize(evaluate3) : onElResize(el, evaluate3);
+      cleanup2(() => off());
+    }));
+  }
+  function onElResize(el, callback) {
+    let observer2 = new ResizeObserver((entries) => {
+      let [width, height] = dimensions(entries);
+      callback(width, height);
+    });
+    observer2.observe(el);
+    return () => observer2.disconnect();
+  }
+  var documentResizeObserver;
+  var documentResizeObserverCallbacks = /* @__PURE__ */ new Set();
+  function onDocumentResize(callback) {
+    documentResizeObserverCallbacks.add(callback);
+    if (!documentResizeObserver) {
+      documentResizeObserver = new ResizeObserver((entries) => {
+        let [width, height] = dimensions(entries);
+        documentResizeObserverCallbacks.forEach((i) => i(width, height));
+      });
+      documentResizeObserver.observe(document.documentElement);
+    }
+    return () => {
+      documentResizeObserverCallbacks.delete(callback);
+    };
+  }
+  function dimensions(entries) {
+    let width, height;
+    for (let entry of entries) {
+      width = entry.borderBoxSize[0].inlineSize;
+      height = entry.borderBoxSize[0].blockSize;
+    }
+    return [width, height];
+  }
+  var module_default6 = src_default6;
+
   // ../alpine/packages/anchor/dist/module.esm.js
   var min = Math.min;
   var max = Math.max;
@@ -7096,7 +7181,7 @@ ${expression ? 'Expression: "' + expression + '"\n\n' : ""}`, el);
       platform: platformWithCache
     });
   };
-  function src_default6(Alpine3) {
+  function src_default7(Alpine3) {
     Alpine3.magic("anchor", (el) => {
       if (!el._x_anchor)
         throw "Alpine: No x-anchor directive found on element using $anchor...";
@@ -7154,7 +7239,7 @@ ${expression ? 'Expression: "' + expression + '"\n\n' : ""}`, el);
     let unstyled = modifiers.includes("no-style");
     return { placement, offsetValue, unstyled };
   }
-  var module_default6 = src_default6;
+  var module_default7 = src_default7;
 
   // js/plugins/navigate/history.js
   var Snapshot = class {
@@ -7305,7 +7390,7 @@ ${expression ? 'Expression: "' + expression + '"\n\n' : ""}`, el);
     return createUrlObjectFromString(linkEl.getAttribute("href"));
   }
   function createUrlObjectFromString(urlString) {
-    return new URL(urlString, document.baseURI);
+    return urlString !== null && new URL(urlString, document.baseURI);
   }
   function getUriStringFromUrlObject(urlObject) {
     return urlObject.pathname + urlObject.search + urlObject.hash;
@@ -7426,8 +7511,10 @@ ${expression ? 'Expression: "' + expression + '"\n\n' : ""}`, el);
       }
     };
     queueMicrotask(() => {
-      scroll(document.body);
-      document.querySelectorAll(["[x-navigate\\:scroll]", "[wire\\:scroll]"]).forEach(scroll);
+      queueMicrotask(() => {
+        scroll(document.body);
+        document.querySelectorAll(["[x-navigate\\:scroll]", "[wire\\:scroll]"]).forEach(scroll);
+      });
     });
   }
 
@@ -7575,6 +7662,51 @@ ${expression ? 'Expression: "' + expression + '"\n\n' : ""}`, el);
     document.head.appendChild(style);
   }
 
+  // js/plugins/navigate/popover.js
+  function packUpPersistedPopovers(persistedEl) {
+    if (!isPopoverSupported())
+      return;
+    persistedEl.querySelectorAll(":popover-open").forEach((el) => {
+      el.setAttribute("data-navigate-popover-open", "");
+      let animations = el.getAnimations();
+      el._pausedAnimations = animations.map((animation) => ({
+        keyframes: animation.effect.getKeyframes(),
+        options: {
+          duration: animation.effect.getTiming().duration,
+          easing: animation.effect.getTiming().easing,
+          fill: animation.effect.getTiming().fill,
+          iterations: animation.effect.getTiming().iterations
+        },
+        currentTime: animation.currentTime,
+        playState: animation.playState
+      }));
+      animations.forEach((i) => i.pause());
+    });
+  }
+  function unPackPersistedPopovers(persistedEl) {
+    if (!isPopoverSupported())
+      return;
+    persistedEl.querySelectorAll("[data-navigate-popover-open]").forEach((el) => {
+      el.removeAttribute("data-navigate-popover-open");
+      queueMicrotask(() => {
+        if (!el.isConnected)
+          return;
+        el.showPopover();
+        el.getAnimations().forEach((i) => i.finish());
+        if (el._pausedAnimations) {
+          el._pausedAnimations.forEach(({ keyframes, options, currentTime, now, playState }) => {
+            let animation = el.animate(keyframes, options);
+            animation.currentTime = currentTime;
+          });
+          delete el._pausedAnimations;
+        }
+      });
+    });
+  }
+  function isPopoverSupported() {
+    return typeof document.createElement("div").showPopover === "function";
+  }
+
   // js/plugins/navigate/page.js
   var oldBodyScriptTagHashes = [];
   var attributesExemptFromScriptTagHashing = [
@@ -7642,6 +7774,8 @@ ${expression ? 'Expression: "' + expression + '"\n\n' : ""}`, el);
         child.remove();
     }
     for (let child of Array.from(newHead.children)) {
+      if (child.tagName.toLowerCase() === "noscript")
+        continue;
       document.head.appendChild(child);
     }
     return Promise.all(remoteScriptsPromises);
@@ -7713,7 +7847,7 @@ ${expression ? 'Expression: "' + expression + '"\n\n' : ""}`, el);
   function navigate_default(Alpine3) {
     Alpine3.navigate = (url) => {
       let destination = createUrlObjectFromString(url);
-      let prevented = fireEventForOtherLibariesToHookInto("alpine:navigate", {
+      let prevented = fireEventForOtherLibrariesToHookInto("alpine:navigate", {
         url: destination,
         history: false,
         cached: false
@@ -7730,17 +7864,21 @@ ${expression ? 'Expression: "' + expression + '"\n\n' : ""}`, el);
       let shouldPrefetchOnHover = modifiers.includes("hover");
       shouldPrefetchOnHover && whenThisLinkIsHoveredFor(el, 60, () => {
         let destination = extractDestinationFromLink(el);
+        if (!destination)
+          return;
         prefetchHtml(destination, (html, finalDestination) => {
           storeThePrefetchedHtmlForWhenALinkIsClicked(html, destination, finalDestination);
         });
       });
       whenThisLinkIsPressed(el, (whenItIsReleased) => {
         let destination = extractDestinationFromLink(el);
+        if (!destination)
+          return;
         prefetchHtml(destination, (html, finalDestination) => {
           storeThePrefetchedHtmlForWhenALinkIsClicked(html, destination, finalDestination);
         });
         whenItIsReleased(() => {
-          let prevented = fireEventForOtherLibariesToHookInto("alpine:navigate", {
+          let prevented = fireEventForOtherLibrariesToHookInto("alpine:navigate", {
             url: destination,
             history: false,
             cached: false
@@ -7754,7 +7892,7 @@ ${expression ? 'Expression: "' + expression + '"\n\n' : ""}`, el);
     function navigateTo(destination, shouldPushToHistoryState = true) {
       showProgressBar && showAndStartProgressBar();
       fetchHtmlOrUsePrefetchedHtml(destination, (html, finalDestination) => {
-        fireEventForOtherLibariesToHookInto("alpine:navigating");
+        fireEventForOtherLibrariesToHookInto("alpine:navigating");
         restoreScroll && storeScrollInformationInHtmlBeforeNavigatingAway();
         showProgressBar && finishAndHideProgressBar();
         cleanupAlpineElementsOnThePageThatArentInsideAPersistedElement();
@@ -7762,6 +7900,7 @@ ${expression ? 'Expression: "' + expression + '"\n\n' : ""}`, el);
         preventAlpineFromPickingUpDomChanges(Alpine3, (andAfterAllThis) => {
           enablePersist && storePersistantElementsForLater((persistedEl) => {
             packUpPersistedTeleports(persistedEl);
+            packUpPersistedPopovers(persistedEl);
           });
           if (shouldPushToHistoryState) {
             updateUrlAndStoreLatestHtmlForFutureBackButtons(html, finalDestination);
@@ -7772,6 +7911,7 @@ ${expression ? 'Expression: "' + expression + '"\n\n' : ""}`, el);
             removeAnyLeftOverStaleTeleportTargets(document.body);
             enablePersist && putPersistantElementsBack((persistedEl, newStub) => {
               unPackPersistedTeleports(persistedEl);
+              unPackPersistedPopovers(persistedEl);
             });
             restoreScrollPositionOrScrollToTop();
             afterNewScriptsAreDoneLoading(() => {
@@ -7780,7 +7920,7 @@ ${expression ? 'Expression: "' + expression + '"\n\n' : ""}`, el);
                   autofocus && autofocusElementsWithTheAutofocusAttribute();
                 });
                 nowInitializeAlpineOnTheNewPage(Alpine3);
-                fireEventForOtherLibariesToHookInto("alpine:navigated");
+                fireEventForOtherLibrariesToHookInto("alpine:navigated");
               });
             });
           });
@@ -7790,7 +7930,7 @@ ${expression ? 'Expression: "' + expression + '"\n\n' : ""}`, el);
     whenTheBackOrForwardButtonIsClicked((ifThePageBeingVisitedHasntBeenCached) => {
       ifThePageBeingVisitedHasntBeenCached((url) => {
         let destination = createUrlObjectFromString(url);
-        let prevented = fireEventForOtherLibariesToHookInto("alpine:navigate", {
+        let prevented = fireEventForOtherLibrariesToHookInto("alpine:navigate", {
           url: destination,
           history: true,
           cached: false
@@ -7802,7 +7942,7 @@ ${expression ? 'Expression: "' + expression + '"\n\n' : ""}`, el);
       });
     }, (html, url, currentPageUrl, currentPageKey) => {
       let destination = createUrlObjectFromString(url);
-      let prevented = fireEventForOtherLibariesToHookInto("alpine:navigate", {
+      let prevented = fireEventForOtherLibrariesToHookInto("alpine:navigate", {
         url: destination,
         history: true,
         cached: true
@@ -7810,29 +7950,31 @@ ${expression ? 'Expression: "' + expression + '"\n\n' : ""}`, el);
       if (prevented)
         return;
       storeScrollInformationInHtmlBeforeNavigatingAway();
-      fireEventForOtherLibariesToHookInto("alpine:navigating");
+      fireEventForOtherLibrariesToHookInto("alpine:navigating");
       updateCurrentPageHtmlInSnapshotCacheForLaterBackButtonClicks(currentPageUrl, currentPageKey);
       preventAlpineFromPickingUpDomChanges(Alpine3, (andAfterAllThis) => {
         enablePersist && storePersistantElementsForLater((persistedEl) => {
           packUpPersistedTeleports(persistedEl);
+          packUpPersistedPopovers(persistedEl);
         });
         swapCurrentPageWithNewHtml(html, () => {
           removeAnyLeftOverStaleProgressBars();
           removeAnyLeftOverStaleTeleportTargets(document.body);
           enablePersist && putPersistantElementsBack((persistedEl, newStub) => {
             unPackPersistedTeleports(persistedEl);
+            unPackPersistedPopovers(persistedEl);
           });
           restoreScrollPositionOrScrollToTop();
           andAfterAllThis(() => {
             autofocus && autofocusElementsWithTheAutofocusAttribute();
             nowInitializeAlpineOnTheNewPage(Alpine3);
-            fireEventForOtherLibariesToHookInto("alpine:navigated");
+            fireEventForOtherLibrariesToHookInto("alpine:navigated");
           });
         });
       });
     });
     setTimeout(() => {
-      fireEventForOtherLibariesToHookInto("alpine:navigated");
+      fireEventForOtherLibrariesToHookInto("alpine:navigated");
     });
   }
   function fetchHtmlOrUsePrefetchedHtml(fromDestination, callback) {
@@ -7849,7 +7991,7 @@ ${expression ? 'Expression: "' + expression + '"\n\n' : ""}`, el);
       });
     });
   }
-  function fireEventForOtherLibariesToHookInto(name, detail) {
+  function fireEventForOtherLibrariesToHookInto(name, detail) {
     let event = new CustomEvent(name, {
       cancelable: true,
       bubbles: true,
@@ -8001,24 +8143,24 @@ ${expression ? 'Expression: "' + expression + '"\n\n' : ""}`, el);
         let search = url.search;
         if (!search)
           return false;
-        let data2 = fromQueryString(search);
+        let data2 = fromQueryString(search, key);
         return Object.keys(data2).includes(key);
       },
       get(url, key) {
         let search = url.search;
         if (!search)
           return false;
-        let data2 = fromQueryString(search);
+        let data2 = fromQueryString(search, key);
         return data2[key];
       },
       set(url, key, value) {
-        let data2 = fromQueryString(url.search);
+        let data2 = fromQueryString(url.search, key);
         data2[key] = stripNulls(unwrap(value));
         url.search = toQueryString(data2);
         return url;
       },
       remove(url, key) {
-        let data2 = fromQueryString(url.search);
+        let data2 = fromQueryString(url.search, key);
         delete data2[key];
         url.search = toQueryString(data2);
         return url;
@@ -8054,7 +8196,7 @@ ${expression ? 'Expression: "' + expression + '"\n\n' : ""}`, el);
     let entries = buildQueryStringEntries(data2);
     return Object.entries(entries).map(([key, value]) => `${key}=${value}`).join("&");
   }
-  function fromQueryString(search) {
+  function fromQueryString(search, queryKey) {
     search = search.replace("?", "");
     if (search === "")
       return {};
@@ -8073,10 +8215,12 @@ ${expression ? 'Expression: "' + expression + '"\n\n' : ""}`, el);
       if (typeof value == "undefined")
         return;
       value = decodeURIComponent(value.replaceAll("+", "%20"));
-      if (!key.includes("[")) {
+      let decodedKey = decodeURIComponent(key);
+      let shouldBeHandledAsArray = decodedKey.includes("[") && decodedKey.startsWith(queryKey);
+      if (!shouldBeHandledAsArray) {
         data2[key] = value;
       } else {
-        let dotNotatedKey = key.replaceAll("[", ".").replaceAll("]", "");
+        let dotNotatedKey = decodedKey.replaceAll("[", ".").replaceAll("]", "");
         insertDotNotatedValueIntoData(dotNotatedKey, value, data2);
       }
     });
@@ -8184,6 +8328,7 @@ ${expression ? 'Expression: "' + expression + '"\n\n' : ""}`, el);
             let holdover = fromKeyHoldovers[toKey];
             from2.appendChild(holdover);
             currentFrom = holdover;
+            fromKey = getKey(currentFrom);
           } else {
             if (!shouldSkip(adding, currentTo)) {
               let clone2 = currentTo.cloneNode(true);
@@ -8257,6 +8402,7 @@ ${expression ? 'Expression: "' + expression + '"\n\n' : ""}`, el);
             if (fromKeys[toKey]) {
               currentFrom.replaceWith(fromKeys[toKey]);
               currentFrom = fromKeys[toKey];
+              fromKey = getKey(currentFrom);
             }
           }
           if (toKey && fromKey) {
@@ -8265,6 +8411,7 @@ ${expression ? 'Expression: "' + expression + '"\n\n' : ""}`, el);
               fromKeyHoldovers[fromKey] = currentFrom;
               currentFrom.replaceWith(fromKeyNode);
               currentFrom = fromKeyNode;
+              fromKey = getKey(currentFrom);
             } else {
               fromKeyHoldovers[fromKey] = currentFrom;
               currentFrom = addNodeBefore(from2, currentTo, currentFrom);
@@ -8410,16 +8557,18 @@ ${expression ? 'Expression: "' + expression + '"\n\n' : ""}`, el);
     let fromId = from && from._x_bindings && from._x_bindings.id;
     if (!fromId)
       return;
+    if (!to.setAttribute)
+      return;
     to.setAttribute("id", fromId);
     to.id = fromId;
   }
-  function src_default7(Alpine3) {
+  function src_default8(Alpine3) {
     Alpine3.morph = morph;
   }
-  var module_default7 = src_default7;
+  var module_default8 = src_default8;
 
   // ../alpine/packages/mask/dist/module.esm.js
-  function src_default8(Alpine3) {
+  function src_default9(Alpine3) {
     Alpine3.directive("mask", (el, { value, expression }, { effect: effect3, evaluateLater: evaluateLater2, cleanup: cleanup2 }) => {
       let templateFn = () => expression;
       let lastInputValue = "";
@@ -8444,8 +8593,13 @@ ${expression ? 'Expression: "' + expression + '"\n\n' : ""}`, el);
         } else {
           processInputValue(el, false);
         }
-        if (el._x_model)
+        if (el._x_model) {
+          if (el._x_model.get() === el.value)
+            return;
+          if (el._x_model.get() === null && el.value === "")
+            return;
           el._x_model.set(el.value);
+        }
       });
       const controller = new AbortController();
       cleanup2(() => {
@@ -8581,22 +8735,23 @@ ${expression ? 'Expression: "' + expression + '"\n\n' : ""}`, el);
     });
     return template;
   }
-  var module_default8 = src_default8;
+  var module_default9 = src_default9;
 
   // js/lifecycle.js
   function start2() {
     setTimeout(() => ensureLivewireScriptIsntMisplaced());
     dispatch(document, "livewire:init");
     dispatch(document, "livewire:initializing");
-    module_default.plugin(module_default7);
+    module_default.plugin(module_default8);
     module_default.plugin(history2);
     module_default.plugin(module_default5);
-    module_default.plugin(module_default2);
     module_default.plugin(module_default6);
+    module_default.plugin(module_default2);
+    module_default.plugin(module_default7);
     module_default.plugin(module_default3);
     module_default.plugin(module_default4);
     module_default.plugin(navigate_default);
-    module_default.plugin(module_default8);
+    module_default.plugin(module_default9);
     module_default.addRootSelector(() => "[wire\\:id]");
     module_default.onAttributesAdded((el, attributes) => {
       if (!Array.from(attributes).some((attribute) => matchesForLivewireDirective(attribute.name)))
@@ -8622,10 +8777,15 @@ ${expression ? 'Expression: "' + expression + '"\n\n' : ""}`, el);
           destroyComponent(component2.id);
         });
       }
+      let directives2 = Array.from(el.getAttributeNames()).filter((name) => matchesForLivewireDirective(name)).map((name) => extractDirective(el, name));
+      directives2.forEach((directive3) => {
+        trigger2("directive.global.init", { el, directive: directive3, cleanup: (callback) => {
+          module_default.onAttributeRemoved(el, directive3.raw, callback);
+        } });
+      });
       let component = closestComponent(el, false);
       if (component) {
         trigger2("element.init", { el, component });
-        let directives2 = Array.from(el.getAttributeNames()).filter((name) => matchesForLivewireDirective(name)).map((name) => extractDirective(el, name));
         directives2.forEach((directive3) => {
           trigger2("directive.init", { el, component, directive: directive3, cleanup: (callback) => {
             module_default.onAttributeRemoved(el, directive3.raw, callback);
@@ -8855,6 +9015,7 @@ ${expression ? 'Expression: "' + expression + '"\n\n' : ""}`, el);
       },
       lookahead: false
     });
+    trigger2("morphed", { el, component });
   }
   function isntElement(el) {
     return typeof el.hasAttribute !== "function";
@@ -9362,6 +9523,53 @@ ${expression ? 'Expression: "' + expression + '"\n\n' : ""}`, el);
     };
   });
 
+  // js/directives/wire-current.js
+  module_default.addInitSelector(() => `[wire\\:current]`);
+  var onPageChanges = /* @__PURE__ */ new Map();
+  document.addEventListener("livewire:navigated", () => {
+    onPageChanges.forEach((i) => i(new URL(window.location.href)));
+  });
+  globalDirective("current", ({ el, directive: directive3, cleanup: cleanup2 }) => {
+    let expression = directive3.expression;
+    let options = {
+      exact: directive3.modifiers.includes("exact"),
+      strict: directive3.modifiers.includes("strict")
+    };
+    if (expression.startsWith("#"))
+      return;
+    if (!el.hasAttribute("href"))
+      return;
+    let href = el.getAttribute("href");
+    let hrefUrl = new URL(href, window.location.href);
+    let classes = expression.split(" ").filter(String);
+    let refreshCurrent = (url) => {
+      if (pathMatches(hrefUrl, url, options)) {
+        el.classList.add(...classes);
+      } else {
+        el.classList.remove(...classes);
+      }
+    };
+    refreshCurrent(new URL(window.location.href));
+    onPageChanges.set(el, refreshCurrent);
+    cleanup2(() => onPageChanges.delete(el));
+  });
+  function pathMatches(hrefUrl, actualUrl, options) {
+    if (hrefUrl.hostname !== actualUrl.hostname)
+      return false;
+    let hrefPath = options.strict ? hrefUrl.pathname : hrefUrl.pathname.replace(/\/+$/, "");
+    let actualPath = options.strict ? actualUrl.pathname : actualUrl.pathname.replace(/\/+$/, "");
+    if (options.exact) {
+      return hrefPath === actualPath;
+    }
+    let hrefPathSegments = hrefPath.split("/");
+    let actualPathSegments = actualPath.split("/");
+    for (let i = 0; i < hrefPathSegments.length; i++) {
+      if (hrefPathSegments[i] !== actualPathSegments[i])
+        return false;
+    }
+    return true;
+  }
+
   // js/directives/shared.js
   function toggleBooleanStateDirective(el, directive3, isTruthy, cachedDisplay = null) {
     isTruthy = directive3.modifiers.includes("remove") ? !isTruthy : isTruthy;
@@ -9633,8 +9841,8 @@ ${expression ? 'Expression: "' + expression + '"\n\n' : ""}`, el);
 
   // js/directives/wire-dirty.js
   var refreshDirtyStatesByComponent = new WeakBag();
-  on2("commit", ({ component, respond }) => {
-    respond(() => {
+  on2("commit", ({ component, succeed }) => {
+    succeed(() => {
       setTimeout(() => {
         refreshDirtyStatesByComponent.each(component, (i) => i(false));
       });
diff --git a/public/vendor/livewire/livewire.min.js b/public/vendor/livewire/livewire.min.js
index 36c4171c37..89da8482fb 100644
--- a/public/vendor/livewire/livewire.min.js
+++ b/public/vendor/livewire/livewire.min.js
@@ -1,14 +1,14 @@
-(()=>{var el=Object.create;var ti=Object.defineProperty;var tl=Object.getOwnPropertyDescriptor;var rl=Object.getOwnPropertyNames;var nl=Object.getPrototypeOf,il=Object.prototype.hasOwnProperty;var ol=(e,t)=>()=>(t||e((t={exports:{}}).exports,t),t.exports);var sl=(e,t,r,n)=>{if(t&&typeof t=="object"||typeof t=="function")for(let i of rl(t))!il.call(e,i)&&i!==r&&ti(e,i,{get:()=>t[i],enumerable:!(n=tl(t,i))||n.enumerable});return e};var al=(e,t,r)=>(r=e!=null?el(nl(e)):{},sl(t||!e||!e.__esModule?ti(r,"default",{value:e,enumerable:!0}):r,e));var ua=ol((Dn,la)=>{(function(e,t){typeof define=="function"&&define.amd?define(t):typeof Dn=="object"?la.exports=t():e.NProgress=t()})(Dn,function(){var e={};e.version="0.2.0";var t=e.settings={minimum:.08,easing:"ease",positionUsing:"",speed:200,trickle:!0,trickleRate:.02,trickleSpeed:800,showSpinner:!0,barSelector:'[role="bar"]',spinnerSelector:'[role="spinner"]',parent:"body",template:'<div class="bar" role="bar"><div class="peg"></div></div><div class="spinner" role="spinner"><div class="spinner-icon"></div></div>'};e.configure=function(c){var d,m;for(d in c)m=c[d],m!==void 0&&c.hasOwnProperty(d)&&(t[d]=m);return this},e.status=null,e.set=function(c){var d=e.isStarted();c=r(c,t.minimum,1),e.status=c===1?null:c;var m=e.render(!d),b=m.querySelector(t.barSelector),g=t.speed,y=t.easing;return m.offsetWidth,o(function(v){t.positionUsing===""&&(t.positionUsing=e.getPositioningCSS()),s(b,i(c,g,y)),c===1?(s(m,{transition:"none",opacity:1}),m.offsetWidth,setTimeout(function(){s(m,{transition:"all "+g+"ms linear",opacity:0}),setTimeout(function(){e.remove(),v()},g)},g)):setTimeout(v,g)}),this},e.isStarted=function(){return typeof e.status=="number"},e.start=function(){e.status||e.set(0);var c=function(){setTimeout(function(){!e.status||(e.trickle(),c())},t.trickleSpeed)};return t.trickle&&c(),this},e.done=function(c){return!c&&!e.status?this:e.inc(.3+.5*Math.random()).set(1)},e.inc=function(c){var d=e.status;return d?(typeof c!="number"&&(c=(1-d)*r(Math.random()*d,.1,.95)),d=r(d+c,0,.994),e.set(d)):e.start()},e.trickle=function(){return e.inc(Math.random()*t.trickleRate)},function(){var c=0,d=0;e.promise=function(m){return!m||m.state()==="resolved"?this:(d===0&&e.start(),c++,d++,m.always(function(){d--,d===0?(c=0,e.done()):e.set((c-d)/c)}),this)}}(),e.render=function(c){if(e.isRendered())return document.getElementById("nprogress");l(document.documentElement,"nprogress-busy");var d=document.createElement("div");d.id="nprogress",d.innerHTML=t.template;var m=d.querySelector(t.barSelector),b=c?"-100":n(e.status||0),g=document.querySelector(t.parent),y;return s(m,{transition:"all 0 linear",transform:"translate3d("+b+"%,0,0)"}),t.showSpinner||(y=d.querySelector(t.spinnerSelector),y&&p(y)),g!=document.body&&l(g,"nprogress-custom-parent"),g.appendChild(d),d},e.remove=function(){u(document.documentElement,"nprogress-busy"),u(document.querySelector(t.parent),"nprogress-custom-parent");var c=document.getElementById("nprogress");c&&p(c)},e.isRendered=function(){return!!document.getElementById("nprogress")},e.getPositioningCSS=function(){var c=document.body.style,d="WebkitTransform"in c?"Webkit":"MozTransform"in c?"Moz":"msTransform"in c?"ms":"OTransform"in c?"O":"";return d+"Perspective"in c?"translate3d":d+"Transform"in c?"translate":"margin"};function r(c,d,m){return c<d?d:c>m?m:c}function n(c){return(-1+c)*100}function i(c,d,m){var b;return t.positionUsing==="translate3d"?b={transform:"translate3d("+n(c)+"%,0,0)"}:t.positionUsing==="translate"?b={transform:"translate("+n(c)+"%,0)"}:b={"margin-left":n(c)+"%"},b.transition="all "+d+"ms "+m,b}var o=function(){var c=[];function d(){var m=c.shift();m&&m(d)}return function(m){c.push(m),c.length==1&&d()}}(),s=function(){var c=["Webkit","O","Moz","ms"],d={};function m(v){return v.replace(/^-ms-/,"ms-").replace(/-([\da-z])/gi,function(_,T){return T.toUpperCase()})}function b(v){var _=document.body.style;if(v in _)return v;for(var T=c.length,A=v.charAt(0).toUpperCase()+v.slice(1),w;T--;)if(w=c[T]+A,w in _)return w;return v}function g(v){return v=m(v),d[v]||(d[v]=b(v))}function y(v,_,T){_=g(_),v.style[_]=T}return function(v,_){var T=arguments,A,w;if(T.length==2)for(A in _)w=_[A],w!==void 0&&_.hasOwnProperty(A)&&y(v,A,w);else y(v,T[1],T[2])}}();function a(c,d){var m=typeof c=="string"?c:f(c);return m.indexOf(" "+d+" ")>=0}function l(c,d){var m=f(c),b=m+d;a(m,d)||(c.className=b.substring(1))}function u(c,d){var m=f(c),b;!a(c,d)||(b=m.replace(" "+d+" "," "),c.className=b.substring(1,b.length-1))}function f(c){return(" "+(c.className||"")+" ").replace(/\s+/gi," ")}function p(c){c&&c.parentNode&&c.parentNode.removeChild(c)}return e})});var wt=class{constructor(){this.arrays={}}add(t,r){this.arrays[t]||(this.arrays[t]=[]),this.arrays[t].push(r)}remove(t){this.arrays[t]&&delete this.arrays[t]}get(t){return this.arrays[t]||[]}each(t,r){return this.get(t).forEach(r)}},Fe=class{constructor(){this.arrays=new WeakMap}add(t,r){this.arrays.has(t)||this.arrays.set(t,[]),this.arrays.get(t).push(r)}remove(t){this.arrays.has(t)&&this.arrays.delete(t,[])}get(t){return this.arrays.has(t)?this.arrays.get(t):[]}each(t,r){return this.get(t).forEach(r)}};function yt(e,t,r={},n=!0){e.dispatchEvent(new CustomEvent(t,{detail:r,bubbles:n,composed:!0,cancelable:!0}))}function xt(e,t,r){return e.addEventListener(t,r),()=>e.removeEventListener(t,r)}function _t(e){return typeof e=="object"&&e!==null}function ri(e){return _t(e)&&!vr(e)}function vr(e){return Array.isArray(e)}function br(e){return typeof e=="function"}function ni(e){return typeof e!="object"||e===null}function ce(e){return JSON.parse(JSON.stringify(e))}function W(e,t){return t===""?e:t.split(".").reduce((r,n)=>{if(r!==void 0)return r[n]},e)}function ye(e,t,r){let n=t.split(".");if(n.length===1)return e[t]=r;let i=n.shift(),o=n.join(".");e[i]===void 0&&(e[i]={}),ye(e[i],o,r)}function Qe(e,t,r={},n=""){if(e===t)return r;if(typeof e!=typeof t||ri(e)&&vr(t)||vr(e)&&ri(t)||ni(e)||ni(t))return r[n]=t,r;let i=Object.keys(e);return Object.entries(t).forEach(([o,s])=>{r={...r,...Qe(e[o],t[o],r,n===""?o:`${n}.${o}`)},i=i.filter(a=>a!==o)}),i.forEach(o=>{r[`${n}.${o}`]="__rm__"}),r}function xe(e){let t=ii(e)?e[0]:e,r=ii(e)?e[1]:void 0;return _t(t)&&Object.entries(t).forEach(([n,i])=>{t[n]=xe(i)}),t}function ii(e){return Array.isArray(e)&&e.length===2&&typeof e[1]=="object"&&Object.keys(e[1]).includes("s")}function St(){if(document.querySelector('meta[name="csrf-token"]'))return document.querySelector('meta[name="csrf-token"]').getAttribute("content");if(document.querySelector("[data-csrf]"))return document.querySelector("[data-csrf]").getAttribute("data-csrf");if(window.livewireScriptConfig.csrf??!1)return window.livewireScriptConfig.csrf;throw"Livewire: No CSRF token detected"}var Ie;function oi(){if(Ie)return Ie;if(window.livewireScriptConfig&&(window.livewireScriptConfig.nonce??!1))return Ie=window.livewireScriptConfig.nonce,Ie;let e=document.querySelector("style[data-livewire-style][nonce]");return e?(Ie=e.nonce,Ie):null}function si(){return document.querySelector("[data-update-uri]")?.getAttribute("data-update-uri")??window.livewireScriptConfig.uri??null}function Et(e){return!!e.match(/<script>Sfdump\(".+"\)<\/script>/)}function ai(e){let t=e.match(/.*<script>Sfdump\(".+"\)<\/script>/s);return[t,e.replace(t,"")]}var wr=new WeakMap;function et(e){if(!wr.has(e)){let t=new yr(e);wr.set(e,t),t.registerListeners()}return wr.get(e)}function li(e,t,r,n){let i=et(r),o=()=>e.dispatchEvent(new CustomEvent("livewire-upload-start",{bubbles:!0,detail:{id:r.id,property:t}})),s=()=>e.dispatchEvent(new CustomEvent("livewire-upload-finish",{bubbles:!0,detail:{id:r.id,property:t}})),a=()=>e.dispatchEvent(new CustomEvent("livewire-upload-error",{bubbles:!0,detail:{id:r.id,property:t}})),l=()=>e.dispatchEvent(new CustomEvent("livewire-upload-cancel",{bubbles:!0,detail:{id:r.id,property:t}})),u=c=>{var d=Math.round(c.loaded*100/c.total);e.dispatchEvent(new CustomEvent("livewire-upload-progress",{bubbles:!0,detail:{progress:d}}))},f=c=>{c.target.files.length!==0&&(o(),c.target.multiple?i.uploadMultiple(t,c.target.files,s,a,u,l):i.upload(t,c.target.files[0],s,a,u,l))};e.addEventListener("change",f),r.$wire.$watch(t,c=>{!e.isConnected||(c===null||c==="")&&(e.value="")});let p=()=>{e.value=null};e.addEventListener("click",p),e.addEventListener("livewire-upload-cancel",p),n(()=>{e.removeEventListener("change",f),e.removeEventListener("click",p)})}var yr=class{constructor(t){this.component=t,this.uploadBag=new Ze,this.removeBag=new Ze}registerListeners(){this.component.$wire.$on("upload:generatedSignedUrl",({name:t,url:r})=>{this.component,this.handleSignedUrl(t,r)}),this.component.$wire.$on("upload:generatedSignedUrlForS3",({name:t,payload:r})=>{this.component,this.handleS3PreSignedUrl(t,r)}),this.component.$wire.$on("upload:finished",({name:t,tmpFilenames:r})=>this.markUploadFinished(t,r)),this.component.$wire.$on("upload:errored",({name:t})=>this.markUploadErrored(t)),this.component.$wire.$on("upload:removed",({name:t,tmpFilename:r})=>this.removeBag.shift(t).finishCallback(r))}upload(t,r,n,i,o,s){this.setUpload(t,{files:[r],multiple:!1,finishCallback:n,errorCallback:i,progressCallback:o,cancelledCallback:s})}uploadMultiple(t,r,n,i,o,s){this.setUpload(t,{files:Array.from(r),multiple:!0,finishCallback:n,errorCallback:i,progressCallback:o,cancelledCallback:s})}removeUpload(t,r,n){this.removeBag.push(t,{tmpFilename:r,finishCallback:n}),this.component.$wire.call("_removeUpload",t,r)}setUpload(t,r){this.uploadBag.add(t,r),this.uploadBag.get(t).length===1&&this.startUpload(t,r)}handleSignedUrl(t,r){let n=new FormData;Array.from(this.uploadBag.first(t).files).forEach(s=>n.append("files[]",s,s.name));let i={Accept:"application/json"},o=St();o&&(i["X-CSRF-TOKEN"]=o),this.makeRequest(t,n,"post",r,i,s=>s.paths)}handleS3PreSignedUrl(t,r){let n=this.uploadBag.first(t).files[0],i=r.headers;"Host"in i&&delete i.Host;let o=r.url;this.makeRequest(t,n,"put",o,i,s=>[r.path])}makeRequest(t,r,n,i,o,s){let a=new XMLHttpRequest;a.open(n,i),Object.entries(o).forEach(([l,u])=>{a.setRequestHeader(l,u)}),a.upload.addEventListener("progress",l=>{l.detail={},l.detail.progress=Math.floor(l.loaded*100/l.total),this.uploadBag.first(t).progressCallback(l)}),a.addEventListener("load",()=>{if((a.status+"")[0]==="2"){let u=s(a.response&&JSON.parse(a.response));this.component.$wire.call("_finishUpload",t,u,this.uploadBag.first(t).multiple);return}let l=null;a.status===422&&(l=a.response),this.component.$wire.call("_uploadErrored",t,l,this.uploadBag.first(t).multiple)}),this.uploadBag.first(t).request=a,a.send(r)}startUpload(t,r){let n=r.files.map(i=>({name:i.name,size:i.size,type:i.type}));this.component.$wire.call("_startUpload",t,n,r.multiple),this.component}markUploadFinished(t,r){this.component;let n=this.uploadBag.shift(t);n.finishCallback(n.multiple?r:r[0]),this.uploadBag.get(t).length>0&&this.startUpload(t,this.uploadBag.last(t))}markUploadErrored(t){this.component,this.uploadBag.shift(t).errorCallback(),this.uploadBag.get(t).length>0&&this.startUpload(t,this.uploadBag.last(t))}cancelUpload(t,r=null){this.component;let n=this.uploadBag.first(t);n&&(n.request&&n.request.abort(),this.uploadBag.shift(t).cancelledCallback(),r&&r())}},Ze=class{constructor(){this.bag={}}add(t,r){this.bag[t]||(this.bag[t]=[]),this.bag[t].push(r)}push(t,r){this.add(t,r)}first(t){return this.bag[t]?this.bag[t][0]:null}last(t){return this.bag[t].slice(-1)[0]}get(t){return this.bag[t]}shift(t){return this.bag[t].shift()}call(t,...r){(this.listeners[t]||[]).forEach(n=>{n(...r)})}has(t){return Object.keys(this.listeners).includes(t)}};function ui(e,t,r,n=()=>{},i=()=>{},o=()=>{},s=()=>{}){et(e).upload(t,r,n,i,o,s)}function ci(e,t,r,n=()=>{},i=()=>{},o=()=>{},s=()=>{}){et(e).uploadMultiple(t,r,n,i,o,s)}function fi(e,t,r,n=()=>{},i=()=>{}){et(e).removeUpload(t,r,n,i)}function di(e,t,r=()=>{}){et(e).cancelUpload(t,r)}var Cr=!1,Or=!1,Ee=[],Tr=-1;function ll(e){ul(e)}function ul(e){Ee.includes(e)||Ee.push(e),cl()}function Oi(e){let t=Ee.indexOf(e);t!==-1&&t>Tr&&Ee.splice(t,1)}function cl(){!Or&&!Cr&&(Cr=!0,queueMicrotask(fl))}function fl(){Cr=!1,Or=!0;for(let e=0;e<Ee.length;e++)Ee[e](),Tr=e;Ee.length=0,Tr=-1,Or=!1}var Be,Te,Ue,Ti,kr=!0;function dl(e){kr=!1,e(),kr=!0}function pl(e){Be=e.reactive,Ue=e.release,Te=t=>e.effect(t,{scheduler:r=>{kr?ll(r):r()}}),Ti=e.raw}function pi(e){Te=e}function hl(e){let t=()=>{};return[n=>{let i=Te(n);return e._x_effects||(e._x_effects=new Set,e._x_runEffects=()=>{e._x_effects.forEach(o=>o())}),e._x_effects.add(i),t=()=>{i!==void 0&&(e._x_effects.delete(i),Ue(i))},i},()=>{t()}]}function ki(e,t){let r=!0,n,i=Te(()=>{let o=e();JSON.stringify(o),r?n=o:queueMicrotask(()=>{t(o,n),n=o}),r=!1});return()=>Ue(i)}var Li=[],Ni=[],Ri=[];function ml(e){Ri.push(e)}function qr(e,t){typeof t=="function"?(e._x_cleanups||(e._x_cleanups=[]),e._x_cleanups.push(t)):(t=e,Ni.push(t))}function Pi(e){Li.push(e)}function Mi(e,t,r){e._x_attributeCleanups||(e._x_attributeCleanups={}),e._x_attributeCleanups[t]||(e._x_attributeCleanups[t]=[]),e._x_attributeCleanups[t].push(r)}function Ii(e,t){!e._x_attributeCleanups||Object.entries(e._x_attributeCleanups).forEach(([r,n])=>{(t===void 0||t.includes(r))&&(n.forEach(i=>i()),delete e._x_attributeCleanups[r])})}function gl(e){if(e._x_cleanups)for(;e._x_cleanups.length;)e._x_cleanups.pop()()}var Wr=new MutationObserver(Jr),Kr=!1;function zr(){Wr.observe(document,{subtree:!0,childList:!0,attributes:!0,attributeOldValue:!0}),Kr=!0}function Fi(){vl(),Wr.disconnect(),Kr=!1}var tt=[];function vl(){let e=Wr.takeRecords();tt.push(()=>e.length>0&&Jr(e));let t=tt.length;queueMicrotask(()=>{if(tt.length===t)for(;tt.length>0;)tt.shift()()})}function B(e){if(!Kr)return e();Fi();let t=e();return zr(),t}var Vr=!1,Rt=[];function bl(){Vr=!0}function wl(){Vr=!1,Jr(Rt),Rt=[]}function Jr(e){if(Vr){Rt=Rt.concat(e);return}let t=new Set,r=new Set,n=new Map,i=new Map;for(let o=0;o<e.length;o++)if(!e[o].target._x_ignoreMutationObserver&&(e[o].type==="childList"&&(e[o].addedNodes.forEach(s=>s.nodeType===1&&t.add(s)),e[o].removedNodes.forEach(s=>s.nodeType===1&&r.add(s))),e[o].type==="attributes")){let s=e[o].target,a=e[o].attributeName,l=e[o].oldValue,u=()=>{n.has(s)||n.set(s,[]),n.get(s).push({name:a,value:s.getAttribute(a)})},f=()=>{i.has(s)||i.set(s,[]),i.get(s).push(a)};s.hasAttribute(a)&&l===null?u():s.hasAttribute(a)?(f(),u()):f()}i.forEach((o,s)=>{Ii(s,o)}),n.forEach((o,s)=>{Li.forEach(a=>a(s,o))});for(let o of r)t.has(o)||Ni.forEach(s=>s(o));t.forEach(o=>{o._x_ignoreSelf=!0,o._x_ignore=!0});for(let o of t)r.has(o)||!o.isConnected||(delete o._x_ignoreSelf,delete o._x_ignore,Ri.forEach(s=>s(o)),o._x_ignore=!0,o._x_ignoreSelf=!0);t.forEach(o=>{delete o._x_ignoreSelf,delete o._x_ignore}),t=null,r=null,n=null,i=null}function $i(e){return ut($e(e))}function lt(e,t,r){return e._x_dataStack=[t,...$e(r||e)],()=>{e._x_dataStack=e._x_dataStack.filter(n=>n!==t)}}function $e(e){return e._x_dataStack?e._x_dataStack:typeof ShadowRoot=="function"&&e instanceof ShadowRoot?$e(e.host):e.parentNode?$e(e.parentNode):[]}function ut(e){return new Proxy({objects:e},yl)}var yl={ownKeys({objects:e}){return Array.from(new Set(e.flatMap(t=>Object.keys(t))))},has({objects:e},t){return t==Symbol.unscopables?!1:e.some(r=>Object.prototype.hasOwnProperty.call(r,t)||Reflect.has(r,t))},get({objects:e},t,r){return t=="toJSON"?xl:Reflect.get(e.find(n=>Reflect.has(n,t))||{},t,r)},set({objects:e},t,r,n){let i=e.find(s=>Object.prototype.hasOwnProperty.call(s,t))||e[e.length-1],o=Object.getOwnPropertyDescriptor(i,t);return o?.set&&o?.get?o.set.call(n,r)||!0:Reflect.set(i,t,r)}};function xl(){return Reflect.ownKeys(this).reduce((t,r)=>(t[r]=Reflect.get(this,r),t),{})}function Di(e){let t=n=>typeof n=="object"&&!Array.isArray(n)&&n!==null,r=(n,i="")=>{Object.entries(Object.getOwnPropertyDescriptors(n)).forEach(([o,{value:s,enumerable:a}])=>{if(a===!1||s===void 0||typeof s=="object"&&s!==null&&s.__v_skip)return;let l=i===""?o:`${i}.${o}`;typeof s=="object"&&s!==null&&s._x_interceptor?n[o]=s.initialize(e,l,o):t(s)&&s!==n&&!(s instanceof Element)&&r(s,l)})};return r(e)}function Bi(e,t=()=>{}){let r={initialValue:void 0,_x_interceptor:!0,initialize(n,i,o){return e(this.initialValue,()=>_l(n,i),s=>Lr(n,i,s),i,o)}};return t(r),n=>{if(typeof n=="object"&&n!==null&&n._x_interceptor){let i=r.initialize.bind(r);r.initialize=(o,s,a)=>{let l=n.initialize(o,s,a);return r.initialValue=l,i(o,s,a)}}else r.initialValue=n;return r}}function _l(e,t){return t.split(".").reduce((r,n)=>r[n],e)}function Lr(e,t,r){if(typeof t=="string"&&(t=t.split(".")),t.length===1)e[t[0]]=r;else{if(t.length===0)throw error;return e[t[0]]||(e[t[0]]={}),Lr(e[t[0]],t.slice(1),r)}}var Ui={};function Z(e,t){Ui[e]=t}function Nr(e,t){return Object.entries(Ui).forEach(([r,n])=>{let i=null;function o(){if(i)return i;{let[s,a]=zi(t);return i={interceptor:Bi,...s},qr(t,a),i}}Object.defineProperty(e,`$${r}`,{get(){return n(t,o())},enumerable:!1})}),e}function Sl(e,t,r,...n){try{return r(...n)}catch(i){at(i,e,t)}}function at(e,t,r=void 0){e=Object.assign(e??{message:"No error message given."},{el:t,expression:r}),console.warn(`Alpine Expression Error: ${e.message}
+(()=>{var cl=Object.create;var li=Object.defineProperty;var fl=Object.getOwnPropertyDescriptor;var dl=Object.getOwnPropertyNames;var pl=Object.getPrototypeOf,hl=Object.prototype.hasOwnProperty;var ml=(e,t)=>()=>(t||e((t={exports:{}}).exports,t),t.exports);var gl=(e,t,r,n)=>{if(t&&typeof t=="object"||typeof t=="function")for(let i of dl(t))!hl.call(e,i)&&i!==r&&li(e,i,{get:()=>t[i],enumerable:!(n=fl(t,i))||n.enumerable});return e};var vl=(e,t,r)=>(r=e!=null?cl(pl(e)):{},gl(t||!e||!e.__esModule?li(r,"default",{value:e,enumerable:!0}):r,e));var ba=ml((jn,va)=>{(function(e,t){typeof define=="function"&&define.amd?define(t):typeof jn=="object"?va.exports=t():e.NProgress=t()})(jn,function(){var e={};e.version="0.2.0";var t=e.settings={minimum:.08,easing:"ease",positionUsing:"",speed:200,trickle:!0,trickleRate:.02,trickleSpeed:800,showSpinner:!0,barSelector:'[role="bar"]',spinnerSelector:'[role="spinner"]',parent:"body",template:'<div class="bar" role="bar"><div class="peg"></div></div><div class="spinner" role="spinner"><div class="spinner-icon"></div></div>'};e.configure=function(c){var d,m;for(d in c)m=c[d],m!==void 0&&c.hasOwnProperty(d)&&(t[d]=m);return this},e.status=null,e.set=function(c){var d=e.isStarted();c=r(c,t.minimum,1),e.status=c===1?null:c;var m=e.render(!d),b=m.querySelector(t.barSelector),g=t.speed,y=t.easing;return m.offsetWidth,o(function(v){t.positionUsing===""&&(t.positionUsing=e.getPositioningCSS()),s(b,i(c,g,y)),c===1?(s(m,{transition:"none",opacity:1}),m.offsetWidth,setTimeout(function(){s(m,{transition:"all "+g+"ms linear",opacity:0}),setTimeout(function(){e.remove(),v()},g)},g)):setTimeout(v,g)}),this},e.isStarted=function(){return typeof e.status=="number"},e.start=function(){e.status||e.set(0);var c=function(){setTimeout(function(){!e.status||(e.trickle(),c())},t.trickleSpeed)};return t.trickle&&c(),this},e.done=function(c){return!c&&!e.status?this:e.inc(.3+.5*Math.random()).set(1)},e.inc=function(c){var d=e.status;return d?(typeof c!="number"&&(c=(1-d)*r(Math.random()*d,.1,.95)),d=r(d+c,0,.994),e.set(d)):e.start()},e.trickle=function(){return e.inc(Math.random()*t.trickleRate)},function(){var c=0,d=0;e.promise=function(m){return!m||m.state()==="resolved"?this:(d===0&&e.start(),c++,d++,m.always(function(){d--,d===0?(c=0,e.done()):e.set((c-d)/c)}),this)}}(),e.render=function(c){if(e.isRendered())return document.getElementById("nprogress");l(document.documentElement,"nprogress-busy");var d=document.createElement("div");d.id="nprogress",d.innerHTML=t.template;var m=d.querySelector(t.barSelector),b=c?"-100":n(e.status||0),g=document.querySelector(t.parent),y;return s(m,{transition:"all 0 linear",transform:"translate3d("+b+"%,0,0)"}),t.showSpinner||(y=d.querySelector(t.spinnerSelector),y&&p(y)),g!=document.body&&l(g,"nprogress-custom-parent"),g.appendChild(d),d},e.remove=function(){u(document.documentElement,"nprogress-busy"),u(document.querySelector(t.parent),"nprogress-custom-parent");var c=document.getElementById("nprogress");c&&p(c)},e.isRendered=function(){return!!document.getElementById("nprogress")},e.getPositioningCSS=function(){var c=document.body.style,d="WebkitTransform"in c?"Webkit":"MozTransform"in c?"Moz":"msTransform"in c?"ms":"OTransform"in c?"O":"";return d+"Perspective"in c?"translate3d":d+"Transform"in c?"translate":"margin"};function r(c,d,m){return c<d?d:c>m?m:c}function n(c){return(-1+c)*100}function i(c,d,m){var b;return t.positionUsing==="translate3d"?b={transform:"translate3d("+n(c)+"%,0,0)"}:t.positionUsing==="translate"?b={transform:"translate("+n(c)+"%,0)"}:b={"margin-left":n(c)+"%"},b.transition="all "+d+"ms "+m,b}var o=function(){var c=[];function d(){var m=c.shift();m&&m(d)}return function(m){c.push(m),c.length==1&&d()}}(),s=function(){var c=["Webkit","O","Moz","ms"],d={};function m(v){return v.replace(/^-ms-/,"ms-").replace(/-([\da-z])/gi,function(_,A){return A.toUpperCase()})}function b(v){var _=document.body.style;if(v in _)return v;for(var A=c.length,C=v.charAt(0).toUpperCase()+v.slice(1),w;A--;)if(w=c[A]+C,w in _)return w;return v}function g(v){return v=m(v),d[v]||(d[v]=b(v))}function y(v,_,A){_=g(_),v.style[_]=A}return function(v,_){var A=arguments,C,w;if(A.length==2)for(C in _)w=_[C],w!==void 0&&_.hasOwnProperty(C)&&y(v,C,w);else y(v,A[1],A[2])}}();function a(c,d){var m=typeof c=="string"?c:f(c);return m.indexOf(" "+d+" ")>=0}function l(c,d){var m=f(c),b=m+d;a(m,d)||(c.className=b.substring(1))}function u(c,d){var m=f(c),b;!a(c,d)||(b=m.replace(" "+d+" "," "),c.className=b.substring(1,b.length-1))}function f(c){return(" "+(c.className||"")+" ").replace(/\s+/gi," ")}function p(c){c&&c.parentNode&&c.parentNode.removeChild(c)}return e})});var xt=class{constructor(){this.arrays={}}add(t,r){this.arrays[t]||(this.arrays[t]=[]),this.arrays[t].push(r)}remove(t){this.arrays[t]&&delete this.arrays[t]}get(t){return this.arrays[t]||[]}each(t,r){return this.get(t).forEach(r)}},Fe=class{constructor(){this.arrays=new WeakMap}add(t,r){this.arrays.has(t)||this.arrays.set(t,[]),this.arrays.get(t).push(r)}remove(t){this.arrays.has(t)&&this.arrays.delete(t,[])}get(t){return this.arrays.has(t)?this.arrays.get(t):[]}each(t,r){return this.get(t).forEach(r)}};function _t(e,t,r={},n=!0){e.dispatchEvent(new CustomEvent(t,{detail:r,bubbles:n,composed:!0,cancelable:!0}))}function St(e,t,r){return e.addEventListener(t,r),()=>e.removeEventListener(t,r)}function Et(e){return typeof e=="object"&&e!==null}function ui(e){return Et(e)&&!wr(e)}function wr(e){return Array.isArray(e)}function yr(e){return typeof e=="function"}function ci(e){return typeof e!="object"||e===null}function ce(e){return JSON.parse(JSON.stringify(e))}function W(e,t){return t===""?e:t.split(".").reduce((r,n)=>r?.[n],e)}function we(e,t,r){let n=t.split(".");if(n.length===1)return e[t]=r;let i=n.shift(),o=n.join(".");e[i]===void 0&&(e[i]={}),we(e[i],o,r)}function et(e,t,r={},n=""){if(e===t)return r;if(typeof e!=typeof t||ui(e)&&wr(t)||wr(e)&&ui(t)||ci(e)||ci(t))return r[n]=t,r;let i=Object.keys(e);return Object.entries(t).forEach(([o,s])=>{r={...r,...et(e[o],t[o],r,n===""?o:`${n}.${o}`)},i=i.filter(a=>a!==o)}),i.forEach(o=>{r[`${n}.${o}`]="__rm__"}),r}function ye(e){let t=fi(e)?e[0]:e,r=fi(e)?e[1]:void 0;return Et(t)&&Object.entries(t).forEach(([n,i])=>{t[n]=ye(i)}),t}function fi(e){return Array.isArray(e)&&e.length===2&&typeof e[1]=="object"&&Object.keys(e[1]).includes("s")}function At(){if(document.querySelector('meta[name="csrf-token"]'))return document.querySelector('meta[name="csrf-token"]').getAttribute("content");if(document.querySelector("[data-csrf]"))return document.querySelector("[data-csrf]").getAttribute("data-csrf");if(window.livewireScriptConfig.csrf??!1)return window.livewireScriptConfig.csrf;throw"Livewire: No CSRF token detected"}var Ie;function di(){if(Ie)return Ie;if(window.livewireScriptConfig&&(window.livewireScriptConfig.nonce??!1))return Ie=window.livewireScriptConfig.nonce,Ie;let e=document.querySelector("style[data-livewire-style][nonce]");return e?(Ie=e.nonce,Ie):null}function pi(){return document.querySelector("[data-update-uri]")?.getAttribute("data-update-uri")??window.livewireScriptConfig.uri??null}function Ct(e){return!!e.match(/<script>Sfdump\(".+"\)<\/script>/)}function hi(e){let t=e.match(/.*<script>Sfdump\(".+"\)<\/script>/s);return[t,e.replace(t,"")]}var xr=new WeakMap;function rt(e){if(!xr.has(e)){let t=new _r(e);xr.set(e,t),t.registerListeners()}return xr.get(e)}function mi(e,t,r,n){let i=rt(r),o=()=>e.dispatchEvent(new CustomEvent("livewire-upload-start",{bubbles:!0,detail:{id:r.id,property:t}})),s=()=>e.dispatchEvent(new CustomEvent("livewire-upload-finish",{bubbles:!0,detail:{id:r.id,property:t}})),a=()=>e.dispatchEvent(new CustomEvent("livewire-upload-error",{bubbles:!0,detail:{id:r.id,property:t}})),l=()=>e.dispatchEvent(new CustomEvent("livewire-upload-cancel",{bubbles:!0,detail:{id:r.id,property:t}})),u=c=>{var d=Math.round(c.loaded*100/c.total);e.dispatchEvent(new CustomEvent("livewire-upload-progress",{bubbles:!0,detail:{progress:d}}))},f=c=>{c.target.files.length!==0&&(o(),c.target.multiple?i.uploadMultiple(t,c.target.files,s,a,u,l):i.upload(t,c.target.files[0],s,a,u,l))};e.addEventListener("change",f),r.$wire.$watch(t,c=>{!e.isConnected||((c===null||c==="")&&(e.value=""),e.multiple&&Array.isArray(c)&&c.length===0&&(e.value=""))});let p=()=>{e.value=null};e.addEventListener("click",p),e.addEventListener("livewire-upload-cancel",p),n(()=>{e.removeEventListener("change",f),e.removeEventListener("click",p)})}var _r=class{constructor(t){this.component=t,this.uploadBag=new tt,this.removeBag=new tt}registerListeners(){this.component.$wire.$on("upload:generatedSignedUrl",({name:t,url:r})=>{this.component,this.handleSignedUrl(t,r)}),this.component.$wire.$on("upload:generatedSignedUrlForS3",({name:t,payload:r})=>{this.component,this.handleS3PreSignedUrl(t,r)}),this.component.$wire.$on("upload:finished",({name:t,tmpFilenames:r})=>this.markUploadFinished(t,r)),this.component.$wire.$on("upload:errored",({name:t})=>this.markUploadErrored(t)),this.component.$wire.$on("upload:removed",({name:t,tmpFilename:r})=>this.removeBag.shift(t).finishCallback(r))}upload(t,r,n,i,o,s){this.setUpload(t,{files:[r],multiple:!1,finishCallback:n,errorCallback:i,progressCallback:o,cancelledCallback:s})}uploadMultiple(t,r,n,i,o,s){this.setUpload(t,{files:Array.from(r),multiple:!0,finishCallback:n,errorCallback:i,progressCallback:o,cancelledCallback:s})}removeUpload(t,r,n){this.removeBag.push(t,{tmpFilename:r,finishCallback:n}),this.component.$wire.call("_removeUpload",t,r)}setUpload(t,r){this.uploadBag.add(t,r),this.uploadBag.get(t).length===1&&this.startUpload(t,r)}handleSignedUrl(t,r){let n=new FormData;Array.from(this.uploadBag.first(t).files).forEach(s=>n.append("files[]",s,s.name));let i={Accept:"application/json"},o=At();o&&(i["X-CSRF-TOKEN"]=o),this.makeRequest(t,n,"post",r,i,s=>s.paths)}handleS3PreSignedUrl(t,r){let n=this.uploadBag.first(t).files[0],i=r.headers;"Host"in i&&delete i.Host;let o=r.url;this.makeRequest(t,n,"put",o,i,s=>[r.path])}makeRequest(t,r,n,i,o,s){let a=new XMLHttpRequest;a.open(n,i),Object.entries(o).forEach(([l,u])=>{a.setRequestHeader(l,u)}),a.upload.addEventListener("progress",l=>{l.detail={},l.detail.progress=Math.floor(l.loaded*100/l.total),this.uploadBag.first(t).progressCallback(l)}),a.addEventListener("load",()=>{if((a.status+"")[0]==="2"){let u=s(a.response&&JSON.parse(a.response));this.component.$wire.call("_finishUpload",t,u,this.uploadBag.first(t).multiple);return}let l=null;a.status===422&&(l=a.response),this.component.$wire.call("_uploadErrored",t,l,this.uploadBag.first(t).multiple)}),this.uploadBag.first(t).request=a,a.send(r)}startUpload(t,r){let n=r.files.map(i=>({name:i.name,size:i.size,type:i.type}));this.component.$wire.call("_startUpload",t,n,r.multiple),this.component}markUploadFinished(t,r){this.component;let n=this.uploadBag.shift(t);n.finishCallback(n.multiple?r:r[0]),this.uploadBag.get(t).length>0&&this.startUpload(t,this.uploadBag.last(t))}markUploadErrored(t){this.component,this.uploadBag.shift(t).errorCallback(),this.uploadBag.get(t).length>0&&this.startUpload(t,this.uploadBag.last(t))}cancelUpload(t,r=null){this.component;let n=this.uploadBag.first(t);n&&(n.request&&n.request.abort(),this.uploadBag.shift(t).cancelledCallback(),r&&r())}},tt=class{constructor(){this.bag={}}add(t,r){this.bag[t]||(this.bag[t]=[]),this.bag[t].push(r)}push(t,r){this.add(t,r)}first(t){return this.bag[t]?this.bag[t][0]:null}last(t){return this.bag[t].slice(-1)[0]}get(t){return this.bag[t]}shift(t){return this.bag[t].shift()}call(t,...r){(this.listeners[t]||[]).forEach(n=>{n(...r)})}has(t){return Object.keys(this.listeners).includes(t)}};function gi(e,t,r,n=()=>{},i=()=>{},o=()=>{},s=()=>{}){rt(e).upload(t,r,n,i,o,s)}function vi(e,t,r,n=()=>{},i=()=>{},o=()=>{},s=()=>{}){rt(e).uploadMultiple(t,r,n,i,o,s)}function bi(e,t,r,n=()=>{},i=()=>{}){rt(e).removeUpload(t,r,n,i)}function wi(e,t,r=()=>{}){rt(e).cancelUpload(t,r)}var Tr=!1,kr=!1,Se=[],Lr=-1;function bl(e){wl(e)}function wl(e){Se.includes(e)||Se.push(e),xl()}function yl(e){let t=Se.indexOf(e);t!==-1&&t>Lr&&Se.splice(t,1)}function xl(){!kr&&!Tr&&(Tr=!0,queueMicrotask(_l))}function _l(){Tr=!1,kr=!0;for(let e=0;e<Se.length;e++)Se[e](),Lr=e;Se.length=0,Lr=-1,kr=!1}var Be,Te,Ue,Mi,Pr=!0;function Sl(e){Pr=!1,e(),Pr=!0}function El(e){Be=e.reactive,Ue=e.release,Te=t=>e.effect(t,{scheduler:r=>{Pr?bl(r):r()}}),Mi=e.raw}function yi(e){Te=e}function Al(e){let t=()=>{};return[n=>{let i=Te(n);return e._x_effects||(e._x_effects=new Set,e._x_runEffects=()=>{e._x_effects.forEach(o=>o())}),e._x_effects.add(i),t=()=>{i!==void 0&&(e._x_effects.delete(i),Ue(i))},i},()=>{t()}]}function Ii(e,t){let r=!0,n,i=Te(()=>{let o=e();JSON.stringify(o),r?n=o:queueMicrotask(()=>{t(o,n),n=o}),r=!1});return()=>Ue(i)}var Fi=[],$i=[],Di=[];function Cl(e){Di.push(e)}function zr(e,t){typeof t=="function"?(e._x_cleanups||(e._x_cleanups=[]),e._x_cleanups.push(t)):(t=e,$i.push(t))}function Bi(e){Fi.push(e)}function Ui(e,t,r){e._x_attributeCleanups||(e._x_attributeCleanups={}),e._x_attributeCleanups[t]||(e._x_attributeCleanups[t]=[]),e._x_attributeCleanups[t].push(r)}function Hi(e,t){!e._x_attributeCleanups||Object.entries(e._x_attributeCleanups).forEach(([r,n])=>{(t===void 0||t.includes(r))&&(n.forEach(i=>i()),delete e._x_attributeCleanups[r])})}function Ol(e){for(e._x_effects?.forEach(yl);e._x_cleanups?.length;)e._x_cleanups.pop()()}var Kr=new MutationObserver(Xr),Vr=!1;function Jr(){Kr.observe(document,{subtree:!0,childList:!0,attributes:!0,attributeOldValue:!0}),Vr=!0}function ji(){Tl(),Kr.disconnect(),Vr=!1}var nt=[];function Tl(){let e=Kr.takeRecords();nt.push(()=>e.length>0&&Xr(e));let t=nt.length;queueMicrotask(()=>{if(nt.length===t)for(;nt.length>0;)nt.shift()()})}function F(e){if(!Vr)return e();ji();let t=e();return Jr(),t}var Gr=!1,Mt=[];function kl(){Gr=!0}function Ll(){Gr=!1,Xr(Mt),Mt=[]}function Xr(e){if(Gr){Mt=Mt.concat(e);return}let t=[],r=new Set,n=new Map,i=new Map;for(let o=0;o<e.length;o++)if(!e[o].target._x_ignoreMutationObserver&&(e[o].type==="childList"&&(e[o].removedNodes.forEach(s=>{s.nodeType===1&&(!s._x_marker||r.add(s))}),e[o].addedNodes.forEach(s=>{if(s.nodeType===1){if(r.has(s)){r.delete(s);return}s._x_marker||t.push(s)}})),e[o].type==="attributes")){let s=e[o].target,a=e[o].attributeName,l=e[o].oldValue,u=()=>{n.has(s)||n.set(s,[]),n.get(s).push({name:a,value:s.getAttribute(a)})},f=()=>{i.has(s)||i.set(s,[]),i.get(s).push(a)};s.hasAttribute(a)&&l===null?u():s.hasAttribute(a)?(f(),u()):f()}i.forEach((o,s)=>{Hi(s,o)}),n.forEach((o,s)=>{Fi.forEach(a=>a(s,o))});for(let o of r)t.some(s=>s.contains(o))||$i.forEach(s=>s(o));for(let o of t)!o.isConnected||Di.forEach(s=>s(o));t=null,r=null,n=null,i=null}function qi(e){return ft($e(e))}function ct(e,t,r){return e._x_dataStack=[t,...$e(r||e)],()=>{e._x_dataStack=e._x_dataStack.filter(n=>n!==t)}}function $e(e){return e._x_dataStack?e._x_dataStack:typeof ShadowRoot=="function"&&e instanceof ShadowRoot?$e(e.host):e.parentNode?$e(e.parentNode):[]}function ft(e){return new Proxy({objects:e},Pl)}var Pl={ownKeys({objects:e}){return Array.from(new Set(e.flatMap(t=>Object.keys(t))))},has({objects:e},t){return t==Symbol.unscopables?!1:e.some(r=>Object.prototype.hasOwnProperty.call(r,t)||Reflect.has(r,t))},get({objects:e},t,r){return t=="toJSON"?Rl:Reflect.get(e.find(n=>Reflect.has(n,t))||{},t,r)},set({objects:e},t,r,n){let i=e.find(s=>Object.prototype.hasOwnProperty.call(s,t))||e[e.length-1],o=Object.getOwnPropertyDescriptor(i,t);return o?.set&&o?.get?o.set.call(n,r)||!0:Reflect.set(i,t,r)}};function Rl(){return Reflect.ownKeys(this).reduce((t,r)=>(t[r]=Reflect.get(this,r),t),{})}function Wi(e){let t=n=>typeof n=="object"&&!Array.isArray(n)&&n!==null,r=(n,i="")=>{Object.entries(Object.getOwnPropertyDescriptors(n)).forEach(([o,{value:s,enumerable:a}])=>{if(a===!1||s===void 0||typeof s=="object"&&s!==null&&s.__v_skip)return;let l=i===""?o:`${i}.${o}`;typeof s=="object"&&s!==null&&s._x_interceptor?n[o]=s.initialize(e,l,o):t(s)&&s!==n&&!(s instanceof Element)&&r(s,l)})};return r(e)}function zi(e,t=()=>{}){let r={initialValue:void 0,_x_interceptor:!0,initialize(n,i,o){return e(this.initialValue,()=>Nl(n,i),s=>Rr(n,i,s),i,o)}};return t(r),n=>{if(typeof n=="object"&&n!==null&&n._x_interceptor){let i=r.initialize.bind(r);r.initialize=(o,s,a)=>{let l=n.initialize(o,s,a);return r.initialValue=l,i(o,s,a)}}else r.initialValue=n;return r}}function Nl(e,t){return t.split(".").reduce((r,n)=>r[n],e)}function Rr(e,t,r){if(typeof t=="string"&&(t=t.split(".")),t.length===1)e[t[0]]=r;else{if(t.length===0)throw error;return e[t[0]]||(e[t[0]]={}),Rr(e[t[0]],t.slice(1),r)}}var Ki={};function Z(e,t){Ki[e]=t}function Nr(e,t){let r=Ml(t);return Object.entries(Ki).forEach(([n,i])=>{Object.defineProperty(e,`$${n}`,{get(){return i(t,r)},enumerable:!1})}),e}function Ml(e){let[t,r]=Qi(e),n={interceptor:zi,...t};return zr(e,r),n}function Il(e,t,r,...n){try{return r(...n)}catch(i){ut(i,e,t)}}function ut(e,t,r=void 0){e=Object.assign(e??{message:"No error message given."},{el:t,expression:r}),console.warn(`Alpine Expression Error: ${e.message}
 
 ${r?'Expression: "'+r+`"
 
-`:""}`,t),setTimeout(()=>{throw e},0)}var Lt=!0;function Hi(e){let t=Lt;Lt=!1;let r=e();return Lt=t,r}function Ae(e,t,r={}){let n;return H(e,t)(i=>n=i,r),n}function H(...e){return ji(...e)}var ji=qi;function El(e){ji=e}function qi(e,t){let r={};Nr(r,e);let n=[r,...$e(e)],i=typeof t=="function"?Al(n,t):Ol(n,t,e);return Sl.bind(null,e,t,i)}function Al(e,t){return(r=()=>{},{scope:n={},params:i=[]}={})=>{let o=t.apply(ut([n,...e]),i);Pt(r,o)}}var xr={};function Cl(e,t){if(xr[e])return xr[e];let r=Object.getPrototypeOf(async function(){}).constructor,n=/^[\n\s]*if.*\(.*\)/.test(e.trim())||/^(let|const)\s/.test(e.trim())?`(async()=>{ ${e} })()`:e,o=(()=>{try{let s=new r(["__self","scope"],`with (scope) { __self.result = ${n} }; __self.finished = true; return __self.result;`);return Object.defineProperty(s,"name",{value:`[Alpine] ${e}`}),s}catch(s){return at(s,t,e),Promise.resolve()}})();return xr[e]=o,o}function Ol(e,t,r){let n=Cl(t,r);return(i=()=>{},{scope:o={},params:s=[]}={})=>{n.result=void 0,n.finished=!1;let a=ut([o,...e]);if(typeof n=="function"){let l=n(n,a).catch(u=>at(u,r,t));n.finished?(Pt(i,n.result,a,s,r),n.result=void 0):l.then(u=>{Pt(i,u,a,s,r)}).catch(u=>at(u,r,t)).finally(()=>n.result=void 0)}}}function Pt(e,t,r,n,i){if(Lt&&typeof t=="function"){let o=t.apply(r,n);o instanceof Promise?o.then(s=>Pt(e,s,r,n)).catch(s=>at(s,i,t)):e(o)}else typeof t=="object"&&t instanceof Promise?t.then(o=>e(o)):e(t)}var Gr="x-";function He(e=""){return Gr+e}function Tl(e){Gr=e}var Mt={};function F(e,t){return Mt[e]=t,{before(r){if(!Mt[r]){console.warn(String.raw`Cannot find directive \`${r}\`. \`${e}\` will use the default order of execution`);return}let n=Se.indexOf(r);Se.splice(n>=0?n:Se.indexOf("DEFAULT"),0,e)}}}function kl(e){return Object.keys(Mt).includes(e)}function Xr(e,t,r){if(t=Array.from(t),e._x_virtualDirectives){let o=Object.entries(e._x_virtualDirectives).map(([a,l])=>({name:a,value:l})),s=Wi(o);o=o.map(a=>s.find(l=>l.name===a.name)?{name:`x-bind:${a.name}`,value:`"${a.value}"`}:a),t=t.concat(o)}let n={};return t.map(Gi((o,s)=>n[o]=s)).filter(Yi).map(Rl(n,r)).sort(Pl).map(o=>Nl(e,o))}function Wi(e){return Array.from(e).map(Gi()).filter(t=>!Yi(t))}var Rr=!1,it=new Map,Ki=Symbol();function Ll(e){Rr=!0;let t=Symbol();Ki=t,it.set(t,[]);let r=()=>{for(;it.get(t).length;)it.get(t).shift()();it.delete(t)},n=()=>{Rr=!1,r()};e(r),n()}function zi(e){let t=[],r=a=>t.push(a),[n,i]=hl(e);return t.push(i),[{Alpine:ft,effect:n,cleanup:r,evaluateLater:H.bind(H,e),evaluate:Ae.bind(Ae,e)},()=>t.forEach(a=>a())]}function Nl(e,t){let r=()=>{},n=Mt[t.type]||r,[i,o]=zi(e);Mi(e,t.original,o);let s=()=>{e._x_ignore||e._x_ignoreSelf||(n.inline&&n.inline(e,t,i),n=n.bind(n,e,t,i),Rr?it.get(Ki).push(n):n())};return s.runCleanups=o,s}var Vi=(e,t)=>({name:r,value:n})=>(r.startsWith(e)&&(r=r.replace(e,t)),{name:r,value:n}),Ji=e=>e;function Gi(e=()=>{}){return({name:t,value:r})=>{let{name:n,value:i}=Xi.reduce((o,s)=>s(o),{name:t,value:r});return n!==t&&e(n,t),{name:n,value:i}}}var Xi=[];function Yr(e){Xi.push(e)}function Yi({name:e}){return Qi().test(e)}var Qi=()=>new RegExp(`^${Gr}([^:^.]+)\\b`);function Rl(e,t){return({name:r,value:n})=>{let i=r.match(Qi()),o=r.match(/:([a-zA-Z0-9\-_:]+)/),s=r.match(/\.[^.\]]+(?=[^\]]*$)/g)||[],a=t||e[r]||r;return{type:i?i[1]:null,value:o?o[1]:null,modifiers:s.map(l=>l.replace(".","")),expression:n,original:a}}}var Pr="DEFAULT",Se=["ignore","ref","data","id","anchor","bind","init","for","model","modelable","transition","show","if",Pr,"teleport"];function Pl(e,t){let r=Se.indexOf(e.type)===-1?Pr:e.type,n=Se.indexOf(t.type)===-1?Pr:t.type;return Se.indexOf(r)-Se.indexOf(n)}function ot(e,t,r={}){e.dispatchEvent(new CustomEvent(t,{detail:r,bubbles:!0,composed:!0,cancelable:!0}))}function de(e,t){if(typeof ShadowRoot=="function"&&e instanceof ShadowRoot){Array.from(e.children).forEach(i=>de(i,t));return}let r=!1;if(t(e,()=>r=!0),r)return;let n=e.firstElementChild;for(;n;)de(n,t,!1),n=n.nextElementSibling}function V(e,...t){console.warn(`Alpine Warning: ${e}`,...t)}var hi=!1;function Ml(){hi&&V("Alpine has already been initialized on this page. Calling Alpine.start() more than once can cause problems."),hi=!0,document.body||V("Unable to initialize. Trying to load Alpine before `<body>` is available. Did you forget to add `defer` in Alpine's `<script>` tag?"),ot(document,"alpine:init"),ot(document,"alpine:initializing"),zr(),ml(t=>ie(t,de)),qr(t=>oo(t)),Pi((t,r)=>{Xr(t,r).forEach(n=>n())});let e=t=>!Ft(t.parentElement,!0);Array.from(document.querySelectorAll(to().join(","))).filter(e).forEach(t=>{ie(t)}),ot(document,"alpine:initialized"),setTimeout(()=>{$l()})}var Qr=[],Zi=[];function eo(){return Qr.map(e=>e())}function to(){return Qr.concat(Zi).map(e=>e())}function ro(e){Qr.push(e)}function no(e){Zi.push(e)}function Ft(e,t=!1){return ct(e,r=>{if((t?to():eo()).some(i=>r.matches(i)))return!0})}function ct(e,t){if(!!e){if(t(e))return e;if(e._x_teleportBack&&(e=e._x_teleportBack),!!e.parentElement)return ct(e.parentElement,t)}}function Il(e){return eo().some(t=>e.matches(t))}var io=[];function Fl(e){io.push(e)}function ie(e,t=de,r=()=>{}){Ll(()=>{t(e,(n,i)=>{r(n,i),io.forEach(o=>o(n,i)),Xr(n,n.attributes).forEach(o=>o()),n._x_ignore&&i()})})}function oo(e,t=de){t(e,r=>{Ii(r),gl(r)})}function $l(){[["ui","dialog",["[x-dialog], [x-popover]"]],["anchor","anchor",["[x-anchor]"]],["sort","sort",["[x-sort]"]]].forEach(([t,r,n])=>{kl(r)||n.some(i=>{if(document.querySelector(i))return V(`found "${i}", but missing ${t} plugin`),!0})})}var Mr=[],Zr=!1;function en(e=()=>{}){return queueMicrotask(()=>{Zr||setTimeout(()=>{Ir()})}),new Promise(t=>{Mr.push(()=>{e(),t()})})}function Ir(){for(Zr=!1;Mr.length;)Mr.shift()()}function Dl(){Zr=!0}function tn(e,t){return Array.isArray(t)?mi(e,t.join(" ")):typeof t=="object"&&t!==null?Bl(e,t):typeof t=="function"?tn(e,t()):mi(e,t)}function mi(e,t){let r=o=>o.split(" ").filter(Boolean),n=o=>o.split(" ").filter(s=>!e.classList.contains(s)).filter(Boolean),i=o=>(e.classList.add(...o),()=>{e.classList.remove(...o)});return t=t===!0?t="":t||"",i(n(t))}function Bl(e,t){let r=a=>a.split(" ").filter(Boolean),n=Object.entries(t).flatMap(([a,l])=>l?r(a):!1).filter(Boolean),i=Object.entries(t).flatMap(([a,l])=>l?!1:r(a)).filter(Boolean),o=[],s=[];return i.forEach(a=>{e.classList.contains(a)&&(e.classList.remove(a),s.push(a))}),n.forEach(a=>{e.classList.contains(a)||(e.classList.add(a),o.push(a))}),()=>{s.forEach(a=>e.classList.add(a)),o.forEach(a=>e.classList.remove(a))}}function $t(e,t){return typeof t=="object"&&t!==null?Ul(e,t):Hl(e,t)}function Ul(e,t){let r={};return Object.entries(t).forEach(([n,i])=>{r[n]=e.style[n],n.startsWith("--")||(n=jl(n)),e.style.setProperty(n,i)}),setTimeout(()=>{e.style.length===0&&e.removeAttribute("style")}),()=>{$t(e,r)}}function Hl(e,t){let r=e.getAttribute("style",t);return e.setAttribute("style",t),()=>{e.setAttribute("style",r||"")}}function jl(e){return e.replace(/([a-z])([A-Z])/g,"$1-$2").toLowerCase()}function Fr(e,t=()=>{}){let r=!1;return function(){r?t.apply(this,arguments):(r=!0,e.apply(this,arguments))}}F("transition",(e,{value:t,modifiers:r,expression:n},{evaluate:i})=>{typeof n=="function"&&(n=i(n)),n!==!1&&(!n||typeof n=="boolean"?Wl(e,r,t):ql(e,n,t))});function ql(e,t,r){so(e,tn,""),{enter:i=>{e._x_transition.enter.during=i},"enter-start":i=>{e._x_transition.enter.start=i},"enter-end":i=>{e._x_transition.enter.end=i},leave:i=>{e._x_transition.leave.during=i},"leave-start":i=>{e._x_transition.leave.start=i},"leave-end":i=>{e._x_transition.leave.end=i}}[r](t)}function Wl(e,t,r){so(e,$t);let n=!t.includes("in")&&!t.includes("out")&&!r,i=n||t.includes("in")||["enter"].includes(r),o=n||t.includes("out")||["leave"].includes(r);t.includes("in")&&!n&&(t=t.filter((y,v)=>v<t.indexOf("out"))),t.includes("out")&&!n&&(t=t.filter((y,v)=>v>t.indexOf("out")));let s=!t.includes("opacity")&&!t.includes("scale"),a=s||t.includes("opacity"),l=s||t.includes("scale"),u=a?0:1,f=l?rt(t,"scale",95)/100:1,p=rt(t,"delay",0)/1e3,c=rt(t,"origin","center"),d="opacity, transform",m=rt(t,"duration",150)/1e3,b=rt(t,"duration",75)/1e3,g="cubic-bezier(0.4, 0.0, 0.2, 1)";i&&(e._x_transition.enter.during={transformOrigin:c,transitionDelay:`${p}s`,transitionProperty:d,transitionDuration:`${m}s`,transitionTimingFunction:g},e._x_transition.enter.start={opacity:u,transform:`scale(${f})`},e._x_transition.enter.end={opacity:1,transform:"scale(1)"}),o&&(e._x_transition.leave.during={transformOrigin:c,transitionDelay:`${p}s`,transitionProperty:d,transitionDuration:`${b}s`,transitionTimingFunction:g},e._x_transition.leave.start={opacity:1,transform:"scale(1)"},e._x_transition.leave.end={opacity:u,transform:`scale(${f})`})}function so(e,t,r={}){e._x_transition||(e._x_transition={enter:{during:r,start:r,end:r},leave:{during:r,start:r,end:r},in(n=()=>{},i=()=>{}){$r(e,t,{during:this.enter.during,start:this.enter.start,end:this.enter.end},n,i)},out(n=()=>{},i=()=>{}){$r(e,t,{during:this.leave.during,start:this.leave.start,end:this.leave.end},n,i)}})}window.Element.prototype._x_toggleAndCascadeWithTransitions=function(e,t,r,n){let i=document.visibilityState==="visible"?requestAnimationFrame:setTimeout,o=()=>i(r);if(t){e._x_transition&&(e._x_transition.enter||e._x_transition.leave)?e._x_transition.enter&&(Object.entries(e._x_transition.enter.during).length||Object.entries(e._x_transition.enter.start).length||Object.entries(e._x_transition.enter.end).length)?e._x_transition.in(r):o():e._x_transition?e._x_transition.in(r):o();return}e._x_hidePromise=e._x_transition?new Promise((s,a)=>{e._x_transition.out(()=>{},()=>s(n)),e._x_transitioning&&e._x_transitioning.beforeCancel(()=>a({isFromCancelledTransition:!0}))}):Promise.resolve(n),queueMicrotask(()=>{let s=ao(e);s?(s._x_hideChildren||(s._x_hideChildren=[]),s._x_hideChildren.push(e)):i(()=>{let a=l=>{let u=Promise.all([l._x_hidePromise,...(l._x_hideChildren||[]).map(a)]).then(([f])=>f?.());return delete l._x_hidePromise,delete l._x_hideChildren,u};a(e).catch(l=>{if(!l.isFromCancelledTransition)throw l})})})};function ao(e){let t=e.parentNode;if(!!t)return t._x_hidePromise?t:ao(t)}function $r(e,t,{during:r,start:n,end:i}={},o=()=>{},s=()=>{}){if(e._x_transitioning&&e._x_transitioning.cancel(),Object.keys(r).length===0&&Object.keys(n).length===0&&Object.keys(i).length===0){o(),s();return}let a,l,u;Kl(e,{start(){a=t(e,n)},during(){l=t(e,r)},before:o,end(){a(),u=t(e,i)},after:s,cleanup(){l(),u()}})}function Kl(e,t){let r,n,i,o=Fr(()=>{B(()=>{r=!0,n||t.before(),i||(t.end(),Ir()),t.after(),e.isConnected&&t.cleanup(),delete e._x_transitioning})});e._x_transitioning={beforeCancels:[],beforeCancel(s){this.beforeCancels.push(s)},cancel:Fr(function(){for(;this.beforeCancels.length;)this.beforeCancels.shift()();o()}),finish:o},B(()=>{t.start(),t.during()}),Dl(),requestAnimationFrame(()=>{if(r)return;let s=Number(getComputedStyle(e).transitionDuration.replace(/,.*/,"").replace("s",""))*1e3,a=Number(getComputedStyle(e).transitionDelay.replace(/,.*/,"").replace("s",""))*1e3;s===0&&(s=Number(getComputedStyle(e).animationDuration.replace("s",""))*1e3),B(()=>{t.before()}),n=!0,requestAnimationFrame(()=>{r||(B(()=>{t.end()}),Ir(),setTimeout(e._x_transitioning.finish,s+a),i=!0)})})}function rt(e,t,r){if(e.indexOf(t)===-1)return r;let n=e[e.indexOf(t)+1];if(!n||t==="scale"&&isNaN(n))return r;if(t==="duration"||t==="delay"){let i=n.match(/([0-9]+)ms/);if(i)return i[1]}return t==="origin"&&["top","right","left","center","bottom"].includes(e[e.indexOf(t)+2])?[n,e[e.indexOf(t)+2]].join(" "):n}var pe=!1;function me(e,t=()=>{}){return(...r)=>pe?t(...r):e(...r)}function zl(e){return(...t)=>pe&&e(...t)}var lo=[];function Dt(e){lo.push(e)}function Vl(e,t){lo.forEach(r=>r(e,t)),pe=!0,uo(()=>{ie(t,(r,n)=>{n(r,()=>{})})}),pe=!1}var Dr=!1;function Jl(e,t){t._x_dataStack||(t._x_dataStack=e._x_dataStack),pe=!0,Dr=!0,uo(()=>{Gl(t)}),pe=!1,Dr=!1}function Gl(e){let t=!1;ie(e,(n,i)=>{de(n,(o,s)=>{if(t&&Il(o))return s();t=!0,i(o,s)})})}function uo(e){let t=Te;pi((r,n)=>{let i=t(r);return Ue(i),()=>{}}),e(),pi(t)}function co(e,t,r,n=[]){switch(e._x_bindings||(e._x_bindings=Be({})),e._x_bindings[t]=r,t=n.includes("camel")?nu(t):t,t){case"value":Xl(e,r);break;case"style":Ql(e,r);break;case"class":Yl(e,r);break;case"selected":case"checked":Zl(e,t,r);break;default:fo(e,t,r);break}}function Xl(e,t){if(e.type==="radio")e.attributes.value===void 0&&(e.value=t),window.fromModel&&(typeof t=="boolean"?e.checked=Nt(e.value)===t:e.checked=gi(e.value,t));else if(e.type==="checkbox")Number.isInteger(t)?e.value=t:!Array.isArray(t)&&typeof t!="boolean"&&![null,void 0].includes(t)?e.value=String(t):Array.isArray(t)?e.checked=t.some(r=>gi(r,e.value)):e.checked=!!t;else if(e.tagName==="SELECT")ru(e,t);else{if(e.value===t)return;e.value=t===void 0?"":t}}function Yl(e,t){e._x_undoAddedClasses&&e._x_undoAddedClasses(),e._x_undoAddedClasses=tn(e,t)}function Ql(e,t){e._x_undoAddedStyles&&e._x_undoAddedStyles(),e._x_undoAddedStyles=$t(e,t)}function Zl(e,t,r){fo(e,t,r),tu(e,t,r)}function fo(e,t,r){[null,void 0,!1].includes(r)&&iu(t)?e.removeAttribute(t):(po(t)&&(r=t),eu(e,t,r))}function eu(e,t,r){e.getAttribute(t)!=r&&e.setAttribute(t,r)}function tu(e,t,r){e[t]!==r&&(e[t]=r)}function ru(e,t){let r=[].concat(t).map(n=>n+"");Array.from(e.options).forEach(n=>{n.selected=r.includes(n.value)})}function nu(e){return e.toLowerCase().replace(/-(\w)/g,(t,r)=>r.toUpperCase())}function gi(e,t){return e==t}function Nt(e){return[1,"1","true","on","yes",!0].includes(e)?!0:[0,"0","false","off","no",!1].includes(e)?!1:e?Boolean(e):null}function po(e){return["disabled","checked","required","readonly","open","selected","autofocus","itemscope","multiple","novalidate","allowfullscreen","allowpaymentrequest","formnovalidate","autoplay","controls","loop","muted","playsinline","default","ismap","reversed","async","defer","nomodule"].includes(e)}function iu(e){return!["aria-pressed","aria-checked","aria-expanded","aria-selected"].includes(e)}function ou(e,t,r){return e._x_bindings&&e._x_bindings[t]!==void 0?e._x_bindings[t]:ho(e,t,r)}function su(e,t,r,n=!0){if(e._x_bindings&&e._x_bindings[t]!==void 0)return e._x_bindings[t];if(e._x_inlineBindings&&e._x_inlineBindings[t]!==void 0){let i=e._x_inlineBindings[t];return i.extract=n,Hi(()=>Ae(e,i.expression))}return ho(e,t,r)}function ho(e,t,r){let n=e.getAttribute(t);return n===null?typeof r=="function"?r():r:n===""?!0:po(t)?!![t,"true"].includes(n):n}function mo(e,t){var r;return function(){var n=this,i=arguments,o=function(){r=null,e.apply(n,i)};clearTimeout(r),r=setTimeout(o,t)}}function go(e,t){let r;return function(){let n=this,i=arguments;r||(e.apply(n,i),r=!0,setTimeout(()=>r=!1,t))}}function vo({get:e,set:t},{get:r,set:n}){let i=!0,o,s,a=Te(()=>{let l=e(),u=r();if(i)n(_r(l)),i=!1;else{let f=JSON.stringify(l),p=JSON.stringify(u);f!==o?n(_r(l)):f!==p&&t(_r(u))}o=JSON.stringify(e()),s=JSON.stringify(r())});return()=>{Ue(a)}}function _r(e){return typeof e=="object"?JSON.parse(JSON.stringify(e)):e}function au(e){(Array.isArray(e)?e:[e]).forEach(r=>r(ft))}var _e={},vi=!1;function lu(e,t){if(vi||(_e=Be(_e),vi=!0),t===void 0)return _e[e];_e[e]=t,typeof t=="object"&&t!==null&&t.hasOwnProperty("init")&&typeof t.init=="function"&&_e[e].init(),Di(_e[e])}function uu(){return _e}var bo={};function cu(e,t){let r=typeof t!="function"?()=>t:t;return e instanceof Element?wo(e,r()):(bo[e]=r,()=>{})}function fu(e){return Object.entries(bo).forEach(([t,r])=>{Object.defineProperty(e,t,{get(){return(...n)=>r(...n)}})}),e}function wo(e,t,r){let n=[];for(;n.length;)n.pop()();let i=Object.entries(t).map(([s,a])=>({name:s,value:a})),o=Wi(i);return i=i.map(s=>o.find(a=>a.name===s.name)?{name:`x-bind:${s.name}`,value:`"${s.value}"`}:s),Xr(e,i,r).map(s=>{n.push(s.runCleanups),s()}),()=>{for(;n.length;)n.pop()()}}var yo={};function du(e,t){yo[e]=t}function pu(e,t){return Object.entries(yo).forEach(([r,n])=>{Object.defineProperty(e,r,{get(){return(...i)=>n.bind(t)(...i)},enumerable:!1})}),e}var hu={get reactive(){return Be},get release(){return Ue},get effect(){return Te},get raw(){return Ti},version:"3.14.1",flushAndStopDeferringMutations:wl,dontAutoEvaluateFunctions:Hi,disableEffectScheduling:dl,startObservingMutations:zr,stopObservingMutations:Fi,setReactivityEngine:pl,onAttributeRemoved:Mi,onAttributesAdded:Pi,closestDataStack:$e,skipDuringClone:me,onlyDuringClone:zl,addRootSelector:ro,addInitSelector:no,interceptClone:Dt,addScopeToNode:lt,deferMutations:bl,mapAttributes:Yr,evaluateLater:H,interceptInit:Fl,setEvaluator:El,mergeProxies:ut,extractProp:su,findClosest:ct,onElRemoved:qr,closestRoot:Ft,destroyTree:oo,interceptor:Bi,transition:$r,setStyles:$t,mutateDom:B,directive:F,entangle:vo,throttle:go,debounce:mo,evaluate:Ae,initTree:ie,nextTick:en,prefixed:He,prefix:Tl,plugin:au,magic:Z,store:lu,start:Ml,clone:Jl,cloneNode:Vl,bound:ou,$data:$i,watch:ki,walk:de,data:du,bind:cu},ft=hu;function xo(e,t){let r=Object.create(null),n=e.split(",");for(let i=0;i<n.length;i++)r[n[i]]=!0;return t?i=>!!r[i.toLowerCase()]:i=>!!r[i]}var mu="itemscope,allowfullscreen,formnovalidate,ismap,nomodule,novalidate,readonly",Hd=xo(mu+",async,autofocus,autoplay,controls,default,defer,disabled,hidden,loop,open,required,reversed,scoped,seamless,checked,muted,multiple,selected"),gu=Object.freeze({}),jd=Object.freeze([]),vu=Object.prototype.hasOwnProperty,Bt=(e,t)=>vu.call(e,t),Ce=Array.isArray,st=e=>_o(e)==="[object Map]",bu=e=>typeof e=="string",rn=e=>typeof e=="symbol",Ut=e=>e!==null&&typeof e=="object",wu=Object.prototype.toString,_o=e=>wu.call(e),So=e=>_o(e).slice(8,-1),nn=e=>bu(e)&&e!=="NaN"&&e[0]!=="-"&&""+parseInt(e,10)===e,Ht=e=>{let t=Object.create(null);return r=>t[r]||(t[r]=e(r))},yu=/-(\w)/g,qd=Ht(e=>e.replace(yu,(t,r)=>r?r.toUpperCase():"")),xu=/\B([A-Z])/g,Wd=Ht(e=>e.replace(xu,"-$1").toLowerCase()),Eo=Ht(e=>e.charAt(0).toUpperCase()+e.slice(1)),Kd=Ht(e=>e?`on${Eo(e)}`:""),Ao=(e,t)=>e!==t&&(e===e||t===t),Br=new WeakMap,nt=[],ee,Oe=Symbol("iterate"),Ur=Symbol("Map key iterate");function _u(e){return e&&e._isEffect===!0}function Su(e,t=gu){_u(e)&&(e=e.raw);let r=Cu(e,t);return t.lazy||r(),r}function Eu(e){e.active&&(Co(e),e.options.onStop&&e.options.onStop(),e.active=!1)}var Au=0;function Cu(e,t){let r=function(){if(!r.active)return e();if(!nt.includes(r)){Co(r);try{return Tu(),nt.push(r),ee=r,e()}finally{nt.pop(),Oo(),ee=nt[nt.length-1]}}};return r.id=Au++,r.allowRecurse=!!t.allowRecurse,r._isEffect=!0,r.active=!0,r.raw=e,r.deps=[],r.options=t,r}function Co(e){let{deps:t}=e;if(t.length){for(let r=0;r<t.length;r++)t[r].delete(e);t.length=0}}var De=!0,on=[];function Ou(){on.push(De),De=!1}function Tu(){on.push(De),De=!0}function Oo(){let e=on.pop();De=e===void 0?!0:e}function Q(e,t,r){if(!De||ee===void 0)return;let n=Br.get(e);n||Br.set(e,n=new Map);let i=n.get(r);i||n.set(r,i=new Set),i.has(ee)||(i.add(ee),ee.deps.push(i),ee.options.onTrack&&ee.options.onTrack({effect:ee,target:e,type:t,key:r}))}function he(e,t,r,n,i,o){let s=Br.get(e);if(!s)return;let a=new Set,l=f=>{f&&f.forEach(p=>{(p!==ee||p.allowRecurse)&&a.add(p)})};if(t==="clear")s.forEach(l);else if(r==="length"&&Ce(e))s.forEach((f,p)=>{(p==="length"||p>=n)&&l(f)});else switch(r!==void 0&&l(s.get(r)),t){case"add":Ce(e)?nn(r)&&l(s.get("length")):(l(s.get(Oe)),st(e)&&l(s.get(Ur)));break;case"delete":Ce(e)||(l(s.get(Oe)),st(e)&&l(s.get(Ur)));break;case"set":st(e)&&l(s.get(Oe));break}let u=f=>{f.options.onTrigger&&f.options.onTrigger({effect:f,target:e,key:r,type:t,newValue:n,oldValue:i,oldTarget:o}),f.options.scheduler?f.options.scheduler(f):f()};a.forEach(u)}var ku=xo("__proto__,__v_isRef,__isVue"),To=new Set(Object.getOwnPropertyNames(Symbol).map(e=>Symbol[e]).filter(rn)),Lu=ko(),Nu=ko(!0),bi=Ru();function Ru(){let e={};return["includes","indexOf","lastIndexOf"].forEach(t=>{e[t]=function(...r){let n=M(this);for(let o=0,s=this.length;o<s;o++)Q(n,"get",o+"");let i=n[t](...r);return i===-1||i===!1?n[t](...r.map(M)):i}}),["push","pop","shift","unshift","splice"].forEach(t=>{e[t]=function(...r){Ou();let n=M(this)[t].apply(this,r);return Oo(),n}}),e}function ko(e=!1,t=!1){return function(n,i,o){if(i==="__v_isReactive")return!e;if(i==="__v_isReadonly")return e;if(i==="__v_raw"&&o===(e?t?Ju:Po:t?Vu:Ro).get(n))return n;let s=Ce(n);if(!e&&s&&Bt(bi,i))return Reflect.get(bi,i,o);let a=Reflect.get(n,i,o);return(rn(i)?To.has(i):ku(i))||(e||Q(n,"get",i),t)?a:Hr(a)?!s||!nn(i)?a.value:a:Ut(a)?e?Mo(a):un(a):a}}var Pu=Mu();function Mu(e=!1){return function(r,n,i,o){let s=r[n];if(!e&&(i=M(i),s=M(s),!Ce(r)&&Hr(s)&&!Hr(i)))return s.value=i,!0;let a=Ce(r)&&nn(n)?Number(n)<r.length:Bt(r,n),l=Reflect.set(r,n,i,o);return r===M(o)&&(a?Ao(i,s)&&he(r,"set",n,i,s):he(r,"add",n,i)),l}}function Iu(e,t){let r=Bt(e,t),n=e[t],i=Reflect.deleteProperty(e,t);return i&&r&&he(e,"delete",t,void 0,n),i}function Fu(e,t){let r=Reflect.has(e,t);return(!rn(t)||!To.has(t))&&Q(e,"has",t),r}function $u(e){return Q(e,"iterate",Ce(e)?"length":Oe),Reflect.ownKeys(e)}var Du={get:Lu,set:Pu,deleteProperty:Iu,has:Fu,ownKeys:$u},Bu={get:Nu,set(e,t){return console.warn(`Set operation on key "${String(t)}" failed: target is readonly.`,e),!0},deleteProperty(e,t){return console.warn(`Delete operation on key "${String(t)}" failed: target is readonly.`,e),!0}},sn=e=>Ut(e)?un(e):e,an=e=>Ut(e)?Mo(e):e,ln=e=>e,jt=e=>Reflect.getPrototypeOf(e);function At(e,t,r=!1,n=!1){e=e.__v_raw;let i=M(e),o=M(t);t!==o&&!r&&Q(i,"get",t),!r&&Q(i,"get",o);let{has:s}=jt(i),a=n?ln:r?an:sn;if(s.call(i,t))return a(e.get(t));if(s.call(i,o))return a(e.get(o));e!==i&&e.get(t)}function Ct(e,t=!1){let r=this.__v_raw,n=M(r),i=M(e);return e!==i&&!t&&Q(n,"has",e),!t&&Q(n,"has",i),e===i?r.has(e):r.has(e)||r.has(i)}function Ot(e,t=!1){return e=e.__v_raw,!t&&Q(M(e),"iterate",Oe),Reflect.get(e,"size",e)}function wi(e){e=M(e);let t=M(this);return jt(t).has.call(t,e)||(t.add(e),he(t,"add",e,e)),this}function yi(e,t){t=M(t);let r=M(this),{has:n,get:i}=jt(r),o=n.call(r,e);o?No(r,n,e):(e=M(e),o=n.call(r,e));let s=i.call(r,e);return r.set(e,t),o?Ao(t,s)&&he(r,"set",e,t,s):he(r,"add",e,t),this}function xi(e){let t=M(this),{has:r,get:n}=jt(t),i=r.call(t,e);i?No(t,r,e):(e=M(e),i=r.call(t,e));let o=n?n.call(t,e):void 0,s=t.delete(e);return i&&he(t,"delete",e,void 0,o),s}function _i(){let e=M(this),t=e.size!==0,r=st(e)?new Map(e):new Set(e),n=e.clear();return t&&he(e,"clear",void 0,void 0,r),n}function Tt(e,t){return function(n,i){let o=this,s=o.__v_raw,a=M(s),l=t?ln:e?an:sn;return!e&&Q(a,"iterate",Oe),s.forEach((u,f)=>n.call(i,l(u),l(f),o))}}function kt(e,t,r){return function(...n){let i=this.__v_raw,o=M(i),s=st(o),a=e==="entries"||e===Symbol.iterator&&s,l=e==="keys"&&s,u=i[e](...n),f=r?ln:t?an:sn;return!t&&Q(o,"iterate",l?Ur:Oe),{next(){let{value:p,done:c}=u.next();return c?{value:p,done:c}:{value:a?[f(p[0]),f(p[1])]:f(p),done:c}},[Symbol.iterator](){return this}}}}function fe(e){return function(...t){{let r=t[0]?`on key "${t[0]}" `:"";console.warn(`${Eo(e)} operation ${r}failed: target is readonly.`,M(this))}return e==="delete"?!1:this}}function Uu(){let e={get(o){return At(this,o)},get size(){return Ot(this)},has:Ct,add:wi,set:yi,delete:xi,clear:_i,forEach:Tt(!1,!1)},t={get(o){return At(this,o,!1,!0)},get size(){return Ot(this)},has:Ct,add:wi,set:yi,delete:xi,clear:_i,forEach:Tt(!1,!0)},r={get(o){return At(this,o,!0)},get size(){return Ot(this,!0)},has(o){return Ct.call(this,o,!0)},add:fe("add"),set:fe("set"),delete:fe("delete"),clear:fe("clear"),forEach:Tt(!0,!1)},n={get(o){return At(this,o,!0,!0)},get size(){return Ot(this,!0)},has(o){return Ct.call(this,o,!0)},add:fe("add"),set:fe("set"),delete:fe("delete"),clear:fe("clear"),forEach:Tt(!0,!0)};return["keys","values","entries",Symbol.iterator].forEach(o=>{e[o]=kt(o,!1,!1),r[o]=kt(o,!0,!1),t[o]=kt(o,!1,!0),n[o]=kt(o,!0,!0)}),[e,r,t,n]}var[Hu,ju,qu,Wu]=Uu();function Lo(e,t){let r=t?e?Wu:qu:e?ju:Hu;return(n,i,o)=>i==="__v_isReactive"?!e:i==="__v_isReadonly"?e:i==="__v_raw"?n:Reflect.get(Bt(r,i)&&i in n?r:n,i,o)}var Ku={get:Lo(!1,!1)},zu={get:Lo(!0,!1)};function No(e,t,r){let n=M(r);if(n!==r&&t.call(e,n)){let i=So(e);console.warn(`Reactive ${i} contains both the raw and reactive versions of the same object${i==="Map"?" as keys":""}, which can lead to inconsistencies. Avoid differentiating between the raw and reactive versions of an object and only use the reactive version if possible.`)}}var Ro=new WeakMap,Vu=new WeakMap,Po=new WeakMap,Ju=new WeakMap;function Gu(e){switch(e){case"Object":case"Array":return 1;case"Map":case"Set":case"WeakMap":case"WeakSet":return 2;default:return 0}}function Xu(e){return e.__v_skip||!Object.isExtensible(e)?0:Gu(So(e))}function un(e){return e&&e.__v_isReadonly?e:Io(e,!1,Du,Ku,Ro)}function Mo(e){return Io(e,!0,Bu,zu,Po)}function Io(e,t,r,n,i){if(!Ut(e))return console.warn(`value cannot be made reactive: ${String(e)}`),e;if(e.__v_raw&&!(t&&e.__v_isReactive))return e;let o=i.get(e);if(o)return o;let s=Xu(e);if(s===0)return e;let a=new Proxy(e,s===2?n:r);return i.set(e,a),a}function M(e){return e&&M(e.__v_raw)||e}function Hr(e){return Boolean(e&&e.__v_isRef===!0)}Z("nextTick",()=>en);Z("dispatch",e=>ot.bind(ot,e));Z("watch",(e,{evaluateLater:t,cleanup:r})=>(n,i)=>{let o=t(n),a=ki(()=>{let l;return o(u=>l=u),l},i);r(a)});Z("store",uu);Z("data",e=>$i(e));Z("root",e=>Ft(e));Z("refs",e=>(e._x_refs_proxy||(e._x_refs_proxy=ut(Yu(e))),e._x_refs_proxy));function Yu(e){let t=[];return ct(e,r=>{r._x_refs&&t.push(r._x_refs)}),t}var Sr={};function Fo(e){return Sr[e]||(Sr[e]=0),++Sr[e]}function Qu(e,t){return ct(e,r=>{if(r._x_ids&&r._x_ids[t])return!0})}function Zu(e,t){e._x_ids||(e._x_ids={}),e._x_ids[t]||(e._x_ids[t]=Fo(t))}Z("id",(e,{cleanup:t})=>(r,n=null)=>{let i=`${r}${n?`-${n}`:""}`;return ec(e,i,t,()=>{let o=Qu(e,r),s=o?o._x_ids[r]:Fo(r);return n?`${r}-${s}-${n}`:`${r}-${s}`})});Dt((e,t)=>{e._x_id&&(t._x_id=e._x_id)});function ec(e,t,r,n){if(e._x_id||(e._x_id={}),e._x_id[t])return e._x_id[t];let i=n();return e._x_id[t]=i,r(()=>{delete e._x_id[t]}),i}Z("el",e=>e);$o("Focus","focus","focus");$o("Persist","persist","persist");function $o(e,t,r){Z(t,n=>V(`You can't use [$${t}] without first installing the "${e}" plugin here: https://alpinejs.dev/plugins/${r}`,n))}F("modelable",(e,{expression:t},{effect:r,evaluateLater:n,cleanup:i})=>{let o=n(t),s=()=>{let f;return o(p=>f=p),f},a=n(`${t} = __placeholder`),l=f=>a(()=>{},{scope:{__placeholder:f}}),u=s();l(u),queueMicrotask(()=>{if(!e._x_model)return;e._x_removeModelListeners.default();let f=e._x_model.get,p=e._x_model.set,c=vo({get(){return f()},set(d){p(d)}},{get(){return s()},set(d){l(d)}});i(c)})});F("teleport",(e,{modifiers:t,expression:r},{cleanup:n})=>{e.tagName.toLowerCase()!=="template"&&V("x-teleport can only be used on a <template> tag",e);let i=Si(r),o=e.content.cloneNode(!0).firstElementChild;e._x_teleport=o,o._x_teleportBack=e,e.setAttribute("data-teleport-template",!0),o.setAttribute("data-teleport-target",!0),e._x_forwardEvents&&e._x_forwardEvents.forEach(a=>{o.addEventListener(a,l=>{l.stopPropagation(),e.dispatchEvent(new l.constructor(l.type,l))})}),lt(o,{},e);let s=(a,l,u)=>{u.includes("prepend")?l.parentNode.insertBefore(a,l):u.includes("append")?l.parentNode.insertBefore(a,l.nextSibling):l.appendChild(a)};B(()=>{s(o,i,t),me(()=>{ie(o),o._x_ignore=!0})()}),e._x_teleportPutBack=()=>{let a=Si(r);B(()=>{s(e._x_teleport,a,t)})},n(()=>o.remove())});var tc=document.createElement("div");function Si(e){let t=me(()=>document.querySelector(e),()=>tc)();return t||V(`Cannot find x-teleport element for selector: "${e}"`),t}var Do=()=>{};Do.inline=(e,{modifiers:t},{cleanup:r})=>{t.includes("self")?e._x_ignoreSelf=!0:e._x_ignore=!0,r(()=>{t.includes("self")?delete e._x_ignoreSelf:delete e._x_ignore})};F("ignore",Do);F("effect",me((e,{expression:t},{effect:r})=>{r(H(e,t))}));function jr(e,t,r,n){let i=e,o=l=>n(l),s={},a=(l,u)=>f=>u(l,f);if(r.includes("dot")&&(t=rc(t)),r.includes("camel")&&(t=nc(t)),r.includes("passive")&&(s.passive=!0),r.includes("capture")&&(s.capture=!0),r.includes("window")&&(i=window),r.includes("document")&&(i=document),r.includes("debounce")){let l=r[r.indexOf("debounce")+1]||"invalid-wait",u=It(l.split("ms")[0])?Number(l.split("ms")[0]):250;o=mo(o,u)}if(r.includes("throttle")){let l=r[r.indexOf("throttle")+1]||"invalid-wait",u=It(l.split("ms")[0])?Number(l.split("ms")[0]):250;o=go(o,u)}return r.includes("prevent")&&(o=a(o,(l,u)=>{u.preventDefault(),l(u)})),r.includes("stop")&&(o=a(o,(l,u)=>{u.stopPropagation(),l(u)})),r.includes("once")&&(o=a(o,(l,u)=>{l(u),i.removeEventListener(t,o,s)})),(r.includes("away")||r.includes("outside"))&&(i=document,o=a(o,(l,u)=>{e.contains(u.target)||u.target.isConnected!==!1&&(e.offsetWidth<1&&e.offsetHeight<1||e._x_isShown!==!1&&l(u))})),r.includes("self")&&(o=a(o,(l,u)=>{u.target===e&&l(u)})),(oc(t)||Bo(t))&&(o=a(o,(l,u)=>{sc(u,r)||l(u)})),i.addEventListener(t,o,s),()=>{i.removeEventListener(t,o,s)}}function rc(e){return e.replace(/-/g,".")}function nc(e){return e.toLowerCase().replace(/-(\w)/g,(t,r)=>r.toUpperCase())}function It(e){return!Array.isArray(e)&&!isNaN(e)}function ic(e){return[" ","_"].includes(e)?e:e.replace(/([a-z])([A-Z])/g,"$1-$2").replace(/[_\s]/,"-").toLowerCase()}function oc(e){return["keydown","keyup"].includes(e)}function Bo(e){return["contextmenu","click","mouse"].some(t=>e.includes(t))}function sc(e,t){let r=t.filter(o=>!["window","document","prevent","stop","once","capture","self","away","outside","passive"].includes(o));if(r.includes("debounce")){let o=r.indexOf("debounce");r.splice(o,It((r[o+1]||"invalid-wait").split("ms")[0])?2:1)}if(r.includes("throttle")){let o=r.indexOf("throttle");r.splice(o,It((r[o+1]||"invalid-wait").split("ms")[0])?2:1)}if(r.length===0||r.length===1&&Ei(e.key).includes(r[0]))return!1;let i=["ctrl","shift","alt","meta","cmd","super"].filter(o=>r.includes(o));return r=r.filter(o=>!i.includes(o)),!(i.length>0&&i.filter(s=>((s==="cmd"||s==="super")&&(s="meta"),e[`${s}Key`])).length===i.length&&(Bo(e.type)||Ei(e.key).includes(r[0])))}function Ei(e){if(!e)return[];e=ic(e);let t={ctrl:"control",slash:"/",space:" ",spacebar:" ",cmd:"meta",esc:"escape",up:"arrow-up",down:"arrow-down",left:"arrow-left",right:"arrow-right",period:".",comma:",",equal:"=",minus:"-",underscore:"_"};return t[e]=e,Object.keys(t).map(r=>{if(t[r]===e)return r}).filter(r=>r)}F("model",(e,{modifiers:t,expression:r},{effect:n,cleanup:i})=>{let o=e;t.includes("parent")&&(o=e.parentNode);let s=H(o,r),a;typeof r=="string"?a=H(o,`${r} = __placeholder`):typeof r=="function"&&typeof r()=="string"?a=H(o,`${r()} = __placeholder`):a=()=>{};let l=()=>{let c;return s(d=>c=d),Ai(c)?c.get():c},u=c=>{let d;s(m=>d=m),Ai(d)?d.set(c):a(()=>{},{scope:{__placeholder:c}})};typeof r=="string"&&e.type==="radio"&&B(()=>{e.hasAttribute("name")||e.setAttribute("name",r)});var f=e.tagName.toLowerCase()==="select"||["checkbox","radio"].includes(e.type)||t.includes("lazy")?"change":"input";let p=pe?()=>{}:jr(e,f,t,c=>{u(Er(e,t,c,l()))});if(t.includes("fill")&&([void 0,null,""].includes(l())||e.type==="checkbox"&&Array.isArray(l())||e.tagName.toLowerCase()==="select"&&e.multiple)&&u(Er(e,t,{target:e},l())),e._x_removeModelListeners||(e._x_removeModelListeners={}),e._x_removeModelListeners.default=p,i(()=>e._x_removeModelListeners.default()),e.form){let c=jr(e.form,"reset",[],d=>{en(()=>e._x_model&&e._x_model.set(Er(e,t,{target:e},l())))});i(()=>c())}e._x_model={get(){return l()},set(c){u(c)}},e._x_forceModelUpdate=c=>{c===void 0&&typeof r=="string"&&r.match(/\./)&&(c=""),window.fromModel=!0,B(()=>co(e,"value",c)),delete window.fromModel},n(()=>{let c=l();t.includes("unintrusive")&&document.activeElement.isSameNode(e)||e._x_forceModelUpdate(c)})});function Er(e,t,r,n){return B(()=>{if(r instanceof CustomEvent&&r.detail!==void 0)return r.detail!==null&&r.detail!==void 0?r.detail:r.target.value;if(e.type==="checkbox")if(Array.isArray(n)){let i=null;return t.includes("number")?i=Ar(r.target.value):t.includes("boolean")?i=Nt(r.target.value):i=r.target.value,r.target.checked?n.includes(i)?n:n.concat([i]):n.filter(o=>!ac(o,i))}else return r.target.checked;else{if(e.tagName.toLowerCase()==="select"&&e.multiple)return t.includes("number")?Array.from(r.target.selectedOptions).map(i=>{let o=i.value||i.text;return Ar(o)}):t.includes("boolean")?Array.from(r.target.selectedOptions).map(i=>{let o=i.value||i.text;return Nt(o)}):Array.from(r.target.selectedOptions).map(i=>i.value||i.text);{let i;return e.type==="radio"?r.target.checked?i=r.target.value:i=n:i=r.target.value,t.includes("number")?Ar(i):t.includes("boolean")?Nt(i):t.includes("trim")?i.trim():i}}})}function Ar(e){let t=e?parseFloat(e):null;return lc(t)?t:e}function ac(e,t){return e==t}function lc(e){return!Array.isArray(e)&&!isNaN(e)}function Ai(e){return e!==null&&typeof e=="object"&&typeof e.get=="function"&&typeof e.set=="function"}F("cloak",e=>queueMicrotask(()=>B(()=>e.removeAttribute(He("cloak")))));no(()=>`[${He("init")}]`);F("init",me((e,{expression:t},{evaluate:r})=>typeof t=="string"?!!t.trim()&&r(t,{},!1):r(t,{},!1)));F("text",(e,{expression:t},{effect:r,evaluateLater:n})=>{let i=n(t);r(()=>{i(o=>{B(()=>{e.textContent=o})})})});F("html",(e,{expression:t},{effect:r,evaluateLater:n})=>{let i=n(t);r(()=>{i(o=>{B(()=>{e.innerHTML=o,e._x_ignoreSelf=!0,ie(e),delete e._x_ignoreSelf})})})});Yr(Vi(":",Ji(He("bind:"))));var Uo=(e,{value:t,modifiers:r,expression:n,original:i},{effect:o,cleanup:s})=>{if(!t){let l={};fu(l),H(e,n)(f=>{wo(e,f,i)},{scope:l});return}if(t==="key")return uc(e,n);if(e._x_inlineBindings&&e._x_inlineBindings[t]&&e._x_inlineBindings[t].extract)return;let a=H(e,n);o(()=>a(l=>{l===void 0&&typeof n=="string"&&n.match(/\./)&&(l=""),B(()=>co(e,t,l,r))})),s(()=>{e._x_undoAddedClasses&&e._x_undoAddedClasses(),e._x_undoAddedStyles&&e._x_undoAddedStyles()})};Uo.inline=(e,{value:t,modifiers:r,expression:n})=>{!t||(e._x_inlineBindings||(e._x_inlineBindings={}),e._x_inlineBindings[t]={expression:n,extract:!1})};F("bind",Uo);function uc(e,t){e._x_keyExpression=t}ro(()=>`[${He("data")}]`);F("data",(e,{expression:t},{cleanup:r})=>{if(cc(e))return;t=t===""?"{}":t;let n={};Nr(n,e);let i={};pu(i,n);let o=Ae(e,t,{scope:i});(o===void 0||o===!0)&&(o={}),Nr(o,e);let s=Be(o);Di(s);let a=lt(e,s);s.init&&Ae(e,s.init),r(()=>{s.destroy&&Ae(e,s.destroy),a()})});Dt((e,t)=>{e._x_dataStack&&(t._x_dataStack=e._x_dataStack,t.setAttribute("data-has-alpine-state",!0))});function cc(e){return pe?Dr?!0:e.hasAttribute("data-has-alpine-state"):!1}F("show",(e,{modifiers:t,expression:r},{effect:n})=>{let i=H(e,r);e._x_doHide||(e._x_doHide=()=>{B(()=>{e.style.setProperty("display","none",t.includes("important")?"important":void 0)})}),e._x_doShow||(e._x_doShow=()=>{B(()=>{e.style.length===1&&e.style.display==="none"?e.removeAttribute("style"):e.style.removeProperty("display")})});let o=()=>{e._x_doHide(),e._x_isShown=!1},s=()=>{e._x_doShow(),e._x_isShown=!0},a=()=>setTimeout(s),l=Fr(p=>p?s():o(),p=>{typeof e._x_toggleAndCascadeWithTransitions=="function"?e._x_toggleAndCascadeWithTransitions(e,p,s,o):p?a():o()}),u,f=!0;n(()=>i(p=>{!f&&p===u||(t.includes("immediate")&&(p?a():o()),l(p),u=p,f=!1)}))});F("for",(e,{expression:t},{effect:r,cleanup:n})=>{let i=dc(t),o=H(e,i.items),s=H(e,e._x_keyExpression||"index");e._x_prevKeys=[],e._x_lookup={},r(()=>fc(e,i,o,s)),n(()=>{Object.values(e._x_lookup).forEach(a=>a.remove()),delete e._x_prevKeys,delete e._x_lookup})});function fc(e,t,r,n){let i=s=>typeof s=="object"&&!Array.isArray(s),o=e;r(s=>{pc(s)&&s>=0&&(s=Array.from(Array(s).keys(),g=>g+1)),s===void 0&&(s=[]);let a=e._x_lookup,l=e._x_prevKeys,u=[],f=[];if(i(s))s=Object.entries(s).map(([g,y])=>{let v=Ci(t,y,g,s);n(_=>{f.includes(_)&&V("Duplicate key on x-for",e),f.push(_)},{scope:{index:g,...v}}),u.push(v)});else for(let g=0;g<s.length;g++){let y=Ci(t,s[g],g,s);n(v=>{f.includes(v)&&V("Duplicate key on x-for",e),f.push(v)},{scope:{index:g,...y}}),u.push(y)}let p=[],c=[],d=[],m=[];for(let g=0;g<l.length;g++){let y=l[g];f.indexOf(y)===-1&&d.push(y)}l=l.filter(g=>!d.includes(g));let b="template";for(let g=0;g<f.length;g++){let y=f[g],v=l.indexOf(y);if(v===-1)l.splice(g,0,y),p.push([b,g]);else if(v!==g){let _=l.splice(g,1)[0],T=l.splice(v-1,1)[0];l.splice(g,0,T),l.splice(v,0,_),c.push([_,T])}else m.push(y);b=y}for(let g=0;g<d.length;g++){let y=d[g];a[y]._x_effects&&a[y]._x_effects.forEach(Oi),a[y].remove(),a[y]=null,delete a[y]}for(let g=0;g<c.length;g++){let[y,v]=c[g],_=a[y],T=a[v],A=document.createElement("div");B(()=>{T||V('x-for ":key" is undefined or invalid',o,v,a),T.after(A),_.after(T),T._x_currentIfEl&&T.after(T._x_currentIfEl),A.before(_),_._x_currentIfEl&&_.after(_._x_currentIfEl),A.remove()}),T._x_refreshXForScope(u[f.indexOf(v)])}for(let g=0;g<p.length;g++){let[y,v]=p[g],_=y==="template"?o:a[y];_._x_currentIfEl&&(_=_._x_currentIfEl);let T=u[v],A=f[v],w=document.importNode(o.content,!0).firstElementChild,h=Be(T);lt(w,h,o),w._x_refreshXForScope=x=>{Object.entries(x).forEach(([O,L])=>{h[O]=L})},B(()=>{_.after(w),me(()=>ie(w))()}),typeof A=="object"&&V("x-for key cannot be an object, it must be a string or an integer",o),a[A]=w}for(let g=0;g<m.length;g++)a[m[g]]._x_refreshXForScope(u[f.indexOf(m[g])]);o._x_prevKeys=f})}function dc(e){let t=/,([^,\}\]]*)(?:,([^,\}\]]*))?$/,r=/^\s*\(|\)\s*$/g,n=/([\s\S]*?)\s+(?:in|of)\s+([\s\S]*)/,i=e.match(n);if(!i)return;let o={};o.items=i[2].trim();let s=i[1].replace(r,"").trim(),a=s.match(t);return a?(o.item=s.replace(t,"").trim(),o.index=a[1].trim(),a[2]&&(o.collection=a[2].trim())):o.item=s,o}function Ci(e,t,r,n){let i={};return/^\[.*\]$/.test(e.item)&&Array.isArray(t)?e.item.replace("[","").replace("]","").split(",").map(s=>s.trim()).forEach((s,a)=>{i[s]=t[a]}):/^\{.*\}$/.test(e.item)&&!Array.isArray(t)&&typeof t=="object"?e.item.replace("{","").replace("}","").split(",").map(s=>s.trim()).forEach(s=>{i[s]=t[s]}):i[e.item]=t,e.index&&(i[e.index]=r),e.collection&&(i[e.collection]=n),i}function pc(e){return!Array.isArray(e)&&!isNaN(e)}function Ho(){}Ho.inline=(e,{expression:t},{cleanup:r})=>{let n=Ft(e);n._x_refs||(n._x_refs={}),n._x_refs[t]=e,r(()=>delete n._x_refs[t])};F("ref",Ho);F("if",(e,{expression:t},{effect:r,cleanup:n})=>{e.tagName.toLowerCase()!=="template"&&V("x-if can only be used on a <template> tag",e);let i=H(e,t),o=()=>{if(e._x_currentIfEl)return e._x_currentIfEl;let a=e.content.cloneNode(!0).firstElementChild;return lt(a,{},e),B(()=>{e.after(a),me(()=>ie(a))()}),e._x_currentIfEl=a,e._x_undoIf=()=>{de(a,l=>{l._x_effects&&l._x_effects.forEach(Oi)}),a.remove(),delete e._x_currentIfEl},a},s=()=>{!e._x_undoIf||(e._x_undoIf(),delete e._x_undoIf)};r(()=>i(a=>{a?o():s()})),n(()=>e._x_undoIf&&e._x_undoIf())});F("id",(e,{expression:t},{evaluate:r})=>{r(t).forEach(i=>Zu(e,i))});Dt((e,t)=>{e._x_ids&&(t._x_ids=e._x_ids)});Yr(Vi("@",Ji(He("on:"))));F("on",me((e,{value:t,modifiers:r,expression:n},{cleanup:i})=>{let o=n?H(e,n):()=>{};e.tagName.toLowerCase()==="template"&&(e._x_forwardEvents||(e._x_forwardEvents=[]),e._x_forwardEvents.includes(t)||e._x_forwardEvents.push(t));let s=jr(e,t,r,a=>{o(()=>{},{scope:{$event:a},params:[a]})});i(()=>s())}));qt("Collapse","collapse","collapse");qt("Intersect","intersect","intersect");qt("Focus","trap","focus");qt("Mask","mask","mask");function qt(e,t,r){F(t,n=>V(`You can't use [x-${t}] without first installing the "${e}" plugin here: https://alpinejs.dev/plugins/${r}`,n))}ft.setEvaluator(qi);ft.setReactivityEngine({reactive:un,effect:Su,release:Eu,raw:M});var hc=ft,S=hc;function cn(e,t){return t||(t=()=>{}),(r,n=!1)=>{let i=n,o=r,s=e.$wire,a=s.get(o);return S.interceptor((u,f,p,c,d)=>{if(typeof a>"u"){console.error(`Livewire Entangle Error: Livewire property ['${o}'] cannot be found on component: ['${e.name}']`);return}let m=S.entangle({get(){return s.get(r)},set(b){s.set(r,b,i)}},{get(){return f()},set(b){p(b)}});return t(()=>m()),mc(s.get(r))},u=>{Object.defineProperty(u,"live",{get(){return i=!0,u}})})(a)}}function mc(e){return typeof e=="object"?JSON.parse(JSON.stringify(e)):e}var ke=[];function k(e,t){return ke[e]||(ke[e]=[]),ke[e].push(t),()=>{ke[e]=ke[e].filter(r=>r!==t)}}function R(e,...t){let r=ke[e]||[],n=[];for(let i=0;i<r.length;i++){let o=r[i](...t);br(o)&&n.push(o)}return i=>jo(n,i)}async function Wt(e,...t){let r=ke[e]||[],n=[];for(let i=0;i<r.length;i++){let o=await r[i](...t);br(o)&&n.push(o)}return i=>jo(n,i)}function jo(e,t){let r=t;for(let n=0;n<e.length;n++){let i=e[n](r);i!==void 0&&(r=i)}return r}function fn(e){let t=document.createElement("html");t.innerHTML=e,t.querySelectorAll("a").forEach(i=>i.setAttribute("target","_top"));let r=document.getElementById("livewire-error");typeof r<"u"&&r!=null?r.innerHTML="":(r=document.createElement("div"),r.id="livewire-error",r.style.position="fixed",r.style.width="100vw",r.style.height="100vh",r.style.padding="50px",r.style.backgroundColor="rgba(0, 0, 0, .6)",r.style.zIndex=2e5);let n=document.createElement("iframe");n.style.backgroundColor="#17161A",n.style.borderRadius="5px",n.style.width="100%",n.style.height="100%",r.appendChild(n),document.body.prepend(r),document.body.style.overflow="hidden",n.contentWindow.document.open(),n.contentWindow.document.write(t.outerHTML),n.contentWindow.document.close(),r.addEventListener("click",()=>qo(r)),r.setAttribute("tabindex",0),r.addEventListener("keydown",i=>{i.key==="Escape"&&qo(r)}),r.focus()}function qo(e){e.outerHTML="",document.body.style.overflow="visible"}var Kt=class{constructor(){this.commits=new Set}add(t){this.commits.add(t)}delete(t){this.commits.delete(t)}hasCommitFor(t){return!!this.findCommitByComponent(t)}findCommitByComponent(t){for(let[r,n]of this.commits.entries())if(n.component===t)return n}shouldHoldCommit(t){return!t.isolate}empty(){return this.commits.size===0}async send(){this.prepare(),await Wo(this)}prepare(){this.commits.forEach(t=>t.prepare())}payload(){let t=[],r=[],n=[];return this.commits.forEach(s=>{let[a,l,u]=s.toRequestPayload();t.push(a),r.push(l),n.push(u)}),[t,s=>r.forEach(a=>a(s.shift())),()=>n.forEach(s=>s())]}};var zt=class{constructor(t){this.component=t,this.isolate=!1,this.calls=[],this.receivers=[],this.resolvers=[]}addResolver(t){this.resolvers.push(t)}addCall(t,r,n){this.calls.push({path:"",method:t,params:r,handleReturn(i){n(i)}})}prepare(){R("commit.prepare",{component:this.component})}toRequestPayload(){let t=Qe(this.component.canonical,this.component.ephemeral),r=this.component.mergeQueuedUpdates(t),n={snapshot:this.component.snapshotEncoded,updates:r,calls:this.calls.map(d=>({path:d.path,method:d.method,params:d.params}))},i=[],o=[],s=[],a=d=>i.forEach(m=>m(d)),l=()=>o.forEach(d=>d()),u=()=>s.forEach(d=>d()),f=R("commit",{component:this.component,commit:n,succeed:d=>{i.push(d)},fail:d=>{o.push(d)},respond:d=>{s.push(d)}});return[n,d=>{let{snapshot:m,effects:b}=d;if(u(),this.component.mergeNewSnapshot(m,b,r),this.component.processEffects(this.component.effects),b.returns){let y=b.returns;this.calls.map(({handleReturn:_})=>_).forEach((_,T)=>{_(y[T])})}let g=JSON.parse(m);f({snapshot:g,effects:b}),this.resolvers.forEach(y=>y()),a(d)},()=>{u(),l()}]}};var Vt=class{constructor(){this.commits=new Set,this.pools=new Set}add(t){let r=this.findCommitOr(t,()=>{let n=new zt(t);return this.commits.add(n),n});return gc(r,()=>{this.findPoolWithComponent(r.component)||this.createAndSendNewPool()}),r}findCommitOr(t,r){for(let[n,i]of this.commits.entries())if(i.component===t)return i;return r()}findPoolWithComponent(t){for(let[r,n]of this.pools.entries())if(n.hasCommitFor(t))return n}createAndSendNewPool(){R("commit.pooling",{commits:this.commits});let t=this.corraleCommitsIntoPools();this.commits.clear(),R("commit.pooled",{pools:t}),t.forEach(r=>{r.empty()||(this.pools.add(r),r.send().then(()=>{this.pools.delete(r),this.sendAnyQueuedCommits()}))})}corraleCommitsIntoPools(){let t=new Set;for(let[r,n]of this.commits.entries()){let i=!1;if(t.forEach(o=>{o.shouldHoldCommit(n)&&(o.add(n),i=!0)}),!i){let o=new Kt;o.add(n),t.add(o)}}return t}sendAnyQueuedCommits(){this.commits.size>0&&this.createAndSendNewPool()}},dn=new WeakMap;function gc(e,t){dn.has(e)||dn.set(e,setTimeout(()=>{t(),dn.delete(e)},5))}var Ko=new Vt;async function pn(e){let t=Ko.add(e),r=new Promise(n=>{t.addResolver(n)});return r.commit=t,r}async function zo(e,t,r){let n=Ko.add(e),i=new Promise(o=>{n.addCall(t,r,s=>o(s))});return i.commit=n,i}async function Wo(e){let[t,r,n]=e.payload(),i={method:"POST",body:JSON.stringify({_token:St(),components:t}),headers:{"Content-type":"application/json","X-Livewire":""}},o=[],s=[],a=[],l=v=>o.forEach(_=>_(v)),u=v=>s.forEach(_=>_(v)),f=v=>a.forEach(_=>_(v)),p=R("request.profile",i),c=si();R("request",{url:c,options:i,payload:i.body,respond:v=>a.push(v),succeed:v=>o.push(v),fail:v=>s.push(v)});let d;try{d=await fetch(c,i)}catch{p({content:"{}",failed:!0}),n(),u({status:503,content:null,preventDefault:()=>{}});return}let m={status:d.status,response:d};f(m),d=m.response;let b=await d.text();if(!d.ok){p({content:"{}",failed:!0});let v=!1;return n(),u({status:d.status,content:b,preventDefault:()=>v=!0}),v?void 0:(d.status===419&&vc(),bc(b))}if(d.redirected&&(window.location.href=d.url),Et(b)){let v;[v,b]=ai(b),fn(v),p({content:"{}",failed:!0})}else p({content:b,failed:!1});let{components:g,assets:y}=JSON.parse(b);await Wt("payload.intercept",{components:g,assets:y}),await r(g),l({status:d.status,json:JSON.parse(b)})}function vc(){confirm(`This page has expired.
-Would you like to refresh the page?`)&&window.location.reload()}function bc(e){fn(e)}var mn={},Go;function $(e,t,r=null){mn[e]=t}function wc(e){Go=e}var Vo={on:"$on",el:"$el",id:"$id",get:"$get",set:"$set",call:"$call",commit:"$commit",watch:"$watch",entangle:"$entangle",dispatch:"$dispatch",dispatchTo:"$dispatchTo",dispatchSelf:"$dispatchSelf",upload:"$upload",uploadMultiple:"$uploadMultiple",removeUpload:"$removeUpload",cancelUpload:"$cancelUpload"};function Xo(e,t){return new Proxy({},{get(r,n){if(n==="__instance")return e;if(n in Vo)return Jo(e,Vo[n]);if(n in mn)return Jo(e,n);if(n in t)return t[n];if(!["then"].includes(n))return yc(e)(n)},set(r,n,i){return n in t&&(t[n]=i),!0}})}function Jo(e,t){return mn[t](e)}function yc(e){return Go(e)}S.magic("wire",(e,{cleanup:t})=>{let r;return new Proxy({},{get(n,i){return r||(r=K(e)),["$entangle","entangle"].includes(i)?cn(r,t):r.$wire[i]},set(n,i,o){return r||(r=K(e)),r.$wire[i]=o,!0}})});$("__instance",e=>e);$("$get",e=>(t,r=!0)=>W(r?e.reactive:e.ephemeral,t));$("$el",e=>e.el);$("$id",e=>e.id);$("$set",e=>async(t,r,n=!0)=>(ye(e.reactive,t,r),n?(e.queueUpdate(t,r),await pn(e)):Promise.resolve()));$("$call",e=>async(t,...r)=>await e.$wire[t](...r));$("$entangle",e=>(t,r=!1)=>cn(e)(t,r));$("$toggle",e=>(t,r=!0)=>e.$wire.set(t,!e.$wire.get(t),r));$("$watch",e=>(t,r)=>{let n=()=>W(e.reactive,t),i=S.watch(n,r);e.addCleanup(i)});$("$refresh",e=>e.$wire.$commit);$("$commit",e=>async()=>await pn(e));$("$on",e=>(...t)=>Qo(e,...t));$("$dispatch",e=>(...t)=>Jt(e,...t));$("$dispatchSelf",e=>(...t)=>oe(e,...t));$("$dispatchTo",()=>(...e)=>qe(...e));$("$upload",e=>(...t)=>ui(e,...t));$("$uploadMultiple",e=>(...t)=>ci(e,...t));$("$removeUpload",e=>(...t)=>fi(e,...t));$("$cancelUpload",e=>(...t)=>di(e,...t));var hn=new WeakMap;$("$parent",e=>{if(hn.has(e))return hn.get(e).$wire;let t=e.parent;return hn.set(e,t),t.$wire});var je=new WeakMap;function Yo(e,t,r){je.has(e)||je.set(e,{});let n=je.get(e);n[t]=r,je.set(e,n)}wc(e=>t=>async(...r)=>{if(r.length===1&&r[0]instanceof Event&&(r=[]),je.has(e)){let n=je.get(e);if(typeof n[t]=="function")return n[t](r)}return await zo(e,t,r)});var Gt=class{constructor(t){if(t.__livewire)throw"Component already initialized";if(t.__livewire=this,this.el=t,this.id=t.getAttribute("wire:id"),this.__livewireId=this.id,this.snapshotEncoded=t.getAttribute("wire:snapshot"),this.snapshot=JSON.parse(this.snapshotEncoded),!this.snapshot)throw"Snapshot missing on Livewire component with id: "+this.id;this.name=this.snapshot.memo.name,this.effects=JSON.parse(t.getAttribute("wire:effects")),this.originalEffects=ce(this.effects),this.canonical=xe(ce(this.snapshot.data)),this.ephemeral=xe(ce(this.snapshot.data)),this.reactive=Alpine.reactive(this.ephemeral),this.queuedUpdates={},this.$wire=Xo(this,this.reactive),this.cleanups=[],this.processEffects(this.effects)}mergeNewSnapshot(t,r,n={}){let i=JSON.parse(t),o=ce(this.canonical),s=this.applyUpdates(o,n),a=xe(ce(i.data)),l=Qe(s,a);this.snapshotEncoded=t,this.snapshot=i,this.effects=r,this.canonical=xe(ce(i.data));let u=xe(ce(i.data));return Object.entries(l).forEach(([f,p])=>{let c=f.split(".")[0];this.reactive[c]=u[c]}),l}queueUpdate(t,r){this.queuedUpdates[t]=r}mergeQueuedUpdates(t){return Object.entries(this.queuedUpdates).forEach(([r,n])=>{Object.entries(t).forEach(([i,o])=>{i.startsWith(n)&&delete t[i]}),t[r]=n}),this.queuedUpdates=[],t}applyUpdates(t,r){for(let n in r)ye(t,n,r[n]);return t}replayUpdate(t,r){let n={...this.effects,html:r};this.mergeNewSnapshot(JSON.stringify(t),n),this.processEffects({html:r})}processEffects(t){R("effects",this,t),R("effect",{component:this,effects:t,cleanup:r=>this.addCleanup(r)})}get children(){let t=this.snapshot.memo;return Object.values(t.children).map(n=>n[1]).map(n=>Zo(n))}get parent(){return K(this.el.parentElement)}inscribeSnapshotAndEffectsOnElement(){let t=this.el;t.setAttribute("wire:snapshot",this.snapshotEncoded);let r=this.originalEffects.listeners?{listeners:this.originalEffects.listeners}:{};this.originalEffects.url&&(r.url=this.originalEffects.url),this.originalEffects.scripts&&(r.scripts=this.originalEffects.scripts),t.setAttribute("wire:effects",JSON.stringify(r))}addCleanup(t){this.cleanups.push(t)}cleanup(){for(delete this.el.__livewire;this.cleanups.length>0;)this.cleanups.pop()()}};var se={};function es(e){let t=new Gt(e);if(se[t.id])throw"Component already registered";return R("component.init",{component:t,cleanup:n=>t.addCleanup(n)}),se[t.id]=t,t}function ts(e){let t=se[e];!t||(t.cleanup(),delete se[e])}function Zo(e){let t=se[e];if(!t)throw"Component not found: "+e;return t}function K(e,t=!0){let r=Alpine.findClosest(e,n=>n.__livewire);if(!r){if(t)throw"Could not find Livewire component in DOM tree";return}return r.__livewire}function gn(e){return Object.values(se).filter(t=>e==t.name)}function rs(e){return gn(e).map(t=>t.$wire)}function ns(e){let t=se[e];return t&&t.$wire}function is(){return Object.values(se)[0].$wire}function os(){return Object.values(se)}function Jt(e,t,r){Xt(e.el,t,r)}function ss(e,t){Xt(window,e,t)}function oe(e,t,r){Xt(e.el,t,r,!1)}function qe(e,t,r){gn(e).forEach(i=>{Xt(i.el,t,r,!1)})}function Qo(e,t,r){e.el.addEventListener(t,n=>{r(n.detail)})}function as(e,t){let r=n=>{!n.__livewire||t(n.detail)};return window.addEventListener(e,r),()=>{window.removeEventListener(e,r)}}function Xt(e,t,r,n=!0){let i=new CustomEvent(t,{bubbles:n,detail:r});i.__livewire={name:t,params:r,receivedBy:[]},e.dispatchEvent(i)}var vn=new Set;function We(e){return e.match(new RegExp("wire:"))}function Yt(e,t){let[r,...n]=t.replace(new RegExp("wire:"),"").split(".");return new wn(r,n,t,e)}function I(e,t){vn.has(e)||(vn.add(e),k("directive.init",({el:r,component:n,directive:i,cleanup:o})=>{i.value===e&&t({el:r,directive:i,component:n,$wire:n.$wire,cleanup:o})}))}function Ke(e){return new bn(e)}function ls(e){return vn.has(e)}var bn=class{constructor(t){this.el=t,this.directives=this.extractTypeModifiersAndValue()}all(){return this.directives}has(t){return this.directives.map(r=>r.value).includes(t)}missing(t){return!this.has(t)}get(t){return this.directives.find(r=>r.value===t)}extractTypeModifiersAndValue(){return Array.from(this.el.getAttributeNames().filter(t=>We(t)).map(t=>Yt(this.el,t)))}},wn=class{constructor(t,r,n,i){this.rawName=this.raw=n,this.el=i,this.eventContext,this.value=t,this.modifiers=r,this.expression=this.el.getAttribute(this.rawName)}get method(){let{method:t}=this.parseOutMethodAndParams(this.expression);return t}get params(){let{params:t}=this.parseOutMethodAndParams(this.expression);return t}parseOutMethodAndParams(t){let r=t,n=[],i=r.match(/(.*?)\((.*)\)/s);return i&&(r=i[1],n=new Function("$event",`return (function () {
+`:""}`,t),setTimeout(()=>{throw e},0)}var Rt=!0;function Vi(e){let t=Rt;Rt=!1;let r=e();return Rt=t,r}function Ee(e,t,r={}){let n;return H(e,t)(i=>n=i,r),n}function H(...e){return Ji(...e)}var Ji=Gi;function Fl(e){Ji=e}function Gi(e,t){let r={};Nr(r,e);let n=[r,...$e(e)],i=typeof t=="function"?$l(n,t):Bl(n,t,e);return Il.bind(null,e,t,i)}function $l(e,t){return(r=()=>{},{scope:n={},params:i=[]}={})=>{let o=t.apply(ft([n,...e]),i);It(r,o)}}var Sr={};function Dl(e,t){if(Sr[e])return Sr[e];let r=Object.getPrototypeOf(async function(){}).constructor,n=/^[\n\s]*if.*\(.*\)/.test(e.trim())||/^(let|const)\s/.test(e.trim())?`(async()=>{ ${e} })()`:e,o=(()=>{try{let s=new r(["__self","scope"],`with (scope) { __self.result = ${n} }; __self.finished = true; return __self.result;`);return Object.defineProperty(s,"name",{value:`[Alpine] ${e}`}),s}catch(s){return ut(s,t,e),Promise.resolve()}})();return Sr[e]=o,o}function Bl(e,t,r){let n=Dl(t,r);return(i=()=>{},{scope:o={},params:s=[]}={})=>{n.result=void 0,n.finished=!1;let a=ft([o,...e]);if(typeof n=="function"){let l=n(n,a).catch(u=>ut(u,r,t));n.finished?(It(i,n.result,a,s,r),n.result=void 0):l.then(u=>{It(i,u,a,s,r)}).catch(u=>ut(u,r,t)).finally(()=>n.result=void 0)}}}function It(e,t,r,n,i){if(Rt&&typeof t=="function"){let o=t.apply(r,n);o instanceof Promise?o.then(s=>It(e,s,r,n)).catch(s=>ut(s,i,t)):e(o)}else typeof t=="object"&&t instanceof Promise?t.then(o=>e(o)):e(t)}var Yr="x-";function He(e=""){return Yr+e}function Ul(e){Yr=e}var Ft={};function B(e,t){return Ft[e]=t,{before(r){if(!Ft[r]){console.warn(String.raw`Cannot find directive \`${r}\`. \`${e}\` will use the default order of execution`);return}let n=_e.indexOf(r);_e.splice(n>=0?n:_e.indexOf("DEFAULT"),0,e)}}}function Hl(e){return Object.keys(Ft).includes(e)}function Qr(e,t,r){if(t=Array.from(t),e._x_virtualDirectives){let o=Object.entries(e._x_virtualDirectives).map(([a,l])=>({name:a,value:l})),s=Xi(o);o=o.map(a=>s.find(l=>l.name===a.name)?{name:`x-bind:${a.name}`,value:`"${a.value}"`}:a),t=t.concat(o)}let n={};return t.map(to((o,s)=>n[o]=s)).filter(no).map(Wl(n,r)).sort(zl).map(o=>ql(e,o))}function Xi(e){return Array.from(e).map(to()).filter(t=>!no(t))}var Mr=!1,st=new Map,Yi=Symbol();function jl(e){Mr=!0;let t=Symbol();Yi=t,st.set(t,[]);let r=()=>{for(;st.get(t).length;)st.get(t).shift()();st.delete(t)},n=()=>{Mr=!1,r()};e(r),n()}function Qi(e){let t=[],r=a=>t.push(a),[n,i]=Al(e);return t.push(i),[{Alpine:dt,effect:n,cleanup:r,evaluateLater:H.bind(H,e),evaluate:Ee.bind(Ee,e)},()=>t.forEach(a=>a())]}function ql(e,t){let r=()=>{},n=Ft[t.type]||r,[i,o]=Qi(e);Ui(e,t.original,o);let s=()=>{e._x_ignore||e._x_ignoreSelf||(n.inline&&n.inline(e,t,i),n=n.bind(n,e,t,i),Mr?st.get(Yi).push(n):n())};return s.runCleanups=o,s}var Zi=(e,t)=>({name:r,value:n})=>(r.startsWith(e)&&(r=r.replace(e,t)),{name:r,value:n}),eo=e=>e;function to(e=()=>{}){return({name:t,value:r})=>{let{name:n,value:i}=ro.reduce((o,s)=>s(o),{name:t,value:r});return n!==t&&e(n,t),{name:n,value:i}}}var ro=[];function Zr(e){ro.push(e)}function no({name:e}){return io().test(e)}var io=()=>new RegExp(`^${Yr}([^:^.]+)\\b`);function Wl(e,t){return({name:r,value:n})=>{let i=r.match(io()),o=r.match(/:([a-zA-Z0-9\-_:]+)/),s=r.match(/\.[^.\]]+(?=[^\]]*$)/g)||[],a=t||e[r]||r;return{type:i?i[1]:null,value:o?o[1]:null,modifiers:s.map(l=>l.replace(".","")),expression:n,original:a}}}var Ir="DEFAULT",_e=["ignore","ref","data","id","anchor","bind","init","for","model","modelable","transition","show","if",Ir,"teleport"];function zl(e,t){let r=_e.indexOf(e.type)===-1?Ir:e.type,n=_e.indexOf(t.type)===-1?Ir:t.type;return _e.indexOf(r)-_e.indexOf(n)}function at(e,t,r={}){e.dispatchEvent(new CustomEvent(t,{detail:r,bubbles:!0,composed:!0,cancelable:!0}))}function Oe(e,t){if(typeof ShadowRoot=="function"&&e instanceof ShadowRoot){Array.from(e.children).forEach(i=>Oe(i,t));return}let r=!1;if(t(e,()=>r=!0),r)return;let n=e.firstElementChild;for(;n;)Oe(n,t,!1),n=n.nextElementSibling}function V(e,...t){console.warn(`Alpine Warning: ${e}`,...t)}var xi=!1;function Kl(){xi&&V("Alpine has already been initialized on this page. Calling Alpine.start() more than once can cause problems."),xi=!0,document.body||V("Unable to initialize. Trying to load Alpine before `<body>` is available. Did you forget to add `defer` in Alpine's `<script>` tag?"),at(document,"alpine:init"),at(document,"alpine:initializing"),Jr(),Cl(t=>ie(t,Oe)),zr(t=>qe(t)),Bi((t,r)=>{Qr(t,r).forEach(n=>n())});let e=t=>!Dt(t.parentElement,!0);Array.from(document.querySelectorAll(ao().join(","))).filter(e).forEach(t=>{ie(t)}),at(document,"alpine:initialized"),setTimeout(()=>{Xl()})}var en=[],oo=[];function so(){return en.map(e=>e())}function ao(){return en.concat(oo).map(e=>e())}function lo(e){en.push(e)}function uo(e){oo.push(e)}function Dt(e,t=!1){return je(e,r=>{if((t?ao():so()).some(i=>r.matches(i)))return!0})}function je(e,t){if(!!e){if(t(e))return e;if(e._x_teleportBack&&(e=e._x_teleportBack),!!e.parentElement)return je(e.parentElement,t)}}function Vl(e){return so().some(t=>e.matches(t))}var co=[];function Jl(e){co.push(e)}var Gl=1;function ie(e,t=Oe,r=()=>{}){je(e,n=>n._x_ignore)||jl(()=>{t(e,(n,i)=>{n._x_marker||(r(n,i),co.forEach(o=>o(n,i)),Qr(n,n.attributes).forEach(o=>o()),n._x_ignore||(n._x_marker=Gl++),n._x_ignore&&i())})})}function qe(e,t=Oe){t(e,r=>{Ol(r),Hi(r),delete r._x_marker})}function Xl(){[["ui","dialog",["[x-dialog], [x-popover]"]],["anchor","anchor",["[x-anchor]"]],["sort","sort",["[x-sort]"]]].forEach(([t,r,n])=>{Hl(r)||n.some(i=>{if(document.querySelector(i))return V(`found "${i}", but missing ${t} plugin`),!0})})}var Fr=[],tn=!1;function rn(e=()=>{}){return queueMicrotask(()=>{tn||setTimeout(()=>{$r()})}),new Promise(t=>{Fr.push(()=>{e(),t()})})}function $r(){for(tn=!1;Fr.length;)Fr.shift()()}function Yl(){tn=!0}function nn(e,t){return Array.isArray(t)?_i(e,t.join(" ")):typeof t=="object"&&t!==null?Ql(e,t):typeof t=="function"?nn(e,t()):_i(e,t)}function _i(e,t){let r=o=>o.split(" ").filter(Boolean),n=o=>o.split(" ").filter(s=>!e.classList.contains(s)).filter(Boolean),i=o=>(e.classList.add(...o),()=>{e.classList.remove(...o)});return t=t===!0?t="":t||"",i(n(t))}function Ql(e,t){let r=a=>a.split(" ").filter(Boolean),n=Object.entries(t).flatMap(([a,l])=>l?r(a):!1).filter(Boolean),i=Object.entries(t).flatMap(([a,l])=>l?!1:r(a)).filter(Boolean),o=[],s=[];return i.forEach(a=>{e.classList.contains(a)&&(e.classList.remove(a),s.push(a))}),n.forEach(a=>{e.classList.contains(a)||(e.classList.add(a),o.push(a))}),()=>{s.forEach(a=>e.classList.add(a)),o.forEach(a=>e.classList.remove(a))}}function Bt(e,t){return typeof t=="object"&&t!==null?Zl(e,t):eu(e,t)}function Zl(e,t){let r={};return Object.entries(t).forEach(([n,i])=>{r[n]=e.style[n],n.startsWith("--")||(n=tu(n)),e.style.setProperty(n,i)}),setTimeout(()=>{e.style.length===0&&e.removeAttribute("style")}),()=>{Bt(e,r)}}function eu(e,t){let r=e.getAttribute("style",t);return e.setAttribute("style",t),()=>{e.setAttribute("style",r||"")}}function tu(e){return e.replace(/([a-z])([A-Z])/g,"$1-$2").toLowerCase()}function Dr(e,t=()=>{}){let r=!1;return function(){r?t.apply(this,arguments):(r=!0,e.apply(this,arguments))}}B("transition",(e,{value:t,modifiers:r,expression:n},{evaluate:i})=>{typeof n=="function"&&(n=i(n)),n!==!1&&(!n||typeof n=="boolean"?nu(e,r,t):ru(e,n,t))});function ru(e,t,r){fo(e,nn,""),{enter:i=>{e._x_transition.enter.during=i},"enter-start":i=>{e._x_transition.enter.start=i},"enter-end":i=>{e._x_transition.enter.end=i},leave:i=>{e._x_transition.leave.during=i},"leave-start":i=>{e._x_transition.leave.start=i},"leave-end":i=>{e._x_transition.leave.end=i}}[r](t)}function nu(e,t,r){fo(e,Bt);let n=!t.includes("in")&&!t.includes("out")&&!r,i=n||t.includes("in")||["enter"].includes(r),o=n||t.includes("out")||["leave"].includes(r);t.includes("in")&&!n&&(t=t.filter((y,v)=>v<t.indexOf("out"))),t.includes("out")&&!n&&(t=t.filter((y,v)=>v>t.indexOf("out")));let s=!t.includes("opacity")&&!t.includes("scale"),a=s||t.includes("opacity"),l=s||t.includes("scale"),u=a?0:1,f=l?it(t,"scale",95)/100:1,p=it(t,"delay",0)/1e3,c=it(t,"origin","center"),d="opacity, transform",m=it(t,"duration",150)/1e3,b=it(t,"duration",75)/1e3,g="cubic-bezier(0.4, 0.0, 0.2, 1)";i&&(e._x_transition.enter.during={transformOrigin:c,transitionDelay:`${p}s`,transitionProperty:d,transitionDuration:`${m}s`,transitionTimingFunction:g},e._x_transition.enter.start={opacity:u,transform:`scale(${f})`},e._x_transition.enter.end={opacity:1,transform:"scale(1)"}),o&&(e._x_transition.leave.during={transformOrigin:c,transitionDelay:`${p}s`,transitionProperty:d,transitionDuration:`${b}s`,transitionTimingFunction:g},e._x_transition.leave.start={opacity:1,transform:"scale(1)"},e._x_transition.leave.end={opacity:u,transform:`scale(${f})`})}function fo(e,t,r={}){e._x_transition||(e._x_transition={enter:{during:r,start:r,end:r},leave:{during:r,start:r,end:r},in(n=()=>{},i=()=>{}){Br(e,t,{during:this.enter.during,start:this.enter.start,end:this.enter.end},n,i)},out(n=()=>{},i=()=>{}){Br(e,t,{during:this.leave.during,start:this.leave.start,end:this.leave.end},n,i)}})}window.Element.prototype._x_toggleAndCascadeWithTransitions=function(e,t,r,n){let i=document.visibilityState==="visible"?requestAnimationFrame:setTimeout,o=()=>i(r);if(t){e._x_transition&&(e._x_transition.enter||e._x_transition.leave)?e._x_transition.enter&&(Object.entries(e._x_transition.enter.during).length||Object.entries(e._x_transition.enter.start).length||Object.entries(e._x_transition.enter.end).length)?e._x_transition.in(r):o():e._x_transition?e._x_transition.in(r):o();return}e._x_hidePromise=e._x_transition?new Promise((s,a)=>{e._x_transition.out(()=>{},()=>s(n)),e._x_transitioning&&e._x_transitioning.beforeCancel(()=>a({isFromCancelledTransition:!0}))}):Promise.resolve(n),queueMicrotask(()=>{let s=po(e);s?(s._x_hideChildren||(s._x_hideChildren=[]),s._x_hideChildren.push(e)):i(()=>{let a=l=>{let u=Promise.all([l._x_hidePromise,...(l._x_hideChildren||[]).map(a)]).then(([f])=>f?.());return delete l._x_hidePromise,delete l._x_hideChildren,u};a(e).catch(l=>{if(!l.isFromCancelledTransition)throw l})})})};function po(e){let t=e.parentNode;if(!!t)return t._x_hidePromise?t:po(t)}function Br(e,t,{during:r,start:n,end:i}={},o=()=>{},s=()=>{}){if(e._x_transitioning&&e._x_transitioning.cancel(),Object.keys(r).length===0&&Object.keys(n).length===0&&Object.keys(i).length===0){o(),s();return}let a,l,u;iu(e,{start(){a=t(e,n)},during(){l=t(e,r)},before:o,end(){a(),u=t(e,i)},after:s,cleanup(){l(),u()}})}function iu(e,t){let r,n,i,o=Dr(()=>{F(()=>{r=!0,n||t.before(),i||(t.end(),$r()),t.after(),e.isConnected&&t.cleanup(),delete e._x_transitioning})});e._x_transitioning={beforeCancels:[],beforeCancel(s){this.beforeCancels.push(s)},cancel:Dr(function(){for(;this.beforeCancels.length;)this.beforeCancels.shift()();o()}),finish:o},F(()=>{t.start(),t.during()}),Yl(),requestAnimationFrame(()=>{if(r)return;let s=Number(getComputedStyle(e).transitionDuration.replace(/,.*/,"").replace("s",""))*1e3,a=Number(getComputedStyle(e).transitionDelay.replace(/,.*/,"").replace("s",""))*1e3;s===0&&(s=Number(getComputedStyle(e).animationDuration.replace("s",""))*1e3),F(()=>{t.before()}),n=!0,requestAnimationFrame(()=>{r||(F(()=>{t.end()}),$r(),setTimeout(e._x_transitioning.finish,s+a),i=!0)})})}function it(e,t,r){if(e.indexOf(t)===-1)return r;let n=e[e.indexOf(t)+1];if(!n||t==="scale"&&isNaN(n))return r;if(t==="duration"||t==="delay"){let i=n.match(/([0-9]+)ms/);if(i)return i[1]}return t==="origin"&&["top","right","left","center","bottom"].includes(e[e.indexOf(t)+2])?[n,e[e.indexOf(t)+2]].join(" "):n}var de=!1;function he(e,t=()=>{}){return(...r)=>de?t(...r):e(...r)}function ou(e){return(...t)=>de&&e(...t)}var ho=[];function Ut(e){ho.push(e)}function su(e,t){ho.forEach(r=>r(e,t)),de=!0,mo(()=>{ie(t,(r,n)=>{n(r,()=>{})})}),de=!1}var Ur=!1;function au(e,t){t._x_dataStack||(t._x_dataStack=e._x_dataStack),de=!0,Ur=!0,mo(()=>{lu(t)}),de=!1,Ur=!1}function lu(e){let t=!1;ie(e,(n,i)=>{Oe(n,(o,s)=>{if(t&&Vl(o))return s();t=!0,i(o,s)})})}function mo(e){let t=Te;yi((r,n)=>{let i=t(r);return Ue(i),()=>{}}),e(),yi(t)}function go(e,t,r,n=[]){switch(e._x_bindings||(e._x_bindings=Be({})),e._x_bindings[t]=r,t=n.includes("camel")?gu(t):t,t){case"value":uu(e,r);break;case"style":fu(e,r);break;case"class":cu(e,r);break;case"selected":case"checked":du(e,t,r);break;default:vo(e,t,r);break}}function uu(e,t){if(yo(e))e.attributes.value===void 0&&(e.value=t),window.fromModel&&(typeof t=="boolean"?e.checked=Nt(e.value)===t:e.checked=Si(e.value,t));else if(on(e))Number.isInteger(t)?e.value=t:!Array.isArray(t)&&typeof t!="boolean"&&![null,void 0].includes(t)?e.value=String(t):Array.isArray(t)?e.checked=t.some(r=>Si(r,e.value)):e.checked=!!t;else if(e.tagName==="SELECT")mu(e,t);else{if(e.value===t)return;e.value=t===void 0?"":t}}function cu(e,t){e._x_undoAddedClasses&&e._x_undoAddedClasses(),e._x_undoAddedClasses=nn(e,t)}function fu(e,t){e._x_undoAddedStyles&&e._x_undoAddedStyles(),e._x_undoAddedStyles=Bt(e,t)}function du(e,t,r){vo(e,t,r),hu(e,t,r)}function vo(e,t,r){[null,void 0,!1].includes(r)&&bu(t)?e.removeAttribute(t):(bo(t)&&(r=t),pu(e,t,r))}function pu(e,t,r){e.getAttribute(t)!=r&&e.setAttribute(t,r)}function hu(e,t,r){e[t]!==r&&(e[t]=r)}function mu(e,t){let r=[].concat(t).map(n=>n+"");Array.from(e.options).forEach(n=>{n.selected=r.includes(n.value)})}function gu(e){return e.toLowerCase().replace(/-(\w)/g,(t,r)=>r.toUpperCase())}function Si(e,t){return e==t}function Nt(e){return[1,"1","true","on","yes",!0].includes(e)?!0:[0,"0","false","off","no",!1].includes(e)?!1:e?Boolean(e):null}var vu=new Set(["allowfullscreen","async","autofocus","autoplay","checked","controls","default","defer","disabled","formnovalidate","inert","ismap","itemscope","loop","multiple","muted","nomodule","novalidate","open","playsinline","readonly","required","reversed","selected","shadowrootclonable","shadowrootdelegatesfocus","shadowrootserializable"]);function bo(e){return vu.has(e)}function bu(e){return!["aria-pressed","aria-checked","aria-expanded","aria-selected"].includes(e)}function wu(e,t,r){return e._x_bindings&&e._x_bindings[t]!==void 0?e._x_bindings[t]:wo(e,t,r)}function yu(e,t,r,n=!0){if(e._x_bindings&&e._x_bindings[t]!==void 0)return e._x_bindings[t];if(e._x_inlineBindings&&e._x_inlineBindings[t]!==void 0){let i=e._x_inlineBindings[t];return i.extract=n,Vi(()=>Ee(e,i.expression))}return wo(e,t,r)}function wo(e,t,r){let n=e.getAttribute(t);return n===null?typeof r=="function"?r():r:n===""?!0:bo(t)?!![t,"true"].includes(n):n}function on(e){return e.type==="checkbox"||e.localName==="ui-checkbox"||e.localName==="ui-switch"}function yo(e){return e.type==="radio"||e.localName==="ui-radio"}function xo(e,t){var r;return function(){var n=this,i=arguments,o=function(){r=null,e.apply(n,i)};clearTimeout(r),r=setTimeout(o,t)}}function _o(e,t){let r;return function(){let n=this,i=arguments;r||(e.apply(n,i),r=!0,setTimeout(()=>r=!1,t))}}function So({get:e,set:t},{get:r,set:n}){let i=!0,o,s,a=Te(()=>{let l=e(),u=r();if(i)n(Er(l)),i=!1;else{let f=JSON.stringify(l),p=JSON.stringify(u);f!==o?n(Er(l)):f!==p&&t(Er(u))}o=JSON.stringify(e()),s=JSON.stringify(r())});return()=>{Ue(a)}}function Er(e){return typeof e=="object"?JSON.parse(JSON.stringify(e)):e}function xu(e){(Array.isArray(e)?e:[e]).forEach(r=>r(dt))}var xe={},Ei=!1;function _u(e,t){if(Ei||(xe=Be(xe),Ei=!0),t===void 0)return xe[e];xe[e]=t,Wi(xe[e]),typeof t=="object"&&t!==null&&t.hasOwnProperty("init")&&typeof t.init=="function"&&xe[e].init()}function Su(){return xe}var Eo={};function Eu(e,t){let r=typeof t!="function"?()=>t:t;return e instanceof Element?Ao(e,r()):(Eo[e]=r,()=>{})}function Au(e){return Object.entries(Eo).forEach(([t,r])=>{Object.defineProperty(e,t,{get(){return(...n)=>r(...n)}})}),e}function Ao(e,t,r){let n=[];for(;n.length;)n.pop()();let i=Object.entries(t).map(([s,a])=>({name:s,value:a})),o=Xi(i);return i=i.map(s=>o.find(a=>a.name===s.name)?{name:`x-bind:${s.name}`,value:`"${s.value}"`}:s),Qr(e,i,r).map(s=>{n.push(s.runCleanups),s()}),()=>{for(;n.length;)n.pop()()}}var Co={};function Cu(e,t){Co[e]=t}function Ou(e,t){return Object.entries(Co).forEach(([r,n])=>{Object.defineProperty(e,r,{get(){return(...i)=>n.bind(t)(...i)},enumerable:!1})}),e}var Tu={get reactive(){return Be},get release(){return Ue},get effect(){return Te},get raw(){return Mi},version:"3.14.8",flushAndStopDeferringMutations:Ll,dontAutoEvaluateFunctions:Vi,disableEffectScheduling:Sl,startObservingMutations:Jr,stopObservingMutations:ji,setReactivityEngine:El,onAttributeRemoved:Ui,onAttributesAdded:Bi,closestDataStack:$e,skipDuringClone:he,onlyDuringClone:ou,addRootSelector:lo,addInitSelector:uo,interceptClone:Ut,addScopeToNode:ct,deferMutations:kl,mapAttributes:Zr,evaluateLater:H,interceptInit:Jl,setEvaluator:Fl,mergeProxies:ft,extractProp:yu,findClosest:je,onElRemoved:zr,closestRoot:Dt,destroyTree:qe,interceptor:zi,transition:Br,setStyles:Bt,mutateDom:F,directive:B,entangle:So,throttle:_o,debounce:xo,evaluate:Ee,initTree:ie,nextTick:rn,prefixed:He,prefix:Ul,plugin:xu,magic:Z,store:_u,start:Kl,clone:au,cloneNode:su,bound:wu,$data:qi,watch:Ii,walk:Oe,data:Cu,bind:Eu},dt=Tu;function Oo(e,t){let r=Object.create(null),n=e.split(",");for(let i=0;i<n.length;i++)r[n[i]]=!0;return t?i=>!!r[i.toLowerCase()]:i=>!!r[i]}var ku="itemscope,allowfullscreen,formnovalidate,ismap,nomodule,novalidate,readonly",op=Oo(ku+",async,autofocus,autoplay,controls,default,defer,disabled,hidden,loop,open,required,reversed,scoped,seamless,checked,muted,multiple,selected"),Lu=Object.freeze({}),sp=Object.freeze([]),Pu=Object.prototype.hasOwnProperty,Ht=(e,t)=>Pu.call(e,t),Ae=Array.isArray,lt=e=>To(e)==="[object Map]",Ru=e=>typeof e=="string",sn=e=>typeof e=="symbol",jt=e=>e!==null&&typeof e=="object",Nu=Object.prototype.toString,To=e=>Nu.call(e),ko=e=>To(e).slice(8,-1),an=e=>Ru(e)&&e!=="NaN"&&e[0]!=="-"&&""+parseInt(e,10)===e,qt=e=>{let t=Object.create(null);return r=>t[r]||(t[r]=e(r))},Mu=/-(\w)/g,ap=qt(e=>e.replace(Mu,(t,r)=>r?r.toUpperCase():"")),Iu=/\B([A-Z])/g,lp=qt(e=>e.replace(Iu,"-$1").toLowerCase()),Lo=qt(e=>e.charAt(0).toUpperCase()+e.slice(1)),up=qt(e=>e?`on${Lo(e)}`:""),Po=(e,t)=>e!==t&&(e===e||t===t),Hr=new WeakMap,ot=[],ee,Ce=Symbol("iterate"),jr=Symbol("Map key iterate");function Fu(e){return e&&e._isEffect===!0}function $u(e,t=Lu){Fu(e)&&(e=e.raw);let r=Uu(e,t);return t.lazy||r(),r}function Du(e){e.active&&(Ro(e),e.options.onStop&&e.options.onStop(),e.active=!1)}var Bu=0;function Uu(e,t){let r=function(){if(!r.active)return e();if(!ot.includes(r)){Ro(r);try{return ju(),ot.push(r),ee=r,e()}finally{ot.pop(),No(),ee=ot[ot.length-1]}}};return r.id=Bu++,r.allowRecurse=!!t.allowRecurse,r._isEffect=!0,r.active=!0,r.raw=e,r.deps=[],r.options=t,r}function Ro(e){let{deps:t}=e;if(t.length){for(let r=0;r<t.length;r++)t[r].delete(e);t.length=0}}var De=!0,ln=[];function Hu(){ln.push(De),De=!1}function ju(){ln.push(De),De=!0}function No(){let e=ln.pop();De=e===void 0?!0:e}function Q(e,t,r){if(!De||ee===void 0)return;let n=Hr.get(e);n||Hr.set(e,n=new Map);let i=n.get(r);i||n.set(r,i=new Set),i.has(ee)||(i.add(ee),ee.deps.push(i),ee.options.onTrack&&ee.options.onTrack({effect:ee,target:e,type:t,key:r}))}function pe(e,t,r,n,i,o){let s=Hr.get(e);if(!s)return;let a=new Set,l=f=>{f&&f.forEach(p=>{(p!==ee||p.allowRecurse)&&a.add(p)})};if(t==="clear")s.forEach(l);else if(r==="length"&&Ae(e))s.forEach((f,p)=>{(p==="length"||p>=n)&&l(f)});else switch(r!==void 0&&l(s.get(r)),t){case"add":Ae(e)?an(r)&&l(s.get("length")):(l(s.get(Ce)),lt(e)&&l(s.get(jr)));break;case"delete":Ae(e)||(l(s.get(Ce)),lt(e)&&l(s.get(jr)));break;case"set":lt(e)&&l(s.get(Ce));break}let u=f=>{f.options.onTrigger&&f.options.onTrigger({effect:f,target:e,key:r,type:t,newValue:n,oldValue:i,oldTarget:o}),f.options.scheduler?f.options.scheduler(f):f()};a.forEach(u)}var qu=Oo("__proto__,__v_isRef,__isVue"),Mo=new Set(Object.getOwnPropertyNames(Symbol).map(e=>Symbol[e]).filter(sn)),Wu=Io(),zu=Io(!0),Ai=Ku();function Ku(){let e={};return["includes","indexOf","lastIndexOf"].forEach(t=>{e[t]=function(...r){let n=M(this);for(let o=0,s=this.length;o<s;o++)Q(n,"get",o+"");let i=n[t](...r);return i===-1||i===!1?n[t](...r.map(M)):i}}),["push","pop","shift","unshift","splice"].forEach(t=>{e[t]=function(...r){Hu();let n=M(this)[t].apply(this,r);return No(),n}}),e}function Io(e=!1,t=!1){return function(n,i,o){if(i==="__v_isReactive")return!e;if(i==="__v_isReadonly")return e;if(i==="__v_raw"&&o===(e?t?lc:Bo:t?ac:Do).get(n))return n;let s=Ae(n);if(!e&&s&&Ht(Ai,i))return Reflect.get(Ai,i,o);let a=Reflect.get(n,i,o);return(sn(i)?Mo.has(i):qu(i))||(e||Q(n,"get",i),t)?a:qr(a)?!s||!an(i)?a.value:a:jt(a)?e?Uo(a):dn(a):a}}var Vu=Ju();function Ju(e=!1){return function(r,n,i,o){let s=r[n];if(!e&&(i=M(i),s=M(s),!Ae(r)&&qr(s)&&!qr(i)))return s.value=i,!0;let a=Ae(r)&&an(n)?Number(n)<r.length:Ht(r,n),l=Reflect.set(r,n,i,o);return r===M(o)&&(a?Po(i,s)&&pe(r,"set",n,i,s):pe(r,"add",n,i)),l}}function Gu(e,t){let r=Ht(e,t),n=e[t],i=Reflect.deleteProperty(e,t);return i&&r&&pe(e,"delete",t,void 0,n),i}function Xu(e,t){let r=Reflect.has(e,t);return(!sn(t)||!Mo.has(t))&&Q(e,"has",t),r}function Yu(e){return Q(e,"iterate",Ae(e)?"length":Ce),Reflect.ownKeys(e)}var Qu={get:Wu,set:Vu,deleteProperty:Gu,has:Xu,ownKeys:Yu},Zu={get:zu,set(e,t){return console.warn(`Set operation on key "${String(t)}" failed: target is readonly.`,e),!0},deleteProperty(e,t){return console.warn(`Delete operation on key "${String(t)}" failed: target is readonly.`,e),!0}},un=e=>jt(e)?dn(e):e,cn=e=>jt(e)?Uo(e):e,fn=e=>e,Wt=e=>Reflect.getPrototypeOf(e);function Ot(e,t,r=!1,n=!1){e=e.__v_raw;let i=M(e),o=M(t);t!==o&&!r&&Q(i,"get",t),!r&&Q(i,"get",o);let{has:s}=Wt(i),a=n?fn:r?cn:un;if(s.call(i,t))return a(e.get(t));if(s.call(i,o))return a(e.get(o));e!==i&&e.get(t)}function Tt(e,t=!1){let r=this.__v_raw,n=M(r),i=M(e);return e!==i&&!t&&Q(n,"has",e),!t&&Q(n,"has",i),e===i?r.has(e):r.has(e)||r.has(i)}function kt(e,t=!1){return e=e.__v_raw,!t&&Q(M(e),"iterate",Ce),Reflect.get(e,"size",e)}function Ci(e){e=M(e);let t=M(this);return Wt(t).has.call(t,e)||(t.add(e),pe(t,"add",e,e)),this}function Oi(e,t){t=M(t);let r=M(this),{has:n,get:i}=Wt(r),o=n.call(r,e);o?$o(r,n,e):(e=M(e),o=n.call(r,e));let s=i.call(r,e);return r.set(e,t),o?Po(t,s)&&pe(r,"set",e,t,s):pe(r,"add",e,t),this}function Ti(e){let t=M(this),{has:r,get:n}=Wt(t),i=r.call(t,e);i?$o(t,r,e):(e=M(e),i=r.call(t,e));let o=n?n.call(t,e):void 0,s=t.delete(e);return i&&pe(t,"delete",e,void 0,o),s}function ki(){let e=M(this),t=e.size!==0,r=lt(e)?new Map(e):new Set(e),n=e.clear();return t&&pe(e,"clear",void 0,void 0,r),n}function Lt(e,t){return function(n,i){let o=this,s=o.__v_raw,a=M(s),l=t?fn:e?cn:un;return!e&&Q(a,"iterate",Ce),s.forEach((u,f)=>n.call(i,l(u),l(f),o))}}function Pt(e,t,r){return function(...n){let i=this.__v_raw,o=M(i),s=lt(o),a=e==="entries"||e===Symbol.iterator&&s,l=e==="keys"&&s,u=i[e](...n),f=r?fn:t?cn:un;return!t&&Q(o,"iterate",l?jr:Ce),{next(){let{value:p,done:c}=u.next();return c?{value:p,done:c}:{value:a?[f(p[0]),f(p[1])]:f(p),done:c}},[Symbol.iterator](){return this}}}}function fe(e){return function(...t){{let r=t[0]?`on key "${t[0]}" `:"";console.warn(`${Lo(e)} operation ${r}failed: target is readonly.`,M(this))}return e==="delete"?!1:this}}function ec(){let e={get(o){return Ot(this,o)},get size(){return kt(this)},has:Tt,add:Ci,set:Oi,delete:Ti,clear:ki,forEach:Lt(!1,!1)},t={get(o){return Ot(this,o,!1,!0)},get size(){return kt(this)},has:Tt,add:Ci,set:Oi,delete:Ti,clear:ki,forEach:Lt(!1,!0)},r={get(o){return Ot(this,o,!0)},get size(){return kt(this,!0)},has(o){return Tt.call(this,o,!0)},add:fe("add"),set:fe("set"),delete:fe("delete"),clear:fe("clear"),forEach:Lt(!0,!1)},n={get(o){return Ot(this,o,!0,!0)},get size(){return kt(this,!0)},has(o){return Tt.call(this,o,!0)},add:fe("add"),set:fe("set"),delete:fe("delete"),clear:fe("clear"),forEach:Lt(!0,!0)};return["keys","values","entries",Symbol.iterator].forEach(o=>{e[o]=Pt(o,!1,!1),r[o]=Pt(o,!0,!1),t[o]=Pt(o,!1,!0),n[o]=Pt(o,!0,!0)}),[e,r,t,n]}var[tc,rc,nc,ic]=ec();function Fo(e,t){let r=t?e?ic:nc:e?rc:tc;return(n,i,o)=>i==="__v_isReactive"?!e:i==="__v_isReadonly"?e:i==="__v_raw"?n:Reflect.get(Ht(r,i)&&i in n?r:n,i,o)}var oc={get:Fo(!1,!1)},sc={get:Fo(!0,!1)};function $o(e,t,r){let n=M(r);if(n!==r&&t.call(e,n)){let i=ko(e);console.warn(`Reactive ${i} contains both the raw and reactive versions of the same object${i==="Map"?" as keys":""}, which can lead to inconsistencies. Avoid differentiating between the raw and reactive versions of an object and only use the reactive version if possible.`)}}var Do=new WeakMap,ac=new WeakMap,Bo=new WeakMap,lc=new WeakMap;function uc(e){switch(e){case"Object":case"Array":return 1;case"Map":case"Set":case"WeakMap":case"WeakSet":return 2;default:return 0}}function cc(e){return e.__v_skip||!Object.isExtensible(e)?0:uc(ko(e))}function dn(e){return e&&e.__v_isReadonly?e:Ho(e,!1,Qu,oc,Do)}function Uo(e){return Ho(e,!0,Zu,sc,Bo)}function Ho(e,t,r,n,i){if(!jt(e))return console.warn(`value cannot be made reactive: ${String(e)}`),e;if(e.__v_raw&&!(t&&e.__v_isReactive))return e;let o=i.get(e);if(o)return o;let s=cc(e);if(s===0)return e;let a=new Proxy(e,s===2?n:r);return i.set(e,a),a}function M(e){return e&&M(e.__v_raw)||e}function qr(e){return Boolean(e&&e.__v_isRef===!0)}Z("nextTick",()=>rn);Z("dispatch",e=>at.bind(at,e));Z("watch",(e,{evaluateLater:t,cleanup:r})=>(n,i)=>{let o=t(n),a=Ii(()=>{let l;return o(u=>l=u),l},i);r(a)});Z("store",Su);Z("data",e=>qi(e));Z("root",e=>Dt(e));Z("refs",e=>(e._x_refs_proxy||(e._x_refs_proxy=ft(fc(e))),e._x_refs_proxy));function fc(e){let t=[];return je(e,r=>{r._x_refs&&t.push(r._x_refs)}),t}var Ar={};function jo(e){return Ar[e]||(Ar[e]=0),++Ar[e]}function dc(e,t){return je(e,r=>{if(r._x_ids&&r._x_ids[t])return!0})}function pc(e,t){e._x_ids||(e._x_ids={}),e._x_ids[t]||(e._x_ids[t]=jo(t))}Z("id",(e,{cleanup:t})=>(r,n=null)=>{let i=`${r}${n?`-${n}`:""}`;return hc(e,i,t,()=>{let o=dc(e,r),s=o?o._x_ids[r]:jo(r);return n?`${r}-${s}-${n}`:`${r}-${s}`})});Ut((e,t)=>{e._x_id&&(t._x_id=e._x_id)});function hc(e,t,r,n){if(e._x_id||(e._x_id={}),e._x_id[t])return e._x_id[t];let i=n();return e._x_id[t]=i,r(()=>{delete e._x_id[t]}),i}Z("el",e=>e);qo("Focus","focus","focus");qo("Persist","persist","persist");function qo(e,t,r){Z(t,n=>V(`You can't use [$${t}] without first installing the "${e}" plugin here: https://alpinejs.dev/plugins/${r}`,n))}B("modelable",(e,{expression:t},{effect:r,evaluateLater:n,cleanup:i})=>{let o=n(t),s=()=>{let f;return o(p=>f=p),f},a=n(`${t} = __placeholder`),l=f=>a(()=>{},{scope:{__placeholder:f}}),u=s();l(u),queueMicrotask(()=>{if(!e._x_model)return;e._x_removeModelListeners.default();let f=e._x_model.get,p=e._x_model.set,c=So({get(){return f()},set(d){p(d)}},{get(){return s()},set(d){l(d)}});i(c)})});B("teleport",(e,{modifiers:t,expression:r},{cleanup:n})=>{e.tagName.toLowerCase()!=="template"&&V("x-teleport can only be used on a <template> tag",e);let i=Li(r),o=e.content.cloneNode(!0).firstElementChild;e._x_teleport=o,o._x_teleportBack=e,e.setAttribute("data-teleport-template",!0),o.setAttribute("data-teleport-target",!0),e._x_forwardEvents&&e._x_forwardEvents.forEach(a=>{o.addEventListener(a,l=>{l.stopPropagation(),e.dispatchEvent(new l.constructor(l.type,l))})}),ct(o,{},e);let s=(a,l,u)=>{u.includes("prepend")?l.parentNode.insertBefore(a,l):u.includes("append")?l.parentNode.insertBefore(a,l.nextSibling):l.appendChild(a)};F(()=>{s(o,i,t),he(()=>{ie(o)})()}),e._x_teleportPutBack=()=>{let a=Li(r);F(()=>{s(e._x_teleport,a,t)})},n(()=>F(()=>{o.remove(),qe(o)}))});var mc=document.createElement("div");function Li(e){let t=he(()=>document.querySelector(e),()=>mc)();return t||V(`Cannot find x-teleport element for selector: "${e}"`),t}var Wo=()=>{};Wo.inline=(e,{modifiers:t},{cleanup:r})=>{t.includes("self")?e._x_ignoreSelf=!0:e._x_ignore=!0,r(()=>{t.includes("self")?delete e._x_ignoreSelf:delete e._x_ignore})};B("ignore",Wo);B("effect",he((e,{expression:t},{effect:r})=>{r(H(e,t))}));function Wr(e,t,r,n){let i=e,o=l=>n(l),s={},a=(l,u)=>f=>u(l,f);if(r.includes("dot")&&(t=gc(t)),r.includes("camel")&&(t=vc(t)),r.includes("passive")&&(s.passive=!0),r.includes("capture")&&(s.capture=!0),r.includes("window")&&(i=window),r.includes("document")&&(i=document),r.includes("debounce")){let l=r[r.indexOf("debounce")+1]||"invalid-wait",u=$t(l.split("ms")[0])?Number(l.split("ms")[0]):250;o=xo(o,u)}if(r.includes("throttle")){let l=r[r.indexOf("throttle")+1]||"invalid-wait",u=$t(l.split("ms")[0])?Number(l.split("ms")[0]):250;o=_o(o,u)}return r.includes("prevent")&&(o=a(o,(l,u)=>{u.preventDefault(),l(u)})),r.includes("stop")&&(o=a(o,(l,u)=>{u.stopPropagation(),l(u)})),r.includes("once")&&(o=a(o,(l,u)=>{l(u),i.removeEventListener(t,o,s)})),(r.includes("away")||r.includes("outside"))&&(i=document,o=a(o,(l,u)=>{e.contains(u.target)||u.target.isConnected!==!1&&(e.offsetWidth<1&&e.offsetHeight<1||e._x_isShown!==!1&&l(u))})),r.includes("self")&&(o=a(o,(l,u)=>{u.target===e&&l(u)})),(wc(t)||zo(t))&&(o=a(o,(l,u)=>{yc(u,r)||l(u)})),i.addEventListener(t,o,s),()=>{i.removeEventListener(t,o,s)}}function gc(e){return e.replace(/-/g,".")}function vc(e){return e.toLowerCase().replace(/-(\w)/g,(t,r)=>r.toUpperCase())}function $t(e){return!Array.isArray(e)&&!isNaN(e)}function bc(e){return[" ","_"].includes(e)?e:e.replace(/([a-z])([A-Z])/g,"$1-$2").replace(/[_\s]/,"-").toLowerCase()}function wc(e){return["keydown","keyup"].includes(e)}function zo(e){return["contextmenu","click","mouse"].some(t=>e.includes(t))}function yc(e,t){let r=t.filter(o=>!["window","document","prevent","stop","once","capture","self","away","outside","passive"].includes(o));if(r.includes("debounce")){let o=r.indexOf("debounce");r.splice(o,$t((r[o+1]||"invalid-wait").split("ms")[0])?2:1)}if(r.includes("throttle")){let o=r.indexOf("throttle");r.splice(o,$t((r[o+1]||"invalid-wait").split("ms")[0])?2:1)}if(r.length===0||r.length===1&&Pi(e.key).includes(r[0]))return!1;let i=["ctrl","shift","alt","meta","cmd","super"].filter(o=>r.includes(o));return r=r.filter(o=>!i.includes(o)),!(i.length>0&&i.filter(s=>((s==="cmd"||s==="super")&&(s="meta"),e[`${s}Key`])).length===i.length&&(zo(e.type)||Pi(e.key).includes(r[0])))}function Pi(e){if(!e)return[];e=bc(e);let t={ctrl:"control",slash:"/",space:" ",spacebar:" ",cmd:"meta",esc:"escape",up:"arrow-up",down:"arrow-down",left:"arrow-left",right:"arrow-right",period:".",comma:",",equal:"=",minus:"-",underscore:"_"};return t[e]=e,Object.keys(t).map(r=>{if(t[r]===e)return r}).filter(r=>r)}B("model",(e,{modifiers:t,expression:r},{effect:n,cleanup:i})=>{let o=e;t.includes("parent")&&(o=e.parentNode);let s=H(o,r),a;typeof r=="string"?a=H(o,`${r} = __placeholder`):typeof r=="function"&&typeof r()=="string"?a=H(o,`${r()} = __placeholder`):a=()=>{};let l=()=>{let c;return s(d=>c=d),Ri(c)?c.get():c},u=c=>{let d;s(m=>d=m),Ri(d)?d.set(c):a(()=>{},{scope:{__placeholder:c}})};typeof r=="string"&&e.type==="radio"&&F(()=>{e.hasAttribute("name")||e.setAttribute("name",r)});var f=e.tagName.toLowerCase()==="select"||["checkbox","radio"].includes(e.type)||t.includes("lazy")?"change":"input";let p=de?()=>{}:Wr(e,f,t,c=>{u(Cr(e,t,c,l()))});if(t.includes("fill")&&([void 0,null,""].includes(l())||on(e)&&Array.isArray(l())||e.tagName.toLowerCase()==="select"&&e.multiple)&&u(Cr(e,t,{target:e},l())),e._x_removeModelListeners||(e._x_removeModelListeners={}),e._x_removeModelListeners.default=p,i(()=>e._x_removeModelListeners.default()),e.form){let c=Wr(e.form,"reset",[],d=>{rn(()=>e._x_model&&e._x_model.set(Cr(e,t,{target:e},l())))});i(()=>c())}e._x_model={get(){return l()},set(c){u(c)}},e._x_forceModelUpdate=c=>{c===void 0&&typeof r=="string"&&r.match(/\./)&&(c=""),window.fromModel=!0,F(()=>go(e,"value",c)),delete window.fromModel},n(()=>{let c=l();t.includes("unintrusive")&&document.activeElement.isSameNode(e)||e._x_forceModelUpdate(c)})});function Cr(e,t,r,n){return F(()=>{if(r instanceof CustomEvent&&r.detail!==void 0)return r.detail!==null&&r.detail!==void 0?r.detail:r.target.value;if(on(e))if(Array.isArray(n)){let i=null;return t.includes("number")?i=Or(r.target.value):t.includes("boolean")?i=Nt(r.target.value):i=r.target.value,r.target.checked?n.includes(i)?n:n.concat([i]):n.filter(o=>!xc(o,i))}else return r.target.checked;else{if(e.tagName.toLowerCase()==="select"&&e.multiple)return t.includes("number")?Array.from(r.target.selectedOptions).map(i=>{let o=i.value||i.text;return Or(o)}):t.includes("boolean")?Array.from(r.target.selectedOptions).map(i=>{let o=i.value||i.text;return Nt(o)}):Array.from(r.target.selectedOptions).map(i=>i.value||i.text);{let i;return yo(e)?r.target.checked?i=r.target.value:i=n:i=r.target.value,t.includes("number")?Or(i):t.includes("boolean")?Nt(i):t.includes("trim")?i.trim():i}}})}function Or(e){let t=e?parseFloat(e):null;return _c(t)?t:e}function xc(e,t){return e==t}function _c(e){return!Array.isArray(e)&&!isNaN(e)}function Ri(e){return e!==null&&typeof e=="object"&&typeof e.get=="function"&&typeof e.set=="function"}B("cloak",e=>queueMicrotask(()=>F(()=>e.removeAttribute(He("cloak")))));uo(()=>`[${He("init")}]`);B("init",he((e,{expression:t},{evaluate:r})=>typeof t=="string"?!!t.trim()&&r(t,{},!1):r(t,{},!1)));B("text",(e,{expression:t},{effect:r,evaluateLater:n})=>{let i=n(t);r(()=>{i(o=>{F(()=>{e.textContent=o})})})});B("html",(e,{expression:t},{effect:r,evaluateLater:n})=>{let i=n(t);r(()=>{i(o=>{F(()=>{e.innerHTML=o,e._x_ignoreSelf=!0,ie(e),delete e._x_ignoreSelf})})})});Zr(Zi(":",eo(He("bind:"))));var Ko=(e,{value:t,modifiers:r,expression:n,original:i},{effect:o,cleanup:s})=>{if(!t){let l={};Au(l),H(e,n)(f=>{Ao(e,f,i)},{scope:l});return}if(t==="key")return Sc(e,n);if(e._x_inlineBindings&&e._x_inlineBindings[t]&&e._x_inlineBindings[t].extract)return;let a=H(e,n);o(()=>a(l=>{l===void 0&&typeof n=="string"&&n.match(/\./)&&(l=""),F(()=>go(e,t,l,r))})),s(()=>{e._x_undoAddedClasses&&e._x_undoAddedClasses(),e._x_undoAddedStyles&&e._x_undoAddedStyles()})};Ko.inline=(e,{value:t,modifiers:r,expression:n})=>{!t||(e._x_inlineBindings||(e._x_inlineBindings={}),e._x_inlineBindings[t]={expression:n,extract:!1})};B("bind",Ko);function Sc(e,t){e._x_keyExpression=t}lo(()=>`[${He("data")}]`);B("data",(e,{expression:t},{cleanup:r})=>{if(Ec(e))return;t=t===""?"{}":t;let n={};Nr(n,e);let i={};Ou(i,n);let o=Ee(e,t,{scope:i});(o===void 0||o===!0)&&(o={}),Nr(o,e);let s=Be(o);Wi(s);let a=ct(e,s);s.init&&Ee(e,s.init),r(()=>{s.destroy&&Ee(e,s.destroy),a()})});Ut((e,t)=>{e._x_dataStack&&(t._x_dataStack=e._x_dataStack,t.setAttribute("data-has-alpine-state",!0))});function Ec(e){return de?Ur?!0:e.hasAttribute("data-has-alpine-state"):!1}B("show",(e,{modifiers:t,expression:r},{effect:n})=>{let i=H(e,r);e._x_doHide||(e._x_doHide=()=>{F(()=>{e.style.setProperty("display","none",t.includes("important")?"important":void 0)})}),e._x_doShow||(e._x_doShow=()=>{F(()=>{e.style.length===1&&e.style.display==="none"?e.removeAttribute("style"):e.style.removeProperty("display")})});let o=()=>{e._x_doHide(),e._x_isShown=!1},s=()=>{e._x_doShow(),e._x_isShown=!0},a=()=>setTimeout(s),l=Dr(p=>p?s():o(),p=>{typeof e._x_toggleAndCascadeWithTransitions=="function"?e._x_toggleAndCascadeWithTransitions(e,p,s,o):p?a():o()}),u,f=!0;n(()=>i(p=>{!f&&p===u||(t.includes("immediate")&&(p?a():o()),l(p),u=p,f=!1)}))});B("for",(e,{expression:t},{effect:r,cleanup:n})=>{let i=Cc(t),o=H(e,i.items),s=H(e,e._x_keyExpression||"index");e._x_prevKeys=[],e._x_lookup={},r(()=>Ac(e,i,o,s)),n(()=>{Object.values(e._x_lookup).forEach(a=>F(()=>{qe(a),a.remove()})),delete e._x_prevKeys,delete e._x_lookup})});function Ac(e,t,r,n){let i=s=>typeof s=="object"&&!Array.isArray(s),o=e;r(s=>{Oc(s)&&s>=0&&(s=Array.from(Array(s).keys(),g=>g+1)),s===void 0&&(s=[]);let a=e._x_lookup,l=e._x_prevKeys,u=[],f=[];if(i(s))s=Object.entries(s).map(([g,y])=>{let v=Ni(t,y,g,s);n(_=>{f.includes(_)&&V("Duplicate key on x-for",e),f.push(_)},{scope:{index:g,...v}}),u.push(v)});else for(let g=0;g<s.length;g++){let y=Ni(t,s[g],g,s);n(v=>{f.includes(v)&&V("Duplicate key on x-for",e),f.push(v)},{scope:{index:g,...y}}),u.push(y)}let p=[],c=[],d=[],m=[];for(let g=0;g<l.length;g++){let y=l[g];f.indexOf(y)===-1&&d.push(y)}l=l.filter(g=>!d.includes(g));let b="template";for(let g=0;g<f.length;g++){let y=f[g],v=l.indexOf(y);if(v===-1)l.splice(g,0,y),p.push([b,g]);else if(v!==g){let _=l.splice(g,1)[0],A=l.splice(v-1,1)[0];l.splice(g,0,A),l.splice(v,0,_),c.push([_,A])}else m.push(y);b=y}for(let g=0;g<d.length;g++){let y=d[g];y in a&&(F(()=>{qe(a[y]),a[y].remove()}),delete a[y])}for(let g=0;g<c.length;g++){let[y,v]=c[g],_=a[y],A=a[v],C=document.createElement("div");F(()=>{A||V('x-for ":key" is undefined or invalid',o,v,a),A.after(C),_.after(A),A._x_currentIfEl&&A.after(A._x_currentIfEl),C.before(_),_._x_currentIfEl&&_.after(_._x_currentIfEl),C.remove()}),A._x_refreshXForScope(u[f.indexOf(v)])}for(let g=0;g<p.length;g++){let[y,v]=p[g],_=y==="template"?o:a[y];_._x_currentIfEl&&(_=_._x_currentIfEl);let A=u[v],C=f[v],w=document.importNode(o.content,!0).firstElementChild,h=Be(A);ct(w,h,o),w._x_refreshXForScope=x=>{Object.entries(x).forEach(([T,L])=>{h[T]=L})},F(()=>{_.after(w),he(()=>ie(w))()}),typeof C=="object"&&V("x-for key cannot be an object, it must be a string or an integer",o),a[C]=w}for(let g=0;g<m.length;g++)a[m[g]]._x_refreshXForScope(u[f.indexOf(m[g])]);o._x_prevKeys=f})}function Cc(e){let t=/,([^,\}\]]*)(?:,([^,\}\]]*))?$/,r=/^\s*\(|\)\s*$/g,n=/([\s\S]*?)\s+(?:in|of)\s+([\s\S]*)/,i=e.match(n);if(!i)return;let o={};o.items=i[2].trim();let s=i[1].replace(r,"").trim(),a=s.match(t);return a?(o.item=s.replace(t,"").trim(),o.index=a[1].trim(),a[2]&&(o.collection=a[2].trim())):o.item=s,o}function Ni(e,t,r,n){let i={};return/^\[.*\]$/.test(e.item)&&Array.isArray(t)?e.item.replace("[","").replace("]","").split(",").map(s=>s.trim()).forEach((s,a)=>{i[s]=t[a]}):/^\{.*\}$/.test(e.item)&&!Array.isArray(t)&&typeof t=="object"?e.item.replace("{","").replace("}","").split(",").map(s=>s.trim()).forEach(s=>{i[s]=t[s]}):i[e.item]=t,e.index&&(i[e.index]=r),e.collection&&(i[e.collection]=n),i}function Oc(e){return!Array.isArray(e)&&!isNaN(e)}function Vo(){}Vo.inline=(e,{expression:t},{cleanup:r})=>{let n=Dt(e);n._x_refs||(n._x_refs={}),n._x_refs[t]=e,r(()=>delete n._x_refs[t])};B("ref",Vo);B("if",(e,{expression:t},{effect:r,cleanup:n})=>{e.tagName.toLowerCase()!=="template"&&V("x-if can only be used on a <template> tag",e);let i=H(e,t),o=()=>{if(e._x_currentIfEl)return e._x_currentIfEl;let a=e.content.cloneNode(!0).firstElementChild;return ct(a,{},e),F(()=>{e.after(a),he(()=>ie(a))()}),e._x_currentIfEl=a,e._x_undoIf=()=>{F(()=>{qe(a),a.remove()}),delete e._x_currentIfEl},a},s=()=>{!e._x_undoIf||(e._x_undoIf(),delete e._x_undoIf)};r(()=>i(a=>{a?o():s()})),n(()=>e._x_undoIf&&e._x_undoIf())});B("id",(e,{expression:t},{evaluate:r})=>{r(t).forEach(i=>pc(e,i))});Ut((e,t)=>{e._x_ids&&(t._x_ids=e._x_ids)});Zr(Zi("@",eo(He("on:"))));B("on",he((e,{value:t,modifiers:r,expression:n},{cleanup:i})=>{let o=n?H(e,n):()=>{};e.tagName.toLowerCase()==="template"&&(e._x_forwardEvents||(e._x_forwardEvents=[]),e._x_forwardEvents.includes(t)||e._x_forwardEvents.push(t));let s=Wr(e,t,r,a=>{o(()=>{},{scope:{$event:a},params:[a]})});i(()=>s())}));zt("Collapse","collapse","collapse");zt("Intersect","intersect","intersect");zt("Focus","trap","focus");zt("Mask","mask","mask");function zt(e,t,r){B(t,n=>V(`You can't use [x-${t}] without first installing the "${e}" plugin here: https://alpinejs.dev/plugins/${r}`,n))}dt.setEvaluator(Gi);dt.setReactivityEngine({reactive:dn,effect:$u,release:Du,raw:M});var Tc=dt,S=Tc;function pn(e,t){return t||(t=()=>{}),(r,n=!1)=>{let i=n,o=r,s=e.$wire,a=s.get(o);return S.interceptor((u,f,p,c,d)=>{if(typeof a>"u"){console.error(`Livewire Entangle Error: Livewire property ['${o}'] cannot be found on component: ['${e.name}']`);return}let m=S.entangle({get(){return s.get(r)},set(b){s.set(r,b,i)}},{get(){return f()},set(b){p(b)}});return t(()=>m()),kc(s.get(r))},u=>{Object.defineProperty(u,"live",{get(){return i=!0,u}})})(a)}}function kc(e){return typeof e=="object"?JSON.parse(JSON.stringify(e)):e}var ke=[];function k(e,t){return ke[e]||(ke[e]=[]),ke[e].push(t),()=>{ke[e]=ke[e].filter(r=>r!==t)}}function P(e,...t){let r=ke[e]||[],n=[];for(let i=0;i<r.length;i++){let o=r[i](...t);yr(o)&&n.push(o)}return i=>Jo(n,i)}async function Kt(e,...t){let r=ke[e]||[],n=[];for(let i=0;i<r.length;i++){let o=await r[i](...t);yr(o)&&n.push(o)}return i=>Jo(n,i)}function Jo(e,t){let r=t;for(let n=0;n<e.length;n++){let i=e[n](r);i!==void 0&&(r=i)}return r}function hn(e){let t=document.createElement("html");t.innerHTML=e,t.querySelectorAll("a").forEach(i=>i.setAttribute("target","_top"));let r=document.getElementById("livewire-error");typeof r<"u"&&r!=null?r.innerHTML="":(r=document.createElement("div"),r.id="livewire-error",r.style.position="fixed",r.style.width="100vw",r.style.height="100vh",r.style.padding="50px",r.style.backgroundColor="rgba(0, 0, 0, .6)",r.style.zIndex=2e5);let n=document.createElement("iframe");n.style.backgroundColor="#17161A",n.style.borderRadius="5px",n.style.width="100%",n.style.height="100%",r.appendChild(n),document.body.prepend(r),document.body.style.overflow="hidden",n.contentWindow.document.open(),n.contentWindow.document.write(t.outerHTML),n.contentWindow.document.close(),r.addEventListener("click",()=>Go(r)),r.setAttribute("tabindex",0),r.addEventListener("keydown",i=>{i.key==="Escape"&&Go(r)}),r.focus()}function Go(e){e.outerHTML="",document.body.style.overflow="visible"}var Vt=class{constructor(){this.commits=new Set}add(t){this.commits.add(t)}delete(t){this.commits.delete(t)}hasCommitFor(t){return!!this.findCommitByComponent(t)}findCommitByComponent(t){for(let[r,n]of this.commits.entries())if(n.component===t)return n}shouldHoldCommit(t){return!t.isolate}empty(){return this.commits.size===0}async send(){this.prepare(),await Xo(this)}prepare(){this.commits.forEach(t=>t.prepare())}payload(){let t=[],r=[],n=[];return this.commits.forEach(s=>{let[a,l,u]=s.toRequestPayload();t.push(a),r.push(l),n.push(u)}),[t,s=>r.forEach(a=>a(s.shift())),()=>n.forEach(s=>s())]}};var Jt=class{constructor(t){this.component=t,this.isolate=!1,this.calls=[],this.receivers=[],this.resolvers=[]}addResolver(t){this.resolvers.push(t)}addCall(t,r,n){this.calls.push({path:"",method:t,params:r,handleReturn(i){n(i)}})}prepare(){P("commit.prepare",{component:this.component})}toRequestPayload(){let t=et(this.component.canonical,this.component.ephemeral),r=this.component.mergeQueuedUpdates(t),n={snapshot:this.component.snapshotEncoded,updates:r,calls:this.calls.map(d=>({path:d.path,method:d.method,params:d.params}))},i=[],o=[],s=[],a=d=>i.forEach(m=>m(d)),l=()=>o.forEach(d=>d()),u=()=>s.forEach(d=>d()),f=P("commit",{component:this.component,commit:n,succeed:d=>{i.push(d)},fail:d=>{o.push(d)},respond:d=>{s.push(d)}});return[n,d=>{let{snapshot:m,effects:b}=d;if(u(),this.component.mergeNewSnapshot(m,b,r),this.component.processEffects(this.component.effects),b.returns){let y=b.returns;this.calls.map(({handleReturn:_})=>_).forEach((_,A)=>{_(y[A])})}let g=JSON.parse(m);f({snapshot:g,effects:b}),this.resolvers.forEach(y=>y()),a(d)},()=>{u(),l()}]}};var Gt=class{constructor(){this.commits=new Set,this.pools=new Set}add(t){let r=this.findCommitOr(t,()=>{let n=new Jt(t);return this.commits.add(n),n});return Lc(r,()=>{this.findPoolWithComponent(r.component)||this.createAndSendNewPool()}),r}findCommitOr(t,r){for(let[n,i]of this.commits.entries())if(i.component===t)return i;return r()}findPoolWithComponent(t){for(let[r,n]of this.pools.entries())if(n.hasCommitFor(t))return n}createAndSendNewPool(){P("commit.pooling",{commits:this.commits});let t=this.corraleCommitsIntoPools();this.commits.clear(),P("commit.pooled",{pools:t}),t.forEach(r=>{r.empty()||(this.pools.add(r),r.send().then(()=>{this.pools.delete(r),this.sendAnyQueuedCommits()}))})}corraleCommitsIntoPools(){let t=new Set;for(let[r,n]of this.commits.entries()){let i=!1;if(t.forEach(o=>{o.shouldHoldCommit(n)&&(o.add(n),i=!0)}),!i){let o=new Vt;o.add(n),t.add(o)}}return t}sendAnyQueuedCommits(){this.commits.size>0&&this.createAndSendNewPool()}},mn=new WeakMap;function Lc(e,t){mn.has(e)||mn.set(e,setTimeout(()=>{t(),mn.delete(e)},5))}var Yo=new Gt;async function gn(e){let t=Yo.add(e),r=new Promise(n=>{t.addResolver(n)});return r.commit=t,r}async function Qo(e,t,r){let n=Yo.add(e),i=new Promise(o=>{n.addCall(t,r,s=>o(s))});return i.commit=n,i}async function Xo(e){let[t,r,n]=e.payload(),i={method:"POST",body:JSON.stringify({_token:At(),components:t}),headers:{"Content-type":"application/json","X-Livewire":""}},o=[],s=[],a=[],l=v=>o.forEach(_=>_(v)),u=v=>s.forEach(_=>_(v)),f=v=>a.forEach(_=>_(v)),p=P("request.profile",i),c=pi();P("request",{url:c,options:i,payload:i.body,respond:v=>a.push(v),succeed:v=>o.push(v),fail:v=>s.push(v)});let d;try{d=await fetch(c,i)}catch{p({content:"{}",failed:!0}),n(),u({status:503,content:null,preventDefault:()=>{}});return}let m={status:d.status,response:d};f(m),d=m.response;let b=await d.text();if(!d.ok){p({content:"{}",failed:!0});let v=!1;return n(),u({status:d.status,content:b,preventDefault:()=>v=!0}),v?void 0:(d.status===419&&Pc(),Rc(b))}if(d.redirected&&(window.location.href=d.url),Ct(b)){let v;[v,b]=hi(b),hn(v),p({content:"{}",failed:!0})}else p({content:b,failed:!1});let{components:g,assets:y}=JSON.parse(b);await Kt("payload.intercept",{components:g,assets:y}),await r(g),l({status:d.status,json:JSON.parse(b)})}function Pc(){confirm(`This page has expired.
+Would you like to refresh the page?`)&&window.location.reload()}function Rc(e){hn(e)}var bn={},ts;function D(e,t,r=null){bn[e]=t}function Nc(e){ts=e}var Zo={on:"$on",el:"$el",id:"$id",get:"$get",set:"$set",call:"$call",hook:"$hook",commit:"$commit",watch:"$watch",entangle:"$entangle",dispatch:"$dispatch",dispatchTo:"$dispatchTo",dispatchSelf:"$dispatchSelf",upload:"$upload",uploadMultiple:"$uploadMultiple",removeUpload:"$removeUpload",cancelUpload:"$cancelUpload"};function rs(e,t){return new Proxy({},{get(r,n){if(n==="__instance")return e;if(n in Zo)return es(e,Zo[n]);if(n in bn)return es(e,n);if(n in t)return t[n];if(!["then"].includes(n))return Mc(e)(n)},set(r,n,i){return n in t&&(t[n]=i),!0}})}function es(e,t){return bn[t](e)}function Mc(e){return ts(e)}S.magic("wire",(e,{cleanup:t})=>{let r;return new Proxy({},{get(n,i){return r||(r=z(e)),["$entangle","entangle"].includes(i)?pn(r,t):r.$wire[i]},set(n,i,o){return r||(r=z(e)),r.$wire[i]=o,!0}})});D("__instance",e=>e);D("$get",e=>(t,r=!0)=>W(r?e.reactive:e.ephemeral,t));D("$el",e=>e.el);D("$id",e=>e.id);D("$set",e=>async(t,r,n=!0)=>(we(e.reactive,t,r),n?(e.queueUpdate(t,r),await gn(e)):Promise.resolve()));D("$call",e=>async(t,...r)=>await e.$wire[t](...r));D("$entangle",e=>(t,r=!1)=>pn(e)(t,r));D("$toggle",e=>(t,r=!0)=>e.$wire.set(t,!e.$wire.get(t),r));D("$watch",e=>(t,r)=>{let n=()=>W(e.reactive,t),i=S.watch(n,r);e.addCleanup(i)});D("$refresh",e=>e.$wire.$commit);D("$commit",e=>async()=>await gn(e));D("$on",e=>(...t)=>is(e,...t));D("$hook",e=>(t,r)=>{let n=k(t,({component:i,...o})=>{if(i===void 0)return r(o);if(i.id===e.id)return r({component:i,...o})});return e.addCleanup(n),n});D("$dispatch",e=>(...t)=>Xt(e,...t));D("$dispatchSelf",e=>(...t)=>oe(e,...t));D("$dispatchTo",()=>(...e)=>ze(...e));D("$upload",e=>(...t)=>gi(e,...t));D("$uploadMultiple",e=>(...t)=>vi(e,...t));D("$removeUpload",e=>(...t)=>bi(e,...t));D("$cancelUpload",e=>(...t)=>wi(e,...t));var vn=new WeakMap;D("$parent",e=>{if(vn.has(e))return vn.get(e).$wire;let t=e.parent;return vn.set(e,t),t.$wire});var We=new WeakMap;function ns(e,t,r){We.has(e)||We.set(e,{});let n=We.get(e);n[t]=r,We.set(e,n)}Nc(e=>t=>async(...r)=>{if(r.length===1&&r[0]instanceof Event&&(r=[]),We.has(e)){let n=We.get(e);if(typeof n[t]=="function")return n[t](r)}return await Qo(e,t,r)});var Yt=class{constructor(t){if(t.__livewire)throw"Component already initialized";if(t.__livewire=this,this.el=t,this.id=t.getAttribute("wire:id"),this.__livewireId=this.id,this.snapshotEncoded=t.getAttribute("wire:snapshot"),this.snapshot=JSON.parse(this.snapshotEncoded),!this.snapshot)throw"Snapshot missing on Livewire component with id: "+this.id;this.name=this.snapshot.memo.name,this.effects=JSON.parse(t.getAttribute("wire:effects")),this.originalEffects=ce(this.effects),this.canonical=ye(ce(this.snapshot.data)),this.ephemeral=ye(ce(this.snapshot.data)),this.reactive=Alpine.reactive(this.ephemeral),this.queuedUpdates={},this.$wire=rs(this,this.reactive),this.cleanups=[],this.processEffects(this.effects)}mergeNewSnapshot(t,r,n={}){let i=JSON.parse(t),o=ce(this.canonical),s=this.applyUpdates(o,n),a=ye(ce(i.data)),l=et(s,a);this.snapshotEncoded=t,this.snapshot=i,this.effects=r,this.canonical=ye(ce(i.data));let u=ye(ce(i.data));return Object.entries(l).forEach(([f,p])=>{let c=f.split(".")[0];this.reactive[c]=u[c]}),l}queueUpdate(t,r){this.queuedUpdates[t]=r}mergeQueuedUpdates(t){return Object.entries(this.queuedUpdates).forEach(([r,n])=>{Object.entries(t).forEach(([i,o])=>{i.startsWith(n)&&delete t[i]}),t[r]=n}),this.queuedUpdates=[],t}applyUpdates(t,r){for(let n in r)we(t,n,r[n]);return t}replayUpdate(t,r){let n={...this.effects,html:r};this.mergeNewSnapshot(JSON.stringify(t),n),this.processEffects({html:r})}processEffects(t){P("effects",this,t),P("effect",{component:this,effects:t,cleanup:r=>this.addCleanup(r)})}get children(){let t=this.snapshot.memo;return Object.values(t.children).map(n=>n[1]).map(n=>os(n))}get parent(){return z(this.el.parentElement)}inscribeSnapshotAndEffectsOnElement(){let t=this.el;t.setAttribute("wire:snapshot",this.snapshotEncoded);let r=this.originalEffects.listeners?{listeners:this.originalEffects.listeners}:{};this.originalEffects.url&&(r.url=this.originalEffects.url),this.originalEffects.scripts&&(r.scripts=this.originalEffects.scripts),t.setAttribute("wire:effects",JSON.stringify(r))}addCleanup(t){this.cleanups.push(t)}cleanup(){for(delete this.el.__livewire;this.cleanups.length>0;)this.cleanups.pop()()}};var se={};function ss(e){let t=new Yt(e);if(se[t.id])throw"Component already registered";return P("component.init",{component:t,cleanup:n=>t.addCleanup(n)}),se[t.id]=t,t}function as(e){let t=se[e];!t||(t.cleanup(),delete se[e])}function os(e){let t=se[e];if(!t)throw"Component not found: "+e;return t}function z(e,t=!0){let r=Alpine.findClosest(e,n=>n.__livewire);if(!r){if(t)throw"Could not find Livewire component in DOM tree";return}return r.__livewire}function wn(e){return Object.values(se).filter(t=>e==t.name)}function ls(e){return wn(e).map(t=>t.$wire)}function us(e){let t=se[e];return t&&t.$wire}function cs(){return Object.values(se)[0].$wire}function fs(){return Object.values(se)}function Xt(e,t,r){Qt(e.el,t,r)}function ds(e,t){Qt(window,e,t)}function oe(e,t,r){Qt(e.el,t,r,!1)}function ze(e,t,r){wn(e).forEach(i=>{Qt(i.el,t,r,!1)})}function is(e,t,r){e.el.addEventListener(t,n=>{r(n.detail)})}function ps(e,t){let r=n=>{!n.__livewire||t(n.detail)};return window.addEventListener(e,r),()=>{window.removeEventListener(e,r)}}function Qt(e,t,r,n=!0){let i=new CustomEvent(t,{bubbles:n,detail:r});i.__livewire={name:t,params:r,receivedBy:[]},e.dispatchEvent(i)}var pt=new Set;function Ke(e){return e.match(new RegExp("wire:"))}function Zt(e,t){let[r,...n]=t.replace(new RegExp("wire:"),"").split(".");return new xn(r,n,t,e)}function I(e,t){pt.has(e)||(pt.add(e),k("directive.init",({el:r,component:n,directive:i,cleanup:o})=>{i.value===e&&t({el:r,directive:i,component:n,$wire:n.$wire,cleanup:o})}))}function hs(e,t){pt.has(e)||(pt.add(e),k("directive.global.init",({el:r,directive:n,cleanup:i})=>{n.value===e&&t({el:r,directive:n,cleanup:i})}))}function Ve(e){return new yn(e)}function ms(e){return pt.has(e)}var yn=class{constructor(t){this.el=t,this.directives=this.extractTypeModifiersAndValue()}all(){return this.directives}has(t){return this.directives.map(r=>r.value).includes(t)}missing(t){return!this.has(t)}get(t){return this.directives.find(r=>r.value===t)}extractTypeModifiersAndValue(){return Array.from(this.el.getAttributeNames().filter(t=>Ke(t)).map(t=>Zt(this.el,t)))}},xn=class{constructor(t,r,n,i){this.rawName=this.raw=n,this.el=i,this.eventContext,this.value=t,this.modifiers=r,this.expression=this.el.getAttribute(this.rawName)}get method(){let{method:t}=this.parseOutMethodAndParams(this.expression);return t}get params(){let{params:t}=this.parseOutMethodAndParams(this.expression);return t}parseOutMethodAndParams(t){let r=t,n=[],i=r.match(/(.*?)\((.*)\)/s);return i&&(r=i[1],n=new Function("$event",`return (function () {
                 for (var l=arguments.length, p=new Array(l), k=0; k<l; k++) {
                     p[k] = arguments[k];
                 }
                 return [].concat(p);
-            })(${i[2]})`)(this.eventContext)),{method:r,params:n}}};function xc(e){e.directive("collapse",t),t.inline=(r,{modifiers:n})=>{!n.includes("min")||(r._x_doShow=()=>{},r._x_doHide=()=>{})};function t(r,{modifiers:n}){let i=us(n,"duration",250)/1e3,o=us(n,"min",0),s=!n.includes("min");r._x_isShown||(r.style.height=`${o}px`),!r._x_isShown&&s&&(r.hidden=!0),r._x_isShown||(r.style.overflow="hidden");let a=(u,f)=>{let p=e.setStyles(u,f);return f.height?()=>{}:p},l={transitionProperty:"height",transitionDuration:`${i}s`,transitionTimingFunction:"cubic-bezier(0.4, 0.0, 0.2, 1)"};r._x_transition={in(u=()=>{},f=()=>{}){s&&(r.hidden=!1),s&&(r.style.display=null);let p=r.getBoundingClientRect().height;r.style.height="auto";let c=r.getBoundingClientRect().height;p===c&&(p=o),e.transition(r,e.setStyles,{during:l,start:{height:p+"px"},end:{height:c+"px"}},()=>r._x_isShown=!0,()=>{Math.abs(r.getBoundingClientRect().height-c)<1&&(r.style.overflow=null)})},out(u=()=>{},f=()=>{}){let p=r.getBoundingClientRect().height;e.transition(r,a,{during:l,start:{height:p+"px"},end:{height:o+"px"}},()=>r.style.overflow="hidden",()=>{r._x_isShown=!1,r.style.height==`${o}px`&&s&&(r.style.display="none",r.hidden=!0)})}}}}function us(e,t,r){if(e.indexOf(t)===-1)return r;let n=e[e.indexOf(t)+1];if(!n)return r;if(t==="duration"){let i=n.match(/([0-9]+)ms/);if(i)return i[1]}if(t==="min"){let i=n.match(/([0-9]+)px/);if(i)return i[1]}return n}var cs=xc;var bs=["input","select","textarea","a[href]","button","[tabindex]:not(slot)","audio[controls]","video[controls]",'[contenteditable]:not([contenteditable="false"])',"details>summary:first-of-type","details"],tr=bs.join(","),ws=typeof Element>"u",Le=ws?function(){}:Element.prototype.matches||Element.prototype.msMatchesSelector||Element.prototype.webkitMatchesSelector,yn=!ws&&Element.prototype.getRootNode?function(e){return e.getRootNode()}:function(e){return e.ownerDocument},ys=function(t,r,n){var i=Array.prototype.slice.apply(t.querySelectorAll(tr));return r&&Le.call(t,tr)&&i.unshift(t),i=i.filter(n),i},xs=function e(t,r,n){for(var i=[],o=Array.from(t);o.length;){var s=o.shift();if(s.tagName==="SLOT"){var a=s.assignedElements(),l=a.length?a:s.children,u=e(l,!0,n);n.flatten?i.push.apply(i,u):i.push({scope:s,candidates:u})}else{var f=Le.call(s,tr);f&&n.filter(s)&&(r||!t.includes(s))&&i.push(s);var p=s.shadowRoot||typeof n.getShadowRoot=="function"&&n.getShadowRoot(s),c=!n.shadowRootFilter||n.shadowRootFilter(s);if(p&&c){var d=e(p===!0?s.children:p.children,!0,n);n.flatten?i.push.apply(i,d):i.push({scope:s,candidates:d})}else o.unshift.apply(o,s.children)}}return i},_s=function(t,r){return t.tabIndex<0&&(r||/^(AUDIO|VIDEO|DETAILS)$/.test(t.tagName)||t.isContentEditable)&&isNaN(parseInt(t.getAttribute("tabindex"),10))?0:t.tabIndex},_c=function(t,r){return t.tabIndex===r.tabIndex?t.documentOrder-r.documentOrder:t.tabIndex-r.tabIndex},Ss=function(t){return t.tagName==="INPUT"},Sc=function(t){return Ss(t)&&t.type==="hidden"},Ec=function(t){var r=t.tagName==="DETAILS"&&Array.prototype.slice.apply(t.children).some(function(n){return n.tagName==="SUMMARY"});return r},Ac=function(t,r){for(var n=0;n<t.length;n++)if(t[n].checked&&t[n].form===r)return t[n]},Cc=function(t){if(!t.name)return!0;var r=t.form||yn(t),n=function(a){return r.querySelectorAll('input[type="radio"][name="'+a+'"]')},i;if(typeof window<"u"&&typeof window.CSS<"u"&&typeof window.CSS.escape=="function")i=n(window.CSS.escape(t.name));else try{i=n(t.name)}catch(s){return console.error("Looks like you have a radio button with a name attribute containing invalid CSS selector characters and need the CSS.escape polyfill: %s",s.message),!1}var o=Ac(i,t.form);return!o||o===t},Oc=function(t){return Ss(t)&&t.type==="radio"},Tc=function(t){return Oc(t)&&!Cc(t)},fs=function(t){var r=t.getBoundingClientRect(),n=r.width,i=r.height;return n===0&&i===0},kc=function(t,r){var n=r.displayCheck,i=r.getShadowRoot;if(getComputedStyle(t).visibility==="hidden")return!0;var o=Le.call(t,"details>summary:first-of-type"),s=o?t.parentElement:t;if(Le.call(s,"details:not([open]) *"))return!0;var a=yn(t).host,l=a?.ownerDocument.contains(a)||t.ownerDocument.contains(t);if(!n||n==="full"){if(typeof i=="function"){for(var u=t;t;){var f=t.parentElement,p=yn(t);if(f&&!f.shadowRoot&&i(f)===!0)return fs(t);t.assignedSlot?t=t.assignedSlot:!f&&p!==t.ownerDocument?t=p.host:t=f}t=u}if(l)return!t.getClientRects().length}else if(n==="non-zero-area")return fs(t);return!1},Lc=function(t){if(/^(INPUT|BUTTON|SELECT|TEXTAREA)$/.test(t.tagName))for(var r=t.parentElement;r;){if(r.tagName==="FIELDSET"&&r.disabled){for(var n=0;n<r.children.length;n++){var i=r.children.item(n);if(i.tagName==="LEGEND")return Le.call(r,"fieldset[disabled] *")?!0:!i.contains(t)}return!0}r=r.parentElement}return!1},rr=function(t,r){return!(r.disabled||Sc(r)||kc(r,t)||Ec(r)||Lc(r))},xn=function(t,r){return!(Tc(r)||_s(r)<0||!rr(t,r))},Nc=function(t){var r=parseInt(t.getAttribute("tabindex"),10);return!!(isNaN(r)||r>=0)},Rc=function e(t){var r=[],n=[];return t.forEach(function(i,o){var s=!!i.scope,a=s?i.scope:i,l=_s(a,s),u=s?e(i.candidates):a;l===0?s?r.push.apply(r,u):r.push(a):n.push({documentOrder:o,tabIndex:l,item:i,isScope:s,content:u})}),n.sort(_c).reduce(function(i,o){return o.isScope?i.push.apply(i,o.content):i.push(o.content),i},[]).concat(r)},Pc=function(t,r){r=r||{};var n;return r.getShadowRoot?n=xs([t],r.includeContainer,{filter:xn.bind(null,r),flatten:!1,getShadowRoot:r.getShadowRoot,shadowRootFilter:Nc}):n=ys(t,r.includeContainer,xn.bind(null,r)),Rc(n)},Es=function(t,r){r=r||{};var n;return r.getShadowRoot?n=xs([t],r.includeContainer,{filter:rr.bind(null,r),flatten:!0,getShadowRoot:r.getShadowRoot}):n=ys(t,r.includeContainer,rr.bind(null,r)),n},Qt=function(t,r){if(r=r||{},!t)throw new Error("No node provided");return Le.call(t,tr)===!1?!1:xn(r,t)},Mc=bs.concat("iframe").join(","),er=function(t,r){if(r=r||{},!t)throw new Error("No node provided");return Le.call(t,Mc)===!1?!1:rr(r,t)};function ds(e,t){var r=Object.keys(e);if(Object.getOwnPropertySymbols){var n=Object.getOwnPropertySymbols(e);t&&(n=n.filter(function(i){return Object.getOwnPropertyDescriptor(e,i).enumerable})),r.push.apply(r,n)}return r}function ps(e){for(var t=1;t<arguments.length;t++){var r=arguments[t]!=null?arguments[t]:{};t%2?ds(Object(r),!0).forEach(function(n){Ic(e,n,r[n])}):Object.getOwnPropertyDescriptors?Object.defineProperties(e,Object.getOwnPropertyDescriptors(r)):ds(Object(r)).forEach(function(n){Object.defineProperty(e,n,Object.getOwnPropertyDescriptor(r,n))})}return e}function Ic(e,t,r){return t in e?Object.defineProperty(e,t,{value:r,enumerable:!0,configurable:!0,writable:!0}):e[t]=r,e}var hs=function(){var e=[];return{activateTrap:function(r){if(e.length>0){var n=e[e.length-1];n!==r&&n.pause()}var i=e.indexOf(r);i===-1||e.splice(i,1),e.push(r)},deactivateTrap:function(r){var n=e.indexOf(r);n!==-1&&e.splice(n,1),e.length>0&&e[e.length-1].unpause()}}}(),Fc=function(t){return t.tagName&&t.tagName.toLowerCase()==="input"&&typeof t.select=="function"},$c=function(t){return t.key==="Escape"||t.key==="Esc"||t.keyCode===27},Dc=function(t){return t.key==="Tab"||t.keyCode===9},ms=function(t){return setTimeout(t,0)},gs=function(t,r){var n=-1;return t.every(function(i,o){return r(i)?(n=o,!1):!0}),n},dt=function(t){for(var r=arguments.length,n=new Array(r>1?r-1:0),i=1;i<r;i++)n[i-1]=arguments[i];return typeof t=="function"?t.apply(void 0,n):t},Zt=function(t){return t.target.shadowRoot&&typeof t.composedPath=="function"?t.composedPath()[0]:t.target},Bc=function(t,r){var n=r?.document||document,i=ps({returnFocusOnDeactivate:!0,escapeDeactivates:!0,delayInitialFocus:!0},r),o={containers:[],containerGroups:[],tabbableGroups:[],nodeFocusedBeforeActivation:null,mostRecentlyFocusedNode:null,active:!1,paused:!1,delayInitialFocusTimer:void 0},s,a=function(w,h,x){return w&&w[h]!==void 0?w[h]:i[x||h]},l=function(w){return o.containerGroups.findIndex(function(h){var x=h.container,O=h.tabbableNodes;return x.contains(w)||O.find(function(L){return L===w})})},u=function(w){var h=i[w];if(typeof h=="function"){for(var x=arguments.length,O=new Array(x>1?x-1:0),L=1;L<x;L++)O[L-1]=arguments[L];h=h.apply(void 0,O)}if(h===!0&&(h=void 0),!h){if(h===void 0||h===!1)return h;throw new Error("`".concat(w,"` was specified but was not a node, or did not return a node"))}var C=h;if(typeof h=="string"&&(C=n.querySelector(h),!C))throw new Error("`".concat(w,"` as selector refers to no known node"));return C},f=function(){var w=u("initialFocus");if(w===!1)return!1;if(w===void 0)if(l(n.activeElement)>=0)w=n.activeElement;else{var h=o.tabbableGroups[0],x=h&&h.firstTabbableNode;w=x||u("fallbackFocus")}if(!w)throw new Error("Your focus-trap needs to have at least one focusable element");return w},p=function(){if(o.containerGroups=o.containers.map(function(w){var h=Pc(w,i.tabbableOptions),x=Es(w,i.tabbableOptions);return{container:w,tabbableNodes:h,focusableNodes:x,firstTabbableNode:h.length>0?h[0]:null,lastTabbableNode:h.length>0?h[h.length-1]:null,nextTabbableNode:function(L){var C=arguments.length>1&&arguments[1]!==void 0?arguments[1]:!0,E=x.findIndex(function(U){return U===L});if(!(E<0))return C?x.slice(E+1).find(function(U){return Qt(U,i.tabbableOptions)}):x.slice(0,E).reverse().find(function(U){return Qt(U,i.tabbableOptions)})}}}),o.tabbableGroups=o.containerGroups.filter(function(w){return w.tabbableNodes.length>0}),o.tabbableGroups.length<=0&&!u("fallbackFocus"))throw new Error("Your focus-trap must have at least one container with at least one tabbable node in it at all times")},c=function A(w){if(w!==!1&&w!==n.activeElement){if(!w||!w.focus){A(f());return}w.focus({preventScroll:!!i.preventScroll}),o.mostRecentlyFocusedNode=w,Fc(w)&&w.select()}},d=function(w){var h=u("setReturnFocus",w);return h||(h===!1?!1:w)},m=function(w){var h=Zt(w);if(!(l(h)>=0)){if(dt(i.clickOutsideDeactivates,w)){s.deactivate({returnFocus:i.returnFocusOnDeactivate&&!er(h,i.tabbableOptions)});return}dt(i.allowOutsideClick,w)||w.preventDefault()}},b=function(w){var h=Zt(w),x=l(h)>=0;x||h instanceof Document?x&&(o.mostRecentlyFocusedNode=h):(w.stopImmediatePropagation(),c(o.mostRecentlyFocusedNode||f()))},g=function(w){var h=Zt(w);p();var x=null;if(o.tabbableGroups.length>0){var O=l(h),L=O>=0?o.containerGroups[O]:void 0;if(O<0)w.shiftKey?x=o.tabbableGroups[o.tabbableGroups.length-1].lastTabbableNode:x=o.tabbableGroups[0].firstTabbableNode;else if(w.shiftKey){var C=gs(o.tabbableGroups,function(j){var we=j.firstTabbableNode;return h===we});if(C<0&&(L.container===h||er(h,i.tabbableOptions)&&!Qt(h,i.tabbableOptions)&&!L.nextTabbableNode(h,!1))&&(C=O),C>=0){var E=C===0?o.tabbableGroups.length-1:C-1,U=o.tabbableGroups[E];x=U.lastTabbableNode}}else{var P=gs(o.tabbableGroups,function(j){var we=j.lastTabbableNode;return h===we});if(P<0&&(L.container===h||er(h,i.tabbableOptions)&&!Qt(h,i.tabbableOptions)&&!L.nextTabbableNode(h))&&(P=O),P>=0){var D=P===o.tabbableGroups.length-1?0:P+1,q=o.tabbableGroups[D];x=q.firstTabbableNode}}}else x=u("fallbackFocus");x&&(w.preventDefault(),c(x))},y=function(w){if($c(w)&&dt(i.escapeDeactivates,w)!==!1){w.preventDefault(),s.deactivate();return}if(Dc(w)){g(w);return}},v=function(w){var h=Zt(w);l(h)>=0||dt(i.clickOutsideDeactivates,w)||dt(i.allowOutsideClick,w)||(w.preventDefault(),w.stopImmediatePropagation())},_=function(){if(!!o.active)return hs.activateTrap(s),o.delayInitialFocusTimer=i.delayInitialFocus?ms(function(){c(f())}):c(f()),n.addEventListener("focusin",b,!0),n.addEventListener("mousedown",m,{capture:!0,passive:!1}),n.addEventListener("touchstart",m,{capture:!0,passive:!1}),n.addEventListener("click",v,{capture:!0,passive:!1}),n.addEventListener("keydown",y,{capture:!0,passive:!1}),s},T=function(){if(!!o.active)return n.removeEventListener("focusin",b,!0),n.removeEventListener("mousedown",m,!0),n.removeEventListener("touchstart",m,!0),n.removeEventListener("click",v,!0),n.removeEventListener("keydown",y,!0),s};return s={get active(){return o.active},get paused(){return o.paused},activate:function(w){if(o.active)return this;var h=a(w,"onActivate"),x=a(w,"onPostActivate"),O=a(w,"checkCanFocusTrap");O||p(),o.active=!0,o.paused=!1,o.nodeFocusedBeforeActivation=n.activeElement,h&&h();var L=function(){O&&p(),_(),x&&x()};return O?(O(o.containers.concat()).then(L,L),this):(L(),this)},deactivate:function(w){if(!o.active)return this;var h=ps({onDeactivate:i.onDeactivate,onPostDeactivate:i.onPostDeactivate,checkCanReturnFocus:i.checkCanReturnFocus},w);clearTimeout(o.delayInitialFocusTimer),o.delayInitialFocusTimer=void 0,T(),o.active=!1,o.paused=!1,hs.deactivateTrap(s);var x=a(h,"onDeactivate"),O=a(h,"onPostDeactivate"),L=a(h,"checkCanReturnFocus"),C=a(h,"returnFocus","returnFocusOnDeactivate");x&&x();var E=function(){ms(function(){C&&c(d(o.nodeFocusedBeforeActivation)),O&&O()})};return C&&L?(L(d(o.nodeFocusedBeforeActivation)).then(E,E),this):(E(),this)},pause:function(){return o.paused||!o.active?this:(o.paused=!0,T(),this)},unpause:function(){return!o.paused||!o.active?this:(o.paused=!1,p(),_(),this)},updateContainerElements:function(w){var h=[].concat(w).filter(Boolean);return o.containers=h.map(function(x){return typeof x=="string"?n.querySelector(x):x}),o.active&&p(),this}},s.updateContainerElements(t),s};function Uc(e){let t,r;window.addEventListener("focusin",()=>{t=r,r=document.activeElement}),e.magic("focus",n=>{let i=n;return{__noscroll:!1,__wrapAround:!1,within(o){return i=o,this},withoutScrolling(){return this.__noscroll=!0,this},noscroll(){return this.__noscroll=!0,this},withWrapAround(){return this.__wrapAround=!0,this},wrap(){return this.withWrapAround()},focusable(o){return er(o)},previouslyFocused(){return t},lastFocused(){return t},focused(){return r},focusables(){return Array.isArray(i)?i:Es(i,{displayCheck:"none"})},all(){return this.focusables()},isFirst(o){let s=this.all();return s[0]&&s[0].isSameNode(o)},isLast(o){let s=this.all();return s.length&&s.slice(-1)[0].isSameNode(o)},getFirst(){return this.all()[0]},getLast(){return this.all().slice(-1)[0]},getNext(){let o=this.all(),s=document.activeElement;if(o.indexOf(s)!==-1)return this.__wrapAround&&o.indexOf(s)===o.length-1?o[0]:o[o.indexOf(s)+1]},getPrevious(){let o=this.all(),s=document.activeElement;if(o.indexOf(s)!==-1)return this.__wrapAround&&o.indexOf(s)===0?o.slice(-1)[0]:o[o.indexOf(s)-1]},first(){this.focus(this.getFirst())},last(){this.focus(this.getLast())},next(){this.focus(this.getNext())},previous(){this.focus(this.getPrevious())},prev(){return this.previous()},focus(o){!o||setTimeout(()=>{o.hasAttribute("tabindex")||o.setAttribute("tabindex","0"),o.focus({preventScroll:this.__noscroll})})}}}),e.directive("trap",e.skipDuringClone((n,{expression:i,modifiers:o},{effect:s,evaluateLater:a,cleanup:l})=>{let u=a(i),f=!1,p={escapeDeactivates:!1,allowOutsideClick:!0,fallbackFocus:()=>n};if(o.includes("noautofocus"))p.initialFocus=!1;else{let g=n.querySelector("[autofocus]");g&&(p.initialFocus=g)}let c=Bc(n,p),d=()=>{},m=()=>{},b=()=>{d(),d=()=>{},m(),m=()=>{},c.deactivate({returnFocus:!o.includes("noreturn")})};s(()=>u(g=>{f!==g&&(g&&!f&&(o.includes("noscroll")&&(m=Hc()),o.includes("inert")&&(d=vs(n)),setTimeout(()=>{c.activate()},15)),!g&&f&&b(),f=!!g)})),l(b)},(n,{expression:i,modifiers:o},{evaluate:s})=>{o.includes("inert")&&s(i)&&vs(n)}))}function vs(e){let t=[];return As(e,r=>{let n=r.hasAttribute("aria-hidden");r.setAttribute("aria-hidden","true"),t.push(()=>n||r.removeAttribute("aria-hidden"))}),()=>{for(;t.length;)t.pop()()}}function As(e,t){e.isSameNode(document.body)||!e.parentNode||Array.from(e.parentNode.children).forEach(r=>{r.isSameNode(e)?As(e.parentNode,t):t(r)})}function Hc(){let e=document.documentElement.style.overflow,t=document.documentElement.style.paddingRight,r=window.innerWidth-document.documentElement.clientWidth;return document.documentElement.style.overflow="hidden",document.documentElement.style.paddingRight=`${r}px`,()=>{document.documentElement.style.overflow=e,document.documentElement.style.paddingRight=t}}var Cs=Uc;function jc(e){let t=()=>{let r,n;try{n=localStorage}catch(i){console.error(i),console.warn("Alpine: $persist is using temporary storage since localStorage is unavailable.");let o=new Map;n={getItem:o.get.bind(o),setItem:o.set.bind(o)}}return e.interceptor((i,o,s,a,l)=>{let u=r||`_x_${a}`,f=Os(u,n)?Ts(u,n):i;return s(f),e.effect(()=>{let p=o();ks(u,p,n),s(p)}),f},i=>{i.as=o=>(r=o,i),i.using=o=>(n=o,i)})};Object.defineProperty(e,"$persist",{get:()=>t()}),e.magic("persist",t),e.persist=(r,{get:n,set:i},o=localStorage)=>{let s=Os(r,o)?Ts(r,o):n();i(s),e.effect(()=>{let a=n();ks(r,a,o),i(a)})}}function Os(e,t){return t.getItem(e)!==null}function Ts(e,t){let r=t.getItem(e,t);if(r!==void 0)return JSON.parse(r)}function ks(e,t,r){r.setItem(e,JSON.stringify(t))}var Ls=jc;function qc(e){e.directive("intersect",e.skipDuringClone((t,{value:r,expression:n,modifiers:i},{evaluateLater:o,cleanup:s})=>{let a=o(n),l={rootMargin:zc(i),threshold:Wc(i)},u=new IntersectionObserver(f=>{f.forEach(p=>{p.isIntersecting!==(r==="leave")&&(a(),i.includes("once")&&u.disconnect())})},l);u.observe(t),s(()=>{u.disconnect()})}))}function Wc(e){if(e.includes("full"))return .99;if(e.includes("half"))return .5;if(!e.includes("threshold"))return 0;let t=e[e.indexOf("threshold")+1];return t==="100"?1:t==="0"?0:Number(`.${t}`)}function Kc(e){let t=e.match(/^(-?[0-9]+)(px|%)?$/);return t?t[1]+(t[2]||"px"):void 0}function zc(e){let t="margin",r="0px 0px 0px 0px",n=e.indexOf(t);if(n===-1)return r;let i=[];for(let o=1;o<5;o++)i.push(Kc(e[n+o]||""));return i=i.filter(o=>o!==void 0),i.length?i.join(" ").trim():r}var Ns=qc;var ir=Math.min,Ne=Math.max,or=Math.round,nr=Math.floor,ge=e=>({x:e,y:e}),Vc={left:"right",right:"left",bottom:"top",top:"bottom"},Jc={start:"end",end:"start"};function Rs(e,t,r){return Ne(e,ir(t,r))}function lr(e,t){return typeof e=="function"?e(t):e}function Re(e){return e.split("-")[0]}function ur(e){return e.split("-")[1]}function Bs(e){return e==="x"?"y":"x"}function Us(e){return e==="y"?"height":"width"}function cr(e){return["top","bottom"].includes(Re(e))?"y":"x"}function Hs(e){return Bs(cr(e))}function Gc(e,t,r){r===void 0&&(r=!1);let n=ur(e),i=Hs(e),o=Us(i),s=i==="x"?n===(r?"end":"start")?"right":"left":n==="start"?"bottom":"top";return t.reference[o]>t.floating[o]&&(s=sr(s)),[s,sr(s)]}function Xc(e){let t=sr(e);return[_n(e),t,_n(t)]}function _n(e){return e.replace(/start|end/g,t=>Jc[t])}function Yc(e,t,r){let n=["left","right"],i=["right","left"],o=["top","bottom"],s=["bottom","top"];switch(e){case"top":case"bottom":return r?t?i:n:t?n:i;case"left":case"right":return t?o:s;default:return[]}}function Qc(e,t,r,n){let i=ur(e),o=Yc(Re(e),r==="start",n);return i&&(o=o.map(s=>s+"-"+i),t&&(o=o.concat(o.map(_n)))),o}function sr(e){return e.replace(/left|right|bottom|top/g,t=>Vc[t])}function Zc(e){return{top:0,right:0,bottom:0,left:0,...e}}function ef(e){return typeof e!="number"?Zc(e):{top:e,right:e,bottom:e,left:e}}function ar(e){return{...e,top:e.y,left:e.x,right:e.x+e.width,bottom:e.y+e.height}}function Ps(e,t,r){let{reference:n,floating:i}=e,o=cr(t),s=Hs(t),a=Us(s),l=Re(t),u=o==="y",f=n.x+n.width/2-i.width/2,p=n.y+n.height/2-i.height/2,c=n[a]/2-i[a]/2,d;switch(l){case"top":d={x:f,y:n.y-i.height};break;case"bottom":d={x:f,y:n.y+n.height};break;case"right":d={x:n.x+n.width,y:p};break;case"left":d={x:n.x-i.width,y:p};break;default:d={x:n.x,y:n.y}}switch(ur(t)){case"start":d[s]-=c*(r&&u?-1:1);break;case"end":d[s]+=c*(r&&u?-1:1);break}return d}var tf=async(e,t,r)=>{let{placement:n="bottom",strategy:i="absolute",middleware:o=[],platform:s}=r,a=o.filter(Boolean),l=await(s.isRTL==null?void 0:s.isRTL(t)),u=await s.getElementRects({reference:e,floating:t,strategy:i}),{x:f,y:p}=Ps(u,n,l),c=n,d={},m=0;for(let b=0;b<a.length;b++){let{name:g,fn:y}=a[b],{x:v,y:_,data:T,reset:A}=await y({x:f,y:p,initialPlacement:n,placement:c,strategy:i,middlewareData:d,rects:u,platform:s,elements:{reference:e,floating:t}});if(f=v??f,p=_??p,d={...d,[g]:{...d[g],...T}},A&&m<=50){m++,typeof A=="object"&&(A.placement&&(c=A.placement),A.rects&&(u=A.rects===!0?await s.getElementRects({reference:e,floating:t,strategy:i}):A.rects),{x:f,y:p}=Ps(u,c,l)),b=-1;continue}}return{x:f,y:p,placement:c,strategy:i,middlewareData:d}};async function js(e,t){var r;t===void 0&&(t={});let{x:n,y:i,platform:o,rects:s,elements:a,strategy:l}=e,{boundary:u="clippingAncestors",rootBoundary:f="viewport",elementContext:p="floating",altBoundary:c=!1,padding:d=0}=lr(t,e),m=ef(d),g=a[c?p==="floating"?"reference":"floating":p],y=ar(await o.getClippingRect({element:(r=await(o.isElement==null?void 0:o.isElement(g)))==null||r?g:g.contextElement||await(o.getDocumentElement==null?void 0:o.getDocumentElement(a.floating)),boundary:u,rootBoundary:f,strategy:l})),v=p==="floating"?{...s.floating,x:n,y:i}:s.reference,_=await(o.getOffsetParent==null?void 0:o.getOffsetParent(a.floating)),T=await(o.isElement==null?void 0:o.isElement(_))?await(o.getScale==null?void 0:o.getScale(_))||{x:1,y:1}:{x:1,y:1},A=ar(o.convertOffsetParentRelativeRectToViewportRelativeRect?await o.convertOffsetParentRelativeRectToViewportRelativeRect({rect:v,offsetParent:_,strategy:l}):v);return{top:(y.top-A.top+m.top)/T.y,bottom:(A.bottom-y.bottom+m.bottom)/T.y,left:(y.left-A.left+m.left)/T.x,right:(A.right-y.right+m.right)/T.x}}var rf=function(e){return e===void 0&&(e={}),{name:"flip",options:e,async fn(t){var r,n;let{placement:i,middlewareData:o,rects:s,initialPlacement:a,platform:l,elements:u}=t,{mainAxis:f=!0,crossAxis:p=!0,fallbackPlacements:c,fallbackStrategy:d="bestFit",fallbackAxisSideDirection:m="none",flipAlignment:b=!0,...g}=lr(e,t);if((r=o.arrow)!=null&&r.alignmentOffset)return{};let y=Re(i),v=Re(a)===a,_=await(l.isRTL==null?void 0:l.isRTL(u.floating)),T=c||(v||!b?[sr(a)]:Xc(a));!c&&m!=="none"&&T.push(...Qc(a,b,m,_));let A=[a,...T],w=await js(t,g),h=[],x=((n=o.flip)==null?void 0:n.overflows)||[];if(f&&h.push(w[y]),p){let E=Gc(i,s,_);h.push(w[E[0]],w[E[1]])}if(x=[...x,{placement:i,overflows:h}],!h.every(E=>E<=0)){var O,L;let E=(((O=o.flip)==null?void 0:O.index)||0)+1,U=A[E];if(U)return{data:{index:E,overflows:x},reset:{placement:U}};let P=(L=x.filter(D=>D.overflows[0]<=0).sort((D,q)=>D.overflows[1]-q.overflows[1])[0])==null?void 0:L.placement;if(!P)switch(d){case"bestFit":{var C;let D=(C=x.map(q=>[q.placement,q.overflows.filter(j=>j>0).reduce((j,we)=>j+we,0)]).sort((q,j)=>q[1]-j[1])[0])==null?void 0:C[0];D&&(P=D);break}case"initialPlacement":P=a;break}if(i!==P)return{reset:{placement:P}}}return{}}}};async function nf(e,t){let{placement:r,platform:n,elements:i}=e,o=await(n.isRTL==null?void 0:n.isRTL(i.floating)),s=Re(r),a=ur(r),l=cr(r)==="y",u=["left","top"].includes(s)?-1:1,f=o&&l?-1:1,p=lr(t,e),{mainAxis:c,crossAxis:d,alignmentAxis:m}=typeof p=="number"?{mainAxis:p,crossAxis:0,alignmentAxis:null}:{mainAxis:0,crossAxis:0,alignmentAxis:null,...p};return a&&typeof m=="number"&&(d=a==="end"?m*-1:m),l?{x:d*f,y:c*u}:{x:c*u,y:d*f}}var of=function(e){return e===void 0&&(e=0),{name:"offset",options:e,async fn(t){let{x:r,y:n}=t,i=await nf(t,e);return{x:r+i.x,y:n+i.y,data:i}}}},sf=function(e){return e===void 0&&(e={}),{name:"shift",options:e,async fn(t){let{x:r,y:n,placement:i}=t,{mainAxis:o=!0,crossAxis:s=!1,limiter:a={fn:g=>{let{x:y,y:v}=g;return{x:y,y:v}}},...l}=lr(e,t),u={x:r,y:n},f=await js(t,l),p=cr(Re(i)),c=Bs(p),d=u[c],m=u[p];if(o){let g=c==="y"?"top":"left",y=c==="y"?"bottom":"right",v=d+f[g],_=d-f[y];d=Rs(v,d,_)}if(s){let g=p==="y"?"top":"left",y=p==="y"?"bottom":"right",v=m+f[g],_=m-f[y];m=Rs(v,m,_)}let b=a.fn({...t,[c]:d,[p]:m});return{...b,data:{x:b.x-r,y:b.y-n}}}}};function ve(e){return qs(e)?(e.nodeName||"").toLowerCase():"#document"}function z(e){var t;return(e==null||(t=e.ownerDocument)==null?void 0:t.defaultView)||window}function le(e){var t;return(t=(qs(e)?e.ownerDocument:e.document)||window.document)==null?void 0:t.documentElement}function qs(e){return e instanceof Node||e instanceof z(e).Node}function ae(e){return e instanceof Element||e instanceof z(e).Element}function te(e){return e instanceof HTMLElement||e instanceof z(e).HTMLElement}function Ms(e){return typeof ShadowRoot>"u"?!1:e instanceof ShadowRoot||e instanceof z(e).ShadowRoot}function ht(e){let{overflow:t,overflowX:r,overflowY:n,display:i}=J(e);return/auto|scroll|overlay|hidden|clip/.test(t+n+r)&&!["inline","contents"].includes(i)}function af(e){return["table","td","th"].includes(ve(e))}function Sn(e){let t=En(),r=J(e);return r.transform!=="none"||r.perspective!=="none"||(r.containerType?r.containerType!=="normal":!1)||!t&&(r.backdropFilter?r.backdropFilter!=="none":!1)||!t&&(r.filter?r.filter!=="none":!1)||["transform","perspective","filter"].some(n=>(r.willChange||"").includes(n))||["paint","layout","strict","content"].some(n=>(r.contain||"").includes(n))}function lf(e){let t=Ve(e);for(;te(t)&&!fr(t);){if(Sn(t))return t;t=Ve(t)}return null}function En(){return typeof CSS>"u"||!CSS.supports?!1:CSS.supports("-webkit-backdrop-filter","none")}function fr(e){return["html","body","#document"].includes(ve(e))}function J(e){return z(e).getComputedStyle(e)}function dr(e){return ae(e)?{scrollLeft:e.scrollLeft,scrollTop:e.scrollTop}:{scrollLeft:e.pageXOffset,scrollTop:e.pageYOffset}}function Ve(e){if(ve(e)==="html")return e;let t=e.assignedSlot||e.parentNode||Ms(e)&&e.host||le(e);return Ms(t)?t.host:t}function Ws(e){let t=Ve(e);return fr(t)?e.ownerDocument?e.ownerDocument.body:e.body:te(t)&&ht(t)?t:Ws(t)}function pt(e,t,r){var n;t===void 0&&(t=[]),r===void 0&&(r=!0);let i=Ws(e),o=i===((n=e.ownerDocument)==null?void 0:n.body),s=z(i);return o?t.concat(s,s.visualViewport||[],ht(i)?i:[],s.frameElement&&r?pt(s.frameElement):[]):t.concat(i,pt(i,[],r))}function Ks(e){let t=J(e),r=parseFloat(t.width)||0,n=parseFloat(t.height)||0,i=te(e),o=i?e.offsetWidth:r,s=i?e.offsetHeight:n,a=or(r)!==o||or(n)!==s;return a&&(r=o,n=s),{width:r,height:n,$:a}}function An(e){return ae(e)?e:e.contextElement}function ze(e){let t=An(e);if(!te(t))return ge(1);let r=t.getBoundingClientRect(),{width:n,height:i,$:o}=Ks(t),s=(o?or(r.width):r.width)/n,a=(o?or(r.height):r.height)/i;return(!s||!Number.isFinite(s))&&(s=1),(!a||!Number.isFinite(a))&&(a=1),{x:s,y:a}}var uf=ge(0);function zs(e){let t=z(e);return!En()||!t.visualViewport?uf:{x:t.visualViewport.offsetLeft,y:t.visualViewport.offsetTop}}function cf(e,t,r){return t===void 0&&(t=!1),!r||t&&r!==z(e)?!1:t}function Pe(e,t,r,n){t===void 0&&(t=!1),r===void 0&&(r=!1);let i=e.getBoundingClientRect(),o=An(e),s=ge(1);t&&(n?ae(n)&&(s=ze(n)):s=ze(e));let a=cf(o,r,n)?zs(o):ge(0),l=(i.left+a.x)/s.x,u=(i.top+a.y)/s.y,f=i.width/s.x,p=i.height/s.y;if(o){let c=z(o),d=n&&ae(n)?z(n):n,m=c.frameElement;for(;m&&n&&d!==c;){let b=ze(m),g=m.getBoundingClientRect(),y=J(m),v=g.left+(m.clientLeft+parseFloat(y.paddingLeft))*b.x,_=g.top+(m.clientTop+parseFloat(y.paddingTop))*b.y;l*=b.x,u*=b.y,f*=b.x,p*=b.y,l+=v,u+=_,m=z(m).frameElement}}return ar({width:f,height:p,x:l,y:u})}function ff(e){let{rect:t,offsetParent:r,strategy:n}=e,i=te(r),o=le(r);if(r===o)return t;let s={scrollLeft:0,scrollTop:0},a=ge(1),l=ge(0);if((i||!i&&n!=="fixed")&&((ve(r)!=="body"||ht(o))&&(s=dr(r)),te(r))){let u=Pe(r);a=ze(r),l.x=u.x+r.clientLeft,l.y=u.y+r.clientTop}return{width:t.width*a.x,height:t.height*a.y,x:t.x*a.x-s.scrollLeft*a.x+l.x,y:t.y*a.y-s.scrollTop*a.y+l.y}}function df(e){return Array.from(e.getClientRects())}function Vs(e){return Pe(le(e)).left+dr(e).scrollLeft}function pf(e){let t=le(e),r=dr(e),n=e.ownerDocument.body,i=Ne(t.scrollWidth,t.clientWidth,n.scrollWidth,n.clientWidth),o=Ne(t.scrollHeight,t.clientHeight,n.scrollHeight,n.clientHeight),s=-r.scrollLeft+Vs(e),a=-r.scrollTop;return J(n).direction==="rtl"&&(s+=Ne(t.clientWidth,n.clientWidth)-i),{width:i,height:o,x:s,y:a}}function hf(e,t){let r=z(e),n=le(e),i=r.visualViewport,o=n.clientWidth,s=n.clientHeight,a=0,l=0;if(i){o=i.width,s=i.height;let u=En();(!u||u&&t==="fixed")&&(a=i.offsetLeft,l=i.offsetTop)}return{width:o,height:s,x:a,y:l}}function mf(e,t){let r=Pe(e,!0,t==="fixed"),n=r.top+e.clientTop,i=r.left+e.clientLeft,o=te(e)?ze(e):ge(1),s=e.clientWidth*o.x,a=e.clientHeight*o.y,l=i*o.x,u=n*o.y;return{width:s,height:a,x:l,y:u}}function Is(e,t,r){let n;if(t==="viewport")n=hf(e,r);else if(t==="document")n=pf(le(e));else if(ae(t))n=mf(t,r);else{let i=zs(e);n={...t,x:t.x-i.x,y:t.y-i.y}}return ar(n)}function Js(e,t){let r=Ve(e);return r===t||!ae(r)||fr(r)?!1:J(r).position==="fixed"||Js(r,t)}function gf(e,t){let r=t.get(e);if(r)return r;let n=pt(e,[],!1).filter(a=>ae(a)&&ve(a)!=="body"),i=null,o=J(e).position==="fixed",s=o?Ve(e):e;for(;ae(s)&&!fr(s);){let a=J(s),l=Sn(s);!l&&a.position==="fixed"&&(i=null),(o?!l&&!i:!l&&a.position==="static"&&!!i&&["absolute","fixed"].includes(i.position)||ht(s)&&!l&&Js(e,s))?n=n.filter(f=>f!==s):i=a,s=Ve(s)}return t.set(e,n),n}function vf(e){let{element:t,boundary:r,rootBoundary:n,strategy:i}=e,s=[...r==="clippingAncestors"?gf(t,this._c):[].concat(r),n],a=s[0],l=s.reduce((u,f)=>{let p=Is(t,f,i);return u.top=Ne(p.top,u.top),u.right=ir(p.right,u.right),u.bottom=ir(p.bottom,u.bottom),u.left=Ne(p.left,u.left),u},Is(t,a,i));return{width:l.right-l.left,height:l.bottom-l.top,x:l.left,y:l.top}}function bf(e){return Ks(e)}function wf(e,t,r){let n=te(t),i=le(t),o=r==="fixed",s=Pe(e,!0,o,t),a={scrollLeft:0,scrollTop:0},l=ge(0);if(n||!n&&!o)if((ve(t)!=="body"||ht(i))&&(a=dr(t)),n){let u=Pe(t,!0,o,t);l.x=u.x+t.clientLeft,l.y=u.y+t.clientTop}else i&&(l.x=Vs(i));return{x:s.left+a.scrollLeft-l.x,y:s.top+a.scrollTop-l.y,width:s.width,height:s.height}}function Fs(e,t){return!te(e)||J(e).position==="fixed"?null:t?t(e):e.offsetParent}function Gs(e,t){let r=z(e);if(!te(e))return r;let n=Fs(e,t);for(;n&&af(n)&&J(n).position==="static";)n=Fs(n,t);return n&&(ve(n)==="html"||ve(n)==="body"&&J(n).position==="static"&&!Sn(n))?r:n||lf(e)||r}var yf=async function(e){let{reference:t,floating:r,strategy:n}=e,i=this.getOffsetParent||Gs,o=this.getDimensions;return{reference:wf(t,await i(r),n),floating:{x:0,y:0,...await o(r)}}};function xf(e){return J(e).direction==="rtl"}var _f={convertOffsetParentRelativeRectToViewportRelativeRect:ff,getDocumentElement:le,getClippingRect:vf,getOffsetParent:Gs,getElementRects:yf,getClientRects:df,getDimensions:bf,getScale:ze,isElement:ae,isRTL:xf};function Sf(e,t){let r=null,n,i=le(e);function o(){clearTimeout(n),r&&r.disconnect(),r=null}function s(a,l){a===void 0&&(a=!1),l===void 0&&(l=1),o();let{left:u,top:f,width:p,height:c}=e.getBoundingClientRect();if(a||t(),!p||!c)return;let d=nr(f),m=nr(i.clientWidth-(u+p)),b=nr(i.clientHeight-(f+c)),g=nr(u),v={rootMargin:-d+"px "+-m+"px "+-b+"px "+-g+"px",threshold:Ne(0,ir(1,l))||1},_=!0;function T(A){let w=A[0].intersectionRatio;if(w!==l){if(!_)return s();w?s(!1,w):n=setTimeout(()=>{s(!1,1e-7)},100)}_=!1}try{r=new IntersectionObserver(T,{...v,root:i.ownerDocument})}catch{r=new IntersectionObserver(T,v)}r.observe(e)}return s(!0),o}function Ef(e,t,r,n){n===void 0&&(n={});let{ancestorScroll:i=!0,ancestorResize:o=!0,elementResize:s=typeof ResizeObserver=="function",layoutShift:a=typeof IntersectionObserver=="function",animationFrame:l=!1}=n,u=An(e),f=i||o?[...u?pt(u):[],...pt(t)]:[];f.forEach(y=>{i&&y.addEventListener("scroll",r,{passive:!0}),o&&y.addEventListener("resize",r)});let p=u&&a?Sf(u,r):null,c=-1,d=null;s&&(d=new ResizeObserver(y=>{let[v]=y;v&&v.target===u&&d&&(d.unobserve(t),cancelAnimationFrame(c),c=requestAnimationFrame(()=>{d&&d.observe(t)})),r()}),u&&!l&&d.observe(u),d.observe(t));let m,b=l?Pe(e):null;l&&g();function g(){let y=Pe(e);b&&(y.x!==b.x||y.y!==b.y||y.width!==b.width||y.height!==b.height)&&r(),b=y,m=requestAnimationFrame(g)}return r(),()=>{f.forEach(y=>{i&&y.removeEventListener("scroll",r),o&&y.removeEventListener("resize",r)}),p&&p(),d&&d.disconnect(),d=null,l&&cancelAnimationFrame(m)}}var Af=(e,t,r)=>{let n=new Map,i={platform:_f,...r},o={...i.platform,_c:n};return tf(e,t,{...i,platform:o})};function Cf(e){e.magic("anchor",t=>{if(!t._x_anchor)throw"Alpine: No x-anchor directive found on element using $anchor...";return t._x_anchor}),e.interceptClone((t,r)=>{t&&t._x_anchor&&!r._x_anchor&&(r._x_anchor=t._x_anchor)}),e.directive("anchor",e.skipDuringClone((t,{expression:r,modifiers:n,value:i},{cleanup:o,evaluate:s})=>{let{placement:a,offsetValue:l,unstyled:u}=Ds(n);t._x_anchor=e.reactive({x:0,y:0});let f=s(r);if(!f)throw"Alpine: no element provided to x-anchor...";let p=()=>{let d;Af(f,t,{placement:a,middleware:[rf(),sf({padding:5}),of(l)]}).then(({x:m,y:b})=>{u||$s(t,m,b),JSON.stringify({x:m,y:b})!==d&&(t._x_anchor.x=m,t._x_anchor.y=b),d=JSON.stringify({x:m,y:b})})},c=Ef(f,t,()=>p());o(()=>c())},(t,{expression:r,modifiers:n,value:i},{cleanup:o,evaluate:s})=>{let{placement:a,offsetValue:l,unstyled:u}=Ds(n);t._x_anchor&&(u||$s(t,t._x_anchor.x,t._x_anchor.y))}))}function $s(e,t,r){Object.assign(e.style,{left:t+"px",top:r+"px",position:"absolute"})}function Ds(e){let r=["top","top-start","top-end","right","right-start","right-end","bottom","bottom-start","bottom-end","left","left-start","left-end"].find(o=>e.includes(o)),n=0;if(e.includes("offset")){let o=e.findIndex(s=>s==="offset");n=e[o+1]!==void 0?Number(e[o+1]):n}let i=e.includes("no-style");return{placement:r,offsetValue:n,unstyled:i}}var Xs=Cf;var mt=class{constructor(t,r){this.url=t,this.html=r}},re={currentKey:null,currentUrl:null,keys:[],lookup:{},limit:10,has(e){return this.lookup[e]!==void 0},retrieve(e){let t=this.lookup[e];if(t===void 0)throw"No back button cache found for current location: "+e;return t},replace(e,t){this.has(e)?this.lookup[e]=t:this.push(e,t)},push(e,t){this.lookup[e]=t;let r=this.keys.indexOf(e);r>-1&&this.keys.splice(r,1),this.keys.unshift(e),this.trim()},trim(){for(let e of this.keys.splice(this.limit))delete this.lookup[e]}};function Ys(){let e=new URL(window.location.href,document.baseURI);Cn(e,document.documentElement.outerHTML)}function Qs(e,t){let r=document.documentElement.outerHTML;re.replace(e,new mt(t,r))}function Zs(e,t){let r;e(n=>r=n),window.addEventListener("popstate",n=>{let i=n.state||{},o=i.alpine||{};if(Object.keys(i).length!==0&&!!o.snapshotIdx)if(re.has(o.snapshotIdx)){let s=re.retrieve(o.snapshotIdx);t(s.html,s.url,re.currentUrl,re.currentKey)}else r(o.url)})}function ea(e,t){Of(t,e)}function Of(e,t){ta("pushState",e,t)}function Cn(e,t){ta("replaceState",e,t)}function ta(e,t,r){let n=t.toString()+"-"+Math.random();e==="pushState"?re.push(n,new mt(t,r)):re.replace(n=re.currentKey??n,new mt(t,r));let i=history.state||{};i.alpine||(i.alpine={}),i.alpine.snapshotIdx=n,i.alpine.url=t.toString();try{history[e](i,JSON.stringify(document.title),t),re.currentKey=n,re.currentUrl=t}catch(o){o instanceof DOMException&&o.name==="SecurityError"&&console.error("Livewire: You can't use wire:navigate with a link to a different root domain: "+t),console.error(o)}}function ra(e,t){let r=o=>!o.isTrusted,n=o=>o.which>1||o.altKey||o.ctrlKey||o.metaKey||o.shiftKey,i=o=>o.which!==13||o.altKey||o.ctrlKey||o.metaKey||o.shiftKey;e.addEventListener("click",o=>{if(r(o)){o.preventDefault(),t(s=>s());return}n(o)||o.preventDefault()}),e.addEventListener("mousedown",o=>{n(o)||(o.preventDefault(),t(s=>{let a=l=>{l.preventDefault(),s(),e.removeEventListener("mouseup",a)};e.addEventListener("mouseup",a)}))}),e.addEventListener("keydown",o=>{i(o)||(o.preventDefault(),t(s=>s()))})}function na(e,t=60,r){e.addEventListener("mouseenter",n=>{let i=setTimeout(()=>{r(n)},t),o=()=>{clearTimeout(i),e.removeEventListener("mouseleave",o)};e.addEventListener("mouseleave",o)})}function On(e){return be(e.getAttribute("href"))}function be(e){return new URL(e,document.baseURI)}function Je(e){return e.pathname+e.search+e.hash}function ia(e,t){let r=Je(e);Tn(r,(n,i)=>{t(n,i)})}function Tn(e,t){let r={headers:{"X-Livewire-Navigate":""}};R("navigate.request",{url:e,options:r});let n;fetch(e,r).then(i=>{let o=be(e);return n=be(i.url),o.pathname+o.search===n.pathname+n.search&&(n.hash=o.hash),i.text()}).then(i=>{t(i,n)})}var G={};function kn(e,t){let r=Je(e);G[r]||(G[r]={finished:!1,html:null,whenFinished:()=>{}},Tn(r,(n,i)=>{t(n,i)}))}function Ln(e,t,r){let n=G[Je(t)];n.html=e,n.finished=!0,n.finalDestination=r,n.whenFinished()}function oa(e,t,r){let n=Je(e);if(!G[n])return r();if(G[n].finished){let i=G[n].html,o=G[n].finalDestination;return delete G[n],t(i,o)}else G[n].whenFinished=()=>{let i=G[n].html,o=G[n].finalDestination;delete G[n],t(i,o)}}function Nn(e){S.mutateDom(()=>{e.querySelectorAll("[data-teleport-template]").forEach(t=>t._x_teleport.remove())})}function Rn(e){S.mutateDom(()=>{e.querySelectorAll("[data-teleport-target]").forEach(t=>t.remove())})}function Pn(e){S.walk(e,(t,r)=>{!t._x_teleport||(t._x_teleportPutBack(),r())})}function sa(e){return e.hasAttribute("data-teleport-target")}function Mn(){document.body.setAttribute("data-scroll-x",document.body.scrollLeft),document.body.setAttribute("data-scroll-y",document.body.scrollTop),document.querySelectorAll(["[x-navigate\\:scroll]","[wire\\:scroll]"]).forEach(e=>{e.setAttribute("data-scroll-x",e.scrollLeft),e.setAttribute("data-scroll-y",e.scrollTop)})}function In(){let e=t=>{t.hasAttribute("data-scroll-x")?(t.scrollTo({top:Number(t.getAttribute("data-scroll-y")),left:Number(t.getAttribute("data-scroll-x")),behavior:"instant"}),t.removeAttribute("data-scroll-x"),t.removeAttribute("data-scroll-y")):window.scrollTo({top:0,left:0,behavior:"instant"})};queueMicrotask(()=>{e(document.body),document.querySelectorAll(["[x-navigate\\:scroll]","[wire\\:scroll]"]).forEach(e)})}var gt={};function Fn(e){gt={},document.querySelectorAll("[x-persist]").forEach(t=>{gt[t.getAttribute("x-persist")]=t,e(t),S.mutateDom(()=>{t.remove()})})}function $n(e){let t=[];document.querySelectorAll("[x-persist]").forEach(r=>{let n=gt[r.getAttribute("x-persist")];!n||(t.push(r.getAttribute("x-persist")),n._x_wasPersisted=!0,e(n,r),S.mutateDom(()=>{r.replaceWith(n)}))}),Object.entries(gt).forEach(([r,n])=>{t.includes(r)||S.destroyTree(n)}),gt={}}function aa(e){return e.hasAttribute("x-persist")}var vt=al(ua());vt.default.configure({minimum:.1,trickleSpeed:200,showSpinner:!1,parent:"body"});Tf();var Bn=!1;function ca(){Bn=!0,setTimeout(()=>{!Bn||vt.default.start()},150)}function fa(){Bn=!1,vt.default.done()}function da(){vt.default.remove()}function Tf(){let e=document.createElement("style");e.innerHTML=`/* Make clicks pass-through */
+            })(${i[2]})`)(this.eventContext)),{method:r,params:n}}};function Ic(e){e.directive("collapse",t),t.inline=(r,{modifiers:n})=>{!n.includes("min")||(r._x_doShow=()=>{},r._x_doHide=()=>{})};function t(r,{modifiers:n}){let i=gs(n,"duration",250)/1e3,o=gs(n,"min",0),s=!n.includes("min");r._x_isShown||(r.style.height=`${o}px`),!r._x_isShown&&s&&(r.hidden=!0),r._x_isShown||(r.style.overflow="hidden");let a=(u,f)=>{let p=e.setStyles(u,f);return f.height?()=>{}:p},l={transitionProperty:"height",transitionDuration:`${i}s`,transitionTimingFunction:"cubic-bezier(0.4, 0.0, 0.2, 1)"};r._x_transition={in(u=()=>{},f=()=>{}){s&&(r.hidden=!1),s&&(r.style.display=null);let p=r.getBoundingClientRect().height;r.style.height="auto";let c=r.getBoundingClientRect().height;p===c&&(p=o),e.transition(r,e.setStyles,{during:l,start:{height:p+"px"},end:{height:c+"px"}},()=>r._x_isShown=!0,()=>{Math.abs(r.getBoundingClientRect().height-c)<1&&(r.style.overflow=null)})},out(u=()=>{},f=()=>{}){let p=r.getBoundingClientRect().height;e.transition(r,a,{during:l,start:{height:p+"px"},end:{height:o+"px"}},()=>r.style.overflow="hidden",()=>{r._x_isShown=!1,r.style.height==`${o}px`&&s&&(r.style.display="none",r.hidden=!0)})}}}}function gs(e,t,r){if(e.indexOf(t)===-1)return r;let n=e[e.indexOf(t)+1];if(!n)return r;if(t==="duration"){let i=n.match(/([0-9]+)ms/);if(i)return i[1]}if(t==="min"){let i=n.match(/([0-9]+)px/);if(i)return i[1]}return n}var vs=Ic;var As=["input","select","textarea","a[href]","button","[tabindex]:not(slot)","audio[controls]","video[controls]",'[contenteditable]:not([contenteditable="false"])',"details>summary:first-of-type","details"],nr=As.join(","),Cs=typeof Element>"u",Le=Cs?function(){}:Element.prototype.matches||Element.prototype.msMatchesSelector||Element.prototype.webkitMatchesSelector,_n=!Cs&&Element.prototype.getRootNode?function(e){return e.getRootNode()}:function(e){return e.ownerDocument},Os=function(t,r,n){var i=Array.prototype.slice.apply(t.querySelectorAll(nr));return r&&Le.call(t,nr)&&i.unshift(t),i=i.filter(n),i},Ts=function e(t,r,n){for(var i=[],o=Array.from(t);o.length;){var s=o.shift();if(s.tagName==="SLOT"){var a=s.assignedElements(),l=a.length?a:s.children,u=e(l,!0,n);n.flatten?i.push.apply(i,u):i.push({scope:s,candidates:u})}else{var f=Le.call(s,nr);f&&n.filter(s)&&(r||!t.includes(s))&&i.push(s);var p=s.shadowRoot||typeof n.getShadowRoot=="function"&&n.getShadowRoot(s),c=!n.shadowRootFilter||n.shadowRootFilter(s);if(p&&c){var d=e(p===!0?s.children:p.children,!0,n);n.flatten?i.push.apply(i,d):i.push({scope:s,candidates:d})}else o.unshift.apply(o,s.children)}}return i},ks=function(t,r){return t.tabIndex<0&&(r||/^(AUDIO|VIDEO|DETAILS)$/.test(t.tagName)||t.isContentEditable)&&isNaN(parseInt(t.getAttribute("tabindex"),10))?0:t.tabIndex},Fc=function(t,r){return t.tabIndex===r.tabIndex?t.documentOrder-r.documentOrder:t.tabIndex-r.tabIndex},Ls=function(t){return t.tagName==="INPUT"},$c=function(t){return Ls(t)&&t.type==="hidden"},Dc=function(t){var r=t.tagName==="DETAILS"&&Array.prototype.slice.apply(t.children).some(function(n){return n.tagName==="SUMMARY"});return r},Bc=function(t,r){for(var n=0;n<t.length;n++)if(t[n].checked&&t[n].form===r)return t[n]},Uc=function(t){if(!t.name)return!0;var r=t.form||_n(t),n=function(a){return r.querySelectorAll('input[type="radio"][name="'+a+'"]')},i;if(typeof window<"u"&&typeof window.CSS<"u"&&typeof window.CSS.escape=="function")i=n(window.CSS.escape(t.name));else try{i=n(t.name)}catch(s){return console.error("Looks like you have a radio button with a name attribute containing invalid CSS selector characters and need the CSS.escape polyfill: %s",s.message),!1}var o=Bc(i,t.form);return!o||o===t},Hc=function(t){return Ls(t)&&t.type==="radio"},jc=function(t){return Hc(t)&&!Uc(t)},bs=function(t){var r=t.getBoundingClientRect(),n=r.width,i=r.height;return n===0&&i===0},qc=function(t,r){var n=r.displayCheck,i=r.getShadowRoot;if(getComputedStyle(t).visibility==="hidden")return!0;var o=Le.call(t,"details>summary:first-of-type"),s=o?t.parentElement:t;if(Le.call(s,"details:not([open]) *"))return!0;var a=_n(t).host,l=a?.ownerDocument.contains(a)||t.ownerDocument.contains(t);if(!n||n==="full"){if(typeof i=="function"){for(var u=t;t;){var f=t.parentElement,p=_n(t);if(f&&!f.shadowRoot&&i(f)===!0)return bs(t);t.assignedSlot?t=t.assignedSlot:!f&&p!==t.ownerDocument?t=p.host:t=f}t=u}if(l)return!t.getClientRects().length}else if(n==="non-zero-area")return bs(t);return!1},Wc=function(t){if(/^(INPUT|BUTTON|SELECT|TEXTAREA)$/.test(t.tagName))for(var r=t.parentElement;r;){if(r.tagName==="FIELDSET"&&r.disabled){for(var n=0;n<r.children.length;n++){var i=r.children.item(n);if(i.tagName==="LEGEND")return Le.call(r,"fieldset[disabled] *")?!0:!i.contains(t)}return!0}r=r.parentElement}return!1},ir=function(t,r){return!(r.disabled||$c(r)||qc(r,t)||Dc(r)||Wc(r))},Sn=function(t,r){return!(jc(r)||ks(r)<0||!ir(t,r))},zc=function(t){var r=parseInt(t.getAttribute("tabindex"),10);return!!(isNaN(r)||r>=0)},Kc=function e(t){var r=[],n=[];return t.forEach(function(i,o){var s=!!i.scope,a=s?i.scope:i,l=ks(a,s),u=s?e(i.candidates):a;l===0?s?r.push.apply(r,u):r.push(a):n.push({documentOrder:o,tabIndex:l,item:i,isScope:s,content:u})}),n.sort(Fc).reduce(function(i,o){return o.isScope?i.push.apply(i,o.content):i.push(o.content),i},[]).concat(r)},Vc=function(t,r){r=r||{};var n;return r.getShadowRoot?n=Ts([t],r.includeContainer,{filter:Sn.bind(null,r),flatten:!1,getShadowRoot:r.getShadowRoot,shadowRootFilter:zc}):n=Os(t,r.includeContainer,Sn.bind(null,r)),Kc(n)},Ps=function(t,r){r=r||{};var n;return r.getShadowRoot?n=Ts([t],r.includeContainer,{filter:ir.bind(null,r),flatten:!0,getShadowRoot:r.getShadowRoot}):n=Os(t,r.includeContainer,ir.bind(null,r)),n},er=function(t,r){if(r=r||{},!t)throw new Error("No node provided");return Le.call(t,nr)===!1?!1:Sn(r,t)},Jc=As.concat("iframe").join(","),rr=function(t,r){if(r=r||{},!t)throw new Error("No node provided");return Le.call(t,Jc)===!1?!1:ir(r,t)};function ws(e,t){var r=Object.keys(e);if(Object.getOwnPropertySymbols){var n=Object.getOwnPropertySymbols(e);t&&(n=n.filter(function(i){return Object.getOwnPropertyDescriptor(e,i).enumerable})),r.push.apply(r,n)}return r}function ys(e){for(var t=1;t<arguments.length;t++){var r=arguments[t]!=null?arguments[t]:{};t%2?ws(Object(r),!0).forEach(function(n){Gc(e,n,r[n])}):Object.getOwnPropertyDescriptors?Object.defineProperties(e,Object.getOwnPropertyDescriptors(r)):ws(Object(r)).forEach(function(n){Object.defineProperty(e,n,Object.getOwnPropertyDescriptor(r,n))})}return e}function Gc(e,t,r){return t in e?Object.defineProperty(e,t,{value:r,enumerable:!0,configurable:!0,writable:!0}):e[t]=r,e}var xs=function(){var e=[];return{activateTrap:function(r){if(e.length>0){var n=e[e.length-1];n!==r&&n.pause()}var i=e.indexOf(r);i===-1||e.splice(i,1),e.push(r)},deactivateTrap:function(r){var n=e.indexOf(r);n!==-1&&e.splice(n,1),e.length>0&&e[e.length-1].unpause()}}}(),Xc=function(t){return t.tagName&&t.tagName.toLowerCase()==="input"&&typeof t.select=="function"},Yc=function(t){return t.key==="Escape"||t.key==="Esc"||t.keyCode===27},Qc=function(t){return t.key==="Tab"||t.keyCode===9},_s=function(t){return setTimeout(t,0)},Ss=function(t,r){var n=-1;return t.every(function(i,o){return r(i)?(n=o,!1):!0}),n},ht=function(t){for(var r=arguments.length,n=new Array(r>1?r-1:0),i=1;i<r;i++)n[i-1]=arguments[i];return typeof t=="function"?t.apply(void 0,n):t},tr=function(t){return t.target.shadowRoot&&typeof t.composedPath=="function"?t.composedPath()[0]:t.target},Zc=function(t,r){var n=r?.document||document,i=ys({returnFocusOnDeactivate:!0,escapeDeactivates:!0,delayInitialFocus:!0},r),o={containers:[],containerGroups:[],tabbableGroups:[],nodeFocusedBeforeActivation:null,mostRecentlyFocusedNode:null,active:!1,paused:!1,delayInitialFocusTimer:void 0},s,a=function(w,h,x){return w&&w[h]!==void 0?w[h]:i[x||h]},l=function(w){return o.containerGroups.findIndex(function(h){var x=h.container,T=h.tabbableNodes;return x.contains(w)||T.find(function(L){return L===w})})},u=function(w){var h=i[w];if(typeof h=="function"){for(var x=arguments.length,T=new Array(x>1?x-1:0),L=1;L<x;L++)T[L-1]=arguments[L];h=h.apply(void 0,T)}if(h===!0&&(h=void 0),!h){if(h===void 0||h===!1)return h;throw new Error("`".concat(w,"` was specified but was not a node, or did not return a node"))}var O=h;if(typeof h=="string"&&(O=n.querySelector(h),!O))throw new Error("`".concat(w,"` as selector refers to no known node"));return O},f=function(){var w=u("initialFocus");if(w===!1)return!1;if(w===void 0)if(l(n.activeElement)>=0)w=n.activeElement;else{var h=o.tabbableGroups[0],x=h&&h.firstTabbableNode;w=x||u("fallbackFocus")}if(!w)throw new Error("Your focus-trap needs to have at least one focusable element");return w},p=function(){if(o.containerGroups=o.containers.map(function(w){var h=Vc(w,i.tabbableOptions),x=Ps(w,i.tabbableOptions);return{container:w,tabbableNodes:h,focusableNodes:x,firstTabbableNode:h.length>0?h[0]:null,lastTabbableNode:h.length>0?h[h.length-1]:null,nextTabbableNode:function(L){var O=arguments.length>1&&arguments[1]!==void 0?arguments[1]:!0,E=x.findIndex(function(U){return U===L});if(!(E<0))return O?x.slice(E+1).find(function(U){return er(U,i.tabbableOptions)}):x.slice(0,E).reverse().find(function(U){return er(U,i.tabbableOptions)})}}}),o.tabbableGroups=o.containerGroups.filter(function(w){return w.tabbableNodes.length>0}),o.tabbableGroups.length<=0&&!u("fallbackFocus"))throw new Error("Your focus-trap must have at least one container with at least one tabbable node in it at all times")},c=function C(w){if(w!==!1&&w!==n.activeElement){if(!w||!w.focus){C(f());return}w.focus({preventScroll:!!i.preventScroll}),o.mostRecentlyFocusedNode=w,Xc(w)&&w.select()}},d=function(w){var h=u("setReturnFocus",w);return h||(h===!1?!1:w)},m=function(w){var h=tr(w);if(!(l(h)>=0)){if(ht(i.clickOutsideDeactivates,w)){s.deactivate({returnFocus:i.returnFocusOnDeactivate&&!rr(h,i.tabbableOptions)});return}ht(i.allowOutsideClick,w)||w.preventDefault()}},b=function(w){var h=tr(w),x=l(h)>=0;x||h instanceof Document?x&&(o.mostRecentlyFocusedNode=h):(w.stopImmediatePropagation(),c(o.mostRecentlyFocusedNode||f()))},g=function(w){var h=tr(w);p();var x=null;if(o.tabbableGroups.length>0){var T=l(h),L=T>=0?o.containerGroups[T]:void 0;if(T<0)w.shiftKey?x=o.tabbableGroups[o.tabbableGroups.length-1].lastTabbableNode:x=o.tabbableGroups[0].firstTabbableNode;else if(w.shiftKey){var O=Ss(o.tabbableGroups,function(j){var be=j.firstTabbableNode;return h===be});if(O<0&&(L.container===h||rr(h,i.tabbableOptions)&&!er(h,i.tabbableOptions)&&!L.nextTabbableNode(h,!1))&&(O=T),O>=0){var E=O===0?o.tabbableGroups.length-1:O-1,U=o.tabbableGroups[E];x=U.lastTabbableNode}}else{var N=Ss(o.tabbableGroups,function(j){var be=j.lastTabbableNode;return h===be});if(N<0&&(L.container===h||rr(h,i.tabbableOptions)&&!er(h,i.tabbableOptions)&&!L.nextTabbableNode(h))&&(N=T),N>=0){var $=N===o.tabbableGroups.length-1?0:N+1,q=o.tabbableGroups[$];x=q.firstTabbableNode}}}else x=u("fallbackFocus");x&&(w.preventDefault(),c(x))},y=function(w){if(Yc(w)&&ht(i.escapeDeactivates,w)!==!1){w.preventDefault(),s.deactivate();return}if(Qc(w)){g(w);return}},v=function(w){var h=tr(w);l(h)>=0||ht(i.clickOutsideDeactivates,w)||ht(i.allowOutsideClick,w)||(w.preventDefault(),w.stopImmediatePropagation())},_=function(){if(!!o.active)return xs.activateTrap(s),o.delayInitialFocusTimer=i.delayInitialFocus?_s(function(){c(f())}):c(f()),n.addEventListener("focusin",b,!0),n.addEventListener("mousedown",m,{capture:!0,passive:!1}),n.addEventListener("touchstart",m,{capture:!0,passive:!1}),n.addEventListener("click",v,{capture:!0,passive:!1}),n.addEventListener("keydown",y,{capture:!0,passive:!1}),s},A=function(){if(!!o.active)return n.removeEventListener("focusin",b,!0),n.removeEventListener("mousedown",m,!0),n.removeEventListener("touchstart",m,!0),n.removeEventListener("click",v,!0),n.removeEventListener("keydown",y,!0),s};return s={get active(){return o.active},get paused(){return o.paused},activate:function(w){if(o.active)return this;var h=a(w,"onActivate"),x=a(w,"onPostActivate"),T=a(w,"checkCanFocusTrap");T||p(),o.active=!0,o.paused=!1,o.nodeFocusedBeforeActivation=n.activeElement,h&&h();var L=function(){T&&p(),_(),x&&x()};return T?(T(o.containers.concat()).then(L,L),this):(L(),this)},deactivate:function(w){if(!o.active)return this;var h=ys({onDeactivate:i.onDeactivate,onPostDeactivate:i.onPostDeactivate,checkCanReturnFocus:i.checkCanReturnFocus},w);clearTimeout(o.delayInitialFocusTimer),o.delayInitialFocusTimer=void 0,A(),o.active=!1,o.paused=!1,xs.deactivateTrap(s);var x=a(h,"onDeactivate"),T=a(h,"onPostDeactivate"),L=a(h,"checkCanReturnFocus"),O=a(h,"returnFocus","returnFocusOnDeactivate");x&&x();var E=function(){_s(function(){O&&c(d(o.nodeFocusedBeforeActivation)),T&&T()})};return O&&L?(L(d(o.nodeFocusedBeforeActivation)).then(E,E),this):(E(),this)},pause:function(){return o.paused||!o.active?this:(o.paused=!0,A(),this)},unpause:function(){return!o.paused||!o.active?this:(o.paused=!1,p(),_(),this)},updateContainerElements:function(w){var h=[].concat(w).filter(Boolean);return o.containers=h.map(function(x){return typeof x=="string"?n.querySelector(x):x}),o.active&&p(),this}},s.updateContainerElements(t),s};function ef(e){let t,r;window.addEventListener("focusin",()=>{t=r,r=document.activeElement}),e.magic("focus",n=>{let i=n;return{__noscroll:!1,__wrapAround:!1,within(o){return i=o,this},withoutScrolling(){return this.__noscroll=!0,this},noscroll(){return this.__noscroll=!0,this},withWrapAround(){return this.__wrapAround=!0,this},wrap(){return this.withWrapAround()},focusable(o){return rr(o)},previouslyFocused(){return t},lastFocused(){return t},focused(){return r},focusables(){return Array.isArray(i)?i:Ps(i,{displayCheck:"none"})},all(){return this.focusables()},isFirst(o){let s=this.all();return s[0]&&s[0].isSameNode(o)},isLast(o){let s=this.all();return s.length&&s.slice(-1)[0].isSameNode(o)},getFirst(){return this.all()[0]},getLast(){return this.all().slice(-1)[0]},getNext(){let o=this.all(),s=document.activeElement;if(o.indexOf(s)!==-1)return this.__wrapAround&&o.indexOf(s)===o.length-1?o[0]:o[o.indexOf(s)+1]},getPrevious(){let o=this.all(),s=document.activeElement;if(o.indexOf(s)!==-1)return this.__wrapAround&&o.indexOf(s)===0?o.slice(-1)[0]:o[o.indexOf(s)-1]},first(){this.focus(this.getFirst())},last(){this.focus(this.getLast())},next(){this.focus(this.getNext())},previous(){this.focus(this.getPrevious())},prev(){return this.previous()},focus(o){!o||setTimeout(()=>{o.hasAttribute("tabindex")||o.setAttribute("tabindex","0"),o.focus({preventScroll:this.__noscroll})})}}}),e.directive("trap",e.skipDuringClone((n,{expression:i,modifiers:o},{effect:s,evaluateLater:a,cleanup:l})=>{let u=a(i),f=!1,p={escapeDeactivates:!1,allowOutsideClick:!0,fallbackFocus:()=>n};if(o.includes("noautofocus"))p.initialFocus=!1;else{let g=n.querySelector("[autofocus]");g&&(p.initialFocus=g)}let c=Zc(n,p),d=()=>{},m=()=>{},b=()=>{d(),d=()=>{},m(),m=()=>{},c.deactivate({returnFocus:!o.includes("noreturn")})};s(()=>u(g=>{f!==g&&(g&&!f&&(o.includes("noscroll")&&(m=tf()),o.includes("inert")&&(d=Es(n)),setTimeout(()=>{c.activate()},15)),!g&&f&&b(),f=!!g)})),l(b)},(n,{expression:i,modifiers:o},{evaluate:s})=>{o.includes("inert")&&s(i)&&Es(n)}))}function Es(e){let t=[];return Rs(e,r=>{let n=r.hasAttribute("aria-hidden");r.setAttribute("aria-hidden","true"),t.push(()=>n||r.removeAttribute("aria-hidden"))}),()=>{for(;t.length;)t.pop()()}}function Rs(e,t){e.isSameNode(document.body)||!e.parentNode||Array.from(e.parentNode.children).forEach(r=>{r.isSameNode(e)?Rs(e.parentNode,t):t(r)})}function tf(){let e=document.documentElement.style.overflow,t=document.documentElement.style.paddingRight,r=window.innerWidth-document.documentElement.clientWidth;return document.documentElement.style.overflow="hidden",document.documentElement.style.paddingRight=`${r}px`,()=>{document.documentElement.style.overflow=e,document.documentElement.style.paddingRight=t}}var Ns=ef;function rf(e){let t=()=>{let r,n;try{n=localStorage}catch(i){console.error(i),console.warn("Alpine: $persist is using temporary storage since localStorage is unavailable.");let o=new Map;n={getItem:o.get.bind(o),setItem:o.set.bind(o)}}return e.interceptor((i,o,s,a,l)=>{let u=r||`_x_${a}`,f=Ms(u,n)?Is(u,n):i;return s(f),e.effect(()=>{let p=o();Fs(u,p,n),s(p)}),f},i=>{i.as=o=>(r=o,i),i.using=o=>(n=o,i)})};Object.defineProperty(e,"$persist",{get:()=>t()}),e.magic("persist",t),e.persist=(r,{get:n,set:i},o=localStorage)=>{let s=Ms(r,o)?Is(r,o):n();i(s),e.effect(()=>{let a=n();Fs(r,a,o),i(a)})}}function Ms(e,t){return t.getItem(e)!==null}function Is(e,t){let r=t.getItem(e,t);if(r!==void 0)return JSON.parse(r)}function Fs(e,t,r){r.setItem(e,JSON.stringify(t))}var $s=rf;function nf(e){e.directive("intersect",e.skipDuringClone((t,{value:r,expression:n,modifiers:i},{evaluateLater:o,cleanup:s})=>{let a=o(n),l={rootMargin:af(i),threshold:of(i)},u=new IntersectionObserver(f=>{f.forEach(p=>{p.isIntersecting!==(r==="leave")&&(a(),i.includes("once")&&u.disconnect())})},l);u.observe(t),s(()=>{u.disconnect()})}))}function of(e){if(e.includes("full"))return .99;if(e.includes("half"))return .5;if(!e.includes("threshold"))return 0;let t=e[e.indexOf("threshold")+1];return t==="100"?1:t==="0"?0:Number(`.${t}`)}function sf(e){let t=e.match(/^(-?[0-9]+)(px|%)?$/);return t?t[1]+(t[2]||"px"):void 0}function af(e){let t="margin",r="0px 0px 0px 0px",n=e.indexOf(t);if(n===-1)return r;let i=[];for(let o=1;o<5;o++)i.push(sf(e[n+o]||""));return i=i.filter(o=>o!==void 0),i.length?i.join(" ").trim():r}var Ds=nf;function lf(e){e.directive("resize",e.skipDuringClone((t,{value:r,expression:n,modifiers:i},{evaluateLater:o,cleanup:s})=>{let a=o(n),l=(f,p)=>{a(()=>{},{scope:{$width:f,$height:p}})},u=i.includes("document")?cf(l):uf(t,l);s(()=>u())}))}function uf(e,t){let r=new ResizeObserver(n=>{let[i,o]=Bs(n);t(i,o)});return r.observe(e),()=>r.disconnect()}var En,An=new Set;function cf(e){return An.add(e),En||(En=new ResizeObserver(t=>{let[r,n]=Bs(t);An.forEach(i=>i(r,n))}),En.observe(document.documentElement)),()=>{An.delete(e)}}function Bs(e){let t,r;for(let n of e)t=n.borderBoxSize[0].inlineSize,r=n.borderBoxSize[0].blockSize;return[t,r]}var Us=lf;var sr=Math.min,Pe=Math.max,ar=Math.round,or=Math.floor,me=e=>({x:e,y:e}),ff={left:"right",right:"left",bottom:"top",top:"bottom"},df={start:"end",end:"start"};function Hs(e,t,r){return Pe(e,sr(t,r))}function cr(e,t){return typeof e=="function"?e(t):e}function Re(e){return e.split("-")[0]}function fr(e){return e.split("-")[1]}function Js(e){return e==="x"?"y":"x"}function Gs(e){return e==="y"?"height":"width"}function dr(e){return["top","bottom"].includes(Re(e))?"y":"x"}function Xs(e){return Js(dr(e))}function pf(e,t,r){r===void 0&&(r=!1);let n=fr(e),i=Xs(e),o=Gs(i),s=i==="x"?n===(r?"end":"start")?"right":"left":n==="start"?"bottom":"top";return t.reference[o]>t.floating[o]&&(s=lr(s)),[s,lr(s)]}function hf(e){let t=lr(e);return[Cn(e),t,Cn(t)]}function Cn(e){return e.replace(/start|end/g,t=>df[t])}function mf(e,t,r){let n=["left","right"],i=["right","left"],o=["top","bottom"],s=["bottom","top"];switch(e){case"top":case"bottom":return r?t?i:n:t?n:i;case"left":case"right":return t?o:s;default:return[]}}function gf(e,t,r,n){let i=fr(e),o=mf(Re(e),r==="start",n);return i&&(o=o.map(s=>s+"-"+i),t&&(o=o.concat(o.map(Cn)))),o}function lr(e){return e.replace(/left|right|bottom|top/g,t=>ff[t])}function vf(e){return{top:0,right:0,bottom:0,left:0,...e}}function bf(e){return typeof e!="number"?vf(e):{top:e,right:e,bottom:e,left:e}}function ur(e){return{...e,top:e.y,left:e.x,right:e.x+e.width,bottom:e.y+e.height}}function js(e,t,r){let{reference:n,floating:i}=e,o=dr(t),s=Xs(t),a=Gs(s),l=Re(t),u=o==="y",f=n.x+n.width/2-i.width/2,p=n.y+n.height/2-i.height/2,c=n[a]/2-i[a]/2,d;switch(l){case"top":d={x:f,y:n.y-i.height};break;case"bottom":d={x:f,y:n.y+n.height};break;case"right":d={x:n.x+n.width,y:p};break;case"left":d={x:n.x-i.width,y:p};break;default:d={x:n.x,y:n.y}}switch(fr(t)){case"start":d[s]-=c*(r&&u?-1:1);break;case"end":d[s]+=c*(r&&u?-1:1);break}return d}var wf=async(e,t,r)=>{let{placement:n="bottom",strategy:i="absolute",middleware:o=[],platform:s}=r,a=o.filter(Boolean),l=await(s.isRTL==null?void 0:s.isRTL(t)),u=await s.getElementRects({reference:e,floating:t,strategy:i}),{x:f,y:p}=js(u,n,l),c=n,d={},m=0;for(let b=0;b<a.length;b++){let{name:g,fn:y}=a[b],{x:v,y:_,data:A,reset:C}=await y({x:f,y:p,initialPlacement:n,placement:c,strategy:i,middlewareData:d,rects:u,platform:s,elements:{reference:e,floating:t}});if(f=v??f,p=_??p,d={...d,[g]:{...d[g],...A}},C&&m<=50){m++,typeof C=="object"&&(C.placement&&(c=C.placement),C.rects&&(u=C.rects===!0?await s.getElementRects({reference:e,floating:t,strategy:i}):C.rects),{x:f,y:p}=js(u,c,l)),b=-1;continue}}return{x:f,y:p,placement:c,strategy:i,middlewareData:d}};async function Ys(e,t){var r;t===void 0&&(t={});let{x:n,y:i,platform:o,rects:s,elements:a,strategy:l}=e,{boundary:u="clippingAncestors",rootBoundary:f="viewport",elementContext:p="floating",altBoundary:c=!1,padding:d=0}=cr(t,e),m=bf(d),g=a[c?p==="floating"?"reference":"floating":p],y=ur(await o.getClippingRect({element:(r=await(o.isElement==null?void 0:o.isElement(g)))==null||r?g:g.contextElement||await(o.getDocumentElement==null?void 0:o.getDocumentElement(a.floating)),boundary:u,rootBoundary:f,strategy:l})),v=p==="floating"?{...s.floating,x:n,y:i}:s.reference,_=await(o.getOffsetParent==null?void 0:o.getOffsetParent(a.floating)),A=await(o.isElement==null?void 0:o.isElement(_))?await(o.getScale==null?void 0:o.getScale(_))||{x:1,y:1}:{x:1,y:1},C=ur(o.convertOffsetParentRelativeRectToViewportRelativeRect?await o.convertOffsetParentRelativeRectToViewportRelativeRect({rect:v,offsetParent:_,strategy:l}):v);return{top:(y.top-C.top+m.top)/A.y,bottom:(C.bottom-y.bottom+m.bottom)/A.y,left:(y.left-C.left+m.left)/A.x,right:(C.right-y.right+m.right)/A.x}}var yf=function(e){return e===void 0&&(e={}),{name:"flip",options:e,async fn(t){var r,n;let{placement:i,middlewareData:o,rects:s,initialPlacement:a,platform:l,elements:u}=t,{mainAxis:f=!0,crossAxis:p=!0,fallbackPlacements:c,fallbackStrategy:d="bestFit",fallbackAxisSideDirection:m="none",flipAlignment:b=!0,...g}=cr(e,t);if((r=o.arrow)!=null&&r.alignmentOffset)return{};let y=Re(i),v=Re(a)===a,_=await(l.isRTL==null?void 0:l.isRTL(u.floating)),A=c||(v||!b?[lr(a)]:hf(a));!c&&m!=="none"&&A.push(...gf(a,b,m,_));let C=[a,...A],w=await Ys(t,g),h=[],x=((n=o.flip)==null?void 0:n.overflows)||[];if(f&&h.push(w[y]),p){let E=pf(i,s,_);h.push(w[E[0]],w[E[1]])}if(x=[...x,{placement:i,overflows:h}],!h.every(E=>E<=0)){var T,L;let E=(((T=o.flip)==null?void 0:T.index)||0)+1,U=C[E];if(U)return{data:{index:E,overflows:x},reset:{placement:U}};let N=(L=x.filter($=>$.overflows[0]<=0).sort(($,q)=>$.overflows[1]-q.overflows[1])[0])==null?void 0:L.placement;if(!N)switch(d){case"bestFit":{var O;let $=(O=x.map(q=>[q.placement,q.overflows.filter(j=>j>0).reduce((j,be)=>j+be,0)]).sort((q,j)=>q[1]-j[1])[0])==null?void 0:O[0];$&&(N=$);break}case"initialPlacement":N=a;break}if(i!==N)return{reset:{placement:N}}}return{}}}};async function xf(e,t){let{placement:r,platform:n,elements:i}=e,o=await(n.isRTL==null?void 0:n.isRTL(i.floating)),s=Re(r),a=fr(r),l=dr(r)==="y",u=["left","top"].includes(s)?-1:1,f=o&&l?-1:1,p=cr(t,e),{mainAxis:c,crossAxis:d,alignmentAxis:m}=typeof p=="number"?{mainAxis:p,crossAxis:0,alignmentAxis:null}:{mainAxis:0,crossAxis:0,alignmentAxis:null,...p};return a&&typeof m=="number"&&(d=a==="end"?m*-1:m),l?{x:d*f,y:c*u}:{x:c*u,y:d*f}}var _f=function(e){return e===void 0&&(e=0),{name:"offset",options:e,async fn(t){let{x:r,y:n}=t,i=await xf(t,e);return{x:r+i.x,y:n+i.y,data:i}}}},Sf=function(e){return e===void 0&&(e={}),{name:"shift",options:e,async fn(t){let{x:r,y:n,placement:i}=t,{mainAxis:o=!0,crossAxis:s=!1,limiter:a={fn:g=>{let{x:y,y:v}=g;return{x:y,y:v}}},...l}=cr(e,t),u={x:r,y:n},f=await Ys(t,l),p=dr(Re(i)),c=Js(p),d=u[c],m=u[p];if(o){let g=c==="y"?"top":"left",y=c==="y"?"bottom":"right",v=d+f[g],_=d-f[y];d=Hs(v,d,_)}if(s){let g=p==="y"?"top":"left",y=p==="y"?"bottom":"right",v=m+f[g],_=m-f[y];m=Hs(v,m,_)}let b=a.fn({...t,[c]:d,[p]:m});return{...b,data:{x:b.x-r,y:b.y-n}}}}};function ge(e){return Qs(e)?(e.nodeName||"").toLowerCase():"#document"}function K(e){var t;return(e==null||(t=e.ownerDocument)==null?void 0:t.defaultView)||window}function le(e){var t;return(t=(Qs(e)?e.ownerDocument:e.document)||window.document)==null?void 0:t.documentElement}function Qs(e){return e instanceof Node||e instanceof K(e).Node}function ae(e){return e instanceof Element||e instanceof K(e).Element}function te(e){return e instanceof HTMLElement||e instanceof K(e).HTMLElement}function qs(e){return typeof ShadowRoot>"u"?!1:e instanceof ShadowRoot||e instanceof K(e).ShadowRoot}function gt(e){let{overflow:t,overflowX:r,overflowY:n,display:i}=J(e);return/auto|scroll|overlay|hidden|clip/.test(t+n+r)&&!["inline","contents"].includes(i)}function Ef(e){return["table","td","th"].includes(ge(e))}function On(e){let t=Tn(),r=J(e);return r.transform!=="none"||r.perspective!=="none"||(r.containerType?r.containerType!=="normal":!1)||!t&&(r.backdropFilter?r.backdropFilter!=="none":!1)||!t&&(r.filter?r.filter!=="none":!1)||["transform","perspective","filter"].some(n=>(r.willChange||"").includes(n))||["paint","layout","strict","content"].some(n=>(r.contain||"").includes(n))}function Af(e){let t=Ge(e);for(;te(t)&&!pr(t);){if(On(t))return t;t=Ge(t)}return null}function Tn(){return typeof CSS>"u"||!CSS.supports?!1:CSS.supports("-webkit-backdrop-filter","none")}function pr(e){return["html","body","#document"].includes(ge(e))}function J(e){return K(e).getComputedStyle(e)}function hr(e){return ae(e)?{scrollLeft:e.scrollLeft,scrollTop:e.scrollTop}:{scrollLeft:e.pageXOffset,scrollTop:e.pageYOffset}}function Ge(e){if(ge(e)==="html")return e;let t=e.assignedSlot||e.parentNode||qs(e)&&e.host||le(e);return qs(t)?t.host:t}function Zs(e){let t=Ge(e);return pr(t)?e.ownerDocument?e.ownerDocument.body:e.body:te(t)&&gt(t)?t:Zs(t)}function mt(e,t,r){var n;t===void 0&&(t=[]),r===void 0&&(r=!0);let i=Zs(e),o=i===((n=e.ownerDocument)==null?void 0:n.body),s=K(i);return o?t.concat(s,s.visualViewport||[],gt(i)?i:[],s.frameElement&&r?mt(s.frameElement):[]):t.concat(i,mt(i,[],r))}function ea(e){let t=J(e),r=parseFloat(t.width)||0,n=parseFloat(t.height)||0,i=te(e),o=i?e.offsetWidth:r,s=i?e.offsetHeight:n,a=ar(r)!==o||ar(n)!==s;return a&&(r=o,n=s),{width:r,height:n,$:a}}function kn(e){return ae(e)?e:e.contextElement}function Je(e){let t=kn(e);if(!te(t))return me(1);let r=t.getBoundingClientRect(),{width:n,height:i,$:o}=ea(t),s=(o?ar(r.width):r.width)/n,a=(o?ar(r.height):r.height)/i;return(!s||!Number.isFinite(s))&&(s=1),(!a||!Number.isFinite(a))&&(a=1),{x:s,y:a}}var Cf=me(0);function ta(e){let t=K(e);return!Tn()||!t.visualViewport?Cf:{x:t.visualViewport.offsetLeft,y:t.visualViewport.offsetTop}}function Of(e,t,r){return t===void 0&&(t=!1),!r||t&&r!==K(e)?!1:t}function Ne(e,t,r,n){t===void 0&&(t=!1),r===void 0&&(r=!1);let i=e.getBoundingClientRect(),o=kn(e),s=me(1);t&&(n?ae(n)&&(s=Je(n)):s=Je(e));let a=Of(o,r,n)?ta(o):me(0),l=(i.left+a.x)/s.x,u=(i.top+a.y)/s.y,f=i.width/s.x,p=i.height/s.y;if(o){let c=K(o),d=n&&ae(n)?K(n):n,m=c.frameElement;for(;m&&n&&d!==c;){let b=Je(m),g=m.getBoundingClientRect(),y=J(m),v=g.left+(m.clientLeft+parseFloat(y.paddingLeft))*b.x,_=g.top+(m.clientTop+parseFloat(y.paddingTop))*b.y;l*=b.x,u*=b.y,f*=b.x,p*=b.y,l+=v,u+=_,m=K(m).frameElement}}return ur({width:f,height:p,x:l,y:u})}function Tf(e){let{rect:t,offsetParent:r,strategy:n}=e,i=te(r),o=le(r);if(r===o)return t;let s={scrollLeft:0,scrollTop:0},a=me(1),l=me(0);if((i||!i&&n!=="fixed")&&((ge(r)!=="body"||gt(o))&&(s=hr(r)),te(r))){let u=Ne(r);a=Je(r),l.x=u.x+r.clientLeft,l.y=u.y+r.clientTop}return{width:t.width*a.x,height:t.height*a.y,x:t.x*a.x-s.scrollLeft*a.x+l.x,y:t.y*a.y-s.scrollTop*a.y+l.y}}function kf(e){return Array.from(e.getClientRects())}function ra(e){return Ne(le(e)).left+hr(e).scrollLeft}function Lf(e){let t=le(e),r=hr(e),n=e.ownerDocument.body,i=Pe(t.scrollWidth,t.clientWidth,n.scrollWidth,n.clientWidth),o=Pe(t.scrollHeight,t.clientHeight,n.scrollHeight,n.clientHeight),s=-r.scrollLeft+ra(e),a=-r.scrollTop;return J(n).direction==="rtl"&&(s+=Pe(t.clientWidth,n.clientWidth)-i),{width:i,height:o,x:s,y:a}}function Pf(e,t){let r=K(e),n=le(e),i=r.visualViewport,o=n.clientWidth,s=n.clientHeight,a=0,l=0;if(i){o=i.width,s=i.height;let u=Tn();(!u||u&&t==="fixed")&&(a=i.offsetLeft,l=i.offsetTop)}return{width:o,height:s,x:a,y:l}}function Rf(e,t){let r=Ne(e,!0,t==="fixed"),n=r.top+e.clientTop,i=r.left+e.clientLeft,o=te(e)?Je(e):me(1),s=e.clientWidth*o.x,a=e.clientHeight*o.y,l=i*o.x,u=n*o.y;return{width:s,height:a,x:l,y:u}}function Ws(e,t,r){let n;if(t==="viewport")n=Pf(e,r);else if(t==="document")n=Lf(le(e));else if(ae(t))n=Rf(t,r);else{let i=ta(e);n={...t,x:t.x-i.x,y:t.y-i.y}}return ur(n)}function na(e,t){let r=Ge(e);return r===t||!ae(r)||pr(r)?!1:J(r).position==="fixed"||na(r,t)}function Nf(e,t){let r=t.get(e);if(r)return r;let n=mt(e,[],!1).filter(a=>ae(a)&&ge(a)!=="body"),i=null,o=J(e).position==="fixed",s=o?Ge(e):e;for(;ae(s)&&!pr(s);){let a=J(s),l=On(s);!l&&a.position==="fixed"&&(i=null),(o?!l&&!i:!l&&a.position==="static"&&!!i&&["absolute","fixed"].includes(i.position)||gt(s)&&!l&&na(e,s))?n=n.filter(f=>f!==s):i=a,s=Ge(s)}return t.set(e,n),n}function Mf(e){let{element:t,boundary:r,rootBoundary:n,strategy:i}=e,s=[...r==="clippingAncestors"?Nf(t,this._c):[].concat(r),n],a=s[0],l=s.reduce((u,f)=>{let p=Ws(t,f,i);return u.top=Pe(p.top,u.top),u.right=sr(p.right,u.right),u.bottom=sr(p.bottom,u.bottom),u.left=Pe(p.left,u.left),u},Ws(t,a,i));return{width:l.right-l.left,height:l.bottom-l.top,x:l.left,y:l.top}}function If(e){return ea(e)}function Ff(e,t,r){let n=te(t),i=le(t),o=r==="fixed",s=Ne(e,!0,o,t),a={scrollLeft:0,scrollTop:0},l=me(0);if(n||!n&&!o)if((ge(t)!=="body"||gt(i))&&(a=hr(t)),n){let u=Ne(t,!0,o,t);l.x=u.x+t.clientLeft,l.y=u.y+t.clientTop}else i&&(l.x=ra(i));return{x:s.left+a.scrollLeft-l.x,y:s.top+a.scrollTop-l.y,width:s.width,height:s.height}}function zs(e,t){return!te(e)||J(e).position==="fixed"?null:t?t(e):e.offsetParent}function ia(e,t){let r=K(e);if(!te(e))return r;let n=zs(e,t);for(;n&&Ef(n)&&J(n).position==="static";)n=zs(n,t);return n&&(ge(n)==="html"||ge(n)==="body"&&J(n).position==="static"&&!On(n))?r:n||Af(e)||r}var $f=async function(e){let{reference:t,floating:r,strategy:n}=e,i=this.getOffsetParent||ia,o=this.getDimensions;return{reference:Ff(t,await i(r),n),floating:{x:0,y:0,...await o(r)}}};function Df(e){return J(e).direction==="rtl"}var Bf={convertOffsetParentRelativeRectToViewportRelativeRect:Tf,getDocumentElement:le,getClippingRect:Mf,getOffsetParent:ia,getElementRects:$f,getClientRects:kf,getDimensions:If,getScale:Je,isElement:ae,isRTL:Df};function Uf(e,t){let r=null,n,i=le(e);function o(){clearTimeout(n),r&&r.disconnect(),r=null}function s(a,l){a===void 0&&(a=!1),l===void 0&&(l=1),o();let{left:u,top:f,width:p,height:c}=e.getBoundingClientRect();if(a||t(),!p||!c)return;let d=or(f),m=or(i.clientWidth-(u+p)),b=or(i.clientHeight-(f+c)),g=or(u),v={rootMargin:-d+"px "+-m+"px "+-b+"px "+-g+"px",threshold:Pe(0,sr(1,l))||1},_=!0;function A(C){let w=C[0].intersectionRatio;if(w!==l){if(!_)return s();w?s(!1,w):n=setTimeout(()=>{s(!1,1e-7)},100)}_=!1}try{r=new IntersectionObserver(A,{...v,root:i.ownerDocument})}catch{r=new IntersectionObserver(A,v)}r.observe(e)}return s(!0),o}function Hf(e,t,r,n){n===void 0&&(n={});let{ancestorScroll:i=!0,ancestorResize:o=!0,elementResize:s=typeof ResizeObserver=="function",layoutShift:a=typeof IntersectionObserver=="function",animationFrame:l=!1}=n,u=kn(e),f=i||o?[...u?mt(u):[],...mt(t)]:[];f.forEach(y=>{i&&y.addEventListener("scroll",r,{passive:!0}),o&&y.addEventListener("resize",r)});let p=u&&a?Uf(u,r):null,c=-1,d=null;s&&(d=new ResizeObserver(y=>{let[v]=y;v&&v.target===u&&d&&(d.unobserve(t),cancelAnimationFrame(c),c=requestAnimationFrame(()=>{d&&d.observe(t)})),r()}),u&&!l&&d.observe(u),d.observe(t));let m,b=l?Ne(e):null;l&&g();function g(){let y=Ne(e);b&&(y.x!==b.x||y.y!==b.y||y.width!==b.width||y.height!==b.height)&&r(),b=y,m=requestAnimationFrame(g)}return r(),()=>{f.forEach(y=>{i&&y.removeEventListener("scroll",r),o&&y.removeEventListener("resize",r)}),p&&p(),d&&d.disconnect(),d=null,l&&cancelAnimationFrame(m)}}var jf=(e,t,r)=>{let n=new Map,i={platform:Bf,...r},o={...i.platform,_c:n};return wf(e,t,{...i,platform:o})};function qf(e){e.magic("anchor",t=>{if(!t._x_anchor)throw"Alpine: No x-anchor directive found on element using $anchor...";return t._x_anchor}),e.interceptClone((t,r)=>{t&&t._x_anchor&&!r._x_anchor&&(r._x_anchor=t._x_anchor)}),e.directive("anchor",e.skipDuringClone((t,{expression:r,modifiers:n,value:i},{cleanup:o,evaluate:s})=>{let{placement:a,offsetValue:l,unstyled:u}=Vs(n);t._x_anchor=e.reactive({x:0,y:0});let f=s(r);if(!f)throw"Alpine: no element provided to x-anchor...";let p=()=>{let d;jf(f,t,{placement:a,middleware:[yf(),Sf({padding:5}),_f(l)]}).then(({x:m,y:b})=>{u||Ks(t,m,b),JSON.stringify({x:m,y:b})!==d&&(t._x_anchor.x=m,t._x_anchor.y=b),d=JSON.stringify({x:m,y:b})})},c=Hf(f,t,()=>p());o(()=>c())},(t,{expression:r,modifiers:n,value:i},{cleanup:o,evaluate:s})=>{let{placement:a,offsetValue:l,unstyled:u}=Vs(n);t._x_anchor&&(u||Ks(t,t._x_anchor.x,t._x_anchor.y))}))}function Ks(e,t,r){Object.assign(e.style,{left:t+"px",top:r+"px",position:"absolute"})}function Vs(e){let r=["top","top-start","top-end","right","right-start","right-end","bottom","bottom-start","bottom-end","left","left-start","left-end"].find(o=>e.includes(o)),n=0;if(e.includes("offset")){let o=e.findIndex(s=>s==="offset");n=e[o+1]!==void 0?Number(e[o+1]):n}let i=e.includes("no-style");return{placement:r,offsetValue:n,unstyled:i}}var oa=qf;var vt=class{constructor(t,r){this.url=t,this.html=r}},re={currentKey:null,currentUrl:null,keys:[],lookup:{},limit:10,has(e){return this.lookup[e]!==void 0},retrieve(e){let t=this.lookup[e];if(t===void 0)throw"No back button cache found for current location: "+e;return t},replace(e,t){this.has(e)?this.lookup[e]=t:this.push(e,t)},push(e,t){this.lookup[e]=t;let r=this.keys.indexOf(e);r>-1&&this.keys.splice(r,1),this.keys.unshift(e),this.trim()},trim(){for(let e of this.keys.splice(this.limit))delete this.lookup[e]}};function sa(){let e=new URL(window.location.href,document.baseURI);Ln(e,document.documentElement.outerHTML)}function aa(e,t){let r=document.documentElement.outerHTML;re.replace(e,new vt(t,r))}function la(e,t){let r;e(n=>r=n),window.addEventListener("popstate",n=>{let i=n.state||{},o=i.alpine||{};if(Object.keys(i).length!==0&&!!o.snapshotIdx)if(re.has(o.snapshotIdx)){let s=re.retrieve(o.snapshotIdx);t(s.html,s.url,re.currentUrl,re.currentKey)}else r(o.url)})}function ua(e,t){Wf(t,e)}function Wf(e,t){ca("pushState",e,t)}function Ln(e,t){ca("replaceState",e,t)}function ca(e,t,r){let n=t.toString()+"-"+Math.random();e==="pushState"?re.push(n,new vt(t,r)):re.replace(n=re.currentKey??n,new vt(t,r));let i=history.state||{};i.alpine||(i.alpine={}),i.alpine.snapshotIdx=n,i.alpine.url=t.toString();try{history[e](i,JSON.stringify(document.title),t),re.currentKey=n,re.currentUrl=t}catch(o){o instanceof DOMException&&o.name==="SecurityError"&&console.error("Livewire: You can't use wire:navigate with a link to a different root domain: "+t),console.error(o)}}function fa(e,t){let r=o=>!o.isTrusted,n=o=>o.which>1||o.altKey||o.ctrlKey||o.metaKey||o.shiftKey,i=o=>o.which!==13||o.altKey||o.ctrlKey||o.metaKey||o.shiftKey;e.addEventListener("click",o=>{if(r(o)){o.preventDefault(),t(s=>s());return}n(o)||o.preventDefault()}),e.addEventListener("mousedown",o=>{n(o)||(o.preventDefault(),t(s=>{let a=l=>{l.preventDefault(),s(),e.removeEventListener("mouseup",a)};e.addEventListener("mouseup",a)}))}),e.addEventListener("keydown",o=>{i(o)||(o.preventDefault(),t(s=>s()))})}function da(e,t=60,r){e.addEventListener("mouseenter",n=>{let i=setTimeout(()=>{r(n)},t),o=()=>{clearTimeout(i),e.removeEventListener("mouseleave",o)};e.addEventListener("mouseleave",o)})}function Pn(e){return ve(e.getAttribute("href"))}function ve(e){return e!==null&&new URL(e,document.baseURI)}function Xe(e){return e.pathname+e.search+e.hash}function pa(e,t){let r=Xe(e);Rn(r,(n,i)=>{t(n,i)})}function Rn(e,t){let r={headers:{"X-Livewire-Navigate":""}};P("navigate.request",{url:e,options:r});let n;fetch(e,r).then(i=>{let o=ve(e);return n=ve(i.url),o.pathname+o.search===n.pathname+n.search&&(n.hash=o.hash),i.text()}).then(i=>{t(i,n)})}var G={};function Nn(e,t){let r=Xe(e);G[r]||(G[r]={finished:!1,html:null,whenFinished:()=>{}},Rn(r,(n,i)=>{t(n,i)}))}function Mn(e,t,r){let n=G[Xe(t)];n.html=e,n.finished=!0,n.finalDestination=r,n.whenFinished()}function ha(e,t,r){let n=Xe(e);if(!G[n])return r();if(G[n].finished){let i=G[n].html,o=G[n].finalDestination;return delete G[n],t(i,o)}else G[n].whenFinished=()=>{let i=G[n].html,o=G[n].finalDestination;delete G[n],t(i,o)}}function In(e){S.mutateDom(()=>{e.querySelectorAll("[data-teleport-template]").forEach(t=>t._x_teleport.remove())})}function Fn(e){S.mutateDom(()=>{e.querySelectorAll("[data-teleport-target]").forEach(t=>t.remove())})}function $n(e){S.walk(e,(t,r)=>{!t._x_teleport||(t._x_teleportPutBack(),r())})}function ma(e){return e.hasAttribute("data-teleport-target")}function Dn(){document.body.setAttribute("data-scroll-x",document.body.scrollLeft),document.body.setAttribute("data-scroll-y",document.body.scrollTop),document.querySelectorAll(["[x-navigate\\:scroll]","[wire\\:scroll]"]).forEach(e=>{e.setAttribute("data-scroll-x",e.scrollLeft),e.setAttribute("data-scroll-y",e.scrollTop)})}function Bn(){let e=t=>{t.hasAttribute("data-scroll-x")?(t.scrollTo({top:Number(t.getAttribute("data-scroll-y")),left:Number(t.getAttribute("data-scroll-x")),behavior:"instant"}),t.removeAttribute("data-scroll-x"),t.removeAttribute("data-scroll-y")):window.scrollTo({top:0,left:0,behavior:"instant"})};queueMicrotask(()=>{queueMicrotask(()=>{e(document.body),document.querySelectorAll(["[x-navigate\\:scroll]","[wire\\:scroll]"]).forEach(e)})})}var bt={};function Un(e){bt={},document.querySelectorAll("[x-persist]").forEach(t=>{bt[t.getAttribute("x-persist")]=t,e(t),S.mutateDom(()=>{t.remove()})})}function Hn(e){let t=[];document.querySelectorAll("[x-persist]").forEach(r=>{let n=bt[r.getAttribute("x-persist")];!n||(t.push(r.getAttribute("x-persist")),n._x_wasPersisted=!0,e(n,r),S.mutateDom(()=>{r.replaceWith(n)}))}),Object.entries(bt).forEach(([r,n])=>{t.includes(r)||S.destroyTree(n)}),bt={}}function ga(e){return e.hasAttribute("x-persist")}var wt=vl(ba());wt.default.configure({minimum:.1,trickleSpeed:200,showSpinner:!1,parent:"body"});zf();var qn=!1;function wa(){qn=!0,setTimeout(()=>{!qn||wt.default.start()},150)}function ya(){qn=!1,wt.default.done()}function xa(){wt.default.remove()}function zf(){let e=document.createElement("style");e.innerHTML=`/* Make clicks pass-through */
 
     #nprogress {
       pointer-events: none;
@@ -82,8 +82,8 @@ Would you like to refresh the page?`)&&window.location.reload()}function bc(e){f
       0%   { transform: rotate(0deg); }
       100% { transform: rotate(360deg); }
     }
-    `;let t=oi();t&&(e.nonce=t),document.head.appendChild(e)}var Un=[],ma=["data-csrf","aria-hidden"];function Hn(e,t){let r=new DOMParser().parseFromString(e,"text/html"),n=document.adoptNode(r.body),i=document.adoptNode(r.head);Un=Un.concat(Array.from(document.body.querySelectorAll("script")).map(a=>wa(ya(a.outerHTML,ma))));let o=()=>{};Lf(i).finally(()=>{o()}),kf(n,Un);let s=document.body;document.body.replaceWith(n),Alpine.destroyTree(s),t(a=>o=a)}function kf(e,t){e.querySelectorAll("script").forEach(r=>{if(r.hasAttribute("data-navigate-once")){let n=wa(ya(r.outerHTML,ma));if(t.includes(n))return}r.replaceWith(ga(r))})}function Lf(e){let t=Array.from(document.head.children),r=t.map(s=>s.outerHTML),n=document.createDocumentFragment(),i=[],o=[];for(let s of Array.from(e.children))if(ha(s)){if(r.includes(s.outerHTML))n.appendChild(s);else if(va(s)&&Rf(s,t)&&setTimeout(()=>window.location.reload()),ba(s))try{o.push(Nf(ga(s)))}catch{}else document.head.appendChild(s);i.push(s)}for(let s of Array.from(document.head.children))ha(s)||s.remove();for(let s of Array.from(e.children))document.head.appendChild(s);return Promise.all(o)}async function Nf(e){return new Promise((t,r)=>{e.src?(e.onload=()=>t(),e.onerror=()=>r()):t(),document.head.appendChild(e)})}function ga(e){let t=document.createElement("script");t.textContent=e.textContent,t.async=e.async;for(let r of e.attributes)t.setAttribute(r.name,r.value);return t}function va(e){return e.hasAttribute("data-navigate-track")}function Rf(e,t){let[r,n]=pa(e);return t.some(i=>{if(!va(i))return!1;let[o,s]=pa(i);if(o===r&&n!==s)return!0})}function pa(e){return(ba(e)?e.src:e.href).split("?")}function ha(e){return e.tagName.toLowerCase()==="link"&&e.getAttribute("rel").toLowerCase()==="stylesheet"||e.tagName.toLowerCase()==="style"||e.tagName.toLowerCase()==="script"}function ba(e){return e.tagName.toLowerCase()==="script"}function wa(e){return e.split("").reduce((t,r)=>(t=(t<<5)-t+r.charCodeAt(0),t&t),0)}function ya(e,t){let r=e;return t.forEach(n=>{let i=new RegExp(`${n}="[^"]*"|${n}='[^']*'`,"g");r=r.replace(i,"")}),r=r.replaceAll(" ",""),r.trim()}var pr=!0,jn=!0,Pf=!0,xa=!1;function Aa(e){e.navigate=r=>{let n=be(r);ue("alpine:navigate",{url:n,history:!1,cached:!1})||t(n)},e.navigate.disableProgressBar=()=>{jn=!1},e.addInitSelector(()=>`[${e.prefixed("navigate")}]`),e.directive("navigate",(r,{modifiers:n})=>{n.includes("hover")&&na(r,60,()=>{let o=On(r);kn(o,(s,a)=>{Ln(s,o,a)})}),ra(r,o=>{let s=On(r);kn(s,(a,l)=>{Ln(a,s,l)}),o(()=>{ue("alpine:navigate",{url:s,history:!1,cached:!1})||t(s)})})});function t(r,n=!0){jn&&ca(),Mf(r,(i,o)=>{ue("alpine:navigating"),Pf&&Mn(),jn&&fa(),If(),Ys(),_a(e,s=>{pr&&Fn(a=>{Nn(a)}),n?ea(i,o):Cn(o,i),Hn(i,a=>{Rn(document.body),pr&&$n((l,u)=>{Pn(l)}),In(),a(()=>{s(()=>{setTimeout(()=>{xa&&Ea()}),Sa(e),ue("alpine:navigated")})})})})})}Zs(r=>{r(n=>{let i=be(n);if(ue("alpine:navigate",{url:i,history:!0,cached:!1}))return;t(i,!1)})},(r,n,i,o)=>{let s=be(n);ue("alpine:navigate",{url:s,history:!0,cached:!0})||(Mn(),ue("alpine:navigating"),Qs(i,o),_a(e,l=>{pr&&Fn(u=>{Nn(u)}),Hn(r,()=>{da(),Rn(document.body),pr&&$n((u,f)=>{Pn(u)}),In(),l(()=>{xa&&Ea(),Sa(e),ue("alpine:navigated")})})}))}),setTimeout(()=>{ue("alpine:navigated")})}function Mf(e,t){oa(e,t,()=>{ia(e,t)})}function _a(e,t){e.stopObservingMutations(),t(r=>{e.startObservingMutations(),queueMicrotask(()=>{r()})})}function ue(e,t){let r=new CustomEvent(e,{cancelable:!0,bubbles:!0,detail:t});return document.dispatchEvent(r),r.defaultPrevented}function Sa(e){e.initTree(document.body,void 0,(t,r)=>{t._x_wasPersisted&&r()})}function Ea(){document.querySelector("[autofocus]")&&document.querySelector("[autofocus]").focus()}function If(){let e=function(t,r){Alpine.walk(t,(n,i)=>{aa(n)&&i(),sa(n)?i():r(n,i)})};Alpine.destroyTree(document.body,e)}function qn(e){e.magic("queryString",(t,{interceptor:r})=>{let n,i=!1,o=!1;return r((s,a,l,u,f)=>{let p=n||u,{initial:c,replace:d,push:m,pop:b}=mr(p,s,i);return l(c),o?(e.effect(()=>m(a())),b(async g=>{l(g),await(()=>Promise.resolve())()})):e.effect(()=>d(a())),c},s=>{s.alwaysShow=()=>(i=!0,s),s.usePush=()=>(o=!0,s),s.as=a=>(n=a,s)})}),e.history={track:mr}}function mr(e,t,r=!1,n=null){let{has:i,get:o,set:s,remove:a}=$f(),l=new URL(window.location.href),u=i(l,e),f=u?o(l,e):t,p=JSON.stringify(f),c=[!1,null,void 0].includes(n)?t:JSON.stringify(n),d=y=>JSON.stringify(y)===p,m=y=>JSON.stringify(y)===c;r&&(l=s(l,e,f)),Ca(l,e,{value:f});let b=!1,g=(y,v)=>{if(b)return;let _=new URL(window.location.href);!r&&!u&&d(v)||v===void 0||!r&&m(v)?_=a(_,e):_=s(_,e,v),y(_,e,{value:v})};return{initial:f,replace(y){g(Ca,y)},push(y){g(Ff,y)},pop(y){let v=_=>{!_.state||!_.state.alpine||Object.entries(_.state.alpine).forEach(([T,{value:A}])=>{if(T!==e)return;b=!0;let w=y(A);w instanceof Promise?w.finally(()=>b=!1):b=!1})};return window.addEventListener("popstate",v),()=>window.removeEventListener("popstate",v)}}}function Ca(e,t,r){let n=window.history.state||{};n.alpine||(n.alpine={}),n.alpine[t]=Wn(r),window.history.replaceState(n,"",e.toString())}function Ff(e,t,r){let n=window.history.state||{};n.alpine||(n.alpine={}),n={alpine:{...n.alpine,[t]:Wn(r)}},window.history.pushState(n,"",e.toString())}function Wn(e){if(e!==void 0)return JSON.parse(JSON.stringify(e))}function $f(){return{has(e,t){let r=e.search;if(!r)return!1;let n=hr(r);return Object.keys(n).includes(t)},get(e,t){let r=e.search;return r?hr(r)[t]:!1},set(e,t,r){let n=hr(e.search);return n[t]=Ta(Wn(r)),e.search=Oa(n),e},remove(e,t){let r=hr(e.search);return delete r[t],e.search=Oa(r),e}}}function Ta(e){if(!_t(e))return e;for(let t in e)e[t]===null?delete e[t]:e[t]=Ta(e[t]);return e}function Oa(e){let t=i=>typeof i=="object"&&i!==null,r=(i,o={},s="")=>(Object.entries(i).forEach(([a,l])=>{let u=s===""?a:`${s}[${a}]`;l===null?o[u]="":t(l)?o={...o,...r(l,o,u)}:o[u]=encodeURIComponent(l).replaceAll("%20","+").replaceAll("%2C",",")}),o),n=r(e);return Object.entries(n).map(([i,o])=>`${i}=${o}`).join("&")}function hr(e){if(e=e.replace("?",""),e==="")return{};let t=(i,o,s)=>{let[a,l,...u]=i.split(".");if(!l)return s[i]=o;s[a]===void 0&&(s[a]=isNaN(l)?{}:[]),t([l,...u].join("."),o,s[a])},r=e.split("&").map(i=>i.split("=")),n=Object.create(null);return r.forEach(([i,o])=>{if(!(typeof o>"u"))if(o=decodeURIComponent(o.replaceAll("+","%20")),!i.includes("["))n[i]=o;else{let s=i.replaceAll("[",".").replaceAll("]","");t(s,o,n)}}),n}function zn(e,t,r){Uf();let n,i,o,s,a,l,u,f,p,c;function d(h={}){let x=L=>L.getAttribute("key"),O=()=>{};a=h.updating||O,l=h.updated||O,u=h.removing||O,f=h.removed||O,p=h.adding||O,c=h.added||O,o=h.key||x,s=h.lookahead||!1}function m(h,x){if(b(h,x))return g(h,x);let O=!1;if(!Ge(a,h,x,()=>O=!0)){if(h.nodeType===1&&window.Alpine&&(window.Alpine.cloneNode(h,x),h._x_teleport&&x._x_teleport&&m(h._x_teleport,x._x_teleport)),Bf(x)){y(h,x),l(h,x);return}O||v(h,x),l(h,x),_(h,x)}}function b(h,x){return h.nodeType!=x.nodeType||h.nodeName!=x.nodeName||T(h)!=T(x)}function g(h,x){if(Ge(u,h))return;let O=x.cloneNode(!0);Ge(p,O)||(h.replaceWith(O),f(h),c(O))}function y(h,x){let O=x.nodeValue;h.nodeValue!==O&&(h.nodeValue=O)}function v(h,x){if(h._x_transitioning||h._x_isShown&&!x._x_isShown||!h._x_isShown&&x._x_isShown)return;let O=Array.from(h.attributes),L=Array.from(x.attributes);for(let C=O.length-1;C>=0;C--){let E=O[C].name;x.hasAttribute(E)||h.removeAttribute(E)}for(let C=L.length-1;C>=0;C--){let E=L[C].name,U=L[C].value;h.getAttribute(E)!==U&&h.setAttribute(E,U)}}function _(h,x){let O=A(h.children),L={},C=La(x),E=La(h);for(;C;){Hf(C,E);let P=T(C),D=T(E);if(!E)if(P&&L[P]){let N=L[P];h.appendChild(N),E=N}else{if(!Ge(p,C)){let N=C.cloneNode(!0);h.appendChild(N),c(N)}C=X(x,C);continue}let q=N=>N&&N.nodeType===8&&N.textContent==="[if BLOCK]><![endif]",j=N=>N&&N.nodeType===8&&N.textContent==="[if ENDBLOCK]><![endif]";if(q(C)&&q(E)){let N=0,bt=E;for(;E;){let Y=X(h,E);if(q(Y))N++;else if(j(Y)&&N>0)N--;else if(j(Y)&&N===0){E=Y;break}E=Y}let Ga=E;N=0;let Xa=C;for(;C;){let Y=X(x,C);if(q(Y))N++;else if(j(Y)&&N>0)N--;else if(j(Y)&&N===0){C=Y;break}C=Y}let Ya=C,Qa=new Kn(bt,Ga),Za=new Kn(Xa,Ya);_(Qa,Za);continue}if(E.nodeType===1&&s&&!E.isEqualNode(C)){let N=X(x,C),bt=!1;for(;!bt&&N;)N.nodeType===1&&E.isEqualNode(N)&&(bt=!0,E=w(h,C,E),D=T(E)),N=X(x,N)}if(P!==D){if(!P&&D){L[D]=E,E=w(h,C,E),L[D].remove(),E=X(h,E),C=X(x,C);continue}if(P&&!D&&O[P]&&(E.replaceWith(O[P]),E=O[P]),P&&D){let N=O[P];if(N)L[D]=E,E.replaceWith(N),E=N;else{L[D]=E,E=w(h,C,E),L[D].remove(),E=X(h,E),C=X(x,C);continue}}}let we=E&&X(h,E);m(E,C),C=C&&X(x,C),E=we}let U=[];for(;E;)Ge(u,E)||U.push(E),E=X(h,E);for(;U.length;){let P=U.shift();P.remove(),f(P)}}function T(h){return h&&h.nodeType===1&&o(h)}function A(h){let x={};for(let O of h){let L=T(O);L&&(x[L]=O)}return x}function w(h,x,O){if(!Ge(p,x)){let L=x.cloneNode(!0);return h.insertBefore(L,O),c(L),L}return x}return d(r),n=e,i=typeof t=="string"?Df(t):t,window.Alpine&&window.Alpine.closestDataStack&&!e._x_dataStack&&(i._x_dataStack=window.Alpine.closestDataStack(e),i._x_dataStack&&window.Alpine.cloneNode(e,i)),m(e,i),n=void 0,i=void 0,e}zn.step=()=>{};zn.log=()=>{};function Ge(e,...t){let r=!1;return e(...t,()=>r=!0),r}var ka=!1;function Df(e){let t=document.createElement("template");return t.innerHTML=e,t.content.firstElementChild}function Bf(e){return e.nodeType===3||e.nodeType===8}var Kn=class{constructor(e,t){this.startComment=e,this.endComment=t}get children(){let e=[],t=this.startComment.nextSibling;for(;t&&t!==this.endComment;)e.push(t),t=t.nextSibling;return e}appendChild(e){this.endComment.before(e)}get firstChild(){let e=this.startComment.nextSibling;if(e!==this.endComment)return e}nextNode(e){let t=e.nextSibling;if(t!==this.endComment)return t}insertBefore(e,t){return t.before(e),e}};function La(e){return e.firstChild}function X(e,t){let r;return e instanceof Kn?r=e.nextNode(t):r=t.nextSibling,r}function Uf(){if(ka)return;ka=!0;let e=Element.prototype.setAttribute,t=document.createElement("div");Element.prototype.setAttribute=function(n,i){if(!n.includes("@"))return e.call(this,n,i);t.innerHTML=`<span ${n}="${i}"></span>`;let o=t.firstElementChild.getAttributeNode(n);t.firstElementChild.removeAttributeNode(o),this.setAttributeNode(o)}}function Hf(e,t){let r=t&&t._x_bindings&&t._x_bindings.id;!r||(e.setAttribute("id",r),e.id=r)}function jf(e){e.morph=zn}var Na=jf;function qf(e){e.directive("mask",(t,{value:r,expression:n},{effect:i,evaluateLater:o,cleanup:s})=>{let a=()=>n,l="";queueMicrotask(()=>{if(["function","dynamic"].includes(r)){let c=o(n);i(()=>{a=d=>{let m;return e.dontAutoEvaluateFunctions(()=>{c(b=>{m=typeof b=="function"?b(d):b},{scope:{$input:d,$money:Kf.bind({el:t})}})}),m},f(t,!1)})}else f(t,!1);t._x_model&&t._x_model.set(t.value)});let u=new AbortController;s(()=>{u.abort()}),t.addEventListener("input",()=>f(t),{signal:u.signal,capture:!0}),t.addEventListener("blur",()=>f(t,!1),{signal:u.signal});function f(c,d=!0){let m=c.value,b=a(m);if(!b||b==="false")return!1;if(l.length-c.value.length===1)return l=c.value;let g=()=>{l=c.value=p(m,b)};d?Wf(c,b,()=>{g()}):g()}function p(c,d){if(c==="")return"";let m=Ra(d,c);return Pa(d,m)}}).before("model")}function Wf(e,t,r){let n=e.selectionStart,i=e.value;r();let o=i.slice(0,n),s=Pa(t,Ra(t,o)).length;e.setSelectionRange(s,s)}function Ra(e,t){let r=t,n="",i={9:/[0-9]/,a:/[a-zA-Z]/,"*":/[a-zA-Z0-9]/},o="";for(let s=0;s<e.length;s++){if(["9","a","*"].includes(e[s])){o+=e[s];continue}for(let a=0;a<r.length;a++)if(r[a]===e[s]){r=r.slice(0,a)+r.slice(a+1);break}}for(let s=0;s<o.length;s++){let a=!1;for(let l=0;l<r.length;l++)if(i[o[s]].test(r[l])){n+=r[l],r=r.slice(0,l)+r.slice(l+1),a=!0;break}if(!a)break}return n}function Pa(e,t){let r=Array.from(t),n="";for(let i=0;i<e.length;i++){if(!["9","a","*"].includes(e[i])){n+=e[i];continue}if(r.length===0)break;n+=r.shift()}return n}function Kf(e,t=".",r,n=2){if(e==="-")return"-";if(/^\D+$/.test(e))return"9";r==null&&(r=t===","?".":",");let i=(l,u)=>{let f="",p=0;for(let c=l.length-1;c>=0;c--)l[c]!==u&&(p===3?(f=l[c]+u+f,p=0):f=l[c]+f,p++);return f},o=e.startsWith("-")?"-":"",s=e.replaceAll(new RegExp(`[^0-9\\${t}]`,"g"),""),a=Array.from({length:s.split(t)[0].length}).fill("9").join("");return a=`${o}${i(a,r)}`,n>0&&e.includes(t)&&(a+=`${t}`+"9".repeat(n)),queueMicrotask(()=>{this.el.value.endsWith(t)||this.el.value[this.el.selectionStart-1]===t&&this.el.setSelectionRange(this.el.selectionStart-1,this.el.selectionStart-1)}),a}var Ma=qf;function Ia(){setTimeout(()=>zf()),yt(document,"livewire:init"),yt(document,"livewire:initializing"),S.plugin(Na),S.plugin(qn),S.plugin(Ns),S.plugin(cs),S.plugin(Xs),S.plugin(Cs),S.plugin(Ls),S.plugin(Aa),S.plugin(Ma),S.addRootSelector(()=>"[wire\\:id]"),S.onAttributesAdded((e,t)=>{if(!Array.from(t).some(n=>We(n.name)))return;let r=K(e,!1);!r||t.forEach(n=>{if(!We(n.name))return;let i=Yt(e,n.name);R("directive.init",{el:e,component:r,directive:i,cleanup:o=>{S.onAttributeRemoved(e,i.raw,o)}})})}),S.interceptInit(S.skipDuringClone(e=>{if(!Array.from(e.attributes).some(r=>We(r.name)))return;if(e.hasAttribute("wire:id")){let r=es(e);S.onAttributeRemoved(e,"wire:id",()=>{ts(r.id)})}let t=K(e,!1);t&&(R("element.init",{el:e,component:t}),Array.from(e.getAttributeNames()).filter(n=>We(n)).map(n=>Yt(e,n)).forEach(n=>{R("directive.init",{el:e,component:t,directive:n,cleanup:i=>{S.onAttributeRemoved(e,n.raw,i)}})}))})),S.start(),setTimeout(()=>window.Livewire.initialRenderIsFinished=!0),yt(document,"livewire:initialized")}function zf(){let e=document.querySelector("script[data-update-uri][data-csrf]");if(!e)return;let t=e.closest("[wire\\:id]");t&&console.warn("Livewire: missing closing tags found. Ensure your template elements contain matching closing tags.",t)}k("effect",({component:e,effects:t})=>{Vf(e,t.listeners||[])});function Vf(e,t){t.forEach(r=>{let n=i=>{i.__livewire&&i.__livewire.receivedBy.push(e),e.$wire.call("__dispatch",r,i.detail||{})};window.addEventListener(r,n),e.addCleanup(()=>window.removeEventListener(r,n)),e.el.addEventListener(r,i=>{!i.__livewire||i.bubbles||(i.__livewire&&i.__livewire.receivedBy.push(e.id),e.$wire.call("__dispatch",r,i.detail||{}))})})}var Xe=new WeakMap,gr=new Set;k("payload.intercept",async({assets:e})=>{if(!!e)for(let[t,r]of Object.entries(e))await Xf(t,async()=>{await Yf(r)})});k("component.init",({component:e})=>{let t=e.snapshot.memo.assets;t&&t.forEach(r=>{gr.has(r)||gr.add(r)})});k("effect",({component:e,effects:t})=>{let r=t.scripts;r&&Object.entries(r).forEach(([n,i])=>{Jf(e,n,()=>{let o=Gf(i);S.dontAutoEvaluateFunctions(()=>{S.evaluate(e.el,o,{$wire:e.$wire})})})})});function Jf(e,t,r){if(Xe.has(e)&&Xe.get(e).includes(t))return;r(),Xe.has(e)||Xe.set(e,[]);let n=Xe.get(e);n.push(t),Xe.set(e,n)}function Gf(e){let r=/<script\b[^>]*>([\s\S]*?)<\/script>/gm.exec(e);return r&&r[1]?r[1].trim():""}async function Xf(e,t){gr.has(e)||(await t(),gr.add(e))}async function Yf(e){let t=new DOMParser().parseFromString(e,"text/html"),r=document.adoptNode(t.head);for(let n of r.children)try{await Qf(n)}catch{}}async function Qf(e){return new Promise((t,r)=>{if(Zf(e)){let n=ed(e);n.src?(n.onload=()=>t(),n.onerror=()=>r()):t(),document.head.appendChild(n)}else document.head.appendChild(e),t()})}function Zf(e){return e.tagName.toLowerCase()==="script"}function ed(e){let t=document.createElement("script");t.textContent=e.textContent,t.async=e.async;for(let r of e.attributes)t.setAttribute(r.name,r.value);return t}k("effect",({component:e,effects:t})=>{let r=t.js,n=t.xjs;r&&Object.entries(r).forEach(([i,o])=>{Yo(e,i,()=>{S.evaluate(e.el,o)})}),n&&n.forEach(i=>{S.evaluate(e.el,i)})});function $a(e,t,r){let n=t.parentElement?t.parentElement.tagName.toLowerCase():"div",i=document.createElement(n);i.innerHTML=r;let o;try{o=K(t.parentElement)}catch{}o&&(i.__livewire=o);let s=i.firstElementChild;s.__livewire=e,R("morph",{el:t,toEl:s,component:e}),S.morph(t,s,{updating:(a,l,u,f)=>{if(!Ye(a)){if(R("morph.updating",{el:a,toEl:l,component:e,skip:f,childrenOnly:u}),a.__livewire_replace===!0&&(a.innerHTML=l.innerHTML),a.__livewire_replace_self===!0)return a.outerHTML=l.outerHTML,f();if(a.__livewire_ignore===!0||(a.__livewire_ignore_self===!0&&u(),Fa(a)&&a.getAttribute("wire:id")!==e.id))return f();Fa(a)&&(l.__livewire=e)}},updated:a=>{Ye(a)||R("morph.updated",{el:a,component:e})},removing:(a,l)=>{Ye(a)||R("morph.removing",{el:a,component:e,skip:l})},removed:a=>{Ye(a)||R("morph.removed",{el:a,component:e})},adding:a=>{R("morph.adding",{el:a,component:e})},added:a=>{if(Ye(a))return;let l=K(a).id;R("morph.added",{el:a})},key:a=>{if(!Ye(a))return a.hasAttribute("wire:key")?a.getAttribute("wire:key"):a.hasAttribute("wire:id")?a.getAttribute("wire:id"):a.id},lookahead:!1})}function Ye(e){return typeof e.hasAttribute!="function"}function Fa(e){return e.hasAttribute("wire:id")}k("effect",({component:e,effects:t})=>{let r=t.html;!r||queueMicrotask(()=>{queueMicrotask(()=>{$a(e,e.el,r)})})});k("effect",({component:e,effects:t})=>{td(e,t.dispatches||[])});function td(e,t){t.forEach(({name:r,params:n={},self:i=!1,to:o})=>{i?oe(e,r,n):o?qe(o,r,n):Jt(e,r,n)})}var Vn=new wt;k("directive.init",({el:e,directive:t,cleanup:r,component:n})=>setTimeout(()=>{t.value==="submit"&&e.addEventListener("submit",()=>{let i=t.expression.startsWith("$parent")?n.parent.id:n.id,o=rd(e);Vn.add(i,o)})}));k("commit",({component:e,respond:t})=>{t(()=>{Vn.each(e.id,r=>r()),Vn.remove(e.id)})});function rd(e){let t=[];return S.walk(e,(r,n)=>{if(!!e.contains(r)){if(r.hasAttribute("wire:ignore"))return n();nd(r)?t.push(od(r)):id(r)&&t.push(sd(r))}}),()=>{for(;t.length>0;)t.shift()()}}function nd(e){let t=e.tagName.toLowerCase();return t==="select"||t==="button"&&e.type==="submit"||t==="input"&&(e.type==="checkbox"||e.type==="radio")}function id(e){return["input","textarea"].includes(e.tagName.toLowerCase())}function od(e){let t=e.disabled?()=>{}:()=>e.disabled=!1;return e.disabled=!0,t}function sd(e){let t=e.readOnly?()=>{}:()=>e.readOnly=!1;return e.readOnly=!0,t}k("commit.pooling",({commits:e})=>{e.forEach(t=>{let r=t.component;Ba(r,n=>{n.$wire.$commit()})})});k("commit.pooled",({pools:e})=>{ad(e).forEach(r=>{let n=r.component;Ba(n,i=>{ld(e,n,i)})})});function ad(e){let t=[];return e.forEach(r=>{r.commits.forEach(n=>{t.push(n)})}),t}function ld(e,t,r){let n=Da(e,t),i=Da(e,r),o=i.findCommitByComponent(r);i.delete(o),n.add(o),e.forEach(s=>{s.empty()&&e.delete(s)})}function Da(e,t){for(let[r,n]of e.entries())if(n.hasCommitFor(t))return n}function Ba(e,t){Ua(e,r=>{(ud(r)||cd(r))&&t(r)})}function ud(e){return!!e.snapshot.memo.props}function cd(e){return!!e.snapshot.memo.bindings}function Ua(e,t){e.children.forEach(r=>{t(r),Ua(r,t)})}k("commit",({succeed:e})=>{e(({effects:t})=>{let r=t.download;if(!r)return;let n=window.webkitURL||window.URL,i=n.createObjectURL(fd(r.content,r.contentType)),o=document.createElement("a");o.style.display="none",o.href=i,o.download=r.name,document.body.appendChild(o),o.click(),setTimeout(function(){n.revokeObjectURL(i)},0)})});function fd(e,t="",r=512){let n=atob(e),i=[];t===null&&(t="");for(let o=0;o<n.length;o+=r){let s=n.slice(o,o+r),a=new Array(s.length);for(let u=0;u<s.length;u++)a[u]=s.charCodeAt(u);let l=new Uint8Array(a);i.push(l)}return new Blob(i,{type:t})}var Jn=new WeakSet,Gn=new WeakSet;k("component.init",({component:e})=>{let t=e.snapshot.memo;t.lazyLoaded!==void 0&&(Gn.add(e),t.lazyIsolated!==void 0&&t.lazyIsolated===!1&&Jn.add(e))});k("commit.pooling",({commits:e})=>{e.forEach(t=>{!Gn.has(t.component)||(Jn.has(t.component)?(t.isolate=!1,Jn.delete(t.component)):t.isolate=!0,Gn.delete(t.component))})});k("effect",({component:e,effects:t,cleanup:r})=>{let n=t.url;!n||Object.entries(n).forEach(([i,o])=>{let{name:s,as:a,use:l,alwaysShow:u,except:f}=dd(i,o);a||(a=s);let p=[!1,null,void 0].includes(f)?W(e.ephemeral,s):f,{replace:c,push:d,pop:m}=mr(a,p,u,f);if(l==="replace"){let b=S.effect(()=>{c(W(e.reactive,s))});r(()=>S.release(b))}else if(l==="push"){let b=k("commit",({component:y,succeed:v})=>{if(e!==y)return;let _=W(e.canonical,s);v(()=>{let T=W(e.canonical,s);JSON.stringify(_)!==JSON.stringify(T)&&d(T)})}),g=m(async y=>{await e.$wire.set(s,y),document.querySelectorAll("input").forEach(v=>{v._x_forceModelUpdate&&v._x_forceModelUpdate(v._x_model.get())})});r(()=>{b(),g()})}})});function dd(e,t){let r={use:"replace",alwaysShow:!1};return typeof t=="string"?{...r,name:t,as:t}:{...{...r,name:e,as:e},...t}}k("request",({options:e})=>{window.Echo&&(e.headers["X-Socket-ID"]=window.Echo.socketId())});k("effect",({component:e,effects:t})=>{(t.listeners||[]).forEach(n=>{if(n.startsWith("echo")){if(typeof window.Echo>"u"){console.warn("Laravel Echo cannot be found");return}let i=n.split(/(echo:|echo-)|:|,/);i[1]=="echo:"&&i.splice(2,0,"channel",void 0),i[2]=="notification"&&i.push(void 0,void 0);let[o,s,a,l,u,f,p]=i;if(["channel","private","encryptedPrivate"].includes(a)){let c=d=>oe(e,n,[d]);window.Echo[a](u).listen(p,c),e.addCleanup(()=>{window.Echo[a](u).stopListening(p,c)})}else if(a=="presence")if(["here","joining","leaving"].includes(p))window.Echo.join(u)[p](c=>{oe(e,n,[c])});else{let c=d=>oe(e,n,[d]);window.Echo.join(u).listen(p,c),e.addCleanup(()=>{window.Echo.leaveChannel(u)})}else a=="notification"?window.Echo.private(u).notification(c=>{oe(e,n,[c])}):console.warn("Echo channel type not yet supported")}})});var Ha=new WeakSet;k("component.init",({component:e})=>{e.snapshot.memo.isolate===!0&&Ha.add(e)});k("commit.pooling",({commits:e})=>{e.forEach(t=>{!Ha.has(t.component)||(t.isolate=!0)})});pd()&&Alpine.navigate.disableProgressBar();document.addEventListener("alpine:navigate",e=>Xn("livewire:navigate",e));document.addEventListener("alpine:navigating",e=>Xn("livewire:navigating",e));document.addEventListener("alpine:navigated",e=>Xn("livewire:navigated",e));function Xn(e,t){let r=new CustomEvent(e,{cancelable:!0,bubbles:!0,detail:t.detail});document.dispatchEvent(r),r.defaultPrevented&&t.preventDefault()}function ja(e,t,r){e.redirectUsingNavigate?Alpine.navigate(t):r()}function pd(){return!!(document.querySelector("[data-no-progress-bar]")||window.livewireScriptConfig&&window.livewireScriptConfig.progressBar===!1)}k("effect",({effects:e})=>{if(!e.redirect)return;let t=e.redirect;ja(e,t,()=>{window.location.href=t})});k("morph.added",({el:e})=>{e.__addedByMorph=!0});I("transition",({el:e,directive:t,component:r,cleanup:n})=>{let i=S.reactive({state:!e.__addedByMorph});S.bind(e,{[t.rawName.replace("wire:","x-")]:"","x-show"(){return i.state}}),e.__addedByMorph&&setTimeout(()=>i.state=!0);let o=[];o.push(k("morph.removing",({el:s,skip:a})=>{a(),s.addEventListener("transitionend",()=>{s.remove()}),i.state=!1,o.push(k("morph",({component:l})=>{l===r&&(s.remove(),o.forEach(u=>u()))}))})),n(()=>o.forEach(s=>s()))});var hd=new Fe;function qa(e,t){hd.each(e,r=>{r.callback(),r.callback=()=>{}}),t()}k("directive.init",({el:e,directive:t,cleanup:r,component:n})=>{if(["snapshot","effects","model","init","loading","poll","ignore","id","data","key","target","dirty"].includes(t.value)||ls(t.value))return;let i=t.rawName.replace("wire:","x-on:");t.value==="submit"&&!t.modifiers.includes("prevent")&&(i=i+".prevent");let o=S.bind(e,{[i](s){let a=()=>{qa(n,()=>{S.evaluate(e,"$wire."+t.expression,{scope:{$event:s}})})};e.__livewire_confirm?e.__livewire_confirm(()=>{a()},()=>{s.stopImmediatePropagation()}):a()}});r(o)});S.addInitSelector(()=>"[wire\\:navigate]");S.addInitSelector(()=>"[wire\\:navigate\\.hover]");S.interceptInit(S.skipDuringClone(e=>{e.hasAttribute("wire:navigate")?S.bind(e,{["x-navigate"]:!0}):e.hasAttribute("wire:navigate.hover")&&S.bind(e,{["x-navigate.hover"]:!0})}));document.addEventListener("alpine:navigating",()=>{Livewire.all().forEach(e=>{e.inscribeSnapshotAndEffectsOnElement()})});I("confirm",({el:e,directive:t})=>{let r=t.expression,n=t.modifiers.includes("prompt");r=r.replaceAll("\\n",`
-`),r===""&&(r="Are you sure?"),e.__livewire_confirm=(i,o)=>{if(n){let[s,a]=r.split("|");a?prompt(s)===a?i():o():console.warn("Livewire: Must provide expectation with wire:confirm.prompt")}else confirm(r)?i():o()}});function ne(e,t,r,n=null){if(r=t.modifiers.includes("remove")?!r:r,t.modifiers.includes("class")){let i=t.expression.split(" ").filter(String);r?e.classList.add(...i):e.classList.remove(...i)}else if(t.modifiers.includes("attr"))r?e.setAttribute(t.expression,!0):e.removeAttribute(t.expression);else{let i=n??window.getComputedStyle(e,null).getPropertyValue("display"),o=["inline","block","table","flex","grid","inline-flex"].filter(s=>t.modifiers.includes(s))[0]||"inline-block";o=t.modifiers.includes("remove")&&!r?i:o,e.style.display=r?o:"none"}}var Yn=new Set,Qn=new Set;window.addEventListener("offline",()=>Yn.forEach(e=>e()));window.addEventListener("online",()=>Qn.forEach(e=>e()));I("offline",({el:e,directive:t,cleanup:r})=>{let n=()=>ne(e,t,!0),i=()=>ne(e,t,!1);Yn.add(n),Qn.add(i),r(()=>{Yn.delete(n),Qn.delete(i)})});I("loading",({el:e,directive:t,component:r,cleanup:n})=>{let{targets:i,inverted:o}=wd(e),[s,a]=md(t),l=gd(r,i,o,[()=>s(()=>ne(e,t,!0)),()=>a(()=>ne(e,t,!1))]),u=vd(r,i,[()=>s(()=>ne(e,t,!0)),()=>a(()=>ne(e,t,!1))]);n(()=>{l(),u()})});function md(e){if(!e.modifiers.includes("delay")||e.modifiers.includes("none"))return[o=>o(),o=>o()];let t=200,r={shortest:50,shorter:100,short:150,default:200,long:300,longer:500,longest:1e3};Object.keys(r).some(o=>{if(e.modifiers.includes(o))return t=r[o],!0});let n,i=!1;return[o=>{n=setTimeout(()=>{o(),i=!0},t)},async o=>{i?(await o(),i=!1):clearTimeout(n)}]}function gd(e,t,r,[n,i]){return k("commit",({component:o,commit:s,respond:a})=>{o===e&&(t.length>0&&bd(s,t)===r||(n(),a(()=>{i()})))})}function vd(e,t,[r,n]){let i=l=>{let{id:u,property:f}=l.detail;return u!==e.id||t.length>0&&!t.map(p=>p.target).includes(f)},o=xt(window,"livewire-upload-start",l=>{i(l)||r()}),s=xt(window,"livewire-upload-finish",l=>{i(l)||n()}),a=xt(window,"livewire-upload-error",l=>{i(l)||n()});return()=>{o(),s(),a()}}function bd(e,t){let{updates:r,calls:n}=e;return t.some(({target:i,params:o})=>{if(o)return n.some(({method:a,params:l})=>i===a&&o===Wa(JSON.stringify(l)));if(Object.keys(r).some(a=>a.includes(".")&&a.split(".")[0]===i?!0:a===i)||n.map(a=>a.method).includes(i))return!0})}function wd(e){let t=Ke(e),r=[],n=!1;if(t.has("target")){let i=t.get("target"),o=i.expression;i.modifiers.includes("except")&&(n=!0),o.includes("(")&&o.includes(")")?r.push({target:i.method,params:Wa(JSON.stringify(i.params))}):o.includes(",")?o.split(",").map(s=>s.trim()).forEach(s=>{r.push({target:s})}):r.push({target:o})}else{let i=["init","dirty","offline","target","loading","poll","ignore","key","id"];t.all().filter(o=>!i.includes(o.value)).map(o=>o.expression.split("(")[0]).forEach(o=>r.push({target:o}))}return{targets:r,inverted:n}}function Wa(e){return btoa(encodeURIComponent(e))}I("stream",({el:e,directive:t,cleanup:r})=>{let{expression:n,modifiers:i}=t,o=k("stream",({name:s,content:a,replace:l})=>{s===n&&(i.includes("replace")||l?e.innerHTML=a:e.innerHTML=e.innerHTML+a)});r(o)});k("request",({respond:e})=>{e(t=>{let r=t.response;!r.headers.has("X-Livewire-Stream")||(t.response={ok:!0,redirected:!1,status:200,async text(){let n=await yd(r,i=>{R("stream",i)});return Et(n)&&(this.ok=!1),n}})})});async function yd(e,t){let r=e.body.getReader(),n="";for(;;){let{done:i,value:o}=await r.read(),a=new TextDecoder().decode(o),[l,u]=xd(n+a);if(l.forEach(f=>{t(f)}),n=u,i)return n}}function xd(e){let t=/({"stream":true.*?"endStream":true})/g,r=e.match(t),n=[];if(r)for(let o=0;o<r.length;o++)n.push(JSON.parse(r[o]).body);let i=e.replace(t,"");return[n,i]}I("replace",({el:e,directive:t})=>{t.modifiers.includes("self")?e.__livewire_replace_self=!0:e.__livewire_replace=!0});I("ignore",({el:e,directive:t})=>{t.modifiers.includes("self")?e.__livewire_ignore_self=!0:e.__livewire_ignore=!0});var Ka=new Fe;k("commit",({component:e,respond:t})=>{t(()=>{setTimeout(()=>{Ka.each(e,r=>r(!1))})})});I("dirty",({el:e,directive:t,component:r})=>{let n=_d(e),i=Alpine.reactive({state:!1}),o=!1,s=e.style.display,a=l=>{ne(e,t,l,s),o=l};Ka.add(r,a),Alpine.effect(()=>{let l=!1;if(n.length===0)l=JSON.stringify(r.canonical)!==JSON.stringify(r.reactive);else for(let u=0;u<n.length&&!l;u++){let f=n[u];l=JSON.stringify(W(r.canonical,f))!==JSON.stringify(W(r.reactive,f))}o!==l&&a(l),o=l})});function _d(e){let t=Ke(e),r=[];return t.has("model")&&r.push(t.get("model").expression),t.has("target")&&(r=r.concat(t.get("target").expression.split(",").map(n=>n.trim()))),r}I("model",({el:e,directive:t,component:r,cleanup:n})=>{let{expression:i,modifiers:o}=t;if(!i)return console.warn("Livewire: [wire:model] is missing a value.",e);if(za(r,i))return console.warn('Livewire: [wire:model="'+i+'"] property does not exist on component: ['+r.name+"]",e);if(e.type&&e.type.toLowerCase()==="file")return li(e,i,r,n);let s=o.includes("live"),a=o.includes("lazy")||o.includes("change"),l=o.includes("blur"),u=o.includes("debounce"),f=i.startsWith("$parent")?()=>r.$wire.$parent.$commit():()=>r.$wire.$commit(),p=Ed(e)&&!u&&s?Ad(f,150):f;S.bind(e,{["@change"](){a&&f()},["@blur"](){l&&f()},["x-model"+Sd(o)](){return{get(){return W(r.$wire,i)},set(c){ye(r.$wire,i,c),s&&!a&&!l&&p()}}}})});function Sd(e){return e=e.filter(t=>!["lazy","defer"].includes(t)),e.length===0?"":"."+e.join(".")}function Ed(e){return["INPUT","TEXTAREA"].includes(e.tagName.toUpperCase())&&!["checkbox","radio"].includes(e.type)}function za(e,t){if(t.startsWith("$parent")){let n=K(e.el.parentElement,!1);return n?za(n,t.split("$parent.")[1]):!0}let r=t.split(".")[0];return!Object.keys(e.canonical).includes(r)}function Ad(e,t){var r;return function(){var n=this,i=arguments,o=function(){r=null,e.apply(n,i)};clearTimeout(r),r=setTimeout(o,t)}}I("init",({el:e,directive:t})=>{let r=t.expression??"$refresh";S.evaluate(e,`$wire.${r}`)});I("poll",({el:e,directive:t})=>{let r=Fd(t.modifiers,2e3),{start:n,pauseWhile:i,throttleWhile:o,stopWhen:s}=Od(()=>{Cd(e,t)},r);n(),o(()=>Ld()&&Rd(t)),i(()=>Pd(t)&&Md(e)),i(()=>Nd(e)),i(()=>kd()),s(()=>Id(e))});function Cd(e,t){S.evaluate(e,t.expression?"$wire."+t.expression:"$wire.$commit()")}function Od(e,t=2e3){let r=[],n=[],i=[];return{start(){let o=Td(t,()=>{if(i.some(s=>s()))return o();r.some(s=>s())||n.some(s=>s())&&Math.random()<.95||e()})},pauseWhile(o){r.push(o)},throttleWhile(o){n.push(o)},stopWhen(o){i.push(o)}}}var Me=[];function Td(e,t){if(!Me[e]){let r={timer:setInterval(()=>r.callbacks.forEach(n=>n()),e),callbacks:new Set};Me[e]=r}return Me[e].callbacks.add(t),()=>{Me[e].callbacks.delete(t),Me[e].callbacks.size===0&&(clearInterval(Me[e].timer),delete Me[e])}}var Zn=!1;window.addEventListener("offline",()=>Zn=!0);window.addEventListener("online",()=>Zn=!1);function kd(){return Zn}var Va=!1;document.addEventListener("visibilitychange",()=>{Va=document.hidden},!1);function Ld(){return Va}function Nd(e){return!Ke(e).has("poll")}function Rd(e){return!e.modifiers.includes("keep-alive")}function Pd(e){return e.modifiers.includes("visible")}function Md(e){let t=e.getBoundingClientRect();return!(t.top<(window.innerHeight||document.documentElement.clientHeight)&&t.left<(window.innerWidth||document.documentElement.clientWidth)&&t.bottom>0&&t.right>0)}function Id(e){return e.isConnected===!1}function Fd(e,t){let r,n=e.find(o=>o.match(/([0-9]+)ms/)),i=e.find(o=>o.match(/([0-9]+)s/));return n?r=Number(n.replace("ms","")):i&&(r=Number(i.replace("s",""))*1e3),r||t}var Ja={directive:I,dispatchTo:qe,start:Ia,first:is,find:ns,getByName:rs,all:os,hook:k,trigger:R,triggerAsync:Wt,dispatch:ss,on:as,get navigate(){return S.navigate}},ei=e=>console.warn(`Detected multiple instances of ${e} running`);window.Livewire&&ei("Livewire");window.Alpine&&ei("Alpine");window.Livewire=Ja;window.Alpine=S;window.livewireScriptConfig===void 0&&(window.Alpine.__fromLivewire=!0,document.addEventListener("DOMContentLoaded",()=>{window.Alpine.__fromLivewire===void 0&&ei("Alpine"),Ja.start()}));})();
+    `;let t=di();t&&(e.nonce=t),document.head.appendChild(e)}function Wn(e){!_a()||e.querySelectorAll(":popover-open").forEach(t=>{t.setAttribute("data-navigate-popover-open","");let r=t.getAnimations();t._pausedAnimations=r.map(n=>({keyframes:n.effect.getKeyframes(),options:{duration:n.effect.getTiming().duration,easing:n.effect.getTiming().easing,fill:n.effect.getTiming().fill,iterations:n.effect.getTiming().iterations},currentTime:n.currentTime,playState:n.playState})),r.forEach(n=>n.pause())})}function zn(e){!_a()||e.querySelectorAll("[data-navigate-popover-open]").forEach(t=>{t.removeAttribute("data-navigate-popover-open"),queueMicrotask(()=>{!t.isConnected||(t.showPopover(),t.getAnimations().forEach(r=>r.finish()),t._pausedAnimations&&(t._pausedAnimations.forEach(({keyframes:r,options:n,currentTime:i,now:o,playState:s})=>{let a=t.animate(r,n);a.currentTime=i}),delete t._pausedAnimations))})})}function _a(){return typeof document.createElement("div").showPopover=="function"}var Kn=[],Aa=["data-csrf","aria-hidden"];function Vn(e,t){let r=new DOMParser().parseFromString(e,"text/html"),n=document.adoptNode(r.body),i=document.adoptNode(r.head);Kn=Kn.concat(Array.from(document.body.querySelectorAll("script")).map(a=>ka(La(a.outerHTML,Aa))));let o=()=>{};Vf(i).finally(()=>{o()}),Kf(n,Kn);let s=document.body;document.body.replaceWith(n),Alpine.destroyTree(s),t(a=>o=a)}function Kf(e,t){e.querySelectorAll("script").forEach(r=>{if(r.hasAttribute("data-navigate-once")){let n=ka(La(r.outerHTML,Aa));if(t.includes(n))return}r.replaceWith(Ca(r))})}function Vf(e){let t=Array.from(document.head.children),r=t.map(s=>s.outerHTML),n=document.createDocumentFragment(),i=[],o=[];for(let s of Array.from(e.children))if(Ea(s)){if(r.includes(s.outerHTML))n.appendChild(s);else if(Oa(s)&&Gf(s,t)&&setTimeout(()=>window.location.reload()),Ta(s))try{o.push(Jf(Ca(s)))}catch{}else document.head.appendChild(s);i.push(s)}for(let s of Array.from(document.head.children))Ea(s)||s.remove();for(let s of Array.from(e.children))s.tagName.toLowerCase()!=="noscript"&&document.head.appendChild(s);return Promise.all(o)}async function Jf(e){return new Promise((t,r)=>{e.src?(e.onload=()=>t(),e.onerror=()=>r()):t(),document.head.appendChild(e)})}function Ca(e){let t=document.createElement("script");t.textContent=e.textContent,t.async=e.async;for(let r of e.attributes)t.setAttribute(r.name,r.value);return t}function Oa(e){return e.hasAttribute("data-navigate-track")}function Gf(e,t){let[r,n]=Sa(e);return t.some(i=>{if(!Oa(i))return!1;let[o,s]=Sa(i);if(o===r&&n!==s)return!0})}function Sa(e){return(Ta(e)?e.src:e.href).split("?")}function Ea(e){return e.tagName.toLowerCase()==="link"&&e.getAttribute("rel").toLowerCase()==="stylesheet"||e.tagName.toLowerCase()==="style"||e.tagName.toLowerCase()==="script"}function Ta(e){return e.tagName.toLowerCase()==="script"}function ka(e){return e.split("").reduce((t,r)=>(t=(t<<5)-t+r.charCodeAt(0),t&t),0)}function La(e,t){let r=e;return t.forEach(n=>{let i=new RegExp(`${n}="[^"]*"|${n}='[^']*'`,"g");r=r.replace(i,"")}),r=r.replaceAll(" ",""),r.trim()}var mr=!0,Jn=!0,Xf=!0,Pa=!1;function Ia(e){e.navigate=r=>{let n=ve(r);ue("alpine:navigate",{url:n,history:!1,cached:!1})||t(n)},e.navigate.disableProgressBar=()=>{Jn=!1},e.addInitSelector(()=>`[${e.prefixed("navigate")}]`),e.directive("navigate",(r,{modifiers:n})=>{n.includes("hover")&&da(r,60,()=>{let o=Pn(r);!o||Nn(o,(s,a)=>{Mn(s,o,a)})}),fa(r,o=>{let s=Pn(r);!s||(Nn(s,(a,l)=>{Mn(a,s,l)}),o(()=>{ue("alpine:navigate",{url:s,history:!1,cached:!1})||t(s)}))})});function t(r,n=!0){Jn&&wa(),Yf(r,(i,o)=>{ue("alpine:navigating"),Xf&&Dn(),Jn&&ya(),Qf(),sa(),Ra(e,s=>{mr&&Un(a=>{In(a),Wn(a)}),n?ua(i,o):Ln(o,i),Vn(i,a=>{Fn(document.body),mr&&Hn((l,u)=>{$n(l),zn(l)}),Bn(),a(()=>{s(()=>{setTimeout(()=>{Pa&&Ma()}),Na(e),ue("alpine:navigated")})})})})})}la(r=>{r(n=>{let i=ve(n);if(ue("alpine:navigate",{url:i,history:!0,cached:!1}))return;t(i,!1)})},(r,n,i,o)=>{let s=ve(n);ue("alpine:navigate",{url:s,history:!0,cached:!0})||(Dn(),ue("alpine:navigating"),aa(i,o),Ra(e,l=>{mr&&Un(u=>{In(u),Wn(u)}),Vn(r,()=>{xa(),Fn(document.body),mr&&Hn((u,f)=>{$n(u),zn(u)}),Bn(),l(()=>{Pa&&Ma(),Na(e),ue("alpine:navigated")})})}))}),setTimeout(()=>{ue("alpine:navigated")})}function Yf(e,t){ha(e,t,()=>{pa(e,t)})}function Ra(e,t){e.stopObservingMutations(),t(r=>{e.startObservingMutations(),queueMicrotask(()=>{r()})})}function ue(e,t){let r=new CustomEvent(e,{cancelable:!0,bubbles:!0,detail:t});return document.dispatchEvent(r),r.defaultPrevented}function Na(e){e.initTree(document.body,void 0,(t,r)=>{t._x_wasPersisted&&r()})}function Ma(){document.querySelector("[autofocus]")&&document.querySelector("[autofocus]").focus()}function Qf(){let e=function(t,r){Alpine.walk(t,(n,i)=>{ga(n)&&i(),ma(n)?i():r(n,i)})};Alpine.destroyTree(document.body,e)}function Gn(e){e.magic("queryString",(t,{interceptor:r})=>{let n,i=!1,o=!1;return r((s,a,l,u,f)=>{let p=n||u,{initial:c,replace:d,push:m,pop:b}=vr(p,s,i);return l(c),o?(e.effect(()=>m(a())),b(async g=>{l(g),await(()=>Promise.resolve())()})):e.effect(()=>d(a())),c},s=>{s.alwaysShow=()=>(i=!0,s),s.usePush=()=>(o=!0,s),s.as=a=>(n=a,s)})}),e.history={track:vr}}function vr(e,t,r=!1,n=null){let{has:i,get:o,set:s,remove:a}=ed(),l=new URL(window.location.href),u=i(l,e),f=u?o(l,e):t,p=JSON.stringify(f),c=[!1,null,void 0].includes(n)?t:JSON.stringify(n),d=y=>JSON.stringify(y)===p,m=y=>JSON.stringify(y)===c;r&&(l=s(l,e,f)),Fa(l,e,{value:f});let b=!1,g=(y,v)=>{if(b)return;let _=new URL(window.location.href);!r&&!u&&d(v)||v===void 0||!r&&m(v)?_=a(_,e):_=s(_,e,v),y(_,e,{value:v})};return{initial:f,replace(y){g(Fa,y)},push(y){g(Zf,y)},pop(y){let v=_=>{!_.state||!_.state.alpine||Object.entries(_.state.alpine).forEach(([A,{value:C}])=>{if(A!==e)return;b=!0;let w=y(C);w instanceof Promise?w.finally(()=>b=!1):b=!1})};return window.addEventListener("popstate",v),()=>window.removeEventListener("popstate",v)}}}function Fa(e,t,r){let n=window.history.state||{};n.alpine||(n.alpine={}),n.alpine[t]=Xn(r),window.history.replaceState(n,"",e.toString())}function Zf(e,t,r){let n=window.history.state||{};n.alpine||(n.alpine={}),n={alpine:{...n.alpine,[t]:Xn(r)}},window.history.pushState(n,"",e.toString())}function Xn(e){if(e!==void 0)return JSON.parse(JSON.stringify(e))}function ed(){return{has(e,t){let r=e.search;if(!r)return!1;let n=gr(r,t);return Object.keys(n).includes(t)},get(e,t){let r=e.search;return r?gr(r,t)[t]:!1},set(e,t,r){let n=gr(e.search,t);return n[t]=Da(Xn(r)),e.search=$a(n),e},remove(e,t){let r=gr(e.search,t);return delete r[t],e.search=$a(r),e}}}function Da(e){if(!Et(e))return e;for(let t in e)e[t]===null?delete e[t]:e[t]=Da(e[t]);return e}function $a(e){let t=i=>typeof i=="object"&&i!==null,r=(i,o={},s="")=>(Object.entries(i).forEach(([a,l])=>{let u=s===""?a:`${s}[${a}]`;l===null?o[u]="":t(l)?o={...o,...r(l,o,u)}:o[u]=encodeURIComponent(l).replaceAll("%20","+").replaceAll("%2C",",")}),o),n=r(e);return Object.entries(n).map(([i,o])=>`${i}=${o}`).join("&")}function gr(e,t){if(e=e.replace("?",""),e==="")return{};let r=(o,s,a)=>{let[l,u,...f]=o.split(".");if(!u)return a[o]=s;a[l]===void 0&&(a[l]=isNaN(u)?{}:[]),r([u,...f].join("."),s,a[l])},n=e.split("&").map(o=>o.split("=")),i=Object.create(null);return n.forEach(([o,s])=>{if(typeof s>"u")return;s=decodeURIComponent(s.replaceAll("+","%20"));let a=decodeURIComponent(o);if(!(a.includes("[")&&a.startsWith(t)))i[o]=s;else{let u=a.replaceAll("[",".").replaceAll("]","");r(u,s,i)}}),i}function Qn(e,t,r){nd();let n,i,o,s,a,l,u,f,p,c;function d(h={}){let x=L=>L.getAttribute("key"),T=()=>{};a=h.updating||T,l=h.updated||T,u=h.removing||T,f=h.removed||T,p=h.adding||T,c=h.added||T,o=h.key||x,s=h.lookahead||!1}function m(h,x){if(b(h,x))return g(h,x);let T=!1;if(!Ye(a,h,x,()=>T=!0)){if(h.nodeType===1&&window.Alpine&&(window.Alpine.cloneNode(h,x),h._x_teleport&&x._x_teleport&&m(h._x_teleport,x._x_teleport)),rd(x)){y(h,x),l(h,x);return}T||v(h,x),l(h,x),_(h,x)}}function b(h,x){return h.nodeType!=x.nodeType||h.nodeName!=x.nodeName||A(h)!=A(x)}function g(h,x){if(Ye(u,h))return;let T=x.cloneNode(!0);Ye(p,T)||(h.replaceWith(T),f(h),c(T))}function y(h,x){let T=x.nodeValue;h.nodeValue!==T&&(h.nodeValue=T)}function v(h,x){if(h._x_transitioning||h._x_isShown&&!x._x_isShown||!h._x_isShown&&x._x_isShown)return;let T=Array.from(h.attributes),L=Array.from(x.attributes);for(let O=T.length-1;O>=0;O--){let E=T[O].name;x.hasAttribute(E)||h.removeAttribute(E)}for(let O=L.length-1;O>=0;O--){let E=L[O].name,U=L[O].value;h.getAttribute(E)!==U&&h.setAttribute(E,U)}}function _(h,x){let T=C(h.children),L={},O=Ua(x),E=Ua(h);for(;O;){id(O,E);let N=A(O),$=A(E);if(!E)if(N&&L[N]){let R=L[N];h.appendChild(R),E=R,$=A(E)}else{if(!Ye(p,O)){let R=O.cloneNode(!0);h.appendChild(R),c(R)}O=X(x,O);continue}let q=R=>R&&R.nodeType===8&&R.textContent==="[if BLOCK]><![endif]",j=R=>R&&R.nodeType===8&&R.textContent==="[if ENDBLOCK]><![endif]";if(q(O)&&q(E)){let R=0,yt=E;for(;E;){let Y=X(h,E);if(q(Y))R++;else if(j(Y)&&R>0)R--;else if(j(Y)&&R===0){E=Y;break}E=Y}let ol=E;R=0;let sl=O;for(;O;){let Y=X(x,O);if(q(Y))R++;else if(j(Y)&&R>0)R--;else if(j(Y)&&R===0){O=Y;break}O=Y}let al=O,ll=new Yn(yt,ol),ul=new Yn(sl,al);_(ll,ul);continue}if(E.nodeType===1&&s&&!E.isEqualNode(O)){let R=X(x,O),yt=!1;for(;!yt&&R;)R.nodeType===1&&E.isEqualNode(R)&&(yt=!0,E=w(h,O,E),$=A(E)),R=X(x,R)}if(N!==$){if(!N&&$){L[$]=E,E=w(h,O,E),L[$].remove(),E=X(h,E),O=X(x,O);continue}if(N&&!$&&T[N]&&(E.replaceWith(T[N]),E=T[N],$=A(E)),N&&$){let R=T[N];if(R)L[$]=E,E.replaceWith(R),E=R,$=A(E);else{L[$]=E,E=w(h,O,E),L[$].remove(),E=X(h,E),O=X(x,O);continue}}}let be=E&&X(h,E);m(E,O),O=O&&X(x,O),E=be}let U=[];for(;E;)Ye(u,E)||U.push(E),E=X(h,E);for(;U.length;){let N=U.shift();N.remove(),f(N)}}function A(h){return h&&h.nodeType===1&&o(h)}function C(h){let x={};for(let T of h){let L=A(T);L&&(x[L]=T)}return x}function w(h,x,T){if(!Ye(p,x)){let L=x.cloneNode(!0);return h.insertBefore(L,T),c(L),L}return x}return d(r),n=e,i=typeof t=="string"?td(t):t,window.Alpine&&window.Alpine.closestDataStack&&!e._x_dataStack&&(i._x_dataStack=window.Alpine.closestDataStack(e),i._x_dataStack&&window.Alpine.cloneNode(e,i)),m(e,i),n=void 0,i=void 0,e}Qn.step=()=>{};Qn.log=()=>{};function Ye(e,...t){let r=!1;return e(...t,()=>r=!0),r}var Ba=!1;function td(e){let t=document.createElement("template");return t.innerHTML=e,t.content.firstElementChild}function rd(e){return e.nodeType===3||e.nodeType===8}var Yn=class{constructor(e,t){this.startComment=e,this.endComment=t}get children(){let e=[],t=this.startComment.nextSibling;for(;t&&t!==this.endComment;)e.push(t),t=t.nextSibling;return e}appendChild(e){this.endComment.before(e)}get firstChild(){let e=this.startComment.nextSibling;if(e!==this.endComment)return e}nextNode(e){let t=e.nextSibling;if(t!==this.endComment)return t}insertBefore(e,t){return t.before(e),e}};function Ua(e){return e.firstChild}function X(e,t){let r;return e instanceof Yn?r=e.nextNode(t):r=t.nextSibling,r}function nd(){if(Ba)return;Ba=!0;let e=Element.prototype.setAttribute,t=document.createElement("div");Element.prototype.setAttribute=function(n,i){if(!n.includes("@"))return e.call(this,n,i);t.innerHTML=`<span ${n}="${i}"></span>`;let o=t.firstElementChild.getAttributeNode(n);t.firstElementChild.removeAttributeNode(o),this.setAttributeNode(o)}}function id(e,t){let r=t&&t._x_bindings&&t._x_bindings.id;!r||!e.setAttribute||(e.setAttribute("id",r),e.id=r)}function od(e){e.morph=Qn}var Ha=od;function sd(e){e.directive("mask",(t,{value:r,expression:n},{effect:i,evaluateLater:o,cleanup:s})=>{let a=()=>n,l="";queueMicrotask(()=>{if(["function","dynamic"].includes(r)){let c=o(n);i(()=>{a=d=>{let m;return e.dontAutoEvaluateFunctions(()=>{c(b=>{m=typeof b=="function"?b(d):b},{scope:{$input:d,$money:ld.bind({el:t})}})}),m},f(t,!1)})}else f(t,!1);if(t._x_model){if(t._x_model.get()===t.value||t._x_model.get()===null&&t.value==="")return;t._x_model.set(t.value)}});let u=new AbortController;s(()=>{u.abort()}),t.addEventListener("input",()=>f(t),{signal:u.signal,capture:!0}),t.addEventListener("blur",()=>f(t,!1),{signal:u.signal});function f(c,d=!0){let m=c.value,b=a(m);if(!b||b==="false")return!1;if(l.length-c.value.length===1)return l=c.value;let g=()=>{l=c.value=p(m,b)};d?ad(c,b,()=>{g()}):g()}function p(c,d){if(c==="")return"";let m=ja(d,c);return qa(d,m)}}).before("model")}function ad(e,t,r){let n=e.selectionStart,i=e.value;r();let o=i.slice(0,n),s=qa(t,ja(t,o)).length;e.setSelectionRange(s,s)}function ja(e,t){let r=t,n="",i={9:/[0-9]/,a:/[a-zA-Z]/,"*":/[a-zA-Z0-9]/},o="";for(let s=0;s<e.length;s++){if(["9","a","*"].includes(e[s])){o+=e[s];continue}for(let a=0;a<r.length;a++)if(r[a]===e[s]){r=r.slice(0,a)+r.slice(a+1);break}}for(let s=0;s<o.length;s++){let a=!1;for(let l=0;l<r.length;l++)if(i[o[s]].test(r[l])){n+=r[l],r=r.slice(0,l)+r.slice(l+1),a=!0;break}if(!a)break}return n}function qa(e,t){let r=Array.from(t),n="";for(let i=0;i<e.length;i++){if(!["9","a","*"].includes(e[i])){n+=e[i];continue}if(r.length===0)break;n+=r.shift()}return n}function ld(e,t=".",r,n=2){if(e==="-")return"-";if(/^\D+$/.test(e))return"9";r==null&&(r=t===","?".":",");let i=(l,u)=>{let f="",p=0;for(let c=l.length-1;c>=0;c--)l[c]!==u&&(p===3?(f=l[c]+u+f,p=0):f=l[c]+f,p++);return f},o=e.startsWith("-")?"-":"",s=e.replaceAll(new RegExp(`[^0-9\\${t}]`,"g"),""),a=Array.from({length:s.split(t)[0].length}).fill("9").join("");return a=`${o}${i(a,r)}`,n>0&&e.includes(t)&&(a+=`${t}`+"9".repeat(n)),queueMicrotask(()=>{this.el.value.endsWith(t)||this.el.value[this.el.selectionStart-1]===t&&this.el.setSelectionRange(this.el.selectionStart-1,this.el.selectionStart-1)}),a}var Wa=sd;function za(){setTimeout(()=>ud()),_t(document,"livewire:init"),_t(document,"livewire:initializing"),S.plugin(Ha),S.plugin(Gn),S.plugin(Ds),S.plugin(Us),S.plugin(vs),S.plugin(oa),S.plugin(Ns),S.plugin($s),S.plugin(Ia),S.plugin(Wa),S.addRootSelector(()=>"[wire\\:id]"),S.onAttributesAdded((e,t)=>{if(!Array.from(t).some(n=>Ke(n.name)))return;let r=z(e,!1);!r||t.forEach(n=>{if(!Ke(n.name))return;let i=Zt(e,n.name);P("directive.init",{el:e,component:r,directive:i,cleanup:o=>{S.onAttributeRemoved(e,i.raw,o)}})})}),S.interceptInit(S.skipDuringClone(e=>{if(!Array.from(e.attributes).some(n=>Ke(n.name)))return;if(e.hasAttribute("wire:id")){let n=ss(e);S.onAttributeRemoved(e,"wire:id",()=>{as(n.id)})}let t=Array.from(e.getAttributeNames()).filter(n=>Ke(n)).map(n=>Zt(e,n));t.forEach(n=>{P("directive.global.init",{el:e,directive:n,cleanup:i=>{S.onAttributeRemoved(e,n.raw,i)}})});let r=z(e,!1);r&&(P("element.init",{el:e,component:r}),t.forEach(n=>{P("directive.init",{el:e,component:r,directive:n,cleanup:i=>{S.onAttributeRemoved(e,n.raw,i)}})}))})),S.start(),setTimeout(()=>window.Livewire.initialRenderIsFinished=!0),_t(document,"livewire:initialized")}function ud(){let e=document.querySelector("script[data-update-uri][data-csrf]");if(!e)return;let t=e.closest("[wire\\:id]");t&&console.warn("Livewire: missing closing tags found. Ensure your template elements contain matching closing tags.",t)}k("effect",({component:e,effects:t})=>{cd(e,t.listeners||[])});function cd(e,t){t.forEach(r=>{let n=i=>{i.__livewire&&i.__livewire.receivedBy.push(e),e.$wire.call("__dispatch",r,i.detail||{})};window.addEventListener(r,n),e.addCleanup(()=>window.removeEventListener(r,n)),e.el.addEventListener(r,i=>{!i.__livewire||i.bubbles||(i.__livewire&&i.__livewire.receivedBy.push(e.id),e.$wire.call("__dispatch",r,i.detail||{}))})})}var Qe=new WeakMap,br=new Set;k("payload.intercept",async({assets:e})=>{if(!!e)for(let[t,r]of Object.entries(e))await pd(t,async()=>{await hd(r)})});k("component.init",({component:e})=>{let t=e.snapshot.memo.assets;t&&t.forEach(r=>{br.has(r)||br.add(r)})});k("effect",({component:e,effects:t})=>{let r=t.scripts;r&&Object.entries(r).forEach(([n,i])=>{fd(e,n,()=>{let o=dd(i);S.dontAutoEvaluateFunctions(()=>{S.evaluate(e.el,o,{$wire:e.$wire})})})})});function fd(e,t,r){if(Qe.has(e)&&Qe.get(e).includes(t))return;r(),Qe.has(e)||Qe.set(e,[]);let n=Qe.get(e);n.push(t),Qe.set(e,n)}function dd(e){let r=/<script\b[^>]*>([\s\S]*?)<\/script>/gm.exec(e);return r&&r[1]?r[1].trim():""}async function pd(e,t){br.has(e)||(await t(),br.add(e))}async function hd(e){let t=new DOMParser().parseFromString(e,"text/html"),r=document.adoptNode(t.head);for(let n of r.children)try{await md(n)}catch{}}async function md(e){return new Promise((t,r)=>{if(gd(e)){let n=vd(e);n.src?(n.onload=()=>t(),n.onerror=()=>r()):t(),document.head.appendChild(n)}else document.head.appendChild(e),t()})}function gd(e){return e.tagName.toLowerCase()==="script"}function vd(e){let t=document.createElement("script");t.textContent=e.textContent,t.async=e.async;for(let r of e.attributes)t.setAttribute(r.name,r.value);return t}k("effect",({component:e,effects:t})=>{let r=t.js,n=t.xjs;r&&Object.entries(r).forEach(([i,o])=>{ns(e,i,()=>{S.evaluate(e.el,o)})}),n&&n.forEach(i=>{S.evaluate(e.el,i)})});function Va(e,t,r){let n=t.parentElement?t.parentElement.tagName.toLowerCase():"div",i=document.createElement(n);i.innerHTML=r;let o;try{o=z(t.parentElement)}catch{}o&&(i.__livewire=o);let s=i.firstElementChild;s.__livewire=e,P("morph",{el:t,toEl:s,component:e}),S.morph(t,s,{updating:(a,l,u,f)=>{if(!Ze(a)){if(P("morph.updating",{el:a,toEl:l,component:e,skip:f,childrenOnly:u}),a.__livewire_replace===!0&&(a.innerHTML=l.innerHTML),a.__livewire_replace_self===!0)return a.outerHTML=l.outerHTML,f();if(a.__livewire_ignore===!0||(a.__livewire_ignore_self===!0&&u(),Ka(a)&&a.getAttribute("wire:id")!==e.id))return f();Ka(a)&&(l.__livewire=e)}},updated:a=>{Ze(a)||P("morph.updated",{el:a,component:e})},removing:(a,l)=>{Ze(a)||P("morph.removing",{el:a,component:e,skip:l})},removed:a=>{Ze(a)||P("morph.removed",{el:a,component:e})},adding:a=>{P("morph.adding",{el:a,component:e})},added:a=>{if(Ze(a))return;let l=z(a).id;P("morph.added",{el:a})},key:a=>{if(!Ze(a))return a.hasAttribute("wire:key")?a.getAttribute("wire:key"):a.hasAttribute("wire:id")?a.getAttribute("wire:id"):a.id},lookahead:!1}),P("morphed",{el:t,component:e})}function Ze(e){return typeof e.hasAttribute!="function"}function Ka(e){return e.hasAttribute("wire:id")}k("effect",({component:e,effects:t})=>{let r=t.html;!r||queueMicrotask(()=>{queueMicrotask(()=>{Va(e,e.el,r)})})});k("effect",({component:e,effects:t})=>{bd(e,t.dispatches||[])});function bd(e,t){t.forEach(({name:r,params:n={},self:i=!1,to:o})=>{i?oe(e,r,n):o?ze(o,r,n):Xt(e,r,n)})}var Zn=new xt;k("directive.init",({el:e,directive:t,cleanup:r,component:n})=>setTimeout(()=>{t.value==="submit"&&e.addEventListener("submit",()=>{let i=t.expression.startsWith("$parent")?n.parent.id:n.id,o=wd(e);Zn.add(i,o)})}));k("commit",({component:e,respond:t})=>{t(()=>{Zn.each(e.id,r=>r()),Zn.remove(e.id)})});function wd(e){let t=[];return S.walk(e,(r,n)=>{if(!!e.contains(r)){if(r.hasAttribute("wire:ignore"))return n();yd(r)?t.push(_d(r)):xd(r)&&t.push(Sd(r))}}),()=>{for(;t.length>0;)t.shift()()}}function yd(e){let t=e.tagName.toLowerCase();return t==="select"||t==="button"&&e.type==="submit"||t==="input"&&(e.type==="checkbox"||e.type==="radio")}function xd(e){return["input","textarea"].includes(e.tagName.toLowerCase())}function _d(e){let t=e.disabled?()=>{}:()=>e.disabled=!1;return e.disabled=!0,t}function Sd(e){let t=e.readOnly?()=>{}:()=>e.readOnly=!1;return e.readOnly=!0,t}k("commit.pooling",({commits:e})=>{e.forEach(t=>{let r=t.component;Ga(r,n=>{n.$wire.$commit()})})});k("commit.pooled",({pools:e})=>{Ed(e).forEach(r=>{let n=r.component;Ga(n,i=>{Ad(e,n,i)})})});function Ed(e){let t=[];return e.forEach(r=>{r.commits.forEach(n=>{t.push(n)})}),t}function Ad(e,t,r){let n=Ja(e,t),i=Ja(e,r),o=i.findCommitByComponent(r);i.delete(o),n.add(o),e.forEach(s=>{s.empty()&&e.delete(s)})}function Ja(e,t){for(let[r,n]of e.entries())if(n.hasCommitFor(t))return n}function Ga(e,t){Xa(e,r=>{(Cd(r)||Od(r))&&t(r)})}function Cd(e){return!!e.snapshot.memo.props}function Od(e){return!!e.snapshot.memo.bindings}function Xa(e,t){e.children.forEach(r=>{t(r),Xa(r,t)})}k("commit",({succeed:e})=>{e(({effects:t})=>{let r=t.download;if(!r)return;let n=window.webkitURL||window.URL,i=n.createObjectURL(Td(r.content,r.contentType)),o=document.createElement("a");o.style.display="none",o.href=i,o.download=r.name,document.body.appendChild(o),o.click(),setTimeout(function(){n.revokeObjectURL(i)},0)})});function Td(e,t="",r=512){let n=atob(e),i=[];t===null&&(t="");for(let o=0;o<n.length;o+=r){let s=n.slice(o,o+r),a=new Array(s.length);for(let u=0;u<s.length;u++)a[u]=s.charCodeAt(u);let l=new Uint8Array(a);i.push(l)}return new Blob(i,{type:t})}var ei=new WeakSet,ti=new WeakSet;k("component.init",({component:e})=>{let t=e.snapshot.memo;t.lazyLoaded!==void 0&&(ti.add(e),t.lazyIsolated!==void 0&&t.lazyIsolated===!1&&ei.add(e))});k("commit.pooling",({commits:e})=>{e.forEach(t=>{!ti.has(t.component)||(ei.has(t.component)?(t.isolate=!1,ei.delete(t.component)):t.isolate=!0,ti.delete(t.component))})});k("effect",({component:e,effects:t,cleanup:r})=>{let n=t.url;!n||Object.entries(n).forEach(([i,o])=>{let{name:s,as:a,use:l,alwaysShow:u,except:f}=kd(i,o);a||(a=s);let p=[!1,null,void 0].includes(f)?W(e.ephemeral,s):f,{replace:c,push:d,pop:m}=vr(a,p,u,f);if(l==="replace"){let b=S.effect(()=>{c(W(e.reactive,s))});r(()=>S.release(b))}else if(l==="push"){let b=k("commit",({component:y,succeed:v})=>{if(e!==y)return;let _=W(e.canonical,s);v(()=>{let A=W(e.canonical,s);JSON.stringify(_)!==JSON.stringify(A)&&d(A)})}),g=m(async y=>{await e.$wire.set(s,y),document.querySelectorAll("input").forEach(v=>{v._x_forceModelUpdate&&v._x_forceModelUpdate(v._x_model.get())})});r(()=>{b(),g()})}})});function kd(e,t){let r={use:"replace",alwaysShow:!1};return typeof t=="string"?{...r,name:t,as:t}:{...{...r,name:e,as:e},...t}}k("request",({options:e})=>{window.Echo&&(e.headers["X-Socket-ID"]=window.Echo.socketId())});k("effect",({component:e,effects:t})=>{(t.listeners||[]).forEach(n=>{if(n.startsWith("echo")){if(typeof window.Echo>"u"){console.warn("Laravel Echo cannot be found");return}let i=n.split(/(echo:|echo-)|:|,/);i[1]=="echo:"&&i.splice(2,0,"channel",void 0),i[2]=="notification"&&i.push(void 0,void 0);let[o,s,a,l,u,f,p]=i;if(["channel","private","encryptedPrivate"].includes(a)){let c=d=>oe(e,n,[d]);window.Echo[a](u).listen(p,c),e.addCleanup(()=>{window.Echo[a](u).stopListening(p,c)})}else if(a=="presence")if(["here","joining","leaving"].includes(p))window.Echo.join(u)[p](c=>{oe(e,n,[c])});else{let c=d=>oe(e,n,[d]);window.Echo.join(u).listen(p,c),e.addCleanup(()=>{window.Echo.leaveChannel(u)})}else a=="notification"?window.Echo.private(u).notification(c=>{oe(e,n,[c])}):console.warn("Echo channel type not yet supported")}})});var Ya=new WeakSet;k("component.init",({component:e})=>{e.snapshot.memo.isolate===!0&&Ya.add(e)});k("commit.pooling",({commits:e})=>{e.forEach(t=>{!Ya.has(t.component)||(t.isolate=!0)})});Ld()&&Alpine.navigate.disableProgressBar();document.addEventListener("alpine:navigate",e=>ri("livewire:navigate",e));document.addEventListener("alpine:navigating",e=>ri("livewire:navigating",e));document.addEventListener("alpine:navigated",e=>ri("livewire:navigated",e));function ri(e,t){let r=new CustomEvent(e,{cancelable:!0,bubbles:!0,detail:t.detail});document.dispatchEvent(r),r.defaultPrevented&&t.preventDefault()}function Qa(e,t,r){e.redirectUsingNavigate?Alpine.navigate(t):r()}function Ld(){return!!(document.querySelector("[data-no-progress-bar]")||window.livewireScriptConfig&&window.livewireScriptConfig.progressBar===!1)}k("effect",({effects:e})=>{if(!e.redirect)return;let t=e.redirect;Qa(e,t,()=>{window.location.href=t})});k("morph.added",({el:e})=>{e.__addedByMorph=!0});I("transition",({el:e,directive:t,component:r,cleanup:n})=>{let i=S.reactive({state:!e.__addedByMorph});S.bind(e,{[t.rawName.replace("wire:","x-")]:"","x-show"(){return i.state}}),e.__addedByMorph&&setTimeout(()=>i.state=!0);let o=[];o.push(k("morph.removing",({el:s,skip:a})=>{a(),s.addEventListener("transitionend",()=>{s.remove()}),i.state=!1,o.push(k("morph",({component:l})=>{l===r&&(s.remove(),o.forEach(u=>u()))}))})),n(()=>o.forEach(s=>s()))});var Pd=new Fe;function Za(e,t){Pd.each(e,r=>{r.callback(),r.callback=()=>{}}),t()}k("directive.init",({el:e,directive:t,cleanup:r,component:n})=>{if(["snapshot","effects","model","init","loading","poll","ignore","id","data","key","target","dirty"].includes(t.value)||ms(t.value))return;let i=t.rawName.replace("wire:","x-on:");t.value==="submit"&&!t.modifiers.includes("prevent")&&(i=i+".prevent");let o=S.bind(e,{[i](s){let a=()=>{Za(n,()=>{S.evaluate(e,"$wire."+t.expression,{scope:{$event:s}})})};e.__livewire_confirm?e.__livewire_confirm(()=>{a()},()=>{s.stopImmediatePropagation()}):a()}});r(o)});S.addInitSelector(()=>"[wire\\:navigate]");S.addInitSelector(()=>"[wire\\:navigate\\.hover]");S.interceptInit(S.skipDuringClone(e=>{e.hasAttribute("wire:navigate")?S.bind(e,{["x-navigate"]:!0}):e.hasAttribute("wire:navigate.hover")&&S.bind(e,{["x-navigate.hover"]:!0})}));document.addEventListener("alpine:navigating",()=>{Livewire.all().forEach(e=>{e.inscribeSnapshotAndEffectsOnElement()})});I("confirm",({el:e,directive:t})=>{let r=t.expression,n=t.modifiers.includes("prompt");r=r.replaceAll("\\n",`
+`),r===""&&(r="Are you sure?"),e.__livewire_confirm=(i,o)=>{if(n){let[s,a]=r.split("|");a?prompt(s)===a?i():o():console.warn("Livewire: Must provide expectation with wire:confirm.prompt")}else confirm(r)?i():o()}});S.addInitSelector(()=>"[wire\\:current]");var ni=new Map;document.addEventListener("livewire:navigated",()=>{ni.forEach(e=>e(new URL(window.location.href)))});hs("current",({el:e,directive:t,cleanup:r})=>{let n=t.expression,i={exact:t.modifiers.includes("exact"),strict:t.modifiers.includes("strict")};if(n.startsWith("#")||!e.hasAttribute("href"))return;let o=e.getAttribute("href"),s=new URL(o,window.location.href),a=n.split(" ").filter(String),l=u=>{Rd(s,u,i)?e.classList.add(...a):e.classList.remove(...a)};l(new URL(window.location.href)),ni.set(e,l),r(()=>ni.delete(e))});function Rd(e,t,r){if(e.hostname!==t.hostname)return!1;let n=r.strict?e.pathname:e.pathname.replace(/\/+$/,""),i=r.strict?t.pathname:t.pathname.replace(/\/+$/,"");if(r.exact)return n===i;let o=n.split("/"),s=i.split("/");for(let a=0;a<o.length;a++)if(o[a]!==s[a])return!1;return!0}function ne(e,t,r,n=null){if(r=t.modifiers.includes("remove")?!r:r,t.modifiers.includes("class")){let i=t.expression.split(" ").filter(String);r?e.classList.add(...i):e.classList.remove(...i)}else if(t.modifiers.includes("attr"))r?e.setAttribute(t.expression,!0):e.removeAttribute(t.expression);else{let i=n??window.getComputedStyle(e,null).getPropertyValue("display"),o=["inline","block","table","flex","grid","inline-flex"].filter(s=>t.modifiers.includes(s))[0]||"inline-block";o=t.modifiers.includes("remove")&&!r?i:o,e.style.display=r?o:"none"}}var ii=new Set,oi=new Set;window.addEventListener("offline",()=>ii.forEach(e=>e()));window.addEventListener("online",()=>oi.forEach(e=>e()));I("offline",({el:e,directive:t,cleanup:r})=>{let n=()=>ne(e,t,!0),i=()=>ne(e,t,!1);ii.add(n),oi.add(i),r(()=>{ii.delete(n),oi.delete(i)})});I("loading",({el:e,directive:t,component:r,cleanup:n})=>{let{targets:i,inverted:o}=$d(e),[s,a]=Nd(t),l=Md(r,i,o,[()=>s(()=>ne(e,t,!0)),()=>a(()=>ne(e,t,!1))]),u=Id(r,i,[()=>s(()=>ne(e,t,!0)),()=>a(()=>ne(e,t,!1))]);n(()=>{l(),u()})});function Nd(e){if(!e.modifiers.includes("delay")||e.modifiers.includes("none"))return[o=>o(),o=>o()];let t=200,r={shortest:50,shorter:100,short:150,default:200,long:300,longer:500,longest:1e3};Object.keys(r).some(o=>{if(e.modifiers.includes(o))return t=r[o],!0});let n,i=!1;return[o=>{n=setTimeout(()=>{o(),i=!0},t)},async o=>{i?(await o(),i=!1):clearTimeout(n)}]}function Md(e,t,r,[n,i]){return k("commit",({component:o,commit:s,respond:a})=>{o===e&&(t.length>0&&Fd(s,t)===r||(n(),a(()=>{i()})))})}function Id(e,t,[r,n]){let i=l=>{let{id:u,property:f}=l.detail;return u!==e.id||t.length>0&&!t.map(p=>p.target).includes(f)},o=St(window,"livewire-upload-start",l=>{i(l)||r()}),s=St(window,"livewire-upload-finish",l=>{i(l)||n()}),a=St(window,"livewire-upload-error",l=>{i(l)||n()});return()=>{o(),s(),a()}}function Fd(e,t){let{updates:r,calls:n}=e;return t.some(({target:i,params:o})=>{if(o)return n.some(({method:a,params:l})=>i===a&&o===el(JSON.stringify(l)));if(Object.keys(r).some(a=>a.includes(".")&&a.split(".")[0]===i?!0:a===i)||n.map(a=>a.method).includes(i))return!0})}function $d(e){let t=Ve(e),r=[],n=!1;if(t.has("target")){let i=t.get("target"),o=i.expression;i.modifiers.includes("except")&&(n=!0),o.includes("(")&&o.includes(")")?r.push({target:i.method,params:el(JSON.stringify(i.params))}):o.includes(",")?o.split(",").map(s=>s.trim()).forEach(s=>{r.push({target:s})}):r.push({target:o})}else{let i=["init","dirty","offline","target","loading","poll","ignore","key","id"];t.all().filter(o=>!i.includes(o.value)).map(o=>o.expression.split("(")[0]).forEach(o=>r.push({target:o}))}return{targets:r,inverted:n}}function el(e){return btoa(encodeURIComponent(e))}I("stream",({el:e,directive:t,cleanup:r})=>{let{expression:n,modifiers:i}=t,o=k("stream",({name:s,content:a,replace:l})=>{s===n&&(i.includes("replace")||l?e.innerHTML=a:e.innerHTML=e.innerHTML+a)});r(o)});k("request",({respond:e})=>{e(t=>{let r=t.response;!r.headers.has("X-Livewire-Stream")||(t.response={ok:!0,redirected:!1,status:200,async text(){let n=await Dd(r,i=>{P("stream",i)});return Ct(n)&&(this.ok=!1),n}})})});async function Dd(e,t){let r=e.body.getReader(),n="";for(;;){let{done:i,value:o}=await r.read(),a=new TextDecoder().decode(o),[l,u]=Bd(n+a);if(l.forEach(f=>{t(f)}),n=u,i)return n}}function Bd(e){let t=/({"stream":true.*?"endStream":true})/g,r=e.match(t),n=[];if(r)for(let o=0;o<r.length;o++)n.push(JSON.parse(r[o]).body);let i=e.replace(t,"");return[n,i]}I("replace",({el:e,directive:t})=>{t.modifiers.includes("self")?e.__livewire_replace_self=!0:e.__livewire_replace=!0});I("ignore",({el:e,directive:t})=>{t.modifiers.includes("self")?e.__livewire_ignore_self=!0:e.__livewire_ignore=!0});var tl=new Fe;k("commit",({component:e,succeed:t})=>{t(()=>{setTimeout(()=>{tl.each(e,r=>r(!1))})})});I("dirty",({el:e,directive:t,component:r})=>{let n=Ud(e),i=Alpine.reactive({state:!1}),o=!1,s=e.style.display,a=l=>{ne(e,t,l,s),o=l};tl.add(r,a),Alpine.effect(()=>{let l=!1;if(n.length===0)l=JSON.stringify(r.canonical)!==JSON.stringify(r.reactive);else for(let u=0;u<n.length&&!l;u++){let f=n[u];l=JSON.stringify(W(r.canonical,f))!==JSON.stringify(W(r.reactive,f))}o!==l&&a(l),o=l})});function Ud(e){let t=Ve(e),r=[];return t.has("model")&&r.push(t.get("model").expression),t.has("target")&&(r=r.concat(t.get("target").expression.split(",").map(n=>n.trim()))),r}I("model",({el:e,directive:t,component:r,cleanup:n})=>{let{expression:i,modifiers:o}=t;if(!i)return console.warn("Livewire: [wire:model] is missing a value.",e);if(rl(r,i))return console.warn('Livewire: [wire:model="'+i+'"] property does not exist on component: ['+r.name+"]",e);if(e.type&&e.type.toLowerCase()==="file")return mi(e,i,r,n);let s=o.includes("live"),a=o.includes("lazy")||o.includes("change"),l=o.includes("blur"),u=o.includes("debounce"),f=i.startsWith("$parent")?()=>r.$wire.$parent.$commit():()=>r.$wire.$commit(),p=jd(e)&&!u&&s?qd(f,150):f;S.bind(e,{["@change"](){a&&f()},["@blur"](){l&&f()},["x-model"+Hd(o)](){return{get(){return W(r.$wire,i)},set(c){we(r.$wire,i,c),s&&!a&&!l&&p()}}}})});function Hd(e){return e=e.filter(t=>!["lazy","defer"].includes(t)),e.length===0?"":"."+e.join(".")}function jd(e){return["INPUT","TEXTAREA"].includes(e.tagName.toUpperCase())&&!["checkbox","radio"].includes(e.type)}function rl(e,t){if(t.startsWith("$parent")){let n=z(e.el.parentElement,!1);return n?rl(n,t.split("$parent.")[1]):!0}let r=t.split(".")[0];return!Object.keys(e.canonical).includes(r)}function qd(e,t){var r;return function(){var n=this,i=arguments,o=function(){r=null,e.apply(n,i)};clearTimeout(r),r=setTimeout(o,t)}}I("init",({el:e,directive:t})=>{let r=t.expression??"$refresh";S.evaluate(e,`$wire.${r}`)});I("poll",({el:e,directive:t})=>{let r=ep(t.modifiers,2e3),{start:n,pauseWhile:i,throttleWhile:o,stopWhen:s}=zd(()=>{Wd(e,t)},r);n(),o(()=>Jd()&&Xd(t)),i(()=>Yd(t)&&Qd(e)),i(()=>Gd(e)),i(()=>Vd()),s(()=>Zd(e))});function Wd(e,t){S.evaluate(e,t.expression?"$wire."+t.expression:"$wire.$commit()")}function zd(e,t=2e3){let r=[],n=[],i=[];return{start(){let o=Kd(t,()=>{if(i.some(s=>s()))return o();r.some(s=>s())||n.some(s=>s())&&Math.random()<.95||e()})},pauseWhile(o){r.push(o)},throttleWhile(o){n.push(o)},stopWhen(o){i.push(o)}}}var Me=[];function Kd(e,t){if(!Me[e]){let r={timer:setInterval(()=>r.callbacks.forEach(n=>n()),e),callbacks:new Set};Me[e]=r}return Me[e].callbacks.add(t),()=>{Me[e].callbacks.delete(t),Me[e].callbacks.size===0&&(clearInterval(Me[e].timer),delete Me[e])}}var si=!1;window.addEventListener("offline",()=>si=!0);window.addEventListener("online",()=>si=!1);function Vd(){return si}var nl=!1;document.addEventListener("visibilitychange",()=>{nl=document.hidden},!1);function Jd(){return nl}function Gd(e){return!Ve(e).has("poll")}function Xd(e){return!e.modifiers.includes("keep-alive")}function Yd(e){return e.modifiers.includes("visible")}function Qd(e){let t=e.getBoundingClientRect();return!(t.top<(window.innerHeight||document.documentElement.clientHeight)&&t.left<(window.innerWidth||document.documentElement.clientWidth)&&t.bottom>0&&t.right>0)}function Zd(e){return e.isConnected===!1}function ep(e,t){let r,n=e.find(o=>o.match(/([0-9]+)ms/)),i=e.find(o=>o.match(/([0-9]+)s/));return n?r=Number(n.replace("ms","")):i&&(r=Number(i.replace("s",""))*1e3),r||t}var il={directive:I,dispatchTo:ze,start:za,first:cs,find:us,getByName:ls,all:fs,hook:k,trigger:P,triggerAsync:Kt,dispatch:ds,on:ps,get navigate(){return S.navigate}},ai=e=>console.warn(`Detected multiple instances of ${e} running`);window.Livewire&&ai("Livewire");window.Alpine&&ai("Alpine");window.Livewire=il;window.Alpine=S;window.livewireScriptConfig===void 0&&(window.Alpine.__fromLivewire=!0,document.addEventListener("DOMContentLoaded",()=>{window.Alpine.__fromLivewire===void 0&&ai("Alpine"),il.start()}));})();
 /* NProgress, (c) 2013, 2014 Rico Sta. Cruz - http://ricostacruz.com/nprogress
  * @license MIT */
 /*! Bundled license information:
diff --git a/public/vendor/livewire/livewire.min.js.map b/public/vendor/livewire/livewire.min.js.map
index 6b5d6278df..986822aa29 100644
--- a/public/vendor/livewire/livewire.min.js.map
+++ b/public/vendor/livewire/livewire.min.js.map
@@ -1,7 +1,7 @@
 {
   "version": 3,
-  "sources": ["../node_modules/nprogress/nprogress.js", "../js/utils.js", "../js/features/supportFileUploads.js", "../../alpine/packages/alpinejs/dist/module.esm.js", "../js/features/supportEntangle.js", "../js/hooks.js", "../js/request/modal.js", "../js/request/pool.js", "../js/request/commit.js", "../js/request/bus.js", "../js/request/index.js", "../js/$wire.js", "../js/component.js", "../js/store.js", "../js/events.js", "../js/directives.js", "../../alpine/packages/collapse/dist/module.esm.js", "../../alpine/packages/focus/dist/module.esm.js", "../../alpine/packages/persist/dist/module.esm.js", "../../alpine/packages/intersect/dist/module.esm.js", "../../alpine/packages/anchor/dist/module.esm.js", "../js/plugins/navigate/history.js", "../js/plugins/navigate/links.js", "../js/plugins/navigate/fetch.js", "../js/plugins/navigate/prefetch.js", "../js/plugins/navigate/teleport.js", "../js/plugins/navigate/scroll.js", "../js/plugins/navigate/persist.js", "../js/plugins/navigate/bar.js", "../js/plugins/navigate/page.js", "../js/plugins/navigate/index.js", "../js/plugins/history/index.js", "../../alpine/packages/morph/dist/module.esm.js", "../../alpine/packages/mask/dist/module.esm.js", "../js/lifecycle.js", "../js/features/supportListeners.js", "../js/features/supportScriptsAndAssets.js", "../js/features/supportJsEvaluation.js", "../js/morph.js", "../js/features/supportMorphDom.js", "../js/features/supportDispatches.js", "../js/features/supportDisablingFormsDuringRequest.js", "../js/features/supportPropsAndModelables.js", "../js/features/supportFileDownloads.js", "../js/features/supportLazyLoading.js", "../js/features/supportQueryString.js", "../js/features/supportLaravelEcho.js", "../js/features/supportIsolating.js", "../js/features/supportNavigate.js", "../js/features/supportRedirects.js", "../js/directives/wire-transition.js", "../js/debounce.js", "../js/directives/wire-wildcard.js", "../js/directives/wire-navigate.js", "../js/directives/wire-confirm.js", "../js/directives/shared.js", "../js/directives/wire-offline.js", "../js/directives/wire-loading.js", "../js/directives/wire-stream.js", "../js/directives/wire-replace.js", "../js/directives/wire-ignore.js", "../js/directives/wire-dirty.js", "../js/directives/wire-model.js", "../js/directives/wire-init.js", "../js/directives/wire-poll.js", "../js/index.js"],
-  "sourcesContent": ["/* NProgress, (c) 2013, 2014 Rico Sta. Cruz - http://ricostacruz.com/nprogress\n * @license MIT */\n\n;(function(root, factory) {\n\n  if (typeof define === 'function' && define.amd) {\n    define(factory);\n  } else if (typeof exports === 'object') {\n    module.exports = factory();\n  } else {\n    root.NProgress = factory();\n  }\n\n})(this, function() {\n  var NProgress = {};\n\n  NProgress.version = '0.2.0';\n\n  var Settings = NProgress.settings = {\n    minimum: 0.08,\n    easing: 'ease',\n    positionUsing: '',\n    speed: 200,\n    trickle: true,\n    trickleRate: 0.02,\n    trickleSpeed: 800,\n    showSpinner: true,\n    barSelector: '[role=\"bar\"]',\n    spinnerSelector: '[role=\"spinner\"]',\n    parent: 'body',\n    template: '<div class=\"bar\" role=\"bar\"><div class=\"peg\"></div></div><div class=\"spinner\" role=\"spinner\"><div class=\"spinner-icon\"></div></div>'\n  };\n\n  /**\n   * Updates configuration.\n   *\n   *     NProgress.configure({\n   *       minimum: 0.1\n   *     });\n   */\n  NProgress.configure = function(options) {\n    var key, value;\n    for (key in options) {\n      value = options[key];\n      if (value !== undefined && options.hasOwnProperty(key)) Settings[key] = value;\n    }\n\n    return this;\n  };\n\n  /**\n   * Last number.\n   */\n\n  NProgress.status = null;\n\n  /**\n   * Sets the progress bar status, where `n` is a number from `0.0` to `1.0`.\n   *\n   *     NProgress.set(0.4);\n   *     NProgress.set(1.0);\n   */\n\n  NProgress.set = function(n) {\n    var started = NProgress.isStarted();\n\n    n = clamp(n, Settings.minimum, 1);\n    NProgress.status = (n === 1 ? null : n);\n\n    var progress = NProgress.render(!started),\n        bar      = progress.querySelector(Settings.barSelector),\n        speed    = Settings.speed,\n        ease     = Settings.easing;\n\n    progress.offsetWidth; /* Repaint */\n\n    queue(function(next) {\n      // Set positionUsing if it hasn't already been set\n      if (Settings.positionUsing === '') Settings.positionUsing = NProgress.getPositioningCSS();\n\n      // Add transition\n      css(bar, barPositionCSS(n, speed, ease));\n\n      if (n === 1) {\n        // Fade out\n        css(progress, { \n          transition: 'none', \n          opacity: 1 \n        });\n        progress.offsetWidth; /* Repaint */\n\n        setTimeout(function() {\n          css(progress, { \n            transition: 'all ' + speed + 'ms linear', \n            opacity: 0 \n          });\n          setTimeout(function() {\n            NProgress.remove();\n            next();\n          }, speed);\n        }, speed);\n      } else {\n        setTimeout(next, speed);\n      }\n    });\n\n    return this;\n  };\n\n  NProgress.isStarted = function() {\n    return typeof NProgress.status === 'number';\n  };\n\n  /**\n   * Shows the progress bar.\n   * This is the same as setting the status to 0%, except that it doesn't go backwards.\n   *\n   *     NProgress.start();\n   *\n   */\n  NProgress.start = function() {\n    if (!NProgress.status) NProgress.set(0);\n\n    var work = function() {\n      setTimeout(function() {\n        if (!NProgress.status) return;\n        NProgress.trickle();\n        work();\n      }, Settings.trickleSpeed);\n    };\n\n    if (Settings.trickle) work();\n\n    return this;\n  };\n\n  /**\n   * Hides the progress bar.\n   * This is the *sort of* the same as setting the status to 100%, with the\n   * difference being `done()` makes some placebo effect of some realistic motion.\n   *\n   *     NProgress.done();\n   *\n   * If `true` is passed, it will show the progress bar even if its hidden.\n   *\n   *     NProgress.done(true);\n   */\n\n  NProgress.done = function(force) {\n    if (!force && !NProgress.status) return this;\n\n    return NProgress.inc(0.3 + 0.5 * Math.random()).set(1);\n  };\n\n  /**\n   * Increments by a random amount.\n   */\n\n  NProgress.inc = function(amount) {\n    var n = NProgress.status;\n\n    if (!n) {\n      return NProgress.start();\n    } else {\n      if (typeof amount !== 'number') {\n        amount = (1 - n) * clamp(Math.random() * n, 0.1, 0.95);\n      }\n\n      n = clamp(n + amount, 0, 0.994);\n      return NProgress.set(n);\n    }\n  };\n\n  NProgress.trickle = function() {\n    return NProgress.inc(Math.random() * Settings.trickleRate);\n  };\n\n  /**\n   * Waits for all supplied jQuery promises and\n   * increases the progress as the promises resolve.\n   *\n   * @param $promise jQUery Promise\n   */\n  (function() {\n    var initial = 0, current = 0;\n\n    NProgress.promise = function($promise) {\n      if (!$promise || $promise.state() === \"resolved\") {\n        return this;\n      }\n\n      if (current === 0) {\n        NProgress.start();\n      }\n\n      initial++;\n      current++;\n\n      $promise.always(function() {\n        current--;\n        if (current === 0) {\n            initial = 0;\n            NProgress.done();\n        } else {\n            NProgress.set((initial - current) / initial);\n        }\n      });\n\n      return this;\n    };\n\n  })();\n\n  /**\n   * (Internal) renders the progress bar markup based on the `template`\n   * setting.\n   */\n\n  NProgress.render = function(fromStart) {\n    if (NProgress.isRendered()) return document.getElementById('nprogress');\n\n    addClass(document.documentElement, 'nprogress-busy');\n    \n    var progress = document.createElement('div');\n    progress.id = 'nprogress';\n    progress.innerHTML = Settings.template;\n\n    var bar      = progress.querySelector(Settings.barSelector),\n        perc     = fromStart ? '-100' : toBarPerc(NProgress.status || 0),\n        parent   = document.querySelector(Settings.parent),\n        spinner;\n    \n    css(bar, {\n      transition: 'all 0 linear',\n      transform: 'translate3d(' + perc + '%,0,0)'\n    });\n\n    if (!Settings.showSpinner) {\n      spinner = progress.querySelector(Settings.spinnerSelector);\n      spinner && removeElement(spinner);\n    }\n\n    if (parent != document.body) {\n      addClass(parent, 'nprogress-custom-parent');\n    }\n\n    parent.appendChild(progress);\n    return progress;\n  };\n\n  /**\n   * Removes the element. Opposite of render().\n   */\n\n  NProgress.remove = function() {\n    removeClass(document.documentElement, 'nprogress-busy');\n    removeClass(document.querySelector(Settings.parent), 'nprogress-custom-parent');\n    var progress = document.getElementById('nprogress');\n    progress && removeElement(progress);\n  };\n\n  /**\n   * Checks if the progress bar is rendered.\n   */\n\n  NProgress.isRendered = function() {\n    return !!document.getElementById('nprogress');\n  };\n\n  /**\n   * Determine which positioning CSS rule to use.\n   */\n\n  NProgress.getPositioningCSS = function() {\n    // Sniff on document.body.style\n    var bodyStyle = document.body.style;\n\n    // Sniff prefixes\n    var vendorPrefix = ('WebkitTransform' in bodyStyle) ? 'Webkit' :\n                       ('MozTransform' in bodyStyle) ? 'Moz' :\n                       ('msTransform' in bodyStyle) ? 'ms' :\n                       ('OTransform' in bodyStyle) ? 'O' : '';\n\n    if (vendorPrefix + 'Perspective' in bodyStyle) {\n      // Modern browsers with 3D support, e.g. Webkit, IE10\n      return 'translate3d';\n    } else if (vendorPrefix + 'Transform' in bodyStyle) {\n      // Browsers without 3D support, e.g. IE9\n      return 'translate';\n    } else {\n      // Browsers without translate() support, e.g. IE7-8\n      return 'margin';\n    }\n  };\n\n  /**\n   * Helpers\n   */\n\n  function clamp(n, min, max) {\n    if (n < min) return min;\n    if (n > max) return max;\n    return n;\n  }\n\n  /**\n   * (Internal) converts a percentage (`0..1`) to a bar translateX\n   * percentage (`-100%..0%`).\n   */\n\n  function toBarPerc(n) {\n    return (-1 + n) * 100;\n  }\n\n\n  /**\n   * (Internal) returns the correct CSS for changing the bar's\n   * position given an n percentage, and speed and ease from Settings\n   */\n\n  function barPositionCSS(n, speed, ease) {\n    var barCSS;\n\n    if (Settings.positionUsing === 'translate3d') {\n      barCSS = { transform: 'translate3d('+toBarPerc(n)+'%,0,0)' };\n    } else if (Settings.positionUsing === 'translate') {\n      barCSS = { transform: 'translate('+toBarPerc(n)+'%,0)' };\n    } else {\n      barCSS = { 'margin-left': toBarPerc(n)+'%' };\n    }\n\n    barCSS.transition = 'all '+speed+'ms '+ease;\n\n    return barCSS;\n  }\n\n  /**\n   * (Internal) Queues a function to be executed.\n   */\n\n  var queue = (function() {\n    var pending = [];\n    \n    function next() {\n      var fn = pending.shift();\n      if (fn) {\n        fn(next);\n      }\n    }\n\n    return function(fn) {\n      pending.push(fn);\n      if (pending.length == 1) next();\n    };\n  })();\n\n  /**\n   * (Internal) Applies css properties to an element, similar to the jQuery \n   * css method.\n   *\n   * While this helper does assist with vendor prefixed property names, it \n   * does not perform any manipulation of values prior to setting styles.\n   */\n\n  var css = (function() {\n    var cssPrefixes = [ 'Webkit', 'O', 'Moz', 'ms' ],\n        cssProps    = {};\n\n    function camelCase(string) {\n      return string.replace(/^-ms-/, 'ms-').replace(/-([\\da-z])/gi, function(match, letter) {\n        return letter.toUpperCase();\n      });\n    }\n\n    function getVendorProp(name) {\n      var style = document.body.style;\n      if (name in style) return name;\n\n      var i = cssPrefixes.length,\n          capName = name.charAt(0).toUpperCase() + name.slice(1),\n          vendorName;\n      while (i--) {\n        vendorName = cssPrefixes[i] + capName;\n        if (vendorName in style) return vendorName;\n      }\n\n      return name;\n    }\n\n    function getStyleProp(name) {\n      name = camelCase(name);\n      return cssProps[name] || (cssProps[name] = getVendorProp(name));\n    }\n\n    function applyCss(element, prop, value) {\n      prop = getStyleProp(prop);\n      element.style[prop] = value;\n    }\n\n    return function(element, properties) {\n      var args = arguments,\n          prop, \n          value;\n\n      if (args.length == 2) {\n        for (prop in properties) {\n          value = properties[prop];\n          if (value !== undefined && properties.hasOwnProperty(prop)) applyCss(element, prop, value);\n        }\n      } else {\n        applyCss(element, args[1], args[2]);\n      }\n    }\n  })();\n\n  /**\n   * (Internal) Determines if an element or space separated list of class names contains a class name.\n   */\n\n  function hasClass(element, name) {\n    var list = typeof element == 'string' ? element : classList(element);\n    return list.indexOf(' ' + name + ' ') >= 0;\n  }\n\n  /**\n   * (Internal) Adds a class to an element.\n   */\n\n  function addClass(element, name) {\n    var oldList = classList(element),\n        newList = oldList + name;\n\n    if (hasClass(oldList, name)) return; \n\n    // Trim the opening space.\n    element.className = newList.substring(1);\n  }\n\n  /**\n   * (Internal) Removes a class from an element.\n   */\n\n  function removeClass(element, name) {\n    var oldList = classList(element),\n        newList;\n\n    if (!hasClass(element, name)) return;\n\n    // Replace the class name.\n    newList = oldList.replace(' ' + name + ' ', ' ');\n\n    // Trim the opening and closing spaces.\n    element.className = newList.substring(1, newList.length - 1);\n  }\n\n  /**\n   * (Internal) Gets a space separated list of the class names on the element. \n   * The list is wrapped with a single space on each end to facilitate finding \n   * matches within the list.\n   */\n\n  function classList(element) {\n    return (' ' + (element.className || '') + ' ').replace(/\\s+/gi, ' ');\n  }\n\n  /**\n   * (Internal) Removes an element from the DOM.\n   */\n\n  function removeElement(element) {\n    element && element.parentNode && element.parentNode.removeChild(element);\n  }\n\n  return NProgress;\n});\n\n", "\nexport class Bag {\n    constructor() { this.arrays = {} }\n\n    add(key, value) {\n        if (! this.arrays[key]) this.arrays[key] = []\n        this.arrays[key].push(value)\n    }\n\n    remove(key) {\n        if (this.arrays[key]) delete this.arrays[key]\n    }\n\n    get(key) { return this.arrays[key] || [] }\n\n    each(key, callback) { return this.get(key).forEach(callback) }\n}\n\nexport class WeakBag {\n    constructor() { this.arrays = new WeakMap }\n\n    add(key, value) {\n        if (! this.arrays.has(key)) this.arrays.set(key, [])\n        this.arrays.get(key).push(value)\n    }\n\n    remove(key) {\n        if (this.arrays.has(key)) this.arrays.delete(key, [])\n    }\n\n    get(key) { return this.arrays.has(key) ? this.arrays.get(key) : [] }\n\n    each(key, callback) { return this.get(key).forEach(callback) }\n}\n\nexport function dispatch(target, name, detail = {}, bubbles = true) {\n    target.dispatchEvent(\n        new CustomEvent(name, {\n            detail,\n            bubbles,\n            // Allows events to pass the shadow DOM barrier.\n            composed: true,\n            cancelable: true,\n        })\n    )\n}\n\nexport function listen(target, name, handler) {\n    target.addEventListener(name, handler)\n\n    return () => target.removeEventListener(name, handler)\n}\n\n/**\n * Type-checking in JS is weird and annoying, these are better.\n */\nexport function isObjecty(subject) { return (typeof subject === 'object' && subject !== null) }\nexport function isObject(subject) { return (isObjecty(subject) && ! isArray(subject)) }\nexport function isArray(subject) { return Array.isArray(subject) }\nexport function isFunction(subject) { return typeof subject === 'function' }\nexport function isPrimitive(subject) { return typeof subject !== 'object' || subject === null }\n\n/**\n * Clone an object deeply to wipe out any shared references.\n */\nexport function deepClone(obj) { return JSON.parse(JSON.stringify(obj)) }\n\n/**\n * Determine if two objects take the exact same shape.\n */\nexport function deeplyEqual(a, b) { return JSON.stringify(a) === JSON.stringify(b) }\n\n/**\n * An easy way to loop through arrays and objects.\n */\nexport function each(subject, callback) {\n    Object.entries(subject).forEach(([key, value]) => callback(key, value))\n}\n\n/**\n * Get a property from an object with support for dot-notation.\n */\nexport function dataGet(object, key) {\n    if (key === '') return object\n\n    return key.split('.').reduce((carry, i) => {\n        if (carry === undefined) return undefined\n\n        return carry[i]\n    }, object)\n}\n\n/**\n * Set a property on an object with support for dot-notation.\n */\nexport function dataSet(object, key, value) {\n    let segments = key.split('.')\n\n    if (segments.length === 1) {\n        return object[key] = value\n    }\n\n    let firstSegment = segments.shift()\n    let restOfSegments = segments.join('.')\n\n    if (object[firstSegment] === undefined) {\n        object[firstSegment] = {}\n    }\n\n    dataSet(object[firstSegment], restOfSegments, value)\n}\n\n/**\n * Create a flat, dot-notated diff of two obejcts.\n */\nexport function diff(left, right, diffs = {}, path = '') {\n    // Are they the same?\n    if (left === right) return diffs\n\n    // Are they COMPLETELY different?\n    if (typeof left !== typeof right || (isObject(left) && isArray(right)) || (isArray(left) && isObject(right))) {\n        diffs[path] = right;\n        return diffs\n    }\n\n    // Is the right or left side a primitive value (a leaf node)?\n    if (isPrimitive(left) || isPrimitive(right)) {\n        diffs[path] = right\n        return diffs\n    }\n\n    // We now know both are objects...\n    let leftKeys = Object.keys(left)\n\n    // Recursively diff the object's properties...\n    Object.entries(right).forEach(([key, value]) => {\n        diffs = {...diffs, ...diff(left[key], right[key], diffs, path === '' ? key : `${path}.${key}`)}\n        leftKeys = leftKeys.filter(i => i !== key)\n    })\n\n    // Mark any items for removal...\n    leftKeys.forEach(key => {\n        diffs[`${path}.${key}`] = '__rm__'\n    })\n\n    return diffs\n}\n\n/**\n * The data that's passed between the browser and server is in the form of\n * nested tuples consisting of the schema: [rawValue, metadata]. In this\n * method we're extracting the plain JS object of only the raw values.\n */\nexport function extractData(payload) {\n    let value = isSynthetic(payload) ? payload[0] : payload\n    let meta = isSynthetic(payload) ? payload[1] : undefined\n\n    if (isObjecty(value)) {\n        Object.entries(value).forEach(([key, iValue]) => {\n            value[key] = extractData(iValue)\n        })\n    }\n\n    return value\n}\n\n/**\n * Determine if the variable passed in is a node in a nested metadata\n * tuple tree. (Meaning it takes the form of: [rawData, metadata])\n */\nexport function isSynthetic(subject) {\n    return Array.isArray(subject)\n        && subject.length === 2\n        && typeof subject[1] === 'object'\n        && Object.keys(subject[1]).includes('s')\n}\n\n/**\n * Post requests in Laravel require a csrf token to be passed\n * along with the payload. Here, we'll try and locate one.\n */\nexport function getCsrfToken() {\n    // Purposely not caching. Fetching it fresh every time ensures we're\n    // not depending on a stale session's CSRF token...\n\n    if (document.querySelector('meta[name=\"csrf-token\"]')) {\n        return document.querySelector('meta[name=\"csrf-token\"]').getAttribute('content')\n    }\n\n    if (document.querySelector('[data-csrf]')) {\n        return document.querySelector('[data-csrf]').getAttribute('data-csrf')\n    }\n\n    if (window.livewireScriptConfig['csrf'] ?? false) {\n        return window.livewireScriptConfig['csrf']\n    }\n\n    throw 'Livewire: No CSRF token detected'\n}\n\nlet nonce;\n\nexport function getNonce() {\n    if (nonce) return nonce\n\n\n    if (window.livewireScriptConfig && (window.livewireScriptConfig['nonce'] ?? false)) {\n        nonce = window.livewireScriptConfig['nonce']\n\n        return nonce\n    }\n\n    const elWithNonce = document.querySelector('style[data-livewire-style][nonce]')\n\n    if (elWithNonce) {\n        nonce = elWithNonce.nonce\n\n        return nonce\n    }\n\n    return null\n}\n\n/**\n * Livewire's update URI. This is configurable via Livewire::setUpdateRoute(...)\n */\nexport function getUpdateUri() {\n    return document.querySelector('[data-update-uri]')?.getAttribute('data-update-uri') ?? window.livewireScriptConfig['uri'] ?? null\n}\n\nexport function contentIsFromDump(content) {\n    return !! content.match(/<script>Sfdump\\(\".+\"\\)<\\/script>/)\n}\n\nexport function splitDumpFromContent(content) {\n    let dump = content.match(/.*<script>Sfdump\\(\".+\"\\)<\\/script>/s)\n\n    return [dump, content.replace(dump, '')]\n}\n", "import { getCsrfToken } from '@/utils';\n\nlet uploadManagers = new WeakMap\n\nfunction getUploadManager(component) {\n    if (! uploadManagers.has(component)) {\n        let manager = new UploadManager(component)\n\n        uploadManagers.set(component, manager)\n\n        manager.registerListeners()\n    }\n\n    return uploadManagers.get(component)\n}\n\nexport function handleFileUpload(el, property, component, cleanup) {\n    let manager = getUploadManager(component)\n\n    let start = () => el.dispatchEvent(new CustomEvent('livewire-upload-start', { bubbles: true, detail: { id: component.id, property} }))\n    let finish = () => el.dispatchEvent(new CustomEvent('livewire-upload-finish', { bubbles: true, detail: { id: component.id, property} }))\n    let error = () => el.dispatchEvent(new CustomEvent('livewire-upload-error', { bubbles: true, detail: { id: component.id, property} }))\n    let cancel = () => el.dispatchEvent(new CustomEvent('livewire-upload-cancel', { bubbles: true, detail: { id: component.id, property} }))\n    let progress = (progressEvent) => {\n        var percentCompleted = Math.round( (progressEvent.loaded * 100) / progressEvent.total )\n\n        el.dispatchEvent(\n            new CustomEvent('livewire-upload-progress', {\n                bubbles: true, detail: { progress: percentCompleted }\n            })\n        )\n    }\n\n    let eventHandler = e => {\n        if (e.target.files.length === 0) return\n\n        start()\n\n        if (e.target.multiple) {\n            manager.uploadMultiple(property, e.target.files, finish, error, progress, cancel)\n        } else {\n            manager.upload(property, e.target.files[0], finish, error, progress, cancel)\n        }\n    }\n\n    el.addEventListener('change', eventHandler)\n\n    // If the Livewire property has changed to null or an empty string, then reset the input...\n    component.$wire.$watch(property, (value) => {\n        // This watch will only be released when the component is removed. However, the\n        // actual file-upload element may be removed from the DOM withou the entire\n        // component being removed. In this case, let's just bail early on this.\n        if (! el.isConnected) return\n\n        if (value === null || value === '') {\n            el.value = ''\n        }\n    })\n\n    // There's a bug in browsers where selecting a file, removing it,\n    // then re-adding it doesn't fire the change event. This fixes it.\n    // Reference: https://stackoverflow.com/questions/12030686/html-input-file-selection-event-not-firing-upon-selecting-the-same-file\n    let clearFileInputValue = () => { el.value = null }\n    el.addEventListener('click', clearFileInputValue)\n\n    // Clear the input if the uploaded is cancelled...\n    el.addEventListener('livewire-upload-cancel', clearFileInputValue)\n\n    cleanup(() => {\n        el.removeEventListener('change', eventHandler)\n        el.removeEventListener('click', clearFileInputValue)\n    })\n}\n\nclass UploadManager {\n    constructor(component) {\n        this.component = component\n        this.uploadBag = new MessageBag\n        this.removeBag = new MessageBag\n    }\n\n    registerListeners() {\n        this.component.$wire.$on('upload:generatedSignedUrl', ({ name, url }) => {\n            // We have to add reduntant \"setLoading\" calls because the dom-patch\n            // from the first response will clear the setUploadLoading call\n            // from the first upload call.\n            setUploadLoading(this.component, name)\n\n            this.handleSignedUrl(name, url)\n        })\n\n        this.component.$wire.$on('upload:generatedSignedUrlForS3', ({ name, payload }) => {\n            setUploadLoading(this.component, name)\n\n            this.handleS3PreSignedUrl(name, payload)\n        })\n\n        this.component.$wire.$on('upload:finished', ({ name, tmpFilenames }) => this.markUploadFinished(name, tmpFilenames))\n        this.component.$wire.$on('upload:errored', ({ name }) => this.markUploadErrored(name))\n        this.component.$wire.$on('upload:removed', ({ name, tmpFilename }) => this.removeBag.shift(name).finishCallback(tmpFilename))\n    }\n\n    upload(name, file, finishCallback, errorCallback, progressCallback, cancelledCallback) {\n        this.setUpload(name, {\n            files: [file],\n            multiple: false,\n            finishCallback,\n            errorCallback,\n            progressCallback,\n            cancelledCallback,\n        })\n    }\n\n    uploadMultiple(name, files, finishCallback, errorCallback, progressCallback, cancelledCallback) {\n        this.setUpload(name, {\n            files: Array.from(files),\n            multiple: true,\n            finishCallback,\n            errorCallback,\n            progressCallback,\n            cancelledCallback,\n        })\n    }\n\n    removeUpload(name, tmpFilename, finishCallback) {\n        this.removeBag.push(name, {\n            tmpFilename, finishCallback\n        })\n\n        this.component.$wire.call('_removeUpload', name, tmpFilename);\n    }\n\n    setUpload(name, uploadObject) {\n        this.uploadBag.add(name, uploadObject)\n\n        if (this.uploadBag.get(name).length === 1) {\n            this.startUpload(name, uploadObject)\n        }\n    }\n\n    handleSignedUrl(name, url) {\n        let formData = new FormData()\n        Array.from(this.uploadBag.first(name).files).forEach(file => formData.append('files[]', file, file.name))\n\n        let headers = {\n            'Accept': 'application/json',\n        }\n\n        let csrfToken = getCsrfToken()\n\n        if (csrfToken) headers['X-CSRF-TOKEN'] = csrfToken\n\n        this.makeRequest(name, formData, 'post', url, headers, response => {\n            return response.paths\n        })\n    }\n\n    handleS3PreSignedUrl(name, payload) {\n        let formData = this.uploadBag.first(name).files[0]\n\n        let headers = payload.headers\n        if ('Host' in headers) delete headers.Host\n        let url = payload.url\n\n        this.makeRequest(name, formData, 'put', url, headers, response => {\n            return [payload.path]\n        })\n    }\n\n    makeRequest(name, formData, method, url, headers, retrievePaths) {\n        let request = new XMLHttpRequest()\n\n        request.open(method, url)\n\n        Object.entries(headers).forEach(([key, value]) => {\n            request.setRequestHeader(key, value)\n        })\n\n        request.upload.addEventListener('progress', e => {\n            e.detail = {}\n            e.detail.progress = Math.floor((e.loaded * 100) / e.total)\n\n            this.uploadBag.first(name).progressCallback(e)\n        })\n\n        request.addEventListener('load', () => {\n            if ((request.status+'')[0] === '2') {\n                let paths = retrievePaths(request.response && JSON.parse(request.response))\n\n                this.component.$wire.call('_finishUpload', name, paths, this.uploadBag.first(name).multiple)\n\n                return\n            }\n\n            let errors = null\n\n            if (request.status === 422) {\n                errors = request.response\n            }\n\n            this.component.$wire.call('_uploadErrored', name, errors, this.uploadBag.first(name).multiple)\n        })\n\n        this.uploadBag.first(name).request = request\n\n        request.send(formData)\n    }\n\n    startUpload(name, uploadObject) {\n        let fileInfos = uploadObject.files.map(file => {\n            return { name: file.name, size: file.size, type: file.type }\n        })\n\n        this.component.$wire.call('_startUpload', name, fileInfos, uploadObject.multiple);\n\n        setUploadLoading(this.component, name)\n    }\n\n    markUploadFinished(name, tmpFilenames) {\n        unsetUploadLoading(this.component)\n\n        let uploadObject = this.uploadBag.shift(name)\n        uploadObject.finishCallback(uploadObject.multiple ? tmpFilenames : tmpFilenames[0])\n\n        if (this.uploadBag.get(name).length > 0) this.startUpload(name, this.uploadBag.last(name))\n    }\n\n    markUploadErrored(name) {\n        unsetUploadLoading(this.component)\n\n        this.uploadBag.shift(name).errorCallback()\n\n        if (this.uploadBag.get(name).length > 0) this.startUpload(name, this.uploadBag.last(name))\n    }\n\n    cancelUpload(name, cancelledCallback = null) {\n        unsetUploadLoading(this.component)\n\n        let uploadItem = this.uploadBag.first(name);\n\n        if (uploadItem) {\n            if (uploadItem.request) {\n                uploadItem.request.abort();\n            }\n\n            this.uploadBag.shift(name).cancelledCallback();\n\n            if (cancelledCallback) cancelledCallback()\n        }\n    }\n}\n\nexport default class MessageBag {\n    constructor() {\n        this.bag = {}\n    }\n\n    add(name, thing) {\n        if (! this.bag[name]) {\n            this.bag[name] = []\n        }\n\n        this.bag[name].push(thing)\n    }\n\n    push(name, thing) {\n        this.add(name, thing)\n    }\n\n    first(name) {\n        if (! this.bag[name]) return null\n\n        return this.bag[name][0]\n    }\n\n    last(name) {\n        return this.bag[name].slice(-1)[0]\n    }\n\n    get(name) {\n        return this.bag[name]\n    }\n\n    shift(name) {\n        return this.bag[name].shift()\n    }\n\n    call(name, ...params) {\n        (this.listeners[name] || []).forEach(callback => {\n            callback(...params)\n        })\n    }\n\n    has(name) {\n        return Object.keys(this.listeners).includes(name)\n    }\n}\n\nfunction setUploadLoading() {\n    // @todo\n}\n\nfunction unsetUploadLoading() {\n    // @todo\n}\n\nexport function upload(\n    component,\n    name,\n    file,\n    finishCallback = () => { },\n    errorCallback = () => { },\n    progressCallback = () => { },\n    cancelledCallback = () => { },\n) {\n    let uploadManager = getUploadManager(component)\n\n    uploadManager.upload(\n        name,\n        file,\n        finishCallback,\n        errorCallback,\n        progressCallback,\n        cancelledCallback,\n    )\n}\n\nexport function uploadMultiple(\n    component,\n    name,\n    files,\n    finishCallback = () => { },\n    errorCallback = () => { },\n    progressCallback = () => { },\n    cancelledCallback = () => { },\n) {\n    let uploadManager = getUploadManager(component)\n\n    uploadManager.uploadMultiple(\n        name,\n        files,\n        finishCallback,\n        errorCallback,\n        progressCallback,\n        cancelledCallback,\n    )\n}\n\nexport function removeUpload(\n    component,\n    name,\n    tmpFilename,\n    finishCallback = () => { },\n    errorCallback = () => { }\n) {\n    let uploadManager = getUploadManager(component)\n\n    uploadManager.removeUpload(\n        name,\n        tmpFilename,\n        finishCallback,\n        errorCallback\n    )\n}\n\nexport function cancelUpload(\n    component,\n    name,\n    cancelledCallback = () => { }\n) {\n    let uploadManager = getUploadManager(component)\n\n    uploadManager.cancelUpload(\n        name,\n        cancelledCallback\n    )\n}\n", "// packages/alpinejs/src/scheduler.js\nvar flushPending = false;\nvar flushing = false;\nvar queue = [];\nvar lastFlushedIndex = -1;\nfunction scheduler(callback) {\n  queueJob(callback);\n}\nfunction queueJob(job) {\n  if (!queue.includes(job))\n    queue.push(job);\n  queueFlush();\n}\nfunction dequeueJob(job) {\n  let index = queue.indexOf(job);\n  if (index !== -1 && index > lastFlushedIndex)\n    queue.splice(index, 1);\n}\nfunction queueFlush() {\n  if (!flushing && !flushPending) {\n    flushPending = true;\n    queueMicrotask(flushJobs);\n  }\n}\nfunction flushJobs() {\n  flushPending = false;\n  flushing = true;\n  for (let i = 0; i < queue.length; i++) {\n    queue[i]();\n    lastFlushedIndex = i;\n  }\n  queue.length = 0;\n  lastFlushedIndex = -1;\n  flushing = false;\n}\n\n// packages/alpinejs/src/reactivity.js\nvar reactive;\nvar effect;\nvar release;\nvar raw;\nvar shouldSchedule = true;\nfunction disableEffectScheduling(callback) {\n  shouldSchedule = false;\n  callback();\n  shouldSchedule = true;\n}\nfunction setReactivityEngine(engine) {\n  reactive = engine.reactive;\n  release = engine.release;\n  effect = (callback) => engine.effect(callback, { scheduler: (task) => {\n    if (shouldSchedule) {\n      scheduler(task);\n    } else {\n      task();\n    }\n  } });\n  raw = engine.raw;\n}\nfunction overrideEffect(override) {\n  effect = override;\n}\nfunction elementBoundEffect(el) {\n  let cleanup2 = () => {\n  };\n  let wrappedEffect = (callback) => {\n    let effectReference = effect(callback);\n    if (!el._x_effects) {\n      el._x_effects = /* @__PURE__ */ new Set();\n      el._x_runEffects = () => {\n        el._x_effects.forEach((i) => i());\n      };\n    }\n    el._x_effects.add(effectReference);\n    cleanup2 = () => {\n      if (effectReference === void 0)\n        return;\n      el._x_effects.delete(effectReference);\n      release(effectReference);\n    };\n    return effectReference;\n  };\n  return [wrappedEffect, () => {\n    cleanup2();\n  }];\n}\nfunction watch(getter, callback) {\n  let firstTime = true;\n  let oldValue;\n  let effectReference = effect(() => {\n    let value = getter();\n    JSON.stringify(value);\n    if (!firstTime) {\n      queueMicrotask(() => {\n        callback(value, oldValue);\n        oldValue = value;\n      });\n    } else {\n      oldValue = value;\n    }\n    firstTime = false;\n  });\n  return () => release(effectReference);\n}\n\n// packages/alpinejs/src/mutation.js\nvar onAttributeAddeds = [];\nvar onElRemoveds = [];\nvar onElAddeds = [];\nfunction onElAdded(callback) {\n  onElAddeds.push(callback);\n}\nfunction onElRemoved(el, callback) {\n  if (typeof callback === \"function\") {\n    if (!el._x_cleanups)\n      el._x_cleanups = [];\n    el._x_cleanups.push(callback);\n  } else {\n    callback = el;\n    onElRemoveds.push(callback);\n  }\n}\nfunction onAttributesAdded(callback) {\n  onAttributeAddeds.push(callback);\n}\nfunction onAttributeRemoved(el, name, callback) {\n  if (!el._x_attributeCleanups)\n    el._x_attributeCleanups = {};\n  if (!el._x_attributeCleanups[name])\n    el._x_attributeCleanups[name] = [];\n  el._x_attributeCleanups[name].push(callback);\n}\nfunction cleanupAttributes(el, names) {\n  if (!el._x_attributeCleanups)\n    return;\n  Object.entries(el._x_attributeCleanups).forEach(([name, value]) => {\n    if (names === void 0 || names.includes(name)) {\n      value.forEach((i) => i());\n      delete el._x_attributeCleanups[name];\n    }\n  });\n}\nfunction cleanupElement(el) {\n  if (el._x_cleanups) {\n    while (el._x_cleanups.length)\n      el._x_cleanups.pop()();\n  }\n}\nvar observer = new MutationObserver(onMutate);\nvar currentlyObserving = false;\nfunction startObservingMutations() {\n  observer.observe(document, { subtree: true, childList: true, attributes: true, attributeOldValue: true });\n  currentlyObserving = true;\n}\nfunction stopObservingMutations() {\n  flushObserver();\n  observer.disconnect();\n  currentlyObserving = false;\n}\nvar queuedMutations = [];\nfunction flushObserver() {\n  let records = observer.takeRecords();\n  queuedMutations.push(() => records.length > 0 && onMutate(records));\n  let queueLengthWhenTriggered = queuedMutations.length;\n  queueMicrotask(() => {\n    if (queuedMutations.length === queueLengthWhenTriggered) {\n      while (queuedMutations.length > 0)\n        queuedMutations.shift()();\n    }\n  });\n}\nfunction mutateDom(callback) {\n  if (!currentlyObserving)\n    return callback();\n  stopObservingMutations();\n  let result = callback();\n  startObservingMutations();\n  return result;\n}\nvar isCollecting = false;\nvar deferredMutations = [];\nfunction deferMutations() {\n  isCollecting = true;\n}\nfunction flushAndStopDeferringMutations() {\n  isCollecting = false;\n  onMutate(deferredMutations);\n  deferredMutations = [];\n}\nfunction onMutate(mutations) {\n  if (isCollecting) {\n    deferredMutations = deferredMutations.concat(mutations);\n    return;\n  }\n  let addedNodes = /* @__PURE__ */ new Set();\n  let removedNodes = /* @__PURE__ */ new Set();\n  let addedAttributes = /* @__PURE__ */ new Map();\n  let removedAttributes = /* @__PURE__ */ new Map();\n  for (let i = 0; i < mutations.length; i++) {\n    if (mutations[i].target._x_ignoreMutationObserver)\n      continue;\n    if (mutations[i].type === \"childList\") {\n      mutations[i].addedNodes.forEach((node) => node.nodeType === 1 && addedNodes.add(node));\n      mutations[i].removedNodes.forEach((node) => node.nodeType === 1 && removedNodes.add(node));\n    }\n    if (mutations[i].type === \"attributes\") {\n      let el = mutations[i].target;\n      let name = mutations[i].attributeName;\n      let oldValue = mutations[i].oldValue;\n      let add2 = () => {\n        if (!addedAttributes.has(el))\n          addedAttributes.set(el, []);\n        addedAttributes.get(el).push({ name, value: el.getAttribute(name) });\n      };\n      let remove = () => {\n        if (!removedAttributes.has(el))\n          removedAttributes.set(el, []);\n        removedAttributes.get(el).push(name);\n      };\n      if (el.hasAttribute(name) && oldValue === null) {\n        add2();\n      } else if (el.hasAttribute(name)) {\n        remove();\n        add2();\n      } else {\n        remove();\n      }\n    }\n  }\n  removedAttributes.forEach((attrs, el) => {\n    cleanupAttributes(el, attrs);\n  });\n  addedAttributes.forEach((attrs, el) => {\n    onAttributeAddeds.forEach((i) => i(el, attrs));\n  });\n  for (let node of removedNodes) {\n    if (addedNodes.has(node))\n      continue;\n    onElRemoveds.forEach((i) => i(node));\n  }\n  addedNodes.forEach((node) => {\n    node._x_ignoreSelf = true;\n    node._x_ignore = true;\n  });\n  for (let node of addedNodes) {\n    if (removedNodes.has(node))\n      continue;\n    if (!node.isConnected)\n      continue;\n    delete node._x_ignoreSelf;\n    delete node._x_ignore;\n    onElAddeds.forEach((i) => i(node));\n    node._x_ignore = true;\n    node._x_ignoreSelf = true;\n  }\n  addedNodes.forEach((node) => {\n    delete node._x_ignoreSelf;\n    delete node._x_ignore;\n  });\n  addedNodes = null;\n  removedNodes = null;\n  addedAttributes = null;\n  removedAttributes = null;\n}\n\n// packages/alpinejs/src/scope.js\nfunction scope(node) {\n  return mergeProxies(closestDataStack(node));\n}\nfunction addScopeToNode(node, data2, referenceNode) {\n  node._x_dataStack = [data2, ...closestDataStack(referenceNode || node)];\n  return () => {\n    node._x_dataStack = node._x_dataStack.filter((i) => i !== data2);\n  };\n}\nfunction closestDataStack(node) {\n  if (node._x_dataStack)\n    return node._x_dataStack;\n  if (typeof ShadowRoot === \"function\" && node instanceof ShadowRoot) {\n    return closestDataStack(node.host);\n  }\n  if (!node.parentNode) {\n    return [];\n  }\n  return closestDataStack(node.parentNode);\n}\nfunction mergeProxies(objects) {\n  return new Proxy({ objects }, mergeProxyTrap);\n}\nvar mergeProxyTrap = {\n  ownKeys({ objects }) {\n    return Array.from(\n      new Set(objects.flatMap((i) => Object.keys(i)))\n    );\n  },\n  has({ objects }, name) {\n    if (name == Symbol.unscopables)\n      return false;\n    return objects.some(\n      (obj) => Object.prototype.hasOwnProperty.call(obj, name) || Reflect.has(obj, name)\n    );\n  },\n  get({ objects }, name, thisProxy) {\n    if (name == \"toJSON\")\n      return collapseProxies;\n    return Reflect.get(\n      objects.find(\n        (obj) => Reflect.has(obj, name)\n      ) || {},\n      name,\n      thisProxy\n    );\n  },\n  set({ objects }, name, value, thisProxy) {\n    const target = objects.find(\n      (obj) => Object.prototype.hasOwnProperty.call(obj, name)\n    ) || objects[objects.length - 1];\n    const descriptor = Object.getOwnPropertyDescriptor(target, name);\n    if (descriptor?.set && descriptor?.get)\n      return descriptor.set.call(thisProxy, value) || true;\n    return Reflect.set(target, name, value);\n  }\n};\nfunction collapseProxies() {\n  let keys = Reflect.ownKeys(this);\n  return keys.reduce((acc, key) => {\n    acc[key] = Reflect.get(this, key);\n    return acc;\n  }, {});\n}\n\n// packages/alpinejs/src/interceptor.js\nfunction initInterceptors(data2) {\n  let isObject2 = (val) => typeof val === \"object\" && !Array.isArray(val) && val !== null;\n  let recurse = (obj, basePath = \"\") => {\n    Object.entries(Object.getOwnPropertyDescriptors(obj)).forEach(([key, { value, enumerable }]) => {\n      if (enumerable === false || value === void 0)\n        return;\n      if (typeof value === \"object\" && value !== null && value.__v_skip)\n        return;\n      let path = basePath === \"\" ? key : `${basePath}.${key}`;\n      if (typeof value === \"object\" && value !== null && value._x_interceptor) {\n        obj[key] = value.initialize(data2, path, key);\n      } else {\n        if (isObject2(value) && value !== obj && !(value instanceof Element)) {\n          recurse(value, path);\n        }\n      }\n    });\n  };\n  return recurse(data2);\n}\nfunction interceptor(callback, mutateObj = () => {\n}) {\n  let obj = {\n    initialValue: void 0,\n    _x_interceptor: true,\n    initialize(data2, path, key) {\n      return callback(this.initialValue, () => get(data2, path), (value) => set(data2, path, value), path, key);\n    }\n  };\n  mutateObj(obj);\n  return (initialValue) => {\n    if (typeof initialValue === \"object\" && initialValue !== null && initialValue._x_interceptor) {\n      let initialize = obj.initialize.bind(obj);\n      obj.initialize = (data2, path, key) => {\n        let innerValue = initialValue.initialize(data2, path, key);\n        obj.initialValue = innerValue;\n        return initialize(data2, path, key);\n      };\n    } else {\n      obj.initialValue = initialValue;\n    }\n    return obj;\n  };\n}\nfunction get(obj, path) {\n  return path.split(\".\").reduce((carry, segment) => carry[segment], obj);\n}\nfunction set(obj, path, value) {\n  if (typeof path === \"string\")\n    path = path.split(\".\");\n  if (path.length === 1)\n    obj[path[0]] = value;\n  else if (path.length === 0)\n    throw error;\n  else {\n    if (obj[path[0]])\n      return set(obj[path[0]], path.slice(1), value);\n    else {\n      obj[path[0]] = {};\n      return set(obj[path[0]], path.slice(1), value);\n    }\n  }\n}\n\n// packages/alpinejs/src/magics.js\nvar magics = {};\nfunction magic(name, callback) {\n  magics[name] = callback;\n}\nfunction injectMagics(obj, el) {\n  Object.entries(magics).forEach(([name, callback]) => {\n    let memoizedUtilities = null;\n    function getUtilities() {\n      if (memoizedUtilities) {\n        return memoizedUtilities;\n      } else {\n        let [utilities, cleanup2] = getElementBoundUtilities(el);\n        memoizedUtilities = { interceptor, ...utilities };\n        onElRemoved(el, cleanup2);\n        return memoizedUtilities;\n      }\n    }\n    Object.defineProperty(obj, `$${name}`, {\n      get() {\n        return callback(el, getUtilities());\n      },\n      enumerable: false\n    });\n  });\n  return obj;\n}\n\n// packages/alpinejs/src/utils/error.js\nfunction tryCatch(el, expression, callback, ...args) {\n  try {\n    return callback(...args);\n  } catch (e) {\n    handleError(e, el, expression);\n  }\n}\nfunction handleError(error2, el, expression = void 0) {\n  error2 = Object.assign(\n    error2 ?? { message: \"No error message given.\" },\n    { el, expression }\n  );\n  console.warn(`Alpine Expression Error: ${error2.message}\n\n${expression ? 'Expression: \"' + expression + '\"\\n\\n' : \"\"}`, el);\n  setTimeout(() => {\n    throw error2;\n  }, 0);\n}\n\n// packages/alpinejs/src/evaluator.js\nvar shouldAutoEvaluateFunctions = true;\nfunction dontAutoEvaluateFunctions(callback) {\n  let cache = shouldAutoEvaluateFunctions;\n  shouldAutoEvaluateFunctions = false;\n  let result = callback();\n  shouldAutoEvaluateFunctions = cache;\n  return result;\n}\nfunction evaluate(el, expression, extras = {}) {\n  let result;\n  evaluateLater(el, expression)((value) => result = value, extras);\n  return result;\n}\nfunction evaluateLater(...args) {\n  return theEvaluatorFunction(...args);\n}\nvar theEvaluatorFunction = normalEvaluator;\nfunction setEvaluator(newEvaluator) {\n  theEvaluatorFunction = newEvaluator;\n}\nfunction normalEvaluator(el, expression) {\n  let overriddenMagics = {};\n  injectMagics(overriddenMagics, el);\n  let dataStack = [overriddenMagics, ...closestDataStack(el)];\n  let evaluator = typeof expression === \"function\" ? generateEvaluatorFromFunction(dataStack, expression) : generateEvaluatorFromString(dataStack, expression, el);\n  return tryCatch.bind(null, el, expression, evaluator);\n}\nfunction generateEvaluatorFromFunction(dataStack, func) {\n  return (receiver = () => {\n  }, { scope: scope2 = {}, params = [] } = {}) => {\n    let result = func.apply(mergeProxies([scope2, ...dataStack]), params);\n    runIfTypeOfFunction(receiver, result);\n  };\n}\nvar evaluatorMemo = {};\nfunction generateFunctionFromString(expression, el) {\n  if (evaluatorMemo[expression]) {\n    return evaluatorMemo[expression];\n  }\n  let AsyncFunction = Object.getPrototypeOf(async function() {\n  }).constructor;\n  let rightSideSafeExpression = /^[\\n\\s]*if.*\\(.*\\)/.test(expression.trim()) || /^(let|const)\\s/.test(expression.trim()) ? `(async()=>{ ${expression} })()` : expression;\n  const safeAsyncFunction = () => {\n    try {\n      let func2 = new AsyncFunction(\n        [\"__self\", \"scope\"],\n        `with (scope) { __self.result = ${rightSideSafeExpression} }; __self.finished = true; return __self.result;`\n      );\n      Object.defineProperty(func2, \"name\", {\n        value: `[Alpine] ${expression}`\n      });\n      return func2;\n    } catch (error2) {\n      handleError(error2, el, expression);\n      return Promise.resolve();\n    }\n  };\n  let func = safeAsyncFunction();\n  evaluatorMemo[expression] = func;\n  return func;\n}\nfunction generateEvaluatorFromString(dataStack, expression, el) {\n  let func = generateFunctionFromString(expression, el);\n  return (receiver = () => {\n  }, { scope: scope2 = {}, params = [] } = {}) => {\n    func.result = void 0;\n    func.finished = false;\n    let completeScope = mergeProxies([scope2, ...dataStack]);\n    if (typeof func === \"function\") {\n      let promise = func(func, completeScope).catch((error2) => handleError(error2, el, expression));\n      if (func.finished) {\n        runIfTypeOfFunction(receiver, func.result, completeScope, params, el);\n        func.result = void 0;\n      } else {\n        promise.then((result) => {\n          runIfTypeOfFunction(receiver, result, completeScope, params, el);\n        }).catch((error2) => handleError(error2, el, expression)).finally(() => func.result = void 0);\n      }\n    }\n  };\n}\nfunction runIfTypeOfFunction(receiver, value, scope2, params, el) {\n  if (shouldAutoEvaluateFunctions && typeof value === \"function\") {\n    let result = value.apply(scope2, params);\n    if (result instanceof Promise) {\n      result.then((i) => runIfTypeOfFunction(receiver, i, scope2, params)).catch((error2) => handleError(error2, el, value));\n    } else {\n      receiver(result);\n    }\n  } else if (typeof value === \"object\" && value instanceof Promise) {\n    value.then((i) => receiver(i));\n  } else {\n    receiver(value);\n  }\n}\n\n// packages/alpinejs/src/directives.js\nvar prefixAsString = \"x-\";\nfunction prefix(subject = \"\") {\n  return prefixAsString + subject;\n}\nfunction setPrefix(newPrefix) {\n  prefixAsString = newPrefix;\n}\nvar directiveHandlers = {};\nfunction directive(name, callback) {\n  directiveHandlers[name] = callback;\n  return {\n    before(directive2) {\n      if (!directiveHandlers[directive2]) {\n        console.warn(String.raw`Cannot find directive \\`${directive2}\\`. \\`${name}\\` will use the default order of execution`);\n        return;\n      }\n      const pos = directiveOrder.indexOf(directive2);\n      directiveOrder.splice(pos >= 0 ? pos : directiveOrder.indexOf(\"DEFAULT\"), 0, name);\n    }\n  };\n}\nfunction directiveExists(name) {\n  return Object.keys(directiveHandlers).includes(name);\n}\nfunction directives(el, attributes, originalAttributeOverride) {\n  attributes = Array.from(attributes);\n  if (el._x_virtualDirectives) {\n    let vAttributes = Object.entries(el._x_virtualDirectives).map(([name, value]) => ({ name, value }));\n    let staticAttributes = attributesOnly(vAttributes);\n    vAttributes = vAttributes.map((attribute) => {\n      if (staticAttributes.find((attr) => attr.name === attribute.name)) {\n        return {\n          name: `x-bind:${attribute.name}`,\n          value: `\"${attribute.value}\"`\n        };\n      }\n      return attribute;\n    });\n    attributes = attributes.concat(vAttributes);\n  }\n  let transformedAttributeMap = {};\n  let directives2 = attributes.map(toTransformedAttributes((newName, oldName) => transformedAttributeMap[newName] = oldName)).filter(outNonAlpineAttributes).map(toParsedDirectives(transformedAttributeMap, originalAttributeOverride)).sort(byPriority);\n  return directives2.map((directive2) => {\n    return getDirectiveHandler(el, directive2);\n  });\n}\nfunction attributesOnly(attributes) {\n  return Array.from(attributes).map(toTransformedAttributes()).filter((attr) => !outNonAlpineAttributes(attr));\n}\nvar isDeferringHandlers = false;\nvar directiveHandlerStacks = /* @__PURE__ */ new Map();\nvar currentHandlerStackKey = Symbol();\nfunction deferHandlingDirectives(callback) {\n  isDeferringHandlers = true;\n  let key = Symbol();\n  currentHandlerStackKey = key;\n  directiveHandlerStacks.set(key, []);\n  let flushHandlers = () => {\n    while (directiveHandlerStacks.get(key).length)\n      directiveHandlerStacks.get(key).shift()();\n    directiveHandlerStacks.delete(key);\n  };\n  let stopDeferring = () => {\n    isDeferringHandlers = false;\n    flushHandlers();\n  };\n  callback(flushHandlers);\n  stopDeferring();\n}\nfunction getElementBoundUtilities(el) {\n  let cleanups = [];\n  let cleanup2 = (callback) => cleanups.push(callback);\n  let [effect3, cleanupEffect] = elementBoundEffect(el);\n  cleanups.push(cleanupEffect);\n  let utilities = {\n    Alpine: alpine_default,\n    effect: effect3,\n    cleanup: cleanup2,\n    evaluateLater: evaluateLater.bind(evaluateLater, el),\n    evaluate: evaluate.bind(evaluate, el)\n  };\n  let doCleanup = () => cleanups.forEach((i) => i());\n  return [utilities, doCleanup];\n}\nfunction getDirectiveHandler(el, directive2) {\n  let noop = () => {\n  };\n  let handler4 = directiveHandlers[directive2.type] || noop;\n  let [utilities, cleanup2] = getElementBoundUtilities(el);\n  onAttributeRemoved(el, directive2.original, cleanup2);\n  let fullHandler = () => {\n    if (el._x_ignore || el._x_ignoreSelf)\n      return;\n    handler4.inline && handler4.inline(el, directive2, utilities);\n    handler4 = handler4.bind(handler4, el, directive2, utilities);\n    isDeferringHandlers ? directiveHandlerStacks.get(currentHandlerStackKey).push(handler4) : handler4();\n  };\n  fullHandler.runCleanups = cleanup2;\n  return fullHandler;\n}\nvar startingWith = (subject, replacement) => ({ name, value }) => {\n  if (name.startsWith(subject))\n    name = name.replace(subject, replacement);\n  return { name, value };\n};\nvar into = (i) => i;\nfunction toTransformedAttributes(callback = () => {\n}) {\n  return ({ name, value }) => {\n    let { name: newName, value: newValue } = attributeTransformers.reduce((carry, transform) => {\n      return transform(carry);\n    }, { name, value });\n    if (newName !== name)\n      callback(newName, name);\n    return { name: newName, value: newValue };\n  };\n}\nvar attributeTransformers = [];\nfunction mapAttributes(callback) {\n  attributeTransformers.push(callback);\n}\nfunction outNonAlpineAttributes({ name }) {\n  return alpineAttributeRegex().test(name);\n}\nvar alpineAttributeRegex = () => new RegExp(`^${prefixAsString}([^:^.]+)\\\\b`);\nfunction toParsedDirectives(transformedAttributeMap, originalAttributeOverride) {\n  return ({ name, value }) => {\n    let typeMatch = name.match(alpineAttributeRegex());\n    let valueMatch = name.match(/:([a-zA-Z0-9\\-_:]+)/);\n    let modifiers = name.match(/\\.[^.\\]]+(?=[^\\]]*$)/g) || [];\n    let original = originalAttributeOverride || transformedAttributeMap[name] || name;\n    return {\n      type: typeMatch ? typeMatch[1] : null,\n      value: valueMatch ? valueMatch[1] : null,\n      modifiers: modifiers.map((i) => i.replace(\".\", \"\")),\n      expression: value,\n      original\n    };\n  };\n}\nvar DEFAULT = \"DEFAULT\";\nvar directiveOrder = [\n  \"ignore\",\n  \"ref\",\n  \"data\",\n  \"id\",\n  \"anchor\",\n  \"bind\",\n  \"init\",\n  \"for\",\n  \"model\",\n  \"modelable\",\n  \"transition\",\n  \"show\",\n  \"if\",\n  DEFAULT,\n  \"teleport\"\n];\nfunction byPriority(a, b) {\n  let typeA = directiveOrder.indexOf(a.type) === -1 ? DEFAULT : a.type;\n  let typeB = directiveOrder.indexOf(b.type) === -1 ? DEFAULT : b.type;\n  return directiveOrder.indexOf(typeA) - directiveOrder.indexOf(typeB);\n}\n\n// packages/alpinejs/src/utils/dispatch.js\nfunction dispatch(el, name, detail = {}) {\n  el.dispatchEvent(\n    new CustomEvent(name, {\n      detail,\n      bubbles: true,\n      // Allows events to pass the shadow DOM barrier.\n      composed: true,\n      cancelable: true\n    })\n  );\n}\n\n// packages/alpinejs/src/utils/walk.js\nfunction walk(el, callback) {\n  if (typeof ShadowRoot === \"function\" && el instanceof ShadowRoot) {\n    Array.from(el.children).forEach((el2) => walk(el2, callback));\n    return;\n  }\n  let skip = false;\n  callback(el, () => skip = true);\n  if (skip)\n    return;\n  let node = el.firstElementChild;\n  while (node) {\n    walk(node, callback, false);\n    node = node.nextElementSibling;\n  }\n}\n\n// packages/alpinejs/src/utils/warn.js\nfunction warn(message, ...args) {\n  console.warn(`Alpine Warning: ${message}`, ...args);\n}\n\n// packages/alpinejs/src/lifecycle.js\nvar started = false;\nfunction start() {\n  if (started)\n    warn(\"Alpine has already been initialized on this page. Calling Alpine.start() more than once can cause problems.\");\n  started = true;\n  if (!document.body)\n    warn(\"Unable to initialize. Trying to load Alpine before `<body>` is available. Did you forget to add `defer` in Alpine's `<script>` tag?\");\n  dispatch(document, \"alpine:init\");\n  dispatch(document, \"alpine:initializing\");\n  startObservingMutations();\n  onElAdded((el) => initTree(el, walk));\n  onElRemoved((el) => destroyTree(el));\n  onAttributesAdded((el, attrs) => {\n    directives(el, attrs).forEach((handle) => handle());\n  });\n  let outNestedComponents = (el) => !closestRoot(el.parentElement, true);\n  Array.from(document.querySelectorAll(allSelectors().join(\",\"))).filter(outNestedComponents).forEach((el) => {\n    initTree(el);\n  });\n  dispatch(document, \"alpine:initialized\");\n  setTimeout(() => {\n    warnAboutMissingPlugins();\n  });\n}\nvar rootSelectorCallbacks = [];\nvar initSelectorCallbacks = [];\nfunction rootSelectors() {\n  return rootSelectorCallbacks.map((fn) => fn());\n}\nfunction allSelectors() {\n  return rootSelectorCallbacks.concat(initSelectorCallbacks).map((fn) => fn());\n}\nfunction addRootSelector(selectorCallback) {\n  rootSelectorCallbacks.push(selectorCallback);\n}\nfunction addInitSelector(selectorCallback) {\n  initSelectorCallbacks.push(selectorCallback);\n}\nfunction closestRoot(el, includeInitSelectors = false) {\n  return findClosest(el, (element) => {\n    const selectors = includeInitSelectors ? allSelectors() : rootSelectors();\n    if (selectors.some((selector) => element.matches(selector)))\n      return true;\n  });\n}\nfunction findClosest(el, callback) {\n  if (!el)\n    return;\n  if (callback(el))\n    return el;\n  if (el._x_teleportBack)\n    el = el._x_teleportBack;\n  if (!el.parentElement)\n    return;\n  return findClosest(el.parentElement, callback);\n}\nfunction isRoot(el) {\n  return rootSelectors().some((selector) => el.matches(selector));\n}\nvar initInterceptors2 = [];\nfunction interceptInit(callback) {\n  initInterceptors2.push(callback);\n}\nfunction initTree(el, walker = walk, intercept = () => {\n}) {\n  deferHandlingDirectives(() => {\n    walker(el, (el2, skip) => {\n      intercept(el2, skip);\n      initInterceptors2.forEach((i) => i(el2, skip));\n      directives(el2, el2.attributes).forEach((handle) => handle());\n      el2._x_ignore && skip();\n    });\n  });\n}\nfunction destroyTree(root, walker = walk) {\n  walker(root, (el) => {\n    cleanupAttributes(el);\n    cleanupElement(el);\n  });\n}\nfunction warnAboutMissingPlugins() {\n  let pluginDirectives = [\n    [\"ui\", \"dialog\", [\"[x-dialog], [x-popover]\"]],\n    [\"anchor\", \"anchor\", [\"[x-anchor]\"]],\n    [\"sort\", \"sort\", [\"[x-sort]\"]]\n  ];\n  pluginDirectives.forEach(([plugin2, directive2, selectors]) => {\n    if (directiveExists(directive2))\n      return;\n    selectors.some((selector) => {\n      if (document.querySelector(selector)) {\n        warn(`found \"${selector}\", but missing ${plugin2} plugin`);\n        return true;\n      }\n    });\n  });\n}\n\n// packages/alpinejs/src/nextTick.js\nvar tickStack = [];\nvar isHolding = false;\nfunction nextTick(callback = () => {\n}) {\n  queueMicrotask(() => {\n    isHolding || setTimeout(() => {\n      releaseNextTicks();\n    });\n  });\n  return new Promise((res) => {\n    tickStack.push(() => {\n      callback();\n      res();\n    });\n  });\n}\nfunction releaseNextTicks() {\n  isHolding = false;\n  while (tickStack.length)\n    tickStack.shift()();\n}\nfunction holdNextTicks() {\n  isHolding = true;\n}\n\n// packages/alpinejs/src/utils/classes.js\nfunction setClasses(el, value) {\n  if (Array.isArray(value)) {\n    return setClassesFromString(el, value.join(\" \"));\n  } else if (typeof value === \"object\" && value !== null) {\n    return setClassesFromObject(el, value);\n  } else if (typeof value === \"function\") {\n    return setClasses(el, value());\n  }\n  return setClassesFromString(el, value);\n}\nfunction setClassesFromString(el, classString) {\n  let split = (classString2) => classString2.split(\" \").filter(Boolean);\n  let missingClasses = (classString2) => classString2.split(\" \").filter((i) => !el.classList.contains(i)).filter(Boolean);\n  let addClassesAndReturnUndo = (classes) => {\n    el.classList.add(...classes);\n    return () => {\n      el.classList.remove(...classes);\n    };\n  };\n  classString = classString === true ? classString = \"\" : classString || \"\";\n  return addClassesAndReturnUndo(missingClasses(classString));\n}\nfunction setClassesFromObject(el, classObject) {\n  let split = (classString) => classString.split(\" \").filter(Boolean);\n  let forAdd = Object.entries(classObject).flatMap(([classString, bool]) => bool ? split(classString) : false).filter(Boolean);\n  let forRemove = Object.entries(classObject).flatMap(([classString, bool]) => !bool ? split(classString) : false).filter(Boolean);\n  let added = [];\n  let removed = [];\n  forRemove.forEach((i) => {\n    if (el.classList.contains(i)) {\n      el.classList.remove(i);\n      removed.push(i);\n    }\n  });\n  forAdd.forEach((i) => {\n    if (!el.classList.contains(i)) {\n      el.classList.add(i);\n      added.push(i);\n    }\n  });\n  return () => {\n    removed.forEach((i) => el.classList.add(i));\n    added.forEach((i) => el.classList.remove(i));\n  };\n}\n\n// packages/alpinejs/src/utils/styles.js\nfunction setStyles(el, value) {\n  if (typeof value === \"object\" && value !== null) {\n    return setStylesFromObject(el, value);\n  }\n  return setStylesFromString(el, value);\n}\nfunction setStylesFromObject(el, value) {\n  let previousStyles = {};\n  Object.entries(value).forEach(([key, value2]) => {\n    previousStyles[key] = el.style[key];\n    if (!key.startsWith(\"--\")) {\n      key = kebabCase(key);\n    }\n    el.style.setProperty(key, value2);\n  });\n  setTimeout(() => {\n    if (el.style.length === 0) {\n      el.removeAttribute(\"style\");\n    }\n  });\n  return () => {\n    setStyles(el, previousStyles);\n  };\n}\nfunction setStylesFromString(el, value) {\n  let cache = el.getAttribute(\"style\", value);\n  el.setAttribute(\"style\", value);\n  return () => {\n    el.setAttribute(\"style\", cache || \"\");\n  };\n}\nfunction kebabCase(subject) {\n  return subject.replace(/([a-z])([A-Z])/g, \"$1-$2\").toLowerCase();\n}\n\n// packages/alpinejs/src/utils/once.js\nfunction once(callback, fallback = () => {\n}) {\n  let called = false;\n  return function() {\n    if (!called) {\n      called = true;\n      callback.apply(this, arguments);\n    } else {\n      fallback.apply(this, arguments);\n    }\n  };\n}\n\n// packages/alpinejs/src/directives/x-transition.js\ndirective(\"transition\", (el, { value, modifiers, expression }, { evaluate: evaluate2 }) => {\n  if (typeof expression === \"function\")\n    expression = evaluate2(expression);\n  if (expression === false)\n    return;\n  if (!expression || typeof expression === \"boolean\") {\n    registerTransitionsFromHelper(el, modifiers, value);\n  } else {\n    registerTransitionsFromClassString(el, expression, value);\n  }\n});\nfunction registerTransitionsFromClassString(el, classString, stage) {\n  registerTransitionObject(el, setClasses, \"\");\n  let directiveStorageMap = {\n    \"enter\": (classes) => {\n      el._x_transition.enter.during = classes;\n    },\n    \"enter-start\": (classes) => {\n      el._x_transition.enter.start = classes;\n    },\n    \"enter-end\": (classes) => {\n      el._x_transition.enter.end = classes;\n    },\n    \"leave\": (classes) => {\n      el._x_transition.leave.during = classes;\n    },\n    \"leave-start\": (classes) => {\n      el._x_transition.leave.start = classes;\n    },\n    \"leave-end\": (classes) => {\n      el._x_transition.leave.end = classes;\n    }\n  };\n  directiveStorageMap[stage](classString);\n}\nfunction registerTransitionsFromHelper(el, modifiers, stage) {\n  registerTransitionObject(el, setStyles);\n  let doesntSpecify = !modifiers.includes(\"in\") && !modifiers.includes(\"out\") && !stage;\n  let transitioningIn = doesntSpecify || modifiers.includes(\"in\") || [\"enter\"].includes(stage);\n  let transitioningOut = doesntSpecify || modifiers.includes(\"out\") || [\"leave\"].includes(stage);\n  if (modifiers.includes(\"in\") && !doesntSpecify) {\n    modifiers = modifiers.filter((i, index) => index < modifiers.indexOf(\"out\"));\n  }\n  if (modifiers.includes(\"out\") && !doesntSpecify) {\n    modifiers = modifiers.filter((i, index) => index > modifiers.indexOf(\"out\"));\n  }\n  let wantsAll = !modifiers.includes(\"opacity\") && !modifiers.includes(\"scale\");\n  let wantsOpacity = wantsAll || modifiers.includes(\"opacity\");\n  let wantsScale = wantsAll || modifiers.includes(\"scale\");\n  let opacityValue = wantsOpacity ? 0 : 1;\n  let scaleValue = wantsScale ? modifierValue(modifiers, \"scale\", 95) / 100 : 1;\n  let delay = modifierValue(modifiers, \"delay\", 0) / 1e3;\n  let origin = modifierValue(modifiers, \"origin\", \"center\");\n  let property = \"opacity, transform\";\n  let durationIn = modifierValue(modifiers, \"duration\", 150) / 1e3;\n  let durationOut = modifierValue(modifiers, \"duration\", 75) / 1e3;\n  let easing = `cubic-bezier(0.4, 0.0, 0.2, 1)`;\n  if (transitioningIn) {\n    el._x_transition.enter.during = {\n      transformOrigin: origin,\n      transitionDelay: `${delay}s`,\n      transitionProperty: property,\n      transitionDuration: `${durationIn}s`,\n      transitionTimingFunction: easing\n    };\n    el._x_transition.enter.start = {\n      opacity: opacityValue,\n      transform: `scale(${scaleValue})`\n    };\n    el._x_transition.enter.end = {\n      opacity: 1,\n      transform: `scale(1)`\n    };\n  }\n  if (transitioningOut) {\n    el._x_transition.leave.during = {\n      transformOrigin: origin,\n      transitionDelay: `${delay}s`,\n      transitionProperty: property,\n      transitionDuration: `${durationOut}s`,\n      transitionTimingFunction: easing\n    };\n    el._x_transition.leave.start = {\n      opacity: 1,\n      transform: `scale(1)`\n    };\n    el._x_transition.leave.end = {\n      opacity: opacityValue,\n      transform: `scale(${scaleValue})`\n    };\n  }\n}\nfunction registerTransitionObject(el, setFunction, defaultValue = {}) {\n  if (!el._x_transition)\n    el._x_transition = {\n      enter: { during: defaultValue, start: defaultValue, end: defaultValue },\n      leave: { during: defaultValue, start: defaultValue, end: defaultValue },\n      in(before = () => {\n      }, after = () => {\n      }) {\n        transition(el, setFunction, {\n          during: this.enter.during,\n          start: this.enter.start,\n          end: this.enter.end\n        }, before, after);\n      },\n      out(before = () => {\n      }, after = () => {\n      }) {\n        transition(el, setFunction, {\n          during: this.leave.during,\n          start: this.leave.start,\n          end: this.leave.end\n        }, before, after);\n      }\n    };\n}\nwindow.Element.prototype._x_toggleAndCascadeWithTransitions = function(el, value, show, hide) {\n  const nextTick2 = document.visibilityState === \"visible\" ? requestAnimationFrame : setTimeout;\n  let clickAwayCompatibleShow = () => nextTick2(show);\n  if (value) {\n    if (el._x_transition && (el._x_transition.enter || el._x_transition.leave)) {\n      el._x_transition.enter && (Object.entries(el._x_transition.enter.during).length || Object.entries(el._x_transition.enter.start).length || Object.entries(el._x_transition.enter.end).length) ? el._x_transition.in(show) : clickAwayCompatibleShow();\n    } else {\n      el._x_transition ? el._x_transition.in(show) : clickAwayCompatibleShow();\n    }\n    return;\n  }\n  el._x_hidePromise = el._x_transition ? new Promise((resolve, reject) => {\n    el._x_transition.out(() => {\n    }, () => resolve(hide));\n    el._x_transitioning && el._x_transitioning.beforeCancel(() => reject({ isFromCancelledTransition: true }));\n  }) : Promise.resolve(hide);\n  queueMicrotask(() => {\n    let closest = closestHide(el);\n    if (closest) {\n      if (!closest._x_hideChildren)\n        closest._x_hideChildren = [];\n      closest._x_hideChildren.push(el);\n    } else {\n      nextTick2(() => {\n        let hideAfterChildren = (el2) => {\n          let carry = Promise.all([\n            el2._x_hidePromise,\n            ...(el2._x_hideChildren || []).map(hideAfterChildren)\n          ]).then(([i]) => i?.());\n          delete el2._x_hidePromise;\n          delete el2._x_hideChildren;\n          return carry;\n        };\n        hideAfterChildren(el).catch((e) => {\n          if (!e.isFromCancelledTransition)\n            throw e;\n        });\n      });\n    }\n  });\n};\nfunction closestHide(el) {\n  let parent = el.parentNode;\n  if (!parent)\n    return;\n  return parent._x_hidePromise ? parent : closestHide(parent);\n}\nfunction transition(el, setFunction, { during, start: start2, end } = {}, before = () => {\n}, after = () => {\n}) {\n  if (el._x_transitioning)\n    el._x_transitioning.cancel();\n  if (Object.keys(during).length === 0 && Object.keys(start2).length === 0 && Object.keys(end).length === 0) {\n    before();\n    after();\n    return;\n  }\n  let undoStart, undoDuring, undoEnd;\n  performTransition(el, {\n    start() {\n      undoStart = setFunction(el, start2);\n    },\n    during() {\n      undoDuring = setFunction(el, during);\n    },\n    before,\n    end() {\n      undoStart();\n      undoEnd = setFunction(el, end);\n    },\n    after,\n    cleanup() {\n      undoDuring();\n      undoEnd();\n    }\n  });\n}\nfunction performTransition(el, stages) {\n  let interrupted, reachedBefore, reachedEnd;\n  let finish = once(() => {\n    mutateDom(() => {\n      interrupted = true;\n      if (!reachedBefore)\n        stages.before();\n      if (!reachedEnd) {\n        stages.end();\n        releaseNextTicks();\n      }\n      stages.after();\n      if (el.isConnected)\n        stages.cleanup();\n      delete el._x_transitioning;\n    });\n  });\n  el._x_transitioning = {\n    beforeCancels: [],\n    beforeCancel(callback) {\n      this.beforeCancels.push(callback);\n    },\n    cancel: once(function() {\n      while (this.beforeCancels.length) {\n        this.beforeCancels.shift()();\n      }\n      ;\n      finish();\n    }),\n    finish\n  };\n  mutateDom(() => {\n    stages.start();\n    stages.during();\n  });\n  holdNextTicks();\n  requestAnimationFrame(() => {\n    if (interrupted)\n      return;\n    let duration = Number(getComputedStyle(el).transitionDuration.replace(/,.*/, \"\").replace(\"s\", \"\")) * 1e3;\n    let delay = Number(getComputedStyle(el).transitionDelay.replace(/,.*/, \"\").replace(\"s\", \"\")) * 1e3;\n    if (duration === 0)\n      duration = Number(getComputedStyle(el).animationDuration.replace(\"s\", \"\")) * 1e3;\n    mutateDom(() => {\n      stages.before();\n    });\n    reachedBefore = true;\n    requestAnimationFrame(() => {\n      if (interrupted)\n        return;\n      mutateDom(() => {\n        stages.end();\n      });\n      releaseNextTicks();\n      setTimeout(el._x_transitioning.finish, duration + delay);\n      reachedEnd = true;\n    });\n  });\n}\nfunction modifierValue(modifiers, key, fallback) {\n  if (modifiers.indexOf(key) === -1)\n    return fallback;\n  const rawValue = modifiers[modifiers.indexOf(key) + 1];\n  if (!rawValue)\n    return fallback;\n  if (key === \"scale\") {\n    if (isNaN(rawValue))\n      return fallback;\n  }\n  if (key === \"duration\" || key === \"delay\") {\n    let match = rawValue.match(/([0-9]+)ms/);\n    if (match)\n      return match[1];\n  }\n  if (key === \"origin\") {\n    if ([\"top\", \"right\", \"left\", \"center\", \"bottom\"].includes(modifiers[modifiers.indexOf(key) + 2])) {\n      return [rawValue, modifiers[modifiers.indexOf(key) + 2]].join(\" \");\n    }\n  }\n  return rawValue;\n}\n\n// packages/alpinejs/src/clone.js\nvar isCloning = false;\nfunction skipDuringClone(callback, fallback = () => {\n}) {\n  return (...args) => isCloning ? fallback(...args) : callback(...args);\n}\nfunction onlyDuringClone(callback) {\n  return (...args) => isCloning && callback(...args);\n}\nvar interceptors = [];\nfunction interceptClone(callback) {\n  interceptors.push(callback);\n}\nfunction cloneNode(from, to) {\n  interceptors.forEach((i) => i(from, to));\n  isCloning = true;\n  dontRegisterReactiveSideEffects(() => {\n    initTree(to, (el, callback) => {\n      callback(el, () => {\n      });\n    });\n  });\n  isCloning = false;\n}\nvar isCloningLegacy = false;\nfunction clone(oldEl, newEl) {\n  if (!newEl._x_dataStack)\n    newEl._x_dataStack = oldEl._x_dataStack;\n  isCloning = true;\n  isCloningLegacy = true;\n  dontRegisterReactiveSideEffects(() => {\n    cloneTree(newEl);\n  });\n  isCloning = false;\n  isCloningLegacy = false;\n}\nfunction cloneTree(el) {\n  let hasRunThroughFirstEl = false;\n  let shallowWalker = (el2, callback) => {\n    walk(el2, (el3, skip) => {\n      if (hasRunThroughFirstEl && isRoot(el3))\n        return skip();\n      hasRunThroughFirstEl = true;\n      callback(el3, skip);\n    });\n  };\n  initTree(el, shallowWalker);\n}\nfunction dontRegisterReactiveSideEffects(callback) {\n  let cache = effect;\n  overrideEffect((callback2, el) => {\n    let storedEffect = cache(callback2);\n    release(storedEffect);\n    return () => {\n    };\n  });\n  callback();\n  overrideEffect(cache);\n}\n\n// packages/alpinejs/src/utils/bind.js\nfunction bind(el, name, value, modifiers = []) {\n  if (!el._x_bindings)\n    el._x_bindings = reactive({});\n  el._x_bindings[name] = value;\n  name = modifiers.includes(\"camel\") ? camelCase(name) : name;\n  switch (name) {\n    case \"value\":\n      bindInputValue(el, value);\n      break;\n    case \"style\":\n      bindStyles(el, value);\n      break;\n    case \"class\":\n      bindClasses(el, value);\n      break;\n    case \"selected\":\n    case \"checked\":\n      bindAttributeAndProperty(el, name, value);\n      break;\n    default:\n      bindAttribute(el, name, value);\n      break;\n  }\n}\nfunction bindInputValue(el, value) {\n  if (el.type === \"radio\") {\n    if (el.attributes.value === void 0) {\n      el.value = value;\n    }\n    if (window.fromModel) {\n      if (typeof value === \"boolean\") {\n        el.checked = safeParseBoolean(el.value) === value;\n      } else {\n        el.checked = checkedAttrLooseCompare(el.value, value);\n      }\n    }\n  } else if (el.type === \"checkbox\") {\n    if (Number.isInteger(value)) {\n      el.value = value;\n    } else if (!Array.isArray(value) && typeof value !== \"boolean\" && ![null, void 0].includes(value)) {\n      el.value = String(value);\n    } else {\n      if (Array.isArray(value)) {\n        el.checked = value.some((val) => checkedAttrLooseCompare(val, el.value));\n      } else {\n        el.checked = !!value;\n      }\n    }\n  } else if (el.tagName === \"SELECT\") {\n    updateSelect(el, value);\n  } else {\n    if (el.value === value)\n      return;\n    el.value = value === void 0 ? \"\" : value;\n  }\n}\nfunction bindClasses(el, value) {\n  if (el._x_undoAddedClasses)\n    el._x_undoAddedClasses();\n  el._x_undoAddedClasses = setClasses(el, value);\n}\nfunction bindStyles(el, value) {\n  if (el._x_undoAddedStyles)\n    el._x_undoAddedStyles();\n  el._x_undoAddedStyles = setStyles(el, value);\n}\nfunction bindAttributeAndProperty(el, name, value) {\n  bindAttribute(el, name, value);\n  setPropertyIfChanged(el, name, value);\n}\nfunction bindAttribute(el, name, value) {\n  if ([null, void 0, false].includes(value) && attributeShouldntBePreservedIfFalsy(name)) {\n    el.removeAttribute(name);\n  } else {\n    if (isBooleanAttr(name))\n      value = name;\n    setIfChanged(el, name, value);\n  }\n}\nfunction setIfChanged(el, attrName, value) {\n  if (el.getAttribute(attrName) != value) {\n    el.setAttribute(attrName, value);\n  }\n}\nfunction setPropertyIfChanged(el, propName, value) {\n  if (el[propName] !== value) {\n    el[propName] = value;\n  }\n}\nfunction updateSelect(el, value) {\n  const arrayWrappedValue = [].concat(value).map((value2) => {\n    return value2 + \"\";\n  });\n  Array.from(el.options).forEach((option) => {\n    option.selected = arrayWrappedValue.includes(option.value);\n  });\n}\nfunction camelCase(subject) {\n  return subject.toLowerCase().replace(/-(\\w)/g, (match, char) => char.toUpperCase());\n}\nfunction checkedAttrLooseCompare(valueA, valueB) {\n  return valueA == valueB;\n}\nfunction safeParseBoolean(rawValue) {\n  if ([1, \"1\", \"true\", \"on\", \"yes\", true].includes(rawValue)) {\n    return true;\n  }\n  if ([0, \"0\", \"false\", \"off\", \"no\", false].includes(rawValue)) {\n    return false;\n  }\n  return rawValue ? Boolean(rawValue) : null;\n}\nfunction isBooleanAttr(attrName) {\n  const booleanAttributes = [\n    \"disabled\",\n    \"checked\",\n    \"required\",\n    \"readonly\",\n    \"open\",\n    \"selected\",\n    \"autofocus\",\n    \"itemscope\",\n    \"multiple\",\n    \"novalidate\",\n    \"allowfullscreen\",\n    \"allowpaymentrequest\",\n    \"formnovalidate\",\n    \"autoplay\",\n    \"controls\",\n    \"loop\",\n    \"muted\",\n    \"playsinline\",\n    \"default\",\n    \"ismap\",\n    \"reversed\",\n    \"async\",\n    \"defer\",\n    \"nomodule\"\n  ];\n  return booleanAttributes.includes(attrName);\n}\nfunction attributeShouldntBePreservedIfFalsy(name) {\n  return ![\"aria-pressed\", \"aria-checked\", \"aria-expanded\", \"aria-selected\"].includes(name);\n}\nfunction getBinding(el, name, fallback) {\n  if (el._x_bindings && el._x_bindings[name] !== void 0)\n    return el._x_bindings[name];\n  return getAttributeBinding(el, name, fallback);\n}\nfunction extractProp(el, name, fallback, extract = true) {\n  if (el._x_bindings && el._x_bindings[name] !== void 0)\n    return el._x_bindings[name];\n  if (el._x_inlineBindings && el._x_inlineBindings[name] !== void 0) {\n    let binding = el._x_inlineBindings[name];\n    binding.extract = extract;\n    return dontAutoEvaluateFunctions(() => {\n      return evaluate(el, binding.expression);\n    });\n  }\n  return getAttributeBinding(el, name, fallback);\n}\nfunction getAttributeBinding(el, name, fallback) {\n  let attr = el.getAttribute(name);\n  if (attr === null)\n    return typeof fallback === \"function\" ? fallback() : fallback;\n  if (attr === \"\")\n    return true;\n  if (isBooleanAttr(name)) {\n    return !![name, \"true\"].includes(attr);\n  }\n  return attr;\n}\n\n// packages/alpinejs/src/utils/debounce.js\nfunction debounce(func, wait) {\n  var timeout;\n  return function() {\n    var context = this, args = arguments;\n    var later = function() {\n      timeout = null;\n      func.apply(context, args);\n    };\n    clearTimeout(timeout);\n    timeout = setTimeout(later, wait);\n  };\n}\n\n// packages/alpinejs/src/utils/throttle.js\nfunction throttle(func, limit) {\n  let inThrottle;\n  return function() {\n    let context = this, args = arguments;\n    if (!inThrottle) {\n      func.apply(context, args);\n      inThrottle = true;\n      setTimeout(() => inThrottle = false, limit);\n    }\n  };\n}\n\n// packages/alpinejs/src/entangle.js\nfunction entangle({ get: outerGet, set: outerSet }, { get: innerGet, set: innerSet }) {\n  let firstRun = true;\n  let outerHash;\n  let innerHash;\n  let reference = effect(() => {\n    let outer = outerGet();\n    let inner = innerGet();\n    if (firstRun) {\n      innerSet(cloneIfObject(outer));\n      firstRun = false;\n    } else {\n      let outerHashLatest = JSON.stringify(outer);\n      let innerHashLatest = JSON.stringify(inner);\n      if (outerHashLatest !== outerHash) {\n        innerSet(cloneIfObject(outer));\n      } else if (outerHashLatest !== innerHashLatest) {\n        outerSet(cloneIfObject(inner));\n      } else {\n      }\n    }\n    outerHash = JSON.stringify(outerGet());\n    innerHash = JSON.stringify(innerGet());\n  });\n  return () => {\n    release(reference);\n  };\n}\nfunction cloneIfObject(value) {\n  return typeof value === \"object\" ? JSON.parse(JSON.stringify(value)) : value;\n}\n\n// packages/alpinejs/src/plugin.js\nfunction plugin(callback) {\n  let callbacks = Array.isArray(callback) ? callback : [callback];\n  callbacks.forEach((i) => i(alpine_default));\n}\n\n// packages/alpinejs/src/store.js\nvar stores = {};\nvar isReactive = false;\nfunction store(name, value) {\n  if (!isReactive) {\n    stores = reactive(stores);\n    isReactive = true;\n  }\n  if (value === void 0) {\n    return stores[name];\n  }\n  stores[name] = value;\n  if (typeof value === \"object\" && value !== null && value.hasOwnProperty(\"init\") && typeof value.init === \"function\") {\n    stores[name].init();\n  }\n  initInterceptors(stores[name]);\n}\nfunction getStores() {\n  return stores;\n}\n\n// packages/alpinejs/src/binds.js\nvar binds = {};\nfunction bind2(name, bindings) {\n  let getBindings = typeof bindings !== \"function\" ? () => bindings : bindings;\n  if (name instanceof Element) {\n    return applyBindingsObject(name, getBindings());\n  } else {\n    binds[name] = getBindings;\n  }\n  return () => {\n  };\n}\nfunction injectBindingProviders(obj) {\n  Object.entries(binds).forEach(([name, callback]) => {\n    Object.defineProperty(obj, name, {\n      get() {\n        return (...args) => {\n          return callback(...args);\n        };\n      }\n    });\n  });\n  return obj;\n}\nfunction applyBindingsObject(el, obj, original) {\n  let cleanupRunners = [];\n  while (cleanupRunners.length)\n    cleanupRunners.pop()();\n  let attributes = Object.entries(obj).map(([name, value]) => ({ name, value }));\n  let staticAttributes = attributesOnly(attributes);\n  attributes = attributes.map((attribute) => {\n    if (staticAttributes.find((attr) => attr.name === attribute.name)) {\n      return {\n        name: `x-bind:${attribute.name}`,\n        value: `\"${attribute.value}\"`\n      };\n    }\n    return attribute;\n  });\n  directives(el, attributes, original).map((handle) => {\n    cleanupRunners.push(handle.runCleanups);\n    handle();\n  });\n  return () => {\n    while (cleanupRunners.length)\n      cleanupRunners.pop()();\n  };\n}\n\n// packages/alpinejs/src/datas.js\nvar datas = {};\nfunction data(name, callback) {\n  datas[name] = callback;\n}\nfunction injectDataProviders(obj, context) {\n  Object.entries(datas).forEach(([name, callback]) => {\n    Object.defineProperty(obj, name, {\n      get() {\n        return (...args) => {\n          return callback.bind(context)(...args);\n        };\n      },\n      enumerable: false\n    });\n  });\n  return obj;\n}\n\n// packages/alpinejs/src/alpine.js\nvar Alpine = {\n  get reactive() {\n    return reactive;\n  },\n  get release() {\n    return release;\n  },\n  get effect() {\n    return effect;\n  },\n  get raw() {\n    return raw;\n  },\n  version: \"3.14.1\",\n  flushAndStopDeferringMutations,\n  dontAutoEvaluateFunctions,\n  disableEffectScheduling,\n  startObservingMutations,\n  stopObservingMutations,\n  setReactivityEngine,\n  onAttributeRemoved,\n  onAttributesAdded,\n  closestDataStack,\n  skipDuringClone,\n  onlyDuringClone,\n  addRootSelector,\n  addInitSelector,\n  interceptClone,\n  addScopeToNode,\n  deferMutations,\n  mapAttributes,\n  evaluateLater,\n  interceptInit,\n  setEvaluator,\n  mergeProxies,\n  extractProp,\n  findClosest,\n  onElRemoved,\n  closestRoot,\n  destroyTree,\n  interceptor,\n  // INTERNAL: not public API and is subject to change without major release.\n  transition,\n  // INTERNAL\n  setStyles,\n  // INTERNAL\n  mutateDom,\n  directive,\n  entangle,\n  throttle,\n  debounce,\n  evaluate,\n  initTree,\n  nextTick,\n  prefixed: prefix,\n  prefix: setPrefix,\n  plugin,\n  magic,\n  store,\n  start,\n  clone,\n  // INTERNAL\n  cloneNode,\n  // INTERNAL\n  bound: getBinding,\n  $data: scope,\n  watch,\n  walk,\n  data,\n  bind: bind2\n};\nvar alpine_default = Alpine;\n\n// node_modules/@vue/shared/dist/shared.esm-bundler.js\nfunction makeMap(str, expectsLowerCase) {\n  const map = /* @__PURE__ */ Object.create(null);\n  const list = str.split(\",\");\n  for (let i = 0; i < list.length; i++) {\n    map[list[i]] = true;\n  }\n  return expectsLowerCase ? (val) => !!map[val.toLowerCase()] : (val) => !!map[val];\n}\nvar specialBooleanAttrs = `itemscope,allowfullscreen,formnovalidate,ismap,nomodule,novalidate,readonly`;\nvar isBooleanAttr2 = /* @__PURE__ */ makeMap(specialBooleanAttrs + `,async,autofocus,autoplay,controls,default,defer,disabled,hidden,loop,open,required,reversed,scoped,seamless,checked,muted,multiple,selected`);\nvar EMPTY_OBJ = true ? Object.freeze({}) : {};\nvar EMPTY_ARR = true ? Object.freeze([]) : [];\nvar hasOwnProperty = Object.prototype.hasOwnProperty;\nvar hasOwn = (val, key) => hasOwnProperty.call(val, key);\nvar isArray = Array.isArray;\nvar isMap = (val) => toTypeString(val) === \"[object Map]\";\nvar isString = (val) => typeof val === \"string\";\nvar isSymbol = (val) => typeof val === \"symbol\";\nvar isObject = (val) => val !== null && typeof val === \"object\";\nvar objectToString = Object.prototype.toString;\nvar toTypeString = (value) => objectToString.call(value);\nvar toRawType = (value) => {\n  return toTypeString(value).slice(8, -1);\n};\nvar isIntegerKey = (key) => isString(key) && key !== \"NaN\" && key[0] !== \"-\" && \"\" + parseInt(key, 10) === key;\nvar cacheStringFunction = (fn) => {\n  const cache = /* @__PURE__ */ Object.create(null);\n  return (str) => {\n    const hit = cache[str];\n    return hit || (cache[str] = fn(str));\n  };\n};\nvar camelizeRE = /-(\\w)/g;\nvar camelize = cacheStringFunction((str) => {\n  return str.replace(camelizeRE, (_, c) => c ? c.toUpperCase() : \"\");\n});\nvar hyphenateRE = /\\B([A-Z])/g;\nvar hyphenate = cacheStringFunction((str) => str.replace(hyphenateRE, \"-$1\").toLowerCase());\nvar capitalize = cacheStringFunction((str) => str.charAt(0).toUpperCase() + str.slice(1));\nvar toHandlerKey = cacheStringFunction((str) => str ? `on${capitalize(str)}` : ``);\nvar hasChanged = (value, oldValue) => value !== oldValue && (value === value || oldValue === oldValue);\n\n// node_modules/@vue/reactivity/dist/reactivity.esm-bundler.js\nvar targetMap = /* @__PURE__ */ new WeakMap();\nvar effectStack = [];\nvar activeEffect;\nvar ITERATE_KEY = Symbol(true ? \"iterate\" : \"\");\nvar MAP_KEY_ITERATE_KEY = Symbol(true ? \"Map key iterate\" : \"\");\nfunction isEffect(fn) {\n  return fn && fn._isEffect === true;\n}\nfunction effect2(fn, options = EMPTY_OBJ) {\n  if (isEffect(fn)) {\n    fn = fn.raw;\n  }\n  const effect3 = createReactiveEffect(fn, options);\n  if (!options.lazy) {\n    effect3();\n  }\n  return effect3;\n}\nfunction stop(effect3) {\n  if (effect3.active) {\n    cleanup(effect3);\n    if (effect3.options.onStop) {\n      effect3.options.onStop();\n    }\n    effect3.active = false;\n  }\n}\nvar uid = 0;\nfunction createReactiveEffect(fn, options) {\n  const effect3 = function reactiveEffect() {\n    if (!effect3.active) {\n      return fn();\n    }\n    if (!effectStack.includes(effect3)) {\n      cleanup(effect3);\n      try {\n        enableTracking();\n        effectStack.push(effect3);\n        activeEffect = effect3;\n        return fn();\n      } finally {\n        effectStack.pop();\n        resetTracking();\n        activeEffect = effectStack[effectStack.length - 1];\n      }\n    }\n  };\n  effect3.id = uid++;\n  effect3.allowRecurse = !!options.allowRecurse;\n  effect3._isEffect = true;\n  effect3.active = true;\n  effect3.raw = fn;\n  effect3.deps = [];\n  effect3.options = options;\n  return effect3;\n}\nfunction cleanup(effect3) {\n  const { deps } = effect3;\n  if (deps.length) {\n    for (let i = 0; i < deps.length; i++) {\n      deps[i].delete(effect3);\n    }\n    deps.length = 0;\n  }\n}\nvar shouldTrack = true;\nvar trackStack = [];\nfunction pauseTracking() {\n  trackStack.push(shouldTrack);\n  shouldTrack = false;\n}\nfunction enableTracking() {\n  trackStack.push(shouldTrack);\n  shouldTrack = true;\n}\nfunction resetTracking() {\n  const last = trackStack.pop();\n  shouldTrack = last === void 0 ? true : last;\n}\nfunction track(target, type, key) {\n  if (!shouldTrack || activeEffect === void 0) {\n    return;\n  }\n  let depsMap = targetMap.get(target);\n  if (!depsMap) {\n    targetMap.set(target, depsMap = /* @__PURE__ */ new Map());\n  }\n  let dep = depsMap.get(key);\n  if (!dep) {\n    depsMap.set(key, dep = /* @__PURE__ */ new Set());\n  }\n  if (!dep.has(activeEffect)) {\n    dep.add(activeEffect);\n    activeEffect.deps.push(dep);\n    if (activeEffect.options.onTrack) {\n      activeEffect.options.onTrack({\n        effect: activeEffect,\n        target,\n        type,\n        key\n      });\n    }\n  }\n}\nfunction trigger(target, type, key, newValue, oldValue, oldTarget) {\n  const depsMap = targetMap.get(target);\n  if (!depsMap) {\n    return;\n  }\n  const effects = /* @__PURE__ */ new Set();\n  const add2 = (effectsToAdd) => {\n    if (effectsToAdd) {\n      effectsToAdd.forEach((effect3) => {\n        if (effect3 !== activeEffect || effect3.allowRecurse) {\n          effects.add(effect3);\n        }\n      });\n    }\n  };\n  if (type === \"clear\") {\n    depsMap.forEach(add2);\n  } else if (key === \"length\" && isArray(target)) {\n    depsMap.forEach((dep, key2) => {\n      if (key2 === \"length\" || key2 >= newValue) {\n        add2(dep);\n      }\n    });\n  } else {\n    if (key !== void 0) {\n      add2(depsMap.get(key));\n    }\n    switch (type) {\n      case \"add\":\n        if (!isArray(target)) {\n          add2(depsMap.get(ITERATE_KEY));\n          if (isMap(target)) {\n            add2(depsMap.get(MAP_KEY_ITERATE_KEY));\n          }\n        } else if (isIntegerKey(key)) {\n          add2(depsMap.get(\"length\"));\n        }\n        break;\n      case \"delete\":\n        if (!isArray(target)) {\n          add2(depsMap.get(ITERATE_KEY));\n          if (isMap(target)) {\n            add2(depsMap.get(MAP_KEY_ITERATE_KEY));\n          }\n        }\n        break;\n      case \"set\":\n        if (isMap(target)) {\n          add2(depsMap.get(ITERATE_KEY));\n        }\n        break;\n    }\n  }\n  const run = (effect3) => {\n    if (effect3.options.onTrigger) {\n      effect3.options.onTrigger({\n        effect: effect3,\n        target,\n        key,\n        type,\n        newValue,\n        oldValue,\n        oldTarget\n      });\n    }\n    if (effect3.options.scheduler) {\n      effect3.options.scheduler(effect3);\n    } else {\n      effect3();\n    }\n  };\n  effects.forEach(run);\n}\nvar isNonTrackableKeys = /* @__PURE__ */ makeMap(`__proto__,__v_isRef,__isVue`);\nvar builtInSymbols = new Set(Object.getOwnPropertyNames(Symbol).map((key) => Symbol[key]).filter(isSymbol));\nvar get2 = /* @__PURE__ */ createGetter();\nvar readonlyGet = /* @__PURE__ */ createGetter(true);\nvar arrayInstrumentations = /* @__PURE__ */ createArrayInstrumentations();\nfunction createArrayInstrumentations() {\n  const instrumentations = {};\n  [\"includes\", \"indexOf\", \"lastIndexOf\"].forEach((key) => {\n    instrumentations[key] = function(...args) {\n      const arr = toRaw(this);\n      for (let i = 0, l = this.length; i < l; i++) {\n        track(arr, \"get\", i + \"\");\n      }\n      const res = arr[key](...args);\n      if (res === -1 || res === false) {\n        return arr[key](...args.map(toRaw));\n      } else {\n        return res;\n      }\n    };\n  });\n  [\"push\", \"pop\", \"shift\", \"unshift\", \"splice\"].forEach((key) => {\n    instrumentations[key] = function(...args) {\n      pauseTracking();\n      const res = toRaw(this)[key].apply(this, args);\n      resetTracking();\n      return res;\n    };\n  });\n  return instrumentations;\n}\nfunction createGetter(isReadonly = false, shallow = false) {\n  return function get3(target, key, receiver) {\n    if (key === \"__v_isReactive\") {\n      return !isReadonly;\n    } else if (key === \"__v_isReadonly\") {\n      return isReadonly;\n    } else if (key === \"__v_raw\" && receiver === (isReadonly ? shallow ? shallowReadonlyMap : readonlyMap : shallow ? shallowReactiveMap : reactiveMap).get(target)) {\n      return target;\n    }\n    const targetIsArray = isArray(target);\n    if (!isReadonly && targetIsArray && hasOwn(arrayInstrumentations, key)) {\n      return Reflect.get(arrayInstrumentations, key, receiver);\n    }\n    const res = Reflect.get(target, key, receiver);\n    if (isSymbol(key) ? builtInSymbols.has(key) : isNonTrackableKeys(key)) {\n      return res;\n    }\n    if (!isReadonly) {\n      track(target, \"get\", key);\n    }\n    if (shallow) {\n      return res;\n    }\n    if (isRef(res)) {\n      const shouldUnwrap = !targetIsArray || !isIntegerKey(key);\n      return shouldUnwrap ? res.value : res;\n    }\n    if (isObject(res)) {\n      return isReadonly ? readonly(res) : reactive2(res);\n    }\n    return res;\n  };\n}\nvar set2 = /* @__PURE__ */ createSetter();\nfunction createSetter(shallow = false) {\n  return function set3(target, key, value, receiver) {\n    let oldValue = target[key];\n    if (!shallow) {\n      value = toRaw(value);\n      oldValue = toRaw(oldValue);\n      if (!isArray(target) && isRef(oldValue) && !isRef(value)) {\n        oldValue.value = value;\n        return true;\n      }\n    }\n    const hadKey = isArray(target) && isIntegerKey(key) ? Number(key) < target.length : hasOwn(target, key);\n    const result = Reflect.set(target, key, value, receiver);\n    if (target === toRaw(receiver)) {\n      if (!hadKey) {\n        trigger(target, \"add\", key, value);\n      } else if (hasChanged(value, oldValue)) {\n        trigger(target, \"set\", key, value, oldValue);\n      }\n    }\n    return result;\n  };\n}\nfunction deleteProperty(target, key) {\n  const hadKey = hasOwn(target, key);\n  const oldValue = target[key];\n  const result = Reflect.deleteProperty(target, key);\n  if (result && hadKey) {\n    trigger(target, \"delete\", key, void 0, oldValue);\n  }\n  return result;\n}\nfunction has(target, key) {\n  const result = Reflect.has(target, key);\n  if (!isSymbol(key) || !builtInSymbols.has(key)) {\n    track(target, \"has\", key);\n  }\n  return result;\n}\nfunction ownKeys(target) {\n  track(target, \"iterate\", isArray(target) ? \"length\" : ITERATE_KEY);\n  return Reflect.ownKeys(target);\n}\nvar mutableHandlers = {\n  get: get2,\n  set: set2,\n  deleteProperty,\n  has,\n  ownKeys\n};\nvar readonlyHandlers = {\n  get: readonlyGet,\n  set(target, key) {\n    if (true) {\n      console.warn(`Set operation on key \"${String(key)}\" failed: target is readonly.`, target);\n    }\n    return true;\n  },\n  deleteProperty(target, key) {\n    if (true) {\n      console.warn(`Delete operation on key \"${String(key)}\" failed: target is readonly.`, target);\n    }\n    return true;\n  }\n};\nvar toReactive = (value) => isObject(value) ? reactive2(value) : value;\nvar toReadonly = (value) => isObject(value) ? readonly(value) : value;\nvar toShallow = (value) => value;\nvar getProto = (v) => Reflect.getPrototypeOf(v);\nfunction get$1(target, key, isReadonly = false, isShallow = false) {\n  target = target[\n    \"__v_raw\"\n    /* RAW */\n  ];\n  const rawTarget = toRaw(target);\n  const rawKey = toRaw(key);\n  if (key !== rawKey) {\n    !isReadonly && track(rawTarget, \"get\", key);\n  }\n  !isReadonly && track(rawTarget, \"get\", rawKey);\n  const { has: has2 } = getProto(rawTarget);\n  const wrap = isShallow ? toShallow : isReadonly ? toReadonly : toReactive;\n  if (has2.call(rawTarget, key)) {\n    return wrap(target.get(key));\n  } else if (has2.call(rawTarget, rawKey)) {\n    return wrap(target.get(rawKey));\n  } else if (target !== rawTarget) {\n    target.get(key);\n  }\n}\nfunction has$1(key, isReadonly = false) {\n  const target = this[\n    \"__v_raw\"\n    /* RAW */\n  ];\n  const rawTarget = toRaw(target);\n  const rawKey = toRaw(key);\n  if (key !== rawKey) {\n    !isReadonly && track(rawTarget, \"has\", key);\n  }\n  !isReadonly && track(rawTarget, \"has\", rawKey);\n  return key === rawKey ? target.has(key) : target.has(key) || target.has(rawKey);\n}\nfunction size(target, isReadonly = false) {\n  target = target[\n    \"__v_raw\"\n    /* RAW */\n  ];\n  !isReadonly && track(toRaw(target), \"iterate\", ITERATE_KEY);\n  return Reflect.get(target, \"size\", target);\n}\nfunction add(value) {\n  value = toRaw(value);\n  const target = toRaw(this);\n  const proto = getProto(target);\n  const hadKey = proto.has.call(target, value);\n  if (!hadKey) {\n    target.add(value);\n    trigger(target, \"add\", value, value);\n  }\n  return this;\n}\nfunction set$1(key, value) {\n  value = toRaw(value);\n  const target = toRaw(this);\n  const { has: has2, get: get3 } = getProto(target);\n  let hadKey = has2.call(target, key);\n  if (!hadKey) {\n    key = toRaw(key);\n    hadKey = has2.call(target, key);\n  } else if (true) {\n    checkIdentityKeys(target, has2, key);\n  }\n  const oldValue = get3.call(target, key);\n  target.set(key, value);\n  if (!hadKey) {\n    trigger(target, \"add\", key, value);\n  } else if (hasChanged(value, oldValue)) {\n    trigger(target, \"set\", key, value, oldValue);\n  }\n  return this;\n}\nfunction deleteEntry(key) {\n  const target = toRaw(this);\n  const { has: has2, get: get3 } = getProto(target);\n  let hadKey = has2.call(target, key);\n  if (!hadKey) {\n    key = toRaw(key);\n    hadKey = has2.call(target, key);\n  } else if (true) {\n    checkIdentityKeys(target, has2, key);\n  }\n  const oldValue = get3 ? get3.call(target, key) : void 0;\n  const result = target.delete(key);\n  if (hadKey) {\n    trigger(target, \"delete\", key, void 0, oldValue);\n  }\n  return result;\n}\nfunction clear() {\n  const target = toRaw(this);\n  const hadItems = target.size !== 0;\n  const oldTarget = true ? isMap(target) ? new Map(target) : new Set(target) : void 0;\n  const result = target.clear();\n  if (hadItems) {\n    trigger(target, \"clear\", void 0, void 0, oldTarget);\n  }\n  return result;\n}\nfunction createForEach(isReadonly, isShallow) {\n  return function forEach(callback, thisArg) {\n    const observed = this;\n    const target = observed[\n      \"__v_raw\"\n      /* RAW */\n    ];\n    const rawTarget = toRaw(target);\n    const wrap = isShallow ? toShallow : isReadonly ? toReadonly : toReactive;\n    !isReadonly && track(rawTarget, \"iterate\", ITERATE_KEY);\n    return target.forEach((value, key) => {\n      return callback.call(thisArg, wrap(value), wrap(key), observed);\n    });\n  };\n}\nfunction createIterableMethod(method, isReadonly, isShallow) {\n  return function(...args) {\n    const target = this[\n      \"__v_raw\"\n      /* RAW */\n    ];\n    const rawTarget = toRaw(target);\n    const targetIsMap = isMap(rawTarget);\n    const isPair = method === \"entries\" || method === Symbol.iterator && targetIsMap;\n    const isKeyOnly = method === \"keys\" && targetIsMap;\n    const innerIterator = target[method](...args);\n    const wrap = isShallow ? toShallow : isReadonly ? toReadonly : toReactive;\n    !isReadonly && track(rawTarget, \"iterate\", isKeyOnly ? MAP_KEY_ITERATE_KEY : ITERATE_KEY);\n    return {\n      // iterator protocol\n      next() {\n        const { value, done } = innerIterator.next();\n        return done ? { value, done } : {\n          value: isPair ? [wrap(value[0]), wrap(value[1])] : wrap(value),\n          done\n        };\n      },\n      // iterable protocol\n      [Symbol.iterator]() {\n        return this;\n      }\n    };\n  };\n}\nfunction createReadonlyMethod(type) {\n  return function(...args) {\n    if (true) {\n      const key = args[0] ? `on key \"${args[0]}\" ` : ``;\n      console.warn(`${capitalize(type)} operation ${key}failed: target is readonly.`, toRaw(this));\n    }\n    return type === \"delete\" ? false : this;\n  };\n}\nfunction createInstrumentations() {\n  const mutableInstrumentations2 = {\n    get(key) {\n      return get$1(this, key);\n    },\n    get size() {\n      return size(this);\n    },\n    has: has$1,\n    add,\n    set: set$1,\n    delete: deleteEntry,\n    clear,\n    forEach: createForEach(false, false)\n  };\n  const shallowInstrumentations2 = {\n    get(key) {\n      return get$1(this, key, false, true);\n    },\n    get size() {\n      return size(this);\n    },\n    has: has$1,\n    add,\n    set: set$1,\n    delete: deleteEntry,\n    clear,\n    forEach: createForEach(false, true)\n  };\n  const readonlyInstrumentations2 = {\n    get(key) {\n      return get$1(this, key, true);\n    },\n    get size() {\n      return size(this, true);\n    },\n    has(key) {\n      return has$1.call(this, key, true);\n    },\n    add: createReadonlyMethod(\n      \"add\"\n      /* ADD */\n    ),\n    set: createReadonlyMethod(\n      \"set\"\n      /* SET */\n    ),\n    delete: createReadonlyMethod(\n      \"delete\"\n      /* DELETE */\n    ),\n    clear: createReadonlyMethod(\n      \"clear\"\n      /* CLEAR */\n    ),\n    forEach: createForEach(true, false)\n  };\n  const shallowReadonlyInstrumentations2 = {\n    get(key) {\n      return get$1(this, key, true, true);\n    },\n    get size() {\n      return size(this, true);\n    },\n    has(key) {\n      return has$1.call(this, key, true);\n    },\n    add: createReadonlyMethod(\n      \"add\"\n      /* ADD */\n    ),\n    set: createReadonlyMethod(\n      \"set\"\n      /* SET */\n    ),\n    delete: createReadonlyMethod(\n      \"delete\"\n      /* DELETE */\n    ),\n    clear: createReadonlyMethod(\n      \"clear\"\n      /* CLEAR */\n    ),\n    forEach: createForEach(true, true)\n  };\n  const iteratorMethods = [\"keys\", \"values\", \"entries\", Symbol.iterator];\n  iteratorMethods.forEach((method) => {\n    mutableInstrumentations2[method] = createIterableMethod(method, false, false);\n    readonlyInstrumentations2[method] = createIterableMethod(method, true, false);\n    shallowInstrumentations2[method] = createIterableMethod(method, false, true);\n    shallowReadonlyInstrumentations2[method] = createIterableMethod(method, true, true);\n  });\n  return [\n    mutableInstrumentations2,\n    readonlyInstrumentations2,\n    shallowInstrumentations2,\n    shallowReadonlyInstrumentations2\n  ];\n}\nvar [mutableInstrumentations, readonlyInstrumentations, shallowInstrumentations, shallowReadonlyInstrumentations] = /* @__PURE__ */ createInstrumentations();\nfunction createInstrumentationGetter(isReadonly, shallow) {\n  const instrumentations = shallow ? isReadonly ? shallowReadonlyInstrumentations : shallowInstrumentations : isReadonly ? readonlyInstrumentations : mutableInstrumentations;\n  return (target, key, receiver) => {\n    if (key === \"__v_isReactive\") {\n      return !isReadonly;\n    } else if (key === \"__v_isReadonly\") {\n      return isReadonly;\n    } else if (key === \"__v_raw\") {\n      return target;\n    }\n    return Reflect.get(hasOwn(instrumentations, key) && key in target ? instrumentations : target, key, receiver);\n  };\n}\nvar mutableCollectionHandlers = {\n  get: /* @__PURE__ */ createInstrumentationGetter(false, false)\n};\nvar readonlyCollectionHandlers = {\n  get: /* @__PURE__ */ createInstrumentationGetter(true, false)\n};\nfunction checkIdentityKeys(target, has2, key) {\n  const rawKey = toRaw(key);\n  if (rawKey !== key && has2.call(target, rawKey)) {\n    const type = toRawType(target);\n    console.warn(`Reactive ${type} contains both the raw and reactive versions of the same object${type === `Map` ? ` as keys` : ``}, which can lead to inconsistencies. Avoid differentiating between the raw and reactive versions of an object and only use the reactive version if possible.`);\n  }\n}\nvar reactiveMap = /* @__PURE__ */ new WeakMap();\nvar shallowReactiveMap = /* @__PURE__ */ new WeakMap();\nvar readonlyMap = /* @__PURE__ */ new WeakMap();\nvar shallowReadonlyMap = /* @__PURE__ */ new WeakMap();\nfunction targetTypeMap(rawType) {\n  switch (rawType) {\n    case \"Object\":\n    case \"Array\":\n      return 1;\n    case \"Map\":\n    case \"Set\":\n    case \"WeakMap\":\n    case \"WeakSet\":\n      return 2;\n    default:\n      return 0;\n  }\n}\nfunction getTargetType(value) {\n  return value[\n    \"__v_skip\"\n    /* SKIP */\n  ] || !Object.isExtensible(value) ? 0 : targetTypeMap(toRawType(value));\n}\nfunction reactive2(target) {\n  if (target && target[\n    \"__v_isReadonly\"\n    /* IS_READONLY */\n  ]) {\n    return target;\n  }\n  return createReactiveObject(target, false, mutableHandlers, mutableCollectionHandlers, reactiveMap);\n}\nfunction readonly(target) {\n  return createReactiveObject(target, true, readonlyHandlers, readonlyCollectionHandlers, readonlyMap);\n}\nfunction createReactiveObject(target, isReadonly, baseHandlers, collectionHandlers, proxyMap) {\n  if (!isObject(target)) {\n    if (true) {\n      console.warn(`value cannot be made reactive: ${String(target)}`);\n    }\n    return target;\n  }\n  if (target[\n    \"__v_raw\"\n    /* RAW */\n  ] && !(isReadonly && target[\n    \"__v_isReactive\"\n    /* IS_REACTIVE */\n  ])) {\n    return target;\n  }\n  const existingProxy = proxyMap.get(target);\n  if (existingProxy) {\n    return existingProxy;\n  }\n  const targetType = getTargetType(target);\n  if (targetType === 0) {\n    return target;\n  }\n  const proxy = new Proxy(target, targetType === 2 ? collectionHandlers : baseHandlers);\n  proxyMap.set(target, proxy);\n  return proxy;\n}\nfunction toRaw(observed) {\n  return observed && toRaw(observed[\n    \"__v_raw\"\n    /* RAW */\n  ]) || observed;\n}\nfunction isRef(r) {\n  return Boolean(r && r.__v_isRef === true);\n}\n\n// packages/alpinejs/src/magics/$nextTick.js\nmagic(\"nextTick\", () => nextTick);\n\n// packages/alpinejs/src/magics/$dispatch.js\nmagic(\"dispatch\", (el) => dispatch.bind(dispatch, el));\n\n// packages/alpinejs/src/magics/$watch.js\nmagic(\"watch\", (el, { evaluateLater: evaluateLater2, cleanup: cleanup2 }) => (key, callback) => {\n  let evaluate2 = evaluateLater2(key);\n  let getter = () => {\n    let value;\n    evaluate2((i) => value = i);\n    return value;\n  };\n  let unwatch = watch(getter, callback);\n  cleanup2(unwatch);\n});\n\n// packages/alpinejs/src/magics/$store.js\nmagic(\"store\", getStores);\n\n// packages/alpinejs/src/magics/$data.js\nmagic(\"data\", (el) => scope(el));\n\n// packages/alpinejs/src/magics/$root.js\nmagic(\"root\", (el) => closestRoot(el));\n\n// packages/alpinejs/src/magics/$refs.js\nmagic(\"refs\", (el) => {\n  if (el._x_refs_proxy)\n    return el._x_refs_proxy;\n  el._x_refs_proxy = mergeProxies(getArrayOfRefObject(el));\n  return el._x_refs_proxy;\n});\nfunction getArrayOfRefObject(el) {\n  let refObjects = [];\n  findClosest(el, (i) => {\n    if (i._x_refs)\n      refObjects.push(i._x_refs);\n  });\n  return refObjects;\n}\n\n// packages/alpinejs/src/ids.js\nvar globalIdMemo = {};\nfunction findAndIncrementId(name) {\n  if (!globalIdMemo[name])\n    globalIdMemo[name] = 0;\n  return ++globalIdMemo[name];\n}\nfunction closestIdRoot(el, name) {\n  return findClosest(el, (element) => {\n    if (element._x_ids && element._x_ids[name])\n      return true;\n  });\n}\nfunction setIdRoot(el, name) {\n  if (!el._x_ids)\n    el._x_ids = {};\n  if (!el._x_ids[name])\n    el._x_ids[name] = findAndIncrementId(name);\n}\n\n// packages/alpinejs/src/magics/$id.js\nmagic(\"id\", (el, { cleanup: cleanup2 }) => (name, key = null) => {\n  let cacheKey = `${name}${key ? `-${key}` : \"\"}`;\n  return cacheIdByNameOnElement(el, cacheKey, cleanup2, () => {\n    let root = closestIdRoot(el, name);\n    let id = root ? root._x_ids[name] : findAndIncrementId(name);\n    return key ? `${name}-${id}-${key}` : `${name}-${id}`;\n  });\n});\ninterceptClone((from, to) => {\n  if (from._x_id) {\n    to._x_id = from._x_id;\n  }\n});\nfunction cacheIdByNameOnElement(el, cacheKey, cleanup2, callback) {\n  if (!el._x_id)\n    el._x_id = {};\n  if (el._x_id[cacheKey])\n    return el._x_id[cacheKey];\n  let output = callback();\n  el._x_id[cacheKey] = output;\n  cleanup2(() => {\n    delete el._x_id[cacheKey];\n  });\n  return output;\n}\n\n// packages/alpinejs/src/magics/$el.js\nmagic(\"el\", (el) => el);\n\n// packages/alpinejs/src/magics/index.js\nwarnMissingPluginMagic(\"Focus\", \"focus\", \"focus\");\nwarnMissingPluginMagic(\"Persist\", \"persist\", \"persist\");\nfunction warnMissingPluginMagic(name, magicName, slug) {\n  magic(magicName, (el) => warn(`You can't use [$${magicName}] without first installing the \"${name}\" plugin here: https://alpinejs.dev/plugins/${slug}`, el));\n}\n\n// packages/alpinejs/src/directives/x-modelable.js\ndirective(\"modelable\", (el, { expression }, { effect: effect3, evaluateLater: evaluateLater2, cleanup: cleanup2 }) => {\n  let func = evaluateLater2(expression);\n  let innerGet = () => {\n    let result;\n    func((i) => result = i);\n    return result;\n  };\n  let evaluateInnerSet = evaluateLater2(`${expression} = __placeholder`);\n  let innerSet = (val) => evaluateInnerSet(() => {\n  }, { scope: { \"__placeholder\": val } });\n  let initialValue = innerGet();\n  innerSet(initialValue);\n  queueMicrotask(() => {\n    if (!el._x_model)\n      return;\n    el._x_removeModelListeners[\"default\"]();\n    let outerGet = el._x_model.get;\n    let outerSet = el._x_model.set;\n    let releaseEntanglement = entangle(\n      {\n        get() {\n          return outerGet();\n        },\n        set(value) {\n          outerSet(value);\n        }\n      },\n      {\n        get() {\n          return innerGet();\n        },\n        set(value) {\n          innerSet(value);\n        }\n      }\n    );\n    cleanup2(releaseEntanglement);\n  });\n});\n\n// packages/alpinejs/src/directives/x-teleport.js\ndirective(\"teleport\", (el, { modifiers, expression }, { cleanup: cleanup2 }) => {\n  if (el.tagName.toLowerCase() !== \"template\")\n    warn(\"x-teleport can only be used on a <template> tag\", el);\n  let target = getTarget(expression);\n  let clone2 = el.content.cloneNode(true).firstElementChild;\n  el._x_teleport = clone2;\n  clone2._x_teleportBack = el;\n  el.setAttribute(\"data-teleport-template\", true);\n  clone2.setAttribute(\"data-teleport-target\", true);\n  if (el._x_forwardEvents) {\n    el._x_forwardEvents.forEach((eventName) => {\n      clone2.addEventListener(eventName, (e) => {\n        e.stopPropagation();\n        el.dispatchEvent(new e.constructor(e.type, e));\n      });\n    });\n  }\n  addScopeToNode(clone2, {}, el);\n  let placeInDom = (clone3, target2, modifiers2) => {\n    if (modifiers2.includes(\"prepend\")) {\n      target2.parentNode.insertBefore(clone3, target2);\n    } else if (modifiers2.includes(\"append\")) {\n      target2.parentNode.insertBefore(clone3, target2.nextSibling);\n    } else {\n      target2.appendChild(clone3);\n    }\n  };\n  mutateDom(() => {\n    placeInDom(clone2, target, modifiers);\n    skipDuringClone(() => {\n      initTree(clone2);\n      clone2._x_ignore = true;\n    })();\n  });\n  el._x_teleportPutBack = () => {\n    let target2 = getTarget(expression);\n    mutateDom(() => {\n      placeInDom(el._x_teleport, target2, modifiers);\n    });\n  };\n  cleanup2(() => clone2.remove());\n});\nvar teleportContainerDuringClone = document.createElement(\"div\");\nfunction getTarget(expression) {\n  let target = skipDuringClone(() => {\n    return document.querySelector(expression);\n  }, () => {\n    return teleportContainerDuringClone;\n  })();\n  if (!target)\n    warn(`Cannot find x-teleport element for selector: \"${expression}\"`);\n  return target;\n}\n\n// packages/alpinejs/src/directives/x-ignore.js\nvar handler = () => {\n};\nhandler.inline = (el, { modifiers }, { cleanup: cleanup2 }) => {\n  modifiers.includes(\"self\") ? el._x_ignoreSelf = true : el._x_ignore = true;\n  cleanup2(() => {\n    modifiers.includes(\"self\") ? delete el._x_ignoreSelf : delete el._x_ignore;\n  });\n};\ndirective(\"ignore\", handler);\n\n// packages/alpinejs/src/directives/x-effect.js\ndirective(\"effect\", skipDuringClone((el, { expression }, { effect: effect3 }) => {\n  effect3(evaluateLater(el, expression));\n}));\n\n// packages/alpinejs/src/utils/on.js\nfunction on(el, event, modifiers, callback) {\n  let listenerTarget = el;\n  let handler4 = (e) => callback(e);\n  let options = {};\n  let wrapHandler = (callback2, wrapper) => (e) => wrapper(callback2, e);\n  if (modifiers.includes(\"dot\"))\n    event = dotSyntax(event);\n  if (modifiers.includes(\"camel\"))\n    event = camelCase2(event);\n  if (modifiers.includes(\"passive\"))\n    options.passive = true;\n  if (modifiers.includes(\"capture\"))\n    options.capture = true;\n  if (modifiers.includes(\"window\"))\n    listenerTarget = window;\n  if (modifiers.includes(\"document\"))\n    listenerTarget = document;\n  if (modifiers.includes(\"debounce\")) {\n    let nextModifier = modifiers[modifiers.indexOf(\"debounce\") + 1] || \"invalid-wait\";\n    let wait = isNumeric(nextModifier.split(\"ms\")[0]) ? Number(nextModifier.split(\"ms\")[0]) : 250;\n    handler4 = debounce(handler4, wait);\n  }\n  if (modifiers.includes(\"throttle\")) {\n    let nextModifier = modifiers[modifiers.indexOf(\"throttle\") + 1] || \"invalid-wait\";\n    let wait = isNumeric(nextModifier.split(\"ms\")[0]) ? Number(nextModifier.split(\"ms\")[0]) : 250;\n    handler4 = throttle(handler4, wait);\n  }\n  if (modifiers.includes(\"prevent\"))\n    handler4 = wrapHandler(handler4, (next, e) => {\n      e.preventDefault();\n      next(e);\n    });\n  if (modifiers.includes(\"stop\"))\n    handler4 = wrapHandler(handler4, (next, e) => {\n      e.stopPropagation();\n      next(e);\n    });\n  if (modifiers.includes(\"once\")) {\n    handler4 = wrapHandler(handler4, (next, e) => {\n      next(e);\n      listenerTarget.removeEventListener(event, handler4, options);\n    });\n  }\n  if (modifiers.includes(\"away\") || modifiers.includes(\"outside\")) {\n    listenerTarget = document;\n    handler4 = wrapHandler(handler4, (next, e) => {\n      if (el.contains(e.target))\n        return;\n      if (e.target.isConnected === false)\n        return;\n      if (el.offsetWidth < 1 && el.offsetHeight < 1)\n        return;\n      if (el._x_isShown === false)\n        return;\n      next(e);\n    });\n  }\n  if (modifiers.includes(\"self\"))\n    handler4 = wrapHandler(handler4, (next, e) => {\n      e.target === el && next(e);\n    });\n  if (isKeyEvent(event) || isClickEvent(event)) {\n    handler4 = wrapHandler(handler4, (next, e) => {\n      if (isListeningForASpecificKeyThatHasntBeenPressed(e, modifiers)) {\n        return;\n      }\n      next(e);\n    });\n  }\n  listenerTarget.addEventListener(event, handler4, options);\n  return () => {\n    listenerTarget.removeEventListener(event, handler4, options);\n  };\n}\nfunction dotSyntax(subject) {\n  return subject.replace(/-/g, \".\");\n}\nfunction camelCase2(subject) {\n  return subject.toLowerCase().replace(/-(\\w)/g, (match, char) => char.toUpperCase());\n}\nfunction isNumeric(subject) {\n  return !Array.isArray(subject) && !isNaN(subject);\n}\nfunction kebabCase2(subject) {\n  if ([\" \", \"_\"].includes(\n    subject\n  ))\n    return subject;\n  return subject.replace(/([a-z])([A-Z])/g, \"$1-$2\").replace(/[_\\s]/, \"-\").toLowerCase();\n}\nfunction isKeyEvent(event) {\n  return [\"keydown\", \"keyup\"].includes(event);\n}\nfunction isClickEvent(event) {\n  return [\"contextmenu\", \"click\", \"mouse\"].some((i) => event.includes(i));\n}\nfunction isListeningForASpecificKeyThatHasntBeenPressed(e, modifiers) {\n  let keyModifiers = modifiers.filter((i) => {\n    return ![\"window\", \"document\", \"prevent\", \"stop\", \"once\", \"capture\", \"self\", \"away\", \"outside\", \"passive\"].includes(i);\n  });\n  if (keyModifiers.includes(\"debounce\")) {\n    let debounceIndex = keyModifiers.indexOf(\"debounce\");\n    keyModifiers.splice(debounceIndex, isNumeric((keyModifiers[debounceIndex + 1] || \"invalid-wait\").split(\"ms\")[0]) ? 2 : 1);\n  }\n  if (keyModifiers.includes(\"throttle\")) {\n    let debounceIndex = keyModifiers.indexOf(\"throttle\");\n    keyModifiers.splice(debounceIndex, isNumeric((keyModifiers[debounceIndex + 1] || \"invalid-wait\").split(\"ms\")[0]) ? 2 : 1);\n  }\n  if (keyModifiers.length === 0)\n    return false;\n  if (keyModifiers.length === 1 && keyToModifiers(e.key).includes(keyModifiers[0]))\n    return false;\n  const systemKeyModifiers = [\"ctrl\", \"shift\", \"alt\", \"meta\", \"cmd\", \"super\"];\n  const selectedSystemKeyModifiers = systemKeyModifiers.filter((modifier) => keyModifiers.includes(modifier));\n  keyModifiers = keyModifiers.filter((i) => !selectedSystemKeyModifiers.includes(i));\n  if (selectedSystemKeyModifiers.length > 0) {\n    const activelyPressedKeyModifiers = selectedSystemKeyModifiers.filter((modifier) => {\n      if (modifier === \"cmd\" || modifier === \"super\")\n        modifier = \"meta\";\n      return e[`${modifier}Key`];\n    });\n    if (activelyPressedKeyModifiers.length === selectedSystemKeyModifiers.length) {\n      if (isClickEvent(e.type))\n        return false;\n      if (keyToModifiers(e.key).includes(keyModifiers[0]))\n        return false;\n    }\n  }\n  return true;\n}\nfunction keyToModifiers(key) {\n  if (!key)\n    return [];\n  key = kebabCase2(key);\n  let modifierToKeyMap = {\n    \"ctrl\": \"control\",\n    \"slash\": \"/\",\n    \"space\": \" \",\n    \"spacebar\": \" \",\n    \"cmd\": \"meta\",\n    \"esc\": \"escape\",\n    \"up\": \"arrow-up\",\n    \"down\": \"arrow-down\",\n    \"left\": \"arrow-left\",\n    \"right\": \"arrow-right\",\n    \"period\": \".\",\n    \"comma\": \",\",\n    \"equal\": \"=\",\n    \"minus\": \"-\",\n    \"underscore\": \"_\"\n  };\n  modifierToKeyMap[key] = key;\n  return Object.keys(modifierToKeyMap).map((modifier) => {\n    if (modifierToKeyMap[modifier] === key)\n      return modifier;\n  }).filter((modifier) => modifier);\n}\n\n// packages/alpinejs/src/directives/x-model.js\ndirective(\"model\", (el, { modifiers, expression }, { effect: effect3, cleanup: cleanup2 }) => {\n  let scopeTarget = el;\n  if (modifiers.includes(\"parent\")) {\n    scopeTarget = el.parentNode;\n  }\n  let evaluateGet = evaluateLater(scopeTarget, expression);\n  let evaluateSet;\n  if (typeof expression === \"string\") {\n    evaluateSet = evaluateLater(scopeTarget, `${expression} = __placeholder`);\n  } else if (typeof expression === \"function\" && typeof expression() === \"string\") {\n    evaluateSet = evaluateLater(scopeTarget, `${expression()} = __placeholder`);\n  } else {\n    evaluateSet = () => {\n    };\n  }\n  let getValue = () => {\n    let result;\n    evaluateGet((value) => result = value);\n    return isGetterSetter(result) ? result.get() : result;\n  };\n  let setValue = (value) => {\n    let result;\n    evaluateGet((value2) => result = value2);\n    if (isGetterSetter(result)) {\n      result.set(value);\n    } else {\n      evaluateSet(() => {\n      }, {\n        scope: { \"__placeholder\": value }\n      });\n    }\n  };\n  if (typeof expression === \"string\" && el.type === \"radio\") {\n    mutateDom(() => {\n      if (!el.hasAttribute(\"name\"))\n        el.setAttribute(\"name\", expression);\n    });\n  }\n  var event = el.tagName.toLowerCase() === \"select\" || [\"checkbox\", \"radio\"].includes(el.type) || modifiers.includes(\"lazy\") ? \"change\" : \"input\";\n  let removeListener = isCloning ? () => {\n  } : on(el, event, modifiers, (e) => {\n    setValue(getInputValue(el, modifiers, e, getValue()));\n  });\n  if (modifiers.includes(\"fill\")) {\n    if ([void 0, null, \"\"].includes(getValue()) || el.type === \"checkbox\" && Array.isArray(getValue()) || el.tagName.toLowerCase() === \"select\" && el.multiple) {\n      setValue(\n        getInputValue(el, modifiers, { target: el }, getValue())\n      );\n    }\n  }\n  if (!el._x_removeModelListeners)\n    el._x_removeModelListeners = {};\n  el._x_removeModelListeners[\"default\"] = removeListener;\n  cleanup2(() => el._x_removeModelListeners[\"default\"]());\n  if (el.form) {\n    let removeResetListener = on(el.form, \"reset\", [], (e) => {\n      nextTick(() => el._x_model && el._x_model.set(getInputValue(el, modifiers, { target: el }, getValue())));\n    });\n    cleanup2(() => removeResetListener());\n  }\n  el._x_model = {\n    get() {\n      return getValue();\n    },\n    set(value) {\n      setValue(value);\n    }\n  };\n  el._x_forceModelUpdate = (value) => {\n    if (value === void 0 && typeof expression === \"string\" && expression.match(/\\./))\n      value = \"\";\n    window.fromModel = true;\n    mutateDom(() => bind(el, \"value\", value));\n    delete window.fromModel;\n  };\n  effect3(() => {\n    let value = getValue();\n    if (modifiers.includes(\"unintrusive\") && document.activeElement.isSameNode(el))\n      return;\n    el._x_forceModelUpdate(value);\n  });\n});\nfunction getInputValue(el, modifiers, event, currentValue) {\n  return mutateDom(() => {\n    if (event instanceof CustomEvent && event.detail !== void 0)\n      return event.detail !== null && event.detail !== void 0 ? event.detail : event.target.value;\n    else if (el.type === \"checkbox\") {\n      if (Array.isArray(currentValue)) {\n        let newValue = null;\n        if (modifiers.includes(\"number\")) {\n          newValue = safeParseNumber(event.target.value);\n        } else if (modifiers.includes(\"boolean\")) {\n          newValue = safeParseBoolean(event.target.value);\n        } else {\n          newValue = event.target.value;\n        }\n        return event.target.checked ? currentValue.includes(newValue) ? currentValue : currentValue.concat([newValue]) : currentValue.filter((el2) => !checkedAttrLooseCompare2(el2, newValue));\n      } else {\n        return event.target.checked;\n      }\n    } else if (el.tagName.toLowerCase() === \"select\" && el.multiple) {\n      if (modifiers.includes(\"number\")) {\n        return Array.from(event.target.selectedOptions).map((option) => {\n          let rawValue = option.value || option.text;\n          return safeParseNumber(rawValue);\n        });\n      } else if (modifiers.includes(\"boolean\")) {\n        return Array.from(event.target.selectedOptions).map((option) => {\n          let rawValue = option.value || option.text;\n          return safeParseBoolean(rawValue);\n        });\n      }\n      return Array.from(event.target.selectedOptions).map((option) => {\n        return option.value || option.text;\n      });\n    } else {\n      let newValue;\n      if (el.type === \"radio\") {\n        if (event.target.checked) {\n          newValue = event.target.value;\n        } else {\n          newValue = currentValue;\n        }\n      } else {\n        newValue = event.target.value;\n      }\n      if (modifiers.includes(\"number\")) {\n        return safeParseNumber(newValue);\n      } else if (modifiers.includes(\"boolean\")) {\n        return safeParseBoolean(newValue);\n      } else if (modifiers.includes(\"trim\")) {\n        return newValue.trim();\n      } else {\n        return newValue;\n      }\n    }\n  });\n}\nfunction safeParseNumber(rawValue) {\n  let number = rawValue ? parseFloat(rawValue) : null;\n  return isNumeric2(number) ? number : rawValue;\n}\nfunction checkedAttrLooseCompare2(valueA, valueB) {\n  return valueA == valueB;\n}\nfunction isNumeric2(subject) {\n  return !Array.isArray(subject) && !isNaN(subject);\n}\nfunction isGetterSetter(value) {\n  return value !== null && typeof value === \"object\" && typeof value.get === \"function\" && typeof value.set === \"function\";\n}\n\n// packages/alpinejs/src/directives/x-cloak.js\ndirective(\"cloak\", (el) => queueMicrotask(() => mutateDom(() => el.removeAttribute(prefix(\"cloak\")))));\n\n// packages/alpinejs/src/directives/x-init.js\naddInitSelector(() => `[${prefix(\"init\")}]`);\ndirective(\"init\", skipDuringClone((el, { expression }, { evaluate: evaluate2 }) => {\n  if (typeof expression === \"string\") {\n    return !!expression.trim() && evaluate2(expression, {}, false);\n  }\n  return evaluate2(expression, {}, false);\n}));\n\n// packages/alpinejs/src/directives/x-text.js\ndirective(\"text\", (el, { expression }, { effect: effect3, evaluateLater: evaluateLater2 }) => {\n  let evaluate2 = evaluateLater2(expression);\n  effect3(() => {\n    evaluate2((value) => {\n      mutateDom(() => {\n        el.textContent = value;\n      });\n    });\n  });\n});\n\n// packages/alpinejs/src/directives/x-html.js\ndirective(\"html\", (el, { expression }, { effect: effect3, evaluateLater: evaluateLater2 }) => {\n  let evaluate2 = evaluateLater2(expression);\n  effect3(() => {\n    evaluate2((value) => {\n      mutateDom(() => {\n        el.innerHTML = value;\n        el._x_ignoreSelf = true;\n        initTree(el);\n        delete el._x_ignoreSelf;\n      });\n    });\n  });\n});\n\n// packages/alpinejs/src/directives/x-bind.js\nmapAttributes(startingWith(\":\", into(prefix(\"bind:\"))));\nvar handler2 = (el, { value, modifiers, expression, original }, { effect: effect3, cleanup: cleanup2 }) => {\n  if (!value) {\n    let bindingProviders = {};\n    injectBindingProviders(bindingProviders);\n    let getBindings = evaluateLater(el, expression);\n    getBindings((bindings) => {\n      applyBindingsObject(el, bindings, original);\n    }, { scope: bindingProviders });\n    return;\n  }\n  if (value === \"key\")\n    return storeKeyForXFor(el, expression);\n  if (el._x_inlineBindings && el._x_inlineBindings[value] && el._x_inlineBindings[value].extract) {\n    return;\n  }\n  let evaluate2 = evaluateLater(el, expression);\n  effect3(() => evaluate2((result) => {\n    if (result === void 0 && typeof expression === \"string\" && expression.match(/\\./)) {\n      result = \"\";\n    }\n    mutateDom(() => bind(el, value, result, modifiers));\n  }));\n  cleanup2(() => {\n    el._x_undoAddedClasses && el._x_undoAddedClasses();\n    el._x_undoAddedStyles && el._x_undoAddedStyles();\n  });\n};\nhandler2.inline = (el, { value, modifiers, expression }) => {\n  if (!value)\n    return;\n  if (!el._x_inlineBindings)\n    el._x_inlineBindings = {};\n  el._x_inlineBindings[value] = { expression, extract: false };\n};\ndirective(\"bind\", handler2);\nfunction storeKeyForXFor(el, expression) {\n  el._x_keyExpression = expression;\n}\n\n// packages/alpinejs/src/directives/x-data.js\naddRootSelector(() => `[${prefix(\"data\")}]`);\ndirective(\"data\", (el, { expression }, { cleanup: cleanup2 }) => {\n  if (shouldSkipRegisteringDataDuringClone(el))\n    return;\n  expression = expression === \"\" ? \"{}\" : expression;\n  let magicContext = {};\n  injectMagics(magicContext, el);\n  let dataProviderContext = {};\n  injectDataProviders(dataProviderContext, magicContext);\n  let data2 = evaluate(el, expression, { scope: dataProviderContext });\n  if (data2 === void 0 || data2 === true)\n    data2 = {};\n  injectMagics(data2, el);\n  let reactiveData = reactive(data2);\n  initInterceptors(reactiveData);\n  let undo = addScopeToNode(el, reactiveData);\n  reactiveData[\"init\"] && evaluate(el, reactiveData[\"init\"]);\n  cleanup2(() => {\n    reactiveData[\"destroy\"] && evaluate(el, reactiveData[\"destroy\"]);\n    undo();\n  });\n});\ninterceptClone((from, to) => {\n  if (from._x_dataStack) {\n    to._x_dataStack = from._x_dataStack;\n    to.setAttribute(\"data-has-alpine-state\", true);\n  }\n});\nfunction shouldSkipRegisteringDataDuringClone(el) {\n  if (!isCloning)\n    return false;\n  if (isCloningLegacy)\n    return true;\n  return el.hasAttribute(\"data-has-alpine-state\");\n}\n\n// packages/alpinejs/src/directives/x-show.js\ndirective(\"show\", (el, { modifiers, expression }, { effect: effect3 }) => {\n  let evaluate2 = evaluateLater(el, expression);\n  if (!el._x_doHide)\n    el._x_doHide = () => {\n      mutateDom(() => {\n        el.style.setProperty(\"display\", \"none\", modifiers.includes(\"important\") ? \"important\" : void 0);\n      });\n    };\n  if (!el._x_doShow)\n    el._x_doShow = () => {\n      mutateDom(() => {\n        if (el.style.length === 1 && el.style.display === \"none\") {\n          el.removeAttribute(\"style\");\n        } else {\n          el.style.removeProperty(\"display\");\n        }\n      });\n    };\n  let hide = () => {\n    el._x_doHide();\n    el._x_isShown = false;\n  };\n  let show = () => {\n    el._x_doShow();\n    el._x_isShown = true;\n  };\n  let clickAwayCompatibleShow = () => setTimeout(show);\n  let toggle = once(\n    (value) => value ? show() : hide(),\n    (value) => {\n      if (typeof el._x_toggleAndCascadeWithTransitions === \"function\") {\n        el._x_toggleAndCascadeWithTransitions(el, value, show, hide);\n      } else {\n        value ? clickAwayCompatibleShow() : hide();\n      }\n    }\n  );\n  let oldValue;\n  let firstTime = true;\n  effect3(() => evaluate2((value) => {\n    if (!firstTime && value === oldValue)\n      return;\n    if (modifiers.includes(\"immediate\"))\n      value ? clickAwayCompatibleShow() : hide();\n    toggle(value);\n    oldValue = value;\n    firstTime = false;\n  }));\n});\n\n// packages/alpinejs/src/directives/x-for.js\ndirective(\"for\", (el, { expression }, { effect: effect3, cleanup: cleanup2 }) => {\n  let iteratorNames = parseForExpression(expression);\n  let evaluateItems = evaluateLater(el, iteratorNames.items);\n  let evaluateKey = evaluateLater(\n    el,\n    // the x-bind:key expression is stored for our use instead of evaluated.\n    el._x_keyExpression || \"index\"\n  );\n  el._x_prevKeys = [];\n  el._x_lookup = {};\n  effect3(() => loop(el, iteratorNames, evaluateItems, evaluateKey));\n  cleanup2(() => {\n    Object.values(el._x_lookup).forEach((el2) => el2.remove());\n    delete el._x_prevKeys;\n    delete el._x_lookup;\n  });\n});\nfunction loop(el, iteratorNames, evaluateItems, evaluateKey) {\n  let isObject2 = (i) => typeof i === \"object\" && !Array.isArray(i);\n  let templateEl = el;\n  evaluateItems((items) => {\n    if (isNumeric3(items) && items >= 0) {\n      items = Array.from(Array(items).keys(), (i) => i + 1);\n    }\n    if (items === void 0)\n      items = [];\n    let lookup = el._x_lookup;\n    let prevKeys = el._x_prevKeys;\n    let scopes = [];\n    let keys = [];\n    if (isObject2(items)) {\n      items = Object.entries(items).map(([key, value]) => {\n        let scope2 = getIterationScopeVariables(iteratorNames, value, key, items);\n        evaluateKey((value2) => {\n          if (keys.includes(value2))\n            warn(\"Duplicate key on x-for\", el);\n          keys.push(value2);\n        }, { scope: { index: key, ...scope2 } });\n        scopes.push(scope2);\n      });\n    } else {\n      for (let i = 0; i < items.length; i++) {\n        let scope2 = getIterationScopeVariables(iteratorNames, items[i], i, items);\n        evaluateKey((value) => {\n          if (keys.includes(value))\n            warn(\"Duplicate key on x-for\", el);\n          keys.push(value);\n        }, { scope: { index: i, ...scope2 } });\n        scopes.push(scope2);\n      }\n    }\n    let adds = [];\n    let moves = [];\n    let removes = [];\n    let sames = [];\n    for (let i = 0; i < prevKeys.length; i++) {\n      let key = prevKeys[i];\n      if (keys.indexOf(key) === -1)\n        removes.push(key);\n    }\n    prevKeys = prevKeys.filter((key) => !removes.includes(key));\n    let lastKey = \"template\";\n    for (let i = 0; i < keys.length; i++) {\n      let key = keys[i];\n      let prevIndex = prevKeys.indexOf(key);\n      if (prevIndex === -1) {\n        prevKeys.splice(i, 0, key);\n        adds.push([lastKey, i]);\n      } else if (prevIndex !== i) {\n        let keyInSpot = prevKeys.splice(i, 1)[0];\n        let keyForSpot = prevKeys.splice(prevIndex - 1, 1)[0];\n        prevKeys.splice(i, 0, keyForSpot);\n        prevKeys.splice(prevIndex, 0, keyInSpot);\n        moves.push([keyInSpot, keyForSpot]);\n      } else {\n        sames.push(key);\n      }\n      lastKey = key;\n    }\n    for (let i = 0; i < removes.length; i++) {\n      let key = removes[i];\n      if (!!lookup[key]._x_effects) {\n        lookup[key]._x_effects.forEach(dequeueJob);\n      }\n      lookup[key].remove();\n      lookup[key] = null;\n      delete lookup[key];\n    }\n    for (let i = 0; i < moves.length; i++) {\n      let [keyInSpot, keyForSpot] = moves[i];\n      let elInSpot = lookup[keyInSpot];\n      let elForSpot = lookup[keyForSpot];\n      let marker = document.createElement(\"div\");\n      mutateDom(() => {\n        if (!elForSpot)\n          warn(`x-for \":key\" is undefined or invalid`, templateEl, keyForSpot, lookup);\n        elForSpot.after(marker);\n        elInSpot.after(elForSpot);\n        elForSpot._x_currentIfEl && elForSpot.after(elForSpot._x_currentIfEl);\n        marker.before(elInSpot);\n        elInSpot._x_currentIfEl && elInSpot.after(elInSpot._x_currentIfEl);\n        marker.remove();\n      });\n      elForSpot._x_refreshXForScope(scopes[keys.indexOf(keyForSpot)]);\n    }\n    for (let i = 0; i < adds.length; i++) {\n      let [lastKey2, index] = adds[i];\n      let lastEl = lastKey2 === \"template\" ? templateEl : lookup[lastKey2];\n      if (lastEl._x_currentIfEl)\n        lastEl = lastEl._x_currentIfEl;\n      let scope2 = scopes[index];\n      let key = keys[index];\n      let clone2 = document.importNode(templateEl.content, true).firstElementChild;\n      let reactiveScope = reactive(scope2);\n      addScopeToNode(clone2, reactiveScope, templateEl);\n      clone2._x_refreshXForScope = (newScope) => {\n        Object.entries(newScope).forEach(([key2, value]) => {\n          reactiveScope[key2] = value;\n        });\n      };\n      mutateDom(() => {\n        lastEl.after(clone2);\n        skipDuringClone(() => initTree(clone2))();\n      });\n      if (typeof key === \"object\") {\n        warn(\"x-for key cannot be an object, it must be a string or an integer\", templateEl);\n      }\n      lookup[key] = clone2;\n    }\n    for (let i = 0; i < sames.length; i++) {\n      lookup[sames[i]]._x_refreshXForScope(scopes[keys.indexOf(sames[i])]);\n    }\n    templateEl._x_prevKeys = keys;\n  });\n}\nfunction parseForExpression(expression) {\n  let forIteratorRE = /,([^,\\}\\]]*)(?:,([^,\\}\\]]*))?$/;\n  let stripParensRE = /^\\s*\\(|\\)\\s*$/g;\n  let forAliasRE = /([\\s\\S]*?)\\s+(?:in|of)\\s+([\\s\\S]*)/;\n  let inMatch = expression.match(forAliasRE);\n  if (!inMatch)\n    return;\n  let res = {};\n  res.items = inMatch[2].trim();\n  let item = inMatch[1].replace(stripParensRE, \"\").trim();\n  let iteratorMatch = item.match(forIteratorRE);\n  if (iteratorMatch) {\n    res.item = item.replace(forIteratorRE, \"\").trim();\n    res.index = iteratorMatch[1].trim();\n    if (iteratorMatch[2]) {\n      res.collection = iteratorMatch[2].trim();\n    }\n  } else {\n    res.item = item;\n  }\n  return res;\n}\nfunction getIterationScopeVariables(iteratorNames, item, index, items) {\n  let scopeVariables = {};\n  if (/^\\[.*\\]$/.test(iteratorNames.item) && Array.isArray(item)) {\n    let names = iteratorNames.item.replace(\"[\", \"\").replace(\"]\", \"\").split(\",\").map((i) => i.trim());\n    names.forEach((name, i) => {\n      scopeVariables[name] = item[i];\n    });\n  } else if (/^\\{.*\\}$/.test(iteratorNames.item) && !Array.isArray(item) && typeof item === \"object\") {\n    let names = iteratorNames.item.replace(\"{\", \"\").replace(\"}\", \"\").split(\",\").map((i) => i.trim());\n    names.forEach((name) => {\n      scopeVariables[name] = item[name];\n    });\n  } else {\n    scopeVariables[iteratorNames.item] = item;\n  }\n  if (iteratorNames.index)\n    scopeVariables[iteratorNames.index] = index;\n  if (iteratorNames.collection)\n    scopeVariables[iteratorNames.collection] = items;\n  return scopeVariables;\n}\nfunction isNumeric3(subject) {\n  return !Array.isArray(subject) && !isNaN(subject);\n}\n\n// packages/alpinejs/src/directives/x-ref.js\nfunction handler3() {\n}\nhandler3.inline = (el, { expression }, { cleanup: cleanup2 }) => {\n  let root = closestRoot(el);\n  if (!root._x_refs)\n    root._x_refs = {};\n  root._x_refs[expression] = el;\n  cleanup2(() => delete root._x_refs[expression]);\n};\ndirective(\"ref\", handler3);\n\n// packages/alpinejs/src/directives/x-if.js\ndirective(\"if\", (el, { expression }, { effect: effect3, cleanup: cleanup2 }) => {\n  if (el.tagName.toLowerCase() !== \"template\")\n    warn(\"x-if can only be used on a <template> tag\", el);\n  let evaluate2 = evaluateLater(el, expression);\n  let show = () => {\n    if (el._x_currentIfEl)\n      return el._x_currentIfEl;\n    let clone2 = el.content.cloneNode(true).firstElementChild;\n    addScopeToNode(clone2, {}, el);\n    mutateDom(() => {\n      el.after(clone2);\n      skipDuringClone(() => initTree(clone2))();\n    });\n    el._x_currentIfEl = clone2;\n    el._x_undoIf = () => {\n      walk(clone2, (node) => {\n        if (!!node._x_effects) {\n          node._x_effects.forEach(dequeueJob);\n        }\n      });\n      clone2.remove();\n      delete el._x_currentIfEl;\n    };\n    return clone2;\n  };\n  let hide = () => {\n    if (!el._x_undoIf)\n      return;\n    el._x_undoIf();\n    delete el._x_undoIf;\n  };\n  effect3(() => evaluate2((value) => {\n    value ? show() : hide();\n  }));\n  cleanup2(() => el._x_undoIf && el._x_undoIf());\n});\n\n// packages/alpinejs/src/directives/x-id.js\ndirective(\"id\", (el, { expression }, { evaluate: evaluate2 }) => {\n  let names = evaluate2(expression);\n  names.forEach((name) => setIdRoot(el, name));\n});\ninterceptClone((from, to) => {\n  if (from._x_ids) {\n    to._x_ids = from._x_ids;\n  }\n});\n\n// packages/alpinejs/src/directives/x-on.js\nmapAttributes(startingWith(\"@\", into(prefix(\"on:\"))));\ndirective(\"on\", skipDuringClone((el, { value, modifiers, expression }, { cleanup: cleanup2 }) => {\n  let evaluate2 = expression ? evaluateLater(el, expression) : () => {\n  };\n  if (el.tagName.toLowerCase() === \"template\") {\n    if (!el._x_forwardEvents)\n      el._x_forwardEvents = [];\n    if (!el._x_forwardEvents.includes(value))\n      el._x_forwardEvents.push(value);\n  }\n  let removeListener = on(el, value, modifiers, (e) => {\n    evaluate2(() => {\n    }, { scope: { \"$event\": e }, params: [e] });\n  });\n  cleanup2(() => removeListener());\n}));\n\n// packages/alpinejs/src/directives/index.js\nwarnMissingPluginDirective(\"Collapse\", \"collapse\", \"collapse\");\nwarnMissingPluginDirective(\"Intersect\", \"intersect\", \"intersect\");\nwarnMissingPluginDirective(\"Focus\", \"trap\", \"focus\");\nwarnMissingPluginDirective(\"Mask\", \"mask\", \"mask\");\nfunction warnMissingPluginDirective(name, directiveName, slug) {\n  directive(directiveName, (el) => warn(`You can't use [x-${directiveName}] without first installing the \"${name}\" plugin here: https://alpinejs.dev/plugins/${slug}`, el));\n}\n\n// packages/alpinejs/src/index.js\nalpine_default.setEvaluator(normalEvaluator);\nalpine_default.setReactivityEngine({ reactive: reactive2, effect: effect2, release: stop, raw: toRaw });\nvar src_default = alpine_default;\n\n// packages/alpinejs/builds/module.js\nvar module_default = src_default;\nexport {\n  src_default as Alpine,\n  module_default as default\n};\n", "import Alpine from 'alpinejs'\n\nexport function generateEntangleFunction(component, cleanup) {\n    if (! cleanup) cleanup = () => {}\n\n    return (name, live = false) => {\n        let isLive = live\n        let livewireProperty = name\n        let livewireComponent = component.$wire\n        let livewirePropertyValue = livewireComponent.get(livewireProperty)\n\n        let interceptor = Alpine.interceptor((initialValue, getter, setter, path, key) => {\n            // Check to see if the Livewire property exists and if not log a console error\n            // and return so everything else keeps running.\n            if (typeof livewirePropertyValue === 'undefined') {\n                console.error(`Livewire Entangle Error: Livewire property ['${livewireProperty}'] cannot be found on component: ['${component.name}']`)\n                return\n            }\n\n                let release = Alpine.entangle({\n                    // Outer scope...\n                    get() {\n                        return livewireComponent.get(name)\n                    },\n                    set(value) {\n                        livewireComponent.set(name, value, isLive)\n                    }\n                }, {\n                    // Inner scope...\n                    get() {\n                        return getter()\n                    },\n                    set(value) {\n                        setter(value)\n                    }\n                })\n\n                cleanup(() => release())\n\n            return cloneIfObject(livewireComponent.get(name))\n        }, obj => {\n            Object.defineProperty(obj, 'live', {\n                get() {\n                    isLive = true\n\n                    return obj\n                }\n            })\n        })\n\n        return interceptor(livewirePropertyValue)\n    }\n}\n\nfunction cloneIfObject(value) {\n    return typeof value === 'object'\n        ? JSON.parse(JSON.stringify(value))\n        : value\n}\n", "import { isFunction } from '@/utils'\n\n/**\n * Our internal event listener bus...\n */\nlet listeners = []\n\n/**\n * Register a callback to run when an event is triggered...\n */\nexport function on(name, callback) {\n    if (! listeners[name]) listeners[name] = []\n\n    listeners[name].push(callback)\n\n    // Return an \"off\" callback to remove the listener...\n    return () => {\n        listeners[name] = listeners[name].filter(i => i !== callback)\n    }\n}\n\n/**\n * In addition to triggering an event, this method allows you to\n * defer running callbacks returned from listeners and pass a\n * value through each one so they can act like middleware.\n *\n * An example of using this combination to the fullest:\n *\n * // First let's look at the triggering phase:\n * let finish = trigger([event name], ...[event params])\n *\n * return finish([pass-through value])\n *\n * // Now, let's look at the \"listening\" phase:\n * on([event name], (...[event params]) => {\n *     // The contents of this callback will be run immediately on trigger.\n *\n *     return ([pass-through value]) => {\n *         // This callback will be run when \"finish()\" is called.\n *\n *         // The [pass-through value] can be mutated and must\n *         // be returned for the next callback to process.\n *         return [pass-through value]\n *     }\n * })\n */\nexport function trigger(name, ...params) {\n    let callbacks = listeners[name] || []\n\n    let finishers = []\n\n    for (let i = 0; i < callbacks.length; i++) {\n        let finisher = callbacks[i](...params)\n\n        if (isFunction(finisher)) finishers.push(finisher)\n    }\n\n    return (result) => {\n       return runFinishers(finishers, result)\n    }\n}\n\nexport async function triggerAsync(name, ...params) {\n    let callbacks = listeners[name] || []\n\n    let finishers = []\n\n    for (let i = 0; i < callbacks.length; i++) {\n        let finisher = await callbacks[i](...params)\n\n        if (isFunction(finisher)) finishers.push(finisher)\n    }\n\n    return (result) => {\n       return runFinishers(finishers, result)\n    }\n}\n\nexport function runFinishers(finishers, result)\n{\n    let latest = result\n\n    for (let i = 0; i < finishers.length; i++) {\n        let iResult = finishers[i](latest)\n\n        if (iResult !== undefined) {\n            latest = iResult\n        }\n    }\n\n    return latest\n}\n", "\n// This code and concept is all Jonathan Reinink - thanks main!\nexport function showHtmlModal(html) {\n    let page = document.createElement('html')\n    page.innerHTML = html\n    page.querySelectorAll('a').forEach(a =>\n        a.setAttribute('target', '_top')\n    )\n\n    let modal = document.getElementById('livewire-error')\n\n    if (typeof modal != 'undefined' && modal != null) {\n        // Modal already exists.\n        modal.innerHTML = ''\n    } else {\n        modal = document.createElement('div')\n        modal.id = 'livewire-error'\n        modal.style.position = 'fixed'\n        modal.style.width = '100vw'\n        modal.style.height = '100vh'\n        modal.style.padding = '50px'\n        modal.style.backgroundColor = 'rgba(0, 0, 0, .6)'\n        modal.style.zIndex = 200000\n    }\n\n    let iframe = document.createElement('iframe')\n    iframe.style.backgroundColor = '#17161A'\n    iframe.style.borderRadius = '5px'\n    iframe.style.width = '100%'\n    iframe.style.height = '100%'\n    modal.appendChild(iframe)\n\n    document.body.prepend(modal)\n    document.body.style.overflow = 'hidden'\n    iframe.contentWindow.document.open()\n    iframe.contentWindow.document.write(page.outerHTML)\n    iframe.contentWindow.document.close()\n\n    // Close on click.\n    modal.addEventListener('click', () => hideHtmlModal(modal))\n\n    // Close on escape key press.\n    modal.setAttribute('tabindex', 0)\n    modal.addEventListener('keydown', e => {\n        if (e.key === 'Escape') hideHtmlModal(modal)\n    })\n    modal.focus()\n}\n\nexport function hideHtmlModal(modal) {\n    modal.outerHTML = ''\n    document.body.style.overflow = 'visible'\n}\n", "import { sendRequest } from \"@/request\"\n\n/**\n * The RequestPool contains a list of commits to be sent to the server...\n */\nexport class RequestPool {\n    constructor() {\n        this.commits = new Set\n    }\n\n    add(commit) {\n        this.commits.add(commit)\n    }\n\n    delete(commit) {\n        this.commits.delete(commit)\n    }\n\n    hasCommitFor(component) {\n        return !! this.findCommitByComponent(component)\n    }\n\n    findCommitByComponent(component) {\n        // Determine if this pool already has a commit for this component...\n        for (let [idx, commit] of this.commits.entries()) {\n            if (commit.component === component) return commit\n        }\n    }\n\n    // Determine if a commit should be added to this pool or isolated into its own...\n    shouldHoldCommit(commit) {\n        return ! commit.isolate\n    }\n\n    empty() {\n        return this.commits.size === 0\n    }\n\n    async send() {\n        this.prepare()\n\n        // Send this pool of commits to the server and let the commits\n        // Manage their own response actions...\n        await sendRequest(this)\n    }\n\n    prepare() {\n        // Give each commit a chance to do any last-minute prep\n        // before being sent to the server.\n        this.commits.forEach(i => i.prepare())\n    }\n\n    payload() {\n        // Extract a request payload from each of the commits in this pool...\n        let commitPayloads = []\n\n        // Collect success and failure callbacks to be used inside aggregated callbacks...\n        let successReceivers = []\n        let failureReceivers = []\n\n        this.commits.forEach(commit => {\n            let [payload, succeed, fail] = commit.toRequestPayload()\n\n            commitPayloads.push(payload)\n            successReceivers.push(succeed)\n            failureReceivers.push(fail)\n        })\n\n        // Aggregate the success and failure callbacks for individual commits\n        // into something that can be called singularly...\n        let succeed = components => successReceivers.forEach(receiver => receiver(components.shift()))\n\n        let fail = () => failureReceivers.forEach(receiver => receiver())\n\n        return [ commitPayloads, succeed, fail ]\n    }\n}\n", "import { diff } from '@/utils'\nimport { on, trigger } from '@/hooks'\n\n/**\n * A commit represents an individual component updating itself server-side...\n */\nexport class Commit {\n    constructor(component) {\n        this.component = component\n        this.isolate = false\n        this.calls = []\n        this.receivers = []\n        this.resolvers = []\n    }\n\n    // Add a new resolver to be resolved when a commit is returned from the server...\n    addResolver(resolver) {\n        this.resolvers.push(resolver)\n    }\n\n    // Add a new action \"call\" to the commit payload...\n    addCall(method, params, receiver) {\n        this.calls.push({\n            path: '', method, params,\n            handleReturn(value) {\n                receiver(value)\n            },\n        })\n    }\n\n    prepare() {\n        trigger('commit.prepare', { component: this.component })\n    }\n\n    // Generate a JSON-friendly server-request payload...\n    toRequestPayload() {\n        // Generate a \"diff\" of the current last known server-side state, and\n        // the new front-end state so that we can update the server atomically...\n        let propertiesDiff = diff(this.component.canonical, this.component.ephemeral)\n\n        let updates = this.component.mergeQueuedUpdates(propertiesDiff)\n\n        let payload = {\n            snapshot: this.component.snapshotEncoded,\n            updates: updates,\n            calls: this.calls.map(i => ({\n                path: i.path,\n                method: i.method,\n                params: i.params,\n            }))\n        }\n\n        // Store success and failure hooks from commit listeners\n        // so they can be aggregated into a singular callback later...\n        let succeedCallbacks = []\n        let failCallbacks = []\n        let respondCallbacks = []\n\n        let succeed = (fwd) => succeedCallbacks.forEach(i => i(fwd))\n        let fail = () => failCallbacks.forEach(i => i())\n        let respond = () => respondCallbacks.forEach(i => i())\n\n        // Allow other areas of the codebase to hook into the lifecycle\n        // of an individual commit...\n        let finishTarget = trigger('commit', {\n            component: this.component,\n            commit: payload,\n            succeed: (callback) => {\n                succeedCallbacks.push(callback)\n            },\n            fail: (callback) => {\n                failCallbacks.push(callback)\n            },\n            respond: (callback) => {\n                respondCallbacks.push(callback)\n            },\n        })\n\n        // Handle the response payload for a commit...\n        let handleResponse = (response) => {\n            let { snapshot, effects } = response\n\n            respond()\n\n            // Take the new snapshot and merge it into the existing one...\n            this.component.mergeNewSnapshot(snapshot, effects, updates)\n\n            // Trigger any side effects from the payload like \"morph\" and \"dispatch event\"...\n            this.component.processEffects(this.component.effects)\n\n            if (effects['returns']) {\n                let returns = effects['returns']\n\n                // Here we'll match up returned values with their method call handlers. We need to build up\n                // two \"stacks\" of the same length and walk through them together to handle them properly...\n                let returnHandlerStack = this.calls.map(({ handleReturn }) => (handleReturn))\n\n                returnHandlerStack.forEach((handleReturn, index) => {\n                    handleReturn(returns[index])\n                })\n            }\n\n            let parsedSnapshot = JSON.parse(snapshot)\n\n            finishTarget({ snapshot: parsedSnapshot, effects })\n\n            this.resolvers.forEach(i => i())\n\n            succeed(response)\n        }\n\n        let handleFailure = () => {\n            respond()\n\n            fail()\n        }\n\n        return [payload, handleResponse, handleFailure]\n    }\n}\n", "import { trigger } from '@/hooks'\nimport { RequestPool } from './pool'\nimport { Commit } from './commit'\n\n/**\n * This bus manages the pooling of multiple commits and sending\n * those pools of commits to the server...\n */\nexport class CommitBus {\n    constructor() {\n        // A list of loose, un-pooled, commits ready to be pooled and sent to the server...\n        this.commits = new Set\n\n        // A list of commit pools currently out to the server...\n        this.pools = new Set\n    }\n\n    add(component) {\n        // If this component already has a commit, leave it, otherwise,\n        // create a new commit and add it to the list...\n        let commit = this.findCommitOr(component, () => {\n            let newCommit = new Commit(component)\n\n            this.commits.add(newCommit)\n\n            return newCommit\n        })\n\n        // Buffer the sending of a pool for 5ms to account for UI interactions\n        // that will trigger multiple events within a few milliseconds of each other.\n        // For example, clicking on a button that both unfocuses a field and registers a mousedown...\n        bufferPoolingForFiveMs(commit, () => {\n            // If this commit is already in a pool, leave it be...\n            let pool = this.findPoolWithComponent(commit.component)\n\n            if (! pool) {\n                // If it's not, create a new pool or add it to an existing one and trigger a network request...\n                this.createAndSendNewPool()\n            }\n        })\n\n        return commit\n    }\n\n    findCommitOr(component, callback) {\n        for (let [idx, commit] of this.commits.entries()) {\n            if (commit.component === component) {\n                return commit\n            }\n        }\n\n        return callback()\n    }\n\n    findPoolWithComponent(component) {\n        for (let [idx, pool] of this.pools.entries()) {\n            if (pool.hasCommitFor(component)) return pool\n        }\n    }\n\n    createAndSendNewPool() {\n        // Allow features like \"reactive properties\" to initiate associated\n        // commits before those commits are pooled for a network request...\n        trigger('commit.pooling', { commits: this.commits })\n\n        // Split commits up across one or multiple pools to be sent as seperate network requests...\n        let pools = this.corraleCommitsIntoPools()\n\n        // Clear all commits in the queue now that they're in pools...\n        this.commits.clear()\n\n        trigger('commit.pooled', { pools })\n\n        // Go through each pool and...\n        pools.forEach(pool => {\n            // Ignore empty pools (if other parts of the system have moved commits around different pools)...\n            if (pool.empty()) return\n\n            // Add it to the list of pending pools...\n            this.pools.add(pool)\n\n            // Send it's payload along to the server...\n            pool.send().then(() => {\n                // When it comes back, remove it from the list...\n                this.pools.delete(pool)\n\n                // Trigger another pooling phase in case commits have\n                // been added while the current request was out...\n                this.sendAnyQueuedCommits()\n            })\n        })\n    }\n\n    corraleCommitsIntoPools() {\n        let pools = new Set\n\n        // Go through each commit and assess wether it should be bundled\n        // with other commits or sperated into it's own pool (network request)...\n        for (let [idx, commit] of this.commits.entries()) {\n            let hasFoundPool = false\n\n            // If an existing pool wants to claim a commit, let it...\n            pools.forEach(pool => {\n                if (pool.shouldHoldCommit(commit)) {\n                    pool.add(commit)\n\n                    hasFoundPool = true\n                }\n            })\n\n            // Otherwise, create a new pool and seed it with this commit...\n            if (! hasFoundPool) {\n                let newPool = new RequestPool\n\n                newPool.add(commit)\n\n                pools.add(newPool)\n            }\n        }\n\n        return pools\n    }\n\n    sendAnyQueuedCommits() {\n        if (this.commits.size > 0) {\n            this.createAndSendNewPool()\n        }\n    }\n}\n\nlet buffersByCommit = new WeakMap\n\nfunction bufferPoolingForFiveMs(commit, callback) {\n    if (buffersByCommit.has(commit)) return\n\n    buffersByCommit.set(commit, setTimeout(() => {\n        callback()\n\n        buffersByCommit.delete(commit)\n    }, 5))\n}\n", "import { getCsrfToken, contentIsFromDump, splitDumpFromContent, getUpdateUri } from '@/utils'\nimport { trigger, triggerAsync } from '@/hooks'\nimport { showHtmlModal } from './modal'\nimport { CommitBus } from './bus'\n\n/**\n * This is the bus that manages pooling and sending\n * commits to the server as network requests...\n */\nlet commitBus = new CommitBus\n\n/**\n * Create a commit and trigger a network request...\n */\nexport async function requestCommit(component) {\n    let commit = commitBus.add(component)\n\n    let promise = new Promise((resolve) => {\n        commit.addResolver(resolve)\n    })\n\n    promise.commit = commit\n\n    return promise\n}\n\n/**\n * Create a commit with an \"action\" call and trigger a network request...\n */\nexport async function requestCall(component, method, params) {\n    let commit = commitBus.add(component)\n\n    let promise = new Promise((resolve) => {\n        commit.addCall(method, params, value => resolve(value))\n    })\n\n    promise.commit = commit\n\n    return promise\n}\n\n/**\n * Send a pool of commits to the server over HTTP...\n */\nexport async function sendRequest(pool) {\n    let [payload, handleSuccess, handleFailure] = pool.payload()\n\n    let options = {\n        method: 'POST',\n        body: JSON.stringify({\n            _token: getCsrfToken(),\n            components: payload,\n        }),\n        headers: {\n            'Content-type': 'application/json',\n            'X-Livewire': '',\n        },\n    }\n\n    let succeedCallbacks = []\n    let failCallbacks = []\n    let respondCallbacks = []\n\n    let succeed = (fwd) => succeedCallbacks.forEach(i => i(fwd))\n    let fail = (fwd) => failCallbacks.forEach(i => i(fwd))\n    let respond = (fwd) => respondCallbacks.forEach(i => i(fwd))\n\n    let finishProfile = trigger('request.profile', options)\n\n    let updateUri = getUpdateUri()\n\n    trigger('request', {\n        url: updateUri,\n        options,\n        payload: options.body,\n        respond: i => respondCallbacks.push(i),\n        succeed: i => succeedCallbacks.push(i),\n        fail: i => failCallbacks.push(i),\n    })\n\n    let response\n\n    try {\n        response = await fetch(updateUri, options)\n    } catch (e) {\n        // If something went wrong with the fetch (particularly\n        // this would happen if the connection went offline)\n        // fail with a 503 and allow Livewire to clean up\n\n        finishProfile({ content: '{}', failed: true })\n\n        handleFailure()\n\n        fail({\n            status: 503,\n            content: null,\n            preventDefault: () => {},\n        })\n\n        return\n    }\n\n    let mutableObject = {\n        status: response.status,\n        response,\n    }\n\n    respond(mutableObject)\n\n    response = mutableObject.response\n\n    let content = await response.text()\n\n    // Handle error response...\n    if (! response.ok) {\n        finishProfile({ content: '{}', failed: true })\n\n        let preventDefault = false\n\n        handleFailure()\n\n        fail({\n            status: response.status,\n            content,\n            preventDefault: () => preventDefault = true,\n        })\n\n        if (preventDefault) return\n\n        if (response.status === 419) {\n            handlePageExpiry()\n        }\n\n        return showFailureModal(content)\n    }\n\n    /**\n     * Sometimes a redirect happens on the backend outside of Livewire's control,\n     * for example to a login page from a middleware, so we will just redirect\n     * to that page.\n     */\n    if (response.redirected) {\n        window.location.href = response.url\n    }\n\n    /**\n     * Sometimes a response will be prepended with html to render a dump, so we\n     * will seperate the dump html from Livewire's JSON response content and\n     * render the dump in a modal and allow Livewire to continue with the\n     * request.\n     */\n    if (contentIsFromDump(content)) {\n        let dump\n        [dump, content] = splitDumpFromContent(content)\n\n        showHtmlModal(dump)\n\n        finishProfile({ content: '{}', failed: true })\n    } else {\n        finishProfile({ content, failed: false })\n    }\n\n    let { components, assets } = JSON.parse(content)\n\n    await triggerAsync('payload.intercept', { components, assets })\n\n    await handleSuccess(components)\n\n    succeed({ status: response.status, json: JSON.parse(content) })\n}\n\nfunction handlePageExpiry() {\n    confirm(\n        'This page has expired.\\nWould you like to refresh the page?'\n    ) && window.location.reload()\n}\n\nfunction showFailureModal(content) {\n    let html = content\n\n    showHtmlModal(html)\n}\n", "import { cancelUpload, removeUpload, upload, uploadMultiple } from './features/supportFileUploads'\nimport { dispatch, dispatchSelf, dispatchTo, listen } from '@/events'\nimport { generateEntangleFunction } from '@/features/supportEntangle'\nimport { closestComponent } from '@/store'\nimport { requestCommit, requestCall } from '@/request'\nimport { dataGet, dataSet } from '@/utils'\nimport Alpine from 'alpinejs'\n\nlet properties = {}\nlet fallback\n\nfunction wireProperty(name, callback, component = null) {\n    properties[name] = callback\n}\n\nfunction wireFallback(callback) {\n    fallback = callback\n}\n\n// For V2 backwards compatibility...\n// And I actually like both depending on the scenario...\nlet aliases = {\n    'on': '$on',\n    'el': '$el',\n    'id': '$id',\n    'get': '$get',\n    'set': '$set',\n    'call': '$call',\n    'commit': '$commit',\n    'watch': '$watch',\n    'entangle': '$entangle',\n    'dispatch': '$dispatch',\n    'dispatchTo': '$dispatchTo',\n    'dispatchSelf': '$dispatchSelf',\n    'upload': '$upload',\n    'uploadMultiple': '$uploadMultiple',\n    'removeUpload': '$removeUpload',\n    'cancelUpload': '$cancelUpload',\n}\n\nexport function generateWireObject(component, state) {\n    return new Proxy({}, {\n        get(target, property) {\n            if (property === '__instance') return component\n\n            if (property in aliases) {\n                return getProperty(component, aliases[property])\n            } else if (property in properties) {\n                return getProperty(component, property)\n            } else if (property in state) {\n                return state[property]\n            } else if (! ['then'].includes(property)) {\n                return getFallback(component)(property)\n            }\n        },\n\n        set(target, property, value) {\n            if (property in state) {\n                state[property] = value\n            }\n\n            return true\n        },\n    })\n}\n\nfunction getProperty(component, name) {\n    return properties[name](component)\n}\n\nfunction getFallback(component) {\n    return fallback(component)\n}\n\nAlpine.magic('wire', (el, { cleanup }) => {\n    // Purposely initializing an empty variable here is a \"memo\"\n    // so that a component is lazy-loaded when using $wire from Alpine...\n    let component\n\n    // Override $wire methods that need to be cleaned up when\n    // and element is removed. For example, `x-data=\"{ foo: $wire.entangle(...) }\"`:\n    // we would want the entangle effect freed if the element was removed from the DOM...\n    return new Proxy({}, {\n        get(target, property) {\n            if (! component) component = closestComponent(el)\n\n            if (['$entangle', 'entangle'].includes(property)) {\n                return generateEntangleFunction(component, cleanup)\n            }\n\n            return component.$wire[property]\n        },\n\n        set(target, property, value) {\n            if (! component) component = closestComponent(el)\n\n            component.$wire[property] = value\n\n            return true\n        },\n    })\n})\n\nwireProperty('__instance', (component) => component)\n\nwireProperty('$get', (component) => (property, reactive = true) => dataGet(reactive ? component.reactive : component.ephemeral, property))\n\nwireProperty('$el', (component) => {\n    return component.el\n})\n\nwireProperty('$id', (component) => {\n    return component.id\n})\n\nwireProperty('$set', (component) => async (property, value, live = true) => {\n    dataSet(component.reactive, property, value)\n\n    // If \"live\", send a request, queueing the property update to happen first\n    // on the server, then trickle back down to the client and get merged...\n    if (live) {\n        component.queueUpdate(property, value)\n\n        return await requestCommit(component)\n    }\n\n    return Promise.resolve()\n})\n\nwireProperty('$call', (component) => async (method, ...params) => {\n    return await component.$wire[method](...params)\n})\n\nwireProperty('$entangle', (component) => (name, live = false) => {\n    return generateEntangleFunction(component)(name, live)\n})\n\nwireProperty('$toggle', (component) => (name, live = true) => {\n    return component.$wire.set(name, ! component.$wire.get(name), live)\n})\n\nwireProperty('$watch', (component) => (path, callback) => {\n    let getter = () => {\n        return dataGet(component.reactive, path)\n    }\n\n    let unwatch = Alpine.watch(getter, callback)\n\n    component.addCleanup(unwatch)\n})\n\nwireProperty('$refresh', (component) => component.$wire.$commit)\nwireProperty('$commit', (component) => async () => await requestCommit(component))\n\nwireProperty('$on', (component) => (...params) => listen(component, ...params))\n\nwireProperty('$dispatch', (component) => (...params) => dispatch(component, ...params))\nwireProperty('$dispatchSelf', (component) => (...params) => dispatchSelf(component, ...params))\nwireProperty('$dispatchTo', () => (...params) => dispatchTo(...params))\nwireProperty('$upload', (component) => (...params) => upload(component, ...params))\nwireProperty('$uploadMultiple', (component) => (...params) => uploadMultiple(component, ...params))\nwireProperty('$removeUpload', (component) => (...params) => removeUpload(component, ...params))\nwireProperty('$cancelUpload', (component) => (...params) => cancelUpload(component, ...params))\n\nlet parentMemo = new WeakMap\n\nwireProperty('$parent', component => {\n    if (parentMemo.has(component)) return parentMemo.get(component).$wire\n\n    let parent = component.parent\n\n    parentMemo.set(component, parent)\n\n    return parent.$wire\n})\n\nlet overriddenMethods = new WeakMap\n\nexport function overrideMethod(component, method, callback) {\n    if (! overriddenMethods.has(component)) {\n        overriddenMethods.set(component, {})\n    }\n\n    let obj = overriddenMethods.get(component)\n\n    obj[method] = callback\n\n    overriddenMethods.set(component, obj)\n}\n\nwireFallback((component) => (property) => async (...params) => {\n    // If this method is passed directly to a Vue or Alpine\n    // event listener (@click=\"someMethod\") without using\n    // parens, strip out the automatically added event.\n    if (params.length === 1 && params[0] instanceof Event) {\n        params = []\n    }\n\n    if (overriddenMethods.has(component)) {\n        let overrides = overriddenMethods.get(component)\n\n        if (typeof overrides[property] === 'function') {\n            return overrides[property](params)\n        }\n    }\n\n    return await requestCall(component, property, params)\n})\n", "import { dataSet, deepClone, diff, extractData} from '@/utils'\nimport { generateWireObject } from '@/$wire'\nimport { closestComponent, findComponent } from '@/store'\nimport { trigger } from '@/hooks'\n\nexport class Component {\n    constructor(el) {\n        if (el.__livewire) throw 'Component already initialized';\n\n        el.__livewire = this\n\n        this.el = el\n\n        this.id = el.getAttribute('wire:id')\n\n        this.__livewireId = this.id // @legacy\n\n        this.snapshotEncoded = el.getAttribute('wire:snapshot')\n\n        this.snapshot = JSON.parse(this.snapshotEncoded)\n\n        if (! this.snapshot) {\n            throw `Snapshot missing on Livewire component with id: ` + this.id\n        }\n\n        this.name = this.snapshot.memo.name\n\n        this.effects = JSON.parse(el.getAttribute('wire:effects'))\n        this.originalEffects = deepClone(this.effects)\n\n        // \"canonical\" data represents the last known server state.\n        this.canonical = extractData(deepClone(this.snapshot.data))\n        // \"ephemeral\" represents the most current state. (This can be freely manipulated by end users)\n        this.ephemeral = extractData(deepClone(this.snapshot.data))\n        // \"reactive\" is just ephemeral, except when you mutate it, front-ends like Vue react.\n        this.reactive = Alpine.reactive(this.ephemeral)\n\n        this.queuedUpdates = {}\n\n        // this.$wire = this.reactive\n        this.$wire = generateWireObject(this, this.reactive)\n\n        this.cleanups = []\n\n        // Effects will be processed after every request, but we'll also handle them on initialization.\n        this.processEffects(this.effects)\n    }\n\n    mergeNewSnapshot(snapshotEncoded, effects, updates = {}) {\n        let snapshot = JSON.parse(snapshotEncoded)\n\n        let oldCanonical = deepClone(this.canonical)\n        let updatedOldCanonical = this.applyUpdates(oldCanonical, updates)\n\n        let newCanonical = extractData(deepClone(snapshot.data))\n\n        let dirty = diff(updatedOldCanonical, newCanonical)\n\n        this.snapshotEncoded = snapshotEncoded\n\n        this.snapshot = snapshot\n\n        this.effects = effects\n\n        this.canonical = extractData(deepClone(snapshot.data))\n\n        let newData = extractData(deepClone(snapshot.data))\n\n        Object.entries(dirty).forEach(([key, value]) => {\n            let rootKey = key.split('.')[0]\n            this.reactive[rootKey] = newData[rootKey]\n        })\n        // Object.entries(this.ephemeral).forEach(([key, value]) => {\n        //     if (! deeplyEqual(this.ephemeral[key], newData[key])) {\n        //         this.reactive[key] = newData[key]\n        //     }\n        // })\n\n        return dirty\n    }\n\n    queueUpdate(propertyName, value) {\n        // These updates will be applied first on the server\n        // on the next request, then trickle back to the\n        // client on the next request that gets sent.\n        this.queuedUpdates[propertyName] = value\n    }\n\n    mergeQueuedUpdates(diff) {\n        // Before adding queuedUpdates into the diff list, we will remove any diffs\n        // that will be overriden by the queued update. Queued updates will take\n        // priority against ephemeral updates that have happend since them...\n        Object.entries(this.queuedUpdates).forEach(([updateKey, updateValue]) => {\n            Object.entries(diff).forEach(([diffKey, diffValue]) => {\n                if (diffKey.startsWith(updateValue)) {\n                    delete diff[diffKey]\n                }\n            })\n\n            diff[updateKey] = updateValue\n        })\n\n        this.queuedUpdates = []\n\n        return diff\n    }\n\n    applyUpdates(object, updates) {\n        for (let key in updates) {\n            dataSet(object, key, updates[key])\n        }\n\n        return object\n    }\n\n    replayUpdate(snapshot, html) {\n        let effects = { ...this.effects, html}\n\n        this.mergeNewSnapshot(JSON.stringify(snapshot), effects)\n\n        this.processEffects({ html })\n    }\n\n    /**\n     * Here we'll take the new state and side effects from the\n     * server and use them to update the existing data that\n     * users interact with, triggering reactive effects.\n     */\n    processEffects(effects) {\n        // This is for BC.\n        trigger('effects', this, effects)\n\n        trigger('effect', {\n            component: this,\n            effects,\n            cleanup: i => this.addCleanup(i)\n        })\n    }\n\n    get children() {\n        let meta = this.snapshot.memo\n        let childIds = Object.values(meta.children).map(i => i[1])\n\n        return childIds.map(id => findComponent(id))\n    }\n\n    get parent() {\n        return closestComponent(this.el.parentElement)\n    }\n\n    inscribeSnapshotAndEffectsOnElement() {\n        let el = this.el\n\n        el.setAttribute('wire:snapshot', this.snapshotEncoded)\n\n        // We need to re-register any event listeners that were originally registered...\n        let effects = this.originalEffects.listeners\n            ? { listeners: this.originalEffects.listeners }\n            : {}\n\n        // We need to re-register any url/query-string bindings...\n        if (this.originalEffects.url) {\n            effects.url = this.originalEffects.url\n        }\n\n        // We need to re-register any scripts that were originally registered...\n        if (this.originalEffects.scripts) {\n            effects.scripts = this.originalEffects.scripts;\n        }\n\n        el.setAttribute('wire:effects', JSON.stringify(effects))\n    }\n\n    addCleanup(cleanup) {\n        this.cleanups.push(cleanup)\n    }\n\n    cleanup() {\n        delete this.el.__livewire\n\n        while (this.cleanups.length > 0) {\n            this.cleanups.pop()()\n        }\n    }\n}\n", "import { Component } from \"@/component\";\nimport { trigger } from \"@/hooks\";\n\nlet components = {}\n\nexport function initComponent(el) {\n    let component = new Component(el)\n\n    if (components[component.id]) throw 'Component already registered'\n\n    let cleanup = (i) => component.addCleanup(i)\n\n    trigger('component.init', { component, cleanup })\n\n    components[component.id] = component\n\n    return component\n}\n\nexport function destroyComponent(id) {\n    let component = components[id]\n\n    if (! component) return\n\n    component.cleanup()\n\n    delete components[id]\n}\n\nexport function hasComponent(id) {\n    return !! components[id]\n}\n\nexport function findComponent(id) {\n    let component = components[id]\n\n    if (! component) throw 'Component not found: ' + id\n\n    return component\n}\n\nexport function closestComponent(el, strict = true) {\n    let closestRoot = Alpine.findClosest(el, i => i.__livewire)\n\n    if (! closestRoot) {\n        if (strict) throw \"Could not find Livewire component in DOM tree\"\n\n        return\n    }\n\n    return closestRoot.__livewire\n}\n\nexport function componentsByName(name) {\n    return Object.values(components).filter(component => {\n        return name == component.name\n    })\n}\n\nexport function getByName(name) {\n    return componentsByName(name).map(i => i.$wire)\n}\n\nexport function find(id) {\n    let component = components[id]\n\n    return component && component.$wire\n}\n\nexport function first() {\n    return Object.values(components)[0].$wire\n}\n\nexport function all() {\n    return Object.values(components)\n}\n", "import { componentsByName } from \"@/store\"\n\nexport function dispatch(component, name, params) {\n    dispatchEvent(component.el, name, params)\n}\n\nexport function dispatchGlobal(name, params) {\n    dispatchEvent(window, name, params)\n}\n\nexport function dispatchSelf(component, name, params) {\n    dispatchEvent(component.el, name, params, false)\n}\n\nexport function dispatchTo(componentName, name, params) {\n    let targets = componentsByName(componentName)\n\n    targets.forEach(target => {\n        dispatchEvent(target.el, name, params, false)\n    })\n}\n\nexport function listen(component, name, callback) {\n    component.el.addEventListener(name, e => {\n        callback(e.detail)\n    })\n}\n\nexport function on(eventName, callback) {\n    let handler = (e) => {\n        // Implemented for backwards compatibility...\n        if (! e.__livewire) return\n\n        callback(e.detail)\n    }\n\n    window.addEventListener(eventName, handler)\n\n    return () => {\n        window.removeEventListener(eventName, handler)\n    }\n}\n\nfunction dispatchEvent(target, name, params, bubbles = true) {\n    let e = new CustomEvent(name, { bubbles, detail: params })\n\n    e.__livewire = { name, params, receivedBy: [] }\n\n    target.dispatchEvent(e)\n}\n", "import { on } from './hooks'\n\nlet customDirectiveNames = new Set\n\nexport function matchesForLivewireDirective(attributeName) {\n    return attributeName.match(new RegExp('wire:'))\n}\n\nexport function extractDirective(el, name) {\n    let [value, ...modifiers] = name.replace(new RegExp('wire:'), '').split('.')\n\n    return new Directive(value, modifiers, name, el)\n}\n\nexport function directive(name, callback) {\n    // Prevent the same directive from registering multiple initialization listeners...\n    if (customDirectiveNames.has(name)) return\n\n    customDirectiveNames.add(name)\n\n    on('directive.init', ({ el, component, directive, cleanup }) => {\n        if (directive.value === name) {\n            callback({\n                el, directive, component, $wire: component.$wire, cleanup\n            })\n        }\n    })\n}\n\nexport function getDirectives(el) {\n    return new DirectiveManager(el)\n}\n\nexport function customDirectiveHasBeenRegistered(name) {\n    return customDirectiveNames.has(name)\n}\n\nclass DirectiveManager {\n    constructor(el) {\n        this.el = el\n        this.directives = this.extractTypeModifiersAndValue()\n    }\n\n    all() {\n        return this.directives\n    }\n\n    has(value) {\n        return this.directives.map(directive => directive.value).includes(value)\n    }\n\n    missing(value) {\n        return ! this.has(value)\n    }\n\n    get(value) {\n        return this.directives.find(directive => directive.value === value)\n    }\n\n    extractTypeModifiersAndValue() {\n        return Array.from(this.el.getAttributeNames()\n            // Filter only the livewire directives.\n            .filter(name => matchesForLivewireDirective(name))\n            // Parse out the type, modifiers, and value from it.\n            .map(name => extractDirective(this.el, name)))\n    }\n}\n\nexport class Directive {\n    constructor(value, modifiers, rawName, el) {\n        this.rawName = this.raw = rawName\n        this.el = el\n        this.eventContext\n\n        this.value = value\n        this.modifiers = modifiers\n        this.expression = this.el.getAttribute(this.rawName)\n    }\n\n    get method() {\n        const { method } = this.parseOutMethodAndParams(this.expression)\n\n        return method\n    }\n\n    get params() {\n        const { params } = this.parseOutMethodAndParams(this.expression)\n\n        return params\n    }\n\n    parseOutMethodAndParams(rawMethod) {\n        let method = rawMethod\n        let params = []\n        const methodAndParamString = method.match(/(.*?)\\((.*)\\)/s)\n\n        if (methodAndParamString) {\n            method = methodAndParamString[1]\n\n            // Use a function that returns it's arguments to parse and eval all params\n            // This \"$event\" is for use inside the livewire event handler.\n            let func = new Function('$event', `return (function () {\n                for (var l=arguments.length, p=new Array(l), k=0; k<l; k++) {\n                    p[k] = arguments[k];\n                }\n                return [].concat(p);\n            })(${methodAndParamString[2]})`)\n\n            params = func(this.eventContext)\n        }\n\n        return { method, params }\n    }\n}\n", "// packages/collapse/src/index.js\nfunction src_default(Alpine) {\n  Alpine.directive(\"collapse\", collapse);\n  collapse.inline = (el, { modifiers }) => {\n    if (!modifiers.includes(\"min\"))\n      return;\n    el._x_doShow = () => {\n    };\n    el._x_doHide = () => {\n    };\n  };\n  function collapse(el, { modifiers }) {\n    let duration = modifierValue(modifiers, \"duration\", 250) / 1e3;\n    let floor = modifierValue(modifiers, \"min\", 0);\n    let fullyHide = !modifiers.includes(\"min\");\n    if (!el._x_isShown)\n      el.style.height = `${floor}px`;\n    if (!el._x_isShown && fullyHide)\n      el.hidden = true;\n    if (!el._x_isShown)\n      el.style.overflow = \"hidden\";\n    let setFunction = (el2, styles) => {\n      let revertFunction = Alpine.setStyles(el2, styles);\n      return styles.height ? () => {\n      } : revertFunction;\n    };\n    let transitionStyles = {\n      transitionProperty: \"height\",\n      transitionDuration: `${duration}s`,\n      transitionTimingFunction: \"cubic-bezier(0.4, 0.0, 0.2, 1)\"\n    };\n    el._x_transition = {\n      in(before = () => {\n      }, after = () => {\n      }) {\n        if (fullyHide)\n          el.hidden = false;\n        if (fullyHide)\n          el.style.display = null;\n        let current = el.getBoundingClientRect().height;\n        el.style.height = \"auto\";\n        let full = el.getBoundingClientRect().height;\n        if (current === full) {\n          current = floor;\n        }\n        Alpine.transition(el, Alpine.setStyles, {\n          during: transitionStyles,\n          start: { height: current + \"px\" },\n          end: { height: full + \"px\" }\n        }, () => el._x_isShown = true, () => {\n          if (Math.abs(el.getBoundingClientRect().height - full) < 1) {\n            el.style.overflow = null;\n          }\n        });\n      },\n      out(before = () => {\n      }, after = () => {\n      }) {\n        let full = el.getBoundingClientRect().height;\n        Alpine.transition(el, setFunction, {\n          during: transitionStyles,\n          start: { height: full + \"px\" },\n          end: { height: floor + \"px\" }\n        }, () => el.style.overflow = \"hidden\", () => {\n          el._x_isShown = false;\n          if (el.style.height == `${floor}px` && fullyHide) {\n            el.style.display = \"none\";\n            el.hidden = true;\n          }\n        });\n      }\n    };\n  }\n}\nfunction modifierValue(modifiers, key, fallback) {\n  if (modifiers.indexOf(key) === -1)\n    return fallback;\n  const rawValue = modifiers[modifiers.indexOf(key) + 1];\n  if (!rawValue)\n    return fallback;\n  if (key === \"duration\") {\n    let match = rawValue.match(/([0-9]+)ms/);\n    if (match)\n      return match[1];\n  }\n  if (key === \"min\") {\n    let match = rawValue.match(/([0-9]+)px/);\n    if (match)\n      return match[1];\n  }\n  return rawValue;\n}\n\n// packages/collapse/builds/module.js\nvar module_default = src_default;\nexport {\n  src_default as collapse,\n  module_default as default\n};\n", "// node_modules/tabbable/dist/index.esm.js\nvar candidateSelectors = [\"input\", \"select\", \"textarea\", \"a[href]\", \"button\", \"[tabindex]:not(slot)\", \"audio[controls]\", \"video[controls]\", '[contenteditable]:not([contenteditable=\"false\"])', \"details>summary:first-of-type\", \"details\"];\nvar candidateSelector = /* @__PURE__ */ candidateSelectors.join(\",\");\nvar NoElement = typeof Element === \"undefined\";\nvar matches = NoElement ? function() {\n} : Element.prototype.matches || Element.prototype.msMatchesSelector || Element.prototype.webkitMatchesSelector;\nvar getRootNode = !NoElement && Element.prototype.getRootNode ? function(element) {\n  return element.getRootNode();\n} : function(element) {\n  return element.ownerDocument;\n};\nvar getCandidates = function getCandidates2(el, includeContainer, filter) {\n  var candidates = Array.prototype.slice.apply(el.querySelectorAll(candidateSelector));\n  if (includeContainer && matches.call(el, candidateSelector)) {\n    candidates.unshift(el);\n  }\n  candidates = candidates.filter(filter);\n  return candidates;\n};\nvar getCandidatesIteratively = function getCandidatesIteratively2(elements, includeContainer, options) {\n  var candidates = [];\n  var elementsToCheck = Array.from(elements);\n  while (elementsToCheck.length) {\n    var element = elementsToCheck.shift();\n    if (element.tagName === \"SLOT\") {\n      var assigned = element.assignedElements();\n      var content = assigned.length ? assigned : element.children;\n      var nestedCandidates = getCandidatesIteratively2(content, true, options);\n      if (options.flatten) {\n        candidates.push.apply(candidates, nestedCandidates);\n      } else {\n        candidates.push({\n          scope: element,\n          candidates: nestedCandidates\n        });\n      }\n    } else {\n      var validCandidate = matches.call(element, candidateSelector);\n      if (validCandidate && options.filter(element) && (includeContainer || !elements.includes(element))) {\n        candidates.push(element);\n      }\n      var shadowRoot = element.shadowRoot || // check for an undisclosed shadow\n      typeof options.getShadowRoot === \"function\" && options.getShadowRoot(element);\n      var validShadowRoot = !options.shadowRootFilter || options.shadowRootFilter(element);\n      if (shadowRoot && validShadowRoot) {\n        var _nestedCandidates = getCandidatesIteratively2(shadowRoot === true ? element.children : shadowRoot.children, true, options);\n        if (options.flatten) {\n          candidates.push.apply(candidates, _nestedCandidates);\n        } else {\n          candidates.push({\n            scope: element,\n            candidates: _nestedCandidates\n          });\n        }\n      } else {\n        elementsToCheck.unshift.apply(elementsToCheck, element.children);\n      }\n    }\n  }\n  return candidates;\n};\nvar getTabindex = function getTabindex2(node, isScope) {\n  if (node.tabIndex < 0) {\n    if ((isScope || /^(AUDIO|VIDEO|DETAILS)$/.test(node.tagName) || node.isContentEditable) && isNaN(parseInt(node.getAttribute(\"tabindex\"), 10))) {\n      return 0;\n    }\n  }\n  return node.tabIndex;\n};\nvar sortOrderedTabbables = function sortOrderedTabbables2(a, b) {\n  return a.tabIndex === b.tabIndex ? a.documentOrder - b.documentOrder : a.tabIndex - b.tabIndex;\n};\nvar isInput = function isInput2(node) {\n  return node.tagName === \"INPUT\";\n};\nvar isHiddenInput = function isHiddenInput2(node) {\n  return isInput(node) && node.type === \"hidden\";\n};\nvar isDetailsWithSummary = function isDetailsWithSummary2(node) {\n  var r = node.tagName === \"DETAILS\" && Array.prototype.slice.apply(node.children).some(function(child) {\n    return child.tagName === \"SUMMARY\";\n  });\n  return r;\n};\nvar getCheckedRadio = function getCheckedRadio2(nodes, form) {\n  for (var i = 0; i < nodes.length; i++) {\n    if (nodes[i].checked && nodes[i].form === form) {\n      return nodes[i];\n    }\n  }\n};\nvar isTabbableRadio = function isTabbableRadio2(node) {\n  if (!node.name) {\n    return true;\n  }\n  var radioScope = node.form || getRootNode(node);\n  var queryRadios = function queryRadios2(name) {\n    return radioScope.querySelectorAll('input[type=\"radio\"][name=\"' + name + '\"]');\n  };\n  var radioSet;\n  if (typeof window !== \"undefined\" && typeof window.CSS !== \"undefined\" && typeof window.CSS.escape === \"function\") {\n    radioSet = queryRadios(window.CSS.escape(node.name));\n  } else {\n    try {\n      radioSet = queryRadios(node.name);\n    } catch (err) {\n      console.error(\"Looks like you have a radio button with a name attribute containing invalid CSS selector characters and need the CSS.escape polyfill: %s\", err.message);\n      return false;\n    }\n  }\n  var checked = getCheckedRadio(radioSet, node.form);\n  return !checked || checked === node;\n};\nvar isRadio = function isRadio2(node) {\n  return isInput(node) && node.type === \"radio\";\n};\nvar isNonTabbableRadio = function isNonTabbableRadio2(node) {\n  return isRadio(node) && !isTabbableRadio(node);\n};\nvar isZeroArea = function isZeroArea2(node) {\n  var _node$getBoundingClie = node.getBoundingClientRect(), width = _node$getBoundingClie.width, height = _node$getBoundingClie.height;\n  return width === 0 && height === 0;\n};\nvar isHidden = function isHidden2(node, _ref) {\n  var displayCheck = _ref.displayCheck, getShadowRoot = _ref.getShadowRoot;\n  if (getComputedStyle(node).visibility === \"hidden\") {\n    return true;\n  }\n  var isDirectSummary = matches.call(node, \"details>summary:first-of-type\");\n  var nodeUnderDetails = isDirectSummary ? node.parentElement : node;\n  if (matches.call(nodeUnderDetails, \"details:not([open]) *\")) {\n    return true;\n  }\n  var nodeRootHost = getRootNode(node).host;\n  var nodeIsAttached = (nodeRootHost === null || nodeRootHost === void 0 ? void 0 : nodeRootHost.ownerDocument.contains(nodeRootHost)) || node.ownerDocument.contains(node);\n  if (!displayCheck || displayCheck === \"full\") {\n    if (typeof getShadowRoot === \"function\") {\n      var originalNode = node;\n      while (node) {\n        var parentElement = node.parentElement;\n        var rootNode = getRootNode(node);\n        if (parentElement && !parentElement.shadowRoot && getShadowRoot(parentElement) === true) {\n          return isZeroArea(node);\n        } else if (node.assignedSlot) {\n          node = node.assignedSlot;\n        } else if (!parentElement && rootNode !== node.ownerDocument) {\n          node = rootNode.host;\n        } else {\n          node = parentElement;\n        }\n      }\n      node = originalNode;\n    }\n    if (nodeIsAttached) {\n      return !node.getClientRects().length;\n    }\n  } else if (displayCheck === \"non-zero-area\") {\n    return isZeroArea(node);\n  }\n  return false;\n};\nvar isDisabledFromFieldset = function isDisabledFromFieldset2(node) {\n  if (/^(INPUT|BUTTON|SELECT|TEXTAREA)$/.test(node.tagName)) {\n    var parentNode = node.parentElement;\n    while (parentNode) {\n      if (parentNode.tagName === \"FIELDSET\" && parentNode.disabled) {\n        for (var i = 0; i < parentNode.children.length; i++) {\n          var child = parentNode.children.item(i);\n          if (child.tagName === \"LEGEND\") {\n            return matches.call(parentNode, \"fieldset[disabled] *\") ? true : !child.contains(node);\n          }\n        }\n        return true;\n      }\n      parentNode = parentNode.parentElement;\n    }\n  }\n  return false;\n};\nvar isNodeMatchingSelectorFocusable = function isNodeMatchingSelectorFocusable2(options, node) {\n  if (node.disabled || isHiddenInput(node) || isHidden(node, options) || // For a details element with a summary, the summary element gets the focus\n  isDetailsWithSummary(node) || isDisabledFromFieldset(node)) {\n    return false;\n  }\n  return true;\n};\nvar isNodeMatchingSelectorTabbable = function isNodeMatchingSelectorTabbable2(options, node) {\n  if (isNonTabbableRadio(node) || getTabindex(node) < 0 || !isNodeMatchingSelectorFocusable(options, node)) {\n    return false;\n  }\n  return true;\n};\nvar isValidShadowRootTabbable = function isValidShadowRootTabbable2(shadowHostNode) {\n  var tabIndex = parseInt(shadowHostNode.getAttribute(\"tabindex\"), 10);\n  if (isNaN(tabIndex) || tabIndex >= 0) {\n    return true;\n  }\n  return false;\n};\nvar sortByOrder = function sortByOrder2(candidates) {\n  var regularTabbables = [];\n  var orderedTabbables = [];\n  candidates.forEach(function(item, i) {\n    var isScope = !!item.scope;\n    var element = isScope ? item.scope : item;\n    var candidateTabindex = getTabindex(element, isScope);\n    var elements = isScope ? sortByOrder2(item.candidates) : element;\n    if (candidateTabindex === 0) {\n      isScope ? regularTabbables.push.apply(regularTabbables, elements) : regularTabbables.push(element);\n    } else {\n      orderedTabbables.push({\n        documentOrder: i,\n        tabIndex: candidateTabindex,\n        item,\n        isScope,\n        content: elements\n      });\n    }\n  });\n  return orderedTabbables.sort(sortOrderedTabbables).reduce(function(acc, sortable) {\n    sortable.isScope ? acc.push.apply(acc, sortable.content) : acc.push(sortable.content);\n    return acc;\n  }, []).concat(regularTabbables);\n};\nvar tabbable = function tabbable2(el, options) {\n  options = options || {};\n  var candidates;\n  if (options.getShadowRoot) {\n    candidates = getCandidatesIteratively([el], options.includeContainer, {\n      filter: isNodeMatchingSelectorTabbable.bind(null, options),\n      flatten: false,\n      getShadowRoot: options.getShadowRoot,\n      shadowRootFilter: isValidShadowRootTabbable\n    });\n  } else {\n    candidates = getCandidates(el, options.includeContainer, isNodeMatchingSelectorTabbable.bind(null, options));\n  }\n  return sortByOrder(candidates);\n};\nvar focusable = function focusable2(el, options) {\n  options = options || {};\n  var candidates;\n  if (options.getShadowRoot) {\n    candidates = getCandidatesIteratively([el], options.includeContainer, {\n      filter: isNodeMatchingSelectorFocusable.bind(null, options),\n      flatten: true,\n      getShadowRoot: options.getShadowRoot\n    });\n  } else {\n    candidates = getCandidates(el, options.includeContainer, isNodeMatchingSelectorFocusable.bind(null, options));\n  }\n  return candidates;\n};\nvar isTabbable = function isTabbable2(node, options) {\n  options = options || {};\n  if (!node) {\n    throw new Error(\"No node provided\");\n  }\n  if (matches.call(node, candidateSelector) === false) {\n    return false;\n  }\n  return isNodeMatchingSelectorTabbable(options, node);\n};\nvar focusableCandidateSelector = /* @__PURE__ */ candidateSelectors.concat(\"iframe\").join(\",\");\nvar isFocusable = function isFocusable2(node, options) {\n  options = options || {};\n  if (!node) {\n    throw new Error(\"No node provided\");\n  }\n  if (matches.call(node, focusableCandidateSelector) === false) {\n    return false;\n  }\n  return isNodeMatchingSelectorFocusable(options, node);\n};\n\n// node_modules/focus-trap/dist/focus-trap.esm.js\nfunction ownKeys(object, enumerableOnly) {\n  var keys = Object.keys(object);\n  if (Object.getOwnPropertySymbols) {\n    var symbols = Object.getOwnPropertySymbols(object);\n    enumerableOnly && (symbols = symbols.filter(function(sym) {\n      return Object.getOwnPropertyDescriptor(object, sym).enumerable;\n    })), keys.push.apply(keys, symbols);\n  }\n  return keys;\n}\nfunction _objectSpread2(target) {\n  for (var i = 1; i < arguments.length; i++) {\n    var source = null != arguments[i] ? arguments[i] : {};\n    i % 2 ? ownKeys(Object(source), true).forEach(function(key) {\n      _defineProperty(target, key, source[key]);\n    }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function(key) {\n      Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key));\n    });\n  }\n  return target;\n}\nfunction _defineProperty(obj, key, value) {\n  if (key in obj) {\n    Object.defineProperty(obj, key, {\n      value,\n      enumerable: true,\n      configurable: true,\n      writable: true\n    });\n  } else {\n    obj[key] = value;\n  }\n  return obj;\n}\nvar activeFocusTraps = function() {\n  var trapQueue = [];\n  return {\n    activateTrap: function activateTrap(trap) {\n      if (trapQueue.length > 0) {\n        var activeTrap = trapQueue[trapQueue.length - 1];\n        if (activeTrap !== trap) {\n          activeTrap.pause();\n        }\n      }\n      var trapIndex = trapQueue.indexOf(trap);\n      if (trapIndex === -1) {\n        trapQueue.push(trap);\n      } else {\n        trapQueue.splice(trapIndex, 1);\n        trapQueue.push(trap);\n      }\n    },\n    deactivateTrap: function deactivateTrap(trap) {\n      var trapIndex = trapQueue.indexOf(trap);\n      if (trapIndex !== -1) {\n        trapQueue.splice(trapIndex, 1);\n      }\n      if (trapQueue.length > 0) {\n        trapQueue[trapQueue.length - 1].unpause();\n      }\n    }\n  };\n}();\nvar isSelectableInput = function isSelectableInput2(node) {\n  return node.tagName && node.tagName.toLowerCase() === \"input\" && typeof node.select === \"function\";\n};\nvar isEscapeEvent = function isEscapeEvent2(e) {\n  return e.key === \"Escape\" || e.key === \"Esc\" || e.keyCode === 27;\n};\nvar isTabEvent = function isTabEvent2(e) {\n  return e.key === \"Tab\" || e.keyCode === 9;\n};\nvar delay = function delay2(fn) {\n  return setTimeout(fn, 0);\n};\nvar findIndex = function findIndex2(arr, fn) {\n  var idx = -1;\n  arr.every(function(value, i) {\n    if (fn(value)) {\n      idx = i;\n      return false;\n    }\n    return true;\n  });\n  return idx;\n};\nvar valueOrHandler = function valueOrHandler2(value) {\n  for (var _len = arguments.length, params = new Array(_len > 1 ? _len - 1 : 0), _key = 1; _key < _len; _key++) {\n    params[_key - 1] = arguments[_key];\n  }\n  return typeof value === \"function\" ? value.apply(void 0, params) : value;\n};\nvar getActualTarget = function getActualTarget2(event) {\n  return event.target.shadowRoot && typeof event.composedPath === \"function\" ? event.composedPath()[0] : event.target;\n};\nvar createFocusTrap = function createFocusTrap2(elements, userOptions) {\n  var doc = (userOptions === null || userOptions === void 0 ? void 0 : userOptions.document) || document;\n  var config = _objectSpread2({\n    returnFocusOnDeactivate: true,\n    escapeDeactivates: true,\n    delayInitialFocus: true\n  }, userOptions);\n  var state = {\n    // containers given to createFocusTrap()\n    // @type {Array<HTMLElement>}\n    containers: [],\n    // list of objects identifying tabbable nodes in `containers` in the trap\n    // NOTE: it's possible that a group has no tabbable nodes if nodes get removed while the trap\n    //  is active, but the trap should never get to a state where there isn't at least one group\n    //  with at least one tabbable node in it (that would lead to an error condition that would\n    //  result in an error being thrown)\n    // @type {Array<{\n    //   container: HTMLElement,\n    //   tabbableNodes: Array<HTMLElement>, // empty if none\n    //   focusableNodes: Array<HTMLElement>, // empty if none\n    //   firstTabbableNode: HTMLElement|null,\n    //   lastTabbableNode: HTMLElement|null,\n    //   nextTabbableNode: (node: HTMLElement, forward: boolean) => HTMLElement|undefined\n    // }>}\n    containerGroups: [],\n    // same order/length as `containers` list\n    // references to objects in `containerGroups`, but only those that actually have\n    //  tabbable nodes in them\n    // NOTE: same order as `containers` and `containerGroups`, but __not necessarily__\n    //  the same length\n    tabbableGroups: [],\n    nodeFocusedBeforeActivation: null,\n    mostRecentlyFocusedNode: null,\n    active: false,\n    paused: false,\n    // timer ID for when delayInitialFocus is true and initial focus in this trap\n    //  has been delayed during activation\n    delayInitialFocusTimer: void 0\n  };\n  var trap;\n  var getOption = function getOption2(configOverrideOptions, optionName, configOptionName) {\n    return configOverrideOptions && configOverrideOptions[optionName] !== void 0 ? configOverrideOptions[optionName] : config[configOptionName || optionName];\n  };\n  var findContainerIndex = function findContainerIndex2(element) {\n    return state.containerGroups.findIndex(function(_ref) {\n      var container = _ref.container, tabbableNodes = _ref.tabbableNodes;\n      return container.contains(element) || // fall back to explicit tabbable search which will take into consideration any\n      //  web components if the `tabbableOptions.getShadowRoot` option was used for\n      //  the trap, enabling shadow DOM support in tabbable (`Node.contains()` doesn't\n      //  look inside web components even if open)\n      tabbableNodes.find(function(node) {\n        return node === element;\n      });\n    });\n  };\n  var getNodeForOption = function getNodeForOption2(optionName) {\n    var optionValue = config[optionName];\n    if (typeof optionValue === \"function\") {\n      for (var _len2 = arguments.length, params = new Array(_len2 > 1 ? _len2 - 1 : 0), _key2 = 1; _key2 < _len2; _key2++) {\n        params[_key2 - 1] = arguments[_key2];\n      }\n      optionValue = optionValue.apply(void 0, params);\n    }\n    if (optionValue === true) {\n      optionValue = void 0;\n    }\n    if (!optionValue) {\n      if (optionValue === void 0 || optionValue === false) {\n        return optionValue;\n      }\n      throw new Error(\"`\".concat(optionName, \"` was specified but was not a node, or did not return a node\"));\n    }\n    var node = optionValue;\n    if (typeof optionValue === \"string\") {\n      node = doc.querySelector(optionValue);\n      if (!node) {\n        throw new Error(\"`\".concat(optionName, \"` as selector refers to no known node\"));\n      }\n    }\n    return node;\n  };\n  var getInitialFocusNode = function getInitialFocusNode2() {\n    var node = getNodeForOption(\"initialFocus\");\n    if (node === false) {\n      return false;\n    }\n    if (node === void 0) {\n      if (findContainerIndex(doc.activeElement) >= 0) {\n        node = doc.activeElement;\n      } else {\n        var firstTabbableGroup = state.tabbableGroups[0];\n        var firstTabbableNode = firstTabbableGroup && firstTabbableGroup.firstTabbableNode;\n        node = firstTabbableNode || getNodeForOption(\"fallbackFocus\");\n      }\n    }\n    if (!node) {\n      throw new Error(\"Your focus-trap needs to have at least one focusable element\");\n    }\n    return node;\n  };\n  var updateTabbableNodes = function updateTabbableNodes2() {\n    state.containerGroups = state.containers.map(function(container) {\n      var tabbableNodes = tabbable(container, config.tabbableOptions);\n      var focusableNodes = focusable(container, config.tabbableOptions);\n      return {\n        container,\n        tabbableNodes,\n        focusableNodes,\n        firstTabbableNode: tabbableNodes.length > 0 ? tabbableNodes[0] : null,\n        lastTabbableNode: tabbableNodes.length > 0 ? tabbableNodes[tabbableNodes.length - 1] : null,\n        /**\n         * Finds the __tabbable__ node that follows the given node in the specified direction,\n         *  in this container, if any.\n         * @param {HTMLElement} node\n         * @param {boolean} [forward] True if going in forward tab order; false if going\n         *  in reverse.\n         * @returns {HTMLElement|undefined} The next tabbable node, if any.\n         */\n        nextTabbableNode: function nextTabbableNode(node) {\n          var forward = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : true;\n          var nodeIdx = focusableNodes.findIndex(function(n) {\n            return n === node;\n          });\n          if (nodeIdx < 0) {\n            return void 0;\n          }\n          if (forward) {\n            return focusableNodes.slice(nodeIdx + 1).find(function(n) {\n              return isTabbable(n, config.tabbableOptions);\n            });\n          }\n          return focusableNodes.slice(0, nodeIdx).reverse().find(function(n) {\n            return isTabbable(n, config.tabbableOptions);\n          });\n        }\n      };\n    });\n    state.tabbableGroups = state.containerGroups.filter(function(group) {\n      return group.tabbableNodes.length > 0;\n    });\n    if (state.tabbableGroups.length <= 0 && !getNodeForOption(\"fallbackFocus\")) {\n      throw new Error(\"Your focus-trap must have at least one container with at least one tabbable node in it at all times\");\n    }\n  };\n  var tryFocus = function tryFocus2(node) {\n    if (node === false) {\n      return;\n    }\n    if (node === doc.activeElement) {\n      return;\n    }\n    if (!node || !node.focus) {\n      tryFocus2(getInitialFocusNode());\n      return;\n    }\n    node.focus({\n      preventScroll: !!config.preventScroll\n    });\n    state.mostRecentlyFocusedNode = node;\n    if (isSelectableInput(node)) {\n      node.select();\n    }\n  };\n  var getReturnFocusNode = function getReturnFocusNode2(previousActiveElement) {\n    var node = getNodeForOption(\"setReturnFocus\", previousActiveElement);\n    return node ? node : node === false ? false : previousActiveElement;\n  };\n  var checkPointerDown = function checkPointerDown2(e) {\n    var target = getActualTarget(e);\n    if (findContainerIndex(target) >= 0) {\n      return;\n    }\n    if (valueOrHandler(config.clickOutsideDeactivates, e)) {\n      trap.deactivate({\n        // if, on deactivation, we should return focus to the node originally-focused\n        //  when the trap was activated (or the configured `setReturnFocus` node),\n        //  then assume it's also OK to return focus to the outside node that was\n        //  just clicked, causing deactivation, as long as that node is focusable;\n        //  if it isn't focusable, then return focus to the original node focused\n        //  on activation (or the configured `setReturnFocus` node)\n        // NOTE: by setting `returnFocus: false`, deactivate() will do nothing,\n        //  which will result in the outside click setting focus to the node\n        //  that was clicked, whether it's focusable or not; by setting\n        //  `returnFocus: true`, we'll attempt to re-focus the node originally-focused\n        //  on activation (or the configured `setReturnFocus` node)\n        returnFocus: config.returnFocusOnDeactivate && !isFocusable(target, config.tabbableOptions)\n      });\n      return;\n    }\n    if (valueOrHandler(config.allowOutsideClick, e)) {\n      return;\n    }\n    e.preventDefault();\n  };\n  var checkFocusIn = function checkFocusIn2(e) {\n    var target = getActualTarget(e);\n    var targetContained = findContainerIndex(target) >= 0;\n    if (targetContained || target instanceof Document) {\n      if (targetContained) {\n        state.mostRecentlyFocusedNode = target;\n      }\n    } else {\n      e.stopImmediatePropagation();\n      tryFocus(state.mostRecentlyFocusedNode || getInitialFocusNode());\n    }\n  };\n  var checkTab = function checkTab2(e) {\n    var target = getActualTarget(e);\n    updateTabbableNodes();\n    var destinationNode = null;\n    if (state.tabbableGroups.length > 0) {\n      var containerIndex = findContainerIndex(target);\n      var containerGroup = containerIndex >= 0 ? state.containerGroups[containerIndex] : void 0;\n      if (containerIndex < 0) {\n        if (e.shiftKey) {\n          destinationNode = state.tabbableGroups[state.tabbableGroups.length - 1].lastTabbableNode;\n        } else {\n          destinationNode = state.tabbableGroups[0].firstTabbableNode;\n        }\n      } else if (e.shiftKey) {\n        var startOfGroupIndex = findIndex(state.tabbableGroups, function(_ref2) {\n          var firstTabbableNode = _ref2.firstTabbableNode;\n          return target === firstTabbableNode;\n        });\n        if (startOfGroupIndex < 0 && (containerGroup.container === target || isFocusable(target, config.tabbableOptions) && !isTabbable(target, config.tabbableOptions) && !containerGroup.nextTabbableNode(target, false))) {\n          startOfGroupIndex = containerIndex;\n        }\n        if (startOfGroupIndex >= 0) {\n          var destinationGroupIndex = startOfGroupIndex === 0 ? state.tabbableGroups.length - 1 : startOfGroupIndex - 1;\n          var destinationGroup = state.tabbableGroups[destinationGroupIndex];\n          destinationNode = destinationGroup.lastTabbableNode;\n        }\n      } else {\n        var lastOfGroupIndex = findIndex(state.tabbableGroups, function(_ref3) {\n          var lastTabbableNode = _ref3.lastTabbableNode;\n          return target === lastTabbableNode;\n        });\n        if (lastOfGroupIndex < 0 && (containerGroup.container === target || isFocusable(target, config.tabbableOptions) && !isTabbable(target, config.tabbableOptions) && !containerGroup.nextTabbableNode(target))) {\n          lastOfGroupIndex = containerIndex;\n        }\n        if (lastOfGroupIndex >= 0) {\n          var _destinationGroupIndex = lastOfGroupIndex === state.tabbableGroups.length - 1 ? 0 : lastOfGroupIndex + 1;\n          var _destinationGroup = state.tabbableGroups[_destinationGroupIndex];\n          destinationNode = _destinationGroup.firstTabbableNode;\n        }\n      }\n    } else {\n      destinationNode = getNodeForOption(\"fallbackFocus\");\n    }\n    if (destinationNode) {\n      e.preventDefault();\n      tryFocus(destinationNode);\n    }\n  };\n  var checkKey = function checkKey2(e) {\n    if (isEscapeEvent(e) && valueOrHandler(config.escapeDeactivates, e) !== false) {\n      e.preventDefault();\n      trap.deactivate();\n      return;\n    }\n    if (isTabEvent(e)) {\n      checkTab(e);\n      return;\n    }\n  };\n  var checkClick = function checkClick2(e) {\n    var target = getActualTarget(e);\n    if (findContainerIndex(target) >= 0) {\n      return;\n    }\n    if (valueOrHandler(config.clickOutsideDeactivates, e)) {\n      return;\n    }\n    if (valueOrHandler(config.allowOutsideClick, e)) {\n      return;\n    }\n    e.preventDefault();\n    e.stopImmediatePropagation();\n  };\n  var addListeners = function addListeners2() {\n    if (!state.active) {\n      return;\n    }\n    activeFocusTraps.activateTrap(trap);\n    state.delayInitialFocusTimer = config.delayInitialFocus ? delay(function() {\n      tryFocus(getInitialFocusNode());\n    }) : tryFocus(getInitialFocusNode());\n    doc.addEventListener(\"focusin\", checkFocusIn, true);\n    doc.addEventListener(\"mousedown\", checkPointerDown, {\n      capture: true,\n      passive: false\n    });\n    doc.addEventListener(\"touchstart\", checkPointerDown, {\n      capture: true,\n      passive: false\n    });\n    doc.addEventListener(\"click\", checkClick, {\n      capture: true,\n      passive: false\n    });\n    doc.addEventListener(\"keydown\", checkKey, {\n      capture: true,\n      passive: false\n    });\n    return trap;\n  };\n  var removeListeners = function removeListeners2() {\n    if (!state.active) {\n      return;\n    }\n    doc.removeEventListener(\"focusin\", checkFocusIn, true);\n    doc.removeEventListener(\"mousedown\", checkPointerDown, true);\n    doc.removeEventListener(\"touchstart\", checkPointerDown, true);\n    doc.removeEventListener(\"click\", checkClick, true);\n    doc.removeEventListener(\"keydown\", checkKey, true);\n    return trap;\n  };\n  trap = {\n    get active() {\n      return state.active;\n    },\n    get paused() {\n      return state.paused;\n    },\n    activate: function activate(activateOptions) {\n      if (state.active) {\n        return this;\n      }\n      var onActivate = getOption(activateOptions, \"onActivate\");\n      var onPostActivate = getOption(activateOptions, \"onPostActivate\");\n      var checkCanFocusTrap = getOption(activateOptions, \"checkCanFocusTrap\");\n      if (!checkCanFocusTrap) {\n        updateTabbableNodes();\n      }\n      state.active = true;\n      state.paused = false;\n      state.nodeFocusedBeforeActivation = doc.activeElement;\n      if (onActivate) {\n        onActivate();\n      }\n      var finishActivation = function finishActivation2() {\n        if (checkCanFocusTrap) {\n          updateTabbableNodes();\n        }\n        addListeners();\n        if (onPostActivate) {\n          onPostActivate();\n        }\n      };\n      if (checkCanFocusTrap) {\n        checkCanFocusTrap(state.containers.concat()).then(finishActivation, finishActivation);\n        return this;\n      }\n      finishActivation();\n      return this;\n    },\n    deactivate: function deactivate(deactivateOptions) {\n      if (!state.active) {\n        return this;\n      }\n      var options = _objectSpread2({\n        onDeactivate: config.onDeactivate,\n        onPostDeactivate: config.onPostDeactivate,\n        checkCanReturnFocus: config.checkCanReturnFocus\n      }, deactivateOptions);\n      clearTimeout(state.delayInitialFocusTimer);\n      state.delayInitialFocusTimer = void 0;\n      removeListeners();\n      state.active = false;\n      state.paused = false;\n      activeFocusTraps.deactivateTrap(trap);\n      var onDeactivate = getOption(options, \"onDeactivate\");\n      var onPostDeactivate = getOption(options, \"onPostDeactivate\");\n      var checkCanReturnFocus = getOption(options, \"checkCanReturnFocus\");\n      var returnFocus = getOption(options, \"returnFocus\", \"returnFocusOnDeactivate\");\n      if (onDeactivate) {\n        onDeactivate();\n      }\n      var finishDeactivation = function finishDeactivation2() {\n        delay(function() {\n          if (returnFocus) {\n            tryFocus(getReturnFocusNode(state.nodeFocusedBeforeActivation));\n          }\n          if (onPostDeactivate) {\n            onPostDeactivate();\n          }\n        });\n      };\n      if (returnFocus && checkCanReturnFocus) {\n        checkCanReturnFocus(getReturnFocusNode(state.nodeFocusedBeforeActivation)).then(finishDeactivation, finishDeactivation);\n        return this;\n      }\n      finishDeactivation();\n      return this;\n    },\n    pause: function pause() {\n      if (state.paused || !state.active) {\n        return this;\n      }\n      state.paused = true;\n      removeListeners();\n      return this;\n    },\n    unpause: function unpause() {\n      if (!state.paused || !state.active) {\n        return this;\n      }\n      state.paused = false;\n      updateTabbableNodes();\n      addListeners();\n      return this;\n    },\n    updateContainerElements: function updateContainerElements(containerElements) {\n      var elementsAsArray = [].concat(containerElements).filter(Boolean);\n      state.containers = elementsAsArray.map(function(element) {\n        return typeof element === \"string\" ? doc.querySelector(element) : element;\n      });\n      if (state.active) {\n        updateTabbableNodes();\n      }\n      return this;\n    }\n  };\n  trap.updateContainerElements(elements);\n  return trap;\n};\n\n// packages/focus/src/index.js\nfunction src_default(Alpine) {\n  let lastFocused;\n  let currentFocused;\n  window.addEventListener(\"focusin\", () => {\n    lastFocused = currentFocused;\n    currentFocused = document.activeElement;\n  });\n  Alpine.magic(\"focus\", (el) => {\n    let within = el;\n    return {\n      __noscroll: false,\n      __wrapAround: false,\n      within(el2) {\n        within = el2;\n        return this;\n      },\n      withoutScrolling() {\n        this.__noscroll = true;\n        return this;\n      },\n      noscroll() {\n        this.__noscroll = true;\n        return this;\n      },\n      withWrapAround() {\n        this.__wrapAround = true;\n        return this;\n      },\n      wrap() {\n        return this.withWrapAround();\n      },\n      focusable(el2) {\n        return isFocusable(el2);\n      },\n      previouslyFocused() {\n        return lastFocused;\n      },\n      lastFocused() {\n        return lastFocused;\n      },\n      focused() {\n        return currentFocused;\n      },\n      focusables() {\n        if (Array.isArray(within))\n          return within;\n        return focusable(within, { displayCheck: \"none\" });\n      },\n      all() {\n        return this.focusables();\n      },\n      isFirst(el2) {\n        let els = this.all();\n        return els[0] && els[0].isSameNode(el2);\n      },\n      isLast(el2) {\n        let els = this.all();\n        return els.length && els.slice(-1)[0].isSameNode(el2);\n      },\n      getFirst() {\n        return this.all()[0];\n      },\n      getLast() {\n        return this.all().slice(-1)[0];\n      },\n      getNext() {\n        let list = this.all();\n        let current = document.activeElement;\n        if (list.indexOf(current) === -1)\n          return;\n        if (this.__wrapAround && list.indexOf(current) === list.length - 1) {\n          return list[0];\n        }\n        return list[list.indexOf(current) + 1];\n      },\n      getPrevious() {\n        let list = this.all();\n        let current = document.activeElement;\n        if (list.indexOf(current) === -1)\n          return;\n        if (this.__wrapAround && list.indexOf(current) === 0) {\n          return list.slice(-1)[0];\n        }\n        return list[list.indexOf(current) - 1];\n      },\n      first() {\n        this.focus(this.getFirst());\n      },\n      last() {\n        this.focus(this.getLast());\n      },\n      next() {\n        this.focus(this.getNext());\n      },\n      previous() {\n        this.focus(this.getPrevious());\n      },\n      prev() {\n        return this.previous();\n      },\n      focus(el2) {\n        if (!el2)\n          return;\n        setTimeout(() => {\n          if (!el2.hasAttribute(\"tabindex\"))\n            el2.setAttribute(\"tabindex\", \"0\");\n          el2.focus({ preventScroll: this.__noscroll });\n        });\n      }\n    };\n  });\n  Alpine.directive(\"trap\", Alpine.skipDuringClone(\n    (el, { expression, modifiers }, { effect, evaluateLater, cleanup }) => {\n      let evaluator = evaluateLater(expression);\n      let oldValue = false;\n      let options = {\n        escapeDeactivates: false,\n        allowOutsideClick: true,\n        fallbackFocus: () => el\n      };\n      if (modifiers.includes(\"noautofocus\")) {\n        options.initialFocus = false;\n      } else {\n        let autofocusEl = el.querySelector(\"[autofocus]\");\n        if (autofocusEl)\n          options.initialFocus = autofocusEl;\n      }\n      let trap = createFocusTrap(el, options);\n      let undoInert = () => {\n      };\n      let undoDisableScrolling = () => {\n      };\n      const releaseFocus = () => {\n        undoInert();\n        undoInert = () => {\n        };\n        undoDisableScrolling();\n        undoDisableScrolling = () => {\n        };\n        trap.deactivate({\n          returnFocus: !modifiers.includes(\"noreturn\")\n        });\n      };\n      effect(() => evaluator((value) => {\n        if (oldValue === value)\n          return;\n        if (value && !oldValue) {\n          if (modifiers.includes(\"noscroll\"))\n            undoDisableScrolling = disableScrolling();\n          if (modifiers.includes(\"inert\"))\n            undoInert = setInert(el);\n          setTimeout(() => {\n            trap.activate();\n          }, 15);\n        }\n        if (!value && oldValue) {\n          releaseFocus();\n        }\n        oldValue = !!value;\n      }));\n      cleanup(releaseFocus);\n    },\n    // When cloning, we only want to add aria-hidden attributes to the\n    // DOM and not try to actually trap, as trapping can mess with the\n    // live DOM and isn't just isolated to the cloned DOM.\n    (el, { expression, modifiers }, { evaluate }) => {\n      if (modifiers.includes(\"inert\") && evaluate(expression))\n        setInert(el);\n    }\n  ));\n}\nfunction setInert(el) {\n  let undos = [];\n  crawlSiblingsUp(el, (sibling) => {\n    let cache = sibling.hasAttribute(\"aria-hidden\");\n    sibling.setAttribute(\"aria-hidden\", \"true\");\n    undos.push(() => cache || sibling.removeAttribute(\"aria-hidden\"));\n  });\n  return () => {\n    while (undos.length)\n      undos.pop()();\n  };\n}\nfunction crawlSiblingsUp(el, callback) {\n  if (el.isSameNode(document.body) || !el.parentNode)\n    return;\n  Array.from(el.parentNode.children).forEach((sibling) => {\n    if (sibling.isSameNode(el)) {\n      crawlSiblingsUp(el.parentNode, callback);\n    } else {\n      callback(sibling);\n    }\n  });\n}\nfunction disableScrolling() {\n  let overflow = document.documentElement.style.overflow;\n  let paddingRight = document.documentElement.style.paddingRight;\n  let scrollbarWidth = window.innerWidth - document.documentElement.clientWidth;\n  document.documentElement.style.overflow = \"hidden\";\n  document.documentElement.style.paddingRight = `${scrollbarWidth}px`;\n  return () => {\n    document.documentElement.style.overflow = overflow;\n    document.documentElement.style.paddingRight = paddingRight;\n  };\n}\n\n// packages/focus/builds/module.js\nvar module_default = src_default;\nexport {\n  module_default as default,\n  src_default as focus\n};\n/*! Bundled license information:\n\ntabbable/dist/index.esm.js:\n  (*!\n  * tabbable 5.3.3\n  * @license MIT, https://github.com/focus-trap/tabbable/blob/master/LICENSE\n  *)\n\nfocus-trap/dist/focus-trap.esm.js:\n  (*!\n  * focus-trap 6.9.4\n  * @license MIT, https://github.com/focus-trap/focus-trap/blob/master/LICENSE\n  *)\n*/\n", "// packages/persist/src/index.js\nfunction src_default(Alpine) {\n  let persist = () => {\n    let alias;\n    let storage;\n    try {\n      storage = localStorage;\n    } catch (e) {\n      console.error(e);\n      console.warn(\"Alpine: $persist is using temporary storage since localStorage is unavailable.\");\n      let dummy = /* @__PURE__ */ new Map();\n      storage = {\n        getItem: dummy.get.bind(dummy),\n        setItem: dummy.set.bind(dummy)\n      };\n    }\n    return Alpine.interceptor((initialValue, getter, setter, path, key) => {\n      let lookup = alias || `_x_${path}`;\n      let initial = storageHas(lookup, storage) ? storageGet(lookup, storage) : initialValue;\n      setter(initial);\n      Alpine.effect(() => {\n        let value = getter();\n        storageSet(lookup, value, storage);\n        setter(value);\n      });\n      return initial;\n    }, (func) => {\n      func.as = (key) => {\n        alias = key;\n        return func;\n      }, func.using = (target) => {\n        storage = target;\n        return func;\n      };\n    });\n  };\n  Object.defineProperty(Alpine, \"$persist\", { get: () => persist() });\n  Alpine.magic(\"persist\", persist);\n  Alpine.persist = (key, { get, set }, storage = localStorage) => {\n    let initial = storageHas(key, storage) ? storageGet(key, storage) : get();\n    set(initial);\n    Alpine.effect(() => {\n      let value = get();\n      storageSet(key, value, storage);\n      set(value);\n    });\n  };\n}\nfunction storageHas(key, storage) {\n  return storage.getItem(key) !== null;\n}\nfunction storageGet(key, storage) {\n  let value = storage.getItem(key, storage);\n  if (value === void 0)\n    return;\n  return JSON.parse(value);\n}\nfunction storageSet(key, value, storage) {\n  storage.setItem(key, JSON.stringify(value));\n}\n\n// packages/persist/builds/module.js\nvar module_default = src_default;\nexport {\n  module_default as default,\n  src_default as persist\n};\n", "// packages/intersect/src/index.js\nfunction src_default(Alpine) {\n  Alpine.directive(\"intersect\", Alpine.skipDuringClone((el, { value, expression, modifiers }, { evaluateLater, cleanup }) => {\n    let evaluate = evaluateLater(expression);\n    let options = {\n      rootMargin: getRootMargin(modifiers),\n      threshold: getThreshold(modifiers)\n    };\n    let observer = new IntersectionObserver((entries) => {\n      entries.forEach((entry) => {\n        if (entry.isIntersecting === (value === \"leave\"))\n          return;\n        evaluate();\n        modifiers.includes(\"once\") && observer.disconnect();\n      });\n    }, options);\n    observer.observe(el);\n    cleanup(() => {\n      observer.disconnect();\n    });\n  }));\n}\nfunction getThreshold(modifiers) {\n  if (modifiers.includes(\"full\"))\n    return 0.99;\n  if (modifiers.includes(\"half\"))\n    return 0.5;\n  if (!modifiers.includes(\"threshold\"))\n    return 0;\n  let threshold = modifiers[modifiers.indexOf(\"threshold\") + 1];\n  if (threshold === \"100\")\n    return 1;\n  if (threshold === \"0\")\n    return 0;\n  return Number(`.${threshold}`);\n}\nfunction getLengthValue(rawValue) {\n  let match = rawValue.match(/^(-?[0-9]+)(px|%)?$/);\n  return match ? match[1] + (match[2] || \"px\") : void 0;\n}\nfunction getRootMargin(modifiers) {\n  const key = \"margin\";\n  const fallback = \"0px 0px 0px 0px\";\n  const index = modifiers.indexOf(key);\n  if (index === -1)\n    return fallback;\n  let values = [];\n  for (let i = 1; i < 5; i++) {\n    values.push(getLengthValue(modifiers[index + i] || \"\"));\n  }\n  values = values.filter((v) => v !== void 0);\n  return values.length ? values.join(\" \").trim() : fallback;\n}\n\n// packages/intersect/builds/module.js\nvar module_default = src_default;\nexport {\n  module_default as default,\n  src_default as intersect\n};\n", "// node_modules/@floating-ui/utils/dist/floating-ui.utils.mjs\nvar min = Math.min;\nvar max = Math.max;\nvar round = Math.round;\nvar floor = Math.floor;\nvar createCoords = (v) => ({\n  x: v,\n  y: v\n});\nvar oppositeSideMap = {\n  left: \"right\",\n  right: \"left\",\n  bottom: \"top\",\n  top: \"bottom\"\n};\nvar oppositeAlignmentMap = {\n  start: \"end\",\n  end: \"start\"\n};\nfunction clamp(start, value, end) {\n  return max(start, min(value, end));\n}\nfunction evaluate(value, param) {\n  return typeof value === \"function\" ? value(param) : value;\n}\nfunction getSide(placement) {\n  return placement.split(\"-\")[0];\n}\nfunction getAlignment(placement) {\n  return placement.split(\"-\")[1];\n}\nfunction getOppositeAxis(axis) {\n  return axis === \"x\" ? \"y\" : \"x\";\n}\nfunction getAxisLength(axis) {\n  return axis === \"y\" ? \"height\" : \"width\";\n}\nfunction getSideAxis(placement) {\n  return [\"top\", \"bottom\"].includes(getSide(placement)) ? \"y\" : \"x\";\n}\nfunction getAlignmentAxis(placement) {\n  return getOppositeAxis(getSideAxis(placement));\n}\nfunction getAlignmentSides(placement, rects, rtl) {\n  if (rtl === void 0) {\n    rtl = false;\n  }\n  const alignment = getAlignment(placement);\n  const alignmentAxis = getAlignmentAxis(placement);\n  const length = getAxisLength(alignmentAxis);\n  let mainAlignmentSide = alignmentAxis === \"x\" ? alignment === (rtl ? \"end\" : \"start\") ? \"right\" : \"left\" : alignment === \"start\" ? \"bottom\" : \"top\";\n  if (rects.reference[length] > rects.floating[length]) {\n    mainAlignmentSide = getOppositePlacement(mainAlignmentSide);\n  }\n  return [mainAlignmentSide, getOppositePlacement(mainAlignmentSide)];\n}\nfunction getExpandedPlacements(placement) {\n  const oppositePlacement = getOppositePlacement(placement);\n  return [getOppositeAlignmentPlacement(placement), oppositePlacement, getOppositeAlignmentPlacement(oppositePlacement)];\n}\nfunction getOppositeAlignmentPlacement(placement) {\n  return placement.replace(/start|end/g, (alignment) => oppositeAlignmentMap[alignment]);\n}\nfunction getSideList(side, isStart, rtl) {\n  const lr = [\"left\", \"right\"];\n  const rl = [\"right\", \"left\"];\n  const tb = [\"top\", \"bottom\"];\n  const bt = [\"bottom\", \"top\"];\n  switch (side) {\n    case \"top\":\n    case \"bottom\":\n      if (rtl)\n        return isStart ? rl : lr;\n      return isStart ? lr : rl;\n    case \"left\":\n    case \"right\":\n      return isStart ? tb : bt;\n    default:\n      return [];\n  }\n}\nfunction getOppositeAxisPlacements(placement, flipAlignment, direction, rtl) {\n  const alignment = getAlignment(placement);\n  let list = getSideList(getSide(placement), direction === \"start\", rtl);\n  if (alignment) {\n    list = list.map((side) => side + \"-\" + alignment);\n    if (flipAlignment) {\n      list = list.concat(list.map(getOppositeAlignmentPlacement));\n    }\n  }\n  return list;\n}\nfunction getOppositePlacement(placement) {\n  return placement.replace(/left|right|bottom|top/g, (side) => oppositeSideMap[side]);\n}\nfunction expandPaddingObject(padding) {\n  return {\n    top: 0,\n    right: 0,\n    bottom: 0,\n    left: 0,\n    ...padding\n  };\n}\nfunction getPaddingObject(padding) {\n  return typeof padding !== \"number\" ? expandPaddingObject(padding) : {\n    top: padding,\n    right: padding,\n    bottom: padding,\n    left: padding\n  };\n}\nfunction rectToClientRect(rect) {\n  return {\n    ...rect,\n    top: rect.y,\n    left: rect.x,\n    right: rect.x + rect.width,\n    bottom: rect.y + rect.height\n  };\n}\n\n// node_modules/@floating-ui/core/dist/floating-ui.core.mjs\nfunction computeCoordsFromPlacement(_ref, placement, rtl) {\n  let {\n    reference,\n    floating\n  } = _ref;\n  const sideAxis = getSideAxis(placement);\n  const alignmentAxis = getAlignmentAxis(placement);\n  const alignLength = getAxisLength(alignmentAxis);\n  const side = getSide(placement);\n  const isVertical = sideAxis === \"y\";\n  const commonX = reference.x + reference.width / 2 - floating.width / 2;\n  const commonY = reference.y + reference.height / 2 - floating.height / 2;\n  const commonAlign = reference[alignLength] / 2 - floating[alignLength] / 2;\n  let coords;\n  switch (side) {\n    case \"top\":\n      coords = {\n        x: commonX,\n        y: reference.y - floating.height\n      };\n      break;\n    case \"bottom\":\n      coords = {\n        x: commonX,\n        y: reference.y + reference.height\n      };\n      break;\n    case \"right\":\n      coords = {\n        x: reference.x + reference.width,\n        y: commonY\n      };\n      break;\n    case \"left\":\n      coords = {\n        x: reference.x - floating.width,\n        y: commonY\n      };\n      break;\n    default:\n      coords = {\n        x: reference.x,\n        y: reference.y\n      };\n  }\n  switch (getAlignment(placement)) {\n    case \"start\":\n      coords[alignmentAxis] -= commonAlign * (rtl && isVertical ? -1 : 1);\n      break;\n    case \"end\":\n      coords[alignmentAxis] += commonAlign * (rtl && isVertical ? -1 : 1);\n      break;\n  }\n  return coords;\n}\nvar computePosition = async (reference, floating, config) => {\n  const {\n    placement = \"bottom\",\n    strategy = \"absolute\",\n    middleware = [],\n    platform: platform2\n  } = config;\n  const validMiddleware = middleware.filter(Boolean);\n  const rtl = await (platform2.isRTL == null ? void 0 : platform2.isRTL(floating));\n  let rects = await platform2.getElementRects({\n    reference,\n    floating,\n    strategy\n  });\n  let {\n    x,\n    y\n  } = computeCoordsFromPlacement(rects, placement, rtl);\n  let statefulPlacement = placement;\n  let middlewareData = {};\n  let resetCount = 0;\n  for (let i = 0; i < validMiddleware.length; i++) {\n    const {\n      name,\n      fn\n    } = validMiddleware[i];\n    const {\n      x: nextX,\n      y: nextY,\n      data,\n      reset\n    } = await fn({\n      x,\n      y,\n      initialPlacement: placement,\n      placement: statefulPlacement,\n      strategy,\n      middlewareData,\n      rects,\n      platform: platform2,\n      elements: {\n        reference,\n        floating\n      }\n    });\n    x = nextX != null ? nextX : x;\n    y = nextY != null ? nextY : y;\n    middlewareData = {\n      ...middlewareData,\n      [name]: {\n        ...middlewareData[name],\n        ...data\n      }\n    };\n    if (reset && resetCount <= 50) {\n      resetCount++;\n      if (typeof reset === \"object\") {\n        if (reset.placement) {\n          statefulPlacement = reset.placement;\n        }\n        if (reset.rects) {\n          rects = reset.rects === true ? await platform2.getElementRects({\n            reference,\n            floating,\n            strategy\n          }) : reset.rects;\n        }\n        ({\n          x,\n          y\n        } = computeCoordsFromPlacement(rects, statefulPlacement, rtl));\n      }\n      i = -1;\n      continue;\n    }\n  }\n  return {\n    x,\n    y,\n    placement: statefulPlacement,\n    strategy,\n    middlewareData\n  };\n};\nasync function detectOverflow(state, options) {\n  var _await$platform$isEle;\n  if (options === void 0) {\n    options = {};\n  }\n  const {\n    x,\n    y,\n    platform: platform2,\n    rects,\n    elements,\n    strategy\n  } = state;\n  const {\n    boundary = \"clippingAncestors\",\n    rootBoundary = \"viewport\",\n    elementContext = \"floating\",\n    altBoundary = false,\n    padding = 0\n  } = evaluate(options, state);\n  const paddingObject = getPaddingObject(padding);\n  const altContext = elementContext === \"floating\" ? \"reference\" : \"floating\";\n  const element = elements[altBoundary ? altContext : elementContext];\n  const clippingClientRect = rectToClientRect(await platform2.getClippingRect({\n    element: ((_await$platform$isEle = await (platform2.isElement == null ? void 0 : platform2.isElement(element))) != null ? _await$platform$isEle : true) ? element : element.contextElement || await (platform2.getDocumentElement == null ? void 0 : platform2.getDocumentElement(elements.floating)),\n    boundary,\n    rootBoundary,\n    strategy\n  }));\n  const rect = elementContext === \"floating\" ? {\n    ...rects.floating,\n    x,\n    y\n  } : rects.reference;\n  const offsetParent = await (platform2.getOffsetParent == null ? void 0 : platform2.getOffsetParent(elements.floating));\n  const offsetScale = await (platform2.isElement == null ? void 0 : platform2.isElement(offsetParent)) ? await (platform2.getScale == null ? void 0 : platform2.getScale(offsetParent)) || {\n    x: 1,\n    y: 1\n  } : {\n    x: 1,\n    y: 1\n  };\n  const elementClientRect = rectToClientRect(platform2.convertOffsetParentRelativeRectToViewportRelativeRect ? await platform2.convertOffsetParentRelativeRectToViewportRelativeRect({\n    rect,\n    offsetParent,\n    strategy\n  }) : rect);\n  return {\n    top: (clippingClientRect.top - elementClientRect.top + paddingObject.top) / offsetScale.y,\n    bottom: (elementClientRect.bottom - clippingClientRect.bottom + paddingObject.bottom) / offsetScale.y,\n    left: (clippingClientRect.left - elementClientRect.left + paddingObject.left) / offsetScale.x,\n    right: (elementClientRect.right - clippingClientRect.right + paddingObject.right) / offsetScale.x\n  };\n}\nvar flip = function(options) {\n  if (options === void 0) {\n    options = {};\n  }\n  return {\n    name: \"flip\",\n    options,\n    async fn(state) {\n      var _middlewareData$arrow, _middlewareData$flip;\n      const {\n        placement,\n        middlewareData,\n        rects,\n        initialPlacement,\n        platform: platform2,\n        elements\n      } = state;\n      const {\n        mainAxis: checkMainAxis = true,\n        crossAxis: checkCrossAxis = true,\n        fallbackPlacements: specifiedFallbackPlacements,\n        fallbackStrategy = \"bestFit\",\n        fallbackAxisSideDirection = \"none\",\n        flipAlignment = true,\n        ...detectOverflowOptions\n      } = evaluate(options, state);\n      if ((_middlewareData$arrow = middlewareData.arrow) != null && _middlewareData$arrow.alignmentOffset) {\n        return {};\n      }\n      const side = getSide(placement);\n      const isBasePlacement = getSide(initialPlacement) === initialPlacement;\n      const rtl = await (platform2.isRTL == null ? void 0 : platform2.isRTL(elements.floating));\n      const fallbackPlacements = specifiedFallbackPlacements || (isBasePlacement || !flipAlignment ? [getOppositePlacement(initialPlacement)] : getExpandedPlacements(initialPlacement));\n      if (!specifiedFallbackPlacements && fallbackAxisSideDirection !== \"none\") {\n        fallbackPlacements.push(...getOppositeAxisPlacements(initialPlacement, flipAlignment, fallbackAxisSideDirection, rtl));\n      }\n      const placements2 = [initialPlacement, ...fallbackPlacements];\n      const overflow = await detectOverflow(state, detectOverflowOptions);\n      const overflows = [];\n      let overflowsData = ((_middlewareData$flip = middlewareData.flip) == null ? void 0 : _middlewareData$flip.overflows) || [];\n      if (checkMainAxis) {\n        overflows.push(overflow[side]);\n      }\n      if (checkCrossAxis) {\n        const sides2 = getAlignmentSides(placement, rects, rtl);\n        overflows.push(overflow[sides2[0]], overflow[sides2[1]]);\n      }\n      overflowsData = [...overflowsData, {\n        placement,\n        overflows\n      }];\n      if (!overflows.every((side2) => side2 <= 0)) {\n        var _middlewareData$flip2, _overflowsData$filter;\n        const nextIndex = (((_middlewareData$flip2 = middlewareData.flip) == null ? void 0 : _middlewareData$flip2.index) || 0) + 1;\n        const nextPlacement = placements2[nextIndex];\n        if (nextPlacement) {\n          return {\n            data: {\n              index: nextIndex,\n              overflows: overflowsData\n            },\n            reset: {\n              placement: nextPlacement\n            }\n          };\n        }\n        let resetPlacement = (_overflowsData$filter = overflowsData.filter((d) => d.overflows[0] <= 0).sort((a, b) => a.overflows[1] - b.overflows[1])[0]) == null ? void 0 : _overflowsData$filter.placement;\n        if (!resetPlacement) {\n          switch (fallbackStrategy) {\n            case \"bestFit\": {\n              var _overflowsData$map$so;\n              const placement2 = (_overflowsData$map$so = overflowsData.map((d) => [d.placement, d.overflows.filter((overflow2) => overflow2 > 0).reduce((acc, overflow2) => acc + overflow2, 0)]).sort((a, b) => a[1] - b[1])[0]) == null ? void 0 : _overflowsData$map$so[0];\n              if (placement2) {\n                resetPlacement = placement2;\n              }\n              break;\n            }\n            case \"initialPlacement\":\n              resetPlacement = initialPlacement;\n              break;\n          }\n        }\n        if (placement !== resetPlacement) {\n          return {\n            reset: {\n              placement: resetPlacement\n            }\n          };\n        }\n      }\n      return {};\n    }\n  };\n};\nasync function convertValueToCoords(state, options) {\n  const {\n    placement,\n    platform: platform2,\n    elements\n  } = state;\n  const rtl = await (platform2.isRTL == null ? void 0 : platform2.isRTL(elements.floating));\n  const side = getSide(placement);\n  const alignment = getAlignment(placement);\n  const isVertical = getSideAxis(placement) === \"y\";\n  const mainAxisMulti = [\"left\", \"top\"].includes(side) ? -1 : 1;\n  const crossAxisMulti = rtl && isVertical ? -1 : 1;\n  const rawValue = evaluate(options, state);\n  let {\n    mainAxis,\n    crossAxis,\n    alignmentAxis\n  } = typeof rawValue === \"number\" ? {\n    mainAxis: rawValue,\n    crossAxis: 0,\n    alignmentAxis: null\n  } : {\n    mainAxis: 0,\n    crossAxis: 0,\n    alignmentAxis: null,\n    ...rawValue\n  };\n  if (alignment && typeof alignmentAxis === \"number\") {\n    crossAxis = alignment === \"end\" ? alignmentAxis * -1 : alignmentAxis;\n  }\n  return isVertical ? {\n    x: crossAxis * crossAxisMulti,\n    y: mainAxis * mainAxisMulti\n  } : {\n    x: mainAxis * mainAxisMulti,\n    y: crossAxis * crossAxisMulti\n  };\n}\nvar offset = function(options) {\n  if (options === void 0) {\n    options = 0;\n  }\n  return {\n    name: \"offset\",\n    options,\n    async fn(state) {\n      const {\n        x,\n        y\n      } = state;\n      const diffCoords = await convertValueToCoords(state, options);\n      return {\n        x: x + diffCoords.x,\n        y: y + diffCoords.y,\n        data: diffCoords\n      };\n    }\n  };\n};\nvar shift = function(options) {\n  if (options === void 0) {\n    options = {};\n  }\n  return {\n    name: \"shift\",\n    options,\n    async fn(state) {\n      const {\n        x,\n        y,\n        placement\n      } = state;\n      const {\n        mainAxis: checkMainAxis = true,\n        crossAxis: checkCrossAxis = false,\n        limiter = {\n          fn: (_ref) => {\n            let {\n              x: x2,\n              y: y2\n            } = _ref;\n            return {\n              x: x2,\n              y: y2\n            };\n          }\n        },\n        ...detectOverflowOptions\n      } = evaluate(options, state);\n      const coords = {\n        x,\n        y\n      };\n      const overflow = await detectOverflow(state, detectOverflowOptions);\n      const crossAxis = getSideAxis(getSide(placement));\n      const mainAxis = getOppositeAxis(crossAxis);\n      let mainAxisCoord = coords[mainAxis];\n      let crossAxisCoord = coords[crossAxis];\n      if (checkMainAxis) {\n        const minSide = mainAxis === \"y\" ? \"top\" : \"left\";\n        const maxSide = mainAxis === \"y\" ? \"bottom\" : \"right\";\n        const min2 = mainAxisCoord + overflow[minSide];\n        const max2 = mainAxisCoord - overflow[maxSide];\n        mainAxisCoord = clamp(min2, mainAxisCoord, max2);\n      }\n      if (checkCrossAxis) {\n        const minSide = crossAxis === \"y\" ? \"top\" : \"left\";\n        const maxSide = crossAxis === \"y\" ? \"bottom\" : \"right\";\n        const min2 = crossAxisCoord + overflow[minSide];\n        const max2 = crossAxisCoord - overflow[maxSide];\n        crossAxisCoord = clamp(min2, crossAxisCoord, max2);\n      }\n      const limitedCoords = limiter.fn({\n        ...state,\n        [mainAxis]: mainAxisCoord,\n        [crossAxis]: crossAxisCoord\n      });\n      return {\n        ...limitedCoords,\n        data: {\n          x: limitedCoords.x - x,\n          y: limitedCoords.y - y\n        }\n      };\n    }\n  };\n};\n\n// node_modules/@floating-ui/utils/dom/dist/floating-ui.utils.dom.mjs\nfunction getNodeName(node) {\n  if (isNode(node)) {\n    return (node.nodeName || \"\").toLowerCase();\n  }\n  return \"#document\";\n}\nfunction getWindow(node) {\n  var _node$ownerDocument;\n  return (node == null ? void 0 : (_node$ownerDocument = node.ownerDocument) == null ? void 0 : _node$ownerDocument.defaultView) || window;\n}\nfunction getDocumentElement(node) {\n  var _ref;\n  return (_ref = (isNode(node) ? node.ownerDocument : node.document) || window.document) == null ? void 0 : _ref.documentElement;\n}\nfunction isNode(value) {\n  return value instanceof Node || value instanceof getWindow(value).Node;\n}\nfunction isElement(value) {\n  return value instanceof Element || value instanceof getWindow(value).Element;\n}\nfunction isHTMLElement(value) {\n  return value instanceof HTMLElement || value instanceof getWindow(value).HTMLElement;\n}\nfunction isShadowRoot(value) {\n  if (typeof ShadowRoot === \"undefined\") {\n    return false;\n  }\n  return value instanceof ShadowRoot || value instanceof getWindow(value).ShadowRoot;\n}\nfunction isOverflowElement(element) {\n  const {\n    overflow,\n    overflowX,\n    overflowY,\n    display\n  } = getComputedStyle(element);\n  return /auto|scroll|overlay|hidden|clip/.test(overflow + overflowY + overflowX) && ![\"inline\", \"contents\"].includes(display);\n}\nfunction isTableElement(element) {\n  return [\"table\", \"td\", \"th\"].includes(getNodeName(element));\n}\nfunction isContainingBlock(element) {\n  const webkit = isWebKit();\n  const css = getComputedStyle(element);\n  return css.transform !== \"none\" || css.perspective !== \"none\" || (css.containerType ? css.containerType !== \"normal\" : false) || !webkit && (css.backdropFilter ? css.backdropFilter !== \"none\" : false) || !webkit && (css.filter ? css.filter !== \"none\" : false) || [\"transform\", \"perspective\", \"filter\"].some((value) => (css.willChange || \"\").includes(value)) || [\"paint\", \"layout\", \"strict\", \"content\"].some((value) => (css.contain || \"\").includes(value));\n}\nfunction getContainingBlock(element) {\n  let currentNode = getParentNode(element);\n  while (isHTMLElement(currentNode) && !isLastTraversableNode(currentNode)) {\n    if (isContainingBlock(currentNode)) {\n      return currentNode;\n    } else {\n      currentNode = getParentNode(currentNode);\n    }\n  }\n  return null;\n}\nfunction isWebKit() {\n  if (typeof CSS === \"undefined\" || !CSS.supports)\n    return false;\n  return CSS.supports(\"-webkit-backdrop-filter\", \"none\");\n}\nfunction isLastTraversableNode(node) {\n  return [\"html\", \"body\", \"#document\"].includes(getNodeName(node));\n}\nfunction getComputedStyle(element) {\n  return getWindow(element).getComputedStyle(element);\n}\nfunction getNodeScroll(element) {\n  if (isElement(element)) {\n    return {\n      scrollLeft: element.scrollLeft,\n      scrollTop: element.scrollTop\n    };\n  }\n  return {\n    scrollLeft: element.pageXOffset,\n    scrollTop: element.pageYOffset\n  };\n}\nfunction getParentNode(node) {\n  if (getNodeName(node) === \"html\") {\n    return node;\n  }\n  const result = (\n    // Step into the shadow DOM of the parent of a slotted node.\n    node.assignedSlot || // DOM Element detected.\n    node.parentNode || // ShadowRoot detected.\n    isShadowRoot(node) && node.host || // Fallback.\n    getDocumentElement(node)\n  );\n  return isShadowRoot(result) ? result.host : result;\n}\nfunction getNearestOverflowAncestor(node) {\n  const parentNode = getParentNode(node);\n  if (isLastTraversableNode(parentNode)) {\n    return node.ownerDocument ? node.ownerDocument.body : node.body;\n  }\n  if (isHTMLElement(parentNode) && isOverflowElement(parentNode)) {\n    return parentNode;\n  }\n  return getNearestOverflowAncestor(parentNode);\n}\nfunction getOverflowAncestors(node, list, traverseIframes) {\n  var _node$ownerDocument2;\n  if (list === void 0) {\n    list = [];\n  }\n  if (traverseIframes === void 0) {\n    traverseIframes = true;\n  }\n  const scrollableAncestor = getNearestOverflowAncestor(node);\n  const isBody = scrollableAncestor === ((_node$ownerDocument2 = node.ownerDocument) == null ? void 0 : _node$ownerDocument2.body);\n  const win = getWindow(scrollableAncestor);\n  if (isBody) {\n    return list.concat(win, win.visualViewport || [], isOverflowElement(scrollableAncestor) ? scrollableAncestor : [], win.frameElement && traverseIframes ? getOverflowAncestors(win.frameElement) : []);\n  }\n  return list.concat(scrollableAncestor, getOverflowAncestors(scrollableAncestor, [], traverseIframes));\n}\n\n// node_modules/@floating-ui/dom/dist/floating-ui.dom.mjs\nfunction getCssDimensions(element) {\n  const css = getComputedStyle(element);\n  let width = parseFloat(css.width) || 0;\n  let height = parseFloat(css.height) || 0;\n  const hasOffset = isHTMLElement(element);\n  const offsetWidth = hasOffset ? element.offsetWidth : width;\n  const offsetHeight = hasOffset ? element.offsetHeight : height;\n  const shouldFallback = round(width) !== offsetWidth || round(height) !== offsetHeight;\n  if (shouldFallback) {\n    width = offsetWidth;\n    height = offsetHeight;\n  }\n  return {\n    width,\n    height,\n    $: shouldFallback\n  };\n}\nfunction unwrapElement(element) {\n  return !isElement(element) ? element.contextElement : element;\n}\nfunction getScale(element) {\n  const domElement = unwrapElement(element);\n  if (!isHTMLElement(domElement)) {\n    return createCoords(1);\n  }\n  const rect = domElement.getBoundingClientRect();\n  const {\n    width,\n    height,\n    $\n  } = getCssDimensions(domElement);\n  let x = ($ ? round(rect.width) : rect.width) / width;\n  let y = ($ ? round(rect.height) : rect.height) / height;\n  if (!x || !Number.isFinite(x)) {\n    x = 1;\n  }\n  if (!y || !Number.isFinite(y)) {\n    y = 1;\n  }\n  return {\n    x,\n    y\n  };\n}\nvar noOffsets = /* @__PURE__ */ createCoords(0);\nfunction getVisualOffsets(element) {\n  const win = getWindow(element);\n  if (!isWebKit() || !win.visualViewport) {\n    return noOffsets;\n  }\n  return {\n    x: win.visualViewport.offsetLeft,\n    y: win.visualViewport.offsetTop\n  };\n}\nfunction shouldAddVisualOffsets(element, isFixed, floatingOffsetParent) {\n  if (isFixed === void 0) {\n    isFixed = false;\n  }\n  if (!floatingOffsetParent || isFixed && floatingOffsetParent !== getWindow(element)) {\n    return false;\n  }\n  return isFixed;\n}\nfunction getBoundingClientRect(element, includeScale, isFixedStrategy, offsetParent) {\n  if (includeScale === void 0) {\n    includeScale = false;\n  }\n  if (isFixedStrategy === void 0) {\n    isFixedStrategy = false;\n  }\n  const clientRect = element.getBoundingClientRect();\n  const domElement = unwrapElement(element);\n  let scale = createCoords(1);\n  if (includeScale) {\n    if (offsetParent) {\n      if (isElement(offsetParent)) {\n        scale = getScale(offsetParent);\n      }\n    } else {\n      scale = getScale(element);\n    }\n  }\n  const visualOffsets = shouldAddVisualOffsets(domElement, isFixedStrategy, offsetParent) ? getVisualOffsets(domElement) : createCoords(0);\n  let x = (clientRect.left + visualOffsets.x) / scale.x;\n  let y = (clientRect.top + visualOffsets.y) / scale.y;\n  let width = clientRect.width / scale.x;\n  let height = clientRect.height / scale.y;\n  if (domElement) {\n    const win = getWindow(domElement);\n    const offsetWin = offsetParent && isElement(offsetParent) ? getWindow(offsetParent) : offsetParent;\n    let currentIFrame = win.frameElement;\n    while (currentIFrame && offsetParent && offsetWin !== win) {\n      const iframeScale = getScale(currentIFrame);\n      const iframeRect = currentIFrame.getBoundingClientRect();\n      const css = getComputedStyle(currentIFrame);\n      const left = iframeRect.left + (currentIFrame.clientLeft + parseFloat(css.paddingLeft)) * iframeScale.x;\n      const top = iframeRect.top + (currentIFrame.clientTop + parseFloat(css.paddingTop)) * iframeScale.y;\n      x *= iframeScale.x;\n      y *= iframeScale.y;\n      width *= iframeScale.x;\n      height *= iframeScale.y;\n      x += left;\n      y += top;\n      currentIFrame = getWindow(currentIFrame).frameElement;\n    }\n  }\n  return rectToClientRect({\n    width,\n    height,\n    x,\n    y\n  });\n}\nfunction convertOffsetParentRelativeRectToViewportRelativeRect(_ref) {\n  let {\n    rect,\n    offsetParent,\n    strategy\n  } = _ref;\n  const isOffsetParentAnElement = isHTMLElement(offsetParent);\n  const documentElement = getDocumentElement(offsetParent);\n  if (offsetParent === documentElement) {\n    return rect;\n  }\n  let scroll = {\n    scrollLeft: 0,\n    scrollTop: 0\n  };\n  let scale = createCoords(1);\n  const offsets = createCoords(0);\n  if (isOffsetParentAnElement || !isOffsetParentAnElement && strategy !== \"fixed\") {\n    if (getNodeName(offsetParent) !== \"body\" || isOverflowElement(documentElement)) {\n      scroll = getNodeScroll(offsetParent);\n    }\n    if (isHTMLElement(offsetParent)) {\n      const offsetRect = getBoundingClientRect(offsetParent);\n      scale = getScale(offsetParent);\n      offsets.x = offsetRect.x + offsetParent.clientLeft;\n      offsets.y = offsetRect.y + offsetParent.clientTop;\n    }\n  }\n  return {\n    width: rect.width * scale.x,\n    height: rect.height * scale.y,\n    x: rect.x * scale.x - scroll.scrollLeft * scale.x + offsets.x,\n    y: rect.y * scale.y - scroll.scrollTop * scale.y + offsets.y\n  };\n}\nfunction getClientRects(element) {\n  return Array.from(element.getClientRects());\n}\nfunction getWindowScrollBarX(element) {\n  return getBoundingClientRect(getDocumentElement(element)).left + getNodeScroll(element).scrollLeft;\n}\nfunction getDocumentRect(element) {\n  const html = getDocumentElement(element);\n  const scroll = getNodeScroll(element);\n  const body = element.ownerDocument.body;\n  const width = max(html.scrollWidth, html.clientWidth, body.scrollWidth, body.clientWidth);\n  const height = max(html.scrollHeight, html.clientHeight, body.scrollHeight, body.clientHeight);\n  let x = -scroll.scrollLeft + getWindowScrollBarX(element);\n  const y = -scroll.scrollTop;\n  if (getComputedStyle(body).direction === \"rtl\") {\n    x += max(html.clientWidth, body.clientWidth) - width;\n  }\n  return {\n    width,\n    height,\n    x,\n    y\n  };\n}\nfunction getViewportRect(element, strategy) {\n  const win = getWindow(element);\n  const html = getDocumentElement(element);\n  const visualViewport = win.visualViewport;\n  let width = html.clientWidth;\n  let height = html.clientHeight;\n  let x = 0;\n  let y = 0;\n  if (visualViewport) {\n    width = visualViewport.width;\n    height = visualViewport.height;\n    const visualViewportBased = isWebKit();\n    if (!visualViewportBased || visualViewportBased && strategy === \"fixed\") {\n      x = visualViewport.offsetLeft;\n      y = visualViewport.offsetTop;\n    }\n  }\n  return {\n    width,\n    height,\n    x,\n    y\n  };\n}\nfunction getInnerBoundingClientRect(element, strategy) {\n  const clientRect = getBoundingClientRect(element, true, strategy === \"fixed\");\n  const top = clientRect.top + element.clientTop;\n  const left = clientRect.left + element.clientLeft;\n  const scale = isHTMLElement(element) ? getScale(element) : createCoords(1);\n  const width = element.clientWidth * scale.x;\n  const height = element.clientHeight * scale.y;\n  const x = left * scale.x;\n  const y = top * scale.y;\n  return {\n    width,\n    height,\n    x,\n    y\n  };\n}\nfunction getClientRectFromClippingAncestor(element, clippingAncestor, strategy) {\n  let rect;\n  if (clippingAncestor === \"viewport\") {\n    rect = getViewportRect(element, strategy);\n  } else if (clippingAncestor === \"document\") {\n    rect = getDocumentRect(getDocumentElement(element));\n  } else if (isElement(clippingAncestor)) {\n    rect = getInnerBoundingClientRect(clippingAncestor, strategy);\n  } else {\n    const visualOffsets = getVisualOffsets(element);\n    rect = {\n      ...clippingAncestor,\n      x: clippingAncestor.x - visualOffsets.x,\n      y: clippingAncestor.y - visualOffsets.y\n    };\n  }\n  return rectToClientRect(rect);\n}\nfunction hasFixedPositionAncestor(element, stopNode) {\n  const parentNode = getParentNode(element);\n  if (parentNode === stopNode || !isElement(parentNode) || isLastTraversableNode(parentNode)) {\n    return false;\n  }\n  return getComputedStyle(parentNode).position === \"fixed\" || hasFixedPositionAncestor(parentNode, stopNode);\n}\nfunction getClippingElementAncestors(element, cache) {\n  const cachedResult = cache.get(element);\n  if (cachedResult) {\n    return cachedResult;\n  }\n  let result = getOverflowAncestors(element, [], false).filter((el) => isElement(el) && getNodeName(el) !== \"body\");\n  let currentContainingBlockComputedStyle = null;\n  const elementIsFixed = getComputedStyle(element).position === \"fixed\";\n  let currentNode = elementIsFixed ? getParentNode(element) : element;\n  while (isElement(currentNode) && !isLastTraversableNode(currentNode)) {\n    const computedStyle = getComputedStyle(currentNode);\n    const currentNodeIsContaining = isContainingBlock(currentNode);\n    if (!currentNodeIsContaining && computedStyle.position === \"fixed\") {\n      currentContainingBlockComputedStyle = null;\n    }\n    const shouldDropCurrentNode = elementIsFixed ? !currentNodeIsContaining && !currentContainingBlockComputedStyle : !currentNodeIsContaining && computedStyle.position === \"static\" && !!currentContainingBlockComputedStyle && [\"absolute\", \"fixed\"].includes(currentContainingBlockComputedStyle.position) || isOverflowElement(currentNode) && !currentNodeIsContaining && hasFixedPositionAncestor(element, currentNode);\n    if (shouldDropCurrentNode) {\n      result = result.filter((ancestor) => ancestor !== currentNode);\n    } else {\n      currentContainingBlockComputedStyle = computedStyle;\n    }\n    currentNode = getParentNode(currentNode);\n  }\n  cache.set(element, result);\n  return result;\n}\nfunction getClippingRect(_ref) {\n  let {\n    element,\n    boundary,\n    rootBoundary,\n    strategy\n  } = _ref;\n  const elementClippingAncestors = boundary === \"clippingAncestors\" ? getClippingElementAncestors(element, this._c) : [].concat(boundary);\n  const clippingAncestors = [...elementClippingAncestors, rootBoundary];\n  const firstClippingAncestor = clippingAncestors[0];\n  const clippingRect = clippingAncestors.reduce((accRect, clippingAncestor) => {\n    const rect = getClientRectFromClippingAncestor(element, clippingAncestor, strategy);\n    accRect.top = max(rect.top, accRect.top);\n    accRect.right = min(rect.right, accRect.right);\n    accRect.bottom = min(rect.bottom, accRect.bottom);\n    accRect.left = max(rect.left, accRect.left);\n    return accRect;\n  }, getClientRectFromClippingAncestor(element, firstClippingAncestor, strategy));\n  return {\n    width: clippingRect.right - clippingRect.left,\n    height: clippingRect.bottom - clippingRect.top,\n    x: clippingRect.left,\n    y: clippingRect.top\n  };\n}\nfunction getDimensions(element) {\n  return getCssDimensions(element);\n}\nfunction getRectRelativeToOffsetParent(element, offsetParent, strategy) {\n  const isOffsetParentAnElement = isHTMLElement(offsetParent);\n  const documentElement = getDocumentElement(offsetParent);\n  const isFixed = strategy === \"fixed\";\n  const rect = getBoundingClientRect(element, true, isFixed, offsetParent);\n  let scroll = {\n    scrollLeft: 0,\n    scrollTop: 0\n  };\n  const offsets = createCoords(0);\n  if (isOffsetParentAnElement || !isOffsetParentAnElement && !isFixed) {\n    if (getNodeName(offsetParent) !== \"body\" || isOverflowElement(documentElement)) {\n      scroll = getNodeScroll(offsetParent);\n    }\n    if (isOffsetParentAnElement) {\n      const offsetRect = getBoundingClientRect(offsetParent, true, isFixed, offsetParent);\n      offsets.x = offsetRect.x + offsetParent.clientLeft;\n      offsets.y = offsetRect.y + offsetParent.clientTop;\n    } else if (documentElement) {\n      offsets.x = getWindowScrollBarX(documentElement);\n    }\n  }\n  return {\n    x: rect.left + scroll.scrollLeft - offsets.x,\n    y: rect.top + scroll.scrollTop - offsets.y,\n    width: rect.width,\n    height: rect.height\n  };\n}\nfunction getTrueOffsetParent(element, polyfill) {\n  if (!isHTMLElement(element) || getComputedStyle(element).position === \"fixed\") {\n    return null;\n  }\n  if (polyfill) {\n    return polyfill(element);\n  }\n  return element.offsetParent;\n}\nfunction getOffsetParent(element, polyfill) {\n  const window2 = getWindow(element);\n  if (!isHTMLElement(element)) {\n    return window2;\n  }\n  let offsetParent = getTrueOffsetParent(element, polyfill);\n  while (offsetParent && isTableElement(offsetParent) && getComputedStyle(offsetParent).position === \"static\") {\n    offsetParent = getTrueOffsetParent(offsetParent, polyfill);\n  }\n  if (offsetParent && (getNodeName(offsetParent) === \"html\" || getNodeName(offsetParent) === \"body\" && getComputedStyle(offsetParent).position === \"static\" && !isContainingBlock(offsetParent))) {\n    return window2;\n  }\n  return offsetParent || getContainingBlock(element) || window2;\n}\nvar getElementRects = async function(_ref) {\n  let {\n    reference,\n    floating,\n    strategy\n  } = _ref;\n  const getOffsetParentFn = this.getOffsetParent || getOffsetParent;\n  const getDimensionsFn = this.getDimensions;\n  return {\n    reference: getRectRelativeToOffsetParent(reference, await getOffsetParentFn(floating), strategy),\n    floating: {\n      x: 0,\n      y: 0,\n      ...await getDimensionsFn(floating)\n    }\n  };\n};\nfunction isRTL(element) {\n  return getComputedStyle(element).direction === \"rtl\";\n}\nvar platform = {\n  convertOffsetParentRelativeRectToViewportRelativeRect,\n  getDocumentElement,\n  getClippingRect,\n  getOffsetParent,\n  getElementRects,\n  getClientRects,\n  getDimensions,\n  getScale,\n  isElement,\n  isRTL\n};\nfunction observeMove(element, onMove) {\n  let io = null;\n  let timeoutId;\n  const root = getDocumentElement(element);\n  function cleanup() {\n    clearTimeout(timeoutId);\n    io && io.disconnect();\n    io = null;\n  }\n  function refresh(skip, threshold) {\n    if (skip === void 0) {\n      skip = false;\n    }\n    if (threshold === void 0) {\n      threshold = 1;\n    }\n    cleanup();\n    const {\n      left,\n      top,\n      width,\n      height\n    } = element.getBoundingClientRect();\n    if (!skip) {\n      onMove();\n    }\n    if (!width || !height) {\n      return;\n    }\n    const insetTop = floor(top);\n    const insetRight = floor(root.clientWidth - (left + width));\n    const insetBottom = floor(root.clientHeight - (top + height));\n    const insetLeft = floor(left);\n    const rootMargin = -insetTop + \"px \" + -insetRight + \"px \" + -insetBottom + \"px \" + -insetLeft + \"px\";\n    const options = {\n      rootMargin,\n      threshold: max(0, min(1, threshold)) || 1\n    };\n    let isFirstUpdate = true;\n    function handleObserve(entries) {\n      const ratio = entries[0].intersectionRatio;\n      if (ratio !== threshold) {\n        if (!isFirstUpdate) {\n          return refresh();\n        }\n        if (!ratio) {\n          timeoutId = setTimeout(() => {\n            refresh(false, 1e-7);\n          }, 100);\n        } else {\n          refresh(false, ratio);\n        }\n      }\n      isFirstUpdate = false;\n    }\n    try {\n      io = new IntersectionObserver(handleObserve, {\n        ...options,\n        // Handle <iframe>s\n        root: root.ownerDocument\n      });\n    } catch (e) {\n      io = new IntersectionObserver(handleObserve, options);\n    }\n    io.observe(element);\n  }\n  refresh(true);\n  return cleanup;\n}\nfunction autoUpdate(reference, floating, update, options) {\n  if (options === void 0) {\n    options = {};\n  }\n  const {\n    ancestorScroll = true,\n    ancestorResize = true,\n    elementResize = typeof ResizeObserver === \"function\",\n    layoutShift = typeof IntersectionObserver === \"function\",\n    animationFrame = false\n  } = options;\n  const referenceEl = unwrapElement(reference);\n  const ancestors = ancestorScroll || ancestorResize ? [...referenceEl ? getOverflowAncestors(referenceEl) : [], ...getOverflowAncestors(floating)] : [];\n  ancestors.forEach((ancestor) => {\n    ancestorScroll && ancestor.addEventListener(\"scroll\", update, {\n      passive: true\n    });\n    ancestorResize && ancestor.addEventListener(\"resize\", update);\n  });\n  const cleanupIo = referenceEl && layoutShift ? observeMove(referenceEl, update) : null;\n  let reobserveFrame = -1;\n  let resizeObserver = null;\n  if (elementResize) {\n    resizeObserver = new ResizeObserver((_ref) => {\n      let [firstEntry] = _ref;\n      if (firstEntry && firstEntry.target === referenceEl && resizeObserver) {\n        resizeObserver.unobserve(floating);\n        cancelAnimationFrame(reobserveFrame);\n        reobserveFrame = requestAnimationFrame(() => {\n          resizeObserver && resizeObserver.observe(floating);\n        });\n      }\n      update();\n    });\n    if (referenceEl && !animationFrame) {\n      resizeObserver.observe(referenceEl);\n    }\n    resizeObserver.observe(floating);\n  }\n  let frameId;\n  let prevRefRect = animationFrame ? getBoundingClientRect(reference) : null;\n  if (animationFrame) {\n    frameLoop();\n  }\n  function frameLoop() {\n    const nextRefRect = getBoundingClientRect(reference);\n    if (prevRefRect && (nextRefRect.x !== prevRefRect.x || nextRefRect.y !== prevRefRect.y || nextRefRect.width !== prevRefRect.width || nextRefRect.height !== prevRefRect.height)) {\n      update();\n    }\n    prevRefRect = nextRefRect;\n    frameId = requestAnimationFrame(frameLoop);\n  }\n  update();\n  return () => {\n    ancestors.forEach((ancestor) => {\n      ancestorScroll && ancestor.removeEventListener(\"scroll\", update);\n      ancestorResize && ancestor.removeEventListener(\"resize\", update);\n    });\n    cleanupIo && cleanupIo();\n    resizeObserver && resizeObserver.disconnect();\n    resizeObserver = null;\n    if (animationFrame) {\n      cancelAnimationFrame(frameId);\n    }\n  };\n}\nvar computePosition2 = (reference, floating, options) => {\n  const cache = /* @__PURE__ */ new Map();\n  const mergedOptions = {\n    platform,\n    ...options\n  };\n  const platformWithCache = {\n    ...mergedOptions.platform,\n    _c: cache\n  };\n  return computePosition(reference, floating, {\n    ...mergedOptions,\n    platform: platformWithCache\n  });\n};\n\n// packages/anchor/src/index.js\nfunction src_default(Alpine) {\n  Alpine.magic(\"anchor\", (el) => {\n    if (!el._x_anchor)\n      throw \"Alpine: No x-anchor directive found on element using $anchor...\";\n    return el._x_anchor;\n  });\n  Alpine.interceptClone((from, to) => {\n    if (from && from._x_anchor && !to._x_anchor) {\n      to._x_anchor = from._x_anchor;\n    }\n  });\n  Alpine.directive(\"anchor\", Alpine.skipDuringClone(\n    (el, { expression, modifiers, value }, { cleanup, evaluate: evaluate2 }) => {\n      let { placement, offsetValue, unstyled } = getOptions(modifiers);\n      el._x_anchor = Alpine.reactive({ x: 0, y: 0 });\n      let reference = evaluate2(expression);\n      if (!reference)\n        throw \"Alpine: no element provided to x-anchor...\";\n      let compute = () => {\n        let previousValue;\n        computePosition2(reference, el, {\n          placement,\n          middleware: [flip(), shift({ padding: 5 }), offset(offsetValue)]\n        }).then(({ x, y }) => {\n          unstyled || setStyles(el, x, y);\n          if (JSON.stringify({ x, y }) !== previousValue) {\n            el._x_anchor.x = x;\n            el._x_anchor.y = y;\n          }\n          previousValue = JSON.stringify({ x, y });\n        });\n      };\n      let release = autoUpdate(reference, el, () => compute());\n      cleanup(() => release());\n    },\n    // When cloning (or \"morphing\"), we will graft the style and position data from the live tree...\n    (el, { expression, modifiers, value }, { cleanup, evaluate: evaluate2 }) => {\n      let { placement, offsetValue, unstyled } = getOptions(modifiers);\n      if (el._x_anchor) {\n        unstyled || setStyles(el, el._x_anchor.x, el._x_anchor.y);\n      }\n    }\n  ));\n}\nfunction setStyles(el, x, y) {\n  Object.assign(el.style, {\n    left: x + \"px\",\n    top: y + \"px\",\n    position: \"absolute\"\n  });\n}\nfunction getOptions(modifiers) {\n  let positions = [\"top\", \"top-start\", \"top-end\", \"right\", \"right-start\", \"right-end\", \"bottom\", \"bottom-start\", \"bottom-end\", \"left\", \"left-start\", \"left-end\"];\n  let placement = positions.find((i) => modifiers.includes(i));\n  let offsetValue = 0;\n  if (modifiers.includes(\"offset\")) {\n    let idx = modifiers.findIndex((i) => i === \"offset\");\n    offsetValue = modifiers[idx + 1] !== void 0 ? Number(modifiers[idx + 1]) : offsetValue;\n  }\n  let unstyled = modifiers.includes(\"no-style\");\n  return { placement, offsetValue, unstyled };\n}\n\n// packages/anchor/builds/module.js\nvar module_default = src_default;\nexport {\n  src_default as anchor,\n  module_default as default\n};\n", "\nclass Snapshot {\n    constructor(url, html) {\n        this.url = url\n        this.html = html\n    }\n}\n\nlet snapshotCache = {\n    currentKey: null,\n    currentUrl: null,\n    keys: [],\n    lookup: {},\n\n    limit: 10,\n\n    has(location) {\n        return this.lookup[location] !== undefined\n    },\n\n    retrieve(location) {\n        let snapshot = this.lookup[location]\n\n        if (snapshot === undefined)\n            throw (\n                'No back button cache found for current location: ' +\n                location\n            )\n\n        return snapshot\n    },\n\n    replace(key, snapshot) {\n        if (this.has(key)) {\n            this.lookup[key] = snapshot\n        } else {\n            this.push(key, snapshot)\n        }\n    },\n\n    push(key, snapshot) {\n        this.lookup[key] = snapshot\n\n        let index = this.keys.indexOf(key)\n\n        if (index > -1) this.keys.splice(index, 1)\n\n        this.keys.unshift(key)\n\n        this.trim()\n    },\n\n    trim() {\n        for (let key of this.keys.splice(this.limit)) {\n          delete this.lookup[key]\n        }\n    }\n}\n\nexport function updateCurrentPageHtmlInHistoryStateForLaterBackButtonClicks() {\n    // Create a history state entry for the initial page load.\n    // (This is so later hitting back can restore this page).\n    let url = new URL(window.location.href, document.baseURI)\n\n    replaceUrl(url, document.documentElement.outerHTML)\n}\n\nexport function updateCurrentPageHtmlInSnapshotCacheForLaterBackButtonClicks(key, url) {\n    let html = document.documentElement.outerHTML\n\n    snapshotCache.replace(key, new Snapshot(url, html))\n}\n\nexport function whenTheBackOrForwardButtonIsClicked(\n    registerFallback,\n    handleHtml\n) {\n    let fallback\n\n    registerFallback(i => (fallback = i))\n\n    window.addEventListener('popstate', e => {\n        let state = e.state || {}\n\n        let alpine = state.alpine || {}\n\n        // If state is an empty object, then the popstate has probably been triggered\n        // by anchor tags `#my-heading`, so we don't want to handle them.\n        if (Object.keys(state).length === 0) return\n\n        if (! alpine.snapshotIdx) return\n\n        if (snapshotCache.has(alpine.snapshotIdx)) {\n            let snapshot = snapshotCache.retrieve(alpine.snapshotIdx)\n\n            handleHtml(snapshot.html, snapshot.url, snapshotCache.currentUrl, snapshotCache.currentKey)\n        } else {\n            fallback(alpine.url)\n        }\n    })\n}\n\nexport function updateUrlAndStoreLatestHtmlForFutureBackButtons(\n    html,\n    destination\n) {\n    pushUrl(destination, html)\n}\n\nexport function pushUrl(url, html) {\n    updateUrl('pushState', url, html)\n}\n\nexport function replaceUrl(url, html) {\n    updateUrl('replaceState', url, html)\n}\n\nfunction updateUrl(method, url, html) {\n    let key = url.toString() + '-' + Math.random()\n\n    method === 'pushState'\n        ? snapshotCache.push(key, new Snapshot(url, html))\n        : snapshotCache.replace(key = (snapshotCache.currentKey ?? key), new Snapshot(url, html))\n\n    let state = history.state || {}\n\n    if (!state.alpine) state.alpine = {}\n\n    state.alpine.snapshotIdx = key\n    state.alpine.url = url.toString()\n\n    try {\n        // 640k character limit:\n        history[method](state, JSON.stringify(document.title), url)\n\n        snapshotCache.currentKey = key\n        snapshotCache.currentUrl = url\n    } catch (error) {\n        if (error instanceof DOMException && error.name === 'SecurityError') {\n            console.error(\n                \"Livewire: You can't use wire:navigate with a link to a different root domain: \" +\n                    url\n            )\n        }\n\n        console.error(error)\n    }\n}\n", "\nexport function whenThisLinkIsPressed(el, callback) {\n    let isProgrammaticClick = e => ! e.isTrusted\n    let isNotPlainLeftClick = e => (e.which > 1) || (e.altKey) || (e.ctrlKey) || (e.metaKey) || (e.shiftKey)\n    let isNotPlainEnterKey = (e) => (e.which !== 13) || (e.altKey) || (e.ctrlKey) || (e.metaKey) || (e.shiftKey)\n\n    el.addEventListener('click', e => {\n        // This allows programmatic clicking of links via: `$0.click()`...\n        if (isProgrammaticClick(e)) {\n            e.preventDefault()\n\n            callback(whenReleased => whenReleased())\n\n            return\n        }\n\n        // This allows cmd+click and such to still work as expected...\n        if (isNotPlainLeftClick(e)) return;\n\n        // If it's a plain left click, we want to prevent \"click\" and let \"mouseup\" do its thing...\n        e.preventDefault()\n    })\n\n    el.addEventListener('mousedown', e => {\n        // We only care about left clicks for wire:navigate...\n        if (isNotPlainLeftClick(e)) return;\n\n        e.preventDefault()\n\n        callback((whenReleased) => {\n            let handler = e => {\n                e.preventDefault()\n\n                whenReleased()\n\n                el.removeEventListener('mouseup', handler)\n            }\n\n            el.addEventListener('mouseup', handler)\n        })\n    })\n\n    el.addEventListener(\"keydown\", e => {\n        // We only care about the enter key...\n        if (isNotPlainEnterKey(e)) return;\n\n        e.preventDefault()\n\n        callback(whenReleased => whenReleased())\n    })\n}\n\nexport function whenThisLinkIsHoveredFor(el, ms = 60, callback) {\n    el.addEventListener('mouseenter', e => {\n        let timeout = setTimeout(() => {\n            callback(e)\n        }, ms)\n\n        let handler = () => {\n            clearTimeout(timeout)\n            el.removeEventListener('mouseleave', handler)\n        }\n\n        el.addEventListener('mouseleave', handler)\n    })\n}\n\nexport function extractDestinationFromLink(linkEl) {\n    return createUrlObjectFromString(linkEl.getAttribute('href'))\n}\n\nexport function createUrlObjectFromString(urlString) {\n    return new URL(urlString, document.baseURI)\n}\n\nexport function getUriStringFromUrlObject(urlObject) {\n    return urlObject.pathname + urlObject.search + urlObject.hash\n}\n", "import { trigger } from \"@/hooks\"\nimport { createUrlObjectFromString, getUriStringFromUrlObject } from \"./links\"\n\nexport function fetchHtml(destination, callback) {\n    let uri = getUriStringFromUrlObject(destination)\n\n    performFetch(uri, (html, finalDestination) => {\n        callback(html, finalDestination)\n    })\n}\n\nexport function performFetch(uri, callback) {\n    let options = {\n        headers: {\n            'X-Livewire-Navigate': ''\n        }\n    }\n\n    trigger('navigate.request', {\n        url: uri,\n        options,\n    })\n\n    let finalDestination\n\n    fetch(uri, options).then(response => {\n        let destination = createUrlObjectFromString(uri)\n        finalDestination = createUrlObjectFromString(response.url)\n\n        // If there was no redirect triggered by the URL that was fetched...\n        if ((destination.pathname + destination.search) === (finalDestination.pathname + finalDestination.search)) {\n            // Then let's cary over any \"hash\" entries on the URL.\n            // We have to do this because hashes aren't sent to\n            // the server by \"fetch\", so it needs to get added\n            finalDestination.hash = destination.hash\n        }\n\n        return response.text()\n    }).then(html => {\n        callback(html, finalDestination)\n    });\n}\n", "import { performFetch } from \"@/plugins/navigate/fetch\";\nimport { getUriStringFromUrlObject } from \"./links\";\n\n// Warning: this could cause some memory leaks\nlet prefetches = {}\n\nexport function prefetchHtml(destination, callback) {\n    let uri = getUriStringFromUrlObject(destination)\n\n    if (prefetches[uri]) return\n\n    prefetches[uri] = { finished: false, html: null, whenFinished: () => {} }\n\n    performFetch(uri, (html, routedUri) => {\n        callback(html, routedUri)\n    })\n}\n\nexport function storeThePrefetchedHtmlForWhenALinkIsClicked(html, destination, finalDestination) {\n    let state = prefetches[getUriStringFromUrlObject(destination)]\n    state.html = html\n    state.finished = true\n    state.finalDestination = finalDestination\n    state.whenFinished()\n}\n\nexport function getPretchedHtmlOr(destination, receive, ifNoPrefetchExists) {\n    let uri = getUriStringFromUrlObject(destination)\n\n    if (! prefetches[uri]) return ifNoPrefetchExists()\n\n    if (prefetches[uri].finished) {\n        let html = prefetches[uri].html\n        let finalDestination = prefetches[uri].finalDestination\n\n        delete prefetches[uri]\n\n        return receive(html, finalDestination)\n    } else {\n        prefetches[uri].whenFinished = () => {\n            let html = prefetches[uri].html\n            let finalDestination = prefetches[uri].finalDestination\n\n            delete prefetches[uri]\n\n            receive(html, finalDestination)\n        }\n    }\n}\n\n", "import Alpine from \"alpinejs\"\n\nexport function packUpPersistedTeleports(persistedEl) {\n    // Persisted elements get removed from the DOM and then re-added later. We need to do the same\n    // with any `x-teleport`ed elements...\n    Alpine.mutateDom(() => {\n        persistedEl.querySelectorAll('[data-teleport-template]').forEach(i => i._x_teleport.remove())\n    })\n}\n\nexport function removeAnyLeftOverStaleTeleportTargets(body) {\n    // We need to remove any left-over teleported elements form the page\n    // as they are stale and will be re-initialized when Alpine boots up on this page...\n    Alpine.mutateDom(() => {\n        body.querySelectorAll('[data-teleport-target]').forEach(i => i.remove())\n    })\n}\n\nexport function unPackPersistedTeleports(persistedEl) {\n    // Before we put back any persisted elements, we're going to\n    // find any \"x-teleports\" and put their targets back on the page...\n    Alpine.walk(persistedEl, (el, skip) => {\n        if (! el._x_teleport) return;\n\n        el._x_teleportPutBack()\n\n        skip()\n    })\n}\n\nexport function isTeleportTarget(el) {\n    return el.hasAttribute('data-teleport-target')\n}\n", "\nexport function storeScrollInformationInHtmlBeforeNavigatingAway() {\n    document.body.setAttribute('data-scroll-x', document.body.scrollLeft)\n    document.body.setAttribute('data-scroll-y', document.body.scrollTop)\n\n    document.querySelectorAll(['[x-navigate\\\\:scroll]', '[wire\\\\:scroll]']).forEach(el => {\n        el.setAttribute('data-scroll-x', el.scrollLeft)\n        el.setAttribute('data-scroll-y', el.scrollTop)\n    })\n}\n\nexport function restoreScrollPositionOrScrollToTop() {\n    let scroll = el => {\n        if (! el.hasAttribute('data-scroll-x')) {\n            window.scrollTo({ top: 0, left: 0, behavior: 'instant' })\n        } else {\n            el.scrollTo({\n                top: Number(el.getAttribute('data-scroll-y')),\n                left: Number(el.getAttribute('data-scroll-x')),\n                behavior: 'instant',\n            })\n            el.removeAttribute('data-scroll-x')\n            el.removeAttribute('data-scroll-y')\n        }\n    }\n\n    queueMicrotask(() => {\n        scroll(document.body)\n\n        document.querySelectorAll(['[x-navigate\\\\:scroll]', '[wire\\\\:scroll]']).forEach(scroll)\n    })\n}\n", "import Alpine from 'alpinejs'\n\nlet els = {}\n\nexport function storePersistantElementsForLater(callback) {\n    els = {}\n\n    document.querySelectorAll('[x-persist]').forEach(i => {\n        els[i.getAttribute('x-persist')] = i\n\n        callback(i)\n\n        Alpine.mutateDom(() => {\n            i.remove()\n        })\n    })\n}\n\nexport function putPersistantElementsBack(callback) {\n    let usedPersists = []\n\n    document.querySelectorAll('[x-persist]').forEach(i => {\n        let old = els[i.getAttribute('x-persist')]\n\n        // There might be a brand new x-persist element...\n        if (! old) return\n\n        usedPersists.push(i.getAttribute('x-persist'))\n\n        old._x_wasPersisted = true\n\n        callback(old, i)\n\n        Alpine.mutateDom(() => {\n            i.replaceWith(old)\n        })\n    })\n\n    Object.entries(els).forEach(([key, el]) => {\n        if (usedPersists.includes(key)) return\n\n        // Destory the un-used persist DOM trees before releasing them...\n        Alpine.destroyTree(el)\n    })\n\n    // Release unused persists for garbage collection...\n    els = {}\n}\n\nexport function isPersistedElement(el) {\n    return el.hasAttribute('x-persist')\n}\n", "import NProgress from 'nprogress'\nimport { getNonce } from '@/utils'\n\nNProgress.configure({\n    minimum: 0.1,\n    trickleSpeed: 200,\n    showSpinner: false,\n    parent: 'body',\n})\n\ninjectStyles()\n\nlet inProgress = false\n\nexport function showAndStartProgressBar() {\n    inProgress = true\n\n    // Only show progress bar if it's been a little bit...\n    setTimeout(() => {\n        if (! inProgress) return\n\n        NProgress.start()\n    }, 150)\n}\n\nexport function finishAndHideProgressBar() {\n    inProgress = false\n\n    NProgress.done()\n}\n\nexport function removeAnyLeftOverStaleProgressBars() {\n    NProgress.remove()\n}\n\nfunction injectStyles() {\n    let style = document.createElement('style')\n\n    style.innerHTML = `/* Make clicks pass-through */\n\n    #nprogress {\n      pointer-events: none;\n    }\n\n    #nprogress .bar {\n      background: var(--livewire-progress-bar-color, #29d);\n\n      position: fixed;\n      z-index: 1031;\n      top: 0;\n      left: 0;\n\n      width: 100%;\n      height: 2px;\n    }\n\n    /* Fancy blur effect */\n    #nprogress .peg {\n      display: block;\n      position: absolute;\n      right: 0px;\n      width: 100px;\n      height: 100%;\n      box-shadow: 0 0 10px var(--livewire-progress-bar-color, #29d), 0 0 5px var(--livewire-progress-bar-color, #29d);\n      opacity: 1.0;\n\n      -webkit-transform: rotate(3deg) translate(0px, -4px);\n          -ms-transform: rotate(3deg) translate(0px, -4px);\n              transform: rotate(3deg) translate(0px, -4px);\n    }\n\n    /* Remove these to get rid of the spinner */\n    #nprogress .spinner {\n      display: block;\n      position: fixed;\n      z-index: 1031;\n      top: 15px;\n      right: 15px;\n    }\n\n    #nprogress .spinner-icon {\n      width: 18px;\n      height: 18px;\n      box-sizing: border-box;\n\n      border: solid 2px transparent;\n      border-top-color: var(--livewire-progress-bar-color, #29d);\n      border-left-color: var(--livewire-progress-bar-color, #29d);\n      border-radius: 50%;\n\n      -webkit-animation: nprogress-spinner 400ms linear infinite;\n              animation: nprogress-spinner 400ms linear infinite;\n    }\n\n    .nprogress-custom-parent {\n      overflow: hidden;\n      position: relative;\n    }\n\n    .nprogress-custom-parent #nprogress .spinner,\n    .nprogress-custom-parent #nprogress .bar {\n      position: absolute;\n    }\n\n    @-webkit-keyframes nprogress-spinner {\n      0%   { -webkit-transform: rotate(0deg); }\n      100% { -webkit-transform: rotate(360deg); }\n    }\n    @keyframes nprogress-spinner {\n      0%   { transform: rotate(0deg); }\n      100% { transform: rotate(360deg); }\n    }\n    `\n\n    let nonce = getNonce()\n\n    if (nonce) style.nonce = nonce\n\n    document.head.appendChild(style)\n}\n", "let oldBodyScriptTagHashes = []\n\nlet attributesExemptFromScriptTagHashing = [\n    'data-csrf',\n    'aria-hidden',\n]\n\nexport function swapCurrentPageWithNewHtml(html, andThen) {\n    let newDocument = (new DOMParser()).parseFromString(html, \"text/html\")\n    let newBody = document.adoptNode(newDocument.body)\n    let newHead = document.adoptNode(newDocument.head)\n\n    oldBodyScriptTagHashes = oldBodyScriptTagHashes.concat(Array.from(document.body.querySelectorAll('script')).map(i => {\n        return simpleHash(ignoreAttributes(i.outerHTML, attributesExemptFromScriptTagHashing))\n    }))\n\n    let afterRemoteScriptsHaveLoaded = () => {}\n\n    mergeNewHead(newHead).finally(() => {\n        afterRemoteScriptsHaveLoaded()\n    })\n\n    prepNewBodyScriptTagsToRun(newBody, oldBodyScriptTagHashes)\n\n    let oldBody = document.body\n\n    document.body.replaceWith(newBody)\n\n    Alpine.destroyTree(oldBody)\n\n    andThen(i => afterRemoteScriptsHaveLoaded = i)\n}\n\nfunction prepNewBodyScriptTagsToRun(newBody, oldBodyScriptTagHashes) {\n    newBody.querySelectorAll('script').forEach(i => {\n        // We don't want to re-run script tags marked as \"data-navigate-once\"...\n        if (i.hasAttribute('data-navigate-once')) {\n            // However, if they didn't exist on the previous page, we do.\n            // Therefore, we'll check the \"old body script hashes\" to\n            // see if it was already there before skipping it...\n\n            let hash = simpleHash(\n                ignoreAttributes(i.outerHTML, attributesExemptFromScriptTagHashing)\n            )\n\n            if (oldBodyScriptTagHashes.includes(hash)) return\n        }\n\n        i.replaceWith(cloneScriptTag(i))\n    })\n}\n\nfunction mergeNewHead(newHead) {\n    let children = Array.from(document.head.children)\n    let headChildrenHtmlLookup = children.map(i => i.outerHTML)\n\n    // Only add scripts and styles that aren't already loaded on the page.\n    let garbageCollector = document.createDocumentFragment()\n\n    let touchedHeadElements = []\n\n    let remoteScriptsPromises = []\n\n    for (let child of Array.from(newHead.children)) {\n        if (isAsset(child)) {\n            if (! headChildrenHtmlLookup.includes(child.outerHTML)) {\n                if (isTracked(child)) {\n                    if (ifTheQueryStringChangedSinceLastRequest(child, children)) {\n                        setTimeout(() => window.location.reload())\n                    }\n                }\n\n                if (isScript(child)) {\n                    try {\n                        remoteScriptsPromises.push(\n                            injectScriptTagAndWaitForItToFullyLoad(\n                                cloneScriptTag(child)\n                            )\n                        )\n                    } catch (error) {\n                        // Let's eat any promise rejects so that we don't\n                        // break the rest of the Alpine intializing...\n                        // Any errors triggered by adding the script tag to the page\n                        // will still be thrown...\n                    }\n                } else {\n                    document.head.appendChild(child)\n                }\n            } else {\n                garbageCollector.appendChild(child)\n            }\n\n            touchedHeadElements.push(child)\n        }\n    }\n\n    // Remove any assets that aren't on the new page...\n    // @todo: Re-enable this code and find a better way to managed injected stylesheets. See livewire/livewire#6824\n    // for (let child of Array.from(document.head.children)) {\n    //     if (isAsset(child)) {\n    //         if (! touchedHeadElements.some(i => i.outerHTML === child.outerHTML)) {\n    //             child.remove()\n    //         }\n    //     }\n    // }\n\n    // How to free up the garbage collector?\n\n    // Remove existing non-asset elements like meta, base, title, template.\n    for (let child of Array.from(document.head.children)) {\n        if (! isAsset(child)) child.remove()\n    }\n\n    // Add new non-asset elements left over in the new head element.\n    for (let child of Array.from(newHead.children)) {\n        document.head.appendChild(child)\n    }\n\n    return Promise.all(remoteScriptsPromises)\n}\n\nasync function injectScriptTagAndWaitForItToFullyLoad(script) {\n    return new Promise((resolve, reject) => {\n        // Script assets need to be loaded synchronously so that scripts have\n        // their global variables available...\n        if (script.src) {\n            script.onload = () => resolve()\n            script.onerror = () => reject()\n        } else {\n            resolve()\n        }\n\n        document.head.appendChild(script)\n    })\n}\n\nfunction cloneScriptTag(el) {\n    let script = document.createElement('script')\n\n    script.textContent = el.textContent\n    script.async = el.async\n\n    for (let attr of el.attributes) {\n        script.setAttribute(attr.name, attr.value)\n    }\n\n    return script\n}\n\nfunction isTracked(el) {\n    return el.hasAttribute('data-navigate-track')\n}\n\nfunction ifTheQueryStringChangedSinceLastRequest(el, currentHeadChildren) {\n    let [uri, queryString] = extractUriAndQueryString(el)\n\n    return currentHeadChildren.some(child => {\n        if (! isTracked(child)) return false\n\n        let [currentUri, currentQueryString] = extractUriAndQueryString(child)\n\n        // Only consider a data-navigate-track element changed if the query string has changed (not the URI)...\n        if (currentUri === uri && queryString !== currentQueryString) return true\n    })\n}\n\nfunction extractUriAndQueryString(el) {\n    let url = isScript(el) ? el.src : el.href\n\n    return url.split('?')\n}\n\nfunction isAsset(el) {\n    return (el.tagName.toLowerCase() === 'link' && el.getAttribute('rel').toLowerCase() === 'stylesheet')\n        || el.tagName.toLowerCase() === 'style'\n        || el.tagName.toLowerCase() === 'script'\n}\n\nfunction isScript(el)   {\n    return el.tagName.toLowerCase() === 'script'\n}\n\nfunction simpleHash(str) {\n    return str.split('').reduce((a, b) => {\n        a = ((a << 5) - a) + b.charCodeAt(0)\n\n        return a & a\n    }, 0);\n}\n\nfunction ignoreAttributes(subject, attributesToRemove) {\n    let result = subject\n\n    attributesToRemove.forEach(attr => {\n        // Create a regex pattern to match the attribute and its value.\n        // The regex handles attributes that have values surrounded by either single or double quotes.\n        const regex = new RegExp(`${attr}=\"[^\"]*\"|${attr}='[^']*'`, 'g')\n\n        result = result.replace(regex, '')\n    })\n\n    // Remove all whitespace to make things less flaky...\n    result = result.replaceAll(' ', '')\n\n    return result.trim()\n}\n", "import { replaceUrl, updateCurrentPageHtmlInHistoryStateForLaterBackButtonClicks, updateCurrentPageHtmlInSnapshotCacheForLaterBackButtonClicks, updateUrlAndStoreLatestHtmlForFutureBackButtons, whenTheBackOrForwardButtonIsClicked } from \"./history\"\nimport { getPretchedHtmlOr, prefetchHtml, storeThePrefetchedHtmlForWhenALinkIsClicked } from \"./prefetch\"\nimport { createUrlObjectFromString, extractDestinationFromLink, whenThisLinkIsHoveredFor, whenThisLinkIsPressed } from \"./links\"\nimport { isTeleportTarget, packUpPersistedTeleports, removeAnyLeftOverStaleTeleportTargets, unPackPersistedTeleports } from \"./teleport\"\nimport { restoreScrollPositionOrScrollToTop, storeScrollInformationInHtmlBeforeNavigatingAway } from \"./scroll\"\nimport { isPersistedElement, putPersistantElementsBack, storePersistantElementsForLater } from \"./persist\"\nimport { finishAndHideProgressBar, removeAnyLeftOverStaleProgressBars, showAndStartProgressBar } from \"./bar\"\nimport { swapCurrentPageWithNewHtml } from \"./page\"\nimport { fetchHtml } from \"./fetch\"\n\nlet enablePersist = true\nlet showProgressBar = true\nlet restoreScroll = true\nlet autofocus = false\n\nexport default function (Alpine) {\n\n    Alpine.navigate = (url) => {\n        let destination = createUrlObjectFromString(url)\n\n        let prevented = fireEventForOtherLibariesToHookInto('alpine:navigate', {\n            url: destination, history: false, cached: false,\n         })\n\n        if (prevented) return\n\n        navigateTo(destination)\n    }\n\n    Alpine.navigate.disableProgressBar = () => {\n        showProgressBar = false\n    }\n\n    Alpine.addInitSelector(() => `[${Alpine.prefixed('navigate')}]`)\n\n    Alpine.directive('navigate', (el, { modifiers }) => {\n        let shouldPrefetchOnHover = modifiers.includes('hover')\n\n        shouldPrefetchOnHover && whenThisLinkIsHoveredFor(el, 60, () => {\n            let destination = extractDestinationFromLink(el)\n\n            prefetchHtml(destination, (html, finalDestination) => {\n                storeThePrefetchedHtmlForWhenALinkIsClicked(html, destination, finalDestination)\n            })\n        })\n\n        whenThisLinkIsPressed(el, (whenItIsReleased) => {\n            let destination = extractDestinationFromLink(el)\n\n            prefetchHtml(destination, (html, finalDestination) => {\n                storeThePrefetchedHtmlForWhenALinkIsClicked(html, destination, finalDestination)\n            })\n\n            whenItIsReleased(() => {\n                let prevented = fireEventForOtherLibariesToHookInto('alpine:navigate', {\n                    url: destination, history: false, cached: false,\n                 })\n\n                if (prevented) return\n\n                navigateTo(destination);\n            })\n        })\n    })\n\n    function navigateTo(destination, shouldPushToHistoryState = true) {\n        showProgressBar && showAndStartProgressBar()\n\n        fetchHtmlOrUsePrefetchedHtml(destination, (html, finalDestination) => {\n            fireEventForOtherLibariesToHookInto('alpine:navigating')\n\n            restoreScroll && storeScrollInformationInHtmlBeforeNavigatingAway()\n\n            showProgressBar && finishAndHideProgressBar()\n\n            cleanupAlpineElementsOnThePageThatArentInsideAPersistedElement()\n\n            updateCurrentPageHtmlInHistoryStateForLaterBackButtonClicks()\n\n            preventAlpineFromPickingUpDomChanges(Alpine, andAfterAllThis => {\n                enablePersist && storePersistantElementsForLater(persistedEl => {\n                    packUpPersistedTeleports(persistedEl)\n                })\n\n                if (shouldPushToHistoryState) {\n                    updateUrlAndStoreLatestHtmlForFutureBackButtons(html, finalDestination)\n                } else {\n                    replaceUrl(finalDestination, html)\n                }\n\n                swapCurrentPageWithNewHtml(html, (afterNewScriptsAreDoneLoading) => {\n                    removeAnyLeftOverStaleTeleportTargets(document.body)\n\n                    enablePersist && putPersistantElementsBack((persistedEl, newStub) => {\n                        unPackPersistedTeleports(persistedEl)\n                    })\n\n                    restoreScrollPositionOrScrollToTop()\n\n                    afterNewScriptsAreDoneLoading(() => {\n                        andAfterAllThis(() => {\n                            setTimeout(() => {\n                                autofocus && autofocusElementsWithTheAutofocusAttribute()\n                            })\n\n                            nowInitializeAlpineOnTheNewPage(Alpine)\n\n                            fireEventForOtherLibariesToHookInto('alpine:navigated')\n                        })\n                    })\n                })\n            })\n        })\n    }\n\n    whenTheBackOrForwardButtonIsClicked(\n        (ifThePageBeingVisitedHasntBeenCached) => {\n            ifThePageBeingVisitedHasntBeenCached((url) => {\n                let destination = createUrlObjectFromString(url)\n\n                let prevented = fireEventForOtherLibariesToHookInto('alpine:navigate', {\n                    url: destination, history: true, cached: false,\n                 })\n\n                if (prevented) return\n\n                let shouldPushToHistoryState = false\n\n                navigateTo(destination, shouldPushToHistoryState)\n            })\n        },\n        (html, url, currentPageUrl, currentPageKey) => {\n            let destination = createUrlObjectFromString(url)\n\n            let prevented = fireEventForOtherLibariesToHookInto('alpine:navigate', {\n                url: destination, history: true, cached: true,\n            })\n\n            if (prevented) return\n\n            // @todo: see if there's a way to update the current HTML BEFORE\n            // the back button is hit, and not AFTER:\n            storeScrollInformationInHtmlBeforeNavigatingAway()\n\n            // This ensures the current HTML has the latest snapshot\n            fireEventForOtherLibariesToHookInto('alpine:navigating')\n\n            // Only update the snapshot and not the history state as the history state\n            // has already changed to the new page due to the popstate event\n            updateCurrentPageHtmlInSnapshotCacheForLaterBackButtonClicks(currentPageUrl, currentPageKey)\n\n            preventAlpineFromPickingUpDomChanges(Alpine, andAfterAllThis => {\n                enablePersist && storePersistantElementsForLater(persistedEl => {\n                    packUpPersistedTeleports(persistedEl)\n                })\n\n                swapCurrentPageWithNewHtml(html, () => {\n                    removeAnyLeftOverStaleProgressBars()\n\n                    removeAnyLeftOverStaleTeleportTargets(document.body)\n\n                    enablePersist && putPersistantElementsBack((persistedEl, newStub) => {\n                        unPackPersistedTeleports(persistedEl)\n                    })\n\n                    restoreScrollPositionOrScrollToTop()\n\n                    andAfterAllThis(() => {\n                        autofocus && autofocusElementsWithTheAutofocusAttribute()\n\n                        nowInitializeAlpineOnTheNewPage(Alpine)\n\n                        fireEventForOtherLibariesToHookInto('alpine:navigated')\n                    })\n                })\n            })\n        },\n    )\n\n    // Because DOMContentLoaded is fired on first load,\n    // we should fire alpine:navigated as a replacement as well...\n    setTimeout(() => {\n        fireEventForOtherLibariesToHookInto('alpine:navigated')\n    })\n}\n\nfunction fetchHtmlOrUsePrefetchedHtml(fromDestination, callback) {\n    getPretchedHtmlOr(fromDestination, callback, () => {\n        fetchHtml(fromDestination, callback)\n    })\n}\n\nfunction preventAlpineFromPickingUpDomChanges(Alpine, callback) {\n    Alpine.stopObservingMutations()\n\n    callback((afterAllThis) => {\n        Alpine.startObservingMutations()\n\n        queueMicrotask(() => {\n            afterAllThis()\n        })\n    })\n}\n\nfunction fireEventForOtherLibariesToHookInto(name, detail) {\n    let event = new CustomEvent(name, {\n        cancelable: true,\n        bubbles: true,\n        detail,\n    })\n\n    document.dispatchEvent(event)\n\n    return event.defaultPrevented\n}\n\nfunction nowInitializeAlpineOnTheNewPage(Alpine) {\n    Alpine.initTree(document.body, undefined, (el, skip) => {\n        if (el._x_wasPersisted) skip()\n    })\n}\n\nfunction autofocusElementsWithTheAutofocusAttribute() {\n    document.querySelector('[autofocus]') && document.querySelector('[autofocus]').focus()\n}\n\nfunction cleanupAlpineElementsOnThePageThatArentInsideAPersistedElement() {\n    // Create a new tree walker that skips persisted elements...\n    let walker = function (root, callback) {\n        Alpine.walk(root, (el, skip) => {\n            if (isPersistedElement(el)) skip()\n            if (isTeleportTarget(el)) skip()\n            else callback(el, skip)\n        })\n    }\n\n    // Set Alpine in motion to destroy itself on the page. If this proves\n    // to be a performance issue at some point (walking the DOM tree),\n    // we can be more surgical about cleaning up x-for/if instead...\n    Alpine.destroyTree(document.body, walker)\n}\n", "import { isObjecty } from \"@/utils\"\n\nexport default function history(Alpine) {\n    Alpine.magic('queryString', (el, { interceptor }) =>  {\n        let alias\n        let alwaysShow = false\n        let usePush = false\n\n        return interceptor((initialSeedValue, getter, setter, path, key) => {\n            let queryKey = alias || path\n\n            let { initial, replace, push, pop } = track(queryKey, initialSeedValue, alwaysShow)\n\n            setter(initial)\n\n            if (! usePush) {\n                Alpine.effect(() => replace(getter()))\n            } else {\n                Alpine.effect(() => push(getter()))\n\n                pop(async newValue => {\n                    setter(newValue)\n\n                    let tillTheEndOfTheMicrotaskQueue = () => Promise.resolve()\n\n                    await tillTheEndOfTheMicrotaskQueue() // ...so that we preserve the internal lock...\n                })\n            }\n\n            return initial\n        }, func => {\n            func.alwaysShow = () => { alwaysShow = true; return func }\n            func.usePush = () => { usePush = true; return func }\n            func.as = key => { alias = key; return func }\n        })\n    })\n\n    Alpine.history = { track }\n}\n\nexport function track(name, initialSeedValue, alwaysShow = false, except = null) {\n    let { has, get, set, remove } = queryStringUtils()\n\n    let url = new URL(window.location.href)\n    let isInitiallyPresentInUrl = has(url, name)\n    let initialValue = isInitiallyPresentInUrl ? get(url, name) : initialSeedValue\n    let initialValueMemo = JSON.stringify(initialValue)\n    let exceptValueMemo = [false, null, undefined].includes(except) ? initialSeedValue : JSON.stringify(except)\n\n    let hasReturnedToInitialValue = (newValue) => JSON.stringify(newValue) === initialValueMemo\n    let hasReturnedToExceptValue = (newValue) =>  JSON.stringify(newValue) === exceptValueMemo\n\n    if (alwaysShow) url = set(url, name, initialValue)\n\n    replace(url, name, { value: initialValue })\n\n    let lock = false\n\n    let update = (strategy, newValue) => {\n        if (lock) return\n\n        let url = new URL(window.location.href)\n\n        // This block of code is what needs to be changed for this failing test to pass:\n        if (! alwaysShow && ! isInitiallyPresentInUrl && hasReturnedToInitialValue(newValue)) {\n            url = remove(url, name)\n        // This is so that when deeply nested values are tracked, but their parent array/object\n        // is removed, we can handle it gracefully by removing the entry from the URL instead\n        // of letting it get set to `?someKey=undefined` which causes issues on refresh...\n        } else if (newValue === undefined) {\n            url = remove(url, name)\n        } else if (! alwaysShow && hasReturnedToExceptValue(newValue)) {\n            url = remove(url, name)\n        } else {\n            url = set(url, name, newValue)\n        }\n\n        // Right now, the above block, checks a few conditions and updates/removes an entry from the query string.\n        // The new strategy needs to be something like:\n        // - If \"alwaysShow\" is toggled on, then just \"set\" the whole thing with no deep diff\n        // - Otherwise, run a deep comparison callback (given the original value and new value).\n        //   - The callback recieves two params (leaf name and value)\n        //   - Check leaf name and value for existance in the original URL from page load. If it's there, just call \"set\"\n        //   - Check leaf name and value for equivelance to original name and value, if equal, call \"remove\", otherwise, \"set\"\n\n        // That code will look something like this:\n\n        // if (alwaysShow) {\n        //     set(url, name, newValue)\n        // } else {\n        //     deepCompare(name, newValue, originalValue, (leafName, leafValue) => {\n        //         // ....\n        //     })\n        // }\n\n        strategy(url, name, { value: newValue})\n    }\n\n    return {\n        initial: initialValue,\n\n        replace(newValue) { // Update via replaceState...\n            update(replace, newValue)\n        },\n\n        push(newValue) { // Update via pushState...\n            update(push, newValue)\n        },\n\n        pop(receiver) { // \"popstate\" handler...\n            let handler = (e) => {\n                if (! e.state || ! e.state.alpine) return\n\n                Object.entries(e.state.alpine).forEach(([iName, { value: newValue }]) => {\n                    if (iName !== name) return\n\n                    lock = true\n\n                    // Allow the \"receiver\" to be an async function in case a non-syncronous\n                    // operation (like an ajax) requests needs to happen while preserving\n                    // the \"locking\" mechanism (\"lock = true\" in this case)...\n                    let result = receiver(newValue)\n\n                    if (result instanceof Promise) {\n                        result.finally(() => lock = false)\n                    } else {\n                        lock = false\n                    }\n                })\n            }\n\n            window.addEventListener('popstate', handler)\n\n            return () => window.removeEventListener('popstate', handler)\n        }\n    }\n}\n\nfunction replace(url, key, object) {\n    let state = window.history.state || {}\n\n    if (! state.alpine) state.alpine = {}\n\n    state.alpine[key] = unwrap(object)\n\n    window.history.replaceState(state, '', url.toString())\n}\n\nfunction push(url, key, object) {\n    let state = window.history.state || {}\n\n    if (! state.alpine) state.alpine = {}\n\n    state = { alpine: {...state.alpine, ...{[key]: unwrap(object)}} }\n\n    window.history.pushState(state, '', url.toString())\n}\n\nfunction unwrap(object) {\n    if (object === undefined) return undefined\n\n    return JSON.parse(JSON.stringify(object))\n}\n\nfunction queryStringUtils() {\n    return {\n        has(url, key) {\n            let search = url.search\n\n            if (! search) return false\n\n            let data = fromQueryString(search)\n\n            return Object.keys(data).includes(key)\n        },\n        get(url, key) {\n            let search = url.search\n\n            if (! search) return false\n\n            let data = fromQueryString(search)\n\n            return data[key]\n        },\n        set(url, key, value) {\n            let data = fromQueryString(url.search)\n\n            data[key] = stripNulls(unwrap(value))\n\n            url.search = toQueryString(data)\n\n            return url\n        },\n        remove(url, key) {\n            let data = fromQueryString(url.search)\n\n            delete data[key]\n\n            url.search = toQueryString(data)\n\n            return url\n        },\n    }\n}\n\nfunction stripNulls(value) {\n    if (! isObjecty(value)) return value\n\n    for (let key in value) {\n        if (value[key] === null) delete value[key]\n        else value[key] = stripNulls(value[key])\n    }\n\n    return value\n}\n\n// This function converts JavaScript data to bracketed query string notation...\n// { items: [['foo']] } -> \"items[0][0]=foo\"\nfunction toQueryString(data) {\n    let isObjecty = (subject) => typeof subject === 'object' && subject !== null\n\n    let buildQueryStringEntries = (data, entries = {}, baseKey = '') => {\n        Object.entries(data).forEach(([iKey, iValue]) => {\n            let key = baseKey === '' ? iKey : `${baseKey}[${iKey}]`\n\n            if (iValue === null) {\n                entries[key] = '';\n            } else if (! isObjecty(iValue)) {\n                entries[key] = encodeURIComponent(iValue)\n                    .replaceAll('%20', '+') // Conform to RFC1738\n                    .replaceAll('%2C', ',')\n            } else {\n                entries = {...entries, ...buildQueryStringEntries(iValue, entries, key)}\n            }\n        })\n\n        return entries\n    }\n\n    let entries = buildQueryStringEntries(data)\n\n    return Object.entries(entries).map(([key, value]) => `${key}=${value}`).join('&')\n}\n\n// This function converts bracketed query string notation back to JS data...\n// \"items[0][0]=foo\" -> { items: [['foo']] }\nfunction fromQueryString(search) {\n    search = search.replace('?', '')\n\n    if (search === '') return {}\n\n    let insertDotNotatedValueIntoData = (key, value, data) => {\n        let [first, second, ...rest] = key.split('.')\n\n        // We're at a leaf node, let's make the assigment...\n        if (! second) return data[key] = value\n\n        // This is where we fill in empty arrays/objects allong the way to the assigment...\n        if (data[first] === undefined) {\n            data[first] = isNaN(second) ? {} : []\n        }\n\n        // Keep deferring assignment until the full key is built up...\n        insertDotNotatedValueIntoData([second, ...rest].join('.'), value, data[first])\n    }\n\n    let entries = search.split('&').map(i => i.split('='))\n\n    // let data = {} creates a security (XSS) vulnerability here. We need to use\n    // Object.create(null) instead so that we have a \"pure\" object that doesnt\n    // inherit Object.prototype and expose the js internals to manipulation.\n    let data = Object.create(null)\n\n    entries.forEach(([key, value]) => {\n        // Query string params don't always have values... (`?foo=`)\n        if ( typeof value == 'undefined' ) return;\n\n        value = decodeURIComponent(value.replaceAll('+', '%20'))\n\n        if (! key.includes('[')) {\n            data[key] = value\n        } else {\n            // Convert to dot notation because it's easier...\n            let dotNotatedKey = key.replaceAll('[', '.').replaceAll(']', '')\n\n            insertDotNotatedValueIntoData(dotNotatedKey, value, data)\n        }\n    })\n\n    return data\n}\n", "// packages/morph/src/morph.js\nfunction morph(from, toHtml, options) {\n  monkeyPatchDomSetAttributeToAllowAtSymbols();\n  let fromEl;\n  let toEl;\n  let key, lookahead, updating, updated, removing, removed, adding, added;\n  function assignOptions(options2 = {}) {\n    let defaultGetKey = (el) => el.getAttribute(\"key\");\n    let noop = () => {\n    };\n    updating = options2.updating || noop;\n    updated = options2.updated || noop;\n    removing = options2.removing || noop;\n    removed = options2.removed || noop;\n    adding = options2.adding || noop;\n    added = options2.added || noop;\n    key = options2.key || defaultGetKey;\n    lookahead = options2.lookahead || false;\n  }\n  function patch(from2, to) {\n    if (differentElementNamesTypesOrKeys(from2, to)) {\n      return swapElements(from2, to);\n    }\n    let updateChildrenOnly = false;\n    if (shouldSkip(updating, from2, to, () => updateChildrenOnly = true))\n      return;\n    if (from2.nodeType === 1 && window.Alpine) {\n      window.Alpine.cloneNode(from2, to);\n      if (from2._x_teleport && to._x_teleport) {\n        patch(from2._x_teleport, to._x_teleport);\n      }\n    }\n    if (textOrComment(to)) {\n      patchNodeValue(from2, to);\n      updated(from2, to);\n      return;\n    }\n    if (!updateChildrenOnly) {\n      patchAttributes(from2, to);\n    }\n    updated(from2, to);\n    patchChildren(from2, to);\n  }\n  function differentElementNamesTypesOrKeys(from2, to) {\n    return from2.nodeType != to.nodeType || from2.nodeName != to.nodeName || getKey(from2) != getKey(to);\n  }\n  function swapElements(from2, to) {\n    if (shouldSkip(removing, from2))\n      return;\n    let toCloned = to.cloneNode(true);\n    if (shouldSkip(adding, toCloned))\n      return;\n    from2.replaceWith(toCloned);\n    removed(from2);\n    added(toCloned);\n  }\n  function patchNodeValue(from2, to) {\n    let value = to.nodeValue;\n    if (from2.nodeValue !== value) {\n      from2.nodeValue = value;\n    }\n  }\n  function patchAttributes(from2, to) {\n    if (from2._x_transitioning)\n      return;\n    if (from2._x_isShown && !to._x_isShown) {\n      return;\n    }\n    if (!from2._x_isShown && to._x_isShown) {\n      return;\n    }\n    let domAttributes = Array.from(from2.attributes);\n    let toAttributes = Array.from(to.attributes);\n    for (let i = domAttributes.length - 1; i >= 0; i--) {\n      let name = domAttributes[i].name;\n      if (!to.hasAttribute(name)) {\n        from2.removeAttribute(name);\n      }\n    }\n    for (let i = toAttributes.length - 1; i >= 0; i--) {\n      let name = toAttributes[i].name;\n      let value = toAttributes[i].value;\n      if (from2.getAttribute(name) !== value) {\n        from2.setAttribute(name, value);\n      }\n    }\n  }\n  function patchChildren(from2, to) {\n    let fromKeys = keyToMap(from2.children);\n    let fromKeyHoldovers = {};\n    let currentTo = getFirstNode(to);\n    let currentFrom = getFirstNode(from2);\n    while (currentTo) {\n      seedingMatchingId(currentTo, currentFrom);\n      let toKey = getKey(currentTo);\n      let fromKey = getKey(currentFrom);\n      if (!currentFrom) {\n        if (toKey && fromKeyHoldovers[toKey]) {\n          let holdover = fromKeyHoldovers[toKey];\n          from2.appendChild(holdover);\n          currentFrom = holdover;\n        } else {\n          if (!shouldSkip(adding, currentTo)) {\n            let clone = currentTo.cloneNode(true);\n            from2.appendChild(clone);\n            added(clone);\n          }\n          currentTo = getNextSibling(to, currentTo);\n          continue;\n        }\n      }\n      let isIf = (node) => node && node.nodeType === 8 && node.textContent === \"[if BLOCK]><![endif]\";\n      let isEnd = (node) => node && node.nodeType === 8 && node.textContent === \"[if ENDBLOCK]><![endif]\";\n      if (isIf(currentTo) && isIf(currentFrom)) {\n        let nestedIfCount = 0;\n        let fromBlockStart = currentFrom;\n        while (currentFrom) {\n          let next = getNextSibling(from2, currentFrom);\n          if (isIf(next)) {\n            nestedIfCount++;\n          } else if (isEnd(next) && nestedIfCount > 0) {\n            nestedIfCount--;\n          } else if (isEnd(next) && nestedIfCount === 0) {\n            currentFrom = next;\n            break;\n          }\n          currentFrom = next;\n        }\n        let fromBlockEnd = currentFrom;\n        nestedIfCount = 0;\n        let toBlockStart = currentTo;\n        while (currentTo) {\n          let next = getNextSibling(to, currentTo);\n          if (isIf(next)) {\n            nestedIfCount++;\n          } else if (isEnd(next) && nestedIfCount > 0) {\n            nestedIfCount--;\n          } else if (isEnd(next) && nestedIfCount === 0) {\n            currentTo = next;\n            break;\n          }\n          currentTo = next;\n        }\n        let toBlockEnd = currentTo;\n        let fromBlock = new Block(fromBlockStart, fromBlockEnd);\n        let toBlock = new Block(toBlockStart, toBlockEnd);\n        patchChildren(fromBlock, toBlock);\n        continue;\n      }\n      if (currentFrom.nodeType === 1 && lookahead && !currentFrom.isEqualNode(currentTo)) {\n        let nextToElementSibling = getNextSibling(to, currentTo);\n        let found = false;\n        while (!found && nextToElementSibling) {\n          if (nextToElementSibling.nodeType === 1 && currentFrom.isEqualNode(nextToElementSibling)) {\n            found = true;\n            currentFrom = addNodeBefore(from2, currentTo, currentFrom);\n            fromKey = getKey(currentFrom);\n          }\n          nextToElementSibling = getNextSibling(to, nextToElementSibling);\n        }\n      }\n      if (toKey !== fromKey) {\n        if (!toKey && fromKey) {\n          fromKeyHoldovers[fromKey] = currentFrom;\n          currentFrom = addNodeBefore(from2, currentTo, currentFrom);\n          fromKeyHoldovers[fromKey].remove();\n          currentFrom = getNextSibling(from2, currentFrom);\n          currentTo = getNextSibling(to, currentTo);\n          continue;\n        }\n        if (toKey && !fromKey) {\n          if (fromKeys[toKey]) {\n            currentFrom.replaceWith(fromKeys[toKey]);\n            currentFrom = fromKeys[toKey];\n          }\n        }\n        if (toKey && fromKey) {\n          let fromKeyNode = fromKeys[toKey];\n          if (fromKeyNode) {\n            fromKeyHoldovers[fromKey] = currentFrom;\n            currentFrom.replaceWith(fromKeyNode);\n            currentFrom = fromKeyNode;\n          } else {\n            fromKeyHoldovers[fromKey] = currentFrom;\n            currentFrom = addNodeBefore(from2, currentTo, currentFrom);\n            fromKeyHoldovers[fromKey].remove();\n            currentFrom = getNextSibling(from2, currentFrom);\n            currentTo = getNextSibling(to, currentTo);\n            continue;\n          }\n        }\n      }\n      let currentFromNext = currentFrom && getNextSibling(from2, currentFrom);\n      patch(currentFrom, currentTo);\n      currentTo = currentTo && getNextSibling(to, currentTo);\n      currentFrom = currentFromNext;\n    }\n    let removals = [];\n    while (currentFrom) {\n      if (!shouldSkip(removing, currentFrom))\n        removals.push(currentFrom);\n      currentFrom = getNextSibling(from2, currentFrom);\n    }\n    while (removals.length) {\n      let domForRemoval = removals.shift();\n      domForRemoval.remove();\n      removed(domForRemoval);\n    }\n  }\n  function getKey(el) {\n    return el && el.nodeType === 1 && key(el);\n  }\n  function keyToMap(els) {\n    let map = {};\n    for (let el of els) {\n      let theKey = getKey(el);\n      if (theKey) {\n        map[theKey] = el;\n      }\n    }\n    return map;\n  }\n  function addNodeBefore(parent, node, beforeMe) {\n    if (!shouldSkip(adding, node)) {\n      let clone = node.cloneNode(true);\n      parent.insertBefore(clone, beforeMe);\n      added(clone);\n      return clone;\n    }\n    return node;\n  }\n  assignOptions(options);\n  fromEl = from;\n  toEl = typeof toHtml === \"string\" ? createElement(toHtml) : toHtml;\n  if (window.Alpine && window.Alpine.closestDataStack && !from._x_dataStack) {\n    toEl._x_dataStack = window.Alpine.closestDataStack(from);\n    toEl._x_dataStack && window.Alpine.cloneNode(from, toEl);\n  }\n  patch(from, toEl);\n  fromEl = void 0;\n  toEl = void 0;\n  return from;\n}\nmorph.step = () => {\n};\nmorph.log = () => {\n};\nfunction shouldSkip(hook, ...args) {\n  let skip = false;\n  hook(...args, () => skip = true);\n  return skip;\n}\nvar patched = false;\nfunction createElement(html) {\n  const template = document.createElement(\"template\");\n  template.innerHTML = html;\n  return template.content.firstElementChild;\n}\nfunction textOrComment(el) {\n  return el.nodeType === 3 || el.nodeType === 8;\n}\nvar Block = class {\n  constructor(start, end) {\n    this.startComment = start;\n    this.endComment = end;\n  }\n  get children() {\n    let children = [];\n    let currentNode = this.startComment.nextSibling;\n    while (currentNode && currentNode !== this.endComment) {\n      children.push(currentNode);\n      currentNode = currentNode.nextSibling;\n    }\n    return children;\n  }\n  appendChild(child) {\n    this.endComment.before(child);\n  }\n  get firstChild() {\n    let first = this.startComment.nextSibling;\n    if (first === this.endComment)\n      return;\n    return first;\n  }\n  nextNode(reference) {\n    let next = reference.nextSibling;\n    if (next === this.endComment)\n      return;\n    return next;\n  }\n  insertBefore(newNode, reference) {\n    reference.before(newNode);\n    return newNode;\n  }\n};\nfunction getFirstNode(parent) {\n  return parent.firstChild;\n}\nfunction getNextSibling(parent, reference) {\n  let next;\n  if (parent instanceof Block) {\n    next = parent.nextNode(reference);\n  } else {\n    next = reference.nextSibling;\n  }\n  return next;\n}\nfunction monkeyPatchDomSetAttributeToAllowAtSymbols() {\n  if (patched)\n    return;\n  patched = true;\n  let original = Element.prototype.setAttribute;\n  let hostDiv = document.createElement(\"div\");\n  Element.prototype.setAttribute = function newSetAttribute(name, value) {\n    if (!name.includes(\"@\")) {\n      return original.call(this, name, value);\n    }\n    hostDiv.innerHTML = `<span ${name}=\"${value}\"></span>`;\n    let attr = hostDiv.firstElementChild.getAttributeNode(name);\n    hostDiv.firstElementChild.removeAttributeNode(attr);\n    this.setAttributeNode(attr);\n  };\n}\nfunction seedingMatchingId(to, from) {\n  let fromId = from && from._x_bindings && from._x_bindings.id;\n  if (!fromId)\n    return;\n  to.setAttribute(\"id\", fromId);\n  to.id = fromId;\n}\n\n// packages/morph/src/index.js\nfunction src_default(Alpine) {\n  Alpine.morph = morph;\n}\n\n// packages/morph/builds/module.js\nvar module_default = src_default;\nexport {\n  module_default as default,\n  src_default as morph\n};\n", "// packages/mask/src/index.js\nfunction src_default(Alpine) {\n  Alpine.directive(\"mask\", (el, { value, expression }, { effect, evaluateLater, cleanup }) => {\n    let templateFn = () => expression;\n    let lastInputValue = \"\";\n    queueMicrotask(() => {\n      if ([\"function\", \"dynamic\"].includes(value)) {\n        let evaluator = evaluateLater(expression);\n        effect(() => {\n          templateFn = (input) => {\n            let result;\n            Alpine.dontAutoEvaluateFunctions(() => {\n              evaluator((value2) => {\n                result = typeof value2 === \"function\" ? value2(input) : value2;\n              }, { scope: {\n                // These are \"magics\" we'll make available to the x-mask:function:\n                \"$input\": input,\n                \"$money\": formatMoney.bind({ el })\n              } });\n            });\n            return result;\n          };\n          processInputValue(el, false);\n        });\n      } else {\n        processInputValue(el, false);\n      }\n      if (el._x_model)\n        el._x_model.set(el.value);\n    });\n    const controller = new AbortController();\n    cleanup(() => {\n      controller.abort();\n    });\n    el.addEventListener(\"input\", () => processInputValue(el), {\n      signal: controller.signal,\n      // Setting this as a capture phase listener to ensure it runs\n      // before wire:model or x-model added as a latent binding...\n      capture: true\n    });\n    el.addEventListener(\"blur\", () => processInputValue(el, false), { signal: controller.signal });\n    function processInputValue(el2, shouldRestoreCursor = true) {\n      let input = el2.value;\n      let template = templateFn(input);\n      if (!template || template === \"false\")\n        return false;\n      if (lastInputValue.length - el2.value.length === 1) {\n        return lastInputValue = el2.value;\n      }\n      let setInput = () => {\n        lastInputValue = el2.value = formatInput(input, template);\n      };\n      if (shouldRestoreCursor) {\n        restoreCursorPosition(el2, template, () => {\n          setInput();\n        });\n      } else {\n        setInput();\n      }\n    }\n    function formatInput(input, template) {\n      if (input === \"\")\n        return \"\";\n      let strippedDownInput = stripDown(template, input);\n      let rebuiltInput = buildUp(template, strippedDownInput);\n      return rebuiltInput;\n    }\n  }).before(\"model\");\n}\nfunction restoreCursorPosition(el, template, callback) {\n  let cursorPosition = el.selectionStart;\n  let unformattedValue = el.value;\n  callback();\n  let beforeLeftOfCursorBeforeFormatting = unformattedValue.slice(0, cursorPosition);\n  let newPosition = buildUp(\n    template,\n    stripDown(\n      template,\n      beforeLeftOfCursorBeforeFormatting\n    )\n  ).length;\n  el.setSelectionRange(newPosition, newPosition);\n}\nfunction stripDown(template, input) {\n  let inputToBeStripped = input;\n  let output = \"\";\n  let regexes = {\n    \"9\": /[0-9]/,\n    \"a\": /[a-zA-Z]/,\n    \"*\": /[a-zA-Z0-9]/\n  };\n  let wildcardTemplate = \"\";\n  for (let i = 0; i < template.length; i++) {\n    if ([\"9\", \"a\", \"*\"].includes(template[i])) {\n      wildcardTemplate += template[i];\n      continue;\n    }\n    for (let j = 0; j < inputToBeStripped.length; j++) {\n      if (inputToBeStripped[j] === template[i]) {\n        inputToBeStripped = inputToBeStripped.slice(0, j) + inputToBeStripped.slice(j + 1);\n        break;\n      }\n    }\n  }\n  for (let i = 0; i < wildcardTemplate.length; i++) {\n    let found = false;\n    for (let j = 0; j < inputToBeStripped.length; j++) {\n      if (regexes[wildcardTemplate[i]].test(inputToBeStripped[j])) {\n        output += inputToBeStripped[j];\n        inputToBeStripped = inputToBeStripped.slice(0, j) + inputToBeStripped.slice(j + 1);\n        found = true;\n        break;\n      }\n    }\n    if (!found)\n      break;\n  }\n  return output;\n}\nfunction buildUp(template, input) {\n  let clean = Array.from(input);\n  let output = \"\";\n  for (let i = 0; i < template.length; i++) {\n    if (![\"9\", \"a\", \"*\"].includes(template[i])) {\n      output += template[i];\n      continue;\n    }\n    if (clean.length === 0)\n      break;\n    output += clean.shift();\n  }\n  return output;\n}\nfunction formatMoney(input, delimiter = \".\", thousands, precision = 2) {\n  if (input === \"-\")\n    return \"-\";\n  if (/^\\D+$/.test(input))\n    return \"9\";\n  if (thousands === null || thousands === void 0) {\n    thousands = delimiter === \",\" ? \".\" : \",\";\n  }\n  let addThousands = (input2, thousands2) => {\n    let output = \"\";\n    let counter = 0;\n    for (let i = input2.length - 1; i >= 0; i--) {\n      if (input2[i] === thousands2)\n        continue;\n      if (counter === 3) {\n        output = input2[i] + thousands2 + output;\n        counter = 0;\n      } else {\n        output = input2[i] + output;\n      }\n      counter++;\n    }\n    return output;\n  };\n  let minus = input.startsWith(\"-\") ? \"-\" : \"\";\n  let strippedInput = input.replaceAll(new RegExp(`[^0-9\\\\${delimiter}]`, \"g\"), \"\");\n  let template = Array.from({ length: strippedInput.split(delimiter)[0].length }).fill(\"9\").join(\"\");\n  template = `${minus}${addThousands(template, thousands)}`;\n  if (precision > 0 && input.includes(delimiter))\n    template += `${delimiter}` + \"9\".repeat(precision);\n  queueMicrotask(() => {\n    if (this.el.value.endsWith(delimiter))\n      return;\n    if (this.el.value[this.el.selectionStart - 1] === delimiter) {\n      this.el.setSelectionRange(this.el.selectionStart - 1, this.el.selectionStart - 1);\n    }\n  });\n  return template;\n}\n\n// packages/mask/builds/module.js\nvar module_default = src_default;\nexport {\n  module_default as default,\n  src_default as mask,\n  stripDown\n};\n", "import { closestComponent, destroyComponent, initComponent } from './store'\nimport { matchesForLivewireDirective, extractDirective } from './directives'\nimport { trigger } from './hooks'\nimport collapse from '@alpinejs/collapse'\nimport focus from '@alpinejs/focus'\nimport persist from '@alpinejs/persist'\nimport intersect from '@alpinejs/intersect'\nimport anchor from '@alpinejs/anchor'\nimport navigate from './plugins/navigate'\nimport history from './plugins/history'\nimport morph from '@alpinejs/morph'\nimport mask from '@alpinejs/mask'\nimport Alpine from 'alpinejs'\nimport { dispatch } from './utils'\n\nexport function start() {\n    setTimeout(() => ensureLivewireScriptIsntMisplaced())\n\n    dispatch(document, 'livewire:init')\n    dispatch(document, 'livewire:initializing')\n\n    Alpine.plugin(morph)\n    Alpine.plugin(history)\n    Alpine.plugin(intersect)\n    Alpine.plugin(collapse)\n    Alpine.plugin(anchor)\n    Alpine.plugin(focus)\n    Alpine.plugin(persist)\n    Alpine.plugin(navigate)\n    Alpine.plugin(mask)\n\n    Alpine.addRootSelector(() => '[wire\\\\:id]')\n\n    Alpine.onAttributesAdded((el, attributes) => {\n        // if there are no \"wire:\" directives we don't need to process this element any further.\n        // This prevents Livewire from causing general slowness for other Alpine elements on the page...\n        if (! Array.from(attributes).some(attribute => matchesForLivewireDirective(attribute.name))) return\n\n        let component = closestComponent(el, false)\n\n        if (! component) return\n\n        attributes.forEach(attribute => {\n            if (! matchesForLivewireDirective(attribute.name)) return;\n\n            let directive = extractDirective(el, attribute.name)\n\n            trigger('directive.init', { el, component, directive, cleanup: (callback) => {\n                Alpine.onAttributeRemoved(el, directive.raw, callback)\n            } })\n        })\n    })\n\n    Alpine.interceptInit(\n        Alpine.skipDuringClone(el => {\n            // if there are no \"wire:\" directives we don't need to process this element any further.\n            // This prevents Livewire from causing general slowness for other Alpine elements on the page...\n            if (! Array.from(el.attributes).some(attribute => matchesForLivewireDirective(attribute.name))) return\n\n            if (el.hasAttribute('wire:id')) {\n                let component = initComponent(el)\n\n                Alpine.onAttributeRemoved(el, 'wire:id', () => {\n                    destroyComponent(component.id)\n                })\n            }\n\n            let component = closestComponent(el, false)\n\n            if (component) {\n                trigger('element.init', { el, component })\n\n                let directives = Array.from(el.getAttributeNames())\n                    .filter(name => matchesForLivewireDirective(name))\n                    .map(name => extractDirective(el, name))\n\n                directives.forEach(directive => {\n                    trigger('directive.init', { el, component, directive, cleanup: (callback) => {\n                        Alpine.onAttributeRemoved(el, directive.raw, callback)\n                    } })\n                })\n            }\n        })\n    )\n\n    Alpine.start()\n\n    setTimeout(() => window.Livewire.initialRenderIsFinished = true)\n\n    dispatch(document, 'livewire:initialized')\n}\n\nfunction ensureLivewireScriptIsntMisplaced() {\n    let el = document.querySelector('script[data-update-uri][data-csrf]')\n\n    // If there is no Livewire-injected script on the page, move on...\n    if (! el) return\n\n    // If there is, let's ensure it's at the top-level. If it's nested\n    // inside a normal element, that probably means that a closing\n    // tag was missing in the template and Chrome moved the tag.\n\n    // We're only checking for \"div\" here because it's quick and useful...\n    let livewireEl = el.closest('[wire\\\\:id]')\n\n    if (livewireEl) {\n        console.warn('Livewire: missing closing tags found. Ensure your template elements contain matching closing tags.', livewireEl)\n    }\n}\n", "import { on as hook } from '@/hooks'\n\nhook('effect', ({ component, effects }) => {\n    registerListeners(component, effects.listeners || [])\n})\n\nfunction registerListeners(component, listeners) {\n    listeners.forEach(name => {\n        // Register a global listener...\n        let handler = (e) => {\n            if (e.__livewire) e.__livewire.receivedBy.push(component)\n\n            component.$wire.call('__dispatch', name, e.detail || {})\n        }\n\n        window.addEventListener(name, handler)\n\n        component.addCleanup(() => window.removeEventListener(name, handler))\n\n        // Register a listener for when \"to\" or \"self\"\n        component.el.addEventListener(name, (e) => {\n            // We don't care about non-Livewire dispatches...\n            if (! e.__livewire) return\n\n            // We don't care about Livewire bubbling dispatches (only \"to\" and \"self\")...\n            if (e.bubbles) return\n\n            if (e.__livewire) e.__livewire.receivedBy.push(component.id)\n\n            component.$wire.call('__dispatch', name, e.detail || {})\n        })\n    })\n}\n\n\n", "import { on } from '@/hooks'\nimport Alpine from 'alpinejs'\n\nlet executedScripts = new WeakMap\n\nlet executedAssets = new Set\n\non('payload.intercept', async ({ assets }) => {\n    if(! assets) return\n\n    for (let [key, asset] of Object.entries(assets)) {\n        await onlyIfAssetsHaventBeenLoadedAlreadyOnThisPage(key, async () => {\n            await addAssetsToHeadTagOfPage(asset)\n        })\n    }\n})\n\n// Assets that were injected into the HTML need to be registered so that\n// they aren't loaded again...\non('component.init', ({ component }) => {\n    let assets = component.snapshot.memo.assets\n\n    if (assets) {\n        assets.forEach((key) => {\n            if (executedAssets.has(key)) return\n            executedAssets.add(key)\n        })\n    }\n})\n\non('effect', ({ component, effects }) => {\n    let scripts = effects.scripts\n\n    if (scripts) {\n        Object.entries(scripts).forEach(([key, content]) => {\n            onlyIfScriptHasntBeenRunAlreadyForThisComponent(component, key, () => {\n                let scriptContent = extractScriptTagContent(content)\n\n                Alpine.dontAutoEvaluateFunctions(() => {\n                    Alpine.evaluate(component.el, scriptContent, { '$wire': component.$wire })\n                })\n            })\n        })\n    }\n})\n\nfunction onlyIfScriptHasntBeenRunAlreadyForThisComponent(component, key, callback) {\n    if (executedScripts.has(component)) {\n        let alreadyRunKeys = executedScripts.get(component)\n\n        if (alreadyRunKeys.includes(key)) return\n    }\n\n    callback()\n\n    if (! executedScripts.has(component)) executedScripts.set(component, [])\n\n    let alreadyRunKeys = executedScripts.get(component)\n\n    alreadyRunKeys.push(key)\n\n    executedScripts.set(component, alreadyRunKeys)\n}\n\nfunction extractScriptTagContent(rawHtml) {\n    let scriptRegex = /<script\\b[^>]*>([\\s\\S]*?)<\\/script>/gm\n    let matches = scriptRegex.exec(rawHtml)\n    let innards =  matches && matches[1] ? matches[1].trim() : ''\n\n    return innards\n}\n\nasync function onlyIfAssetsHaventBeenLoadedAlreadyOnThisPage(key, callback) {\n    if (executedAssets.has(key)) return\n\n    await callback()\n\n    executedAssets.add(key)\n}\n\nasync function addAssetsToHeadTagOfPage(rawHtml) {\n    let newDocument = (new DOMParser()).parseFromString(rawHtml, \"text/html\")\n    let newHead = document.adoptNode(newDocument.head)\n\n    for (let child of newHead.children) {\n        try {\n            await runAssetSynchronously(child)\n        } catch (error) {\n            // Let's eat any promise rejects so that we don't\n            // break the rest of Livewire's handling of the response...\n            // Any errors triggered by adding the script tag to the page\n            // will still be thrown...\n        }\n    }\n}\n\nasync function runAssetSynchronously(child) {\n    return new Promise((resolve, reject) => {\n        if (isScript(child)) {\n            let script = cloneScriptTag(child)\n\n            // Script assets need to be loaded synchronously so that scripts have\n            // their global variables available...\n            if (script.src) {\n                script.onload = () => resolve()\n                script.onerror = () => reject()\n            } else {\n                resolve()\n            }\n\n            document.head.appendChild(script)\n        } else {\n            document.head.appendChild(child)\n\n            resolve()\n        }\n    })\n}\n\nfunction isScript(el)   {\n    return el.tagName.toLowerCase() === 'script'\n}\n\nfunction cloneScriptTag(el) {\n    let script = document.createElement('script')\n\n    script.textContent = el.textContent\n    script.async = el.async\n\n    for (let attr of el.attributes) {\n        script.setAttribute(attr.name, attr.value)\n    }\n\n    return script\n}\n", "import { overrideMethod } from '@/$wire'\nimport { on } from '@/hooks'\nimport Alpine from 'alpinejs'\n\non('effect', ({ component, effects }) => {\n    let js = effects.js\n    let xjs = effects.xjs\n\n    if (js) {\n        Object.entries(js).forEach(([method, body]) => {\n            overrideMethod(component, method, () => {\n                Alpine.evaluate(component.el, body)\n            })\n        })\n    }\n\n    if (xjs) {\n        xjs.forEach(expression => {\n            Alpine.evaluate(component.el, expression)\n        })\n    }\n})\n\n", "import { trigger } from \"@/hooks\"\nimport { closestComponent } from \"@/store\"\nimport Alpine from 'alpinejs'\n\nexport function morph(component, el, html) {\n    let wrapperTag = el.parentElement\n        // If the root element is a \"tr\", we need the wrapper to be a \"table\"...\n        ? el.parentElement.tagName.toLowerCase()\n        : 'div'\n\n    let wrapper = document.createElement(wrapperTag)\n\n    wrapper.innerHTML = html\n    let parentComponent\n\n    try {\n        parentComponent = closestComponent(el.parentElement)\n    } catch (e) {}\n\n    parentComponent && (wrapper.__livewire = parentComponent)\n\n    let to = wrapper.firstElementChild\n\n    to.__livewire = component\n\n    trigger('morph', { el, toEl: to, component })\n\n    Alpine.morph(el, to, {\n        updating: (el, toEl, childrenOnly, skip) => {\n            if (isntElement(el)) return\n\n            trigger('morph.updating', { el, toEl, component, skip, childrenOnly })\n\n            // bypass DOM diffing for children by overwriting the content\n            if (el.__livewire_replace === true) el.innerHTML = toEl.innerHTML;\n            // completely bypass DOM diffing for this element and all children\n            if (el.__livewire_replace_self === true) { el.outerHTML = toEl.outerHTML; return skip(); }\n\n            if (el.__livewire_ignore === true) return skip()\n            if (el.__livewire_ignore_self === true) childrenOnly()\n\n            // Children will update themselves.\n            if (isComponentRootEl(el) && el.getAttribute('wire:id') !== component.id) return skip()\n\n            // Give the root Livewire \"to\" element, the same object reference as the \"from\"\n            // element. This ensures new Alpine magics like $wire and @entangle can\n            // initialize in the context of a real Livewire component object.\n            if (isComponentRootEl(el)) toEl.__livewire = component\n        },\n\n        updated: (el) => {\n            if (isntElement(el)) return\n\n            trigger('morph.updated', { el, component })\n        },\n\n        removing: (el, skip) => {\n            if (isntElement(el)) return\n\n            trigger('morph.removing', { el, component, skip })\n        },\n\n        removed: (el) => {\n            if (isntElement(el)) return\n\n            trigger('morph.removed', { el, component })\n        },\n\n        adding: (el) => {\n            trigger('morph.adding', { el, component })\n        },\n\n        added: (el) => {\n            if (isntElement(el)) return\n\n            const closestComponentId = closestComponent(el).id\n\n            trigger('morph.added', { el })\n        },\n\n        key: (el) => {\n            if (isntElement(el)) return\n\n            return el.hasAttribute(`wire:key`)\n                ? el.getAttribute(`wire:key`)\n                : // If no \"key\", then first check for \"wire:id\", then \"id\"\n                el.hasAttribute(`wire:id`)\n                    ? el.getAttribute(`wire:id`)\n                    : el.id\n        },\n\n        lookahead: false,\n    })\n}\n\nfunction isntElement(el) {\n    return typeof el.hasAttribute !== 'function'\n}\n\nfunction isComponentRootEl(el) {\n    return el.hasAttribute('wire:id')\n}\n", "import { morph } from '@/morph'\nimport { on } from '@/hooks'\n\non('effect', ({ component, effects }) => {\n    let html = effects.html\n    if (! html) return\n\n    // Wrapping this in a double queueMicrotask. The first one puts it after all\n    // other \"effect\" hooks, and the second one puts it after all reactive\n    // Alpine effects (that are processed via flushJobs in scheduler).\n    queueMicrotask(() => {\n        queueMicrotask(() => {\n            morph(component, component.el, html)\n        })\n    })\n})\n", "import { dispatch, dispatchSelf, dispatchTo } from '@/events'\nimport { on } from '@/hooks'\n\non('effect', ({ component, effects }) => {\n    dispatchEvents(component, effects.dispatches || [])\n})\n\nfunction dispatchEvents(component, dispatches) {\n    dispatches.forEach(({ name, params = {}, self = false, to }) => {\n        if (self) dispatchSelf(component, name, params)\n        else if (to) dispatchTo(to, name, params)\n        else dispatch(component, name, params)\n    })\n}\n\n\n", "import { getDirectives } from '@/directives'\nimport { on } from '@/hooks'\nimport { Bag } from '@/utils'\nimport Alpine from 'alpinejs'\n\nlet cleanups = new Bag\n\n// Adding a setTimeout here so that these event listeners are\n// registered AFTER most other event listenrs, this way, we\n// can call \"stopPropagation\" for things like wire:confirm\non('directive.init', ({ el, directive, cleanup, component }) => setTimeout(() => {\n    if (directive.value !== 'submit') return\n\n    // Livewire will clean it all up automatically when the form\n    // submission returns and the new DOM lacks these additions...\n    el.addEventListener('submit', () => {\n        // If using wire:submit=\"$parent...\", we will need to use\n        // the parent ID as a reference for undoing because it's\n        // the ID that will come back from the network request.\n        let componentId = directive.expression.startsWith('$parent')\n            ? component.parent.id\n            : component.id\n\n        let cleanup = disableForm(el)\n\n        cleanups.add(componentId, cleanup)\n    })\n}))\n\non('commit', ({ component, respond }) => {\n    respond(() => {\n        cleanups.each(component.id, i => i())\n        cleanups.remove(component.id)\n    })\n})\n\nfunction disableForm(formEl) {\n    let undos = []\n\n    Alpine.walk(formEl, (el, skip) => {\n        if (! formEl.contains(el)) return\n\n        if (el.hasAttribute('wire:ignore')) return skip()\n\n        if (shouldMarkDisabled(el)) {\n            undos.push(markDisabled(el))\n        } else if (shouldMarkReadOnly(el)) {\n            undos.push(markReadOnly(el))\n        }\n    })\n\n    return () => {\n        while (undos.length > 0) undos.shift()()\n    }\n}\n\nfunction shouldMarkDisabled(el) {\n    let tag = el.tagName.toLowerCase()\n\n    if (tag === 'select') return true\n    if (tag === 'button' && el.type === 'submit') return true\n    if (tag === 'input' && (el.type === 'checkbox' || el.type === 'radio')) return true\n\n    return false\n}\n\nfunction shouldMarkReadOnly(el) {\n    return ['input', 'textarea'].includes(el.tagName.toLowerCase())\n}\n\nfunction markDisabled(el) {\n    let undo = el.disabled\n        ? () => {}\n        : () => el.disabled = false\n\n    el.disabled = true\n\n    return undo\n}\n\nfunction markReadOnly(el) {\n    let undo = el.readOnly\n        ? () => {}\n        : () => el.readOnly = false\n\n    el.readOnly = true\n\n    return undo\n}\n", "import { on } from '@/hooks'\n\n// Ensure that all child components with reactive props (even deeply nested)\n// are included in the network request...\non('commit.pooling', ({ commits }) => {\n    commits.forEach(commit => {\n        let component = commit.component\n\n        getDeepChildrenWithBindings(component, child => {\n            child.$wire.$commit()\n        })\n    })\n})\n\n// Ensure that related components are pooled together, even if they chose\n// to be isolated normally...\non('commit.pooled', ({ pools }) => {\n    let commits = getPooledCommits(pools)\n\n    commits.forEach(commit => {\n        let component = commit.component\n\n        getDeepChildrenWithBindings(component, child => {\n            colocateCommitsByComponent(pools, component, child)\n        })\n    })\n})\n\nfunction getPooledCommits(pools) {\n    let commits = []\n\n    pools.forEach(pool => {\n        pool.commits.forEach(commit => {\n            commits.push(commit)\n        })\n    })\n\n    return commits\n}\n\nfunction colocateCommitsByComponent(pools, component, foreignComponent) {\n    let pool = findPoolWithComponent(pools, component)\n\n    let foreignPool = findPoolWithComponent(pools, foreignComponent)\n\n    let foreignCommit = foreignPool.findCommitByComponent(foreignComponent)\n\n    // Delete needs to come before add in case there are the same pool...\n    foreignPool.delete(foreignCommit)\n\n    pool.add(foreignCommit)\n\n    // Cleanup empty pools...\n    pools.forEach(pool => {\n        if (pool.empty()) pools.delete(pool)\n    })\n}\n\nfunction findPoolWithComponent(pools, component) {\n    for (let [idx, pool] of pools.entries()) {\n        if (pool.hasCommitFor(component)) return pool\n    }\n}\n\nfunction getDeepChildrenWithBindings(component, callback) {\n    getDeepChildren(component, child => {\n        if (hasReactiveProps(child) || hasWireModelableBindings(child)) {\n            callback(child)\n        }\n    })\n}\n\nfunction hasReactiveProps(component) {\n    let meta = component.snapshot.memo\n    let props = meta.props\n\n    return !! props\n}\n\nfunction hasWireModelableBindings(component) {\n    let meta = component.snapshot.memo\n    let bindings = meta.bindings\n\n    return !! bindings\n}\n\nfunction getDeepChildren(component, callback) {\n    component.children.forEach(child => {\n        callback(child)\n\n        getDeepChildren(child, callback)\n    })\n}\n", "import { on } from '@/hooks'\n\non('commit', ({ succeed }) => {\n    succeed(({ effects }) => {\n        let download = effects.download\n\n        if (! download) return\n\n        // We need to use window.webkitURL so downloads work on iOS Safari.\n        let urlObject = window.webkitURL || window.URL\n\n        let url = urlObject.createObjectURL(\n            base64toBlob(download.content, download.contentType)\n        )\n\n        let invisibleLink = document.createElement('a')\n\n        invisibleLink.style.display = 'none'\n        invisibleLink.href = url\n        invisibleLink.download = download.name\n\n        document.body.appendChild(invisibleLink)\n\n        invisibleLink.click()\n\n        setTimeout(function() {\n            urlObject.revokeObjectURL(url)\n        }, 0);\n    })\n})\n\nfunction base64toBlob(b64Data, contentType = '', sliceSize = 512) {\n    const byteCharacters = atob(b64Data)\n    const byteArrays = []\n\n    if (contentType === null) contentType = ''\n\n    for (let offset = 0; offset < byteCharacters.length; offset += sliceSize) {\n        let slice = byteCharacters.slice(offset, offset + sliceSize)\n\n        let byteNumbers = new Array(slice.length)\n\n        for (let i = 0; i < slice.length; i++) {\n            byteNumbers[i] = slice.charCodeAt(i)\n        }\n\n        let byteArray = new Uint8Array(byteNumbers)\n\n        byteArrays.push(byteArray)\n    }\n\n    return new Blob(byteArrays, { type: contentType });\n}\n", "import { on } from '@/hooks'\n\nlet componentsThatWantToBeBundled = new WeakSet\n\nlet componentsThatAreLazy = new WeakSet\n\non('component.init', ({ component }) => {\n    let memo = component.snapshot.memo\n\n    // We only care about lazy components...\n    if (memo.lazyLoaded === undefined) return\n\n    componentsThatAreLazy.add(component)\n\n    // The component doesn't want its lazy load to be an isolated request\n    // then we'll mark it to detect at \"pool\" time to make sure it gets bundled...\n    if (memo.lazyIsolated !== undefined && memo.lazyIsolated === false) {\n        componentsThatWantToBeBundled.add(component)\n    }\n})\n\non('commit.pooling', ({ commits }) => {\n    commits.forEach(commit => {\n        // We only care about lazy components...\n        if (! componentsThatAreLazy.has(commit.component)) return\n\n        if (componentsThatWantToBeBundled.has(commit.component)) {\n            commit.isolate = false\n\n            componentsThatWantToBeBundled.delete(commit.component)\n        } else {\n            commit.isolate = true\n        }\n\n        // Component is no longer lazy after the first full request, so remove it...\n        componentsThatAreLazy.delete(commit.component)\n    })\n})\n", "import { on } from '@/hooks'\nimport { dataGet } from '@/utils'\nimport Alpine from 'alpinejs'\nimport { track } from '@/plugins/history'\n\non('effect', ({ component, effects, cleanup }) => {\n    let queryString = effects['url']\n\n    if (! queryString) return\n\n    Object.entries(queryString).forEach(([key, value]) => {\n        let { name, as, use, alwaysShow, except } = normalizeQueryStringEntry(key, value)\n\n        if (! as) as = name\n\n        let initialValue = [false, null, undefined].includes(except) ? dataGet(component.ephemeral, name) : except\n\n        let { replace, push, pop } = track(as, initialValue, alwaysShow, except)\n\n        if (use === 'replace') {\n            let effectReference = Alpine.effect(() => {\n                replace(dataGet(component.reactive, name))\n            })\n\n            cleanup(() => Alpine.release(effectReference))\n        } else if (use === 'push') {\n            let forgetCommitHandler = on('commit', ({ component: commitComponent, succeed }) => {\n                if (component !== commitComponent) return\n\n                let beforeValue = dataGet(component.canonical, name)\n\n                succeed(() => {\n                    let afterValue = dataGet(component.canonical, name)\n\n                    if (JSON.stringify(beforeValue) === JSON.stringify(afterValue)) return\n\n                    push(afterValue)\n                })\n            })\n\n            let forgetPopHandler = pop(async newValue => {\n                await component.$wire.set(name, newValue)\n\n                // @todo: this is the absolute worst thing ever I'm so sorry this needs to be refactored stat:\n                document.querySelectorAll('input').forEach(el => {\n                    el._x_forceModelUpdate && el._x_forceModelUpdate(el._x_model.get())\n                })\n            })\n\n            cleanup(() => {\n                forgetCommitHandler()\n                forgetPopHandler()\n            })\n        }\n    })\n})\n\nfunction normalizeQueryStringEntry(key, value) {\n    let defaults = { use: 'replace', alwaysShow: false }\n\n    if (typeof value === 'string') {\n        return {...defaults, name: value, as: value }\n    } else {\n        let fullerDefaults = {...defaults, name: key, as: key }\n\n        return {...fullerDefaults, ...value }\n    }\n}\n", "import { on } from '@/hooks'\nimport { dispatchSelf } from '@/events'\n\non('request', ({ options }) => {\n    if (window.Echo) {\n        options.headers['X-Socket-ID'] = window.Echo.socketId()\n    }\n})\n\non('effect', ({ component, effects }) => {\n    let listeners = effects.listeners || []\n\n    listeners.forEach(event => {\n        if (event.startsWith('echo')) {\n            if (typeof window.Echo === 'undefined') {\n                console.warn('Laravel Echo cannot be found')\n\n                return\n            }\n\n            let event_parts = event.split(/(echo:|echo-)|:|,/)\n\n            if (event_parts[1] == 'echo:') {\n                event_parts.splice(2, 0, 'channel', undefined)\n            }\n\n            if (event_parts[2] == 'notification') {\n                event_parts.push(undefined, undefined)\n            }\n\n            let [\n                s1,\n                signature,\n                channel_type,\n                s2,\n                channel,\n                s3,\n                event_name,\n            ] = event_parts\n\n            if (['channel', 'private', 'encryptedPrivate'].includes(channel_type)) {\n                let handler = e => dispatchSelf(component, event, [e])\n\n                window.Echo[channel_type](channel).listen(event_name, handler)\n\n                component.addCleanup(() => {\n                    window.Echo[channel_type](channel).stopListening(event_name, handler)\n                })\n            } else if (channel_type == 'presence') {\n                if (['here', 'joining', 'leaving'].includes(event_name)) {\n                    window.Echo.join(channel)[event_name](e => {\n                        dispatchSelf(component, event, [e])\n                    })\n\n                    // @todo: add listener cleanup...\n                } else{\n                    let handler = e => dispatchSelf(component, event, [e])\n\n                    window.Echo.join(channel).listen(event_name, handler)\n\n                    component.addCleanup(() => {\n                        window.Echo.leaveChannel(channel)\n                    })\n                }\n            } else if (channel_type == 'notification') {\n                window.Echo.private(channel).notification(notification => {\n                    dispatchSelf(component, event, [notification])\n                })\n\n                // @todo: add listener cleanup...\n            } else {\n                console.warn('Echo channel type not yet supported')\n            }\n        }\n    })\n})\n", "import { on } from '@/hooks'\n\nlet componentsThatAreIsolated = new WeakSet\n\non('component.init', ({ component }) => {\n    let memo = component.snapshot.memo\n\n    // We only care about isolated components...\n    if (memo.isolate !== true) return\n\n    componentsThatAreIsolated.add(component)\n})\n\non('commit.pooling', ({ commits }) => {\n    commits.forEach(commit => {\n        // We only care about isolated components...\n        if (! componentsThatAreIsolated.has(commit.component)) return\n\n        commit.isolate = true\n    })\n})\n", "\nshouldHideProgressBar() && Alpine.navigate.disableProgressBar()\n\ndocument.addEventListener('alpine:navigate', e => forwardEvent('livewire:navigate', e))\ndocument.addEventListener('alpine:navigating', e => forwardEvent('livewire:navigating', e))\ndocument.addEventListener('alpine:navigated', e => forwardEvent('livewire:navigated', e))\n\nfunction forwardEvent(name, original) {\n    let event = new CustomEvent(name, { cancelable: true, bubbles: true, detail: original.detail })\n\n    document.dispatchEvent(event)\n\n    if (event.defaultPrevented) {\n        original.preventDefault()\n    }\n}\n\nexport function shouldRedirectUsingNavigateOr(effects, url, or) {\n    let forceNavigate = effects.redirectUsingNavigate\n\n    if (forceNavigate) {\n        Alpine.navigate(url)\n    } else {\n        or()\n    }\n}\n\nfunction shouldHideProgressBar() {\n    if (!! document.querySelector('[data-no-progress-bar]')) return true\n\n    if (window.livewireScriptConfig && window.livewireScriptConfig.progressBar === false) return true\n\n    return false\n}\n", "import { on } from \"@/hooks\"\nimport { shouldRedirectUsingNavigateOr } from \"./supportNavigate\"\n\non('effect', ({ effects }) => {\n    if (! effects['redirect']) return\n\n    let url = effects['redirect']\n\n    shouldRedirectUsingNavigateOr(effects, url, () => {\n        window.location.href = url\n    })\n})\n", "import { directive } from \"@/directives\"\nimport { on } from '@/hooks'\nimport Alpine from 'alpinejs'\n\non('morph.added', ({ el }) => {\n    el.__addedByMorph = true\n})\n\ndirective('transition', ({ el, directive, component, cleanup }) => {\n    let visibility = Alpine.reactive({ state: el.__addedByMorph ? false : true })\n\n    // We're going to control the element's transition with Alpine transitions...\n    Alpine.bind(el, {\n        [directive.rawName.replace('wire:', 'x-')]: '',\n        'x-show'() { return visibility.state },\n    })\n\n    // If it's not the initial page load, transition the element in...\n    el.__addedByMorph && setTimeout(() => visibility.state = true)\n\n    let cleanups = []\n\n    cleanups.push(on('morph.removing', ({ el, skip }) => {\n        // Here we interupt morphdom from removing an element...\n        skip()\n\n        // When the transition ends...\n        el.addEventListener('transitionend', () => {\n            // We can actually remove the element and all the listeners along with it...\n            el.remove()\n        })\n\n        // Now we can trigger a transition:\n        visibility.state = false\n\n        cleanups.push(on('morph', ({ component: morphComponent }) => {\n            if (morphComponent !== component) return\n\n            // While this element is transitioning out, a new morph is about to occur.\n            // Let's expidite this one and clean it up so it doesn't interfere...\n            el.remove()\n\n            cleanups.forEach(i => i())\n        }))\n    }))\n\n    cleanup(() => cleanups.forEach(i => i()))\n})\n\n\n\n", "import { WeakBag } from './utils'\n\nlet callbacksByComponent = new WeakBag\n\nexport function debounceByComponent(component, callback, time) {\n    // Prepare yourself for what's happening here.\n    // Any text input with wire:model on it should be \"debounced\" by ~150ms by default.\n    // We can't use a simple debounce function because we need a way to clear all the pending\n    // debounces if a user submits a form or performs some other action.\n    // This is a modified debounce function that acts just like a debounce, except it stores\n    // the pending callbacks in a global property so we can \"clear them\" on command instead\n    // of waiting for their setTimeouts to expire. I know.\n\n    // This is a \"null\" callback. Each wire:model will resister one of these upon initialization.\n    let callbackRegister = { callback: () => { } }\n    callbacksByComponent.add(component, callbackRegister)\n\n    // This is a normal \"timeout\" for a debounce function.\n    var timeout\n\n    return e => {\n        clearTimeout(timeout)\n\n        timeout = setTimeout(() => {\n            callback(e)\n            timeout = undefined\n\n            // Because we just called the callback, let's return the\n            // callback register to it's normal \"null\" state.\n            callbackRegister.callback = () => { }\n        }, time)\n\n        // Register the current callback in the register as a kind-of \"escape-hatch\".\n        callbackRegister.callback = () => {\n            clearTimeout(timeout)\n            callback(e)\n        }\n    }\n}\n\nexport function callAndClearComponentDebounces(component, callback) {\n    // This is to protect against the following scenario:\n    // A user is typing into a debounced input, and hits the enter key.\n    // If the enter key submits a form or something, the submission\n    // will happen BEFORE the model input finishes syncing because\n    // of the debounce. This makes sure to clear anything in the debounce queue.\n\n    callbacksByComponent.each(component, callbackRegister => {\n        callbackRegister.callback()\n        callbackRegister.callback = () => { }\n    })\n\n    callback()\n}\n", "import { callAndClearComponentDebounces } from '@/debounce'\nimport { customDirectiveHasBeenRegistered } from '@/directives'\nimport { on } from '@/hooks'\nimport Alpine from 'alpinejs'\n\non('directive.init', ({ el, directive, cleanup, component }) => {\n    if (['snapshot', 'effects', 'model', 'init', 'loading', 'poll', 'ignore', 'id', 'data', 'key', 'target', 'dirty'].includes(directive.value)) return\n    if (customDirectiveHasBeenRegistered(directive.value)) return\n\n    let attribute = directive.rawName.replace('wire:', 'x-on:')\n\n    // Automatically add .prevent to wire:submit, if they didn't add it themselves...\n    if (directive.value === 'submit' && ! directive.modifiers.includes('prevent')) {\n        attribute = attribute + '.prevent'\n    }\n\n    let cleanupBinding = Alpine.bind(el, {\n        [attribute](e) {\n            let execute = () => {\n                callAndClearComponentDebounces(component, () => {\n                    // Forward these calls directly to $wire. Let them handle firing the request.\n                    Alpine.evaluate(el, '$wire.'+directive.expression, { scope: { $event: e }})\n                })\n            }\n\n            // Account for the existance of wire:confirm=\"...\" on the action...\n            if (el.__livewire_confirm) {\n                el.__livewire_confirm(() => {\n                    execute()\n                }, () => {\n                    e.stopImmediatePropagation()\n                })\n            } else {\n                execute()\n            }\n        }\n    })\n\n    cleanup(cleanupBinding)\n})\n", "import Alpine from 'alpinejs'\n\nAlpine.addInitSelector(() => `[wire\\\\:navigate]`)\nAlpine.addInitSelector(() => `[wire\\\\:navigate\\\\.hover]`)\n\nAlpine.interceptInit(\n    Alpine.skipDuringClone(el => {\n        if (el.hasAttribute('wire:navigate')) {\n            Alpine.bind(el, { ['x-navigate']: true })\n        } else if (el.hasAttribute('wire:navigate.hover')) {\n            Alpine.bind(el, { ['x-navigate.hover']: true })\n        }\n    })\n)\n\ndocument.addEventListener('alpine:navigating', () => {\n    // Before navigating away, we'll inscribe the latest state of each component\n    // in their HTML so that upon return, they will have the latest state...\n    Livewire.all().forEach(component => {\n        component.inscribeSnapshotAndEffectsOnElement()\n    })\n})\n", "import { directive } from \"@/directives\"\n\ndirective('confirm', ({ el, directive }) => {\n    let message = directive.expression\n    let shouldPrompt = directive.modifiers.includes('prompt')\n\n    // Convert sanitized linebreaks (\"\\n\") to real line breaks...\n    message = message.replaceAll('\\\\n', '\\n')\n\n    if (message === '') message = 'Are you sure?'\n\n    el.__livewire_confirm = (action, instead) => {\n        if (shouldPrompt) {\n            let [question, expected] = message.split('|')\n\n            if (! expected) {\n                console.warn('Livewire: Must provide expectation with wire:confirm.prompt')\n            } else {\n                let input = prompt(question)\n\n                if (input === expected) {\n                    action()\n                } else {\n                    instead()\n                }\n            }\n        } else {\n            if (confirm(message)) action()\n            else instead()\n        }\n    }\n})\n", "\nexport function toggleBooleanStateDirective(el, directive, isTruthy, cachedDisplay = null) {\n    isTruthy = directive.modifiers.includes('remove') ? ! isTruthy : isTruthy\n\n    if (directive.modifiers.includes('class')) {\n        let classes = directive.expression.split(' ').filter(String)\n\n        if (isTruthy) {\n            el.classList.add(...classes)\n        } else {\n            el.classList.remove(...classes)\n        }\n    } else if (directive.modifiers.includes('attr')) {\n        if (isTruthy) {\n            el.setAttribute(directive.expression, true)\n        } else {\n            el.removeAttribute(directive.expression)\n        }\n    } else {\n        let cache = cachedDisplay ?? window\n            .getComputedStyle(el, null)\n            .getPropertyValue('display')\n\n        let display = (['inline', 'block', 'table', 'flex', 'grid', 'inline-flex']\n            .filter(i => directive.modifiers.includes(i))[0] || 'inline-block')\n\n        // If element is to be removed, set display to its current value...\n        // display = (directive.modifiers.includes('remove') && ! isTruthy)\n        display = (directive.modifiers.includes('remove') && ! isTruthy)\n            ? cache : display\n\n        el.style.display = isTruthy ? display : 'none'\n    }\n}\n", "import { toggleBooleanStateDirective } from './shared'\nimport { directive } from '@/directives'\n\nlet offlineHandlers = new Set\nlet onlineHandlers = new Set\n\nwindow.addEventListener('offline', () => offlineHandlers.forEach(i => i()))\nwindow.addEventListener('online', () => onlineHandlers.forEach(i => i()))\n\ndirective('offline', ({ el, directive, cleanup }) => {\n    let setOffline = () => toggleBooleanStateDirective(el, directive, true)\n    let setOnline = () => toggleBooleanStateDirective(el, directive, false)\n\n    offlineHandlers.add(setOffline)\n    onlineHandlers.add(setOnline)\n\n    cleanup(() => {\n        offlineHandlers.delete(setOffline)\n        onlineHandlers.delete(setOnline)\n    })\n})\n", "import { toggleBooleanStateDirective } from './shared'\nimport { directive, getDirectives } from \"@/directives\"\nimport { on } from '@/hooks'\nimport { listen } from '@/utils'\n\ndirective('loading', ({ el, directive, component, cleanup }) => {\n    let { targets, inverted } = getTargets(el)\n\n    let [delay, abortDelay] = applyDelay(directive)\n\n    let cleanupA = whenTargetsArePartOfRequest(component, targets, inverted, [\n        () => delay(() => toggleBooleanStateDirective(el, directive, true)),\n        () => abortDelay(() => toggleBooleanStateDirective(el, directive, false)),\n    ])\n\n    let cleanupB = whenTargetsArePartOfFileUpload(component, targets, [\n        () => delay(() => toggleBooleanStateDirective(el, directive, true)),\n        () => abortDelay(() => toggleBooleanStateDirective(el, directive, false)),\n    ])\n\n    cleanup(() => {\n        cleanupA()\n        cleanupB()\n    })\n})\n\nfunction applyDelay(directive) {\n    if (! directive.modifiers.includes('delay') || directive.modifiers.includes('none')) return [i => i(), i => i()]\n\n    let duration = 200\n\n    let delayModifiers = {\n        'shortest': 50,\n        'shorter': 100,\n        'short': 150,\n        'default': 200,\n        'long': 300,\n        'longer': 500,\n        'longest': 1000,\n    }\n\n    Object.keys(delayModifiers).some(key => {\n        if (directive.modifiers.includes(key)) {\n            duration = delayModifiers[key]\n\n            return true\n        }\n    })\n\n    let timeout\n    let started = false\n\n    return [\n        (callback) => { // Initiate delay...\n            timeout = setTimeout(() => {\n                callback()\n\n                started = true\n            }, duration)\n        },\n        async (callback) => { // Execute or abort...\n            if (started) {\n                await callback()\n                started = false\n            } else {\n                clearTimeout(timeout)\n            }\n        },\n    ]\n}\n\nfunction whenTargetsArePartOfRequest(component, targets, inverted, [ startLoading, endLoading ]) {\n    return on('commit', ({ component: iComponent, commit: payload, respond }) => {\n        if (iComponent !== component) return\n\n        if (targets.length > 0 && containsTargets(payload, targets) === inverted) return\n\n        startLoading()\n\n        respond(() => {\n            endLoading()\n        })\n    })\n}\n\nfunction whenTargetsArePartOfFileUpload(component, targets, [ startLoading, endLoading ]) {\n    let eventMismatch = e => {\n        let { id, property } = e.detail\n\n        if (id !== component.id) return true\n        if (targets.length > 0 && ! targets.map(i => i.target).includes(property)) return true\n\n        return false\n    }\n\n    let cleanupA = listen(window, 'livewire-upload-start', e => {\n        if (eventMismatch(e)) return\n\n        startLoading()\n    })\n\n    let cleanupB = listen(window, 'livewire-upload-finish', e => {\n        if (eventMismatch(e)) return\n\n        endLoading()\n    })\n\n    let cleanupC = listen(window, 'livewire-upload-error', e => {\n        if (eventMismatch(e)) return\n\n        endLoading()\n    })\n\n    return () => {\n        cleanupA()\n        cleanupB()\n        cleanupC()\n    }\n}\n\nfunction containsTargets(payload, targets) {\n    let { updates, calls } = payload\n\n    return targets.some(({ target, params }) => {\n        if (params) {\n            return calls.some(({ method, params: methodParams }) => {\n                return target === method\n                    && params === quickHash(JSON.stringify(methodParams))\n            })\n        }\n\n        let hasMatchingUpdate = Object.keys(updates).some(property => {\n            // If the property is nested, like `foo.bar`, we need to check if the root `foo` is the target.\n            if (property.includes('.')) {\n                let propertyRoot = property.split('.')[0]\n\n                if (propertyRoot === target) return true\n            }\n\n            return property === target\n        })\n\n        if (hasMatchingUpdate) return true\n\n        if (calls.map(i => i.method).includes(target)) return true\n    })\n}\n\nfunction getTargets(el) {\n    let directives = getDirectives(el)\n\n    let targets = []\n\n    let inverted = false\n\n    if (directives.has('target')) {\n        let directive = directives.get('target')\n\n        let raw = directive.expression\n\n        if (directive.modifiers.includes(\"except\")) inverted = true\n\n        if (raw.includes('(') && raw.includes(')')) {\n            targets.push({ target: directive.method, params: quickHash(JSON.stringify(directive.params)) })\n        } else if (raw.includes(',')) {\n            raw.split(',').map(i => i.trim()).forEach(target => {\n                targets.push({ target })\n            })\n        } else {\n            targets.push({ target: raw })\n        }\n    } else {\n        // If there is no wire:target, let's check for the existance of a wire:click=\"foo\" or something,\n        // and automatically scope this loading directive to that action.\n        let nonActionOrModelLivewireDirectives = [ 'init', 'dirty', 'offline', 'target', 'loading', 'poll', 'ignore', 'key', 'id' ]\n\n        directives\n            .all()\n            .filter(i => ! nonActionOrModelLivewireDirectives.includes(i.value))\n            .map(i => i.expression.split('(')[0])\n            .forEach(target => targets.push({ target }))\n    }\n\n    return { targets, inverted }\n}\n\nfunction quickHash(subject) {\n    return btoa(encodeURIComponent(subject))\n}\n", "import { contentIsFromDump } from '@/utils'\nimport { directive } from '@/directives'\nimport { on, trigger } from '@/hooks'\n\ndirective('stream', ({el, directive, cleanup }) => {\n    let { expression, modifiers } = directive\n\n    let off = on('stream', ({ name, content, replace }) => {\n        if (name !== expression) return\n\n        if (modifiers.includes('replace') || replace) {\n            el.innerHTML = content\n        } else {\n            el.innerHTML = el.innerHTML + content\n        }\n    })\n\n    cleanup(off)\n})\n\non('request', ({ respond }) => {\n    respond(mutableObject => {\n        let response = mutableObject.response\n\n        if (! response.headers.has('X-Livewire-Stream')) return\n\n        mutableObject.response = {\n            ok: true,\n            redirected: false,\n            status: 200,\n\n            async text() {\n                let finalResponse = await interceptStreamAndReturnFinalResponse(response, streamed => {\n                    trigger('stream', streamed)\n                })\n\n                if (contentIsFromDump(finalResponse)) {\n                    this.ok = false\n                }\n\n                return finalResponse\n            }\n        }\n    })\n})\n\nasync function interceptStreamAndReturnFinalResponse(response, callback) {\n    let reader = response.body.getReader()\n    let remainingResponse = ''\n\n    while (true) {\n        let { done, value: chunk } = await reader.read()\n\n        let decoder = new TextDecoder\n        let output = decoder.decode(chunk)\n\n        let [ streams, remaining ] = extractStreamObjects(remainingResponse + output)\n\n        streams.forEach(stream => {\n            callback(stream)\n        })\n\n        remainingResponse = remaining\n\n        if (done) return remainingResponse\n    }\n}\n\nfunction extractStreamObjects(raw) {\n    let regex = /({\"stream\":true.*?\"endStream\":true})/g\n\n    let matches = raw.match(regex)\n\n    let parsed = []\n\n    if (matches) {\n        for (let i = 0; i < matches.length; i++) {\n            parsed.push(JSON.parse(matches[i]).body)\n        }\n    }\n\n    let remaining = raw.replace(regex, '');\n\n    return [ parsed, remaining ];\n}\n", "import { directive } from \"@/directives\"\n\ndirective('replace', ({ el, directive }) => {\n    if (directive.modifiers.includes('self')) {\n        el.__livewire_replace_self = true\n    } else {\n        el.__livewire_replace = true\n    }\n})\n", "import { directive } from \"@/directives\"\n\ndirective('ignore', ({ el, directive }) => {\n    if (directive.modifiers.includes('self')) {\n        el.__livewire_ignore_self = true\n    } else {\n        el.__livewire_ignore = true\n    }\n})\n", "import { toggleBooleanStateDirective } from './shared'\nimport { directive, getDirectives } from '@/directives'\nimport { dataGet, WeakBag } from '@/utils'\nimport { on } from '@/hooks'\n\nlet refreshDirtyStatesByComponent = new WeakBag\n\non('commit', ({ component, respond }) => {\n    respond(() => {\n        setTimeout(() => { // Doing a \"setTimeout\" to let morphdom do its thing first...\n            refreshDirtyStatesByComponent.each(component, i => i(false))\n        })\n    })\n})\n\ndirective('dirty', ({ el, directive, component }) => {\n    let targets = dirtyTargets(el)\n\n    let dirty = Alpine.reactive({ state: false })\n\n    let oldIsDirty = false\n\n    let initialDisplay = el.style.display\n\n    let refreshDirtyState = (isDirty) => {\n        toggleBooleanStateDirective(el, directive, isDirty, initialDisplay)\n\n        oldIsDirty = isDirty\n    }\n\n    refreshDirtyStatesByComponent.add(component, refreshDirtyState)\n\n    Alpine.effect(() => {\n        let isDirty = false\n\n        if (targets.length === 0) {\n            isDirty = JSON.stringify(component.canonical) !== JSON.stringify(component.reactive)\n        } else {\n            for (let i = 0; i < targets.length; i++) {\n                if (isDirty) break;\n\n                let target = targets[i]\n\n                isDirty = JSON.stringify(dataGet(component.canonical, target)) !== JSON.stringify(dataGet(component.reactive, target))\n            }\n        }\n\n        if (oldIsDirty !== isDirty) {\n            refreshDirtyState(isDirty)\n        }\n\n        oldIsDirty = isDirty\n    })\n})\n\nfunction dirtyTargets(el) {\n    let directives = getDirectives(el)\n    let targets = []\n\n    if (directives.has('model')) {\n        targets.push(directives.get('model').expression)\n    }\n\n    if (directives.has('target')) {\n        targets = targets.concat(\n            directives\n            .get('target')\n            .expression.split(',')\n            .map(s => s.trim())\n        )\n    }\n\n    return targets\n}\n", "import { directive } from '@/directives'\nimport { handleFileUpload } from '@/features/supportFileUploads'\nimport { closestComponent } from '@/store'\nimport { dataGet, dataSet } from '@/utils'\nimport Alpine from 'alpinejs'\n\ndirective('model', ({ el, directive, component, cleanup }) => {\n    let { expression, modifiers } = directive\n\n    if (! expression) {\n        return console.warn('Livewire: [wire:model] is missing a value.', el)\n    }\n\n    if (componentIsMissingProperty(component, expression)) {\n        return console.warn('Livewire: [wire:model=\"'+expression+'\"] property does not exist on component: ['+component.name+']', el)\n    }\n\n    // Handle file uploads differently...\n    if (el.type && el.type.toLowerCase() === 'file') {\n        return handleFileUpload(el, expression, component, cleanup)\n    }\n\n    let isLive = modifiers.includes('live')\n    let isLazy = modifiers.includes('lazy') || modifiers.includes('change')\n    let onBlur = modifiers.includes('blur')\n    let isDebounced = modifiers.includes('debounce')\n\n    // Trigger a network request (only if .live or .lazy is added to wire:model)...\n    let update = expression.startsWith('$parent')\n        ? () => component.$wire.$parent.$commit()\n        : () => component.$wire.$commit()\n\n    // If a plain wire:model is added to a text input, debounce the\n    // trigerring of network requests.\n    let debouncedUpdate = isTextInput(el) && ! isDebounced && isLive\n        ? debounce(update, 150)\n        : update\n\n    Alpine.bind(el, {\n        ['@change']() {\n            isLazy && update()\n        },\n        ['@blur']() {\n            onBlur && update()\n        },\n        ['x-model' + getModifierTail(modifiers)]() {\n            return {\n                get() {\n                    return dataGet(component.$wire, expression)\n                },\n                set(value) {\n                    dataSet(component.$wire, expression, value)\n\n                    isLive && (! isLazy) && (! onBlur) && debouncedUpdate()\n                },\n            }\n        }\n    })\n})\n\nfunction getModifierTail(modifiers) {\n    modifiers = modifiers.filter(i => ! [\n        'lazy', 'defer'\n    ].includes(i))\n\n    if (modifiers.length === 0) return ''\n\n    return '.' + modifiers.join('.')\n}\n\nfunction isTextInput(el) {\n    return (\n        ['INPUT', 'TEXTAREA'].includes(el.tagName.toUpperCase()) &&\n        !['checkbox', 'radio'].includes(el.type)\n    )\n}\n\nfunction isDirty(subject, dirty) {\n    // Check for exact match: wire:model=\"bob\" in ['bob']\n    if (dirty.includes(subject)) return true\n\n    // Check case of parent: wire:model=\"bob.1\" in ['bob']\n    return dirty.some(i => subject.startsWith(i))\n}\n\nfunction componentIsMissingProperty(component, property) {\n    if (property.startsWith('$parent')) {\n        let parent = closestComponent(component.el.parentElement, false)\n\n        if (! parent) return true\n\n        return componentIsMissingProperty(parent, property.split('$parent.')[1])\n    }\n\n    let baseProperty = property.split('.')[0]\n\n    return ! Object.keys(component.canonical).includes(baseProperty)\n}\n\nfunction debounce(func, wait) {\n    var timeout;\n\n    return function() {\n      var context = this, args = arguments;\n\n      var later = function() {\n            timeout = null\n\n            func.apply(context, args)\n      }\n\n      clearTimeout(timeout)\n\n      timeout = setTimeout(later, wait)\n    }\n}\n", "import { directive } from \"@/directives\"\nimport Alpine from 'alpinejs'\n\ndirective('init', ({ el, directive }) => {\n    let fullMethod = directive.expression ?? '$refresh'\n\n    Alpine.evaluate(el, `$wire.${fullMethod}`)\n})\n\n", "import { directive, getDirectives } from \"@/directives\"\nimport Alpine from 'alpinejs'\n\ndirective('poll', ({ el, directive }) => {\n    let interval = extractDurationFrom(directive.modifiers, 2000)\n\n    let { start, pauseWhile, throttleWhile, stopWhen } = poll(() => {\n        triggerComponentRequest(el, directive)\n    }, interval)\n\n    start()\n\n    throttleWhile(() => theTabIsInTheBackground() && theDirectiveIsMissingKeepAlive(directive))\n    pauseWhile(() => theDirectiveHasVisible(directive) && theElementIsNotInTheViewport(el))\n    pauseWhile(() => theDirectiveIsOffTheElement(el))\n    pauseWhile(() => livewireIsOffline())\n    stopWhen(() => theElementIsDisconnected(el))\n})\n\nfunction triggerComponentRequest(el, directive) {\n    Alpine.evaluate(el,\n        directive.expression ? '$wire.' + directive.expression : '$wire.$commit()'\n    )\n}\n\nfunction poll(callback, interval = 2000) {\n    let pauseConditions = []\n    let throttleConditions = []\n    let stopConditions = []\n\n    return {\n        start() {\n            let clear = syncronizedInterval(interval, () => {\n                if (stopConditions.some(i => i())) return clear()\n                if (pauseConditions.some(i => i())) return\n                if (throttleConditions.some(i => i()) && Math.random() < .95) return\n\n                callback()\n            })\n        },\n        pauseWhile(condition) {\n            pauseConditions.push(condition)\n        },\n        throttleWhile(condition) {\n            throttleConditions.push(condition)\n        },\n        stopWhen(condition) {\n            stopConditions.push(condition)\n        }\n    }\n}\n\nlet clocks = []\n\nfunction syncronizedInterval(ms, callback) {\n    if (! clocks[ms]) {\n        let clock = {\n            timer: setInterval(() => clock.callbacks.forEach(i => i()), ms),\n            callbacks: new Set,\n        }\n\n        clocks[ms] = clock\n    }\n\n    clocks[ms].callbacks.add(callback)\n\n    return () => {\n        clocks[ms].callbacks.delete(callback)\n\n        if (clocks[ms].callbacks.size === 0) {\n            clearInterval(clocks[ms].timer)\n            delete clocks[ms]\n        }\n    }\n}\n\nlet isOffline = false\n\nwindow.addEventListener('offline', () => isOffline = true)\nwindow.addEventListener('online', () => isOffline = false)\n\nfunction livewireIsOffline() {\n    return isOffline\n}\n\nlet inBackground = false\n\ndocument.addEventListener('visibilitychange', () => { inBackground = document.hidden }, false)\n\nfunction theTabIsInTheBackground() {\n    return inBackground\n}\n\nfunction theDirectiveIsOffTheElement(el) {\n    return ! getDirectives(el).has('poll')\n}\n\nfunction theDirectiveIsMissingKeepAlive(directive) {\n    return ! directive.modifiers.includes('keep-alive')\n}\n\nfunction theDirectiveHasVisible(directive) {\n    return directive.modifiers.includes('visible')\n}\n\nfunction theElementIsNotInTheViewport(el) {\n    let bounding = el.getBoundingClientRect()\n\n    return ! (\n        bounding.top < (window.innerHeight || document.documentElement.clientHeight) &&\n        bounding.left < (window.innerWidth || document.documentElement.clientWidth) &&\n        bounding.bottom > 0 &&\n        bounding.right > 0\n    )\n}\n\nfunction theElementIsDisconnected(el) {\n    return el.isConnected === false\n}\n\nfunction extractDurationFrom(modifiers, defaultDuration) {\n    let durationInMilliSeconds\n    let durationInMilliSecondsString = modifiers.find(mod => mod.match(/([0-9]+)ms/))\n    let durationInSecondsString = modifiers.find(mod => mod.match(/([0-9]+)s/))\n\n    if (durationInMilliSecondsString) {\n        durationInMilliSeconds = Number(durationInMilliSecondsString.replace('ms', ''))\n    } else if (durationInSecondsString) {\n        durationInMilliSeconds = Number(durationInSecondsString.replace('s', '')) * 1000\n    }\n\n    return durationInMilliSeconds || defaultDuration\n}\n", "import { dispatchGlobal as dispatch, dispatchTo, on } from './events'\nimport { find, first, getByName, all } from './store'\nimport { start } from './lifecycle'\nimport { on as hook, trigger, triggerAsync } from './hooks'\nimport { directive } from './directives'\nimport Alpine from 'alpinejs'\n\nlet Livewire = {\n    directive,\n    dispatchTo,\n    start,\n    first,\n    find,\n    getByName,\n    all,\n    hook,\n    trigger,\n    triggerAsync,\n    dispatch,\n    on,\n    get navigate() {\n        return Alpine.navigate\n    }\n}\n\nlet warnAboutMultipleInstancesOf = entity => console.warn(`Detected multiple instances of ${entity} running`)\n\nif (window.Livewire) warnAboutMultipleInstancesOf('Livewire')\nif (window.Alpine) warnAboutMultipleInstancesOf('Alpine')\n\n// Register features...\nimport './features/index'\n\n// Register directives...\nimport './directives/index'\n\n// Make globals...\nwindow.Livewire = Livewire\nwindow.Alpine = Alpine\n\nif (window.livewireScriptConfig === undefined) {\n    window.Alpine.__fromLivewire = true\n\n    document.addEventListener('DOMContentLoaded', () => {\n        if (window.Alpine.__fromLivewire === undefined) {\n            // If this is undefined, we know that an outside Alpine bundle\n            // has been included on the page and will cause problems...\n            warnAboutMultipleInstancesOf('Alpine')\n        }\n\n        // Start Livewire...\n        Livewire.start()\n    })\n}\n\nexport { Livewire, Alpine }\n"],
-  "mappings": "giBAAA,oBAGC,AAAC,UAAS,EAAM,EAAS,CAExB,AAAI,MAAO,SAAW,YAAc,OAAO,IACzC,OAAO,CAAO,EACT,AAAI,MAAO,KAAY,SAC5B,GAAO,QAAU,EAAQ,EAEzB,EAAK,UAAY,EAAQ,CAG7B,GAAG,GAAM,UAAW,CAClB,GAAI,GAAY,CAAC,EAEjB,EAAU,QAAU,QAEpB,GAAI,GAAW,EAAU,SAAW,CAClC,QAAS,IACT,OAAQ,OACR,cAAe,GACf,MAAO,IACP,QAAS,GACT,YAAa,IACb,aAAc,IACd,YAAa,GACb,YAAa,eACb,gBAAiB,mBACjB,OAAQ,OACR,SAAU,qIACZ,EASA,EAAU,UAAY,SAAS,EAAS,CACtC,GAAI,GAAK,EACT,IAAK,IAAO,GACV,EAAQ,EAAQ,GACZ,IAAU,QAAa,EAAQ,eAAe,CAAG,GAAG,GAAS,GAAO,GAG1E,MAAO,KACT,EAMA,EAAU,OAAS,KASnB,EAAU,IAAM,SAAS,EAAG,CAC1B,GAAI,GAAU,EAAU,UAAU,EAElC,EAAI,EAAM,EAAG,EAAS,QAAS,CAAC,EAChC,EAAU,OAAU,IAAM,EAAI,KAAO,EAErC,GAAI,GAAW,EAAU,OAAO,CAAC,CAAO,EACpC,EAAW,EAAS,cAAc,EAAS,WAAW,EACtD,EAAW,EAAS,MACpB,EAAW,EAAS,OAExB,SAAS,YAET,EAAM,SAAS,EAAM,CAEnB,AAAI,EAAS,gBAAkB,IAAI,GAAS,cAAgB,EAAU,kBAAkB,GAGxF,EAAI,EAAK,EAAe,EAAG,EAAO,CAAI,CAAC,EAEvC,AAAI,IAAM,EAER,GAAI,EAAU,CACZ,WAAY,OACZ,QAAS,CACX,CAAC,EACD,EAAS,YAET,WAAW,UAAW,CACpB,EAAI,EAAU,CACZ,WAAY,OAAS,EAAQ,YAC7B,QAAS,CACX,CAAC,EACD,WAAW,UAAW,CACpB,EAAU,OAAO,EACjB,EAAK,CACP,EAAG,CAAK,CACV,EAAG,CAAK,GAER,WAAW,EAAM,CAAK,CAE1B,CAAC,EAEM,IACT,EAEA,EAAU,UAAY,UAAW,CAC/B,MAAO,OAAO,GAAU,QAAW,QACrC,EASA,EAAU,MAAQ,UAAW,CAC3B,AAAK,EAAU,QAAQ,EAAU,IAAI,CAAC,EAEtC,GAAI,GAAO,UAAW,CACpB,WAAW,UAAW,CACpB,AAAI,CAAC,EAAU,QACf,GAAU,QAAQ,EAClB,EAAK,EACP,EAAG,EAAS,YAAY,CAC1B,EAEA,MAAI,GAAS,SAAS,EAAK,EAEpB,IACT,EAcA,EAAU,KAAO,SAAS,EAAO,CAC/B,MAAI,CAAC,GAAS,CAAC,EAAU,OAAe,KAEjC,EAAU,IAAI,GAAM,GAAM,KAAK,OAAO,CAAC,EAAE,IAAI,CAAC,CACvD,EAMA,EAAU,IAAM,SAAS,EAAQ,CAC/B,GAAI,GAAI,EAAU,OAElB,MAAK,GAGC,OAAO,IAAW,UACpB,GAAU,GAAI,GAAK,EAAM,KAAK,OAAO,EAAI,EAAG,GAAK,GAAI,GAGvD,EAAI,EAAM,EAAI,EAAQ,EAAG,IAAK,EACvB,EAAU,IAAI,CAAC,GAPf,EAAU,MAAM,CAS3B,EAEA,EAAU,QAAU,UAAW,CAC7B,MAAO,GAAU,IAAI,KAAK,OAAO,EAAI,EAAS,WAAW,CAC3D,EAQC,UAAW,CACV,GAAI,GAAU,EAAG,EAAU,EAE3B,EAAU,QAAU,SAAS,EAAU,CACrC,MAAI,CAAC,GAAY,EAAS,MAAM,IAAM,WAC7B,KAGL,KAAY,GACd,EAAU,MAAM,EAGlB,IACA,IAEA,EAAS,OAAO,UAAW,CACzB,IACA,AAAI,IAAY,EACZ,GAAU,EACV,EAAU,KAAK,GAEf,EAAU,IAAK,GAAU,GAAW,CAAO,CAEjD,CAAC,EAEM,KACT,CAEF,EAAG,EAOH,EAAU,OAAS,SAAS,EAAW,CACrC,GAAI,EAAU,WAAW,EAAG,MAAO,UAAS,eAAe,WAAW,EAEtE,EAAS,SAAS,gBAAiB,gBAAgB,EAEnD,GAAI,GAAW,SAAS,cAAc,KAAK,EAC3C,EAAS,GAAK,YACd,EAAS,UAAY,EAAS,SAE9B,GAAI,GAAW,EAAS,cAAc,EAAS,WAAW,EACtD,EAAW,EAAY,OAAS,EAAU,EAAU,QAAU,CAAC,EAC/D,EAAW,SAAS,cAAc,EAAS,MAAM,EACjD,EAEJ,SAAI,EAAK,CACP,WAAY,eACZ,UAAW,eAAiB,EAAO,QACrC,CAAC,EAEI,EAAS,aACZ,GAAU,EAAS,cAAc,EAAS,eAAe,EACzD,GAAW,EAAc,CAAO,GAG9B,GAAU,SAAS,MACrB,EAAS,EAAQ,yBAAyB,EAG5C,EAAO,YAAY,CAAQ,EACpB,CACT,EAMA,EAAU,OAAS,UAAW,CAC5B,EAAY,SAAS,gBAAiB,gBAAgB,EACtD,EAAY,SAAS,cAAc,EAAS,MAAM,EAAG,yBAAyB,EAC9E,GAAI,GAAW,SAAS,eAAe,WAAW,EAClD,GAAY,EAAc,CAAQ,CACpC,EAMA,EAAU,WAAa,UAAW,CAChC,MAAO,CAAC,CAAC,SAAS,eAAe,WAAW,CAC9C,EAMA,EAAU,kBAAoB,UAAW,CAEvC,GAAI,GAAY,SAAS,KAAK,MAG1B,EAAgB,mBAAqB,GAAa,SAClC,gBAAkB,GAAa,MAC/B,eAAiB,GAAa,KAC9B,cAAgB,GAAa,IAAM,GAEvD,MAAI,GAAe,eAAiB,GAE3B,cACE,EAAe,aAAe,GAEhC,YAGA,QAEX,EAMA,WAAe,EAAG,EAAK,EAAK,CAC1B,MAAI,GAAI,EAAY,EAChB,EAAI,EAAY,EACb,CACT,CAOA,WAAmB,EAAG,CACpB,MAAQ,IAAK,GAAK,GACpB,CAQA,WAAwB,EAAG,EAAO,EAAM,CACtC,GAAI,GAEJ,MAAI,GAAS,gBAAkB,cAC7B,EAAS,CAAE,UAAW,eAAe,EAAU,CAAC,EAAE,QAAS,EACtD,AAAI,EAAS,gBAAkB,YACpC,EAAS,CAAE,UAAW,aAAa,EAAU,CAAC,EAAE,MAAO,EAEvD,EAAS,CAAE,cAAe,EAAU,CAAC,EAAE,GAAI,EAG7C,EAAO,WAAa,OAAO,EAAM,MAAM,EAEhC,CACT,CAMA,GAAI,GAAS,UAAW,CACtB,GAAI,GAAU,CAAC,EAEf,YAAgB,CACd,GAAI,GAAK,EAAQ,MAAM,EACvB,AAAI,GACF,EAAG,CAAI,CAEX,CAEA,MAAO,UAAS,EAAI,CAClB,EAAQ,KAAK,CAAE,EACX,EAAQ,QAAU,GAAG,EAAK,CAChC,CACF,EAAG,EAUC,EAAO,UAAW,CACpB,GAAI,GAAc,CAAE,SAAU,IAAK,MAAO,IAAK,EAC3C,EAAc,CAAC,EAEnB,WAAmB,EAAQ,CACzB,MAAO,GAAO,QAAQ,QAAS,KAAK,EAAE,QAAQ,eAAgB,SAAS,EAAO,EAAQ,CACpF,MAAO,GAAO,YAAY,CAC5B,CAAC,CACH,CAEA,WAAuB,EAAM,CAC3B,GAAI,GAAQ,SAAS,KAAK,MAC1B,GAAI,IAAQ,GAAO,MAAO,GAK1B,OAHI,GAAI,EAAY,OAChB,EAAU,EAAK,OAAO,CAAC,EAAE,YAAY,EAAI,EAAK,MAAM,CAAC,EACrD,EACG,KAEL,GADA,EAAa,EAAY,GAAK,EAC1B,IAAc,GAAO,MAAO,GAGlC,MAAO,EACT,CAEA,WAAsB,EAAM,CAC1B,SAAO,EAAU,CAAI,EACd,EAAS,IAAU,GAAS,GAAQ,EAAc,CAAI,EAC/D,CAEA,WAAkB,EAAS,EAAM,EAAO,CACtC,EAAO,EAAa,CAAI,EACxB,EAAQ,MAAM,GAAQ,CACxB,CAEA,MAAO,UAAS,EAAS,EAAY,CACnC,GAAI,GAAO,UACP,EACA,EAEJ,GAAI,EAAK,QAAU,EACjB,IAAK,IAAQ,GACX,EAAQ,EAAW,GACf,IAAU,QAAa,EAAW,eAAe,CAAI,GAAG,EAAS,EAAS,EAAM,CAAK,MAG3F,GAAS,EAAS,EAAK,GAAI,EAAK,EAAE,CAEtC,CACF,EAAG,EAMH,WAAkB,EAAS,EAAM,CAC/B,GAAI,GAAO,MAAO,IAAW,SAAW,EAAU,EAAU,CAAO,EACnE,MAAO,GAAK,QAAQ,IAAM,EAAO,GAAG,GAAK,CAC3C,CAMA,WAAkB,EAAS,EAAM,CAC/B,GAAI,GAAU,EAAU,CAAO,EAC3B,EAAU,EAAU,EAExB,AAAI,EAAS,EAAS,CAAI,GAG1B,GAAQ,UAAY,EAAQ,UAAU,CAAC,EACzC,CAMA,WAAqB,EAAS,EAAM,CAClC,GAAI,GAAU,EAAU,CAAO,EAC3B,EAEJ,AAAI,CAAC,EAAS,EAAS,CAAI,GAG3B,GAAU,EAAQ,QAAQ,IAAM,EAAO,IAAK,GAAG,EAG/C,EAAQ,UAAY,EAAQ,UAAU,EAAG,EAAQ,OAAS,CAAC,EAC7D,CAQA,WAAmB,EAAS,CAC1B,MAAQ,KAAO,GAAQ,WAAa,IAAM,KAAK,QAAQ,QAAS,GAAG,CACrE,CAMA,WAAuB,EAAS,CAC9B,GAAW,EAAQ,YAAc,EAAQ,WAAW,YAAY,CAAO,CACzE,CAEA,MAAO,EACT,CAAC,ICzdM,GAAM,IAAN,KAAU,CACb,aAAc,CAAE,KAAK,OAAS,CAAC,CAAE,CAEjC,IAAI,EAAK,EAAO,CACZ,AAAM,KAAK,OAAO,IAAM,MAAK,OAAO,GAAO,CAAC,GAC5C,KAAK,OAAO,GAAK,KAAK,CAAK,CAC/B,CAEA,OAAO,EAAK,CACR,AAAI,KAAK,OAAO,IAAM,MAAO,MAAK,OAAO,EAC7C,CAEA,IAAI,EAAK,CAAE,MAAO,MAAK,OAAO,IAAQ,CAAC,CAAE,CAEzC,KAAK,EAAK,EAAU,CAAE,MAAO,MAAK,IAAI,CAAG,EAAE,QAAQ,CAAQ,CAAE,CACjE,EAEa,GAAN,KAAc,CACjB,aAAc,CAAE,KAAK,OAAS,GAAI,QAAQ,CAE1C,IAAI,EAAK,EAAO,CACZ,AAAM,KAAK,OAAO,IAAI,CAAG,GAAG,KAAK,OAAO,IAAI,EAAK,CAAC,CAAC,EACnD,KAAK,OAAO,IAAI,CAAG,EAAE,KAAK,CAAK,CACnC,CAEA,OAAO,EAAK,CACR,AAAI,KAAK,OAAO,IAAI,CAAG,GAAG,KAAK,OAAO,OAAO,EAAK,CAAC,CAAC,CACxD,CAEA,IAAI,EAAK,CAAE,MAAO,MAAK,OAAO,IAAI,CAAG,EAAI,KAAK,OAAO,IAAI,CAAG,EAAI,CAAC,CAAE,CAEnE,KAAK,EAAK,EAAU,CAAE,MAAO,MAAK,IAAI,CAAG,EAAE,QAAQ,CAAQ,CAAE,CACjE,EAEO,YAAkB,EAAQ,EAAM,EAAS,CAAC,EAAG,EAAU,GAAM,CAChE,EAAO,cACH,GAAI,aAAY,EAAM,CAClB,SACA,UAEA,SAAU,GACV,WAAY,EAChB,CAAC,CACL,CACJ,CAEO,YAAgB,EAAQ,EAAM,EAAS,CAC1C,SAAO,iBAAiB,EAAM,CAAO,EAE9B,IAAM,EAAO,oBAAoB,EAAM,CAAO,CACzD,CAKO,YAAmB,EAAS,CAAE,MAAQ,OAAO,IAAY,UAAY,IAAY,IAAM,CACvF,YAAkB,EAAS,CAAE,MAAQ,IAAU,CAAO,GAAK,CAAE,GAAQ,CAAO,CAAG,CAC/E,YAAiB,EAAS,CAAE,MAAO,OAAM,QAAQ,CAAO,CAAE,CAC1D,YAAoB,EAAS,CAAE,MAAO,OAAO,IAAY,UAAW,CACpE,YAAqB,EAAS,CAAE,MAAO,OAAO,IAAY,UAAY,IAAY,IAAK,CAKvF,YAAmB,EAAK,CAAE,MAAO,MAAK,MAAM,KAAK,UAAU,CAAG,CAAC,CAAE,CAiBjE,WAAiB,EAAQ,EAAK,CACjC,MAAI,KAAQ,GAAW,EAEhB,EAAI,MAAM,GAAG,EAAE,OAAO,CAAC,EAAO,IAAM,CACvC,GAAI,IAAU,OAEd,MAAO,GAAM,EACjB,EAAG,CAAM,CACb,CAKO,YAAiB,EAAQ,EAAK,EAAO,CACxC,GAAI,GAAW,EAAI,MAAM,GAAG,EAE5B,GAAI,EAAS,SAAW,EACpB,MAAO,GAAO,GAAO,EAGzB,GAAI,GAAe,EAAS,MAAM,EAC9B,EAAiB,EAAS,KAAK,GAAG,EAEtC,AAAI,EAAO,KAAkB,QACzB,GAAO,GAAgB,CAAC,GAG5B,GAAQ,EAAO,GAAe,EAAgB,CAAK,CACvD,CAKO,YAAc,EAAM,EAAO,EAAQ,CAAC,EAAG,EAAO,GAAI,CAErD,GAAI,IAAS,EAAO,MAAO,GAS3B,GANI,MAAO,IAAS,MAAO,IAAU,GAAS,CAAI,GAAK,GAAQ,CAAK,GAAO,GAAQ,CAAI,GAAK,GAAS,CAAK,GAMtG,GAAY,CAAI,GAAK,GAAY,CAAK,EACtC,SAAM,GAAQ,EACP,EAIX,GAAI,GAAW,OAAO,KAAK,CAAI,EAG/B,cAAO,QAAQ,CAAK,EAAE,QAAQ,CAAC,CAAC,EAAK,KAAW,CAC5C,EAAQ,CAAC,GAAG,EAAO,GAAG,GAAK,EAAK,GAAM,EAAM,GAAM,EAAO,IAAS,GAAK,EAAM,GAAG,KAAQ,GAAK,CAAC,EAC9F,EAAW,EAAS,OAAO,GAAK,IAAM,CAAG,CAC7C,CAAC,EAGD,EAAS,QAAQ,GAAO,CACpB,EAAM,GAAG,KAAQ,KAAS,QAC9B,CAAC,EAEM,CACX,CAOO,YAAqB,EAAS,CACjC,GAAI,GAAQ,GAAY,CAAO,EAAI,EAAQ,GAAK,EAC5C,EAAO,GAAY,CAAO,EAAI,EAAQ,GAAK,OAE/C,MAAI,IAAU,CAAK,GACf,OAAO,QAAQ,CAAK,EAAE,QAAQ,CAAC,CAAC,EAAK,KAAY,CAC7C,EAAM,GAAO,GAAY,CAAM,CACnC,CAAC,EAGE,CACX,CAMO,YAAqB,EAAS,CACjC,MAAO,OAAM,QAAQ,CAAO,GACrB,EAAQ,SAAW,GACnB,MAAO,GAAQ,IAAO,UACtB,OAAO,KAAK,EAAQ,EAAE,EAAE,SAAS,GAAG,CAC/C,CAMO,aAAwB,CAI3B,GAAI,SAAS,cAAc,yBAAyB,EAChD,MAAO,UAAS,cAAc,yBAAyB,EAAE,aAAa,SAAS,EAGnF,GAAI,SAAS,cAAc,aAAa,EACpC,MAAO,UAAS,cAAc,aAAa,EAAE,aAAa,WAAW,EAGzE,GAAI,OAAO,qBAAqB,MAAW,GACvC,MAAO,QAAO,qBAAqB,KAGvC,KAAM,kCACV,CAEA,GAAI,IAEG,aAAoB,CACvB,GAAI,GAAO,MAAO,IAGlB,GAAI,OAAO,sBAAyB,QAAO,qBAAqB,OAAY,IACxE,UAAQ,OAAO,qBAAqB,MAE7B,GAGX,GAAM,GAAc,SAAS,cAAc,mCAAmC,EAE9E,MAAI,GACA,IAAQ,EAAY,MAEb,IAGJ,IACX,CAKO,aAAwB,CAC3B,MAAO,UAAS,cAAc,mBAAmB,GAAG,aAAa,iBAAiB,GAAK,OAAO,qBAAqB,KAAU,IACjI,CAEO,YAA2B,EAAS,CACvC,MAAO,CAAC,CAAE,EAAQ,MAAM,kCAAkC,CAC9D,CAEO,YAA8B,EAAS,CAC1C,GAAI,GAAO,EAAQ,MAAM,qCAAqC,EAE9D,MAAO,CAAC,EAAM,EAAQ,QAAQ,EAAM,EAAE,CAAC,CAC3C,CC5OA,GAAI,IAAiB,GAAI,SAEzB,YAA0B,EAAW,CACjC,GAAI,CAAE,GAAe,IAAI,CAAS,EAAG,CACjC,GAAI,GAAU,GAAI,IAAc,CAAS,EAEzC,GAAe,IAAI,EAAW,CAAO,EAErC,EAAQ,kBAAkB,CAC9B,CAEA,MAAO,IAAe,IAAI,CAAS,CACvC,CAEO,YAA0B,EAAI,EAAU,EAAW,EAAS,CAC/D,GAAI,GAAU,GAAiB,CAAS,EAEpC,EAAQ,IAAM,EAAG,cAAc,GAAI,aAAY,wBAAyB,CAAE,QAAS,GAAM,OAAQ,CAAE,GAAI,EAAU,GAAI,UAAQ,CAAE,CAAC,CAAC,EACjI,EAAS,IAAM,EAAG,cAAc,GAAI,aAAY,yBAA0B,CAAE,QAAS,GAAM,OAAQ,CAAE,GAAI,EAAU,GAAI,UAAQ,CAAE,CAAC,CAAC,EACnI,EAAQ,IAAM,EAAG,cAAc,GAAI,aAAY,wBAAyB,CAAE,QAAS,GAAM,OAAQ,CAAE,GAAI,EAAU,GAAI,UAAQ,CAAE,CAAC,CAAC,EACjI,EAAS,IAAM,EAAG,cAAc,GAAI,aAAY,yBAA0B,CAAE,QAAS,GAAM,OAAQ,CAAE,GAAI,EAAU,GAAI,UAAQ,CAAE,CAAC,CAAC,EACnI,EAAW,AAAC,GAAkB,CAC9B,GAAI,GAAmB,KAAK,MAAQ,EAAc,OAAS,IAAO,EAAc,KAAM,EAEtF,EAAG,cACC,GAAI,aAAY,2BAA4B,CACxC,QAAS,GAAM,OAAQ,CAAE,SAAU,CAAiB,CACxD,CAAC,CACL,CACJ,EAEI,EAAe,GAAK,CACpB,AAAI,EAAE,OAAO,MAAM,SAAW,GAE9B,GAAM,EAEN,AAAI,EAAE,OAAO,SACT,EAAQ,eAAe,EAAU,EAAE,OAAO,MAAO,EAAQ,EAAO,EAAU,CAAM,EAEhF,EAAQ,OAAO,EAAU,EAAE,OAAO,MAAM,GAAI,EAAQ,EAAO,EAAU,CAAM,EAEnF,EAEA,EAAG,iBAAiB,SAAU,CAAY,EAG1C,EAAU,MAAM,OAAO,EAAU,AAAC,GAAU,CAIxC,AAAI,CAAE,EAAG,aAEL,KAAU,MAAQ,IAAU,KAC5B,GAAG,MAAQ,GAEnB,CAAC,EAKD,GAAI,GAAsB,IAAM,CAAE,EAAG,MAAQ,IAAK,EAClD,EAAG,iBAAiB,QAAS,CAAmB,EAGhD,EAAG,iBAAiB,yBAA0B,CAAmB,EAEjE,EAAQ,IAAM,CACV,EAAG,oBAAoB,SAAU,CAAY,EAC7C,EAAG,oBAAoB,QAAS,CAAmB,CACvD,CAAC,CACL,CAEA,GAAM,IAAN,KAAoB,CAChB,YAAY,EAAW,CACnB,KAAK,UAAY,EACjB,KAAK,UAAY,GAAI,IACrB,KAAK,UAAY,GAAI,GACzB,CAEA,mBAAoB,CAChB,KAAK,UAAU,MAAM,IAAI,4BAA6B,CAAC,CAAE,OAAM,SAAU,CAIrE,AAAiB,KAAK,UAEtB,KAAK,gBAAgB,EAAM,CAAG,CAClC,CAAC,EAED,KAAK,UAAU,MAAM,IAAI,iCAAkC,CAAC,CAAE,OAAM,aAAc,CAC9E,AAAiB,KAAK,UAEtB,KAAK,qBAAqB,EAAM,CAAO,CAC3C,CAAC,EAED,KAAK,UAAU,MAAM,IAAI,kBAAmB,CAAC,CAAE,OAAM,kBAAmB,KAAK,mBAAmB,EAAM,CAAY,CAAC,EACnH,KAAK,UAAU,MAAM,IAAI,iBAAkB,CAAC,CAAE,UAAW,KAAK,kBAAkB,CAAI,CAAC,EACrF,KAAK,UAAU,MAAM,IAAI,iBAAkB,CAAC,CAAE,OAAM,iBAAkB,KAAK,UAAU,MAAM,CAAI,EAAE,eAAe,CAAW,CAAC,CAChI,CAEA,OAAO,EAAM,EAAM,EAAgB,EAAe,EAAkB,EAAmB,CACnF,KAAK,UAAU,EAAM,CACjB,MAAO,CAAC,CAAI,EACZ,SAAU,GACV,iBACA,gBACA,mBACA,mBACJ,CAAC,CACL,CAEA,eAAe,EAAM,EAAO,EAAgB,EAAe,EAAkB,EAAmB,CAC5F,KAAK,UAAU,EAAM,CACjB,MAAO,MAAM,KAAK,CAAK,EACvB,SAAU,GACV,iBACA,gBACA,mBACA,mBACJ,CAAC,CACL,CAEA,aAAa,EAAM,EAAa,EAAgB,CAC5C,KAAK,UAAU,KAAK,EAAM,CACtB,cAAa,gBACjB,CAAC,EAED,KAAK,UAAU,MAAM,KAAK,gBAAiB,EAAM,CAAW,CAChE,CAEA,UAAU,EAAM,EAAc,CAC1B,KAAK,UAAU,IAAI,EAAM,CAAY,EAEjC,KAAK,UAAU,IAAI,CAAI,EAAE,SAAW,GACpC,KAAK,YAAY,EAAM,CAAY,CAE3C,CAEA,gBAAgB,EAAM,EAAK,CACvB,GAAI,GAAW,GAAI,UACnB,MAAM,KAAK,KAAK,UAAU,MAAM,CAAI,EAAE,KAAK,EAAE,QAAQ,GAAQ,EAAS,OAAO,UAAW,EAAM,EAAK,IAAI,CAAC,EAExG,GAAI,GAAU,CACV,OAAU,kBACd,EAEI,EAAY,GAAa,EAE7B,AAAI,GAAW,GAAQ,gBAAkB,GAEzC,KAAK,YAAY,EAAM,EAAU,OAAQ,EAAK,EAAS,GAC5C,EAAS,KACnB,CACL,CAEA,qBAAqB,EAAM,EAAS,CAChC,GAAI,GAAW,KAAK,UAAU,MAAM,CAAI,EAAE,MAAM,GAE5C,EAAU,EAAQ,QACtB,AAAI,QAAU,IAAS,MAAO,GAAQ,KACtC,GAAI,GAAM,EAAQ,IAElB,KAAK,YAAY,EAAM,EAAU,MAAO,EAAK,EAAS,GAC3C,CAAC,EAAQ,IAAI,CACvB,CACL,CAEA,YAAY,EAAM,EAAU,EAAQ,EAAK,EAAS,EAAe,CAC7D,GAAI,GAAU,GAAI,gBAElB,EAAQ,KAAK,EAAQ,CAAG,EAExB,OAAO,QAAQ,CAAO,EAAE,QAAQ,CAAC,CAAC,EAAK,KAAW,CAC9C,EAAQ,iBAAiB,EAAK,CAAK,CACvC,CAAC,EAED,EAAQ,OAAO,iBAAiB,WAAY,GAAK,CAC7C,EAAE,OAAS,CAAC,EACZ,EAAE,OAAO,SAAW,KAAK,MAAO,EAAE,OAAS,IAAO,EAAE,KAAK,EAEzD,KAAK,UAAU,MAAM,CAAI,EAAE,iBAAiB,CAAC,CACjD,CAAC,EAED,EAAQ,iBAAiB,OAAQ,IAAM,CACnC,GAAK,GAAQ,OAAO,IAAI,KAAO,IAAK,CAChC,GAAI,GAAQ,EAAc,EAAQ,UAAY,KAAK,MAAM,EAAQ,QAAQ,CAAC,EAE1E,KAAK,UAAU,MAAM,KAAK,gBAAiB,EAAM,EAAO,KAAK,UAAU,MAAM,CAAI,EAAE,QAAQ,EAE3F,MACJ,CAEA,GAAI,GAAS,KAEb,AAAI,EAAQ,SAAW,KACnB,GAAS,EAAQ,UAGrB,KAAK,UAAU,MAAM,KAAK,iBAAkB,EAAM,EAAQ,KAAK,UAAU,MAAM,CAAI,EAAE,QAAQ,CACjG,CAAC,EAED,KAAK,UAAU,MAAM,CAAI,EAAE,QAAU,EAErC,EAAQ,KAAK,CAAQ,CACzB,CAEA,YAAY,EAAM,EAAc,CAC5B,GAAI,GAAY,EAAa,MAAM,IAAI,GAC5B,EAAE,KAAM,EAAK,KAAM,KAAM,EAAK,KAAM,KAAM,EAAK,IAAK,EAC9D,EAED,KAAK,UAAU,MAAM,KAAK,eAAgB,EAAM,EAAW,EAAa,QAAQ,EAE/D,KAAK,SAC1B,CAEA,mBAAmB,EAAM,EAAc,CACnC,AAAmB,KAAK,UAExB,GAAI,GAAe,KAAK,UAAU,MAAM,CAAI,EAC5C,EAAa,eAAe,EAAa,SAAW,EAAe,EAAa,EAAE,EAE9E,KAAK,UAAU,IAAI,CAAI,EAAE,OAAS,GAAG,KAAK,YAAY,EAAM,KAAK,UAAU,KAAK,CAAI,CAAC,CAC7F,CAEA,kBAAkB,EAAM,CACpB,AAAmB,KAAK,UAExB,KAAK,UAAU,MAAM,CAAI,EAAE,cAAc,EAErC,KAAK,UAAU,IAAI,CAAI,EAAE,OAAS,GAAG,KAAK,YAAY,EAAM,KAAK,UAAU,KAAK,CAAI,CAAC,CAC7F,CAEA,aAAa,EAAM,EAAoB,KAAM,CACzC,AAAmB,KAAK,UAExB,GAAI,GAAa,KAAK,UAAU,MAAM,CAAI,EAE1C,AAAI,GACI,GAAW,SACX,EAAW,QAAQ,MAAM,EAG7B,KAAK,UAAU,MAAM,CAAI,EAAE,kBAAkB,EAEzC,GAAmB,EAAkB,EAEjD,CACJ,EAEqB,GAArB,KAAgC,CAC5B,aAAc,CACV,KAAK,IAAM,CAAC,CAChB,CAEA,IAAI,EAAM,EAAO,CACb,AAAM,KAAK,IAAI,IACX,MAAK,IAAI,GAAQ,CAAC,GAGtB,KAAK,IAAI,GAAM,KAAK,CAAK,CAC7B,CAEA,KAAK,EAAM,EAAO,CACd,KAAK,IAAI,EAAM,CAAK,CACxB,CAEA,MAAM,EAAM,CACR,MAAM,MAAK,IAAI,GAER,KAAK,IAAI,GAAM,GAFO,IAGjC,CAEA,KAAK,EAAM,CACP,MAAO,MAAK,IAAI,GAAM,MAAM,EAAE,EAAE,EACpC,CAEA,IAAI,EAAM,CACN,MAAO,MAAK,IAAI,EACpB,CAEA,MAAM,EAAM,CACR,MAAO,MAAK,IAAI,GAAM,MAAM,CAChC,CAEA,KAAK,KAAS,EAAQ,CAClB,AAAC,MAAK,UAAU,IAAS,CAAC,GAAG,QAAQ,GAAY,CAC7C,EAAS,GAAG,CAAM,CACtB,CAAC,CACL,CAEA,IAAI,EAAM,CACN,MAAO,QAAO,KAAK,KAAK,SAAS,EAAE,SAAS,CAAI,CACpD,CACJ,EAUO,YACH,EACA,EACA,EACA,EAAiB,IAAM,CAAE,EACzB,EAAgB,IAAM,CAAE,EACxB,EAAmB,IAAM,CAAE,EAC3B,EAAoB,IAAM,CAAE,EAC9B,CAGE,AAFoB,GAAiB,CAAS,EAEhC,OACV,EACA,EACA,EACA,EACA,EACA,CACJ,CACJ,CAEO,YACH,EACA,EACA,EACA,EAAiB,IAAM,CAAE,EACzB,EAAgB,IAAM,CAAE,EACxB,EAAmB,IAAM,CAAE,EAC3B,EAAoB,IAAM,CAAE,EAC9B,CAGE,AAFoB,GAAiB,CAAS,EAEhC,eACV,EACA,EACA,EACA,EACA,EACA,CACJ,CACJ,CAEO,YACH,EACA,EACA,EACA,EAAiB,IAAM,CAAE,EACzB,EAAgB,IAAM,CAAE,EAC1B,CAGE,AAFoB,GAAiB,CAAS,EAEhC,aACV,EACA,EACA,EACA,CACJ,CACJ,CAEO,YACH,EACA,EACA,EAAoB,IAAM,CAAE,EAC9B,CAGE,AAFoB,GAAiB,CAAS,EAEhC,aACV,EACA,CACJ,CACJ,CCvXA,GAAI,IAAe,GACf,GAAW,GACX,GAAQ,CAAC,EACT,GAAmB,GACvB,YAAmB,EAAU,CAC3B,GAAS,CAAQ,CACnB,CACA,YAAkB,EAAK,CACrB,AAAK,GAAM,SAAS,CAAG,GACrB,GAAM,KAAK,CAAG,EAChB,GAAW,CACb,CACA,YAAoB,EAAK,CACvB,GAAI,GAAQ,GAAM,QAAQ,CAAG,EAC7B,AAAI,IAAU,IAAM,EAAQ,IAC1B,GAAM,OAAO,EAAO,CAAC,CACzB,CACA,aAAsB,CACpB,AAAI,CAAC,IAAY,CAAC,IAChB,IAAe,GACf,eAAe,EAAS,EAE5B,CACA,aAAqB,CACnB,GAAe,GACf,GAAW,GACX,OAAS,GAAI,EAAG,EAAI,GAAM,OAAQ,IAChC,GAAM,GAAG,EACT,GAAmB,EAErB,GAAM,OAAS,EACf,GAAmB,GACnB,GAAW,EACb,CAGA,GAAI,IACA,GACA,GACA,GACA,GAAiB,GACrB,YAAiC,EAAU,CACzC,GAAiB,GACjB,EAAS,EACT,GAAiB,EACnB,CACA,YAA6B,EAAQ,CACnC,GAAW,EAAO,SAClB,GAAU,EAAO,QACjB,GAAS,AAAC,GAAa,EAAO,OAAO,EAAU,CAAE,UAAW,AAAC,GAAS,CACpE,AAAI,GACF,GAAU,CAAI,EAEd,EAAK,CAET,CAAE,CAAC,EACH,GAAM,EAAO,GACf,CACA,YAAwB,EAAU,CAChC,GAAS,CACX,CACA,YAA4B,EAAI,CAC9B,GAAI,GAAW,IAAM,CACrB,EAkBA,MAAO,CAjBa,AAAC,GAAa,CAChC,GAAI,GAAkB,GAAO,CAAQ,EACrC,MAAK,GAAG,YACN,GAAG,WAA6B,GAAI,KACpC,EAAG,cAAgB,IAAM,CACvB,EAAG,WAAW,QAAQ,AAAC,GAAM,EAAE,CAAC,CAClC,GAEF,EAAG,WAAW,IAAI,CAAe,EACjC,EAAW,IAAM,CACf,AAAI,IAAoB,QAExB,GAAG,WAAW,OAAO,CAAe,EACpC,GAAQ,CAAe,EACzB,EACO,CACT,EACuB,IAAM,CAC3B,EAAS,CACX,CAAC,CACH,CACA,YAAe,EAAQ,EAAU,CAC/B,GAAI,GAAY,GACZ,EACA,EAAkB,GAAO,IAAM,CACjC,GAAI,GAAQ,EAAO,EACnB,KAAK,UAAU,CAAK,EACpB,AAAK,EAMH,EAAW,EALX,eAAe,IAAM,CACnB,EAAS,EAAO,CAAQ,EACxB,EAAW,CACb,CAAC,EAIH,EAAY,EACd,CAAC,EACD,MAAO,IAAM,GAAQ,CAAe,CACtC,CAGA,GAAI,IAAoB,CAAC,EACrB,GAAe,CAAC,EAChB,GAAa,CAAC,EAClB,YAAmB,EAAU,CAC3B,GAAW,KAAK,CAAQ,CAC1B,CACA,YAAqB,EAAI,EAAU,CACjC,AAAI,MAAO,IAAa,WACjB,GAAG,aACN,GAAG,YAAc,CAAC,GACpB,EAAG,YAAY,KAAK,CAAQ,GAE5B,GAAW,EACX,GAAa,KAAK,CAAQ,EAE9B,CACA,YAA2B,EAAU,CACnC,GAAkB,KAAK,CAAQ,CACjC,CACA,YAA4B,EAAI,EAAM,EAAU,CAC9C,AAAK,EAAG,sBACN,GAAG,qBAAuB,CAAC,GACxB,EAAG,qBAAqB,IAC3B,GAAG,qBAAqB,GAAQ,CAAC,GACnC,EAAG,qBAAqB,GAAM,KAAK,CAAQ,CAC7C,CACA,YAA2B,EAAI,EAAO,CACpC,AAAI,CAAC,EAAG,sBAER,OAAO,QAAQ,EAAG,oBAAoB,EAAE,QAAQ,CAAC,CAAC,EAAM,KAAW,CACjE,AAAI,KAAU,QAAU,EAAM,SAAS,CAAI,IACzC,GAAM,QAAQ,AAAC,GAAM,EAAE,CAAC,EACxB,MAAO,GAAG,qBAAqB,GAEnC,CAAC,CACH,CACA,YAAwB,EAAI,CAC1B,GAAI,EAAG,YACL,KAAO,EAAG,YAAY,QACpB,EAAG,YAAY,IAAI,EAAE,CAE3B,CACA,GAAI,IAAW,GAAI,kBAAiB,EAAQ,EACxC,GAAqB,GACzB,aAAmC,CACjC,GAAS,QAAQ,SAAU,CAAE,QAAS,GAAM,UAAW,GAAM,WAAY,GAAM,kBAAmB,EAAK,CAAC,EACxG,GAAqB,EACvB,CACA,aAAkC,CAChC,GAAc,EACd,GAAS,WAAW,EACpB,GAAqB,EACvB,CACA,GAAI,IAAkB,CAAC,EACvB,aAAyB,CACvB,GAAI,GAAU,GAAS,YAAY,EACnC,GAAgB,KAAK,IAAM,EAAQ,OAAS,GAAK,GAAS,CAAO,CAAC,EAClE,GAAI,GAA2B,GAAgB,OAC/C,eAAe,IAAM,CACnB,GAAI,GAAgB,SAAW,EAC7B,KAAO,GAAgB,OAAS,GAC9B,GAAgB,MAAM,EAAE,CAE9B,CAAC,CACH,CACA,WAAmB,EAAU,CAC3B,GAAI,CAAC,GACH,MAAO,GAAS,EAClB,GAAuB,EACvB,GAAI,GAAS,EAAS,EACtB,UAAwB,EACjB,CACT,CACA,GAAI,IAAe,GACf,GAAoB,CAAC,EACzB,aAA0B,CACxB,GAAe,EACjB,CACA,aAA0C,CACxC,GAAe,GACf,GAAS,EAAiB,EAC1B,GAAoB,CAAC,CACvB,CACA,YAAkB,EAAW,CAC3B,GAAI,GAAc,CAChB,GAAoB,GAAkB,OAAO,CAAS,EACtD,MACF,CACA,GAAI,GAA6B,GAAI,KACjC,EAA+B,GAAI,KACnC,EAAkC,GAAI,KACtC,EAAoC,GAAI,KAC5C,OAAS,GAAI,EAAG,EAAI,EAAU,OAAQ,IACpC,GAAI,GAAU,GAAG,OAAO,2BAEpB,GAAU,GAAG,OAAS,aACxB,GAAU,GAAG,WAAW,QAAQ,AAAC,GAAS,EAAK,WAAa,GAAK,EAAW,IAAI,CAAI,CAAC,EACrF,EAAU,GAAG,aAAa,QAAQ,AAAC,GAAS,EAAK,WAAa,GAAK,EAAa,IAAI,CAAI,CAAC,GAEvF,EAAU,GAAG,OAAS,cAAc,CACtC,GAAI,GAAK,EAAU,GAAG,OAClB,EAAO,EAAU,GAAG,cACpB,EAAW,EAAU,GAAG,SACxB,EAAO,IAAM,CACf,AAAK,EAAgB,IAAI,CAAE,GACzB,EAAgB,IAAI,EAAI,CAAC,CAAC,EAC5B,EAAgB,IAAI,CAAE,EAAE,KAAK,CAAE,OAAM,MAAO,EAAG,aAAa,CAAI,CAAE,CAAC,CACrE,EACI,EAAS,IAAM,CACjB,AAAK,EAAkB,IAAI,CAAE,GAC3B,EAAkB,IAAI,EAAI,CAAC,CAAC,EAC9B,EAAkB,IAAI,CAAE,EAAE,KAAK,CAAI,CACrC,EACA,AAAI,EAAG,aAAa,CAAI,GAAK,IAAa,KACxC,EAAK,EACA,AAAI,EAAG,aAAa,CAAI,EAC7B,GAAO,EACP,EAAK,GAEL,EAAO,CAEX,CAEF,EAAkB,QAAQ,CAAC,EAAO,IAAO,CACvC,GAAkB,EAAI,CAAK,CAC7B,CAAC,EACD,EAAgB,QAAQ,CAAC,EAAO,IAAO,CACrC,GAAkB,QAAQ,AAAC,GAAM,EAAE,EAAI,CAAK,CAAC,CAC/C,CAAC,EACD,OAAS,KAAQ,GACf,AAAI,EAAW,IAAI,CAAI,GAEvB,GAAa,QAAQ,AAAC,GAAM,EAAE,CAAI,CAAC,EAErC,EAAW,QAAQ,AAAC,GAAS,CAC3B,EAAK,cAAgB,GACrB,EAAK,UAAY,EACnB,CAAC,EACD,OAAS,KAAQ,GACf,AAAI,EAAa,IAAI,CAAI,GAErB,CAAC,EAAK,aAEV,OAAO,GAAK,cACZ,MAAO,GAAK,UACZ,GAAW,QAAQ,AAAC,GAAM,EAAE,CAAI,CAAC,EACjC,EAAK,UAAY,GACjB,EAAK,cAAgB,IAEvB,EAAW,QAAQ,AAAC,GAAS,CAC3B,MAAO,GAAK,cACZ,MAAO,GAAK,SACd,CAAC,EACD,EAAa,KACb,EAAe,KACf,EAAkB,KAClB,EAAoB,IACtB,CAGA,YAAe,EAAM,CACnB,MAAO,IAAa,GAAiB,CAAI,CAAC,CAC5C,CACA,YAAwB,EAAM,EAAO,EAAe,CAClD,SAAK,aAAe,CAAC,EAAO,GAAG,GAAiB,GAAiB,CAAI,CAAC,EAC/D,IAAM,CACX,EAAK,aAAe,EAAK,aAAa,OAAO,AAAC,GAAM,IAAM,CAAK,CACjE,CACF,CACA,YAA0B,EAAM,CAC9B,MAAI,GAAK,aACA,EAAK,aACV,MAAO,aAAe,YAAc,YAAgB,YAC/C,GAAiB,EAAK,IAAI,EAE9B,EAAK,WAGH,GAAiB,EAAK,UAAU,EAF9B,CAAC,CAGZ,CACA,YAAsB,EAAS,CAC7B,MAAO,IAAI,OAAM,CAAE,SAAQ,EAAG,EAAc,CAC9C,CACA,GAAI,IAAiB,CACnB,QAAQ,CAAE,WAAW,CACnB,MAAO,OAAM,KACX,GAAI,KAAI,EAAQ,QAAQ,AAAC,GAAM,OAAO,KAAK,CAAC,CAAC,CAAC,CAChD,CACF,EACA,IAAI,CAAE,WAAW,EAAM,CACrB,MAAI,IAAQ,OAAO,YACV,GACF,EAAQ,KACb,AAAC,GAAQ,OAAO,UAAU,eAAe,KAAK,EAAK,CAAI,GAAK,QAAQ,IAAI,EAAK,CAAI,CACnF,CACF,EACA,IAAI,CAAE,WAAW,EAAM,EAAW,CAChC,MAAI,IAAQ,SACH,GACF,QAAQ,IACb,EAAQ,KACN,AAAC,GAAQ,QAAQ,IAAI,EAAK,CAAI,CAChC,GAAK,CAAC,EACN,EACA,CACF,CACF,EACA,IAAI,CAAE,WAAW,EAAM,EAAO,EAAW,CACvC,GAAM,GAAS,EAAQ,KACrB,AAAC,GAAQ,OAAO,UAAU,eAAe,KAAK,EAAK,CAAI,CACzD,GAAK,EAAQ,EAAQ,OAAS,GACxB,EAAa,OAAO,yBAAyB,EAAQ,CAAI,EAC/D,MAAI,IAAY,KAAO,GAAY,IAC1B,EAAW,IAAI,KAAK,EAAW,CAAK,GAAK,GAC3C,QAAQ,IAAI,EAAQ,EAAM,CAAK,CACxC,CACF,EACA,aAA2B,CAEzB,MAAO,AADI,SAAQ,QAAQ,IAAI,EACnB,OAAO,CAAC,EAAK,IACvB,GAAI,GAAO,QAAQ,IAAI,KAAM,CAAG,EACzB,GACN,CAAC,CAAC,CACP,CAGA,YAA0B,EAAO,CAC/B,GAAI,GAAY,AAAC,GAAQ,MAAO,IAAQ,UAAY,CAAC,MAAM,QAAQ,CAAG,GAAK,IAAQ,KAC/E,EAAU,CAAC,EAAK,EAAW,KAAO,CACpC,OAAO,QAAQ,OAAO,0BAA0B,CAAG,CAAC,EAAE,QAAQ,CAAC,CAAC,EAAK,CAAE,QAAO,iBAAkB,CAG9F,GAFI,IAAe,IAAS,IAAU,QAElC,MAAO,IAAU,UAAY,IAAU,MAAQ,EAAM,SACvD,OACF,GAAI,GAAO,IAAa,GAAK,EAAM,GAAG,KAAY,IAClD,AAAI,MAAO,IAAU,UAAY,IAAU,MAAQ,EAAM,eACvD,EAAI,GAAO,EAAM,WAAW,EAAO,EAAM,CAAG,EAExC,EAAU,CAAK,GAAK,IAAU,GAAO,CAAE,aAAiB,WAC1D,EAAQ,EAAO,CAAI,CAGzB,CAAC,CACH,EACA,MAAO,GAAQ,CAAK,CACtB,CACA,YAAqB,EAAU,EAAY,IAAM,CACjD,EAAG,CACD,GAAI,GAAM,CACR,aAAc,OACd,eAAgB,GAChB,WAAW,EAAO,EAAM,EAAK,CAC3B,MAAO,GAAS,KAAK,aAAc,IAAM,GAAI,EAAO,CAAI,EAAG,AAAC,GAAU,GAAI,EAAO,EAAM,CAAK,EAAG,EAAM,CAAG,CAC1G,CACF,EACA,SAAU,CAAG,EACN,AAAC,GAAiB,CACvB,GAAI,MAAO,IAAiB,UAAY,IAAiB,MAAQ,EAAa,eAAgB,CAC5F,GAAI,GAAa,EAAI,WAAW,KAAK,CAAG,EACxC,EAAI,WAAa,CAAC,EAAO,EAAM,IAAQ,CACrC,GAAI,GAAa,EAAa,WAAW,EAAO,EAAM,CAAG,EACzD,SAAI,aAAe,EACZ,EAAW,EAAO,EAAM,CAAG,CACpC,CACF,KACE,GAAI,aAAe,EAErB,MAAO,EACT,CACF,CACA,YAAa,EAAK,EAAM,CACtB,MAAO,GAAK,MAAM,GAAG,EAAE,OAAO,CAAC,EAAO,IAAY,EAAM,GAAU,CAAG,CACvE,CACA,YAAa,EAAK,EAAM,EAAO,CAG7B,GAFI,MAAO,IAAS,UAClB,GAAO,EAAK,MAAM,GAAG,GACnB,EAAK,SAAW,EAClB,EAAI,EAAK,IAAM,MACZ,IAAI,EAAK,SAAW,EACvB,KAAM,OAEN,MAAI,GAAI,EAAK,KAGX,GAAI,EAAK,IAAM,CAAC,GACT,GAAI,EAAI,EAAK,IAAK,EAAK,MAAM,CAAC,EAAG,CAAK,EAGnD,CAGA,GAAI,IAAS,CAAC,EACd,WAAe,EAAM,EAAU,CAC7B,GAAO,GAAQ,CACjB,CACA,YAAsB,EAAK,EAAI,CAC7B,cAAO,QAAQ,EAAM,EAAE,QAAQ,CAAC,CAAC,EAAM,KAAc,CACnD,GAAI,GAAoB,KACxB,YAAwB,CACtB,GAAI,EACF,MAAO,GACF,CACL,GAAI,CAAC,EAAW,GAAY,GAAyB,CAAE,EACvD,SAAoB,CAAE,eAAa,GAAG,CAAU,EAChD,GAAY,EAAI,CAAQ,EACjB,CACT,CACF,CACA,OAAO,eAAe,EAAK,IAAI,IAAQ,CACrC,KAAM,CACJ,MAAO,GAAS,EAAI,EAAa,CAAC,CACpC,EACA,WAAY,EACd,CAAC,CACH,CAAC,EACM,CACT,CAGA,YAAkB,EAAI,EAAY,KAAa,EAAM,CACnD,GAAI,CACF,MAAO,GAAS,GAAG,CAAI,CACzB,OAAS,EAAP,CACA,GAAY,EAAG,EAAI,CAAU,CAC/B,CACF,CACA,YAAqB,EAAQ,EAAI,EAAa,OAAQ,CACpD,EAAS,OAAO,OACd,GAAU,CAAE,QAAS,yBAA0B,EAC/C,CAAE,KAAI,YAAW,CACnB,EACA,QAAQ,KAAK,4BAA4B,EAAO;AAAA;AAAA,EAEhD,EAAa,gBAAkB,EAAa;AAAA;AAAA,EAAU,KAAM,CAAE,EAC9D,WAAW,IAAM,CACf,KAAM,EACR,EAAG,CAAC,CACN,CAGA,GAAI,IAA8B,GAClC,YAAmC,EAAU,CAC3C,GAAI,GAAQ,GACZ,GAA8B,GAC9B,GAAI,GAAS,EAAS,EACtB,UAA8B,EACvB,CACT,CACA,YAAkB,EAAI,EAAY,EAAS,CAAC,EAAG,CAC7C,GAAI,GACJ,SAAc,EAAI,CAAU,EAAE,AAAC,GAAU,EAAS,EAAO,CAAM,EACxD,CACT,CACA,cAA0B,EAAM,CAC9B,MAAO,IAAqB,GAAG,CAAI,CACrC,CACA,GAAI,IAAuB,GAC3B,YAAsB,EAAc,CAClC,GAAuB,CACzB,CACA,YAAyB,EAAI,EAAY,CACvC,GAAI,GAAmB,CAAC,EACxB,GAAa,EAAkB,CAAE,EACjC,GAAI,GAAY,CAAC,EAAkB,GAAG,GAAiB,CAAE,CAAC,EACtD,EAAY,MAAO,IAAe,WAAa,GAA8B,EAAW,CAAU,EAAI,GAA4B,EAAW,EAAY,CAAE,EAC/J,MAAO,IAAS,KAAK,KAAM,EAAI,EAAY,CAAS,CACtD,CACA,YAAuC,EAAW,EAAM,CACtD,MAAO,CAAC,EAAW,IAAM,CACzB,EAAG,CAAE,MAAO,EAAS,CAAC,EAAG,SAAS,CAAC,GAAM,CAAC,IAAM,CAC9C,GAAI,GAAS,EAAK,MAAM,GAAa,CAAC,EAAQ,GAAG,CAAS,CAAC,EAAG,CAAM,EACpE,GAAoB,EAAU,CAAM,CACtC,CACF,CACA,GAAI,IAAgB,CAAC,EACrB,YAAoC,EAAY,EAAI,CAClD,GAAI,GAAc,GAChB,MAAO,IAAc,GAEvB,GAAI,GAAgB,OAAO,eAAe,gBAAiB,CAC3D,CAAC,EAAE,YACC,EAA0B,qBAAqB,KAAK,EAAW,KAAK,CAAC,GAAK,iBAAiB,KAAK,EAAW,KAAK,CAAC,EAAI,eAAe,SAAoB,EAgBxJ,EAAO,AAfe,KAAM,CAC9B,GAAI,CACF,GAAI,GAAQ,GAAI,GACd,CAAC,SAAU,OAAO,EAClB,kCAAkC,oDACpC,EACA,cAAO,eAAe,EAAO,OAAQ,CACnC,MAAO,YAAY,GACrB,CAAC,EACM,CACT,OAAS,EAAP,CACA,UAAY,EAAQ,EAAI,CAAU,EAC3B,QAAQ,QAAQ,CACzB,CACF,GAC6B,EAC7B,UAAc,GAAc,EACrB,CACT,CACA,YAAqC,EAAW,EAAY,EAAI,CAC9D,GAAI,GAAO,GAA2B,EAAY,CAAE,EACpD,MAAO,CAAC,EAAW,IAAM,CACzB,EAAG,CAAE,MAAO,EAAS,CAAC,EAAG,SAAS,CAAC,GAAM,CAAC,IAAM,CAC9C,EAAK,OAAS,OACd,EAAK,SAAW,GAChB,GAAI,GAAgB,GAAa,CAAC,EAAQ,GAAG,CAAS,CAAC,EACvD,GAAI,MAAO,IAAS,WAAY,CAC9B,GAAI,GAAU,EAAK,EAAM,CAAa,EAAE,MAAM,AAAC,GAAW,GAAY,EAAQ,EAAI,CAAU,CAAC,EAC7F,AAAI,EAAK,SACP,IAAoB,EAAU,EAAK,OAAQ,EAAe,EAAQ,CAAE,EACpE,EAAK,OAAS,QAEd,EAAQ,KAAK,AAAC,GAAW,CACvB,GAAoB,EAAU,EAAQ,EAAe,EAAQ,CAAE,CACjE,CAAC,EAAE,MAAM,AAAC,GAAW,GAAY,EAAQ,EAAI,CAAU,CAAC,EAAE,QAAQ,IAAM,EAAK,OAAS,MAAM,CAEhG,CACF,CACF,CACA,YAA6B,EAAU,EAAO,EAAQ,EAAQ,EAAI,CAChE,GAAI,IAA+B,MAAO,IAAU,WAAY,CAC9D,GAAI,GAAS,EAAM,MAAM,EAAQ,CAAM,EACvC,AAAI,YAAkB,SACpB,EAAO,KAAK,AAAC,GAAM,GAAoB,EAAU,EAAG,EAAQ,CAAM,CAAC,EAAE,MAAM,AAAC,GAAW,GAAY,EAAQ,EAAI,CAAK,CAAC,EAErH,EAAS,CAAM,CAEnB,KAAO,AAAI,OAAO,IAAU,UAAY,YAAiB,SACvD,EAAM,KAAK,AAAC,GAAM,EAAS,CAAC,CAAC,EAE7B,EAAS,CAAK,CAElB,CAGA,GAAI,IAAiB,KACrB,YAAgB,EAAU,GAAI,CAC5B,MAAO,IAAiB,CAC1B,CACA,YAAmB,EAAW,CAC5B,GAAiB,CACnB,CACA,GAAI,IAAoB,CAAC,EACzB,WAAmB,EAAM,EAAU,CACjC,UAAkB,GAAQ,EACnB,CACL,OAAO,EAAY,CACjB,GAAI,CAAC,GAAkB,GAAa,CAClC,QAAQ,KAAK,OAAO,8BAA8B,UAAmB,6CAAgD,EACrH,MACF,CACA,GAAM,GAAM,GAAe,QAAQ,CAAU,EAC7C,GAAe,OAAO,GAAO,EAAI,EAAM,GAAe,QAAQ,SAAS,EAAG,EAAG,CAAI,CACnF,CACF,CACF,CACA,YAAyB,EAAM,CAC7B,MAAO,QAAO,KAAK,EAAiB,EAAE,SAAS,CAAI,CACrD,CACA,YAAoB,EAAI,EAAY,EAA2B,CAE7D,GADA,EAAa,MAAM,KAAK,CAAU,EAC9B,EAAG,qBAAsB,CAC3B,GAAI,GAAc,OAAO,QAAQ,EAAG,oBAAoB,EAAE,IAAI,CAAC,CAAC,EAAM,KAAY,EAAE,OAAM,OAAM,EAAE,EAC9F,EAAmB,GAAe,CAAW,EACjD,EAAc,EAAY,IAAI,AAAC,GACzB,EAAiB,KAAK,AAAC,GAAS,EAAK,OAAS,EAAU,IAAI,EACvD,CACL,KAAM,UAAU,EAAU,OAC1B,MAAO,IAAI,EAAU,QACvB,EAEK,CACR,EACD,EAAa,EAAW,OAAO,CAAW,CAC5C,CACA,GAAI,GAA0B,CAAC,EAE/B,MAAO,AADW,GAAW,IAAI,GAAwB,CAAC,EAAS,IAAY,EAAwB,GAAW,CAAO,CAAC,EAAE,OAAO,EAAsB,EAAE,IAAI,GAAmB,EAAyB,CAAyB,CAAC,EAAE,KAAK,EAAU,EACnO,IAAI,AAAC,GACf,GAAoB,EAAI,CAAU,CAC1C,CACH,CACA,YAAwB,EAAY,CAClC,MAAO,OAAM,KAAK,CAAU,EAAE,IAAI,GAAwB,CAAC,EAAE,OAAO,AAAC,GAAS,CAAC,GAAuB,CAAI,CAAC,CAC7G,CACA,GAAI,IAAsB,GACtB,GAAyC,GAAI,KAC7C,GAAyB,OAAO,EACpC,YAAiC,EAAU,CACzC,GAAsB,GACtB,GAAI,GAAM,OAAO,EACjB,GAAyB,EACzB,GAAuB,IAAI,EAAK,CAAC,CAAC,EAClC,GAAI,GAAgB,IAAM,CACxB,KAAO,GAAuB,IAAI,CAAG,EAAE,QACrC,GAAuB,IAAI,CAAG,EAAE,MAAM,EAAE,EAC1C,GAAuB,OAAO,CAAG,CACnC,EACI,EAAgB,IAAM,CACxB,GAAsB,GACtB,EAAc,CAChB,EACA,EAAS,CAAa,EACtB,EAAc,CAChB,CACA,YAAkC,EAAI,CACpC,GAAI,GAAW,CAAC,EACZ,EAAW,AAAC,GAAa,EAAS,KAAK,CAAQ,EAC/C,CAAC,EAAS,GAAiB,GAAmB,CAAE,EACpD,SAAS,KAAK,CAAa,EASpB,CARS,CACd,OAAQ,GACR,OAAQ,EACR,QAAS,EACT,cAAe,EAAc,KAAK,EAAe,CAAE,EACnD,SAAU,GAAS,KAAK,GAAU,CAAE,CACtC,EACgB,IAAM,EAAS,QAAQ,AAAC,GAAM,EAAE,CAAC,CACrB,CAC9B,CACA,YAA6B,EAAI,EAAY,CAC3C,GAAI,GAAO,IAAM,CACjB,EACI,EAAW,GAAkB,EAAW,OAAS,EACjD,CAAC,EAAW,GAAY,GAAyB,CAAE,EACvD,GAAmB,EAAI,EAAW,SAAU,CAAQ,EACpD,GAAI,GAAc,IAAM,CACtB,AAAI,EAAG,WAAa,EAAG,eAEvB,GAAS,QAAU,EAAS,OAAO,EAAI,EAAY,CAAS,EAC5D,EAAW,EAAS,KAAK,EAAU,EAAI,EAAY,CAAS,EAC5D,GAAsB,GAAuB,IAAI,EAAsB,EAAE,KAAK,CAAQ,EAAI,EAAS,EACrG,EACA,SAAY,YAAc,EACnB,CACT,CACA,GAAI,IAAe,CAAC,EAAS,IAAgB,CAAC,CAAE,OAAM,WAChD,GAAK,WAAW,CAAO,GACzB,GAAO,EAAK,QAAQ,EAAS,CAAW,GACnC,CAAE,OAAM,OAAM,GAEnB,GAAO,AAAC,GAAM,EAClB,YAAiC,EAAW,IAAM,CAClD,EAAG,CACD,MAAO,CAAC,CAAE,OAAM,WAAY,CAC1B,GAAI,CAAE,KAAM,EAAS,MAAO,GAAa,GAAsB,OAAO,CAAC,EAAO,IACrE,EAAU,CAAK,EACrB,CAAE,OAAM,OAAM,CAAC,EAClB,MAAI,KAAY,GACd,EAAS,EAAS,CAAI,EACjB,CAAE,KAAM,EAAS,MAAO,CAAS,CAC1C,CACF,CACA,GAAI,IAAwB,CAAC,EAC7B,YAAuB,EAAU,CAC/B,GAAsB,KAAK,CAAQ,CACrC,CACA,YAAgC,CAAE,QAAQ,CACxC,MAAO,IAAqB,EAAE,KAAK,CAAI,CACzC,CACA,GAAI,IAAuB,IAAM,GAAI,QAAO,IAAI,gBAA4B,EAC5E,YAA4B,EAAyB,EAA2B,CAC9E,MAAO,CAAC,CAAE,OAAM,WAAY,CAC1B,GAAI,GAAY,EAAK,MAAM,GAAqB,CAAC,EAC7C,EAAa,EAAK,MAAM,qBAAqB,EAC7C,EAAY,EAAK,MAAM,uBAAuB,GAAK,CAAC,EACpD,EAAW,GAA6B,EAAwB,IAAS,EAC7E,MAAO,CACL,KAAM,EAAY,EAAU,GAAK,KACjC,MAAO,EAAa,EAAW,GAAK,KACpC,UAAW,EAAU,IAAI,AAAC,GAAM,EAAE,QAAQ,IAAK,EAAE,CAAC,EAClD,WAAY,EACZ,UACF,CACF,CACF,CACA,GAAI,IAAU,UACV,GAAiB,CACnB,SACA,MACA,OACA,KACA,SACA,OACA,OACA,MACA,QACA,YACA,aACA,OACA,KACA,GACA,UACF,EACA,YAAoB,EAAG,EAAG,CACxB,GAAI,GAAQ,GAAe,QAAQ,EAAE,IAAI,IAAM,GAAK,GAAU,EAAE,KAC5D,EAAQ,GAAe,QAAQ,EAAE,IAAI,IAAM,GAAK,GAAU,EAAE,KAChE,MAAO,IAAe,QAAQ,CAAK,EAAI,GAAe,QAAQ,CAAK,CACrE,CAGA,YAAkB,EAAI,EAAM,EAAS,CAAC,EAAG,CACvC,EAAG,cACD,GAAI,aAAY,EAAM,CACpB,SACA,QAAS,GAET,SAAU,GACV,WAAY,EACd,CAAC,CACH,CACF,CAGA,YAAc,EAAI,EAAU,CAC1B,GAAI,MAAO,aAAe,YAAc,YAAc,YAAY,CAChE,MAAM,KAAK,EAAG,QAAQ,EAAE,QAAQ,AAAC,GAAQ,GAAK,EAAK,CAAQ,CAAC,EAC5D,MACF,CACA,GAAI,GAAO,GAEX,GADA,EAAS,EAAI,IAAM,EAAO,EAAI,EAC1B,EACF,OACF,GAAI,GAAO,EAAG,kBACd,KAAO,GACL,GAAK,EAAM,EAAU,EAAK,EAC1B,EAAO,EAAK,kBAEhB,CAGA,WAAc,KAAY,EAAM,CAC9B,QAAQ,KAAK,mBAAmB,IAAW,GAAG,CAAI,CACpD,CAGA,GAAI,IAAU,GACd,aAAiB,CACf,AAAI,IACF,EAAK,6GAA6G,EACpH,GAAU,GACL,SAAS,MACZ,EAAK,qIAAqI,EAC5I,GAAS,SAAU,aAAa,EAChC,GAAS,SAAU,qBAAqB,EACxC,GAAwB,EACxB,GAAU,AAAC,GAAO,GAAS,EAAI,EAAI,CAAC,EACpC,GAAY,AAAC,GAAO,GAAY,CAAE,CAAC,EACnC,GAAkB,CAAC,EAAI,IAAU,CAC/B,GAAW,EAAI,CAAK,EAAE,QAAQ,AAAC,GAAW,EAAO,CAAC,CACpD,CAAC,EACD,GAAI,GAAsB,AAAC,GAAO,CAAC,GAAY,EAAG,cAAe,EAAI,EACrE,MAAM,KAAK,SAAS,iBAAiB,GAAa,EAAE,KAAK,GAAG,CAAC,CAAC,EAAE,OAAO,CAAmB,EAAE,QAAQ,AAAC,GAAO,CAC1G,GAAS,CAAE,CACb,CAAC,EACD,GAAS,SAAU,oBAAoB,EACvC,WAAW,IAAM,CACf,GAAwB,CAC1B,CAAC,CACH,CACA,GAAI,IAAwB,CAAC,EACzB,GAAwB,CAAC,EAC7B,aAAyB,CACvB,MAAO,IAAsB,IAAI,AAAC,GAAO,EAAG,CAAC,CAC/C,CACA,aAAwB,CACtB,MAAO,IAAsB,OAAO,EAAqB,EAAE,IAAI,AAAC,GAAO,EAAG,CAAC,CAC7E,CACA,YAAyB,EAAkB,CACzC,GAAsB,KAAK,CAAgB,CAC7C,CACA,YAAyB,EAAkB,CACzC,GAAsB,KAAK,CAAgB,CAC7C,CACA,YAAqB,EAAI,EAAuB,GAAO,CACrD,MAAO,IAAY,EAAI,AAAC,GAAY,CAElC,GAAI,AADc,GAAuB,GAAa,EAAI,GAAc,GAC1D,KAAK,AAAC,GAAa,EAAQ,QAAQ,CAAQ,CAAC,EACxD,MAAO,EACX,CAAC,CACH,CACA,YAAqB,EAAI,EAAU,CACjC,GAAI,EAAC,EAEL,IAAI,EAAS,CAAE,EACb,MAAO,GAGT,GAFI,EAAG,iBACL,GAAK,EAAG,iBACN,EAAC,EAAG,cAER,MAAO,IAAY,EAAG,cAAe,CAAQ,EAC/C,CACA,YAAgB,EAAI,CAClB,MAAO,IAAc,EAAE,KAAK,AAAC,GAAa,EAAG,QAAQ,CAAQ,CAAC,CAChE,CACA,GAAI,IAAoB,CAAC,EACzB,YAAuB,EAAU,CAC/B,GAAkB,KAAK,CAAQ,CACjC,CACA,YAAkB,EAAI,EAAS,GAAM,EAAY,IAAM,CACvD,EAAG,CACD,GAAwB,IAAM,CAC5B,EAAO,EAAI,CAAC,EAAK,IAAS,CACxB,EAAU,EAAK,CAAI,EACnB,GAAkB,QAAQ,AAAC,GAAM,EAAE,EAAK,CAAI,CAAC,EAC7C,GAAW,EAAK,EAAI,UAAU,EAAE,QAAQ,AAAC,GAAW,EAAO,CAAC,EAC5D,EAAI,WAAa,EAAK,CACxB,CAAC,CACH,CAAC,CACH,CACA,YAAqB,EAAM,EAAS,GAAM,CACxC,EAAO,EAAM,AAAC,GAAO,CACnB,GAAkB,CAAE,EACpB,GAAe,CAAE,CACnB,CAAC,CACH,CACA,aAAmC,CAMjC,AALuB,CACrB,CAAC,KAAM,SAAU,CAAC,yBAAyB,CAAC,EAC5C,CAAC,SAAU,SAAU,CAAC,YAAY,CAAC,EACnC,CAAC,OAAQ,OAAQ,CAAC,UAAU,CAAC,CAC/B,EACiB,QAAQ,CAAC,CAAC,EAAS,EAAY,KAAe,CAC7D,AAAI,GAAgB,CAAU,GAE9B,EAAU,KAAK,AAAC,GAAa,CAC3B,GAAI,SAAS,cAAc,CAAQ,EACjC,SAAK,UAAU,mBAA0B,UAAgB,EAClD,EAEX,CAAC,CACH,CAAC,CACH,CAGA,GAAI,IAAY,CAAC,EACb,GAAY,GAChB,YAAkB,EAAW,IAAM,CACnC,EAAG,CACD,sBAAe,IAAM,CACnB,IAAa,WAAW,IAAM,CAC5B,GAAiB,CACnB,CAAC,CACH,CAAC,EACM,GAAI,SAAQ,AAAC,GAAQ,CAC1B,GAAU,KAAK,IAAM,CACnB,EAAS,EACT,EAAI,CACN,CAAC,CACH,CAAC,CACH,CACA,aAA4B,CAE1B,IADA,GAAY,GACL,GAAU,QACf,GAAU,MAAM,EAAE,CACtB,CACA,aAAyB,CACvB,GAAY,EACd,CAGA,YAAoB,EAAI,EAAO,CAC7B,MAAI,OAAM,QAAQ,CAAK,EACd,GAAqB,EAAI,EAAM,KAAK,GAAG,CAAC,EACtC,MAAO,IAAU,UAAY,IAAU,KACzC,GAAqB,EAAI,CAAK,EAC5B,MAAO,IAAU,WACnB,GAAW,EAAI,EAAM,CAAC,EAExB,GAAqB,EAAI,CAAK,CACvC,CACA,YAA8B,EAAI,EAAa,CAC7C,GAAI,GAAQ,AAAC,GAAiB,EAAa,MAAM,GAAG,EAAE,OAAO,OAAO,EAChE,EAAiB,AAAC,GAAiB,EAAa,MAAM,GAAG,EAAE,OAAO,AAAC,GAAM,CAAC,EAAG,UAAU,SAAS,CAAC,CAAC,EAAE,OAAO,OAAO,EAClH,EAA0B,AAAC,GAC7B,GAAG,UAAU,IAAI,GAAG,CAAO,EACpB,IAAM,CACX,EAAG,UAAU,OAAO,GAAG,CAAO,CAChC,GAEF,SAAc,IAAgB,GAAO,EAAc,GAAK,GAAe,GAChE,EAAwB,EAAe,CAAW,CAAC,CAC5D,CACA,YAA8B,EAAI,EAAa,CAC7C,GAAI,GAAQ,AAAC,GAAgB,EAAY,MAAM,GAAG,EAAE,OAAO,OAAO,EAC9D,EAAS,OAAO,QAAQ,CAAW,EAAE,QAAQ,CAAC,CAAC,EAAa,KAAU,EAAO,EAAM,CAAW,EAAI,EAAK,EAAE,OAAO,OAAO,EACvH,EAAY,OAAO,QAAQ,CAAW,EAAE,QAAQ,CAAC,CAAC,EAAa,KAAU,AAAC,EAA4B,GAArB,EAAM,CAAW,CAAS,EAAE,OAAO,OAAO,EAC3H,EAAQ,CAAC,EACT,EAAU,CAAC,EACf,SAAU,QAAQ,AAAC,GAAM,CACvB,AAAI,EAAG,UAAU,SAAS,CAAC,GACzB,GAAG,UAAU,OAAO,CAAC,EACrB,EAAQ,KAAK,CAAC,EAElB,CAAC,EACD,EAAO,QAAQ,AAAC,GAAM,CACpB,AAAK,EAAG,UAAU,SAAS,CAAC,GAC1B,GAAG,UAAU,IAAI,CAAC,EAClB,EAAM,KAAK,CAAC,EAEhB,CAAC,EACM,IAAM,CACX,EAAQ,QAAQ,AAAC,GAAM,EAAG,UAAU,IAAI,CAAC,CAAC,EAC1C,EAAM,QAAQ,AAAC,GAAM,EAAG,UAAU,OAAO,CAAC,CAAC,CAC7C,CACF,CAGA,YAAmB,EAAI,EAAO,CAC5B,MAAI,OAAO,IAAU,UAAY,IAAU,KAClC,GAAoB,EAAI,CAAK,EAE/B,GAAoB,EAAI,CAAK,CACtC,CACA,YAA6B,EAAI,EAAO,CACtC,GAAI,GAAiB,CAAC,EACtB,cAAO,QAAQ,CAAK,EAAE,QAAQ,CAAC,CAAC,EAAK,KAAY,CAC/C,EAAe,GAAO,EAAG,MAAM,GAC1B,EAAI,WAAW,IAAI,GACtB,GAAM,GAAU,CAAG,GAErB,EAAG,MAAM,YAAY,EAAK,CAAM,CAClC,CAAC,EACD,WAAW,IAAM,CACf,AAAI,EAAG,MAAM,SAAW,GACtB,EAAG,gBAAgB,OAAO,CAE9B,CAAC,EACM,IAAM,CACX,GAAU,EAAI,CAAc,CAC9B,CACF,CACA,YAA6B,EAAI,EAAO,CACtC,GAAI,GAAQ,EAAG,aAAa,QAAS,CAAK,EAC1C,SAAG,aAAa,QAAS,CAAK,EACvB,IAAM,CACX,EAAG,aAAa,QAAS,GAAS,EAAE,CACtC,CACF,CACA,YAAmB,EAAS,CAC1B,MAAO,GAAQ,QAAQ,kBAAmB,OAAO,EAAE,YAAY,CACjE,CAGA,YAAc,EAAU,EAAW,IAAM,CACzC,EAAG,CACD,GAAI,GAAS,GACb,MAAO,WAAW,CAChB,AAAK,EAIH,EAAS,MAAM,KAAM,SAAS,EAH9B,GAAS,GACT,EAAS,MAAM,KAAM,SAAS,EAIlC,CACF,CAGA,EAAU,aAAc,CAAC,EAAI,CAAE,QAAO,YAAW,cAAc,CAAE,SAAU,KAAgB,CAGzF,AAFI,MAAO,IAAe,YACxB,GAAa,EAAU,CAAU,GAC/B,IAAe,IAEnB,CAAI,CAAC,GAAc,MAAO,IAAe,UACvC,GAA8B,EAAI,EAAW,CAAK,EAElD,GAAmC,EAAI,EAAY,CAAK,EAE5D,CAAC,EACD,YAA4C,EAAI,EAAa,EAAO,CAClE,GAAyB,EAAI,GAAY,EAAE,EAqB3C,AApB0B,CACxB,MAAS,AAAC,GAAY,CACpB,EAAG,cAAc,MAAM,OAAS,CAClC,EACA,cAAe,AAAC,GAAY,CAC1B,EAAG,cAAc,MAAM,MAAQ,CACjC,EACA,YAAa,AAAC,GAAY,CACxB,EAAG,cAAc,MAAM,IAAM,CAC/B,EACA,MAAS,AAAC,GAAY,CACpB,EAAG,cAAc,MAAM,OAAS,CAClC,EACA,cAAe,AAAC,GAAY,CAC1B,EAAG,cAAc,MAAM,MAAQ,CACjC,EACA,YAAa,AAAC,GAAY,CACxB,EAAG,cAAc,MAAM,IAAM,CAC/B,CACF,EACoB,GAAO,CAAW,CACxC,CACA,YAAuC,EAAI,EAAW,EAAO,CAC3D,GAAyB,EAAI,EAAS,EACtC,GAAI,GAAgB,CAAC,EAAU,SAAS,IAAI,GAAK,CAAC,EAAU,SAAS,KAAK,GAAK,CAAC,EAC5E,EAAkB,GAAiB,EAAU,SAAS,IAAI,GAAK,CAAC,OAAO,EAAE,SAAS,CAAK,EACvF,EAAmB,GAAiB,EAAU,SAAS,KAAK,GAAK,CAAC,OAAO,EAAE,SAAS,CAAK,EAC7F,AAAI,EAAU,SAAS,IAAI,GAAK,CAAC,GAC/B,GAAY,EAAU,OAAO,CAAC,EAAG,IAAU,EAAQ,EAAU,QAAQ,KAAK,CAAC,GAEzE,EAAU,SAAS,KAAK,GAAK,CAAC,GAChC,GAAY,EAAU,OAAO,CAAC,EAAG,IAAU,EAAQ,EAAU,QAAQ,KAAK,CAAC,GAE7E,GAAI,GAAW,CAAC,EAAU,SAAS,SAAS,GAAK,CAAC,EAAU,SAAS,OAAO,EACxE,EAAe,GAAY,EAAU,SAAS,SAAS,EACvD,EAAa,GAAY,EAAU,SAAS,OAAO,EACnD,EAAe,EAAe,EAAI,EAClC,EAAa,EAAa,GAAc,EAAW,QAAS,EAAE,EAAI,IAAM,EACxE,EAAQ,GAAc,EAAW,QAAS,CAAC,EAAI,IAC/C,EAAS,GAAc,EAAW,SAAU,QAAQ,EACpD,EAAW,qBACX,EAAa,GAAc,EAAW,WAAY,GAAG,EAAI,IACzD,EAAc,GAAc,EAAW,WAAY,EAAE,EAAI,IACzD,EAAS,iCACb,AAAI,GACF,GAAG,cAAc,MAAM,OAAS,CAC9B,gBAAiB,EACjB,gBAAiB,GAAG,KACpB,mBAAoB,EACpB,mBAAoB,GAAG,KACvB,yBAA0B,CAC5B,EACA,EAAG,cAAc,MAAM,MAAQ,CAC7B,QAAS,EACT,UAAW,SAAS,IACtB,EACA,EAAG,cAAc,MAAM,IAAM,CAC3B,QAAS,EACT,UAAW,UACb,GAEE,GACF,GAAG,cAAc,MAAM,OAAS,CAC9B,gBAAiB,EACjB,gBAAiB,GAAG,KACpB,mBAAoB,EACpB,mBAAoB,GAAG,KACvB,yBAA0B,CAC5B,EACA,EAAG,cAAc,MAAM,MAAQ,CAC7B,QAAS,EACT,UAAW,UACb,EACA,EAAG,cAAc,MAAM,IAAM,CAC3B,QAAS,EACT,UAAW,SAAS,IACtB,EAEJ,CACA,YAAkC,EAAI,EAAa,EAAe,CAAC,EAAG,CACpE,AAAK,EAAG,eACN,GAAG,cAAgB,CACjB,MAAO,CAAE,OAAQ,EAAc,MAAO,EAAc,IAAK,CAAa,EACtE,MAAO,CAAE,OAAQ,EAAc,MAAO,EAAc,IAAK,CAAa,EACtE,GAAG,EAAS,IAAM,CAClB,EAAG,EAAQ,IAAM,CACjB,EAAG,CACD,GAAW,EAAI,EAAa,CAC1B,OAAQ,KAAK,MAAM,OACnB,MAAO,KAAK,MAAM,MAClB,IAAK,KAAK,MAAM,GAClB,EAAG,EAAQ,CAAK,CAClB,EACA,IAAI,EAAS,IAAM,CACnB,EAAG,EAAQ,IAAM,CACjB,EAAG,CACD,GAAW,EAAI,EAAa,CAC1B,OAAQ,KAAK,MAAM,OACnB,MAAO,KAAK,MAAM,MAClB,IAAK,KAAK,MAAM,GAClB,EAAG,EAAQ,CAAK,CAClB,CACF,EACJ,CACA,OAAO,QAAQ,UAAU,mCAAqC,SAAS,EAAI,EAAO,EAAM,EAAM,CAC5F,GAAM,GAAY,SAAS,kBAAoB,UAAY,sBAAwB,WAC/E,EAA0B,IAAM,EAAU,CAAI,EAClD,GAAI,EAAO,CACT,AAAI,EAAG,eAAkB,GAAG,cAAc,OAAS,EAAG,cAAc,OAClE,EAAG,cAAc,OAAU,QAAO,QAAQ,EAAG,cAAc,MAAM,MAAM,EAAE,QAAU,OAAO,QAAQ,EAAG,cAAc,MAAM,KAAK,EAAE,QAAU,OAAO,QAAQ,EAAG,cAAc,MAAM,GAAG,EAAE,QAAU,EAAG,cAAc,GAAG,CAAI,EAAI,EAAwB,EAEnP,EAAG,cAAgB,EAAG,cAAc,GAAG,CAAI,EAAI,EAAwB,EAEzE,MACF,CACA,EAAG,eAAiB,EAAG,cAAgB,GAAI,SAAQ,CAAC,EAAS,IAAW,CACtE,EAAG,cAAc,IAAI,IAAM,CAC3B,EAAG,IAAM,EAAQ,CAAI,CAAC,EACtB,EAAG,kBAAoB,EAAG,iBAAiB,aAAa,IAAM,EAAO,CAAE,0BAA2B,EAAK,CAAC,CAAC,CAC3G,CAAC,EAAI,QAAQ,QAAQ,CAAI,EACzB,eAAe,IAAM,CACnB,GAAI,GAAU,GAAY,CAAE,EAC5B,AAAI,EACG,GAAQ,iBACX,GAAQ,gBAAkB,CAAC,GAC7B,EAAQ,gBAAgB,KAAK,CAAE,GAE/B,EAAU,IAAM,CACd,GAAI,GAAoB,AAAC,GAAQ,CAC/B,GAAI,GAAQ,QAAQ,IAAI,CACtB,EAAI,eACJ,GAAI,GAAI,iBAAmB,CAAC,GAAG,IAAI,CAAiB,CACtD,CAAC,EAAE,KAAK,CAAC,CAAC,KAAO,IAAI,CAAC,EACtB,aAAO,GAAI,eACX,MAAO,GAAI,gBACJ,CACT,EACA,EAAkB,CAAE,EAAE,MAAM,AAAC,GAAM,CACjC,GAAI,CAAC,EAAE,0BACL,KAAM,EACV,CAAC,CACH,CAAC,CAEL,CAAC,CACH,EACA,YAAqB,EAAI,CACvB,GAAI,GAAS,EAAG,WAChB,GAAI,EAAC,EAEL,MAAO,GAAO,eAAiB,EAAS,GAAY,CAAM,CAC5D,CACA,YAAoB,EAAI,EAAa,CAAE,SAAQ,MAAO,EAAQ,OAAQ,CAAC,EAAG,EAAS,IAAM,CACzF,EAAG,EAAQ,IAAM,CACjB,EAAG,CAGD,GAFI,EAAG,kBACL,EAAG,iBAAiB,OAAO,EACzB,OAAO,KAAK,CAAM,EAAE,SAAW,GAAK,OAAO,KAAK,CAAM,EAAE,SAAW,GAAK,OAAO,KAAK,CAAG,EAAE,SAAW,EAAG,CACzG,EAAO,EACP,EAAM,EACN,MACF,CACA,GAAI,GAAW,EAAY,EAC3B,GAAkB,EAAI,CACpB,OAAQ,CACN,EAAY,EAAY,EAAI,CAAM,CACpC,EACA,QAAS,CACP,EAAa,EAAY,EAAI,CAAM,CACrC,EACA,SACA,KAAM,CACJ,EAAU,EACV,EAAU,EAAY,EAAI,CAAG,CAC/B,EACA,QACA,SAAU,CACR,EAAW,EACX,EAAQ,CACV,CACF,CAAC,CACH,CACA,YAA2B,EAAI,EAAQ,CACrC,GAAI,GAAa,EAAe,EAC5B,EAAS,GAAK,IAAM,CACtB,EAAU,IAAM,CACd,EAAc,GACT,GACH,EAAO,OAAO,EACX,GACH,GAAO,IAAI,EACX,GAAiB,GAEnB,EAAO,MAAM,EACT,EAAG,aACL,EAAO,QAAQ,EACjB,MAAO,GAAG,gBACZ,CAAC,CACH,CAAC,EACD,EAAG,iBAAmB,CACpB,cAAe,CAAC,EAChB,aAAa,EAAU,CACrB,KAAK,cAAc,KAAK,CAAQ,CAClC,EACA,OAAQ,GAAK,UAAW,CACtB,KAAO,KAAK,cAAc,QACxB,KAAK,cAAc,MAAM,EAAE,EAG7B,EAAO,CACT,CAAC,EACD,QACF,EACA,EAAU,IAAM,CACd,EAAO,MAAM,EACb,EAAO,OAAO,CAChB,CAAC,EACD,GAAc,EACd,sBAAsB,IAAM,CAC1B,GAAI,EACF,OACF,GAAI,GAAW,OAAO,iBAAiB,CAAE,EAAE,mBAAmB,QAAQ,MAAO,EAAE,EAAE,QAAQ,IAAK,EAAE,CAAC,EAAI,IACjG,EAAQ,OAAO,iBAAiB,CAAE,EAAE,gBAAgB,QAAQ,MAAO,EAAE,EAAE,QAAQ,IAAK,EAAE,CAAC,EAAI,IAC/F,AAAI,IAAa,GACf,GAAW,OAAO,iBAAiB,CAAE,EAAE,kBAAkB,QAAQ,IAAK,EAAE,CAAC,EAAI,KAC/E,EAAU,IAAM,CACd,EAAO,OAAO,CAChB,CAAC,EACD,EAAgB,GAChB,sBAAsB,IAAM,CAC1B,AAAI,GAEJ,GAAU,IAAM,CACd,EAAO,IAAI,CACb,CAAC,EACD,GAAiB,EACjB,WAAW,EAAG,iBAAiB,OAAQ,EAAW,CAAK,EACvD,EAAa,GACf,CAAC,CACH,CAAC,CACH,CACA,YAAuB,EAAW,EAAK,EAAU,CAC/C,GAAI,EAAU,QAAQ,CAAG,IAAM,GAC7B,MAAO,GACT,GAAM,GAAW,EAAU,EAAU,QAAQ,CAAG,EAAI,GAGpD,GAFI,CAAC,GAED,IAAQ,SACN,MAAM,CAAQ,EAChB,MAAO,GAEX,GAAI,IAAQ,YAAc,IAAQ,QAAS,CACzC,GAAI,GAAQ,EAAS,MAAM,YAAY,EACvC,GAAI,EACF,MAAO,GAAM,EACjB,CACA,MAAI,KAAQ,UACN,CAAC,MAAO,QAAS,OAAQ,SAAU,QAAQ,EAAE,SAAS,EAAU,EAAU,QAAQ,CAAG,EAAI,EAAE,EACtF,CAAC,EAAU,EAAU,EAAU,QAAQ,CAAG,EAAI,EAAE,EAAE,KAAK,GAAG,EAG9D,CACT,CAGA,GAAI,IAAY,GAChB,YAAyB,EAAU,EAAW,IAAM,CACpD,EAAG,CACD,MAAO,IAAI,IAAS,GAAY,EAAS,GAAG,CAAI,EAAI,EAAS,GAAG,CAAI,CACtE,CACA,YAAyB,EAAU,CACjC,MAAO,IAAI,IAAS,IAAa,EAAS,GAAG,CAAI,CACnD,CACA,GAAI,IAAe,CAAC,EACpB,YAAwB,EAAU,CAChC,GAAa,KAAK,CAAQ,CAC5B,CACA,YAAmB,EAAM,EAAI,CAC3B,GAAa,QAAQ,AAAC,GAAM,EAAE,EAAM,CAAE,CAAC,EACvC,GAAY,GACZ,GAAgC,IAAM,CACpC,GAAS,EAAI,CAAC,EAAI,IAAa,CAC7B,EAAS,EAAI,IAAM,CACnB,CAAC,CACH,CAAC,CACH,CAAC,EACD,GAAY,EACd,CACA,GAAI,IAAkB,GACtB,YAAe,EAAO,EAAO,CAC3B,AAAK,EAAM,cACT,GAAM,aAAe,EAAM,cAC7B,GAAY,GACZ,GAAkB,GAClB,GAAgC,IAAM,CACpC,GAAU,CAAK,CACjB,CAAC,EACD,GAAY,GACZ,GAAkB,EACpB,CACA,YAAmB,EAAI,CACrB,GAAI,GAAuB,GAS3B,GAAS,EARW,CAAC,EAAK,IAAa,CACrC,GAAK,EAAK,CAAC,EAAK,IAAS,CACvB,GAAI,GAAwB,GAAO,CAAG,EACpC,MAAO,GAAK,EACd,EAAuB,GACvB,EAAS,EAAK,CAAI,CACpB,CAAC,CACH,CAC0B,CAC5B,CACA,YAAyC,EAAU,CACjD,GAAI,GAAQ,GACZ,GAAe,CAAC,EAAW,IAAO,CAChC,GAAI,GAAe,EAAM,CAAS,EAClC,UAAQ,CAAY,EACb,IAAM,CACb,CACF,CAAC,EACD,EAAS,EACT,GAAe,CAAK,CACtB,CAGA,YAAc,EAAI,EAAM,EAAO,EAAY,CAAC,EAAG,CAK7C,OAJK,EAAG,aACN,GAAG,YAAc,GAAS,CAAC,CAAC,GAC9B,EAAG,YAAY,GAAQ,EACvB,EAAO,EAAU,SAAS,OAAO,EAAI,GAAU,CAAI,EAAI,EAC/C,OACD,QACH,GAAe,EAAI,CAAK,EACxB,UACG,QACH,GAAW,EAAI,CAAK,EACpB,UACG,QACH,GAAY,EAAI,CAAK,EACrB,UACG,eACA,UACH,GAAyB,EAAI,EAAM,CAAK,EACxC,cAEA,GAAc,EAAI,EAAM,CAAK,EAC7B,MAEN,CACA,YAAwB,EAAI,EAAO,CACjC,GAAI,EAAG,OAAS,QACd,AAAI,EAAG,WAAW,QAAU,QAC1B,GAAG,MAAQ,GAET,OAAO,WACT,CAAI,MAAO,IAAU,UACnB,EAAG,QAAU,GAAiB,EAAG,KAAK,IAAM,EAE5C,EAAG,QAAU,GAAwB,EAAG,MAAO,CAAK,WAG/C,EAAG,OAAS,WACrB,AAAI,OAAO,UAAU,CAAK,EACxB,EAAG,MAAQ,EACN,AAAI,CAAC,MAAM,QAAQ,CAAK,GAAK,MAAO,IAAU,WAAa,CAAC,CAAC,KAAM,MAAM,EAAE,SAAS,CAAK,EAC9F,EAAG,MAAQ,OAAO,CAAK,EAEvB,AAAI,MAAM,QAAQ,CAAK,EACrB,EAAG,QAAU,EAAM,KAAK,AAAC,GAAQ,GAAwB,EAAK,EAAG,KAAK,CAAC,EAEvE,EAAG,QAAU,CAAC,CAAC,UAGV,EAAG,UAAY,SACxB,GAAa,EAAI,CAAK,MACjB,CACL,GAAI,EAAG,QAAU,EACf,OACF,EAAG,MAAQ,IAAU,OAAS,GAAK,CACrC,CACF,CACA,YAAqB,EAAI,EAAO,CAC9B,AAAI,EAAG,qBACL,EAAG,oBAAoB,EACzB,EAAG,oBAAsB,GAAW,EAAI,CAAK,CAC/C,CACA,YAAoB,EAAI,EAAO,CAC7B,AAAI,EAAG,oBACL,EAAG,mBAAmB,EACxB,EAAG,mBAAqB,GAAU,EAAI,CAAK,CAC7C,CACA,YAAkC,EAAI,EAAM,EAAO,CACjD,GAAc,EAAI,EAAM,CAAK,EAC7B,GAAqB,EAAI,EAAM,CAAK,CACtC,CACA,YAAuB,EAAI,EAAM,EAAO,CACtC,AAAI,CAAC,KAAM,OAAQ,EAAK,EAAE,SAAS,CAAK,GAAK,GAAoC,CAAI,EACnF,EAAG,gBAAgB,CAAI,EAEnB,IAAc,CAAI,GACpB,GAAQ,GACV,GAAa,EAAI,EAAM,CAAK,EAEhC,CACA,YAAsB,EAAI,EAAU,EAAO,CACzC,AAAI,EAAG,aAAa,CAAQ,GAAK,GAC/B,EAAG,aAAa,EAAU,CAAK,CAEnC,CACA,YAA8B,EAAI,EAAU,EAAO,CACjD,AAAI,EAAG,KAAc,GACnB,GAAG,GAAY,EAEnB,CACA,YAAsB,EAAI,EAAO,CAC/B,GAAM,GAAoB,CAAC,EAAE,OAAO,CAAK,EAAE,IAAI,AAAC,GACvC,EAAS,EACjB,EACD,MAAM,KAAK,EAAG,OAAO,EAAE,QAAQ,AAAC,GAAW,CACzC,EAAO,SAAW,EAAkB,SAAS,EAAO,KAAK,CAC3D,CAAC,CACH,CACA,YAAmB,EAAS,CAC1B,MAAO,GAAQ,YAAY,EAAE,QAAQ,SAAU,CAAC,EAAO,IAAS,EAAK,YAAY,CAAC,CACpF,CACA,YAAiC,EAAQ,EAAQ,CAC/C,MAAO,IAAU,CACnB,CACA,YAA0B,EAAU,CAClC,MAAI,CAAC,EAAG,IAAK,OAAQ,KAAM,MAAO,EAAI,EAAE,SAAS,CAAQ,EAChD,GAEL,CAAC,EAAG,IAAK,QAAS,MAAO,KAAM,EAAK,EAAE,SAAS,CAAQ,EAClD,GAEF,EAAW,QAAQ,CAAQ,EAAI,IACxC,CACA,YAAuB,EAAU,CA2B/B,MAAO,AA1BmB,CACxB,WACA,UACA,WACA,WACA,OACA,WACA,YACA,YACA,WACA,aACA,kBACA,sBACA,iBACA,WACA,WACA,OACA,QACA,cACA,UACA,QACA,WACA,QACA,QACA,UACF,EACyB,SAAS,CAAQ,CAC5C,CACA,YAA6C,EAAM,CACjD,MAAO,CAAC,CAAC,eAAgB,eAAgB,gBAAiB,eAAe,EAAE,SAAS,CAAI,CAC1F,CACA,YAAoB,EAAI,EAAM,EAAU,CACtC,MAAI,GAAG,aAAe,EAAG,YAAY,KAAU,OACtC,EAAG,YAAY,GACjB,GAAoB,EAAI,EAAM,CAAQ,CAC/C,CACA,YAAqB,EAAI,EAAM,EAAU,EAAU,GAAM,CACvD,GAAI,EAAG,aAAe,EAAG,YAAY,KAAU,OAC7C,MAAO,GAAG,YAAY,GACxB,GAAI,EAAG,mBAAqB,EAAG,kBAAkB,KAAU,OAAQ,CACjE,GAAI,GAAU,EAAG,kBAAkB,GACnC,SAAQ,QAAU,EACX,GAA0B,IACxB,GAAS,EAAI,EAAQ,UAAU,CACvC,CACH,CACA,MAAO,IAAoB,EAAI,EAAM,CAAQ,CAC/C,CACA,YAA6B,EAAI,EAAM,EAAU,CAC/C,GAAI,GAAO,EAAG,aAAa,CAAI,EAC/B,MAAI,KAAS,KACJ,MAAO,IAAa,WAAa,EAAS,EAAI,EACnD,IAAS,GACJ,GACL,GAAc,CAAI,EACb,CAAC,CAAC,CAAC,EAAM,MAAM,EAAE,SAAS,CAAI,EAEhC,CACT,CAGA,YAAkB,EAAM,EAAM,CAC5B,GAAI,GACJ,MAAO,WAAW,CAChB,GAAI,GAAU,KAAM,EAAO,UACvB,EAAQ,UAAW,CACrB,EAAU,KACV,EAAK,MAAM,EAAS,CAAI,CAC1B,EACA,aAAa,CAAO,EACpB,EAAU,WAAW,EAAO,CAAI,CAClC,CACF,CAGA,YAAkB,EAAM,EAAO,CAC7B,GAAI,GACJ,MAAO,WAAW,CAChB,GAAI,GAAU,KAAM,EAAO,UAC3B,AAAK,GACH,GAAK,MAAM,EAAS,CAAI,EACxB,EAAa,GACb,WAAW,IAAM,EAAa,GAAO,CAAK,EAE9C,CACF,CAGA,YAAkB,CAAE,IAAK,EAAU,IAAK,GAAY,CAAE,IAAK,EAAU,IAAK,GAAY,CACpF,GAAI,GAAW,GACX,EACA,EACA,EAAY,GAAO,IAAM,CAC3B,GAAI,GAAQ,EAAS,EACjB,EAAQ,EAAS,EACrB,GAAI,EACF,EAAS,GAAc,CAAK,CAAC,EAC7B,EAAW,OACN,CACL,GAAI,GAAkB,KAAK,UAAU,CAAK,EACtC,EAAkB,KAAK,UAAU,CAAK,EAC1C,AAAI,IAAoB,EACtB,EAAS,GAAc,CAAK,CAAC,EACpB,IAAoB,GAC7B,EAAS,GAAc,CAAK,CAAC,CAGjC,CACA,EAAY,KAAK,UAAU,EAAS,CAAC,EACrC,EAAY,KAAK,UAAU,EAAS,CAAC,CACvC,CAAC,EACD,MAAO,IAAM,CACX,GAAQ,CAAS,CACnB,CACF,CACA,YAAuB,EAAO,CAC5B,MAAO,OAAO,IAAU,SAAW,KAAK,MAAM,KAAK,UAAU,CAAK,CAAC,EAAI,CACzE,CAGA,YAAgB,EAAU,CAExB,AADgB,OAAM,QAAQ,CAAQ,EAAI,EAAW,CAAC,CAAQ,GACpD,QAAQ,AAAC,GAAM,EAAE,EAAc,CAAC,CAC5C,CAGA,GAAI,IAAS,CAAC,EACV,GAAa,GACjB,YAAe,EAAM,EAAO,CAK1B,GAJK,IACH,IAAS,GAAS,EAAM,EACxB,GAAa,IAEX,IAAU,OACZ,MAAO,IAAO,GAEhB,GAAO,GAAQ,EACX,MAAO,IAAU,UAAY,IAAU,MAAQ,EAAM,eAAe,MAAM,GAAK,MAAO,GAAM,MAAS,YACvG,GAAO,GAAM,KAAK,EAEpB,GAAiB,GAAO,EAAK,CAC/B,CACA,aAAqB,CACnB,MAAO,GACT,CAGA,GAAI,IAAQ,CAAC,EACb,YAAe,EAAM,EAAU,CAC7B,GAAI,GAAc,MAAO,IAAa,WAAa,IAAM,EAAW,EACpE,MAAI,aAAgB,SACX,GAAoB,EAAM,EAAY,CAAC,EAE9C,IAAM,GAAQ,EAET,IAAM,CACb,EACF,CACA,YAAgC,EAAK,CACnC,cAAO,QAAQ,EAAK,EAAE,QAAQ,CAAC,CAAC,EAAM,KAAc,CAClD,OAAO,eAAe,EAAK,EAAM,CAC/B,KAAM,CACJ,MAAO,IAAI,IACF,EAAS,GAAG,CAAI,CAE3B,CACF,CAAC,CACH,CAAC,EACM,CACT,CACA,YAA6B,EAAI,EAAK,EAAU,CAC9C,GAAI,GAAiB,CAAC,EACtB,KAAO,EAAe,QACpB,EAAe,IAAI,EAAE,EACvB,GAAI,GAAa,OAAO,QAAQ,CAAG,EAAE,IAAI,CAAC,CAAC,EAAM,KAAY,EAAE,OAAM,OAAM,EAAE,EACzE,EAAmB,GAAe,CAAU,EAChD,SAAa,EAAW,IAAI,AAAC,GACvB,EAAiB,KAAK,AAAC,GAAS,EAAK,OAAS,EAAU,IAAI,EACvD,CACL,KAAM,UAAU,EAAU,OAC1B,MAAO,IAAI,EAAU,QACvB,EAEK,CACR,EACD,GAAW,EAAI,EAAY,CAAQ,EAAE,IAAI,AAAC,GAAW,CACnD,EAAe,KAAK,EAAO,WAAW,EACtC,EAAO,CACT,CAAC,EACM,IAAM,CACX,KAAO,EAAe,QACpB,EAAe,IAAI,EAAE,CACzB,CACF,CAGA,GAAI,IAAQ,CAAC,EACb,YAAc,EAAM,EAAU,CAC5B,GAAM,GAAQ,CAChB,CACA,YAA6B,EAAK,EAAS,CACzC,cAAO,QAAQ,EAAK,EAAE,QAAQ,CAAC,CAAC,EAAM,KAAc,CAClD,OAAO,eAAe,EAAK,EAAM,CAC/B,KAAM,CACJ,MAAO,IAAI,IACF,EAAS,KAAK,CAAO,EAAE,GAAG,CAAI,CAEzC,EACA,WAAY,EACd,CAAC,CACH,CAAC,EACM,CACT,CAGA,GAAI,IAAS,CACX,GAAI,WAAW,CACb,MAAO,GACT,EACA,GAAI,UAAU,CACZ,MAAO,GACT,EACA,GAAI,SAAS,CACX,MAAO,GACT,EACA,GAAI,MAAM,CACR,MAAO,GACT,EACA,QAAS,SACT,kCACA,6BACA,2BACA,2BACA,0BACA,uBACA,sBACA,qBACA,oBACA,mBACA,mBACA,mBACA,mBACA,kBACA,kBACA,kBACA,iBACA,gBACA,iBACA,gBACA,gBACA,eACA,eACA,eACA,eACA,eACA,eAEA,cAEA,aAEA,YACA,YACA,YACA,YACA,YACA,YACA,YACA,YACA,SAAU,GACV,OAAQ,GACR,UACA,QACA,SACA,SACA,SAEA,aAEA,MAAO,GACP,MAAO,GACP,SACA,QACA,QACA,KAAM,EACR,EACI,GAAiB,GAGrB,YAAiB,EAAK,EAAkB,CACtC,GAAM,GAAsB,OAAO,OAAO,IAAI,EACxC,EAAO,EAAI,MAAM,GAAG,EAC1B,OAAS,GAAI,EAAG,EAAI,EAAK,OAAQ,IAC/B,EAAI,EAAK,IAAM,GAEjB,MAAO,GAAmB,AAAC,GAAQ,CAAC,CAAC,EAAI,EAAI,YAAY,GAAK,AAAC,GAAQ,CAAC,CAAC,EAAI,EAC/E,CACA,GAAI,IAAsB,8EACtB,GAAiC,GAAQ,GAAsB,8IAA8I,EAC7M,GAAmB,OAAO,OAAO,CAAC,CAAC,EACnC,GAAmB,OAAO,OAAO,CAAC,CAAC,EACnC,GAAiB,OAAO,UAAU,eAClC,GAAS,CAAC,EAAK,IAAQ,GAAe,KAAK,EAAK,CAAG,EACnD,GAAU,MAAM,QAChB,GAAQ,AAAC,GAAQ,GAAa,CAAG,IAAM,eACvC,GAAW,AAAC,GAAQ,MAAO,IAAQ,SACnC,GAAW,AAAC,GAAQ,MAAO,IAAQ,SACnC,GAAW,AAAC,GAAQ,IAAQ,MAAQ,MAAO,IAAQ,SACnD,GAAiB,OAAO,UAAU,SAClC,GAAe,AAAC,GAAU,GAAe,KAAK,CAAK,EACnD,GAAY,AAAC,GACR,GAAa,CAAK,EAAE,MAAM,EAAG,EAAE,EAEpC,GAAe,AAAC,GAAQ,GAAS,CAAG,GAAK,IAAQ,OAAS,EAAI,KAAO,KAAO,GAAK,SAAS,EAAK,EAAE,IAAM,EACvG,GAAsB,AAAC,GAAO,CAChC,GAAM,GAAwB,OAAO,OAAO,IAAI,EAChD,MAAO,AAAC,IAEC,AADK,EAAM,IACH,GAAM,GAAO,EAAG,CAAG,EAEtC,EACI,GAAa,SACb,GAAW,GAAoB,AAAC,GAC3B,EAAI,QAAQ,GAAY,CAAC,EAAG,IAAM,EAAI,EAAE,YAAY,EAAI,EAAE,CAClE,EACG,GAAc,aACd,GAAY,GAAoB,AAAC,GAAQ,EAAI,QAAQ,GAAa,KAAK,EAAE,YAAY,CAAC,EACtF,GAAa,GAAoB,AAAC,GAAQ,EAAI,OAAO,CAAC,EAAE,YAAY,EAAI,EAAI,MAAM,CAAC,CAAC,EACpF,GAAe,GAAoB,AAAC,GAAQ,EAAM,KAAK,GAAW,CAAG,IAAM,EAAE,EAC7E,GAAa,CAAC,EAAO,IAAa,IAAU,GAAa,KAAU,GAAS,IAAa,GAGzF,GAA4B,GAAI,SAChC,GAAc,CAAC,EACf,GACA,GAAc,OAAc,SAAc,EAC1C,GAAsB,OAAc,iBAAsB,EAC9D,YAAkB,EAAI,CACpB,MAAO,IAAM,EAAG,YAAc,EAChC,CACA,YAAiB,EAAI,EAAU,GAAW,CACxC,AAAI,GAAS,CAAE,GACb,GAAK,EAAG,KAEV,GAAM,GAAU,GAAqB,EAAI,CAAO,EAChD,MAAK,GAAQ,MACX,EAAQ,EAEH,CACT,CACA,YAAc,EAAS,CACrB,AAAI,EAAQ,QACV,IAAQ,CAAO,EACX,EAAQ,QAAQ,QAClB,EAAQ,QAAQ,OAAO,EAEzB,EAAQ,OAAS,GAErB,CACA,GAAI,IAAM,EACV,YAA8B,EAAI,EAAS,CACzC,GAAM,GAAU,UAA0B,CACxC,GAAI,CAAC,EAAQ,OACX,MAAO,GAAG,EAEZ,GAAI,CAAC,GAAY,SAAS,CAAO,EAAG,CAClC,GAAQ,CAAO,EACf,GAAI,CACF,UAAe,EACf,GAAY,KAAK,CAAO,EACxB,GAAe,EACR,EAAG,CACZ,QAAE,CACA,GAAY,IAAI,EAChB,GAAc,EACd,GAAe,GAAY,GAAY,OAAS,EAClD,CACF,CACF,EACA,SAAQ,GAAK,KACb,EAAQ,aAAe,CAAC,CAAC,EAAQ,aACjC,EAAQ,UAAY,GACpB,EAAQ,OAAS,GACjB,EAAQ,IAAM,EACd,EAAQ,KAAO,CAAC,EAChB,EAAQ,QAAU,EACX,CACT,CACA,YAAiB,EAAS,CACxB,GAAM,CAAE,QAAS,EACjB,GAAI,EAAK,OAAQ,CACf,OAAS,GAAI,EAAG,EAAI,EAAK,OAAQ,IAC/B,EAAK,GAAG,OAAO,CAAO,EAExB,EAAK,OAAS,CAChB,CACF,CACA,GAAI,IAAc,GACd,GAAa,CAAC,EAClB,aAAyB,CACvB,GAAW,KAAK,EAAW,EAC3B,GAAc,EAChB,CACA,aAA0B,CACxB,GAAW,KAAK,EAAW,EAC3B,GAAc,EAChB,CACA,aAAyB,CACvB,GAAM,GAAO,GAAW,IAAI,EAC5B,GAAc,IAAS,OAAS,GAAO,CACzC,CACA,WAAe,EAAQ,EAAM,EAAK,CAChC,GAAI,CAAC,IAAe,KAAiB,OACnC,OAEF,GAAI,GAAU,GAAU,IAAI,CAAM,EAClC,AAAK,GACH,GAAU,IAAI,EAAQ,EAA0B,GAAI,IAAK,EAE3D,GAAI,GAAM,EAAQ,IAAI,CAAG,EACzB,AAAK,GACH,EAAQ,IAAI,EAAK,EAAsB,GAAI,IAAK,EAE7C,EAAI,IAAI,EAAY,GACvB,GAAI,IAAI,EAAY,EACpB,GAAa,KAAK,KAAK,CAAG,EACtB,GAAa,QAAQ,SACvB,GAAa,QAAQ,QAAQ,CAC3B,OAAQ,GACR,SACA,OACA,KACF,CAAC,EAGP,CACA,YAAiB,EAAQ,EAAM,EAAK,EAAU,EAAU,EAAW,CACjE,GAAM,GAAU,GAAU,IAAI,CAAM,EACpC,GAAI,CAAC,EACH,OAEF,GAAM,GAA0B,GAAI,KAC9B,EAAO,AAAC,GAAiB,CAC7B,AAAI,GACF,EAAa,QAAQ,AAAC,GAAY,CAChC,AAAI,KAAY,IAAgB,EAAQ,eACtC,EAAQ,IAAI,CAAO,CAEvB,CAAC,CAEL,EACA,GAAI,IAAS,QACX,EAAQ,QAAQ,CAAI,UACX,IAAQ,UAAY,GAAQ,CAAM,EAC3C,EAAQ,QAAQ,CAAC,EAAK,IAAS,CAC7B,AAAI,KAAS,UAAY,GAAQ,IAC/B,EAAK,CAAG,CAEZ,CAAC,MAKD,QAHI,IAAQ,QACV,EAAK,EAAQ,IAAI,CAAG,CAAC,EAEf,OACD,MACH,AAAK,GAAQ,CAAM,EAKR,GAAa,CAAG,GACzB,EAAK,EAAQ,IAAI,QAAQ,CAAC,EAL1B,GAAK,EAAQ,IAAI,EAAW,CAAC,EACzB,GAAM,CAAM,GACd,EAAK,EAAQ,IAAI,EAAmB,CAAC,GAKzC,UACG,SACH,AAAK,GAAQ,CAAM,GACjB,GAAK,EAAQ,IAAI,EAAW,CAAC,EACzB,GAAM,CAAM,GACd,EAAK,EAAQ,IAAI,EAAmB,CAAC,GAGzC,UACG,MACH,AAAI,GAAM,CAAM,GACd,EAAK,EAAQ,IAAI,EAAW,CAAC,EAE/B,MAGN,GAAM,GAAM,AAAC,GAAY,CACvB,AAAI,EAAQ,QAAQ,WAClB,EAAQ,QAAQ,UAAU,CACxB,OAAQ,EACR,SACA,MACA,OACA,WACA,WACA,WACF,CAAC,EAEH,AAAI,EAAQ,QAAQ,UAClB,EAAQ,QAAQ,UAAU,CAAO,EAEjC,EAAQ,CAEZ,EACA,EAAQ,QAAQ,CAAG,CACrB,CACA,GAAI,IAAqC,GAAQ,6BAA6B,EAC1E,GAAiB,GAAI,KAAI,OAAO,oBAAoB,MAAM,EAAE,IAAI,AAAC,GAAQ,OAAO,EAAI,EAAE,OAAO,EAAQ,CAAC,EACtG,GAAuB,GAAa,EACpC,GAA8B,GAAa,EAAI,EAC/C,GAAwC,GAA4B,EACxE,aAAuC,CACrC,GAAM,GAAmB,CAAC,EAC1B,OAAC,WAAY,UAAW,aAAa,EAAE,QAAQ,AAAC,GAAQ,CACtD,EAAiB,GAAO,YAAY,EAAM,CACxC,GAAM,GAAM,EAAM,IAAI,EACtB,OAAS,GAAI,EAAG,EAAI,KAAK,OAAQ,EAAI,EAAG,IACtC,EAAM,EAAK,MAAO,EAAI,EAAE,EAE1B,GAAM,GAAM,EAAI,GAAK,GAAG,CAAI,EAC5B,MAAI,KAAQ,IAAM,IAAQ,GACjB,EAAI,GAAK,GAAG,EAAK,IAAI,CAAK,CAAC,EAE3B,CAEX,CACF,CAAC,EACD,CAAC,OAAQ,MAAO,QAAS,UAAW,QAAQ,EAAE,QAAQ,AAAC,GAAQ,CAC7D,EAAiB,GAAO,YAAY,EAAM,CACxC,GAAc,EACd,GAAM,GAAM,EAAM,IAAI,EAAE,GAAK,MAAM,KAAM,CAAI,EAC7C,UAAc,EACP,CACT,CACF,CAAC,EACM,CACT,CACA,YAAsB,EAAa,GAAO,EAAU,GAAO,CACzD,MAAO,UAAc,EAAQ,EAAK,EAAU,CAC1C,GAAI,IAAQ,iBACV,MAAO,CAAC,EACH,GAAI,IAAQ,iBACjB,MAAO,GACF,GAAI,IAAQ,WAAa,IAAc,GAAa,EAAU,GAAqB,GAAc,EAAU,GAAqB,IAAa,IAAI,CAAM,EAC5J,MAAO,GAET,GAAM,GAAgB,GAAQ,CAAM,EACpC,GAAI,CAAC,GAAc,GAAiB,GAAO,GAAuB,CAAG,EACnE,MAAO,SAAQ,IAAI,GAAuB,EAAK,CAAQ,EAEzD,GAAM,GAAM,QAAQ,IAAI,EAAQ,EAAK,CAAQ,EAO7C,MANI,IAAS,CAAG,EAAI,GAAe,IAAI,CAAG,EAAI,GAAmB,CAAG,IAG/D,IACH,EAAM,EAAQ,MAAO,CAAG,EAEtB,GACK,EAEL,GAAM,CAAG,EAEJ,AADc,CAAC,GAAiB,CAAC,GAAa,CAAG,EAClC,EAAI,MAAQ,EAEhC,GAAS,CAAG,EACP,EAAa,GAAS,CAAG,EAAI,GAAU,CAAG,EAE5C,CACT,CACF,CACA,GAAI,IAAuB,GAAa,EACxC,YAAsB,EAAU,GAAO,CACrC,MAAO,UAAc,EAAQ,EAAK,EAAO,EAAU,CACjD,GAAI,GAAW,EAAO,GACtB,GAAI,CAAC,GACH,GAAQ,EAAM,CAAK,EACnB,EAAW,EAAM,CAAQ,EACrB,CAAC,GAAQ,CAAM,GAAK,GAAM,CAAQ,GAAK,CAAC,GAAM,CAAK,GACrD,SAAS,MAAQ,EACV,GAGX,GAAM,GAAS,GAAQ,CAAM,GAAK,GAAa,CAAG,EAAI,OAAO,CAAG,EAAI,EAAO,OAAS,GAAO,EAAQ,CAAG,EAChG,EAAS,QAAQ,IAAI,EAAQ,EAAK,EAAO,CAAQ,EACvD,MAAI,KAAW,EAAM,CAAQ,GAC3B,CAAK,EAEM,GAAW,EAAO,CAAQ,GACnC,GAAQ,EAAQ,MAAO,EAAK,EAAO,CAAQ,EAF3C,GAAQ,EAAQ,MAAO,EAAK,CAAK,GAK9B,CACT,CACF,CACA,YAAwB,EAAQ,EAAK,CACnC,GAAM,GAAS,GAAO,EAAQ,CAAG,EAC3B,EAAW,EAAO,GAClB,EAAS,QAAQ,eAAe,EAAQ,CAAG,EACjD,MAAI,IAAU,GACZ,GAAQ,EAAQ,SAAU,EAAK,OAAQ,CAAQ,EAE1C,CACT,CACA,YAAa,EAAQ,EAAK,CACxB,GAAM,GAAS,QAAQ,IAAI,EAAQ,CAAG,EACtC,MAAI,EAAC,GAAS,CAAG,GAAK,CAAC,GAAe,IAAI,CAAG,IAC3C,EAAM,EAAQ,MAAO,CAAG,EAEnB,CACT,CACA,YAAiB,EAAQ,CACvB,SAAM,EAAQ,UAAW,GAAQ,CAAM,EAAI,SAAW,EAAW,EAC1D,QAAQ,QAAQ,CAAM,CAC/B,CACA,GAAI,IAAkB,CACpB,IAAK,GACL,IAAK,GACL,kBACA,OACA,UACF,EACI,GAAmB,CACrB,IAAK,GACL,IAAI,EAAQ,EAAK,CAEb,eAAQ,KAAK,yBAAyB,OAAO,CAAG,iCAAkC,CAAM,EAEnF,EACT,EACA,eAAe,EAAQ,EAAK,CAExB,eAAQ,KAAK,4BAA4B,OAAO,CAAG,iCAAkC,CAAM,EAEtF,EACT,CACF,EACI,GAAa,AAAC,GAAU,GAAS,CAAK,EAAI,GAAU,CAAK,EAAI,EAC7D,GAAa,AAAC,GAAU,GAAS,CAAK,EAAI,GAAS,CAAK,EAAI,EAC5D,GAAY,AAAC,GAAU,EACvB,GAAW,AAAC,GAAM,QAAQ,eAAe,CAAC,EAC9C,YAAe,EAAQ,EAAK,EAAa,GAAO,EAAY,GAAO,CACjE,EAAS,EACP,QAGF,GAAM,GAAY,EAAM,CAAM,EACxB,EAAS,EAAM,CAAG,EACxB,AAAI,IAAQ,GACV,CAAC,GAAc,EAAM,EAAW,MAAO,CAAG,EAE5C,CAAC,GAAc,EAAM,EAAW,MAAO,CAAM,EAC7C,GAAM,CAAE,IAAK,GAAS,GAAS,CAAS,EAClC,EAAO,EAAY,GAAY,EAAa,GAAa,GAC/D,GAAI,EAAK,KAAK,EAAW,CAAG,EAC1B,MAAO,GAAK,EAAO,IAAI,CAAG,CAAC,EACtB,GAAI,EAAK,KAAK,EAAW,CAAM,EACpC,MAAO,GAAK,EAAO,IAAI,CAAM,CAAC,EACzB,AAAI,IAAW,GACpB,EAAO,IAAI,CAAG,CAElB,CACA,YAAe,EAAK,EAAa,GAAO,CACtC,GAAM,GAAS,KACb,QAGI,EAAY,EAAM,CAAM,EACxB,EAAS,EAAM,CAAG,EACxB,MAAI,KAAQ,GACV,CAAC,GAAc,EAAM,EAAW,MAAO,CAAG,EAE5C,CAAC,GAAc,EAAM,EAAW,MAAO,CAAM,EACtC,IAAQ,EAAS,EAAO,IAAI,CAAG,EAAI,EAAO,IAAI,CAAG,GAAK,EAAO,IAAI,CAAM,CAChF,CACA,YAAc,EAAQ,EAAa,GAAO,CACxC,SAAS,EACP,QAGF,CAAC,GAAc,EAAM,EAAM,CAAM,EAAG,UAAW,EAAW,EACnD,QAAQ,IAAI,EAAQ,OAAQ,CAAM,CAC3C,CACA,YAAa,EAAO,CAClB,EAAQ,EAAM,CAAK,EACnB,GAAM,GAAS,EAAM,IAAI,EAGzB,MAAK,AADU,AADD,IAAS,CAAM,EACR,IAAI,KAAK,EAAQ,CAAK,GAEzC,GAAO,IAAI,CAAK,EAChB,GAAQ,EAAQ,MAAO,EAAO,CAAK,GAE9B,IACT,CACA,YAAe,EAAK,EAAO,CACzB,EAAQ,EAAM,CAAK,EACnB,GAAM,GAAS,EAAM,IAAI,EACnB,CAAE,IAAK,EAAM,IAAK,GAAS,GAAS,CAAM,EAC5C,EAAS,EAAK,KAAK,EAAQ,CAAG,EAClC,AAAK,EAIH,GAAkB,EAAQ,EAAM,CAAG,EAHnC,GAAM,EAAM,CAAG,EACf,EAAS,EAAK,KAAK,EAAQ,CAAG,GAIhC,GAAM,GAAW,EAAK,KAAK,EAAQ,CAAG,EACtC,SAAO,IAAI,EAAK,CAAK,EACrB,AAAK,EAEM,GAAW,EAAO,CAAQ,GACnC,GAAQ,EAAQ,MAAO,EAAK,EAAO,CAAQ,EAF3C,GAAQ,EAAQ,MAAO,EAAK,CAAK,EAI5B,IACT,CACA,YAAqB,EAAK,CACxB,GAAM,GAAS,EAAM,IAAI,EACnB,CAAE,IAAK,EAAM,IAAK,GAAS,GAAS,CAAM,EAC5C,EAAS,EAAK,KAAK,EAAQ,CAAG,EAClC,AAAK,EAIH,GAAkB,EAAQ,EAAM,CAAG,EAHnC,GAAM,EAAM,CAAG,EACf,EAAS,EAAK,KAAK,EAAQ,CAAG,GAIhC,GAAM,GAAW,EAAO,EAAK,KAAK,EAAQ,CAAG,EAAI,OAC3C,EAAS,EAAO,OAAO,CAAG,EAChC,MAAI,IACF,GAAQ,EAAQ,SAAU,EAAK,OAAQ,CAAQ,EAE1C,CACT,CACA,aAAiB,CACf,GAAM,GAAS,EAAM,IAAI,EACnB,EAAW,EAAO,OAAS,EAC3B,EAAmB,GAAM,CAAM,EAAI,GAAI,KAAI,CAAM,EAAI,GAAI,KAAI,CAAM,EACnE,EAAS,EAAO,MAAM,EAC5B,MAAI,IACF,GAAQ,EAAQ,QAAS,OAAQ,OAAQ,CAAS,EAE7C,CACT,CACA,YAAuB,EAAY,EAAW,CAC5C,MAAO,UAAiB,EAAU,EAAS,CACzC,GAAM,GAAW,KACX,EAAS,EACb,QAGI,EAAY,EAAM,CAAM,EACxB,EAAO,EAAY,GAAY,EAAa,GAAa,GAC/D,OAAC,GAAc,EAAM,EAAW,UAAW,EAAW,EAC/C,EAAO,QAAQ,CAAC,EAAO,IACrB,EAAS,KAAK,EAAS,EAAK,CAAK,EAAG,EAAK,CAAG,EAAG,CAAQ,CAC/D,CACH,CACF,CACA,YAA8B,EAAQ,EAAY,EAAW,CAC3D,MAAO,aAAY,EAAM,CACvB,GAAM,GAAS,KACb,QAGI,EAAY,EAAM,CAAM,EACxB,EAAc,GAAM,CAAS,EAC7B,EAAS,IAAW,WAAa,IAAW,OAAO,UAAY,EAC/D,EAAY,IAAW,QAAU,EACjC,EAAgB,EAAO,GAAQ,GAAG,CAAI,EACtC,EAAO,EAAY,GAAY,EAAa,GAAa,GAC/D,OAAC,GAAc,EAAM,EAAW,UAAW,EAAY,GAAsB,EAAW,EACjF,CAEL,MAAO,CACL,GAAM,CAAE,QAAO,QAAS,EAAc,KAAK,EAC3C,MAAO,GAAO,CAAE,QAAO,MAAK,EAAI,CAC9B,MAAO,EAAS,CAAC,EAAK,EAAM,EAAE,EAAG,EAAK,EAAM,EAAE,CAAC,EAAI,EAAK,CAAK,EAC7D,MACF,CACF,EAEA,CAAC,OAAO,WAAY,CAClB,MAAO,KACT,CACF,CACF,CACF,CACA,YAA8B,EAAM,CAClC,MAAO,aAAY,EAAM,CACb,CACR,GAAM,GAAM,EAAK,GAAK,WAAW,EAAK,OAAS,GAC/C,QAAQ,KAAK,GAAG,GAAW,CAAI,eAAe,+BAAkC,EAAM,IAAI,CAAC,CAC7F,CACA,MAAO,KAAS,SAAW,GAAQ,IACrC,CACF,CACA,aAAkC,CAChC,GAAM,GAA2B,CAC/B,IAAI,EAAK,CACP,MAAO,IAAM,KAAM,CAAG,CACxB,EACA,GAAI,OAAO,CACT,MAAO,IAAK,IAAI,CAClB,EACA,IAAK,GACL,OACA,IAAK,GACL,OAAQ,GACR,SACA,QAAS,GAAc,GAAO,EAAK,CACrC,EACM,EAA2B,CAC/B,IAAI,EAAK,CACP,MAAO,IAAM,KAAM,EAAK,GAAO,EAAI,CACrC,EACA,GAAI,OAAO,CACT,MAAO,IAAK,IAAI,CAClB,EACA,IAAK,GACL,OACA,IAAK,GACL,OAAQ,GACR,SACA,QAAS,GAAc,GAAO,EAAI,CACpC,EACM,EAA4B,CAChC,IAAI,EAAK,CACP,MAAO,IAAM,KAAM,EAAK,EAAI,CAC9B,EACA,GAAI,OAAO,CACT,MAAO,IAAK,KAAM,EAAI,CACxB,EACA,IAAI,EAAK,CACP,MAAO,IAAM,KAAK,KAAM,EAAK,EAAI,CACnC,EACA,IAAK,GACH,KAEF,EACA,IAAK,GACH,KAEF,EACA,OAAQ,GACN,QAEF,EACA,MAAO,GACL,OAEF,EACA,QAAS,GAAc,GAAM,EAAK,CACpC,EACM,EAAmC,CACvC,IAAI,EAAK,CACP,MAAO,IAAM,KAAM,EAAK,GAAM,EAAI,CACpC,EACA,GAAI,OAAO,CACT,MAAO,IAAK,KAAM,EAAI,CACxB,EACA,IAAI,EAAK,CACP,MAAO,IAAM,KAAK,KAAM,EAAK,EAAI,CACnC,EACA,IAAK,GACH,KAEF,EACA,IAAK,GACH,KAEF,EACA,OAAQ,GACN,QAEF,EACA,MAAO,GACL,OAEF,EACA,QAAS,GAAc,GAAM,EAAI,CACnC,EAEA,MADwB,CAAC,OAAQ,SAAU,UAAW,OAAO,QAAQ,EACrD,QAAQ,AAAC,GAAW,CAClC,EAAyB,GAAU,GAAqB,EAAQ,GAAO,EAAK,EAC5E,EAA0B,GAAU,GAAqB,EAAQ,GAAM,EAAK,EAC5E,EAAyB,GAAU,GAAqB,EAAQ,GAAO,EAAI,EAC3E,EAAiC,GAAU,GAAqB,EAAQ,GAAM,EAAI,CACpF,CAAC,EACM,CACL,EACA,EACA,EACA,CACF,CACF,CACA,GAAI,CAAC,GAAyB,GAA0B,GAAyB,IAAmD,GAAuB,EAC3J,YAAqC,EAAY,EAAS,CACxD,GAAM,GAAmB,EAAU,EAAa,GAAkC,GAA0B,EAAa,GAA2B,GACpJ,MAAO,CAAC,EAAQ,EAAK,IACf,IAAQ,iBACH,CAAC,EACC,IAAQ,iBACV,EACE,IAAQ,UACV,EAEF,QAAQ,IAAI,GAAO,EAAkB,CAAG,GAAK,IAAO,GAAS,EAAmB,EAAQ,EAAK,CAAQ,CAEhH,CACA,GAAI,IAA4B,CAC9B,IAAqB,GAA4B,GAAO,EAAK,CAC/D,EACI,GAA6B,CAC/B,IAAqB,GAA4B,GAAM,EAAK,CAC9D,EACA,YAA2B,EAAQ,EAAM,EAAK,CAC5C,GAAM,GAAS,EAAM,CAAG,EACxB,GAAI,IAAW,GAAO,EAAK,KAAK,EAAQ,CAAM,EAAG,CAC/C,GAAM,GAAO,GAAU,CAAM,EAC7B,QAAQ,KAAK,YAAY,mEAAsE,IAAS,MAAQ,WAAa,gKAAgK,CAC/R,CACF,CACA,GAAI,IAA8B,GAAI,SAClC,GAAqC,GAAI,SACzC,GAA8B,GAAI,SAClC,GAAqC,GAAI,SAC7C,YAAuB,EAAS,CAC9B,OAAQ,OACD,aACA,QACH,MAAO,OACJ,UACA,UACA,cACA,UACH,MAAO,WAEP,MAAO,GAEb,CACA,YAAuB,EAAO,CAC5B,MAAO,GACL,UAEG,CAAC,OAAO,aAAa,CAAK,EAAI,EAAI,GAAc,GAAU,CAAK,CAAC,CACvE,CACA,YAAmB,EAAQ,CACzB,MAAI,IAAU,EACZ,eAGO,EAEF,GAAqB,EAAQ,GAAO,GAAiB,GAA2B,EAAW,CACpG,CACA,YAAkB,EAAQ,CACxB,MAAO,IAAqB,EAAQ,GAAM,GAAkB,GAA4B,EAAW,CACrG,CACA,YAA8B,EAAQ,EAAY,EAAc,EAAoB,EAAU,CAC5F,GAAI,CAAC,GAAS,CAAM,EAEhB,eAAQ,KAAK,kCAAkC,OAAO,CAAM,GAAG,EAE1D,EAET,GAAI,EACF,SAEG,CAAE,IAAc,EACnB,gBAGA,MAAO,GAET,GAAM,GAAgB,EAAS,IAAI,CAAM,EACzC,GAAI,EACF,MAAO,GAET,GAAM,GAAa,GAAc,CAAM,EACvC,GAAI,IAAe,EACjB,MAAO,GAET,GAAM,GAAQ,GAAI,OAAM,EAAQ,IAAe,EAAI,EAAqB,CAAY,EACpF,SAAS,IAAI,EAAQ,CAAK,EACnB,CACT,CACA,WAAe,EAAU,CACvB,MAAO,IAAY,EAAM,EACvB,OAED,GAAK,CACR,CACA,YAAe,EAAG,CAChB,MAAO,SAAQ,GAAK,EAAE,YAAc,EAAI,CAC1C,CAGA,EAAM,WAAY,IAAM,EAAQ,EAGhC,EAAM,WAAY,AAAC,GAAO,GAAS,KAAK,GAAU,CAAE,CAAC,EAGrD,EAAM,QAAS,CAAC,EAAI,CAAE,cAAe,EAAgB,QAAS,KAAe,CAAC,EAAK,IAAa,CAC9F,GAAI,GAAY,EAAe,CAAG,EAM9B,EAAU,GALD,IAAM,CACjB,GAAI,GACJ,SAAU,AAAC,GAAM,EAAQ,CAAC,EACnB,CACT,EAC4B,CAAQ,EACpC,EAAS,CAAO,CAClB,CAAC,EAGD,EAAM,QAAS,EAAS,EAGxB,EAAM,OAAQ,AAAC,GAAO,GAAM,CAAE,CAAC,EAG/B,EAAM,OAAQ,AAAC,GAAO,GAAY,CAAE,CAAC,EAGrC,EAAM,OAAQ,AAAC,GACT,GAAG,eAEP,GAAG,cAAgB,GAAa,GAAoB,CAAE,CAAC,GAChD,EAAG,cACX,EACD,YAA6B,EAAI,CAC/B,GAAI,GAAa,CAAC,EAClB,UAAY,EAAI,AAAC,GAAM,CACrB,AAAI,EAAE,SACJ,EAAW,KAAK,EAAE,OAAO,CAC7B,CAAC,EACM,CACT,CAGA,GAAI,IAAe,CAAC,EACpB,YAA4B,EAAM,CAChC,MAAK,IAAa,IAChB,IAAa,GAAQ,GAChB,EAAE,GAAa,EACxB,CACA,YAAuB,EAAI,EAAM,CAC/B,MAAO,IAAY,EAAI,AAAC,GAAY,CAClC,GAAI,EAAQ,QAAU,EAAQ,OAAO,GACnC,MAAO,EACX,CAAC,CACH,CACA,YAAmB,EAAI,EAAM,CAC3B,AAAK,EAAG,QACN,GAAG,OAAS,CAAC,GACV,EAAG,OAAO,IACb,GAAG,OAAO,GAAQ,GAAmB,CAAI,EAC7C,CAGA,EAAM,KAAM,CAAC,EAAI,CAAE,QAAS,KAAe,CAAC,EAAM,EAAM,OAAS,CAC/D,GAAI,GAAW,GAAG,IAAO,EAAM,IAAI,IAAQ,KAC3C,MAAO,IAAuB,EAAI,EAAU,EAAU,IAAM,CAC1D,GAAI,GAAO,GAAc,EAAI,CAAI,EAC7B,EAAK,EAAO,EAAK,OAAO,GAAQ,GAAmB,CAAI,EAC3D,MAAO,GAAM,GAAG,KAAQ,KAAM,IAAQ,GAAG,KAAQ,GACnD,CAAC,CACH,CAAC,EACD,GAAe,CAAC,EAAM,IAAO,CAC3B,AAAI,EAAK,OACP,GAAG,MAAQ,EAAK,MAEpB,CAAC,EACD,YAAgC,EAAI,EAAU,EAAU,EAAU,CAGhE,GAFK,EAAG,OACN,GAAG,MAAQ,CAAC,GACV,EAAG,MAAM,GACX,MAAO,GAAG,MAAM,GAClB,GAAI,GAAS,EAAS,EACtB,SAAG,MAAM,GAAY,EACrB,EAAS,IAAM,CACb,MAAO,GAAG,MAAM,EAClB,CAAC,EACM,CACT,CAGA,EAAM,KAAM,AAAC,GAAO,CAAE,EAGtB,GAAuB,QAAS,QAAS,OAAO,EAChD,GAAuB,UAAW,UAAW,SAAS,EACtD,YAAgC,EAAM,EAAW,EAAM,CACrD,EAAM,EAAW,AAAC,GAAO,EAAK,mBAAmB,oCAA4C,gDAAmD,IAAQ,CAAE,CAAC,CAC7J,CAGA,EAAU,YAAa,CAAC,EAAI,CAAE,cAAc,CAAE,OAAQ,EAAS,cAAe,EAAgB,QAAS,KAAe,CACpH,GAAI,GAAO,EAAe,CAAU,EAChC,EAAW,IAAM,CACnB,GAAI,GACJ,SAAK,AAAC,GAAM,EAAS,CAAC,EACf,CACT,EACI,EAAmB,EAAe,GAAG,mBAA4B,EACjE,EAAW,AAAC,GAAQ,EAAiB,IAAM,CAC/C,EAAG,CAAE,MAAO,CAAE,cAAiB,CAAI,CAAE,CAAC,EAClC,EAAe,EAAS,EAC5B,EAAS,CAAY,EACrB,eAAe,IAAM,CACnB,GAAI,CAAC,EAAG,SACN,OACF,EAAG,wBAAwB,QAAW,EACtC,GAAI,GAAW,EAAG,SAAS,IACvB,EAAW,EAAG,SAAS,IACvB,EAAsB,GACxB,CACE,KAAM,CACJ,MAAO,GAAS,CAClB,EACA,IAAI,EAAO,CACT,EAAS,CAAK,CAChB,CACF,EACA,CACE,KAAM,CACJ,MAAO,GAAS,CAClB,EACA,IAAI,EAAO,CACT,EAAS,CAAK,CAChB,CACF,CACF,EACA,EAAS,CAAmB,CAC9B,CAAC,CACH,CAAC,EAGD,EAAU,WAAY,CAAC,EAAI,CAAE,YAAW,cAAc,CAAE,QAAS,KAAe,CAC9E,AAAI,EAAG,QAAQ,YAAY,IAAM,YAC/B,EAAK,kDAAmD,CAAE,EAC5D,GAAI,GAAS,GAAU,CAAU,EAC7B,EAAS,EAAG,QAAQ,UAAU,EAAI,EAAE,kBACxC,EAAG,YAAc,EACjB,EAAO,gBAAkB,EACzB,EAAG,aAAa,yBAA0B,EAAI,EAC9C,EAAO,aAAa,uBAAwB,EAAI,EAC5C,EAAG,kBACL,EAAG,iBAAiB,QAAQ,AAAC,GAAc,CACzC,EAAO,iBAAiB,EAAW,AAAC,GAAM,CACxC,EAAE,gBAAgB,EAClB,EAAG,cAAc,GAAI,GAAE,YAAY,EAAE,KAAM,CAAC,CAAC,CAC/C,CAAC,CACH,CAAC,EAEH,GAAe,EAAQ,CAAC,EAAG,CAAE,EAC7B,GAAI,GAAa,CAAC,EAAQ,EAAS,IAAe,CAChD,AAAI,EAAW,SAAS,SAAS,EAC/B,EAAQ,WAAW,aAAa,EAAQ,CAAO,EAC1C,AAAI,EAAW,SAAS,QAAQ,EACrC,EAAQ,WAAW,aAAa,EAAQ,EAAQ,WAAW,EAE3D,EAAQ,YAAY,CAAM,CAE9B,EACA,EAAU,IAAM,CACd,EAAW,EAAQ,EAAQ,CAAS,EACpC,GAAgB,IAAM,CACpB,GAAS,CAAM,EACf,EAAO,UAAY,EACrB,CAAC,EAAE,CACL,CAAC,EACD,EAAG,mBAAqB,IAAM,CAC5B,GAAI,GAAU,GAAU,CAAU,EAClC,EAAU,IAAM,CACd,EAAW,EAAG,YAAa,EAAS,CAAS,CAC/C,CAAC,CACH,EACA,EAAS,IAAM,EAAO,OAAO,CAAC,CAChC,CAAC,EACD,GAAI,IAA+B,SAAS,cAAc,KAAK,EAC/D,YAAmB,EAAY,CAC7B,GAAI,GAAS,GAAgB,IACpB,SAAS,cAAc,CAAU,EACvC,IACM,EACR,EAAE,EACH,MAAK,IACH,EAAK,iDAAiD,IAAa,EAC9D,CACT,CAGA,GAAI,IAAU,IAAM,CACpB,EACA,GAAQ,OAAS,CAAC,EAAI,CAAE,aAAa,CAAE,QAAS,KAAe,CAC7D,EAAU,SAAS,MAAM,EAAI,EAAG,cAAgB,GAAO,EAAG,UAAY,GACtE,EAAS,IAAM,CACb,EAAU,SAAS,MAAM,EAAI,MAAO,GAAG,cAAgB,MAAO,GAAG,SACnE,CAAC,CACH,EACA,EAAU,SAAU,EAAO,EAG3B,EAAU,SAAU,GAAgB,CAAC,EAAI,CAAE,cAAc,CAAE,OAAQ,KAAc,CAC/E,EAAQ,EAAc,EAAI,CAAU,CAAC,CACvC,CAAC,CAAC,EAGF,YAAY,EAAI,EAAO,EAAW,EAAU,CAC1C,GAAI,GAAiB,EACjB,EAAW,AAAC,GAAM,EAAS,CAAC,EAC5B,EAAU,CAAC,EACX,EAAc,CAAC,EAAW,IAAY,AAAC,GAAM,EAAQ,EAAW,CAAC,EAarE,GAZI,EAAU,SAAS,KAAK,GAC1B,GAAQ,GAAU,CAAK,GACrB,EAAU,SAAS,OAAO,GAC5B,GAAQ,GAAW,CAAK,GACtB,EAAU,SAAS,SAAS,GAC9B,GAAQ,QAAU,IAChB,EAAU,SAAS,SAAS,GAC9B,GAAQ,QAAU,IAChB,EAAU,SAAS,QAAQ,GAC7B,GAAiB,QACf,EAAU,SAAS,UAAU,GAC/B,GAAiB,UACf,EAAU,SAAS,UAAU,EAAG,CAClC,GAAI,GAAe,EAAU,EAAU,QAAQ,UAAU,EAAI,IAAM,eAC/D,EAAO,GAAU,EAAa,MAAM,IAAI,EAAE,EAAE,EAAI,OAAO,EAAa,MAAM,IAAI,EAAE,EAAE,EAAI,IAC1F,EAAW,GAAS,EAAU,CAAI,CACpC,CACA,GAAI,EAAU,SAAS,UAAU,EAAG,CAClC,GAAI,GAAe,EAAU,EAAU,QAAQ,UAAU,EAAI,IAAM,eAC/D,EAAO,GAAU,EAAa,MAAM,IAAI,EAAE,EAAE,EAAI,OAAO,EAAa,MAAM,IAAI,EAAE,EAAE,EAAI,IAC1F,EAAW,GAAS,EAAU,CAAI,CACpC,CACA,MAAI,GAAU,SAAS,SAAS,GAC9B,GAAW,EAAY,EAAU,CAAC,EAAM,IAAM,CAC5C,EAAE,eAAe,EACjB,EAAK,CAAC,CACR,CAAC,GACC,EAAU,SAAS,MAAM,GAC3B,GAAW,EAAY,EAAU,CAAC,EAAM,IAAM,CAC5C,EAAE,gBAAgB,EAClB,EAAK,CAAC,CACR,CAAC,GACC,EAAU,SAAS,MAAM,GAC3B,GAAW,EAAY,EAAU,CAAC,EAAM,IAAM,CAC5C,EAAK,CAAC,EACN,EAAe,oBAAoB,EAAO,EAAU,CAAO,CAC7D,CAAC,GAEC,GAAU,SAAS,MAAM,GAAK,EAAU,SAAS,SAAS,IAC5D,GAAiB,SACjB,EAAW,EAAY,EAAU,CAAC,EAAM,IAAM,CAC5C,AAAI,EAAG,SAAS,EAAE,MAAM,GAEpB,EAAE,OAAO,cAAgB,IAEzB,GAAG,YAAc,GAAK,EAAG,aAAe,GAExC,EAAG,aAAe,IAEtB,EAAK,CAAC,EACR,CAAC,GAEC,EAAU,SAAS,MAAM,GAC3B,GAAW,EAAY,EAAU,CAAC,EAAM,IAAM,CAC5C,EAAE,SAAW,GAAM,EAAK,CAAC,CAC3B,CAAC,GACC,IAAW,CAAK,GAAK,GAAa,CAAK,IACzC,GAAW,EAAY,EAAU,CAAC,EAAM,IAAM,CAC5C,AAAI,GAA+C,EAAG,CAAS,GAG/D,EAAK,CAAC,CACR,CAAC,GAEH,EAAe,iBAAiB,EAAO,EAAU,CAAO,EACjD,IAAM,CACX,EAAe,oBAAoB,EAAO,EAAU,CAAO,CAC7D,CACF,CACA,YAAmB,EAAS,CAC1B,MAAO,GAAQ,QAAQ,KAAM,GAAG,CAClC,CACA,YAAoB,EAAS,CAC3B,MAAO,GAAQ,YAAY,EAAE,QAAQ,SAAU,CAAC,EAAO,IAAS,EAAK,YAAY,CAAC,CACpF,CACA,YAAmB,EAAS,CAC1B,MAAO,CAAC,MAAM,QAAQ,CAAO,GAAK,CAAC,MAAM,CAAO,CAClD,CACA,YAAoB,EAAS,CAC3B,MAAI,CAAC,IAAK,GAAG,EAAE,SACb,CACF,EACS,EACF,EAAQ,QAAQ,kBAAmB,OAAO,EAAE,QAAQ,QAAS,GAAG,EAAE,YAAY,CACvF,CACA,YAAoB,EAAO,CACzB,MAAO,CAAC,UAAW,OAAO,EAAE,SAAS,CAAK,CAC5C,CACA,YAAsB,EAAO,CAC3B,MAAO,CAAC,cAAe,QAAS,OAAO,EAAE,KAAK,AAAC,GAAM,EAAM,SAAS,CAAC,CAAC,CACxE,CACA,YAAwD,EAAG,EAAW,CACpE,GAAI,GAAe,EAAU,OAAO,AAAC,GAC5B,CAAC,CAAC,SAAU,WAAY,UAAW,OAAQ,OAAQ,UAAW,OAAQ,OAAQ,UAAW,SAAS,EAAE,SAAS,CAAC,CACtH,EACD,GAAI,EAAa,SAAS,UAAU,EAAG,CACrC,GAAI,GAAgB,EAAa,QAAQ,UAAU,EACnD,EAAa,OAAO,EAAe,GAAW,GAAa,EAAgB,IAAM,gBAAgB,MAAM,IAAI,EAAE,EAAE,EAAI,EAAI,CAAC,CAC1H,CACA,GAAI,EAAa,SAAS,UAAU,EAAG,CACrC,GAAI,GAAgB,EAAa,QAAQ,UAAU,EACnD,EAAa,OAAO,EAAe,GAAW,GAAa,EAAgB,IAAM,gBAAgB,MAAM,IAAI,EAAE,EAAE,EAAI,EAAI,CAAC,CAC1H,CAGA,GAFI,EAAa,SAAW,GAExB,EAAa,SAAW,GAAK,GAAe,EAAE,GAAG,EAAE,SAAS,EAAa,EAAE,EAC7E,MAAO,GAET,GAAM,GAA6B,AADR,CAAC,OAAQ,QAAS,MAAO,OAAQ,MAAO,OAAO,EACpB,OAAO,AAAC,GAAa,EAAa,SAAS,CAAQ,CAAC,EAE1G,MADA,GAAe,EAAa,OAAO,AAAC,GAAM,CAAC,EAA2B,SAAS,CAAC,CAAC,EAC7E,IAA2B,OAAS,GAMlC,AALgC,EAA2B,OAAO,AAAC,GACjE,MAAa,OAAS,IAAa,UACrC,GAAW,QACN,EAAE,GAAG,QACb,EAC+B,SAAW,EAA2B,QAChE,IAAa,EAAE,IAAI,GAEnB,GAAe,EAAE,GAAG,EAAE,SAAS,EAAa,EAAE,GAKxD,CACA,YAAwB,EAAK,CAC3B,GAAI,CAAC,EACH,MAAO,CAAC,EACV,EAAM,GAAW,CAAG,EACpB,GAAI,GAAmB,CACrB,KAAQ,UACR,MAAS,IACT,MAAS,IACT,SAAY,IACZ,IAAO,OACP,IAAO,SACP,GAAM,WACN,KAAQ,aACR,KAAQ,aACR,MAAS,cACT,OAAU,IACV,MAAS,IACT,MAAS,IACT,MAAS,IACT,WAAc,GAChB,EACA,SAAiB,GAAO,EACjB,OAAO,KAAK,CAAgB,EAAE,IAAI,AAAC,GAAa,CACrD,GAAI,EAAiB,KAAc,EACjC,MAAO,EACX,CAAC,EAAE,OAAO,AAAC,GAAa,CAAQ,CAClC,CAGA,EAAU,QAAS,CAAC,EAAI,CAAE,YAAW,cAAc,CAAE,OAAQ,EAAS,QAAS,KAAe,CAC5F,GAAI,GAAc,EAClB,AAAI,EAAU,SAAS,QAAQ,GAC7B,GAAc,EAAG,YAEnB,GAAI,GAAc,EAAc,EAAa,CAAU,EACnD,EACJ,AAAI,MAAO,IAAe,SACxB,EAAc,EAAc,EAAa,GAAG,mBAA4B,EACnE,AAAI,MAAO,IAAe,YAAc,MAAO,GAAW,GAAM,SACrE,EAAc,EAAc,EAAa,GAAG,EAAW,mBAAmB,EAE1E,EAAc,IAAM,CACpB,EAEF,GAAI,GAAW,IAAM,CACnB,GAAI,GACJ,SAAY,AAAC,GAAU,EAAS,CAAK,EAC9B,GAAe,CAAM,EAAI,EAAO,IAAI,EAAI,CACjD,EACI,EAAW,AAAC,GAAU,CACxB,GAAI,GACJ,EAAY,AAAC,GAAW,EAAS,CAAM,EACvC,AAAI,GAAe,CAAM,EACvB,EAAO,IAAI,CAAK,EAEhB,EAAY,IAAM,CAClB,EAAG,CACD,MAAO,CAAE,cAAiB,CAAM,CAClC,CAAC,CAEL,EACA,AAAI,MAAO,IAAe,UAAY,EAAG,OAAS,SAChD,EAAU,IAAM,CACd,AAAK,EAAG,aAAa,MAAM,GACzB,EAAG,aAAa,OAAQ,CAAU,CACtC,CAAC,EAEH,GAAI,GAAQ,EAAG,QAAQ,YAAY,IAAM,UAAY,CAAC,WAAY,OAAO,EAAE,SAAS,EAAG,IAAI,GAAK,EAAU,SAAS,MAAM,EAAI,SAAW,QACxI,GAAI,GAAiB,GAAY,IAAM,CACvC,EAAI,GAAG,EAAI,EAAO,EAAW,AAAC,GAAM,CAClC,EAAS,GAAc,EAAI,EAAW,EAAG,EAAS,CAAC,CAAC,CACtD,CAAC,EAYD,GAXI,EAAU,SAAS,MAAM,GACvB,EAAC,OAAQ,KAAM,EAAE,EAAE,SAAS,EAAS,CAAC,GAAK,EAAG,OAAS,YAAc,MAAM,QAAQ,EAAS,CAAC,GAAK,EAAG,QAAQ,YAAY,IAAM,UAAY,EAAG,WAChJ,EACE,GAAc,EAAI,EAAW,CAAE,OAAQ,CAAG,EAAG,EAAS,CAAC,CACzD,EAGC,EAAG,yBACN,GAAG,wBAA0B,CAAC,GAChC,EAAG,wBAAwB,QAAa,EACxC,EAAS,IAAM,EAAG,wBAAwB,QAAW,CAAC,EAClD,EAAG,KAAM,CACX,GAAI,GAAsB,GAAG,EAAG,KAAM,QAAS,CAAC,EAAG,AAAC,GAAM,CACxD,GAAS,IAAM,EAAG,UAAY,EAAG,SAAS,IAAI,GAAc,EAAI,EAAW,CAAE,OAAQ,CAAG,EAAG,EAAS,CAAC,CAAC,CAAC,CACzG,CAAC,EACD,EAAS,IAAM,EAAoB,CAAC,CACtC,CACA,EAAG,SAAW,CACZ,KAAM,CACJ,MAAO,GAAS,CAClB,EACA,IAAI,EAAO,CACT,EAAS,CAAK,CAChB,CACF,EACA,EAAG,oBAAsB,AAAC,GAAU,CAClC,AAAI,IAAU,QAAU,MAAO,IAAe,UAAY,EAAW,MAAM,IAAI,GAC7E,GAAQ,IACV,OAAO,UAAY,GACnB,EAAU,IAAM,GAAK,EAAI,QAAS,CAAK,CAAC,EACxC,MAAO,QAAO,SAChB,EACA,EAAQ,IAAM,CACZ,GAAI,GAAQ,EAAS,EACrB,AAAI,EAAU,SAAS,aAAa,GAAK,SAAS,cAAc,WAAW,CAAE,GAE7E,EAAG,oBAAoB,CAAK,CAC9B,CAAC,CACH,CAAC,EACD,YAAuB,EAAI,EAAW,EAAO,EAAc,CACzD,MAAO,GAAU,IAAM,CACrB,GAAI,YAAiB,cAAe,EAAM,SAAW,OACnD,MAAO,GAAM,SAAW,MAAQ,EAAM,SAAW,OAAS,EAAM,OAAS,EAAM,OAAO,MACnF,GAAI,EAAG,OAAS,WACnB,GAAI,MAAM,QAAQ,CAAY,EAAG,CAC/B,GAAI,GAAW,KACf,MAAI,GAAU,SAAS,QAAQ,EAC7B,EAAW,GAAgB,EAAM,OAAO,KAAK,EACxC,AAAI,EAAU,SAAS,SAAS,EACrC,EAAW,GAAiB,EAAM,OAAO,KAAK,EAE9C,EAAW,EAAM,OAAO,MAEnB,EAAM,OAAO,QAAU,EAAa,SAAS,CAAQ,EAAI,EAAe,EAAa,OAAO,CAAC,CAAQ,CAAC,EAAI,EAAa,OAAO,AAAC,GAAQ,CAAC,GAAyB,EAAK,CAAQ,CAAC,CACxL,KACE,OAAO,GAAM,OAAO,YAEjB,IAAI,EAAG,QAAQ,YAAY,IAAM,UAAY,EAAG,SACrD,MAAI,GAAU,SAAS,QAAQ,EACtB,MAAM,KAAK,EAAM,OAAO,eAAe,EAAE,IAAI,AAAC,GAAW,CAC9D,GAAI,GAAW,EAAO,OAAS,EAAO,KACtC,MAAO,IAAgB,CAAQ,CACjC,CAAC,EACQ,EAAU,SAAS,SAAS,EAC9B,MAAM,KAAK,EAAM,OAAO,eAAe,EAAE,IAAI,AAAC,GAAW,CAC9D,GAAI,GAAW,EAAO,OAAS,EAAO,KACtC,MAAO,IAAiB,CAAQ,CAClC,CAAC,EAEI,MAAM,KAAK,EAAM,OAAO,eAAe,EAAE,IAAI,AAAC,GAC5C,EAAO,OAAS,EAAO,IAC/B,EACI,CACL,GAAI,GAUJ,MATA,AAAI,GAAG,OAAS,QACd,AAAI,EAAM,OAAO,QACf,EAAW,EAAM,OAAO,MAExB,EAAW,EAGb,EAAW,EAAM,OAAO,MAEtB,EAAU,SAAS,QAAQ,EACtB,GAAgB,CAAQ,EACtB,EAAU,SAAS,SAAS,EAC9B,GAAiB,CAAQ,EACvB,EAAU,SAAS,MAAM,EAC3B,EAAS,KAAK,EAEd,CAEX,EACF,CAAC,CACH,CACA,YAAyB,EAAU,CACjC,GAAI,GAAS,EAAW,WAAW,CAAQ,EAAI,KAC/C,MAAO,IAAW,CAAM,EAAI,EAAS,CACvC,CACA,YAAkC,EAAQ,EAAQ,CAChD,MAAO,IAAU,CACnB,CACA,YAAoB,EAAS,CAC3B,MAAO,CAAC,MAAM,QAAQ,CAAO,GAAK,CAAC,MAAM,CAAO,CAClD,CACA,YAAwB,EAAO,CAC7B,MAAO,KAAU,MAAQ,MAAO,IAAU,UAAY,MAAO,GAAM,KAAQ,YAAc,MAAO,GAAM,KAAQ,UAChH,CAGA,EAAU,QAAS,AAAC,GAAO,eAAe,IAAM,EAAU,IAAM,EAAG,gBAAgB,GAAO,OAAO,CAAC,CAAC,CAAC,CAAC,EAGrG,GAAgB,IAAM,IAAI,GAAO,MAAM,IAAI,EAC3C,EAAU,OAAQ,GAAgB,CAAC,EAAI,CAAE,cAAc,CAAE,SAAU,KAC7D,MAAO,IAAe,SACjB,CAAC,CAAC,EAAW,KAAK,GAAK,EAAU,EAAY,CAAC,EAAG,EAAK,EAExD,EAAU,EAAY,CAAC,EAAG,EAAK,CACvC,CAAC,EAGF,EAAU,OAAQ,CAAC,EAAI,CAAE,cAAc,CAAE,OAAQ,EAAS,cAAe,KAAqB,CAC5F,GAAI,GAAY,EAAe,CAAU,EACzC,EAAQ,IAAM,CACZ,EAAU,AAAC,GAAU,CACnB,EAAU,IAAM,CACd,EAAG,YAAc,CACnB,CAAC,CACH,CAAC,CACH,CAAC,CACH,CAAC,EAGD,EAAU,OAAQ,CAAC,EAAI,CAAE,cAAc,CAAE,OAAQ,EAAS,cAAe,KAAqB,CAC5F,GAAI,GAAY,EAAe,CAAU,EACzC,EAAQ,IAAM,CACZ,EAAU,AAAC,GAAU,CACnB,EAAU,IAAM,CACd,EAAG,UAAY,EACf,EAAG,cAAgB,GACnB,GAAS,CAAE,EACX,MAAO,GAAG,aACZ,CAAC,CACH,CAAC,CACH,CAAC,CACH,CAAC,EAGD,GAAc,GAAa,IAAK,GAAK,GAAO,OAAO,CAAC,CAAC,CAAC,EACtD,GAAI,IAAW,CAAC,EAAI,CAAE,QAAO,YAAW,aAAY,YAAY,CAAE,OAAQ,EAAS,QAAS,KAAe,CACzG,GAAI,CAAC,EAAO,CACV,GAAI,GAAmB,CAAC,EACxB,GAAuB,CAAgB,EAEvC,AADkB,EAAc,EAAI,CAAU,EAClC,AAAC,GAAa,CACxB,GAAoB,EAAI,EAAU,CAAQ,CAC5C,EAAG,CAAE,MAAO,CAAiB,CAAC,EAC9B,MACF,CACA,GAAI,IAAU,MACZ,MAAO,IAAgB,EAAI,CAAU,EACvC,GAAI,EAAG,mBAAqB,EAAG,kBAAkB,IAAU,EAAG,kBAAkB,GAAO,QACrF,OAEF,GAAI,GAAY,EAAc,EAAI,CAAU,EAC5C,EAAQ,IAAM,EAAU,AAAC,GAAW,CAClC,AAAI,IAAW,QAAU,MAAO,IAAe,UAAY,EAAW,MAAM,IAAI,GAC9E,GAAS,IAEX,EAAU,IAAM,GAAK,EAAI,EAAO,EAAQ,CAAS,CAAC,CACpD,CAAC,CAAC,EACF,EAAS,IAAM,CACb,EAAG,qBAAuB,EAAG,oBAAoB,EACjD,EAAG,oBAAsB,EAAG,mBAAmB,CACjD,CAAC,CACH,EACA,GAAS,OAAS,CAAC,EAAI,CAAE,QAAO,YAAW,gBAAiB,CAC1D,AAAI,CAAC,GAEA,GAAG,mBACN,GAAG,kBAAoB,CAAC,GAC1B,EAAG,kBAAkB,GAAS,CAAE,aAAY,QAAS,EAAM,EAC7D,EACA,EAAU,OAAQ,EAAQ,EAC1B,YAAyB,EAAI,EAAY,CACvC,EAAG,iBAAmB,CACxB,CAGA,GAAgB,IAAM,IAAI,GAAO,MAAM,IAAI,EAC3C,EAAU,OAAQ,CAAC,EAAI,CAAE,cAAc,CAAE,QAAS,KAAe,CAC/D,GAAI,GAAqC,CAAE,EACzC,OACF,EAAa,IAAe,GAAK,KAAO,EACxC,GAAI,GAAe,CAAC,EACpB,GAAa,EAAc,CAAE,EAC7B,GAAI,GAAsB,CAAC,EAC3B,GAAoB,EAAqB,CAAY,EACrD,GAAI,GAAQ,GAAS,EAAI,EAAY,CAAE,MAAO,CAAoB,CAAC,EACnE,AAAI,KAAU,QAAU,IAAU,KAChC,GAAQ,CAAC,GACX,GAAa,EAAO,CAAE,EACtB,GAAI,GAAe,GAAS,CAAK,EACjC,GAAiB,CAAY,EAC7B,GAAI,GAAO,GAAe,EAAI,CAAY,EAC1C,EAAa,MAAW,GAAS,EAAI,EAAa,IAAO,EACzD,EAAS,IAAM,CACb,EAAa,SAAc,GAAS,EAAI,EAAa,OAAU,EAC/D,EAAK,CACP,CAAC,CACH,CAAC,EACD,GAAe,CAAC,EAAM,IAAO,CAC3B,AAAI,EAAK,cACP,GAAG,aAAe,EAAK,aACvB,EAAG,aAAa,wBAAyB,EAAI,EAEjD,CAAC,EACD,YAA8C,EAAI,CAChD,MAAK,IAED,GACK,GACF,EAAG,aAAa,uBAAuB,EAHrC,EAIX,CAGA,EAAU,OAAQ,CAAC,EAAI,CAAE,YAAW,cAAc,CAAE,OAAQ,KAAc,CACxE,GAAI,GAAY,EAAc,EAAI,CAAU,EAC5C,AAAK,EAAG,WACN,GAAG,UAAY,IAAM,CACnB,EAAU,IAAM,CACd,EAAG,MAAM,YAAY,UAAW,OAAQ,EAAU,SAAS,WAAW,EAAI,YAAc,MAAM,CAChG,CAAC,CACH,GACG,EAAG,WACN,GAAG,UAAY,IAAM,CACnB,EAAU,IAAM,CACd,AAAI,EAAG,MAAM,SAAW,GAAK,EAAG,MAAM,UAAY,OAChD,EAAG,gBAAgB,OAAO,EAE1B,EAAG,MAAM,eAAe,SAAS,CAErC,CAAC,CACH,GACF,GAAI,GAAO,IAAM,CACf,EAAG,UAAU,EACb,EAAG,WAAa,EAClB,EACI,EAAO,IAAM,CACf,EAAG,UAAU,EACb,EAAG,WAAa,EAClB,EACI,EAA0B,IAAM,WAAW,CAAI,EAC/C,EAAS,GACX,AAAC,GAAU,EAAQ,EAAK,EAAI,EAAK,EACjC,AAAC,GAAU,CACT,AAAI,MAAO,GAAG,oCAAuC,WACnD,EAAG,mCAAmC,EAAI,EAAO,EAAM,CAAI,EAE3D,EAAQ,EAAwB,EAAI,EAAK,CAE7C,CACF,EACI,EACA,EAAY,GAChB,EAAQ,IAAM,EAAU,AAAC,GAAU,CACjC,AAAI,CAAC,GAAa,IAAU,GAExB,GAAU,SAAS,WAAW,GAChC,GAAQ,EAAwB,EAAI,EAAK,GAC3C,EAAO,CAAK,EACZ,EAAW,EACX,EAAY,GACd,CAAC,CAAC,CACJ,CAAC,EAGD,EAAU,MAAO,CAAC,EAAI,CAAE,cAAc,CAAE,OAAQ,EAAS,QAAS,KAAe,CAC/E,GAAI,GAAgB,GAAmB,CAAU,EAC7C,EAAgB,EAAc,EAAI,EAAc,KAAK,EACrD,EAAc,EAChB,EAEA,EAAG,kBAAoB,OACzB,EACA,EAAG,YAAc,CAAC,EAClB,EAAG,UAAY,CAAC,EAChB,EAAQ,IAAM,GAAK,EAAI,EAAe,EAAe,CAAW,CAAC,EACjE,EAAS,IAAM,CACb,OAAO,OAAO,EAAG,SAAS,EAAE,QAAQ,AAAC,GAAQ,EAAI,OAAO,CAAC,EACzD,MAAO,GAAG,YACV,MAAO,GAAG,SACZ,CAAC,CACH,CAAC,EACD,YAAc,EAAI,EAAe,EAAe,EAAa,CAC3D,GAAI,GAAY,AAAC,GAAM,MAAO,IAAM,UAAY,CAAC,MAAM,QAAQ,CAAC,EAC5D,EAAa,EACjB,EAAc,AAAC,GAAU,CACvB,AAAI,GAAW,CAAK,GAAK,GAAS,GAChC,GAAQ,MAAM,KAAK,MAAM,CAAK,EAAE,KAAK,EAAG,AAAC,GAAM,EAAI,CAAC,GAElD,IAAU,QACZ,GAAQ,CAAC,GACX,GAAI,GAAS,EAAG,UACZ,EAAW,EAAG,YACd,EAAS,CAAC,EACV,EAAO,CAAC,EACZ,GAAI,EAAU,CAAK,EACjB,EAAQ,OAAO,QAAQ,CAAK,EAAE,IAAI,CAAC,CAAC,EAAK,KAAW,CAClD,GAAI,GAAS,GAA2B,EAAe,EAAO,EAAK,CAAK,EACxE,EAAY,AAAC,GAAW,CACtB,AAAI,EAAK,SAAS,CAAM,GACtB,EAAK,yBAA0B,CAAE,EACnC,EAAK,KAAK,CAAM,CAClB,EAAG,CAAE,MAAO,CAAE,MAAO,EAAK,GAAG,CAAO,CAAE,CAAC,EACvC,EAAO,KAAK,CAAM,CACpB,CAAC,MAED,QAAS,GAAI,EAAG,EAAI,EAAM,OAAQ,IAAK,CACrC,GAAI,GAAS,GAA2B,EAAe,EAAM,GAAI,EAAG,CAAK,EACzE,EAAY,AAAC,GAAU,CACrB,AAAI,EAAK,SAAS,CAAK,GACrB,EAAK,yBAA0B,CAAE,EACnC,EAAK,KAAK,CAAK,CACjB,EAAG,CAAE,MAAO,CAAE,MAAO,EAAG,GAAG,CAAO,CAAE,CAAC,EACrC,EAAO,KAAK,CAAM,CACpB,CAEF,GAAI,GAAO,CAAC,EACR,EAAQ,CAAC,EACT,EAAU,CAAC,EACX,EAAQ,CAAC,EACb,OAAS,GAAI,EAAG,EAAI,EAAS,OAAQ,IAAK,CACxC,GAAI,GAAM,EAAS,GACnB,AAAI,EAAK,QAAQ,CAAG,IAAM,IACxB,EAAQ,KAAK,CAAG,CACpB,CACA,EAAW,EAAS,OAAO,AAAC,GAAQ,CAAC,EAAQ,SAAS,CAAG,CAAC,EAC1D,GAAI,GAAU,WACd,OAAS,GAAI,EAAG,EAAI,EAAK,OAAQ,IAAK,CACpC,GAAI,GAAM,EAAK,GACX,EAAY,EAAS,QAAQ,CAAG,EACpC,GAAI,IAAc,GAChB,EAAS,OAAO,EAAG,EAAG,CAAG,EACzB,EAAK,KAAK,CAAC,EAAS,CAAC,CAAC,UACb,IAAc,EAAG,CAC1B,GAAI,GAAY,EAAS,OAAO,EAAG,CAAC,EAAE,GAClC,EAAa,EAAS,OAAO,EAAY,EAAG,CAAC,EAAE,GACnD,EAAS,OAAO,EAAG,EAAG,CAAU,EAChC,EAAS,OAAO,EAAW,EAAG,CAAS,EACvC,EAAM,KAAK,CAAC,EAAW,CAAU,CAAC,CACpC,KACE,GAAM,KAAK,CAAG,EAEhB,EAAU,CACZ,CACA,OAAS,GAAI,EAAG,EAAI,EAAQ,OAAQ,IAAK,CACvC,GAAI,GAAM,EAAQ,GAClB,AAAM,EAAO,GAAK,YAChB,EAAO,GAAK,WAAW,QAAQ,EAAU,EAE3C,EAAO,GAAK,OAAO,EACnB,EAAO,GAAO,KACd,MAAO,GAAO,EAChB,CACA,OAAS,GAAI,EAAG,EAAI,EAAM,OAAQ,IAAK,CACrC,GAAI,CAAC,EAAW,GAAc,EAAM,GAChC,EAAW,EAAO,GAClB,EAAY,EAAO,GACnB,EAAS,SAAS,cAAc,KAAK,EACzC,EAAU,IAAM,CACd,AAAK,GACH,EAAK,uCAAwC,EAAY,EAAY,CAAM,EAC7E,EAAU,MAAM,CAAM,EACtB,EAAS,MAAM,CAAS,EACxB,EAAU,gBAAkB,EAAU,MAAM,EAAU,cAAc,EACpE,EAAO,OAAO,CAAQ,EACtB,EAAS,gBAAkB,EAAS,MAAM,EAAS,cAAc,EACjE,EAAO,OAAO,CAChB,CAAC,EACD,EAAU,oBAAoB,EAAO,EAAK,QAAQ,CAAU,EAAE,CAChE,CACA,OAAS,GAAI,EAAG,EAAI,EAAK,OAAQ,IAAK,CACpC,GAAI,CAAC,EAAU,GAAS,EAAK,GACzB,EAAS,IAAa,WAAa,EAAa,EAAO,GAC3D,AAAI,EAAO,gBACT,GAAS,EAAO,gBAClB,GAAI,GAAS,EAAO,GAChB,EAAM,EAAK,GACX,EAAS,SAAS,WAAW,EAAW,QAAS,EAAI,EAAE,kBACvD,EAAgB,GAAS,CAAM,EACnC,GAAe,EAAQ,EAAe,CAAU,EAChD,EAAO,oBAAsB,AAAC,GAAa,CACzC,OAAO,QAAQ,CAAQ,EAAE,QAAQ,CAAC,CAAC,EAAM,KAAW,CAClD,EAAc,GAAQ,CACxB,CAAC,CACH,EACA,EAAU,IAAM,CACd,EAAO,MAAM,CAAM,EACnB,GAAgB,IAAM,GAAS,CAAM,CAAC,EAAE,CAC1C,CAAC,EACG,MAAO,IAAQ,UACjB,EAAK,mEAAoE,CAAU,EAErF,EAAO,GAAO,CAChB,CACA,OAAS,GAAI,EAAG,EAAI,EAAM,OAAQ,IAChC,EAAO,EAAM,IAAI,oBAAoB,EAAO,EAAK,QAAQ,EAAM,EAAE,EAAE,EAErE,EAAW,YAAc,CAC3B,CAAC,CACH,CACA,YAA4B,EAAY,CACtC,GAAI,GAAgB,iCAChB,EAAgB,iBAChB,EAAa,qCACb,EAAU,EAAW,MAAM,CAAU,EACzC,GAAI,CAAC,EACH,OACF,GAAI,GAAM,CAAC,EACX,EAAI,MAAQ,EAAQ,GAAG,KAAK,EAC5B,GAAI,GAAO,EAAQ,GAAG,QAAQ,EAAe,EAAE,EAAE,KAAK,EAClD,EAAgB,EAAK,MAAM,CAAa,EAC5C,MAAI,GACF,GAAI,KAAO,EAAK,QAAQ,EAAe,EAAE,EAAE,KAAK,EAChD,EAAI,MAAQ,EAAc,GAAG,KAAK,EAC9B,EAAc,IAChB,GAAI,WAAa,EAAc,GAAG,KAAK,IAGzC,EAAI,KAAO,EAEN,CACT,CACA,YAAoC,EAAe,EAAM,EAAO,EAAO,CACrE,GAAI,GAAiB,CAAC,EACtB,MAAI,WAAW,KAAK,EAAc,IAAI,GAAK,MAAM,QAAQ,CAAI,EAE3D,AADY,EAAc,KAAK,QAAQ,IAAK,EAAE,EAAE,QAAQ,IAAK,EAAE,EAAE,MAAM,GAAG,EAAE,IAAI,AAAC,GAAM,EAAE,KAAK,CAAC,EACzF,QAAQ,CAAC,EAAM,IAAM,CACzB,EAAe,GAAQ,EAAK,EAC9B,CAAC,EACI,AAAI,WAAW,KAAK,EAAc,IAAI,GAAK,CAAC,MAAM,QAAQ,CAAI,GAAK,MAAO,IAAS,SAExF,AADY,EAAc,KAAK,QAAQ,IAAK,EAAE,EAAE,QAAQ,IAAK,EAAE,EAAE,MAAM,GAAG,EAAE,IAAI,AAAC,GAAM,EAAE,KAAK,CAAC,EACzF,QAAQ,AAAC,GAAS,CACtB,EAAe,GAAQ,EAAK,EAC9B,CAAC,EAED,EAAe,EAAc,MAAQ,EAEnC,EAAc,OAChB,GAAe,EAAc,OAAS,GACpC,EAAc,YAChB,GAAe,EAAc,YAAc,GACtC,CACT,CACA,YAAoB,EAAS,CAC3B,MAAO,CAAC,MAAM,QAAQ,CAAO,GAAK,CAAC,MAAM,CAAO,CAClD,CAGA,aAAoB,CACpB,CACA,GAAS,OAAS,CAAC,EAAI,CAAE,cAAc,CAAE,QAAS,KAAe,CAC/D,GAAI,GAAO,GAAY,CAAE,EACzB,AAAK,EAAK,SACR,GAAK,QAAU,CAAC,GAClB,EAAK,QAAQ,GAAc,EAC3B,EAAS,IAAM,MAAO,GAAK,QAAQ,EAAW,CAChD,EACA,EAAU,MAAO,EAAQ,EAGzB,EAAU,KAAM,CAAC,EAAI,CAAE,cAAc,CAAE,OAAQ,EAAS,QAAS,KAAe,CAC9E,AAAI,EAAG,QAAQ,YAAY,IAAM,YAC/B,EAAK,4CAA6C,CAAE,EACtD,GAAI,GAAY,EAAc,EAAI,CAAU,EACxC,EAAO,IAAM,CACf,GAAI,EAAG,eACL,MAAO,GAAG,eACZ,GAAI,GAAS,EAAG,QAAQ,UAAU,EAAI,EAAE,kBACxC,UAAe,EAAQ,CAAC,EAAG,CAAE,EAC7B,EAAU,IAAM,CACd,EAAG,MAAM,CAAM,EACf,GAAgB,IAAM,GAAS,CAAM,CAAC,EAAE,CAC1C,CAAC,EACD,EAAG,eAAiB,EACpB,EAAG,UAAY,IAAM,CACnB,GAAK,EAAQ,AAAC,GAAS,CACrB,AAAM,EAAK,YACT,EAAK,WAAW,QAAQ,EAAU,CAEtC,CAAC,EACD,EAAO,OAAO,EACd,MAAO,GAAG,cACZ,EACO,CACT,EACI,EAAO,IAAM,CACf,AAAI,CAAC,EAAG,WAER,GAAG,UAAU,EACb,MAAO,GAAG,UACZ,EACA,EAAQ,IAAM,EAAU,AAAC,GAAU,CACjC,EAAQ,EAAK,EAAI,EAAK,CACxB,CAAC,CAAC,EACF,EAAS,IAAM,EAAG,WAAa,EAAG,UAAU,CAAC,CAC/C,CAAC,EAGD,EAAU,KAAM,CAAC,EAAI,CAAE,cAAc,CAAE,SAAU,KAAgB,CAE/D,AADY,EAAU,CAAU,EAC1B,QAAQ,AAAC,GAAS,GAAU,EAAI,CAAI,CAAC,CAC7C,CAAC,EACD,GAAe,CAAC,EAAM,IAAO,CAC3B,AAAI,EAAK,QACP,GAAG,OAAS,EAAK,OAErB,CAAC,EAGD,GAAc,GAAa,IAAK,GAAK,GAAO,KAAK,CAAC,CAAC,CAAC,EACpD,EAAU,KAAM,GAAgB,CAAC,EAAI,CAAE,QAAO,YAAW,cAAc,CAAE,QAAS,KAAe,CAC/F,GAAI,GAAY,EAAa,EAAc,EAAI,CAAU,EAAI,IAAM,CACnE,EACA,AAAI,EAAG,QAAQ,YAAY,IAAM,YAC1B,GAAG,kBACN,GAAG,iBAAmB,CAAC,GACpB,EAAG,iBAAiB,SAAS,CAAK,GACrC,EAAG,iBAAiB,KAAK,CAAK,GAElC,GAAI,GAAiB,GAAG,EAAI,EAAO,EAAW,AAAC,GAAM,CACnD,EAAU,IAAM,CAChB,EAAG,CAAE,MAAO,CAAE,OAAU,CAAE,EAAG,OAAQ,CAAC,CAAC,CAAE,CAAC,CAC5C,CAAC,EACD,EAAS,IAAM,EAAe,CAAC,CACjC,CAAC,CAAC,EAGF,GAA2B,WAAY,WAAY,UAAU,EAC7D,GAA2B,YAAa,YAAa,WAAW,EAChE,GAA2B,QAAS,OAAQ,OAAO,EACnD,GAA2B,OAAQ,OAAQ,MAAM,EACjD,YAAoC,EAAM,EAAe,EAAM,CAC7D,EAAU,EAAe,AAAC,GAAO,EAAK,oBAAoB,oCAAgD,gDAAmD,IAAQ,CAAE,CAAC,CAC1K,CAGA,GAAe,aAAa,EAAe,EAC3C,GAAe,oBAAoB,CAAE,SAAU,GAAW,OAAQ,GAAS,QAAS,GAAM,IAAK,CAAM,CAAC,EACtG,GAAI,IAAc,GAGd,EAAiB,GClzGd,YAAkC,EAAW,EAAS,CACzD,MAAM,IAAS,GAAU,IAAM,CAAC,GAEzB,CAAC,EAAM,EAAO,KAAU,CAC3B,GAAI,GAAS,EACT,EAAmB,EACnB,EAAoB,EAAU,MAC9B,EAAwB,EAAkB,IAAI,CAAgB,EAyClE,MAAO,AAvCW,GAAO,YAAY,CAAC,EAAc,EAAQ,EAAQ,EAAM,IAAQ,CAG9E,GAAI,MAAO,GAA0B,IAAa,CAC9C,QAAQ,MAAM,gDAAgD,uCAAsD,EAAU,QAAQ,EACtI,MACJ,CAEI,GAAI,GAAU,EAAO,SAAS,CAE1B,KAAM,CACF,MAAO,GAAkB,IAAI,CAAI,CACrC,EACA,IAAI,EAAO,CACP,EAAkB,IAAI,EAAM,EAAO,CAAM,CAC7C,CACJ,EAAG,CAEC,KAAM,CACF,MAAO,GAAO,CAClB,EACA,IAAI,EAAO,CACP,EAAO,CAAK,CAChB,CACJ,CAAC,EAED,SAAQ,IAAM,EAAQ,CAAC,EAEpB,GAAc,EAAkB,IAAI,CAAI,CAAC,CACpD,EAAG,GAAO,CACN,OAAO,eAAe,EAAK,OAAQ,CAC/B,KAAM,CACF,SAAS,GAEF,CACX,CACJ,CAAC,CACL,CAAC,EAEkB,CAAqB,CAC5C,CACJ,CAEA,YAAuB,EAAO,CAC1B,MAAO,OAAO,IAAU,SAClB,KAAK,MAAM,KAAK,UAAU,CAAK,CAAC,EAChC,CACV,CCrDA,GAAI,IAAY,CAAC,EAKV,WAAY,EAAM,EAAU,CAC/B,MAAM,IAAU,IAAO,IAAU,GAAQ,CAAC,GAE1C,GAAU,GAAM,KAAK,CAAQ,EAGtB,IAAM,CACT,GAAU,GAAQ,GAAU,GAAM,OAAO,GAAK,IAAM,CAAQ,CAChE,CACJ,CA2BO,WAAiB,KAAS,EAAQ,CACrC,GAAI,GAAY,GAAU,IAAS,CAAC,EAEhC,EAAY,CAAC,EAEjB,OAAS,GAAI,EAAG,EAAI,EAAU,OAAQ,IAAK,CACvC,GAAI,GAAW,EAAU,GAAG,GAAG,CAAM,EAErC,AAAI,GAAW,CAAQ,GAAG,EAAU,KAAK,CAAQ,CACrD,CAEA,MAAO,AAAC,IACE,GAAa,EAAW,CAAM,CAE5C,CAEA,kBAAmC,KAAS,EAAQ,CAChD,GAAI,GAAY,GAAU,IAAS,CAAC,EAEhC,EAAY,CAAC,EAEjB,OAAS,GAAI,EAAG,EAAI,EAAU,OAAQ,IAAK,CACvC,GAAI,GAAW,KAAM,GAAU,GAAG,GAAG,CAAM,EAE3C,AAAI,GAAW,CAAQ,GAAG,EAAU,KAAK,CAAQ,CACrD,CAEA,MAAO,AAAC,IACE,GAAa,EAAW,CAAM,CAE5C,CAEO,YAAsB,EAAW,EACxC,CACI,GAAI,GAAS,EAEb,OAAS,GAAI,EAAG,EAAI,EAAU,OAAQ,IAAK,CACvC,GAAI,GAAU,EAAU,GAAG,CAAM,EAEjC,AAAI,IAAY,QACZ,GAAS,EAEjB,CAEA,MAAO,EACX,CCzFO,YAAuB,EAAM,CAChC,GAAI,GAAO,SAAS,cAAc,MAAM,EACxC,EAAK,UAAY,EACjB,EAAK,iBAAiB,GAAG,EAAE,QAAQ,GAC/B,EAAE,aAAa,SAAU,MAAM,CACnC,EAEA,GAAI,GAAQ,SAAS,eAAe,gBAAgB,EAEpD,AAAI,MAAO,GAAS,KAAe,GAAS,KAExC,EAAM,UAAY,GAElB,GAAQ,SAAS,cAAc,KAAK,EACpC,EAAM,GAAK,iBACX,EAAM,MAAM,SAAW,QACvB,EAAM,MAAM,MAAQ,QACpB,EAAM,MAAM,OAAS,QACrB,EAAM,MAAM,QAAU,OACtB,EAAM,MAAM,gBAAkB,oBAC9B,EAAM,MAAM,OAAS,KAGzB,GAAI,GAAS,SAAS,cAAc,QAAQ,EAC5C,EAAO,MAAM,gBAAkB,UAC/B,EAAO,MAAM,aAAe,MAC5B,EAAO,MAAM,MAAQ,OACrB,EAAO,MAAM,OAAS,OACtB,EAAM,YAAY,CAAM,EAExB,SAAS,KAAK,QAAQ,CAAK,EAC3B,SAAS,KAAK,MAAM,SAAW,SAC/B,EAAO,cAAc,SAAS,KAAK,EACnC,EAAO,cAAc,SAAS,MAAM,EAAK,SAAS,EAClD,EAAO,cAAc,SAAS,MAAM,EAGpC,EAAM,iBAAiB,QAAS,IAAM,GAAc,CAAK,CAAC,EAG1D,EAAM,aAAa,WAAY,CAAC,EAChC,EAAM,iBAAiB,UAAW,GAAK,CACnC,AAAI,EAAE,MAAQ,UAAU,GAAc,CAAK,CAC/C,CAAC,EACD,EAAM,MAAM,CAChB,CAEO,YAAuB,EAAO,CACjC,EAAM,UAAY,GAClB,SAAS,KAAK,MAAM,SAAW,SACnC,CC/CO,GAAM,IAAN,KAAkB,CACrB,aAAc,CACV,KAAK,QAAU,GAAI,IACvB,CAEA,IAAI,EAAQ,CACR,KAAK,QAAQ,IAAI,CAAM,CAC3B,CAEA,OAAO,EAAQ,CACX,KAAK,QAAQ,OAAO,CAAM,CAC9B,CAEA,aAAa,EAAW,CACpB,MAAO,CAAC,CAAE,KAAK,sBAAsB,CAAS,CAClD,CAEA,sBAAsB,EAAW,CAE7B,OAAS,CAAC,EAAK,IAAW,MAAK,QAAQ,QAAQ,EAC3C,GAAI,EAAO,YAAc,EAAW,MAAO,EAEnD,CAGA,iBAAiB,EAAQ,CACrB,MAAO,CAAE,EAAO,OACpB,CAEA,OAAQ,CACJ,MAAO,MAAK,QAAQ,OAAS,CACjC,CAEA,KAAM,OAAO,CACT,KAAK,QAAQ,EAIb,KAAM,IAAY,IAAI,CAC1B,CAEA,SAAU,CAGN,KAAK,QAAQ,QAAQ,GAAK,EAAE,QAAQ,CAAC,CACzC,CAEA,SAAU,CAEN,GAAI,GAAiB,CAAC,EAGlB,EAAmB,CAAC,EACpB,EAAmB,CAAC,EAExB,YAAK,QAAQ,QAAQ,GAAU,CAC3B,GAAI,CAAC,EAAS,EAAS,GAAQ,EAAO,iBAAiB,EAEvD,EAAe,KAAK,CAAO,EAC3B,EAAiB,KAAK,CAAO,EAC7B,EAAiB,KAAK,CAAI,CAC9B,CAAC,EAQM,CAAE,EAJK,GAAc,EAAiB,QAAQ,GAAY,EAAS,EAAW,MAAM,CAAC,CAAC,EAElF,IAAM,EAAiB,QAAQ,GAAY,EAAS,CAAC,CAEzB,CAC3C,CACJ,ECtEO,GAAM,IAAN,KAAa,CAChB,YAAY,EAAW,CACnB,KAAK,UAAY,EACjB,KAAK,QAAU,GACf,KAAK,MAAQ,CAAC,EACd,KAAK,UAAY,CAAC,EAClB,KAAK,UAAY,CAAC,CACtB,CAGA,YAAY,EAAU,CAClB,KAAK,UAAU,KAAK,CAAQ,CAChC,CAGA,QAAQ,EAAQ,EAAQ,EAAU,CAC9B,KAAK,MAAM,KAAK,CACZ,KAAM,GAAI,SAAQ,SAClB,aAAa,EAAO,CAChB,EAAS,CAAK,CAClB,CACJ,CAAC,CACL,CAEA,SAAU,CACN,EAAQ,iBAAkB,CAAE,UAAW,KAAK,SAAU,CAAC,CAC3D,CAGA,kBAAmB,CAGf,GAAI,GAAiB,GAAK,KAAK,UAAU,UAAW,KAAK,UAAU,SAAS,EAExE,EAAU,KAAK,UAAU,mBAAmB,CAAc,EAE1D,EAAU,CACV,SAAU,KAAK,UAAU,gBACzB,QAAS,EACT,MAAO,KAAK,MAAM,IAAI,GAAM,EACxB,KAAM,EAAE,KACR,OAAQ,EAAE,OACV,OAAQ,EAAE,MACd,EAAE,CACN,EAII,EAAmB,CAAC,EACpB,EAAgB,CAAC,EACjB,EAAmB,CAAC,EAEpB,EAAU,AAAC,GAAQ,EAAiB,QAAQ,GAAK,EAAE,CAAG,CAAC,EACvD,EAAO,IAAM,EAAc,QAAQ,GAAK,EAAE,CAAC,EAC3C,EAAU,IAAM,EAAiB,QAAQ,GAAK,EAAE,CAAC,EAIjD,EAAe,EAAQ,SAAU,CACjC,UAAW,KAAK,UAChB,OAAQ,EACR,QAAS,AAAC,GAAa,CACnB,EAAiB,KAAK,CAAQ,CAClC,EACA,KAAM,AAAC,GAAa,CAChB,EAAc,KAAK,CAAQ,CAC/B,EACA,QAAS,AAAC,GAAa,CACnB,EAAiB,KAAK,CAAQ,CAClC,CACJ,CAAC,EAyCD,MAAO,CAAC,EAtCa,AAAC,GAAa,CAC/B,GAAI,CAAE,WAAU,WAAY,EAU5B,GARA,EAAQ,EAGR,KAAK,UAAU,iBAAiB,EAAU,EAAS,CAAO,EAG1D,KAAK,UAAU,eAAe,KAAK,UAAU,OAAO,EAEhD,EAAQ,QAAY,CACpB,GAAI,GAAU,EAAQ,QAMtB,AAFyB,KAAK,MAAM,IAAI,CAAC,CAAE,kBAAoB,CAAa,EAEzD,QAAQ,CAAC,EAAc,IAAU,CAChD,EAAa,EAAQ,EAAM,CAC/B,CAAC,CACL,CAEA,GAAI,GAAiB,KAAK,MAAM,CAAQ,EAExC,EAAa,CAAE,SAAU,EAAgB,SAAQ,CAAC,EAElD,KAAK,UAAU,QAAQ,GAAK,EAAE,CAAC,EAE/B,EAAQ,CAAQ,CACpB,EAEoB,IAAM,CACtB,EAAQ,EAER,EAAK,CACT,CAE8C,CAClD,CACJ,EC/GO,GAAM,IAAN,KAAgB,CACnB,aAAc,CAEV,KAAK,QAAU,GAAI,KAGnB,KAAK,MAAQ,GAAI,IACrB,CAEA,IAAI,EAAW,CAGX,GAAI,GAAS,KAAK,aAAa,EAAW,IAAM,CAC5C,GAAI,GAAY,GAAI,IAAO,CAAS,EAEpC,YAAK,QAAQ,IAAI,CAAS,EAEnB,CACX,CAAC,EAKD,UAAuB,EAAQ,IAAM,CAIjC,AAAM,AAFK,KAAK,sBAAsB,EAAO,SAAS,GAIlD,KAAK,qBAAqB,CAElC,CAAC,EAEM,CACX,CAEA,aAAa,EAAW,EAAU,CAC9B,OAAS,CAAC,EAAK,IAAW,MAAK,QAAQ,QAAQ,EAC3C,GAAI,EAAO,YAAc,EACrB,MAAO,GAIf,MAAO,GAAS,CACpB,CAEA,sBAAsB,EAAW,CAC7B,OAAS,CAAC,EAAK,IAAS,MAAK,MAAM,QAAQ,EACvC,GAAI,EAAK,aAAa,CAAS,EAAG,MAAO,EAEjD,CAEA,sBAAuB,CAGnB,EAAQ,iBAAkB,CAAE,QAAS,KAAK,OAAQ,CAAC,EAGnD,GAAI,GAAQ,KAAK,wBAAwB,EAGzC,KAAK,QAAQ,MAAM,EAEnB,EAAQ,gBAAiB,CAAE,OAAM,CAAC,EAGlC,EAAM,QAAQ,GAAQ,CAElB,AAAI,EAAK,MAAM,GAGf,MAAK,MAAM,IAAI,CAAI,EAGnB,EAAK,KAAK,EAAE,KAAK,IAAM,CAEnB,KAAK,MAAM,OAAO,CAAI,EAItB,KAAK,qBAAqB,CAC9B,CAAC,EACL,CAAC,CACL,CAEA,yBAA0B,CACtB,GAAI,GAAQ,GAAI,KAIhB,OAAS,CAAC,EAAK,IAAW,MAAK,QAAQ,QAAQ,EAAG,CAC9C,GAAI,GAAe,GAYnB,GATA,EAAM,QAAQ,GAAQ,CAClB,AAAI,EAAK,iBAAiB,CAAM,GAC5B,GAAK,IAAI,CAAM,EAEf,EAAe,GAEvB,CAAC,EAGG,CAAE,EAAc,CAChB,GAAI,GAAU,GAAI,IAElB,EAAQ,IAAI,CAAM,EAElB,EAAM,IAAI,CAAO,CACrB,CACJ,CAEA,MAAO,EACX,CAEA,sBAAuB,CACnB,AAAI,KAAK,QAAQ,KAAO,GACpB,KAAK,qBAAqB,CAElC,CACJ,EAEI,GAAkB,GAAI,SAE1B,YAAgC,EAAQ,EAAU,CAC9C,AAAI,GAAgB,IAAI,CAAM,GAE9B,GAAgB,IAAI,EAAQ,WAAW,IAAM,CACzC,EAAS,EAET,GAAgB,OAAO,CAAM,CACjC,EAAG,CAAC,CAAC,CACT,CCnIA,GAAI,IAAY,GAAI,IAKpB,kBAAoC,EAAW,CAC3C,GAAI,GAAS,GAAU,IAAI,CAAS,EAEhC,EAAU,GAAI,SAAQ,AAAC,GAAY,CACnC,EAAO,YAAY,CAAO,CAC9B,CAAC,EAED,SAAQ,OAAS,EAEV,CACX,CAKA,kBAAkC,EAAW,EAAQ,EAAQ,CACzD,GAAI,GAAS,GAAU,IAAI,CAAS,EAEhC,EAAU,GAAI,SAAQ,AAAC,GAAY,CACnC,EAAO,QAAQ,EAAQ,EAAQ,GAAS,EAAQ,CAAK,CAAC,CAC1D,CAAC,EAED,SAAQ,OAAS,EAEV,CACX,CAKA,kBAAkC,EAAM,CACpC,GAAI,CAAC,EAAS,EAAe,GAAiB,EAAK,QAAQ,EAEvD,EAAU,CACV,OAAQ,OACR,KAAM,KAAK,UAAU,CACjB,OAAQ,GAAa,EACrB,WAAY,CAChB,CAAC,EACD,QAAS,CACL,eAAgB,mBAChB,aAAc,EAClB,CACJ,EAEI,EAAmB,CAAC,EACpB,EAAgB,CAAC,EACjB,EAAmB,CAAC,EAEpB,EAAU,AAAC,GAAQ,EAAiB,QAAQ,GAAK,EAAE,CAAG,CAAC,EACvD,EAAO,AAAC,GAAQ,EAAc,QAAQ,GAAK,EAAE,CAAG,CAAC,EACjD,EAAU,AAAC,GAAQ,EAAiB,QAAQ,GAAK,EAAE,CAAG,CAAC,EAEvD,EAAgB,EAAQ,kBAAmB,CAAO,EAElD,EAAY,GAAa,EAE7B,EAAQ,UAAW,CACf,IAAK,EACL,UACA,QAAS,EAAQ,KACjB,QAAS,GAAK,EAAiB,KAAK,CAAC,EACrC,QAAS,GAAK,EAAiB,KAAK,CAAC,EACrC,KAAM,GAAK,EAAc,KAAK,CAAC,CACnC,CAAC,EAED,GAAI,GAEJ,GAAI,CACA,EAAW,KAAM,OAAM,EAAW,CAAO,CAC7C,MAAE,CAKE,EAAc,CAAE,QAAS,KAAM,OAAQ,EAAK,CAAC,EAE7C,EAAc,EAEd,EAAK,CACD,OAAQ,IACR,QAAS,KACT,eAAgB,IAAM,CAAC,CAC3B,CAAC,EAED,MACJ,CAEA,GAAI,GAAgB,CAChB,OAAQ,EAAS,OACjB,UACJ,EAEA,EAAQ,CAAa,EAErB,EAAW,EAAc,SAEzB,GAAI,GAAU,KAAM,GAAS,KAAK,EAGlC,GAAI,CAAE,EAAS,GAAI,CACf,EAAc,CAAE,QAAS,KAAM,OAAQ,EAAK,CAAC,EAE7C,GAAI,GAAiB,GAUrB,MARA,GAAc,EAEd,EAAK,CACD,OAAQ,EAAS,OACjB,UACA,eAAgB,IAAM,EAAiB,EAC3C,CAAC,EAEG,EAAgB,OAEhB,GAAS,SAAW,KACpB,GAAiB,EAGd,GAAiB,CAAO,EACnC,CAiBA,GAVI,EAAS,YACT,QAAO,SAAS,KAAO,EAAS,KAShC,GAAkB,CAAO,EAAG,CAC5B,GAAI,GACJ,CAAC,EAAM,CAAO,EAAI,GAAqB,CAAO,EAE9C,GAAc,CAAI,EAElB,EAAc,CAAE,QAAS,KAAM,OAAQ,EAAK,CAAC,CACjD,KACI,GAAc,CAAE,UAAS,OAAQ,EAAM,CAAC,EAG5C,GAAI,CAAE,aAAY,UAAW,KAAK,MAAM,CAAO,EAE/C,KAAM,IAAa,oBAAqB,CAAE,aAAY,QAAO,CAAC,EAE9D,KAAM,GAAc,CAAU,EAE9B,EAAQ,CAAE,OAAQ,EAAS,OAAQ,KAAM,KAAK,MAAM,CAAO,CAAE,CAAC,CAClE,CAEA,aAA4B,CACxB,QACI;AAAA,oCACJ,GAAK,OAAO,SAAS,OAAO,CAChC,CAEA,YAA0B,EAAS,CAG/B,GAFW,CAEO,CACtB,CC7KA,GAAI,IAAa,CAAC,EACd,GAEJ,WAAsB,EAAM,EAAU,EAAY,KAAM,CACpD,GAAW,GAAQ,CACvB,CAEA,YAAsB,EAAU,CAC5B,GAAW,CACf,CAIA,GAAI,IAAU,CACV,GAAM,MACN,GAAM,MACN,GAAM,MACN,IAAO,OACP,IAAO,OACP,KAAQ,QACR,OAAU,UACV,MAAS,SACT,SAAY,YACZ,SAAY,YACZ,WAAc,cACd,aAAgB,gBAChB,OAAU,UACV,eAAkB,kBAClB,aAAgB,gBAChB,aAAgB,eACpB,EAEO,YAA4B,EAAW,EAAO,CACjD,MAAO,IAAI,OAAM,CAAC,EAAG,CACjB,IAAI,EAAQ,EAAU,CAClB,GAAI,IAAa,aAAc,MAAO,GAEtC,GAAI,IAAY,IACZ,MAAO,IAAY,EAAW,GAAQ,EAAS,EAC5C,GAAI,IAAY,IACnB,MAAO,IAAY,EAAW,CAAQ,EACnC,GAAI,IAAY,GACnB,MAAO,GAAM,GACV,GAAI,CAAE,CAAC,MAAM,EAAE,SAAS,CAAQ,EACnC,MAAO,IAAY,CAAS,EAAE,CAAQ,CAE9C,EAEA,IAAI,EAAQ,EAAU,EAAO,CACzB,MAAI,KAAY,IACZ,GAAM,GAAY,GAGf,EACX,CACJ,CAAC,CACL,CAEA,YAAqB,EAAW,EAAM,CAClC,MAAO,IAAW,GAAM,CAAS,CACrC,CAEA,YAAqB,EAAW,CAC5B,MAAO,IAAS,CAAS,CAC7B,CAEA,EAAO,MAAM,OAAQ,CAAC,EAAI,CAAE,aAAc,CAGtC,GAAI,GAKJ,MAAO,IAAI,OAAM,CAAC,EAAG,CACjB,IAAI,EAAQ,EAAU,CAGlB,MAFM,IAAW,GAAY,EAAiB,CAAE,GAE5C,CAAC,YAAa,UAAU,EAAE,SAAS,CAAQ,EACpC,GAAyB,EAAW,CAAO,EAG/C,EAAU,MAAM,EAC3B,EAEA,IAAI,EAAQ,EAAU,EAAO,CACzB,MAAM,IAAW,GAAY,EAAiB,CAAE,GAEhD,EAAU,MAAM,GAAY,EAErB,EACX,CACJ,CAAC,CACL,CAAC,EAED,EAAa,aAAc,AAAC,GAAc,CAAS,EAEnD,EAAa,OAAQ,AAAC,GAAc,CAAC,EAAU,EAAW,KAAS,EAAQ,EAAW,EAAU,SAAW,EAAU,UAAW,CAAQ,CAAC,EAEzI,EAAa,MAAO,AAAC,GACV,EAAU,EACpB,EAED,EAAa,MAAO,AAAC,GACV,EAAU,EACpB,EAED,EAAa,OAAQ,AAAC,GAAc,MAAO,EAAU,EAAO,EAAO,KAC/D,IAAQ,EAAU,SAAU,EAAU,CAAK,EAIvC,EACA,GAAU,YAAY,EAAU,CAAK,EAE9B,KAAM,IAAc,CAAS,GAGjC,QAAQ,QAAQ,EAC1B,EAED,EAAa,QAAS,AAAC,GAAc,MAAO,KAAW,IAC5C,KAAM,GAAU,MAAM,GAAQ,GAAG,CAAM,CACjD,EAED,EAAa,YAAa,AAAC,GAAc,CAAC,EAAM,EAAO,KAC5C,GAAyB,CAAS,EAAE,EAAM,CAAI,CACxD,EAED,EAAa,UAAW,AAAC,GAAc,CAAC,EAAM,EAAO,KAC1C,EAAU,MAAM,IAAI,EAAM,CAAE,EAAU,MAAM,IAAI,CAAI,EAAG,CAAI,CACrE,EAED,EAAa,SAAU,AAAC,GAAc,CAAC,EAAM,IAAa,CACtD,GAAI,GAAS,IACF,EAAQ,EAAU,SAAU,CAAI,EAGvC,EAAU,EAAO,MAAM,EAAQ,CAAQ,EAE3C,EAAU,WAAW,CAAO,CAChC,CAAC,EAED,EAAa,WAAY,AAAC,GAAc,EAAU,MAAM,OAAO,EAC/D,EAAa,UAAW,AAAC,GAAc,SAAY,KAAM,IAAc,CAAS,CAAC,EAEjF,EAAa,MAAO,AAAC,GAAc,IAAI,IAAW,GAAO,EAAW,GAAG,CAAM,CAAC,EAE9E,EAAa,YAAa,AAAC,GAAc,IAAI,IAAW,GAAS,EAAW,GAAG,CAAM,CAAC,EACtF,EAAa,gBAAiB,AAAC,GAAc,IAAI,IAAW,GAAa,EAAW,GAAG,CAAM,CAAC,EAC9F,EAAa,cAAe,IAAM,IAAI,IAAW,GAAW,GAAG,CAAM,CAAC,EACtE,EAAa,UAAW,AAAC,GAAc,IAAI,IAAW,GAAO,EAAW,GAAG,CAAM,CAAC,EAClF,EAAa,kBAAmB,AAAC,GAAc,IAAI,IAAW,GAAe,EAAW,GAAG,CAAM,CAAC,EAClG,EAAa,gBAAiB,AAAC,GAAc,IAAI,IAAW,GAAa,EAAW,GAAG,CAAM,CAAC,EAC9F,EAAa,gBAAiB,AAAC,GAAc,IAAI,IAAW,GAAa,EAAW,GAAG,CAAM,CAAC,EAE9F,GAAI,IAAa,GAAI,SAErB,EAAa,UAAW,GAAa,CACjC,GAAI,GAAW,IAAI,CAAS,EAAG,MAAO,IAAW,IAAI,CAAS,EAAE,MAEhE,GAAI,GAAS,EAAU,OAEvB,UAAW,IAAI,EAAW,CAAM,EAEzB,EAAO,KAClB,CAAC,EAED,GAAI,IAAoB,GAAI,SAErB,YAAwB,EAAW,EAAQ,EAAU,CACxD,AAAM,GAAkB,IAAI,CAAS,GACjC,GAAkB,IAAI,EAAW,CAAC,CAAC,EAGvC,GAAI,GAAM,GAAkB,IAAI,CAAS,EAEzC,EAAI,GAAU,EAEd,GAAkB,IAAI,EAAW,CAAG,CACxC,CAEA,GAAa,AAAC,GAAc,AAAC,GAAa,SAAU,IAAW,CAQ3D,GAJI,EAAO,SAAW,GAAK,EAAO,YAAc,QAC5C,GAAS,CAAC,GAGV,GAAkB,IAAI,CAAS,EAAG,CAClC,GAAI,GAAY,GAAkB,IAAI,CAAS,EAE/C,GAAI,MAAO,GAAU,IAAc,WAC/B,MAAO,GAAU,GAAU,CAAM,CAEzC,CAEA,MAAO,MAAM,IAAY,EAAW,EAAU,CAAM,CACxD,CAAC,EC1MM,GAAM,IAAN,KAAgB,CACnB,YAAY,EAAI,CACZ,GAAI,EAAG,WAAY,KAAM,gCAczB,GAZA,EAAG,WAAa,KAEhB,KAAK,GAAK,EAEV,KAAK,GAAK,EAAG,aAAa,SAAS,EAEnC,KAAK,aAAe,KAAK,GAEzB,KAAK,gBAAkB,EAAG,aAAa,eAAe,EAEtD,KAAK,SAAW,KAAK,MAAM,KAAK,eAAe,EAE3C,CAAE,KAAK,SACP,KAAM,mDAAqD,KAAK,GAGpE,KAAK,KAAO,KAAK,SAAS,KAAK,KAE/B,KAAK,QAAU,KAAK,MAAM,EAAG,aAAa,cAAc,CAAC,EACzD,KAAK,gBAAkB,GAAU,KAAK,OAAO,EAG7C,KAAK,UAAY,GAAY,GAAU,KAAK,SAAS,IAAI,CAAC,EAE1D,KAAK,UAAY,GAAY,GAAU,KAAK,SAAS,IAAI,CAAC,EAE1D,KAAK,SAAW,OAAO,SAAS,KAAK,SAAS,EAE9C,KAAK,cAAgB,CAAC,EAGtB,KAAK,MAAQ,GAAmB,KAAM,KAAK,QAAQ,EAEnD,KAAK,SAAW,CAAC,EAGjB,KAAK,eAAe,KAAK,OAAO,CACpC,CAEA,iBAAiB,EAAiB,EAAS,EAAU,CAAC,EAAG,CACrD,GAAI,GAAW,KAAK,MAAM,CAAe,EAErC,EAAe,GAAU,KAAK,SAAS,EACvC,EAAsB,KAAK,aAAa,EAAc,CAAO,EAE7D,EAAe,GAAY,GAAU,EAAS,IAAI,CAAC,EAEnD,EAAQ,GAAK,EAAqB,CAAY,EAElD,KAAK,gBAAkB,EAEvB,KAAK,SAAW,EAEhB,KAAK,QAAU,EAEf,KAAK,UAAY,GAAY,GAAU,EAAS,IAAI,CAAC,EAErD,GAAI,GAAU,GAAY,GAAU,EAAS,IAAI,CAAC,EAElD,cAAO,QAAQ,CAAK,EAAE,QAAQ,CAAC,CAAC,EAAK,KAAW,CAC5C,GAAI,GAAU,EAAI,MAAM,GAAG,EAAE,GAC7B,KAAK,SAAS,GAAW,EAAQ,EACrC,CAAC,EAOM,CACX,CAEA,YAAY,EAAc,EAAO,CAI7B,KAAK,cAAc,GAAgB,CACvC,CAEA,mBAAmB,EAAM,CAIrB,cAAO,QAAQ,KAAK,aAAa,EAAE,QAAQ,CAAC,CAAC,EAAW,KAAiB,CACrE,OAAO,QAAQ,CAAI,EAAE,QAAQ,CAAC,CAAC,EAAS,KAAe,CACnD,AAAI,EAAQ,WAAW,CAAW,GAC9B,MAAO,GAAK,EAEpB,CAAC,EAED,EAAK,GAAa,CACtB,CAAC,EAED,KAAK,cAAgB,CAAC,EAEf,CACX,CAEA,aAAa,EAAQ,EAAS,CAC1B,OAAS,KAAO,GACZ,GAAQ,EAAQ,EAAK,EAAQ,EAAI,EAGrC,MAAO,EACX,CAEA,aAAa,EAAU,EAAM,CACzB,GAAI,GAAU,CAAE,GAAG,KAAK,QAAS,MAAI,EAErC,KAAK,iBAAiB,KAAK,UAAU,CAAQ,EAAG,CAAO,EAEvD,KAAK,eAAe,CAAE,MAAK,CAAC,CAChC,CAOA,eAAe,EAAS,CAEpB,EAAQ,UAAW,KAAM,CAAO,EAEhC,EAAQ,SAAU,CACd,UAAW,KACX,UACA,QAAS,GAAK,KAAK,WAAW,CAAC,CACnC,CAAC,CACL,CAEA,GAAI,WAAW,CACX,GAAI,GAAO,KAAK,SAAS,KAGzB,MAAO,AAFQ,QAAO,OAAO,EAAK,QAAQ,EAAE,IAAI,GAAK,EAAE,EAAE,EAEzC,IAAI,GAAM,GAAc,CAAE,CAAC,CAC/C,CAEA,GAAI,SAAS,CACT,MAAO,GAAiB,KAAK,GAAG,aAAa,CACjD,CAEA,qCAAsC,CAClC,GAAI,GAAK,KAAK,GAEd,EAAG,aAAa,gBAAiB,KAAK,eAAe,EAGrD,GAAI,GAAU,KAAK,gBAAgB,UAC7B,CAAE,UAAW,KAAK,gBAAgB,SAAU,EAC5C,CAAC,EAGP,AAAI,KAAK,gBAAgB,KACrB,GAAQ,IAAM,KAAK,gBAAgB,KAInC,KAAK,gBAAgB,SACrB,GAAQ,QAAU,KAAK,gBAAgB,SAG3C,EAAG,aAAa,eAAgB,KAAK,UAAU,CAAO,CAAC,CAC3D,CAEA,WAAW,EAAS,CAChB,KAAK,SAAS,KAAK,CAAO,CAC9B,CAEA,SAAU,CAGN,IAFA,MAAO,MAAK,GAAG,WAER,KAAK,SAAS,OAAS,GAC1B,KAAK,SAAS,IAAI,EAAE,CAE5B,CACJ,ECrLA,GAAI,IAAa,CAAC,EAEX,YAAuB,EAAI,CAC9B,GAAI,GAAY,GAAI,IAAU,CAAE,EAEhC,GAAI,GAAW,EAAU,IAAK,KAAM,+BAIpC,SAAQ,iBAAkB,CAAE,YAAW,QAFzB,AAAC,GAAM,EAAU,WAAW,CAAC,CAEI,CAAC,EAEhD,GAAW,EAAU,IAAM,EAEpB,CACX,CAEO,YAA0B,EAAI,CACjC,GAAI,GAAY,GAAW,GAE3B,AAAI,CAAE,GAEN,GAAU,QAAQ,EAElB,MAAO,IAAW,GACtB,CAMO,YAAuB,EAAI,CAC9B,GAAI,GAAY,GAAW,GAE3B,GAAI,CAAE,EAAW,KAAM,wBAA0B,EAEjD,MAAO,EACX,CAEO,WAA0B,EAAI,EAAS,GAAM,CAChD,GAAI,GAAc,OAAO,YAAY,EAAI,GAAK,EAAE,UAAU,EAE1D,GAAI,CAAE,EAAa,CACf,GAAI,EAAQ,KAAM,gDAElB,MACJ,CAEA,MAAO,GAAY,UACvB,CAEO,YAA0B,EAAM,CACnC,MAAO,QAAO,OAAO,EAAU,EAAE,OAAO,GAC7B,GAAQ,EAAU,IAC5B,CACL,CAEO,YAAmB,EAAM,CAC5B,MAAO,IAAiB,CAAI,EAAE,IAAI,GAAK,EAAE,KAAK,CAClD,CAEO,YAAc,EAAI,CACrB,GAAI,GAAY,GAAW,GAE3B,MAAO,IAAa,EAAU,KAClC,CAEO,aAAiB,CACpB,MAAO,QAAO,OAAO,EAAU,EAAE,GAAG,KACxC,CAEO,aAAe,CAClB,MAAO,QAAO,OAAO,EAAU,CACnC,CCzEO,YAAkB,EAAW,EAAM,EAAQ,CAC9C,GAAc,EAAU,GAAI,EAAM,CAAM,CAC5C,CAEO,YAAwB,EAAM,EAAQ,CACzC,GAAc,OAAQ,EAAM,CAAM,CACtC,CAEO,YAAsB,EAAW,EAAM,EAAQ,CAClD,GAAc,EAAU,GAAI,EAAM,EAAQ,EAAK,CACnD,CAEO,YAAoB,EAAe,EAAM,EAAQ,CAGpD,AAFc,GAAiB,CAAa,EAEpC,QAAQ,GAAU,CACtB,GAAc,EAAO,GAAI,EAAM,EAAQ,EAAK,CAChD,CAAC,CACL,CAEO,YAAgB,EAAW,EAAM,EAAU,CAC9C,EAAU,GAAG,iBAAiB,EAAM,GAAK,CACrC,EAAS,EAAE,MAAM,CACrB,CAAC,CACL,CAEO,YAAY,EAAW,EAAU,CACpC,GAAI,GAAU,AAAC,GAAM,CAEjB,AAAI,CAAE,EAAE,YAER,EAAS,EAAE,MAAM,CACrB,EAEA,cAAO,iBAAiB,EAAW,CAAO,EAEnC,IAAM,CACT,OAAO,oBAAoB,EAAW,CAAO,CACjD,CACJ,CAEA,YAAuB,EAAQ,EAAM,EAAQ,EAAU,GAAM,CACzD,GAAI,GAAI,GAAI,aAAY,EAAM,CAAE,UAAS,OAAQ,CAAO,CAAC,EAEzD,EAAE,WAAa,CAAE,OAAM,SAAQ,WAAY,CAAC,CAAE,EAE9C,EAAO,cAAc,CAAC,CAC1B,CC/CA,GAAI,IAAuB,GAAI,KAExB,YAAqC,EAAe,CACvD,MAAO,GAAc,MAAM,GAAI,QAAO,OAAO,CAAC,CAClD,CAEO,YAA0B,EAAI,EAAM,CACvC,GAAI,CAAC,KAAU,GAAa,EAAK,QAAQ,GAAI,QAAO,OAAO,EAAG,EAAE,EAAE,MAAM,GAAG,EAE3E,MAAO,IAAI,IAAU,EAAO,EAAW,EAAM,CAAE,CACnD,CAEO,WAAmB,EAAM,EAAU,CAEtC,AAAI,GAAqB,IAAI,CAAI,GAEjC,IAAqB,IAAI,CAAI,EAE7B,EAAG,iBAAkB,CAAC,CAAE,KAAI,YAAW,YAAW,aAAc,CAC5D,AAAI,EAAU,QAAU,GACpB,EAAS,CACL,KAAI,YAAW,YAAW,MAAO,EAAU,MAAO,SACtD,CAAC,CAET,CAAC,EACL,CAEO,YAAuB,EAAI,CAC9B,MAAO,IAAI,IAAiB,CAAE,CAClC,CAEO,YAA0C,EAAM,CACnD,MAAO,IAAqB,IAAI,CAAI,CACxC,CAEA,GAAM,IAAN,KAAuB,CACnB,YAAY,EAAI,CACZ,KAAK,GAAK,EACV,KAAK,WAAa,KAAK,6BAA6B,CACxD,CAEA,KAAM,CACF,MAAO,MAAK,UAChB,CAEA,IAAI,EAAO,CACP,MAAO,MAAK,WAAW,IAAI,GAAa,EAAU,KAAK,EAAE,SAAS,CAAK,CAC3E,CAEA,QAAQ,EAAO,CACX,MAAO,CAAE,KAAK,IAAI,CAAK,CAC3B,CAEA,IAAI,EAAO,CACP,MAAO,MAAK,WAAW,KAAK,GAAa,EAAU,QAAU,CAAK,CACtE,CAEA,8BAA+B,CAC3B,MAAO,OAAM,KAAK,KAAK,GAAG,kBAAkB,EAEvC,OAAO,GAAQ,GAA4B,CAAI,CAAC,EAEhD,IAAI,GAAQ,GAAiB,KAAK,GAAI,CAAI,CAAC,CAAC,CACrD,CACJ,EAEa,GAAN,KAAgB,CACnB,YAAY,EAAO,EAAW,EAAS,EAAI,CACvC,KAAK,QAAU,KAAK,IAAM,EAC1B,KAAK,GAAK,EACV,KAAK,aAEL,KAAK,MAAQ,EACb,KAAK,UAAY,EACjB,KAAK,WAAa,KAAK,GAAG,aAAa,KAAK,OAAO,CACvD,CAEA,GAAI,SAAS,CACT,GAAM,CAAE,UAAW,KAAK,wBAAwB,KAAK,UAAU,EAE/D,MAAO,EACX,CAEA,GAAI,SAAS,CACT,GAAM,CAAE,UAAW,KAAK,wBAAwB,KAAK,UAAU,EAE/D,MAAO,EACX,CAEA,wBAAwB,EAAW,CAC/B,GAAI,GAAS,EACT,EAAS,CAAC,EACR,EAAuB,EAAO,MAAM,gBAAgB,EAE1D,MAAI,IACA,GAAS,EAAqB,GAW9B,EAAS,AAPE,GAAI,UAAS,SAAU;AAAA;AAAA;AAAA;AAAA;AAAA,iBAK7B,EAAqB,KAAK,EAEjB,KAAK,YAAY,GAG5B,CAAE,SAAQ,QAAO,CAC5B,CACJ,EChHA,YAAqB,EAAQ,CAC3B,EAAO,UAAU,WAAY,CAAQ,EACrC,EAAS,OAAS,CAAC,EAAI,CAAE,eAAgB,CACvC,AAAI,CAAC,EAAU,SAAS,KAAK,GAE7B,GAAG,UAAY,IAAM,CACrB,EACA,EAAG,UAAY,IAAM,CACrB,EACF,EACA,WAAkB,EAAI,CAAE,aAAa,CACnC,GAAI,GAAW,GAAc,EAAW,WAAY,GAAG,EAAI,IACvD,EAAQ,GAAc,EAAW,MAAO,CAAC,EACzC,EAAY,CAAC,EAAU,SAAS,KAAK,EACzC,AAAK,EAAG,YACN,GAAG,MAAM,OAAS,GAAG,OACnB,CAAC,EAAG,YAAc,GACpB,GAAG,OAAS,IACT,EAAG,YACN,GAAG,MAAM,SAAW,UACtB,GAAI,GAAc,CAAC,EAAK,IAAW,CACjC,GAAI,GAAiB,EAAO,UAAU,EAAK,CAAM,EACjD,MAAO,GAAO,OAAS,IAAM,CAC7B,EAAI,CACN,EACI,EAAmB,CACrB,mBAAoB,SACpB,mBAAoB,GAAG,KACvB,yBAA0B,gCAC5B,EACA,EAAG,cAAgB,CACjB,GAAG,EAAS,IAAM,CAClB,EAAG,EAAQ,IAAM,CACjB,EAAG,CACD,AAAI,GACF,GAAG,OAAS,IACV,GACF,GAAG,MAAM,QAAU,MACrB,GAAI,GAAU,EAAG,sBAAsB,EAAE,OACzC,EAAG,MAAM,OAAS,OAClB,GAAI,GAAO,EAAG,sBAAsB,EAAE,OACtC,AAAI,IAAY,GACd,GAAU,GAEZ,EAAO,WAAW,EAAI,EAAO,UAAW,CACtC,OAAQ,EACR,MAAO,CAAE,OAAQ,EAAU,IAAK,EAChC,IAAK,CAAE,OAAQ,EAAO,IAAK,CAC7B,EAAG,IAAM,EAAG,WAAa,GAAM,IAAM,CACnC,AAAI,KAAK,IAAI,EAAG,sBAAsB,EAAE,OAAS,CAAI,EAAI,GACvD,GAAG,MAAM,SAAW,KAExB,CAAC,CACH,EACA,IAAI,EAAS,IAAM,CACnB,EAAG,EAAQ,IAAM,CACjB,EAAG,CACD,GAAI,GAAO,EAAG,sBAAsB,EAAE,OACtC,EAAO,WAAW,EAAI,EAAa,CACjC,OAAQ,EACR,MAAO,CAAE,OAAQ,EAAO,IAAK,EAC7B,IAAK,CAAE,OAAQ,EAAQ,IAAK,CAC9B,EAAG,IAAM,EAAG,MAAM,SAAW,SAAU,IAAM,CAC3C,EAAG,WAAa,GACZ,EAAG,MAAM,QAAU,GAAG,OAAa,GACrC,GAAG,MAAM,QAAU,OACnB,EAAG,OAAS,GAEhB,CAAC,CACH,CACF,CACF,CACF,CACA,YAAuB,EAAW,EAAK,EAAU,CAC/C,GAAI,EAAU,QAAQ,CAAG,IAAM,GAC7B,MAAO,GACT,GAAM,GAAW,EAAU,EAAU,QAAQ,CAAG,EAAI,GACpD,GAAI,CAAC,EACH,MAAO,GACT,GAAI,IAAQ,WAAY,CACtB,GAAI,GAAQ,EAAS,MAAM,YAAY,EACvC,GAAI,EACF,MAAO,GAAM,EACjB,CACA,GAAI,IAAQ,MAAO,CACjB,GAAI,GAAQ,EAAS,MAAM,YAAY,EACvC,GAAI,EACF,MAAO,GAAM,EACjB,CACA,MAAO,EACT,CAGA,GAAI,IAAiB,GC7FrB,GAAI,IAAqB,CAAC,QAAS,SAAU,WAAY,UAAW,SAAU,uBAAwB,kBAAmB,kBAAmB,mDAAoD,gCAAiC,SAAS,EACtO,GAAoC,GAAmB,KAAK,GAAG,EAC/D,GAAY,MAAO,SAAY,IAC/B,GAAU,GAAY,UAAW,CACrC,EAAI,QAAQ,UAAU,SAAW,QAAQ,UAAU,mBAAqB,QAAQ,UAAU,sBACtF,GAAc,CAAC,IAAa,QAAQ,UAAU,YAAc,SAAS,EAAS,CAChF,MAAO,GAAQ,YAAY,CAC7B,EAAI,SAAS,EAAS,CACpB,MAAO,GAAQ,aACjB,EACI,GAAgB,SAAwB,EAAI,EAAkB,EAAQ,CACxE,GAAI,GAAa,MAAM,UAAU,MAAM,MAAM,EAAG,iBAAiB,EAAiB,CAAC,EACnF,MAAI,IAAoB,GAAQ,KAAK,EAAI,EAAiB,GACxD,EAAW,QAAQ,CAAE,EAEvB,EAAa,EAAW,OAAO,CAAM,EAC9B,CACT,EACI,GAA2B,WAAmC,EAAU,EAAkB,EAAS,CAGrG,OAFI,GAAa,CAAC,EACd,EAAkB,MAAM,KAAK,CAAQ,EAClC,EAAgB,QAAQ,CAC7B,GAAI,GAAU,EAAgB,MAAM,EACpC,GAAI,EAAQ,UAAY,OAAQ,CAC9B,GAAI,GAAW,EAAQ,iBAAiB,EACpC,EAAU,EAAS,OAAS,EAAW,EAAQ,SAC/C,EAAmB,EAA0B,EAAS,GAAM,CAAO,EACvE,AAAI,EAAQ,QACV,EAAW,KAAK,MAAM,EAAY,CAAgB,EAElD,EAAW,KAAK,CACd,MAAO,EACP,WAAY,CACd,CAAC,CAEL,KAAO,CACL,GAAI,GAAiB,GAAQ,KAAK,EAAS,EAAiB,EAC5D,AAAI,GAAkB,EAAQ,OAAO,CAAO,GAAM,IAAoB,CAAC,EAAS,SAAS,CAAO,IAC9F,EAAW,KAAK,CAAO,EAEzB,GAAI,GAAa,EAAQ,YACzB,MAAO,GAAQ,eAAkB,YAAc,EAAQ,cAAc,CAAO,EACxE,EAAkB,CAAC,EAAQ,kBAAoB,EAAQ,iBAAiB,CAAO,EACnF,GAAI,GAAc,EAAiB,CACjC,GAAI,GAAoB,EAA0B,IAAe,GAAO,EAAQ,SAAW,EAAW,SAAU,GAAM,CAAO,EAC7H,AAAI,EAAQ,QACV,EAAW,KAAK,MAAM,EAAY,CAAiB,EAEnD,EAAW,KAAK,CACd,MAAO,EACP,WAAY,CACd,CAAC,CAEL,KACE,GAAgB,QAAQ,MAAM,EAAiB,EAAQ,QAAQ,CAEnE,CACF,CACA,MAAO,EACT,EACI,GAAc,SAAsB,EAAM,EAAS,CACrD,MAAI,GAAK,SAAW,GACb,IAAW,0BAA0B,KAAK,EAAK,OAAO,GAAK,EAAK,oBAAsB,MAAM,SAAS,EAAK,aAAa,UAAU,EAAG,EAAE,CAAC,EACnI,EAGJ,EAAK,QACd,EACI,GAAuB,SAA+B,EAAG,EAAG,CAC9D,MAAO,GAAE,WAAa,EAAE,SAAW,EAAE,cAAgB,EAAE,cAAgB,EAAE,SAAW,EAAE,QACxF,EACI,GAAU,SAAkB,EAAM,CACpC,MAAO,GAAK,UAAY,OAC1B,EACI,GAAgB,SAAwB,EAAM,CAChD,MAAO,IAAQ,CAAI,GAAK,EAAK,OAAS,QACxC,EACI,GAAuB,SAA+B,EAAM,CAC9D,GAAI,GAAI,EAAK,UAAY,WAAa,MAAM,UAAU,MAAM,MAAM,EAAK,QAAQ,EAAE,KAAK,SAAS,EAAO,CACpG,MAAO,GAAM,UAAY,SAC3B,CAAC,EACD,MAAO,EACT,EACI,GAAkB,SAA0B,EAAO,EAAM,CAC3D,OAAS,GAAI,EAAG,EAAI,EAAM,OAAQ,IAChC,GAAI,EAAM,GAAG,SAAW,EAAM,GAAG,OAAS,EACxC,MAAO,GAAM,EAGnB,EACI,GAAkB,SAA0B,EAAM,CACpD,GAAI,CAAC,EAAK,KACR,MAAO,GAET,GAAI,GAAa,EAAK,MAAQ,GAAY,CAAI,EAC1C,EAAc,SAAsB,EAAM,CAC5C,MAAO,GAAW,iBAAiB,6BAA+B,EAAO,IAAI,CAC/E,EACI,EACJ,GAAI,MAAO,QAAW,KAAe,MAAO,QAAO,IAAQ,KAAe,MAAO,QAAO,IAAI,QAAW,WACrG,EAAW,EAAY,OAAO,IAAI,OAAO,EAAK,IAAI,CAAC,MAEnD,IAAI,CACF,EAAW,EAAY,EAAK,IAAI,CAClC,OAAS,EAAP,CACA,eAAQ,MAAM,2IAA4I,EAAI,OAAO,EAC9J,EACT,CAEF,GAAI,GAAU,GAAgB,EAAU,EAAK,IAAI,EACjD,MAAO,CAAC,GAAW,IAAY,CACjC,EACI,GAAU,SAAkB,EAAM,CACpC,MAAO,IAAQ,CAAI,GAAK,EAAK,OAAS,OACxC,EACI,GAAqB,SAA6B,EAAM,CAC1D,MAAO,IAAQ,CAAI,GAAK,CAAC,GAAgB,CAAI,CAC/C,EACI,GAAa,SAAqB,EAAM,CAC1C,GAAI,GAAwB,EAAK,sBAAsB,EAAG,EAAQ,EAAsB,MAAO,EAAS,EAAsB,OAC9H,MAAO,KAAU,GAAK,IAAW,CACnC,EACI,GAAW,SAAmB,EAAM,EAAM,CAC5C,GAAI,GAAe,EAAK,aAAc,EAAgB,EAAK,cAC3D,GAAI,iBAAiB,CAAI,EAAE,aAAe,SACxC,MAAO,GAET,GAAI,GAAkB,GAAQ,KAAK,EAAM,+BAA+B,EACpE,EAAmB,EAAkB,EAAK,cAAgB,EAC9D,GAAI,GAAQ,KAAK,EAAkB,uBAAuB,EACxD,MAAO,GAET,GAAI,GAAe,GAAY,CAAI,EAAE,KACjC,EAAkB,AAA4D,GAAa,cAAc,SAAS,CAAY,GAAM,EAAK,cAAc,SAAS,CAAI,EACxK,GAAI,CAAC,GAAgB,IAAiB,OAAQ,CAC5C,GAAI,MAAO,IAAkB,WAAY,CAEvC,OADI,GAAe,EACZ,GAAM,CACX,GAAI,GAAgB,EAAK,cACrB,EAAW,GAAY,CAAI,EAC/B,GAAI,GAAiB,CAAC,EAAc,YAAc,EAAc,CAAa,IAAM,GACjF,MAAO,IAAW,CAAI,EACjB,AAAI,EAAK,aACd,EAAO,EAAK,aACP,AAAI,CAAC,GAAiB,IAAa,EAAK,cAC7C,EAAO,EAAS,KAEhB,EAAO,CAEX,CACA,EAAO,CACT,CACA,GAAI,EACF,MAAO,CAAC,EAAK,eAAe,EAAE,MAElC,SAAW,IAAiB,gBAC1B,MAAO,IAAW,CAAI,EAExB,MAAO,EACT,EACI,GAAyB,SAAiC,EAAM,CAClE,GAAI,mCAAmC,KAAK,EAAK,OAAO,EAEtD,OADI,GAAa,EAAK,cACf,GAAY,CACjB,GAAI,EAAW,UAAY,YAAc,EAAW,SAAU,CAC5D,OAAS,GAAI,EAAG,EAAI,EAAW,SAAS,OAAQ,IAAK,CACnD,GAAI,GAAQ,EAAW,SAAS,KAAK,CAAC,EACtC,GAAI,EAAM,UAAY,SACpB,MAAO,IAAQ,KAAK,EAAY,sBAAsB,EAAI,GAAO,CAAC,EAAM,SAAS,CAAI,CAEzF,CACA,MAAO,EACT,CACA,EAAa,EAAW,aAC1B,CAEF,MAAO,EACT,EACI,GAAkC,SAA0C,EAAS,EAAM,CAC7F,MAAI,IAAK,UAAY,GAAc,CAAI,GAAK,GAAS,EAAM,CAAO,GAClE,GAAqB,CAAI,GAAK,GAAuB,CAAI,EAI3D,EACI,GAAiC,SAAyC,EAAS,EAAM,CAC3F,MAAI,KAAmB,CAAI,GAAK,GAAY,CAAI,EAAI,GAAK,CAAC,GAAgC,EAAS,CAAI,EAIzG,EACI,GAA4B,SAAoC,EAAgB,CAClF,GAAI,GAAW,SAAS,EAAe,aAAa,UAAU,EAAG,EAAE,EACnE,MAAI,SAAM,CAAQ,GAAK,GAAY,EAIrC,EACI,GAAc,WAAsB,EAAY,CAClD,GAAI,GAAmB,CAAC,EACpB,EAAmB,CAAC,EACxB,SAAW,QAAQ,SAAS,EAAM,EAAG,CACnC,GAAI,GAAU,CAAC,CAAC,EAAK,MACjB,EAAU,EAAU,EAAK,MAAQ,EACjC,EAAoB,GAAY,EAAS,CAAO,EAChD,EAAW,EAAU,EAAa,EAAK,UAAU,EAAI,EACzD,AAAI,IAAsB,EACxB,EAAU,EAAiB,KAAK,MAAM,EAAkB,CAAQ,EAAI,EAAiB,KAAK,CAAO,EAEjG,EAAiB,KAAK,CACpB,cAAe,EACf,SAAU,EACV,OACA,UACA,QAAS,CACX,CAAC,CAEL,CAAC,EACM,EAAiB,KAAK,EAAoB,EAAE,OAAO,SAAS,EAAK,EAAU,CAChF,SAAS,QAAU,EAAI,KAAK,MAAM,EAAK,EAAS,OAAO,EAAI,EAAI,KAAK,EAAS,OAAO,EAC7E,CACT,EAAG,CAAC,CAAC,EAAE,OAAO,CAAgB,CAChC,EACI,GAAW,SAAmB,EAAI,EAAS,CAC7C,EAAU,GAAW,CAAC,EACtB,GAAI,GACJ,MAAI,GAAQ,cACV,EAAa,GAAyB,CAAC,CAAE,EAAG,EAAQ,iBAAkB,CACpE,OAAQ,GAA+B,KAAK,KAAM,CAAO,EACzD,QAAS,GACT,cAAe,EAAQ,cACvB,iBAAkB,EACpB,CAAC,EAED,EAAa,GAAc,EAAI,EAAQ,iBAAkB,GAA+B,KAAK,KAAM,CAAO,CAAC,EAEtG,GAAY,CAAU,CAC/B,EACI,GAAY,SAAoB,EAAI,EAAS,CAC/C,EAAU,GAAW,CAAC,EACtB,GAAI,GACJ,MAAI,GAAQ,cACV,EAAa,GAAyB,CAAC,CAAE,EAAG,EAAQ,iBAAkB,CACpE,OAAQ,GAAgC,KAAK,KAAM,CAAO,EAC1D,QAAS,GACT,cAAe,EAAQ,aACzB,CAAC,EAED,EAAa,GAAc,EAAI,EAAQ,iBAAkB,GAAgC,KAAK,KAAM,CAAO,CAAC,EAEvG,CACT,EACI,GAAa,SAAqB,EAAM,EAAS,CAEnD,GADA,EAAU,GAAW,CAAC,EAClB,CAAC,EACH,KAAM,IAAI,OAAM,kBAAkB,EAEpC,MAAI,IAAQ,KAAK,EAAM,EAAiB,IAAM,GACrC,GAEF,GAA+B,EAAS,CAAI,CACrD,EACI,GAA6C,GAAmB,OAAO,QAAQ,EAAE,KAAK,GAAG,EACzF,GAAc,SAAsB,EAAM,EAAS,CAErD,GADA,EAAU,GAAW,CAAC,EAClB,CAAC,EACH,KAAM,IAAI,OAAM,kBAAkB,EAEpC,MAAI,IAAQ,KAAK,EAAM,EAA0B,IAAM,GAC9C,GAEF,GAAgC,EAAS,CAAI,CACtD,EAGA,YAAiB,EAAQ,EAAgB,CACvC,GAAI,GAAO,OAAO,KAAK,CAAM,EAC7B,GAAI,OAAO,sBAAuB,CAChC,GAAI,GAAU,OAAO,sBAAsB,CAAM,EACjD,GAAmB,GAAU,EAAQ,OAAO,SAAS,EAAK,CACxD,MAAO,QAAO,yBAAyB,EAAQ,CAAG,EAAE,UACtD,CAAC,GAAI,EAAK,KAAK,MAAM,EAAM,CAAO,CACpC,CACA,MAAO,EACT,CACA,YAAwB,EAAQ,CAC9B,OAAS,GAAI,EAAG,EAAI,UAAU,OAAQ,IAAK,CACzC,GAAI,GAAS,AAAQ,UAAU,IAAlB,KAAuB,UAAU,GAAK,CAAC,EACpD,EAAI,EAAI,GAAQ,OAAO,CAAM,EAAG,EAAI,EAAE,QAAQ,SAAS,EAAK,CAC1D,GAAgB,EAAQ,EAAK,EAAO,EAAI,CAC1C,CAAC,EAAI,OAAO,0BAA4B,OAAO,iBAAiB,EAAQ,OAAO,0BAA0B,CAAM,CAAC,EAAI,GAAQ,OAAO,CAAM,CAAC,EAAE,QAAQ,SAAS,EAAK,CAChK,OAAO,eAAe,EAAQ,EAAK,OAAO,yBAAyB,EAAQ,CAAG,CAAC,CACjF,CAAC,CACH,CACA,MAAO,EACT,CACA,YAAyB,EAAK,EAAK,EAAO,CACxC,MAAI,KAAO,GACT,OAAO,eAAe,EAAK,EAAK,CAC9B,QACA,WAAY,GACZ,aAAc,GACd,SAAU,EACZ,CAAC,EAED,EAAI,GAAO,EAEN,CACT,CACA,GAAI,IAAmB,UAAW,CAChC,GAAI,GAAY,CAAC,EACjB,MAAO,CACL,aAAc,SAAsB,EAAM,CACxC,GAAI,EAAU,OAAS,EAAG,CACxB,GAAI,GAAa,EAAU,EAAU,OAAS,GAC9C,AAAI,IAAe,GACjB,EAAW,MAAM,CAErB,CACA,GAAI,GAAY,EAAU,QAAQ,CAAI,EACtC,AAAI,IAAc,IAGhB,EAAU,OAAO,EAAW,CAAC,EAC7B,EAAU,KAAK,CAAI,CAEvB,EACA,eAAgB,SAAwB,EAAM,CAC5C,GAAI,GAAY,EAAU,QAAQ,CAAI,EACtC,AAAI,IAAc,IAChB,EAAU,OAAO,EAAW,CAAC,EAE3B,EAAU,OAAS,GACrB,EAAU,EAAU,OAAS,GAAG,QAAQ,CAE5C,CACF,CACF,EAAE,EACE,GAAoB,SAA4B,EAAM,CACxD,MAAO,GAAK,SAAW,EAAK,QAAQ,YAAY,IAAM,SAAW,MAAO,GAAK,QAAW,UAC1F,EACI,GAAgB,SAAwB,EAAG,CAC7C,MAAO,GAAE,MAAQ,UAAY,EAAE,MAAQ,OAAS,EAAE,UAAY,EAChE,EACI,GAAa,SAAqB,EAAG,CACvC,MAAO,GAAE,MAAQ,OAAS,EAAE,UAAY,CAC1C,EACI,GAAQ,SAAgB,EAAI,CAC9B,MAAO,YAAW,EAAI,CAAC,CACzB,EACI,GAAY,SAAoB,EAAK,EAAI,CAC3C,GAAI,GAAM,GACV,SAAI,MAAM,SAAS,EAAO,EAAG,CAC3B,MAAI,GAAG,CAAK,EACV,GAAM,EACC,IAEF,EACT,CAAC,EACM,CACT,EACI,GAAiB,SAAyB,EAAO,CACnD,OAAS,GAAO,UAAU,OAAQ,EAAS,GAAI,OAAM,EAAO,EAAI,EAAO,EAAI,CAAC,EAAG,EAAO,EAAG,EAAO,EAAM,IACpG,EAAO,EAAO,GAAK,UAAU,GAE/B,MAAO,OAAO,IAAU,WAAa,EAAM,MAAM,OAAQ,CAAM,EAAI,CACrE,EACI,GAAkB,SAA0B,EAAO,CACrD,MAAO,GAAM,OAAO,YAAc,MAAO,GAAM,cAAiB,WAAa,EAAM,aAAa,EAAE,GAAK,EAAM,MAC/G,EACI,GAAkB,SAA0B,EAAU,EAAa,CACrE,GAAI,GAAO,AAA0D,GAAY,UAAa,SAC1F,EAAS,GAAe,CAC1B,wBAAyB,GACzB,kBAAmB,GACnB,kBAAmB,EACrB,EAAG,CAAW,EACV,EAAQ,CAGV,WAAY,CAAC,EAcb,gBAAiB,CAAC,EAMlB,eAAgB,CAAC,EACjB,4BAA6B,KAC7B,wBAAyB,KACzB,OAAQ,GACR,OAAQ,GAGR,uBAAwB,MAC1B,EACI,EACA,EAAY,SAAoB,EAAuB,EAAY,EAAkB,CACvF,MAAO,IAAyB,EAAsB,KAAgB,OAAS,EAAsB,GAAc,EAAO,GAAoB,EAChJ,EACI,EAAqB,SAA6B,EAAS,CAC7D,MAAO,GAAM,gBAAgB,UAAU,SAAS,EAAM,CACpD,GAAI,GAAY,EAAK,UAAW,EAAgB,EAAK,cACrD,MAAO,GAAU,SAAS,CAAO,GAIjC,EAAc,KAAK,SAAS,EAAM,CAChC,MAAO,KAAS,CAClB,CAAC,CACH,CAAC,CACH,EACI,EAAmB,SAA2B,EAAY,CAC5D,GAAI,GAAc,EAAO,GACzB,GAAI,MAAO,IAAgB,WAAY,CACrC,OAAS,GAAQ,UAAU,OAAQ,EAAS,GAAI,OAAM,EAAQ,EAAI,EAAQ,EAAI,CAAC,EAAG,EAAQ,EAAG,EAAQ,EAAO,IAC1G,EAAO,EAAQ,GAAK,UAAU,GAEhC,EAAc,EAAY,MAAM,OAAQ,CAAM,CAChD,CAIA,GAHI,IAAgB,IAClB,GAAc,QAEZ,CAAC,EAAa,CAChB,GAAI,IAAgB,QAAU,IAAgB,GAC5C,MAAO,GAET,KAAM,IAAI,OAAM,IAAI,OAAO,EAAY,8DAA8D,CAAC,CACxG,CACA,GAAI,GAAO,EACX,GAAI,MAAO,IAAgB,UACzB,GAAO,EAAI,cAAc,CAAW,EAChC,CAAC,GACH,KAAM,IAAI,OAAM,IAAI,OAAO,EAAY,uCAAuC,CAAC,EAGnF,MAAO,EACT,EACI,EAAsB,UAAgC,CACxD,GAAI,GAAO,EAAiB,cAAc,EAC1C,GAAI,IAAS,GACX,MAAO,GAET,GAAI,IAAS,OACX,GAAI,EAAmB,EAAI,aAAa,GAAK,EAC3C,EAAO,EAAI,kBACN,CACL,GAAI,GAAqB,EAAM,eAAe,GAC1C,EAAoB,GAAsB,EAAmB,kBACjE,EAAO,GAAqB,EAAiB,eAAe,CAC9D,CAEF,GAAI,CAAC,EACH,KAAM,IAAI,OAAM,8DAA8D,EAEhF,MAAO,EACT,EACI,EAAsB,UAAgC,CAwCxD,GAvCA,EAAM,gBAAkB,EAAM,WAAW,IAAI,SAAS,EAAW,CAC/D,GAAI,GAAgB,GAAS,EAAW,EAAO,eAAe,EAC1D,EAAiB,GAAU,EAAW,EAAO,eAAe,EAChE,MAAO,CACL,YACA,gBACA,iBACA,kBAAmB,EAAc,OAAS,EAAI,EAAc,GAAK,KACjE,iBAAkB,EAAc,OAAS,EAAI,EAAc,EAAc,OAAS,GAAK,KASvF,iBAAkB,SAA0B,EAAM,CAChD,GAAI,GAAU,UAAU,OAAS,GAAK,UAAU,KAAO,OAAS,UAAU,GAAK,GAC3E,EAAU,EAAe,UAAU,SAAS,EAAG,CACjD,MAAO,KAAM,CACf,CAAC,EACD,GAAI,IAAU,GAGd,MAAI,GACK,EAAe,MAAM,EAAU,CAAC,EAAE,KAAK,SAAS,EAAG,CACxD,MAAO,IAAW,EAAG,EAAO,eAAe,CAC7C,CAAC,EAEI,EAAe,MAAM,EAAG,CAAO,EAAE,QAAQ,EAAE,KAAK,SAAS,EAAG,CACjE,MAAO,IAAW,EAAG,EAAO,eAAe,CAC7C,CAAC,CACH,CACF,CACF,CAAC,EACD,EAAM,eAAiB,EAAM,gBAAgB,OAAO,SAAS,EAAO,CAClE,MAAO,GAAM,cAAc,OAAS,CACtC,CAAC,EACG,EAAM,eAAe,QAAU,GAAK,CAAC,EAAiB,eAAe,EACvE,KAAM,IAAI,OAAM,qGAAqG,CAEzH,EACI,EAAW,WAAmB,EAAM,CACtC,GAAI,IAAS,IAGT,IAAS,EAAI,cAGjB,IAAI,CAAC,GAAQ,CAAC,EAAK,MAAO,CACxB,EAAU,EAAoB,CAAC,EAC/B,MACF,CACA,EAAK,MAAM,CACT,cAAe,CAAC,CAAC,EAAO,aAC1B,CAAC,EACD,EAAM,wBAA0B,EAC5B,GAAkB,CAAI,GACxB,EAAK,OAAO,EAEhB,EACI,EAAqB,SAA6B,EAAuB,CAC3E,GAAI,GAAO,EAAiB,iBAAkB,CAAqB,EACnE,MAAO,IAAc,KAAS,GAAQ,GAAQ,EAChD,EACI,EAAmB,SAA2B,EAAG,CACnD,GAAI,GAAS,GAAgB,CAAC,EAC9B,GAAI,IAAmB,CAAM,GAAK,GAGlC,IAAI,GAAe,EAAO,wBAAyB,CAAC,EAAG,CACrD,EAAK,WAAW,CAYd,YAAa,EAAO,yBAA2B,CAAC,GAAY,EAAQ,EAAO,eAAe,CAC5F,CAAC,EACD,MACF,CACA,AAAI,GAAe,EAAO,kBAAmB,CAAC,GAG9C,EAAE,eAAe,EACnB,EACI,EAAe,SAAuB,EAAG,CAC3C,GAAI,GAAS,GAAgB,CAAC,EAC1B,EAAkB,EAAmB,CAAM,GAAK,EACpD,AAAI,GAAmB,YAAkB,UACnC,GACF,GAAM,wBAA0B,GAGlC,GAAE,yBAAyB,EAC3B,EAAS,EAAM,yBAA2B,EAAoB,CAAC,EAEnE,EACI,EAAW,SAAmB,EAAG,CACnC,GAAI,GAAS,GAAgB,CAAC,EAC9B,EAAoB,EACpB,GAAI,GAAkB,KACtB,GAAI,EAAM,eAAe,OAAS,EAAG,CACnC,GAAI,GAAiB,EAAmB,CAAM,EAC1C,EAAiB,GAAkB,EAAI,EAAM,gBAAgB,GAAkB,OACnF,GAAI,EAAiB,EACnB,AAAI,EAAE,SACJ,EAAkB,EAAM,eAAe,EAAM,eAAe,OAAS,GAAG,iBAExE,EAAkB,EAAM,eAAe,GAAG,0BAEnC,EAAE,SAAU,CACrB,GAAI,GAAoB,GAAU,EAAM,eAAgB,SAAS,EAAO,CACtE,GAAI,IAAoB,EAAM,kBAC9B,MAAO,KAAW,EACpB,CAAC,EAID,GAHI,EAAoB,GAAM,GAAe,YAAc,GAAU,GAAY,EAAQ,EAAO,eAAe,GAAK,CAAC,GAAW,EAAQ,EAAO,eAAe,GAAK,CAAC,EAAe,iBAAiB,EAAQ,EAAK,IAC/M,GAAoB,GAElB,GAAqB,EAAG,CAC1B,GAAI,GAAwB,IAAsB,EAAI,EAAM,eAAe,OAAS,EAAI,EAAoB,EACxG,EAAmB,EAAM,eAAe,GAC5C,EAAkB,EAAiB,gBACrC,CACF,KAAO,CACL,GAAI,GAAmB,GAAU,EAAM,eAAgB,SAAS,EAAO,CACrE,GAAI,IAAmB,EAAM,iBAC7B,MAAO,KAAW,EACpB,CAAC,EAID,GAHI,EAAmB,GAAM,GAAe,YAAc,GAAU,GAAY,EAAQ,EAAO,eAAe,GAAK,CAAC,GAAW,EAAQ,EAAO,eAAe,GAAK,CAAC,EAAe,iBAAiB,CAAM,IACvM,GAAmB,GAEjB,GAAoB,EAAG,CACzB,GAAI,GAAyB,IAAqB,EAAM,eAAe,OAAS,EAAI,EAAI,EAAmB,EACvG,EAAoB,EAAM,eAAe,GAC7C,EAAkB,EAAkB,iBACtC,CACF,CACF,KACE,GAAkB,EAAiB,eAAe,EAEpD,AAAI,GACF,GAAE,eAAe,EACjB,EAAS,CAAe,EAE5B,EACI,EAAW,SAAmB,EAAG,CACnC,GAAI,GAAc,CAAC,GAAK,GAAe,EAAO,kBAAmB,CAAC,IAAM,GAAO,CAC7E,EAAE,eAAe,EACjB,EAAK,WAAW,EAChB,MACF,CACA,GAAI,GAAW,CAAC,EAAG,CACjB,EAAS,CAAC,EACV,MACF,CACF,EACI,EAAa,SAAqB,EAAG,CACvC,GAAI,GAAS,GAAgB,CAAC,EAC9B,AAAI,EAAmB,CAAM,GAAK,GAG9B,GAAe,EAAO,wBAAyB,CAAC,GAGhD,GAAe,EAAO,kBAAmB,CAAC,GAG9C,GAAE,eAAe,EACjB,EAAE,yBAAyB,EAC7B,EACI,EAAe,UAAyB,CAC1C,GAAI,EAAC,EAAM,OAGX,UAAiB,aAAa,CAAI,EAClC,EAAM,uBAAyB,EAAO,kBAAoB,GAAM,UAAW,CACzE,EAAS,EAAoB,CAAC,CAChC,CAAC,EAAI,EAAS,EAAoB,CAAC,EACnC,EAAI,iBAAiB,UAAW,EAAc,EAAI,EAClD,EAAI,iBAAiB,YAAa,EAAkB,CAClD,QAAS,GACT,QAAS,EACX,CAAC,EACD,EAAI,iBAAiB,aAAc,EAAkB,CACnD,QAAS,GACT,QAAS,EACX,CAAC,EACD,EAAI,iBAAiB,QAAS,EAAY,CACxC,QAAS,GACT,QAAS,EACX,CAAC,EACD,EAAI,iBAAiB,UAAW,EAAU,CACxC,QAAS,GACT,QAAS,EACX,CAAC,EACM,CACT,EACI,EAAkB,UAA4B,CAChD,GAAI,EAAC,EAAM,OAGX,SAAI,oBAAoB,UAAW,EAAc,EAAI,EACrD,EAAI,oBAAoB,YAAa,EAAkB,EAAI,EAC3D,EAAI,oBAAoB,aAAc,EAAkB,EAAI,EAC5D,EAAI,oBAAoB,QAAS,EAAY,EAAI,EACjD,EAAI,oBAAoB,UAAW,EAAU,EAAI,EAC1C,CACT,EACA,SAAO,CACL,GAAI,SAAS,CACX,MAAO,GAAM,MACf,EACA,GAAI,SAAS,CACX,MAAO,GAAM,MACf,EACA,SAAU,SAAkB,EAAiB,CAC3C,GAAI,EAAM,OACR,MAAO,MAET,GAAI,GAAa,EAAU,EAAiB,YAAY,EACpD,EAAiB,EAAU,EAAiB,gBAAgB,EAC5D,EAAoB,EAAU,EAAiB,mBAAmB,EACtE,AAAK,GACH,EAAoB,EAEtB,EAAM,OAAS,GACf,EAAM,OAAS,GACf,EAAM,4BAA8B,EAAI,cACpC,GACF,EAAW,EAEb,GAAI,GAAmB,UAA6B,CAClD,AAAI,GACF,EAAoB,EAEtB,EAAa,EACT,GACF,EAAe,CAEnB,EACA,MAAI,GACF,GAAkB,EAAM,WAAW,OAAO,CAAC,EAAE,KAAK,EAAkB,CAAgB,EAC7E,MAET,GAAiB,EACV,KACT,EACA,WAAY,SAAoB,EAAmB,CACjD,GAAI,CAAC,EAAM,OACT,MAAO,MAET,GAAI,GAAU,GAAe,CAC3B,aAAc,EAAO,aACrB,iBAAkB,EAAO,iBACzB,oBAAqB,EAAO,mBAC9B,EAAG,CAAiB,EACpB,aAAa,EAAM,sBAAsB,EACzC,EAAM,uBAAyB,OAC/B,EAAgB,EAChB,EAAM,OAAS,GACf,EAAM,OAAS,GACf,GAAiB,eAAe,CAAI,EACpC,GAAI,GAAe,EAAU,EAAS,cAAc,EAChD,EAAmB,EAAU,EAAS,kBAAkB,EACxD,EAAsB,EAAU,EAAS,qBAAqB,EAC9D,EAAc,EAAU,EAAS,cAAe,yBAAyB,EAC7E,AAAI,GACF,EAAa,EAEf,GAAI,GAAqB,UAA+B,CACtD,GAAM,UAAW,CACf,AAAI,GACF,EAAS,EAAmB,EAAM,2BAA2B,CAAC,EAE5D,GACF,EAAiB,CAErB,CAAC,CACH,EACA,MAAI,IAAe,EACjB,GAAoB,EAAmB,EAAM,2BAA2B,CAAC,EAAE,KAAK,EAAoB,CAAkB,EAC/G,MAET,GAAmB,EACZ,KACT,EACA,MAAO,UAAiB,CACtB,MAAI,GAAM,QAAU,CAAC,EAAM,OAClB,KAET,GAAM,OAAS,GACf,EAAgB,EACT,KACT,EACA,QAAS,UAAmB,CAC1B,MAAI,CAAC,EAAM,QAAU,CAAC,EAAM,OACnB,KAET,GAAM,OAAS,GACf,EAAoB,EACpB,EAAa,EACN,KACT,EACA,wBAAyB,SAAiC,EAAmB,CAC3E,GAAI,GAAkB,CAAC,EAAE,OAAO,CAAiB,EAAE,OAAO,OAAO,EACjE,SAAM,WAAa,EAAgB,IAAI,SAAS,EAAS,CACvD,MAAO,OAAO,IAAY,SAAW,EAAI,cAAc,CAAO,EAAI,CACpE,CAAC,EACG,EAAM,QACR,EAAoB,EAEf,IACT,CACF,EACA,EAAK,wBAAwB,CAAQ,EAC9B,CACT,EAGA,YAAqB,EAAQ,CAC3B,GAAI,GACA,EACJ,OAAO,iBAAiB,UAAW,IAAM,CACvC,EAAc,EACd,EAAiB,SAAS,aAC5B,CAAC,EACD,EAAO,MAAM,QAAS,AAAC,GAAO,CAC5B,GAAI,GAAS,EACb,MAAO,CACL,WAAY,GACZ,aAAc,GACd,OAAO,EAAK,CACV,SAAS,EACF,IACT,EACA,kBAAmB,CACjB,YAAK,WAAa,GACX,IACT,EACA,UAAW,CACT,YAAK,WAAa,GACX,IACT,EACA,gBAAiB,CACf,YAAK,aAAe,GACb,IACT,EACA,MAAO,CACL,MAAO,MAAK,eAAe,CAC7B,EACA,UAAU,EAAK,CACb,MAAO,IAAY,CAAG,CACxB,EACA,mBAAoB,CAClB,MAAO,EACT,EACA,aAAc,CACZ,MAAO,EACT,EACA,SAAU,CACR,MAAO,EACT,EACA,YAAa,CACX,MAAI,OAAM,QAAQ,CAAM,EACf,EACF,GAAU,EAAQ,CAAE,aAAc,MAAO,CAAC,CACnD,EACA,KAAM,CACJ,MAAO,MAAK,WAAW,CACzB,EACA,QAAQ,EAAK,CACX,GAAI,GAAM,KAAK,IAAI,EACnB,MAAO,GAAI,IAAM,EAAI,GAAG,WAAW,CAAG,CACxC,EACA,OAAO,EAAK,CACV,GAAI,GAAM,KAAK,IAAI,EACnB,MAAO,GAAI,QAAU,EAAI,MAAM,EAAE,EAAE,GAAG,WAAW,CAAG,CACtD,EACA,UAAW,CACT,MAAO,MAAK,IAAI,EAAE,EACpB,EACA,SAAU,CACR,MAAO,MAAK,IAAI,EAAE,MAAM,EAAE,EAAE,EAC9B,EACA,SAAU,CACR,GAAI,GAAO,KAAK,IAAI,EAChB,EAAU,SAAS,cACvB,GAAI,EAAK,QAAQ,CAAO,IAAM,GAE9B,MAAI,MAAK,cAAgB,EAAK,QAAQ,CAAO,IAAM,EAAK,OAAS,EACxD,EAAK,GAEP,EAAK,EAAK,QAAQ,CAAO,EAAI,EACtC,EACA,aAAc,CACZ,GAAI,GAAO,KAAK,IAAI,EAChB,EAAU,SAAS,cACvB,GAAI,EAAK,QAAQ,CAAO,IAAM,GAE9B,MAAI,MAAK,cAAgB,EAAK,QAAQ,CAAO,IAAM,EAC1C,EAAK,MAAM,EAAE,EAAE,GAEjB,EAAK,EAAK,QAAQ,CAAO,EAAI,EACtC,EACA,OAAQ,CACN,KAAK,MAAM,KAAK,SAAS,CAAC,CAC5B,EACA,MAAO,CACL,KAAK,MAAM,KAAK,QAAQ,CAAC,CAC3B,EACA,MAAO,CACL,KAAK,MAAM,KAAK,QAAQ,CAAC,CAC3B,EACA,UAAW,CACT,KAAK,MAAM,KAAK,YAAY,CAAC,CAC/B,EACA,MAAO,CACL,MAAO,MAAK,SAAS,CACvB,EACA,MAAM,EAAK,CACT,AAAI,CAAC,GAEL,WAAW,IAAM,CACf,AAAK,EAAI,aAAa,UAAU,GAC9B,EAAI,aAAa,WAAY,GAAG,EAClC,EAAI,MAAM,CAAE,cAAe,KAAK,UAAW,CAAC,CAC9C,CAAC,CACH,CACF,CACF,CAAC,EACD,EAAO,UAAU,OAAQ,EAAO,gBAC9B,CAAC,EAAI,CAAE,aAAY,aAAa,CAAE,SAAQ,gBAAe,aAAc,CACrE,GAAI,GAAY,EAAc,CAAU,EACpC,EAAW,GACX,EAAU,CACZ,kBAAmB,GACnB,kBAAmB,GACnB,cAAe,IAAM,CACvB,EACA,GAAI,EAAU,SAAS,aAAa,EAClC,EAAQ,aAAe,OAClB,CACL,GAAI,GAAc,EAAG,cAAc,aAAa,EAChD,AAAI,GACF,GAAQ,aAAe,EAC3B,CACA,GAAI,GAAO,GAAgB,EAAI,CAAO,EAClC,EAAY,IAAM,CACtB,EACI,EAAuB,IAAM,CACjC,EACM,EAAe,IAAM,CACzB,EAAU,EACV,EAAY,IAAM,CAClB,EACA,EAAqB,EACrB,EAAuB,IAAM,CAC7B,EACA,EAAK,WAAW,CACd,YAAa,CAAC,EAAU,SAAS,UAAU,CAC7C,CAAC,CACH,EACA,EAAO,IAAM,EAAU,AAAC,GAAU,CAChC,AAAI,IAAa,GAEb,IAAS,CAAC,GACR,GAAU,SAAS,UAAU,GAC/B,GAAuB,GAAiB,GACtC,EAAU,SAAS,OAAO,GAC5B,GAAY,GAAS,CAAE,GACzB,WAAW,IAAM,CACf,EAAK,SAAS,CAChB,EAAG,EAAE,GAEH,CAAC,GAAS,GACZ,EAAa,EAEf,EAAW,CAAC,CAAC,EACf,CAAC,CAAC,EACF,EAAQ,CAAY,CACtB,EAIA,CAAC,EAAI,CAAE,aAAY,aAAa,CAAE,cAAe,CAC/C,AAAI,EAAU,SAAS,OAAO,GAAK,EAAS,CAAU,GACpD,GAAS,CAAE,CACf,CACF,CAAC,CACH,CACA,YAAkB,EAAI,CACpB,GAAI,GAAQ,CAAC,EACb,UAAgB,EAAI,AAAC,GAAY,CAC/B,GAAI,GAAQ,EAAQ,aAAa,aAAa,EAC9C,EAAQ,aAAa,cAAe,MAAM,EAC1C,EAAM,KAAK,IAAM,GAAS,EAAQ,gBAAgB,aAAa,CAAC,CAClE,CAAC,EACM,IAAM,CACX,KAAO,EAAM,QACX,EAAM,IAAI,EAAE,CAChB,CACF,CACA,YAAyB,EAAI,EAAU,CACrC,AAAI,EAAG,WAAW,SAAS,IAAI,GAAK,CAAC,EAAG,YAExC,MAAM,KAAK,EAAG,WAAW,QAAQ,EAAE,QAAQ,AAAC,GAAY,CACtD,AAAI,EAAQ,WAAW,CAAE,EACvB,GAAgB,EAAG,WAAY,CAAQ,EAEvC,EAAS,CAAO,CAEpB,CAAC,CACH,CACA,aAA4B,CAC1B,GAAI,GAAW,SAAS,gBAAgB,MAAM,SAC1C,EAAe,SAAS,gBAAgB,MAAM,aAC9C,EAAiB,OAAO,WAAa,SAAS,gBAAgB,YAClE,gBAAS,gBAAgB,MAAM,SAAW,SAC1C,SAAS,gBAAgB,MAAM,aAAe,GAAG,MAC1C,IAAM,CACX,SAAS,gBAAgB,MAAM,SAAW,EAC1C,SAAS,gBAAgB,MAAM,aAAe,CAChD,CACF,CAGA,GAAI,IAAiB,GAKrB,ACl/BA,YAAqB,EAAQ,CAC3B,GAAI,GAAU,IAAM,CAClB,GAAI,GACA,EACJ,GAAI,CACF,EAAU,YACZ,OAAS,EAAP,CACA,QAAQ,MAAM,CAAC,EACf,QAAQ,KAAK,gFAAgF,EAC7F,GAAI,GAAwB,GAAI,KAChC,EAAU,CACR,QAAS,EAAM,IAAI,KAAK,CAAK,EAC7B,QAAS,EAAM,IAAI,KAAK,CAAK,CAC/B,CACF,CACA,MAAO,GAAO,YAAY,CAAC,EAAc,EAAQ,EAAQ,EAAM,IAAQ,CACrE,GAAI,GAAS,GAAS,MAAM,IACxB,EAAU,GAAW,EAAQ,CAAO,EAAI,GAAW,EAAQ,CAAO,EAAI,EAC1E,SAAO,CAAO,EACd,EAAO,OAAO,IAAM,CAClB,GAAI,GAAQ,EAAO,EACnB,GAAW,EAAQ,EAAO,CAAO,EACjC,EAAO,CAAK,CACd,CAAC,EACM,CACT,EAAG,AAAC,GAAS,CACX,EAAK,GAAK,AAAC,GACT,GAAQ,EACD,GACN,EAAK,MAAQ,AAAC,GACf,GAAU,EACH,EAEX,CAAC,CACH,EACA,OAAO,eAAe,EAAQ,WAAY,CAAE,IAAK,IAAM,EAAQ,CAAE,CAAC,EAClE,EAAO,MAAM,UAAW,CAAO,EAC/B,EAAO,QAAU,CAAC,EAAK,CAAE,MAAK,OAAO,EAAU,eAAiB,CAC9D,GAAI,GAAU,GAAW,EAAK,CAAO,EAAI,GAAW,EAAK,CAAO,EAAI,EAAI,EACxE,EAAI,CAAO,EACX,EAAO,OAAO,IAAM,CAClB,GAAI,GAAQ,EAAI,EAChB,GAAW,EAAK,EAAO,CAAO,EAC9B,EAAI,CAAK,CACX,CAAC,CACH,CACF,CACA,YAAoB,EAAK,EAAS,CAChC,MAAO,GAAQ,QAAQ,CAAG,IAAM,IAClC,CACA,YAAoB,EAAK,EAAS,CAChC,GAAI,GAAQ,EAAQ,QAAQ,EAAK,CAAO,EACxC,GAAI,IAAU,OAEd,MAAO,MAAK,MAAM,CAAK,CACzB,CACA,YAAoB,EAAK,EAAO,EAAS,CACvC,EAAQ,QAAQ,EAAK,KAAK,UAAU,CAAK,CAAC,CAC5C,CAGA,GAAI,IAAiB,GC7DrB,YAAqB,EAAQ,CAC3B,EAAO,UAAU,YAAa,EAAO,gBAAgB,CAAC,EAAI,CAAE,QAAO,aAAY,aAAa,CAAE,gBAAe,aAAc,CACzH,GAAI,GAAW,EAAc,CAAU,EACnC,EAAU,CACZ,WAAY,GAAc,CAAS,EACnC,UAAW,GAAa,CAAS,CACnC,EACI,EAAW,GAAI,sBAAqB,AAAC,GAAY,CACnD,EAAQ,QAAQ,AAAC,GAAU,CACzB,AAAI,EAAM,iBAAoB,KAAU,UAExC,GAAS,EACT,EAAU,SAAS,MAAM,GAAK,EAAS,WAAW,EACpD,CAAC,CACH,EAAG,CAAO,EACV,EAAS,QAAQ,CAAE,EACnB,EAAQ,IAAM,CACZ,EAAS,WAAW,CACtB,CAAC,CACH,CAAC,CAAC,CACJ,CACA,YAAsB,EAAW,CAC/B,GAAI,EAAU,SAAS,MAAM,EAC3B,MAAO,KACT,GAAI,EAAU,SAAS,MAAM,EAC3B,MAAO,IACT,GAAI,CAAC,EAAU,SAAS,WAAW,EACjC,MAAO,GACT,GAAI,GAAY,EAAU,EAAU,QAAQ,WAAW,EAAI,GAC3D,MAAI,KAAc,MACT,EACL,IAAc,IACT,EACF,OAAO,IAAI,GAAW,CAC/B,CACA,YAAwB,EAAU,CAChC,GAAI,GAAQ,EAAS,MAAM,qBAAqB,EAChD,MAAO,GAAQ,EAAM,GAAM,GAAM,IAAM,MAAQ,MACjD,CACA,YAAuB,EAAW,CAChC,GAAM,GAAM,SACN,EAAW,kBACX,EAAQ,EAAU,QAAQ,CAAG,EACnC,GAAI,IAAU,GACZ,MAAO,GACT,GAAI,GAAS,CAAC,EACd,OAAS,GAAI,EAAG,EAAI,EAAG,IACrB,EAAO,KAAK,GAAe,EAAU,EAAQ,IAAM,EAAE,CAAC,EAExD,SAAS,EAAO,OAAO,AAAC,GAAM,IAAM,MAAM,EACnC,EAAO,OAAS,EAAO,KAAK,GAAG,EAAE,KAAK,EAAI,CACnD,CAGA,GAAI,IAAiB,GCtDrB,GAAI,IAAM,KAAK,IACX,GAAM,KAAK,IACX,GAAQ,KAAK,MACb,GAAQ,KAAK,MACb,GAAe,AAAC,GAAO,EACzB,EAAG,EACH,EAAG,CACL,GACI,GAAkB,CACpB,KAAM,QACN,MAAO,OACP,OAAQ,MACR,IAAK,QACP,EACI,GAAuB,CACzB,MAAO,MACP,IAAK,OACP,EACA,YAAe,EAAO,EAAO,EAAK,CAChC,MAAO,IAAI,EAAO,GAAI,EAAO,CAAG,CAAC,CACnC,CACA,YAAkB,EAAO,EAAO,CAC9B,MAAO,OAAO,IAAU,WAAa,EAAM,CAAK,EAAI,CACtD,CACA,YAAiB,EAAW,CAC1B,MAAO,GAAU,MAAM,GAAG,EAAE,EAC9B,CACA,YAAsB,EAAW,CAC/B,MAAO,GAAU,MAAM,GAAG,EAAE,EAC9B,CACA,YAAyB,EAAM,CAC7B,MAAO,KAAS,IAAM,IAAM,GAC9B,CACA,YAAuB,EAAM,CAC3B,MAAO,KAAS,IAAM,SAAW,OACnC,CACA,YAAqB,EAAW,CAC9B,MAAO,CAAC,MAAO,QAAQ,EAAE,SAAS,GAAQ,CAAS,CAAC,EAAI,IAAM,GAChE,CACA,YAA0B,EAAW,CACnC,MAAO,IAAgB,GAAY,CAAS,CAAC,CAC/C,CACA,YAA2B,EAAW,EAAO,EAAK,CAChD,AAAI,IAAQ,QACV,GAAM,IAER,GAAM,GAAY,GAAa,CAAS,EAClC,EAAgB,GAAiB,CAAS,EAC1C,EAAS,GAAc,CAAa,EACtC,EAAoB,IAAkB,IAAM,IAAe,GAAM,MAAQ,SAAW,QAAU,OAAS,IAAc,QAAU,SAAW,MAC9I,MAAI,GAAM,UAAU,GAAU,EAAM,SAAS,IAC3C,GAAoB,GAAqB,CAAiB,GAErD,CAAC,EAAmB,GAAqB,CAAiB,CAAC,CACpE,CACA,YAA+B,EAAW,CACxC,GAAM,GAAoB,GAAqB,CAAS,EACxD,MAAO,CAAC,GAA8B,CAAS,EAAG,EAAmB,GAA8B,CAAiB,CAAC,CACvH,CACA,YAAuC,EAAW,CAChD,MAAO,GAAU,QAAQ,aAAc,AAAC,GAAc,GAAqB,EAAU,CACvF,CACA,YAAqB,EAAM,EAAS,EAAK,CACvC,GAAM,GAAK,CAAC,OAAQ,OAAO,EACrB,EAAK,CAAC,QAAS,MAAM,EACrB,EAAK,CAAC,MAAO,QAAQ,EACrB,EAAK,CAAC,SAAU,KAAK,EAC3B,OAAQ,OACD,UACA,SACH,MAAI,GACK,EAAU,EAAK,EACjB,EAAU,EAAK,MACnB,WACA,QACH,MAAO,GAAU,EAAK,UAEtB,MAAO,CAAC,EAEd,CACA,YAAmC,EAAW,EAAe,EAAW,EAAK,CAC3E,GAAM,GAAY,GAAa,CAAS,EACpC,EAAO,GAAY,GAAQ,CAAS,EAAG,IAAc,QAAS,CAAG,EACrE,MAAI,IACF,GAAO,EAAK,IAAI,AAAC,GAAS,EAAO,IAAM,CAAS,EAC5C,GACF,GAAO,EAAK,OAAO,EAAK,IAAI,EAA6B,CAAC,IAGvD,CACT,CACA,YAA8B,EAAW,CACvC,MAAO,GAAU,QAAQ,yBAA0B,AAAC,GAAS,GAAgB,EAAK,CACpF,CACA,YAA6B,EAAS,CACpC,MAAO,CACL,IAAK,EACL,MAAO,EACP,OAAQ,EACR,KAAM,EACN,GAAG,CACL,CACF,CACA,YAA0B,EAAS,CACjC,MAAO,OAAO,IAAY,SAAW,GAAoB,CAAO,EAAI,CAClE,IAAK,EACL,MAAO,EACP,OAAQ,EACR,KAAM,CACR,CACF,CACA,YAA0B,EAAM,CAC9B,MAAO,CACL,GAAG,EACH,IAAK,EAAK,EACV,KAAM,EAAK,EACX,MAAO,EAAK,EAAI,EAAK,MACrB,OAAQ,EAAK,EAAI,EAAK,MACxB,CACF,CAGA,YAAoC,EAAM,EAAW,EAAK,CACxD,GAAI,CACF,YACA,YACE,EACE,EAAW,GAAY,CAAS,EAChC,EAAgB,GAAiB,CAAS,EAC1C,EAAc,GAAc,CAAa,EACzC,EAAO,GAAQ,CAAS,EACxB,EAAa,IAAa,IAC1B,EAAU,EAAU,EAAI,EAAU,MAAQ,EAAI,EAAS,MAAQ,EAC/D,EAAU,EAAU,EAAI,EAAU,OAAS,EAAI,EAAS,OAAS,EACjE,EAAc,EAAU,GAAe,EAAI,EAAS,GAAe,EACrE,EACJ,OAAQ,OACD,MACH,EAAS,CACP,EAAG,EACH,EAAG,EAAU,EAAI,EAAS,MAC5B,EACA,UACG,SACH,EAAS,CACP,EAAG,EACH,EAAG,EAAU,EAAI,EAAU,MAC7B,EACA,UACG,QACH,EAAS,CACP,EAAG,EAAU,EAAI,EAAU,MAC3B,EAAG,CACL,EACA,UACG,OACH,EAAS,CACP,EAAG,EAAU,EAAI,EAAS,MAC1B,EAAG,CACL,EACA,cAEA,EAAS,CACP,EAAG,EAAU,EACb,EAAG,EAAU,CACf,EAEJ,OAAQ,GAAa,CAAS,OACvB,QACH,EAAO,IAAkB,EAAe,IAAO,EAAa,GAAK,GACjE,UACG,MACH,EAAO,IAAkB,EAAe,IAAO,EAAa,GAAK,GACjE,MAEJ,MAAO,EACT,CACA,GAAI,IAAkB,MAAO,EAAW,EAAU,IAAW,CAC3D,GAAM,CACJ,YAAY,SACZ,WAAW,WACX,aAAa,CAAC,EACd,SAAU,GACR,EACE,EAAkB,EAAW,OAAO,OAAO,EAC3C,EAAM,KAAO,GAAU,OAAS,KAAO,OAAS,EAAU,MAAM,CAAQ,GAC1E,EAAQ,KAAM,GAAU,gBAAgB,CAC1C,YACA,WACA,UACF,CAAC,EACG,CACF,IACA,KACE,GAA2B,EAAO,EAAW,CAAG,EAChD,EAAoB,EACpB,EAAiB,CAAC,EAClB,EAAa,EACjB,OAAS,GAAI,EAAG,EAAI,EAAgB,OAAQ,IAAK,CAC/C,GAAM,CACJ,OACA,MACE,EAAgB,GACd,CACJ,EAAG,EACH,EAAG,EACH,OACA,SACE,KAAM,GAAG,CACX,IACA,IACA,iBAAkB,EAClB,UAAW,EACX,WACA,iBACA,QACA,SAAU,EACV,SAAU,CACR,YACA,UACF,CACF,CAAC,EAUD,GATA,EAAI,GAAwB,EAC5B,EAAI,GAAwB,EAC5B,EAAiB,CACf,GAAG,EACH,CAAC,GAAO,CACN,GAAG,EAAe,GAClB,GAAG,CACL,CACF,EACI,GAAS,GAAc,GAAI,CAC7B,IACI,MAAO,IAAU,UACf,GAAM,WACR,GAAoB,EAAM,WAExB,EAAM,OACR,GAAQ,EAAM,QAAU,GAAO,KAAM,GAAU,gBAAgB,CAC7D,YACA,WACA,UACF,CAAC,EAAI,EAAM,OAEZ,CACC,IACA,GACF,EAAI,GAA2B,EAAO,EAAmB,CAAG,GAE9D,EAAI,GACJ,QACF,CACF,CACA,MAAO,CACL,IACA,IACA,UAAW,EACX,WACA,gBACF,CACF,EACA,kBAA8B,EAAO,EAAS,CAC5C,GAAI,GACJ,AAAI,IAAY,QACd,GAAU,CAAC,GAEb,GAAM,CACJ,IACA,IACA,SAAU,EACV,QACA,WACA,YACE,EACE,CACJ,WAAW,oBACX,eAAe,WACf,iBAAiB,WACjB,cAAc,GACd,UAAU,GACR,GAAS,EAAS,CAAK,EACrB,EAAgB,GAAiB,CAAO,EAExC,EAAU,EAAS,EADN,IAAmB,WAAa,YAAc,WACb,GAC9C,EAAqB,GAAiB,KAAM,GAAU,gBAAgB,CAC1E,QAAW,GAAwB,KAAO,GAAU,WAAa,KAAO,OAAS,EAAU,UAAU,CAAO,KAAO,MAAO,EAAgC,EAAU,EAAQ,gBAAkB,KAAO,GAAU,oBAAsB,KAAO,OAAS,EAAU,mBAAmB,EAAS,QAAQ,GACnS,WACA,eACA,UACF,CAAC,CAAC,EACI,EAAO,IAAmB,WAAa,CAC3C,GAAG,EAAM,SACT,IACA,GACF,EAAI,EAAM,UACJ,EAAe,KAAO,GAAU,iBAAmB,KAAO,OAAS,EAAU,gBAAgB,EAAS,QAAQ,GAC9G,EAAc,KAAO,GAAU,WAAa,KAAO,OAAS,EAAU,UAAU,CAAY,GAAK,KAAO,GAAU,UAAY,KAAO,OAAS,EAAU,SAAS,CAAY,IAAM,CACvL,EAAG,EACH,EAAG,CACL,EAAI,CACF,EAAG,EACH,EAAG,CACL,EACM,EAAoB,GAAiB,EAAU,sDAAwD,KAAM,GAAU,sDAAsD,CACjL,OACA,eACA,UACF,CAAC,EAAI,CAAI,EACT,MAAO,CACL,IAAM,GAAmB,IAAM,EAAkB,IAAM,EAAc,KAAO,EAAY,EACxF,OAAS,GAAkB,OAAS,EAAmB,OAAS,EAAc,QAAU,EAAY,EACpG,KAAO,GAAmB,KAAO,EAAkB,KAAO,EAAc,MAAQ,EAAY,EAC5F,MAAQ,GAAkB,MAAQ,EAAmB,MAAQ,EAAc,OAAS,EAAY,CAClG,CACF,CACA,GAAI,IAAO,SAAS,EAAS,CAC3B,MAAI,KAAY,QACd,GAAU,CAAC,GAEN,CACL,KAAM,OACN,UACA,KAAM,IAAG,EAAO,CACd,GAAI,GAAuB,EAC3B,GAAM,CACJ,YACA,iBACA,QACA,mBACA,SAAU,EACV,YACE,EACE,CACJ,SAAU,EAAgB,GAC1B,UAAW,EAAiB,GAC5B,mBAAoB,EACpB,mBAAmB,UACnB,4BAA4B,OAC5B,gBAAgB,MACb,GACD,GAAS,EAAS,CAAK,EAC3B,GAAK,GAAwB,EAAe,QAAU,MAAQ,EAAsB,gBAClF,MAAO,CAAC,EAEV,GAAM,GAAO,GAAQ,CAAS,EACxB,EAAkB,GAAQ,CAAgB,IAAM,EAChD,EAAM,KAAO,GAAU,OAAS,KAAO,OAAS,EAAU,MAAM,EAAS,QAAQ,GACjF,EAAqB,GAAgC,IAAmB,CAAC,EAAgB,CAAC,GAAqB,CAAgB,CAAC,EAAI,GAAsB,CAAgB,GAChL,AAAI,CAAC,GAA+B,IAA8B,QAChE,EAAmB,KAAK,GAAG,GAA0B,EAAkB,EAAe,EAA2B,CAAG,CAAC,EAEvH,GAAM,GAAc,CAAC,EAAkB,GAAG,CAAkB,EACtD,EAAW,KAAM,IAAe,EAAO,CAAqB,EAC5D,EAAY,CAAC,EACf,EAAkB,IAAuB,EAAe,OAAS,KAAO,OAAS,EAAqB,YAAc,CAAC,EAIzH,GAHI,GACF,EAAU,KAAK,EAAS,EAAK,EAE3B,EAAgB,CAClB,GAAM,GAAS,GAAkB,EAAW,EAAO,CAAG,EACtD,EAAU,KAAK,EAAS,EAAO,IAAK,EAAS,EAAO,GAAG,CACzD,CAKA,GAJA,EAAgB,CAAC,GAAG,EAAe,CACjC,YACA,WACF,CAAC,EACG,CAAC,EAAU,MAAM,AAAC,GAAU,GAAS,CAAC,EAAG,CAC3C,GAAI,GAAuB,EAC3B,GAAM,GAAe,KAAwB,EAAe,OAAS,KAAO,OAAS,EAAsB,QAAU,GAAK,EACpH,EAAgB,EAAY,GAClC,GAAI,EACF,MAAO,CACL,KAAM,CACJ,MAAO,EACP,UAAW,CACb,EACA,MAAO,CACL,UAAW,CACb,CACF,EAEF,GAAI,GAAkB,GAAwB,EAAc,OAAO,AAAC,GAAM,EAAE,UAAU,IAAM,CAAC,EAAE,KAAK,CAAC,EAAG,IAAM,EAAE,UAAU,GAAK,EAAE,UAAU,EAAE,EAAE,KAAO,KAAO,OAAS,EAAsB,UAC5L,GAAI,CAAC,EACH,OAAQ,OACD,UAAW,CACd,GAAI,GACJ,GAAM,GAAc,GAAwB,EAAc,IAAI,AAAC,GAAM,CAAC,EAAE,UAAW,EAAE,UAAU,OAAO,AAAC,GAAc,EAAY,CAAC,EAAE,OAAO,CAAC,EAAK,KAAc,EAAM,GAAW,CAAC,CAAC,CAAC,EAAE,KAAK,CAAC,EAAG,IAAM,EAAE,GAAK,EAAE,EAAE,EAAE,KAAO,KAAO,OAAS,EAAsB,GAC9P,AAAI,GACF,GAAiB,GAEnB,KACF,KACK,mBACH,EAAiB,EACjB,MAGN,GAAI,IAAc,EAChB,MAAO,CACL,MAAO,CACL,UAAW,CACb,CACF,CAEJ,CACA,MAAO,CAAC,CACV,CACF,CACF,EACA,kBAAoC,EAAO,EAAS,CAClD,GAAM,CACJ,YACA,SAAU,EACV,YACE,EACE,EAAM,KAAO,GAAU,OAAS,KAAO,OAAS,EAAU,MAAM,EAAS,QAAQ,GACjF,EAAO,GAAQ,CAAS,EACxB,EAAY,GAAa,CAAS,EAClC,EAAa,GAAY,CAAS,IAAM,IACxC,EAAgB,CAAC,OAAQ,KAAK,EAAE,SAAS,CAAI,EAAI,GAAK,EACtD,EAAiB,GAAO,EAAa,GAAK,EAC1C,EAAW,GAAS,EAAS,CAAK,EACpC,CACF,WACA,YACA,iBACE,MAAO,IAAa,SAAW,CACjC,SAAU,EACV,UAAW,EACX,cAAe,IACjB,EAAI,CACF,SAAU,EACV,UAAW,EACX,cAAe,KACf,GAAG,CACL,EACA,MAAI,IAAa,MAAO,IAAkB,UACxC,GAAY,IAAc,MAAQ,EAAgB,GAAK,GAElD,EAAa,CAClB,EAAG,EAAY,EACf,EAAG,EAAW,CAChB,EAAI,CACF,EAAG,EAAW,EACd,EAAG,EAAY,CACjB,CACF,CACA,GAAI,IAAS,SAAS,EAAS,CAC7B,MAAI,KAAY,QACd,GAAU,GAEL,CACL,KAAM,SACN,UACA,KAAM,IAAG,EAAO,CACd,GAAM,CACJ,IACA,KACE,EACE,EAAa,KAAM,IAAqB,EAAO,CAAO,EAC5D,MAAO,CACL,EAAG,EAAI,EAAW,EAClB,EAAG,EAAI,EAAW,EAClB,KAAM,CACR,CACF,CACF,CACF,EACI,GAAQ,SAAS,EAAS,CAC5B,MAAI,KAAY,QACd,GAAU,CAAC,GAEN,CACL,KAAM,QACN,UACA,KAAM,IAAG,EAAO,CACd,GAAM,CACJ,IACA,IACA,aACE,EACE,CACJ,SAAU,EAAgB,GAC1B,UAAW,EAAiB,GAC5B,UAAU,CACR,GAAI,AAAC,GAAS,CACZ,GAAI,CACF,EAAG,EACH,EAAG,GACD,EACJ,MAAO,CACL,EAAG,EACH,EAAG,CACL,CACF,CACF,KACG,GACD,GAAS,EAAS,CAAK,EACrB,EAAS,CACb,IACA,GACF,EACM,EAAW,KAAM,IAAe,EAAO,CAAqB,EAC5D,EAAY,GAAY,GAAQ,CAAS,CAAC,EAC1C,EAAW,GAAgB,CAAS,EACtC,EAAgB,EAAO,GACvB,EAAiB,EAAO,GAC5B,GAAI,EAAe,CACjB,GAAM,GAAU,IAAa,IAAM,MAAQ,OACrC,EAAU,IAAa,IAAM,SAAW,QACxC,EAAO,EAAgB,EAAS,GAChC,EAAO,EAAgB,EAAS,GACtC,EAAgB,GAAM,EAAM,EAAe,CAAI,CACjD,CACA,GAAI,EAAgB,CAClB,GAAM,GAAU,IAAc,IAAM,MAAQ,OACtC,EAAU,IAAc,IAAM,SAAW,QACzC,EAAO,EAAiB,EAAS,GACjC,EAAO,EAAiB,EAAS,GACvC,EAAiB,GAAM,EAAM,EAAgB,CAAI,CACnD,CACA,GAAM,GAAgB,EAAQ,GAAG,CAC/B,GAAG,EACH,CAAC,GAAW,EACZ,CAAC,GAAY,CACf,CAAC,EACD,MAAO,CACL,GAAG,EACH,KAAM,CACJ,EAAG,EAAc,EAAI,EACrB,EAAG,EAAc,EAAI,CACvB,CACF,CACF,CACF,CACF,EAGA,YAAqB,EAAM,CACzB,MAAI,IAAO,CAAI,EACL,GAAK,UAAY,IAAI,YAAY,EAEpC,WACT,CACA,WAAmB,EAAM,CACvB,GAAI,GACJ,MAAQ,IAAQ,MAAiB,GAAsB,EAAK,gBAAkB,KAAvD,OAAuE,EAAoB,cAAgB,MACpI,CACA,YAA4B,EAAM,CAChC,GAAI,GACJ,MAAQ,GAAQ,IAAO,CAAI,EAAI,EAAK,cAAgB,EAAK,WAAa,OAAO,WAAa,KAAO,OAAS,EAAK,eACjH,CACA,YAAgB,EAAO,CACrB,MAAO,aAAiB,OAAQ,YAAiB,GAAU,CAAK,EAAE,IACpE,CACA,YAAmB,EAAO,CACxB,MAAO,aAAiB,UAAW,YAAiB,GAAU,CAAK,EAAE,OACvE,CACA,YAAuB,EAAO,CAC5B,MAAO,aAAiB,cAAe,YAAiB,GAAU,CAAK,EAAE,WAC3E,CACA,YAAsB,EAAO,CAC3B,MAAI,OAAO,YAAe,IACjB,GAEF,YAAiB,aAAc,YAAiB,GAAU,CAAK,EAAE,UAC1E,CACA,YAA2B,EAAS,CAClC,GAAM,CACJ,WACA,YACA,YACA,WACE,EAAiB,CAAO,EAC5B,MAAO,kCAAkC,KAAK,EAAW,EAAY,CAAS,GAAK,CAAC,CAAC,SAAU,UAAU,EAAE,SAAS,CAAO,CAC7H,CACA,YAAwB,EAAS,CAC/B,MAAO,CAAC,QAAS,KAAM,IAAI,EAAE,SAAS,GAAY,CAAO,CAAC,CAC5D,CACA,YAA2B,EAAS,CAClC,GAAM,GAAS,GAAS,EAClB,EAAM,EAAiB,CAAO,EACpC,MAAO,GAAI,YAAc,QAAU,EAAI,cAAgB,QAAW,GAAI,cAAgB,EAAI,gBAAkB,SAAW,KAAU,CAAC,GAAW,GAAI,eAAiB,EAAI,iBAAmB,OAAS,KAAU,CAAC,GAAW,GAAI,OAAS,EAAI,SAAW,OAAS,KAAU,CAAC,YAAa,cAAe,QAAQ,EAAE,KAAK,AAAC,GAAW,GAAI,YAAc,IAAI,SAAS,CAAK,CAAC,GAAK,CAAC,QAAS,SAAU,SAAU,SAAS,EAAE,KAAK,AAAC,GAAW,GAAI,SAAW,IAAI,SAAS,CAAK,CAAC,CACvc,CACA,YAA4B,EAAS,CACnC,GAAI,GAAc,GAAc,CAAO,EACvC,KAAO,GAAc,CAAW,GAAK,CAAC,GAAsB,CAAW,GAAG,CACxE,GAAI,GAAkB,CAAW,EAC/B,MAAO,GAEP,EAAc,GAAc,CAAW,CAE3C,CACA,MAAO,KACT,CACA,aAAoB,CAClB,MAAI,OAAO,KAAQ,KAAe,CAAC,IAAI,SAC9B,GACF,IAAI,SAAS,0BAA2B,MAAM,CACvD,CACA,YAA+B,EAAM,CACnC,MAAO,CAAC,OAAQ,OAAQ,WAAW,EAAE,SAAS,GAAY,CAAI,CAAC,CACjE,CACA,WAA0B,EAAS,CACjC,MAAO,GAAU,CAAO,EAAE,iBAAiB,CAAO,CACpD,CACA,YAAuB,EAAS,CAC9B,MAAI,IAAU,CAAO,EACZ,CACL,WAAY,EAAQ,WACpB,UAAW,EAAQ,SACrB,EAEK,CACL,WAAY,EAAQ,YACpB,UAAW,EAAQ,WACrB,CACF,CACA,YAAuB,EAAM,CAC3B,GAAI,GAAY,CAAI,IAAM,OACxB,MAAO,GAET,GAAM,GAEJ,EAAK,cACL,EAAK,YACL,GAAa,CAAI,GAAK,EAAK,MAC3B,GAAmB,CAAI,EAEzB,MAAO,IAAa,CAAM,EAAI,EAAO,KAAO,CAC9C,CACA,YAAoC,EAAM,CACxC,GAAM,GAAa,GAAc,CAAI,EACrC,MAAI,IAAsB,CAAU,EAC3B,EAAK,cAAgB,EAAK,cAAc,KAAO,EAAK,KAEzD,GAAc,CAAU,GAAK,GAAkB,CAAU,EACpD,EAEF,GAA2B,CAAU,CAC9C,CACA,YAA8B,EAAM,EAAM,EAAiB,CACzD,GAAI,GACJ,AAAI,IAAS,QACX,GAAO,CAAC,GAEN,IAAoB,QACtB,GAAkB,IAEpB,GAAM,GAAqB,GAA2B,CAAI,EACpD,EAAS,IAAyB,IAAuB,EAAK,gBAAkB,KAAO,OAAS,EAAqB,MACrH,EAAM,EAAU,CAAkB,EACxC,MAAI,GACK,EAAK,OAAO,EAAK,EAAI,gBAAkB,CAAC,EAAG,GAAkB,CAAkB,EAAI,EAAqB,CAAC,EAAG,EAAI,cAAgB,EAAkB,GAAqB,EAAI,YAAY,EAAI,CAAC,CAAC,EAE/L,EAAK,OAAO,EAAoB,GAAqB,EAAoB,CAAC,EAAG,CAAe,CAAC,CACtG,CAGA,YAA0B,EAAS,CACjC,GAAM,GAAM,EAAiB,CAAO,EAChC,EAAQ,WAAW,EAAI,KAAK,GAAK,EACjC,EAAS,WAAW,EAAI,MAAM,GAAK,EACjC,EAAY,GAAc,CAAO,EACjC,EAAc,EAAY,EAAQ,YAAc,EAChD,EAAe,EAAY,EAAQ,aAAe,EAClD,EAAiB,GAAM,CAAK,IAAM,GAAe,GAAM,CAAM,IAAM,EACzE,MAAI,IACF,GAAQ,EACR,EAAS,GAEJ,CACL,QACA,SACA,EAAG,CACL,CACF,CACA,YAAuB,EAAS,CAC9B,MAAO,AAAC,IAAU,CAAO,EAA6B,EAAzB,EAAQ,cACvC,CACA,YAAkB,EAAS,CACzB,GAAM,GAAa,GAAc,CAAO,EACxC,GAAI,CAAC,GAAc,CAAU,EAC3B,MAAO,IAAa,CAAC,EAEvB,GAAM,GAAO,EAAW,sBAAsB,EACxC,CACJ,QACA,SACA,KACE,GAAiB,CAAU,EAC3B,EAAK,GAAI,GAAM,EAAK,KAAK,EAAI,EAAK,OAAS,EAC3C,EAAK,GAAI,GAAM,EAAK,MAAM,EAAI,EAAK,QAAU,EACjD,MAAI,EAAC,GAAK,CAAC,OAAO,SAAS,CAAC,IAC1B,GAAI,GAEF,EAAC,GAAK,CAAC,OAAO,SAAS,CAAC,IAC1B,GAAI,GAEC,CACL,IACA,GACF,CACF,CACA,GAAI,IAA4B,GAAa,CAAC,EAC9C,YAA0B,EAAS,CACjC,GAAM,GAAM,EAAU,CAAO,EAC7B,MAAI,CAAC,GAAS,GAAK,CAAC,EAAI,eACf,GAEF,CACL,EAAG,EAAI,eAAe,WACtB,EAAG,EAAI,eAAe,SACxB,CACF,CACA,YAAgC,EAAS,EAAS,EAAsB,CAItE,MAHI,KAAY,QACd,GAAU,IAER,CAAC,GAAwB,GAAW,IAAyB,EAAU,CAAO,EACzE,GAEF,CACT,CACA,YAA+B,EAAS,EAAc,EAAiB,EAAc,CACnF,AAAI,IAAiB,QACnB,GAAe,IAEb,IAAoB,QACtB,GAAkB,IAEpB,GAAM,GAAa,EAAQ,sBAAsB,EAC3C,EAAa,GAAc,CAAO,EACpC,EAAQ,GAAa,CAAC,EAC1B,AAAI,GACF,CAAI,EACE,GAAU,CAAY,GACxB,GAAQ,GAAS,CAAY,GAG/B,EAAQ,GAAS,CAAO,GAG5B,GAAM,GAAgB,GAAuB,EAAY,EAAiB,CAAY,EAAI,GAAiB,CAAU,EAAI,GAAa,CAAC,EACnI,EAAK,GAAW,KAAO,EAAc,GAAK,EAAM,EAChD,EAAK,GAAW,IAAM,EAAc,GAAK,EAAM,EAC/C,EAAQ,EAAW,MAAQ,EAAM,EACjC,EAAS,EAAW,OAAS,EAAM,EACvC,GAAI,EAAY,CACd,GAAM,GAAM,EAAU,CAAU,EAC1B,EAAY,GAAgB,GAAU,CAAY,EAAI,EAAU,CAAY,EAAI,EAClF,EAAgB,EAAI,aACxB,KAAO,GAAiB,GAAgB,IAAc,GAAK,CACzD,GAAM,GAAc,GAAS,CAAa,EACpC,EAAa,EAAc,sBAAsB,EACjD,EAAM,EAAiB,CAAa,EACpC,EAAO,EAAW,KAAQ,GAAc,WAAa,WAAW,EAAI,WAAW,GAAK,EAAY,EAChG,EAAM,EAAW,IAAO,GAAc,UAAY,WAAW,EAAI,UAAU,GAAK,EAAY,EAClG,GAAK,EAAY,EACjB,GAAK,EAAY,EACjB,GAAS,EAAY,EACrB,GAAU,EAAY,EACtB,GAAK,EACL,GAAK,EACL,EAAgB,EAAU,CAAa,EAAE,YAC3C,CACF,CACA,MAAO,IAAiB,CACtB,QACA,SACA,IACA,GACF,CAAC,CACH,CACA,YAA+D,EAAM,CACnE,GAAI,CACF,OACA,eACA,YACE,EACE,EAA0B,GAAc,CAAY,EACpD,EAAkB,GAAmB,CAAY,EACvD,GAAI,IAAiB,EACnB,MAAO,GAET,GAAI,GAAS,CACX,WAAY,EACZ,UAAW,CACb,EACI,EAAQ,GAAa,CAAC,EACpB,EAAU,GAAa,CAAC,EAC9B,GAAI,IAA2B,CAAC,GAA2B,IAAa,UAClE,KAAY,CAAY,IAAM,QAAU,GAAkB,CAAe,IAC3E,GAAS,GAAc,CAAY,GAEjC,GAAc,CAAY,GAAG,CAC/B,GAAM,GAAa,GAAsB,CAAY,EACrD,EAAQ,GAAS,CAAY,EAC7B,EAAQ,EAAI,EAAW,EAAI,EAAa,WACxC,EAAQ,EAAI,EAAW,EAAI,EAAa,SAC1C,CAEF,MAAO,CACL,MAAO,EAAK,MAAQ,EAAM,EAC1B,OAAQ,EAAK,OAAS,EAAM,EAC5B,EAAG,EAAK,EAAI,EAAM,EAAI,EAAO,WAAa,EAAM,EAAI,EAAQ,EAC5D,EAAG,EAAK,EAAI,EAAM,EAAI,EAAO,UAAY,EAAM,EAAI,EAAQ,CAC7D,CACF,CACA,YAAwB,EAAS,CAC/B,MAAO,OAAM,KAAK,EAAQ,eAAe,CAAC,CAC5C,CACA,YAA6B,EAAS,CACpC,MAAO,IAAsB,GAAmB,CAAO,CAAC,EAAE,KAAO,GAAc,CAAO,EAAE,UAC1F,CACA,YAAyB,EAAS,CAChC,GAAM,GAAO,GAAmB,CAAO,EACjC,EAAS,GAAc,CAAO,EAC9B,EAAO,EAAQ,cAAc,KAC7B,EAAQ,GAAI,EAAK,YAAa,EAAK,YAAa,EAAK,YAAa,EAAK,WAAW,EAClF,EAAS,GAAI,EAAK,aAAc,EAAK,aAAc,EAAK,aAAc,EAAK,YAAY,EACzF,EAAI,CAAC,EAAO,WAAa,GAAoB,CAAO,EAClD,EAAI,CAAC,EAAO,UAClB,MAAI,GAAiB,CAAI,EAAE,YAAc,OACvC,IAAK,GAAI,EAAK,YAAa,EAAK,WAAW,EAAI,GAE1C,CACL,QACA,SACA,IACA,GACF,CACF,CACA,YAAyB,EAAS,EAAU,CAC1C,GAAM,GAAM,EAAU,CAAO,EACvB,EAAO,GAAmB,CAAO,EACjC,EAAiB,EAAI,eACvB,EAAQ,EAAK,YACb,EAAS,EAAK,aACd,EAAI,EACJ,EAAI,EACR,GAAI,EAAgB,CAClB,EAAQ,EAAe,MACvB,EAAS,EAAe,OACxB,GAAM,GAAsB,GAAS,EACrC,AAAI,EAAC,GAAuB,GAAuB,IAAa,UAC9D,GAAI,EAAe,WACnB,EAAI,EAAe,UAEvB,CACA,MAAO,CACL,QACA,SACA,IACA,GACF,CACF,CACA,YAAoC,EAAS,EAAU,CACrD,GAAM,GAAa,GAAsB,EAAS,GAAM,IAAa,OAAO,EACtE,EAAM,EAAW,IAAM,EAAQ,UAC/B,EAAO,EAAW,KAAO,EAAQ,WACjC,EAAQ,GAAc,CAAO,EAAI,GAAS,CAAO,EAAI,GAAa,CAAC,EACnE,EAAQ,EAAQ,YAAc,EAAM,EACpC,EAAS,EAAQ,aAAe,EAAM,EACtC,EAAI,EAAO,EAAM,EACjB,EAAI,EAAM,EAAM,EACtB,MAAO,CACL,QACA,SACA,IACA,GACF,CACF,CACA,YAA2C,EAAS,EAAkB,EAAU,CAC9E,GAAI,GACJ,GAAI,IAAqB,WACvB,EAAO,GAAgB,EAAS,CAAQ,UAC/B,IAAqB,WAC9B,EAAO,GAAgB,GAAmB,CAAO,CAAC,UACzC,GAAU,CAAgB,EACnC,EAAO,GAA2B,EAAkB,CAAQ,MACvD,CACL,GAAM,GAAgB,GAAiB,CAAO,EAC9C,EAAO,CACL,GAAG,EACH,EAAG,EAAiB,EAAI,EAAc,EACtC,EAAG,EAAiB,EAAI,EAAc,CACxC,CACF,CACA,MAAO,IAAiB,CAAI,CAC9B,CACA,YAAkC,EAAS,EAAU,CACnD,GAAM,GAAa,GAAc,CAAO,EACxC,MAAI,KAAe,GAAY,CAAC,GAAU,CAAU,GAAK,GAAsB,CAAU,EAChF,GAEF,EAAiB,CAAU,EAAE,WAAa,SAAW,GAAyB,EAAY,CAAQ,CAC3G,CACA,YAAqC,EAAS,EAAO,CACnD,GAAM,GAAe,EAAM,IAAI,CAAO,EACtC,GAAI,EACF,MAAO,GAET,GAAI,GAAS,GAAqB,EAAS,CAAC,EAAG,EAAK,EAAE,OAAO,AAAC,GAAO,GAAU,CAAE,GAAK,GAAY,CAAE,IAAM,MAAM,EAC5G,EAAsC,KACpC,EAAiB,EAAiB,CAAO,EAAE,WAAa,QAC1D,EAAc,EAAiB,GAAc,CAAO,EAAI,EAC5D,KAAO,GAAU,CAAW,GAAK,CAAC,GAAsB,CAAW,GAAG,CACpE,GAAM,GAAgB,EAAiB,CAAW,EAC5C,EAA0B,GAAkB,CAAW,EAC7D,AAAI,CAAC,GAA2B,EAAc,WAAa,SACzD,GAAsC,MAGxC,AAD8B,GAAiB,CAAC,GAA2B,CAAC,EAAsC,CAAC,GAA2B,EAAc,WAAa,UAAY,CAAC,CAAC,GAAuC,CAAC,WAAY,OAAO,EAAE,SAAS,EAAoC,QAAQ,GAAK,GAAkB,CAAW,GAAK,CAAC,GAA2B,GAAyB,EAAS,CAAW,GAEvZ,EAAS,EAAO,OAAO,AAAC,GAAa,IAAa,CAAW,EAE7D,EAAsC,EAExC,EAAc,GAAc,CAAW,CACzC,CACA,SAAM,IAAI,EAAS,CAAM,EAClB,CACT,CACA,YAAyB,EAAM,CAC7B,GAAI,CACF,UACA,WACA,eACA,YACE,EAEE,EAAoB,CAAC,GADM,IAAa,oBAAsB,GAA4B,EAAS,KAAK,EAAE,EAAI,CAAC,EAAE,OAAO,CAAQ,EAC9E,CAAY,EAC9D,EAAwB,EAAkB,GAC1C,EAAe,EAAkB,OAAO,CAAC,EAAS,IAAqB,CAC3E,GAAM,GAAO,GAAkC,EAAS,EAAkB,CAAQ,EAClF,SAAQ,IAAM,GAAI,EAAK,IAAK,EAAQ,GAAG,EACvC,EAAQ,MAAQ,GAAI,EAAK,MAAO,EAAQ,KAAK,EAC7C,EAAQ,OAAS,GAAI,EAAK,OAAQ,EAAQ,MAAM,EAChD,EAAQ,KAAO,GAAI,EAAK,KAAM,EAAQ,IAAI,EACnC,CACT,EAAG,GAAkC,EAAS,EAAuB,CAAQ,CAAC,EAC9E,MAAO,CACL,MAAO,EAAa,MAAQ,EAAa,KACzC,OAAQ,EAAa,OAAS,EAAa,IAC3C,EAAG,EAAa,KAChB,EAAG,EAAa,GAClB,CACF,CACA,YAAuB,EAAS,CAC9B,MAAO,IAAiB,CAAO,CACjC,CACA,YAAuC,EAAS,EAAc,EAAU,CACtE,GAAM,GAA0B,GAAc,CAAY,EACpD,EAAkB,GAAmB,CAAY,EACjD,EAAU,IAAa,QACvB,EAAO,GAAsB,EAAS,GAAM,EAAS,CAAY,EACnE,EAAS,CACX,WAAY,EACZ,UAAW,CACb,EACM,EAAU,GAAa,CAAC,EAC9B,GAAI,GAA2B,CAAC,GAA2B,CAAC,EAI1D,GAHI,IAAY,CAAY,IAAM,QAAU,GAAkB,CAAe,IAC3E,GAAS,GAAc,CAAY,GAEjC,EAAyB,CAC3B,GAAM,GAAa,GAAsB,EAAc,GAAM,EAAS,CAAY,EAClF,EAAQ,EAAI,EAAW,EAAI,EAAa,WACxC,EAAQ,EAAI,EAAW,EAAI,EAAa,SAC1C,KAAO,AAAI,IACT,GAAQ,EAAI,GAAoB,CAAe,GAGnD,MAAO,CACL,EAAG,EAAK,KAAO,EAAO,WAAa,EAAQ,EAC3C,EAAG,EAAK,IAAM,EAAO,UAAY,EAAQ,EACzC,MAAO,EAAK,MACZ,OAAQ,EAAK,MACf,CACF,CACA,YAA6B,EAAS,EAAU,CAC9C,MAAI,CAAC,GAAc,CAAO,GAAK,EAAiB,CAAO,EAAE,WAAa,QAC7D,KAEL,EACK,EAAS,CAAO,EAElB,EAAQ,YACjB,CACA,YAAyB,EAAS,EAAU,CAC1C,GAAM,GAAU,EAAU,CAAO,EACjC,GAAI,CAAC,GAAc,CAAO,EACxB,MAAO,GAET,GAAI,GAAe,GAAoB,EAAS,CAAQ,EACxD,KAAO,GAAgB,GAAe,CAAY,GAAK,EAAiB,CAAY,EAAE,WAAa,UACjG,EAAe,GAAoB,EAAc,CAAQ,EAE3D,MAAI,IAAiB,IAAY,CAAY,IAAM,QAAU,GAAY,CAAY,IAAM,QAAU,EAAiB,CAAY,EAAE,WAAa,UAAY,CAAC,GAAkB,CAAY,GACnL,EAEF,GAAgB,GAAmB,CAAO,GAAK,CACxD,CACA,GAAI,IAAkB,eAAe,EAAM,CACzC,GAAI,CACF,YACA,WACA,YACE,EACE,EAAoB,KAAK,iBAAmB,GAC5C,EAAkB,KAAK,cAC7B,MAAO,CACL,UAAW,GAA8B,EAAW,KAAM,GAAkB,CAAQ,EAAG,CAAQ,EAC/F,SAAU,CACR,EAAG,EACH,EAAG,EACH,GAAG,KAAM,GAAgB,CAAQ,CACnC,CACF,CACF,EACA,YAAe,EAAS,CACtB,MAAO,GAAiB,CAAO,EAAE,YAAc,KACjD,CACA,GAAI,IAAW,CACb,yDACA,sBACA,mBACA,mBACA,mBACA,kBACA,iBACA,YACA,aACA,QACF,EACA,YAAqB,EAAS,EAAQ,CACpC,GAAI,GAAK,KACL,EACE,EAAO,GAAmB,CAAO,EACvC,YAAmB,CACjB,aAAa,CAAS,EACtB,GAAM,EAAG,WAAW,EACpB,EAAK,IACP,CACA,WAAiB,EAAM,EAAW,CAChC,AAAI,IAAS,QACX,GAAO,IAEL,IAAc,QAChB,GAAY,GAEd,EAAQ,EACR,GAAM,CACJ,OACA,MACA,QACA,UACE,EAAQ,sBAAsB,EAIlC,GAHK,GACH,EAAO,EAEL,CAAC,GAAS,CAAC,EACb,OAEF,GAAM,GAAW,GAAM,CAAG,EACpB,EAAa,GAAM,EAAK,YAAe,GAAO,EAAM,EACpD,EAAc,GAAM,EAAK,aAAgB,GAAM,EAAO,EACtD,EAAY,GAAM,CAAI,EAEtB,EAAU,CACd,WAFiB,CAAC,EAAW,MAAQ,CAAC,EAAa,MAAQ,CAAC,EAAc,MAAQ,CAAC,EAAY,KAG/F,UAAW,GAAI,EAAG,GAAI,EAAG,CAAS,CAAC,GAAK,CAC1C,EACI,EAAgB,GACpB,WAAuB,EAAS,CAC9B,GAAM,GAAQ,EAAQ,GAAG,kBACzB,GAAI,IAAU,EAAW,CACvB,GAAI,CAAC,EACH,MAAO,GAAQ,EAEjB,AAAK,EAKH,EAAQ,GAAO,CAAK,EAJpB,EAAY,WAAW,IAAM,CAC3B,EAAQ,GAAO,IAAI,CACrB,EAAG,GAAG,CAIV,CACA,EAAgB,EAClB,CACA,GAAI,CACF,EAAK,GAAI,sBAAqB,EAAe,CAC3C,GAAG,EAEH,KAAM,EAAK,aACb,CAAC,CACH,MAAE,CACA,EAAK,GAAI,sBAAqB,EAAe,CAAO,CACtD,CACA,EAAG,QAAQ,CAAO,CACpB,CACA,SAAQ,EAAI,EACL,CACT,CACA,YAAoB,EAAW,EAAU,EAAQ,EAAS,CACxD,AAAI,IAAY,QACd,GAAU,CAAC,GAEb,GAAM,CACJ,iBAAiB,GACjB,iBAAiB,GACjB,gBAAgB,MAAO,iBAAmB,WAC1C,cAAc,MAAO,uBAAyB,WAC9C,iBAAiB,IACf,EACE,EAAc,GAAc,CAAS,EACrC,EAAY,GAAkB,EAAiB,CAAC,GAAG,EAAc,GAAqB,CAAW,EAAI,CAAC,EAAG,GAAG,GAAqB,CAAQ,CAAC,EAAI,CAAC,EACrJ,EAAU,QAAQ,AAAC,GAAa,CAC9B,GAAkB,EAAS,iBAAiB,SAAU,EAAQ,CAC5D,QAAS,EACX,CAAC,EACD,GAAkB,EAAS,iBAAiB,SAAU,CAAM,CAC9D,CAAC,EACD,GAAM,GAAY,GAAe,EAAc,GAAY,EAAa,CAAM,EAAI,KAC9E,EAAiB,GACjB,EAAiB,KACrB,AAAI,GACF,GAAiB,GAAI,gBAAe,AAAC,GAAS,CAC5C,GAAI,CAAC,GAAc,EACnB,AAAI,GAAc,EAAW,SAAW,GAAe,GACrD,GAAe,UAAU,CAAQ,EACjC,qBAAqB,CAAc,EACnC,EAAiB,sBAAsB,IAAM,CAC3C,GAAkB,EAAe,QAAQ,CAAQ,CACnD,CAAC,GAEH,EAAO,CACT,CAAC,EACG,GAAe,CAAC,GAClB,EAAe,QAAQ,CAAW,EAEpC,EAAe,QAAQ,CAAQ,GAEjC,GAAI,GACA,EAAc,EAAiB,GAAsB,CAAS,EAAI,KACtE,AAAI,GACF,EAAU,EAEZ,YAAqB,CACnB,GAAM,GAAc,GAAsB,CAAS,EACnD,AAAI,GAAgB,GAAY,IAAM,EAAY,GAAK,EAAY,IAAM,EAAY,GAAK,EAAY,QAAU,EAAY,OAAS,EAAY,SAAW,EAAY,SACtK,EAAO,EAET,EAAc,EACd,EAAU,sBAAsB,CAAS,CAC3C,CACA,SAAO,EACA,IAAM,CACX,EAAU,QAAQ,AAAC,GAAa,CAC9B,GAAkB,EAAS,oBAAoB,SAAU,CAAM,EAC/D,GAAkB,EAAS,oBAAoB,SAAU,CAAM,CACjE,CAAC,EACD,GAAa,EAAU,EACvB,GAAkB,EAAe,WAAW,EAC5C,EAAiB,KACb,GACF,qBAAqB,CAAO,CAEhC,CACF,CACA,GAAI,IAAmB,CAAC,EAAW,EAAU,IAAY,CACvD,GAAM,GAAwB,GAAI,KAC5B,EAAgB,CACpB,YACA,GAAG,CACL,EACM,EAAoB,CACxB,GAAG,EAAc,SACjB,GAAI,CACN,EACA,MAAO,IAAgB,EAAW,EAAU,CAC1C,GAAG,EACH,SAAU,CACZ,CAAC,CACH,EAGA,YAAqB,EAAQ,CAC3B,EAAO,MAAM,SAAU,AAAC,GAAO,CAC7B,GAAI,CAAC,EAAG,UACN,KAAM,kEACR,MAAO,GAAG,SACZ,CAAC,EACD,EAAO,eAAe,CAAC,EAAM,IAAO,CAClC,AAAI,GAAQ,EAAK,WAAa,CAAC,EAAG,WAChC,GAAG,UAAY,EAAK,UAExB,CAAC,EACD,EAAO,UAAU,SAAU,EAAO,gBAChC,CAAC,EAAI,CAAE,aAAY,YAAW,SAAS,CAAE,UAAS,SAAU,KAAgB,CAC1E,GAAI,CAAE,YAAW,cAAa,YAAa,GAAW,CAAS,EAC/D,EAAG,UAAY,EAAO,SAAS,CAAE,EAAG,EAAG,EAAG,CAAE,CAAC,EAC7C,GAAI,GAAY,EAAU,CAAU,EACpC,GAAI,CAAC,EACH,KAAM,6CACR,GAAI,GAAU,IAAM,CAClB,GAAI,GACJ,GAAiB,EAAW,EAAI,CAC9B,YACA,WAAY,CAAC,GAAK,EAAG,GAAM,CAAE,QAAS,CAAE,CAAC,EAAG,GAAO,CAAW,CAAC,CACjE,CAAC,EAAE,KAAK,CAAC,CAAE,IAAG,OAAQ,CACpB,GAAY,GAAU,EAAI,EAAG,CAAC,EAC1B,KAAK,UAAU,CAAE,IAAG,GAAE,CAAC,IAAM,GAC/B,GAAG,UAAU,EAAI,EACjB,EAAG,UAAU,EAAI,GAEnB,EAAgB,KAAK,UAAU,CAAE,IAAG,GAAE,CAAC,CACzC,CAAC,CACH,EACI,EAAU,GAAW,EAAW,EAAI,IAAM,EAAQ,CAAC,EACvD,EAAQ,IAAM,EAAQ,CAAC,CACzB,EAEA,CAAC,EAAI,CAAE,aAAY,YAAW,SAAS,CAAE,UAAS,SAAU,KAAgB,CAC1E,GAAI,CAAE,YAAW,cAAa,YAAa,GAAW,CAAS,EAC/D,AAAI,EAAG,WACL,IAAY,GAAU,EAAI,EAAG,UAAU,EAAG,EAAG,UAAU,CAAC,EAE5D,CACF,CAAC,CACH,CACA,YAAmB,EAAI,EAAG,EAAG,CAC3B,OAAO,OAAO,EAAG,MAAO,CACtB,KAAM,EAAI,KACV,IAAK,EAAI,KACT,SAAU,UACZ,CAAC,CACH,CACA,YAAoB,EAAW,CAE7B,GAAI,GAAY,AADA,CAAC,MAAO,YAAa,UAAW,QAAS,cAAe,YAAa,SAAU,eAAgB,aAAc,OAAQ,aAAc,UAAU,EACnI,KAAK,AAAC,GAAM,EAAU,SAAS,CAAC,CAAC,EACvD,EAAc,EAClB,GAAI,EAAU,SAAS,QAAQ,EAAG,CAChC,GAAI,GAAM,EAAU,UAAU,AAAC,GAAM,IAAM,QAAQ,EACnD,EAAc,EAAU,EAAM,KAAO,OAAS,OAAO,EAAU,EAAM,EAAE,EAAI,CAC7E,CACA,GAAI,GAAW,EAAU,SAAS,UAAU,EAC5C,MAAO,CAAE,YAAW,cAAa,UAAS,CAC5C,CAGA,GAAI,IAAiB,GCpuCrB,GAAM,IAAN,KAAe,CACX,YAAY,EAAK,EAAM,CACnB,KAAK,IAAM,EACX,KAAK,KAAO,CAChB,CACJ,EAEI,GAAgB,CAChB,WAAY,KACZ,WAAY,KACZ,KAAM,CAAC,EACP,OAAQ,CAAC,EAET,MAAO,GAEP,IAAI,EAAU,CACV,MAAO,MAAK,OAAO,KAAc,MACrC,EAEA,SAAS,EAAU,CACf,GAAI,GAAW,KAAK,OAAO,GAE3B,GAAI,IAAa,OACb,KACI,oDACA,EAGR,MAAO,EACX,EAEA,QAAQ,EAAK,EAAU,CACnB,AAAI,KAAK,IAAI,CAAG,EACZ,KAAK,OAAO,GAAO,EAEnB,KAAK,KAAK,EAAK,CAAQ,CAE/B,EAEA,KAAK,EAAK,EAAU,CAChB,KAAK,OAAO,GAAO,EAEnB,GAAI,GAAQ,KAAK,KAAK,QAAQ,CAAG,EAEjC,AAAI,EAAQ,IAAI,KAAK,KAAK,OAAO,EAAO,CAAC,EAEzC,KAAK,KAAK,QAAQ,CAAG,EAErB,KAAK,KAAK,CACd,EAEA,MAAO,CACH,OAAS,KAAO,MAAK,KAAK,OAAO,KAAK,KAAK,EACzC,MAAO,MAAK,OAAO,EAEzB,CACJ,EAEO,aAAuE,CAG1E,GAAI,GAAM,GAAI,KAAI,OAAO,SAAS,KAAM,SAAS,OAAO,EAExD,GAAW,EAAK,SAAS,gBAAgB,SAAS,CACtD,CAEO,YAAsE,EAAK,EAAK,CACnF,GAAI,GAAO,SAAS,gBAAgB,UAEpC,GAAc,QAAQ,EAAK,GAAI,IAAS,EAAK,CAAI,CAAC,CACtD,CAEO,YACH,EACA,EACF,CACE,GAAI,GAEJ,EAAiB,GAAM,EAAW,CAAE,EAEpC,OAAO,iBAAiB,WAAY,GAAK,CACrC,GAAI,GAAQ,EAAE,OAAS,CAAC,EAEpB,EAAS,EAAM,QAAU,CAAC,EAI9B,GAAI,OAAO,KAAK,CAAK,EAAE,SAAW,GAE9B,EAAE,EAAO,YAEb,GAAI,GAAc,IAAI,EAAO,WAAW,EAAG,CACvC,GAAI,GAAW,GAAc,SAAS,EAAO,WAAW,EAExD,EAAW,EAAS,KAAM,EAAS,IAAK,GAAc,WAAY,GAAc,UAAU,CAC9F,KACI,GAAS,EAAO,GAAG,CAE3B,CAAC,CACL,CAEO,YACH,EACA,EACF,CACE,GAAQ,EAAa,CAAI,CAC7B,CAEO,YAAiB,EAAK,EAAM,CAC/B,GAAU,YAAa,EAAK,CAAI,CACpC,CAEO,YAAoB,EAAK,EAAM,CAClC,GAAU,eAAgB,EAAK,CAAI,CACvC,CAEA,YAAmB,EAAQ,EAAK,EAAM,CAClC,GAAI,GAAM,EAAI,SAAS,EAAI,IAAM,KAAK,OAAO,EAE7C,IAAW,YACL,GAAc,KAAK,EAAK,GAAI,IAAS,EAAK,CAAI,CAAC,EAC/C,GAAc,QAAQ,EAAO,GAAc,YAAc,EAAM,GAAI,IAAS,EAAK,CAAI,CAAC,EAE5F,GAAI,GAAQ,QAAQ,OAAS,CAAC,EAE9B,AAAK,EAAM,QAAQ,GAAM,OAAS,CAAC,GAEnC,EAAM,OAAO,YAAc,EAC3B,EAAM,OAAO,IAAM,EAAI,SAAS,EAEhC,GAAI,CAEA,QAAQ,GAAQ,EAAO,KAAK,UAAU,SAAS,KAAK,EAAG,CAAG,EAE1D,GAAc,WAAa,EAC3B,GAAc,WAAa,CAC/B,OAAS,EAAP,CACE,AAAI,YAAiB,eAAgB,EAAM,OAAS,iBAChD,QAAQ,MACJ,iFACI,CACR,EAGJ,QAAQ,MAAM,CAAK,CACvB,CACJ,CClJO,YAA+B,EAAI,EAAU,CAChD,GAAI,GAAsB,GAAK,CAAE,EAAE,UAC/B,EAAsB,GAAM,EAAE,MAAQ,GAAO,EAAE,QAAY,EAAE,SAAa,EAAE,SAAa,EAAE,SAC3F,EAAqB,AAAC,GAAO,EAAE,QAAU,IAAQ,EAAE,QAAY,EAAE,SAAa,EAAE,SAAa,EAAE,SAEnG,EAAG,iBAAiB,QAAS,GAAK,CAE9B,GAAI,EAAoB,CAAC,EAAG,CACxB,EAAE,eAAe,EAEjB,EAAS,GAAgB,EAAa,CAAC,EAEvC,MACJ,CAGA,AAAI,EAAoB,CAAC,GAGzB,EAAE,eAAe,CACrB,CAAC,EAED,EAAG,iBAAiB,YAAa,GAAK,CAElC,AAAI,EAAoB,CAAC,GAEzB,GAAE,eAAe,EAEjB,EAAS,AAAC,GAAiB,CACvB,GAAI,GAAU,GAAK,CACf,EAAE,eAAe,EAEjB,EAAa,EAEb,EAAG,oBAAoB,UAAW,CAAO,CAC7C,EAEA,EAAG,iBAAiB,UAAW,CAAO,CAC1C,CAAC,EACL,CAAC,EAED,EAAG,iBAAiB,UAAW,GAAK,CAEhC,AAAI,EAAmB,CAAC,GAExB,GAAE,eAAe,EAEjB,EAAS,GAAgB,EAAa,CAAC,EAC3C,CAAC,CACL,CAEO,YAAkC,EAAI,EAAK,GAAI,EAAU,CAC5D,EAAG,iBAAiB,aAAc,GAAK,CACnC,GAAI,GAAU,WAAW,IAAM,CAC3B,EAAS,CAAC,CACd,EAAG,CAAE,EAED,EAAU,IAAM,CAChB,aAAa,CAAO,EACpB,EAAG,oBAAoB,aAAc,CAAO,CAChD,EAEA,EAAG,iBAAiB,aAAc,CAAO,CAC7C,CAAC,CACL,CAEO,YAAoC,EAAQ,CAC/C,MAAO,IAA0B,EAAO,aAAa,MAAM,CAAC,CAChE,CAEO,YAAmC,EAAW,CACjD,MAAO,IAAI,KAAI,EAAW,SAAS,OAAO,CAC9C,CAEO,YAAmC,EAAW,CACjD,MAAO,GAAU,SAAW,EAAU,OAAS,EAAU,IAC7D,CC1EO,YAAmB,EAAa,EAAU,CAC7C,GAAI,GAAM,GAA0B,CAAW,EAE/C,GAAa,EAAK,CAAC,EAAM,IAAqB,CAC1C,EAAS,EAAM,CAAgB,CACnC,CAAC,CACL,CAEO,YAAsB,EAAK,EAAU,CACxC,GAAI,GAAU,CACV,QAAS,CACL,sBAAuB,EAC3B,CACJ,EAEA,EAAQ,mBAAoB,CACxB,IAAK,EACL,SACJ,CAAC,EAED,GAAI,GAEJ,MAAM,EAAK,CAAO,EAAE,KAAK,GAAY,CACjC,GAAI,GAAc,GAA0B,CAAG,EAC/C,SAAmB,GAA0B,EAAS,GAAG,EAGpD,EAAY,SAAW,EAAY,SAAa,EAAiB,SAAW,EAAiB,QAI9F,GAAiB,KAAO,EAAY,MAGjC,EAAS,KAAK,CACzB,CAAC,EAAE,KAAK,GAAQ,CACZ,EAAS,EAAM,CAAgB,CACnC,CAAC,CACL,CCrCA,GAAI,GAAa,CAAC,EAEX,YAAsB,EAAa,EAAU,CAChD,GAAI,GAAM,GAA0B,CAAW,EAE/C,AAAI,EAAW,IAEf,GAAW,GAAO,CAAE,SAAU,GAAO,KAAM,KAAM,aAAc,IAAM,CAAC,CAAE,EAExE,GAAa,EAAK,CAAC,EAAM,IAAc,CACnC,EAAS,EAAM,CAAS,CAC5B,CAAC,EACL,CAEO,YAAqD,EAAM,EAAa,EAAkB,CAC7F,GAAI,GAAQ,EAAW,GAA0B,CAAW,GAC5D,EAAM,KAAO,EACb,EAAM,SAAW,GACjB,EAAM,iBAAmB,EACzB,EAAM,aAAa,CACvB,CAEO,YAA2B,EAAa,EAAS,EAAoB,CACxE,GAAI,GAAM,GAA0B,CAAW,EAE/C,GAAI,CAAE,EAAW,GAAM,MAAO,GAAmB,EAEjD,GAAI,EAAW,GAAK,SAAU,CAC1B,GAAI,GAAO,EAAW,GAAK,KACvB,EAAmB,EAAW,GAAK,iBAEvC,aAAO,GAAW,GAEX,EAAQ,EAAM,CAAgB,CACzC,KACI,GAAW,GAAK,aAAe,IAAM,CACjC,GAAI,GAAO,EAAW,GAAK,KACvB,EAAmB,EAAW,GAAK,iBAEvC,MAAO,GAAW,GAElB,EAAQ,EAAM,CAAgB,CAClC,CAER,CC9CO,YAAkC,EAAa,CAGlD,EAAO,UAAU,IAAM,CACnB,EAAY,iBAAiB,0BAA0B,EAAE,QAAQ,GAAK,EAAE,YAAY,OAAO,CAAC,CAChG,CAAC,CACL,CAEO,YAA+C,EAAM,CAGxD,EAAO,UAAU,IAAM,CACnB,EAAK,iBAAiB,wBAAwB,EAAE,QAAQ,GAAK,EAAE,OAAO,CAAC,CAC3E,CAAC,CACL,CAEO,YAAkC,EAAa,CAGlD,EAAO,KAAK,EAAa,CAAC,EAAI,IAAS,CACnC,AAAI,CAAE,EAAG,aAET,GAAG,mBAAmB,EAEtB,EAAK,EACT,CAAC,CACL,CAEO,YAA0B,EAAI,CACjC,MAAO,GAAG,aAAa,sBAAsB,CACjD,CC/BO,aAA4D,CAC/D,SAAS,KAAK,aAAa,gBAAiB,SAAS,KAAK,UAAU,EACpE,SAAS,KAAK,aAAa,gBAAiB,SAAS,KAAK,SAAS,EAEnE,SAAS,iBAAiB,CAAC,wBAAyB,iBAAiB,CAAC,EAAE,QAAQ,GAAM,CAClF,EAAG,aAAa,gBAAiB,EAAG,UAAU,EAC9C,EAAG,aAAa,gBAAiB,EAAG,SAAS,CACjD,CAAC,CACL,CAEO,aAA8C,CACjD,GAAI,GAAS,GAAM,CACf,AAAM,EAAG,aAAa,eAAe,EAGjC,GAAG,SAAS,CACR,IAAK,OAAO,EAAG,aAAa,eAAe,CAAC,EAC5C,KAAM,OAAO,EAAG,aAAa,eAAe,CAAC,EAC7C,SAAU,SACd,CAAC,EACD,EAAG,gBAAgB,eAAe,EAClC,EAAG,gBAAgB,eAAe,GARlC,OAAO,SAAS,CAAE,IAAK,EAAG,KAAM,EAAG,SAAU,SAAU,CAAC,CAUhE,EAEA,eAAe,IAAM,CACjB,EAAO,SAAS,IAAI,EAEpB,SAAS,iBAAiB,CAAC,wBAAyB,iBAAiB,CAAC,EAAE,QAAQ,CAAM,CAC1F,CAAC,CACL,CC7BA,GAAI,IAAM,CAAC,EAEJ,YAAyC,EAAU,CACtD,GAAM,CAAC,EAEP,SAAS,iBAAiB,aAAa,EAAE,QAAQ,GAAK,CAClD,GAAI,EAAE,aAAa,WAAW,GAAK,EAEnC,EAAS,CAAC,EAEV,EAAO,UAAU,IAAM,CACnB,EAAE,OAAO,CACb,CAAC,CACL,CAAC,CACL,CAEO,YAAmC,EAAU,CAChD,GAAI,GAAe,CAAC,EAEpB,SAAS,iBAAiB,aAAa,EAAE,QAAQ,GAAK,CAClD,GAAI,GAAM,GAAI,EAAE,aAAa,WAAW,GAGxC,AAAI,CAAE,GAEN,GAAa,KAAK,EAAE,aAAa,WAAW,CAAC,EAE7C,EAAI,gBAAkB,GAEtB,EAAS,EAAK,CAAC,EAEf,EAAO,UAAU,IAAM,CACnB,EAAE,YAAY,CAAG,CACrB,CAAC,EACL,CAAC,EAED,OAAO,QAAQ,EAAG,EAAE,QAAQ,CAAC,CAAC,EAAK,KAAQ,CACvC,AAAI,EAAa,SAAS,CAAG,GAG7B,EAAO,YAAY,CAAE,CACzB,CAAC,EAGD,GAAM,CAAC,CACX,CAEO,YAA4B,EAAI,CACnC,MAAO,GAAG,aAAa,WAAW,CACtC,CCnDA,OAAsB,SAGtB,WAAU,UAAU,CAChB,QAAS,GACT,aAAc,IACd,YAAa,GACb,OAAQ,MACZ,CAAC,EAED,GAAa,EAEb,GAAI,IAAa,GAEV,aAAmC,CACtC,GAAa,GAGb,WAAW,IAAM,CACb,AAAI,CAAE,IAEN,WAAU,MAAM,CACpB,EAAG,GAAG,CACV,CAEO,aAAoC,CACvC,GAAa,GAEb,WAAU,KAAK,CACnB,CAEO,aAA8C,CACjD,WAAU,OAAO,CACrB,CAEA,aAAwB,CACpB,GAAI,GAAQ,SAAS,cAAc,OAAO,EAE1C,EAAM,UAAY;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,MA4ElB,GAAI,GAAQ,GAAS,EAErB,AAAI,GAAO,GAAM,MAAQ,GAEzB,SAAS,KAAK,YAAY,CAAK,CACnC,CCvHA,GAAI,IAAyB,CAAC,EAE1B,GAAuC,CACvC,YACA,aACJ,EAEO,YAAoC,EAAM,EAAS,CACtD,GAAI,GAAe,GAAI,WAAU,EAAG,gBAAgB,EAAM,WAAW,EACjE,EAAU,SAAS,UAAU,EAAY,IAAI,EAC7C,EAAU,SAAS,UAAU,EAAY,IAAI,EAEjD,GAAyB,GAAuB,OAAO,MAAM,KAAK,SAAS,KAAK,iBAAiB,QAAQ,CAAC,EAAE,IAAI,GACrG,GAAW,GAAiB,EAAE,UAAW,EAAoC,CAAC,CACxF,CAAC,EAEF,GAAI,GAA+B,IAAM,CAAC,EAE1C,GAAa,CAAO,EAAE,QAAQ,IAAM,CAChC,EAA6B,CACjC,CAAC,EAED,GAA2B,EAAS,EAAsB,EAE1D,GAAI,GAAU,SAAS,KAEvB,SAAS,KAAK,YAAY,CAAO,EAEjC,OAAO,YAAY,CAAO,EAE1B,EAAQ,GAAK,EAA+B,CAAC,CACjD,CAEA,YAAoC,EAAS,EAAwB,CACjE,EAAQ,iBAAiB,QAAQ,EAAE,QAAQ,GAAK,CAE5C,GAAI,EAAE,aAAa,oBAAoB,EAAG,CAKtC,GAAI,GAAO,GACP,GAAiB,EAAE,UAAW,EAAoC,CACtE,EAEA,GAAI,EAAuB,SAAS,CAAI,EAAG,MAC/C,CAEA,EAAE,YAAY,GAAe,CAAC,CAAC,CACnC,CAAC,CACL,CAEA,YAAsB,EAAS,CAC3B,GAAI,GAAW,MAAM,KAAK,SAAS,KAAK,QAAQ,EAC5C,EAAyB,EAAS,IAAI,GAAK,EAAE,SAAS,EAGtD,EAAmB,SAAS,uBAAuB,EAEnD,EAAsB,CAAC,EAEvB,EAAwB,CAAC,EAE7B,OAAS,KAAS,OAAM,KAAK,EAAQ,QAAQ,EACzC,GAAI,GAAQ,CAAK,EAAG,CAChB,GAAM,EAAuB,SAAS,EAAM,SAAS,EAwBjD,EAAiB,YAAY,CAAK,UAvB9B,GAAU,CAAK,GACX,GAAwC,EAAO,CAAQ,GACvD,WAAW,IAAM,OAAO,SAAS,OAAO,CAAC,EAI7C,GAAS,CAAK,EACd,GAAI,CACA,EAAsB,KAClB,GACI,GAAe,CAAK,CACxB,CACJ,CACJ,MAAE,CAKF,KAEA,UAAS,KAAK,YAAY,CAAK,EAMvC,EAAoB,KAAK,CAAK,CAClC,CAgBJ,OAAS,KAAS,OAAM,KAAK,SAAS,KAAK,QAAQ,EAC/C,AAAM,GAAQ,CAAK,GAAG,EAAM,OAAO,EAIvC,OAAS,KAAS,OAAM,KAAK,EAAQ,QAAQ,EACzC,SAAS,KAAK,YAAY,CAAK,EAGnC,MAAO,SAAQ,IAAI,CAAqB,CAC5C,CAEA,kBAAsD,EAAQ,CAC1D,MAAO,IAAI,SAAQ,CAAC,EAAS,IAAW,CAGpC,AAAI,EAAO,IACP,GAAO,OAAS,IAAM,EAAQ,EAC9B,EAAO,QAAU,IAAM,EAAO,GAE9B,EAAQ,EAGZ,SAAS,KAAK,YAAY,CAAM,CACpC,CAAC,CACL,CAEA,YAAwB,EAAI,CACxB,GAAI,GAAS,SAAS,cAAc,QAAQ,EAE5C,EAAO,YAAc,EAAG,YACxB,EAAO,MAAQ,EAAG,MAElB,OAAS,KAAQ,GAAG,WAChB,EAAO,aAAa,EAAK,KAAM,EAAK,KAAK,EAG7C,MAAO,EACX,CAEA,YAAmB,EAAI,CACnB,MAAO,GAAG,aAAa,qBAAqB,CAChD,CAEA,YAAiD,EAAI,EAAqB,CACtE,GAAI,CAAC,EAAK,GAAe,GAAyB,CAAE,EAEpD,MAAO,GAAoB,KAAK,GAAS,CACrC,GAAI,CAAE,GAAU,CAAK,EAAG,MAAO,GAE/B,GAAI,CAAC,EAAY,GAAsB,GAAyB,CAAK,EAGrE,GAAI,IAAe,GAAO,IAAgB,EAAoB,MAAO,EACzE,CAAC,CACL,CAEA,YAAkC,EAAI,CAGlC,MAAO,AAFG,IAAS,CAAE,EAAI,EAAG,IAAM,EAAG,MAE1B,MAAM,GAAG,CACxB,CAEA,YAAiB,EAAI,CACjB,MAAQ,GAAG,QAAQ,YAAY,IAAM,QAAU,EAAG,aAAa,KAAK,EAAE,YAAY,IAAM,cACjF,EAAG,QAAQ,YAAY,IAAM,SAC7B,EAAG,QAAQ,YAAY,IAAM,QACxC,CAEA,YAAkB,EAAM,CACpB,MAAO,GAAG,QAAQ,YAAY,IAAM,QACxC,CAEA,YAAoB,EAAK,CACrB,MAAO,GAAI,MAAM,EAAE,EAAE,OAAO,CAAC,EAAG,IAC5B,GAAM,IAAK,GAAK,EAAK,EAAE,WAAW,CAAC,EAE5B,EAAI,GACZ,CAAC,CACR,CAEA,YAA0B,EAAS,EAAoB,CACnD,GAAI,GAAS,EAEb,SAAmB,QAAQ,GAAQ,CAG/B,GAAM,GAAQ,GAAI,QAAO,GAAG,aAAgB,YAAgB,GAAG,EAE/D,EAAS,EAAO,QAAQ,EAAO,EAAE,CACrC,CAAC,EAGD,EAAS,EAAO,WAAW,IAAK,EAAE,EAE3B,EAAO,KAAK,CACvB,CCnMA,GAAI,IAAgB,GAChB,GAAkB,GAClB,GAAgB,GAChB,GAAY,GAED,YAAU,EAAQ,CAE7B,EAAO,SAAW,AAAC,GAAQ,CACvB,GAAI,GAAc,GAA0B,CAAG,EAM/C,AAJgB,GAAoC,kBAAmB,CACnE,IAAK,EAAa,QAAS,GAAO,OAAQ,EAC7C,CAAC,GAIF,EAAW,CAAW,CAC1B,EAEA,EAAO,SAAS,mBAAqB,IAAM,CACvC,GAAkB,EACtB,EAEA,EAAO,gBAAgB,IAAM,IAAI,EAAO,SAAS,UAAU,IAAI,EAE/D,EAAO,UAAU,WAAY,CAAC,EAAI,CAAE,eAAgB,CAGhD,AAF4B,EAAU,SAAS,OAAO,GAE7B,GAAyB,EAAI,GAAI,IAAM,CAC5D,GAAI,GAAc,GAA2B,CAAE,EAE/C,GAAa,EAAa,CAAC,EAAM,IAAqB,CAClD,GAA4C,EAAM,EAAa,CAAgB,CACnF,CAAC,CACL,CAAC,EAED,GAAsB,EAAI,AAAC,GAAqB,CAC5C,GAAI,GAAc,GAA2B,CAAE,EAE/C,GAAa,EAAa,CAAC,EAAM,IAAqB,CAClD,GAA4C,EAAM,EAAa,CAAgB,CACnF,CAAC,EAED,EAAiB,IAAM,CAKnB,AAJgB,GAAoC,kBAAmB,CACnE,IAAK,EAAa,QAAS,GAAO,OAAQ,EAC7C,CAAC,GAIF,EAAW,CAAW,CAC1B,CAAC,CACL,CAAC,CACL,CAAC,EAED,WAAoB,EAAa,EAA2B,GAAM,CAC9D,IAAmB,GAAwB,EAE3C,GAA6B,EAAa,CAAC,EAAM,IAAqB,CAClE,GAAoC,mBAAmB,EAEvD,IAAiB,GAAiD,EAElE,IAAmB,GAAyB,EAE5C,GAA+D,EAE/D,GAA4D,EAE5D,GAAqC,EAAQ,GAAmB,CAC5D,IAAiB,GAAgC,GAAe,CAC5D,GAAyB,CAAW,CACxC,CAAC,EAED,AAAI,EACA,GAAgD,EAAM,CAAgB,EAEtE,GAAW,EAAkB,CAAI,EAGrC,GAA2B,EAAM,AAAC,GAAkC,CAChE,GAAsC,SAAS,IAAI,EAEnD,IAAiB,GAA0B,CAAC,EAAa,IAAY,CACjE,GAAyB,CAAW,CACxC,CAAC,EAED,GAAmC,EAEnC,EAA8B,IAAM,CAChC,EAAgB,IAAM,CAClB,WAAW,IAAM,CACb,IAAa,GAA2C,CAC5D,CAAC,EAED,GAAgC,CAAM,EAEtC,GAAoC,kBAAkB,CAC1D,CAAC,CACL,CAAC,CACL,CAAC,CACL,CAAC,CACL,CAAC,CACL,CAEA,GACI,AAAC,GAAyC,CACtC,EAAqC,AAAC,GAAQ,CAC1C,GAAI,GAAc,GAA0B,CAAG,EAM/C,GAJgB,GAAoC,kBAAmB,CACnE,IAAK,EAAa,QAAS,GAAM,OAAQ,EAC5C,CAAC,EAEa,OAIf,EAAW,EAFoB,EAEiB,CACpD,CAAC,CACL,EACA,CAAC,EAAM,EAAK,EAAgB,IAAmB,CAC3C,GAAI,GAAc,GAA0B,CAAG,EAM/C,AAJgB,GAAoC,kBAAmB,CACnE,IAAK,EAAa,QAAS,GAAM,OAAQ,EAC7C,CAAC,GAMD,IAAiD,EAGjD,GAAoC,mBAAmB,EAIvD,GAA6D,EAAgB,CAAc,EAE3F,GAAqC,EAAQ,GAAmB,CAC5D,IAAiB,GAAgC,GAAe,CAC5D,GAAyB,CAAW,CACxC,CAAC,EAED,GAA2B,EAAM,IAAM,CACnC,GAAmC,EAEnC,GAAsC,SAAS,IAAI,EAEnD,IAAiB,GAA0B,CAAC,EAAa,IAAY,CACjE,GAAyB,CAAW,CACxC,CAAC,EAED,GAAmC,EAEnC,EAAgB,IAAM,CAClB,IAAa,GAA2C,EAExD,GAAgC,CAAM,EAEtC,GAAoC,kBAAkB,CAC1D,CAAC,CACL,CAAC,CACL,CAAC,EACL,CACJ,EAIA,WAAW,IAAM,CACb,GAAoC,kBAAkB,CAC1D,CAAC,CACL,CAEA,YAAsC,EAAiB,EAAU,CAC7D,GAAkB,EAAiB,EAAU,IAAM,CAC/C,GAAU,EAAiB,CAAQ,CACvC,CAAC,CACL,CAEA,YAA8C,EAAQ,EAAU,CAC5D,EAAO,uBAAuB,EAE9B,EAAS,AAAC,GAAiB,CACvB,EAAO,wBAAwB,EAE/B,eAAe,IAAM,CACjB,EAAa,CACjB,CAAC,CACL,CAAC,CACL,CAEA,YAA6C,EAAM,EAAQ,CACvD,GAAI,GAAQ,GAAI,aAAY,EAAM,CAC9B,WAAY,GACZ,QAAS,GACT,QACJ,CAAC,EAED,gBAAS,cAAc,CAAK,EAErB,EAAM,gBACjB,CAEA,YAAyC,EAAQ,CAC7C,EAAO,SAAS,SAAS,KAAM,OAAW,CAAC,EAAI,IAAS,CACpD,AAAI,EAAG,iBAAiB,EAAK,CACjC,CAAC,CACL,CAEA,aAAsD,CAClD,SAAS,cAAc,aAAa,GAAK,SAAS,cAAc,aAAa,EAAE,MAAM,CACzF,CAEA,aAA0E,CAEtE,GAAI,GAAS,SAAU,EAAM,EAAU,CACnC,OAAO,KAAK,EAAM,CAAC,EAAI,IAAS,CAC5B,AAAI,GAAmB,CAAE,GAAG,EAAK,EACjC,AAAI,GAAiB,CAAE,EAAG,EAAK,EAC1B,EAAS,EAAI,CAAI,CAC1B,CAAC,CACL,EAKA,OAAO,YAAY,SAAS,KAAM,CAAM,CAC5C,CC9Oe,YAAiB,EAAQ,CACpC,EAAO,MAAM,cAAe,CAAC,EAAI,CAAE,iBAAmB,CAClD,GAAI,GACA,EAAa,GACb,EAAU,GAEd,MAAO,GAAY,CAAC,EAAkB,EAAQ,EAAQ,EAAM,IAAQ,CAChE,GAAI,GAAW,GAAS,EAEpB,CAAE,UAAS,UAAS,OAAM,OAAQ,GAAM,EAAU,EAAkB,CAAU,EAElF,SAAO,CAAO,EAEd,AAAM,EAGF,GAAO,OAAO,IAAM,EAAK,EAAO,CAAC,CAAC,EAElC,EAAI,KAAM,IAAY,CAClB,EAAO,CAAQ,EAIf,KAAM,AAF8B,KAAM,QAAQ,QAAQ,GAEtB,CACxC,CAAC,GAVD,EAAO,OAAO,IAAM,EAAQ,EAAO,CAAC,CAAC,EAalC,CACX,EAAG,GAAQ,CACP,EAAK,WAAa,IAAQ,GAAa,GAAa,GACpD,EAAK,QAAU,IAAQ,GAAU,GAAa,GAC9C,EAAK,GAAK,GAAS,GAAQ,EAAY,EAC3C,CAAC,CACL,CAAC,EAED,EAAO,QAAU,CAAE,QAAM,CAC7B,CAEO,YAAe,EAAM,EAAkB,EAAa,GAAO,EAAS,KAAM,CAC7E,GAAI,CAAE,MAAK,MAAK,MAAK,UAAW,GAAiB,EAE7C,EAAM,GAAI,KAAI,OAAO,SAAS,IAAI,EAClC,EAA0B,EAAI,EAAK,CAAI,EACvC,EAAe,EAA0B,EAAI,EAAK,CAAI,EAAI,EAC1D,EAAmB,KAAK,UAAU,CAAY,EAC9C,EAAkB,CAAC,GAAO,KAAM,MAAS,EAAE,SAAS,CAAM,EAAI,EAAmB,KAAK,UAAU,CAAM,EAEtG,EAA4B,AAAC,GAAa,KAAK,UAAU,CAAQ,IAAM,EACvE,EAA2B,AAAC,GAAc,KAAK,UAAU,CAAQ,IAAM,EAE3E,AAAI,GAAY,GAAM,EAAI,EAAK,EAAM,CAAY,GAEjD,GAAQ,EAAK,EAAM,CAAE,MAAO,CAAa,CAAC,EAE1C,GAAI,GAAO,GAEP,EAAS,CAAC,EAAU,IAAa,CACjC,GAAI,EAAM,OAEV,GAAI,GAAM,GAAI,KAAI,OAAO,SAAS,IAAI,EAGtC,AAAI,CAAE,GAAc,CAAE,GAA2B,EAA0B,CAAQ,GAKxE,IAAa,QAEb,CAAE,GAAc,EAAyB,CAAQ,EANxD,EAAM,EAAO,EAAK,CAAI,EAStB,EAAM,EAAI,EAAK,EAAM,CAAQ,EAqBjC,EAAS,EAAK,EAAM,CAAE,MAAO,CAAQ,CAAC,CAC1C,EAEA,MAAO,CACH,QAAS,EAET,QAAQ,EAAU,CACd,EAAO,GAAS,CAAQ,CAC5B,EAEA,KAAK,EAAU,CACX,EAAO,GAAM,CAAQ,CACzB,EAEA,IAAI,EAAU,CACV,GAAI,GAAU,AAAC,GAAM,CACjB,AAAI,CAAE,EAAE,OAAS,CAAE,EAAE,MAAM,QAE3B,OAAO,QAAQ,EAAE,MAAM,MAAM,EAAE,QAAQ,CAAC,CAAC,EAAO,CAAE,MAAO,MAAgB,CACrE,GAAI,IAAU,EAAM,OAEpB,EAAO,GAKP,GAAI,GAAS,EAAS,CAAQ,EAE9B,AAAI,YAAkB,SAClB,EAAO,QAAQ,IAAM,EAAO,EAAK,EAEjC,EAAO,EAEf,CAAC,CACL,EAEA,cAAO,iBAAiB,WAAY,CAAO,EAEpC,IAAM,OAAO,oBAAoB,WAAY,CAAO,CAC/D,CACJ,CACJ,CAEA,YAAiB,EAAK,EAAK,EAAQ,CAC/B,GAAI,GAAQ,OAAO,QAAQ,OAAS,CAAC,EAErC,AAAM,EAAM,QAAQ,GAAM,OAAS,CAAC,GAEpC,EAAM,OAAO,GAAO,GAAO,CAAM,EAEjC,OAAO,QAAQ,aAAa,EAAO,GAAI,EAAI,SAAS,CAAC,CACzD,CAEA,YAAc,EAAK,EAAK,EAAQ,CAC5B,GAAI,GAAQ,OAAO,QAAQ,OAAS,CAAC,EAErC,AAAM,EAAM,QAAQ,GAAM,OAAS,CAAC,GAEpC,EAAQ,CAAE,OAAQ,CAAC,GAAG,EAAM,OAAY,CAAC,GAAM,GAAO,CAAM,CAAE,CAAE,EAEhE,OAAO,QAAQ,UAAU,EAAO,GAAI,EAAI,SAAS,CAAC,CACtD,CAEA,YAAgB,EAAQ,CACpB,GAAI,IAAW,OAEf,MAAO,MAAK,MAAM,KAAK,UAAU,CAAM,CAAC,CAC5C,CAEA,aAA4B,CACxB,MAAO,CACH,IAAI,EAAK,EAAK,CACV,GAAI,GAAS,EAAI,OAEjB,GAAI,CAAE,EAAQ,MAAO,GAErB,GAAI,GAAO,GAAgB,CAAM,EAEjC,MAAO,QAAO,KAAK,CAAI,EAAE,SAAS,CAAG,CACzC,EACA,IAAI,EAAK,EAAK,CACV,GAAI,GAAS,EAAI,OAEjB,MAAM,GAIC,AAFI,GAAgB,CAAM,EAErB,GAJS,EAKzB,EACA,IAAI,EAAK,EAAK,EAAO,CACjB,GAAI,GAAO,GAAgB,EAAI,MAAM,EAErC,SAAK,GAAO,GAAW,GAAO,CAAK,CAAC,EAEpC,EAAI,OAAS,GAAc,CAAI,EAExB,CACX,EACA,OAAO,EAAK,EAAK,CACb,GAAI,GAAO,GAAgB,EAAI,MAAM,EAErC,aAAO,GAAK,GAEZ,EAAI,OAAS,GAAc,CAAI,EAExB,CACX,CACJ,CACJ,CAEA,YAAoB,EAAO,CACvB,GAAI,CAAE,GAAU,CAAK,EAAG,MAAO,GAE/B,OAAS,KAAO,GACZ,AAAI,EAAM,KAAS,KAAM,MAAO,GAAM,GACjC,EAAM,GAAO,GAAW,EAAM,EAAI,EAG3C,MAAO,EACX,CAIA,YAAuB,EAAM,CACzB,GAAI,GAAY,AAAC,GAAY,MAAO,IAAY,UAAY,IAAY,KAEpE,EAA0B,CAAC,EAAM,EAAU,CAAC,EAAG,EAAU,KACzD,QAAO,QAAQ,CAAI,EAAE,QAAQ,CAAC,CAAC,EAAM,KAAY,CAC7C,GAAI,GAAM,IAAY,GAAK,EAAO,GAAG,KAAW,KAEhD,AAAI,IAAW,KACX,EAAQ,GAAO,GACZ,AAAM,EAAU,CAAM,EAKzB,EAAU,CAAC,GAAG,EAAS,GAAG,EAAwB,EAAQ,EAAS,CAAG,CAAC,EAJvE,EAAQ,GAAO,mBAAmB,CAAM,EACnC,WAAW,MAAO,GAAG,EACrB,WAAW,MAAO,GAAG,CAIlC,CAAC,EAEM,GAGP,EAAU,EAAwB,CAAI,EAE1C,MAAO,QAAO,QAAQ,CAAO,EAAE,IAAI,CAAC,CAAC,EAAK,KAAW,GAAG,KAAO,GAAO,EAAE,KAAK,GAAG,CACpF,CAIA,YAAyB,EAAQ,CAG7B,GAFA,EAAS,EAAO,QAAQ,IAAK,EAAE,EAE3B,IAAW,GAAI,MAAO,CAAC,EAE3B,GAAI,GAAgC,CAAC,EAAK,EAAO,IAAS,CACtD,GAAI,CAAC,EAAO,KAAW,GAAQ,EAAI,MAAM,GAAG,EAG5C,GAAI,CAAE,EAAQ,MAAO,GAAK,GAAO,EAGjC,AAAI,EAAK,KAAW,QAChB,GAAK,GAAS,MAAM,CAAM,EAAI,CAAC,EAAI,CAAC,GAIxC,EAA8B,CAAC,EAAQ,GAAG,CAAI,EAAE,KAAK,GAAG,EAAG,EAAO,EAAK,EAAM,CACjF,EAEI,EAAU,EAAO,MAAM,GAAG,EAAE,IAAI,GAAK,EAAE,MAAM,GAAG,CAAC,EAKjD,EAAO,OAAO,OAAO,IAAI,EAE7B,SAAQ,QAAQ,CAAC,CAAC,EAAK,KAAW,CAE9B,GAAK,QAAO,GAAS,KAIrB,GAFA,EAAQ,mBAAmB,EAAM,WAAW,IAAK,KAAK,CAAC,EAEnD,CAAE,EAAI,SAAS,GAAG,EAClB,EAAK,GAAO,MACT,CAEH,GAAI,GAAgB,EAAI,WAAW,IAAK,GAAG,EAAE,WAAW,IAAK,EAAE,EAE/D,EAA8B,EAAe,EAAO,CAAI,CAC5D,CACJ,CAAC,EAEM,CACX,CCjSA,YAAe,EAAM,EAAQ,EAAS,CACpC,GAA2C,EAC3C,GAAI,GACA,EACA,EAAK,EAAW,EAAU,EAAS,EAAU,EAAS,EAAQ,EAClE,WAAuB,EAAW,CAAC,EAAG,CACpC,GAAI,GAAgB,AAAC,GAAO,EAAG,aAAa,KAAK,EAC7C,EAAO,IAAM,CACjB,EACA,EAAW,EAAS,UAAY,EAChC,EAAU,EAAS,SAAW,EAC9B,EAAW,EAAS,UAAY,EAChC,EAAU,EAAS,SAAW,EAC9B,EAAS,EAAS,QAAU,EAC5B,EAAQ,EAAS,OAAS,EAC1B,EAAM,EAAS,KAAO,EACtB,EAAY,EAAS,WAAa,EACpC,CACA,WAAe,EAAO,EAAI,CACxB,GAAI,EAAiC,EAAO,CAAE,EAC5C,MAAO,GAAa,EAAO,CAAE,EAE/B,GAAI,GAAqB,GACzB,GAAI,IAAW,EAAU,EAAO,EAAI,IAAM,EAAqB,EAAI,EAQnE,IANI,EAAM,WAAa,GAAK,OAAO,QACjC,QAAO,OAAO,UAAU,EAAO,CAAE,EAC7B,EAAM,aAAe,EAAG,aAC1B,EAAM,EAAM,YAAa,EAAG,WAAW,GAGvC,GAAc,CAAE,EAAG,CACrB,EAAe,EAAO,CAAE,EACxB,EAAQ,EAAO,CAAE,EACjB,MACF,CACA,AAAK,GACH,EAAgB,EAAO,CAAE,EAE3B,EAAQ,EAAO,CAAE,EACjB,EAAc,EAAO,CAAE,EACzB,CACA,WAA0C,EAAO,EAAI,CACnD,MAAO,GAAM,UAAY,EAAG,UAAY,EAAM,UAAY,EAAG,UAAY,EAAO,CAAK,GAAK,EAAO,CAAE,CACrG,CACA,WAAsB,EAAO,EAAI,CAC/B,GAAI,GAAW,EAAU,CAAK,EAC5B,OACF,GAAI,GAAW,EAAG,UAAU,EAAI,EAChC,AAAI,GAAW,EAAQ,CAAQ,GAE/B,GAAM,YAAY,CAAQ,EAC1B,EAAQ,CAAK,EACb,EAAM,CAAQ,EAChB,CACA,WAAwB,EAAO,EAAI,CACjC,GAAI,GAAQ,EAAG,UACf,AAAI,EAAM,YAAc,GACtB,GAAM,UAAY,EAEtB,CACA,WAAyB,EAAO,EAAI,CAMlC,GALI,EAAM,kBAEN,EAAM,YAAc,CAAC,EAAG,YAGxB,CAAC,EAAM,YAAc,EAAG,WAC1B,OAEF,GAAI,GAAgB,MAAM,KAAK,EAAM,UAAU,EAC3C,EAAe,MAAM,KAAK,EAAG,UAAU,EAC3C,OAAS,GAAI,EAAc,OAAS,EAAG,GAAK,EAAG,IAAK,CAClD,GAAI,GAAO,EAAc,GAAG,KAC5B,AAAK,EAAG,aAAa,CAAI,GACvB,EAAM,gBAAgB,CAAI,CAE9B,CACA,OAAS,GAAI,EAAa,OAAS,EAAG,GAAK,EAAG,IAAK,CACjD,GAAI,GAAO,EAAa,GAAG,KACvB,EAAQ,EAAa,GAAG,MAC5B,AAAI,EAAM,aAAa,CAAI,IAAM,GAC/B,EAAM,aAAa,EAAM,CAAK,CAElC,CACF,CACA,WAAuB,EAAO,EAAI,CAChC,GAAI,GAAW,EAAS,EAAM,QAAQ,EAClC,EAAmB,CAAC,EACpB,EAAY,GAAa,CAAE,EAC3B,EAAc,GAAa,CAAK,EACpC,KAAO,GAAW,CAChB,GAAkB,EAAW,CAAW,EACxC,GAAI,GAAQ,EAAO,CAAS,EACxB,EAAU,EAAO,CAAW,EAChC,GAAI,CAAC,EACH,GAAI,GAAS,EAAiB,GAAQ,CACpC,GAAI,GAAW,EAAiB,GAChC,EAAM,YAAY,CAAQ,EAC1B,EAAc,CAChB,KAAO,CACL,GAAI,CAAC,GAAW,EAAQ,CAAS,EAAG,CAClC,GAAI,GAAQ,EAAU,UAAU,EAAI,EACpC,EAAM,YAAY,CAAK,EACvB,EAAM,CAAK,CACb,CACA,EAAY,EAAe,EAAI,CAAS,EACxC,QACF,CAEF,GAAI,GAAO,AAAC,GAAS,GAAQ,EAAK,WAAa,GAAK,EAAK,cAAgB,uBACrE,EAAQ,AAAC,GAAS,GAAQ,EAAK,WAAa,GAAK,EAAK,cAAgB,0BAC1E,GAAI,EAAK,CAAS,GAAK,EAAK,CAAW,EAAG,CACxC,GAAI,GAAgB,EAChB,GAAiB,EACrB,KAAO,GAAa,CAClB,GAAI,GAAO,EAAe,EAAO,CAAW,EAC5C,GAAI,EAAK,CAAI,EACX,YACS,EAAM,CAAI,GAAK,EAAgB,EACxC,YACS,EAAM,CAAI,GAAK,IAAkB,EAAG,CAC7C,EAAc,EACd,KACF,CACA,EAAc,CAChB,CACA,GAAI,IAAe,EACnB,EAAgB,EAChB,GAAI,IAAe,EACnB,KAAO,GAAW,CAChB,GAAI,GAAO,EAAe,EAAI,CAAS,EACvC,GAAI,EAAK,CAAI,EACX,YACS,EAAM,CAAI,GAAK,EAAgB,EACxC,YACS,EAAM,CAAI,GAAK,IAAkB,EAAG,CAC7C,EAAY,EACZ,KACF,CACA,EAAY,CACd,CACA,GAAI,IAAa,EACb,GAAY,GAAI,IAAM,GAAgB,EAAY,EAClD,GAAU,GAAI,IAAM,GAAc,EAAU,EAChD,EAAc,GAAW,EAAO,EAChC,QACF,CACA,GAAI,EAAY,WAAa,GAAK,GAAa,CAAC,EAAY,YAAY,CAAS,EAAG,CAClF,GAAI,GAAuB,EAAe,EAAI,CAAS,EACnD,GAAQ,GACZ,KAAO,CAAC,IAAS,GACf,AAAI,EAAqB,WAAa,GAAK,EAAY,YAAY,CAAoB,GACrF,IAAQ,GACR,EAAc,EAAc,EAAO,EAAW,CAAW,EACzD,EAAU,EAAO,CAAW,GAE9B,EAAuB,EAAe,EAAI,CAAoB,CAElE,CACA,GAAI,IAAU,EAAS,CACrB,GAAI,CAAC,GAAS,EAAS,CACrB,EAAiB,GAAW,EAC5B,EAAc,EAAc,EAAO,EAAW,CAAW,EACzD,EAAiB,GAAS,OAAO,EACjC,EAAc,EAAe,EAAO,CAAW,EAC/C,EAAY,EAAe,EAAI,CAAS,EACxC,QACF,CAOA,GANI,GAAS,CAAC,GACR,EAAS,IACX,GAAY,YAAY,EAAS,EAAM,EACvC,EAAc,EAAS,IAGvB,GAAS,EAAS,CACpB,GAAI,GAAc,EAAS,GAC3B,GAAI,EACF,EAAiB,GAAW,EAC5B,EAAY,YAAY,CAAW,EACnC,EAAc,MACT,CACL,EAAiB,GAAW,EAC5B,EAAc,EAAc,EAAO,EAAW,CAAW,EACzD,EAAiB,GAAS,OAAO,EACjC,EAAc,EAAe,EAAO,CAAW,EAC/C,EAAY,EAAe,EAAI,CAAS,EACxC,QACF,CACF,CACF,CACA,GAAI,IAAkB,GAAe,EAAe,EAAO,CAAW,EACtE,EAAM,EAAa,CAAS,EAC5B,EAAY,GAAa,EAAe,EAAI,CAAS,EACrD,EAAc,EAChB,CACA,GAAI,GAAW,CAAC,EAChB,KAAO,GACL,AAAK,GAAW,EAAU,CAAW,GACnC,EAAS,KAAK,CAAW,EAC3B,EAAc,EAAe,EAAO,CAAW,EAEjD,KAAO,EAAS,QAAQ,CACtB,GAAI,GAAgB,EAAS,MAAM,EACnC,EAAc,OAAO,EACrB,EAAQ,CAAa,CACvB,CACF,CACA,WAAgB,EAAI,CAClB,MAAO,IAAM,EAAG,WAAa,GAAK,EAAI,CAAE,CAC1C,CACA,WAAkB,EAAK,CACrB,GAAI,GAAM,CAAC,EACX,OAAS,KAAM,GAAK,CAClB,GAAI,GAAS,EAAO,CAAE,EACtB,AAAI,GACF,GAAI,GAAU,EAElB,CACA,MAAO,EACT,CACA,WAAuB,EAAQ,EAAM,EAAU,CAC7C,GAAI,CAAC,GAAW,EAAQ,CAAI,EAAG,CAC7B,GAAI,GAAQ,EAAK,UAAU,EAAI,EAC/B,SAAO,aAAa,EAAO,CAAQ,EACnC,EAAM,CAAK,EACJ,CACT,CACA,MAAO,EACT,CACA,SAAc,CAAO,EACrB,EAAS,EACT,EAAO,MAAO,IAAW,SAAW,GAAc,CAAM,EAAI,EACxD,OAAO,QAAU,OAAO,OAAO,kBAAoB,CAAC,EAAK,cAC3D,GAAK,aAAe,OAAO,OAAO,iBAAiB,CAAI,EACvD,EAAK,cAAgB,OAAO,OAAO,UAAU,EAAM,CAAI,GAEzD,EAAM,EAAM,CAAI,EAChB,EAAS,OACT,EAAO,OACA,CACT,CACA,GAAM,KAAO,IAAM,CACnB,EACA,GAAM,IAAM,IAAM,CAClB,EACA,YAAoB,KAAS,EAAM,CACjC,GAAI,GAAO,GACX,SAAK,GAAG,EAAM,IAAM,EAAO,EAAI,EACxB,CACT,CACA,GAAI,IAAU,GACd,YAAuB,EAAM,CAC3B,GAAM,GAAW,SAAS,cAAc,UAAU,EAClD,SAAS,UAAY,EACd,EAAS,QAAQ,iBAC1B,CACA,YAAuB,EAAI,CACzB,MAAO,GAAG,WAAa,GAAK,EAAG,WAAa,CAC9C,CACA,GAAI,IAAQ,KAAM,CAChB,YAAY,EAAO,EAAK,CACtB,KAAK,aAAe,EACpB,KAAK,WAAa,CACpB,CACA,GAAI,WAAW,CACb,GAAI,GAAW,CAAC,EACZ,EAAc,KAAK,aAAa,YACpC,KAAO,GAAe,IAAgB,KAAK,YACzC,EAAS,KAAK,CAAW,EACzB,EAAc,EAAY,YAE5B,MAAO,EACT,CACA,YAAY,EAAO,CACjB,KAAK,WAAW,OAAO,CAAK,CAC9B,CACA,GAAI,aAAa,CACf,GAAI,GAAQ,KAAK,aAAa,YAC9B,GAAI,IAAU,KAAK,WAEnB,MAAO,EACT,CACA,SAAS,EAAW,CAClB,GAAI,GAAO,EAAU,YACrB,GAAI,IAAS,KAAK,WAElB,MAAO,EACT,CACA,aAAa,EAAS,EAAW,CAC/B,SAAU,OAAO,CAAO,EACjB,CACT,CACF,EACA,YAAsB,EAAQ,CAC5B,MAAO,GAAO,UAChB,CACA,WAAwB,EAAQ,EAAW,CACzC,GAAI,GACJ,MAAI,aAAkB,IACpB,EAAO,EAAO,SAAS,CAAS,EAEhC,EAAO,EAAU,YAEZ,CACT,CACA,aAAsD,CACpD,GAAI,GACF,OACF,GAAU,GACV,GAAI,GAAW,QAAQ,UAAU,aAC7B,EAAU,SAAS,cAAc,KAAK,EAC1C,QAAQ,UAAU,aAAe,SAAyB,EAAM,EAAO,CACrE,GAAI,CAAC,EAAK,SAAS,GAAG,EACpB,MAAO,GAAS,KAAK,KAAM,EAAM,CAAK,EAExC,EAAQ,UAAY,SAAS,MAAS,aACtC,GAAI,GAAO,EAAQ,kBAAkB,iBAAiB,CAAI,EAC1D,EAAQ,kBAAkB,oBAAoB,CAAI,EAClD,KAAK,iBAAiB,CAAI,CAC5B,CACF,CACA,YAA2B,EAAI,EAAM,CACnC,GAAI,GAAS,GAAQ,EAAK,aAAe,EAAK,YAAY,GAC1D,AAAI,CAAC,GAEL,GAAG,aAAa,KAAM,CAAM,EAC5B,EAAG,GAAK,EACV,CAGA,YAAqB,EAAQ,CAC3B,EAAO,MAAQ,EACjB,CAGA,GAAI,IAAiB,GChVrB,YAAqB,EAAQ,CAC3B,EAAO,UAAU,OAAQ,CAAC,EAAI,CAAE,QAAO,cAAc,CAAE,SAAQ,gBAAe,aAAc,CAC1F,GAAI,GAAa,IAAM,EACnB,EAAiB,GACrB,eAAe,IAAM,CACnB,GAAI,CAAC,WAAY,SAAS,EAAE,SAAS,CAAK,EAAG,CAC3C,GAAI,GAAY,EAAc,CAAU,EACxC,EAAO,IAAM,CACX,EAAa,AAAC,GAAU,CACtB,GAAI,GACJ,SAAO,0BAA0B,IAAM,CACrC,EAAU,AAAC,GAAW,CACpB,EAAS,MAAO,IAAW,WAAa,EAAO,CAAK,EAAI,CAC1D,EAAG,CAAE,MAAO,CAEV,OAAU,EACV,OAAU,GAAY,KAAK,CAAE,IAAG,CAAC,CACnC,CAAE,CAAC,CACL,CAAC,EACM,CACT,EACA,EAAkB,EAAI,EAAK,CAC7B,CAAC,CACH,KACE,GAAkB,EAAI,EAAK,EAE7B,AAAI,EAAG,UACL,EAAG,SAAS,IAAI,EAAG,KAAK,CAC5B,CAAC,EACD,GAAM,GAAa,GAAI,iBACvB,EAAQ,IAAM,CACZ,EAAW,MAAM,CACnB,CAAC,EACD,EAAG,iBAAiB,QAAS,IAAM,EAAkB,CAAE,EAAG,CACxD,OAAQ,EAAW,OAGnB,QAAS,EACX,CAAC,EACD,EAAG,iBAAiB,OAAQ,IAAM,EAAkB,EAAI,EAAK,EAAG,CAAE,OAAQ,EAAW,MAAO,CAAC,EAC7F,WAA2B,EAAK,EAAsB,GAAM,CAC1D,GAAI,GAAQ,EAAI,MACZ,EAAW,EAAW,CAAK,EAC/B,GAAI,CAAC,GAAY,IAAa,QAC5B,MAAO,GACT,GAAI,EAAe,OAAS,EAAI,MAAM,SAAW,EAC/C,MAAO,GAAiB,EAAI,MAE9B,GAAI,GAAW,IAAM,CACnB,EAAiB,EAAI,MAAQ,EAAY,EAAO,CAAQ,CAC1D,EACA,AAAI,EACF,GAAsB,EAAK,EAAU,IAAM,CACzC,EAAS,CACX,CAAC,EAED,EAAS,CAEb,CACA,WAAqB,EAAO,EAAU,CACpC,GAAI,IAAU,GACZ,MAAO,GACT,GAAI,GAAoB,GAAU,EAAU,CAAK,EAEjD,MADmB,IAAQ,EAAU,CAAiB,CAExD,CACF,CAAC,EAAE,OAAO,OAAO,CACnB,CACA,YAA+B,EAAI,EAAU,EAAU,CACrD,GAAI,GAAiB,EAAG,eACpB,EAAmB,EAAG,MAC1B,EAAS,EACT,GAAI,GAAqC,EAAiB,MAAM,EAAG,CAAc,EAC7E,EAAc,GAChB,EACA,GACE,EACA,CACF,CACF,EAAE,OACF,EAAG,kBAAkB,EAAa,CAAW,CAC/C,CACA,YAAmB,EAAU,EAAO,CAClC,GAAI,GAAoB,EACpB,EAAS,GACT,EAAU,CACZ,EAAK,QACL,EAAK,WACL,IAAK,aACP,EACI,EAAmB,GACvB,OAAS,GAAI,EAAG,EAAI,EAAS,OAAQ,IAAK,CACxC,GAAI,CAAC,IAAK,IAAK,GAAG,EAAE,SAAS,EAAS,EAAE,EAAG,CACzC,GAAoB,EAAS,GAC7B,QACF,CACA,OAAS,GAAI,EAAG,EAAI,EAAkB,OAAQ,IAC5C,GAAI,EAAkB,KAAO,EAAS,GAAI,CACxC,EAAoB,EAAkB,MAAM,EAAG,CAAC,EAAI,EAAkB,MAAM,EAAI,CAAC,EACjF,KACF,CAEJ,CACA,OAAS,GAAI,EAAG,EAAI,EAAiB,OAAQ,IAAK,CAChD,GAAI,GAAQ,GACZ,OAAS,GAAI,EAAG,EAAI,EAAkB,OAAQ,IAC5C,GAAI,EAAQ,EAAiB,IAAI,KAAK,EAAkB,EAAE,EAAG,CAC3D,GAAU,EAAkB,GAC5B,EAAoB,EAAkB,MAAM,EAAG,CAAC,EAAI,EAAkB,MAAM,EAAI,CAAC,EACjF,EAAQ,GACR,KACF,CAEF,GAAI,CAAC,EACH,KACJ,CACA,MAAO,EACT,CACA,YAAiB,EAAU,EAAO,CAChC,GAAI,GAAQ,MAAM,KAAK,CAAK,EACxB,EAAS,GACb,OAAS,GAAI,EAAG,EAAI,EAAS,OAAQ,IAAK,CACxC,GAAI,CAAC,CAAC,IAAK,IAAK,GAAG,EAAE,SAAS,EAAS,EAAE,EAAG,CAC1C,GAAU,EAAS,GACnB,QACF,CACA,GAAI,EAAM,SAAW,EACnB,MACF,GAAU,EAAM,MAAM,CACxB,CACA,MAAO,EACT,CACA,YAAqB,EAAO,EAAY,IAAK,EAAW,EAAY,EAAG,CACrE,GAAI,IAAU,IACZ,MAAO,IACT,GAAI,QAAQ,KAAK,CAAK,EACpB,MAAO,IACT,AAAI,GAAc,MAChB,GAAY,IAAc,IAAM,IAAM,KAExC,GAAI,GAAe,CAAC,EAAQ,IAAe,CACzC,GAAI,GAAS,GACT,EAAU,EACd,OAAS,GAAI,EAAO,OAAS,EAAG,GAAK,EAAG,IACtC,AAAI,EAAO,KAAO,GAElB,CAAI,IAAY,EACd,GAAS,EAAO,GAAK,EAAa,EAClC,EAAU,GAEV,EAAS,EAAO,GAAK,EAEvB,KAEF,MAAO,EACT,EACI,EAAQ,EAAM,WAAW,GAAG,EAAI,IAAM,GACtC,EAAgB,EAAM,WAAW,GAAI,QAAO,UAAU,KAAc,GAAG,EAAG,EAAE,EAC5E,EAAW,MAAM,KAAK,CAAE,OAAQ,EAAc,MAAM,CAAS,EAAE,GAAG,MAAO,CAAC,EAAE,KAAK,GAAG,EAAE,KAAK,EAAE,EACjG,SAAW,GAAG,IAAQ,EAAa,EAAU,CAAS,IAClD,EAAY,GAAK,EAAM,SAAS,CAAS,GAC3C,IAAY,GAAG,IAAc,IAAI,OAAO,CAAS,GACnD,eAAe,IAAM,CACnB,AAAI,KAAK,GAAG,MAAM,SAAS,CAAS,GAEhC,KAAK,GAAG,MAAM,KAAK,GAAG,eAAiB,KAAO,GAChD,KAAK,GAAG,kBAAkB,KAAK,GAAG,eAAiB,EAAG,KAAK,GAAG,eAAiB,CAAC,CAEpF,CAAC,EACM,CACT,CAGA,GAAI,IAAiB,GC/Jd,aAAiB,CACpB,WAAW,IAAM,GAAkC,CAAC,EAEpD,GAAS,SAAU,eAAe,EAClC,GAAS,SAAU,uBAAuB,EAE1C,EAAO,OAAO,EAAK,EACnB,EAAO,OAAO,EAAO,EACrB,EAAO,OAAO,EAAS,EACvB,EAAO,OAAO,EAAQ,EACtB,EAAO,OAAO,EAAM,EACpB,EAAO,OAAO,EAAK,EACnB,EAAO,OAAO,EAAO,EACrB,EAAO,OAAO,EAAQ,EACtB,EAAO,OAAO,EAAI,EAElB,EAAO,gBAAgB,IAAM,aAAa,EAE1C,EAAO,kBAAkB,CAAC,EAAI,IAAe,CAGzC,GAAI,CAAE,MAAM,KAAK,CAAU,EAAE,KAAK,GAAa,GAA4B,EAAU,IAAI,CAAC,EAAG,OAE7F,GAAI,GAAY,EAAiB,EAAI,EAAK,EAE1C,AAAI,CAAE,GAEN,EAAW,QAAQ,GAAa,CAC5B,GAAI,CAAE,GAA4B,EAAU,IAAI,EAAG,OAEnD,GAAI,GAAY,GAAiB,EAAI,EAAU,IAAI,EAEnD,EAAQ,iBAAkB,CAAE,KAAI,YAAW,YAAW,QAAS,AAAC,GAAa,CACzE,EAAO,mBAAmB,EAAI,EAAU,IAAK,CAAQ,CACzD,CAAE,CAAC,CACP,CAAC,CACL,CAAC,EAED,EAAO,cACH,EAAO,gBAAgB,GAAM,CAGzB,GAAI,CAAE,MAAM,KAAK,EAAG,UAAU,EAAE,KAAK,GAAa,GAA4B,EAAU,IAAI,CAAC,EAAG,OAEhG,GAAI,EAAG,aAAa,SAAS,EAAG,CAC5B,GAAI,GAAY,GAAc,CAAE,EAEhC,EAAO,mBAAmB,EAAI,UAAW,IAAM,CAC3C,GAAiB,EAAU,EAAE,CACjC,CAAC,CACL,CAEA,GAAI,GAAY,EAAiB,EAAI,EAAK,EAE1C,AAAI,GACA,GAAQ,eAAgB,CAAE,KAAI,WAAU,CAAC,EAMzC,AAJiB,MAAM,KAAK,EAAG,kBAAkB,CAAC,EAC7C,OAAO,GAAQ,GAA4B,CAAI,CAAC,EAChD,IAAI,GAAQ,GAAiB,EAAI,CAAI,CAAC,EAEhC,QAAQ,GAAa,CAC5B,EAAQ,iBAAkB,CAAE,KAAI,YAAW,YAAW,QAAS,AAAC,GAAa,CACzE,EAAO,mBAAmB,EAAI,EAAU,IAAK,CAAQ,CACzD,CAAE,CAAC,CACP,CAAC,EAET,CAAC,CACL,EAEA,EAAO,MAAM,EAEb,WAAW,IAAM,OAAO,SAAS,wBAA0B,EAAI,EAE/D,GAAS,SAAU,sBAAsB,CAC7C,CAEA,aAA6C,CACzC,GAAI,GAAK,SAAS,cAAc,oCAAoC,EAGpE,GAAI,CAAE,EAAI,OAOV,GAAI,GAAa,EAAG,QAAQ,aAAa,EAEzC,AAAI,GACA,QAAQ,KAAK,qGAAsG,CAAU,CAErI,CC1GA,EAAK,SAAU,CAAC,CAAE,YAAW,aAAc,CACvC,GAAkB,EAAW,EAAQ,WAAa,CAAC,CAAC,CACxD,CAAC,EAED,YAA2B,EAAW,EAAW,CAC7C,EAAU,QAAQ,GAAQ,CAEtB,GAAI,GAAU,AAAC,GAAM,CACjB,AAAI,EAAE,YAAY,EAAE,WAAW,WAAW,KAAK,CAAS,EAExD,EAAU,MAAM,KAAK,aAAc,EAAM,EAAE,QAAU,CAAC,CAAC,CAC3D,EAEA,OAAO,iBAAiB,EAAM,CAAO,EAErC,EAAU,WAAW,IAAM,OAAO,oBAAoB,EAAM,CAAO,CAAC,EAGpE,EAAU,GAAG,iBAAiB,EAAM,AAAC,GAAM,CAEvC,AAAI,CAAE,EAAE,YAGJ,EAAE,SAEF,GAAE,YAAY,EAAE,WAAW,WAAW,KAAK,EAAU,EAAE,EAE3D,EAAU,MAAM,KAAK,aAAc,EAAM,EAAE,QAAU,CAAC,CAAC,EAC3D,CAAC,CACL,CAAC,CACL,CC7BA,GAAI,IAAkB,GAAI,SAEtB,GAAiB,GAAI,KAEzB,EAAG,oBAAqB,MAAO,CAAE,YAAa,CAC1C,GAAG,EAAE,EAEL,OAAS,CAAC,EAAK,IAAU,QAAO,QAAQ,CAAM,EAC1C,KAAM,IAA8C,EAAK,SAAY,CACjE,KAAM,IAAyB,CAAK,CACxC,CAAC,CAET,CAAC,EAID,EAAG,iBAAkB,CAAC,CAAE,eAAgB,CACpC,GAAI,GAAS,EAAU,SAAS,KAAK,OAErC,AAAI,GACA,EAAO,QAAQ,AAAC,GAAQ,CACpB,AAAI,GAAe,IAAI,CAAG,GAC1B,GAAe,IAAI,CAAG,CAC1B,CAAC,CAET,CAAC,EAED,EAAG,SAAU,CAAC,CAAE,YAAW,aAAc,CACrC,GAAI,GAAU,EAAQ,QAEtB,AAAI,GACA,OAAO,QAAQ,CAAO,EAAE,QAAQ,CAAC,CAAC,EAAK,KAAa,CAChD,GAAgD,EAAW,EAAK,IAAM,CAClE,GAAI,GAAgB,GAAwB,CAAO,EAEnD,EAAO,0BAA0B,IAAM,CACnC,EAAO,SAAS,EAAU,GAAI,EAAe,CAAE,MAAS,EAAU,KAAM,CAAC,CAC7E,CAAC,CACL,CAAC,CACL,CAAC,CAET,CAAC,EAED,YAAyD,EAAW,EAAK,EAAU,CAC/E,GAAI,GAAgB,IAAI,CAAS,GAGzB,AAFiB,GAAgB,IAAI,CAAS,EAE/B,SAAS,CAAG,EAAG,OAGtC,EAAS,EAEH,GAAgB,IAAI,CAAS,GAAG,GAAgB,IAAI,EAAW,CAAC,CAAC,EAEvE,GAAI,GAAiB,GAAgB,IAAI,CAAS,EAElD,EAAe,KAAK,CAAG,EAEvB,GAAgB,IAAI,EAAW,CAAc,CACjD,CAEA,YAAiC,EAAS,CAEtC,GAAI,GAAU,AADI,wCACQ,KAAK,CAAO,EAGtC,MAFe,IAAW,EAAQ,GAAK,EAAQ,GAAG,KAAK,EAAI,EAG/D,CAEA,kBAA6D,EAAK,EAAU,CACxE,AAAI,GAAe,IAAI,CAAG,GAE1B,MAAM,GAAS,EAEf,GAAe,IAAI,CAAG,EAC1B,CAEA,kBAAwC,EAAS,CAC7C,GAAI,GAAe,GAAI,WAAU,EAAG,gBAAgB,EAAS,WAAW,EACpE,EAAU,SAAS,UAAU,EAAY,IAAI,EAEjD,OAAS,KAAS,GAAQ,SACtB,GAAI,CACA,KAAM,IAAsB,CAAK,CACrC,MAAE,CAKF,CAER,CAEA,kBAAqC,EAAO,CACxC,MAAO,IAAI,SAAQ,CAAC,EAAS,IAAW,CACpC,GAAI,GAAS,CAAK,EAAG,CACjB,GAAI,GAAS,GAAe,CAAK,EAIjC,AAAI,EAAO,IACP,GAAO,OAAS,IAAM,EAAQ,EAC9B,EAAO,QAAU,IAAM,EAAO,GAE9B,EAAQ,EAGZ,SAAS,KAAK,YAAY,CAAM,CACpC,KACI,UAAS,KAAK,YAAY,CAAK,EAE/B,EAAQ,CAEhB,CAAC,CACL,CAEA,YAAkB,EAAM,CACpB,MAAO,GAAG,QAAQ,YAAY,IAAM,QACxC,CAEA,YAAwB,EAAI,CACxB,GAAI,GAAS,SAAS,cAAc,QAAQ,EAE5C,EAAO,YAAc,EAAG,YACxB,EAAO,MAAQ,EAAG,MAElB,OAAS,KAAQ,GAAG,WAChB,EAAO,aAAa,EAAK,KAAM,EAAK,KAAK,EAG7C,MAAO,EACX,CClIA,EAAG,SAAU,CAAC,CAAE,YAAW,aAAc,CACrC,GAAI,GAAK,EAAQ,GACb,EAAM,EAAQ,IAElB,AAAI,GACA,OAAO,QAAQ,CAAE,EAAE,QAAQ,CAAC,CAAC,EAAQ,KAAU,CAC3C,GAAe,EAAW,EAAQ,IAAM,CACpC,EAAO,SAAS,EAAU,GAAI,CAAI,CACtC,CAAC,CACL,CAAC,EAGD,GACA,EAAI,QAAQ,GAAc,CACtB,EAAO,SAAS,EAAU,GAAI,CAAU,CAC5C,CAAC,CAET,CAAC,ECjBM,YAAe,EAAW,EAAI,EAAM,CACvC,GAAI,GAAa,EAAG,cAEd,EAAG,cAAc,QAAQ,YAAY,EACrC,MAEF,EAAU,SAAS,cAAc,CAAU,EAE/C,EAAQ,UAAY,EACpB,GAAI,GAEJ,GAAI,CACA,EAAkB,EAAiB,EAAG,aAAa,CACvD,MAAE,CAAW,CAEb,GAAoB,GAAQ,WAAa,GAEzC,GAAI,GAAK,EAAQ,kBAEjB,EAAG,WAAa,EAEhB,EAAQ,QAAS,CAAE,KAAI,KAAM,EAAI,WAAU,CAAC,EAE5C,EAAO,MAAM,EAAI,EAAI,CACjB,SAAU,CAAC,EAAI,EAAM,EAAc,IAAS,CACxC,GAAI,IAAY,CAAE,EAOlB,IALA,EAAQ,iBAAkB,CAAE,KAAI,OAAM,YAAW,OAAM,cAAa,CAAC,EAGjE,EAAG,qBAAuB,IAAM,GAAG,UAAY,EAAK,WAEpD,EAAG,0BAA4B,GAAQ,SAAG,UAAY,EAAK,UAAkB,EAAK,EAMtF,GAJI,EAAG,oBAAsB,IACzB,GAAG,yBAA2B,IAAM,EAAa,EAGjD,GAAkB,CAAE,GAAK,EAAG,aAAa,SAAS,IAAM,EAAU,IAAI,MAAO,GAAK,EAKtF,AAAI,GAAkB,CAAE,GAAG,GAAK,WAAa,GACjD,EAEA,QAAS,AAAC,GAAO,CACb,AAAI,GAAY,CAAE,GAElB,EAAQ,gBAAiB,CAAE,KAAI,WAAU,CAAC,CAC9C,EAEA,SAAU,CAAC,EAAI,IAAS,CACpB,AAAI,GAAY,CAAE,GAElB,EAAQ,iBAAkB,CAAE,KAAI,YAAW,MAAK,CAAC,CACrD,EAEA,QAAS,AAAC,GAAO,CACb,AAAI,GAAY,CAAE,GAElB,EAAQ,gBAAiB,CAAE,KAAI,WAAU,CAAC,CAC9C,EAEA,OAAQ,AAAC,GAAO,CACZ,EAAQ,eAAgB,CAAE,KAAI,WAAU,CAAC,CAC7C,EAEA,MAAO,AAAC,GAAO,CACX,GAAI,GAAY,CAAE,EAAG,OAErB,GAAM,GAAqB,EAAiB,CAAE,EAAE,GAEhD,EAAQ,cAAe,CAAE,IAAG,CAAC,CACjC,EAEA,IAAK,AAAC,GAAO,CACT,GAAI,IAAY,CAAE,EAElB,MAAO,GAAG,aAAa,UAAU,EAC3B,EAAG,aAAa,UAAU,EAE5B,EAAG,aAAa,SAAS,EACnB,EAAG,aAAa,SAAS,EACzB,EAAG,EACjB,EAEA,UAAW,EACf,CAAC,CACL,CAEA,YAAqB,EAAI,CACrB,MAAO,OAAO,GAAG,cAAiB,UACtC,CAEA,YAA2B,EAAI,CAC3B,MAAO,GAAG,aAAa,SAAS,CACpC,CClGA,EAAG,SAAU,CAAC,CAAE,YAAW,aAAc,CACrC,GAAI,GAAO,EAAQ,KACnB,AAAI,CAAE,GAKN,eAAe,IAAM,CACjB,eAAe,IAAM,CACjB,GAAM,EAAW,EAAU,GAAI,CAAI,CACvC,CAAC,CACL,CAAC,CACL,CAAC,ECZD,EAAG,SAAU,CAAC,CAAE,YAAW,aAAc,CACrC,GAAe,EAAW,EAAQ,YAAc,CAAC,CAAC,CACtD,CAAC,EAED,YAAwB,EAAW,EAAY,CAC3C,EAAW,QAAQ,CAAC,CAAE,OAAM,SAAS,CAAC,EAAG,OAAO,GAAO,QAAS,CAC5D,AAAI,EAAM,GAAa,EAAW,EAAM,CAAM,EACzC,AAAI,EAAI,GAAW,EAAI,EAAM,CAAM,EACnC,GAAS,EAAW,EAAM,CAAM,CACzC,CAAC,CACL,CCRA,GAAI,IAAW,GAAI,IAKnB,EAAG,iBAAkB,CAAC,CAAE,KAAI,YAAW,UAAS,eAAgB,WAAW,IAAM,CAC7E,AAAI,EAAU,QAAU,UAIxB,EAAG,iBAAiB,SAAU,IAAM,CAIhC,GAAI,GAAc,EAAU,WAAW,WAAW,SAAS,EACrD,EAAU,OAAO,GACjB,EAAU,GAEZ,EAAU,GAAY,CAAE,EAE5B,GAAS,IAAI,EAAa,CAAO,CACrC,CAAC,CACL,CAAC,CAAC,EAEF,EAAG,SAAU,CAAC,CAAE,YAAW,aAAc,CACrC,EAAQ,IAAM,CACV,GAAS,KAAK,EAAU,GAAI,GAAK,EAAE,CAAC,EACpC,GAAS,OAAO,EAAU,EAAE,CAChC,CAAC,CACL,CAAC,EAED,YAAqB,EAAQ,CACzB,GAAI,GAAQ,CAAC,EAEb,SAAO,KAAK,EAAQ,CAAC,EAAI,IAAS,CAC9B,GAAI,EAAE,EAAO,SAAS,CAAE,EAExB,IAAI,EAAG,aAAa,aAAa,EAAG,MAAO,GAAK,EAEhD,AAAI,GAAmB,CAAE,EACrB,EAAM,KAAK,GAAa,CAAE,CAAC,EACpB,GAAmB,CAAE,GAC5B,EAAM,KAAK,GAAa,CAAE,CAAC,EAEnC,CAAC,EAEM,IAAM,CACT,KAAO,EAAM,OAAS,GAAG,EAAM,MAAM,EAAE,CAC3C,CACJ,CAEA,YAA4B,EAAI,CAC5B,GAAI,GAAM,EAAG,QAAQ,YAAY,EAIjC,MAFI,KAAQ,UACR,IAAQ,UAAY,EAAG,OAAS,UAChC,IAAQ,SAAY,GAAG,OAAS,YAAc,EAAG,OAAS,QAGlE,CAEA,YAA4B,EAAI,CAC5B,MAAO,CAAC,QAAS,UAAU,EAAE,SAAS,EAAG,QAAQ,YAAY,CAAC,CAClE,CAEA,YAAsB,EAAI,CACtB,GAAI,GAAO,EAAG,SACR,IAAM,CAAC,EACP,IAAM,EAAG,SAAW,GAE1B,SAAG,SAAW,GAEP,CACX,CAEA,YAAsB,EAAI,CACtB,GAAI,GAAO,EAAG,SACR,IAAM,CAAC,EACP,IAAM,EAAG,SAAW,GAE1B,SAAG,SAAW,GAEP,CACX,CCpFA,EAAG,iBAAkB,CAAC,CAAE,aAAc,CAClC,EAAQ,QAAQ,GAAU,CACtB,GAAI,GAAY,EAAO,UAEvB,GAA4B,EAAW,GAAS,CAC5C,EAAM,MAAM,QAAQ,CACxB,CAAC,CACL,CAAC,CACL,CAAC,EAID,EAAG,gBAAiB,CAAC,CAAE,WAAY,CAG/B,AAFc,GAAiB,CAAK,EAE5B,QAAQ,GAAU,CACtB,GAAI,GAAY,EAAO,UAEvB,GAA4B,EAAW,GAAS,CAC5C,GAA2B,EAAO,EAAW,CAAK,CACtD,CAAC,CACL,CAAC,CACL,CAAC,EAED,YAA0B,EAAO,CAC7B,GAAI,GAAU,CAAC,EAEf,SAAM,QAAQ,GAAQ,CAClB,EAAK,QAAQ,QAAQ,GAAU,CAC3B,EAAQ,KAAK,CAAM,CACvB,CAAC,CACL,CAAC,EAEM,CACX,CAEA,YAAoC,EAAO,EAAW,EAAkB,CACpE,GAAI,GAAO,GAAsB,EAAO,CAAS,EAE7C,EAAc,GAAsB,EAAO,CAAgB,EAE3D,EAAgB,EAAY,sBAAsB,CAAgB,EAGtE,EAAY,OAAO,CAAa,EAEhC,EAAK,IAAI,CAAa,EAGtB,EAAM,QAAQ,GAAQ,CAClB,AAAI,EAAK,MAAM,GAAG,EAAM,OAAO,CAAI,CACvC,CAAC,CACL,CAEA,YAA+B,EAAO,EAAW,CAC7C,OAAS,CAAC,EAAK,IAAS,GAAM,QAAQ,EAClC,GAAI,EAAK,aAAa,CAAS,EAAG,MAAO,EAEjD,CAEA,YAAqC,EAAW,EAAU,CACtD,GAAgB,EAAW,GAAS,CAChC,AAAI,IAAiB,CAAK,GAAK,GAAyB,CAAK,IACzD,EAAS,CAAK,CAEtB,CAAC,CACL,CAEA,YAA0B,EAAW,CAIjC,MAAO,CAAC,CAFI,AADD,EAAU,SAAS,KACb,KAGrB,CAEA,YAAkC,EAAW,CAIzC,MAAO,CAAC,CAFO,AADJ,EAAU,SAAS,KACV,QAGxB,CAEA,YAAyB,EAAW,EAAU,CAC1C,EAAU,SAAS,QAAQ,GAAS,CAChC,EAAS,CAAK,EAEd,GAAgB,EAAO,CAAQ,CACnC,CAAC,CACL,CC1FA,EAAG,SAAU,CAAC,CAAE,aAAc,CAC1B,EAAQ,CAAC,CAAE,aAAc,CACrB,GAAI,GAAW,EAAQ,SAEvB,GAAI,CAAE,EAAU,OAGhB,GAAI,GAAY,OAAO,WAAa,OAAO,IAEvC,EAAM,EAAU,gBAChB,GAAa,EAAS,QAAS,EAAS,WAAW,CACvD,EAEI,EAAgB,SAAS,cAAc,GAAG,EAE9C,EAAc,MAAM,QAAU,OAC9B,EAAc,KAAO,EACrB,EAAc,SAAW,EAAS,KAElC,SAAS,KAAK,YAAY,CAAa,EAEvC,EAAc,MAAM,EAEpB,WAAW,UAAW,CAClB,EAAU,gBAAgB,CAAG,CACjC,EAAG,CAAC,CACR,CAAC,CACL,CAAC,EAED,YAAsB,EAAS,EAAc,GAAI,EAAY,IAAK,CAC9D,GAAM,GAAiB,KAAK,CAAO,EAC7B,EAAa,CAAC,EAEpB,AAAI,IAAgB,MAAM,GAAc,IAExC,OAAS,GAAS,EAAG,EAAS,EAAe,OAAQ,GAAU,EAAW,CACtE,GAAI,GAAQ,EAAe,MAAM,EAAQ,EAAS,CAAS,EAEvD,EAAc,GAAI,OAAM,EAAM,MAAM,EAExC,OAAS,GAAI,EAAG,EAAI,EAAM,OAAQ,IAC9B,EAAY,GAAK,EAAM,WAAW,CAAC,EAGvC,GAAI,GAAY,GAAI,YAAW,CAAW,EAE1C,EAAW,KAAK,CAAS,CAC7B,CAEA,MAAO,IAAI,MAAK,EAAY,CAAE,KAAM,CAAY,CAAC,CACrD,CClDA,GAAI,IAAgC,GAAI,SAEpC,GAAwB,GAAI,SAEhC,EAAG,iBAAkB,CAAC,CAAE,eAAgB,CACpC,GAAI,GAAO,EAAU,SAAS,KAG9B,AAAI,EAAK,aAAe,QAExB,IAAsB,IAAI,CAAS,EAI/B,EAAK,eAAiB,QAAa,EAAK,eAAiB,IACzD,GAA8B,IAAI,CAAS,EAEnD,CAAC,EAED,EAAG,iBAAkB,CAAC,CAAE,aAAc,CAClC,EAAQ,QAAQ,GAAU,CAEtB,AAAI,CAAE,GAAsB,IAAI,EAAO,SAAS,GAEhD,CAAI,GAA8B,IAAI,EAAO,SAAS,EAClD,GAAO,QAAU,GAEjB,GAA8B,OAAO,EAAO,SAAS,GAErD,EAAO,QAAU,GAIrB,GAAsB,OAAO,EAAO,SAAS,EACjD,CAAC,CACL,CAAC,EChCD,EAAG,SAAU,CAAC,CAAE,YAAW,UAAS,aAAc,CAC9C,GAAI,GAAc,EAAQ,IAE1B,AAAI,CAAE,GAEN,OAAO,QAAQ,CAAW,EAAE,QAAQ,CAAC,CAAC,EAAK,KAAW,CAClD,GAAI,CAAE,OAAM,KAAI,MAAK,aAAY,UAAW,GAA0B,EAAK,CAAK,EAEhF,AAAM,GAAI,GAAK,GAEf,GAAI,GAAe,CAAC,GAAO,KAAM,MAAS,EAAE,SAAS,CAAM,EAAI,EAAQ,EAAU,UAAW,CAAI,EAAI,EAEhG,CAAE,UAAS,OAAM,OAAQ,GAAM,EAAI,EAAc,EAAY,CAAM,EAEvE,GAAI,IAAQ,UAAW,CACnB,GAAI,GAAkB,EAAO,OAAO,IAAM,CACtC,EAAQ,EAAQ,EAAU,SAAU,CAAI,CAAC,CAC7C,CAAC,EAED,EAAQ,IAAM,EAAO,QAAQ,CAAe,CAAC,CACjD,SAAW,IAAQ,OAAQ,CACvB,GAAI,GAAsB,EAAG,SAAU,CAAC,CAAE,UAAW,EAAiB,aAAc,CAChF,GAAI,IAAc,EAAiB,OAEnC,GAAI,GAAc,EAAQ,EAAU,UAAW,CAAI,EAEnD,EAAQ,IAAM,CACV,GAAI,GAAa,EAAQ,EAAU,UAAW,CAAI,EAElD,AAAI,KAAK,UAAU,CAAW,IAAM,KAAK,UAAU,CAAU,GAE7D,EAAK,CAAU,CACnB,CAAC,CACL,CAAC,EAEG,EAAmB,EAAI,KAAM,IAAY,CACzC,KAAM,GAAU,MAAM,IAAI,EAAM,CAAQ,EAGxC,SAAS,iBAAiB,OAAO,EAAE,QAAQ,GAAM,CAC7C,EAAG,qBAAuB,EAAG,oBAAoB,EAAG,SAAS,IAAI,CAAC,CACtE,CAAC,CACL,CAAC,EAED,EAAQ,IAAM,CACV,EAAoB,EACpB,EAAiB,CACrB,CAAC,CACL,CACJ,CAAC,CACL,CAAC,EAED,YAAmC,EAAK,EAAO,CAC3C,GAAI,GAAW,CAAE,IAAK,UAAW,WAAY,EAAM,EAEnD,MAAI,OAAO,IAAU,SACV,CAAC,GAAG,EAAU,KAAM,EAAO,GAAI,CAAM,EAIrC,CAAC,GAFa,CAAC,GAAG,EAAU,KAAM,EAAK,GAAI,CAAI,EAE3B,GAAG,CAAM,CAE5C,CChEA,EAAG,UAAW,CAAC,CAAE,aAAc,CAC3B,AAAI,OAAO,MACP,GAAQ,QAAQ,eAAiB,OAAO,KAAK,SAAS,EAE9D,CAAC,EAED,EAAG,SAAU,CAAC,CAAE,YAAW,aAAc,CAGrC,AAFgB,GAAQ,WAAa,CAAC,GAE5B,QAAQ,GAAS,CACvB,GAAI,EAAM,WAAW,MAAM,EAAG,CAC1B,GAAI,MAAO,QAAO,KAAS,IAAa,CACpC,QAAQ,KAAK,8BAA8B,EAE3C,MACJ,CAEA,GAAI,GAAc,EAAM,MAAM,mBAAmB,EAEjD,AAAI,EAAY,IAAM,SAClB,EAAY,OAAO,EAAG,EAAG,UAAW,MAAS,EAG7C,EAAY,IAAM,gBAClB,EAAY,KAAK,OAAW,MAAS,EAGzC,GAAI,CACA,EACA,EACA,EACA,EACA,EACA,EACA,GACA,EAEJ,GAAI,CAAC,UAAW,UAAW,kBAAkB,EAAE,SAAS,CAAY,EAAG,CACnE,GAAI,GAAU,GAAK,GAAa,EAAW,EAAO,CAAC,CAAC,CAAC,EAErD,OAAO,KAAK,GAAc,CAAO,EAAE,OAAO,EAAY,CAAO,EAE7D,EAAU,WAAW,IAAM,CACvB,OAAO,KAAK,GAAc,CAAO,EAAE,cAAc,EAAY,CAAO,CACxE,CAAC,CACL,SAAW,GAAgB,WACvB,GAAI,CAAC,OAAQ,UAAW,SAAS,EAAE,SAAS,CAAU,EAClD,OAAO,KAAK,KAAK,CAAO,EAAE,GAAY,GAAK,CACvC,GAAa,EAAW,EAAO,CAAC,CAAC,CAAC,CACtC,CAAC,MAGC,CACF,GAAI,GAAU,GAAK,GAAa,EAAW,EAAO,CAAC,CAAC,CAAC,EAErD,OAAO,KAAK,KAAK,CAAO,EAAE,OAAO,EAAY,CAAO,EAEpD,EAAU,WAAW,IAAM,CACvB,OAAO,KAAK,aAAa,CAAO,CACpC,CAAC,CACL,KACG,AAAI,IAAgB,eACvB,OAAO,KAAK,QAAQ,CAAO,EAAE,aAAa,GAAgB,CACtD,GAAa,EAAW,EAAO,CAAC,CAAY,CAAC,CACjD,CAAC,EAID,QAAQ,KAAK,qCAAqC,CAE1D,CACJ,CAAC,CACL,CAAC,ECzED,GAAI,IAA4B,GAAI,SAEpC,EAAG,iBAAkB,CAAC,CAAE,eAAgB,CAIpC,AAAI,AAHO,EAAU,SAAS,KAGrB,UAAY,IAErB,GAA0B,IAAI,CAAS,CAC3C,CAAC,EAED,EAAG,iBAAkB,CAAC,CAAE,aAAc,CAClC,EAAQ,QAAQ,GAAU,CAEtB,AAAI,CAAE,GAA0B,IAAI,EAAO,SAAS,GAEpD,GAAO,QAAU,GACrB,CAAC,CACL,CAAC,ECnBD,GAAsB,GAAK,OAAO,SAAS,mBAAmB,EAE9D,SAAS,iBAAiB,kBAAmB,GAAK,GAAa,oBAAqB,CAAC,CAAC,EACtF,SAAS,iBAAiB,oBAAqB,GAAK,GAAa,sBAAuB,CAAC,CAAC,EAC1F,SAAS,iBAAiB,mBAAoB,GAAK,GAAa,qBAAsB,CAAC,CAAC,EAExF,YAAsB,EAAM,EAAU,CAClC,GAAI,GAAQ,GAAI,aAAY,EAAM,CAAE,WAAY,GAAM,QAAS,GAAM,OAAQ,EAAS,MAAO,CAAC,EAE9F,SAAS,cAAc,CAAK,EAExB,EAAM,kBACN,EAAS,eAAe,CAEhC,CAEO,YAAuC,EAAS,EAAK,EAAI,CAG5D,AAFoB,EAAQ,sBAGxB,OAAO,SAAS,CAAG,EAEnB,EAAG,CAEX,CAEA,aAAiC,CAG7B,MAFO,YAAS,cAAc,wBAAwB,GAElD,OAAO,sBAAwB,OAAO,qBAAqB,cAAgB,GAGnF,CC9BA,EAAG,SAAU,CAAC,CAAE,aAAc,CAC1B,GAAI,CAAE,EAAQ,SAAa,OAE3B,GAAI,GAAM,EAAQ,SAElB,GAA8B,EAAS,EAAK,IAAM,CAC9C,OAAO,SAAS,KAAO,CAC3B,CAAC,CACL,CAAC,ECPD,EAAG,cAAe,CAAC,CAAE,QAAS,CAC1B,EAAG,eAAiB,EACxB,CAAC,EAED,EAAU,aAAc,CAAC,CAAE,KAAI,YAAW,YAAW,aAAc,CAC/D,GAAI,GAAa,EAAO,SAAS,CAAE,MAAO,GAAG,cAA8B,CAAC,EAG5E,EAAO,KAAK,EAAI,CACZ,CAAC,EAAU,QAAQ,QAAQ,QAAS,IAAI,GAAI,GAC5C,UAAW,CAAE,MAAO,GAAW,KAAM,CACzC,CAAC,EAGD,EAAG,gBAAkB,WAAW,IAAM,EAAW,MAAQ,EAAI,EAE7D,GAAI,GAAW,CAAC,EAEhB,EAAS,KAAK,EAAG,iBAAkB,CAAC,CAAE,KAAI,UAAW,CAEjD,EAAK,EAGL,EAAG,iBAAiB,gBAAiB,IAAM,CAEvC,EAAG,OAAO,CACd,CAAC,EAGD,EAAW,MAAQ,GAEnB,EAAS,KAAK,EAAG,QAAS,CAAC,CAAE,UAAW,KAAqB,CACzD,AAAI,IAAmB,GAIvB,GAAG,OAAO,EAEV,EAAS,QAAQ,GAAK,EAAE,CAAC,EAC7B,CAAC,CAAC,CACN,CAAC,CAAC,EAEF,EAAQ,IAAM,EAAS,QAAQ,GAAK,EAAE,CAAC,CAAC,CAC5C,CAAC,EC7CD,GAAI,IAAuB,GAAI,IAsCxB,YAAwC,EAAW,EAAU,CAOhE,GAAqB,KAAK,EAAW,GAAoB,CACrD,EAAiB,SAAS,EAC1B,EAAiB,SAAW,IAAM,CAAE,CACxC,CAAC,EAED,EAAS,CACb,CChDA,EAAG,iBAAkB,CAAC,CAAE,KAAI,YAAW,UAAS,eAAgB,CAE5D,GADI,CAAC,WAAY,UAAW,QAAS,OAAQ,UAAW,OAAQ,SAAU,KAAM,OAAQ,MAAO,SAAU,OAAO,EAAE,SAAS,EAAU,KAAK,GACtI,GAAiC,EAAU,KAAK,EAAG,OAEvD,GAAI,GAAY,EAAU,QAAQ,QAAQ,QAAS,OAAO,EAG1D,AAAI,EAAU,QAAU,UAAY,CAAE,EAAU,UAAU,SAAS,SAAS,GACxE,GAAY,EAAY,YAG5B,GAAI,GAAiB,EAAO,KAAK,EAAI,CACjC,CAAC,GAAW,EAAG,CACX,GAAI,GAAU,IAAM,CAChB,GAA+B,EAAW,IAAM,CAE5C,EAAO,SAAS,EAAI,SAAS,EAAU,WAAY,CAAE,MAAO,CAAE,OAAQ,CAAE,CAAC,CAAC,CAC9E,CAAC,CACL,EAGA,AAAI,EAAG,mBACH,EAAG,mBAAmB,IAAM,CACxB,EAAQ,CACZ,EAAG,IAAM,CACL,EAAE,yBAAyB,CAC/B,CAAC,EAED,EAAQ,CAEhB,CACJ,CAAC,EAED,EAAQ,CAAc,CAC1B,CAAC,ECrCD,EAAO,gBAAgB,IAAM,mBAAmB,EAChD,EAAO,gBAAgB,IAAM,2BAA2B,EAExD,EAAO,cACH,EAAO,gBAAgB,GAAM,CACzB,AAAI,EAAG,aAAa,eAAe,EAC/B,EAAO,KAAK,EAAI,CAAE,CAAC,cAAe,EAAK,CAAC,EACjC,EAAG,aAAa,qBAAqB,GAC5C,EAAO,KAAK,EAAI,CAAE,CAAC,oBAAqB,EAAK,CAAC,CAEtD,CAAC,CACL,EAEA,SAAS,iBAAiB,oBAAqB,IAAM,CAGjD,SAAS,IAAI,EAAE,QAAQ,GAAa,CAChC,EAAU,oCAAoC,CAClD,CAAC,CACL,CAAC,ECnBD,EAAU,UAAW,CAAC,CAAE,KAAI,eAAgB,CACxC,GAAI,GAAU,EAAU,WACpB,EAAe,EAAU,UAAU,SAAS,QAAQ,EAGxD,EAAU,EAAQ,WAAW,MAAO;AAAA,CAAI,EAEpC,IAAY,IAAI,GAAU,iBAE9B,EAAG,mBAAqB,CAAC,EAAQ,IAAY,CACzC,GAAI,EAAc,CACd,GAAI,CAAC,EAAU,GAAY,EAAQ,MAAM,GAAG,EAE5C,AAAM,EAKF,AAAI,AAFQ,OAAO,CAAQ,IAEb,EACV,EAAO,EAEP,EAAQ,EAPZ,QAAQ,KAAK,6DAA6D,CAUlF,KACI,AAAI,SAAQ,CAAO,EAAG,EAAO,EACxB,EAAQ,CAErB,CACJ,CAAC,EC9BM,YAAqC,EAAI,EAAW,EAAU,EAAgB,KAAM,CAGvF,GAFA,EAAW,EAAU,UAAU,SAAS,QAAQ,EAAI,CAAE,EAAW,EAE7D,EAAU,UAAU,SAAS,OAAO,EAAG,CACvC,GAAI,GAAU,EAAU,WAAW,MAAM,GAAG,EAAE,OAAO,MAAM,EAE3D,AAAI,EACA,EAAG,UAAU,IAAI,GAAG,CAAO,EAE3B,EAAG,UAAU,OAAO,GAAG,CAAO,CAEtC,SAAW,EAAU,UAAU,SAAS,MAAM,EAC1C,AAAI,EACA,EAAG,aAAa,EAAU,WAAY,EAAI,EAE1C,EAAG,gBAAgB,EAAU,UAAU,MAExC,CACH,GAAI,GAAQ,GAAiB,OACxB,iBAAiB,EAAI,IAAI,EACzB,iBAAiB,SAAS,EAE3B,EAAW,CAAC,SAAU,QAAS,QAAS,OAAQ,OAAQ,aAAa,EACpE,OAAO,GAAK,EAAU,UAAU,SAAS,CAAC,CAAC,EAAE,IAAM,eAIxD,EAAW,EAAU,UAAU,SAAS,QAAQ,GAAK,CAAE,EACjD,EAAQ,EAEd,EAAG,MAAM,QAAU,EAAW,EAAU,MAC5C,CACJ,CC9BA,GAAI,IAAkB,GAAI,KACtB,GAAiB,GAAI,KAEzB,OAAO,iBAAiB,UAAW,IAAM,GAAgB,QAAQ,GAAK,EAAE,CAAC,CAAC,EAC1E,OAAO,iBAAiB,SAAU,IAAM,GAAe,QAAQ,GAAK,EAAE,CAAC,CAAC,EAExE,EAAU,UAAW,CAAC,CAAE,KAAI,YAAW,aAAc,CACjD,GAAI,GAAa,IAAM,GAA4B,EAAI,EAAW,EAAI,EAClE,EAAY,IAAM,GAA4B,EAAI,EAAW,EAAK,EAEtE,GAAgB,IAAI,CAAU,EAC9B,GAAe,IAAI,CAAS,EAE5B,EAAQ,IAAM,CACV,GAAgB,OAAO,CAAU,EACjC,GAAe,OAAO,CAAS,CACnC,CAAC,CACL,CAAC,ECfD,EAAU,UAAW,CAAC,CAAE,KAAI,YAAW,YAAW,aAAc,CAC5D,GAAI,CAAE,UAAS,YAAa,GAAW,CAAE,EAErC,CAAC,EAAO,GAAc,GAAW,CAAS,EAE1C,EAAW,GAA4B,EAAW,EAAS,EAAU,CACrE,IAAM,EAAM,IAAM,GAA4B,EAAI,EAAW,EAAI,CAAC,EAClE,IAAM,EAAW,IAAM,GAA4B,EAAI,EAAW,EAAK,CAAC,CAC5E,CAAC,EAEG,EAAW,GAA+B,EAAW,EAAS,CAC9D,IAAM,EAAM,IAAM,GAA4B,EAAI,EAAW,EAAI,CAAC,EAClE,IAAM,EAAW,IAAM,GAA4B,EAAI,EAAW,EAAK,CAAC,CAC5E,CAAC,EAED,EAAQ,IAAM,CACV,EAAS,EACT,EAAS,CACb,CAAC,CACL,CAAC,EAED,YAAoB,EAAW,CAC3B,GAAI,CAAE,EAAU,UAAU,SAAS,OAAO,GAAK,EAAU,UAAU,SAAS,MAAM,EAAG,MAAO,CAAC,GAAK,EAAE,EAAG,GAAK,EAAE,CAAC,EAE/G,GAAI,GAAW,IAEX,EAAiB,CACjB,SAAY,GACZ,QAAW,IACX,MAAS,IACT,QAAW,IACX,KAAQ,IACR,OAAU,IACV,QAAW,GACf,EAEA,OAAO,KAAK,CAAc,EAAE,KAAK,GAAO,CACpC,GAAI,EAAU,UAAU,SAAS,CAAG,EAChC,SAAW,EAAe,GAEnB,EAEf,CAAC,EAED,GAAI,GACA,EAAU,GAEd,MAAO,CACH,AAAC,GAAa,CACV,EAAU,WAAW,IAAM,CACvB,EAAS,EAET,EAAU,EACd,EAAG,CAAQ,CACf,EACA,KAAO,IAAa,CAChB,AAAI,EACA,MAAM,GAAS,EACf,EAAU,IAEV,aAAa,CAAO,CAE5B,CACJ,CACJ,CAEA,YAAqC,EAAW,EAAS,EAAU,CAAE,EAAc,GAAc,CAC7F,MAAO,GAAG,SAAU,CAAC,CAAE,UAAW,EAAY,OAAQ,EAAS,aAAc,CACzE,AAAI,IAAe,GAEf,GAAQ,OAAS,GAAK,GAAgB,EAAS,CAAO,IAAM,GAEhE,GAAa,EAEb,EAAQ,IAAM,CACV,EAAW,CACf,CAAC,GACL,CAAC,CACL,CAEA,YAAwC,EAAW,EAAS,CAAE,EAAc,GAAc,CACtF,GAAI,GAAgB,GAAK,CACrB,GAAI,CAAE,KAAI,YAAa,EAAE,OAGzB,MADI,KAAO,EAAU,IACjB,EAAQ,OAAS,GAAK,CAAE,EAAQ,IAAI,GAAK,EAAE,MAAM,EAAE,SAAS,CAAQ,CAG5E,EAEI,EAAW,GAAO,OAAQ,wBAAyB,GAAK,CACxD,AAAI,EAAc,CAAC,GAEnB,EAAa,CACjB,CAAC,EAEG,EAAW,GAAO,OAAQ,yBAA0B,GAAK,CACzD,AAAI,EAAc,CAAC,GAEnB,EAAW,CACf,CAAC,EAEG,EAAW,GAAO,OAAQ,wBAAyB,GAAK,CACxD,AAAI,EAAc,CAAC,GAEnB,EAAW,CACf,CAAC,EAED,MAAO,IAAM,CACT,EAAS,EACT,EAAS,EACT,EAAS,CACb,CACJ,CAEA,YAAyB,EAAS,EAAS,CACvC,GAAI,CAAE,UAAS,SAAU,EAEzB,MAAO,GAAQ,KAAK,CAAC,CAAE,SAAQ,YAAa,CACxC,GAAI,EACA,MAAO,GAAM,KAAK,CAAC,CAAE,SAAQ,OAAQ,KAC1B,IAAW,GACX,IAAW,GAAU,KAAK,UAAU,CAAY,CAAC,CAC3D,EAgBL,GAbwB,OAAO,KAAK,CAAO,EAAE,KAAK,GAE1C,EAAS,SAAS,GAAG,GAGjB,AAFe,EAAS,MAAM,GAAG,EAAE,KAElB,EAAe,GAGjC,IAAa,CACvB,GAIG,EAAM,IAAI,GAAK,EAAE,MAAM,EAAE,SAAS,CAAM,EAAG,MAAO,EAC1D,CAAC,CACL,CAEA,YAAoB,EAAI,CACpB,GAAI,GAAa,GAAc,CAAE,EAE7B,EAAU,CAAC,EAEX,EAAW,GAEf,GAAI,EAAW,IAAI,QAAQ,EAAG,CAC1B,GAAI,GAAY,EAAW,IAAI,QAAQ,EAEnC,EAAM,EAAU,WAEpB,AAAI,EAAU,UAAU,SAAS,QAAQ,GAAG,GAAW,IAEvD,AAAI,EAAI,SAAS,GAAG,GAAK,EAAI,SAAS,GAAG,EACrC,EAAQ,KAAK,CAAE,OAAQ,EAAU,OAAQ,OAAQ,GAAU,KAAK,UAAU,EAAU,MAAM,CAAC,CAAE,CAAC,EAC3F,AAAI,EAAI,SAAS,GAAG,EACvB,EAAI,MAAM,GAAG,EAAE,IAAI,GAAK,EAAE,KAAK,CAAC,EAAE,QAAQ,GAAU,CAChD,EAAQ,KAAK,CAAE,QAAO,CAAC,CAC3B,CAAC,EAED,EAAQ,KAAK,CAAE,OAAQ,CAAI,CAAC,CAEpC,KAAO,CAGH,GAAI,GAAqC,CAAE,OAAQ,QAAS,UAAW,SAAU,UAAW,OAAQ,SAAU,MAAO,IAAK,EAE1H,EACK,IAAI,EACJ,OAAO,GAAK,CAAE,EAAmC,SAAS,EAAE,KAAK,CAAC,EAClE,IAAI,GAAK,EAAE,WAAW,MAAM,GAAG,EAAE,EAAE,EACnC,QAAQ,GAAU,EAAQ,KAAK,CAAE,QAAO,CAAC,CAAC,CACnD,CAEA,MAAO,CAAE,UAAS,UAAS,CAC/B,CAEA,YAAmB,EAAS,CACxB,MAAO,MAAK,mBAAmB,CAAO,CAAC,CAC3C,CCxLA,EAAU,SAAU,CAAC,CAAC,KAAI,YAAW,aAAc,CAC/C,GAAI,CAAE,aAAY,aAAc,EAE5B,EAAM,EAAG,SAAU,CAAC,CAAE,OAAM,UAAS,aAAc,CACnD,AAAI,IAAS,GAEb,CAAI,EAAU,SAAS,SAAS,GAAK,EACjC,EAAG,UAAY,EAEf,EAAG,UAAY,EAAG,UAAY,EAEtC,CAAC,EAED,EAAQ,CAAG,CACf,CAAC,EAED,EAAG,UAAW,CAAC,CAAE,aAAc,CAC3B,EAAQ,GAAiB,CACrB,GAAI,GAAW,EAAc,SAE7B,AAAI,CAAE,EAAS,QAAQ,IAAI,mBAAmB,GAE9C,GAAc,SAAW,CACrB,GAAI,GACJ,WAAY,GACZ,OAAQ,IAER,KAAM,OAAO,CACT,GAAI,GAAgB,KAAM,IAAsC,EAAU,GAAY,CAClF,EAAQ,SAAU,CAAQ,CAC9B,CAAC,EAED,MAAI,IAAkB,CAAa,GAC/B,MAAK,GAAK,IAGP,CACX,CACJ,EACJ,CAAC,CACL,CAAC,EAED,kBAAqD,EAAU,EAAU,CACrE,GAAI,GAAS,EAAS,KAAK,UAAU,EACjC,EAAoB,GAExB,OAAa,CACT,GAAI,CAAE,OAAM,MAAO,GAAU,KAAM,GAAO,KAAK,EAG3C,EAAS,AADC,GAAI,eACG,OAAO,CAAK,EAE7B,CAAE,EAAS,GAAc,GAAqB,EAAoB,CAAM,EAQ5E,GANA,EAAQ,QAAQ,GAAU,CACtB,EAAS,CAAM,CACnB,CAAC,EAED,EAAoB,EAEhB,EAAM,MAAO,EACrB,CACJ,CAEA,YAA8B,EAAK,CAC/B,GAAI,GAAQ,wCAER,EAAU,EAAI,MAAM,CAAK,EAEzB,EAAS,CAAC,EAEd,GAAI,EACA,OAAS,GAAI,EAAG,EAAI,EAAQ,OAAQ,IAChC,EAAO,KAAK,KAAK,MAAM,EAAQ,EAAE,EAAE,IAAI,EAI/C,GAAI,GAAY,EAAI,QAAQ,EAAO,EAAE,EAErC,MAAO,CAAE,EAAQ,CAAU,CAC/B,CClFA,EAAU,UAAW,CAAC,CAAE,KAAI,eAAgB,CACxC,AAAI,EAAU,UAAU,SAAS,MAAM,EACnC,EAAG,wBAA0B,GAE7B,EAAG,mBAAqB,EAEhC,CAAC,ECND,EAAU,SAAU,CAAC,CAAE,KAAI,eAAgB,CACvC,AAAI,EAAU,UAAU,SAAS,MAAM,EACnC,EAAG,uBAAyB,GAE5B,EAAG,kBAAoB,EAE/B,CAAC,ECHD,GAAI,IAAgC,GAAI,IAExC,EAAG,SAAU,CAAC,CAAE,YAAW,aAAc,CACrC,EAAQ,IAAM,CACV,WAAW,IAAM,CACb,GAA8B,KAAK,EAAW,GAAK,EAAE,EAAK,CAAC,CAC/D,CAAC,CACL,CAAC,CACL,CAAC,EAED,EAAU,QAAS,CAAC,CAAE,KAAI,YAAW,eAAgB,CACjD,GAAI,GAAU,GAAa,CAAE,EAEzB,EAAQ,OAAO,SAAS,CAAE,MAAO,EAAM,CAAC,EAExC,EAAa,GAEb,EAAiB,EAAG,MAAM,QAE1B,EAAoB,AAAC,GAAY,CACjC,GAA4B,EAAI,EAAW,EAAS,CAAc,EAElE,EAAa,CACjB,EAEA,GAA8B,IAAI,EAAW,CAAiB,EAE9D,OAAO,OAAO,IAAM,CAChB,GAAI,GAAU,GAEd,GAAI,EAAQ,SAAW,EACnB,EAAU,KAAK,UAAU,EAAU,SAAS,IAAM,KAAK,UAAU,EAAU,QAAQ,MAEnF,QAAS,GAAI,EAAG,EAAI,EAAQ,QACpB,GAD4B,IAAK,CAGrC,GAAI,GAAS,EAAQ,GAErB,EAAU,KAAK,UAAU,EAAQ,EAAU,UAAW,CAAM,CAAC,IAAM,KAAK,UAAU,EAAQ,EAAU,SAAU,CAAM,CAAC,CACzH,CAGJ,AAAI,IAAe,GACf,EAAkB,CAAO,EAG7B,EAAa,CACjB,CAAC,CACL,CAAC,EAED,YAAsB,EAAI,CACtB,GAAI,GAAa,GAAc,CAAE,EAC7B,EAAU,CAAC,EAEf,MAAI,GAAW,IAAI,OAAO,GACtB,EAAQ,KAAK,EAAW,IAAI,OAAO,EAAE,UAAU,EAG/C,EAAW,IAAI,QAAQ,GACvB,GAAU,EAAQ,OACd,EACC,IAAI,QAAQ,EACZ,WAAW,MAAM,GAAG,EACpB,IAAI,GAAK,EAAE,KAAK,CAAC,CACtB,GAGG,CACX,CCnEA,EAAU,QAAS,CAAC,CAAE,KAAI,YAAW,YAAW,aAAc,CAC1D,GAAI,CAAE,aAAY,aAAc,EAEhC,GAAI,CAAE,EACF,MAAO,SAAQ,KAAK,6CAA8C,CAAE,EAGxE,GAAI,GAA2B,EAAW,CAAU,EAChD,MAAO,SAAQ,KAAK,0BAA0B,EAAW,6CAA6C,EAAU,KAAK,IAAK,CAAE,EAIhI,GAAI,EAAG,MAAQ,EAAG,KAAK,YAAY,IAAM,OACrC,MAAO,IAAiB,EAAI,EAAY,EAAW,CAAO,EAG9D,GAAI,GAAS,EAAU,SAAS,MAAM,EAClC,EAAS,EAAU,SAAS,MAAM,GAAK,EAAU,SAAS,QAAQ,EAClE,EAAS,EAAU,SAAS,MAAM,EAClC,EAAc,EAAU,SAAS,UAAU,EAG3C,EAAS,EAAW,WAAW,SAAS,EACtC,IAAM,EAAU,MAAM,QAAQ,QAAQ,EACtC,IAAM,EAAU,MAAM,QAAQ,EAIhC,EAAkB,GAAY,CAAE,GAAK,CAAE,GAAe,EACpD,GAAS,EAAQ,GAAG,EACpB,EAEN,EAAO,KAAK,EAAI,CACZ,CAAC,YAAa,CACV,GAAU,EAAO,CACrB,EACA,CAAC,UAAW,CACR,GAAU,EAAO,CACrB,EACA,CAAC,UAAY,GAAgB,CAAS,IAAK,CACvC,MAAO,CACH,KAAM,CACF,MAAO,GAAQ,EAAU,MAAO,CAAU,CAC9C,EACA,IAAI,EAAO,CACP,GAAQ,EAAU,MAAO,EAAY,CAAK,EAE1C,GAAW,CAAE,GAAY,CAAE,GAAW,EAAgB,CAC1D,CACJ,CACJ,CACJ,CAAC,CACL,CAAC,EAED,YAAyB,EAAW,CAKhC,MAJA,GAAY,EAAU,OAAO,GAAK,CAAE,CAChC,OAAQ,OACZ,EAAE,SAAS,CAAC,CAAC,EAET,EAAU,SAAW,EAAU,GAE5B,IAAM,EAAU,KAAK,GAAG,CACnC,CAEA,YAAqB,EAAI,CACrB,MACI,CAAC,QAAS,UAAU,EAAE,SAAS,EAAG,QAAQ,YAAY,CAAC,GACvD,CAAC,CAAC,WAAY,OAAO,EAAE,SAAS,EAAG,IAAI,CAE/C,CAUA,YAAoC,EAAW,EAAU,CACrD,GAAI,EAAS,WAAW,SAAS,EAAG,CAChC,GAAI,GAAS,EAAiB,EAAU,GAAG,cAAe,EAAK,EAE/D,MAAM,GAEC,GAA2B,EAAQ,EAAS,MAAM,UAAU,EAAE,EAAE,EAFlD,EAGzB,CAEA,GAAI,GAAe,EAAS,MAAM,GAAG,EAAE,GAEvC,MAAO,CAAE,OAAO,KAAK,EAAU,SAAS,EAAE,SAAS,CAAY,CACnE,CAEA,YAAkB,EAAM,EAAM,CAC1B,GAAI,GAEJ,MAAO,WAAW,CAChB,GAAI,GAAU,KAAM,EAAO,UAEvB,EAAQ,UAAW,CACjB,EAAU,KAEV,EAAK,MAAM,EAAS,CAAI,CAC9B,EAEA,aAAa,CAAO,EAEpB,EAAU,WAAW,EAAO,CAAI,CAClC,CACJ,CChHA,EAAU,OAAQ,CAAC,CAAE,KAAI,eAAgB,CACrC,GAAI,GAAa,EAAU,YAAc,WAEzC,EAAO,SAAS,EAAI,SAAS,GAAY,CAC7C,CAAC,ECJD,EAAU,OAAQ,CAAC,CAAE,KAAI,eAAgB,CACrC,GAAI,GAAW,GAAoB,EAAU,UAAW,GAAI,EAExD,CAAE,QAAO,aAAY,gBAAe,YAAa,GAAK,IAAM,CAC5D,GAAwB,EAAI,CAAS,CACzC,EAAG,CAAQ,EAEX,EAAM,EAEN,EAAc,IAAM,GAAwB,GAAK,GAA+B,CAAS,CAAC,EAC1F,EAAW,IAAM,GAAuB,CAAS,GAAK,GAA6B,CAAE,CAAC,EACtF,EAAW,IAAM,GAA4B,CAAE,CAAC,EAChD,EAAW,IAAM,GAAkB,CAAC,EACpC,EAAS,IAAM,GAAyB,CAAE,CAAC,CAC/C,CAAC,EAED,YAAiC,EAAI,EAAW,CAC5C,EAAO,SAAS,EACZ,EAAU,WAAa,SAAW,EAAU,WAAa,iBAC7D,CACJ,CAEA,YAAc,EAAU,EAAW,IAAM,CACrC,GAAI,GAAkB,CAAC,EACnB,EAAqB,CAAC,EACtB,EAAiB,CAAC,EAEtB,MAAO,CACH,OAAQ,CACJ,GAAI,GAAQ,GAAoB,EAAU,IAAM,CAC5C,GAAI,EAAe,KAAK,GAAK,EAAE,CAAC,EAAG,MAAO,GAAM,EAChD,AAAI,EAAgB,KAAK,GAAK,EAAE,CAAC,GAC7B,EAAmB,KAAK,GAAK,EAAE,CAAC,GAAK,KAAK,OAAO,EAAI,KAEzD,EAAS,CACb,CAAC,CACL,EACA,WAAW,EAAW,CAClB,EAAgB,KAAK,CAAS,CAClC,EACA,cAAc,EAAW,CACrB,EAAmB,KAAK,CAAS,CACrC,EACA,SAAS,EAAW,CAChB,EAAe,KAAK,CAAS,CACjC,CACJ,CACJ,CAEA,GAAI,IAAS,CAAC,EAEd,YAA6B,EAAI,EAAU,CACvC,GAAI,CAAE,GAAO,GAAK,CACd,GAAI,GAAQ,CACR,MAAO,YAAY,IAAM,EAAM,UAAU,QAAQ,GAAK,EAAE,CAAC,EAAG,CAAE,EAC9D,UAAW,GAAI,IACnB,EAEA,GAAO,GAAM,CACjB,CAEA,UAAO,GAAI,UAAU,IAAI,CAAQ,EAE1B,IAAM,CACT,GAAO,GAAI,UAAU,OAAO,CAAQ,EAEhC,GAAO,GAAI,UAAU,OAAS,GAC9B,eAAc,GAAO,GAAI,KAAK,EAC9B,MAAO,IAAO,GAEtB,CACJ,CAEA,GAAI,IAAY,GAEhB,OAAO,iBAAiB,UAAW,IAAM,GAAY,EAAI,EACzD,OAAO,iBAAiB,SAAU,IAAM,GAAY,EAAK,EAEzD,aAA6B,CACzB,MAAO,GACX,CAEA,GAAI,IAAe,GAEnB,SAAS,iBAAiB,mBAAoB,IAAM,CAAE,GAAe,SAAS,MAAO,EAAG,EAAK,EAE7F,aAAmC,CAC/B,MAAO,GACX,CAEA,YAAqC,EAAI,CACrC,MAAO,CAAE,GAAc,CAAE,EAAE,IAAI,MAAM,CACzC,CAEA,YAAwC,EAAW,CAC/C,MAAO,CAAE,EAAU,UAAU,SAAS,YAAY,CACtD,CAEA,YAAgC,EAAW,CACvC,MAAO,GAAU,UAAU,SAAS,SAAS,CACjD,CAEA,YAAsC,EAAI,CACtC,GAAI,GAAW,EAAG,sBAAsB,EAExC,MAAO,CACH,GAAS,IAAO,QAAO,aAAe,SAAS,gBAAgB,eAC/D,EAAS,KAAQ,QAAO,YAAc,SAAS,gBAAgB,cAC/D,EAAS,OAAS,GAClB,EAAS,MAAQ,EAEzB,CAEA,YAAkC,EAAI,CAClC,MAAO,GAAG,cAAgB,EAC9B,CAEA,YAA6B,EAAW,EAAiB,CACrD,GAAI,GACA,EAA+B,EAAU,KAAK,GAAO,EAAI,MAAM,YAAY,CAAC,EAC5E,EAA0B,EAAU,KAAK,GAAO,EAAI,MAAM,WAAW,CAAC,EAE1E,MAAI,GACA,EAAyB,OAAO,EAA6B,QAAQ,KAAM,EAAE,CAAC,EACvE,GACP,GAAyB,OAAO,EAAwB,QAAQ,IAAK,EAAE,CAAC,EAAI,KAGzE,GAA0B,CACrC,CC7HA,GAAI,IAAW,CACX,YACA,cACA,SACA,SACA,QACA,aACA,OACA,OACA,UACA,gBACA,YACA,MACA,GAAI,WAAW,CACX,MAAO,GAAO,QAClB,CACJ,EAEI,GAA+B,GAAU,QAAQ,KAAK,kCAAkC,WAAgB,EAE5G,AAAI,OAAO,UAAU,GAA6B,UAAU,EAC5D,AAAI,OAAO,QAAQ,GAA6B,QAAQ,EASxD,OAAO,SAAW,GAClB,OAAO,OAAS,EAEhB,AAAI,OAAO,uBAAyB,QAChC,QAAO,OAAO,eAAiB,GAE/B,SAAS,iBAAiB,mBAAoB,IAAM,CAChD,AAAI,OAAO,OAAO,iBAAmB,QAGjC,GAA6B,QAAQ,EAIzC,GAAS,MAAM,CACnB,CAAC",
+  "sources": ["../node_modules/nprogress/nprogress.js", "../js/utils.js", "../js/features/supportFileUploads.js", "../../alpine/packages/alpinejs/dist/module.esm.js", "../js/features/supportEntangle.js", "../js/hooks.js", "../js/request/modal.js", "../js/request/pool.js", "../js/request/commit.js", "../js/request/bus.js", "../js/request/index.js", "../js/$wire.js", "../js/component.js", "../js/store.js", "../js/events.js", "../js/directives.js", "../../alpine/packages/collapse/dist/module.esm.js", "../../alpine/packages/focus/dist/module.esm.js", "../../alpine/packages/persist/dist/module.esm.js", "../../alpine/packages/intersect/dist/module.esm.js", "../node_modules/@alpinejs/resize/dist/module.esm.js", "../../alpine/packages/anchor/dist/module.esm.js", "../js/plugins/navigate/history.js", "../js/plugins/navigate/links.js", "../js/plugins/navigate/fetch.js", "../js/plugins/navigate/prefetch.js", "../js/plugins/navigate/teleport.js", "../js/plugins/navigate/scroll.js", "../js/plugins/navigate/persist.js", "../js/plugins/navigate/bar.js", "../js/plugins/navigate/popover.js", "../js/plugins/navigate/page.js", "../js/plugins/navigate/index.js", "../js/plugins/history/index.js", "../../alpine/packages/morph/dist/module.esm.js", "../../alpine/packages/mask/dist/module.esm.js", "../js/lifecycle.js", "../js/features/supportListeners.js", "../js/features/supportScriptsAndAssets.js", "../js/features/supportJsEvaluation.js", "../js/morph.js", "../js/features/supportMorphDom.js", "../js/features/supportDispatches.js", "../js/features/supportDisablingFormsDuringRequest.js", "../js/features/supportPropsAndModelables.js", "../js/features/supportFileDownloads.js", "../js/features/supportLazyLoading.js", "../js/features/supportQueryString.js", "../js/features/supportLaravelEcho.js", "../js/features/supportIsolating.js", "../js/features/supportNavigate.js", "../js/features/supportRedirects.js", "../js/directives/wire-transition.js", "../js/debounce.js", "../js/directives/wire-wildcard.js", "../js/directives/wire-navigate.js", "../js/directives/wire-confirm.js", "../js/directives/wire-current.js", "../js/directives/shared.js", "../js/directives/wire-offline.js", "../js/directives/wire-loading.js", "../js/directives/wire-stream.js", "../js/directives/wire-replace.js", "../js/directives/wire-ignore.js", "../js/directives/wire-dirty.js", "../js/directives/wire-model.js", "../js/directives/wire-init.js", "../js/directives/wire-poll.js", "../js/index.js"],
+  "sourcesContent": ["/* NProgress, (c) 2013, 2014 Rico Sta. Cruz - http://ricostacruz.com/nprogress\n * @license MIT */\n\n;(function(root, factory) {\n\n  if (typeof define === 'function' && define.amd) {\n    define(factory);\n  } else if (typeof exports === 'object') {\n    module.exports = factory();\n  } else {\n    root.NProgress = factory();\n  }\n\n})(this, function() {\n  var NProgress = {};\n\n  NProgress.version = '0.2.0';\n\n  var Settings = NProgress.settings = {\n    minimum: 0.08,\n    easing: 'ease',\n    positionUsing: '',\n    speed: 200,\n    trickle: true,\n    trickleRate: 0.02,\n    trickleSpeed: 800,\n    showSpinner: true,\n    barSelector: '[role=\"bar\"]',\n    spinnerSelector: '[role=\"spinner\"]',\n    parent: 'body',\n    template: '<div class=\"bar\" role=\"bar\"><div class=\"peg\"></div></div><div class=\"spinner\" role=\"spinner\"><div class=\"spinner-icon\"></div></div>'\n  };\n\n  /**\n   * Updates configuration.\n   *\n   *     NProgress.configure({\n   *       minimum: 0.1\n   *     });\n   */\n  NProgress.configure = function(options) {\n    var key, value;\n    for (key in options) {\n      value = options[key];\n      if (value !== undefined && options.hasOwnProperty(key)) Settings[key] = value;\n    }\n\n    return this;\n  };\n\n  /**\n   * Last number.\n   */\n\n  NProgress.status = null;\n\n  /**\n   * Sets the progress bar status, where `n` is a number from `0.0` to `1.0`.\n   *\n   *     NProgress.set(0.4);\n   *     NProgress.set(1.0);\n   */\n\n  NProgress.set = function(n) {\n    var started = NProgress.isStarted();\n\n    n = clamp(n, Settings.minimum, 1);\n    NProgress.status = (n === 1 ? null : n);\n\n    var progress = NProgress.render(!started),\n        bar      = progress.querySelector(Settings.barSelector),\n        speed    = Settings.speed,\n        ease     = Settings.easing;\n\n    progress.offsetWidth; /* Repaint */\n\n    queue(function(next) {\n      // Set positionUsing if it hasn't already been set\n      if (Settings.positionUsing === '') Settings.positionUsing = NProgress.getPositioningCSS();\n\n      // Add transition\n      css(bar, barPositionCSS(n, speed, ease));\n\n      if (n === 1) {\n        // Fade out\n        css(progress, { \n          transition: 'none', \n          opacity: 1 \n        });\n        progress.offsetWidth; /* Repaint */\n\n        setTimeout(function() {\n          css(progress, { \n            transition: 'all ' + speed + 'ms linear', \n            opacity: 0 \n          });\n          setTimeout(function() {\n            NProgress.remove();\n            next();\n          }, speed);\n        }, speed);\n      } else {\n        setTimeout(next, speed);\n      }\n    });\n\n    return this;\n  };\n\n  NProgress.isStarted = function() {\n    return typeof NProgress.status === 'number';\n  };\n\n  /**\n   * Shows the progress bar.\n   * This is the same as setting the status to 0%, except that it doesn't go backwards.\n   *\n   *     NProgress.start();\n   *\n   */\n  NProgress.start = function() {\n    if (!NProgress.status) NProgress.set(0);\n\n    var work = function() {\n      setTimeout(function() {\n        if (!NProgress.status) return;\n        NProgress.trickle();\n        work();\n      }, Settings.trickleSpeed);\n    };\n\n    if (Settings.trickle) work();\n\n    return this;\n  };\n\n  /**\n   * Hides the progress bar.\n   * This is the *sort of* the same as setting the status to 100%, with the\n   * difference being `done()` makes some placebo effect of some realistic motion.\n   *\n   *     NProgress.done();\n   *\n   * If `true` is passed, it will show the progress bar even if its hidden.\n   *\n   *     NProgress.done(true);\n   */\n\n  NProgress.done = function(force) {\n    if (!force && !NProgress.status) return this;\n\n    return NProgress.inc(0.3 + 0.5 * Math.random()).set(1);\n  };\n\n  /**\n   * Increments by a random amount.\n   */\n\n  NProgress.inc = function(amount) {\n    var n = NProgress.status;\n\n    if (!n) {\n      return NProgress.start();\n    } else {\n      if (typeof amount !== 'number') {\n        amount = (1 - n) * clamp(Math.random() * n, 0.1, 0.95);\n      }\n\n      n = clamp(n + amount, 0, 0.994);\n      return NProgress.set(n);\n    }\n  };\n\n  NProgress.trickle = function() {\n    return NProgress.inc(Math.random() * Settings.trickleRate);\n  };\n\n  /**\n   * Waits for all supplied jQuery promises and\n   * increases the progress as the promises resolve.\n   *\n   * @param $promise jQUery Promise\n   */\n  (function() {\n    var initial = 0, current = 0;\n\n    NProgress.promise = function($promise) {\n      if (!$promise || $promise.state() === \"resolved\") {\n        return this;\n      }\n\n      if (current === 0) {\n        NProgress.start();\n      }\n\n      initial++;\n      current++;\n\n      $promise.always(function() {\n        current--;\n        if (current === 0) {\n            initial = 0;\n            NProgress.done();\n        } else {\n            NProgress.set((initial - current) / initial);\n        }\n      });\n\n      return this;\n    };\n\n  })();\n\n  /**\n   * (Internal) renders the progress bar markup based on the `template`\n   * setting.\n   */\n\n  NProgress.render = function(fromStart) {\n    if (NProgress.isRendered()) return document.getElementById('nprogress');\n\n    addClass(document.documentElement, 'nprogress-busy');\n    \n    var progress = document.createElement('div');\n    progress.id = 'nprogress';\n    progress.innerHTML = Settings.template;\n\n    var bar      = progress.querySelector(Settings.barSelector),\n        perc     = fromStart ? '-100' : toBarPerc(NProgress.status || 0),\n        parent   = document.querySelector(Settings.parent),\n        spinner;\n    \n    css(bar, {\n      transition: 'all 0 linear',\n      transform: 'translate3d(' + perc + '%,0,0)'\n    });\n\n    if (!Settings.showSpinner) {\n      spinner = progress.querySelector(Settings.spinnerSelector);\n      spinner && removeElement(spinner);\n    }\n\n    if (parent != document.body) {\n      addClass(parent, 'nprogress-custom-parent');\n    }\n\n    parent.appendChild(progress);\n    return progress;\n  };\n\n  /**\n   * Removes the element. Opposite of render().\n   */\n\n  NProgress.remove = function() {\n    removeClass(document.documentElement, 'nprogress-busy');\n    removeClass(document.querySelector(Settings.parent), 'nprogress-custom-parent');\n    var progress = document.getElementById('nprogress');\n    progress && removeElement(progress);\n  };\n\n  /**\n   * Checks if the progress bar is rendered.\n   */\n\n  NProgress.isRendered = function() {\n    return !!document.getElementById('nprogress');\n  };\n\n  /**\n   * Determine which positioning CSS rule to use.\n   */\n\n  NProgress.getPositioningCSS = function() {\n    // Sniff on document.body.style\n    var bodyStyle = document.body.style;\n\n    // Sniff prefixes\n    var vendorPrefix = ('WebkitTransform' in bodyStyle) ? 'Webkit' :\n                       ('MozTransform' in bodyStyle) ? 'Moz' :\n                       ('msTransform' in bodyStyle) ? 'ms' :\n                       ('OTransform' in bodyStyle) ? 'O' : '';\n\n    if (vendorPrefix + 'Perspective' in bodyStyle) {\n      // Modern browsers with 3D support, e.g. Webkit, IE10\n      return 'translate3d';\n    } else if (vendorPrefix + 'Transform' in bodyStyle) {\n      // Browsers without 3D support, e.g. IE9\n      return 'translate';\n    } else {\n      // Browsers without translate() support, e.g. IE7-8\n      return 'margin';\n    }\n  };\n\n  /**\n   * Helpers\n   */\n\n  function clamp(n, min, max) {\n    if (n < min) return min;\n    if (n > max) return max;\n    return n;\n  }\n\n  /**\n   * (Internal) converts a percentage (`0..1`) to a bar translateX\n   * percentage (`-100%..0%`).\n   */\n\n  function toBarPerc(n) {\n    return (-1 + n) * 100;\n  }\n\n\n  /**\n   * (Internal) returns the correct CSS for changing the bar's\n   * position given an n percentage, and speed and ease from Settings\n   */\n\n  function barPositionCSS(n, speed, ease) {\n    var barCSS;\n\n    if (Settings.positionUsing === 'translate3d') {\n      barCSS = { transform: 'translate3d('+toBarPerc(n)+'%,0,0)' };\n    } else if (Settings.positionUsing === 'translate') {\n      barCSS = { transform: 'translate('+toBarPerc(n)+'%,0)' };\n    } else {\n      barCSS = { 'margin-left': toBarPerc(n)+'%' };\n    }\n\n    barCSS.transition = 'all '+speed+'ms '+ease;\n\n    return barCSS;\n  }\n\n  /**\n   * (Internal) Queues a function to be executed.\n   */\n\n  var queue = (function() {\n    var pending = [];\n    \n    function next() {\n      var fn = pending.shift();\n      if (fn) {\n        fn(next);\n      }\n    }\n\n    return function(fn) {\n      pending.push(fn);\n      if (pending.length == 1) next();\n    };\n  })();\n\n  /**\n   * (Internal) Applies css properties to an element, similar to the jQuery \n   * css method.\n   *\n   * While this helper does assist with vendor prefixed property names, it \n   * does not perform any manipulation of values prior to setting styles.\n   */\n\n  var css = (function() {\n    var cssPrefixes = [ 'Webkit', 'O', 'Moz', 'ms' ],\n        cssProps    = {};\n\n    function camelCase(string) {\n      return string.replace(/^-ms-/, 'ms-').replace(/-([\\da-z])/gi, function(match, letter) {\n        return letter.toUpperCase();\n      });\n    }\n\n    function getVendorProp(name) {\n      var style = document.body.style;\n      if (name in style) return name;\n\n      var i = cssPrefixes.length,\n          capName = name.charAt(0).toUpperCase() + name.slice(1),\n          vendorName;\n      while (i--) {\n        vendorName = cssPrefixes[i] + capName;\n        if (vendorName in style) return vendorName;\n      }\n\n      return name;\n    }\n\n    function getStyleProp(name) {\n      name = camelCase(name);\n      return cssProps[name] || (cssProps[name] = getVendorProp(name));\n    }\n\n    function applyCss(element, prop, value) {\n      prop = getStyleProp(prop);\n      element.style[prop] = value;\n    }\n\n    return function(element, properties) {\n      var args = arguments,\n          prop, \n          value;\n\n      if (args.length == 2) {\n        for (prop in properties) {\n          value = properties[prop];\n          if (value !== undefined && properties.hasOwnProperty(prop)) applyCss(element, prop, value);\n        }\n      } else {\n        applyCss(element, args[1], args[2]);\n      }\n    }\n  })();\n\n  /**\n   * (Internal) Determines if an element or space separated list of class names contains a class name.\n   */\n\n  function hasClass(element, name) {\n    var list = typeof element == 'string' ? element : classList(element);\n    return list.indexOf(' ' + name + ' ') >= 0;\n  }\n\n  /**\n   * (Internal) Adds a class to an element.\n   */\n\n  function addClass(element, name) {\n    var oldList = classList(element),\n        newList = oldList + name;\n\n    if (hasClass(oldList, name)) return; \n\n    // Trim the opening space.\n    element.className = newList.substring(1);\n  }\n\n  /**\n   * (Internal) Removes a class from an element.\n   */\n\n  function removeClass(element, name) {\n    var oldList = classList(element),\n        newList;\n\n    if (!hasClass(element, name)) return;\n\n    // Replace the class name.\n    newList = oldList.replace(' ' + name + ' ', ' ');\n\n    // Trim the opening and closing spaces.\n    element.className = newList.substring(1, newList.length - 1);\n  }\n\n  /**\n   * (Internal) Gets a space separated list of the class names on the element. \n   * The list is wrapped with a single space on each end to facilitate finding \n   * matches within the list.\n   */\n\n  function classList(element) {\n    return (' ' + (element.className || '') + ' ').replace(/\\s+/gi, ' ');\n  }\n\n  /**\n   * (Internal) Removes an element from the DOM.\n   */\n\n  function removeElement(element) {\n    element && element.parentNode && element.parentNode.removeChild(element);\n  }\n\n  return NProgress;\n});\n\n", "\nexport class Bag {\n    constructor() { this.arrays = {} }\n\n    add(key, value) {\n        if (! this.arrays[key]) this.arrays[key] = []\n        this.arrays[key].push(value)\n    }\n\n    remove(key) {\n        if (this.arrays[key]) delete this.arrays[key]\n    }\n\n    get(key) { return this.arrays[key] || [] }\n\n    each(key, callback) { return this.get(key).forEach(callback) }\n}\n\nexport class WeakBag {\n    constructor() { this.arrays = new WeakMap }\n\n    add(key, value) {\n        if (! this.arrays.has(key)) this.arrays.set(key, [])\n        this.arrays.get(key).push(value)\n    }\n\n    remove(key) {\n        if (this.arrays.has(key)) this.arrays.delete(key, [])\n    }\n\n    get(key) { return this.arrays.has(key) ? this.arrays.get(key) : [] }\n\n    each(key, callback) { return this.get(key).forEach(callback) }\n}\n\nexport function dispatch(target, name, detail = {}, bubbles = true) {\n    target.dispatchEvent(\n        new CustomEvent(name, {\n            detail,\n            bubbles,\n            // Allows events to pass the shadow DOM barrier.\n            composed: true,\n            cancelable: true,\n        })\n    )\n}\n\nexport function listen(target, name, handler) {\n    target.addEventListener(name, handler)\n\n    return () => target.removeEventListener(name, handler)\n}\n\n/**\n * Type-checking in JS is weird and annoying, these are better.\n */\nexport function isObjecty(subject) { return (typeof subject === 'object' && subject !== null) }\nexport function isObject(subject) { return (isObjecty(subject) && ! isArray(subject)) }\nexport function isArray(subject) { return Array.isArray(subject) }\nexport function isFunction(subject) { return typeof subject === 'function' }\nexport function isPrimitive(subject) { return typeof subject !== 'object' || subject === null }\n\n/**\n * Clone an object deeply to wipe out any shared references.\n */\nexport function deepClone(obj) { return JSON.parse(JSON.stringify(obj)) }\n\n/**\n * Determine if two objects take the exact same shape.\n */\nexport function deeplyEqual(a, b) { return JSON.stringify(a) === JSON.stringify(b) }\n\n/**\n * An easy way to loop through arrays and objects.\n */\nexport function each(subject, callback) {\n    Object.entries(subject).forEach(([key, value]) => callback(key, value))\n}\n\n/**\n * Get a property from an object with support for dot-notation.\n */\nexport function dataGet(object, key) {\n    if (key === '') return object\n\n    return key.split('.').reduce((carry, i) => {\n        return carry?.[i]\n    }, object)\n}\n\n/**\n * Set a property on an object with support for dot-notation.\n */\nexport function dataSet(object, key, value) {\n    let segments = key.split('.')\n\n    if (segments.length === 1) {\n        return object[key] = value\n    }\n\n    let firstSegment = segments.shift()\n    let restOfSegments = segments.join('.')\n\n    if (object[firstSegment] === undefined) {\n        object[firstSegment] = {}\n    }\n\n    dataSet(object[firstSegment], restOfSegments, value)\n}\n\n/**\n * Create a flat, dot-notated diff of two obejcts.\n */\nexport function diff(left, right, diffs = {}, path = '') {\n    // Are they the same?\n    if (left === right) return diffs\n\n    // Are they COMPLETELY different?\n    if (typeof left !== typeof right || (isObject(left) && isArray(right)) || (isArray(left) && isObject(right))) {\n        diffs[path] = right;\n        return diffs\n    }\n\n    // Is the right or left side a primitive value (a leaf node)?\n    if (isPrimitive(left) || isPrimitive(right)) {\n        diffs[path] = right\n        return diffs\n    }\n\n    // We now know both are objects...\n    let leftKeys = Object.keys(left)\n\n    // Recursively diff the object's properties...\n    Object.entries(right).forEach(([key, value]) => {\n        diffs = {...diffs, ...diff(left[key], right[key], diffs, path === '' ? key : `${path}.${key}`)}\n        leftKeys = leftKeys.filter(i => i !== key)\n    })\n\n    // Mark any items for removal...\n    leftKeys.forEach(key => {\n        diffs[`${path}.${key}`] = '__rm__'\n    })\n\n    return diffs\n}\n\n/**\n * The data that's passed between the browser and server is in the form of\n * nested tuples consisting of the schema: [rawValue, metadata]. In this\n * method we're extracting the plain JS object of only the raw values.\n */\nexport function extractData(payload) {\n    let value = isSynthetic(payload) ? payload[0] : payload\n    let meta = isSynthetic(payload) ? payload[1] : undefined\n\n    if (isObjecty(value)) {\n        Object.entries(value).forEach(([key, iValue]) => {\n            value[key] = extractData(iValue)\n        })\n    }\n\n    return value\n}\n\n/**\n * Determine if the variable passed in is a node in a nested metadata\n * tuple tree. (Meaning it takes the form of: [rawData, metadata])\n */\nexport function isSynthetic(subject) {\n    return Array.isArray(subject)\n        && subject.length === 2\n        && typeof subject[1] === 'object'\n        && Object.keys(subject[1]).includes('s')\n}\n\n/**\n * Post requests in Laravel require a csrf token to be passed\n * along with the payload. Here, we'll try and locate one.\n */\nexport function getCsrfToken() {\n    // Purposely not caching. Fetching it fresh every time ensures we're\n    // not depending on a stale session's CSRF token...\n\n    if (document.querySelector('meta[name=\"csrf-token\"]')) {\n        return document.querySelector('meta[name=\"csrf-token\"]').getAttribute('content')\n    }\n\n    if (document.querySelector('[data-csrf]')) {\n        return document.querySelector('[data-csrf]').getAttribute('data-csrf')\n    }\n\n    if (window.livewireScriptConfig['csrf'] ?? false) {\n        return window.livewireScriptConfig['csrf']\n    }\n\n    throw 'Livewire: No CSRF token detected'\n}\n\nlet nonce;\n\nexport function getNonce() {\n    if (nonce) return nonce\n\n\n    if (window.livewireScriptConfig && (window.livewireScriptConfig['nonce'] ?? false)) {\n        nonce = window.livewireScriptConfig['nonce']\n\n        return nonce\n    }\n\n    const elWithNonce = document.querySelector('style[data-livewire-style][nonce]')\n\n    if (elWithNonce) {\n        nonce = elWithNonce.nonce\n\n        return nonce\n    }\n\n    return null\n}\n\n/**\n * Livewire's update URI. This is configurable via Livewire::setUpdateRoute(...)\n */\nexport function getUpdateUri() {\n    return document.querySelector('[data-update-uri]')?.getAttribute('data-update-uri') ?? window.livewireScriptConfig['uri'] ?? null\n}\n\nexport function contentIsFromDump(content) {\n    return !! content.match(/<script>Sfdump\\(\".+\"\\)<\\/script>/)\n}\n\nexport function splitDumpFromContent(content) {\n    let dump = content.match(/.*<script>Sfdump\\(\".+\"\\)<\\/script>/s)\n\n    return [dump, content.replace(dump, '')]\n}\n", "import { getCsrfToken } from '@/utils';\n\nlet uploadManagers = new WeakMap\n\nfunction getUploadManager(component) {\n    if (! uploadManagers.has(component)) {\n        let manager = new UploadManager(component)\n\n        uploadManagers.set(component, manager)\n\n        manager.registerListeners()\n    }\n\n    return uploadManagers.get(component)\n}\n\nexport function handleFileUpload(el, property, component, cleanup) {\n    let manager = getUploadManager(component)\n\n    let start = () => el.dispatchEvent(new CustomEvent('livewire-upload-start', { bubbles: true, detail: { id: component.id, property} }))\n    let finish = () => el.dispatchEvent(new CustomEvent('livewire-upload-finish', { bubbles: true, detail: { id: component.id, property} }))\n    let error = () => el.dispatchEvent(new CustomEvent('livewire-upload-error', { bubbles: true, detail: { id: component.id, property} }))\n    let cancel = () => el.dispatchEvent(new CustomEvent('livewire-upload-cancel', { bubbles: true, detail: { id: component.id, property} }))\n    let progress = (progressEvent) => {\n        var percentCompleted = Math.round( (progressEvent.loaded * 100) / progressEvent.total )\n\n        el.dispatchEvent(\n            new CustomEvent('livewire-upload-progress', {\n                bubbles: true, detail: { progress: percentCompleted }\n            })\n        )\n    }\n\n    let eventHandler = e => {\n        if (e.target.files.length === 0) return\n\n        start()\n\n        if (e.target.multiple) {\n            manager.uploadMultiple(property, e.target.files, finish, error, progress, cancel)\n        } else {\n            manager.upload(property, e.target.files[0], finish, error, progress, cancel)\n        }\n    }\n\n    el.addEventListener('change', eventHandler)\n\n    // If the Livewire property has changed to null or an empty string, then reset the input...\n    component.$wire.$watch(property, (value) => {\n        // This watch will only be released when the component is removed. However, the\n        // actual file-upload element may be removed from the DOM withou the entire\n        // component being removed. In this case, let's just bail early on this.\n        if (! el.isConnected) return\n\n        if (value === null || value === '') {\n            el.value = ''\n        }\n        \n        // If the file input is a multiple file input and the value has been reset to an empty array, then reset the input...\n        if (el.multiple && Array.isArray(value) && value.length === 0) {\n            el.value = ''\n        }\n    })\n\n    // There's a bug in browsers where selecting a file, removing it,\n    // then re-adding it doesn't fire the change event. This fixes it.\n    // Reference: https://stackoverflow.com/questions/12030686/html-input-file-selection-event-not-firing-upon-selecting-the-same-file\n    let clearFileInputValue = () => { el.value = null }\n    el.addEventListener('click', clearFileInputValue)\n\n    // Clear the input if the uploaded is cancelled...\n    el.addEventListener('livewire-upload-cancel', clearFileInputValue)\n\n    cleanup(() => {\n        el.removeEventListener('change', eventHandler)\n        el.removeEventListener('click', clearFileInputValue)\n    })\n}\n\nclass UploadManager {\n    constructor(component) {\n        this.component = component\n        this.uploadBag = new MessageBag\n        this.removeBag = new MessageBag\n    }\n\n    registerListeners() {\n        this.component.$wire.$on('upload:generatedSignedUrl', ({ name, url }) => {\n            // We have to add reduntant \"setLoading\" calls because the dom-patch\n            // from the first response will clear the setUploadLoading call\n            // from the first upload call.\n            setUploadLoading(this.component, name)\n\n            this.handleSignedUrl(name, url)\n        })\n\n        this.component.$wire.$on('upload:generatedSignedUrlForS3', ({ name, payload }) => {\n            setUploadLoading(this.component, name)\n\n            this.handleS3PreSignedUrl(name, payload)\n        })\n\n        this.component.$wire.$on('upload:finished', ({ name, tmpFilenames }) => this.markUploadFinished(name, tmpFilenames))\n        this.component.$wire.$on('upload:errored', ({ name }) => this.markUploadErrored(name))\n        this.component.$wire.$on('upload:removed', ({ name, tmpFilename }) => this.removeBag.shift(name).finishCallback(tmpFilename))\n    }\n\n    upload(name, file, finishCallback, errorCallback, progressCallback, cancelledCallback) {\n        this.setUpload(name, {\n            files: [file],\n            multiple: false,\n            finishCallback,\n            errorCallback,\n            progressCallback,\n            cancelledCallback,\n        })\n    }\n\n    uploadMultiple(name, files, finishCallback, errorCallback, progressCallback, cancelledCallback) {\n        this.setUpload(name, {\n            files: Array.from(files),\n            multiple: true,\n            finishCallback,\n            errorCallback,\n            progressCallback,\n            cancelledCallback,\n        })\n    }\n\n    removeUpload(name, tmpFilename, finishCallback) {\n        this.removeBag.push(name, {\n            tmpFilename, finishCallback\n        })\n\n        this.component.$wire.call('_removeUpload', name, tmpFilename);\n    }\n\n    setUpload(name, uploadObject) {\n        this.uploadBag.add(name, uploadObject)\n\n        if (this.uploadBag.get(name).length === 1) {\n            this.startUpload(name, uploadObject)\n        }\n    }\n\n    handleSignedUrl(name, url) {\n        let formData = new FormData()\n        Array.from(this.uploadBag.first(name).files).forEach(file => formData.append('files[]', file, file.name))\n\n        let headers = {\n            'Accept': 'application/json',\n        }\n\n        let csrfToken = getCsrfToken()\n\n        if (csrfToken) headers['X-CSRF-TOKEN'] = csrfToken\n\n        this.makeRequest(name, formData, 'post', url, headers, response => {\n            return response.paths\n        })\n    }\n\n    handleS3PreSignedUrl(name, payload) {\n        let formData = this.uploadBag.first(name).files[0]\n\n        let headers = payload.headers\n        if ('Host' in headers) delete headers.Host\n        let url = payload.url\n\n        this.makeRequest(name, formData, 'put', url, headers, response => {\n            return [payload.path]\n        })\n    }\n\n    makeRequest(name, formData, method, url, headers, retrievePaths) {\n        let request = new XMLHttpRequest()\n\n        request.open(method, url)\n\n        Object.entries(headers).forEach(([key, value]) => {\n            request.setRequestHeader(key, value)\n        })\n\n        request.upload.addEventListener('progress', e => {\n            e.detail = {}\n            e.detail.progress = Math.floor((e.loaded * 100) / e.total)\n\n            this.uploadBag.first(name).progressCallback(e)\n        })\n\n        request.addEventListener('load', () => {\n            if ((request.status+'')[0] === '2') {\n                let paths = retrievePaths(request.response && JSON.parse(request.response))\n\n                this.component.$wire.call('_finishUpload', name, paths, this.uploadBag.first(name).multiple)\n\n                return\n            }\n\n            let errors = null\n\n            if (request.status === 422) {\n                errors = request.response\n            }\n\n            this.component.$wire.call('_uploadErrored', name, errors, this.uploadBag.first(name).multiple)\n        })\n\n        this.uploadBag.first(name).request = request\n\n        request.send(formData)\n    }\n\n    startUpload(name, uploadObject) {\n        let fileInfos = uploadObject.files.map(file => {\n            return { name: file.name, size: file.size, type: file.type }\n        })\n\n        this.component.$wire.call('_startUpload', name, fileInfos, uploadObject.multiple);\n\n        setUploadLoading(this.component, name)\n    }\n\n    markUploadFinished(name, tmpFilenames) {\n        unsetUploadLoading(this.component)\n\n        let uploadObject = this.uploadBag.shift(name)\n        uploadObject.finishCallback(uploadObject.multiple ? tmpFilenames : tmpFilenames[0])\n\n        if (this.uploadBag.get(name).length > 0) this.startUpload(name, this.uploadBag.last(name))\n    }\n\n    markUploadErrored(name) {\n        unsetUploadLoading(this.component)\n\n        this.uploadBag.shift(name).errorCallback()\n\n        if (this.uploadBag.get(name).length > 0) this.startUpload(name, this.uploadBag.last(name))\n    }\n\n    cancelUpload(name, cancelledCallback = null) {\n        unsetUploadLoading(this.component)\n\n        let uploadItem = this.uploadBag.first(name);\n\n        if (uploadItem) {\n            if (uploadItem.request) {\n                uploadItem.request.abort();\n            }\n\n            this.uploadBag.shift(name).cancelledCallback();\n\n            if (cancelledCallback) cancelledCallback()\n        }\n    }\n}\n\nexport default class MessageBag {\n    constructor() {\n        this.bag = {}\n    }\n\n    add(name, thing) {\n        if (! this.bag[name]) {\n            this.bag[name] = []\n        }\n\n        this.bag[name].push(thing)\n    }\n\n    push(name, thing) {\n        this.add(name, thing)\n    }\n\n    first(name) {\n        if (! this.bag[name]) return null\n\n        return this.bag[name][0]\n    }\n\n    last(name) {\n        return this.bag[name].slice(-1)[0]\n    }\n\n    get(name) {\n        return this.bag[name]\n    }\n\n    shift(name) {\n        return this.bag[name].shift()\n    }\n\n    call(name, ...params) {\n        (this.listeners[name] || []).forEach(callback => {\n            callback(...params)\n        })\n    }\n\n    has(name) {\n        return Object.keys(this.listeners).includes(name)\n    }\n}\n\nfunction setUploadLoading() {\n    // @todo\n}\n\nfunction unsetUploadLoading() {\n    // @todo\n}\n\nexport function upload(\n    component,\n    name,\n    file,\n    finishCallback = () => { },\n    errorCallback = () => { },\n    progressCallback = () => { },\n    cancelledCallback = () => { },\n) {\n    let uploadManager = getUploadManager(component)\n\n    uploadManager.upload(\n        name,\n        file,\n        finishCallback,\n        errorCallback,\n        progressCallback,\n        cancelledCallback,\n    )\n}\n\nexport function uploadMultiple(\n    component,\n    name,\n    files,\n    finishCallback = () => { },\n    errorCallback = () => { },\n    progressCallback = () => { },\n    cancelledCallback = () => { },\n) {\n    let uploadManager = getUploadManager(component)\n\n    uploadManager.uploadMultiple(\n        name,\n        files,\n        finishCallback,\n        errorCallback,\n        progressCallback,\n        cancelledCallback,\n    )\n}\n\nexport function removeUpload(\n    component,\n    name,\n    tmpFilename,\n    finishCallback = () => { },\n    errorCallback = () => { }\n) {\n    let uploadManager = getUploadManager(component)\n\n    uploadManager.removeUpload(\n        name,\n        tmpFilename,\n        finishCallback,\n        errorCallback\n    )\n}\n\nexport function cancelUpload(\n    component,\n    name,\n    cancelledCallback = () => { }\n) {\n    let uploadManager = getUploadManager(component)\n\n    uploadManager.cancelUpload(\n        name,\n        cancelledCallback\n    )\n}\n", "// packages/alpinejs/src/scheduler.js\nvar flushPending = false;\nvar flushing = false;\nvar queue = [];\nvar lastFlushedIndex = -1;\nfunction scheduler(callback) {\n  queueJob(callback);\n}\nfunction queueJob(job) {\n  if (!queue.includes(job))\n    queue.push(job);\n  queueFlush();\n}\nfunction dequeueJob(job) {\n  let index = queue.indexOf(job);\n  if (index !== -1 && index > lastFlushedIndex)\n    queue.splice(index, 1);\n}\nfunction queueFlush() {\n  if (!flushing && !flushPending) {\n    flushPending = true;\n    queueMicrotask(flushJobs);\n  }\n}\nfunction flushJobs() {\n  flushPending = false;\n  flushing = true;\n  for (let i = 0; i < queue.length; i++) {\n    queue[i]();\n    lastFlushedIndex = i;\n  }\n  queue.length = 0;\n  lastFlushedIndex = -1;\n  flushing = false;\n}\n\n// packages/alpinejs/src/reactivity.js\nvar reactive;\nvar effect;\nvar release;\nvar raw;\nvar shouldSchedule = true;\nfunction disableEffectScheduling(callback) {\n  shouldSchedule = false;\n  callback();\n  shouldSchedule = true;\n}\nfunction setReactivityEngine(engine) {\n  reactive = engine.reactive;\n  release = engine.release;\n  effect = (callback) => engine.effect(callback, { scheduler: (task) => {\n    if (shouldSchedule) {\n      scheduler(task);\n    } else {\n      task();\n    }\n  } });\n  raw = engine.raw;\n}\nfunction overrideEffect(override) {\n  effect = override;\n}\nfunction elementBoundEffect(el) {\n  let cleanup2 = () => {\n  };\n  let wrappedEffect = (callback) => {\n    let effectReference = effect(callback);\n    if (!el._x_effects) {\n      el._x_effects = /* @__PURE__ */ new Set();\n      el._x_runEffects = () => {\n        el._x_effects.forEach((i) => i());\n      };\n    }\n    el._x_effects.add(effectReference);\n    cleanup2 = () => {\n      if (effectReference === void 0)\n        return;\n      el._x_effects.delete(effectReference);\n      release(effectReference);\n    };\n    return effectReference;\n  };\n  return [wrappedEffect, () => {\n    cleanup2();\n  }];\n}\nfunction watch(getter, callback) {\n  let firstTime = true;\n  let oldValue;\n  let effectReference = effect(() => {\n    let value = getter();\n    JSON.stringify(value);\n    if (!firstTime) {\n      queueMicrotask(() => {\n        callback(value, oldValue);\n        oldValue = value;\n      });\n    } else {\n      oldValue = value;\n    }\n    firstTime = false;\n  });\n  return () => release(effectReference);\n}\n\n// packages/alpinejs/src/mutation.js\nvar onAttributeAddeds = [];\nvar onElRemoveds = [];\nvar onElAddeds = [];\nfunction onElAdded(callback) {\n  onElAddeds.push(callback);\n}\nfunction onElRemoved(el, callback) {\n  if (typeof callback === \"function\") {\n    if (!el._x_cleanups)\n      el._x_cleanups = [];\n    el._x_cleanups.push(callback);\n  } else {\n    callback = el;\n    onElRemoveds.push(callback);\n  }\n}\nfunction onAttributesAdded(callback) {\n  onAttributeAddeds.push(callback);\n}\nfunction onAttributeRemoved(el, name, callback) {\n  if (!el._x_attributeCleanups)\n    el._x_attributeCleanups = {};\n  if (!el._x_attributeCleanups[name])\n    el._x_attributeCleanups[name] = [];\n  el._x_attributeCleanups[name].push(callback);\n}\nfunction cleanupAttributes(el, names) {\n  if (!el._x_attributeCleanups)\n    return;\n  Object.entries(el._x_attributeCleanups).forEach(([name, value]) => {\n    if (names === void 0 || names.includes(name)) {\n      value.forEach((i) => i());\n      delete el._x_attributeCleanups[name];\n    }\n  });\n}\nfunction cleanupElement(el) {\n  el._x_effects?.forEach(dequeueJob);\n  while (el._x_cleanups?.length)\n    el._x_cleanups.pop()();\n}\nvar observer = new MutationObserver(onMutate);\nvar currentlyObserving = false;\nfunction startObservingMutations() {\n  observer.observe(document, { subtree: true, childList: true, attributes: true, attributeOldValue: true });\n  currentlyObserving = true;\n}\nfunction stopObservingMutations() {\n  flushObserver();\n  observer.disconnect();\n  currentlyObserving = false;\n}\nvar queuedMutations = [];\nfunction flushObserver() {\n  let records = observer.takeRecords();\n  queuedMutations.push(() => records.length > 0 && onMutate(records));\n  let queueLengthWhenTriggered = queuedMutations.length;\n  queueMicrotask(() => {\n    if (queuedMutations.length === queueLengthWhenTriggered) {\n      while (queuedMutations.length > 0)\n        queuedMutations.shift()();\n    }\n  });\n}\nfunction mutateDom(callback) {\n  if (!currentlyObserving)\n    return callback();\n  stopObservingMutations();\n  let result = callback();\n  startObservingMutations();\n  return result;\n}\nvar isCollecting = false;\nvar deferredMutations = [];\nfunction deferMutations() {\n  isCollecting = true;\n}\nfunction flushAndStopDeferringMutations() {\n  isCollecting = false;\n  onMutate(deferredMutations);\n  deferredMutations = [];\n}\nfunction onMutate(mutations) {\n  if (isCollecting) {\n    deferredMutations = deferredMutations.concat(mutations);\n    return;\n  }\n  let addedNodes = [];\n  let removedNodes = /* @__PURE__ */ new Set();\n  let addedAttributes = /* @__PURE__ */ new Map();\n  let removedAttributes = /* @__PURE__ */ new Map();\n  for (let i = 0; i < mutations.length; i++) {\n    if (mutations[i].target._x_ignoreMutationObserver)\n      continue;\n    if (mutations[i].type === \"childList\") {\n      mutations[i].removedNodes.forEach((node) => {\n        if (node.nodeType !== 1)\n          return;\n        if (!node._x_marker)\n          return;\n        removedNodes.add(node);\n      });\n      mutations[i].addedNodes.forEach((node) => {\n        if (node.nodeType !== 1)\n          return;\n        if (removedNodes.has(node)) {\n          removedNodes.delete(node);\n          return;\n        }\n        if (node._x_marker)\n          return;\n        addedNodes.push(node);\n      });\n    }\n    if (mutations[i].type === \"attributes\") {\n      let el = mutations[i].target;\n      let name = mutations[i].attributeName;\n      let oldValue = mutations[i].oldValue;\n      let add2 = () => {\n        if (!addedAttributes.has(el))\n          addedAttributes.set(el, []);\n        addedAttributes.get(el).push({ name, value: el.getAttribute(name) });\n      };\n      let remove = () => {\n        if (!removedAttributes.has(el))\n          removedAttributes.set(el, []);\n        removedAttributes.get(el).push(name);\n      };\n      if (el.hasAttribute(name) && oldValue === null) {\n        add2();\n      } else if (el.hasAttribute(name)) {\n        remove();\n        add2();\n      } else {\n        remove();\n      }\n    }\n  }\n  removedAttributes.forEach((attrs, el) => {\n    cleanupAttributes(el, attrs);\n  });\n  addedAttributes.forEach((attrs, el) => {\n    onAttributeAddeds.forEach((i) => i(el, attrs));\n  });\n  for (let node of removedNodes) {\n    if (addedNodes.some((i) => i.contains(node)))\n      continue;\n    onElRemoveds.forEach((i) => i(node));\n  }\n  for (let node of addedNodes) {\n    if (!node.isConnected)\n      continue;\n    onElAddeds.forEach((i) => i(node));\n  }\n  addedNodes = null;\n  removedNodes = null;\n  addedAttributes = null;\n  removedAttributes = null;\n}\n\n// packages/alpinejs/src/scope.js\nfunction scope(node) {\n  return mergeProxies(closestDataStack(node));\n}\nfunction addScopeToNode(node, data2, referenceNode) {\n  node._x_dataStack = [data2, ...closestDataStack(referenceNode || node)];\n  return () => {\n    node._x_dataStack = node._x_dataStack.filter((i) => i !== data2);\n  };\n}\nfunction closestDataStack(node) {\n  if (node._x_dataStack)\n    return node._x_dataStack;\n  if (typeof ShadowRoot === \"function\" && node instanceof ShadowRoot) {\n    return closestDataStack(node.host);\n  }\n  if (!node.parentNode) {\n    return [];\n  }\n  return closestDataStack(node.parentNode);\n}\nfunction mergeProxies(objects) {\n  return new Proxy({ objects }, mergeProxyTrap);\n}\nvar mergeProxyTrap = {\n  ownKeys({ objects }) {\n    return Array.from(\n      new Set(objects.flatMap((i) => Object.keys(i)))\n    );\n  },\n  has({ objects }, name) {\n    if (name == Symbol.unscopables)\n      return false;\n    return objects.some(\n      (obj) => Object.prototype.hasOwnProperty.call(obj, name) || Reflect.has(obj, name)\n    );\n  },\n  get({ objects }, name, thisProxy) {\n    if (name == \"toJSON\")\n      return collapseProxies;\n    return Reflect.get(\n      objects.find(\n        (obj) => Reflect.has(obj, name)\n      ) || {},\n      name,\n      thisProxy\n    );\n  },\n  set({ objects }, name, value, thisProxy) {\n    const target = objects.find(\n      (obj) => Object.prototype.hasOwnProperty.call(obj, name)\n    ) || objects[objects.length - 1];\n    const descriptor = Object.getOwnPropertyDescriptor(target, name);\n    if (descriptor?.set && descriptor?.get)\n      return descriptor.set.call(thisProxy, value) || true;\n    return Reflect.set(target, name, value);\n  }\n};\nfunction collapseProxies() {\n  let keys = Reflect.ownKeys(this);\n  return keys.reduce((acc, key) => {\n    acc[key] = Reflect.get(this, key);\n    return acc;\n  }, {});\n}\n\n// packages/alpinejs/src/interceptor.js\nfunction initInterceptors(data2) {\n  let isObject2 = (val) => typeof val === \"object\" && !Array.isArray(val) && val !== null;\n  let recurse = (obj, basePath = \"\") => {\n    Object.entries(Object.getOwnPropertyDescriptors(obj)).forEach(([key, { value, enumerable }]) => {\n      if (enumerable === false || value === void 0)\n        return;\n      if (typeof value === \"object\" && value !== null && value.__v_skip)\n        return;\n      let path = basePath === \"\" ? key : `${basePath}.${key}`;\n      if (typeof value === \"object\" && value !== null && value._x_interceptor) {\n        obj[key] = value.initialize(data2, path, key);\n      } else {\n        if (isObject2(value) && value !== obj && !(value instanceof Element)) {\n          recurse(value, path);\n        }\n      }\n    });\n  };\n  return recurse(data2);\n}\nfunction interceptor(callback, mutateObj = () => {\n}) {\n  let obj = {\n    initialValue: void 0,\n    _x_interceptor: true,\n    initialize(data2, path, key) {\n      return callback(this.initialValue, () => get(data2, path), (value) => set(data2, path, value), path, key);\n    }\n  };\n  mutateObj(obj);\n  return (initialValue) => {\n    if (typeof initialValue === \"object\" && initialValue !== null && initialValue._x_interceptor) {\n      let initialize = obj.initialize.bind(obj);\n      obj.initialize = (data2, path, key) => {\n        let innerValue = initialValue.initialize(data2, path, key);\n        obj.initialValue = innerValue;\n        return initialize(data2, path, key);\n      };\n    } else {\n      obj.initialValue = initialValue;\n    }\n    return obj;\n  };\n}\nfunction get(obj, path) {\n  return path.split(\".\").reduce((carry, segment) => carry[segment], obj);\n}\nfunction set(obj, path, value) {\n  if (typeof path === \"string\")\n    path = path.split(\".\");\n  if (path.length === 1)\n    obj[path[0]] = value;\n  else if (path.length === 0)\n    throw error;\n  else {\n    if (obj[path[0]])\n      return set(obj[path[0]], path.slice(1), value);\n    else {\n      obj[path[0]] = {};\n      return set(obj[path[0]], path.slice(1), value);\n    }\n  }\n}\n\n// packages/alpinejs/src/magics.js\nvar magics = {};\nfunction magic(name, callback) {\n  magics[name] = callback;\n}\nfunction injectMagics(obj, el) {\n  let memoizedUtilities = getUtilities(el);\n  Object.entries(magics).forEach(([name, callback]) => {\n    Object.defineProperty(obj, `$${name}`, {\n      get() {\n        return callback(el, memoizedUtilities);\n      },\n      enumerable: false\n    });\n  });\n  return obj;\n}\nfunction getUtilities(el) {\n  let [utilities, cleanup2] = getElementBoundUtilities(el);\n  let utils = { interceptor, ...utilities };\n  onElRemoved(el, cleanup2);\n  return utils;\n}\n\n// packages/alpinejs/src/utils/error.js\nfunction tryCatch(el, expression, callback, ...args) {\n  try {\n    return callback(...args);\n  } catch (e) {\n    handleError(e, el, expression);\n  }\n}\nfunction handleError(error2, el, expression = void 0) {\n  error2 = Object.assign(\n    error2 ?? { message: \"No error message given.\" },\n    { el, expression }\n  );\n  console.warn(`Alpine Expression Error: ${error2.message}\n\n${expression ? 'Expression: \"' + expression + '\"\\n\\n' : \"\"}`, el);\n  setTimeout(() => {\n    throw error2;\n  }, 0);\n}\n\n// packages/alpinejs/src/evaluator.js\nvar shouldAutoEvaluateFunctions = true;\nfunction dontAutoEvaluateFunctions(callback) {\n  let cache = shouldAutoEvaluateFunctions;\n  shouldAutoEvaluateFunctions = false;\n  let result = callback();\n  shouldAutoEvaluateFunctions = cache;\n  return result;\n}\nfunction evaluate(el, expression, extras = {}) {\n  let result;\n  evaluateLater(el, expression)((value) => result = value, extras);\n  return result;\n}\nfunction evaluateLater(...args) {\n  return theEvaluatorFunction(...args);\n}\nvar theEvaluatorFunction = normalEvaluator;\nfunction setEvaluator(newEvaluator) {\n  theEvaluatorFunction = newEvaluator;\n}\nfunction normalEvaluator(el, expression) {\n  let overriddenMagics = {};\n  injectMagics(overriddenMagics, el);\n  let dataStack = [overriddenMagics, ...closestDataStack(el)];\n  let evaluator = typeof expression === \"function\" ? generateEvaluatorFromFunction(dataStack, expression) : generateEvaluatorFromString(dataStack, expression, el);\n  return tryCatch.bind(null, el, expression, evaluator);\n}\nfunction generateEvaluatorFromFunction(dataStack, func) {\n  return (receiver = () => {\n  }, { scope: scope2 = {}, params = [] } = {}) => {\n    let result = func.apply(mergeProxies([scope2, ...dataStack]), params);\n    runIfTypeOfFunction(receiver, result);\n  };\n}\nvar evaluatorMemo = {};\nfunction generateFunctionFromString(expression, el) {\n  if (evaluatorMemo[expression]) {\n    return evaluatorMemo[expression];\n  }\n  let AsyncFunction = Object.getPrototypeOf(async function() {\n  }).constructor;\n  let rightSideSafeExpression = /^[\\n\\s]*if.*\\(.*\\)/.test(expression.trim()) || /^(let|const)\\s/.test(expression.trim()) ? `(async()=>{ ${expression} })()` : expression;\n  const safeAsyncFunction = () => {\n    try {\n      let func2 = new AsyncFunction(\n        [\"__self\", \"scope\"],\n        `with (scope) { __self.result = ${rightSideSafeExpression} }; __self.finished = true; return __self.result;`\n      );\n      Object.defineProperty(func2, \"name\", {\n        value: `[Alpine] ${expression}`\n      });\n      return func2;\n    } catch (error2) {\n      handleError(error2, el, expression);\n      return Promise.resolve();\n    }\n  };\n  let func = safeAsyncFunction();\n  evaluatorMemo[expression] = func;\n  return func;\n}\nfunction generateEvaluatorFromString(dataStack, expression, el) {\n  let func = generateFunctionFromString(expression, el);\n  return (receiver = () => {\n  }, { scope: scope2 = {}, params = [] } = {}) => {\n    func.result = void 0;\n    func.finished = false;\n    let completeScope = mergeProxies([scope2, ...dataStack]);\n    if (typeof func === \"function\") {\n      let promise = func(func, completeScope).catch((error2) => handleError(error2, el, expression));\n      if (func.finished) {\n        runIfTypeOfFunction(receiver, func.result, completeScope, params, el);\n        func.result = void 0;\n      } else {\n        promise.then((result) => {\n          runIfTypeOfFunction(receiver, result, completeScope, params, el);\n        }).catch((error2) => handleError(error2, el, expression)).finally(() => func.result = void 0);\n      }\n    }\n  };\n}\nfunction runIfTypeOfFunction(receiver, value, scope2, params, el) {\n  if (shouldAutoEvaluateFunctions && typeof value === \"function\") {\n    let result = value.apply(scope2, params);\n    if (result instanceof Promise) {\n      result.then((i) => runIfTypeOfFunction(receiver, i, scope2, params)).catch((error2) => handleError(error2, el, value));\n    } else {\n      receiver(result);\n    }\n  } else if (typeof value === \"object\" && value instanceof Promise) {\n    value.then((i) => receiver(i));\n  } else {\n    receiver(value);\n  }\n}\n\n// packages/alpinejs/src/directives.js\nvar prefixAsString = \"x-\";\nfunction prefix(subject = \"\") {\n  return prefixAsString + subject;\n}\nfunction setPrefix(newPrefix) {\n  prefixAsString = newPrefix;\n}\nvar directiveHandlers = {};\nfunction directive(name, callback) {\n  directiveHandlers[name] = callback;\n  return {\n    before(directive2) {\n      if (!directiveHandlers[directive2]) {\n        console.warn(String.raw`Cannot find directive \\`${directive2}\\`. \\`${name}\\` will use the default order of execution`);\n        return;\n      }\n      const pos = directiveOrder.indexOf(directive2);\n      directiveOrder.splice(pos >= 0 ? pos : directiveOrder.indexOf(\"DEFAULT\"), 0, name);\n    }\n  };\n}\nfunction directiveExists(name) {\n  return Object.keys(directiveHandlers).includes(name);\n}\nfunction directives(el, attributes, originalAttributeOverride) {\n  attributes = Array.from(attributes);\n  if (el._x_virtualDirectives) {\n    let vAttributes = Object.entries(el._x_virtualDirectives).map(([name, value]) => ({ name, value }));\n    let staticAttributes = attributesOnly(vAttributes);\n    vAttributes = vAttributes.map((attribute) => {\n      if (staticAttributes.find((attr) => attr.name === attribute.name)) {\n        return {\n          name: `x-bind:${attribute.name}`,\n          value: `\"${attribute.value}\"`\n        };\n      }\n      return attribute;\n    });\n    attributes = attributes.concat(vAttributes);\n  }\n  let transformedAttributeMap = {};\n  let directives2 = attributes.map(toTransformedAttributes((newName, oldName) => transformedAttributeMap[newName] = oldName)).filter(outNonAlpineAttributes).map(toParsedDirectives(transformedAttributeMap, originalAttributeOverride)).sort(byPriority);\n  return directives2.map((directive2) => {\n    return getDirectiveHandler(el, directive2);\n  });\n}\nfunction attributesOnly(attributes) {\n  return Array.from(attributes).map(toTransformedAttributes()).filter((attr) => !outNonAlpineAttributes(attr));\n}\nvar isDeferringHandlers = false;\nvar directiveHandlerStacks = /* @__PURE__ */ new Map();\nvar currentHandlerStackKey = Symbol();\nfunction deferHandlingDirectives(callback) {\n  isDeferringHandlers = true;\n  let key = Symbol();\n  currentHandlerStackKey = key;\n  directiveHandlerStacks.set(key, []);\n  let flushHandlers = () => {\n    while (directiveHandlerStacks.get(key).length)\n      directiveHandlerStacks.get(key).shift()();\n    directiveHandlerStacks.delete(key);\n  };\n  let stopDeferring = () => {\n    isDeferringHandlers = false;\n    flushHandlers();\n  };\n  callback(flushHandlers);\n  stopDeferring();\n}\nfunction getElementBoundUtilities(el) {\n  let cleanups = [];\n  let cleanup2 = (callback) => cleanups.push(callback);\n  let [effect3, cleanupEffect] = elementBoundEffect(el);\n  cleanups.push(cleanupEffect);\n  let utilities = {\n    Alpine: alpine_default,\n    effect: effect3,\n    cleanup: cleanup2,\n    evaluateLater: evaluateLater.bind(evaluateLater, el),\n    evaluate: evaluate.bind(evaluate, el)\n  };\n  let doCleanup = () => cleanups.forEach((i) => i());\n  return [utilities, doCleanup];\n}\nfunction getDirectiveHandler(el, directive2) {\n  let noop = () => {\n  };\n  let handler4 = directiveHandlers[directive2.type] || noop;\n  let [utilities, cleanup2] = getElementBoundUtilities(el);\n  onAttributeRemoved(el, directive2.original, cleanup2);\n  let fullHandler = () => {\n    if (el._x_ignore || el._x_ignoreSelf)\n      return;\n    handler4.inline && handler4.inline(el, directive2, utilities);\n    handler4 = handler4.bind(handler4, el, directive2, utilities);\n    isDeferringHandlers ? directiveHandlerStacks.get(currentHandlerStackKey).push(handler4) : handler4();\n  };\n  fullHandler.runCleanups = cleanup2;\n  return fullHandler;\n}\nvar startingWith = (subject, replacement) => ({ name, value }) => {\n  if (name.startsWith(subject))\n    name = name.replace(subject, replacement);\n  return { name, value };\n};\nvar into = (i) => i;\nfunction toTransformedAttributes(callback = () => {\n}) {\n  return ({ name, value }) => {\n    let { name: newName, value: newValue } = attributeTransformers.reduce((carry, transform) => {\n      return transform(carry);\n    }, { name, value });\n    if (newName !== name)\n      callback(newName, name);\n    return { name: newName, value: newValue };\n  };\n}\nvar attributeTransformers = [];\nfunction mapAttributes(callback) {\n  attributeTransformers.push(callback);\n}\nfunction outNonAlpineAttributes({ name }) {\n  return alpineAttributeRegex().test(name);\n}\nvar alpineAttributeRegex = () => new RegExp(`^${prefixAsString}([^:^.]+)\\\\b`);\nfunction toParsedDirectives(transformedAttributeMap, originalAttributeOverride) {\n  return ({ name, value }) => {\n    let typeMatch = name.match(alpineAttributeRegex());\n    let valueMatch = name.match(/:([a-zA-Z0-9\\-_:]+)/);\n    let modifiers = name.match(/\\.[^.\\]]+(?=[^\\]]*$)/g) || [];\n    let original = originalAttributeOverride || transformedAttributeMap[name] || name;\n    return {\n      type: typeMatch ? typeMatch[1] : null,\n      value: valueMatch ? valueMatch[1] : null,\n      modifiers: modifiers.map((i) => i.replace(\".\", \"\")),\n      expression: value,\n      original\n    };\n  };\n}\nvar DEFAULT = \"DEFAULT\";\nvar directiveOrder = [\n  \"ignore\",\n  \"ref\",\n  \"data\",\n  \"id\",\n  \"anchor\",\n  \"bind\",\n  \"init\",\n  \"for\",\n  \"model\",\n  \"modelable\",\n  \"transition\",\n  \"show\",\n  \"if\",\n  DEFAULT,\n  \"teleport\"\n];\nfunction byPriority(a, b) {\n  let typeA = directiveOrder.indexOf(a.type) === -1 ? DEFAULT : a.type;\n  let typeB = directiveOrder.indexOf(b.type) === -1 ? DEFAULT : b.type;\n  return directiveOrder.indexOf(typeA) - directiveOrder.indexOf(typeB);\n}\n\n// packages/alpinejs/src/utils/dispatch.js\nfunction dispatch(el, name, detail = {}) {\n  el.dispatchEvent(\n    new CustomEvent(name, {\n      detail,\n      bubbles: true,\n      // Allows events to pass the shadow DOM barrier.\n      composed: true,\n      cancelable: true\n    })\n  );\n}\n\n// packages/alpinejs/src/utils/walk.js\nfunction walk(el, callback) {\n  if (typeof ShadowRoot === \"function\" && el instanceof ShadowRoot) {\n    Array.from(el.children).forEach((el2) => walk(el2, callback));\n    return;\n  }\n  let skip = false;\n  callback(el, () => skip = true);\n  if (skip)\n    return;\n  let node = el.firstElementChild;\n  while (node) {\n    walk(node, callback, false);\n    node = node.nextElementSibling;\n  }\n}\n\n// packages/alpinejs/src/utils/warn.js\nfunction warn(message, ...args) {\n  console.warn(`Alpine Warning: ${message}`, ...args);\n}\n\n// packages/alpinejs/src/lifecycle.js\nvar started = false;\nfunction start() {\n  if (started)\n    warn(\"Alpine has already been initialized on this page. Calling Alpine.start() more than once can cause problems.\");\n  started = true;\n  if (!document.body)\n    warn(\"Unable to initialize. Trying to load Alpine before `<body>` is available. Did you forget to add `defer` in Alpine's `<script>` tag?\");\n  dispatch(document, \"alpine:init\");\n  dispatch(document, \"alpine:initializing\");\n  startObservingMutations();\n  onElAdded((el) => initTree(el, walk));\n  onElRemoved((el) => destroyTree(el));\n  onAttributesAdded((el, attrs) => {\n    directives(el, attrs).forEach((handle) => handle());\n  });\n  let outNestedComponents = (el) => !closestRoot(el.parentElement, true);\n  Array.from(document.querySelectorAll(allSelectors().join(\",\"))).filter(outNestedComponents).forEach((el) => {\n    initTree(el);\n  });\n  dispatch(document, \"alpine:initialized\");\n  setTimeout(() => {\n    warnAboutMissingPlugins();\n  });\n}\nvar rootSelectorCallbacks = [];\nvar initSelectorCallbacks = [];\nfunction rootSelectors() {\n  return rootSelectorCallbacks.map((fn) => fn());\n}\nfunction allSelectors() {\n  return rootSelectorCallbacks.concat(initSelectorCallbacks).map((fn) => fn());\n}\nfunction addRootSelector(selectorCallback) {\n  rootSelectorCallbacks.push(selectorCallback);\n}\nfunction addInitSelector(selectorCallback) {\n  initSelectorCallbacks.push(selectorCallback);\n}\nfunction closestRoot(el, includeInitSelectors = false) {\n  return findClosest(el, (element) => {\n    const selectors = includeInitSelectors ? allSelectors() : rootSelectors();\n    if (selectors.some((selector) => element.matches(selector)))\n      return true;\n  });\n}\nfunction findClosest(el, callback) {\n  if (!el)\n    return;\n  if (callback(el))\n    return el;\n  if (el._x_teleportBack)\n    el = el._x_teleportBack;\n  if (!el.parentElement)\n    return;\n  return findClosest(el.parentElement, callback);\n}\nfunction isRoot(el) {\n  return rootSelectors().some((selector) => el.matches(selector));\n}\nvar initInterceptors2 = [];\nfunction interceptInit(callback) {\n  initInterceptors2.push(callback);\n}\nvar markerDispenser = 1;\nfunction initTree(el, walker = walk, intercept = () => {\n}) {\n  if (findClosest(el, (i) => i._x_ignore))\n    return;\n  deferHandlingDirectives(() => {\n    walker(el, (el2, skip) => {\n      if (el2._x_marker)\n        return;\n      intercept(el2, skip);\n      initInterceptors2.forEach((i) => i(el2, skip));\n      directives(el2, el2.attributes).forEach((handle) => handle());\n      if (!el2._x_ignore)\n        el2._x_marker = markerDispenser++;\n      el2._x_ignore && skip();\n    });\n  });\n}\nfunction destroyTree(root, walker = walk) {\n  walker(root, (el) => {\n    cleanupElement(el);\n    cleanupAttributes(el);\n    delete el._x_marker;\n  });\n}\nfunction warnAboutMissingPlugins() {\n  let pluginDirectives = [\n    [\"ui\", \"dialog\", [\"[x-dialog], [x-popover]\"]],\n    [\"anchor\", \"anchor\", [\"[x-anchor]\"]],\n    [\"sort\", \"sort\", [\"[x-sort]\"]]\n  ];\n  pluginDirectives.forEach(([plugin2, directive2, selectors]) => {\n    if (directiveExists(directive2))\n      return;\n    selectors.some((selector) => {\n      if (document.querySelector(selector)) {\n        warn(`found \"${selector}\", but missing ${plugin2} plugin`);\n        return true;\n      }\n    });\n  });\n}\n\n// packages/alpinejs/src/nextTick.js\nvar tickStack = [];\nvar isHolding = false;\nfunction nextTick(callback = () => {\n}) {\n  queueMicrotask(() => {\n    isHolding || setTimeout(() => {\n      releaseNextTicks();\n    });\n  });\n  return new Promise((res) => {\n    tickStack.push(() => {\n      callback();\n      res();\n    });\n  });\n}\nfunction releaseNextTicks() {\n  isHolding = false;\n  while (tickStack.length)\n    tickStack.shift()();\n}\nfunction holdNextTicks() {\n  isHolding = true;\n}\n\n// packages/alpinejs/src/utils/classes.js\nfunction setClasses(el, value) {\n  if (Array.isArray(value)) {\n    return setClassesFromString(el, value.join(\" \"));\n  } else if (typeof value === \"object\" && value !== null) {\n    return setClassesFromObject(el, value);\n  } else if (typeof value === \"function\") {\n    return setClasses(el, value());\n  }\n  return setClassesFromString(el, value);\n}\nfunction setClassesFromString(el, classString) {\n  let split = (classString2) => classString2.split(\" \").filter(Boolean);\n  let missingClasses = (classString2) => classString2.split(\" \").filter((i) => !el.classList.contains(i)).filter(Boolean);\n  let addClassesAndReturnUndo = (classes) => {\n    el.classList.add(...classes);\n    return () => {\n      el.classList.remove(...classes);\n    };\n  };\n  classString = classString === true ? classString = \"\" : classString || \"\";\n  return addClassesAndReturnUndo(missingClasses(classString));\n}\nfunction setClassesFromObject(el, classObject) {\n  let split = (classString) => classString.split(\" \").filter(Boolean);\n  let forAdd = Object.entries(classObject).flatMap(([classString, bool]) => bool ? split(classString) : false).filter(Boolean);\n  let forRemove = Object.entries(classObject).flatMap(([classString, bool]) => !bool ? split(classString) : false).filter(Boolean);\n  let added = [];\n  let removed = [];\n  forRemove.forEach((i) => {\n    if (el.classList.contains(i)) {\n      el.classList.remove(i);\n      removed.push(i);\n    }\n  });\n  forAdd.forEach((i) => {\n    if (!el.classList.contains(i)) {\n      el.classList.add(i);\n      added.push(i);\n    }\n  });\n  return () => {\n    removed.forEach((i) => el.classList.add(i));\n    added.forEach((i) => el.classList.remove(i));\n  };\n}\n\n// packages/alpinejs/src/utils/styles.js\nfunction setStyles(el, value) {\n  if (typeof value === \"object\" && value !== null) {\n    return setStylesFromObject(el, value);\n  }\n  return setStylesFromString(el, value);\n}\nfunction setStylesFromObject(el, value) {\n  let previousStyles = {};\n  Object.entries(value).forEach(([key, value2]) => {\n    previousStyles[key] = el.style[key];\n    if (!key.startsWith(\"--\")) {\n      key = kebabCase(key);\n    }\n    el.style.setProperty(key, value2);\n  });\n  setTimeout(() => {\n    if (el.style.length === 0) {\n      el.removeAttribute(\"style\");\n    }\n  });\n  return () => {\n    setStyles(el, previousStyles);\n  };\n}\nfunction setStylesFromString(el, value) {\n  let cache = el.getAttribute(\"style\", value);\n  el.setAttribute(\"style\", value);\n  return () => {\n    el.setAttribute(\"style\", cache || \"\");\n  };\n}\nfunction kebabCase(subject) {\n  return subject.replace(/([a-z])([A-Z])/g, \"$1-$2\").toLowerCase();\n}\n\n// packages/alpinejs/src/utils/once.js\nfunction once(callback, fallback = () => {\n}) {\n  let called = false;\n  return function() {\n    if (!called) {\n      called = true;\n      callback.apply(this, arguments);\n    } else {\n      fallback.apply(this, arguments);\n    }\n  };\n}\n\n// packages/alpinejs/src/directives/x-transition.js\ndirective(\"transition\", (el, { value, modifiers, expression }, { evaluate: evaluate2 }) => {\n  if (typeof expression === \"function\")\n    expression = evaluate2(expression);\n  if (expression === false)\n    return;\n  if (!expression || typeof expression === \"boolean\") {\n    registerTransitionsFromHelper(el, modifiers, value);\n  } else {\n    registerTransitionsFromClassString(el, expression, value);\n  }\n});\nfunction registerTransitionsFromClassString(el, classString, stage) {\n  registerTransitionObject(el, setClasses, \"\");\n  let directiveStorageMap = {\n    \"enter\": (classes) => {\n      el._x_transition.enter.during = classes;\n    },\n    \"enter-start\": (classes) => {\n      el._x_transition.enter.start = classes;\n    },\n    \"enter-end\": (classes) => {\n      el._x_transition.enter.end = classes;\n    },\n    \"leave\": (classes) => {\n      el._x_transition.leave.during = classes;\n    },\n    \"leave-start\": (classes) => {\n      el._x_transition.leave.start = classes;\n    },\n    \"leave-end\": (classes) => {\n      el._x_transition.leave.end = classes;\n    }\n  };\n  directiveStorageMap[stage](classString);\n}\nfunction registerTransitionsFromHelper(el, modifiers, stage) {\n  registerTransitionObject(el, setStyles);\n  let doesntSpecify = !modifiers.includes(\"in\") && !modifiers.includes(\"out\") && !stage;\n  let transitioningIn = doesntSpecify || modifiers.includes(\"in\") || [\"enter\"].includes(stage);\n  let transitioningOut = doesntSpecify || modifiers.includes(\"out\") || [\"leave\"].includes(stage);\n  if (modifiers.includes(\"in\") && !doesntSpecify) {\n    modifiers = modifiers.filter((i, index) => index < modifiers.indexOf(\"out\"));\n  }\n  if (modifiers.includes(\"out\") && !doesntSpecify) {\n    modifiers = modifiers.filter((i, index) => index > modifiers.indexOf(\"out\"));\n  }\n  let wantsAll = !modifiers.includes(\"opacity\") && !modifiers.includes(\"scale\");\n  let wantsOpacity = wantsAll || modifiers.includes(\"opacity\");\n  let wantsScale = wantsAll || modifiers.includes(\"scale\");\n  let opacityValue = wantsOpacity ? 0 : 1;\n  let scaleValue = wantsScale ? modifierValue(modifiers, \"scale\", 95) / 100 : 1;\n  let delay = modifierValue(modifiers, \"delay\", 0) / 1e3;\n  let origin = modifierValue(modifiers, \"origin\", \"center\");\n  let property = \"opacity, transform\";\n  let durationIn = modifierValue(modifiers, \"duration\", 150) / 1e3;\n  let durationOut = modifierValue(modifiers, \"duration\", 75) / 1e3;\n  let easing = `cubic-bezier(0.4, 0.0, 0.2, 1)`;\n  if (transitioningIn) {\n    el._x_transition.enter.during = {\n      transformOrigin: origin,\n      transitionDelay: `${delay}s`,\n      transitionProperty: property,\n      transitionDuration: `${durationIn}s`,\n      transitionTimingFunction: easing\n    };\n    el._x_transition.enter.start = {\n      opacity: opacityValue,\n      transform: `scale(${scaleValue})`\n    };\n    el._x_transition.enter.end = {\n      opacity: 1,\n      transform: `scale(1)`\n    };\n  }\n  if (transitioningOut) {\n    el._x_transition.leave.during = {\n      transformOrigin: origin,\n      transitionDelay: `${delay}s`,\n      transitionProperty: property,\n      transitionDuration: `${durationOut}s`,\n      transitionTimingFunction: easing\n    };\n    el._x_transition.leave.start = {\n      opacity: 1,\n      transform: `scale(1)`\n    };\n    el._x_transition.leave.end = {\n      opacity: opacityValue,\n      transform: `scale(${scaleValue})`\n    };\n  }\n}\nfunction registerTransitionObject(el, setFunction, defaultValue = {}) {\n  if (!el._x_transition)\n    el._x_transition = {\n      enter: { during: defaultValue, start: defaultValue, end: defaultValue },\n      leave: { during: defaultValue, start: defaultValue, end: defaultValue },\n      in(before = () => {\n      }, after = () => {\n      }) {\n        transition(el, setFunction, {\n          during: this.enter.during,\n          start: this.enter.start,\n          end: this.enter.end\n        }, before, after);\n      },\n      out(before = () => {\n      }, after = () => {\n      }) {\n        transition(el, setFunction, {\n          during: this.leave.during,\n          start: this.leave.start,\n          end: this.leave.end\n        }, before, after);\n      }\n    };\n}\nwindow.Element.prototype._x_toggleAndCascadeWithTransitions = function(el, value, show, hide) {\n  const nextTick2 = document.visibilityState === \"visible\" ? requestAnimationFrame : setTimeout;\n  let clickAwayCompatibleShow = () => nextTick2(show);\n  if (value) {\n    if (el._x_transition && (el._x_transition.enter || el._x_transition.leave)) {\n      el._x_transition.enter && (Object.entries(el._x_transition.enter.during).length || Object.entries(el._x_transition.enter.start).length || Object.entries(el._x_transition.enter.end).length) ? el._x_transition.in(show) : clickAwayCompatibleShow();\n    } else {\n      el._x_transition ? el._x_transition.in(show) : clickAwayCompatibleShow();\n    }\n    return;\n  }\n  el._x_hidePromise = el._x_transition ? new Promise((resolve, reject) => {\n    el._x_transition.out(() => {\n    }, () => resolve(hide));\n    el._x_transitioning && el._x_transitioning.beforeCancel(() => reject({ isFromCancelledTransition: true }));\n  }) : Promise.resolve(hide);\n  queueMicrotask(() => {\n    let closest = closestHide(el);\n    if (closest) {\n      if (!closest._x_hideChildren)\n        closest._x_hideChildren = [];\n      closest._x_hideChildren.push(el);\n    } else {\n      nextTick2(() => {\n        let hideAfterChildren = (el2) => {\n          let carry = Promise.all([\n            el2._x_hidePromise,\n            ...(el2._x_hideChildren || []).map(hideAfterChildren)\n          ]).then(([i]) => i?.());\n          delete el2._x_hidePromise;\n          delete el2._x_hideChildren;\n          return carry;\n        };\n        hideAfterChildren(el).catch((e) => {\n          if (!e.isFromCancelledTransition)\n            throw e;\n        });\n      });\n    }\n  });\n};\nfunction closestHide(el) {\n  let parent = el.parentNode;\n  if (!parent)\n    return;\n  return parent._x_hidePromise ? parent : closestHide(parent);\n}\nfunction transition(el, setFunction, { during, start: start2, end } = {}, before = () => {\n}, after = () => {\n}) {\n  if (el._x_transitioning)\n    el._x_transitioning.cancel();\n  if (Object.keys(during).length === 0 && Object.keys(start2).length === 0 && Object.keys(end).length === 0) {\n    before();\n    after();\n    return;\n  }\n  let undoStart, undoDuring, undoEnd;\n  performTransition(el, {\n    start() {\n      undoStart = setFunction(el, start2);\n    },\n    during() {\n      undoDuring = setFunction(el, during);\n    },\n    before,\n    end() {\n      undoStart();\n      undoEnd = setFunction(el, end);\n    },\n    after,\n    cleanup() {\n      undoDuring();\n      undoEnd();\n    }\n  });\n}\nfunction performTransition(el, stages) {\n  let interrupted, reachedBefore, reachedEnd;\n  let finish = once(() => {\n    mutateDom(() => {\n      interrupted = true;\n      if (!reachedBefore)\n        stages.before();\n      if (!reachedEnd) {\n        stages.end();\n        releaseNextTicks();\n      }\n      stages.after();\n      if (el.isConnected)\n        stages.cleanup();\n      delete el._x_transitioning;\n    });\n  });\n  el._x_transitioning = {\n    beforeCancels: [],\n    beforeCancel(callback) {\n      this.beforeCancels.push(callback);\n    },\n    cancel: once(function() {\n      while (this.beforeCancels.length) {\n        this.beforeCancels.shift()();\n      }\n      ;\n      finish();\n    }),\n    finish\n  };\n  mutateDom(() => {\n    stages.start();\n    stages.during();\n  });\n  holdNextTicks();\n  requestAnimationFrame(() => {\n    if (interrupted)\n      return;\n    let duration = Number(getComputedStyle(el).transitionDuration.replace(/,.*/, \"\").replace(\"s\", \"\")) * 1e3;\n    let delay = Number(getComputedStyle(el).transitionDelay.replace(/,.*/, \"\").replace(\"s\", \"\")) * 1e3;\n    if (duration === 0)\n      duration = Number(getComputedStyle(el).animationDuration.replace(\"s\", \"\")) * 1e3;\n    mutateDom(() => {\n      stages.before();\n    });\n    reachedBefore = true;\n    requestAnimationFrame(() => {\n      if (interrupted)\n        return;\n      mutateDom(() => {\n        stages.end();\n      });\n      releaseNextTicks();\n      setTimeout(el._x_transitioning.finish, duration + delay);\n      reachedEnd = true;\n    });\n  });\n}\nfunction modifierValue(modifiers, key, fallback) {\n  if (modifiers.indexOf(key) === -1)\n    return fallback;\n  const rawValue = modifiers[modifiers.indexOf(key) + 1];\n  if (!rawValue)\n    return fallback;\n  if (key === \"scale\") {\n    if (isNaN(rawValue))\n      return fallback;\n  }\n  if (key === \"duration\" || key === \"delay\") {\n    let match = rawValue.match(/([0-9]+)ms/);\n    if (match)\n      return match[1];\n  }\n  if (key === \"origin\") {\n    if ([\"top\", \"right\", \"left\", \"center\", \"bottom\"].includes(modifiers[modifiers.indexOf(key) + 2])) {\n      return [rawValue, modifiers[modifiers.indexOf(key) + 2]].join(\" \");\n    }\n  }\n  return rawValue;\n}\n\n// packages/alpinejs/src/clone.js\nvar isCloning = false;\nfunction skipDuringClone(callback, fallback = () => {\n}) {\n  return (...args) => isCloning ? fallback(...args) : callback(...args);\n}\nfunction onlyDuringClone(callback) {\n  return (...args) => isCloning && callback(...args);\n}\nvar interceptors = [];\nfunction interceptClone(callback) {\n  interceptors.push(callback);\n}\nfunction cloneNode(from, to) {\n  interceptors.forEach((i) => i(from, to));\n  isCloning = true;\n  dontRegisterReactiveSideEffects(() => {\n    initTree(to, (el, callback) => {\n      callback(el, () => {\n      });\n    });\n  });\n  isCloning = false;\n}\nvar isCloningLegacy = false;\nfunction clone(oldEl, newEl) {\n  if (!newEl._x_dataStack)\n    newEl._x_dataStack = oldEl._x_dataStack;\n  isCloning = true;\n  isCloningLegacy = true;\n  dontRegisterReactiveSideEffects(() => {\n    cloneTree(newEl);\n  });\n  isCloning = false;\n  isCloningLegacy = false;\n}\nfunction cloneTree(el) {\n  let hasRunThroughFirstEl = false;\n  let shallowWalker = (el2, callback) => {\n    walk(el2, (el3, skip) => {\n      if (hasRunThroughFirstEl && isRoot(el3))\n        return skip();\n      hasRunThroughFirstEl = true;\n      callback(el3, skip);\n    });\n  };\n  initTree(el, shallowWalker);\n}\nfunction dontRegisterReactiveSideEffects(callback) {\n  let cache = effect;\n  overrideEffect((callback2, el) => {\n    let storedEffect = cache(callback2);\n    release(storedEffect);\n    return () => {\n    };\n  });\n  callback();\n  overrideEffect(cache);\n}\n\n// packages/alpinejs/src/utils/bind.js\nfunction bind(el, name, value, modifiers = []) {\n  if (!el._x_bindings)\n    el._x_bindings = reactive({});\n  el._x_bindings[name] = value;\n  name = modifiers.includes(\"camel\") ? camelCase(name) : name;\n  switch (name) {\n    case \"value\":\n      bindInputValue(el, value);\n      break;\n    case \"style\":\n      bindStyles(el, value);\n      break;\n    case \"class\":\n      bindClasses(el, value);\n      break;\n    case \"selected\":\n    case \"checked\":\n      bindAttributeAndProperty(el, name, value);\n      break;\n    default:\n      bindAttribute(el, name, value);\n      break;\n  }\n}\nfunction bindInputValue(el, value) {\n  if (isRadio(el)) {\n    if (el.attributes.value === void 0) {\n      el.value = value;\n    }\n    if (window.fromModel) {\n      if (typeof value === \"boolean\") {\n        el.checked = safeParseBoolean(el.value) === value;\n      } else {\n        el.checked = checkedAttrLooseCompare(el.value, value);\n      }\n    }\n  } else if (isCheckbox(el)) {\n    if (Number.isInteger(value)) {\n      el.value = value;\n    } else if (!Array.isArray(value) && typeof value !== \"boolean\" && ![null, void 0].includes(value)) {\n      el.value = String(value);\n    } else {\n      if (Array.isArray(value)) {\n        el.checked = value.some((val) => checkedAttrLooseCompare(val, el.value));\n      } else {\n        el.checked = !!value;\n      }\n    }\n  } else if (el.tagName === \"SELECT\") {\n    updateSelect(el, value);\n  } else {\n    if (el.value === value)\n      return;\n    el.value = value === void 0 ? \"\" : value;\n  }\n}\nfunction bindClasses(el, value) {\n  if (el._x_undoAddedClasses)\n    el._x_undoAddedClasses();\n  el._x_undoAddedClasses = setClasses(el, value);\n}\nfunction bindStyles(el, value) {\n  if (el._x_undoAddedStyles)\n    el._x_undoAddedStyles();\n  el._x_undoAddedStyles = setStyles(el, value);\n}\nfunction bindAttributeAndProperty(el, name, value) {\n  bindAttribute(el, name, value);\n  setPropertyIfChanged(el, name, value);\n}\nfunction bindAttribute(el, name, value) {\n  if ([null, void 0, false].includes(value) && attributeShouldntBePreservedIfFalsy(name)) {\n    el.removeAttribute(name);\n  } else {\n    if (isBooleanAttr(name))\n      value = name;\n    setIfChanged(el, name, value);\n  }\n}\nfunction setIfChanged(el, attrName, value) {\n  if (el.getAttribute(attrName) != value) {\n    el.setAttribute(attrName, value);\n  }\n}\nfunction setPropertyIfChanged(el, propName, value) {\n  if (el[propName] !== value) {\n    el[propName] = value;\n  }\n}\nfunction updateSelect(el, value) {\n  const arrayWrappedValue = [].concat(value).map((value2) => {\n    return value2 + \"\";\n  });\n  Array.from(el.options).forEach((option) => {\n    option.selected = arrayWrappedValue.includes(option.value);\n  });\n}\nfunction camelCase(subject) {\n  return subject.toLowerCase().replace(/-(\\w)/g, (match, char) => char.toUpperCase());\n}\nfunction checkedAttrLooseCompare(valueA, valueB) {\n  return valueA == valueB;\n}\nfunction safeParseBoolean(rawValue) {\n  if ([1, \"1\", \"true\", \"on\", \"yes\", true].includes(rawValue)) {\n    return true;\n  }\n  if ([0, \"0\", \"false\", \"off\", \"no\", false].includes(rawValue)) {\n    return false;\n  }\n  return rawValue ? Boolean(rawValue) : null;\n}\nvar booleanAttributes = /* @__PURE__ */ new Set([\n  \"allowfullscreen\",\n  \"async\",\n  \"autofocus\",\n  \"autoplay\",\n  \"checked\",\n  \"controls\",\n  \"default\",\n  \"defer\",\n  \"disabled\",\n  \"formnovalidate\",\n  \"inert\",\n  \"ismap\",\n  \"itemscope\",\n  \"loop\",\n  \"multiple\",\n  \"muted\",\n  \"nomodule\",\n  \"novalidate\",\n  \"open\",\n  \"playsinline\",\n  \"readonly\",\n  \"required\",\n  \"reversed\",\n  \"selected\",\n  \"shadowrootclonable\",\n  \"shadowrootdelegatesfocus\",\n  \"shadowrootserializable\"\n]);\nfunction isBooleanAttr(attrName) {\n  return booleanAttributes.has(attrName);\n}\nfunction attributeShouldntBePreservedIfFalsy(name) {\n  return ![\"aria-pressed\", \"aria-checked\", \"aria-expanded\", \"aria-selected\"].includes(name);\n}\nfunction getBinding(el, name, fallback) {\n  if (el._x_bindings && el._x_bindings[name] !== void 0)\n    return el._x_bindings[name];\n  return getAttributeBinding(el, name, fallback);\n}\nfunction extractProp(el, name, fallback, extract = true) {\n  if (el._x_bindings && el._x_bindings[name] !== void 0)\n    return el._x_bindings[name];\n  if (el._x_inlineBindings && el._x_inlineBindings[name] !== void 0) {\n    let binding = el._x_inlineBindings[name];\n    binding.extract = extract;\n    return dontAutoEvaluateFunctions(() => {\n      return evaluate(el, binding.expression);\n    });\n  }\n  return getAttributeBinding(el, name, fallback);\n}\nfunction getAttributeBinding(el, name, fallback) {\n  let attr = el.getAttribute(name);\n  if (attr === null)\n    return typeof fallback === \"function\" ? fallback() : fallback;\n  if (attr === \"\")\n    return true;\n  if (isBooleanAttr(name)) {\n    return !![name, \"true\"].includes(attr);\n  }\n  return attr;\n}\nfunction isCheckbox(el) {\n  return el.type === \"checkbox\" || el.localName === \"ui-checkbox\" || el.localName === \"ui-switch\";\n}\nfunction isRadio(el) {\n  return el.type === \"radio\" || el.localName === \"ui-radio\";\n}\n\n// packages/alpinejs/src/utils/debounce.js\nfunction debounce(func, wait) {\n  var timeout;\n  return function() {\n    var context = this, args = arguments;\n    var later = function() {\n      timeout = null;\n      func.apply(context, args);\n    };\n    clearTimeout(timeout);\n    timeout = setTimeout(later, wait);\n  };\n}\n\n// packages/alpinejs/src/utils/throttle.js\nfunction throttle(func, limit) {\n  let inThrottle;\n  return function() {\n    let context = this, args = arguments;\n    if (!inThrottle) {\n      func.apply(context, args);\n      inThrottle = true;\n      setTimeout(() => inThrottle = false, limit);\n    }\n  };\n}\n\n// packages/alpinejs/src/entangle.js\nfunction entangle({ get: outerGet, set: outerSet }, { get: innerGet, set: innerSet }) {\n  let firstRun = true;\n  let outerHash;\n  let innerHash;\n  let reference = effect(() => {\n    let outer = outerGet();\n    let inner = innerGet();\n    if (firstRun) {\n      innerSet(cloneIfObject(outer));\n      firstRun = false;\n    } else {\n      let outerHashLatest = JSON.stringify(outer);\n      let innerHashLatest = JSON.stringify(inner);\n      if (outerHashLatest !== outerHash) {\n        innerSet(cloneIfObject(outer));\n      } else if (outerHashLatest !== innerHashLatest) {\n        outerSet(cloneIfObject(inner));\n      } else {\n      }\n    }\n    outerHash = JSON.stringify(outerGet());\n    innerHash = JSON.stringify(innerGet());\n  });\n  return () => {\n    release(reference);\n  };\n}\nfunction cloneIfObject(value) {\n  return typeof value === \"object\" ? JSON.parse(JSON.stringify(value)) : value;\n}\n\n// packages/alpinejs/src/plugin.js\nfunction plugin(callback) {\n  let callbacks = Array.isArray(callback) ? callback : [callback];\n  callbacks.forEach((i) => i(alpine_default));\n}\n\n// packages/alpinejs/src/store.js\nvar stores = {};\nvar isReactive = false;\nfunction store(name, value) {\n  if (!isReactive) {\n    stores = reactive(stores);\n    isReactive = true;\n  }\n  if (value === void 0) {\n    return stores[name];\n  }\n  stores[name] = value;\n  initInterceptors(stores[name]);\n  if (typeof value === \"object\" && value !== null && value.hasOwnProperty(\"init\") && typeof value.init === \"function\") {\n    stores[name].init();\n  }\n}\nfunction getStores() {\n  return stores;\n}\n\n// packages/alpinejs/src/binds.js\nvar binds = {};\nfunction bind2(name, bindings) {\n  let getBindings = typeof bindings !== \"function\" ? () => bindings : bindings;\n  if (name instanceof Element) {\n    return applyBindingsObject(name, getBindings());\n  } else {\n    binds[name] = getBindings;\n  }\n  return () => {\n  };\n}\nfunction injectBindingProviders(obj) {\n  Object.entries(binds).forEach(([name, callback]) => {\n    Object.defineProperty(obj, name, {\n      get() {\n        return (...args) => {\n          return callback(...args);\n        };\n      }\n    });\n  });\n  return obj;\n}\nfunction applyBindingsObject(el, obj, original) {\n  let cleanupRunners = [];\n  while (cleanupRunners.length)\n    cleanupRunners.pop()();\n  let attributes = Object.entries(obj).map(([name, value]) => ({ name, value }));\n  let staticAttributes = attributesOnly(attributes);\n  attributes = attributes.map((attribute) => {\n    if (staticAttributes.find((attr) => attr.name === attribute.name)) {\n      return {\n        name: `x-bind:${attribute.name}`,\n        value: `\"${attribute.value}\"`\n      };\n    }\n    return attribute;\n  });\n  directives(el, attributes, original).map((handle) => {\n    cleanupRunners.push(handle.runCleanups);\n    handle();\n  });\n  return () => {\n    while (cleanupRunners.length)\n      cleanupRunners.pop()();\n  };\n}\n\n// packages/alpinejs/src/datas.js\nvar datas = {};\nfunction data(name, callback) {\n  datas[name] = callback;\n}\nfunction injectDataProviders(obj, context) {\n  Object.entries(datas).forEach(([name, callback]) => {\n    Object.defineProperty(obj, name, {\n      get() {\n        return (...args) => {\n          return callback.bind(context)(...args);\n        };\n      },\n      enumerable: false\n    });\n  });\n  return obj;\n}\n\n// packages/alpinejs/src/alpine.js\nvar Alpine = {\n  get reactive() {\n    return reactive;\n  },\n  get release() {\n    return release;\n  },\n  get effect() {\n    return effect;\n  },\n  get raw() {\n    return raw;\n  },\n  version: \"3.14.8\",\n  flushAndStopDeferringMutations,\n  dontAutoEvaluateFunctions,\n  disableEffectScheduling,\n  startObservingMutations,\n  stopObservingMutations,\n  setReactivityEngine,\n  onAttributeRemoved,\n  onAttributesAdded,\n  closestDataStack,\n  skipDuringClone,\n  onlyDuringClone,\n  addRootSelector,\n  addInitSelector,\n  interceptClone,\n  addScopeToNode,\n  deferMutations,\n  mapAttributes,\n  evaluateLater,\n  interceptInit,\n  setEvaluator,\n  mergeProxies,\n  extractProp,\n  findClosest,\n  onElRemoved,\n  closestRoot,\n  destroyTree,\n  interceptor,\n  // INTERNAL: not public API and is subject to change without major release.\n  transition,\n  // INTERNAL\n  setStyles,\n  // INTERNAL\n  mutateDom,\n  directive,\n  entangle,\n  throttle,\n  debounce,\n  evaluate,\n  initTree,\n  nextTick,\n  prefixed: prefix,\n  prefix: setPrefix,\n  plugin,\n  magic,\n  store,\n  start,\n  clone,\n  // INTERNAL\n  cloneNode,\n  // INTERNAL\n  bound: getBinding,\n  $data: scope,\n  watch,\n  walk,\n  data,\n  bind: bind2\n};\nvar alpine_default = Alpine;\n\n// node_modules/@vue/shared/dist/shared.esm-bundler.js\nfunction makeMap(str, expectsLowerCase) {\n  const map = /* @__PURE__ */ Object.create(null);\n  const list = str.split(\",\");\n  for (let i = 0; i < list.length; i++) {\n    map[list[i]] = true;\n  }\n  return expectsLowerCase ? (val) => !!map[val.toLowerCase()] : (val) => !!map[val];\n}\nvar specialBooleanAttrs = `itemscope,allowfullscreen,formnovalidate,ismap,nomodule,novalidate,readonly`;\nvar isBooleanAttr2 = /* @__PURE__ */ makeMap(specialBooleanAttrs + `,async,autofocus,autoplay,controls,default,defer,disabled,hidden,loop,open,required,reversed,scoped,seamless,checked,muted,multiple,selected`);\nvar EMPTY_OBJ = true ? Object.freeze({}) : {};\nvar EMPTY_ARR = true ? Object.freeze([]) : [];\nvar hasOwnProperty = Object.prototype.hasOwnProperty;\nvar hasOwn = (val, key) => hasOwnProperty.call(val, key);\nvar isArray = Array.isArray;\nvar isMap = (val) => toTypeString(val) === \"[object Map]\";\nvar isString = (val) => typeof val === \"string\";\nvar isSymbol = (val) => typeof val === \"symbol\";\nvar isObject = (val) => val !== null && typeof val === \"object\";\nvar objectToString = Object.prototype.toString;\nvar toTypeString = (value) => objectToString.call(value);\nvar toRawType = (value) => {\n  return toTypeString(value).slice(8, -1);\n};\nvar isIntegerKey = (key) => isString(key) && key !== \"NaN\" && key[0] !== \"-\" && \"\" + parseInt(key, 10) === key;\nvar cacheStringFunction = (fn) => {\n  const cache = /* @__PURE__ */ Object.create(null);\n  return (str) => {\n    const hit = cache[str];\n    return hit || (cache[str] = fn(str));\n  };\n};\nvar camelizeRE = /-(\\w)/g;\nvar camelize = cacheStringFunction((str) => {\n  return str.replace(camelizeRE, (_, c) => c ? c.toUpperCase() : \"\");\n});\nvar hyphenateRE = /\\B([A-Z])/g;\nvar hyphenate = cacheStringFunction((str) => str.replace(hyphenateRE, \"-$1\").toLowerCase());\nvar capitalize = cacheStringFunction((str) => str.charAt(0).toUpperCase() + str.slice(1));\nvar toHandlerKey = cacheStringFunction((str) => str ? `on${capitalize(str)}` : ``);\nvar hasChanged = (value, oldValue) => value !== oldValue && (value === value || oldValue === oldValue);\n\n// node_modules/@vue/reactivity/dist/reactivity.esm-bundler.js\nvar targetMap = /* @__PURE__ */ new WeakMap();\nvar effectStack = [];\nvar activeEffect;\nvar ITERATE_KEY = Symbol(true ? \"iterate\" : \"\");\nvar MAP_KEY_ITERATE_KEY = Symbol(true ? \"Map key iterate\" : \"\");\nfunction isEffect(fn) {\n  return fn && fn._isEffect === true;\n}\nfunction effect2(fn, options = EMPTY_OBJ) {\n  if (isEffect(fn)) {\n    fn = fn.raw;\n  }\n  const effect3 = createReactiveEffect(fn, options);\n  if (!options.lazy) {\n    effect3();\n  }\n  return effect3;\n}\nfunction stop(effect3) {\n  if (effect3.active) {\n    cleanup(effect3);\n    if (effect3.options.onStop) {\n      effect3.options.onStop();\n    }\n    effect3.active = false;\n  }\n}\nvar uid = 0;\nfunction createReactiveEffect(fn, options) {\n  const effect3 = function reactiveEffect() {\n    if (!effect3.active) {\n      return fn();\n    }\n    if (!effectStack.includes(effect3)) {\n      cleanup(effect3);\n      try {\n        enableTracking();\n        effectStack.push(effect3);\n        activeEffect = effect3;\n        return fn();\n      } finally {\n        effectStack.pop();\n        resetTracking();\n        activeEffect = effectStack[effectStack.length - 1];\n      }\n    }\n  };\n  effect3.id = uid++;\n  effect3.allowRecurse = !!options.allowRecurse;\n  effect3._isEffect = true;\n  effect3.active = true;\n  effect3.raw = fn;\n  effect3.deps = [];\n  effect3.options = options;\n  return effect3;\n}\nfunction cleanup(effect3) {\n  const { deps } = effect3;\n  if (deps.length) {\n    for (let i = 0; i < deps.length; i++) {\n      deps[i].delete(effect3);\n    }\n    deps.length = 0;\n  }\n}\nvar shouldTrack = true;\nvar trackStack = [];\nfunction pauseTracking() {\n  trackStack.push(shouldTrack);\n  shouldTrack = false;\n}\nfunction enableTracking() {\n  trackStack.push(shouldTrack);\n  shouldTrack = true;\n}\nfunction resetTracking() {\n  const last = trackStack.pop();\n  shouldTrack = last === void 0 ? true : last;\n}\nfunction track(target, type, key) {\n  if (!shouldTrack || activeEffect === void 0) {\n    return;\n  }\n  let depsMap = targetMap.get(target);\n  if (!depsMap) {\n    targetMap.set(target, depsMap = /* @__PURE__ */ new Map());\n  }\n  let dep = depsMap.get(key);\n  if (!dep) {\n    depsMap.set(key, dep = /* @__PURE__ */ new Set());\n  }\n  if (!dep.has(activeEffect)) {\n    dep.add(activeEffect);\n    activeEffect.deps.push(dep);\n    if (activeEffect.options.onTrack) {\n      activeEffect.options.onTrack({\n        effect: activeEffect,\n        target,\n        type,\n        key\n      });\n    }\n  }\n}\nfunction trigger(target, type, key, newValue, oldValue, oldTarget) {\n  const depsMap = targetMap.get(target);\n  if (!depsMap) {\n    return;\n  }\n  const effects = /* @__PURE__ */ new Set();\n  const add2 = (effectsToAdd) => {\n    if (effectsToAdd) {\n      effectsToAdd.forEach((effect3) => {\n        if (effect3 !== activeEffect || effect3.allowRecurse) {\n          effects.add(effect3);\n        }\n      });\n    }\n  };\n  if (type === \"clear\") {\n    depsMap.forEach(add2);\n  } else if (key === \"length\" && isArray(target)) {\n    depsMap.forEach((dep, key2) => {\n      if (key2 === \"length\" || key2 >= newValue) {\n        add2(dep);\n      }\n    });\n  } else {\n    if (key !== void 0) {\n      add2(depsMap.get(key));\n    }\n    switch (type) {\n      case \"add\":\n        if (!isArray(target)) {\n          add2(depsMap.get(ITERATE_KEY));\n          if (isMap(target)) {\n            add2(depsMap.get(MAP_KEY_ITERATE_KEY));\n          }\n        } else if (isIntegerKey(key)) {\n          add2(depsMap.get(\"length\"));\n        }\n        break;\n      case \"delete\":\n        if (!isArray(target)) {\n          add2(depsMap.get(ITERATE_KEY));\n          if (isMap(target)) {\n            add2(depsMap.get(MAP_KEY_ITERATE_KEY));\n          }\n        }\n        break;\n      case \"set\":\n        if (isMap(target)) {\n          add2(depsMap.get(ITERATE_KEY));\n        }\n        break;\n    }\n  }\n  const run = (effect3) => {\n    if (effect3.options.onTrigger) {\n      effect3.options.onTrigger({\n        effect: effect3,\n        target,\n        key,\n        type,\n        newValue,\n        oldValue,\n        oldTarget\n      });\n    }\n    if (effect3.options.scheduler) {\n      effect3.options.scheduler(effect3);\n    } else {\n      effect3();\n    }\n  };\n  effects.forEach(run);\n}\nvar isNonTrackableKeys = /* @__PURE__ */ makeMap(`__proto__,__v_isRef,__isVue`);\nvar builtInSymbols = new Set(Object.getOwnPropertyNames(Symbol).map((key) => Symbol[key]).filter(isSymbol));\nvar get2 = /* @__PURE__ */ createGetter();\nvar readonlyGet = /* @__PURE__ */ createGetter(true);\nvar arrayInstrumentations = /* @__PURE__ */ createArrayInstrumentations();\nfunction createArrayInstrumentations() {\n  const instrumentations = {};\n  [\"includes\", \"indexOf\", \"lastIndexOf\"].forEach((key) => {\n    instrumentations[key] = function(...args) {\n      const arr = toRaw(this);\n      for (let i = 0, l = this.length; i < l; i++) {\n        track(arr, \"get\", i + \"\");\n      }\n      const res = arr[key](...args);\n      if (res === -1 || res === false) {\n        return arr[key](...args.map(toRaw));\n      } else {\n        return res;\n      }\n    };\n  });\n  [\"push\", \"pop\", \"shift\", \"unshift\", \"splice\"].forEach((key) => {\n    instrumentations[key] = function(...args) {\n      pauseTracking();\n      const res = toRaw(this)[key].apply(this, args);\n      resetTracking();\n      return res;\n    };\n  });\n  return instrumentations;\n}\nfunction createGetter(isReadonly = false, shallow = false) {\n  return function get3(target, key, receiver) {\n    if (key === \"__v_isReactive\") {\n      return !isReadonly;\n    } else if (key === \"__v_isReadonly\") {\n      return isReadonly;\n    } else if (key === \"__v_raw\" && receiver === (isReadonly ? shallow ? shallowReadonlyMap : readonlyMap : shallow ? shallowReactiveMap : reactiveMap).get(target)) {\n      return target;\n    }\n    const targetIsArray = isArray(target);\n    if (!isReadonly && targetIsArray && hasOwn(arrayInstrumentations, key)) {\n      return Reflect.get(arrayInstrumentations, key, receiver);\n    }\n    const res = Reflect.get(target, key, receiver);\n    if (isSymbol(key) ? builtInSymbols.has(key) : isNonTrackableKeys(key)) {\n      return res;\n    }\n    if (!isReadonly) {\n      track(target, \"get\", key);\n    }\n    if (shallow) {\n      return res;\n    }\n    if (isRef(res)) {\n      const shouldUnwrap = !targetIsArray || !isIntegerKey(key);\n      return shouldUnwrap ? res.value : res;\n    }\n    if (isObject(res)) {\n      return isReadonly ? readonly(res) : reactive2(res);\n    }\n    return res;\n  };\n}\nvar set2 = /* @__PURE__ */ createSetter();\nfunction createSetter(shallow = false) {\n  return function set3(target, key, value, receiver) {\n    let oldValue = target[key];\n    if (!shallow) {\n      value = toRaw(value);\n      oldValue = toRaw(oldValue);\n      if (!isArray(target) && isRef(oldValue) && !isRef(value)) {\n        oldValue.value = value;\n        return true;\n      }\n    }\n    const hadKey = isArray(target) && isIntegerKey(key) ? Number(key) < target.length : hasOwn(target, key);\n    const result = Reflect.set(target, key, value, receiver);\n    if (target === toRaw(receiver)) {\n      if (!hadKey) {\n        trigger(target, \"add\", key, value);\n      } else if (hasChanged(value, oldValue)) {\n        trigger(target, \"set\", key, value, oldValue);\n      }\n    }\n    return result;\n  };\n}\nfunction deleteProperty(target, key) {\n  const hadKey = hasOwn(target, key);\n  const oldValue = target[key];\n  const result = Reflect.deleteProperty(target, key);\n  if (result && hadKey) {\n    trigger(target, \"delete\", key, void 0, oldValue);\n  }\n  return result;\n}\nfunction has(target, key) {\n  const result = Reflect.has(target, key);\n  if (!isSymbol(key) || !builtInSymbols.has(key)) {\n    track(target, \"has\", key);\n  }\n  return result;\n}\nfunction ownKeys(target) {\n  track(target, \"iterate\", isArray(target) ? \"length\" : ITERATE_KEY);\n  return Reflect.ownKeys(target);\n}\nvar mutableHandlers = {\n  get: get2,\n  set: set2,\n  deleteProperty,\n  has,\n  ownKeys\n};\nvar readonlyHandlers = {\n  get: readonlyGet,\n  set(target, key) {\n    if (true) {\n      console.warn(`Set operation on key \"${String(key)}\" failed: target is readonly.`, target);\n    }\n    return true;\n  },\n  deleteProperty(target, key) {\n    if (true) {\n      console.warn(`Delete operation on key \"${String(key)}\" failed: target is readonly.`, target);\n    }\n    return true;\n  }\n};\nvar toReactive = (value) => isObject(value) ? reactive2(value) : value;\nvar toReadonly = (value) => isObject(value) ? readonly(value) : value;\nvar toShallow = (value) => value;\nvar getProto = (v) => Reflect.getPrototypeOf(v);\nfunction get$1(target, key, isReadonly = false, isShallow = false) {\n  target = target[\n    \"__v_raw\"\n    /* RAW */\n  ];\n  const rawTarget = toRaw(target);\n  const rawKey = toRaw(key);\n  if (key !== rawKey) {\n    !isReadonly && track(rawTarget, \"get\", key);\n  }\n  !isReadonly && track(rawTarget, \"get\", rawKey);\n  const { has: has2 } = getProto(rawTarget);\n  const wrap = isShallow ? toShallow : isReadonly ? toReadonly : toReactive;\n  if (has2.call(rawTarget, key)) {\n    return wrap(target.get(key));\n  } else if (has2.call(rawTarget, rawKey)) {\n    return wrap(target.get(rawKey));\n  } else if (target !== rawTarget) {\n    target.get(key);\n  }\n}\nfunction has$1(key, isReadonly = false) {\n  const target = this[\n    \"__v_raw\"\n    /* RAW */\n  ];\n  const rawTarget = toRaw(target);\n  const rawKey = toRaw(key);\n  if (key !== rawKey) {\n    !isReadonly && track(rawTarget, \"has\", key);\n  }\n  !isReadonly && track(rawTarget, \"has\", rawKey);\n  return key === rawKey ? target.has(key) : target.has(key) || target.has(rawKey);\n}\nfunction size(target, isReadonly = false) {\n  target = target[\n    \"__v_raw\"\n    /* RAW */\n  ];\n  !isReadonly && track(toRaw(target), \"iterate\", ITERATE_KEY);\n  return Reflect.get(target, \"size\", target);\n}\nfunction add(value) {\n  value = toRaw(value);\n  const target = toRaw(this);\n  const proto = getProto(target);\n  const hadKey = proto.has.call(target, value);\n  if (!hadKey) {\n    target.add(value);\n    trigger(target, \"add\", value, value);\n  }\n  return this;\n}\nfunction set$1(key, value) {\n  value = toRaw(value);\n  const target = toRaw(this);\n  const { has: has2, get: get3 } = getProto(target);\n  let hadKey = has2.call(target, key);\n  if (!hadKey) {\n    key = toRaw(key);\n    hadKey = has2.call(target, key);\n  } else if (true) {\n    checkIdentityKeys(target, has2, key);\n  }\n  const oldValue = get3.call(target, key);\n  target.set(key, value);\n  if (!hadKey) {\n    trigger(target, \"add\", key, value);\n  } else if (hasChanged(value, oldValue)) {\n    trigger(target, \"set\", key, value, oldValue);\n  }\n  return this;\n}\nfunction deleteEntry(key) {\n  const target = toRaw(this);\n  const { has: has2, get: get3 } = getProto(target);\n  let hadKey = has2.call(target, key);\n  if (!hadKey) {\n    key = toRaw(key);\n    hadKey = has2.call(target, key);\n  } else if (true) {\n    checkIdentityKeys(target, has2, key);\n  }\n  const oldValue = get3 ? get3.call(target, key) : void 0;\n  const result = target.delete(key);\n  if (hadKey) {\n    trigger(target, \"delete\", key, void 0, oldValue);\n  }\n  return result;\n}\nfunction clear() {\n  const target = toRaw(this);\n  const hadItems = target.size !== 0;\n  const oldTarget = true ? isMap(target) ? new Map(target) : new Set(target) : void 0;\n  const result = target.clear();\n  if (hadItems) {\n    trigger(target, \"clear\", void 0, void 0, oldTarget);\n  }\n  return result;\n}\nfunction createForEach(isReadonly, isShallow) {\n  return function forEach(callback, thisArg) {\n    const observed = this;\n    const target = observed[\n      \"__v_raw\"\n      /* RAW */\n    ];\n    const rawTarget = toRaw(target);\n    const wrap = isShallow ? toShallow : isReadonly ? toReadonly : toReactive;\n    !isReadonly && track(rawTarget, \"iterate\", ITERATE_KEY);\n    return target.forEach((value, key) => {\n      return callback.call(thisArg, wrap(value), wrap(key), observed);\n    });\n  };\n}\nfunction createIterableMethod(method, isReadonly, isShallow) {\n  return function(...args) {\n    const target = this[\n      \"__v_raw\"\n      /* RAW */\n    ];\n    const rawTarget = toRaw(target);\n    const targetIsMap = isMap(rawTarget);\n    const isPair = method === \"entries\" || method === Symbol.iterator && targetIsMap;\n    const isKeyOnly = method === \"keys\" && targetIsMap;\n    const innerIterator = target[method](...args);\n    const wrap = isShallow ? toShallow : isReadonly ? toReadonly : toReactive;\n    !isReadonly && track(rawTarget, \"iterate\", isKeyOnly ? MAP_KEY_ITERATE_KEY : ITERATE_KEY);\n    return {\n      // iterator protocol\n      next() {\n        const { value, done } = innerIterator.next();\n        return done ? { value, done } : {\n          value: isPair ? [wrap(value[0]), wrap(value[1])] : wrap(value),\n          done\n        };\n      },\n      // iterable protocol\n      [Symbol.iterator]() {\n        return this;\n      }\n    };\n  };\n}\nfunction createReadonlyMethod(type) {\n  return function(...args) {\n    if (true) {\n      const key = args[0] ? `on key \"${args[0]}\" ` : ``;\n      console.warn(`${capitalize(type)} operation ${key}failed: target is readonly.`, toRaw(this));\n    }\n    return type === \"delete\" ? false : this;\n  };\n}\nfunction createInstrumentations() {\n  const mutableInstrumentations2 = {\n    get(key) {\n      return get$1(this, key);\n    },\n    get size() {\n      return size(this);\n    },\n    has: has$1,\n    add,\n    set: set$1,\n    delete: deleteEntry,\n    clear,\n    forEach: createForEach(false, false)\n  };\n  const shallowInstrumentations2 = {\n    get(key) {\n      return get$1(this, key, false, true);\n    },\n    get size() {\n      return size(this);\n    },\n    has: has$1,\n    add,\n    set: set$1,\n    delete: deleteEntry,\n    clear,\n    forEach: createForEach(false, true)\n  };\n  const readonlyInstrumentations2 = {\n    get(key) {\n      return get$1(this, key, true);\n    },\n    get size() {\n      return size(this, true);\n    },\n    has(key) {\n      return has$1.call(this, key, true);\n    },\n    add: createReadonlyMethod(\n      \"add\"\n      /* ADD */\n    ),\n    set: createReadonlyMethod(\n      \"set\"\n      /* SET */\n    ),\n    delete: createReadonlyMethod(\n      \"delete\"\n      /* DELETE */\n    ),\n    clear: createReadonlyMethod(\n      \"clear\"\n      /* CLEAR */\n    ),\n    forEach: createForEach(true, false)\n  };\n  const shallowReadonlyInstrumentations2 = {\n    get(key) {\n      return get$1(this, key, true, true);\n    },\n    get size() {\n      return size(this, true);\n    },\n    has(key) {\n      return has$1.call(this, key, true);\n    },\n    add: createReadonlyMethod(\n      \"add\"\n      /* ADD */\n    ),\n    set: createReadonlyMethod(\n      \"set\"\n      /* SET */\n    ),\n    delete: createReadonlyMethod(\n      \"delete\"\n      /* DELETE */\n    ),\n    clear: createReadonlyMethod(\n      \"clear\"\n      /* CLEAR */\n    ),\n    forEach: createForEach(true, true)\n  };\n  const iteratorMethods = [\"keys\", \"values\", \"entries\", Symbol.iterator];\n  iteratorMethods.forEach((method) => {\n    mutableInstrumentations2[method] = createIterableMethod(method, false, false);\n    readonlyInstrumentations2[method] = createIterableMethod(method, true, false);\n    shallowInstrumentations2[method] = createIterableMethod(method, false, true);\n    shallowReadonlyInstrumentations2[method] = createIterableMethod(method, true, true);\n  });\n  return [\n    mutableInstrumentations2,\n    readonlyInstrumentations2,\n    shallowInstrumentations2,\n    shallowReadonlyInstrumentations2\n  ];\n}\nvar [mutableInstrumentations, readonlyInstrumentations, shallowInstrumentations, shallowReadonlyInstrumentations] = /* @__PURE__ */ createInstrumentations();\nfunction createInstrumentationGetter(isReadonly, shallow) {\n  const instrumentations = shallow ? isReadonly ? shallowReadonlyInstrumentations : shallowInstrumentations : isReadonly ? readonlyInstrumentations : mutableInstrumentations;\n  return (target, key, receiver) => {\n    if (key === \"__v_isReactive\") {\n      return !isReadonly;\n    } else if (key === \"__v_isReadonly\") {\n      return isReadonly;\n    } else if (key === \"__v_raw\") {\n      return target;\n    }\n    return Reflect.get(hasOwn(instrumentations, key) && key in target ? instrumentations : target, key, receiver);\n  };\n}\nvar mutableCollectionHandlers = {\n  get: /* @__PURE__ */ createInstrumentationGetter(false, false)\n};\nvar readonlyCollectionHandlers = {\n  get: /* @__PURE__ */ createInstrumentationGetter(true, false)\n};\nfunction checkIdentityKeys(target, has2, key) {\n  const rawKey = toRaw(key);\n  if (rawKey !== key && has2.call(target, rawKey)) {\n    const type = toRawType(target);\n    console.warn(`Reactive ${type} contains both the raw and reactive versions of the same object${type === `Map` ? ` as keys` : ``}, which can lead to inconsistencies. Avoid differentiating between the raw and reactive versions of an object and only use the reactive version if possible.`);\n  }\n}\nvar reactiveMap = /* @__PURE__ */ new WeakMap();\nvar shallowReactiveMap = /* @__PURE__ */ new WeakMap();\nvar readonlyMap = /* @__PURE__ */ new WeakMap();\nvar shallowReadonlyMap = /* @__PURE__ */ new WeakMap();\nfunction targetTypeMap(rawType) {\n  switch (rawType) {\n    case \"Object\":\n    case \"Array\":\n      return 1;\n    case \"Map\":\n    case \"Set\":\n    case \"WeakMap\":\n    case \"WeakSet\":\n      return 2;\n    default:\n      return 0;\n  }\n}\nfunction getTargetType(value) {\n  return value[\n    \"__v_skip\"\n    /* SKIP */\n  ] || !Object.isExtensible(value) ? 0 : targetTypeMap(toRawType(value));\n}\nfunction reactive2(target) {\n  if (target && target[\n    \"__v_isReadonly\"\n    /* IS_READONLY */\n  ]) {\n    return target;\n  }\n  return createReactiveObject(target, false, mutableHandlers, mutableCollectionHandlers, reactiveMap);\n}\nfunction readonly(target) {\n  return createReactiveObject(target, true, readonlyHandlers, readonlyCollectionHandlers, readonlyMap);\n}\nfunction createReactiveObject(target, isReadonly, baseHandlers, collectionHandlers, proxyMap) {\n  if (!isObject(target)) {\n    if (true) {\n      console.warn(`value cannot be made reactive: ${String(target)}`);\n    }\n    return target;\n  }\n  if (target[\n    \"__v_raw\"\n    /* RAW */\n  ] && !(isReadonly && target[\n    \"__v_isReactive\"\n    /* IS_REACTIVE */\n  ])) {\n    return target;\n  }\n  const existingProxy = proxyMap.get(target);\n  if (existingProxy) {\n    return existingProxy;\n  }\n  const targetType = getTargetType(target);\n  if (targetType === 0) {\n    return target;\n  }\n  const proxy = new Proxy(target, targetType === 2 ? collectionHandlers : baseHandlers);\n  proxyMap.set(target, proxy);\n  return proxy;\n}\nfunction toRaw(observed) {\n  return observed && toRaw(observed[\n    \"__v_raw\"\n    /* RAW */\n  ]) || observed;\n}\nfunction isRef(r) {\n  return Boolean(r && r.__v_isRef === true);\n}\n\n// packages/alpinejs/src/magics/$nextTick.js\nmagic(\"nextTick\", () => nextTick);\n\n// packages/alpinejs/src/magics/$dispatch.js\nmagic(\"dispatch\", (el) => dispatch.bind(dispatch, el));\n\n// packages/alpinejs/src/magics/$watch.js\nmagic(\"watch\", (el, { evaluateLater: evaluateLater2, cleanup: cleanup2 }) => (key, callback) => {\n  let evaluate2 = evaluateLater2(key);\n  let getter = () => {\n    let value;\n    evaluate2((i) => value = i);\n    return value;\n  };\n  let unwatch = watch(getter, callback);\n  cleanup2(unwatch);\n});\n\n// packages/alpinejs/src/magics/$store.js\nmagic(\"store\", getStores);\n\n// packages/alpinejs/src/magics/$data.js\nmagic(\"data\", (el) => scope(el));\n\n// packages/alpinejs/src/magics/$root.js\nmagic(\"root\", (el) => closestRoot(el));\n\n// packages/alpinejs/src/magics/$refs.js\nmagic(\"refs\", (el) => {\n  if (el._x_refs_proxy)\n    return el._x_refs_proxy;\n  el._x_refs_proxy = mergeProxies(getArrayOfRefObject(el));\n  return el._x_refs_proxy;\n});\nfunction getArrayOfRefObject(el) {\n  let refObjects = [];\n  findClosest(el, (i) => {\n    if (i._x_refs)\n      refObjects.push(i._x_refs);\n  });\n  return refObjects;\n}\n\n// packages/alpinejs/src/ids.js\nvar globalIdMemo = {};\nfunction findAndIncrementId(name) {\n  if (!globalIdMemo[name])\n    globalIdMemo[name] = 0;\n  return ++globalIdMemo[name];\n}\nfunction closestIdRoot(el, name) {\n  return findClosest(el, (element) => {\n    if (element._x_ids && element._x_ids[name])\n      return true;\n  });\n}\nfunction setIdRoot(el, name) {\n  if (!el._x_ids)\n    el._x_ids = {};\n  if (!el._x_ids[name])\n    el._x_ids[name] = findAndIncrementId(name);\n}\n\n// packages/alpinejs/src/magics/$id.js\nmagic(\"id\", (el, { cleanup: cleanup2 }) => (name, key = null) => {\n  let cacheKey = `${name}${key ? `-${key}` : \"\"}`;\n  return cacheIdByNameOnElement(el, cacheKey, cleanup2, () => {\n    let root = closestIdRoot(el, name);\n    let id = root ? root._x_ids[name] : findAndIncrementId(name);\n    return key ? `${name}-${id}-${key}` : `${name}-${id}`;\n  });\n});\ninterceptClone((from, to) => {\n  if (from._x_id) {\n    to._x_id = from._x_id;\n  }\n});\nfunction cacheIdByNameOnElement(el, cacheKey, cleanup2, callback) {\n  if (!el._x_id)\n    el._x_id = {};\n  if (el._x_id[cacheKey])\n    return el._x_id[cacheKey];\n  let output = callback();\n  el._x_id[cacheKey] = output;\n  cleanup2(() => {\n    delete el._x_id[cacheKey];\n  });\n  return output;\n}\n\n// packages/alpinejs/src/magics/$el.js\nmagic(\"el\", (el) => el);\n\n// packages/alpinejs/src/magics/index.js\nwarnMissingPluginMagic(\"Focus\", \"focus\", \"focus\");\nwarnMissingPluginMagic(\"Persist\", \"persist\", \"persist\");\nfunction warnMissingPluginMagic(name, magicName, slug) {\n  magic(magicName, (el) => warn(`You can't use [$${magicName}] without first installing the \"${name}\" plugin here: https://alpinejs.dev/plugins/${slug}`, el));\n}\n\n// packages/alpinejs/src/directives/x-modelable.js\ndirective(\"modelable\", (el, { expression }, { effect: effect3, evaluateLater: evaluateLater2, cleanup: cleanup2 }) => {\n  let func = evaluateLater2(expression);\n  let innerGet = () => {\n    let result;\n    func((i) => result = i);\n    return result;\n  };\n  let evaluateInnerSet = evaluateLater2(`${expression} = __placeholder`);\n  let innerSet = (val) => evaluateInnerSet(() => {\n  }, { scope: { \"__placeholder\": val } });\n  let initialValue = innerGet();\n  innerSet(initialValue);\n  queueMicrotask(() => {\n    if (!el._x_model)\n      return;\n    el._x_removeModelListeners[\"default\"]();\n    let outerGet = el._x_model.get;\n    let outerSet = el._x_model.set;\n    let releaseEntanglement = entangle(\n      {\n        get() {\n          return outerGet();\n        },\n        set(value) {\n          outerSet(value);\n        }\n      },\n      {\n        get() {\n          return innerGet();\n        },\n        set(value) {\n          innerSet(value);\n        }\n      }\n    );\n    cleanup2(releaseEntanglement);\n  });\n});\n\n// packages/alpinejs/src/directives/x-teleport.js\ndirective(\"teleport\", (el, { modifiers, expression }, { cleanup: cleanup2 }) => {\n  if (el.tagName.toLowerCase() !== \"template\")\n    warn(\"x-teleport can only be used on a <template> tag\", el);\n  let target = getTarget(expression);\n  let clone2 = el.content.cloneNode(true).firstElementChild;\n  el._x_teleport = clone2;\n  clone2._x_teleportBack = el;\n  el.setAttribute(\"data-teleport-template\", true);\n  clone2.setAttribute(\"data-teleport-target\", true);\n  if (el._x_forwardEvents) {\n    el._x_forwardEvents.forEach((eventName) => {\n      clone2.addEventListener(eventName, (e) => {\n        e.stopPropagation();\n        el.dispatchEvent(new e.constructor(e.type, e));\n      });\n    });\n  }\n  addScopeToNode(clone2, {}, el);\n  let placeInDom = (clone3, target2, modifiers2) => {\n    if (modifiers2.includes(\"prepend\")) {\n      target2.parentNode.insertBefore(clone3, target2);\n    } else if (modifiers2.includes(\"append\")) {\n      target2.parentNode.insertBefore(clone3, target2.nextSibling);\n    } else {\n      target2.appendChild(clone3);\n    }\n  };\n  mutateDom(() => {\n    placeInDom(clone2, target, modifiers);\n    skipDuringClone(() => {\n      initTree(clone2);\n    })();\n  });\n  el._x_teleportPutBack = () => {\n    let target2 = getTarget(expression);\n    mutateDom(() => {\n      placeInDom(el._x_teleport, target2, modifiers);\n    });\n  };\n  cleanup2(\n    () => mutateDom(() => {\n      clone2.remove();\n      destroyTree(clone2);\n    })\n  );\n});\nvar teleportContainerDuringClone = document.createElement(\"div\");\nfunction getTarget(expression) {\n  let target = skipDuringClone(() => {\n    return document.querySelector(expression);\n  }, () => {\n    return teleportContainerDuringClone;\n  })();\n  if (!target)\n    warn(`Cannot find x-teleport element for selector: \"${expression}\"`);\n  return target;\n}\n\n// packages/alpinejs/src/directives/x-ignore.js\nvar handler = () => {\n};\nhandler.inline = (el, { modifiers }, { cleanup: cleanup2 }) => {\n  modifiers.includes(\"self\") ? el._x_ignoreSelf = true : el._x_ignore = true;\n  cleanup2(() => {\n    modifiers.includes(\"self\") ? delete el._x_ignoreSelf : delete el._x_ignore;\n  });\n};\ndirective(\"ignore\", handler);\n\n// packages/alpinejs/src/directives/x-effect.js\ndirective(\"effect\", skipDuringClone((el, { expression }, { effect: effect3 }) => {\n  effect3(evaluateLater(el, expression));\n}));\n\n// packages/alpinejs/src/utils/on.js\nfunction on(el, event, modifiers, callback) {\n  let listenerTarget = el;\n  let handler4 = (e) => callback(e);\n  let options = {};\n  let wrapHandler = (callback2, wrapper) => (e) => wrapper(callback2, e);\n  if (modifiers.includes(\"dot\"))\n    event = dotSyntax(event);\n  if (modifiers.includes(\"camel\"))\n    event = camelCase2(event);\n  if (modifiers.includes(\"passive\"))\n    options.passive = true;\n  if (modifiers.includes(\"capture\"))\n    options.capture = true;\n  if (modifiers.includes(\"window\"))\n    listenerTarget = window;\n  if (modifiers.includes(\"document\"))\n    listenerTarget = document;\n  if (modifiers.includes(\"debounce\")) {\n    let nextModifier = modifiers[modifiers.indexOf(\"debounce\") + 1] || \"invalid-wait\";\n    let wait = isNumeric(nextModifier.split(\"ms\")[0]) ? Number(nextModifier.split(\"ms\")[0]) : 250;\n    handler4 = debounce(handler4, wait);\n  }\n  if (modifiers.includes(\"throttle\")) {\n    let nextModifier = modifiers[modifiers.indexOf(\"throttle\") + 1] || \"invalid-wait\";\n    let wait = isNumeric(nextModifier.split(\"ms\")[0]) ? Number(nextModifier.split(\"ms\")[0]) : 250;\n    handler4 = throttle(handler4, wait);\n  }\n  if (modifiers.includes(\"prevent\"))\n    handler4 = wrapHandler(handler4, (next, e) => {\n      e.preventDefault();\n      next(e);\n    });\n  if (modifiers.includes(\"stop\"))\n    handler4 = wrapHandler(handler4, (next, e) => {\n      e.stopPropagation();\n      next(e);\n    });\n  if (modifiers.includes(\"once\")) {\n    handler4 = wrapHandler(handler4, (next, e) => {\n      next(e);\n      listenerTarget.removeEventListener(event, handler4, options);\n    });\n  }\n  if (modifiers.includes(\"away\") || modifiers.includes(\"outside\")) {\n    listenerTarget = document;\n    handler4 = wrapHandler(handler4, (next, e) => {\n      if (el.contains(e.target))\n        return;\n      if (e.target.isConnected === false)\n        return;\n      if (el.offsetWidth < 1 && el.offsetHeight < 1)\n        return;\n      if (el._x_isShown === false)\n        return;\n      next(e);\n    });\n  }\n  if (modifiers.includes(\"self\"))\n    handler4 = wrapHandler(handler4, (next, e) => {\n      e.target === el && next(e);\n    });\n  if (isKeyEvent(event) || isClickEvent(event)) {\n    handler4 = wrapHandler(handler4, (next, e) => {\n      if (isListeningForASpecificKeyThatHasntBeenPressed(e, modifiers)) {\n        return;\n      }\n      next(e);\n    });\n  }\n  listenerTarget.addEventListener(event, handler4, options);\n  return () => {\n    listenerTarget.removeEventListener(event, handler4, options);\n  };\n}\nfunction dotSyntax(subject) {\n  return subject.replace(/-/g, \".\");\n}\nfunction camelCase2(subject) {\n  return subject.toLowerCase().replace(/-(\\w)/g, (match, char) => char.toUpperCase());\n}\nfunction isNumeric(subject) {\n  return !Array.isArray(subject) && !isNaN(subject);\n}\nfunction kebabCase2(subject) {\n  if ([\" \", \"_\"].includes(\n    subject\n  ))\n    return subject;\n  return subject.replace(/([a-z])([A-Z])/g, \"$1-$2\").replace(/[_\\s]/, \"-\").toLowerCase();\n}\nfunction isKeyEvent(event) {\n  return [\"keydown\", \"keyup\"].includes(event);\n}\nfunction isClickEvent(event) {\n  return [\"contextmenu\", \"click\", \"mouse\"].some((i) => event.includes(i));\n}\nfunction isListeningForASpecificKeyThatHasntBeenPressed(e, modifiers) {\n  let keyModifiers = modifiers.filter((i) => {\n    return ![\"window\", \"document\", \"prevent\", \"stop\", \"once\", \"capture\", \"self\", \"away\", \"outside\", \"passive\"].includes(i);\n  });\n  if (keyModifiers.includes(\"debounce\")) {\n    let debounceIndex = keyModifiers.indexOf(\"debounce\");\n    keyModifiers.splice(debounceIndex, isNumeric((keyModifiers[debounceIndex + 1] || \"invalid-wait\").split(\"ms\")[0]) ? 2 : 1);\n  }\n  if (keyModifiers.includes(\"throttle\")) {\n    let debounceIndex = keyModifiers.indexOf(\"throttle\");\n    keyModifiers.splice(debounceIndex, isNumeric((keyModifiers[debounceIndex + 1] || \"invalid-wait\").split(\"ms\")[0]) ? 2 : 1);\n  }\n  if (keyModifiers.length === 0)\n    return false;\n  if (keyModifiers.length === 1 && keyToModifiers(e.key).includes(keyModifiers[0]))\n    return false;\n  const systemKeyModifiers = [\"ctrl\", \"shift\", \"alt\", \"meta\", \"cmd\", \"super\"];\n  const selectedSystemKeyModifiers = systemKeyModifiers.filter((modifier) => keyModifiers.includes(modifier));\n  keyModifiers = keyModifiers.filter((i) => !selectedSystemKeyModifiers.includes(i));\n  if (selectedSystemKeyModifiers.length > 0) {\n    const activelyPressedKeyModifiers = selectedSystemKeyModifiers.filter((modifier) => {\n      if (modifier === \"cmd\" || modifier === \"super\")\n        modifier = \"meta\";\n      return e[`${modifier}Key`];\n    });\n    if (activelyPressedKeyModifiers.length === selectedSystemKeyModifiers.length) {\n      if (isClickEvent(e.type))\n        return false;\n      if (keyToModifiers(e.key).includes(keyModifiers[0]))\n        return false;\n    }\n  }\n  return true;\n}\nfunction keyToModifiers(key) {\n  if (!key)\n    return [];\n  key = kebabCase2(key);\n  let modifierToKeyMap = {\n    \"ctrl\": \"control\",\n    \"slash\": \"/\",\n    \"space\": \" \",\n    \"spacebar\": \" \",\n    \"cmd\": \"meta\",\n    \"esc\": \"escape\",\n    \"up\": \"arrow-up\",\n    \"down\": \"arrow-down\",\n    \"left\": \"arrow-left\",\n    \"right\": \"arrow-right\",\n    \"period\": \".\",\n    \"comma\": \",\",\n    \"equal\": \"=\",\n    \"minus\": \"-\",\n    \"underscore\": \"_\"\n  };\n  modifierToKeyMap[key] = key;\n  return Object.keys(modifierToKeyMap).map((modifier) => {\n    if (modifierToKeyMap[modifier] === key)\n      return modifier;\n  }).filter((modifier) => modifier);\n}\n\n// packages/alpinejs/src/directives/x-model.js\ndirective(\"model\", (el, { modifiers, expression }, { effect: effect3, cleanup: cleanup2 }) => {\n  let scopeTarget = el;\n  if (modifiers.includes(\"parent\")) {\n    scopeTarget = el.parentNode;\n  }\n  let evaluateGet = evaluateLater(scopeTarget, expression);\n  let evaluateSet;\n  if (typeof expression === \"string\") {\n    evaluateSet = evaluateLater(scopeTarget, `${expression} = __placeholder`);\n  } else if (typeof expression === \"function\" && typeof expression() === \"string\") {\n    evaluateSet = evaluateLater(scopeTarget, `${expression()} = __placeholder`);\n  } else {\n    evaluateSet = () => {\n    };\n  }\n  let getValue = () => {\n    let result;\n    evaluateGet((value) => result = value);\n    return isGetterSetter(result) ? result.get() : result;\n  };\n  let setValue = (value) => {\n    let result;\n    evaluateGet((value2) => result = value2);\n    if (isGetterSetter(result)) {\n      result.set(value);\n    } else {\n      evaluateSet(() => {\n      }, {\n        scope: { \"__placeholder\": value }\n      });\n    }\n  };\n  if (typeof expression === \"string\" && el.type === \"radio\") {\n    mutateDom(() => {\n      if (!el.hasAttribute(\"name\"))\n        el.setAttribute(\"name\", expression);\n    });\n  }\n  var event = el.tagName.toLowerCase() === \"select\" || [\"checkbox\", \"radio\"].includes(el.type) || modifiers.includes(\"lazy\") ? \"change\" : \"input\";\n  let removeListener = isCloning ? () => {\n  } : on(el, event, modifiers, (e) => {\n    setValue(getInputValue(el, modifiers, e, getValue()));\n  });\n  if (modifiers.includes(\"fill\")) {\n    if ([void 0, null, \"\"].includes(getValue()) || isCheckbox(el) && Array.isArray(getValue()) || el.tagName.toLowerCase() === \"select\" && el.multiple) {\n      setValue(\n        getInputValue(el, modifiers, { target: el }, getValue())\n      );\n    }\n  }\n  if (!el._x_removeModelListeners)\n    el._x_removeModelListeners = {};\n  el._x_removeModelListeners[\"default\"] = removeListener;\n  cleanup2(() => el._x_removeModelListeners[\"default\"]());\n  if (el.form) {\n    let removeResetListener = on(el.form, \"reset\", [], (e) => {\n      nextTick(() => el._x_model && el._x_model.set(getInputValue(el, modifiers, { target: el }, getValue())));\n    });\n    cleanup2(() => removeResetListener());\n  }\n  el._x_model = {\n    get() {\n      return getValue();\n    },\n    set(value) {\n      setValue(value);\n    }\n  };\n  el._x_forceModelUpdate = (value) => {\n    if (value === void 0 && typeof expression === \"string\" && expression.match(/\\./))\n      value = \"\";\n    window.fromModel = true;\n    mutateDom(() => bind(el, \"value\", value));\n    delete window.fromModel;\n  };\n  effect3(() => {\n    let value = getValue();\n    if (modifiers.includes(\"unintrusive\") && document.activeElement.isSameNode(el))\n      return;\n    el._x_forceModelUpdate(value);\n  });\n});\nfunction getInputValue(el, modifiers, event, currentValue) {\n  return mutateDom(() => {\n    if (event instanceof CustomEvent && event.detail !== void 0)\n      return event.detail !== null && event.detail !== void 0 ? event.detail : event.target.value;\n    else if (isCheckbox(el)) {\n      if (Array.isArray(currentValue)) {\n        let newValue = null;\n        if (modifiers.includes(\"number\")) {\n          newValue = safeParseNumber(event.target.value);\n        } else if (modifiers.includes(\"boolean\")) {\n          newValue = safeParseBoolean(event.target.value);\n        } else {\n          newValue = event.target.value;\n        }\n        return event.target.checked ? currentValue.includes(newValue) ? currentValue : currentValue.concat([newValue]) : currentValue.filter((el2) => !checkedAttrLooseCompare2(el2, newValue));\n      } else {\n        return event.target.checked;\n      }\n    } else if (el.tagName.toLowerCase() === \"select\" && el.multiple) {\n      if (modifiers.includes(\"number\")) {\n        return Array.from(event.target.selectedOptions).map((option) => {\n          let rawValue = option.value || option.text;\n          return safeParseNumber(rawValue);\n        });\n      } else if (modifiers.includes(\"boolean\")) {\n        return Array.from(event.target.selectedOptions).map((option) => {\n          let rawValue = option.value || option.text;\n          return safeParseBoolean(rawValue);\n        });\n      }\n      return Array.from(event.target.selectedOptions).map((option) => {\n        return option.value || option.text;\n      });\n    } else {\n      let newValue;\n      if (isRadio(el)) {\n        if (event.target.checked) {\n          newValue = event.target.value;\n        } else {\n          newValue = currentValue;\n        }\n      } else {\n        newValue = event.target.value;\n      }\n      if (modifiers.includes(\"number\")) {\n        return safeParseNumber(newValue);\n      } else if (modifiers.includes(\"boolean\")) {\n        return safeParseBoolean(newValue);\n      } else if (modifiers.includes(\"trim\")) {\n        return newValue.trim();\n      } else {\n        return newValue;\n      }\n    }\n  });\n}\nfunction safeParseNumber(rawValue) {\n  let number = rawValue ? parseFloat(rawValue) : null;\n  return isNumeric2(number) ? number : rawValue;\n}\nfunction checkedAttrLooseCompare2(valueA, valueB) {\n  return valueA == valueB;\n}\nfunction isNumeric2(subject) {\n  return !Array.isArray(subject) && !isNaN(subject);\n}\nfunction isGetterSetter(value) {\n  return value !== null && typeof value === \"object\" && typeof value.get === \"function\" && typeof value.set === \"function\";\n}\n\n// packages/alpinejs/src/directives/x-cloak.js\ndirective(\"cloak\", (el) => queueMicrotask(() => mutateDom(() => el.removeAttribute(prefix(\"cloak\")))));\n\n// packages/alpinejs/src/directives/x-init.js\naddInitSelector(() => `[${prefix(\"init\")}]`);\ndirective(\"init\", skipDuringClone((el, { expression }, { evaluate: evaluate2 }) => {\n  if (typeof expression === \"string\") {\n    return !!expression.trim() && evaluate2(expression, {}, false);\n  }\n  return evaluate2(expression, {}, false);\n}));\n\n// packages/alpinejs/src/directives/x-text.js\ndirective(\"text\", (el, { expression }, { effect: effect3, evaluateLater: evaluateLater2 }) => {\n  let evaluate2 = evaluateLater2(expression);\n  effect3(() => {\n    evaluate2((value) => {\n      mutateDom(() => {\n        el.textContent = value;\n      });\n    });\n  });\n});\n\n// packages/alpinejs/src/directives/x-html.js\ndirective(\"html\", (el, { expression }, { effect: effect3, evaluateLater: evaluateLater2 }) => {\n  let evaluate2 = evaluateLater2(expression);\n  effect3(() => {\n    evaluate2((value) => {\n      mutateDom(() => {\n        el.innerHTML = value;\n        el._x_ignoreSelf = true;\n        initTree(el);\n        delete el._x_ignoreSelf;\n      });\n    });\n  });\n});\n\n// packages/alpinejs/src/directives/x-bind.js\nmapAttributes(startingWith(\":\", into(prefix(\"bind:\"))));\nvar handler2 = (el, { value, modifiers, expression, original }, { effect: effect3, cleanup: cleanup2 }) => {\n  if (!value) {\n    let bindingProviders = {};\n    injectBindingProviders(bindingProviders);\n    let getBindings = evaluateLater(el, expression);\n    getBindings((bindings) => {\n      applyBindingsObject(el, bindings, original);\n    }, { scope: bindingProviders });\n    return;\n  }\n  if (value === \"key\")\n    return storeKeyForXFor(el, expression);\n  if (el._x_inlineBindings && el._x_inlineBindings[value] && el._x_inlineBindings[value].extract) {\n    return;\n  }\n  let evaluate2 = evaluateLater(el, expression);\n  effect3(() => evaluate2((result) => {\n    if (result === void 0 && typeof expression === \"string\" && expression.match(/\\./)) {\n      result = \"\";\n    }\n    mutateDom(() => bind(el, value, result, modifiers));\n  }));\n  cleanup2(() => {\n    el._x_undoAddedClasses && el._x_undoAddedClasses();\n    el._x_undoAddedStyles && el._x_undoAddedStyles();\n  });\n};\nhandler2.inline = (el, { value, modifiers, expression }) => {\n  if (!value)\n    return;\n  if (!el._x_inlineBindings)\n    el._x_inlineBindings = {};\n  el._x_inlineBindings[value] = { expression, extract: false };\n};\ndirective(\"bind\", handler2);\nfunction storeKeyForXFor(el, expression) {\n  el._x_keyExpression = expression;\n}\n\n// packages/alpinejs/src/directives/x-data.js\naddRootSelector(() => `[${prefix(\"data\")}]`);\ndirective(\"data\", (el, { expression }, { cleanup: cleanup2 }) => {\n  if (shouldSkipRegisteringDataDuringClone(el))\n    return;\n  expression = expression === \"\" ? \"{}\" : expression;\n  let magicContext = {};\n  injectMagics(magicContext, el);\n  let dataProviderContext = {};\n  injectDataProviders(dataProviderContext, magicContext);\n  let data2 = evaluate(el, expression, { scope: dataProviderContext });\n  if (data2 === void 0 || data2 === true)\n    data2 = {};\n  injectMagics(data2, el);\n  let reactiveData = reactive(data2);\n  initInterceptors(reactiveData);\n  let undo = addScopeToNode(el, reactiveData);\n  reactiveData[\"init\"] && evaluate(el, reactiveData[\"init\"]);\n  cleanup2(() => {\n    reactiveData[\"destroy\"] && evaluate(el, reactiveData[\"destroy\"]);\n    undo();\n  });\n});\ninterceptClone((from, to) => {\n  if (from._x_dataStack) {\n    to._x_dataStack = from._x_dataStack;\n    to.setAttribute(\"data-has-alpine-state\", true);\n  }\n});\nfunction shouldSkipRegisteringDataDuringClone(el) {\n  if (!isCloning)\n    return false;\n  if (isCloningLegacy)\n    return true;\n  return el.hasAttribute(\"data-has-alpine-state\");\n}\n\n// packages/alpinejs/src/directives/x-show.js\ndirective(\"show\", (el, { modifiers, expression }, { effect: effect3 }) => {\n  let evaluate2 = evaluateLater(el, expression);\n  if (!el._x_doHide)\n    el._x_doHide = () => {\n      mutateDom(() => {\n        el.style.setProperty(\"display\", \"none\", modifiers.includes(\"important\") ? \"important\" : void 0);\n      });\n    };\n  if (!el._x_doShow)\n    el._x_doShow = () => {\n      mutateDom(() => {\n        if (el.style.length === 1 && el.style.display === \"none\") {\n          el.removeAttribute(\"style\");\n        } else {\n          el.style.removeProperty(\"display\");\n        }\n      });\n    };\n  let hide = () => {\n    el._x_doHide();\n    el._x_isShown = false;\n  };\n  let show = () => {\n    el._x_doShow();\n    el._x_isShown = true;\n  };\n  let clickAwayCompatibleShow = () => setTimeout(show);\n  let toggle = once(\n    (value) => value ? show() : hide(),\n    (value) => {\n      if (typeof el._x_toggleAndCascadeWithTransitions === \"function\") {\n        el._x_toggleAndCascadeWithTransitions(el, value, show, hide);\n      } else {\n        value ? clickAwayCompatibleShow() : hide();\n      }\n    }\n  );\n  let oldValue;\n  let firstTime = true;\n  effect3(() => evaluate2((value) => {\n    if (!firstTime && value === oldValue)\n      return;\n    if (modifiers.includes(\"immediate\"))\n      value ? clickAwayCompatibleShow() : hide();\n    toggle(value);\n    oldValue = value;\n    firstTime = false;\n  }));\n});\n\n// packages/alpinejs/src/directives/x-for.js\ndirective(\"for\", (el, { expression }, { effect: effect3, cleanup: cleanup2 }) => {\n  let iteratorNames = parseForExpression(expression);\n  let evaluateItems = evaluateLater(el, iteratorNames.items);\n  let evaluateKey = evaluateLater(\n    el,\n    // the x-bind:key expression is stored for our use instead of evaluated.\n    el._x_keyExpression || \"index\"\n  );\n  el._x_prevKeys = [];\n  el._x_lookup = {};\n  effect3(() => loop(el, iteratorNames, evaluateItems, evaluateKey));\n  cleanup2(() => {\n    Object.values(el._x_lookup).forEach((el2) => mutateDom(\n      () => {\n        destroyTree(el2);\n        el2.remove();\n      }\n    ));\n    delete el._x_prevKeys;\n    delete el._x_lookup;\n  });\n});\nfunction loop(el, iteratorNames, evaluateItems, evaluateKey) {\n  let isObject2 = (i) => typeof i === \"object\" && !Array.isArray(i);\n  let templateEl = el;\n  evaluateItems((items) => {\n    if (isNumeric3(items) && items >= 0) {\n      items = Array.from(Array(items).keys(), (i) => i + 1);\n    }\n    if (items === void 0)\n      items = [];\n    let lookup = el._x_lookup;\n    let prevKeys = el._x_prevKeys;\n    let scopes = [];\n    let keys = [];\n    if (isObject2(items)) {\n      items = Object.entries(items).map(([key, value]) => {\n        let scope2 = getIterationScopeVariables(iteratorNames, value, key, items);\n        evaluateKey((value2) => {\n          if (keys.includes(value2))\n            warn(\"Duplicate key on x-for\", el);\n          keys.push(value2);\n        }, { scope: { index: key, ...scope2 } });\n        scopes.push(scope2);\n      });\n    } else {\n      for (let i = 0; i < items.length; i++) {\n        let scope2 = getIterationScopeVariables(iteratorNames, items[i], i, items);\n        evaluateKey((value) => {\n          if (keys.includes(value))\n            warn(\"Duplicate key on x-for\", el);\n          keys.push(value);\n        }, { scope: { index: i, ...scope2 } });\n        scopes.push(scope2);\n      }\n    }\n    let adds = [];\n    let moves = [];\n    let removes = [];\n    let sames = [];\n    for (let i = 0; i < prevKeys.length; i++) {\n      let key = prevKeys[i];\n      if (keys.indexOf(key) === -1)\n        removes.push(key);\n    }\n    prevKeys = prevKeys.filter((key) => !removes.includes(key));\n    let lastKey = \"template\";\n    for (let i = 0; i < keys.length; i++) {\n      let key = keys[i];\n      let prevIndex = prevKeys.indexOf(key);\n      if (prevIndex === -1) {\n        prevKeys.splice(i, 0, key);\n        adds.push([lastKey, i]);\n      } else if (prevIndex !== i) {\n        let keyInSpot = prevKeys.splice(i, 1)[0];\n        let keyForSpot = prevKeys.splice(prevIndex - 1, 1)[0];\n        prevKeys.splice(i, 0, keyForSpot);\n        prevKeys.splice(prevIndex, 0, keyInSpot);\n        moves.push([keyInSpot, keyForSpot]);\n      } else {\n        sames.push(key);\n      }\n      lastKey = key;\n    }\n    for (let i = 0; i < removes.length; i++) {\n      let key = removes[i];\n      if (!(key in lookup))\n        continue;\n      mutateDom(() => {\n        destroyTree(lookup[key]);\n        lookup[key].remove();\n      });\n      delete lookup[key];\n    }\n    for (let i = 0; i < moves.length; i++) {\n      let [keyInSpot, keyForSpot] = moves[i];\n      let elInSpot = lookup[keyInSpot];\n      let elForSpot = lookup[keyForSpot];\n      let marker = document.createElement(\"div\");\n      mutateDom(() => {\n        if (!elForSpot)\n          warn(`x-for \":key\" is undefined or invalid`, templateEl, keyForSpot, lookup);\n        elForSpot.after(marker);\n        elInSpot.after(elForSpot);\n        elForSpot._x_currentIfEl && elForSpot.after(elForSpot._x_currentIfEl);\n        marker.before(elInSpot);\n        elInSpot._x_currentIfEl && elInSpot.after(elInSpot._x_currentIfEl);\n        marker.remove();\n      });\n      elForSpot._x_refreshXForScope(scopes[keys.indexOf(keyForSpot)]);\n    }\n    for (let i = 0; i < adds.length; i++) {\n      let [lastKey2, index] = adds[i];\n      let lastEl = lastKey2 === \"template\" ? templateEl : lookup[lastKey2];\n      if (lastEl._x_currentIfEl)\n        lastEl = lastEl._x_currentIfEl;\n      let scope2 = scopes[index];\n      let key = keys[index];\n      let clone2 = document.importNode(templateEl.content, true).firstElementChild;\n      let reactiveScope = reactive(scope2);\n      addScopeToNode(clone2, reactiveScope, templateEl);\n      clone2._x_refreshXForScope = (newScope) => {\n        Object.entries(newScope).forEach(([key2, value]) => {\n          reactiveScope[key2] = value;\n        });\n      };\n      mutateDom(() => {\n        lastEl.after(clone2);\n        skipDuringClone(() => initTree(clone2))();\n      });\n      if (typeof key === \"object\") {\n        warn(\"x-for key cannot be an object, it must be a string or an integer\", templateEl);\n      }\n      lookup[key] = clone2;\n    }\n    for (let i = 0; i < sames.length; i++) {\n      lookup[sames[i]]._x_refreshXForScope(scopes[keys.indexOf(sames[i])]);\n    }\n    templateEl._x_prevKeys = keys;\n  });\n}\nfunction parseForExpression(expression) {\n  let forIteratorRE = /,([^,\\}\\]]*)(?:,([^,\\}\\]]*))?$/;\n  let stripParensRE = /^\\s*\\(|\\)\\s*$/g;\n  let forAliasRE = /([\\s\\S]*?)\\s+(?:in|of)\\s+([\\s\\S]*)/;\n  let inMatch = expression.match(forAliasRE);\n  if (!inMatch)\n    return;\n  let res = {};\n  res.items = inMatch[2].trim();\n  let item = inMatch[1].replace(stripParensRE, \"\").trim();\n  let iteratorMatch = item.match(forIteratorRE);\n  if (iteratorMatch) {\n    res.item = item.replace(forIteratorRE, \"\").trim();\n    res.index = iteratorMatch[1].trim();\n    if (iteratorMatch[2]) {\n      res.collection = iteratorMatch[2].trim();\n    }\n  } else {\n    res.item = item;\n  }\n  return res;\n}\nfunction getIterationScopeVariables(iteratorNames, item, index, items) {\n  let scopeVariables = {};\n  if (/^\\[.*\\]$/.test(iteratorNames.item) && Array.isArray(item)) {\n    let names = iteratorNames.item.replace(\"[\", \"\").replace(\"]\", \"\").split(\",\").map((i) => i.trim());\n    names.forEach((name, i) => {\n      scopeVariables[name] = item[i];\n    });\n  } else if (/^\\{.*\\}$/.test(iteratorNames.item) && !Array.isArray(item) && typeof item === \"object\") {\n    let names = iteratorNames.item.replace(\"{\", \"\").replace(\"}\", \"\").split(\",\").map((i) => i.trim());\n    names.forEach((name) => {\n      scopeVariables[name] = item[name];\n    });\n  } else {\n    scopeVariables[iteratorNames.item] = item;\n  }\n  if (iteratorNames.index)\n    scopeVariables[iteratorNames.index] = index;\n  if (iteratorNames.collection)\n    scopeVariables[iteratorNames.collection] = items;\n  return scopeVariables;\n}\nfunction isNumeric3(subject) {\n  return !Array.isArray(subject) && !isNaN(subject);\n}\n\n// packages/alpinejs/src/directives/x-ref.js\nfunction handler3() {\n}\nhandler3.inline = (el, { expression }, { cleanup: cleanup2 }) => {\n  let root = closestRoot(el);\n  if (!root._x_refs)\n    root._x_refs = {};\n  root._x_refs[expression] = el;\n  cleanup2(() => delete root._x_refs[expression]);\n};\ndirective(\"ref\", handler3);\n\n// packages/alpinejs/src/directives/x-if.js\ndirective(\"if\", (el, { expression }, { effect: effect3, cleanup: cleanup2 }) => {\n  if (el.tagName.toLowerCase() !== \"template\")\n    warn(\"x-if can only be used on a <template> tag\", el);\n  let evaluate2 = evaluateLater(el, expression);\n  let show = () => {\n    if (el._x_currentIfEl)\n      return el._x_currentIfEl;\n    let clone2 = el.content.cloneNode(true).firstElementChild;\n    addScopeToNode(clone2, {}, el);\n    mutateDom(() => {\n      el.after(clone2);\n      skipDuringClone(() => initTree(clone2))();\n    });\n    el._x_currentIfEl = clone2;\n    el._x_undoIf = () => {\n      mutateDom(() => {\n        destroyTree(clone2);\n        clone2.remove();\n      });\n      delete el._x_currentIfEl;\n    };\n    return clone2;\n  };\n  let hide = () => {\n    if (!el._x_undoIf)\n      return;\n    el._x_undoIf();\n    delete el._x_undoIf;\n  };\n  effect3(() => evaluate2((value) => {\n    value ? show() : hide();\n  }));\n  cleanup2(() => el._x_undoIf && el._x_undoIf());\n});\n\n// packages/alpinejs/src/directives/x-id.js\ndirective(\"id\", (el, { expression }, { evaluate: evaluate2 }) => {\n  let names = evaluate2(expression);\n  names.forEach((name) => setIdRoot(el, name));\n});\ninterceptClone((from, to) => {\n  if (from._x_ids) {\n    to._x_ids = from._x_ids;\n  }\n});\n\n// packages/alpinejs/src/directives/x-on.js\nmapAttributes(startingWith(\"@\", into(prefix(\"on:\"))));\ndirective(\"on\", skipDuringClone((el, { value, modifiers, expression }, { cleanup: cleanup2 }) => {\n  let evaluate2 = expression ? evaluateLater(el, expression) : () => {\n  };\n  if (el.tagName.toLowerCase() === \"template\") {\n    if (!el._x_forwardEvents)\n      el._x_forwardEvents = [];\n    if (!el._x_forwardEvents.includes(value))\n      el._x_forwardEvents.push(value);\n  }\n  let removeListener = on(el, value, modifiers, (e) => {\n    evaluate2(() => {\n    }, { scope: { \"$event\": e }, params: [e] });\n  });\n  cleanup2(() => removeListener());\n}));\n\n// packages/alpinejs/src/directives/index.js\nwarnMissingPluginDirective(\"Collapse\", \"collapse\", \"collapse\");\nwarnMissingPluginDirective(\"Intersect\", \"intersect\", \"intersect\");\nwarnMissingPluginDirective(\"Focus\", \"trap\", \"focus\");\nwarnMissingPluginDirective(\"Mask\", \"mask\", \"mask\");\nfunction warnMissingPluginDirective(name, directiveName, slug) {\n  directive(directiveName, (el) => warn(`You can't use [x-${directiveName}] without first installing the \"${name}\" plugin here: https://alpinejs.dev/plugins/${slug}`, el));\n}\n\n// packages/alpinejs/src/index.js\nalpine_default.setEvaluator(normalEvaluator);\nalpine_default.setReactivityEngine({ reactive: reactive2, effect: effect2, release: stop, raw: toRaw });\nvar src_default = alpine_default;\n\n// packages/alpinejs/builds/module.js\nvar module_default = src_default;\nexport {\n  src_default as Alpine,\n  module_default as default\n};\n", "import Alpine from 'alpinejs'\n\nexport function generateEntangleFunction(component, cleanup) {\n    if (! cleanup) cleanup = () => {}\n\n    return (name, live = false) => {\n        let isLive = live\n        let livewireProperty = name\n        let livewireComponent = component.$wire\n        let livewirePropertyValue = livewireComponent.get(livewireProperty)\n\n        let interceptor = Alpine.interceptor((initialValue, getter, setter, path, key) => {\n            // Check to see if the Livewire property exists and if not log a console error\n            // and return so everything else keeps running.\n            if (typeof livewirePropertyValue === 'undefined') {\n                console.error(`Livewire Entangle Error: Livewire property ['${livewireProperty}'] cannot be found on component: ['${component.name}']`)\n                return\n            }\n\n                let release = Alpine.entangle({\n                    // Outer scope...\n                    get() {\n                        return livewireComponent.get(name)\n                    },\n                    set(value) {\n                        livewireComponent.set(name, value, isLive)\n                    }\n                }, {\n                    // Inner scope...\n                    get() {\n                        return getter()\n                    },\n                    set(value) {\n                        setter(value)\n                    }\n                })\n\n                cleanup(() => release())\n\n            return cloneIfObject(livewireComponent.get(name))\n        }, obj => {\n            Object.defineProperty(obj, 'live', {\n                get() {\n                    isLive = true\n\n                    return obj\n                }\n            })\n        })\n\n        return interceptor(livewirePropertyValue)\n    }\n}\n\nfunction cloneIfObject(value) {\n    return typeof value === 'object'\n        ? JSON.parse(JSON.stringify(value))\n        : value\n}\n", "import { isFunction } from '@/utils'\n\n/**\n * Our internal event listener bus...\n */\nlet listeners = []\n\n/**\n * Register a callback to run when an event is triggered...\n */\nexport function on(name, callback) {\n    if (! listeners[name]) listeners[name] = []\n\n    listeners[name].push(callback)\n\n    // Return an \"off\" callback to remove the listener...\n    return () => {\n        listeners[name] = listeners[name].filter(i => i !== callback)\n    }\n}\n\n/**\n * In addition to triggering an event, this method allows you to\n * defer running callbacks returned from listeners and pass a\n * value through each one so they can act like middleware.\n *\n * An example of using this combination to the fullest:\n *\n * // First let's look at the triggering phase:\n * let finish = trigger([event name], ...[event params])\n *\n * return finish([pass-through value])\n *\n * // Now, let's look at the \"listening\" phase:\n * on([event name], (...[event params]) => {\n *     // The contents of this callback will be run immediately on trigger.\n *\n *     return ([pass-through value]) => {\n *         // This callback will be run when \"finish()\" is called.\n *\n *         // The [pass-through value] can be mutated and must\n *         // be returned for the next callback to process.\n *         return [pass-through value]\n *     }\n * })\n */\nexport function trigger(name, ...params) {\n    let callbacks = listeners[name] || []\n\n    let finishers = []\n\n    for (let i = 0; i < callbacks.length; i++) {\n        let finisher = callbacks[i](...params)\n\n        if (isFunction(finisher)) finishers.push(finisher)\n    }\n\n    return (result) => {\n       return runFinishers(finishers, result)\n    }\n}\n\nexport async function triggerAsync(name, ...params) {\n    let callbacks = listeners[name] || []\n\n    let finishers = []\n\n    for (let i = 0; i < callbacks.length; i++) {\n        let finisher = await callbacks[i](...params)\n\n        if (isFunction(finisher)) finishers.push(finisher)\n    }\n\n    return (result) => {\n       return runFinishers(finishers, result)\n    }\n}\n\nexport function runFinishers(finishers, result)\n{\n    let latest = result\n\n    for (let i = 0; i < finishers.length; i++) {\n        let iResult = finishers[i](latest)\n\n        if (iResult !== undefined) {\n            latest = iResult\n        }\n    }\n\n    return latest\n}\n", "\n// This code and concept is all Jonathan Reinink - thanks main!\nexport function showHtmlModal(html) {\n    let page = document.createElement('html')\n    page.innerHTML = html\n    page.querySelectorAll('a').forEach(a =>\n        a.setAttribute('target', '_top')\n    )\n\n    let modal = document.getElementById('livewire-error')\n\n    if (typeof modal != 'undefined' && modal != null) {\n        // Modal already exists.\n        modal.innerHTML = ''\n    } else {\n        modal = document.createElement('div')\n        modal.id = 'livewire-error'\n        modal.style.position = 'fixed'\n        modal.style.width = '100vw'\n        modal.style.height = '100vh'\n        modal.style.padding = '50px'\n        modal.style.backgroundColor = 'rgba(0, 0, 0, .6)'\n        modal.style.zIndex = 200000\n    }\n\n    let iframe = document.createElement('iframe')\n    iframe.style.backgroundColor = '#17161A'\n    iframe.style.borderRadius = '5px'\n    iframe.style.width = '100%'\n    iframe.style.height = '100%'\n    modal.appendChild(iframe)\n\n    document.body.prepend(modal)\n    document.body.style.overflow = 'hidden'\n    iframe.contentWindow.document.open()\n    iframe.contentWindow.document.write(page.outerHTML)\n    iframe.contentWindow.document.close()\n\n    // Close on click.\n    modal.addEventListener('click', () => hideHtmlModal(modal))\n\n    // Close on escape key press.\n    modal.setAttribute('tabindex', 0)\n    modal.addEventListener('keydown', e => {\n        if (e.key === 'Escape') hideHtmlModal(modal)\n    })\n    modal.focus()\n}\n\nexport function hideHtmlModal(modal) {\n    modal.outerHTML = ''\n    document.body.style.overflow = 'visible'\n}\n", "import { sendRequest } from \"@/request\"\n\n/**\n * The RequestPool contains a list of commits to be sent to the server...\n */\nexport class RequestPool {\n    constructor() {\n        this.commits = new Set\n    }\n\n    add(commit) {\n        this.commits.add(commit)\n    }\n\n    delete(commit) {\n        this.commits.delete(commit)\n    }\n\n    hasCommitFor(component) {\n        return !! this.findCommitByComponent(component)\n    }\n\n    findCommitByComponent(component) {\n        // Determine if this pool already has a commit for this component...\n        for (let [idx, commit] of this.commits.entries()) {\n            if (commit.component === component) return commit\n        }\n    }\n\n    // Determine if a commit should be added to this pool or isolated into its own...\n    shouldHoldCommit(commit) {\n        return ! commit.isolate\n    }\n\n    empty() {\n        return this.commits.size === 0\n    }\n\n    async send() {\n        this.prepare()\n\n        // Send this pool of commits to the server and let the commits\n        // Manage their own response actions...\n        await sendRequest(this)\n    }\n\n    prepare() {\n        // Give each commit a chance to do any last-minute prep\n        // before being sent to the server.\n        this.commits.forEach(i => i.prepare())\n    }\n\n    payload() {\n        // Extract a request payload from each of the commits in this pool...\n        let commitPayloads = []\n\n        // Collect success and failure callbacks to be used inside aggregated callbacks...\n        let successReceivers = []\n        let failureReceivers = []\n\n        this.commits.forEach(commit => {\n            let [payload, succeed, fail] = commit.toRequestPayload()\n\n            commitPayloads.push(payload)\n            successReceivers.push(succeed)\n            failureReceivers.push(fail)\n        })\n\n        // Aggregate the success and failure callbacks for individual commits\n        // into something that can be called singularly...\n        let succeed = components => successReceivers.forEach(receiver => receiver(components.shift()))\n\n        let fail = () => failureReceivers.forEach(receiver => receiver())\n\n        return [ commitPayloads, succeed, fail ]\n    }\n}\n", "import { diff } from '@/utils'\nimport { on, trigger } from '@/hooks'\n\n/**\n * A commit represents an individual component updating itself server-side...\n */\nexport class Commit {\n    constructor(component) {\n        this.component = component\n        this.isolate = false\n        this.calls = []\n        this.receivers = []\n        this.resolvers = []\n    }\n\n    // Add a new resolver to be resolved when a commit is returned from the server...\n    addResolver(resolver) {\n        this.resolvers.push(resolver)\n    }\n\n    // Add a new action \"call\" to the commit payload...\n    addCall(method, params, receiver) {\n        this.calls.push({\n            path: '', method, params,\n            handleReturn(value) {\n                receiver(value)\n            },\n        })\n    }\n\n    prepare() {\n        trigger('commit.prepare', { component: this.component })\n    }\n\n    // Generate a JSON-friendly server-request payload...\n    toRequestPayload() {\n        // Generate a \"diff\" of the current last known server-side state, and\n        // the new front-end state so that we can update the server atomically...\n        let propertiesDiff = diff(this.component.canonical, this.component.ephemeral)\n\n        let updates = this.component.mergeQueuedUpdates(propertiesDiff)\n\n        let payload = {\n            snapshot: this.component.snapshotEncoded,\n            updates: updates,\n            calls: this.calls.map(i => ({\n                path: i.path,\n                method: i.method,\n                params: i.params,\n            }))\n        }\n\n        // Store success and failure hooks from commit listeners\n        // so they can be aggregated into a singular callback later...\n        let succeedCallbacks = []\n        let failCallbacks = []\n        let respondCallbacks = []\n\n        let succeed = (fwd) => succeedCallbacks.forEach(i => i(fwd))\n        let fail = () => failCallbacks.forEach(i => i())\n        let respond = () => respondCallbacks.forEach(i => i())\n\n        // Allow other areas of the codebase to hook into the lifecycle\n        // of an individual commit...\n        let finishTarget = trigger('commit', {\n            component: this.component,\n            commit: payload,\n            succeed: (callback) => {\n                succeedCallbacks.push(callback)\n            },\n            fail: (callback) => {\n                failCallbacks.push(callback)\n            },\n            respond: (callback) => {\n                respondCallbacks.push(callback)\n            },\n        })\n\n        // Handle the response payload for a commit...\n        let handleResponse = (response) => {\n            let { snapshot, effects } = response\n\n            respond()\n\n            // Take the new snapshot and merge it into the existing one...\n            this.component.mergeNewSnapshot(snapshot, effects, updates)\n\n            // Trigger any side effects from the payload like \"morph\" and \"dispatch event\"...\n            this.component.processEffects(this.component.effects)\n\n            if (effects['returns']) {\n                let returns = effects['returns']\n\n                // Here we'll match up returned values with their method call handlers. We need to build up\n                // two \"stacks\" of the same length and walk through them together to handle them properly...\n                let returnHandlerStack = this.calls.map(({ handleReturn }) => (handleReturn))\n\n                returnHandlerStack.forEach((handleReturn, index) => {\n                    handleReturn(returns[index])\n                })\n            }\n\n            let parsedSnapshot = JSON.parse(snapshot)\n\n            finishTarget({ snapshot: parsedSnapshot, effects })\n\n            this.resolvers.forEach(i => i())\n\n            succeed(response)\n        }\n\n        let handleFailure = () => {\n            respond()\n\n            fail()\n        }\n\n        return [payload, handleResponse, handleFailure]\n    }\n}\n", "import { trigger } from '@/hooks'\nimport { RequestPool } from './pool'\nimport { Commit } from './commit'\n\n/**\n * This bus manages the pooling of multiple commits and sending\n * those pools of commits to the server...\n */\nexport class CommitBus {\n    constructor() {\n        // A list of loose, un-pooled, commits ready to be pooled and sent to the server...\n        this.commits = new Set\n\n        // A list of commit pools currently out to the server...\n        this.pools = new Set\n    }\n\n    add(component) {\n        // If this component already has a commit, leave it, otherwise,\n        // create a new commit and add it to the list...\n        let commit = this.findCommitOr(component, () => {\n            let newCommit = new Commit(component)\n\n            this.commits.add(newCommit)\n\n            return newCommit\n        })\n\n        // Buffer the sending of a pool for 5ms to account for UI interactions\n        // that will trigger multiple events within a few milliseconds of each other.\n        // For example, clicking on a button that both unfocuses a field and registers a mousedown...\n        bufferPoolingForFiveMs(commit, () => {\n            // If this commit is already in a pool, leave it be...\n            let pool = this.findPoolWithComponent(commit.component)\n\n            if (! pool) {\n                // If it's not, create a new pool or add it to an existing one and trigger a network request...\n                this.createAndSendNewPool()\n            }\n        })\n\n        return commit\n    }\n\n    findCommitOr(component, callback) {\n        for (let [idx, commit] of this.commits.entries()) {\n            if (commit.component === component) {\n                return commit\n            }\n        }\n\n        return callback()\n    }\n\n    findPoolWithComponent(component) {\n        for (let [idx, pool] of this.pools.entries()) {\n            if (pool.hasCommitFor(component)) return pool\n        }\n    }\n\n    createAndSendNewPool() {\n        // Allow features like \"reactive properties\" to initiate associated\n        // commits before those commits are pooled for a network request...\n        trigger('commit.pooling', { commits: this.commits })\n\n        // Split commits up across one or multiple pools to be sent as seperate network requests...\n        let pools = this.corraleCommitsIntoPools()\n\n        // Clear all commits in the queue now that they're in pools...\n        this.commits.clear()\n\n        trigger('commit.pooled', { pools })\n\n        // Go through each pool and...\n        pools.forEach(pool => {\n            // Ignore empty pools (if other parts of the system have moved commits around different pools)...\n            if (pool.empty()) return\n\n            // Add it to the list of pending pools...\n            this.pools.add(pool)\n\n            // Send it's payload along to the server...\n            pool.send().then(() => {\n                // When it comes back, remove it from the list...\n                this.pools.delete(pool)\n\n                // Trigger another pooling phase in case commits have\n                // been added while the current request was out...\n                this.sendAnyQueuedCommits()\n            })\n        })\n    }\n\n    corraleCommitsIntoPools() {\n        let pools = new Set\n\n        // Go through each commit and assess wether it should be bundled\n        // with other commits or sperated into it's own pool (network request)...\n        for (let [idx, commit] of this.commits.entries()) {\n            let hasFoundPool = false\n\n            // If an existing pool wants to claim a commit, let it...\n            pools.forEach(pool => {\n                if (pool.shouldHoldCommit(commit)) {\n                    pool.add(commit)\n\n                    hasFoundPool = true\n                }\n            })\n\n            // Otherwise, create a new pool and seed it with this commit...\n            if (! hasFoundPool) {\n                let newPool = new RequestPool\n\n                newPool.add(commit)\n\n                pools.add(newPool)\n            }\n        }\n\n        return pools\n    }\n\n    sendAnyQueuedCommits() {\n        if (this.commits.size > 0) {\n            this.createAndSendNewPool()\n        }\n    }\n}\n\nlet buffersByCommit = new WeakMap\n\nfunction bufferPoolingForFiveMs(commit, callback) {\n    if (buffersByCommit.has(commit)) return\n\n    buffersByCommit.set(commit, setTimeout(() => {\n        callback()\n\n        buffersByCommit.delete(commit)\n    }, 5))\n}\n", "import { getCsrfToken, contentIsFromDump, splitDumpFromContent, getUpdateUri } from '@/utils'\nimport { trigger, triggerAsync } from '@/hooks'\nimport { showHtmlModal } from './modal'\nimport { CommitBus } from './bus'\n\n/**\n * This is the bus that manages pooling and sending\n * commits to the server as network requests...\n */\nlet commitBus = new CommitBus\n\n/**\n * Create a commit and trigger a network request...\n */\nexport async function requestCommit(component) {\n    let commit = commitBus.add(component)\n\n    let promise = new Promise((resolve) => {\n        commit.addResolver(resolve)\n    })\n\n    promise.commit = commit\n\n    return promise\n}\n\n/**\n * Create a commit with an \"action\" call and trigger a network request...\n */\nexport async function requestCall(component, method, params) {\n    let commit = commitBus.add(component)\n\n    let promise = new Promise((resolve) => {\n        commit.addCall(method, params, value => resolve(value))\n    })\n\n    promise.commit = commit\n\n    return promise\n}\n\n/**\n * Send a pool of commits to the server over HTTP...\n */\nexport async function sendRequest(pool) {\n    let [payload, handleSuccess, handleFailure] = pool.payload()\n\n    let options = {\n        method: 'POST',\n        body: JSON.stringify({\n            _token: getCsrfToken(),\n            components: payload,\n        }),\n        headers: {\n            'Content-type': 'application/json',\n            'X-Livewire': '',\n        },\n    }\n\n    let succeedCallbacks = []\n    let failCallbacks = []\n    let respondCallbacks = []\n\n    let succeed = (fwd) => succeedCallbacks.forEach(i => i(fwd))\n    let fail = (fwd) => failCallbacks.forEach(i => i(fwd))\n    let respond = (fwd) => respondCallbacks.forEach(i => i(fwd))\n\n    let finishProfile = trigger('request.profile', options)\n\n    let updateUri = getUpdateUri()\n\n    trigger('request', {\n        url: updateUri,\n        options,\n        payload: options.body,\n        respond: i => respondCallbacks.push(i),\n        succeed: i => succeedCallbacks.push(i),\n        fail: i => failCallbacks.push(i),\n    })\n\n    let response\n\n    try {\n        response = await fetch(updateUri, options)\n    } catch (e) {\n        // If something went wrong with the fetch (particularly\n        // this would happen if the connection went offline)\n        // fail with a 503 and allow Livewire to clean up\n\n        finishProfile({ content: '{}', failed: true })\n\n        handleFailure()\n\n        fail({\n            status: 503,\n            content: null,\n            preventDefault: () => {},\n        })\n\n        return\n    }\n\n    let mutableObject = {\n        status: response.status,\n        response,\n    }\n\n    respond(mutableObject)\n\n    response = mutableObject.response\n\n    let content = await response.text()\n\n    // Handle error response...\n    if (! response.ok) {\n        finishProfile({ content: '{}', failed: true })\n\n        let preventDefault = false\n\n        handleFailure()\n\n        fail({\n            status: response.status,\n            content,\n            preventDefault: () => preventDefault = true,\n        })\n\n        if (preventDefault) return\n\n        if (response.status === 419) {\n            handlePageExpiry()\n        }\n\n        return showFailureModal(content)\n    }\n\n    /**\n     * Sometimes a redirect happens on the backend outside of Livewire's control,\n     * for example to a login page from a middleware, so we will just redirect\n     * to that page.\n     */\n    if (response.redirected) {\n        window.location.href = response.url\n    }\n\n    /**\n     * Sometimes a response will be prepended with html to render a dump, so we\n     * will seperate the dump html from Livewire's JSON response content and\n     * render the dump in a modal and allow Livewire to continue with the\n     * request.\n     */\n    if (contentIsFromDump(content)) {\n        let dump\n        [dump, content] = splitDumpFromContent(content)\n\n        showHtmlModal(dump)\n\n        finishProfile({ content: '{}', failed: true })\n    } else {\n        finishProfile({ content, failed: false })\n    }\n\n    let { components, assets } = JSON.parse(content)\n\n    await triggerAsync('payload.intercept', { components, assets })\n\n    await handleSuccess(components)\n\n    succeed({ status: response.status, json: JSON.parse(content) })\n}\n\nfunction handlePageExpiry() {\n    confirm(\n        'This page has expired.\\nWould you like to refresh the page?'\n    ) && window.location.reload()\n}\n\nfunction showFailureModal(content) {\n    let html = content\n\n    showHtmlModal(html)\n}\n", "import { cancelUpload, removeUpload, upload, uploadMultiple } from './features/supportFileUploads'\nimport { dispatch, dispatchSelf, dispatchTo, listen } from '@/events'\nimport { generateEntangleFunction } from '@/features/supportEntangle'\nimport { closestComponent } from '@/store'\nimport { requestCommit, requestCall } from '@/request'\nimport { dataGet, dataSet } from '@/utils'\nimport Alpine from 'alpinejs'\nimport { on as hook } from './hooks'\n\nlet properties = {}\nlet fallback\n\nfunction wireProperty(name, callback, component = null) {\n    properties[name] = callback\n}\n\nfunction wireFallback(callback) {\n    fallback = callback\n}\n\n// For V2 backwards compatibility...\n// And I actually like both depending on the scenario...\nlet aliases = {\n    'on': '$on',\n    'el': '$el',\n    'id': '$id',\n    'get': '$get',\n    'set': '$set',\n    'call': '$call',\n    'hook': '$hook',\n    'commit': '$commit',\n    'watch': '$watch',\n    'entangle': '$entangle',\n    'dispatch': '$dispatch',\n    'dispatchTo': '$dispatchTo',\n    'dispatchSelf': '$dispatchSelf',\n    'upload': '$upload',\n    'uploadMultiple': '$uploadMultiple',\n    'removeUpload': '$removeUpload',\n    'cancelUpload': '$cancelUpload',\n}\n\nexport function generateWireObject(component, state) {\n    return new Proxy({}, {\n        get(target, property) {\n            if (property === '__instance') return component\n\n            if (property in aliases) {\n                return getProperty(component, aliases[property])\n            } else if (property in properties) {\n                return getProperty(component, property)\n            } else if (property in state) {\n                return state[property]\n            } else if (! ['then'].includes(property)) {\n                return getFallback(component)(property)\n            }\n        },\n\n        set(target, property, value) {\n            if (property in state) {\n                state[property] = value\n            }\n\n            return true\n        },\n    })\n}\n\nfunction getProperty(component, name) {\n    return properties[name](component)\n}\n\nfunction getFallback(component) {\n    return fallback(component)\n}\n\nAlpine.magic('wire', (el, { cleanup }) => {\n    // Purposely initializing an empty variable here is a \"memo\"\n    // so that a component is lazy-loaded when using $wire from Alpine...\n    let component\n\n    // Override $wire methods that need to be cleaned up when\n    // and element is removed. For example, `x-data=\"{ foo: $wire.entangle(...) }\"`:\n    // we would want the entangle effect freed if the element was removed from the DOM...\n    return new Proxy({}, {\n        get(target, property) {\n            if (! component) component = closestComponent(el)\n\n            if (['$entangle', 'entangle'].includes(property)) {\n                return generateEntangleFunction(component, cleanup)\n            }\n\n            return component.$wire[property]\n        },\n\n        set(target, property, value) {\n            if (! component) component = closestComponent(el)\n\n            component.$wire[property] = value\n\n            return true\n        },\n    })\n})\n\nwireProperty('__instance', (component) => component)\n\nwireProperty('$get', (component) => (property, reactive = true) => dataGet(reactive ? component.reactive : component.ephemeral, property))\n\nwireProperty('$el', (component) => {\n    return component.el\n})\n\nwireProperty('$id', (component) => {\n    return component.id\n})\n\nwireProperty('$set', (component) => async (property, value, live = true) => {\n    dataSet(component.reactive, property, value)\n\n    // If \"live\", send a request, queueing the property update to happen first\n    // on the server, then trickle back down to the client and get merged...\n    if (live) {\n        component.queueUpdate(property, value)\n\n        return await requestCommit(component)\n    }\n\n    return Promise.resolve()\n})\n\nwireProperty('$call', (component) => async (method, ...params) => {\n    return await component.$wire[method](...params)\n})\n\nwireProperty('$entangle', (component) => (name, live = false) => {\n    return generateEntangleFunction(component)(name, live)\n})\n\nwireProperty('$toggle', (component) => (name, live = true) => {\n    return component.$wire.set(name, ! component.$wire.get(name), live)\n})\n\nwireProperty('$watch', (component) => (path, callback) => {\n    let getter = () => {\n        return dataGet(component.reactive, path)\n    }\n\n    let unwatch = Alpine.watch(getter, callback)\n\n    component.addCleanup(unwatch)\n})\n\nwireProperty('$refresh', (component) => component.$wire.$commit)\nwireProperty('$commit', (component) => async () => await requestCommit(component))\n\nwireProperty('$on', (component) => (...params) => listen(component, ...params))\n\nwireProperty('$hook', (component) => (name, callback) => {\n    let unhook = hook(name, ({component: hookComponent, ...params}) => {\n        // Request level hooks don't have a component, so just run the callback\n        if (hookComponent === undefined) return callback(params)\n\n        // Run the callback if the component in the hook matches the $wire component\n        if (hookComponent.id === component.id) return callback({component: hookComponent, ...params})\n    })\n\n    component.addCleanup(unhook)\n\n    // Return the unhook function so it can be called manually if needed\n    return unhook\n})\n\nwireProperty('$dispatch', (component) => (...params) => dispatch(component, ...params))\nwireProperty('$dispatchSelf', (component) => (...params) => dispatchSelf(component, ...params))\nwireProperty('$dispatchTo', () => (...params) => dispatchTo(...params))\nwireProperty('$upload', (component) => (...params) => upload(component, ...params))\nwireProperty('$uploadMultiple', (component) => (...params) => uploadMultiple(component, ...params))\nwireProperty('$removeUpload', (component) => (...params) => removeUpload(component, ...params))\nwireProperty('$cancelUpload', (component) => (...params) => cancelUpload(component, ...params))\n\nlet parentMemo = new WeakMap\n\nwireProperty('$parent', component => {\n    if (parentMemo.has(component)) return parentMemo.get(component).$wire\n\n    let parent = component.parent\n\n    parentMemo.set(component, parent)\n\n    return parent.$wire\n})\n\nlet overriddenMethods = new WeakMap\n\nexport function overrideMethod(component, method, callback) {\n    if (! overriddenMethods.has(component)) {\n        overriddenMethods.set(component, {})\n    }\n\n    let obj = overriddenMethods.get(component)\n\n    obj[method] = callback\n\n    overriddenMethods.set(component, obj)\n}\n\nwireFallback((component) => (property) => async (...params) => {\n    // If this method is passed directly to a Vue or Alpine\n    // event listener (@click=\"someMethod\") without using\n    // parens, strip out the automatically added event.\n    if (params.length === 1 && params[0] instanceof Event) {\n        params = []\n    }\n\n    if (overriddenMethods.has(component)) {\n        let overrides = overriddenMethods.get(component)\n\n        if (typeof overrides[property] === 'function') {\n            return overrides[property](params)\n        }\n    }\n\n    return await requestCall(component, property, params)\n})\n", "import { dataSet, deepClone, diff, extractData} from '@/utils'\nimport { generateWireObject } from '@/$wire'\nimport { closestComponent, findComponent } from '@/store'\nimport { trigger } from '@/hooks'\n\nexport class Component {\n    constructor(el) {\n        if (el.__livewire) throw 'Component already initialized';\n\n        el.__livewire = this\n\n        this.el = el\n\n        this.id = el.getAttribute('wire:id')\n\n        this.__livewireId = this.id // @legacy\n\n        this.snapshotEncoded = el.getAttribute('wire:snapshot')\n\n        this.snapshot = JSON.parse(this.snapshotEncoded)\n\n        if (! this.snapshot) {\n            throw `Snapshot missing on Livewire component with id: ` + this.id\n        }\n\n        this.name = this.snapshot.memo.name\n\n        this.effects = JSON.parse(el.getAttribute('wire:effects'))\n        this.originalEffects = deepClone(this.effects)\n\n        // \"canonical\" data represents the last known server state.\n        this.canonical = extractData(deepClone(this.snapshot.data))\n        // \"ephemeral\" represents the most current state. (This can be freely manipulated by end users)\n        this.ephemeral = extractData(deepClone(this.snapshot.data))\n        // \"reactive\" is just ephemeral, except when you mutate it, front-ends like Vue react.\n        this.reactive = Alpine.reactive(this.ephemeral)\n\n        this.queuedUpdates = {}\n\n        // this.$wire = this.reactive\n        this.$wire = generateWireObject(this, this.reactive)\n\n        this.cleanups = []\n\n        // Effects will be processed after every request, but we'll also handle them on initialization.\n        this.processEffects(this.effects)\n    }\n\n    mergeNewSnapshot(snapshotEncoded, effects, updates = {}) {\n        let snapshot = JSON.parse(snapshotEncoded)\n\n        let oldCanonical = deepClone(this.canonical)\n        let updatedOldCanonical = this.applyUpdates(oldCanonical, updates)\n\n        let newCanonical = extractData(deepClone(snapshot.data))\n\n        let dirty = diff(updatedOldCanonical, newCanonical)\n\n        this.snapshotEncoded = snapshotEncoded\n\n        this.snapshot = snapshot\n\n        this.effects = effects\n\n        this.canonical = extractData(deepClone(snapshot.data))\n\n        let newData = extractData(deepClone(snapshot.data))\n\n        Object.entries(dirty).forEach(([key, value]) => {\n            let rootKey = key.split('.')[0]\n            this.reactive[rootKey] = newData[rootKey]\n        })\n        // Object.entries(this.ephemeral).forEach(([key, value]) => {\n        //     if (! deeplyEqual(this.ephemeral[key], newData[key])) {\n        //         this.reactive[key] = newData[key]\n        //     }\n        // })\n\n        return dirty\n    }\n\n    queueUpdate(propertyName, value) {\n        // These updates will be applied first on the server\n        // on the next request, then trickle back to the\n        // client on the next request that gets sent.\n        this.queuedUpdates[propertyName] = value\n    }\n\n    mergeQueuedUpdates(diff) {\n        // Before adding queuedUpdates into the diff list, we will remove any diffs\n        // that will be overriden by the queued update. Queued updates will take\n        // priority against ephemeral updates that have happend since them...\n        Object.entries(this.queuedUpdates).forEach(([updateKey, updateValue]) => {\n            Object.entries(diff).forEach(([diffKey, diffValue]) => {\n                if (diffKey.startsWith(updateValue)) {\n                    delete diff[diffKey]\n                }\n            })\n\n            diff[updateKey] = updateValue\n        })\n\n        this.queuedUpdates = []\n\n        return diff\n    }\n\n    applyUpdates(object, updates) {\n        for (let key in updates) {\n            dataSet(object, key, updates[key])\n        }\n\n        return object\n    }\n\n    replayUpdate(snapshot, html) {\n        let effects = { ...this.effects, html}\n\n        this.mergeNewSnapshot(JSON.stringify(snapshot), effects)\n\n        this.processEffects({ html })\n    }\n\n    /**\n     * Here we'll take the new state and side effects from the\n     * server and use them to update the existing data that\n     * users interact with, triggering reactive effects.\n     */\n    processEffects(effects) {\n        // This is for BC.\n        trigger('effects', this, effects)\n\n        trigger('effect', {\n            component: this,\n            effects,\n            cleanup: i => this.addCleanup(i)\n        })\n    }\n\n    get children() {\n        let meta = this.snapshot.memo\n        let childIds = Object.values(meta.children).map(i => i[1])\n\n        return childIds.map(id => findComponent(id))\n    }\n\n    get parent() {\n        return closestComponent(this.el.parentElement)\n    }\n\n    inscribeSnapshotAndEffectsOnElement() {\n        let el = this.el\n\n        el.setAttribute('wire:snapshot', this.snapshotEncoded)\n\n        // We need to re-register any event listeners that were originally registered...\n        let effects = this.originalEffects.listeners\n            ? { listeners: this.originalEffects.listeners }\n            : {}\n\n        // We need to re-register any url/query-string bindings...\n        if (this.originalEffects.url) {\n            effects.url = this.originalEffects.url\n        }\n\n        // We need to re-register any scripts that were originally registered...\n        if (this.originalEffects.scripts) {\n            effects.scripts = this.originalEffects.scripts;\n        }\n\n        el.setAttribute('wire:effects', JSON.stringify(effects))\n    }\n\n    addCleanup(cleanup) {\n        this.cleanups.push(cleanup)\n    }\n\n    cleanup() {\n        delete this.el.__livewire\n\n        while (this.cleanups.length > 0) {\n            this.cleanups.pop()()\n        }\n    }\n}\n", "import { Component } from \"@/component\";\nimport { trigger } from \"@/hooks\";\n\nlet components = {}\n\nexport function initComponent(el) {\n    let component = new Component(el)\n\n    if (components[component.id]) throw 'Component already registered'\n\n    let cleanup = (i) => component.addCleanup(i)\n\n    trigger('component.init', { component, cleanup })\n\n    components[component.id] = component\n\n    return component\n}\n\nexport function destroyComponent(id) {\n    let component = components[id]\n\n    if (! component) return\n\n    component.cleanup()\n\n    delete components[id]\n}\n\nexport function hasComponent(id) {\n    return !! components[id]\n}\n\nexport function findComponent(id) {\n    let component = components[id]\n\n    if (! component) throw 'Component not found: ' + id\n\n    return component\n}\n\nexport function closestComponent(el, strict = true) {\n    let closestRoot = Alpine.findClosest(el, i => i.__livewire)\n\n    if (! closestRoot) {\n        if (strict) throw \"Could not find Livewire component in DOM tree\"\n\n        return\n    }\n\n    return closestRoot.__livewire\n}\n\nexport function componentsByName(name) {\n    return Object.values(components).filter(component => {\n        return name == component.name\n    })\n}\n\nexport function getByName(name) {\n    return componentsByName(name).map(i => i.$wire)\n}\n\nexport function find(id) {\n    let component = components[id]\n\n    return component && component.$wire\n}\n\nexport function first() {\n    return Object.values(components)[0].$wire\n}\n\nexport function all() {\n    return Object.values(components)\n}\n", "import { componentsByName } from \"@/store\"\n\nexport function dispatch(component, name, params) {\n    dispatchEvent(component.el, name, params)\n}\n\nexport function dispatchGlobal(name, params) {\n    dispatchEvent(window, name, params)\n}\n\nexport function dispatchSelf(component, name, params) {\n    dispatchEvent(component.el, name, params, false)\n}\n\nexport function dispatchTo(componentName, name, params) {\n    let targets = componentsByName(componentName)\n\n    targets.forEach(target => {\n        dispatchEvent(target.el, name, params, false)\n    })\n}\n\nexport function listen(component, name, callback) {\n    component.el.addEventListener(name, e => {\n        callback(e.detail)\n    })\n}\n\nexport function on(eventName, callback) {\n    let handler = (e) => {\n        // Implemented for backwards compatibility...\n        if (! e.__livewire) return\n\n        callback(e.detail)\n    }\n\n    window.addEventListener(eventName, handler)\n\n    return () => {\n        window.removeEventListener(eventName, handler)\n    }\n}\n\nfunction dispatchEvent(target, name, params, bubbles = true) {\n    let e = new CustomEvent(name, { bubbles, detail: params })\n\n    e.__livewire = { name, params, receivedBy: [] }\n\n    target.dispatchEvent(e)\n}\n", "import { on } from './hooks'\n\nlet customDirectiveNames = new Set\n\nexport function matchesForLivewireDirective(attributeName) {\n    return attributeName.match(new RegExp('wire:'))\n}\n\nexport function extractDirective(el, name) {\n    let [value, ...modifiers] = name.replace(new RegExp('wire:'), '').split('.')\n\n    return new Directive(value, modifiers, name, el)\n}\n\nexport function directive(name, callback) {\n    // Prevent the same directive from registering multiple initialization listeners...\n    if (customDirectiveNames.has(name)) return\n\n    customDirectiveNames.add(name)\n\n    on('directive.init', ({ el, component, directive, cleanup }) => {\n        if (directive.value === name) {\n            callback({\n                el, directive, component, $wire: component.$wire, cleanup\n            })\n        }\n    })\n}\n\nexport function globalDirective(name, callback) {\n    // Prevent the same directive from registering multiple initialization listeners...\n    if (customDirectiveNames.has(name)) return\n\n    customDirectiveNames.add(name)\n\n    on('directive.global.init', ({ el, directive, cleanup }) => {\n        if (directive.value === name) {\n            callback({ el, directive, cleanup })\n        }\n    })\n}\n\nexport function getDirectives(el) {\n    return new DirectiveManager(el)\n}\n\nexport function customDirectiveHasBeenRegistered(name) {\n    return customDirectiveNames.has(name)\n}\n\nclass DirectiveManager {\n    constructor(el) {\n        this.el = el\n        this.directives = this.extractTypeModifiersAndValue()\n    }\n\n    all() {\n        return this.directives\n    }\n\n    has(value) {\n        return this.directives.map(directive => directive.value).includes(value)\n    }\n\n    missing(value) {\n        return ! this.has(value)\n    }\n\n    get(value) {\n        return this.directives.find(directive => directive.value === value)\n    }\n\n    extractTypeModifiersAndValue() {\n        return Array.from(this.el.getAttributeNames()\n            // Filter only the livewire directives.\n            .filter(name => matchesForLivewireDirective(name))\n            // Parse out the type, modifiers, and value from it.\n            .map(name => extractDirective(this.el, name)))\n    }\n}\n\nexport class Directive {\n    constructor(value, modifiers, rawName, el) {\n        this.rawName = this.raw = rawName\n        this.el = el\n        this.eventContext\n\n        this.value = value\n        this.modifiers = modifiers\n        this.expression = this.el.getAttribute(this.rawName)\n    }\n\n    get method() {\n        const { method } = this.parseOutMethodAndParams(this.expression)\n\n        return method\n    }\n\n    get params() {\n        const { params } = this.parseOutMethodAndParams(this.expression)\n\n        return params\n    }\n\n    parseOutMethodAndParams(rawMethod) {\n        let method = rawMethod\n        let params = []\n        const methodAndParamString = method.match(/(.*?)\\((.*)\\)/s)\n\n        if (methodAndParamString) {\n            method = methodAndParamString[1]\n\n            // Use a function that returns it's arguments to parse and eval all params\n            // This \"$event\" is for use inside the livewire event handler.\n            let func = new Function('$event', `return (function () {\n                for (var l=arguments.length, p=new Array(l), k=0; k<l; k++) {\n                    p[k] = arguments[k];\n                }\n                return [].concat(p);\n            })(${methodAndParamString[2]})`)\n\n            params = func(this.eventContext)\n        }\n\n        return { method, params }\n    }\n}\n", "// packages/collapse/src/index.js\nfunction src_default(Alpine) {\n  Alpine.directive(\"collapse\", collapse);\n  collapse.inline = (el, { modifiers }) => {\n    if (!modifiers.includes(\"min\"))\n      return;\n    el._x_doShow = () => {\n    };\n    el._x_doHide = () => {\n    };\n  };\n  function collapse(el, { modifiers }) {\n    let duration = modifierValue(modifiers, \"duration\", 250) / 1e3;\n    let floor = modifierValue(modifiers, \"min\", 0);\n    let fullyHide = !modifiers.includes(\"min\");\n    if (!el._x_isShown)\n      el.style.height = `${floor}px`;\n    if (!el._x_isShown && fullyHide)\n      el.hidden = true;\n    if (!el._x_isShown)\n      el.style.overflow = \"hidden\";\n    let setFunction = (el2, styles) => {\n      let revertFunction = Alpine.setStyles(el2, styles);\n      return styles.height ? () => {\n      } : revertFunction;\n    };\n    let transitionStyles = {\n      transitionProperty: \"height\",\n      transitionDuration: `${duration}s`,\n      transitionTimingFunction: \"cubic-bezier(0.4, 0.0, 0.2, 1)\"\n    };\n    el._x_transition = {\n      in(before = () => {\n      }, after = () => {\n      }) {\n        if (fullyHide)\n          el.hidden = false;\n        if (fullyHide)\n          el.style.display = null;\n        let current = el.getBoundingClientRect().height;\n        el.style.height = \"auto\";\n        let full = el.getBoundingClientRect().height;\n        if (current === full) {\n          current = floor;\n        }\n        Alpine.transition(el, Alpine.setStyles, {\n          during: transitionStyles,\n          start: { height: current + \"px\" },\n          end: { height: full + \"px\" }\n        }, () => el._x_isShown = true, () => {\n          if (Math.abs(el.getBoundingClientRect().height - full) < 1) {\n            el.style.overflow = null;\n          }\n        });\n      },\n      out(before = () => {\n      }, after = () => {\n      }) {\n        let full = el.getBoundingClientRect().height;\n        Alpine.transition(el, setFunction, {\n          during: transitionStyles,\n          start: { height: full + \"px\" },\n          end: { height: floor + \"px\" }\n        }, () => el.style.overflow = \"hidden\", () => {\n          el._x_isShown = false;\n          if (el.style.height == `${floor}px` && fullyHide) {\n            el.style.display = \"none\";\n            el.hidden = true;\n          }\n        });\n      }\n    };\n  }\n}\nfunction modifierValue(modifiers, key, fallback) {\n  if (modifiers.indexOf(key) === -1)\n    return fallback;\n  const rawValue = modifiers[modifiers.indexOf(key) + 1];\n  if (!rawValue)\n    return fallback;\n  if (key === \"duration\") {\n    let match = rawValue.match(/([0-9]+)ms/);\n    if (match)\n      return match[1];\n  }\n  if (key === \"min\") {\n    let match = rawValue.match(/([0-9]+)px/);\n    if (match)\n      return match[1];\n  }\n  return rawValue;\n}\n\n// packages/collapse/builds/module.js\nvar module_default = src_default;\nexport {\n  src_default as collapse,\n  module_default as default\n};\n", "// node_modules/tabbable/dist/index.esm.js\nvar candidateSelectors = [\"input\", \"select\", \"textarea\", \"a[href]\", \"button\", \"[tabindex]:not(slot)\", \"audio[controls]\", \"video[controls]\", '[contenteditable]:not([contenteditable=\"false\"])', \"details>summary:first-of-type\", \"details\"];\nvar candidateSelector = /* @__PURE__ */ candidateSelectors.join(\",\");\nvar NoElement = typeof Element === \"undefined\";\nvar matches = NoElement ? function() {\n} : Element.prototype.matches || Element.prototype.msMatchesSelector || Element.prototype.webkitMatchesSelector;\nvar getRootNode = !NoElement && Element.prototype.getRootNode ? function(element) {\n  return element.getRootNode();\n} : function(element) {\n  return element.ownerDocument;\n};\nvar getCandidates = function getCandidates2(el, includeContainer, filter) {\n  var candidates = Array.prototype.slice.apply(el.querySelectorAll(candidateSelector));\n  if (includeContainer && matches.call(el, candidateSelector)) {\n    candidates.unshift(el);\n  }\n  candidates = candidates.filter(filter);\n  return candidates;\n};\nvar getCandidatesIteratively = function getCandidatesIteratively2(elements, includeContainer, options) {\n  var candidates = [];\n  var elementsToCheck = Array.from(elements);\n  while (elementsToCheck.length) {\n    var element = elementsToCheck.shift();\n    if (element.tagName === \"SLOT\") {\n      var assigned = element.assignedElements();\n      var content = assigned.length ? assigned : element.children;\n      var nestedCandidates = getCandidatesIteratively2(content, true, options);\n      if (options.flatten) {\n        candidates.push.apply(candidates, nestedCandidates);\n      } else {\n        candidates.push({\n          scope: element,\n          candidates: nestedCandidates\n        });\n      }\n    } else {\n      var validCandidate = matches.call(element, candidateSelector);\n      if (validCandidate && options.filter(element) && (includeContainer || !elements.includes(element))) {\n        candidates.push(element);\n      }\n      var shadowRoot = element.shadowRoot || // check for an undisclosed shadow\n      typeof options.getShadowRoot === \"function\" && options.getShadowRoot(element);\n      var validShadowRoot = !options.shadowRootFilter || options.shadowRootFilter(element);\n      if (shadowRoot && validShadowRoot) {\n        var _nestedCandidates = getCandidatesIteratively2(shadowRoot === true ? element.children : shadowRoot.children, true, options);\n        if (options.flatten) {\n          candidates.push.apply(candidates, _nestedCandidates);\n        } else {\n          candidates.push({\n            scope: element,\n            candidates: _nestedCandidates\n          });\n        }\n      } else {\n        elementsToCheck.unshift.apply(elementsToCheck, element.children);\n      }\n    }\n  }\n  return candidates;\n};\nvar getTabindex = function getTabindex2(node, isScope) {\n  if (node.tabIndex < 0) {\n    if ((isScope || /^(AUDIO|VIDEO|DETAILS)$/.test(node.tagName) || node.isContentEditable) && isNaN(parseInt(node.getAttribute(\"tabindex\"), 10))) {\n      return 0;\n    }\n  }\n  return node.tabIndex;\n};\nvar sortOrderedTabbables = function sortOrderedTabbables2(a, b) {\n  return a.tabIndex === b.tabIndex ? a.documentOrder - b.documentOrder : a.tabIndex - b.tabIndex;\n};\nvar isInput = function isInput2(node) {\n  return node.tagName === \"INPUT\";\n};\nvar isHiddenInput = function isHiddenInput2(node) {\n  return isInput(node) && node.type === \"hidden\";\n};\nvar isDetailsWithSummary = function isDetailsWithSummary2(node) {\n  var r = node.tagName === \"DETAILS\" && Array.prototype.slice.apply(node.children).some(function(child) {\n    return child.tagName === \"SUMMARY\";\n  });\n  return r;\n};\nvar getCheckedRadio = function getCheckedRadio2(nodes, form) {\n  for (var i = 0; i < nodes.length; i++) {\n    if (nodes[i].checked && nodes[i].form === form) {\n      return nodes[i];\n    }\n  }\n};\nvar isTabbableRadio = function isTabbableRadio2(node) {\n  if (!node.name) {\n    return true;\n  }\n  var radioScope = node.form || getRootNode(node);\n  var queryRadios = function queryRadios2(name) {\n    return radioScope.querySelectorAll('input[type=\"radio\"][name=\"' + name + '\"]');\n  };\n  var radioSet;\n  if (typeof window !== \"undefined\" && typeof window.CSS !== \"undefined\" && typeof window.CSS.escape === \"function\") {\n    radioSet = queryRadios(window.CSS.escape(node.name));\n  } else {\n    try {\n      radioSet = queryRadios(node.name);\n    } catch (err) {\n      console.error(\"Looks like you have a radio button with a name attribute containing invalid CSS selector characters and need the CSS.escape polyfill: %s\", err.message);\n      return false;\n    }\n  }\n  var checked = getCheckedRadio(radioSet, node.form);\n  return !checked || checked === node;\n};\nvar isRadio = function isRadio2(node) {\n  return isInput(node) && node.type === \"radio\";\n};\nvar isNonTabbableRadio = function isNonTabbableRadio2(node) {\n  return isRadio(node) && !isTabbableRadio(node);\n};\nvar isZeroArea = function isZeroArea2(node) {\n  var _node$getBoundingClie = node.getBoundingClientRect(), width = _node$getBoundingClie.width, height = _node$getBoundingClie.height;\n  return width === 0 && height === 0;\n};\nvar isHidden = function isHidden2(node, _ref) {\n  var displayCheck = _ref.displayCheck, getShadowRoot = _ref.getShadowRoot;\n  if (getComputedStyle(node).visibility === \"hidden\") {\n    return true;\n  }\n  var isDirectSummary = matches.call(node, \"details>summary:first-of-type\");\n  var nodeUnderDetails = isDirectSummary ? node.parentElement : node;\n  if (matches.call(nodeUnderDetails, \"details:not([open]) *\")) {\n    return true;\n  }\n  var nodeRootHost = getRootNode(node).host;\n  var nodeIsAttached = (nodeRootHost === null || nodeRootHost === void 0 ? void 0 : nodeRootHost.ownerDocument.contains(nodeRootHost)) || node.ownerDocument.contains(node);\n  if (!displayCheck || displayCheck === \"full\") {\n    if (typeof getShadowRoot === \"function\") {\n      var originalNode = node;\n      while (node) {\n        var parentElement = node.parentElement;\n        var rootNode = getRootNode(node);\n        if (parentElement && !parentElement.shadowRoot && getShadowRoot(parentElement) === true) {\n          return isZeroArea(node);\n        } else if (node.assignedSlot) {\n          node = node.assignedSlot;\n        } else if (!parentElement && rootNode !== node.ownerDocument) {\n          node = rootNode.host;\n        } else {\n          node = parentElement;\n        }\n      }\n      node = originalNode;\n    }\n    if (nodeIsAttached) {\n      return !node.getClientRects().length;\n    }\n  } else if (displayCheck === \"non-zero-area\") {\n    return isZeroArea(node);\n  }\n  return false;\n};\nvar isDisabledFromFieldset = function isDisabledFromFieldset2(node) {\n  if (/^(INPUT|BUTTON|SELECT|TEXTAREA)$/.test(node.tagName)) {\n    var parentNode = node.parentElement;\n    while (parentNode) {\n      if (parentNode.tagName === \"FIELDSET\" && parentNode.disabled) {\n        for (var i = 0; i < parentNode.children.length; i++) {\n          var child = parentNode.children.item(i);\n          if (child.tagName === \"LEGEND\") {\n            return matches.call(parentNode, \"fieldset[disabled] *\") ? true : !child.contains(node);\n          }\n        }\n        return true;\n      }\n      parentNode = parentNode.parentElement;\n    }\n  }\n  return false;\n};\nvar isNodeMatchingSelectorFocusable = function isNodeMatchingSelectorFocusable2(options, node) {\n  if (node.disabled || isHiddenInput(node) || isHidden(node, options) || // For a details element with a summary, the summary element gets the focus\n  isDetailsWithSummary(node) || isDisabledFromFieldset(node)) {\n    return false;\n  }\n  return true;\n};\nvar isNodeMatchingSelectorTabbable = function isNodeMatchingSelectorTabbable2(options, node) {\n  if (isNonTabbableRadio(node) || getTabindex(node) < 0 || !isNodeMatchingSelectorFocusable(options, node)) {\n    return false;\n  }\n  return true;\n};\nvar isValidShadowRootTabbable = function isValidShadowRootTabbable2(shadowHostNode) {\n  var tabIndex = parseInt(shadowHostNode.getAttribute(\"tabindex\"), 10);\n  if (isNaN(tabIndex) || tabIndex >= 0) {\n    return true;\n  }\n  return false;\n};\nvar sortByOrder = function sortByOrder2(candidates) {\n  var regularTabbables = [];\n  var orderedTabbables = [];\n  candidates.forEach(function(item, i) {\n    var isScope = !!item.scope;\n    var element = isScope ? item.scope : item;\n    var candidateTabindex = getTabindex(element, isScope);\n    var elements = isScope ? sortByOrder2(item.candidates) : element;\n    if (candidateTabindex === 0) {\n      isScope ? regularTabbables.push.apply(regularTabbables, elements) : regularTabbables.push(element);\n    } else {\n      orderedTabbables.push({\n        documentOrder: i,\n        tabIndex: candidateTabindex,\n        item,\n        isScope,\n        content: elements\n      });\n    }\n  });\n  return orderedTabbables.sort(sortOrderedTabbables).reduce(function(acc, sortable) {\n    sortable.isScope ? acc.push.apply(acc, sortable.content) : acc.push(sortable.content);\n    return acc;\n  }, []).concat(regularTabbables);\n};\nvar tabbable = function tabbable2(el, options) {\n  options = options || {};\n  var candidates;\n  if (options.getShadowRoot) {\n    candidates = getCandidatesIteratively([el], options.includeContainer, {\n      filter: isNodeMatchingSelectorTabbable.bind(null, options),\n      flatten: false,\n      getShadowRoot: options.getShadowRoot,\n      shadowRootFilter: isValidShadowRootTabbable\n    });\n  } else {\n    candidates = getCandidates(el, options.includeContainer, isNodeMatchingSelectorTabbable.bind(null, options));\n  }\n  return sortByOrder(candidates);\n};\nvar focusable = function focusable2(el, options) {\n  options = options || {};\n  var candidates;\n  if (options.getShadowRoot) {\n    candidates = getCandidatesIteratively([el], options.includeContainer, {\n      filter: isNodeMatchingSelectorFocusable.bind(null, options),\n      flatten: true,\n      getShadowRoot: options.getShadowRoot\n    });\n  } else {\n    candidates = getCandidates(el, options.includeContainer, isNodeMatchingSelectorFocusable.bind(null, options));\n  }\n  return candidates;\n};\nvar isTabbable = function isTabbable2(node, options) {\n  options = options || {};\n  if (!node) {\n    throw new Error(\"No node provided\");\n  }\n  if (matches.call(node, candidateSelector) === false) {\n    return false;\n  }\n  return isNodeMatchingSelectorTabbable(options, node);\n};\nvar focusableCandidateSelector = /* @__PURE__ */ candidateSelectors.concat(\"iframe\").join(\",\");\nvar isFocusable = function isFocusable2(node, options) {\n  options = options || {};\n  if (!node) {\n    throw new Error(\"No node provided\");\n  }\n  if (matches.call(node, focusableCandidateSelector) === false) {\n    return false;\n  }\n  return isNodeMatchingSelectorFocusable(options, node);\n};\n\n// node_modules/focus-trap/dist/focus-trap.esm.js\nfunction ownKeys(object, enumerableOnly) {\n  var keys = Object.keys(object);\n  if (Object.getOwnPropertySymbols) {\n    var symbols = Object.getOwnPropertySymbols(object);\n    enumerableOnly && (symbols = symbols.filter(function(sym) {\n      return Object.getOwnPropertyDescriptor(object, sym).enumerable;\n    })), keys.push.apply(keys, symbols);\n  }\n  return keys;\n}\nfunction _objectSpread2(target) {\n  for (var i = 1; i < arguments.length; i++) {\n    var source = null != arguments[i] ? arguments[i] : {};\n    i % 2 ? ownKeys(Object(source), true).forEach(function(key) {\n      _defineProperty(target, key, source[key]);\n    }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function(key) {\n      Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key));\n    });\n  }\n  return target;\n}\nfunction _defineProperty(obj, key, value) {\n  if (key in obj) {\n    Object.defineProperty(obj, key, {\n      value,\n      enumerable: true,\n      configurable: true,\n      writable: true\n    });\n  } else {\n    obj[key] = value;\n  }\n  return obj;\n}\nvar activeFocusTraps = function() {\n  var trapQueue = [];\n  return {\n    activateTrap: function activateTrap(trap) {\n      if (trapQueue.length > 0) {\n        var activeTrap = trapQueue[trapQueue.length - 1];\n        if (activeTrap !== trap) {\n          activeTrap.pause();\n        }\n      }\n      var trapIndex = trapQueue.indexOf(trap);\n      if (trapIndex === -1) {\n        trapQueue.push(trap);\n      } else {\n        trapQueue.splice(trapIndex, 1);\n        trapQueue.push(trap);\n      }\n    },\n    deactivateTrap: function deactivateTrap(trap) {\n      var trapIndex = trapQueue.indexOf(trap);\n      if (trapIndex !== -1) {\n        trapQueue.splice(trapIndex, 1);\n      }\n      if (trapQueue.length > 0) {\n        trapQueue[trapQueue.length - 1].unpause();\n      }\n    }\n  };\n}();\nvar isSelectableInput = function isSelectableInput2(node) {\n  return node.tagName && node.tagName.toLowerCase() === \"input\" && typeof node.select === \"function\";\n};\nvar isEscapeEvent = function isEscapeEvent2(e) {\n  return e.key === \"Escape\" || e.key === \"Esc\" || e.keyCode === 27;\n};\nvar isTabEvent = function isTabEvent2(e) {\n  return e.key === \"Tab\" || e.keyCode === 9;\n};\nvar delay = function delay2(fn) {\n  return setTimeout(fn, 0);\n};\nvar findIndex = function findIndex2(arr, fn) {\n  var idx = -1;\n  arr.every(function(value, i) {\n    if (fn(value)) {\n      idx = i;\n      return false;\n    }\n    return true;\n  });\n  return idx;\n};\nvar valueOrHandler = function valueOrHandler2(value) {\n  for (var _len = arguments.length, params = new Array(_len > 1 ? _len - 1 : 0), _key = 1; _key < _len; _key++) {\n    params[_key - 1] = arguments[_key];\n  }\n  return typeof value === \"function\" ? value.apply(void 0, params) : value;\n};\nvar getActualTarget = function getActualTarget2(event) {\n  return event.target.shadowRoot && typeof event.composedPath === \"function\" ? event.composedPath()[0] : event.target;\n};\nvar createFocusTrap = function createFocusTrap2(elements, userOptions) {\n  var doc = (userOptions === null || userOptions === void 0 ? void 0 : userOptions.document) || document;\n  var config = _objectSpread2({\n    returnFocusOnDeactivate: true,\n    escapeDeactivates: true,\n    delayInitialFocus: true\n  }, userOptions);\n  var state = {\n    // containers given to createFocusTrap()\n    // @type {Array<HTMLElement>}\n    containers: [],\n    // list of objects identifying tabbable nodes in `containers` in the trap\n    // NOTE: it's possible that a group has no tabbable nodes if nodes get removed while the trap\n    //  is active, but the trap should never get to a state where there isn't at least one group\n    //  with at least one tabbable node in it (that would lead to an error condition that would\n    //  result in an error being thrown)\n    // @type {Array<{\n    //   container: HTMLElement,\n    //   tabbableNodes: Array<HTMLElement>, // empty if none\n    //   focusableNodes: Array<HTMLElement>, // empty if none\n    //   firstTabbableNode: HTMLElement|null,\n    //   lastTabbableNode: HTMLElement|null,\n    //   nextTabbableNode: (node: HTMLElement, forward: boolean) => HTMLElement|undefined\n    // }>}\n    containerGroups: [],\n    // same order/length as `containers` list\n    // references to objects in `containerGroups`, but only those that actually have\n    //  tabbable nodes in them\n    // NOTE: same order as `containers` and `containerGroups`, but __not necessarily__\n    //  the same length\n    tabbableGroups: [],\n    nodeFocusedBeforeActivation: null,\n    mostRecentlyFocusedNode: null,\n    active: false,\n    paused: false,\n    // timer ID for when delayInitialFocus is true and initial focus in this trap\n    //  has been delayed during activation\n    delayInitialFocusTimer: void 0\n  };\n  var trap;\n  var getOption = function getOption2(configOverrideOptions, optionName, configOptionName) {\n    return configOverrideOptions && configOverrideOptions[optionName] !== void 0 ? configOverrideOptions[optionName] : config[configOptionName || optionName];\n  };\n  var findContainerIndex = function findContainerIndex2(element) {\n    return state.containerGroups.findIndex(function(_ref) {\n      var container = _ref.container, tabbableNodes = _ref.tabbableNodes;\n      return container.contains(element) || // fall back to explicit tabbable search which will take into consideration any\n      //  web components if the `tabbableOptions.getShadowRoot` option was used for\n      //  the trap, enabling shadow DOM support in tabbable (`Node.contains()` doesn't\n      //  look inside web components even if open)\n      tabbableNodes.find(function(node) {\n        return node === element;\n      });\n    });\n  };\n  var getNodeForOption = function getNodeForOption2(optionName) {\n    var optionValue = config[optionName];\n    if (typeof optionValue === \"function\") {\n      for (var _len2 = arguments.length, params = new Array(_len2 > 1 ? _len2 - 1 : 0), _key2 = 1; _key2 < _len2; _key2++) {\n        params[_key2 - 1] = arguments[_key2];\n      }\n      optionValue = optionValue.apply(void 0, params);\n    }\n    if (optionValue === true) {\n      optionValue = void 0;\n    }\n    if (!optionValue) {\n      if (optionValue === void 0 || optionValue === false) {\n        return optionValue;\n      }\n      throw new Error(\"`\".concat(optionName, \"` was specified but was not a node, or did not return a node\"));\n    }\n    var node = optionValue;\n    if (typeof optionValue === \"string\") {\n      node = doc.querySelector(optionValue);\n      if (!node) {\n        throw new Error(\"`\".concat(optionName, \"` as selector refers to no known node\"));\n      }\n    }\n    return node;\n  };\n  var getInitialFocusNode = function getInitialFocusNode2() {\n    var node = getNodeForOption(\"initialFocus\");\n    if (node === false) {\n      return false;\n    }\n    if (node === void 0) {\n      if (findContainerIndex(doc.activeElement) >= 0) {\n        node = doc.activeElement;\n      } else {\n        var firstTabbableGroup = state.tabbableGroups[0];\n        var firstTabbableNode = firstTabbableGroup && firstTabbableGroup.firstTabbableNode;\n        node = firstTabbableNode || getNodeForOption(\"fallbackFocus\");\n      }\n    }\n    if (!node) {\n      throw new Error(\"Your focus-trap needs to have at least one focusable element\");\n    }\n    return node;\n  };\n  var updateTabbableNodes = function updateTabbableNodes2() {\n    state.containerGroups = state.containers.map(function(container) {\n      var tabbableNodes = tabbable(container, config.tabbableOptions);\n      var focusableNodes = focusable(container, config.tabbableOptions);\n      return {\n        container,\n        tabbableNodes,\n        focusableNodes,\n        firstTabbableNode: tabbableNodes.length > 0 ? tabbableNodes[0] : null,\n        lastTabbableNode: tabbableNodes.length > 0 ? tabbableNodes[tabbableNodes.length - 1] : null,\n        /**\n         * Finds the __tabbable__ node that follows the given node in the specified direction,\n         *  in this container, if any.\n         * @param {HTMLElement} node\n         * @param {boolean} [forward] True if going in forward tab order; false if going\n         *  in reverse.\n         * @returns {HTMLElement|undefined} The next tabbable node, if any.\n         */\n        nextTabbableNode: function nextTabbableNode(node) {\n          var forward = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : true;\n          var nodeIdx = focusableNodes.findIndex(function(n) {\n            return n === node;\n          });\n          if (nodeIdx < 0) {\n            return void 0;\n          }\n          if (forward) {\n            return focusableNodes.slice(nodeIdx + 1).find(function(n) {\n              return isTabbable(n, config.tabbableOptions);\n            });\n          }\n          return focusableNodes.slice(0, nodeIdx).reverse().find(function(n) {\n            return isTabbable(n, config.tabbableOptions);\n          });\n        }\n      };\n    });\n    state.tabbableGroups = state.containerGroups.filter(function(group) {\n      return group.tabbableNodes.length > 0;\n    });\n    if (state.tabbableGroups.length <= 0 && !getNodeForOption(\"fallbackFocus\")) {\n      throw new Error(\"Your focus-trap must have at least one container with at least one tabbable node in it at all times\");\n    }\n  };\n  var tryFocus = function tryFocus2(node) {\n    if (node === false) {\n      return;\n    }\n    if (node === doc.activeElement) {\n      return;\n    }\n    if (!node || !node.focus) {\n      tryFocus2(getInitialFocusNode());\n      return;\n    }\n    node.focus({\n      preventScroll: !!config.preventScroll\n    });\n    state.mostRecentlyFocusedNode = node;\n    if (isSelectableInput(node)) {\n      node.select();\n    }\n  };\n  var getReturnFocusNode = function getReturnFocusNode2(previousActiveElement) {\n    var node = getNodeForOption(\"setReturnFocus\", previousActiveElement);\n    return node ? node : node === false ? false : previousActiveElement;\n  };\n  var checkPointerDown = function checkPointerDown2(e) {\n    var target = getActualTarget(e);\n    if (findContainerIndex(target) >= 0) {\n      return;\n    }\n    if (valueOrHandler(config.clickOutsideDeactivates, e)) {\n      trap.deactivate({\n        // if, on deactivation, we should return focus to the node originally-focused\n        //  when the trap was activated (or the configured `setReturnFocus` node),\n        //  then assume it's also OK to return focus to the outside node that was\n        //  just clicked, causing deactivation, as long as that node is focusable;\n        //  if it isn't focusable, then return focus to the original node focused\n        //  on activation (or the configured `setReturnFocus` node)\n        // NOTE: by setting `returnFocus: false`, deactivate() will do nothing,\n        //  which will result in the outside click setting focus to the node\n        //  that was clicked, whether it's focusable or not; by setting\n        //  `returnFocus: true`, we'll attempt to re-focus the node originally-focused\n        //  on activation (or the configured `setReturnFocus` node)\n        returnFocus: config.returnFocusOnDeactivate && !isFocusable(target, config.tabbableOptions)\n      });\n      return;\n    }\n    if (valueOrHandler(config.allowOutsideClick, e)) {\n      return;\n    }\n    e.preventDefault();\n  };\n  var checkFocusIn = function checkFocusIn2(e) {\n    var target = getActualTarget(e);\n    var targetContained = findContainerIndex(target) >= 0;\n    if (targetContained || target instanceof Document) {\n      if (targetContained) {\n        state.mostRecentlyFocusedNode = target;\n      }\n    } else {\n      e.stopImmediatePropagation();\n      tryFocus(state.mostRecentlyFocusedNode || getInitialFocusNode());\n    }\n  };\n  var checkTab = function checkTab2(e) {\n    var target = getActualTarget(e);\n    updateTabbableNodes();\n    var destinationNode = null;\n    if (state.tabbableGroups.length > 0) {\n      var containerIndex = findContainerIndex(target);\n      var containerGroup = containerIndex >= 0 ? state.containerGroups[containerIndex] : void 0;\n      if (containerIndex < 0) {\n        if (e.shiftKey) {\n          destinationNode = state.tabbableGroups[state.tabbableGroups.length - 1].lastTabbableNode;\n        } else {\n          destinationNode = state.tabbableGroups[0].firstTabbableNode;\n        }\n      } else if (e.shiftKey) {\n        var startOfGroupIndex = findIndex(state.tabbableGroups, function(_ref2) {\n          var firstTabbableNode = _ref2.firstTabbableNode;\n          return target === firstTabbableNode;\n        });\n        if (startOfGroupIndex < 0 && (containerGroup.container === target || isFocusable(target, config.tabbableOptions) && !isTabbable(target, config.tabbableOptions) && !containerGroup.nextTabbableNode(target, false))) {\n          startOfGroupIndex = containerIndex;\n        }\n        if (startOfGroupIndex >= 0) {\n          var destinationGroupIndex = startOfGroupIndex === 0 ? state.tabbableGroups.length - 1 : startOfGroupIndex - 1;\n          var destinationGroup = state.tabbableGroups[destinationGroupIndex];\n          destinationNode = destinationGroup.lastTabbableNode;\n        }\n      } else {\n        var lastOfGroupIndex = findIndex(state.tabbableGroups, function(_ref3) {\n          var lastTabbableNode = _ref3.lastTabbableNode;\n          return target === lastTabbableNode;\n        });\n        if (lastOfGroupIndex < 0 && (containerGroup.container === target || isFocusable(target, config.tabbableOptions) && !isTabbable(target, config.tabbableOptions) && !containerGroup.nextTabbableNode(target))) {\n          lastOfGroupIndex = containerIndex;\n        }\n        if (lastOfGroupIndex >= 0) {\n          var _destinationGroupIndex = lastOfGroupIndex === state.tabbableGroups.length - 1 ? 0 : lastOfGroupIndex + 1;\n          var _destinationGroup = state.tabbableGroups[_destinationGroupIndex];\n          destinationNode = _destinationGroup.firstTabbableNode;\n        }\n      }\n    } else {\n      destinationNode = getNodeForOption(\"fallbackFocus\");\n    }\n    if (destinationNode) {\n      e.preventDefault();\n      tryFocus(destinationNode);\n    }\n  };\n  var checkKey = function checkKey2(e) {\n    if (isEscapeEvent(e) && valueOrHandler(config.escapeDeactivates, e) !== false) {\n      e.preventDefault();\n      trap.deactivate();\n      return;\n    }\n    if (isTabEvent(e)) {\n      checkTab(e);\n      return;\n    }\n  };\n  var checkClick = function checkClick2(e) {\n    var target = getActualTarget(e);\n    if (findContainerIndex(target) >= 0) {\n      return;\n    }\n    if (valueOrHandler(config.clickOutsideDeactivates, e)) {\n      return;\n    }\n    if (valueOrHandler(config.allowOutsideClick, e)) {\n      return;\n    }\n    e.preventDefault();\n    e.stopImmediatePropagation();\n  };\n  var addListeners = function addListeners2() {\n    if (!state.active) {\n      return;\n    }\n    activeFocusTraps.activateTrap(trap);\n    state.delayInitialFocusTimer = config.delayInitialFocus ? delay(function() {\n      tryFocus(getInitialFocusNode());\n    }) : tryFocus(getInitialFocusNode());\n    doc.addEventListener(\"focusin\", checkFocusIn, true);\n    doc.addEventListener(\"mousedown\", checkPointerDown, {\n      capture: true,\n      passive: false\n    });\n    doc.addEventListener(\"touchstart\", checkPointerDown, {\n      capture: true,\n      passive: false\n    });\n    doc.addEventListener(\"click\", checkClick, {\n      capture: true,\n      passive: false\n    });\n    doc.addEventListener(\"keydown\", checkKey, {\n      capture: true,\n      passive: false\n    });\n    return trap;\n  };\n  var removeListeners = function removeListeners2() {\n    if (!state.active) {\n      return;\n    }\n    doc.removeEventListener(\"focusin\", checkFocusIn, true);\n    doc.removeEventListener(\"mousedown\", checkPointerDown, true);\n    doc.removeEventListener(\"touchstart\", checkPointerDown, true);\n    doc.removeEventListener(\"click\", checkClick, true);\n    doc.removeEventListener(\"keydown\", checkKey, true);\n    return trap;\n  };\n  trap = {\n    get active() {\n      return state.active;\n    },\n    get paused() {\n      return state.paused;\n    },\n    activate: function activate(activateOptions) {\n      if (state.active) {\n        return this;\n      }\n      var onActivate = getOption(activateOptions, \"onActivate\");\n      var onPostActivate = getOption(activateOptions, \"onPostActivate\");\n      var checkCanFocusTrap = getOption(activateOptions, \"checkCanFocusTrap\");\n      if (!checkCanFocusTrap) {\n        updateTabbableNodes();\n      }\n      state.active = true;\n      state.paused = false;\n      state.nodeFocusedBeforeActivation = doc.activeElement;\n      if (onActivate) {\n        onActivate();\n      }\n      var finishActivation = function finishActivation2() {\n        if (checkCanFocusTrap) {\n          updateTabbableNodes();\n        }\n        addListeners();\n        if (onPostActivate) {\n          onPostActivate();\n        }\n      };\n      if (checkCanFocusTrap) {\n        checkCanFocusTrap(state.containers.concat()).then(finishActivation, finishActivation);\n        return this;\n      }\n      finishActivation();\n      return this;\n    },\n    deactivate: function deactivate(deactivateOptions) {\n      if (!state.active) {\n        return this;\n      }\n      var options = _objectSpread2({\n        onDeactivate: config.onDeactivate,\n        onPostDeactivate: config.onPostDeactivate,\n        checkCanReturnFocus: config.checkCanReturnFocus\n      }, deactivateOptions);\n      clearTimeout(state.delayInitialFocusTimer);\n      state.delayInitialFocusTimer = void 0;\n      removeListeners();\n      state.active = false;\n      state.paused = false;\n      activeFocusTraps.deactivateTrap(trap);\n      var onDeactivate = getOption(options, \"onDeactivate\");\n      var onPostDeactivate = getOption(options, \"onPostDeactivate\");\n      var checkCanReturnFocus = getOption(options, \"checkCanReturnFocus\");\n      var returnFocus = getOption(options, \"returnFocus\", \"returnFocusOnDeactivate\");\n      if (onDeactivate) {\n        onDeactivate();\n      }\n      var finishDeactivation = function finishDeactivation2() {\n        delay(function() {\n          if (returnFocus) {\n            tryFocus(getReturnFocusNode(state.nodeFocusedBeforeActivation));\n          }\n          if (onPostDeactivate) {\n            onPostDeactivate();\n          }\n        });\n      };\n      if (returnFocus && checkCanReturnFocus) {\n        checkCanReturnFocus(getReturnFocusNode(state.nodeFocusedBeforeActivation)).then(finishDeactivation, finishDeactivation);\n        return this;\n      }\n      finishDeactivation();\n      return this;\n    },\n    pause: function pause() {\n      if (state.paused || !state.active) {\n        return this;\n      }\n      state.paused = true;\n      removeListeners();\n      return this;\n    },\n    unpause: function unpause() {\n      if (!state.paused || !state.active) {\n        return this;\n      }\n      state.paused = false;\n      updateTabbableNodes();\n      addListeners();\n      return this;\n    },\n    updateContainerElements: function updateContainerElements(containerElements) {\n      var elementsAsArray = [].concat(containerElements).filter(Boolean);\n      state.containers = elementsAsArray.map(function(element) {\n        return typeof element === \"string\" ? doc.querySelector(element) : element;\n      });\n      if (state.active) {\n        updateTabbableNodes();\n      }\n      return this;\n    }\n  };\n  trap.updateContainerElements(elements);\n  return trap;\n};\n\n// packages/focus/src/index.js\nfunction src_default(Alpine) {\n  let lastFocused;\n  let currentFocused;\n  window.addEventListener(\"focusin\", () => {\n    lastFocused = currentFocused;\n    currentFocused = document.activeElement;\n  });\n  Alpine.magic(\"focus\", (el) => {\n    let within = el;\n    return {\n      __noscroll: false,\n      __wrapAround: false,\n      within(el2) {\n        within = el2;\n        return this;\n      },\n      withoutScrolling() {\n        this.__noscroll = true;\n        return this;\n      },\n      noscroll() {\n        this.__noscroll = true;\n        return this;\n      },\n      withWrapAround() {\n        this.__wrapAround = true;\n        return this;\n      },\n      wrap() {\n        return this.withWrapAround();\n      },\n      focusable(el2) {\n        return isFocusable(el2);\n      },\n      previouslyFocused() {\n        return lastFocused;\n      },\n      lastFocused() {\n        return lastFocused;\n      },\n      focused() {\n        return currentFocused;\n      },\n      focusables() {\n        if (Array.isArray(within))\n          return within;\n        return focusable(within, { displayCheck: \"none\" });\n      },\n      all() {\n        return this.focusables();\n      },\n      isFirst(el2) {\n        let els = this.all();\n        return els[0] && els[0].isSameNode(el2);\n      },\n      isLast(el2) {\n        let els = this.all();\n        return els.length && els.slice(-1)[0].isSameNode(el2);\n      },\n      getFirst() {\n        return this.all()[0];\n      },\n      getLast() {\n        return this.all().slice(-1)[0];\n      },\n      getNext() {\n        let list = this.all();\n        let current = document.activeElement;\n        if (list.indexOf(current) === -1)\n          return;\n        if (this.__wrapAround && list.indexOf(current) === list.length - 1) {\n          return list[0];\n        }\n        return list[list.indexOf(current) + 1];\n      },\n      getPrevious() {\n        let list = this.all();\n        let current = document.activeElement;\n        if (list.indexOf(current) === -1)\n          return;\n        if (this.__wrapAround && list.indexOf(current) === 0) {\n          return list.slice(-1)[0];\n        }\n        return list[list.indexOf(current) - 1];\n      },\n      first() {\n        this.focus(this.getFirst());\n      },\n      last() {\n        this.focus(this.getLast());\n      },\n      next() {\n        this.focus(this.getNext());\n      },\n      previous() {\n        this.focus(this.getPrevious());\n      },\n      prev() {\n        return this.previous();\n      },\n      focus(el2) {\n        if (!el2)\n          return;\n        setTimeout(() => {\n          if (!el2.hasAttribute(\"tabindex\"))\n            el2.setAttribute(\"tabindex\", \"0\");\n          el2.focus({ preventScroll: this.__noscroll });\n        });\n      }\n    };\n  });\n  Alpine.directive(\"trap\", Alpine.skipDuringClone(\n    (el, { expression, modifiers }, { effect, evaluateLater, cleanup }) => {\n      let evaluator = evaluateLater(expression);\n      let oldValue = false;\n      let options = {\n        escapeDeactivates: false,\n        allowOutsideClick: true,\n        fallbackFocus: () => el\n      };\n      if (modifiers.includes(\"noautofocus\")) {\n        options.initialFocus = false;\n      } else {\n        let autofocusEl = el.querySelector(\"[autofocus]\");\n        if (autofocusEl)\n          options.initialFocus = autofocusEl;\n      }\n      let trap = createFocusTrap(el, options);\n      let undoInert = () => {\n      };\n      let undoDisableScrolling = () => {\n      };\n      const releaseFocus = () => {\n        undoInert();\n        undoInert = () => {\n        };\n        undoDisableScrolling();\n        undoDisableScrolling = () => {\n        };\n        trap.deactivate({\n          returnFocus: !modifiers.includes(\"noreturn\")\n        });\n      };\n      effect(() => evaluator((value) => {\n        if (oldValue === value)\n          return;\n        if (value && !oldValue) {\n          if (modifiers.includes(\"noscroll\"))\n            undoDisableScrolling = disableScrolling();\n          if (modifiers.includes(\"inert\"))\n            undoInert = setInert(el);\n          setTimeout(() => {\n            trap.activate();\n          }, 15);\n        }\n        if (!value && oldValue) {\n          releaseFocus();\n        }\n        oldValue = !!value;\n      }));\n      cleanup(releaseFocus);\n    },\n    // When cloning, we only want to add aria-hidden attributes to the\n    // DOM and not try to actually trap, as trapping can mess with the\n    // live DOM and isn't just isolated to the cloned DOM.\n    (el, { expression, modifiers }, { evaluate }) => {\n      if (modifiers.includes(\"inert\") && evaluate(expression))\n        setInert(el);\n    }\n  ));\n}\nfunction setInert(el) {\n  let undos = [];\n  crawlSiblingsUp(el, (sibling) => {\n    let cache = sibling.hasAttribute(\"aria-hidden\");\n    sibling.setAttribute(\"aria-hidden\", \"true\");\n    undos.push(() => cache || sibling.removeAttribute(\"aria-hidden\"));\n  });\n  return () => {\n    while (undos.length)\n      undos.pop()();\n  };\n}\nfunction crawlSiblingsUp(el, callback) {\n  if (el.isSameNode(document.body) || !el.parentNode)\n    return;\n  Array.from(el.parentNode.children).forEach((sibling) => {\n    if (sibling.isSameNode(el)) {\n      crawlSiblingsUp(el.parentNode, callback);\n    } else {\n      callback(sibling);\n    }\n  });\n}\nfunction disableScrolling() {\n  let overflow = document.documentElement.style.overflow;\n  let paddingRight = document.documentElement.style.paddingRight;\n  let scrollbarWidth = window.innerWidth - document.documentElement.clientWidth;\n  document.documentElement.style.overflow = \"hidden\";\n  document.documentElement.style.paddingRight = `${scrollbarWidth}px`;\n  return () => {\n    document.documentElement.style.overflow = overflow;\n    document.documentElement.style.paddingRight = paddingRight;\n  };\n}\n\n// packages/focus/builds/module.js\nvar module_default = src_default;\nexport {\n  module_default as default,\n  src_default as focus\n};\n/*! Bundled license information:\n\ntabbable/dist/index.esm.js:\n  (*!\n  * tabbable 5.3.3\n  * @license MIT, https://github.com/focus-trap/tabbable/blob/master/LICENSE\n  *)\n\nfocus-trap/dist/focus-trap.esm.js:\n  (*!\n  * focus-trap 6.9.4\n  * @license MIT, https://github.com/focus-trap/focus-trap/blob/master/LICENSE\n  *)\n*/\n", "// packages/persist/src/index.js\nfunction src_default(Alpine) {\n  let persist = () => {\n    let alias;\n    let storage;\n    try {\n      storage = localStorage;\n    } catch (e) {\n      console.error(e);\n      console.warn(\"Alpine: $persist is using temporary storage since localStorage is unavailable.\");\n      let dummy = /* @__PURE__ */ new Map();\n      storage = {\n        getItem: dummy.get.bind(dummy),\n        setItem: dummy.set.bind(dummy)\n      };\n    }\n    return Alpine.interceptor((initialValue, getter, setter, path, key) => {\n      let lookup = alias || `_x_${path}`;\n      let initial = storageHas(lookup, storage) ? storageGet(lookup, storage) : initialValue;\n      setter(initial);\n      Alpine.effect(() => {\n        let value = getter();\n        storageSet(lookup, value, storage);\n        setter(value);\n      });\n      return initial;\n    }, (func) => {\n      func.as = (key) => {\n        alias = key;\n        return func;\n      }, func.using = (target) => {\n        storage = target;\n        return func;\n      };\n    });\n  };\n  Object.defineProperty(Alpine, \"$persist\", { get: () => persist() });\n  Alpine.magic(\"persist\", persist);\n  Alpine.persist = (key, { get, set }, storage = localStorage) => {\n    let initial = storageHas(key, storage) ? storageGet(key, storage) : get();\n    set(initial);\n    Alpine.effect(() => {\n      let value = get();\n      storageSet(key, value, storage);\n      set(value);\n    });\n  };\n}\nfunction storageHas(key, storage) {\n  return storage.getItem(key) !== null;\n}\nfunction storageGet(key, storage) {\n  let value = storage.getItem(key, storage);\n  if (value === void 0)\n    return;\n  return JSON.parse(value);\n}\nfunction storageSet(key, value, storage) {\n  storage.setItem(key, JSON.stringify(value));\n}\n\n// packages/persist/builds/module.js\nvar module_default = src_default;\nexport {\n  module_default as default,\n  src_default as persist\n};\n", "// packages/intersect/src/index.js\nfunction src_default(Alpine) {\n  Alpine.directive(\"intersect\", Alpine.skipDuringClone((el, { value, expression, modifiers }, { evaluateLater, cleanup }) => {\n    let evaluate = evaluateLater(expression);\n    let options = {\n      rootMargin: getRootMargin(modifiers),\n      threshold: getThreshold(modifiers)\n    };\n    let observer = new IntersectionObserver((entries) => {\n      entries.forEach((entry) => {\n        if (entry.isIntersecting === (value === \"leave\"))\n          return;\n        evaluate();\n        modifiers.includes(\"once\") && observer.disconnect();\n      });\n    }, options);\n    observer.observe(el);\n    cleanup(() => {\n      observer.disconnect();\n    });\n  }));\n}\nfunction getThreshold(modifiers) {\n  if (modifiers.includes(\"full\"))\n    return 0.99;\n  if (modifiers.includes(\"half\"))\n    return 0.5;\n  if (!modifiers.includes(\"threshold\"))\n    return 0;\n  let threshold = modifiers[modifiers.indexOf(\"threshold\") + 1];\n  if (threshold === \"100\")\n    return 1;\n  if (threshold === \"0\")\n    return 0;\n  return Number(`.${threshold}`);\n}\nfunction getLengthValue(rawValue) {\n  let match = rawValue.match(/^(-?[0-9]+)(px|%)?$/);\n  return match ? match[1] + (match[2] || \"px\") : void 0;\n}\nfunction getRootMargin(modifiers) {\n  const key = \"margin\";\n  const fallback = \"0px 0px 0px 0px\";\n  const index = modifiers.indexOf(key);\n  if (index === -1)\n    return fallback;\n  let values = [];\n  for (let i = 1; i < 5; i++) {\n    values.push(getLengthValue(modifiers[index + i] || \"\"));\n  }\n  values = values.filter((v) => v !== void 0);\n  return values.length ? values.join(\" \").trim() : fallback;\n}\n\n// packages/intersect/builds/module.js\nvar module_default = src_default;\nexport {\n  module_default as default,\n  src_default as intersect\n};\n", "// packages/resize/src/index.js\nfunction src_default(Alpine) {\n  Alpine.directive(\"resize\", Alpine.skipDuringClone((el, { value, expression, modifiers }, { evaluateLater, cleanup }) => {\n    let evaluator = evaluateLater(expression);\n    let evaluate = (width, height) => {\n      evaluator(() => {\n      }, { scope: { \"$width\": width, \"$height\": height } });\n    };\n    let off = modifiers.includes(\"document\") ? onDocumentResize(evaluate) : onElResize(el, evaluate);\n    cleanup(() => off());\n  }));\n}\nfunction onElResize(el, callback) {\n  let observer = new ResizeObserver((entries) => {\n    let [width, height] = dimensions(entries);\n    callback(width, height);\n  });\n  observer.observe(el);\n  return () => observer.disconnect();\n}\nvar documentResizeObserver;\nvar documentResizeObserverCallbacks = /* @__PURE__ */ new Set();\nfunction onDocumentResize(callback) {\n  documentResizeObserverCallbacks.add(callback);\n  if (!documentResizeObserver) {\n    documentResizeObserver = new ResizeObserver((entries) => {\n      let [width, height] = dimensions(entries);\n      documentResizeObserverCallbacks.forEach((i) => i(width, height));\n    });\n    documentResizeObserver.observe(document.documentElement);\n  }\n  return () => {\n    documentResizeObserverCallbacks.delete(callback);\n  };\n}\nfunction dimensions(entries) {\n  let width, height;\n  for (let entry of entries) {\n    width = entry.borderBoxSize[0].inlineSize;\n    height = entry.borderBoxSize[0].blockSize;\n  }\n  return [width, height];\n}\n\n// packages/resize/builds/module.js\nvar module_default = src_default;\nexport {\n  module_default as default,\n  src_default as resize\n};\n", "// node_modules/@floating-ui/utils/dist/floating-ui.utils.mjs\nvar min = Math.min;\nvar max = Math.max;\nvar round = Math.round;\nvar floor = Math.floor;\nvar createCoords = (v) => ({\n  x: v,\n  y: v\n});\nvar oppositeSideMap = {\n  left: \"right\",\n  right: \"left\",\n  bottom: \"top\",\n  top: \"bottom\"\n};\nvar oppositeAlignmentMap = {\n  start: \"end\",\n  end: \"start\"\n};\nfunction clamp(start, value, end) {\n  return max(start, min(value, end));\n}\nfunction evaluate(value, param) {\n  return typeof value === \"function\" ? value(param) : value;\n}\nfunction getSide(placement) {\n  return placement.split(\"-\")[0];\n}\nfunction getAlignment(placement) {\n  return placement.split(\"-\")[1];\n}\nfunction getOppositeAxis(axis) {\n  return axis === \"x\" ? \"y\" : \"x\";\n}\nfunction getAxisLength(axis) {\n  return axis === \"y\" ? \"height\" : \"width\";\n}\nfunction getSideAxis(placement) {\n  return [\"top\", \"bottom\"].includes(getSide(placement)) ? \"y\" : \"x\";\n}\nfunction getAlignmentAxis(placement) {\n  return getOppositeAxis(getSideAxis(placement));\n}\nfunction getAlignmentSides(placement, rects, rtl) {\n  if (rtl === void 0) {\n    rtl = false;\n  }\n  const alignment = getAlignment(placement);\n  const alignmentAxis = getAlignmentAxis(placement);\n  const length = getAxisLength(alignmentAxis);\n  let mainAlignmentSide = alignmentAxis === \"x\" ? alignment === (rtl ? \"end\" : \"start\") ? \"right\" : \"left\" : alignment === \"start\" ? \"bottom\" : \"top\";\n  if (rects.reference[length] > rects.floating[length]) {\n    mainAlignmentSide = getOppositePlacement(mainAlignmentSide);\n  }\n  return [mainAlignmentSide, getOppositePlacement(mainAlignmentSide)];\n}\nfunction getExpandedPlacements(placement) {\n  const oppositePlacement = getOppositePlacement(placement);\n  return [getOppositeAlignmentPlacement(placement), oppositePlacement, getOppositeAlignmentPlacement(oppositePlacement)];\n}\nfunction getOppositeAlignmentPlacement(placement) {\n  return placement.replace(/start|end/g, (alignment) => oppositeAlignmentMap[alignment]);\n}\nfunction getSideList(side, isStart, rtl) {\n  const lr = [\"left\", \"right\"];\n  const rl = [\"right\", \"left\"];\n  const tb = [\"top\", \"bottom\"];\n  const bt = [\"bottom\", \"top\"];\n  switch (side) {\n    case \"top\":\n    case \"bottom\":\n      if (rtl)\n        return isStart ? rl : lr;\n      return isStart ? lr : rl;\n    case \"left\":\n    case \"right\":\n      return isStart ? tb : bt;\n    default:\n      return [];\n  }\n}\nfunction getOppositeAxisPlacements(placement, flipAlignment, direction, rtl) {\n  const alignment = getAlignment(placement);\n  let list = getSideList(getSide(placement), direction === \"start\", rtl);\n  if (alignment) {\n    list = list.map((side) => side + \"-\" + alignment);\n    if (flipAlignment) {\n      list = list.concat(list.map(getOppositeAlignmentPlacement));\n    }\n  }\n  return list;\n}\nfunction getOppositePlacement(placement) {\n  return placement.replace(/left|right|bottom|top/g, (side) => oppositeSideMap[side]);\n}\nfunction expandPaddingObject(padding) {\n  return {\n    top: 0,\n    right: 0,\n    bottom: 0,\n    left: 0,\n    ...padding\n  };\n}\nfunction getPaddingObject(padding) {\n  return typeof padding !== \"number\" ? expandPaddingObject(padding) : {\n    top: padding,\n    right: padding,\n    bottom: padding,\n    left: padding\n  };\n}\nfunction rectToClientRect(rect) {\n  return {\n    ...rect,\n    top: rect.y,\n    left: rect.x,\n    right: rect.x + rect.width,\n    bottom: rect.y + rect.height\n  };\n}\n\n// node_modules/@floating-ui/core/dist/floating-ui.core.mjs\nfunction computeCoordsFromPlacement(_ref, placement, rtl) {\n  let {\n    reference,\n    floating\n  } = _ref;\n  const sideAxis = getSideAxis(placement);\n  const alignmentAxis = getAlignmentAxis(placement);\n  const alignLength = getAxisLength(alignmentAxis);\n  const side = getSide(placement);\n  const isVertical = sideAxis === \"y\";\n  const commonX = reference.x + reference.width / 2 - floating.width / 2;\n  const commonY = reference.y + reference.height / 2 - floating.height / 2;\n  const commonAlign = reference[alignLength] / 2 - floating[alignLength] / 2;\n  let coords;\n  switch (side) {\n    case \"top\":\n      coords = {\n        x: commonX,\n        y: reference.y - floating.height\n      };\n      break;\n    case \"bottom\":\n      coords = {\n        x: commonX,\n        y: reference.y + reference.height\n      };\n      break;\n    case \"right\":\n      coords = {\n        x: reference.x + reference.width,\n        y: commonY\n      };\n      break;\n    case \"left\":\n      coords = {\n        x: reference.x - floating.width,\n        y: commonY\n      };\n      break;\n    default:\n      coords = {\n        x: reference.x,\n        y: reference.y\n      };\n  }\n  switch (getAlignment(placement)) {\n    case \"start\":\n      coords[alignmentAxis] -= commonAlign * (rtl && isVertical ? -1 : 1);\n      break;\n    case \"end\":\n      coords[alignmentAxis] += commonAlign * (rtl && isVertical ? -1 : 1);\n      break;\n  }\n  return coords;\n}\nvar computePosition = async (reference, floating, config) => {\n  const {\n    placement = \"bottom\",\n    strategy = \"absolute\",\n    middleware = [],\n    platform: platform2\n  } = config;\n  const validMiddleware = middleware.filter(Boolean);\n  const rtl = await (platform2.isRTL == null ? void 0 : platform2.isRTL(floating));\n  let rects = await platform2.getElementRects({\n    reference,\n    floating,\n    strategy\n  });\n  let {\n    x,\n    y\n  } = computeCoordsFromPlacement(rects, placement, rtl);\n  let statefulPlacement = placement;\n  let middlewareData = {};\n  let resetCount = 0;\n  for (let i = 0; i < validMiddleware.length; i++) {\n    const {\n      name,\n      fn\n    } = validMiddleware[i];\n    const {\n      x: nextX,\n      y: nextY,\n      data,\n      reset\n    } = await fn({\n      x,\n      y,\n      initialPlacement: placement,\n      placement: statefulPlacement,\n      strategy,\n      middlewareData,\n      rects,\n      platform: platform2,\n      elements: {\n        reference,\n        floating\n      }\n    });\n    x = nextX != null ? nextX : x;\n    y = nextY != null ? nextY : y;\n    middlewareData = {\n      ...middlewareData,\n      [name]: {\n        ...middlewareData[name],\n        ...data\n      }\n    };\n    if (reset && resetCount <= 50) {\n      resetCount++;\n      if (typeof reset === \"object\") {\n        if (reset.placement) {\n          statefulPlacement = reset.placement;\n        }\n        if (reset.rects) {\n          rects = reset.rects === true ? await platform2.getElementRects({\n            reference,\n            floating,\n            strategy\n          }) : reset.rects;\n        }\n        ({\n          x,\n          y\n        } = computeCoordsFromPlacement(rects, statefulPlacement, rtl));\n      }\n      i = -1;\n      continue;\n    }\n  }\n  return {\n    x,\n    y,\n    placement: statefulPlacement,\n    strategy,\n    middlewareData\n  };\n};\nasync function detectOverflow(state, options) {\n  var _await$platform$isEle;\n  if (options === void 0) {\n    options = {};\n  }\n  const {\n    x,\n    y,\n    platform: platform2,\n    rects,\n    elements,\n    strategy\n  } = state;\n  const {\n    boundary = \"clippingAncestors\",\n    rootBoundary = \"viewport\",\n    elementContext = \"floating\",\n    altBoundary = false,\n    padding = 0\n  } = evaluate(options, state);\n  const paddingObject = getPaddingObject(padding);\n  const altContext = elementContext === \"floating\" ? \"reference\" : \"floating\";\n  const element = elements[altBoundary ? altContext : elementContext];\n  const clippingClientRect = rectToClientRect(await platform2.getClippingRect({\n    element: ((_await$platform$isEle = await (platform2.isElement == null ? void 0 : platform2.isElement(element))) != null ? _await$platform$isEle : true) ? element : element.contextElement || await (platform2.getDocumentElement == null ? void 0 : platform2.getDocumentElement(elements.floating)),\n    boundary,\n    rootBoundary,\n    strategy\n  }));\n  const rect = elementContext === \"floating\" ? {\n    ...rects.floating,\n    x,\n    y\n  } : rects.reference;\n  const offsetParent = await (platform2.getOffsetParent == null ? void 0 : platform2.getOffsetParent(elements.floating));\n  const offsetScale = await (platform2.isElement == null ? void 0 : platform2.isElement(offsetParent)) ? await (platform2.getScale == null ? void 0 : platform2.getScale(offsetParent)) || {\n    x: 1,\n    y: 1\n  } : {\n    x: 1,\n    y: 1\n  };\n  const elementClientRect = rectToClientRect(platform2.convertOffsetParentRelativeRectToViewportRelativeRect ? await platform2.convertOffsetParentRelativeRectToViewportRelativeRect({\n    rect,\n    offsetParent,\n    strategy\n  }) : rect);\n  return {\n    top: (clippingClientRect.top - elementClientRect.top + paddingObject.top) / offsetScale.y,\n    bottom: (elementClientRect.bottom - clippingClientRect.bottom + paddingObject.bottom) / offsetScale.y,\n    left: (clippingClientRect.left - elementClientRect.left + paddingObject.left) / offsetScale.x,\n    right: (elementClientRect.right - clippingClientRect.right + paddingObject.right) / offsetScale.x\n  };\n}\nvar flip = function(options) {\n  if (options === void 0) {\n    options = {};\n  }\n  return {\n    name: \"flip\",\n    options,\n    async fn(state) {\n      var _middlewareData$arrow, _middlewareData$flip;\n      const {\n        placement,\n        middlewareData,\n        rects,\n        initialPlacement,\n        platform: platform2,\n        elements\n      } = state;\n      const {\n        mainAxis: checkMainAxis = true,\n        crossAxis: checkCrossAxis = true,\n        fallbackPlacements: specifiedFallbackPlacements,\n        fallbackStrategy = \"bestFit\",\n        fallbackAxisSideDirection = \"none\",\n        flipAlignment = true,\n        ...detectOverflowOptions\n      } = evaluate(options, state);\n      if ((_middlewareData$arrow = middlewareData.arrow) != null && _middlewareData$arrow.alignmentOffset) {\n        return {};\n      }\n      const side = getSide(placement);\n      const isBasePlacement = getSide(initialPlacement) === initialPlacement;\n      const rtl = await (platform2.isRTL == null ? void 0 : platform2.isRTL(elements.floating));\n      const fallbackPlacements = specifiedFallbackPlacements || (isBasePlacement || !flipAlignment ? [getOppositePlacement(initialPlacement)] : getExpandedPlacements(initialPlacement));\n      if (!specifiedFallbackPlacements && fallbackAxisSideDirection !== \"none\") {\n        fallbackPlacements.push(...getOppositeAxisPlacements(initialPlacement, flipAlignment, fallbackAxisSideDirection, rtl));\n      }\n      const placements2 = [initialPlacement, ...fallbackPlacements];\n      const overflow = await detectOverflow(state, detectOverflowOptions);\n      const overflows = [];\n      let overflowsData = ((_middlewareData$flip = middlewareData.flip) == null ? void 0 : _middlewareData$flip.overflows) || [];\n      if (checkMainAxis) {\n        overflows.push(overflow[side]);\n      }\n      if (checkCrossAxis) {\n        const sides2 = getAlignmentSides(placement, rects, rtl);\n        overflows.push(overflow[sides2[0]], overflow[sides2[1]]);\n      }\n      overflowsData = [...overflowsData, {\n        placement,\n        overflows\n      }];\n      if (!overflows.every((side2) => side2 <= 0)) {\n        var _middlewareData$flip2, _overflowsData$filter;\n        const nextIndex = (((_middlewareData$flip2 = middlewareData.flip) == null ? void 0 : _middlewareData$flip2.index) || 0) + 1;\n        const nextPlacement = placements2[nextIndex];\n        if (nextPlacement) {\n          return {\n            data: {\n              index: nextIndex,\n              overflows: overflowsData\n            },\n            reset: {\n              placement: nextPlacement\n            }\n          };\n        }\n        let resetPlacement = (_overflowsData$filter = overflowsData.filter((d) => d.overflows[0] <= 0).sort((a, b) => a.overflows[1] - b.overflows[1])[0]) == null ? void 0 : _overflowsData$filter.placement;\n        if (!resetPlacement) {\n          switch (fallbackStrategy) {\n            case \"bestFit\": {\n              var _overflowsData$map$so;\n              const placement2 = (_overflowsData$map$so = overflowsData.map((d) => [d.placement, d.overflows.filter((overflow2) => overflow2 > 0).reduce((acc, overflow2) => acc + overflow2, 0)]).sort((a, b) => a[1] - b[1])[0]) == null ? void 0 : _overflowsData$map$so[0];\n              if (placement2) {\n                resetPlacement = placement2;\n              }\n              break;\n            }\n            case \"initialPlacement\":\n              resetPlacement = initialPlacement;\n              break;\n          }\n        }\n        if (placement !== resetPlacement) {\n          return {\n            reset: {\n              placement: resetPlacement\n            }\n          };\n        }\n      }\n      return {};\n    }\n  };\n};\nasync function convertValueToCoords(state, options) {\n  const {\n    placement,\n    platform: platform2,\n    elements\n  } = state;\n  const rtl = await (platform2.isRTL == null ? void 0 : platform2.isRTL(elements.floating));\n  const side = getSide(placement);\n  const alignment = getAlignment(placement);\n  const isVertical = getSideAxis(placement) === \"y\";\n  const mainAxisMulti = [\"left\", \"top\"].includes(side) ? -1 : 1;\n  const crossAxisMulti = rtl && isVertical ? -1 : 1;\n  const rawValue = evaluate(options, state);\n  let {\n    mainAxis,\n    crossAxis,\n    alignmentAxis\n  } = typeof rawValue === \"number\" ? {\n    mainAxis: rawValue,\n    crossAxis: 0,\n    alignmentAxis: null\n  } : {\n    mainAxis: 0,\n    crossAxis: 0,\n    alignmentAxis: null,\n    ...rawValue\n  };\n  if (alignment && typeof alignmentAxis === \"number\") {\n    crossAxis = alignment === \"end\" ? alignmentAxis * -1 : alignmentAxis;\n  }\n  return isVertical ? {\n    x: crossAxis * crossAxisMulti,\n    y: mainAxis * mainAxisMulti\n  } : {\n    x: mainAxis * mainAxisMulti,\n    y: crossAxis * crossAxisMulti\n  };\n}\nvar offset = function(options) {\n  if (options === void 0) {\n    options = 0;\n  }\n  return {\n    name: \"offset\",\n    options,\n    async fn(state) {\n      const {\n        x,\n        y\n      } = state;\n      const diffCoords = await convertValueToCoords(state, options);\n      return {\n        x: x + diffCoords.x,\n        y: y + diffCoords.y,\n        data: diffCoords\n      };\n    }\n  };\n};\nvar shift = function(options) {\n  if (options === void 0) {\n    options = {};\n  }\n  return {\n    name: \"shift\",\n    options,\n    async fn(state) {\n      const {\n        x,\n        y,\n        placement\n      } = state;\n      const {\n        mainAxis: checkMainAxis = true,\n        crossAxis: checkCrossAxis = false,\n        limiter = {\n          fn: (_ref) => {\n            let {\n              x: x2,\n              y: y2\n            } = _ref;\n            return {\n              x: x2,\n              y: y2\n            };\n          }\n        },\n        ...detectOverflowOptions\n      } = evaluate(options, state);\n      const coords = {\n        x,\n        y\n      };\n      const overflow = await detectOverflow(state, detectOverflowOptions);\n      const crossAxis = getSideAxis(getSide(placement));\n      const mainAxis = getOppositeAxis(crossAxis);\n      let mainAxisCoord = coords[mainAxis];\n      let crossAxisCoord = coords[crossAxis];\n      if (checkMainAxis) {\n        const minSide = mainAxis === \"y\" ? \"top\" : \"left\";\n        const maxSide = mainAxis === \"y\" ? \"bottom\" : \"right\";\n        const min2 = mainAxisCoord + overflow[minSide];\n        const max2 = mainAxisCoord - overflow[maxSide];\n        mainAxisCoord = clamp(min2, mainAxisCoord, max2);\n      }\n      if (checkCrossAxis) {\n        const minSide = crossAxis === \"y\" ? \"top\" : \"left\";\n        const maxSide = crossAxis === \"y\" ? \"bottom\" : \"right\";\n        const min2 = crossAxisCoord + overflow[minSide];\n        const max2 = crossAxisCoord - overflow[maxSide];\n        crossAxisCoord = clamp(min2, crossAxisCoord, max2);\n      }\n      const limitedCoords = limiter.fn({\n        ...state,\n        [mainAxis]: mainAxisCoord,\n        [crossAxis]: crossAxisCoord\n      });\n      return {\n        ...limitedCoords,\n        data: {\n          x: limitedCoords.x - x,\n          y: limitedCoords.y - y\n        }\n      };\n    }\n  };\n};\n\n// node_modules/@floating-ui/utils/dom/dist/floating-ui.utils.dom.mjs\nfunction getNodeName(node) {\n  if (isNode(node)) {\n    return (node.nodeName || \"\").toLowerCase();\n  }\n  return \"#document\";\n}\nfunction getWindow(node) {\n  var _node$ownerDocument;\n  return (node == null ? void 0 : (_node$ownerDocument = node.ownerDocument) == null ? void 0 : _node$ownerDocument.defaultView) || window;\n}\nfunction getDocumentElement(node) {\n  var _ref;\n  return (_ref = (isNode(node) ? node.ownerDocument : node.document) || window.document) == null ? void 0 : _ref.documentElement;\n}\nfunction isNode(value) {\n  return value instanceof Node || value instanceof getWindow(value).Node;\n}\nfunction isElement(value) {\n  return value instanceof Element || value instanceof getWindow(value).Element;\n}\nfunction isHTMLElement(value) {\n  return value instanceof HTMLElement || value instanceof getWindow(value).HTMLElement;\n}\nfunction isShadowRoot(value) {\n  if (typeof ShadowRoot === \"undefined\") {\n    return false;\n  }\n  return value instanceof ShadowRoot || value instanceof getWindow(value).ShadowRoot;\n}\nfunction isOverflowElement(element) {\n  const {\n    overflow,\n    overflowX,\n    overflowY,\n    display\n  } = getComputedStyle(element);\n  return /auto|scroll|overlay|hidden|clip/.test(overflow + overflowY + overflowX) && ![\"inline\", \"contents\"].includes(display);\n}\nfunction isTableElement(element) {\n  return [\"table\", \"td\", \"th\"].includes(getNodeName(element));\n}\nfunction isContainingBlock(element) {\n  const webkit = isWebKit();\n  const css = getComputedStyle(element);\n  return css.transform !== \"none\" || css.perspective !== \"none\" || (css.containerType ? css.containerType !== \"normal\" : false) || !webkit && (css.backdropFilter ? css.backdropFilter !== \"none\" : false) || !webkit && (css.filter ? css.filter !== \"none\" : false) || [\"transform\", \"perspective\", \"filter\"].some((value) => (css.willChange || \"\").includes(value)) || [\"paint\", \"layout\", \"strict\", \"content\"].some((value) => (css.contain || \"\").includes(value));\n}\nfunction getContainingBlock(element) {\n  let currentNode = getParentNode(element);\n  while (isHTMLElement(currentNode) && !isLastTraversableNode(currentNode)) {\n    if (isContainingBlock(currentNode)) {\n      return currentNode;\n    } else {\n      currentNode = getParentNode(currentNode);\n    }\n  }\n  return null;\n}\nfunction isWebKit() {\n  if (typeof CSS === \"undefined\" || !CSS.supports)\n    return false;\n  return CSS.supports(\"-webkit-backdrop-filter\", \"none\");\n}\nfunction isLastTraversableNode(node) {\n  return [\"html\", \"body\", \"#document\"].includes(getNodeName(node));\n}\nfunction getComputedStyle(element) {\n  return getWindow(element).getComputedStyle(element);\n}\nfunction getNodeScroll(element) {\n  if (isElement(element)) {\n    return {\n      scrollLeft: element.scrollLeft,\n      scrollTop: element.scrollTop\n    };\n  }\n  return {\n    scrollLeft: element.pageXOffset,\n    scrollTop: element.pageYOffset\n  };\n}\nfunction getParentNode(node) {\n  if (getNodeName(node) === \"html\") {\n    return node;\n  }\n  const result = (\n    // Step into the shadow DOM of the parent of a slotted node.\n    node.assignedSlot || // DOM Element detected.\n    node.parentNode || // ShadowRoot detected.\n    isShadowRoot(node) && node.host || // Fallback.\n    getDocumentElement(node)\n  );\n  return isShadowRoot(result) ? result.host : result;\n}\nfunction getNearestOverflowAncestor(node) {\n  const parentNode = getParentNode(node);\n  if (isLastTraversableNode(parentNode)) {\n    return node.ownerDocument ? node.ownerDocument.body : node.body;\n  }\n  if (isHTMLElement(parentNode) && isOverflowElement(parentNode)) {\n    return parentNode;\n  }\n  return getNearestOverflowAncestor(parentNode);\n}\nfunction getOverflowAncestors(node, list, traverseIframes) {\n  var _node$ownerDocument2;\n  if (list === void 0) {\n    list = [];\n  }\n  if (traverseIframes === void 0) {\n    traverseIframes = true;\n  }\n  const scrollableAncestor = getNearestOverflowAncestor(node);\n  const isBody = scrollableAncestor === ((_node$ownerDocument2 = node.ownerDocument) == null ? void 0 : _node$ownerDocument2.body);\n  const win = getWindow(scrollableAncestor);\n  if (isBody) {\n    return list.concat(win, win.visualViewport || [], isOverflowElement(scrollableAncestor) ? scrollableAncestor : [], win.frameElement && traverseIframes ? getOverflowAncestors(win.frameElement) : []);\n  }\n  return list.concat(scrollableAncestor, getOverflowAncestors(scrollableAncestor, [], traverseIframes));\n}\n\n// node_modules/@floating-ui/dom/dist/floating-ui.dom.mjs\nfunction getCssDimensions(element) {\n  const css = getComputedStyle(element);\n  let width = parseFloat(css.width) || 0;\n  let height = parseFloat(css.height) || 0;\n  const hasOffset = isHTMLElement(element);\n  const offsetWidth = hasOffset ? element.offsetWidth : width;\n  const offsetHeight = hasOffset ? element.offsetHeight : height;\n  const shouldFallback = round(width) !== offsetWidth || round(height) !== offsetHeight;\n  if (shouldFallback) {\n    width = offsetWidth;\n    height = offsetHeight;\n  }\n  return {\n    width,\n    height,\n    $: shouldFallback\n  };\n}\nfunction unwrapElement(element) {\n  return !isElement(element) ? element.contextElement : element;\n}\nfunction getScale(element) {\n  const domElement = unwrapElement(element);\n  if (!isHTMLElement(domElement)) {\n    return createCoords(1);\n  }\n  const rect = domElement.getBoundingClientRect();\n  const {\n    width,\n    height,\n    $\n  } = getCssDimensions(domElement);\n  let x = ($ ? round(rect.width) : rect.width) / width;\n  let y = ($ ? round(rect.height) : rect.height) / height;\n  if (!x || !Number.isFinite(x)) {\n    x = 1;\n  }\n  if (!y || !Number.isFinite(y)) {\n    y = 1;\n  }\n  return {\n    x,\n    y\n  };\n}\nvar noOffsets = /* @__PURE__ */ createCoords(0);\nfunction getVisualOffsets(element) {\n  const win = getWindow(element);\n  if (!isWebKit() || !win.visualViewport) {\n    return noOffsets;\n  }\n  return {\n    x: win.visualViewport.offsetLeft,\n    y: win.visualViewport.offsetTop\n  };\n}\nfunction shouldAddVisualOffsets(element, isFixed, floatingOffsetParent) {\n  if (isFixed === void 0) {\n    isFixed = false;\n  }\n  if (!floatingOffsetParent || isFixed && floatingOffsetParent !== getWindow(element)) {\n    return false;\n  }\n  return isFixed;\n}\nfunction getBoundingClientRect(element, includeScale, isFixedStrategy, offsetParent) {\n  if (includeScale === void 0) {\n    includeScale = false;\n  }\n  if (isFixedStrategy === void 0) {\n    isFixedStrategy = false;\n  }\n  const clientRect = element.getBoundingClientRect();\n  const domElement = unwrapElement(element);\n  let scale = createCoords(1);\n  if (includeScale) {\n    if (offsetParent) {\n      if (isElement(offsetParent)) {\n        scale = getScale(offsetParent);\n      }\n    } else {\n      scale = getScale(element);\n    }\n  }\n  const visualOffsets = shouldAddVisualOffsets(domElement, isFixedStrategy, offsetParent) ? getVisualOffsets(domElement) : createCoords(0);\n  let x = (clientRect.left + visualOffsets.x) / scale.x;\n  let y = (clientRect.top + visualOffsets.y) / scale.y;\n  let width = clientRect.width / scale.x;\n  let height = clientRect.height / scale.y;\n  if (domElement) {\n    const win = getWindow(domElement);\n    const offsetWin = offsetParent && isElement(offsetParent) ? getWindow(offsetParent) : offsetParent;\n    let currentIFrame = win.frameElement;\n    while (currentIFrame && offsetParent && offsetWin !== win) {\n      const iframeScale = getScale(currentIFrame);\n      const iframeRect = currentIFrame.getBoundingClientRect();\n      const css = getComputedStyle(currentIFrame);\n      const left = iframeRect.left + (currentIFrame.clientLeft + parseFloat(css.paddingLeft)) * iframeScale.x;\n      const top = iframeRect.top + (currentIFrame.clientTop + parseFloat(css.paddingTop)) * iframeScale.y;\n      x *= iframeScale.x;\n      y *= iframeScale.y;\n      width *= iframeScale.x;\n      height *= iframeScale.y;\n      x += left;\n      y += top;\n      currentIFrame = getWindow(currentIFrame).frameElement;\n    }\n  }\n  return rectToClientRect({\n    width,\n    height,\n    x,\n    y\n  });\n}\nfunction convertOffsetParentRelativeRectToViewportRelativeRect(_ref) {\n  let {\n    rect,\n    offsetParent,\n    strategy\n  } = _ref;\n  const isOffsetParentAnElement = isHTMLElement(offsetParent);\n  const documentElement = getDocumentElement(offsetParent);\n  if (offsetParent === documentElement) {\n    return rect;\n  }\n  let scroll = {\n    scrollLeft: 0,\n    scrollTop: 0\n  };\n  let scale = createCoords(1);\n  const offsets = createCoords(0);\n  if (isOffsetParentAnElement || !isOffsetParentAnElement && strategy !== \"fixed\") {\n    if (getNodeName(offsetParent) !== \"body\" || isOverflowElement(documentElement)) {\n      scroll = getNodeScroll(offsetParent);\n    }\n    if (isHTMLElement(offsetParent)) {\n      const offsetRect = getBoundingClientRect(offsetParent);\n      scale = getScale(offsetParent);\n      offsets.x = offsetRect.x + offsetParent.clientLeft;\n      offsets.y = offsetRect.y + offsetParent.clientTop;\n    }\n  }\n  return {\n    width: rect.width * scale.x,\n    height: rect.height * scale.y,\n    x: rect.x * scale.x - scroll.scrollLeft * scale.x + offsets.x,\n    y: rect.y * scale.y - scroll.scrollTop * scale.y + offsets.y\n  };\n}\nfunction getClientRects(element) {\n  return Array.from(element.getClientRects());\n}\nfunction getWindowScrollBarX(element) {\n  return getBoundingClientRect(getDocumentElement(element)).left + getNodeScroll(element).scrollLeft;\n}\nfunction getDocumentRect(element) {\n  const html = getDocumentElement(element);\n  const scroll = getNodeScroll(element);\n  const body = element.ownerDocument.body;\n  const width = max(html.scrollWidth, html.clientWidth, body.scrollWidth, body.clientWidth);\n  const height = max(html.scrollHeight, html.clientHeight, body.scrollHeight, body.clientHeight);\n  let x = -scroll.scrollLeft + getWindowScrollBarX(element);\n  const y = -scroll.scrollTop;\n  if (getComputedStyle(body).direction === \"rtl\") {\n    x += max(html.clientWidth, body.clientWidth) - width;\n  }\n  return {\n    width,\n    height,\n    x,\n    y\n  };\n}\nfunction getViewportRect(element, strategy) {\n  const win = getWindow(element);\n  const html = getDocumentElement(element);\n  const visualViewport = win.visualViewport;\n  let width = html.clientWidth;\n  let height = html.clientHeight;\n  let x = 0;\n  let y = 0;\n  if (visualViewport) {\n    width = visualViewport.width;\n    height = visualViewport.height;\n    const visualViewportBased = isWebKit();\n    if (!visualViewportBased || visualViewportBased && strategy === \"fixed\") {\n      x = visualViewport.offsetLeft;\n      y = visualViewport.offsetTop;\n    }\n  }\n  return {\n    width,\n    height,\n    x,\n    y\n  };\n}\nfunction getInnerBoundingClientRect(element, strategy) {\n  const clientRect = getBoundingClientRect(element, true, strategy === \"fixed\");\n  const top = clientRect.top + element.clientTop;\n  const left = clientRect.left + element.clientLeft;\n  const scale = isHTMLElement(element) ? getScale(element) : createCoords(1);\n  const width = element.clientWidth * scale.x;\n  const height = element.clientHeight * scale.y;\n  const x = left * scale.x;\n  const y = top * scale.y;\n  return {\n    width,\n    height,\n    x,\n    y\n  };\n}\nfunction getClientRectFromClippingAncestor(element, clippingAncestor, strategy) {\n  let rect;\n  if (clippingAncestor === \"viewport\") {\n    rect = getViewportRect(element, strategy);\n  } else if (clippingAncestor === \"document\") {\n    rect = getDocumentRect(getDocumentElement(element));\n  } else if (isElement(clippingAncestor)) {\n    rect = getInnerBoundingClientRect(clippingAncestor, strategy);\n  } else {\n    const visualOffsets = getVisualOffsets(element);\n    rect = {\n      ...clippingAncestor,\n      x: clippingAncestor.x - visualOffsets.x,\n      y: clippingAncestor.y - visualOffsets.y\n    };\n  }\n  return rectToClientRect(rect);\n}\nfunction hasFixedPositionAncestor(element, stopNode) {\n  const parentNode = getParentNode(element);\n  if (parentNode === stopNode || !isElement(parentNode) || isLastTraversableNode(parentNode)) {\n    return false;\n  }\n  return getComputedStyle(parentNode).position === \"fixed\" || hasFixedPositionAncestor(parentNode, stopNode);\n}\nfunction getClippingElementAncestors(element, cache) {\n  const cachedResult = cache.get(element);\n  if (cachedResult) {\n    return cachedResult;\n  }\n  let result = getOverflowAncestors(element, [], false).filter((el) => isElement(el) && getNodeName(el) !== \"body\");\n  let currentContainingBlockComputedStyle = null;\n  const elementIsFixed = getComputedStyle(element).position === \"fixed\";\n  let currentNode = elementIsFixed ? getParentNode(element) : element;\n  while (isElement(currentNode) && !isLastTraversableNode(currentNode)) {\n    const computedStyle = getComputedStyle(currentNode);\n    const currentNodeIsContaining = isContainingBlock(currentNode);\n    if (!currentNodeIsContaining && computedStyle.position === \"fixed\") {\n      currentContainingBlockComputedStyle = null;\n    }\n    const shouldDropCurrentNode = elementIsFixed ? !currentNodeIsContaining && !currentContainingBlockComputedStyle : !currentNodeIsContaining && computedStyle.position === \"static\" && !!currentContainingBlockComputedStyle && [\"absolute\", \"fixed\"].includes(currentContainingBlockComputedStyle.position) || isOverflowElement(currentNode) && !currentNodeIsContaining && hasFixedPositionAncestor(element, currentNode);\n    if (shouldDropCurrentNode) {\n      result = result.filter((ancestor) => ancestor !== currentNode);\n    } else {\n      currentContainingBlockComputedStyle = computedStyle;\n    }\n    currentNode = getParentNode(currentNode);\n  }\n  cache.set(element, result);\n  return result;\n}\nfunction getClippingRect(_ref) {\n  let {\n    element,\n    boundary,\n    rootBoundary,\n    strategy\n  } = _ref;\n  const elementClippingAncestors = boundary === \"clippingAncestors\" ? getClippingElementAncestors(element, this._c) : [].concat(boundary);\n  const clippingAncestors = [...elementClippingAncestors, rootBoundary];\n  const firstClippingAncestor = clippingAncestors[0];\n  const clippingRect = clippingAncestors.reduce((accRect, clippingAncestor) => {\n    const rect = getClientRectFromClippingAncestor(element, clippingAncestor, strategy);\n    accRect.top = max(rect.top, accRect.top);\n    accRect.right = min(rect.right, accRect.right);\n    accRect.bottom = min(rect.bottom, accRect.bottom);\n    accRect.left = max(rect.left, accRect.left);\n    return accRect;\n  }, getClientRectFromClippingAncestor(element, firstClippingAncestor, strategy));\n  return {\n    width: clippingRect.right - clippingRect.left,\n    height: clippingRect.bottom - clippingRect.top,\n    x: clippingRect.left,\n    y: clippingRect.top\n  };\n}\nfunction getDimensions(element) {\n  return getCssDimensions(element);\n}\nfunction getRectRelativeToOffsetParent(element, offsetParent, strategy) {\n  const isOffsetParentAnElement = isHTMLElement(offsetParent);\n  const documentElement = getDocumentElement(offsetParent);\n  const isFixed = strategy === \"fixed\";\n  const rect = getBoundingClientRect(element, true, isFixed, offsetParent);\n  let scroll = {\n    scrollLeft: 0,\n    scrollTop: 0\n  };\n  const offsets = createCoords(0);\n  if (isOffsetParentAnElement || !isOffsetParentAnElement && !isFixed) {\n    if (getNodeName(offsetParent) !== \"body\" || isOverflowElement(documentElement)) {\n      scroll = getNodeScroll(offsetParent);\n    }\n    if (isOffsetParentAnElement) {\n      const offsetRect = getBoundingClientRect(offsetParent, true, isFixed, offsetParent);\n      offsets.x = offsetRect.x + offsetParent.clientLeft;\n      offsets.y = offsetRect.y + offsetParent.clientTop;\n    } else if (documentElement) {\n      offsets.x = getWindowScrollBarX(documentElement);\n    }\n  }\n  return {\n    x: rect.left + scroll.scrollLeft - offsets.x,\n    y: rect.top + scroll.scrollTop - offsets.y,\n    width: rect.width,\n    height: rect.height\n  };\n}\nfunction getTrueOffsetParent(element, polyfill) {\n  if (!isHTMLElement(element) || getComputedStyle(element).position === \"fixed\") {\n    return null;\n  }\n  if (polyfill) {\n    return polyfill(element);\n  }\n  return element.offsetParent;\n}\nfunction getOffsetParent(element, polyfill) {\n  const window2 = getWindow(element);\n  if (!isHTMLElement(element)) {\n    return window2;\n  }\n  let offsetParent = getTrueOffsetParent(element, polyfill);\n  while (offsetParent && isTableElement(offsetParent) && getComputedStyle(offsetParent).position === \"static\") {\n    offsetParent = getTrueOffsetParent(offsetParent, polyfill);\n  }\n  if (offsetParent && (getNodeName(offsetParent) === \"html\" || getNodeName(offsetParent) === \"body\" && getComputedStyle(offsetParent).position === \"static\" && !isContainingBlock(offsetParent))) {\n    return window2;\n  }\n  return offsetParent || getContainingBlock(element) || window2;\n}\nvar getElementRects = async function(_ref) {\n  let {\n    reference,\n    floating,\n    strategy\n  } = _ref;\n  const getOffsetParentFn = this.getOffsetParent || getOffsetParent;\n  const getDimensionsFn = this.getDimensions;\n  return {\n    reference: getRectRelativeToOffsetParent(reference, await getOffsetParentFn(floating), strategy),\n    floating: {\n      x: 0,\n      y: 0,\n      ...await getDimensionsFn(floating)\n    }\n  };\n};\nfunction isRTL(element) {\n  return getComputedStyle(element).direction === \"rtl\";\n}\nvar platform = {\n  convertOffsetParentRelativeRectToViewportRelativeRect,\n  getDocumentElement,\n  getClippingRect,\n  getOffsetParent,\n  getElementRects,\n  getClientRects,\n  getDimensions,\n  getScale,\n  isElement,\n  isRTL\n};\nfunction observeMove(element, onMove) {\n  let io = null;\n  let timeoutId;\n  const root = getDocumentElement(element);\n  function cleanup() {\n    clearTimeout(timeoutId);\n    io && io.disconnect();\n    io = null;\n  }\n  function refresh(skip, threshold) {\n    if (skip === void 0) {\n      skip = false;\n    }\n    if (threshold === void 0) {\n      threshold = 1;\n    }\n    cleanup();\n    const {\n      left,\n      top,\n      width,\n      height\n    } = element.getBoundingClientRect();\n    if (!skip) {\n      onMove();\n    }\n    if (!width || !height) {\n      return;\n    }\n    const insetTop = floor(top);\n    const insetRight = floor(root.clientWidth - (left + width));\n    const insetBottom = floor(root.clientHeight - (top + height));\n    const insetLeft = floor(left);\n    const rootMargin = -insetTop + \"px \" + -insetRight + \"px \" + -insetBottom + \"px \" + -insetLeft + \"px\";\n    const options = {\n      rootMargin,\n      threshold: max(0, min(1, threshold)) || 1\n    };\n    let isFirstUpdate = true;\n    function handleObserve(entries) {\n      const ratio = entries[0].intersectionRatio;\n      if (ratio !== threshold) {\n        if (!isFirstUpdate) {\n          return refresh();\n        }\n        if (!ratio) {\n          timeoutId = setTimeout(() => {\n            refresh(false, 1e-7);\n          }, 100);\n        } else {\n          refresh(false, ratio);\n        }\n      }\n      isFirstUpdate = false;\n    }\n    try {\n      io = new IntersectionObserver(handleObserve, {\n        ...options,\n        // Handle <iframe>s\n        root: root.ownerDocument\n      });\n    } catch (e) {\n      io = new IntersectionObserver(handleObserve, options);\n    }\n    io.observe(element);\n  }\n  refresh(true);\n  return cleanup;\n}\nfunction autoUpdate(reference, floating, update, options) {\n  if (options === void 0) {\n    options = {};\n  }\n  const {\n    ancestorScroll = true,\n    ancestorResize = true,\n    elementResize = typeof ResizeObserver === \"function\",\n    layoutShift = typeof IntersectionObserver === \"function\",\n    animationFrame = false\n  } = options;\n  const referenceEl = unwrapElement(reference);\n  const ancestors = ancestorScroll || ancestorResize ? [...referenceEl ? getOverflowAncestors(referenceEl) : [], ...getOverflowAncestors(floating)] : [];\n  ancestors.forEach((ancestor) => {\n    ancestorScroll && ancestor.addEventListener(\"scroll\", update, {\n      passive: true\n    });\n    ancestorResize && ancestor.addEventListener(\"resize\", update);\n  });\n  const cleanupIo = referenceEl && layoutShift ? observeMove(referenceEl, update) : null;\n  let reobserveFrame = -1;\n  let resizeObserver = null;\n  if (elementResize) {\n    resizeObserver = new ResizeObserver((_ref) => {\n      let [firstEntry] = _ref;\n      if (firstEntry && firstEntry.target === referenceEl && resizeObserver) {\n        resizeObserver.unobserve(floating);\n        cancelAnimationFrame(reobserveFrame);\n        reobserveFrame = requestAnimationFrame(() => {\n          resizeObserver && resizeObserver.observe(floating);\n        });\n      }\n      update();\n    });\n    if (referenceEl && !animationFrame) {\n      resizeObserver.observe(referenceEl);\n    }\n    resizeObserver.observe(floating);\n  }\n  let frameId;\n  let prevRefRect = animationFrame ? getBoundingClientRect(reference) : null;\n  if (animationFrame) {\n    frameLoop();\n  }\n  function frameLoop() {\n    const nextRefRect = getBoundingClientRect(reference);\n    if (prevRefRect && (nextRefRect.x !== prevRefRect.x || nextRefRect.y !== prevRefRect.y || nextRefRect.width !== prevRefRect.width || nextRefRect.height !== prevRefRect.height)) {\n      update();\n    }\n    prevRefRect = nextRefRect;\n    frameId = requestAnimationFrame(frameLoop);\n  }\n  update();\n  return () => {\n    ancestors.forEach((ancestor) => {\n      ancestorScroll && ancestor.removeEventListener(\"scroll\", update);\n      ancestorResize && ancestor.removeEventListener(\"resize\", update);\n    });\n    cleanupIo && cleanupIo();\n    resizeObserver && resizeObserver.disconnect();\n    resizeObserver = null;\n    if (animationFrame) {\n      cancelAnimationFrame(frameId);\n    }\n  };\n}\nvar computePosition2 = (reference, floating, options) => {\n  const cache = /* @__PURE__ */ new Map();\n  const mergedOptions = {\n    platform,\n    ...options\n  };\n  const platformWithCache = {\n    ...mergedOptions.platform,\n    _c: cache\n  };\n  return computePosition(reference, floating, {\n    ...mergedOptions,\n    platform: platformWithCache\n  });\n};\n\n// packages/anchor/src/index.js\nfunction src_default(Alpine) {\n  Alpine.magic(\"anchor\", (el) => {\n    if (!el._x_anchor)\n      throw \"Alpine: No x-anchor directive found on element using $anchor...\";\n    return el._x_anchor;\n  });\n  Alpine.interceptClone((from, to) => {\n    if (from && from._x_anchor && !to._x_anchor) {\n      to._x_anchor = from._x_anchor;\n    }\n  });\n  Alpine.directive(\"anchor\", Alpine.skipDuringClone(\n    (el, { expression, modifiers, value }, { cleanup, evaluate: evaluate2 }) => {\n      let { placement, offsetValue, unstyled } = getOptions(modifiers);\n      el._x_anchor = Alpine.reactive({ x: 0, y: 0 });\n      let reference = evaluate2(expression);\n      if (!reference)\n        throw \"Alpine: no element provided to x-anchor...\";\n      let compute = () => {\n        let previousValue;\n        computePosition2(reference, el, {\n          placement,\n          middleware: [flip(), shift({ padding: 5 }), offset(offsetValue)]\n        }).then(({ x, y }) => {\n          unstyled || setStyles(el, x, y);\n          if (JSON.stringify({ x, y }) !== previousValue) {\n            el._x_anchor.x = x;\n            el._x_anchor.y = y;\n          }\n          previousValue = JSON.stringify({ x, y });\n        });\n      };\n      let release = autoUpdate(reference, el, () => compute());\n      cleanup(() => release());\n    },\n    // When cloning (or \"morphing\"), we will graft the style and position data from the live tree...\n    (el, { expression, modifiers, value }, { cleanup, evaluate: evaluate2 }) => {\n      let { placement, offsetValue, unstyled } = getOptions(modifiers);\n      if (el._x_anchor) {\n        unstyled || setStyles(el, el._x_anchor.x, el._x_anchor.y);\n      }\n    }\n  ));\n}\nfunction setStyles(el, x, y) {\n  Object.assign(el.style, {\n    left: x + \"px\",\n    top: y + \"px\",\n    position: \"absolute\"\n  });\n}\nfunction getOptions(modifiers) {\n  let positions = [\"top\", \"top-start\", \"top-end\", \"right\", \"right-start\", \"right-end\", \"bottom\", \"bottom-start\", \"bottom-end\", \"left\", \"left-start\", \"left-end\"];\n  let placement = positions.find((i) => modifiers.includes(i));\n  let offsetValue = 0;\n  if (modifiers.includes(\"offset\")) {\n    let idx = modifiers.findIndex((i) => i === \"offset\");\n    offsetValue = modifiers[idx + 1] !== void 0 ? Number(modifiers[idx + 1]) : offsetValue;\n  }\n  let unstyled = modifiers.includes(\"no-style\");\n  return { placement, offsetValue, unstyled };\n}\n\n// packages/anchor/builds/module.js\nvar module_default = src_default;\nexport {\n  src_default as anchor,\n  module_default as default\n};\n", "\nclass Snapshot {\n    constructor(url, html) {\n        this.url = url\n        this.html = html\n    }\n}\n\nlet snapshotCache = {\n    currentKey: null,\n    currentUrl: null,\n    keys: [],\n    lookup: {},\n\n    limit: 10,\n\n    has(location) {\n        return this.lookup[location] !== undefined\n    },\n\n    retrieve(location) {\n        let snapshot = this.lookup[location]\n\n        if (snapshot === undefined)\n            throw (\n                'No back button cache found for current location: ' +\n                location\n            )\n\n        return snapshot\n    },\n\n    replace(key, snapshot) {\n        if (this.has(key)) {\n            this.lookup[key] = snapshot\n        } else {\n            this.push(key, snapshot)\n        }\n    },\n\n    push(key, snapshot) {\n        this.lookup[key] = snapshot\n\n        let index = this.keys.indexOf(key)\n\n        if (index > -1) this.keys.splice(index, 1)\n\n        this.keys.unshift(key)\n\n        this.trim()\n    },\n\n    trim() {\n        for (let key of this.keys.splice(this.limit)) {\n          delete this.lookup[key]\n        }\n    }\n}\n\nexport function updateCurrentPageHtmlInHistoryStateForLaterBackButtonClicks() {\n    // Create a history state entry for the initial page load.\n    // (This is so later hitting back can restore this page).\n    let url = new URL(window.location.href, document.baseURI)\n\n    replaceUrl(url, document.documentElement.outerHTML)\n}\n\nexport function updateCurrentPageHtmlInSnapshotCacheForLaterBackButtonClicks(key, url) {\n    let html = document.documentElement.outerHTML\n\n    snapshotCache.replace(key, new Snapshot(url, html))\n}\n\nexport function whenTheBackOrForwardButtonIsClicked(\n    registerFallback,\n    handleHtml\n) {\n    let fallback\n\n    registerFallback(i => (fallback = i))\n\n    window.addEventListener('popstate', e => {\n        let state = e.state || {}\n\n        let alpine = state.alpine || {}\n\n        // If state is an empty object, then the popstate has probably been triggered\n        // by anchor tags `#my-heading`, so we don't want to handle them.\n        if (Object.keys(state).length === 0) return\n\n        if (! alpine.snapshotIdx) return\n\n        if (snapshotCache.has(alpine.snapshotIdx)) {\n            let snapshot = snapshotCache.retrieve(alpine.snapshotIdx)\n\n            handleHtml(snapshot.html, snapshot.url, snapshotCache.currentUrl, snapshotCache.currentKey)\n        } else {\n            fallback(alpine.url)\n        }\n    })\n}\n\nexport function updateUrlAndStoreLatestHtmlForFutureBackButtons(\n    html,\n    destination\n) {\n    pushUrl(destination, html)\n}\n\nexport function pushUrl(url, html) {\n    updateUrl('pushState', url, html)\n}\n\nexport function replaceUrl(url, html) {\n    updateUrl('replaceState', url, html)\n}\n\nfunction updateUrl(method, url, html) {\n    let key = url.toString() + '-' + Math.random()\n\n    method === 'pushState'\n        ? snapshotCache.push(key, new Snapshot(url, html))\n        : snapshotCache.replace(key = (snapshotCache.currentKey ?? key), new Snapshot(url, html))\n\n    let state = history.state || {}\n\n    if (!state.alpine) state.alpine = {}\n\n    state.alpine.snapshotIdx = key\n    state.alpine.url = url.toString()\n\n    try {\n        // 640k character limit:\n        history[method](state, JSON.stringify(document.title), url)\n\n        snapshotCache.currentKey = key\n        snapshotCache.currentUrl = url\n    } catch (error) {\n        if (error instanceof DOMException && error.name === 'SecurityError') {\n            console.error(\n                \"Livewire: You can't use wire:navigate with a link to a different root domain: \" +\n                    url\n            )\n        }\n\n        console.error(error)\n    }\n}\n", "\nexport function whenThisLinkIsPressed(el, callback) {\n    let isProgrammaticClick = e => ! e.isTrusted\n    let isNotPlainLeftClick = e => (e.which > 1) || (e.altKey) || (e.ctrlKey) || (e.metaKey) || (e.shiftKey)\n    let isNotPlainEnterKey = (e) => (e.which !== 13) || (e.altKey) || (e.ctrlKey) || (e.metaKey) || (e.shiftKey)\n\n    el.addEventListener('click', e => {\n        // This allows programmatic clicking of links via: `$0.click()`...\n        if (isProgrammaticClick(e)) {\n            e.preventDefault()\n\n            callback(whenReleased => whenReleased())\n\n            return\n        }\n\n        // This allows cmd+click and such to still work as expected...\n        if (isNotPlainLeftClick(e)) return;\n\n        // If it's a plain left click, we want to prevent \"click\" and let \"mouseup\" do its thing...\n        e.preventDefault()\n    })\n\n    el.addEventListener('mousedown', e => {\n        // We only care about left clicks for wire:navigate...\n        if (isNotPlainLeftClick(e)) return;\n\n        e.preventDefault()\n\n        callback((whenReleased) => {\n            let handler = e => {\n                e.preventDefault()\n\n                whenReleased()\n\n                el.removeEventListener('mouseup', handler)\n            }\n\n            el.addEventListener('mouseup', handler)\n        })\n    })\n\n    el.addEventListener(\"keydown\", e => {\n        // We only care about the enter key...\n        if (isNotPlainEnterKey(e)) return;\n\n        e.preventDefault()\n\n        callback(whenReleased => whenReleased())\n    })\n}\n\nexport function whenThisLinkIsHoveredFor(el, ms = 60, callback) {\n    el.addEventListener('mouseenter', e => {\n        let timeout = setTimeout(() => {\n            callback(e)\n        }, ms)\n\n        let handler = () => {\n            clearTimeout(timeout)\n            el.removeEventListener('mouseleave', handler)\n        }\n\n        el.addEventListener('mouseleave', handler)\n    })\n}\n\nexport function extractDestinationFromLink(linkEl) {\n    return createUrlObjectFromString(linkEl.getAttribute('href'))\n}\n\nexport function createUrlObjectFromString(urlString) {\n    return urlString !== null && new URL(urlString, document.baseURI)\n}\n\nexport function getUriStringFromUrlObject(urlObject) {\n    return urlObject.pathname + urlObject.search + urlObject.hash\n}\n", "import { trigger } from \"@/hooks\"\nimport { createUrlObjectFromString, getUriStringFromUrlObject } from \"./links\"\n\nexport function fetchHtml(destination, callback) {\n    let uri = getUriStringFromUrlObject(destination)\n\n    performFetch(uri, (html, finalDestination) => {\n        callback(html, finalDestination)\n    })\n}\n\nexport function performFetch(uri, callback) {\n    let options = {\n        headers: {\n            'X-Livewire-Navigate': ''\n        }\n    }\n\n    trigger('navigate.request', {\n        url: uri,\n        options,\n    })\n\n    let finalDestination\n\n    fetch(uri, options).then(response => {\n        let destination = createUrlObjectFromString(uri)\n        finalDestination = createUrlObjectFromString(response.url)\n\n        // If there was no redirect triggered by the URL that was fetched...\n        if ((destination.pathname + destination.search) === (finalDestination.pathname + finalDestination.search)) {\n            // Then let's cary over any \"hash\" entries on the URL.\n            // We have to do this because hashes aren't sent to\n            // the server by \"fetch\", so it needs to get added\n            finalDestination.hash = destination.hash\n        }\n\n        return response.text()\n    }).then(html => {\n        callback(html, finalDestination)\n    });\n}\n", "import { performFetch } from \"@/plugins/navigate/fetch\";\nimport { getUriStringFromUrlObject } from \"./links\";\n\n// Warning: this could cause some memory leaks\nlet prefetches = {}\n\nexport function prefetchHtml(destination, callback) {\n    let uri = getUriStringFromUrlObject(destination)\n\n    if (prefetches[uri]) return\n\n    prefetches[uri] = { finished: false, html: null, whenFinished: () => {} }\n\n    performFetch(uri, (html, routedUri) => {\n        callback(html, routedUri)\n    })\n}\n\nexport function storeThePrefetchedHtmlForWhenALinkIsClicked(html, destination, finalDestination) {\n    let state = prefetches[getUriStringFromUrlObject(destination)]\n    state.html = html\n    state.finished = true\n    state.finalDestination = finalDestination\n    state.whenFinished()\n}\n\nexport function getPretchedHtmlOr(destination, receive, ifNoPrefetchExists) {\n    let uri = getUriStringFromUrlObject(destination)\n\n    if (! prefetches[uri]) return ifNoPrefetchExists()\n\n    if (prefetches[uri].finished) {\n        let html = prefetches[uri].html\n        let finalDestination = prefetches[uri].finalDestination\n\n        delete prefetches[uri]\n\n        return receive(html, finalDestination)\n    } else {\n        prefetches[uri].whenFinished = () => {\n            let html = prefetches[uri].html\n            let finalDestination = prefetches[uri].finalDestination\n\n            delete prefetches[uri]\n\n            receive(html, finalDestination)\n        }\n    }\n}\n\n", "import Alpine from \"alpinejs\"\n\nexport function packUpPersistedTeleports(persistedEl) {\n    // Persisted elements get removed from the DOM and then re-added later. We need to do the same\n    // with any `x-teleport`ed elements...\n    Alpine.mutateDom(() => {\n        persistedEl.querySelectorAll('[data-teleport-template]').forEach(i => i._x_teleport.remove())\n    })\n}\n\nexport function removeAnyLeftOverStaleTeleportTargets(body) {\n    // We need to remove any left-over teleported elements form the page\n    // as they are stale and will be re-initialized when Alpine boots up on this page...\n    Alpine.mutateDom(() => {\n        body.querySelectorAll('[data-teleport-target]').forEach(i => i.remove())\n    })\n}\n\nexport function unPackPersistedTeleports(persistedEl) {\n    // Before we put back any persisted elements, we're going to\n    // find any \"x-teleports\" and put their targets back on the page...\n    Alpine.walk(persistedEl, (el, skip) => {\n        if (! el._x_teleport) return;\n\n        el._x_teleportPutBack()\n\n        skip()\n    })\n}\n\nexport function isTeleportTarget(el) {\n    return el.hasAttribute('data-teleport-target')\n}\n", "\nexport function storeScrollInformationInHtmlBeforeNavigatingAway() {\n    document.body.setAttribute('data-scroll-x', document.body.scrollLeft)\n    document.body.setAttribute('data-scroll-y', document.body.scrollTop)\n\n    document.querySelectorAll(['[x-navigate\\\\:scroll]', '[wire\\\\:scroll]']).forEach(el => {\n        el.setAttribute('data-scroll-x', el.scrollLeft)\n        el.setAttribute('data-scroll-y', el.scrollTop)\n    })\n}\n\nexport function restoreScrollPositionOrScrollToTop() {\n    let scroll = el => {\n        if (! el.hasAttribute('data-scroll-x')) {\n            window.scrollTo({ top: 0, left: 0, behavior: 'instant' })\n        } else {\n            el.scrollTo({\n                top: Number(el.getAttribute('data-scroll-y')),\n                left: Number(el.getAttribute('data-scroll-x')),\n                behavior: 'instant',\n            })\n            el.removeAttribute('data-scroll-x')\n            el.removeAttribute('data-scroll-y')\n        }\n    }\n\n    queueMicrotask(() => {\n        queueMicrotask(() => { // Double microtask here to make sure scrolling restoration is the LAST thing to happen. (Even after Alpine's x-init functions)...\n            scroll(document.body)\n\n            document.querySelectorAll(['[x-navigate\\\\:scroll]', '[wire\\\\:scroll]']).forEach(scroll)\n        })\n    })\n}\n", "import Alpine from 'alpinejs'\n\nlet els = {}\n\nexport function storePersistantElementsForLater(callback) {\n    els = {}\n\n    document.querySelectorAll('[x-persist]').forEach(i => {\n        els[i.getAttribute('x-persist')] = i\n\n        callback(i)\n\n        Alpine.mutateDom(() => {\n            i.remove()\n        })\n    })\n}\n\nexport function putPersistantElementsBack(callback) {\n    let usedPersists = []\n\n    document.querySelectorAll('[x-persist]').forEach(i => {\n        let old = els[i.getAttribute('x-persist')]\n\n        // There might be a brand new x-persist element...\n        if (! old) return\n\n        usedPersists.push(i.getAttribute('x-persist'))\n\n        old._x_wasPersisted = true\n\n        callback(old, i)\n\n        Alpine.mutateDom(() => {\n            i.replaceWith(old)\n        })\n    })\n\n    Object.entries(els).forEach(([key, el]) => {\n        if (usedPersists.includes(key)) return\n\n        // Destory the un-used persist DOM trees before releasing them...\n        Alpine.destroyTree(el)\n    })\n\n    // Release unused persists for garbage collection...\n    els = {}\n}\n\nexport function isPersistedElement(el) {\n    return el.hasAttribute('x-persist')\n}\n", "import NProgress from 'nprogress'\nimport { getNonce } from '@/utils'\n\nNProgress.configure({\n    minimum: 0.1,\n    trickleSpeed: 200,\n    showSpinner: false,\n    parent: 'body',\n})\n\ninjectStyles()\n\nlet inProgress = false\n\nexport function showAndStartProgressBar() {\n    inProgress = true\n\n    // Only show progress bar if it's been a little bit...\n    setTimeout(() => {\n        if (! inProgress) return\n\n        NProgress.start()\n    }, 150)\n}\n\nexport function finishAndHideProgressBar() {\n    inProgress = false\n\n    NProgress.done()\n}\n\nexport function removeAnyLeftOverStaleProgressBars() {\n    NProgress.remove()\n}\n\nfunction injectStyles() {\n    let style = document.createElement('style')\n\n    style.innerHTML = `/* Make clicks pass-through */\n\n    #nprogress {\n      pointer-events: none;\n    }\n\n    #nprogress .bar {\n      background: var(--livewire-progress-bar-color, #29d);\n\n      position: fixed;\n      z-index: 1031;\n      top: 0;\n      left: 0;\n\n      width: 100%;\n      height: 2px;\n    }\n\n    /* Fancy blur effect */\n    #nprogress .peg {\n      display: block;\n      position: absolute;\n      right: 0px;\n      width: 100px;\n      height: 100%;\n      box-shadow: 0 0 10px var(--livewire-progress-bar-color, #29d), 0 0 5px var(--livewire-progress-bar-color, #29d);\n      opacity: 1.0;\n\n      -webkit-transform: rotate(3deg) translate(0px, -4px);\n          -ms-transform: rotate(3deg) translate(0px, -4px);\n              transform: rotate(3deg) translate(0px, -4px);\n    }\n\n    /* Remove these to get rid of the spinner */\n    #nprogress .spinner {\n      display: block;\n      position: fixed;\n      z-index: 1031;\n      top: 15px;\n      right: 15px;\n    }\n\n    #nprogress .spinner-icon {\n      width: 18px;\n      height: 18px;\n      box-sizing: border-box;\n\n      border: solid 2px transparent;\n      border-top-color: var(--livewire-progress-bar-color, #29d);\n      border-left-color: var(--livewire-progress-bar-color, #29d);\n      border-radius: 50%;\n\n      -webkit-animation: nprogress-spinner 400ms linear infinite;\n              animation: nprogress-spinner 400ms linear infinite;\n    }\n\n    .nprogress-custom-parent {\n      overflow: hidden;\n      position: relative;\n    }\n\n    .nprogress-custom-parent #nprogress .spinner,\n    .nprogress-custom-parent #nprogress .bar {\n      position: absolute;\n    }\n\n    @-webkit-keyframes nprogress-spinner {\n      0%   { -webkit-transform: rotate(0deg); }\n      100% { -webkit-transform: rotate(360deg); }\n    }\n    @keyframes nprogress-spinner {\n      0%   { transform: rotate(0deg); }\n      100% { transform: rotate(360deg); }\n    }\n    `\n\n    let nonce = getNonce()\n\n    if (nonce) style.nonce = nonce\n\n    document.head.appendChild(style)\n}\n", "\nexport function packUpPersistedPopovers(persistedEl) {\n    if (!isPopoverSupported()) return;\n\n    persistedEl.querySelectorAll(':popover-open').forEach(el => {\n        el.setAttribute('data-navigate-popover-open', '')\n\n        let animations = el.getAnimations()\n\n        // Gather any in-progress animations, serialize them, and pause them, for later re-triggering...\n        el._pausedAnimations = animations.map(animation => ({\n            keyframes: animation.effect.getKeyframes(),\n            options: {\n                duration: animation.effect.getTiming().duration,\n                easing: animation.effect.getTiming().easing,\n                fill: animation.effect.getTiming().fill,\n                iterations: animation.effect.getTiming().iterations\n            },\n            currentTime: animation.currentTime,\n            playState: animation.playState\n        }))\n\n        animations.forEach(i => i.pause())\n    })\n}\n\nexport function unPackPersistedPopovers(persistedEl) {\n    if (!isPopoverSupported()) return;\n\n    persistedEl.querySelectorAll('[data-navigate-popover-open]').forEach(el => {\n        el.removeAttribute('data-navigate-popover-open')\n\n        // Wait for the popovers to be fully connected to the DOM...\n        queueMicrotask(() => {\n            if (! el.isConnected) return\n\n            // Show them because disconnected popovers are force-hidden...\n            el.showPopover()\n\n            // End the out-of-the-box animations...\n            el.getAnimations().forEach(i => i.finish())\n\n            // If there are any paused animations, we need to re-trigger them...\n            if (el._pausedAnimations) {\n                el._pausedAnimations.forEach(({keyframes, options, currentTime, now, playState}) => {\n                    let animation = el.animate(keyframes, options);\n\n                    animation.currentTime = currentTime;\n                })\n\n                delete el._pausedAnimations\n            }\n        })\n    })\n}\n\nfunction isPopoverSupported() {\n    return typeof document.createElement('div').showPopover === 'function';\n}\n", "let oldBodyScriptTagHashes = []\n\nlet attributesExemptFromScriptTagHashing = [\n    'data-csrf',\n    'aria-hidden',\n]\n\nexport function swapCurrentPageWithNewHtml(html, andThen) {\n    let newDocument = (new DOMParser()).parseFromString(html, \"text/html\")\n    let newBody = document.adoptNode(newDocument.body)\n    let newHead = document.adoptNode(newDocument.head)\n\n    oldBodyScriptTagHashes = oldBodyScriptTagHashes.concat(Array.from(document.body.querySelectorAll('script')).map(i => {\n        return simpleHash(ignoreAttributes(i.outerHTML, attributesExemptFromScriptTagHashing))\n    }))\n\n    let afterRemoteScriptsHaveLoaded = () => {}\n\n    mergeNewHead(newHead).finally(() => {\n        afterRemoteScriptsHaveLoaded()\n    })\n\n    prepNewBodyScriptTagsToRun(newBody, oldBodyScriptTagHashes)\n\n    let oldBody = document.body\n\n    document.body.replaceWith(newBody)\n\n    Alpine.destroyTree(oldBody)\n\n    andThen(i => afterRemoteScriptsHaveLoaded = i)\n}\n\nfunction prepNewBodyScriptTagsToRun(newBody, oldBodyScriptTagHashes) {\n    newBody.querySelectorAll('script').forEach(i => {\n        // We don't want to re-run script tags marked as \"data-navigate-once\"...\n        if (i.hasAttribute('data-navigate-once')) {\n            // However, if they didn't exist on the previous page, we do.\n            // Therefore, we'll check the \"old body script hashes\" to\n            // see if it was already there before skipping it...\n\n            let hash = simpleHash(\n                ignoreAttributes(i.outerHTML, attributesExemptFromScriptTagHashing)\n            )\n\n            if (oldBodyScriptTagHashes.includes(hash)) return\n        }\n\n        i.replaceWith(cloneScriptTag(i))\n    })\n}\n\nfunction mergeNewHead(newHead) {\n    let children = Array.from(document.head.children)\n    let headChildrenHtmlLookup = children.map(i => i.outerHTML)\n\n    // Only add scripts and styles that aren't already loaded on the page.\n    let garbageCollector = document.createDocumentFragment()\n\n    let touchedHeadElements = []\n\n    let remoteScriptsPromises = []\n\n    for (let child of Array.from(newHead.children)) {\n        if (isAsset(child)) {\n            if (! headChildrenHtmlLookup.includes(child.outerHTML)) {\n                if (isTracked(child)) {\n                    if (ifTheQueryStringChangedSinceLastRequest(child, children)) {\n                        setTimeout(() => window.location.reload())\n                    }\n                }\n\n                if (isScript(child)) {\n                    try {\n                        remoteScriptsPromises.push(\n                            injectScriptTagAndWaitForItToFullyLoad(\n                                cloneScriptTag(child)\n                            )\n                        )\n                    } catch (error) {\n                        // Let's eat any promise rejects so that we don't\n                        // break the rest of the Alpine intializing...\n                        // Any errors triggered by adding the script tag to the page\n                        // will still be thrown...\n                    }\n                } else {\n                    document.head.appendChild(child)\n                }\n            } else {\n                garbageCollector.appendChild(child)\n            }\n\n            touchedHeadElements.push(child)\n        }\n    }\n\n    // Remove any assets that aren't on the new page...\n    // @todo: Re-enable this code and find a better way to managed injected stylesheets. See livewire/livewire#6824\n    // for (let child of Array.from(document.head.children)) {\n    //     if (isAsset(child)) {\n    //         if (! touchedHeadElements.some(i => i.outerHTML === child.outerHTML)) {\n    //             child.remove()\n    //         }\n    //     }\n    // }\n\n    // How to free up the garbage collector?\n\n    // Remove existing non-asset elements like meta, base, title, template.\n    for (let child of Array.from(document.head.children)) {\n        if (! isAsset(child)) child.remove()\n    }\n\n    // Add new non-asset elements left over in the new head element.\n    for (let child of Array.from(newHead.children)) {\n        if (child.tagName.toLowerCase() === 'noscript') continue\n\n        document.head.appendChild(child)\n    }\n\n    return Promise.all(remoteScriptsPromises)\n}\n\nasync function injectScriptTagAndWaitForItToFullyLoad(script) {\n    return new Promise((resolve, reject) => {\n        // Script assets need to be loaded synchronously so that scripts have\n        // their global variables available...\n        if (script.src) {\n            script.onload = () => resolve()\n            script.onerror = () => reject()\n        } else {\n            resolve()\n        }\n\n        document.head.appendChild(script)\n    })\n}\n\nfunction cloneScriptTag(el) {\n    let script = document.createElement('script')\n\n    script.textContent = el.textContent\n    script.async = el.async\n\n    for (let attr of el.attributes) {\n        script.setAttribute(attr.name, attr.value)\n    }\n\n    return script\n}\n\nfunction isTracked(el) {\n    return el.hasAttribute('data-navigate-track')\n}\n\nfunction ifTheQueryStringChangedSinceLastRequest(el, currentHeadChildren) {\n    let [uri, queryString] = extractUriAndQueryString(el)\n\n    return currentHeadChildren.some(child => {\n        if (! isTracked(child)) return false\n\n        let [currentUri, currentQueryString] = extractUriAndQueryString(child)\n\n        // Only consider a data-navigate-track element changed if the query string has changed (not the URI)...\n        if (currentUri === uri && queryString !== currentQueryString) return true\n    })\n}\n\nfunction extractUriAndQueryString(el) {\n    let url = isScript(el) ? el.src : el.href\n\n    return url.split('?')\n}\n\nfunction isAsset(el) {\n    return (el.tagName.toLowerCase() === 'link' && el.getAttribute('rel').toLowerCase() === 'stylesheet')\n        || el.tagName.toLowerCase() === 'style'\n        || el.tagName.toLowerCase() === 'script'\n}\n\nfunction isScript(el)   {\n    return el.tagName.toLowerCase() === 'script'\n}\n\nfunction simpleHash(str) {\n    return str.split('').reduce((a, b) => {\n        a = ((a << 5) - a) + b.charCodeAt(0)\n\n        return a & a\n    }, 0);\n}\n\nfunction ignoreAttributes(subject, attributesToRemove) {\n    let result = subject\n\n    attributesToRemove.forEach(attr => {\n        // Create a regex pattern to match the attribute and its value.\n        // The regex handles attributes that have values surrounded by either single or double quotes.\n        const regex = new RegExp(`${attr}=\"[^\"]*\"|${attr}='[^']*'`, 'g')\n\n        result = result.replace(regex, '')\n    })\n\n    // Remove all whitespace to make things less flaky...\n    result = result.replaceAll(' ', '')\n\n    return result.trim()\n}\n", "import { replaceUrl, updateCurrentPageHtmlInHistoryStateForLaterBackButtonClicks, updateCurrentPageHtmlInSnapshotCacheForLaterBackButtonClicks, updateUrlAndStoreLatestHtmlForFutureBackButtons, whenTheBackOrForwardButtonIsClicked } from \"./history\"\nimport { getPretchedHtmlOr, prefetchHtml, storeThePrefetchedHtmlForWhenALinkIsClicked } from \"./prefetch\"\nimport { createUrlObjectFromString, extractDestinationFromLink, whenThisLinkIsHoveredFor, whenThisLinkIsPressed } from \"./links\"\nimport { isTeleportTarget, packUpPersistedTeleports, removeAnyLeftOverStaleTeleportTargets, unPackPersistedTeleports } from \"./teleport\"\nimport { restoreScrollPositionOrScrollToTop, storeScrollInformationInHtmlBeforeNavigatingAway } from \"./scroll\"\nimport { isPersistedElement, putPersistantElementsBack, storePersistantElementsForLater } from \"./persist\"\nimport { finishAndHideProgressBar, removeAnyLeftOverStaleProgressBars, showAndStartProgressBar } from \"./bar\"\nimport { packUpPersistedPopovers, unPackPersistedPopovers } from \"./popover\"\nimport { swapCurrentPageWithNewHtml } from \"./page\"\nimport { fetchHtml } from \"./fetch\"\n\nlet enablePersist = true\nlet showProgressBar = true\nlet restoreScroll = true\nlet autofocus = false\n\nexport default function (Alpine) {\n\n    Alpine.navigate = (url) => {\n        let destination = createUrlObjectFromString(url)\n\n        let prevented = fireEventForOtherLibrariesToHookInto('alpine:navigate', {\n            url: destination, history: false, cached: false,\n         })\n\n        if (prevented) return\n\n        navigateTo(destination)\n    }\n\n    Alpine.navigate.disableProgressBar = () => {\n        showProgressBar = false\n    }\n\n    Alpine.addInitSelector(() => `[${Alpine.prefixed('navigate')}]`)\n\n    Alpine.directive('navigate', (el, { modifiers }) => {\n        let shouldPrefetchOnHover = modifiers.includes('hover')\n\n        shouldPrefetchOnHover && whenThisLinkIsHoveredFor(el, 60, () => {\n            let destination = extractDestinationFromLink(el)\n\n            if (! destination) return\n\n            prefetchHtml(destination, (html, finalDestination) => {\n                storeThePrefetchedHtmlForWhenALinkIsClicked(html, destination, finalDestination)\n            })\n        })\n\n        whenThisLinkIsPressed(el, (whenItIsReleased) => {\n            let destination = extractDestinationFromLink(el)\n\n            if (! destination) return\n\n            prefetchHtml(destination, (html, finalDestination) => {\n                storeThePrefetchedHtmlForWhenALinkIsClicked(html, destination, finalDestination)\n            })\n\n            whenItIsReleased(() => {\n                let prevented = fireEventForOtherLibrariesToHookInto('alpine:navigate', {\n                    url: destination, history: false, cached: false,\n                 })\n\n                if (prevented) return\n\n                navigateTo(destination);\n            })\n        })\n    })\n\n    function navigateTo(destination, shouldPushToHistoryState = true) {\n        showProgressBar && showAndStartProgressBar()\n\n        fetchHtmlOrUsePrefetchedHtml(destination, (html, finalDestination) => {\n            fireEventForOtherLibrariesToHookInto('alpine:navigating')\n\n            restoreScroll && storeScrollInformationInHtmlBeforeNavigatingAway()\n\n            showProgressBar && finishAndHideProgressBar()\n\n            cleanupAlpineElementsOnThePageThatArentInsideAPersistedElement()\n\n            updateCurrentPageHtmlInHistoryStateForLaterBackButtonClicks()\n\n            preventAlpineFromPickingUpDomChanges(Alpine, andAfterAllThis => {\n                enablePersist && storePersistantElementsForLater(persistedEl => {\n                    packUpPersistedTeleports(persistedEl)\n                    packUpPersistedPopovers(persistedEl)\n                })\n\n                if (shouldPushToHistoryState) {\n                    updateUrlAndStoreLatestHtmlForFutureBackButtons(html, finalDestination)\n                } else {\n                    replaceUrl(finalDestination, html)\n                }\n\n                swapCurrentPageWithNewHtml(html, (afterNewScriptsAreDoneLoading) => {\n                    removeAnyLeftOverStaleTeleportTargets(document.body)\n\n                    enablePersist && putPersistantElementsBack((persistedEl, newStub) => {\n                        unPackPersistedTeleports(persistedEl)\n                        unPackPersistedPopovers(persistedEl)\n                    })\n\n                    restoreScrollPositionOrScrollToTop()\n\n                    afterNewScriptsAreDoneLoading(() => {\n                        andAfterAllThis(() => {\n                            setTimeout(() => {\n                                autofocus && autofocusElementsWithTheAutofocusAttribute()\n                            })\n\n                            nowInitializeAlpineOnTheNewPage(Alpine)\n\n                            fireEventForOtherLibrariesToHookInto('alpine:navigated')\n                        })\n                    })\n                })\n            })\n        })\n    }\n\n    whenTheBackOrForwardButtonIsClicked(\n        (ifThePageBeingVisitedHasntBeenCached) => {\n            ifThePageBeingVisitedHasntBeenCached((url) => {\n                let destination = createUrlObjectFromString(url)\n\n                let prevented = fireEventForOtherLibrariesToHookInto('alpine:navigate', {\n                    url: destination, history: true, cached: false,\n                 })\n\n                if (prevented) return\n\n                let shouldPushToHistoryState = false\n\n                navigateTo(destination, shouldPushToHistoryState)\n            })\n        },\n        (html, url, currentPageUrl, currentPageKey) => {\n            let destination = createUrlObjectFromString(url)\n\n            let prevented = fireEventForOtherLibrariesToHookInto('alpine:navigate', {\n                url: destination, history: true, cached: true,\n            })\n\n            if (prevented) return\n\n            // @todo: see if there's a way to update the current HTML BEFORE\n            // the back button is hit, and not AFTER:\n            storeScrollInformationInHtmlBeforeNavigatingAway()\n\n            // This ensures the current HTML has the latest snapshot\n            fireEventForOtherLibrariesToHookInto('alpine:navigating')\n\n            // Only update the snapshot and not the history state as the history state\n            // has already changed to the new page due to the popstate event\n            updateCurrentPageHtmlInSnapshotCacheForLaterBackButtonClicks(currentPageUrl, currentPageKey)\n\n            preventAlpineFromPickingUpDomChanges(Alpine, andAfterAllThis => {\n                enablePersist && storePersistantElementsForLater(persistedEl => {\n                    packUpPersistedTeleports(persistedEl)\n                    packUpPersistedPopovers(persistedEl)\n                })\n\n                swapCurrentPageWithNewHtml(html, () => {\n                    removeAnyLeftOverStaleProgressBars()\n\n                    removeAnyLeftOverStaleTeleportTargets(document.body)\n\n                    enablePersist && putPersistantElementsBack((persistedEl, newStub) => {\n                        unPackPersistedTeleports(persistedEl)\n                        unPackPersistedPopovers(persistedEl)\n                    })\n\n                    restoreScrollPositionOrScrollToTop()\n\n                    andAfterAllThis(() => {\n                        autofocus && autofocusElementsWithTheAutofocusAttribute()\n\n                        nowInitializeAlpineOnTheNewPage(Alpine)\n\n                        fireEventForOtherLibrariesToHookInto('alpine:navigated')\n                    })\n                })\n            })\n        },\n    )\n\n    // Because DOMContentLoaded is fired on first load,\n    // we should fire alpine:navigated as a replacement as well...\n    setTimeout(() => {\n        fireEventForOtherLibrariesToHookInto('alpine:navigated')\n    })\n}\n\nfunction fetchHtmlOrUsePrefetchedHtml(fromDestination, callback) {\n    getPretchedHtmlOr(fromDestination, callback, () => {\n        fetchHtml(fromDestination, callback)\n    })\n}\n\nfunction preventAlpineFromPickingUpDomChanges(Alpine, callback) {\n    Alpine.stopObservingMutations()\n\n    callback((afterAllThis) => {\n        Alpine.startObservingMutations()\n\n        queueMicrotask(() => {\n            afterAllThis()\n        })\n    })\n}\n\nfunction fireEventForOtherLibrariesToHookInto(name, detail) {\n    let event = new CustomEvent(name, {\n        cancelable: true,\n        bubbles: true,\n        detail,\n    })\n\n    document.dispatchEvent(event)\n\n    return event.defaultPrevented\n}\n\nfunction nowInitializeAlpineOnTheNewPage(Alpine) {\n    Alpine.initTree(document.body, undefined, (el, skip) => {\n        if (el._x_wasPersisted) skip()\n    })\n}\n\nfunction autofocusElementsWithTheAutofocusAttribute() {\n    document.querySelector('[autofocus]') && document.querySelector('[autofocus]').focus()\n}\n\nfunction cleanupAlpineElementsOnThePageThatArentInsideAPersistedElement() {\n    // Create a new tree walker that skips persisted elements...\n    let walker = function (root, callback) {\n        Alpine.walk(root, (el, skip) => {\n            if (isPersistedElement(el)) skip()\n            if (isTeleportTarget(el)) skip()\n            else callback(el, skip)\n        })\n    }\n\n    // Set Alpine in motion to destroy itself on the page. If this proves\n    // to be a performance issue at some point (walking the DOM tree),\n    // we can be more surgical about cleaning up x-for/if instead...\n    Alpine.destroyTree(document.body, walker)\n}\n", "import { isObjecty } from \"@/utils\"\n\nexport default function history(Alpine) {\n    Alpine.magic('queryString', (el, { interceptor }) =>  {\n        let alias\n        let alwaysShow = false\n        let usePush = false\n\n        return interceptor((initialSeedValue, getter, setter, path, key) => {\n            let queryKey = alias || path\n\n            let { initial, replace, push, pop } = track(queryKey, initialSeedValue, alwaysShow)\n\n            setter(initial)\n\n            if (! usePush) {\n                Alpine.effect(() => replace(getter()))\n            } else {\n                Alpine.effect(() => push(getter()))\n\n                pop(async newValue => {\n                    setter(newValue)\n\n                    let tillTheEndOfTheMicrotaskQueue = () => Promise.resolve()\n\n                    await tillTheEndOfTheMicrotaskQueue() // ...so that we preserve the internal lock...\n                })\n            }\n\n            return initial\n        }, func => {\n            func.alwaysShow = () => { alwaysShow = true; return func }\n            func.usePush = () => { usePush = true; return func }\n            func.as = key => { alias = key; return func }\n        })\n    })\n\n    Alpine.history = { track }\n}\n\nexport function track(name, initialSeedValue, alwaysShow = false, except = null) {\n    let { has, get, set, remove } = queryStringUtils()\n\n    let url = new URL(window.location.href)\n    let isInitiallyPresentInUrl = has(url, name)\n    let initialValue = isInitiallyPresentInUrl ? get(url, name) : initialSeedValue\n    let initialValueMemo = JSON.stringify(initialValue)\n    let exceptValueMemo = [false, null, undefined].includes(except) ? initialSeedValue : JSON.stringify(except)\n\n    let hasReturnedToInitialValue = (newValue) => JSON.stringify(newValue) === initialValueMemo\n    let hasReturnedToExceptValue = (newValue) =>  JSON.stringify(newValue) === exceptValueMemo\n\n    if (alwaysShow) url = set(url, name, initialValue)\n\n    replace(url, name, { value: initialValue })\n\n    let lock = false\n\n    let update = (strategy, newValue) => {\n        if (lock) return\n\n        let url = new URL(window.location.href)\n\n        // This block of code is what needs to be changed for this failing test to pass:\n        if (! alwaysShow && ! isInitiallyPresentInUrl && hasReturnedToInitialValue(newValue)) {\n            url = remove(url, name)\n        // This is so that when deeply nested values are tracked, but their parent array/object\n        // is removed, we can handle it gracefully by removing the entry from the URL instead\n        // of letting it get set to `?someKey=undefined` which causes issues on refresh...\n        } else if (newValue === undefined) {\n            url = remove(url, name)\n        } else if (! alwaysShow && hasReturnedToExceptValue(newValue)) {\n            url = remove(url, name)\n        } else {\n            url = set(url, name, newValue)\n        }\n\n        // Right now, the above block, checks a few conditions and updates/removes an entry from the query string.\n        // The new strategy needs to be something like:\n        // - If \"alwaysShow\" is toggled on, then just \"set\" the whole thing with no deep diff\n        // - Otherwise, run a deep comparison callback (given the original value and new value).\n        //   - The callback recieves two params (leaf name and value)\n        //   - Check leaf name and value for existance in the original URL from page load. If it's there, just call \"set\"\n        //   - Check leaf name and value for equivelance to original name and value, if equal, call \"remove\", otherwise, \"set\"\n\n        // That code will look something like this:\n\n        // if (alwaysShow) {\n        //     set(url, name, newValue)\n        // } else {\n        //     deepCompare(name, newValue, originalValue, (leafName, leafValue) => {\n        //         // ....\n        //     })\n        // }\n\n        strategy(url, name, { value: newValue})\n    }\n\n    return {\n        initial: initialValue,\n\n        replace(newValue) { // Update via replaceState...\n            update(replace, newValue)\n        },\n\n        push(newValue) { // Update via pushState...\n            update(push, newValue)\n        },\n\n        pop(receiver) { // \"popstate\" handler...\n            let handler = (e) => {\n                if (! e.state || ! e.state.alpine) return\n\n                Object.entries(e.state.alpine).forEach(([iName, { value: newValue }]) => {\n                    if (iName !== name) return\n\n                    lock = true\n\n                    // Allow the \"receiver\" to be an async function in case a non-syncronous\n                    // operation (like an ajax) requests needs to happen while preserving\n                    // the \"locking\" mechanism (\"lock = true\" in this case)...\n                    let result = receiver(newValue)\n\n                    if (result instanceof Promise) {\n                        result.finally(() => lock = false)\n                    } else {\n                        lock = false\n                    }\n                })\n            }\n\n            window.addEventListener('popstate', handler)\n\n            return () => window.removeEventListener('popstate', handler)\n        }\n    }\n}\n\nfunction replace(url, key, object) {\n    let state = window.history.state || {}\n\n    if (! state.alpine) state.alpine = {}\n\n    state.alpine[key] = unwrap(object)\n\n    window.history.replaceState(state, '', url.toString())\n}\n\nfunction push(url, key, object) {\n    let state = window.history.state || {}\n\n    if (! state.alpine) state.alpine = {}\n\n    state = { alpine: {...state.alpine, ...{[key]: unwrap(object)}} }\n\n    window.history.pushState(state, '', url.toString())\n}\n\nfunction unwrap(object) {\n    if (object === undefined) return undefined\n\n    return JSON.parse(JSON.stringify(object))\n}\n\nfunction queryStringUtils() {\n    return {\n        has(url, key) {\n            let search = url.search\n\n            if (! search) return false\n\n            let data = fromQueryString(search, key)\n\n            return Object.keys(data).includes(key)\n        },\n        get(url, key) {\n            let search = url.search\n\n            if (! search) return false\n\n            let data = fromQueryString(search, key)\n\n            return data[key]\n        },\n        set(url, key, value) {\n            let data = fromQueryString(url.search, key)\n\n            data[key] = stripNulls(unwrap(value))\n\n            url.search = toQueryString(data)\n\n            return url\n        },\n        remove(url, key) {\n            let data = fromQueryString(url.search, key)\n\n            delete data[key]\n\n            url.search = toQueryString(data)\n\n            return url\n        },\n    }\n}\n\nfunction stripNulls(value) {\n    if (! isObjecty(value)) return value\n\n    for (let key in value) {\n        if (value[key] === null) delete value[key]\n        else value[key] = stripNulls(value[key])\n    }\n\n    return value\n}\n\n// This function converts JavaScript data to bracketed query string notation...\n// { items: [['foo']] } -> \"items[0][0]=foo\"\nfunction toQueryString(data) {\n    let isObjecty = (subject) => typeof subject === 'object' && subject !== null\n\n    let buildQueryStringEntries = (data, entries = {}, baseKey = '') => {\n        Object.entries(data).forEach(([iKey, iValue]) => {\n            let key = baseKey === '' ? iKey : `${baseKey}[${iKey}]`\n\n            if (iValue === null) {\n                entries[key] = '';\n            } else if (! isObjecty(iValue)) {\n                entries[key] = encodeURIComponent(iValue)\n                    .replaceAll('%20', '+') // Conform to RFC1738\n                    .replaceAll('%2C', ',')\n            } else {\n                entries = {...entries, ...buildQueryStringEntries(iValue, entries, key)}\n            }\n        })\n\n        return entries\n    }\n\n    let entries = buildQueryStringEntries(data)\n\n    return Object.entries(entries).map(([key, value]) => `${key}=${value}`).join('&')\n}\n\n// This function converts bracketed query string notation back to JS data...\n// \"items[0][0]=foo\" -> { items: [['foo']] }\nfunction fromQueryString(search, queryKey) {\n    search = search.replace('?', '')\n\n    if (search === '') return {}\n\n    let insertDotNotatedValueIntoData = (key, value, data) => {\n        let [first, second, ...rest] = key.split('.')\n\n        // We're at a leaf node, let's make the assigment...\n        if (! second) return data[key] = value\n\n        // This is where we fill in empty arrays/objects allong the way to the assigment...\n        if (data[first] === undefined) {\n            data[first] = isNaN(second) ? {} : []\n        }\n\n        // Keep deferring assignment until the full key is built up...\n        insertDotNotatedValueIntoData([second, ...rest].join('.'), value, data[first])\n    }\n\n    let entries = search.split('&').map(i => i.split('='))\n\n    // let data = {} creates a security (XSS) vulnerability here. We need to use\n    // Object.create(null) instead so that we have a \"pure\" object that doesnt\n    // inherit Object.prototype and expose the js internals to manipulation.\n    let data = Object.create(null)\n\n    entries.forEach(([key, value]) => {\n        // Query string params don't always have values... (`?foo=`)\n        if ( typeof value == 'undefined' ) return;\n\n        value = decodeURIComponent(value.replaceAll('+', '%20'))\n\n        let decodedKey = decodeURIComponent(key)\n\n        let shouldBeHandledAsArray = decodedKey.includes('[') && decodedKey.startsWith(queryKey)\n\n        if (!shouldBeHandledAsArray) {\n            data[key] = value\n        } else {\n            // Convert to dot notation because it's easier...\n            let dotNotatedKey = decodedKey.replaceAll('[', '.').replaceAll(']', '')\n\n            insertDotNotatedValueIntoData(dotNotatedKey, value, data)\n        }\n    })\n\n    return data\n}\n", "// packages/morph/src/morph.js\nfunction morph(from, toHtml, options) {\n  monkeyPatchDomSetAttributeToAllowAtSymbols();\n  let fromEl;\n  let toEl;\n  let key, lookahead, updating, updated, removing, removed, adding, added;\n  function assignOptions(options2 = {}) {\n    let defaultGetKey = (el) => el.getAttribute(\"key\");\n    let noop = () => {\n    };\n    updating = options2.updating || noop;\n    updated = options2.updated || noop;\n    removing = options2.removing || noop;\n    removed = options2.removed || noop;\n    adding = options2.adding || noop;\n    added = options2.added || noop;\n    key = options2.key || defaultGetKey;\n    lookahead = options2.lookahead || false;\n  }\n  function patch(from2, to) {\n    if (differentElementNamesTypesOrKeys(from2, to)) {\n      return swapElements(from2, to);\n    }\n    let updateChildrenOnly = false;\n    if (shouldSkip(updating, from2, to, () => updateChildrenOnly = true))\n      return;\n    if (from2.nodeType === 1 && window.Alpine) {\n      window.Alpine.cloneNode(from2, to);\n      if (from2._x_teleport && to._x_teleport) {\n        patch(from2._x_teleport, to._x_teleport);\n      }\n    }\n    if (textOrComment(to)) {\n      patchNodeValue(from2, to);\n      updated(from2, to);\n      return;\n    }\n    if (!updateChildrenOnly) {\n      patchAttributes(from2, to);\n    }\n    updated(from2, to);\n    patchChildren(from2, to);\n  }\n  function differentElementNamesTypesOrKeys(from2, to) {\n    return from2.nodeType != to.nodeType || from2.nodeName != to.nodeName || getKey(from2) != getKey(to);\n  }\n  function swapElements(from2, to) {\n    if (shouldSkip(removing, from2))\n      return;\n    let toCloned = to.cloneNode(true);\n    if (shouldSkip(adding, toCloned))\n      return;\n    from2.replaceWith(toCloned);\n    removed(from2);\n    added(toCloned);\n  }\n  function patchNodeValue(from2, to) {\n    let value = to.nodeValue;\n    if (from2.nodeValue !== value) {\n      from2.nodeValue = value;\n    }\n  }\n  function patchAttributes(from2, to) {\n    if (from2._x_transitioning)\n      return;\n    if (from2._x_isShown && !to._x_isShown) {\n      return;\n    }\n    if (!from2._x_isShown && to._x_isShown) {\n      return;\n    }\n    let domAttributes = Array.from(from2.attributes);\n    let toAttributes = Array.from(to.attributes);\n    for (let i = domAttributes.length - 1; i >= 0; i--) {\n      let name = domAttributes[i].name;\n      if (!to.hasAttribute(name)) {\n        from2.removeAttribute(name);\n      }\n    }\n    for (let i = toAttributes.length - 1; i >= 0; i--) {\n      let name = toAttributes[i].name;\n      let value = toAttributes[i].value;\n      if (from2.getAttribute(name) !== value) {\n        from2.setAttribute(name, value);\n      }\n    }\n  }\n  function patchChildren(from2, to) {\n    let fromKeys = keyToMap(from2.children);\n    let fromKeyHoldovers = {};\n    let currentTo = getFirstNode(to);\n    let currentFrom = getFirstNode(from2);\n    while (currentTo) {\n      seedingMatchingId(currentTo, currentFrom);\n      let toKey = getKey(currentTo);\n      let fromKey = getKey(currentFrom);\n      if (!currentFrom) {\n        if (toKey && fromKeyHoldovers[toKey]) {\n          let holdover = fromKeyHoldovers[toKey];\n          from2.appendChild(holdover);\n          currentFrom = holdover;\n          fromKey = getKey(currentFrom);\n        } else {\n          if (!shouldSkip(adding, currentTo)) {\n            let clone = currentTo.cloneNode(true);\n            from2.appendChild(clone);\n            added(clone);\n          }\n          currentTo = getNextSibling(to, currentTo);\n          continue;\n        }\n      }\n      let isIf = (node) => node && node.nodeType === 8 && node.textContent === \"[if BLOCK]><![endif]\";\n      let isEnd = (node) => node && node.nodeType === 8 && node.textContent === \"[if ENDBLOCK]><![endif]\";\n      if (isIf(currentTo) && isIf(currentFrom)) {\n        let nestedIfCount = 0;\n        let fromBlockStart = currentFrom;\n        while (currentFrom) {\n          let next = getNextSibling(from2, currentFrom);\n          if (isIf(next)) {\n            nestedIfCount++;\n          } else if (isEnd(next) && nestedIfCount > 0) {\n            nestedIfCount--;\n          } else if (isEnd(next) && nestedIfCount === 0) {\n            currentFrom = next;\n            break;\n          }\n          currentFrom = next;\n        }\n        let fromBlockEnd = currentFrom;\n        nestedIfCount = 0;\n        let toBlockStart = currentTo;\n        while (currentTo) {\n          let next = getNextSibling(to, currentTo);\n          if (isIf(next)) {\n            nestedIfCount++;\n          } else if (isEnd(next) && nestedIfCount > 0) {\n            nestedIfCount--;\n          } else if (isEnd(next) && nestedIfCount === 0) {\n            currentTo = next;\n            break;\n          }\n          currentTo = next;\n        }\n        let toBlockEnd = currentTo;\n        let fromBlock = new Block(fromBlockStart, fromBlockEnd);\n        let toBlock = new Block(toBlockStart, toBlockEnd);\n        patchChildren(fromBlock, toBlock);\n        continue;\n      }\n      if (currentFrom.nodeType === 1 && lookahead && !currentFrom.isEqualNode(currentTo)) {\n        let nextToElementSibling = getNextSibling(to, currentTo);\n        let found = false;\n        while (!found && nextToElementSibling) {\n          if (nextToElementSibling.nodeType === 1 && currentFrom.isEqualNode(nextToElementSibling)) {\n            found = true;\n            currentFrom = addNodeBefore(from2, currentTo, currentFrom);\n            fromKey = getKey(currentFrom);\n          }\n          nextToElementSibling = getNextSibling(to, nextToElementSibling);\n        }\n      }\n      if (toKey !== fromKey) {\n        if (!toKey && fromKey) {\n          fromKeyHoldovers[fromKey] = currentFrom;\n          currentFrom = addNodeBefore(from2, currentTo, currentFrom);\n          fromKeyHoldovers[fromKey].remove();\n          currentFrom = getNextSibling(from2, currentFrom);\n          currentTo = getNextSibling(to, currentTo);\n          continue;\n        }\n        if (toKey && !fromKey) {\n          if (fromKeys[toKey]) {\n            currentFrom.replaceWith(fromKeys[toKey]);\n            currentFrom = fromKeys[toKey];\n            fromKey = getKey(currentFrom);\n          }\n        }\n        if (toKey && fromKey) {\n          let fromKeyNode = fromKeys[toKey];\n          if (fromKeyNode) {\n            fromKeyHoldovers[fromKey] = currentFrom;\n            currentFrom.replaceWith(fromKeyNode);\n            currentFrom = fromKeyNode;\n            fromKey = getKey(currentFrom);\n          } else {\n            fromKeyHoldovers[fromKey] = currentFrom;\n            currentFrom = addNodeBefore(from2, currentTo, currentFrom);\n            fromKeyHoldovers[fromKey].remove();\n            currentFrom = getNextSibling(from2, currentFrom);\n            currentTo = getNextSibling(to, currentTo);\n            continue;\n          }\n        }\n      }\n      let currentFromNext = currentFrom && getNextSibling(from2, currentFrom);\n      patch(currentFrom, currentTo);\n      currentTo = currentTo && getNextSibling(to, currentTo);\n      currentFrom = currentFromNext;\n    }\n    let removals = [];\n    while (currentFrom) {\n      if (!shouldSkip(removing, currentFrom))\n        removals.push(currentFrom);\n      currentFrom = getNextSibling(from2, currentFrom);\n    }\n    while (removals.length) {\n      let domForRemoval = removals.shift();\n      domForRemoval.remove();\n      removed(domForRemoval);\n    }\n  }\n  function getKey(el) {\n    return el && el.nodeType === 1 && key(el);\n  }\n  function keyToMap(els) {\n    let map = {};\n    for (let el of els) {\n      let theKey = getKey(el);\n      if (theKey) {\n        map[theKey] = el;\n      }\n    }\n    return map;\n  }\n  function addNodeBefore(parent, node, beforeMe) {\n    if (!shouldSkip(adding, node)) {\n      let clone = node.cloneNode(true);\n      parent.insertBefore(clone, beforeMe);\n      added(clone);\n      return clone;\n    }\n    return node;\n  }\n  assignOptions(options);\n  fromEl = from;\n  toEl = typeof toHtml === \"string\" ? createElement(toHtml) : toHtml;\n  if (window.Alpine && window.Alpine.closestDataStack && !from._x_dataStack) {\n    toEl._x_dataStack = window.Alpine.closestDataStack(from);\n    toEl._x_dataStack && window.Alpine.cloneNode(from, toEl);\n  }\n  patch(from, toEl);\n  fromEl = void 0;\n  toEl = void 0;\n  return from;\n}\nmorph.step = () => {\n};\nmorph.log = () => {\n};\nfunction shouldSkip(hook, ...args) {\n  let skip = false;\n  hook(...args, () => skip = true);\n  return skip;\n}\nvar patched = false;\nfunction createElement(html) {\n  const template = document.createElement(\"template\");\n  template.innerHTML = html;\n  return template.content.firstElementChild;\n}\nfunction textOrComment(el) {\n  return el.nodeType === 3 || el.nodeType === 8;\n}\nvar Block = class {\n  constructor(start, end) {\n    this.startComment = start;\n    this.endComment = end;\n  }\n  get children() {\n    let children = [];\n    let currentNode = this.startComment.nextSibling;\n    while (currentNode && currentNode !== this.endComment) {\n      children.push(currentNode);\n      currentNode = currentNode.nextSibling;\n    }\n    return children;\n  }\n  appendChild(child) {\n    this.endComment.before(child);\n  }\n  get firstChild() {\n    let first = this.startComment.nextSibling;\n    if (first === this.endComment)\n      return;\n    return first;\n  }\n  nextNode(reference) {\n    let next = reference.nextSibling;\n    if (next === this.endComment)\n      return;\n    return next;\n  }\n  insertBefore(newNode, reference) {\n    reference.before(newNode);\n    return newNode;\n  }\n};\nfunction getFirstNode(parent) {\n  return parent.firstChild;\n}\nfunction getNextSibling(parent, reference) {\n  let next;\n  if (parent instanceof Block) {\n    next = parent.nextNode(reference);\n  } else {\n    next = reference.nextSibling;\n  }\n  return next;\n}\nfunction monkeyPatchDomSetAttributeToAllowAtSymbols() {\n  if (patched)\n    return;\n  patched = true;\n  let original = Element.prototype.setAttribute;\n  let hostDiv = document.createElement(\"div\");\n  Element.prototype.setAttribute = function newSetAttribute(name, value) {\n    if (!name.includes(\"@\")) {\n      return original.call(this, name, value);\n    }\n    hostDiv.innerHTML = `<span ${name}=\"${value}\"></span>`;\n    let attr = hostDiv.firstElementChild.getAttributeNode(name);\n    hostDiv.firstElementChild.removeAttributeNode(attr);\n    this.setAttributeNode(attr);\n  };\n}\nfunction seedingMatchingId(to, from) {\n  let fromId = from && from._x_bindings && from._x_bindings.id;\n  if (!fromId)\n    return;\n  if (!to.setAttribute)\n    return;\n  to.setAttribute(\"id\", fromId);\n  to.id = fromId;\n}\n\n// packages/morph/src/index.js\nfunction src_default(Alpine) {\n  Alpine.morph = morph;\n}\n\n// packages/morph/builds/module.js\nvar module_default = src_default;\nexport {\n  module_default as default,\n  src_default as morph\n};\n", "// packages/mask/src/index.js\nfunction src_default(Alpine) {\n  Alpine.directive(\"mask\", (el, { value, expression }, { effect, evaluateLater, cleanup }) => {\n    let templateFn = () => expression;\n    let lastInputValue = \"\";\n    queueMicrotask(() => {\n      if ([\"function\", \"dynamic\"].includes(value)) {\n        let evaluator = evaluateLater(expression);\n        effect(() => {\n          templateFn = (input) => {\n            let result;\n            Alpine.dontAutoEvaluateFunctions(() => {\n              evaluator((value2) => {\n                result = typeof value2 === \"function\" ? value2(input) : value2;\n              }, { scope: {\n                // These are \"magics\" we'll make available to the x-mask:function:\n                \"$input\": input,\n                \"$money\": formatMoney.bind({ el })\n              } });\n            });\n            return result;\n          };\n          processInputValue(el, false);\n        });\n      } else {\n        processInputValue(el, false);\n      }\n      if (el._x_model) {\n        if (el._x_model.get() === el.value)\n          return;\n        if (el._x_model.get() === null && el.value === \"\")\n          return;\n        el._x_model.set(el.value);\n      }\n    });\n    const controller = new AbortController();\n    cleanup(() => {\n      controller.abort();\n    });\n    el.addEventListener(\"input\", () => processInputValue(el), {\n      signal: controller.signal,\n      // Setting this as a capture phase listener to ensure it runs\n      // before wire:model or x-model added as a latent binding...\n      capture: true\n    });\n    el.addEventListener(\"blur\", () => processInputValue(el, false), { signal: controller.signal });\n    function processInputValue(el2, shouldRestoreCursor = true) {\n      let input = el2.value;\n      let template = templateFn(input);\n      if (!template || template === \"false\")\n        return false;\n      if (lastInputValue.length - el2.value.length === 1) {\n        return lastInputValue = el2.value;\n      }\n      let setInput = () => {\n        lastInputValue = el2.value = formatInput(input, template);\n      };\n      if (shouldRestoreCursor) {\n        restoreCursorPosition(el2, template, () => {\n          setInput();\n        });\n      } else {\n        setInput();\n      }\n    }\n    function formatInput(input, template) {\n      if (input === \"\")\n        return \"\";\n      let strippedDownInput = stripDown(template, input);\n      let rebuiltInput = buildUp(template, strippedDownInput);\n      return rebuiltInput;\n    }\n  }).before(\"model\");\n}\nfunction restoreCursorPosition(el, template, callback) {\n  let cursorPosition = el.selectionStart;\n  let unformattedValue = el.value;\n  callback();\n  let beforeLeftOfCursorBeforeFormatting = unformattedValue.slice(0, cursorPosition);\n  let newPosition = buildUp(\n    template,\n    stripDown(\n      template,\n      beforeLeftOfCursorBeforeFormatting\n    )\n  ).length;\n  el.setSelectionRange(newPosition, newPosition);\n}\nfunction stripDown(template, input) {\n  let inputToBeStripped = input;\n  let output = \"\";\n  let regexes = {\n    \"9\": /[0-9]/,\n    \"a\": /[a-zA-Z]/,\n    \"*\": /[a-zA-Z0-9]/\n  };\n  let wildcardTemplate = \"\";\n  for (let i = 0; i < template.length; i++) {\n    if ([\"9\", \"a\", \"*\"].includes(template[i])) {\n      wildcardTemplate += template[i];\n      continue;\n    }\n    for (let j = 0; j < inputToBeStripped.length; j++) {\n      if (inputToBeStripped[j] === template[i]) {\n        inputToBeStripped = inputToBeStripped.slice(0, j) + inputToBeStripped.slice(j + 1);\n        break;\n      }\n    }\n  }\n  for (let i = 0; i < wildcardTemplate.length; i++) {\n    let found = false;\n    for (let j = 0; j < inputToBeStripped.length; j++) {\n      if (regexes[wildcardTemplate[i]].test(inputToBeStripped[j])) {\n        output += inputToBeStripped[j];\n        inputToBeStripped = inputToBeStripped.slice(0, j) + inputToBeStripped.slice(j + 1);\n        found = true;\n        break;\n      }\n    }\n    if (!found)\n      break;\n  }\n  return output;\n}\nfunction buildUp(template, input) {\n  let clean = Array.from(input);\n  let output = \"\";\n  for (let i = 0; i < template.length; i++) {\n    if (![\"9\", \"a\", \"*\"].includes(template[i])) {\n      output += template[i];\n      continue;\n    }\n    if (clean.length === 0)\n      break;\n    output += clean.shift();\n  }\n  return output;\n}\nfunction formatMoney(input, delimiter = \".\", thousands, precision = 2) {\n  if (input === \"-\")\n    return \"-\";\n  if (/^\\D+$/.test(input))\n    return \"9\";\n  if (thousands === null || thousands === void 0) {\n    thousands = delimiter === \",\" ? \".\" : \",\";\n  }\n  let addThousands = (input2, thousands2) => {\n    let output = \"\";\n    let counter = 0;\n    for (let i = input2.length - 1; i >= 0; i--) {\n      if (input2[i] === thousands2)\n        continue;\n      if (counter === 3) {\n        output = input2[i] + thousands2 + output;\n        counter = 0;\n      } else {\n        output = input2[i] + output;\n      }\n      counter++;\n    }\n    return output;\n  };\n  let minus = input.startsWith(\"-\") ? \"-\" : \"\";\n  let strippedInput = input.replaceAll(new RegExp(`[^0-9\\\\${delimiter}]`, \"g\"), \"\");\n  let template = Array.from({ length: strippedInput.split(delimiter)[0].length }).fill(\"9\").join(\"\");\n  template = `${minus}${addThousands(template, thousands)}`;\n  if (precision > 0 && input.includes(delimiter))\n    template += `${delimiter}` + \"9\".repeat(precision);\n  queueMicrotask(() => {\n    if (this.el.value.endsWith(delimiter))\n      return;\n    if (this.el.value[this.el.selectionStart - 1] === delimiter) {\n      this.el.setSelectionRange(this.el.selectionStart - 1, this.el.selectionStart - 1);\n    }\n  });\n  return template;\n}\n\n// packages/mask/builds/module.js\nvar module_default = src_default;\nexport {\n  module_default as default,\n  src_default as mask,\n  stripDown\n};\n", "import { closestComponent, destroyComponent, initComponent } from './store'\nimport { matchesForLivewireDirective, extractDirective } from './directives'\nimport { trigger } from './hooks'\nimport collapse from '@alpinejs/collapse'\nimport focus from '@alpinejs/focus'\nimport persist from '@alpinejs/persist'\nimport intersect from '@alpinejs/intersect'\nimport resize from '@alpinejs/resize'\nimport anchor from '@alpinejs/anchor'\nimport navigate from './plugins/navigate'\nimport history from './plugins/history'\nimport morph from '@alpinejs/morph'\nimport mask from '@alpinejs/mask'\nimport Alpine from 'alpinejs'\nimport { dispatch } from './utils'\n\nexport function start() {\n    setTimeout(() => ensureLivewireScriptIsntMisplaced())\n\n    dispatch(document, 'livewire:init')\n    dispatch(document, 'livewire:initializing')\n\n    Alpine.plugin(morph)\n    Alpine.plugin(history)\n    Alpine.plugin(intersect)\n    Alpine.plugin(resize)\n    Alpine.plugin(collapse)\n    Alpine.plugin(anchor)\n    Alpine.plugin(focus)\n    Alpine.plugin(persist)\n    Alpine.plugin(navigate)\n    Alpine.plugin(mask)\n\n    Alpine.addRootSelector(() => '[wire\\\\:id]')\n\n    Alpine.onAttributesAdded((el, attributes) => {\n        // if there are no \"wire:\" directives we don't need to process this element any further.\n        // This prevents Livewire from causing general slowness for other Alpine elements on the page...\n        if (! Array.from(attributes).some(attribute => matchesForLivewireDirective(attribute.name))) return\n\n        let component = closestComponent(el, false)\n\n        if (! component) return\n\n        attributes.forEach(attribute => {\n            if (! matchesForLivewireDirective(attribute.name)) return;\n\n            let directive = extractDirective(el, attribute.name)\n\n            trigger('directive.init', { el, component, directive, cleanup: (callback) => {\n                Alpine.onAttributeRemoved(el, directive.raw, callback)\n            } })\n        })\n    })\n\n    Alpine.interceptInit(\n        Alpine.skipDuringClone(el => {\n            // if there are no \"wire:\" directives we don't need to process this element any further.\n            // This prevents Livewire from causing general slowness for other Alpine elements on the page...\n            if (! Array.from(el.attributes).some(attribute => matchesForLivewireDirective(attribute.name))) return\n\n            if (el.hasAttribute('wire:id')) {\n                let component = initComponent(el)\n\n                Alpine.onAttributeRemoved(el, 'wire:id', () => {\n                    destroyComponent(component.id)\n                })\n            }\n\n            let directives = Array.from(el.getAttributeNames())\n                .filter(name => matchesForLivewireDirective(name))\n                .map(name => extractDirective(el, name))\n\n            directives.forEach(directive => {\n                trigger('directive.global.init', { el, directive, cleanup: (callback) => {\n                    Alpine.onAttributeRemoved(el, directive.raw, callback)\n                } })\n            })\n\n            let component = closestComponent(el, false)\n\n            if (component) {\n                trigger('element.init', { el, component })\n\n                directives.forEach(directive => {\n                    trigger('directive.init', { el, component, directive, cleanup: (callback) => {\n                        Alpine.onAttributeRemoved(el, directive.raw, callback)\n                    } })\n                })\n            }\n        })\n    )\n\n    Alpine.start()\n\n    setTimeout(() => window.Livewire.initialRenderIsFinished = true)\n\n    dispatch(document, 'livewire:initialized')\n}\n\nfunction ensureLivewireScriptIsntMisplaced() {\n    let el = document.querySelector('script[data-update-uri][data-csrf]')\n\n    // If there is no Livewire-injected script on the page, move on...\n    if (! el) return\n\n    // If there is, let's ensure it's at the top-level. If it's nested\n    // inside a normal element, that probably means that a closing\n    // tag was missing in the template and Chrome moved the tag.\n\n    // We're only checking for \"div\" here because it's quick and useful...\n    let livewireEl = el.closest('[wire\\\\:id]')\n\n    if (livewireEl) {\n        console.warn('Livewire: missing closing tags found. Ensure your template elements contain matching closing tags.', livewireEl)\n    }\n}\n", "import { on as hook } from '@/hooks'\n\nhook('effect', ({ component, effects }) => {\n    registerListeners(component, effects.listeners || [])\n})\n\nfunction registerListeners(component, listeners) {\n    listeners.forEach(name => {\n        // Register a global listener...\n        let handler = (e) => {\n            if (e.__livewire) e.__livewire.receivedBy.push(component)\n\n            component.$wire.call('__dispatch', name, e.detail || {})\n        }\n\n        window.addEventListener(name, handler)\n\n        component.addCleanup(() => window.removeEventListener(name, handler))\n\n        // Register a listener for when \"to\" or \"self\"\n        component.el.addEventListener(name, (e) => {\n            // We don't care about non-Livewire dispatches...\n            if (! e.__livewire) return\n\n            // We don't care about Livewire bubbling dispatches (only \"to\" and \"self\")...\n            if (e.bubbles) return\n\n            if (e.__livewire) e.__livewire.receivedBy.push(component.id)\n\n            component.$wire.call('__dispatch', name, e.detail || {})\n        })\n    })\n}\n\n\n", "import { on } from '@/hooks'\nimport Alpine from 'alpinejs'\n\nlet executedScripts = new WeakMap\n\nlet executedAssets = new Set\n\non('payload.intercept', async ({ assets }) => {\n    if(! assets) return\n\n    for (let [key, asset] of Object.entries(assets)) {\n        await onlyIfAssetsHaventBeenLoadedAlreadyOnThisPage(key, async () => {\n            await addAssetsToHeadTagOfPage(asset)\n        })\n    }\n})\n\n// Assets that were injected into the HTML need to be registered so that\n// they aren't loaded again...\non('component.init', ({ component }) => {\n    let assets = component.snapshot.memo.assets\n\n    if (assets) {\n        assets.forEach((key) => {\n            if (executedAssets.has(key)) return\n            executedAssets.add(key)\n        })\n    }\n})\n\non('effect', ({ component, effects }) => {\n    let scripts = effects.scripts\n\n    if (scripts) {\n        Object.entries(scripts).forEach(([key, content]) => {\n            onlyIfScriptHasntBeenRunAlreadyForThisComponent(component, key, () => {\n                let scriptContent = extractScriptTagContent(content)\n\n                Alpine.dontAutoEvaluateFunctions(() => {\n                    Alpine.evaluate(component.el, scriptContent, { '$wire': component.$wire })\n                })\n            })\n        })\n    }\n})\n\nfunction onlyIfScriptHasntBeenRunAlreadyForThisComponent(component, key, callback) {\n    if (executedScripts.has(component)) {\n        let alreadyRunKeys = executedScripts.get(component)\n\n        if (alreadyRunKeys.includes(key)) return\n    }\n\n    callback()\n\n    if (! executedScripts.has(component)) executedScripts.set(component, [])\n\n    let alreadyRunKeys = executedScripts.get(component)\n\n    alreadyRunKeys.push(key)\n\n    executedScripts.set(component, alreadyRunKeys)\n}\n\nfunction extractScriptTagContent(rawHtml) {\n    let scriptRegex = /<script\\b[^>]*>([\\s\\S]*?)<\\/script>/gm\n    let matches = scriptRegex.exec(rawHtml)\n    let innards =  matches && matches[1] ? matches[1].trim() : ''\n\n    return innards\n}\n\nasync function onlyIfAssetsHaventBeenLoadedAlreadyOnThisPage(key, callback) {\n    if (executedAssets.has(key)) return\n\n    await callback()\n\n    executedAssets.add(key)\n}\n\nasync function addAssetsToHeadTagOfPage(rawHtml) {\n    let newDocument = (new DOMParser()).parseFromString(rawHtml, \"text/html\")\n    let newHead = document.adoptNode(newDocument.head)\n\n    for (let child of newHead.children) {\n        try {\n            await runAssetSynchronously(child)\n        } catch (error) {\n            // Let's eat any promise rejects so that we don't\n            // break the rest of Livewire's handling of the response...\n            // Any errors triggered by adding the script tag to the page\n            // will still be thrown...\n        }\n    }\n}\n\nasync function runAssetSynchronously(child) {\n    return new Promise((resolve, reject) => {\n        if (isScript(child)) {\n            let script = cloneScriptTag(child)\n\n            // Script assets need to be loaded synchronously so that scripts have\n            // their global variables available...\n            if (script.src) {\n                script.onload = () => resolve()\n                script.onerror = () => reject()\n            } else {\n                resolve()\n            }\n\n            document.head.appendChild(script)\n        } else {\n            document.head.appendChild(child)\n\n            resolve()\n        }\n    })\n}\n\nfunction isScript(el)   {\n    return el.tagName.toLowerCase() === 'script'\n}\n\nfunction cloneScriptTag(el) {\n    let script = document.createElement('script')\n\n    script.textContent = el.textContent\n    script.async = el.async\n\n    for (let attr of el.attributes) {\n        script.setAttribute(attr.name, attr.value)\n    }\n\n    return script\n}\n", "import { overrideMethod } from '@/$wire'\nimport { on } from '@/hooks'\nimport Alpine from 'alpinejs'\n\non('effect', ({ component, effects }) => {\n    let js = effects.js\n    let xjs = effects.xjs\n\n    if (js) {\n        Object.entries(js).forEach(([method, body]) => {\n            overrideMethod(component, method, () => {\n                Alpine.evaluate(component.el, body)\n            })\n        })\n    }\n\n    if (xjs) {\n        xjs.forEach(expression => {\n            Alpine.evaluate(component.el, expression)\n        })\n    }\n})\n\n", "import { trigger } from \"@/hooks\"\nimport { closestComponent } from \"@/store\"\nimport Alpine from 'alpinejs'\n\nexport function morph(component, el, html) {\n    let wrapperTag = el.parentElement\n        // If the root element is a \"tr\", we need the wrapper to be a \"table\"...\n        ? el.parentElement.tagName.toLowerCase()\n        : 'div'\n\n    let wrapper = document.createElement(wrapperTag)\n\n    wrapper.innerHTML = html\n    let parentComponent\n\n    try {\n        parentComponent = closestComponent(el.parentElement)\n    } catch (e) {}\n\n    parentComponent && (wrapper.__livewire = parentComponent)\n\n    let to = wrapper.firstElementChild\n\n    to.__livewire = component\n\n    trigger('morph', { el, toEl: to, component })\n\n    Alpine.morph(el, to, {\n        updating: (el, toEl, childrenOnly, skip) => {\n            if (isntElement(el)) return\n\n            trigger('morph.updating', { el, toEl, component, skip, childrenOnly })\n\n            // bypass DOM diffing for children by overwriting the content\n            if (el.__livewire_replace === true) el.innerHTML = toEl.innerHTML;\n            // completely bypass DOM diffing for this element and all children\n            if (el.__livewire_replace_self === true) { el.outerHTML = toEl.outerHTML; return skip(); }\n\n            if (el.__livewire_ignore === true) return skip()\n            if (el.__livewire_ignore_self === true) childrenOnly()\n\n            // Children will update themselves.\n            if (isComponentRootEl(el) && el.getAttribute('wire:id') !== component.id) return skip()\n\n            // Give the root Livewire \"to\" element, the same object reference as the \"from\"\n            // element. This ensures new Alpine magics like $wire and @entangle can\n            // initialize in the context of a real Livewire component object.\n            if (isComponentRootEl(el)) toEl.__livewire = component\n        },\n\n        updated: (el) => {\n            if (isntElement(el)) return\n\n            trigger('morph.updated', { el, component })\n        },\n\n        removing: (el, skip) => {\n            if (isntElement(el)) return\n\n            trigger('morph.removing', { el, component, skip })\n        },\n\n        removed: (el) => {\n            if (isntElement(el)) return\n\n            trigger('morph.removed', { el, component })\n        },\n\n        adding: (el) => {\n            trigger('morph.adding', { el, component })\n        },\n\n        added: (el) => {\n            if (isntElement(el)) return\n\n            const closestComponentId = closestComponent(el).id\n\n            trigger('morph.added', { el })\n        },\n\n        key: (el) => {\n            if (isntElement(el)) return\n\n            return el.hasAttribute(`wire:key`)\n                ? el.getAttribute(`wire:key`)\n                : // If no \"key\", then first check for \"wire:id\", then \"id\"\n                el.hasAttribute(`wire:id`)\n                    ? el.getAttribute(`wire:id`)\n                    : el.id\n        },\n\n        lookahead: false,\n    })\n\n    trigger('morphed', { el, component })\n}\n\nfunction isntElement(el) {\n    return typeof el.hasAttribute !== 'function'\n}\n\nfunction isComponentRootEl(el) {\n    return el.hasAttribute('wire:id')\n}\n", "import { morph } from '@/morph'\nimport { on } from '@/hooks'\n\non('effect', ({ component, effects }) => {\n    let html = effects.html\n    if (! html) return\n\n    // Wrapping this in a double queueMicrotask. The first one puts it after all\n    // other \"effect\" hooks, and the second one puts it after all reactive\n    // Alpine effects (that are processed via flushJobs in scheduler).\n    queueMicrotask(() => {\n        queueMicrotask(() => {\n            morph(component, component.el, html)\n        })\n    })\n})\n", "import { dispatch, dispatchSelf, dispatchTo } from '@/events'\nimport { on } from '@/hooks'\n\non('effect', ({ component, effects }) => {\n    dispatchEvents(component, effects.dispatches || [])\n})\n\nfunction dispatchEvents(component, dispatches) {\n    dispatches.forEach(({ name, params = {}, self = false, to }) => {\n        if (self) dispatchSelf(component, name, params)\n        else if (to) dispatchTo(to, name, params)\n        else dispatch(component, name, params)\n    })\n}\n\n\n", "import { getDirectives } from '@/directives'\nimport { on } from '@/hooks'\nimport { Bag } from '@/utils'\nimport Alpine from 'alpinejs'\n\nlet cleanups = new Bag\n\n// Adding a setTimeout here so that these event listeners are\n// registered AFTER most other event listenrs, this way, we\n// can call \"stopPropagation\" for things like wire:confirm\non('directive.init', ({ el, directive, cleanup, component }) => setTimeout(() => {\n    if (directive.value !== 'submit') return\n\n    // Livewire will clean it all up automatically when the form\n    // submission returns and the new DOM lacks these additions...\n    el.addEventListener('submit', () => {\n        // If using wire:submit=\"$parent...\", we will need to use\n        // the parent ID as a reference for undoing because it's\n        // the ID that will come back from the network request.\n        let componentId = directive.expression.startsWith('$parent')\n            ? component.parent.id\n            : component.id\n\n        let cleanup = disableForm(el)\n\n        cleanups.add(componentId, cleanup)\n    })\n}))\n\non('commit', ({ component, respond }) => {\n    respond(() => {\n        cleanups.each(component.id, i => i())\n        cleanups.remove(component.id)\n    })\n})\n\nfunction disableForm(formEl) {\n    let undos = []\n\n    Alpine.walk(formEl, (el, skip) => {\n        if (! formEl.contains(el)) return\n\n        if (el.hasAttribute('wire:ignore')) return skip()\n\n        if (shouldMarkDisabled(el)) {\n            undos.push(markDisabled(el))\n        } else if (shouldMarkReadOnly(el)) {\n            undos.push(markReadOnly(el))\n        }\n    })\n\n    return () => {\n        while (undos.length > 0) undos.shift()()\n    }\n}\n\nfunction shouldMarkDisabled(el) {\n    let tag = el.tagName.toLowerCase()\n\n    if (tag === 'select') return true\n    if (tag === 'button' && el.type === 'submit') return true\n    if (tag === 'input' && (el.type === 'checkbox' || el.type === 'radio')) return true\n\n    return false\n}\n\nfunction shouldMarkReadOnly(el) {\n    return ['input', 'textarea'].includes(el.tagName.toLowerCase())\n}\n\nfunction markDisabled(el) {\n    let undo = el.disabled\n        ? () => {}\n        : () => el.disabled = false\n\n    el.disabled = true\n\n    return undo\n}\n\nfunction markReadOnly(el) {\n    let undo = el.readOnly\n        ? () => {}\n        : () => el.readOnly = false\n\n    el.readOnly = true\n\n    return undo\n}\n", "import { on } from '@/hooks'\n\n// Ensure that all child components with reactive props (even deeply nested)\n// are included in the network request...\non('commit.pooling', ({ commits }) => {\n    commits.forEach(commit => {\n        let component = commit.component\n\n        getDeepChildrenWithBindings(component, child => {\n            child.$wire.$commit()\n        })\n    })\n})\n\n// Ensure that related components are pooled together, even if they chose\n// to be isolated normally...\non('commit.pooled', ({ pools }) => {\n    let commits = getPooledCommits(pools)\n\n    commits.forEach(commit => {\n        let component = commit.component\n\n        getDeepChildrenWithBindings(component, child => {\n            colocateCommitsByComponent(pools, component, child)\n        })\n    })\n})\n\nfunction getPooledCommits(pools) {\n    let commits = []\n\n    pools.forEach(pool => {\n        pool.commits.forEach(commit => {\n            commits.push(commit)\n        })\n    })\n\n    return commits\n}\n\nfunction colocateCommitsByComponent(pools, component, foreignComponent) {\n    let pool = findPoolWithComponent(pools, component)\n\n    let foreignPool = findPoolWithComponent(pools, foreignComponent)\n\n    let foreignCommit = foreignPool.findCommitByComponent(foreignComponent)\n\n    // Delete needs to come before add in case there are the same pool...\n    foreignPool.delete(foreignCommit)\n\n    pool.add(foreignCommit)\n\n    // Cleanup empty pools...\n    pools.forEach(pool => {\n        if (pool.empty()) pools.delete(pool)\n    })\n}\n\nfunction findPoolWithComponent(pools, component) {\n    for (let [idx, pool] of pools.entries()) {\n        if (pool.hasCommitFor(component)) return pool\n    }\n}\n\nfunction getDeepChildrenWithBindings(component, callback) {\n    getDeepChildren(component, child => {\n        if (hasReactiveProps(child) || hasWireModelableBindings(child)) {\n            callback(child)\n        }\n    })\n}\n\nfunction hasReactiveProps(component) {\n    let meta = component.snapshot.memo\n    let props = meta.props\n\n    return !! props\n}\n\nfunction hasWireModelableBindings(component) {\n    let meta = component.snapshot.memo\n    let bindings = meta.bindings\n\n    return !! bindings\n}\n\nfunction getDeepChildren(component, callback) {\n    component.children.forEach(child => {\n        callback(child)\n\n        getDeepChildren(child, callback)\n    })\n}\n", "import { on } from '@/hooks'\n\non('commit', ({ succeed }) => {\n    succeed(({ effects }) => {\n        let download = effects.download\n\n        if (! download) return\n\n        // We need to use window.webkitURL so downloads work on iOS Safari.\n        let urlObject = window.webkitURL || window.URL\n\n        let url = urlObject.createObjectURL(\n            base64toBlob(download.content, download.contentType)\n        )\n\n        let invisibleLink = document.createElement('a')\n\n        invisibleLink.style.display = 'none'\n        invisibleLink.href = url\n        invisibleLink.download = download.name\n\n        document.body.appendChild(invisibleLink)\n\n        invisibleLink.click()\n\n        setTimeout(function() {\n            urlObject.revokeObjectURL(url)\n        }, 0);\n    })\n})\n\nfunction base64toBlob(b64Data, contentType = '', sliceSize = 512) {\n    const byteCharacters = atob(b64Data)\n    const byteArrays = []\n\n    if (contentType === null) contentType = ''\n\n    for (let offset = 0; offset < byteCharacters.length; offset += sliceSize) {\n        let slice = byteCharacters.slice(offset, offset + sliceSize)\n\n        let byteNumbers = new Array(slice.length)\n\n        for (let i = 0; i < slice.length; i++) {\n            byteNumbers[i] = slice.charCodeAt(i)\n        }\n\n        let byteArray = new Uint8Array(byteNumbers)\n\n        byteArrays.push(byteArray)\n    }\n\n    return new Blob(byteArrays, { type: contentType });\n}\n", "import { on } from '@/hooks'\n\nlet componentsThatWantToBeBundled = new WeakSet\n\nlet componentsThatAreLazy = new WeakSet\n\non('component.init', ({ component }) => {\n    let memo = component.snapshot.memo\n\n    // We only care about lazy components...\n    if (memo.lazyLoaded === undefined) return\n\n    componentsThatAreLazy.add(component)\n\n    // The component doesn't want its lazy load to be an isolated request\n    // then we'll mark it to detect at \"pool\" time to make sure it gets bundled...\n    if (memo.lazyIsolated !== undefined && memo.lazyIsolated === false) {\n        componentsThatWantToBeBundled.add(component)\n    }\n})\n\non('commit.pooling', ({ commits }) => {\n    commits.forEach(commit => {\n        // We only care about lazy components...\n        if (! componentsThatAreLazy.has(commit.component)) return\n\n        if (componentsThatWantToBeBundled.has(commit.component)) {\n            commit.isolate = false\n\n            componentsThatWantToBeBundled.delete(commit.component)\n        } else {\n            commit.isolate = true\n        }\n\n        // Component is no longer lazy after the first full request, so remove it...\n        componentsThatAreLazy.delete(commit.component)\n    })\n})\n", "import { on } from '@/hooks'\nimport { dataGet } from '@/utils'\nimport Alpine from 'alpinejs'\nimport { track } from '@/plugins/history'\n\non('effect', ({ component, effects, cleanup }) => {\n    let queryString = effects['url']\n\n    if (! queryString) return\n\n    Object.entries(queryString).forEach(([key, value]) => {\n        let { name, as, use, alwaysShow, except } = normalizeQueryStringEntry(key, value)\n\n        if (! as) as = name\n\n        let initialValue = [false, null, undefined].includes(except) ? dataGet(component.ephemeral, name) : except\n\n        let { replace, push, pop } = track(as, initialValue, alwaysShow, except)\n\n        if (use === 'replace') {\n            let effectReference = Alpine.effect(() => {\n                replace(dataGet(component.reactive, name))\n            })\n\n            cleanup(() => Alpine.release(effectReference))\n        } else if (use === 'push') {\n            let forgetCommitHandler = on('commit', ({ component: commitComponent, succeed }) => {\n                if (component !== commitComponent) return\n\n                let beforeValue = dataGet(component.canonical, name)\n\n                succeed(() => {\n                    let afterValue = dataGet(component.canonical, name)\n\n                    if (JSON.stringify(beforeValue) === JSON.stringify(afterValue)) return\n\n                    push(afterValue)\n                })\n            })\n\n            let forgetPopHandler = pop(async newValue => {\n                await component.$wire.set(name, newValue)\n\n                // @todo: this is the absolute worst thing ever I'm so sorry this needs to be refactored stat:\n                document.querySelectorAll('input').forEach(el => {\n                    el._x_forceModelUpdate && el._x_forceModelUpdate(el._x_model.get())\n                })\n            })\n\n            cleanup(() => {\n                forgetCommitHandler()\n                forgetPopHandler()\n            })\n        }\n    })\n})\n\nfunction normalizeQueryStringEntry(key, value) {\n    let defaults = { use: 'replace', alwaysShow: false }\n\n    if (typeof value === 'string') {\n        return {...defaults, name: value, as: value }\n    } else {\n        let fullerDefaults = {...defaults, name: key, as: key }\n\n        return {...fullerDefaults, ...value }\n    }\n}\n", "import { on } from '@/hooks'\nimport { dispatchSelf } from '@/events'\n\non('request', ({ options }) => {\n    if (window.Echo) {\n        options.headers['X-Socket-ID'] = window.Echo.socketId()\n    }\n})\n\non('effect', ({ component, effects }) => {\n    let listeners = effects.listeners || []\n\n    listeners.forEach(event => {\n        if (event.startsWith('echo')) {\n            if (typeof window.Echo === 'undefined') {\n                console.warn('Laravel Echo cannot be found')\n\n                return\n            }\n\n            let event_parts = event.split(/(echo:|echo-)|:|,/)\n\n            if (event_parts[1] == 'echo:') {\n                event_parts.splice(2, 0, 'channel', undefined)\n            }\n\n            if (event_parts[2] == 'notification') {\n                event_parts.push(undefined, undefined)\n            }\n\n            let [\n                s1,\n                signature,\n                channel_type,\n                s2,\n                channel,\n                s3,\n                event_name,\n            ] = event_parts\n\n            if (['channel', 'private', 'encryptedPrivate'].includes(channel_type)) {\n                let handler = e => dispatchSelf(component, event, [e])\n\n                window.Echo[channel_type](channel).listen(event_name, handler)\n\n                component.addCleanup(() => {\n                    window.Echo[channel_type](channel).stopListening(event_name, handler)\n                })\n            } else if (channel_type == 'presence') {\n                if (['here', 'joining', 'leaving'].includes(event_name)) {\n                    window.Echo.join(channel)[event_name](e => {\n                        dispatchSelf(component, event, [e])\n                    })\n\n                    // @todo: add listener cleanup...\n                } else{\n                    let handler = e => dispatchSelf(component, event, [e])\n\n                    window.Echo.join(channel).listen(event_name, handler)\n\n                    component.addCleanup(() => {\n                        window.Echo.leaveChannel(channel)\n                    })\n                }\n            } else if (channel_type == 'notification') {\n                window.Echo.private(channel).notification(notification => {\n                    dispatchSelf(component, event, [notification])\n                })\n\n                // @todo: add listener cleanup...\n            } else {\n                console.warn('Echo channel type not yet supported')\n            }\n        }\n    })\n})\n", "import { on } from '@/hooks'\n\nlet componentsThatAreIsolated = new WeakSet\n\non('component.init', ({ component }) => {\n    let memo = component.snapshot.memo\n\n    // We only care about isolated components...\n    if (memo.isolate !== true) return\n\n    componentsThatAreIsolated.add(component)\n})\n\non('commit.pooling', ({ commits }) => {\n    commits.forEach(commit => {\n        // We only care about isolated components...\n        if (! componentsThatAreIsolated.has(commit.component)) return\n\n        commit.isolate = true\n    })\n})\n", "\nshouldHideProgressBar() && Alpine.navigate.disableProgressBar()\n\ndocument.addEventListener('alpine:navigate', e => forwardEvent('livewire:navigate', e))\ndocument.addEventListener('alpine:navigating', e => forwardEvent('livewire:navigating', e))\ndocument.addEventListener('alpine:navigated', e => forwardEvent('livewire:navigated', e))\n\nfunction forwardEvent(name, original) {\n    let event = new CustomEvent(name, { cancelable: true, bubbles: true, detail: original.detail })\n\n    document.dispatchEvent(event)\n\n    if (event.defaultPrevented) {\n        original.preventDefault()\n    }\n}\n\nexport function shouldRedirectUsingNavigateOr(effects, url, or) {\n    let forceNavigate = effects.redirectUsingNavigate\n\n    if (forceNavigate) {\n        Alpine.navigate(url)\n    } else {\n        or()\n    }\n}\n\nfunction shouldHideProgressBar() {\n    if (!! document.querySelector('[data-no-progress-bar]')) return true\n\n    if (window.livewireScriptConfig && window.livewireScriptConfig.progressBar === false) return true\n\n    return false\n}\n", "import { on } from \"@/hooks\"\nimport { shouldRedirectUsingNavigateOr } from \"./supportNavigate\"\n\non('effect', ({ effects }) => {\n    if (! effects['redirect']) return\n\n    let url = effects['redirect']\n\n    shouldRedirectUsingNavigateOr(effects, url, () => {\n        window.location.href = url\n    })\n})\n", "import { directive } from \"@/directives\"\nimport { on } from '@/hooks'\nimport Alpine from 'alpinejs'\n\non('morph.added', ({ el }) => {\n    el.__addedByMorph = true\n})\n\ndirective('transition', ({ el, directive, component, cleanup }) => {\n    let visibility = Alpine.reactive({ state: el.__addedByMorph ? false : true })\n\n    // We're going to control the element's transition with Alpine transitions...\n    Alpine.bind(el, {\n        [directive.rawName.replace('wire:', 'x-')]: '',\n        'x-show'() { return visibility.state },\n    })\n\n    // If it's not the initial page load, transition the element in...\n    el.__addedByMorph && setTimeout(() => visibility.state = true)\n\n    let cleanups = []\n\n    cleanups.push(on('morph.removing', ({ el, skip }) => {\n        // Here we interupt morphdom from removing an element...\n        skip()\n\n        // When the transition ends...\n        el.addEventListener('transitionend', () => {\n            // We can actually remove the element and all the listeners along with it...\n            el.remove()\n        })\n\n        // Now we can trigger a transition:\n        visibility.state = false\n\n        cleanups.push(on('morph', ({ component: morphComponent }) => {\n            if (morphComponent !== component) return\n\n            // While this element is transitioning out, a new morph is about to occur.\n            // Let's expidite this one and clean it up so it doesn't interfere...\n            el.remove()\n\n            cleanups.forEach(i => i())\n        }))\n    }))\n\n    cleanup(() => cleanups.forEach(i => i()))\n})\n\n\n\n", "import { WeakBag } from './utils'\n\nlet callbacksByComponent = new WeakBag\n\nexport function debounceByComponent(component, callback, time) {\n    // Prepare yourself for what's happening here.\n    // Any text input with wire:model on it should be \"debounced\" by ~150ms by default.\n    // We can't use a simple debounce function because we need a way to clear all the pending\n    // debounces if a user submits a form or performs some other action.\n    // This is a modified debounce function that acts just like a debounce, except it stores\n    // the pending callbacks in a global property so we can \"clear them\" on command instead\n    // of waiting for their setTimeouts to expire. I know.\n\n    // This is a \"null\" callback. Each wire:model will resister one of these upon initialization.\n    let callbackRegister = { callback: () => { } }\n    callbacksByComponent.add(component, callbackRegister)\n\n    // This is a normal \"timeout\" for a debounce function.\n    var timeout\n\n    return e => {\n        clearTimeout(timeout)\n\n        timeout = setTimeout(() => {\n            callback(e)\n            timeout = undefined\n\n            // Because we just called the callback, let's return the\n            // callback register to it's normal \"null\" state.\n            callbackRegister.callback = () => { }\n        }, time)\n\n        // Register the current callback in the register as a kind-of \"escape-hatch\".\n        callbackRegister.callback = () => {\n            clearTimeout(timeout)\n            callback(e)\n        }\n    }\n}\n\nexport function callAndClearComponentDebounces(component, callback) {\n    // This is to protect against the following scenario:\n    // A user is typing into a debounced input, and hits the enter key.\n    // If the enter key submits a form or something, the submission\n    // will happen BEFORE the model input finishes syncing because\n    // of the debounce. This makes sure to clear anything in the debounce queue.\n\n    callbacksByComponent.each(component, callbackRegister => {\n        callbackRegister.callback()\n        callbackRegister.callback = () => { }\n    })\n\n    callback()\n}\n", "import { callAndClearComponentDebounces } from '@/debounce'\nimport { customDirectiveHasBeenRegistered } from '@/directives'\nimport { on } from '@/hooks'\nimport Alpine from 'alpinejs'\n\non('directive.init', ({ el, directive, cleanup, component }) => {\n    if (['snapshot', 'effects', 'model', 'init', 'loading', 'poll', 'ignore', 'id', 'data', 'key', 'target', 'dirty'].includes(directive.value)) return\n    if (customDirectiveHasBeenRegistered(directive.value)) return\n\n    let attribute = directive.rawName.replace('wire:', 'x-on:')\n\n    // Automatically add .prevent to wire:submit, if they didn't add it themselves...\n    if (directive.value === 'submit' && ! directive.modifiers.includes('prevent')) {\n        attribute = attribute + '.prevent'\n    }\n\n    let cleanupBinding = Alpine.bind(el, {\n        [attribute](e) {\n            let execute = () => {\n                callAndClearComponentDebounces(component, () => {\n                    // Forward these calls directly to $wire. Let them handle firing the request.\n                    Alpine.evaluate(el, '$wire.'+directive.expression, { scope: { $event: e }})\n                })\n            }\n\n            // Account for the existance of wire:confirm=\"...\" on the action...\n            if (el.__livewire_confirm) {\n                el.__livewire_confirm(() => {\n                    execute()\n                }, () => {\n                    e.stopImmediatePropagation()\n                })\n            } else {\n                execute()\n            }\n        }\n    })\n\n    cleanup(cleanupBinding)\n})\n", "import Alpine from 'alpinejs'\n\nAlpine.addInitSelector(() => `[wire\\\\:navigate]`)\nAlpine.addInitSelector(() => `[wire\\\\:navigate\\\\.hover]`)\n\nAlpine.interceptInit(\n    Alpine.skipDuringClone(el => {\n        if (el.hasAttribute('wire:navigate')) {\n            Alpine.bind(el, { ['x-navigate']: true })\n        } else if (el.hasAttribute('wire:navigate.hover')) {\n            Alpine.bind(el, { ['x-navigate.hover']: true })\n        }\n    })\n)\n\ndocument.addEventListener('alpine:navigating', () => {\n    // Before navigating away, we'll inscribe the latest state of each component\n    // in their HTML so that upon return, they will have the latest state...\n    Livewire.all().forEach(component => {\n        component.inscribeSnapshotAndEffectsOnElement()\n    })\n})\n", "import { directive } from \"@/directives\"\n\ndirective('confirm', ({ el, directive }) => {\n    let message = directive.expression\n    let shouldPrompt = directive.modifiers.includes('prompt')\n\n    // Convert sanitized linebreaks (\"\\n\") to real line breaks...\n    message = message.replaceAll('\\\\n', '\\n')\n\n    if (message === '') message = 'Are you sure?'\n\n    el.__livewire_confirm = (action, instead) => {\n        if (shouldPrompt) {\n            let [question, expected] = message.split('|')\n\n            if (! expected) {\n                console.warn('Livewire: Must provide expectation with wire:confirm.prompt')\n            } else {\n                let input = prompt(question)\n\n                if (input === expected) {\n                    action()\n                } else {\n                    instead()\n                }\n            }\n        } else {\n            if (confirm(message)) action()\n            else instead()\n        }\n    }\n})\n", "import { globalDirective } from \"@/directives\"\nimport Alpine from 'alpinejs'\n\nAlpine.addInitSelector(() => `[wire\\\\:current]`)\n\nlet onPageChanges = new Map\n\ndocument.addEventListener('livewire:navigated', () => {\n    onPageChanges.forEach(i => i(new URL(window.location.href)))\n})\n\nglobalDirective('current', ({ el, directive, cleanup }) => {\n    let expression = directive.expression\n\n    let options = {\n        exact: directive.modifiers.includes('exact'),\n        strict: directive.modifiers.includes('strict'),\n    }\n\n    // Fragment hrefs aren't supported as of yet...\n    if (expression.startsWith('#')) return\n\n    // If there is no href, let's not do anything...\n    if (! el.hasAttribute('href')) return\n\n    let href = el.getAttribute('href')\n\n    let hrefUrl = new URL(href, window.location.href)\n\n    let classes = expression.split(' ').filter(String)\n\n    let refreshCurrent = url => {\n        if (pathMatches(hrefUrl, url, options)) {\n            el.classList.add(...classes)\n        } else {\n            el.classList.remove(...classes)\n        }\n    }\n\n    refreshCurrent(new URL(window.location.href))\n\n    onPageChanges.set(el, refreshCurrent)\n\n    cleanup(() => onPageChanges.delete(el))\n})\n\nfunction pathMatches(hrefUrl, actualUrl, options) {\n    // If the domains/hostnames don't match, we are not going to match...\n    if (hrefUrl.hostname !== actualUrl.hostname) return false\n\n    // Remove trailing slashes for consistency (if not .strict)...\n    let hrefPath = options.strict ? hrefUrl.pathname : hrefUrl.pathname.replace(/\\/+$/, '')\n    let actualPath = options.strict ? actualUrl.pathname : actualUrl.pathname.replace(/\\/+$/, '')\n\n    if (options.exact) {\n        return hrefPath === actualPath\n    }\n\n    let hrefPathSegments = hrefPath.split('/')\n    let actualPathSegments = actualPath.split('/')\n\n\n    for (let i = 0; i < hrefPathSegments.length; i++) {\n        if (hrefPathSegments[i] !== actualPathSegments[i]) return false\n    }\n\n    return true\n}\n", "\nexport function toggleBooleanStateDirective(el, directive, isTruthy, cachedDisplay = null) {\n    isTruthy = directive.modifiers.includes('remove') ? ! isTruthy : isTruthy\n\n    if (directive.modifiers.includes('class')) {\n        let classes = directive.expression.split(' ').filter(String)\n\n        if (isTruthy) {\n            el.classList.add(...classes)\n        } else {\n            el.classList.remove(...classes)\n        }\n    } else if (directive.modifiers.includes('attr')) {\n        if (isTruthy) {\n            el.setAttribute(directive.expression, true)\n        } else {\n            el.removeAttribute(directive.expression)\n        }\n    } else {\n        let cache = cachedDisplay ?? window\n            .getComputedStyle(el, null)\n            .getPropertyValue('display')\n\n        let display = (['inline', 'block', 'table', 'flex', 'grid', 'inline-flex']\n            .filter(i => directive.modifiers.includes(i))[0] || 'inline-block')\n\n        // If element is to be removed, set display to its current value...\n        // display = (directive.modifiers.includes('remove') && ! isTruthy)\n        display = (directive.modifiers.includes('remove') && ! isTruthy)\n            ? cache : display\n\n        el.style.display = isTruthy ? display : 'none'\n    }\n}\n", "import { toggleBooleanStateDirective } from './shared'\nimport { directive } from '@/directives'\n\nlet offlineHandlers = new Set\nlet onlineHandlers = new Set\n\nwindow.addEventListener('offline', () => offlineHandlers.forEach(i => i()))\nwindow.addEventListener('online', () => onlineHandlers.forEach(i => i()))\n\ndirective('offline', ({ el, directive, cleanup }) => {\n    let setOffline = () => toggleBooleanStateDirective(el, directive, true)\n    let setOnline = () => toggleBooleanStateDirective(el, directive, false)\n\n    offlineHandlers.add(setOffline)\n    onlineHandlers.add(setOnline)\n\n    cleanup(() => {\n        offlineHandlers.delete(setOffline)\n        onlineHandlers.delete(setOnline)\n    })\n})\n", "import { toggleBooleanStateDirective } from './shared'\nimport { directive, getDirectives } from \"@/directives\"\nimport { on } from '@/hooks'\nimport { listen } from '@/utils'\n\ndirective('loading', ({ el, directive, component, cleanup }) => {\n    let { targets, inverted } = getTargets(el)\n\n    let [delay, abortDelay] = applyDelay(directive)\n\n    let cleanupA = whenTargetsArePartOfRequest(component, targets, inverted, [\n        () => delay(() => toggleBooleanStateDirective(el, directive, true)),\n        () => abortDelay(() => toggleBooleanStateDirective(el, directive, false)),\n    ])\n\n    let cleanupB = whenTargetsArePartOfFileUpload(component, targets, [\n        () => delay(() => toggleBooleanStateDirective(el, directive, true)),\n        () => abortDelay(() => toggleBooleanStateDirective(el, directive, false)),\n    ])\n\n    cleanup(() => {\n        cleanupA()\n        cleanupB()\n    })\n})\n\nfunction applyDelay(directive) {\n    if (! directive.modifiers.includes('delay') || directive.modifiers.includes('none')) return [i => i(), i => i()]\n\n    let duration = 200\n\n    let delayModifiers = {\n        'shortest': 50,\n        'shorter': 100,\n        'short': 150,\n        'default': 200,\n        'long': 300,\n        'longer': 500,\n        'longest': 1000,\n    }\n\n    Object.keys(delayModifiers).some(key => {\n        if (directive.modifiers.includes(key)) {\n            duration = delayModifiers[key]\n\n            return true\n        }\n    })\n\n    let timeout\n    let started = false\n\n    return [\n        (callback) => { // Initiate delay...\n            timeout = setTimeout(() => {\n                callback()\n\n                started = true\n            }, duration)\n        },\n        async (callback) => { // Execute or abort...\n            if (started) {\n                await callback()\n                started = false\n            } else {\n                clearTimeout(timeout)\n            }\n        },\n    ]\n}\n\nfunction whenTargetsArePartOfRequest(component, targets, inverted, [ startLoading, endLoading ]) {\n    return on('commit', ({ component: iComponent, commit: payload, respond }) => {\n        if (iComponent !== component) return\n\n        if (targets.length > 0 && containsTargets(payload, targets) === inverted) return\n\n        startLoading()\n\n        respond(() => {\n            endLoading()\n        })\n    })\n}\n\nfunction whenTargetsArePartOfFileUpload(component, targets, [ startLoading, endLoading ]) {\n    let eventMismatch = e => {\n        let { id, property } = e.detail\n\n        if (id !== component.id) return true\n        if (targets.length > 0 && ! targets.map(i => i.target).includes(property)) return true\n\n        return false\n    }\n\n    let cleanupA = listen(window, 'livewire-upload-start', e => {\n        if (eventMismatch(e)) return\n\n        startLoading()\n    })\n\n    let cleanupB = listen(window, 'livewire-upload-finish', e => {\n        if (eventMismatch(e)) return\n\n        endLoading()\n    })\n\n    let cleanupC = listen(window, 'livewire-upload-error', e => {\n        if (eventMismatch(e)) return\n\n        endLoading()\n    })\n\n    return () => {\n        cleanupA()\n        cleanupB()\n        cleanupC()\n    }\n}\n\nfunction containsTargets(payload, targets) {\n    let { updates, calls } = payload\n\n    return targets.some(({ target, params }) => {\n        if (params) {\n            return calls.some(({ method, params: methodParams }) => {\n                return target === method\n                    && params === quickHash(JSON.stringify(methodParams))\n            })\n        }\n\n        let hasMatchingUpdate = Object.keys(updates).some(property => {\n            // If the property is nested, like `foo.bar`, we need to check if the root `foo` is the target.\n            if (property.includes('.')) {\n                let propertyRoot = property.split('.')[0]\n\n                if (propertyRoot === target) return true\n            }\n\n            return property === target\n        })\n\n        if (hasMatchingUpdate) return true\n\n        if (calls.map(i => i.method).includes(target)) return true\n    })\n}\n\nfunction getTargets(el) {\n    let directives = getDirectives(el)\n\n    let targets = []\n\n    let inverted = false\n\n    if (directives.has('target')) {\n        let directive = directives.get('target')\n\n        let raw = directive.expression\n\n        if (directive.modifiers.includes(\"except\")) inverted = true\n\n        if (raw.includes('(') && raw.includes(')')) {\n            targets.push({ target: directive.method, params: quickHash(JSON.stringify(directive.params)) })\n        } else if (raw.includes(',')) {\n            raw.split(',').map(i => i.trim()).forEach(target => {\n                targets.push({ target })\n            })\n        } else {\n            targets.push({ target: raw })\n        }\n    } else {\n        // If there is no wire:target, let's check for the existance of a wire:click=\"foo\" or something,\n        // and automatically scope this loading directive to that action.\n        let nonActionOrModelLivewireDirectives = [ 'init', 'dirty', 'offline', 'target', 'loading', 'poll', 'ignore', 'key', 'id' ]\n\n        directives\n            .all()\n            .filter(i => ! nonActionOrModelLivewireDirectives.includes(i.value))\n            .map(i => i.expression.split('(')[0])\n            .forEach(target => targets.push({ target }))\n    }\n\n    return { targets, inverted }\n}\n\nfunction quickHash(subject) {\n    return btoa(encodeURIComponent(subject))\n}\n", "import { contentIsFromDump } from '@/utils'\nimport { directive } from '@/directives'\nimport { on, trigger } from '@/hooks'\n\ndirective('stream', ({el, directive, cleanup }) => {\n    let { expression, modifiers } = directive\n\n    let off = on('stream', ({ name, content, replace }) => {\n        if (name !== expression) return\n\n        if (modifiers.includes('replace') || replace) {\n            el.innerHTML = content\n        } else {\n            el.innerHTML = el.innerHTML + content\n        }\n    })\n\n    cleanup(off)\n})\n\non('request', ({ respond }) => {\n    respond(mutableObject => {\n        let response = mutableObject.response\n\n        if (! response.headers.has('X-Livewire-Stream')) return\n\n        mutableObject.response = {\n            ok: true,\n            redirected: false,\n            status: 200,\n\n            async text() {\n                let finalResponse = await interceptStreamAndReturnFinalResponse(response, streamed => {\n                    trigger('stream', streamed)\n                })\n\n                if (contentIsFromDump(finalResponse)) {\n                    this.ok = false\n                }\n\n                return finalResponse\n            }\n        }\n    })\n})\n\nasync function interceptStreamAndReturnFinalResponse(response, callback) {\n    let reader = response.body.getReader()\n    let remainingResponse = ''\n\n    while (true) {\n        let { done, value: chunk } = await reader.read()\n\n        let decoder = new TextDecoder\n        let output = decoder.decode(chunk)\n\n        let [ streams, remaining ] = extractStreamObjects(remainingResponse + output)\n\n        streams.forEach(stream => {\n            callback(stream)\n        })\n\n        remainingResponse = remaining\n\n        if (done) return remainingResponse\n    }\n}\n\nfunction extractStreamObjects(raw) {\n    let regex = /({\"stream\":true.*?\"endStream\":true})/g\n\n    let matches = raw.match(regex)\n\n    let parsed = []\n\n    if (matches) {\n        for (let i = 0; i < matches.length; i++) {\n            parsed.push(JSON.parse(matches[i]).body)\n        }\n    }\n\n    let remaining = raw.replace(regex, '');\n\n    return [ parsed, remaining ];\n}\n", "import { directive } from \"@/directives\"\n\ndirective('replace', ({ el, directive }) => {\n    if (directive.modifiers.includes('self')) {\n        el.__livewire_replace_self = true\n    } else {\n        el.__livewire_replace = true\n    }\n})\n", "import { directive } from \"@/directives\"\n\ndirective('ignore', ({ el, directive }) => {\n    if (directive.modifiers.includes('self')) {\n        el.__livewire_ignore_self = true\n    } else {\n        el.__livewire_ignore = true\n    }\n})\n", "import { toggleBooleanStateDirective } from './shared'\nimport { directive, getDirectives } from '@/directives'\nimport { dataGet, WeakBag } from '@/utils'\nimport { on } from '@/hooks'\n\nlet refreshDirtyStatesByComponent = new WeakBag\n\non('commit', ({ component, succeed }) => {\n    succeed(() => {\n        setTimeout(() => { // Doing a \"setTimeout\" to let morphdom do its thing first...\n            refreshDirtyStatesByComponent.each(component, i => i(false))\n        })\n    })\n})\n\ndirective('dirty', ({ el, directive, component }) => {\n    let targets = dirtyTargets(el)\n\n    let dirty = Alpine.reactive({ state: false })\n\n    let oldIsDirty = false\n\n    let initialDisplay = el.style.display\n\n    let refreshDirtyState = (isDirty) => {\n        toggleBooleanStateDirective(el, directive, isDirty, initialDisplay)\n\n        oldIsDirty = isDirty\n    }\n\n    refreshDirtyStatesByComponent.add(component, refreshDirtyState)\n\n    Alpine.effect(() => {\n        let isDirty = false\n\n        if (targets.length === 0) {\n            isDirty = JSON.stringify(component.canonical) !== JSON.stringify(component.reactive)\n        } else {\n            for (let i = 0; i < targets.length; i++) {\n                if (isDirty) break;\n\n                let target = targets[i]\n\n                isDirty = JSON.stringify(dataGet(component.canonical, target)) !== JSON.stringify(dataGet(component.reactive, target))\n            }\n        }\n\n        if (oldIsDirty !== isDirty) {\n            refreshDirtyState(isDirty)\n        }\n\n        oldIsDirty = isDirty\n    })\n})\n\nfunction dirtyTargets(el) {\n    let directives = getDirectives(el)\n    let targets = []\n\n    if (directives.has('model')) {\n        targets.push(directives.get('model').expression)\n    }\n\n    if (directives.has('target')) {\n        targets = targets.concat(\n            directives\n            .get('target')\n            .expression.split(',')\n            .map(s => s.trim())\n        )\n    }\n\n    return targets\n}\n", "import { directive } from '@/directives'\nimport { handleFileUpload } from '@/features/supportFileUploads'\nimport { closestComponent } from '@/store'\nimport { dataGet, dataSet } from '@/utils'\nimport Alpine from 'alpinejs'\n\ndirective('model', ({ el, directive, component, cleanup }) => {\n    let { expression, modifiers } = directive\n\n    if (! expression) {\n        return console.warn('Livewire: [wire:model] is missing a value.', el)\n    }\n\n    if (componentIsMissingProperty(component, expression)) {\n        return console.warn('Livewire: [wire:model=\"'+expression+'\"] property does not exist on component: ['+component.name+']', el)\n    }\n\n    // Handle file uploads differently...\n    if (el.type && el.type.toLowerCase() === 'file') {\n        return handleFileUpload(el, expression, component, cleanup)\n    }\n\n    let isLive = modifiers.includes('live')\n    let isLazy = modifiers.includes('lazy') || modifiers.includes('change')\n    let onBlur = modifiers.includes('blur')\n    let isDebounced = modifiers.includes('debounce')\n\n    // Trigger a network request (only if .live or .lazy is added to wire:model)...\n    let update = expression.startsWith('$parent')\n        ? () => component.$wire.$parent.$commit()\n        : () => component.$wire.$commit()\n\n    // If a plain wire:model is added to a text input, debounce the\n    // trigerring of network requests.\n    let debouncedUpdate = isTextInput(el) && ! isDebounced && isLive\n        ? debounce(update, 150)\n        : update\n\n    Alpine.bind(el, {\n        ['@change']() {\n            isLazy && update()\n        },\n        ['@blur']() {\n            onBlur && update()\n        },\n        ['x-model' + getModifierTail(modifiers)]() {\n            return {\n                get() {\n                    return dataGet(component.$wire, expression)\n                },\n                set(value) {\n                    dataSet(component.$wire, expression, value)\n\n                    isLive && (! isLazy) && (! onBlur) && debouncedUpdate()\n                },\n            }\n        }\n    })\n})\n\nfunction getModifierTail(modifiers) {\n    modifiers = modifiers.filter(i => ! [\n        'lazy', 'defer'\n    ].includes(i))\n\n    if (modifiers.length === 0) return ''\n\n    return '.' + modifiers.join('.')\n}\n\nfunction isTextInput(el) {\n    return (\n        ['INPUT', 'TEXTAREA'].includes(el.tagName.toUpperCase()) &&\n        !['checkbox', 'radio'].includes(el.type)\n    )\n}\n\nfunction isDirty(subject, dirty) {\n    // Check for exact match: wire:model=\"bob\" in ['bob']\n    if (dirty.includes(subject)) return true\n\n    // Check case of parent: wire:model=\"bob.1\" in ['bob']\n    return dirty.some(i => subject.startsWith(i))\n}\n\nfunction componentIsMissingProperty(component, property) {\n    if (property.startsWith('$parent')) {\n        let parent = closestComponent(component.el.parentElement, false)\n\n        if (! parent) return true\n\n        return componentIsMissingProperty(parent, property.split('$parent.')[1])\n    }\n\n    let baseProperty = property.split('.')[0]\n\n    return ! Object.keys(component.canonical).includes(baseProperty)\n}\n\nfunction debounce(func, wait) {\n    var timeout;\n\n    return function() {\n      var context = this, args = arguments;\n\n      var later = function() {\n            timeout = null\n\n            func.apply(context, args)\n      }\n\n      clearTimeout(timeout)\n\n      timeout = setTimeout(later, wait)\n    }\n}\n", "import { directive } from \"@/directives\"\nimport Alpine from 'alpinejs'\n\ndirective('init', ({ el, directive }) => {\n    let fullMethod = directive.expression ?? '$refresh'\n\n    Alpine.evaluate(el, `$wire.${fullMethod}`)\n})\n\n", "import { directive, getDirectives } from \"@/directives\"\nimport Alpine from 'alpinejs'\n\ndirective('poll', ({ el, directive }) => {\n    let interval = extractDurationFrom(directive.modifiers, 2000)\n\n    let { start, pauseWhile, throttleWhile, stopWhen } = poll(() => {\n        triggerComponentRequest(el, directive)\n    }, interval)\n\n    start()\n\n    throttleWhile(() => theTabIsInTheBackground() && theDirectiveIsMissingKeepAlive(directive))\n    pauseWhile(() => theDirectiveHasVisible(directive) && theElementIsNotInTheViewport(el))\n    pauseWhile(() => theDirectiveIsOffTheElement(el))\n    pauseWhile(() => livewireIsOffline())\n    stopWhen(() => theElementIsDisconnected(el))\n})\n\nfunction triggerComponentRequest(el, directive) {\n    Alpine.evaluate(el,\n        directive.expression ? '$wire.' + directive.expression : '$wire.$commit()'\n    )\n}\n\nfunction poll(callback, interval = 2000) {\n    let pauseConditions = []\n    let throttleConditions = []\n    let stopConditions = []\n\n    return {\n        start() {\n            let clear = syncronizedInterval(interval, () => {\n                if (stopConditions.some(i => i())) return clear()\n                if (pauseConditions.some(i => i())) return\n                if (throttleConditions.some(i => i()) && Math.random() < .95) return\n\n                callback()\n            })\n        },\n        pauseWhile(condition) {\n            pauseConditions.push(condition)\n        },\n        throttleWhile(condition) {\n            throttleConditions.push(condition)\n        },\n        stopWhen(condition) {\n            stopConditions.push(condition)\n        }\n    }\n}\n\nlet clocks = []\n\nfunction syncronizedInterval(ms, callback) {\n    if (! clocks[ms]) {\n        let clock = {\n            timer: setInterval(() => clock.callbacks.forEach(i => i()), ms),\n            callbacks: new Set,\n        }\n\n        clocks[ms] = clock\n    }\n\n    clocks[ms].callbacks.add(callback)\n\n    return () => {\n        clocks[ms].callbacks.delete(callback)\n\n        if (clocks[ms].callbacks.size === 0) {\n            clearInterval(clocks[ms].timer)\n            delete clocks[ms]\n        }\n    }\n}\n\nlet isOffline = false\n\nwindow.addEventListener('offline', () => isOffline = true)\nwindow.addEventListener('online', () => isOffline = false)\n\nfunction livewireIsOffline() {\n    return isOffline\n}\n\nlet inBackground = false\n\ndocument.addEventListener('visibilitychange', () => { inBackground = document.hidden }, false)\n\nfunction theTabIsInTheBackground() {\n    return inBackground\n}\n\nfunction theDirectiveIsOffTheElement(el) {\n    return ! getDirectives(el).has('poll')\n}\n\nfunction theDirectiveIsMissingKeepAlive(directive) {\n    return ! directive.modifiers.includes('keep-alive')\n}\n\nfunction theDirectiveHasVisible(directive) {\n    return directive.modifiers.includes('visible')\n}\n\nfunction theElementIsNotInTheViewport(el) {\n    let bounding = el.getBoundingClientRect()\n\n    return ! (\n        bounding.top < (window.innerHeight || document.documentElement.clientHeight) &&\n        bounding.left < (window.innerWidth || document.documentElement.clientWidth) &&\n        bounding.bottom > 0 &&\n        bounding.right > 0\n    )\n}\n\nfunction theElementIsDisconnected(el) {\n    return el.isConnected === false\n}\n\nfunction extractDurationFrom(modifiers, defaultDuration) {\n    let durationInMilliSeconds\n    let durationInMilliSecondsString = modifiers.find(mod => mod.match(/([0-9]+)ms/))\n    let durationInSecondsString = modifiers.find(mod => mod.match(/([0-9]+)s/))\n\n    if (durationInMilliSecondsString) {\n        durationInMilliSeconds = Number(durationInMilliSecondsString.replace('ms', ''))\n    } else if (durationInSecondsString) {\n        durationInMilliSeconds = Number(durationInSecondsString.replace('s', '')) * 1000\n    }\n\n    return durationInMilliSeconds || defaultDuration\n}\n", "import { dispatchGlobal as dispatch, dispatchTo, on } from './events'\nimport { find, first, getByName, all } from './store'\nimport { start } from './lifecycle'\nimport { on as hook, trigger, triggerAsync } from './hooks'\nimport { directive } from './directives'\nimport Alpine from 'alpinejs'\n\nlet Livewire = {\n    directive,\n    dispatchTo,\n    start,\n    first,\n    find,\n    getByName,\n    all,\n    hook,\n    trigger,\n    triggerAsync,\n    dispatch,\n    on,\n    get navigate() {\n        return Alpine.navigate\n    }\n}\n\nlet warnAboutMultipleInstancesOf = entity => console.warn(`Detected multiple instances of ${entity} running`)\n\nif (window.Livewire) warnAboutMultipleInstancesOf('Livewire')\nif (window.Alpine) warnAboutMultipleInstancesOf('Alpine')\n\n// Register features...\nimport './features/index'\n\n// Register directives...\nimport './directives/index'\n\n// Make globals...\nwindow.Livewire = Livewire\nwindow.Alpine = Alpine\n\nif (window.livewireScriptConfig === undefined) {\n    window.Alpine.__fromLivewire = true\n\n    document.addEventListener('DOMContentLoaded', () => {\n        if (window.Alpine.__fromLivewire === undefined) {\n            // If this is undefined, we know that an outside Alpine bundle\n            // has been included on the page and will cause problems...\n            warnAboutMultipleInstancesOf('Alpine')\n        }\n\n        // Start Livewire...\n        Livewire.start()\n    })\n}\n\nexport { Livewire, Alpine }\n"],
+  "mappings": "giBAAA,oBAGC,AAAC,UAAS,EAAM,EAAS,CAExB,AAAI,MAAO,SAAW,YAAc,OAAO,IACzC,OAAO,CAAO,EACT,AAAI,MAAO,KAAY,SAC5B,GAAO,QAAU,EAAQ,EAEzB,EAAK,UAAY,EAAQ,CAG7B,GAAG,GAAM,UAAW,CAClB,GAAI,GAAY,CAAC,EAEjB,EAAU,QAAU,QAEpB,GAAI,GAAW,EAAU,SAAW,CAClC,QAAS,IACT,OAAQ,OACR,cAAe,GACf,MAAO,IACP,QAAS,GACT,YAAa,IACb,aAAc,IACd,YAAa,GACb,YAAa,eACb,gBAAiB,mBACjB,OAAQ,OACR,SAAU,qIACZ,EASA,EAAU,UAAY,SAAS,EAAS,CACtC,GAAI,GAAK,EACT,IAAK,IAAO,GACV,EAAQ,EAAQ,GACZ,IAAU,QAAa,EAAQ,eAAe,CAAG,GAAG,GAAS,GAAO,GAG1E,MAAO,KACT,EAMA,EAAU,OAAS,KASnB,EAAU,IAAM,SAAS,EAAG,CAC1B,GAAI,GAAU,EAAU,UAAU,EAElC,EAAI,EAAM,EAAG,EAAS,QAAS,CAAC,EAChC,EAAU,OAAU,IAAM,EAAI,KAAO,EAErC,GAAI,GAAW,EAAU,OAAO,CAAC,CAAO,EACpC,EAAW,EAAS,cAAc,EAAS,WAAW,EACtD,EAAW,EAAS,MACpB,EAAW,EAAS,OAExB,SAAS,YAET,EAAM,SAAS,EAAM,CAEnB,AAAI,EAAS,gBAAkB,IAAI,GAAS,cAAgB,EAAU,kBAAkB,GAGxF,EAAI,EAAK,EAAe,EAAG,EAAO,CAAI,CAAC,EAEvC,AAAI,IAAM,EAER,GAAI,EAAU,CACZ,WAAY,OACZ,QAAS,CACX,CAAC,EACD,EAAS,YAET,WAAW,UAAW,CACpB,EAAI,EAAU,CACZ,WAAY,OAAS,EAAQ,YAC7B,QAAS,CACX,CAAC,EACD,WAAW,UAAW,CACpB,EAAU,OAAO,EACjB,EAAK,CACP,EAAG,CAAK,CACV,EAAG,CAAK,GAER,WAAW,EAAM,CAAK,CAE1B,CAAC,EAEM,IACT,EAEA,EAAU,UAAY,UAAW,CAC/B,MAAO,OAAO,GAAU,QAAW,QACrC,EASA,EAAU,MAAQ,UAAW,CAC3B,AAAK,EAAU,QAAQ,EAAU,IAAI,CAAC,EAEtC,GAAI,GAAO,UAAW,CACpB,WAAW,UAAW,CACpB,AAAI,CAAC,EAAU,QACf,GAAU,QAAQ,EAClB,EAAK,EACP,EAAG,EAAS,YAAY,CAC1B,EAEA,MAAI,GAAS,SAAS,EAAK,EAEpB,IACT,EAcA,EAAU,KAAO,SAAS,EAAO,CAC/B,MAAI,CAAC,GAAS,CAAC,EAAU,OAAe,KAEjC,EAAU,IAAI,GAAM,GAAM,KAAK,OAAO,CAAC,EAAE,IAAI,CAAC,CACvD,EAMA,EAAU,IAAM,SAAS,EAAQ,CAC/B,GAAI,GAAI,EAAU,OAElB,MAAK,GAGC,OAAO,IAAW,UACpB,GAAU,GAAI,GAAK,EAAM,KAAK,OAAO,EAAI,EAAG,GAAK,GAAI,GAGvD,EAAI,EAAM,EAAI,EAAQ,EAAG,IAAK,EACvB,EAAU,IAAI,CAAC,GAPf,EAAU,MAAM,CAS3B,EAEA,EAAU,QAAU,UAAW,CAC7B,MAAO,GAAU,IAAI,KAAK,OAAO,EAAI,EAAS,WAAW,CAC3D,EAQC,UAAW,CACV,GAAI,GAAU,EAAG,EAAU,EAE3B,EAAU,QAAU,SAAS,EAAU,CACrC,MAAI,CAAC,GAAY,EAAS,MAAM,IAAM,WAC7B,KAGL,KAAY,GACd,EAAU,MAAM,EAGlB,IACA,IAEA,EAAS,OAAO,UAAW,CACzB,IACA,AAAI,IAAY,EACZ,GAAU,EACV,EAAU,KAAK,GAEf,EAAU,IAAK,GAAU,GAAW,CAAO,CAEjD,CAAC,EAEM,KACT,CAEF,EAAG,EAOH,EAAU,OAAS,SAAS,EAAW,CACrC,GAAI,EAAU,WAAW,EAAG,MAAO,UAAS,eAAe,WAAW,EAEtE,EAAS,SAAS,gBAAiB,gBAAgB,EAEnD,GAAI,GAAW,SAAS,cAAc,KAAK,EAC3C,EAAS,GAAK,YACd,EAAS,UAAY,EAAS,SAE9B,GAAI,GAAW,EAAS,cAAc,EAAS,WAAW,EACtD,EAAW,EAAY,OAAS,EAAU,EAAU,QAAU,CAAC,EAC/D,EAAW,SAAS,cAAc,EAAS,MAAM,EACjD,EAEJ,SAAI,EAAK,CACP,WAAY,eACZ,UAAW,eAAiB,EAAO,QACrC,CAAC,EAEI,EAAS,aACZ,GAAU,EAAS,cAAc,EAAS,eAAe,EACzD,GAAW,EAAc,CAAO,GAG9B,GAAU,SAAS,MACrB,EAAS,EAAQ,yBAAyB,EAG5C,EAAO,YAAY,CAAQ,EACpB,CACT,EAMA,EAAU,OAAS,UAAW,CAC5B,EAAY,SAAS,gBAAiB,gBAAgB,EACtD,EAAY,SAAS,cAAc,EAAS,MAAM,EAAG,yBAAyB,EAC9E,GAAI,GAAW,SAAS,eAAe,WAAW,EAClD,GAAY,EAAc,CAAQ,CACpC,EAMA,EAAU,WAAa,UAAW,CAChC,MAAO,CAAC,CAAC,SAAS,eAAe,WAAW,CAC9C,EAMA,EAAU,kBAAoB,UAAW,CAEvC,GAAI,GAAY,SAAS,KAAK,MAG1B,EAAgB,mBAAqB,GAAa,SAClC,gBAAkB,GAAa,MAC/B,eAAiB,GAAa,KAC9B,cAAgB,GAAa,IAAM,GAEvD,MAAI,GAAe,eAAiB,GAE3B,cACE,EAAe,aAAe,GAEhC,YAGA,QAEX,EAMA,WAAe,EAAG,EAAK,EAAK,CAC1B,MAAI,GAAI,EAAY,EAChB,EAAI,EAAY,EACb,CACT,CAOA,WAAmB,EAAG,CACpB,MAAQ,IAAK,GAAK,GACpB,CAQA,WAAwB,EAAG,EAAO,EAAM,CACtC,GAAI,GAEJ,MAAI,GAAS,gBAAkB,cAC7B,EAAS,CAAE,UAAW,eAAe,EAAU,CAAC,EAAE,QAAS,EACtD,AAAI,EAAS,gBAAkB,YACpC,EAAS,CAAE,UAAW,aAAa,EAAU,CAAC,EAAE,MAAO,EAEvD,EAAS,CAAE,cAAe,EAAU,CAAC,EAAE,GAAI,EAG7C,EAAO,WAAa,OAAO,EAAM,MAAM,EAEhC,CACT,CAMA,GAAI,GAAS,UAAW,CACtB,GAAI,GAAU,CAAC,EAEf,YAAgB,CACd,GAAI,GAAK,EAAQ,MAAM,EACvB,AAAI,GACF,EAAG,CAAI,CAEX,CAEA,MAAO,UAAS,EAAI,CAClB,EAAQ,KAAK,CAAE,EACX,EAAQ,QAAU,GAAG,EAAK,CAChC,CACF,EAAG,EAUC,EAAO,UAAW,CACpB,GAAI,GAAc,CAAE,SAAU,IAAK,MAAO,IAAK,EAC3C,EAAc,CAAC,EAEnB,WAAmB,EAAQ,CACzB,MAAO,GAAO,QAAQ,QAAS,KAAK,EAAE,QAAQ,eAAgB,SAAS,EAAO,EAAQ,CACpF,MAAO,GAAO,YAAY,CAC5B,CAAC,CACH,CAEA,WAAuB,EAAM,CAC3B,GAAI,GAAQ,SAAS,KAAK,MAC1B,GAAI,IAAQ,GAAO,MAAO,GAK1B,OAHI,GAAI,EAAY,OAChB,EAAU,EAAK,OAAO,CAAC,EAAE,YAAY,EAAI,EAAK,MAAM,CAAC,EACrD,EACG,KAEL,GADA,EAAa,EAAY,GAAK,EAC1B,IAAc,GAAO,MAAO,GAGlC,MAAO,EACT,CAEA,WAAsB,EAAM,CAC1B,SAAO,EAAU,CAAI,EACd,EAAS,IAAU,GAAS,GAAQ,EAAc,CAAI,EAC/D,CAEA,WAAkB,EAAS,EAAM,EAAO,CACtC,EAAO,EAAa,CAAI,EACxB,EAAQ,MAAM,GAAQ,CACxB,CAEA,MAAO,UAAS,EAAS,EAAY,CACnC,GAAI,GAAO,UACP,EACA,EAEJ,GAAI,EAAK,QAAU,EACjB,IAAK,IAAQ,GACX,EAAQ,EAAW,GACf,IAAU,QAAa,EAAW,eAAe,CAAI,GAAG,EAAS,EAAS,EAAM,CAAK,MAG3F,GAAS,EAAS,EAAK,GAAI,EAAK,EAAE,CAEtC,CACF,EAAG,EAMH,WAAkB,EAAS,EAAM,CAC/B,GAAI,GAAO,MAAO,IAAW,SAAW,EAAU,EAAU,CAAO,EACnE,MAAO,GAAK,QAAQ,IAAM,EAAO,GAAG,GAAK,CAC3C,CAMA,WAAkB,EAAS,EAAM,CAC/B,GAAI,GAAU,EAAU,CAAO,EAC3B,EAAU,EAAU,EAExB,AAAI,EAAS,EAAS,CAAI,GAG1B,GAAQ,UAAY,EAAQ,UAAU,CAAC,EACzC,CAMA,WAAqB,EAAS,EAAM,CAClC,GAAI,GAAU,EAAU,CAAO,EAC3B,EAEJ,AAAI,CAAC,EAAS,EAAS,CAAI,GAG3B,GAAU,EAAQ,QAAQ,IAAM,EAAO,IAAK,GAAG,EAG/C,EAAQ,UAAY,EAAQ,UAAU,EAAG,EAAQ,OAAS,CAAC,EAC7D,CAQA,WAAmB,EAAS,CAC1B,MAAQ,KAAO,GAAQ,WAAa,IAAM,KAAK,QAAQ,QAAS,GAAG,CACrE,CAMA,WAAuB,EAAS,CAC9B,GAAW,EAAQ,YAAc,EAAQ,WAAW,YAAY,CAAO,CACzE,CAEA,MAAO,EACT,CAAC,ICzdM,GAAM,IAAN,KAAU,CACb,aAAc,CAAE,KAAK,OAAS,CAAC,CAAE,CAEjC,IAAI,EAAK,EAAO,CACZ,AAAM,KAAK,OAAO,IAAM,MAAK,OAAO,GAAO,CAAC,GAC5C,KAAK,OAAO,GAAK,KAAK,CAAK,CAC/B,CAEA,OAAO,EAAK,CACR,AAAI,KAAK,OAAO,IAAM,MAAO,MAAK,OAAO,EAC7C,CAEA,IAAI,EAAK,CAAE,MAAO,MAAK,OAAO,IAAQ,CAAC,CAAE,CAEzC,KAAK,EAAK,EAAU,CAAE,MAAO,MAAK,IAAI,CAAG,EAAE,QAAQ,CAAQ,CAAE,CACjE,EAEa,GAAN,KAAc,CACjB,aAAc,CAAE,KAAK,OAAS,GAAI,QAAQ,CAE1C,IAAI,EAAK,EAAO,CACZ,AAAM,KAAK,OAAO,IAAI,CAAG,GAAG,KAAK,OAAO,IAAI,EAAK,CAAC,CAAC,EACnD,KAAK,OAAO,IAAI,CAAG,EAAE,KAAK,CAAK,CACnC,CAEA,OAAO,EAAK,CACR,AAAI,KAAK,OAAO,IAAI,CAAG,GAAG,KAAK,OAAO,OAAO,EAAK,CAAC,CAAC,CACxD,CAEA,IAAI,EAAK,CAAE,MAAO,MAAK,OAAO,IAAI,CAAG,EAAI,KAAK,OAAO,IAAI,CAAG,EAAI,CAAC,CAAE,CAEnE,KAAK,EAAK,EAAU,CAAE,MAAO,MAAK,IAAI,CAAG,EAAE,QAAQ,CAAQ,CAAE,CACjE,EAEO,YAAkB,EAAQ,EAAM,EAAS,CAAC,EAAG,EAAU,GAAM,CAChE,EAAO,cACH,GAAI,aAAY,EAAM,CAClB,SACA,UAEA,SAAU,GACV,WAAY,EAChB,CAAC,CACL,CACJ,CAEO,YAAgB,EAAQ,EAAM,EAAS,CAC1C,SAAO,iBAAiB,EAAM,CAAO,EAE9B,IAAM,EAAO,oBAAoB,EAAM,CAAO,CACzD,CAKO,YAAmB,EAAS,CAAE,MAAQ,OAAO,IAAY,UAAY,IAAY,IAAM,CACvF,YAAkB,EAAS,CAAE,MAAQ,IAAU,CAAO,GAAK,CAAE,GAAQ,CAAO,CAAG,CAC/E,YAAiB,EAAS,CAAE,MAAO,OAAM,QAAQ,CAAO,CAAE,CAC1D,YAAoB,EAAS,CAAE,MAAO,OAAO,IAAY,UAAW,CACpE,YAAqB,EAAS,CAAE,MAAO,OAAO,IAAY,UAAY,IAAY,IAAK,CAKvF,YAAmB,EAAK,CAAE,MAAO,MAAK,MAAM,KAAK,UAAU,CAAG,CAAC,CAAE,CAiBjE,WAAiB,EAAQ,EAAK,CACjC,MAAI,KAAQ,GAAW,EAEhB,EAAI,MAAM,GAAG,EAAE,OAAO,CAAC,EAAO,IAC1B,IAAQ,GAChB,CAAM,CACb,CAKO,YAAiB,EAAQ,EAAK,EAAO,CACxC,GAAI,GAAW,EAAI,MAAM,GAAG,EAE5B,GAAI,EAAS,SAAW,EACpB,MAAO,GAAO,GAAO,EAGzB,GAAI,GAAe,EAAS,MAAM,EAC9B,EAAiB,EAAS,KAAK,GAAG,EAEtC,AAAI,EAAO,KAAkB,QACzB,GAAO,GAAgB,CAAC,GAG5B,GAAQ,EAAO,GAAe,EAAgB,CAAK,CACvD,CAKO,YAAc,EAAM,EAAO,EAAQ,CAAC,EAAG,EAAO,GAAI,CAErD,GAAI,IAAS,EAAO,MAAO,GAS3B,GANI,MAAO,IAAS,MAAO,IAAU,GAAS,CAAI,GAAK,GAAQ,CAAK,GAAO,GAAQ,CAAI,GAAK,GAAS,CAAK,GAMtG,GAAY,CAAI,GAAK,GAAY,CAAK,EACtC,SAAM,GAAQ,EACP,EAIX,GAAI,GAAW,OAAO,KAAK,CAAI,EAG/B,cAAO,QAAQ,CAAK,EAAE,QAAQ,CAAC,CAAC,EAAK,KAAW,CAC5C,EAAQ,CAAC,GAAG,EAAO,GAAG,GAAK,EAAK,GAAM,EAAM,GAAM,EAAO,IAAS,GAAK,EAAM,GAAG,KAAQ,GAAK,CAAC,EAC9F,EAAW,EAAS,OAAO,GAAK,IAAM,CAAG,CAC7C,CAAC,EAGD,EAAS,QAAQ,GAAO,CACpB,EAAM,GAAG,KAAQ,KAAS,QAC9B,CAAC,EAEM,CACX,CAOO,YAAqB,EAAS,CACjC,GAAI,GAAQ,GAAY,CAAO,EAAI,EAAQ,GAAK,EAC5C,EAAO,GAAY,CAAO,EAAI,EAAQ,GAAK,OAE/C,MAAI,IAAU,CAAK,GACf,OAAO,QAAQ,CAAK,EAAE,QAAQ,CAAC,CAAC,EAAK,KAAY,CAC7C,EAAM,GAAO,GAAY,CAAM,CACnC,CAAC,EAGE,CACX,CAMO,YAAqB,EAAS,CACjC,MAAO,OAAM,QAAQ,CAAO,GACrB,EAAQ,SAAW,GACnB,MAAO,GAAQ,IAAO,UACtB,OAAO,KAAK,EAAQ,EAAE,EAAE,SAAS,GAAG,CAC/C,CAMO,aAAwB,CAI3B,GAAI,SAAS,cAAc,yBAAyB,EAChD,MAAO,UAAS,cAAc,yBAAyB,EAAE,aAAa,SAAS,EAGnF,GAAI,SAAS,cAAc,aAAa,EACpC,MAAO,UAAS,cAAc,aAAa,EAAE,aAAa,WAAW,EAGzE,GAAI,OAAO,qBAAqB,MAAW,GACvC,MAAO,QAAO,qBAAqB,KAGvC,KAAM,kCACV,CAEA,GAAI,IAEG,aAAoB,CACvB,GAAI,GAAO,MAAO,IAGlB,GAAI,OAAO,sBAAyB,QAAO,qBAAqB,OAAY,IACxE,UAAQ,OAAO,qBAAqB,MAE7B,GAGX,GAAM,GAAc,SAAS,cAAc,mCAAmC,EAE9E,MAAI,GACA,IAAQ,EAAY,MAEb,IAGJ,IACX,CAKO,aAAwB,CAC3B,MAAO,UAAS,cAAc,mBAAmB,GAAG,aAAa,iBAAiB,GAAK,OAAO,qBAAqB,KAAU,IACjI,CAEO,YAA2B,EAAS,CACvC,MAAO,CAAC,CAAE,EAAQ,MAAM,kCAAkC,CAC9D,CAEO,YAA8B,EAAS,CAC1C,GAAI,GAAO,EAAQ,MAAM,qCAAqC,EAE9D,MAAO,CAAC,EAAM,EAAQ,QAAQ,EAAM,EAAE,CAAC,CAC3C,CC1OA,GAAI,IAAiB,GAAI,SAEzB,YAA0B,EAAW,CACjC,GAAI,CAAE,GAAe,IAAI,CAAS,EAAG,CACjC,GAAI,GAAU,GAAI,IAAc,CAAS,EAEzC,GAAe,IAAI,EAAW,CAAO,EAErC,EAAQ,kBAAkB,CAC9B,CAEA,MAAO,IAAe,IAAI,CAAS,CACvC,CAEO,YAA0B,EAAI,EAAU,EAAW,EAAS,CAC/D,GAAI,GAAU,GAAiB,CAAS,EAEpC,EAAQ,IAAM,EAAG,cAAc,GAAI,aAAY,wBAAyB,CAAE,QAAS,GAAM,OAAQ,CAAE,GAAI,EAAU,GAAI,UAAQ,CAAE,CAAC,CAAC,EACjI,EAAS,IAAM,EAAG,cAAc,GAAI,aAAY,yBAA0B,CAAE,QAAS,GAAM,OAAQ,CAAE,GAAI,EAAU,GAAI,UAAQ,CAAE,CAAC,CAAC,EACnI,EAAQ,IAAM,EAAG,cAAc,GAAI,aAAY,wBAAyB,CAAE,QAAS,GAAM,OAAQ,CAAE,GAAI,EAAU,GAAI,UAAQ,CAAE,CAAC,CAAC,EACjI,EAAS,IAAM,EAAG,cAAc,GAAI,aAAY,yBAA0B,CAAE,QAAS,GAAM,OAAQ,CAAE,GAAI,EAAU,GAAI,UAAQ,CAAE,CAAC,CAAC,EACnI,EAAW,AAAC,GAAkB,CAC9B,GAAI,GAAmB,KAAK,MAAQ,EAAc,OAAS,IAAO,EAAc,KAAM,EAEtF,EAAG,cACC,GAAI,aAAY,2BAA4B,CACxC,QAAS,GAAM,OAAQ,CAAE,SAAU,CAAiB,CACxD,CAAC,CACL,CACJ,EAEI,EAAe,GAAK,CACpB,AAAI,EAAE,OAAO,MAAM,SAAW,GAE9B,GAAM,EAEN,AAAI,EAAE,OAAO,SACT,EAAQ,eAAe,EAAU,EAAE,OAAO,MAAO,EAAQ,EAAO,EAAU,CAAM,EAEhF,EAAQ,OAAO,EAAU,EAAE,OAAO,MAAM,GAAI,EAAQ,EAAO,EAAU,CAAM,EAEnF,EAEA,EAAG,iBAAiB,SAAU,CAAY,EAG1C,EAAU,MAAM,OAAO,EAAU,AAAC,GAAU,CAIxC,AAAI,CAAE,EAAG,aAEL,MAAU,MAAQ,IAAU,KAC5B,GAAG,MAAQ,IAIX,EAAG,UAAY,MAAM,QAAQ,CAAK,GAAK,EAAM,SAAW,GACxD,GAAG,MAAQ,IAEnB,CAAC,EAKD,GAAI,GAAsB,IAAM,CAAE,EAAG,MAAQ,IAAK,EAClD,EAAG,iBAAiB,QAAS,CAAmB,EAGhD,EAAG,iBAAiB,yBAA0B,CAAmB,EAEjE,EAAQ,IAAM,CACV,EAAG,oBAAoB,SAAU,CAAY,EAC7C,EAAG,oBAAoB,QAAS,CAAmB,CACvD,CAAC,CACL,CAEA,GAAM,IAAN,KAAoB,CAChB,YAAY,EAAW,CACnB,KAAK,UAAY,EACjB,KAAK,UAAY,GAAI,IACrB,KAAK,UAAY,GAAI,GACzB,CAEA,mBAAoB,CAChB,KAAK,UAAU,MAAM,IAAI,4BAA6B,CAAC,CAAE,OAAM,SAAU,CAIrE,AAAiB,KAAK,UAEtB,KAAK,gBAAgB,EAAM,CAAG,CAClC,CAAC,EAED,KAAK,UAAU,MAAM,IAAI,iCAAkC,CAAC,CAAE,OAAM,aAAc,CAC9E,AAAiB,KAAK,UAEtB,KAAK,qBAAqB,EAAM,CAAO,CAC3C,CAAC,EAED,KAAK,UAAU,MAAM,IAAI,kBAAmB,CAAC,CAAE,OAAM,kBAAmB,KAAK,mBAAmB,EAAM,CAAY,CAAC,EACnH,KAAK,UAAU,MAAM,IAAI,iBAAkB,CAAC,CAAE,UAAW,KAAK,kBAAkB,CAAI,CAAC,EACrF,KAAK,UAAU,MAAM,IAAI,iBAAkB,CAAC,CAAE,OAAM,iBAAkB,KAAK,UAAU,MAAM,CAAI,EAAE,eAAe,CAAW,CAAC,CAChI,CAEA,OAAO,EAAM,EAAM,EAAgB,EAAe,EAAkB,EAAmB,CACnF,KAAK,UAAU,EAAM,CACjB,MAAO,CAAC,CAAI,EACZ,SAAU,GACV,iBACA,gBACA,mBACA,mBACJ,CAAC,CACL,CAEA,eAAe,EAAM,EAAO,EAAgB,EAAe,EAAkB,EAAmB,CAC5F,KAAK,UAAU,EAAM,CACjB,MAAO,MAAM,KAAK,CAAK,EACvB,SAAU,GACV,iBACA,gBACA,mBACA,mBACJ,CAAC,CACL,CAEA,aAAa,EAAM,EAAa,EAAgB,CAC5C,KAAK,UAAU,KAAK,EAAM,CACtB,cAAa,gBACjB,CAAC,EAED,KAAK,UAAU,MAAM,KAAK,gBAAiB,EAAM,CAAW,CAChE,CAEA,UAAU,EAAM,EAAc,CAC1B,KAAK,UAAU,IAAI,EAAM,CAAY,EAEjC,KAAK,UAAU,IAAI,CAAI,EAAE,SAAW,GACpC,KAAK,YAAY,EAAM,CAAY,CAE3C,CAEA,gBAAgB,EAAM,EAAK,CACvB,GAAI,GAAW,GAAI,UACnB,MAAM,KAAK,KAAK,UAAU,MAAM,CAAI,EAAE,KAAK,EAAE,QAAQ,GAAQ,EAAS,OAAO,UAAW,EAAM,EAAK,IAAI,CAAC,EAExG,GAAI,GAAU,CACV,OAAU,kBACd,EAEI,EAAY,GAAa,EAE7B,AAAI,GAAW,GAAQ,gBAAkB,GAEzC,KAAK,YAAY,EAAM,EAAU,OAAQ,EAAK,EAAS,GAC5C,EAAS,KACnB,CACL,CAEA,qBAAqB,EAAM,EAAS,CAChC,GAAI,GAAW,KAAK,UAAU,MAAM,CAAI,EAAE,MAAM,GAE5C,EAAU,EAAQ,QACtB,AAAI,QAAU,IAAS,MAAO,GAAQ,KACtC,GAAI,GAAM,EAAQ,IAElB,KAAK,YAAY,EAAM,EAAU,MAAO,EAAK,EAAS,GAC3C,CAAC,EAAQ,IAAI,CACvB,CACL,CAEA,YAAY,EAAM,EAAU,EAAQ,EAAK,EAAS,EAAe,CAC7D,GAAI,GAAU,GAAI,gBAElB,EAAQ,KAAK,EAAQ,CAAG,EAExB,OAAO,QAAQ,CAAO,EAAE,QAAQ,CAAC,CAAC,EAAK,KAAW,CAC9C,EAAQ,iBAAiB,EAAK,CAAK,CACvC,CAAC,EAED,EAAQ,OAAO,iBAAiB,WAAY,GAAK,CAC7C,EAAE,OAAS,CAAC,EACZ,EAAE,OAAO,SAAW,KAAK,MAAO,EAAE,OAAS,IAAO,EAAE,KAAK,EAEzD,KAAK,UAAU,MAAM,CAAI,EAAE,iBAAiB,CAAC,CACjD,CAAC,EAED,EAAQ,iBAAiB,OAAQ,IAAM,CACnC,GAAK,GAAQ,OAAO,IAAI,KAAO,IAAK,CAChC,GAAI,GAAQ,EAAc,EAAQ,UAAY,KAAK,MAAM,EAAQ,QAAQ,CAAC,EAE1E,KAAK,UAAU,MAAM,KAAK,gBAAiB,EAAM,EAAO,KAAK,UAAU,MAAM,CAAI,EAAE,QAAQ,EAE3F,MACJ,CAEA,GAAI,GAAS,KAEb,AAAI,EAAQ,SAAW,KACnB,GAAS,EAAQ,UAGrB,KAAK,UAAU,MAAM,KAAK,iBAAkB,EAAM,EAAQ,KAAK,UAAU,MAAM,CAAI,EAAE,QAAQ,CACjG,CAAC,EAED,KAAK,UAAU,MAAM,CAAI,EAAE,QAAU,EAErC,EAAQ,KAAK,CAAQ,CACzB,CAEA,YAAY,EAAM,EAAc,CAC5B,GAAI,GAAY,EAAa,MAAM,IAAI,GAC5B,EAAE,KAAM,EAAK,KAAM,KAAM,EAAK,KAAM,KAAM,EAAK,IAAK,EAC9D,EAED,KAAK,UAAU,MAAM,KAAK,eAAgB,EAAM,EAAW,EAAa,QAAQ,EAE/D,KAAK,SAC1B,CAEA,mBAAmB,EAAM,EAAc,CACnC,AAAmB,KAAK,UAExB,GAAI,GAAe,KAAK,UAAU,MAAM,CAAI,EAC5C,EAAa,eAAe,EAAa,SAAW,EAAe,EAAa,EAAE,EAE9E,KAAK,UAAU,IAAI,CAAI,EAAE,OAAS,GAAG,KAAK,YAAY,EAAM,KAAK,UAAU,KAAK,CAAI,CAAC,CAC7F,CAEA,kBAAkB,EAAM,CACpB,AAAmB,KAAK,UAExB,KAAK,UAAU,MAAM,CAAI,EAAE,cAAc,EAErC,KAAK,UAAU,IAAI,CAAI,EAAE,OAAS,GAAG,KAAK,YAAY,EAAM,KAAK,UAAU,KAAK,CAAI,CAAC,CAC7F,CAEA,aAAa,EAAM,EAAoB,KAAM,CACzC,AAAmB,KAAK,UAExB,GAAI,GAAa,KAAK,UAAU,MAAM,CAAI,EAE1C,AAAI,GACI,GAAW,SACX,EAAW,QAAQ,MAAM,EAG7B,KAAK,UAAU,MAAM,CAAI,EAAE,kBAAkB,EAEzC,GAAmB,EAAkB,EAEjD,CACJ,EAEqB,GAArB,KAAgC,CAC5B,aAAc,CACV,KAAK,IAAM,CAAC,CAChB,CAEA,IAAI,EAAM,EAAO,CACb,AAAM,KAAK,IAAI,IACX,MAAK,IAAI,GAAQ,CAAC,GAGtB,KAAK,IAAI,GAAM,KAAK,CAAK,CAC7B,CAEA,KAAK,EAAM,EAAO,CACd,KAAK,IAAI,EAAM,CAAK,CACxB,CAEA,MAAM,EAAM,CACR,MAAM,MAAK,IAAI,GAER,KAAK,IAAI,GAAM,GAFO,IAGjC,CAEA,KAAK,EAAM,CACP,MAAO,MAAK,IAAI,GAAM,MAAM,EAAE,EAAE,EACpC,CAEA,IAAI,EAAM,CACN,MAAO,MAAK,IAAI,EACpB,CAEA,MAAM,EAAM,CACR,MAAO,MAAK,IAAI,GAAM,MAAM,CAChC,CAEA,KAAK,KAAS,EAAQ,CAClB,AAAC,MAAK,UAAU,IAAS,CAAC,GAAG,QAAQ,GAAY,CAC7C,EAAS,GAAG,CAAM,CACtB,CAAC,CACL,CAEA,IAAI,EAAM,CACN,MAAO,QAAO,KAAK,KAAK,SAAS,EAAE,SAAS,CAAI,CACpD,CACJ,EAUO,YACH,EACA,EACA,EACA,EAAiB,IAAM,CAAE,EACzB,EAAgB,IAAM,CAAE,EACxB,EAAmB,IAAM,CAAE,EAC3B,EAAoB,IAAM,CAAE,EAC9B,CAGE,AAFoB,GAAiB,CAAS,EAEhC,OACV,EACA,EACA,EACA,EACA,EACA,CACJ,CACJ,CAEO,YACH,EACA,EACA,EACA,EAAiB,IAAM,CAAE,EACzB,EAAgB,IAAM,CAAE,EACxB,EAAmB,IAAM,CAAE,EAC3B,EAAoB,IAAM,CAAE,EAC9B,CAGE,AAFoB,GAAiB,CAAS,EAEhC,eACV,EACA,EACA,EACA,EACA,EACA,CACJ,CACJ,CAEO,YACH,EACA,EACA,EACA,EAAiB,IAAM,CAAE,EACzB,EAAgB,IAAM,CAAE,EAC1B,CAGE,AAFoB,GAAiB,CAAS,EAEhC,aACV,EACA,EACA,EACA,CACJ,CACJ,CAEO,YACH,EACA,EACA,EAAoB,IAAM,CAAE,EAC9B,CAGE,AAFoB,GAAiB,CAAS,EAEhC,aACV,EACA,CACJ,CACJ,CC5XA,GAAI,IAAe,GACf,GAAW,GACX,GAAQ,CAAC,EACT,GAAmB,GACvB,YAAmB,EAAU,CAC3B,GAAS,CAAQ,CACnB,CACA,YAAkB,EAAK,CACrB,AAAK,GAAM,SAAS,CAAG,GACrB,GAAM,KAAK,CAAG,EAChB,GAAW,CACb,CACA,YAAoB,EAAK,CACvB,GAAI,GAAQ,GAAM,QAAQ,CAAG,EAC7B,AAAI,IAAU,IAAM,EAAQ,IAC1B,GAAM,OAAO,EAAO,CAAC,CACzB,CACA,aAAsB,CACpB,AAAI,CAAC,IAAY,CAAC,IAChB,IAAe,GACf,eAAe,EAAS,EAE5B,CACA,aAAqB,CACnB,GAAe,GACf,GAAW,GACX,OAAS,GAAI,EAAG,EAAI,GAAM,OAAQ,IAChC,GAAM,GAAG,EACT,GAAmB,EAErB,GAAM,OAAS,EACf,GAAmB,GACnB,GAAW,EACb,CAGA,GAAI,IACA,GACA,GACA,GACA,GAAiB,GACrB,YAAiC,EAAU,CACzC,GAAiB,GACjB,EAAS,EACT,GAAiB,EACnB,CACA,YAA6B,EAAQ,CACnC,GAAW,EAAO,SAClB,GAAU,EAAO,QACjB,GAAS,AAAC,GAAa,EAAO,OAAO,EAAU,CAAE,UAAW,AAAC,GAAS,CACpE,AAAI,GACF,GAAU,CAAI,EAEd,EAAK,CAET,CAAE,CAAC,EACH,GAAM,EAAO,GACf,CACA,YAAwB,EAAU,CAChC,GAAS,CACX,CACA,YAA4B,EAAI,CAC9B,GAAI,GAAW,IAAM,CACrB,EAkBA,MAAO,CAjBa,AAAC,GAAa,CAChC,GAAI,GAAkB,GAAO,CAAQ,EACrC,MAAK,GAAG,YACN,GAAG,WAA6B,GAAI,KACpC,EAAG,cAAgB,IAAM,CACvB,EAAG,WAAW,QAAQ,AAAC,GAAM,EAAE,CAAC,CAClC,GAEF,EAAG,WAAW,IAAI,CAAe,EACjC,EAAW,IAAM,CACf,AAAI,IAAoB,QAExB,GAAG,WAAW,OAAO,CAAe,EACpC,GAAQ,CAAe,EACzB,EACO,CACT,EACuB,IAAM,CAC3B,EAAS,CACX,CAAC,CACH,CACA,YAAe,EAAQ,EAAU,CAC/B,GAAI,GAAY,GACZ,EACA,EAAkB,GAAO,IAAM,CACjC,GAAI,GAAQ,EAAO,EACnB,KAAK,UAAU,CAAK,EACpB,AAAK,EAMH,EAAW,EALX,eAAe,IAAM,CACnB,EAAS,EAAO,CAAQ,EACxB,EAAW,CACb,CAAC,EAIH,EAAY,EACd,CAAC,EACD,MAAO,IAAM,GAAQ,CAAe,CACtC,CAGA,GAAI,IAAoB,CAAC,EACrB,GAAe,CAAC,EAChB,GAAa,CAAC,EAClB,YAAmB,EAAU,CAC3B,GAAW,KAAK,CAAQ,CAC1B,CACA,YAAqB,EAAI,EAAU,CACjC,AAAI,MAAO,IAAa,WACjB,GAAG,aACN,GAAG,YAAc,CAAC,GACpB,EAAG,YAAY,KAAK,CAAQ,GAE5B,GAAW,EACX,GAAa,KAAK,CAAQ,EAE9B,CACA,YAA2B,EAAU,CACnC,GAAkB,KAAK,CAAQ,CACjC,CACA,YAA4B,EAAI,EAAM,EAAU,CAC9C,AAAK,EAAG,sBACN,GAAG,qBAAuB,CAAC,GACxB,EAAG,qBAAqB,IAC3B,GAAG,qBAAqB,GAAQ,CAAC,GACnC,EAAG,qBAAqB,GAAM,KAAK,CAAQ,CAC7C,CACA,YAA2B,EAAI,EAAO,CACpC,AAAI,CAAC,EAAG,sBAER,OAAO,QAAQ,EAAG,oBAAoB,EAAE,QAAQ,CAAC,CAAC,EAAM,KAAW,CACjE,AAAI,KAAU,QAAU,EAAM,SAAS,CAAI,IACzC,GAAM,QAAQ,AAAC,GAAM,EAAE,CAAC,EACxB,MAAO,GAAG,qBAAqB,GAEnC,CAAC,CACH,CACA,YAAwB,EAAI,CAE1B,IADA,EAAG,YAAY,QAAQ,EAAU,EAC1B,EAAG,aAAa,QACrB,EAAG,YAAY,IAAI,EAAE,CACzB,CACA,GAAI,IAAW,GAAI,kBAAiB,EAAQ,EACxC,GAAqB,GACzB,aAAmC,CACjC,GAAS,QAAQ,SAAU,CAAE,QAAS,GAAM,UAAW,GAAM,WAAY,GAAM,kBAAmB,EAAK,CAAC,EACxG,GAAqB,EACvB,CACA,aAAkC,CAChC,GAAc,EACd,GAAS,WAAW,EACpB,GAAqB,EACvB,CACA,GAAI,IAAkB,CAAC,EACvB,aAAyB,CACvB,GAAI,GAAU,GAAS,YAAY,EACnC,GAAgB,KAAK,IAAM,EAAQ,OAAS,GAAK,GAAS,CAAO,CAAC,EAClE,GAAI,GAA2B,GAAgB,OAC/C,eAAe,IAAM,CACnB,GAAI,GAAgB,SAAW,EAC7B,KAAO,GAAgB,OAAS,GAC9B,GAAgB,MAAM,EAAE,CAE9B,CAAC,CACH,CACA,WAAmB,EAAU,CAC3B,GAAI,CAAC,GACH,MAAO,GAAS,EAClB,GAAuB,EACvB,GAAI,GAAS,EAAS,EACtB,UAAwB,EACjB,CACT,CACA,GAAI,IAAe,GACf,GAAoB,CAAC,EACzB,aAA0B,CACxB,GAAe,EACjB,CACA,aAA0C,CACxC,GAAe,GACf,GAAS,EAAiB,EAC1B,GAAoB,CAAC,CACvB,CACA,YAAkB,EAAW,CAC3B,GAAI,GAAc,CAChB,GAAoB,GAAkB,OAAO,CAAS,EACtD,MACF,CACA,GAAI,GAAa,CAAC,EACd,EAA+B,GAAI,KACnC,EAAkC,GAAI,KACtC,EAAoC,GAAI,KAC5C,OAAS,GAAI,EAAG,EAAI,EAAU,OAAQ,IACpC,GAAI,GAAU,GAAG,OAAO,2BAEpB,GAAU,GAAG,OAAS,aACxB,GAAU,GAAG,aAAa,QAAQ,AAAC,GAAS,CAC1C,AAAI,EAAK,WAAa,GAElB,EAAC,EAAK,WAEV,EAAa,IAAI,CAAI,EACvB,CAAC,EACD,EAAU,GAAG,WAAW,QAAQ,AAAC,GAAS,CACxC,GAAI,EAAK,WAAa,EAEtB,IAAI,EAAa,IAAI,CAAI,EAAG,CAC1B,EAAa,OAAO,CAAI,EACxB,MACF,CACA,AAAI,EAAK,WAET,EAAW,KAAK,CAAI,EACtB,CAAC,GAEC,EAAU,GAAG,OAAS,cAAc,CACtC,GAAI,GAAK,EAAU,GAAG,OAClB,EAAO,EAAU,GAAG,cACpB,EAAW,EAAU,GAAG,SACxB,EAAO,IAAM,CACf,AAAK,EAAgB,IAAI,CAAE,GACzB,EAAgB,IAAI,EAAI,CAAC,CAAC,EAC5B,EAAgB,IAAI,CAAE,EAAE,KAAK,CAAE,OAAM,MAAO,EAAG,aAAa,CAAI,CAAE,CAAC,CACrE,EACI,EAAS,IAAM,CACjB,AAAK,EAAkB,IAAI,CAAE,GAC3B,EAAkB,IAAI,EAAI,CAAC,CAAC,EAC9B,EAAkB,IAAI,CAAE,EAAE,KAAK,CAAI,CACrC,EACA,AAAI,EAAG,aAAa,CAAI,GAAK,IAAa,KACxC,EAAK,EACA,AAAI,EAAG,aAAa,CAAI,EAC7B,GAAO,EACP,EAAK,GAEL,EAAO,CAEX,CAEF,EAAkB,QAAQ,CAAC,EAAO,IAAO,CACvC,GAAkB,EAAI,CAAK,CAC7B,CAAC,EACD,EAAgB,QAAQ,CAAC,EAAO,IAAO,CACrC,GAAkB,QAAQ,AAAC,GAAM,EAAE,EAAI,CAAK,CAAC,CAC/C,CAAC,EACD,OAAS,KAAQ,GACf,AAAI,EAAW,KAAK,AAAC,GAAM,EAAE,SAAS,CAAI,CAAC,GAE3C,GAAa,QAAQ,AAAC,GAAM,EAAE,CAAI,CAAC,EAErC,OAAS,KAAQ,GACf,AAAI,CAAC,EAAK,aAEV,GAAW,QAAQ,AAAC,GAAM,EAAE,CAAI,CAAC,EAEnC,EAAa,KACb,EAAe,KACf,EAAkB,KAClB,EAAoB,IACtB,CAGA,YAAe,EAAM,CACnB,MAAO,IAAa,GAAiB,CAAI,CAAC,CAC5C,CACA,YAAwB,EAAM,EAAO,EAAe,CAClD,SAAK,aAAe,CAAC,EAAO,GAAG,GAAiB,GAAiB,CAAI,CAAC,EAC/D,IAAM,CACX,EAAK,aAAe,EAAK,aAAa,OAAO,AAAC,GAAM,IAAM,CAAK,CACjE,CACF,CACA,YAA0B,EAAM,CAC9B,MAAI,GAAK,aACA,EAAK,aACV,MAAO,aAAe,YAAc,YAAgB,YAC/C,GAAiB,EAAK,IAAI,EAE9B,EAAK,WAGH,GAAiB,EAAK,UAAU,EAF9B,CAAC,CAGZ,CACA,YAAsB,EAAS,CAC7B,MAAO,IAAI,OAAM,CAAE,SAAQ,EAAG,EAAc,CAC9C,CACA,GAAI,IAAiB,CACnB,QAAQ,CAAE,WAAW,CACnB,MAAO,OAAM,KACX,GAAI,KAAI,EAAQ,QAAQ,AAAC,GAAM,OAAO,KAAK,CAAC,CAAC,CAAC,CAChD,CACF,EACA,IAAI,CAAE,WAAW,EAAM,CACrB,MAAI,IAAQ,OAAO,YACV,GACF,EAAQ,KACb,AAAC,GAAQ,OAAO,UAAU,eAAe,KAAK,EAAK,CAAI,GAAK,QAAQ,IAAI,EAAK,CAAI,CACnF,CACF,EACA,IAAI,CAAE,WAAW,EAAM,EAAW,CAChC,MAAI,IAAQ,SACH,GACF,QAAQ,IACb,EAAQ,KACN,AAAC,GAAQ,QAAQ,IAAI,EAAK,CAAI,CAChC,GAAK,CAAC,EACN,EACA,CACF,CACF,EACA,IAAI,CAAE,WAAW,EAAM,EAAO,EAAW,CACvC,GAAM,GAAS,EAAQ,KACrB,AAAC,GAAQ,OAAO,UAAU,eAAe,KAAK,EAAK,CAAI,CACzD,GAAK,EAAQ,EAAQ,OAAS,GACxB,EAAa,OAAO,yBAAyB,EAAQ,CAAI,EAC/D,MAAI,IAAY,KAAO,GAAY,IAC1B,EAAW,IAAI,KAAK,EAAW,CAAK,GAAK,GAC3C,QAAQ,IAAI,EAAQ,EAAM,CAAK,CACxC,CACF,EACA,aAA2B,CAEzB,MAAO,AADI,SAAQ,QAAQ,IAAI,EACnB,OAAO,CAAC,EAAK,IACvB,GAAI,GAAO,QAAQ,IAAI,KAAM,CAAG,EACzB,GACN,CAAC,CAAC,CACP,CAGA,YAA0B,EAAO,CAC/B,GAAI,GAAY,AAAC,GAAQ,MAAO,IAAQ,UAAY,CAAC,MAAM,QAAQ,CAAG,GAAK,IAAQ,KAC/E,EAAU,CAAC,EAAK,EAAW,KAAO,CACpC,OAAO,QAAQ,OAAO,0BAA0B,CAAG,CAAC,EAAE,QAAQ,CAAC,CAAC,EAAK,CAAE,QAAO,iBAAkB,CAG9F,GAFI,IAAe,IAAS,IAAU,QAElC,MAAO,IAAU,UAAY,IAAU,MAAQ,EAAM,SACvD,OACF,GAAI,GAAO,IAAa,GAAK,EAAM,GAAG,KAAY,IAClD,AAAI,MAAO,IAAU,UAAY,IAAU,MAAQ,EAAM,eACvD,EAAI,GAAO,EAAM,WAAW,EAAO,EAAM,CAAG,EAExC,EAAU,CAAK,GAAK,IAAU,GAAO,CAAE,aAAiB,WAC1D,EAAQ,EAAO,CAAI,CAGzB,CAAC,CACH,EACA,MAAO,GAAQ,CAAK,CACtB,CACA,YAAqB,EAAU,EAAY,IAAM,CACjD,EAAG,CACD,GAAI,GAAM,CACR,aAAc,OACd,eAAgB,GAChB,WAAW,EAAO,EAAM,EAAK,CAC3B,MAAO,GAAS,KAAK,aAAc,IAAM,GAAI,EAAO,CAAI,EAAG,AAAC,GAAU,GAAI,EAAO,EAAM,CAAK,EAAG,EAAM,CAAG,CAC1G,CACF,EACA,SAAU,CAAG,EACN,AAAC,GAAiB,CACvB,GAAI,MAAO,IAAiB,UAAY,IAAiB,MAAQ,EAAa,eAAgB,CAC5F,GAAI,GAAa,EAAI,WAAW,KAAK,CAAG,EACxC,EAAI,WAAa,CAAC,EAAO,EAAM,IAAQ,CACrC,GAAI,GAAa,EAAa,WAAW,EAAO,EAAM,CAAG,EACzD,SAAI,aAAe,EACZ,EAAW,EAAO,EAAM,CAAG,CACpC,CACF,KACE,GAAI,aAAe,EAErB,MAAO,EACT,CACF,CACA,YAAa,EAAK,EAAM,CACtB,MAAO,GAAK,MAAM,GAAG,EAAE,OAAO,CAAC,EAAO,IAAY,EAAM,GAAU,CAAG,CACvE,CACA,YAAa,EAAK,EAAM,EAAO,CAG7B,GAFI,MAAO,IAAS,UAClB,GAAO,EAAK,MAAM,GAAG,GACnB,EAAK,SAAW,EAClB,EAAI,EAAK,IAAM,MACZ,IAAI,EAAK,SAAW,EACvB,KAAM,OAEN,MAAI,GAAI,EAAK,KAGX,GAAI,EAAK,IAAM,CAAC,GACT,GAAI,EAAI,EAAK,IAAK,EAAK,MAAM,CAAC,EAAG,CAAK,EAGnD,CAGA,GAAI,IAAS,CAAC,EACd,WAAe,EAAM,EAAU,CAC7B,GAAO,GAAQ,CACjB,CACA,YAAsB,EAAK,EAAI,CAC7B,GAAI,GAAoB,GAAa,CAAE,EACvC,cAAO,QAAQ,EAAM,EAAE,QAAQ,CAAC,CAAC,EAAM,KAAc,CACnD,OAAO,eAAe,EAAK,IAAI,IAAQ,CACrC,KAAM,CACJ,MAAO,GAAS,EAAI,CAAiB,CACvC,EACA,WAAY,EACd,CAAC,CACH,CAAC,EACM,CACT,CACA,YAAsB,EAAI,CACxB,GAAI,CAAC,EAAW,GAAY,GAAyB,CAAE,EACnD,EAAQ,CAAE,eAAa,GAAG,CAAU,EACxC,UAAY,EAAI,CAAQ,EACjB,CACT,CAGA,YAAkB,EAAI,EAAY,KAAa,EAAM,CACnD,GAAI,CACF,MAAO,GAAS,GAAG,CAAI,CACzB,OAAS,EAAP,CACA,GAAY,EAAG,EAAI,CAAU,CAC/B,CACF,CACA,YAAqB,EAAQ,EAAI,EAAa,OAAQ,CACpD,EAAS,OAAO,OACd,GAAU,CAAE,QAAS,yBAA0B,EAC/C,CAAE,KAAI,YAAW,CACnB,EACA,QAAQ,KAAK,4BAA4B,EAAO;AAAA;AAAA,EAEhD,EAAa,gBAAkB,EAAa;AAAA;AAAA,EAAU,KAAM,CAAE,EAC9D,WAAW,IAAM,CACf,KAAM,EACR,EAAG,CAAC,CACN,CAGA,GAAI,IAA8B,GAClC,YAAmC,EAAU,CAC3C,GAAI,GAAQ,GACZ,GAA8B,GAC9B,GAAI,GAAS,EAAS,EACtB,UAA8B,EACvB,CACT,CACA,YAAkB,EAAI,EAAY,EAAS,CAAC,EAAG,CAC7C,GAAI,GACJ,SAAc,EAAI,CAAU,EAAE,AAAC,GAAU,EAAS,EAAO,CAAM,EACxD,CACT,CACA,cAA0B,EAAM,CAC9B,MAAO,IAAqB,GAAG,CAAI,CACrC,CACA,GAAI,IAAuB,GAC3B,YAAsB,EAAc,CAClC,GAAuB,CACzB,CACA,YAAyB,EAAI,EAAY,CACvC,GAAI,GAAmB,CAAC,EACxB,GAAa,EAAkB,CAAE,EACjC,GAAI,GAAY,CAAC,EAAkB,GAAG,GAAiB,CAAE,CAAC,EACtD,EAAY,MAAO,IAAe,WAAa,GAA8B,EAAW,CAAU,EAAI,GAA4B,EAAW,EAAY,CAAE,EAC/J,MAAO,IAAS,KAAK,KAAM,EAAI,EAAY,CAAS,CACtD,CACA,YAAuC,EAAW,EAAM,CACtD,MAAO,CAAC,EAAW,IAAM,CACzB,EAAG,CAAE,MAAO,EAAS,CAAC,EAAG,SAAS,CAAC,GAAM,CAAC,IAAM,CAC9C,GAAI,GAAS,EAAK,MAAM,GAAa,CAAC,EAAQ,GAAG,CAAS,CAAC,EAAG,CAAM,EACpE,GAAoB,EAAU,CAAM,CACtC,CACF,CACA,GAAI,IAAgB,CAAC,EACrB,YAAoC,EAAY,EAAI,CAClD,GAAI,GAAc,GAChB,MAAO,IAAc,GAEvB,GAAI,GAAgB,OAAO,eAAe,gBAAiB,CAC3D,CAAC,EAAE,YACC,EAA0B,qBAAqB,KAAK,EAAW,KAAK,CAAC,GAAK,iBAAiB,KAAK,EAAW,KAAK,CAAC,EAAI,eAAe,SAAoB,EAgBxJ,EAAO,AAfe,KAAM,CAC9B,GAAI,CACF,GAAI,GAAQ,GAAI,GACd,CAAC,SAAU,OAAO,EAClB,kCAAkC,oDACpC,EACA,cAAO,eAAe,EAAO,OAAQ,CACnC,MAAO,YAAY,GACrB,CAAC,EACM,CACT,OAAS,EAAP,CACA,UAAY,EAAQ,EAAI,CAAU,EAC3B,QAAQ,QAAQ,CACzB,CACF,GAC6B,EAC7B,UAAc,GAAc,EACrB,CACT,CACA,YAAqC,EAAW,EAAY,EAAI,CAC9D,GAAI,GAAO,GAA2B,EAAY,CAAE,EACpD,MAAO,CAAC,EAAW,IAAM,CACzB,EAAG,CAAE,MAAO,EAAS,CAAC,EAAG,SAAS,CAAC,GAAM,CAAC,IAAM,CAC9C,EAAK,OAAS,OACd,EAAK,SAAW,GAChB,GAAI,GAAgB,GAAa,CAAC,EAAQ,GAAG,CAAS,CAAC,EACvD,GAAI,MAAO,IAAS,WAAY,CAC9B,GAAI,GAAU,EAAK,EAAM,CAAa,EAAE,MAAM,AAAC,GAAW,GAAY,EAAQ,EAAI,CAAU,CAAC,EAC7F,AAAI,EAAK,SACP,IAAoB,EAAU,EAAK,OAAQ,EAAe,EAAQ,CAAE,EACpE,EAAK,OAAS,QAEd,EAAQ,KAAK,AAAC,GAAW,CACvB,GAAoB,EAAU,EAAQ,EAAe,EAAQ,CAAE,CACjE,CAAC,EAAE,MAAM,AAAC,GAAW,GAAY,EAAQ,EAAI,CAAU,CAAC,EAAE,QAAQ,IAAM,EAAK,OAAS,MAAM,CAEhG,CACF,CACF,CACA,YAA6B,EAAU,EAAO,EAAQ,EAAQ,EAAI,CAChE,GAAI,IAA+B,MAAO,IAAU,WAAY,CAC9D,GAAI,GAAS,EAAM,MAAM,EAAQ,CAAM,EACvC,AAAI,YAAkB,SACpB,EAAO,KAAK,AAAC,GAAM,GAAoB,EAAU,EAAG,EAAQ,CAAM,CAAC,EAAE,MAAM,AAAC,GAAW,GAAY,EAAQ,EAAI,CAAK,CAAC,EAErH,EAAS,CAAM,CAEnB,KAAO,AAAI,OAAO,IAAU,UAAY,YAAiB,SACvD,EAAM,KAAK,AAAC,GAAM,EAAS,CAAC,CAAC,EAE7B,EAAS,CAAK,CAElB,CAGA,GAAI,IAAiB,KACrB,YAAgB,EAAU,GAAI,CAC5B,MAAO,IAAiB,CAC1B,CACA,YAAmB,EAAW,CAC5B,GAAiB,CACnB,CACA,GAAI,IAAoB,CAAC,EACzB,WAAmB,EAAM,EAAU,CACjC,UAAkB,GAAQ,EACnB,CACL,OAAO,EAAY,CACjB,GAAI,CAAC,GAAkB,GAAa,CAClC,QAAQ,KAAK,OAAO,8BAA8B,UAAmB,6CAAgD,EACrH,MACF,CACA,GAAM,GAAM,GAAe,QAAQ,CAAU,EAC7C,GAAe,OAAO,GAAO,EAAI,EAAM,GAAe,QAAQ,SAAS,EAAG,EAAG,CAAI,CACnF,CACF,CACF,CACA,YAAyB,EAAM,CAC7B,MAAO,QAAO,KAAK,EAAiB,EAAE,SAAS,CAAI,CACrD,CACA,YAAoB,EAAI,EAAY,EAA2B,CAE7D,GADA,EAAa,MAAM,KAAK,CAAU,EAC9B,EAAG,qBAAsB,CAC3B,GAAI,GAAc,OAAO,QAAQ,EAAG,oBAAoB,EAAE,IAAI,CAAC,CAAC,EAAM,KAAY,EAAE,OAAM,OAAM,EAAE,EAC9F,EAAmB,GAAe,CAAW,EACjD,EAAc,EAAY,IAAI,AAAC,GACzB,EAAiB,KAAK,AAAC,GAAS,EAAK,OAAS,EAAU,IAAI,EACvD,CACL,KAAM,UAAU,EAAU,OAC1B,MAAO,IAAI,EAAU,QACvB,EAEK,CACR,EACD,EAAa,EAAW,OAAO,CAAW,CAC5C,CACA,GAAI,GAA0B,CAAC,EAE/B,MAAO,AADW,GAAW,IAAI,GAAwB,CAAC,EAAS,IAAY,EAAwB,GAAW,CAAO,CAAC,EAAE,OAAO,EAAsB,EAAE,IAAI,GAAmB,EAAyB,CAAyB,CAAC,EAAE,KAAK,EAAU,EACnO,IAAI,AAAC,GACf,GAAoB,EAAI,CAAU,CAC1C,CACH,CACA,YAAwB,EAAY,CAClC,MAAO,OAAM,KAAK,CAAU,EAAE,IAAI,GAAwB,CAAC,EAAE,OAAO,AAAC,GAAS,CAAC,GAAuB,CAAI,CAAC,CAC7G,CACA,GAAI,IAAsB,GACtB,GAAyC,GAAI,KAC7C,GAAyB,OAAO,EACpC,YAAiC,EAAU,CACzC,GAAsB,GACtB,GAAI,GAAM,OAAO,EACjB,GAAyB,EACzB,GAAuB,IAAI,EAAK,CAAC,CAAC,EAClC,GAAI,GAAgB,IAAM,CACxB,KAAO,GAAuB,IAAI,CAAG,EAAE,QACrC,GAAuB,IAAI,CAAG,EAAE,MAAM,EAAE,EAC1C,GAAuB,OAAO,CAAG,CACnC,EACI,EAAgB,IAAM,CACxB,GAAsB,GACtB,EAAc,CAChB,EACA,EAAS,CAAa,EACtB,EAAc,CAChB,CACA,YAAkC,EAAI,CACpC,GAAI,GAAW,CAAC,EACZ,EAAW,AAAC,GAAa,EAAS,KAAK,CAAQ,EAC/C,CAAC,EAAS,GAAiB,GAAmB,CAAE,EACpD,SAAS,KAAK,CAAa,EASpB,CARS,CACd,OAAQ,GACR,OAAQ,EACR,QAAS,EACT,cAAe,EAAc,KAAK,EAAe,CAAE,EACnD,SAAU,GAAS,KAAK,GAAU,CAAE,CACtC,EACgB,IAAM,EAAS,QAAQ,AAAC,GAAM,EAAE,CAAC,CACrB,CAC9B,CACA,YAA6B,EAAI,EAAY,CAC3C,GAAI,GAAO,IAAM,CACjB,EACI,EAAW,GAAkB,EAAW,OAAS,EACjD,CAAC,EAAW,GAAY,GAAyB,CAAE,EACvD,GAAmB,EAAI,EAAW,SAAU,CAAQ,EACpD,GAAI,GAAc,IAAM,CACtB,AAAI,EAAG,WAAa,EAAG,eAEvB,GAAS,QAAU,EAAS,OAAO,EAAI,EAAY,CAAS,EAC5D,EAAW,EAAS,KAAK,EAAU,EAAI,EAAY,CAAS,EAC5D,GAAsB,GAAuB,IAAI,EAAsB,EAAE,KAAK,CAAQ,EAAI,EAAS,EACrG,EACA,SAAY,YAAc,EACnB,CACT,CACA,GAAI,IAAe,CAAC,EAAS,IAAgB,CAAC,CAAE,OAAM,WAChD,GAAK,WAAW,CAAO,GACzB,GAAO,EAAK,QAAQ,EAAS,CAAW,GACnC,CAAE,OAAM,OAAM,GAEnB,GAAO,AAAC,GAAM,EAClB,YAAiC,EAAW,IAAM,CAClD,EAAG,CACD,MAAO,CAAC,CAAE,OAAM,WAAY,CAC1B,GAAI,CAAE,KAAM,EAAS,MAAO,GAAa,GAAsB,OAAO,CAAC,EAAO,IACrE,EAAU,CAAK,EACrB,CAAE,OAAM,OAAM,CAAC,EAClB,MAAI,KAAY,GACd,EAAS,EAAS,CAAI,EACjB,CAAE,KAAM,EAAS,MAAO,CAAS,CAC1C,CACF,CACA,GAAI,IAAwB,CAAC,EAC7B,YAAuB,EAAU,CAC/B,GAAsB,KAAK,CAAQ,CACrC,CACA,YAAgC,CAAE,QAAQ,CACxC,MAAO,IAAqB,EAAE,KAAK,CAAI,CACzC,CACA,GAAI,IAAuB,IAAM,GAAI,QAAO,IAAI,gBAA4B,EAC5E,YAA4B,EAAyB,EAA2B,CAC9E,MAAO,CAAC,CAAE,OAAM,WAAY,CAC1B,GAAI,GAAY,EAAK,MAAM,GAAqB,CAAC,EAC7C,EAAa,EAAK,MAAM,qBAAqB,EAC7C,EAAY,EAAK,MAAM,uBAAuB,GAAK,CAAC,EACpD,EAAW,GAA6B,EAAwB,IAAS,EAC7E,MAAO,CACL,KAAM,EAAY,EAAU,GAAK,KACjC,MAAO,EAAa,EAAW,GAAK,KACpC,UAAW,EAAU,IAAI,AAAC,GAAM,EAAE,QAAQ,IAAK,EAAE,CAAC,EAClD,WAAY,EACZ,UACF,CACF,CACF,CACA,GAAI,IAAU,UACV,GAAiB,CACnB,SACA,MACA,OACA,KACA,SACA,OACA,OACA,MACA,QACA,YACA,aACA,OACA,KACA,GACA,UACF,EACA,YAAoB,EAAG,EAAG,CACxB,GAAI,GAAQ,GAAe,QAAQ,EAAE,IAAI,IAAM,GAAK,GAAU,EAAE,KAC5D,EAAQ,GAAe,QAAQ,EAAE,IAAI,IAAM,GAAK,GAAU,EAAE,KAChE,MAAO,IAAe,QAAQ,CAAK,EAAI,GAAe,QAAQ,CAAK,CACrE,CAGA,YAAkB,EAAI,EAAM,EAAS,CAAC,EAAG,CACvC,EAAG,cACD,GAAI,aAAY,EAAM,CACpB,SACA,QAAS,GAET,SAAU,GACV,WAAY,EACd,CAAC,CACH,CACF,CAGA,YAAc,EAAI,EAAU,CAC1B,GAAI,MAAO,aAAe,YAAc,YAAc,YAAY,CAChE,MAAM,KAAK,EAAG,QAAQ,EAAE,QAAQ,AAAC,GAAQ,GAAK,EAAK,CAAQ,CAAC,EAC5D,MACF,CACA,GAAI,GAAO,GAEX,GADA,EAAS,EAAI,IAAM,EAAO,EAAI,EAC1B,EACF,OACF,GAAI,GAAO,EAAG,kBACd,KAAO,GACL,GAAK,EAAM,EAAU,EAAK,EAC1B,EAAO,EAAK,kBAEhB,CAGA,WAAc,KAAY,EAAM,CAC9B,QAAQ,KAAK,mBAAmB,IAAW,GAAG,CAAI,CACpD,CAGA,GAAI,IAAU,GACd,aAAiB,CACf,AAAI,IACF,EAAK,6GAA6G,EACpH,GAAU,GACL,SAAS,MACZ,EAAK,qIAAqI,EAC5I,GAAS,SAAU,aAAa,EAChC,GAAS,SAAU,qBAAqB,EACxC,GAAwB,EACxB,GAAU,AAAC,GAAO,GAAS,EAAI,EAAI,CAAC,EACpC,GAAY,AAAC,GAAO,GAAY,CAAE,CAAC,EACnC,GAAkB,CAAC,EAAI,IAAU,CAC/B,GAAW,EAAI,CAAK,EAAE,QAAQ,AAAC,GAAW,EAAO,CAAC,CACpD,CAAC,EACD,GAAI,GAAsB,AAAC,GAAO,CAAC,GAAY,EAAG,cAAe,EAAI,EACrE,MAAM,KAAK,SAAS,iBAAiB,GAAa,EAAE,KAAK,GAAG,CAAC,CAAC,EAAE,OAAO,CAAmB,EAAE,QAAQ,AAAC,GAAO,CAC1G,GAAS,CAAE,CACb,CAAC,EACD,GAAS,SAAU,oBAAoB,EACvC,WAAW,IAAM,CACf,GAAwB,CAC1B,CAAC,CACH,CACA,GAAI,IAAwB,CAAC,EACzB,GAAwB,CAAC,EAC7B,aAAyB,CACvB,MAAO,IAAsB,IAAI,AAAC,GAAO,EAAG,CAAC,CAC/C,CACA,aAAwB,CACtB,MAAO,IAAsB,OAAO,EAAqB,EAAE,IAAI,AAAC,GAAO,EAAG,CAAC,CAC7E,CACA,YAAyB,EAAkB,CACzC,GAAsB,KAAK,CAAgB,CAC7C,CACA,YAAyB,EAAkB,CACzC,GAAsB,KAAK,CAAgB,CAC7C,CACA,YAAqB,EAAI,EAAuB,GAAO,CACrD,MAAO,IAAY,EAAI,AAAC,GAAY,CAElC,GAAI,AADc,GAAuB,GAAa,EAAI,GAAc,GAC1D,KAAK,AAAC,GAAa,EAAQ,QAAQ,CAAQ,CAAC,EACxD,MAAO,EACX,CAAC,CACH,CACA,YAAqB,EAAI,EAAU,CACjC,GAAI,EAAC,EAEL,IAAI,EAAS,CAAE,EACb,MAAO,GAGT,GAFI,EAAG,iBACL,GAAK,EAAG,iBACN,EAAC,EAAG,cAER,MAAO,IAAY,EAAG,cAAe,CAAQ,EAC/C,CACA,YAAgB,EAAI,CAClB,MAAO,IAAc,EAAE,KAAK,AAAC,GAAa,EAAG,QAAQ,CAAQ,CAAC,CAChE,CACA,GAAI,IAAoB,CAAC,EACzB,YAAuB,EAAU,CAC/B,GAAkB,KAAK,CAAQ,CACjC,CACA,GAAI,IAAkB,EACtB,YAAkB,EAAI,EAAS,GAAM,EAAY,IAAM,CACvD,EAAG,CACD,AAAI,GAAY,EAAI,AAAC,GAAM,EAAE,SAAS,GAEtC,GAAwB,IAAM,CAC5B,EAAO,EAAI,CAAC,EAAK,IAAS,CACxB,AAAI,EAAI,WAER,GAAU,EAAK,CAAI,EACnB,GAAkB,QAAQ,AAAC,GAAM,EAAE,EAAK,CAAI,CAAC,EAC7C,GAAW,EAAK,EAAI,UAAU,EAAE,QAAQ,AAAC,GAAW,EAAO,CAAC,EACvD,EAAI,WACP,GAAI,UAAY,MAClB,EAAI,WAAa,EAAK,EACxB,CAAC,CACH,CAAC,CACH,CACA,YAAqB,EAAM,EAAS,GAAM,CACxC,EAAO,EAAM,AAAC,GAAO,CACnB,GAAe,CAAE,EACjB,GAAkB,CAAE,EACpB,MAAO,GAAG,SACZ,CAAC,CACH,CACA,aAAmC,CAMjC,AALuB,CACrB,CAAC,KAAM,SAAU,CAAC,yBAAyB,CAAC,EAC5C,CAAC,SAAU,SAAU,CAAC,YAAY,CAAC,EACnC,CAAC,OAAQ,OAAQ,CAAC,UAAU,CAAC,CAC/B,EACiB,QAAQ,CAAC,CAAC,EAAS,EAAY,KAAe,CAC7D,AAAI,GAAgB,CAAU,GAE9B,EAAU,KAAK,AAAC,GAAa,CAC3B,GAAI,SAAS,cAAc,CAAQ,EACjC,SAAK,UAAU,mBAA0B,UAAgB,EAClD,EAEX,CAAC,CACH,CAAC,CACH,CAGA,GAAI,IAAY,CAAC,EACb,GAAY,GAChB,YAAkB,EAAW,IAAM,CACnC,EAAG,CACD,sBAAe,IAAM,CACnB,IAAa,WAAW,IAAM,CAC5B,GAAiB,CACnB,CAAC,CACH,CAAC,EACM,GAAI,SAAQ,AAAC,GAAQ,CAC1B,GAAU,KAAK,IAAM,CACnB,EAAS,EACT,EAAI,CACN,CAAC,CACH,CAAC,CACH,CACA,aAA4B,CAE1B,IADA,GAAY,GACL,GAAU,QACf,GAAU,MAAM,EAAE,CACtB,CACA,aAAyB,CACvB,GAAY,EACd,CAGA,YAAoB,EAAI,EAAO,CAC7B,MAAI,OAAM,QAAQ,CAAK,EACd,GAAqB,EAAI,EAAM,KAAK,GAAG,CAAC,EACtC,MAAO,IAAU,UAAY,IAAU,KACzC,GAAqB,EAAI,CAAK,EAC5B,MAAO,IAAU,WACnB,GAAW,EAAI,EAAM,CAAC,EAExB,GAAqB,EAAI,CAAK,CACvC,CACA,YAA8B,EAAI,EAAa,CAC7C,GAAI,GAAQ,AAAC,GAAiB,EAAa,MAAM,GAAG,EAAE,OAAO,OAAO,EAChE,EAAiB,AAAC,GAAiB,EAAa,MAAM,GAAG,EAAE,OAAO,AAAC,GAAM,CAAC,EAAG,UAAU,SAAS,CAAC,CAAC,EAAE,OAAO,OAAO,EAClH,EAA0B,AAAC,GAC7B,GAAG,UAAU,IAAI,GAAG,CAAO,EACpB,IAAM,CACX,EAAG,UAAU,OAAO,GAAG,CAAO,CAChC,GAEF,SAAc,IAAgB,GAAO,EAAc,GAAK,GAAe,GAChE,EAAwB,EAAe,CAAW,CAAC,CAC5D,CACA,YAA8B,EAAI,EAAa,CAC7C,GAAI,GAAQ,AAAC,GAAgB,EAAY,MAAM,GAAG,EAAE,OAAO,OAAO,EAC9D,EAAS,OAAO,QAAQ,CAAW,EAAE,QAAQ,CAAC,CAAC,EAAa,KAAU,EAAO,EAAM,CAAW,EAAI,EAAK,EAAE,OAAO,OAAO,EACvH,EAAY,OAAO,QAAQ,CAAW,EAAE,QAAQ,CAAC,CAAC,EAAa,KAAU,AAAC,EAA4B,GAArB,EAAM,CAAW,CAAS,EAAE,OAAO,OAAO,EAC3H,EAAQ,CAAC,EACT,EAAU,CAAC,EACf,SAAU,QAAQ,AAAC,GAAM,CACvB,AAAI,EAAG,UAAU,SAAS,CAAC,GACzB,GAAG,UAAU,OAAO,CAAC,EACrB,EAAQ,KAAK,CAAC,EAElB,CAAC,EACD,EAAO,QAAQ,AAAC,GAAM,CACpB,AAAK,EAAG,UAAU,SAAS,CAAC,GAC1B,GAAG,UAAU,IAAI,CAAC,EAClB,EAAM,KAAK,CAAC,EAEhB,CAAC,EACM,IAAM,CACX,EAAQ,QAAQ,AAAC,GAAM,EAAG,UAAU,IAAI,CAAC,CAAC,EAC1C,EAAM,QAAQ,AAAC,GAAM,EAAG,UAAU,OAAO,CAAC,CAAC,CAC7C,CACF,CAGA,YAAmB,EAAI,EAAO,CAC5B,MAAI,OAAO,IAAU,UAAY,IAAU,KAClC,GAAoB,EAAI,CAAK,EAE/B,GAAoB,EAAI,CAAK,CACtC,CACA,YAA6B,EAAI,EAAO,CACtC,GAAI,GAAiB,CAAC,EACtB,cAAO,QAAQ,CAAK,EAAE,QAAQ,CAAC,CAAC,EAAK,KAAY,CAC/C,EAAe,GAAO,EAAG,MAAM,GAC1B,EAAI,WAAW,IAAI,GACtB,GAAM,GAAU,CAAG,GAErB,EAAG,MAAM,YAAY,EAAK,CAAM,CAClC,CAAC,EACD,WAAW,IAAM,CACf,AAAI,EAAG,MAAM,SAAW,GACtB,EAAG,gBAAgB,OAAO,CAE9B,CAAC,EACM,IAAM,CACX,GAAU,EAAI,CAAc,CAC9B,CACF,CACA,YAA6B,EAAI,EAAO,CACtC,GAAI,GAAQ,EAAG,aAAa,QAAS,CAAK,EAC1C,SAAG,aAAa,QAAS,CAAK,EACvB,IAAM,CACX,EAAG,aAAa,QAAS,GAAS,EAAE,CACtC,CACF,CACA,YAAmB,EAAS,CAC1B,MAAO,GAAQ,QAAQ,kBAAmB,OAAO,EAAE,YAAY,CACjE,CAGA,YAAc,EAAU,EAAW,IAAM,CACzC,EAAG,CACD,GAAI,GAAS,GACb,MAAO,WAAW,CAChB,AAAK,EAIH,EAAS,MAAM,KAAM,SAAS,EAH9B,GAAS,GACT,EAAS,MAAM,KAAM,SAAS,EAIlC,CACF,CAGA,EAAU,aAAc,CAAC,EAAI,CAAE,QAAO,YAAW,cAAc,CAAE,SAAU,KAAgB,CAGzF,AAFI,MAAO,IAAe,YACxB,GAAa,EAAU,CAAU,GAC/B,IAAe,IAEnB,CAAI,CAAC,GAAc,MAAO,IAAe,UACvC,GAA8B,EAAI,EAAW,CAAK,EAElD,GAAmC,EAAI,EAAY,CAAK,EAE5D,CAAC,EACD,YAA4C,EAAI,EAAa,EAAO,CAClE,GAAyB,EAAI,GAAY,EAAE,EAqB3C,AApB0B,CACxB,MAAS,AAAC,GAAY,CACpB,EAAG,cAAc,MAAM,OAAS,CAClC,EACA,cAAe,AAAC,GAAY,CAC1B,EAAG,cAAc,MAAM,MAAQ,CACjC,EACA,YAAa,AAAC,GAAY,CACxB,EAAG,cAAc,MAAM,IAAM,CAC/B,EACA,MAAS,AAAC,GAAY,CACpB,EAAG,cAAc,MAAM,OAAS,CAClC,EACA,cAAe,AAAC,GAAY,CAC1B,EAAG,cAAc,MAAM,MAAQ,CACjC,EACA,YAAa,AAAC,GAAY,CACxB,EAAG,cAAc,MAAM,IAAM,CAC/B,CACF,EACoB,GAAO,CAAW,CACxC,CACA,YAAuC,EAAI,EAAW,EAAO,CAC3D,GAAyB,EAAI,EAAS,EACtC,GAAI,GAAgB,CAAC,EAAU,SAAS,IAAI,GAAK,CAAC,EAAU,SAAS,KAAK,GAAK,CAAC,EAC5E,EAAkB,GAAiB,EAAU,SAAS,IAAI,GAAK,CAAC,OAAO,EAAE,SAAS,CAAK,EACvF,EAAmB,GAAiB,EAAU,SAAS,KAAK,GAAK,CAAC,OAAO,EAAE,SAAS,CAAK,EAC7F,AAAI,EAAU,SAAS,IAAI,GAAK,CAAC,GAC/B,GAAY,EAAU,OAAO,CAAC,EAAG,IAAU,EAAQ,EAAU,QAAQ,KAAK,CAAC,GAEzE,EAAU,SAAS,KAAK,GAAK,CAAC,GAChC,GAAY,EAAU,OAAO,CAAC,EAAG,IAAU,EAAQ,EAAU,QAAQ,KAAK,CAAC,GAE7E,GAAI,GAAW,CAAC,EAAU,SAAS,SAAS,GAAK,CAAC,EAAU,SAAS,OAAO,EACxE,EAAe,GAAY,EAAU,SAAS,SAAS,EACvD,EAAa,GAAY,EAAU,SAAS,OAAO,EACnD,EAAe,EAAe,EAAI,EAClC,EAAa,EAAa,GAAc,EAAW,QAAS,EAAE,EAAI,IAAM,EACxE,EAAQ,GAAc,EAAW,QAAS,CAAC,EAAI,IAC/C,EAAS,GAAc,EAAW,SAAU,QAAQ,EACpD,EAAW,qBACX,EAAa,GAAc,EAAW,WAAY,GAAG,EAAI,IACzD,EAAc,GAAc,EAAW,WAAY,EAAE,EAAI,IACzD,EAAS,iCACb,AAAI,GACF,GAAG,cAAc,MAAM,OAAS,CAC9B,gBAAiB,EACjB,gBAAiB,GAAG,KACpB,mBAAoB,EACpB,mBAAoB,GAAG,KACvB,yBAA0B,CAC5B,EACA,EAAG,cAAc,MAAM,MAAQ,CAC7B,QAAS,EACT,UAAW,SAAS,IACtB,EACA,EAAG,cAAc,MAAM,IAAM,CAC3B,QAAS,EACT,UAAW,UACb,GAEE,GACF,GAAG,cAAc,MAAM,OAAS,CAC9B,gBAAiB,EACjB,gBAAiB,GAAG,KACpB,mBAAoB,EACpB,mBAAoB,GAAG,KACvB,yBAA0B,CAC5B,EACA,EAAG,cAAc,MAAM,MAAQ,CAC7B,QAAS,EACT,UAAW,UACb,EACA,EAAG,cAAc,MAAM,IAAM,CAC3B,QAAS,EACT,UAAW,SAAS,IACtB,EAEJ,CACA,YAAkC,EAAI,EAAa,EAAe,CAAC,EAAG,CACpE,AAAK,EAAG,eACN,GAAG,cAAgB,CACjB,MAAO,CAAE,OAAQ,EAAc,MAAO,EAAc,IAAK,CAAa,EACtE,MAAO,CAAE,OAAQ,EAAc,MAAO,EAAc,IAAK,CAAa,EACtE,GAAG,EAAS,IAAM,CAClB,EAAG,EAAQ,IAAM,CACjB,EAAG,CACD,GAAW,EAAI,EAAa,CAC1B,OAAQ,KAAK,MAAM,OACnB,MAAO,KAAK,MAAM,MAClB,IAAK,KAAK,MAAM,GAClB,EAAG,EAAQ,CAAK,CAClB,EACA,IAAI,EAAS,IAAM,CACnB,EAAG,EAAQ,IAAM,CACjB,EAAG,CACD,GAAW,EAAI,EAAa,CAC1B,OAAQ,KAAK,MAAM,OACnB,MAAO,KAAK,MAAM,MAClB,IAAK,KAAK,MAAM,GAClB,EAAG,EAAQ,CAAK,CAClB,CACF,EACJ,CACA,OAAO,QAAQ,UAAU,mCAAqC,SAAS,EAAI,EAAO,EAAM,EAAM,CAC5F,GAAM,GAAY,SAAS,kBAAoB,UAAY,sBAAwB,WAC/E,EAA0B,IAAM,EAAU,CAAI,EAClD,GAAI,EAAO,CACT,AAAI,EAAG,eAAkB,GAAG,cAAc,OAAS,EAAG,cAAc,OAClE,EAAG,cAAc,OAAU,QAAO,QAAQ,EAAG,cAAc,MAAM,MAAM,EAAE,QAAU,OAAO,QAAQ,EAAG,cAAc,MAAM,KAAK,EAAE,QAAU,OAAO,QAAQ,EAAG,cAAc,MAAM,GAAG,EAAE,QAAU,EAAG,cAAc,GAAG,CAAI,EAAI,EAAwB,EAEnP,EAAG,cAAgB,EAAG,cAAc,GAAG,CAAI,EAAI,EAAwB,EAEzE,MACF,CACA,EAAG,eAAiB,EAAG,cAAgB,GAAI,SAAQ,CAAC,EAAS,IAAW,CACtE,EAAG,cAAc,IAAI,IAAM,CAC3B,EAAG,IAAM,EAAQ,CAAI,CAAC,EACtB,EAAG,kBAAoB,EAAG,iBAAiB,aAAa,IAAM,EAAO,CAAE,0BAA2B,EAAK,CAAC,CAAC,CAC3G,CAAC,EAAI,QAAQ,QAAQ,CAAI,EACzB,eAAe,IAAM,CACnB,GAAI,GAAU,GAAY,CAAE,EAC5B,AAAI,EACG,GAAQ,iBACX,GAAQ,gBAAkB,CAAC,GAC7B,EAAQ,gBAAgB,KAAK,CAAE,GAE/B,EAAU,IAAM,CACd,GAAI,GAAoB,AAAC,GAAQ,CAC/B,GAAI,GAAQ,QAAQ,IAAI,CACtB,EAAI,eACJ,GAAI,GAAI,iBAAmB,CAAC,GAAG,IAAI,CAAiB,CACtD,CAAC,EAAE,KAAK,CAAC,CAAC,KAAO,IAAI,CAAC,EACtB,aAAO,GAAI,eACX,MAAO,GAAI,gBACJ,CACT,EACA,EAAkB,CAAE,EAAE,MAAM,AAAC,GAAM,CACjC,GAAI,CAAC,EAAE,0BACL,KAAM,EACV,CAAC,CACH,CAAC,CAEL,CAAC,CACH,EACA,YAAqB,EAAI,CACvB,GAAI,GAAS,EAAG,WAChB,GAAI,EAAC,EAEL,MAAO,GAAO,eAAiB,EAAS,GAAY,CAAM,CAC5D,CACA,YAAoB,EAAI,EAAa,CAAE,SAAQ,MAAO,EAAQ,OAAQ,CAAC,EAAG,EAAS,IAAM,CACzF,EAAG,EAAQ,IAAM,CACjB,EAAG,CAGD,GAFI,EAAG,kBACL,EAAG,iBAAiB,OAAO,EACzB,OAAO,KAAK,CAAM,EAAE,SAAW,GAAK,OAAO,KAAK,CAAM,EAAE,SAAW,GAAK,OAAO,KAAK,CAAG,EAAE,SAAW,EAAG,CACzG,EAAO,EACP,EAAM,EACN,MACF,CACA,GAAI,GAAW,EAAY,EAC3B,GAAkB,EAAI,CACpB,OAAQ,CACN,EAAY,EAAY,EAAI,CAAM,CACpC,EACA,QAAS,CACP,EAAa,EAAY,EAAI,CAAM,CACrC,EACA,SACA,KAAM,CACJ,EAAU,EACV,EAAU,EAAY,EAAI,CAAG,CAC/B,EACA,QACA,SAAU,CACR,EAAW,EACX,EAAQ,CACV,CACF,CAAC,CACH,CACA,YAA2B,EAAI,EAAQ,CACrC,GAAI,GAAa,EAAe,EAC5B,EAAS,GAAK,IAAM,CACtB,EAAU,IAAM,CACd,EAAc,GACT,GACH,EAAO,OAAO,EACX,GACH,GAAO,IAAI,EACX,GAAiB,GAEnB,EAAO,MAAM,EACT,EAAG,aACL,EAAO,QAAQ,EACjB,MAAO,GAAG,gBACZ,CAAC,CACH,CAAC,EACD,EAAG,iBAAmB,CACpB,cAAe,CAAC,EAChB,aAAa,EAAU,CACrB,KAAK,cAAc,KAAK,CAAQ,CAClC,EACA,OAAQ,GAAK,UAAW,CACtB,KAAO,KAAK,cAAc,QACxB,KAAK,cAAc,MAAM,EAAE,EAG7B,EAAO,CACT,CAAC,EACD,QACF,EACA,EAAU,IAAM,CACd,EAAO,MAAM,EACb,EAAO,OAAO,CAChB,CAAC,EACD,GAAc,EACd,sBAAsB,IAAM,CAC1B,GAAI,EACF,OACF,GAAI,GAAW,OAAO,iBAAiB,CAAE,EAAE,mBAAmB,QAAQ,MAAO,EAAE,EAAE,QAAQ,IAAK,EAAE,CAAC,EAAI,IACjG,EAAQ,OAAO,iBAAiB,CAAE,EAAE,gBAAgB,QAAQ,MAAO,EAAE,EAAE,QAAQ,IAAK,EAAE,CAAC,EAAI,IAC/F,AAAI,IAAa,GACf,GAAW,OAAO,iBAAiB,CAAE,EAAE,kBAAkB,QAAQ,IAAK,EAAE,CAAC,EAAI,KAC/E,EAAU,IAAM,CACd,EAAO,OAAO,CAChB,CAAC,EACD,EAAgB,GAChB,sBAAsB,IAAM,CAC1B,AAAI,GAEJ,GAAU,IAAM,CACd,EAAO,IAAI,CACb,CAAC,EACD,GAAiB,EACjB,WAAW,EAAG,iBAAiB,OAAQ,EAAW,CAAK,EACvD,EAAa,GACf,CAAC,CACH,CAAC,CACH,CACA,YAAuB,EAAW,EAAK,EAAU,CAC/C,GAAI,EAAU,QAAQ,CAAG,IAAM,GAC7B,MAAO,GACT,GAAM,GAAW,EAAU,EAAU,QAAQ,CAAG,EAAI,GAGpD,GAFI,CAAC,GAED,IAAQ,SACN,MAAM,CAAQ,EAChB,MAAO,GAEX,GAAI,IAAQ,YAAc,IAAQ,QAAS,CACzC,GAAI,GAAQ,EAAS,MAAM,YAAY,EACvC,GAAI,EACF,MAAO,GAAM,EACjB,CACA,MAAI,KAAQ,UACN,CAAC,MAAO,QAAS,OAAQ,SAAU,QAAQ,EAAE,SAAS,EAAU,EAAU,QAAQ,CAAG,EAAI,EAAE,EACtF,CAAC,EAAU,EAAU,EAAU,QAAQ,CAAG,EAAI,EAAE,EAAE,KAAK,GAAG,EAG9D,CACT,CAGA,GAAI,IAAY,GAChB,YAAyB,EAAU,EAAW,IAAM,CACpD,EAAG,CACD,MAAO,IAAI,IAAS,GAAY,EAAS,GAAG,CAAI,EAAI,EAAS,GAAG,CAAI,CACtE,CACA,YAAyB,EAAU,CACjC,MAAO,IAAI,IAAS,IAAa,EAAS,GAAG,CAAI,CACnD,CACA,GAAI,IAAe,CAAC,EACpB,YAAwB,EAAU,CAChC,GAAa,KAAK,CAAQ,CAC5B,CACA,YAAmB,EAAM,EAAI,CAC3B,GAAa,QAAQ,AAAC,GAAM,EAAE,EAAM,CAAE,CAAC,EACvC,GAAY,GACZ,GAAgC,IAAM,CACpC,GAAS,EAAI,CAAC,EAAI,IAAa,CAC7B,EAAS,EAAI,IAAM,CACnB,CAAC,CACH,CAAC,CACH,CAAC,EACD,GAAY,EACd,CACA,GAAI,IAAkB,GACtB,YAAe,EAAO,EAAO,CAC3B,AAAK,EAAM,cACT,GAAM,aAAe,EAAM,cAC7B,GAAY,GACZ,GAAkB,GAClB,GAAgC,IAAM,CACpC,GAAU,CAAK,CACjB,CAAC,EACD,GAAY,GACZ,GAAkB,EACpB,CACA,YAAmB,EAAI,CACrB,GAAI,GAAuB,GAS3B,GAAS,EARW,CAAC,EAAK,IAAa,CACrC,GAAK,EAAK,CAAC,EAAK,IAAS,CACvB,GAAI,GAAwB,GAAO,CAAG,EACpC,MAAO,GAAK,EACd,EAAuB,GACvB,EAAS,EAAK,CAAI,CACpB,CAAC,CACH,CAC0B,CAC5B,CACA,YAAyC,EAAU,CACjD,GAAI,GAAQ,GACZ,GAAe,CAAC,EAAW,IAAO,CAChC,GAAI,GAAe,EAAM,CAAS,EAClC,UAAQ,CAAY,EACb,IAAM,CACb,CACF,CAAC,EACD,EAAS,EACT,GAAe,CAAK,CACtB,CAGA,YAAc,EAAI,EAAM,EAAO,EAAY,CAAC,EAAG,CAK7C,OAJK,EAAG,aACN,GAAG,YAAc,GAAS,CAAC,CAAC,GAC9B,EAAG,YAAY,GAAQ,EACvB,EAAO,EAAU,SAAS,OAAO,EAAI,GAAU,CAAI,EAAI,EAC/C,OACD,QACH,GAAe,EAAI,CAAK,EACxB,UACG,QACH,GAAW,EAAI,CAAK,EACpB,UACG,QACH,GAAY,EAAI,CAAK,EACrB,UACG,eACA,UACH,GAAyB,EAAI,EAAM,CAAK,EACxC,cAEA,GAAc,EAAI,EAAM,CAAK,EAC7B,MAEN,CACA,YAAwB,EAAI,EAAO,CACjC,GAAI,GAAQ,CAAE,EACZ,AAAI,EAAG,WAAW,QAAU,QAC1B,GAAG,MAAQ,GAET,OAAO,WACT,CAAI,MAAO,IAAU,UACnB,EAAG,QAAU,GAAiB,EAAG,KAAK,IAAM,EAE5C,EAAG,QAAU,GAAwB,EAAG,MAAO,CAAK,WAG/C,GAAW,CAAE,EACtB,AAAI,OAAO,UAAU,CAAK,EACxB,EAAG,MAAQ,EACN,AAAI,CAAC,MAAM,QAAQ,CAAK,GAAK,MAAO,IAAU,WAAa,CAAC,CAAC,KAAM,MAAM,EAAE,SAAS,CAAK,EAC9F,EAAG,MAAQ,OAAO,CAAK,EAEvB,AAAI,MAAM,QAAQ,CAAK,EACrB,EAAG,QAAU,EAAM,KAAK,AAAC,GAAQ,GAAwB,EAAK,EAAG,KAAK,CAAC,EAEvE,EAAG,QAAU,CAAC,CAAC,UAGV,EAAG,UAAY,SACxB,GAAa,EAAI,CAAK,MACjB,CACL,GAAI,EAAG,QAAU,EACf,OACF,EAAG,MAAQ,IAAU,OAAS,GAAK,CACrC,CACF,CACA,YAAqB,EAAI,EAAO,CAC9B,AAAI,EAAG,qBACL,EAAG,oBAAoB,EACzB,EAAG,oBAAsB,GAAW,EAAI,CAAK,CAC/C,CACA,YAAoB,EAAI,EAAO,CAC7B,AAAI,EAAG,oBACL,EAAG,mBAAmB,EACxB,EAAG,mBAAqB,GAAU,EAAI,CAAK,CAC7C,CACA,YAAkC,EAAI,EAAM,EAAO,CACjD,GAAc,EAAI,EAAM,CAAK,EAC7B,GAAqB,EAAI,EAAM,CAAK,CACtC,CACA,YAAuB,EAAI,EAAM,EAAO,CACtC,AAAI,CAAC,KAAM,OAAQ,EAAK,EAAE,SAAS,CAAK,GAAK,GAAoC,CAAI,EACnF,EAAG,gBAAgB,CAAI,EAEnB,IAAc,CAAI,GACpB,GAAQ,GACV,GAAa,EAAI,EAAM,CAAK,EAEhC,CACA,YAAsB,EAAI,EAAU,EAAO,CACzC,AAAI,EAAG,aAAa,CAAQ,GAAK,GAC/B,EAAG,aAAa,EAAU,CAAK,CAEnC,CACA,YAA8B,EAAI,EAAU,EAAO,CACjD,AAAI,EAAG,KAAc,GACnB,GAAG,GAAY,EAEnB,CACA,YAAsB,EAAI,EAAO,CAC/B,GAAM,GAAoB,CAAC,EAAE,OAAO,CAAK,EAAE,IAAI,AAAC,GACvC,EAAS,EACjB,EACD,MAAM,KAAK,EAAG,OAAO,EAAE,QAAQ,AAAC,GAAW,CACzC,EAAO,SAAW,EAAkB,SAAS,EAAO,KAAK,CAC3D,CAAC,CACH,CACA,YAAmB,EAAS,CAC1B,MAAO,GAAQ,YAAY,EAAE,QAAQ,SAAU,CAAC,EAAO,IAAS,EAAK,YAAY,CAAC,CACpF,CACA,YAAiC,EAAQ,EAAQ,CAC/C,MAAO,IAAU,CACnB,CACA,YAA0B,EAAU,CAClC,MAAI,CAAC,EAAG,IAAK,OAAQ,KAAM,MAAO,EAAI,EAAE,SAAS,CAAQ,EAChD,GAEL,CAAC,EAAG,IAAK,QAAS,MAAO,KAAM,EAAK,EAAE,SAAS,CAAQ,EAClD,GAEF,EAAW,QAAQ,CAAQ,EAAI,IACxC,CACA,GAAI,IAAoC,GAAI,KAAI,CAC9C,kBACA,QACA,YACA,WACA,UACA,WACA,UACA,QACA,WACA,iBACA,QACA,QACA,YACA,OACA,WACA,QACA,WACA,aACA,OACA,cACA,WACA,WACA,WACA,WACA,qBACA,2BACA,wBACF,CAAC,EACD,YAAuB,EAAU,CAC/B,MAAO,IAAkB,IAAI,CAAQ,CACvC,CACA,YAA6C,EAAM,CACjD,MAAO,CAAC,CAAC,eAAgB,eAAgB,gBAAiB,eAAe,EAAE,SAAS,CAAI,CAC1F,CACA,YAAoB,EAAI,EAAM,EAAU,CACtC,MAAI,GAAG,aAAe,EAAG,YAAY,KAAU,OACtC,EAAG,YAAY,GACjB,GAAoB,EAAI,EAAM,CAAQ,CAC/C,CACA,YAAqB,EAAI,EAAM,EAAU,EAAU,GAAM,CACvD,GAAI,EAAG,aAAe,EAAG,YAAY,KAAU,OAC7C,MAAO,GAAG,YAAY,GACxB,GAAI,EAAG,mBAAqB,EAAG,kBAAkB,KAAU,OAAQ,CACjE,GAAI,GAAU,EAAG,kBAAkB,GACnC,SAAQ,QAAU,EACX,GAA0B,IACxB,GAAS,EAAI,EAAQ,UAAU,CACvC,CACH,CACA,MAAO,IAAoB,EAAI,EAAM,CAAQ,CAC/C,CACA,YAA6B,EAAI,EAAM,EAAU,CAC/C,GAAI,GAAO,EAAG,aAAa,CAAI,EAC/B,MAAI,KAAS,KACJ,MAAO,IAAa,WAAa,EAAS,EAAI,EACnD,IAAS,GACJ,GACL,GAAc,CAAI,EACb,CAAC,CAAC,CAAC,EAAM,MAAM,EAAE,SAAS,CAAI,EAEhC,CACT,CACA,YAAoB,EAAI,CACtB,MAAO,GAAG,OAAS,YAAc,EAAG,YAAc,eAAiB,EAAG,YAAc,WACtF,CACA,YAAiB,EAAI,CACnB,MAAO,GAAG,OAAS,SAAW,EAAG,YAAc,UACjD,CAGA,YAAkB,EAAM,EAAM,CAC5B,GAAI,GACJ,MAAO,WAAW,CAChB,GAAI,GAAU,KAAM,EAAO,UACvB,EAAQ,UAAW,CACrB,EAAU,KACV,EAAK,MAAM,EAAS,CAAI,CAC1B,EACA,aAAa,CAAO,EACpB,EAAU,WAAW,EAAO,CAAI,CAClC,CACF,CAGA,YAAkB,EAAM,EAAO,CAC7B,GAAI,GACJ,MAAO,WAAW,CAChB,GAAI,GAAU,KAAM,EAAO,UAC3B,AAAK,GACH,GAAK,MAAM,EAAS,CAAI,EACxB,EAAa,GACb,WAAW,IAAM,EAAa,GAAO,CAAK,EAE9C,CACF,CAGA,YAAkB,CAAE,IAAK,EAAU,IAAK,GAAY,CAAE,IAAK,EAAU,IAAK,GAAY,CACpF,GAAI,GAAW,GACX,EACA,EACA,EAAY,GAAO,IAAM,CAC3B,GAAI,GAAQ,EAAS,EACjB,EAAQ,EAAS,EACrB,GAAI,EACF,EAAS,GAAc,CAAK,CAAC,EAC7B,EAAW,OACN,CACL,GAAI,GAAkB,KAAK,UAAU,CAAK,EACtC,EAAkB,KAAK,UAAU,CAAK,EAC1C,AAAI,IAAoB,EACtB,EAAS,GAAc,CAAK,CAAC,EACpB,IAAoB,GAC7B,EAAS,GAAc,CAAK,CAAC,CAGjC,CACA,EAAY,KAAK,UAAU,EAAS,CAAC,EACrC,EAAY,KAAK,UAAU,EAAS,CAAC,CACvC,CAAC,EACD,MAAO,IAAM,CACX,GAAQ,CAAS,CACnB,CACF,CACA,YAAuB,EAAO,CAC5B,MAAO,OAAO,IAAU,SAAW,KAAK,MAAM,KAAK,UAAU,CAAK,CAAC,EAAI,CACzE,CAGA,YAAgB,EAAU,CAExB,AADgB,OAAM,QAAQ,CAAQ,EAAI,EAAW,CAAC,CAAQ,GACpD,QAAQ,AAAC,GAAM,EAAE,EAAc,CAAC,CAC5C,CAGA,GAAI,IAAS,CAAC,EACV,GAAa,GACjB,YAAe,EAAM,EAAO,CAK1B,GAJK,IACH,IAAS,GAAS,EAAM,EACxB,GAAa,IAEX,IAAU,OACZ,MAAO,IAAO,GAEhB,GAAO,GAAQ,EACf,GAAiB,GAAO,EAAK,EACzB,MAAO,IAAU,UAAY,IAAU,MAAQ,EAAM,eAAe,MAAM,GAAK,MAAO,GAAM,MAAS,YACvG,GAAO,GAAM,KAAK,CAEtB,CACA,aAAqB,CACnB,MAAO,GACT,CAGA,GAAI,IAAQ,CAAC,EACb,YAAe,EAAM,EAAU,CAC7B,GAAI,GAAc,MAAO,IAAa,WAAa,IAAM,EAAW,EACpE,MAAI,aAAgB,SACX,GAAoB,EAAM,EAAY,CAAC,EAE9C,IAAM,GAAQ,EAET,IAAM,CACb,EACF,CACA,YAAgC,EAAK,CACnC,cAAO,QAAQ,EAAK,EAAE,QAAQ,CAAC,CAAC,EAAM,KAAc,CAClD,OAAO,eAAe,EAAK,EAAM,CAC/B,KAAM,CACJ,MAAO,IAAI,IACF,EAAS,GAAG,CAAI,CAE3B,CACF,CAAC,CACH,CAAC,EACM,CACT,CACA,YAA6B,EAAI,EAAK,EAAU,CAC9C,GAAI,GAAiB,CAAC,EACtB,KAAO,EAAe,QACpB,EAAe,IAAI,EAAE,EACvB,GAAI,GAAa,OAAO,QAAQ,CAAG,EAAE,IAAI,CAAC,CAAC,EAAM,KAAY,EAAE,OAAM,OAAM,EAAE,EACzE,EAAmB,GAAe,CAAU,EAChD,SAAa,EAAW,IAAI,AAAC,GACvB,EAAiB,KAAK,AAAC,GAAS,EAAK,OAAS,EAAU,IAAI,EACvD,CACL,KAAM,UAAU,EAAU,OAC1B,MAAO,IAAI,EAAU,QACvB,EAEK,CACR,EACD,GAAW,EAAI,EAAY,CAAQ,EAAE,IAAI,AAAC,GAAW,CACnD,EAAe,KAAK,EAAO,WAAW,EACtC,EAAO,CACT,CAAC,EACM,IAAM,CACX,KAAO,EAAe,QACpB,EAAe,IAAI,EAAE,CACzB,CACF,CAGA,GAAI,IAAQ,CAAC,EACb,YAAc,EAAM,EAAU,CAC5B,GAAM,GAAQ,CAChB,CACA,YAA6B,EAAK,EAAS,CACzC,cAAO,QAAQ,EAAK,EAAE,QAAQ,CAAC,CAAC,EAAM,KAAc,CAClD,OAAO,eAAe,EAAK,EAAM,CAC/B,KAAM,CACJ,MAAO,IAAI,IACF,EAAS,KAAK,CAAO,EAAE,GAAG,CAAI,CAEzC,EACA,WAAY,EACd,CAAC,CACH,CAAC,EACM,CACT,CAGA,GAAI,IAAS,CACX,GAAI,WAAW,CACb,MAAO,GACT,EACA,GAAI,UAAU,CACZ,MAAO,GACT,EACA,GAAI,SAAS,CACX,MAAO,GACT,EACA,GAAI,MAAM,CACR,MAAO,GACT,EACA,QAAS,SACT,kCACA,6BACA,2BACA,2BACA,0BACA,uBACA,sBACA,qBACA,oBACA,mBACA,mBACA,mBACA,mBACA,kBACA,kBACA,kBACA,iBACA,gBACA,iBACA,gBACA,gBACA,eACA,eACA,eACA,eACA,eACA,eAEA,cAEA,aAEA,YACA,YACA,YACA,YACA,YACA,YACA,YACA,YACA,SAAU,GACV,OAAQ,GACR,UACA,QACA,SACA,SACA,SAEA,aAEA,MAAO,GACP,MAAO,GACP,SACA,QACA,QACA,KAAM,EACR,EACI,GAAiB,GAGrB,YAAiB,EAAK,EAAkB,CACtC,GAAM,GAAsB,OAAO,OAAO,IAAI,EACxC,EAAO,EAAI,MAAM,GAAG,EAC1B,OAAS,GAAI,EAAG,EAAI,EAAK,OAAQ,IAC/B,EAAI,EAAK,IAAM,GAEjB,MAAO,GAAmB,AAAC,GAAQ,CAAC,CAAC,EAAI,EAAI,YAAY,GAAK,AAAC,GAAQ,CAAC,CAAC,EAAI,EAC/E,CACA,GAAI,IAAsB,8EACtB,GAAiC,GAAQ,GAAsB,8IAA8I,EAC7M,GAAmB,OAAO,OAAO,CAAC,CAAC,EACnC,GAAmB,OAAO,OAAO,CAAC,CAAC,EACnC,GAAiB,OAAO,UAAU,eAClC,GAAS,CAAC,EAAK,IAAQ,GAAe,KAAK,EAAK,CAAG,EACnD,GAAU,MAAM,QAChB,GAAQ,AAAC,GAAQ,GAAa,CAAG,IAAM,eACvC,GAAW,AAAC,GAAQ,MAAO,IAAQ,SACnC,GAAW,AAAC,GAAQ,MAAO,IAAQ,SACnC,GAAW,AAAC,GAAQ,IAAQ,MAAQ,MAAO,IAAQ,SACnD,GAAiB,OAAO,UAAU,SAClC,GAAe,AAAC,GAAU,GAAe,KAAK,CAAK,EACnD,GAAY,AAAC,GACR,GAAa,CAAK,EAAE,MAAM,EAAG,EAAE,EAEpC,GAAe,AAAC,GAAQ,GAAS,CAAG,GAAK,IAAQ,OAAS,EAAI,KAAO,KAAO,GAAK,SAAS,EAAK,EAAE,IAAM,EACvG,GAAsB,AAAC,GAAO,CAChC,GAAM,GAAwB,OAAO,OAAO,IAAI,EAChD,MAAO,AAAC,IAEC,AADK,EAAM,IACH,GAAM,GAAO,EAAG,CAAG,EAEtC,EACI,GAAa,SACb,GAAW,GAAoB,AAAC,GAC3B,EAAI,QAAQ,GAAY,CAAC,EAAG,IAAM,EAAI,EAAE,YAAY,EAAI,EAAE,CAClE,EACG,GAAc,aACd,GAAY,GAAoB,AAAC,GAAQ,EAAI,QAAQ,GAAa,KAAK,EAAE,YAAY,CAAC,EACtF,GAAa,GAAoB,AAAC,GAAQ,EAAI,OAAO,CAAC,EAAE,YAAY,EAAI,EAAI,MAAM,CAAC,CAAC,EACpF,GAAe,GAAoB,AAAC,GAAQ,EAAM,KAAK,GAAW,CAAG,IAAM,EAAE,EAC7E,GAAa,CAAC,EAAO,IAAa,IAAU,GAAa,KAAU,GAAS,IAAa,GAGzF,GAA4B,GAAI,SAChC,GAAc,CAAC,EACf,GACA,GAAc,OAAc,SAAc,EAC1C,GAAsB,OAAc,iBAAsB,EAC9D,YAAkB,EAAI,CACpB,MAAO,IAAM,EAAG,YAAc,EAChC,CACA,YAAiB,EAAI,EAAU,GAAW,CACxC,AAAI,GAAS,CAAE,GACb,GAAK,EAAG,KAEV,GAAM,GAAU,GAAqB,EAAI,CAAO,EAChD,MAAK,GAAQ,MACX,EAAQ,EAEH,CACT,CACA,YAAc,EAAS,CACrB,AAAI,EAAQ,QACV,IAAQ,CAAO,EACX,EAAQ,QAAQ,QAClB,EAAQ,QAAQ,OAAO,EAEzB,EAAQ,OAAS,GAErB,CACA,GAAI,IAAM,EACV,YAA8B,EAAI,EAAS,CACzC,GAAM,GAAU,UAA0B,CACxC,GAAI,CAAC,EAAQ,OACX,MAAO,GAAG,EAEZ,GAAI,CAAC,GAAY,SAAS,CAAO,EAAG,CAClC,GAAQ,CAAO,EACf,GAAI,CACF,UAAe,EACf,GAAY,KAAK,CAAO,EACxB,GAAe,EACR,EAAG,CACZ,QAAE,CACA,GAAY,IAAI,EAChB,GAAc,EACd,GAAe,GAAY,GAAY,OAAS,EAClD,CACF,CACF,EACA,SAAQ,GAAK,KACb,EAAQ,aAAe,CAAC,CAAC,EAAQ,aACjC,EAAQ,UAAY,GACpB,EAAQ,OAAS,GACjB,EAAQ,IAAM,EACd,EAAQ,KAAO,CAAC,EAChB,EAAQ,QAAU,EACX,CACT,CACA,YAAiB,EAAS,CACxB,GAAM,CAAE,QAAS,EACjB,GAAI,EAAK,OAAQ,CACf,OAAS,GAAI,EAAG,EAAI,EAAK,OAAQ,IAC/B,EAAK,GAAG,OAAO,CAAO,EAExB,EAAK,OAAS,CAChB,CACF,CACA,GAAI,IAAc,GACd,GAAa,CAAC,EAClB,aAAyB,CACvB,GAAW,KAAK,EAAW,EAC3B,GAAc,EAChB,CACA,aAA0B,CACxB,GAAW,KAAK,EAAW,EAC3B,GAAc,EAChB,CACA,aAAyB,CACvB,GAAM,GAAO,GAAW,IAAI,EAC5B,GAAc,IAAS,OAAS,GAAO,CACzC,CACA,WAAe,EAAQ,EAAM,EAAK,CAChC,GAAI,CAAC,IAAe,KAAiB,OACnC,OAEF,GAAI,GAAU,GAAU,IAAI,CAAM,EAClC,AAAK,GACH,GAAU,IAAI,EAAQ,EAA0B,GAAI,IAAK,EAE3D,GAAI,GAAM,EAAQ,IAAI,CAAG,EACzB,AAAK,GACH,EAAQ,IAAI,EAAK,EAAsB,GAAI,IAAK,EAE7C,EAAI,IAAI,EAAY,GACvB,GAAI,IAAI,EAAY,EACpB,GAAa,KAAK,KAAK,CAAG,EACtB,GAAa,QAAQ,SACvB,GAAa,QAAQ,QAAQ,CAC3B,OAAQ,GACR,SACA,OACA,KACF,CAAC,EAGP,CACA,YAAiB,EAAQ,EAAM,EAAK,EAAU,EAAU,EAAW,CACjE,GAAM,GAAU,GAAU,IAAI,CAAM,EACpC,GAAI,CAAC,EACH,OAEF,GAAM,GAA0B,GAAI,KAC9B,EAAO,AAAC,GAAiB,CAC7B,AAAI,GACF,EAAa,QAAQ,AAAC,GAAY,CAChC,AAAI,KAAY,IAAgB,EAAQ,eACtC,EAAQ,IAAI,CAAO,CAEvB,CAAC,CAEL,EACA,GAAI,IAAS,QACX,EAAQ,QAAQ,CAAI,UACX,IAAQ,UAAY,GAAQ,CAAM,EAC3C,EAAQ,QAAQ,CAAC,EAAK,IAAS,CAC7B,AAAI,KAAS,UAAY,GAAQ,IAC/B,EAAK,CAAG,CAEZ,CAAC,MAKD,QAHI,IAAQ,QACV,EAAK,EAAQ,IAAI,CAAG,CAAC,EAEf,OACD,MACH,AAAK,GAAQ,CAAM,EAKR,GAAa,CAAG,GACzB,EAAK,EAAQ,IAAI,QAAQ,CAAC,EAL1B,GAAK,EAAQ,IAAI,EAAW,CAAC,EACzB,GAAM,CAAM,GACd,EAAK,EAAQ,IAAI,EAAmB,CAAC,GAKzC,UACG,SACH,AAAK,GAAQ,CAAM,GACjB,GAAK,EAAQ,IAAI,EAAW,CAAC,EACzB,GAAM,CAAM,GACd,EAAK,EAAQ,IAAI,EAAmB,CAAC,GAGzC,UACG,MACH,AAAI,GAAM,CAAM,GACd,EAAK,EAAQ,IAAI,EAAW,CAAC,EAE/B,MAGN,GAAM,GAAM,AAAC,GAAY,CACvB,AAAI,EAAQ,QAAQ,WAClB,EAAQ,QAAQ,UAAU,CACxB,OAAQ,EACR,SACA,MACA,OACA,WACA,WACA,WACF,CAAC,EAEH,AAAI,EAAQ,QAAQ,UAClB,EAAQ,QAAQ,UAAU,CAAO,EAEjC,EAAQ,CAEZ,EACA,EAAQ,QAAQ,CAAG,CACrB,CACA,GAAI,IAAqC,GAAQ,6BAA6B,EAC1E,GAAiB,GAAI,KAAI,OAAO,oBAAoB,MAAM,EAAE,IAAI,AAAC,GAAQ,OAAO,EAAI,EAAE,OAAO,EAAQ,CAAC,EACtG,GAAuB,GAAa,EACpC,GAA8B,GAAa,EAAI,EAC/C,GAAwC,GAA4B,EACxE,aAAuC,CACrC,GAAM,GAAmB,CAAC,EAC1B,OAAC,WAAY,UAAW,aAAa,EAAE,QAAQ,AAAC,GAAQ,CACtD,EAAiB,GAAO,YAAY,EAAM,CACxC,GAAM,GAAM,EAAM,IAAI,EACtB,OAAS,GAAI,EAAG,EAAI,KAAK,OAAQ,EAAI,EAAG,IACtC,EAAM,EAAK,MAAO,EAAI,EAAE,EAE1B,GAAM,GAAM,EAAI,GAAK,GAAG,CAAI,EAC5B,MAAI,KAAQ,IAAM,IAAQ,GACjB,EAAI,GAAK,GAAG,EAAK,IAAI,CAAK,CAAC,EAE3B,CAEX,CACF,CAAC,EACD,CAAC,OAAQ,MAAO,QAAS,UAAW,QAAQ,EAAE,QAAQ,AAAC,GAAQ,CAC7D,EAAiB,GAAO,YAAY,EAAM,CACxC,GAAc,EACd,GAAM,GAAM,EAAM,IAAI,EAAE,GAAK,MAAM,KAAM,CAAI,EAC7C,UAAc,EACP,CACT,CACF,CAAC,EACM,CACT,CACA,YAAsB,EAAa,GAAO,EAAU,GAAO,CACzD,MAAO,UAAc,EAAQ,EAAK,EAAU,CAC1C,GAAI,IAAQ,iBACV,MAAO,CAAC,EACH,GAAI,IAAQ,iBACjB,MAAO,GACF,GAAI,IAAQ,WAAa,IAAc,GAAa,EAAU,GAAqB,GAAc,EAAU,GAAqB,IAAa,IAAI,CAAM,EAC5J,MAAO,GAET,GAAM,GAAgB,GAAQ,CAAM,EACpC,GAAI,CAAC,GAAc,GAAiB,GAAO,GAAuB,CAAG,EACnE,MAAO,SAAQ,IAAI,GAAuB,EAAK,CAAQ,EAEzD,GAAM,GAAM,QAAQ,IAAI,EAAQ,EAAK,CAAQ,EAO7C,MANI,IAAS,CAAG,EAAI,GAAe,IAAI,CAAG,EAAI,GAAmB,CAAG,IAG/D,IACH,EAAM,EAAQ,MAAO,CAAG,EAEtB,GACK,EAEL,GAAM,CAAG,EAEJ,AADc,CAAC,GAAiB,CAAC,GAAa,CAAG,EAClC,EAAI,MAAQ,EAEhC,GAAS,CAAG,EACP,EAAa,GAAS,CAAG,EAAI,GAAU,CAAG,EAE5C,CACT,CACF,CACA,GAAI,IAAuB,GAAa,EACxC,YAAsB,EAAU,GAAO,CACrC,MAAO,UAAc,EAAQ,EAAK,EAAO,EAAU,CACjD,GAAI,GAAW,EAAO,GACtB,GAAI,CAAC,GACH,GAAQ,EAAM,CAAK,EACnB,EAAW,EAAM,CAAQ,EACrB,CAAC,GAAQ,CAAM,GAAK,GAAM,CAAQ,GAAK,CAAC,GAAM,CAAK,GACrD,SAAS,MAAQ,EACV,GAGX,GAAM,GAAS,GAAQ,CAAM,GAAK,GAAa,CAAG,EAAI,OAAO,CAAG,EAAI,EAAO,OAAS,GAAO,EAAQ,CAAG,EAChG,EAAS,QAAQ,IAAI,EAAQ,EAAK,EAAO,CAAQ,EACvD,MAAI,KAAW,EAAM,CAAQ,GAC3B,CAAK,EAEM,GAAW,EAAO,CAAQ,GACnC,GAAQ,EAAQ,MAAO,EAAK,EAAO,CAAQ,EAF3C,GAAQ,EAAQ,MAAO,EAAK,CAAK,GAK9B,CACT,CACF,CACA,YAAwB,EAAQ,EAAK,CACnC,GAAM,GAAS,GAAO,EAAQ,CAAG,EAC3B,EAAW,EAAO,GAClB,EAAS,QAAQ,eAAe,EAAQ,CAAG,EACjD,MAAI,IAAU,GACZ,GAAQ,EAAQ,SAAU,EAAK,OAAQ,CAAQ,EAE1C,CACT,CACA,YAAa,EAAQ,EAAK,CACxB,GAAM,GAAS,QAAQ,IAAI,EAAQ,CAAG,EACtC,MAAI,EAAC,GAAS,CAAG,GAAK,CAAC,GAAe,IAAI,CAAG,IAC3C,EAAM,EAAQ,MAAO,CAAG,EAEnB,CACT,CACA,YAAiB,EAAQ,CACvB,SAAM,EAAQ,UAAW,GAAQ,CAAM,EAAI,SAAW,EAAW,EAC1D,QAAQ,QAAQ,CAAM,CAC/B,CACA,GAAI,IAAkB,CACpB,IAAK,GACL,IAAK,GACL,kBACA,OACA,UACF,EACI,GAAmB,CACrB,IAAK,GACL,IAAI,EAAQ,EAAK,CAEb,eAAQ,KAAK,yBAAyB,OAAO,CAAG,iCAAkC,CAAM,EAEnF,EACT,EACA,eAAe,EAAQ,EAAK,CAExB,eAAQ,KAAK,4BAA4B,OAAO,CAAG,iCAAkC,CAAM,EAEtF,EACT,CACF,EACI,GAAa,AAAC,GAAU,GAAS,CAAK,EAAI,GAAU,CAAK,EAAI,EAC7D,GAAa,AAAC,GAAU,GAAS,CAAK,EAAI,GAAS,CAAK,EAAI,EAC5D,GAAY,AAAC,GAAU,EACvB,GAAW,AAAC,GAAM,QAAQ,eAAe,CAAC,EAC9C,YAAe,EAAQ,EAAK,EAAa,GAAO,EAAY,GAAO,CACjE,EAAS,EACP,QAGF,GAAM,GAAY,EAAM,CAAM,EACxB,EAAS,EAAM,CAAG,EACxB,AAAI,IAAQ,GACV,CAAC,GAAc,EAAM,EAAW,MAAO,CAAG,EAE5C,CAAC,GAAc,EAAM,EAAW,MAAO,CAAM,EAC7C,GAAM,CAAE,IAAK,GAAS,GAAS,CAAS,EAClC,EAAO,EAAY,GAAY,EAAa,GAAa,GAC/D,GAAI,EAAK,KAAK,EAAW,CAAG,EAC1B,MAAO,GAAK,EAAO,IAAI,CAAG,CAAC,EACtB,GAAI,EAAK,KAAK,EAAW,CAAM,EACpC,MAAO,GAAK,EAAO,IAAI,CAAM,CAAC,EACzB,AAAI,IAAW,GACpB,EAAO,IAAI,CAAG,CAElB,CACA,YAAe,EAAK,EAAa,GAAO,CACtC,GAAM,GAAS,KACb,QAGI,EAAY,EAAM,CAAM,EACxB,EAAS,EAAM,CAAG,EACxB,MAAI,KAAQ,GACV,CAAC,GAAc,EAAM,EAAW,MAAO,CAAG,EAE5C,CAAC,GAAc,EAAM,EAAW,MAAO,CAAM,EACtC,IAAQ,EAAS,EAAO,IAAI,CAAG,EAAI,EAAO,IAAI,CAAG,GAAK,EAAO,IAAI,CAAM,CAChF,CACA,YAAc,EAAQ,EAAa,GAAO,CACxC,SAAS,EACP,QAGF,CAAC,GAAc,EAAM,EAAM,CAAM,EAAG,UAAW,EAAW,EACnD,QAAQ,IAAI,EAAQ,OAAQ,CAAM,CAC3C,CACA,YAAa,EAAO,CAClB,EAAQ,EAAM,CAAK,EACnB,GAAM,GAAS,EAAM,IAAI,EAGzB,MAAK,AADU,AADD,IAAS,CAAM,EACR,IAAI,KAAK,EAAQ,CAAK,GAEzC,GAAO,IAAI,CAAK,EAChB,GAAQ,EAAQ,MAAO,EAAO,CAAK,GAE9B,IACT,CACA,YAAe,EAAK,EAAO,CACzB,EAAQ,EAAM,CAAK,EACnB,GAAM,GAAS,EAAM,IAAI,EACnB,CAAE,IAAK,EAAM,IAAK,GAAS,GAAS,CAAM,EAC5C,EAAS,EAAK,KAAK,EAAQ,CAAG,EAClC,AAAK,EAIH,GAAkB,EAAQ,EAAM,CAAG,EAHnC,GAAM,EAAM,CAAG,EACf,EAAS,EAAK,KAAK,EAAQ,CAAG,GAIhC,GAAM,GAAW,EAAK,KAAK,EAAQ,CAAG,EACtC,SAAO,IAAI,EAAK,CAAK,EACrB,AAAK,EAEM,GAAW,EAAO,CAAQ,GACnC,GAAQ,EAAQ,MAAO,EAAK,EAAO,CAAQ,EAF3C,GAAQ,EAAQ,MAAO,EAAK,CAAK,EAI5B,IACT,CACA,YAAqB,EAAK,CACxB,GAAM,GAAS,EAAM,IAAI,EACnB,CAAE,IAAK,EAAM,IAAK,GAAS,GAAS,CAAM,EAC5C,EAAS,EAAK,KAAK,EAAQ,CAAG,EAClC,AAAK,EAIH,GAAkB,EAAQ,EAAM,CAAG,EAHnC,GAAM,EAAM,CAAG,EACf,EAAS,EAAK,KAAK,EAAQ,CAAG,GAIhC,GAAM,GAAW,EAAO,EAAK,KAAK,EAAQ,CAAG,EAAI,OAC3C,EAAS,EAAO,OAAO,CAAG,EAChC,MAAI,IACF,GAAQ,EAAQ,SAAU,EAAK,OAAQ,CAAQ,EAE1C,CACT,CACA,aAAiB,CACf,GAAM,GAAS,EAAM,IAAI,EACnB,EAAW,EAAO,OAAS,EAC3B,EAAmB,GAAM,CAAM,EAAI,GAAI,KAAI,CAAM,EAAI,GAAI,KAAI,CAAM,EACnE,EAAS,EAAO,MAAM,EAC5B,MAAI,IACF,GAAQ,EAAQ,QAAS,OAAQ,OAAQ,CAAS,EAE7C,CACT,CACA,YAAuB,EAAY,EAAW,CAC5C,MAAO,UAAiB,EAAU,EAAS,CACzC,GAAM,GAAW,KACX,EAAS,EACb,QAGI,EAAY,EAAM,CAAM,EACxB,EAAO,EAAY,GAAY,EAAa,GAAa,GAC/D,OAAC,GAAc,EAAM,EAAW,UAAW,EAAW,EAC/C,EAAO,QAAQ,CAAC,EAAO,IACrB,EAAS,KAAK,EAAS,EAAK,CAAK,EAAG,EAAK,CAAG,EAAG,CAAQ,CAC/D,CACH,CACF,CACA,YAA8B,EAAQ,EAAY,EAAW,CAC3D,MAAO,aAAY,EAAM,CACvB,GAAM,GAAS,KACb,QAGI,EAAY,EAAM,CAAM,EACxB,EAAc,GAAM,CAAS,EAC7B,EAAS,IAAW,WAAa,IAAW,OAAO,UAAY,EAC/D,EAAY,IAAW,QAAU,EACjC,EAAgB,EAAO,GAAQ,GAAG,CAAI,EACtC,EAAO,EAAY,GAAY,EAAa,GAAa,GAC/D,OAAC,GAAc,EAAM,EAAW,UAAW,EAAY,GAAsB,EAAW,EACjF,CAEL,MAAO,CACL,GAAM,CAAE,QAAO,QAAS,EAAc,KAAK,EAC3C,MAAO,GAAO,CAAE,QAAO,MAAK,EAAI,CAC9B,MAAO,EAAS,CAAC,EAAK,EAAM,EAAE,EAAG,EAAK,EAAM,EAAE,CAAC,EAAI,EAAK,CAAK,EAC7D,MACF,CACF,EAEA,CAAC,OAAO,WAAY,CAClB,MAAO,KACT,CACF,CACF,CACF,CACA,YAA8B,EAAM,CAClC,MAAO,aAAY,EAAM,CACb,CACR,GAAM,GAAM,EAAK,GAAK,WAAW,EAAK,OAAS,GAC/C,QAAQ,KAAK,GAAG,GAAW,CAAI,eAAe,+BAAkC,EAAM,IAAI,CAAC,CAC7F,CACA,MAAO,KAAS,SAAW,GAAQ,IACrC,CACF,CACA,aAAkC,CAChC,GAAM,GAA2B,CAC/B,IAAI,EAAK,CACP,MAAO,IAAM,KAAM,CAAG,CACxB,EACA,GAAI,OAAO,CACT,MAAO,IAAK,IAAI,CAClB,EACA,IAAK,GACL,OACA,IAAK,GACL,OAAQ,GACR,SACA,QAAS,GAAc,GAAO,EAAK,CACrC,EACM,EAA2B,CAC/B,IAAI,EAAK,CACP,MAAO,IAAM,KAAM,EAAK,GAAO,EAAI,CACrC,EACA,GAAI,OAAO,CACT,MAAO,IAAK,IAAI,CAClB,EACA,IAAK,GACL,OACA,IAAK,GACL,OAAQ,GACR,SACA,QAAS,GAAc,GAAO,EAAI,CACpC,EACM,EAA4B,CAChC,IAAI,EAAK,CACP,MAAO,IAAM,KAAM,EAAK,EAAI,CAC9B,EACA,GAAI,OAAO,CACT,MAAO,IAAK,KAAM,EAAI,CACxB,EACA,IAAI,EAAK,CACP,MAAO,IAAM,KAAK,KAAM,EAAK,EAAI,CACnC,EACA,IAAK,GACH,KAEF,EACA,IAAK,GACH,KAEF,EACA,OAAQ,GACN,QAEF,EACA,MAAO,GACL,OAEF,EACA,QAAS,GAAc,GAAM,EAAK,CACpC,EACM,EAAmC,CACvC,IAAI,EAAK,CACP,MAAO,IAAM,KAAM,EAAK,GAAM,EAAI,CACpC,EACA,GAAI,OAAO,CACT,MAAO,IAAK,KAAM,EAAI,CACxB,EACA,IAAI,EAAK,CACP,MAAO,IAAM,KAAK,KAAM,EAAK,EAAI,CACnC,EACA,IAAK,GACH,KAEF,EACA,IAAK,GACH,KAEF,EACA,OAAQ,GACN,QAEF,EACA,MAAO,GACL,OAEF,EACA,QAAS,GAAc,GAAM,EAAI,CACnC,EAEA,MADwB,CAAC,OAAQ,SAAU,UAAW,OAAO,QAAQ,EACrD,QAAQ,AAAC,GAAW,CAClC,EAAyB,GAAU,GAAqB,EAAQ,GAAO,EAAK,EAC5E,EAA0B,GAAU,GAAqB,EAAQ,GAAM,EAAK,EAC5E,EAAyB,GAAU,GAAqB,EAAQ,GAAO,EAAI,EAC3E,EAAiC,GAAU,GAAqB,EAAQ,GAAM,EAAI,CACpF,CAAC,EACM,CACL,EACA,EACA,EACA,CACF,CACF,CACA,GAAI,CAAC,GAAyB,GAA0B,GAAyB,IAAmD,GAAuB,EAC3J,YAAqC,EAAY,EAAS,CACxD,GAAM,GAAmB,EAAU,EAAa,GAAkC,GAA0B,EAAa,GAA2B,GACpJ,MAAO,CAAC,EAAQ,EAAK,IACf,IAAQ,iBACH,CAAC,EACC,IAAQ,iBACV,EACE,IAAQ,UACV,EAEF,QAAQ,IAAI,GAAO,EAAkB,CAAG,GAAK,IAAO,GAAS,EAAmB,EAAQ,EAAK,CAAQ,CAEhH,CACA,GAAI,IAA4B,CAC9B,IAAqB,GAA4B,GAAO,EAAK,CAC/D,EACI,GAA6B,CAC/B,IAAqB,GAA4B,GAAM,EAAK,CAC9D,EACA,YAA2B,EAAQ,EAAM,EAAK,CAC5C,GAAM,GAAS,EAAM,CAAG,EACxB,GAAI,IAAW,GAAO,EAAK,KAAK,EAAQ,CAAM,EAAG,CAC/C,GAAM,GAAO,GAAU,CAAM,EAC7B,QAAQ,KAAK,YAAY,mEAAsE,IAAS,MAAQ,WAAa,gKAAgK,CAC/R,CACF,CACA,GAAI,IAA8B,GAAI,SAClC,GAAqC,GAAI,SACzC,GAA8B,GAAI,SAClC,GAAqC,GAAI,SAC7C,YAAuB,EAAS,CAC9B,OAAQ,OACD,aACA,QACH,MAAO,OACJ,UACA,UACA,cACA,UACH,MAAO,WAEP,MAAO,GAEb,CACA,YAAuB,EAAO,CAC5B,MAAO,GACL,UAEG,CAAC,OAAO,aAAa,CAAK,EAAI,EAAI,GAAc,GAAU,CAAK,CAAC,CACvE,CACA,YAAmB,EAAQ,CACzB,MAAI,IAAU,EACZ,eAGO,EAEF,GAAqB,EAAQ,GAAO,GAAiB,GAA2B,EAAW,CACpG,CACA,YAAkB,EAAQ,CACxB,MAAO,IAAqB,EAAQ,GAAM,GAAkB,GAA4B,EAAW,CACrG,CACA,YAA8B,EAAQ,EAAY,EAAc,EAAoB,EAAU,CAC5F,GAAI,CAAC,GAAS,CAAM,EAEhB,eAAQ,KAAK,kCAAkC,OAAO,CAAM,GAAG,EAE1D,EAET,GAAI,EACF,SAEG,CAAE,IAAc,EACnB,gBAGA,MAAO,GAET,GAAM,GAAgB,EAAS,IAAI,CAAM,EACzC,GAAI,EACF,MAAO,GAET,GAAM,GAAa,GAAc,CAAM,EACvC,GAAI,IAAe,EACjB,MAAO,GAET,GAAM,GAAQ,GAAI,OAAM,EAAQ,IAAe,EAAI,EAAqB,CAAY,EACpF,SAAS,IAAI,EAAQ,CAAK,EACnB,CACT,CACA,WAAe,EAAU,CACvB,MAAO,IAAY,EAAM,EACvB,OAED,GAAK,CACR,CACA,YAAe,EAAG,CAChB,MAAO,SAAQ,GAAK,EAAE,YAAc,EAAI,CAC1C,CAGA,EAAM,WAAY,IAAM,EAAQ,EAGhC,EAAM,WAAY,AAAC,GAAO,GAAS,KAAK,GAAU,CAAE,CAAC,EAGrD,EAAM,QAAS,CAAC,EAAI,CAAE,cAAe,EAAgB,QAAS,KAAe,CAAC,EAAK,IAAa,CAC9F,GAAI,GAAY,EAAe,CAAG,EAM9B,EAAU,GALD,IAAM,CACjB,GAAI,GACJ,SAAU,AAAC,GAAM,EAAQ,CAAC,EACnB,CACT,EAC4B,CAAQ,EACpC,EAAS,CAAO,CAClB,CAAC,EAGD,EAAM,QAAS,EAAS,EAGxB,EAAM,OAAQ,AAAC,GAAO,GAAM,CAAE,CAAC,EAG/B,EAAM,OAAQ,AAAC,GAAO,GAAY,CAAE,CAAC,EAGrC,EAAM,OAAQ,AAAC,GACT,GAAG,eAEP,GAAG,cAAgB,GAAa,GAAoB,CAAE,CAAC,GAChD,EAAG,cACX,EACD,YAA6B,EAAI,CAC/B,GAAI,GAAa,CAAC,EAClB,UAAY,EAAI,AAAC,GAAM,CACrB,AAAI,EAAE,SACJ,EAAW,KAAK,EAAE,OAAO,CAC7B,CAAC,EACM,CACT,CAGA,GAAI,IAAe,CAAC,EACpB,YAA4B,EAAM,CAChC,MAAK,IAAa,IAChB,IAAa,GAAQ,GAChB,EAAE,GAAa,EACxB,CACA,YAAuB,EAAI,EAAM,CAC/B,MAAO,IAAY,EAAI,AAAC,GAAY,CAClC,GAAI,EAAQ,QAAU,EAAQ,OAAO,GACnC,MAAO,EACX,CAAC,CACH,CACA,YAAmB,EAAI,EAAM,CAC3B,AAAK,EAAG,QACN,GAAG,OAAS,CAAC,GACV,EAAG,OAAO,IACb,GAAG,OAAO,GAAQ,GAAmB,CAAI,EAC7C,CAGA,EAAM,KAAM,CAAC,EAAI,CAAE,QAAS,KAAe,CAAC,EAAM,EAAM,OAAS,CAC/D,GAAI,GAAW,GAAG,IAAO,EAAM,IAAI,IAAQ,KAC3C,MAAO,IAAuB,EAAI,EAAU,EAAU,IAAM,CAC1D,GAAI,GAAO,GAAc,EAAI,CAAI,EAC7B,EAAK,EAAO,EAAK,OAAO,GAAQ,GAAmB,CAAI,EAC3D,MAAO,GAAM,GAAG,KAAQ,KAAM,IAAQ,GAAG,KAAQ,GACnD,CAAC,CACH,CAAC,EACD,GAAe,CAAC,EAAM,IAAO,CAC3B,AAAI,EAAK,OACP,GAAG,MAAQ,EAAK,MAEpB,CAAC,EACD,YAAgC,EAAI,EAAU,EAAU,EAAU,CAGhE,GAFK,EAAG,OACN,GAAG,MAAQ,CAAC,GACV,EAAG,MAAM,GACX,MAAO,GAAG,MAAM,GAClB,GAAI,GAAS,EAAS,EACtB,SAAG,MAAM,GAAY,EACrB,EAAS,IAAM,CACb,MAAO,GAAG,MAAM,EAClB,CAAC,EACM,CACT,CAGA,EAAM,KAAM,AAAC,GAAO,CAAE,EAGtB,GAAuB,QAAS,QAAS,OAAO,EAChD,GAAuB,UAAW,UAAW,SAAS,EACtD,YAAgC,EAAM,EAAW,EAAM,CACrD,EAAM,EAAW,AAAC,GAAO,EAAK,mBAAmB,oCAA4C,gDAAmD,IAAQ,CAAE,CAAC,CAC7J,CAGA,EAAU,YAAa,CAAC,EAAI,CAAE,cAAc,CAAE,OAAQ,EAAS,cAAe,EAAgB,QAAS,KAAe,CACpH,GAAI,GAAO,EAAe,CAAU,EAChC,EAAW,IAAM,CACnB,GAAI,GACJ,SAAK,AAAC,GAAM,EAAS,CAAC,EACf,CACT,EACI,EAAmB,EAAe,GAAG,mBAA4B,EACjE,EAAW,AAAC,GAAQ,EAAiB,IAAM,CAC/C,EAAG,CAAE,MAAO,CAAE,cAAiB,CAAI,CAAE,CAAC,EAClC,EAAe,EAAS,EAC5B,EAAS,CAAY,EACrB,eAAe,IAAM,CACnB,GAAI,CAAC,EAAG,SACN,OACF,EAAG,wBAAwB,QAAW,EACtC,GAAI,GAAW,EAAG,SAAS,IACvB,EAAW,EAAG,SAAS,IACvB,EAAsB,GACxB,CACE,KAAM,CACJ,MAAO,GAAS,CAClB,EACA,IAAI,EAAO,CACT,EAAS,CAAK,CAChB,CACF,EACA,CACE,KAAM,CACJ,MAAO,GAAS,CAClB,EACA,IAAI,EAAO,CACT,EAAS,CAAK,CAChB,CACF,CACF,EACA,EAAS,CAAmB,CAC9B,CAAC,CACH,CAAC,EAGD,EAAU,WAAY,CAAC,EAAI,CAAE,YAAW,cAAc,CAAE,QAAS,KAAe,CAC9E,AAAI,EAAG,QAAQ,YAAY,IAAM,YAC/B,EAAK,kDAAmD,CAAE,EAC5D,GAAI,GAAS,GAAU,CAAU,EAC7B,EAAS,EAAG,QAAQ,UAAU,EAAI,EAAE,kBACxC,EAAG,YAAc,EACjB,EAAO,gBAAkB,EACzB,EAAG,aAAa,yBAA0B,EAAI,EAC9C,EAAO,aAAa,uBAAwB,EAAI,EAC5C,EAAG,kBACL,EAAG,iBAAiB,QAAQ,AAAC,GAAc,CACzC,EAAO,iBAAiB,EAAW,AAAC,GAAM,CACxC,EAAE,gBAAgB,EAClB,EAAG,cAAc,GAAI,GAAE,YAAY,EAAE,KAAM,CAAC,CAAC,CAC/C,CAAC,CACH,CAAC,EAEH,GAAe,EAAQ,CAAC,EAAG,CAAE,EAC7B,GAAI,GAAa,CAAC,EAAQ,EAAS,IAAe,CAChD,AAAI,EAAW,SAAS,SAAS,EAC/B,EAAQ,WAAW,aAAa,EAAQ,CAAO,EAC1C,AAAI,EAAW,SAAS,QAAQ,EACrC,EAAQ,WAAW,aAAa,EAAQ,EAAQ,WAAW,EAE3D,EAAQ,YAAY,CAAM,CAE9B,EACA,EAAU,IAAM,CACd,EAAW,EAAQ,EAAQ,CAAS,EACpC,GAAgB,IAAM,CACpB,GAAS,CAAM,CACjB,CAAC,EAAE,CACL,CAAC,EACD,EAAG,mBAAqB,IAAM,CAC5B,GAAI,GAAU,GAAU,CAAU,EAClC,EAAU,IAAM,CACd,EAAW,EAAG,YAAa,EAAS,CAAS,CAC/C,CAAC,CACH,EACA,EACE,IAAM,EAAU,IAAM,CACpB,EAAO,OAAO,EACd,GAAY,CAAM,CACpB,CAAC,CACH,CACF,CAAC,EACD,GAAI,IAA+B,SAAS,cAAc,KAAK,EAC/D,YAAmB,EAAY,CAC7B,GAAI,GAAS,GAAgB,IACpB,SAAS,cAAc,CAAU,EACvC,IACM,EACR,EAAE,EACH,MAAK,IACH,EAAK,iDAAiD,IAAa,EAC9D,CACT,CAGA,GAAI,IAAU,IAAM,CACpB,EACA,GAAQ,OAAS,CAAC,EAAI,CAAE,aAAa,CAAE,QAAS,KAAe,CAC7D,EAAU,SAAS,MAAM,EAAI,EAAG,cAAgB,GAAO,EAAG,UAAY,GACtE,EAAS,IAAM,CACb,EAAU,SAAS,MAAM,EAAI,MAAO,GAAG,cAAgB,MAAO,GAAG,SACnE,CAAC,CACH,EACA,EAAU,SAAU,EAAO,EAG3B,EAAU,SAAU,GAAgB,CAAC,EAAI,CAAE,cAAc,CAAE,OAAQ,KAAc,CAC/E,EAAQ,EAAc,EAAI,CAAU,CAAC,CACvC,CAAC,CAAC,EAGF,YAAY,EAAI,EAAO,EAAW,EAAU,CAC1C,GAAI,GAAiB,EACjB,EAAW,AAAC,GAAM,EAAS,CAAC,EAC5B,EAAU,CAAC,EACX,EAAc,CAAC,EAAW,IAAY,AAAC,GAAM,EAAQ,EAAW,CAAC,EAarE,GAZI,EAAU,SAAS,KAAK,GAC1B,GAAQ,GAAU,CAAK,GACrB,EAAU,SAAS,OAAO,GAC5B,GAAQ,GAAW,CAAK,GACtB,EAAU,SAAS,SAAS,GAC9B,GAAQ,QAAU,IAChB,EAAU,SAAS,SAAS,GAC9B,GAAQ,QAAU,IAChB,EAAU,SAAS,QAAQ,GAC7B,GAAiB,QACf,EAAU,SAAS,UAAU,GAC/B,GAAiB,UACf,EAAU,SAAS,UAAU,EAAG,CAClC,GAAI,GAAe,EAAU,EAAU,QAAQ,UAAU,EAAI,IAAM,eAC/D,EAAO,GAAU,EAAa,MAAM,IAAI,EAAE,EAAE,EAAI,OAAO,EAAa,MAAM,IAAI,EAAE,EAAE,EAAI,IAC1F,EAAW,GAAS,EAAU,CAAI,CACpC,CACA,GAAI,EAAU,SAAS,UAAU,EAAG,CAClC,GAAI,GAAe,EAAU,EAAU,QAAQ,UAAU,EAAI,IAAM,eAC/D,EAAO,GAAU,EAAa,MAAM,IAAI,EAAE,EAAE,EAAI,OAAO,EAAa,MAAM,IAAI,EAAE,EAAE,EAAI,IAC1F,EAAW,GAAS,EAAU,CAAI,CACpC,CACA,MAAI,GAAU,SAAS,SAAS,GAC9B,GAAW,EAAY,EAAU,CAAC,EAAM,IAAM,CAC5C,EAAE,eAAe,EACjB,EAAK,CAAC,CACR,CAAC,GACC,EAAU,SAAS,MAAM,GAC3B,GAAW,EAAY,EAAU,CAAC,EAAM,IAAM,CAC5C,EAAE,gBAAgB,EAClB,EAAK,CAAC,CACR,CAAC,GACC,EAAU,SAAS,MAAM,GAC3B,GAAW,EAAY,EAAU,CAAC,EAAM,IAAM,CAC5C,EAAK,CAAC,EACN,EAAe,oBAAoB,EAAO,EAAU,CAAO,CAC7D,CAAC,GAEC,GAAU,SAAS,MAAM,GAAK,EAAU,SAAS,SAAS,IAC5D,GAAiB,SACjB,EAAW,EAAY,EAAU,CAAC,EAAM,IAAM,CAC5C,AAAI,EAAG,SAAS,EAAE,MAAM,GAEpB,EAAE,OAAO,cAAgB,IAEzB,GAAG,YAAc,GAAK,EAAG,aAAe,GAExC,EAAG,aAAe,IAEtB,EAAK,CAAC,EACR,CAAC,GAEC,EAAU,SAAS,MAAM,GAC3B,GAAW,EAAY,EAAU,CAAC,EAAM,IAAM,CAC5C,EAAE,SAAW,GAAM,EAAK,CAAC,CAC3B,CAAC,GACC,IAAW,CAAK,GAAK,GAAa,CAAK,IACzC,GAAW,EAAY,EAAU,CAAC,EAAM,IAAM,CAC5C,AAAI,GAA+C,EAAG,CAAS,GAG/D,EAAK,CAAC,CACR,CAAC,GAEH,EAAe,iBAAiB,EAAO,EAAU,CAAO,EACjD,IAAM,CACX,EAAe,oBAAoB,EAAO,EAAU,CAAO,CAC7D,CACF,CACA,YAAmB,EAAS,CAC1B,MAAO,GAAQ,QAAQ,KAAM,GAAG,CAClC,CACA,YAAoB,EAAS,CAC3B,MAAO,GAAQ,YAAY,EAAE,QAAQ,SAAU,CAAC,EAAO,IAAS,EAAK,YAAY,CAAC,CACpF,CACA,YAAmB,EAAS,CAC1B,MAAO,CAAC,MAAM,QAAQ,CAAO,GAAK,CAAC,MAAM,CAAO,CAClD,CACA,YAAoB,EAAS,CAC3B,MAAI,CAAC,IAAK,GAAG,EAAE,SACb,CACF,EACS,EACF,EAAQ,QAAQ,kBAAmB,OAAO,EAAE,QAAQ,QAAS,GAAG,EAAE,YAAY,CACvF,CACA,YAAoB,EAAO,CACzB,MAAO,CAAC,UAAW,OAAO,EAAE,SAAS,CAAK,CAC5C,CACA,YAAsB,EAAO,CAC3B,MAAO,CAAC,cAAe,QAAS,OAAO,EAAE,KAAK,AAAC,GAAM,EAAM,SAAS,CAAC,CAAC,CACxE,CACA,YAAwD,EAAG,EAAW,CACpE,GAAI,GAAe,EAAU,OAAO,AAAC,GAC5B,CAAC,CAAC,SAAU,WAAY,UAAW,OAAQ,OAAQ,UAAW,OAAQ,OAAQ,UAAW,SAAS,EAAE,SAAS,CAAC,CACtH,EACD,GAAI,EAAa,SAAS,UAAU,EAAG,CACrC,GAAI,GAAgB,EAAa,QAAQ,UAAU,EACnD,EAAa,OAAO,EAAe,GAAW,GAAa,EAAgB,IAAM,gBAAgB,MAAM,IAAI,EAAE,EAAE,EAAI,EAAI,CAAC,CAC1H,CACA,GAAI,EAAa,SAAS,UAAU,EAAG,CACrC,GAAI,GAAgB,EAAa,QAAQ,UAAU,EACnD,EAAa,OAAO,EAAe,GAAW,GAAa,EAAgB,IAAM,gBAAgB,MAAM,IAAI,EAAE,EAAE,EAAI,EAAI,CAAC,CAC1H,CAGA,GAFI,EAAa,SAAW,GAExB,EAAa,SAAW,GAAK,GAAe,EAAE,GAAG,EAAE,SAAS,EAAa,EAAE,EAC7E,MAAO,GAET,GAAM,GAA6B,AADR,CAAC,OAAQ,QAAS,MAAO,OAAQ,MAAO,OAAO,EACpB,OAAO,AAAC,GAAa,EAAa,SAAS,CAAQ,CAAC,EAE1G,MADA,GAAe,EAAa,OAAO,AAAC,GAAM,CAAC,EAA2B,SAAS,CAAC,CAAC,EAC7E,IAA2B,OAAS,GAMlC,AALgC,EAA2B,OAAO,AAAC,GACjE,MAAa,OAAS,IAAa,UACrC,GAAW,QACN,EAAE,GAAG,QACb,EAC+B,SAAW,EAA2B,QAChE,IAAa,EAAE,IAAI,GAEnB,GAAe,EAAE,GAAG,EAAE,SAAS,EAAa,EAAE,GAKxD,CACA,YAAwB,EAAK,CAC3B,GAAI,CAAC,EACH,MAAO,CAAC,EACV,EAAM,GAAW,CAAG,EACpB,GAAI,GAAmB,CACrB,KAAQ,UACR,MAAS,IACT,MAAS,IACT,SAAY,IACZ,IAAO,OACP,IAAO,SACP,GAAM,WACN,KAAQ,aACR,KAAQ,aACR,MAAS,cACT,OAAU,IACV,MAAS,IACT,MAAS,IACT,MAAS,IACT,WAAc,GAChB,EACA,SAAiB,GAAO,EACjB,OAAO,KAAK,CAAgB,EAAE,IAAI,AAAC,GAAa,CACrD,GAAI,EAAiB,KAAc,EACjC,MAAO,EACX,CAAC,EAAE,OAAO,AAAC,GAAa,CAAQ,CAClC,CAGA,EAAU,QAAS,CAAC,EAAI,CAAE,YAAW,cAAc,CAAE,OAAQ,EAAS,QAAS,KAAe,CAC5F,GAAI,GAAc,EAClB,AAAI,EAAU,SAAS,QAAQ,GAC7B,GAAc,EAAG,YAEnB,GAAI,GAAc,EAAc,EAAa,CAAU,EACnD,EACJ,AAAI,MAAO,IAAe,SACxB,EAAc,EAAc,EAAa,GAAG,mBAA4B,EACnE,AAAI,MAAO,IAAe,YAAc,MAAO,GAAW,GAAM,SACrE,EAAc,EAAc,EAAa,GAAG,EAAW,mBAAmB,EAE1E,EAAc,IAAM,CACpB,EAEF,GAAI,GAAW,IAAM,CACnB,GAAI,GACJ,SAAY,AAAC,GAAU,EAAS,CAAK,EAC9B,GAAe,CAAM,EAAI,EAAO,IAAI,EAAI,CACjD,EACI,EAAW,AAAC,GAAU,CACxB,GAAI,GACJ,EAAY,AAAC,GAAW,EAAS,CAAM,EACvC,AAAI,GAAe,CAAM,EACvB,EAAO,IAAI,CAAK,EAEhB,EAAY,IAAM,CAClB,EAAG,CACD,MAAO,CAAE,cAAiB,CAAM,CAClC,CAAC,CAEL,EACA,AAAI,MAAO,IAAe,UAAY,EAAG,OAAS,SAChD,EAAU,IAAM,CACd,AAAK,EAAG,aAAa,MAAM,GACzB,EAAG,aAAa,OAAQ,CAAU,CACtC,CAAC,EAEH,GAAI,GAAQ,EAAG,QAAQ,YAAY,IAAM,UAAY,CAAC,WAAY,OAAO,EAAE,SAAS,EAAG,IAAI,GAAK,EAAU,SAAS,MAAM,EAAI,SAAW,QACxI,GAAI,GAAiB,GAAY,IAAM,CACvC,EAAI,GAAG,EAAI,EAAO,EAAW,AAAC,GAAM,CAClC,EAAS,GAAc,EAAI,EAAW,EAAG,EAAS,CAAC,CAAC,CACtD,CAAC,EAYD,GAXI,EAAU,SAAS,MAAM,GACvB,EAAC,OAAQ,KAAM,EAAE,EAAE,SAAS,EAAS,CAAC,GAAK,GAAW,CAAE,GAAK,MAAM,QAAQ,EAAS,CAAC,GAAK,EAAG,QAAQ,YAAY,IAAM,UAAY,EAAG,WACxI,EACE,GAAc,EAAI,EAAW,CAAE,OAAQ,CAAG,EAAG,EAAS,CAAC,CACzD,EAGC,EAAG,yBACN,GAAG,wBAA0B,CAAC,GAChC,EAAG,wBAAwB,QAAa,EACxC,EAAS,IAAM,EAAG,wBAAwB,QAAW,CAAC,EAClD,EAAG,KAAM,CACX,GAAI,GAAsB,GAAG,EAAG,KAAM,QAAS,CAAC,EAAG,AAAC,GAAM,CACxD,GAAS,IAAM,EAAG,UAAY,EAAG,SAAS,IAAI,GAAc,EAAI,EAAW,CAAE,OAAQ,CAAG,EAAG,EAAS,CAAC,CAAC,CAAC,CACzG,CAAC,EACD,EAAS,IAAM,EAAoB,CAAC,CACtC,CACA,EAAG,SAAW,CACZ,KAAM,CACJ,MAAO,GAAS,CAClB,EACA,IAAI,EAAO,CACT,EAAS,CAAK,CAChB,CACF,EACA,EAAG,oBAAsB,AAAC,GAAU,CAClC,AAAI,IAAU,QAAU,MAAO,IAAe,UAAY,EAAW,MAAM,IAAI,GAC7E,GAAQ,IACV,OAAO,UAAY,GACnB,EAAU,IAAM,GAAK,EAAI,QAAS,CAAK,CAAC,EACxC,MAAO,QAAO,SAChB,EACA,EAAQ,IAAM,CACZ,GAAI,GAAQ,EAAS,EACrB,AAAI,EAAU,SAAS,aAAa,GAAK,SAAS,cAAc,WAAW,CAAE,GAE7E,EAAG,oBAAoB,CAAK,CAC9B,CAAC,CACH,CAAC,EACD,YAAuB,EAAI,EAAW,EAAO,EAAc,CACzD,MAAO,GAAU,IAAM,CACrB,GAAI,YAAiB,cAAe,EAAM,SAAW,OACnD,MAAO,GAAM,SAAW,MAAQ,EAAM,SAAW,OAAS,EAAM,OAAS,EAAM,OAAO,MACnF,GAAI,GAAW,CAAE,EACpB,GAAI,MAAM,QAAQ,CAAY,EAAG,CAC/B,GAAI,GAAW,KACf,MAAI,GAAU,SAAS,QAAQ,EAC7B,EAAW,GAAgB,EAAM,OAAO,KAAK,EACxC,AAAI,EAAU,SAAS,SAAS,EACrC,EAAW,GAAiB,EAAM,OAAO,KAAK,EAE9C,EAAW,EAAM,OAAO,MAEnB,EAAM,OAAO,QAAU,EAAa,SAAS,CAAQ,EAAI,EAAe,EAAa,OAAO,CAAC,CAAQ,CAAC,EAAI,EAAa,OAAO,AAAC,GAAQ,CAAC,GAAyB,EAAK,CAAQ,CAAC,CACxL,KACE,OAAO,GAAM,OAAO,YAEjB,IAAI,EAAG,QAAQ,YAAY,IAAM,UAAY,EAAG,SACrD,MAAI,GAAU,SAAS,QAAQ,EACtB,MAAM,KAAK,EAAM,OAAO,eAAe,EAAE,IAAI,AAAC,GAAW,CAC9D,GAAI,GAAW,EAAO,OAAS,EAAO,KACtC,MAAO,IAAgB,CAAQ,CACjC,CAAC,EACQ,EAAU,SAAS,SAAS,EAC9B,MAAM,KAAK,EAAM,OAAO,eAAe,EAAE,IAAI,AAAC,GAAW,CAC9D,GAAI,GAAW,EAAO,OAAS,EAAO,KACtC,MAAO,IAAiB,CAAQ,CAClC,CAAC,EAEI,MAAM,KAAK,EAAM,OAAO,eAAe,EAAE,IAAI,AAAC,GAC5C,EAAO,OAAS,EAAO,IAC/B,EACI,CACL,GAAI,GAUJ,MATA,AAAI,IAAQ,CAAE,EACZ,AAAI,EAAM,OAAO,QACf,EAAW,EAAM,OAAO,MAExB,EAAW,EAGb,EAAW,EAAM,OAAO,MAEtB,EAAU,SAAS,QAAQ,EACtB,GAAgB,CAAQ,EACtB,EAAU,SAAS,SAAS,EAC9B,GAAiB,CAAQ,EACvB,EAAU,SAAS,MAAM,EAC3B,EAAS,KAAK,EAEd,CAEX,EACF,CAAC,CACH,CACA,YAAyB,EAAU,CACjC,GAAI,GAAS,EAAW,WAAW,CAAQ,EAAI,KAC/C,MAAO,IAAW,CAAM,EAAI,EAAS,CACvC,CACA,YAAkC,EAAQ,EAAQ,CAChD,MAAO,IAAU,CACnB,CACA,YAAoB,EAAS,CAC3B,MAAO,CAAC,MAAM,QAAQ,CAAO,GAAK,CAAC,MAAM,CAAO,CAClD,CACA,YAAwB,EAAO,CAC7B,MAAO,KAAU,MAAQ,MAAO,IAAU,UAAY,MAAO,GAAM,KAAQ,YAAc,MAAO,GAAM,KAAQ,UAChH,CAGA,EAAU,QAAS,AAAC,GAAO,eAAe,IAAM,EAAU,IAAM,EAAG,gBAAgB,GAAO,OAAO,CAAC,CAAC,CAAC,CAAC,EAGrG,GAAgB,IAAM,IAAI,GAAO,MAAM,IAAI,EAC3C,EAAU,OAAQ,GAAgB,CAAC,EAAI,CAAE,cAAc,CAAE,SAAU,KAC7D,MAAO,IAAe,SACjB,CAAC,CAAC,EAAW,KAAK,GAAK,EAAU,EAAY,CAAC,EAAG,EAAK,EAExD,EAAU,EAAY,CAAC,EAAG,EAAK,CACvC,CAAC,EAGF,EAAU,OAAQ,CAAC,EAAI,CAAE,cAAc,CAAE,OAAQ,EAAS,cAAe,KAAqB,CAC5F,GAAI,GAAY,EAAe,CAAU,EACzC,EAAQ,IAAM,CACZ,EAAU,AAAC,GAAU,CACnB,EAAU,IAAM,CACd,EAAG,YAAc,CACnB,CAAC,CACH,CAAC,CACH,CAAC,CACH,CAAC,EAGD,EAAU,OAAQ,CAAC,EAAI,CAAE,cAAc,CAAE,OAAQ,EAAS,cAAe,KAAqB,CAC5F,GAAI,GAAY,EAAe,CAAU,EACzC,EAAQ,IAAM,CACZ,EAAU,AAAC,GAAU,CACnB,EAAU,IAAM,CACd,EAAG,UAAY,EACf,EAAG,cAAgB,GACnB,GAAS,CAAE,EACX,MAAO,GAAG,aACZ,CAAC,CACH,CAAC,CACH,CAAC,CACH,CAAC,EAGD,GAAc,GAAa,IAAK,GAAK,GAAO,OAAO,CAAC,CAAC,CAAC,EACtD,GAAI,IAAW,CAAC,EAAI,CAAE,QAAO,YAAW,aAAY,YAAY,CAAE,OAAQ,EAAS,QAAS,KAAe,CACzG,GAAI,CAAC,EAAO,CACV,GAAI,GAAmB,CAAC,EACxB,GAAuB,CAAgB,EAEvC,AADkB,EAAc,EAAI,CAAU,EAClC,AAAC,GAAa,CACxB,GAAoB,EAAI,EAAU,CAAQ,CAC5C,EAAG,CAAE,MAAO,CAAiB,CAAC,EAC9B,MACF,CACA,GAAI,IAAU,MACZ,MAAO,IAAgB,EAAI,CAAU,EACvC,GAAI,EAAG,mBAAqB,EAAG,kBAAkB,IAAU,EAAG,kBAAkB,GAAO,QACrF,OAEF,GAAI,GAAY,EAAc,EAAI,CAAU,EAC5C,EAAQ,IAAM,EAAU,AAAC,GAAW,CAClC,AAAI,IAAW,QAAU,MAAO,IAAe,UAAY,EAAW,MAAM,IAAI,GAC9E,GAAS,IAEX,EAAU,IAAM,GAAK,EAAI,EAAO,EAAQ,CAAS,CAAC,CACpD,CAAC,CAAC,EACF,EAAS,IAAM,CACb,EAAG,qBAAuB,EAAG,oBAAoB,EACjD,EAAG,oBAAsB,EAAG,mBAAmB,CACjD,CAAC,CACH,EACA,GAAS,OAAS,CAAC,EAAI,CAAE,QAAO,YAAW,gBAAiB,CAC1D,AAAI,CAAC,GAEA,GAAG,mBACN,GAAG,kBAAoB,CAAC,GAC1B,EAAG,kBAAkB,GAAS,CAAE,aAAY,QAAS,EAAM,EAC7D,EACA,EAAU,OAAQ,EAAQ,EAC1B,YAAyB,EAAI,EAAY,CACvC,EAAG,iBAAmB,CACxB,CAGA,GAAgB,IAAM,IAAI,GAAO,MAAM,IAAI,EAC3C,EAAU,OAAQ,CAAC,EAAI,CAAE,cAAc,CAAE,QAAS,KAAe,CAC/D,GAAI,GAAqC,CAAE,EACzC,OACF,EAAa,IAAe,GAAK,KAAO,EACxC,GAAI,GAAe,CAAC,EACpB,GAAa,EAAc,CAAE,EAC7B,GAAI,GAAsB,CAAC,EAC3B,GAAoB,EAAqB,CAAY,EACrD,GAAI,GAAQ,GAAS,EAAI,EAAY,CAAE,MAAO,CAAoB,CAAC,EACnE,AAAI,KAAU,QAAU,IAAU,KAChC,GAAQ,CAAC,GACX,GAAa,EAAO,CAAE,EACtB,GAAI,GAAe,GAAS,CAAK,EACjC,GAAiB,CAAY,EAC7B,GAAI,GAAO,GAAe,EAAI,CAAY,EAC1C,EAAa,MAAW,GAAS,EAAI,EAAa,IAAO,EACzD,EAAS,IAAM,CACb,EAAa,SAAc,GAAS,EAAI,EAAa,OAAU,EAC/D,EAAK,CACP,CAAC,CACH,CAAC,EACD,GAAe,CAAC,EAAM,IAAO,CAC3B,AAAI,EAAK,cACP,GAAG,aAAe,EAAK,aACvB,EAAG,aAAa,wBAAyB,EAAI,EAEjD,CAAC,EACD,YAA8C,EAAI,CAChD,MAAK,IAED,GACK,GACF,EAAG,aAAa,uBAAuB,EAHrC,EAIX,CAGA,EAAU,OAAQ,CAAC,EAAI,CAAE,YAAW,cAAc,CAAE,OAAQ,KAAc,CACxE,GAAI,GAAY,EAAc,EAAI,CAAU,EAC5C,AAAK,EAAG,WACN,GAAG,UAAY,IAAM,CACnB,EAAU,IAAM,CACd,EAAG,MAAM,YAAY,UAAW,OAAQ,EAAU,SAAS,WAAW,EAAI,YAAc,MAAM,CAChG,CAAC,CACH,GACG,EAAG,WACN,GAAG,UAAY,IAAM,CACnB,EAAU,IAAM,CACd,AAAI,EAAG,MAAM,SAAW,GAAK,EAAG,MAAM,UAAY,OAChD,EAAG,gBAAgB,OAAO,EAE1B,EAAG,MAAM,eAAe,SAAS,CAErC,CAAC,CACH,GACF,GAAI,GAAO,IAAM,CACf,EAAG,UAAU,EACb,EAAG,WAAa,EAClB,EACI,EAAO,IAAM,CACf,EAAG,UAAU,EACb,EAAG,WAAa,EAClB,EACI,EAA0B,IAAM,WAAW,CAAI,EAC/C,EAAS,GACX,AAAC,GAAU,EAAQ,EAAK,EAAI,EAAK,EACjC,AAAC,GAAU,CACT,AAAI,MAAO,GAAG,oCAAuC,WACnD,EAAG,mCAAmC,EAAI,EAAO,EAAM,CAAI,EAE3D,EAAQ,EAAwB,EAAI,EAAK,CAE7C,CACF,EACI,EACA,EAAY,GAChB,EAAQ,IAAM,EAAU,AAAC,GAAU,CACjC,AAAI,CAAC,GAAa,IAAU,GAExB,GAAU,SAAS,WAAW,GAChC,GAAQ,EAAwB,EAAI,EAAK,GAC3C,EAAO,CAAK,EACZ,EAAW,EACX,EAAY,GACd,CAAC,CAAC,CACJ,CAAC,EAGD,EAAU,MAAO,CAAC,EAAI,CAAE,cAAc,CAAE,OAAQ,EAAS,QAAS,KAAe,CAC/E,GAAI,GAAgB,GAAmB,CAAU,EAC7C,EAAgB,EAAc,EAAI,EAAc,KAAK,EACrD,EAAc,EAChB,EAEA,EAAG,kBAAoB,OACzB,EACA,EAAG,YAAc,CAAC,EAClB,EAAG,UAAY,CAAC,EAChB,EAAQ,IAAM,GAAK,EAAI,EAAe,EAAe,CAAW,CAAC,EACjE,EAAS,IAAM,CACb,OAAO,OAAO,EAAG,SAAS,EAAE,QAAQ,AAAC,GAAQ,EAC3C,IAAM,CACJ,GAAY,CAAG,EACf,EAAI,OAAO,CACb,CACF,CAAC,EACD,MAAO,GAAG,YACV,MAAO,GAAG,SACZ,CAAC,CACH,CAAC,EACD,YAAc,EAAI,EAAe,EAAe,EAAa,CAC3D,GAAI,GAAY,AAAC,GAAM,MAAO,IAAM,UAAY,CAAC,MAAM,QAAQ,CAAC,EAC5D,EAAa,EACjB,EAAc,AAAC,GAAU,CACvB,AAAI,GAAW,CAAK,GAAK,GAAS,GAChC,GAAQ,MAAM,KAAK,MAAM,CAAK,EAAE,KAAK,EAAG,AAAC,GAAM,EAAI,CAAC,GAElD,IAAU,QACZ,GAAQ,CAAC,GACX,GAAI,GAAS,EAAG,UACZ,EAAW,EAAG,YACd,EAAS,CAAC,EACV,EAAO,CAAC,EACZ,GAAI,EAAU,CAAK,EACjB,EAAQ,OAAO,QAAQ,CAAK,EAAE,IAAI,CAAC,CAAC,EAAK,KAAW,CAClD,GAAI,GAAS,GAA2B,EAAe,EAAO,EAAK,CAAK,EACxE,EAAY,AAAC,GAAW,CACtB,AAAI,EAAK,SAAS,CAAM,GACtB,EAAK,yBAA0B,CAAE,EACnC,EAAK,KAAK,CAAM,CAClB,EAAG,CAAE,MAAO,CAAE,MAAO,EAAK,GAAG,CAAO,CAAE,CAAC,EACvC,EAAO,KAAK,CAAM,CACpB,CAAC,MAED,QAAS,GAAI,EAAG,EAAI,EAAM,OAAQ,IAAK,CACrC,GAAI,GAAS,GAA2B,EAAe,EAAM,GAAI,EAAG,CAAK,EACzE,EAAY,AAAC,GAAU,CACrB,AAAI,EAAK,SAAS,CAAK,GACrB,EAAK,yBAA0B,CAAE,EACnC,EAAK,KAAK,CAAK,CACjB,EAAG,CAAE,MAAO,CAAE,MAAO,EAAG,GAAG,CAAO,CAAE,CAAC,EACrC,EAAO,KAAK,CAAM,CACpB,CAEF,GAAI,GAAO,CAAC,EACR,EAAQ,CAAC,EACT,EAAU,CAAC,EACX,EAAQ,CAAC,EACb,OAAS,GAAI,EAAG,EAAI,EAAS,OAAQ,IAAK,CACxC,GAAI,GAAM,EAAS,GACnB,AAAI,EAAK,QAAQ,CAAG,IAAM,IACxB,EAAQ,KAAK,CAAG,CACpB,CACA,EAAW,EAAS,OAAO,AAAC,GAAQ,CAAC,EAAQ,SAAS,CAAG,CAAC,EAC1D,GAAI,GAAU,WACd,OAAS,GAAI,EAAG,EAAI,EAAK,OAAQ,IAAK,CACpC,GAAI,GAAM,EAAK,GACX,EAAY,EAAS,QAAQ,CAAG,EACpC,GAAI,IAAc,GAChB,EAAS,OAAO,EAAG,EAAG,CAAG,EACzB,EAAK,KAAK,CAAC,EAAS,CAAC,CAAC,UACb,IAAc,EAAG,CAC1B,GAAI,GAAY,EAAS,OAAO,EAAG,CAAC,EAAE,GAClC,EAAa,EAAS,OAAO,EAAY,EAAG,CAAC,EAAE,GACnD,EAAS,OAAO,EAAG,EAAG,CAAU,EAChC,EAAS,OAAO,EAAW,EAAG,CAAS,EACvC,EAAM,KAAK,CAAC,EAAW,CAAU,CAAC,CACpC,KACE,GAAM,KAAK,CAAG,EAEhB,EAAU,CACZ,CACA,OAAS,GAAI,EAAG,EAAI,EAAQ,OAAQ,IAAK,CACvC,GAAI,GAAM,EAAQ,GAClB,AAAM,IAAO,IAEb,GAAU,IAAM,CACd,GAAY,EAAO,EAAI,EACvB,EAAO,GAAK,OAAO,CACrB,CAAC,EACD,MAAO,GAAO,GAChB,CACA,OAAS,GAAI,EAAG,EAAI,EAAM,OAAQ,IAAK,CACrC,GAAI,CAAC,EAAW,GAAc,EAAM,GAChC,EAAW,EAAO,GAClB,EAAY,EAAO,GACnB,EAAS,SAAS,cAAc,KAAK,EACzC,EAAU,IAAM,CACd,AAAK,GACH,EAAK,uCAAwC,EAAY,EAAY,CAAM,EAC7E,EAAU,MAAM,CAAM,EACtB,EAAS,MAAM,CAAS,EACxB,EAAU,gBAAkB,EAAU,MAAM,EAAU,cAAc,EACpE,EAAO,OAAO,CAAQ,EACtB,EAAS,gBAAkB,EAAS,MAAM,EAAS,cAAc,EACjE,EAAO,OAAO,CAChB,CAAC,EACD,EAAU,oBAAoB,EAAO,EAAK,QAAQ,CAAU,EAAE,CAChE,CACA,OAAS,GAAI,EAAG,EAAI,EAAK,OAAQ,IAAK,CACpC,GAAI,CAAC,EAAU,GAAS,EAAK,GACzB,EAAS,IAAa,WAAa,EAAa,EAAO,GAC3D,AAAI,EAAO,gBACT,GAAS,EAAO,gBAClB,GAAI,GAAS,EAAO,GAChB,EAAM,EAAK,GACX,EAAS,SAAS,WAAW,EAAW,QAAS,EAAI,EAAE,kBACvD,EAAgB,GAAS,CAAM,EACnC,GAAe,EAAQ,EAAe,CAAU,EAChD,EAAO,oBAAsB,AAAC,GAAa,CACzC,OAAO,QAAQ,CAAQ,EAAE,QAAQ,CAAC,CAAC,EAAM,KAAW,CAClD,EAAc,GAAQ,CACxB,CAAC,CACH,EACA,EAAU,IAAM,CACd,EAAO,MAAM,CAAM,EACnB,GAAgB,IAAM,GAAS,CAAM,CAAC,EAAE,CAC1C,CAAC,EACG,MAAO,IAAQ,UACjB,EAAK,mEAAoE,CAAU,EAErF,EAAO,GAAO,CAChB,CACA,OAAS,GAAI,EAAG,EAAI,EAAM,OAAQ,IAChC,EAAO,EAAM,IAAI,oBAAoB,EAAO,EAAK,QAAQ,EAAM,EAAE,EAAE,EAErE,EAAW,YAAc,CAC3B,CAAC,CACH,CACA,YAA4B,EAAY,CACtC,GAAI,GAAgB,iCAChB,EAAgB,iBAChB,EAAa,qCACb,EAAU,EAAW,MAAM,CAAU,EACzC,GAAI,CAAC,EACH,OACF,GAAI,GAAM,CAAC,EACX,EAAI,MAAQ,EAAQ,GAAG,KAAK,EAC5B,GAAI,GAAO,EAAQ,GAAG,QAAQ,EAAe,EAAE,EAAE,KAAK,EAClD,EAAgB,EAAK,MAAM,CAAa,EAC5C,MAAI,GACF,GAAI,KAAO,EAAK,QAAQ,EAAe,EAAE,EAAE,KAAK,EAChD,EAAI,MAAQ,EAAc,GAAG,KAAK,EAC9B,EAAc,IAChB,GAAI,WAAa,EAAc,GAAG,KAAK,IAGzC,EAAI,KAAO,EAEN,CACT,CACA,YAAoC,EAAe,EAAM,EAAO,EAAO,CACrE,GAAI,GAAiB,CAAC,EACtB,MAAI,WAAW,KAAK,EAAc,IAAI,GAAK,MAAM,QAAQ,CAAI,EAE3D,AADY,EAAc,KAAK,QAAQ,IAAK,EAAE,EAAE,QAAQ,IAAK,EAAE,EAAE,MAAM,GAAG,EAAE,IAAI,AAAC,GAAM,EAAE,KAAK,CAAC,EACzF,QAAQ,CAAC,EAAM,IAAM,CACzB,EAAe,GAAQ,EAAK,EAC9B,CAAC,EACI,AAAI,WAAW,KAAK,EAAc,IAAI,GAAK,CAAC,MAAM,QAAQ,CAAI,GAAK,MAAO,IAAS,SAExF,AADY,EAAc,KAAK,QAAQ,IAAK,EAAE,EAAE,QAAQ,IAAK,EAAE,EAAE,MAAM,GAAG,EAAE,IAAI,AAAC,GAAM,EAAE,KAAK,CAAC,EACzF,QAAQ,AAAC,GAAS,CACtB,EAAe,GAAQ,EAAK,EAC9B,CAAC,EAED,EAAe,EAAc,MAAQ,EAEnC,EAAc,OAChB,GAAe,EAAc,OAAS,GACpC,EAAc,YAChB,GAAe,EAAc,YAAc,GACtC,CACT,CACA,YAAoB,EAAS,CAC3B,MAAO,CAAC,MAAM,QAAQ,CAAO,GAAK,CAAC,MAAM,CAAO,CAClD,CAGA,aAAoB,CACpB,CACA,GAAS,OAAS,CAAC,EAAI,CAAE,cAAc,CAAE,QAAS,KAAe,CAC/D,GAAI,GAAO,GAAY,CAAE,EACzB,AAAK,EAAK,SACR,GAAK,QAAU,CAAC,GAClB,EAAK,QAAQ,GAAc,EAC3B,EAAS,IAAM,MAAO,GAAK,QAAQ,EAAW,CAChD,EACA,EAAU,MAAO,EAAQ,EAGzB,EAAU,KAAM,CAAC,EAAI,CAAE,cAAc,CAAE,OAAQ,EAAS,QAAS,KAAe,CAC9E,AAAI,EAAG,QAAQ,YAAY,IAAM,YAC/B,EAAK,4CAA6C,CAAE,EACtD,GAAI,GAAY,EAAc,EAAI,CAAU,EACxC,EAAO,IAAM,CACf,GAAI,EAAG,eACL,MAAO,GAAG,eACZ,GAAI,GAAS,EAAG,QAAQ,UAAU,EAAI,EAAE,kBACxC,UAAe,EAAQ,CAAC,EAAG,CAAE,EAC7B,EAAU,IAAM,CACd,EAAG,MAAM,CAAM,EACf,GAAgB,IAAM,GAAS,CAAM,CAAC,EAAE,CAC1C,CAAC,EACD,EAAG,eAAiB,EACpB,EAAG,UAAY,IAAM,CACnB,EAAU,IAAM,CACd,GAAY,CAAM,EAClB,EAAO,OAAO,CAChB,CAAC,EACD,MAAO,GAAG,cACZ,EACO,CACT,EACI,EAAO,IAAM,CACf,AAAI,CAAC,EAAG,WAER,GAAG,UAAU,EACb,MAAO,GAAG,UACZ,EACA,EAAQ,IAAM,EAAU,AAAC,GAAU,CACjC,EAAQ,EAAK,EAAI,EAAK,CACxB,CAAC,CAAC,EACF,EAAS,IAAM,EAAG,WAAa,EAAG,UAAU,CAAC,CAC/C,CAAC,EAGD,EAAU,KAAM,CAAC,EAAI,CAAE,cAAc,CAAE,SAAU,KAAgB,CAE/D,AADY,EAAU,CAAU,EAC1B,QAAQ,AAAC,GAAS,GAAU,EAAI,CAAI,CAAC,CAC7C,CAAC,EACD,GAAe,CAAC,EAAM,IAAO,CAC3B,AAAI,EAAK,QACP,GAAG,OAAS,EAAK,OAErB,CAAC,EAGD,GAAc,GAAa,IAAK,GAAK,GAAO,KAAK,CAAC,CAAC,CAAC,EACpD,EAAU,KAAM,GAAgB,CAAC,EAAI,CAAE,QAAO,YAAW,cAAc,CAAE,QAAS,KAAe,CAC/F,GAAI,GAAY,EAAa,EAAc,EAAI,CAAU,EAAI,IAAM,CACnE,EACA,AAAI,EAAG,QAAQ,YAAY,IAAM,YAC1B,GAAG,kBACN,GAAG,iBAAmB,CAAC,GACpB,EAAG,iBAAiB,SAAS,CAAK,GACrC,EAAG,iBAAiB,KAAK,CAAK,GAElC,GAAI,GAAiB,GAAG,EAAI,EAAO,EAAW,AAAC,GAAM,CACnD,EAAU,IAAM,CAChB,EAAG,CAAE,MAAO,CAAE,OAAU,CAAE,EAAG,OAAQ,CAAC,CAAC,CAAE,CAAC,CAC5C,CAAC,EACD,EAAS,IAAM,EAAe,CAAC,CACjC,CAAC,CAAC,EAGF,GAA2B,WAAY,WAAY,UAAU,EAC7D,GAA2B,YAAa,YAAa,WAAW,EAChE,GAA2B,QAAS,OAAQ,OAAO,EACnD,GAA2B,OAAQ,OAAQ,MAAM,EACjD,YAAoC,EAAM,EAAe,EAAM,CAC7D,EAAU,EAAe,AAAC,GAAO,EAAK,oBAAoB,oCAAgD,gDAAmD,IAAQ,CAAE,CAAC,CAC1K,CAGA,GAAe,aAAa,EAAe,EAC3C,GAAe,oBAAoB,CAAE,SAAU,GAAW,OAAQ,GAAS,QAAS,GAAM,IAAK,CAAM,CAAC,EACtG,GAAI,IAAc,GAGd,EAAiB,GCx0Gd,YAAkC,EAAW,EAAS,CACzD,MAAM,IAAS,GAAU,IAAM,CAAC,GAEzB,CAAC,EAAM,EAAO,KAAU,CAC3B,GAAI,GAAS,EACT,EAAmB,EACnB,EAAoB,EAAU,MAC9B,EAAwB,EAAkB,IAAI,CAAgB,EAyClE,MAAO,AAvCW,GAAO,YAAY,CAAC,EAAc,EAAQ,EAAQ,EAAM,IAAQ,CAG9E,GAAI,MAAO,GAA0B,IAAa,CAC9C,QAAQ,MAAM,gDAAgD,uCAAsD,EAAU,QAAQ,EACtI,MACJ,CAEI,GAAI,GAAU,EAAO,SAAS,CAE1B,KAAM,CACF,MAAO,GAAkB,IAAI,CAAI,CACrC,EACA,IAAI,EAAO,CACP,EAAkB,IAAI,EAAM,EAAO,CAAM,CAC7C,CACJ,EAAG,CAEC,KAAM,CACF,MAAO,GAAO,CAClB,EACA,IAAI,EAAO,CACP,EAAO,CAAK,CAChB,CACJ,CAAC,EAED,SAAQ,IAAM,EAAQ,CAAC,EAEpB,GAAc,EAAkB,IAAI,CAAI,CAAC,CACpD,EAAG,GAAO,CACN,OAAO,eAAe,EAAK,OAAQ,CAC/B,KAAM,CACF,SAAS,GAEF,CACX,CACJ,CAAC,CACL,CAAC,EAEkB,CAAqB,CAC5C,CACJ,CAEA,YAAuB,EAAO,CAC1B,MAAO,OAAO,IAAU,SAClB,KAAK,MAAM,KAAK,UAAU,CAAK,CAAC,EAChC,CACV,CCrDA,GAAI,IAAY,CAAC,EAKV,WAAY,EAAM,EAAU,CAC/B,MAAM,IAAU,IAAO,IAAU,GAAQ,CAAC,GAE1C,GAAU,GAAM,KAAK,CAAQ,EAGtB,IAAM,CACT,GAAU,GAAQ,GAAU,GAAM,OAAO,GAAK,IAAM,CAAQ,CAChE,CACJ,CA2BO,WAAiB,KAAS,EAAQ,CACrC,GAAI,GAAY,GAAU,IAAS,CAAC,EAEhC,EAAY,CAAC,EAEjB,OAAS,GAAI,EAAG,EAAI,EAAU,OAAQ,IAAK,CACvC,GAAI,GAAW,EAAU,GAAG,GAAG,CAAM,EAErC,AAAI,GAAW,CAAQ,GAAG,EAAU,KAAK,CAAQ,CACrD,CAEA,MAAO,AAAC,IACE,GAAa,EAAW,CAAM,CAE5C,CAEA,kBAAmC,KAAS,EAAQ,CAChD,GAAI,GAAY,GAAU,IAAS,CAAC,EAEhC,EAAY,CAAC,EAEjB,OAAS,GAAI,EAAG,EAAI,EAAU,OAAQ,IAAK,CACvC,GAAI,GAAW,KAAM,GAAU,GAAG,GAAG,CAAM,EAE3C,AAAI,GAAW,CAAQ,GAAG,EAAU,KAAK,CAAQ,CACrD,CAEA,MAAO,AAAC,IACE,GAAa,EAAW,CAAM,CAE5C,CAEO,YAAsB,EAAW,EACxC,CACI,GAAI,GAAS,EAEb,OAAS,GAAI,EAAG,EAAI,EAAU,OAAQ,IAAK,CACvC,GAAI,GAAU,EAAU,GAAG,CAAM,EAEjC,AAAI,IAAY,QACZ,GAAS,EAEjB,CAEA,MAAO,EACX,CCzFO,YAAuB,EAAM,CAChC,GAAI,GAAO,SAAS,cAAc,MAAM,EACxC,EAAK,UAAY,EACjB,EAAK,iBAAiB,GAAG,EAAE,QAAQ,GAC/B,EAAE,aAAa,SAAU,MAAM,CACnC,EAEA,GAAI,GAAQ,SAAS,eAAe,gBAAgB,EAEpD,AAAI,MAAO,GAAS,KAAe,GAAS,KAExC,EAAM,UAAY,GAElB,GAAQ,SAAS,cAAc,KAAK,EACpC,EAAM,GAAK,iBACX,EAAM,MAAM,SAAW,QACvB,EAAM,MAAM,MAAQ,QACpB,EAAM,MAAM,OAAS,QACrB,EAAM,MAAM,QAAU,OACtB,EAAM,MAAM,gBAAkB,oBAC9B,EAAM,MAAM,OAAS,KAGzB,GAAI,GAAS,SAAS,cAAc,QAAQ,EAC5C,EAAO,MAAM,gBAAkB,UAC/B,EAAO,MAAM,aAAe,MAC5B,EAAO,MAAM,MAAQ,OACrB,EAAO,MAAM,OAAS,OACtB,EAAM,YAAY,CAAM,EAExB,SAAS,KAAK,QAAQ,CAAK,EAC3B,SAAS,KAAK,MAAM,SAAW,SAC/B,EAAO,cAAc,SAAS,KAAK,EACnC,EAAO,cAAc,SAAS,MAAM,EAAK,SAAS,EAClD,EAAO,cAAc,SAAS,MAAM,EAGpC,EAAM,iBAAiB,QAAS,IAAM,GAAc,CAAK,CAAC,EAG1D,EAAM,aAAa,WAAY,CAAC,EAChC,EAAM,iBAAiB,UAAW,GAAK,CACnC,AAAI,EAAE,MAAQ,UAAU,GAAc,CAAK,CAC/C,CAAC,EACD,EAAM,MAAM,CAChB,CAEO,YAAuB,EAAO,CACjC,EAAM,UAAY,GAClB,SAAS,KAAK,MAAM,SAAW,SACnC,CC/CO,GAAM,IAAN,KAAkB,CACrB,aAAc,CACV,KAAK,QAAU,GAAI,IACvB,CAEA,IAAI,EAAQ,CACR,KAAK,QAAQ,IAAI,CAAM,CAC3B,CAEA,OAAO,EAAQ,CACX,KAAK,QAAQ,OAAO,CAAM,CAC9B,CAEA,aAAa,EAAW,CACpB,MAAO,CAAC,CAAE,KAAK,sBAAsB,CAAS,CAClD,CAEA,sBAAsB,EAAW,CAE7B,OAAS,CAAC,EAAK,IAAW,MAAK,QAAQ,QAAQ,EAC3C,GAAI,EAAO,YAAc,EAAW,MAAO,EAEnD,CAGA,iBAAiB,EAAQ,CACrB,MAAO,CAAE,EAAO,OACpB,CAEA,OAAQ,CACJ,MAAO,MAAK,QAAQ,OAAS,CACjC,CAEA,KAAM,OAAO,CACT,KAAK,QAAQ,EAIb,KAAM,IAAY,IAAI,CAC1B,CAEA,SAAU,CAGN,KAAK,QAAQ,QAAQ,GAAK,EAAE,QAAQ,CAAC,CACzC,CAEA,SAAU,CAEN,GAAI,GAAiB,CAAC,EAGlB,EAAmB,CAAC,EACpB,EAAmB,CAAC,EAExB,YAAK,QAAQ,QAAQ,GAAU,CAC3B,GAAI,CAAC,EAAS,EAAS,GAAQ,EAAO,iBAAiB,EAEvD,EAAe,KAAK,CAAO,EAC3B,EAAiB,KAAK,CAAO,EAC7B,EAAiB,KAAK,CAAI,CAC9B,CAAC,EAQM,CAAE,EAJK,GAAc,EAAiB,QAAQ,GAAY,EAAS,EAAW,MAAM,CAAC,CAAC,EAElF,IAAM,EAAiB,QAAQ,GAAY,EAAS,CAAC,CAEzB,CAC3C,CACJ,ECtEO,GAAM,IAAN,KAAa,CAChB,YAAY,EAAW,CACnB,KAAK,UAAY,EACjB,KAAK,QAAU,GACf,KAAK,MAAQ,CAAC,EACd,KAAK,UAAY,CAAC,EAClB,KAAK,UAAY,CAAC,CACtB,CAGA,YAAY,EAAU,CAClB,KAAK,UAAU,KAAK,CAAQ,CAChC,CAGA,QAAQ,EAAQ,EAAQ,EAAU,CAC9B,KAAK,MAAM,KAAK,CACZ,KAAM,GAAI,SAAQ,SAClB,aAAa,EAAO,CAChB,EAAS,CAAK,CAClB,CACJ,CAAC,CACL,CAEA,SAAU,CACN,EAAQ,iBAAkB,CAAE,UAAW,KAAK,SAAU,CAAC,CAC3D,CAGA,kBAAmB,CAGf,GAAI,GAAiB,GAAK,KAAK,UAAU,UAAW,KAAK,UAAU,SAAS,EAExE,EAAU,KAAK,UAAU,mBAAmB,CAAc,EAE1D,EAAU,CACV,SAAU,KAAK,UAAU,gBACzB,QAAS,EACT,MAAO,KAAK,MAAM,IAAI,GAAM,EACxB,KAAM,EAAE,KACR,OAAQ,EAAE,OACV,OAAQ,EAAE,MACd,EAAE,CACN,EAII,EAAmB,CAAC,EACpB,EAAgB,CAAC,EACjB,EAAmB,CAAC,EAEpB,EAAU,AAAC,GAAQ,EAAiB,QAAQ,GAAK,EAAE,CAAG,CAAC,EACvD,EAAO,IAAM,EAAc,QAAQ,GAAK,EAAE,CAAC,EAC3C,EAAU,IAAM,EAAiB,QAAQ,GAAK,EAAE,CAAC,EAIjD,EAAe,EAAQ,SAAU,CACjC,UAAW,KAAK,UAChB,OAAQ,EACR,QAAS,AAAC,GAAa,CACnB,EAAiB,KAAK,CAAQ,CAClC,EACA,KAAM,AAAC,GAAa,CAChB,EAAc,KAAK,CAAQ,CAC/B,EACA,QAAS,AAAC,GAAa,CACnB,EAAiB,KAAK,CAAQ,CAClC,CACJ,CAAC,EAyCD,MAAO,CAAC,EAtCa,AAAC,GAAa,CAC/B,GAAI,CAAE,WAAU,WAAY,EAU5B,GARA,EAAQ,EAGR,KAAK,UAAU,iBAAiB,EAAU,EAAS,CAAO,EAG1D,KAAK,UAAU,eAAe,KAAK,UAAU,OAAO,EAEhD,EAAQ,QAAY,CACpB,GAAI,GAAU,EAAQ,QAMtB,AAFyB,KAAK,MAAM,IAAI,CAAC,CAAE,kBAAoB,CAAa,EAEzD,QAAQ,CAAC,EAAc,IAAU,CAChD,EAAa,EAAQ,EAAM,CAC/B,CAAC,CACL,CAEA,GAAI,GAAiB,KAAK,MAAM,CAAQ,EAExC,EAAa,CAAE,SAAU,EAAgB,SAAQ,CAAC,EAElD,KAAK,UAAU,QAAQ,GAAK,EAAE,CAAC,EAE/B,EAAQ,CAAQ,CACpB,EAEoB,IAAM,CACtB,EAAQ,EAER,EAAK,CACT,CAE8C,CAClD,CACJ,EC/GO,GAAM,IAAN,KAAgB,CACnB,aAAc,CAEV,KAAK,QAAU,GAAI,KAGnB,KAAK,MAAQ,GAAI,IACrB,CAEA,IAAI,EAAW,CAGX,GAAI,GAAS,KAAK,aAAa,EAAW,IAAM,CAC5C,GAAI,GAAY,GAAI,IAAO,CAAS,EAEpC,YAAK,QAAQ,IAAI,CAAS,EAEnB,CACX,CAAC,EAKD,UAAuB,EAAQ,IAAM,CAIjC,AAAM,AAFK,KAAK,sBAAsB,EAAO,SAAS,GAIlD,KAAK,qBAAqB,CAElC,CAAC,EAEM,CACX,CAEA,aAAa,EAAW,EAAU,CAC9B,OAAS,CAAC,EAAK,IAAW,MAAK,QAAQ,QAAQ,EAC3C,GAAI,EAAO,YAAc,EACrB,MAAO,GAIf,MAAO,GAAS,CACpB,CAEA,sBAAsB,EAAW,CAC7B,OAAS,CAAC,EAAK,IAAS,MAAK,MAAM,QAAQ,EACvC,GAAI,EAAK,aAAa,CAAS,EAAG,MAAO,EAEjD,CAEA,sBAAuB,CAGnB,EAAQ,iBAAkB,CAAE,QAAS,KAAK,OAAQ,CAAC,EAGnD,GAAI,GAAQ,KAAK,wBAAwB,EAGzC,KAAK,QAAQ,MAAM,EAEnB,EAAQ,gBAAiB,CAAE,OAAM,CAAC,EAGlC,EAAM,QAAQ,GAAQ,CAElB,AAAI,EAAK,MAAM,GAGf,MAAK,MAAM,IAAI,CAAI,EAGnB,EAAK,KAAK,EAAE,KAAK,IAAM,CAEnB,KAAK,MAAM,OAAO,CAAI,EAItB,KAAK,qBAAqB,CAC9B,CAAC,EACL,CAAC,CACL,CAEA,yBAA0B,CACtB,GAAI,GAAQ,GAAI,KAIhB,OAAS,CAAC,EAAK,IAAW,MAAK,QAAQ,QAAQ,EAAG,CAC9C,GAAI,GAAe,GAYnB,GATA,EAAM,QAAQ,GAAQ,CAClB,AAAI,EAAK,iBAAiB,CAAM,GAC5B,GAAK,IAAI,CAAM,EAEf,EAAe,GAEvB,CAAC,EAGG,CAAE,EAAc,CAChB,GAAI,GAAU,GAAI,IAElB,EAAQ,IAAI,CAAM,EAElB,EAAM,IAAI,CAAO,CACrB,CACJ,CAEA,MAAO,EACX,CAEA,sBAAuB,CACnB,AAAI,KAAK,QAAQ,KAAO,GACpB,KAAK,qBAAqB,CAElC,CACJ,EAEI,GAAkB,GAAI,SAE1B,YAAgC,EAAQ,EAAU,CAC9C,AAAI,GAAgB,IAAI,CAAM,GAE9B,GAAgB,IAAI,EAAQ,WAAW,IAAM,CACzC,EAAS,EAET,GAAgB,OAAO,CAAM,CACjC,EAAG,CAAC,CAAC,CACT,CCnIA,GAAI,IAAY,GAAI,IAKpB,kBAAoC,EAAW,CAC3C,GAAI,GAAS,GAAU,IAAI,CAAS,EAEhC,EAAU,GAAI,SAAQ,AAAC,GAAY,CACnC,EAAO,YAAY,CAAO,CAC9B,CAAC,EAED,SAAQ,OAAS,EAEV,CACX,CAKA,kBAAkC,EAAW,EAAQ,EAAQ,CACzD,GAAI,GAAS,GAAU,IAAI,CAAS,EAEhC,EAAU,GAAI,SAAQ,AAAC,GAAY,CACnC,EAAO,QAAQ,EAAQ,EAAQ,GAAS,EAAQ,CAAK,CAAC,CAC1D,CAAC,EAED,SAAQ,OAAS,EAEV,CACX,CAKA,kBAAkC,EAAM,CACpC,GAAI,CAAC,EAAS,EAAe,GAAiB,EAAK,QAAQ,EAEvD,EAAU,CACV,OAAQ,OACR,KAAM,KAAK,UAAU,CACjB,OAAQ,GAAa,EACrB,WAAY,CAChB,CAAC,EACD,QAAS,CACL,eAAgB,mBAChB,aAAc,EAClB,CACJ,EAEI,EAAmB,CAAC,EACpB,EAAgB,CAAC,EACjB,EAAmB,CAAC,EAEpB,EAAU,AAAC,GAAQ,EAAiB,QAAQ,GAAK,EAAE,CAAG,CAAC,EACvD,EAAO,AAAC,GAAQ,EAAc,QAAQ,GAAK,EAAE,CAAG,CAAC,EACjD,EAAU,AAAC,GAAQ,EAAiB,QAAQ,GAAK,EAAE,CAAG,CAAC,EAEvD,EAAgB,EAAQ,kBAAmB,CAAO,EAElD,EAAY,GAAa,EAE7B,EAAQ,UAAW,CACf,IAAK,EACL,UACA,QAAS,EAAQ,KACjB,QAAS,GAAK,EAAiB,KAAK,CAAC,EACrC,QAAS,GAAK,EAAiB,KAAK,CAAC,EACrC,KAAM,GAAK,EAAc,KAAK,CAAC,CACnC,CAAC,EAED,GAAI,GAEJ,GAAI,CACA,EAAW,KAAM,OAAM,EAAW,CAAO,CAC7C,MAAE,CAKE,EAAc,CAAE,QAAS,KAAM,OAAQ,EAAK,CAAC,EAE7C,EAAc,EAEd,EAAK,CACD,OAAQ,IACR,QAAS,KACT,eAAgB,IAAM,CAAC,CAC3B,CAAC,EAED,MACJ,CAEA,GAAI,GAAgB,CAChB,OAAQ,EAAS,OACjB,UACJ,EAEA,EAAQ,CAAa,EAErB,EAAW,EAAc,SAEzB,GAAI,GAAU,KAAM,GAAS,KAAK,EAGlC,GAAI,CAAE,EAAS,GAAI,CACf,EAAc,CAAE,QAAS,KAAM,OAAQ,EAAK,CAAC,EAE7C,GAAI,GAAiB,GAUrB,MARA,GAAc,EAEd,EAAK,CACD,OAAQ,EAAS,OACjB,UACA,eAAgB,IAAM,EAAiB,EAC3C,CAAC,EAEG,EAAgB,OAEhB,GAAS,SAAW,KACpB,GAAiB,EAGd,GAAiB,CAAO,EACnC,CAiBA,GAVI,EAAS,YACT,QAAO,SAAS,KAAO,EAAS,KAShC,GAAkB,CAAO,EAAG,CAC5B,GAAI,GACJ,CAAC,EAAM,CAAO,EAAI,GAAqB,CAAO,EAE9C,GAAc,CAAI,EAElB,EAAc,CAAE,QAAS,KAAM,OAAQ,EAAK,CAAC,CACjD,KACI,GAAc,CAAE,UAAS,OAAQ,EAAM,CAAC,EAG5C,GAAI,CAAE,aAAY,UAAW,KAAK,MAAM,CAAO,EAE/C,KAAM,IAAa,oBAAqB,CAAE,aAAY,QAAO,CAAC,EAE9D,KAAM,GAAc,CAAU,EAE9B,EAAQ,CAAE,OAAQ,EAAS,OAAQ,KAAM,KAAK,MAAM,CAAO,CAAE,CAAC,CAClE,CAEA,aAA4B,CACxB,QACI;AAAA,oCACJ,GAAK,OAAO,SAAS,OAAO,CAChC,CAEA,YAA0B,EAAS,CAG/B,GAFW,CAEO,CACtB,CC5KA,GAAI,IAAa,CAAC,EACd,GAEJ,WAAsB,EAAM,EAAU,EAAY,KAAM,CACpD,GAAW,GAAQ,CACvB,CAEA,YAAsB,EAAU,CAC5B,GAAW,CACf,CAIA,GAAI,IAAU,CACV,GAAM,MACN,GAAM,MACN,GAAM,MACN,IAAO,OACP,IAAO,OACP,KAAQ,QACR,KAAQ,QACR,OAAU,UACV,MAAS,SACT,SAAY,YACZ,SAAY,YACZ,WAAc,cACd,aAAgB,gBAChB,OAAU,UACV,eAAkB,kBAClB,aAAgB,gBAChB,aAAgB,eACpB,EAEO,YAA4B,EAAW,EAAO,CACjD,MAAO,IAAI,OAAM,CAAC,EAAG,CACjB,IAAI,EAAQ,EAAU,CAClB,GAAI,IAAa,aAAc,MAAO,GAEtC,GAAI,IAAY,IACZ,MAAO,IAAY,EAAW,GAAQ,EAAS,EAC5C,GAAI,IAAY,IACnB,MAAO,IAAY,EAAW,CAAQ,EACnC,GAAI,IAAY,GACnB,MAAO,GAAM,GACV,GAAI,CAAE,CAAC,MAAM,EAAE,SAAS,CAAQ,EACnC,MAAO,IAAY,CAAS,EAAE,CAAQ,CAE9C,EAEA,IAAI,EAAQ,EAAU,EAAO,CACzB,MAAI,KAAY,IACZ,GAAM,GAAY,GAGf,EACX,CACJ,CAAC,CACL,CAEA,YAAqB,EAAW,EAAM,CAClC,MAAO,IAAW,GAAM,CAAS,CACrC,CAEA,YAAqB,EAAW,CAC5B,MAAO,IAAS,CAAS,CAC7B,CAEA,EAAO,MAAM,OAAQ,CAAC,EAAI,CAAE,aAAc,CAGtC,GAAI,GAKJ,MAAO,IAAI,OAAM,CAAC,EAAG,CACjB,IAAI,EAAQ,EAAU,CAGlB,MAFM,IAAW,GAAY,EAAiB,CAAE,GAE5C,CAAC,YAAa,UAAU,EAAE,SAAS,CAAQ,EACpC,GAAyB,EAAW,CAAO,EAG/C,EAAU,MAAM,EAC3B,EAEA,IAAI,EAAQ,EAAU,EAAO,CACzB,MAAM,IAAW,GAAY,EAAiB,CAAE,GAEhD,EAAU,MAAM,GAAY,EAErB,EACX,CACJ,CAAC,CACL,CAAC,EAED,EAAa,aAAc,AAAC,GAAc,CAAS,EAEnD,EAAa,OAAQ,AAAC,GAAc,CAAC,EAAU,EAAW,KAAS,EAAQ,EAAW,EAAU,SAAW,EAAU,UAAW,CAAQ,CAAC,EAEzI,EAAa,MAAO,AAAC,GACV,EAAU,EACpB,EAED,EAAa,MAAO,AAAC,GACV,EAAU,EACpB,EAED,EAAa,OAAQ,AAAC,GAAc,MAAO,EAAU,EAAO,EAAO,KAC/D,IAAQ,EAAU,SAAU,EAAU,CAAK,EAIvC,EACA,GAAU,YAAY,EAAU,CAAK,EAE9B,KAAM,IAAc,CAAS,GAGjC,QAAQ,QAAQ,EAC1B,EAED,EAAa,QAAS,AAAC,GAAc,MAAO,KAAW,IAC5C,KAAM,GAAU,MAAM,GAAQ,GAAG,CAAM,CACjD,EAED,EAAa,YAAa,AAAC,GAAc,CAAC,EAAM,EAAO,KAC5C,GAAyB,CAAS,EAAE,EAAM,CAAI,CACxD,EAED,EAAa,UAAW,AAAC,GAAc,CAAC,EAAM,EAAO,KAC1C,EAAU,MAAM,IAAI,EAAM,CAAE,EAAU,MAAM,IAAI,CAAI,EAAG,CAAI,CACrE,EAED,EAAa,SAAU,AAAC,GAAc,CAAC,EAAM,IAAa,CACtD,GAAI,GAAS,IACF,EAAQ,EAAU,SAAU,CAAI,EAGvC,EAAU,EAAO,MAAM,EAAQ,CAAQ,EAE3C,EAAU,WAAW,CAAO,CAChC,CAAC,EAED,EAAa,WAAY,AAAC,GAAc,EAAU,MAAM,OAAO,EAC/D,EAAa,UAAW,AAAC,GAAc,SAAY,KAAM,IAAc,CAAS,CAAC,EAEjF,EAAa,MAAO,AAAC,GAAc,IAAI,IAAW,GAAO,EAAW,GAAG,CAAM,CAAC,EAE9E,EAAa,QAAS,AAAC,GAAc,CAAC,EAAM,IAAa,CACrD,GAAI,GAAS,EAAK,EAAM,CAAC,CAAC,UAAW,KAAkB,KAAY,CAE/D,GAAI,IAAkB,OAAW,MAAO,GAAS,CAAM,EAGvD,GAAI,EAAc,KAAO,EAAU,GAAI,MAAO,GAAS,CAAC,UAAW,EAAe,GAAG,CAAM,CAAC,CAChG,CAAC,EAED,SAAU,WAAW,CAAM,EAGpB,CACX,CAAC,EAED,EAAa,YAAa,AAAC,GAAc,IAAI,IAAW,GAAS,EAAW,GAAG,CAAM,CAAC,EACtF,EAAa,gBAAiB,AAAC,GAAc,IAAI,IAAW,GAAa,EAAW,GAAG,CAAM,CAAC,EAC9F,EAAa,cAAe,IAAM,IAAI,IAAW,GAAW,GAAG,CAAM,CAAC,EACtE,EAAa,UAAW,AAAC,GAAc,IAAI,IAAW,GAAO,EAAW,GAAG,CAAM,CAAC,EAClF,EAAa,kBAAmB,AAAC,GAAc,IAAI,IAAW,GAAe,EAAW,GAAG,CAAM,CAAC,EAClG,EAAa,gBAAiB,AAAC,GAAc,IAAI,IAAW,GAAa,EAAW,GAAG,CAAM,CAAC,EAC9F,EAAa,gBAAiB,AAAC,GAAc,IAAI,IAAW,GAAa,EAAW,GAAG,CAAM,CAAC,EAE9F,GAAI,IAAa,GAAI,SAErB,EAAa,UAAW,GAAa,CACjC,GAAI,GAAW,IAAI,CAAS,EAAG,MAAO,IAAW,IAAI,CAAS,EAAE,MAEhE,GAAI,GAAS,EAAU,OAEvB,UAAW,IAAI,EAAW,CAAM,EAEzB,EAAO,KAClB,CAAC,EAED,GAAI,IAAoB,GAAI,SAErB,YAAwB,EAAW,EAAQ,EAAU,CACxD,AAAM,GAAkB,IAAI,CAAS,GACjC,GAAkB,IAAI,EAAW,CAAC,CAAC,EAGvC,GAAI,GAAM,GAAkB,IAAI,CAAS,EAEzC,EAAI,GAAU,EAEd,GAAkB,IAAI,EAAW,CAAG,CACxC,CAEA,GAAa,AAAC,GAAc,AAAC,GAAa,SAAU,IAAW,CAQ3D,GAJI,EAAO,SAAW,GAAK,EAAO,YAAc,QAC5C,GAAS,CAAC,GAGV,GAAkB,IAAI,CAAS,EAAG,CAClC,GAAI,GAAY,GAAkB,IAAI,CAAS,EAE/C,GAAI,MAAO,GAAU,IAAc,WAC/B,MAAO,GAAU,GAAU,CAAM,CAEzC,CAEA,MAAO,MAAM,IAAY,EAAW,EAAU,CAAM,CACxD,CAAC,EC3NM,GAAM,IAAN,KAAgB,CACnB,YAAY,EAAI,CACZ,GAAI,EAAG,WAAY,KAAM,gCAczB,GAZA,EAAG,WAAa,KAEhB,KAAK,GAAK,EAEV,KAAK,GAAK,EAAG,aAAa,SAAS,EAEnC,KAAK,aAAe,KAAK,GAEzB,KAAK,gBAAkB,EAAG,aAAa,eAAe,EAEtD,KAAK,SAAW,KAAK,MAAM,KAAK,eAAe,EAE3C,CAAE,KAAK,SACP,KAAM,mDAAqD,KAAK,GAGpE,KAAK,KAAO,KAAK,SAAS,KAAK,KAE/B,KAAK,QAAU,KAAK,MAAM,EAAG,aAAa,cAAc,CAAC,EACzD,KAAK,gBAAkB,GAAU,KAAK,OAAO,EAG7C,KAAK,UAAY,GAAY,GAAU,KAAK,SAAS,IAAI,CAAC,EAE1D,KAAK,UAAY,GAAY,GAAU,KAAK,SAAS,IAAI,CAAC,EAE1D,KAAK,SAAW,OAAO,SAAS,KAAK,SAAS,EAE9C,KAAK,cAAgB,CAAC,EAGtB,KAAK,MAAQ,GAAmB,KAAM,KAAK,QAAQ,EAEnD,KAAK,SAAW,CAAC,EAGjB,KAAK,eAAe,KAAK,OAAO,CACpC,CAEA,iBAAiB,EAAiB,EAAS,EAAU,CAAC,EAAG,CACrD,GAAI,GAAW,KAAK,MAAM,CAAe,EAErC,EAAe,GAAU,KAAK,SAAS,EACvC,EAAsB,KAAK,aAAa,EAAc,CAAO,EAE7D,EAAe,GAAY,GAAU,EAAS,IAAI,CAAC,EAEnD,EAAQ,GAAK,EAAqB,CAAY,EAElD,KAAK,gBAAkB,EAEvB,KAAK,SAAW,EAEhB,KAAK,QAAU,EAEf,KAAK,UAAY,GAAY,GAAU,EAAS,IAAI,CAAC,EAErD,GAAI,GAAU,GAAY,GAAU,EAAS,IAAI,CAAC,EAElD,cAAO,QAAQ,CAAK,EAAE,QAAQ,CAAC,CAAC,EAAK,KAAW,CAC5C,GAAI,GAAU,EAAI,MAAM,GAAG,EAAE,GAC7B,KAAK,SAAS,GAAW,EAAQ,EACrC,CAAC,EAOM,CACX,CAEA,YAAY,EAAc,EAAO,CAI7B,KAAK,cAAc,GAAgB,CACvC,CAEA,mBAAmB,EAAM,CAIrB,cAAO,QAAQ,KAAK,aAAa,EAAE,QAAQ,CAAC,CAAC,EAAW,KAAiB,CACrE,OAAO,QAAQ,CAAI,EAAE,QAAQ,CAAC,CAAC,EAAS,KAAe,CACnD,AAAI,EAAQ,WAAW,CAAW,GAC9B,MAAO,GAAK,EAEpB,CAAC,EAED,EAAK,GAAa,CACtB,CAAC,EAED,KAAK,cAAgB,CAAC,EAEf,CACX,CAEA,aAAa,EAAQ,EAAS,CAC1B,OAAS,KAAO,GACZ,GAAQ,EAAQ,EAAK,EAAQ,EAAI,EAGrC,MAAO,EACX,CAEA,aAAa,EAAU,EAAM,CACzB,GAAI,GAAU,CAAE,GAAG,KAAK,QAAS,MAAI,EAErC,KAAK,iBAAiB,KAAK,UAAU,CAAQ,EAAG,CAAO,EAEvD,KAAK,eAAe,CAAE,MAAK,CAAC,CAChC,CAOA,eAAe,EAAS,CAEpB,EAAQ,UAAW,KAAM,CAAO,EAEhC,EAAQ,SAAU,CACd,UAAW,KACX,UACA,QAAS,GAAK,KAAK,WAAW,CAAC,CACnC,CAAC,CACL,CAEA,GAAI,WAAW,CACX,GAAI,GAAO,KAAK,SAAS,KAGzB,MAAO,AAFQ,QAAO,OAAO,EAAK,QAAQ,EAAE,IAAI,GAAK,EAAE,EAAE,EAEzC,IAAI,GAAM,GAAc,CAAE,CAAC,CAC/C,CAEA,GAAI,SAAS,CACT,MAAO,GAAiB,KAAK,GAAG,aAAa,CACjD,CAEA,qCAAsC,CAClC,GAAI,GAAK,KAAK,GAEd,EAAG,aAAa,gBAAiB,KAAK,eAAe,EAGrD,GAAI,GAAU,KAAK,gBAAgB,UAC7B,CAAE,UAAW,KAAK,gBAAgB,SAAU,EAC5C,CAAC,EAGP,AAAI,KAAK,gBAAgB,KACrB,GAAQ,IAAM,KAAK,gBAAgB,KAInC,KAAK,gBAAgB,SACrB,GAAQ,QAAU,KAAK,gBAAgB,SAG3C,EAAG,aAAa,eAAgB,KAAK,UAAU,CAAO,CAAC,CAC3D,CAEA,WAAW,EAAS,CAChB,KAAK,SAAS,KAAK,CAAO,CAC9B,CAEA,SAAU,CAGN,IAFA,MAAO,MAAK,GAAG,WAER,KAAK,SAAS,OAAS,GAC1B,KAAK,SAAS,IAAI,EAAE,CAE5B,CACJ,ECrLA,GAAI,IAAa,CAAC,EAEX,YAAuB,EAAI,CAC9B,GAAI,GAAY,GAAI,IAAU,CAAE,EAEhC,GAAI,GAAW,EAAU,IAAK,KAAM,+BAIpC,SAAQ,iBAAkB,CAAE,YAAW,QAFzB,AAAC,GAAM,EAAU,WAAW,CAAC,CAEI,CAAC,EAEhD,GAAW,EAAU,IAAM,EAEpB,CACX,CAEO,YAA0B,EAAI,CACjC,GAAI,GAAY,GAAW,GAE3B,AAAI,CAAE,GAEN,GAAU,QAAQ,EAElB,MAAO,IAAW,GACtB,CAMO,YAAuB,EAAI,CAC9B,GAAI,GAAY,GAAW,GAE3B,GAAI,CAAE,EAAW,KAAM,wBAA0B,EAEjD,MAAO,EACX,CAEO,WAA0B,EAAI,EAAS,GAAM,CAChD,GAAI,GAAc,OAAO,YAAY,EAAI,GAAK,EAAE,UAAU,EAE1D,GAAI,CAAE,EAAa,CACf,GAAI,EAAQ,KAAM,gDAElB,MACJ,CAEA,MAAO,GAAY,UACvB,CAEO,YAA0B,EAAM,CACnC,MAAO,QAAO,OAAO,EAAU,EAAE,OAAO,GAC7B,GAAQ,EAAU,IAC5B,CACL,CAEO,YAAmB,EAAM,CAC5B,MAAO,IAAiB,CAAI,EAAE,IAAI,GAAK,EAAE,KAAK,CAClD,CAEO,YAAc,EAAI,CACrB,GAAI,GAAY,GAAW,GAE3B,MAAO,IAAa,EAAU,KAClC,CAEO,aAAiB,CACpB,MAAO,QAAO,OAAO,EAAU,EAAE,GAAG,KACxC,CAEO,aAAe,CAClB,MAAO,QAAO,OAAO,EAAU,CACnC,CCzEO,YAAkB,EAAW,EAAM,EAAQ,CAC9C,GAAc,EAAU,GAAI,EAAM,CAAM,CAC5C,CAEO,YAAwB,EAAM,EAAQ,CACzC,GAAc,OAAQ,EAAM,CAAM,CACtC,CAEO,YAAsB,EAAW,EAAM,EAAQ,CAClD,GAAc,EAAU,GAAI,EAAM,EAAQ,EAAK,CACnD,CAEO,YAAoB,EAAe,EAAM,EAAQ,CAGpD,AAFc,GAAiB,CAAa,EAEpC,QAAQ,GAAU,CACtB,GAAc,EAAO,GAAI,EAAM,EAAQ,EAAK,CAChD,CAAC,CACL,CAEO,YAAgB,EAAW,EAAM,EAAU,CAC9C,EAAU,GAAG,iBAAiB,EAAM,GAAK,CACrC,EAAS,EAAE,MAAM,CACrB,CAAC,CACL,CAEO,YAAY,EAAW,EAAU,CACpC,GAAI,GAAU,AAAC,GAAM,CAEjB,AAAI,CAAE,EAAE,YAER,EAAS,EAAE,MAAM,CACrB,EAEA,cAAO,iBAAiB,EAAW,CAAO,EAEnC,IAAM,CACT,OAAO,oBAAoB,EAAW,CAAO,CACjD,CACJ,CAEA,YAAuB,EAAQ,EAAM,EAAQ,EAAU,GAAM,CACzD,GAAI,GAAI,GAAI,aAAY,EAAM,CAAE,UAAS,OAAQ,CAAO,CAAC,EAEzD,EAAE,WAAa,CAAE,OAAM,SAAQ,WAAY,CAAC,CAAE,EAE9C,EAAO,cAAc,CAAC,CAC1B,CC/CA,GAAI,IAAuB,GAAI,KAExB,YAAqC,EAAe,CACvD,MAAO,GAAc,MAAM,GAAI,QAAO,OAAO,CAAC,CAClD,CAEO,YAA0B,EAAI,EAAM,CACvC,GAAI,CAAC,KAAU,GAAa,EAAK,QAAQ,GAAI,QAAO,OAAO,EAAG,EAAE,EAAE,MAAM,GAAG,EAE3E,MAAO,IAAI,IAAU,EAAO,EAAW,EAAM,CAAE,CACnD,CAEO,WAAmB,EAAM,EAAU,CAEtC,AAAI,GAAqB,IAAI,CAAI,GAEjC,IAAqB,IAAI,CAAI,EAE7B,EAAG,iBAAkB,CAAC,CAAE,KAAI,YAAW,YAAW,aAAc,CAC5D,AAAI,EAAU,QAAU,GACpB,EAAS,CACL,KAAI,YAAW,YAAW,MAAO,EAAU,MAAO,SACtD,CAAC,CAET,CAAC,EACL,CAEO,YAAyB,EAAM,EAAU,CAE5C,AAAI,GAAqB,IAAI,CAAI,GAEjC,IAAqB,IAAI,CAAI,EAE7B,EAAG,wBAAyB,CAAC,CAAE,KAAI,YAAW,aAAc,CACxD,AAAI,EAAU,QAAU,GACpB,EAAS,CAAE,KAAI,YAAW,SAAQ,CAAC,CAE3C,CAAC,EACL,CAEO,YAAuB,EAAI,CAC9B,MAAO,IAAI,IAAiB,CAAE,CAClC,CAEO,YAA0C,EAAM,CACnD,MAAO,IAAqB,IAAI,CAAI,CACxC,CAEA,GAAM,IAAN,KAAuB,CACnB,YAAY,EAAI,CACZ,KAAK,GAAK,EACV,KAAK,WAAa,KAAK,6BAA6B,CACxD,CAEA,KAAM,CACF,MAAO,MAAK,UAChB,CAEA,IAAI,EAAO,CACP,MAAO,MAAK,WAAW,IAAI,GAAa,EAAU,KAAK,EAAE,SAAS,CAAK,CAC3E,CAEA,QAAQ,EAAO,CACX,MAAO,CAAE,KAAK,IAAI,CAAK,CAC3B,CAEA,IAAI,EAAO,CACP,MAAO,MAAK,WAAW,KAAK,GAAa,EAAU,QAAU,CAAK,CACtE,CAEA,8BAA+B,CAC3B,MAAO,OAAM,KAAK,KAAK,GAAG,kBAAkB,EAEvC,OAAO,GAAQ,GAA4B,CAAI,CAAC,EAEhD,IAAI,GAAQ,GAAiB,KAAK,GAAI,CAAI,CAAC,CAAC,CACrD,CACJ,EAEa,GAAN,KAAgB,CACnB,YAAY,EAAO,EAAW,EAAS,EAAI,CACvC,KAAK,QAAU,KAAK,IAAM,EAC1B,KAAK,GAAK,EACV,KAAK,aAEL,KAAK,MAAQ,EACb,KAAK,UAAY,EACjB,KAAK,WAAa,KAAK,GAAG,aAAa,KAAK,OAAO,CACvD,CAEA,GAAI,SAAS,CACT,GAAM,CAAE,UAAW,KAAK,wBAAwB,KAAK,UAAU,EAE/D,MAAO,EACX,CAEA,GAAI,SAAS,CACT,GAAM,CAAE,UAAW,KAAK,wBAAwB,KAAK,UAAU,EAE/D,MAAO,EACX,CAEA,wBAAwB,EAAW,CAC/B,GAAI,GAAS,EACT,EAAS,CAAC,EACR,EAAuB,EAAO,MAAM,gBAAgB,EAE1D,MAAI,IACA,GAAS,EAAqB,GAW9B,EAAS,AAPE,GAAI,UAAS,SAAU;AAAA;AAAA;AAAA;AAAA;AAAA,iBAK7B,EAAqB,KAAK,EAEjB,KAAK,YAAY,GAG5B,CAAE,SAAQ,QAAO,CAC5B,CACJ,EC7HA,YAAqB,EAAQ,CAC3B,EAAO,UAAU,WAAY,CAAQ,EACrC,EAAS,OAAS,CAAC,EAAI,CAAE,eAAgB,CACvC,AAAI,CAAC,EAAU,SAAS,KAAK,GAE7B,GAAG,UAAY,IAAM,CACrB,EACA,EAAG,UAAY,IAAM,CACrB,EACF,EACA,WAAkB,EAAI,CAAE,aAAa,CACnC,GAAI,GAAW,GAAc,EAAW,WAAY,GAAG,EAAI,IACvD,EAAQ,GAAc,EAAW,MAAO,CAAC,EACzC,EAAY,CAAC,EAAU,SAAS,KAAK,EACzC,AAAK,EAAG,YACN,GAAG,MAAM,OAAS,GAAG,OACnB,CAAC,EAAG,YAAc,GACpB,GAAG,OAAS,IACT,EAAG,YACN,GAAG,MAAM,SAAW,UACtB,GAAI,GAAc,CAAC,EAAK,IAAW,CACjC,GAAI,GAAiB,EAAO,UAAU,EAAK,CAAM,EACjD,MAAO,GAAO,OAAS,IAAM,CAC7B,EAAI,CACN,EACI,EAAmB,CACrB,mBAAoB,SACpB,mBAAoB,GAAG,KACvB,yBAA0B,gCAC5B,EACA,EAAG,cAAgB,CACjB,GAAG,EAAS,IAAM,CAClB,EAAG,EAAQ,IAAM,CACjB,EAAG,CACD,AAAI,GACF,GAAG,OAAS,IACV,GACF,GAAG,MAAM,QAAU,MACrB,GAAI,GAAU,EAAG,sBAAsB,EAAE,OACzC,EAAG,MAAM,OAAS,OAClB,GAAI,GAAO,EAAG,sBAAsB,EAAE,OACtC,AAAI,IAAY,GACd,GAAU,GAEZ,EAAO,WAAW,EAAI,EAAO,UAAW,CACtC,OAAQ,EACR,MAAO,CAAE,OAAQ,EAAU,IAAK,EAChC,IAAK,CAAE,OAAQ,EAAO,IAAK,CAC7B,EAAG,IAAM,EAAG,WAAa,GAAM,IAAM,CACnC,AAAI,KAAK,IAAI,EAAG,sBAAsB,EAAE,OAAS,CAAI,EAAI,GACvD,GAAG,MAAM,SAAW,KAExB,CAAC,CACH,EACA,IAAI,EAAS,IAAM,CACnB,EAAG,EAAQ,IAAM,CACjB,EAAG,CACD,GAAI,GAAO,EAAG,sBAAsB,EAAE,OACtC,EAAO,WAAW,EAAI,EAAa,CACjC,OAAQ,EACR,MAAO,CAAE,OAAQ,EAAO,IAAK,EAC7B,IAAK,CAAE,OAAQ,EAAQ,IAAK,CAC9B,EAAG,IAAM,EAAG,MAAM,SAAW,SAAU,IAAM,CAC3C,EAAG,WAAa,GACZ,EAAG,MAAM,QAAU,GAAG,OAAa,GACrC,GAAG,MAAM,QAAU,OACnB,EAAG,OAAS,GAEhB,CAAC,CACH,CACF,CACF,CACF,CACA,YAAuB,EAAW,EAAK,EAAU,CAC/C,GAAI,EAAU,QAAQ,CAAG,IAAM,GAC7B,MAAO,GACT,GAAM,GAAW,EAAU,EAAU,QAAQ,CAAG,EAAI,GACpD,GAAI,CAAC,EACH,MAAO,GACT,GAAI,IAAQ,WAAY,CACtB,GAAI,GAAQ,EAAS,MAAM,YAAY,EACvC,GAAI,EACF,MAAO,GAAM,EACjB,CACA,GAAI,IAAQ,MAAO,CACjB,GAAI,GAAQ,EAAS,MAAM,YAAY,EACvC,GAAI,EACF,MAAO,GAAM,EACjB,CACA,MAAO,EACT,CAGA,GAAI,IAAiB,GC7FrB,GAAI,IAAqB,CAAC,QAAS,SAAU,WAAY,UAAW,SAAU,uBAAwB,kBAAmB,kBAAmB,mDAAoD,gCAAiC,SAAS,EACtO,GAAoC,GAAmB,KAAK,GAAG,EAC/D,GAAY,MAAO,SAAY,IAC/B,GAAU,GAAY,UAAW,CACrC,EAAI,QAAQ,UAAU,SAAW,QAAQ,UAAU,mBAAqB,QAAQ,UAAU,sBACtF,GAAc,CAAC,IAAa,QAAQ,UAAU,YAAc,SAAS,EAAS,CAChF,MAAO,GAAQ,YAAY,CAC7B,EAAI,SAAS,EAAS,CACpB,MAAO,GAAQ,aACjB,EACI,GAAgB,SAAwB,EAAI,EAAkB,EAAQ,CACxE,GAAI,GAAa,MAAM,UAAU,MAAM,MAAM,EAAG,iBAAiB,EAAiB,CAAC,EACnF,MAAI,IAAoB,GAAQ,KAAK,EAAI,EAAiB,GACxD,EAAW,QAAQ,CAAE,EAEvB,EAAa,EAAW,OAAO,CAAM,EAC9B,CACT,EACI,GAA2B,WAAmC,EAAU,EAAkB,EAAS,CAGrG,OAFI,GAAa,CAAC,EACd,EAAkB,MAAM,KAAK,CAAQ,EAClC,EAAgB,QAAQ,CAC7B,GAAI,GAAU,EAAgB,MAAM,EACpC,GAAI,EAAQ,UAAY,OAAQ,CAC9B,GAAI,GAAW,EAAQ,iBAAiB,EACpC,EAAU,EAAS,OAAS,EAAW,EAAQ,SAC/C,EAAmB,EAA0B,EAAS,GAAM,CAAO,EACvE,AAAI,EAAQ,QACV,EAAW,KAAK,MAAM,EAAY,CAAgB,EAElD,EAAW,KAAK,CACd,MAAO,EACP,WAAY,CACd,CAAC,CAEL,KAAO,CACL,GAAI,GAAiB,GAAQ,KAAK,EAAS,EAAiB,EAC5D,AAAI,GAAkB,EAAQ,OAAO,CAAO,GAAM,IAAoB,CAAC,EAAS,SAAS,CAAO,IAC9F,EAAW,KAAK,CAAO,EAEzB,GAAI,GAAa,EAAQ,YACzB,MAAO,GAAQ,eAAkB,YAAc,EAAQ,cAAc,CAAO,EACxE,EAAkB,CAAC,EAAQ,kBAAoB,EAAQ,iBAAiB,CAAO,EACnF,GAAI,GAAc,EAAiB,CACjC,GAAI,GAAoB,EAA0B,IAAe,GAAO,EAAQ,SAAW,EAAW,SAAU,GAAM,CAAO,EAC7H,AAAI,EAAQ,QACV,EAAW,KAAK,MAAM,EAAY,CAAiB,EAEnD,EAAW,KAAK,CACd,MAAO,EACP,WAAY,CACd,CAAC,CAEL,KACE,GAAgB,QAAQ,MAAM,EAAiB,EAAQ,QAAQ,CAEnE,CACF,CACA,MAAO,EACT,EACI,GAAc,SAAsB,EAAM,EAAS,CACrD,MAAI,GAAK,SAAW,GACb,IAAW,0BAA0B,KAAK,EAAK,OAAO,GAAK,EAAK,oBAAsB,MAAM,SAAS,EAAK,aAAa,UAAU,EAAG,EAAE,CAAC,EACnI,EAGJ,EAAK,QACd,EACI,GAAuB,SAA+B,EAAG,EAAG,CAC9D,MAAO,GAAE,WAAa,EAAE,SAAW,EAAE,cAAgB,EAAE,cAAgB,EAAE,SAAW,EAAE,QACxF,EACI,GAAU,SAAkB,EAAM,CACpC,MAAO,GAAK,UAAY,OAC1B,EACI,GAAgB,SAAwB,EAAM,CAChD,MAAO,IAAQ,CAAI,GAAK,EAAK,OAAS,QACxC,EACI,GAAuB,SAA+B,EAAM,CAC9D,GAAI,GAAI,EAAK,UAAY,WAAa,MAAM,UAAU,MAAM,MAAM,EAAK,QAAQ,EAAE,KAAK,SAAS,EAAO,CACpG,MAAO,GAAM,UAAY,SAC3B,CAAC,EACD,MAAO,EACT,EACI,GAAkB,SAA0B,EAAO,EAAM,CAC3D,OAAS,GAAI,EAAG,EAAI,EAAM,OAAQ,IAChC,GAAI,EAAM,GAAG,SAAW,EAAM,GAAG,OAAS,EACxC,MAAO,GAAM,EAGnB,EACI,GAAkB,SAA0B,EAAM,CACpD,GAAI,CAAC,EAAK,KACR,MAAO,GAET,GAAI,GAAa,EAAK,MAAQ,GAAY,CAAI,EAC1C,EAAc,SAAsB,EAAM,CAC5C,MAAO,GAAW,iBAAiB,6BAA+B,EAAO,IAAI,CAC/E,EACI,EACJ,GAAI,MAAO,QAAW,KAAe,MAAO,QAAO,IAAQ,KAAe,MAAO,QAAO,IAAI,QAAW,WACrG,EAAW,EAAY,OAAO,IAAI,OAAO,EAAK,IAAI,CAAC,MAEnD,IAAI,CACF,EAAW,EAAY,EAAK,IAAI,CAClC,OAAS,EAAP,CACA,eAAQ,MAAM,2IAA4I,EAAI,OAAO,EAC9J,EACT,CAEF,GAAI,GAAU,GAAgB,EAAU,EAAK,IAAI,EACjD,MAAO,CAAC,GAAW,IAAY,CACjC,EACI,GAAU,SAAkB,EAAM,CACpC,MAAO,IAAQ,CAAI,GAAK,EAAK,OAAS,OACxC,EACI,GAAqB,SAA6B,EAAM,CAC1D,MAAO,IAAQ,CAAI,GAAK,CAAC,GAAgB,CAAI,CAC/C,EACI,GAAa,SAAqB,EAAM,CAC1C,GAAI,GAAwB,EAAK,sBAAsB,EAAG,EAAQ,EAAsB,MAAO,EAAS,EAAsB,OAC9H,MAAO,KAAU,GAAK,IAAW,CACnC,EACI,GAAW,SAAmB,EAAM,EAAM,CAC5C,GAAI,GAAe,EAAK,aAAc,EAAgB,EAAK,cAC3D,GAAI,iBAAiB,CAAI,EAAE,aAAe,SACxC,MAAO,GAET,GAAI,GAAkB,GAAQ,KAAK,EAAM,+BAA+B,EACpE,EAAmB,EAAkB,EAAK,cAAgB,EAC9D,GAAI,GAAQ,KAAK,EAAkB,uBAAuB,EACxD,MAAO,GAET,GAAI,GAAe,GAAY,CAAI,EAAE,KACjC,EAAkB,AAA4D,GAAa,cAAc,SAAS,CAAY,GAAM,EAAK,cAAc,SAAS,CAAI,EACxK,GAAI,CAAC,GAAgB,IAAiB,OAAQ,CAC5C,GAAI,MAAO,IAAkB,WAAY,CAEvC,OADI,GAAe,EACZ,GAAM,CACX,GAAI,GAAgB,EAAK,cACrB,EAAW,GAAY,CAAI,EAC/B,GAAI,GAAiB,CAAC,EAAc,YAAc,EAAc,CAAa,IAAM,GACjF,MAAO,IAAW,CAAI,EACjB,AAAI,EAAK,aACd,EAAO,EAAK,aACP,AAAI,CAAC,GAAiB,IAAa,EAAK,cAC7C,EAAO,EAAS,KAEhB,EAAO,CAEX,CACA,EAAO,CACT,CACA,GAAI,EACF,MAAO,CAAC,EAAK,eAAe,EAAE,MAElC,SAAW,IAAiB,gBAC1B,MAAO,IAAW,CAAI,EAExB,MAAO,EACT,EACI,GAAyB,SAAiC,EAAM,CAClE,GAAI,mCAAmC,KAAK,EAAK,OAAO,EAEtD,OADI,GAAa,EAAK,cACf,GAAY,CACjB,GAAI,EAAW,UAAY,YAAc,EAAW,SAAU,CAC5D,OAAS,GAAI,EAAG,EAAI,EAAW,SAAS,OAAQ,IAAK,CACnD,GAAI,GAAQ,EAAW,SAAS,KAAK,CAAC,EACtC,GAAI,EAAM,UAAY,SACpB,MAAO,IAAQ,KAAK,EAAY,sBAAsB,EAAI,GAAO,CAAC,EAAM,SAAS,CAAI,CAEzF,CACA,MAAO,EACT,CACA,EAAa,EAAW,aAC1B,CAEF,MAAO,EACT,EACI,GAAkC,SAA0C,EAAS,EAAM,CAC7F,MAAI,IAAK,UAAY,GAAc,CAAI,GAAK,GAAS,EAAM,CAAO,GAClE,GAAqB,CAAI,GAAK,GAAuB,CAAI,EAI3D,EACI,GAAiC,SAAyC,EAAS,EAAM,CAC3F,MAAI,KAAmB,CAAI,GAAK,GAAY,CAAI,EAAI,GAAK,CAAC,GAAgC,EAAS,CAAI,EAIzG,EACI,GAA4B,SAAoC,EAAgB,CAClF,GAAI,GAAW,SAAS,EAAe,aAAa,UAAU,EAAG,EAAE,EACnE,MAAI,SAAM,CAAQ,GAAK,GAAY,EAIrC,EACI,GAAc,WAAsB,EAAY,CAClD,GAAI,GAAmB,CAAC,EACpB,EAAmB,CAAC,EACxB,SAAW,QAAQ,SAAS,EAAM,EAAG,CACnC,GAAI,GAAU,CAAC,CAAC,EAAK,MACjB,EAAU,EAAU,EAAK,MAAQ,EACjC,EAAoB,GAAY,EAAS,CAAO,EAChD,EAAW,EAAU,EAAa,EAAK,UAAU,EAAI,EACzD,AAAI,IAAsB,EACxB,EAAU,EAAiB,KAAK,MAAM,EAAkB,CAAQ,EAAI,EAAiB,KAAK,CAAO,EAEjG,EAAiB,KAAK,CACpB,cAAe,EACf,SAAU,EACV,OACA,UACA,QAAS,CACX,CAAC,CAEL,CAAC,EACM,EAAiB,KAAK,EAAoB,EAAE,OAAO,SAAS,EAAK,EAAU,CAChF,SAAS,QAAU,EAAI,KAAK,MAAM,EAAK,EAAS,OAAO,EAAI,EAAI,KAAK,EAAS,OAAO,EAC7E,CACT,EAAG,CAAC,CAAC,EAAE,OAAO,CAAgB,CAChC,EACI,GAAW,SAAmB,EAAI,EAAS,CAC7C,EAAU,GAAW,CAAC,EACtB,GAAI,GACJ,MAAI,GAAQ,cACV,EAAa,GAAyB,CAAC,CAAE,EAAG,EAAQ,iBAAkB,CACpE,OAAQ,GAA+B,KAAK,KAAM,CAAO,EACzD,QAAS,GACT,cAAe,EAAQ,cACvB,iBAAkB,EACpB,CAAC,EAED,EAAa,GAAc,EAAI,EAAQ,iBAAkB,GAA+B,KAAK,KAAM,CAAO,CAAC,EAEtG,GAAY,CAAU,CAC/B,EACI,GAAY,SAAoB,EAAI,EAAS,CAC/C,EAAU,GAAW,CAAC,EACtB,GAAI,GACJ,MAAI,GAAQ,cACV,EAAa,GAAyB,CAAC,CAAE,EAAG,EAAQ,iBAAkB,CACpE,OAAQ,GAAgC,KAAK,KAAM,CAAO,EAC1D,QAAS,GACT,cAAe,EAAQ,aACzB,CAAC,EAED,EAAa,GAAc,EAAI,EAAQ,iBAAkB,GAAgC,KAAK,KAAM,CAAO,CAAC,EAEvG,CACT,EACI,GAAa,SAAqB,EAAM,EAAS,CAEnD,GADA,EAAU,GAAW,CAAC,EAClB,CAAC,EACH,KAAM,IAAI,OAAM,kBAAkB,EAEpC,MAAI,IAAQ,KAAK,EAAM,EAAiB,IAAM,GACrC,GAEF,GAA+B,EAAS,CAAI,CACrD,EACI,GAA6C,GAAmB,OAAO,QAAQ,EAAE,KAAK,GAAG,EACzF,GAAc,SAAsB,EAAM,EAAS,CAErD,GADA,EAAU,GAAW,CAAC,EAClB,CAAC,EACH,KAAM,IAAI,OAAM,kBAAkB,EAEpC,MAAI,IAAQ,KAAK,EAAM,EAA0B,IAAM,GAC9C,GAEF,GAAgC,EAAS,CAAI,CACtD,EAGA,YAAiB,EAAQ,EAAgB,CACvC,GAAI,GAAO,OAAO,KAAK,CAAM,EAC7B,GAAI,OAAO,sBAAuB,CAChC,GAAI,GAAU,OAAO,sBAAsB,CAAM,EACjD,GAAmB,GAAU,EAAQ,OAAO,SAAS,EAAK,CACxD,MAAO,QAAO,yBAAyB,EAAQ,CAAG,EAAE,UACtD,CAAC,GAAI,EAAK,KAAK,MAAM,EAAM,CAAO,CACpC,CACA,MAAO,EACT,CACA,YAAwB,EAAQ,CAC9B,OAAS,GAAI,EAAG,EAAI,UAAU,OAAQ,IAAK,CACzC,GAAI,GAAS,AAAQ,UAAU,IAAlB,KAAuB,UAAU,GAAK,CAAC,EACpD,EAAI,EAAI,GAAQ,OAAO,CAAM,EAAG,EAAI,EAAE,QAAQ,SAAS,EAAK,CAC1D,GAAgB,EAAQ,EAAK,EAAO,EAAI,CAC1C,CAAC,EAAI,OAAO,0BAA4B,OAAO,iBAAiB,EAAQ,OAAO,0BAA0B,CAAM,CAAC,EAAI,GAAQ,OAAO,CAAM,CAAC,EAAE,QAAQ,SAAS,EAAK,CAChK,OAAO,eAAe,EAAQ,EAAK,OAAO,yBAAyB,EAAQ,CAAG,CAAC,CACjF,CAAC,CACH,CACA,MAAO,EACT,CACA,YAAyB,EAAK,EAAK,EAAO,CACxC,MAAI,KAAO,GACT,OAAO,eAAe,EAAK,EAAK,CAC9B,QACA,WAAY,GACZ,aAAc,GACd,SAAU,EACZ,CAAC,EAED,EAAI,GAAO,EAEN,CACT,CACA,GAAI,IAAmB,UAAW,CAChC,GAAI,GAAY,CAAC,EACjB,MAAO,CACL,aAAc,SAAsB,EAAM,CACxC,GAAI,EAAU,OAAS,EAAG,CACxB,GAAI,GAAa,EAAU,EAAU,OAAS,GAC9C,AAAI,IAAe,GACjB,EAAW,MAAM,CAErB,CACA,GAAI,GAAY,EAAU,QAAQ,CAAI,EACtC,AAAI,IAAc,IAGhB,EAAU,OAAO,EAAW,CAAC,EAC7B,EAAU,KAAK,CAAI,CAEvB,EACA,eAAgB,SAAwB,EAAM,CAC5C,GAAI,GAAY,EAAU,QAAQ,CAAI,EACtC,AAAI,IAAc,IAChB,EAAU,OAAO,EAAW,CAAC,EAE3B,EAAU,OAAS,GACrB,EAAU,EAAU,OAAS,GAAG,QAAQ,CAE5C,CACF,CACF,EAAE,EACE,GAAoB,SAA4B,EAAM,CACxD,MAAO,GAAK,SAAW,EAAK,QAAQ,YAAY,IAAM,SAAW,MAAO,GAAK,QAAW,UAC1F,EACI,GAAgB,SAAwB,EAAG,CAC7C,MAAO,GAAE,MAAQ,UAAY,EAAE,MAAQ,OAAS,EAAE,UAAY,EAChE,EACI,GAAa,SAAqB,EAAG,CACvC,MAAO,GAAE,MAAQ,OAAS,EAAE,UAAY,CAC1C,EACI,GAAQ,SAAgB,EAAI,CAC9B,MAAO,YAAW,EAAI,CAAC,CACzB,EACI,GAAY,SAAoB,EAAK,EAAI,CAC3C,GAAI,GAAM,GACV,SAAI,MAAM,SAAS,EAAO,EAAG,CAC3B,MAAI,GAAG,CAAK,EACV,GAAM,EACC,IAEF,EACT,CAAC,EACM,CACT,EACI,GAAiB,SAAyB,EAAO,CACnD,OAAS,GAAO,UAAU,OAAQ,EAAS,GAAI,OAAM,EAAO,EAAI,EAAO,EAAI,CAAC,EAAG,EAAO,EAAG,EAAO,EAAM,IACpG,EAAO,EAAO,GAAK,UAAU,GAE/B,MAAO,OAAO,IAAU,WAAa,EAAM,MAAM,OAAQ,CAAM,EAAI,CACrE,EACI,GAAkB,SAA0B,EAAO,CACrD,MAAO,GAAM,OAAO,YAAc,MAAO,GAAM,cAAiB,WAAa,EAAM,aAAa,EAAE,GAAK,EAAM,MAC/G,EACI,GAAkB,SAA0B,EAAU,EAAa,CACrE,GAAI,GAAO,AAA0D,GAAY,UAAa,SAC1F,EAAS,GAAe,CAC1B,wBAAyB,GACzB,kBAAmB,GACnB,kBAAmB,EACrB,EAAG,CAAW,EACV,EAAQ,CAGV,WAAY,CAAC,EAcb,gBAAiB,CAAC,EAMlB,eAAgB,CAAC,EACjB,4BAA6B,KAC7B,wBAAyB,KACzB,OAAQ,GACR,OAAQ,GAGR,uBAAwB,MAC1B,EACI,EACA,EAAY,SAAoB,EAAuB,EAAY,EAAkB,CACvF,MAAO,IAAyB,EAAsB,KAAgB,OAAS,EAAsB,GAAc,EAAO,GAAoB,EAChJ,EACI,EAAqB,SAA6B,EAAS,CAC7D,MAAO,GAAM,gBAAgB,UAAU,SAAS,EAAM,CACpD,GAAI,GAAY,EAAK,UAAW,EAAgB,EAAK,cACrD,MAAO,GAAU,SAAS,CAAO,GAIjC,EAAc,KAAK,SAAS,EAAM,CAChC,MAAO,KAAS,CAClB,CAAC,CACH,CAAC,CACH,EACI,EAAmB,SAA2B,EAAY,CAC5D,GAAI,GAAc,EAAO,GACzB,GAAI,MAAO,IAAgB,WAAY,CACrC,OAAS,GAAQ,UAAU,OAAQ,EAAS,GAAI,OAAM,EAAQ,EAAI,EAAQ,EAAI,CAAC,EAAG,EAAQ,EAAG,EAAQ,EAAO,IAC1G,EAAO,EAAQ,GAAK,UAAU,GAEhC,EAAc,EAAY,MAAM,OAAQ,CAAM,CAChD,CAIA,GAHI,IAAgB,IAClB,GAAc,QAEZ,CAAC,EAAa,CAChB,GAAI,IAAgB,QAAU,IAAgB,GAC5C,MAAO,GAET,KAAM,IAAI,OAAM,IAAI,OAAO,EAAY,8DAA8D,CAAC,CACxG,CACA,GAAI,GAAO,EACX,GAAI,MAAO,IAAgB,UACzB,GAAO,EAAI,cAAc,CAAW,EAChC,CAAC,GACH,KAAM,IAAI,OAAM,IAAI,OAAO,EAAY,uCAAuC,CAAC,EAGnF,MAAO,EACT,EACI,EAAsB,UAAgC,CACxD,GAAI,GAAO,EAAiB,cAAc,EAC1C,GAAI,IAAS,GACX,MAAO,GAET,GAAI,IAAS,OACX,GAAI,EAAmB,EAAI,aAAa,GAAK,EAC3C,EAAO,EAAI,kBACN,CACL,GAAI,GAAqB,EAAM,eAAe,GAC1C,EAAoB,GAAsB,EAAmB,kBACjE,EAAO,GAAqB,EAAiB,eAAe,CAC9D,CAEF,GAAI,CAAC,EACH,KAAM,IAAI,OAAM,8DAA8D,EAEhF,MAAO,EACT,EACI,EAAsB,UAAgC,CAwCxD,GAvCA,EAAM,gBAAkB,EAAM,WAAW,IAAI,SAAS,EAAW,CAC/D,GAAI,GAAgB,GAAS,EAAW,EAAO,eAAe,EAC1D,EAAiB,GAAU,EAAW,EAAO,eAAe,EAChE,MAAO,CACL,YACA,gBACA,iBACA,kBAAmB,EAAc,OAAS,EAAI,EAAc,GAAK,KACjE,iBAAkB,EAAc,OAAS,EAAI,EAAc,EAAc,OAAS,GAAK,KASvF,iBAAkB,SAA0B,EAAM,CAChD,GAAI,GAAU,UAAU,OAAS,GAAK,UAAU,KAAO,OAAS,UAAU,GAAK,GAC3E,EAAU,EAAe,UAAU,SAAS,EAAG,CACjD,MAAO,KAAM,CACf,CAAC,EACD,GAAI,IAAU,GAGd,MAAI,GACK,EAAe,MAAM,EAAU,CAAC,EAAE,KAAK,SAAS,EAAG,CACxD,MAAO,IAAW,EAAG,EAAO,eAAe,CAC7C,CAAC,EAEI,EAAe,MAAM,EAAG,CAAO,EAAE,QAAQ,EAAE,KAAK,SAAS,EAAG,CACjE,MAAO,IAAW,EAAG,EAAO,eAAe,CAC7C,CAAC,CACH,CACF,CACF,CAAC,EACD,EAAM,eAAiB,EAAM,gBAAgB,OAAO,SAAS,EAAO,CAClE,MAAO,GAAM,cAAc,OAAS,CACtC,CAAC,EACG,EAAM,eAAe,QAAU,GAAK,CAAC,EAAiB,eAAe,EACvE,KAAM,IAAI,OAAM,qGAAqG,CAEzH,EACI,EAAW,WAAmB,EAAM,CACtC,GAAI,IAAS,IAGT,IAAS,EAAI,cAGjB,IAAI,CAAC,GAAQ,CAAC,EAAK,MAAO,CACxB,EAAU,EAAoB,CAAC,EAC/B,MACF,CACA,EAAK,MAAM,CACT,cAAe,CAAC,CAAC,EAAO,aAC1B,CAAC,EACD,EAAM,wBAA0B,EAC5B,GAAkB,CAAI,GACxB,EAAK,OAAO,EAEhB,EACI,EAAqB,SAA6B,EAAuB,CAC3E,GAAI,GAAO,EAAiB,iBAAkB,CAAqB,EACnE,MAAO,IAAc,KAAS,GAAQ,GAAQ,EAChD,EACI,EAAmB,SAA2B,EAAG,CACnD,GAAI,GAAS,GAAgB,CAAC,EAC9B,GAAI,IAAmB,CAAM,GAAK,GAGlC,IAAI,GAAe,EAAO,wBAAyB,CAAC,EAAG,CACrD,EAAK,WAAW,CAYd,YAAa,EAAO,yBAA2B,CAAC,GAAY,EAAQ,EAAO,eAAe,CAC5F,CAAC,EACD,MACF,CACA,AAAI,GAAe,EAAO,kBAAmB,CAAC,GAG9C,EAAE,eAAe,EACnB,EACI,EAAe,SAAuB,EAAG,CAC3C,GAAI,GAAS,GAAgB,CAAC,EAC1B,EAAkB,EAAmB,CAAM,GAAK,EACpD,AAAI,GAAmB,YAAkB,UACnC,GACF,GAAM,wBAA0B,GAGlC,GAAE,yBAAyB,EAC3B,EAAS,EAAM,yBAA2B,EAAoB,CAAC,EAEnE,EACI,EAAW,SAAmB,EAAG,CACnC,GAAI,GAAS,GAAgB,CAAC,EAC9B,EAAoB,EACpB,GAAI,GAAkB,KACtB,GAAI,EAAM,eAAe,OAAS,EAAG,CACnC,GAAI,GAAiB,EAAmB,CAAM,EAC1C,EAAiB,GAAkB,EAAI,EAAM,gBAAgB,GAAkB,OACnF,GAAI,EAAiB,EACnB,AAAI,EAAE,SACJ,EAAkB,EAAM,eAAe,EAAM,eAAe,OAAS,GAAG,iBAExE,EAAkB,EAAM,eAAe,GAAG,0BAEnC,EAAE,SAAU,CACrB,GAAI,GAAoB,GAAU,EAAM,eAAgB,SAAS,EAAO,CACtE,GAAI,IAAoB,EAAM,kBAC9B,MAAO,KAAW,EACpB,CAAC,EAID,GAHI,EAAoB,GAAM,GAAe,YAAc,GAAU,GAAY,EAAQ,EAAO,eAAe,GAAK,CAAC,GAAW,EAAQ,EAAO,eAAe,GAAK,CAAC,EAAe,iBAAiB,EAAQ,EAAK,IAC/M,GAAoB,GAElB,GAAqB,EAAG,CAC1B,GAAI,GAAwB,IAAsB,EAAI,EAAM,eAAe,OAAS,EAAI,EAAoB,EACxG,EAAmB,EAAM,eAAe,GAC5C,EAAkB,EAAiB,gBACrC,CACF,KAAO,CACL,GAAI,GAAmB,GAAU,EAAM,eAAgB,SAAS,EAAO,CACrE,GAAI,IAAmB,EAAM,iBAC7B,MAAO,KAAW,EACpB,CAAC,EAID,GAHI,EAAmB,GAAM,GAAe,YAAc,GAAU,GAAY,EAAQ,EAAO,eAAe,GAAK,CAAC,GAAW,EAAQ,EAAO,eAAe,GAAK,CAAC,EAAe,iBAAiB,CAAM,IACvM,GAAmB,GAEjB,GAAoB,EAAG,CACzB,GAAI,GAAyB,IAAqB,EAAM,eAAe,OAAS,EAAI,EAAI,EAAmB,EACvG,EAAoB,EAAM,eAAe,GAC7C,EAAkB,EAAkB,iBACtC,CACF,CACF,KACE,GAAkB,EAAiB,eAAe,EAEpD,AAAI,GACF,GAAE,eAAe,EACjB,EAAS,CAAe,EAE5B,EACI,EAAW,SAAmB,EAAG,CACnC,GAAI,GAAc,CAAC,GAAK,GAAe,EAAO,kBAAmB,CAAC,IAAM,GAAO,CAC7E,EAAE,eAAe,EACjB,EAAK,WAAW,EAChB,MACF,CACA,GAAI,GAAW,CAAC,EAAG,CACjB,EAAS,CAAC,EACV,MACF,CACF,EACI,EAAa,SAAqB,EAAG,CACvC,GAAI,GAAS,GAAgB,CAAC,EAC9B,AAAI,EAAmB,CAAM,GAAK,GAG9B,GAAe,EAAO,wBAAyB,CAAC,GAGhD,GAAe,EAAO,kBAAmB,CAAC,GAG9C,GAAE,eAAe,EACjB,EAAE,yBAAyB,EAC7B,EACI,EAAe,UAAyB,CAC1C,GAAI,EAAC,EAAM,OAGX,UAAiB,aAAa,CAAI,EAClC,EAAM,uBAAyB,EAAO,kBAAoB,GAAM,UAAW,CACzE,EAAS,EAAoB,CAAC,CAChC,CAAC,EAAI,EAAS,EAAoB,CAAC,EACnC,EAAI,iBAAiB,UAAW,EAAc,EAAI,EAClD,EAAI,iBAAiB,YAAa,EAAkB,CAClD,QAAS,GACT,QAAS,EACX,CAAC,EACD,EAAI,iBAAiB,aAAc,EAAkB,CACnD,QAAS,GACT,QAAS,EACX,CAAC,EACD,EAAI,iBAAiB,QAAS,EAAY,CACxC,QAAS,GACT,QAAS,EACX,CAAC,EACD,EAAI,iBAAiB,UAAW,EAAU,CACxC,QAAS,GACT,QAAS,EACX,CAAC,EACM,CACT,EACI,EAAkB,UAA4B,CAChD,GAAI,EAAC,EAAM,OAGX,SAAI,oBAAoB,UAAW,EAAc,EAAI,EACrD,EAAI,oBAAoB,YAAa,EAAkB,EAAI,EAC3D,EAAI,oBAAoB,aAAc,EAAkB,EAAI,EAC5D,EAAI,oBAAoB,QAAS,EAAY,EAAI,EACjD,EAAI,oBAAoB,UAAW,EAAU,EAAI,EAC1C,CACT,EACA,SAAO,CACL,GAAI,SAAS,CACX,MAAO,GAAM,MACf,EACA,GAAI,SAAS,CACX,MAAO,GAAM,MACf,EACA,SAAU,SAAkB,EAAiB,CAC3C,GAAI,EAAM,OACR,MAAO,MAET,GAAI,GAAa,EAAU,EAAiB,YAAY,EACpD,EAAiB,EAAU,EAAiB,gBAAgB,EAC5D,EAAoB,EAAU,EAAiB,mBAAmB,EACtE,AAAK,GACH,EAAoB,EAEtB,EAAM,OAAS,GACf,EAAM,OAAS,GACf,EAAM,4BAA8B,EAAI,cACpC,GACF,EAAW,EAEb,GAAI,GAAmB,UAA6B,CAClD,AAAI,GACF,EAAoB,EAEtB,EAAa,EACT,GACF,EAAe,CAEnB,EACA,MAAI,GACF,GAAkB,EAAM,WAAW,OAAO,CAAC,EAAE,KAAK,EAAkB,CAAgB,EAC7E,MAET,GAAiB,EACV,KACT,EACA,WAAY,SAAoB,EAAmB,CACjD,GAAI,CAAC,EAAM,OACT,MAAO,MAET,GAAI,GAAU,GAAe,CAC3B,aAAc,EAAO,aACrB,iBAAkB,EAAO,iBACzB,oBAAqB,EAAO,mBAC9B,EAAG,CAAiB,EACpB,aAAa,EAAM,sBAAsB,EACzC,EAAM,uBAAyB,OAC/B,EAAgB,EAChB,EAAM,OAAS,GACf,EAAM,OAAS,GACf,GAAiB,eAAe,CAAI,EACpC,GAAI,GAAe,EAAU,EAAS,cAAc,EAChD,EAAmB,EAAU,EAAS,kBAAkB,EACxD,EAAsB,EAAU,EAAS,qBAAqB,EAC9D,EAAc,EAAU,EAAS,cAAe,yBAAyB,EAC7E,AAAI,GACF,EAAa,EAEf,GAAI,GAAqB,UAA+B,CACtD,GAAM,UAAW,CACf,AAAI,GACF,EAAS,EAAmB,EAAM,2BAA2B,CAAC,EAE5D,GACF,EAAiB,CAErB,CAAC,CACH,EACA,MAAI,IAAe,EACjB,GAAoB,EAAmB,EAAM,2BAA2B,CAAC,EAAE,KAAK,EAAoB,CAAkB,EAC/G,MAET,GAAmB,EACZ,KACT,EACA,MAAO,UAAiB,CACtB,MAAI,GAAM,QAAU,CAAC,EAAM,OAClB,KAET,GAAM,OAAS,GACf,EAAgB,EACT,KACT,EACA,QAAS,UAAmB,CAC1B,MAAI,CAAC,EAAM,QAAU,CAAC,EAAM,OACnB,KAET,GAAM,OAAS,GACf,EAAoB,EACpB,EAAa,EACN,KACT,EACA,wBAAyB,SAAiC,EAAmB,CAC3E,GAAI,GAAkB,CAAC,EAAE,OAAO,CAAiB,EAAE,OAAO,OAAO,EACjE,SAAM,WAAa,EAAgB,IAAI,SAAS,EAAS,CACvD,MAAO,OAAO,IAAY,SAAW,EAAI,cAAc,CAAO,EAAI,CACpE,CAAC,EACG,EAAM,QACR,EAAoB,EAEf,IACT,CACF,EACA,EAAK,wBAAwB,CAAQ,EAC9B,CACT,EAGA,YAAqB,EAAQ,CAC3B,GAAI,GACA,EACJ,OAAO,iBAAiB,UAAW,IAAM,CACvC,EAAc,EACd,EAAiB,SAAS,aAC5B,CAAC,EACD,EAAO,MAAM,QAAS,AAAC,GAAO,CAC5B,GAAI,GAAS,EACb,MAAO,CACL,WAAY,GACZ,aAAc,GACd,OAAO,EAAK,CACV,SAAS,EACF,IACT,EACA,kBAAmB,CACjB,YAAK,WAAa,GACX,IACT,EACA,UAAW,CACT,YAAK,WAAa,GACX,IACT,EACA,gBAAiB,CACf,YAAK,aAAe,GACb,IACT,EACA,MAAO,CACL,MAAO,MAAK,eAAe,CAC7B,EACA,UAAU,EAAK,CACb,MAAO,IAAY,CAAG,CACxB,EACA,mBAAoB,CAClB,MAAO,EACT,EACA,aAAc,CACZ,MAAO,EACT,EACA,SAAU,CACR,MAAO,EACT,EACA,YAAa,CACX,MAAI,OAAM,QAAQ,CAAM,EACf,EACF,GAAU,EAAQ,CAAE,aAAc,MAAO,CAAC,CACnD,EACA,KAAM,CACJ,MAAO,MAAK,WAAW,CACzB,EACA,QAAQ,EAAK,CACX,GAAI,GAAM,KAAK,IAAI,EACnB,MAAO,GAAI,IAAM,EAAI,GAAG,WAAW,CAAG,CACxC,EACA,OAAO,EAAK,CACV,GAAI,GAAM,KAAK,IAAI,EACnB,MAAO,GAAI,QAAU,EAAI,MAAM,EAAE,EAAE,GAAG,WAAW,CAAG,CACtD,EACA,UAAW,CACT,MAAO,MAAK,IAAI,EAAE,EACpB,EACA,SAAU,CACR,MAAO,MAAK,IAAI,EAAE,MAAM,EAAE,EAAE,EAC9B,EACA,SAAU,CACR,GAAI,GAAO,KAAK,IAAI,EAChB,EAAU,SAAS,cACvB,GAAI,EAAK,QAAQ,CAAO,IAAM,GAE9B,MAAI,MAAK,cAAgB,EAAK,QAAQ,CAAO,IAAM,EAAK,OAAS,EACxD,EAAK,GAEP,EAAK,EAAK,QAAQ,CAAO,EAAI,EACtC,EACA,aAAc,CACZ,GAAI,GAAO,KAAK,IAAI,EAChB,EAAU,SAAS,cACvB,GAAI,EAAK,QAAQ,CAAO,IAAM,GAE9B,MAAI,MAAK,cAAgB,EAAK,QAAQ,CAAO,IAAM,EAC1C,EAAK,MAAM,EAAE,EAAE,GAEjB,EAAK,EAAK,QAAQ,CAAO,EAAI,EACtC,EACA,OAAQ,CACN,KAAK,MAAM,KAAK,SAAS,CAAC,CAC5B,EACA,MAAO,CACL,KAAK,MAAM,KAAK,QAAQ,CAAC,CAC3B,EACA,MAAO,CACL,KAAK,MAAM,KAAK,QAAQ,CAAC,CAC3B,EACA,UAAW,CACT,KAAK,MAAM,KAAK,YAAY,CAAC,CAC/B,EACA,MAAO,CACL,MAAO,MAAK,SAAS,CACvB,EACA,MAAM,EAAK,CACT,AAAI,CAAC,GAEL,WAAW,IAAM,CACf,AAAK,EAAI,aAAa,UAAU,GAC9B,EAAI,aAAa,WAAY,GAAG,EAClC,EAAI,MAAM,CAAE,cAAe,KAAK,UAAW,CAAC,CAC9C,CAAC,CACH,CACF,CACF,CAAC,EACD,EAAO,UAAU,OAAQ,EAAO,gBAC9B,CAAC,EAAI,CAAE,aAAY,aAAa,CAAE,SAAQ,gBAAe,aAAc,CACrE,GAAI,GAAY,EAAc,CAAU,EACpC,EAAW,GACX,EAAU,CACZ,kBAAmB,GACnB,kBAAmB,GACnB,cAAe,IAAM,CACvB,EACA,GAAI,EAAU,SAAS,aAAa,EAClC,EAAQ,aAAe,OAClB,CACL,GAAI,GAAc,EAAG,cAAc,aAAa,EAChD,AAAI,GACF,GAAQ,aAAe,EAC3B,CACA,GAAI,GAAO,GAAgB,EAAI,CAAO,EAClC,EAAY,IAAM,CACtB,EACI,EAAuB,IAAM,CACjC,EACM,EAAe,IAAM,CACzB,EAAU,EACV,EAAY,IAAM,CAClB,EACA,EAAqB,EACrB,EAAuB,IAAM,CAC7B,EACA,EAAK,WAAW,CACd,YAAa,CAAC,EAAU,SAAS,UAAU,CAC7C,CAAC,CACH,EACA,EAAO,IAAM,EAAU,AAAC,GAAU,CAChC,AAAI,IAAa,GAEb,IAAS,CAAC,GACR,GAAU,SAAS,UAAU,GAC/B,GAAuB,GAAiB,GACtC,EAAU,SAAS,OAAO,GAC5B,GAAY,GAAS,CAAE,GACzB,WAAW,IAAM,CACf,EAAK,SAAS,CAChB,EAAG,EAAE,GAEH,CAAC,GAAS,GACZ,EAAa,EAEf,EAAW,CAAC,CAAC,EACf,CAAC,CAAC,EACF,EAAQ,CAAY,CACtB,EAIA,CAAC,EAAI,CAAE,aAAY,aAAa,CAAE,cAAe,CAC/C,AAAI,EAAU,SAAS,OAAO,GAAK,EAAS,CAAU,GACpD,GAAS,CAAE,CACf,CACF,CAAC,CACH,CACA,YAAkB,EAAI,CACpB,GAAI,GAAQ,CAAC,EACb,UAAgB,EAAI,AAAC,GAAY,CAC/B,GAAI,GAAQ,EAAQ,aAAa,aAAa,EAC9C,EAAQ,aAAa,cAAe,MAAM,EAC1C,EAAM,KAAK,IAAM,GAAS,EAAQ,gBAAgB,aAAa,CAAC,CAClE,CAAC,EACM,IAAM,CACX,KAAO,EAAM,QACX,EAAM,IAAI,EAAE,CAChB,CACF,CACA,YAAyB,EAAI,EAAU,CACrC,AAAI,EAAG,WAAW,SAAS,IAAI,GAAK,CAAC,EAAG,YAExC,MAAM,KAAK,EAAG,WAAW,QAAQ,EAAE,QAAQ,AAAC,GAAY,CACtD,AAAI,EAAQ,WAAW,CAAE,EACvB,GAAgB,EAAG,WAAY,CAAQ,EAEvC,EAAS,CAAO,CAEpB,CAAC,CACH,CACA,aAA4B,CAC1B,GAAI,GAAW,SAAS,gBAAgB,MAAM,SAC1C,EAAe,SAAS,gBAAgB,MAAM,aAC9C,EAAiB,OAAO,WAAa,SAAS,gBAAgB,YAClE,gBAAS,gBAAgB,MAAM,SAAW,SAC1C,SAAS,gBAAgB,MAAM,aAAe,GAAG,MAC1C,IAAM,CACX,SAAS,gBAAgB,MAAM,SAAW,EAC1C,SAAS,gBAAgB,MAAM,aAAe,CAChD,CACF,CAGA,GAAI,IAAiB,GAKrB,ACl/BA,YAAqB,EAAQ,CAC3B,GAAI,GAAU,IAAM,CAClB,GAAI,GACA,EACJ,GAAI,CACF,EAAU,YACZ,OAAS,EAAP,CACA,QAAQ,MAAM,CAAC,EACf,QAAQ,KAAK,gFAAgF,EAC7F,GAAI,GAAwB,GAAI,KAChC,EAAU,CACR,QAAS,EAAM,IAAI,KAAK,CAAK,EAC7B,QAAS,EAAM,IAAI,KAAK,CAAK,CAC/B,CACF,CACA,MAAO,GAAO,YAAY,CAAC,EAAc,EAAQ,EAAQ,EAAM,IAAQ,CACrE,GAAI,GAAS,GAAS,MAAM,IACxB,EAAU,GAAW,EAAQ,CAAO,EAAI,GAAW,EAAQ,CAAO,EAAI,EAC1E,SAAO,CAAO,EACd,EAAO,OAAO,IAAM,CAClB,GAAI,GAAQ,EAAO,EACnB,GAAW,EAAQ,EAAO,CAAO,EACjC,EAAO,CAAK,CACd,CAAC,EACM,CACT,EAAG,AAAC,GAAS,CACX,EAAK,GAAK,AAAC,GACT,GAAQ,EACD,GACN,EAAK,MAAQ,AAAC,GACf,GAAU,EACH,EAEX,CAAC,CACH,EACA,OAAO,eAAe,EAAQ,WAAY,CAAE,IAAK,IAAM,EAAQ,CAAE,CAAC,EAClE,EAAO,MAAM,UAAW,CAAO,EAC/B,EAAO,QAAU,CAAC,EAAK,CAAE,MAAK,OAAO,EAAU,eAAiB,CAC9D,GAAI,GAAU,GAAW,EAAK,CAAO,EAAI,GAAW,EAAK,CAAO,EAAI,EAAI,EACxE,EAAI,CAAO,EACX,EAAO,OAAO,IAAM,CAClB,GAAI,GAAQ,EAAI,EAChB,GAAW,EAAK,EAAO,CAAO,EAC9B,EAAI,CAAK,CACX,CAAC,CACH,CACF,CACA,YAAoB,EAAK,EAAS,CAChC,MAAO,GAAQ,QAAQ,CAAG,IAAM,IAClC,CACA,YAAoB,EAAK,EAAS,CAChC,GAAI,GAAQ,EAAQ,QAAQ,EAAK,CAAO,EACxC,GAAI,IAAU,OAEd,MAAO,MAAK,MAAM,CAAK,CACzB,CACA,YAAoB,EAAK,EAAO,EAAS,CACvC,EAAQ,QAAQ,EAAK,KAAK,UAAU,CAAK,CAAC,CAC5C,CAGA,GAAI,IAAiB,GC7DrB,YAAqB,EAAQ,CAC3B,EAAO,UAAU,YAAa,EAAO,gBAAgB,CAAC,EAAI,CAAE,QAAO,aAAY,aAAa,CAAE,gBAAe,aAAc,CACzH,GAAI,GAAW,EAAc,CAAU,EACnC,EAAU,CACZ,WAAY,GAAc,CAAS,EACnC,UAAW,GAAa,CAAS,CACnC,EACI,EAAW,GAAI,sBAAqB,AAAC,GAAY,CACnD,EAAQ,QAAQ,AAAC,GAAU,CACzB,AAAI,EAAM,iBAAoB,KAAU,UAExC,GAAS,EACT,EAAU,SAAS,MAAM,GAAK,EAAS,WAAW,EACpD,CAAC,CACH,EAAG,CAAO,EACV,EAAS,QAAQ,CAAE,EACnB,EAAQ,IAAM,CACZ,EAAS,WAAW,CACtB,CAAC,CACH,CAAC,CAAC,CACJ,CACA,YAAsB,EAAW,CAC/B,GAAI,EAAU,SAAS,MAAM,EAC3B,MAAO,KACT,GAAI,EAAU,SAAS,MAAM,EAC3B,MAAO,IACT,GAAI,CAAC,EAAU,SAAS,WAAW,EACjC,MAAO,GACT,GAAI,GAAY,EAAU,EAAU,QAAQ,WAAW,EAAI,GAC3D,MAAI,KAAc,MACT,EACL,IAAc,IACT,EACF,OAAO,IAAI,GAAW,CAC/B,CACA,YAAwB,EAAU,CAChC,GAAI,GAAQ,EAAS,MAAM,qBAAqB,EAChD,MAAO,GAAQ,EAAM,GAAM,GAAM,IAAM,MAAQ,MACjD,CACA,YAAuB,EAAW,CAChC,GAAM,GAAM,SACN,EAAW,kBACX,EAAQ,EAAU,QAAQ,CAAG,EACnC,GAAI,IAAU,GACZ,MAAO,GACT,GAAI,GAAS,CAAC,EACd,OAAS,GAAI,EAAG,EAAI,EAAG,IACrB,EAAO,KAAK,GAAe,EAAU,EAAQ,IAAM,EAAE,CAAC,EAExD,SAAS,EAAO,OAAO,AAAC,GAAM,IAAM,MAAM,EACnC,EAAO,OAAS,EAAO,KAAK,GAAG,EAAE,KAAK,EAAI,CACnD,CAGA,GAAI,IAAiB,GCtDrB,YAAqB,EAAQ,CAC3B,EAAO,UAAU,SAAU,EAAO,gBAAgB,CAAC,EAAI,CAAE,QAAO,aAAY,aAAa,CAAE,gBAAe,aAAc,CACtH,GAAI,GAAY,EAAc,CAAU,EACpC,EAAW,CAAC,EAAO,IAAW,CAChC,EAAU,IAAM,CAChB,EAAG,CAAE,MAAO,CAAE,OAAU,EAAO,QAAW,CAAO,CAAE,CAAC,CACtD,EACI,EAAM,EAAU,SAAS,UAAU,EAAI,GAAiB,CAAQ,EAAI,GAAW,EAAI,CAAQ,EAC/F,EAAQ,IAAM,EAAI,CAAC,CACrB,CAAC,CAAC,CACJ,CACA,YAAoB,EAAI,EAAU,CAChC,GAAI,GAAW,GAAI,gBAAe,AAAC,GAAY,CAC7C,GAAI,CAAC,EAAO,GAAU,GAAW,CAAO,EACxC,EAAS,EAAO,CAAM,CACxB,CAAC,EACD,SAAS,QAAQ,CAAE,EACZ,IAAM,EAAS,WAAW,CACnC,CACA,GAAI,IACA,GAAkD,GAAI,KAC1D,YAA0B,EAAU,CAClC,UAAgC,IAAI,CAAQ,EACvC,IACH,IAAyB,GAAI,gBAAe,AAAC,GAAY,CACvD,GAAI,CAAC,EAAO,GAAU,GAAW,CAAO,EACxC,GAAgC,QAAQ,AAAC,GAAM,EAAE,EAAO,CAAM,CAAC,CACjE,CAAC,EACD,GAAuB,QAAQ,SAAS,eAAe,GAElD,IAAM,CACX,GAAgC,OAAO,CAAQ,CACjD,CACF,CACA,YAAoB,EAAS,CAC3B,GAAI,GAAO,EACX,OAAS,KAAS,GAChB,EAAQ,EAAM,cAAc,GAAG,WAC/B,EAAS,EAAM,cAAc,GAAG,UAElC,MAAO,CAAC,EAAO,CAAM,CACvB,CAGA,GAAI,IAAiB,GC5CrB,GAAI,IAAM,KAAK,IACX,GAAM,KAAK,IACX,GAAQ,KAAK,MACb,GAAQ,KAAK,MACb,GAAe,AAAC,GAAO,EACzB,EAAG,EACH,EAAG,CACL,GACI,GAAkB,CACpB,KAAM,QACN,MAAO,OACP,OAAQ,MACR,IAAK,QACP,EACI,GAAuB,CACzB,MAAO,MACP,IAAK,OACP,EACA,YAAe,EAAO,EAAO,EAAK,CAChC,MAAO,IAAI,EAAO,GAAI,EAAO,CAAG,CAAC,CACnC,CACA,YAAkB,EAAO,EAAO,CAC9B,MAAO,OAAO,IAAU,WAAa,EAAM,CAAK,EAAI,CACtD,CACA,YAAiB,EAAW,CAC1B,MAAO,GAAU,MAAM,GAAG,EAAE,EAC9B,CACA,YAAsB,EAAW,CAC/B,MAAO,GAAU,MAAM,GAAG,EAAE,EAC9B,CACA,YAAyB,EAAM,CAC7B,MAAO,KAAS,IAAM,IAAM,GAC9B,CACA,YAAuB,EAAM,CAC3B,MAAO,KAAS,IAAM,SAAW,OACnC,CACA,YAAqB,EAAW,CAC9B,MAAO,CAAC,MAAO,QAAQ,EAAE,SAAS,GAAQ,CAAS,CAAC,EAAI,IAAM,GAChE,CACA,YAA0B,EAAW,CACnC,MAAO,IAAgB,GAAY,CAAS,CAAC,CAC/C,CACA,YAA2B,EAAW,EAAO,EAAK,CAChD,AAAI,IAAQ,QACV,GAAM,IAER,GAAM,GAAY,GAAa,CAAS,EAClC,EAAgB,GAAiB,CAAS,EAC1C,EAAS,GAAc,CAAa,EACtC,EAAoB,IAAkB,IAAM,IAAe,GAAM,MAAQ,SAAW,QAAU,OAAS,IAAc,QAAU,SAAW,MAC9I,MAAI,GAAM,UAAU,GAAU,EAAM,SAAS,IAC3C,GAAoB,GAAqB,CAAiB,GAErD,CAAC,EAAmB,GAAqB,CAAiB,CAAC,CACpE,CACA,YAA+B,EAAW,CACxC,GAAM,GAAoB,GAAqB,CAAS,EACxD,MAAO,CAAC,GAA8B,CAAS,EAAG,EAAmB,GAA8B,CAAiB,CAAC,CACvH,CACA,YAAuC,EAAW,CAChD,MAAO,GAAU,QAAQ,aAAc,AAAC,GAAc,GAAqB,EAAU,CACvF,CACA,YAAqB,EAAM,EAAS,EAAK,CACvC,GAAM,GAAK,CAAC,OAAQ,OAAO,EACrB,EAAK,CAAC,QAAS,MAAM,EACrB,EAAK,CAAC,MAAO,QAAQ,EACrB,EAAK,CAAC,SAAU,KAAK,EAC3B,OAAQ,OACD,UACA,SACH,MAAI,GACK,EAAU,EAAK,EACjB,EAAU,EAAK,MACnB,WACA,QACH,MAAO,GAAU,EAAK,UAEtB,MAAO,CAAC,EAEd,CACA,YAAmC,EAAW,EAAe,EAAW,EAAK,CAC3E,GAAM,GAAY,GAAa,CAAS,EACpC,EAAO,GAAY,GAAQ,CAAS,EAAG,IAAc,QAAS,CAAG,EACrE,MAAI,IACF,GAAO,EAAK,IAAI,AAAC,GAAS,EAAO,IAAM,CAAS,EAC5C,GACF,GAAO,EAAK,OAAO,EAAK,IAAI,EAA6B,CAAC,IAGvD,CACT,CACA,YAA8B,EAAW,CACvC,MAAO,GAAU,QAAQ,yBAA0B,AAAC,GAAS,GAAgB,EAAK,CACpF,CACA,YAA6B,EAAS,CACpC,MAAO,CACL,IAAK,EACL,MAAO,EACP,OAAQ,EACR,KAAM,EACN,GAAG,CACL,CACF,CACA,YAA0B,EAAS,CACjC,MAAO,OAAO,IAAY,SAAW,GAAoB,CAAO,EAAI,CAClE,IAAK,EACL,MAAO,EACP,OAAQ,EACR,KAAM,CACR,CACF,CACA,YAA0B,EAAM,CAC9B,MAAO,CACL,GAAG,EACH,IAAK,EAAK,EACV,KAAM,EAAK,EACX,MAAO,EAAK,EAAI,EAAK,MACrB,OAAQ,EAAK,EAAI,EAAK,MACxB,CACF,CAGA,YAAoC,EAAM,EAAW,EAAK,CACxD,GAAI,CACF,YACA,YACE,EACE,EAAW,GAAY,CAAS,EAChC,EAAgB,GAAiB,CAAS,EAC1C,EAAc,GAAc,CAAa,EACzC,EAAO,GAAQ,CAAS,EACxB,EAAa,IAAa,IAC1B,EAAU,EAAU,EAAI,EAAU,MAAQ,EAAI,EAAS,MAAQ,EAC/D,EAAU,EAAU,EAAI,EAAU,OAAS,EAAI,EAAS,OAAS,EACjE,EAAc,EAAU,GAAe,EAAI,EAAS,GAAe,EACrE,EACJ,OAAQ,OACD,MACH,EAAS,CACP,EAAG,EACH,EAAG,EAAU,EAAI,EAAS,MAC5B,EACA,UACG,SACH,EAAS,CACP,EAAG,EACH,EAAG,EAAU,EAAI,EAAU,MAC7B,EACA,UACG,QACH,EAAS,CACP,EAAG,EAAU,EAAI,EAAU,MAC3B,EAAG,CACL,EACA,UACG,OACH,EAAS,CACP,EAAG,EAAU,EAAI,EAAS,MAC1B,EAAG,CACL,EACA,cAEA,EAAS,CACP,EAAG,EAAU,EACb,EAAG,EAAU,CACf,EAEJ,OAAQ,GAAa,CAAS,OACvB,QACH,EAAO,IAAkB,EAAe,IAAO,EAAa,GAAK,GACjE,UACG,MACH,EAAO,IAAkB,EAAe,IAAO,EAAa,GAAK,GACjE,MAEJ,MAAO,EACT,CACA,GAAI,IAAkB,MAAO,EAAW,EAAU,IAAW,CAC3D,GAAM,CACJ,YAAY,SACZ,WAAW,WACX,aAAa,CAAC,EACd,SAAU,GACR,EACE,EAAkB,EAAW,OAAO,OAAO,EAC3C,EAAM,KAAO,GAAU,OAAS,KAAO,OAAS,EAAU,MAAM,CAAQ,GAC1E,EAAQ,KAAM,GAAU,gBAAgB,CAC1C,YACA,WACA,UACF,CAAC,EACG,CACF,IACA,KACE,GAA2B,EAAO,EAAW,CAAG,EAChD,EAAoB,EACpB,EAAiB,CAAC,EAClB,EAAa,EACjB,OAAS,GAAI,EAAG,EAAI,EAAgB,OAAQ,IAAK,CAC/C,GAAM,CACJ,OACA,MACE,EAAgB,GACd,CACJ,EAAG,EACH,EAAG,EACH,OACA,SACE,KAAM,GAAG,CACX,IACA,IACA,iBAAkB,EAClB,UAAW,EACX,WACA,iBACA,QACA,SAAU,EACV,SAAU,CACR,YACA,UACF,CACF,CAAC,EAUD,GATA,EAAI,GAAwB,EAC5B,EAAI,GAAwB,EAC5B,EAAiB,CACf,GAAG,EACH,CAAC,GAAO,CACN,GAAG,EAAe,GAClB,GAAG,CACL,CACF,EACI,GAAS,GAAc,GAAI,CAC7B,IACI,MAAO,IAAU,UACf,GAAM,WACR,GAAoB,EAAM,WAExB,EAAM,OACR,GAAQ,EAAM,QAAU,GAAO,KAAM,GAAU,gBAAgB,CAC7D,YACA,WACA,UACF,CAAC,EAAI,EAAM,OAEZ,CACC,IACA,GACF,EAAI,GAA2B,EAAO,EAAmB,CAAG,GAE9D,EAAI,GACJ,QACF,CACF,CACA,MAAO,CACL,IACA,IACA,UAAW,EACX,WACA,gBACF,CACF,EACA,kBAA8B,EAAO,EAAS,CAC5C,GAAI,GACJ,AAAI,IAAY,QACd,GAAU,CAAC,GAEb,GAAM,CACJ,IACA,IACA,SAAU,EACV,QACA,WACA,YACE,EACE,CACJ,WAAW,oBACX,eAAe,WACf,iBAAiB,WACjB,cAAc,GACd,UAAU,GACR,GAAS,EAAS,CAAK,EACrB,EAAgB,GAAiB,CAAO,EAExC,EAAU,EAAS,EADN,IAAmB,WAAa,YAAc,WACb,GAC9C,EAAqB,GAAiB,KAAM,GAAU,gBAAgB,CAC1E,QAAW,GAAwB,KAAO,GAAU,WAAa,KAAO,OAAS,EAAU,UAAU,CAAO,KAAO,MAAO,EAAgC,EAAU,EAAQ,gBAAkB,KAAO,GAAU,oBAAsB,KAAO,OAAS,EAAU,mBAAmB,EAAS,QAAQ,GACnS,WACA,eACA,UACF,CAAC,CAAC,EACI,EAAO,IAAmB,WAAa,CAC3C,GAAG,EAAM,SACT,IACA,GACF,EAAI,EAAM,UACJ,EAAe,KAAO,GAAU,iBAAmB,KAAO,OAAS,EAAU,gBAAgB,EAAS,QAAQ,GAC9G,EAAc,KAAO,GAAU,WAAa,KAAO,OAAS,EAAU,UAAU,CAAY,GAAK,KAAO,GAAU,UAAY,KAAO,OAAS,EAAU,SAAS,CAAY,IAAM,CACvL,EAAG,EACH,EAAG,CACL,EAAI,CACF,EAAG,EACH,EAAG,CACL,EACM,EAAoB,GAAiB,EAAU,sDAAwD,KAAM,GAAU,sDAAsD,CACjL,OACA,eACA,UACF,CAAC,EAAI,CAAI,EACT,MAAO,CACL,IAAM,GAAmB,IAAM,EAAkB,IAAM,EAAc,KAAO,EAAY,EACxF,OAAS,GAAkB,OAAS,EAAmB,OAAS,EAAc,QAAU,EAAY,EACpG,KAAO,GAAmB,KAAO,EAAkB,KAAO,EAAc,MAAQ,EAAY,EAC5F,MAAQ,GAAkB,MAAQ,EAAmB,MAAQ,EAAc,OAAS,EAAY,CAClG,CACF,CACA,GAAI,IAAO,SAAS,EAAS,CAC3B,MAAI,KAAY,QACd,GAAU,CAAC,GAEN,CACL,KAAM,OACN,UACA,KAAM,IAAG,EAAO,CACd,GAAI,GAAuB,EAC3B,GAAM,CACJ,YACA,iBACA,QACA,mBACA,SAAU,EACV,YACE,EACE,CACJ,SAAU,EAAgB,GAC1B,UAAW,EAAiB,GAC5B,mBAAoB,EACpB,mBAAmB,UACnB,4BAA4B,OAC5B,gBAAgB,MACb,GACD,GAAS,EAAS,CAAK,EAC3B,GAAK,GAAwB,EAAe,QAAU,MAAQ,EAAsB,gBAClF,MAAO,CAAC,EAEV,GAAM,GAAO,GAAQ,CAAS,EACxB,EAAkB,GAAQ,CAAgB,IAAM,EAChD,EAAM,KAAO,GAAU,OAAS,KAAO,OAAS,EAAU,MAAM,EAAS,QAAQ,GACjF,EAAqB,GAAgC,IAAmB,CAAC,EAAgB,CAAC,GAAqB,CAAgB,CAAC,EAAI,GAAsB,CAAgB,GAChL,AAAI,CAAC,GAA+B,IAA8B,QAChE,EAAmB,KAAK,GAAG,GAA0B,EAAkB,EAAe,EAA2B,CAAG,CAAC,EAEvH,GAAM,GAAc,CAAC,EAAkB,GAAG,CAAkB,EACtD,EAAW,KAAM,IAAe,EAAO,CAAqB,EAC5D,EAAY,CAAC,EACf,EAAkB,IAAuB,EAAe,OAAS,KAAO,OAAS,EAAqB,YAAc,CAAC,EAIzH,GAHI,GACF,EAAU,KAAK,EAAS,EAAK,EAE3B,EAAgB,CAClB,GAAM,GAAS,GAAkB,EAAW,EAAO,CAAG,EACtD,EAAU,KAAK,EAAS,EAAO,IAAK,EAAS,EAAO,GAAG,CACzD,CAKA,GAJA,EAAgB,CAAC,GAAG,EAAe,CACjC,YACA,WACF,CAAC,EACG,CAAC,EAAU,MAAM,AAAC,GAAU,GAAS,CAAC,EAAG,CAC3C,GAAI,GAAuB,EAC3B,GAAM,GAAe,KAAwB,EAAe,OAAS,KAAO,OAAS,EAAsB,QAAU,GAAK,EACpH,EAAgB,EAAY,GAClC,GAAI,EACF,MAAO,CACL,KAAM,CACJ,MAAO,EACP,UAAW,CACb,EACA,MAAO,CACL,UAAW,CACb,CACF,EAEF,GAAI,GAAkB,GAAwB,EAAc,OAAO,AAAC,GAAM,EAAE,UAAU,IAAM,CAAC,EAAE,KAAK,CAAC,EAAG,IAAM,EAAE,UAAU,GAAK,EAAE,UAAU,EAAE,EAAE,KAAO,KAAO,OAAS,EAAsB,UAC5L,GAAI,CAAC,EACH,OAAQ,OACD,UAAW,CACd,GAAI,GACJ,GAAM,GAAc,GAAwB,EAAc,IAAI,AAAC,GAAM,CAAC,EAAE,UAAW,EAAE,UAAU,OAAO,AAAC,GAAc,EAAY,CAAC,EAAE,OAAO,CAAC,EAAK,KAAc,EAAM,GAAW,CAAC,CAAC,CAAC,EAAE,KAAK,CAAC,EAAG,IAAM,EAAE,GAAK,EAAE,EAAE,EAAE,KAAO,KAAO,OAAS,EAAsB,GAC9P,AAAI,GACF,GAAiB,GAEnB,KACF,KACK,mBACH,EAAiB,EACjB,MAGN,GAAI,IAAc,EAChB,MAAO,CACL,MAAO,CACL,UAAW,CACb,CACF,CAEJ,CACA,MAAO,CAAC,CACV,CACF,CACF,EACA,kBAAoC,EAAO,EAAS,CAClD,GAAM,CACJ,YACA,SAAU,EACV,YACE,EACE,EAAM,KAAO,GAAU,OAAS,KAAO,OAAS,EAAU,MAAM,EAAS,QAAQ,GACjF,EAAO,GAAQ,CAAS,EACxB,EAAY,GAAa,CAAS,EAClC,EAAa,GAAY,CAAS,IAAM,IACxC,EAAgB,CAAC,OAAQ,KAAK,EAAE,SAAS,CAAI,EAAI,GAAK,EACtD,EAAiB,GAAO,EAAa,GAAK,EAC1C,EAAW,GAAS,EAAS,CAAK,EACpC,CACF,WACA,YACA,iBACE,MAAO,IAAa,SAAW,CACjC,SAAU,EACV,UAAW,EACX,cAAe,IACjB,EAAI,CACF,SAAU,EACV,UAAW,EACX,cAAe,KACf,GAAG,CACL,EACA,MAAI,IAAa,MAAO,IAAkB,UACxC,GAAY,IAAc,MAAQ,EAAgB,GAAK,GAElD,EAAa,CAClB,EAAG,EAAY,EACf,EAAG,EAAW,CAChB,EAAI,CACF,EAAG,EAAW,EACd,EAAG,EAAY,CACjB,CACF,CACA,GAAI,IAAS,SAAS,EAAS,CAC7B,MAAI,KAAY,QACd,GAAU,GAEL,CACL,KAAM,SACN,UACA,KAAM,IAAG,EAAO,CACd,GAAM,CACJ,IACA,KACE,EACE,EAAa,KAAM,IAAqB,EAAO,CAAO,EAC5D,MAAO,CACL,EAAG,EAAI,EAAW,EAClB,EAAG,EAAI,EAAW,EAClB,KAAM,CACR,CACF,CACF,CACF,EACI,GAAQ,SAAS,EAAS,CAC5B,MAAI,KAAY,QACd,GAAU,CAAC,GAEN,CACL,KAAM,QACN,UACA,KAAM,IAAG,EAAO,CACd,GAAM,CACJ,IACA,IACA,aACE,EACE,CACJ,SAAU,EAAgB,GAC1B,UAAW,EAAiB,GAC5B,UAAU,CACR,GAAI,AAAC,GAAS,CACZ,GAAI,CACF,EAAG,EACH,EAAG,GACD,EACJ,MAAO,CACL,EAAG,EACH,EAAG,CACL,CACF,CACF,KACG,GACD,GAAS,EAAS,CAAK,EACrB,EAAS,CACb,IACA,GACF,EACM,EAAW,KAAM,IAAe,EAAO,CAAqB,EAC5D,EAAY,GAAY,GAAQ,CAAS,CAAC,EAC1C,EAAW,GAAgB,CAAS,EACtC,EAAgB,EAAO,GACvB,EAAiB,EAAO,GAC5B,GAAI,EAAe,CACjB,GAAM,GAAU,IAAa,IAAM,MAAQ,OACrC,EAAU,IAAa,IAAM,SAAW,QACxC,EAAO,EAAgB,EAAS,GAChC,EAAO,EAAgB,EAAS,GACtC,EAAgB,GAAM,EAAM,EAAe,CAAI,CACjD,CACA,GAAI,EAAgB,CAClB,GAAM,GAAU,IAAc,IAAM,MAAQ,OACtC,EAAU,IAAc,IAAM,SAAW,QACzC,EAAO,EAAiB,EAAS,GACjC,EAAO,EAAiB,EAAS,GACvC,EAAiB,GAAM,EAAM,EAAgB,CAAI,CACnD,CACA,GAAM,GAAgB,EAAQ,GAAG,CAC/B,GAAG,EACH,CAAC,GAAW,EACZ,CAAC,GAAY,CACf,CAAC,EACD,MAAO,CACL,GAAG,EACH,KAAM,CACJ,EAAG,EAAc,EAAI,EACrB,EAAG,EAAc,EAAI,CACvB,CACF,CACF,CACF,CACF,EAGA,YAAqB,EAAM,CACzB,MAAI,IAAO,CAAI,EACL,GAAK,UAAY,IAAI,YAAY,EAEpC,WACT,CACA,WAAmB,EAAM,CACvB,GAAI,GACJ,MAAQ,IAAQ,MAAiB,GAAsB,EAAK,gBAAkB,KAAvD,OAAuE,EAAoB,cAAgB,MACpI,CACA,YAA4B,EAAM,CAChC,GAAI,GACJ,MAAQ,GAAQ,IAAO,CAAI,EAAI,EAAK,cAAgB,EAAK,WAAa,OAAO,WAAa,KAAO,OAAS,EAAK,eACjH,CACA,YAAgB,EAAO,CACrB,MAAO,aAAiB,OAAQ,YAAiB,GAAU,CAAK,EAAE,IACpE,CACA,YAAmB,EAAO,CACxB,MAAO,aAAiB,UAAW,YAAiB,GAAU,CAAK,EAAE,OACvE,CACA,YAAuB,EAAO,CAC5B,MAAO,aAAiB,cAAe,YAAiB,GAAU,CAAK,EAAE,WAC3E,CACA,YAAsB,EAAO,CAC3B,MAAI,OAAO,YAAe,IACjB,GAEF,YAAiB,aAAc,YAAiB,GAAU,CAAK,EAAE,UAC1E,CACA,YAA2B,EAAS,CAClC,GAAM,CACJ,WACA,YACA,YACA,WACE,EAAiB,CAAO,EAC5B,MAAO,kCAAkC,KAAK,EAAW,EAAY,CAAS,GAAK,CAAC,CAAC,SAAU,UAAU,EAAE,SAAS,CAAO,CAC7H,CACA,YAAwB,EAAS,CAC/B,MAAO,CAAC,QAAS,KAAM,IAAI,EAAE,SAAS,GAAY,CAAO,CAAC,CAC5D,CACA,YAA2B,EAAS,CAClC,GAAM,GAAS,GAAS,EAClB,EAAM,EAAiB,CAAO,EACpC,MAAO,GAAI,YAAc,QAAU,EAAI,cAAgB,QAAW,GAAI,cAAgB,EAAI,gBAAkB,SAAW,KAAU,CAAC,GAAW,GAAI,eAAiB,EAAI,iBAAmB,OAAS,KAAU,CAAC,GAAW,GAAI,OAAS,EAAI,SAAW,OAAS,KAAU,CAAC,YAAa,cAAe,QAAQ,EAAE,KAAK,AAAC,GAAW,GAAI,YAAc,IAAI,SAAS,CAAK,CAAC,GAAK,CAAC,QAAS,SAAU,SAAU,SAAS,EAAE,KAAK,AAAC,GAAW,GAAI,SAAW,IAAI,SAAS,CAAK,CAAC,CACvc,CACA,YAA4B,EAAS,CACnC,GAAI,GAAc,GAAc,CAAO,EACvC,KAAO,GAAc,CAAW,GAAK,CAAC,GAAsB,CAAW,GAAG,CACxE,GAAI,GAAkB,CAAW,EAC/B,MAAO,GAEP,EAAc,GAAc,CAAW,CAE3C,CACA,MAAO,KACT,CACA,aAAoB,CAClB,MAAI,OAAO,KAAQ,KAAe,CAAC,IAAI,SAC9B,GACF,IAAI,SAAS,0BAA2B,MAAM,CACvD,CACA,YAA+B,EAAM,CACnC,MAAO,CAAC,OAAQ,OAAQ,WAAW,EAAE,SAAS,GAAY,CAAI,CAAC,CACjE,CACA,WAA0B,EAAS,CACjC,MAAO,GAAU,CAAO,EAAE,iBAAiB,CAAO,CACpD,CACA,YAAuB,EAAS,CAC9B,MAAI,IAAU,CAAO,EACZ,CACL,WAAY,EAAQ,WACpB,UAAW,EAAQ,SACrB,EAEK,CACL,WAAY,EAAQ,YACpB,UAAW,EAAQ,WACrB,CACF,CACA,YAAuB,EAAM,CAC3B,GAAI,GAAY,CAAI,IAAM,OACxB,MAAO,GAET,GAAM,GAEJ,EAAK,cACL,EAAK,YACL,GAAa,CAAI,GAAK,EAAK,MAC3B,GAAmB,CAAI,EAEzB,MAAO,IAAa,CAAM,EAAI,EAAO,KAAO,CAC9C,CACA,YAAoC,EAAM,CACxC,GAAM,GAAa,GAAc,CAAI,EACrC,MAAI,IAAsB,CAAU,EAC3B,EAAK,cAAgB,EAAK,cAAc,KAAO,EAAK,KAEzD,GAAc,CAAU,GAAK,GAAkB,CAAU,EACpD,EAEF,GAA2B,CAAU,CAC9C,CACA,YAA8B,EAAM,EAAM,EAAiB,CACzD,GAAI,GACJ,AAAI,IAAS,QACX,GAAO,CAAC,GAEN,IAAoB,QACtB,GAAkB,IAEpB,GAAM,GAAqB,GAA2B,CAAI,EACpD,EAAS,IAAyB,IAAuB,EAAK,gBAAkB,KAAO,OAAS,EAAqB,MACrH,EAAM,EAAU,CAAkB,EACxC,MAAI,GACK,EAAK,OAAO,EAAK,EAAI,gBAAkB,CAAC,EAAG,GAAkB,CAAkB,EAAI,EAAqB,CAAC,EAAG,EAAI,cAAgB,EAAkB,GAAqB,EAAI,YAAY,EAAI,CAAC,CAAC,EAE/L,EAAK,OAAO,EAAoB,GAAqB,EAAoB,CAAC,EAAG,CAAe,CAAC,CACtG,CAGA,YAA0B,EAAS,CACjC,GAAM,GAAM,EAAiB,CAAO,EAChC,EAAQ,WAAW,EAAI,KAAK,GAAK,EACjC,EAAS,WAAW,EAAI,MAAM,GAAK,EACjC,EAAY,GAAc,CAAO,EACjC,EAAc,EAAY,EAAQ,YAAc,EAChD,EAAe,EAAY,EAAQ,aAAe,EAClD,EAAiB,GAAM,CAAK,IAAM,GAAe,GAAM,CAAM,IAAM,EACzE,MAAI,IACF,GAAQ,EACR,EAAS,GAEJ,CACL,QACA,SACA,EAAG,CACL,CACF,CACA,YAAuB,EAAS,CAC9B,MAAO,AAAC,IAAU,CAAO,EAA6B,EAAzB,EAAQ,cACvC,CACA,YAAkB,EAAS,CACzB,GAAM,GAAa,GAAc,CAAO,EACxC,GAAI,CAAC,GAAc,CAAU,EAC3B,MAAO,IAAa,CAAC,EAEvB,GAAM,GAAO,EAAW,sBAAsB,EACxC,CACJ,QACA,SACA,KACE,GAAiB,CAAU,EAC3B,EAAK,GAAI,GAAM,EAAK,KAAK,EAAI,EAAK,OAAS,EAC3C,EAAK,GAAI,GAAM,EAAK,MAAM,EAAI,EAAK,QAAU,EACjD,MAAI,EAAC,GAAK,CAAC,OAAO,SAAS,CAAC,IAC1B,GAAI,GAEF,EAAC,GAAK,CAAC,OAAO,SAAS,CAAC,IAC1B,GAAI,GAEC,CACL,IACA,GACF,CACF,CACA,GAAI,IAA4B,GAAa,CAAC,EAC9C,YAA0B,EAAS,CACjC,GAAM,GAAM,EAAU,CAAO,EAC7B,MAAI,CAAC,GAAS,GAAK,CAAC,EAAI,eACf,GAEF,CACL,EAAG,EAAI,eAAe,WACtB,EAAG,EAAI,eAAe,SACxB,CACF,CACA,YAAgC,EAAS,EAAS,EAAsB,CAItE,MAHI,KAAY,QACd,GAAU,IAER,CAAC,GAAwB,GAAW,IAAyB,EAAU,CAAO,EACzE,GAEF,CACT,CACA,YAA+B,EAAS,EAAc,EAAiB,EAAc,CACnF,AAAI,IAAiB,QACnB,GAAe,IAEb,IAAoB,QACtB,GAAkB,IAEpB,GAAM,GAAa,EAAQ,sBAAsB,EAC3C,EAAa,GAAc,CAAO,EACpC,EAAQ,GAAa,CAAC,EAC1B,AAAI,GACF,CAAI,EACE,GAAU,CAAY,GACxB,GAAQ,GAAS,CAAY,GAG/B,EAAQ,GAAS,CAAO,GAG5B,GAAM,GAAgB,GAAuB,EAAY,EAAiB,CAAY,EAAI,GAAiB,CAAU,EAAI,GAAa,CAAC,EACnI,EAAK,GAAW,KAAO,EAAc,GAAK,EAAM,EAChD,EAAK,GAAW,IAAM,EAAc,GAAK,EAAM,EAC/C,EAAQ,EAAW,MAAQ,EAAM,EACjC,EAAS,EAAW,OAAS,EAAM,EACvC,GAAI,EAAY,CACd,GAAM,GAAM,EAAU,CAAU,EAC1B,EAAY,GAAgB,GAAU,CAAY,EAAI,EAAU,CAAY,EAAI,EAClF,EAAgB,EAAI,aACxB,KAAO,GAAiB,GAAgB,IAAc,GAAK,CACzD,GAAM,GAAc,GAAS,CAAa,EACpC,EAAa,EAAc,sBAAsB,EACjD,EAAM,EAAiB,CAAa,EACpC,EAAO,EAAW,KAAQ,GAAc,WAAa,WAAW,EAAI,WAAW,GAAK,EAAY,EAChG,EAAM,EAAW,IAAO,GAAc,UAAY,WAAW,EAAI,UAAU,GAAK,EAAY,EAClG,GAAK,EAAY,EACjB,GAAK,EAAY,EACjB,GAAS,EAAY,EACrB,GAAU,EAAY,EACtB,GAAK,EACL,GAAK,EACL,EAAgB,EAAU,CAAa,EAAE,YAC3C,CACF,CACA,MAAO,IAAiB,CACtB,QACA,SACA,IACA,GACF,CAAC,CACH,CACA,YAA+D,EAAM,CACnE,GAAI,CACF,OACA,eACA,YACE,EACE,EAA0B,GAAc,CAAY,EACpD,EAAkB,GAAmB,CAAY,EACvD,GAAI,IAAiB,EACnB,MAAO,GAET,GAAI,GAAS,CACX,WAAY,EACZ,UAAW,CACb,EACI,EAAQ,GAAa,CAAC,EACpB,EAAU,GAAa,CAAC,EAC9B,GAAI,IAA2B,CAAC,GAA2B,IAAa,UAClE,KAAY,CAAY,IAAM,QAAU,GAAkB,CAAe,IAC3E,GAAS,GAAc,CAAY,GAEjC,GAAc,CAAY,GAAG,CAC/B,GAAM,GAAa,GAAsB,CAAY,EACrD,EAAQ,GAAS,CAAY,EAC7B,EAAQ,EAAI,EAAW,EAAI,EAAa,WACxC,EAAQ,EAAI,EAAW,EAAI,EAAa,SAC1C,CAEF,MAAO,CACL,MAAO,EAAK,MAAQ,EAAM,EAC1B,OAAQ,EAAK,OAAS,EAAM,EAC5B,EAAG,EAAK,EAAI,EAAM,EAAI,EAAO,WAAa,EAAM,EAAI,EAAQ,EAC5D,EAAG,EAAK,EAAI,EAAM,EAAI,EAAO,UAAY,EAAM,EAAI,EAAQ,CAC7D,CACF,CACA,YAAwB,EAAS,CAC/B,MAAO,OAAM,KAAK,EAAQ,eAAe,CAAC,CAC5C,CACA,YAA6B,EAAS,CACpC,MAAO,IAAsB,GAAmB,CAAO,CAAC,EAAE,KAAO,GAAc,CAAO,EAAE,UAC1F,CACA,YAAyB,EAAS,CAChC,GAAM,GAAO,GAAmB,CAAO,EACjC,EAAS,GAAc,CAAO,EAC9B,EAAO,EAAQ,cAAc,KAC7B,EAAQ,GAAI,EAAK,YAAa,EAAK,YAAa,EAAK,YAAa,EAAK,WAAW,EAClF,EAAS,GAAI,EAAK,aAAc,EAAK,aAAc,EAAK,aAAc,EAAK,YAAY,EACzF,EAAI,CAAC,EAAO,WAAa,GAAoB,CAAO,EAClD,EAAI,CAAC,EAAO,UAClB,MAAI,GAAiB,CAAI,EAAE,YAAc,OACvC,IAAK,GAAI,EAAK,YAAa,EAAK,WAAW,EAAI,GAE1C,CACL,QACA,SACA,IACA,GACF,CACF,CACA,YAAyB,EAAS,EAAU,CAC1C,GAAM,GAAM,EAAU,CAAO,EACvB,EAAO,GAAmB,CAAO,EACjC,EAAiB,EAAI,eACvB,EAAQ,EAAK,YACb,EAAS,EAAK,aACd,EAAI,EACJ,EAAI,EACR,GAAI,EAAgB,CAClB,EAAQ,EAAe,MACvB,EAAS,EAAe,OACxB,GAAM,GAAsB,GAAS,EACrC,AAAI,EAAC,GAAuB,GAAuB,IAAa,UAC9D,GAAI,EAAe,WACnB,EAAI,EAAe,UAEvB,CACA,MAAO,CACL,QACA,SACA,IACA,GACF,CACF,CACA,YAAoC,EAAS,EAAU,CACrD,GAAM,GAAa,GAAsB,EAAS,GAAM,IAAa,OAAO,EACtE,EAAM,EAAW,IAAM,EAAQ,UAC/B,EAAO,EAAW,KAAO,EAAQ,WACjC,EAAQ,GAAc,CAAO,EAAI,GAAS,CAAO,EAAI,GAAa,CAAC,EACnE,EAAQ,EAAQ,YAAc,EAAM,EACpC,EAAS,EAAQ,aAAe,EAAM,EACtC,EAAI,EAAO,EAAM,EACjB,EAAI,EAAM,EAAM,EACtB,MAAO,CACL,QACA,SACA,IACA,GACF,CACF,CACA,YAA2C,EAAS,EAAkB,EAAU,CAC9E,GAAI,GACJ,GAAI,IAAqB,WACvB,EAAO,GAAgB,EAAS,CAAQ,UAC/B,IAAqB,WAC9B,EAAO,GAAgB,GAAmB,CAAO,CAAC,UACzC,GAAU,CAAgB,EACnC,EAAO,GAA2B,EAAkB,CAAQ,MACvD,CACL,GAAM,GAAgB,GAAiB,CAAO,EAC9C,EAAO,CACL,GAAG,EACH,EAAG,EAAiB,EAAI,EAAc,EACtC,EAAG,EAAiB,EAAI,EAAc,CACxC,CACF,CACA,MAAO,IAAiB,CAAI,CAC9B,CACA,YAAkC,EAAS,EAAU,CACnD,GAAM,GAAa,GAAc,CAAO,EACxC,MAAI,KAAe,GAAY,CAAC,GAAU,CAAU,GAAK,GAAsB,CAAU,EAChF,GAEF,EAAiB,CAAU,EAAE,WAAa,SAAW,GAAyB,EAAY,CAAQ,CAC3G,CACA,YAAqC,EAAS,EAAO,CACnD,GAAM,GAAe,EAAM,IAAI,CAAO,EACtC,GAAI,EACF,MAAO,GAET,GAAI,GAAS,GAAqB,EAAS,CAAC,EAAG,EAAK,EAAE,OAAO,AAAC,GAAO,GAAU,CAAE,GAAK,GAAY,CAAE,IAAM,MAAM,EAC5G,EAAsC,KACpC,EAAiB,EAAiB,CAAO,EAAE,WAAa,QAC1D,EAAc,EAAiB,GAAc,CAAO,EAAI,EAC5D,KAAO,GAAU,CAAW,GAAK,CAAC,GAAsB,CAAW,GAAG,CACpE,GAAM,GAAgB,EAAiB,CAAW,EAC5C,EAA0B,GAAkB,CAAW,EAC7D,AAAI,CAAC,GAA2B,EAAc,WAAa,SACzD,GAAsC,MAGxC,AAD8B,GAAiB,CAAC,GAA2B,CAAC,EAAsC,CAAC,GAA2B,EAAc,WAAa,UAAY,CAAC,CAAC,GAAuC,CAAC,WAAY,OAAO,EAAE,SAAS,EAAoC,QAAQ,GAAK,GAAkB,CAAW,GAAK,CAAC,GAA2B,GAAyB,EAAS,CAAW,GAEvZ,EAAS,EAAO,OAAO,AAAC,GAAa,IAAa,CAAW,EAE7D,EAAsC,EAExC,EAAc,GAAc,CAAW,CACzC,CACA,SAAM,IAAI,EAAS,CAAM,EAClB,CACT,CACA,YAAyB,EAAM,CAC7B,GAAI,CACF,UACA,WACA,eACA,YACE,EAEE,EAAoB,CAAC,GADM,IAAa,oBAAsB,GAA4B,EAAS,KAAK,EAAE,EAAI,CAAC,EAAE,OAAO,CAAQ,EAC9E,CAAY,EAC9D,EAAwB,EAAkB,GAC1C,EAAe,EAAkB,OAAO,CAAC,EAAS,IAAqB,CAC3E,GAAM,GAAO,GAAkC,EAAS,EAAkB,CAAQ,EAClF,SAAQ,IAAM,GAAI,EAAK,IAAK,EAAQ,GAAG,EACvC,EAAQ,MAAQ,GAAI,EAAK,MAAO,EAAQ,KAAK,EAC7C,EAAQ,OAAS,GAAI,EAAK,OAAQ,EAAQ,MAAM,EAChD,EAAQ,KAAO,GAAI,EAAK,KAAM,EAAQ,IAAI,EACnC,CACT,EAAG,GAAkC,EAAS,EAAuB,CAAQ,CAAC,EAC9E,MAAO,CACL,MAAO,EAAa,MAAQ,EAAa,KACzC,OAAQ,EAAa,OAAS,EAAa,IAC3C,EAAG,EAAa,KAChB,EAAG,EAAa,GAClB,CACF,CACA,YAAuB,EAAS,CAC9B,MAAO,IAAiB,CAAO,CACjC,CACA,YAAuC,EAAS,EAAc,EAAU,CACtE,GAAM,GAA0B,GAAc,CAAY,EACpD,EAAkB,GAAmB,CAAY,EACjD,EAAU,IAAa,QACvB,EAAO,GAAsB,EAAS,GAAM,EAAS,CAAY,EACnE,EAAS,CACX,WAAY,EACZ,UAAW,CACb,EACM,EAAU,GAAa,CAAC,EAC9B,GAAI,GAA2B,CAAC,GAA2B,CAAC,EAI1D,GAHI,IAAY,CAAY,IAAM,QAAU,GAAkB,CAAe,IAC3E,GAAS,GAAc,CAAY,GAEjC,EAAyB,CAC3B,GAAM,GAAa,GAAsB,EAAc,GAAM,EAAS,CAAY,EAClF,EAAQ,EAAI,EAAW,EAAI,EAAa,WACxC,EAAQ,EAAI,EAAW,EAAI,EAAa,SAC1C,KAAO,AAAI,IACT,GAAQ,EAAI,GAAoB,CAAe,GAGnD,MAAO,CACL,EAAG,EAAK,KAAO,EAAO,WAAa,EAAQ,EAC3C,EAAG,EAAK,IAAM,EAAO,UAAY,EAAQ,EACzC,MAAO,EAAK,MACZ,OAAQ,EAAK,MACf,CACF,CACA,YAA6B,EAAS,EAAU,CAC9C,MAAI,CAAC,GAAc,CAAO,GAAK,EAAiB,CAAO,EAAE,WAAa,QAC7D,KAEL,EACK,EAAS,CAAO,EAElB,EAAQ,YACjB,CACA,YAAyB,EAAS,EAAU,CAC1C,GAAM,GAAU,EAAU,CAAO,EACjC,GAAI,CAAC,GAAc,CAAO,EACxB,MAAO,GAET,GAAI,GAAe,GAAoB,EAAS,CAAQ,EACxD,KAAO,GAAgB,GAAe,CAAY,GAAK,EAAiB,CAAY,EAAE,WAAa,UACjG,EAAe,GAAoB,EAAc,CAAQ,EAE3D,MAAI,IAAiB,IAAY,CAAY,IAAM,QAAU,GAAY,CAAY,IAAM,QAAU,EAAiB,CAAY,EAAE,WAAa,UAAY,CAAC,GAAkB,CAAY,GACnL,EAEF,GAAgB,GAAmB,CAAO,GAAK,CACxD,CACA,GAAI,IAAkB,eAAe,EAAM,CACzC,GAAI,CACF,YACA,WACA,YACE,EACE,EAAoB,KAAK,iBAAmB,GAC5C,EAAkB,KAAK,cAC7B,MAAO,CACL,UAAW,GAA8B,EAAW,KAAM,GAAkB,CAAQ,EAAG,CAAQ,EAC/F,SAAU,CACR,EAAG,EACH,EAAG,EACH,GAAG,KAAM,GAAgB,CAAQ,CACnC,CACF,CACF,EACA,YAAe,EAAS,CACtB,MAAO,GAAiB,CAAO,EAAE,YAAc,KACjD,CACA,GAAI,IAAW,CACb,yDACA,sBACA,mBACA,mBACA,mBACA,kBACA,iBACA,YACA,aACA,QACF,EACA,YAAqB,EAAS,EAAQ,CACpC,GAAI,GAAK,KACL,EACE,EAAO,GAAmB,CAAO,EACvC,YAAmB,CACjB,aAAa,CAAS,EACtB,GAAM,EAAG,WAAW,EACpB,EAAK,IACP,CACA,WAAiB,EAAM,EAAW,CAChC,AAAI,IAAS,QACX,GAAO,IAEL,IAAc,QAChB,GAAY,GAEd,EAAQ,EACR,GAAM,CACJ,OACA,MACA,QACA,UACE,EAAQ,sBAAsB,EAIlC,GAHK,GACH,EAAO,EAEL,CAAC,GAAS,CAAC,EACb,OAEF,GAAM,GAAW,GAAM,CAAG,EACpB,EAAa,GAAM,EAAK,YAAe,GAAO,EAAM,EACpD,EAAc,GAAM,EAAK,aAAgB,GAAM,EAAO,EACtD,EAAY,GAAM,CAAI,EAEtB,EAAU,CACd,WAFiB,CAAC,EAAW,MAAQ,CAAC,EAAa,MAAQ,CAAC,EAAc,MAAQ,CAAC,EAAY,KAG/F,UAAW,GAAI,EAAG,GAAI,EAAG,CAAS,CAAC,GAAK,CAC1C,EACI,EAAgB,GACpB,WAAuB,EAAS,CAC9B,GAAM,GAAQ,EAAQ,GAAG,kBACzB,GAAI,IAAU,EAAW,CACvB,GAAI,CAAC,EACH,MAAO,GAAQ,EAEjB,AAAK,EAKH,EAAQ,GAAO,CAAK,EAJpB,EAAY,WAAW,IAAM,CAC3B,EAAQ,GAAO,IAAI,CACrB,EAAG,GAAG,CAIV,CACA,EAAgB,EAClB,CACA,GAAI,CACF,EAAK,GAAI,sBAAqB,EAAe,CAC3C,GAAG,EAEH,KAAM,EAAK,aACb,CAAC,CACH,MAAE,CACA,EAAK,GAAI,sBAAqB,EAAe,CAAO,CACtD,CACA,EAAG,QAAQ,CAAO,CACpB,CACA,SAAQ,EAAI,EACL,CACT,CACA,YAAoB,EAAW,EAAU,EAAQ,EAAS,CACxD,AAAI,IAAY,QACd,GAAU,CAAC,GAEb,GAAM,CACJ,iBAAiB,GACjB,iBAAiB,GACjB,gBAAgB,MAAO,iBAAmB,WAC1C,cAAc,MAAO,uBAAyB,WAC9C,iBAAiB,IACf,EACE,EAAc,GAAc,CAAS,EACrC,EAAY,GAAkB,EAAiB,CAAC,GAAG,EAAc,GAAqB,CAAW,EAAI,CAAC,EAAG,GAAG,GAAqB,CAAQ,CAAC,EAAI,CAAC,EACrJ,EAAU,QAAQ,AAAC,GAAa,CAC9B,GAAkB,EAAS,iBAAiB,SAAU,EAAQ,CAC5D,QAAS,EACX,CAAC,EACD,GAAkB,EAAS,iBAAiB,SAAU,CAAM,CAC9D,CAAC,EACD,GAAM,GAAY,GAAe,EAAc,GAAY,EAAa,CAAM,EAAI,KAC9E,EAAiB,GACjB,EAAiB,KACrB,AAAI,GACF,GAAiB,GAAI,gBAAe,AAAC,GAAS,CAC5C,GAAI,CAAC,GAAc,EACnB,AAAI,GAAc,EAAW,SAAW,GAAe,GACrD,GAAe,UAAU,CAAQ,EACjC,qBAAqB,CAAc,EACnC,EAAiB,sBAAsB,IAAM,CAC3C,GAAkB,EAAe,QAAQ,CAAQ,CACnD,CAAC,GAEH,EAAO,CACT,CAAC,EACG,GAAe,CAAC,GAClB,EAAe,QAAQ,CAAW,EAEpC,EAAe,QAAQ,CAAQ,GAEjC,GAAI,GACA,EAAc,EAAiB,GAAsB,CAAS,EAAI,KACtE,AAAI,GACF,EAAU,EAEZ,YAAqB,CACnB,GAAM,GAAc,GAAsB,CAAS,EACnD,AAAI,GAAgB,GAAY,IAAM,EAAY,GAAK,EAAY,IAAM,EAAY,GAAK,EAAY,QAAU,EAAY,OAAS,EAAY,SAAW,EAAY,SACtK,EAAO,EAET,EAAc,EACd,EAAU,sBAAsB,CAAS,CAC3C,CACA,SAAO,EACA,IAAM,CACX,EAAU,QAAQ,AAAC,GAAa,CAC9B,GAAkB,EAAS,oBAAoB,SAAU,CAAM,EAC/D,GAAkB,EAAS,oBAAoB,SAAU,CAAM,CACjE,CAAC,EACD,GAAa,EAAU,EACvB,GAAkB,EAAe,WAAW,EAC5C,EAAiB,KACb,GACF,qBAAqB,CAAO,CAEhC,CACF,CACA,GAAI,IAAmB,CAAC,EAAW,EAAU,IAAY,CACvD,GAAM,GAAwB,GAAI,KAC5B,EAAgB,CACpB,YACA,GAAG,CACL,EACM,EAAoB,CACxB,GAAG,EAAc,SACjB,GAAI,CACN,EACA,MAAO,IAAgB,EAAW,EAAU,CAC1C,GAAG,EACH,SAAU,CACZ,CAAC,CACH,EAGA,YAAqB,EAAQ,CAC3B,EAAO,MAAM,SAAU,AAAC,GAAO,CAC7B,GAAI,CAAC,EAAG,UACN,KAAM,kEACR,MAAO,GAAG,SACZ,CAAC,EACD,EAAO,eAAe,CAAC,EAAM,IAAO,CAClC,AAAI,GAAQ,EAAK,WAAa,CAAC,EAAG,WAChC,GAAG,UAAY,EAAK,UAExB,CAAC,EACD,EAAO,UAAU,SAAU,EAAO,gBAChC,CAAC,EAAI,CAAE,aAAY,YAAW,SAAS,CAAE,UAAS,SAAU,KAAgB,CAC1E,GAAI,CAAE,YAAW,cAAa,YAAa,GAAW,CAAS,EAC/D,EAAG,UAAY,EAAO,SAAS,CAAE,EAAG,EAAG,EAAG,CAAE,CAAC,EAC7C,GAAI,GAAY,EAAU,CAAU,EACpC,GAAI,CAAC,EACH,KAAM,6CACR,GAAI,GAAU,IAAM,CAClB,GAAI,GACJ,GAAiB,EAAW,EAAI,CAC9B,YACA,WAAY,CAAC,GAAK,EAAG,GAAM,CAAE,QAAS,CAAE,CAAC,EAAG,GAAO,CAAW,CAAC,CACjE,CAAC,EAAE,KAAK,CAAC,CAAE,IAAG,OAAQ,CACpB,GAAY,GAAU,EAAI,EAAG,CAAC,EAC1B,KAAK,UAAU,CAAE,IAAG,GAAE,CAAC,IAAM,GAC/B,GAAG,UAAU,EAAI,EACjB,EAAG,UAAU,EAAI,GAEnB,EAAgB,KAAK,UAAU,CAAE,IAAG,GAAE,CAAC,CACzC,CAAC,CACH,EACI,EAAU,GAAW,EAAW,EAAI,IAAM,EAAQ,CAAC,EACvD,EAAQ,IAAM,EAAQ,CAAC,CACzB,EAEA,CAAC,EAAI,CAAE,aAAY,YAAW,SAAS,CAAE,UAAS,SAAU,KAAgB,CAC1E,GAAI,CAAE,YAAW,cAAa,YAAa,GAAW,CAAS,EAC/D,AAAI,EAAG,WACL,IAAY,GAAU,EAAI,EAAG,UAAU,EAAG,EAAG,UAAU,CAAC,EAE5D,CACF,CAAC,CACH,CACA,YAAmB,EAAI,EAAG,EAAG,CAC3B,OAAO,OAAO,EAAG,MAAO,CACtB,KAAM,EAAI,KACV,IAAK,EAAI,KACT,SAAU,UACZ,CAAC,CACH,CACA,YAAoB,EAAW,CAE7B,GAAI,GAAY,AADA,CAAC,MAAO,YAAa,UAAW,QAAS,cAAe,YAAa,SAAU,eAAgB,aAAc,OAAQ,aAAc,UAAU,EACnI,KAAK,AAAC,GAAM,EAAU,SAAS,CAAC,CAAC,EACvD,EAAc,EAClB,GAAI,EAAU,SAAS,QAAQ,EAAG,CAChC,GAAI,GAAM,EAAU,UAAU,AAAC,GAAM,IAAM,QAAQ,EACnD,EAAc,EAAU,EAAM,KAAO,OAAS,OAAO,EAAU,EAAM,EAAE,EAAI,CAC7E,CACA,GAAI,GAAW,EAAU,SAAS,UAAU,EAC5C,MAAO,CAAE,YAAW,cAAa,UAAS,CAC5C,CAGA,GAAI,IAAiB,GCpuCrB,GAAM,IAAN,KAAe,CACX,YAAY,EAAK,EAAM,CACnB,KAAK,IAAM,EACX,KAAK,KAAO,CAChB,CACJ,EAEI,GAAgB,CAChB,WAAY,KACZ,WAAY,KACZ,KAAM,CAAC,EACP,OAAQ,CAAC,EAET,MAAO,GAEP,IAAI,EAAU,CACV,MAAO,MAAK,OAAO,KAAc,MACrC,EAEA,SAAS,EAAU,CACf,GAAI,GAAW,KAAK,OAAO,GAE3B,GAAI,IAAa,OACb,KACI,oDACA,EAGR,MAAO,EACX,EAEA,QAAQ,EAAK,EAAU,CACnB,AAAI,KAAK,IAAI,CAAG,EACZ,KAAK,OAAO,GAAO,EAEnB,KAAK,KAAK,EAAK,CAAQ,CAE/B,EAEA,KAAK,EAAK,EAAU,CAChB,KAAK,OAAO,GAAO,EAEnB,GAAI,GAAQ,KAAK,KAAK,QAAQ,CAAG,EAEjC,AAAI,EAAQ,IAAI,KAAK,KAAK,OAAO,EAAO,CAAC,EAEzC,KAAK,KAAK,QAAQ,CAAG,EAErB,KAAK,KAAK,CACd,EAEA,MAAO,CACH,OAAS,KAAO,MAAK,KAAK,OAAO,KAAK,KAAK,EACzC,MAAO,MAAK,OAAO,EAEzB,CACJ,EAEO,aAAuE,CAG1E,GAAI,GAAM,GAAI,KAAI,OAAO,SAAS,KAAM,SAAS,OAAO,EAExD,GAAW,EAAK,SAAS,gBAAgB,SAAS,CACtD,CAEO,YAAsE,EAAK,EAAK,CACnF,GAAI,GAAO,SAAS,gBAAgB,UAEpC,GAAc,QAAQ,EAAK,GAAI,IAAS,EAAK,CAAI,CAAC,CACtD,CAEO,YACH,EACA,EACF,CACE,GAAI,GAEJ,EAAiB,GAAM,EAAW,CAAE,EAEpC,OAAO,iBAAiB,WAAY,GAAK,CACrC,GAAI,GAAQ,EAAE,OAAS,CAAC,EAEpB,EAAS,EAAM,QAAU,CAAC,EAI9B,GAAI,OAAO,KAAK,CAAK,EAAE,SAAW,GAE9B,EAAE,EAAO,YAEb,GAAI,GAAc,IAAI,EAAO,WAAW,EAAG,CACvC,GAAI,GAAW,GAAc,SAAS,EAAO,WAAW,EAExD,EAAW,EAAS,KAAM,EAAS,IAAK,GAAc,WAAY,GAAc,UAAU,CAC9F,KACI,GAAS,EAAO,GAAG,CAE3B,CAAC,CACL,CAEO,YACH,EACA,EACF,CACE,GAAQ,EAAa,CAAI,CAC7B,CAEO,YAAiB,EAAK,EAAM,CAC/B,GAAU,YAAa,EAAK,CAAI,CACpC,CAEO,YAAoB,EAAK,EAAM,CAClC,GAAU,eAAgB,EAAK,CAAI,CACvC,CAEA,YAAmB,EAAQ,EAAK,EAAM,CAClC,GAAI,GAAM,EAAI,SAAS,EAAI,IAAM,KAAK,OAAO,EAE7C,IAAW,YACL,GAAc,KAAK,EAAK,GAAI,IAAS,EAAK,CAAI,CAAC,EAC/C,GAAc,QAAQ,EAAO,GAAc,YAAc,EAAM,GAAI,IAAS,EAAK,CAAI,CAAC,EAE5F,GAAI,GAAQ,QAAQ,OAAS,CAAC,EAE9B,AAAK,EAAM,QAAQ,GAAM,OAAS,CAAC,GAEnC,EAAM,OAAO,YAAc,EAC3B,EAAM,OAAO,IAAM,EAAI,SAAS,EAEhC,GAAI,CAEA,QAAQ,GAAQ,EAAO,KAAK,UAAU,SAAS,KAAK,EAAG,CAAG,EAE1D,GAAc,WAAa,EAC3B,GAAc,WAAa,CAC/B,OAAS,EAAP,CACE,AAAI,YAAiB,eAAgB,EAAM,OAAS,iBAChD,QAAQ,MACJ,iFACI,CACR,EAGJ,QAAQ,MAAM,CAAK,CACvB,CACJ,CClJO,YAA+B,EAAI,EAAU,CAChD,GAAI,GAAsB,GAAK,CAAE,EAAE,UAC/B,EAAsB,GAAM,EAAE,MAAQ,GAAO,EAAE,QAAY,EAAE,SAAa,EAAE,SAAa,EAAE,SAC3F,EAAqB,AAAC,GAAO,EAAE,QAAU,IAAQ,EAAE,QAAY,EAAE,SAAa,EAAE,SAAa,EAAE,SAEnG,EAAG,iBAAiB,QAAS,GAAK,CAE9B,GAAI,EAAoB,CAAC,EAAG,CACxB,EAAE,eAAe,EAEjB,EAAS,GAAgB,EAAa,CAAC,EAEvC,MACJ,CAGA,AAAI,EAAoB,CAAC,GAGzB,EAAE,eAAe,CACrB,CAAC,EAED,EAAG,iBAAiB,YAAa,GAAK,CAElC,AAAI,EAAoB,CAAC,GAEzB,GAAE,eAAe,EAEjB,EAAS,AAAC,GAAiB,CACvB,GAAI,GAAU,GAAK,CACf,EAAE,eAAe,EAEjB,EAAa,EAEb,EAAG,oBAAoB,UAAW,CAAO,CAC7C,EAEA,EAAG,iBAAiB,UAAW,CAAO,CAC1C,CAAC,EACL,CAAC,EAED,EAAG,iBAAiB,UAAW,GAAK,CAEhC,AAAI,EAAmB,CAAC,GAExB,GAAE,eAAe,EAEjB,EAAS,GAAgB,EAAa,CAAC,EAC3C,CAAC,CACL,CAEO,YAAkC,EAAI,EAAK,GAAI,EAAU,CAC5D,EAAG,iBAAiB,aAAc,GAAK,CACnC,GAAI,GAAU,WAAW,IAAM,CAC3B,EAAS,CAAC,CACd,EAAG,CAAE,EAED,EAAU,IAAM,CAChB,aAAa,CAAO,EACpB,EAAG,oBAAoB,aAAc,CAAO,CAChD,EAEA,EAAG,iBAAiB,aAAc,CAAO,CAC7C,CAAC,CACL,CAEO,YAAoC,EAAQ,CAC/C,MAAO,IAA0B,EAAO,aAAa,MAAM,CAAC,CAChE,CAEO,YAAmC,EAAW,CACjD,MAAO,KAAc,MAAQ,GAAI,KAAI,EAAW,SAAS,OAAO,CACpE,CAEO,YAAmC,EAAW,CACjD,MAAO,GAAU,SAAW,EAAU,OAAS,EAAU,IAC7D,CC1EO,YAAmB,EAAa,EAAU,CAC7C,GAAI,GAAM,GAA0B,CAAW,EAE/C,GAAa,EAAK,CAAC,EAAM,IAAqB,CAC1C,EAAS,EAAM,CAAgB,CACnC,CAAC,CACL,CAEO,YAAsB,EAAK,EAAU,CACxC,GAAI,GAAU,CACV,QAAS,CACL,sBAAuB,EAC3B,CACJ,EAEA,EAAQ,mBAAoB,CACxB,IAAK,EACL,SACJ,CAAC,EAED,GAAI,GAEJ,MAAM,EAAK,CAAO,EAAE,KAAK,GAAY,CACjC,GAAI,GAAc,GAA0B,CAAG,EAC/C,SAAmB,GAA0B,EAAS,GAAG,EAGpD,EAAY,SAAW,EAAY,SAAa,EAAiB,SAAW,EAAiB,QAI9F,GAAiB,KAAO,EAAY,MAGjC,EAAS,KAAK,CACzB,CAAC,EAAE,KAAK,GAAQ,CACZ,EAAS,EAAM,CAAgB,CACnC,CAAC,CACL,CCrCA,GAAI,GAAa,CAAC,EAEX,YAAsB,EAAa,EAAU,CAChD,GAAI,GAAM,GAA0B,CAAW,EAE/C,AAAI,EAAW,IAEf,GAAW,GAAO,CAAE,SAAU,GAAO,KAAM,KAAM,aAAc,IAAM,CAAC,CAAE,EAExE,GAAa,EAAK,CAAC,EAAM,IAAc,CACnC,EAAS,EAAM,CAAS,CAC5B,CAAC,EACL,CAEO,YAAqD,EAAM,EAAa,EAAkB,CAC7F,GAAI,GAAQ,EAAW,GAA0B,CAAW,GAC5D,EAAM,KAAO,EACb,EAAM,SAAW,GACjB,EAAM,iBAAmB,EACzB,EAAM,aAAa,CACvB,CAEO,YAA2B,EAAa,EAAS,EAAoB,CACxE,GAAI,GAAM,GAA0B,CAAW,EAE/C,GAAI,CAAE,EAAW,GAAM,MAAO,GAAmB,EAEjD,GAAI,EAAW,GAAK,SAAU,CAC1B,GAAI,GAAO,EAAW,GAAK,KACvB,EAAmB,EAAW,GAAK,iBAEvC,aAAO,GAAW,GAEX,EAAQ,EAAM,CAAgB,CACzC,KACI,GAAW,GAAK,aAAe,IAAM,CACjC,GAAI,GAAO,EAAW,GAAK,KACvB,EAAmB,EAAW,GAAK,iBAEvC,MAAO,GAAW,GAElB,EAAQ,EAAM,CAAgB,CAClC,CAER,CC9CO,YAAkC,EAAa,CAGlD,EAAO,UAAU,IAAM,CACnB,EAAY,iBAAiB,0BAA0B,EAAE,QAAQ,GAAK,EAAE,YAAY,OAAO,CAAC,CAChG,CAAC,CACL,CAEO,YAA+C,EAAM,CAGxD,EAAO,UAAU,IAAM,CACnB,EAAK,iBAAiB,wBAAwB,EAAE,QAAQ,GAAK,EAAE,OAAO,CAAC,CAC3E,CAAC,CACL,CAEO,YAAkC,EAAa,CAGlD,EAAO,KAAK,EAAa,CAAC,EAAI,IAAS,CACnC,AAAI,CAAE,EAAG,aAET,GAAG,mBAAmB,EAEtB,EAAK,EACT,CAAC,CACL,CAEO,YAA0B,EAAI,CACjC,MAAO,GAAG,aAAa,sBAAsB,CACjD,CC/BO,aAA4D,CAC/D,SAAS,KAAK,aAAa,gBAAiB,SAAS,KAAK,UAAU,EACpE,SAAS,KAAK,aAAa,gBAAiB,SAAS,KAAK,SAAS,EAEnE,SAAS,iBAAiB,CAAC,wBAAyB,iBAAiB,CAAC,EAAE,QAAQ,GAAM,CAClF,EAAG,aAAa,gBAAiB,EAAG,UAAU,EAC9C,EAAG,aAAa,gBAAiB,EAAG,SAAS,CACjD,CAAC,CACL,CAEO,aAA8C,CACjD,GAAI,GAAS,GAAM,CACf,AAAM,EAAG,aAAa,eAAe,EAGjC,GAAG,SAAS,CACR,IAAK,OAAO,EAAG,aAAa,eAAe,CAAC,EAC5C,KAAM,OAAO,EAAG,aAAa,eAAe,CAAC,EAC7C,SAAU,SACd,CAAC,EACD,EAAG,gBAAgB,eAAe,EAClC,EAAG,gBAAgB,eAAe,GARlC,OAAO,SAAS,CAAE,IAAK,EAAG,KAAM,EAAG,SAAU,SAAU,CAAC,CAUhE,EAEA,eAAe,IAAM,CACjB,eAAe,IAAM,CACjB,EAAO,SAAS,IAAI,EAEpB,SAAS,iBAAiB,CAAC,wBAAyB,iBAAiB,CAAC,EAAE,QAAQ,CAAM,CAC1F,CAAC,CACL,CAAC,CACL,CC/BA,GAAI,IAAM,CAAC,EAEJ,YAAyC,EAAU,CACtD,GAAM,CAAC,EAEP,SAAS,iBAAiB,aAAa,EAAE,QAAQ,GAAK,CAClD,GAAI,EAAE,aAAa,WAAW,GAAK,EAEnC,EAAS,CAAC,EAEV,EAAO,UAAU,IAAM,CACnB,EAAE,OAAO,CACb,CAAC,CACL,CAAC,CACL,CAEO,YAAmC,EAAU,CAChD,GAAI,GAAe,CAAC,EAEpB,SAAS,iBAAiB,aAAa,EAAE,QAAQ,GAAK,CAClD,GAAI,GAAM,GAAI,EAAE,aAAa,WAAW,GAGxC,AAAI,CAAE,GAEN,GAAa,KAAK,EAAE,aAAa,WAAW,CAAC,EAE7C,EAAI,gBAAkB,GAEtB,EAAS,EAAK,CAAC,EAEf,EAAO,UAAU,IAAM,CACnB,EAAE,YAAY,CAAG,CACrB,CAAC,EACL,CAAC,EAED,OAAO,QAAQ,EAAG,EAAE,QAAQ,CAAC,CAAC,EAAK,KAAQ,CACvC,AAAI,EAAa,SAAS,CAAG,GAG7B,EAAO,YAAY,CAAE,CACzB,CAAC,EAGD,GAAM,CAAC,CACX,CAEO,YAA4B,EAAI,CACnC,MAAO,GAAG,aAAa,WAAW,CACtC,CCnDA,OAAsB,SAGtB,WAAU,UAAU,CAChB,QAAS,GACT,aAAc,IACd,YAAa,GACb,OAAQ,MACZ,CAAC,EAED,GAAa,EAEb,GAAI,IAAa,GAEV,aAAmC,CACtC,GAAa,GAGb,WAAW,IAAM,CACb,AAAI,CAAE,IAEN,WAAU,MAAM,CACpB,EAAG,GAAG,CACV,CAEO,aAAoC,CACvC,GAAa,GAEb,WAAU,KAAK,CACnB,CAEO,aAA8C,CACjD,WAAU,OAAO,CACrB,CAEA,aAAwB,CACpB,GAAI,GAAQ,SAAS,cAAc,OAAO,EAE1C,EAAM,UAAY;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,MA4ElB,GAAI,GAAQ,GAAS,EAErB,AAAI,GAAO,GAAM,MAAQ,GAEzB,SAAS,KAAK,YAAY,CAAK,CACnC,CCtHO,YAAiC,EAAa,CACjD,AAAI,CAAC,GAAmB,GAExB,EAAY,iBAAiB,eAAe,EAAE,QAAQ,GAAM,CACxD,EAAG,aAAa,6BAA8B,EAAE,EAEhD,GAAI,GAAa,EAAG,cAAc,EAGlC,EAAG,kBAAoB,EAAW,IAAI,GAAc,EAChD,UAAW,EAAU,OAAO,aAAa,EACzC,QAAS,CACL,SAAU,EAAU,OAAO,UAAU,EAAE,SACvC,OAAQ,EAAU,OAAO,UAAU,EAAE,OACrC,KAAM,EAAU,OAAO,UAAU,EAAE,KACnC,WAAY,EAAU,OAAO,UAAU,EAAE,UAC7C,EACA,YAAa,EAAU,YACvB,UAAW,EAAU,SACzB,EAAE,EAEF,EAAW,QAAQ,GAAK,EAAE,MAAM,CAAC,CACrC,CAAC,CACL,CAEO,YAAiC,EAAa,CACjD,AAAI,CAAC,GAAmB,GAExB,EAAY,iBAAiB,8BAA8B,EAAE,QAAQ,GAAM,CACvE,EAAG,gBAAgB,4BAA4B,EAG/C,eAAe,IAAM,CACjB,AAAI,CAAE,EAAG,aAGT,GAAG,YAAY,EAGf,EAAG,cAAc,EAAE,QAAQ,GAAK,EAAE,OAAO,CAAC,EAGtC,EAAG,mBACH,GAAG,kBAAkB,QAAQ,CAAC,CAAC,YAAW,UAAS,cAAa,MAAK,eAAe,CAChF,GAAI,GAAY,EAAG,QAAQ,EAAW,CAAO,EAE7C,EAAU,YAAc,CAC5B,CAAC,EAED,MAAO,GAAG,mBAElB,CAAC,CACL,CAAC,CACL,CAEA,aAA8B,CAC1B,MAAO,OAAO,UAAS,cAAc,KAAK,EAAE,aAAgB,UAChE,CC1DA,GAAI,IAAyB,CAAC,EAE1B,GAAuC,CACvC,YACA,aACJ,EAEO,YAAoC,EAAM,EAAS,CACtD,GAAI,GAAe,GAAI,WAAU,EAAG,gBAAgB,EAAM,WAAW,EACjE,EAAU,SAAS,UAAU,EAAY,IAAI,EAC7C,EAAU,SAAS,UAAU,EAAY,IAAI,EAEjD,GAAyB,GAAuB,OAAO,MAAM,KAAK,SAAS,KAAK,iBAAiB,QAAQ,CAAC,EAAE,IAAI,GACrG,GAAW,GAAiB,EAAE,UAAW,EAAoC,CAAC,CACxF,CAAC,EAEF,GAAI,GAA+B,IAAM,CAAC,EAE1C,GAAa,CAAO,EAAE,QAAQ,IAAM,CAChC,EAA6B,CACjC,CAAC,EAED,GAA2B,EAAS,EAAsB,EAE1D,GAAI,GAAU,SAAS,KAEvB,SAAS,KAAK,YAAY,CAAO,EAEjC,OAAO,YAAY,CAAO,EAE1B,EAAQ,GAAK,EAA+B,CAAC,CACjD,CAEA,YAAoC,EAAS,EAAwB,CACjE,EAAQ,iBAAiB,QAAQ,EAAE,QAAQ,GAAK,CAE5C,GAAI,EAAE,aAAa,oBAAoB,EAAG,CAKtC,GAAI,GAAO,GACP,GAAiB,EAAE,UAAW,EAAoC,CACtE,EAEA,GAAI,EAAuB,SAAS,CAAI,EAAG,MAC/C,CAEA,EAAE,YAAY,GAAe,CAAC,CAAC,CACnC,CAAC,CACL,CAEA,YAAsB,EAAS,CAC3B,GAAI,GAAW,MAAM,KAAK,SAAS,KAAK,QAAQ,EAC5C,EAAyB,EAAS,IAAI,GAAK,EAAE,SAAS,EAGtD,EAAmB,SAAS,uBAAuB,EAEnD,EAAsB,CAAC,EAEvB,EAAwB,CAAC,EAE7B,OAAS,KAAS,OAAM,KAAK,EAAQ,QAAQ,EACzC,GAAI,GAAQ,CAAK,EAAG,CAChB,GAAM,EAAuB,SAAS,EAAM,SAAS,EAwBjD,EAAiB,YAAY,CAAK,UAvB9B,GAAU,CAAK,GACX,GAAwC,EAAO,CAAQ,GACvD,WAAW,IAAM,OAAO,SAAS,OAAO,CAAC,EAI7C,GAAS,CAAK,EACd,GAAI,CACA,EAAsB,KAClB,GACI,GAAe,CAAK,CACxB,CACJ,CACJ,MAAE,CAKF,KAEA,UAAS,KAAK,YAAY,CAAK,EAMvC,EAAoB,KAAK,CAAK,CAClC,CAgBJ,OAAS,KAAS,OAAM,KAAK,SAAS,KAAK,QAAQ,EAC/C,AAAM,GAAQ,CAAK,GAAG,EAAM,OAAO,EAIvC,OAAS,KAAS,OAAM,KAAK,EAAQ,QAAQ,EACzC,AAAI,EAAM,QAAQ,YAAY,IAAM,YAEpC,SAAS,KAAK,YAAY,CAAK,EAGnC,MAAO,SAAQ,IAAI,CAAqB,CAC5C,CAEA,kBAAsD,EAAQ,CAC1D,MAAO,IAAI,SAAQ,CAAC,EAAS,IAAW,CAGpC,AAAI,EAAO,IACP,GAAO,OAAS,IAAM,EAAQ,EAC9B,EAAO,QAAU,IAAM,EAAO,GAE9B,EAAQ,EAGZ,SAAS,KAAK,YAAY,CAAM,CACpC,CAAC,CACL,CAEA,YAAwB,EAAI,CACxB,GAAI,GAAS,SAAS,cAAc,QAAQ,EAE5C,EAAO,YAAc,EAAG,YACxB,EAAO,MAAQ,EAAG,MAElB,OAAS,KAAQ,GAAG,WAChB,EAAO,aAAa,EAAK,KAAM,EAAK,KAAK,EAG7C,MAAO,EACX,CAEA,YAAmB,EAAI,CACnB,MAAO,GAAG,aAAa,qBAAqB,CAChD,CAEA,YAAiD,EAAI,EAAqB,CACtE,GAAI,CAAC,EAAK,GAAe,GAAyB,CAAE,EAEpD,MAAO,GAAoB,KAAK,GAAS,CACrC,GAAI,CAAE,GAAU,CAAK,EAAG,MAAO,GAE/B,GAAI,CAAC,EAAY,GAAsB,GAAyB,CAAK,EAGrE,GAAI,IAAe,GAAO,IAAgB,EAAoB,MAAO,EACzE,CAAC,CACL,CAEA,YAAkC,EAAI,CAGlC,MAAO,AAFG,IAAS,CAAE,EAAI,EAAG,IAAM,EAAG,MAE1B,MAAM,GAAG,CACxB,CAEA,YAAiB,EAAI,CACjB,MAAQ,GAAG,QAAQ,YAAY,IAAM,QAAU,EAAG,aAAa,KAAK,EAAE,YAAY,IAAM,cACjF,EAAG,QAAQ,YAAY,IAAM,SAC7B,EAAG,QAAQ,YAAY,IAAM,QACxC,CAEA,YAAkB,EAAM,CACpB,MAAO,GAAG,QAAQ,YAAY,IAAM,QACxC,CAEA,YAAoB,EAAK,CACrB,MAAO,GAAI,MAAM,EAAE,EAAE,OAAO,CAAC,EAAG,IAC5B,GAAM,IAAK,GAAK,EAAK,EAAE,WAAW,CAAC,EAE5B,EAAI,GACZ,CAAC,CACR,CAEA,YAA0B,EAAS,EAAoB,CACnD,GAAI,GAAS,EAEb,SAAmB,QAAQ,GAAQ,CAG/B,GAAM,GAAQ,GAAI,QAAO,GAAG,aAAgB,YAAgB,GAAG,EAE/D,EAAS,EAAO,QAAQ,EAAO,EAAE,CACrC,CAAC,EAGD,EAAS,EAAO,WAAW,IAAK,EAAE,EAE3B,EAAO,KAAK,CACvB,CCpMA,GAAI,IAAgB,GAChB,GAAkB,GAClB,GAAgB,GAChB,GAAY,GAED,YAAU,EAAQ,CAE7B,EAAO,SAAW,AAAC,GAAQ,CACvB,GAAI,GAAc,GAA0B,CAAG,EAM/C,AAJgB,GAAqC,kBAAmB,CACpE,IAAK,EAAa,QAAS,GAAO,OAAQ,EAC7C,CAAC,GAIF,EAAW,CAAW,CAC1B,EAEA,EAAO,SAAS,mBAAqB,IAAM,CACvC,GAAkB,EACtB,EAEA,EAAO,gBAAgB,IAAM,IAAI,EAAO,SAAS,UAAU,IAAI,EAE/D,EAAO,UAAU,WAAY,CAAC,EAAI,CAAE,eAAgB,CAGhD,AAF4B,EAAU,SAAS,OAAO,GAE7B,GAAyB,EAAI,GAAI,IAAM,CAC5D,GAAI,GAAc,GAA2B,CAAE,EAE/C,AAAI,CAAE,GAEN,GAAa,EAAa,CAAC,EAAM,IAAqB,CAClD,GAA4C,EAAM,EAAa,CAAgB,CACnF,CAAC,CACL,CAAC,EAED,GAAsB,EAAI,AAAC,GAAqB,CAC5C,GAAI,GAAc,GAA2B,CAAE,EAE/C,AAAI,CAAE,GAEN,IAAa,EAAa,CAAC,EAAM,IAAqB,CAClD,GAA4C,EAAM,EAAa,CAAgB,CACnF,CAAC,EAED,EAAiB,IAAM,CAKnB,AAJgB,GAAqC,kBAAmB,CACpE,IAAK,EAAa,QAAS,GAAO,OAAQ,EAC7C,CAAC,GAIF,EAAW,CAAW,CAC1B,CAAC,EACL,CAAC,CACL,CAAC,EAED,WAAoB,EAAa,EAA2B,GAAM,CAC9D,IAAmB,GAAwB,EAE3C,GAA6B,EAAa,CAAC,EAAM,IAAqB,CAClE,GAAqC,mBAAmB,EAExD,IAAiB,GAAiD,EAElE,IAAmB,GAAyB,EAE5C,GAA+D,EAE/D,GAA4D,EAE5D,GAAqC,EAAQ,GAAmB,CAC5D,IAAiB,GAAgC,GAAe,CAC5D,GAAyB,CAAW,EACpC,GAAwB,CAAW,CACvC,CAAC,EAED,AAAI,EACA,GAAgD,EAAM,CAAgB,EAEtE,GAAW,EAAkB,CAAI,EAGrC,GAA2B,EAAM,AAAC,GAAkC,CAChE,GAAsC,SAAS,IAAI,EAEnD,IAAiB,GAA0B,CAAC,EAAa,IAAY,CACjE,GAAyB,CAAW,EACpC,GAAwB,CAAW,CACvC,CAAC,EAED,GAAmC,EAEnC,EAA8B,IAAM,CAChC,EAAgB,IAAM,CAClB,WAAW,IAAM,CACb,IAAa,GAA2C,CAC5D,CAAC,EAED,GAAgC,CAAM,EAEtC,GAAqC,kBAAkB,CAC3D,CAAC,CACL,CAAC,CACL,CAAC,CACL,CAAC,CACL,CAAC,CACL,CAEA,GACI,AAAC,GAAyC,CACtC,EAAqC,AAAC,GAAQ,CAC1C,GAAI,GAAc,GAA0B,CAAG,EAM/C,GAJgB,GAAqC,kBAAmB,CACpE,IAAK,EAAa,QAAS,GAAM,OAAQ,EAC5C,CAAC,EAEa,OAIf,EAAW,EAFoB,EAEiB,CACpD,CAAC,CACL,EACA,CAAC,EAAM,EAAK,EAAgB,IAAmB,CAC3C,GAAI,GAAc,GAA0B,CAAG,EAM/C,AAJgB,GAAqC,kBAAmB,CACpE,IAAK,EAAa,QAAS,GAAM,OAAQ,EAC7C,CAAC,GAMD,IAAiD,EAGjD,GAAqC,mBAAmB,EAIxD,GAA6D,EAAgB,CAAc,EAE3F,GAAqC,EAAQ,GAAmB,CAC5D,IAAiB,GAAgC,GAAe,CAC5D,GAAyB,CAAW,EACpC,GAAwB,CAAW,CACvC,CAAC,EAED,GAA2B,EAAM,IAAM,CACnC,GAAmC,EAEnC,GAAsC,SAAS,IAAI,EAEnD,IAAiB,GAA0B,CAAC,EAAa,IAAY,CACjE,GAAyB,CAAW,EACpC,GAAwB,CAAW,CACvC,CAAC,EAED,GAAmC,EAEnC,EAAgB,IAAM,CAClB,IAAa,GAA2C,EAExD,GAAgC,CAAM,EAEtC,GAAqC,kBAAkB,CAC3D,CAAC,CACL,CAAC,CACL,CAAC,EACL,CACJ,EAIA,WAAW,IAAM,CACb,GAAqC,kBAAkB,CAC3D,CAAC,CACL,CAEA,YAAsC,EAAiB,EAAU,CAC7D,GAAkB,EAAiB,EAAU,IAAM,CAC/C,GAAU,EAAiB,CAAQ,CACvC,CAAC,CACL,CAEA,YAA8C,EAAQ,EAAU,CAC5D,EAAO,uBAAuB,EAE9B,EAAS,AAAC,GAAiB,CACvB,EAAO,wBAAwB,EAE/B,eAAe,IAAM,CACjB,EAAa,CACjB,CAAC,CACL,CAAC,CACL,CAEA,YAA8C,EAAM,EAAQ,CACxD,GAAI,GAAQ,GAAI,aAAY,EAAM,CAC9B,WAAY,GACZ,QAAS,GACT,QACJ,CAAC,EAED,gBAAS,cAAc,CAAK,EAErB,EAAM,gBACjB,CAEA,YAAyC,EAAQ,CAC7C,EAAO,SAAS,SAAS,KAAM,OAAW,CAAC,EAAI,IAAS,CACpD,AAAI,EAAG,iBAAiB,EAAK,CACjC,CAAC,CACL,CAEA,aAAsD,CAClD,SAAS,cAAc,aAAa,GAAK,SAAS,cAAc,aAAa,EAAE,MAAM,CACzF,CAEA,aAA0E,CAEtE,GAAI,GAAS,SAAU,EAAM,EAAU,CACnC,OAAO,KAAK,EAAM,CAAC,EAAI,IAAS,CAC5B,AAAI,GAAmB,CAAE,GAAG,EAAK,EACjC,AAAI,GAAiB,CAAE,EAAG,EAAK,EAC1B,EAAS,EAAI,CAAI,CAC1B,CAAC,CACL,EAKA,OAAO,YAAY,SAAS,KAAM,CAAM,CAC5C,CCvPe,YAAiB,EAAQ,CACpC,EAAO,MAAM,cAAe,CAAC,EAAI,CAAE,iBAAmB,CAClD,GAAI,GACA,EAAa,GACb,EAAU,GAEd,MAAO,GAAY,CAAC,EAAkB,EAAQ,EAAQ,EAAM,IAAQ,CAChE,GAAI,GAAW,GAAS,EAEpB,CAAE,UAAS,UAAS,OAAM,OAAQ,GAAM,EAAU,EAAkB,CAAU,EAElF,SAAO,CAAO,EAEd,AAAM,EAGF,GAAO,OAAO,IAAM,EAAK,EAAO,CAAC,CAAC,EAElC,EAAI,KAAM,IAAY,CAClB,EAAO,CAAQ,EAIf,KAAM,AAF8B,KAAM,QAAQ,QAAQ,GAEtB,CACxC,CAAC,GAVD,EAAO,OAAO,IAAM,EAAQ,EAAO,CAAC,CAAC,EAalC,CACX,EAAG,GAAQ,CACP,EAAK,WAAa,IAAQ,GAAa,GAAa,GACpD,EAAK,QAAU,IAAQ,GAAU,GAAa,GAC9C,EAAK,GAAK,GAAS,GAAQ,EAAY,EAC3C,CAAC,CACL,CAAC,EAED,EAAO,QAAU,CAAE,QAAM,CAC7B,CAEO,YAAe,EAAM,EAAkB,EAAa,GAAO,EAAS,KAAM,CAC7E,GAAI,CAAE,MAAK,MAAK,MAAK,UAAW,GAAiB,EAE7C,EAAM,GAAI,KAAI,OAAO,SAAS,IAAI,EAClC,EAA0B,EAAI,EAAK,CAAI,EACvC,EAAe,EAA0B,EAAI,EAAK,CAAI,EAAI,EAC1D,EAAmB,KAAK,UAAU,CAAY,EAC9C,EAAkB,CAAC,GAAO,KAAM,MAAS,EAAE,SAAS,CAAM,EAAI,EAAmB,KAAK,UAAU,CAAM,EAEtG,EAA4B,AAAC,GAAa,KAAK,UAAU,CAAQ,IAAM,EACvE,EAA2B,AAAC,GAAc,KAAK,UAAU,CAAQ,IAAM,EAE3E,AAAI,GAAY,GAAM,EAAI,EAAK,EAAM,CAAY,GAEjD,GAAQ,EAAK,EAAM,CAAE,MAAO,CAAa,CAAC,EAE1C,GAAI,GAAO,GAEP,EAAS,CAAC,EAAU,IAAa,CACjC,GAAI,EAAM,OAEV,GAAI,GAAM,GAAI,KAAI,OAAO,SAAS,IAAI,EAGtC,AAAI,CAAE,GAAc,CAAE,GAA2B,EAA0B,CAAQ,GAKxE,IAAa,QAEb,CAAE,GAAc,EAAyB,CAAQ,EANxD,EAAM,EAAO,EAAK,CAAI,EAStB,EAAM,EAAI,EAAK,EAAM,CAAQ,EAqBjC,EAAS,EAAK,EAAM,CAAE,MAAO,CAAQ,CAAC,CAC1C,EAEA,MAAO,CACH,QAAS,EAET,QAAQ,EAAU,CACd,EAAO,GAAS,CAAQ,CAC5B,EAEA,KAAK,EAAU,CACX,EAAO,GAAM,CAAQ,CACzB,EAEA,IAAI,EAAU,CACV,GAAI,GAAU,AAAC,GAAM,CACjB,AAAI,CAAE,EAAE,OAAS,CAAE,EAAE,MAAM,QAE3B,OAAO,QAAQ,EAAE,MAAM,MAAM,EAAE,QAAQ,CAAC,CAAC,EAAO,CAAE,MAAO,MAAgB,CACrE,GAAI,IAAU,EAAM,OAEpB,EAAO,GAKP,GAAI,GAAS,EAAS,CAAQ,EAE9B,AAAI,YAAkB,SAClB,EAAO,QAAQ,IAAM,EAAO,EAAK,EAEjC,EAAO,EAEf,CAAC,CACL,EAEA,cAAO,iBAAiB,WAAY,CAAO,EAEpC,IAAM,OAAO,oBAAoB,WAAY,CAAO,CAC/D,CACJ,CACJ,CAEA,YAAiB,EAAK,EAAK,EAAQ,CAC/B,GAAI,GAAQ,OAAO,QAAQ,OAAS,CAAC,EAErC,AAAM,EAAM,QAAQ,GAAM,OAAS,CAAC,GAEpC,EAAM,OAAO,GAAO,GAAO,CAAM,EAEjC,OAAO,QAAQ,aAAa,EAAO,GAAI,EAAI,SAAS,CAAC,CACzD,CAEA,YAAc,EAAK,EAAK,EAAQ,CAC5B,GAAI,GAAQ,OAAO,QAAQ,OAAS,CAAC,EAErC,AAAM,EAAM,QAAQ,GAAM,OAAS,CAAC,GAEpC,EAAQ,CAAE,OAAQ,CAAC,GAAG,EAAM,OAAY,CAAC,GAAM,GAAO,CAAM,CAAE,CAAE,EAEhE,OAAO,QAAQ,UAAU,EAAO,GAAI,EAAI,SAAS,CAAC,CACtD,CAEA,YAAgB,EAAQ,CACpB,GAAI,IAAW,OAEf,MAAO,MAAK,MAAM,KAAK,UAAU,CAAM,CAAC,CAC5C,CAEA,aAA4B,CACxB,MAAO,CACH,IAAI,EAAK,EAAK,CACV,GAAI,GAAS,EAAI,OAEjB,GAAI,CAAE,EAAQ,MAAO,GAErB,GAAI,GAAO,GAAgB,EAAQ,CAAG,EAEtC,MAAO,QAAO,KAAK,CAAI,EAAE,SAAS,CAAG,CACzC,EACA,IAAI,EAAK,EAAK,CACV,GAAI,GAAS,EAAI,OAEjB,MAAM,GAIC,AAFI,GAAgB,EAAQ,CAAG,EAE1B,GAJS,EAKzB,EACA,IAAI,EAAK,EAAK,EAAO,CACjB,GAAI,GAAO,GAAgB,EAAI,OAAQ,CAAG,EAE1C,SAAK,GAAO,GAAW,GAAO,CAAK,CAAC,EAEpC,EAAI,OAAS,GAAc,CAAI,EAExB,CACX,EACA,OAAO,EAAK,EAAK,CACb,GAAI,GAAO,GAAgB,EAAI,OAAQ,CAAG,EAE1C,aAAO,GAAK,GAEZ,EAAI,OAAS,GAAc,CAAI,EAExB,CACX,CACJ,CACJ,CAEA,YAAoB,EAAO,CACvB,GAAI,CAAE,GAAU,CAAK,EAAG,MAAO,GAE/B,OAAS,KAAO,GACZ,AAAI,EAAM,KAAS,KAAM,MAAO,GAAM,GACjC,EAAM,GAAO,GAAW,EAAM,EAAI,EAG3C,MAAO,EACX,CAIA,YAAuB,EAAM,CACzB,GAAI,GAAY,AAAC,GAAY,MAAO,IAAY,UAAY,IAAY,KAEpE,EAA0B,CAAC,EAAM,EAAU,CAAC,EAAG,EAAU,KACzD,QAAO,QAAQ,CAAI,EAAE,QAAQ,CAAC,CAAC,EAAM,KAAY,CAC7C,GAAI,GAAM,IAAY,GAAK,EAAO,GAAG,KAAW,KAEhD,AAAI,IAAW,KACX,EAAQ,GAAO,GACZ,AAAM,EAAU,CAAM,EAKzB,EAAU,CAAC,GAAG,EAAS,GAAG,EAAwB,EAAQ,EAAS,CAAG,CAAC,EAJvE,EAAQ,GAAO,mBAAmB,CAAM,EACnC,WAAW,MAAO,GAAG,EACrB,WAAW,MAAO,GAAG,CAIlC,CAAC,EAEM,GAGP,EAAU,EAAwB,CAAI,EAE1C,MAAO,QAAO,QAAQ,CAAO,EAAE,IAAI,CAAC,CAAC,EAAK,KAAW,GAAG,KAAO,GAAO,EAAE,KAAK,GAAG,CACpF,CAIA,YAAyB,EAAQ,EAAU,CAGvC,GAFA,EAAS,EAAO,QAAQ,IAAK,EAAE,EAE3B,IAAW,GAAI,MAAO,CAAC,EAE3B,GAAI,GAAgC,CAAC,EAAK,EAAO,IAAS,CACtD,GAAI,CAAC,EAAO,KAAW,GAAQ,EAAI,MAAM,GAAG,EAG5C,GAAI,CAAE,EAAQ,MAAO,GAAK,GAAO,EAGjC,AAAI,EAAK,KAAW,QAChB,GAAK,GAAS,MAAM,CAAM,EAAI,CAAC,EAAI,CAAC,GAIxC,EAA8B,CAAC,EAAQ,GAAG,CAAI,EAAE,KAAK,GAAG,EAAG,EAAO,EAAK,EAAM,CACjF,EAEI,EAAU,EAAO,MAAM,GAAG,EAAE,IAAI,GAAK,EAAE,MAAM,GAAG,CAAC,EAKjD,EAAO,OAAO,OAAO,IAAI,EAE7B,SAAQ,QAAQ,CAAC,CAAC,EAAK,KAAW,CAE9B,GAAK,MAAO,GAAS,IAAc,OAEnC,EAAQ,mBAAmB,EAAM,WAAW,IAAK,KAAK,CAAC,EAEvD,GAAI,GAAa,mBAAmB,CAAG,EAIvC,GAAI,CAFyB,GAAW,SAAS,GAAG,GAAK,EAAW,WAAW,CAAQ,GAGnF,EAAK,GAAO,MACT,CAEH,GAAI,GAAgB,EAAW,WAAW,IAAK,GAAG,EAAE,WAAW,IAAK,EAAE,EAEtE,EAA8B,EAAe,EAAO,CAAI,CAC5D,CACJ,CAAC,EAEM,CACX,CCrSA,YAAe,EAAM,EAAQ,EAAS,CACpC,GAA2C,EAC3C,GAAI,GACA,EACA,EAAK,EAAW,EAAU,EAAS,EAAU,EAAS,EAAQ,EAClE,WAAuB,EAAW,CAAC,EAAG,CACpC,GAAI,GAAgB,AAAC,GAAO,EAAG,aAAa,KAAK,EAC7C,EAAO,IAAM,CACjB,EACA,EAAW,EAAS,UAAY,EAChC,EAAU,EAAS,SAAW,EAC9B,EAAW,EAAS,UAAY,EAChC,EAAU,EAAS,SAAW,EAC9B,EAAS,EAAS,QAAU,EAC5B,EAAQ,EAAS,OAAS,EAC1B,EAAM,EAAS,KAAO,EACtB,EAAY,EAAS,WAAa,EACpC,CACA,WAAe,EAAO,EAAI,CACxB,GAAI,EAAiC,EAAO,CAAE,EAC5C,MAAO,GAAa,EAAO,CAAE,EAE/B,GAAI,GAAqB,GACzB,GAAI,IAAW,EAAU,EAAO,EAAI,IAAM,EAAqB,EAAI,EAQnE,IANI,EAAM,WAAa,GAAK,OAAO,QACjC,QAAO,OAAO,UAAU,EAAO,CAAE,EAC7B,EAAM,aAAe,EAAG,aAC1B,EAAM,EAAM,YAAa,EAAG,WAAW,GAGvC,GAAc,CAAE,EAAG,CACrB,EAAe,EAAO,CAAE,EACxB,EAAQ,EAAO,CAAE,EACjB,MACF,CACA,AAAK,GACH,EAAgB,EAAO,CAAE,EAE3B,EAAQ,EAAO,CAAE,EACjB,EAAc,EAAO,CAAE,EACzB,CACA,WAA0C,EAAO,EAAI,CACnD,MAAO,GAAM,UAAY,EAAG,UAAY,EAAM,UAAY,EAAG,UAAY,EAAO,CAAK,GAAK,EAAO,CAAE,CACrG,CACA,WAAsB,EAAO,EAAI,CAC/B,GAAI,GAAW,EAAU,CAAK,EAC5B,OACF,GAAI,GAAW,EAAG,UAAU,EAAI,EAChC,AAAI,GAAW,EAAQ,CAAQ,GAE/B,GAAM,YAAY,CAAQ,EAC1B,EAAQ,CAAK,EACb,EAAM,CAAQ,EAChB,CACA,WAAwB,EAAO,EAAI,CACjC,GAAI,GAAQ,EAAG,UACf,AAAI,EAAM,YAAc,GACtB,GAAM,UAAY,EAEtB,CACA,WAAyB,EAAO,EAAI,CAMlC,GALI,EAAM,kBAEN,EAAM,YAAc,CAAC,EAAG,YAGxB,CAAC,EAAM,YAAc,EAAG,WAC1B,OAEF,GAAI,GAAgB,MAAM,KAAK,EAAM,UAAU,EAC3C,EAAe,MAAM,KAAK,EAAG,UAAU,EAC3C,OAAS,GAAI,EAAc,OAAS,EAAG,GAAK,EAAG,IAAK,CAClD,GAAI,GAAO,EAAc,GAAG,KAC5B,AAAK,EAAG,aAAa,CAAI,GACvB,EAAM,gBAAgB,CAAI,CAE9B,CACA,OAAS,GAAI,EAAa,OAAS,EAAG,GAAK,EAAG,IAAK,CACjD,GAAI,GAAO,EAAa,GAAG,KACvB,EAAQ,EAAa,GAAG,MAC5B,AAAI,EAAM,aAAa,CAAI,IAAM,GAC/B,EAAM,aAAa,EAAM,CAAK,CAElC,CACF,CACA,WAAuB,EAAO,EAAI,CAChC,GAAI,GAAW,EAAS,EAAM,QAAQ,EAClC,EAAmB,CAAC,EACpB,EAAY,GAAa,CAAE,EAC3B,EAAc,GAAa,CAAK,EACpC,KAAO,GAAW,CAChB,GAAkB,EAAW,CAAW,EACxC,GAAI,GAAQ,EAAO,CAAS,EACxB,EAAU,EAAO,CAAW,EAChC,GAAI,CAAC,EACH,GAAI,GAAS,EAAiB,GAAQ,CACpC,GAAI,GAAW,EAAiB,GAChC,EAAM,YAAY,CAAQ,EAC1B,EAAc,EACd,EAAU,EAAO,CAAW,CAC9B,KAAO,CACL,GAAI,CAAC,GAAW,EAAQ,CAAS,EAAG,CAClC,GAAI,GAAQ,EAAU,UAAU,EAAI,EACpC,EAAM,YAAY,CAAK,EACvB,EAAM,CAAK,CACb,CACA,EAAY,EAAe,EAAI,CAAS,EACxC,QACF,CAEF,GAAI,GAAO,AAAC,GAAS,GAAQ,EAAK,WAAa,GAAK,EAAK,cAAgB,uBACrE,EAAQ,AAAC,GAAS,GAAQ,EAAK,WAAa,GAAK,EAAK,cAAgB,0BAC1E,GAAI,EAAK,CAAS,GAAK,EAAK,CAAW,EAAG,CACxC,GAAI,GAAgB,EAChB,GAAiB,EACrB,KAAO,GAAa,CAClB,GAAI,GAAO,EAAe,EAAO,CAAW,EAC5C,GAAI,EAAK,CAAI,EACX,YACS,EAAM,CAAI,GAAK,EAAgB,EACxC,YACS,EAAM,CAAI,GAAK,IAAkB,EAAG,CAC7C,EAAc,EACd,KACF,CACA,EAAc,CAChB,CACA,GAAI,IAAe,EACnB,EAAgB,EAChB,GAAI,IAAe,EACnB,KAAO,GAAW,CAChB,GAAI,GAAO,EAAe,EAAI,CAAS,EACvC,GAAI,EAAK,CAAI,EACX,YACS,EAAM,CAAI,GAAK,EAAgB,EACxC,YACS,EAAM,CAAI,GAAK,IAAkB,EAAG,CAC7C,EAAY,EACZ,KACF,CACA,EAAY,CACd,CACA,GAAI,IAAa,EACb,GAAY,GAAI,IAAM,GAAgB,EAAY,EAClD,GAAU,GAAI,IAAM,GAAc,EAAU,EAChD,EAAc,GAAW,EAAO,EAChC,QACF,CACA,GAAI,EAAY,WAAa,GAAK,GAAa,CAAC,EAAY,YAAY,CAAS,EAAG,CAClF,GAAI,GAAuB,EAAe,EAAI,CAAS,EACnD,GAAQ,GACZ,KAAO,CAAC,IAAS,GACf,AAAI,EAAqB,WAAa,GAAK,EAAY,YAAY,CAAoB,GACrF,IAAQ,GACR,EAAc,EAAc,EAAO,EAAW,CAAW,EACzD,EAAU,EAAO,CAAW,GAE9B,EAAuB,EAAe,EAAI,CAAoB,CAElE,CACA,GAAI,IAAU,EAAS,CACrB,GAAI,CAAC,GAAS,EAAS,CACrB,EAAiB,GAAW,EAC5B,EAAc,EAAc,EAAO,EAAW,CAAW,EACzD,EAAiB,GAAS,OAAO,EACjC,EAAc,EAAe,EAAO,CAAW,EAC/C,EAAY,EAAe,EAAI,CAAS,EACxC,QACF,CAQA,GAPI,GAAS,CAAC,GACR,EAAS,IACX,GAAY,YAAY,EAAS,EAAM,EACvC,EAAc,EAAS,GACvB,EAAU,EAAO,CAAW,GAG5B,GAAS,EAAS,CACpB,GAAI,GAAc,EAAS,GAC3B,GAAI,EACF,EAAiB,GAAW,EAC5B,EAAY,YAAY,CAAW,EACnC,EAAc,EACd,EAAU,EAAO,CAAW,MACvB,CACL,EAAiB,GAAW,EAC5B,EAAc,EAAc,EAAO,EAAW,CAAW,EACzD,EAAiB,GAAS,OAAO,EACjC,EAAc,EAAe,EAAO,CAAW,EAC/C,EAAY,EAAe,EAAI,CAAS,EACxC,QACF,CACF,CACF,CACA,GAAI,IAAkB,GAAe,EAAe,EAAO,CAAW,EACtE,EAAM,EAAa,CAAS,EAC5B,EAAY,GAAa,EAAe,EAAI,CAAS,EACrD,EAAc,EAChB,CACA,GAAI,GAAW,CAAC,EAChB,KAAO,GACL,AAAK,GAAW,EAAU,CAAW,GACnC,EAAS,KAAK,CAAW,EAC3B,EAAc,EAAe,EAAO,CAAW,EAEjD,KAAO,EAAS,QAAQ,CACtB,GAAI,GAAgB,EAAS,MAAM,EACnC,EAAc,OAAO,EACrB,EAAQ,CAAa,CACvB,CACF,CACA,WAAgB,EAAI,CAClB,MAAO,IAAM,EAAG,WAAa,GAAK,EAAI,CAAE,CAC1C,CACA,WAAkB,EAAK,CACrB,GAAI,GAAM,CAAC,EACX,OAAS,KAAM,GAAK,CAClB,GAAI,GAAS,EAAO,CAAE,EACtB,AAAI,GACF,GAAI,GAAU,EAElB,CACA,MAAO,EACT,CACA,WAAuB,EAAQ,EAAM,EAAU,CAC7C,GAAI,CAAC,GAAW,EAAQ,CAAI,EAAG,CAC7B,GAAI,GAAQ,EAAK,UAAU,EAAI,EAC/B,SAAO,aAAa,EAAO,CAAQ,EACnC,EAAM,CAAK,EACJ,CACT,CACA,MAAO,EACT,CACA,SAAc,CAAO,EACrB,EAAS,EACT,EAAO,MAAO,IAAW,SAAW,GAAc,CAAM,EAAI,EACxD,OAAO,QAAU,OAAO,OAAO,kBAAoB,CAAC,EAAK,cAC3D,GAAK,aAAe,OAAO,OAAO,iBAAiB,CAAI,EACvD,EAAK,cAAgB,OAAO,OAAO,UAAU,EAAM,CAAI,GAEzD,EAAM,EAAM,CAAI,EAChB,EAAS,OACT,EAAO,OACA,CACT,CACA,GAAM,KAAO,IAAM,CACnB,EACA,GAAM,IAAM,IAAM,CAClB,EACA,YAAoB,KAAS,EAAM,CACjC,GAAI,GAAO,GACX,SAAK,GAAG,EAAM,IAAM,EAAO,EAAI,EACxB,CACT,CACA,GAAI,IAAU,GACd,YAAuB,EAAM,CAC3B,GAAM,GAAW,SAAS,cAAc,UAAU,EAClD,SAAS,UAAY,EACd,EAAS,QAAQ,iBAC1B,CACA,YAAuB,EAAI,CACzB,MAAO,GAAG,WAAa,GAAK,EAAG,WAAa,CAC9C,CACA,GAAI,IAAQ,KAAM,CAChB,YAAY,EAAO,EAAK,CACtB,KAAK,aAAe,EACpB,KAAK,WAAa,CACpB,CACA,GAAI,WAAW,CACb,GAAI,GAAW,CAAC,EACZ,EAAc,KAAK,aAAa,YACpC,KAAO,GAAe,IAAgB,KAAK,YACzC,EAAS,KAAK,CAAW,EACzB,EAAc,EAAY,YAE5B,MAAO,EACT,CACA,YAAY,EAAO,CACjB,KAAK,WAAW,OAAO,CAAK,CAC9B,CACA,GAAI,aAAa,CACf,GAAI,GAAQ,KAAK,aAAa,YAC9B,GAAI,IAAU,KAAK,WAEnB,MAAO,EACT,CACA,SAAS,EAAW,CAClB,GAAI,GAAO,EAAU,YACrB,GAAI,IAAS,KAAK,WAElB,MAAO,EACT,CACA,aAAa,EAAS,EAAW,CAC/B,SAAU,OAAO,CAAO,EACjB,CACT,CACF,EACA,YAAsB,EAAQ,CAC5B,MAAO,GAAO,UAChB,CACA,WAAwB,EAAQ,EAAW,CACzC,GAAI,GACJ,MAAI,aAAkB,IACpB,EAAO,EAAO,SAAS,CAAS,EAEhC,EAAO,EAAU,YAEZ,CACT,CACA,aAAsD,CACpD,GAAI,GACF,OACF,GAAU,GACV,GAAI,GAAW,QAAQ,UAAU,aAC7B,EAAU,SAAS,cAAc,KAAK,EAC1C,QAAQ,UAAU,aAAe,SAAyB,EAAM,EAAO,CACrE,GAAI,CAAC,EAAK,SAAS,GAAG,EACpB,MAAO,GAAS,KAAK,KAAM,EAAM,CAAK,EAExC,EAAQ,UAAY,SAAS,MAAS,aACtC,GAAI,GAAO,EAAQ,kBAAkB,iBAAiB,CAAI,EAC1D,EAAQ,kBAAkB,oBAAoB,CAAI,EAClD,KAAK,iBAAiB,CAAI,CAC5B,CACF,CACA,YAA2B,EAAI,EAAM,CACnC,GAAI,GAAS,GAAQ,EAAK,aAAe,EAAK,YAAY,GAC1D,AAAI,CAAC,GAED,CAAC,EAAG,cAER,GAAG,aAAa,KAAM,CAAM,EAC5B,EAAG,GAAK,EACV,CAGA,YAAqB,EAAQ,CAC3B,EAAO,MAAQ,EACjB,CAGA,GAAI,IAAiB,GCrVrB,YAAqB,EAAQ,CAC3B,EAAO,UAAU,OAAQ,CAAC,EAAI,CAAE,QAAO,cAAc,CAAE,SAAQ,gBAAe,aAAc,CAC1F,GAAI,GAAa,IAAM,EACnB,EAAiB,GACrB,eAAe,IAAM,CACnB,GAAI,CAAC,WAAY,SAAS,EAAE,SAAS,CAAK,EAAG,CAC3C,GAAI,GAAY,EAAc,CAAU,EACxC,EAAO,IAAM,CACX,EAAa,AAAC,GAAU,CACtB,GAAI,GACJ,SAAO,0BAA0B,IAAM,CACrC,EAAU,AAAC,GAAW,CACpB,EAAS,MAAO,IAAW,WAAa,EAAO,CAAK,EAAI,CAC1D,EAAG,CAAE,MAAO,CAEV,OAAU,EACV,OAAU,GAAY,KAAK,CAAE,IAAG,CAAC,CACnC,CAAE,CAAC,CACL,CAAC,EACM,CACT,EACA,EAAkB,EAAI,EAAK,CAC7B,CAAC,CACH,KACE,GAAkB,EAAI,EAAK,EAE7B,GAAI,EAAG,SAAU,CAGf,GAFI,EAAG,SAAS,IAAI,IAAM,EAAG,OAEzB,EAAG,SAAS,IAAI,IAAM,MAAQ,EAAG,QAAU,GAC7C,OACF,EAAG,SAAS,IAAI,EAAG,KAAK,CAC1B,CACF,CAAC,EACD,GAAM,GAAa,GAAI,iBACvB,EAAQ,IAAM,CACZ,EAAW,MAAM,CACnB,CAAC,EACD,EAAG,iBAAiB,QAAS,IAAM,EAAkB,CAAE,EAAG,CACxD,OAAQ,EAAW,OAGnB,QAAS,EACX,CAAC,EACD,EAAG,iBAAiB,OAAQ,IAAM,EAAkB,EAAI,EAAK,EAAG,CAAE,OAAQ,EAAW,MAAO,CAAC,EAC7F,WAA2B,EAAK,EAAsB,GAAM,CAC1D,GAAI,GAAQ,EAAI,MACZ,EAAW,EAAW,CAAK,EAC/B,GAAI,CAAC,GAAY,IAAa,QAC5B,MAAO,GACT,GAAI,EAAe,OAAS,EAAI,MAAM,SAAW,EAC/C,MAAO,GAAiB,EAAI,MAE9B,GAAI,GAAW,IAAM,CACnB,EAAiB,EAAI,MAAQ,EAAY,EAAO,CAAQ,CAC1D,EACA,AAAI,EACF,GAAsB,EAAK,EAAU,IAAM,CACzC,EAAS,CACX,CAAC,EAED,EAAS,CAEb,CACA,WAAqB,EAAO,EAAU,CACpC,GAAI,IAAU,GACZ,MAAO,GACT,GAAI,GAAoB,GAAU,EAAU,CAAK,EAEjD,MADmB,IAAQ,EAAU,CAAiB,CAExD,CACF,CAAC,EAAE,OAAO,OAAO,CACnB,CACA,YAA+B,EAAI,EAAU,EAAU,CACrD,GAAI,GAAiB,EAAG,eACpB,EAAmB,EAAG,MAC1B,EAAS,EACT,GAAI,GAAqC,EAAiB,MAAM,EAAG,CAAc,EAC7E,EAAc,GAChB,EACA,GACE,EACA,CACF,CACF,EAAE,OACF,EAAG,kBAAkB,EAAa,CAAW,CAC/C,CACA,YAAmB,EAAU,EAAO,CAClC,GAAI,GAAoB,EACpB,EAAS,GACT,EAAU,CACZ,EAAK,QACL,EAAK,WACL,IAAK,aACP,EACI,EAAmB,GACvB,OAAS,GAAI,EAAG,EAAI,EAAS,OAAQ,IAAK,CACxC,GAAI,CAAC,IAAK,IAAK,GAAG,EAAE,SAAS,EAAS,EAAE,EAAG,CACzC,GAAoB,EAAS,GAC7B,QACF,CACA,OAAS,GAAI,EAAG,EAAI,EAAkB,OAAQ,IAC5C,GAAI,EAAkB,KAAO,EAAS,GAAI,CACxC,EAAoB,EAAkB,MAAM,EAAG,CAAC,EAAI,EAAkB,MAAM,EAAI,CAAC,EACjF,KACF,CAEJ,CACA,OAAS,GAAI,EAAG,EAAI,EAAiB,OAAQ,IAAK,CAChD,GAAI,GAAQ,GACZ,OAAS,GAAI,EAAG,EAAI,EAAkB,OAAQ,IAC5C,GAAI,EAAQ,EAAiB,IAAI,KAAK,EAAkB,EAAE,EAAG,CAC3D,GAAU,EAAkB,GAC5B,EAAoB,EAAkB,MAAM,EAAG,CAAC,EAAI,EAAkB,MAAM,EAAI,CAAC,EACjF,EAAQ,GACR,KACF,CAEF,GAAI,CAAC,EACH,KACJ,CACA,MAAO,EACT,CACA,YAAiB,EAAU,EAAO,CAChC,GAAI,GAAQ,MAAM,KAAK,CAAK,EACxB,EAAS,GACb,OAAS,GAAI,EAAG,EAAI,EAAS,OAAQ,IAAK,CACxC,GAAI,CAAC,CAAC,IAAK,IAAK,GAAG,EAAE,SAAS,EAAS,EAAE,EAAG,CAC1C,GAAU,EAAS,GACnB,QACF,CACA,GAAI,EAAM,SAAW,EACnB,MACF,GAAU,EAAM,MAAM,CACxB,CACA,MAAO,EACT,CACA,YAAqB,EAAO,EAAY,IAAK,EAAW,EAAY,EAAG,CACrE,GAAI,IAAU,IACZ,MAAO,IACT,GAAI,QAAQ,KAAK,CAAK,EACpB,MAAO,IACT,AAAI,GAAc,MAChB,GAAY,IAAc,IAAM,IAAM,KAExC,GAAI,GAAe,CAAC,EAAQ,IAAe,CACzC,GAAI,GAAS,GACT,EAAU,EACd,OAAS,GAAI,EAAO,OAAS,EAAG,GAAK,EAAG,IACtC,AAAI,EAAO,KAAO,GAElB,CAAI,IAAY,EACd,GAAS,EAAO,GAAK,EAAa,EAClC,EAAU,GAEV,EAAS,EAAO,GAAK,EAEvB,KAEF,MAAO,EACT,EACI,EAAQ,EAAM,WAAW,GAAG,EAAI,IAAM,GACtC,EAAgB,EAAM,WAAW,GAAI,QAAO,UAAU,KAAc,GAAG,EAAG,EAAE,EAC5E,EAAW,MAAM,KAAK,CAAE,OAAQ,EAAc,MAAM,CAAS,EAAE,GAAG,MAAO,CAAC,EAAE,KAAK,GAAG,EAAE,KAAK,EAAE,EACjG,SAAW,GAAG,IAAQ,EAAa,EAAU,CAAS,IAClD,EAAY,GAAK,EAAM,SAAS,CAAS,GAC3C,IAAY,GAAG,IAAc,IAAI,OAAO,CAAS,GACnD,eAAe,IAAM,CACnB,AAAI,KAAK,GAAG,MAAM,SAAS,CAAS,GAEhC,KAAK,GAAG,MAAM,KAAK,GAAG,eAAiB,KAAO,GAChD,KAAK,GAAG,kBAAkB,KAAK,GAAG,eAAiB,EAAG,KAAK,GAAG,eAAiB,CAAC,CAEpF,CAAC,EACM,CACT,CAGA,GAAI,IAAiB,GCnKd,aAAiB,CACpB,WAAW,IAAM,GAAkC,CAAC,EAEpD,GAAS,SAAU,eAAe,EAClC,GAAS,SAAU,uBAAuB,EAE1C,EAAO,OAAO,EAAK,EACnB,EAAO,OAAO,EAAO,EACrB,EAAO,OAAO,EAAS,EACvB,EAAO,OAAO,EAAM,EACpB,EAAO,OAAO,EAAQ,EACtB,EAAO,OAAO,EAAM,EACpB,EAAO,OAAO,EAAK,EACnB,EAAO,OAAO,EAAO,EACrB,EAAO,OAAO,EAAQ,EACtB,EAAO,OAAO,EAAI,EAElB,EAAO,gBAAgB,IAAM,aAAa,EAE1C,EAAO,kBAAkB,CAAC,EAAI,IAAe,CAGzC,GAAI,CAAE,MAAM,KAAK,CAAU,EAAE,KAAK,GAAa,GAA4B,EAAU,IAAI,CAAC,EAAG,OAE7F,GAAI,GAAY,EAAiB,EAAI,EAAK,EAE1C,AAAI,CAAE,GAEN,EAAW,QAAQ,GAAa,CAC5B,GAAI,CAAE,GAA4B,EAAU,IAAI,EAAG,OAEnD,GAAI,GAAY,GAAiB,EAAI,EAAU,IAAI,EAEnD,EAAQ,iBAAkB,CAAE,KAAI,YAAW,YAAW,QAAS,AAAC,GAAa,CACzE,EAAO,mBAAmB,EAAI,EAAU,IAAK,CAAQ,CACzD,CAAE,CAAC,CACP,CAAC,CACL,CAAC,EAED,EAAO,cACH,EAAO,gBAAgB,GAAM,CAGzB,GAAI,CAAE,MAAM,KAAK,EAAG,UAAU,EAAE,KAAK,GAAa,GAA4B,EAAU,IAAI,CAAC,EAAG,OAEhG,GAAI,EAAG,aAAa,SAAS,EAAG,CAC5B,GAAI,GAAY,GAAc,CAAE,EAEhC,EAAO,mBAAmB,EAAI,UAAW,IAAM,CAC3C,GAAiB,EAAU,EAAE,CACjC,CAAC,CACL,CAEA,GAAI,GAAa,MAAM,KAAK,EAAG,kBAAkB,CAAC,EAC7C,OAAO,GAAQ,GAA4B,CAAI,CAAC,EAChD,IAAI,GAAQ,GAAiB,EAAI,CAAI,CAAC,EAE3C,EAAW,QAAQ,GAAa,CAC5B,EAAQ,wBAAyB,CAAE,KAAI,YAAW,QAAS,AAAC,GAAa,CACrE,EAAO,mBAAmB,EAAI,EAAU,IAAK,CAAQ,CACzD,CAAE,CAAC,CACP,CAAC,EAED,GAAI,GAAY,EAAiB,EAAI,EAAK,EAE1C,AAAI,GACA,GAAQ,eAAgB,CAAE,KAAI,WAAU,CAAC,EAEzC,EAAW,QAAQ,GAAa,CAC5B,EAAQ,iBAAkB,CAAE,KAAI,YAAW,YAAW,QAAS,AAAC,GAAa,CACzE,EAAO,mBAAmB,EAAI,EAAU,IAAK,CAAQ,CACzD,CAAE,CAAC,CACP,CAAC,EAET,CAAC,CACL,EAEA,EAAO,MAAM,EAEb,WAAW,IAAM,OAAO,SAAS,wBAA0B,EAAI,EAE/D,GAAS,SAAU,sBAAsB,CAC7C,CAEA,aAA6C,CACzC,GAAI,GAAK,SAAS,cAAc,oCAAoC,EAGpE,GAAI,CAAE,EAAI,OAOV,GAAI,GAAa,EAAG,QAAQ,aAAa,EAEzC,AAAI,GACA,QAAQ,KAAK,qGAAsG,CAAU,CAErI,CClHA,EAAK,SAAU,CAAC,CAAE,YAAW,aAAc,CACvC,GAAkB,EAAW,EAAQ,WAAa,CAAC,CAAC,CACxD,CAAC,EAED,YAA2B,EAAW,EAAW,CAC7C,EAAU,QAAQ,GAAQ,CAEtB,GAAI,GAAU,AAAC,GAAM,CACjB,AAAI,EAAE,YAAY,EAAE,WAAW,WAAW,KAAK,CAAS,EAExD,EAAU,MAAM,KAAK,aAAc,EAAM,EAAE,QAAU,CAAC,CAAC,CAC3D,EAEA,OAAO,iBAAiB,EAAM,CAAO,EAErC,EAAU,WAAW,IAAM,OAAO,oBAAoB,EAAM,CAAO,CAAC,EAGpE,EAAU,GAAG,iBAAiB,EAAM,AAAC,GAAM,CAEvC,AAAI,CAAE,EAAE,YAGJ,EAAE,SAEF,GAAE,YAAY,EAAE,WAAW,WAAW,KAAK,EAAU,EAAE,EAE3D,EAAU,MAAM,KAAK,aAAc,EAAM,EAAE,QAAU,CAAC,CAAC,EAC3D,CAAC,CACL,CAAC,CACL,CC7BA,GAAI,IAAkB,GAAI,SAEtB,GAAiB,GAAI,KAEzB,EAAG,oBAAqB,MAAO,CAAE,YAAa,CAC1C,GAAG,EAAE,EAEL,OAAS,CAAC,EAAK,IAAU,QAAO,QAAQ,CAAM,EAC1C,KAAM,IAA8C,EAAK,SAAY,CACjE,KAAM,IAAyB,CAAK,CACxC,CAAC,CAET,CAAC,EAID,EAAG,iBAAkB,CAAC,CAAE,eAAgB,CACpC,GAAI,GAAS,EAAU,SAAS,KAAK,OAErC,AAAI,GACA,EAAO,QAAQ,AAAC,GAAQ,CACpB,AAAI,GAAe,IAAI,CAAG,GAC1B,GAAe,IAAI,CAAG,CAC1B,CAAC,CAET,CAAC,EAED,EAAG,SAAU,CAAC,CAAE,YAAW,aAAc,CACrC,GAAI,GAAU,EAAQ,QAEtB,AAAI,GACA,OAAO,QAAQ,CAAO,EAAE,QAAQ,CAAC,CAAC,EAAK,KAAa,CAChD,GAAgD,EAAW,EAAK,IAAM,CAClE,GAAI,GAAgB,GAAwB,CAAO,EAEnD,EAAO,0BAA0B,IAAM,CACnC,EAAO,SAAS,EAAU,GAAI,EAAe,CAAE,MAAS,EAAU,KAAM,CAAC,CAC7E,CAAC,CACL,CAAC,CACL,CAAC,CAET,CAAC,EAED,YAAyD,EAAW,EAAK,EAAU,CAC/E,GAAI,GAAgB,IAAI,CAAS,GAGzB,AAFiB,GAAgB,IAAI,CAAS,EAE/B,SAAS,CAAG,EAAG,OAGtC,EAAS,EAEH,GAAgB,IAAI,CAAS,GAAG,GAAgB,IAAI,EAAW,CAAC,CAAC,EAEvE,GAAI,GAAiB,GAAgB,IAAI,CAAS,EAElD,EAAe,KAAK,CAAG,EAEvB,GAAgB,IAAI,EAAW,CAAc,CACjD,CAEA,YAAiC,EAAS,CAEtC,GAAI,GAAU,AADI,wCACQ,KAAK,CAAO,EAGtC,MAFe,IAAW,EAAQ,GAAK,EAAQ,GAAG,KAAK,EAAI,EAG/D,CAEA,kBAA6D,EAAK,EAAU,CACxE,AAAI,GAAe,IAAI,CAAG,GAE1B,MAAM,GAAS,EAEf,GAAe,IAAI,CAAG,EAC1B,CAEA,kBAAwC,EAAS,CAC7C,GAAI,GAAe,GAAI,WAAU,EAAG,gBAAgB,EAAS,WAAW,EACpE,EAAU,SAAS,UAAU,EAAY,IAAI,EAEjD,OAAS,KAAS,GAAQ,SACtB,GAAI,CACA,KAAM,IAAsB,CAAK,CACrC,MAAE,CAKF,CAER,CAEA,kBAAqC,EAAO,CACxC,MAAO,IAAI,SAAQ,CAAC,EAAS,IAAW,CACpC,GAAI,GAAS,CAAK,EAAG,CACjB,GAAI,GAAS,GAAe,CAAK,EAIjC,AAAI,EAAO,IACP,GAAO,OAAS,IAAM,EAAQ,EAC9B,EAAO,QAAU,IAAM,EAAO,GAE9B,EAAQ,EAGZ,SAAS,KAAK,YAAY,CAAM,CACpC,KACI,UAAS,KAAK,YAAY,CAAK,EAE/B,EAAQ,CAEhB,CAAC,CACL,CAEA,YAAkB,EAAM,CACpB,MAAO,GAAG,QAAQ,YAAY,IAAM,QACxC,CAEA,YAAwB,EAAI,CACxB,GAAI,GAAS,SAAS,cAAc,QAAQ,EAE5C,EAAO,YAAc,EAAG,YACxB,EAAO,MAAQ,EAAG,MAElB,OAAS,KAAQ,GAAG,WAChB,EAAO,aAAa,EAAK,KAAM,EAAK,KAAK,EAG7C,MAAO,EACX,CClIA,EAAG,SAAU,CAAC,CAAE,YAAW,aAAc,CACrC,GAAI,GAAK,EAAQ,GACb,EAAM,EAAQ,IAElB,AAAI,GACA,OAAO,QAAQ,CAAE,EAAE,QAAQ,CAAC,CAAC,EAAQ,KAAU,CAC3C,GAAe,EAAW,EAAQ,IAAM,CACpC,EAAO,SAAS,EAAU,GAAI,CAAI,CACtC,CAAC,CACL,CAAC,EAGD,GACA,EAAI,QAAQ,GAAc,CACtB,EAAO,SAAS,EAAU,GAAI,CAAU,CAC5C,CAAC,CAET,CAAC,ECjBM,YAAe,EAAW,EAAI,EAAM,CACvC,GAAI,GAAa,EAAG,cAEd,EAAG,cAAc,QAAQ,YAAY,EACrC,MAEF,EAAU,SAAS,cAAc,CAAU,EAE/C,EAAQ,UAAY,EACpB,GAAI,GAEJ,GAAI,CACA,EAAkB,EAAiB,EAAG,aAAa,CACvD,MAAE,CAAW,CAEb,GAAoB,GAAQ,WAAa,GAEzC,GAAI,GAAK,EAAQ,kBAEjB,EAAG,WAAa,EAEhB,EAAQ,QAAS,CAAE,KAAI,KAAM,EAAI,WAAU,CAAC,EAE5C,EAAO,MAAM,EAAI,EAAI,CACjB,SAAU,CAAC,EAAI,EAAM,EAAc,IAAS,CACxC,GAAI,IAAY,CAAE,EAOlB,IALA,EAAQ,iBAAkB,CAAE,KAAI,OAAM,YAAW,OAAM,cAAa,CAAC,EAGjE,EAAG,qBAAuB,IAAM,GAAG,UAAY,EAAK,WAEpD,EAAG,0BAA4B,GAAQ,SAAG,UAAY,EAAK,UAAkB,EAAK,EAMtF,GAJI,EAAG,oBAAsB,IACzB,GAAG,yBAA2B,IAAM,EAAa,EAGjD,GAAkB,CAAE,GAAK,EAAG,aAAa,SAAS,IAAM,EAAU,IAAI,MAAO,GAAK,EAKtF,AAAI,GAAkB,CAAE,GAAG,GAAK,WAAa,GACjD,EAEA,QAAS,AAAC,GAAO,CACb,AAAI,GAAY,CAAE,GAElB,EAAQ,gBAAiB,CAAE,KAAI,WAAU,CAAC,CAC9C,EAEA,SAAU,CAAC,EAAI,IAAS,CACpB,AAAI,GAAY,CAAE,GAElB,EAAQ,iBAAkB,CAAE,KAAI,YAAW,MAAK,CAAC,CACrD,EAEA,QAAS,AAAC,GAAO,CACb,AAAI,GAAY,CAAE,GAElB,EAAQ,gBAAiB,CAAE,KAAI,WAAU,CAAC,CAC9C,EAEA,OAAQ,AAAC,GAAO,CACZ,EAAQ,eAAgB,CAAE,KAAI,WAAU,CAAC,CAC7C,EAEA,MAAO,AAAC,GAAO,CACX,GAAI,GAAY,CAAE,EAAG,OAErB,GAAM,GAAqB,EAAiB,CAAE,EAAE,GAEhD,EAAQ,cAAe,CAAE,IAAG,CAAC,CACjC,EAEA,IAAK,AAAC,GAAO,CACT,GAAI,IAAY,CAAE,EAElB,MAAO,GAAG,aAAa,UAAU,EAC3B,EAAG,aAAa,UAAU,EAE5B,EAAG,aAAa,SAAS,EACnB,EAAG,aAAa,SAAS,EACzB,EAAG,EACjB,EAEA,UAAW,EACf,CAAC,EAED,EAAQ,UAAW,CAAE,KAAI,WAAU,CAAC,CACxC,CAEA,YAAqB,EAAI,CACrB,MAAO,OAAO,GAAG,cAAiB,UACtC,CAEA,YAA2B,EAAI,CAC3B,MAAO,GAAG,aAAa,SAAS,CACpC,CCpGA,EAAG,SAAU,CAAC,CAAE,YAAW,aAAc,CACrC,GAAI,GAAO,EAAQ,KACnB,AAAI,CAAE,GAKN,eAAe,IAAM,CACjB,eAAe,IAAM,CACjB,GAAM,EAAW,EAAU,GAAI,CAAI,CACvC,CAAC,CACL,CAAC,CACL,CAAC,ECZD,EAAG,SAAU,CAAC,CAAE,YAAW,aAAc,CACrC,GAAe,EAAW,EAAQ,YAAc,CAAC,CAAC,CACtD,CAAC,EAED,YAAwB,EAAW,EAAY,CAC3C,EAAW,QAAQ,CAAC,CAAE,OAAM,SAAS,CAAC,EAAG,OAAO,GAAO,QAAS,CAC5D,AAAI,EAAM,GAAa,EAAW,EAAM,CAAM,EACzC,AAAI,EAAI,GAAW,EAAI,EAAM,CAAM,EACnC,GAAS,EAAW,EAAM,CAAM,CACzC,CAAC,CACL,CCRA,GAAI,IAAW,GAAI,IAKnB,EAAG,iBAAkB,CAAC,CAAE,KAAI,YAAW,UAAS,eAAgB,WAAW,IAAM,CAC7E,AAAI,EAAU,QAAU,UAIxB,EAAG,iBAAiB,SAAU,IAAM,CAIhC,GAAI,GAAc,EAAU,WAAW,WAAW,SAAS,EACrD,EAAU,OAAO,GACjB,EAAU,GAEZ,EAAU,GAAY,CAAE,EAE5B,GAAS,IAAI,EAAa,CAAO,CACrC,CAAC,CACL,CAAC,CAAC,EAEF,EAAG,SAAU,CAAC,CAAE,YAAW,aAAc,CACrC,EAAQ,IAAM,CACV,GAAS,KAAK,EAAU,GAAI,GAAK,EAAE,CAAC,EACpC,GAAS,OAAO,EAAU,EAAE,CAChC,CAAC,CACL,CAAC,EAED,YAAqB,EAAQ,CACzB,GAAI,GAAQ,CAAC,EAEb,SAAO,KAAK,EAAQ,CAAC,EAAI,IAAS,CAC9B,GAAI,EAAE,EAAO,SAAS,CAAE,EAExB,IAAI,EAAG,aAAa,aAAa,EAAG,MAAO,GAAK,EAEhD,AAAI,GAAmB,CAAE,EACrB,EAAM,KAAK,GAAa,CAAE,CAAC,EACpB,GAAmB,CAAE,GAC5B,EAAM,KAAK,GAAa,CAAE,CAAC,EAEnC,CAAC,EAEM,IAAM,CACT,KAAO,EAAM,OAAS,GAAG,EAAM,MAAM,EAAE,CAC3C,CACJ,CAEA,YAA4B,EAAI,CAC5B,GAAI,GAAM,EAAG,QAAQ,YAAY,EAIjC,MAFI,KAAQ,UACR,IAAQ,UAAY,EAAG,OAAS,UAChC,IAAQ,SAAY,GAAG,OAAS,YAAc,EAAG,OAAS,QAGlE,CAEA,YAA4B,EAAI,CAC5B,MAAO,CAAC,QAAS,UAAU,EAAE,SAAS,EAAG,QAAQ,YAAY,CAAC,CAClE,CAEA,YAAsB,EAAI,CACtB,GAAI,GAAO,EAAG,SACR,IAAM,CAAC,EACP,IAAM,EAAG,SAAW,GAE1B,SAAG,SAAW,GAEP,CACX,CAEA,YAAsB,EAAI,CACtB,GAAI,GAAO,EAAG,SACR,IAAM,CAAC,EACP,IAAM,EAAG,SAAW,GAE1B,SAAG,SAAW,GAEP,CACX,CCpFA,EAAG,iBAAkB,CAAC,CAAE,aAAc,CAClC,EAAQ,QAAQ,GAAU,CACtB,GAAI,GAAY,EAAO,UAEvB,GAA4B,EAAW,GAAS,CAC5C,EAAM,MAAM,QAAQ,CACxB,CAAC,CACL,CAAC,CACL,CAAC,EAID,EAAG,gBAAiB,CAAC,CAAE,WAAY,CAG/B,AAFc,GAAiB,CAAK,EAE5B,QAAQ,GAAU,CACtB,GAAI,GAAY,EAAO,UAEvB,GAA4B,EAAW,GAAS,CAC5C,GAA2B,EAAO,EAAW,CAAK,CACtD,CAAC,CACL,CAAC,CACL,CAAC,EAED,YAA0B,EAAO,CAC7B,GAAI,GAAU,CAAC,EAEf,SAAM,QAAQ,GAAQ,CAClB,EAAK,QAAQ,QAAQ,GAAU,CAC3B,EAAQ,KAAK,CAAM,CACvB,CAAC,CACL,CAAC,EAEM,CACX,CAEA,YAAoC,EAAO,EAAW,EAAkB,CACpE,GAAI,GAAO,GAAsB,EAAO,CAAS,EAE7C,EAAc,GAAsB,EAAO,CAAgB,EAE3D,EAAgB,EAAY,sBAAsB,CAAgB,EAGtE,EAAY,OAAO,CAAa,EAEhC,EAAK,IAAI,CAAa,EAGtB,EAAM,QAAQ,GAAQ,CAClB,AAAI,EAAK,MAAM,GAAG,EAAM,OAAO,CAAI,CACvC,CAAC,CACL,CAEA,YAA+B,EAAO,EAAW,CAC7C,OAAS,CAAC,EAAK,IAAS,GAAM,QAAQ,EAClC,GAAI,EAAK,aAAa,CAAS,EAAG,MAAO,EAEjD,CAEA,YAAqC,EAAW,EAAU,CACtD,GAAgB,EAAW,GAAS,CAChC,AAAI,IAAiB,CAAK,GAAK,GAAyB,CAAK,IACzD,EAAS,CAAK,CAEtB,CAAC,CACL,CAEA,YAA0B,EAAW,CAIjC,MAAO,CAAC,CAFI,AADD,EAAU,SAAS,KACb,KAGrB,CAEA,YAAkC,EAAW,CAIzC,MAAO,CAAC,CAFO,AADJ,EAAU,SAAS,KACV,QAGxB,CAEA,YAAyB,EAAW,EAAU,CAC1C,EAAU,SAAS,QAAQ,GAAS,CAChC,EAAS,CAAK,EAEd,GAAgB,EAAO,CAAQ,CACnC,CAAC,CACL,CC1FA,EAAG,SAAU,CAAC,CAAE,aAAc,CAC1B,EAAQ,CAAC,CAAE,aAAc,CACrB,GAAI,GAAW,EAAQ,SAEvB,GAAI,CAAE,EAAU,OAGhB,GAAI,GAAY,OAAO,WAAa,OAAO,IAEvC,EAAM,EAAU,gBAChB,GAAa,EAAS,QAAS,EAAS,WAAW,CACvD,EAEI,EAAgB,SAAS,cAAc,GAAG,EAE9C,EAAc,MAAM,QAAU,OAC9B,EAAc,KAAO,EACrB,EAAc,SAAW,EAAS,KAElC,SAAS,KAAK,YAAY,CAAa,EAEvC,EAAc,MAAM,EAEpB,WAAW,UAAW,CAClB,EAAU,gBAAgB,CAAG,CACjC,EAAG,CAAC,CACR,CAAC,CACL,CAAC,EAED,YAAsB,EAAS,EAAc,GAAI,EAAY,IAAK,CAC9D,GAAM,GAAiB,KAAK,CAAO,EAC7B,EAAa,CAAC,EAEpB,AAAI,IAAgB,MAAM,GAAc,IAExC,OAAS,GAAS,EAAG,EAAS,EAAe,OAAQ,GAAU,EAAW,CACtE,GAAI,GAAQ,EAAe,MAAM,EAAQ,EAAS,CAAS,EAEvD,EAAc,GAAI,OAAM,EAAM,MAAM,EAExC,OAAS,GAAI,EAAG,EAAI,EAAM,OAAQ,IAC9B,EAAY,GAAK,EAAM,WAAW,CAAC,EAGvC,GAAI,GAAY,GAAI,YAAW,CAAW,EAE1C,EAAW,KAAK,CAAS,CAC7B,CAEA,MAAO,IAAI,MAAK,EAAY,CAAE,KAAM,CAAY,CAAC,CACrD,CClDA,GAAI,IAAgC,GAAI,SAEpC,GAAwB,GAAI,SAEhC,EAAG,iBAAkB,CAAC,CAAE,eAAgB,CACpC,GAAI,GAAO,EAAU,SAAS,KAG9B,AAAI,EAAK,aAAe,QAExB,IAAsB,IAAI,CAAS,EAI/B,EAAK,eAAiB,QAAa,EAAK,eAAiB,IACzD,GAA8B,IAAI,CAAS,EAEnD,CAAC,EAED,EAAG,iBAAkB,CAAC,CAAE,aAAc,CAClC,EAAQ,QAAQ,GAAU,CAEtB,AAAI,CAAE,GAAsB,IAAI,EAAO,SAAS,GAEhD,CAAI,GAA8B,IAAI,EAAO,SAAS,EAClD,GAAO,QAAU,GAEjB,GAA8B,OAAO,EAAO,SAAS,GAErD,EAAO,QAAU,GAIrB,GAAsB,OAAO,EAAO,SAAS,EACjD,CAAC,CACL,CAAC,EChCD,EAAG,SAAU,CAAC,CAAE,YAAW,UAAS,aAAc,CAC9C,GAAI,GAAc,EAAQ,IAE1B,AAAI,CAAE,GAEN,OAAO,QAAQ,CAAW,EAAE,QAAQ,CAAC,CAAC,EAAK,KAAW,CAClD,GAAI,CAAE,OAAM,KAAI,MAAK,aAAY,UAAW,GAA0B,EAAK,CAAK,EAEhF,AAAM,GAAI,GAAK,GAEf,GAAI,GAAe,CAAC,GAAO,KAAM,MAAS,EAAE,SAAS,CAAM,EAAI,EAAQ,EAAU,UAAW,CAAI,EAAI,EAEhG,CAAE,UAAS,OAAM,OAAQ,GAAM,EAAI,EAAc,EAAY,CAAM,EAEvE,GAAI,IAAQ,UAAW,CACnB,GAAI,GAAkB,EAAO,OAAO,IAAM,CACtC,EAAQ,EAAQ,EAAU,SAAU,CAAI,CAAC,CAC7C,CAAC,EAED,EAAQ,IAAM,EAAO,QAAQ,CAAe,CAAC,CACjD,SAAW,IAAQ,OAAQ,CACvB,GAAI,GAAsB,EAAG,SAAU,CAAC,CAAE,UAAW,EAAiB,aAAc,CAChF,GAAI,IAAc,EAAiB,OAEnC,GAAI,GAAc,EAAQ,EAAU,UAAW,CAAI,EAEnD,EAAQ,IAAM,CACV,GAAI,GAAa,EAAQ,EAAU,UAAW,CAAI,EAElD,AAAI,KAAK,UAAU,CAAW,IAAM,KAAK,UAAU,CAAU,GAE7D,EAAK,CAAU,CACnB,CAAC,CACL,CAAC,EAEG,EAAmB,EAAI,KAAM,IAAY,CACzC,KAAM,GAAU,MAAM,IAAI,EAAM,CAAQ,EAGxC,SAAS,iBAAiB,OAAO,EAAE,QAAQ,GAAM,CAC7C,EAAG,qBAAuB,EAAG,oBAAoB,EAAG,SAAS,IAAI,CAAC,CACtE,CAAC,CACL,CAAC,EAED,EAAQ,IAAM,CACV,EAAoB,EACpB,EAAiB,CACrB,CAAC,CACL,CACJ,CAAC,CACL,CAAC,EAED,YAAmC,EAAK,EAAO,CAC3C,GAAI,GAAW,CAAE,IAAK,UAAW,WAAY,EAAM,EAEnD,MAAI,OAAO,IAAU,SACV,CAAC,GAAG,EAAU,KAAM,EAAO,GAAI,CAAM,EAIrC,CAAC,GAFa,CAAC,GAAG,EAAU,KAAM,EAAK,GAAI,CAAI,EAE3B,GAAG,CAAM,CAE5C,CChEA,EAAG,UAAW,CAAC,CAAE,aAAc,CAC3B,AAAI,OAAO,MACP,GAAQ,QAAQ,eAAiB,OAAO,KAAK,SAAS,EAE9D,CAAC,EAED,EAAG,SAAU,CAAC,CAAE,YAAW,aAAc,CAGrC,AAFgB,GAAQ,WAAa,CAAC,GAE5B,QAAQ,GAAS,CACvB,GAAI,EAAM,WAAW,MAAM,EAAG,CAC1B,GAAI,MAAO,QAAO,KAAS,IAAa,CACpC,QAAQ,KAAK,8BAA8B,EAE3C,MACJ,CAEA,GAAI,GAAc,EAAM,MAAM,mBAAmB,EAEjD,AAAI,EAAY,IAAM,SAClB,EAAY,OAAO,EAAG,EAAG,UAAW,MAAS,EAG7C,EAAY,IAAM,gBAClB,EAAY,KAAK,OAAW,MAAS,EAGzC,GAAI,CACA,EACA,EACA,EACA,EACA,EACA,EACA,GACA,EAEJ,GAAI,CAAC,UAAW,UAAW,kBAAkB,EAAE,SAAS,CAAY,EAAG,CACnE,GAAI,GAAU,GAAK,GAAa,EAAW,EAAO,CAAC,CAAC,CAAC,EAErD,OAAO,KAAK,GAAc,CAAO,EAAE,OAAO,EAAY,CAAO,EAE7D,EAAU,WAAW,IAAM,CACvB,OAAO,KAAK,GAAc,CAAO,EAAE,cAAc,EAAY,CAAO,CACxE,CAAC,CACL,SAAW,GAAgB,WACvB,GAAI,CAAC,OAAQ,UAAW,SAAS,EAAE,SAAS,CAAU,EAClD,OAAO,KAAK,KAAK,CAAO,EAAE,GAAY,GAAK,CACvC,GAAa,EAAW,EAAO,CAAC,CAAC,CAAC,CACtC,CAAC,MAGC,CACF,GAAI,GAAU,GAAK,GAAa,EAAW,EAAO,CAAC,CAAC,CAAC,EAErD,OAAO,KAAK,KAAK,CAAO,EAAE,OAAO,EAAY,CAAO,EAEpD,EAAU,WAAW,IAAM,CACvB,OAAO,KAAK,aAAa,CAAO,CACpC,CAAC,CACL,KACG,AAAI,IAAgB,eACvB,OAAO,KAAK,QAAQ,CAAO,EAAE,aAAa,GAAgB,CACtD,GAAa,EAAW,EAAO,CAAC,CAAY,CAAC,CACjD,CAAC,EAID,QAAQ,KAAK,qCAAqC,CAE1D,CACJ,CAAC,CACL,CAAC,ECzED,GAAI,IAA4B,GAAI,SAEpC,EAAG,iBAAkB,CAAC,CAAE,eAAgB,CAIpC,AAAI,AAHO,EAAU,SAAS,KAGrB,UAAY,IAErB,GAA0B,IAAI,CAAS,CAC3C,CAAC,EAED,EAAG,iBAAkB,CAAC,CAAE,aAAc,CAClC,EAAQ,QAAQ,GAAU,CAEtB,AAAI,CAAE,GAA0B,IAAI,EAAO,SAAS,GAEpD,GAAO,QAAU,GACrB,CAAC,CACL,CAAC,ECnBD,GAAsB,GAAK,OAAO,SAAS,mBAAmB,EAE9D,SAAS,iBAAiB,kBAAmB,GAAK,GAAa,oBAAqB,CAAC,CAAC,EACtF,SAAS,iBAAiB,oBAAqB,GAAK,GAAa,sBAAuB,CAAC,CAAC,EAC1F,SAAS,iBAAiB,mBAAoB,GAAK,GAAa,qBAAsB,CAAC,CAAC,EAExF,YAAsB,EAAM,EAAU,CAClC,GAAI,GAAQ,GAAI,aAAY,EAAM,CAAE,WAAY,GAAM,QAAS,GAAM,OAAQ,EAAS,MAAO,CAAC,EAE9F,SAAS,cAAc,CAAK,EAExB,EAAM,kBACN,EAAS,eAAe,CAEhC,CAEO,YAAuC,EAAS,EAAK,EAAI,CAG5D,AAFoB,EAAQ,sBAGxB,OAAO,SAAS,CAAG,EAEnB,EAAG,CAEX,CAEA,aAAiC,CAG7B,MAFO,YAAS,cAAc,wBAAwB,GAElD,OAAO,sBAAwB,OAAO,qBAAqB,cAAgB,GAGnF,CC9BA,EAAG,SAAU,CAAC,CAAE,aAAc,CAC1B,GAAI,CAAE,EAAQ,SAAa,OAE3B,GAAI,GAAM,EAAQ,SAElB,GAA8B,EAAS,EAAK,IAAM,CAC9C,OAAO,SAAS,KAAO,CAC3B,CAAC,CACL,CAAC,ECPD,EAAG,cAAe,CAAC,CAAE,QAAS,CAC1B,EAAG,eAAiB,EACxB,CAAC,EAED,EAAU,aAAc,CAAC,CAAE,KAAI,YAAW,YAAW,aAAc,CAC/D,GAAI,GAAa,EAAO,SAAS,CAAE,MAAO,GAAG,cAA8B,CAAC,EAG5E,EAAO,KAAK,EAAI,CACZ,CAAC,EAAU,QAAQ,QAAQ,QAAS,IAAI,GAAI,GAC5C,UAAW,CAAE,MAAO,GAAW,KAAM,CACzC,CAAC,EAGD,EAAG,gBAAkB,WAAW,IAAM,EAAW,MAAQ,EAAI,EAE7D,GAAI,GAAW,CAAC,EAEhB,EAAS,KAAK,EAAG,iBAAkB,CAAC,CAAE,KAAI,UAAW,CAEjD,EAAK,EAGL,EAAG,iBAAiB,gBAAiB,IAAM,CAEvC,EAAG,OAAO,CACd,CAAC,EAGD,EAAW,MAAQ,GAEnB,EAAS,KAAK,EAAG,QAAS,CAAC,CAAE,UAAW,KAAqB,CACzD,AAAI,IAAmB,GAIvB,GAAG,OAAO,EAEV,EAAS,QAAQ,GAAK,EAAE,CAAC,EAC7B,CAAC,CAAC,CACN,CAAC,CAAC,EAEF,EAAQ,IAAM,EAAS,QAAQ,GAAK,EAAE,CAAC,CAAC,CAC5C,CAAC,EC7CD,GAAI,IAAuB,GAAI,IAsCxB,YAAwC,EAAW,EAAU,CAOhE,GAAqB,KAAK,EAAW,GAAoB,CACrD,EAAiB,SAAS,EAC1B,EAAiB,SAAW,IAAM,CAAE,CACxC,CAAC,EAED,EAAS,CACb,CChDA,EAAG,iBAAkB,CAAC,CAAE,KAAI,YAAW,UAAS,eAAgB,CAE5D,GADI,CAAC,WAAY,UAAW,QAAS,OAAQ,UAAW,OAAQ,SAAU,KAAM,OAAQ,MAAO,SAAU,OAAO,EAAE,SAAS,EAAU,KAAK,GACtI,GAAiC,EAAU,KAAK,EAAG,OAEvD,GAAI,GAAY,EAAU,QAAQ,QAAQ,QAAS,OAAO,EAG1D,AAAI,EAAU,QAAU,UAAY,CAAE,EAAU,UAAU,SAAS,SAAS,GACxE,GAAY,EAAY,YAG5B,GAAI,GAAiB,EAAO,KAAK,EAAI,CACjC,CAAC,GAAW,EAAG,CACX,GAAI,GAAU,IAAM,CAChB,GAA+B,EAAW,IAAM,CAE5C,EAAO,SAAS,EAAI,SAAS,EAAU,WAAY,CAAE,MAAO,CAAE,OAAQ,CAAE,CAAC,CAAC,CAC9E,CAAC,CACL,EAGA,AAAI,EAAG,mBACH,EAAG,mBAAmB,IAAM,CACxB,EAAQ,CACZ,EAAG,IAAM,CACL,EAAE,yBAAyB,CAC/B,CAAC,EAED,EAAQ,CAEhB,CACJ,CAAC,EAED,EAAQ,CAAc,CAC1B,CAAC,ECrCD,EAAO,gBAAgB,IAAM,mBAAmB,EAChD,EAAO,gBAAgB,IAAM,2BAA2B,EAExD,EAAO,cACH,EAAO,gBAAgB,GAAM,CACzB,AAAI,EAAG,aAAa,eAAe,EAC/B,EAAO,KAAK,EAAI,CAAE,CAAC,cAAe,EAAK,CAAC,EACjC,EAAG,aAAa,qBAAqB,GAC5C,EAAO,KAAK,EAAI,CAAE,CAAC,oBAAqB,EAAK,CAAC,CAEtD,CAAC,CACL,EAEA,SAAS,iBAAiB,oBAAqB,IAAM,CAGjD,SAAS,IAAI,EAAE,QAAQ,GAAa,CAChC,EAAU,oCAAoC,CAClD,CAAC,CACL,CAAC,ECnBD,EAAU,UAAW,CAAC,CAAE,KAAI,eAAgB,CACxC,GAAI,GAAU,EAAU,WACpB,EAAe,EAAU,UAAU,SAAS,QAAQ,EAGxD,EAAU,EAAQ,WAAW,MAAO;AAAA,CAAI,EAEpC,IAAY,IAAI,GAAU,iBAE9B,EAAG,mBAAqB,CAAC,EAAQ,IAAY,CACzC,GAAI,EAAc,CACd,GAAI,CAAC,EAAU,GAAY,EAAQ,MAAM,GAAG,EAE5C,AAAM,EAKF,AAAI,AAFQ,OAAO,CAAQ,IAEb,EACV,EAAO,EAEP,EAAQ,EAPZ,QAAQ,KAAK,6DAA6D,CAUlF,KACI,AAAI,SAAQ,CAAO,EAAG,EAAO,EACxB,EAAQ,CAErB,CACJ,CAAC,EC5BD,EAAO,gBAAgB,IAAM,kBAAkB,EAE/C,GAAI,IAAgB,GAAI,KAExB,SAAS,iBAAiB,qBAAsB,IAAM,CAClD,GAAc,QAAQ,GAAK,EAAE,GAAI,KAAI,OAAO,SAAS,IAAI,CAAC,CAAC,CAC/D,CAAC,EAED,GAAgB,UAAW,CAAC,CAAE,KAAI,YAAW,aAAc,CACvD,GAAI,GAAa,EAAU,WAEvB,EAAU,CACV,MAAO,EAAU,UAAU,SAAS,OAAO,EAC3C,OAAQ,EAAU,UAAU,SAAS,QAAQ,CACjD,EAMA,GAHI,EAAW,WAAW,GAAG,GAGzB,CAAE,EAAG,aAAa,MAAM,EAAG,OAE/B,GAAI,GAAO,EAAG,aAAa,MAAM,EAE7B,EAAU,GAAI,KAAI,EAAM,OAAO,SAAS,IAAI,EAE5C,EAAU,EAAW,MAAM,GAAG,EAAE,OAAO,MAAM,EAE7C,EAAiB,GAAO,CACxB,AAAI,GAAY,EAAS,EAAK,CAAO,EACjC,EAAG,UAAU,IAAI,GAAG,CAAO,EAE3B,EAAG,UAAU,OAAO,GAAG,CAAO,CAEtC,EAEA,EAAe,GAAI,KAAI,OAAO,SAAS,IAAI,CAAC,EAE5C,GAAc,IAAI,EAAI,CAAc,EAEpC,EAAQ,IAAM,GAAc,OAAO,CAAE,CAAC,CAC1C,CAAC,EAED,YAAqB,EAAS,EAAW,EAAS,CAE9C,GAAI,EAAQ,WAAa,EAAU,SAAU,MAAO,GAGpD,GAAI,GAAW,EAAQ,OAAS,EAAQ,SAAW,EAAQ,SAAS,QAAQ,OAAQ,EAAE,EAClF,EAAa,EAAQ,OAAS,EAAU,SAAW,EAAU,SAAS,QAAQ,OAAQ,EAAE,EAE5F,GAAI,EAAQ,MACR,MAAO,KAAa,EAGxB,GAAI,GAAmB,EAAS,MAAM,GAAG,EACrC,EAAqB,EAAW,MAAM,GAAG,EAG7C,OAAS,GAAI,EAAG,EAAI,EAAiB,OAAQ,IACzC,GAAI,EAAiB,KAAO,EAAmB,GAAI,MAAO,GAG9D,MAAO,EACX,CClEO,YAAqC,EAAI,EAAW,EAAU,EAAgB,KAAM,CAGvF,GAFA,EAAW,EAAU,UAAU,SAAS,QAAQ,EAAI,CAAE,EAAW,EAE7D,EAAU,UAAU,SAAS,OAAO,EAAG,CACvC,GAAI,GAAU,EAAU,WAAW,MAAM,GAAG,EAAE,OAAO,MAAM,EAE3D,AAAI,EACA,EAAG,UAAU,IAAI,GAAG,CAAO,EAE3B,EAAG,UAAU,OAAO,GAAG,CAAO,CAEtC,SAAW,EAAU,UAAU,SAAS,MAAM,EAC1C,AAAI,EACA,EAAG,aAAa,EAAU,WAAY,EAAI,EAE1C,EAAG,gBAAgB,EAAU,UAAU,MAExC,CACH,GAAI,GAAQ,GAAiB,OACxB,iBAAiB,EAAI,IAAI,EACzB,iBAAiB,SAAS,EAE3B,EAAW,CAAC,SAAU,QAAS,QAAS,OAAQ,OAAQ,aAAa,EACpE,OAAO,GAAK,EAAU,UAAU,SAAS,CAAC,CAAC,EAAE,IAAM,eAIxD,EAAW,EAAU,UAAU,SAAS,QAAQ,GAAK,CAAE,EACjD,EAAQ,EAEd,EAAG,MAAM,QAAU,EAAW,EAAU,MAC5C,CACJ,CC9BA,GAAI,IAAkB,GAAI,KACtB,GAAiB,GAAI,KAEzB,OAAO,iBAAiB,UAAW,IAAM,GAAgB,QAAQ,GAAK,EAAE,CAAC,CAAC,EAC1E,OAAO,iBAAiB,SAAU,IAAM,GAAe,QAAQ,GAAK,EAAE,CAAC,CAAC,EAExE,EAAU,UAAW,CAAC,CAAE,KAAI,YAAW,aAAc,CACjD,GAAI,GAAa,IAAM,GAA4B,EAAI,EAAW,EAAI,EAClE,EAAY,IAAM,GAA4B,EAAI,EAAW,EAAK,EAEtE,GAAgB,IAAI,CAAU,EAC9B,GAAe,IAAI,CAAS,EAE5B,EAAQ,IAAM,CACV,GAAgB,OAAO,CAAU,EACjC,GAAe,OAAO,CAAS,CACnC,CAAC,CACL,CAAC,ECfD,EAAU,UAAW,CAAC,CAAE,KAAI,YAAW,YAAW,aAAc,CAC5D,GAAI,CAAE,UAAS,YAAa,GAAW,CAAE,EAErC,CAAC,EAAO,GAAc,GAAW,CAAS,EAE1C,EAAW,GAA4B,EAAW,EAAS,EAAU,CACrE,IAAM,EAAM,IAAM,GAA4B,EAAI,EAAW,EAAI,CAAC,EAClE,IAAM,EAAW,IAAM,GAA4B,EAAI,EAAW,EAAK,CAAC,CAC5E,CAAC,EAEG,EAAW,GAA+B,EAAW,EAAS,CAC9D,IAAM,EAAM,IAAM,GAA4B,EAAI,EAAW,EAAI,CAAC,EAClE,IAAM,EAAW,IAAM,GAA4B,EAAI,EAAW,EAAK,CAAC,CAC5E,CAAC,EAED,EAAQ,IAAM,CACV,EAAS,EACT,EAAS,CACb,CAAC,CACL,CAAC,EAED,YAAoB,EAAW,CAC3B,GAAI,CAAE,EAAU,UAAU,SAAS,OAAO,GAAK,EAAU,UAAU,SAAS,MAAM,EAAG,MAAO,CAAC,GAAK,EAAE,EAAG,GAAK,EAAE,CAAC,EAE/G,GAAI,GAAW,IAEX,EAAiB,CACjB,SAAY,GACZ,QAAW,IACX,MAAS,IACT,QAAW,IACX,KAAQ,IACR,OAAU,IACV,QAAW,GACf,EAEA,OAAO,KAAK,CAAc,EAAE,KAAK,GAAO,CACpC,GAAI,EAAU,UAAU,SAAS,CAAG,EAChC,SAAW,EAAe,GAEnB,EAEf,CAAC,EAED,GAAI,GACA,EAAU,GAEd,MAAO,CACH,AAAC,GAAa,CACV,EAAU,WAAW,IAAM,CACvB,EAAS,EAET,EAAU,EACd,EAAG,CAAQ,CACf,EACA,KAAO,IAAa,CAChB,AAAI,EACA,MAAM,GAAS,EACf,EAAU,IAEV,aAAa,CAAO,CAE5B,CACJ,CACJ,CAEA,YAAqC,EAAW,EAAS,EAAU,CAAE,EAAc,GAAc,CAC7F,MAAO,GAAG,SAAU,CAAC,CAAE,UAAW,EAAY,OAAQ,EAAS,aAAc,CACzE,AAAI,IAAe,GAEf,GAAQ,OAAS,GAAK,GAAgB,EAAS,CAAO,IAAM,GAEhE,GAAa,EAEb,EAAQ,IAAM,CACV,EAAW,CACf,CAAC,GACL,CAAC,CACL,CAEA,YAAwC,EAAW,EAAS,CAAE,EAAc,GAAc,CACtF,GAAI,GAAgB,GAAK,CACrB,GAAI,CAAE,KAAI,YAAa,EAAE,OAGzB,MADI,KAAO,EAAU,IACjB,EAAQ,OAAS,GAAK,CAAE,EAAQ,IAAI,GAAK,EAAE,MAAM,EAAE,SAAS,CAAQ,CAG5E,EAEI,EAAW,GAAO,OAAQ,wBAAyB,GAAK,CACxD,AAAI,EAAc,CAAC,GAEnB,EAAa,CACjB,CAAC,EAEG,EAAW,GAAO,OAAQ,yBAA0B,GAAK,CACzD,AAAI,EAAc,CAAC,GAEnB,EAAW,CACf,CAAC,EAEG,EAAW,GAAO,OAAQ,wBAAyB,GAAK,CACxD,AAAI,EAAc,CAAC,GAEnB,EAAW,CACf,CAAC,EAED,MAAO,IAAM,CACT,EAAS,EACT,EAAS,EACT,EAAS,CACb,CACJ,CAEA,YAAyB,EAAS,EAAS,CACvC,GAAI,CAAE,UAAS,SAAU,EAEzB,MAAO,GAAQ,KAAK,CAAC,CAAE,SAAQ,YAAa,CACxC,GAAI,EACA,MAAO,GAAM,KAAK,CAAC,CAAE,SAAQ,OAAQ,KAC1B,IAAW,GACX,IAAW,GAAU,KAAK,UAAU,CAAY,CAAC,CAC3D,EAgBL,GAbwB,OAAO,KAAK,CAAO,EAAE,KAAK,GAE1C,EAAS,SAAS,GAAG,GAGjB,AAFe,EAAS,MAAM,GAAG,EAAE,KAElB,EAAe,GAGjC,IAAa,CACvB,GAIG,EAAM,IAAI,GAAK,EAAE,MAAM,EAAE,SAAS,CAAM,EAAG,MAAO,EAC1D,CAAC,CACL,CAEA,YAAoB,EAAI,CACpB,GAAI,GAAa,GAAc,CAAE,EAE7B,EAAU,CAAC,EAEX,EAAW,GAEf,GAAI,EAAW,IAAI,QAAQ,EAAG,CAC1B,GAAI,GAAY,EAAW,IAAI,QAAQ,EAEnC,EAAM,EAAU,WAEpB,AAAI,EAAU,UAAU,SAAS,QAAQ,GAAG,GAAW,IAEvD,AAAI,EAAI,SAAS,GAAG,GAAK,EAAI,SAAS,GAAG,EACrC,EAAQ,KAAK,CAAE,OAAQ,EAAU,OAAQ,OAAQ,GAAU,KAAK,UAAU,EAAU,MAAM,CAAC,CAAE,CAAC,EAC3F,AAAI,EAAI,SAAS,GAAG,EACvB,EAAI,MAAM,GAAG,EAAE,IAAI,GAAK,EAAE,KAAK,CAAC,EAAE,QAAQ,GAAU,CAChD,EAAQ,KAAK,CAAE,QAAO,CAAC,CAC3B,CAAC,EAED,EAAQ,KAAK,CAAE,OAAQ,CAAI,CAAC,CAEpC,KAAO,CAGH,GAAI,GAAqC,CAAE,OAAQ,QAAS,UAAW,SAAU,UAAW,OAAQ,SAAU,MAAO,IAAK,EAE1H,EACK,IAAI,EACJ,OAAO,GAAK,CAAE,EAAmC,SAAS,EAAE,KAAK,CAAC,EAClE,IAAI,GAAK,EAAE,WAAW,MAAM,GAAG,EAAE,EAAE,EACnC,QAAQ,GAAU,EAAQ,KAAK,CAAE,QAAO,CAAC,CAAC,CACnD,CAEA,MAAO,CAAE,UAAS,UAAS,CAC/B,CAEA,YAAmB,EAAS,CACxB,MAAO,MAAK,mBAAmB,CAAO,CAAC,CAC3C,CCxLA,EAAU,SAAU,CAAC,CAAC,KAAI,YAAW,aAAc,CAC/C,GAAI,CAAE,aAAY,aAAc,EAE5B,EAAM,EAAG,SAAU,CAAC,CAAE,OAAM,UAAS,aAAc,CACnD,AAAI,IAAS,GAEb,CAAI,EAAU,SAAS,SAAS,GAAK,EACjC,EAAG,UAAY,EAEf,EAAG,UAAY,EAAG,UAAY,EAEtC,CAAC,EAED,EAAQ,CAAG,CACf,CAAC,EAED,EAAG,UAAW,CAAC,CAAE,aAAc,CAC3B,EAAQ,GAAiB,CACrB,GAAI,GAAW,EAAc,SAE7B,AAAI,CAAE,EAAS,QAAQ,IAAI,mBAAmB,GAE9C,GAAc,SAAW,CACrB,GAAI,GACJ,WAAY,GACZ,OAAQ,IAER,KAAM,OAAO,CACT,GAAI,GAAgB,KAAM,IAAsC,EAAU,GAAY,CAClF,EAAQ,SAAU,CAAQ,CAC9B,CAAC,EAED,MAAI,IAAkB,CAAa,GAC/B,MAAK,GAAK,IAGP,CACX,CACJ,EACJ,CAAC,CACL,CAAC,EAED,kBAAqD,EAAU,EAAU,CACrE,GAAI,GAAS,EAAS,KAAK,UAAU,EACjC,EAAoB,GAExB,OAAa,CACT,GAAI,CAAE,OAAM,MAAO,GAAU,KAAM,GAAO,KAAK,EAG3C,EAAS,AADC,GAAI,eACG,OAAO,CAAK,EAE7B,CAAE,EAAS,GAAc,GAAqB,EAAoB,CAAM,EAQ5E,GANA,EAAQ,QAAQ,GAAU,CACtB,EAAS,CAAM,CACnB,CAAC,EAED,EAAoB,EAEhB,EAAM,MAAO,EACrB,CACJ,CAEA,YAA8B,EAAK,CAC/B,GAAI,GAAQ,wCAER,EAAU,EAAI,MAAM,CAAK,EAEzB,EAAS,CAAC,EAEd,GAAI,EACA,OAAS,GAAI,EAAG,EAAI,EAAQ,OAAQ,IAChC,EAAO,KAAK,KAAK,MAAM,EAAQ,EAAE,EAAE,IAAI,EAI/C,GAAI,GAAY,EAAI,QAAQ,EAAO,EAAE,EAErC,MAAO,CAAE,EAAQ,CAAU,CAC/B,CClFA,EAAU,UAAW,CAAC,CAAE,KAAI,eAAgB,CACxC,AAAI,EAAU,UAAU,SAAS,MAAM,EACnC,EAAG,wBAA0B,GAE7B,EAAG,mBAAqB,EAEhC,CAAC,ECND,EAAU,SAAU,CAAC,CAAE,KAAI,eAAgB,CACvC,AAAI,EAAU,UAAU,SAAS,MAAM,EACnC,EAAG,uBAAyB,GAE5B,EAAG,kBAAoB,EAE/B,CAAC,ECHD,GAAI,IAAgC,GAAI,IAExC,EAAG,SAAU,CAAC,CAAE,YAAW,aAAc,CACrC,EAAQ,IAAM,CACV,WAAW,IAAM,CACb,GAA8B,KAAK,EAAW,GAAK,EAAE,EAAK,CAAC,CAC/D,CAAC,CACL,CAAC,CACL,CAAC,EAED,EAAU,QAAS,CAAC,CAAE,KAAI,YAAW,eAAgB,CACjD,GAAI,GAAU,GAAa,CAAE,EAEzB,EAAQ,OAAO,SAAS,CAAE,MAAO,EAAM,CAAC,EAExC,EAAa,GAEb,EAAiB,EAAG,MAAM,QAE1B,EAAoB,AAAC,GAAY,CACjC,GAA4B,EAAI,EAAW,EAAS,CAAc,EAElE,EAAa,CACjB,EAEA,GAA8B,IAAI,EAAW,CAAiB,EAE9D,OAAO,OAAO,IAAM,CAChB,GAAI,GAAU,GAEd,GAAI,EAAQ,SAAW,EACnB,EAAU,KAAK,UAAU,EAAU,SAAS,IAAM,KAAK,UAAU,EAAU,QAAQ,MAEnF,QAAS,GAAI,EAAG,EAAI,EAAQ,QACpB,GAD4B,IAAK,CAGrC,GAAI,GAAS,EAAQ,GAErB,EAAU,KAAK,UAAU,EAAQ,EAAU,UAAW,CAAM,CAAC,IAAM,KAAK,UAAU,EAAQ,EAAU,SAAU,CAAM,CAAC,CACzH,CAGJ,AAAI,IAAe,GACf,EAAkB,CAAO,EAG7B,EAAa,CACjB,CAAC,CACL,CAAC,EAED,YAAsB,EAAI,CACtB,GAAI,GAAa,GAAc,CAAE,EAC7B,EAAU,CAAC,EAEf,MAAI,GAAW,IAAI,OAAO,GACtB,EAAQ,KAAK,EAAW,IAAI,OAAO,EAAE,UAAU,EAG/C,EAAW,IAAI,QAAQ,GACvB,GAAU,EAAQ,OACd,EACC,IAAI,QAAQ,EACZ,WAAW,MAAM,GAAG,EACpB,IAAI,GAAK,EAAE,KAAK,CAAC,CACtB,GAGG,CACX,CCnEA,EAAU,QAAS,CAAC,CAAE,KAAI,YAAW,YAAW,aAAc,CAC1D,GAAI,CAAE,aAAY,aAAc,EAEhC,GAAI,CAAE,EACF,MAAO,SAAQ,KAAK,6CAA8C,CAAE,EAGxE,GAAI,GAA2B,EAAW,CAAU,EAChD,MAAO,SAAQ,KAAK,0BAA0B,EAAW,6CAA6C,EAAU,KAAK,IAAK,CAAE,EAIhI,GAAI,EAAG,MAAQ,EAAG,KAAK,YAAY,IAAM,OACrC,MAAO,IAAiB,EAAI,EAAY,EAAW,CAAO,EAG9D,GAAI,GAAS,EAAU,SAAS,MAAM,EAClC,EAAS,EAAU,SAAS,MAAM,GAAK,EAAU,SAAS,QAAQ,EAClE,EAAS,EAAU,SAAS,MAAM,EAClC,EAAc,EAAU,SAAS,UAAU,EAG3C,EAAS,EAAW,WAAW,SAAS,EACtC,IAAM,EAAU,MAAM,QAAQ,QAAQ,EACtC,IAAM,EAAU,MAAM,QAAQ,EAIhC,EAAkB,GAAY,CAAE,GAAK,CAAE,GAAe,EACpD,GAAS,EAAQ,GAAG,EACpB,EAEN,EAAO,KAAK,EAAI,CACZ,CAAC,YAAa,CACV,GAAU,EAAO,CACrB,EACA,CAAC,UAAW,CACR,GAAU,EAAO,CACrB,EACA,CAAC,UAAY,GAAgB,CAAS,IAAK,CACvC,MAAO,CACH,KAAM,CACF,MAAO,GAAQ,EAAU,MAAO,CAAU,CAC9C,EACA,IAAI,EAAO,CACP,GAAQ,EAAU,MAAO,EAAY,CAAK,EAE1C,GAAW,CAAE,GAAY,CAAE,GAAW,EAAgB,CAC1D,CACJ,CACJ,CACJ,CAAC,CACL,CAAC,EAED,YAAyB,EAAW,CAKhC,MAJA,GAAY,EAAU,OAAO,GAAK,CAAE,CAChC,OAAQ,OACZ,EAAE,SAAS,CAAC,CAAC,EAET,EAAU,SAAW,EAAU,GAE5B,IAAM,EAAU,KAAK,GAAG,CACnC,CAEA,YAAqB,EAAI,CACrB,MACI,CAAC,QAAS,UAAU,EAAE,SAAS,EAAG,QAAQ,YAAY,CAAC,GACvD,CAAC,CAAC,WAAY,OAAO,EAAE,SAAS,EAAG,IAAI,CAE/C,CAUA,YAAoC,EAAW,EAAU,CACrD,GAAI,EAAS,WAAW,SAAS,EAAG,CAChC,GAAI,GAAS,EAAiB,EAAU,GAAG,cAAe,EAAK,EAE/D,MAAM,GAEC,GAA2B,EAAQ,EAAS,MAAM,UAAU,EAAE,EAAE,EAFlD,EAGzB,CAEA,GAAI,GAAe,EAAS,MAAM,GAAG,EAAE,GAEvC,MAAO,CAAE,OAAO,KAAK,EAAU,SAAS,EAAE,SAAS,CAAY,CACnE,CAEA,YAAkB,EAAM,EAAM,CAC1B,GAAI,GAEJ,MAAO,WAAW,CAChB,GAAI,GAAU,KAAM,EAAO,UAEvB,EAAQ,UAAW,CACjB,EAAU,KAEV,EAAK,MAAM,EAAS,CAAI,CAC9B,EAEA,aAAa,CAAO,EAEpB,EAAU,WAAW,EAAO,CAAI,CAClC,CACJ,CChHA,EAAU,OAAQ,CAAC,CAAE,KAAI,eAAgB,CACrC,GAAI,GAAa,EAAU,YAAc,WAEzC,EAAO,SAAS,EAAI,SAAS,GAAY,CAC7C,CAAC,ECJD,EAAU,OAAQ,CAAC,CAAE,KAAI,eAAgB,CACrC,GAAI,GAAW,GAAoB,EAAU,UAAW,GAAI,EAExD,CAAE,QAAO,aAAY,gBAAe,YAAa,GAAK,IAAM,CAC5D,GAAwB,EAAI,CAAS,CACzC,EAAG,CAAQ,EAEX,EAAM,EAEN,EAAc,IAAM,GAAwB,GAAK,GAA+B,CAAS,CAAC,EAC1F,EAAW,IAAM,GAAuB,CAAS,GAAK,GAA6B,CAAE,CAAC,EACtF,EAAW,IAAM,GAA4B,CAAE,CAAC,EAChD,EAAW,IAAM,GAAkB,CAAC,EACpC,EAAS,IAAM,GAAyB,CAAE,CAAC,CAC/C,CAAC,EAED,YAAiC,EAAI,EAAW,CAC5C,EAAO,SAAS,EACZ,EAAU,WAAa,SAAW,EAAU,WAAa,iBAC7D,CACJ,CAEA,YAAc,EAAU,EAAW,IAAM,CACrC,GAAI,GAAkB,CAAC,EACnB,EAAqB,CAAC,EACtB,EAAiB,CAAC,EAEtB,MAAO,CACH,OAAQ,CACJ,GAAI,GAAQ,GAAoB,EAAU,IAAM,CAC5C,GAAI,EAAe,KAAK,GAAK,EAAE,CAAC,EAAG,MAAO,GAAM,EAChD,AAAI,EAAgB,KAAK,GAAK,EAAE,CAAC,GAC7B,EAAmB,KAAK,GAAK,EAAE,CAAC,GAAK,KAAK,OAAO,EAAI,KAEzD,EAAS,CACb,CAAC,CACL,EACA,WAAW,EAAW,CAClB,EAAgB,KAAK,CAAS,CAClC,EACA,cAAc,EAAW,CACrB,EAAmB,KAAK,CAAS,CACrC,EACA,SAAS,EAAW,CAChB,EAAe,KAAK,CAAS,CACjC,CACJ,CACJ,CAEA,GAAI,IAAS,CAAC,EAEd,YAA6B,EAAI,EAAU,CACvC,GAAI,CAAE,GAAO,GAAK,CACd,GAAI,GAAQ,CACR,MAAO,YAAY,IAAM,EAAM,UAAU,QAAQ,GAAK,EAAE,CAAC,EAAG,CAAE,EAC9D,UAAW,GAAI,IACnB,EAEA,GAAO,GAAM,CACjB,CAEA,UAAO,GAAI,UAAU,IAAI,CAAQ,EAE1B,IAAM,CACT,GAAO,GAAI,UAAU,OAAO,CAAQ,EAEhC,GAAO,GAAI,UAAU,OAAS,GAC9B,eAAc,GAAO,GAAI,KAAK,EAC9B,MAAO,IAAO,GAEtB,CACJ,CAEA,GAAI,IAAY,GAEhB,OAAO,iBAAiB,UAAW,IAAM,GAAY,EAAI,EACzD,OAAO,iBAAiB,SAAU,IAAM,GAAY,EAAK,EAEzD,aAA6B,CACzB,MAAO,GACX,CAEA,GAAI,IAAe,GAEnB,SAAS,iBAAiB,mBAAoB,IAAM,CAAE,GAAe,SAAS,MAAO,EAAG,EAAK,EAE7F,aAAmC,CAC/B,MAAO,GACX,CAEA,YAAqC,EAAI,CACrC,MAAO,CAAE,GAAc,CAAE,EAAE,IAAI,MAAM,CACzC,CAEA,YAAwC,EAAW,CAC/C,MAAO,CAAE,EAAU,UAAU,SAAS,YAAY,CACtD,CAEA,YAAgC,EAAW,CACvC,MAAO,GAAU,UAAU,SAAS,SAAS,CACjD,CAEA,YAAsC,EAAI,CACtC,GAAI,GAAW,EAAG,sBAAsB,EAExC,MAAO,CACH,GAAS,IAAO,QAAO,aAAe,SAAS,gBAAgB,eAC/D,EAAS,KAAQ,QAAO,YAAc,SAAS,gBAAgB,cAC/D,EAAS,OAAS,GAClB,EAAS,MAAQ,EAEzB,CAEA,YAAkC,EAAI,CAClC,MAAO,GAAG,cAAgB,EAC9B,CAEA,YAA6B,EAAW,EAAiB,CACrD,GAAI,GACA,EAA+B,EAAU,KAAK,GAAO,EAAI,MAAM,YAAY,CAAC,EAC5E,EAA0B,EAAU,KAAK,GAAO,EAAI,MAAM,WAAW,CAAC,EAE1E,MAAI,GACA,EAAyB,OAAO,EAA6B,QAAQ,KAAM,EAAE,CAAC,EACvE,GACP,GAAyB,OAAO,EAAwB,QAAQ,IAAK,EAAE,CAAC,EAAI,KAGzE,GAA0B,CACrC,CC7HA,GAAI,IAAW,CACX,YACA,cACA,SACA,SACA,QACA,aACA,OACA,OACA,UACA,gBACA,YACA,MACA,GAAI,WAAW,CACX,MAAO,GAAO,QAClB,CACJ,EAEI,GAA+B,GAAU,QAAQ,KAAK,kCAAkC,WAAgB,EAE5G,AAAI,OAAO,UAAU,GAA6B,UAAU,EAC5D,AAAI,OAAO,QAAQ,GAA6B,QAAQ,EASxD,OAAO,SAAW,GAClB,OAAO,OAAS,EAEhB,AAAI,OAAO,uBAAyB,QAChC,QAAO,OAAO,eAAiB,GAE/B,SAAS,iBAAiB,mBAAoB,IAAM,CAChD,AAAI,OAAO,OAAO,iBAAmB,QAGjC,GAA6B,QAAQ,EAIzC,GAAS,MAAM,CACnB,CAAC",
   "names": []
 }
diff --git a/public/vendor/livewire/manifest.json b/public/vendor/livewire/manifest.json
index 4020e03e28..36528aab1c 100644
--- a/public/vendor/livewire/manifest.json
+++ b/public/vendor/livewire/manifest.json
@@ -1,2 +1,2 @@
 
-{"/livewire.js":"87e1046f"}
+{"/livewire.js":"951e6947"}
diff --git a/resources/assets/js/snipeit.js b/resources/assets/js/snipeit.js
index bd03690ca7..38e58e956d 100755
--- a/resources/assets/js/snipeit.js
+++ b/resources/assets/js/snipeit.js
@@ -82,84 +82,45 @@ pieOptions = {
 
 var baseUrl = $('meta[name="baseUrl"]').attr('content');
 
-(function($, settings) {
-    var Components = {};
-    Components.modals = {};
+$(function () {
+
+    var $el = $('table');
 
     // confirm restore modal
-    Components.modals.confirmRestore = function() {
-        var $el = $('table');
 
-        var events = {
-            'click': function(evnt) {
-                var $context = $(this);
-                var $restoreConfirmModal = $('#restoreConfirmModal');
-                var href = $context.attr('href');
-                var message = $context.attr('data-content');
-                var title = $context.attr('data-title');
+    $el.on('click', '.restore-asset', function (evnt) {
+        var $context = $(this);
+        var $restoreConfirmModal = $('#restoreConfirmModal');
+        var href = $context.attr('href');
+        var message = $context.attr('data-content');
+        var title = $context.attr('data-title');
 
-                $('#restoreConfirmModalLabel').text(title);
-                $restoreConfirmModal.find('.modal-body').text(message);
-                $('#restoreForm').attr('action', href);
-                $restoreConfirmModal.modal({
-                    show: true
-                });
-                return false;
-            }
-        };
-
-        var render = function() {
-            $el.on('click', '.restore-asset', events['click']);
-        };
-
-        return {
-            render: render
-        };
-    };
+        $('#confirmModalLabel').text(title);
+        $restoreConfirmModal.find('.modal-body').text(message);
+        $('#restoreForm').attr('action', href);
+        $restoreConfirmModal.modal({
+            show: true
+        });
+        return false;
+    });
 
     // confirm delete modal
-    Components.modals.confirmDelete = function() {
-        var $el = $('table');
 
-        var events = {
-            'click': function(evnt) {
-                var $context = $(this);
-                var $dataConfirmModal = $('#dataConfirmModal');
-                var href = $context.attr('href');
-                var message = $context.attr('data-content');
-                var title = $context.attr('data-title');
+    $el.on('click', '.delete-asset', function (evnt) {
+        var $context = $(this);
+        var $dataConfirmModal = $('#dataConfirmModal');
+        var href = $context.attr('href');
+        var message = $context.attr('data-content');
+        var title = $context.attr('data-title');
 
-                $('#myModalLabel').text(title);
-                $dataConfirmModal.find('.modal-body').text(message);
-                $('#deleteForm').attr('action', href);
-                $dataConfirmModal.modal({
-                    show: true
-                });
-                return false;
-            }
-        };
-
-        var render = function() {
-            $el.on('click', '.delete-asset', events['click']);
-        };
-
-        return {
-            render: render
-        };
-    };
-
-
-    /**
-     * Application start point
-     * Component definition stays out of load event, execution only happens.
-     */
-    $(function() {
-        new Components.modals.confirmRestore().render();
-        new Components.modals.confirmDelete().render();
+        $('#myModalLabel').text(title);
+        $dataConfirmModal.find('.modal-body').text(message);
+        $('#deleteForm').attr('action', href);
+        $dataConfirmModal.modal({
+            show: true
+        });
+        return false;
     });
-}(jQuery, window.snipeit.settings));
-
-$(document).ready(function () {
 
     /*
     * Slideout help menu
@@ -219,6 +180,8 @@ $(document).ready(function () {
              */
             placeholder: '',
             allowClear: true,
+            language: $('meta[name="language"]').attr('content'),
+            dir: $('meta[name="language-direction"]').attr('content'),
             
             ajax: {
 
@@ -235,6 +198,7 @@ $(document).ready(function () {
                         search: params.term,
                         page: params.page || 1,
                         assetStatusType: link.data("asset-status-type"),
+                        companyId: link.data("company-id"),
                     };
                     return data;
                 },
diff --git a/resources/assets/js/snipeit_modals.js b/resources/assets/js/snipeit_modals.js
index 7e20e9d5d9..cea79e1141 100644
--- a/resources/assets/js/snipeit_modals.js
+++ b/resources/assets/js/snipeit_modals.js
@@ -40,7 +40,6 @@ $(function () {
       select = link.data("select");
       refreshSelector = link.data("refresh");
 
-
       $('#createModal').load(link.attr('href'),function () {
 
           // this sets the focus to be the name field
@@ -122,10 +121,11 @@ $(function () {
                 $('#modal_error_msg').html(error_message).show();
                 return false;
             }
+
             var id = result.payload.id;
             var name = result.payload.name || (result.payload.first_name + " " + result.payload.last_name);
-            if(!id || !name) {
-                console.error("Could not find resulting name or ID from modal-create. Name: "+name+", id: "+id);
+            if (!id || !name) {
+                console.error("Could not find resulting name or ID from modal-create. Name: " + name + ", id: " + id);
                 return false;
             }
             $('#createModal').modal('hide');
diff --git a/resources/assets/less/app.less b/resources/assets/less/app.less
index 94f5f4098b..4bd3889722 100644
--- a/resources/assets/less/app.less
+++ b/resources/assets/less/app.less
@@ -384,7 +384,18 @@ a.logo.no-hover a:hover {
   background-color: transparent;
 }
 
-.required {
+.index-block {
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+}
+.index-block:hover{
+  overflow: visible;
+  white-space: normal;
+  height:auto;
+}
+
+input:required, select:required, textarea:required {
   border-right: 6px solid orange;
 }
 
diff --git a/resources/assets/less/overrides.less b/resources/assets/less/overrides.less
index 12bce00bb6..e072e4b1e4 100644
--- a/resources/assets/less/overrides.less
+++ b/resources/assets/less/overrides.less
@@ -47,7 +47,7 @@
   padding: 10px;
   background: #f4f4f4;
   margin-bottom: 3px;
-  border-left: 2px solid #e6e7e8;
+  border-inline: 2px solid #e6e7e8;
   color: #444;
   cursor: move;
 }
@@ -156,10 +156,10 @@ a.accordion-header {
   height: 150px;
 }
 
-
 .select2-container {
   width: 100%;
 }
+
 .error input {
   color: #a94442;
   border: 2px solid #a94442 !important;
@@ -341,8 +341,11 @@ a.logo.no-hover a:hover {
 }
 
 
-.required {
-  border-right: 6px solid orange;
+input:required, select:required {
+  border-right: 5px solid orange;
+}
+select:required + .select2-container .select2-selection, select:required + .select2-container .select2-selection .select2-selection--multiple  {
+  border-right: 5px solid orange !important;
 }
 
 body {
@@ -358,13 +361,19 @@ body {
   white-space: normal;
 }
 
+.modal-warning .modal-help {
+  color: #fff8af;
+}
+
 .bootstrap-table .fixed-table-container .fixed-table-body .fixed-table-loading {
   z-index: 0 !important;
 }
 
 @media print {
-  a[href]:after {
-    content: none;
+
+  @page {
+    size: A4;
+    margin: 0mm;
   }
 
   .tab-content > .tab-pane {
@@ -372,6 +381,148 @@ body {
     opacity: 1 !important;
     visibility: visible !important;
   }
+
+  .img-responsive {
+    width: 200px;
+  }
+
+  html, body {
+    width: 1024px;
+  }
+
+  body {
+    margin: 0 auto;
+    line-height: 1em;
+    word-spacing:1px;
+    letter-spacing:0.2px;
+    font: 15px "Times New Roman", Times, serif;
+    background:white;
+    color:black;
+    width: 100%;
+    float: none;
+  }
+
+  /* avoid page-breaks inside a listingContainer*/
+  .listingContainer {
+    page-break-inside: avoid;
+  }
+
+  h1 {
+    font: 28px "Times New Roman", Times, serif;
+  }
+
+  h2 {
+    font: 24px "Times New Roman", Times, serif;
+  }
+
+  h3 {
+    font: 20px "Times New Roman", Times, serif;
+  }
+
+  /* Improve colour contrast of links */
+  a:link, a:visited {
+    color: #781351
+  }
+
+  /* URL */
+  a:link, a:visited {
+    background: transparent;
+    color:#333;
+    text-decoration:none;
+  }
+
+  a[href]:after {
+    content: "" !important;
+  }
+
+  a[href^="http://"] {
+    color:#000;
+  }
+
+  #header {
+    height:75px;
+    font-size: 24pt;
+    color:black
+  }
+
+  div.row-new-striped {
+    margin: 0px;
+    padding: 0px;
+  }
+
+  .pagination-detail, .fixed-table-toolbar {
+    visibility: hidden;
+  }
+  .col-sm-1, .col-sm-2, .col-sm-3, .col-sm-4, .col-sm-5, .col-sm-6, .col-sm-7, .col-sm-8, .col-sm-9, .col-sm-10, .col-sm-11, .col-sm-12 .col-sm-pull-3 .col-sm-push-9 {
+    float: left;
+  }
+
+  .col-sm-12 {
+    width: 100%;
+  }
+  .col-sm-11 {
+    width: 91.66666666666666%;
+  }
+  .col-sm-10 {
+    width: 83.33333333333334%;
+  }
+  .col-sm-9 {
+    width: 75%;
+  }
+  .col-sm-8 {
+    width: 66.66666666666666%;
+  }
+  .col-sm-7 {
+    width: 58.333333333333336%;
+  }
+  .col-sm-6 {
+    width: 50%;
+  }
+  .col-sm-5 {
+    width: 41.66666666666667%;
+  }
+  .col-sm-4 {
+    width: 33.33333333333333%;
+  }
+  .col-sm-3 {
+    width: 25%;
+  }
+  .col-sm-2 {
+    width: 16.666666666666664%;
+  }
+  .col-sm-1 {
+    width: 8.333333333333332%;
+  }
+
+}
+
+
+.select2-selection__choice__remove {
+  color: white !important;
+}
+
+.select2-selection--multiple {
+    border-color: #d2d6de !important;
+    overflow-y: auto;
+}
+
+.select2-selection__choice {
+  border-radius: 0px !important;
+}
+
+.select2-search select2-search--inline {
+  height: 35px !important;
+  float: left;
+  margin: 0;
+}
+
+
+
+.select2-results__option {
+  padding: 5px;
+  user-select: none;
+  -webkit-user-select: none;
+  margin: 0px;
 }
 
 img.navbar-brand-img, .navbar-brand>img {
@@ -380,8 +531,8 @@ img.navbar-brand-img, .navbar-brand>img {
   max-height: 50px;
 }
 
-.input-daterange {
-  border-radius: 0px;
+.input-daterange, .input-daterange input:first-child, .input-daterange input:last-child {
+  border-radius: 0px !important;
 }
 
 .btn.bg-maroon, .btn.bg-purple{
@@ -470,31 +621,30 @@ h4 {
   //border-left: 1px solid #dddddd;
   //border-right: 1px solid #dddddd;
   display: table;
-
 }
 
 .row-striped .row:nth-of-type(odd) div {
   background-color: #f9f9f9;
   border-top: 1px solid #dddddd;
   display: table-cell;
-
+  word-wrap: break-word;
 }
 
 .row-striped .row:nth-of-type(even) div {
   background: #FFFFFF;
   border-top: 1px solid #dddddd;
   display: table-cell;
+  word-wrap: break-word;
 }
 
 
 .row-new-striped {
   vertical-align: top;
-  line-height: 2.6;
-  padding: 0px;
-  margin-left: 20px;
+  padding: 3px;
   display: table;
   width: 100%;
-  padding-right: 20px;
+  word-wrap: break-word;
+  table-layout:fixed;
 }
 
 /**
@@ -505,25 +655,28 @@ h4 {
 .row-new-striped  > .row:nth-of-type(even) {
   background: #FFFFFF;
   border-top: 1px solid #dddddd;
+  line-height: 1.9;
   display: table-row;
-
 }
 
 .row-new-striped > .row:nth-of-type(odd)  {
   background-color: #F8F8F8;
   border-top: 1px solid #dddddd;
   display: table-row;
-
+  line-height: 1.9;
+  padding: 2px;
 }
 
 .row-new-striped div {
   display: table-cell;
   border-top: 1px solid #dddddd;
+  padding: 6px;
 }
 
 .row-new-striped div {
   display: table-cell;
   border-top: 1px solid #dddddd;
+  padding: 6px;
 }
 
 
@@ -576,22 +729,27 @@ h4 {
  any HTML used in the UserPresenter "title" attribute breaks the column selector HTML.
 
  Instead, we use CSS to add the icon into the table header, which leaves the column selector
- "title" text as-is.
-
- See https://github.com/snipe/snipe-it/issues/7989
+ "title" text as-is and hides the icon.
 
+ See https://github.com/grokability/snipe-it/issues/7989
  */
-
+th.css-accessory > .th-inner,
+th.css-accessory-alt > .th-inner,
 th.css-barcode > .th-inner,
-th.css-license > .th-inner,
+th.css-component > .th-inner,
 th.css-consumable > .th-inner,
 th.css-envelope > .th-inner,
-th.css-users > .th-inner,
+th.css-house-flag > .th-inner,
+th.css-house-laptop > .th-inner,
+th.css-house-user > .th-inner,
+th.css-license > .th-inner,
 th.css-location > .th-inner,
-th.css-accessory > .th-inner
+th.css-users > .th-inner,
+th.css-currency > .th-inner,
+th.css-history > .th-inner
 {
   font-size: 0px;
-  line-height: .75!important;
+  line-height: 0.75 !important;
   text-align: left;
   text-rendering: auto;
   -webkit-font-smoothing: antialiased;
@@ -599,15 +757,22 @@ th.css-accessory > .th-inner
 }
 
 
-th.css-padlock > .th-inner::before,
+th.css-location > .th-inner::before,
+th.css-accessory > .th-inner::before,
+th.css-accessory-alt > .th-inner::before,
 th.css-barcode > .th-inner::before,
-th.css-license > .th-inner::before,
+th.css-component > .th-inner::before,
 th.css-consumable > .th-inner::before,
 th.css-envelope > .th-inner::before,
-th.css-users > .th-inner::before,
+th.css-house-flag > .th-inner::before,
+th.css-house-laptop > .th-inner::before,
+th.css-house-user > .th-inner::before,
+th.css-license > .th-inner::before,
 th.css-location > .th-inner::before,
-th.css-accessory > .th-inner::before
-
+th.css-padlock > .th-inner::before,
+th.css-users > .th-inner::before,
+th.css-currency > .th-inner::before,
+th.css-history > .th-inner::before
 {
   display: inline-block;
   font-size: 20px;
@@ -615,15 +780,6 @@ th.css-accessory > .th-inner::before
   font-weight: 900;
 }
 
-th.css-padlock > .th-inner::before
-{
-  content: "\f023";
-  font-family: "Font Awesome 5 Free";
-  font-weight: 900;
-  padding-right: 4px;
-  font-size: 12px;
-}
-
 /**
 BEGIN ICON TABLE HEADERS
 Set the font-weight css property as 900 (For Solid), 400 (Regular or Brands), 300 (Light for pro icons).
@@ -661,6 +817,55 @@ th.css-location > .th-inner::before {
   content: "\f3c5"; font-family: "Font Awesome 5 Free"; font-size: 19px; margin-bottom: 0px;
 }
 
+th.css-component > .th-inner::before
+{
+  content: "\f0a0"; font-family: "Font Awesome 5 Free"; font-weight: 500;
+}
+
+th.css-padlock > .th-inner::before
+{
+  content: "\f023"; font-family: "Font Awesome 5 Free"; font-weight: 900;
+}
+
+th.css-house-user > .th-inner::before {
+  content: "\e1b0";
+  font-family: "Font Awesome 5 Free";
+  font-size: 19px;
+  margin-bottom: 0px;
+}
+th.css-house-flag > .th-inner::before {
+  content: "\e50d";
+  font-family: "Font Awesome 5 Free";
+  font-size: 19px;
+  margin-bottom: 0px;
+}
+th.css-house-laptop > .th-inner::before {
+  content: "\e066";
+  font-family: "Font Awesome 5 Free";
+  font-size: 19px;
+  margin-bottom: 0px;
+}
+th.css-accessory-alt > .th-inner::before {
+  content: "\f11c";
+  font-family: "Font Awesome 5 Free";
+  font-size: 19px;
+  margin-bottom: 0px;
+}
+
+th.css-currency > .th-inner::before {
+  content: "\24"; // change this to f51e for coins
+  font-family: "Font Awesome 5 Free";
+  font-size: 19px;
+  margin-bottom: 0px;
+}
+
+th.css-history > .th-inner::before {
+  content: "\f1da"; // change this to f51e for coins
+  font-family: "Font Awesome 5 Free";
+  font-size: 19px;
+  margin-bottom: 0px;
+}
+
 
 .small-box .inner {
   padding-left: 15px;
@@ -681,7 +886,7 @@ th.css-location > .th-inner::before {
   height: 34px;
 }
 
-.form-group.has-error label {
+.form-group.has-error label, .form-group.has-error .help-block {
   color: #a94442;
 }
 
@@ -714,13 +919,43 @@ th.css-location > .th-inner::before {
     margin-top:50px
   }
 }
-
-.ellipsis {
-  overflow: hidden;
-  white-space: nowrap;
-  text-overflow: ellipsis;
+@media screen and (max-width: 992px){
+  .info-stack-container {
+    flex-direction: column;
+  }
+  .col-md-3.col-xs-12.col-sm-push-9.info-stack{
+    left:auto;
+    order:1;
+  }
+  .col-md-9.col-xs-12.col-sm-pull-3.info-stack{
+    right:auto;
+    order:2;
+  }
+  .info-stack-container > .col-md-9.col-xs-12.col-sm-pull-3.info-stack > .row-new-striped > .row > .col-sm-2{
+    width:auto;
+    float:none;
+  }
+}
+@media screen and (max-width: 992px){
+  .row-new-striped div{
+    width:100%;
+  }
 }
 
+@media screen and (max-width: 1318px) and (min-width: 1200px){
+  .admin.box{
+    height:170px;
+  }
+}
+@media screen and (max-width: 1494px) and (min-width: 1200px){
+  .dashboard.small-box{
+    white-space: nowrap;
+    text-overflow: ellipsis;
+    max-width: 188px;
+    display: block;
+    overflow: hidden;
+  }
+}
 
 /** Form-stuff overrides for checkboxes and stuff **/
 
@@ -880,6 +1115,10 @@ input[type="radio"]:checked::before {
   padding-left:15px;
 }
 
+.nav-tabs-custom > .nav-tabs > li.active {
+  font-weight: bold;
+}
+
 /** --------------------------------------- **/
 /** End checkbox styles to replace iCheck   **/
 /** --------------------------------------- **/
@@ -920,3 +1159,60 @@ input[type="radio"]:checked::before {
   filter: brightness(70%);
   font-size: 70%;
 }
+
+/** this is needed to override ekko-lightboxes card view styles **/
+.bootstrap-table .fixed-table-container .table tbody tr .card-view {
+  display: table-row !important;
+}
+
+td.text-right.text-padding-number-cell {
+  padding-right: 30px !important;
+  white-space: nowrap;
+}
+
+th.text-right.text-padding-number-footer-cell {
+  padding-right: 20px !important;
+  white-space: nowrap;
+}
+
+code.single-line {
+  white-space: pre-wrap;
+  display: -webkit-box;
+  -webkit-box-orient: vertical;
+  -webkit-line-clamp: 1;
+  overflow: hidden;
+  max-width: 400px;
+}
+
+p.monospace, span.monospace {
+  font-family: monospace, monospace;
+}
+
+legend.highlight {
+  background: repeating-linear-gradient(
+          45deg,
+          #222d32,
+          #222d32 10px,
+          #444 10px,
+          #444 11px
+  );
+
+  color: #fff;
+  font-size: 18px;
+  padding: 6px 6px 6px 10px;
+}
+
+legend.highlight a {
+  color: #fff;
+  cursor: pointer;
+}
+
+fieldset.bottom-padded {
+  padding-bottom: 20px;
+}
+
+caption.tableCaption {
+  font-size: 18px;
+  padding-left: 8px;
+}
+
diff --git a/resources/assets/less/skins/skin-black-dark.less b/resources/assets/less/skins/skin-black-dark.less
index c47bd74b35..d446fb3f9c 100644
--- a/resources/assets/less/skins/skin-black-dark.less
+++ b/resources/assets/less/skins/skin-black-dark.less
@@ -112,8 +112,10 @@ a {
   color: #fff;
 }
 
-
-
+#sort tr.cansort{
+  background-color:var(--back-main);
+  color:var(--text-main);
+}
 
 :root {
   --background: #222;
@@ -309,10 +311,7 @@ input[type=text], input[type=search] {
 .search-highlight, .search-highlight:hover{
   background-color: var(--back-sub) !important;
 }
-.input-group, .input-group-addon {
-  background-color: var(--back-sub);
-  color: var(--text-main);
-}
+
 #licensesTable>tbody>tr>td>nobr>a>i.fa {
   color: var(--text-main);
 }
diff --git a/resources/assets/less/skins/skin-blue-dark.less b/resources/assets/less/skins/skin-blue-dark.less
index 13b3bc17b9..c78379f2d5 100644
--- a/resources/assets/less/skins/skin-blue-dark.less
+++ b/resources/assets/less/skins/skin-blue-dark.less
@@ -107,6 +107,10 @@ a {
 .text-primary {
   color: #fff;
 }
+#sort tr.cansort{
+  background-color:var(--back-main);
+  color:var(--text-main);
+}
 
 
 
@@ -294,10 +298,6 @@ input[type=text], input[type=search] {
   background-color: var(--back-sub);
   color: var(--text-main);
 }
-.input-group, .input-group-addon {
-  background-color: var(--back-sub)!important;
-  color: var(--text-main);
-}
 #licensesTable>tbody>tr>td>nobr>a>i.fa {
   color: var(--text-main);
 }
@@ -376,7 +376,7 @@ input[type=text], input[type=search] {
   background-color: var(--back-sub);
 }
 .table-striped>tbody>tr:nth-of-type(even){
-  background-color: var(--back-sub-alt);
+  background-color: var(--back-main);
 }
 #webui>div>div>div>div>div>table>tbody>tr>td>a>i.fa, .box-body, .box-footer, .box-header {
   color: var(--text-main);
@@ -400,7 +400,16 @@ a {
   }
 }
 #customFieldsTable a[href*='/models'] {
-  color: var(--back-sub);
+  background-color: var(--back-sub-alt);
+  color: var(--link);
+}
+#customFieldsTable a[href*='/models']:hover {
+  background-color: var(--text-sub);
+  color: var(--button-hover);
+}
+#customFieldsTable a[href*='/models']:visited {
+  background-color: var(--background);
+  color: var(--visited-link);
 }
 #customFieldsTable a[href*='/fieldsets']{
   background-color: transparent;
diff --git a/resources/assets/less/skins/skin-blue.less b/resources/assets/less/skins/skin-blue.less
index fcbb3c0308..43be718b9a 100755
--- a/resources/assets/less/skins/skin-blue.less
+++ b/resources/assets/less/skins/skin-blue.less
@@ -156,4 +156,18 @@ a:hover {
 // Link colors for the settings page
 a.settings_button:link, a.settings_button:visited, a.settings_button:hover {
   color: @light-blue;
-}
\ No newline at end of file
+}
+
+a.label.label-default:link {
+  color: darken(#3c8dbc, 10%); /* Use same as Header picker, lighten by 70% */
+}
+
+a.label.label-default:visited {
+  color: darken(#3c8dbc,20%); /* Use same as Header picker, lighten by 70% */
+}
+
+a.label.label-default:hover {
+  background-color: #BBB;
+  color: darken(#3c8dbc,15%);
+}
+
diff --git a/resources/assets/less/skins/skin-green-dark.less b/resources/assets/less/skins/skin-green-dark.less
index 069d1bb3b6..34a490140b 100644
--- a/resources/assets/less/skins/skin-green-dark.less
+++ b/resources/assets/less/skins/skin-green-dark.less
@@ -107,6 +107,10 @@ a {
   color: #fff;
 }
 
+#sort tr.cansort{
+  background-color:var(--back-main);
+  color:var(--text-main);
+}
 
 
 
@@ -285,10 +289,6 @@ input[type=text], input[type=search] {
   background-color: var(--back-sub);
   color: var(--text-main);
 }
-.input-group, .input-group-addon {
-  background-color: var(--back-sub)!important;
-  color: var(--text-main);
-}
 #licensesTable>tbody>tr>td>nobr>a>i.fa {
   color: var(--text-main);
 }
@@ -387,7 +387,16 @@ a {
   }
 }
 #customFieldsTable a[href*='/models'] {
-  color: var(--back-sub);
+  background-color: var(--back-sub-alt);
+  color: var(--link);
+}
+#customFieldsTable a[href*='/models']:hover {
+  background-color: var(--text-sub);
+  color: var(--button-hover);
+}
+#customFieldsTable a[href*='/models']:visited {
+  background-color: var(--background);
+  color: var(--visited-link);
 }
 #customFieldsTable a[href*='/fieldsets']{
   background-color: transparent;
diff --git a/resources/assets/less/skins/skin-orange-dark.less b/resources/assets/less/skins/skin-orange-dark.less
index 0ec1a87d2e..f17d807efa 100644
--- a/resources/assets/less/skins/skin-orange-dark.less
+++ b/resources/assets/less/skins/skin-orange-dark.less
@@ -98,6 +98,11 @@ li.dropdown-item-marker {
   color: #fff;
 }
 
+#sort tr.cansort{
+  background-color:var(--back-main);
+  color:var(--text-main);
+}
+
 :root {
   --background: #222;
   --back-main: #333;
@@ -292,10 +297,6 @@ input[type=text], input[type=search] {
   background-color: var(--back-sub);
   color: var(--text-main);
 }
-.input-group, .input-group-addon {
-  background-color: var(--back-sub)!important;
-  color: var(--text-main);
-}
 #licensesTable>tbody>tr>td>nobr>a>i.fa {
   color: var(--text-main);
 }
@@ -384,7 +385,16 @@ input[type=text], input[type=search] {
   border-bottom: #000;
 }
 #customFieldsTable a[href*='/models'] {
-  color: var(--back-sub);
+  background-color: var(--back-sub-alt);
+  color: var(--link);
+}
+#customFieldsTable a[href*='/models']:hover {
+  background-color: var(--text-sub);
+  color: var(--button-hover);
+}
+#customFieldsTable a[href*='/models']:visited {
+  background-color: var(--background);
+  color: var(--visited-link);
 }
 #customFieldsTable a[href*='/fieldsets']{
   background-color: transparent;
diff --git a/resources/assets/less/skins/skin-purple-dark.less b/resources/assets/less/skins/skin-purple-dark.less
index c86bc810f3..ff3ff04ded 100644
--- a/resources/assets/less/skins/skin-purple-dark.less
+++ b/resources/assets/less/skins/skin-purple-dark.less
@@ -108,8 +108,10 @@ a {
   color: #fff;
 }
 
-
-
+#sort tr.cansort{
+  background-color:var(--back-main);
+  color:var(--text-main);
+}
 
 :root {
   --background: #222;
@@ -295,10 +297,6 @@ input[type=text], input[type=search] {
   background-color: var(--back-sub);
   color: var(--text-main);
 }
-.input-group, .input-group-addon {
-  background-color: var(--back-sub)!important;
-  color: var(--text-main);
-}
 #licensesTable>tbody>tr>td>nobr>a>i.fa {
   color: var(--text-main);
 }
@@ -412,6 +410,18 @@ a {
   display: table;
 
 }
+#customFieldsTable a[href*='/models'] {
+  background-color: var(--back-sub-alt);
+  color: var(--link);
+}
+#customFieldsTable a[href*='/models']:hover {
+  background-color: var(--text-sub);
+  color: var(--button-hover);
+}
+#customFieldsTable a[href*='/models']:visited {
+  background-color: var(--back-sub);
+  color: var(--visited-link);
+}
 
 .row-striped .row:nth-of-type(odd) div {
   background-color: var(--back-sub);
diff --git a/resources/assets/less/skins/skin-red-dark.less b/resources/assets/less/skins/skin-red-dark.less
index b9e97615f4..b01654095c 100644
--- a/resources/assets/less/skins/skin-red-dark.less
+++ b/resources/assets/less/skins/skin-red-dark.less
@@ -107,8 +107,10 @@ a {
   color: #fff;
 }
 
-
-
+#sort tr.cansort{
+  background-color:var(--back-main);
+  color:var(--text-main);
+}
 
 :root {
   --background: #222;
@@ -296,10 +298,6 @@ input[type=text], input[type=search] {
   background-color: var(--back-sub);
   color: var(--text-main);
 }
-.input-group, .input-group-addon {
-  background-color: var(--back-sub)!important;
-  color: var(--text-main);
-}
 #licensesTable>tbody>tr>td>nobr>a>i.fa {
   color: var(--text-main);
 }
@@ -407,7 +405,16 @@ a {
   }
 }
 #customFieldsTable a[href*='/models'] {
-  color: var(--back-sub);
+  background-color: var(--back-sub-alt);
+  color: var(--link);
+}
+#customFieldsTable a[href*='/models']:hover {
+  background-color: var(--text-sub);
+  color: var(--button-hover);
+}
+#customFieldsTable a[href*='/models']:visited {
+  background-color: var(--back-sub);
+  color: var(--visited-link);
 }
 #customFieldsTable a[href*='/fieldsets']{
   background-color: transparent;
diff --git a/resources/assets/less/skins/skin-yellow-dark.less b/resources/assets/less/skins/skin-yellow-dark.less
index ded0ed452f..e949665a12 100644
--- a/resources/assets/less/skins/skin-yellow-dark.less
+++ b/resources/assets/less/skins/skin-yellow-dark.less
@@ -104,8 +104,10 @@ a {
   color: #fff;
 }
 
-
-
+#sort tr.cansort{
+  background-color:var(--back-main);
+  color:var(--text-main);
+}
 
 :root {
   --background: #222;
@@ -287,10 +289,6 @@ input[type=text], input[type=search] {
   background-color: var(--back-sub);
   color: var(--text-main);
 }
-.input-group, .input-group-addon {
-  background-color: var(--back-sub)!important;
-  color: var(--text-main);
-}
 #licensesTable>tbody>tr>td>nobr>a>i.fa {
   color: var(--text-main);
 }
@@ -381,6 +379,18 @@ tr th div.th-inner {
 .box-header.with-border {
   border-bottom: #000;
 }
+#customFieldsTable a[href*='/models'] {
+  background-color: var(--back-sub-alt);
+  color: var(--link);
+}
+#customFieldsTable a[href*='/models']:hover {
+  background-color: var(--text-sub);
+  color: var(--button-hover);
+}
+#customFieldsTable a[href*='/models']:visited {
+  background-color: var(--background);
+  color: var(--visited-link);
+}
 
 .row-striped {
   vertical-align: top;
diff --git a/resources/lang/aa-ER/account/general.php b/resources/lang/aa-ER/account/general.php
index 1d698e0fb2..5db6716fb7 100644
--- a/resources/lang/aa-ER/account/general.php
+++ b/resources/lang/aa-ER/account/general.php
@@ -2,10 +2,16 @@
 
 return array(
     'personal_api_keys' => 'crwdns6798:0crwdne6798:0',
+    'personal_access_token' => 'crwdns12312:0crwdne12312:0',
+    'personal_api_keys_success' => 'crwdns12314:0crwdne12314:0',
+    'here_is_api_key' => 'crwdns12316:0crwdne12316:0',
     'api_key_warning' => 'crwdns12268:0crwdne12268:0',
     'api_base_url' => 'crwdns6802:0crwdne6802:0',
     'api_base_url_endpoint' => 'crwdns6804:0crwdne6804:0',
     'api_token_expiration_time' => 'crwdns6806:0crwdne6806:0',
     'api_reference' => 'crwdns12270:0crwdne12270:0',
     'profile_updated' => 'crwdns12202:0crwdne12202:0',
+    'no_tokens' => 'crwdns12318:0crwdne12318:0',
+    'enable_sounds' => 'crwdns12658:0crwdne12658:0',
+    'enable_confetti' => 'crwdns12664:0crwdne12664:0',
 );
diff --git a/resources/lang/aa-ER/admin/accessories/message.php b/resources/lang/aa-ER/admin/accessories/message.php
index 8e91c099ee..86442f615f 100644
--- a/resources/lang/aa-ER/admin/accessories/message.php
+++ b/resources/lang/aa-ER/admin/accessories/message.php
@@ -26,7 +26,11 @@ return array(
         'error'   		=> 'crwdns1229:0crwdne1229:0',
         'success' 		=> 'crwdns1230:0crwdne1230:0',
         'unavailable'   => 'crwdns11523:0crwdne11523:0',
-        'user_does_not_exist' => 'crwdns1231:0crwdne1231:0'
+        'user_does_not_exist' => 'crwdns1231:0crwdne1231:0',
+         'checkout_qty' => array(
+            'lte'  => 'crwdns12326:0crwdne12326:0',
+            ),
+           
     ),
 
     'checkin' => array(
diff --git a/resources/lang/aa-ER/admin/accessories/table.php b/resources/lang/aa-ER/admin/accessories/table.php
index 4d40c18a88..ef9c5401f0 100644
--- a/resources/lang/aa-ER/admin/accessories/table.php
+++ b/resources/lang/aa-ER/admin/accessories/table.php
@@ -6,6 +6,4 @@ return array(
     'id'      					=> 'crwdns1236:0crwdne1236:0',
     'require_acceptance'      	=> 'crwdns1237:0crwdne1237:0',
     'title'      				=> 'crwdns1238:0crwdne1238:0',
-
-
 );
diff --git a/resources/lang/aa-ER/admin/components/message.php b/resources/lang/aa-ER/admin/components/message.php
index a1a2616f8b..0af45c2912 100644
--- a/resources/lang/aa-ER/admin/components/message.php
+++ b/resources/lang/aa-ER/admin/components/message.php
@@ -17,7 +17,8 @@ return array(
     'delete' => array(
         'confirm'   => 'crwdns1560:0crwdne1560:0',
         'error'   => 'crwdns1561:0crwdne1561:0',
-        'success' => 'crwdns1562:0crwdne1562:0'
+        'success' => 'crwdns1562:0crwdne1562:0',
+        'error_qty'   => 'crwdns12937:0crwdne12937:0',
     ),
 
      'checkout' => array(
diff --git a/resources/lang/aa-ER/admin/consumables/general.php b/resources/lang/aa-ER/admin/consumables/general.php
index 9425c9956d..8e762c7419 100644
--- a/resources/lang/aa-ER/admin/consumables/general.php
+++ b/resources/lang/aa-ER/admin/consumables/general.php
@@ -8,4 +8,5 @@ return array(
     'remaining' 			            => 'crwdns1307:0crwdne1307:0',
     'total' 			                => 'crwdns1308:0crwdne1308:0',
     'update'                            => 'crwdns1398:0crwdne1398:0',
+    'inventory_warning'                 => 'crwdns12614:0crwdne12614:0',
 );
diff --git a/resources/lang/aa-ER/admin/consumables/message.php b/resources/lang/aa-ER/admin/consumables/message.php
index 6473ad0991..86b1d95c53 100644
--- a/resources/lang/aa-ER/admin/consumables/message.php
+++ b/resources/lang/aa-ER/admin/consumables/message.php
@@ -2,6 +2,7 @@
 
 return array(
 
+    'invalid_category_type' => 'crwdns12320:0crwdne12320:0',
     'does_not_exist' => 'crwdns1309:0crwdne1309:0',
 
     'create' => array(
diff --git a/resources/lang/aa-ER/admin/custom_fields/general.php b/resources/lang/aa-ER/admin/custom_fields/general.php
index 7150382a41..1a140946a6 100644
--- a/resources/lang/aa-ER/admin/custom_fields/general.php
+++ b/resources/lang/aa-ER/admin/custom_fields/general.php
@@ -5,7 +5,7 @@ return [
     'manage'                    => 'crwdns6501:0crwdne6501:0',
     'field'		                => 'crwdns1487:0crwdne1487:0',
     'about_fieldsets_title'		=> 'crwdns1488:0crwdne1488:0',
-    'about_fieldsets_text'		=> 'crwdns6503:0crwdne6503:0',
+    'about_fieldsets_text'		=> 'crwdns13242:0crwdne13242:0',
     'custom_format'             => 'crwdns6505:0crwdne6505:0',
     'encrypt_field'      	        => 'crwdns1792:0crwdne1792:0',
     'encrypt_field_help'      => 'crwdns1683:0crwdne1683:0',
@@ -35,7 +35,7 @@ return [
     'create_field_title' => 'crwdns6509:0crwdne6509:0',
     'value_encrypted'      	        => 'crwdns1696:0crwdne1696:0',
     'show_in_email'     => 'crwdns11854:0crwdne11854:0',
-    'show_in_email_short'     => 'crwdns11856:0crwdne11856:0',
+    'show_in_email_short' => 'crwdns12933:0crwdne12933:0',
     'help_text' => 'crwdns6511:0crwdne6511:0',
     'help_text_description' => 'crwdns6513:0crwdne6513:0',
     'about_custom_fields_title' => 'crwdns6515:0crwdne6515:0',
@@ -57,5 +57,8 @@ return [
     'show_in_requestable_list_short' => 'crwdns11860:0crwdne11860:0',
     'show_in_requestable_list' => 'crwdns11862:0crwdne11862:0',
     'encrypted_options' => 'crwdns11864:0crwdne11864:0',
+    'display_checkin' => 'crwdns12929:0crwdne12929:0',
+    'display_checkout' => 'crwdns12931:0crwdne12931:0',
+    'display_audit' => 'crwdns13023:0crwdne13023:0',
 
 ];
diff --git a/resources/lang/aa-ER/admin/custom_fields/message.php b/resources/lang/aa-ER/admin/custom_fields/message.php
index c76b8f86af..0531ba73a1 100644
--- a/resources/lang/aa-ER/admin/custom_fields/message.php
+++ b/resources/lang/aa-ER/admin/custom_fields/message.php
@@ -5,6 +5,7 @@ return array(
     'field' => array(
         'invalid'   => 'crwdns1505:0crwdne1505:0',
         'already_added'   => 'crwdns1506:0crwdne1506:0',
+        'none_selected'   => 'crwdns12586:0crwdne12586:0',
 
         'create' => array(
             'error'   => 'crwdns1507:0crwdne1507:0',
diff --git a/resources/lang/aa-ER/admin/depreciations/general.php b/resources/lang/aa-ER/admin/depreciations/general.php
index faf7cda5fa..f1726a13ec 100644
--- a/resources/lang/aa-ER/admin/depreciations/general.php
+++ b/resources/lang/aa-ER/admin/depreciations/general.php
@@ -11,4 +11,8 @@ return [
     'update'  					            => 'crwdns1800:0crwdne1800:0',
     'depreciation_min'                      => 'crwdns6071:0crwdne6071:0',
     'no_depreciations_warning'               => 'crwdns6533:0crwdne6533:0',
+    'depreciation_method'                   => 'crwdns13146:0crwdne13146:0',
+    'linear_depreciation'                   => 'crwdns12957:0crwdne12957:0',
+    'half_1'                                => 'crwdns12959:0crwdne12959:0',
+    'half_2'                                => 'crwdns12961:0crwdne12961:0',
 ];
diff --git a/resources/lang/aa-ER/admin/hardware/form.php b/resources/lang/aa-ER/admin/hardware/form.php
index 03289a1626..04ac2b290d 100644
--- a/resources/lang/aa-ER/admin/hardware/form.php
+++ b/resources/lang/aa-ER/admin/hardware/form.php
@@ -55,8 +55,11 @@ return [
     'asset_location_update_default' => 'crwdns6547:0crwdne6547:0',
     'asset_location_update_actual' => 'crwdns11852:0crwdne11852:0',
     'asset_not_deployable' => 'crwdns6549:0crwdne6549:0',
-    'asset_deployable' => 'crwdns6551:0crwdne6551:0',
+    'asset_not_deployable_checkin' => 'crwdns12752:0crwdne12752:0',
+    'asset_deployable' => 'crwdns12945:0crwdne12945:0',
     'processing_spinner' => 'crwdns11515:0crwdne11515:0',
+    'processing' => 'crwdns13210:0crwdne13210:0',
     'optional_infos'  => 'crwdns10490:0crwdne10490:0',
-    'order_details'   => 'crwdns10492:0crwdne10492:0'
+    'order_details'   => 'crwdns10492:0crwdne10492:0',
+    'calc_eol'    => 'crwdns12782:0crwdne12782:0',
 ];
diff --git a/resources/lang/aa-ER/admin/hardware/general.php b/resources/lang/aa-ER/admin/hardware/general.php
index 4d2d0a1c92..ae862ea7c3 100644
--- a/resources/lang/aa-ER/admin/hardware/general.php
+++ b/resources/lang/aa-ER/admin/hardware/general.php
@@ -5,8 +5,8 @@ return [
     'about_assets_text'            => 'crwdns1807:0crwdne1807:0',
     'archived'  				=> 'crwdns1168:0crwdne1168:0',
     'asset'  					=> 'crwdns755:0crwdne755:0',
-    'bulk_checkout'             => 'crwdns2023:0crwdne2023:0',
-    'bulk_checkin'              => 'crwdns6770:0crwdne6770:0',
+    'bulk_checkout'             => 'crwdns12902:0crwdne12902:0',
+    'bulk_checkin'              => 'crwdns12904:0crwdne12904:0',
     'checkin'  					=> 'crwdns756:0crwdne756:0',
     'checkout'  				=> 'crwdns1905:0crwdne1905:0',
     'clone'  					=> 'crwdns758:0crwdne758:0',
@@ -27,7 +27,7 @@ return [
     'undeployable_tooltip'  	=> 'crwdns11579:0crwdne11579:0',
     'view'  					=> 'crwdns761:0crwdne761:0',
     'csv_error' => 'crwdns6559:0crwdne6559:0',
-    'import_text' => 'crwdns12112:0crwdne12112:0',
+    'import_text' => 'crwdns13144:0crwdne13144:0',
     'csv_import_match_f-l' => 'crwdns12114:0crwdne12114:0',
     'csv_import_match_initial_last' => 'crwdns12116:0crwdne12116:0',
     'csv_import_match_first' => 'crwdns12118:0crwdne12118:0',
diff --git a/resources/lang/aa-ER/admin/hardware/message.php b/resources/lang/aa-ER/admin/hardware/message.php
index e78fdca87c..f5b12a8947 100644
--- a/resources/lang/aa-ER/admin/hardware/message.php
+++ b/resources/lang/aa-ER/admin/hardware/message.php
@@ -2,18 +2,23 @@
 
 return [
 
-    'undeployable' 		=> 'crwdns1173:0crwdne1173:0',
-    'does_not_exist' 	=> 'crwdns740:0crwdne740:0',
-    'does_not_exist_var'=> 'crwdns12188:0crwdne12188:0',
-    'no_tag' 	        => 'crwdns12190:0crwdne12190:0',
+    'undeployable' 		 => 'crwdns12562:0crwdne12562:0',
+    'does_not_exist' 	 => 'crwdns740:0crwdne740:0',
+    'does_not_exist_var' => 'crwdns12188:0crwdne12188:0',
+    'no_tag' 	         => 'crwdns12190:0crwdne12190:0',
     'does_not_exist_or_not_requestable' => 'crwdns6581:0crwdne6581:0',
-    'assoc_users'	 	=> 'crwdns741:0crwdne741:0',
+    'assoc_users'	 	 => 'crwdns741:0crwdne741:0',
     'warning_audit_date_mismatch' 	=> 'crwdns12192:0crwdne12192:0',
+    'labels_generated'   => 'crwdns12786:0crwdne12786:0',
+    'error_generating_labels' => 'crwdns12788:0crwdne12788:0',
+    'no_assets_selected' => 'crwdns12790:0crwdne12790:0',
 
     'create' => [
         'error'   		=> 'crwdns742:0crwdne742:0',
         'success' 		=> 'crwdns743:0crwdne743:0',
         'success_linked' => 'crwdns11882:0crwdne11882:0',
+        'multi_success_linked' => 'crwdns12776:0crwdne12776:0',
+        'partial_failure' => 'crwdns12778:0crwdne12778:0',
     ],
 
     'update' => [
@@ -51,20 +56,24 @@ return [
     ],
 
     'import' => [
+        'import_button'         => 'crwdns12564:0crwdne12564:0',
         'error'                 => 'crwdns1688:0crwdne1688:0',
         'errorDetail'           => 'crwdns1689:0crwdne1689:0',
         'success'               => 'crwdns1690:0crwdne1690:0',
         'file_delete_success'   => 'crwdns1698:0crwdne1698:0',
         'file_delete_error'      => 'crwdns1699:0crwdne1699:0',
         'file_missing' => 'crwdns11835:0crwdne11835:0',
+        'file_already_deleted' => 'crwdns12694:0crwdne12694:0',
         'header_row_has_malformed_characters' => 'crwdns11229:0crwdne11229:0',
         'content_row_has_malformed_characters' => 'crwdns11231:0crwdne11231:0',
+        'transliterate_failure' => 'crwdns12949:0crwdne12949:0'
     ],
 
 
     'delete' => [
         'confirm'   	=> 'crwdns746:0crwdne746:0',
         'error'   		=> 'crwdns747:0crwdne747:0',
+        'assigned_to_error' => 'crwdns12925:0{1}crwdne12925:0',
         'nothing_updated'   => 'crwdns1876:0crwdne1876:0',
         'success' 		=> 'crwdns748:0crwdne748:0',
     ],
@@ -77,6 +86,11 @@ return [
         'no_assets_selected' => 'crwdns1965:0crwdne1965:0',
     ],
 
+    'multi-checkout' => [
+        'error'   => 'crwdns12768:0crwdne12768:0',
+        'success' => 'crwdns12770:0crwdne12770:0',
+    ],
+
     'checkin' => [
         'error'   		=> 'crwdns752:0crwdne752:0',
         'success' 		=> 'crwdns753:0crwdne753:0',
@@ -86,9 +100,10 @@ return [
     ],
 
     'requests' => [
-        'error'   		=> 'crwdns1484:0crwdne1484:0',
-        'success' 		=> 'crwdns1485:0crwdne1485:0',
-        'canceled'      => 'crwdns1700:0crwdne1700:0',
+        'error'   		=> 'crwdns13013:0crwdne13013:0',
+        'success' 		=> 'crwdns13021:0crwdne13021:0',
+        'canceled'      => 'crwdns13017:0crwdne13017:0',
+        'cancel'        => 'crwdns13019:0crwdne13019:0',
     ],
 
 ];
diff --git a/resources/lang/aa-ER/admin/hardware/table.php b/resources/lang/aa-ER/admin/hardware/table.php
index 3a4ecd68df..1034194598 100644
--- a/resources/lang/aa-ER/admin/hardware/table.php
+++ b/resources/lang/aa-ER/admin/hardware/table.php
@@ -25,7 +25,6 @@ return [
     'image'		    => 'crwdns1466:0crwdne1466:0',
     'days_without_acceptance' => 'crwdns1402:0crwdne1402:0',
     'monthly_depreciation' => 'crwdns5842:0crwdne5842:0',
-    'assigned_to'    => 'crwdns12052:0crwdne12052:0',
     'requesting_user' => 'crwdns6589:0crwdne6589:0',
     'requested_date' => 'crwdns6591:0crwdne6591:0',
     'changed'       => 'crwdns6593:0crwdne6593:0',
diff --git a/resources/lang/aa-ER/admin/kits/general.php b/resources/lang/aa-ER/admin/kits/general.php
index 11317c9547..27fd6ec3ff 100644
--- a/resources/lang/aa-ER/admin/kits/general.php
+++ b/resources/lang/aa-ER/admin/kits/general.php
@@ -47,4 +47,5 @@ return [
     'kit_deleted'                       => 'crwdns6659:0crwdne6659:0',
     'kit_model_updated'                 => 'crwdns6661:0crwdne6661:0',
     'kit_model_detached'                => 'crwdns6663:0crwdne6663:0',
+    'model_already_attached'            => 'crwdns12684:0crwdne12684:0',
 ];
diff --git a/resources/lang/aa-ER/admin/licenses/general.php b/resources/lang/aa-ER/admin/licenses/general.php
index f6295cab10..acfe10c6c3 100644
--- a/resources/lang/aa-ER/admin/licenses/general.php
+++ b/resources/lang/aa-ER/admin/licenses/general.php
@@ -14,6 +14,7 @@ return array(
     'info'  					=> 'crwdns957:0crwdne957:0',
     'license_seats'  			=> 'crwdns958:0crwdne958:0',
     'seat'  					=> 'crwdns959:0crwdne959:0',
+    'seat_count'  				=> 'crwdns12566:0crwdne12566:0',
     'seats'  					=> 'crwdns960:0crwdne960:0',
     'software_licenses'  		=> 'crwdns961:0crwdne961:0',
     'user'  					=> 'crwdns962:0crwdne962:0',
@@ -23,12 +24,12 @@ return array(
         [
             'checkin_all'           => [
                 'button'            => 'crwdns11549:0crwdne11549:0',
-                'modal'             => 'crwdns11551:0crwdne11551:0',
+                'modal'             => 'crwdns12568:0crwdne12568:0',
                 'enabled_tooltip'   => 'crwdns11553:0crwdne11553:0',
                 'disabled_tooltip'  => 'crwdns11555:0crwdne11555:0',
                 'disabled_tooltip_reassignable'  => 'crwdns11803:0crwdne11803:0',
                 'success'           => 'crwdns11557:0crwdne11557:0',
-                'log_msg'           => 'crwdns11559:0crwdne11559:0',
+                'log_msg'           => 'crwdns12570:0crwdne12570:0',
             ],
 
             'checkout_all'              => [
diff --git a/resources/lang/aa-ER/admin/licenses/message.php b/resources/lang/aa-ER/admin/licenses/message.php
index f8a8298276..e0173d7e89 100644
--- a/resources/lang/aa-ER/admin/licenses/message.php
+++ b/resources/lang/aa-ER/admin/licenses/message.php
@@ -44,10 +44,13 @@ return array(
         'error'   => 'crwdns946:0crwdne946:0',
         'success' => 'crwdns947:0crwdne947:0',
         'not_enough_seats' => 'crwdns11902:0crwdne11902:0',
+        'mismatch' => 'crwdns12574:0crwdne12574:0',
+        'unavailable' => 'crwdns12576:0crwdne12576:0',
     ),
 
     'checkin' => array(
         'error'   => 'crwdns948:0crwdne948:0',
+        'not_reassignable' => 'crwdns12802:0crwdne12802:0',
         'success' => 'crwdns949:0crwdne949:0'
     ),
 
diff --git a/resources/lang/aa-ER/admin/locations/message.php b/resources/lang/aa-ER/admin/locations/message.php
index 588a0d4d8b..2004674f47 100644
--- a/resources/lang/aa-ER/admin/locations/message.php
+++ b/resources/lang/aa-ER/admin/locations/message.php
@@ -3,11 +3,12 @@
 return array(
 
     'does_not_exist' => 'crwdns650:0crwdne650:0',
-    'assoc_users'    => 'crwdns12272:0crwdne12272:0',
+    'assoc_users'    => 'crwdns13150:0crwdne13150:0',
     'assoc_assets'	 => 'crwdns1404:0crwdne1404:0',
     'assoc_child_loc'	 => 'crwdns1405:0crwdne1405:0',
     'assigned_assets' => 'crwdns11179:0crwdne11179:0',
     'current_location' => 'crwdns11181:0crwdne11181:0',
+    'open_map' => 'crwdns12696:0crwdne12696:0',
 
 
     'create' => array(
@@ -20,6 +21,11 @@ return array(
         'success' => 'crwdns655:0crwdne655:0'
     ),
 
+    'restore' => array(
+        'error'   => 'crwdns12698:0crwdne12698:0',
+        'success' => 'crwdns12700:0crwdne12700:0'
+    ),
+
     'delete' => array(
         'confirm'   	=> 'crwdns656:0crwdne656:0',
         'error'   => 'crwdns657:0crwdne657:0',
diff --git a/resources/lang/aa-ER/admin/locations/table.php b/resources/lang/aa-ER/admin/locations/table.php
index 4d2af5523f..2c0363f02d 100644
--- a/resources/lang/aa-ER/admin/locations/table.php
+++ b/resources/lang/aa-ER/admin/locations/table.php
@@ -39,4 +39,5 @@ return [
     'signed_by_finance_auditor' => 'crwdns6693:0crwdne6693:0',
     'signed_by_location_manager' => 'crwdns6695:0crwdne6695:0',
     'signed_by'                 => 'crwdns6697:0crwdne6697:0',
+    'clone'  					=> 'crwdns13240:0crwdne13240:0',
 ];
diff --git a/resources/lang/aa-ER/admin/models/general.php b/resources/lang/aa-ER/admin/models/general.php
index 998c4a0956..ce1fdfc687 100644
--- a/resources/lang/aa-ER/admin/models/general.php
+++ b/resources/lang/aa-ER/admin/models/general.php
@@ -3,7 +3,7 @@
 return array(
     'about_models_title'     => 'crwdns1815:0crwdne1815:0',
     'about_models_text'           => 'crwdns1816:0crwdne1816:0',
-    'deleted'  					        => 'crwdns6077:0crwdne6077:0',
+    'deleted'  					=> 'crwdns6077:0crwdne6077:0',
     'bulk_delete'               => 'crwdns1972:0crwdne1972:0',
     'bulk_delete_help'               => 'crwdns1973:0crwdne1973:0',
     'bulk_delete_warn'          => 'crwdns11521:0crwdne11521:0',
diff --git a/resources/lang/aa-ER/admin/models/message.php b/resources/lang/aa-ER/admin/models/message.php
index b5f0dc4f34..e134cf9e4a 100644
--- a/resources/lang/aa-ER/admin/models/message.php
+++ b/resources/lang/aa-ER/admin/models/message.php
@@ -7,7 +7,7 @@ return array(
     'no_association' => 'crwdns11693:0crwdne11693:0',
     'no_association_fix' => 'crwdns11235:0crwdne11235:0',
     'assoc_users'	 => 'crwdns672:0crwdne672:0',
-
+    'invalid_category_type' => 'crwdns12678:0crwdne12678:0',
 
     'create' => array(
         'error'   => 'crwdns673:0crwdne673:0',
diff --git a/resources/lang/aa-ER/admin/reports/general.php b/resources/lang/aa-ER/admin/reports/general.php
index 36bb7b7363..a423704aa2 100644
--- a/resources/lang/aa-ER/admin/reports/general.php
+++ b/resources/lang/aa-ER/admin/reports/general.php
@@ -4,6 +4,7 @@ return [
     'info'   => 'crwdns1136:0crwdne1136:0',
     'deleted_user' => 'crwdns6699:0crwdne6699:0',
     'send_reminder' => 'crwdns6701:0crwdne6701:0',
+    'cannot_send_reminder' => 'crwdns12947:0crwdne12947:0',
     'reminder_sent' => 'crwdns6703:0crwdne6703:0',
     'acceptance_deleted' => 'crwdns6705:0crwdne6705:0',
     'acceptance_request' => 'crwdns6707:0crwdne6707:0',
@@ -13,5 +14,10 @@ return [
         'user_state' => 'crwdns11874:0crwdne11874:0',
         'user_country' => 'crwdns11876:0crwdne11876:0',
         'user_zip' => 'crwdns11878:0crwdne11878:0'
-    ]
-];
\ No newline at end of file
+    ],
+    'open_saved_template' => 'crwdns12818:0crwdne12818:0',
+    'save_template' =>  'crwdns12820:0crwdne12820:0',
+    'select_a_template' => 'crwdns12822:0crwdne12822:0',
+    'template_name' => 'crwdns12824:0crwdne12824:0',
+    'update_template' => 'crwdns12826:0crwdne12826:0',
+];
diff --git a/resources/lang/aa-ER/admin/reports/message.php b/resources/lang/aa-ER/admin/reports/message.php
index 35d177d69e..30050e75e2 100644
--- a/resources/lang/aa-ER/admin/reports/message.php
+++ b/resources/lang/aa-ER/admin/reports/message.php
@@ -1,5 +1,16 @@
 <?php
 
-return array(
-    'error'   => 'crwdns1137:0crwdne1137:0'
-);
+return [
+    'about_templates' => 'crwdns12806:0crwdne12806:0',
+    'saving_templates_description' => 'crwdns12808:0crwdne12808:0',
+    'create'  => [
+        'success' => 'crwdns12810:0crwdne12810:0',
+    ],
+    'update' => [
+        'success' => 'crwdns12812:0crwdne12812:0',
+    ],
+    'delete' => [
+        'success' => 'crwdns12814:0crwdne12814:0',
+        'no_delete_permission' => 'crwdns12816:0crwdne12816:0',
+    ],
+];
diff --git a/resources/lang/aa-ER/admin/settings/general.php b/resources/lang/aa-ER/admin/settings/general.php
index a218b1a45f..78ef765055 100644
--- a/resources/lang/aa-ER/admin/settings/general.php
+++ b/resources/lang/aa-ER/admin/settings/general.php
@@ -8,13 +8,13 @@ return [
     'ad_append_domain'          => 'crwdns5848:0crwdne5848:0',
     'ad_append_domain_help'     => 'crwdns5850:0crwdne5850:0',
     'admin_cc_email'            => 'crwdns2026:0crwdne2026:0',
-    'admin_cc_email_help'       => 'crwdns2027:0crwdne2027:0',
+    'admin_cc_email_help'       => 'crwdns13158:0crwdne13158:0',
     'admin_settings'            => 'crwdns11908:0crwdne11908:0',
     'is_ad'				        => 'crwdns1674:0crwdne1674:0',
     'alerts'                	=> 'crwdns6315:0crwdne6315:0',
     'alert_title'               => 'crwdns11367:0crwdne11367:0',
     'alert_email'				=> 'crwdns1198:0crwdne1198:0',
-    'alert_email_help'    => 'crwdns6319:0crwdne6319:0',
+    'alert_email_help'          => 'crwdns13160:0crwdne13160:0',
     'alerts_enabled'			=> 'crwdns1623:0crwdne1623:0',
     'alert_interval'			=> 'crwdns1624:0crwdne1624:0',
     'alert_inv_threshold'		=> 'crwdns1625:0crwdne1625:0',
@@ -25,21 +25,24 @@ return [
     'audit_interval_help'       => 'crwdns11201:0crwdne11201:0',
     'audit_warning_days'        => 'crwdns1910:0crwdne1910:0',
     'audit_warning_days_help'   => 'crwdns1911:0crwdne1911:0',
-    'auto_increment_assets'		=> 'crwdns6321:0crwdne6321:0',
+    'auto_increment_assets'		=> 'crwdns13178:0crwdne13178:0',
     'auto_increment_prefix'		=> 'crwdns1148:0crwdne1148:0',
     'auto_incrementing_help'    => 'crwdns6323:0crwdne6323:0',
     'backups'					=> 'crwdns1331:0crwdne1331:0',
     'backups_help'              => 'crwdns6812:0crwdne6812:0',
     'backups_restoring'         => 'crwdns6325:0crwdne6325:0',
+    'backups_clean' => 'crwdns12712:0crwdne12712:0',
+    'backups_clean_helptext' => "crwdns12714:0crwdne12714:0",
     'backups_upload'            => 'crwdns6327:0crwdne6327:0',
     'backups_path'              => 'crwdns6329:0crwdne6329:0',
-    'backups_restore_warning'   => 'crwdns11531:0crwdne11531:0',
+    'backups_restore_warning'   => 'crwdns13156:0crwdne13156:0',
     'backups_logged_out'         => 'crwdns6774:0crwdne6774:0',
     'backups_large'             => 'crwdns6335:0crwdne6335:0',
     'barcode_settings'			=> 'crwdns1295:0crwdne1295:0',
     'confirm_purge'			    => 'crwdns1611:0crwdne1611:0',
     'confirm_purge_help'		=> 'crwdns5852:0crwdne5852:0',
     'custom_css'				=> 'crwdns1419:0crwdne1419:0',
+    'custom_css_placeholder'	=> 'crwdns12963:0crwdne12963:0',
     'custom_css_help'			=> 'crwdns1420:0crwdne1420:0',
     'custom_forgot_pass_url'	=> 'crwdns1966:0crwdne1966:0',
     'custom_forgot_pass_url_help'	=> 'crwdns1967:0crwdne1967:0',
@@ -47,34 +50,34 @@ return [
     'dashboard_message_help'	=> 'crwdns1983:0crwdne1983:0',
     'default_currency'  		=> 'crwdns1390:0crwdne1390:0',
     'default_eula_text'			=> 'crwdns1259:0crwdne1259:0',
+    'default_eula_text_placeholder' => 'crwdns13174:0crwdne13174:0',
     'default_language'			=> 'crwdns1581:0crwdne1581:0',
     'default_eula_help_text'	=> 'crwdns1260:0crwdne1260:0',
     'acceptance_note'           => 'crwdns12186:0crwdne12186:0',
     'display_asset_name'        => 'crwdns828:0crwdne828:0',
     'display_checkout_date'     => 'crwdns829:0crwdne829:0',
     'display_eol'               => 'crwdns1118:0crwdne1118:0',
-    'display_qr'                => 'crwdns1626:0crwdne1626:0',
+    'display_qr'                => 'crwdns12798:0crwdne12798:0',
     'display_alt_barcode'		=> 'crwdns1664:0crwdne1664:0',
-    'email_logo'                => 'crwdns5854:0crwdne5854:0',
     'barcode_type'				=> 'crwdns1665:0crwdne1665:0',
     'alt_barcode_type'			=> 'crwdns1666:0crwdne1666:0',
-    'email_logo_size'       => 'crwdns5856:0crwdne5856:0',
     'enabled'                   => 'crwdns6337:0crwdne6337:0',
     'eula_settings'				=> 'crwdns1296:0crwdne1296:0',
     'eula_markdown'				=> 'crwdns1261:0crwdne1261:0',
+    'empty_row_count'           => 'crwdns13236:0crwdne13236:0',
+    'empty_row_count_help'      => 'crwdns13238:0crwdne13238:0',
     'favicon'                   => 'crwdns5858:0crwdne5858:0',
     'favicon_format'            => 'crwdns5860:0crwdne5860:0',
     'favicon_size'          => 'crwdns5862:0crwdne5862:0',
     'footer_text'               => 'crwdns1987:0crwdne1987:0',
     'footer_text_help'          => 'crwdns1988:0crwdne1988:0',
+    'footer_text_placeholder'   => 'crwdns12965:0crwdne12965:0',
     'general_settings'			=> 'crwdns1297:0crwdne1297:0',
-    'general_settings_keywords' => 'crwdns12084:0crwdne12084:0',
     'general_settings_help'     => 'crwdns6341:0crwdne6341:0',
     'generate_backup'			=> 'crwdns1427:0crwdne1427:0',
     'google_workspaces'         => 'crwdns12080:0crwdne12080:0',
     'header_color'              => 'crwdns1196:0crwdne1196:0',
     'info'                      => 'crwdns831:0crwdne831:0',
-    'label_logo'                => 'crwdns5864:0crwdne5864:0',
     'label_logo_size'           => 'crwdns5866:0crwdne5866:0',
     'laravel'                   => 'crwdns1119:0crwdne1119:0',
     'ldap'                      => 'crwdns6343:0crwdne6343:0',
@@ -94,7 +97,7 @@ return [
     'ldap_login_sync_help'      => 'crwdns1969:0crwdne1969:0',
     'ldap_manager'              => 'crwdns6814:0crwdne6814:0',
     'ldap_server'               => 'crwdns1451:0crwdne1451:0',
-    'ldap_server_help'          => 'crwdns1675:0crwdne1675:0',
+    'ldap_server_help'          => 'crwdns12578:0crwdne12578:0',
     'ldap_server_cert'			=> 'crwdns1475:0crwdne1475:0',
     'ldap_server_cert_ignore'	=> 'crwdns1476:0crwdne1476:0',
     'ldap_server_cert_help'		=> 'crwdns1477:0crwdne1477:0',
@@ -108,8 +111,8 @@ return [
     'ldap_pword'                => 'crwdns1453:0crwdne1453:0',
     'ldap_basedn'               => 'crwdns1454:0crwdne1454:0',
     'ldap_filter'               => 'crwdns1455:0crwdne1455:0',
-    'ldap_pw_sync'              => 'crwdns1692:0crwdne1692:0',
-    'ldap_pw_sync_help'         => 'crwdns1693:0crwdne1693:0',
+    'ldap_pw_sync'              => 'crwdns12882:0crwdne12882:0',
+    'ldap_pw_sync_help'         => 'crwdns12884:0crwdne12884:0',
     'ldap_username_field'       => 'crwdns1456:0crwdne1456:0',
     'ldap_lname_field'          => 'crwdns1457:0crwdne1457:0',
     'ldap_fname_field'          => 'crwdns1458:0crwdne1458:0',
@@ -117,13 +120,15 @@ return [
     'ldap_version'              => 'crwdns1460:0crwdne1460:0',
     'ldap_active_flag'          => 'crwdns1461:0crwdne1461:0',
     'ldap_activated_flag_help'  => 'crwdns11176:0crwdne11176:0',
+    'ldap_invert_active_flag'   => 'crwdns12951:0crwdne12951:0',
+    'ldap_invert_active_flag_help'     => 'crwdns12953:0crwdne12953:0',
     'ldap_emp_num'              => 'crwdns1462:0crwdne1462:0',
     'ldap_email'                => 'crwdns1463:0crwdne1463:0',
     'ldap_test'                 => 'crwdns6349:0crwdne6349:0',
     'ldap_test_sync'            => 'crwdns6351:0crwdne6351:0',
     'license'                   => 'crwdns1989:0crwdne1989:0',
-    'load_remote'               => 'crwdns12086:0crwdne12086:0',
-    'load_remote_help_text'		=> 'crwdns12088:0crwdne12088:0',
+    'load_remote'               => 'crwdns12292:0crwdne12292:0',
+    'load_remote_help_text'		=> 'crwdns12294:0crwdne12294:0',
     'login'                     => 'crwdns6353:0crwdne6353:0',
     'login_attempt'             => 'crwdns6355:0crwdne6355:0',
     'login_ip'                  => 'crwdns6357:0crwdne6357:0',
@@ -131,6 +136,7 @@ return [
     'login_user_agent'          => 'crwdns6361:0crwdne6361:0',
     'login_help'                => 'crwdns6363:0crwdne6363:0',
     'login_note'                => 'crwdns1890:0crwdne1890:0',
+    'login_note_placeholder'            => "crwdns12967:0crwdne12967:0",
     'login_note_help'           => 'crwdns1891:0crwdne1891:0',
     'login_remote_user_text'    => 'crwdns2003:0crwdne2003:0',
     'login_remote_user_enabled_text' => 'crwdns2004:0crwdne2004:0',
@@ -146,13 +152,16 @@ return [
     'logo_print_assets_help'    => 'crwdns2053:0crwdne2053:0',
     'full_multiple_companies_support_help_text' => 'crwdns1464:0crwdne1464:0',
     'full_multiple_companies_support_text' => 'crwdns1465:0crwdne1465:0',
+    'scope_locations_fmcs_support_text'  => 'crwdns13049:0crwdne13049:0',
+    'scope_locations_fmcs_support_help_text'  => 'crwdns13188:0crwdne13188:0',
+    'scope_locations_fmcs_check_button' => 'crwdns13234:0crwdne13234:0',
+    'scope_locations_fmcs_support_disabled_text'  => 'crwdns13190:0crwdne13190:0',
     'show_in_model_list'   => 'crwdns1990:0crwdne1990:0',
     'optional'					=> 'crwdns1298:0crwdne1298:0',
     'per_page'                  => 'crwdns832:0crwdne832:0',
     'php'                       => 'crwdns1120:0crwdne1120:0',
-    'php_info'                  => 'crwdns6365:0crwdne6365:0',
+    'php_info'                  => 'crwdns12298:0crwdne12298:0',
     'php_overview'              => 'crwdns6367:0crwdne6367:0',
-    'php_overview_keywords'     => 'crwdns6369:0crwdne6369:0',
     'php_overview_help'         => 'crwdns6371:0crwdne6371:0',
     'php_gd_info'               => 'crwdns833:0crwdne833:0',
     'php_gd_warning'            => 'crwdns834:0crwdne834:0',
@@ -218,6 +227,8 @@ return [
     'webhook_integration_help'    => 'crwdns11403:0crwdne11403:0',
     'webhook_integration_help_button'    => 'crwdns11405:0crwdne11405:0',
     'webhook_test_help'           => 'crwdns11407:0crwdne11407:0',
+    'shortcuts_enabled'         => 'crwdns12654:0crwdne12654:0',
+    'shortcuts_help_text'       => 'crwdns12656:0crwdne12656:0',
     'snipe_version'  			=> 'crwdns1266:0crwdne1266:0',
     'support_footer'            => 'crwdns1991:0crwdne1991:0',
     'support_footer_help'       => 'crwdns1992:0crwdne1992:0',
@@ -227,7 +238,6 @@ return [
     'update'                    => 'crwdns840:0crwdne840:0',
     'value'                     => 'crwdns841:0crwdne841:0',
     'brand'                     => 'crwdns1433:0crwdne1433:0',
-    'brand_keywords'            => 'crwdns6397:0crwdne6397:0',
     'brand_help'                => 'crwdns6399:0crwdne6399:0',
     'web_brand'                 => 'crwdns5916:0crwdne5916:0',
     'about_settings_title'      => 'crwdns1434:0crwdne1434:0',
@@ -276,6 +286,8 @@ return [
     'two_factor_enrollment_text'	=> "crwdns1791:0crwdne1791:0",
     'require_accept_signature'      => 'crwdns1819:0crwdne1819:0',
     'require_accept_signature_help_text'      => 'crwdns1820:0crwdne1820:0',
+    'require_checkinout_notes'  => 'crwdns12794:0crwdne12794:0',
+    'require_checkinout_notes_help_text'    => 'crwdns12796:0crwdne12796:0',
     'left'        => 'crwdns1597:0crwdne1597:0',
     'right'        => 'crwdns1598:0crwdne1598:0',
     'top'        => 'crwdns1599:0crwdne1599:0',
@@ -313,24 +325,24 @@ return [
     'filter_by_keyword' => 'crwdns6431:0crwdne6431:0',
     'security' => 'crwdns6433:0crwdne6433:0',
     'security_title' => 'crwdns6435:0crwdne6435:0',
-    'security_keywords' => 'crwdns6437:0crwdne6437:0',
     'security_help' => 'crwdns6439:0crwdne6439:0',
-    'groups_keywords' => 'crwdns6441:0crwdne6441:0',
     'groups_help' => 'crwdns6443:0crwdne6443:0',
     'localization' => 'crwdns6445:0crwdne6445:0',
     'localization_title' => 'crwdns6447:0crwdne6447:0',
-    'localization_keywords' => 'crwdns6449:0crwdne6449:0',
     'localization_help' => 'crwdns6451:0crwdne6451:0',
     'notifications' => 'crwdns6453:0crwdne6453:0',
     'notifications_help' => 'crwdns11363:0crwdne11363:0',
     'asset_tags_help' => 'crwdns6457:0crwdne6457:0',
     'labels' => 'crwdns6459:0crwdne6459:0',
     'labels_title' => 'crwdns6461:0crwdne6461:0',
-    'labels_help' => 'crwdns6463:0crwdne6463:0',
-    'purge_keywords' => 'crwdns6467:0crwdne6467:0',
+    'labels_help' => 'crwdns12840:0crwdne12840:0',
     'purge_help' => 'crwdns6469:0crwdne6469:0',
     'ldap_extension_warning' => 'crwdns6471:0crwdne6471:0',
     'ldap_ad' => 'crwdns6473:0crwdne6473:0',
+    'ldap_test_label' => 'crwdns12892:0crwdne12892:0',
+    'ldap_test_login' => 'crwdns12894:0crwdne12894:0',
+    'ldap_username_placeholder' => 'crwdns12896:0crwdne12896:0',
+    'ldap_password_placeholder' => 'crwdns12898:0crwdne12898:0',
     'employee_number' => 'crwdns6475:0crwdne6475:0',
     'create_admin_user' => 'crwdns6477:0crwdne6477:0',
     'create_admin_success' => 'crwdns6479:0crwdne6479:0',
@@ -342,6 +354,8 @@ return [
     'setup_migration_create_user' => 'crwdns6491:0crwdne6491:0',
     'ldap_settings_link' => 'crwdns6493:0crwdne6493:0',
     'slack_test' => 'crwdns6495:0crwdne6495:0',
+    'status_label_name' => 'crwdns12969:0crwdne12969:0',
+    'super_admin_only'  => 'crwdns12971:0crwdne12971:0',
     'label2_enable'           => 'crwdns11723:0crwdne11723:0',
     'label2_enable_help'      => 'crwdns11725:0crwdne11725:0',
     'label2_template'         => 'crwdns11727:0crwdne11727:0',
@@ -356,12 +370,15 @@ return [
     'label2_2d_type'          => 'crwdns11745:0crwdne11745:0',
     'label2_2d_type_help'     => 'crwdns11747:0crwdne11747:0',
     'label2_2d_target'        => 'crwdns11749:0crwdne11749:0',
-    'label2_2d_target_help'   => 'crwdns11751:0crwdne11751:0',
+    'label2_2d_target_help'   => 'crwdns12832:0crwdne12832:0',
     'label2_fields'           => 'crwdns11753:0crwdne11753:0',
     'label2_fields_help'      => 'crwdns11755:0crwdne11755:0',
+    'purge_barcodes' => 'crwdns12985:0crwdne12985:0',
     'help_asterisk_bold'    => 'crwdns11757:0crwdne11757:0',
     'help_blank_to_use'     => 'crwdns11759:0crwdne11759:0',
-    'help_default_will_use' => 'crwdns11789:0crwdne11789:0',
+    'help_default_will_use' => 'crwdns12834:0crwdne12834:0',
+    'asset_id'              => 'crwdns12836:0crwdne12836:0',
+    'data'               => 'crwdns12838:0crwdne12838:0',
     'default'               => 'crwdns11763:0crwdne11763:0',
     'none'                  => 'crwdns11765:0crwdne11765:0',
     'google_callback_help' => 'crwdns11615:0crwdne11615:0',
@@ -373,7 +390,100 @@ return [
     'database_driver' => 'crwdns11827:0crwdne11827:0',
     'bs_table_storage' => 'crwdns11829:0crwdne11829:0',
     'timezone' => 'crwdns11831:0crwdne11831:0',
+    'test_mail' => 'crwdns12973:0crwdne12973:0',
     'profile_edit'          => 'crwdns12280:0crwdne12280:0',
     'profile_edit_help'          => 'crwdns12282:0crwdne12282:0',
+    'default_avatar' => 'crwdns12987:0crwdne12987:0',
+    'default_avatar_help' => 'crwdns12590:0crwdne12590:0',
+    'restore_default_avatar' => 'crwdns12592:0crwdne12592:0',
+    'restore_default_avatar_help' => 'crwdns12594:0crwdne12594:0',
+    'due_checkin_days' => 'crwdns12680:0crwdne12680:0',
+    'due_checkin_days_help' => 'crwdns12682:0crwdne12682:0',
+    'no_groups' => 'crwdns12760:0crwdne12760:0',
+    'text' => 'crwdns12975:0crwdne12975:0',
+
+    'username_formats' => [
+        'username_format'		=> 'crwdns13090:0crwdne13090:0',
+        'firstname_lastname_format'	=> 'crwdns13092:0crwdne13092:0',
+        'first_name_format'	        => 'crwdns13094:0crwdne13094:0',
+        'last_name_format'		=> 'crwdns13096:0crwdne13096:0',
+        'filastname_format'			=> 'crwdns13098:0crwdne13098:0',
+        'lastnamefirstinitial_format' =>  'crwdns13100:0crwdne13100:0',
+        'firstname_lastname_underscore_format' => 'crwdns13102:0crwdne13102:0',
+        'firstinitial.lastname' => 'crwdns13104:0crwdne13104:0',
+        'lastname_firstinitial' => 'crwdns13106:0crwdne13106:0',
+        'lastname_dot_firstinitial_format' => 'crwdns13108:0crwdne13108:0',
+        'firstnamelastname'     => 'crwdns13110:0crwdne13110:0',
+        'firstnamelastinitial'  => 'crwdns13112:0crwdne13112:0',
+        'lastnamefirstname'      => 'crwdns13114:0crwdne13114:0',
+    ],
+
+    'email_formats' => [
+        'email_format'			=> 'crwdns13116:0crwdne13116:0',
+        'firstname_lastname_format'	=> 'crwdns13118:0crwdne13118:0',
+        'first_name_format'		=> 'crwdns13120:0crwdne13120:0',
+        'last_name_format'		=> 'crwdns13122:0crwdne13122:0',
+        'filastname_format'			=> 'crwdns13124:0crwdne13124:0',
+        'lastnamefirstinitial_format' =>  'crwdns13126:0crwdne13126:0',
+        'firstname_lastname_underscore_format' => 'crwdns13128:0crwdne13128:0',
+        'firstinitial.lastname' => 'crwdns13130:0crwdne13130:0',
+        'lastname_firstinitial' => 'crwdns13132:0crwdne13132:0',
+        'lastname_dot_firstinitial_format' => 'crwdns13134:0crwdne13134:0',
+        'firstnamelastname'     => 'crwdns13136:0crwdne13136:0',
+        'firstnamelastinitial'  => 'crwdns13138:0crwdne13138:0',
+        'lastnamefirstname'      => 'crwdns13140:0crwdne13140:0',
+    ],
+
+
+
+    'logo_labels' => [
+        'acceptance_pdf_logo'       => 'crwdns12989:0crwdne12989:0',
+        'email_logo'                => 'crwdns12991:0crwdne12991:0',
+        'label_logo'                => 'crwdns12993:0crwdne12993:0',
+        'logo'                      => 'crwdns12995:0crwdne12995:0',
+        'favicon'                   => 'crwdns12997:0crwdne12997:0',
+    ],
+
+    'logo_help' => [
+        'email_logo_size'       => 'crwdns12999:0crwdne12999:0',
+    ],
+
+    'logo_option_types' => [
+        'text' => 'crwdns12977:0crwdne12977:0',
+        'logo' => 'crwdns12979:0crwdne12979:0',
+        'logo_and_text' => 'crwdns12981:0crwdne12981:0',
+    ],
+
+
+    'legends' => [
+        'scoping' => 'crwdns13192:0crwdne13192:0',
+        'formats' => 'crwdns13194:0crwdne13194:0',
+        'profiles' => 'crwdns13196:0crwdne13196:0',
+        'eula' => 'crwdns13224:0crwdne13224:0',
+        'misc_display' => 'crwdns13200:0crwdne13200:0',
+        'email' => 'crwdns13202:0crwdne13202:0',
+        'checkin' => 'crwdns13204:0crwdne13204:0',
+        'dashboard' => 'crwdns13206:0crwdne13206:0',
+        'misc' => 'crwdns13208:0crwdne13208:0',
+        'logos' => 'crwdns13212:0crwdne13212:0',
+        'colors' => 'crwdns13214:0crwdne13214:0',
+        'footer' => 'crwdns13216:0crwdne13216:0',
+        'security' => 'crwdns13218:0crwdne13218:0',
+        'general' => 'crwdns13220:0crwdne13220:0',
+        'intervals' => 'crwdns13222:0crwdne13222:0',
+    ],
+
+
+    /* Keywords for settings overview help */
+    'keywords' => [
+        'brand'             => 'crwdns12842:0crwdne12842:0',
+        'general_settings'  => 'crwdns12844:0crwdne12844:0',
+        'groups'            => 'crwdns12846:0crwdne12846:0',
+        'labels'            => 'crwdns12848:0crwdne12848:0',
+        'localization'      => 'crwdns12850:0crwdne12850:0',
+        'php_overview'      => 'crwdns12852:0crwdne12852:0',
+        'purge'             => 'crwdns12854:0crwdne12854:0',
+        'security'          => 'crwdns12856:0crwdne12856:0',
+    ],
 
 ];
diff --git a/resources/lang/aa-ER/admin/settings/message.php b/resources/lang/aa-ER/admin/settings/message.php
index 5e88ef0903..b861a76595 100644
--- a/resources/lang/aa-ER/admin/settings/message.php
+++ b/resources/lang/aa-ER/admin/settings/message.php
@@ -14,6 +14,9 @@ return [
         'restore_warning'       => 'crwdns6709:0crwdne6709:0',
         'restore_confirm'       => 'crwdns6711:0crwdne6711:0'
     ],
+    'restore' => [
+        'success'               => 'crwdns12668:0crwdne12668:0'
+    ],
     'purge' => [
         'error'     => 'crwdns1615:0crwdne1615:0',
         'validation_failed'     => 'crwdns1616:0crwdne1616:0',
@@ -33,6 +36,9 @@ return [
         'testing_authentication' => 'crwdns6729:0crwdne6729:0',
         'authentication_success' => 'crwdns6731:0crwdne6731:0'
     ],
+    'labels' => [
+        'null_template' => 'crwdns12900:0crwdne12900:0',
+        ],
     'webhook' => [
         'sending' => 'crwdns11373:0crwdne11373:0',
         'success' => 'crwdns11841:0crwdne11841:0',
@@ -42,5 +48,12 @@ return [
         'error' => 'crwdns11381:0crwdne11381:0',
         'error_redirect' => 'crwdns11843:0crwdne11843:0',
         'error_misc' => 'crwdns11383:0crwdne11383:0',
-    ]
+        'webhook_fail' => 'crwdns12830:0crwdne12830:0',
+        'webhook_channel_not_found' => 'crwdns12876:0crwdne12876:0',
+        'ms_teams_deprecation' => 'crwdns13246:0crwdne13246:0',
+    ],
+    'location_scoping' => [
+        'not_saved' => 'crwdns13053:0crwdne13053:0',
+        'mismatch' => 'crwdns13055:0crwdne13055:0',
+    ],
 ];
diff --git a/resources/lang/aa-ER/admin/users/general.php b/resources/lang/aa-ER/admin/users/general.php
index c6e1289526..1520edc625 100644
--- a/resources/lang/aa-ER/admin/users/general.php
+++ b/resources/lang/aa-ER/admin/users/general.php
@@ -19,6 +19,8 @@ return [
     'print_assigned'    => 'crwdns1993:0crwdne1993:0',
     'email_assigned'    => 'crwdns10484:0crwdne10484:0',
     'user_notified'     => 'crwdns10486:0crwdne10486:0',
+    'users_notified'    => 'crwdns12921:0crwdne12921:0',
+    'users_notified_warning' => 'crwdns12923:0crwdne12923:0',
     'auto_assign_label' => 'crwdns11345:0crwdne11345:0',
     'auto_assign_help'  => 'crwdns11347:0crwdne11347:0',
     'software_user'     => 'crwdns1131:0crwdne1131:0',
diff --git a/resources/lang/aa-ER/admin/users/message.php b/resources/lang/aa-ER/admin/users/message.php
index b4d71b6ef6..46006c7ea1 100644
--- a/resources/lang/aa-ER/admin/users/message.php
+++ b/resources/lang/aa-ER/admin/users/message.php
@@ -6,7 +6,7 @@ return array(
     'declined'                  => 'crwdns1345:0crwdne1345:0',
     'bulk_manager_warn'	        => 'crwdns1849:0crwdne1849:0',
     'user_exists'               => 'crwdns787:0crwdne787:0',
-    'user_not_found'            => 'crwdns11623:0crwdne11623:0',
+    'user_not_found'            => 'crwdns12744:0crwdne12744:0',
     'user_login_required'       => 'crwdns789:0crwdne789:0',
     'user_has_no_assets_assigned' => 'crwdns11868:0crwdne11868:0',
     'user_password_required'    => 'crwdns790:0crwdne790:0',
@@ -53,6 +53,7 @@ return array(
         'ldap_could_not_search' => 'crwdns1415:0crwdne1415:0',
         'ldap_could_not_get_entries' => 'crwdns1416:0crwdne1416:0',
         'password_ldap' => 'crwdns1889:0crwdne1889:0',
+        'multi_company_items_assigned' => 'crwdns12754:0crwdne12754:0'
     ),
 
     'deletefile' => array(
diff --git a/resources/lang/aa-ER/admin/users/table.php b/resources/lang/aa-ER/admin/users/table.php
index 5874f241e1..f1b801f2bc 100644
--- a/resources/lang/aa-ER/admin/users/table.php
+++ b/resources/lang/aa-ER/admin/users/table.php
@@ -22,7 +22,7 @@ return array(
     'managed_locations'     => 'crwdns1887:0crwdne1887:0',
     'managed_users'         => 'crwdns12182:0crwdne12182:0',
     'name' 					=> 'crwdns779:0crwdne779:0',
-    'nogroup'               => 'crwdns11906:0crwdne11906:0',
+    'nogroup'               => 'crwdns13152:0crwdne13152:0',
     'notes'                 => 'crwdns1268:0crwdne1268:0',
     'password_confirm' 		=> 'crwdns780:0crwdne780:0',
     'password' 				=> 'crwdns781:0crwdne781:0',
diff --git a/resources/lang/aa-ER/auth.php b/resources/lang/aa-ER/auth.php
index 27df1e1525..ca1694e34a 100644
--- a/resources/lang/aa-ER/auth.php
+++ b/resources/lang/aa-ER/auth.php
@@ -15,6 +15,6 @@ return array(
 
     'failed' => 'crwdns6844:0crwdne6844:0',
     'password' => 'crwdns6846:0crwdne6846:0',
-    'throttle' => 'crwdns6848:0crwdne6848:0',
+    'throttle' => 'crwdns13001:0crwdne13001:0',
 
 );
diff --git a/resources/lang/aa-ER/auth/message.php b/resources/lang/aa-ER/auth/message.php
index 67d18c4daf..3fe1fa1d0a 100644
--- a/resources/lang/aa-ER/auth/message.php
+++ b/resources/lang/aa-ER/auth/message.php
@@ -6,8 +6,6 @@ return array(
     'account_not_found'      => 'crwdns1392:0crwdne1392:0',
     'account_not_activated'  => 'crwdns1104:0crwdne1104:0',
     'account_suspended'      => 'crwdns1105:0crwdne1105:0',
-    'account_banned'         => 'crwdns1106:0crwdne1106:0',
-    'throttle'               => 'crwdns5926:0crwdne5926:0',
 
     'two_factor' => array(
         'already_enrolled'      => 'crwdns5928:0crwdne5928:0',
diff --git a/resources/lang/aa-ER/button.php b/resources/lang/aa-ER/button.php
index 363e8b894b..9284fc6a74 100644
--- a/resources/lang/aa-ER/button.php
+++ b/resources/lang/aa-ER/button.php
@@ -7,6 +7,7 @@ return [
     'checkin_and_delete'  	    => 'crwdns10510:0crwdne10510:0',
     'delete'  	                => 'crwdns965:0crwdne965:0',
     'edit'    	                => 'crwdns964:0crwdne964:0',
+    'clone'    	                => 'crwdns12596:0crwdne12596:0',
     'restore' 	                => 'crwdns966:0crwdne966:0',
     'remove'                    => 'crwdns6301:0crwdne6301:0',
     'request'                   => 'crwdns1407:0crwdne1407:0',
@@ -21,4 +22,13 @@ return [
     'add_maintenance'           => 'crwdns6307:0crwdne6307:0',
     'append'                    => 'crwdns6309:0crwdne6309:0',
     'new'                       => 'crwdns6311:0crwdne6311:0',
+    'var' => [
+        'clone'     => 'crwdns12598:0crwdne12598:0',
+        'edit'      => 'crwdns12600:0crwdne12600:0',
+        'delete'    => 'crwdns12602:0crwdne12602:0',
+        'restore'   => 'crwdns12646:0crwdne12646:0',
+        'create'    => 'crwdns12606:0crwdne12606:0',
+        'checkout'  => 'crwdns12608:0crwdne12608:0',
+        'checkin'   => 'crwdns12610:0crwdne12610:0',
+    ]
 ];
diff --git a/resources/lang/aa-ER/general.php b/resources/lang/aa-ER/general.php
index bea3cdd70f..80f585ea17 100644
--- a/resources/lang/aa-ER/general.php
+++ b/resources/lang/aa-ER/general.php
@@ -10,7 +10,7 @@ return [
     'action'                => 'crwdns1304:0crwdne1304:0',
     'activity_report'		=> 'crwdns1291:0crwdne1291:0',
     'address'				=> 'crwdns1019:0crwdne1019:0',
-    'admin'					=> 'crwdns1020:0crwdne1020:0',
+    'admin'					=> 'crwdns12906:0crwdne12906:0',
     'admin_tooltip'			=> 'crwdns12216:0crwdne12216:0',
     'superuser'				=> 'crwdns12218:0crwdne12218:0',
     'superuser_tooltip'		=> 'crwdns12220:0crwdne12220:0',
@@ -23,13 +23,16 @@ return [
     'asset_models'			=> 'crwdns1023:0crwdne1023:0',
     'asset_model'			=> 'crwdns1950:0crwdne1950:0',
     'asset'					=> 'crwdns1024:0crwdne1024:0',
+    'asset_previous'        => 'crwdns13162:0crwdne13162:0',
     'asset_report'          => 'crwdns1138:0crwdne1138:0',
     'asset_tag'				=> 'crwdns1025:0crwdne1025:0',
     'asset_tags'            => 'crwdns6097:0crwdne6097:0',
     'assets_available'		=> 'crwdns6099:0crwdne6099:0',
     'accept_assets'         => 'crwdns6101:0crwdne6101:0',
     'accept_assets_menu'    => 'crwdns6103:0crwdne6103:0',
+    'accept_item'           => 'crwdns12908:0crwdne12908:0',
     'audit'				    => 'crwdns1913:0crwdne1913:0',
+    'audits'				=> 'crwdns13025:0crwdne13025:0',
     'audit_report'			=> 'crwdns1914:0crwdne1914:0',
     'assets'				=> 'crwdns1027:0crwdne1027:0',
     'assets_audited'        => 'crwdns11297:0crwdne11297:0',
@@ -61,9 +64,12 @@ return [
     'changepassword'  		=> 'crwdns1035:0crwdne1035:0',
     'checkin'  				=> 'crwdns1036:0crwdne1036:0',
     'checkin_from'  		=> 'crwdns1272:0crwdne1272:0',
+    'checkin_note'  		=> 'crwdns13003:0crwdne13003:0',
+    'checkout_note'  		=> 'crwdns13005:0crwdne13005:0',
     'checkout'  			=> 'crwdns1037:0crwdne1037:0',
     'checkouts_count'       => 'crwdns2017:0crwdne2017:0',
     'checkins_count'        => 'crwdns2018:0crwdne2018:0',
+    'checkin_and_delete'  	=> 'crwdns12758:0crwdne12758:0',
     'user_requests_count'   => 'crwdns2019:0crwdne2019:0',
     'city'  				=> 'crwdns1038:0crwdne1038:0',
     'click_here'			=> 'crwdns1854:0crwdne1854:0',
@@ -77,7 +83,7 @@ return [
     'consumables'			=> 'crwdns1327:0crwdne1327:0',
     'country'  				=> 'crwdns1039:0crwdne1039:0',
     'could_not_restore'     => 'crwdns11894:0:item_type:crwdne11894:0',
-    'not_deleted'           => 'crwdns11896:0crwdne11896:0',
+    'not_deleted'           => 'crwdns12670:0crwdne12670:0',
     'create'				=> 'crwdns1040:0crwdne1040:0',
     'created'               => 'crwdns1773:0crwdne1773:0',
     'created_asset'			=> 'crwdns1041:0crwdne1041:0',
@@ -86,11 +92,13 @@ return [
     'record_created' 		=> 'crwdns5946:0crwdne5946:0',
     'updated_at' 			=> 'crwdns1856:0crwdne1856:0',
     'currency'  			=> 'crwdns1043:0crwdne1043:0', // this is deprecated
+    'currency_text'  		=> 'crwdns12935:0crwdne12935:0', //
     'current'  				=> 'crwdns1044:0crwdne1044:0',
     'current_password'      => 'crwdns6113:0crwdne6113:0',
     'customize_report'      => 'crwdns6115:0crwdne6115:0',
     'custom_report'         => 'crwdns1139:0crwdne1139:0',
     'dashboard'				=> 'crwdns1202:0crwdne1202:0',
+    'data_source'           => 'crwdns12886:0crwdne12886:0',
     'days'      			=> 'crwdns1917:0crwdne1917:0',
     'days_to_next_audit'    => 'crwdns1918:0crwdne1918:0',
     'date'					=> 'crwdns1045:0crwdne1045:0',
@@ -98,7 +106,7 @@ return [
     'debug_warning_text'    => 'crwdns1828:0crwdne1828:0',
     'delete'  				=> 'crwdns1046:0crwdne1046:0',
     'delete_confirm'  		=> 'crwdns2020:0crwdne2020:0',
-    'delete_confirm_no_undo' => 'crwdns11599:0crwdne11599:0',
+    'delete_confirm_no_undo' => 'crwdns12672:0crwdne12672:0',
     'deleted'  				=> 'crwdns1047:0crwdne1047:0',
     'delete_seats'  		=> 'crwdns1430:0crwdne1430:0',
     'deletion_failed'       => 'crwdns6117:0crwdne6117:0',
@@ -114,29 +122,13 @@ return [
     'editprofile'  			=> 'crwdns1051:0crwdne1051:0',
     'eol'					=> 'crwdns1052:0crwdne1052:0',
     'email_domain'			=> 'crwdns1642:0crwdne1642:0',
-    'email_format'			=> 'crwdns1643:0crwdne1643:0',
     'employee_number'       => 'crwdns6776:0crwdne6776:0',
     'email_domain_help'		=> 'crwdns1644:0crwdne1644:0',
     'error'				    => 'crwdns6121:0crwdne6121:0',
     'exclude_archived'      => 'crwdns10514:0crwdne10514:0',
     'exclude_deleted'       => 'crwdns10516:0crwdne10516:0',
     'example'				=> 'crwdns10462:0crwdne10462:0',
-    'filastname_format'			=> 'crwdns1645:0crwdne1645:0',
-    'firstname_lastname_format'	=> 'crwdns1646:0crwdne1646:0',
-    'firstname_lastname_underscore_format' => 'crwdns1995:0crwdne1995:0',
-    'lastnamefirstinitial_format' =>  'crwdns1999:0crwdne1999:0',
-    'firstintial_dot_lastname_format' => 'crwdns5948:0crwdne5948:0',
-    'firstname_lastname_display'	=> 'crwdns11779:0crwdne11779:0',
-    'lastname_firstname_display'	=> 'crwdns11781:0crwdne11781:0',
-    'name_display_format'	=> 'crwdns11783:0crwdne11783:0',
-    'first'					=> 'crwdns1273:0crwdne1273:0',
-    'firstnamelastname'     => 'crwdns5950:0crwdne5950:0',
-    'lastname_firstinitial' => 'crwdns5952:0crwdne5952:0',
-    'firstinitial.lastname' => 'crwdns5954:0crwdne5954:0',
-    'firstnamelastinitial'  => 'crwdns5956:0crwdne5956:0',
-    'lastnamefirstname'      => 'crwdns12266:0crwdne12266:0',
-    'first_name'			=> 'crwdns1053:0crwdne1053:0',
-    'first_name_format'		=> 'crwdns1647:0crwdne1647:0',
+
     'files'                 => 'crwdns1996:0crwdne1996:0',
     'file_name'				=> 'crwdns1153:0crwdne1153:0',
     'file_type'             => 'crwdns5970:0crwdne5970:0',
@@ -156,9 +148,9 @@ return [
     'image_delete'         	=> 'crwdns1057:0crwdne1057:0',
     'include_deleted'       => 'crwdns10518:0crwdne10518:0',
     'image_upload'         	=> 'crwdns1058:0crwdne1058:0',
-    'filetypes_accepted_help'    => 'crwdns6129:0crwdne6129:0',
-    'filetypes_size_help'   => 'crwdns6131:0crwdne6131:0',
-    'image_filetypes_help'  => 'crwdns12284:0crwdne12284:0',
+    'filetypes_accepted_help'    => 'crwdns12622:0crwdne12622:0',
+    'filetypes_size_help'   => 'crwdns12624:0crwdne12624:0',
+    'image_filetypes_help'  => 'crwdns12674:0crwdne12674:0',
     'unaccepted_image_type'  => 'crwdns11365:0crwdne11365:0',
     'import'         	    => 'crwdns1411:0crwdne1411:0',
     'import_this_file'      => 'crwdns11922:0crwdne11922:0',
@@ -178,12 +170,17 @@ return [
     'last'					=> 'crwdns1274:0crwdne1274:0',
     'last_login'            => 'crwdns1857:0crwdne1857:0',
     'last_name'             => 'crwdns1059:0crwdne1059:0',
+    'firstname_lastname_display'	=> 'crwdns11779:0crwdne11779:0',
+    'lastname_firstname_display'	=> 'crwdns11781:0crwdne11781:0',
+    'name_display_format'	=> 'crwdns11783:0crwdne11783:0',
+    'first'					=> 'crwdns1273:0crwdne1273:0',
+    'first_name'			=> 'crwdns1053:0crwdne1053:0',
     'license'				=> 'crwdns1060:0crwdne1060:0',
     'license_report'        => 'crwdns1141:0crwdne1141:0',
     'licenses_available'	=> 'crwdns12172:0crwdne12172:0',
     'licenses'				=> 'crwdns1062:0crwdne1062:0',
     'list_all'				=> 'crwdns1063:0crwdne1063:0',
-    'loading'				=> 'crwdns6135:0crwdne6135:0',
+    'loading'				=> 'crwdns12628:0crwdne12628:0',
     'lock_passwords'        => 'crwdns5974:0crwdne5974:0',
     'feature_disabled'      => 'crwdns1774:0crwdne1774:0',
     'location'              => 'crwdns1064:0crwdne1064:0',
@@ -193,7 +190,7 @@ return [
     'logout'				=> 'crwdns1066:0crwdne1066:0',
     'lookup_by_tag'     => 'crwdns1648:0crwdne1648:0',
     'maintenances'          => 'crwdns1998:0crwdne1998:0',
-    'manage_api_keys'       => 'crwdns6137:0crwdne6137:0',
+    'manage_api_keys'       => 'crwdns12630:0crwdne12630:0',
     'manufacturer'			=> 'crwdns1067:0crwdne1067:0',
     'manufacturers'			=> 'crwdns1068:0crwdne1068:0',
     'markdown'				=> 'crwdns1574:0crwdne1574:0',
@@ -215,6 +212,14 @@ return [
     'no_results'			=> 'crwdns1074:0crwdne1074:0',
     'no'  					=> 'crwdns1075:0crwdne1075:0',
     'notes'  				=> 'crwdns1076:0crwdne1076:0',
+    'note_added'            => 'crwdns12858:0crwdne12858:0',
+    'options'				=> 'crwdns12888:0crwdne12888:0',
+    'preview'				=> 'crwdns12890:0crwdne12890:0',
+    'add_note'              => 'crwdns12860:0crwdne12860:0',
+    'note_edited'            => 'crwdns12862:0crwdne12862:0',
+    'edit_note'              => 'crwdns12864:0crwdne12864:0',
+    'note_deleted'            => 'crwdns12866:0crwdne12866:0',
+    'delete_note'              => 'crwdns12868:0crwdne12868:0',
     'order_number'          => 'crwdns1829:0crwdne1829:0',
     'only_deleted'          => 'crwdns10520:0crwdne10520:0',
     'page_menu'				=> 'crwdns1276:0crwdne1276:0',
@@ -229,7 +234,7 @@ return [
     'purchase_date'         => 'crwdns1831:0crwdne1831:0',
     'qty'		            => 'crwdns1328:0crwdne1328:0',
     'quantity'		        => 'crwdns1473:0crwdne1473:0',
-    'quantity_minimum'      => 'crwdns6143:0crwdne6143:0',
+    'quantity_minimum'      => 'crwdns12774:0crwdne12774:0',
     'quickscan_checkin'  	=> 'crwdns6778:0crwdne6778:0',
     'quickscan_checkin_status'  	=> 'crwdns6780:0crwdne6780:0',
     'ready_to_deploy'		=> 'crwdns1081:0crwdne1081:0',
@@ -254,7 +259,7 @@ return [
     'select_all'            => 'crwdns6155:0crwdne6155:0',
     'search'				=> 'crwdns1290:0crwdne1290:0',
     'select_category'       => 'crwdns1663:0crwdne1663:0',
-    'select_datasource' => 'crwdns12166:0crwdne12166:0',
+    'select_datasource' => 'crwdns12632:0crwdne12632:0',
     'select_department'     => 'crwdns1880:0crwdne1880:0',
     'select_depreciation'	=> 'crwdns1282:0crwdne1282:0',
     'select_location'		=> 'crwdns1283:0crwdne1283:0',
@@ -274,13 +279,15 @@ return [
     'signed_off_by'         => 'crwdns6784:0crwdne6784:0',
     'skin'       			=> 'crwdns2002:0crwdne2002:0',
     'webhook_msg_note'        => 'crwdns11483:0crwdne11483:0',
-    'webhook_test_msg'        => 'crwdns11371:0crwdne11371:0',
+    'webhook_test_msg'        => 'crwdns12634:0crwdne12634:0',
     'some_features_disabled' => 'crwdns1669:0crwdne1669:0',
     'site_name'				=> 'crwdns1086:0crwdne1086:0',
     'state'  				=> 'crwdns1087:0crwdne1087:0',
     'status_labels'			=> 'crwdns1088:0crwdne1088:0',
+    'status_label'			=> 'crwdns12662:0crwdne12662:0',
     'status'    			=> 'crwdns1089:0crwdne1089:0',
     'accept_eula'           => 'crwdns6786:0crwdne6786:0',
+    'show_or_hide_eulas' => 'crwdns12756:0crwdne12756:0',
     'supplier'              => 'crwdns1833:0crwdne1833:0',
     'suppliers'  			=> 'crwdns1090:0crwdne1090:0',
     'sure_to_delete'        => 'crwdns1858:0crwdne1858:0',
@@ -296,9 +303,9 @@ return [
     'type'  				=> 'crwdns1203:0crwdne1203:0',
     'undeployable'			=> 'crwdns1093:0crwdne1093:0',
     'unknown_admin'			=> 'crwdns1094:0crwdne1094:0',
-    'username_format'		=> 'crwdns1649:0crwdne1649:0',
     'username'              => 'crwdns10464:0crwdne10464:0',
     'update'                => 'crwdns1341:0crwdne1341:0',
+    'updating_item' => 'crwdns12804:0crwdne12804:0',
     'upload_filetypes_help'      => 'crwdns5980:0crwdne5980:0',
     'uploaded'              => 'crwdns1289:0crwdne1289:0',
     'user'					=> 'crwdns1095:0crwdne1095:0',
@@ -323,10 +330,10 @@ return [
     'token_expired'         => 'crwdns1578:0crwdne1578:0',
     'login_enabled'         => 'crwdns5984:0crwdne5984:0',
     'audit_due'             => 'crwdns5986:0crwdne5986:0',
-    'audit_due_days'        => 'crwdns12174:0crwdne12174:0',
+    'audit_due_days'        => 'crwdns12910:0crwdne12910:0',
     'checkin_due'           => 'crwdns12176:0crwdne12176:0',
     'checkin_overdue'       => 'crwdns12178:0crwdne12178:0',
-    'checkin_due_days'      => 'crwdns12180:0crwdne12180:0',
+    'checkin_due_days'      => 'crwdns12912:0crwdne12912:0',
     'audit_overdue'         => 'crwdns5988:0crwdne5988:0',
     'accept'                => 'crwdns6016:0crwdne6016:0',
     'i_accept'              => 'crwdns6018:0crwdne6018:0',
@@ -339,16 +346,16 @@ return [
     'view_all'              => 'crwdns6165:0crwdne6165:0',
     'hide_deleted'          => 'crwdns6167:0crwdne6167:0',
     'email'                 => 'crwdns6169:0crwdne6169:0',
-    'do_not_change'         => 'crwdns6171:0crwdne6171:0',
-    'bug_report'            => 'crwdns6173:0crwdne6173:0',
+    'do_not_change'         => 'crwdns12636:0crwdne12636:0',
+    'bug_report'            => 'crwdns12638:0crwdne12638:0',
     'user_manual'           => 'crwdns6175:0crwdne6175:0',
     'setup_step_1'          => 'crwdns6177:0crwdne6177:0',
     'setup_step_2'          => 'crwdns6179:0crwdne6179:0',
     'setup_step_3'          => 'crwdns6181:0crwdne6181:0',
     'setup_step_4'          => 'crwdns6183:0crwdne6183:0',
     'setup_config_check'    => 'crwdns6185:0crwdne6185:0',
-    'setup_create_database' => 'crwdns6187:0crwdne6187:0',
-    'setup_create_admin'    => 'crwdns6189:0crwdne6189:0',
+    'setup_create_database' => 'crwdns12640:0crwdne12640:0',
+    'setup_create_admin'    => 'crwdns12676:0crwdne12676:0',
     'setup_done'            => 'crwdns6191:0crwdne6191:0',
     'bulk_edit_about_to'    => 'crwdns6193:0crwdne6193:0',
     'checked_out'           => 'crwdns6195:0crwdne6195:0',
@@ -382,6 +389,8 @@ return [
     'new_license'           => 'crwdns6249:0crwdne6249:0',
     'new_accessory'         => 'crwdns6251:0crwdne6251:0',
     'new_consumable'        => 'crwdns6253:0crwdne6253:0',
+    'new_component'         => 'crwdns13228:0crwdne13228:0',
+    'new_user'              => 'crwdns13230:0crwdne13230:0',
     'collapse'              => 'crwdns6255:0crwdne6255:0',
     'assigned'              => 'crwdns6257:0crwdne6257:0',
     'asset_count'           => 'crwdns6259:0crwdne6259:0',
@@ -417,19 +426,20 @@ return [
     'bulk_soft_delete'      =>'crwdns10524:0crwdne10524:0',
     'bulk_checkin_delete_success' => 'crwdns10526:0crwdne10526:0',
     'bulk_checkin_success' => 'crwdns10528:0crwdne10528:0',
-    'set_to_null'           => 'crwdns10538:0crwdne10538:0',
+    'set_to_null'           => 'crwdns12738:0crwdne12738:0',
     'set_users_field_to_null'  => 'crwdns11449:0crwdne11449:0',
     'na_no_purchase_date'   => 'crwdns10540:0crwdne10540:0',
     'assets_by_status'      => 'crwdns10542:0crwdne10542:0',
     'assets_by_status_type'      => 'crwdns10544:0crwdne10544:0',
     'pie_chart_type'        => 'crwdns10546:0crwdne10546:0',
     'hello_name'            => 'crwdns10548:0crwdne10548:0',
-    'unaccepted_profile_warning'   => 'crwdns10550:0crwdne10550:0',
+    'unaccepted_profile_warning'   => 'crwdns12686:0crwdne12686:0',
     'start_date'            => 'crwdns11168:0crwdne11168:0',
     'end_date'            => 'crwdns11170:0crwdne11170:0',
     'alt_uploaded_image_thumbnail' => 'crwdns11172:0crwdne11172:0',
     'placeholder_kit'       => 'crwdns11174:0crwdne11174:0',
     'file_not_found'        => 'crwdns11313:0crwdne11313:0',
+    'log_record_not_found'  => 'crwdns12772:0crwdne12772:0',
     'preview_not_available' => 'crwdns11315:0crwdne11315:0',
     'setup'                 => 'crwdns11317:0crwdne11317:0',
     'pre_flight'            => 'crwdns11319:0crwdne11319:0',
@@ -511,7 +521,7 @@ return [
     'checked_out_to_fields' => 'crwdns12214:0crwdne12214:0',
     'percent_complete' => 'crwdns11811:0crwdne11811:0',
     'uploading' => 'crwdns11813:0crwdne11813:0',
-    'upload_error' => 'crwdns11884:0crwdne11884:0',
+    'upload_error' => 'crwdns13244:0crwdne13244:0',
     'copy_to_clipboard' => 'crwdns11837:0crwdne11837:0',
     'copied' => 'crwdns11839:0crwdne11839:0',
     'status_compatibility' => 'crwdns11910:0crwdne11910:0',
@@ -548,6 +558,71 @@ return [
         'license_seats'  => 'crwdns12142:0crwdne12142:0',
         'consumables'  => 'crwdns12144:0crwdne12144:0',
         'components'  => 'crwdns12146:0crwdne12146:0',
-    ]
+    ],
+
+    'more_info' => 'crwdns12288:0crwdne12288:0',
+    'quickscan_bulk_help' => 'crwdns12290:0crwdne12290:0',
+    'whoops' => 'crwdns12304:0crwdne12304:0',
+    'something_went_wrong' => 'crwdns12306:0crwdne12306:0',
+    'close' => 'crwdns12308:0crwdne12308:0',
+    'expires' => 'crwdns12310:0crwdne12310:0',
+    'map_fields'=> 'crwdns12784:0crwdne12784:0',
+    'remaining_var' => 'crwdns12612:0crwdne12612:0',
+    'label' => 'crwdns12690:0crwdne12690:0',
+    'import_asset_tag_exists' => 'crwdns12692:0crwdne12692:0',
+    'countries_manually_entered_help' => 'crwdns12702:0crwdne12702:0',
+    'accessories_assigned' => 'crwdns12800:0crwdne12800:0',
+    'user_managed_passwords' => 'crwdns12870:0crwdne12870:0',
+    'user_managed_passwords_disallow' => 'crwdns12872:0crwdne12872:0',
+    'user_managed_passwords_allow' => 'crwdns12874:0crwdne12874:0',
+    'from' => 'crwdns13170:0crwdne13170:0',
+    'by' => 'crwdns13172:0crwdne13172:0',
+
+// Add form placeholders here
+    'placeholders' => [
+        'notes'  => 'crwdns12878:0crwdne12878:0',
+    ],
+
+    'breadcrumb_button_actions' => [
+        'edit_item' => 'crwdns12914:0crwdne12914:0',
+        'checkout_item' => 'crwdns12916:0crwdne12916:0',
+        'checkin_item' => 'crwdns12918:0crwdne12918:0',
+    ],
+
+    'skins' => [
+        'site_default' => 'crwdns13057:0crwdne13057:0',
+        'default_blue' => 'crwdns13059:0crwdne13059:0',
+        'blue_dark' => 'crwdns13061:0crwdne13061:0',
+        'green' => 'crwdns13063:0crwdne13063:0',
+        'green_dark' => 'crwdns13065:0crwdne13065:0',
+        'red' => 'crwdns13067:0crwdne13067:0',
+        'red_dark' => 'crwdns13069:0crwdne13069:0',
+        'orange' => 'crwdns13071:0crwdne13071:0',
+        'orange_dark' => 'crwdns13073:0crwdne13073:0',
+        'black' => 'crwdns13075:0crwdne13075:0',
+        'black_dark' => 'crwdns13077:0crwdne13077:0',
+        'purple' => 'crwdns13079:0crwdne13079:0',
+        'purple_dark' => 'crwdns13081:0crwdne13081:0',
+        'yellow' => 'crwdns13083:0crwdne13083:0',
+        'yellow_dark' => 'crwdns13085:0crwdne13085:0',
+        'high_contrast' => 'crwdns13087:0crwdne13087:0',
+
+    ],
+
+    'select_all_none' => 'crwdns12927:0crwdne12927:0',
+    'generic_model_not_found' => 'crwdns12920:0crwdne12920:0',
+    'deleted_models' => 'crwdns12939:0crwdne12939:0',
+    'deleted_users' => 'crwdns12941:0crwdne12941:0',
+    'cost_each' => 'crwdns12983:0crwdne12983:0',
+    'remove_current_image' => 'crwdns13089:0crwdne13089:0',
+
+    'seeding' => [
+        'manufacturers' => [
+            'button' => 'crwdns13180:0crwdne13180:0',
+            'prompt' => 'crwdns13182:0crwdne13182:0',
+            'success' => 'crwdns13184:0crwdne13184:0',
+            'error' => 'crwdns13186:0crwdne13186:0',
+        ],
+    ],
 
 ];
diff --git a/resources/lang/aa-ER/localizations.php b/resources/lang/aa-ER/localizations.php
index 0e695f7a75..0e75ab9899 100644
--- a/resources/lang/aa-ER/localizations.php
+++ b/resources/lang/aa-ER/localizations.php
@@ -2,7 +2,7 @@
 
 return [
 
-    'select_language' => 'crwdns10560:0crwdne10560:0',
+    'select_language' => 'crwdns12746:0crwdne12746:0',
     'languages' => [
         'en-US'=> 'crwdns11932:0crwdne11932:0',
         'en-GB'=> 'crwdns10564:0crwdne10564:0',
@@ -40,7 +40,9 @@ return [
         'ms-MY'=> 'crwdns11986:0crwdne11986:0',
         'mi-NZ'=> 'crwdns11988:0crwdne11988:0',
         'mn-MN'=> 'crwdns11990:0crwdne11990:0',
-        'no-NO'=> 'crwdns11992:0crwdne11992:0',
+        'nb-NO'=> 'crwdns12644:0crwdne12644:0',
+        'om-ET' => 'crwdns12943:0crwdne12943:0',
+        //'nn-NO'=> 'Norwegian Nynorsk',
         'fa-IR'=> 'crwdns11994:0crwdne11994:0',
         'pl-PL'=> 'crwdns11996:0crwdne11996:0',
         'pt-PT'=> 'crwdns10634:0crwdne10634:0',
@@ -66,7 +68,7 @@ return [
         'zu-ZA'=> 'crwdns12020:0crwdne12020:0',
     ],
 
-    'select_country' => 'crwdns10672:0crwdne10672:0',
+    'select_country' => 'crwdns12748:0crwdne12748:0',
     
     'countries' => [
         'AC'=>'crwdns10674:0crwdne10674:0',
@@ -133,6 +135,7 @@ return [
         'EC'=>'crwdns10796:0crwdne10796:0',
         'EE'=>'crwdns10798:0crwdne10798:0',
         'EG'=>'crwdns10800:0crwdne10800:0',
+        'GB-ENG'=>'crwdns12704:0crwdne12704:0',
         'ER'=>'crwdns10802:0crwdne10802:0',
         'ES'=>'crwdns10804:0crwdne10804:0',
         'ET'=>'crwdns10806:0crwdne10806:0',
@@ -231,6 +234,7 @@ return [
         'NG'=>'crwdns10992:0crwdne10992:0',
         'NI'=>'crwdns10994:0crwdne10994:0',
         'NL'=>'crwdns10996:0crwdne10996:0',
+        'GB-NIR' => 'crwdns12706:0crwdne12706:0',
         'NO'=>'crwdns10998:0crwdne10998:0',
         'NP'=>'crwdns11000:0crwdne11000:0',
         'NR'=>'crwdns11002:0crwdne11002:0',
@@ -258,7 +262,7 @@ return [
         'RU'=>'crwdns11046:0crwdne11046:0',
         'RW'=>'crwdns11048:0crwdne11048:0',
         'SA'=>'crwdns11050:0crwdne11050:0',
-        'UK'=>'crwdns11052:0crwdne11052:0',
+        'GB-SCT'=>'crwdns12708:0crwdne12708:0',
         'SB'=>'crwdns11054:0crwdne11054:0',
         'SC'=>'crwdns11056:0crwdne11056:0',
         'SS'=>'crwdns11241:0crwdne11241:0',
@@ -310,6 +314,7 @@ return [
         'VI'=>'crwdns11148:0crwdne11148:0',
         'VN'=>'crwdns11150:0crwdne11150:0',
         'VU'=>'crwdns11152:0crwdne11152:0',
+        'GB-WLS' =>'crwdns12710:0crwdne12710:0',
         'WF'=>'crwdns11154:0crwdne11154:0',
         'WS'=>'crwdns11156:0crwdne11156:0',
         'YE'=>'crwdns11158:0crwdne11158:0',
diff --git a/resources/lang/aa-ER/mail.php b/resources/lang/aa-ER/mail.php
index 3bbee46b87..533b5a4690 100644
--- a/resources/lang/aa-ER/mail.php
+++ b/resources/lang/aa-ER/mail.php
@@ -23,24 +23,25 @@ return [
     'Item_Requested' => 'crwdns1740:0crwdne1740:0',
     'License_Checkin_Notification' => 'crwdns6008:0crwdne6008:0',
     'License_Checkout_Notification' => 'crwdns12064:0crwdne12064:0',
+    'license_for'   => 'crwdns12780:0crwdne12780:0',
     'Low_Inventory_Report' => 'crwdns1745:0crwdne1745:0',
     'a_user_canceled' => 'crwdns1704:0crwdne1704:0',
     'a_user_requested' => 'crwdns1705:0crwdne1705:0',
     'acceptance_asset_accepted' => 'crwdns10552:0crwdne10552:0',
     'acceptance_asset_declined' => 'crwdns10554:0crwdne10554:0',
-    'accessory_name' => 'crwdns1706:0crwdne1706:0',
-    'additional_notes' => 'crwdns1707:0crwdne1707:0',
+    'accessory_name' => 'crwdns12732:0crwdne12732:0',
+    'additional_notes' => 'crwdns12734:0crwdne12734:0',
     'admin_has_created' => 'crwdns1708:0crwdne1708:0',
-    'asset' => 'crwdns1709:0crwdne1709:0',
-    'asset_name' => 'crwdns1710:0crwdne1710:0',
+    'asset' => 'crwdns12750:0crwdne12750:0',
+    'asset_name' => 'crwdns12716:0crwdne12716:0',
     'asset_requested' => 'crwdns1711:0crwdne1711:0',
     'asset_tag' => 'crwdns6068:0crwdne6068:0',
     'assets_warrantee_alert' => 'crwdns6313:0crwdne6313:0',
     'assigned_to' => 'crwdns1714:0crwdne1714:0',
     'best_regards' => 'crwdns1715:0crwdne1715:0',
-    'canceled' => 'crwdns1716:0crwdne1716:0',
-    'checkin_date' => 'crwdns1717:0crwdne1717:0',
-    'checkout_date' => 'crwdns1718:0crwdne1718:0',
+    'canceled' => 'crwdns12718:0crwdne12718:0',
+    'checkin_date' => 'crwdns12720:0crwdne12720:0',
+    'checkout_date' => 'crwdns12722:0crwdne12722:0',
     'checkedout_from' => 'crwdns12066:0crwdne12066:0',
     'checkedin_from'  => 'crwdns12082:0crwdne12082:0',
     'checked_into' => 'crwdns12068:0crwdne12068:0',
@@ -49,27 +50,30 @@ return [
     'click_to_confirm' => 'crwdns1719:0crwdne1719:0',
     'current_QTY' => 'crwdns1727:0crwdne1727:0',
     'days' => 'crwdns1729:0crwdne1729:0',
-    'expecting_checkin_date' => 'crwdns1730:0crwdne1730:0',
+    'expecting_checkin_date' => 'crwdns12724:0crwdne12724:0',
     'expires' => 'crwdns1731:0crwdne1731:0',
     'hello' => 'crwdns1734:0crwdne1734:0',
     'hi' => 'crwdns1735:0crwdne1735:0',
     'i_have_read' => 'crwdns1736:0crwdne1736:0',
     'inventory_report' => 'crwdns11243:0crwdne11243:0',
-    'item' => 'crwdns1737:0crwdne1737:0',
+    'item' => 'crwdns12726:0crwdne12726:0',
+    'item_checked_reminder' => 'crwdns12322:0crwdne12322:0',
     'license_expiring_alert' => 'crwdns2048:0crwdne2048:0',
     'link_to_update_password' => 'crwdns1742:0crwdne1742:0',
-    'login' => 'crwdns1744:0crwdne1744:0',
+    'login' => 'crwdns12792:0crwdne12792:0',
     'login_first_admin' => 'crwdns1743:0crwdne1743:0',
     'low_inventory_alert' => 'crwdns2046:0crwdne2046:0',
     'min_QTY' => 'crwdns1746:0crwdne1746:0',
     'name' => 'crwdns1747:0crwdne1747:0',
     'new_item_checked' => 'crwdns1748:0crwdne1748:0',
+    'new_item_checked_with_acceptance' => 'crwdns13007:0crwdne13007:0',
+    'recent_item_checked' => 'crwdns13009:0crwdne13009:0',
     'notes' => 'crwdns12070:0crwdne12070:0',
-    'password' => 'crwdns1749:0crwdne1749:0',
+    'password' => 'crwdns12728:0crwdne12728:0',
     'password_reset' => 'crwdns1750:0crwdne1750:0',
     'read_the_terms' => 'crwdns1751:0crwdne1751:0',
     'read_the_terms_and_click' => 'crwdns12072:0crwdne12072:0',
-    'requested' => 'crwdns1753:0crwdne1753:0',
+    'requested' => 'crwdns12730:0crwdne12730:0',
     'reset_link' => 'crwdns1754:0crwdne1754:0',
     'reset_password' => 'crwdns1755:0crwdne1755:0',
     'rights_reserved' => 'crwdns11245:0crwdne11245:0',
@@ -86,8 +90,10 @@ return [
     'upcoming-audits' => 'crwdns6002:0crwdne6002:0',
     'user' => 'crwdns2032:0crwdne2032:0',
     'username' => 'crwdns2033:0crwdne2033:0',
+    'unaccepted_asset_reminder' => 'crwdns13011:0crwdne13011:0',
     'welcome' => 'crwdns1767:0crwdne1767:0',
     'welcome_to' => 'crwdns1768:0crwdne1768:0',
     'your_assets' => 'crwdns6014:0crwdne6014:0',
     'your_credentials' => 'crwdns1769:0crwdne1769:0',
+    'mail_sent' => 'crwdns12300:0crwdne12300:0',
 ];
diff --git a/resources/lang/aa-ER/validation.php b/resources/lang/aa-ER/validation.php
index a932f8e92a..f58d8c6a78 100644
--- a/resources/lang/aa-ER/validation.php
+++ b/resources/lang/aa-ER/validation.php
@@ -13,87 +13,150 @@ return [
     |
     */
 
-    'accepted'             => 'crwdns973:0crwdne973:0',
-    'active_url'           => 'crwdns974:0crwdne974:0',
-    'after'                => 'crwdns975:0crwdne975:0',
-    'after_or_equal'       => 'crwdns1921:0crwdne1921:0',
-    'alpha'                => 'crwdns976:0crwdne976:0',
-    'alpha_dash'           => 'crwdns977:0crwdne977:0',
-    'alpha_num'            => 'crwdns978:0crwdne978:0',
-    'array'                => 'crwdns1922:0crwdne1922:0',
-    'before'               => 'crwdns979:0crwdne979:0',
-    'before_or_equal'      => 'crwdns1923:0crwdne1923:0',
-    'between'              => [
-        'numeric' => 'crwdns980:0crwdne980:0',
-        'file'    => 'crwdns981:0crwdne981:0',
-        'string'  => 'crwdns982:0crwdne982:0',
-        'array'   => 'crwdns1924:0crwdne1924:0',
+    'accepted' => 'crwdns12328:0crwdne12328:0',
+    'accepted_if' => 'crwdns12330:0crwdne12330:0',
+    'active_url' => 'crwdns12332:0crwdne12332:0',
+    'after' => 'crwdns12334:0crwdne12334:0',
+    'after_or_equal' => 'crwdns12336:0crwdne12336:0',
+    'alpha' => 'crwdns12338:0crwdne12338:0',
+    'alpha_dash' => 'crwdns12340:0crwdne12340:0',
+    'alpha_num' => 'crwdns12342:0crwdne12342:0',
+    'array' => 'crwdns12344:0crwdne12344:0',
+    'ascii' => 'crwdns12346:0crwdne12346:0',
+    'before' => 'crwdns12348:0crwdne12348:0',
+    'before_or_equal' => 'crwdns12350:0crwdne12350:0',
+    'between' => [
+        'array' => 'crwdns12352:0crwdne12352:0',
+        'file' => 'crwdns12354:0crwdne12354:0',
+        'numeric' => 'crwdns12356:0crwdne12356:0',
+        'string' => 'crwdns12358:0crwdne12358:0',
     ],
-    'boolean'              => 'crwdns1860:0crwdne1860:0',
-    'confirmed'            => 'crwdns983:0crwdne983:0',
-    'date'                 => 'crwdns984:0crwdne984:0',
-    'date_format'          => 'crwdns985:0crwdne985:0',
-    'different'            => 'crwdns986:0crwdne986:0',
-    'digits'               => 'crwdns987:0crwdne987:0',
-    'digits_between'       => 'crwdns988:0crwdne988:0',
-    'dimensions'           => 'crwdns1925:0crwdne1925:0',
-    'distinct'             => 'crwdns1926:0crwdne1926:0',
-    'email'                => 'crwdns989:0crwdne989:0',
-    'exists'               => 'crwdns990:0crwdne990:0',
-    'file'                 => 'crwdns1927:0crwdne1927:0',
-    'filled'               => 'crwdns1928:0crwdne1928:0',
-    'image'                => 'crwdns991:0crwdne991:0',
+    'boolean' => 'crwdns12360:0crwdne12360:0',
+    'can' => 'crwdns12362:0crwdne12362:0',
+    'confirmed' => 'crwdns12364:0crwdne12364:0',
+    'contains' => 'crwdns12366:0crwdne12366:0',
+    'current_password' => 'crwdns12368:0crwdne12368:0',
+    'date' => 'crwdns12370:0crwdne12370:0',
+    'date_equals' => 'crwdns12372:0crwdne12372:0',
+    'date_format' => 'crwdns12374:0crwdne12374:0',
+    'decimal' => 'crwdns12376:0crwdne12376:0',
+    'declined' => 'crwdns12378:0crwdne12378:0',
+    'declined_if' => 'crwdns12380:0crwdne12380:0',
+    'different' => 'crwdns12382:0crwdne12382:0',
+    'digits' => 'crwdns12384:0crwdne12384:0',
+    'digits_between' => 'crwdns12386:0crwdne12386:0',
+    'dimensions' => 'crwdns12388:0crwdne12388:0',
+    'distinct' => 'crwdns1926:0crwdne1926:0',
+    'doesnt_end_with' => 'crwdns12390:0crwdne12390:0',
+    'doesnt_start_with' => 'crwdns12392:0crwdne12392:0',
+    'email' => 'crwdns12394:0crwdne12394:0',
+    'ends_with' => 'crwdns12396:0crwdne12396:0',
+    'enum' => 'crwdns12398:0crwdne12398:0',
+    'exists' => 'crwdns990:0crwdne990:0',
+    'extensions' => 'crwdns12400:0crwdne12400:0',
+    'file' => 'crwdns12402:0crwdne12402:0',
+    'filled' => 'crwdns1928:0crwdne1928:0',
+    'gt' => [
+        'array' => 'crwdns12404:0crwdne12404:0',
+        'file' => 'crwdns12406:0crwdne12406:0',
+        'numeric' => 'crwdns12408:0crwdne12408:0',
+        'string' => 'crwdns12410:0crwdne12410:0',
+    ],
+    'gte' => [
+        'array' => 'crwdns12412:0crwdne12412:0',
+        'file' => 'crwdns12414:0crwdne12414:0',
+        'numeric' => 'crwdns12416:0crwdne12416:0',
+        'string' => 'crwdns12418:0crwdne12418:0',
+    ],
+    'hex_color' => 'crwdns12420:0crwdne12420:0',
+    'image' => 'crwdns12422:0crwdne12422:0',
     'import_field_empty'    => 'crwdns11191:0crwdne11191:0',
-    'in'                   => 'crwdns992:0crwdne992:0',
-    'in_array'             => 'crwdns1929:0crwdne1929:0',
-    'integer'              => 'crwdns993:0crwdne993:0',
-    'ip'                   => 'crwdns994:0crwdne994:0',
-    'ipv4'                 => 'crwdns1930:0crwdne1930:0',
-    'ipv6'                 => 'crwdns1931:0crwdne1931:0',
-    'is_unique_department' => 'crwdns11193:0crwdne11193:0',
-    'json'                 => 'crwdns1932:0crwdne1932:0',
-    'max'                  => [
-        'numeric' => 'crwdns995:0crwdne995:0',
-        'file'    => 'crwdns996:0crwdne996:0',
-        'string'  => 'crwdns997:0crwdne997:0',
-        'array'   => 'crwdns1933:0crwdne1933:0',
+    'in' => 'crwdns992:0crwdne992:0',
+    'in_array' => 'crwdns12424:0crwdne12424:0',
+    'integer' => 'crwdns12426:0crwdne12426:0',
+    'ip' => 'crwdns12428:0crwdne12428:0',
+    'ipv4' => 'crwdns12430:0crwdne12430:0',
+    'ipv6' => 'crwdns12432:0crwdne12432:0',
+    'json' => 'crwdns12434:0crwdne12434:0',
+    'list' => 'crwdns12436:0crwdne12436:0',
+    'lowercase' => 'crwdns12438:0crwdne12438:0',
+    'lt' => [
+        'array' => 'crwdns12440:0crwdne12440:0',
+        'file' => 'crwdns12442:0crwdne12442:0',
+        'numeric' => 'crwdns12444:0crwdne12444:0',
+        'string' => 'crwdns12446:0crwdne12446:0',
     ],
-    'mimes'                => 'crwdns998:0crwdne998:0',
-    'mimetypes'            => 'crwdns1934:0crwdne1934:0',
-    'min'                  => [
-        'numeric' => 'crwdns999:0crwdne999:0',
-        'file'    => 'crwdns1000:0crwdne1000:0',
-        'string'  => 'crwdns1001:0crwdne1001:0',
-        'array'   => 'crwdns1935:0crwdne1935:0',
+    'lte' => [
+        'array' => 'crwdns12448:0crwdne12448:0',
+        'file' => 'crwdns12450:0crwdne12450:0',
+        'numeric' => 'crwdns12452:0crwdne12452:0',
+        'string' => 'crwdns12454:0crwdne12454:0',
     ],
-    'starts_with'          => 'crwdns6095:0crwdne6095:0',
-    'ends_with'            => 'crwdns11607:0crwdne11607:0',
+    'mac_address' => 'crwdns12456:0crwdne12456:0',
+    'max' => [
+        'array' => 'crwdns12458:0crwdne12458:0',
+        'file' => 'crwdns12460:0crwdne12460:0',
+        'numeric' => 'crwdns12462:0crwdne12462:0',
+        'string' => 'crwdns12464:0crwdne12464:0',
+    ],
+    'max_digits' => 'crwdns12466:0crwdne12466:0',
+    'mimes' => 'crwdns12468:0crwdne12468:0',
+    'mimetypes' => 'crwdns12470:0crwdne12470:0',
+    'min' => [
+        'array' => 'crwdns12472:0crwdne12472:0',
+        'file' => 'crwdns12474:0crwdne12474:0',
+        'numeric' => 'crwdns12476:0crwdne12476:0',
+        'string' => 'crwdns12478:0crwdne12478:0',
+    ],
+    'min_digits' => 'crwdns12480:0crwdne12480:0',
+    'missing' => 'crwdns12482:0crwdne12482:0',
+    'missing_if' => 'crwdns12484:0crwdne12484:0',
+    'missing_unless' => 'crwdns12486:0crwdne12486:0',
+    'missing_with' => 'crwdns12488:0crwdne12488:0',
+    'missing_with_all' => 'crwdns12490:0crwdne12490:0',
+    'multiple_of' => 'crwdns12492:0crwdne12492:0',
+    'not_in' => 'crwdns1002:0crwdne1002:0',
+    'not_regex' => 'crwdns12494:0crwdne12494:0',
+    'numeric' => 'crwdns12496:0crwdne12496:0',
+    'password' => [
+        'letters' => 'crwdns12498:0crwdne12498:0',
+        'mixed' => 'crwdns12500:0crwdne12500:0',
+        'numbers' => 'crwdns12502:0crwdne12502:0',
+        'symbols' => 'crwdns12504:0crwdne12504:0',
+        'uncompromised' => 'crwdns12506:0crwdne12506:0',
+    ],
+    'percent'       => 'crwdns12660:0crwdne12660:0',
 
-    'not_in'               => 'crwdns1002:0crwdne1002:0',
-    'numeric'              => 'crwdns1003:0crwdne1003:0',
-    'present'              => 'crwdns1936:0crwdne1936:0',
-    'valid_regex'          => 'crwdns1970:0crwdne1970:0',
-    'regex'                => 'crwdns1004:0crwdne1004:0',
-    'required'             => 'crwdns1005:0crwdne1005:0',
-    'required_if'          => 'crwdns1006:0crwdne1006:0',
-    'required_unless'      => 'crwdns1937:0crwdne1937:0',
-    'required_with'        => 'crwdns1007:0crwdne1007:0',
-    'required_with_all'    => 'crwdns1938:0crwdne1938:0',
-    'required_without'     => 'crwdns1008:0crwdne1008:0',
+    'present' => 'crwdns1936:0crwdne1936:0',
+    'present_if' => 'crwdns12508:0crwdne12508:0',
+    'present_unless' => 'crwdns12510:0crwdne12510:0',
+    'present_with' => 'crwdns12512:0crwdne12512:0',
+    'present_with_all' => 'crwdns12514:0crwdne12514:0',
+    'prohibited' => 'crwdns12516:0crwdne12516:0',
+    'prohibited_if' => 'crwdns12518:0crwdne12518:0',
+    'prohibited_unless' => 'crwdns12520:0crwdne12520:0',
+    'prohibits' => 'crwdns12522:0crwdne12522:0',
+    'regex' => 'crwdns12524:0crwdne12524:0',
+    'required' => 'crwdns1005:0crwdne1005:0',
+    'required_array_keys' => 'crwdns12526:0crwdne12526:0',
+    'required_if' => 'crwdns1006:0crwdne1006:0',
+    'required_if_accepted' => 'crwdns12528:0crwdne12528:0',
+    'required_if_declined' => 'crwdns12530:0crwdne12530:0',
+    'required_unless' => 'crwdns1937:0crwdne1937:0',
+    'required_with' => 'crwdns1007:0crwdne1007:0',
+    'required_with_all' => 'crwdns12532:0crwdne12532:0',
+    'required_without' => 'crwdns1008:0crwdne1008:0',
     'required_without_all' => 'crwdns1939:0crwdne1939:0',
-    'same'                 => 'crwdns1009:0crwdne1009:0',
-    'size'                 => [
-        'numeric' => 'crwdns1010:0crwdne1010:0',
-        'file'    => 'crwdns1011:0crwdne1011:0',
-        'string'  => 'crwdns1012:0crwdne1012:0',
-        'array'   => 'crwdns1940:0crwdne1940:0',
+    'same' => 'crwdns12534:0crwdne12534:0',
+    'size' => [
+        'array' => 'crwdns12536:0crwdne12536:0',
+        'file' => 'crwdns12538:0crwdne12538:0',
+        'numeric' => 'crwdns12540:0crwdne12540:0',
+        'string' => 'crwdns12542:0crwdne12542:0',
     ],
+    'starts_with' => 'crwdns12544:0crwdne12544:0',
     'string'               => 'crwdns1941:0crwdne1941:0',
-    'timezone'             => 'crwdns1942:0crwdne1942:0',
     'two_column_unique_undeleted' => 'crwdns11892:0crwdne11892:0',
-    'unique'               => 'crwdns1013:0crwdne1013:0',
-    'uploaded'             => 'crwdns1943:0crwdne1943:0',
-    'url'                  => 'crwdns1014:0crwdne1014:0',
     'unique_undeleted'     => 'crwdns1964:0crwdne1964:0',
     'non_circular'         => 'crwdns6070:0crwdne6070:0',
     'not_array'            => 'crwdns12056:0crwdne12056:0',
@@ -102,11 +165,14 @@ return [
     'numbers'              => 'crwdns10502:0crwdne10502:0',
     'case_diff'            => 'crwdns10504:0crwdne10504:0',
     'symbols'              => 'crwdns10506:0crwdne10506:0',
-    'gte'                  => [
-        'numeric'          => 'crwdns6796:0crwdne6796:0'
-    ],
-    'checkboxes'           => 'crwdns12152:0crwdne12152:0',
-    'radio_buttons'        => 'crwdns12154:0crwdne12154:0',
+    'timezone' => 'crwdns12546:0crwdne12546:0',
+    'unique' => 'crwdns1013:0crwdne1013:0',
+    'uploaded' => 'crwdns1943:0crwdne1943:0',
+    'uppercase' => 'crwdns12548:0crwdne12548:0',
+    'url' => 'crwdns12550:0crwdne12550:0',
+    'ulid' => 'crwdns12552:0crwdne12552:0',
+    'uuid' => 'crwdns12554:0crwdne12554:0',
+    'fmcs_location' => 'crwdns13232:0crwdne13232:0',
 
 
     /*
@@ -120,16 +186,22 @@ return [
     |
     */
 
+    'email_array'      => 'crwdns13164:0crwdne13164:0',
+    'checkboxes'           => 'crwdns13166:0crwdne13166:0',
+    'radio_buttons'        => 'crwdns13168:0crwdne13168:0',
+    
     'custom' => [
         'alpha_space' => 'crwdns1944:0crwdne1944:0',
-        'email_array'      => 'crwdns1945:0crwdne1945:0',
+
         'hashed_pass'      => 'crwdns1946:0crwdne1946:0',
         'dumbpwd'          => 'crwdns1947:0crwdne1947:0',
         'statuslabel_type' => 'crwdns1948:0crwdne1948:0',
+        'custom_field_not_found'          => 'crwdns12650:0crwdne12650:0',
+        'custom_field_not_found_on_model' => 'crwdns12652:0crwdne12652:0',
 
         // date_format validation with slightly less stupid messages. It duplicates a lot, but it gets the job done :(
-        // We use this because the default error message for date_format is reflects php Y-m-d, which non-PHP
-        // people won't know how to format. 
+        // We use this because the default error message for date_format reflects php Y-m-d, which non-PHP
+        // people won't know how to format.
         'purchase_date.date_format'     => 'crwdns11247:0crwdne11247:0',
         'last_audit_date.date_format'   =>  'crwdns11249:0crwdne11249:0',
         'expiration_date.date_format'   =>  'crwdns11251:0crwdne11251:0',
@@ -137,9 +209,15 @@ return [
         'expected_checkin.date_format'  =>  'crwdns11255:0crwdne11255:0',
         'start_date.date_format'        =>  'crwdns11257:0crwdne11257:0',
         'end_date.date_format'          =>  'crwdns11259:0crwdne11259:0',
+        'invalid_value_in_field' => 'crwdns12560:0crwdne12560:0',
 
-    ],
+        'ldap_username_field' => [
+            'not_in' =>         'crwdns12762:0crwdne12762:0'
+        ],
+        'ldap_auth_filter_query' => ['not_in' => 'crwdns12764:0crwdne12764:0'],
+        'ldap_filter' => ['regex' => 'crwdns12766:0crwdne12766:0'],
 
+        ],
     /*
     |--------------------------------------------------------------------------
     | Custom Validation Attributes
@@ -155,8 +233,16 @@ return [
 
     /*
     |--------------------------------------------------------------------------
-    | Generic Validation Messages
+    | Generic Validation Messages - we use these in the jquery validation where we don't have
+    | access to the :attribute
     |--------------------------------------------------------------------------
     */
-    'invalid_value_in_field' => 'crwdns12156:0crwdne12156:0',
+
+    'generic' => [
+        'invalid_value_in_field' => 'crwdns12580:0crwdne12580:0',
+        'required' => 'crwdns12582:0crwdne12582:0',
+        'email' => 'crwdns12584:0crwdne12584:0',
+    ],
+
+
 ];
diff --git a/resources/lang/af-ZA/account/general.php b/resources/lang/af-ZA/account/general.php
index dda17abaaf..557454678c 100644
--- a/resources/lang/af-ZA/account/general.php
+++ b/resources/lang/af-ZA/account/general.php
@@ -2,10 +2,16 @@
 
 return array(
     'personal_api_keys' => '私有API 金鑰',
+    'personal_access_token' => 'Personal Access Token',
+    'personal_api_keys_success' => 'Personal API Key :key created sucessfully',
+    'here_is_api_key' => 'Here is your new personal access token. This is the only time it will be shown so do not lose it! You may now use this token to make API requests.',
     'api_key_warning' => 'When generating an API token, be sure to copy it down immediately as they will not be visible to you again.',
     'api_base_url' => 'Your API base url is located at:',
     'api_base_url_endpoint' => '/&lt;endpoint&gt;',
     'api_token_expiration_time' => 'API tokens are set to expire in:',
     'api_reference' => 'Please check the <a href="https://snipe-it.readme.io/reference" target="_blank">API reference</a> to find specific API endpoints and additional API documentation.',
     'profile_updated' => 'Account successfully updated',
+    'no_tokens' => 'You have not created any personal access tokens.',
+    'enable_sounds' => 'Enable sound effects',
+    'enable_confetti' => 'Enable confetti effects',
 );
diff --git a/resources/lang/af-ZA/admin/accessories/message.php b/resources/lang/af-ZA/admin/accessories/message.php
index 170abe3501..6c2362e25c 100644
--- a/resources/lang/af-ZA/admin/accessories/message.php
+++ b/resources/lang/af-ZA/admin/accessories/message.php
@@ -26,7 +26,11 @@ return array(
         'error'   		=> 'Toebehore is nie nagegaan nie, probeer asseblief weer',
         'success' 		=> 'Toebehore suksesvol nagegaan.',
         'unavailable'   => 'Accessory is not available for checkout. Check quantity available',
-        'user_does_not_exist' => 'Die gebruiker is ongeldig. Probeer asseblief weer.'
+        'user_does_not_exist' => 'Die gebruiker is ongeldig. Probeer asseblief weer.',
+         'checkout_qty' => array(
+            'lte'  => 'There is currently only one available accessory of this type, and you are trying to check out :checkout_qty. Please adjust the checkout quantity or the total stock of this accessory and try again.|There are :number_currently_remaining total available accessories, and you are trying to check out :checkout_qty. Please adjust the checkout quantity or the total stock of this accessory and try again.',
+            ),
+           
     ),
 
     'checkin' => array(
diff --git a/resources/lang/af-ZA/admin/accessories/table.php b/resources/lang/af-ZA/admin/accessories/table.php
index d8fa52c62c..a951aa4054 100644
--- a/resources/lang/af-ZA/admin/accessories/table.php
+++ b/resources/lang/af-ZA/admin/accessories/table.php
@@ -6,6 +6,4 @@ return array(
     'id'      					=> 'ID',
     'require_acceptance'      	=> 'aanvaarding',
     'title'      				=> 'Toebehore Naam',
-
-
 );
diff --git a/resources/lang/af-ZA/admin/components/message.php b/resources/lang/af-ZA/admin/components/message.php
index e2bbfb92ed..f8ca09a84c 100644
--- a/resources/lang/af-ZA/admin/components/message.php
+++ b/resources/lang/af-ZA/admin/components/message.php
@@ -17,7 +17,8 @@ return array(
     'delete' => array(
         'confirm'   => 'Is jy seker jy wil hierdie komponent uitvee?',
         'error'   => 'Daar was \'n probleem met die verwydering van die komponent. Probeer asseblief weer.',
-        'success' => 'Die komponent is suksesvol verwyder.'
+        'success' => 'Die komponent is suksesvol verwyder.',
+        'error_qty'   => 'Some components of this type are still checked out. Please check them in and try again.',
     ),
 
      'checkout' => array(
diff --git a/resources/lang/af-ZA/admin/consumables/general.php b/resources/lang/af-ZA/admin/consumables/general.php
index 9c690cb898..b828b1418c 100644
--- a/resources/lang/af-ZA/admin/consumables/general.php
+++ b/resources/lang/af-ZA/admin/consumables/general.php
@@ -8,4 +8,5 @@ return array(
     'remaining' 			            => 'oorblywende',
     'total' 			                => 'totale',
     'update'                            => 'Verbruik Verbruik',
+    'inventory_warning'                 => 'The inventory of this consumable is below the minimum amount of :min_count',
 );
diff --git a/resources/lang/af-ZA/admin/consumables/message.php b/resources/lang/af-ZA/admin/consumables/message.php
index 20999a76ff..4e88a67649 100644
--- a/resources/lang/af-ZA/admin/consumables/message.php
+++ b/resources/lang/af-ZA/admin/consumables/message.php
@@ -2,6 +2,7 @@
 
 return array(
 
+    'invalid_category_type' => 'The category must be a consumable category.',
     'does_not_exist' => 'Verbruiksgoedere bestaan ​​nie.',
 
     'create' => array(
diff --git a/resources/lang/af-ZA/admin/custom_fields/general.php b/resources/lang/af-ZA/admin/custom_fields/general.php
index 719f1c5854..bc552ea4a4 100644
--- a/resources/lang/af-ZA/admin/custom_fields/general.php
+++ b/resources/lang/af-ZA/admin/custom_fields/general.php
@@ -35,7 +35,7 @@ return [
     'create_field_title' => 'Create a new custom field',
     'value_encrypted'      	        => 'Die waarde van hierdie veld is geïnkripteer in die databasis. Slegs admingebruikers sal die gedecodeerde waarde kan sien',
     'show_in_email'     => 'Include the value of this field in checkout emails sent to the user? Encrypted fields cannot be included in emails',
-    'show_in_email_short'     => 'Include in emails.',
+    'show_in_email_short' => 'Include in emails',
     'help_text' => 'Help Text',
     'help_text_description' => 'This is optional text that will appear below the form elements while editing an asset to provide context on the field.',
     'about_custom_fields_title' => 'About Custom Fields',
@@ -57,5 +57,8 @@ return [
     'show_in_requestable_list_short' => 'Show in requestable assets list',
     'show_in_requestable_list' => 'Show value in requestable assets list. Encrypted fields will not be shown',
     'encrypted_options' => 'This field is encrypted, so some display options will not be available.',
+    'display_checkin' => 'Display in checkin forms',
+    'display_checkout' => 'Display in checkout forms',
+    'display_audit' => 'Display in audit forms',
 
 ];
diff --git a/resources/lang/af-ZA/admin/custom_fields/message.php b/resources/lang/af-ZA/admin/custom_fields/message.php
index 3280b8ca6c..1f39cb1bf1 100644
--- a/resources/lang/af-ZA/admin/custom_fields/message.php
+++ b/resources/lang/af-ZA/admin/custom_fields/message.php
@@ -5,6 +5,7 @@ return array(
     'field' => array(
         'invalid'   => 'Daardie veld bestaan ​​nie.',
         'already_added'   => 'Veld reeds bygevoeg',
+        'none_selected'   => 'No field selected',
 
         'create' => array(
             'error'   => 'Veld is nie geskep nie, probeer asseblief weer.',
diff --git a/resources/lang/af-ZA/admin/depreciations/general.php b/resources/lang/af-ZA/admin/depreciations/general.php
index 047f50d004..76710bd04f 100644
--- a/resources/lang/af-ZA/admin/depreciations/general.php
+++ b/resources/lang/af-ZA/admin/depreciations/general.php
@@ -13,4 +13,8 @@ return [
     'no_depreciations_warning'               => '<strong>Warning: </strong>
                       You do not currently have any depreciations set up.
                       Please set up at least one depreciation to view the depreciation report.',
+    'depreciation_method'                   => 'Waardeverminderingsverslag',
+    'linear_depreciation'                   => 'Linear (Default)',
+    'half_1'                                => 'Half-year convention, always applied',
+    'half_2'                                => 'Half-year convention, applied with condition',
 ];
diff --git a/resources/lang/af-ZA/admin/hardware/form.php b/resources/lang/af-ZA/admin/hardware/form.php
index 6943e6c62a..94c88a944e 100644
--- a/resources/lang/af-ZA/admin/hardware/form.php
+++ b/resources/lang/af-ZA/admin/hardware/form.php
@@ -55,8 +55,11 @@ return [
     'asset_location_update_default' => 'Update only default location',
     'asset_location_update_actual' => 'Update only actual location',
     'asset_not_deployable' => 'That asset status is not deployable. This asset cannot be checked out.',
-    'asset_deployable' => 'That status is deployable. This asset can be checked out.',
+    'asset_not_deployable_checkin' => 'That asset status is not deployable. Using this status label will checkin the asset.',
+    'asset_deployable' => 'This asset can be checked out.',
     'processing_spinner' => 'Processing... (This might take a bit of time on large files)',
+    'processing' => 'Processing... ',
     'optional_infos'  => 'Optional Information',
-    'order_details'   => 'Order Related Information'
+    'order_details'   => 'Order Related Information',
+    'calc_eol'    => 'If nulling the EOL date, use automatic EOL calculation based on the purchase date and EOL rate.',
 ];
diff --git a/resources/lang/af-ZA/admin/hardware/general.php b/resources/lang/af-ZA/admin/hardware/general.php
index 05d3be9de4..92050fc46f 100644
--- a/resources/lang/af-ZA/admin/hardware/general.php
+++ b/resources/lang/af-ZA/admin/hardware/general.php
@@ -5,8 +5,8 @@ return [
     'about_assets_text'            => 'Bates is items opgespoor volgens reeksnommer of bate-tag. Hulle is geneig om hoër waarde items te wees waar die identifisering van \'n spesifieke item saak maak.',
     'archived'  				=> 'argief',
     'asset'  					=> 'bate',
-    'bulk_checkout'             => 'Checkout Assets',
-    'bulk_checkin'              => 'Checkin Assets',
+    'bulk_checkout'             => 'Grootmaat Checkout',
+    'bulk_checkin'              => 'Bulk Checkin',
     'checkin'  					=> 'Kontrole bate',
     'checkout'  				=> 'Checkout Asset',
     'clone'  					=> 'Klone Bate',
@@ -27,8 +27,7 @@ return [
     'undeployable_tooltip'  	=> 'This asset has a status label that is undeployable and cannot be checked out at this time.',
     'view'  					=> 'Bekyk bate',
     'csv_error' => 'You have an error in your CSV file:',
-    'import_text' => '<p>Upload a CSV that contains asset history. The assets and users MUST already exist in the system, or they will be skipped. Matching assets for history import happens against the asset tag. We will try to find a matching user based on the user\'s name you provide, and the criteria you select below. If you do not select any criteria below, it will simply try to match on the username format you configured in the <code>Admin &gt; General Settings</code>.</p><p>Fields included in the CSV must match the headers: <strong>Asset Tag, Name, Checkout Date, Checkin Date</strong>. Any additional fields will be ignored. </p><p>Checkin Date: blank or future checkin dates will checkout items to associated user.  Excluding the Checkin Date column will create a checkin date with todays date.</p>
-    ',
+    'import_text' => '<p>Upload a CSV that contains asset history. The assets and users MUST already exist in the system, or they will be skipped. Matching assets for history import happens against the asset tag. We will try to find a matching user based on the user\'s name you provide, and the criteria you select below. If you do not select any criteria below, it will simply try to match on the username format you configured in the <code>Admin &gt; General Settings</code>.</p><p>Fields included in the CSV must match the headers: <strong>Asset Tag, Name, Checkout Date, Checkin Date</strong>. Any additional fields will be ignored. </p><p>Checkin Date: blank or future checkin dates will checkout items to associated user.  Excluding the Checkin Date column will create a checkin date with todays date.</p>    ',
     'csv_import_match_f-l' => 'Try to match users by <strong>firstname.lastname</strong> (<code>jane.smith</code>) format',
     'csv_import_match_initial_last' => 'Try to match users by <strong>first initial last name</strong> (<code>jsmith</code>) format',
     'csv_import_match_first' => 'Try to match users by <strong>first name</strong> (<code>jane</code>) format',
diff --git a/resources/lang/af-ZA/admin/hardware/message.php b/resources/lang/af-ZA/admin/hardware/message.php
index d345c9298d..645ba7e2dd 100644
--- a/resources/lang/af-ZA/admin/hardware/message.php
+++ b/resources/lang/af-ZA/admin/hardware/message.php
@@ -2,18 +2,23 @@
 
 return [
 
-    'undeployable' 		=> '<strong>Waarskuwing: </strong> Hierdie bate is gemerk as tans onbruikbaar. As hierdie status verander het, verander asseblief die batestatus.',
-    'does_not_exist' 	=> 'Bate bestaan ​​nie.',
-    'does_not_exist_var'=> 'Asset with tag :asset_tag not found.',
-    'no_tag' 	        => 'No asset tag provided.',
+    'undeployable' 		 => '<strong>Warning: </strong> This asset has been marked as currently undeployable. If this status has changed, please update the asset status.',
+    'does_not_exist' 	 => 'Bate bestaan ​​nie.',
+    'does_not_exist_var' => 'Asset with tag :asset_tag not found.',
+    'no_tag' 	         => 'No asset tag provided.',
     'does_not_exist_or_not_requestable' => 'That asset does not exist or is not requestable.',
-    'assoc_users'	 	=> 'Hierdie bate word tans na \'n gebruiker nagegaan en kan nie uitgevee word nie. Gaan asseblief die bate eers in, en probeer dan weer uitvee.',
+    'assoc_users'	 	 => 'Hierdie bate word tans na \'n gebruiker nagegaan en kan nie uitgevee word nie. Gaan asseblief die bate eers in, en probeer dan weer uitvee.',
     'warning_audit_date_mismatch' 	=> 'This asset\'s next audit date (:next_audit_date) is before the last audit date (:last_audit_date). Please update the next audit date.',
+    'labels_generated'   => 'Labels were successfully generated.',
+    'error_generating_labels' => 'Error while generating labels.',
+    'no_assets_selected' => 'No assets selected.',
 
     'create' => [
         'error'   		=> 'Bate is nie geskep nie, probeer asseblief weer. :(',
         'success' 		=> 'Bate geskep suksesvol. :)',
         'success_linked' => 'Asset with tag :tag was created successfully. <strong><a href=":link" style="color: white;">Click here to view</a></strong>.',
+        'multi_success_linked' => 'Asset with tag :links was created successfully.|:count assets were created succesfully. :links.',
+        'partial_failure' => 'An asset was unable to be created. Reason: :failures|:count assets were unable to be created. Reasons: :failures',
     ],
 
     'update' => [
@@ -51,20 +56,24 @@ return [
     ],
 
     'import' => [
+        'import_button'         => 'Process Import',
         'error'                 => 'Sommige items is nie korrek ingevoer nie.',
         'errorDetail'           => 'Die volgende items is nie ingevoer as gevolg van foute nie.',
         'success'               => 'Jou lêer is ingevoer',
         'file_delete_success'   => 'Jou lêer is suksesvol verwyder',
         'file_delete_error'      => 'Die lêer kon nie uitgevee word nie',
         'file_missing' => 'The file selected is missing',
+        'file_already_deleted' => 'The file selected was already deleted',
         'header_row_has_malformed_characters' => 'One or more attributes in the header row contain malformed UTF-8 characters',
         'content_row_has_malformed_characters' => 'One or more attributes in the first row of content contain malformed UTF-8 characters',
+        'transliterate_failure' => 'Transliteration from :encoding to UTF-8 failed due to invalid characters in input'
     ],
 
 
     'delete' => [
         'confirm'   	=> 'Is jy seker jy wil hierdie bate uitvee?',
         'error'   		=> 'Daar was \'n probleem met die verwydering van die bate. Probeer asseblief weer.',
+        'assigned_to_error' => '{1}Asset Tag: :asset_tag is currently checked out. Check in this device before deletion.|[2,*]Asset Tags: :asset_tag are currently checked out. Check in these devices before deletion.',
         'nothing_updated'   => 'Geen bates is gekies nie, so niks is verwyder nie.',
         'success' 		=> 'Die bate is suksesvol verwyder.',
     ],
@@ -77,6 +86,11 @@ return [
         'no_assets_selected' => 'You must select at least one asset from the list',
     ],
 
+    'multi-checkout' => [
+        'error'   => 'Asset was not checked out, please try again|Assets were not checked out, please try again',
+        'success' => 'Asset checked out successfully.|Assets checked out successfully.',
+    ],
+
     'checkin' => [
         'error'   		=> 'Bate is nie nagegaan nie, probeer asseblief weer',
         'success' 		=> 'Die bate is suksesvol nagegaan.',
@@ -86,9 +100,10 @@ return [
     ],
 
     'requests' => [
-        'error'   		=> 'Bate is nie aangevra nie, probeer asseblief weer',
-        'success' 		=> 'Die bate is suksesvol aangevra.',
-        'canceled'      => 'Afhandeling versoek suksesvol gekanselleer',
+        'error'   		=> 'Request was not successful, please try again.',
+        'success' 		=> 'Request successfully submitted.',
+        'canceled'      => 'Request successfully canceled.',
+        'cancel'        => 'Cancel this item request',
     ],
 
 ];
diff --git a/resources/lang/af-ZA/admin/hardware/table.php b/resources/lang/af-ZA/admin/hardware/table.php
index 0820600936..7af4304501 100644
--- a/resources/lang/af-ZA/admin/hardware/table.php
+++ b/resources/lang/af-ZA/admin/hardware/table.php
@@ -25,7 +25,6 @@ return [
     'image'		    => 'Toestelbeeld',
     'days_without_acceptance' => 'Dae sonder aanvaarding',
     'monthly_depreciation' => 'Monthly Depreciation',
-    'assigned_to'    => 'Toevertrou aan',
     'requesting_user' => 'Requesting User',
     'requested_date' => 'Requested Date',
     'changed'       => 'Changed',
diff --git a/resources/lang/af-ZA/admin/kits/general.php b/resources/lang/af-ZA/admin/kits/general.php
index 8c32816b1c..44b4e2f820 100644
--- a/resources/lang/af-ZA/admin/kits/general.php
+++ b/resources/lang/af-ZA/admin/kits/general.php
@@ -47,4 +47,5 @@ return [
     'kit_deleted'                       => 'Kit was successfully deleted',
     'kit_model_updated'                 => 'Model was successfully updated',
     'kit_model_detached'                => 'Model was successfully detached',
+    'model_already_attached'            => 'Model already attached to kit',
 ];
diff --git a/resources/lang/af-ZA/admin/licenses/general.php b/resources/lang/af-ZA/admin/licenses/general.php
index b0d2afff14..f0ff83b608 100644
--- a/resources/lang/af-ZA/admin/licenses/general.php
+++ b/resources/lang/af-ZA/admin/licenses/general.php
@@ -14,6 +14,7 @@ return array(
     'info'  					=> 'Lisensie-inligting',
     'license_seats'  			=> 'Lisensie Seats',
     'seat'  					=> 'Seat',
+    'seat_count'  				=> 'Seat :count',
     'seats'  					=> 'sitplekke',
     'software_licenses'  		=> 'Sagteware lisensies',
     'user'  					=> 'gebruiker',
@@ -23,12 +24,12 @@ return array(
         [
             'checkin_all'           => [
                 'button'            => 'Checkin All Seats',
-                'modal'             => 'This will action checkin one seat. | This action will checkin all :checkedout_seats_count seats for this license.',
+                'modal'             => 'This action will checkin one seat. | This action will checkin all :checkedout_seats_count seats for this license.',
                 'enabled_tooltip'   => 'Checkin ALL seats for this license from both users and assets',
                 'disabled_tooltip'  => 'This is disabled because there are no seats currently checked out',
                 'disabled_tooltip_reassignable'  => 'This is disabled because the License is not reassignable',
                 'success'           => 'License successfully checked in! | All licenses were successfully checked in!',
-                'log_msg'           => 'Checked in via bulk license checkout in license GUI',
+                'log_msg'           => 'Checked in via bulk license checkin in license GUI',
             ],
 
             'checkout_all'              => [
diff --git a/resources/lang/af-ZA/admin/licenses/message.php b/resources/lang/af-ZA/admin/licenses/message.php
index a0f69b9a74..f0f12789de 100644
--- a/resources/lang/af-ZA/admin/licenses/message.php
+++ b/resources/lang/af-ZA/admin/licenses/message.php
@@ -44,10 +44,13 @@ return array(
         'error'   => 'Daar was \'n probleem om die lisensie te kontroleer. Probeer asseblief weer.',
         'success' => 'Die lisensie is suksesvol nagegaan',
         'not_enough_seats' => 'Not enough license seats available for checkout',
+        'mismatch' => 'The license seat provided does not match the license',
+        'unavailable' => 'This seat is not available for checkout.',
     ),
 
     'checkin' => array(
         'error'   => 'Daar was \'n probleem om die lisensie te kontroleer. Probeer asseblief weer.',
+        'not_reassignable' => 'License not reassignable',
         'success' => 'Die lisensie is suksesvol nagegaan'
     ),
 
diff --git a/resources/lang/af-ZA/admin/locations/message.php b/resources/lang/af-ZA/admin/locations/message.php
index dd41bba329..f98bedb937 100644
--- a/resources/lang/af-ZA/admin/locations/message.php
+++ b/resources/lang/af-ZA/admin/locations/message.php
@@ -3,11 +3,12 @@
 return array(
 
     'does_not_exist' => 'Ligging bestaan ​​nie.',
-    'assoc_users'    => 'This location is not currently deletable because it is the location of record for at least one asset or user, has assets assigned to it, or is the parent location of another location. Please update your models to no longer reference this company and try again. ',
+    'assoc_users'    => 'This location is not currently deletable because it is the location of record for at least one asset or user, has assets assigned to it, or is the parent location of another location. Please update your records to no longer reference this location and try again ',
     'assoc_assets'	 => 'Hierdie ligging is tans geassosieer met ten minste een bate en kan nie uitgevee word nie. Dateer asseblief jou bates op om nie meer hierdie ligging te verwys nie en probeer weer.',
     'assoc_child_loc'	 => 'Hierdie ligging is tans die ouer van ten minste een kind se plek en kan nie uitgevee word nie. Werk asseblief jou liggings by om nie meer hierdie ligging te verwys nie en probeer weer.',
     'assigned_assets' => 'Assigned Assets',
     'current_location' => 'Current Location',
+    'open_map' => 'Open in :map_provider_icon Maps',
 
 
     'create' => array(
@@ -20,6 +21,11 @@ return array(
         'success' => 'Ligging suksesvol opgedateer.'
     ),
 
+    'restore' => array(
+        'error'   => 'Location was not restored, please try again',
+        'success' => 'Location restored successfully.'
+    ),
+
     'delete' => array(
         'confirm'   	=> 'Is jy seker jy wil hierdie ligging uitvee?',
         'error'   => 'Daar was \'n probleem met die verwydering van die ligging. Probeer asseblief weer.',
diff --git a/resources/lang/af-ZA/admin/locations/table.php b/resources/lang/af-ZA/admin/locations/table.php
index 526a020d54..fb01959e6d 100644
--- a/resources/lang/af-ZA/admin/locations/table.php
+++ b/resources/lang/af-ZA/admin/locations/table.php
@@ -39,4 +39,5 @@ return [
     'signed_by_finance_auditor' => 'Signed By (Finance Auditor):',
     'signed_by_location_manager' => 'Signed By (Location Manager):',
     'signed_by'                 => 'Signed Off By:',
+    'clone'  					=> 'Clone Location',
 ];
diff --git a/resources/lang/af-ZA/admin/models/general.php b/resources/lang/af-ZA/admin/models/general.php
index e036502985..187c0427aa 100644
--- a/resources/lang/af-ZA/admin/models/general.php
+++ b/resources/lang/af-ZA/admin/models/general.php
@@ -3,7 +3,7 @@
 return array(
     'about_models_title'     => 'Oor Asset Models',
     'about_models_text'           => 'Batemodelle is \'n manier om identiese bates te groepeer. "MBP 2013", "IPhone 6s", ens.',
-    'deleted'  					        => 'This model has been deleted.',
+    'deleted'  					=> 'This model has been deleted.',
     'bulk_delete'               => 'Bulk Delete Asset Models',
     'bulk_delete_help'               => 'Use the checkboxes below to confirm the deletion of the selected asset models. Asset models that have assets associated with them cannot be deleted until the assets are associated with a different model.',
     'bulk_delete_warn'          => 'You are about to delete one asset model.|You are about to delete :model_count asset models.',
diff --git a/resources/lang/af-ZA/admin/models/message.php b/resources/lang/af-ZA/admin/models/message.php
index e345c1bad3..05f640e979 100644
--- a/resources/lang/af-ZA/admin/models/message.php
+++ b/resources/lang/af-ZA/admin/models/message.php
@@ -7,7 +7,7 @@ return array(
     'no_association' => 'WARNING! The asset model for this item is invalid or missing!',
     'no_association_fix' => 'This will break things in weird and horrible ways. Edit this asset now to assign it a model.',
     'assoc_users'	 => 'Hierdie model word tans geassosieer met een of meer bates en kan nie verwyder word nie. Verwyder asseblief die bates en probeer dan weer uitvee.',
-
+    'invalid_category_type' => 'This category must be an asset category.',
 
     'create' => array(
         'error'   => 'Model is nie geskep nie, probeer asseblief weer.',
diff --git a/resources/lang/af-ZA/admin/reports/general.php b/resources/lang/af-ZA/admin/reports/general.php
index d1cf8ccffb..21d97cb5dc 100644
--- a/resources/lang/af-ZA/admin/reports/general.php
+++ b/resources/lang/af-ZA/admin/reports/general.php
@@ -4,6 +4,7 @@ return [
     'info'   => 'Kies die opsies wat jy wil hê vir jou bateverslag.',
     'deleted_user' => 'Deleted user',
     'send_reminder' => 'Send reminder',
+    'cannot_send_reminder' => 'User has been deleted or does not have an email address so cannot receive a reminder',
     'reminder_sent' => 'Reminder sent',
     'acceptance_deleted' => 'Acceptance request deleted',
     'acceptance_request' => 'Acceptance request',
@@ -13,5 +14,10 @@ return [
         'user_state' => 'User State',
         'user_country' => 'User Country',
         'user_zip' => 'User Zip'
-    ]
-];
\ No newline at end of file
+    ],
+    'open_saved_template' => 'Open Saved Template',
+    'save_template' =>  'Save Template',
+    'select_a_template' => 'Select a Template',
+    'template_name' => 'Template Name',
+    'update_template' => 'Update Template',
+];
diff --git a/resources/lang/af-ZA/admin/reports/message.php b/resources/lang/af-ZA/admin/reports/message.php
index f79828cffc..2800bbdf0b 100644
--- a/resources/lang/af-ZA/admin/reports/message.php
+++ b/resources/lang/af-ZA/admin/reports/message.php
@@ -1,5 +1,16 @@
 <?php
 
-return array(
-    'error'   => 'Jy moet ten minste EEN opsie kies.'
-);
+return [
+    'about_templates' => 'About Saved Templates',
+    'saving_templates_description' => 'Select your options, then enter the name of your template in the box above and click the \'Save Template\' button. Use the dropdown to select a previously saved template.',
+    'create'  => [
+        'success' => 'Template saved successfully',
+    ],
+    'update' => [
+        'success' => 'Template updated successfully',
+    ],
+    'delete' => [
+        'success' => 'Template deleted',
+        'no_delete_permission' => 'Template does not exist or you do not have permission to delete it.',
+    ],
+];
diff --git a/resources/lang/af-ZA/admin/settings/general.php b/resources/lang/af-ZA/admin/settings/general.php
index e7e15bab85..dbb2db306d 100644
--- a/resources/lang/af-ZA/admin/settings/general.php
+++ b/resources/lang/af-ZA/admin/settings/general.php
@@ -8,13 +8,13 @@ return [
     'ad_append_domain'          => 'Append domain name to username field',
     'ad_append_domain_help'     => 'User isn\'t required to write "username@domain.local", they can just type "username".',
     'admin_cc_email'            => 'CC Email',
-    'admin_cc_email_help'       => 'If you would like to send a copy of checkin/checkout emails that are sent to users to an additional email account, enter it here. Otherwise leave this field blank.',
+    'admin_cc_email_help'       => 'Send a copy of checkin/checkout emails to this address.',
     'admin_settings'            => 'Admin Settings',
     'is_ad'				        => 'Dit is \'n Active Directory-bediener',
     'alerts'                	=> 'Alerts',
     'alert_title'               => 'Update Notification Settings',
     'alert_email'				=> 'Stuur kennisgewings aan',
-    'alert_email_help'    => 'Email addresses or distribution lists you want alerts to be sent to, comma separated',
+    'alert_email_help'          => 'Email addresses or distribution lists you want alerts to be sent to, comma separated.',
     'alerts_enabled'			=> 'Alerts aangeskakel',
     'alert_interval'			=> 'Uitgaande Alert Drempel (in dae)',
     'alert_inv_threshold'		=> 'Voorraadwaarskuwingsdrempel',
@@ -31,15 +31,18 @@ return [
     'backups'					=> 'rugsteun',
     'backups_help'              => 'Create, download, and restore backups ',
     'backups_restoring'         => 'Restoring from Backup',
+    'backups_clean' => 'Clean the backed-up database before restore',
+    'backups_clean_helptext' => "This can be useful if you're changing between database versions",
     'backups_upload'            => 'Upload Backup',
     'backups_path'              => 'Backups on the server are stored in <code>:path</code>',
-    'backups_restore_warning'   => 'Use the restore button <small><span class="btn btn-xs btn-warning"><i class="text-white fas fa-retweet" aria-hidden="true"></i></span></small> to restore from a previous backup. (This does not currently work with S3 file storage or Docker.)<br><br>Your <strong>entire :app_name database and any uploaded files will be completely replaced</strong> by what\'s in the backup file.  ',
+    'backups_restore_warning'   => 'Use the restore button <small><span class="btn btn-xs btn-warning"><i class="text-white fas fa-retweet" aria-hidden="true"></i></span></small> to restore from a previous backup. (This does not currently work with S3 file storage or Docker.)<br><br>Your <strong>entire :app_name database and any uploaded files will be completely replaced</strong> by what\'s in the backup file  ',
     'backups_logged_out'         => 'All existing users, including you, will be logged out once your restore is complete.',
     'backups_large'             => 'Very large backups may time out on the restore attempt and may still need to be run via command line. ',
     'barcode_settings'			=> 'Barcode-instellings',
     'confirm_purge'			    => 'Bevestig skoonmaak',
     'confirm_purge_help'		=> 'Enter the text "DELETE" in the box below to purge your deleted records. This action cannot be undone and will PERMANENTLY delete all soft-deleted items and users. (You should make a backup first, just to be safe.)',
     'custom_css'				=> 'Aangepaste CSS',
+    'custom_css_placeholder'	=> 'Add your custom CSS',
     'custom_css_help'			=> 'Voer enige aangepaste CSS-oortredings in wat u graag wil gebruik. Moenie die &lt;style&gt;&lt;/style&gt;-etikette insluit nie.',
     'custom_forgot_pass_url'	=> 'Custom Password Reset URL',
     'custom_forgot_pass_url_help'	=> 'This replaces the built-in forgotten password URL on the login screen, useful to direct people to internal or hosted LDAP password reset functionality. It will effectively disable local user forgotten password functionality.',
@@ -47,34 +50,34 @@ return [
     'dashboard_message_help'	=> 'This text will appear on the dashboard for anyone with permission to view the dashboard.',
     'default_currency'  		=> 'Verstek Geld',
     'default_eula_text'			=> 'Standaard EULA',
+    'default_eula_text_placeholder' => 'Add your default EULA text',
     'default_language'			=> 'Verstek taal',
     'default_eula_help_text'	=> 'U kan ook aangepaste EULA\'s aan spesifieke batekategorieë assosieer.',
     'acceptance_note'           => 'Add a note for your decision (Optional)',
     'display_asset_name'        => 'Wys bate naam',
     'display_checkout_date'     => 'Vertoon Checkout Date',
     'display_eol'               => 'Wys EOL in tabelweergawe',
-    'display_qr'                => 'Vertoon vierkante kodes',
+    'display_qr'                => 'Display 2D barcode',
     'display_alt_barcode'		=> 'Wys 1D strepieskode',
-    'email_logo'                => 'Email Logo',
     'barcode_type'				=> '2D Barcode Type',
     'alt_barcode_type'			=> '1D barcode tipe',
-    'email_logo_size'       => 'Square logos in email look best. ',
     'enabled'                   => 'Enabled',
     'eula_settings'				=> 'EULA-instellings',
     'eula_markdown'				=> 'Hierdie EULA laat <a href="https://help.github.com/articles/github-flavored-markdown/">Github-geurde markdown</a> toe.',
+    'empty_row_count'           => 'Field Start Offset (Empty Rows)',
+    'empty_row_count_help'      => 'Fields will begin populating after this many empty rows are skipped at the top of the label.',
     'favicon'                   => 'Favicon',
     'favicon_format'            => 'Accepted filetypes are ico, png, and gif. Other image formats may not work in all browsers.',
     'favicon_size'          => 'Favicons should be square images, 16x16 pixels.',
     'footer_text'               => 'Additional Footer Text ',
     'footer_text_help'          => 'This text will appear in the right-side footer. Links are allowed using <a href="https://help.github.com/articles/github-flavored-markdown/">Github flavored markdown</a>. Line breaks, headers, images, etc may result in unpredictable results.',
+    'footer_text_placeholder'   => 'Optional footer text',
     'general_settings'			=> 'Algemene instellings',
-    'general_settings_keywords' => 'company support, signature, acceptance, email format, username format, images, per page, thumbnail, eula, gravatar, tos, dashboard, privacy',
     'general_settings_help'     => 'Default EULA and more',
     'generate_backup'			=> 'Genereer rugsteun',
     'google_workspaces'         => 'Google Workspaces',
     'header_color'              => 'Opskrif Kleur',
     'info'                      => 'Met hierdie instellings kan u sekere aspekte van u installasie aanpas.',
-    'label_logo'                => 'Label Logo',
     'label_logo_size'           => 'Square logos look best - will be displayed in the top right of each asset label. ',
     'laravel'                   => 'Laravel Weergawe',
     'ldap'                      => 'LDAP',
@@ -94,7 +97,7 @@ return [
     'ldap_login_sync_help'      => 'This only tests that LDAP can sync correctly. If your LDAP Authentication query is not correct, users may still not be able to login. YOU MUST SAVE YOUR UPDATED LDAP SETTINGS FIRST.',
     'ldap_manager'              => 'LDAP Manager',
     'ldap_server'               => 'LDAP-bediener',
-    'ldap_server_help'          => 'Dit moet begin met ldap: // (vir unencrypted of TLS) of ldaps: // (vir SSL)',
+    'ldap_server_help'          => 'This should start with ldap:// (for unencrypted) or ldaps:// (for TLS or SSL)',
     'ldap_server_cert'			=> 'LDAP SSL-sertifikaat-validering',
     'ldap_server_cert_ignore'	=> 'Laat ongeldige SSL-sertifikaat toe',
     'ldap_server_cert_help'		=> 'Kies hierdie boks as u \'n self-ondertekende SSL-sertifikaat gebruik en graag \'n ongeldige SSL-sertifikaat aanvaar.',
@@ -108,8 +111,8 @@ return [
     'ldap_pword'                => 'LDAP-koppel wagwoord',
     'ldap_basedn'               => 'Base Bind DN',
     'ldap_filter'               => 'LDAP Filter',
-    'ldap_pw_sync'              => 'LDAP-wagwoordsynkronisering',
-    'ldap_pw_sync_help'         => 'Verwyder hierdie vinkje as u nie LDAP-wagwoorde wil laat sinkroniseer met plaaslike wagwoorde nie. As u hierdie opsie uitskakel, beteken dit dat u gebruikers dalk nie kan aanmeld as u LDAP-bediener om een ​​of ander rede onbereikbaar is nie.',
+    'ldap_pw_sync'              => 'Cache LDAP Passwords',
+    'ldap_pw_sync_help'         => 'Uncheck this box if you do not wish to keep LDAP passwords cached as local hashed passwords. Disabling this means that your users may not be able to login if your LDAP server is unreachable for some reason.',
     'ldap_username_field'       => 'Gebruikernaam',
     'ldap_lname_field'          => 'Van',
     'ldap_fname_field'          => 'LDAP Voornaam',
@@ -117,13 +120,15 @@ return [
     'ldap_version'              => 'LDAP-weergawe',
     'ldap_active_flag'          => 'LDAP-aktiewe vlag',
     'ldap_activated_flag_help'  => 'This value is used to determine whether a synced user can login to Snipe-IT. <strong>It does not affect the ability to check items in or out to them</strong>, and should be the <strong>attribute name</strong> within your AD/LDAP, <strong>not the value</strong>. <br><br>If this field is set to a field name that does not exist in your AD/LDAP, or the value in the AD/LDAP field is set to <code>0</code> or <code>false</code>, <strong>user login will be disabled</strong>. If the value in the AD/LDAP field is set to <code>1</code> or <code>true</code> or <em>any other text</em> means the user can log in. When the field is blank in your AD, we respect the <code>userAccountControl</code> attribute, which usually allows non-suspended users to log in.',
+    'ldap_invert_active_flag'   => 'LDAP Invert Active Flag',
+    'ldap_invert_active_flag_help'     => 'If enabled: when the value returned by LDAP Active Flag is <code>0</code> or <code>false</code> the user account will be active.',
     'ldap_emp_num'              => 'LDAP Werknemersnommer',
     'ldap_email'                => 'LDAP-e-pos',
     'ldap_test'                 => 'Test LDAP',
     'ldap_test_sync'            => 'Test LDAP Synchronization',
     'license'                   => 'Software License',
-    'load_remote'               => 'Use Gravatar',
-    'load_remote_help_text'		=> 'Uncheck this box if your install cannot load scripts from the outside internet. This will prevent Snipe-IT from trying load images from Gravatar.',
+    'load_remote'               => 'Load Remote Avatars',
+    'load_remote_help_text'		=> 'Uncheck this box if your install cannot load scripts from the outside internet. This will prevent Snipe-IT from trying load avatars from Gravatar or other outside sources.',
     'login'                     => 'Login Attempts',
     'login_attempt'             => 'Login Attempt',
     'login_ip'                  => 'IP Address',
@@ -131,6 +136,7 @@ return [
     'login_user_agent'          => 'User Agent',
     'login_help'                => 'List of attempted logins',
     'login_note'                => 'Login Nota',
+    'login_note_placeholder'            => "If you do not have a login or have found a device belonging to this company, please call technical support at 888-555-1212. Thank you.",
     'login_note_help'           => 'Voeg opsioneel \'n paar sinne op jou aanmeldskerm, byvoorbeeld om mense te help wat \'n verlore of gesteelde toestel gevind het. Hierdie veld aanvaar <a href="https://help.github.com/articles/github-flavored-markdown/">Gitub-gegeurde markdown</a>',
     'login_remote_user_text'    => 'Remote User login options',
     'login_remote_user_enabled_text' => 'Enable Login with Remote User Header',
@@ -146,13 +152,16 @@ return [
     'logo_print_assets_help'    => 'Use branding on printable asset lists ',
     'full_multiple_companies_support_help_text' => 'Beperking van gebruikers (insluitend administrateurs) wat aan maatskappye toegewys is aan hul maatskappy se bates.',
     'full_multiple_companies_support_text' => 'Volledige Veelvuldige Maatskappye Ondersteuning',
+    'scope_locations_fmcs_support_text'  => 'Scope Locations with Full Multiple Companies Support',
+    'scope_locations_fmcs_support_help_text'  => 'Restrict locations to their selected company.',
+    'scope_locations_fmcs_check_button' => 'Check Compatibility',
+    'scope_locations_fmcs_support_disabled_text'  => 'This option is disabled because you have conflicting locations set for :count or more items.',
     'show_in_model_list'   => 'Show in Model Dropdowns',
     'optional'					=> 'opsioneel',
     'per_page'                  => 'Resultate per bladsy',
     'php'                       => 'PHP weergawe',
-    'php_info'                  => 'PHP Info',
+    'php_info'                  => 'PHP info',
     'php_overview'              => 'PHP',
-    'php_overview_keywords'     => 'phpinfo, system, info',
     'php_overview_help'         => 'PHP System info',
     'php_gd_info'               => 'Jy moet php-gd installeer om QR-kodes te vertoon, sien installeringsinstruksies.',
     'php_gd_warning'            => 'PHP Image Processing en GD plugin is NIE geïnstalleer nie.',
@@ -218,6 +227,8 @@ return [
     'webhook_integration_help'    => ':app integration is optional, however the endpoint and channel are required if you wish to use it. To configure :app integration, you must first <a href=":webhook_link" target="_new" rel="noopener">create an incoming webhook</a> on your :app account. Click on the <strong>Test :app Integration</strong> button to confirm your settings are correct before saving. ',
     'webhook_integration_help_button'    => 'Once you have saved your :app information, a test button will appear.',
     'webhook_test_help'           => 'Test whether your :app integration is configured correctly. YOU MUST SAVE YOUR UPDATED :app SETTINGS FIRST.',
+    'shortcuts_enabled'         => 'Enable Shortcuts',
+    'shortcuts_help_text'       => '<strong>Windows</strong>: Alt + Access key, <strong>Mac</strong>: Control + Option + Access key',
     'snipe_version'  			=> 'Snipe-IT-weergawe',
     'support_footer'            => 'Support Footer Links ',
     'support_footer_help'       => 'Specify who sees the links to the Snipe-IT Support info and Users Manual',
@@ -227,7 +238,6 @@ return [
     'update'                    => 'Opdateer instellings',
     'value'                     => 'waarde',
     'brand'                     => 'Handelsmerk',
-    'brand_keywords'            => 'footer, logo, print, theme, skin, header, colors, color, css',
     'brand_help'                => 'Logo, Site Name',
     'web_brand'                 => 'Web Branding Type',
     'about_settings_title'      => 'Oor instellings',
@@ -276,6 +286,8 @@ return [
     'two_factor_enrollment_text'	=> "Twee faktor verifikasie is nodig, maar jou toestel is nog nie ingeskryf nie. Maak jou Google Authenticator-program oop en scan die QR-kode hieronder om jou toestel in te skryf. Sodra jy jou toestel ingeskryf het, voer die kode hieronder in",
     'require_accept_signature'      => 'Vereis Handtekening',
     'require_accept_signature_help_text'      => 'As u hierdie kenmerk aanskakel, sal gebruikers fisies moet afmeld wanneer hulle \'n bate aanvaar.',
+    'require_checkinout_notes'  => 'Require Notes on Checkin/Checkout',
+    'require_checkinout_notes_help_text'    => 'Enabling this feature will require the note fields to be populated when checking in or checking out an asset.',
     'left'        => 'links',
     'right'        => 'reg',
     'top'        => 'Top',
@@ -313,24 +325,24 @@ return [
     'filter_by_keyword' => 'Filter by setting keyword',
     'security' => 'Security',
     'security_title' => 'Update Security Settings',
-    'security_keywords' => 'password, passwords, requirements, two factor, two-factor, common passwords, remote login, logout, authentication',
     'security_help' => 'Two-factor, Password Restrictions',
-    'groups_keywords' => 'permissions, permission groups, authorization',
     'groups_help' => 'Account permission groups',
     'localization' => 'Localization',
     'localization_title' => 'Update Localization Settings',
-    'localization_keywords' => 'localization, currency, local, locale, time zone, timezone, international, internatinalization, language, languages, translation',
     'localization_help' => 'Language, date display',
     'notifications' => 'Notifications',
     'notifications_help' => 'Email Alerts & Audit Settings',
     'asset_tags_help' => 'Incrementing and prefixes',
     'labels' => 'Labels',
     'labels_title' => 'Update Label Settings',
-    'labels_help' => 'Label sizes &amp; settings',
-    'purge_keywords' => 'permanently delete',
+    'labels_help' => 'Barcodes &amp; label settings',
     'purge_help' => 'Verwyder verwyderde rekords',
     'ldap_extension_warning' => 'It does not look like the LDAP extension is installed or enabled on this server. You can still save your settings, but you will need to enable the LDAP extension for PHP before LDAP syncing or login will work.',
     'ldap_ad' => 'LDAP/AD',
+    'ldap_test_label' => 'Test LDAP Sync',
+    'ldap_test_login' => ' Test LDAP Login',
+    'ldap_username_placeholder' => 'LDAP Username',
+    'ldap_password_placeholder' => 'LDAP Password',
     'employee_number' => 'Employee Number',
     'create_admin_user' => 'Create a User ::',
     'create_admin_success' => 'Success! Your admin user has been added!',
@@ -342,6 +354,8 @@ return [
     'setup_migration_create_user' => 'Next: Create User',
     'ldap_settings_link' => 'LDAP Settings Page',
     'slack_test' => 'Test <i class="fab fa-slack"></i> Integration',
+    'status_label_name' => 'Status Label Name',
+    'super_admin_only'  => 'Super Admin Only',
     'label2_enable'           => 'New Label Engine',
     'label2_enable_help'      => 'Switch to the new label engine. <b>Note: You will need to save this setting before setting others.</b>',
     'label2_template'         => 'Template',
@@ -356,12 +370,15 @@ return [
     'label2_2d_type'          => '2D Barcode Type',
     'label2_2d_type_help'     => 'Format for 2D barcodes',
     'label2_2d_target'        => '2D Barcode Target',
-    'label2_2d_target_help'   => 'The URL the 2D barcode points to when scanned',
+    'label2_2d_target_help'   => 'The data that will be contained in the 2D barcode',
     'label2_fields'           => 'Field Definitions',
     'label2_fields_help'      => 'Fields can be added, removed, and reordered in the left column. For each field, multiple options for Label and DataSource can be added, removed, and reordered in the right column.',
+    'purge_barcodes' => 'Purge Barcodes',
     'help_asterisk_bold'    => 'Text entered as <code>**text**</code> will be displayed as bold',
     'help_blank_to_use'     => 'Leave blank to use the value from <code>:setting_name</code>',
     'help_default_will_use' => '<code>:default</code> will use the value from <code>:setting_name</code>. <br>Note that the value of the barcodes must comply with the respective barcode spec in order to be successfully generated. Please see <a href="https://snipe-it.readme.io/docs/barcodes">the documentation <i class="fa fa-external-link"></i></a> for more details. ',
+    'asset_id'              => 'Asset ID',
+    'data'               => 'Data',
     'default'               => 'Default',
     'none'                  => 'None',
     'google_callback_help' => 'This should be entered as the callback URL in your Google OAuth app settings in your organization&apos;s <strong><a href="https://console.cloud.google.com/" target="_blank">Google developer console <i class="fa fa-external-link" aria-hidden="true"></i></a></strong>.',
@@ -373,7 +390,100 @@ return [
     'database_driver' => 'Database Driver',
     'bs_table_storage' => 'Table Storage',
     'timezone' => 'Timezone',
+    'test_mail' => 'Test Mail',
     'profile_edit'          => 'Edit Profile',
     'profile_edit_help'          => 'Allow users to edit their own profiles.',
+    'default_avatar' => 'Custom Default Avatar',
+    'default_avatar_help' => 'This image will be displayed as a profile if a user does not have a profile photo.',
+    'restore_default_avatar' => 'Restore <a href=":default_avatar" data-toggle="lightbox" data-type="image">original system default avatar</a>',
+    'restore_default_avatar_help' => '',
+    'due_checkin_days' => 'Due For Checkin Warning',
+    'due_checkin_days_help' => 'How many days before the expected checkin of an asset should it be listed in the "Due for checkin" page?',
+    'no_groups' => 'No groups have been created yet. Visit <code>Admin Settings > Permission Groups</code> to add one.',
+    'text' => 'Text',
+
+    'username_formats' => [
+        'username_format'		=> 'Gebruikernaam',
+        'firstname_lastname_format'	=> 'Vir Naam Van (jane.smith)',
+        'first_name_format'	        => 'First Name (jane)',
+        'last_name_format'		=> 'Last Name (doe)',
+        'filastname_format'			=> 'First Initial Last Name (jsmith)',
+        'lastnamefirstinitial_format' =>  'Last Name First Initial (smithj)',
+        'firstname_lastname_underscore_format' => 'First Name Last Name (jane_smith)',
+        'firstinitial.lastname' => 'First Initial Last Name (j.smith)',
+        'lastname_firstinitial' => 'Last Name First Initial (smith_j)',
+        'lastname_dot_firstinitial_format' => 'Last Name First Initial (smith.j)',
+        'firstnamelastname'     => 'First Name Last Name (janesmith)',
+        'firstnamelastinitial'  => 'First Name Last Initial (janes)',
+        'lastnamefirstname'      => 'Last Name.First Name (smith.jane)',
+    ],
+
+    'email_formats' => [
+        'email_format'			=> 'E-pos formaat',
+        'firstname_lastname_format'	=> 'Vir Naam Van (jane.smith@example.com)',
+        'first_name_format'		=> 'Voornaam (jane@example.com)',
+        'last_name_format'		=> 'Last Name (doe@example.com)',
+        'filastname_format'			=> 'Eerste Voorletter (jsmith@voorbeeld.com)',
+        'lastnamefirstinitial_format' =>  'Last Name First Initial (smithj@example.com)',
+        'firstname_lastname_underscore_format' => 'First Name Last Name (jane_smith@example.com)',
+        'firstinitial.lastname' => 'First Initial Last Name (j.smith@example.com)',
+        'lastname_firstinitial' => 'Last Name First Initial (smith_j@example.com)',
+        'lastname_dot_firstinitial_format' => 'Last Name First Initial (smith.j@example.com)',
+        'firstnamelastname'     => 'First Name Last Name (janesmith@example.com)',
+        'firstnamelastinitial'  => 'First Name Last Initial (janes@example.com)',
+        'lastnamefirstname'      => 'Last Name.First Name (smith.jane@example.com)',
+    ],
+
+
+
+    'logo_labels' => [
+        'acceptance_pdf_logo'       => 'PDF Logo',
+        'email_logo'                => 'Email Logo',
+        'label_logo'                => 'Label Logo',
+        'logo'                      => 'Site Logo',
+        'favicon'                   => 'Favicon',
+    ],
+
+    'logo_help' => [
+        'email_logo_size'       => 'Square logos in email look best. ',
+    ],
+
+    'logo_option_types' => [
+        'text' => 'Text',
+        'logo' => 'logo',
+        'logo_and_text' => 'Logo and Text',
+    ],
+
+
+    'legends' => [
+        'scoping' => 'Scoping',
+        'formats' => 'Default Formats',
+        'profiles' => 'User Profiles',
+        'eula' => 'EULA & Acceptance Preferences',
+        'misc_display' => 'Miscellaneous Display Options',
+        'email' => 'Email Preferences',
+        'checkin' => 'Checkin Preferences',
+        'dashboard' => 'Login & Dashboard Preferences',
+        'misc' => 'Miscellaneous',
+        'logos' => 'Logos & Display',
+        'colors' => 'Colors & Skins',
+        'footer' => 'Footer Preferences',
+        'security' => 'Security Preferences',
+        'general' => 'General',
+        'intervals' => 'Intervals & Thresholds',
+    ],
+
+
+    /* Keywords for settings overview help */
+    'keywords' => [
+        'brand'             => 'footer, logo, print, theme, skin, header, colors, color, css',
+        'general_settings'  => 'company support, signature, acceptance, email format, username format, images, per page, thumbnail, eula, gravatar, tos, dashboard, privacy',
+        'groups'            => 'permissions, permission groups, authorization',
+        'labels'            => 'labels, barcodes, barcode, sheets, print, upc, qr, 1d, 2d',
+        'localization'      => 'localization, currency, local, locale, time zone, timezone, international, internatinalization, language, languages, translation',
+        'php_overview'      => 'phpinfo, system, info',
+        'purge'             => 'permanently delete',
+        'security'          => 'password, passwords, requirements, two factor, two-factor, common passwords, remote login, logout, authentication',
+    ],
 
 ];
diff --git a/resources/lang/af-ZA/admin/settings/message.php b/resources/lang/af-ZA/admin/settings/message.php
index 8f41acf3f1..9cd8749deb 100644
--- a/resources/lang/af-ZA/admin/settings/message.php
+++ b/resources/lang/af-ZA/admin/settings/message.php
@@ -14,6 +14,9 @@ return [
         'restore_warning'       => 'Yes, restore it. I acknowledge that this will overwrite any existing data currently in the database. This will also log out all of your existing users (including you).',
         'restore_confirm'       => 'Are you sure you wish to restore your database from :filename?'
     ],
+    'restore' => [
+        'success'               => 'Your system backup has been restored. Please log in again.'
+    ],
     'purge' => [
         'error'     => '\'N Fout het voorgekom tydens suiwering.',
         'validation_failed'     => 'Jou skoonmaakbevestiging is verkeerd. Tik asseblief die woord "DELETE" in die bevestigingsboks.',
@@ -33,6 +36,9 @@ return [
         'testing_authentication' => 'Testing LDAP Authentication...',
         'authentication_success' => 'User authenticated against LDAP successfully!'
     ],
+    'labels' => [
+        'null_template' => 'Label template not found. Please select a template.',
+        ],
     'webhook' => [
         'sending' => 'Sending :app test message...',
         'success' => 'Your :webhook_name Integration works!',
@@ -42,5 +48,12 @@ return [
         'error' => 'Something went wrong. :app responded with: :error_message',
         'error_redirect' => 'ERROR: 301/302 :endpoint returns a redirect. For security reasons, we don’t follow redirects. Please use the actual endpoint.',
         'error_misc' => 'Something went wrong. :( ',
-    ]
+        'webhook_fail' => ' webhook notification failed: Check to make sure the URL is still valid.',
+        'webhook_channel_not_found' => ' webhook channel not found.',
+        'ms_teams_deprecation' => 'The selected Microsoft Teams webhook URL will be deprecated Dec 31st, 2025. Please use a workflow URL. Microsoft\'s documentation on creating a workflow can be found <a href="https://support.microsoft.com/en-us/office/create-incoming-webhooks-with-workflows-for-microsoft-teams-8ae491c7-0394-4861-ba59-055e33f75498" target="_blank"> here.</a>',
+    ],
+    'location_scoping' => [
+        'not_saved' => 'Your settings were not saved.',
+        'mismatch' => 'There is 1 item in the database that need your attention before you can enable location scoping.|There are :count items in the database that need your attention before you can enable location scoping.',
+    ],
 ];
diff --git a/resources/lang/af-ZA/admin/statuslabels/table.php b/resources/lang/af-ZA/admin/statuslabels/table.php
index 24e1078b69..16af55285c 100644
--- a/resources/lang/af-ZA/admin/statuslabels/table.php
+++ b/resources/lang/af-ZA/admin/statuslabels/table.php
@@ -1,14 +1,14 @@
 <?php
 
 return array(
-    'about'      	=> 'Oor Status Etikette',
+    'about'      	=> 'About Status Types',
     'archived'      	=> 'argief',
     'create'      	=> 'Skep statusetiket',
     'color'      	=> 'Grafiek Kleur',
     'default_label' => 'Default Label',
     'default_label_help' => 'This is used to ensure your most commonly used status labels appear at the top of the select box when creating/editing assets.',
     'deployable'      	=> 'verbintenis',
-    'info'      	=> 'Statusetikette word gebruik om die verskillende state waarin u bates kan wees, te beskryf. Hulle kan dalk herstel, verlore / gesteel wees, ens. U kan nuwe statusetikette skep vir ontplooibare, hangende en geargiveerde bates.',
+    'info'      	=> 'Status label types are used to describe the various states your assets could be in. They may be out for repair, lost/stolen, etc. You can create new status labels for your deployable, pending and archived assets according to your own workflow. For more information, <a href="https://snipe-it.readme.io/docs/overview#status-labels" target="_blank">see the documentation <i class="fa fa-external-link"></i></a>.',
     'name'      	=> 'Status Naam',
     'pending'      	=> 'hangende',
     'status_type'   => 'Status Tipe',
diff --git a/resources/lang/af-ZA/admin/users/general.php b/resources/lang/af-ZA/admin/users/general.php
index c91c0d7901..c0ee6ba1a5 100644
--- a/resources/lang/af-ZA/admin/users/general.php
+++ b/resources/lang/af-ZA/admin/users/general.php
@@ -19,6 +19,8 @@ return [
     'print_assigned'    => 'Print All Assigned',
     'email_assigned'    => 'Email List of All Assigned',
     'user_notified'     => 'User has been emailed a list of their currently assigned items.',
+    'users_notified'    => 'The user has been emailed a list of their currently assigned items.|:count users have been emailed a list of their currently assigned items.',
+    'users_notified_warning' => ':count user has been emailed a list of their currently assigned items, however :no_email users did not have an email address so could not be emailed.|:count users have been emailed a list of their currently assigned items, however :no_email user(s) did not have an email address so could not be emailed.',
     'auto_assign_label' => 'Include this user when auto-assigning eligible licenses',
     'auto_assign_help'  => 'Skip this user in auto assignment of licenses',
     'software_user'     => 'Sagteware Uitgesoek na: naam',
diff --git a/resources/lang/af-ZA/admin/users/message.php b/resources/lang/af-ZA/admin/users/message.php
index 81d99479a6..8fdfa7c5b0 100644
--- a/resources/lang/af-ZA/admin/users/message.php
+++ b/resources/lang/af-ZA/admin/users/message.php
@@ -6,7 +6,7 @@ return array(
     'declined'                  => 'Jy het hierdie bate suksesvol geweier.',
     'bulk_manager_warn'	        => 'Jou gebruikers is suksesvol opgedateer, maar jou bestuurderinskrywing is nie gestoor nie, want die bestuurder wat jy gekies het, was ook in die gebruikerslys om geredigeer te word, en gebruikers mag nie hul eie bestuurder wees nie. Kies asseblief u gebruikers weer, behalwe die bestuurder.',
     'user_exists'               => 'Gebruiker bestaan ​​reeds!',
-    'user_not_found'            => 'Gebruiker bestaan ​​nie.',
+    'user_not_found'            => 'User does not exist or you do not have permission view them.',
     'user_login_required'       => 'Die aanmeldingsveld is nodig',
     'user_has_no_assets_assigned' => 'No assets currently assigned to user.',
     'user_password_required'    => 'Die wagwoord is nodig.',
@@ -53,6 +53,7 @@ return array(
         'ldap_could_not_search' => 'Kon nie die LDAP-bediener soek nie. Gaan asseblief die LDAP-bediener opstelling in die LDAP-konfigurasie lêer. <br>Error van LDAP-bediener:',
         'ldap_could_not_get_entries' => 'Kon nie inskrywings van die LDAP-bediener kry nie. Gaan asseblief die LDAP-bediener opstelling in die LDAP-konfigurasie lêer. <br>Error van LDAP-bediener:',
         'password_ldap' => 'Die wagwoord vir hierdie rekening word bestuur deur LDAP / Active Directory. Kontak asseblief u IT-afdeling om u wagwoord te verander.',
+        'multi_company_items_assigned' => 'This user has items assigned that belong to a different company. Please check them in or edit their company.'
     ),
 
     'deletefile' => array(
diff --git a/resources/lang/af-ZA/admin/users/table.php b/resources/lang/af-ZA/admin/users/table.php
index b885bbd890..d05dfd3bae 100644
--- a/resources/lang/af-ZA/admin/users/table.php
+++ b/resources/lang/af-ZA/admin/users/table.php
@@ -22,7 +22,7 @@ return array(
     'managed_locations'     => 'Bestuurde plekke',
     'managed_users'         => 'Managed Users',
     'name' 					=> 'naam',
-    'nogroup'               => 'No groups have been created yet. To add one, visit: ',
+    'nogroup'               => 'No groups have been created yet. To add one, visit:',
     'notes'                 => 'notas',
     'password_confirm' 		=> 'Bevestig Wagwoord',
     'password' 				=> 'wagwoord',
diff --git a/resources/lang/af-ZA/auth.php b/resources/lang/af-ZA/auth.php
index db310aa1bb..14d8acfce0 100644
--- a/resources/lang/af-ZA/auth.php
+++ b/resources/lang/af-ZA/auth.php
@@ -15,6 +15,6 @@ return array(
 
     'failed' => 'These credentials do not match our records.',
     'password' => 'The provided password is incorrect.',
-    'throttle' => 'Too many login attempts. Please try again in :seconds seconds.',
+    'throttle' => 'Too many login attempts. Please try again in :minutes minute(s).',
 
 );
diff --git a/resources/lang/af-ZA/auth/message.php b/resources/lang/af-ZA/auth/message.php
index 2459eacbc0..8a705bda43 100644
--- a/resources/lang/af-ZA/auth/message.php
+++ b/resources/lang/af-ZA/auth/message.php
@@ -6,8 +6,6 @@ return array(
     'account_not_found'      => 'Die gebruikersnaam of wagwoord is verkeerd.',
     'account_not_activated'  => 'Hierdie gebruikers rekening is nie geaktiveer nie.',
     'account_suspended'      => 'Hierdie gebruikerrekening is opgeskort.',
-    'account_banned'         => 'Hierdie gebruikerrekening is verban.',
-    'throttle'               => 'Too many failed login attempts. Please try again in :minutes minutes.',
 
     'two_factor' => array(
         'already_enrolled'      => 'Your device is already enrolled.',
diff --git a/resources/lang/af-ZA/button.php b/resources/lang/af-ZA/button.php
index e0709bce16..a6b51214f8 100644
--- a/resources/lang/af-ZA/button.php
+++ b/resources/lang/af-ZA/button.php
@@ -7,6 +7,7 @@ return [
     'checkin_and_delete'  	    => 'Checkin All / Delete User',
     'delete'  	                => 'verwyder',
     'edit'    	                => 'wysig',
+    'clone'    	                => 'Clone',
     'restore' 	                => 'herstel',
     'remove'                    => 'Remove',
     'request'                   => 'versoek',
@@ -21,4 +22,13 @@ return [
     'add_maintenance'           => 'Add Maintenance',
     'append'                    => 'Append',
     'new'                       => 'Nuwe',
+    'var' => [
+        'clone'     => 'Clone :item_type',
+        'edit'      => 'Edit :item_type',
+        'delete'    => 'Delete :item_type',
+        'restore'   => 'Restore :item_type',
+        'create'    => 'Create New :item_type',
+        'checkout'  => 'Checkout :item_type',
+        'checkin'   => 'Checkin :item_type',
+    ]
 ];
diff --git a/resources/lang/af-ZA/general.php b/resources/lang/af-ZA/general.php
index eae36eb446..1d06acb75f 100644
--- a/resources/lang/af-ZA/general.php
+++ b/resources/lang/af-ZA/general.php
@@ -10,7 +10,7 @@ return [
     'action'                => 'aksie',
     'activity_report'		=> 'Aktiwiteitsverslag',
     'address'				=> 'adres',
-    'admin'					=> 'admin',
+    'admin'					=> 'Admin Settings',
     'admin_tooltip'			=> 'This user has admin privileges',
     'superuser'				=> 'Superuser',
     'superuser_tooltip'		=> 'This user has superuser privileges',
@@ -23,13 +23,16 @@ return [
     'asset_models'			=> 'Bate Modelle',
     'asset_model'			=> 'model',
     'asset'					=> 'bate',
+    'asset_previous'        => 'Asset (Previously Assigned)',
     'asset_report'          => 'Asset Report',
     'asset_tag'				=> 'Bate-tag',
     'asset_tags'            => 'Asset Tags',
     'assets_available'		=> 'Assets available',
     'accept_assets'         => 'Accept Assets :name',
     'accept_assets_menu'    => 'Accept Assets',
+    'accept_item'           => 'Accept Item',
     'audit'				    => 'oudit',
+    'audits'				=> 'Audits',
     'audit_report'			=> 'Ouditlogboek',
     'assets'				=> 'bates',
     'assets_audited'        => 'assets audited',
@@ -61,9 +64,12 @@ return [
     'changepassword'  		=> 'Verander wagwoord',
     'checkin'  				=> 'Inboek',
     'checkin_from'  		=> 'Kontroleer vanaf',
+    'checkin_note'  		=> 'Checkin Note',
+    'checkout_note'  		=> 'Checkout Note',
     'checkout'  			=> 'Uitteken',
     'checkouts_count'       => 'Checkouts',
     'checkins_count'        => 'Checkins',
+    'checkin_and_delete'  	=> 'Checkin and Delete',
     'user_requests_count'   => 'Requests',
     'city'  				=> 'Stad',
     'click_here'			=> 'Klik hier',
@@ -77,7 +83,7 @@ return [
     'consumables'			=> 'Consumables',
     'country'  				=> 'land',
     'could_not_restore'     => 'Error restoring :item_type: :error',
-    'not_deleted'           => 'The :item_type is not deleted so it cannot be restored',
+    'not_deleted'           => 'The :item_type was not deleted and therefore cannot be restored',
     'create'				=> 'Skep nuwe',
     'created'               => 'Item geskep',
     'created_asset'			=> 'geskep bate',
@@ -86,11 +92,13 @@ return [
     'record_created' 		=> 'Record Created',
     'updated_at' 			=> 'Opgedateer op',
     'currency'  			=> '$', // this is deprecated
+    'currency_text'  		=> 'Currency', //
     'current'  				=> 'Huidige',
     'current_password'      => 'Current Password',
     'customize_report'      => 'Customize Report',
     'custom_report'         => 'Aangepaste bateverslag',
     'dashboard'				=> 'Dashboard',
+    'data_source'           => 'Data Source',
     'days'      			=> 'dae',
     'days_to_next_audit'    => 'Dae na Volgende Oudit',
     'date'					=> 'datum',
@@ -98,7 +106,7 @@ return [
     'debug_warning_text'    => 'Hierdie program word uitgevoer in die produksiemodus met debugging aangeskakel. Dit kan sensitiewe data blootstel indien u aansoek vir die buitewêreld toeganklik is. Deaktiveer debug-modus deur die <code>APP_DEBUG</code>-waarde in jou <code>.env</code>-lêer te stel na <code>false</code>.',
     'delete'  				=> 'verwyder',
     'delete_confirm'  		=> 'Are you sure you wish to delete :item?',
-    'delete_confirm_no_undo' => 'Are you sure you wish to delete :item? This can not be undone.',
+    'delete_confirm_no_undo' => 'Are you sure, you wish to delete :item? This cannot be undone.',
     'deleted'  				=> 'geskrap',
     'delete_seats'  		=> 'Plekke verwyder',
     'deletion_failed'       => 'Deletion failed',
@@ -114,29 +122,13 @@ return [
     'editprofile'  			=> 'Wysig jou profiel',
     'eol'					=> 'EOL',
     'email_domain'			=> 'E-pos Domein',
-    'email_format'			=> 'E-pos formaat',
     'employee_number'       => 'Employee Number',
     'email_domain_help'		=> 'Dit word gebruik om e-posadresse te genereer wanneer u dit invoer',
     'error'				    => 'Error',
     'exclude_archived'      => 'Exclude Archived Assets',
     'exclude_deleted'       => 'Exclude Deleted Assets',
     'example'				=> 'Example: ',
-    'filastname_format'			=> 'Eerste Voorletter (jsmith@voorbeeld.com)',
-    'firstname_lastname_format'	=> 'Vir Naam Van (jane.smith@example.com)',
-    'firstname_lastname_underscore_format' => 'First Name Last Name (jane_smith@example.com)',
-    'lastnamefirstinitial_format' =>  'Last Name First Initial (smithj@example.com)',
-    'firstintial_dot_lastname_format' => 'First Initial Last Name (j.smith@example.com)',
-    'firstname_lastname_display'	=> 'First Name Last Name (Jane Smith)',
-    'lastname_firstname_display'	=> 'Last Name First Name (Smith Jane)',
-    'name_display_format'	=> 'Name Display Format',
-    'first'					=> 'eerste',
-    'firstnamelastname'     => 'First Name Last Name (janesmith@example.com)',
-    'lastname_firstinitial' => 'Last Name First Initial (smith_j@example.com)',
-    'firstinitial.lastname' => 'First Initial Last Name (j.smith@example.com)',
-    'firstnamelastinitial'  => 'First Name Last Initial (janes@example.com)',
-    'lastnamefirstname'      => 'Last Name First Name (smith.jane@example.com)',
-    'first_name'			=> 'Eerste naam',
-    'first_name_format'		=> 'Voornaam (jane@example.com)',
+
     'files'                 => 'Files',
     'file_name'				=> 'lêer',
     'file_type'             => 'File Type',
@@ -156,9 +148,9 @@ return [
     'image_delete'         	=> 'Vee prent uit',
     'include_deleted'       => 'Include Deleted Assets',
     'image_upload'         	=> 'Laai prent op',
-    'filetypes_accepted_help'    => 'Accepted filetype is :types. Max upload size allowed is :size.|Accepted filetypes are :types. Max upload size allowed is :size.',
-    'filetypes_size_help'   => 'Max upload size allowed is :size.',
-    'image_filetypes_help'  => 'Accepted filetypes are jpg, webp, png, gif, svg, and avif. Max upload size allowed is :size.',
+    'filetypes_accepted_help'    => 'Accepted filetype is :types. The maximum size allowed is :size.|Accepted filetypes are :types. The maximum upload size allowed is :size.',
+    'filetypes_size_help'   => 'The maximum upload size allowed is :size.',
+    'image_filetypes_help'  => 'Accepted Filetypes are jpg, webp, png, gif, svg, and avif. The maximum upload size allowed is :size.',
     'unaccepted_image_type'  => 'This image file was not readable. Accepted filetypes are jpg, webp, png, gif, and svg. The mimetype of this file is: :mimetype.',
     'import'         	    => 'invoer',
     'import_this_file'      => 'Map fields and process this file',
@@ -178,12 +170,17 @@ return [
     'last'					=> 'laaste',
     'last_login'            => 'Laaste Aanmelding',
     'last_name'             => 'Van',
+    'firstname_lastname_display'	=> 'First Name Last Name (Jane Smith)',
+    'lastname_firstname_display'	=> 'Last Name First Name (Smith Jane)',
+    'name_display_format'	=> 'Name Display Format',
+    'first'					=> 'eerste',
+    'first_name'			=> 'Eerste naam',
     'license'				=> 'lisensie',
     'license_report'        => 'Lisensie Verslag',
     'licenses_available'	=> 'Licenses available',
     'licenses'				=> 'lisensies',
     'list_all'				=> 'Lys almal',
-    'loading'				=> 'Loading... please wait....',
+    'loading'				=> 'Loading... please wait...',
     'lock_passwords'        => 'This field value will not be saved in a demo installation.',
     'feature_disabled'      => 'Hierdie funksie is afgeskakel vir die demo-installasie.',
     'location'              => 'plek',
@@ -193,7 +190,7 @@ return [
     'logout'				=> 'Teken uit',
     'lookup_by_tag'     => 'Opsoek deur Asset Tag',
     'maintenances'          => 'Maintenances',
-    'manage_api_keys'       => 'Manage API Keys',
+    'manage_api_keys'       => 'Manage API keys',
     'manufacturer'			=> 'vervaardiger',
     'manufacturers'			=> 'vervaardigers',
     'markdown'				=> 'Hierdie veld laat <a href="https://help.github.com/articles/github-flavored-markdown/">Gitub-gegeurde markdown</a> toe.',
@@ -215,6 +212,14 @@ return [
     'no_results'			=> 'Geen resultate.',
     'no'  					=> 'Geen',
     'notes'  				=> 'notas',
+    'note_added'            => 'Note Added',
+    'options'				=> 'Options',
+    'preview'				=> 'Preview',
+    'add_note'              => 'Add Note',
+    'note_edited'            => 'Note Edited',
+    'edit_note'              => 'Edit Note',
+    'note_deleted'            => 'Note Deleted',
+    'delete_note'              => 'Delete Note',
     'order_number'          => 'Bestellingnommer',
     'only_deleted'          => 'Only Deleted Assets',
     'page_menu'				=> 'Wys _MENU_ items',
@@ -229,7 +234,7 @@ return [
     'purchase_date'         => 'Aankoop datum',
     'qty'		            => 'HOEV',
     'quantity'		        => 'hoeveelheid',
-    'quantity_minimum'      => 'You have :count items below or almost below minimum quantity levels',
+    'quantity_minimum'      => 'You have one item below or almost below minimum quantity levels|You have :count items below or almost below minimum quantity levels',
     'quickscan_checkin'  	=> 'Quick Scan Checkin',
     'quickscan_checkin_status'  	=> 'Checkin Status',
     'ready_to_deploy'		=> 'Klaar om te implementeer',
@@ -254,7 +259,7 @@ return [
     'select_all'            => 'Select All',
     'search'				=> 'Soek',
     'select_category'       => 'Kies \'n kategorie',
-    'select_datasource' => 'Select a Datasource',
+    'select_datasource' => 'Select a data source',
     'select_department'     => 'Kies \'n Departement',
     'select_depreciation'	=> 'Kies \'n waardeverminderingstipe',
     'select_location'		=> 'Kies \'n plek',
@@ -274,13 +279,15 @@ return [
     'signed_off_by'         => 'Signed Off By',
     'skin'       			=> 'Skin',
     'webhook_msg_note'        => 'A notification will be sent via webhook',
-    'webhook_test_msg'        => 'Oh hai! Looks like your :app integration with Snipe-IT is working!',
+    'webhook_test_msg'        => 'Oh hai! It looks like your :app integration with Snipe-IT is working!',
     'some_features_disabled' => 'DEMO MODE: Sommige funksies is afgeskakel vir hierdie installasie.',
     'site_name'				=> 'Site Naam',
     'state'  				=> 'staat',
     'status_labels'			=> 'Status etikette',
+    'status_label'			=> 'Status Label',
     'status'    			=> 'status',
     'accept_eula'           => 'Acceptance Agreement',
+    'show_or_hide_eulas' => 'Show/Hide EULAs',
     'supplier'              => 'verskaffer',
     'suppliers'  			=> 'Verskaffers',
     'sure_to_delete'        => 'Is jy seker jy wil verwyder',
@@ -296,9 +303,9 @@ return [
     'type'  				=> 'tipe',
     'undeployable'			=> 'Un-verbintenis',
     'unknown_admin'			=> 'Onbekende Admin',
-    'username_format'		=> 'Gebruikernaam',
     'username'              => 'Gebruikersnaam',
     'update'                => 'Opdateer',
+    'updating_item' => 'Updating :item',
     'upload_filetypes_help'      => 'Allowed filetypes are png, gif, jpg, jpeg, doc, docx, pdf, xls, xlsx, txt, lic, xml, zip, rtf and rar. Max upload size allowed is :size.',
     'uploaded'              => 'opgelaai',
     'user'					=> 'gebruiker',
@@ -323,10 +330,10 @@ return [
     'token_expired'         => 'Jou vormsessie het verval. Probeer asseblief weer.',
     'login_enabled'         => 'Login Enabled',
     'audit_due'             => 'Due for Audit',
-    'audit_due_days'        => 'Assets Due for Audit Within :days Day|Assets Due for Audit Within :days Days',
+    'audit_due_days'        => '{}Assets Due or Overdue for Audit|[1]Assets Due or Overdue for Audit Within a Day|[2,*]Assets Due or Overdue for Audit Within :days Days',
     'checkin_due'           => 'Due for Checkin',
     'checkin_overdue'       => 'Overdue for Checkin',
-    'checkin_due_days'      => 'Assets Due for Checkin Within :days Day|Assets Due for Checkin Within :days Days',
+    'checkin_due_days'      => '{}Due for Checkin|[1]Assets Due for Checkin Within :days Day|[2,*]Assets Due for Checkin Within :days Days',
     'audit_overdue'         => 'Overdue for Audit',
     'accept'                => 'Accept :asset',
     'i_accept'              => 'I accept',
@@ -339,16 +346,16 @@ return [
     'view_all'              => 'view all',
     'hide_deleted'          => 'Hide Deleted',
     'email'                 => 'e-pos',
-    'do_not_change'         => 'Do Not Change',
-    'bug_report'            => 'Report a Bug',
+    'do_not_change'         => 'Do not change',
+    'bug_report'            => 'Report a bug',
     'user_manual'           => 'User\'s Manual',
     'setup_step_1'          => 'Step 1',
     'setup_step_2'          => 'Step 2',
     'setup_step_3'          => 'Step 3',
     'setup_step_4'          => 'Step 4',
     'setup_config_check'    => 'Configuration Check',
-    'setup_create_database' => 'Create Database Tables',
-    'setup_create_admin'    => 'Create Admin User',
+    'setup_create_database' => 'Create database tables',
+    'setup_create_admin'    => 'Create an admin user',
     'setup_done'            => 'Finished!',
     'bulk_edit_about_to'    => 'You are about to edit the following: ',
     'checked_out'           => 'Gekontroleer',
@@ -383,6 +390,8 @@ return [
     'new_license'           => 'New License',
     'new_accessory'         => 'New Accessory',
     'new_consumable'        => 'New Consumable',
+    'new_component'         => 'New Component',
+    'new_user'              => 'New User',
     'collapse'              => 'Collapse',
     'assigned'              => 'Assigned',
     'asset_count'           => 'Asset Count',
@@ -418,19 +427,20 @@ return [
     'bulk_soft_delete'      =>'Also soft-delete these users. Their asset history will remain intact unless/until you purge deleted records in the Admin Settings.',
     'bulk_checkin_delete_success' => 'Your selected users have been deleted and their items have been checked in.',
     'bulk_checkin_success' => 'The items for the selected users have been checked in.',
-    'set_to_null'           => 'Delete values for this asset|Delete values for all :asset_count assets ',
+    'set_to_null'           => 'Delete values for this selection|Delete values for all :selection_count selections ',
     'set_users_field_to_null'  => 'Delete :field values for this user|Delete :field values for all :user_count users ',
     'na_no_purchase_date'   => 'N/A - No purchase date provided',
     'assets_by_status'      => 'Assets by Status',
     'assets_by_status_type'      => 'Assets by Status Type',
     'pie_chart_type'        => 'Dashboard Pie Chart Type',
     'hello_name'            => 'Hello, :name!',
-    'unaccepted_profile_warning'   => 'You have :count items requiring acceptance. Click here to accept or decline them',
+    'unaccepted_profile_warning'   => 'You have one item requiring acceptance. Click here to accept or decline it | You have :count items requiring acceptance. Click here to accept or decline them',
     'start_date'            => 'Start Date',
     'end_date'            => 'End Date',
     'alt_uploaded_image_thumbnail' => 'Uploaded thumbnail',
     'placeholder_kit'       => 'Select a kit',
     'file_not_found'        => 'File not found',
+    'log_record_not_found'  => 'No record for that log entry was found.',
     'preview_not_available' => '(no preview)',
     'setup'                 => 'Setup',
     'pre_flight'            => 'Pre-Flight',
@@ -512,7 +522,7 @@ return [
     'checked_out_to_fields' => 'Checked Out To Fields',
     'percent_complete' => '% volledige',
     'uploading' => 'Uploading... ',
-    'upload_error' => 'Error uploading file. Please check that there are no empty rows and that no column names are duplicated.',
+    'upload_error' => 'Error uploading file. Please check that you have no empty rows or duplicated column names in your CSV, and that the server permissions allow uploads.',
     'copy_to_clipboard' => 'Copy to Clipboard',
     'copied' => 'Copied!',
     'status_compatibility' => 'If assets are already assigned, they cannot be changed to a non-deployable status type and this value change will be skipped.',
@@ -549,6 +559,71 @@ return [
         'license_seats'  => ':count License Seat|:count License Seats',
         'consumables'  => ':count Consumable|:count Consumables',
         'components'  => ':count Component|:count Components',
-    ]
+    ],
+
+    'more_info' => 'Meer inligting',
+    'quickscan_bulk_help' => 'Checking this box will edit the asset record to reflect this new location. Leaving it unchecked will simply note the location in the audit log. Note that if this asset is checked out, it will not change the location of the person, asset or location it is checked out to.',
+    'whoops' => 'Whoops!',
+    'something_went_wrong' => 'Something went wrong with your request.',
+    'close' => 'Close',
+    'expires' => 'verstryk',
+    'map_fields'=> 'Map :item_type Fields',
+    'remaining_var' => ':count Remaining',
+    'label' => 'Label',
+    'import_asset_tag_exists' => 'An asset with the asset tag :asset_tag already exists and an update was not requested. No change was made.',
+    'countries_manually_entered_help' => 'Values with an asterisk (*) were manually entered and do not match existing ISO 3166 dropdown values',
+    'accessories_assigned' => 'Assigned Accessories',
+    'user_managed_passwords' => 'Password Management',
+    'user_managed_passwords_disallow' => 'Disallow users from managing their own passwords',
+    'user_managed_passwords_allow' => 'Allow users to manage their own passwords',
+    'from' => 'From',
+    'by' => 'deur',
+
+// Add form placeholders here
+    'placeholders' => [
+        'notes'  => 'Add a note',
+    ],
+
+    'breadcrumb_button_actions' => [
+        'edit_item' => 'Edit :name',
+        'checkout_item' => 'Checkout :name',
+        'checkin_item' => 'Checkin :name',
+    ],
+
+    'skins' => [
+        'site_default' => 'Site Default',
+        'default_blue' => 'Default Blue',
+        'blue_dark' => 'Blue (Dark Mode)',
+        'green' => 'Green Dark',
+        'green_dark' => 'Green (Dark Mode)',
+        'red' => 'Red Dark',
+        'red_dark' => 'Red (Dark Mode)',
+        'orange' => 'Orange Dark',
+        'orange_dark' => 'Orange (Dark Mode)',
+        'black' => 'Black',
+        'black_dark' => 'Black (Dark Mode)',
+        'purple' => 'Purple',
+        'purple_dark' => 'Purple (Dark Mode)',
+        'yellow' => 'Yellow',
+        'yellow_dark' => 'Yellow (Dark Mode)',
+        'high_contrast' => 'High Contrast',
+
+    ],
+
+    'select_all_none' => 'Select/Unselect All',
+    'generic_model_not_found' => 'That :model was not found or you do not have permission to access it',
+    'deleted_models' => 'Deleted Asset Models',
+    'deleted_users' => 'Deleted Users',
+    'cost_each' => ':amount each',
+    'remove_current_image' => 'Remove current :type image',
+
+    'seeding' => [
+        'manufacturers' => [
+            'button' => 'Create Manufacturers',
+            'prompt' => 'You do not have any manufacturers yet. Would you like to seed a list of common manufacturers? (THIS WILL OVERWRITE EXISTING MANUFACTURERS, including those that have been soft-deleted.)',
+            'success' => 'Manufacturers seeded successfully',
+            'error' => 'Could not seed manufacturers. A manufacturer record already exists and seeding would overwrite it.|Could not seed manufacturers. :count manufacturer records already exist and seeding would overwrite them.',
+        ],
+    ],
 
 ];
diff --git a/resources/lang/af-ZA/localizations.php b/resources/lang/af-ZA/localizations.php
index f1232dd138..827ed4fca1 100644
--- a/resources/lang/af-ZA/localizations.php
+++ b/resources/lang/af-ZA/localizations.php
@@ -2,7 +2,7 @@
 
 return [
 
-    'select_language' => 'Select a language',
+    'select_language' => 'Select a Language',
     'languages' => [
         'en-US'=> 'English, US',
         'en-GB'=> 'English, UK',
@@ -40,7 +40,9 @@ return [
         'ms-MY'=> 'Malay',
         'mi-NZ'=> 'Maori',
         'mn-MN'=> 'Mongolian',
-        'no-NO'=> 'Norwegian',
+        'nb-NO'=> 'Norwegian Bokmål',
+        'om-ET' => 'Oromo (Ethiopian)',
+        //'nn-NO'=> 'Norwegian Nynorsk',
         'fa-IR'=> 'Persian',
         'pl-PL'=> 'Polish',
         'pt-PT'=> 'Portuguese',
@@ -66,7 +68,7 @@ return [
         'zu-ZA'=> 'Zulu',
     ],
 
-    'select_country' => 'Select a country',
+    'select_country' => 'Select a Country',
     
     'countries' => [
         'AC'=>'Ascension Island',
@@ -133,6 +135,7 @@ return [
         'EC'=>'Ecuador',
         'EE'=>'Estonia',
         'EG'=>'Egypt',
+        'GB-ENG'=>'England',
         'ER'=>'Eritrea',
         'ES'=>'Spain',
         'ET'=>'Ethiopia',
@@ -231,6 +234,7 @@ return [
         'NG'=>'Nigeria',
         'NI'=>'Nicaragua',
         'NL'=>'Netherlands',
+        'GB-NIR' => 'Northern Ireland',
         'NO'=>'Norway',
         'NP'=>'Nepal',
         'NR'=>'Nauru',
@@ -258,7 +262,7 @@ return [
         'RU'=>'Russian Federation',
         'RW'=>'Rwanda',
         'SA'=>'Saudi Arabia',
-        'UK'=>'Scotland',
+        'GB-SCT'=>'Scotland',
         'SB'=>'Solomon Islands',
         'SC'=>'Seychelles',
         'SS'=>'South Sudan',
@@ -310,6 +314,7 @@ return [
         'VI'=>'Virgin Islands (U.S.)',
         'VN'=>'Viet Nam',
         'VU'=>'Vanuatu',
+        'GB-WLS' =>'Wales',
         'WF'=>'Wallis And Futuna Islands',
         'WS'=>'Samoa',
         'YE'=>'Yemen',
diff --git a/resources/lang/af-ZA/mail.php b/resources/lang/af-ZA/mail.php
index c90f6c8dba..e54d592327 100644
--- a/resources/lang/af-ZA/mail.php
+++ b/resources/lang/af-ZA/mail.php
@@ -23,24 +23,25 @@ return [
     'Item_Requested' => 'Item gevra',
     'License_Checkin_Notification' => 'License checked in',
     'License_Checkout_Notification' => 'License checked out',
+    'license_for'   => 'License for',
     'Low_Inventory_Report' => 'Lae voorraadverslag',
     'a_user_canceled' => '\'N Gebruiker het \'n itemversoek op die webwerf gekanselleer',
     'a_user_requested' => '\'N Gebruiker het \'n item op die webwerf versoek',
     'acceptance_asset_accepted' => 'A user has accepted an item',
     'acceptance_asset_declined' => 'A user has declined an item',
-    'accessory_name' => 'Toebehore Naam:',
-    'additional_notes' => 'Bykomende aantekeninge:',
+    'accessory_name' => 'Toebehore Naam',
+    'additional_notes' => 'Bykomende aantekeninge',
     'admin_has_created' => '\'N Administrateur het \'n rekening vir jou op die webtuiste gemaak.',
-    'asset' => 'bate:',
-    'asset_name' => 'Bate Naam:',
+    'asset' => 'bate',
+    'asset_name' => 'Bate Naam',
     'asset_requested' => 'Bate aangevra',
     'asset_tag' => 'Bate-tag',
     'assets_warrantee_alert' => 'There is :count asset with a warranty expiring in the next :threshold days.|There are :count assets with warranties expiring in the next :threshold days.',
     'assigned_to' => 'Toevertrou aan',
     'best_regards' => 'Beste wense,',
-    'canceled' => 'gekanselleer:',
-    'checkin_date' => 'Incheckdatum:',
-    'checkout_date' => 'Checkout Datum:',
+    'canceled' => 'Gekanselleer',
+    'checkin_date' => 'Incheckdatum',
+    'checkout_date' => 'Checkout Datum',
     'checkedout_from' => 'Checked out from',
     'checkedin_from'  => 'Checked in from',
     'checked_into' => 'Checked into',
@@ -49,27 +50,30 @@ return [
     'click_to_confirm' => 'Klik asseblief op die volgende skakel om u webadres te bevestig:',
     'current_QTY' => 'Huidige QTY',
     'days' => 'dae',
-    'expecting_checkin_date' => 'Verwagte inskrywingsdatum:',
+    'expecting_checkin_date' => 'Verwagte tjekdatum',
     'expires' => 'verstryk',
     'hello' => 'hallo',
     'hi' => 'Hi',
     'i_have_read' => 'Ek het die gebruiksvoorwaardes gelees en ingestem en het hierdie item ontvang.',
     'inventory_report' => 'Inventory Report',
-    'item' => 'item:',
+    'item' => 'item',
+    'item_checked_reminder' => 'This is a reminder that you currently have :count items checked out to you that you have not accepted or declined. Please click the link below to confirm your decision.',
     'license_expiring_alert' => 'There is :count license expiring in the next :threshold days.|There are :count licenses expiring in the next :threshold days.',
     'link_to_update_password' => 'Klik asseblief op die volgende skakel om u webtuiste te verander:',
-    'login' => 'Teken aan:',
+    'login' => 'Teken aan',
     'login_first_admin' => 'Teken in op jou nuwe Snipe-IT-installasie deur die volgende inligting te gebruik:',
     'low_inventory_alert' => 'There is :count item that is below minimum inventory or will soon be low.|There are :count items that are below minimum inventory or will soon be low.',
     'min_QTY' => 'Min QTY',
     'name' => 'naam',
     'new_item_checked' => '\'N Nuwe item is onder u naam nagegaan, besonderhede is hieronder.',
+    'new_item_checked_with_acceptance' => 'A new item has been checked out under your name that requires acceptance, details are below.',
+    'recent_item_checked' => 'An item was recently checked out under your name that requires acceptance, details are below.',
     'notes' => 'notas',
-    'password' => 'wagwoord:',
+    'password' => 'wagwoord',
     'password_reset' => 'Wagwoord Herstel',
     'read_the_terms' => 'Lees asseblief die gebruiksvoorwaardes hieronder.',
     'read_the_terms_and_click' => 'Please read the terms of use below, and click on the link at the bottom to confirm that you read and agree to the terms of use, and have received the asset.',
-    'requested' => 'versoek:',
+    'requested' => 'versoek',
     'reset_link' => 'Jou wagwoord herstel skakel',
     'reset_password' => 'Klik hier om jou wagwoord terug te stel:',
     'rights_reserved' => 'All rights reserved.',
@@ -86,8 +90,10 @@ return [
     'upcoming-audits' => 'There is :count asset that is coming up for audit within :threshold days.|There are :count assets that are coming up for audit within :threshold days.',
     'user' => 'gebruiker',
     'username' => 'Gebruikersnaam',
+    'unaccepted_asset_reminder' => 'Reminder: You have Unaccepted Assets.',
     'welcome' => 'Welkom: naam',
     'welcome_to' => 'Welkom by: web!',
     'your_assets' => 'View Your Assets',
     'your_credentials' => 'Jou Snipe-IT-referenties',
+    'mail_sent' => 'Mail sent successfully!',
 ];
diff --git a/resources/lang/af-ZA/validation.php b/resources/lang/af-ZA/validation.php
index 2a12ea3ae8..57a672e39e 100644
--- a/resources/lang/af-ZA/validation.php
+++ b/resources/lang/af-ZA/validation.php
@@ -13,87 +13,150 @@ return [
     |
     */
 
-    'accepted'             => 'Die: Attribuut moet aanvaar word.',
-    'active_url'           => 'Die: Attribuut is nie \'n geldige URL nie.',
-    'after'                => 'Die: Attribuut moet \'n datum wees na: datum.',
-    'after_or_equal'       => 'Die: Attribuut moet \'n datum na of gelyk wees aan: datum.',
-    'alpha'                => 'Die: Attribuut mag slegs letters bevat.',
-    'alpha_dash'           => 'Die: Attribuut mag slegs letters, nommers en streepies bevat.',
-    'alpha_num'            => 'Die: Attribuut mag slegs letters en syfers bevat.',
-    'array'                => 'Die: kenmerk moet \'n skikking wees.',
-    'before'               => 'Die: Attribuut moet \'n datum wees voor: datum.',
-    'before_or_equal'      => 'Die: Attribuut moet \'n datum voor of gelyk wees aan: datum.',
-    'between'              => [
-        'numeric' => 'Die: Attribuut moet tussen: min en: maksimum wees.',
-        'file'    => 'Die: Attribuut moet tussen: min en: maksimum kilobytes wees.',
-        'string'  => 'Die: Attribuut moet tussen: min en: maksimum karakters wees.',
-        'array'   => 'Die: Attribuut moet tussen: min en: maksimum items hê.',
+    'accepted' => 'The :attribute field must be accepted.',
+    'accepted_if' => 'The :attribute field must be accepted when :other is :value.',
+    'active_url' => 'The :attribute field must be a valid URL.',
+    'after' => 'The :attribute field must be a date after :date.',
+    'after_or_equal' => 'The :attribute field must be a date after or equal to :date.',
+    'alpha' => 'The :attribute field must only contain letters.',
+    'alpha_dash' => 'The :attribute field must only contain letters, numbers, dashes, and underscores.',
+    'alpha_num' => 'The :attribute field must only contain letters and numbers.',
+    'array' => 'The :attribute field must be an array.',
+    'ascii' => 'The :attribute field must only contain single-byte alphanumeric characters and symbols.',
+    'before' => 'The :attribute field must be a date before :date.',
+    'before_or_equal' => 'The :attribute field must be a date before or equal to :date.',
+    'between' => [
+        'array' => 'The :attribute field must have between :min and :max items.',
+        'file' => 'The :attribute field must be between :min and :max kilobytes.',
+        'numeric' => 'The :attribute field must be between :min and :max.',
+        'string' => 'The :attribute field must be between :min and :max characters.',
     ],
-    'boolean'              => 'Die: Attribuut veld moet waar of onwaar wees.',
-    'confirmed'            => 'Die: Attribuut bevestiging stem nie ooreen nie.',
-    'date'                 => 'Die: Attribuut is nie \'n geldige datum nie.',
-    'date_format'          => 'Die: Attribuut stem nie ooreen met die formaat: formaat.',
-    'different'            => 'Die: attribuut en: ander moet anders wees.',
-    'digits'               => 'Die: Attribuut moet wees: syfers syfers.',
-    'digits_between'       => 'Die: Attribuut moet tussen: min en: maksimum syfers wees.',
-    'dimensions'           => 'Die: Attribuut het ongeldige beeldafmetings.',
-    'distinct'             => 'Die: Attribuut veld het \'n duplikaat waarde.',
-    'email'                => 'Die: Attribuut moet \'n geldige e-posadres wees.',
-    'exists'               => 'Die gekose: attribuut is ongeldig.',
-    'file'                 => 'Die: Attribuut moet \'n lêer wees.',
-    'filled'               => 'Die: Attribuut veld moet \'n waarde hê.',
-    'image'                => 'Die: kenmerk moet \'n beeld wees.',
+    'boolean' => 'Die: Attribuut veld moet waar of onwaar wees.',
+    'can' => 'The :attribute field contains an unauthorized value.',
+    'confirmed' => 'The :attribute field confirmation does not match.',
+    'contains' => 'The :attribute field is missing a required value.',
+    'current_password' => 'The password is incorrect.',
+    'date' => 'The :attribute field must be a valid date.',
+    'date_equals' => 'The :attribute field must be a date equal to :date.',
+    'date_format' => 'The :attribute field must match the format :format.',
+    'decimal' => 'The :attribute field must have :decimal decimal places.',
+    'declined' => 'The :attribute field must be declined.',
+    'declined_if' => 'The :attribute field must be declined when :other is :value.',
+    'different' => 'The :attribute field and :other must be different.',
+    'digits' => 'The :attribute field must be :digits digits.',
+    'digits_between' => 'The :attribute field must be between :min and :max digits.',
+    'dimensions' => 'The :attribute field has invalid image dimensions.',
+    'distinct' => 'Die: Attribuut veld het \'n duplikaat waarde.',
+    'doesnt_end_with' => 'The :attribute field must not end with one of the following: :values.',
+    'doesnt_start_with' => 'The :attribute field must not start with one of the following: :values.',
+    'email' => 'The :attribute field must be a valid email address.',
+    'ends_with' => 'The :attribute field must end with one of the following: :values.',
+    'enum' => 'Die gekose: attribuut is ongeldig.',
+    'exists' => 'Die gekose: attribuut is ongeldig.',
+    'extensions' => 'The :attribute field must have one of the following extensions: :values.',
+    'file' => 'The :attribute field must be a file.',
+    'filled' => 'Die: Attribuut veld moet \'n waarde hê.',
+    'gt' => [
+        'array' => 'The :attribute field must have more than :value items.',
+        'file' => 'The :attribute field must be greater than :value kilobytes.',
+        'numeric' => 'The :attribute field must be greater than :value.',
+        'string' => 'The :attribute field must be greater than :value characters.',
+    ],
+    'gte' => [
+        'array' => 'The :attribute field must have :value items or more.',
+        'file' => 'The :attribute field must be greater than or equal to :value kilobytes.',
+        'numeric' => 'The :attribute field must be greater than or equal to :value.',
+        'string' => 'The :attribute field must be greater than or equal to :value characters.',
+    ],
+    'hex_color' => 'The :attribute field must be a valid hexadecimal color.',
+    'image' => 'The :attribute field must be an image.',
     'import_field_empty'    => 'The value for :fieldname cannot be null.',
-    'in'                   => 'Die gekose: attribuut is ongeldig.',
-    'in_array'             => 'Die: attribuut veld bestaan ​​nie in: ander.',
-    'integer'              => 'Die: Attribuut moet \'n heelgetal wees.',
-    'ip'                   => 'Die: Attribuut moet \'n geldige IP-adres wees.',
-    'ipv4'                 => 'Die: Attribuut moet \'n geldige IPv4-adres wees.',
-    'ipv6'                 => 'Die: Attribuut moet \'n geldige IPv6-adres wees.',
-    'is_unique_department' => 'The :attribute must be unique to this Company Location',
-    'json'                 => 'Die: Attribuut moet \'n geldige JSON-string wees.',
-    'max'                  => [
-        'numeric' => 'Die: Attribuut mag nie groter wees as: maksimum.',
-        'file'    => 'Die: kenmerk mag nie groter wees as: maksimum kilobytes.',
-        'string'  => 'Die: Attribuut mag nie groter wees as: maksimum karakters.',
-        'array'   => 'Die: Attribuut mag nie meer as: maksimum items hê nie.',
+    'in' => 'Die gekose: attribuut is ongeldig.',
+    'in_array' => 'The :attribute field must exist in :other.',
+    'integer' => 'The :attribute field must be an integer.',
+    'ip' => 'The :attribute field must be a valid IP address.',
+    'ipv4' => 'The :attribute field must be a valid IPv4 address.',
+    'ipv6' => 'The :attribute field must be a valid IPv6 address.',
+    'json' => 'The :attribute field must be a valid JSON string.',
+    'list' => 'The :attribute field must be a list.',
+    'lowercase' => 'The :attribute field must be lowercase.',
+    'lt' => [
+        'array' => 'The :attribute field must have less than :value items.',
+        'file' => 'The :attribute field must be less than :value kilobytes.',
+        'numeric' => 'The :attribute field must be less than :value.',
+        'string' => 'The :attribute field must be less than :value characters.',
     ],
-    'mimes'                => 'Die: kenmerk moet \'n lêer van tipe wees:: waardes.',
-    'mimetypes'            => 'Die: kenmerk moet \'n lêer van tipe wees:: waardes.',
-    'min'                  => [
-        'numeric' => 'Die: attribuut moet ten minste wees: min.',
-        'file'    => 'Die: attribuut moet ten minste wees: min kilobytes.',
-        'string'  => 'Die: kenmerk moet ten minste wees: min karakters.',
-        'array'   => 'Die: Attribuut moet ten minste: min items hê.',
+    'lte' => [
+        'array' => 'The :attribute field must not have more than :value items.',
+        'file' => 'The :attribute field must be less than or equal to :value kilobytes.',
+        'numeric' => 'The :attribute field must be less than or equal to :value.',
+        'string' => 'The :attribute field must be less than or equal to :value characters.',
     ],
-    'starts_with'          => 'The :attribute must start with one of the following: :values.',
-    'ends_with'            => 'The :attribute must end with one of the following: :values.',
+    'mac_address' => 'The :attribute field must be a valid MAC address.',
+    'max' => [
+        'array' => 'The :attribute field must not have more than :max items.',
+        'file' => 'The :attribute field must not be greater than :max kilobytes.',
+        'numeric' => 'The :attribute field must not be greater than :max.',
+        'string' => 'The :attribute field must not be greater than :max characters.',
+    ],
+    'max_digits' => 'The :attribute field must not have more than :max digits.',
+    'mimes' => 'The :attribute field must be a file of type: :values.',
+    'mimetypes' => 'The :attribute field must be a file of type: :values.',
+    'min' => [
+        'array' => 'The :attribute field must have at least :min items.',
+        'file' => 'The :attribute field must be at least :min kilobytes.',
+        'numeric' => 'The :attribute field must be at least :min.',
+        'string' => 'The :attribute field must be at least :min characters.',
+    ],
+    'min_digits' => 'The :attribute field must have at least :min digits.',
+    'missing' => 'The :attribute field must be missing.',
+    'missing_if' => 'The :attribute field must be missing when :other is :value.',
+    'missing_unless' => 'The :attribute field must be missing unless :other is :value.',
+    'missing_with' => 'The :attribute field must be missing when :values is present.',
+    'missing_with_all' => 'The :attribute field must be missing when :values are present.',
+    'multiple_of' => 'The :attribute field must be a multiple of :value.',
+    'not_in' => 'Die gekose: attribuut is ongeldig.',
+    'not_regex' => 'The :attribute field format is invalid.',
+    'numeric' => 'The :attribute field must be a number.',
+    'password' => [
+        'letters' => 'The :attribute field must contain at least one letter.',
+        'mixed' => 'The :attribute field must contain at least one uppercase and one lowercase letter.',
+        'numbers' => 'The :attribute field must contain at least one number.',
+        'symbols' => 'The :attribute field must contain at least one symbol.',
+        'uncompromised' => 'The given :attribute has appeared in a data leak. Please choose a different :attribute.',
+    ],
+    'percent'       => 'The depreciation minimum must be between 0 and 100 when depreciation type is percentage.',
 
-    'not_in'               => 'Die gekose: attribuut is ongeldig.',
-    'numeric'              => 'Die: Attribuut moet \'n nommer wees.',
-    'present'              => 'Die: attribuut veld moet teenwoordig wees.',
-    'valid_regex'          => 'That is not a valid regex. ',
-    'regex'                => 'Die: Attribuutformaat is ongeldig.',
-    'required'             => 'Die: attribuut veld is nodig.',
-    'required_if'          => 'Die: attribuut veld is nodig wanneer: ander is: waarde.',
-    'required_unless'      => 'Die: Attribuut veld is nodig tensy: ander is in: waardes.',
-    'required_with'        => 'Die: Attribuut veld is nodig wanneer: waardes teenwoordig is.',
-    'required_with_all'    => 'Die: Attribuut veld is nodig wanneer: waardes teenwoordig is.',
-    'required_without'     => 'Die: Attribuut veld is nodig wanneer: waardes nie teenwoordig is nie.',
+    'present' => 'Die: attribuut veld moet teenwoordig wees.',
+    'present_if' => 'The :attribute field must be present when :other is :value.',
+    'present_unless' => 'The :attribute field must be present unless :other is :value.',
+    'present_with' => 'The :attribute field must be present when :values is present.',
+    'present_with_all' => 'The :attribute field must be present when :values are present.',
+    'prohibited' => 'The :attribute field is prohibited.',
+    'prohibited_if' => 'The :attribute field is prohibited when :other is :value.',
+    'prohibited_unless' => 'The :attribute field is prohibited unless :other is in :values.',
+    'prohibits' => 'The :attribute field prohibits :other from being present.',
+    'regex' => 'The :attribute field format is invalid.',
+    'required' => 'Die: attribuut veld is nodig.',
+    'required_array_keys' => 'The :attribute field must contain entries for: :values.',
+    'required_if' => 'Die: attribuut veld is nodig wanneer: ander is: waarde.',
+    'required_if_accepted' => 'The :attribute field is required when :other is accepted.',
+    'required_if_declined' => 'The :attribute field is required when :other is declined.',
+    'required_unless' => 'Die: Attribuut veld is nodig tensy: ander is in: waardes.',
+    'required_with' => 'Die: Attribuut veld is nodig wanneer: waardes teenwoordig is.',
+    'required_with_all' => 'The :attribute field is required when :values are present.',
+    'required_without' => 'Die: Attribuut veld is nodig wanneer: waardes nie teenwoordig is nie.',
     'required_without_all' => 'Die: Attribuut veld is nodig wanneer geen van: waardes teenwoordig is nie.',
-    'same'                 => 'Die: attribuut en ander moet ooreenstem.',
-    'size'                 => [
-        'numeric' => 'Die: Attribuut moet wees: grootte.',
-        'file'    => 'Die: Attribuut moet wees: grootte kilobyte.',
-        'string'  => 'Die: Attribuut moet wees: grootte karakters.',
-        'array'   => 'Die: Attribuut moet bevat: grootte items.',
+    'same' => 'The :attribute field must match :other.',
+    'size' => [
+        'array' => 'The :attribute field must contain :size items.',
+        'file' => 'The :attribute field must be :size kilobytes.',
+        'numeric' => 'The :attribute field must be :size.',
+        'string' => 'The :attribute field must be :size characters.',
     ],
+    'starts_with' => 'The :attribute field must start with one of the following: :values.',
     'string'               => 'Die: kenmerk moet \'n string wees.',
-    'timezone'             => 'Die: Attribuut moet \'n geldige sone wees.',
     'two_column_unique_undeleted' => 'The :attribute must be unique across :table1 and :table2. ',
-    'unique'               => 'Die: Attribuut is reeds geneem.',
-    'uploaded'             => 'Die: kenmerk kon nie opgelaai word nie.',
-    'url'                  => 'Die: Attribuutformaat is ongeldig.',
     'unique_undeleted'     => 'Die: Attribuut moet uniek wees.',
     'non_circular'         => 'The :attribute must not create a circular reference.',
     'not_array'            => ':attribute cannot be an array.',
@@ -102,11 +165,14 @@ return [
     'numbers'              => 'Password must contain at least one number.',
     'case_diff'            => 'Password must use mixed case.',
     'symbols'              => 'Password must contain symbols.',
-    'gte'                  => [
-        'numeric'          => 'Value cannot be negative'
-    ],
-    'checkboxes'           => ':attribute contains invalid options.',
-    'radio_buttons'        => ':attribute is invalid.',
+    'timezone' => 'The :attribute field must be a valid timezone.',
+    'unique' => 'Die: Attribuut is reeds geneem.',
+    'uploaded' => 'Die: kenmerk kon nie opgelaai word nie.',
+    'uppercase' => 'The :attribute field must be uppercase.',
+    'url' => 'The :attribute field must be a valid URL.',
+    'ulid' => 'The :attribute field must be a valid ULID.',
+    'uuid' => 'The :attribute field must be a valid UUID.',
+    'fmcs_location' => 'Full multiple company support and location scoping is enabled in the Admin Settings, and the selected location and selected company are not compatible.',
 
 
     /*
@@ -120,16 +186,22 @@ return [
     |
     */
 
+    'email_array'      => 'Een of meer e-posadresse is ongeldig.',
+    'checkboxes'           => ':attribute contains invalid options.',
+    'radio_buttons'        => ':attribute is invalid.',
+    
     'custom' => [
         'alpha_space' => 'Die: attribuut veld bevat \'n karakter wat nie toegelaat word nie.',
-        'email_array'      => 'Een of meer e-posadresse is ongeldig.',
+
         'hashed_pass'      => 'Jou huidige wagwoord is verkeerd',
         'dumbpwd'          => 'Daardie wagwoord is te algemeen.',
         'statuslabel_type' => 'U moet \'n geldige statusetiket tipe kies',
+        'custom_field_not_found'          => 'This field does not seem to exist, please double check your custom field names.',
+        'custom_field_not_found_on_model' => 'This field seems to exist, but is not available on this Asset Model\'s fieldset.',
 
         // date_format validation with slightly less stupid messages. It duplicates a lot, but it gets the job done :(
-        // We use this because the default error message for date_format is reflects php Y-m-d, which non-PHP
-        // people won't know how to format. 
+        // We use this because the default error message for date_format reflects php Y-m-d, which non-PHP
+        // people won't know how to format.
         'purchase_date.date_format'     => 'The :attribute must be a valid date in YYYY-MM-DD format',
         'last_audit_date.date_format'   =>  'The :attribute must be a valid date in YYYY-MM-DD hh:mm:ss format',
         'expiration_date.date_format'   =>  'The :attribute must be a valid date in YYYY-MM-DD format',
@@ -137,9 +209,15 @@ return [
         'expected_checkin.date_format'  =>  'The :attribute must be a valid date in YYYY-MM-DD format',
         'start_date.date_format'        =>  'The :attribute must be a valid date in YYYY-MM-DD format',
         'end_date.date_format'          =>  'The :attribute must be a valid date in YYYY-MM-DD format',
+        'invalid_value_in_field' => 'Invalid value included in this field',
 
-    ],
+        'ldap_username_field' => [
+            'not_in' =>         '<code>sAMAccountName</code> (mixed case) will likely not work. You should use <code>samaccountname</code> (lowercase) instead.'
+        ],
+        'ldap_auth_filter_query' => ['not_in' => '<code>uid=samaccountname</code> is probably not a valid auth filter. You probably want <code>uid=</code> '],
+        'ldap_filter' => ['regex' => 'This value should probably not be wrapped in parentheses.'],
 
+        ],
     /*
     |--------------------------------------------------------------------------
     | Custom Validation Attributes
@@ -155,8 +233,16 @@ return [
 
     /*
     |--------------------------------------------------------------------------
-    | Generic Validation Messages
+    | Generic Validation Messages - we use these in the jquery validation where we don't have
+    | access to the :attribute
     |--------------------------------------------------------------------------
     */
-    'invalid_value_in_field' => 'Invalid value included in this field',
+
+    'generic' => [
+        'invalid_value_in_field' => 'Invalid value included in this field',
+        'required' => 'This field is required',
+        'email' => 'Please enter a valid email address',
+    ],
+
+
 ];
diff --git a/resources/lang/am-ET/account/general.php b/resources/lang/am-ET/account/general.php
index 1a9e2c03b8..7f9e2f848e 100644
--- a/resources/lang/am-ET/account/general.php
+++ b/resources/lang/am-ET/account/general.php
@@ -2,10 +2,16 @@
 
 return array(
     'personal_api_keys' => 'Personal API Keys',
+    'personal_access_token' => 'Personal Access Token',
+    'personal_api_keys_success' => 'Personal API Key :key created sucessfully',
+    'here_is_api_key' => 'Here is your new personal access token. This is the only time it will be shown so do not lose it! You may now use this token to make API requests.',
     'api_key_warning' => 'When generating an API token, be sure to copy it down immediately as they will not be visible to you again.',
     'api_base_url' => 'Your API base url is located at:',
     'api_base_url_endpoint' => '/&lt;endpoint&gt;',
     'api_token_expiration_time' => 'API tokens are set to expire in:',
     'api_reference' => 'Please check the <a href="https://snipe-it.readme.io/reference" target="_blank">API reference</a> to find specific API endpoints and additional API documentation.',
     'profile_updated' => 'Account successfully updated',
+    'no_tokens' => 'You have not created any personal access tokens.',
+    'enable_sounds' => 'Enable sound effects',
+    'enable_confetti' => 'Enable confetti effects',
 );
diff --git a/resources/lang/am-ET/admin/accessories/message.php b/resources/lang/am-ET/admin/accessories/message.php
index c688d5e03d..f60d41957b 100644
--- a/resources/lang/am-ET/admin/accessories/message.php
+++ b/resources/lang/am-ET/admin/accessories/message.php
@@ -26,7 +26,11 @@ return array(
         'error'   		=> 'Accessory was not checked out, please try again',
         'success' 		=> 'Accessory checked out successfully.',
         'unavailable'   => 'Accessory is not available for checkout. Check quantity available',
-        'user_does_not_exist' => 'That user is invalid. Please try again.'
+        'user_does_not_exist' => 'That user is invalid. Please try again.',
+         'checkout_qty' => array(
+            'lte'  => 'There is currently only one available accessory of this type, and you are trying to check out :checkout_qty. Please adjust the checkout quantity or the total stock of this accessory and try again.|There are :number_currently_remaining total available accessories, and you are trying to check out :checkout_qty. Please adjust the checkout quantity or the total stock of this accessory and try again.',
+            ),
+           
     ),
 
     'checkin' => array(
diff --git a/resources/lang/am-ET/admin/accessories/table.php b/resources/lang/am-ET/admin/accessories/table.php
index e02d9f22e4..aaa5e68a3d 100644
--- a/resources/lang/am-ET/admin/accessories/table.php
+++ b/resources/lang/am-ET/admin/accessories/table.php
@@ -3,9 +3,7 @@
 return array(
 	'dl_csv'      				=> 'Download CSV',
 	'eula_text'      			=> 'EULA',
-    'id'      					=> 'ID',
+    'id'      					=> 'መለያ',
     'require_acceptance'      	=> 'Acceptance',
     'title'      				=> 'Accessory Name',
-
-
 );
diff --git a/resources/lang/am-ET/admin/asset_maintenances/form.php b/resources/lang/am-ET/admin/asset_maintenances/form.php
index 785d06b08f..4fb998bc89 100644
--- a/resources/lang/am-ET/admin/asset_maintenances/form.php
+++ b/resources/lang/am-ET/admin/asset_maintenances/form.php
@@ -1,8 +1,8 @@
 <?php
 
     return [
-        'asset_maintenance_type' => 'Asset Maintenance Type',
-        'title'                  => 'Title',
+        'asset_maintenance_type' => 'የንብረት ጥገና አይነት',
+        'title'                  => 'መጠርያ',
         'start_date'             => 'Start Date',
         'completion_date'        => 'Completion Date',
         'cost'                   => 'Cost',
diff --git a/resources/lang/am-ET/admin/categories/message.php b/resources/lang/am-ET/admin/categories/message.php
index 4e493f68b6..52f62c024c 100644
--- a/resources/lang/am-ET/admin/categories/message.php
+++ b/resources/lang/am-ET/admin/categories/message.php
@@ -2,7 +2,7 @@
 
 return array(
 
-    'does_not_exist' => 'Category does not exist.',
+    'does_not_exist' => 'መደቡ የለም አልተገኘም.',
     'assoc_models'	 => 'This category is currently associated with at least one model and cannot be deleted. Please update your models to no longer reference this category and try again. ',
     'assoc_items'	 => 'This category is currently associated with at least one :asset_type and cannot be deleted. Please update your :asset_type  to no longer reference this category and try again. ',
 
diff --git a/resources/lang/am-ET/admin/categories/table.php b/resources/lang/am-ET/admin/categories/table.php
index a3ee96ae7f..d2256a31e3 100644
--- a/resources/lang/am-ET/admin/categories/table.php
+++ b/resources/lang/am-ET/admin/categories/table.php
@@ -1,10 +1,10 @@
 <?php
 
 return array(
-	'eula_text'      			=> 'EULA',
-    'id'      					=> 'ID',
-    'parent'   					=> 'Parent',
-    'require_acceptance'      	=> 'Acceptance',
-    'title'      				=> 'Asset Category Name',
+	'eula_text'      			=> 'የመጨረሻ ተጠቃሚ የፍቃድ ስምምነት',
+    'id'      					=> 'መለያ',
+    'parent'   					=> 'ዋና መደብ',
+    'require_acceptance'      	=> 'ተቀባይነት',
+    'title'      				=> 'የንብረት መደብ ስም',
 
 );
diff --git a/resources/lang/am-ET/admin/companies/table.php b/resources/lang/am-ET/admin/companies/table.php
index 100b258240..929344c6f0 100644
--- a/resources/lang/am-ET/admin/companies/table.php
+++ b/resources/lang/am-ET/admin/companies/table.php
@@ -7,5 +7,5 @@ return array(
     'phone'     => 'Company Phone',
     'update'    => 'Update Company',
     'name'      => 'Company Name',
-    'id'        => 'ID',
+    'id'        => 'መለያ',
 );
diff --git a/resources/lang/am-ET/admin/components/message.php b/resources/lang/am-ET/admin/components/message.php
index 0a7dd8d954..ec39dc4178 100644
--- a/resources/lang/am-ET/admin/components/message.php
+++ b/resources/lang/am-ET/admin/components/message.php
@@ -17,7 +17,8 @@ return array(
     'delete' => array(
         'confirm'   => 'Are you sure you wish to delete this component?',
         'error'   => 'There was an issue deleting the component. Please try again.',
-        'success' => 'The component was deleted successfully.'
+        'success' => 'The component was deleted successfully.',
+        'error_qty'   => 'Some components of this type are still checked out. Please check them in and try again.',
     ),
 
      'checkout' => array(
diff --git a/resources/lang/am-ET/admin/consumables/general.php b/resources/lang/am-ET/admin/consumables/general.php
index 7c6bb32968..29acfedc1b 100644
--- a/resources/lang/am-ET/admin/consumables/general.php
+++ b/resources/lang/am-ET/admin/consumables/general.php
@@ -8,4 +8,5 @@ return array(
     'remaining' 			            => 'Remaining',
     'total' 			                => 'Total',
     'update'                            => 'Update Consumable',
+    'inventory_warning'                 => 'The inventory of this consumable is below the minimum amount of :min_count',
 );
diff --git a/resources/lang/am-ET/admin/consumables/message.php b/resources/lang/am-ET/admin/consumables/message.php
index c0d0aa7f68..e2591503bf 100644
--- a/resources/lang/am-ET/admin/consumables/message.php
+++ b/resources/lang/am-ET/admin/consumables/message.php
@@ -2,6 +2,7 @@
 
 return array(
 
+    'invalid_category_type' => 'The category must be a consumable category.',
     'does_not_exist' => 'Consumable does not exist.',
 
     'create' => array(
diff --git a/resources/lang/am-ET/admin/custom_fields/general.php b/resources/lang/am-ET/admin/custom_fields/general.php
index e3c21d1f0c..c9ae61c963 100644
--- a/resources/lang/am-ET/admin/custom_fields/general.php
+++ b/resources/lang/am-ET/admin/custom_fields/general.php
@@ -35,7 +35,7 @@ return [
     'create_field_title' => 'Create a new custom field',
     'value_encrypted'      	        => 'The value of this field is encrypted in the database. Only admin users will be able to view the decrypted value',
     'show_in_email'     => 'Include the value of this field in checkout emails sent to the user? Encrypted fields cannot be included in emails',
-    'show_in_email_short'     => 'Include in emails.',
+    'show_in_email_short' => 'Include in emails',
     'help_text' => 'Help Text',
     'help_text_description' => 'This is optional text that will appear below the form elements while editing an asset to provide context on the field.',
     'about_custom_fields_title' => 'About Custom Fields',
@@ -57,5 +57,8 @@ return [
     'show_in_requestable_list_short' => 'Show in requestable assets list',
     'show_in_requestable_list' => 'Show value in requestable assets list. Encrypted fields will not be shown',
     'encrypted_options' => 'This field is encrypted, so some display options will not be available.',
+    'display_checkin' => 'Display in checkin forms',
+    'display_checkout' => 'Display in checkout forms',
+    'display_audit' => 'Display in audit forms',
 
 ];
diff --git a/resources/lang/am-ET/admin/custom_fields/message.php b/resources/lang/am-ET/admin/custom_fields/message.php
index 43ba821821..6442359b7f 100644
--- a/resources/lang/am-ET/admin/custom_fields/message.php
+++ b/resources/lang/am-ET/admin/custom_fields/message.php
@@ -5,6 +5,7 @@ return array(
     'field' => array(
         'invalid'   => 'That field does not exist.',
         'already_added'   => 'Field already added',
+        'none_selected'   => 'No field selected',
 
         'create' => array(
             'error'   => 'Field was not created, please try again.',
diff --git a/resources/lang/am-ET/admin/departments/table.php b/resources/lang/am-ET/admin/departments/table.php
index 76494247be..0b331a5dd1 100644
--- a/resources/lang/am-ET/admin/departments/table.php
+++ b/resources/lang/am-ET/admin/departments/table.php
@@ -2,7 +2,7 @@
 
 return array(
 
-    'id'                        => 'ID',
+    'id'                        => 'መለያ',
     'name'                      => 'Department Name',
     'manager'                   => 'Manager',
     'location'                  => 'Location',
diff --git a/resources/lang/am-ET/admin/depreciations/general.php b/resources/lang/am-ET/admin/depreciations/general.php
index 1a5666f9dc..90246e9cd8 100644
--- a/resources/lang/am-ET/admin/depreciations/general.php
+++ b/resources/lang/am-ET/admin/depreciations/general.php
@@ -13,4 +13,8 @@ return [
     'no_depreciations_warning'               => '<strong>Warning: </strong>
                       You do not currently have any depreciations set up.
                       Please set up at least one depreciation to view the depreciation report.',
+    'depreciation_method'                   => 'Depreciation Report',
+    'linear_depreciation'                   => 'Linear (Default)',
+    'half_1'                                => 'Half-year convention, always applied',
+    'half_2'                                => 'Half-year convention, applied with condition',
 ];
diff --git a/resources/lang/am-ET/admin/depreciations/table.php b/resources/lang/am-ET/admin/depreciations/table.php
index 256b10b92a..e8950d4e8f 100644
--- a/resources/lang/am-ET/admin/depreciations/table.php
+++ b/resources/lang/am-ET/admin/depreciations/table.php
@@ -2,7 +2,7 @@
 
 return [
 
-    'id'      => 'ID',
+    'id'      => 'መለያ',
     'months'   => 'Months',
     'term'   => 'Term',
     'title'      => 'Name ',
diff --git a/resources/lang/am-ET/admin/hardware/form.php b/resources/lang/am-ET/admin/hardware/form.php
index 0b3d46b575..0664f15133 100644
--- a/resources/lang/am-ET/admin/hardware/form.php
+++ b/resources/lang/am-ET/admin/hardware/form.php
@@ -55,8 +55,11 @@ return [
     'asset_location_update_default' => 'Update only default location',
     'asset_location_update_actual' => 'Update only actual location',
     'asset_not_deployable' => 'That asset status is not deployable. This asset cannot be checked out.',
-    'asset_deployable' => 'That status is deployable. This asset can be checked out.',
+    'asset_not_deployable_checkin' => 'That asset status is not deployable. Using this status label will checkin the asset.',
+    'asset_deployable' => 'This asset can be checked out.',
     'processing_spinner' => 'Processing... (This might take a bit of time on large files)',
+    'processing' => 'Processing... ',
     'optional_infos'  => 'Optional Information',
-    'order_details'   => 'Order Related Information'
+    'order_details'   => 'Order Related Information',
+    'calc_eol'    => 'If nulling the EOL date, use automatic EOL calculation based on the purchase date and EOL rate.',
 ];
diff --git a/resources/lang/am-ET/admin/hardware/general.php b/resources/lang/am-ET/admin/hardware/general.php
index 88327fed9a..a6a2791c58 100644
--- a/resources/lang/am-ET/admin/hardware/general.php
+++ b/resources/lang/am-ET/admin/hardware/general.php
@@ -5,8 +5,8 @@ return [
     'about_assets_text'            => 'Assets are items tracked by serial number or asset tag.  They tend to be higher value items where identifying a specific item matters.',
     'archived'  				=> 'የተመኸደረ',
     'asset'  					=> 'ንብረት',
-    'bulk_checkout'             => 'Checkout Assets',
-    'bulk_checkin'              => 'Checkin Assets',
+    'bulk_checkout'             => 'በጅምላ ማውጣት',
+    'bulk_checkin'              => 'Bulk Checkin',
     'checkin'  					=> 'Checkin Asset',
     'checkout'  				=> 'Checkout Asset',
     'clone'  					=> 'Clone Asset',
@@ -27,8 +27,7 @@ return [
     'undeployable_tooltip'  	=> 'This asset has a status label that is undeployable and cannot be checked out at this time.',
     'view'  					=> 'View Asset',
     'csv_error' => 'You have an error in your CSV file:',
-    'import_text' => '<p>Upload a CSV that contains asset history. The assets and users MUST already exist in the system, or they will be skipped. Matching assets for history import happens against the asset tag. We will try to find a matching user based on the user\'s name you provide, and the criteria you select below. If you do not select any criteria below, it will simply try to match on the username format you configured in the <code>Admin &gt; General Settings</code>.</p><p>Fields included in the CSV must match the headers: <strong>Asset Tag, Name, Checkout Date, Checkin Date</strong>. Any additional fields will be ignored. </p><p>Checkin Date: blank or future checkin dates will checkout items to associated user.  Excluding the Checkin Date column will create a checkin date with todays date.</p>
-    ',
+    'import_text' => '<p>Upload a CSV that contains asset history. The assets and users MUST already exist in the system, or they will be skipped. Matching assets for history import happens against the asset tag. We will try to find a matching user based on the user\'s name you provide, and the criteria you select below. If you do not select any criteria below, it will simply try to match on the username format you configured in the <code>Admin &gt; General Settings</code>.</p><p>Fields included in the CSV must match the headers: <strong>Asset Tag, Name, Checkout Date, Checkin Date</strong>. Any additional fields will be ignored. </p><p>Checkin Date: blank or future checkin dates will checkout items to associated user.  Excluding the Checkin Date column will create a checkin date with todays date.</p>    ',
     'csv_import_match_f-l' => 'Try to match users by <strong>firstname.lastname</strong> (<code>jane.smith</code>) format',
     'csv_import_match_initial_last' => 'Try to match users by <strong>first initial last name</strong> (<code>jsmith</code>) format',
     'csv_import_match_first' => 'Try to match users by <strong>first name</strong> (<code>jane</code>) format',
diff --git a/resources/lang/am-ET/admin/hardware/message.php b/resources/lang/am-ET/admin/hardware/message.php
index 32698b1c07..c19bc63647 100644
--- a/resources/lang/am-ET/admin/hardware/message.php
+++ b/resources/lang/am-ET/admin/hardware/message.php
@@ -2,19 +2,23 @@
 
 return [
 
-    'undeployable' 		=> '<strong>Warning: </strong> This asset has been marked as currently undeployable.
-                        If this status has changed, please update the asset status.',
-    'does_not_exist' 	=> 'Asset does not exist.',
-    'does_not_exist_var'=> 'Asset with tag :asset_tag not found.',
-    'no_tag' 	        => 'No asset tag provided.',
+    'undeployable' 		 => '<strong>Warning: </strong> This asset has been marked as currently undeployable. If this status has changed, please update the asset status.',
+    'does_not_exist' 	 => 'Asset does not exist.',
+    'does_not_exist_var' => 'Asset with tag :asset_tag not found.',
+    'no_tag' 	         => 'No asset tag provided.',
     'does_not_exist_or_not_requestable' => 'That asset does not exist or is not requestable.',
-    'assoc_users'	 	=> 'This asset is currently checked out to a user and cannot be deleted. Please check the asset in first, and then try deleting again. ',
+    'assoc_users'	 	 => 'This asset is currently checked out to a user and cannot be deleted. Please check the asset in first, and then try deleting again. ',
     'warning_audit_date_mismatch' 	=> 'This asset\'s next audit date (:next_audit_date) is before the last audit date (:last_audit_date). Please update the next audit date.',
+    'labels_generated'   => 'Labels were successfully generated.',
+    'error_generating_labels' => 'Error while generating labels.',
+    'no_assets_selected' => 'No assets selected.',
 
     'create' => [
         'error'   		=> 'Asset was not created, please try again. :(',
         'success' 		=> 'Asset created successfully. :)',
         'success_linked' => 'Asset with tag :tag was created successfully. <strong><a href=":link" style="color: white;">Click here to view</a></strong>.',
+        'multi_success_linked' => 'Asset with tag :links was created successfully.|:count assets were created succesfully. :links.',
+        'partial_failure' => 'An asset was unable to be created. Reason: :failures|:count assets were unable to be created. Reasons: :failures',
     ],
 
     'update' => [
@@ -52,20 +56,24 @@ return [
     ],
 
     'import' => [
+        'import_button'         => 'Process Import',
         'error'                 => 'Some items did not import correctly.',
         'errorDetail'           => 'The following Items were not imported because of errors.',
         'success'               => 'Your file has been imported',
         'file_delete_success'   => 'Your file has been been successfully deleted',
         'file_delete_error'      => 'The file was unable to be deleted',
         'file_missing' => 'The file selected is missing',
+        'file_already_deleted' => 'The file selected was already deleted',
         'header_row_has_malformed_characters' => 'One or more attributes in the header row contain malformed UTF-8 characters',
         'content_row_has_malformed_characters' => 'One or more attributes in the first row of content contain malformed UTF-8 characters',
+        'transliterate_failure' => 'Transliteration from :encoding to UTF-8 failed due to invalid characters in input'
     ],
 
 
     'delete' => [
         'confirm'   	=> 'Are you sure you wish to delete this asset?',
         'error'   		=> 'There was an issue deleting the asset. Please try again.',
+        'assigned_to_error' => '{1}Asset Tag: :asset_tag is currently checked out. Check in this device before deletion.|[2,*]Asset Tags: :asset_tag are currently checked out. Check in these devices before deletion.',
         'nothing_updated'   => 'No assets were selected, so nothing was deleted.',
         'success' 		=> 'The asset was deleted successfully.',
     ],
@@ -78,6 +86,11 @@ return [
         'no_assets_selected' => 'You must select at least one asset from the list',
     ],
 
+    'multi-checkout' => [
+        'error'   => 'Asset was not checked out, please try again|Assets were not checked out, please try again',
+        'success' => 'Asset checked out successfully.|Assets checked out successfully.',
+    ],
+
     'checkin' => [
         'error'   		=> 'Asset was not checked in, please try again',
         'success' 		=> 'Asset checked in successfully.',
@@ -87,9 +100,10 @@ return [
     ],
 
     'requests' => [
-        'error'   		=> 'Asset was not requested, please try again',
-        'success' 		=> 'Asset requested successfully.',
-        'canceled'      => 'Checkout request successfully canceled',
+        'error'   		=> 'Request was not successful, please try again.',
+        'success' 		=> 'Request successfully submitted.',
+        'canceled'      => 'Request successfully canceled.',
+        'cancel'        => 'Cancel this item request',
     ],
 
 ];
diff --git a/resources/lang/am-ET/admin/hardware/table.php b/resources/lang/am-ET/admin/hardware/table.php
index 9e8944d386..afa7a9d2dc 100644
--- a/resources/lang/am-ET/admin/hardware/table.php
+++ b/resources/lang/am-ET/admin/hardware/table.php
@@ -14,7 +14,7 @@ return [
     'diff' 			=> 'Diff',
     'dl_csv' 		=> 'Download CSV',
     'eol' 			=> 'EOL',
-    'id'      		=> 'ID',
+    'id'      		=> 'መለያ',
     'last_checkin_date' => 'Last Checkin Date',
     'location' 		=> 'Location',
     'purchase_cost'	=> 'Cost',
@@ -25,7 +25,6 @@ return [
     'image'		    => 'Device Image',
     'days_without_acceptance' => 'Days Without Acceptance',
     'monthly_depreciation' => 'Monthly Depreciation',
-    'assigned_to'    => 'Assigned To',
     'requesting_user' => 'Requesting User',
     'requested_date' => 'Requested Date',
     'changed'       => 'Changed',
diff --git a/resources/lang/am-ET/admin/kits/general.php b/resources/lang/am-ET/admin/kits/general.php
index f57fb645c4..2b5c2d9cd0 100644
--- a/resources/lang/am-ET/admin/kits/general.php
+++ b/resources/lang/am-ET/admin/kits/general.php
@@ -47,4 +47,5 @@ return [
     'kit_deleted'                       => 'Kit was successfully deleted',
     'kit_model_updated'                 => 'Model was successfully updated',
     'kit_model_detached'                => 'Model was successfully detached',
+    'model_already_attached'            => 'Model already attached to kit',
 ];
diff --git a/resources/lang/am-ET/admin/licenses/general.php b/resources/lang/am-ET/admin/licenses/general.php
index 79b69a3d94..b39030afd4 100644
--- a/resources/lang/am-ET/admin/licenses/general.php
+++ b/resources/lang/am-ET/admin/licenses/general.php
@@ -14,6 +14,7 @@ return array(
     'info'  					=> 'License Info',
     'license_seats'  			=> 'License Seats',
     'seat'  					=> 'Seat',
+    'seat_count'  				=> 'Seat :count',
     'seats'  					=> 'Seats',
     'software_licenses'  		=> 'Software Licenses',
     'user'  					=> 'User',
@@ -23,12 +24,12 @@ return array(
         [
             'checkin_all'           => [
                 'button'            => 'Checkin All Seats',
-                'modal'             => 'This will action checkin one seat. | This action will checkin all :checkedout_seats_count seats for this license.',
+                'modal'             => 'This action will checkin one seat. | This action will checkin all :checkedout_seats_count seats for this license.',
                 'enabled_tooltip'   => 'Checkin ALL seats for this license from both users and assets',
                 'disabled_tooltip'  => 'This is disabled because there are no seats currently checked out',
                 'disabled_tooltip_reassignable'  => 'This is disabled because the License is not reassignable',
                 'success'           => 'License successfully checked in! | All licenses were successfully checked in!',
-                'log_msg'           => 'Checked in via bulk license checkout in license GUI',
+                'log_msg'           => 'Checked in via bulk license checkin in license GUI',
             ],
 
             'checkout_all'              => [
diff --git a/resources/lang/am-ET/admin/licenses/message.php b/resources/lang/am-ET/admin/licenses/message.php
index 27fbfe38a9..74e1d7af5a 100644
--- a/resources/lang/am-ET/admin/licenses/message.php
+++ b/resources/lang/am-ET/admin/licenses/message.php
@@ -44,10 +44,13 @@ return array(
         'error'   => 'There was an issue checking out the license. Please try again.',
         'success' => 'The license was checked out successfully',
         'not_enough_seats' => 'Not enough license seats available for checkout',
+        'mismatch' => 'The license seat provided does not match the license',
+        'unavailable' => 'This seat is not available for checkout.',
     ),
 
     'checkin' => array(
         'error'   => 'There was an issue checking in the license. Please try again.',
+        'not_reassignable' => 'License not reassignable',
         'success' => 'The license was checked in successfully'
     ),
 
diff --git a/resources/lang/am-ET/admin/licenses/table.php b/resources/lang/am-ET/admin/licenses/table.php
index 9cabf9c883..584b44e344 100644
--- a/resources/lang/am-ET/admin/licenses/table.php
+++ b/resources/lang/am-ET/admin/licenses/table.php
@@ -5,7 +5,7 @@ return array(
     'assigned_to'   	=> 'Assigned To',
     'checkout'   		=> 'In/Out',
     'deleted_at'        => 'Deleted at',
-    'id'      			=> 'ID',
+    'id'      			=> 'መለያ',
     'license_email'   	=> 'License Email',
     'license_name'   	=> 'Licensed To',
     'purchase_date'   	=> 'Purchase Date',
diff --git a/resources/lang/am-ET/admin/locations/message.php b/resources/lang/am-ET/admin/locations/message.php
index 8121b80687..b21c70ad89 100644
--- a/resources/lang/am-ET/admin/locations/message.php
+++ b/resources/lang/am-ET/admin/locations/message.php
@@ -3,11 +3,12 @@
 return array(
 
     'does_not_exist' => 'Location does not exist.',
-    'assoc_users'    => 'This location is not currently deletable because it is the location of record for at least one asset or user, has assets assigned to it, or is the parent location of another location. Please update your models to no longer reference this company and try again. ',
+    'assoc_users'    => 'This location is not currently deletable because it is the location of record for at least one asset or user, has assets assigned to it, or is the parent location of another location. Please update your records to no longer reference this location and try again ',
     'assoc_assets'	 => 'This location is currently associated with at least one asset and cannot be deleted. Please update your assets to no longer reference this location and try again. ',
     'assoc_child_loc'	 => 'This location is currently the parent of at least one child location and cannot be deleted. Please update your locations to no longer reference this location and try again. ',
     'assigned_assets' => 'Assigned Assets',
     'current_location' => 'Current Location',
+    'open_map' => 'Open in :map_provider_icon Maps',
 
 
     'create' => array(
@@ -20,6 +21,11 @@ return array(
         'success' => 'Location updated successfully.'
     ),
 
+    'restore' => array(
+        'error'   => 'Location was not restored, please try again',
+        'success' => 'Location restored successfully.'
+    ),
+
     'delete' => array(
         'confirm'   	=> 'Are you sure you wish to delete this location?',
         'error'   => 'There was an issue deleting the location. Please try again.',
diff --git a/resources/lang/am-ET/admin/locations/table.php b/resources/lang/am-ET/admin/locations/table.php
index 3fb92b588b..ba1572a0c1 100644
--- a/resources/lang/am-ET/admin/locations/table.php
+++ b/resources/lang/am-ET/admin/locations/table.php
@@ -5,7 +5,7 @@ return [
     'about_locations'           => 'Locations are used to track location information for users, assets, and other items',
     'assets_rtd'                => 'ንብረቶች', // This has NEVER meant Assets Retired. I don't know how it keeps getting reverted.
     'assets_checkedout'         => 'Assets Assigned',
-    'id'                        => 'ID',
+    'id'                        => 'መለያ',
     'city'                      => 'City',
     'state'                     => 'State',
     'country'                   => 'Country',
@@ -18,7 +18,7 @@ return [
     'address2'                   => 'Address Line 2',
     'zip'                       => 'Postal Code',
     'locations'                 => 'Locations',
-    'parent'                    => 'Parent',
+    'parent'                    => 'ዋና መደብ',
     'currency'                  => 'Location Currency',
     'ldap_ou'                   => 'LDAP Search OU',
     'user_name'                 => 'User Name',
@@ -39,4 +39,5 @@ return [
     'signed_by_finance_auditor' => 'Signed By (Finance Auditor):',
     'signed_by_location_manager' => 'Signed By (Location Manager):',
     'signed_by'                 => 'Signed Off By:',
+    'clone'  					=> 'Clone Location',
 ];
diff --git a/resources/lang/am-ET/admin/manufacturers/table.php b/resources/lang/am-ET/admin/manufacturers/table.php
index 6a0aaa8865..201390454f 100644
--- a/resources/lang/am-ET/admin/manufacturers/table.php
+++ b/resources/lang/am-ET/admin/manufacturers/table.php
@@ -5,7 +5,7 @@ return array(
     'about_manufacturers_text'  => 'Manufacturers are the companies that create your assets. You can store important support contact information about them here, which will be displayed on your asset detail pages.',
     'asset_manufacturers'	=> 'Asset Manufacturers',
     'create'				=> 'Create Manufacturer',
-    'id'   					=> 'ID',
+    'id'   					=> 'መለያ',
     'name'      			=> 'Name',
     'support_email'   		=> 'Support Email',
     'support_phone'   		=> 'Support Phone',
diff --git a/resources/lang/am-ET/admin/models/general.php b/resources/lang/am-ET/admin/models/general.php
index 7e4a77adbc..9a61b53fd0 100644
--- a/resources/lang/am-ET/admin/models/general.php
+++ b/resources/lang/am-ET/admin/models/general.php
@@ -3,7 +3,7 @@
 return array(
     'about_models_title'     => 'About Asset Models',
     'about_models_text'           => 'Asset Models are a way to group identical assets. "MBP 2013", "IPhone 6s", etc.',
-    'deleted'  					        => 'This model has been deleted.',
+    'deleted'  					=> 'This model has been deleted.',
     'bulk_delete'               => 'Bulk Delete Asset Models',
     'bulk_delete_help'               => 'Use the checkboxes below to confirm the deletion of the selected asset models. Asset models that have assets associated with them cannot be deleted until the assets are associated with a different model.',
     'bulk_delete_warn'          => 'You are about to delete one asset model.|You are about to delete :model_count asset models.',
diff --git a/resources/lang/am-ET/admin/models/message.php b/resources/lang/am-ET/admin/models/message.php
index cc38c54530..ae3bc34eed 100644
--- a/resources/lang/am-ET/admin/models/message.php
+++ b/resources/lang/am-ET/admin/models/message.php
@@ -7,7 +7,7 @@ return array(
     'no_association' => 'WARNING! The asset model for this item is invalid or missing!',
     'no_association_fix' => 'This will break things in weird and horrible ways. Edit this asset now to assign it a model.',
     'assoc_users'	 => 'This model is currently associated with one or more assets and cannot be deleted. Please delete the assets, and then try deleting again. ',
-
+    'invalid_category_type' => 'This category must be an asset category.',
 
     'create' => array(
         'error'   => 'Model was not created, please try again.',
diff --git a/resources/lang/am-ET/admin/reports/general.php b/resources/lang/am-ET/admin/reports/general.php
index 9b682f8ecd..ed8bf1a156 100644
--- a/resources/lang/am-ET/admin/reports/general.php
+++ b/resources/lang/am-ET/admin/reports/general.php
@@ -4,6 +4,7 @@ return [
     'info'   => 'Select the options you want for your asset report.',
     'deleted_user' => 'Deleted user',
     'send_reminder' => 'Send reminder',
+    'cannot_send_reminder' => 'User has been deleted or does not have an email address so cannot receive a reminder',
     'reminder_sent' => 'Reminder sent',
     'acceptance_deleted' => 'Acceptance request deleted',
     'acceptance_request' => 'Acceptance request',
@@ -13,5 +14,10 @@ return [
         'user_state' => 'User State',
         'user_country' => 'User Country',
         'user_zip' => 'User Zip'
-    ]
-];
\ No newline at end of file
+    ],
+    'open_saved_template' => 'Open Saved Template',
+    'save_template' =>  'Save Template',
+    'select_a_template' => 'Select a Template',
+    'template_name' => 'Template Name',
+    'update_template' => 'Update Template',
+];
diff --git a/resources/lang/am-ET/admin/reports/message.php b/resources/lang/am-ET/admin/reports/message.php
index d4c8f8198f..2800bbdf0b 100644
--- a/resources/lang/am-ET/admin/reports/message.php
+++ b/resources/lang/am-ET/admin/reports/message.php
@@ -1,5 +1,16 @@
 <?php
 
-return array(
-    'error'   => 'You must select at least ONE option.'
-);
+return [
+    'about_templates' => 'About Saved Templates',
+    'saving_templates_description' => 'Select your options, then enter the name of your template in the box above and click the \'Save Template\' button. Use the dropdown to select a previously saved template.',
+    'create'  => [
+        'success' => 'Template saved successfully',
+    ],
+    'update' => [
+        'success' => 'Template updated successfully',
+    ],
+    'delete' => [
+        'success' => 'Template deleted',
+        'no_delete_permission' => 'Template does not exist or you do not have permission to delete it.',
+    ],
+];
diff --git a/resources/lang/am-ET/admin/settings/general.php b/resources/lang/am-ET/admin/settings/general.php
index 8074f5082e..37cfb0de94 100644
--- a/resources/lang/am-ET/admin/settings/general.php
+++ b/resources/lang/am-ET/admin/settings/general.php
@@ -8,13 +8,13 @@ return [
     'ad_append_domain'          => 'Append domain name to username field',
     'ad_append_domain_help'     => 'User isn\'t required to write "username@domain.local", they can just type "username".',
     'admin_cc_email'            => 'CC Email',
-    'admin_cc_email_help'       => 'If you would like to send a copy of checkin/checkout emails that are sent to users to an additional email account, enter it here. Otherwise leave this field blank.',
+    'admin_cc_email_help'       => 'Send a copy of checkin/checkout emails to this address.',
     'admin_settings'            => 'Admin Settings',
     'is_ad'				        => 'This is an Active Directory server',
     'alerts'                	=> 'Alerts',
     'alert_title'               => 'Update Notification Settings',
     'alert_email'				=> 'Send alerts to',
-    'alert_email_help'    => 'Email addresses or distribution lists you want alerts to be sent to, comma separated',
+    'alert_email_help'          => 'Email addresses or distribution lists you want alerts to be sent to, comma separated.',
     'alerts_enabled'			=> 'Email Alerts Enabled',
     'alert_interval'			=> 'Expiring Alerts Threshold (in days)',
     'alert_inv_threshold'		=> 'Inventory Alert Threshold',
@@ -31,15 +31,18 @@ return [
     'backups'					=> 'Backups',
     'backups_help'              => 'Create, download, and restore backups ',
     'backups_restoring'         => 'Restoring from Backup',
+    'backups_clean' => 'Clean the backed-up database before restore',
+    'backups_clean_helptext' => "This can be useful if you're changing between database versions",
     'backups_upload'            => 'Upload Backup',
     'backups_path'              => 'Backups on the server are stored in <code>:path</code>',
-    'backups_restore_warning'   => 'Use the restore button <small><span class="btn btn-xs btn-warning"><i class="text-white fas fa-retweet" aria-hidden="true"></i></span></small> to restore from a previous backup. (This does not currently work with S3 file storage or Docker.)<br><br>Your <strong>entire :app_name database and any uploaded files will be completely replaced</strong> by what\'s in the backup file.  ',
+    'backups_restore_warning'   => 'Use the restore button <small><span class="btn btn-xs btn-warning"><i class="text-white fas fa-retweet" aria-hidden="true"></i></span></small> to restore from a previous backup. (This does not currently work with S3 file storage or Docker.)<br><br>Your <strong>entire :app_name database and any uploaded files will be completely replaced</strong> by what\'s in the backup file  ',
     'backups_logged_out'         => 'All existing users, including you, will be logged out once your restore is complete.',
     'backups_large'             => 'Very large backups may time out on the restore attempt and may still need to be run via command line. ',
     'barcode_settings'			=> 'Barcode Settings',
     'confirm_purge'			    => 'Confirm Purge',
     'confirm_purge_help'		=> 'Enter the text "DELETE" in the box below to purge your deleted records. This action cannot be undone and will PERMANENTLY delete all soft-deleted items and users. (You should make a backup first, just to be safe.)',
     'custom_css'				=> 'Custom CSS',
+    'custom_css_placeholder'	=> 'Add your custom CSS',
     'custom_css_help'			=> 'Enter any custom CSS overrides you would like to use. Do not include the &lt;style&gt;&lt;/style&gt; tags.',
     'custom_forgot_pass_url'	=> 'Custom Password Reset URL',
     'custom_forgot_pass_url_help'	=> 'This replaces the built-in forgotten password URL on the login screen, useful to direct people to internal or hosted LDAP password reset functionality. It will effectively disable local user forgotten password functionality.',
@@ -47,34 +50,34 @@ return [
     'dashboard_message_help'	=> 'This text will appear on the dashboard for anyone with permission to view the dashboard.',
     'default_currency'  		=> 'Default Currency',
     'default_eula_text'			=> 'Default EULA',
+    'default_eula_text_placeholder' => 'Add your default EULA text',
     'default_language'			=> 'Default Language',
     'default_eula_help_text'	=> 'You can also associate custom EULAs to specific asset categories.',
     'acceptance_note'           => 'Add a note for your decision (Optional)',
     'display_asset_name'        => 'Display Asset Name',
     'display_checkout_date'     => 'Display Checkout Date',
     'display_eol'               => 'Display EOL in table view',
-    'display_qr'                => 'Display Square Codes',
+    'display_qr'                => 'Display 2D barcode',
     'display_alt_barcode'		=> 'Display 1D barcode',
-    'email_logo'                => 'Email Logo',
     'barcode_type'				=> '2D Barcode Type',
     'alt_barcode_type'			=> '1D barcode type',
-    'email_logo_size'       => 'Square logos in email look best. ',
     'enabled'                   => 'Enabled',
     'eula_settings'				=> 'EULA Settings',
     'eula_markdown'				=> 'This EULA allows <a href="https://help.github.com/articles/github-flavored-markdown/">Github flavored markdown</a>.',
+    'empty_row_count'           => 'Field Start Offset (Empty Rows)',
+    'empty_row_count_help'      => 'Fields will begin populating after this many empty rows are skipped at the top of the label.',
     'favicon'                   => 'Favicon',
     'favicon_format'            => 'Accepted filetypes are ico, png, and gif. Other image formats may not work in all browsers.',
     'favicon_size'          => 'Favicons should be square images, 16x16 pixels.',
     'footer_text'               => 'Additional Footer Text ',
     'footer_text_help'          => 'This text will appear in the right-side footer. Links are allowed using <a href="https://help.github.com/articles/github-flavored-markdown/">Github flavored markdown</a>. Line breaks, headers, images, etc may result in unpredictable results.',
+    'footer_text_placeholder'   => 'Optional footer text',
     'general_settings'			=> 'General Settings',
-    'general_settings_keywords' => 'company support, signature, acceptance, email format, username format, images, per page, thumbnail, eula, gravatar, tos, dashboard, privacy',
     'general_settings_help'     => 'Default EULA and more',
     'generate_backup'			=> 'Generate Backup',
     'google_workspaces'         => 'Google Workspaces',
     'header_color'              => 'Header Color',
     'info'                      => 'These settings let you customize certain aspects of your installation.',
-    'label_logo'                => 'Label Logo',
     'label_logo_size'           => 'Square logos look best - will be displayed in the top right of each asset label. ',
     'laravel'                   => 'Laravel Version',
     'ldap'                      => 'LDAP',
@@ -94,7 +97,7 @@ return [
     'ldap_login_sync_help'      => 'This only tests that LDAP can sync correctly. If your LDAP Authentication query is not correct, users may still not be able to login. YOU MUST SAVE YOUR UPDATED LDAP SETTINGS FIRST.',
     'ldap_manager'              => 'LDAP Manager',
     'ldap_server'               => 'LDAP Server',
-    'ldap_server_help'          => 'This should start with ldap:// (for unencrypted or TLS) or ldaps:// (for SSL)',
+    'ldap_server_help'          => 'This should start with ldap:// (for unencrypted) or ldaps:// (for TLS or SSL)',
     'ldap_server_cert'			=> 'LDAP SSL certificate validation',
     'ldap_server_cert_ignore'	=> 'Allow invalid SSL Certificate',
     'ldap_server_cert_help'		=> 'Select this checkbox if you are using a self signed SSL cert and would like to accept an invalid SSL certificate.',
@@ -108,8 +111,8 @@ return [
     'ldap_pword'                => 'LDAP Bind Password',
     'ldap_basedn'               => 'Base Bind DN',
     'ldap_filter'               => 'LDAP Filter',
-    'ldap_pw_sync'              => 'LDAP Password Sync',
-    'ldap_pw_sync_help'         => 'Uncheck this box if you do not wish to keep LDAP passwords synced with local passwords. Disabling this means that your users may not be able to login if your LDAP server is unreachable for some reason.',
+    'ldap_pw_sync'              => 'Cache LDAP Passwords',
+    'ldap_pw_sync_help'         => 'Uncheck this box if you do not wish to keep LDAP passwords cached as local hashed passwords. Disabling this means that your users may not be able to login if your LDAP server is unreachable for some reason.',
     'ldap_username_field'       => 'Username Field',
     'ldap_lname_field'          => 'Last Name',
     'ldap_fname_field'          => 'LDAP First Name',
@@ -117,13 +120,15 @@ return [
     'ldap_version'              => 'LDAP Version',
     'ldap_active_flag'          => 'LDAP Active Flag',
     'ldap_activated_flag_help'  => 'This value is used to determine whether a synced user can login to Snipe-IT. <strong>It does not affect the ability to check items in or out to them</strong>, and should be the <strong>attribute name</strong> within your AD/LDAP, <strong>not the value</strong>. <br><br>If this field is set to a field name that does not exist in your AD/LDAP, or the value in the AD/LDAP field is set to <code>0</code> or <code>false</code>, <strong>user login will be disabled</strong>. If the value in the AD/LDAP field is set to <code>1</code> or <code>true</code> or <em>any other text</em> means the user can log in. When the field is blank in your AD, we respect the <code>userAccountControl</code> attribute, which usually allows non-suspended users to log in.',
+    'ldap_invert_active_flag'   => 'LDAP Invert Active Flag',
+    'ldap_invert_active_flag_help'     => 'If enabled: when the value returned by LDAP Active Flag is <code>0</code> or <code>false</code> the user account will be active.',
     'ldap_emp_num'              => 'LDAP Employee Number',
     'ldap_email'                => 'LDAP Email',
     'ldap_test'                 => 'Test LDAP',
     'ldap_test_sync'            => 'Test LDAP Synchronization',
     'license'                   => 'Software License',
-    'load_remote'               => 'Use Gravatar',
-    'load_remote_help_text'		=> 'Uncheck this box if your install cannot load scripts from the outside internet. This will prevent Snipe-IT from trying load images from Gravatar.',
+    'load_remote'               => 'Load Remote Avatars',
+    'load_remote_help_text'		=> 'Uncheck this box if your install cannot load scripts from the outside internet. This will prevent Snipe-IT from trying load avatars from Gravatar or other outside sources.',
     'login'                     => 'Login Attempts',
     'login_attempt'             => 'Login Attempt',
     'login_ip'                  => 'IP Address',
@@ -131,6 +136,7 @@ return [
     'login_user_agent'          => 'User Agent',
     'login_help'                => 'List of attempted logins',
     'login_note'                => 'Login Note',
+    'login_note_placeholder'            => "If you do not have a login or have found a device belonging to this company, please call technical support at 888-555-1212. Thank you.",
     'login_note_help'           => 'Optionally include a few sentences on your login screen, for example to assist people who have found a lost or stolen device. This field accepts <a href="https://help.github.com/articles/github-flavored-markdown/">Github flavored markdown</a>',
     'login_remote_user_text'    => 'Remote User login options',
     'login_remote_user_enabled_text' => 'Enable Login with Remote User Header',
@@ -146,13 +152,16 @@ return [
     'logo_print_assets_help'    => 'Use branding on printable asset lists ',
     'full_multiple_companies_support_help_text' => 'Restricting users (including admins) assigned to companies to their company\'s assets.',
     'full_multiple_companies_support_text' => 'Full Multiple Companies Support',
+    'scope_locations_fmcs_support_text'  => 'Scope Locations with Full Multiple Companies Support',
+    'scope_locations_fmcs_support_help_text'  => 'Restrict locations to their selected company.',
+    'scope_locations_fmcs_check_button' => 'Check Compatibility',
+    'scope_locations_fmcs_support_disabled_text'  => 'This option is disabled because you have conflicting locations set for :count or more items.',
     'show_in_model_list'   => 'Show in Model Dropdowns',
     'optional'					=> 'optional',
     'per_page'                  => 'Results Per Page',
     'php'                       => 'PHP Version',
-    'php_info'                  => 'PHP Info',
+    'php_info'                  => 'PHP info',
     'php_overview'              => 'PHP',
-    'php_overview_keywords'     => 'phpinfo, system, info',
     'php_overview_help'         => 'PHP System info',
     'php_gd_info'               => 'You must install php-gd to display QR codes, see install instructions.',
     'php_gd_warning'            => 'PHP Image Processing and GD plugin is NOT installed.',
@@ -218,6 +227,8 @@ return [
     'webhook_integration_help'    => ':app integration is optional, however the endpoint and channel are required if you wish to use it. To configure :app integration, you must first <a href=":webhook_link" target="_new" rel="noopener">create an incoming webhook</a> on your :app account. Click on the <strong>Test :app Integration</strong> button to confirm your settings are correct before saving. ',
     'webhook_integration_help_button'    => 'Once you have saved your :app information, a test button will appear.',
     'webhook_test_help'           => 'Test whether your :app integration is configured correctly. YOU MUST SAVE YOUR UPDATED :app SETTINGS FIRST.',
+    'shortcuts_enabled'         => 'Enable Shortcuts',
+    'shortcuts_help_text'       => '<strong>Windows</strong>: Alt + Access key, <strong>Mac</strong>: Control + Option + Access key',
     'snipe_version'  			=> 'Snipe-IT version',
     'support_footer'            => 'Support Footer Links ',
     'support_footer_help'       => 'Specify who sees the links to the Snipe-IT Support info and Users Manual',
@@ -227,7 +238,6 @@ return [
     'update'                    => 'Update Settings',
     'value'                     => 'Value',
     'brand'                     => 'Branding',
-    'brand_keywords'            => 'footer, logo, print, theme, skin, header, colors, color, css',
     'brand_help'                => 'Logo, Site Name',
     'web_brand'                 => 'Web Branding Type',
     'about_settings_title'      => 'About Settings',
@@ -276,6 +286,8 @@ return [
     'two_factor_enrollment_text'	=> "Two factor authentication is required, however your device has not been enrolled yet. Open your Google Authenticator app and scan the QR code below to enroll your device. Once you've enrolled your device, enter the code below",
     'require_accept_signature'      => 'Require Signature',
     'require_accept_signature_help_text'      => 'Enabling this feature will require users to physically sign off on accepting an asset.',
+    'require_checkinout_notes'  => 'Require Notes on Checkin/Checkout',
+    'require_checkinout_notes_help_text'    => 'Enabling this feature will require the note fields to be populated when checking in or checking out an asset.',
     'left'        => 'left',
     'right'        => 'right',
     'top'        => 'top',
@@ -313,24 +325,24 @@ return [
     'filter_by_keyword' => 'Filter by setting keyword',
     'security' => 'Security',
     'security_title' => 'Update Security Settings',
-    'security_keywords' => 'password, passwords, requirements, two factor, two-factor, common passwords, remote login, logout, authentication',
     'security_help' => 'Two-factor, Password Restrictions',
-    'groups_keywords' => 'permissions, permission groups, authorization',
     'groups_help' => 'Account permission groups',
     'localization' => 'Localization',
     'localization_title' => 'Update Localization Settings',
-    'localization_keywords' => 'localization, currency, local, locale, time zone, timezone, international, internatinalization, language, languages, translation',
     'localization_help' => 'Language, date display',
     'notifications' => 'Notifications',
     'notifications_help' => 'Email Alerts & Audit Settings',
     'asset_tags_help' => 'Incrementing and prefixes',
     'labels' => 'Labels',
     'labels_title' => 'Update Label Settings',
-    'labels_help' => 'Label sizes &amp; settings',
-    'purge_keywords' => 'permanently delete',
+    'labels_help' => 'Barcodes &amp; label settings',
     'purge_help' => 'Purge Deleted Records',
     'ldap_extension_warning' => 'It does not look like the LDAP extension is installed or enabled on this server. You can still save your settings, but you will need to enable the LDAP extension for PHP before LDAP syncing or login will work.',
     'ldap_ad' => 'LDAP/AD',
+    'ldap_test_label' => 'Test LDAP Sync',
+    'ldap_test_login' => ' Test LDAP Login',
+    'ldap_username_placeholder' => 'LDAP Username',
+    'ldap_password_placeholder' => 'LDAP Password',
     'employee_number' => 'Employee Number',
     'create_admin_user' => 'Create a User ::',
     'create_admin_success' => 'Success! Your admin user has been added!',
@@ -342,6 +354,8 @@ return [
     'setup_migration_create_user' => 'Next: Create User',
     'ldap_settings_link' => 'LDAP Settings Page',
     'slack_test' => 'Test <i class="fab fa-slack"></i> Integration',
+    'status_label_name' => 'Status Label Name',
+    'super_admin_only'  => 'Super Admin Only',
     'label2_enable'           => 'New Label Engine',
     'label2_enable_help'      => 'Switch to the new label engine. <b>Note: You will need to save this setting before setting others.</b>',
     'label2_template'         => 'Template',
@@ -356,12 +370,15 @@ return [
     'label2_2d_type'          => '2D Barcode Type',
     'label2_2d_type_help'     => 'Format for 2D barcodes',
     'label2_2d_target'        => '2D Barcode Target',
-    'label2_2d_target_help'   => 'The URL the 2D barcode points to when scanned',
+    'label2_2d_target_help'   => 'The data that will be contained in the 2D barcode',
     'label2_fields'           => 'Field Definitions',
     'label2_fields_help'      => 'Fields can be added, removed, and reordered in the left column. For each field, multiple options for Label and DataSource can be added, removed, and reordered in the right column.',
+    'purge_barcodes' => 'Purge Barcodes',
     'help_asterisk_bold'    => 'Text entered as <code>**text**</code> will be displayed as bold',
     'help_blank_to_use'     => 'Leave blank to use the value from <code>:setting_name</code>',
     'help_default_will_use' => '<code>:default</code> will use the value from <code>:setting_name</code>. <br>Note that the value of the barcodes must comply with the respective barcode spec in order to be successfully generated. Please see <a href="https://snipe-it.readme.io/docs/barcodes">the documentation <i class="fa fa-external-link"></i></a> for more details. ',
+    'asset_id'              => 'Asset ID',
+    'data'               => 'Data',
     'default'               => 'Default',
     'none'                  => 'None',
     'google_callback_help' => 'This should be entered as the callback URL in your Google OAuth app settings in your organization&apos;s <strong><a href="https://console.cloud.google.com/" target="_blank">Google developer console <i class="fa fa-external-link" aria-hidden="true"></i></a></strong>.',
@@ -373,7 +390,100 @@ return [
     'database_driver' => 'Database Driver',
     'bs_table_storage' => 'Table Storage',
     'timezone' => 'Timezone',
+    'test_mail' => 'Test Mail',
     'profile_edit'          => 'Edit Profile',
     'profile_edit_help'          => 'Allow users to edit their own profiles.',
+    'default_avatar' => 'Custom Default Avatar',
+    'default_avatar_help' => 'This image will be displayed as a profile if a user does not have a profile photo.',
+    'restore_default_avatar' => 'Restore <a href=":default_avatar" data-toggle="lightbox" data-type="image">original system default avatar</a>',
+    'restore_default_avatar_help' => '',
+    'due_checkin_days' => 'Due For Checkin Warning',
+    'due_checkin_days_help' => 'How many days before the expected checkin of an asset should it be listed in the "Due for checkin" page?',
+    'no_groups' => 'No groups have been created yet. Visit <code>Admin Settings > Permission Groups</code> to add one.',
+    'text' => 'Text',
+
+    'username_formats' => [
+        'username_format'		=> 'Username Format',
+        'firstname_lastname_format'	=> 'First Name Last Name (jane.smith)',
+        'first_name_format'	        => 'First Name (jane)',
+        'last_name_format'		=> 'Last Name (doe)',
+        'filastname_format'			=> 'First Initial Last Name (jsmith)',
+        'lastnamefirstinitial_format' =>  'Last Name First Initial (smithj)',
+        'firstname_lastname_underscore_format' => 'First Name Last Name (jane_smith)',
+        'firstinitial.lastname' => 'First Initial Last Name (j.smith)',
+        'lastname_firstinitial' => 'Last Name First Initial (smith_j)',
+        'lastname_dot_firstinitial_format' => 'Last Name First Initial (smith.j)',
+        'firstnamelastname'     => 'First Name Last Name (janesmith)',
+        'firstnamelastinitial'  => 'First Name Last Initial (janes)',
+        'lastnamefirstname'      => 'Last Name.First Name (smith.jane)',
+    ],
+
+    'email_formats' => [
+        'email_format'			=> 'Email Format',
+        'firstname_lastname_format'	=> 'First Name Last Name (jane.smith@example.com)',
+        'first_name_format'		=> 'First Name (jane@example.com)',
+        'last_name_format'		=> 'Last Name (doe@example.com)',
+        'filastname_format'			=> 'First Initial Last Name (jsmith@example.com)',
+        'lastnamefirstinitial_format' =>  'Last Name First Initial (smithj@example.com)',
+        'firstname_lastname_underscore_format' => 'First Name Last Name (jane_smith@example.com)',
+        'firstinitial.lastname' => 'First Initial Last Name (j.smith@example.com)',
+        'lastname_firstinitial' => 'Last Name First Initial (smith_j@example.com)',
+        'lastname_dot_firstinitial_format' => 'Last Name First Initial (smith.j@example.com)',
+        'firstnamelastname'     => 'First Name Last Name (janesmith@example.com)',
+        'firstnamelastinitial'  => 'First Name Last Initial (janes@example.com)',
+        'lastnamefirstname'      => 'Last Name.First Name (smith.jane@example.com)',
+    ],
+
+
+
+    'logo_labels' => [
+        'acceptance_pdf_logo'       => 'PDF Logo',
+        'email_logo'                => 'Email Logo',
+        'label_logo'                => 'Label Logo',
+        'logo'                      => 'Site Logo',
+        'favicon'                   => 'Favicon',
+    ],
+
+    'logo_help' => [
+        'email_logo_size'       => 'Square logos in email look best. ',
+    ],
+
+    'logo_option_types' => [
+        'text' => 'Text',
+        'logo' => 'Logo',
+        'logo_and_text' => 'Logo and Text',
+    ],
+
+
+    'legends' => [
+        'scoping' => 'Scoping',
+        'formats' => 'Default Formats',
+        'profiles' => 'User Profiles',
+        'eula' => 'EULA & Acceptance Preferences',
+        'misc_display' => 'Miscellaneous Display Options',
+        'email' => 'Email Preferences',
+        'checkin' => 'Checkin Preferences',
+        'dashboard' => 'Login & Dashboard Preferences',
+        'misc' => 'Miscellaneous',
+        'logos' => 'Logos & Display',
+        'colors' => 'Colors & Skins',
+        'footer' => 'Footer Preferences',
+        'security' => 'Security Preferences',
+        'general' => 'General',
+        'intervals' => 'Intervals & Thresholds',
+    ],
+
+
+    /* Keywords for settings overview help */
+    'keywords' => [
+        'brand'             => 'footer, logo, print, theme, skin, header, colors, color, css',
+        'general_settings'  => 'company support, signature, acceptance, email format, username format, images, per page, thumbnail, eula, gravatar, tos, dashboard, privacy',
+        'groups'            => 'permissions, permission groups, authorization',
+        'labels'            => 'labels, barcodes, barcode, sheets, print, upc, qr, 1d, 2d',
+        'localization'      => 'localization, currency, local, locale, time zone, timezone, international, internatinalization, language, languages, translation',
+        'php_overview'      => 'phpinfo, system, info',
+        'purge'             => 'permanently delete',
+        'security'          => 'password, passwords, requirements, two factor, two-factor, common passwords, remote login, logout, authentication',
+    ],
 
 ];
diff --git a/resources/lang/am-ET/admin/settings/message.php b/resources/lang/am-ET/admin/settings/message.php
index c9b0f34217..58abf14c5c 100644
--- a/resources/lang/am-ET/admin/settings/message.php
+++ b/resources/lang/am-ET/admin/settings/message.php
@@ -14,6 +14,9 @@ return [
         'restore_warning'       => 'Yes, restore it. I acknowledge that this will overwrite any existing data currently in the database. This will also log out all of your existing users (including you).',
         'restore_confirm'       => 'Are you sure you wish to restore your database from :filename?'
     ],
+    'restore' => [
+        'success'               => 'Your system backup has been restored. Please log in again.'
+    ],
     'purge' => [
         'error'     => 'An error has occurred while purging. ',
         'validation_failed'     => 'Your purge confirmation is incorrect. Please type the word "DELETE" in the confirmation box.',
@@ -33,6 +36,9 @@ return [
         'testing_authentication' => 'Testing LDAP Authentication...',
         'authentication_success' => 'User authenticated against LDAP successfully!'
     ],
+    'labels' => [
+        'null_template' => 'Label template not found. Please select a template.',
+        ],
     'webhook' => [
         'sending' => 'Sending :app test message...',
         'success' => 'Your :webhook_name Integration works!',
@@ -42,5 +48,12 @@ return [
         'error' => 'Something went wrong. :app responded with: :error_message',
         'error_redirect' => 'ERROR: 301/302 :endpoint returns a redirect. For security reasons, we don’t follow redirects. Please use the actual endpoint.',
         'error_misc' => 'Something went wrong. :( ',
-    ]
+        'webhook_fail' => ' webhook notification failed: Check to make sure the URL is still valid.',
+        'webhook_channel_not_found' => ' webhook channel not found.',
+        'ms_teams_deprecation' => 'The selected Microsoft Teams webhook URL will be deprecated Dec 31st, 2025. Please use a workflow URL. Microsoft\'s documentation on creating a workflow can be found <a href="https://support.microsoft.com/en-us/office/create-incoming-webhooks-with-workflows-for-microsoft-teams-8ae491c7-0394-4861-ba59-055e33f75498" target="_blank"> here.</a>',
+    ],
+    'location_scoping' => [
+        'not_saved' => 'Your settings were not saved.',
+        'mismatch' => 'There is 1 item in the database that need your attention before you can enable location scoping.|There are :count items in the database that need your attention before you can enable location scoping.',
+    ],
 ];
diff --git a/resources/lang/am-ET/admin/statuslabels/table.php b/resources/lang/am-ET/admin/statuslabels/table.php
index aa3f5f9a2c..cb743209d1 100644
--- a/resources/lang/am-ET/admin/statuslabels/table.php
+++ b/resources/lang/am-ET/admin/statuslabels/table.php
@@ -1,14 +1,14 @@
 <?php
 
 return array(
-    'about'      	=> 'About Status Labels',
+    'about'      	=> 'About Status Types',
     'archived'      	=> 'የተመኸደረ',
     'create'      	=> 'Create Status Label',
     'color'      	=> 'Chart Color',
     'default_label' => 'Default Label',
     'default_label_help' => 'This is used to ensure your most commonly used status labels appear at the top of the select box when creating/editing assets.',
     'deployable'      	=> 'Deployable',
-    'info'      	=> 'Status labels are used to describe the various states your assets could be in. They may be out for repair, lost/stolen, etc. You can create new status labels for deployable, pending and archived assets.',
+    'info'      	=> 'Status label types are used to describe the various states your assets could be in. They may be out for repair, lost/stolen, etc. You can create new status labels for your deployable, pending and archived assets according to your own workflow. For more information, <a href="https://snipe-it.readme.io/docs/overview#status-labels" target="_blank">see the documentation <i class="fa fa-external-link"></i></a>.',
     'name'      	=> 'Status Name',
     'pending'      	=> 'Pending',
     'status_type'   => 'Status Type',
diff --git a/resources/lang/am-ET/admin/suppliers/table.php b/resources/lang/am-ET/admin/suppliers/table.php
index 21cf0950de..fe13628f22 100644
--- a/resources/lang/am-ET/admin/suppliers/table.php
+++ b/resources/lang/am-ET/admin/suppliers/table.php
@@ -11,7 +11,7 @@ return array(
     'create'                => 'Create Supplier',
     'email'                 => 'Email',
     'fax'                   => 'Fax',
-    'id'                    => 'ID',
+    'id'                    => 'መለያ',
     'licenses'              => 'Licenses',
     'name'                  => 'Supplier Name',
     'notes'                 => 'Notes',
diff --git a/resources/lang/am-ET/admin/users/general.php b/resources/lang/am-ET/admin/users/general.php
index b097ccec69..14f36cf151 100644
--- a/resources/lang/am-ET/admin/users/general.php
+++ b/resources/lang/am-ET/admin/users/general.php
@@ -19,6 +19,8 @@ return [
     'print_assigned'    => 'Print All Assigned',
     'email_assigned'    => 'Email List of All Assigned',
     'user_notified'     => 'User has been emailed a list of their currently assigned items.',
+    'users_notified'    => 'The user has been emailed a list of their currently assigned items.|:count users have been emailed a list of their currently assigned items.',
+    'users_notified_warning' => ':count user has been emailed a list of their currently assigned items, however :no_email users did not have an email address so could not be emailed.|:count users have been emailed a list of their currently assigned items, however :no_email user(s) did not have an email address so could not be emailed.',
     'auto_assign_label' => 'Include this user when auto-assigning eligible licenses',
     'auto_assign_help'  => 'Skip this user in auto assignment of licenses',
     'software_user'     => 'Software Checked out to :name',
diff --git a/resources/lang/am-ET/admin/users/message.php b/resources/lang/am-ET/admin/users/message.php
index 4d014775bd..b6ddad3aac 100644
--- a/resources/lang/am-ET/admin/users/message.php
+++ b/resources/lang/am-ET/admin/users/message.php
@@ -6,7 +6,7 @@ return array(
     'declined'                  => 'You have successfully declined this asset.',
     'bulk_manager_warn'	        => 'Your users have been successfully updated, however your manager entry was not saved because the manager you selected was also in the user list to be edited, and users may not be their own manager. Please select your users again, excluding the manager.',
     'user_exists'               => 'User already exists!',
-    'user_not_found'            => 'User does not exist.',
+    'user_not_found'            => 'User does not exist or you do not have permission view them.',
     'user_login_required'       => 'The login field is required',
     'user_has_no_assets_assigned' => 'No assets currently assigned to user.',
     'user_password_required'    => 'The password is required.',
@@ -53,6 +53,7 @@ return array(
         'ldap_could_not_search' => 'Could not search the LDAP server. Please check your LDAP server configuration in the LDAP config file. <br>Error from LDAP Server:',
         'ldap_could_not_get_entries' => 'Could not get entries from the LDAP server. Please check your LDAP server configuration in the LDAP config file. <br>Error from LDAP Server:',
         'password_ldap' => 'The password for this account is managed by LDAP/Active Directory. Please contact your IT department to change your password. ',
+        'multi_company_items_assigned' => 'This user has items assigned that belong to a different company. Please check them in or edit their company.'
     ),
 
     'deletefile' => array(
diff --git a/resources/lang/am-ET/admin/users/table.php b/resources/lang/am-ET/admin/users/table.php
index 35548b8487..7cfc7e529f 100644
--- a/resources/lang/am-ET/admin/users/table.php
+++ b/resources/lang/am-ET/admin/users/table.php
@@ -22,7 +22,7 @@ return array(
     'managed_locations'     => 'Managed Locations',
     'managed_users'         => 'Managed Users',
     'name' 					=> 'Name',
-    'nogroup'               => 'No groups have been created yet. To add one, visit: ',
+    'nogroup'               => 'No groups have been created yet. To add one, visit:',
     'notes'                 => 'Notes',
     'password_confirm' 		=> 'Confirm Password',
     'password' 				=> 'Password',
diff --git a/resources/lang/am-ET/auth.php b/resources/lang/am-ET/auth.php
index db310aa1bb..14d8acfce0 100644
--- a/resources/lang/am-ET/auth.php
+++ b/resources/lang/am-ET/auth.php
@@ -15,6 +15,6 @@ return array(
 
     'failed' => 'These credentials do not match our records.',
     'password' => 'The provided password is incorrect.',
-    'throttle' => 'Too many login attempts. Please try again in :seconds seconds.',
+    'throttle' => 'Too many login attempts. Please try again in :minutes minute(s).',
 
 );
diff --git a/resources/lang/am-ET/auth/message.php b/resources/lang/am-ET/auth/message.php
index 588c9069ca..08f638d058 100644
--- a/resources/lang/am-ET/auth/message.php
+++ b/resources/lang/am-ET/auth/message.php
@@ -6,8 +6,6 @@ return array(
     'account_not_found'      => 'The username or password is incorrect.',
     'account_not_activated'  => 'This user account is not activated.',
     'account_suspended'      => 'This user account is suspended.',
-    'account_banned'         => 'This user account is banned.',
-    'throttle'               => 'Too many failed login attempts. Please try again in :minutes minutes.',
 
     'two_factor' => array(
         'already_enrolled'      => 'Your device is already enrolled.',
diff --git a/resources/lang/am-ET/button.php b/resources/lang/am-ET/button.php
index fe6dfe97a1..e154e592a3 100644
--- a/resources/lang/am-ET/button.php
+++ b/resources/lang/am-ET/button.php
@@ -7,6 +7,7 @@ return [
     'checkin_and_delete'  	    => 'Checkin All / Delete User',
     'delete'  	                => 'Delete',
     'edit'    	                => 'Edit',
+    'clone'    	                => 'Clone',
     'restore' 	                => 'Restore',
     'remove'                    => 'Remove',
     'request'                   => 'Request',
@@ -21,4 +22,13 @@ return [
     'add_maintenance'           => 'Add Maintenance',
     'append'                    => 'Append',
     'new'                       => 'New',
+    'var' => [
+        'clone'     => 'Clone :item_type',
+        'edit'      => 'Edit :item_type',
+        'delete'    => 'Delete :item_type',
+        'restore'   => 'Restore :item_type',
+        'create'    => 'Create New :item_type',
+        'checkout'  => 'Checkout :item_type',
+        'checkin'   => 'Checkin :item_type',
+    ]
 ];
diff --git a/resources/lang/am-ET/general.php b/resources/lang/am-ET/general.php
index 5018634195..113a53e687 100644
--- a/resources/lang/am-ET/general.php
+++ b/resources/lang/am-ET/general.php
@@ -10,7 +10,7 @@ return [
     'action'                => 'ተግባር',
     'activity_report'		=> 'የእንቅስቃሴ ዘገባ',
     'address'				=> 'አድራሻ',
-    'admin'					=> 'ተቆጣጣሪ',
+    'admin'					=> 'Admin Settings',
     'admin_tooltip'			=> 'This user has admin privileges',
     'superuser'				=> 'Superuser',
     'superuser_tooltip'		=> 'This user has superuser privileges',
@@ -23,13 +23,16 @@ return [
     'asset_models'			=> 'የንብረት ዓይነቶች',
     'asset_model'			=> 'ሞዴል',
     'asset'					=> 'ንብረት',
+    'asset_previous'        => 'Asset (Previously Assigned)',
     'asset_report'          => 'የንብረት ዘገባ',
     'asset_tag'				=> 'የንብረት መለያ',
     'asset_tags'            => 'የንብረት መለያዎች',
     'assets_available'		=> 'የሚያገለግሉ ንብረቶች',
     'accept_assets'         => 'ገቢ ንብረቶች፥ ስም',
     'accept_assets_menu'    => 'የገቡ ንብረቶች',
+    'accept_item'           => 'Accept Item',
     'audit'				    => 'ቁጥጥር',
+    'audits'				=> 'Audits',
     'audit_report'			=> 'የቁጥጥር መዝገብ',
     'assets'				=> 'ንብረቶች',
     'assets_audited'        => 'የተረጋገጡ ንብረቶች',
@@ -61,9 +64,12 @@ return [
     'changepassword'  		=> 'Change Password',
     'checkin'  				=> 'Checkin',
     'checkin_from'  		=> 'Checkin from',
+    'checkin_note'  		=> 'Checkin Note',
+    'checkout_note'  		=> 'Checkout Note',
     'checkout'  			=> 'Checkout',
     'checkouts_count'       => 'Checkouts',
     'checkins_count'        => 'Checkins',
+    'checkin_and_delete'  	=> 'Checkin and Delete',
     'user_requests_count'   => 'Requests',
     'city'  				=> 'City',
     'click_here'			=> 'Click here',
@@ -77,7 +83,7 @@ return [
     'consumables'			=> 'Consumables',
     'country'  				=> 'Country',
     'could_not_restore'     => 'Error restoring :item_type: :error',
-    'not_deleted'           => 'The :item_type is not deleted so it cannot be restored',
+    'not_deleted'           => 'The :item_type was not deleted and therefore cannot be restored',
     'create'				=> 'Create New',
     'created'               => 'Item Created',
     'created_asset'			=> 'created asset',
@@ -86,11 +92,13 @@ return [
     'record_created' 		=> 'Record Created',
     'updated_at' 			=> 'Updated at',
     'currency'  			=> '$', // this is deprecated
+    'currency_text'  		=> 'Currency', //
     'current'  				=> 'Current',
     'current_password'      => 'Current Password',
     'customize_report'      => 'Customize Report',
     'custom_report'         => 'Custom Asset Report',
     'dashboard'				=> 'Dashboard',
+    'data_source'           => 'Data Source',
     'days'      			=> 'days',
     'days_to_next_audit'    => 'Days to Next Audit',
     'date'					=> 'Date',
@@ -98,7 +106,7 @@ return [
     'debug_warning_text'    => 'This application is running in production mode with debugging enabled. This can expose sensitive data if your application is accessible to the outside world. Disable debug mode by setting the <code>APP_DEBUG</code> value in your <code>.env</code> file to <code>false</code>.',
     'delete'  				=> 'Delete',
     'delete_confirm'  		=> 'Are you sure you wish to delete :item?',
-    'delete_confirm_no_undo' => 'Are you sure you wish to delete :item? This can not be undone.',
+    'delete_confirm_no_undo' => 'Are you sure, you wish to delete :item? This cannot be undone.',
     'deleted'  				=> 'Deleted',
     'delete_seats'  		=> 'Deleted Seats',
     'deletion_failed'       => 'Deletion failed',
@@ -114,29 +122,13 @@ return [
     'editprofile'  			=> 'Edit Your Profile',
     'eol'					=> 'EOL',
     'email_domain'			=> 'Email Domain',
-    'email_format'			=> 'Email Format',
     'employee_number'       => 'Employee Number',
     'email_domain_help'		=> 'This is used to generate email addresses when importing',
     'error'				    => 'Error',
     'exclude_archived'      => 'Exclude Archived Assets',
     'exclude_deleted'       => 'Exclude Deleted Assets',
     'example'				=> 'Example: ',
-    'filastname_format'			=> 'First Initial Last Name (jsmith@example.com)',
-    'firstname_lastname_format'	=> 'First Name Last Name (jane.smith@example.com)',
-    'firstname_lastname_underscore_format' => 'First Name Last Name (jane_smith@example.com)',
-    'lastnamefirstinitial_format' =>  'Last Name First Initial (smithj@example.com)',
-    'firstintial_dot_lastname_format' => 'First Initial Last Name (j.smith@example.com)',
-    'firstname_lastname_display'	=> 'First Name Last Name (Jane Smith)',
-    'lastname_firstname_display'	=> 'Last Name First Name (Smith Jane)',
-    'name_display_format'	=> 'Name Display Format',
-    'first'					=> 'First',
-    'firstnamelastname'     => 'First Name Last Name (janesmith@example.com)',
-    'lastname_firstinitial' => 'Last Name First Initial (smith_j@example.com)',
-    'firstinitial.lastname' => 'First Initial Last Name (j.smith@example.com)',
-    'firstnamelastinitial'  => 'First Name Last Initial (janes@example.com)',
-    'lastnamefirstname'      => 'Last Name First Name (smith.jane@example.com)',
-    'first_name'			=> 'First Name',
-    'first_name_format'		=> 'First Name (jane@example.com)',
+
     'files'                 => 'Files',
     'file_name'				=> 'File',
     'file_type'             => 'File Type',
@@ -151,14 +143,14 @@ return [
     'gravatar_url'          => '<a href="http://gravatar.com"><small>Change your avatar at Gravatar.com</small></a>.',
     'history'  			    => 'History',
     'history_for'  			=> 'History for',
-    'id'  					=> 'ID',
+    'id'  					=> 'መለያ',
     'image'                 => 'Image',
     'image_delete'         	=> 'Delete Image',
     'include_deleted'       => 'Include Deleted Assets',
     'image_upload'         	=> 'Upload Image',
-    'filetypes_accepted_help'    => 'Accepted filetype is :types. Max upload size allowed is :size.|Accepted filetypes are :types. Max upload size allowed is :size.',
-    'filetypes_size_help'   => 'Max upload size allowed is :size.',
-    'image_filetypes_help'  => 'Accepted filetypes are jpg, webp, png, gif, svg, and avif. Max upload size allowed is :size.',
+    'filetypes_accepted_help'    => 'Accepted filetype is :types. The maximum size allowed is :size.|Accepted filetypes are :types. The maximum upload size allowed is :size.',
+    'filetypes_size_help'   => 'The maximum upload size allowed is :size.',
+    'image_filetypes_help'  => 'Accepted Filetypes are jpg, webp, png, gif, svg, and avif. The maximum upload size allowed is :size.',
     'unaccepted_image_type'  => 'This image file was not readable. Accepted filetypes are jpg, webp, png, gif, and svg. The mimetype of this file is: :mimetype.',
     'import'         	    => 'Import',
     'import_this_file'      => 'Map fields and process this file',
@@ -178,12 +170,17 @@ return [
     'last'					=> 'Last',
     'last_login'            => 'Last Login',
     'last_name'             => 'Last Name',
+    'firstname_lastname_display'	=> 'First Name Last Name (Jane Smith)',
+    'lastname_firstname_display'	=> 'Last Name First Name (Smith Jane)',
+    'name_display_format'	=> 'Name Display Format',
+    'first'					=> 'First',
+    'first_name'			=> 'First Name',
     'license'				=> 'License',
     'license_report'        => 'License Report',
     'licenses_available'	=> 'Licenses available',
     'licenses'				=> 'Licenses',
     'list_all'				=> 'List All',
-    'loading'				=> 'Loading... please wait....',
+    'loading'				=> 'Loading... please wait...',
     'lock_passwords'        => 'This field value will not be saved in a demo installation.',
     'feature_disabled'      => 'This feature has been disabled for the demo installation.',
     'location'              => 'Location',
@@ -193,7 +190,7 @@ return [
     'logout'				=> 'Logout',
     'lookup_by_tag'     => 'Lookup by Asset Tag',
     'maintenances'          => 'Maintenances',
-    'manage_api_keys'       => 'Manage API Keys',
+    'manage_api_keys'       => 'Manage API keys',
     'manufacturer'			=> 'Manufacturer',
     'manufacturers'			=> 'Manufacturers',
     'markdown'				=> 'This field allows <a href="https://help.github.com/articles/github-flavored-markdown/">Github flavored markdown</a>.',
@@ -215,6 +212,14 @@ return [
     'no_results'			=> 'No Results.',
     'no'  					=> 'No',
     'notes'  				=> 'Notes',
+    'note_added'            => 'Note Added',
+    'options'				=> 'Options',
+    'preview'				=> 'Preview',
+    'add_note'              => 'Add Note',
+    'note_edited'            => 'Note Edited',
+    'edit_note'              => 'Edit Note',
+    'note_deleted'            => 'Note Deleted',
+    'delete_note'              => 'Delete Note',
     'order_number'          => 'Order Number',
     'only_deleted'          => 'Only Deleted Assets',
     'page_menu'				=> 'Showing _MENU_ items',
@@ -229,7 +234,7 @@ return [
     'purchase_date'         => 'Purchase Date',
     'qty'		            => 'QTY',
     'quantity'		        => 'Quantity',
-    'quantity_minimum'      => 'You have :count items below or almost below minimum quantity levels',
+    'quantity_minimum'      => 'You have one item below or almost below minimum quantity levels|You have :count items below or almost below minimum quantity levels',
     'quickscan_checkin'  	=> 'Quick Scan Checkin',
     'quickscan_checkin_status'  	=> 'Checkin Status',
     'ready_to_deploy'		=> 'Ready to Deploy',
@@ -254,7 +259,7 @@ return [
     'select_all'            => 'Select All',
     'search'				=> 'Search',
     'select_category'       => 'Select a Category',
-    'select_datasource' => 'Select a Datasource',
+    'select_datasource' => 'Select a data source',
     'select_department'     => 'Select a Department',
     'select_depreciation'	=> 'Select a Depreciation Type',
     'select_location'		=> 'Select a Location',
@@ -274,13 +279,15 @@ return [
     'signed_off_by'         => 'Signed Off By',
     'skin'       			=> 'Skin',
     'webhook_msg_note'        => 'A notification will be sent via webhook',
-    'webhook_test_msg'        => 'Oh hai! Looks like your :app integration with Snipe-IT is working!',
+    'webhook_test_msg'        => 'Oh hai! It looks like your :app integration with Snipe-IT is working!',
     'some_features_disabled' => 'DEMO MODE: Some features are disabled for this installation.',
     'site_name'				=> 'Site Name',
     'state'  				=> 'State',
     'status_labels'			=> 'Status Labels',
+    'status_label'			=> 'Status Label',
     'status'    			=> 'Status',
     'accept_eula'           => 'Acceptance Agreement',
+    'show_or_hide_eulas' => 'Show/Hide EULAs',
     'supplier'              => 'Supplier',
     'suppliers'  			=> 'Suppliers',
     'sure_to_delete'        => 'Are you sure you wish to delete',
@@ -296,9 +303,9 @@ return [
     'type'  				=> 'Type',
     'undeployable'			=> 'Un-deployable',
     'unknown_admin'			=> 'Unknown Admin',
-    'username_format'		=> 'Username Format',
     'username'              => 'Username',
     'update'                => 'Update',
+    'updating_item' => 'Updating :item',
     'upload_filetypes_help'      => 'Allowed filetypes are png, gif, jpg, jpeg, doc, docx, pdf, xls, xlsx, txt, lic, xml, zip, rtf and rar. Max upload size allowed is :size.',
     'uploaded'              => 'Uploaded',
     'user'					=> 'User',
@@ -323,10 +330,10 @@ return [
     'token_expired'         => 'Your form session has expired. Please try again.',
     'login_enabled'         => 'Login Enabled',
     'audit_due'             => 'Due for Audit',
-    'audit_due_days'        => 'Assets Due for Audit Within :days Day|Assets Due for Audit Within :days Days',
+    'audit_due_days'        => '{}Assets Due or Overdue for Audit|[1]Assets Due or Overdue for Audit Within a Day|[2,*]Assets Due or Overdue for Audit Within :days Days',
     'checkin_due'           => 'Due for Checkin',
     'checkin_overdue'       => 'Overdue for Checkin',
-    'checkin_due_days'      => 'Assets Due for Checkin Within :days Day|Assets Due for Checkin Within :days Days',
+    'checkin_due_days'      => '{}Due for Checkin|[1]Assets Due for Checkin Within :days Day|[2,*]Assets Due for Checkin Within :days Days',
     'audit_overdue'         => 'Overdue for Audit',
     'accept'                => 'Accept :asset',
     'i_accept'              => 'I accept',
@@ -339,16 +346,16 @@ return [
     'view_all'              => 'view all',
     'hide_deleted'          => 'Hide Deleted',
     'email'                 => 'Email',
-    'do_not_change'         => 'Do Not Change',
-    'bug_report'            => 'Report a Bug',
+    'do_not_change'         => 'Do not change',
+    'bug_report'            => 'Report a bug',
     'user_manual'           => 'User\'s Manual',
     'setup_step_1'          => 'Step 1',
     'setup_step_2'          => 'Step 2',
     'setup_step_3'          => 'Step 3',
     'setup_step_4'          => 'Step 4',
     'setup_config_check'    => 'Configuration Check',
-    'setup_create_database' => 'Create Database Tables',
-    'setup_create_admin'    => 'Create Admin User',
+    'setup_create_database' => 'Create database tables',
+    'setup_create_admin'    => 'Create an admin user',
     'setup_done'            => 'Finished!',
     'bulk_edit_about_to'    => 'You are about to edit the following: ',
     'checked_out'           => 'Checked Out',
@@ -383,6 +390,8 @@ return [
     'new_license'           => 'New License',
     'new_accessory'         => 'New Accessory',
     'new_consumable'        => 'New Consumable',
+    'new_component'         => 'New Component',
+    'new_user'              => 'New User',
     'collapse'              => 'Collapse',
     'assigned'              => 'Assigned',
     'asset_count'           => 'Asset Count',
@@ -418,19 +427,20 @@ return [
     'bulk_soft_delete'      =>'Also soft-delete these users. Their asset history will remain intact unless/until you purge deleted records in the Admin Settings.',
     'bulk_checkin_delete_success' => 'Your selected users have been deleted and their items have been checked in.',
     'bulk_checkin_success' => 'The items for the selected users have been checked in.',
-    'set_to_null'           => 'Delete values for this asset|Delete values for all :asset_count assets ',
+    'set_to_null'           => 'Delete values for this selection|Delete values for all :selection_count selections ',
     'set_users_field_to_null'  => 'Delete :field values for this user|Delete :field values for all :user_count users ',
     'na_no_purchase_date'   => 'N/A - No purchase date provided',
     'assets_by_status'      => 'Assets by Status',
     'assets_by_status_type'      => 'Assets by Status Type',
     'pie_chart_type'        => 'Dashboard Pie Chart Type',
     'hello_name'            => 'Hello, :name!',
-    'unaccepted_profile_warning'   => 'You have :count items requiring acceptance. Click here to accept or decline them',
+    'unaccepted_profile_warning'   => 'You have one item requiring acceptance. Click here to accept or decline it | You have :count items requiring acceptance. Click here to accept or decline them',
     'start_date'            => 'Start Date',
     'end_date'            => 'End Date',
     'alt_uploaded_image_thumbnail' => 'Uploaded thumbnail',
     'placeholder_kit'       => 'Select a kit',
     'file_not_found'        => 'File not found',
+    'log_record_not_found'  => 'No record for that log entry was found.',
     'preview_not_available' => '(no preview)',
     'setup'                 => 'Setup',
     'pre_flight'            => 'Pre-Flight',
@@ -512,7 +522,7 @@ return [
     'checked_out_to_fields' => 'Checked Out To Fields',
     'percent_complete' => '% complete',
     'uploading' => 'Uploading... ',
-    'upload_error' => 'Error uploading file. Please check that there are no empty rows and that no column names are duplicated.',
+    'upload_error' => 'Error uploading file. Please check that you have no empty rows or duplicated column names in your CSV, and that the server permissions allow uploads.',
     'copy_to_clipboard' => 'Copy to Clipboard',
     'copied' => 'Copied!',
     'status_compatibility' => 'If assets are already assigned, they cannot be changed to a non-deployable status type and this value change will be skipped.',
@@ -549,6 +559,71 @@ return [
         'license_seats'  => ':count License Seat|:count License Seats',
         'consumables'  => ':count Consumable|:count Consumables',
         'components'  => ':count Component|:count Components',
-    ]
+    ],
+
+    'more_info' => 'More Info',
+    'quickscan_bulk_help' => 'Checking this box will edit the asset record to reflect this new location. Leaving it unchecked will simply note the location in the audit log. Note that if this asset is checked out, it will not change the location of the person, asset or location it is checked out to.',
+    'whoops' => 'Whoops!',
+    'something_went_wrong' => 'Something went wrong with your request.',
+    'close' => 'Close',
+    'expires' => 'Expires',
+    'map_fields'=> 'Map :item_type Fields',
+    'remaining_var' => ':count Remaining',
+    'label' => 'Label',
+    'import_asset_tag_exists' => 'An asset with the asset tag :asset_tag already exists and an update was not requested. No change was made.',
+    'countries_manually_entered_help' => 'Values with an asterisk (*) were manually entered and do not match existing ISO 3166 dropdown values',
+    'accessories_assigned' => 'Assigned Accessories',
+    'user_managed_passwords' => 'Password Management',
+    'user_managed_passwords_disallow' => 'Disallow users from managing their own passwords',
+    'user_managed_passwords_allow' => 'Allow users to manage their own passwords',
+    'from' => 'From',
+    'by' => 'By',
+
+// Add form placeholders here
+    'placeholders' => [
+        'notes'  => 'Add a note',
+    ],
+
+    'breadcrumb_button_actions' => [
+        'edit_item' => 'Edit :name',
+        'checkout_item' => 'Checkout :name',
+        'checkin_item' => 'Checkin :name',
+    ],
+
+    'skins' => [
+        'site_default' => 'Site Default',
+        'default_blue' => 'Default Blue',
+        'blue_dark' => 'Blue (Dark Mode)',
+        'green' => 'Green Dark',
+        'green_dark' => 'Green (Dark Mode)',
+        'red' => 'Red Dark',
+        'red_dark' => 'Red (Dark Mode)',
+        'orange' => 'Orange Dark',
+        'orange_dark' => 'Orange (Dark Mode)',
+        'black' => 'Black',
+        'black_dark' => 'Black (Dark Mode)',
+        'purple' => 'Purple',
+        'purple_dark' => 'Purple (Dark Mode)',
+        'yellow' => 'Yellow',
+        'yellow_dark' => 'Yellow (Dark Mode)',
+        'high_contrast' => 'High Contrast',
+
+    ],
+
+    'select_all_none' => 'Select/Unselect All',
+    'generic_model_not_found' => 'That :model was not found or you do not have permission to access it',
+    'deleted_models' => 'Deleted Asset Models',
+    'deleted_users' => 'Deleted Users',
+    'cost_each' => ':amount each',
+    'remove_current_image' => 'Remove current :type image',
+
+    'seeding' => [
+        'manufacturers' => [
+            'button' => 'Create Manufacturers',
+            'prompt' => 'You do not have any manufacturers yet. Would you like to seed a list of common manufacturers? (THIS WILL OVERWRITE EXISTING MANUFACTURERS, including those that have been soft-deleted.)',
+            'success' => 'Manufacturers seeded successfully',
+            'error' => 'Could not seed manufacturers. A manufacturer record already exists and seeding would overwrite it.|Could not seed manufacturers. :count manufacturer records already exist and seeding would overwrite them.',
+        ],
+    ],
 
 ];
diff --git a/resources/lang/am-ET/localizations.php b/resources/lang/am-ET/localizations.php
index f1232dd138..827ed4fca1 100644
--- a/resources/lang/am-ET/localizations.php
+++ b/resources/lang/am-ET/localizations.php
@@ -2,7 +2,7 @@
 
 return [
 
-    'select_language' => 'Select a language',
+    'select_language' => 'Select a Language',
     'languages' => [
         'en-US'=> 'English, US',
         'en-GB'=> 'English, UK',
@@ -40,7 +40,9 @@ return [
         'ms-MY'=> 'Malay',
         'mi-NZ'=> 'Maori',
         'mn-MN'=> 'Mongolian',
-        'no-NO'=> 'Norwegian',
+        'nb-NO'=> 'Norwegian Bokmål',
+        'om-ET' => 'Oromo (Ethiopian)',
+        //'nn-NO'=> 'Norwegian Nynorsk',
         'fa-IR'=> 'Persian',
         'pl-PL'=> 'Polish',
         'pt-PT'=> 'Portuguese',
@@ -66,7 +68,7 @@ return [
         'zu-ZA'=> 'Zulu',
     ],
 
-    'select_country' => 'Select a country',
+    'select_country' => 'Select a Country',
     
     'countries' => [
         'AC'=>'Ascension Island',
@@ -133,6 +135,7 @@ return [
         'EC'=>'Ecuador',
         'EE'=>'Estonia',
         'EG'=>'Egypt',
+        'GB-ENG'=>'England',
         'ER'=>'Eritrea',
         'ES'=>'Spain',
         'ET'=>'Ethiopia',
@@ -231,6 +234,7 @@ return [
         'NG'=>'Nigeria',
         'NI'=>'Nicaragua',
         'NL'=>'Netherlands',
+        'GB-NIR' => 'Northern Ireland',
         'NO'=>'Norway',
         'NP'=>'Nepal',
         'NR'=>'Nauru',
@@ -258,7 +262,7 @@ return [
         'RU'=>'Russian Federation',
         'RW'=>'Rwanda',
         'SA'=>'Saudi Arabia',
-        'UK'=>'Scotland',
+        'GB-SCT'=>'Scotland',
         'SB'=>'Solomon Islands',
         'SC'=>'Seychelles',
         'SS'=>'South Sudan',
@@ -310,6 +314,7 @@ return [
         'VI'=>'Virgin Islands (U.S.)',
         'VN'=>'Viet Nam',
         'VU'=>'Vanuatu',
+        'GB-WLS' =>'Wales',
         'WF'=>'Wallis And Futuna Islands',
         'WS'=>'Samoa',
         'YE'=>'Yemen',
diff --git a/resources/lang/am-ET/mail.php b/resources/lang/am-ET/mail.php
index 8d5aa80f61..75a0912608 100644
--- a/resources/lang/am-ET/mail.php
+++ b/resources/lang/am-ET/mail.php
@@ -23,24 +23,25 @@ return [
     'Item_Requested' => 'Item Requested',
     'License_Checkin_Notification' => 'License checked in',
     'License_Checkout_Notification' => 'License checked out',
+    'license_for'   => 'License for',
     'Low_Inventory_Report' => 'Low Inventory Report',
     'a_user_canceled' => 'A user has canceled an item request on the website',
     'a_user_requested' => 'A user has requested an item on the website',
     'acceptance_asset_accepted' => 'A user has accepted an item',
     'acceptance_asset_declined' => 'A user has declined an item',
-    'accessory_name' => 'Accessory Name:',
-    'additional_notes' => 'Additional Notes:',
+    'accessory_name' => 'Accessory Name',
+    'additional_notes' => 'Additional Notes',
     'admin_has_created' => 'An administrator has created an account for you on the :web website.',
-    'asset' => 'ንብረት:',
-    'asset_name' => 'Asset Name:',
+    'asset' => 'ንብረት',
+    'asset_name' => 'Asset Name',
     'asset_requested' => 'Asset requested',
     'asset_tag' => 'የንብረት መለያ',
     'assets_warrantee_alert' => 'There is :count asset with a warranty expiring in the next :threshold days.|There are :count assets with warranties expiring in the next :threshold days.',
     'assigned_to' => 'Assigned To',
     'best_regards' => 'Best regards,',
-    'canceled' => 'Canceled:',
-    'checkin_date' => 'Checkin Date:',
-    'checkout_date' => 'Checkout Date:',
+    'canceled' => 'Canceled',
+    'checkin_date' => 'Checkin Date',
+    'checkout_date' => 'Checkout Date',
     'checkedout_from' => 'Checked out from',
     'checkedin_from'  => 'Checked in from',
     'checked_into' => 'Checked into',
@@ -49,27 +50,30 @@ return [
     'click_to_confirm' => 'Please click on the following link to confirm your :web account:',
     'current_QTY' => 'Current QTY',
     'days' => 'Days',
-    'expecting_checkin_date' => 'Expected Checkin Date:',
+    'expecting_checkin_date' => 'Expected Checkin Date',
     'expires' => 'Expires',
     'hello' => 'Hello',
     'hi' => 'Hi',
     'i_have_read' => 'I have read and agree to the terms of use, and have received this item.',
     'inventory_report' => 'Inventory Report',
-    'item' => 'Item:',
+    'item' => 'Item',
+    'item_checked_reminder' => 'This is a reminder that you currently have :count items checked out to you that you have not accepted or declined. Please click the link below to confirm your decision.',
     'license_expiring_alert' => 'There is :count license expiring in the next :threshold days.|There are :count licenses expiring in the next :threshold days.',
     'link_to_update_password' => 'Please click on the following link to update your :web password:',
-    'login' => 'Login:',
+    'login' => 'Login',
     'login_first_admin' => 'Login to your new Snipe-IT installation using the credentials below:',
     'low_inventory_alert' => 'There is :count item that is below minimum inventory or will soon be low.|There are :count items that are below minimum inventory or will soon be low.',
     'min_QTY' => 'Min QTY',
     'name' => 'Name',
     'new_item_checked' => 'A new item has been checked out under your name, details are below.',
+    'new_item_checked_with_acceptance' => 'A new item has been checked out under your name that requires acceptance, details are below.',
+    'recent_item_checked' => 'An item was recently checked out under your name that requires acceptance, details are below.',
     'notes' => 'Notes',
-    'password' => 'Password:',
+    'password' => 'Password',
     'password_reset' => 'Password Reset',
     'read_the_terms' => 'Please read the terms of use below.',
     'read_the_terms_and_click' => 'Please read the terms of use below, and click on the link at the bottom to confirm that you read and agree to the terms of use, and have received the asset.',
-    'requested' => 'Requested:',
+    'requested' => 'Requested',
     'reset_link' => 'Your Password Reset Link',
     'reset_password' => 'Click here to reset your password:',
     'rights_reserved' => 'All rights reserved.',
@@ -86,8 +90,10 @@ return [
     'upcoming-audits' => 'There is :count asset that is coming up for audit within :threshold days.|There are :count assets that are coming up for audit within :threshold days.',
     'user' => 'User',
     'username' => 'Username',
+    'unaccepted_asset_reminder' => 'Reminder: You have Unaccepted Assets.',
     'welcome' => 'Welcome :name',
     'welcome_to' => 'Welcome to :web!',
     'your_assets' => 'View Your Assets',
     'your_credentials' => 'Your Snipe-IT credentials',
+    'mail_sent' => 'Mail sent successfully!',
 ];
diff --git a/resources/lang/am-ET/validation.php b/resources/lang/am-ET/validation.php
index 05374e23af..99c847f589 100644
--- a/resources/lang/am-ET/validation.php
+++ b/resources/lang/am-ET/validation.php
@@ -13,87 +13,150 @@ return [
     |
     */
 
-    'accepted'             => 'The :attribute must be accepted.',
-    'active_url'           => 'The :attribute is not a valid URL.',
-    'after'                => 'The :attribute must be a date after :date.',
-    'after_or_equal'       => 'The :attribute must be a date after or equal to :date.',
-    'alpha'                => 'The :attribute may only contain letters.',
-    'alpha_dash'           => 'The :attribute may only contain letters, numbers, and dashes.',
-    'alpha_num'            => 'The :attribute may only contain letters and numbers.',
-    'array'                => 'The :attribute must be an array.',
-    'before'               => 'The :attribute must be a date before :date.',
-    'before_or_equal'      => 'The :attribute must be a date before or equal to :date.',
-    'between'              => [
-        'numeric' => 'The :attribute must be between :min - :max.',
-        'file'    => 'The :attribute must be between :min - :max kilobytes.',
-        'string'  => 'The :attribute must be between :min - :max characters.',
-        'array'   => 'The :attribute must have between :min and :max items.',
+    'accepted' => 'The :attribute field must be accepted.',
+    'accepted_if' => 'The :attribute field must be accepted when :other is :value.',
+    'active_url' => 'The :attribute field must be a valid URL.',
+    'after' => 'The :attribute field must be a date after :date.',
+    'after_or_equal' => 'The :attribute field must be a date after or equal to :date.',
+    'alpha' => 'The :attribute field must only contain letters.',
+    'alpha_dash' => 'The :attribute field must only contain letters, numbers, dashes, and underscores.',
+    'alpha_num' => 'The :attribute field must only contain letters and numbers.',
+    'array' => 'The :attribute field must be an array.',
+    'ascii' => 'The :attribute field must only contain single-byte alphanumeric characters and symbols.',
+    'before' => 'The :attribute field must be a date before :date.',
+    'before_or_equal' => 'The :attribute field must be a date before or equal to :date.',
+    'between' => [
+        'array' => 'The :attribute field must have between :min and :max items.',
+        'file' => 'The :attribute field must be between :min and :max kilobytes.',
+        'numeric' => 'The :attribute field must be between :min and :max.',
+        'string' => 'The :attribute field must be between :min and :max characters.',
     ],
-    'boolean'              => 'The :attribute must be true or false.',
-    'confirmed'            => 'The :attribute confirmation does not match.',
-    'date'                 => 'The :attribute is not a valid date.',
-    'date_format'          => 'The :attribute does not match the format :format.',
-    'different'            => 'The :attribute and :other must be different.',
-    'digits'               => 'The :attribute must be :digits digits.',
-    'digits_between'       => 'The :attribute must be between :min and :max digits.',
-    'dimensions'           => 'The :attribute has invalid image dimensions.',
-    'distinct'             => 'The :attribute field has a duplicate value.',
-    'email'                => 'The :attribute format is invalid.',
-    'exists'               => 'The selected :attribute is invalid.',
-    'file'                 => 'The :attribute must be a file.',
-    'filled'               => 'The :attribute field must have a value.',
-    'image'                => 'The :attribute must be an image.',
+    'boolean' => 'The :attribute field must be true or false.',
+    'can' => 'The :attribute field contains an unauthorized value.',
+    'confirmed' => 'The :attribute field confirmation does not match.',
+    'contains' => 'The :attribute field is missing a required value.',
+    'current_password' => 'The password is incorrect.',
+    'date' => 'The :attribute field must be a valid date.',
+    'date_equals' => 'The :attribute field must be a date equal to :date.',
+    'date_format' => 'The :attribute field must match the format :format.',
+    'decimal' => 'The :attribute field must have :decimal decimal places.',
+    'declined' => 'The :attribute field must be declined.',
+    'declined_if' => 'The :attribute field must be declined when :other is :value.',
+    'different' => 'The :attribute field and :other must be different.',
+    'digits' => 'The :attribute field must be :digits digits.',
+    'digits_between' => 'The :attribute field must be between :min and :max digits.',
+    'dimensions' => 'The :attribute field has invalid image dimensions.',
+    'distinct' => 'The :attribute field has a duplicate value.',
+    'doesnt_end_with' => 'The :attribute field must not end with one of the following: :values.',
+    'doesnt_start_with' => 'The :attribute field must not start with one of the following: :values.',
+    'email' => 'The :attribute field must be a valid email address.',
+    'ends_with' => 'The :attribute field must end with one of the following: :values.',
+    'enum' => 'The selected :attribute is invalid.',
+    'exists' => 'The selected :attribute is invalid.',
+    'extensions' => 'The :attribute field must have one of the following extensions: :values.',
+    'file' => 'The :attribute field must be a file.',
+    'filled' => 'The :attribute field must have a value.',
+    'gt' => [
+        'array' => 'The :attribute field must have more than :value items.',
+        'file' => 'The :attribute field must be greater than :value kilobytes.',
+        'numeric' => 'The :attribute field must be greater than :value.',
+        'string' => 'The :attribute field must be greater than :value characters.',
+    ],
+    'gte' => [
+        'array' => 'The :attribute field must have :value items or more.',
+        'file' => 'The :attribute field must be greater than or equal to :value kilobytes.',
+        'numeric' => 'The :attribute field must be greater than or equal to :value.',
+        'string' => 'The :attribute field must be greater than or equal to :value characters.',
+    ],
+    'hex_color' => 'The :attribute field must be a valid hexadecimal color.',
+    'image' => 'The :attribute field must be an image.',
     'import_field_empty'    => 'The value for :fieldname cannot be null.',
-    'in'                   => 'The selected :attribute is invalid.',
-    'in_array'             => 'The :attribute field does not exist in :other.',
-    'integer'              => 'The :attribute must be an integer.',
-    'ip'                   => 'The :attribute must be a valid IP address.',
-    'ipv4'                 => 'The :attribute must be a valid IPv4 address.',
-    'ipv6'                 => 'The :attribute must be a valid IPv6 address.',
-    'is_unique_department' => 'The :attribute must be unique to this Company Location',
-    'json'                 => 'The :attribute must be a valid JSON string.',
-    'max'                  => [
-        'numeric' => 'The :attribute may not be greater than :max.',
-        'file'    => 'The :attribute may not be greater than :max kilobytes.',
-        'string'  => 'The :attribute may not be greater than :max characters.',
-        'array'   => 'The :attribute may not have more than :max items.',
+    'in' => 'The selected :attribute is invalid.',
+    'in_array' => 'The :attribute field must exist in :other.',
+    'integer' => 'The :attribute field must be an integer.',
+    'ip' => 'The :attribute field must be a valid IP address.',
+    'ipv4' => 'The :attribute field must be a valid IPv4 address.',
+    'ipv6' => 'The :attribute field must be a valid IPv6 address.',
+    'json' => 'The :attribute field must be a valid JSON string.',
+    'list' => 'The :attribute field must be a list.',
+    'lowercase' => 'The :attribute field must be lowercase.',
+    'lt' => [
+        'array' => 'The :attribute field must have less than :value items.',
+        'file' => 'The :attribute field must be less than :value kilobytes.',
+        'numeric' => 'The :attribute field must be less than :value.',
+        'string' => 'The :attribute field must be less than :value characters.',
     ],
-    'mimes'                => 'The :attribute must be a file of type: :values.',
-    'mimetypes'            => 'The :attribute must be a file of type: :values.',
-    'min'                  => [
-        'numeric' => 'The :attribute must be at least :min.',
-        'file'    => 'The :attribute must be at least :min kilobytes.',
-        'string'  => 'The :attribute must be at least :min characters.',
-        'array'   => 'The :attribute must have at least :min items.',
+    'lte' => [
+        'array' => 'The :attribute field must not have more than :value items.',
+        'file' => 'The :attribute field must be less than or equal to :value kilobytes.',
+        'numeric' => 'The :attribute field must be less than or equal to :value.',
+        'string' => 'The :attribute field must be less than or equal to :value characters.',
     ],
-    'starts_with'          => 'The :attribute must start with one of the following: :values.',
-    'ends_with'            => 'The :attribute must end with one of the following: :values.',
+    'mac_address' => 'The :attribute field must be a valid MAC address.',
+    'max' => [
+        'array' => 'The :attribute field must not have more than :max items.',
+        'file' => 'The :attribute field must not be greater than :max kilobytes.',
+        'numeric' => 'The :attribute field must not be greater than :max.',
+        'string' => 'The :attribute field must not be greater than :max characters.',
+    ],
+    'max_digits' => 'The :attribute field must not have more than :max digits.',
+    'mimes' => 'The :attribute field must be a file of type: :values.',
+    'mimetypes' => 'The :attribute field must be a file of type: :values.',
+    'min' => [
+        'array' => 'The :attribute field must have at least :min items.',
+        'file' => 'The :attribute field must be at least :min kilobytes.',
+        'numeric' => 'The :attribute field must be at least :min.',
+        'string' => 'The :attribute field must be at least :min characters.',
+    ],
+    'min_digits' => 'The :attribute field must have at least :min digits.',
+    'missing' => 'The :attribute field must be missing.',
+    'missing_if' => 'The :attribute field must be missing when :other is :value.',
+    'missing_unless' => 'The :attribute field must be missing unless :other is :value.',
+    'missing_with' => 'The :attribute field must be missing when :values is present.',
+    'missing_with_all' => 'The :attribute field must be missing when :values are present.',
+    'multiple_of' => 'The :attribute field must be a multiple of :value.',
+    'not_in' => 'The selected :attribute is invalid.',
+    'not_regex' => 'The :attribute field format is invalid.',
+    'numeric' => 'The :attribute field must be a number.',
+    'password' => [
+        'letters' => 'The :attribute field must contain at least one letter.',
+        'mixed' => 'The :attribute field must contain at least one uppercase and one lowercase letter.',
+        'numbers' => 'The :attribute field must contain at least one number.',
+        'symbols' => 'The :attribute field must contain at least one symbol.',
+        'uncompromised' => 'The given :attribute has appeared in a data leak. Please choose a different :attribute.',
+    ],
+    'percent'       => 'The depreciation minimum must be between 0 and 100 when depreciation type is percentage.',
 
-    'not_in'               => 'The selected :attribute is invalid.',
-    'numeric'              => 'The :attribute must be a number.',
-    'present'              => 'The :attribute field must be present.',
-    'valid_regex'          => 'That is not a valid regex. ',
-    'regex'                => 'The :attribute format is invalid.',
-    'required'             => 'The :attribute field is required.',
-    'required_if'          => 'The :attribute field is required when :other is :value.',
-    'required_unless'      => 'The :attribute field is required unless :other is in :values.',
-    'required_with'        => 'The :attribute field is required when :values is present.',
-    'required_with_all'    => 'The :attribute field is required when :values is present.',
-    'required_without'     => 'The :attribute field is required when :values is not present.',
+    'present' => 'The :attribute field must be present.',
+    'present_if' => 'The :attribute field must be present when :other is :value.',
+    'present_unless' => 'The :attribute field must be present unless :other is :value.',
+    'present_with' => 'The :attribute field must be present when :values is present.',
+    'present_with_all' => 'The :attribute field must be present when :values are present.',
+    'prohibited' => 'The :attribute field is prohibited.',
+    'prohibited_if' => 'The :attribute field is prohibited when :other is :value.',
+    'prohibited_unless' => 'The :attribute field is prohibited unless :other is in :values.',
+    'prohibits' => 'The :attribute field prohibits :other from being present.',
+    'regex' => 'The :attribute field format is invalid.',
+    'required' => 'The :attribute field is required.',
+    'required_array_keys' => 'The :attribute field must contain entries for: :values.',
+    'required_if' => 'The :attribute field is required when :other is :value.',
+    'required_if_accepted' => 'The :attribute field is required when :other is accepted.',
+    'required_if_declined' => 'The :attribute field is required when :other is declined.',
+    'required_unless' => 'The :attribute field is required unless :other is in :values.',
+    'required_with' => 'The :attribute field is required when :values is present.',
+    'required_with_all' => 'The :attribute field is required when :values are present.',
+    'required_without' => 'The :attribute field is required when :values is not present.',
     'required_without_all' => 'The :attribute field is required when none of :values are present.',
-    'same'                 => 'The :attribute and :other must match.',
-    'size'                 => [
-        'numeric' => 'The :attribute must be :size.',
-        'file'    => 'The :attribute must be :size kilobytes.',
-        'string'  => 'The :attribute must be :size characters.',
-        'array'   => 'The :attribute must contain :size items.',
+    'same' => 'The :attribute field must match :other.',
+    'size' => [
+        'array' => 'The :attribute field must contain :size items.',
+        'file' => 'The :attribute field must be :size kilobytes.',
+        'numeric' => 'The :attribute field must be :size.',
+        'string' => 'The :attribute field must be :size characters.',
     ],
+    'starts_with' => 'The :attribute field must start with one of the following: :values.',
     'string'               => 'The :attribute must be a string.',
-    'timezone'             => 'The :attribute must be a valid zone.',
     'two_column_unique_undeleted' => 'The :attribute must be unique across :table1 and :table2. ',
-    'unique'               => 'The :attribute has already been taken.',
-    'uploaded'             => 'The :attribute failed to upload.',
-    'url'                  => 'The :attribute format is invalid.',
     'unique_undeleted'     => 'The :attribute must be unique.',
     'non_circular'         => 'The :attribute must not create a circular reference.',
     'not_array'            => ':attribute cannot be an array.',
@@ -102,11 +165,14 @@ return [
     'numbers'              => 'Password must contain at least one number.',
     'case_diff'            => 'Password must use mixed case.',
     'symbols'              => 'Password must contain symbols.',
-    'gte'                  => [
-        'numeric'          => 'Value cannot be negative'
-    ],
-    'checkboxes'           => ':attribute contains invalid options.',
-    'radio_buttons'        => ':attribute is invalid.',
+    'timezone' => 'The :attribute field must be a valid timezone.',
+    'unique' => 'The :attribute has already been taken.',
+    'uploaded' => 'The :attribute failed to upload.',
+    'uppercase' => 'The :attribute field must be uppercase.',
+    'url' => 'The :attribute field must be a valid URL.',
+    'ulid' => 'The :attribute field must be a valid ULID.',
+    'uuid' => 'The :attribute field must be a valid UUID.',
+    'fmcs_location' => 'Full multiple company support and location scoping is enabled in the Admin Settings, and the selected location and selected company are not compatible.',
 
 
     /*
@@ -120,16 +186,22 @@ return [
     |
     */
 
+    'email_array'      => 'One or more email addresses is invalid.',
+    'checkboxes'           => ':attribute contains invalid options.',
+    'radio_buttons'        => ':attribute is invalid.',
+    
     'custom' => [
         'alpha_space' => 'The :attribute field contains a character that is not allowed.',
-        'email_array'      => 'One or more email addresses is invalid.',
+
         'hashed_pass'      => 'Your current password is incorrect',
         'dumbpwd'          => 'That password is too common.',
         'statuslabel_type' => 'You must select a valid status label type',
+        'custom_field_not_found'          => 'This field does not seem to exist, please double check your custom field names.',
+        'custom_field_not_found_on_model' => 'This field seems to exist, but is not available on this Asset Model\'s fieldset.',
 
         // date_format validation with slightly less stupid messages. It duplicates a lot, but it gets the job done :(
-        // We use this because the default error message for date_format is reflects php Y-m-d, which non-PHP
-        // people won't know how to format. 
+        // We use this because the default error message for date_format reflects php Y-m-d, which non-PHP
+        // people won't know how to format.
         'purchase_date.date_format'     => 'The :attribute must be a valid date in YYYY-MM-DD format',
         'last_audit_date.date_format'   =>  'The :attribute must be a valid date in YYYY-MM-DD hh:mm:ss format',
         'expiration_date.date_format'   =>  'The :attribute must be a valid date in YYYY-MM-DD format',
@@ -137,9 +209,15 @@ return [
         'expected_checkin.date_format'  =>  'The :attribute must be a valid date in YYYY-MM-DD format',
         'start_date.date_format'        =>  'The :attribute must be a valid date in YYYY-MM-DD format',
         'end_date.date_format'          =>  'The :attribute must be a valid date in YYYY-MM-DD format',
+        'invalid_value_in_field' => 'Invalid value included in this field',
 
-    ],
+        'ldap_username_field' => [
+            'not_in' =>         '<code>sAMAccountName</code> (mixed case) will likely not work. You should use <code>samaccountname</code> (lowercase) instead.'
+        ],
+        'ldap_auth_filter_query' => ['not_in' => '<code>uid=samaccountname</code> is probably not a valid auth filter. You probably want <code>uid=</code> '],
+        'ldap_filter' => ['regex' => 'This value should probably not be wrapped in parentheses.'],
 
+        ],
     /*
     |--------------------------------------------------------------------------
     | Custom Validation Attributes
@@ -155,8 +233,16 @@ return [
 
     /*
     |--------------------------------------------------------------------------
-    | Generic Validation Messages
+    | Generic Validation Messages - we use these in the jquery validation where we don't have
+    | access to the :attribute
     |--------------------------------------------------------------------------
     */
-    'invalid_value_in_field' => 'Invalid value included in this field',
+
+    'generic' => [
+        'invalid_value_in_field' => 'Invalid value included in this field',
+        'required' => 'This field is required',
+        'email' => 'Please enter a valid email address',
+    ],
+
+
 ];
diff --git a/resources/lang/ar-SA/account/general.php b/resources/lang/ar-SA/account/general.php
index 0be269548b..237dbae990 100644
--- a/resources/lang/ar-SA/account/general.php
+++ b/resources/lang/ar-SA/account/general.php
@@ -2,10 +2,16 @@
 
 return array(
     'personal_api_keys' => 'مفاتيح API الشخصية',
+    'personal_access_token' => 'Personal Access Token',
+    'personal_api_keys_success' => 'Personal API Key :key created sucessfully',
+    'here_is_api_key' => 'Here is your new personal access token. This is the only time it will be shown so do not lose it! You may now use this token to make API requests.',
     'api_key_warning' => 'When generating an API token, be sure to copy it down immediately as they will not be visible to you again.',
     'api_base_url' => 'عنوان URL الأساسي API الخاص بك موجود في:',
     'api_base_url_endpoint' => '/&lt;endpoint&gt;',
     'api_token_expiration_time' => 'تم تعيين رموز API لانتهاء صلاحيتها في:',
     'api_reference' => 'Please check the <a href="https://snipe-it.readme.io/reference" target="_blank">API reference</a> to find specific API endpoints and additional API documentation.',
-    'profile_updated' => 'Account successfully updated',
+    'profile_updated' => 'تم تحديث الحساب بنجاح',
+    'no_tokens' => 'لم تقم بإنشاء أي رموز خاصة للوصول الشخصي.',
+    'enable_sounds' => 'تمكين المؤثرات الصوتية',
+    'enable_confetti' => 'Enable confetti effects',
 );
diff --git a/resources/lang/ar-SA/admin/accessories/message.php b/resources/lang/ar-SA/admin/accessories/message.php
index fa1a252de1..e664d31c67 100644
--- a/resources/lang/ar-SA/admin/accessories/message.php
+++ b/resources/lang/ar-SA/admin/accessories/message.php
@@ -26,7 +26,11 @@ return array(
         'error'   		=> 'لم يتم إخراج الملحق، الرجاء المحاولة مرة أخرى',
         'success' 		=> 'تم إخراج الملحق بنجاح.',
         'unavailable'   => 'الملحق غير متوفر لعملية الدفع. تحقق من الكمية المتاحة',
-        'user_does_not_exist' => 'هذا المستخدم خاطئ، الرجاء المحاولة مرة أخرى.'
+        'user_does_not_exist' => 'هذا المستخدم خاطئ، الرجاء المحاولة مرة أخرى.',
+         'checkout_qty' => array(
+            'lte'  => 'There is currently only one available accessory of this type, and you are trying to check out :checkout_qty. Please adjust the checkout quantity or the total stock of this accessory and try again.|There are :number_currently_remaining total available accessories, and you are trying to check out :checkout_qty. Please adjust the checkout quantity or the total stock of this accessory and try again.',
+            ),
+           
     ),
 
     'checkin' => array(
diff --git a/resources/lang/ar-SA/admin/accessories/table.php b/resources/lang/ar-SA/admin/accessories/table.php
index 203b5f05fd..bbe76686d1 100644
--- a/resources/lang/ar-SA/admin/accessories/table.php
+++ b/resources/lang/ar-SA/admin/accessories/table.php
@@ -6,6 +6,4 @@ return array(
     'id'      					=> 'رقم التعريف',
     'require_acceptance'      	=> 'القبول',
     'title'      				=> 'اسم الملحق',
-
-
 );
diff --git a/resources/lang/ar-SA/admin/components/message.php b/resources/lang/ar-SA/admin/components/message.php
index 9b06c537df..e4d6de48c4 100644
--- a/resources/lang/ar-SA/admin/components/message.php
+++ b/resources/lang/ar-SA/admin/components/message.php
@@ -17,7 +17,8 @@ return array(
     'delete' => array(
         'confirm'   => 'هل أنت متأكد من رغبتك في حذف هذا المكون؟',
         'error'   => 'حدثت مشكلة اثناء عملية حذف المكون. الرجاء المحاولة مرة اُخرى.',
-        'success' => 'تم حذف المكون بنجاح.'
+        'success' => 'تم حذف المكون بنجاح.',
+        'error_qty'   => 'Some components of this type are still checked out. Please check them in and try again.',
     ),
 
      'checkout' => array(
diff --git a/resources/lang/ar-SA/admin/consumables/general.php b/resources/lang/ar-SA/admin/consumables/general.php
index 430cfe89fa..3c29112155 100644
--- a/resources/lang/ar-SA/admin/consumables/general.php
+++ b/resources/lang/ar-SA/admin/consumables/general.php
@@ -8,4 +8,5 @@ return array(
     'remaining' 			            => 'المتبقية',
     'total' 			                => 'المجموع',
     'update'                            => 'تحديث المادة الإستهلاكية',
+    'inventory_warning'                 => 'The inventory of this consumable is below the minimum amount of :min_count',
 );
diff --git a/resources/lang/ar-SA/admin/consumables/message.php b/resources/lang/ar-SA/admin/consumables/message.php
index 58eaa5ff51..3e7a15e57a 100644
--- a/resources/lang/ar-SA/admin/consumables/message.php
+++ b/resources/lang/ar-SA/admin/consumables/message.php
@@ -2,6 +2,7 @@
 
 return array(
 
+    'invalid_category_type' => 'The category must be a consumable category.',
     'does_not_exist' => 'المادة الإستهلاكية غير موجودة.',
 
     'create' => array(
diff --git a/resources/lang/ar-SA/admin/custom_fields/general.php b/resources/lang/ar-SA/admin/custom_fields/general.php
index e9b0dd2cd2..49ab27d69f 100644
--- a/resources/lang/ar-SA/admin/custom_fields/general.php
+++ b/resources/lang/ar-SA/admin/custom_fields/general.php
@@ -35,7 +35,7 @@ return [
     'create_field_title' => 'إنشاء حقل مخصص جديد',
     'value_encrypted'      	        => 'هذا الحقل مشفر في قاعدة البيانات. يمكن قرائته من قبل مدراء النظام فقط',
     'show_in_email'     => 'هل تريد تضمين قيمة هذا الحقل في رسائل البريد الإلكتروني المرسلة إلى المستخدم؟ لا يمكن تضمين الحقول المشفرة في رسائل البريد الإلكتروني',
-    'show_in_email_short'     => 'تضمين في رسائل البريد الإلكتروني.',
+    'show_in_email_short' => 'تضمين في رسائل البريد الإلكتروني',
     'help_text' => 'نص المساعدة',
     'help_text_description' => 'هذا نص اختياري سيظهر أدناه عناصر النموذج أثناء تحرير الأصل لتوفير السياق في الحقل.',
     'about_custom_fields_title' => 'حول الحقول المخصصة',
@@ -57,5 +57,8 @@ return [
     'show_in_requestable_list_short' => 'إظهار في قائمة الأصول القابلة للطلب',
     'show_in_requestable_list' => 'إظهار القيمة في قائمة الأصول القابلة للطلب. لن تظهر الحقول المشفرة',
     'encrypted_options' => 'هذا الحقل مشفّر، لذلك لن تتوفر بعض خيارات العرض.',
+    'display_checkin' => 'Display in checkin forms',
+    'display_checkout' => 'Display in checkout forms',
+    'display_audit' => 'Display in audit forms',
 
 ];
diff --git a/resources/lang/ar-SA/admin/custom_fields/message.php b/resources/lang/ar-SA/admin/custom_fields/message.php
index 9c2709c43e..0cf68b4fef 100644
--- a/resources/lang/ar-SA/admin/custom_fields/message.php
+++ b/resources/lang/ar-SA/admin/custom_fields/message.php
@@ -5,6 +5,7 @@ return array(
     'field' => array(
         'invalid'   => 'هذا الحقل غير موجود.',
         'already_added'   => 'تم إضافة الحقل مسبقا',
+        'none_selected'   => 'No field selected',
 
         'create' => array(
             'error'   => 'لم يتم إنشاء الحقل، الرجاء المحاولة مرة اخرى.',
diff --git a/resources/lang/ar-SA/admin/depreciations/general.php b/resources/lang/ar-SA/admin/depreciations/general.php
index e203d8d300..de1583d8cc 100644
--- a/resources/lang/ar-SA/admin/depreciations/general.php
+++ b/resources/lang/ar-SA/admin/depreciations/general.php
@@ -13,4 +13,8 @@ return [
     'no_depreciations_warning'               => '<strong>Warning: </strong>
                       You do not currently have any depreciations set up.
                       Please set up at least one depreciation to view the depreciation report.',
+    'depreciation_method'                   => 'تقرير الإستهلاك',
+    'linear_depreciation'                   => 'Linear (Default)',
+    'half_1'                                => 'Half-year convention, always applied',
+    'half_2'                                => 'Half-year convention, applied with condition',
 ];
diff --git a/resources/lang/ar-SA/admin/hardware/form.php b/resources/lang/ar-SA/admin/hardware/form.php
index 966aa8b07b..72415bc7a9 100644
--- a/resources/lang/ar-SA/admin/hardware/form.php
+++ b/resources/lang/ar-SA/admin/hardware/form.php
@@ -55,8 +55,11 @@ return [
     'asset_location_update_default' => 'تحديث الموقع الافتراضي فقط',
     'asset_location_update_actual' => 'تحديث الموقع الفعلي فقط',
     'asset_not_deployable' => 'حالة الأصول هذه غير قابلة للنشر. لا يمكن التحقق من هذه الأصول.',
-    'asset_deployable' => 'حالة تلك الأصول قابلة للنشر. هذا الأصل يمكن إخراجه.',
+    'asset_not_deployable_checkin' => 'That asset status is not deployable. Using this status label will checkin the asset.',
+    'asset_deployable' => 'This asset can be checked out.',
     'processing_spinner' => 'معالجة... (قد يستغرق هذا بعض الوقت على ملفات كبيرة)',
+    'processing' => 'Processing... ',
     'optional_infos'  => 'معلومات اختيارية',
-    'order_details'   => 'معلومات ذات صلة'
+    'order_details'   => 'معلومات ذات صلة',
+    'calc_eol'    => 'If nulling the EOL date, use automatic EOL calculation based on the purchase date and EOL rate.',
 ];
diff --git a/resources/lang/ar-SA/admin/hardware/general.php b/resources/lang/ar-SA/admin/hardware/general.php
index e0847a7fad..c4d7ab3e83 100644
--- a/resources/lang/ar-SA/admin/hardware/general.php
+++ b/resources/lang/ar-SA/admin/hardware/general.php
@@ -5,8 +5,8 @@ return [
     'about_assets_text'            => 'الأصول هي العناصر التي يتم تتبعها بواسطة الرقم التسلسلي أو ترميز الأصل. وهي تميل إلى أن تكون ممتلكات ذات قيمة أعلى حيث انه من المهم توثيقها.',
     'archived'  				=> 'مؤرشفة',
     'asset'  					=> 'أصل',
-    'bulk_checkout'             => 'إخراج الأصول',
-    'bulk_checkin'              => 'ادخال الأصل',
+    'bulk_checkout'             => 'اخراج متعدد',
+    'bulk_checkin'              => 'Bulk Checkin',
     'checkin'  					=> 'ادخال الأصل',
     'checkout'  				=> 'اخراج الأصل',
     'clone'  					=> 'استنساخ الأصل',
@@ -27,8 +27,7 @@ return [
     'undeployable_tooltip'  	=> 'هذا الأصل لديه علامة حالة غير قابلة للنشر ولا يمكن التحقق منها في هذا الوقت.',
     'view'  					=> 'عرض الأصل',
     'csv_error' => 'لديك خطأ في ملف CSV الخاص بك:',
-    'import_text' => '<p>Upload a CSV that contains asset history. The assets and users MUST already exist in the system, or they will be skipped. Matching assets for history import happens against the asset tag. We will try to find a matching user based on the user\'s name you provide, and the criteria you select below. If you do not select any criteria below, it will simply try to match on the username format you configured in the <code>Admin &gt; General Settings</code>.</p><p>Fields included in the CSV must match the headers: <strong>Asset Tag, Name, Checkout Date, Checkin Date</strong>. Any additional fields will be ignored. </p><p>Checkin Date: blank or future checkin dates will checkout items to associated user.  Excluding the Checkin Date column will create a checkin date with todays date.</p>
-    ',
+    'import_text' => '<p>Upload a CSV that contains asset history. The assets and users MUST already exist in the system, or they will be skipped. Matching assets for history import happens against the asset tag. We will try to find a matching user based on the user\'s name you provide, and the criteria you select below. If you do not select any criteria below, it will simply try to match on the username format you configured in the <code>Admin &gt; General Settings</code>.</p><p>Fields included in the CSV must match the headers: <strong>Asset Tag, Name, Checkout Date, Checkin Date</strong>. Any additional fields will be ignored. </p><p>Checkin Date: blank or future checkin dates will checkout items to associated user.  Excluding the Checkin Date column will create a checkin date with todays date.</p>    ',
     'csv_import_match_f-l' => 'حاول مطابقة المستخدمين بواسطة <strong>firstname.lastname</strong> (<code>jane.smith</code>)',
     'csv_import_match_initial_last' => 'حاول مطابقة المستخدمين بواسطة <strong>أول اسم عائلة</strong> (<code>jsmith</code>)',
     'csv_import_match_first' => 'حاول مطابقة المستخدمين بواسطة <strong>الاسم الأول</strong> (<code>jane</code>) تنسيق',
diff --git a/resources/lang/ar-SA/admin/hardware/message.php b/resources/lang/ar-SA/admin/hardware/message.php
index cc4a5efdeb..8bef037fee 100644
--- a/resources/lang/ar-SA/admin/hardware/message.php
+++ b/resources/lang/ar-SA/admin/hardware/message.php
@@ -2,18 +2,23 @@
 
 return [
 
-    'undeployable' 		=> '<strong> تحذير: </strong> تم تحديد الحالة لهذا الأصل بانه غير قابل للتوزيع حاليا. إذا تغيرت هذه الحالة، يرجى تحديث حالة الأصل.',
-    'does_not_exist' 	=> 'الأصل غير موجود.',
-    'does_not_exist_var'=> 'Asset with tag :asset_tag not found.',
-    'no_tag' 	        => 'No asset tag provided.',
+    'undeployable' 		 => '<strong>Warning: </strong> This asset has been marked as currently undeployable. If this status has changed, please update the asset status.',
+    'does_not_exist' 	 => 'الأصل غير موجود.',
+    'does_not_exist_var' => 'Asset with tag :asset_tag not found.',
+    'no_tag' 	         => 'No asset tag provided.',
     'does_not_exist_or_not_requestable' => 'ذالك الأصل غير موجود أو غير قابل للطلب.',
-    'assoc_users'	 	=> 'هذا الأصل مخرج حاليا لمستخدم ولا يمكن حذفه. يرجى التحقق من الأصل أولا، ثم حاول الحذف مرة أخرى. ',
+    'assoc_users'	 	 => 'هذا الأصل مخرج حاليا لمستخدم ولا يمكن حذفه. يرجى التحقق من الأصل أولا، ثم حاول الحذف مرة أخرى. ',
     'warning_audit_date_mismatch' 	=> 'This asset\'s next audit date (:next_audit_date) is before the last audit date (:last_audit_date). Please update the next audit date.',
+    'labels_generated'   => 'Labels were successfully generated.',
+    'error_generating_labels' => 'Error while generating labels.',
+    'no_assets_selected' => 'No assets selected.',
 
     'create' => [
         'error'   		=> 'لم يتم إنشاء الأصل، يرجى إعادة المحاولة. :(',
         'success' 		=> 'تم إنشاء الأصل بنجاح. :)',
         'success_linked' => 'تم إنشاء الأصل مع العلامة :tag بنجاح. <strong><a href=":link" style="color: white;">انقر هنا لعرض</a></strong>.',
+        'multi_success_linked' => 'Asset with tag :links was created successfully.|:count assets were created succesfully. :links.',
+        'partial_failure' => 'An asset was unable to be created. Reason: :failures|:count assets were unable to be created. Reasons: :failures',
     ],
 
     'update' => [
@@ -51,20 +56,24 @@ return [
     ],
 
     'import' => [
+        'import_button'         => 'Process Import',
         'error'                 => 'لم يتم استيراد بعض العناصر بشكل صحيح.',
         'errorDetail'           => 'لم يتم استيراد العناصر التالية بسبب الأخطاء.',
         'success'               => 'تم استيراد الملف الخاص بك',
         'file_delete_success'   => 'تم حذف ملفك بنجاح',
         'file_delete_error'      => 'تعذر حذف الملف',
         'file_missing' => 'الملف المحدد مفقود',
+        'file_already_deleted' => 'The file selected was already deleted',
         'header_row_has_malformed_characters' => 'واحدة أو أكثر من السمات في الصف الترويجي تحتوي على أحرف UTF-8 سيئة',
         'content_row_has_malformed_characters' => 'واحدة أو أكثر من السمات في الصف الأول من المحتوى تحتوي على أحرف UTF-8 سيئة',
+        'transliterate_failure' => 'Transliteration from :encoding to UTF-8 failed due to invalid characters in input'
     ],
 
 
     'delete' => [
         'confirm'   	=> 'هل تريد بالتأكيد حذف هذا الأصل؟',
         'error'   		=> 'حدثت مشكلة أثناء حذف هذا الأصل. حاول مرة اخرى.',
+        'assigned_to_error' => '{1}Asset Tag: :asset_tag is currently checked out. Check in this device before deletion.|[2,*]Asset Tags: :asset_tag are currently checked out. Check in these devices before deletion.',
         'nothing_updated'   => 'لم يتم اختيار أي أصول، لذلك لم يتم حذف أي شيء.',
         'success' 		=> 'تم حذف الأصل بنجاح.',
     ],
@@ -77,6 +86,11 @@ return [
         'no_assets_selected' => 'يجب عليك تحديد أصل واحد على الأقل من القائمة',
     ],
 
+    'multi-checkout' => [
+        'error'   => 'Asset was not checked out, please try again|Assets were not checked out, please try again',
+        'success' => 'Asset checked out successfully.|Assets checked out successfully.',
+    ],
+
     'checkin' => [
         'error'   		=> 'لم يتم ادخال الأصل، يرجى إعادة المحاولة',
         'success' 		=> 'تم ادخال الأصل بنجاح.',
@@ -86,9 +100,10 @@ return [
     ],
 
     'requests' => [
-        'error'   		=> 'لم يتم طلب الأصل، يرجى إعادة المحاولة',
-        'success' 		=> 'تم طلب الأصل بنجاح.',
-        'canceled'      => 'تم إلغاء طلب الاخراج بنجاح',
+        'error'   		=> 'Request was not successful, please try again.',
+        'success' 		=> 'Request successfully submitted.',
+        'canceled'      => 'Request successfully canceled.',
+        'cancel'        => 'إلغاء طلب هذا العنصر',
     ],
 
 ];
diff --git a/resources/lang/ar-SA/admin/hardware/table.php b/resources/lang/ar-SA/admin/hardware/table.php
index f2a2c9cdac..ead48e0e09 100644
--- a/resources/lang/ar-SA/admin/hardware/table.php
+++ b/resources/lang/ar-SA/admin/hardware/table.php
@@ -25,7 +25,6 @@ return [
     'image'		    => 'صورة الجهاز',
     'days_without_acceptance' => 'أيام بدون قبول',
     'monthly_depreciation' => 'الإهلاك الشهري',
-    'assigned_to'    => 'تعيين إلى',
     'requesting_user' => 'طلب المستخدم',
     'requested_date' => 'تاريخ الطلب',
     'changed'       => 'تغيرت',
diff --git a/resources/lang/ar-SA/admin/kits/general.php b/resources/lang/ar-SA/admin/kits/general.php
index b8f9bb4bc8..aaa7a73173 100644
--- a/resources/lang/ar-SA/admin/kits/general.php
+++ b/resources/lang/ar-SA/admin/kits/general.php
@@ -49,4 +49,5 @@ return [
     'kit_deleted'                       => 'تم حذف عدة بنجاح',
     'kit_model_updated'                 => 'تم تحديث النموذج بنجاح',
     'kit_model_detached'                => 'تم فصل النموذج بنجاح',
+    'model_already_attached'            => 'يتبين انه النموذج الحالي مرتبط أصلاً مع مجموعة الأدوات',
 ];
diff --git a/resources/lang/ar-SA/admin/licenses/general.php b/resources/lang/ar-SA/admin/licenses/general.php
index 395c9c427d..e83a5c0253 100644
--- a/resources/lang/ar-SA/admin/licenses/general.php
+++ b/resources/lang/ar-SA/admin/licenses/general.php
@@ -14,6 +14,7 @@ return array(
     'info'  					=> 'معلومات الترخيص',
     'license_seats'  			=> 'مقاعد الترخيص',
     'seat'  					=> 'مقعد',
+    'seat_count'  				=> 'Seat :count',
     'seats'  					=> 'مقاعد',
     'software_licenses'  		=> 'تراخيص البرامج',
     'user'  					=> 'مستخدم',
@@ -23,12 +24,12 @@ return array(
         [
             'checkin_all'           => [
                 'button'            => 'ادخل جميع المقاعد',
-                'modal'             => 'سيؤدي هذا إلى التدقيق في مقعد واحد. <unk> سيؤدي هذا الإجراء إلى التحقق من جميع مقاعد الـ :checkedout_seats_count لهذا الترخيص.',
+                'modal'             => 'This action will checkin one seat. | This action will checkin all :checkedout_seats_count seats for this license.',
                 'enabled_tooltip'   => 'تسجيل جميع مقاعد هذا الترخيص من كل من المستخدمين والأصول',
                 'disabled_tooltip'  => 'تم تعطيل هذا لأنه لا توجد مقاعد حاليا',
                 'disabled_tooltip_reassignable'  => 'هذا معطل لأن الترخيص غير قابل لإعادة التعيين',
                 'success'           => 'تم تسجيل الترخيص بنجاح! <unk> تم تسجيل جميع التراخيص بنجاح!',
-                'log_msg'           => 'تحقق عن طريق دفع الترخيص بالجملة في واجهة المستخدم المرخص',
+                'log_msg'           => 'Checked in via bulk license checkin in license GUI',
             ],
 
             'checkout_all'              => [
diff --git a/resources/lang/ar-SA/admin/licenses/message.php b/resources/lang/ar-SA/admin/licenses/message.php
index a2e4458eca..fb92d4821a 100644
--- a/resources/lang/ar-SA/admin/licenses/message.php
+++ b/resources/lang/ar-SA/admin/licenses/message.php
@@ -44,10 +44,13 @@ return array(
         'error'   => 'حدثت مشكلة أثناء اخراج الترخيص. يرجى إعادة المحاولة.',
         'success' => 'تم اخراج الترخيص بنجاح',
         'not_enough_seats' => 'لا توجد مقاعد ترخيص كافية متاحة للدفع',
+        'mismatch' => 'The license seat provided does not match the license',
+        'unavailable' => 'This seat is not available for checkout.',
     ),
 
     'checkin' => array(
         'error'   => 'حدثت مشكلة في التحقق من الترخيص. يرجى إعادة المحاولة.',
+        'not_reassignable' => 'License not reassignable',
         'success' => 'تم ادخال الترخيص بنجاح'
     ),
 
diff --git a/resources/lang/ar-SA/admin/locations/message.php b/resources/lang/ar-SA/admin/locations/message.php
index fa50016626..24451b2ff0 100644
--- a/resources/lang/ar-SA/admin/locations/message.php
+++ b/resources/lang/ar-SA/admin/locations/message.php
@@ -3,11 +3,12 @@
 return array(
 
     'does_not_exist' => 'الموقع غير موجود.',
-    'assoc_users'    => 'This location is not currently deletable because it is the location of record for at least one asset or user, has assets assigned to it, or is the parent location of another location. Please update your models to no longer reference this company and try again. ',
+    'assoc_users'    => 'This location is not currently deletable because it is the location of record for at least one asset or user, has assets assigned to it, or is the parent location of another location. Please update your records to no longer reference this location and try again ',
     'assoc_assets'	 => 'هذا الموقع مرتبط حاليا بمادة عرض واحدة على الأقل ولا يمكن حذفها. يرجى تحديث مواد العرض لم تعد تشير إلى هذا الموقع ثم أعد المحاولة. ',
     'assoc_child_loc'	 => 'هذا الموقع هو حاليا أحد الوالدين لموقع طفل واحد على الأقل ولا يمكن حذفه. يرجى تحديث مواقعك لم تعد تشير إلى هذا الموقع ثم أعد المحاولة.',
     'assigned_assets' => 'الأصول المعينة',
     'current_location' => 'الموقع الحالي',
+    'open_map' => 'Open in :map_provider_icon Maps',
 
 
     'create' => array(
@@ -20,6 +21,11 @@ return array(
         'success' => 'تم تحديث الموقع بنجاح.'
     ),
 
+    'restore' => array(
+        'error'   => 'Location was not restored, please try again',
+        'success' => 'Location restored successfully.'
+    ),
+
     'delete' => array(
         'confirm'   	=> 'هل تريد بالتأكيد حذف هذا الموقع؟',
         'error'   => 'حدثت مشكلة أثناء حذف الموقع. حاول مرة اخرى.',
diff --git a/resources/lang/ar-SA/admin/locations/table.php b/resources/lang/ar-SA/admin/locations/table.php
index c548318a6a..8b1790aab1 100644
--- a/resources/lang/ar-SA/admin/locations/table.php
+++ b/resources/lang/ar-SA/admin/locations/table.php
@@ -39,4 +39,5 @@ return [
     'signed_by_finance_auditor' => 'موقعة من قبل (مراجع الحسابات المالي):',
     'signed_by_location_manager' => 'توقيع بواسطة (مدير الموقع):',
     'signed_by'                 => 'تم توقيعه من قبل:',
+    'clone'  					=> 'Clone Location',
 ];
diff --git a/resources/lang/ar-SA/admin/models/general.php b/resources/lang/ar-SA/admin/models/general.php
index df6fda1a4d..3049def779 100644
--- a/resources/lang/ar-SA/admin/models/general.php
+++ b/resources/lang/ar-SA/admin/models/general.php
@@ -3,7 +3,7 @@
 return array(
     'about_models_title'     => 'حول موديلات الأصول',
     'about_models_text'           => 'موديلات الأصول هي طريقة لتجميع الأصول المتطابقة "MBP 2013", "IPhone 6s", الخ.',
-    'deleted'  					        => 'تم حذف هذا الموديل.',
+    'deleted'  					=> 'تم حذف هذا الموديل.',
     'bulk_delete'               => 'حذف موديلات الاصول بالجملة',
     'bulk_delete_help'               => 'استخدم مربعات الاختيار أدناه لتأكيد حذف موديلات الأصول المحددة. لا يمكن حذف موديلات الأصول التي تحتوي على أصول مرتبطة بها إلى أن يتم ربط الأصول بموديل مختلف.',
     'bulk_delete_warn'          => 'أنت على وشك حذف نموذج واحد للأصول.|أنت على وشك حذف :model_count من نماذج الأصول.',
diff --git a/resources/lang/ar-SA/admin/models/message.php b/resources/lang/ar-SA/admin/models/message.php
index 81dfb39116..043c3a7001 100644
--- a/resources/lang/ar-SA/admin/models/message.php
+++ b/resources/lang/ar-SA/admin/models/message.php
@@ -7,7 +7,7 @@ return array(
     'no_association' => 'تحذير! نموذج الأصول لهذا العنصر غير صالح أو مفقود!',
     'no_association_fix' => 'سيؤدي هذا إلى كسر الأمور بطرق غريبة وفظيعة. قم بتعديل هذا الأصل الآن لربطه بنموذج.',
     'assoc_users'	 => 'هذا الموديل مرتبط حاليا بواحد أو أكثر من الأصول ولا يمكن حذفه. يرجى حذف الأصول، ثم محاولة الحذف مرة أخرى. ',
-
+    'invalid_category_type' => 'This category must be an asset category.',
 
     'create' => array(
         'error'   => 'لم يتم انشاء الموديل، يرجى إعادة المحاولة.',
diff --git a/resources/lang/ar-SA/admin/reports/general.php b/resources/lang/ar-SA/admin/reports/general.php
index c1c1dbad8a..1a24a9a8ce 100644
--- a/resources/lang/ar-SA/admin/reports/general.php
+++ b/resources/lang/ar-SA/admin/reports/general.php
@@ -4,6 +4,7 @@ return [
     'info'   => 'حدد الخيارات التي تريدها لتقرير الأصول الخاصة بك.',
     'deleted_user' => 'المستخدم المحذوف',
     'send_reminder' => 'إرسال تذكير',
+    'cannot_send_reminder' => 'User has been deleted or does not have an email address so cannot receive a reminder',
     'reminder_sent' => 'تم إرسال التذكير',
     'acceptance_deleted' => 'تم حذف طلب القبول',
     'acceptance_request' => 'طلب القبول',
@@ -13,5 +14,10 @@ return [
         'user_state' => 'حالة المستخدم',
         'user_country' => 'بلد المستخدم',
         'user_zip' => 'الرمز البريدي المستخدم'
-    ]
-];
\ No newline at end of file
+    ],
+    'open_saved_template' => 'Open Saved Template',
+    'save_template' =>  'Save Template',
+    'select_a_template' => 'Select a Template',
+    'template_name' => 'Template Name',
+    'update_template' => 'Update Template',
+];
diff --git a/resources/lang/ar-SA/admin/reports/message.php b/resources/lang/ar-SA/admin/reports/message.php
index 9c1a9fc16f..2800bbdf0b 100644
--- a/resources/lang/ar-SA/admin/reports/message.php
+++ b/resources/lang/ar-SA/admin/reports/message.php
@@ -1,5 +1,16 @@
 <?php
 
-return array(
-    'error'   => 'يجب عليك أن تختار اختيار واحد على الأقل.'
-);
+return [
+    'about_templates' => 'About Saved Templates',
+    'saving_templates_description' => 'Select your options, then enter the name of your template in the box above and click the \'Save Template\' button. Use the dropdown to select a previously saved template.',
+    'create'  => [
+        'success' => 'Template saved successfully',
+    ],
+    'update' => [
+        'success' => 'Template updated successfully',
+    ],
+    'delete' => [
+        'success' => 'Template deleted',
+        'no_delete_permission' => 'Template does not exist or you do not have permission to delete it.',
+    ],
+];
diff --git a/resources/lang/ar-SA/admin/settings/general.php b/resources/lang/ar-SA/admin/settings/general.php
index 2fcb8d05ac..7012e7eeef 100644
--- a/resources/lang/ar-SA/admin/settings/general.php
+++ b/resources/lang/ar-SA/admin/settings/general.php
@@ -8,13 +8,13 @@ return [
     'ad_append_domain'          => 'إلحاق اسم domain إلى حقل اسم المستخدم',
     'ad_append_domain_help'     => 'المستخدم غير مطلوب لكتابة "username@domain.local" ، فإنها يمكن أن تكتب فقط "اسم المستخدم".',
     'admin_cc_email'            => 'نسخة اضافية للبريد الإكتروني',
-    'admin_cc_email_help'       => 'إذا كنت ترغب في إرسال نسخة من رسائل البريد الإلكتروني لتسجيل الدخول / الخروج التي يتم إرسالها إلى المستخدمين إلى حساب بريد إلكتروني إضافي، فقم بإدخالها هنا. خلاف ذلك، اترك هذه الخانة فارغة.',
+    'admin_cc_email_help'       => 'Send a copy of checkin/checkout emails to this address.',
     'admin_settings'            => 'إعدادات المدير',
     'is_ad'				        => 'هذا هو ملقم أكتيف ديركتوري',
     'alerts'                	=> 'التنبيهات',
     'alert_title'               => 'تحديث إعدادات الإشعارات',
     'alert_email'				=> 'إرسال تنبيهات إلى',
-    'alert_email_help'    => 'عناوين البريد الإلكتروني أو قوائم التوزيع التي تريد إرسال تنبيهات إليها، مفصولة بفاصلة',
+    'alert_email_help'          => 'عناوين البريد الإلكتروني أو قوائم التوزيع التي تريد إرسال تنبيهات إليها، مفصولة بفاصلة.',
     'alerts_enabled'			=> 'التنبيهان ممكنه',
     'alert_interval'			=> 'انتهاء فترة التنبيهات (بالأيام)',
     'alert_inv_threshold'		=> 'عتبة تنبيه المخزون',
@@ -31,15 +31,18 @@ return [
     'backups'					=> 'النسخ الإحتياطية',
     'backups_help'              => 'إنشاء وتنزيل واستعادة النسخ الاحتياطية ',
     'backups_restoring'         => 'استعادة من النسخة الاحتياطية',
+    'backups_clean' => 'Clean the backed-up database before restore',
+    'backups_clean_helptext' => "This can be useful if you're changing between database versions",
     'backups_upload'            => 'تحميل نسخة احتياطية',
     'backups_path'              => 'يتم تخزين النسخ الاحتياطي على الخادم في <code>:path</code>',
-    'backups_restore_warning'   => 'استخدم زر الاستعادة <small><span class="btn btn-xs btn-warning"><i class="text-white fas fa-retweet" aria-hidden="true"></i></span></small> للاستعادة من نسخة احتياطية سابقة. (هذا لا يعمل حاليا مع وحدة تخزين الملفات S3 أو Docker.<br><br> <strong>الخاص بك قاعدة بيانات :app_name بأكملها وأي ملفات تم تحميلها سيتم استبدالها بالكامل</strong> بما هو موجود في ملف النسخ الاحتياطي.  ',
+    'backups_restore_warning'   => 'Use the restore button <small><span class="btn btn-xs btn-warning"><i class="text-white fas fa-retweet" aria-hidden="true"></i></span></small> to restore from a previous backup. (This does not currently work with S3 file storage or Docker.)<br><br>Your <strong>entire :app_name database and any uploaded files will be completely replaced</strong> by what\'s in the backup file  ',
     'backups_logged_out'         => 'سيتم تسجيل الخروج من جميع المستخدمين الحاليين، بما في ذلك انت، بمجرد اكتمال الاستعادة.',
     'backups_large'             => 'قد تنتهي النسخ الاحتياطية الكبيرة جدا عند محاولة الاستعادة وقد تكون هناك حاجة إلى تشغيلها عبر سطر الأوامر. ',
     'barcode_settings'			=> 'إعدادات الباركود',
     'confirm_purge'			    => 'تأكيد التطهير',
     'confirm_purge_help'		=> 'أدخل النص "DELETE" في المربع أدناه لإزالة السجلات المحذوفة. لا يمكن التراجع عن هذا الإجراء وسيتم حذف كافة العناصر حذف ناعمة والمستخدمين بشكل دائم. (يجب أن تقوم بعمل نسخة احتياطية أولاً، فقط لتكون آمنة.)',
     'custom_css'				=> 'CSS مخصص',
+    'custom_css_placeholder'	=> 'Add your custom CSS',
     'custom_css_help'			=> 'أدخل أي تخصيصات CSS ترغب في استخدامها. لا تقم باضافة &lt;style&gt;&lt;/style&gt;.',
     'custom_forgot_pass_url'	=> 'رابط مخصص لاعادة تعيين كلمة المرور',
     'custom_forgot_pass_url_help'	=> 'يحل هذا محل الرابط الخاص باعادة تعيين كلمة المرور على شاشة تسجيل الدخول، وهو مفيد لتوجيه الأشخاص إلى وظيفة إعادة تعيين كلمة مرور من خلال LDAP الداخلي أو المستضاف. وهذا سوف يعطل وظيفة إعادة تعيين كلمة مرور المحلية.',
@@ -47,34 +50,34 @@ return [
     'dashboard_message_help'	=> 'سيظهر هذا النص على لوحة التحكم لأي شخص لديه صلاحية عرض لوحة التحكم.',
     'default_currency'  		=> 'العملة الافتراضية',
     'default_eula_text'			=> 'اتفاقية ترخيص المستخدم النهائي الافتراضية',
+    'default_eula_text_placeholder' => 'Add your default EULA text',
     'default_language'			=> 'اللغة الافتراضية',
     'default_eula_help_text'	=> 'يمكنك أيضا ربط (اتفاقية ترخيص المستخدم) لاصناف محددة من الاصول.',
     'acceptance_note'           => 'Add a note for your decision (Optional)',
     'display_asset_name'        => 'عرض اسم مادة العرض',
     'display_checkout_date'     => 'عرض تاريخ الخروج',
     'display_eol'               => 'عرض نهاية العمر على شكل جدول',
-    'display_qr'                => 'عرض رموز مربع',
+    'display_qr'                => 'Display 2D barcode',
     'display_alt_barcode'		=> 'عرض 1D الباركود',
-    'email_logo'                => 'شعار البريد الإلكتروني',
     'barcode_type'				=> '2D نوع الباركود',
     'alt_barcode_type'			=> '1D نوع الباركود',
-    'email_logo_size'       => 'الشعارات الشعارات البريد الإلكتروني في البريد الإلكتروني تبدو أفضل. ',
     'enabled'                   => 'تمكين',
     'eula_settings'				=> 'إعدادات اتفاقية ترخيص المستخدم النهائي',
     'eula_markdown'				=> 'تسمح اتفاقية ترخيص المستخدم هذه <a href="https://help.github.com/articles/github-flavored-markdown/">بتطبيق نمط الكتابة من Github</a>.',
+    'empty_row_count'           => 'Field Start Offset (Empty Rows)',
+    'empty_row_count_help'      => 'Fields will begin populating after this many empty rows are skipped at the top of the label.',
     'favicon'                   => 'Favicon',
     'favicon_format'            => 'أنواع الملفات المقبولة هي رمز و png و gif. قد لا تعمل تنسيقات الصور الأخرى في كافة المستعرضات.',
     'favicon_size'          => 'وينبغي أن تكون Favicons صور مربعة ، 16x16 بكسل.',
     'footer_text'               => 'إضافة نص لتذييل الصفحة ',
     'footer_text_help'          => 'سيظهر هذا النص في تذييل الجانب الأيمن. يُسمح باستخدام الروابط باستخدام < href="https://help.github.com/articles/github-flavored-markdown/">eGithub بنكهة markdown</a>. فواصل الأسطر، رؤوس، الصور، الخ قد يؤدي إلى نتائج غير متوقعة.',
+    'footer_text_placeholder'   => 'Optional footer text',
     'general_settings'			=> 'الاعدادات العامة',
-    'general_settings_keywords' => 'دعم الشركة، التوقيع، القبول، تنسيق البريد الإلكتروني، تنسيق اسم المستخدم، الصور، لكل صفحة، صورة مصغرة، إيولا، الجاذبية، التصورات، لوحة التحكم، الخصوصية',
     'general_settings_help'     => 'اتفاقية ترخيص المستخدم الافتراضية والمزيد',
     'generate_backup'			=> 'إنشاء النسخ الاحتياطي',
     'google_workspaces'         => 'مساحات عمل جوجل',
     'header_color'              => 'رأس اللون',
     'info'                      => 'تتيح لك هذه الإعدادات تخصيص بعض جوانب التثبيت.',
-    'label_logo'                => 'شعار التسمية',
     'label_logo_size'           => 'الشعارات المربعة تبدو أفضل - سيتم عرضها في أعلى يمين كل ملصق أصل. ',
     'laravel'                   => 'نسخة لارافيل',
     'ldap'                      => 'LDAP',
@@ -94,7 +97,7 @@ return [
     'ldap_login_sync_help'      => 'هذا يختبر فقط أن LDAP يستطيع المزامنة بشكل صحيح. إذا كان استعلام التوثيق الى LDAP الخاص بك غير صحيح، قد لا يزال المستخدمون غير قادرين على تسجيل الدخول. يجب عليك اولا حفظ اي تغييرات في إعدادات LDAP.',
     'ldap_manager'              => 'مدير LDAP',
     'ldap_server'               => 'خادم لداب',
-    'ldap_server_help'          => 'ينبغي أن يبدأ هذا مع //:ldap (للاتصال غير المشفر او TLS) او //:ldaps (لاتصال SSL)',
+    'ldap_server_help'          => 'This should start with ldap:// (for unencrypted) or ldaps:// (for TLS or SSL)',
     'ldap_server_cert'			=> 'التحقق من صحة شهادة سل لداب',
     'ldap_server_cert_ignore'	=> 'السماح بشهادة سل غير صالحة',
     'ldap_server_cert_help'		=> 'حدد مربع الاختيار هذا إذا كنت تستخدم شهادة سل موقعة ذاتيا وترغب في قبول شهادة سل غير صالحة.',
@@ -108,8 +111,8 @@ return [
     'ldap_pword'                => 'لداب ربط كلمة المرور',
     'ldap_basedn'               => 'قاعدة ربط دن',
     'ldap_filter'               => 'فلتر لداب',
-    'ldap_pw_sync'              => 'مزامنة كلمة مرور لداب',
-    'ldap_pw_sync_help'         => 'ألغ تحديد هذا المربع إذا كنت لا ترغب في الاحتفاظ بكلمات مرور لداب التي تمت مزامنتها مع كلمات المرور المحلية. ويعني تعطيل هذا أن المستخدمين قد لا يتمكنون من تسجيل الدخول إذا تعذر الوصول إلى خادم لداب لسبب ما.',
+    'ldap_pw_sync'              => 'Cache LDAP Passwords',
+    'ldap_pw_sync_help'         => 'Uncheck this box if you do not wish to keep LDAP passwords cached as local hashed passwords. Disabling this means that your users may not be able to login if your LDAP server is unreachable for some reason.',
     'ldap_username_field'       => 'حقل اسم المستخدم',
     'ldap_lname_field'          => 'الكنية',
     'ldap_fname_field'          => 'لداب الاسم الأول',
@@ -117,13 +120,15 @@ return [
     'ldap_version'              => 'إصدار لداب',
     'ldap_active_flag'          => 'لداب العلم النشط',
     'ldap_activated_flag_help'  => 'يتم استخدام هذه القيمة لتحديد ما إذا كان يمكن للمستخدم المزامنة تسجيل الدخول إلى Snipe-IT. <strong>لا يؤثر على القدرة على التحقق من العناصر الداخلة إليها أو الخارجة إليها</strong>، وينبغي أن يكون اسم السمة <strong></strong> داخل AD/LDAP, <strong>ليس القيمة</strong>. <br><br>إذا تم تعيين هذا الحقل إلى اسم حقل غير موجود في AD/LDAP الخاص بك، أو تم تعيين القيمة في حقل AD/LDAP إلى <code>0</code> أو <code>false</code>، <strong>سيتم تعطيل تسجيل الدخول للمستخدم</strong>. إذا تم تعيين القيمة في حقل AD/LDAP إلى <code>1</code> أو <code>true</code> أو <em>أي نص آخر</em> يعني أنه يمكن للمستخدم تسجيل الدخول. عندما يكون الحقل فارغاً في AD ، نحترم سمة <code>userAccountControl</code> ، التي تسمح عادة للمستخدمين غير المعلقين بتسجيل الدخول.',
+    'ldap_invert_active_flag'   => 'LDAP Invert Active Flag',
+    'ldap_invert_active_flag_help'     => 'If enabled: when the value returned by LDAP Active Flag is <code>0</code> or <code>false</code> the user account will be active.',
     'ldap_emp_num'              => 'رقم موظف لداب',
     'ldap_email'                => 'بريد لداب',
     'ldap_test'                 => 'اختبار LDAP',
     'ldap_test_sync'            => 'اختبار مزامنة LDAP',
     'license'                   => 'ترخيص البرنامج',
-    'load_remote'               => 'استخدام Gravatar',
-    'load_remote_help_text'		=> 'قم بإلغاء تحديد هذا المربع إذا لم يتمكن التثبيت الخاص بك من تحميل البرامج النصية من الإنترنت الخارجي. وهذا سيمنع Snipe-IT من محاولة تحميل الصور من Gravatar.',
+    'load_remote'               => 'Load Remote Avatars',
+    'load_remote_help_text'		=> 'Uncheck this box if your install cannot load scripts from the outside internet. This will prevent Snipe-IT from trying load avatars from Gravatar or other outside sources.',
     'login'                     => 'محاولات تسجيل الدخول',
     'login_attempt'             => 'محاولة تسجيل الدخول',
     'login_ip'                  => 'عنوان IP',
@@ -131,6 +136,7 @@ return [
     'login_user_agent'          => 'وكيل المستخدم',
     'login_help'                => 'قائمة محاولات تسجيل الدخول',
     'login_note'                => 'تسجيل الدخول ملاحظة',
+    'login_note_placeholder'            => "If you do not have a login or have found a device belonging to this company, please call technical support at 888-555-1212. Thank you.",
     'login_note_help'           => 'اختيارياً تضمين بعض الجمل على شاشة تسجيل الدخول الخاصة بك، على سبيل المثال لمساعدة الناس الذين وجدوا أحد الأجهزة المفقودة أو المسروقة. يقبل هذا الحقل <a href="https://help.github.com/articles/github-flavored-markdown/">بتطبيق نمط الكتابة من Github</a>',
     'login_remote_user_text'    => 'خيارات تسجيل دخول المستخدم عن بعد',
     'login_remote_user_enabled_text' => 'تمكين تسجيل الدخول باستخدام الخانة الرئيسية للمستخدم عن بعد',
@@ -146,13 +152,16 @@ return [
     'logo_print_assets_help'    => 'استخدم العلامة التجارية في قوائم الأصول القابلة للطباعة ',
     'full_multiple_companies_support_help_text' => 'تقييد المستخدمين (بما في ذلك المشرفون) المعينون للشركات إلى أصول شركاتهم.',
     'full_multiple_companies_support_text' => 'كامل دعم الشركات المتعددة',
+    'scope_locations_fmcs_support_text'  => 'Scope Locations with Full Multiple Companies Support',
+    'scope_locations_fmcs_support_help_text'  => 'Restrict locations to their selected company.',
+    'scope_locations_fmcs_check_button' => 'Check Compatibility',
+    'scope_locations_fmcs_support_disabled_text'  => 'This option is disabled because you have conflicting locations set for :count or more items.',
     'show_in_model_list'   => 'إظهار في القوائم المنسدلة للنماذج',
     'optional'					=> 'اختياري',
     'per_page'                  => 'النتائج لكل صفحة',
     'php'                       => 'نسخة فب',
-    'php_info'                  => 'PHP Info',
+    'php_info'                  => 'PHP info',
     'php_overview'              => 'PHP',
-    'php_overview_keywords'     => 'phpinfo, النظام, معلومات',
     'php_overview_help'         => 'معلومات نظام PHP',
     'php_gd_info'               => 'يجب تثبيت فب-غ لعرض رموز قر، راجع تعليمات التثبيت.',
     'php_gd_warning'            => 'لم يتم تثبيت فب معالجة الصور و غ المساعد.',
@@ -218,6 +227,8 @@ return [
     'webhook_integration_help'    => 'تكامل :app اختياري، ولكن نقطة النهاية والقناة مطلوبة إذا كنت ترغب في استخدامها. لتكوين تكامل :app، يجب عليك أولاً <a href=":webhook_link" target="_new" rel="noopener">إنشاء webhook</a> على حساب :app الخاص بك. انقر على زر <strong>اختبار تكامل :app</strong> لتأكيد أن إعداداتك صحيحة قبل الحفظ. ',
     'webhook_integration_help_button'    => 'بمجرد حفظ معلومات :app الخاصة بك، سيظهر زر الاختبار.',
     'webhook_test_help'           => 'اختبر ما إذا كان تكامل :app الخاص بك قد تم تكوينه بشكل صحيح. لقد قمت بتحديث :app إعدادات التحديثات.',
+    'shortcuts_enabled'         => 'Enable Shortcuts',
+    'shortcuts_help_text'       => '<strong>Windows</strong>: Alt + Access key, <strong>Mac</strong>: Control + Option + Access key',
     'snipe_version'  			=> 'قنص-إيت الإصدار',
     'support_footer'            => 'دعم روابط تذييل الصفحة ',
     'support_footer_help'       => 'تحديد من يرى الروابط إلى دليل معلومات الدعم للمستخدمين عن طريق القناصة',
@@ -227,7 +238,6 @@ return [
     'update'                    => 'إعدادات التحديث',
     'value'                     => 'القيمة',
     'brand'                     => 'العلامات التجارية',
-    'brand_keywords'            => 'قدم, الشعار, الطباعة, الموضوع, الجلد , الرأس , الألوان , الألوان',
     'brand_help'                => 'الشعار ، اسم الموقع',
     'web_brand'                 => 'نوع العلامات التجارية للويب',
     'about_settings_title'      => 'حول الإعدادات',
@@ -276,6 +286,8 @@ return [
     'two_factor_enrollment_text'	=> "التوثيق ذو العاملين 2FA اجباري، ولكن لم يتم تسجيل جهازك بعد. افتح تطبيق غوغل للتوثيق Google Authenticator وافحص رمز الاستجابة السريعة QR أدناه لتسجيل جهازك. بعد تسجيل جهازك، أدخل الرمز أدناه",
     'require_accept_signature'      => 'يتطلب التوقيع',
     'require_accept_signature_help_text'      => 'سيتطلب تمكين هذه الميزة من المستخدمين تسجيل الدخول فعليا عند قبول مادة العرض.',
+    'require_checkinout_notes'  => 'Require Notes on Checkin/Checkout',
+    'require_checkinout_notes_help_text'    => 'Enabling this feature will require the note fields to be populated when checking in or checking out an asset.',
     'left'        => 'اليسار',
     'right'        => 'حق',
     'top'        => 'أعلى',
@@ -313,24 +325,24 @@ return [
     'filter_by_keyword' => 'تصفية عن طريق إعداد الكلمة المفتاحية',
     'security' => 'أمان',
     'security_title' => 'تحديث إعدادات الأمان',
-    'security_keywords' => 'كلمة المرور، كلمة المرور، كلمات المرور، المتطلبات، عاملان، كلمات المرور الشائعة، تسجيل الدخول، المصادقة',
     'security_help' => 'عاملين، قيود كلمة المرور',
-    'groups_keywords' => 'الأذونات، مجموعات الأذونات، تفويض',
     'groups_help' => 'مجموعات إذن الحساب',
     'localization' => 'التعريب',
     'localization_title' => 'تحديث إعدادات التعريب',
-    'localization_keywords' => 'التعميم، العملة، المحلية المحلية، المحلية والمنطقة الزمنية، المنطقة الزمنية، الدولية، الاستيعاب، اللغة، الترجمة',
     'localization_help' => 'اللغة، عرض التاريخ',
     'notifications' => 'الإشعارات',
     'notifications_help' => 'إعدادات تنبيهات ومراجعة حسابات البريد الإلكتروني',
     'asset_tags_help' => 'زيادة والبادئات',
     'labels' => 'التسميات',
     'labels_title' => 'تحديث إعدادات التسمية',
-    'labels_help' => 'أحجام التسمية &amp; الإعدادات',
-    'purge_keywords' => 'حذف نهائيًا',
+    'labels_help' => 'Barcodes &amp; label settings',
     'purge_help' => 'تطهير السجلات المحذوفة',
     'ldap_extension_warning' => 'لا يبدو أن ملحق LDAP مثبت أو مفعّل على هذا الخادم. لا يزال بإمكانك حفظ الإعدادات الخاصة بك، ولكن ستحتاج إلى تمكين ملحق LDAP لـ PHP قبل أن تعمل مزامنة LDAP أو تسجيل الدخول.',
     'ldap_ad' => 'LDAP/AD',
+    'ldap_test_label' => 'Test LDAP Sync',
+    'ldap_test_login' => ' Test LDAP Login',
+    'ldap_username_placeholder' => 'LDAP Username',
+    'ldap_password_placeholder' => 'LDAP Password',
     'employee_number' => 'رقم الموظف',
     'create_admin_user' => 'إنشاء مستخدم ::',
     'create_admin_success' => 'نجاح! تم إضافة مستخدم المشرف الخاص بك!',
@@ -342,6 +354,8 @@ return [
     'setup_migration_create_user' => 'التالي: إنشاء مستخدم',
     'ldap_settings_link' => 'صفحة إعدادات LDAP',
     'slack_test' => 'اختبار التكامل <i class="fab fa-slack"></i>',
+    'status_label_name' => 'Status Label Name',
+    'super_admin_only'  => 'Super Admin Only',
     'label2_enable'           => 'محرك تسمية جديد',
     'label2_enable_help'      => 'Switch to the new label engine. <b>Note: You will need to save this setting before setting others.</b>',
     'label2_template'         => 'قالب',
@@ -356,12 +370,15 @@ return [
     'label2_2d_type'          => '2D نوع الباركود',
     'label2_2d_type_help'     => 'تنسيق الباركود ثنائية الأبعاد',
     'label2_2d_target'        => 'هدف الباركود 2D',
-    'label2_2d_target_help'   => 'عنوان URL الباركود 2D يشير إلى عندما يتم مسحه',
+    'label2_2d_target_help'   => 'The data that will be contained in the 2D barcode',
     'label2_fields'           => 'تعاريف الحقل',
     'label2_fields_help'      => 'يمكن إضافة الحقول وإزالتها وإعادة ترتيبها في العمود الأيسر. لكل حقل ، يمكن إضافة خيارات متعددة للتسمية و DataSource ، وإزالتها وإعادة ترتيبها في العمود الأيمن.',
+    'purge_barcodes' => 'Purge Barcodes',
     'help_asterisk_bold'    => 'النص الذي تم إدخاله كـ <code>**text**</code> سيتم عرضه بالخط العريض',
     'help_blank_to_use'     => 'اتركه فارغاً لاستخدام القيمة من <code>:setting_name</code>',
     'help_default_will_use' => '<code>:default</code> will use the value from <code>:setting_name</code>. <br>Note that the value of the barcodes must comply with the respective barcode spec in order to be successfully generated. Please see <a href="https://snipe-it.readme.io/docs/barcodes">the documentation <i class="fa fa-external-link"></i></a> for more details. ',
+    'asset_id'              => 'Asset ID',
+    'data'               => 'Data',
     'default'               => 'الافتراضي',
     'none'                  => 'لا',
     'google_callback_help' => 'يجب إدخال هذا كعنوان URL لرد الاتصال في إعدادات تطبيق Google OAuth في مؤسستك&apos;s <strong><a href="https://console.cloud.google.com/" target="_blank">Google developer <i class="fa fa-external-link" aria-hidden="true"></i></a></strong>.',
@@ -373,7 +390,100 @@ return [
     'database_driver' => 'سائق قاعدة البيانات',
     'bs_table_storage' => 'تخزين الجدول',
     'timezone' => 'Timezone',
+    'test_mail' => 'Test Mail',
     'profile_edit'          => 'Edit Profile',
     'profile_edit_help'          => 'Allow users to edit their own profiles.',
+    'default_avatar' => 'Custom Default Avatar',
+    'default_avatar_help' => 'This image will be displayed as a profile if a user does not have a profile photo.',
+    'restore_default_avatar' => 'Restore <a href=":default_avatar" data-toggle="lightbox" data-type="image">original system default avatar</a>',
+    'restore_default_avatar_help' => '',
+    'due_checkin_days' => 'Due For Checkin Warning',
+    'due_checkin_days_help' => 'How many days before the expected checkin of an asset should it be listed in the "Due for checkin" page?',
+    'no_groups' => 'No groups have been created yet. Visit <code>Admin Settings > Permission Groups</code> to add one.',
+    'text' => 'Text',
+
+    'username_formats' => [
+        'username_format'		=> 'تنسيق اسم المستخدم',
+        'firstname_lastname_format'	=> 'الاسم الأول الاسم الأخير (jane.smith)',
+        'first_name_format'	        => 'First Name (jane)',
+        'last_name_format'		=> 'Last Name (doe)',
+        'filastname_format'			=> 'First Initial Last Name (jsmith)',
+        'lastnamefirstinitial_format' =>  'Last Name First Initial (smithj)',
+        'firstname_lastname_underscore_format' => 'First Name Last Name (jane_smith)',
+        'firstinitial.lastname' => 'First Initial Last Name (j.smith)',
+        'lastname_firstinitial' => 'Last Name First Initial (smith_j)',
+        'lastname_dot_firstinitial_format' => 'Last Name First Initial (smith.j)',
+        'firstnamelastname'     => 'First Name Last Name (janesmith)',
+        'firstnamelastinitial'  => 'First Name Last Initial (janes)',
+        'lastnamefirstname'      => 'الاسم الأخير (smith.jane)',
+    ],
+
+    'email_formats' => [
+        'email_format'			=> 'تنسيق البريد الإلكتروني',
+        'firstname_lastname_format'	=> 'الاسم الأول الاسم الأخير (jane.smith@example.com)',
+        'first_name_format'		=> 'الاسم الأول (jane@example.com)',
+        'last_name_format'		=> 'Last Name (doe@example.com)',
+        'filastname_format'			=> 'الاسم الأخير الأول (jsmith@example.com)',
+        'lastnamefirstinitial_format' =>  'اللقب والحرف الاول من الاسم (smithj@example.com)',
+        'firstname_lastname_underscore_format' => 'الاسم الأول الاسم الأخير (jane_smith@example.com)',
+        'firstinitial.lastname' => 'حرف الاول من الاسم اول و الاسم الاخير (j.smith@example.com)',
+        'lastname_firstinitial' => 'اللقب والحرف الاول من الاسم (smithj@example.com)',
+        'lastname_dot_firstinitial_format' => 'Last Name First Initial (smith.j@example.com)',
+        'firstnamelastname'     => 'الاسم الأول الاسم الأخير (jane.smith@example.com)',
+        'firstnamelastinitial'  => 'الاسم الأول حرف الأخير من الاسم الأخير (janes@example.com)',
+        'lastnamefirstname'      => 'الاسم الأخير (smith.jane@example.com)',
+    ],
+
+
+
+    'logo_labels' => [
+        'acceptance_pdf_logo'       => 'PDF Logo',
+        'email_logo'                => 'شعار البريد الإلكتروني',
+        'label_logo'                => 'شعار التسمية',
+        'logo'                      => 'Site Logo',
+        'favicon'                   => 'Favicon',
+    ],
+
+    'logo_help' => [
+        'email_logo_size'       => 'الشعارات الشعارات البريد الإلكتروني في البريد الإلكتروني تبدو أفضل. ',
+    ],
+
+    'logo_option_types' => [
+        'text' => 'Text',
+        'logo' => 'شعار',
+        'logo_and_text' => 'Logo and Text',
+    ],
+
+
+    'legends' => [
+        'scoping' => 'Scoping',
+        'formats' => 'Default Formats',
+        'profiles' => 'User Profiles',
+        'eula' => 'EULA & Acceptance Preferences',
+        'misc_display' => 'Miscellaneous Display Options',
+        'email' => 'Email Preferences',
+        'checkin' => 'Checkin Preferences',
+        'dashboard' => 'Login & Dashboard Preferences',
+        'misc' => 'Miscellaneous',
+        'logos' => 'Logos & Display',
+        'colors' => 'Colors & Skins',
+        'footer' => 'Footer Preferences',
+        'security' => 'Security Preferences',
+        'general' => 'General',
+        'intervals' => 'Intervals & Thresholds',
+    ],
+
+
+    /* Keywords for settings overview help */
+    'keywords' => [
+        'brand'             => 'قدم, الشعار, الطباعة, الموضوع, الجلد , الرأس , الألوان , الألوان',
+        'general_settings'  => 'دعم الشركة، التوقيع، القبول، تنسيق البريد الإلكتروني، تنسيق اسم المستخدم، الصور، لكل صفحة، صورة مصغرة، إيولا، الجاذبية، التصورات، لوحة التحكم، الخصوصية',
+        'groups'            => 'الأذونات، مجموعات الأذونات، تفويض',
+        'labels'            => 'labels, barcodes, barcode, sheets, print, upc, qr, 1d, 2d',
+        'localization'      => 'التعميم، العملة، المحلية المحلية، المحلية والمنطقة الزمنية، المنطقة الزمنية، الدولية، الاستيعاب، اللغة، الترجمة',
+        'php_overview'      => 'phpinfo, النظام, معلومات',
+        'purge'             => 'حذف نهائيًا',
+        'security'          => 'كلمة المرور، كلمة المرور، كلمات المرور، المتطلبات، عاملان، كلمات المرور الشائعة، تسجيل الدخول، المصادقة',
+    ],
 
 ];
diff --git a/resources/lang/ar-SA/admin/settings/message.php b/resources/lang/ar-SA/admin/settings/message.php
index 01bc5ec70a..6ed857e4c2 100644
--- a/resources/lang/ar-SA/admin/settings/message.php
+++ b/resources/lang/ar-SA/admin/settings/message.php
@@ -14,6 +14,9 @@ return [
         'restore_warning'       => 'نعم، استعادة. أقر بأن هذا سوف يستبدل أي بيانات موجودة حاليا في قاعدة البيانات. سيؤدي هذا أيضا إلى تسجيل جميع المستخدمين الحاليين (بما في ذلك أنت).',
         'restore_confirm'       => 'هل أنت متأكد من رغبتك في استعادة قاعدة البيانات الخاصة بك من :filename؟'
     ],
+    'restore' => [
+        'success'               => 'Your system backup has been restored. Please log in again.'
+    ],
     'purge' => [
         'error'     => 'حدث خطأ أثناء التطهير.',
         'validation_failed'     => 'تأكيد التطهير غير صحيح. الرجاء كتابة الكلمة "ديليت" في مربع التأكيد.',
@@ -33,6 +36,9 @@ return [
         'testing_authentication' => 'اختبار مصادقة LDAP...',
         'authentication_success' => 'تمت المصادقة على المستخدم ضد LDAP بنجاح!'
     ],
+    'labels' => [
+        'null_template' => 'Label template not found. Please select a template.',
+        ],
     'webhook' => [
         'sending' => 'إرسال رسالة اختبار :app ...',
         'success' => 'يعمل تكامل :webhook_name الخاص بك!',
@@ -42,5 +48,12 @@ return [
         'error' => 'حدث خطأ ما. استجاب :app :error_message',
         'error_redirect' => 'خطأ: 301/302 :endpoint يرجع إعادة توجيه. لأسباب أمنية، نحن لا نتابع إعادة التوجيه. الرجاء استخدام نقطة النهاية الفعلية.',
         'error_misc' => 'حدث خطأ ما. :( ',
-    ]
+        'webhook_fail' => ' webhook notification failed: Check to make sure the URL is still valid.',
+        'webhook_channel_not_found' => ' webhook channel not found.',
+        'ms_teams_deprecation' => 'The selected Microsoft Teams webhook URL will be deprecated Dec 31st, 2025. Please use a workflow URL. Microsoft\'s documentation on creating a workflow can be found <a href="https://support.microsoft.com/en-us/office/create-incoming-webhooks-with-workflows-for-microsoft-teams-8ae491c7-0394-4861-ba59-055e33f75498" target="_blank"> here.</a>',
+    ],
+    'location_scoping' => [
+        'not_saved' => 'Your settings were not saved.',
+        'mismatch' => 'There is 1 item in the database that need your attention before you can enable location scoping.|There are :count items in the database that need your attention before you can enable location scoping.',
+    ],
 ];
diff --git a/resources/lang/ar-SA/admin/statuslabels/table.php b/resources/lang/ar-SA/admin/statuslabels/table.php
index 5435406090..cd63d12b92 100644
--- a/resources/lang/ar-SA/admin/statuslabels/table.php
+++ b/resources/lang/ar-SA/admin/statuslabels/table.php
@@ -1,14 +1,14 @@
 <?php
 
 return array(
-    'about'      	=> 'حول تسميات الحالة',
+    'about'      	=> 'About Status Types',
     'archived'      	=> 'مؤرشف',
     'create'      	=> 'إنشاء تسمية الحالة',
     'color'      	=> 'لون الرسم البياني',
     'default_label' => 'الوسم الافتراضي',
     'default_label_help' => 'يستخدم هذا للتأكد من أن تسميات الحالة الأكثر استخداما تظهر في الجزء العلوي من المربع المحدد عند إنشاء/تحرير الأصول.',
     'deployable'      	=> 'قابل للتوزيع',
-    'info'      	=> 'يتم استخدام تسميات الحالة لوصف الحالات المحتملة للأصول التابعة لك. قد تكون قيد الصيانة أو ضمن المفقودة أو المسروقة، وما إلى ذلك. يمكنك إنشاء تسميات حالة جديدة للأصول القابلة للتوزيع وقيد الانتظار والمؤرشفة.',
+    'info'      	=> 'Status label types are used to describe the various states your assets could be in. They may be out for repair, lost/stolen, etc. You can create new status labels for your deployable, pending and archived assets according to your own workflow. For more information, <a href="https://snipe-it.readme.io/docs/overview#status-labels" target="_blank">see the documentation <i class="fa fa-external-link"></i></a>.',
     'name'      	=> 'اسم الحالة',
     'pending'      	=> 'قيد الانتظار',
     'status_type'   => 'نوع الحالة',
diff --git a/resources/lang/ar-SA/admin/users/general.php b/resources/lang/ar-SA/admin/users/general.php
index c7bbdcfa50..a32334bce8 100644
--- a/resources/lang/ar-SA/admin/users/general.php
+++ b/resources/lang/ar-SA/admin/users/general.php
@@ -19,6 +19,8 @@ return [
     'print_assigned'    => 'طباعة كل الممتلكات',
     'email_assigned'    => 'قائمة البريد اﻹلكتروني لكل المعينين',
     'user_notified'     => 'تم إرسال قائمة بالعناصر المعينة حاليا إلى المستخدم بالبريد الإلكتروني.',
+    'users_notified'    => 'The user has been emailed a list of their currently assigned items.|:count users have been emailed a list of their currently assigned items.',
+    'users_notified_warning' => ':count user has been emailed a list of their currently assigned items, however :no_email users did not have an email address so could not be emailed.|:count users have been emailed a list of their currently assigned items, however :no_email user(s) did not have an email address so could not be emailed.',
     'auto_assign_label' => 'تضمين هذا المستخدم عند التعيين التلقائي للتراخيص المؤهلة',
     'auto_assign_help'  => 'تخطي هذا المستخدم في التعيين التلقائي للترخيص',
     'software_user'     => 'البرامج المخرجة الى: :name',
diff --git a/resources/lang/ar-SA/admin/users/message.php b/resources/lang/ar-SA/admin/users/message.php
index 9b5a279d48..be17cff4fb 100644
--- a/resources/lang/ar-SA/admin/users/message.php
+++ b/resources/lang/ar-SA/admin/users/message.php
@@ -6,7 +6,7 @@ return array(
     'declined'                  => 'لقد رفضت هذا الأصل بنجاح.',
     'bulk_manager_warn'	        => 'تم تحديث المستخدمين بنجاح، ولكن لم يتم حفظ إدخال مديرك لأن المدير الذي حددته كان أيضا في قائمة المستخدمين التي سيتم تعديلها، وقد لا يكون المستخدمون مديرهم الخاص. يرجى تحديد المستخدمين مرة أخرى، باستثناء المدير.',
     'user_exists'               => 'المستخدم موجود مسبقاً!',
-    'user_not_found'            => 'المستخدم غير موجود.',
+    'user_not_found'            => 'User does not exist or you do not have permission view them.',
     'user_login_required'       => 'حقل تسجيل الدخول اجباري',
     'user_has_no_assets_assigned' => 'لا توجد أصول مخصصة حاليا للمستخدم.',
     'user_password_required'    => 'كلمة المرور اجبارية.',
@@ -53,6 +53,7 @@ return array(
         'ldap_could_not_search' => 'تعذر البحث في خادم LDAP. الرجاء التحقق من الاعدادات الخاصة بخادم LDAP في ملف اعدادات LDAP. <br>الخطأ من خادم LDAP:',
         'ldap_could_not_get_entries' => 'تعذر الحصول على إدخالات من خادم LDAP. الرجاء التحقق من الاعدادات الخاصة بخادم LDAP في ملف اعدادات LDAP. <br>الخطأ من خادم LDAP:',
         'password_ldap' => 'تتم إدارة كلمة المرور لهذا الحساب بواسطة لداب / أكتيف ديركتوري. يرجى الاتصال بقسم تقنية المعلومات لتغيير كلمة المرور.',
+        'multi_company_items_assigned' => 'This user has items assigned that belong to a different company. Please check them in or edit their company.'
     ),
 
     'deletefile' => array(
diff --git a/resources/lang/ar-SA/admin/users/table.php b/resources/lang/ar-SA/admin/users/table.php
index 0bfcc7c9b8..e40b476944 100644
--- a/resources/lang/ar-SA/admin/users/table.php
+++ b/resources/lang/ar-SA/admin/users/table.php
@@ -22,7 +22,7 @@ return array(
     'managed_locations'     => 'المواقع المدارة',
     'managed_users'         => 'المستخدمين المدراء',
     'name' 					=> 'الاسم',
-    'nogroup'               => 'لم يتم إنشاء أي مجموعات حتى الآن. لإضافة مجموعة واحدة، قم بزيارة: ',
+    'nogroup'               => 'لم يتم إنشاء أي مجموعات حتى الآن. لإضافة مجموعة واحدة، قم بزيارة:',
     'notes'                 => 'مُلاحظات',
     'password_confirm' 		=> 'تأكيد كلمة المرور',
     'password' 				=> 'كلمة المرور',
diff --git a/resources/lang/ar-SA/auth.php b/resources/lang/ar-SA/auth.php
index 73133897b9..28a2b75b43 100644
--- a/resources/lang/ar-SA/auth.php
+++ b/resources/lang/ar-SA/auth.php
@@ -15,6 +15,6 @@ return array(
 
     'failed' => 'بيانات الاعتماد هذه لا تتطابق مع سجلاتنا.',
     'password' => 'كلمة المرور المقدمة غير صحيحة.',
-    'throttle' => 'عدد كبير جدا من محاولات تسجيل الدخول. الرجاء المحاولة مرة أخرى خلال :seconds ثواني.',
+    'throttle' => 'Too many login attempts. Please try again in :minutes minute(s).',
 
 );
diff --git a/resources/lang/ar-SA/auth/message.php b/resources/lang/ar-SA/auth/message.php
index b098b1e846..d2a55b5091 100644
--- a/resources/lang/ar-SA/auth/message.php
+++ b/resources/lang/ar-SA/auth/message.php
@@ -6,8 +6,6 @@ return array(
     'account_not_found'      => 'اسم المستخدم أو كلمة المرور غير صحيحة.',
     'account_not_activated'  => 'لم يتم تنشيط حساب هذا المستخدم.',
     'account_suspended'      => 'تم تعليق حساب المستخدم هذا.',
-    'account_banned'         => 'تم حظر حساب المستخدم هذا.',
-    'throttle'               => 'هناك عدد كبير جدا من محاولات تسجيل الدخول الفاشلة. يرجى المحاولة مرة أخرى خلال :minutes دقيقة.',
 
     'two_factor' => array(
         'already_enrolled'      => 'جهازك مسجل مسبقا.',
diff --git a/resources/lang/ar-SA/button.php b/resources/lang/ar-SA/button.php
index 0e1ffa6e8e..08972aafe1 100644
--- a/resources/lang/ar-SA/button.php
+++ b/resources/lang/ar-SA/button.php
@@ -7,6 +7,7 @@ return [
     'checkin_and_delete'  	    => 'تسجيل الكل / حذف المستخدم',
     'delete'  	                => 'حذف',
     'edit'    	                => 'تعديل',
+    'clone'    	                => 'Clone',
     'restore' 	                => 'إستعادة',
     'remove'                    => 'حذف',
     'request'                   => 'طلب',
@@ -21,4 +22,13 @@ return [
     'add_maintenance'           => 'إضافة صيانة',
     'append'                    => 'إلحاق',
     'new'                       => 'جديد',
+    'var' => [
+        'clone'     => 'Clone :item_type',
+        'edit'      => 'Edit :item_type',
+        'delete'    => 'Delete :item_type',
+        'restore'   => 'Restore :item_type',
+        'create'    => 'Create New :item_type',
+        'checkout'  => 'Checkout :item_type',
+        'checkin'   => 'Checkin :item_type',
+    ]
 ];
diff --git a/resources/lang/ar-SA/general.php b/resources/lang/ar-SA/general.php
index 3de2ca181c..9fdf3b28f3 100644
--- a/resources/lang/ar-SA/general.php
+++ b/resources/lang/ar-SA/general.php
@@ -10,10 +10,10 @@ return [
     'action'                => 'الإجراء',
     'activity_report'		=> 'تقرير الأنشطة',
     'address'				=> 'العنوان',
-    'admin'					=> 'الإدارة',
-    'admin_tooltip'			=> 'This user has admin privileges',
-    'superuser'				=> 'Superuser',
-    'superuser_tooltip'		=> 'This user has superuser privileges',
+    'admin'					=> 'إعدادات المدير',
+    'admin_tooltip'			=> 'هذا المستخدم لديه صلاحيات المشرف',
+    'superuser'				=> 'مدير النظام',
+    'superuser_tooltip'		=> 'هذا المستخدم لديه امتيازات المستخدم المتميز',
     'administrator'			=> 'المدير',
     'add_seats'             => 'المقاعد المضافة',
     'age'                   => "العمر",
@@ -23,13 +23,16 @@ return [
     'asset_models'			=> 'موديلات الأصول',
     'asset_model'			=> 'موديل',
     'asset'					=> 'الأصول',
+    'asset_previous'        => 'Asset (Previously Assigned)',
     'asset_report'          => 'تقرير الأصول',
     'asset_tag'				=> 'ترميز الأصل',
     'asset_tags'            => 'وسم الأصل',
     'assets_available'		=> 'الأصول المتاحة',
     'accept_assets'         => 'قبول الأصول :name',
     'accept_assets_menu'    => 'قبول الأصول',
+    'accept_item'           => 'Accept Item',
     'audit'				    => 'تدقيق',
+    'audits'				=> 'Audits',
     'audit_report'			=> 'سجل التدقيق',
     'assets'				=> 'الأصول',
     'assets_audited'        => 'الأصول التي روجعت حساباتها',
@@ -61,9 +64,12 @@ return [
     'changepassword'  		=> 'تغيير كلمة المرور',
     'checkin'  				=> 'تسجيل',
     'checkin_from'  		=> 'تحقق من',
+    'checkin_note'  		=> 'Checkin Note',
+    'checkout_note'  		=> 'Checkout Note',
     'checkout'  			=> 'ترجيع',
     'checkouts_count'       => 'الخارج',
     'checkins_count'        => 'المٌدخل',
+    'checkin_and_delete'  	=> 'الإيداع والحذف',
     'user_requests_count'   => 'الطلبات',
     'city'  				=> 'المدينة',
     'click_here'			=> 'انقر هنا',
@@ -77,7 +83,7 @@ return [
     'consumables'			=> 'المواد الاستهلاكية',
     'country'  				=> 'الدولة',
     'could_not_restore'     => 'خطأ في استعادة :item_type: :error',
-    'not_deleted'           => 'لم يتم حذف :item_type لذلك لا يمكن استعادته',
+    'not_deleted'           => 'The :item_type was not deleted and therefore cannot be restored',
     'create'				=> 'إضافة',
     'created'               => 'تم إنشاء العنصر',
     'created_asset'			=> 'الأصول المضافة',
@@ -86,11 +92,13 @@ return [
     'record_created' 		=> 'إنشاء سجل',
     'updated_at' 			=> 'تم التحديث في',
     'currency'  			=> '$', // this is deprecated
+    'currency_text'  		=> 'العملة', //
     'current'  				=> 'الحالي',
     'current_password'      => 'كلمة المرور الحالية',
     'customize_report'      => 'تخصيص التقرير',
     'custom_report'         => 'تقرير مخصص للأصول',
     'dashboard'				=> 'لوحة القيادة',
+    'data_source'           => 'Data Source',
     'days'      			=> 'أيام',
     'days_to_next_audit'    => 'أيام إلى التدقيق التالي',
     'date'					=> 'التاريخ',
@@ -98,7 +106,7 @@ return [
     'debug_warning_text'    => 'هذا التطبيق يعمل في وضع الإنتاج مع تمكين التصحيح. هذا يمكن أن يعرض البيانات الحساسة إذا كان التطبيق الخاص بك هو في متناول العالم الخارجي. تعطيل وضع التصحيح عن طريق تعيين قيمة <code>APP_DEBUG</code> في ملف <code>.env</code> إلى <code>false</code>.',
     'delete'  				=> 'حذف',
     'delete_confirm'  		=> 'هل أنت متأكد من حذف :المنتج؟',
-    'delete_confirm_no_undo' => 'هل أنت متأكد من رغبتك في حذف :item؟ لا يمكن التراجع عن ذلك.',
+    'delete_confirm_no_undo' => 'هل أنت متأكد من أنك ترغب في حذف :item؟ لا يمكن التراجع بعد الحذف.',
     'deleted'  				=> 'تم حذفها',
     'delete_seats'  		=> 'المقاعد المحذوفة',
     'deletion_failed'       => 'فشل الحذف',
@@ -114,29 +122,13 @@ return [
     'editprofile'  			=> 'تعديل الملف الشخصي',
     'eol'					=> 'نهاية العمر',
     'email_domain'			=> 'نطاق البريد الإلكتروني',
-    'email_format'			=> 'تنسيق البريد الإلكتروني',
     'employee_number'       => 'رقم الموظف',
     'email_domain_help'		=> 'يتم استخدام هذا لتوليد عناوين البريد الإلكتروني عند الاستيراد',
     'error'				    => 'خطأ',
     'exclude_archived'      => 'استبعاد الأصول المؤرشفة',
     'exclude_deleted'       => 'استبعاد الأصول المحذوفة',
     'example'				=> 'مثال: ',
-    'filastname_format'			=> 'الاسم الأخير الأول (jsmith@example.com)',
-    'firstname_lastname_format'	=> 'الاسم الأول الاسم الأخير (jane.smith@example.com)',
-    'firstname_lastname_underscore_format' => 'الاسم الأول الاسم الأخير (jane_smith@example.com)',
-    'lastnamefirstinitial_format' =>  'اللقب والحرف الاول من الاسم (smithj@example.com)',
-    'firstintial_dot_lastname_format' => 'الاسم الأخير الأول (jsmith@example.com)',
-    'firstname_lastname_display'	=> 'الاسم الأول الاسم الأخير (جين سميث)',
-    'lastname_firstname_display'	=> 'اسم العائلة الأول (ميث جاني)',
-    'name_display_format'	=> 'تنسيق عرض الاسم',
-    'first'					=> 'الأول',
-    'firstnamelastname'     => 'الاسم الأول الاسم الأخير (jane.smith@example.com)',
-    'lastname_firstinitial' => 'اللقب والحرف الاول من الاسم (smithj@example.com)',
-    'firstinitial.lastname' => 'الاسم الأخير الأول (jsmith@example.com)',
-    'firstnamelastinitial'  => 'اللقب والحرف الاول من الاسم (smithj@example.com)',
-    'lastnamefirstname'      => 'Last Name First Name (smith.jane@example.com)',
-    'first_name'			=> 'الإسم الأول',
-    'first_name_format'		=> 'الاسم الأول (jane@example.com)',
+
     'files'                 => 'الملفات',
     'file_name'				=> 'ملف',
     'file_type'             => 'نوع الملف',
@@ -156,9 +148,9 @@ return [
     'image_delete'         	=> 'حذف الصورة',
     'include_deleted'       => 'تضمين الأصول المحذوفة',
     'image_upload'         	=> 'رفع صورة',
-    'filetypes_accepted_help'    => 'نوع الملف المقبول هو :types. الحد الأقصى لحجم التحميل المسموح به هو :size.|أنواع الملف المقبول هي :types. الحد الأقصى لحجم التحميل المسموح به هو :size.',
-    'filetypes_size_help'   => 'الحد الأقصى لحجم الرفع المسموح به هو :size.',
-    'image_filetypes_help'  => 'Accepted filetypes are jpg, webp, png, gif, svg, and avif. Max upload size allowed is :size.',
+    'filetypes_accepted_help'    => 'Accepted filetype is :types. The maximum size allowed is :size.|Accepted filetypes are :types. The maximum upload size allowed is :size.',
+    'filetypes_size_help'   => 'الحد الأقصى المسموح لحجم التصعيد هو :size.',
+    'image_filetypes_help'  => 'أنواع الملفات المسموحة هي jpg، webpp، png، gif، svg، tif. الحد الأقصى لحجم التصعيد المسموح به هو :size.',
     'unaccepted_image_type'  => 'ملف الصورة هذا غير قابل للقراءة. أنواع الملفات المقبولة هي jpg، webpp، png، gif، svg. نوع هذا الملف هو: :mimetype.',
     'import'         	    => 'استيراد',
     'import_this_file'      => 'حقول الخريطة ومعالجة هذا الملف',
@@ -178,12 +170,17 @@ return [
     'last'					=> 'الاخير',
     'last_login'            => 'آخر تسجيل دخول',
     'last_name'             => 'الإسم الأخير',
+    'firstname_lastname_display'	=> 'الاسم الأول الاسم الأخير (جين سميث)',
+    'lastname_firstname_display'	=> 'اسم العائلة الأول (ميث جاني)',
+    'name_display_format'	=> 'تنسيق عرض الاسم',
+    'first'					=> 'الأول',
+    'first_name'			=> 'الإسم الأول',
     'license'				=> 'الترخيص',
     'license_report'        => 'تقرير الترخيص',
     'licenses_available'	=> 'التراخيص المتاحة',
     'licenses'				=> 'التراخيص',
     'list_all'				=> 'عرض الكل',
-    'loading'				=> 'جار التحميل. أرجو الإنتظار....',
+    'loading'				=> 'جار التحميل. أرجو الإنتظار...',
     'lock_passwords'        => 'لن يتم حفظ قيمة الحقل هذه في تثبيت تجريبي.',
     'feature_disabled'      => 'تم تعطيل هذه الميزة للتثبيت التجريبي.',
     'location'              => 'الموقع',
@@ -207,7 +204,7 @@ return [
     'next'					=> 'التالى',
     'next_audit_date'		=> 'تاريخ التدقيق التالي',
     'next_audit_date_help'  => 'If you use auditing in your organization, this is usually automatically calculated based on the asset&apos;s last audit date and audit frequency (in <code>Admin Settings &gt; Alerts</code>) and you can leave this blank. You can manually set this date here if you need to, but it must be later than the last audit date. ',
-    'audit_images_help'     => 'You can find audit images in the asset\'s history tab.',
+    'audit_images_help'     => 'يمكنك العثور على صور التدقيق في علامة تبويب التاريخ في صفحة الأصول.',
     'no_email'              => 'لا يوجد عنوان بريد إلكتروني مرتبط بهذا المستخدم',
     'last_audit'		    => 'آخر مراجعة',
     'new'					=> 'الجديد!',
@@ -215,6 +212,14 @@ return [
     'no_results'			=> 'لا يوجد نتائج.',
     'no'  					=> 'لا',
     'notes'  				=> 'مُلاحظات',
+    'note_added'            => 'Note Added',
+    'options'				=> 'Options',
+    'preview'				=> 'Preview',
+    'add_note'              => 'Add Note',
+    'note_edited'            => 'Note Edited',
+    'edit_note'              => 'Edit Note',
+    'note_deleted'            => 'Note Deleted',
+    'delete_note'              => 'Delete Note',
     'order_number'          => 'رقم الأمر',
     'only_deleted'          => 'الأصول المحذوفة فقط',
     'page_menu'				=> 'عرض عناصر _MENU_',
@@ -229,7 +234,7 @@ return [
     'purchase_date'         => 'تاريخ الشراء',
     'qty'		            => 'الكمية',
     'quantity'		        => 'كمية',
-    'quantity_minimum'      => 'لديك :count عناصر أقل أو قريبة من الحد الأدنى لمستويات الكمية',
+    'quantity_minimum'      => 'You have one item below or almost below minimum quantity levels|You have :count items below or almost below minimum quantity levels',
     'quickscan_checkin'  	=> 'فحص سريع للادخال',
     'quickscan_checkin_status'  	=> 'فحص حالة الادخال',
     'ready_to_deploy'		=> 'جاهزة للتوزيع',
@@ -240,13 +245,13 @@ return [
     'restored'				=> 'المعاد',
     'restore'				=> 'إستعادة',
     'requestable_models'    => 'النماذج المطلوبة',
-    'requestable_items'     => 'Requestable Items',
+    'requestable_items'     => 'العناصر المطلوبة',
     'requested'				=> 'طلب',
     'requested_date'        => 'تاريخ الطلب',
     'requested_assets'      => 'الأصول المطلوبة',
     'requested_assets_menu' => 'الأصول المطلوبة',
     'request_canceled'      => 'تم إلغاء الطلب',
-    'request_item'          => 'Request this item',
+    'request_item'          => 'طلب هذا العنصر',
     'external_link_tooltip' => 'رابط خارجي إلى',
     'save'  				=> 'حفظ',
     'select_var'            => 'اختر :thing... ', // this will eventually replace all of our other selects
@@ -254,7 +259,7 @@ return [
     'select_all'            => 'اختر الكل',
     'search'				=> 'بحث',
     'select_category'       => 'اختر تصنيف',
-    'select_datasource' => 'حدد سجل البيانات',
+    'select_datasource' => 'اختر مصدر البيانات',
     'select_department'     => 'حدد قسم',
     'select_depreciation'	=> 'حدد نوع الاستهلاك',
     'select_location'		=> 'حدد موقعا',
@@ -274,13 +279,15 @@ return [
     'signed_off_by'         => 'تم توقيعه من قبل',
     'skin'       			=> 'المظهر',
     'webhook_msg_note'        => 'سيتم إرسال إشعار عبر الربط البرمجي (webhook)',
-    'webhook_test_msg'        => 'مرحباً! يبدو أن تكامل :app مع Snipe-IT يعمل!',
+    'webhook_test_msg'        => 'مرحبًا! أخبار سعيدة ، يبدو أن نظامك الأن يعمل مع Snipe-IT ',
     'some_features_disabled' => 'التثبيت التجريبي (DEMO): يتم تعطيل بعض الميزات لهذا التثبيت.',
     'site_name'				=> 'إسم الموقع',
     'state'  				=> 'المنطقة / الولاية',
     'status_labels'			=> 'تسميات الحالة',
+    'status_label'			=> 'Status Label',
     'status'    			=> 'الحالة',
     'accept_eula'           => 'اتفاقية القبول',
+    'show_or_hide_eulas' => 'مرحبًا! أخبار سعيدة ، يبدو أن نظامك الأن يعمل مع Snipe-IT. ',
     'supplier'              => 'المورد',
     'suppliers'  			=> 'الموردون',
     'sure_to_delete'        => 'هل تريد بالتأكيد حذفها',
@@ -296,15 +303,15 @@ return [
     'type'  				=> 'اكتب',
     'undeployable'			=> 'غير قابلة للتوزيع',
     'unknown_admin'			=> 'إداري غير معروف',
-    'username_format'		=> 'تنسيق اسم المستخدم',
     'username'              => 'اسم المستخدم',
     'update'                => 'تحديث',
+    'updating_item' => 'Updating :item',
     'upload_filetypes_help'      => 'أنواع الملفات المسموح بها هي png, gif, jpg, jpeg, doc, docx, pdf, xls, xlsx, txt, lic, xml, zip, rtf and rar. الحد الأقصى المسموح به هو :size.',
     'uploaded'              => 'تم تحميلها',
     'user'					=> 'المستخدم',
     'accepted'			    => 'قبلت',
     'declined'			    => 'رفض',
-    'declined_note'         => 'Declined Notes',
+    'declined_note'         => 'الملاحظات المرفوضة',
     'unassigned'            => 'غير مسند',
     'unaccepted_asset_report' => 'الأصول غير المقبولة',
     'users'                 => 'المستخدمين',
@@ -323,10 +330,10 @@ return [
     'token_expired'         => 'انتهت صلاحية جلسة النموذج. حاول مرة اخرى.',
     'login_enabled'         => 'تسجيل الدخول مفعل',
     'audit_due'             => 'الواجب مراجعته',
-    'audit_due_days'        => 'الأصول المستحقة للمراجعة خلال :أيام الأصول اليومية المستحقة للمراجعة خلال :أيام',
+    'audit_due_days'        => '{}Assets Due or Overdue for Audit|[1]Assets Due or Overdue for Audit Within a Day|[2,*]Assets Due or Overdue for Audit Within :days Days',
     'checkin_due'           => 'من المقرر تسجيل الدخول',
     'checkin_overdue'       => 'تأخر في تسجيل الدخول',
-    'checkin_due_days'      => 'الأصول المستحقة للتسجيل في غضون :أيام الأصول اليومية المستحقة للتسجيل في غضون :أيام',
+    'checkin_due_days'      => '{}Due for Checkin|[1]Assets Due for Checkin Within :days Day|[2,*]Assets Due for Checkin Within :days Days',
     'audit_overdue'         => 'مراجعة الحسابات المتأخرة',
     'accept'                => 'قبول :asset',
     'i_accept'              => 'قبول',
@@ -339,16 +346,16 @@ return [
     'view_all'              => 'عرض الكل',
     'hide_deleted'          => 'إخفاء المحذوفة',
     'email'                 => 'البريد الالكتروني',
-    'do_not_change'         => 'لا تقم بالتغيير',
-    'bug_report'            => 'الإبلاغ عن خلل',
+    'do_not_change'         => 'الرجاء عدم التغيير',
+    'bug_report'            => 'أبلغ عن وجود مشكلة أو خطأ في النظام',
     'user_manual'           => 'دليل المستخدم',
     'setup_step_1'          => 'الخطوة 1',
     'setup_step_2'          => 'الخطوة 2',
     'setup_step_3'          => 'الخطوة 3',
     'setup_step_4'          => 'الخطوة 4',
     'setup_config_check'    => 'التحقق من الاعدادات',
-    'setup_create_database' => 'إنشاء جداول قاعدة البيانات',
-    'setup_create_admin'    => 'إنشاء مستخدم مسؤول',
+    'setup_create_database' => 'Create database tables',
+    'setup_create_admin'    => 'تكوين حساب مدير النظام',
     'setup_done'            => 'إنتهى!',
     'bulk_edit_about_to'    => 'أنت على وشك تحرير ما يلي: ',
     'checked_out'           => 'استعارة',
@@ -383,6 +390,8 @@ return [
     'new_license'           => 'ترخيص جديد',
     'new_accessory'         => 'ملحق الجودة',
     'new_consumable'        => 'مادة إستهلاكية جديدة',
+    'new_component'         => 'New Component',
+    'new_user'              => 'New User',
     'collapse'              => 'اخفاء',
     'assigned'              => 'مسندة',
     'asset_count'           => 'عدد الأصول',
@@ -418,19 +427,20 @@ return [
     'bulk_soft_delete'      =>'أيضًا حذف هؤلاء المستخدمين. سيبقى سجل الأصول الخاص بهم سليماً ما لم/حتى تطهير السجلات المحذوفة في إعدادات المدير.',
     'bulk_checkin_delete_success' => 'تم حذف المستخدمين المحددين وتم تسجيل العناصر الخاصة بهم.',
     'bulk_checkin_success' => 'تم تسجيل الدخول إلى العناصر الخاصة بالمستخدمين المحددين.',
-    'set_to_null'           => 'حذف القيم لهذه الأصول<unk> حذف القيم لجميع الأصول :asset_count ',
+    'set_to_null'           => 'Delete values for this selection|Delete values for all :selection_count selections ',
     'set_users_field_to_null'  => 'حذف :field القيم لهذا المستخدم <unk> حذف :field القيم لجميع :user_count المستخدمين ',
     'na_no_purchase_date'   => 'N/A - لا يوجد تاريخ شراء',
     'assets_by_status'      => 'الأصول حسب الحالة',
     'assets_by_status_type'      => 'الأصول حسب نوع الحالة',
     'pie_chart_type'        => 'نوع مخطط دائري لوحة التحكم',
     'hello_name'            => 'مرحبا، :name!',
-    'unaccepted_profile_warning'   => 'لديك :count عناصر تتطلب القبول. انقر هنا لقبولها أو رفضها',
+    'unaccepted_profile_warning'   => 'You have one item requiring acceptance. Click here to accept or decline it | You have :count items requiring acceptance. Click here to accept or decline them',
     'start_date'            => 'تاريخ البداية',
     'end_date'            => 'تاريخ الانتهاء',
     'alt_uploaded_image_thumbnail' => 'الصورة المصغرة المحملة',
     'placeholder_kit'       => 'حدد مجموعة أدوات',
     'file_not_found'        => 'لم يتم العثور على الملف',
+    'log_record_not_found'  => 'No record for that log entry was found.',
     'preview_not_available' => '(بدون معاينة)',
     'setup'                 => 'الإعداد',
     'pre_flight'            => 'قبل الطيران',
@@ -512,7 +522,7 @@ return [
     'checked_out_to_fields' => 'Checked Out To Fields',
     'percent_complete' => '% اكتمال',
     'uploading' => 'تحميل... ',
-    'upload_error' => 'خطأ في تحميل الملف. الرجاء التحقق من أنه لا توجد صفوف فارغة وأنه لا يوجد تكرار لأسماء الأعمدة.',
+    'upload_error' => 'Error uploading file. Please check that you have no empty rows or duplicated column names in your CSV, and that the server permissions allow uploads.',
     'copy_to_clipboard' => 'نسخ إلى الحافظة',
     'copied' => 'نسخ!',
     'status_compatibility' => 'إذا تم تعيين الأصول بالفعل، فإنه لا يمكن تغييرها إلى نوع حالة غير قابل للنشر وسيتم تخطي هذا التغيير في القيمة.',
@@ -549,6 +559,71 @@ return [
         'license_seats'  => ':count مقاعد الرخصة<unk> :count مقاعد الرخص',
         'consumables'  => ':count مستهلكة<unk> :count مستهلك',
         'components'  => ':count مكون<unk> :count مكونات',
-    ]
+    ],
+
+    'more_info' => 'المزيد من المعلومات',
+    'quickscan_bulk_help' => 'Checking this box will edit the asset record to reflect this new location. Leaving it unchecked will simply note the location in the audit log. Note that if this asset is checked out, it will not change the location of the person, asset or location it is checked out to.',
+    'whoops' => 'Whoops!',
+    'something_went_wrong' => 'Something went wrong with your request.',
+    'close' => 'Close',
+    'expires' => 'انتهاء الصلاحية',
+    'map_fields'=> 'Map :item_type Fields',
+    'remaining_var' => ':count Remaining',
+    'label' => 'Label',
+    'import_asset_tag_exists' => 'An asset with the asset tag :asset_tag already exists and an update was not requested. No change was made.',
+    'countries_manually_entered_help' => 'Values with an asterisk (*) were manually entered and do not match existing ISO 3166 dropdown values',
+    'accessories_assigned' => 'Assigned Accessories',
+    'user_managed_passwords' => 'Password Management',
+    'user_managed_passwords_disallow' => 'Disallow users from managing their own passwords',
+    'user_managed_passwords_allow' => 'Allow users to manage their own passwords',
+    'from' => 'From',
+    'by' => 'بواسطة',
+
+// Add form placeholders here
+    'placeholders' => [
+        'notes'  => 'Add a note',
+    ],
+
+    'breadcrumb_button_actions' => [
+        'edit_item' => 'Edit :name',
+        'checkout_item' => 'Checkout :name',
+        'checkin_item' => 'Checkin :name',
+    ],
+
+    'skins' => [
+        'site_default' => 'Site Default',
+        'default_blue' => 'Default Blue',
+        'blue_dark' => 'Blue (Dark Mode)',
+        'green' => 'Green Dark',
+        'green_dark' => 'Green (Dark Mode)',
+        'red' => 'Red Dark',
+        'red_dark' => 'Red (Dark Mode)',
+        'orange' => 'Orange Dark',
+        'orange_dark' => 'Orange (Dark Mode)',
+        'black' => 'Black',
+        'black_dark' => 'Black (Dark Mode)',
+        'purple' => 'Purple',
+        'purple_dark' => 'Purple (Dark Mode)',
+        'yellow' => 'Yellow',
+        'yellow_dark' => 'Yellow (Dark Mode)',
+        'high_contrast' => 'High Contrast',
+
+    ],
+
+    'select_all_none' => 'Select/Unselect All',
+    'generic_model_not_found' => 'That :model was not found or you do not have permission to access it',
+    'deleted_models' => 'Deleted Asset Models',
+    'deleted_users' => 'Deleted Users',
+    'cost_each' => ':amount each',
+    'remove_current_image' => 'Remove current :type image',
+
+    'seeding' => [
+        'manufacturers' => [
+            'button' => 'Create Manufacturers',
+            'prompt' => 'You do not have any manufacturers yet. Would you like to seed a list of common manufacturers? (THIS WILL OVERWRITE EXISTING MANUFACTURERS, including those that have been soft-deleted.)',
+            'success' => 'Manufacturers seeded successfully',
+            'error' => 'Could not seed manufacturers. A manufacturer record already exists and seeding would overwrite it.|Could not seed manufacturers. :count manufacturer records already exist and seeding would overwrite them.',
+        ],
+    ],
 
 ];
diff --git a/resources/lang/ar-SA/localizations.php b/resources/lang/ar-SA/localizations.php
index 288f0bdd09..895e0db5eb 100644
--- a/resources/lang/ar-SA/localizations.php
+++ b/resources/lang/ar-SA/localizations.php
@@ -2,7 +2,7 @@
 
 return [
 
-    'select_language' => 'اختر لغة',
+    'select_language' => 'Select a Language',
     'languages' => [
         'en-US'=> 'الإنجليزية، الولايات المتحدة',
         'en-GB'=> 'الإنجليزية، المملكة المتحدة',
@@ -40,7 +40,9 @@ return [
         'ms-MY'=> 'الملايو',
         'mi-NZ'=> 'Maori',
         'mn-MN'=> 'المنغولية',
-        'no-NO'=> 'النرويجية',
+        'nb-NO'=> 'Norwegian Bokmål',
+        'om-ET' => 'Oromo (Ethiopian)',
+        //'nn-NO'=> 'Norwegian Nynorsk',
         'fa-IR'=> 'الفارسية',
         'pl-PL'=> 'البولندية',
         'pt-PT'=> 'البرتغالية',
@@ -66,7 +68,7 @@ return [
         'zu-ZA'=> 'الزولو',
     ],
 
-    'select_country' => 'اختر دولة',
+    'select_country' => 'Select a Country',
     
     'countries' => [
         'AC'=>'جزيرة أسنشن',
@@ -133,6 +135,7 @@ return [
         'EC'=>'Ecuador',
         'EE'=>'إستونيا',
         'EG'=>'مصر',
+        'GB-ENG'=>'England',
         'ER'=>'إريتريا',
         'ES'=>'إسبانيا',
         'ET'=>'Ethiopia',
@@ -231,6 +234,7 @@ return [
         'NG'=>'Nigeria',
         'NI'=>'Nicaragua',
         'NL'=>'هولندا',
+        'GB-NIR' => 'Northern Ireland',
         'NO'=>'النرويج',
         'NP'=>'نيبال',
         'NR'=>'Nauru',
@@ -258,7 +262,7 @@ return [
         'RU'=>'الاتحاد الروسي',
         'RW'=>'Rwanda',
         'SA'=>'المملكة العربية السعودية',
-        'UK'=>'اسكتلندا',
+        'GB-SCT'=>'اسكتلندا',
         'SB'=>'جزر سليمان',
         'SC'=>'Seychelles',
         'SS'=>'جنوب السودان',
@@ -310,6 +314,7 @@ return [
         'VI'=>'جزر فرجن (الولايات المتحدة الأمريكية)',
         'VN'=>'Viet Nam',
         'VU'=>'Vanuatu',
+        'GB-WLS' =>'Wales',
         'WF'=>'جزر واليس وفوتونا',
         'WS'=>'Samoa',
         'YE'=>'اليمن',
diff --git a/resources/lang/ar-SA/mail.php b/resources/lang/ar-SA/mail.php
index ec1f564fca..f182ce9d12 100644
--- a/resources/lang/ar-SA/mail.php
+++ b/resources/lang/ar-SA/mail.php
@@ -23,24 +23,25 @@ return [
     'Item_Requested' => 'العنصر المطلوب',
     'License_Checkin_Notification' => 'تم تسجيل الرخصة',
     'License_Checkout_Notification' => 'تم إخراج الترخيص',
+    'license_for'   => 'License for',
     'Low_Inventory_Report' => 'تقرير المخزون المنخفض',
     'a_user_canceled' => 'ألغى المستخدم طلب عنصر على الموقع',
     'a_user_requested' => 'طلب مستخدم عنصر على الموقع',
     'acceptance_asset_accepted' => 'قام مستخدم بقبول عنصر',
     'acceptance_asset_declined' => 'قام مستخدم برفض عنصر',
-    'accessory_name' => 'اسم الملحق:',
-    'additional_notes' => 'ملاحظات إضافية:',
+    'accessory_name' => 'اسم الملحق',
+    'additional_notes' => 'ملاحظات إضافية',
     'admin_has_created' => 'قام مسؤول بإنشاء حساب لك على الموقع :web.',
-    'asset' => 'أصل:',
-    'asset_name' => 'اسم الأصل:',
+    'asset' => 'أصل',
+    'asset_name' => 'اسم الأصل',
     'asset_requested' => 'تم طلب مادة العرض',
     'asset_tag' => 'وسم الأصل',
     'assets_warrantee_alert' => 'هناك :count أصل مع ضمان تنتهي صلاحيته في :threshold أيام.<unk> هناك :count أصول مع ضمانات تنتهي صلاحيتها في :threshold أيام.',
     'assigned_to' => 'عينت الى',
     'best_regards' => 'أفضل التحيات،',
-    'canceled' => 'ملغى:',
-    'checkin_date' => 'تاريخ الادخال:',
-    'checkout_date' => 'تاريخ الاخراج:',
+    'canceled' => 'ملغى',
+    'checkin_date' => 'تاريخ الادخال',
+    'checkout_date' => 'تاريخ الاخراج',
     'checkedout_from' => 'الخروج من',
     'checkedin_from'  => 'تم التحقق من',
     'checked_into' => 'تم التحقق من الدخول',
@@ -49,27 +50,30 @@ return [
     'click_to_confirm' => 'يرجى النقر على الرابط التالي لتأكيد حسابك على :web :',
     'current_QTY' => 'الكمية الحالية',
     'days' => 'أيام',
-    'expecting_checkin_date' => 'تاريخ الادخال المتوقع:',
+    'expecting_checkin_date' => 'تاريخ الادخال المتوقع',
     'expires' => 'ينتهي',
     'hello' => 'مرحبا',
     'hi' => 'مرحبا',
     'i_have_read' => 'لقد قرأت بنود الاستخدام وأوافق عليها، وقد تلقيت هذا البند.',
     'inventory_report' => 'تقرير المخزون',
-    'item' => 'عنصر:',
+    'item' => 'عنصر',
+    'item_checked_reminder' => 'This is a reminder that you currently have :count items checked out to you that you have not accepted or declined. Please click the link below to confirm your decision.',
     'license_expiring_alert' => 'هنالك :count رخص سوف تنتهي في الأيام :threshold القادمة.',
     'link_to_update_password' => 'يرجى النقر على الرابط التالي لتحديث كلمة المرور الخاصة بك على :web :',
-    'login' => 'تسجيل الدخول:',
+    'login' => 'الدخول',
     'login_first_admin' => 'قم بتسجيل الدخول إلى التثبيت الجديد من Snipe-IT باستخدام البيانات أدناه:',
     'low_inventory_alert' => 'هنالك :count عناصر أقل من الحد الأدنى للمخزون أول سوف تصبح أقل منه قريباً.',
     'min_QTY' => 'دقيقة الكمية',
     'name' => 'اسم',
     'new_item_checked' => 'تم فحص عنصر جديد تحت اسمك، التفاصيل أدناه.',
+    'new_item_checked_with_acceptance' => 'A new item has been checked out under your name that requires acceptance, details are below.',
+    'recent_item_checked' => 'An item was recently checked out under your name that requires acceptance, details are below.',
     'notes' => 'ملاحظات',
-    'password' => 'كلمة المرور:',
+    'password' => 'كلمة المرور',
     'password_reset' => 'إعادة تعيين كلمة المرور',
     'read_the_terms' => 'يرجى قراءة شروط الاستخدام أدناه.',
     'read_the_terms_and_click' => 'يرجى قراءة شروط الاستخدام أدناه، وانقر على الرابط في الأسفل لتأكيد أنك تقرأ وتوافق على شروط الاستخدام، وقد استلمت الأصل.',
-    'requested' => 'تم الطلب:',
+    'requested' => 'طلب',
     'reset_link' => 'رابط إعادة تعيين كلمة المرور',
     'reset_password' => 'انقر هنا لإعادة تعيين كلمة المرور:',
     'rights_reserved' => 'جميع الحقوق محفوظة.format@@0',
@@ -86,8 +90,10 @@ return [
     'upcoming-audits' => 'هناك :count الأصل الذي سيأتي للمراجعة في غضون :threshold أيام.<unk> هناك :count أصول ستأتي للمراجعة في غضون :threshold أيام.',
     'user' => 'المستخدم',
     'username' => 'اسم المستخدم',
+    'unaccepted_asset_reminder' => 'Reminder: You have Unaccepted Assets.',
     'welcome' => 'مرحباً :name',
     'welcome_to' => 'مرحبا بكم في :web!',
     'your_assets' => 'عرض الأصول الخاصة بك',
     'your_credentials' => 'أوراق اعتماد قنص-إيت الخاص بك',
+    'mail_sent' => 'Mail sent successfully!',
 ];
diff --git a/resources/lang/ar-SA/validation.php b/resources/lang/ar-SA/validation.php
index 00bd955a10..08a5b0f1c9 100644
--- a/resources/lang/ar-SA/validation.php
+++ b/resources/lang/ar-SA/validation.php
@@ -13,87 +13,150 @@ return [
     |
     */
 
-    'accepted'             => 'يجب ان يتم قبول :attribute .',
-    'active_url'           => ':attribute موقع غير صحيح.',
-    'after'                => ':attribute يجب ان يكون تاريخ قبل :date.',
-    'after_or_equal'       => ':attribute يجب أن يكون تاريخ بعد أو يساوي :date.',
-    'alpha'                => 'يجب ان تحتوي :attribute على أحرف فقط.',
-    'alpha_dash'           => 'يجب ان تحتوي :attribute على أحرف وأرقام وشرطات فقط.',
-    'alpha_num'            => 'يجب ان تحتوي :attribute على أحرف وأرقام فقط.',
-    'array'                => 'يجب أن تكون :attribute مصفوفة.',
-    'before'               => ':attribute يجب ان يكون تاريخ قبل :date.',
-    'before_or_equal'      => 'يجب أن تكون :attribute عبارة عن تاريخ قبل أو يساوي :date.',
-    'between'              => [
-        'numeric' => ':attribute يجب ان يكون بين :min - :max.',
-        'file'    => 'يجب أن تكون :attribute بين :min - :max كيلوبايت.',
-        'string'  => 'يجب أن تكون :attribute بين :min - :max من الأحرف.',
-        'array'   => 'يجب أن تكون :attribute ما بين: :min and :max من العناصر.',
+    'accepted' => 'The :attribute field must be accepted.',
+    'accepted_if' => 'The :attribute field must be accepted when :other is :value.',
+    'active_url' => 'The :attribute field must be a valid URL.',
+    'after' => 'The :attribute field must be a date after :date.',
+    'after_or_equal' => 'The :attribute field must be a date after or equal to :date.',
+    'alpha' => 'The :attribute field must only contain letters.',
+    'alpha_dash' => 'The :attribute field must only contain letters, numbers, dashes, and underscores.',
+    'alpha_num' => 'The :attribute field must only contain letters and numbers.',
+    'array' => 'The :attribute field must be an array.',
+    'ascii' => 'The :attribute field must only contain single-byte alphanumeric characters and symbols.',
+    'before' => 'The :attribute field must be a date before :date.',
+    'before_or_equal' => 'The :attribute field must be a date before or equal to :date.',
+    'between' => [
+        'array' => 'The :attribute field must have between :min and :max items.',
+        'file' => 'The :attribute field must be between :min and :max kilobytes.',
+        'numeric' => 'The :attribute field must be between :min and :max.',
+        'string' => 'The :attribute field must be between :min and :max characters.',
     ],
-    'boolean'              => 'يجب أن يكون :attribute صحيحا أو خاطئا.',
-    'confirmed'            => 'تأكيد :attribute غير متطابق.',
-    'date'                 => 'ان :attribute تاريخ غير صحيح.',
-    'date_format'          => 'لا تتطابق :attribute مع التنسيق.',
-    'different'            => 'يجب أن تكون :attribute و :other مختلفين.',
-    'digits'               => 'يجب أن تكون السمة: أرقام الأرقام.',
-    'digits_between'       => 'يجب أن تكون السمة: مين و: ماكس ديجيتس.',
-    'dimensions'           => 'تحتوي :attribute على أبعاد غير صالحة للصور.',
-    'distinct'             => 'يحتوي :attribute على قيمة مكررة.',
-    'email'                => 'يجب أن يكون :attribute عنوان بريد إلكتروني صالحا.',
-    'exists'               => ':attribute المحدد غير صالح.',
-    'file'                 => 'يجب أن تكون :attribute ملف.',
-    'filled'               => 'يجب أن يحتوي :attribute على قيمة.',
-    'image'                => 'يجب أن تكون :attribute صورة.',
+    'boolean' => 'يجب أن يكون حقل السمة صحيحا أو خاطئا.',
+    'can' => 'The :attribute field contains an unauthorized value.',
+    'confirmed' => 'The :attribute field confirmation does not match.',
+    'contains' => 'The :attribute field is missing a required value.',
+    'current_password' => 'The password is incorrect.',
+    'date' => 'The :attribute field must be a valid date.',
+    'date_equals' => 'The :attribute field must be a date equal to :date.',
+    'date_format' => 'The :attribute field must match the format :format.',
+    'decimal' => 'The :attribute field must have :decimal decimal places.',
+    'declined' => 'The :attribute field must be declined.',
+    'declined_if' => 'The :attribute field must be declined when :other is :value.',
+    'different' => 'The :attribute field and :other must be different.',
+    'digits' => 'The :attribute field must be :digits digits.',
+    'digits_between' => 'The :attribute field must be between :min and :max digits.',
+    'dimensions' => 'The :attribute field has invalid image dimensions.',
+    'distinct' => 'يحتوي :attribute على قيمة مكررة.',
+    'doesnt_end_with' => 'The :attribute field must not end with one of the following: :values.',
+    'doesnt_start_with' => 'The :attribute field must not start with one of the following: :values.',
+    'email' => 'The :attribute field must be a valid email address.',
+    'ends_with' => 'The :attribute field must end with one of the following: :values.',
+    'enum' => ':attribute المحدد غير صالح.',
+    'exists' => ':attribute المحدد غير صالح.',
+    'extensions' => 'The :attribute field must have one of the following extensions: :values.',
+    'file' => 'The :attribute field must be a file.',
+    'filled' => 'يجب أن يحتوي :attribute على قيمة.',
+    'gt' => [
+        'array' => 'The :attribute field must have more than :value items.',
+        'file' => 'The :attribute field must be greater than :value kilobytes.',
+        'numeric' => 'The :attribute field must be greater than :value.',
+        'string' => 'The :attribute field must be greater than :value characters.',
+    ],
+    'gte' => [
+        'array' => 'The :attribute field must have :value items or more.',
+        'file' => 'The :attribute field must be greater than or equal to :value kilobytes.',
+        'numeric' => 'The :attribute field must be greater than or equal to :value.',
+        'string' => 'The :attribute field must be greater than or equal to :value characters.',
+    ],
+    'hex_color' => 'The :attribute field must be a valid hexadecimal color.',
+    'image' => 'The :attribute field must be an image.',
     'import_field_empty'    => 'لا يمكن أن تكون قيمة :fieldname فارغة.',
-    'in'                   => ':attribute المحدد غير صالح.',
-    'in_array'             => ':attribute غير موجود في :other.',
-    'integer'              => 'يجب أن تكون :attribute عدد صحيح.',
-    'ip'                   => 'يجب أن تكون :attribute عنوان IP صالحا.',
-    'ipv4'                 => 'يجب أن تكون :attribute عنوان IPv4 صالحا.',
-    'ipv6'                 => 'يجب أن تكون :attribute عنوان IPv6 صالح.',
-    'is_unique_department' => 'يجب أن يكون :attribute فريداً في موقع الشركة هذا',
-    'json'                 => 'يجب أن يكون :attribute نص جسون JSON صالح.',
-    'max'                  => [
-        'numeric' => 'يجب ان يكون :attribute أكبر من :max.',
-        'file'    => 'يجب ان يكون :attribute أكبر من كيلوبايت كحد أقصى.',
-        'string'  => 'يجب ان يكون :attribute أكبر من :max احرف.',
-        'array'   => 'قد لا تحتوي :attribute على أكثر من :max من للعناصر.',
+    'in' => ':attribute المحدد غير صالح.',
+    'in_array' => 'The :attribute field must exist in :other.',
+    'integer' => 'The :attribute field must be an integer.',
+    'ip' => 'The :attribute field must be a valid IP address.',
+    'ipv4' => 'The :attribute field must be a valid IPv4 address.',
+    'ipv6' => 'The :attribute field must be a valid IPv6 address.',
+    'json' => 'The :attribute field must be a valid JSON string.',
+    'list' => 'The :attribute field must be a list.',
+    'lowercase' => 'The :attribute field must be lowercase.',
+    'lt' => [
+        'array' => 'The :attribute field must have less than :value items.',
+        'file' => 'The :attribute field must be less than :value kilobytes.',
+        'numeric' => 'The :attribute field must be less than :value.',
+        'string' => 'The :attribute field must be less than :value characters.',
     ],
-    'mimes'                => 'يجب أن يكون :attribute ملف من النوع :values.',
-    'mimetypes'            => 'يجب أن يكون :attribute ملف من النوع :values.',
-    'min'                  => [
-        'numeric' => 'يجب أن يكون :attribute على الأقل :min.',
-        'file'    => 'يجب أن يكون :attribute على الأقل :min كيلوبايت.',
-        'string'  => 'يجب أن يكون :attribute على الأقل :min من الاحرف.',
-        'array'   => 'يجب أن تحتوي :attribute على الأقل :min من العناصر.',
+    'lte' => [
+        'array' => 'The :attribute field must not have more than :value items.',
+        'file' => 'The :attribute field must be less than or equal to :value kilobytes.',
+        'numeric' => 'The :attribute field must be less than or equal to :value.',
+        'string' => 'The :attribute field must be less than or equal to :value characters.',
     ],
-    'starts_with'          => 'يجب أن تبدأ خانة :attribute بواحد مما يلي: :values.',
-    'ends_with'            => 'يجب أن تنتهي خانة :attribute بواحد مما يلي: :values.',
+    'mac_address' => 'The :attribute field must be a valid MAC address.',
+    'max' => [
+        'array' => 'The :attribute field must not have more than :max items.',
+        'file' => 'The :attribute field must not be greater than :max kilobytes.',
+        'numeric' => 'The :attribute field must not be greater than :max.',
+        'string' => 'The :attribute field must not be greater than :max characters.',
+    ],
+    'max_digits' => 'The :attribute field must not have more than :max digits.',
+    'mimes' => 'The :attribute field must be a file of type: :values.',
+    'mimetypes' => 'The :attribute field must be a file of type: :values.',
+    'min' => [
+        'array' => 'The :attribute field must have at least :min items.',
+        'file' => 'The :attribute field must be at least :min kilobytes.',
+        'numeric' => 'The :attribute field must be at least :min.',
+        'string' => 'The :attribute field must be at least :min characters.',
+    ],
+    'min_digits' => 'The :attribute field must have at least :min digits.',
+    'missing' => 'The :attribute field must be missing.',
+    'missing_if' => 'The :attribute field must be missing when :other is :value.',
+    'missing_unless' => 'The :attribute field must be missing unless :other is :value.',
+    'missing_with' => 'The :attribute field must be missing when :values is present.',
+    'missing_with_all' => 'The :attribute field must be missing when :values are present.',
+    'multiple_of' => 'The :attribute field must be a multiple of :value.',
+    'not_in' => ':attribute المحدد غير صالح.',
+    'not_regex' => 'The :attribute field format is invalid.',
+    'numeric' => 'The :attribute field must be a number.',
+    'password' => [
+        'letters' => 'The :attribute field must contain at least one letter.',
+        'mixed' => 'The :attribute field must contain at least one uppercase and one lowercase letter.',
+        'numbers' => 'The :attribute field must contain at least one number.',
+        'symbols' => 'The :attribute field must contain at least one symbol.',
+        'uncompromised' => 'The given :attribute has appeared in a data leak. Please choose a different :attribute.',
+    ],
+    'percent'       => 'The depreciation minimum must be between 0 and 100 when depreciation type is percentage.',
 
-    'not_in'               => ':attribute المحدد غير صالح.',
-    'numeric'              => 'يجب أن يكون :attribute رقما.',
-    'present'              => 'يجب أن يكون :attribute موجود.',
-    'valid_regex'          => 'هذا ليس تعبير regex صحيح. ',
-    'regex'                => 'تنسيق :attribute غير صالح.',
-    'required'             => 'الحقل :attribute اجباري.',
-    'required_if'          => 'الحقل :attribute اجباري عندما يكون :other يساوي :value.',
-    'required_unless'      => 'الحقل :attribute اجباري ما لم يكن :other ما بين :values.',
-    'required_with'        => 'الحقل :attribute اجباري عندما يكون :values موجودا.',
-    'required_with_all'    => 'الحقل :attribute اجباري عندما يكون :values موجودا.',
-    'required_without'     => 'الحقل :attribute اجباري عندما تكون :values غير موجودة.',
+    'present' => 'يجب أن يكون :attribute موجود.',
+    'present_if' => 'The :attribute field must be present when :other is :value.',
+    'present_unless' => 'The :attribute field must be present unless :other is :value.',
+    'present_with' => 'The :attribute field must be present when :values is present.',
+    'present_with_all' => 'The :attribute field must be present when :values are present.',
+    'prohibited' => 'The :attribute field is prohibited.',
+    'prohibited_if' => 'The :attribute field is prohibited when :other is :value.',
+    'prohibited_unless' => 'The :attribute field is prohibited unless :other is in :values.',
+    'prohibits' => 'The :attribute field prohibits :other from being present.',
+    'regex' => 'The :attribute field format is invalid.',
+    'required' => 'الحقل :attribute اجباري.',
+    'required_array_keys' => 'The :attribute field must contain entries for: :values.',
+    'required_if' => 'الحقل :attribute اجباري عندما يكون :other يساوي :value.',
+    'required_if_accepted' => 'The :attribute field is required when :other is accepted.',
+    'required_if_declined' => 'The :attribute field is required when :other is declined.',
+    'required_unless' => 'الحقل :attribute اجباري ما لم يكن :other ما بين :values.',
+    'required_with' => 'الحقل :attribute اجباري عندما يكون :values موجودا.',
+    'required_with_all' => 'The :attribute field is required when :values are present.',
+    'required_without' => 'الحقل :attribute اجباري عندما تكون :values غير موجودة.',
     'required_without_all' => 'الحقل :attribute اجباري عندما لا يكون اي من :values موجودة.',
-    'same'                 => 'يجب ان يكون :attribute و :other متطابقين.',
-    'size'                 => [
-        'numeric' => 'ان :attribute يجب ان يكون :size.',
-        'file'    => 'ان :attribute يجب ان يكون :size كيلوبايت.',
-        'string'  => 'ان :attribute يجب ان يكون :size احرف.',
-        'array'   => 'يجب أن يحتوي :attribute على :size من العناصر.',
+    'same' => 'The :attribute field must match :other.',
+    'size' => [
+        'array' => 'The :attribute field must contain :size items.',
+        'file' => 'The :attribute field must be :size kilobytes.',
+        'numeric' => 'The :attribute field must be :size.',
+        'string' => 'The :attribute field must be :size characters.',
     ],
+    'starts_with' => 'The :attribute field must start with one of the following: :values.',
     'string'               => 'يجب أن يكون :attribute عبارة عن سلسلة نصية.',
-    'timezone'             => 'يجب أن يكون :attribute منطقة صالحة.',
     'two_column_unique_undeleted' => ':attribute يجب أن يكون فريداً عبر :table1 و :table2. ',
-    'unique'               => 'لقد تم أخذ :attribute مسبقا.',
-    'uploaded'             => 'لقد فشل تحميل :attribute.',
-    'url'                  => 'ان تنسيق :attribute غير صالح.',
     'unique_undeleted'     => ':attribute يجب ان تكون فريدة.',
     'non_circular'         => 'يجب ألا تنشئ السمة مرجعًا دائريًا.',
     'not_array'            => ':attribute لا يمكن أن يكون مصفوف.',
@@ -102,11 +165,14 @@ return [
     'numbers'              => 'يجب أن تحتوي كلمة المرور على رقم واحد على الأقل.',
     'case_diff'            => 'كلمة المرور يجب أن تستخدم حالة مختلطة.',
     'symbols'              => 'يجب أن تحتوي كلمة المرور على رموز.',
-    'gte'                  => [
-        'numeric'          => 'لا يمكن أن تكون القيمة سالبة'
-    ],
-    'checkboxes'           => ':attribute يحتوي على خيارات غير صالحة.',
-    'radio_buttons'        => ':attribute غير صالح.',
+    'timezone' => 'The :attribute field must be a valid timezone.',
+    'unique' => 'لقد تم أخذ :attribute مسبقا.',
+    'uploaded' => 'لقد فشل تحميل :attribute.',
+    'uppercase' => 'The :attribute field must be uppercase.',
+    'url' => 'The :attribute field must be a valid URL.',
+    'ulid' => 'The :attribute field must be a valid ULID.',
+    'uuid' => 'The :attribute field must be a valid UUID.',
+    'fmcs_location' => 'Full multiple company support and location scoping is enabled in the Admin Settings, and the selected location and selected company are not compatible.',
 
 
     /*
@@ -120,16 +186,22 @@ return [
     |
     */
 
+    'email_array'      => 'عنوان بريد إلكتروني واحد أو أكثر غير صالح.',
+    'checkboxes'           => ':attribute يحتوي على خيارات غير صالحة.',
+    'radio_buttons'        => ':attribute غير صالح.',
+    
     'custom' => [
         'alpha_space' => 'يحتوي الحقل :attribute على حرف غير مسموح به.',
-        'email_array'      => 'عنوان بريد إلكتروني واحد أو أكثر غير صالح.',
+
         'hashed_pass'      => 'كلمة المرور الحالية غير صحيحة',
         'dumbpwd'          => 'كلمة المرور هذه شائعة جدا.',
         'statuslabel_type' => 'يجب تحديد نوع تسمية حالة صالح',
+        'custom_field_not_found'          => 'This field does not seem to exist, please double check your custom field names.',
+        'custom_field_not_found_on_model' => 'This field seems to exist, but is not available on this Asset Model\'s fieldset.',
 
         // date_format validation with slightly less stupid messages. It duplicates a lot, but it gets the job done :(
-        // We use this because the default error message for date_format is reflects php Y-m-d, which non-PHP
-        // people won't know how to format. 
+        // We use this because the default error message for date_format reflects php Y-m-d, which non-PHP
+        // people won't know how to format.
         'purchase_date.date_format'     => 'يجب أن يكون :attribute تاريخ صالح بتنسيق YYY-MM-DD',
         'last_audit_date.date_format'   =>  'يجب أن يكون :attribute تاريخًا صحيحًا في تنسيق YYY-MM-DD hh:mm:ss',
         'expiration_date.date_format'   =>  'يجب أن يكون :attribute تاريخ صالح بتنسيق YYY-MM-DD',
@@ -137,9 +209,15 @@ return [
         'expected_checkin.date_format'  =>  'يجب أن يكون :attribute تاريخ صالح بتنسيق YYY-MM-DD',
         'start_date.date_format'        =>  'يجب أن يكون :attribute تاريخ صالح بتنسيق YYY-MM-DD',
         'end_date.date_format'          =>  'يجب أن يكون :attribute تاريخ صالح بتنسيق YYY-MM-DD',
+        'invalid_value_in_field' => 'القيمة غير صالحة المدرجة في هذا الحقل',
 
-    ],
+        'ldap_username_field' => [
+            'not_in' =>         '<code>sAMAccountName</code> (mixed case) will likely not work. You should use <code>samaccountname</code> (lowercase) instead.'
+        ],
+        'ldap_auth_filter_query' => ['not_in' => '<code>uid=samaccountname</code> is probably not a valid auth filter. You probably want <code>uid=</code> '],
+        'ldap_filter' => ['regex' => 'This value should probably not be wrapped in parentheses.'],
 
+        ],
     /*
     |--------------------------------------------------------------------------
     | Custom Validation Attributes
@@ -155,8 +233,16 @@ return [
 
     /*
     |--------------------------------------------------------------------------
-    | Generic Validation Messages
+    | Generic Validation Messages - we use these in the jquery validation where we don't have
+    | access to the :attribute
     |--------------------------------------------------------------------------
     */
-    'invalid_value_in_field' => 'القيمة غير صالحة المدرجة في هذا الحقل',
+
+    'generic' => [
+        'invalid_value_in_field' => 'القيمة غير صالحة المدرجة في هذا الحقل',
+        'required' => 'This field is required',
+        'email' => 'Please enter a valid email address',
+    ],
+
+
 ];
diff --git a/resources/lang/bg-BG/account/general.php b/resources/lang/bg-BG/account/general.php
index 53a63ec326..65ee0309a7 100644
--- a/resources/lang/bg-BG/account/general.php
+++ b/resources/lang/bg-BG/account/general.php
@@ -2,10 +2,16 @@
 
 return array(
     'personal_api_keys' => 'Частни API ключове',
-    'api_key_warning' => 'When generating an API token, be sure to copy it down immediately as they will not be visible to you again.',
+    'personal_access_token' => 'Personal Access Token',
+    'personal_api_keys_success' => 'Personal API Key :key created sucessfully',
+    'here_is_api_key' => 'Here is your new personal access token. This is the only time it will be shown so do not lose it! You may now use this token to make API requests.',
+    'api_key_warning' => 'Когато генерирате API токен, не забравяйте да го копирате незабавно, тъй като те няма да бъдат видими за вас отново.',
     'api_base_url' => 'Вашият API основен URL се намира на:',
     'api_base_url_endpoint' => '/&lt;endpoint&gt;',
     'api_token_expiration_time' => 'API ключа ще изтиче на:',
-    'api_reference' => 'Please check the <a href="https://snipe-it.readme.io/reference" target="_blank">API reference</a> to find specific API endpoints and additional API documentation.',
-    'profile_updated' => 'Account successfully updated',
+    'api_reference' => 'Моля, проверете <a href="https://snipe-it.readme.io/reference" target="_blank">справката за API</a>, за да намерите конкретни API крайни точки и допълнителна API документация.',
+    'profile_updated' => 'Акаунтът е актуализиран успешно',
+    'no_tokens' => 'You have not created any personal access tokens.',
+    'enable_sounds' => 'Enable sound effects',
+    'enable_confetti' => 'Enable confetti effects',
 );
diff --git a/resources/lang/bg-BG/admin/accessories/message.php b/resources/lang/bg-BG/admin/accessories/message.php
index 4de264f0db..98af327a86 100644
--- a/resources/lang/bg-BG/admin/accessories/message.php
+++ b/resources/lang/bg-BG/admin/accessories/message.php
@@ -26,7 +26,11 @@ return array(
         'error'   		=> 'Аксесоарът не беше изписан. Моля опитайте отново.',
         'success' 		=> 'Аксесоарът изписан успешно.',
         'unavailable'   => 'Аксесоарт не е наличен за изписване. Проверете наличното количество',
-        'user_does_not_exist' => 'Невалиден потребител. Моля опитайте отново.'
+        'user_does_not_exist' => 'Невалиден потребител. Моля опитайте отново.',
+         'checkout_qty' => array(
+            'lte'  => 'В момента има само един наличен аксесоар от този вид и вие се опитвате да изпишете :checkout_qty. Моля коригирайте количеството или общата наличност и опитайте отново.|Има :number_currently_remaining броя налични аксесоари и вие се опитвате да изпишете :checkout_qty. Моля коригирайте количеството или общата наличност и опитайте отново.',
+            ),
+           
     ),
 
     'checkin' => array(
diff --git a/resources/lang/bg-BG/admin/accessories/table.php b/resources/lang/bg-BG/admin/accessories/table.php
index 93badac4b7..f54528e856 100644
--- a/resources/lang/bg-BG/admin/accessories/table.php
+++ b/resources/lang/bg-BG/admin/accessories/table.php
@@ -6,6 +6,4 @@ return array(
     'id'      					=> 'ID',
     'require_acceptance'      	=> 'Утвърждаване',
     'title'      				=> 'Аксесоар',
-
-
 );
diff --git a/resources/lang/bg-BG/admin/components/message.php b/resources/lang/bg-BG/admin/components/message.php
index 7dd5cf9614..3a0078aea7 100644
--- a/resources/lang/bg-BG/admin/components/message.php
+++ b/resources/lang/bg-BG/admin/components/message.php
@@ -17,7 +17,8 @@ return array(
     'delete' => array(
         'confirm'   => 'Сигурни ли сте, че желаете да изтриете този компонент?',
         'error'   => 'Възникна проблем при изтриването на компонента. Моля опитайте отново.',
-        'success' => 'Компонентът бе изтрит успешно.'
+        'success' => 'Компонентът бе изтрит успешно.',
+        'error_qty'   => 'Някой компоненти от този тип са все още изписани. Моля проверете ги и пробвайте отново.',
     ),
 
      'checkout' => array(
diff --git a/resources/lang/bg-BG/admin/consumables/general.php b/resources/lang/bg-BG/admin/consumables/general.php
index 5792f67ffc..fee7bbe73a 100644
--- a/resources/lang/bg-BG/admin/consumables/general.php
+++ b/resources/lang/bg-BG/admin/consumables/general.php
@@ -8,4 +8,5 @@ return array(
     'remaining' 			            => 'Остава',
     'total' 			                => 'Oбщо',
     'update'                            => 'Обновяване на консуматив',
+    'inventory_warning'                 => 'Наличноста на този консуматив е под зададения минимум от :min_count',
 );
diff --git a/resources/lang/bg-BG/admin/consumables/message.php b/resources/lang/bg-BG/admin/consumables/message.php
index 8721beb17e..6a0effbff8 100644
--- a/resources/lang/bg-BG/admin/consumables/message.php
+++ b/resources/lang/bg-BG/admin/consumables/message.php
@@ -2,6 +2,7 @@
 
 return array(
 
+    'invalid_category_type' => 'Категоряита трябва да бъде от консумативи.',
     'does_not_exist' => 'Консуматива не съществува.',
 
     'create' => array(
diff --git a/resources/lang/bg-BG/admin/custom_fields/general.php b/resources/lang/bg-BG/admin/custom_fields/general.php
index c583776a3e..9bc28f7eb1 100644
--- a/resources/lang/bg-BG/admin/custom_fields/general.php
+++ b/resources/lang/bg-BG/admin/custom_fields/general.php
@@ -35,7 +35,7 @@ return [
     'create_field_title' => 'Създай ново персонализирано поле',
     'value_encrypted'      	        => 'Стойността на това поле е криптирана в базата данни. Само администратор потребители ще бъде в състояние да видят дешифрираната стойност',
     'show_in_email'     => 'Да се включи ли стойността на това поле в електронната поща, изпращана към потребителите? Криптираните полета не могат да бъдат включвани в изпращаните електронни пощи',
-    'show_in_email_short'     => 'Включи в е-майлите.',
+    'show_in_email_short' => 'Включи в е-майлите',
     'help_text' => 'Помощен текст',
     'help_text_description' => 'Това е допълнителен текст, който ще се появява под формата с елементите докато редактирате актив описващ значението на полето.',
     'about_custom_fields_title' => 'Отностно Персонализирани Полета',
@@ -57,5 +57,8 @@ return [
     'show_in_requestable_list_short' => 'Покажи в списъка на изискуемите артикули',
     'show_in_requestable_list' => 'Покажи стойноста в списъка на изискуемите артикули. Криптираните полета няма да се покажат',
     'encrypted_options' => 'Това поле е криптирано, затова някой настройки няма да бъдат налични.',
+    'display_checkin' => 'Покажи в форма за вписване',
+    'display_checkout' => 'Покажи в форма за изписване',
+    'display_audit' => 'Покажи в форма за одит',
 
 ];
diff --git a/resources/lang/bg-BG/admin/custom_fields/message.php b/resources/lang/bg-BG/admin/custom_fields/message.php
index ba83bb4e64..8d9d3b703c 100644
--- a/resources/lang/bg-BG/admin/custom_fields/message.php
+++ b/resources/lang/bg-BG/admin/custom_fields/message.php
@@ -5,6 +5,7 @@ return array(
     'field' => array(
         'invalid'   => 'Това поле не съществува.',
         'already_added'   => 'Вече е добавено поле',
+        'none_selected'   => 'Не е избрано поле',
 
         'create' => array(
             'error'   => 'Поле не беше създадено, моля опитайте отново.',
diff --git a/resources/lang/bg-BG/admin/depreciations/general.php b/resources/lang/bg-BG/admin/depreciations/general.php
index a53e31bc14..af306688c8 100644
--- a/resources/lang/bg-BG/admin/depreciations/general.php
+++ b/resources/lang/bg-BG/admin/depreciations/general.php
@@ -13,4 +13,8 @@ return [
     'no_depreciations_warning'               => '<strong>Внимание: </strong>
                       Нямате нагласена амортизация.
                       Моля настройте поне една амортизация за да видите справката.',
+    'depreciation_method'                   => 'Справка за амортизации',
+    'linear_depreciation'                   => 'Линеен (по подразбиране)',
+    'half_1'                                => 'Полугодишна, винаги се приложена',
+    'half_2'                                => 'Полугодишна, приложена с условие',
 ];
diff --git a/resources/lang/bg-BG/admin/hardware/form.php b/resources/lang/bg-BG/admin/hardware/form.php
index 7927d7e356..a35a322d42 100644
--- a/resources/lang/bg-BG/admin/hardware/form.php
+++ b/resources/lang/bg-BG/admin/hardware/form.php
@@ -39,9 +39,9 @@ return [
     'order'				=> 'Номер на поръчка',
     'qr'				=> 'QR код',
     'requestable'		=> 'Потребителите могат да изписват актива',
-    'redirect_to_all'   => 'Return to all :type',
-    'redirect_to_type'   => 'Go to :type',
-    'redirect_to_checked_out_to'   => 'Go to Checked Out to',
+    'redirect_to_all'   => 'Връщане към всички :type',
+    'redirect_to_type'   => 'Отидете на :type',
+    'redirect_to_checked_out_to'   => 'Отидете на Checked Out to',
     'select_statustype'	=> 'Избиране на тип на статуса',
     'serial'			=> 'Сериен номер',
     'status'			=> 'Статус',
@@ -55,8 +55,11 @@ return [
     'asset_location_update_default' => 'Актуализиране на местоположението по подразбиране',
     'asset_location_update_actual' => 'Актуализиране само на местоположението',
     'asset_not_deployable' => 'Актива не може да бъде предоставен. Този активк не може да бъде изписан.',
-    'asset_deployable' => 'Актива може да бъде предоставен. Този активк може да бъде изписан.',
+    'asset_not_deployable_checkin' => 'Статуса на този актив е със забрана за изписване. Използвайки този статус ще впише актива обратно.',
+    'asset_deployable' => 'Този актив може да бъде изписан.',
     'processing_spinner' => 'Обработка...(Това може да отнеме време при големи файлове)',
+    'processing' => 'В процес на изпълнение... ',
     'optional_infos'  => 'Допълнителна информация',
-    'order_details'   => 'Информация за състоянието на поръчка'
+    'order_details'   => 'Информация за състоянието на поръчка',
+    'calc_eol'    => 'Ако нулирате EOL датата, ще се използва EOL дата базирана на дата на закупуване + EOL норма.',
 ];
diff --git a/resources/lang/bg-BG/admin/hardware/general.php b/resources/lang/bg-BG/admin/hardware/general.php
index e0ff0a9d5a..eebb5e17e4 100644
--- a/resources/lang/bg-BG/admin/hardware/general.php
+++ b/resources/lang/bg-BG/admin/hardware/general.php
@@ -5,8 +5,8 @@ return [
     'about_assets_text'            => 'Активите са елементи, проследен от сериен номер или етикет. По-често, те са елементи с висока стойност, където идентифицирането на специфичен елемент е от значение.',
     'archived'  				=> 'Архивиран',
     'asset'  					=> 'Актив',
-    'bulk_checkout'             => 'Изписване на активи',
-    'bulk_checkin'              => 'Връщане на актив',
+    'bulk_checkout'             => 'Общо отписване',
+    'bulk_checkin'              => 'Общо вписване',
     'checkin'  					=> 'Връщане на актив',
     'checkout'  				=> 'Изписване на актив',
     'clone'  					=> 'Копиране на актив',
@@ -15,8 +15,8 @@ return [
     'delete_confirm'            => 'Сигурни ли сте, че желаете изтриване на актива?',
     'edit'  					=> 'Редакция на актив',
     'model_deleted'  			=> 'Този Модел на актив беше изтрит. Вие трябва да възстановите този модел преди да можете да възстановите актива.',
-    'model_invalid'             => 'This model for this asset is invalid.',
-    'model_invalid_fix'         => 'The asset must be updated use a valid asset model before attempting to check it in or out, or to audit it.',
+    'model_invalid'             => 'Този модел за този актив е невалиден.',
+    'model_invalid_fix'         => 'Активът трябва да бъде актуализиран с помощта на валиден модел на актив, преди да се опитате да го проверите или изведете или да го одитирате.',
     'requestable'               => 'Може да бъде изискван',
     'requested'				    => 'Изискан',
     'not_requestable'           => 'Не може да бъде изискан',
diff --git a/resources/lang/bg-BG/admin/hardware/message.php b/resources/lang/bg-BG/admin/hardware/message.php
index 2dd4ac7a00..57b17cac75 100644
--- a/resources/lang/bg-BG/admin/hardware/message.php
+++ b/resources/lang/bg-BG/admin/hardware/message.php
@@ -2,24 +2,29 @@
 
 return [
 
-    'undeployable' 		=> '<strong>Внимание:</strong> Този актив е маркиран като невъзможен за предоставяне. Ако статусът е променен, моля обновете актива.',
-    'does_not_exist' 	=> 'Активът не съществува.',
-    'does_not_exist_var'=> 'Asset with tag :asset_tag not found.',
-    'no_tag' 	        => 'No asset tag provided.',
+    'undeployable' 		 => '<strong>Внимание:</strong> Този актив е маркиран, като забранен за изписване. Ако статусът е променен, моля обновете актива.',
+    'does_not_exist' 	 => 'Активът не съществува.',
+    'does_not_exist_var' => 'Активът с етике :asset_tag не е намерен.',
+    'no_tag' 	         => 'Не е предоставен етикет на актив.',
     'does_not_exist_or_not_requestable' => 'Актива не съществува или не може да бъде предоставян.',
-    'assoc_users'	 	=> 'Активът е изписан на потребител и не може да бъде изтрит. Моля впишете го обратно и след това опитайте да го изтриете отново.',
-    'warning_audit_date_mismatch' 	=> 'This asset\'s next audit date (:next_audit_date) is before the last audit date (:last_audit_date). Please update the next audit date.',
+    'assoc_users'	 	 => 'Активът е изписан на потребител и не може да бъде изтрит. Моля впишете го обратно и след това опитайте да го изтриете отново.',
+    'warning_audit_date_mismatch' 	=> 'Следващата дата на одит на този актив (:next_audit_date) е преди последната дата на одит (:last_audit_date). Моля, актуализирайте следващата дата на одита.',
+    'labels_generated'   => 'Етиката е успешно генериран.',
+    'error_generating_labels' => 'Грешка при генериране на етикети.',
+    'no_assets_selected' => 'Няма избрани активи.',
 
     'create' => [
         'error'   		=> 'Активът не беше създаден. Моля опитайте отново.',
         'success' 		=> 'Активът създаден успешно.',
         'success_linked' => 'Артикул с етикет :tag беше създаден успешно. <strong><a href=":link" style="color: white;">Щракнете тук за да го видите</a></strong>.',
+        'multi_success_linked' => 'Актив с етикет :links беше създаден успешно.|:count активи бяха създадено успешно. :links.',
+        'partial_failure' => 'Грешка при създаване на актив. Съобщението за грешка е: :failures|:count актива не бяха създадени. Съобщението за грешка е: :failures',
     ],
 
     'update' => [
         'error'   			=> 'Активът не беше обновен. Моля опитайте отново.',
         'success' 			=> 'Активът обновен успешно.',
-        'encrypted_warning' => 'Asset updated successfully, but encrypted custom fields were not due to permissions',
+        'encrypted_warning' => 'Активът беше актуализиран успешно, но шифрованите персонализирани полета не бяха актуализирани поради разрешения',
         'nothing_updated'	=>  'Няма избрани полета, съответно нищо не беше обновено.',
         'no_assets_selected'  =>  'Няма избрани активи, така че нищо не бе обновено.',
         'assets_do_not_exist_or_are_invalid' => 'Избраните активи не могат да се обновят.',
@@ -33,7 +38,7 @@ return [
     ],
 
     'audit' => [
-        'error'   		=> 'Asset audit unsuccessful: :error ',
+        'error'   		=> 'Одитът на активите е неуспешен: :error ',
         'success' 		=> 'Активният одит бе успешно регистриран.',
     ],
 
@@ -51,20 +56,24 @@ return [
     ],
 
     'import' => [
+        'import_button'         => 'Импортирай',
         'error'                 => 'Някои елементи не бяха въведени правилно.',
         'errorDetail'           => 'Следните елементи не бяха въведени поради грешки.',
         'success'               => 'Вашият файл беше въведен.',
         'file_delete_success'   => 'Вашият файл беше изтрит успешно.',
         'file_delete_error'      => 'Файлът не е в състояние да бъде изтрит',
         'file_missing' => 'Избраният файл липсва',
+        'file_already_deleted' => 'Избрания файл беше вече изтрит',
         'header_row_has_malformed_characters' => 'Един или повече атрибути на заглавния ред съдържат неправилни UTF-8 символи',
         'content_row_has_malformed_characters' => 'Един или повече атрибути на заглавния ред съдържат неправилни UTF-8 символи',
+        'transliterate_failure' => 'Транслитерацията от :encoding към UTF-8 беше неуспешна, поради невалидни символи'
     ],
 
 
     'delete' => [
         'confirm'   	=> 'Сигурни ли сте, че желаете изтриване на актива?',
         'error'   		=> 'Проблем при изтриване на актива. Моля опитайте отново.',
+        'assigned_to_error' => '{1}Актива: :asset_tag е изписан. Впишете го обратно преди изтриване.|[2,*] Активите :asset_tag са изписани. Впишете ги обратно преди изтриване.',
         'nothing_updated'   => 'Няма избрани активи, така че нищо не бе изтрито.',
         'success' 		=> 'Активът е изтрит успешно.',
     ],
@@ -77,6 +86,11 @@ return [
         'no_assets_selected' => 'Трябва да изберете поне един елемент към списъка',
     ],
 
+    'multi-checkout' => [
+        'error'   => 'Актива не беше изписан, моля опитайте отново|Активите не бяха изписани, моля опитайте отново',
+        'success' => 'Актива е изписан успешно.|Активите са изписани успешно.',
+    ],
+
     'checkin' => [
         'error'   		=> 'Активът не беше вписан. Моля опитайте отново.',
         'success' 		=> 'Активът вписан успешно.',
@@ -86,9 +100,10 @@ return [
     ],
 
     'requests' => [
-        'error'   		=> 'Активът не беше изискан. Моля опитайте отново.',
-        'success' 		=> 'Активът изискан успешно.',
-        'canceled'      => 'Заявка за отписване отказана успешно',
+        'error'   		=> 'Опитат беше неуспешен, моля опитайте отново.',
+        'success' 		=> 'Заявката е успешно подадена.',
+        'canceled'      => 'Заявката е отменена.',
+        'cancel'        => 'Отмени тази заявка за артикул',
     ],
 
 ];
diff --git a/resources/lang/bg-BG/admin/hardware/table.php b/resources/lang/bg-BG/admin/hardware/table.php
index bf7d383d47..fcbc24e74d 100644
--- a/resources/lang/bg-BG/admin/hardware/table.php
+++ b/resources/lang/bg-BG/admin/hardware/table.php
@@ -25,7 +25,6 @@ return [
     'image'		    => 'Изображение на устройството',
     'days_without_acceptance' => 'Дни без да е предаден',
     'monthly_depreciation' => 'Месечна Амортизация',
-    'assigned_to'    => 'Възложени на',
     'requesting_user' => 'Изискан от',
     'requested_date' => 'Дата на заявката',
     'changed'       => 'Променен',
diff --git a/resources/lang/bg-BG/admin/kits/general.php b/resources/lang/bg-BG/admin/kits/general.php
index 90b7aa1b03..e54e2c0f5c 100644
--- a/resources/lang/bg-BG/admin/kits/general.php
+++ b/resources/lang/bg-BG/admin/kits/general.php
@@ -47,4 +47,5 @@ return [
     'kit_deleted'                       => 'Комплектът беше изтрит',
     'kit_model_updated'                 => 'Модела беше успешно обновен',
     'kit_model_detached'                => 'Модела беше премахнат успешно',
+    'model_already_attached'            => 'Модела е добавен в комплекта',
 ];
diff --git a/resources/lang/bg-BG/admin/licenses/general.php b/resources/lang/bg-BG/admin/licenses/general.php
index 126220342d..9d908d7a8a 100644
--- a/resources/lang/bg-BG/admin/licenses/general.php
+++ b/resources/lang/bg-BG/admin/licenses/general.php
@@ -14,6 +14,7 @@ return array(
     'info'  					=> 'Информация за лиценз',
     'license_seats'  			=> 'Потребителски лицензи',
     'seat'  					=> 'Потребителски лиценз',
+    'seat_count'  				=> 'Брой места :count',
     'seats'  					=> 'Потребителски лицензи',
     'software_licenses'  		=> 'Софтуерни лицензи',
     'user'  					=> 'Потребител',
@@ -23,12 +24,12 @@ return array(
         [
             'checkin_all'           => [
                 'button'            => 'Връщане на всички бройки',
-                'modal'             => 'Това ще заведе една бройка. | Това ще заведе всички :checkedout_seats_count бройки от този лиценз.',
+                'modal'             => 'Това действие ще впише едно работно място. | Това действие ще впише всички  :checkedout_seats_count работни места от този лиценз.',
                 'enabled_tooltip'   => 'Вписване на всички бройки от този лиценз за потребителите и активите',
                 'disabled_tooltip'  => 'Това е забранено защото няма изписани бройки',
                 'disabled_tooltip_reassignable'  => 'Това е деактивирано, защото лиценза не може да се прехвърля',
                 'success'           => 'Лиценза е заведен успешно! | Всички лицензи са заведени успешно!',
-                'log_msg'           => 'Проверено чрез групово лиценз изписване в GUI',
+                'log_msg'           => 'Вписване чрез групово лиценз вписване в GUI',
             ],
 
             'checkout_all'              => [
diff --git a/resources/lang/bg-BG/admin/licenses/message.php b/resources/lang/bg-BG/admin/licenses/message.php
index fd79c7574a..37482e141f 100644
--- a/resources/lang/bg-BG/admin/licenses/message.php
+++ b/resources/lang/bg-BG/admin/licenses/message.php
@@ -44,10 +44,13 @@ return array(
         'error'   => 'Възникна проблем при изписването на лиценза. Моля, опитайте отново.',
         'success' => 'Лицензът е изписан',
         'not_enough_seats' => 'Няма достатъчно лицензи за изписване',
+        'mismatch' => 'Броя лицензни места не отговаря на броя лицензи',
+        'unavailable' => 'Този лиценз за работно място не е наличен за изписване.',
     ),
 
     'checkin' => array(
         'error'   => 'Възникна проблем при вписването на лиценза. Моля, опитайте отново.',
+        'not_reassignable' => 'Лиценза не може да се прехвърля',
         'success' => 'Лицензът е вписан'
     ),
 
diff --git a/resources/lang/bg-BG/admin/locations/message.php b/resources/lang/bg-BG/admin/locations/message.php
index f6a9c1f257..d1e30c7bd1 100644
--- a/resources/lang/bg-BG/admin/locations/message.php
+++ b/resources/lang/bg-BG/admin/locations/message.php
@@ -3,11 +3,12 @@
 return array(
 
     'does_not_exist' => 'Местоположението не съществува.',
-    'assoc_users'    => 'This location is not currently deletable because it is the location of record for at least one asset or user, has assets assigned to it, or is the parent location of another location. Please update your models to no longer reference this company and try again. ',
+    'assoc_users'    => 'Това местоположение не може да бъде изтрито, защото има поне един запис на актив или потребител, зачислен към него или съдържа под локаций. Моля обновете вашите записи, така че да не съдържат това местоположение и пробвайте да го изтриете отново. ',
     'assoc_assets'	 => 'Местоположението е свързано с поне един актив и не може да бъде изтрито. Моля, актуализирайте активите, така че да не са свързани с това местоположение и опитайте отново. ',
     'assoc_child_loc'	 => 'В избраното местоположение е присъединено едно или повече местоположения. Моля преместете ги в друго и опитайте отново.',
     'assigned_assets' => 'Изписани Активи',
     'current_location' => 'Текущо местоположение',
+    'open_map' => 'Отвори в :map_provider_icon карти',
 
 
     'create' => array(
@@ -20,6 +21,11 @@ return array(
         'success' => 'Местоположението е обновено.'
     ),
 
+    'restore' => array(
+        'error'   => 'Местоположението не беше възстановено, моля опитайте отново',
+        'success' => 'Местоположението е възстановено.'
+    ),
+
     'delete' => array(
         'confirm'   	=> 'Сигурни ли сте, че искате да изтриете това местоположение?',
         'error'   => 'Възникна проблем при изтриване на местоположението. Моля, опитайте отново.',
diff --git a/resources/lang/bg-BG/admin/locations/table.php b/resources/lang/bg-BG/admin/locations/table.php
index 14e79bf919..a92d618571 100644
--- a/resources/lang/bg-BG/admin/locations/table.php
+++ b/resources/lang/bg-BG/admin/locations/table.php
@@ -39,4 +39,5 @@ return [
     'signed_by_finance_auditor' => 'Подписан от (счетоводител):',
     'signed_by_location_manager' => 'Подписан от (мениджър):',
     'signed_by'                 => 'Подписано от:',
+    'clone'  					=> 'Клонирай местоположението',
 ];
diff --git a/resources/lang/bg-BG/admin/models/general.php b/resources/lang/bg-BG/admin/models/general.php
index 031e082548..04a2a03b82 100644
--- a/resources/lang/bg-BG/admin/models/general.php
+++ b/resources/lang/bg-BG/admin/models/general.php
@@ -3,7 +3,7 @@
 return array(
     'about_models_title'     => 'Относно модели на актив',
     'about_models_text'           => 'Модели на актив са начин за групиране на идентични активи. "MBP 2013", "IPhone 6s" и др.',
-    'deleted'  					        => 'Този модел беше изтрит.',
+    'deleted'  					=> 'Този модел беше изтрит.',
     'bulk_delete'               => 'Масово изтриване на модели на активите',
     'bulk_delete_help'               => 'Използвайте квадратчетата за отметка по-долу, за да потвърдите изтриването на избраните модели на активи. Моделите, за които има асоциирани активи, не могат да бъдат изтрити, докато активите не се асоциират с друг модел.',
     'bulk_delete_warn'          => 'Ще изтриете един модел.|Ще изтриете :model_count модела.',
diff --git a/resources/lang/bg-BG/admin/models/message.php b/resources/lang/bg-BG/admin/models/message.php
index ed6e1d1235..18535b9ab8 100644
--- a/resources/lang/bg-BG/admin/models/message.php
+++ b/resources/lang/bg-BG/admin/models/message.php
@@ -7,7 +7,7 @@ return array(
     'no_association' => 'ВНИМАНИЕ! Модела за този актив е неправилен или липсва!',
     'no_association_fix' => 'Това ще счупи нещата по много лош начин. Редактирайте артикула сега и го зачислете към модел.',
     'assoc_users'	 => 'Този модел е асоцииран с един или повече активи и не може да бъде изтрит. Моля изтрийте активите и опитайте отново.',
-
+    'invalid_category_type' => 'Тази категоря трябва да бъде за модели.',
 
     'create' => array(
         'error'   => 'Моделът не беше създаден. Моля опитайте отново.',
diff --git a/resources/lang/bg-BG/admin/reports/general.php b/resources/lang/bg-BG/admin/reports/general.php
index 41f50ba5b1..58d8d731f9 100644
--- a/resources/lang/bg-BG/admin/reports/general.php
+++ b/resources/lang/bg-BG/admin/reports/general.php
@@ -4,6 +4,7 @@ return [
     'info'   => 'Изберете опциите, които желаете за справката за активи.',
     'deleted_user' => 'Изтрит потребител',
     'send_reminder' => 'Изпрати напомняне',
+    'cannot_send_reminder' => 'Потребителя е бил изтрит или няма валиден е-майл адрес и не може да получи напомняне',
     'reminder_sent' => 'Напомнянето изпратено',
     'acceptance_deleted' => 'Заявката за приемане е изтрита',
     'acceptance_request' => 'Заявка за приемане',
@@ -13,5 +14,10 @@ return [
         'user_state' => 'Щат на потребителя',
         'user_country' => 'Държава на потребителя',
         'user_zip' => 'Пощенски код на потребителя'
-    ]
-];
\ No newline at end of file
+    ],
+    'open_saved_template' => 'Отвори записан шаблон',
+    'save_template' =>  'Запиши шаблон',
+    'select_a_template' => 'Избери шаблон',
+    'template_name' => 'Име на шаблон',
+    'update_template' => 'Обнови шаблон',
+];
diff --git a/resources/lang/bg-BG/admin/reports/message.php b/resources/lang/bg-BG/admin/reports/message.php
index ededaa0dea..2800bbdf0b 100644
--- a/resources/lang/bg-BG/admin/reports/message.php
+++ b/resources/lang/bg-BG/admin/reports/message.php
@@ -1,5 +1,16 @@
 <?php
 
-return array(
-    'error'   => 'Трябва да изберете поне една опция.'
-);
+return [
+    'about_templates' => 'About Saved Templates',
+    'saving_templates_description' => 'Select your options, then enter the name of your template in the box above and click the \'Save Template\' button. Use the dropdown to select a previously saved template.',
+    'create'  => [
+        'success' => 'Template saved successfully',
+    ],
+    'update' => [
+        'success' => 'Template updated successfully',
+    ],
+    'delete' => [
+        'success' => 'Template deleted',
+        'no_delete_permission' => 'Template does not exist or you do not have permission to delete it.',
+    ],
+];
diff --git a/resources/lang/bg-BG/admin/settings/general.php b/resources/lang/bg-BG/admin/settings/general.php
index 70549d0db0..5082aa5357 100644
--- a/resources/lang/bg-BG/admin/settings/general.php
+++ b/resources/lang/bg-BG/admin/settings/general.php
@@ -8,13 +8,13 @@ return [
     'ad_append_domain'          => 'Добави името на домейна към потребителското име',
     'ad_append_domain_help'     => 'От потребителя не се изисква да въвежда "username@domain.local", достатъчно е да напише само "username".',
     'admin_cc_email'            => 'CC електронна поща',
-    'admin_cc_email_help'       => 'Въведете допълнителни електронни адреси, ако желаете да се изпраща копие на електронните пощи при вписване и изписване на активи.',
+    'admin_cc_email_help'       => 'Изпращай копие на известията за вписване/изписване на следния е-майл адрес.',
     'admin_settings'            => 'Админ настройки',
     'is_ad'				        => 'Това е активна директория на сървър',
     'alerts'                	=> 'Известия',
     'alert_title'               => 'Обнови настройките за известие',
     'alert_email'				=> 'Изпращане на нотификации към',
-    'alert_email_help'    => 'Е-майл адреси или групов е-маил за известяване, разделен със запетайка',
+    'alert_email_help'          => 'Е-майл адреси или групов е-маил за известяване, разделен със запетайка.',
     'alerts_enabled'			=> 'Включване на известията',
     'alert_interval'			=> 'Изтичаш праг на известия (в дни)',
     'alert_inv_threshold'		=> 'Праг на известия за запаси',
@@ -31,6 +31,8 @@ return [
     'backups'					=> 'Архивиране',
     'backups_help'              => 'Създаване, сваляне и възстановяване на архиви ',
     'backups_restoring'         => 'Възстановяване от архив',
+    'backups_clean' => 'Почисти архива на базата преди възстановяване',
+    'backups_clean_helptext' => "Това може да е полесно при смяна на версията на базата",
     'backups_upload'            => 'Качване на архив',
     'backups_path'              => 'Архивите на сървъра са записани в <code>:path</code>',
     'backups_restore_warning'   => 'Използвайте бутона за възстановяване <small><span class="btn btn-xs btn-warning"><i class="text-white fas fa-retweet" aria-hidden="true"></i></span></small> ,за да възстановите архивно копие. (Това не работи с S3 файлова система или Docker.)<br><br>Вашата <strong>цяла :app_name датабаза и всички качени файлове ще бъдат заменени</strong> от съдържанието на архива.  ',
@@ -40,6 +42,7 @@ return [
     'confirm_purge'			    => 'Потвърдете пречистване ',
     'confirm_purge_help'		=> 'Моля да потвърдите изтриването като въведете думата "DELETE" в полето. Изтриването не може да се прекрати и всички записи който са маркирани за истриване, ще бъдат безвъзвратно изтрити. (Добре е да направите архив преди това.)',
     'custom_css'				=> 'Потребителски CSS',
+    'custom_css_placeholder'	=> 'Добавете ваш персонализиран CSS',
     'custom_css_help'			=> 'Включете вашите CSS правила тук. Не използвайте &lt;style&gt;&lt;/style&gt; тагове.',
     'custom_forgot_pass_url'	=> 'Персонализиран адрес за възстановяване на паролата',
     'custom_forgot_pass_url_help'	=> 'Това URL ще замени вградения механизъм за възстановяване на паролата на входния екран, което е полезно за потребителите, използващи външни оторизации като LDAP. Това ефективно ще спре възможността за възстановяване на паролата за потребителите, управлявани през Sinpe-it.',
@@ -47,34 +50,34 @@ return [
     'dashboard_message_help'	=> 'Този текст ще се появи на таблото на всички потребители с права за достъп до таблото.',
     'default_currency'  		=> 'Валута по подразбиране',
     'default_eula_text'			=> 'EULA по подразбиране',
+    'default_eula_text_placeholder' => 'Добавете ваш EULA',
     'default_language'			=> 'Език по подразбиране',
     'default_eula_help_text'	=> 'Можете да асоциирате специфична EULA към всяка избрана категория.',
-    'acceptance_note'           => 'Add a note for your decision (Optional)',
+    'acceptance_note'           => 'Добавете бележка за вашето решение (По желание)',
     'display_asset_name'        => 'Визуализиране на актив',
     'display_checkout_date'     => 'Визуализиране на дата на изписване',
     'display_eol'               => 'Визуализиране на EOL в таблиците',
-    'display_qr'                => 'Показване на Square кодове',
+    'display_qr'                => 'Показвай 2D баркод',
     'display_alt_barcode'		=> 'Показване на 1D баркод',
-    'email_logo'                => 'Е-майл лого',
     'barcode_type'				=> '2D тип на баркод',
     'alt_barcode_type'			=> '1D тип на баркод',
-    'email_logo_size'       => 'Квадратно лого в е-майлът изглежда най-добре. ',
     'enabled'                   => 'Активно',
     'eula_settings'				=> 'Настройки на EULA',
     'eula_markdown'				=> 'Съдържанието на EULA може да бъде форматирано с <a href="https://help.github.com/articles/github-flavored-markdown/">Github flavored markdown</a>.',
+    'empty_row_count'           => 'Отместване на началото на полето (Празни редове)',
+    'empty_row_count_help'      => 'Полетата ще започнат да се попълват след като празните редове се презкочат в началото на етикета.',
     'favicon'                   => 'Favicon',
     'favicon_format'            => 'Приетите файлови формати са ico, png, и gif. Другите формати на снимки може да не работят в всъчки браузъри.',
     'favicon_size'          => 'Favicons трябва да бъдат квадратна снимка с размери, 16х16 пиксела.',
     'footer_text'               => 'Допълнителен текст във футъра',
     'footer_text_help'          => 'Този текст ще се визуализира в дясната част на футъра. Връзки могат да бъдат добавяни с използването на <a href="https://help.github.com/articles/github-flavored-markdown/">Github тип markdown</a>. Нови редове, хедър тагове, изображения и т.н. могат да доведат до непредвидими резултати.',
+    'footer_text_placeholder'   => 'Опционален текст на долния колонтитул',
     'general_settings'			=> 'Общи настройки',
-    'general_settings_keywords' => 'поддръжка, подписи, получаване, формат на е-майл, формат на потребителско име, снимки, страници, иконки, EULA, Gravatar, tos, панели, поверителност',
     'general_settings_help'     => 'Общи условия и други',
     'generate_backup'			=> 'Създаване на архив',
     'google_workspaces'         => 'Google Workspaces',
     'header_color'              => 'Цвят на хедъра',
     'info'                      => 'Тези настройки позволяват да конфигурирате различни аспекти на Вашата инсталация.',
-    'label_logo'                => 'Лого за етикет',
     'label_logo_size'           => 'Квадратните логота изглеждат най-добре - ще бъдат показани в горния десен ъгъл на всеки артикулен етикет. ',
     'laravel'                   => 'Версия на Laravel',
     'ldap'                      => 'LDAP',
@@ -94,7 +97,7 @@ return [
     'ldap_login_sync_help'      => 'Това единствено проверява дали LDAP може да се синхронизира успешно. Ако вашата LDAP заявка за оторизация не е коректна е възможно потребителите да не могат да влязат. НЕОБХОДИМО Е ДА ЗАПИШЕТЕ LDAP НАСТРОЙКИТЕ ПРЕДИ ТОВА.',
     'ldap_manager'              => 'LDAP мениджър',
     'ldap_server'               => 'LDAP сървър',
-    'ldap_server_help'          => 'Това трябва да започва с Idap:// (for unencrypted or TLS) или Idaps:// (for SSL)',
+    'ldap_server_help'          => 'Това трябва да започва с Idap:// (for unencrypted) или Idaps:// (for TLS or SSL)',
     'ldap_server_cert'			=> 'Валидация на LDAP SSL сертификата',
     'ldap_server_cert_ignore'	=> 'Допускане на невалиден SSL сертификат',
     'ldap_server_cert_help'		=> 'Изберете тази опция ако използвате самоподписан SSL сертификат.',
@@ -108,8 +111,8 @@ return [
     'ldap_pword'                => 'LDAP парола на потребител за връзка',
     'ldap_basedn'               => 'Базов DN',
     'ldap_filter'               => 'LDAP филтър',
-    'ldap_pw_sync'              => 'LADP Password SYNC',
-    'ldap_pw_sync_help'         => 'Премахнете отметката в тази клетка ако не желаете да запазите LDAP паролите синхронизирани с локални пароли. Деактивиране на това означава, че вашите потребители може да не успеят да влязат използвайки LDAP сървъри ако са недостижими по някаква причина.',
+    'ldap_pw_sync'              => 'Кеш за LDAP Пароли',
+    'ldap_pw_sync_help'         => 'Махнете отметката, ако не желаете да се пази кеш за LDAP пароли, като локален хеш. Забранявайки този опция означава, че вашите потребители няма да могат да се впишат ако не работи LDAP сървъра поради някаква причина.',
     'ldap_username_field'       => 'Поле за потребителско име',
     'ldap_lname_field'          => 'Фамилия',
     'ldap_fname_field'          => 'LDAP собствено име',
@@ -117,13 +120,15 @@ return [
     'ldap_version'              => 'LDAP версия',
     'ldap_active_flag'          => 'LDAP флаг за активност',
     'ldap_activated_flag_help'  => 'Тази стойност определя дали синхронизирания потребител може да се логва в Snipe-IT. <strong>Не се премахва възможността да се изписват активи към потребителя</strong> и полето трябва да бъде <strong>attribute name</strong> от вашата AD/LDAP, а не <strong>неговата стройност</strong>. <br><br>Ако това поле не съществува във вашата AD/LDAP или стойността е <code>0</code> или <code>false</code> <strong>достъпа на потребителя ще бъде забранен</strong>. Ако стойността в AD/LDAP полето е <code>1</code> или <code>true</code> означава че потребителя може да се логва. Когато това поле е празно във вашата AD се приема <code>userAccountControl</code> атрибута, който обикновенно позволява не блокираните потребители да се логват.',
+    'ldap_invert_active_flag'   => 'LDAP Инвертиране на активния флаг',
+    'ldap_invert_active_flag_help'     => 'Ако е включено, когато стойноста на полето LDAP Active Flag е <code>0</code> или <code>false</code> потребителя ще е активен.',
     'ldap_emp_num'              => 'LDAP номер на служител',
     'ldap_email'                => 'LDAP електронна поща',
     'ldap_test'                 => 'Тест LDAP',
     'ldap_test_sync'            => 'Тест LDAP Синхронизация',
     'license'                   => 'Софтуерен лиценз',
-    'load_remote'               => 'Използвай Gravatar',
-    'load_remote_help_text'		=> 'Махнете отметката, ако нямате достъп до интернет. Това ще забрани на Snipe-IT да пробва да зареди аватар снимките от Gravatar.',
+    'load_remote'               => 'Зареждане на отдалечени аватари',
+    'load_remote_help_text'		=> 'Премахнете отметката от това квадратче, ако вашата инсталация не може да зареди скриптове от външен интернет. Това ще попречи на Snipe-IT да се опита да зареди аватари от Gravatar или други външни източници.',
     'login'                     => 'Опити за вход',
     'login_attempt'             => 'Опит за вход',
     'login_ip'                  => 'IP Адрес',
@@ -131,6 +136,7 @@ return [
     'login_user_agent'          => 'Потребителски агент',
     'login_help'                => 'Списък на опитите за достъп',
     'login_note'                => 'Вход забележка',
+    'login_note_placeholder'            => "Ако нямате потребител или сте намерили загубено устройство принадлежащо на тази компания, моля свържете се на официалният им телефон.",
     'login_note_help'           => 'По избор включете няколко изречения на екрана за вход, например, за да помогнете на хора, които са намерили изгубено или откраднато устройство. Това поле приема <a href="https://help.github.com/articles/github-flavored-markdown/">Github flavored markdown</a>',
     'login_remote_user_text'    => 'Опции за вход с Remote User',
     'login_remote_user_enabled_text' => 'Включване на вход с HTTP хедър Remote User',
@@ -146,13 +152,16 @@ return [
     'logo_print_assets_help'    => 'Показвай логото при печат на листа с артикули ',
     'full_multiple_companies_support_help_text' => 'Ограничаване на потребителите (включително административните) до активите на собствената им компания.',
     'full_multiple_companies_support_text' => 'Поддръжка на множество компании',
+    'scope_locations_fmcs_support_text'  => 'Подружка на множество местоположения и много фирми',
+    'scope_locations_fmcs_support_help_text'  => 'Ограничи местоположенията до техните избрани фирми.',
+    'scope_locations_fmcs_check_button' => 'Проверка за съвместимост',
+    'scope_locations_fmcs_support_disabled_text'  => 'Тази опция е забранена, защото имате конфликт на настройката на местоположение на :count или повече артикула.',
     'show_in_model_list'   => 'Показване в падащите менюта на моделите',
     'optional'					=> 'незадължително',
     'per_page'                  => 'Резултати на страница',
     'php'                       => 'PHP версия',
     'php_info'                  => 'PHP инфо',
     'php_overview'              => 'PHP',
-    'php_overview_keywords'     => 'phpinfo, система, информация',
     'php_overview_help'         => 'PHP Системна информация',
     'php_gd_info'               => 'Необходимо е да инсталирате php-gd, за да визуализирате QR кодове. Моля прегледайте инструкцията за инсталация.',
     'php_gd_warning'            => 'php-gd НЕ е инсталиран.',
@@ -218,6 +227,8 @@ return [
     'webhook_integration_help'    => ':app интеграцията е по избор, въпреки че крайната цел и канала са задължителни, ако искате да я ползате. За да се конфигурира :app интеграцията трябва първо да <a href=":webhook_link" target="_new" rel="noopener"> създадете входяща webhook</a> във вашият :app акаунт. Кликнете на <strong>Тест :app интеграция</strong> бутона за да потвърдите, че всичко работи преди да запишете настройките. ',
     'webhook_integration_help_button'    => 'След като запишите вашата информация за :app, ще се пояави тест бутон.',
     'webhook_test_help'           => 'Тест за коректна конфигурация на :app интеграцията. НЕОБХОДИМО Е ПЪРВО ДА ЗАПИШЕТЕ :app НАСТРОЙКИТЕ.',
+    'shortcuts_enabled'         => 'Enable Shortcuts',
+    'shortcuts_help_text'       => '<strong>Windows</strong>: Alt + Access key, <strong>Mac</strong>: Control + Option + Access key',
     'snipe_version'  			=> 'Snipe-IT версия',
     'support_footer'            => 'Връзки към Snipe-it поддръжката във футъра',
     'support_footer_help'       => 'Указва визуализацията на връзки към поддръжката на Snipe-IT и потребителската документация',
@@ -227,7 +238,6 @@ return [
     'update'                    => 'Обновяване на настройките',
     'value'                     => 'Стойност',
     'brand'                     => 'Брандиране',
-    'brand_keywords'            => 'долен колонтитул, лого, печат, тема, скин, горен колонтитул, цветове, css',
     'brand_help'                => 'Лого, Име на сайт',
     'web_brand'                 => 'Тип уеб брандиране',
     'about_settings_title'      => 'Относно настройките',
@@ -276,6 +286,8 @@ return [
     'two_factor_enrollment_text'	=> "Двуфакторово удостоверяване се изисква, но вашето устройство не е било регистрирано още. Отворете Google Authenticator и сканирайте QR кода по-долу за да регистрирате вашето устройство. След като сте записани вашето устройство, въведете кода по-долу",
     'require_accept_signature'      => 'Изисква подпис',
     'require_accept_signature_help_text'      => 'Разрешаването на тази функция ще изисква от потребителите да се подпишат физически за приемане на даден актив.',
+    'require_checkinout_notes'  => 'Require Notes on Checkin/Checkout',
+    'require_checkinout_notes_help_text'    => 'Enabling this feature will require the note fields to be populated when checking in or checking out an asset.',
     'left'        => 'ляво',
     'right'        => 'дясно',
     'top'        => 'Горе',
@@ -287,18 +299,18 @@ return [
     'zerofill_count'        => 'Дължина на етикети на актив, включително zerofill',
     'username_format_help'   => 'Тази настройка се изпозлва само при импортиране, ако потребителя не е въведен и ние трябва да му генерираме потребителско име.',
     'oauth_title' => 'OAuth API Настройки',
-    'oauth_clients' => 'OAuth Clients',
+    'oauth_clients' => 'OAuth Клиенти',
     'oauth' => 'OAuth',
     'oauth_help' => 'Oauth Endpoint настройки',
-    'oauth_no_clients' => 'You have not created any OAuth clients yet.',
-    'oauth_secret' => 'Secret',
-    'oauth_authorized_apps' => 'Authorized Applications',
-    'oauth_redirect_url' => 'Redirect URL',
-    'oauth_name_help' => ' Something your users will recognize and trust.',
-    'oauth_scopes' => 'Scopes',
-    'oauth_callback_url' => 'Your application authorization callback URL.',
-    'create_client' => 'Create Client',
-    'no_scopes' => 'No scopes',
+    'oauth_no_clients' => 'Все още не сте създали OAuth клиенти.',
+    'oauth_secret' => 'Тайна',
+    'oauth_authorized_apps' => 'Оторизирани приложения',
+    'oauth_redirect_url' => 'URL адрес за пренасочване',
+    'oauth_name_help' => ' Нещо, на което вашите потребители ще разпознаят и ще се доверят.',
+    'oauth_scopes' => 'Обхват',
+    'oauth_callback_url' => 'Вашият URL адрес за обратно извикване за оторизация.',
+    'create_client' => 'Създайте клиент',
+    'no_scopes' => 'Без обхват',
     'asset_tag_title' => 'Обнови настроките на етикета на актива',
     'barcode_title' => 'Обнови настройките на баркод',
     'barcodes' => 'Баркоди',
@@ -313,24 +325,24 @@ return [
     'filter_by_keyword' => 'Филтър по ключова дума',
     'security' => 'Сигурност',
     'security_title' => 'Обнови настройките за сигурност',
-    'security_keywords' => 'парола, парили, изисквания, двустепенна идентификация, двустепенна-идентификация, общи пароли, отдалечен вход, изход, идентификация',
     'security_help' => 'Двустепенна идентификация, ограничения на пароли',
-    'groups_keywords' => 'права за достъп, групи за достъп, упълномощаване',
     'groups_help' => 'Групи с разрешения за акаунт',
     'localization' => 'Локализация',
     'localization_title' => 'Обнови настройките за локализация',
-    'localization_keywords' => 'локализация, валута, местен, място, часова зона, международен, интернационализация, език, езици, превод',
     'localization_help' => 'Език, дата формат',
     'notifications' => 'Известия',
     'notifications_help' => 'Настройки на е-майл известия',
     'asset_tags_help' => 'Автоматично номериране и префикси',
     'labels' => 'Етикети',
     'labels_title' => 'Обнови настройките на етикета',
-    'labels_help' => 'Размер на етикета &amp; настройки',
-    'purge_keywords' => 'изтриване за постоянно',
+    'labels_help' => 'Barcodes &amp; label settings',
     'purge_help' => 'Пречисти изтрити записи',
     'ldap_extension_warning' => 'Изглежда, че нямате инсталирани LDAP разширения или не са пуснати на сървъра. Вие можете все пак да запишите настройките, но ще трябва да включите LDAP разширенията за PHP преди да синхронизирате с LDAP, в противен случай няма да можете да се логнете.',
     'ldap_ad' => 'LDAP/AD',
+    'ldap_test_label' => 'Test LDAP Sync',
+    'ldap_test_login' => ' Test LDAP Login',
+    'ldap_username_placeholder' => 'LDAP Username',
+    'ldap_password_placeholder' => 'LDAP Password',
     'employee_number' => 'Номер на служител',
     'create_admin_user' => 'Нов потребител ::',
     'create_admin_success' => 'Готово! Вашият админ потребител беше добавен!',
@@ -342,6 +354,8 @@ return [
     'setup_migration_create_user' => 'Следва: Създаване на потребител',
     'ldap_settings_link' => 'LDAP настройки',
     'slack_test' => 'Тест <i class="fab fa-slack"></i> интеграция',
+    'status_label_name' => 'Status Label Name',
+    'super_admin_only'  => 'Super Admin Only',
     'label2_enable'           => 'Нов генератор за етикети',
     'label2_enable_help'      => 'Използвайте новия генератор за етикети. <b>Забележка: Трябва да изберете тази настройка и да запишете преди да променята другите настройки.</b>',
     'label2_template'         => 'Шаблон',
@@ -356,12 +370,15 @@ return [
     'label2_2d_type'          => '2D тип на баркод',
     'label2_2d_type_help'     => 'Формат на 2D баркод',
     'label2_2d_target'        => '2D баркод адрес',
-    'label2_2d_target_help'   => 'Къде да сочи URL адреса на 2D баркода, когато се сканира',
+    'label2_2d_target_help'   => 'The data that will be contained in the 2D barcode',
     'label2_fields'           => 'Настройки на полета',
     'label2_fields_help'      => 'Полетата могат да бъдат добавяни, премахване и подреждани от лявата колона. За всяко едно поле, множество настройки могат да бъдат добавяни премахвани и подреждани в дясната колона.',
+    'purge_barcodes' => 'Purge Barcodes',
     'help_asterisk_bold'    => 'Текста въведен като <code>**text**</code> ,ще бъде показан удебелено',
     'help_blank_to_use'     => 'Оставете празно за да се ползва стойност от <code>:setting_name</code>',
-    'help_default_will_use' => '<code>:default</code> ще използва стойност от <code>:setting_name</code>. <br>Стойността на баркода трябва да отговаря на изискванията за баркод или той няма да се генерира. Моля вижте следното<a href="https://snipe-it.readme.io/docs/barcodes">упътване <i class="fa fa-external-link"></i></a> за повече информация. ',
+    'help_default_will_use' => '<code>:default</code> will use the value from <code>:setting_name</code>. <br>Note that the value of the barcodes must comply with the respective barcode spec in order to be successfully generated. Please see <a href="https://snipe-it.readme.io/docs/barcodes">the documentation <i class="fa fa-external-link"></i></a> for more details. ',
+    'asset_id'              => 'Asset ID',
+    'data'               => 'Data',
     'default'               => 'Подразбиране',
     'none'                  => 'Няма',
     'google_callback_help' => 'Това трябва да се въведе като callback URL във вашият Google OAuth настройки за вашата организация &apos;s <strong><a href="https://console.cloud.google.com/" target="_blank">Google developer console <i class="fa fa-external-link" aria-hidden="true"></i></a></strong>.',
@@ -373,7 +390,100 @@ return [
     'database_driver' => 'Драйвер на датабаза',
     'bs_table_storage' => 'Table Storage',
     'timezone' => 'Часова зона',
-    'profile_edit'          => 'Edit Profile',
-    'profile_edit_help'          => 'Allow users to edit their own profiles.',
+    'test_mail' => 'Test Mail',
+    'profile_edit'          => 'Редактиране на профил',
+    'profile_edit_help'          => 'Позволете на потребителите сами да могат да редактират собствените си профили.',
+    'default_avatar' => 'Custom Default Avatar',
+    'default_avatar_help' => 'This image will be displayed as a profile if a user does not have a profile photo.',
+    'restore_default_avatar' => 'Restore <a href=":default_avatar" data-toggle="lightbox" data-type="image">original system default avatar</a>',
+    'restore_default_avatar_help' => '',
+    'due_checkin_days' => 'Due For Checkin Warning',
+    'due_checkin_days_help' => 'How many days before the expected checkin of an asset should it be listed in the "Due for checkin" page?',
+    'no_groups' => 'No groups have been created yet. Visit <code>Admin Settings > Permission Groups</code> to add one.',
+    'text' => 'Text',
+
+    'username_formats' => [
+        'username_format'		=> 'Формат на потребителско име',
+        'firstname_lastname_format'	=> 'Име Фамилия (jane.smith)',
+        'first_name_format'	        => 'First Name (jane)',
+        'last_name_format'		=> 'Last Name (doe)',
+        'filastname_format'			=> 'First Initial Last Name (jsmith)',
+        'lastnamefirstinitial_format' =>  'Last Name First Initial (smithj)',
+        'firstname_lastname_underscore_format' => 'First Name Last Name (jane_smith)',
+        'firstinitial.lastname' => 'First Initial Last Name (j.smith)',
+        'lastname_firstinitial' => 'Last Name First Initial (smith_j)',
+        'lastname_dot_firstinitial_format' => 'Last Name First Initial (smith.j)',
+        'firstnamelastname'     => 'First Name Last Name (janesmith)',
+        'firstnamelastinitial'  => 'First Name Last Initial (janes)',
+        'lastnamefirstname'      => 'Фамилно име.Собствено име (smith.jane)',
+    ],
+
+    'email_formats' => [
+        'email_format'			=> 'Email формат',
+        'firstname_lastname_format'	=> 'Име Фамилия (jane.smith@example.com)',
+        'first_name_format'		=> 'Име (jane@example.com)',
+        'last_name_format'		=> 'Last Name (doe@example.com)',
+        'filastname_format'			=> 'Инициал на името Фамилия (jsmith@example.com)',
+        'lastnamefirstinitial_format' =>  'Фамилно име Инициал на собствено (smithj@example.com)',
+        'firstname_lastname_underscore_format' => 'Име Фамилия (jane.smith@example.com)',
+        'firstinitial.lastname' => 'Първа буква от името и Фамилия (i.ivanov@example.com)',
+        'lastname_firstinitial' => 'Фамилия и Първа буква от име (ivanov_i@example.com)',
+        'lastname_dot_firstinitial_format' => 'Last Name First Initial (smith.j@example.com)',
+        'firstnamelastname'     => 'Име и Фамилия (ivan.ivanov@example.com)',
+        'firstnamelastinitial'  => 'Име и първа буква от фамилия (ivani@example.com)',
+        'lastnamefirstname'      => 'Фамилно име.Собствено име (smith.jane@example.com)',
+    ],
+
+
+
+    'logo_labels' => [
+        'acceptance_pdf_logo'       => 'PDF Logo',
+        'email_logo'                => 'Е-майл лого',
+        'label_logo'                => 'Лого за етикет',
+        'logo'                      => 'Site Logo',
+        'favicon'                   => 'Favicon',
+    ],
+
+    'logo_help' => [
+        'email_logo_size'       => 'Квадратно лого в е-майлът изглежда най-добре. ',
+    ],
+
+    'logo_option_types' => [
+        'text' => 'Text',
+        'logo' => 'Лого',
+        'logo_and_text' => 'Logo and Text',
+    ],
+
+
+    'legends' => [
+        'scoping' => 'Scoping',
+        'formats' => 'Default Formats',
+        'profiles' => 'User Profiles',
+        'eula' => 'EULA & Acceptance Preferences',
+        'misc_display' => 'Miscellaneous Display Options',
+        'email' => 'Email Preferences',
+        'checkin' => 'Checkin Preferences',
+        'dashboard' => 'Login & Dashboard Preferences',
+        'misc' => 'Miscellaneous',
+        'logos' => 'Logos & Display',
+        'colors' => 'Colors & Skins',
+        'footer' => 'Footer Preferences',
+        'security' => 'Security Preferences',
+        'general' => 'General',
+        'intervals' => 'Intervals & Thresholds',
+    ],
+
+
+    /* Keywords for settings overview help */
+    'keywords' => [
+        'brand'             => 'долен колонтитул, лого, печат, тема, скин, горен колонтитул, цветове, css',
+        'general_settings'  => 'поддръжка, подписи, получаване, формат на е-майл, формат на потребителско име, снимки, страници, иконки, EULA, Gravatar, tos, панели, поверителност',
+        'groups'            => 'права за достъп, групи за достъп, упълномощаване',
+        'labels'            => 'labels, barcodes, barcode, sheets, print, upc, qr, 1d, 2d',
+        'localization'      => 'локализация, валута, местен, място, часова зона, международен, интернационализация, език, езици, превод',
+        'php_overview'      => 'phpinfo, система, информация',
+        'purge'             => 'изтриване за постоянно',
+        'security'          => 'парола, парили, изисквания, двустепенна идентификация, двустепенна-идентификация, общи пароли, отдалечен вход, изход, идентификация',
+    ],
 
 ];
diff --git a/resources/lang/bg-BG/admin/settings/message.php b/resources/lang/bg-BG/admin/settings/message.php
index e23a9dacb6..9c5389c132 100644
--- a/resources/lang/bg-BG/admin/settings/message.php
+++ b/resources/lang/bg-BG/admin/settings/message.php
@@ -14,6 +14,9 @@ return [
         'restore_warning'       => 'Да, потвърди възстановяването. Това ще презапише цялата информация в датабазата и ще отпише всички вписани потребители включително вас.',
         'restore_confirm'       => 'Сигурни ли сте че искате да възстановите датабазата от :filename?'
     ],
+    'restore' => [
+        'success'               => 'Your system backup has been restored. Please log in again.'
+    ],
     'purge' => [
         'error'     => 'Възникна грешка при пречистване. ',
         'validation_failed'     => 'Потвърждението ви за пречистване не неправилно. Моля напишете думата "DELETE" в клетката за потвърждаване.',
@@ -33,6 +36,9 @@ return [
         'testing_authentication' => 'Тест LDAP Автентификация...',
         'authentication_success' => 'Потребителска Автентификация към LDAP успешна!'
     ],
+    'labels' => [
+        'null_template' => 'Label template not found. Please select a template.',
+        ],
     'webhook' => [
         'sending' => 'Изпращане :app тест съобщение...',
         'success' => 'Вашата :webhook_name интеграция работи!',
@@ -42,5 +48,12 @@ return [
         'error' => 'Възникна грешка. :app върна грешка: :error_message',
         'error_redirect' => 'Грешка 301/302 :endpoint върна пренасочване. От съображения за сигурност, ние не отваряме пренасочванията. Моля ползвайте действителната крайна точка.',
         'error_misc' => 'Възникна грешка. :( ',
-    ]
+        'webhook_fail' => ' webhook notification failed: Check to make sure the URL is still valid.',
+        'webhook_channel_not_found' => ' webhook channel not found.',
+        'ms_teams_deprecation' => 'The selected Microsoft Teams webhook URL will be deprecated Dec 31st, 2025. Please use a workflow URL. Microsoft\'s documentation on creating a workflow can be found <a href="https://support.microsoft.com/en-us/office/create-incoming-webhooks-with-workflows-for-microsoft-teams-8ae491c7-0394-4861-ba59-055e33f75498" target="_blank"> here.</a>',
+    ],
+    'location_scoping' => [
+        'not_saved' => 'Your settings were not saved.',
+        'mismatch' => 'There is 1 item in the database that need your attention before you can enable location scoping.|There are :count items in the database that need your attention before you can enable location scoping.',
+    ],
 ];
diff --git a/resources/lang/bg-BG/admin/statuslabels/table.php b/resources/lang/bg-BG/admin/statuslabels/table.php
index 466d67ea6e..e5f4bfc2c4 100644
--- a/resources/lang/bg-BG/admin/statuslabels/table.php
+++ b/resources/lang/bg-BG/admin/statuslabels/table.php
@@ -1,14 +1,14 @@
 <?php
 
 return array(
-    'about'      	=> 'Относно статус етикетите',
+    'about'      	=> 'About Status Types',
     'archived'      	=> 'Архивирани',
     'create'      	=> 'Създаване на статус етикет',
     'color'      	=> 'Цвят на диаграма',
     'default_label' => 'Етикет по подразбиране',
     'default_label_help' => 'Позиционира най-често използваните етикети в началото на падащото меню за избор при създаване и редактиране на активи.',
     'deployable'      	=> 'Може да бъде предоставен',
-    'info'      	=> 'Статусите се използват за описване на различните състояния на Вашите активи. Например, това са Предаден за ремонт, Изгубен/откраднат и др. Можете да създавате нови статуси за активите, които могат да бъдат предоставяни, очакващи набавяне и архивирани.',
+    'info'      	=> 'Status label types are used to describe the various states your assets could be in. They may be out for repair, lost/stolen, etc. You can create new status labels for your deployable, pending and archived assets according to your own workflow. For more information, <a href="https://snipe-it.readme.io/docs/overview#status-labels" target="_blank">see the documentation <i class="fa fa-external-link"></i></a>.',
     'name'      	=> 'Статус',
     'pending'      	=> 'Изчакване',
     'status_type'   => 'Тип на статуса',
diff --git a/resources/lang/bg-BG/admin/users/general.php b/resources/lang/bg-BG/admin/users/general.php
index dca402fdfa..4cfe2862ff 100644
--- a/resources/lang/bg-BG/admin/users/general.php
+++ b/resources/lang/bg-BG/admin/users/general.php
@@ -19,6 +19,8 @@ return [
     'print_assigned'    => 'Печат на всички отдадени',
     'email_assigned'    => 'Изпрати Е-майл списък на всички заведени активи',
     'user_notified'     => 'На потребителя беше изпратен списак по е-майл с неговите заведени активи.',
+    'users_notified'    => 'The user has been emailed a list of their currently assigned items.|:count users have been emailed a list of their currently assigned items.',
+    'users_notified_warning' => ':count user has been emailed a list of their currently assigned items, however :no_email users did not have an email address so could not be emailed.|:count users have been emailed a list of their currently assigned items, however :no_email user(s) did not have an email address so could not be emailed.',
     'auto_assign_label' => 'Включи този потребител при автоматичното асоцииране на лицензи',
     'auto_assign_help'  => 'Не включвай този потребител при автоматичното асоцииране на лицензи',
     'software_user'     => 'Софтуерни продукти, изписани на :name',
diff --git a/resources/lang/bg-BG/admin/users/message.php b/resources/lang/bg-BG/admin/users/message.php
index 5a15131561..239bd8bbe1 100644
--- a/resources/lang/bg-BG/admin/users/message.php
+++ b/resources/lang/bg-BG/admin/users/message.php
@@ -6,7 +6,7 @@ return array(
     'declined'                  => 'Активът беше отказан.',
     'bulk_manager_warn'	        => 'Вашите потребителски профили бяха обновени успешно, обаче вашето управителско вписване не беше запазено, защото управителят, които сте избрали бе в списъка с потребителски профили за промяна и потребителите не могат да бъдат свои управители. Моля изберете вашите потребителски профили отново, с изключение на управителя.',
     'user_exists'               => 'Потребителят вече съществува!',
-    'user_not_found'            => 'Потребителят не съществува.',
+    'user_not_found'            => 'User does not exist or you do not have permission view them.',
     'user_login_required'       => 'Полето за вход е задължително',
     'user_has_no_assets_assigned' => 'Няма заведени активи на този потребител.',
     'user_password_required'    => 'Паролата е задължителна.',
@@ -37,22 +37,23 @@ return array(
         'update' => 'Възникна проблем при обновяването на този потребител. Моля, опитайте отново.',
         'delete' => 'Възникна проблем при изтриването на този потребител. Моля, опитайте отново.',
         'delete_has_assets' => 'Този потребител има зададени елементи и не може да бъде изтрит.',
-        'delete_has_assets_var' => 'This user still has an asset assigned. Please check it in first.|This user still has :count assets assigned. Please check their assets in first.',
-        'delete_has_licenses_var' => 'This user still has a license seats assigned. Please check it in first.|This user still has :count license seats assigned. Please check them in first.',
-        'delete_has_accessories_var' => 'This user still has an accessory assigned. Please check it in first.|This user still has :count accessories assigned. Please check their assets in first.',
-        'delete_has_locations_var' => 'This user still manages a location. Please select another manager first.|This user still manages :count locations. Please select another manager first.',
-        'delete_has_users_var' => 'This user still manages another user. Please select another manager for that user first.|This user still manages :count users. Please select another manager for them first.',
+        'delete_has_assets_var' => 'Този потребител все още има присвоен актив. Моля, първо го проверете.|Този потребител все още има присвоени :count активи. Моля, първо проверете активите им.',
+        'delete_has_licenses_var' => 'Този потребител все още има присвоени лицензи. Моля, първо го проверете.|Този потребител все още има :count присвоени лицензи. Моля, първо ги проверете.',
+        'delete_has_accessories_var' => 'Този потребител все още има присвоен аксесоар. Моля, първо го проверете.|Този потребител все още има :count присвоени аксесоари. Моля, първо проверете активите им.',
+        'delete_has_locations_var' => 'Този потребител все още управлява местоположение. Моля, първо изберете друг мениджър.|Този потребител все още управлява :count местоположения. Моля, първо изберете друг мениджър.',
+        'delete_has_users_var' => 'Този потребител все още управлява друг потребител. Моля, първо изберете друг мениджър за този потребител.|Този потребител все още управлява :count потребители. Моля, първо изберете друг мениджър за тях.',
         'unsuspend' => 'Проблем при активирането на потребителя. Моля опитайте отново.',
         'import'    => 'Проблем при зареждането на потребителите. Моля опитайте отново.',
         'asset_already_accepted' => 'Този актив е вече приет.',
         'accept_or_decline' => 'Трябва да приемете или да откажете този актив.',
-        'cannot_delete_yourself' => 'We would feel really bad if you deleted yourself, please reconsider.',
+        'cannot_delete_yourself' => 'Ще се почувстваме много зле, ако се изтриете, моля, помислете отново.',
         'incorrect_user_accepted' => 'Активът, който се опитвате да приемете не е изписан към Вас.',
         'ldap_could_not_connect' => 'Проблем при комуникацията с LDAP сървъра. Моля прегледайте конфигурацията на LDAP.<br/>Грешка от LDAP сървъра: ',
         'ldap_could_not_bind' => 'Проблем при връзката с LDAP сървъра. Моля прегледайте конфигурацията на LDAP.<br/>Грешка от LDAP сървъра: ',
         'ldap_could_not_search' => 'Проблем при търсенето в LDAP сървъра. Моля прегледайте конфигурацията на LDAP.<br/>Грешка от LDAP сървъра: ',
         'ldap_could_not_get_entries' => 'Проблем при извличането на резултат от LDAP сървъра. Моля прегледайте конфигурацията на LDAP.<br/>Грешка от LDAP сървъра:',
         'password_ldap' => 'Паролата за този профил се управлява от LDAP / Active Directory. Моля, свържете се с вашия ИТ отдел, за да промените паролата си.',
+        'multi_company_items_assigned' => 'This user has items assigned that belong to a different company. Please check them in or edit their company.'
     ),
 
     'deletefile' => array(
diff --git a/resources/lang/bg-BG/admin/users/table.php b/resources/lang/bg-BG/admin/users/table.php
index 2c5c15f74c..654c593be6 100644
--- a/resources/lang/bg-BG/admin/users/table.php
+++ b/resources/lang/bg-BG/admin/users/table.php
@@ -22,7 +22,7 @@ return array(
     'managed_locations'     => 'Управлявани места',
     'managed_users'         => 'Управлявани потребители',
     'name' 					=> 'Име',
-    'nogroup'               => 'Няма създадени групи все още. За да създадете една отидете на: ',
+    'nogroup'               => 'Няма създадени групи все още. За да създадете една отидете на:',
     'notes'                 => 'Бележки',
     'password_confirm' 		=> 'Потвърждение на паролата',
     'password' 				=> 'Парола',
diff --git a/resources/lang/bg-BG/auth.php b/resources/lang/bg-BG/auth.php
index aec278b860..39623e1b5b 100644
--- a/resources/lang/bg-BG/auth.php
+++ b/resources/lang/bg-BG/auth.php
@@ -15,6 +15,6 @@ return array(
 
     'failed' => 'Неуспешно удостоверяване на потребител.',
     'password' => 'Невалидна парола.',
-    'throttle' => 'Твърде много опити за логин. Моля, опитайте отново след :seconds секунди.',
+    'throttle' => 'Too many login attempts. Please try again in :minutes minute(s).',
 
 );
diff --git a/resources/lang/bg-BG/auth/message.php b/resources/lang/bg-BG/auth/message.php
index 6c009251b1..69fc30d268 100644
--- a/resources/lang/bg-BG/auth/message.php
+++ b/resources/lang/bg-BG/auth/message.php
@@ -6,16 +6,14 @@ return array(
     'account_not_found'      => 'Невалиден потребител или парола.',
     'account_not_activated'  => 'Потребителят все още не е активиран.',
     'account_suspended'      => 'Потребителят е временно спрян.',
-    'account_banned'         => 'Потребителят е неактивен.',
-    'throttle'               => 'Твърде много грешни опити. Моля опитайте отново след :minutes минути.',
 
     'two_factor' => array(
         'already_enrolled'      => 'Вашето устройство е вече вписано.',
         'success'               => 'Вие влязохте успешно.',
         'code_required'         => 'Необходим е код за двуфакторова идентификация.',
         'invalid_code'          => 'Кода за двуфакторна идентификация е невалиден.',
-        'enter_two_factor_code' => 'Please enter your two-factor authentication code.',
-        'please_enroll'         => 'Please enroll a device in two-factor authentication.',
+        'enter_two_factor_code' => 'Моля, въведете вашия двуфакторен код за удостоверяване.',
+        'please_enroll'         => 'Моля, регистрирайте устройство с двуфакторно удостоверяване.',
     ),
 
     'signin' => array(
diff --git a/resources/lang/bg-BG/button.php b/resources/lang/bg-BG/button.php
index c048a7896f..6595f54c4a 100644
--- a/resources/lang/bg-BG/button.php
+++ b/resources/lang/bg-BG/button.php
@@ -7,6 +7,7 @@ return [
     'checkin_and_delete'  	    => 'Впиши всички / изтрии потребител',
     'delete'  	                => 'Изтриване',
     'edit'    	                => 'Редакция',
+    'clone'    	                => 'Clone',
     'restore' 	                => 'Възстановяване',
     'remove'                    => 'Премахване',
     'request'                   => 'Заявка',
@@ -21,4 +22,13 @@ return [
     'add_maintenance'           => 'Добави поддръжка',
     'append'                    => 'Добави',
     'new'                       => 'Нов',
+    'var' => [
+        'clone'     => 'Clone :item_type',
+        'edit'      => 'Edit :item_type',
+        'delete'    => 'Delete :item_type',
+        'restore'   => 'Restore :item_type',
+        'create'    => 'Create New :item_type',
+        'checkout'  => 'Checkout :item_type',
+        'checkin'   => 'Checkin :item_type',
+    ]
 ];
diff --git a/resources/lang/bg-BG/general.php b/resources/lang/bg-BG/general.php
index d8a96901b7..41c5a3a223 100644
--- a/resources/lang/bg-BG/general.php
+++ b/resources/lang/bg-BG/general.php
@@ -10,10 +10,10 @@ return [
     'action'                => 'Действие',
     'activity_report'		=> 'Справка за дейностите',
     'address'				=> 'Aдрес',
-    'admin'					=> 'Администриране',
-    'admin_tooltip'			=> 'This user has admin privileges',
-    'superuser'				=> 'Superuser',
-    'superuser_tooltip'		=> 'This user has superuser privileges',
+    'admin'					=> 'Админ настройки',
+    'admin_tooltip'			=> 'Този потребител има администраторски привилегии',
+    'superuser'				=> 'Супер потребител',
+    'superuser_tooltip'		=> 'Този потребител има привилегии на супер потребител',
     'administrator'			=> 'Администратор',
     'add_seats'             => 'Добавени работни места',
     'age'                   => "Години",
@@ -23,13 +23,16 @@ return [
     'asset_models'			=> 'Модели на активи',
     'asset_model'			=> 'Модел',
     'asset'					=> 'Актив',
+    'asset_previous'        => 'Актив (Предходно зачислен)',
     'asset_report'          => 'Справка за активите',
     'asset_tag'				=> 'Инвентарен номер',
     'asset_tags'            => 'Етикет на актив',
     'assets_available'		=> 'Налични активи',
     'accept_assets'         => 'Приеми Актив :name',
     'accept_assets_menu'    => 'Приеми активите',
+    'accept_item'           => 'Приеми артикул',
     'audit'				    => 'проверка',
+    'audits'				=> 'Одити',
     'audit_report'			=> 'Отчет за одита',
     'assets'				=> 'Активи',
     'assets_audited'        => 'одитирани активи',
@@ -61,9 +64,12 @@ return [
     'changepassword'  		=> 'Смяна на паролата',
     'checkin'  				=> 'Вписване',
     'checkin_from'  		=> 'Форма за вписване',
+    'checkin_note'  		=> 'Забележка Вписване',
+    'checkout_note'  		=> 'Забележка Изписване',
     'checkout'  			=> 'Изписване',
     'checkouts_count'       => 'Изписвания',
     'checkins_count'        => 'Вписвания',
+    'checkin_and_delete'  	=> 'Впиши и Изтрий',
     'user_requests_count'   => 'Заявки',
     'city'  				=> 'Град',
     'click_here'			=> 'Натиснете тук',
@@ -77,7 +83,7 @@ return [
     'consumables'			=> 'Консумативи',
     'country'  				=> 'Държава',
     'could_not_restore'     => 'Грешка при възстановяване :item_type: :error',
-    'not_deleted'           => ':item_type е изтрит и не може да се възстанови',
+    'not_deleted'           => ':item_type не е изтрит и не може да бъде възстановен',
     'create'				=> 'Създаване на нов',
     'created'               => 'Създадени артикули',
     'created_asset'			=> 'създадени активи',
@@ -86,11 +92,13 @@ return [
     'record_created' 		=> 'Създаден на',
     'updated_at' 			=> 'Обновено на',
     'currency'  			=> '$', // this is deprecated
+    'currency_text'  		=> 'Валута', //
     'current'  				=> 'Текущи',
     'current_password'      => 'Текуща парола',
     'customize_report'      => 'Персонализиран отчет',
     'custom_report'         => 'Потребителски справки за активи',
     'dashboard'				=> 'Табло',
+    'data_source'           => 'Източник на Данни',
     'days'      			=> 'дни',
     'days_to_next_audit'    => 'Дни до следващия одит',
     'date'					=> 'Дата',
@@ -98,7 +106,7 @@ return [
     'debug_warning_text'    => 'Това приложение се изпълнява в режим на производство с разрешено отстраняване на грешки. Това може да изложи чувствителни данни, ако приложението ви е достъпно за външния свят. Забранете режим отстраняване на грешки чрез задаване на стойността <code>APP_DEBUF</code>  <code>.env</code> във файла <code>false</code>.',
     'delete'  				=> 'Изтриване',
     'delete_confirm'  		=> 'Сигурни ли сте, че желаете изтриването на :item?',
-    'delete_confirm_no_undo' => 'Сигурни ли сте че искате да изтриете :item? Това не може да бъде върнато на обратно.',
+    'delete_confirm_no_undo' => 'Сигурни ли сте, че искате да изтриете :item? Това не може да бъде върнато на обратно.',
     'deleted'  				=> 'Изтрито',
     'delete_seats'  		=> 'Изтрити работни места за лиценз',
     'deletion_failed'       => 'Неуспешно изтриване',
@@ -114,29 +122,13 @@ return [
     'editprofile'  			=> 'Редакция на профила',
     'eol'					=> 'EOL',
     'email_domain'			=> 'Email домейн',
-    'email_format'			=> 'Email формат',
     'employee_number'       => 'Номер на служител',
     'email_domain_help'		=> 'Използвайте това за да генерирате email адреси при въвеждане',
     'error'				    => 'Грешка',
     'exclude_archived'      => 'Без архивирани активи',
     'exclude_deleted'       => 'Без изтрити активи',
     'example'				=> 'Пример: ',
-    'filastname_format'			=> 'Инициал на името Фамилия (jsmith@example.com)',
-    'firstname_lastname_format'	=> 'Име Фамилия (jane.smith@example.com)',
-    'firstname_lastname_underscore_format' => 'Име Фамилия (jane.smith@example.com)',
-    'lastnamefirstinitial_format' =>  'Фамилно име Инициал на собствено (smithj@example.com)',
-    'firstintial_dot_lastname_format' => 'Първа буква от името и Фамилия (i.ivanov@example.com)',
-    'firstname_lastname_display'	=> 'Име Фамилия (Иван Иванов)',
-    'lastname_firstname_display'	=> 'Фамилия Име (Иванов Иван)',
-    'name_display_format'	=> 'Формат на показване на името',
-    'first'					=> 'Първа',
-    'firstnamelastname'     => 'Име и Фамилия (ivan.ivanov@example.com)',
-    'lastname_firstinitial' => 'Фамилия и Първа буква от име (ivanov_i@example.com)',
-    'firstinitial.lastname' => 'Първа буква от името и Фамилия (i.ivanov@example.com)',
-    'firstnamelastinitial'  => 'Име и първа буква от фамилия (ivani@example.com)',
-    'lastnamefirstname'      => 'Last Name First Name (smith.jane@example.com)',
-    'first_name'			=> 'Собствено име',
-    'first_name_format'		=> 'Име (jane@example.com)',
+
     'files'                 => 'Файлове',
     'file_name'				=> 'Файл',
     'file_type'             => 'Тип Файл',
@@ -156,9 +148,9 @@ return [
     'image_delete'         	=> 'Изтриване на изображението',
     'include_deleted'       => 'Включително изтрити активи',
     'image_upload'         	=> 'Качване на изображение',
-    'filetypes_accepted_help'    => 'Позволенo разширенe на файлa :types. Максимално позволен размер :size.|Позволени разширения на файлове са :types. Максимално позволен размер :size.',
+    'filetypes_accepted_help'    => 'Позволенoто разширенe на файлa е :types. Максимално позволения размер е :size.|Позволените разширения на файловете са :types. Максимално позволен размер :size.',
     'filetypes_size_help'   => 'Максимално позволен размер на файла е :size.',
-    'image_filetypes_help'  => 'Accepted filetypes are jpg, webp, png, gif, svg, and avif. Max upload size allowed is :size.',
+    'image_filetypes_help'  => 'Допустимите файлови типове са jpg, webp, png, gif, svg и avif. Максималният разрешен размер за качване е :size.',
     'unaccepted_image_type'  => 'Снимката не може да се прочете. Типовете файлови разширения са jpg, webp, png, gif и svg. Разширението на този файл е :mimetype.',
     'import'         	    => 'Зареждане',
     'import_this_file'      => 'Асоциирайте полетата и обработете този файл',
@@ -178,12 +170,17 @@ return [
     'last'					=> 'Последна',
     'last_login'            => 'Последен достъп до системата',
     'last_name'             => 'Фамилия',
+    'firstname_lastname_display'	=> 'Име Фамилия (Иван Иванов)',
+    'lastname_firstname_display'	=> 'Фамилия Име (Иванов Иван)',
+    'name_display_format'	=> 'Формат на показване на името',
+    'first'					=> 'Първа',
+    'first_name'			=> 'Собствено име',
     'license'				=> 'Лиценз',
     'license_report'        => 'Справка за лицензите',
     'licenses_available'	=> 'Налични лицензи',
     'licenses'				=> 'Лицензи',
     'list_all'				=> 'Преглед на всички',
-    'loading'				=> 'Зареждане... моля изчакайте....',
+    'loading'				=> 'Зареждане... моля изчакайте...',
     'lock_passwords'        => 'В демо версията това поле няма да се запише.',
     'feature_disabled'      => 'Тази функция е забранена за демо инсталацията.',
     'location'              => 'Местоположение',
@@ -206,8 +203,8 @@ return [
     'new_password'          => 'Нова парола',
     'next'					=> 'Следващ',
     'next_audit_date'		=> 'Следваща дата на одита',
-    'next_audit_date_help'  => 'If you use auditing in your organization, this is usually automatically calculated based on the asset&apos;s last audit date and audit frequency (in <code>Admin Settings &gt; Alerts</code>) and you can leave this blank. You can manually set this date here if you need to, but it must be later than the last audit date. ',
-    'audit_images_help'     => 'You can find audit images in the asset\'s history tab.',
+    'next_audit_date_help'  => 'Ако използвате одит във вашата организация, това обикновено се изчислява автоматично въз основа на последната дата на одит на актива&apos; и честота на одит (в <code>Настройки на администратора &gt; Сигнали</code>) и можете да оставите това празно. Можете ръчно да зададете тази дата тук, ако е необходимо, но тя трябва да е по-късна от последната дата на одит. ',
+    'audit_images_help'     => 'Можете да намерите изображения за одит в раздела за история на актива.',
     'no_email'              => 'Няма е-майл адрес към този потребител',
     'last_audit'		    => 'Последният одит',
     'new'					=> 'new!',
@@ -215,6 +212,14 @@ return [
     'no_results'			=> 'Няма резултат.',
     'no'  					=> 'Не',
     'notes'  				=> 'Бележки',
+    'note_added'            => 'Бележката е добавена',
+    'options'				=> 'Настройки',
+    'preview'				=> 'Преглед',
+    'add_note'              => 'Добави бележка',
+    'note_edited'            => 'Бележката е редактирана',
+    'edit_note'              => 'Редактиране на бележка',
+    'note_deleted'            => 'Бележката е изтрита',
+    'delete_note'              => 'Изтрий бележката',
     'order_number'          => 'Номер на поръчка',
     'only_deleted'          => 'Само изтрити активи',
     'page_menu'				=> 'Показване на _MENU_ записа',
@@ -229,7 +234,7 @@ return [
     'purchase_date'         => 'Дата на закупуване',
     'qty'		            => 'Количество',
     'quantity'		        => 'Kоличество',
-    'quantity_minimum'      => 'Имате :count актива под минимума или почти под минимума',
+    'quantity_minimum'      => 'Имате един артикул под или почти под минимум налично количество|Имате :count артикула под или почти под монимум налично количесто',
     'quickscan_checkin'  	=> 'Бързо сканиране и Вписване',
     'quickscan_checkin_status'  	=> 'Статус вписване',
     'ready_to_deploy'		=> 'Готово за предоставяне',
@@ -240,14 +245,14 @@ return [
     'restored'				=> 'възстановени',
     'restore'				=> 'Възстановяване',
     'requestable_models'    => 'Изискуеми Модели',
-    'requestable_items'     => 'Requestable Items',
+    'requestable_items'     => 'Изискуеми артикули',
     'requested'				=> 'Изискан',
     'requested_date'        => 'Дата на заявката',
     'requested_assets'      => 'Изискуеми активи',
     'requested_assets_menu' => 'Изискуеми активи',
     'request_canceled'      => 'Заявка отменена',
-    'request_item'          => 'Request this item',
-    'external_link_tooltip' => 'External link to',
+    'request_item'          => 'Поискайте този артикул',
+    'external_link_tooltip' => 'Външна връзка към',
     'save'  				=> 'Запис',
     'select_var'            => 'Избран :thing... ', // this will eventually replace all of our other selects
     'select'				=> 'Избор',
@@ -279,8 +284,10 @@ return [
     'site_name'				=> 'Име на системата',
     'state'  				=> 'Област',
     'status_labels'			=> 'Статус етикети',
+    'status_label'			=> 'Статус етикет',
     'status'    			=> 'Статус',
     'accept_eula'           => 'Споразумение за приемане',
+    'show_or_hide_eulas' => 'Покажи/Скрий EULAs',
     'supplier'              => 'Доставчик',
     'suppliers'  			=> 'Доставчици',
     'sure_to_delete'        => 'Сигурни ли сте, че искате да изтриете',
@@ -296,15 +303,15 @@ return [
     'type'  				=> 'Тип',
     'undeployable'			=> 'Не може да бъде предоставян',
     'unknown_admin'			=> 'Непознат администратор',
-    'username_format'		=> 'Формат на потребителско име',
     'username'              => 'Потребител',
     'update'                => 'Обновяване',
+    'updating_item' => 'Обновяване :item',
     'upload_filetypes_help'      => 'Позволените файлови разширения са png, gif, jpg, jpeg, doc, docx, pdf, xls, xlsx, txt, lic, xml, zip, rtf и rar. Максималният размер на файла е :size.',
     'uploaded'              => 'Качен',
     'user'					=> 'Потребител',
     'accepted'			    => 'приет',
     'declined'			    => 'отказан',
-    'declined_note'         => 'Declined Notes',
+    'declined_note'         => 'Отхвърлени бележки',
     'unassigned'            => 'Не е асоциирано',
     'unaccepted_asset_report' => 'Неприети активи',
     'users'                 => 'Потребители',
@@ -323,10 +330,10 @@ return [
     'token_expired'         => 'Вашата сесия за формуляр изтече. Моля опитайте отново.',
     'login_enabled'         => 'Разрешен вход',
     'audit_due'             => 'За Одит',
-    'audit_due_days'        => 'Активи, подлежащи на одит в рамките на :days Ден|Активи, подлежащи на одит в рамките на :days дни',
+    'audit_due_days'        => '{}Активи чакащи или просрочили Одит|[1]Активи чакащи или просрочили одит, за следващия ден|[2,*]Активи чакащи или просрочили одит за следващите :days дни',
     'checkin_due'           => 'Предстои проверка',
     'checkin_overdue'       => 'Просрочен срок за регистрация',
-    'checkin_due_days'      => 'Активи, дължими за проверка в рамките на :days ден|Активи, дължими за проверка в рамките на :days дни',
+    'checkin_due_days'      => '{}Чакащи за вписване|[1]Активи чакащи за вписване в следващя :days ден|[2,*]Активи чакащи за вписване за следващите :days дни',
     'audit_overdue'         => 'Просрочен Одит',
     'accept'                => 'Приеми :asset',
     'i_accept'              => 'Съгласен съм',
@@ -383,6 +390,8 @@ return [
     'new_license'           => 'Нов Лиценз',
     'new_accessory'         => 'Нов аксесоар',
     'new_consumable'        => 'Нов Консуматив',
+    'new_component'         => 'Нов компонент',
+    'new_user'              => 'Нов потребител',
     'collapse'              => 'Свий',
     'assigned'              => 'Възложен',
     'asset_count'           => 'Брой Активи',
@@ -405,9 +414,9 @@ return [
     'accessory_name'       => 'Име на аксесоар:',
     'clone_item'            => 'Клониране',
     'checkout_tooltip' => 'Изпишете този артикул',
-    'checkin_tooltip' => 'Check this item in so that it is available for re-issue, re-imaging, etc',
+    'checkin_tooltip' => 'Маркирайте този артикул, така че да е наличен за повторно издаване, повторно изобразяване и т. н.',
     'checkout_user_tooltip' => 'Изпишете този артикул на потребител',
-    'checkin_to_diff_location' => 'You can choose to check this asset in to a location other than this asset\'s default location of :default_location if one is set',
+    'checkin_to_diff_location' => 'Можете да изберете да проверите този актив на място, различно от местоположението по подразбиране на този актив :default_location, ако е зададено такова',
     'maintenance_mode'      => 'Услугата е временно недостъпна поради обновяване. Моля опитайте по-късно.',
     'maintenance_mode_title' => 'Системата е временно недостъпна',
     'ldap_import'           => 'Потребителската парола не трябва да се управлява от LDAP. (Това ви позволява да изпращате заявки за забравена парола)',
@@ -418,19 +427,20 @@ return [
     'bulk_soft_delete'      =>'Също маркирай за изтриване потребителите. Историята на тяхните активи ще остане докато не изчистите изтритите записи през административните настройки.',
     'bulk_checkin_delete_success' => 'Избраните потребители бяха изтрити и техните активи вписани обратно.',
     'bulk_checkin_success' => 'Активите за избраните потребители бяха вписани обратно.',
-    'set_to_null'           => 'Изтрии стойнистите за този актив|Изтрии стойностите за всичките :asset_count актива ',
+    'set_to_null'           => 'Изтрий стойностите за маркираното|Изтрий стойностите за свички :selection_count маркирания ',
     'set_users_field_to_null'  => 'Изтрий стойноста :field за този потребител|Изтрий стойността :field за всичките :user_count потребителя ',
     'na_no_purchase_date'   => 'N/A - Няма дата на закупуване',
     'assets_by_status'      => 'Статус на Активи',
     'assets_by_status_type'      => 'Статус тип по Активи',
     'pie_chart_type'        => 'Кръгова диаграма на таблото',
     'hello_name'            => 'Здравейте, :name!',
-    'unaccepted_profile_warning'   => 'Вие имате :count актив чакащ за приемане. Щрактене тук за да приемете или откажете актива',
+    'unaccepted_profile_warning'   => 'Имате един артикул за приемане. Щракнете тук, за да го приемете или откажете | Имате :count артикула за приемане. Щракнете тук, за да ги приемете или откажете',
     'start_date'            => 'Начална дата',
     'end_date'            => 'Крайна дата',
     'alt_uploaded_image_thumbnail' => 'Качено умалено изображение',
     'placeholder_kit'       => 'Изберете комплект',
     'file_not_found'        => 'Файлът не е намерен',
+    'log_record_not_found'  => 'Няма намерени записи.',
     'preview_not_available' => '(няма преглед)',
     'setup'                 => 'Настройка',
     'pre_flight'            => 'Тест',
@@ -508,11 +518,11 @@ return [
         'address2' => 'Адрес ред 2',
         'import_note' => 'Импортирано използвайки CSV импорт',
     ],
-    'remove_customfield_association' => 'Remove this field from the fieldset. This will not delete the custom field, only this field\'s association with this fieldset.',
-    'checked_out_to_fields' => 'Checked Out To Fields',
+    'remove_customfield_association' => 'Премахнете това поле от набора полета. Това няма да изтрие персонализираното поле, а само връзката на това поле с този набор от полета.',
+    'checked_out_to_fields' => 'Checked Out To полета',
     'percent_complete' => '% завърешен',
     'uploading' => 'Качване... ',
-    'upload_error' => 'Грешка при качване на файл. Моля проверете да няма празни редове или повтарящи се колони.',
+    'upload_error' => 'Грешка при качване на файл. Моля проверете да нямате празни редове или повтарящи се колони във вашият CSV файл и дали имате права за качване на сървъра.',
     'copy_to_clipboard' => 'Копиране в клипборда',
     'copied' => 'Копирано!',
     'status_compatibility' => 'Ако артикула е вече асоцииран, не може да се му се смени статуса на забранен за изписване и тази стойност ще бъде игнорирана.',
@@ -528,7 +538,7 @@ return [
     'permission_denied_superuser_demo' => 'Разрешението е отказано. Не можете да актуализирате потребителска информация за суперадминистратори в демо версията.',
     'pwd_reset_not_sent' => 'Потребителят не е активиран, синхронизиран е с LDAP или няма имейл адрес',
     'error_sending_email' => 'Възникна грешка при изпращане на имейл',
-    'sad_panda' => 'Sad panda. You are not authorized to do the thing. Maybe <a href=":link">return to the dashboard</a>, or contact your administrator.',
+    'sad_panda' => 'Тъжна панда. Не си упълномощен да направиш нещото. Може би <a href=":link">да се върнете към таблото за управление</a> или да се свържете с администратора ви.',
     'bulk' => [
             'delete' =>
                 [
@@ -549,6 +559,71 @@ return [
         'license_seats'  => ':count Лицензно място|:count Лицензни места',
         'consumables'  => ':count Консуматив|:count Консумативи',
         'components'  => ':count Компонент|:count Компоненти',
-    ]
+    ],
+
+    'more_info' => 'Повече информация',
+    'quickscan_bulk_help' => 'Поставянето на отметка в това квадратче ще редактира записа на актива, за да отрази това ново местоположение. Оставянето му без отметка просто ще отбележи местоположението в журнала за проверка. Обърнете внимание, че ако този актив бъде извлечен, той няма да промени местоположението на лицето, актива или местоположението, към които е извлечен.',
+    'whoops' => 'Упс!',
+    'something_went_wrong' => 'При обработката нещо се обърка.',
+    'close' => 'Затвори',
+    'expires' => 'Изтича',
+    'map_fields'=> 'Зачисли полетата към :item_type',
+    'remaining_var' => 'остават :count',
+    'label' => 'Етикет',
+    'import_asset_tag_exists' => 'Актив с етикет :asset_tag вече съществува и обновяването не е необходимо. Не са извършени промени.',
+    'countries_manually_entered_help' => 'Стойностите със звезда (*) са ръчно създадени и не са от ISO 3166 стойности',
+    'accessories_assigned' => 'Зачислени Аксесоари',
+    'user_managed_passwords' => 'Управление на пароли',
+    'user_managed_passwords_disallow' => 'Забраняване на потребителите да управляват собствените си пароли',
+    'user_managed_passwords_allow' => 'Позволяване на потребителите да управляват собствените си пароли',
+    'from' => 'От',
+    'by' => 'От',
+
+// Add form placeholders here
+    'placeholders' => [
+        'notes'  => 'Добавете бележка',
+    ],
+
+    'breadcrumb_button_actions' => [
+        'edit_item' => 'Редактирай :name',
+        'checkout_item' => 'Изпиши :name',
+        'checkin_item' => 'Впиши :name',
+    ],
+
+    'skins' => [
+        'site_default' => 'Настройки по подразбиране на сайта',
+        'default_blue' => 'По подразбиране Синьо',
+        'blue_dark' => 'Синьо (тъмен режим)',
+        'green' => 'Тъмно Зелено',
+        'green_dark' => 'Зелено (тъмен режим)',
+        'red' => 'Тъмно Червено',
+        'red_dark' => 'Червено (тъмен режим)',
+        'orange' => 'Тъмно Оранжево',
+        'orange_dark' => 'Оранжево (тъмен режим)',
+        'black' => 'Черно',
+        'black_dark' => 'Черно (тъмен режим)',
+        'purple' => 'Лилаво',
+        'purple_dark' => 'Лилаво (тъмен режим)',
+        'yellow' => 'Жълто',
+        'yellow_dark' => 'Жълто (тъмен режим)',
+        'high_contrast' => 'Висок контраст',
+
+    ],
+
+    'select_all_none' => 'Маркирай всички',
+    'generic_model_not_found' => ':model не беше намерен или вие нямате права да го достъпите',
+    'deleted_models' => 'Изтрити Модели',
+    'deleted_users' => 'Изтрити Потребители',
+    'cost_each' => ':amount от всеки',
+    'remove_current_image' => 'Премахни текущата :type снимка',
+
+    'seeding' => [
+        'manufacturers' => [
+            'button' => 'Създаване на производители',
+            'prompt' => 'Нямате създадени никакви производители все още. Изкатели да се създадат най-често срещаните пройзводители по подразбиране? (Това ще презапише всички съществуващи и вече създадени производители, включително тези който са били изтрити и са в коша.)',
+            'success' => 'Създаването на производителите е успешно',
+            'error' => 'Създаването на производителите върна грешка. Запис на производител вече съществува и това действие ще го презапише.|Създаването на производителите върна грешка. Има :count производителя вече създадени и това действие ще ги презапише.',
+        ],
+    ],
 
 ];
diff --git a/resources/lang/bg-BG/localizations.php b/resources/lang/bg-BG/localizations.php
index a2b5197b24..1e9af4e5b1 100644
--- a/resources/lang/bg-BG/localizations.php
+++ b/resources/lang/bg-BG/localizations.php
@@ -2,7 +2,7 @@
 
 return [
 
-    'select_language' => 'Избор на език',
+    'select_language' => 'Select a Language',
     'languages' => [
         'en-US'=> 'Английски, САЩ',
         'en-GB'=> 'Английски, Великобритания',
@@ -40,7 +40,9 @@ return [
         'ms-MY'=> 'Малайски',
         'mi-NZ'=> 'Маори',
         'mn-MN'=> 'Монголски',
-        'no-NO'=> 'Норвежки',
+        'nb-NO'=> 'Norwegian Bokmål',
+        'om-ET' => 'Oromo (Ethiopian)',
+        //'nn-NO'=> 'Norwegian Nynorsk',
         'fa-IR'=> 'Персийски',
         'pl-PL'=> 'Полски',
         'pt-PT'=> 'Португалски',
@@ -66,7 +68,7 @@ return [
         'zu-ZA'=> 'Зулу',
     ],
 
-    'select_country' => 'Изберете държава',
+    'select_country' => 'Select a Country',
     
     'countries' => [
         'AC'=>'Остров Възнесение',
@@ -133,6 +135,7 @@ return [
         'EC'=>'Еквадор',
         'EE'=>'Естония',
         'EG'=>'Египет',
+        'GB-ENG'=>'England',
         'ER'=>'Еритрея',
         'ES'=>'Испания',
         'ET'=>'Етиопия',
@@ -191,27 +194,27 @@ return [
         'KW'=>'Кувейт',
         'KY'=>'Кайманови острови',
         'KZ'=>'Казахстан',
-        'LA'=>'Lao People\'s Democratic Republic',
+        'LA'=>'Лаоска народнодемократична република',
         'LB'=>'Ливан',
         'LC'=>'Сейнт Лусия',
         'LI'=>'Лихтенщайн',
-        'LK'=>'Sri Lanka',
-        'LR'=>'Liberia',
-        'LS'=>'Lesotho',
-        'LT'=>'Lithuania',
-        'LU'=>'Luxembourg',
-        'LV'=>'Latvia',
-        'LY'=>'Libyan Arab Jamahiriya',
-        'MA'=>'Morocco',
-        'MC'=>'Monaco',
-        'MD'=>'Moldova, Republic Of',
-        'ME'=>'Montenegro',
-        'MG'=>'Madagascar',
-        'MH'=>'Marshall Islands',
-        'MK'=>'Macedonia, The Former Yugoslav Republic Of',
-        'ML'=>'Mali',
-        'MM'=>'Myanmar',
-        'MN'=>'Mongolia',
+        'LK'=>'Шри Ланка',
+        'LR'=>'Либерия',
+        'LS'=>'Лесото',
+        'LT'=>'Литва',
+        'LU'=>'Люксембург',
+        'LV'=>'Латвия',
+        'LY'=>'Либийска Арабска Джамахирия',
+        'MA'=>'Мароко',
+        'MC'=>'Монако',
+        'MD'=>'Република Молдова',
+        'ME'=>'Черна гора',
+        'MG'=>'Мадагаскар',
+        'MH'=>'Маршалови острови',
+        'MK'=>'Северна Македония, бивша Югославка република',
+        'ML'=>'Мали',
+        'MM'=>'Мианмар',
+        'MN'=>'Монголия',
         'MO'=>'Макао',
         'MP'=>'Северни Мариански острови',
         'MQ'=>'Мартиника',
@@ -219,23 +222,24 @@ return [
         'MS'=>'Монсерат',
         'MT'=>'Малта',
         'MU'=>'Мавриций',
-        'MV'=>'Maldives',
-        'MW'=>'Malawi',
-        'MX'=>'Mexico',
-        'MY'=>'Malaysia',
-        'MZ'=>'Mozambique',
-        'NA'=>'Namibia',
-        'NC'=>'New Caledonia',
-        'NE'=>'Niger',
+        'MV'=>'Малдиви',
+        'MW'=>'Малави',
+        'MX'=>'Мексико',
+        'MY'=>'Малайзия',
+        'MZ'=>'Мозамбик',
+        'NA'=>'Намибия',
+        'NC'=>'Нова Каледония',
+        'NE'=>'Нигер',
         'NF'=>'Остров Норфолк',
         'NG'=>'Нигерия',
         'NI'=>'Никарагуа',
         'NL'=>'Холандия',
+        'GB-NIR' => 'Northern Ireland',
         'NO'=>'Норвегия',
         'NP'=>'Непал',
         'NR'=>'Науру',
         'NU'=>'Ниуе',
-        'NZ'=>'New Zealand',
+        'NZ'=>'Нова Зеландия',
         'OM'=>'Оман',
         'PA'=>'Панама',
         'PE'=>'Перу',
@@ -258,7 +262,7 @@ return [
         'RU'=>'Руска федерация',
         'RW'=>'Руанда',
         'SA'=>'Саудитска Арабия',
-        'UK'=>'Шотландия',
+        'GB-SCT'=>'Шотландия',
         'SB'=>'Соломонови острови',
         'SC'=>'Сейшелските острови',
         'SS'=>'Южен Судан',
@@ -270,29 +274,29 @@ return [
         'SJ'=>'Острови Свалбард и Ян Майен',
         'SK'=>'Словакия (Словашка република)',
         'SL'=>'Сиера Леоне',
-        'SM'=>'San Marino',
-        'SN'=>'Senegal',
-        'SO'=>'Somalia',
+        'SM'=>'Сан Марино',
+        'SN'=>'Сенегал',
+        'SO'=>'Сомалия',
         'SR'=>'Суринам',
-        'ST'=>'Sao Tome And Principe',
-        'SU'=>'Soviet Union',
-        'SV'=>'El Salvador',
-        'SY'=>'Syrian Arab Republic',
-        'SZ'=>'Swaziland',
-        'TC'=>'Turks And Caicos Islands',
-        'TD'=>'Chad',
-        'TF'=>'French Southern Territories',
-        'TG'=>'Togo',
-        'TH'=>'Thailand',
-        'TJ'=>'Tajikistan',
-        'TK'=>'Tokelau',
-        'TI'=>'East Timor',
-        'TM'=>'Turkmenistan',
-        'TN'=>'Tunisia',
-        'TO'=>'Tonga',
-        'TP'=>'East Timor (old code)',
-        'TR'=>'Turkey',
-        'TT'=>'Trinidad And Tobago',
+        'ST'=>'Сао Томе и Принсипи',
+        'SU'=>'Съветски съюз',
+        'SV'=>'Ел Салвадор',
+        'SY'=>'Сирийска Арабска Република',
+        'SZ'=>'Свазиленд',
+        'TC'=>'Острови Търкс и Кайкос',
+        'TD'=>'Чад',
+        'TF'=>'Френски южни територии',
+        'TG'=>'Того',
+        'TH'=>'Тайланд',
+        'TJ'=>'Таджикистан',
+        'TK'=>'Токелау',
+        'TI'=>'Източен Тимор',
+        'TM'=>'Тюркменистан',
+        'TN'=>'Тунис',
+        'TO'=>'Тонга',
+        'TP'=>'Източен Тимор (стар код)',
+        'TR'=>'Турция',
+        'TT'=>'Тринидад и Тобаго',
         'TV'=>'Тувалу',
         'TW'=>'Тайван',
         'TZ'=>'Обединена република Танзания',
@@ -300,18 +304,19 @@ return [
         'UG'=>'Уганда',
         'UK'=>'Великобритания',
         'US'=>'САЩ',
-        'UM'=>'United States Minor Outlying Islands',
-        'UY'=>'Uruguay',
-        'UZ'=>'Uzbekistan',
-        'VA'=>'Vatican City State (Holy See)',
-        'VC'=>'Saint Vincent And The Grenadines',
-        'VE'=>'Venezuela',
-        'VG'=>'Virgin Islands (British)',
-        'VI'=>'Virgin Islands (U.S.)',
-        'VN'=>'Viet Nam',
-        'VU'=>'Vanuatu',
-        'WF'=>'Wallis And Futuna Islands',
-        'WS'=>'Samoa',
+        'UM'=>'Малки отдалечени острови на Съединените щати',
+        'UY'=>'Уругвай',
+        'UZ'=>'Узбекистан',
+        'VA'=>'Град-държава Ватикана (Светия престол)',
+        'VC'=>'Сейнт Винсент и Гренадини',
+        'VE'=>'Венецуела',
+        'VG'=>'Вирджински острови (Британски)',
+        'VI'=>'Вирджински острови (САЩ)',
+        'VN'=>'Виетнам',
+        'VU'=>'Вануату',
+        'GB-WLS' =>'Wales',
+        'WF'=>'Острови Уолис и Футуна',
+        'WS'=>'Самоу',
         'YE'=>'Йемен',
         'YT'=>'Майот',
         'ZA'=>'Южна Африка',
diff --git a/resources/lang/bg-BG/mail.php b/resources/lang/bg-BG/mail.php
index a1bc50e593..c5692021d1 100644
--- a/resources/lang/bg-BG/mail.php
+++ b/resources/lang/bg-BG/mail.php
@@ -23,24 +23,25 @@ return [
     'Item_Requested' => 'Артикул заявен',
     'License_Checkin_Notification' => 'Лиценза е вписан',
     'License_Checkout_Notification' => 'Изписани лицензи',
+    'license_for'   => 'License for',
     'Low_Inventory_Report' => 'Доклад за нисък запас',
     'a_user_canceled' => 'Потребител е отменил заявка за елемент в уебсайта',
     'a_user_requested' => 'Потребител е направил заявка за елемент в уебсайта',
     'acceptance_asset_accepted' => 'Потребителя прие актива',
     'acceptance_asset_declined' => 'Потребителя отказа актива',
-    'accessory_name' => 'Име на аксесоар:',
-    'additional_notes' => 'Допълнителни бележки:',
+    'accessory_name' => 'Аксесоар',
+    'additional_notes' => 'Допълнителни бележки',
     'admin_has_created' => 'Администратор е създал акаунт за вас на :web website.',
-    'asset' => 'Актив:',
-    'asset_name' => 'Име на актив:',
+    'asset' => 'Актив',
+    'asset_name' => 'Име на актив',
     'asset_requested' => 'Заявка за актив',
     'asset_tag' => 'Инвентарен номер',
     'assets_warrantee_alert' => 'Има :count актив(а) с гаранция, която ще изтече в следващите :threshold дни.|Има :count активa с гаранции, която ще изтече в следващите :threshold дни.',
     'assigned_to' => 'Възложени на',
     'best_regards' => 'С най-добри пожелания.',
-    'canceled' => 'Отменено:',
-    'checkin_date' => 'Дата на вписване:',
-    'checkout_date' => 'Дата на отписване:',
+    'canceled' => 'Отменено',
+    'checkin_date' => 'Дата на вписване',
+    'checkout_date' => 'Дата на изписване',
     'checkedout_from' => 'Изписан от',
     'checkedin_from'  => 'Вписан от',
     'checked_into' => 'Изписан на',
@@ -55,21 +56,24 @@ return [
     'hi' => 'Здравейте',
     'i_have_read' => 'Прочетох и се съгласих с условията за ползване, и получих този артикул.',
     'inventory_report' => 'Списък активи',
-    'item' => 'Артикул:',
+    'item' => 'Информация',
+    'item_checked_reminder' => 'This is a reminder that you currently have :count items checked out to you that you have not accepted or declined. Please click the link below to confirm your decision.',
     'license_expiring_alert' => 'Има :count лиценз, който изтича в следващите :threshold дни.|Има :count лиценза, които изтичат в следващите :threshold дни.',
     'link_to_update_password' => 'Моля щракенете върху следния линк за да обновите своята :web password:',
-    'login' => 'Вход:',
+    'login' => 'Логин',
     'login_first_admin' => 'Влезте в своята Snipe-IT инсталация използвайки данните по-долу:',
     'low_inventory_alert' => 'Има :count артикул, който е под минималния праг за наличност или скоро ще се изчерпа.| Има :count артикула, които са под минималния праг за наличност или скоро ще се изчерпат.',
     'min_QTY' => 'Минимално количество',
     'name' => 'Име',
     'new_item_checked' => 'Нов артикул беше изписан под вашето име, детайлите са отдолу.',
+    'new_item_checked_with_acceptance' => 'A new item has been checked out under your name that requires acceptance, details are below.',
+    'recent_item_checked' => 'An item was recently checked out under your name that requires acceptance, details are below.',
     'notes' => 'Бележки',
-    'password' => 'Парола:',
+    'password' => 'Парола',
     'password_reset' => 'Нулиране на паролата',
     'read_the_terms' => 'Моля прочетете условията по-долу.',
     'read_the_terms_and_click' => 'Моля прочетете условията за ползване по-долу и щракнете върху връзката в края, за да потвърдите че сте прочели и се съгласявате с условията на употреба и сте получили актива.',
-    'requested' => 'Изискан:',
+    'requested' => 'Изискан',
     'reset_link' => 'Вашата връзка за повторно задаване на паролата',
     'reset_password' => 'Щракнете тук, за да нулирате паролата си:',
     'rights_reserved' => 'Всички права запазени.',
@@ -86,8 +90,10 @@ return [
     'upcoming-audits' => 'Има :count актив, който подлежи на одит в следващите :threshold дни.|Има :count активи, които подлежат на отид през следващите :threshold дни.',
     'user' => 'Потребител',
     'username' => 'Потребителско име',
+    'unaccepted_asset_reminder' => 'Reminder: You have Unaccepted Assets.',
     'welcome' => 'Добре дошли, :name',
     'welcome_to' => 'Добре дошли: уеб!',
     'your_assets' => 'Преглед на вашите активи',
     'your_credentials' => 'Вашите идентификационни данни за Snipe-IT',
+    'mail_sent' => 'Mail sent successfully!',
 ];
diff --git a/resources/lang/bg-BG/table.php b/resources/lang/bg-BG/table.php
index 87ab0ff030..53bc674196 100644
--- a/resources/lang/bg-BG/table.php
+++ b/resources/lang/bg-BG/table.php
@@ -6,6 +6,6 @@ return array(
     'action' 		        => 'Действие',
     'by'      		        => 'От',
     'item' 			        => 'Информация',
-    'no_matching_records'   => 'No matching records found',
+    'no_matching_records'   => 'Няма намерени съответстващи записи',
 
 );
diff --git a/resources/lang/bg-BG/validation.php b/resources/lang/bg-BG/validation.php
index f541db6157..b8880da603 100644
--- a/resources/lang/bg-BG/validation.php
+++ b/resources/lang/bg-BG/validation.php
@@ -13,87 +13,150 @@ return [
     |
     */
 
-    'accepted'             => ':attribute трябва да бъде потвърден.',
-    'active_url'           => ':attribute не е валиден URL адрес.',
-    'after'                => ':attribute трябва да бъде дата след :date.',
-    'after_or_equal'       => 'Атрибутът: трябва да бъде дата след или равна на: дата.',
-    'alpha'                => ':attribute може да съдържа единствено букви.',
-    'alpha_dash'           => ':attribute може да съдържа единствено букви, числа и тире.',
-    'alpha_num'            => ':attribute може да съдържа единствено букви и числа.',
-    'array'                => 'Атрибутът: трябва да бъде масив.',
-    'before'               => ':attribute трябва да бъде дата преди :date.',
-    'before_or_equal'      => 'Атрибутът: трябва да бъде дата преди или равна на: дата.',
-    'between'              => [
-        'numeric' => ':attribute трябва да бъде между :min и :max.',
-        'file'    => ':attribute трябва да бъде с големина между :min и :max KB.',
-        'string'  => ':attribute трябва да бъде с дължина между :min и :max символа.',
-        'array'   => 'Атрибутът: трябва да има между: min и: max items.',
+    'accepted' => 'Полето :attribute трябва да бъде прието.',
+    'accepted_if' => 'Полето :attribute трябва да бъде прието, когато :other е :value.',
+    'active_url' => 'Полето :attribute трябва да съдържа валиден URL.',
+    'after' => 'Полето :attribute трябва да бъде дата след :date.',
+    'after_or_equal' => 'Полето :attribute трябва да бъде дата след или равна на :date.',
+    'alpha' => 'Полето :attribute трябва да съдържа само букви.',
+    'alpha_dash' => 'Полето :attribute трябва да съдържа само букви, цифри, тирета и подчертавания.',
+    'alpha_num' => 'Полето :attribute трябва да съдържа само букви и цифри.',
+    'array' => 'Полето :attribute трябва да е масив.',
+    'ascii' => 'Полето :attribute трябва да съдържа еднобайтови буквено-цифрови знаци и символи.',
+    'before' => 'Полето :attribute трябва да бъде дата преди :date.',
+    'before_or_equal' => 'Полето :attribute трябва да бъде дата преди или равна на :date.',
+    'between' => [
+        'array' => 'Полето :attribute трябва да има между :min и :max .',
+        'file' => 'Полето :attribute трябва да бъде между :min и :max килобайта.',
+        'numeric' => 'Полето :attribute трябва да бъде между :min и :max .',
+        'string' => 'Полето :attribute трябва да бъде между :min и :max символа.',
     ],
-    'boolean'              => ':attribute трябва да е верен или грешен.',
-    'confirmed'            => ':attribute потвърждение не съвпада.',
-    'date'                 => ':attribute не е валидна дата.',
-    'date_format'          => ':attribute не съвпада с формата :format.',
-    'different'            => ':attribute и :other трябва да се различават.',
-    'digits'               => ':attribute трябва да бъде с дължина :digits цифри.',
-    'digits_between'       => ':attribute трябва да бъде с дължина между :min и :max цифри.',
-    'dimensions'           => 'Атрибутът: има невалидни величини на изображението.',
-    'distinct'             => 'Полето: atribut има дублираща се стойност.',
-    'email'                => ':attribute е с невалиден формат.',
-    'exists'               => 'Избраният :attribute е невалиден.',
-    'file'                 => 'Атрибутът: трябва да е файл.',
-    'filled'               => 'Полето на атрибута: трябва да има стойност.',
-    'image'                => ':attribute трябва да бъде изображение.',
+    'boolean' => 'Полето :attribute трябва да бъде Да или Не.',
+    'can' => 'Полето :attribute съдържа неприемлива стойност.',
+    'confirmed' => 'Полето :attribute не съвпада.',
+    'contains' => 'Полето :attribute липсва необходимата стойност.',
+    'current_password' => 'Паролата е грешна.',
+    'date' => 'Полето :attribute трябва да съдържа валидна дата.',
+    'date_equals' => 'Полето :attribute трябва да бъде дата равна на :date.',
+    'date_format' => 'Полето :attribute трябва да има формат :format.',
+    'decimal' => 'Полето :attribute трябва да има :decimal десетични знака.',
+    'declined' => 'Полето :attribute трябва да бъде отказано.',
+    'declined_if' => 'Полето :attribute трябва да бъде отказано, когато :other е :value.',
+    'different' => 'Полето :attribute и :other трябва да са различни.',
+    'digits' => 'Полето :attribute трябва да съдържа :digits цифри.',
+    'digits_between' => 'Полето :attribute трябва да бъде между :min и :max цифри.',
+    'dimensions' => 'Полето :attribute има невалидни размери на снимката.',
+    'distinct' => 'Полето: atribut има дублираща се стойност.',
+    'doesnt_end_with' => 'Полето :attribute трябва да не завършва на: :values.',
+    'doesnt_start_with' => 'Полето :attribute трябва да не започва с: :values.',
+    'email' => 'Полето :attribute трябва да съдържа валиден е-майл адрес.',
+    'ends_with' => 'Полето :attribute трябва да завършва на: :values.',
+    'enum' => 'Избраният :attribute е невалиден.',
+    'exists' => 'Избраният :attribute е невалиден.',
+    'extensions' => 'Полето :attribute трябва да има едно от следните разширения: :values.',
+    'file' => 'Полето :attribute трябва да бъде файл.',
+    'filled' => 'Полето на атрибута: трябва да има стойност.',
+    'gt' => [
+        'array' => 'Полето :attribute трябва да съдържа повече от :value стойности.',
+        'file' => 'Полето :attribute трябва да бъде по-голямо от :value килобайта.',
+        'numeric' => 'Полето :attribute трябва да бъде по-голямо от :value.',
+        'string' => 'Полето :attribute трябва да бъде по-голямо от :value символа.',
+    ],
+    'gte' => [
+        'array' => 'Полето :attribute трябва да има :value или повече неща.',
+        'file' => 'Полето :attribute трябва да бъде повече или равно на :value килобайта.',
+        'numeric' => 'Полето :attribute трябва да бъде повече или равно на :value.',
+        'string' => 'Полето :attribute трябва да бъде повече или равно на :value символа.',
+    ],
+    'hex_color' => 'Полето :attribute трябва да съдържа валиден шестнадесетичен цвят.',
+    'image' => 'Полето :attribute трябва да бъде снимка.',
     'import_field_empty'    => 'Стойността за :fieldname не може да бъде празна.',
-    'in'                   => 'Избраният :attribute е невалиден.',
-    'in_array'             => 'Полето: atribut не съществува в: други.',
-    'integer'              => ':attribute трябва да бъде целочислен.',
-    'ip'                   => ':attribute трябва да бъде валиден IP адрес.',
-    'ipv4'                 => 'Атрибутът: трябва да е валиден IPv4 адрес.',
-    'ipv6'                 => 'Атрибутът: трябва да е валиден IPv6 адрес.',
-    'is_unique_department' => ':attribute трябва да бъде уникален за тази локация на фирмата.',
-    'json'                 => 'Атрибутът: трябва да е валиден низ на JSON.',
-    'max'                  => [
-        'numeric' => ':attribute не може да бъде по-дълъг от :max.',
-        'file'    => ':attribute не може да бъде по-голям от :max KB.',
-        'string'  => ':attribute не може да бъде по-дълъг от :max символа.',
-        'array'   => 'Атрибутът: не може да има повече от: max items.',
+    'in' => 'Избраният :attribute е невалиден.',
+    'in_array' => 'Полето :attribute трябва да се съдържа в :other.',
+    'integer' => 'Полето :attribute трябва да бъде цяло число.',
+    'ip' => 'Полето :attribute трябва да бъде валиден IP адрес.',
+    'ipv4' => 'Полето :attribute трябва да бъде валиден IPv4 адрес.',
+    'ipv6' => 'Полето :attribute трябва да бъде валиден IPv6 адрес.',
+    'json' => 'Полето :attribute трябва да бъде валиден JSON низ.',
+    'list' => 'Полето :attribute трябва да бъде списък.',
+    'lowercase' => 'Полето :attribute трябва да бъде с малки букви.',
+    'lt' => [
+        'array' => 'Полето :attribute трябва да бъде по-малко от :value .',
+        'file' => 'Полето :attribute трябва да бъде по-малко от :value килобайта.',
+        'numeric' => 'Полето :attribute трябва да бъде по-малко от :value.',
+        'string' => 'Полето :attribute трябва да бъде помалко от :value символа.',
     ],
-    'mimes'                => ':attribute трябва да бъде файл с един от следните типове: :values.',
-    'mimetypes'            => 'Атрибутът: трябва да бъде файл от тип:: стойности.',
-    'min'                  => [
-        'numeric' => ':attribute трябва да бъде минимум :min.',
-        'file'    => ':attribute трябва да бъде с големина минимум :min KB.',
-        'string'  => ':attribute трябва да бъде минимум :min символа.',
-        'array'   => 'Атрибутът: трябва да има поне: min елементи.',
+    'lte' => [
+        'array' => 'Полето :attribute не трябва да съдържа повече от :value стойности.',
+        'file' => 'Полето :attribute трябва да бъде по-малко или равно на :value килобайта.',
+        'numeric' => 'Полето :attribute трябва да бъде по-малко или равно на :value.',
+        'string' => 'Полето :attribute трябва да бъде по-малко или равно на :value символа.',
     ],
-    'starts_with'          => ':attribute трябва да започва с една от следните стойности: :values',
-    'ends_with'            => ':attribute трябва да завършва с една от следните стойности: :values',
+    'mac_address' => 'Полето :attribute трябва да бъде валиден MAC адрес.',
+    'max' => [
+        'array' => 'Полето :attribute не трябва да е повече от :max .',
+        'file' => 'Полето :attribute не трябва да е повече от :max килобайта.',
+        'numeric' => 'Полето :attribute не трябва да е повече от :max.',
+        'string' => 'Полето :attribute не трябва да е повече от :max символа.',
+    ],
+    'max_digits' => 'Полето :attribute не трябва да съдържа повече от :max цифри.',
+    'mimes' => 'Полето :attribute трябва да бъде файл от тип: :values.',
+    'mimetypes' => 'Полето :attribute трябва да бъде файл от тип: :values.',
+    'min' => [
+        'array' => 'Полето :attribute трябва да съдържа най-малко :min стойности.',
+        'file' => 'Полето :attribute трябва да бъде най-малко :min килобайта.',
+        'numeric' => 'Полето :attribute трябва да бъде най-малко :min.',
+        'string' => 'Полето :attribute трябва да бъде минимум :min символа.',
+    ],
+    'min_digits' => 'Полето :attribute трябва да бъде минимум :min цифри.',
+    'missing' => 'Полето :attribute трябва да липсва.',
+    'missing_if' => 'Полето :attribute трябва да липсва, когато :other е :value.',
+    'missing_unless' => 'Полето :attribute трябва да липсва, освен когато :other e :value.',
+    'missing_with' => 'Полето :attribute трябва да липсва, когато :values е налице.',
+    'missing_with_all' => 'Полето :attribute трябва да липсва, когато :values е налице.',
+    'multiple_of' => 'Полето :attribute трябва да е кратно на :value.',
+    'not_in' => 'Избраният :attribute е невалиден.',
+    'not_regex' => 'Полето :attribute е с невалиден формат.',
+    'numeric' => 'Полето :attribute трябва да бъде число.',
+    'password' => [
+        'letters' => 'Полето :attribute трябва да съдръжа поне една буква.',
+        'mixed' => 'Полето :attribute трябва да съдържа поне една главна и една малка буква.',
+        'numbers' => 'Полето :attribute трябва да съдържа поне една цифра.',
+        'symbols' => 'Полето :attribute трябва да съдържа поне един символ.',
+        'uncompromised' => 'Избраната :attribute e намерена в хакнати пароли. Моля изберете друга :attribute.',
+    ],
+    'percent'       => 'Минималната стойност на амортизацията трябва да бъде между 0 и 100, когато типът амортизация е процент.',
 
-    'not_in'               => 'Избраният :attribute е невалиден.',
-    'numeric'              => ':attribute трябва да бъде число.',
-    'present'              => 'Полето на атрибута трябва да е налице.',
-    'valid_regex'          => 'Това не е валиден регулярен израз.',
-    'regex'                => 'Форматът на :attribute е невалиден.',
-    'required'             => 'Полето :attribute е задължително.',
-    'required_if'          => 'Полето :attribute е задължително, когато :other е :value.',
-    'required_unless'      => 'Полето: атрибут се изисква, освен ако: другият не е в: стойности.',
-    'required_with'        => ':attribute е задължителен, когато са избрани :values.',
-    'required_with_all'    => 'Полето: атрибут се изисква, когато: стойностите са налице.',
-    'required_without'     => ':attribute е задължителен, когато не са избрани :values.',
+    'present' => 'Полето на атрибута трябва да е налице.',
+    'present_if' => 'Полето :attribute трябва да е попълнено, когато :other е :value.',
+    'present_unless' => 'Полето :attribute трябва да е попълнено, освен когато :other е :value.',
+    'present_with' => 'Полето :attribute трябва да е попълнено, когато :values е налице.',
+    'present_with_all' => 'Полето :attribute трябва да е попълнено, когато :values са на лице.',
+    'prohibited' => 'Полето :attribute е забранено.',
+    'prohibited_if' => 'Полето :attribute е забранено, когато :other е :value.',
+    'prohibited_unless' => 'Полето :attribute е забранено, освен когато :other е в :values.',
+    'prohibits' => 'Полето :attribute забранява :other да бъде налично.',
+    'regex' => 'Полето :attribute е с невалиден формат.',
+    'required' => 'Полето :attribute е задължително.',
+    'required_array_keys' => 'Полето :attribute трябва да съдържа записи за: :values.',
+    'required_if' => 'Полето :attribute е задължително, когато :other е :value.',
+    'required_if_accepted' => 'Полето :attribute е задължително, когато :other e приет.',
+    'required_if_declined' => 'Полето :attribute е задължително, когато :other e отхвърлен.',
+    'required_unless' => 'Полето: атрибут се изисква, освен ако: другият не е в: стойности.',
+    'required_with' => ':attribute е задължителен, когато са избрани :values.',
+    'required_with_all' => 'Полето :attribute е задъклжително, когато :values имат стойност.',
+    'required_without' => ':attribute е задължителен, когато не са избрани :values.',
     'required_without_all' => 'Полето: атрибут се изисква, когато няма стойности: стойности.',
-    'same'                 => ':attribute и :other трябва да съвпадат.',
-    'size'                 => [
-        'numeric' => ':attribute трябва да бъде с дължина :size.',
-        'file'    => ':attribute трябва да бъде с големина :size KB.',
-        'string'  => ':attribute трябва да бъде с дължина :size символа.',
-        'array'   => 'Атрибутът: трябва да съдържа: размерни елементи.',
+    'same' => 'Полето :attribute трябва да съвпада с :other.',
+    'size' => [
+        'array' => 'Полето :attribute трябва да съдържа :size елементи.',
+        'file' => 'Полето :attribute трябва да бъде с големина :size килобайта.',
+        'numeric' => 'Полето :attribute трябва да бъде :size.',
+        'string' => 'Полето :attribute трябва да бъде с дължина :size символа.',
     ],
+    'starts_with' => 'Полето :attribute трябва да започва с: :values.',
     'string'               => 'Атрибутът: трябва да е низ.',
-    'timezone'             => 'Атрибутът: трябва да е валидна зона.',
     'two_column_unique_undeleted' => ':attribute трябва да бъде уникален за :table1 и :table2. ',
-    'unique'               => ':attribute вече е вписан.',
-    'uploaded'             => 'Атрибутът: не успя да качи.',
-    'url'                  => 'Форматът на :attribute е невалиден.',
     'unique_undeleted'     => ':attribute трябва да бъде уникален.',
     'non_circular'         => ':attribute не трябва да създава препрадка към себе си.',
     'not_array'            => ':attribute не може да бъде масив.',
@@ -102,11 +165,14 @@ return [
     'numbers'              => 'Паролата трябва да съдържа поне една цифра.',
     'case_diff'            => 'Паролата трябва да съдържа главни и малки букви.',
     'symbols'              => 'Паролата трябва да съдържа символи.',
-    'gte'                  => [
-        'numeric'          => 'Стойността не може да бъде отрицателна'
-    ],
-    'checkboxes'           => ':attribute съдържа невалидни опции.',
-    'radio_buttons'        => ':attribute е невалиден.',
+    'timezone' => 'Полето :attribute трябва да бъде валидна часова зона.',
+    'unique' => ':attribute вече е вписан.',
+    'uploaded' => 'Атрибутът: не успя да качи.',
+    'uppercase' => 'Полето :attribute трябва да бъде с главни букви.',
+    'url' => 'Полето :attribute трябва да съдържа валиден URL.',
+    'ulid' => 'Полето :attribute трябва да бъде валиден ULID.',
+    'uuid' => 'Полето :attribute трябва да съдържа валиден UUID.',
+    'fmcs_location' => 'Пълна поддръжка за множество компаний и местоположения е включена в админ настройките, но избраната локация и компания не са съвместими.',
 
 
     /*
@@ -120,16 +186,22 @@ return [
     |
     */
 
+    'email_array'      => 'Един или повече email адреси е невалиден.',
+    'checkboxes'           => ':attribute съдържа невалидни опции.',
+    'radio_buttons'        => ':attribute е невалиден.',
+    
     'custom' => [
         'alpha_space' => 'Полето атрибут: съдържа знак, който не е разрешен.',
-        'email_array'      => 'Един или повече имейл адреси са невалидни.',
+
         'hashed_pass'      => 'Текущата ви парола е неправилна',
         'dumbpwd'          => 'Тази парола е твърде често срещана.',
         'statuslabel_type' => 'Трябва да изберете валиден тип етикет на състоянието',
+        'custom_field_not_found'          => 'Това поле не съществува, моля проверете името на полето по избор.',
+        'custom_field_not_found_on_model' => 'Това поле вече съществува, но не е налично за избрания дълготраен актив.',
 
         // date_format validation with slightly less stupid messages. It duplicates a lot, but it gets the job done :(
-        // We use this because the default error message for date_format is reflects php Y-m-d, which non-PHP
-        // people won't know how to format. 
+        // We use this because the default error message for date_format reflects php Y-m-d, which non-PHP
+        // people won't know how to format.
         'purchase_date.date_format'     => ':values трябва да бъде валидна дата в YYYY-MM-DD формат',
         'last_audit_date.date_format'   =>  ':attribute трябва да бъде валидна дата в YYYY-MM-DD hh:mm:ss формат',
         'expiration_date.date_format'   =>  ':attribute трябва да бъде валидна дата в YYYY-MM-DD формат',
@@ -137,9 +209,15 @@ return [
         'expected_checkin.date_format'  =>  ':attribute трябва да бъде валидна дата в YYYY-MM-DD формат',
         'start_date.date_format'        =>  ':attribute трябва да бъде валидна дата в YYYY-MM-DD формат',
         'end_date.date_format'          =>  ':attribute трябва да бъде валидна дата в YYYY-MM-DD формат',
+        'invalid_value_in_field' => 'В това поле е включена невалидна стойност',
 
-    ],
+        'ldap_username_field' => [
+            'not_in' =>         '<code>sAMAccountName</code> (mixed case) няма да работи. Трябва да използвате <code>samaccountname</code> (lowercase) вместо това.'
+        ],
+        'ldap_auth_filter_query' => ['not_in' => '<code>uid=samaccountname</code> не е валиден филтър за автентикация. Ползвайте <code>uid=</code> '],
+        'ldap_filter' => ['regex' => 'Стойността не трябва да е в кавички.'],
 
+        ],
     /*
     |--------------------------------------------------------------------------
     | Custom Validation Attributes
@@ -155,8 +233,16 @@ return [
 
     /*
     |--------------------------------------------------------------------------
-    | Generic Validation Messages
+    | Generic Validation Messages - we use these in the jquery validation where we don't have
+    | access to the :attribute
     |--------------------------------------------------------------------------
     */
-    'invalid_value_in_field' => 'В това поле е включена невалидна стойност',
+
+    'generic' => [
+        'invalid_value_in_field' => 'В това поле е включена невалидна стойност',
+        'required' => 'Това поле е задължително',
+        'email' => 'Моля, въведете валиден имейл адрес',
+    ],
+
+
 ];
diff --git a/resources/lang/ca-ES/account/general.php b/resources/lang/ca-ES/account/general.php
index 1a9e2c03b8..7f9e2f848e 100644
--- a/resources/lang/ca-ES/account/general.php
+++ b/resources/lang/ca-ES/account/general.php
@@ -2,10 +2,16 @@
 
 return array(
     'personal_api_keys' => 'Personal API Keys',
+    'personal_access_token' => 'Personal Access Token',
+    'personal_api_keys_success' => 'Personal API Key :key created sucessfully',
+    'here_is_api_key' => 'Here is your new personal access token. This is the only time it will be shown so do not lose it! You may now use this token to make API requests.',
     'api_key_warning' => 'When generating an API token, be sure to copy it down immediately as they will not be visible to you again.',
     'api_base_url' => 'Your API base url is located at:',
     'api_base_url_endpoint' => '/&lt;endpoint&gt;',
     'api_token_expiration_time' => 'API tokens are set to expire in:',
     'api_reference' => 'Please check the <a href="https://snipe-it.readme.io/reference" target="_blank">API reference</a> to find specific API endpoints and additional API documentation.',
     'profile_updated' => 'Account successfully updated',
+    'no_tokens' => 'You have not created any personal access tokens.',
+    'enable_sounds' => 'Enable sound effects',
+    'enable_confetti' => 'Enable confetti effects',
 );
diff --git a/resources/lang/ca-ES/admin/accessories/message.php b/resources/lang/ca-ES/admin/accessories/message.php
index c688d5e03d..f60d41957b 100644
--- a/resources/lang/ca-ES/admin/accessories/message.php
+++ b/resources/lang/ca-ES/admin/accessories/message.php
@@ -26,7 +26,11 @@ return array(
         'error'   		=> 'Accessory was not checked out, please try again',
         'success' 		=> 'Accessory checked out successfully.',
         'unavailable'   => 'Accessory is not available for checkout. Check quantity available',
-        'user_does_not_exist' => 'That user is invalid. Please try again.'
+        'user_does_not_exist' => 'That user is invalid. Please try again.',
+         'checkout_qty' => array(
+            'lte'  => 'There is currently only one available accessory of this type, and you are trying to check out :checkout_qty. Please adjust the checkout quantity or the total stock of this accessory and try again.|There are :number_currently_remaining total available accessories, and you are trying to check out :checkout_qty. Please adjust the checkout quantity or the total stock of this accessory and try again.',
+            ),
+           
     ),
 
     'checkin' => array(
diff --git a/resources/lang/ca-ES/admin/accessories/table.php b/resources/lang/ca-ES/admin/accessories/table.php
index e02d9f22e4..80df687161 100644
--- a/resources/lang/ca-ES/admin/accessories/table.php
+++ b/resources/lang/ca-ES/admin/accessories/table.php
@@ -6,6 +6,4 @@ return array(
     'id'      					=> 'ID',
     'require_acceptance'      	=> 'Acceptance',
     'title'      				=> 'Accessory Name',
-
-
 );
diff --git a/resources/lang/ca-ES/admin/components/message.php b/resources/lang/ca-ES/admin/components/message.php
index 0a7dd8d954..ec39dc4178 100644
--- a/resources/lang/ca-ES/admin/components/message.php
+++ b/resources/lang/ca-ES/admin/components/message.php
@@ -17,7 +17,8 @@ return array(
     'delete' => array(
         'confirm'   => 'Are you sure you wish to delete this component?',
         'error'   => 'There was an issue deleting the component. Please try again.',
-        'success' => 'The component was deleted successfully.'
+        'success' => 'The component was deleted successfully.',
+        'error_qty'   => 'Some components of this type are still checked out. Please check them in and try again.',
     ),
 
      'checkout' => array(
diff --git a/resources/lang/ca-ES/admin/consumables/general.php b/resources/lang/ca-ES/admin/consumables/general.php
index 7c6bb32968..29acfedc1b 100644
--- a/resources/lang/ca-ES/admin/consumables/general.php
+++ b/resources/lang/ca-ES/admin/consumables/general.php
@@ -8,4 +8,5 @@ return array(
     'remaining' 			            => 'Remaining',
     'total' 			                => 'Total',
     'update'                            => 'Update Consumable',
+    'inventory_warning'                 => 'The inventory of this consumable is below the minimum amount of :min_count',
 );
diff --git a/resources/lang/ca-ES/admin/consumables/message.php b/resources/lang/ca-ES/admin/consumables/message.php
index c0d0aa7f68..e2591503bf 100644
--- a/resources/lang/ca-ES/admin/consumables/message.php
+++ b/resources/lang/ca-ES/admin/consumables/message.php
@@ -2,6 +2,7 @@
 
 return array(
 
+    'invalid_category_type' => 'The category must be a consumable category.',
     'does_not_exist' => 'Consumable does not exist.',
 
     'create' => array(
diff --git a/resources/lang/ca-ES/admin/custom_fields/general.php b/resources/lang/ca-ES/admin/custom_fields/general.php
index e3c21d1f0c..c9ae61c963 100644
--- a/resources/lang/ca-ES/admin/custom_fields/general.php
+++ b/resources/lang/ca-ES/admin/custom_fields/general.php
@@ -35,7 +35,7 @@ return [
     'create_field_title' => 'Create a new custom field',
     'value_encrypted'      	        => 'The value of this field is encrypted in the database. Only admin users will be able to view the decrypted value',
     'show_in_email'     => 'Include the value of this field in checkout emails sent to the user? Encrypted fields cannot be included in emails',
-    'show_in_email_short'     => 'Include in emails.',
+    'show_in_email_short' => 'Include in emails',
     'help_text' => 'Help Text',
     'help_text_description' => 'This is optional text that will appear below the form elements while editing an asset to provide context on the field.',
     'about_custom_fields_title' => 'About Custom Fields',
@@ -57,5 +57,8 @@ return [
     'show_in_requestable_list_short' => 'Show in requestable assets list',
     'show_in_requestable_list' => 'Show value in requestable assets list. Encrypted fields will not be shown',
     'encrypted_options' => 'This field is encrypted, so some display options will not be available.',
+    'display_checkin' => 'Display in checkin forms',
+    'display_checkout' => 'Display in checkout forms',
+    'display_audit' => 'Display in audit forms',
 
 ];
diff --git a/resources/lang/ca-ES/admin/custom_fields/message.php b/resources/lang/ca-ES/admin/custom_fields/message.php
index 43ba821821..6442359b7f 100644
--- a/resources/lang/ca-ES/admin/custom_fields/message.php
+++ b/resources/lang/ca-ES/admin/custom_fields/message.php
@@ -5,6 +5,7 @@ return array(
     'field' => array(
         'invalid'   => 'That field does not exist.',
         'already_added'   => 'Field already added',
+        'none_selected'   => 'No field selected',
 
         'create' => array(
             'error'   => 'Field was not created, please try again.',
diff --git a/resources/lang/ca-ES/admin/depreciations/general.php b/resources/lang/ca-ES/admin/depreciations/general.php
index 1a5666f9dc..90246e9cd8 100644
--- a/resources/lang/ca-ES/admin/depreciations/general.php
+++ b/resources/lang/ca-ES/admin/depreciations/general.php
@@ -13,4 +13,8 @@ return [
     'no_depreciations_warning'               => '<strong>Warning: </strong>
                       You do not currently have any depreciations set up.
                       Please set up at least one depreciation to view the depreciation report.',
+    'depreciation_method'                   => 'Depreciation Report',
+    'linear_depreciation'                   => 'Linear (Default)',
+    'half_1'                                => 'Half-year convention, always applied',
+    'half_2'                                => 'Half-year convention, applied with condition',
 ];
diff --git a/resources/lang/ca-ES/admin/hardware/form.php b/resources/lang/ca-ES/admin/hardware/form.php
index 8d8f41f189..61b185f6e6 100644
--- a/resources/lang/ca-ES/admin/hardware/form.php
+++ b/resources/lang/ca-ES/admin/hardware/form.php
@@ -55,8 +55,11 @@ return [
     'asset_location_update_default' => 'Update only default location',
     'asset_location_update_actual' => 'Update only actual location',
     'asset_not_deployable' => 'That asset status is not deployable. This asset cannot be checked out.',
-    'asset_deployable' => 'That status is deployable. This asset can be checked out.',
+    'asset_not_deployable_checkin' => 'That asset status is not deployable. Using this status label will checkin the asset.',
+    'asset_deployable' => 'This asset can be checked out.',
     'processing_spinner' => 'Processing... (This might take a bit of time on large files)',
+    'processing' => 'Processing... ',
     'optional_infos'  => 'Optional Information',
-    'order_details'   => 'Order Related Information'
+    'order_details'   => 'Order Related Information',
+    'calc_eol'    => 'If nulling the EOL date, use automatic EOL calculation based on the purchase date and EOL rate.',
 ];
diff --git a/resources/lang/ca-ES/admin/hardware/general.php b/resources/lang/ca-ES/admin/hardware/general.php
index 0cd9d24fd1..a4ed651fe8 100644
--- a/resources/lang/ca-ES/admin/hardware/general.php
+++ b/resources/lang/ca-ES/admin/hardware/general.php
@@ -5,8 +5,8 @@ return [
     'about_assets_text'            => 'Assets are items tracked by serial number or asset tag.  They tend to be higher value items where identifying a specific item matters.',
     'archived'  				=> 'Arxivat',
     'asset'  					=> 'Recurs',
-    'bulk_checkout'             => 'Checkout Assets',
-    'bulk_checkin'              => 'Checkin Assets',
+    'bulk_checkout'             => 'Bulk Checkout',
+    'bulk_checkin'              => 'Bulk Checkin',
     'checkin'  					=> 'Checkin Asset',
     'checkout'  				=> 'Checkout Asset',
     'clone'  					=> 'Clone Asset',
@@ -27,8 +27,7 @@ return [
     'undeployable_tooltip'  	=> 'This asset has a status label that is undeployable and cannot be checked out at this time.',
     'view'  					=> 'View Asset',
     'csv_error' => 'You have an error in your CSV file:',
-    'import_text' => '<p>Upload a CSV that contains asset history. The assets and users MUST already exist in the system, or they will be skipped. Matching assets for history import happens against the asset tag. We will try to find a matching user based on the user\'s name you provide, and the criteria you select below. If you do not select any criteria below, it will simply try to match on the username format you configured in the <code>Admin &gt; General Settings</code>.</p><p>Fields included in the CSV must match the headers: <strong>Asset Tag, Name, Checkout Date, Checkin Date</strong>. Any additional fields will be ignored. </p><p>Checkin Date: blank or future checkin dates will checkout items to associated user.  Excluding the Checkin Date column will create a checkin date with todays date.</p>
-    ',
+    'import_text' => '<p>Upload a CSV that contains asset history. The assets and users MUST already exist in the system, or they will be skipped. Matching assets for history import happens against the asset tag. We will try to find a matching user based on the user\'s name you provide, and the criteria you select below. If you do not select any criteria below, it will simply try to match on the username format you configured in the <code>Admin &gt; General Settings</code>.</p><p>Fields included in the CSV must match the headers: <strong>Asset Tag, Name, Checkout Date, Checkin Date</strong>. Any additional fields will be ignored. </p><p>Checkin Date: blank or future checkin dates will checkout items to associated user.  Excluding the Checkin Date column will create a checkin date with todays date.</p>    ',
     'csv_import_match_f-l' => 'Try to match users by <strong>firstname.lastname</strong> (<code>jane.smith</code>) format',
     'csv_import_match_initial_last' => 'Try to match users by <strong>first initial last name</strong> (<code>jsmith</code>) format',
     'csv_import_match_first' => 'Try to match users by <strong>first name</strong> (<code>jane</code>) format',
diff --git a/resources/lang/ca-ES/admin/hardware/message.php b/resources/lang/ca-ES/admin/hardware/message.php
index 32698b1c07..c19bc63647 100644
--- a/resources/lang/ca-ES/admin/hardware/message.php
+++ b/resources/lang/ca-ES/admin/hardware/message.php
@@ -2,19 +2,23 @@
 
 return [
 
-    'undeployable' 		=> '<strong>Warning: </strong> This asset has been marked as currently undeployable.
-                        If this status has changed, please update the asset status.',
-    'does_not_exist' 	=> 'Asset does not exist.',
-    'does_not_exist_var'=> 'Asset with tag :asset_tag not found.',
-    'no_tag' 	        => 'No asset tag provided.',
+    'undeployable' 		 => '<strong>Warning: </strong> This asset has been marked as currently undeployable. If this status has changed, please update the asset status.',
+    'does_not_exist' 	 => 'Asset does not exist.',
+    'does_not_exist_var' => 'Asset with tag :asset_tag not found.',
+    'no_tag' 	         => 'No asset tag provided.',
     'does_not_exist_or_not_requestable' => 'That asset does not exist or is not requestable.',
-    'assoc_users'	 	=> 'This asset is currently checked out to a user and cannot be deleted. Please check the asset in first, and then try deleting again. ',
+    'assoc_users'	 	 => 'This asset is currently checked out to a user and cannot be deleted. Please check the asset in first, and then try deleting again. ',
     'warning_audit_date_mismatch' 	=> 'This asset\'s next audit date (:next_audit_date) is before the last audit date (:last_audit_date). Please update the next audit date.',
+    'labels_generated'   => 'Labels were successfully generated.',
+    'error_generating_labels' => 'Error while generating labels.',
+    'no_assets_selected' => 'No assets selected.',
 
     'create' => [
         'error'   		=> 'Asset was not created, please try again. :(',
         'success' 		=> 'Asset created successfully. :)',
         'success_linked' => 'Asset with tag :tag was created successfully. <strong><a href=":link" style="color: white;">Click here to view</a></strong>.',
+        'multi_success_linked' => 'Asset with tag :links was created successfully.|:count assets were created succesfully. :links.',
+        'partial_failure' => 'An asset was unable to be created. Reason: :failures|:count assets were unable to be created. Reasons: :failures',
     ],
 
     'update' => [
@@ -52,20 +56,24 @@ return [
     ],
 
     'import' => [
+        'import_button'         => 'Process Import',
         'error'                 => 'Some items did not import correctly.',
         'errorDetail'           => 'The following Items were not imported because of errors.',
         'success'               => 'Your file has been imported',
         'file_delete_success'   => 'Your file has been been successfully deleted',
         'file_delete_error'      => 'The file was unable to be deleted',
         'file_missing' => 'The file selected is missing',
+        'file_already_deleted' => 'The file selected was already deleted',
         'header_row_has_malformed_characters' => 'One or more attributes in the header row contain malformed UTF-8 characters',
         'content_row_has_malformed_characters' => 'One or more attributes in the first row of content contain malformed UTF-8 characters',
+        'transliterate_failure' => 'Transliteration from :encoding to UTF-8 failed due to invalid characters in input'
     ],
 
 
     'delete' => [
         'confirm'   	=> 'Are you sure you wish to delete this asset?',
         'error'   		=> 'There was an issue deleting the asset. Please try again.',
+        'assigned_to_error' => '{1}Asset Tag: :asset_tag is currently checked out. Check in this device before deletion.|[2,*]Asset Tags: :asset_tag are currently checked out. Check in these devices before deletion.',
         'nothing_updated'   => 'No assets were selected, so nothing was deleted.',
         'success' 		=> 'The asset was deleted successfully.',
     ],
@@ -78,6 +86,11 @@ return [
         'no_assets_selected' => 'You must select at least one asset from the list',
     ],
 
+    'multi-checkout' => [
+        'error'   => 'Asset was not checked out, please try again|Assets were not checked out, please try again',
+        'success' => 'Asset checked out successfully.|Assets checked out successfully.',
+    ],
+
     'checkin' => [
         'error'   		=> 'Asset was not checked in, please try again',
         'success' 		=> 'Asset checked in successfully.',
@@ -87,9 +100,10 @@ return [
     ],
 
     'requests' => [
-        'error'   		=> 'Asset was not requested, please try again',
-        'success' 		=> 'Asset requested successfully.',
-        'canceled'      => 'Checkout request successfully canceled',
+        'error'   		=> 'Request was not successful, please try again.',
+        'success' 		=> 'Request successfully submitted.',
+        'canceled'      => 'Request successfully canceled.',
+        'cancel'        => 'Cancel this item request',
     ],
 
 ];
diff --git a/resources/lang/ca-ES/admin/hardware/table.php b/resources/lang/ca-ES/admin/hardware/table.php
index 77fc6b3c32..9cba7ba3ee 100644
--- a/resources/lang/ca-ES/admin/hardware/table.php
+++ b/resources/lang/ca-ES/admin/hardware/table.php
@@ -25,7 +25,6 @@ return [
     'image'		    => 'Device Image',
     'days_without_acceptance' => 'Days Without Acceptance',
     'monthly_depreciation' => 'Monthly Depreciation',
-    'assigned_to'    => 'Assigned To',
     'requesting_user' => 'Requesting User',
     'requested_date' => 'Requested Date',
     'changed'       => 'Changed',
diff --git a/resources/lang/ca-ES/admin/kits/general.php b/resources/lang/ca-ES/admin/kits/general.php
index f57fb645c4..2b5c2d9cd0 100644
--- a/resources/lang/ca-ES/admin/kits/general.php
+++ b/resources/lang/ca-ES/admin/kits/general.php
@@ -47,4 +47,5 @@ return [
     'kit_deleted'                       => 'Kit was successfully deleted',
     'kit_model_updated'                 => 'Model was successfully updated',
     'kit_model_detached'                => 'Model was successfully detached',
+    'model_already_attached'            => 'Model already attached to kit',
 ];
diff --git a/resources/lang/ca-ES/admin/licenses/general.php b/resources/lang/ca-ES/admin/licenses/general.php
index 79b69a3d94..b39030afd4 100644
--- a/resources/lang/ca-ES/admin/licenses/general.php
+++ b/resources/lang/ca-ES/admin/licenses/general.php
@@ -14,6 +14,7 @@ return array(
     'info'  					=> 'License Info',
     'license_seats'  			=> 'License Seats',
     'seat'  					=> 'Seat',
+    'seat_count'  				=> 'Seat :count',
     'seats'  					=> 'Seats',
     'software_licenses'  		=> 'Software Licenses',
     'user'  					=> 'User',
@@ -23,12 +24,12 @@ return array(
         [
             'checkin_all'           => [
                 'button'            => 'Checkin All Seats',
-                'modal'             => 'This will action checkin one seat. | This action will checkin all :checkedout_seats_count seats for this license.',
+                'modal'             => 'This action will checkin one seat. | This action will checkin all :checkedout_seats_count seats for this license.',
                 'enabled_tooltip'   => 'Checkin ALL seats for this license from both users and assets',
                 'disabled_tooltip'  => 'This is disabled because there are no seats currently checked out',
                 'disabled_tooltip_reassignable'  => 'This is disabled because the License is not reassignable',
                 'success'           => 'License successfully checked in! | All licenses were successfully checked in!',
-                'log_msg'           => 'Checked in via bulk license checkout in license GUI',
+                'log_msg'           => 'Checked in via bulk license checkin in license GUI',
             ],
 
             'checkout_all'              => [
diff --git a/resources/lang/ca-ES/admin/licenses/message.php b/resources/lang/ca-ES/admin/licenses/message.php
index 27fbfe38a9..74e1d7af5a 100644
--- a/resources/lang/ca-ES/admin/licenses/message.php
+++ b/resources/lang/ca-ES/admin/licenses/message.php
@@ -44,10 +44,13 @@ return array(
         'error'   => 'There was an issue checking out the license. Please try again.',
         'success' => 'The license was checked out successfully',
         'not_enough_seats' => 'Not enough license seats available for checkout',
+        'mismatch' => 'The license seat provided does not match the license',
+        'unavailable' => 'This seat is not available for checkout.',
     ),
 
     'checkin' => array(
         'error'   => 'There was an issue checking in the license. Please try again.',
+        'not_reassignable' => 'License not reassignable',
         'success' => 'The license was checked in successfully'
     ),
 
diff --git a/resources/lang/ca-ES/admin/locations/message.php b/resources/lang/ca-ES/admin/locations/message.php
index 8121b80687..b21c70ad89 100644
--- a/resources/lang/ca-ES/admin/locations/message.php
+++ b/resources/lang/ca-ES/admin/locations/message.php
@@ -3,11 +3,12 @@
 return array(
 
     'does_not_exist' => 'Location does not exist.',
-    'assoc_users'    => 'This location is not currently deletable because it is the location of record for at least one asset or user, has assets assigned to it, or is the parent location of another location. Please update your models to no longer reference this company and try again. ',
+    'assoc_users'    => 'This location is not currently deletable because it is the location of record for at least one asset or user, has assets assigned to it, or is the parent location of another location. Please update your records to no longer reference this location and try again ',
     'assoc_assets'	 => 'This location is currently associated with at least one asset and cannot be deleted. Please update your assets to no longer reference this location and try again. ',
     'assoc_child_loc'	 => 'This location is currently the parent of at least one child location and cannot be deleted. Please update your locations to no longer reference this location and try again. ',
     'assigned_assets' => 'Assigned Assets',
     'current_location' => 'Current Location',
+    'open_map' => 'Open in :map_provider_icon Maps',
 
 
     'create' => array(
@@ -20,6 +21,11 @@ return array(
         'success' => 'Location updated successfully.'
     ),
 
+    'restore' => array(
+        'error'   => 'Location was not restored, please try again',
+        'success' => 'Location restored successfully.'
+    ),
+
     'delete' => array(
         'confirm'   	=> 'Are you sure you wish to delete this location?',
         'error'   => 'There was an issue deleting the location. Please try again.',
diff --git a/resources/lang/ca-ES/admin/locations/table.php b/resources/lang/ca-ES/admin/locations/table.php
index b23cef3e5c..2e3ff70e85 100644
--- a/resources/lang/ca-ES/admin/locations/table.php
+++ b/resources/lang/ca-ES/admin/locations/table.php
@@ -39,4 +39,5 @@ return [
     'signed_by_finance_auditor' => 'Signed By (Finance Auditor):',
     'signed_by_location_manager' => 'Signed By (Location Manager):',
     'signed_by'                 => 'Signed Off By:',
+    'clone'  					=> 'Clone Location',
 ];
diff --git a/resources/lang/ca-ES/admin/models/general.php b/resources/lang/ca-ES/admin/models/general.php
index 7e4a77adbc..9a61b53fd0 100644
--- a/resources/lang/ca-ES/admin/models/general.php
+++ b/resources/lang/ca-ES/admin/models/general.php
@@ -3,7 +3,7 @@
 return array(
     'about_models_title'     => 'About Asset Models',
     'about_models_text'           => 'Asset Models are a way to group identical assets. "MBP 2013", "IPhone 6s", etc.',
-    'deleted'  					        => 'This model has been deleted.',
+    'deleted'  					=> 'This model has been deleted.',
     'bulk_delete'               => 'Bulk Delete Asset Models',
     'bulk_delete_help'               => 'Use the checkboxes below to confirm the deletion of the selected asset models. Asset models that have assets associated with them cannot be deleted until the assets are associated with a different model.',
     'bulk_delete_warn'          => 'You are about to delete one asset model.|You are about to delete :model_count asset models.',
diff --git a/resources/lang/ca-ES/admin/models/message.php b/resources/lang/ca-ES/admin/models/message.php
index cc38c54530..ae3bc34eed 100644
--- a/resources/lang/ca-ES/admin/models/message.php
+++ b/resources/lang/ca-ES/admin/models/message.php
@@ -7,7 +7,7 @@ return array(
     'no_association' => 'WARNING! The asset model for this item is invalid or missing!',
     'no_association_fix' => 'This will break things in weird and horrible ways. Edit this asset now to assign it a model.',
     'assoc_users'	 => 'This model is currently associated with one or more assets and cannot be deleted. Please delete the assets, and then try deleting again. ',
-
+    'invalid_category_type' => 'This category must be an asset category.',
 
     'create' => array(
         'error'   => 'Model was not created, please try again.',
diff --git a/resources/lang/ca-ES/admin/reports/general.php b/resources/lang/ca-ES/admin/reports/general.php
index 9b682f8ecd..ed8bf1a156 100644
--- a/resources/lang/ca-ES/admin/reports/general.php
+++ b/resources/lang/ca-ES/admin/reports/general.php
@@ -4,6 +4,7 @@ return [
     'info'   => 'Select the options you want for your asset report.',
     'deleted_user' => 'Deleted user',
     'send_reminder' => 'Send reminder',
+    'cannot_send_reminder' => 'User has been deleted or does not have an email address so cannot receive a reminder',
     'reminder_sent' => 'Reminder sent',
     'acceptance_deleted' => 'Acceptance request deleted',
     'acceptance_request' => 'Acceptance request',
@@ -13,5 +14,10 @@ return [
         'user_state' => 'User State',
         'user_country' => 'User Country',
         'user_zip' => 'User Zip'
-    ]
-];
\ No newline at end of file
+    ],
+    'open_saved_template' => 'Open Saved Template',
+    'save_template' =>  'Save Template',
+    'select_a_template' => 'Select a Template',
+    'template_name' => 'Template Name',
+    'update_template' => 'Update Template',
+];
diff --git a/resources/lang/ca-ES/admin/reports/message.php b/resources/lang/ca-ES/admin/reports/message.php
index d4c8f8198f..2800bbdf0b 100644
--- a/resources/lang/ca-ES/admin/reports/message.php
+++ b/resources/lang/ca-ES/admin/reports/message.php
@@ -1,5 +1,16 @@
 <?php
 
-return array(
-    'error'   => 'You must select at least ONE option.'
-);
+return [
+    'about_templates' => 'About Saved Templates',
+    'saving_templates_description' => 'Select your options, then enter the name of your template in the box above and click the \'Save Template\' button. Use the dropdown to select a previously saved template.',
+    'create'  => [
+        'success' => 'Template saved successfully',
+    ],
+    'update' => [
+        'success' => 'Template updated successfully',
+    ],
+    'delete' => [
+        'success' => 'Template deleted',
+        'no_delete_permission' => 'Template does not exist or you do not have permission to delete it.',
+    ],
+];
diff --git a/resources/lang/ca-ES/admin/settings/general.php b/resources/lang/ca-ES/admin/settings/general.php
index 8074f5082e..37cfb0de94 100644
--- a/resources/lang/ca-ES/admin/settings/general.php
+++ b/resources/lang/ca-ES/admin/settings/general.php
@@ -8,13 +8,13 @@ return [
     'ad_append_domain'          => 'Append domain name to username field',
     'ad_append_domain_help'     => 'User isn\'t required to write "username@domain.local", they can just type "username".',
     'admin_cc_email'            => 'CC Email',
-    'admin_cc_email_help'       => 'If you would like to send a copy of checkin/checkout emails that are sent to users to an additional email account, enter it here. Otherwise leave this field blank.',
+    'admin_cc_email_help'       => 'Send a copy of checkin/checkout emails to this address.',
     'admin_settings'            => 'Admin Settings',
     'is_ad'				        => 'This is an Active Directory server',
     'alerts'                	=> 'Alerts',
     'alert_title'               => 'Update Notification Settings',
     'alert_email'				=> 'Send alerts to',
-    'alert_email_help'    => 'Email addresses or distribution lists you want alerts to be sent to, comma separated',
+    'alert_email_help'          => 'Email addresses or distribution lists you want alerts to be sent to, comma separated.',
     'alerts_enabled'			=> 'Email Alerts Enabled',
     'alert_interval'			=> 'Expiring Alerts Threshold (in days)',
     'alert_inv_threshold'		=> 'Inventory Alert Threshold',
@@ -31,15 +31,18 @@ return [
     'backups'					=> 'Backups',
     'backups_help'              => 'Create, download, and restore backups ',
     'backups_restoring'         => 'Restoring from Backup',
+    'backups_clean' => 'Clean the backed-up database before restore',
+    'backups_clean_helptext' => "This can be useful if you're changing between database versions",
     'backups_upload'            => 'Upload Backup',
     'backups_path'              => 'Backups on the server are stored in <code>:path</code>',
-    'backups_restore_warning'   => 'Use the restore button <small><span class="btn btn-xs btn-warning"><i class="text-white fas fa-retweet" aria-hidden="true"></i></span></small> to restore from a previous backup. (This does not currently work with S3 file storage or Docker.)<br><br>Your <strong>entire :app_name database and any uploaded files will be completely replaced</strong> by what\'s in the backup file.  ',
+    'backups_restore_warning'   => 'Use the restore button <small><span class="btn btn-xs btn-warning"><i class="text-white fas fa-retweet" aria-hidden="true"></i></span></small> to restore from a previous backup. (This does not currently work with S3 file storage or Docker.)<br><br>Your <strong>entire :app_name database and any uploaded files will be completely replaced</strong> by what\'s in the backup file  ',
     'backups_logged_out'         => 'All existing users, including you, will be logged out once your restore is complete.',
     'backups_large'             => 'Very large backups may time out on the restore attempt and may still need to be run via command line. ',
     'barcode_settings'			=> 'Barcode Settings',
     'confirm_purge'			    => 'Confirm Purge',
     'confirm_purge_help'		=> 'Enter the text "DELETE" in the box below to purge your deleted records. This action cannot be undone and will PERMANENTLY delete all soft-deleted items and users. (You should make a backup first, just to be safe.)',
     'custom_css'				=> 'Custom CSS',
+    'custom_css_placeholder'	=> 'Add your custom CSS',
     'custom_css_help'			=> 'Enter any custom CSS overrides you would like to use. Do not include the &lt;style&gt;&lt;/style&gt; tags.',
     'custom_forgot_pass_url'	=> 'Custom Password Reset URL',
     'custom_forgot_pass_url_help'	=> 'This replaces the built-in forgotten password URL on the login screen, useful to direct people to internal or hosted LDAP password reset functionality. It will effectively disable local user forgotten password functionality.',
@@ -47,34 +50,34 @@ return [
     'dashboard_message_help'	=> 'This text will appear on the dashboard for anyone with permission to view the dashboard.',
     'default_currency'  		=> 'Default Currency',
     'default_eula_text'			=> 'Default EULA',
+    'default_eula_text_placeholder' => 'Add your default EULA text',
     'default_language'			=> 'Default Language',
     'default_eula_help_text'	=> 'You can also associate custom EULAs to specific asset categories.',
     'acceptance_note'           => 'Add a note for your decision (Optional)',
     'display_asset_name'        => 'Display Asset Name',
     'display_checkout_date'     => 'Display Checkout Date',
     'display_eol'               => 'Display EOL in table view',
-    'display_qr'                => 'Display Square Codes',
+    'display_qr'                => 'Display 2D barcode',
     'display_alt_barcode'		=> 'Display 1D barcode',
-    'email_logo'                => 'Email Logo',
     'barcode_type'				=> '2D Barcode Type',
     'alt_barcode_type'			=> '1D barcode type',
-    'email_logo_size'       => 'Square logos in email look best. ',
     'enabled'                   => 'Enabled',
     'eula_settings'				=> 'EULA Settings',
     'eula_markdown'				=> 'This EULA allows <a href="https://help.github.com/articles/github-flavored-markdown/">Github flavored markdown</a>.',
+    'empty_row_count'           => 'Field Start Offset (Empty Rows)',
+    'empty_row_count_help'      => 'Fields will begin populating after this many empty rows are skipped at the top of the label.',
     'favicon'                   => 'Favicon',
     'favicon_format'            => 'Accepted filetypes are ico, png, and gif. Other image formats may not work in all browsers.',
     'favicon_size'          => 'Favicons should be square images, 16x16 pixels.',
     'footer_text'               => 'Additional Footer Text ',
     'footer_text_help'          => 'This text will appear in the right-side footer. Links are allowed using <a href="https://help.github.com/articles/github-flavored-markdown/">Github flavored markdown</a>. Line breaks, headers, images, etc may result in unpredictable results.',
+    'footer_text_placeholder'   => 'Optional footer text',
     'general_settings'			=> 'General Settings',
-    'general_settings_keywords' => 'company support, signature, acceptance, email format, username format, images, per page, thumbnail, eula, gravatar, tos, dashboard, privacy',
     'general_settings_help'     => 'Default EULA and more',
     'generate_backup'			=> 'Generate Backup',
     'google_workspaces'         => 'Google Workspaces',
     'header_color'              => 'Header Color',
     'info'                      => 'These settings let you customize certain aspects of your installation.',
-    'label_logo'                => 'Label Logo',
     'label_logo_size'           => 'Square logos look best - will be displayed in the top right of each asset label. ',
     'laravel'                   => 'Laravel Version',
     'ldap'                      => 'LDAP',
@@ -94,7 +97,7 @@ return [
     'ldap_login_sync_help'      => 'This only tests that LDAP can sync correctly. If your LDAP Authentication query is not correct, users may still not be able to login. YOU MUST SAVE YOUR UPDATED LDAP SETTINGS FIRST.',
     'ldap_manager'              => 'LDAP Manager',
     'ldap_server'               => 'LDAP Server',
-    'ldap_server_help'          => 'This should start with ldap:// (for unencrypted or TLS) or ldaps:// (for SSL)',
+    'ldap_server_help'          => 'This should start with ldap:// (for unencrypted) or ldaps:// (for TLS or SSL)',
     'ldap_server_cert'			=> 'LDAP SSL certificate validation',
     'ldap_server_cert_ignore'	=> 'Allow invalid SSL Certificate',
     'ldap_server_cert_help'		=> 'Select this checkbox if you are using a self signed SSL cert and would like to accept an invalid SSL certificate.',
@@ -108,8 +111,8 @@ return [
     'ldap_pword'                => 'LDAP Bind Password',
     'ldap_basedn'               => 'Base Bind DN',
     'ldap_filter'               => 'LDAP Filter',
-    'ldap_pw_sync'              => 'LDAP Password Sync',
-    'ldap_pw_sync_help'         => 'Uncheck this box if you do not wish to keep LDAP passwords synced with local passwords. Disabling this means that your users may not be able to login if your LDAP server is unreachable for some reason.',
+    'ldap_pw_sync'              => 'Cache LDAP Passwords',
+    'ldap_pw_sync_help'         => 'Uncheck this box if you do not wish to keep LDAP passwords cached as local hashed passwords. Disabling this means that your users may not be able to login if your LDAP server is unreachable for some reason.',
     'ldap_username_field'       => 'Username Field',
     'ldap_lname_field'          => 'Last Name',
     'ldap_fname_field'          => 'LDAP First Name',
@@ -117,13 +120,15 @@ return [
     'ldap_version'              => 'LDAP Version',
     'ldap_active_flag'          => 'LDAP Active Flag',
     'ldap_activated_flag_help'  => 'This value is used to determine whether a synced user can login to Snipe-IT. <strong>It does not affect the ability to check items in or out to them</strong>, and should be the <strong>attribute name</strong> within your AD/LDAP, <strong>not the value</strong>. <br><br>If this field is set to a field name that does not exist in your AD/LDAP, or the value in the AD/LDAP field is set to <code>0</code> or <code>false</code>, <strong>user login will be disabled</strong>. If the value in the AD/LDAP field is set to <code>1</code> or <code>true</code> or <em>any other text</em> means the user can log in. When the field is blank in your AD, we respect the <code>userAccountControl</code> attribute, which usually allows non-suspended users to log in.',
+    'ldap_invert_active_flag'   => 'LDAP Invert Active Flag',
+    'ldap_invert_active_flag_help'     => 'If enabled: when the value returned by LDAP Active Flag is <code>0</code> or <code>false</code> the user account will be active.',
     'ldap_emp_num'              => 'LDAP Employee Number',
     'ldap_email'                => 'LDAP Email',
     'ldap_test'                 => 'Test LDAP',
     'ldap_test_sync'            => 'Test LDAP Synchronization',
     'license'                   => 'Software License',
-    'load_remote'               => 'Use Gravatar',
-    'load_remote_help_text'		=> 'Uncheck this box if your install cannot load scripts from the outside internet. This will prevent Snipe-IT from trying load images from Gravatar.',
+    'load_remote'               => 'Load Remote Avatars',
+    'load_remote_help_text'		=> 'Uncheck this box if your install cannot load scripts from the outside internet. This will prevent Snipe-IT from trying load avatars from Gravatar or other outside sources.',
     'login'                     => 'Login Attempts',
     'login_attempt'             => 'Login Attempt',
     'login_ip'                  => 'IP Address',
@@ -131,6 +136,7 @@ return [
     'login_user_agent'          => 'User Agent',
     'login_help'                => 'List of attempted logins',
     'login_note'                => 'Login Note',
+    'login_note_placeholder'            => "If you do not have a login or have found a device belonging to this company, please call technical support at 888-555-1212. Thank you.",
     'login_note_help'           => 'Optionally include a few sentences on your login screen, for example to assist people who have found a lost or stolen device. This field accepts <a href="https://help.github.com/articles/github-flavored-markdown/">Github flavored markdown</a>',
     'login_remote_user_text'    => 'Remote User login options',
     'login_remote_user_enabled_text' => 'Enable Login with Remote User Header',
@@ -146,13 +152,16 @@ return [
     'logo_print_assets_help'    => 'Use branding on printable asset lists ',
     'full_multiple_companies_support_help_text' => 'Restricting users (including admins) assigned to companies to their company\'s assets.',
     'full_multiple_companies_support_text' => 'Full Multiple Companies Support',
+    'scope_locations_fmcs_support_text'  => 'Scope Locations with Full Multiple Companies Support',
+    'scope_locations_fmcs_support_help_text'  => 'Restrict locations to their selected company.',
+    'scope_locations_fmcs_check_button' => 'Check Compatibility',
+    'scope_locations_fmcs_support_disabled_text'  => 'This option is disabled because you have conflicting locations set for :count or more items.',
     'show_in_model_list'   => 'Show in Model Dropdowns',
     'optional'					=> 'optional',
     'per_page'                  => 'Results Per Page',
     'php'                       => 'PHP Version',
-    'php_info'                  => 'PHP Info',
+    'php_info'                  => 'PHP info',
     'php_overview'              => 'PHP',
-    'php_overview_keywords'     => 'phpinfo, system, info',
     'php_overview_help'         => 'PHP System info',
     'php_gd_info'               => 'You must install php-gd to display QR codes, see install instructions.',
     'php_gd_warning'            => 'PHP Image Processing and GD plugin is NOT installed.',
@@ -218,6 +227,8 @@ return [
     'webhook_integration_help'    => ':app integration is optional, however the endpoint and channel are required if you wish to use it. To configure :app integration, you must first <a href=":webhook_link" target="_new" rel="noopener">create an incoming webhook</a> on your :app account. Click on the <strong>Test :app Integration</strong> button to confirm your settings are correct before saving. ',
     'webhook_integration_help_button'    => 'Once you have saved your :app information, a test button will appear.',
     'webhook_test_help'           => 'Test whether your :app integration is configured correctly. YOU MUST SAVE YOUR UPDATED :app SETTINGS FIRST.',
+    'shortcuts_enabled'         => 'Enable Shortcuts',
+    'shortcuts_help_text'       => '<strong>Windows</strong>: Alt + Access key, <strong>Mac</strong>: Control + Option + Access key',
     'snipe_version'  			=> 'Snipe-IT version',
     'support_footer'            => 'Support Footer Links ',
     'support_footer_help'       => 'Specify who sees the links to the Snipe-IT Support info and Users Manual',
@@ -227,7 +238,6 @@ return [
     'update'                    => 'Update Settings',
     'value'                     => 'Value',
     'brand'                     => 'Branding',
-    'brand_keywords'            => 'footer, logo, print, theme, skin, header, colors, color, css',
     'brand_help'                => 'Logo, Site Name',
     'web_brand'                 => 'Web Branding Type',
     'about_settings_title'      => 'About Settings',
@@ -276,6 +286,8 @@ return [
     'two_factor_enrollment_text'	=> "Two factor authentication is required, however your device has not been enrolled yet. Open your Google Authenticator app and scan the QR code below to enroll your device. Once you've enrolled your device, enter the code below",
     'require_accept_signature'      => 'Require Signature',
     'require_accept_signature_help_text'      => 'Enabling this feature will require users to physically sign off on accepting an asset.',
+    'require_checkinout_notes'  => 'Require Notes on Checkin/Checkout',
+    'require_checkinout_notes_help_text'    => 'Enabling this feature will require the note fields to be populated when checking in or checking out an asset.',
     'left'        => 'left',
     'right'        => 'right',
     'top'        => 'top',
@@ -313,24 +325,24 @@ return [
     'filter_by_keyword' => 'Filter by setting keyword',
     'security' => 'Security',
     'security_title' => 'Update Security Settings',
-    'security_keywords' => 'password, passwords, requirements, two factor, two-factor, common passwords, remote login, logout, authentication',
     'security_help' => 'Two-factor, Password Restrictions',
-    'groups_keywords' => 'permissions, permission groups, authorization',
     'groups_help' => 'Account permission groups',
     'localization' => 'Localization',
     'localization_title' => 'Update Localization Settings',
-    'localization_keywords' => 'localization, currency, local, locale, time zone, timezone, international, internatinalization, language, languages, translation',
     'localization_help' => 'Language, date display',
     'notifications' => 'Notifications',
     'notifications_help' => 'Email Alerts & Audit Settings',
     'asset_tags_help' => 'Incrementing and prefixes',
     'labels' => 'Labels',
     'labels_title' => 'Update Label Settings',
-    'labels_help' => 'Label sizes &amp; settings',
-    'purge_keywords' => 'permanently delete',
+    'labels_help' => 'Barcodes &amp; label settings',
     'purge_help' => 'Purge Deleted Records',
     'ldap_extension_warning' => 'It does not look like the LDAP extension is installed or enabled on this server. You can still save your settings, but you will need to enable the LDAP extension for PHP before LDAP syncing or login will work.',
     'ldap_ad' => 'LDAP/AD',
+    'ldap_test_label' => 'Test LDAP Sync',
+    'ldap_test_login' => ' Test LDAP Login',
+    'ldap_username_placeholder' => 'LDAP Username',
+    'ldap_password_placeholder' => 'LDAP Password',
     'employee_number' => 'Employee Number',
     'create_admin_user' => 'Create a User ::',
     'create_admin_success' => 'Success! Your admin user has been added!',
@@ -342,6 +354,8 @@ return [
     'setup_migration_create_user' => 'Next: Create User',
     'ldap_settings_link' => 'LDAP Settings Page',
     'slack_test' => 'Test <i class="fab fa-slack"></i> Integration',
+    'status_label_name' => 'Status Label Name',
+    'super_admin_only'  => 'Super Admin Only',
     'label2_enable'           => 'New Label Engine',
     'label2_enable_help'      => 'Switch to the new label engine. <b>Note: You will need to save this setting before setting others.</b>',
     'label2_template'         => 'Template',
@@ -356,12 +370,15 @@ return [
     'label2_2d_type'          => '2D Barcode Type',
     'label2_2d_type_help'     => 'Format for 2D barcodes',
     'label2_2d_target'        => '2D Barcode Target',
-    'label2_2d_target_help'   => 'The URL the 2D barcode points to when scanned',
+    'label2_2d_target_help'   => 'The data that will be contained in the 2D barcode',
     'label2_fields'           => 'Field Definitions',
     'label2_fields_help'      => 'Fields can be added, removed, and reordered in the left column. For each field, multiple options for Label and DataSource can be added, removed, and reordered in the right column.',
+    'purge_barcodes' => 'Purge Barcodes',
     'help_asterisk_bold'    => 'Text entered as <code>**text**</code> will be displayed as bold',
     'help_blank_to_use'     => 'Leave blank to use the value from <code>:setting_name</code>',
     'help_default_will_use' => '<code>:default</code> will use the value from <code>:setting_name</code>. <br>Note that the value of the barcodes must comply with the respective barcode spec in order to be successfully generated. Please see <a href="https://snipe-it.readme.io/docs/barcodes">the documentation <i class="fa fa-external-link"></i></a> for more details. ',
+    'asset_id'              => 'Asset ID',
+    'data'               => 'Data',
     'default'               => 'Default',
     'none'                  => 'None',
     'google_callback_help' => 'This should be entered as the callback URL in your Google OAuth app settings in your organization&apos;s <strong><a href="https://console.cloud.google.com/" target="_blank">Google developer console <i class="fa fa-external-link" aria-hidden="true"></i></a></strong>.',
@@ -373,7 +390,100 @@ return [
     'database_driver' => 'Database Driver',
     'bs_table_storage' => 'Table Storage',
     'timezone' => 'Timezone',
+    'test_mail' => 'Test Mail',
     'profile_edit'          => 'Edit Profile',
     'profile_edit_help'          => 'Allow users to edit their own profiles.',
+    'default_avatar' => 'Custom Default Avatar',
+    'default_avatar_help' => 'This image will be displayed as a profile if a user does not have a profile photo.',
+    'restore_default_avatar' => 'Restore <a href=":default_avatar" data-toggle="lightbox" data-type="image">original system default avatar</a>',
+    'restore_default_avatar_help' => '',
+    'due_checkin_days' => 'Due For Checkin Warning',
+    'due_checkin_days_help' => 'How many days before the expected checkin of an asset should it be listed in the "Due for checkin" page?',
+    'no_groups' => 'No groups have been created yet. Visit <code>Admin Settings > Permission Groups</code> to add one.',
+    'text' => 'Text',
+
+    'username_formats' => [
+        'username_format'		=> 'Username Format',
+        'firstname_lastname_format'	=> 'First Name Last Name (jane.smith)',
+        'first_name_format'	        => 'First Name (jane)',
+        'last_name_format'		=> 'Last Name (doe)',
+        'filastname_format'			=> 'First Initial Last Name (jsmith)',
+        'lastnamefirstinitial_format' =>  'Last Name First Initial (smithj)',
+        'firstname_lastname_underscore_format' => 'First Name Last Name (jane_smith)',
+        'firstinitial.lastname' => 'First Initial Last Name (j.smith)',
+        'lastname_firstinitial' => 'Last Name First Initial (smith_j)',
+        'lastname_dot_firstinitial_format' => 'Last Name First Initial (smith.j)',
+        'firstnamelastname'     => 'First Name Last Name (janesmith)',
+        'firstnamelastinitial'  => 'First Name Last Initial (janes)',
+        'lastnamefirstname'      => 'Last Name.First Name (smith.jane)',
+    ],
+
+    'email_formats' => [
+        'email_format'			=> 'Email Format',
+        'firstname_lastname_format'	=> 'First Name Last Name (jane.smith@example.com)',
+        'first_name_format'		=> 'First Name (jane@example.com)',
+        'last_name_format'		=> 'Last Name (doe@example.com)',
+        'filastname_format'			=> 'First Initial Last Name (jsmith@example.com)',
+        'lastnamefirstinitial_format' =>  'Last Name First Initial (smithj@example.com)',
+        'firstname_lastname_underscore_format' => 'First Name Last Name (jane_smith@example.com)',
+        'firstinitial.lastname' => 'First Initial Last Name (j.smith@example.com)',
+        'lastname_firstinitial' => 'Last Name First Initial (smith_j@example.com)',
+        'lastname_dot_firstinitial_format' => 'Last Name First Initial (smith.j@example.com)',
+        'firstnamelastname'     => 'First Name Last Name (janesmith@example.com)',
+        'firstnamelastinitial'  => 'First Name Last Initial (janes@example.com)',
+        'lastnamefirstname'      => 'Last Name.First Name (smith.jane@example.com)',
+    ],
+
+
+
+    'logo_labels' => [
+        'acceptance_pdf_logo'       => 'PDF Logo',
+        'email_logo'                => 'Email Logo',
+        'label_logo'                => 'Label Logo',
+        'logo'                      => 'Site Logo',
+        'favicon'                   => 'Favicon',
+    ],
+
+    'logo_help' => [
+        'email_logo_size'       => 'Square logos in email look best. ',
+    ],
+
+    'logo_option_types' => [
+        'text' => 'Text',
+        'logo' => 'Logo',
+        'logo_and_text' => 'Logo and Text',
+    ],
+
+
+    'legends' => [
+        'scoping' => 'Scoping',
+        'formats' => 'Default Formats',
+        'profiles' => 'User Profiles',
+        'eula' => 'EULA & Acceptance Preferences',
+        'misc_display' => 'Miscellaneous Display Options',
+        'email' => 'Email Preferences',
+        'checkin' => 'Checkin Preferences',
+        'dashboard' => 'Login & Dashboard Preferences',
+        'misc' => 'Miscellaneous',
+        'logos' => 'Logos & Display',
+        'colors' => 'Colors & Skins',
+        'footer' => 'Footer Preferences',
+        'security' => 'Security Preferences',
+        'general' => 'General',
+        'intervals' => 'Intervals & Thresholds',
+    ],
+
+
+    /* Keywords for settings overview help */
+    'keywords' => [
+        'brand'             => 'footer, logo, print, theme, skin, header, colors, color, css',
+        'general_settings'  => 'company support, signature, acceptance, email format, username format, images, per page, thumbnail, eula, gravatar, tos, dashboard, privacy',
+        'groups'            => 'permissions, permission groups, authorization',
+        'labels'            => 'labels, barcodes, barcode, sheets, print, upc, qr, 1d, 2d',
+        'localization'      => 'localization, currency, local, locale, time zone, timezone, international, internatinalization, language, languages, translation',
+        'php_overview'      => 'phpinfo, system, info',
+        'purge'             => 'permanently delete',
+        'security'          => 'password, passwords, requirements, two factor, two-factor, common passwords, remote login, logout, authentication',
+    ],
 
 ];
diff --git a/resources/lang/ca-ES/admin/settings/message.php b/resources/lang/ca-ES/admin/settings/message.php
index c9b0f34217..58abf14c5c 100644
--- a/resources/lang/ca-ES/admin/settings/message.php
+++ b/resources/lang/ca-ES/admin/settings/message.php
@@ -14,6 +14,9 @@ return [
         'restore_warning'       => 'Yes, restore it. I acknowledge that this will overwrite any existing data currently in the database. This will also log out all of your existing users (including you).',
         'restore_confirm'       => 'Are you sure you wish to restore your database from :filename?'
     ],
+    'restore' => [
+        'success'               => 'Your system backup has been restored. Please log in again.'
+    ],
     'purge' => [
         'error'     => 'An error has occurred while purging. ',
         'validation_failed'     => 'Your purge confirmation is incorrect. Please type the word "DELETE" in the confirmation box.',
@@ -33,6 +36,9 @@ return [
         'testing_authentication' => 'Testing LDAP Authentication...',
         'authentication_success' => 'User authenticated against LDAP successfully!'
     ],
+    'labels' => [
+        'null_template' => 'Label template not found. Please select a template.',
+        ],
     'webhook' => [
         'sending' => 'Sending :app test message...',
         'success' => 'Your :webhook_name Integration works!',
@@ -42,5 +48,12 @@ return [
         'error' => 'Something went wrong. :app responded with: :error_message',
         'error_redirect' => 'ERROR: 301/302 :endpoint returns a redirect. For security reasons, we don’t follow redirects. Please use the actual endpoint.',
         'error_misc' => 'Something went wrong. :( ',
-    ]
+        'webhook_fail' => ' webhook notification failed: Check to make sure the URL is still valid.',
+        'webhook_channel_not_found' => ' webhook channel not found.',
+        'ms_teams_deprecation' => 'The selected Microsoft Teams webhook URL will be deprecated Dec 31st, 2025. Please use a workflow URL. Microsoft\'s documentation on creating a workflow can be found <a href="https://support.microsoft.com/en-us/office/create-incoming-webhooks-with-workflows-for-microsoft-teams-8ae491c7-0394-4861-ba59-055e33f75498" target="_blank"> here.</a>',
+    ],
+    'location_scoping' => [
+        'not_saved' => 'Your settings were not saved.',
+        'mismatch' => 'There is 1 item in the database that need your attention before you can enable location scoping.|There are :count items in the database that need your attention before you can enable location scoping.',
+    ],
 ];
diff --git a/resources/lang/ca-ES/admin/statuslabels/table.php b/resources/lang/ca-ES/admin/statuslabels/table.php
index 23427227a8..719ec73d31 100644
--- a/resources/lang/ca-ES/admin/statuslabels/table.php
+++ b/resources/lang/ca-ES/admin/statuslabels/table.php
@@ -1,14 +1,14 @@
 <?php
 
 return array(
-    'about'      	=> 'About Status Labels',
+    'about'      	=> 'About Status Types',
     'archived'      	=> 'Arxivat',
     'create'      	=> 'Create Status Label',
     'color'      	=> 'Chart Color',
     'default_label' => 'Default Label',
     'default_label_help' => 'This is used to ensure your most commonly used status labels appear at the top of the select box when creating/editing assets.',
     'deployable'      	=> 'Deployable',
-    'info'      	=> 'Status labels are used to describe the various states your assets could be in. They may be out for repair, lost/stolen, etc. You can create new status labels for deployable, pending and archived assets.',
+    'info'      	=> 'Status label types are used to describe the various states your assets could be in. They may be out for repair, lost/stolen, etc. You can create new status labels for your deployable, pending and archived assets according to your own workflow. For more information, <a href="https://snipe-it.readme.io/docs/overview#status-labels" target="_blank">see the documentation <i class="fa fa-external-link"></i></a>.',
     'name'      	=> 'Status Name',
     'pending'      	=> 'Pending',
     'status_type'   => 'Status Type',
diff --git a/resources/lang/ca-ES/admin/users/general.php b/resources/lang/ca-ES/admin/users/general.php
index b097ccec69..14f36cf151 100644
--- a/resources/lang/ca-ES/admin/users/general.php
+++ b/resources/lang/ca-ES/admin/users/general.php
@@ -19,6 +19,8 @@ return [
     'print_assigned'    => 'Print All Assigned',
     'email_assigned'    => 'Email List of All Assigned',
     'user_notified'     => 'User has been emailed a list of their currently assigned items.',
+    'users_notified'    => 'The user has been emailed a list of their currently assigned items.|:count users have been emailed a list of their currently assigned items.',
+    'users_notified_warning' => ':count user has been emailed a list of their currently assigned items, however :no_email users did not have an email address so could not be emailed.|:count users have been emailed a list of their currently assigned items, however :no_email user(s) did not have an email address so could not be emailed.',
     'auto_assign_label' => 'Include this user when auto-assigning eligible licenses',
     'auto_assign_help'  => 'Skip this user in auto assignment of licenses',
     'software_user'     => 'Software Checked out to :name',
diff --git a/resources/lang/ca-ES/admin/users/message.php b/resources/lang/ca-ES/admin/users/message.php
index 4d014775bd..b6ddad3aac 100644
--- a/resources/lang/ca-ES/admin/users/message.php
+++ b/resources/lang/ca-ES/admin/users/message.php
@@ -6,7 +6,7 @@ return array(
     'declined'                  => 'You have successfully declined this asset.',
     'bulk_manager_warn'	        => 'Your users have been successfully updated, however your manager entry was not saved because the manager you selected was also in the user list to be edited, and users may not be their own manager. Please select your users again, excluding the manager.',
     'user_exists'               => 'User already exists!',
-    'user_not_found'            => 'User does not exist.',
+    'user_not_found'            => 'User does not exist or you do not have permission view them.',
     'user_login_required'       => 'The login field is required',
     'user_has_no_assets_assigned' => 'No assets currently assigned to user.',
     'user_password_required'    => 'The password is required.',
@@ -53,6 +53,7 @@ return array(
         'ldap_could_not_search' => 'Could not search the LDAP server. Please check your LDAP server configuration in the LDAP config file. <br>Error from LDAP Server:',
         'ldap_could_not_get_entries' => 'Could not get entries from the LDAP server. Please check your LDAP server configuration in the LDAP config file. <br>Error from LDAP Server:',
         'password_ldap' => 'The password for this account is managed by LDAP/Active Directory. Please contact your IT department to change your password. ',
+        'multi_company_items_assigned' => 'This user has items assigned that belong to a different company. Please check them in or edit their company.'
     ),
 
     'deletefile' => array(
diff --git a/resources/lang/ca-ES/admin/users/table.php b/resources/lang/ca-ES/admin/users/table.php
index e88c78c0f0..6d6e4bc52d 100644
--- a/resources/lang/ca-ES/admin/users/table.php
+++ b/resources/lang/ca-ES/admin/users/table.php
@@ -22,7 +22,7 @@ return array(
     'managed_locations'     => 'Managed Locations',
     'managed_users'         => 'Managed Users',
     'name' 					=> 'Name',
-    'nogroup'               => 'No groups have been created yet. To add one, visit: ',
+    'nogroup'               => 'No groups have been created yet. To add one, visit:',
     'notes'                 => 'Notes',
     'password_confirm' 		=> 'Confirm Password',
     'password' 				=> 'Password',
diff --git a/resources/lang/ca-ES/auth.php b/resources/lang/ca-ES/auth.php
index db310aa1bb..14d8acfce0 100644
--- a/resources/lang/ca-ES/auth.php
+++ b/resources/lang/ca-ES/auth.php
@@ -15,6 +15,6 @@ return array(
 
     'failed' => 'These credentials do not match our records.',
     'password' => 'The provided password is incorrect.',
-    'throttle' => 'Too many login attempts. Please try again in :seconds seconds.',
+    'throttle' => 'Too many login attempts. Please try again in :minutes minute(s).',
 
 );
diff --git a/resources/lang/ca-ES/auth/message.php b/resources/lang/ca-ES/auth/message.php
index 588c9069ca..08f638d058 100644
--- a/resources/lang/ca-ES/auth/message.php
+++ b/resources/lang/ca-ES/auth/message.php
@@ -6,8 +6,6 @@ return array(
     'account_not_found'      => 'The username or password is incorrect.',
     'account_not_activated'  => 'This user account is not activated.',
     'account_suspended'      => 'This user account is suspended.',
-    'account_banned'         => 'This user account is banned.',
-    'throttle'               => 'Too many failed login attempts. Please try again in :minutes minutes.',
 
     'two_factor' => array(
         'already_enrolled'      => 'Your device is already enrolled.',
diff --git a/resources/lang/ca-ES/button.php b/resources/lang/ca-ES/button.php
index 59ff9a02a4..71292fe98a 100644
--- a/resources/lang/ca-ES/button.php
+++ b/resources/lang/ca-ES/button.php
@@ -7,6 +7,7 @@ return [
     'checkin_and_delete'  	    => 'Checkin All / Delete User',
     'delete'  	                => 'Suprimeix',
     'edit'    	                => 'Edit',
+    'clone'    	                => 'Clone',
     'restore' 	                => 'Restore',
     'remove'                    => 'Remove',
     'request'                   => 'Request',
@@ -21,4 +22,13 @@ return [
     'add_maintenance'           => 'Add Maintenance',
     'append'                    => 'Append',
     'new'                       => 'New',
+    'var' => [
+        'clone'     => 'Clone :item_type',
+        'edit'      => 'Edit :item_type',
+        'delete'    => 'Delete :item_type',
+        'restore'   => 'Restore :item_type',
+        'create'    => 'Create New :item_type',
+        'checkout'  => 'Checkout :item_type',
+        'checkin'   => 'Checkin :item_type',
+    ]
 ];
diff --git a/resources/lang/ca-ES/general.php b/resources/lang/ca-ES/general.php
index 9abc624ad2..718ab55fb3 100644
--- a/resources/lang/ca-ES/general.php
+++ b/resources/lang/ca-ES/general.php
@@ -10,7 +10,7 @@ return [
     'action'                => 'Acció',
     'activity_report'		=> 'Informe d\'Activitat',
     'address'				=> 'Adreça',
-    'admin'					=> 'Administrador',
+    'admin'					=> 'Admin Settings',
     'admin_tooltip'			=> 'This user has admin privileges',
     'superuser'				=> 'Superuser',
     'superuser_tooltip'		=> 'This user has superuser privileges',
@@ -23,13 +23,16 @@ return [
     'asset_models'			=> 'Models de Recurs',
     'asset_model'			=> 'Model',
     'asset'					=> 'Recurs',
+    'asset_previous'        => 'Asset (Previously Assigned)',
     'asset_report'          => 'Informe de Recursos',
     'asset_tag'				=> 'Etiqueta de Recurs',
     'asset_tags'            => 'Asset Tags',
     'assets_available'		=> 'Assets available',
     'accept_assets'         => 'Accept Assets :name',
     'accept_assets_menu'    => 'Accept Assets',
+    'accept_item'           => 'Accept Item',
     'audit'				    => 'Audit',
+    'audits'				=> 'Audits',
     'audit_report'			=> 'Registre d\'auditoria',
     'assets'				=> 'Recursos',
     'assets_audited'        => 'assets audited',
@@ -61,9 +64,12 @@ return [
     'changepassword'  		=> 'Canviar la contrasenya',
     'checkin'  				=> 'Checkin',
     'checkin_from'  		=> 'Checkin from',
+    'checkin_note'  		=> 'Checkin Note',
+    'checkout_note'  		=> 'Checkout Note',
     'checkout'  			=> 'Checkout',
     'checkouts_count'       => 'Checkouts',
     'checkins_count'        => 'Checkins',
+    'checkin_and_delete'  	=> 'Checkin and Delete',
     'user_requests_count'   => 'Peticions',
     'city'  				=> 'Municipi',
     'click_here'			=> 'Feu clic aquí',
@@ -77,7 +83,7 @@ return [
     'consumables'			=> 'Consumibles',
     'country'  				=> 'País',
     'could_not_restore'     => 'Error restoring :item_type: :error',
-    'not_deleted'           => 'The :item_type is not deleted so it cannot be restored',
+    'not_deleted'           => 'The :item_type was not deleted and therefore cannot be restored',
     'create'				=> 'Crea nou',
     'created'               => 'Item Created',
     'created_asset'			=> 'recurs creat',
@@ -86,11 +92,13 @@ return [
     'record_created' 		=> 'Record Created',
     'updated_at' 			=> 'Updated at',
     'currency'  			=> '$', // this is deprecated
+    'currency_text'  		=> 'Currency', //
     'current'  				=> 'Current',
     'current_password'      => 'Current Password',
     'customize_report'      => 'Customize Report',
     'custom_report'         => 'Informe de Recursos Personalitzat',
     'dashboard'				=> 'Dashboard',
+    'data_source'           => 'Data Source',
     'days'      			=> 'days',
     'days_to_next_audit'    => 'Days to Next Audit',
     'date'					=> 'Date',
@@ -98,7 +106,7 @@ return [
     'debug_warning_text'    => 'This application is running in production mode with debugging enabled. This can expose sensitive data if your application is accessible to the outside world. Disable debug mode by setting the <code>APP_DEBUG</code> value in your <code>.env</code> file to <code>false</code>.',
     'delete'  				=> 'Suprimeix',
     'delete_confirm'  		=> 'Are you sure you wish to delete :item?',
-    'delete_confirm_no_undo' => 'Are you sure you wish to delete :item? This can not be undone.',
+    'delete_confirm_no_undo' => 'Are you sure, you wish to delete :item? This cannot be undone.',
     'deleted'  				=> 'S\'ha suprimit',
     'delete_seats'  		=> 'Deleted Seats',
     'deletion_failed'       => 'Deletion failed',
@@ -114,29 +122,13 @@ return [
     'editprofile'  			=> 'Edit Your Profile',
     'eol'					=> 'EOL',
     'email_domain'			=> 'Email Domain',
-    'email_format'			=> 'Email Format',
     'employee_number'       => 'Employee Number',
     'email_domain_help'		=> 'This is used to generate email addresses when importing',
     'error'				    => 'Error',
     'exclude_archived'      => 'Exclude Archived Assets',
     'exclude_deleted'       => 'Exclude Deleted Assets',
     'example'				=> 'Example: ',
-    'filastname_format'			=> 'First Initial Last Name (jsmith@example.com)',
-    'firstname_lastname_format'	=> 'First Name Last Name (jane.smith@example.com)',
-    'firstname_lastname_underscore_format' => 'First Name Last Name (jane_smith@example.com)',
-    'lastnamefirstinitial_format' =>  'Last Name First Initial (smithj@example.com)',
-    'firstintial_dot_lastname_format' => 'First Initial Last Name (j.smith@example.com)',
-    'firstname_lastname_display'	=> 'First Name Last Name (Jane Smith)',
-    'lastname_firstname_display'	=> 'Last Name First Name (Smith Jane)',
-    'name_display_format'	=> 'Name Display Format',
-    'first'					=> 'First',
-    'firstnamelastname'     => 'First Name Last Name (janesmith@example.com)',
-    'lastname_firstinitial' => 'Last Name First Initial (smith_j@example.com)',
-    'firstinitial.lastname' => 'First Initial Last Name (j.smith@example.com)',
-    'firstnamelastinitial'  => 'First Name Last Initial (janes@example.com)',
-    'lastnamefirstname'      => 'Last Name First Name (smith.jane@example.com)',
-    'first_name'			=> 'First Name',
-    'first_name_format'		=> 'First Name (jane@example.com)',
+
     'files'                 => 'Files',
     'file_name'				=> 'File',
     'file_type'             => 'File Type',
@@ -156,9 +148,9 @@ return [
     'image_delete'         	=> 'Delete Image',
     'include_deleted'       => 'Include Deleted Assets',
     'image_upload'         	=> 'Upload Image',
-    'filetypes_accepted_help'    => 'Accepted filetype is :types. Max upload size allowed is :size.|Accepted filetypes are :types. Max upload size allowed is :size.',
-    'filetypes_size_help'   => 'Max upload size allowed is :size.',
-    'image_filetypes_help'  => 'Accepted filetypes are jpg, webp, png, gif, svg, and avif. Max upload size allowed is :size.',
+    'filetypes_accepted_help'    => 'Accepted filetype is :types. The maximum size allowed is :size.|Accepted filetypes are :types. The maximum upload size allowed is :size.',
+    'filetypes_size_help'   => 'The maximum upload size allowed is :size.',
+    'image_filetypes_help'  => 'Accepted Filetypes are jpg, webp, png, gif, svg, and avif. The maximum upload size allowed is :size.',
     'unaccepted_image_type'  => 'This image file was not readable. Accepted filetypes are jpg, webp, png, gif, and svg. The mimetype of this file is: :mimetype.',
     'import'         	    => 'Import',
     'import_this_file'      => 'Map fields and process this file',
@@ -178,12 +170,17 @@ return [
     'last'					=> 'Last',
     'last_login'            => 'Last Login',
     'last_name'             => 'Last Name',
+    'firstname_lastname_display'	=> 'First Name Last Name (Jane Smith)',
+    'lastname_firstname_display'	=> 'Last Name First Name (Smith Jane)',
+    'name_display_format'	=> 'Name Display Format',
+    'first'					=> 'First',
+    'first_name'			=> 'First Name',
     'license'				=> 'License',
     'license_report'        => 'License Report',
     'licenses_available'	=> 'Licenses available',
     'licenses'				=> 'Licenses',
     'list_all'				=> 'List All',
-    'loading'				=> 'Loading... please wait....',
+    'loading'				=> 'Loading... please wait...',
     'lock_passwords'        => 'This field value will not be saved in a demo installation.',
     'feature_disabled'      => 'This feature has been disabled for the demo installation.',
     'location'              => 'Location',
@@ -193,7 +190,7 @@ return [
     'logout'				=> 'Logout',
     'lookup_by_tag'     => 'Cercar per Etiqueta de Recurs',
     'maintenances'          => 'Maintenances',
-    'manage_api_keys'       => 'Manage API Keys',
+    'manage_api_keys'       => 'Manage API keys',
     'manufacturer'			=> 'Manufacturer',
     'manufacturers'			=> 'Manufacturers',
     'markdown'				=> 'This field allows <a href="https://help.github.com/articles/github-flavored-markdown/">Github flavored markdown</a>.',
@@ -215,6 +212,14 @@ return [
     'no_results'			=> 'No Results.',
     'no'  					=> 'No',
     'notes'  				=> 'Notes',
+    'note_added'            => 'Note Added',
+    'options'				=> 'Options',
+    'preview'				=> 'Preview',
+    'add_note'              => 'Add Note',
+    'note_edited'            => 'Note Edited',
+    'edit_note'              => 'Edit Note',
+    'note_deleted'            => 'Note Deleted',
+    'delete_note'              => 'Delete Note',
     'order_number'          => 'Order Number',
     'only_deleted'          => 'Only Deleted Assets',
     'page_menu'				=> 'Showing _MENU_ items',
@@ -229,7 +234,7 @@ return [
     'purchase_date'         => 'Purchase Date',
     'qty'		            => 'QTY',
     'quantity'		        => 'Quantity',
-    'quantity_minimum'      => 'You have :count items below or almost below minimum quantity levels',
+    'quantity_minimum'      => 'You have one item below or almost below minimum quantity levels|You have :count items below or almost below minimum quantity levels',
     'quickscan_checkin'  	=> 'Quick Scan Checkin',
     'quickscan_checkin_status'  	=> 'Checkin Status',
     'ready_to_deploy'		=> 'Ready to Deploy',
@@ -254,7 +259,7 @@ return [
     'select_all'            => 'Select All',
     'search'				=> 'Search',
     'select_category'       => 'Select a Category',
-    'select_datasource' => 'Select a Datasource',
+    'select_datasource' => 'Select a data source',
     'select_department'     => 'Select a Department',
     'select_depreciation'	=> 'Select a Depreciation Type',
     'select_location'		=> 'Select a Location',
@@ -274,13 +279,15 @@ return [
     'signed_off_by'         => 'Signed Off By',
     'skin'       			=> 'Skin',
     'webhook_msg_note'        => 'A notification will be sent via webhook',
-    'webhook_test_msg'        => 'Oh hai! Looks like your :app integration with Snipe-IT is working!',
+    'webhook_test_msg'        => 'Oh hai! It looks like your :app integration with Snipe-IT is working!',
     'some_features_disabled' => 'DEMO MODE: Some features are disabled for this installation.',
     'site_name'				=> 'Site Name',
     'state'  				=> 'State',
     'status_labels'			=> 'Status Labels',
+    'status_label'			=> 'Status Label',
     'status'    			=> 'Status',
     'accept_eula'           => 'Acceptance Agreement',
+    'show_or_hide_eulas' => 'Show/Hide EULAs',
     'supplier'              => 'Supplier',
     'suppliers'  			=> 'Suppliers',
     'sure_to_delete'        => 'Are you sure you wish to delete',
@@ -296,9 +303,9 @@ return [
     'type'  				=> 'Type',
     'undeployable'			=> 'Un-deployable',
     'unknown_admin'			=> 'Unknown Admin',
-    'username_format'		=> 'Username Format',
     'username'              => 'Username',
     'update'                => 'Update',
+    'updating_item' => 'Updating :item',
     'upload_filetypes_help'      => 'Allowed filetypes are png, gif, jpg, jpeg, doc, docx, pdf, xls, xlsx, txt, lic, xml, zip, rtf and rar. Max upload size allowed is :size.',
     'uploaded'              => 'Uploaded',
     'user'					=> 'User',
@@ -323,10 +330,10 @@ return [
     'token_expired'         => 'Your form session has expired. Please try again.',
     'login_enabled'         => 'Login Enabled',
     'audit_due'             => 'Due for Audit',
-    'audit_due_days'        => 'Assets Due for Audit Within :days Day|Assets Due for Audit Within :days Days',
+    'audit_due_days'        => '{}Assets Due or Overdue for Audit|[1]Assets Due or Overdue for Audit Within a Day|[2,*]Assets Due or Overdue for Audit Within :days Days',
     'checkin_due'           => 'Due for Checkin',
     'checkin_overdue'       => 'Overdue for Checkin',
-    'checkin_due_days'      => 'Assets Due for Checkin Within :days Day|Assets Due for Checkin Within :days Days',
+    'checkin_due_days'      => '{}Due for Checkin|[1]Assets Due for Checkin Within :days Day|[2,*]Assets Due for Checkin Within :days Days',
     'audit_overdue'         => 'Overdue for Audit',
     'accept'                => 'Acceptar :recurs',
     'i_accept'              => 'I accept',
@@ -339,16 +346,16 @@ return [
     'view_all'              => 'view all',
     'hide_deleted'          => 'Hide Deleted',
     'email'                 => 'Email',
-    'do_not_change'         => 'Do Not Change',
-    'bug_report'            => 'Report a Bug',
+    'do_not_change'         => 'Do not change',
+    'bug_report'            => 'Report a bug',
     'user_manual'           => 'User\'s Manual',
     'setup_step_1'          => 'Step 1',
     'setup_step_2'          => 'Step 2',
     'setup_step_3'          => 'Step 3',
     'setup_step_4'          => 'Step 4',
     'setup_config_check'    => 'Configuration Check',
-    'setup_create_database' => 'Create Database Tables',
-    'setup_create_admin'    => 'Create Admin User',
+    'setup_create_database' => 'Create database tables',
+    'setup_create_admin'    => 'Create an admin user',
     'setup_done'            => 'Finished!',
     'bulk_edit_about_to'    => 'You are about to edit the following: ',
     'checked_out'           => 'Checked Out',
@@ -383,6 +390,8 @@ return [
     'new_license'           => 'New License',
     'new_accessory'         => 'New Accessory',
     'new_consumable'        => 'New Consumable',
+    'new_component'         => 'New Component',
+    'new_user'              => 'New User',
     'collapse'              => 'Collapse',
     'assigned'              => 'Assigned',
     'asset_count'           => 'Asset Count',
@@ -418,19 +427,20 @@ return [
     'bulk_soft_delete'      =>'Also soft-delete these users. Their asset history will remain intact unless/until you purge deleted records in the Admin Settings.',
     'bulk_checkin_delete_success' => 'Your selected users have been deleted and their items have been checked in.',
     'bulk_checkin_success' => 'The items for the selected users have been checked in.',
-    'set_to_null'           => 'Delete values for this asset|Delete values for all :asset_count assets ',
+    'set_to_null'           => 'Delete values for this selection|Delete values for all :selection_count selections ',
     'set_users_field_to_null'  => 'Delete :field values for this user|Delete :field values for all :user_count users ',
     'na_no_purchase_date'   => 'N/A - No purchase date provided',
     'assets_by_status'      => 'Assets by Status',
     'assets_by_status_type'      => 'Assets by Status Type',
     'pie_chart_type'        => 'Dashboard Pie Chart Type',
     'hello_name'            => 'Hello, :name!',
-    'unaccepted_profile_warning'   => 'You have :count items requiring acceptance. Click here to accept or decline them',
+    'unaccepted_profile_warning'   => 'You have one item requiring acceptance. Click here to accept or decline it | You have :count items requiring acceptance. Click here to accept or decline them',
     'start_date'            => 'Start Date',
     'end_date'            => 'End Date',
     'alt_uploaded_image_thumbnail' => 'Uploaded thumbnail',
     'placeholder_kit'       => 'Select a kit',
     'file_not_found'        => 'File not found',
+    'log_record_not_found'  => 'No record for that log entry was found.',
     'preview_not_available' => '(no preview)',
     'setup'                 => 'Setup',
     'pre_flight'            => 'Pre-Flight',
@@ -512,7 +522,7 @@ return [
     'checked_out_to_fields' => 'Checked Out To Fields',
     'percent_complete' => '% completar',
     'uploading' => 'Uploading... ',
-    'upload_error' => 'Error uploading file. Please check that there are no empty rows and that no column names are duplicated.',
+    'upload_error' => 'Error uploading file. Please check that you have no empty rows or duplicated column names in your CSV, and that the server permissions allow uploads.',
     'copy_to_clipboard' => 'Copy to Clipboard',
     'copied' => 'Copied!',
     'status_compatibility' => 'If assets are already assigned, they cannot be changed to a non-deployable status type and this value change will be skipped.',
@@ -549,6 +559,71 @@ return [
         'license_seats'  => ':count License Seat|:count License Seats',
         'consumables'  => ':count Consumable|:count Consumables',
         'components'  => ':count Component|:count Components',
-    ]
+    ],
+
+    'more_info' => 'More Info',
+    'quickscan_bulk_help' => 'Checking this box will edit the asset record to reflect this new location. Leaving it unchecked will simply note the location in the audit log. Note that if this asset is checked out, it will not change the location of the person, asset or location it is checked out to.',
+    'whoops' => 'Whoops!',
+    'something_went_wrong' => 'Something went wrong with your request.',
+    'close' => 'Close',
+    'expires' => 'Expires',
+    'map_fields'=> 'Map :item_type Fields',
+    'remaining_var' => ':count Remaining',
+    'label' => 'Label',
+    'import_asset_tag_exists' => 'An asset with the asset tag :asset_tag already exists and an update was not requested. No change was made.',
+    'countries_manually_entered_help' => 'Values with an asterisk (*) were manually entered and do not match existing ISO 3166 dropdown values',
+    'accessories_assigned' => 'Assigned Accessories',
+    'user_managed_passwords' => 'Password Management',
+    'user_managed_passwords_disallow' => 'Disallow users from managing their own passwords',
+    'user_managed_passwords_allow' => 'Allow users to manage their own passwords',
+    'from' => 'From',
+    'by' => 'By',
+
+// Add form placeholders here
+    'placeholders' => [
+        'notes'  => 'Add a note',
+    ],
+
+    'breadcrumb_button_actions' => [
+        'edit_item' => 'Edit :name',
+        'checkout_item' => 'Checkout :name',
+        'checkin_item' => 'Checkin :name',
+    ],
+
+    'skins' => [
+        'site_default' => 'Site Default',
+        'default_blue' => 'Default Blue',
+        'blue_dark' => 'Blue (Dark Mode)',
+        'green' => 'Green Dark',
+        'green_dark' => 'Green (Dark Mode)',
+        'red' => 'Red Dark',
+        'red_dark' => 'Red (Dark Mode)',
+        'orange' => 'Orange Dark',
+        'orange_dark' => 'Orange (Dark Mode)',
+        'black' => 'Black',
+        'black_dark' => 'Black (Dark Mode)',
+        'purple' => 'Purple',
+        'purple_dark' => 'Purple (Dark Mode)',
+        'yellow' => 'Yellow',
+        'yellow_dark' => 'Yellow (Dark Mode)',
+        'high_contrast' => 'High Contrast',
+
+    ],
+
+    'select_all_none' => 'Select/Unselect All',
+    'generic_model_not_found' => 'That :model was not found or you do not have permission to access it',
+    'deleted_models' => 'Deleted Asset Models',
+    'deleted_users' => 'Deleted Users',
+    'cost_each' => ':amount each',
+    'remove_current_image' => 'Remove current :type image',
+
+    'seeding' => [
+        'manufacturers' => [
+            'button' => 'Create Manufacturers',
+            'prompt' => 'You do not have any manufacturers yet. Would you like to seed a list of common manufacturers? (THIS WILL OVERWRITE EXISTING MANUFACTURERS, including those that have been soft-deleted.)',
+            'success' => 'Manufacturers seeded successfully',
+            'error' => 'Could not seed manufacturers. A manufacturer record already exists and seeding would overwrite it.|Could not seed manufacturers. :count manufacturer records already exist and seeding would overwrite them.',
+        ],
+    ],
 
 ];
diff --git a/resources/lang/ca-ES/localizations.php b/resources/lang/ca-ES/localizations.php
index f1232dd138..827ed4fca1 100644
--- a/resources/lang/ca-ES/localizations.php
+++ b/resources/lang/ca-ES/localizations.php
@@ -2,7 +2,7 @@
 
 return [
 
-    'select_language' => 'Select a language',
+    'select_language' => 'Select a Language',
     'languages' => [
         'en-US'=> 'English, US',
         'en-GB'=> 'English, UK',
@@ -40,7 +40,9 @@ return [
         'ms-MY'=> 'Malay',
         'mi-NZ'=> 'Maori',
         'mn-MN'=> 'Mongolian',
-        'no-NO'=> 'Norwegian',
+        'nb-NO'=> 'Norwegian Bokmål',
+        'om-ET' => 'Oromo (Ethiopian)',
+        //'nn-NO'=> 'Norwegian Nynorsk',
         'fa-IR'=> 'Persian',
         'pl-PL'=> 'Polish',
         'pt-PT'=> 'Portuguese',
@@ -66,7 +68,7 @@ return [
         'zu-ZA'=> 'Zulu',
     ],
 
-    'select_country' => 'Select a country',
+    'select_country' => 'Select a Country',
     
     'countries' => [
         'AC'=>'Ascension Island',
@@ -133,6 +135,7 @@ return [
         'EC'=>'Ecuador',
         'EE'=>'Estonia',
         'EG'=>'Egypt',
+        'GB-ENG'=>'England',
         'ER'=>'Eritrea',
         'ES'=>'Spain',
         'ET'=>'Ethiopia',
@@ -231,6 +234,7 @@ return [
         'NG'=>'Nigeria',
         'NI'=>'Nicaragua',
         'NL'=>'Netherlands',
+        'GB-NIR' => 'Northern Ireland',
         'NO'=>'Norway',
         'NP'=>'Nepal',
         'NR'=>'Nauru',
@@ -258,7 +262,7 @@ return [
         'RU'=>'Russian Federation',
         'RW'=>'Rwanda',
         'SA'=>'Saudi Arabia',
-        'UK'=>'Scotland',
+        'GB-SCT'=>'Scotland',
         'SB'=>'Solomon Islands',
         'SC'=>'Seychelles',
         'SS'=>'South Sudan',
@@ -310,6 +314,7 @@ return [
         'VI'=>'Virgin Islands (U.S.)',
         'VN'=>'Viet Nam',
         'VU'=>'Vanuatu',
+        'GB-WLS' =>'Wales',
         'WF'=>'Wallis And Futuna Islands',
         'WS'=>'Samoa',
         'YE'=>'Yemen',
diff --git a/resources/lang/ca-ES/mail.php b/resources/lang/ca-ES/mail.php
index cb3e88cae0..0aa66149a8 100644
--- a/resources/lang/ca-ES/mail.php
+++ b/resources/lang/ca-ES/mail.php
@@ -23,24 +23,25 @@ return [
     'Item_Requested' => 'Item Requested',
     'License_Checkin_Notification' => 'License checked in',
     'License_Checkout_Notification' => 'License checked out',
+    'license_for'   => 'License for',
     'Low_Inventory_Report' => 'Low Inventory Report',
     'a_user_canceled' => 'A user has canceled an item request on the website',
     'a_user_requested' => 'A user has requested an item on the website',
     'acceptance_asset_accepted' => 'A user has accepted an item',
     'acceptance_asset_declined' => 'A user has declined an item',
-    'accessory_name' => 'Accessory Name:',
-    'additional_notes' => 'Additional Notes:',
+    'accessory_name' => 'Accessory Name',
+    'additional_notes' => 'Additional Notes',
     'admin_has_created' => 'An administrator has created an account for you on the :web website.',
-    'asset' => 'Recurs:',
-    'asset_name' => 'Asset Name:',
+    'asset' => 'Recurs',
+    'asset_name' => 'Asset Name',
     'asset_requested' => 'Asset requested',
     'asset_tag' => 'Etiqueta de Recurs',
     'assets_warrantee_alert' => 'There is :count asset with a warranty expiring in the next :threshold days.|There are :count assets with warranties expiring in the next :threshold days.',
     'assigned_to' => 'Assigned To',
     'best_regards' => 'Best regards,',
-    'canceled' => 'Canceled:',
-    'checkin_date' => 'Checkin Date:',
-    'checkout_date' => 'Checkout Date:',
+    'canceled' => 'Canceled',
+    'checkin_date' => 'Checkin Date',
+    'checkout_date' => 'Checkout Date',
     'checkedout_from' => 'Checked out from',
     'checkedin_from'  => 'Checked in from',
     'checked_into' => 'Checked into',
@@ -49,27 +50,30 @@ return [
     'click_to_confirm' => 'Please click on the following link to confirm your :web account:',
     'current_QTY' => 'Current QTY',
     'days' => 'Days',
-    'expecting_checkin_date' => 'Expected Checkin Date:',
+    'expecting_checkin_date' => 'Expected Checkin Date',
     'expires' => 'Expires',
     'hello' => 'Hello',
     'hi' => 'Hi',
     'i_have_read' => 'I have read and agree to the terms of use, and have received this item.',
     'inventory_report' => 'Inventory Report',
-    'item' => 'Item:',
+    'item' => 'Item',
+    'item_checked_reminder' => 'This is a reminder that you currently have :count items checked out to you that you have not accepted or declined. Please click the link below to confirm your decision.',
     'license_expiring_alert' => 'There is :count license expiring in the next :threshold days.|There are :count licenses expiring in the next :threshold days.',
     'link_to_update_password' => 'Please click on the following link to update your :web password:',
-    'login' => 'Login:',
+    'login' => 'Login',
     'login_first_admin' => 'Login to your new Snipe-IT installation using the credentials below:',
     'low_inventory_alert' => 'There is :count item that is below minimum inventory or will soon be low.|There are :count items that are below minimum inventory or will soon be low.',
     'min_QTY' => 'Min QTY',
     'name' => 'Name',
     'new_item_checked' => 'A new item has been checked out under your name, details are below.',
+    'new_item_checked_with_acceptance' => 'A new item has been checked out under your name that requires acceptance, details are below.',
+    'recent_item_checked' => 'An item was recently checked out under your name that requires acceptance, details are below.',
     'notes' => 'Notes',
-    'password' => 'Password:',
+    'password' => 'Password',
     'password_reset' => 'Password Reset',
     'read_the_terms' => 'Please read the terms of use below.',
     'read_the_terms_and_click' => 'Please read the terms of use below, and click on the link at the bottom to confirm that you read and agree to the terms of use, and have received the asset.',
-    'requested' => 'Requested:',
+    'requested' => 'Requested',
     'reset_link' => 'Your Password Reset Link',
     'reset_password' => 'Click here to reset your password:',
     'rights_reserved' => 'All rights reserved.',
@@ -86,8 +90,10 @@ return [
     'upcoming-audits' => 'There is :count asset that is coming up for audit within :threshold days.|There are :count assets that are coming up for audit within :threshold days.',
     'user' => 'User',
     'username' => 'Username',
+    'unaccepted_asset_reminder' => 'Reminder: You have Unaccepted Assets.',
     'welcome' => 'Welcome :name',
     'welcome_to' => 'Welcome to :web!',
     'your_assets' => 'View Your Assets',
     'your_credentials' => 'Your Snipe-IT credentials',
+    'mail_sent' => 'Mail sent successfully!',
 ];
diff --git a/resources/lang/ca-ES/validation.php b/resources/lang/ca-ES/validation.php
index 05374e23af..99c847f589 100644
--- a/resources/lang/ca-ES/validation.php
+++ b/resources/lang/ca-ES/validation.php
@@ -13,87 +13,150 @@ return [
     |
     */
 
-    'accepted'             => 'The :attribute must be accepted.',
-    'active_url'           => 'The :attribute is not a valid URL.',
-    'after'                => 'The :attribute must be a date after :date.',
-    'after_or_equal'       => 'The :attribute must be a date after or equal to :date.',
-    'alpha'                => 'The :attribute may only contain letters.',
-    'alpha_dash'           => 'The :attribute may only contain letters, numbers, and dashes.',
-    'alpha_num'            => 'The :attribute may only contain letters and numbers.',
-    'array'                => 'The :attribute must be an array.',
-    'before'               => 'The :attribute must be a date before :date.',
-    'before_or_equal'      => 'The :attribute must be a date before or equal to :date.',
-    'between'              => [
-        'numeric' => 'The :attribute must be between :min - :max.',
-        'file'    => 'The :attribute must be between :min - :max kilobytes.',
-        'string'  => 'The :attribute must be between :min - :max characters.',
-        'array'   => 'The :attribute must have between :min and :max items.',
+    'accepted' => 'The :attribute field must be accepted.',
+    'accepted_if' => 'The :attribute field must be accepted when :other is :value.',
+    'active_url' => 'The :attribute field must be a valid URL.',
+    'after' => 'The :attribute field must be a date after :date.',
+    'after_or_equal' => 'The :attribute field must be a date after or equal to :date.',
+    'alpha' => 'The :attribute field must only contain letters.',
+    'alpha_dash' => 'The :attribute field must only contain letters, numbers, dashes, and underscores.',
+    'alpha_num' => 'The :attribute field must only contain letters and numbers.',
+    'array' => 'The :attribute field must be an array.',
+    'ascii' => 'The :attribute field must only contain single-byte alphanumeric characters and symbols.',
+    'before' => 'The :attribute field must be a date before :date.',
+    'before_or_equal' => 'The :attribute field must be a date before or equal to :date.',
+    'between' => [
+        'array' => 'The :attribute field must have between :min and :max items.',
+        'file' => 'The :attribute field must be between :min and :max kilobytes.',
+        'numeric' => 'The :attribute field must be between :min and :max.',
+        'string' => 'The :attribute field must be between :min and :max characters.',
     ],
-    'boolean'              => 'The :attribute must be true or false.',
-    'confirmed'            => 'The :attribute confirmation does not match.',
-    'date'                 => 'The :attribute is not a valid date.',
-    'date_format'          => 'The :attribute does not match the format :format.',
-    'different'            => 'The :attribute and :other must be different.',
-    'digits'               => 'The :attribute must be :digits digits.',
-    'digits_between'       => 'The :attribute must be between :min and :max digits.',
-    'dimensions'           => 'The :attribute has invalid image dimensions.',
-    'distinct'             => 'The :attribute field has a duplicate value.',
-    'email'                => 'The :attribute format is invalid.',
-    'exists'               => 'The selected :attribute is invalid.',
-    'file'                 => 'The :attribute must be a file.',
-    'filled'               => 'The :attribute field must have a value.',
-    'image'                => 'The :attribute must be an image.',
+    'boolean' => 'The :attribute field must be true or false.',
+    'can' => 'The :attribute field contains an unauthorized value.',
+    'confirmed' => 'The :attribute field confirmation does not match.',
+    'contains' => 'The :attribute field is missing a required value.',
+    'current_password' => 'The password is incorrect.',
+    'date' => 'The :attribute field must be a valid date.',
+    'date_equals' => 'The :attribute field must be a date equal to :date.',
+    'date_format' => 'The :attribute field must match the format :format.',
+    'decimal' => 'The :attribute field must have :decimal decimal places.',
+    'declined' => 'The :attribute field must be declined.',
+    'declined_if' => 'The :attribute field must be declined when :other is :value.',
+    'different' => 'The :attribute field and :other must be different.',
+    'digits' => 'The :attribute field must be :digits digits.',
+    'digits_between' => 'The :attribute field must be between :min and :max digits.',
+    'dimensions' => 'The :attribute field has invalid image dimensions.',
+    'distinct' => 'The :attribute field has a duplicate value.',
+    'doesnt_end_with' => 'The :attribute field must not end with one of the following: :values.',
+    'doesnt_start_with' => 'The :attribute field must not start with one of the following: :values.',
+    'email' => 'The :attribute field must be a valid email address.',
+    'ends_with' => 'The :attribute field must end with one of the following: :values.',
+    'enum' => 'The selected :attribute is invalid.',
+    'exists' => 'The selected :attribute is invalid.',
+    'extensions' => 'The :attribute field must have one of the following extensions: :values.',
+    'file' => 'The :attribute field must be a file.',
+    'filled' => 'The :attribute field must have a value.',
+    'gt' => [
+        'array' => 'The :attribute field must have more than :value items.',
+        'file' => 'The :attribute field must be greater than :value kilobytes.',
+        'numeric' => 'The :attribute field must be greater than :value.',
+        'string' => 'The :attribute field must be greater than :value characters.',
+    ],
+    'gte' => [
+        'array' => 'The :attribute field must have :value items or more.',
+        'file' => 'The :attribute field must be greater than or equal to :value kilobytes.',
+        'numeric' => 'The :attribute field must be greater than or equal to :value.',
+        'string' => 'The :attribute field must be greater than or equal to :value characters.',
+    ],
+    'hex_color' => 'The :attribute field must be a valid hexadecimal color.',
+    'image' => 'The :attribute field must be an image.',
     'import_field_empty'    => 'The value for :fieldname cannot be null.',
-    'in'                   => 'The selected :attribute is invalid.',
-    'in_array'             => 'The :attribute field does not exist in :other.',
-    'integer'              => 'The :attribute must be an integer.',
-    'ip'                   => 'The :attribute must be a valid IP address.',
-    'ipv4'                 => 'The :attribute must be a valid IPv4 address.',
-    'ipv6'                 => 'The :attribute must be a valid IPv6 address.',
-    'is_unique_department' => 'The :attribute must be unique to this Company Location',
-    'json'                 => 'The :attribute must be a valid JSON string.',
-    'max'                  => [
-        'numeric' => 'The :attribute may not be greater than :max.',
-        'file'    => 'The :attribute may not be greater than :max kilobytes.',
-        'string'  => 'The :attribute may not be greater than :max characters.',
-        'array'   => 'The :attribute may not have more than :max items.',
+    'in' => 'The selected :attribute is invalid.',
+    'in_array' => 'The :attribute field must exist in :other.',
+    'integer' => 'The :attribute field must be an integer.',
+    'ip' => 'The :attribute field must be a valid IP address.',
+    'ipv4' => 'The :attribute field must be a valid IPv4 address.',
+    'ipv6' => 'The :attribute field must be a valid IPv6 address.',
+    'json' => 'The :attribute field must be a valid JSON string.',
+    'list' => 'The :attribute field must be a list.',
+    'lowercase' => 'The :attribute field must be lowercase.',
+    'lt' => [
+        'array' => 'The :attribute field must have less than :value items.',
+        'file' => 'The :attribute field must be less than :value kilobytes.',
+        'numeric' => 'The :attribute field must be less than :value.',
+        'string' => 'The :attribute field must be less than :value characters.',
     ],
-    'mimes'                => 'The :attribute must be a file of type: :values.',
-    'mimetypes'            => 'The :attribute must be a file of type: :values.',
-    'min'                  => [
-        'numeric' => 'The :attribute must be at least :min.',
-        'file'    => 'The :attribute must be at least :min kilobytes.',
-        'string'  => 'The :attribute must be at least :min characters.',
-        'array'   => 'The :attribute must have at least :min items.',
+    'lte' => [
+        'array' => 'The :attribute field must not have more than :value items.',
+        'file' => 'The :attribute field must be less than or equal to :value kilobytes.',
+        'numeric' => 'The :attribute field must be less than or equal to :value.',
+        'string' => 'The :attribute field must be less than or equal to :value characters.',
     ],
-    'starts_with'          => 'The :attribute must start with one of the following: :values.',
-    'ends_with'            => 'The :attribute must end with one of the following: :values.',
+    'mac_address' => 'The :attribute field must be a valid MAC address.',
+    'max' => [
+        'array' => 'The :attribute field must not have more than :max items.',
+        'file' => 'The :attribute field must not be greater than :max kilobytes.',
+        'numeric' => 'The :attribute field must not be greater than :max.',
+        'string' => 'The :attribute field must not be greater than :max characters.',
+    ],
+    'max_digits' => 'The :attribute field must not have more than :max digits.',
+    'mimes' => 'The :attribute field must be a file of type: :values.',
+    'mimetypes' => 'The :attribute field must be a file of type: :values.',
+    'min' => [
+        'array' => 'The :attribute field must have at least :min items.',
+        'file' => 'The :attribute field must be at least :min kilobytes.',
+        'numeric' => 'The :attribute field must be at least :min.',
+        'string' => 'The :attribute field must be at least :min characters.',
+    ],
+    'min_digits' => 'The :attribute field must have at least :min digits.',
+    'missing' => 'The :attribute field must be missing.',
+    'missing_if' => 'The :attribute field must be missing when :other is :value.',
+    'missing_unless' => 'The :attribute field must be missing unless :other is :value.',
+    'missing_with' => 'The :attribute field must be missing when :values is present.',
+    'missing_with_all' => 'The :attribute field must be missing when :values are present.',
+    'multiple_of' => 'The :attribute field must be a multiple of :value.',
+    'not_in' => 'The selected :attribute is invalid.',
+    'not_regex' => 'The :attribute field format is invalid.',
+    'numeric' => 'The :attribute field must be a number.',
+    'password' => [
+        'letters' => 'The :attribute field must contain at least one letter.',
+        'mixed' => 'The :attribute field must contain at least one uppercase and one lowercase letter.',
+        'numbers' => 'The :attribute field must contain at least one number.',
+        'symbols' => 'The :attribute field must contain at least one symbol.',
+        'uncompromised' => 'The given :attribute has appeared in a data leak. Please choose a different :attribute.',
+    ],
+    'percent'       => 'The depreciation minimum must be between 0 and 100 when depreciation type is percentage.',
 
-    'not_in'               => 'The selected :attribute is invalid.',
-    'numeric'              => 'The :attribute must be a number.',
-    'present'              => 'The :attribute field must be present.',
-    'valid_regex'          => 'That is not a valid regex. ',
-    'regex'                => 'The :attribute format is invalid.',
-    'required'             => 'The :attribute field is required.',
-    'required_if'          => 'The :attribute field is required when :other is :value.',
-    'required_unless'      => 'The :attribute field is required unless :other is in :values.',
-    'required_with'        => 'The :attribute field is required when :values is present.',
-    'required_with_all'    => 'The :attribute field is required when :values is present.',
-    'required_without'     => 'The :attribute field is required when :values is not present.',
+    'present' => 'The :attribute field must be present.',
+    'present_if' => 'The :attribute field must be present when :other is :value.',
+    'present_unless' => 'The :attribute field must be present unless :other is :value.',
+    'present_with' => 'The :attribute field must be present when :values is present.',
+    'present_with_all' => 'The :attribute field must be present when :values are present.',
+    'prohibited' => 'The :attribute field is prohibited.',
+    'prohibited_if' => 'The :attribute field is prohibited when :other is :value.',
+    'prohibited_unless' => 'The :attribute field is prohibited unless :other is in :values.',
+    'prohibits' => 'The :attribute field prohibits :other from being present.',
+    'regex' => 'The :attribute field format is invalid.',
+    'required' => 'The :attribute field is required.',
+    'required_array_keys' => 'The :attribute field must contain entries for: :values.',
+    'required_if' => 'The :attribute field is required when :other is :value.',
+    'required_if_accepted' => 'The :attribute field is required when :other is accepted.',
+    'required_if_declined' => 'The :attribute field is required when :other is declined.',
+    'required_unless' => 'The :attribute field is required unless :other is in :values.',
+    'required_with' => 'The :attribute field is required when :values is present.',
+    'required_with_all' => 'The :attribute field is required when :values are present.',
+    'required_without' => 'The :attribute field is required when :values is not present.',
     'required_without_all' => 'The :attribute field is required when none of :values are present.',
-    'same'                 => 'The :attribute and :other must match.',
-    'size'                 => [
-        'numeric' => 'The :attribute must be :size.',
-        'file'    => 'The :attribute must be :size kilobytes.',
-        'string'  => 'The :attribute must be :size characters.',
-        'array'   => 'The :attribute must contain :size items.',
+    'same' => 'The :attribute field must match :other.',
+    'size' => [
+        'array' => 'The :attribute field must contain :size items.',
+        'file' => 'The :attribute field must be :size kilobytes.',
+        'numeric' => 'The :attribute field must be :size.',
+        'string' => 'The :attribute field must be :size characters.',
     ],
+    'starts_with' => 'The :attribute field must start with one of the following: :values.',
     'string'               => 'The :attribute must be a string.',
-    'timezone'             => 'The :attribute must be a valid zone.',
     'two_column_unique_undeleted' => 'The :attribute must be unique across :table1 and :table2. ',
-    'unique'               => 'The :attribute has already been taken.',
-    'uploaded'             => 'The :attribute failed to upload.',
-    'url'                  => 'The :attribute format is invalid.',
     'unique_undeleted'     => 'The :attribute must be unique.',
     'non_circular'         => 'The :attribute must not create a circular reference.',
     'not_array'            => ':attribute cannot be an array.',
@@ -102,11 +165,14 @@ return [
     'numbers'              => 'Password must contain at least one number.',
     'case_diff'            => 'Password must use mixed case.',
     'symbols'              => 'Password must contain symbols.',
-    'gte'                  => [
-        'numeric'          => 'Value cannot be negative'
-    ],
-    'checkboxes'           => ':attribute contains invalid options.',
-    'radio_buttons'        => ':attribute is invalid.',
+    'timezone' => 'The :attribute field must be a valid timezone.',
+    'unique' => 'The :attribute has already been taken.',
+    'uploaded' => 'The :attribute failed to upload.',
+    'uppercase' => 'The :attribute field must be uppercase.',
+    'url' => 'The :attribute field must be a valid URL.',
+    'ulid' => 'The :attribute field must be a valid ULID.',
+    'uuid' => 'The :attribute field must be a valid UUID.',
+    'fmcs_location' => 'Full multiple company support and location scoping is enabled in the Admin Settings, and the selected location and selected company are not compatible.',
 
 
     /*
@@ -120,16 +186,22 @@ return [
     |
     */
 
+    'email_array'      => 'One or more email addresses is invalid.',
+    'checkboxes'           => ':attribute contains invalid options.',
+    'radio_buttons'        => ':attribute is invalid.',
+    
     'custom' => [
         'alpha_space' => 'The :attribute field contains a character that is not allowed.',
-        'email_array'      => 'One or more email addresses is invalid.',
+
         'hashed_pass'      => 'Your current password is incorrect',
         'dumbpwd'          => 'That password is too common.',
         'statuslabel_type' => 'You must select a valid status label type',
+        'custom_field_not_found'          => 'This field does not seem to exist, please double check your custom field names.',
+        'custom_field_not_found_on_model' => 'This field seems to exist, but is not available on this Asset Model\'s fieldset.',
 
         // date_format validation with slightly less stupid messages. It duplicates a lot, but it gets the job done :(
-        // We use this because the default error message for date_format is reflects php Y-m-d, which non-PHP
-        // people won't know how to format. 
+        // We use this because the default error message for date_format reflects php Y-m-d, which non-PHP
+        // people won't know how to format.
         'purchase_date.date_format'     => 'The :attribute must be a valid date in YYYY-MM-DD format',
         'last_audit_date.date_format'   =>  'The :attribute must be a valid date in YYYY-MM-DD hh:mm:ss format',
         'expiration_date.date_format'   =>  'The :attribute must be a valid date in YYYY-MM-DD format',
@@ -137,9 +209,15 @@ return [
         'expected_checkin.date_format'  =>  'The :attribute must be a valid date in YYYY-MM-DD format',
         'start_date.date_format'        =>  'The :attribute must be a valid date in YYYY-MM-DD format',
         'end_date.date_format'          =>  'The :attribute must be a valid date in YYYY-MM-DD format',
+        'invalid_value_in_field' => 'Invalid value included in this field',
 
-    ],
+        'ldap_username_field' => [
+            'not_in' =>         '<code>sAMAccountName</code> (mixed case) will likely not work. You should use <code>samaccountname</code> (lowercase) instead.'
+        ],
+        'ldap_auth_filter_query' => ['not_in' => '<code>uid=samaccountname</code> is probably not a valid auth filter. You probably want <code>uid=</code> '],
+        'ldap_filter' => ['regex' => 'This value should probably not be wrapped in parentheses.'],
 
+        ],
     /*
     |--------------------------------------------------------------------------
     | Custom Validation Attributes
@@ -155,8 +233,16 @@ return [
 
     /*
     |--------------------------------------------------------------------------
-    | Generic Validation Messages
+    | Generic Validation Messages - we use these in the jquery validation where we don't have
+    | access to the :attribute
     |--------------------------------------------------------------------------
     */
-    'invalid_value_in_field' => 'Invalid value included in this field',
+
+    'generic' => [
+        'invalid_value_in_field' => 'Invalid value included in this field',
+        'required' => 'This field is required',
+        'email' => 'Please enter a valid email address',
+    ],
+
+
 ];
diff --git a/resources/lang/chr-US/account/general.php b/resources/lang/chr-US/account/general.php
index 1a9e2c03b8..7f9e2f848e 100644
--- a/resources/lang/chr-US/account/general.php
+++ b/resources/lang/chr-US/account/general.php
@@ -2,10 +2,16 @@
 
 return array(
     'personal_api_keys' => 'Personal API Keys',
+    'personal_access_token' => 'Personal Access Token',
+    'personal_api_keys_success' => 'Personal API Key :key created sucessfully',
+    'here_is_api_key' => 'Here is your new personal access token. This is the only time it will be shown so do not lose it! You may now use this token to make API requests.',
     'api_key_warning' => 'When generating an API token, be sure to copy it down immediately as they will not be visible to you again.',
     'api_base_url' => 'Your API base url is located at:',
     'api_base_url_endpoint' => '/&lt;endpoint&gt;',
     'api_token_expiration_time' => 'API tokens are set to expire in:',
     'api_reference' => 'Please check the <a href="https://snipe-it.readme.io/reference" target="_blank">API reference</a> to find specific API endpoints and additional API documentation.',
     'profile_updated' => 'Account successfully updated',
+    'no_tokens' => 'You have not created any personal access tokens.',
+    'enable_sounds' => 'Enable sound effects',
+    'enable_confetti' => 'Enable confetti effects',
 );
diff --git a/resources/lang/chr-US/admin/accessories/message.php b/resources/lang/chr-US/admin/accessories/message.php
index c688d5e03d..f60d41957b 100644
--- a/resources/lang/chr-US/admin/accessories/message.php
+++ b/resources/lang/chr-US/admin/accessories/message.php
@@ -26,7 +26,11 @@ return array(
         'error'   		=> 'Accessory was not checked out, please try again',
         'success' 		=> 'Accessory checked out successfully.',
         'unavailable'   => 'Accessory is not available for checkout. Check quantity available',
-        'user_does_not_exist' => 'That user is invalid. Please try again.'
+        'user_does_not_exist' => 'That user is invalid. Please try again.',
+         'checkout_qty' => array(
+            'lte'  => 'There is currently only one available accessory of this type, and you are trying to check out :checkout_qty. Please adjust the checkout quantity or the total stock of this accessory and try again.|There are :number_currently_remaining total available accessories, and you are trying to check out :checkout_qty. Please adjust the checkout quantity or the total stock of this accessory and try again.',
+            ),
+           
     ),
 
     'checkin' => array(
diff --git a/resources/lang/chr-US/admin/accessories/table.php b/resources/lang/chr-US/admin/accessories/table.php
index e02d9f22e4..80df687161 100644
--- a/resources/lang/chr-US/admin/accessories/table.php
+++ b/resources/lang/chr-US/admin/accessories/table.php
@@ -6,6 +6,4 @@ return array(
     'id'      					=> 'ID',
     'require_acceptance'      	=> 'Acceptance',
     'title'      				=> 'Accessory Name',
-
-
 );
diff --git a/resources/lang/chr-US/admin/components/message.php b/resources/lang/chr-US/admin/components/message.php
index 0a7dd8d954..ec39dc4178 100644
--- a/resources/lang/chr-US/admin/components/message.php
+++ b/resources/lang/chr-US/admin/components/message.php
@@ -17,7 +17,8 @@ return array(
     'delete' => array(
         'confirm'   => 'Are you sure you wish to delete this component?',
         'error'   => 'There was an issue deleting the component. Please try again.',
-        'success' => 'The component was deleted successfully.'
+        'success' => 'The component was deleted successfully.',
+        'error_qty'   => 'Some components of this type are still checked out. Please check them in and try again.',
     ),
 
      'checkout' => array(
diff --git a/resources/lang/chr-US/admin/consumables/general.php b/resources/lang/chr-US/admin/consumables/general.php
index 7c6bb32968..29acfedc1b 100644
--- a/resources/lang/chr-US/admin/consumables/general.php
+++ b/resources/lang/chr-US/admin/consumables/general.php
@@ -8,4 +8,5 @@ return array(
     'remaining' 			            => 'Remaining',
     'total' 			                => 'Total',
     'update'                            => 'Update Consumable',
+    'inventory_warning'                 => 'The inventory of this consumable is below the minimum amount of :min_count',
 );
diff --git a/resources/lang/chr-US/admin/consumables/message.php b/resources/lang/chr-US/admin/consumables/message.php
index c0d0aa7f68..e2591503bf 100644
--- a/resources/lang/chr-US/admin/consumables/message.php
+++ b/resources/lang/chr-US/admin/consumables/message.php
@@ -2,6 +2,7 @@
 
 return array(
 
+    'invalid_category_type' => 'The category must be a consumable category.',
     'does_not_exist' => 'Consumable does not exist.',
 
     'create' => array(
diff --git a/resources/lang/chr-US/admin/custom_fields/general.php b/resources/lang/chr-US/admin/custom_fields/general.php
index e3c21d1f0c..c9ae61c963 100644
--- a/resources/lang/chr-US/admin/custom_fields/general.php
+++ b/resources/lang/chr-US/admin/custom_fields/general.php
@@ -35,7 +35,7 @@ return [
     'create_field_title' => 'Create a new custom field',
     'value_encrypted'      	        => 'The value of this field is encrypted in the database. Only admin users will be able to view the decrypted value',
     'show_in_email'     => 'Include the value of this field in checkout emails sent to the user? Encrypted fields cannot be included in emails',
-    'show_in_email_short'     => 'Include in emails.',
+    'show_in_email_short' => 'Include in emails',
     'help_text' => 'Help Text',
     'help_text_description' => 'This is optional text that will appear below the form elements while editing an asset to provide context on the field.',
     'about_custom_fields_title' => 'About Custom Fields',
@@ -57,5 +57,8 @@ return [
     'show_in_requestable_list_short' => 'Show in requestable assets list',
     'show_in_requestable_list' => 'Show value in requestable assets list. Encrypted fields will not be shown',
     'encrypted_options' => 'This field is encrypted, so some display options will not be available.',
+    'display_checkin' => 'Display in checkin forms',
+    'display_checkout' => 'Display in checkout forms',
+    'display_audit' => 'Display in audit forms',
 
 ];
diff --git a/resources/lang/chr-US/admin/custom_fields/message.php b/resources/lang/chr-US/admin/custom_fields/message.php
index 43ba821821..6442359b7f 100644
--- a/resources/lang/chr-US/admin/custom_fields/message.php
+++ b/resources/lang/chr-US/admin/custom_fields/message.php
@@ -5,6 +5,7 @@ return array(
     'field' => array(
         'invalid'   => 'That field does not exist.',
         'already_added'   => 'Field already added',
+        'none_selected'   => 'No field selected',
 
         'create' => array(
             'error'   => 'Field was not created, please try again.',
diff --git a/resources/lang/chr-US/admin/depreciations/general.php b/resources/lang/chr-US/admin/depreciations/general.php
index 1a5666f9dc..90246e9cd8 100644
--- a/resources/lang/chr-US/admin/depreciations/general.php
+++ b/resources/lang/chr-US/admin/depreciations/general.php
@@ -13,4 +13,8 @@ return [
     'no_depreciations_warning'               => '<strong>Warning: </strong>
                       You do not currently have any depreciations set up.
                       Please set up at least one depreciation to view the depreciation report.',
+    'depreciation_method'                   => 'Depreciation Report',
+    'linear_depreciation'                   => 'Linear (Default)',
+    'half_1'                                => 'Half-year convention, always applied',
+    'half_2'                                => 'Half-year convention, applied with condition',
 ];
diff --git a/resources/lang/chr-US/admin/hardware/form.php b/resources/lang/chr-US/admin/hardware/form.php
index edec543637..8fbd0b4e87 100644
--- a/resources/lang/chr-US/admin/hardware/form.php
+++ b/resources/lang/chr-US/admin/hardware/form.php
@@ -55,8 +55,11 @@ return [
     'asset_location_update_default' => 'Update only default location',
     'asset_location_update_actual' => 'Update only actual location',
     'asset_not_deployable' => 'That asset status is not deployable. This asset cannot be checked out.',
-    'asset_deployable' => 'That status is deployable. This asset can be checked out.',
+    'asset_not_deployable_checkin' => 'That asset status is not deployable. Using this status label will checkin the asset.',
+    'asset_deployable' => 'This asset can be checked out.',
     'processing_spinner' => 'Processing... (This might take a bit of time on large files)',
+    'processing' => 'Processing... ',
     'optional_infos'  => 'Optional Information',
-    'order_details'   => 'Order Related Information'
+    'order_details'   => 'Order Related Information',
+    'calc_eol'    => 'If nulling the EOL date, use automatic EOL calculation based on the purchase date and EOL rate.',
 ];
diff --git a/resources/lang/chr-US/admin/hardware/general.php b/resources/lang/chr-US/admin/hardware/general.php
index 34ac4e63ee..6740476574 100644
--- a/resources/lang/chr-US/admin/hardware/general.php
+++ b/resources/lang/chr-US/admin/hardware/general.php
@@ -5,8 +5,8 @@ return [
     'about_assets_text'            => 'Assets are items tracked by serial number or asset tag.  They tend to be higher value items where identifying a specific item matters.',
     'archived'  				=> 'Archived',
     'asset'  					=> 'Asset',
-    'bulk_checkout'             => 'Checkout Assets',
-    'bulk_checkin'              => 'Checkin Assets',
+    'bulk_checkout'             => 'Bulk Checkout',
+    'bulk_checkin'              => 'Bulk Checkin',
     'checkin'  					=> 'Checkin Asset',
     'checkout'  				=> 'Checkout Asset',
     'clone'  					=> 'Clone Asset',
@@ -27,8 +27,7 @@ return [
     'undeployable_tooltip'  	=> 'This asset has a status label that is undeployable and cannot be checked out at this time.',
     'view'  					=> 'View Asset',
     'csv_error' => 'You have an error in your CSV file:',
-    'import_text' => '<p>Upload a CSV that contains asset history. The assets and users MUST already exist in the system, or they will be skipped. Matching assets for history import happens against the asset tag. We will try to find a matching user based on the user\'s name you provide, and the criteria you select below. If you do not select any criteria below, it will simply try to match on the username format you configured in the <code>Admin &gt; General Settings</code>.</p><p>Fields included in the CSV must match the headers: <strong>Asset Tag, Name, Checkout Date, Checkin Date</strong>. Any additional fields will be ignored. </p><p>Checkin Date: blank or future checkin dates will checkout items to associated user.  Excluding the Checkin Date column will create a checkin date with todays date.</p>
-    ',
+    'import_text' => '<p>Upload a CSV that contains asset history. The assets and users MUST already exist in the system, or they will be skipped. Matching assets for history import happens against the asset tag. We will try to find a matching user based on the user\'s name you provide, and the criteria you select below. If you do not select any criteria below, it will simply try to match on the username format you configured in the <code>Admin &gt; General Settings</code>.</p><p>Fields included in the CSV must match the headers: <strong>Asset Tag, Name, Checkout Date, Checkin Date</strong>. Any additional fields will be ignored. </p><p>Checkin Date: blank or future checkin dates will checkout items to associated user.  Excluding the Checkin Date column will create a checkin date with todays date.</p>    ',
     'csv_import_match_f-l' => 'Try to match users by <strong>firstname.lastname</strong> (<code>jane.smith</code>) format',
     'csv_import_match_initial_last' => 'Try to match users by <strong>first initial last name</strong> (<code>jsmith</code>) format',
     'csv_import_match_first' => 'Try to match users by <strong>first name</strong> (<code>jane</code>) format',
diff --git a/resources/lang/chr-US/admin/hardware/message.php b/resources/lang/chr-US/admin/hardware/message.php
index 32698b1c07..c19bc63647 100644
--- a/resources/lang/chr-US/admin/hardware/message.php
+++ b/resources/lang/chr-US/admin/hardware/message.php
@@ -2,19 +2,23 @@
 
 return [
 
-    'undeployable' 		=> '<strong>Warning: </strong> This asset has been marked as currently undeployable.
-                        If this status has changed, please update the asset status.',
-    'does_not_exist' 	=> 'Asset does not exist.',
-    'does_not_exist_var'=> 'Asset with tag :asset_tag not found.',
-    'no_tag' 	        => 'No asset tag provided.',
+    'undeployable' 		 => '<strong>Warning: </strong> This asset has been marked as currently undeployable. If this status has changed, please update the asset status.',
+    'does_not_exist' 	 => 'Asset does not exist.',
+    'does_not_exist_var' => 'Asset with tag :asset_tag not found.',
+    'no_tag' 	         => 'No asset tag provided.',
     'does_not_exist_or_not_requestable' => 'That asset does not exist or is not requestable.',
-    'assoc_users'	 	=> 'This asset is currently checked out to a user and cannot be deleted. Please check the asset in first, and then try deleting again. ',
+    'assoc_users'	 	 => 'This asset is currently checked out to a user and cannot be deleted. Please check the asset in first, and then try deleting again. ',
     'warning_audit_date_mismatch' 	=> 'This asset\'s next audit date (:next_audit_date) is before the last audit date (:last_audit_date). Please update the next audit date.',
+    'labels_generated'   => 'Labels were successfully generated.',
+    'error_generating_labels' => 'Error while generating labels.',
+    'no_assets_selected' => 'No assets selected.',
 
     'create' => [
         'error'   		=> 'Asset was not created, please try again. :(',
         'success' 		=> 'Asset created successfully. :)',
         'success_linked' => 'Asset with tag :tag was created successfully. <strong><a href=":link" style="color: white;">Click here to view</a></strong>.',
+        'multi_success_linked' => 'Asset with tag :links was created successfully.|:count assets were created succesfully. :links.',
+        'partial_failure' => 'An asset was unable to be created. Reason: :failures|:count assets were unable to be created. Reasons: :failures',
     ],
 
     'update' => [
@@ -52,20 +56,24 @@ return [
     ],
 
     'import' => [
+        'import_button'         => 'Process Import',
         'error'                 => 'Some items did not import correctly.',
         'errorDetail'           => 'The following Items were not imported because of errors.',
         'success'               => 'Your file has been imported',
         'file_delete_success'   => 'Your file has been been successfully deleted',
         'file_delete_error'      => 'The file was unable to be deleted',
         'file_missing' => 'The file selected is missing',
+        'file_already_deleted' => 'The file selected was already deleted',
         'header_row_has_malformed_characters' => 'One or more attributes in the header row contain malformed UTF-8 characters',
         'content_row_has_malformed_characters' => 'One or more attributes in the first row of content contain malformed UTF-8 characters',
+        'transliterate_failure' => 'Transliteration from :encoding to UTF-8 failed due to invalid characters in input'
     ],
 
 
     'delete' => [
         'confirm'   	=> 'Are you sure you wish to delete this asset?',
         'error'   		=> 'There was an issue deleting the asset. Please try again.',
+        'assigned_to_error' => '{1}Asset Tag: :asset_tag is currently checked out. Check in this device before deletion.|[2,*]Asset Tags: :asset_tag are currently checked out. Check in these devices before deletion.',
         'nothing_updated'   => 'No assets were selected, so nothing was deleted.',
         'success' 		=> 'The asset was deleted successfully.',
     ],
@@ -78,6 +86,11 @@ return [
         'no_assets_selected' => 'You must select at least one asset from the list',
     ],
 
+    'multi-checkout' => [
+        'error'   => 'Asset was not checked out, please try again|Assets were not checked out, please try again',
+        'success' => 'Asset checked out successfully.|Assets checked out successfully.',
+    ],
+
     'checkin' => [
         'error'   		=> 'Asset was not checked in, please try again',
         'success' 		=> 'Asset checked in successfully.',
@@ -87,9 +100,10 @@ return [
     ],
 
     'requests' => [
-        'error'   		=> 'Asset was not requested, please try again',
-        'success' 		=> 'Asset requested successfully.',
-        'canceled'      => 'Checkout request successfully canceled',
+        'error'   		=> 'Request was not successful, please try again.',
+        'success' 		=> 'Request successfully submitted.',
+        'canceled'      => 'Request successfully canceled.',
+        'cancel'        => 'Cancel this item request',
     ],
 
 ];
diff --git a/resources/lang/chr-US/admin/hardware/table.php b/resources/lang/chr-US/admin/hardware/table.php
index 92b228dccd..2d88c6c131 100644
--- a/resources/lang/chr-US/admin/hardware/table.php
+++ b/resources/lang/chr-US/admin/hardware/table.php
@@ -25,7 +25,6 @@ return [
     'image'		    => 'Device Image',
     'days_without_acceptance' => 'Days Without Acceptance',
     'monthly_depreciation' => 'Monthly Depreciation',
-    'assigned_to'    => 'Assigned To',
     'requesting_user' => 'Requesting User',
     'requested_date' => 'Requested Date',
     'changed'       => 'Changed',
diff --git a/resources/lang/chr-US/admin/kits/general.php b/resources/lang/chr-US/admin/kits/general.php
index f57fb645c4..2b5c2d9cd0 100644
--- a/resources/lang/chr-US/admin/kits/general.php
+++ b/resources/lang/chr-US/admin/kits/general.php
@@ -47,4 +47,5 @@ return [
     'kit_deleted'                       => 'Kit was successfully deleted',
     'kit_model_updated'                 => 'Model was successfully updated',
     'kit_model_detached'                => 'Model was successfully detached',
+    'model_already_attached'            => 'Model already attached to kit',
 ];
diff --git a/resources/lang/chr-US/admin/licenses/general.php b/resources/lang/chr-US/admin/licenses/general.php
index 79b69a3d94..b39030afd4 100644
--- a/resources/lang/chr-US/admin/licenses/general.php
+++ b/resources/lang/chr-US/admin/licenses/general.php
@@ -14,6 +14,7 @@ return array(
     'info'  					=> 'License Info',
     'license_seats'  			=> 'License Seats',
     'seat'  					=> 'Seat',
+    'seat_count'  				=> 'Seat :count',
     'seats'  					=> 'Seats',
     'software_licenses'  		=> 'Software Licenses',
     'user'  					=> 'User',
@@ -23,12 +24,12 @@ return array(
         [
             'checkin_all'           => [
                 'button'            => 'Checkin All Seats',
-                'modal'             => 'This will action checkin one seat. | This action will checkin all :checkedout_seats_count seats for this license.',
+                'modal'             => 'This action will checkin one seat. | This action will checkin all :checkedout_seats_count seats for this license.',
                 'enabled_tooltip'   => 'Checkin ALL seats for this license from both users and assets',
                 'disabled_tooltip'  => 'This is disabled because there are no seats currently checked out',
                 'disabled_tooltip_reassignable'  => 'This is disabled because the License is not reassignable',
                 'success'           => 'License successfully checked in! | All licenses were successfully checked in!',
-                'log_msg'           => 'Checked in via bulk license checkout in license GUI',
+                'log_msg'           => 'Checked in via bulk license checkin in license GUI',
             ],
 
             'checkout_all'              => [
diff --git a/resources/lang/chr-US/admin/licenses/message.php b/resources/lang/chr-US/admin/licenses/message.php
index 27fbfe38a9..74e1d7af5a 100644
--- a/resources/lang/chr-US/admin/licenses/message.php
+++ b/resources/lang/chr-US/admin/licenses/message.php
@@ -44,10 +44,13 @@ return array(
         'error'   => 'There was an issue checking out the license. Please try again.',
         'success' => 'The license was checked out successfully',
         'not_enough_seats' => 'Not enough license seats available for checkout',
+        'mismatch' => 'The license seat provided does not match the license',
+        'unavailable' => 'This seat is not available for checkout.',
     ),
 
     'checkin' => array(
         'error'   => 'There was an issue checking in the license. Please try again.',
+        'not_reassignable' => 'License not reassignable',
         'success' => 'The license was checked in successfully'
     ),
 
diff --git a/resources/lang/chr-US/admin/locations/message.php b/resources/lang/chr-US/admin/locations/message.php
index 8121b80687..b21c70ad89 100644
--- a/resources/lang/chr-US/admin/locations/message.php
+++ b/resources/lang/chr-US/admin/locations/message.php
@@ -3,11 +3,12 @@
 return array(
 
     'does_not_exist' => 'Location does not exist.',
-    'assoc_users'    => 'This location is not currently deletable because it is the location of record for at least one asset or user, has assets assigned to it, or is the parent location of another location. Please update your models to no longer reference this company and try again. ',
+    'assoc_users'    => 'This location is not currently deletable because it is the location of record for at least one asset or user, has assets assigned to it, or is the parent location of another location. Please update your records to no longer reference this location and try again ',
     'assoc_assets'	 => 'This location is currently associated with at least one asset and cannot be deleted. Please update your assets to no longer reference this location and try again. ',
     'assoc_child_loc'	 => 'This location is currently the parent of at least one child location and cannot be deleted. Please update your locations to no longer reference this location and try again. ',
     'assigned_assets' => 'Assigned Assets',
     'current_location' => 'Current Location',
+    'open_map' => 'Open in :map_provider_icon Maps',
 
 
     'create' => array(
@@ -20,6 +21,11 @@ return array(
         'success' => 'Location updated successfully.'
     ),
 
+    'restore' => array(
+        'error'   => 'Location was not restored, please try again',
+        'success' => 'Location restored successfully.'
+    ),
+
     'delete' => array(
         'confirm'   	=> 'Are you sure you wish to delete this location?',
         'error'   => 'There was an issue deleting the location. Please try again.',
diff --git a/resources/lang/chr-US/admin/locations/table.php b/resources/lang/chr-US/admin/locations/table.php
index ed3f96f6b4..53176d8a4e 100644
--- a/resources/lang/chr-US/admin/locations/table.php
+++ b/resources/lang/chr-US/admin/locations/table.php
@@ -39,4 +39,5 @@ return [
     'signed_by_finance_auditor' => 'Signed By (Finance Auditor):',
     'signed_by_location_manager' => 'Signed By (Location Manager):',
     'signed_by'                 => 'Signed Off By:',
+    'clone'  					=> 'Clone Location',
 ];
diff --git a/resources/lang/chr-US/admin/models/general.php b/resources/lang/chr-US/admin/models/general.php
index 7e4a77adbc..9a61b53fd0 100644
--- a/resources/lang/chr-US/admin/models/general.php
+++ b/resources/lang/chr-US/admin/models/general.php
@@ -3,7 +3,7 @@
 return array(
     'about_models_title'     => 'About Asset Models',
     'about_models_text'           => 'Asset Models are a way to group identical assets. "MBP 2013", "IPhone 6s", etc.',
-    'deleted'  					        => 'This model has been deleted.',
+    'deleted'  					=> 'This model has been deleted.',
     'bulk_delete'               => 'Bulk Delete Asset Models',
     'bulk_delete_help'               => 'Use the checkboxes below to confirm the deletion of the selected asset models. Asset models that have assets associated with them cannot be deleted until the assets are associated with a different model.',
     'bulk_delete_warn'          => 'You are about to delete one asset model.|You are about to delete :model_count asset models.',
diff --git a/resources/lang/chr-US/admin/models/message.php b/resources/lang/chr-US/admin/models/message.php
index cc38c54530..ae3bc34eed 100644
--- a/resources/lang/chr-US/admin/models/message.php
+++ b/resources/lang/chr-US/admin/models/message.php
@@ -7,7 +7,7 @@ return array(
     'no_association' => 'WARNING! The asset model for this item is invalid or missing!',
     'no_association_fix' => 'This will break things in weird and horrible ways. Edit this asset now to assign it a model.',
     'assoc_users'	 => 'This model is currently associated with one or more assets and cannot be deleted. Please delete the assets, and then try deleting again. ',
-
+    'invalid_category_type' => 'This category must be an asset category.',
 
     'create' => array(
         'error'   => 'Model was not created, please try again.',
diff --git a/resources/lang/chr-US/admin/reports/general.php b/resources/lang/chr-US/admin/reports/general.php
index 9b682f8ecd..ed8bf1a156 100644
--- a/resources/lang/chr-US/admin/reports/general.php
+++ b/resources/lang/chr-US/admin/reports/general.php
@@ -4,6 +4,7 @@ return [
     'info'   => 'Select the options you want for your asset report.',
     'deleted_user' => 'Deleted user',
     'send_reminder' => 'Send reminder',
+    'cannot_send_reminder' => 'User has been deleted or does not have an email address so cannot receive a reminder',
     'reminder_sent' => 'Reminder sent',
     'acceptance_deleted' => 'Acceptance request deleted',
     'acceptance_request' => 'Acceptance request',
@@ -13,5 +14,10 @@ return [
         'user_state' => 'User State',
         'user_country' => 'User Country',
         'user_zip' => 'User Zip'
-    ]
-];
\ No newline at end of file
+    ],
+    'open_saved_template' => 'Open Saved Template',
+    'save_template' =>  'Save Template',
+    'select_a_template' => 'Select a Template',
+    'template_name' => 'Template Name',
+    'update_template' => 'Update Template',
+];
diff --git a/resources/lang/chr-US/admin/reports/message.php b/resources/lang/chr-US/admin/reports/message.php
index d4c8f8198f..2800bbdf0b 100644
--- a/resources/lang/chr-US/admin/reports/message.php
+++ b/resources/lang/chr-US/admin/reports/message.php
@@ -1,5 +1,16 @@
 <?php
 
-return array(
-    'error'   => 'You must select at least ONE option.'
-);
+return [
+    'about_templates' => 'About Saved Templates',
+    'saving_templates_description' => 'Select your options, then enter the name of your template in the box above and click the \'Save Template\' button. Use the dropdown to select a previously saved template.',
+    'create'  => [
+        'success' => 'Template saved successfully',
+    ],
+    'update' => [
+        'success' => 'Template updated successfully',
+    ],
+    'delete' => [
+        'success' => 'Template deleted',
+        'no_delete_permission' => 'Template does not exist or you do not have permission to delete it.',
+    ],
+];
diff --git a/resources/lang/chr-US/admin/settings/general.php b/resources/lang/chr-US/admin/settings/general.php
index 8074f5082e..37cfb0de94 100644
--- a/resources/lang/chr-US/admin/settings/general.php
+++ b/resources/lang/chr-US/admin/settings/general.php
@@ -8,13 +8,13 @@ return [
     'ad_append_domain'          => 'Append domain name to username field',
     'ad_append_domain_help'     => 'User isn\'t required to write "username@domain.local", they can just type "username".',
     'admin_cc_email'            => 'CC Email',
-    'admin_cc_email_help'       => 'If you would like to send a copy of checkin/checkout emails that are sent to users to an additional email account, enter it here. Otherwise leave this field blank.',
+    'admin_cc_email_help'       => 'Send a copy of checkin/checkout emails to this address.',
     'admin_settings'            => 'Admin Settings',
     'is_ad'				        => 'This is an Active Directory server',
     'alerts'                	=> 'Alerts',
     'alert_title'               => 'Update Notification Settings',
     'alert_email'				=> 'Send alerts to',
-    'alert_email_help'    => 'Email addresses or distribution lists you want alerts to be sent to, comma separated',
+    'alert_email_help'          => 'Email addresses or distribution lists you want alerts to be sent to, comma separated.',
     'alerts_enabled'			=> 'Email Alerts Enabled',
     'alert_interval'			=> 'Expiring Alerts Threshold (in days)',
     'alert_inv_threshold'		=> 'Inventory Alert Threshold',
@@ -31,15 +31,18 @@ return [
     'backups'					=> 'Backups',
     'backups_help'              => 'Create, download, and restore backups ',
     'backups_restoring'         => 'Restoring from Backup',
+    'backups_clean' => 'Clean the backed-up database before restore',
+    'backups_clean_helptext' => "This can be useful if you're changing between database versions",
     'backups_upload'            => 'Upload Backup',
     'backups_path'              => 'Backups on the server are stored in <code>:path</code>',
-    'backups_restore_warning'   => 'Use the restore button <small><span class="btn btn-xs btn-warning"><i class="text-white fas fa-retweet" aria-hidden="true"></i></span></small> to restore from a previous backup. (This does not currently work with S3 file storage or Docker.)<br><br>Your <strong>entire :app_name database and any uploaded files will be completely replaced</strong> by what\'s in the backup file.  ',
+    'backups_restore_warning'   => 'Use the restore button <small><span class="btn btn-xs btn-warning"><i class="text-white fas fa-retweet" aria-hidden="true"></i></span></small> to restore from a previous backup. (This does not currently work with S3 file storage or Docker.)<br><br>Your <strong>entire :app_name database and any uploaded files will be completely replaced</strong> by what\'s in the backup file  ',
     'backups_logged_out'         => 'All existing users, including you, will be logged out once your restore is complete.',
     'backups_large'             => 'Very large backups may time out on the restore attempt and may still need to be run via command line. ',
     'barcode_settings'			=> 'Barcode Settings',
     'confirm_purge'			    => 'Confirm Purge',
     'confirm_purge_help'		=> 'Enter the text "DELETE" in the box below to purge your deleted records. This action cannot be undone and will PERMANENTLY delete all soft-deleted items and users. (You should make a backup first, just to be safe.)',
     'custom_css'				=> 'Custom CSS',
+    'custom_css_placeholder'	=> 'Add your custom CSS',
     'custom_css_help'			=> 'Enter any custom CSS overrides you would like to use. Do not include the &lt;style&gt;&lt;/style&gt; tags.',
     'custom_forgot_pass_url'	=> 'Custom Password Reset URL',
     'custom_forgot_pass_url_help'	=> 'This replaces the built-in forgotten password URL on the login screen, useful to direct people to internal or hosted LDAP password reset functionality. It will effectively disable local user forgotten password functionality.',
@@ -47,34 +50,34 @@ return [
     'dashboard_message_help'	=> 'This text will appear on the dashboard for anyone with permission to view the dashboard.',
     'default_currency'  		=> 'Default Currency',
     'default_eula_text'			=> 'Default EULA',
+    'default_eula_text_placeholder' => 'Add your default EULA text',
     'default_language'			=> 'Default Language',
     'default_eula_help_text'	=> 'You can also associate custom EULAs to specific asset categories.',
     'acceptance_note'           => 'Add a note for your decision (Optional)',
     'display_asset_name'        => 'Display Asset Name',
     'display_checkout_date'     => 'Display Checkout Date',
     'display_eol'               => 'Display EOL in table view',
-    'display_qr'                => 'Display Square Codes',
+    'display_qr'                => 'Display 2D barcode',
     'display_alt_barcode'		=> 'Display 1D barcode',
-    'email_logo'                => 'Email Logo',
     'barcode_type'				=> '2D Barcode Type',
     'alt_barcode_type'			=> '1D barcode type',
-    'email_logo_size'       => 'Square logos in email look best. ',
     'enabled'                   => 'Enabled',
     'eula_settings'				=> 'EULA Settings',
     'eula_markdown'				=> 'This EULA allows <a href="https://help.github.com/articles/github-flavored-markdown/">Github flavored markdown</a>.',
+    'empty_row_count'           => 'Field Start Offset (Empty Rows)',
+    'empty_row_count_help'      => 'Fields will begin populating after this many empty rows are skipped at the top of the label.',
     'favicon'                   => 'Favicon',
     'favicon_format'            => 'Accepted filetypes are ico, png, and gif. Other image formats may not work in all browsers.',
     'favicon_size'          => 'Favicons should be square images, 16x16 pixels.',
     'footer_text'               => 'Additional Footer Text ',
     'footer_text_help'          => 'This text will appear in the right-side footer. Links are allowed using <a href="https://help.github.com/articles/github-flavored-markdown/">Github flavored markdown</a>. Line breaks, headers, images, etc may result in unpredictable results.',
+    'footer_text_placeholder'   => 'Optional footer text',
     'general_settings'			=> 'General Settings',
-    'general_settings_keywords' => 'company support, signature, acceptance, email format, username format, images, per page, thumbnail, eula, gravatar, tos, dashboard, privacy',
     'general_settings_help'     => 'Default EULA and more',
     'generate_backup'			=> 'Generate Backup',
     'google_workspaces'         => 'Google Workspaces',
     'header_color'              => 'Header Color',
     'info'                      => 'These settings let you customize certain aspects of your installation.',
-    'label_logo'                => 'Label Logo',
     'label_logo_size'           => 'Square logos look best - will be displayed in the top right of each asset label. ',
     'laravel'                   => 'Laravel Version',
     'ldap'                      => 'LDAP',
@@ -94,7 +97,7 @@ return [
     'ldap_login_sync_help'      => 'This only tests that LDAP can sync correctly. If your LDAP Authentication query is not correct, users may still not be able to login. YOU MUST SAVE YOUR UPDATED LDAP SETTINGS FIRST.',
     'ldap_manager'              => 'LDAP Manager',
     'ldap_server'               => 'LDAP Server',
-    'ldap_server_help'          => 'This should start with ldap:// (for unencrypted or TLS) or ldaps:// (for SSL)',
+    'ldap_server_help'          => 'This should start with ldap:// (for unencrypted) or ldaps:// (for TLS or SSL)',
     'ldap_server_cert'			=> 'LDAP SSL certificate validation',
     'ldap_server_cert_ignore'	=> 'Allow invalid SSL Certificate',
     'ldap_server_cert_help'		=> 'Select this checkbox if you are using a self signed SSL cert and would like to accept an invalid SSL certificate.',
@@ -108,8 +111,8 @@ return [
     'ldap_pword'                => 'LDAP Bind Password',
     'ldap_basedn'               => 'Base Bind DN',
     'ldap_filter'               => 'LDAP Filter',
-    'ldap_pw_sync'              => 'LDAP Password Sync',
-    'ldap_pw_sync_help'         => 'Uncheck this box if you do not wish to keep LDAP passwords synced with local passwords. Disabling this means that your users may not be able to login if your LDAP server is unreachable for some reason.',
+    'ldap_pw_sync'              => 'Cache LDAP Passwords',
+    'ldap_pw_sync_help'         => 'Uncheck this box if you do not wish to keep LDAP passwords cached as local hashed passwords. Disabling this means that your users may not be able to login if your LDAP server is unreachable for some reason.',
     'ldap_username_field'       => 'Username Field',
     'ldap_lname_field'          => 'Last Name',
     'ldap_fname_field'          => 'LDAP First Name',
@@ -117,13 +120,15 @@ return [
     'ldap_version'              => 'LDAP Version',
     'ldap_active_flag'          => 'LDAP Active Flag',
     'ldap_activated_flag_help'  => 'This value is used to determine whether a synced user can login to Snipe-IT. <strong>It does not affect the ability to check items in or out to them</strong>, and should be the <strong>attribute name</strong> within your AD/LDAP, <strong>not the value</strong>. <br><br>If this field is set to a field name that does not exist in your AD/LDAP, or the value in the AD/LDAP field is set to <code>0</code> or <code>false</code>, <strong>user login will be disabled</strong>. If the value in the AD/LDAP field is set to <code>1</code> or <code>true</code> or <em>any other text</em> means the user can log in. When the field is blank in your AD, we respect the <code>userAccountControl</code> attribute, which usually allows non-suspended users to log in.',
+    'ldap_invert_active_flag'   => 'LDAP Invert Active Flag',
+    'ldap_invert_active_flag_help'     => 'If enabled: when the value returned by LDAP Active Flag is <code>0</code> or <code>false</code> the user account will be active.',
     'ldap_emp_num'              => 'LDAP Employee Number',
     'ldap_email'                => 'LDAP Email',
     'ldap_test'                 => 'Test LDAP',
     'ldap_test_sync'            => 'Test LDAP Synchronization',
     'license'                   => 'Software License',
-    'load_remote'               => 'Use Gravatar',
-    'load_remote_help_text'		=> 'Uncheck this box if your install cannot load scripts from the outside internet. This will prevent Snipe-IT from trying load images from Gravatar.',
+    'load_remote'               => 'Load Remote Avatars',
+    'load_remote_help_text'		=> 'Uncheck this box if your install cannot load scripts from the outside internet. This will prevent Snipe-IT from trying load avatars from Gravatar or other outside sources.',
     'login'                     => 'Login Attempts',
     'login_attempt'             => 'Login Attempt',
     'login_ip'                  => 'IP Address',
@@ -131,6 +136,7 @@ return [
     'login_user_agent'          => 'User Agent',
     'login_help'                => 'List of attempted logins',
     'login_note'                => 'Login Note',
+    'login_note_placeholder'            => "If you do not have a login or have found a device belonging to this company, please call technical support at 888-555-1212. Thank you.",
     'login_note_help'           => 'Optionally include a few sentences on your login screen, for example to assist people who have found a lost or stolen device. This field accepts <a href="https://help.github.com/articles/github-flavored-markdown/">Github flavored markdown</a>',
     'login_remote_user_text'    => 'Remote User login options',
     'login_remote_user_enabled_text' => 'Enable Login with Remote User Header',
@@ -146,13 +152,16 @@ return [
     'logo_print_assets_help'    => 'Use branding on printable asset lists ',
     'full_multiple_companies_support_help_text' => 'Restricting users (including admins) assigned to companies to their company\'s assets.',
     'full_multiple_companies_support_text' => 'Full Multiple Companies Support',
+    'scope_locations_fmcs_support_text'  => 'Scope Locations with Full Multiple Companies Support',
+    'scope_locations_fmcs_support_help_text'  => 'Restrict locations to their selected company.',
+    'scope_locations_fmcs_check_button' => 'Check Compatibility',
+    'scope_locations_fmcs_support_disabled_text'  => 'This option is disabled because you have conflicting locations set for :count or more items.',
     'show_in_model_list'   => 'Show in Model Dropdowns',
     'optional'					=> 'optional',
     'per_page'                  => 'Results Per Page',
     'php'                       => 'PHP Version',
-    'php_info'                  => 'PHP Info',
+    'php_info'                  => 'PHP info',
     'php_overview'              => 'PHP',
-    'php_overview_keywords'     => 'phpinfo, system, info',
     'php_overview_help'         => 'PHP System info',
     'php_gd_info'               => 'You must install php-gd to display QR codes, see install instructions.',
     'php_gd_warning'            => 'PHP Image Processing and GD plugin is NOT installed.',
@@ -218,6 +227,8 @@ return [
     'webhook_integration_help'    => ':app integration is optional, however the endpoint and channel are required if you wish to use it. To configure :app integration, you must first <a href=":webhook_link" target="_new" rel="noopener">create an incoming webhook</a> on your :app account. Click on the <strong>Test :app Integration</strong> button to confirm your settings are correct before saving. ',
     'webhook_integration_help_button'    => 'Once you have saved your :app information, a test button will appear.',
     'webhook_test_help'           => 'Test whether your :app integration is configured correctly. YOU MUST SAVE YOUR UPDATED :app SETTINGS FIRST.',
+    'shortcuts_enabled'         => 'Enable Shortcuts',
+    'shortcuts_help_text'       => '<strong>Windows</strong>: Alt + Access key, <strong>Mac</strong>: Control + Option + Access key',
     'snipe_version'  			=> 'Snipe-IT version',
     'support_footer'            => 'Support Footer Links ',
     'support_footer_help'       => 'Specify who sees the links to the Snipe-IT Support info and Users Manual',
@@ -227,7 +238,6 @@ return [
     'update'                    => 'Update Settings',
     'value'                     => 'Value',
     'brand'                     => 'Branding',
-    'brand_keywords'            => 'footer, logo, print, theme, skin, header, colors, color, css',
     'brand_help'                => 'Logo, Site Name',
     'web_brand'                 => 'Web Branding Type',
     'about_settings_title'      => 'About Settings',
@@ -276,6 +286,8 @@ return [
     'two_factor_enrollment_text'	=> "Two factor authentication is required, however your device has not been enrolled yet. Open your Google Authenticator app and scan the QR code below to enroll your device. Once you've enrolled your device, enter the code below",
     'require_accept_signature'      => 'Require Signature',
     'require_accept_signature_help_text'      => 'Enabling this feature will require users to physically sign off on accepting an asset.',
+    'require_checkinout_notes'  => 'Require Notes on Checkin/Checkout',
+    'require_checkinout_notes_help_text'    => 'Enabling this feature will require the note fields to be populated when checking in or checking out an asset.',
     'left'        => 'left',
     'right'        => 'right',
     'top'        => 'top',
@@ -313,24 +325,24 @@ return [
     'filter_by_keyword' => 'Filter by setting keyword',
     'security' => 'Security',
     'security_title' => 'Update Security Settings',
-    'security_keywords' => 'password, passwords, requirements, two factor, two-factor, common passwords, remote login, logout, authentication',
     'security_help' => 'Two-factor, Password Restrictions',
-    'groups_keywords' => 'permissions, permission groups, authorization',
     'groups_help' => 'Account permission groups',
     'localization' => 'Localization',
     'localization_title' => 'Update Localization Settings',
-    'localization_keywords' => 'localization, currency, local, locale, time zone, timezone, international, internatinalization, language, languages, translation',
     'localization_help' => 'Language, date display',
     'notifications' => 'Notifications',
     'notifications_help' => 'Email Alerts & Audit Settings',
     'asset_tags_help' => 'Incrementing and prefixes',
     'labels' => 'Labels',
     'labels_title' => 'Update Label Settings',
-    'labels_help' => 'Label sizes &amp; settings',
-    'purge_keywords' => 'permanently delete',
+    'labels_help' => 'Barcodes &amp; label settings',
     'purge_help' => 'Purge Deleted Records',
     'ldap_extension_warning' => 'It does not look like the LDAP extension is installed or enabled on this server. You can still save your settings, but you will need to enable the LDAP extension for PHP before LDAP syncing or login will work.',
     'ldap_ad' => 'LDAP/AD',
+    'ldap_test_label' => 'Test LDAP Sync',
+    'ldap_test_login' => ' Test LDAP Login',
+    'ldap_username_placeholder' => 'LDAP Username',
+    'ldap_password_placeholder' => 'LDAP Password',
     'employee_number' => 'Employee Number',
     'create_admin_user' => 'Create a User ::',
     'create_admin_success' => 'Success! Your admin user has been added!',
@@ -342,6 +354,8 @@ return [
     'setup_migration_create_user' => 'Next: Create User',
     'ldap_settings_link' => 'LDAP Settings Page',
     'slack_test' => 'Test <i class="fab fa-slack"></i> Integration',
+    'status_label_name' => 'Status Label Name',
+    'super_admin_only'  => 'Super Admin Only',
     'label2_enable'           => 'New Label Engine',
     'label2_enable_help'      => 'Switch to the new label engine. <b>Note: You will need to save this setting before setting others.</b>',
     'label2_template'         => 'Template',
@@ -356,12 +370,15 @@ return [
     'label2_2d_type'          => '2D Barcode Type',
     'label2_2d_type_help'     => 'Format for 2D barcodes',
     'label2_2d_target'        => '2D Barcode Target',
-    'label2_2d_target_help'   => 'The URL the 2D barcode points to when scanned',
+    'label2_2d_target_help'   => 'The data that will be contained in the 2D barcode',
     'label2_fields'           => 'Field Definitions',
     'label2_fields_help'      => 'Fields can be added, removed, and reordered in the left column. For each field, multiple options for Label and DataSource can be added, removed, and reordered in the right column.',
+    'purge_barcodes' => 'Purge Barcodes',
     'help_asterisk_bold'    => 'Text entered as <code>**text**</code> will be displayed as bold',
     'help_blank_to_use'     => 'Leave blank to use the value from <code>:setting_name</code>',
     'help_default_will_use' => '<code>:default</code> will use the value from <code>:setting_name</code>. <br>Note that the value of the barcodes must comply with the respective barcode spec in order to be successfully generated. Please see <a href="https://snipe-it.readme.io/docs/barcodes">the documentation <i class="fa fa-external-link"></i></a> for more details. ',
+    'asset_id'              => 'Asset ID',
+    'data'               => 'Data',
     'default'               => 'Default',
     'none'                  => 'None',
     'google_callback_help' => 'This should be entered as the callback URL in your Google OAuth app settings in your organization&apos;s <strong><a href="https://console.cloud.google.com/" target="_blank">Google developer console <i class="fa fa-external-link" aria-hidden="true"></i></a></strong>.',
@@ -373,7 +390,100 @@ return [
     'database_driver' => 'Database Driver',
     'bs_table_storage' => 'Table Storage',
     'timezone' => 'Timezone',
+    'test_mail' => 'Test Mail',
     'profile_edit'          => 'Edit Profile',
     'profile_edit_help'          => 'Allow users to edit their own profiles.',
+    'default_avatar' => 'Custom Default Avatar',
+    'default_avatar_help' => 'This image will be displayed as a profile if a user does not have a profile photo.',
+    'restore_default_avatar' => 'Restore <a href=":default_avatar" data-toggle="lightbox" data-type="image">original system default avatar</a>',
+    'restore_default_avatar_help' => '',
+    'due_checkin_days' => 'Due For Checkin Warning',
+    'due_checkin_days_help' => 'How many days before the expected checkin of an asset should it be listed in the "Due for checkin" page?',
+    'no_groups' => 'No groups have been created yet. Visit <code>Admin Settings > Permission Groups</code> to add one.',
+    'text' => 'Text',
+
+    'username_formats' => [
+        'username_format'		=> 'Username Format',
+        'firstname_lastname_format'	=> 'First Name Last Name (jane.smith)',
+        'first_name_format'	        => 'First Name (jane)',
+        'last_name_format'		=> 'Last Name (doe)',
+        'filastname_format'			=> 'First Initial Last Name (jsmith)',
+        'lastnamefirstinitial_format' =>  'Last Name First Initial (smithj)',
+        'firstname_lastname_underscore_format' => 'First Name Last Name (jane_smith)',
+        'firstinitial.lastname' => 'First Initial Last Name (j.smith)',
+        'lastname_firstinitial' => 'Last Name First Initial (smith_j)',
+        'lastname_dot_firstinitial_format' => 'Last Name First Initial (smith.j)',
+        'firstnamelastname'     => 'First Name Last Name (janesmith)',
+        'firstnamelastinitial'  => 'First Name Last Initial (janes)',
+        'lastnamefirstname'      => 'Last Name.First Name (smith.jane)',
+    ],
+
+    'email_formats' => [
+        'email_format'			=> 'Email Format',
+        'firstname_lastname_format'	=> 'First Name Last Name (jane.smith@example.com)',
+        'first_name_format'		=> 'First Name (jane@example.com)',
+        'last_name_format'		=> 'Last Name (doe@example.com)',
+        'filastname_format'			=> 'First Initial Last Name (jsmith@example.com)',
+        'lastnamefirstinitial_format' =>  'Last Name First Initial (smithj@example.com)',
+        'firstname_lastname_underscore_format' => 'First Name Last Name (jane_smith@example.com)',
+        'firstinitial.lastname' => 'First Initial Last Name (j.smith@example.com)',
+        'lastname_firstinitial' => 'Last Name First Initial (smith_j@example.com)',
+        'lastname_dot_firstinitial_format' => 'Last Name First Initial (smith.j@example.com)',
+        'firstnamelastname'     => 'First Name Last Name (janesmith@example.com)',
+        'firstnamelastinitial'  => 'First Name Last Initial (janes@example.com)',
+        'lastnamefirstname'      => 'Last Name.First Name (smith.jane@example.com)',
+    ],
+
+
+
+    'logo_labels' => [
+        'acceptance_pdf_logo'       => 'PDF Logo',
+        'email_logo'                => 'Email Logo',
+        'label_logo'                => 'Label Logo',
+        'logo'                      => 'Site Logo',
+        'favicon'                   => 'Favicon',
+    ],
+
+    'logo_help' => [
+        'email_logo_size'       => 'Square logos in email look best. ',
+    ],
+
+    'logo_option_types' => [
+        'text' => 'Text',
+        'logo' => 'Logo',
+        'logo_and_text' => 'Logo and Text',
+    ],
+
+
+    'legends' => [
+        'scoping' => 'Scoping',
+        'formats' => 'Default Formats',
+        'profiles' => 'User Profiles',
+        'eula' => 'EULA & Acceptance Preferences',
+        'misc_display' => 'Miscellaneous Display Options',
+        'email' => 'Email Preferences',
+        'checkin' => 'Checkin Preferences',
+        'dashboard' => 'Login & Dashboard Preferences',
+        'misc' => 'Miscellaneous',
+        'logos' => 'Logos & Display',
+        'colors' => 'Colors & Skins',
+        'footer' => 'Footer Preferences',
+        'security' => 'Security Preferences',
+        'general' => 'General',
+        'intervals' => 'Intervals & Thresholds',
+    ],
+
+
+    /* Keywords for settings overview help */
+    'keywords' => [
+        'brand'             => 'footer, logo, print, theme, skin, header, colors, color, css',
+        'general_settings'  => 'company support, signature, acceptance, email format, username format, images, per page, thumbnail, eula, gravatar, tos, dashboard, privacy',
+        'groups'            => 'permissions, permission groups, authorization',
+        'labels'            => 'labels, barcodes, barcode, sheets, print, upc, qr, 1d, 2d',
+        'localization'      => 'localization, currency, local, locale, time zone, timezone, international, internatinalization, language, languages, translation',
+        'php_overview'      => 'phpinfo, system, info',
+        'purge'             => 'permanently delete',
+        'security'          => 'password, passwords, requirements, two factor, two-factor, common passwords, remote login, logout, authentication',
+    ],
 
 ];
diff --git a/resources/lang/chr-US/admin/settings/message.php b/resources/lang/chr-US/admin/settings/message.php
index c9b0f34217..58abf14c5c 100644
--- a/resources/lang/chr-US/admin/settings/message.php
+++ b/resources/lang/chr-US/admin/settings/message.php
@@ -14,6 +14,9 @@ return [
         'restore_warning'       => 'Yes, restore it. I acknowledge that this will overwrite any existing data currently in the database. This will also log out all of your existing users (including you).',
         'restore_confirm'       => 'Are you sure you wish to restore your database from :filename?'
     ],
+    'restore' => [
+        'success'               => 'Your system backup has been restored. Please log in again.'
+    ],
     'purge' => [
         'error'     => 'An error has occurred while purging. ',
         'validation_failed'     => 'Your purge confirmation is incorrect. Please type the word "DELETE" in the confirmation box.',
@@ -33,6 +36,9 @@ return [
         'testing_authentication' => 'Testing LDAP Authentication...',
         'authentication_success' => 'User authenticated against LDAP successfully!'
     ],
+    'labels' => [
+        'null_template' => 'Label template not found. Please select a template.',
+        ],
     'webhook' => [
         'sending' => 'Sending :app test message...',
         'success' => 'Your :webhook_name Integration works!',
@@ -42,5 +48,12 @@ return [
         'error' => 'Something went wrong. :app responded with: :error_message',
         'error_redirect' => 'ERROR: 301/302 :endpoint returns a redirect. For security reasons, we don’t follow redirects. Please use the actual endpoint.',
         'error_misc' => 'Something went wrong. :( ',
-    ]
+        'webhook_fail' => ' webhook notification failed: Check to make sure the URL is still valid.',
+        'webhook_channel_not_found' => ' webhook channel not found.',
+        'ms_teams_deprecation' => 'The selected Microsoft Teams webhook URL will be deprecated Dec 31st, 2025. Please use a workflow URL. Microsoft\'s documentation on creating a workflow can be found <a href="https://support.microsoft.com/en-us/office/create-incoming-webhooks-with-workflows-for-microsoft-teams-8ae491c7-0394-4861-ba59-055e33f75498" target="_blank"> here.</a>',
+    ],
+    'location_scoping' => [
+        'not_saved' => 'Your settings were not saved.',
+        'mismatch' => 'There is 1 item in the database that need your attention before you can enable location scoping.|There are :count items in the database that need your attention before you can enable location scoping.',
+    ],
 ];
diff --git a/resources/lang/chr-US/admin/statuslabels/table.php b/resources/lang/chr-US/admin/statuslabels/table.php
index 27befb5ef7..1a0fab891e 100644
--- a/resources/lang/chr-US/admin/statuslabels/table.php
+++ b/resources/lang/chr-US/admin/statuslabels/table.php
@@ -1,14 +1,14 @@
 <?php
 
 return array(
-    'about'      	=> 'About Status Labels',
+    'about'      	=> 'About Status Types',
     'archived'      	=> 'Archived',
     'create'      	=> 'Create Status Label',
     'color'      	=> 'Chart Color',
     'default_label' => 'Default Label',
     'default_label_help' => 'This is used to ensure your most commonly used status labels appear at the top of the select box when creating/editing assets.',
     'deployable'      	=> 'Deployable',
-    'info'      	=> 'Status labels are used to describe the various states your assets could be in. They may be out for repair, lost/stolen, etc. You can create new status labels for deployable, pending and archived assets.',
+    'info'      	=> 'Status label types are used to describe the various states your assets could be in. They may be out for repair, lost/stolen, etc. You can create new status labels for your deployable, pending and archived assets according to your own workflow. For more information, <a href="https://snipe-it.readme.io/docs/overview#status-labels" target="_blank">see the documentation <i class="fa fa-external-link"></i></a>.',
     'name'      	=> 'Status Name',
     'pending'      	=> 'Pending',
     'status_type'   => 'Status Type',
diff --git a/resources/lang/chr-US/admin/users/general.php b/resources/lang/chr-US/admin/users/general.php
index b097ccec69..14f36cf151 100644
--- a/resources/lang/chr-US/admin/users/general.php
+++ b/resources/lang/chr-US/admin/users/general.php
@@ -19,6 +19,8 @@ return [
     'print_assigned'    => 'Print All Assigned',
     'email_assigned'    => 'Email List of All Assigned',
     'user_notified'     => 'User has been emailed a list of their currently assigned items.',
+    'users_notified'    => 'The user has been emailed a list of their currently assigned items.|:count users have been emailed a list of their currently assigned items.',
+    'users_notified_warning' => ':count user has been emailed a list of their currently assigned items, however :no_email users did not have an email address so could not be emailed.|:count users have been emailed a list of their currently assigned items, however :no_email user(s) did not have an email address so could not be emailed.',
     'auto_assign_label' => 'Include this user when auto-assigning eligible licenses',
     'auto_assign_help'  => 'Skip this user in auto assignment of licenses',
     'software_user'     => 'Software Checked out to :name',
diff --git a/resources/lang/chr-US/admin/users/message.php b/resources/lang/chr-US/admin/users/message.php
index 4d014775bd..b6ddad3aac 100644
--- a/resources/lang/chr-US/admin/users/message.php
+++ b/resources/lang/chr-US/admin/users/message.php
@@ -6,7 +6,7 @@ return array(
     'declined'                  => 'You have successfully declined this asset.',
     'bulk_manager_warn'	        => 'Your users have been successfully updated, however your manager entry was not saved because the manager you selected was also in the user list to be edited, and users may not be their own manager. Please select your users again, excluding the manager.',
     'user_exists'               => 'User already exists!',
-    'user_not_found'            => 'User does not exist.',
+    'user_not_found'            => 'User does not exist or you do not have permission view them.',
     'user_login_required'       => 'The login field is required',
     'user_has_no_assets_assigned' => 'No assets currently assigned to user.',
     'user_password_required'    => 'The password is required.',
@@ -53,6 +53,7 @@ return array(
         'ldap_could_not_search' => 'Could not search the LDAP server. Please check your LDAP server configuration in the LDAP config file. <br>Error from LDAP Server:',
         'ldap_could_not_get_entries' => 'Could not get entries from the LDAP server. Please check your LDAP server configuration in the LDAP config file. <br>Error from LDAP Server:',
         'password_ldap' => 'The password for this account is managed by LDAP/Active Directory. Please contact your IT department to change your password. ',
+        'multi_company_items_assigned' => 'This user has items assigned that belong to a different company. Please check them in or edit their company.'
     ),
 
     'deletefile' => array(
diff --git a/resources/lang/chr-US/admin/users/table.php b/resources/lang/chr-US/admin/users/table.php
index 7c5fb2cad5..094cdbc412 100644
--- a/resources/lang/chr-US/admin/users/table.php
+++ b/resources/lang/chr-US/admin/users/table.php
@@ -22,7 +22,7 @@ return array(
     'managed_locations'     => 'Managed Locations',
     'managed_users'         => 'Managed Users',
     'name' 					=> 'Name',
-    'nogroup'               => 'No groups have been created yet. To add one, visit: ',
+    'nogroup'               => 'No groups have been created yet. To add one, visit:',
     'notes'                 => 'Notes',
     'password_confirm' 		=> 'Confirm Password',
     'password' 				=> 'Password',
diff --git a/resources/lang/chr-US/auth.php b/resources/lang/chr-US/auth.php
index db310aa1bb..14d8acfce0 100644
--- a/resources/lang/chr-US/auth.php
+++ b/resources/lang/chr-US/auth.php
@@ -15,6 +15,6 @@ return array(
 
     'failed' => 'These credentials do not match our records.',
     'password' => 'The provided password is incorrect.',
-    'throttle' => 'Too many login attempts. Please try again in :seconds seconds.',
+    'throttle' => 'Too many login attempts. Please try again in :minutes minute(s).',
 
 );
diff --git a/resources/lang/chr-US/auth/message.php b/resources/lang/chr-US/auth/message.php
index 588c9069ca..08f638d058 100644
--- a/resources/lang/chr-US/auth/message.php
+++ b/resources/lang/chr-US/auth/message.php
@@ -6,8 +6,6 @@ return array(
     'account_not_found'      => 'The username or password is incorrect.',
     'account_not_activated'  => 'This user account is not activated.',
     'account_suspended'      => 'This user account is suspended.',
-    'account_banned'         => 'This user account is banned.',
-    'throttle'               => 'Too many failed login attempts. Please try again in :minutes minutes.',
 
     'two_factor' => array(
         'already_enrolled'      => 'Your device is already enrolled.',
diff --git a/resources/lang/chr-US/button.php b/resources/lang/chr-US/button.php
index 22821b8157..8a838e8faf 100644
--- a/resources/lang/chr-US/button.php
+++ b/resources/lang/chr-US/button.php
@@ -7,6 +7,7 @@ return [
     'checkin_and_delete'  	    => 'Checkin All / Delete User',
     'delete'  	                => 'Delete',
     'edit'    	                => 'Edit',
+    'clone'    	                => 'Clone',
     'restore' 	                => 'Restore',
     'remove'                    => 'Remove',
     'request'                   => 'Request',
@@ -21,4 +22,13 @@ return [
     'add_maintenance'           => 'Add Maintenance',
     'append'                    => 'Append',
     'new'                       => 'New',
+    'var' => [
+        'clone'     => 'Clone :item_type',
+        'edit'      => 'Edit :item_type',
+        'delete'    => 'Delete :item_type',
+        'restore'   => 'Restore :item_type',
+        'create'    => 'Create New :item_type',
+        'checkout'  => 'Checkout :item_type',
+        'checkin'   => 'Checkin :item_type',
+    ]
 ];
diff --git a/resources/lang/chr-US/general.php b/resources/lang/chr-US/general.php
index 5b1d0e9b3c..d2e16aafbb 100644
--- a/resources/lang/chr-US/general.php
+++ b/resources/lang/chr-US/general.php
@@ -10,7 +10,7 @@ return [
     'action'                => 'Action',
     'activity_report'		=> 'Activity Report',
     'address'				=> 'Address',
-    'admin'					=> 'Admin',
+    'admin'					=> 'Admin Settings',
     'admin_tooltip'			=> 'This user has admin privileges',
     'superuser'				=> 'Superuser',
     'superuser_tooltip'		=> 'This user has superuser privileges',
@@ -23,13 +23,16 @@ return [
     'asset_models'			=> 'Asset Models',
     'asset_model'			=> 'Model',
     'asset'					=> 'Asset',
+    'asset_previous'        => 'Asset (Previously Assigned)',
     'asset_report'          => 'Asset Report',
     'asset_tag'				=> 'Asset Tag',
     'asset_tags'            => 'Asset Tags',
     'assets_available'		=> 'Assets available',
     'accept_assets'         => 'Accept Assets :name',
     'accept_assets_menu'    => 'Accept Assets',
+    'accept_item'           => 'Accept Item',
     'audit'				    => 'Audit',
+    'audits'				=> 'Audits',
     'audit_report'			=> 'Audit Log',
     'assets'				=> 'Assets',
     'assets_audited'        => 'assets audited',
@@ -61,9 +64,12 @@ return [
     'changepassword'  		=> 'Change Password',
     'checkin'  				=> 'Checkin',
     'checkin_from'  		=> 'Checkin from',
+    'checkin_note'  		=> 'Checkin Note',
+    'checkout_note'  		=> 'Checkout Note',
     'checkout'  			=> 'Checkout',
     'checkouts_count'       => 'Checkouts',
     'checkins_count'        => 'Checkins',
+    'checkin_and_delete'  	=> 'Checkin and Delete',
     'user_requests_count'   => 'Requests',
     'city'  				=> 'City',
     'click_here'			=> 'Click here',
@@ -77,7 +83,7 @@ return [
     'consumables'			=> 'Consumables',
     'country'  				=> 'Country',
     'could_not_restore'     => 'Error restoring :item_type: :error',
-    'not_deleted'           => 'The :item_type is not deleted so it cannot be restored',
+    'not_deleted'           => 'The :item_type was not deleted and therefore cannot be restored',
     'create'				=> 'Create New',
     'created'               => 'Item Created',
     'created_asset'			=> 'created asset',
@@ -86,11 +92,13 @@ return [
     'record_created' 		=> 'Record Created',
     'updated_at' 			=> 'Updated at',
     'currency'  			=> '$', // this is deprecated
+    'currency_text'  		=> 'Currency', //
     'current'  				=> 'Current',
     'current_password'      => 'Current Password',
     'customize_report'      => 'Customize Report',
     'custom_report'         => 'Custom Asset Report',
     'dashboard'				=> 'Dashboard',
+    'data_source'           => 'Data Source',
     'days'      			=> 'days',
     'days_to_next_audit'    => 'Days to Next Audit',
     'date'					=> 'Date',
@@ -98,7 +106,7 @@ return [
     'debug_warning_text'    => 'This application is running in production mode with debugging enabled. This can expose sensitive data if your application is accessible to the outside world. Disable debug mode by setting the <code>APP_DEBUG</code> value in your <code>.env</code> file to <code>false</code>.',
     'delete'  				=> 'Delete',
     'delete_confirm'  		=> 'Are you sure you wish to delete :item?',
-    'delete_confirm_no_undo' => 'Are you sure you wish to delete :item? This can not be undone.',
+    'delete_confirm_no_undo' => 'Are you sure, you wish to delete :item? This cannot be undone.',
     'deleted'  				=> 'Deleted',
     'delete_seats'  		=> 'Deleted Seats',
     'deletion_failed'       => 'Deletion failed',
@@ -114,29 +122,13 @@ return [
     'editprofile'  			=> 'Edit Your Profile',
     'eol'					=> 'EOL',
     'email_domain'			=> 'Email Domain',
-    'email_format'			=> 'Email Format',
     'employee_number'       => 'Employee Number',
     'email_domain_help'		=> 'This is used to generate email addresses when importing',
     'error'				    => 'Error',
     'exclude_archived'      => 'Exclude Archived Assets',
     'exclude_deleted'       => 'Exclude Deleted Assets',
     'example'				=> 'Example: ',
-    'filastname_format'			=> 'First Initial Last Name (jsmith@example.com)',
-    'firstname_lastname_format'	=> 'First Name Last Name (jane.smith@example.com)',
-    'firstname_lastname_underscore_format' => 'First Name Last Name (jane_smith@example.com)',
-    'lastnamefirstinitial_format' =>  'Last Name First Initial (smithj@example.com)',
-    'firstintial_dot_lastname_format' => 'First Initial Last Name (j.smith@example.com)',
-    'firstname_lastname_display'	=> 'First Name Last Name (Jane Smith)',
-    'lastname_firstname_display'	=> 'Last Name First Name (Smith Jane)',
-    'name_display_format'	=> 'Name Display Format',
-    'first'					=> 'First',
-    'firstnamelastname'     => 'First Name Last Name (janesmith@example.com)',
-    'lastname_firstinitial' => 'Last Name First Initial (smith_j@example.com)',
-    'firstinitial.lastname' => 'First Initial Last Name (j.smith@example.com)',
-    'firstnamelastinitial'  => 'First Name Last Initial (janes@example.com)',
-    'lastnamefirstname'      => 'Last Name First Name (smith.jane@example.com)',
-    'first_name'			=> 'First Name',
-    'first_name_format'		=> 'First Name (jane@example.com)',
+
     'files'                 => 'Files',
     'file_name'				=> 'File',
     'file_type'             => 'File Type',
@@ -156,9 +148,9 @@ return [
     'image_delete'         	=> 'Delete Image',
     'include_deleted'       => 'Include Deleted Assets',
     'image_upload'         	=> 'Upload Image',
-    'filetypes_accepted_help'    => 'Accepted filetype is :types. Max upload size allowed is :size.|Accepted filetypes are :types. Max upload size allowed is :size.',
-    'filetypes_size_help'   => 'Max upload size allowed is :size.',
-    'image_filetypes_help'  => 'Accepted filetypes are jpg, webp, png, gif, svg, and avif. Max upload size allowed is :size.',
+    'filetypes_accepted_help'    => 'Accepted filetype is :types. The maximum size allowed is :size.|Accepted filetypes are :types. The maximum upload size allowed is :size.',
+    'filetypes_size_help'   => 'The maximum upload size allowed is :size.',
+    'image_filetypes_help'  => 'Accepted Filetypes are jpg, webp, png, gif, svg, and avif. The maximum upload size allowed is :size.',
     'unaccepted_image_type'  => 'This image file was not readable. Accepted filetypes are jpg, webp, png, gif, and svg. The mimetype of this file is: :mimetype.',
     'import'         	    => 'Import',
     'import_this_file'      => 'Map fields and process this file',
@@ -178,12 +170,17 @@ return [
     'last'					=> 'Last',
     'last_login'            => 'Last Login',
     'last_name'             => 'Last Name',
+    'firstname_lastname_display'	=> 'First Name Last Name (Jane Smith)',
+    'lastname_firstname_display'	=> 'Last Name First Name (Smith Jane)',
+    'name_display_format'	=> 'Name Display Format',
+    'first'					=> 'First',
+    'first_name'			=> 'First Name',
     'license'				=> 'License',
     'license_report'        => 'License Report',
     'licenses_available'	=> 'Licenses available',
     'licenses'				=> 'Licenses',
     'list_all'				=> 'List All',
-    'loading'				=> 'Loading... please wait....',
+    'loading'				=> 'Loading... please wait...',
     'lock_passwords'        => 'This field value will not be saved in a demo installation.',
     'feature_disabled'      => 'This feature has been disabled for the demo installation.',
     'location'              => 'Location',
@@ -193,7 +190,7 @@ return [
     'logout'				=> 'Logout',
     'lookup_by_tag'     => 'Lookup by Asset Tag',
     'maintenances'          => 'Maintenances',
-    'manage_api_keys'       => 'Manage API Keys',
+    'manage_api_keys'       => 'Manage API keys',
     'manufacturer'			=> 'Manufacturer',
     'manufacturers'			=> 'Manufacturers',
     'markdown'				=> 'This field allows <a href="https://help.github.com/articles/github-flavored-markdown/">Github flavored markdown</a>.',
@@ -215,6 +212,14 @@ return [
     'no_results'			=> 'No Results.',
     'no'  					=> 'No',
     'notes'  				=> 'Notes',
+    'note_added'            => 'Note Added',
+    'options'				=> 'Options',
+    'preview'				=> 'Preview',
+    'add_note'              => 'Add Note',
+    'note_edited'            => 'Note Edited',
+    'edit_note'              => 'Edit Note',
+    'note_deleted'            => 'Note Deleted',
+    'delete_note'              => 'Delete Note',
     'order_number'          => 'Order Number',
     'only_deleted'          => 'Only Deleted Assets',
     'page_menu'				=> 'Showing _MENU_ items',
@@ -229,7 +234,7 @@ return [
     'purchase_date'         => 'Purchase Date',
     'qty'		            => 'QTY',
     'quantity'		        => 'Quantity',
-    'quantity_minimum'      => 'You have :count items below or almost below minimum quantity levels',
+    'quantity_minimum'      => 'You have one item below or almost below minimum quantity levels|You have :count items below or almost below minimum quantity levels',
     'quickscan_checkin'  	=> 'Quick Scan Checkin',
     'quickscan_checkin_status'  	=> 'Checkin Status',
     'ready_to_deploy'		=> 'Ready to Deploy',
@@ -254,7 +259,7 @@ return [
     'select_all'            => 'Select All',
     'search'				=> 'Search',
     'select_category'       => 'Select a Category',
-    'select_datasource' => 'Select a Datasource',
+    'select_datasource' => 'Select a data source',
     'select_department'     => 'Select a Department',
     'select_depreciation'	=> 'Select a Depreciation Type',
     'select_location'		=> 'Select a Location',
@@ -274,13 +279,15 @@ return [
     'signed_off_by'         => 'Signed Off By',
     'skin'       			=> 'Skin',
     'webhook_msg_note'        => 'A notification will be sent via webhook',
-    'webhook_test_msg'        => 'Oh hai! Looks like your :app integration with Snipe-IT is working!',
+    'webhook_test_msg'        => 'Oh hai! It looks like your :app integration with Snipe-IT is working!',
     'some_features_disabled' => 'DEMO MODE: Some features are disabled for this installation.',
     'site_name'				=> 'Site Name',
     'state'  				=> 'State',
     'status_labels'			=> 'Status Labels',
+    'status_label'			=> 'Status Label',
     'status'    			=> 'Status',
     'accept_eula'           => 'Acceptance Agreement',
+    'show_or_hide_eulas' => 'Show/Hide EULAs',
     'supplier'              => 'Supplier',
     'suppliers'  			=> 'Suppliers',
     'sure_to_delete'        => 'Are you sure you wish to delete',
@@ -296,9 +303,9 @@ return [
     'type'  				=> 'Type',
     'undeployable'			=> 'Un-deployable',
     'unknown_admin'			=> 'Unknown Admin',
-    'username_format'		=> 'Username Format',
     'username'              => 'Username',
     'update'                => 'Update',
+    'updating_item' => 'Updating :item',
     'upload_filetypes_help'      => 'Allowed filetypes are png, gif, jpg, jpeg, doc, docx, pdf, xls, xlsx, txt, lic, xml, zip, rtf and rar. Max upload size allowed is :size.',
     'uploaded'              => 'Uploaded',
     'user'					=> 'User',
@@ -323,10 +330,10 @@ return [
     'token_expired'         => 'Your form session has expired. Please try again.',
     'login_enabled'         => 'Login Enabled',
     'audit_due'             => 'Due for Audit',
-    'audit_due_days'        => 'Assets Due for Audit Within :days Day|Assets Due for Audit Within :days Days',
+    'audit_due_days'        => '{}Assets Due or Overdue for Audit|[1]Assets Due or Overdue for Audit Within a Day|[2,*]Assets Due or Overdue for Audit Within :days Days',
     'checkin_due'           => 'Due for Checkin',
     'checkin_overdue'       => 'Overdue for Checkin',
-    'checkin_due_days'      => 'Assets Due for Checkin Within :days Day|Assets Due for Checkin Within :days Days',
+    'checkin_due_days'      => '{}Due for Checkin|[1]Assets Due for Checkin Within :days Day|[2,*]Assets Due for Checkin Within :days Days',
     'audit_overdue'         => 'Overdue for Audit',
     'accept'                => 'Accept :asset',
     'i_accept'              => 'I accept',
@@ -339,16 +346,16 @@ return [
     'view_all'              => 'view all',
     'hide_deleted'          => 'Hide Deleted',
     'email'                 => 'Email',
-    'do_not_change'         => 'Do Not Change',
-    'bug_report'            => 'Report a Bug',
+    'do_not_change'         => 'Do not change',
+    'bug_report'            => 'Report a bug',
     'user_manual'           => 'User\'s Manual',
     'setup_step_1'          => 'Step 1',
     'setup_step_2'          => 'Step 2',
     'setup_step_3'          => 'Step 3',
     'setup_step_4'          => 'Step 4',
     'setup_config_check'    => 'Configuration Check',
-    'setup_create_database' => 'Create Database Tables',
-    'setup_create_admin'    => 'Create Admin User',
+    'setup_create_database' => 'Create database tables',
+    'setup_create_admin'    => 'Create an admin user',
     'setup_done'            => 'Finished!',
     'bulk_edit_about_to'    => 'You are about to edit the following: ',
     'checked_out'           => 'Checked Out',
@@ -383,6 +390,8 @@ return [
     'new_license'           => 'New License',
     'new_accessory'         => 'New Accessory',
     'new_consumable'        => 'New Consumable',
+    'new_component'         => 'New Component',
+    'new_user'              => 'New User',
     'collapse'              => 'Collapse',
     'assigned'              => 'Assigned',
     'asset_count'           => 'Asset Count',
@@ -418,19 +427,20 @@ return [
     'bulk_soft_delete'      =>'Also soft-delete these users. Their asset history will remain intact unless/until you purge deleted records in the Admin Settings.',
     'bulk_checkin_delete_success' => 'Your selected users have been deleted and their items have been checked in.',
     'bulk_checkin_success' => 'The items for the selected users have been checked in.',
-    'set_to_null'           => 'Delete values for this asset|Delete values for all :asset_count assets ',
+    'set_to_null'           => 'Delete values for this selection|Delete values for all :selection_count selections ',
     'set_users_field_to_null'  => 'Delete :field values for this user|Delete :field values for all :user_count users ',
     'na_no_purchase_date'   => 'N/A - No purchase date provided',
     'assets_by_status'      => 'Assets by Status',
     'assets_by_status_type'      => 'Assets by Status Type',
     'pie_chart_type'        => 'Dashboard Pie Chart Type',
     'hello_name'            => 'Hello, :name!',
-    'unaccepted_profile_warning'   => 'You have :count items requiring acceptance. Click here to accept or decline them',
+    'unaccepted_profile_warning'   => 'You have one item requiring acceptance. Click here to accept or decline it | You have :count items requiring acceptance. Click here to accept or decline them',
     'start_date'            => 'Start Date',
     'end_date'            => 'End Date',
     'alt_uploaded_image_thumbnail' => 'Uploaded thumbnail',
     'placeholder_kit'       => 'Select a kit',
     'file_not_found'        => 'File not found',
+    'log_record_not_found'  => 'No record for that log entry was found.',
     'preview_not_available' => '(no preview)',
     'setup'                 => 'Setup',
     'pre_flight'            => 'Pre-Flight',
@@ -512,7 +522,7 @@ return [
     'checked_out_to_fields' => 'Checked Out To Fields',
     'percent_complete' => '% complete',
     'uploading' => 'Uploading... ',
-    'upload_error' => 'Error uploading file. Please check that there are no empty rows and that no column names are duplicated.',
+    'upload_error' => 'Error uploading file. Please check that you have no empty rows or duplicated column names in your CSV, and that the server permissions allow uploads.',
     'copy_to_clipboard' => 'Copy to Clipboard',
     'copied' => 'Copied!',
     'status_compatibility' => 'If assets are already assigned, they cannot be changed to a non-deployable status type and this value change will be skipped.',
@@ -549,6 +559,71 @@ return [
         'license_seats'  => ':count License Seat|:count License Seats',
         'consumables'  => ':count Consumable|:count Consumables',
         'components'  => ':count Component|:count Components',
-    ]
+    ],
+
+    'more_info' => 'More Info',
+    'quickscan_bulk_help' => 'Checking this box will edit the asset record to reflect this new location. Leaving it unchecked will simply note the location in the audit log. Note that if this asset is checked out, it will not change the location of the person, asset or location it is checked out to.',
+    'whoops' => 'Whoops!',
+    'something_went_wrong' => 'Something went wrong with your request.',
+    'close' => 'Close',
+    'expires' => 'Expires',
+    'map_fields'=> 'Map :item_type Fields',
+    'remaining_var' => ':count Remaining',
+    'label' => 'Label',
+    'import_asset_tag_exists' => 'An asset with the asset tag :asset_tag already exists and an update was not requested. No change was made.',
+    'countries_manually_entered_help' => 'Values with an asterisk (*) were manually entered and do not match existing ISO 3166 dropdown values',
+    'accessories_assigned' => 'Assigned Accessories',
+    'user_managed_passwords' => 'Password Management',
+    'user_managed_passwords_disallow' => 'Disallow users from managing their own passwords',
+    'user_managed_passwords_allow' => 'Allow users to manage their own passwords',
+    'from' => 'From',
+    'by' => 'By',
+
+// Add form placeholders here
+    'placeholders' => [
+        'notes'  => 'Add a note',
+    ],
+
+    'breadcrumb_button_actions' => [
+        'edit_item' => 'Edit :name',
+        'checkout_item' => 'Checkout :name',
+        'checkin_item' => 'Checkin :name',
+    ],
+
+    'skins' => [
+        'site_default' => 'Site Default',
+        'default_blue' => 'Default Blue',
+        'blue_dark' => 'Blue (Dark Mode)',
+        'green' => 'Green Dark',
+        'green_dark' => 'Green (Dark Mode)',
+        'red' => 'Red Dark',
+        'red_dark' => 'Red (Dark Mode)',
+        'orange' => 'Orange Dark',
+        'orange_dark' => 'Orange (Dark Mode)',
+        'black' => 'Black',
+        'black_dark' => 'Black (Dark Mode)',
+        'purple' => 'Purple',
+        'purple_dark' => 'Purple (Dark Mode)',
+        'yellow' => 'Yellow',
+        'yellow_dark' => 'Yellow (Dark Mode)',
+        'high_contrast' => 'High Contrast',
+
+    ],
+
+    'select_all_none' => 'Select/Unselect All',
+    'generic_model_not_found' => 'That :model was not found or you do not have permission to access it',
+    'deleted_models' => 'Deleted Asset Models',
+    'deleted_users' => 'Deleted Users',
+    'cost_each' => ':amount each',
+    'remove_current_image' => 'Remove current :type image',
+
+    'seeding' => [
+        'manufacturers' => [
+            'button' => 'Create Manufacturers',
+            'prompt' => 'You do not have any manufacturers yet. Would you like to seed a list of common manufacturers? (THIS WILL OVERWRITE EXISTING MANUFACTURERS, including those that have been soft-deleted.)',
+            'success' => 'Manufacturers seeded successfully',
+            'error' => 'Could not seed manufacturers. A manufacturer record already exists and seeding would overwrite it.|Could not seed manufacturers. :count manufacturer records already exist and seeding would overwrite them.',
+        ],
+    ],
 
 ];
diff --git a/resources/lang/chr-US/localizations.php b/resources/lang/chr-US/localizations.php
index f1232dd138..827ed4fca1 100644
--- a/resources/lang/chr-US/localizations.php
+++ b/resources/lang/chr-US/localizations.php
@@ -2,7 +2,7 @@
 
 return [
 
-    'select_language' => 'Select a language',
+    'select_language' => 'Select a Language',
     'languages' => [
         'en-US'=> 'English, US',
         'en-GB'=> 'English, UK',
@@ -40,7 +40,9 @@ return [
         'ms-MY'=> 'Malay',
         'mi-NZ'=> 'Maori',
         'mn-MN'=> 'Mongolian',
-        'no-NO'=> 'Norwegian',
+        'nb-NO'=> 'Norwegian Bokmål',
+        'om-ET' => 'Oromo (Ethiopian)',
+        //'nn-NO'=> 'Norwegian Nynorsk',
         'fa-IR'=> 'Persian',
         'pl-PL'=> 'Polish',
         'pt-PT'=> 'Portuguese',
@@ -66,7 +68,7 @@ return [
         'zu-ZA'=> 'Zulu',
     ],
 
-    'select_country' => 'Select a country',
+    'select_country' => 'Select a Country',
     
     'countries' => [
         'AC'=>'Ascension Island',
@@ -133,6 +135,7 @@ return [
         'EC'=>'Ecuador',
         'EE'=>'Estonia',
         'EG'=>'Egypt',
+        'GB-ENG'=>'England',
         'ER'=>'Eritrea',
         'ES'=>'Spain',
         'ET'=>'Ethiopia',
@@ -231,6 +234,7 @@ return [
         'NG'=>'Nigeria',
         'NI'=>'Nicaragua',
         'NL'=>'Netherlands',
+        'GB-NIR' => 'Northern Ireland',
         'NO'=>'Norway',
         'NP'=>'Nepal',
         'NR'=>'Nauru',
@@ -258,7 +262,7 @@ return [
         'RU'=>'Russian Federation',
         'RW'=>'Rwanda',
         'SA'=>'Saudi Arabia',
-        'UK'=>'Scotland',
+        'GB-SCT'=>'Scotland',
         'SB'=>'Solomon Islands',
         'SC'=>'Seychelles',
         'SS'=>'South Sudan',
@@ -310,6 +314,7 @@ return [
         'VI'=>'Virgin Islands (U.S.)',
         'VN'=>'Viet Nam',
         'VU'=>'Vanuatu',
+        'GB-WLS' =>'Wales',
         'WF'=>'Wallis And Futuna Islands',
         'WS'=>'Samoa',
         'YE'=>'Yemen',
diff --git a/resources/lang/chr-US/mail.php b/resources/lang/chr-US/mail.php
index 759ff0f5e8..797f735a2b 100644
--- a/resources/lang/chr-US/mail.php
+++ b/resources/lang/chr-US/mail.php
@@ -23,24 +23,25 @@ return [
     'Item_Requested' => 'Item Requested',
     'License_Checkin_Notification' => 'License checked in',
     'License_Checkout_Notification' => 'License checked out',
+    'license_for'   => 'License for',
     'Low_Inventory_Report' => 'Low Inventory Report',
     'a_user_canceled' => 'A user has canceled an item request on the website',
     'a_user_requested' => 'A user has requested an item on the website',
     'acceptance_asset_accepted' => 'A user has accepted an item',
     'acceptance_asset_declined' => 'A user has declined an item',
-    'accessory_name' => 'Accessory Name:',
-    'additional_notes' => 'Additional Notes:',
+    'accessory_name' => 'Accessory Name',
+    'additional_notes' => 'Additional Notes',
     'admin_has_created' => 'An administrator has created an account for you on the :web website.',
-    'asset' => 'Asset:',
-    'asset_name' => 'Asset Name:',
+    'asset' => 'Asset',
+    'asset_name' => 'Asset Name',
     'asset_requested' => 'Asset requested',
     'asset_tag' => 'Asset Tag',
     'assets_warrantee_alert' => 'There is :count asset with a warranty expiring in the next :threshold days.|There are :count assets with warranties expiring in the next :threshold days.',
     'assigned_to' => 'Assigned To',
     'best_regards' => 'Best regards,',
-    'canceled' => 'Canceled:',
-    'checkin_date' => 'Checkin Date:',
-    'checkout_date' => 'Checkout Date:',
+    'canceled' => 'Canceled',
+    'checkin_date' => 'Checkin Date',
+    'checkout_date' => 'Checkout Date',
     'checkedout_from' => 'Checked out from',
     'checkedin_from'  => 'Checked in from',
     'checked_into' => 'Checked into',
@@ -49,27 +50,30 @@ return [
     'click_to_confirm' => 'Please click on the following link to confirm your :web account:',
     'current_QTY' => 'Current QTY',
     'days' => 'Days',
-    'expecting_checkin_date' => 'Expected Checkin Date:',
+    'expecting_checkin_date' => 'Expected Checkin Date',
     'expires' => 'Expires',
     'hello' => 'Hello',
     'hi' => 'Hi',
     'i_have_read' => 'I have read and agree to the terms of use, and have received this item.',
     'inventory_report' => 'Inventory Report',
-    'item' => 'Item:',
+    'item' => 'Item',
+    'item_checked_reminder' => 'This is a reminder that you currently have :count items checked out to you that you have not accepted or declined. Please click the link below to confirm your decision.',
     'license_expiring_alert' => 'There is :count license expiring in the next :threshold days.|There are :count licenses expiring in the next :threshold days.',
     'link_to_update_password' => 'Please click on the following link to update your :web password:',
-    'login' => 'Login:',
+    'login' => 'Login',
     'login_first_admin' => 'Login to your new Snipe-IT installation using the credentials below:',
     'low_inventory_alert' => 'There is :count item that is below minimum inventory or will soon be low.|There are :count items that are below minimum inventory or will soon be low.',
     'min_QTY' => 'Min QTY',
     'name' => 'Name',
     'new_item_checked' => 'A new item has been checked out under your name, details are below.',
+    'new_item_checked_with_acceptance' => 'A new item has been checked out under your name that requires acceptance, details are below.',
+    'recent_item_checked' => 'An item was recently checked out under your name that requires acceptance, details are below.',
     'notes' => 'Notes',
-    'password' => 'Password:',
+    'password' => 'Password',
     'password_reset' => 'Password Reset',
     'read_the_terms' => 'Please read the terms of use below.',
     'read_the_terms_and_click' => 'Please read the terms of use below, and click on the link at the bottom to confirm that you read and agree to the terms of use, and have received the asset.',
-    'requested' => 'Requested:',
+    'requested' => 'Requested',
     'reset_link' => 'Your Password Reset Link',
     'reset_password' => 'Click here to reset your password:',
     'rights_reserved' => 'All rights reserved.',
@@ -86,8 +90,10 @@ return [
     'upcoming-audits' => 'There is :count asset that is coming up for audit within :threshold days.|There are :count assets that are coming up for audit within :threshold days.',
     'user' => 'User',
     'username' => 'Username',
+    'unaccepted_asset_reminder' => 'Reminder: You have Unaccepted Assets.',
     'welcome' => 'Welcome :name',
     'welcome_to' => 'Welcome to :web!',
     'your_assets' => 'View Your Assets',
     'your_credentials' => 'Your Snipe-IT credentials',
+    'mail_sent' => 'Mail sent successfully!',
 ];
diff --git a/resources/lang/chr-US/validation.php b/resources/lang/chr-US/validation.php
index 05374e23af..99c847f589 100644
--- a/resources/lang/chr-US/validation.php
+++ b/resources/lang/chr-US/validation.php
@@ -13,87 +13,150 @@ return [
     |
     */
 
-    'accepted'             => 'The :attribute must be accepted.',
-    'active_url'           => 'The :attribute is not a valid URL.',
-    'after'                => 'The :attribute must be a date after :date.',
-    'after_or_equal'       => 'The :attribute must be a date after or equal to :date.',
-    'alpha'                => 'The :attribute may only contain letters.',
-    'alpha_dash'           => 'The :attribute may only contain letters, numbers, and dashes.',
-    'alpha_num'            => 'The :attribute may only contain letters and numbers.',
-    'array'                => 'The :attribute must be an array.',
-    'before'               => 'The :attribute must be a date before :date.',
-    'before_or_equal'      => 'The :attribute must be a date before or equal to :date.',
-    'between'              => [
-        'numeric' => 'The :attribute must be between :min - :max.',
-        'file'    => 'The :attribute must be between :min - :max kilobytes.',
-        'string'  => 'The :attribute must be between :min - :max characters.',
-        'array'   => 'The :attribute must have between :min and :max items.',
+    'accepted' => 'The :attribute field must be accepted.',
+    'accepted_if' => 'The :attribute field must be accepted when :other is :value.',
+    'active_url' => 'The :attribute field must be a valid URL.',
+    'after' => 'The :attribute field must be a date after :date.',
+    'after_or_equal' => 'The :attribute field must be a date after or equal to :date.',
+    'alpha' => 'The :attribute field must only contain letters.',
+    'alpha_dash' => 'The :attribute field must only contain letters, numbers, dashes, and underscores.',
+    'alpha_num' => 'The :attribute field must only contain letters and numbers.',
+    'array' => 'The :attribute field must be an array.',
+    'ascii' => 'The :attribute field must only contain single-byte alphanumeric characters and symbols.',
+    'before' => 'The :attribute field must be a date before :date.',
+    'before_or_equal' => 'The :attribute field must be a date before or equal to :date.',
+    'between' => [
+        'array' => 'The :attribute field must have between :min and :max items.',
+        'file' => 'The :attribute field must be between :min and :max kilobytes.',
+        'numeric' => 'The :attribute field must be between :min and :max.',
+        'string' => 'The :attribute field must be between :min and :max characters.',
     ],
-    'boolean'              => 'The :attribute must be true or false.',
-    'confirmed'            => 'The :attribute confirmation does not match.',
-    'date'                 => 'The :attribute is not a valid date.',
-    'date_format'          => 'The :attribute does not match the format :format.',
-    'different'            => 'The :attribute and :other must be different.',
-    'digits'               => 'The :attribute must be :digits digits.',
-    'digits_between'       => 'The :attribute must be between :min and :max digits.',
-    'dimensions'           => 'The :attribute has invalid image dimensions.',
-    'distinct'             => 'The :attribute field has a duplicate value.',
-    'email'                => 'The :attribute format is invalid.',
-    'exists'               => 'The selected :attribute is invalid.',
-    'file'                 => 'The :attribute must be a file.',
-    'filled'               => 'The :attribute field must have a value.',
-    'image'                => 'The :attribute must be an image.',
+    'boolean' => 'The :attribute field must be true or false.',
+    'can' => 'The :attribute field contains an unauthorized value.',
+    'confirmed' => 'The :attribute field confirmation does not match.',
+    'contains' => 'The :attribute field is missing a required value.',
+    'current_password' => 'The password is incorrect.',
+    'date' => 'The :attribute field must be a valid date.',
+    'date_equals' => 'The :attribute field must be a date equal to :date.',
+    'date_format' => 'The :attribute field must match the format :format.',
+    'decimal' => 'The :attribute field must have :decimal decimal places.',
+    'declined' => 'The :attribute field must be declined.',
+    'declined_if' => 'The :attribute field must be declined when :other is :value.',
+    'different' => 'The :attribute field and :other must be different.',
+    'digits' => 'The :attribute field must be :digits digits.',
+    'digits_between' => 'The :attribute field must be between :min and :max digits.',
+    'dimensions' => 'The :attribute field has invalid image dimensions.',
+    'distinct' => 'The :attribute field has a duplicate value.',
+    'doesnt_end_with' => 'The :attribute field must not end with one of the following: :values.',
+    'doesnt_start_with' => 'The :attribute field must not start with one of the following: :values.',
+    'email' => 'The :attribute field must be a valid email address.',
+    'ends_with' => 'The :attribute field must end with one of the following: :values.',
+    'enum' => 'The selected :attribute is invalid.',
+    'exists' => 'The selected :attribute is invalid.',
+    'extensions' => 'The :attribute field must have one of the following extensions: :values.',
+    'file' => 'The :attribute field must be a file.',
+    'filled' => 'The :attribute field must have a value.',
+    'gt' => [
+        'array' => 'The :attribute field must have more than :value items.',
+        'file' => 'The :attribute field must be greater than :value kilobytes.',
+        'numeric' => 'The :attribute field must be greater than :value.',
+        'string' => 'The :attribute field must be greater than :value characters.',
+    ],
+    'gte' => [
+        'array' => 'The :attribute field must have :value items or more.',
+        'file' => 'The :attribute field must be greater than or equal to :value kilobytes.',
+        'numeric' => 'The :attribute field must be greater than or equal to :value.',
+        'string' => 'The :attribute field must be greater than or equal to :value characters.',
+    ],
+    'hex_color' => 'The :attribute field must be a valid hexadecimal color.',
+    'image' => 'The :attribute field must be an image.',
     'import_field_empty'    => 'The value for :fieldname cannot be null.',
-    'in'                   => 'The selected :attribute is invalid.',
-    'in_array'             => 'The :attribute field does not exist in :other.',
-    'integer'              => 'The :attribute must be an integer.',
-    'ip'                   => 'The :attribute must be a valid IP address.',
-    'ipv4'                 => 'The :attribute must be a valid IPv4 address.',
-    'ipv6'                 => 'The :attribute must be a valid IPv6 address.',
-    'is_unique_department' => 'The :attribute must be unique to this Company Location',
-    'json'                 => 'The :attribute must be a valid JSON string.',
-    'max'                  => [
-        'numeric' => 'The :attribute may not be greater than :max.',
-        'file'    => 'The :attribute may not be greater than :max kilobytes.',
-        'string'  => 'The :attribute may not be greater than :max characters.',
-        'array'   => 'The :attribute may not have more than :max items.',
+    'in' => 'The selected :attribute is invalid.',
+    'in_array' => 'The :attribute field must exist in :other.',
+    'integer' => 'The :attribute field must be an integer.',
+    'ip' => 'The :attribute field must be a valid IP address.',
+    'ipv4' => 'The :attribute field must be a valid IPv4 address.',
+    'ipv6' => 'The :attribute field must be a valid IPv6 address.',
+    'json' => 'The :attribute field must be a valid JSON string.',
+    'list' => 'The :attribute field must be a list.',
+    'lowercase' => 'The :attribute field must be lowercase.',
+    'lt' => [
+        'array' => 'The :attribute field must have less than :value items.',
+        'file' => 'The :attribute field must be less than :value kilobytes.',
+        'numeric' => 'The :attribute field must be less than :value.',
+        'string' => 'The :attribute field must be less than :value characters.',
     ],
-    'mimes'                => 'The :attribute must be a file of type: :values.',
-    'mimetypes'            => 'The :attribute must be a file of type: :values.',
-    'min'                  => [
-        'numeric' => 'The :attribute must be at least :min.',
-        'file'    => 'The :attribute must be at least :min kilobytes.',
-        'string'  => 'The :attribute must be at least :min characters.',
-        'array'   => 'The :attribute must have at least :min items.',
+    'lte' => [
+        'array' => 'The :attribute field must not have more than :value items.',
+        'file' => 'The :attribute field must be less than or equal to :value kilobytes.',
+        'numeric' => 'The :attribute field must be less than or equal to :value.',
+        'string' => 'The :attribute field must be less than or equal to :value characters.',
     ],
-    'starts_with'          => 'The :attribute must start with one of the following: :values.',
-    'ends_with'            => 'The :attribute must end with one of the following: :values.',
+    'mac_address' => 'The :attribute field must be a valid MAC address.',
+    'max' => [
+        'array' => 'The :attribute field must not have more than :max items.',
+        'file' => 'The :attribute field must not be greater than :max kilobytes.',
+        'numeric' => 'The :attribute field must not be greater than :max.',
+        'string' => 'The :attribute field must not be greater than :max characters.',
+    ],
+    'max_digits' => 'The :attribute field must not have more than :max digits.',
+    'mimes' => 'The :attribute field must be a file of type: :values.',
+    'mimetypes' => 'The :attribute field must be a file of type: :values.',
+    'min' => [
+        'array' => 'The :attribute field must have at least :min items.',
+        'file' => 'The :attribute field must be at least :min kilobytes.',
+        'numeric' => 'The :attribute field must be at least :min.',
+        'string' => 'The :attribute field must be at least :min characters.',
+    ],
+    'min_digits' => 'The :attribute field must have at least :min digits.',
+    'missing' => 'The :attribute field must be missing.',
+    'missing_if' => 'The :attribute field must be missing when :other is :value.',
+    'missing_unless' => 'The :attribute field must be missing unless :other is :value.',
+    'missing_with' => 'The :attribute field must be missing when :values is present.',
+    'missing_with_all' => 'The :attribute field must be missing when :values are present.',
+    'multiple_of' => 'The :attribute field must be a multiple of :value.',
+    'not_in' => 'The selected :attribute is invalid.',
+    'not_regex' => 'The :attribute field format is invalid.',
+    'numeric' => 'The :attribute field must be a number.',
+    'password' => [
+        'letters' => 'The :attribute field must contain at least one letter.',
+        'mixed' => 'The :attribute field must contain at least one uppercase and one lowercase letter.',
+        'numbers' => 'The :attribute field must contain at least one number.',
+        'symbols' => 'The :attribute field must contain at least one symbol.',
+        'uncompromised' => 'The given :attribute has appeared in a data leak. Please choose a different :attribute.',
+    ],
+    'percent'       => 'The depreciation minimum must be between 0 and 100 when depreciation type is percentage.',
 
-    'not_in'               => 'The selected :attribute is invalid.',
-    'numeric'              => 'The :attribute must be a number.',
-    'present'              => 'The :attribute field must be present.',
-    'valid_regex'          => 'That is not a valid regex. ',
-    'regex'                => 'The :attribute format is invalid.',
-    'required'             => 'The :attribute field is required.',
-    'required_if'          => 'The :attribute field is required when :other is :value.',
-    'required_unless'      => 'The :attribute field is required unless :other is in :values.',
-    'required_with'        => 'The :attribute field is required when :values is present.',
-    'required_with_all'    => 'The :attribute field is required when :values is present.',
-    'required_without'     => 'The :attribute field is required when :values is not present.',
+    'present' => 'The :attribute field must be present.',
+    'present_if' => 'The :attribute field must be present when :other is :value.',
+    'present_unless' => 'The :attribute field must be present unless :other is :value.',
+    'present_with' => 'The :attribute field must be present when :values is present.',
+    'present_with_all' => 'The :attribute field must be present when :values are present.',
+    'prohibited' => 'The :attribute field is prohibited.',
+    'prohibited_if' => 'The :attribute field is prohibited when :other is :value.',
+    'prohibited_unless' => 'The :attribute field is prohibited unless :other is in :values.',
+    'prohibits' => 'The :attribute field prohibits :other from being present.',
+    'regex' => 'The :attribute field format is invalid.',
+    'required' => 'The :attribute field is required.',
+    'required_array_keys' => 'The :attribute field must contain entries for: :values.',
+    'required_if' => 'The :attribute field is required when :other is :value.',
+    'required_if_accepted' => 'The :attribute field is required when :other is accepted.',
+    'required_if_declined' => 'The :attribute field is required when :other is declined.',
+    'required_unless' => 'The :attribute field is required unless :other is in :values.',
+    'required_with' => 'The :attribute field is required when :values is present.',
+    'required_with_all' => 'The :attribute field is required when :values are present.',
+    'required_without' => 'The :attribute field is required when :values is not present.',
     'required_without_all' => 'The :attribute field is required when none of :values are present.',
-    'same'                 => 'The :attribute and :other must match.',
-    'size'                 => [
-        'numeric' => 'The :attribute must be :size.',
-        'file'    => 'The :attribute must be :size kilobytes.',
-        'string'  => 'The :attribute must be :size characters.',
-        'array'   => 'The :attribute must contain :size items.',
+    'same' => 'The :attribute field must match :other.',
+    'size' => [
+        'array' => 'The :attribute field must contain :size items.',
+        'file' => 'The :attribute field must be :size kilobytes.',
+        'numeric' => 'The :attribute field must be :size.',
+        'string' => 'The :attribute field must be :size characters.',
     ],
+    'starts_with' => 'The :attribute field must start with one of the following: :values.',
     'string'               => 'The :attribute must be a string.',
-    'timezone'             => 'The :attribute must be a valid zone.',
     'two_column_unique_undeleted' => 'The :attribute must be unique across :table1 and :table2. ',
-    'unique'               => 'The :attribute has already been taken.',
-    'uploaded'             => 'The :attribute failed to upload.',
-    'url'                  => 'The :attribute format is invalid.',
     'unique_undeleted'     => 'The :attribute must be unique.',
     'non_circular'         => 'The :attribute must not create a circular reference.',
     'not_array'            => ':attribute cannot be an array.',
@@ -102,11 +165,14 @@ return [
     'numbers'              => 'Password must contain at least one number.',
     'case_diff'            => 'Password must use mixed case.',
     'symbols'              => 'Password must contain symbols.',
-    'gte'                  => [
-        'numeric'          => 'Value cannot be negative'
-    ],
-    'checkboxes'           => ':attribute contains invalid options.',
-    'radio_buttons'        => ':attribute is invalid.',
+    'timezone' => 'The :attribute field must be a valid timezone.',
+    'unique' => 'The :attribute has already been taken.',
+    'uploaded' => 'The :attribute failed to upload.',
+    'uppercase' => 'The :attribute field must be uppercase.',
+    'url' => 'The :attribute field must be a valid URL.',
+    'ulid' => 'The :attribute field must be a valid ULID.',
+    'uuid' => 'The :attribute field must be a valid UUID.',
+    'fmcs_location' => 'Full multiple company support and location scoping is enabled in the Admin Settings, and the selected location and selected company are not compatible.',
 
 
     /*
@@ -120,16 +186,22 @@ return [
     |
     */
 
+    'email_array'      => 'One or more email addresses is invalid.',
+    'checkboxes'           => ':attribute contains invalid options.',
+    'radio_buttons'        => ':attribute is invalid.',
+    
     'custom' => [
         'alpha_space' => 'The :attribute field contains a character that is not allowed.',
-        'email_array'      => 'One or more email addresses is invalid.',
+
         'hashed_pass'      => 'Your current password is incorrect',
         'dumbpwd'          => 'That password is too common.',
         'statuslabel_type' => 'You must select a valid status label type',
+        'custom_field_not_found'          => 'This field does not seem to exist, please double check your custom field names.',
+        'custom_field_not_found_on_model' => 'This field seems to exist, but is not available on this Asset Model\'s fieldset.',
 
         // date_format validation with slightly less stupid messages. It duplicates a lot, but it gets the job done :(
-        // We use this because the default error message for date_format is reflects php Y-m-d, which non-PHP
-        // people won't know how to format. 
+        // We use this because the default error message for date_format reflects php Y-m-d, which non-PHP
+        // people won't know how to format.
         'purchase_date.date_format'     => 'The :attribute must be a valid date in YYYY-MM-DD format',
         'last_audit_date.date_format'   =>  'The :attribute must be a valid date in YYYY-MM-DD hh:mm:ss format',
         'expiration_date.date_format'   =>  'The :attribute must be a valid date in YYYY-MM-DD format',
@@ -137,9 +209,15 @@ return [
         'expected_checkin.date_format'  =>  'The :attribute must be a valid date in YYYY-MM-DD format',
         'start_date.date_format'        =>  'The :attribute must be a valid date in YYYY-MM-DD format',
         'end_date.date_format'          =>  'The :attribute must be a valid date in YYYY-MM-DD format',
+        'invalid_value_in_field' => 'Invalid value included in this field',
 
-    ],
+        'ldap_username_field' => [
+            'not_in' =>         '<code>sAMAccountName</code> (mixed case) will likely not work. You should use <code>samaccountname</code> (lowercase) instead.'
+        ],
+        'ldap_auth_filter_query' => ['not_in' => '<code>uid=samaccountname</code> is probably not a valid auth filter. You probably want <code>uid=</code> '],
+        'ldap_filter' => ['regex' => 'This value should probably not be wrapped in parentheses.'],
 
+        ],
     /*
     |--------------------------------------------------------------------------
     | Custom Validation Attributes
@@ -155,8 +233,16 @@ return [
 
     /*
     |--------------------------------------------------------------------------
-    | Generic Validation Messages
+    | Generic Validation Messages - we use these in the jquery validation where we don't have
+    | access to the :attribute
     |--------------------------------------------------------------------------
     */
-    'invalid_value_in_field' => 'Invalid value included in this field',
+
+    'generic' => [
+        'invalid_value_in_field' => 'Invalid value included in this field',
+        'required' => 'This field is required',
+        'email' => 'Please enter a valid email address',
+    ],
+
+
 ];
diff --git a/resources/lang/cs-CZ/account/general.php b/resources/lang/cs-CZ/account/general.php
index 6099bc7bde..889b0a4889 100644
--- a/resources/lang/cs-CZ/account/general.php
+++ b/resources/lang/cs-CZ/account/general.php
@@ -2,10 +2,16 @@
 
 return array(
     'personal_api_keys' => 'Osobní API klíče',
-    'api_key_warning' => 'When generating an API token, be sure to copy it down immediately as they will not be visible to you again.',
+    'personal_access_token' => 'Osobní přístupový token',
+    'personal_api_keys_success' => 'Osobní API klíč :key byl úspěšně vytvořen',
+    'here_is_api_key' => 'Zde je váš nový osobní přístupový token. Toto je jediná chvíle, kdy bude zobrazen, takže si jej prosím uložte! Nyní můžete použít tento token k vytvoření API požadavků.',
+    'api_key_warning' => 'Při generování tokenu API se ujistěte, že jej ihned okopírujete, nebude znovu k zobrazení.',
     'api_base_url' => 'Základní adresa API je umístěna na:',
     'api_base_url_endpoint' => '/&lt;endpoint&gt;',
     'api_token_expiration_time' => 'API tokeny vyprší:',
     'api_reference' => 'Please check the <a href="https://snipe-it.readme.io/reference" target="_blank">API reference</a> to find specific API endpoints and additional API documentation.',
-    'profile_updated' => 'Account successfully updated',
+    'profile_updated' => 'Účet úspěšně aktualizován',
+    'no_tokens' => 'Nevytvořili jste žádné osobní přístupové tokeny.',
+    'enable_sounds' => 'Povolit zvukové efekty',
+    'enable_confetti' => 'Povolit efekty confetti',
 );
diff --git a/resources/lang/cs-CZ/admin/accessories/message.php b/resources/lang/cs-CZ/admin/accessories/message.php
index 08d8fd6b04..a02285b777 100644
--- a/resources/lang/cs-CZ/admin/accessories/message.php
+++ b/resources/lang/cs-CZ/admin/accessories/message.php
@@ -26,7 +26,12 @@ return array(
         'error'   		=> 'Příslušenství nebylo převzato, zkuste to znovu',
         'success' 		=> 'Příslušenství úspěšně předáno.',
         'unavailable'   => 'Příslušenství nelze vydat. Zkontrolujte skladové zásoby.',
-        'user_does_not_exist' => 'Neplatný uživatel. Zkuste to znovu.'
+        'user_does_not_exist' => 'Neplatný uživatel. Zkuste to znovu.',
+         'checkout_qty' => array(
+            'lte'  => 'V současné době je k dispozici pouze jeden doplněk tohoto příslušenství a snažíte se vydat :checkout_qty. Upravte prosím množství k výdeji nebo celkový počet dostupných doplňků a zkuste to znovu.
+K dispozici je celkem :number_currently_remaining doplňků, přičemž se pokoušíte vydat :checkout_qty. Upravte prosím množství k výdeji nebo celkový počet a zkuste to znovu.',
+            ),
+           
     ),
 
     'checkin' => array(
diff --git a/resources/lang/cs-CZ/admin/accessories/table.php b/resources/lang/cs-CZ/admin/accessories/table.php
index f2773f3e88..56aa7368c3 100644
--- a/resources/lang/cs-CZ/admin/accessories/table.php
+++ b/resources/lang/cs-CZ/admin/accessories/table.php
@@ -6,6 +6,4 @@ return array(
     'id'      					=> 'ID',
     'require_acceptance'      	=> 'Přijetí',
     'title'      				=> 'Název příslušenství',
-
-
 );
diff --git a/resources/lang/cs-CZ/admin/components/message.php b/resources/lang/cs-CZ/admin/components/message.php
index 54bccc49f5..87b7da0af7 100644
--- a/resources/lang/cs-CZ/admin/components/message.php
+++ b/resources/lang/cs-CZ/admin/components/message.php
@@ -17,7 +17,8 @@ return array(
     'delete' => array(
         'confirm'   => 'Opravdu si přejete odstranit tento díl?',
         'error'   => 'Nepodařilo se díl odstranit. Zkuste to prosím později.',
-        'success' => 'Díl byl v pořádku odstraněn.'
+        'success' => 'Díl byl v pořádku odstraněn.',
+        'error_qty'   => 'Některé komponenty tohoto typu jsou stále vydané. Nejprve je prosím vraťte a poté akci opakujte.',
     ),
 
      'checkout' => array(
diff --git a/resources/lang/cs-CZ/admin/consumables/general.php b/resources/lang/cs-CZ/admin/consumables/general.php
index ea4ce1c3d1..e6a5da0663 100644
--- a/resources/lang/cs-CZ/admin/consumables/general.php
+++ b/resources/lang/cs-CZ/admin/consumables/general.php
@@ -8,4 +8,5 @@ return array(
     'remaining' 			            => 'Zbývá',
     'total' 			                => 'Celkem',
     'update'                            => 'Upravit sp. materiál',
+    'inventory_warning'                 => 'Zásoba tohoto spotřebního materiálu klesla pod minimální hodnotu :min_count',
 );
diff --git a/resources/lang/cs-CZ/admin/consumables/message.php b/resources/lang/cs-CZ/admin/consumables/message.php
index 6d775d09f6..a3770250e6 100644
--- a/resources/lang/cs-CZ/admin/consumables/message.php
+++ b/resources/lang/cs-CZ/admin/consumables/message.php
@@ -2,6 +2,7 @@
 
 return array(
 
+    'invalid_category_type' => 'The category must be a consumable category.',
     'does_not_exist' => 'Spotřební materiál nebyl nalezen.',
 
     'create' => array(
diff --git a/resources/lang/cs-CZ/admin/custom_fields/general.php b/resources/lang/cs-CZ/admin/custom_fields/general.php
index 0d1cc3f2a2..474faa4d15 100644
--- a/resources/lang/cs-CZ/admin/custom_fields/general.php
+++ b/resources/lang/cs-CZ/admin/custom_fields/general.php
@@ -35,7 +35,7 @@ return [
     'create_field_title' => 'Vytvořít vlastní fieldset',
     'value_encrypted'      	        => 'Hodnota tohoto pole je zašifrována v databázi. Pouze administrátoři budou moci zobrazit dešifrovanou hodnotu',
     'show_in_email'     => 'Zahrnout hodnotu této kolonky do e-mailu o vyskladnění pro uživatele? Šifrované kolonky nemohou být součástí e-mailů',
-    'show_in_email_short'     => 'Zahrnout do e-mailů.',
+    'show_in_email_short' => 'Zahrnout do e-mailů',
     'help_text' => 'Text nápovědy',
     'help_text_description' => 'Toto je volitelný text, který se zobrazí pod formulářovými prvky při úpravách aktiva pro poskytnutí kontextu v poli.',
     'about_custom_fields_title' => 'O vlastních polích',
@@ -57,5 +57,8 @@ return [
     'show_in_requestable_list_short' => 'Zobrazit v seznamu požadovaných položek',
     'show_in_requestable_list' => 'Zobrazit hodnotu v seznamu požadovaných aktiv. Šifrovaná pole nebudou zobrazena',
     'encrypted_options' => 'Toto pole je šifrované, takže některé možnosti zobrazení nebudou k dispozici.',
+    'display_checkin' => 'Display in checkin forms',
+    'display_checkout' => 'Display in checkout forms',
+    'display_audit' => 'Display in audit forms',
 
 ];
diff --git a/resources/lang/cs-CZ/admin/custom_fields/message.php b/resources/lang/cs-CZ/admin/custom_fields/message.php
index a924d7a19e..5115cd1279 100644
--- a/resources/lang/cs-CZ/admin/custom_fields/message.php
+++ b/resources/lang/cs-CZ/admin/custom_fields/message.php
@@ -5,6 +5,7 @@ return array(
     'field' => array(
         'invalid'   => 'Takové pole neexistuje.',
         'already_added'   => 'Takové pole již existuje',
+        'none_selected'   => 'No field selected',
 
         'create' => array(
             'error'   => 'Pole se nepodařilo přidat, pokuste se o to znovu.',
diff --git a/resources/lang/cs-CZ/admin/depreciations/general.php b/resources/lang/cs-CZ/admin/depreciations/general.php
index 8eff5ad873..72f8928655 100644
--- a/resources/lang/cs-CZ/admin/depreciations/general.php
+++ b/resources/lang/cs-CZ/admin/depreciations/general.php
@@ -13,4 +13,8 @@ return [
     'no_depreciations_warning'               => '<strong>Upozornění: </strong>
                       V současné době nemáte nastavené žádné odpisy.
                       Prosím nastavte alespoň jedno odpisování pro zobrazení zprávy o odpisu.',
+    'depreciation_method'                   => 'Report zastarání',
+    'linear_depreciation'                   => 'Linear (Default)',
+    'half_1'                                => 'Half-year convention, always applied',
+    'half_2'                                => 'Half-year convention, applied with condition',
 ];
diff --git a/resources/lang/cs-CZ/admin/hardware/form.php b/resources/lang/cs-CZ/admin/hardware/form.php
index 842bfe4a69..ae6bffdbdf 100644
--- a/resources/lang/cs-CZ/admin/hardware/form.php
+++ b/resources/lang/cs-CZ/admin/hardware/form.php
@@ -55,8 +55,11 @@ return [
     'asset_location_update_default' => 'Aktualizovat pouze výchozí umístění',
     'asset_location_update_actual' => 'Aktualizovat pouze skutečnou polohu',
     'asset_not_deployable' => 'Tento majetek nelze vyskladnit.',
-    'asset_deployable' => 'Tento majetek lze vyskladnit.',
+    'asset_not_deployable_checkin' => 'That asset status is not deployable. Using this status label will checkin the asset.',
+    'asset_deployable' => 'This asset can be checked out.',
     'processing_spinner' => 'Zpracovávání... (S velkými soubory to může chvíli trvat)',
+    'processing' => 'Zpracovává se... ',
     'optional_infos'  => 'Volitelné informace',
-    'order_details'   => 'Informace související s objednávkou'
+    'order_details'   => 'Informace související s objednávkou',
+    'calc_eol'    => 'If nulling the EOL date, use automatic EOL calculation based on the purchase date and EOL rate.',
 ];
diff --git a/resources/lang/cs-CZ/admin/hardware/general.php b/resources/lang/cs-CZ/admin/hardware/general.php
index 78e00f5d31..e49e2db79c 100644
--- a/resources/lang/cs-CZ/admin/hardware/general.php
+++ b/resources/lang/cs-CZ/admin/hardware/general.php
@@ -5,8 +5,8 @@ return [
     'about_assets_text'            => 'Majetky jsou položky sledované sériovým číslem nebo značkou. Mají tendenci mít vyšší hodnotou, tam kde je důležitá identifikace určité položky.',
     'archived'  				=> 'Archivováno',
     'asset'  					=> 'Majetek',
-    'bulk_checkout'             => 'Vyskladnit majetek',
-    'bulk_checkin'              => 'Převzít majetek',
+    'bulk_checkout'             => 'Hromadný výdej',
+    'bulk_checkin'              => 'Bulk Checkin',
     'checkin'  					=> 'Převzít majetek',
     'checkout'  				=> 'Pokladní majetek',
     'clone'  					=> 'Klonovat majetek',
@@ -27,8 +27,7 @@ return [
     'undeployable_tooltip'  	=> 'Tento majetek je ve stavu, který neumožňuje nasazení, a nemůže tak být vydán.',
     'view'  					=> 'Zobrazit majetek',
     'csv_error' => 'Máte chybu v souboru CSV:',
-    'import_text' => '<p>Nahrajte CSV, který obsahuje historii aktiv. Aktiva a uživatelé MUSÍ již v systému existovat, nebo budou přeskočeni. Odpovídající aktiva pro import historie se odehrávají proti značce majetku. Pokusíme se najít odpovídající uživatele na základě jména uživatele, které zadáte, a kritérií, která vyberete níže. Pokud nevyberete žádná kritéria níže, se jednoduše pokusí shodnout se ve formátu uživatelského jména, který jste nakonfigurovali v <code>Admin &gt; Obecné nastavení</code>.</p><p>Pole zahrnutá do CSV musí odpovídat hlavičkám: <strong>Štítek majetku, jméno, datum platby, datum platby</strong>. Všechna další pole budou ignorována. </p><p>Datum zaškrtnutí: prázdná nebo budoucí data zaškrtnutí zaškrtněte položky pro přidruženého uživatele. S výjimkou sloupce Datum zaškrtnutí vytvoří datum zaškrtnutí s datumem.</p>
-    ',
+    'import_text' => '<p>Upload a CSV that contains asset history. The assets and users MUST already exist in the system, or they will be skipped. Matching assets for history import happens against the asset tag. We will try to find a matching user based on the user\'s name you provide, and the criteria you select below. If you do not select any criteria below, it will simply try to match on the username format you configured in the <code>Admin &gt; General Settings</code>.</p><p>Fields included in the CSV must match the headers: <strong>Asset Tag, Name, Checkout Date, Checkin Date</strong>. Any additional fields will be ignored. </p><p>Checkin Date: blank or future checkin dates will checkout items to associated user.  Excluding the Checkin Date column will create a checkin date with todays date.</p>    ',
     'csv_import_match_f-l' => 'Pokuste se porovnat uživatele podle formátu <strong>firstname.lastname</strong> (<code>jane.smith</code>)',
     'csv_import_match_initial_last' => 'Pokuste se porovnat uživatele podle formátu <strong>první počáteční příjmení</strong> (<code>jsmith</code>)',
     'csv_import_match_first' => 'Zkuste porovnat uživatele podle formátu <strong>křestního jména</strong> (<code>jane</code>)',
diff --git a/resources/lang/cs-CZ/admin/hardware/message.php b/resources/lang/cs-CZ/admin/hardware/message.php
index 653f60fbfd..75ffb1f7a6 100644
--- a/resources/lang/cs-CZ/admin/hardware/message.php
+++ b/resources/lang/cs-CZ/admin/hardware/message.php
@@ -2,19 +2,23 @@
 
 return [
 
-    'undeployable' 		=> '<strong>Varování:</strong> Toto zařízení bylo označeno jako momentálně nepřiřaditelné.
-                        Pokud se na jeho stavu něco změnilo, upravte jej.',
-    'does_not_exist' 	=> 'Majetek nenalezen.',
-    'does_not_exist_var'=> 'Asset with tag :asset_tag not found.',
-    'no_tag' 	        => 'No asset tag provided.',
+    'undeployable' 		 => '<strong>Warning: </strong> This asset has been marked as currently undeployable. If this status has changed, please update the asset status.',
+    'does_not_exist' 	 => 'Majetek nenalezen.',
+    'does_not_exist_var' => 'Asset with tag :asset_tag not found.',
+    'no_tag' 	         => 'No asset tag provided.',
     'does_not_exist_or_not_requestable' => 'Tento majetek neexistuje nebo jej nelze vyskladnit.',
-    'assoc_users'	 	=> 'Majetek je předán svému uživateli a nelze jej odstranit. Před odstraněním jej nejprve převezměte. ',
+    'assoc_users'	 	 => 'Majetek je předán svému uživateli a nelze jej odstranit. Před odstraněním jej nejprve převezměte. ',
     'warning_audit_date_mismatch' 	=> 'This asset\'s next audit date (:next_audit_date) is before the last audit date (:last_audit_date). Please update the next audit date.',
+    'labels_generated'   => 'Labels were successfully generated.',
+    'error_generating_labels' => 'Error while generating labels.',
+    'no_assets_selected' => 'No assets selected.',
 
     'create' => [
         'error'   		=> 'Majetek se nepodařilo vytvořit, zkuste to prosím znovu.',
         'success' 		=> 'Majetek byl v pořádku vytvořen.',
         'success_linked' => 'Asset with tag :tag was created successfully. <strong><a href=":link" style="color: white;">Click here to view</a></strong>.',
+        'multi_success_linked' => 'Asset with tag :links was created successfully.|:count assets were created succesfully. :links.',
+        'partial_failure' => 'An asset was unable to be created. Reason: :failures|:count assets were unable to be created. Reasons: :failures',
     ],
 
     'update' => [
@@ -52,20 +56,24 @@ return [
     ],
 
     'import' => [
+        'import_button'         => 'Process Import',
         'error'                 => 'Některé položky nebyly správně importovány.',
         'errorDetail'           => 'Následující položky nebyly importovány kvůli chybám.',
         'success'               => 'Váš soubor byl importován',
         'file_delete_success'   => 'Váš soubor byl úspěšně odstraněn',
         'file_delete_error'      => 'Soubor nelze odstranit',
         'file_missing' => 'Vybraný soubor chybí',
+        'file_already_deleted' => 'The file selected was already deleted',
         'header_row_has_malformed_characters' => 'Jeden nebo více sloupců obsahuje v záhlaví poškozené UTF-8 znaky',
         'content_row_has_malformed_characters' => 'Jedna nebo více hodnot v prvním řádku obsahu obsahuje poškozené UTF-8 znaky',
+        'transliterate_failure' => 'Transliteration from :encoding to UTF-8 failed due to invalid characters in input'
     ],
 
 
     'delete' => [
         'confirm'   	=> 'Opravdu si přejete tento majetek odstranit?',
         'error'   		=> 'Nepodařilo se nám tento majetek odstranit. Zkuste to prosím znovu.',
+        'assigned_to_error' => '{1}Asset Tag: :asset_tag is currently checked out. Check in this device before deletion.|[2,*]Asset Tags: :asset_tag are currently checked out. Check in these devices before deletion.',
         'nothing_updated'   => 'Žádný majetek nebyl vybrán, takže nic nebylo odstraněno.',
         'success' 		=> 'Majetek byl úspěšně smazán.',
     ],
@@ -78,6 +86,11 @@ return [
         'no_assets_selected' => 'Je třeba vybrat ze seznamu alespoň jeden majetek',
     ],
 
+    'multi-checkout' => [
+        'error'   => 'Asset was not checked out, please try again|Assets were not checked out, please try again',
+        'success' => 'Asset checked out successfully.|Assets checked out successfully.',
+    ],
+
     'checkin' => [
         'error'   		=> 'Majetek nebyl převzat. Zkuste to prosím znovu',
         'success' 		=> 'Majetek byl v pořádku převzat.',
@@ -87,9 +100,10 @@ return [
     ],
 
     'requests' => [
-        'error'   		=> 'Majetek nebyl vyžádán, zkuste to prosím znovu',
-        'success' 		=> 'Vyžádání majetku proběhlo v pořádku.',
-        'canceled'      => 'Požadavek na výdej byl úspěšně zrušen',
+        'error'   		=> 'Request was not successful, please try again.',
+        'success' 		=> 'Request successfully submitted.',
+        'canceled'      => 'Request successfully canceled.',
+        'cancel'        => 'Zrušit tuto žádost o položku',
     ],
 
 ];
diff --git a/resources/lang/cs-CZ/admin/hardware/table.php b/resources/lang/cs-CZ/admin/hardware/table.php
index 656865afcc..b60fb035c9 100644
--- a/resources/lang/cs-CZ/admin/hardware/table.php
+++ b/resources/lang/cs-CZ/admin/hardware/table.php
@@ -25,7 +25,6 @@ return [
     'image'		    => 'Obrázek zařízení',
     'days_without_acceptance' => 'Dní bez schválení',
     'monthly_depreciation' => 'Měsíční odpisy',
-    'assigned_to'    => 'Přiděleno',
     'requesting_user' => 'Požaduje uživatel',
     'requested_date' => 'Požadované datum',
     'changed'       => 'Upraveno',
diff --git a/resources/lang/cs-CZ/admin/kits/general.php b/resources/lang/cs-CZ/admin/kits/general.php
index 1f1bfd0dfe..e06cb105df 100644
--- a/resources/lang/cs-CZ/admin/kits/general.php
+++ b/resources/lang/cs-CZ/admin/kits/general.php
@@ -47,4 +47,5 @@ return [
     'kit_deleted'                       => 'Sada byla úspěšně smazána',
     'kit_model_updated'                 => 'Model byl úspěšně aktualizován',
     'kit_model_detached'                => 'Model byl úspěšně odpojen',
+    'model_already_attached'            => 'Model already attached to kit',
 ];
diff --git a/resources/lang/cs-CZ/admin/licenses/general.php b/resources/lang/cs-CZ/admin/licenses/general.php
index 2a617221e8..9ef84a0c0a 100644
--- a/resources/lang/cs-CZ/admin/licenses/general.php
+++ b/resources/lang/cs-CZ/admin/licenses/general.php
@@ -14,6 +14,7 @@ return array(
     'info'  					=> 'Informace o licenci',
     'license_seats'  			=> 'Počet licencí',
     'seat'  					=> 'Licence',
+    'seat_count'  				=> 'Seat :count',
     'seats'  					=> 'Počet licencí',
     'software_licenses'  		=> 'Softwarové licence',
     'user'  					=> 'Uživatel',
@@ -23,12 +24,12 @@ return array(
         [
             'checkin_all'           => [
                 'button'            => 'Hromadně převzít všechny licence',
-                'modal'             => 'Tímto převezmete jednu licenci. | Tímto převezmete všech :checkedout_seats_count licencí.',
+                'modal'             => 'This action will checkin one seat. | This action will checkin all :checkedout_seats_count seats for this license.',
                 'enabled_tooltip'   => 'Převzít všechny licence vydané jak uživatelům, tak i zařízením',
                 'disabled_tooltip'  => 'To nelze provést, neboť není vydaná žádná licence',
                 'disabled_tooltip_reassignable'  => 'Toto je zakázáno, protože licence není znovu přiřazitelná',
                 'success'           => 'Lincece úspěšně převzata! | Licence úspěšně převzaty!',
-                'log_msg'           => 'Převzato pomocí hromadného zpracování licencí',
+                'log_msg'           => 'Checked in via bulk license checkin in license GUI',
             ],
 
             'checkout_all'              => [
diff --git a/resources/lang/cs-CZ/admin/licenses/message.php b/resources/lang/cs-CZ/admin/licenses/message.php
index 3fddef6b9d..a5e31faa16 100644
--- a/resources/lang/cs-CZ/admin/licenses/message.php
+++ b/resources/lang/cs-CZ/admin/licenses/message.php
@@ -44,10 +44,13 @@ return array(
         'error'   => 'Vyskytl se problém při výdeji licence. Zkuste to znovu prosím.',
         'success' => 'Licence byla úspěšně vydána',
         'not_enough_seats' => 'Není k dispozici dostatek licenčních míst pro pokladnu',
+        'mismatch' => 'The license seat provided does not match the license',
+        'unavailable' => 'This seat is not available for checkout.',
     ),
 
     'checkin' => array(
         'error'   => 'Vyskytl se problém při ověřování licence. Zkuste to znovu prosím.',
+        'not_reassignable' => 'License not reassignable',
         'success' => 'Licence byla úspěšně zkontrolována'
     ),
 
diff --git a/resources/lang/cs-CZ/admin/locations/message.php b/resources/lang/cs-CZ/admin/locations/message.php
index bbcfcec389..06745adbec 100644
--- a/resources/lang/cs-CZ/admin/locations/message.php
+++ b/resources/lang/cs-CZ/admin/locations/message.php
@@ -3,11 +3,12 @@
 return array(
 
     'does_not_exist' => 'Místo neexistuje.',
-    'assoc_users'    => 'This location is not currently deletable because it is the location of record for at least one asset or user, has assets assigned to it, or is the parent location of another location. Please update your models to no longer reference this company and try again. ',
+    'assoc_users'    => 'This location is not currently deletable because it is the location of record for at least one asset or user, has assets assigned to it, or is the parent location of another location. Please update your records to no longer reference this location and try again ',
     'assoc_assets'	 => 'Toto umístění je spojeno s alespoň jedním majetkem a nemůže být smazáno. Aktualizujte majetky tak aby nenáleželi k tomuto umístění a zkuste to znovu. ',
     'assoc_child_loc'	 => 'Toto umístění je nadřazené alespoň jednomu umístění a nelze jej smazat. Aktualizujte své umístění tak, aby na toto umístění již neodkazovalo a zkuste to znovu. ',
     'assigned_assets' => 'Přiřazený majetek',
     'current_location' => 'Současné umístění',
+    'open_map' => 'Open in :map_provider_icon Maps',
 
 
     'create' => array(
@@ -20,6 +21,11 @@ return array(
         'success' => 'Místo úspěšně aktualizováno.'
     ),
 
+    'restore' => array(
+        'error'   => 'Location was not restored, please try again',
+        'success' => 'Location restored successfully.'
+    ),
+
     'delete' => array(
         'confirm'   	=> 'Opravdu si želáte vymazat tohle místo na trvalo?',
         'error'   => 'Vyskytl se problém při mazání místa. Zkuste to znovu prosím.',
diff --git a/resources/lang/cs-CZ/admin/locations/table.php b/resources/lang/cs-CZ/admin/locations/table.php
index d0ffed7d96..3c029fe581 100644
--- a/resources/lang/cs-CZ/admin/locations/table.php
+++ b/resources/lang/cs-CZ/admin/locations/table.php
@@ -39,4 +39,5 @@ return [
     'signed_by_finance_auditor' => 'Podepsáno (Finanční auditor):',
     'signed_by_location_manager' => 'Podepsáno (Manager):',
     'signed_by'                 => 'Odepsal:',
+    'clone'  					=> 'Clone Location',
 ];
diff --git a/resources/lang/cs-CZ/admin/models/general.php b/resources/lang/cs-CZ/admin/models/general.php
index 44514f5f76..00565f709c 100644
--- a/resources/lang/cs-CZ/admin/models/general.php
+++ b/resources/lang/cs-CZ/admin/models/general.php
@@ -3,7 +3,7 @@
 return array(
     'about_models_title'     => 'O modelech majetku',
     'about_models_text'           => 'Modely majetku jsou způsoby seskupení shodných majetků. "MBP 2013", "iPhone 6s" atd.',
-    'deleted'  					        => 'Tento model byl odstraněn.',
+    'deleted'  					=> 'Tento model byl odstraněn.',
     'bulk_delete'               => 'Hromadné mazání modelů majetku',
     'bulk_delete_help'               => 'Pomocí zaškrtávacích kolonek potvrďte smazání označených modelů majetku. Modely majetku, ke kterým je přiřazen majetek nemohou být smazány dokud jim přiřazený majetek nebude přeřazen k jinému modulu.',
     'bulk_delete_warn'          => 'Chystáte se odstranit jeden model majetku.|Chystáte se smazat :model_count majetkových modelů.',
diff --git a/resources/lang/cs-CZ/admin/models/message.php b/resources/lang/cs-CZ/admin/models/message.php
index 9b374e27ec..5a5dd8b411 100644
--- a/resources/lang/cs-CZ/admin/models/message.php
+++ b/resources/lang/cs-CZ/admin/models/message.php
@@ -7,7 +7,7 @@ return array(
     'no_association' => 'VAROVÁNÍ! Model majetku pro tuto položku je neplatný, nebo chybí!',
     'no_association_fix' => 'Tento stav může způsobit nedozírné problémy. Přiřaďte dotyčnému majetku správný model.',
     'assoc_users'	 => 'Tento model je spojen s alespoň jedním majetkem a nemůže být smazán. Prosím smažte tyto majetky a pak to zkuste znovu. ',
-
+    'invalid_category_type' => 'This category must be an asset category.',
 
     'create' => array(
         'error'   => 'Model nebyl vytvořen, zkuste to znovu.',
diff --git a/resources/lang/cs-CZ/admin/reports/general.php b/resources/lang/cs-CZ/admin/reports/general.php
index c45c1da30d..e135d33d12 100644
--- a/resources/lang/cs-CZ/admin/reports/general.php
+++ b/resources/lang/cs-CZ/admin/reports/general.php
@@ -4,6 +4,7 @@ return [
     'info'   => 'Zvolte možnosti zprávy o majetku.',
     'deleted_user' => 'Odstraněný uživatel',
     'send_reminder' => 'Poslat připomínku',
+    'cannot_send_reminder' => 'User has been deleted or does not have an email address so cannot receive a reminder',
     'reminder_sent' => 'Připomínka odeslána',
     'acceptance_deleted' => 'Žádost o přijetí byla smazána',
     'acceptance_request' => 'Žádost o přijetí',
@@ -13,5 +14,10 @@ return [
         'user_state' => 'Stav uživatele',
         'user_country' => 'Země uživatele',
         'user_zip' => 'PSČ uživatele'
-    ]
-];
\ No newline at end of file
+    ],
+    'open_saved_template' => 'Open Saved Template',
+    'save_template' =>  'Save Template',
+    'select_a_template' => 'Select a Template',
+    'template_name' => 'Template Name',
+    'update_template' => 'Update Template',
+];
diff --git a/resources/lang/cs-CZ/admin/reports/message.php b/resources/lang/cs-CZ/admin/reports/message.php
index 6457338c1f..2800bbdf0b 100644
--- a/resources/lang/cs-CZ/admin/reports/message.php
+++ b/resources/lang/cs-CZ/admin/reports/message.php
@@ -1,5 +1,16 @@
 <?php
 
-return array(
-    'error'   => 'Musíte vybrat alespoň jednu možnost.'
-);
+return [
+    'about_templates' => 'About Saved Templates',
+    'saving_templates_description' => 'Select your options, then enter the name of your template in the box above and click the \'Save Template\' button. Use the dropdown to select a previously saved template.',
+    'create'  => [
+        'success' => 'Template saved successfully',
+    ],
+    'update' => [
+        'success' => 'Template updated successfully',
+    ],
+    'delete' => [
+        'success' => 'Template deleted',
+        'no_delete_permission' => 'Template does not exist or you do not have permission to delete it.',
+    ],
+];
diff --git a/resources/lang/cs-CZ/admin/settings/general.php b/resources/lang/cs-CZ/admin/settings/general.php
index 8333e98d5e..a542275051 100644
--- a/resources/lang/cs-CZ/admin/settings/general.php
+++ b/resources/lang/cs-CZ/admin/settings/general.php
@@ -8,13 +8,13 @@ return [
     'ad_append_domain'          => 'Připojit doménu k uživatelskému jménu',
     'ad_append_domain_help'     => 'Uživatel není povinen psát "uzivatel@domena.local", může pouze napsat "uzivatel".',
     'admin_cc_email'            => 'Ve skryté kopii',
-    'admin_cc_email_help'       => 'Chcete-li poslat kopii e-mailů pro check-in / checkout, které jsou uživatelům zaslány na další e-mailový účet, zadejte je zde. V opačném případě nechte toto pole prázdné.',
+    'admin_cc_email_help'       => 'Send a copy of checkin/checkout emails to this address.',
     'admin_settings'            => 'Nastavení správce',
     'is_ad'				        => 'Toto je server služby Active Directory',
     'alerts'                	=> 'Výstrahy',
     'alert_title'               => 'Aktualizace nastavení oznámení',
     'alert_email'				=> 'Zasílat upozornění na',
-    'alert_email_help'    => 'E-mailové adresy nebo distribuční seznamy kterým chcete odesílat výstrahy, oddělené čárkou',
+    'alert_email_help'          => 'E-mailové adresy nebo distribuční seznamy kterým chcete odesílat výstrahy, oddělené čárkou.',
     'alerts_enabled'			=> 'Upozornění zapnutá',
     'alert_interval'			=> 'Mez upozornění na vypršení (ve dnech)',
     'alert_inv_threshold'		=> 'Mez upozornění skladu',
@@ -31,15 +31,18 @@ return [
     'backups'					=> 'Zálohy',
     'backups_help'              => 'Vytvořit, stáhnout a obnovit zálohy ',
     'backups_restoring'         => 'Obnovit ze zálohy',
+    'backups_clean' => 'Clean the backed-up database before restore',
+    'backups_clean_helptext' => "This can be useful if you're changing between database versions",
     'backups_upload'            => 'Nahrát zálohu',
     'backups_path'              => 'Zálohy jsou uloženy v <code>:path</code>',
-    'backups_restore_warning'   => 'Použijte tlačítko obnovení <small><span class="btn btn-xs btn-warning"><i class="text-white fas fa-retweet" aria-hidden="true"></i></span></small> pro obnovení z předchozí zálohy. (Toto v současné době nefunguje se S3 souborovým úložištěm nebo Docker.<br><br>Vaše <strong>celá databáze :app_name a všechny nahrané soubory budou zcela nahrazeny</strong> tím, co je v záložním souboru.  ',
+    'backups_restore_warning'   => 'Use the restore button <small><span class="btn btn-xs btn-warning"><i class="text-white fas fa-retweet" aria-hidden="true"></i></span></small> to restore from a previous backup. (This does not currently work with S3 file storage or Docker.)<br><br>Your <strong>entire :app_name database and any uploaded files will be completely replaced</strong> by what\'s in the backup file  ',
     'backups_logged_out'         => 'Všichni stávající uživatelé, včetně vás, budou odhlášeni po dokončení obnovy.',
     'backups_large'             => 'Velmi velké zálohy mohou při obnovování způsobit time out chybu a možná budou muset být spuštěny přes příkazový řádek. ',
     'barcode_settings'			=> 'Nastavení čárového kódu',
     'confirm_purge'			    => 'Potvrdit vyčištění',
     'confirm_purge_help'		=> 'Zadejte text "DELETE" do pole níže pro odstranění odstraněných záznamů. Tato akce nemůže být vrácena zpět a TRVALE smaže všechny položky a uživatele. (Měli byste nejdříve vytvořit zálohu, pro jistotu.)',
     'custom_css'				=> 'Vlastní CSS',
+    'custom_css_placeholder'	=> 'Add your custom CSS',
     'custom_css_help'			=> 'Zadejte libovolné vlastní CSS, které chcete použít. Nezahrnujte &lt;style&gt;&lt;/style&gt; tagy.',
     'custom_forgot_pass_url'	=> 'Uživatelem určená URL adresa pro resetování hesla',
     'custom_forgot_pass_url_help'	=> 'Nahrazuje vestavěnou URL pro změnu zapomenutého hesla na přihlašovací obrazovce, slouží k přesměrování uživatelů na interní nebo hostované funkce obnovení hesla LDAP. Zablokuje přístup k funkci změny hesla lokálního uživatele.',
@@ -47,34 +50,34 @@ return [
     'dashboard_message_help'	=> 'Tento text se objeví na nástěnce každému, kdo má oprávnění k zobrazení nástěnky.',
     'default_currency'  		=> 'Výchozí měna',
     'default_eula_text'			=> 'Výchozí EULA',
+    'default_eula_text_placeholder' => 'Add your default EULA text',
     'default_language'			=> 'Výchozí jazyk',
     'default_eula_help_text'	=> 'Můžete také spojit vlastní EULA se specifickými kategoriemi majetku.',
     'acceptance_note'           => 'Add a note for your decision (Optional)',
     'display_asset_name'        => 'Zobrazit název majetku',
     'display_checkout_date'     => 'Zobrazit den převzetí',
     'display_eol'               => 'Zobrazit EOL v tabulkovém zobrazení',
-    'display_qr'                => 'Zobrazit kódy',
+    'display_qr'                => 'Display 2D barcode',
     'display_alt_barcode'		=> 'Zobrazit 1D čárový kód',
-    'email_logo'                => 'Email logo',
     'barcode_type'				=> 'Typ 2D čárového kódu',
     'alt_barcode_type'			=> 'Typ 1D čárového kódu',
-    'email_logo_size'       => 'Čtvercová loga vypadají na mailu nejlépe. ',
     'enabled'                   => 'Povoleno',
     'eula_settings'				=> 'Nastavení EULA',
     'eula_markdown'				=> 'Tato EULA umožňuje <a href="https://help.github.com/articles/github-flavored-markdown/">Github markdown</a>.',
+    'empty_row_count'           => 'Field Start Offset (Empty Rows)',
+    'empty_row_count_help'      => 'Fields will begin populating after this many empty rows are skipped at the top of the label.',
     'favicon'                   => 'Favicona',
     'favicon_format'            => 'Povolené typy souborů jsou ico, png a gif. Ostatní formáty obrázků nemusí fungovat ve všech prohlížečích.',
     'favicon_size'          => 'Favikony by měly být čtvercové obrázky, 16 x 16 pixelů.',
     'footer_text'               => 'Další text do zápatí ',
     'footer_text_help'          => 'Tento text se zobrazí v pravém zápatí. Odkazy jsou povoleny pomocí <a href="https://help.github.com/articles/github-flavored-markdown/">Github flavored markdown</a>. Zalamování řádků, záhlaví, obrázky atd. mohou mít za následek nepředvídatelné výsledky.',
+    'footer_text_placeholder'   => 'Optional footer text',
     'general_settings'			=> 'Obecné nastavení',
-    'general_settings_keywords' => 'podpora společnosti, podpis, přijetí, e-mailový formát, formát uživatelského jména, obrázky, na stránku, náhled, eula, gravatar, toky, nástěnka, soukromí',
     'general_settings_help'     => 'Výchozí EULA a další',
     'generate_backup'			=> 'Vytvořit zálohu',
     'google_workspaces'         => 'Pracovní prostory Google',
     'header_color'              => 'Barva záhlaví',
     'info'                      => 'Tato nastavení umožňují zvolit určité prvky instalace.',
-    'label_logo'                => 'Logo štítku',
     'label_logo_size'           => 'Čtvercová loga vypadají nejlépe - zobrazí se vpravo nahoře v každém inventárním číslem. ',
     'laravel'                   => 'Verze Laravel',
     'ldap'                      => 'LDAP',
@@ -94,7 +97,7 @@ return [
     'ldap_login_sync_help'      => 'Otestujte, že LDAP může správně synchronizovat. Pokud ověřovací LDAP dotaz není správný, uživatelé se nemusí být schopni přihlásit. JE NUTNÉ NEJPRVE NEJDŘÍVE ULOŽIT NASTAVENÍ LDAP POKUD BYLO ZMĚNĚNO.',
     'ldap_manager'              => 'LDAP Manager',
     'ldap_server'               => 'LDAP server',
-    'ldap_server_help'          => 'Toto by mělo začít s ldap: // (pro nešifrované nebo TLS) nebo ldaps: // (pro SSL)',
+    'ldap_server_help'          => 'This should start with ldap:// (for unencrypted) or ldaps:// (for TLS or SSL)',
     'ldap_server_cert'			=> 'Validace certifikátů LDAP SSL',
     'ldap_server_cert_ignore'	=> 'Povolit neplatný certifikát SSL',
     'ldap_server_cert_help'		=> 'Zaškrtněte toto políčko, pokud používáte SSL certifikát s vlastním podpisem a chcete přijmout neplatný certifikát SSL.',
@@ -108,8 +111,8 @@ return [
     'ldap_pword'                => 'LDAP heslo připojení',
     'ldap_basedn'               => 'Základní svázání DN',
     'ldap_filter'               => 'LDAP filtr',
-    'ldap_pw_sync'              => 'LDAP heslo synchronizace',
-    'ldap_pw_sync_help'         => 'Zrušte zaškrtnutí tohoto políčka, pokud si nepřejete zachovat hesla LDAP synchronizovaná s lokálními hesly. Pokud to zakážete znamená to, že se uživatelé nemusí přihlásit, pokud je váš LDAP server z nějakého důvodu nedostupný.',
+    'ldap_pw_sync'              => 'Cache LDAP Passwords',
+    'ldap_pw_sync_help'         => 'Uncheck this box if you do not wish to keep LDAP passwords cached as local hashed passwords. Disabling this means that your users may not be able to login if your LDAP server is unreachable for some reason.',
     'ldap_username_field'       => 'Pole uživatelského jména',
     'ldap_lname_field'          => 'Příjmení',
     'ldap_fname_field'          => 'LDAP jméno',
@@ -117,13 +120,15 @@ return [
     'ldap_version'              => 'Verze LDAP',
     'ldap_active_flag'          => 'LDAP Active Flag',
     'ldap_activated_flag_help'  => 'Tato hodnota se používá k určení, zda se synchronizovaný uživatel může přihlásit do Snipe-IT. <strong>To nemá vliv na schopnost kontrolovat položky v nich nebo v nich</strong>, a mělo by být <strong>název atributu</strong> v rámci vašeho AD/LDAP, <strong>ne hodnota</strong>. <br><br>Je-li toto pole nastaveno na název pole, který neexistuje ve vašem AD/LDAP, nebo je hodnota v poli AD/LDAP nastavena na <code>0</code> nebo <code>false</code>, Přihlášení uživatele <strong>bude zakázáno</strong>. Pokud je hodnota v poli AD/LDAP nastavena na <code>1</code> nebo <code>true</code> nebo <em>jakýkoli jiný text</em> znamená, že se uživatel může přihlásit. Pokud je pole prázdné ve vašem AD, respektujeme atribut <code>userAccountControl</code> , který obvykle umožňuje nepozastaveným uživatelům přihlásit.',
+    'ldap_invert_active_flag'   => 'LDAP Invert Active Flag',
+    'ldap_invert_active_flag_help'     => 'If enabled: when the value returned by LDAP Active Flag is <code>0</code> or <code>false</code> the user account will be active.',
     'ldap_emp_num'              => 'LDAP číslo zaměstnance',
     'ldap_email'                => 'LDAP email',
     'ldap_test'                 => 'Test LDAP',
     'ldap_test_sync'            => 'Test LDAP synchronizace',
     'license'                   => 'Softwarová licence',
-    'load_remote'               => 'Použít Gravatar',
-    'load_remote_help_text'		=> 'Zrušte zaškrtnutí tohoto políčka, pokud vaše instalace nemůže načíst skripty z externího internetu. To Snipe-IT zabrání načítání obrázků z Gravataru.',
+    'load_remote'               => 'Load Remote Avatars',
+    'load_remote_help_text'		=> 'Uncheck this box if your install cannot load scripts from the outside internet. This will prevent Snipe-IT from trying load avatars from Gravatar or other outside sources.',
     'login'                     => 'Pokusů o přihlášení',
     'login_attempt'             => 'Pokus o přihlášení',
     'login_ip'                  => 'IP adresa',
@@ -131,6 +136,7 @@ return [
     'login_user_agent'          => 'User Agent',
     'login_help'                => 'Seznam pokusů o přihlášení',
     'login_note'                => 'Přihlásit se Poznámka',
+    'login_note_placeholder'            => "If you do not have a login or have found a device belonging to this company, please call technical support at 888-555-1212. Thank you.",
     'login_note_help'           => 'Volitelně můžete na obrazovce přihlášení zadat několik vět, například pomoci lidem, kteří nalezli ztracené nebo ukradené zařízení. Toto pole akceptuje značku <a href="https://help.github.com/articles/github-flavored-markdown/">Github flavedmarkdown</a>',
     'login_remote_user_text'    => 'Volby vzdáleného přihlašování uživatele',
     'login_remote_user_enabled_text' => 'Zapnout přihlašování s hlavičkou vzdálený uživatel',
@@ -146,13 +152,16 @@ return [
     'logo_print_assets_help'    => 'Používat branding na seznamech k tisku ',
     'full_multiple_companies_support_help_text' => 'Omezení uživatelů (včetně správců) jsou přiřazená ke společnostem s majetkem společnosti.',
     'full_multiple_companies_support_text' => 'Plná podpora více společností',
+    'scope_locations_fmcs_support_text'  => 'Scope Locations with Full Multiple Companies Support',
+    'scope_locations_fmcs_support_help_text'  => 'Restrict locations to their selected company.',
+    'scope_locations_fmcs_check_button' => 'Check Compatibility',
+    'scope_locations_fmcs_support_disabled_text'  => 'This option is disabled because you have conflicting locations set for :count or more items.',
     'show_in_model_list'   => 'Zobrazit v rozbalovacích nabídkách modelu',
     'optional'					=> 'volitelný',
     'per_page'                  => 'Výsledků na stránku',
     'php'                       => 'Verze PHP',
-    'php_info'                  => 'PHP Info',
+    'php_info'                  => 'PHP info',
     'php_overview'              => 'PHP',
-    'php_overview_keywords'     => 'phpinfo, systém, info',
     'php_overview_help'         => 'PHP System info',
     'php_gd_info'               => 'Je nutné nainstalovat php-gd pro zobrazení QR kódů. Více v instalační příručce.',
     'php_gd_warning'            => 'PHP pluginy pro zpracování obrazu a GD nejsou nainstalovány.',
@@ -218,6 +227,8 @@ return [
     'webhook_integration_help'    => ':app integrace je volitelná, ale koncový bod a kanál jsou vyžadovány, pokud jej chcete používat. Chcete-li konfigurovat integraci :app, musíte nejprve <a href=":webhook_link" target="_new" rel="noopener">vytvořit příchozí webový háček</a> na vašem účtu :app. Klikněte na tlačítko <strong>Test :app Integration</strong> pro potvrzení správného nastavení před uložením. ',
     'webhook_integration_help_button'    => 'Jakmile uložíte informace :app, objeví se testovací tlačítko.',
     'webhook_test_help'           => 'Vyzkoušejte, zda je vaše integrace :app správně nakonfigurována. MŮŽE MŮŽE MŮŽE VÁŠ AKTUALIZOVAT :app NASTAVENÍ FIRST.',
+    'shortcuts_enabled'         => 'Enable Shortcuts',
+    'shortcuts_help_text'       => '<strong>Windows</strong>: Alt + Access key, <strong>Mac</strong>: Control + Option + Access key',
     'snipe_version'  			=> 'Verze Snipe-IT',
     'support_footer'            => 'Odkazy v zápatí na podporu ',
     'support_footer_help'       => 'Určete, kdo uvidí odkazy na Snipe-IT podporu a uživatelskou příručku',
@@ -227,7 +238,6 @@ return [
     'update'                    => 'Upravit nastavení',
     'value'                     => 'Hodnota',
     'brand'                     => 'Opatřit značkou',
-    'brand_keywords'            => 'zápatí, logo, tisk, motiv, skin, záhlaví, barvy, css',
     'brand_help'                => 'Logo, název webu',
     'web_brand'                 => 'Typ webového brandingu',
     'about_settings_title'      => 'O nastavení',
@@ -276,6 +286,8 @@ return [
     'two_factor_enrollment_text'	=> "Je vyžadováno dvoufaktorové ověření, nicméně vaše zařízení ještě nebylo zaregistrováno. Otevřete aplikaci Google Authenticator a oskenujte níže uvedený QR kód pro registraci vašeho zařízení. Jakmile zaregistrujete své zařízení, zadejte níže uvedený kód",
     'require_accept_signature'      => 'Požadovat podpis',
     'require_accept_signature_help_text'      => 'Aktivace této funkce bude vyžadovat, aby se uživatelé fyzicky přihlásili k přijetí určitého materiálu.',
+    'require_checkinout_notes'  => 'Require Notes on Checkin/Checkout',
+    'require_checkinout_notes_help_text'    => 'Enabling this feature will require the note fields to be populated when checking in or checking out an asset.',
     'left'        => 'vlevo',
     'right'        => 'vpravo',
     'top'        => 'nahoře',
@@ -313,24 +325,24 @@ return [
     'filter_by_keyword' => 'Filtrovat podle klíčového slova',
     'security' => 'Zabezpečení',
     'security_title' => 'Aktualizovat nastavení zabezpečení',
-    'security_keywords' => 'heslo, hesla, požadavky, dvou fázové, dvou-fázové, běžná hesla, vzdálené přihlášení, odhlášení, autentifikace',
     'security_help' => 'Dvou-faktorové, Omezení hesel',
-    'groups_keywords' => 'oprávnění, skupiny oprávnění, autorizace',
     'groups_help' => 'Skupiny oprávnění k účtu',
     'localization' => 'Lokalizace',
     'localization_title' => 'Aktualizovat nastavení lokalizace',
-    'localization_keywords' => 'lokalizace, měna, místní, místní, časové pásmo, mezinárodní, internatinalizace, jazyk, jazyky, překlad',
     'localization_help' => 'Jazyk, zobrazení data',
     'notifications' => 'Oznámení',
     'notifications_help' => 'E-mailová oznámení a inventura',
     'asset_tags_help' => 'Nárůst a prefixy',
     'labels' => 'Štítky',
     'labels_title' => 'Upravit nastavení štítků',
-    'labels_help' => 'Velikost štítků &amp; nastavení',
-    'purge_keywords' => 'trvale odstranit',
+    'labels_help' => 'Barcodes &amp; label settings',
     'purge_help' => 'Vymazat smazané záznamy',
     'ldap_extension_warning' => 'Nevypadá to, že LDAP rozšíření je nainstalováno nebo povoleno na tomto serveru. Stále můžete uložit vaše nastavení, ale budete muset povolit LDAP rozšíření pro PHP, než bude fungovat LDAP synchronizace nebo přihlášení.',
     'ldap_ad' => 'LDAP/AD',
+    'ldap_test_label' => 'Test LDAP Sync',
+    'ldap_test_login' => ' Test LDAP Login',
+    'ldap_username_placeholder' => 'LDAP Username',
+    'ldap_password_placeholder' => 'LDAP Password',
     'employee_number' => 'Osobní číslo',
     'create_admin_user' => 'Vytvořit uživatele ::',
     'create_admin_success' => 'Úspěch! Administrátorský účet byl přidán!',
@@ -342,6 +354,8 @@ return [
     'setup_migration_create_user' => 'Další: Vytvořit uživatele',
     'ldap_settings_link' => 'Nastavení LDAP',
     'slack_test' => 'Test <i class="fab fa-slack"></i> Integrace',
+    'status_label_name' => 'Status Label Name',
+    'super_admin_only'  => 'Super Admin Only',
     'label2_enable'           => 'Nový popisek',
     'label2_enable_help'      => 'Přepněte do nového popisku. <b>Poznámka: Před nastavením ostatních budete muset toto nastavení uložit.</b>',
     'label2_template'         => 'Šablona',
@@ -356,12 +370,15 @@ return [
     'label2_2d_type'          => 'Typ 2D čárového kódu',
     'label2_2d_type_help'     => 'Formát pro 2D čárové kódy',
     'label2_2d_target'        => 'Cíl 2D čárového kódu',
-    'label2_2d_target_help'   => 'Adresa URL 2D čárového kódu při naskenování',
+    'label2_2d_target_help'   => 'The data that will be contained in the 2D barcode',
     'label2_fields'           => 'Definice polí',
     'label2_fields_help'      => 'Pole lze přidat, odstranit a seřadit v levém sloupci. Pro každé pole lze přidat více možností pro popisek a DataSource a odstranit a přeřadit je v pravém sloupci.',
+    'purge_barcodes' => 'Purge Barcodes',
     'help_asterisk_bold'    => 'Text zadaný jako <code>**text**</code> bude zobrazen tučně',
     'help_blank_to_use'     => 'Ponechte prázdné pro použití hodnoty z <code>:setting_name</code>',
     'help_default_will_use' => '<code>:default</code> will use the value from <code>:setting_name</code>. <br>Note that the value of the barcodes must comply with the respective barcode spec in order to be successfully generated. Please see <a href="https://snipe-it.readme.io/docs/barcodes">the documentation <i class="fa fa-external-link"></i></a> for more details. ',
+    'asset_id'              => 'Asset ID',
+    'data'               => 'Data',
     'default'               => 'Výchozí',
     'none'                  => 'Nic',
     'google_callback_help' => 'Toto by mělo být zadáno jako URL zpětného volání v nastavení aplikace Google OAuth ve vaší organizaci&apos;s <strong><a href="https://console.cloud.google.com/" target="_blank">vývojová konzole Google <i class="fa fa-external-link" aria-hidden="true"></i></a></strong>.',
@@ -373,7 +390,100 @@ return [
     'database_driver' => 'Ovladač databáze',
     'bs_table_storage' => 'Úložiště tabulky',
     'timezone' => 'Timezone',
+    'test_mail' => 'Test Mail',
     'profile_edit'          => 'Edit Profile',
     'profile_edit_help'          => 'Allow users to edit their own profiles.',
+    'default_avatar' => 'Custom Default Avatar',
+    'default_avatar_help' => 'This image will be displayed as a profile if a user does not have a profile photo.',
+    'restore_default_avatar' => 'Restore <a href=":default_avatar" data-toggle="lightbox" data-type="image">original system default avatar</a>',
+    'restore_default_avatar_help' => '',
+    'due_checkin_days' => 'Due For Checkin Warning',
+    'due_checkin_days_help' => 'How many days before the expected checkin of an asset should it be listed in the "Due for checkin" page?',
+    'no_groups' => 'No groups have been created yet. Visit <code>Admin Settings > Permission Groups</code> to add one.',
+    'text' => 'Text',
+
+    'username_formats' => [
+        'username_format'		=> 'Formát uživatelského jména',
+        'firstname_lastname_format'	=> 'Jméno Příjmení (jane.smith)',
+        'first_name_format'	        => 'First Name (jane)',
+        'last_name_format'		=> 'Last Name (doe)',
+        'filastname_format'			=> 'First Initial Last Name (jsmith)',
+        'lastnamefirstinitial_format' =>  'Last Name First Initial (smithj)',
+        'firstname_lastname_underscore_format' => 'First Name Last Name (jane_smith)',
+        'firstinitial.lastname' => 'First Initial Last Name (j.smith)',
+        'lastname_firstinitial' => 'Last Name First Initial (smith_j)',
+        'lastname_dot_firstinitial_format' => 'Last Name First Initial (smith.j)',
+        'firstnamelastname'     => 'First Name Last Name (janesmith)',
+        'firstnamelastinitial'  => 'First Name Last Initial (janes)',
+        'lastnamefirstname'      => 'Last Name.First Name (smith.jane)',
+    ],
+
+    'email_formats' => [
+        'email_format'			=> 'Formát e-mailu',
+        'firstname_lastname_format'	=> 'Jméno Příjmení (jane.smith@example.com)',
+        'first_name_format'		=> 'Jméno (jane@example.com)',
+        'last_name_format'		=> 'Last Name (doe@example.com)',
+        'filastname_format'			=> 'Iniciál Jména Příjmení (jsmith@example.com)',
+        'lastnamefirstinitial_format' =>  'Příjmení první písmeno ze jména (novakj@example.com)',
+        'firstname_lastname_underscore_format' => 'Jméno Příjmení (jan_novak@example.com)',
+        'firstinitial.lastname' => 'Iniciál Príjmení (j.novak@example.com)',
+        'lastname_firstinitial' => 'Příjmení Iniciál (novak_j@example.com)',
+        'lastname_dot_firstinitial_format' => 'Last Name First Initial (smith.j@example.com)',
+        'firstnamelastname'     => 'Jméno Příjmení (jozefnovak@example.com)',
+        'firstnamelastinitial'  => 'Jméno Iniciál(josefn@example.com)',
+        'lastnamefirstname'      => 'Last Name.First Name (smith.jane@example.com)',
+    ],
+
+
+
+    'logo_labels' => [
+        'acceptance_pdf_logo'       => 'PDF Logo',
+        'email_logo'                => 'Email logo',
+        'label_logo'                => 'Logo štítku',
+        'logo'                      => 'Site Logo',
+        'favicon'                   => 'Favicona',
+    ],
+
+    'logo_help' => [
+        'email_logo_size'       => 'Čtvercová loga vypadají na mailu nejlépe. ',
+    ],
+
+    'logo_option_types' => [
+        'text' => 'Text',
+        'logo' => 'Logo',
+        'logo_and_text' => 'Logo and Text',
+    ],
+
+
+    'legends' => [
+        'scoping' => 'Scoping',
+        'formats' => 'Default Formats',
+        'profiles' => 'User Profiles',
+        'eula' => 'EULA & Acceptance Preferences',
+        'misc_display' => 'Miscellaneous Display Options',
+        'email' => 'Email Preferences',
+        'checkin' => 'Checkin Preferences',
+        'dashboard' => 'Login & Dashboard Preferences',
+        'misc' => 'Miscellaneous',
+        'logos' => 'Logos & Display',
+        'colors' => 'Colors & Skins',
+        'footer' => 'Footer Preferences',
+        'security' => 'Security Preferences',
+        'general' => 'General',
+        'intervals' => 'Intervals & Thresholds',
+    ],
+
+
+    /* Keywords for settings overview help */
+    'keywords' => [
+        'brand'             => 'zápatí, logo, tisk, motiv, skin, záhlaví, barvy, css',
+        'general_settings'  => 'podpora společnosti, podpis, přijetí, e-mailový formát, formát uživatelského jména, obrázky, na stránku, náhled, eula, gravatar, toky, nástěnka, soukromí',
+        'groups'            => 'oprávnění, skupiny oprávnění, autorizace',
+        'labels'            => 'labels, barcodes, barcode, sheets, print, upc, qr, 1d, 2d',
+        'localization'      => 'lokalizace, měna, místní, místní, časové pásmo, mezinárodní, internatinalizace, jazyk, jazyky, překlad',
+        'php_overview'      => 'phpinfo, systém, info',
+        'purge'             => 'trvale odstranit',
+        'security'          => 'heslo, hesla, požadavky, dvou fázové, dvou-fázové, běžná hesla, vzdálené přihlášení, odhlášení, autentifikace',
+    ],
 
 ];
diff --git a/resources/lang/cs-CZ/admin/settings/message.php b/resources/lang/cs-CZ/admin/settings/message.php
index a7405ff344..84597f378b 100644
--- a/resources/lang/cs-CZ/admin/settings/message.php
+++ b/resources/lang/cs-CZ/admin/settings/message.php
@@ -14,6 +14,9 @@ return [
         'restore_warning'       => 'Ano, obnovit. Potvrzuji, že toto přepíše existující data v databázi. Tato akce taky odhlásí všechny uživatele (včetně vás).',
         'restore_confirm'       => 'Jste si jisti, že chcete obnovit databázi z :filename?'
     ],
+    'restore' => [
+        'success'               => 'Your system backup has been restored. Please log in again.'
+    ],
     'purge' => [
         'error'     => 'Během čištění došlo k chybě. ',
         'validation_failed'     => 'Vaše potvrzení o čištění je nesprávné. Zadejte prosím slovo "DELETE" do potvrzovacího rámečku.',
@@ -33,6 +36,9 @@ return [
         'testing_authentication' => 'Testování LDAP ověření...',
         'authentication_success' => 'Uživatel byl úspěšně ověřen přes LDAP!'
     ],
+    'labels' => [
+        'null_template' => 'Label template not found. Please select a template.',
+        ],
     'webhook' => [
         'sending' => 'Odesílání testovací zprávy :app...',
         'success' => 'Vaše integrace :webhook_name funguje!',
@@ -42,5 +48,12 @@ return [
         'error' => 'Něco se pokazilo. :app odpověděla v: :error_message',
         'error_redirect' => 'CHYBA: 301/302 :endpoint vrací přesměrování. Z bezpečnostních důvodů nesledujeme přesměrování. Použijte prosím skutečný koncový bod.',
         'error_misc' => 'Něco se nepovedlo.',
-    ]
+        'webhook_fail' => ' webhook notification failed: Check to make sure the URL is still valid.',
+        'webhook_channel_not_found' => ' webhook channel not found.',
+        'ms_teams_deprecation' => 'The selected Microsoft Teams webhook URL will be deprecated Dec 31st, 2025. Please use a workflow URL. Microsoft\'s documentation on creating a workflow can be found <a href="https://support.microsoft.com/en-us/office/create-incoming-webhooks-with-workflows-for-microsoft-teams-8ae491c7-0394-4861-ba59-055e33f75498" target="_blank"> here.</a>',
+    ],
+    'location_scoping' => [
+        'not_saved' => 'Your settings were not saved.',
+        'mismatch' => 'There is 1 item in the database that need your attention before you can enable location scoping.|There are :count items in the database that need your attention before you can enable location scoping.',
+    ],
 ];
diff --git a/resources/lang/cs-CZ/admin/statuslabels/table.php b/resources/lang/cs-CZ/admin/statuslabels/table.php
index 3fb3c0f178..0a781a9402 100644
--- a/resources/lang/cs-CZ/admin/statuslabels/table.php
+++ b/resources/lang/cs-CZ/admin/statuslabels/table.php
@@ -1,14 +1,14 @@
 <?php
 
 return array(
-    'about'      	=> 'O označení stavu',
+    'about'      	=> 'About Status Types',
     'archived'      	=> 'Archivováno',
     'create'      	=> 'Vytvořit označení stavu',
     'color'      	=> 'Barva grafu',
     'default_label' => 'Výchozí štítek',
     'default_label_help' => 'Toto se používá k zajištění zobrazení nejčastěji používaných štítků v horní části rozbalovacího pole, při vytváření nebo úpravách položek majetku.',
     'deployable'      	=> 'Připraveno k nasazení',
-    'info'      	=> 'Označení stavu se používá k popisu různých stavů majetku. Můžou být v opravě, ztracení atd. Lze vytvořit nové stavy pro další možné stavy.',
+    'info'      	=> 'Status label types are used to describe the various states your assets could be in. They may be out for repair, lost/stolen, etc. You can create new status labels for your deployable, pending and archived assets according to your own workflow. For more information, <a href="https://snipe-it.readme.io/docs/overview#status-labels" target="_blank">see the documentation <i class="fa fa-external-link"></i></a>.',
     'name'      	=> 'Název stavu',
     'pending'      	=> 'Probíhající',
     'status_type'   => 'Typ stavu',
diff --git a/resources/lang/cs-CZ/admin/users/general.php b/resources/lang/cs-CZ/admin/users/general.php
index 1c4440d9ec..0a862c6aff 100644
--- a/resources/lang/cs-CZ/admin/users/general.php
+++ b/resources/lang/cs-CZ/admin/users/general.php
@@ -19,6 +19,8 @@ return [
     'print_assigned'    => 'Vypsat všechna přiřazení',
     'email_assigned'    => 'Odeslat seznam aktuálně přiřazeného majetku',
     'user_notified'     => 'Uživateli byl zaslán e-mail se seznamem aktuálně přiřazeného majetku.',
+    'users_notified'    => 'The user has been emailed a list of their currently assigned items.|:count users have been emailed a list of their currently assigned items.',
+    'users_notified_warning' => ':count user has been emailed a list of their currently assigned items, however :no_email users did not have an email address so could not be emailed.|:count users have been emailed a list of their currently assigned items, however :no_email user(s) did not have an email address so could not be emailed.',
     'auto_assign_label' => 'Zahrnout tohoto uživatele do automatického přiřazování licencí',
     'auto_assign_help'  => 'Nezahrnout tohoto uživatele do automatického přiřazování licencí',
     'software_user'     => 'Software vydaný pro :name',
diff --git a/resources/lang/cs-CZ/admin/users/message.php b/resources/lang/cs-CZ/admin/users/message.php
index 4a2551113c..09304ae46a 100644
--- a/resources/lang/cs-CZ/admin/users/message.php
+++ b/resources/lang/cs-CZ/admin/users/message.php
@@ -6,7 +6,7 @@ return array(
     'declined'                  => 'Úspěšně jste odmítli tento majetek.',
     'bulk_manager_warn'	        => 'Uživatelé byli úspěšně aktualizováni, položka správce však nebyla uložena, protože správce, který jste si vybrali, byl také v seznamu uživatelů, který má být upraven, a uživatelé nemusí být jejich vlastní správce. Zvolte své uživatele znovu, kromě správce.',
     'user_exists'               => 'Uživatel již existuje!',
-    'user_not_found'            => 'Uživatel neexistuje.',
+    'user_not_found'            => 'User does not exist or you do not have permission view them.',
     'user_login_required'       => 'Přihlašovací pole je povinné',
     'user_has_no_assets_assigned' => 'Momentálně nejsou uživateli přiřazeny žádné položky.',
     'user_password_required'    => 'Je vyžadováno heslo.',
@@ -53,6 +53,7 @@ return array(
         'ldap_could_not_search' => 'Nelze vyhledat server LDAP. Zkontrolujte prosím konfiguraci serveru LDAP v konfiguračním souboru LDAP. <br>Chyba serveru LDAP:',
         'ldap_could_not_get_entries' => 'Nelze získat záznamy ze serveru LDAP. Zkontrolujte prosím konfiguraci serveru LDAP v konfiguračním souboru LDAP. <br>Chyba serveru LDAP:',
         'password_ldap' => 'Heslo pro tento účet je spravováno serverem LDAP / Active Directory. Obraťte se na oddělení IT a změňte heslo.',
+        'multi_company_items_assigned' => 'This user has items assigned that belong to a different company. Please check them in or edit their company.'
     ),
 
     'deletefile' => array(
diff --git a/resources/lang/cs-CZ/admin/users/table.php b/resources/lang/cs-CZ/admin/users/table.php
index 5ec39c366a..e00eef04bd 100644
--- a/resources/lang/cs-CZ/admin/users/table.php
+++ b/resources/lang/cs-CZ/admin/users/table.php
@@ -22,7 +22,7 @@ return array(
     'managed_locations'     => 'Spravovaná místa',
     'managed_users'         => 'Spravovaní uživatelé',
     'name' 					=> 'Položka',
-    'nogroup'               => 'Zatím nebyly vytvořeny žádné skupiny. Chcete-li přidat jednu skupinu, navštivte: ',
+    'nogroup'               => 'Zatím nebyly vytvořeny žádné skupiny. Chcete-li přidat jednu skupinu, navštivte:',
     'notes'                 => 'Poznámky',
     'password_confirm' 		=> 'Potvrzení hesla',
     'password' 				=> 'Heslo',
diff --git a/resources/lang/cs-CZ/auth.php b/resources/lang/cs-CZ/auth.php
index 23ed48cd0c..02d66fcd33 100644
--- a/resources/lang/cs-CZ/auth.php
+++ b/resources/lang/cs-CZ/auth.php
@@ -15,6 +15,6 @@ return array(
 
     'failed' => 'Tyto přihlašovací údaje neodpovídají žádnému záznamu.',
     'password' => 'Zadané heslo není správné.',
-    'throttle' => 'Příliš mnoho pokusů o přihlášení. Zkuste to, prosím, znovu za :seconds vteřin.',
+    'throttle' => 'Too many login attempts. Please try again in :minutes minute(s).',
 
 );
diff --git a/resources/lang/cs-CZ/auth/message.php b/resources/lang/cs-CZ/auth/message.php
index b57f7fd93a..890be33141 100644
--- a/resources/lang/cs-CZ/auth/message.php
+++ b/resources/lang/cs-CZ/auth/message.php
@@ -6,8 +6,6 @@ return array(
     'account_not_found'      => 'Neexistující uživatel nebo chybné heslo!',
     'account_not_activated'  => 'Uživatelský účet není aktivován.',
     'account_suspended'      => 'Uživatelský účet je pozastaven.',
-    'account_banned'         => 'Uživatelský účet je zablokován.',
-    'throttle'               => 'Příliš mnoho neúspěšných pokusů o přihlášení. Zkuste to prosím znovu za :minutes minut.',
 
     'two_factor' => array(
         'already_enrolled'      => 'Vaše zařízení je již zapsáno.',
diff --git a/resources/lang/cs-CZ/button.php b/resources/lang/cs-CZ/button.php
index e674be04c7..036b97e84b 100644
--- a/resources/lang/cs-CZ/button.php
+++ b/resources/lang/cs-CZ/button.php
@@ -7,6 +7,7 @@ return [
     'checkin_and_delete'  	    => 'Vrátit vše / Smazat uživatele',
     'delete'  	                => 'Smazat',
     'edit'    	                => 'Upravit',
+    'clone'    	                => 'Clone',
     'restore' 	                => 'Obnovit',
     'remove'                    => 'Odebrat',
     'request'                   => 'Požadavek',
@@ -21,4 +22,13 @@ return [
     'add_maintenance'           => 'Přidat údržbu',
     'append'                    => 'Připojit',
     'new'                       => 'Nový',
+    'var' => [
+        'clone'     => 'Clone :item_type',
+        'edit'      => 'Edit :item_type',
+        'delete'    => 'Delete :item_type',
+        'restore'   => 'Restore :item_type',
+        'create'    => 'Create New :item_type',
+        'checkout'  => 'Checkout :item_type',
+        'checkin'   => 'Checkin :item_type',
+    ]
 ];
diff --git a/resources/lang/cs-CZ/general.php b/resources/lang/cs-CZ/general.php
index d072c8fc95..b98c443e9d 100644
--- a/resources/lang/cs-CZ/general.php
+++ b/resources/lang/cs-CZ/general.php
@@ -10,7 +10,7 @@ return [
     'action'                => 'Akce',
     'activity_report'		=> 'Report aktivity',
     'address'				=> 'Adresa',
-    'admin'					=> 'Admin',
+    'admin'					=> 'Nastavení správce',
     'admin_tooltip'			=> 'Tento uživatel má administrátorská oprávnění',
     'superuser'				=> 'Superuživatel',
     'superuser_tooltip'		=> 'Tento uživatel má superuživatelská oprávnění',
@@ -23,13 +23,16 @@ return [
     'asset_models'			=> 'Modely majetku',
     'asset_model'			=> 'model',
     'asset'					=> 'Zařízeni',
+    'asset_previous'        => 'Zařízení (původně přiřazené)',
     'asset_report'          => 'Report majetku',
     'asset_tag'				=> 'Označení majetku',
     'asset_tags'            => 'Označení majetku',
     'assets_available'		=> 'Dostupný majatek',
     'accept_assets'         => 'Příjmout majetek :name',
     'accept_assets_menu'    => 'Přijmout majetek',
+    'accept_item'           => 'Potvrdit převzetí',
     'audit'				    => 'Audit',
+    'audits'				=> 'Audity',
     'audit_report'			=> 'Záznamy auditu',
     'assets'				=> 'Zařízení',
     'assets_audited'        => 'aktiva, u nichž byl proveden audit',
@@ -61,9 +64,12 @@ return [
     'changepassword'  		=> 'Změnit heslo',
     'checkin'  				=> 'Příjem',
     'checkin_from'  		=> 'Převzít od',
+    'checkin_note'  		=> 'Poznámka k převzetí',
+    'checkout_note'  		=> 'Poznámka k vyřazení',
     'checkout'  			=> 'Výdej',
     'checkouts_count'       => 'Vyskladnění',
     'checkins_count'        => 'Naskladnění',
+    'checkin_and_delete'  	=> 'Převzít a odstranit',
     'user_requests_count'   => 'Požadavky',
     'city'  				=> 'Město',
     'click_here'			=> 'Klikněte zde',
@@ -77,7 +83,7 @@ return [
     'consumables'			=> 'Spotřební materiál',
     'country'  				=> 'Země',
     'could_not_restore'     => 'Chyba při obnově :item_type: :chyba',
-    'not_deleted'           => ':item_type není odstraněn, takže nemůže být obnoven',
+    'not_deleted'           => 'Položka typu :item_type nebyla smazána, takže ji není možné obnovit',
     'create'				=> 'Vytvořit nové',
     'created'               => 'Položka vytvořena',
     'created_asset'			=> 'vytvořit majetek',
@@ -86,11 +92,13 @@ return [
     'record_created' 		=> 'Záznam vytvořen',
     'updated_at' 			=> 'Aktualizováno',
     'currency'  			=> 'Kč', // this is deprecated
+    'currency_text'  		=> 'Měna', //
     'current'  				=> 'Aktuální',
     'current_password'      => 'Stávající heslo',
     'customize_report'      => 'Přizpůsobit report',
     'custom_report'         => 'Vlastní report majetku',
     'dashboard'				=> 'Nástěnka',
+    'data_source'           => 'Zdroj dat',
     'days'      			=> 'dnů',
     'days_to_next_audit'    => 'Dny k dalšímu auditu',
     'date'					=> 'Datum',
@@ -98,7 +106,7 @@ return [
     'debug_warning_text'    => 'Tato aplikace běží ve výrobním režimu s povoleným laděním. To znamená že citlivá data mohou být přístupná vnějšímu světu. Deaktivujte režim ladění nastavením hodnoty <code>APP_DEBUG</code> v souboru <code>.env</code> na <code>false</code>.',
     'delete'  				=> 'Odstranit',
     'delete_confirm'  		=> 'Opravdu chcete smazat :item?',
-    'delete_confirm_no_undo' => 'Opravdu chcete odstranit :item? Tuto operaci nelze zvrátit.',
+    'delete_confirm_no_undo' => 'Opravdu si přejete odstranit :item? Tuto akci nelze vrátit zpět.',
     'deleted'  				=> 'Odstraněno',
     'delete_seats'  		=> 'Vymazaná licenční místa',
     'deletion_failed'       => 'Odstranění se nezdařilo',
@@ -114,29 +122,13 @@ return [
     'editprofile'  			=> 'Upravit profil',
     'eol'					=> 'Konec životnosti',
     'email_domain'			=> 'Doména e-mailu',
-    'email_format'			=> 'Formát e-mailu',
     'employee_number'       => 'Číslo zaměstnance',
     'email_domain_help'		=> 'Toto je použito na generování e-mailových adres při importu',
     'error'				    => 'Chyba',
     'exclude_archived'      => 'Vyloučit archivované položky',
     'exclude_deleted'       => 'Vyloučit odstraněné položky',
     'example'				=> 'Příklad: ',
-    'filastname_format'			=> 'Iniciál Jména Příjmení (jsmith@example.com)',
-    'firstname_lastname_format'	=> 'Jméno Příjmení (jane.smith@example.com)',
-    'firstname_lastname_underscore_format' => 'Jméno Příjmení (jan_novak@example.com)',
-    'lastnamefirstinitial_format' =>  'Příjmení první písmeno ze jména (novakj@example.com)',
-    'firstintial_dot_lastname_format' => 'Iniciál Príjmení (j.novak@example.com)',
-    'firstname_lastname_display'	=> 'Jméno příjmení (Jane Smith)',
-    'lastname_firstname_display'	=> 'Příjmení (Smith Jane)',
-    'name_display_format'	=> 'Formát zobrazení jména',
-    'first'					=> 'První',
-    'firstnamelastname'     => 'Jméno Příjmení (jozefnovak@example.com)',
-    'lastname_firstinitial' => 'Příjmení Iniciál (novak_j@example.com)',
-    'firstinitial.lastname' => 'Iniciál Príjmení (j.novak@example.com)',
-    'firstnamelastinitial'  => 'Jméno Iniciál(josefn@example.com)',
-    'lastnamefirstname'      => 'Last Name First Name (smith.jane@example.com)',
-    'first_name'			=> 'Jméno',
-    'first_name_format'		=> 'Jméno (jane@example.com)',
+
     'files'                 => 'Soubory',
     'file_name'				=> 'Soubor',
     'file_type'             => 'Typ souboru',
@@ -156,9 +148,9 @@ return [
     'image_delete'         	=> 'Smazat obrázek',
     'include_deleted'       => 'Zahrnout odstraněné položky',
     'image_upload'         	=> 'Nahrát obrázek',
-    'filetypes_accepted_help'    => 'Přijatý typ souboru je :types. Maximální povolená velikost nahrávání je :size.|Přijaté typy souborů jsou :types. Maximální povolená velikost nahrávání je :size.',
-    'filetypes_size_help'   => 'Maximální povolená velikost nahrávání je :size.',
-    'image_filetypes_help'  => 'Accepted filetypes are jpg, webp, png, gif, svg, and avif. Max upload size allowed is :size.',
+    'filetypes_accepted_help'    => 'Povolený typ souboru je :types. Maximální povolená velikost je :size.|Povolený typ souborů je :types. Maximální povolená velikost je :size.',
+    'filetypes_size_help'   => 'Maximální povolená velikost nahrávaného souboru je :size.',
+    'image_filetypes_help'  => 'Povolené formáty: jpg, webp, png, gif, svg a avif. Max. velikost nahrávaného souboru: :size.',
     'unaccepted_image_type'  => 'Soubor s obrázkem nebyl čitelný. Přijatelné druhy souborů jsou jpg, webp, png, gif, a svg. Tento soubor je druhu: :mimetype.',
     'import'         	    => 'Import',
     'import_this_file'      => 'Mapa polí a zpracovávat tento soubor',
@@ -178,12 +170,17 @@ return [
     'last'					=> 'Poslední',
     'last_login'            => 'Poslední přihlášení',
     'last_name'             => 'Příjmení',
+    'firstname_lastname_display'	=> 'Jméno příjmení (Jane Smith)',
+    'lastname_firstname_display'	=> 'Příjmení (Smith Jane)',
+    'name_display_format'	=> 'Formát zobrazení jména',
+    'first'					=> 'První',
+    'first_name'			=> 'Jméno',
     'license'				=> 'Licence',
     'license_report'        => 'Report licencí',
     'licenses_available'	=> 'Dostupné licence',
     'licenses'				=> 'Licence',
     'list_all'				=> 'Vypsat vše',
-    'loading'				=> 'Načítání, čekejte prosím...',
+    'loading'				=> 'Načítání... Prosím, vyčkejte...',
     'lock_passwords'        => 'Tato hodnota pole nebude uložena v ukázkové instalaci.',
     'feature_disabled'      => 'Tato funkce byla deaktivována pro demo instalaci.',
     'location'              => 'Lokalita',
@@ -215,6 +212,14 @@ return [
     'no_results'			=> 'Žádné výsledky.',
     'no'  					=> 'Ne',
     'notes'  				=> 'Poznámky',
+    'note_added'            => 'Poznámka přidána',
+    'options'				=> 'Možnosti',
+    'preview'				=> 'Náhled',
+    'add_note'              => 'Přidat poznámku',
+    'note_edited'            => 'Poznámka byla upravena',
+    'edit_note'              => 'Upravit poznámku',
+    'note_deleted'            => 'Poznámka odstraněna',
+    'delete_note'              => 'Odstranit poznámku',
     'order_number'          => 'Číslo objednávky',
     'only_deleted'          => 'Pouze odstraněné položky',
     'page_menu'				=> 'Zobrazuji _MENU_ položky',
@@ -229,7 +234,7 @@ return [
     'purchase_date'         => 'Datum nákupu',
     'qty'		            => 'Množství',
     'quantity'		        => 'Množství',
-    'quantity_minimum'      => 'Máte :count položek pod nebo téměř pod nejnižšími skladovými zásobami',
+    'quantity_minimum'      => 'Máte jednu položku pod nebo téměř pod minimální hladinou množství | Máte :count položek pod nebo téměř pod minimální hladinou množství',
     'quickscan_checkin'  	=> 'Rychlé skenování přivlastněných počítačů',
     'quickscan_checkin_status'  	=> 'Stav převzetí',
     'ready_to_deploy'		=> 'Připraveno k přidělení',
@@ -240,7 +245,7 @@ return [
     'restored'				=> 'obnoveno',
     'restore'				=> 'Obnovit',
     'requestable_models'    => 'Požadované modely',
-    'requestable_items'     => 'Requestable Items',
+    'requestable_items'     => 'Položky, o které lze požádat',
     'requested'				=> 'Požadováno',
     'requested_date'        => 'Požadované datum',
     'requested_assets'      => 'Vyžádaný majetek',
@@ -254,7 +259,7 @@ return [
     'select_all'            => 'Vybrat vše',
     'search'				=> 'Hledat',
     'select_category'       => 'Vyberte kategorii',
-    'select_datasource' => 'Vyberte datový soubor',
+    'select_datasource' => 'Vyberte zdroj dat',
     'select_department'     => 'Vyberte Oddělení',
     'select_depreciation'	=> 'Zvolit typ amortizace',
     'select_location'		=> 'Zvolit místo',
@@ -274,13 +279,15 @@ return [
     'signed_off_by'         => 'Odepsal:',
     'skin'       			=> 'Vzhled',
     'webhook_msg_note'        => 'Oznámení zavolá webhook',
-    'webhook_test_msg'        => 'Ah haj! Vypadá to, že vaše :app integrace se Snipe-IT funguje!',
+    'webhook_test_msg'        => 'Ahoj! Vypadá to, že propojení s :app funguje!',
     'some_features_disabled' => 'REŽIM DEMO: Některé funkce jsou pro tuto instalaci zakázány.',
     'site_name'				=> 'Název lokality',
     'state'  				=> 'Stát',
     'status_labels'			=> 'Označení stavu',
+    'status_label'			=> 'Označení stavu',
     'status'    			=> 'Stav',
     'accept_eula'           => 'Licenční podmínky',
+    'show_or_hide_eulas' => 'Zobrazit/schovat EULA',
     'supplier'              => 'Dodavatel',
     'suppliers'  			=> 'Dodavatelé',
     'sure_to_delete'        => 'Opravdu si přejete odstranit',
@@ -296,9 +303,9 @@ return [
     'type'  				=> 'Typ',
     'undeployable'			=> 'Ne-přiřaditelné',
     'unknown_admin'			=> 'Neznámy správce',
-    'username_format'		=> 'Formát uživatelského jména',
     'username'              => 'Uživatelské jméno',
     'update'                => 'Aktualizace',
+    'updating_item' => 'Probíhá aktualizace položky :item',
     'upload_filetypes_help'      => 'Podporované typy souborů jsou png, gif, jpg, jpeg, doc, docx, pdf, xls, txt, lic, xlsx, xml, rtf, zip, a rar. Velikost může být až :size.',
     'uploaded'              => 'Nahráno',
     'user'					=> 'Uživatel',
@@ -323,10 +330,10 @@ return [
     'token_expired'         => 'Platnost relace formuláře vypršela. Prosím zkuste to znovu.',
     'login_enabled'         => 'Přihlášení povoleno',
     'audit_due'             => 'Ke inventuře',
-    'audit_due_days'        => 'Majetky splatné k auditu během :day|Majetky k auditu během :dní',
+    'audit_due_days'        => '{}Zařízení čekající na audit nebo po termínu|[1]Zařízení čekající na audit do jednoho dne|[2,*]]Zařízení čekající na audit do :days dnů',
     'checkin_due'           => 'Kvůli přihlášení',
     'checkin_overdue'       => 'Po termínu pro přihlášení',
-    'checkin_due_days'      => 'Majetky splatné pro kontrolu během :day|Majetky pro kontrolu během :dní',
+    'checkin_due_days'      => '{}Zařízení čekající na vrácení nebo po termínu|[1]Zařízení čekající na vrácení do jednoho dne|[2,*]Zařízení čekající na vrácení do :days dnů',
     'audit_overdue'         => 'Po termínu inventury',
     'accept'                => 'Přijmout :asset',
     'i_accept'              => 'Přijímám',
@@ -339,7 +346,7 @@ return [
     'view_all'              => 'zobrazit vše',
     'hide_deleted'          => 'Skrýt smazané',
     'email'                 => 'Email',
-    'do_not_change'         => 'Neměnit',
+    'do_not_change'         => 'Nechat beze změny',
     'bug_report'            => 'Nahlásit chybu',
     'user_manual'           => 'Uživatelská příručka',
     'setup_step_1'          => 'Krok 1',
@@ -347,8 +354,8 @@ return [
     'setup_step_3'          => 'Krok 3',
     'setup_step_4'          => 'Krok 4',
     'setup_config_check'    => 'Kontrola konfigurace',
-    'setup_create_database' => 'Vytvořit databázové tabulky',
-    'setup_create_admin'    => 'Vytvořit administrátora',
+    'setup_create_database' => 'Vytvořit tabulky v databázi',
+    'setup_create_admin'    => 'Přidat správce',
     'setup_done'            => 'Hotovo!',
     'bulk_edit_about_to'    => 'Tímto upravíte následující možnosti: ',
     'checked_out'           => 'K výdeji',
@@ -383,6 +390,8 @@ return [
     'new_license'           => 'Nová licence',
     'new_accessory'         => 'Nové příslušenství',
     'new_consumable'        => 'Nový spotřební materiál',
+    'new_component'         => 'Nový komponent',
+    'new_user'              => 'Nový uživatel',
     'collapse'              => 'Sbalit',
     'assigned'              => 'Přiřazené',
     'asset_count'           => 'Počet aktiv',
@@ -418,19 +427,22 @@ return [
     'bulk_soft_delete'      =>'Také odstranit tyto uživatele. Historie jejich majetku zůstane neporušená/dokud tvrvale nevymažete smazané záznamy v nastavení správce.',
     'bulk_checkin_delete_success' => 'Vybraní uživatelé byli odstraněni a jejich položky byly odebrány.',
     'bulk_checkin_success' => 'Položky vybraných uživatelů byly odebrány.',
-    'set_to_null'           => 'Odstranit hodnoty z aktiva|Odstranit hodnoty z :asset_count aktiv ',
+    'set_to_null'           => 'Smazat hodnoty pro tento výběr|Smazat hodnoty pro všech :selection_count výběrů ',
     'set_users_field_to_null'  => 'Odstranit hodnoty :field pro tohoto uživatele|Odstranit :field hodnoty pro všechny :user_count uživatele ',
     'na_no_purchase_date'   => 'N/A – neznámé datum nákupu',
     'assets_by_status'      => 'Majetek podle stavu',
     'assets_by_status_type'      => 'Majetek podle stavu',
     'pie_chart_type'        => 'Typ koláčového grafu na hlavní stránce',
     'hello_name'            => 'Ahoj, :name!',
-    'unaccepted_profile_warning'   => 'Máte :count položek vyžadujících potvrzení. Klikněte zde pro jejich přijetí nebo zamítnutí',
+    'unaccepted_profile_warning'   => 'Máte jednu položku čekající na schválení. Klikněte sem pro přijetí nebo odmítnutí | Máte :count položek čekajících na schválení. Klikněte sem pro přijetí nebo odmítnutí
+
+',
     'start_date'            => 'Od',
     'end_date'            => 'Do',
     'alt_uploaded_image_thumbnail' => 'Nahraný náhledový obrázek',
     'placeholder_kit'       => 'Vyberte sadu',
     'file_not_found'        => 'Soubor nebyl nalezen',
+    'log_record_not_found'  => 'Záznam v protokolu nebyl nalezen.',
     'preview_not_available' => '(žádný náhled)',
     'setup'                 => 'Nastavení',
     'pre_flight'            => 'Předletový',
@@ -509,10 +521,10 @@ return [
         'import_note' => 'Importováno pomocí csv importu',
     ],
     'remove_customfield_association' => 'Odstranění tohoto pole ze sady polí. Tím se neodstraní vlastní pole, ale pouze spojení tohoto pole s touto sadou polí.',
-    'checked_out_to_fields' => 'Checked Out To Fields',
+    'checked_out_to_fields' => 'Údaje o zapůjčení',
     'percent_complete' => '% dokončit',
     'uploading' => 'Nahrávám... ',
-    'upload_error' => 'Chyba při nahrávání souboru. Zkontrolujte, zda nejsou žádné prázdné řádky a že nejsou duplicitní názvy sloupců.',
+    'upload_error' => 'Chyba při nahrávání souboru. Zkontrolujte, že v CSV nejsou prázdné řádky nebo duplicitní názvy sloupců a že server umožňuje nahrávání.',
     'copy_to_clipboard' => 'Kopírovat do schránky',
     'copied' => 'Zkopírováno!',
     'status_compatibility' => 'Pokud jsou položky již přiřazeny, nelze je změnit na typ stavu bez použití souboru a tato změna hodnoty bude přeskočena.',
@@ -528,7 +540,7 @@ return [
     'permission_denied_superuser_demo' => 'Oprávnění bylo odepřeno. Nemůžete aktualizovat informace o uživateli pro superadminy na demo.',
     'pwd_reset_not_sent' => 'Uživatel není aktivován, LDAP je synchronizován, nebo nemá e-mailovou adresu',
     'error_sending_email' => 'Chyba při odesílání e-mailu',
-    'sad_panda' => 'Sad panda. You are not authorized to do the thing. Maybe <a href=":link">return to the dashboard</a>, or contact your administrator.',
+    'sad_panda' => 'Nemáte oprávnění tohle provést. <a href=":link">Zpět na přehled</a> nebo kontaktujte správce.',
     'bulk' => [
             'delete' =>
                 [
@@ -549,6 +561,71 @@ return [
         'license_seats'  => ':count sídlo licence|:count licenční místa',
         'consumables'  => ':count Spotřební materiál|:count Spotřební materiál',
         'components'  => ':count komponenta|:count komponenty',
-    ]
+    ],
+
+    'more_info' => 'Více informací',
+    'quickscan_bulk_help' => 'Zaškrtnutím tohoto políčka se aktualizuje záznam zařízení na novou lokaci. Nezaškrtnutí pouze zaznamená lokaci v auditním záznamu. Pokud je zařízení zapůjčeno, nezmění to lokaci osoby, zařízení nebo místa, kam je zapůjčeno.',
+    'whoops' => 'Jejda!',
+    'something_went_wrong' => 'Při zpracování požadavku došlo k chybě.',
+    'close' => 'Zavřít',
+    'expires' => 'Vyprší',
+    'map_fields'=> 'Mapovat pole typu :item_type',
+    'remaining_var' => 'Zbývá:count',
+    'label' => 'Štítek',
+    'import_asset_tag_exists' => 'Zařízení s označením :asset_tag již existuje a aktualizace není požadována. Nebyla provedena žádná změna.',
+    'countries_manually_entered_help' => 'Hodnoty s hvězdičkou (*) byly zadány ručně a neodpovídají oficiálním hodnotám podle ISO 3166',
+    'accessories_assigned' => 'Přiřazené příslušenství',
+    'user_managed_passwords' => 'Správa hesel',
+    'user_managed_passwords_disallow' => 'Zakázat uživatelům správu vlastních hesel',
+    'user_managed_passwords_allow' => 'Povolit uživatelům správu vlastních hesel',
+    'from' => 'Od',
+    'by' => 'Vytvořil',
+
+// Add form placeholders here
+    'placeholders' => [
+        'notes'  => 'Přidat poznámku',
+    ],
+
+    'breadcrumb_button_actions' => [
+        'edit_item' => 'Upravit :name',
+        'checkout_item' => 'Vydat :name',
+        'checkin_item' => 'Převzít :name',
+    ],
+
+    'skins' => [
+        'site_default' => 'Výchozí nastavení webu',
+        'default_blue' => 'Modrá – výchozí',
+        'blue_dark' => 'Modrá (tmavý režim)',
+        'green' => 'Tmavě zelená',
+        'green_dark' => 'Zelená (tmavý režim)',
+        'red' => 'Tmavě červená',
+        'red_dark' => 'Červená (tmavý režim)',
+        'orange' => 'Tmavě Oranžová',
+        'orange_dark' => 'Oranžová (tmavý režim)',
+        'black' => 'Černá',
+        'black_dark' => 'Černá (tmavý režim)',
+        'purple' => 'Fialová',
+        'purple_dark' => 'Fialová (tmavý režim)',
+        'yellow' => 'Žlutá',
+        'yellow_dark' => 'Žlutá (tmavý režim)',
+        'high_contrast' => 'Vysoký kontrast',
+
+    ],
+
+    'select_all_none' => 'Označit/odznačit vše',
+    'generic_model_not_found' => ':model nebyl nalezen, nebo k němu nemáte oprávnění.',
+    'deleted_models' => 'Smazané modely zařízení',
+    'deleted_users' => 'Smazaní uživatelé',
+    'cost_each' => ':amount za kus',
+    'remove_current_image' => 'Odebrat aktuální obrázek typu :type',
+
+    'seeding' => [
+        'manufacturers' => [
+            'button' => 'Přidat výrobce',
+            'prompt' => 'Zatím nemáte žádné výrobce. Chcete načíst seznam běžných výrobců? (TÍM DOJDE K PŘEPSÁNÍ STÁVAJÍCÍCH VÝROBCŮ, včetně těch, kteří byli označeni jako smazaní.)',
+            'success' => 'Výrobci byli úspěšně vloženi',
+            'error' => 'Výrobce se nepodařilo načíst – již nějaký existuje a nový by ho přepsal.|Výrobce se nepodařilo načíst – existuje už :count záznamů a došlo by k jejich přepsání.',
+        ],
+    ],
 
 ];
diff --git a/resources/lang/cs-CZ/localizations.php b/resources/lang/cs-CZ/localizations.php
index 87e9750980..a5a5f379bb 100644
--- a/resources/lang/cs-CZ/localizations.php
+++ b/resources/lang/cs-CZ/localizations.php
@@ -2,7 +2,7 @@
 
 return [
 
-    'select_language' => 'Vyberte jazyk',
+    'select_language' => 'Select a Language',
     'languages' => [
         'en-US'=> 'Angličtina, USA',
         'en-GB'=> 'Angličtina, UK',
@@ -40,7 +40,9 @@ return [
         'ms-MY'=> 'Malajština',
         'mi-NZ'=> 'Maori',
         'mn-MN'=> 'Mongolština',
-        'no-NO'=> 'Norština',
+        'nb-NO'=> 'Norwegian Bokmål',
+        'om-ET' => 'Oromo (Ethiopian)',
+        //'nn-NO'=> 'Norwegian Nynorsk',
         'fa-IR'=> 'Perština',
         'pl-PL'=> 'Polština',
         'pt-PT'=> 'Portugalština',
@@ -66,7 +68,7 @@ return [
         'zu-ZA'=> 'Zuluština',
     ],
 
-    'select_country' => 'Zvolte stát',
+    'select_country' => 'Select a Country',
     
     'countries' => [
         'AC'=>'Ostrov Ascension',
@@ -133,6 +135,7 @@ return [
         'EC'=>'Ekvádor',
         'EE'=>'Estonsko',
         'EG'=>'Egypt',
+        'GB-ENG'=>'England',
         'ER'=>'Eritrea',
         'ES'=>'Španělsko',
         'ET'=>'Etiopie',
@@ -231,6 +234,7 @@ return [
         'NG'=>'Nigérie',
         'NI'=>'Nikaragua',
         'NL'=>'Nizozemsko',
+        'GB-NIR' => 'Northern Ireland',
         'NO'=>'Norsko',
         'NP'=>'Nepál',
         'NR'=>'Nauru',
@@ -258,7 +262,7 @@ return [
         'RU'=>'Ruská federace',
         'RW'=>'Rwanda',
         'SA'=>'Saúdská Arábie',
-        'UK'=>'Skotsko',
+        'GB-SCT'=>'Skotsko',
         'SB'=>'Šalamounovy ostrovy',
         'SC'=>'Seychelles',
         'SS'=>'Jižní Súdán',
@@ -310,6 +314,7 @@ return [
         'VI'=>'Americké Panenské ostrovy',
         'VN'=>'Vietnam',
         'VU'=>'Vanuatu',
+        'GB-WLS' =>'Wales',
         'WF'=>'Ostrovy Wallis a Futuna',
         'WS'=>'Samoa',
         'YE'=>'Jemen',
diff --git a/resources/lang/cs-CZ/mail.php b/resources/lang/cs-CZ/mail.php
index e846d7cbed..401f966bae 100644
--- a/resources/lang/cs-CZ/mail.php
+++ b/resources/lang/cs-CZ/mail.php
@@ -23,24 +23,25 @@ return [
     'Item_Requested' => 'Požadavek na položku',
     'License_Checkin_Notification' => 'Licence přidána v',
     'License_Checkout_Notification' => 'Licence byla zkontrolována',
+    'license_for'   => 'License for',
     'Low_Inventory_Report' => 'Hlášení o nízkých zásobách',
     'a_user_canceled' => 'Uživatel zrušil žádost o položku na webu',
     'a_user_requested' => 'Uživatel požádal o položku na webu',
     'acceptance_asset_accepted' => 'Uživatel potvrdil vlastnictví',
     'acceptance_asset_declined' => 'Uživatel zamítl vlastnictví',
-    'accessory_name' => 'Název příslušenství:',
-    'additional_notes' => 'Další Poznámky:',
+    'accessory_name' => 'Název příslušenství',
+    'additional_notes' => 'Další Poznámky',
     'admin_has_created' => 'Administrátor pro vás vytvořil účet na stránce :web.',
-    'asset' => 'Majetek:',
-    'asset_name' => 'Název majetku:',
+    'asset' => 'Majetek',
+    'asset_name' => 'Název majetku',
     'asset_requested' => 'Požadovaný majetek',
     'asset_tag' => 'Inventární číslo',
     'assets_warrantee_alert' => 'Je zde :count položka se zárukou končící v následujících :threshold dnech.|Jsou zde :count položek se zárukou končící v následujících :threshold dnech.',
     'assigned_to' => 'Přiděleno',
     'best_regards' => 'S pozdravem,',
-    'canceled' => 'Zrušeno:',
-    'checkin_date' => 'Datum převzetí:',
-    'checkout_date' => 'Datum vydání:',
+    'canceled' => 'Zrušeno',
+    'checkin_date' => 'Datum převzetí',
+    'checkout_date' => 'Datum vydání',
     'checkedout_from' => 'Zkontrolováno od',
     'checkedin_from'  => 'Zaškrtnuto z',
     'checked_into' => 'Ověřeno do',
@@ -49,27 +50,30 @@ return [
     'click_to_confirm' => 'Kliknutím na následující odkaz potvrdíte váš účet pro :web:',
     'current_QTY' => 'Aktuální množství',
     'days' => 'Dní',
-    'expecting_checkin_date' => 'Očekávané datum převzetí:',
+    'expecting_checkin_date' => 'Očekávané datum převzetí',
     'expires' => 'Vyprší',
     'hello' => 'Dobrý den',
     'hi' => 'Ahoj',
     'i_have_read' => 'Přečetl/a jsem si podmínky používání, souhlasím s pravidel používání a obdržel jsem tuto položku.',
     'inventory_report' => 'Zpráva o majetku',
-    'item' => 'Položka:',
+    'item' => 'Položka',
+    'item_checked_reminder' => 'This is a reminder that you currently have :count items checked out to you that you have not accepted or declined. Please click the link below to confirm your decision.',
     'license_expiring_alert' => 'Je zde :count licence, které končí platnost v příštích :threshold dnech.|Jsou zde :count licence, kterým končí platnost v příštích :threshold dnech.',
     'link_to_update_password' => 'Klepnutím na následující odkaz aktualizujte své heslo pro :web:',
-    'login' => 'Uživatelské jméno:',
+    'login' => 'Přihlášení',
     'login_first_admin' => 'Přihlaste se k nové instalaci Snipe-IT pomocí níže uvedených pověření:',
     'low_inventory_alert' => 'Je zde :count položka která je pod minimálním stavem nebo brzy bude.|Jsou zde :count položky které jsou pod minimálním stavem nebo brzy budou.',
     'min_QTY' => 'Minimální množství',
     'name' => 'Položka',
     'new_item_checked' => 'Nová položka byla odevzdána pod vaším jménem, podrobnosti jsou uvedeny níže.',
+    'new_item_checked_with_acceptance' => 'A new item has been checked out under your name that requires acceptance, details are below.',
+    'recent_item_checked' => 'An item was recently checked out under your name that requires acceptance, details are below.',
     'notes' => 'Poznámky',
-    'password' => 'Heslo:',
+    'password' => 'Heslo',
     'password_reset' => 'Resetování hesla',
     'read_the_terms' => 'Prosím přečtěte si níže uvedené podmínky použití.',
     'read_the_terms_and_click' => 'Přečtěte si prosím níže uvedené podmínky použití, a klikněte na odkaz v dolní části pro potvrzení, že jste si přečetli a souhlasili s podmínkami použití a obdrželi aktivum.',
-    'requested' => 'Zažádáno:',
+    'requested' => 'Požadováno',
     'reset_link' => 'Váš odkaz pro resetování hesla',
     'reset_password' => 'Pro zresetování vašeho hesla klikněte na odkaz:',
     'rights_reserved' => 'Všechna práva vyhrazena.',
@@ -86,8 +90,10 @@ return [
     'upcoming-audits' => 'Je zde :count položka, která má chystaný audit za :threshold dní.|Jsou zde :count položek, který se chystá k auditu za :threshold dní.',
     'user' => 'Uživatel',
     'username' => 'Uživatelské jméno',
+    'unaccepted_asset_reminder' => 'Reminder: You have Unaccepted Assets.',
     'welcome' => 'Vítej uživateli :name',
     'welcome_to' => 'Vítejte na :web!',
     'your_assets' => 'Zobrazit vaše položky',
     'your_credentials' => 'Vaše pověření Snipe-IT',
+    'mail_sent' => 'Mail sent successfully!',
 ];
diff --git a/resources/lang/cs-CZ/validation.php b/resources/lang/cs-CZ/validation.php
index 92c41a0c07..675b631bae 100644
--- a/resources/lang/cs-CZ/validation.php
+++ b/resources/lang/cs-CZ/validation.php
@@ -13,87 +13,150 @@ return [
     |
     */
 
-    'accepted'             => 'Je potřeba potvrdit :attribute.',
-    'active_url'           => ':attribute není platnou URL.',
-    'after'                => ':attribute nemůže být dříve než :date.',
-    'after_or_equal'       => 'Atribut musí mít datum následující nebo rovné: datum.',
-    'alpha'                => ':attribute může obsahovat pouze písmena.',
-    'alpha_dash'           => ':attribute může obsahovat pouze písmena, čísla, a pomlčky.',
-    'alpha_num'            => ':attribute může obsahovat pouze písmena čísla.',
-    'array'                => 'Atribut musí být atribut.',
-    'before'               => ':attribute nemůže být později než :date.',
-    'before_or_equal'      => 'Atribut: musí mít datum před datem nebo se rovnat: datum.',
-    'between'              => [
-        'numeric' => ':attribute musí být mezi :min - :max.',
-        'file'    => ':attribute musí být mezi :min - :max kilobajtů.',
-        'string'  => ':attribute smí obsahovat pouze :min - :max znaků.',
-        'array'   => 'Atribut: musí obsahovat položky: min a max.',
+    'accepted' => 'Je potřeba potvrdit :attribute.',
+    'accepted_if' => 'Položka :attribute je vyžadována, když :other je :value.',
+    'active_url' => ':attribute není platnou URL.',
+    'after' => ':attribute nemůže být později než :date.',
+    'after_or_equal' => 'Atribut musí mít datum následující nebo rovné :date.',
+    'alpha' => ':attribute může obsahovat pouze písmena.',
+    'alpha_dash' => ':attribute může obsahovat pouze písmena, čísla, a pomlčky.',
+    'alpha_num' => ':attribute může obsahovat pouze písmena a čísla.',
+    'array' => 'The :attribute field must be an array.',
+    'ascii' => 'The :attribute field must only contain single-byte alphanumeric characters and symbols.',
+    'before' => 'The :attribute field must be a date before :date.',
+    'before_or_equal' => 'The :attribute field must be a date before or equal to :date.',
+    'between' => [
+        'array' => ':attribute musí být mezi hodnotami :min a :max.',
+        'file' => ':attribute musí být větší než :min a menší než :max kilobytů.',
+        'numeric' => 'The :attribute field must be between :min and :max.',
+        'string' => 'The :attribute field must be between :min and :max characters.',
     ],
-    'boolean'              => ':attribute musí být true nebo false.',
-    'confirmed'            => 'Potvrzení :attribute se neshoduje.',
-    'date'                 => ':attribute není platným datem.',
-    'date_format'          => 'Atribut  :attribute nesouhlasí s formátem :format.',
-    'different'            => ':attribute a  :other se musí lišit.',
-    'digits'               => ':attribute musí být :digits číslo.',
-    'digits_between'       => ':attribute musí být mezi hodnotami :min a :max.',
-    'dimensions'           => 'Atribut: má neplatné kóty obrázku.',
-    'distinct'             => 'Pole atributu: atribut má duplicitní hodnotu.',
-    'email'                => 'Formát :attribute je neplatný.',
-    'exists'               => 'Zvolený :attribute je neplatný.',
-    'file'                 => 'Atribut: musí být soubor.',
-    'filled'               => 'Pole atributu: musí mít hodnotu.',
-    'image'                => ':attribute musí být obrázek.',
+    'boolean' => 'The :attribute field must be true or false.',
+    'can' => 'The :attribute field contains an unauthorized value.',
+    'confirmed' => 'The :attribute field confirmation does not match.',
+    'contains' => 'The :attribute field is missing a required value.',
+    'current_password' => 'The password is incorrect.',
+    'date' => 'The :attribute field must be a valid date.',
+    'date_equals' => 'The :attribute field must be a date equal to :date.',
+    'date_format' => 'The :attribute field must match the format :format.',
+    'decimal' => 'The :attribute field must have :decimal decimal places.',
+    'declined' => 'The :attribute field must be declined.',
+    'declined_if' => 'The :attribute field must be declined when :other is :value.',
+    'different' => 'The :attribute field and :other must be different.',
+    'digits' => 'The :attribute field must be :digits digits.',
+    'digits_between' => 'The :attribute field must be between :min and :max digits.',
+    'dimensions' => 'The :attribute field has invalid image dimensions.',
+    'distinct' => 'Pole atributu: atribut má duplicitní hodnotu.',
+    'doesnt_end_with' => 'The :attribute field must not end with one of the following: :values.',
+    'doesnt_start_with' => 'The :attribute field must not start with one of the following: :values.',
+    'email' => 'The :attribute field must be a valid email address.',
+    'ends_with' => 'The :attribute field must end with one of the following: :values.',
+    'enum' => 'Zvolený :attribute je neplatný.',
+    'exists' => 'Zvolený :attribute je neplatný.',
+    'extensions' => 'The :attribute field must have one of the following extensions: :values.',
+    'file' => 'The :attribute field must be a file.',
+    'filled' => 'Pole atributu: musí mít hodnotu.',
+    'gt' => [
+        'array' => 'The :attribute field must have more than :value items.',
+        'file' => 'The :attribute field must be greater than :value kilobytes.',
+        'numeric' => 'The :attribute field must be greater than :value.',
+        'string' => 'The :attribute field must be greater than :value characters.',
+    ],
+    'gte' => [
+        'array' => 'The :attribute field must have :value items or more.',
+        'file' => 'The :attribute field must be greater than or equal to :value kilobytes.',
+        'numeric' => 'The :attribute field must be greater than or equal to :value.',
+        'string' => 'The :attribute field must be greater than or equal to :value characters.',
+    ],
+    'hex_color' => 'The :attribute field must be a valid hexadecimal color.',
+    'image' => 'The :attribute field must be an image.',
     'import_field_empty'    => 'Hodnota pro :fieldname nemůže být null.',
-    'in'                   => 'Zvolený :attribute je neplatný.',
-    'in_array'             => 'Pole atributu neexistuje v: jiné.',
-    'integer'              => ':attribute musí být celočíselný.',
-    'ip'                   => ':attribute musí být platná IP adresa.',
-    'ipv4'                 => 'Atribut: musí mít platnou adresu IPv4.',
-    'ipv6'                 => 'Atribut: musí být platná adresa IPv6.',
-    'is_unique_department' => ':attribute musí být unikátní pro tuto lokalitu společnosti',
-    'json'                 => 'Atribut: musí být platný řetězec JSON.',
-    'max'                  => [
-        'numeric' => ':attribute nesmí být větší než :max.',
-        'file'    => ':attribute nesmí být větší než :max kilobajtů.',
-        'string'  => ':attribute nesmí být větší než :max znaků.',
-        'array'   => 'Atribut: Atribut nesmí mít více než: max položky.',
+    'in' => 'Zvolený :attribute je neplatný.',
+    'in_array' => 'The :attribute field must exist in :other.',
+    'integer' => 'The :attribute field must be an integer.',
+    'ip' => 'The :attribute field must be a valid IP address.',
+    'ipv4' => 'The :attribute field must be a valid IPv4 address.',
+    'ipv6' => 'The :attribute field must be a valid IPv6 address.',
+    'json' => 'The :attribute field must be a valid JSON string.',
+    'list' => 'The :attribute field must be a list.',
+    'lowercase' => 'The :attribute field must be lowercase.',
+    'lt' => [
+        'array' => 'The :attribute field must have less than :value items.',
+        'file' => 'The :attribute field must be less than :value kilobytes.',
+        'numeric' => 'The :attribute field must be less than :value.',
+        'string' => 'The :attribute field must be less than :value characters.',
     ],
-    'mimes'                => ':attribute musí být soubor typu: :values.',
-    'mimetypes'            => 'Atribut: musí být soubor typu:: values.',
-    'min'                  => [
-        'numeric' => ':attribute musí být minimálne :min.',
-        'file'    => ':attribute musí být minimálně :min kilobajtů.',
-        'string'  => ':attribute musí mít minimálně :min znaků.',
-        'array'   => 'Atribut musí mít alespoň: min položky.',
+    'lte' => [
+        'array' => 'The :attribute field must not have more than :value items.',
+        'file' => 'The :attribute field must be less than or equal to :value kilobytes.',
+        'numeric' => 'The :attribute field must be less than or equal to :value.',
+        'string' => 'The :attribute field must be less than or equal to :value characters.',
     ],
-    'starts_with'          => ':attribute musí končit jednou z následujících hodnot: :values.',
-    'ends_with'            => ':attribute musí končit jedním z těchto znaků: :values.',
+    'mac_address' => 'The :attribute field must be a valid MAC address.',
+    'max' => [
+        'array' => 'The :attribute field must not have more than :max items.',
+        'file' => 'The :attribute field must not be greater than :max kilobytes.',
+        'numeric' => 'The :attribute field must not be greater than :max.',
+        'string' => 'The :attribute field must not be greater than :max characters.',
+    ],
+    'max_digits' => 'The :attribute field must not have more than :max digits.',
+    'mimes' => 'The :attribute field must be a file of type: :values.',
+    'mimetypes' => 'The :attribute field must be a file of type: :values.',
+    'min' => [
+        'array' => 'The :attribute field must have at least :min items.',
+        'file' => 'The :attribute field must be at least :min kilobytes.',
+        'numeric' => 'The :attribute field must be at least :min.',
+        'string' => 'The :attribute field must be at least :min characters.',
+    ],
+    'min_digits' => 'The :attribute field must have at least :min digits.',
+    'missing' => 'The :attribute field must be missing.',
+    'missing_if' => 'The :attribute field must be missing when :other is :value.',
+    'missing_unless' => 'The :attribute field must be missing unless :other is :value.',
+    'missing_with' => 'The :attribute field must be missing when :values is present.',
+    'missing_with_all' => 'The :attribute field must be missing when :values are present.',
+    'multiple_of' => 'The :attribute field must be a multiple of :value.',
+    'not_in' => 'Zvolený :attribute je neplatný.',
+    'not_regex' => 'The :attribute field format is invalid.',
+    'numeric' => 'The :attribute field must be a number.',
+    'password' => [
+        'letters' => 'The :attribute field must contain at least one letter.',
+        'mixed' => 'The :attribute field must contain at least one uppercase and one lowercase letter.',
+        'numbers' => 'The :attribute field must contain at least one number.',
+        'symbols' => 'The :attribute field must contain at least one symbol.',
+        'uncompromised' => 'The given :attribute has appeared in a data leak. Please choose a different :attribute.',
+    ],
+    'percent'       => 'The depreciation minimum must be between 0 and 100 when depreciation type is percentage.',
 
-    'not_in'               => 'Zvolený :attribute je neplatný.',
-    'numeric'              => ':attribute musí být číslo.',
-    'present'              => 'Pole atributu musí být přítomno.',
-    'valid_regex'          => 'Toto není platný regulární výraz. ',
-    'regex'                => 'Formát :attribute je neplatný.',
-    'required'             => 'Pole :attribute je požadováno.',
-    'required_if'          => 'Položka :attribute je vyžadována, když :other je :value.',
-    'required_unless'      => 'Pole atributu: je povinné, pokud: jiný není v: hodnoty.',
-    'required_with'        => 'Hodnota :attribute je vyžadována, když je přítomno :values.',
-    'required_with_all'    => 'Pole atributu: je požadováno, když: jsou přítomny hodnoty.',
-    'required_without'     => 'Hodnota :attribute je vyžadována, když není přítomno :values.',
+    'present' => 'Pole atributu musí být přítomno.',
+    'present_if' => 'The :attribute field must be present when :other is :value.',
+    'present_unless' => 'The :attribute field must be present unless :other is :value.',
+    'present_with' => 'The :attribute field must be present when :values is present.',
+    'present_with_all' => 'The :attribute field must be present when :values are present.',
+    'prohibited' => 'The :attribute field is prohibited.',
+    'prohibited_if' => 'The :attribute field is prohibited when :other is :value.',
+    'prohibited_unless' => 'The :attribute field is prohibited unless :other is in :values.',
+    'prohibits' => 'The :attribute field prohibits :other from being present.',
+    'regex' => 'The :attribute field format is invalid.',
+    'required' => 'Pole :attribute je požadováno.',
+    'required_array_keys' => 'The :attribute field must contain entries for: :values.',
+    'required_if' => 'Položka :attribute je vyžadována, když :other je :value.',
+    'required_if_accepted' => 'The :attribute field is required when :other is accepted.',
+    'required_if_declined' => 'The :attribute field is required when :other is declined.',
+    'required_unless' => 'Pole atributu: je povinné, pokud: jiný není v: hodnoty.',
+    'required_with' => 'Hodnota :attribute je vyžadována, když je přítomno :values.',
+    'required_with_all' => 'The :attribute field is required when :values are present.',
+    'required_without' => 'Hodnota :attribute je vyžadována, když není přítomno :values.',
     'required_without_all' => 'Pole atributu: je vyžadováno, pokud nejsou žádné hodnoty: existují.',
-    'same'                 => ':attribute a :other se musí shodovat.',
-    'size'                 => [
-        'numeric' => ':attribute musí být :size.',
-        'file'    => ':attribute musí být :size kilobajtů.',
-        'string'  => ':attribute musí mít :size znaků.',
-        'array'   => 'Atribut: musí obsahovat: položky velikosti.',
+    'same' => 'The :attribute field must match :other.',
+    'size' => [
+        'array' => 'The :attribute field must contain :size items.',
+        'file' => 'The :attribute field must be :size kilobytes.',
+        'numeric' => 'The :attribute field must be :size.',
+        'string' => 'The :attribute field must be :size characters.',
     ],
+    'starts_with' => 'The :attribute field must start with one of the following: :values.',
     'string'               => 'Atribut: musí být řetězec.',
-    'timezone'             => 'Atribut: musí být platnou zónou.',
     'two_column_unique_undeleted' => ':attribute musí být unikátní napříč :table1 a :table2. ',
-    'unique'               => ':attribute byl již vybrán.',
-    'uploaded'             => 'Atribut: se nepodařilo nahrát.',
-    'url'                  => 'Formát :attribute je neplatný.',
     'unique_undeleted'     => 'Je třeba, aby se :attribute neopakoval.',
     'non_circular'         => ':attribute nesmí vytvořit kruhový odkaz.',
     'not_array'            => ':attribute nemůže být pole.',
@@ -102,11 +165,14 @@ return [
     'numbers'              => 'Heslo musí obsahovat alespoň jednu číslici.',
     'case_diff'            => 'Heslo musí použít smíšené znaky.',
     'symbols'              => 'Heslo musí obsahovat symboly.',
-    'gte'                  => [
-        'numeric'          => 'Hodnota nemůže být záporná'
-    ],
-    'checkboxes'           => ':attribute obsahuje neplatné možnosti.',
-    'radio_buttons'        => ':attribute je neplatný.',
+    'timezone' => 'The :attribute field must be a valid timezone.',
+    'unique' => ':attribute byl již vybrán.',
+    'uploaded' => 'Atribut: se nepodařilo nahrát.',
+    'uppercase' => 'The :attribute field must be uppercase.',
+    'url' => ':attribute není platnou URL.',
+    'ulid' => 'The :attribute field must be a valid ULID.',
+    'uuid' => 'The :attribute field must be a valid UUID.',
+    'fmcs_location' => 'Full multiple company support and location scoping is enabled in the Admin Settings, and the selected location and selected company are not compatible.',
 
 
     /*
@@ -120,16 +186,22 @@ return [
     |
     */
 
+    'email_array'      => 'Jedna nebo více e-mailových adres je neplatná.',
+    'checkboxes'           => ':attribute obsahuje neplatné možnosti.',
+    'radio_buttons'        => ':attribute je neplatný.',
+    
     'custom' => [
         'alpha_space' => 'Pole atributu: atribut obsahuje znak, který není povolen.',
-        'email_array'      => 'Jedna nebo více e-mailových adres je neplatná.',
+
         'hashed_pass'      => 'Vaše současné heslo je nesprávné',
         'dumbpwd'          => 'Toto heslo je příliš běžné.',
         'statuslabel_type' => 'Musíte vybrat platný typ štítku stavu',
+        'custom_field_not_found'          => 'This field does not seem to exist, please double check your custom field names.',
+        'custom_field_not_found_on_model' => 'This field seems to exist, but is not available on this Asset Model\'s fieldset.',
 
         // date_format validation with slightly less stupid messages. It duplicates a lot, but it gets the job done :(
-        // We use this because the default error message for date_format is reflects php Y-m-d, which non-PHP
-        // people won't know how to format. 
+        // We use this because the default error message for date_format reflects php Y-m-d, which non-PHP
+        // people won't know how to format.
         'purchase_date.date_format'     => ':attribute musí být platné datum ve formátu RRRR-MM-DD',
         'last_audit_date.date_format'   =>  ':attribute musí být platné datum ve formátu RRRR-MM-DD hh:mm:ss',
         'expiration_date.date_format'   =>  ':attribute musí být platné datum ve formátu RRRR-MM-DD',
@@ -137,9 +209,15 @@ return [
         'expected_checkin.date_format'  =>  ':attribute musí být platné datum ve formátu RRRR-MM-DD',
         'start_date.date_format'        =>  ':attribute musí být platné datum ve formátu RRRR-MM-DD',
         'end_date.date_format'          =>  ':attribute musí být platné datum ve formátu RRRR-MM-DD',
+        'invalid_value_in_field' => 'Neplatná hodnota zahrnutá v tomto poli',
 
-    ],
+        'ldap_username_field' => [
+            'not_in' =>         '<code>sAMAccountName</code> (mixed case) will likely not work. You should use <code>samaccountname</code> (lowercase) instead.'
+        ],
+        'ldap_auth_filter_query' => ['not_in' => '<code>uid=samaccountname</code> is probably not a valid auth filter. You probably want <code>uid=</code> '],
+        'ldap_filter' => ['regex' => 'This value should probably not be wrapped in parentheses.'],
 
+        ],
     /*
     |--------------------------------------------------------------------------
     | Custom Validation Attributes
@@ -155,8 +233,16 @@ return [
 
     /*
     |--------------------------------------------------------------------------
-    | Generic Validation Messages
+    | Generic Validation Messages - we use these in the jquery validation where we don't have
+    | access to the :attribute
     |--------------------------------------------------------------------------
     */
-    'invalid_value_in_field' => 'Neplatná hodnota zahrnutá v tomto poli',
+
+    'generic' => [
+        'invalid_value_in_field' => 'Neplatná hodnota zahrnutá v tomto poli',
+        'required' => 'This field is required',
+        'email' => 'Please enter a valid email address',
+    ],
+
+
 ];
diff --git a/resources/lang/cy-GB/account/general.php b/resources/lang/cy-GB/account/general.php
index 1a9e2c03b8..7f9e2f848e 100644
--- a/resources/lang/cy-GB/account/general.php
+++ b/resources/lang/cy-GB/account/general.php
@@ -2,10 +2,16 @@
 
 return array(
     'personal_api_keys' => 'Personal API Keys',
+    'personal_access_token' => 'Personal Access Token',
+    'personal_api_keys_success' => 'Personal API Key :key created sucessfully',
+    'here_is_api_key' => 'Here is your new personal access token. This is the only time it will be shown so do not lose it! You may now use this token to make API requests.',
     'api_key_warning' => 'When generating an API token, be sure to copy it down immediately as they will not be visible to you again.',
     'api_base_url' => 'Your API base url is located at:',
     'api_base_url_endpoint' => '/&lt;endpoint&gt;',
     'api_token_expiration_time' => 'API tokens are set to expire in:',
     'api_reference' => 'Please check the <a href="https://snipe-it.readme.io/reference" target="_blank">API reference</a> to find specific API endpoints and additional API documentation.',
     'profile_updated' => 'Account successfully updated',
+    'no_tokens' => 'You have not created any personal access tokens.',
+    'enable_sounds' => 'Enable sound effects',
+    'enable_confetti' => 'Enable confetti effects',
 );
diff --git a/resources/lang/cy-GB/admin/accessories/message.php b/resources/lang/cy-GB/admin/accessories/message.php
index a14eb5c3cc..85e06e49fa 100644
--- a/resources/lang/cy-GB/admin/accessories/message.php
+++ b/resources/lang/cy-GB/admin/accessories/message.php
@@ -26,7 +26,11 @@ return array(
         'error'   		=> 'Ategolyn heb ei nodi allan, ceisiwch eto o. g. y. dd',
         'success' 		=> 'Ategolyn wedi nodi allan yn llwyddiannus.',
         'unavailable'   => 'Accessory is not available for checkout. Check quantity available',
-        'user_does_not_exist' => 'Nid yw\'r defnyddiwr yna yn ddilys. Ceisiwch eto o.g.y.dd.'
+        'user_does_not_exist' => 'Nid yw\'r defnyddiwr yna yn ddilys. Ceisiwch eto o.g.y.dd.',
+         'checkout_qty' => array(
+            'lte'  => 'There is currently only one available accessory of this type, and you are trying to check out :checkout_qty. Please adjust the checkout quantity or the total stock of this accessory and try again.|There are :number_currently_remaining total available accessories, and you are trying to check out :checkout_qty. Please adjust the checkout quantity or the total stock of this accessory and try again.',
+            ),
+           
     ),
 
     'checkin' => array(
diff --git a/resources/lang/cy-GB/admin/accessories/table.php b/resources/lang/cy-GB/admin/accessories/table.php
index 7774723e28..d2fb119f20 100644
--- a/resources/lang/cy-GB/admin/accessories/table.php
+++ b/resources/lang/cy-GB/admin/accessories/table.php
@@ -6,6 +6,4 @@ return array(
     'id'      					=> 'Rhif Unigryw',
     'require_acceptance'      	=> 'Derbyn',
     'title'      				=> 'Enw Ategolyn',
-
-
 );
diff --git a/resources/lang/cy-GB/admin/components/message.php b/resources/lang/cy-GB/admin/components/message.php
index f89aedb4b8..6c535e625e 100644
--- a/resources/lang/cy-GB/admin/components/message.php
+++ b/resources/lang/cy-GB/admin/components/message.php
@@ -17,7 +17,8 @@ return array(
     '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.'
+        'success' => 'Cydran wedi dileu\'n llwyddiannus.',
+        'error_qty'   => 'Some components of this type are still checked out. Please check them in and try again.',
     ),
 
      'checkout' => array(
diff --git a/resources/lang/cy-GB/admin/consumables/general.php b/resources/lang/cy-GB/admin/consumables/general.php
index 4efaf8e9e2..34ff743000 100644
--- a/resources/lang/cy-GB/admin/consumables/general.php
+++ b/resources/lang/cy-GB/admin/consumables/general.php
@@ -8,4 +8,5 @@ return array(
     'remaining' 			            => 'Yn weddill',
     'total' 			                => 'Cyfanswm',
     'update'                            => 'Diweddaru nwydd traul',
+    'inventory_warning'                 => 'The inventory of this consumable is below the minimum amount of :min_count',
 );
diff --git a/resources/lang/cy-GB/admin/consumables/message.php b/resources/lang/cy-GB/admin/consumables/message.php
index f7f5438001..7acf2a33df 100644
--- a/resources/lang/cy-GB/admin/consumables/message.php
+++ b/resources/lang/cy-GB/admin/consumables/message.php
@@ -2,6 +2,7 @@
 
 return array(
 
+    'invalid_category_type' => 'The category must be a consumable category.',
     'does_not_exist' => 'Nid yw\'r nwydd traul yn bodoli.',
 
     'create' => array(
diff --git a/resources/lang/cy-GB/admin/custom_fields/general.php b/resources/lang/cy-GB/admin/custom_fields/general.php
index 3fa05de73e..e8a8ac9826 100644
--- a/resources/lang/cy-GB/admin/custom_fields/general.php
+++ b/resources/lang/cy-GB/admin/custom_fields/general.php
@@ -35,7 +35,7 @@ return [
     'create_field_title' => 'Create a new custom field',
     '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',
-    'show_in_email_short'     => 'Include in emails.',
+    'show_in_email_short' => 'Include in emails',
     'help_text' => 'Help Text',
     'help_text_description' => 'This is optional text that will appear below the form elements while editing an asset to provide context on the field.',
     'about_custom_fields_title' => 'About Custom Fields',
@@ -57,5 +57,8 @@ return [
     'show_in_requestable_list_short' => 'Show in requestable assets list',
     'show_in_requestable_list' => 'Show value in requestable assets list. Encrypted fields will not be shown',
     'encrypted_options' => 'This field is encrypted, so some display options will not be available.',
+    'display_checkin' => 'Display in checkin forms',
+    'display_checkout' => 'Display in checkout forms',
+    'display_audit' => 'Display in audit forms',
 
 ];
diff --git a/resources/lang/cy-GB/admin/custom_fields/message.php b/resources/lang/cy-GB/admin/custom_fields/message.php
index 30d7297b21..a1ca87bac2 100644
--- a/resources/lang/cy-GB/admin/custom_fields/message.php
+++ b/resources/lang/cy-GB/admin/custom_fields/message.php
@@ -5,6 +5,7 @@ return array(
     'field' => array(
         'invalid'   => 'Nid yw\'r maes yn bodoli.',
         'already_added'   => 'Maes eisoes yn bodoli',
+        'none_selected'   => 'No field selected',
 
         'create' => array(
             'error'   => 'Ni crewyd y maes, ceisiwch eto o. g. y. dd.',
diff --git a/resources/lang/cy-GB/admin/depreciations/general.php b/resources/lang/cy-GB/admin/depreciations/general.php
index 4a78177cca..ab63b8690a 100644
--- a/resources/lang/cy-GB/admin/depreciations/general.php
+++ b/resources/lang/cy-GB/admin/depreciations/general.php
@@ -13,4 +13,8 @@ return [
     'no_depreciations_warning'               => '<strong>Warning: </strong>
                       You do not currently have any depreciations set up.
                       Please set up at least one depreciation to view the depreciation report.',
+    'depreciation_method'                   => 'Adroddiad Dibrisiant',
+    'linear_depreciation'                   => 'Linear (Default)',
+    'half_1'                                => 'Half-year convention, always applied',
+    'half_2'                                => 'Half-year convention, applied with condition',
 ];
diff --git a/resources/lang/cy-GB/admin/hardware/form.php b/resources/lang/cy-GB/admin/hardware/form.php
index 960a9217fa..e79d5d2f47 100644
--- a/resources/lang/cy-GB/admin/hardware/form.php
+++ b/resources/lang/cy-GB/admin/hardware/form.php
@@ -55,8 +55,11 @@ return [
     'asset_location_update_default' => 'Update only default location',
     'asset_location_update_actual' => 'Update only actual location',
     'asset_not_deployable' => 'That asset status is not deployable. This asset cannot be checked out.',
-    'asset_deployable' => 'That status is deployable. This asset can be checked out.',
+    'asset_not_deployable_checkin' => 'That asset status is not deployable. Using this status label will checkin the asset.',
+    'asset_deployable' => 'This asset can be checked out.',
     'processing_spinner' => 'Processing... (This might take a bit of time on large files)',
+    'processing' => 'Processing... ',
     'optional_infos'  => 'Optional Information',
-    'order_details'   => 'Order Related Information'
+    'order_details'   => 'Order Related Information',
+    'calc_eol'    => 'If nulling the EOL date, use automatic EOL calculation based on the purchase date and EOL rate.',
 ];
diff --git a/resources/lang/cy-GB/admin/hardware/general.php b/resources/lang/cy-GB/admin/hardware/general.php
index 0633dc9359..86ccbdcb25 100644
--- a/resources/lang/cy-GB/admin/hardware/general.php
+++ b/resources/lang/cy-GB/admin/hardware/general.php
@@ -5,8 +5,8 @@ return [
     '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',
-    'bulk_checkin'              => 'Checkin Assets',
+    'bulk_checkout'             => 'Nodi swmp allan',
+    'bulk_checkin'              => 'Bulk Checkin',
     'checkin'  					=> 'Nodi Asedau I Mewn',
     'checkout'  				=> 'Nodi Asedau Allan',
     'clone'  					=> 'Dyblygu Ased',
@@ -27,8 +27,7 @@ return [
     'undeployable_tooltip'  	=> 'This asset has a status label that is undeployable and cannot be checked out at this time.',
     'view'  					=> 'Gweld Ased',
     'csv_error' => 'You have an error in your CSV file:',
-    'import_text' => '<p>Upload a CSV that contains asset history. The assets and users MUST already exist in the system, or they will be skipped. Matching assets for history import happens against the asset tag. We will try to find a matching user based on the user\'s name you provide, and the criteria you select below. If you do not select any criteria below, it will simply try to match on the username format you configured in the <code>Admin &gt; General Settings</code>.</p><p>Fields included in the CSV must match the headers: <strong>Asset Tag, Name, Checkout Date, Checkin Date</strong>. Any additional fields will be ignored. </p><p>Checkin Date: blank or future checkin dates will checkout items to associated user.  Excluding the Checkin Date column will create a checkin date with todays date.</p>
-    ',
+    'import_text' => '<p>Upload a CSV that contains asset history. The assets and users MUST already exist in the system, or they will be skipped. Matching assets for history import happens against the asset tag. We will try to find a matching user based on the user\'s name you provide, and the criteria you select below. If you do not select any criteria below, it will simply try to match on the username format you configured in the <code>Admin &gt; General Settings</code>.</p><p>Fields included in the CSV must match the headers: <strong>Asset Tag, Name, Checkout Date, Checkin Date</strong>. Any additional fields will be ignored. </p><p>Checkin Date: blank or future checkin dates will checkout items to associated user.  Excluding the Checkin Date column will create a checkin date with todays date.</p>    ',
     'csv_import_match_f-l' => 'Try to match users by <strong>firstname.lastname</strong> (<code>jane.smith</code>) format',
     'csv_import_match_initial_last' => 'Try to match users by <strong>first initial last name</strong> (<code>jsmith</code>) format',
     'csv_import_match_first' => 'Try to match users by <strong>first name</strong> (<code>jane</code>) format',
diff --git a/resources/lang/cy-GB/admin/hardware/message.php b/resources/lang/cy-GB/admin/hardware/message.php
index 5f41876580..74e4e660ed 100644
--- a/resources/lang/cy-GB/admin/hardware/message.php
+++ b/resources/lang/cy-GB/admin/hardware/message.php
@@ -2,19 +2,23 @@
 
 return [
 
-    '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_var'=> 'Asset with tag :asset_tag not found.',
-    'no_tag' 	        => 'No asset tag provided.',
+    'undeployable' 		 => '<strong>Warning: </strong> This asset has been marked as currently undeployable. If this status has changed, please update the asset status.',
+    'does_not_exist' 	 => 'Nid yw\'r ased yn bodoli.',
+    'does_not_exist_var' => 'Asset with tag :asset_tag not found.',
+    'no_tag' 	         => 'No asset tag provided.',
     'does_not_exist_or_not_requestable' => 'That asset does not exist or is not requestable.',
-    '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. ',
+    '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. ',
     'warning_audit_date_mismatch' 	=> 'This asset\'s next audit date (:next_audit_date) is before the last audit date (:last_audit_date). Please update the next audit date.',
+    'labels_generated'   => 'Labels were successfully generated.',
+    'error_generating_labels' => 'Error while generating labels.',
+    'no_assets_selected' => 'No assets selected.',
 
     'create' => [
         'error'   		=> 'Ni crewyd yr ased, ceisiwch eto o. g. y. dd. :(',
         'success' 		=> 'Ased wedi creu yn llwyddiannus. :)',
         'success_linked' => 'Asset with tag :tag was created successfully. <strong><a href=":link" style="color: white;">Click here to view</a></strong>.',
+        'multi_success_linked' => 'Asset with tag :links was created successfully.|:count assets were created succesfully. :links.',
+        'partial_failure' => 'An asset was unable to be created. Reason: :failures|:count assets were unable to be created. Reasons: :failures',
     ],
 
     'update' => [
@@ -52,20 +56,24 @@ return [
     ],
 
     'import' => [
+        'import_button'         => 'Process Import',
         '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',
         'file_missing' => 'The file selected is missing',
+        'file_already_deleted' => 'The file selected was already deleted',
         'header_row_has_malformed_characters' => 'One or more attributes in the header row contain malformed UTF-8 characters',
         'content_row_has_malformed_characters' => 'One or more attributes in the first row of content contain malformed UTF-8 characters',
+        'transliterate_failure' => 'Transliteration from :encoding to UTF-8 failed due to invalid characters in input'
     ],
 
 
     'delete' => [
         '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.',
+        'assigned_to_error' => '{1}Asset Tag: :asset_tag is currently checked out. Check in this device before deletion.|[2,*]Asset Tags: :asset_tag are currently checked out. Check in these devices before deletion.',
         'nothing_updated'   => 'Dim asedau wedi dewis, felly dim byd wedi\'i dileu.',
         'success' 		=> 'Ased wedi dileu\'n llwyddiannus.',
     ],
@@ -78,6 +86,11 @@ return [
         'no_assets_selected' => 'Rhaid i chi ddewis o leiaf un ased o\'r rhestr',
     ],
 
+    'multi-checkout' => [
+        'error'   => 'Asset was not checked out, please try again|Assets were not checked out, please try again',
+        'success' => 'Asset checked out successfully.|Assets checked out successfully.',
+    ],
+
     'checkin' => [
         'error'   		=> 'Ased heb ei nodi i mewn, ceisiwch eto o. g. y. dd',
         'success' 		=> 'Ased wedi nodi i mewn yn llwyddiannus.',
@@ -87,9 +100,10 @@ return [
     ],
 
     'requests' => [
-        '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',
+        'error'   		=> 'Request was not successful, please try again.',
+        'success' 		=> 'Request successfully submitted.',
+        'canceled'      => 'Request successfully canceled.',
+        'cancel'        => 'Cancel this item request',
     ],
 
 ];
diff --git a/resources/lang/cy-GB/admin/hardware/table.php b/resources/lang/cy-GB/admin/hardware/table.php
index ba9f2ea38d..546f0d9a73 100644
--- a/resources/lang/cy-GB/admin/hardware/table.php
+++ b/resources/lang/cy-GB/admin/hardware/table.php
@@ -25,7 +25,6 @@ return [
     'image'		    => 'Delwedd Dyfais',
     'days_without_acceptance' => 'Diwrnodau Heb Derbyn',
     'monthly_depreciation' => 'Monthly Depreciation',
-    'assigned_to'    => 'Wedi Neilltuo i',
     'requesting_user' => 'Requesting User',
     'requested_date' => 'Requested Date',
     'changed'       => 'Wedi newid',
diff --git a/resources/lang/cy-GB/admin/kits/general.php b/resources/lang/cy-GB/admin/kits/general.php
index 50ac358df1..749c332d9e 100644
--- a/resources/lang/cy-GB/admin/kits/general.php
+++ b/resources/lang/cy-GB/admin/kits/general.php
@@ -47,4 +47,5 @@ return [
     'kit_deleted'                       => 'Kit was successfully deleted',
     'kit_model_updated'                 => 'Model was successfully updated',
     'kit_model_detached'                => 'Model was successfully detached',
+    'model_already_attached'            => 'Model already attached to kit',
 ];
diff --git a/resources/lang/cy-GB/admin/licenses/general.php b/resources/lang/cy-GB/admin/licenses/general.php
index 1583278259..523cb50fe3 100644
--- a/resources/lang/cy-GB/admin/licenses/general.php
+++ b/resources/lang/cy-GB/admin/licenses/general.php
@@ -14,6 +14,7 @@ return array(
     'info'  					=> 'Gwybodaeth Trwydded',
     'license_seats'  			=> 'Seddi Trwydded',
     'seat'  					=> 'Sedd',
+    'seat_count'  				=> 'Seat :count',
     'seats'  					=> 'Seddi',
     'software_licenses'  		=> 'Trwyddedau Meddalwedd',
     'user'  					=> 'Defnyddiwr',
@@ -23,12 +24,12 @@ return array(
         [
             'checkin_all'           => [
                 'button'            => 'Checkin All Seats',
-                'modal'             => 'This will action checkin one seat. | This action will checkin all :checkedout_seats_count seats for this license.',
+                'modal'             => 'This action will checkin one seat. | This action will checkin all :checkedout_seats_count seats for this license.',
                 'enabled_tooltip'   => 'Checkin ALL seats for this license from both users and assets',
                 'disabled_tooltip'  => 'This is disabled because there are no seats currently checked out',
                 'disabled_tooltip_reassignable'  => 'This is disabled because the License is not reassignable',
                 'success'           => 'License successfully checked in! | All licenses were successfully checked in!',
-                'log_msg'           => 'Checked in via bulk license checkout in license GUI',
+                'log_msg'           => 'Checked in via bulk license checkin in license GUI',
             ],
 
             'checkout_all'              => [
diff --git a/resources/lang/cy-GB/admin/licenses/message.php b/resources/lang/cy-GB/admin/licenses/message.php
index 765824681b..521d9b0dc6 100644
--- a/resources/lang/cy-GB/admin/licenses/message.php
+++ b/resources/lang/cy-GB/admin/licenses/message.php
@@ -44,10 +44,13 @@ return array(
         'error'   => 'Nid oedd yn bosib nodi\'r trwydded allan. Ceisiwch eto o. g. y. dd.',
         'success' => 'Trwydded wedi nodi allan yn llwyddiannus',
         'not_enough_seats' => 'Not enough license seats available for checkout',
+        'mismatch' => 'The license seat provided does not match the license',
+        'unavailable' => 'This seat is not available for checkout.',
     ),
 
     'checkin' => array(
         'error'   => 'Nid oedd yn bosib nodi\'r trwydded i mewn. Ceisiwch eto o. g. y. dd.',
+        'not_reassignable' => 'License not reassignable',
         'success' => 'Trwydded wedi nodi i fewn yn llwyddiannus'
     ),
 
diff --git a/resources/lang/cy-GB/admin/locations/message.php b/resources/lang/cy-GB/admin/locations/message.php
index 204368aa61..1a85c831dd 100644
--- a/resources/lang/cy-GB/admin/locations/message.php
+++ b/resources/lang/cy-GB/admin/locations/message.php
@@ -3,11 +3,12 @@
 return array(
 
     'does_not_exist' => 'Nid yw\'r lleoliad yn bodoli.',
-    'assoc_users'    => 'This location is not currently deletable because it is the location of record for at least one asset or user, has assets assigned to it, or is the parent location of another location. Please update your models to no longer reference this company and try again. ',
+    'assoc_users'    => 'This location is not currently deletable because it is the location of record for at least one asset or user, has assets assigned to it, or is the parent location of another location. Please update your records to no longer reference this location and try again ',
     '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. ',
     'assigned_assets' => 'Assigned Assets',
     'current_location' => 'Current Location',
+    'open_map' => 'Open in :map_provider_icon Maps',
 
 
     'create' => array(
@@ -20,6 +21,11 @@ return array(
         'success' => 'Lleoliad wedi diweddaru\'n llwyddiannus.'
     ),
 
+    'restore' => array(
+        'error'   => 'Location was not restored, please try again',
+        'success' => 'Location restored successfully.'
+    ),
+
     '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.',
diff --git a/resources/lang/cy-GB/admin/locations/table.php b/resources/lang/cy-GB/admin/locations/table.php
index 172bcd6faa..6444fb5df4 100644
--- a/resources/lang/cy-GB/admin/locations/table.php
+++ b/resources/lang/cy-GB/admin/locations/table.php
@@ -39,4 +39,5 @@ return [
     'signed_by_finance_auditor' => 'Signed By (Finance Auditor):',
     'signed_by_location_manager' => 'Signed By (Location Manager):',
     'signed_by'                 => 'Signed Off By:',
+    'clone'  					=> 'Clone Location',
 ];
diff --git a/resources/lang/cy-GB/admin/models/general.php b/resources/lang/cy-GB/admin/models/general.php
index c0926c19c2..ef183fae0c 100644
--- a/resources/lang/cy-GB/admin/models/general.php
+++ b/resources/lang/cy-GB/admin/models/general.php
@@ -3,7 +3,7 @@
 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'  					        => 'This model has been deleted.',
+    'deleted'  					=> 'This model has been deleted.',
     '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'          => 'You are about to delete one asset model.|You are about to delete :model_count asset models.',
diff --git a/resources/lang/cy-GB/admin/models/message.php b/resources/lang/cy-GB/admin/models/message.php
index eadedfe479..76ba22c70a 100644
--- a/resources/lang/cy-GB/admin/models/message.php
+++ b/resources/lang/cy-GB/admin/models/message.php
@@ -7,7 +7,7 @@ return array(
     'no_association' => 'WARNING! The asset model for this item is invalid or missing!',
     'no_association_fix' => 'This will break things in weird and horrible ways. Edit this asset now to assign it a model.',
     'assoc_users'	 => 'Mae\'r model yma wedi perthnasu hefo un neu mwy o asedau. Fydd rhaid dileu\'r asedau ac yna trio eto. ',
-
+    'invalid_category_type' => 'This category must be an asset category.',
 
     'create' => array(
         'error'   => 'Ni crewyd y model, ceisiwch eto o.g.y.dd.',
diff --git a/resources/lang/cy-GB/admin/reports/general.php b/resources/lang/cy-GB/admin/reports/general.php
index d069e15fea..8d95a77cb1 100644
--- a/resources/lang/cy-GB/admin/reports/general.php
+++ b/resources/lang/cy-GB/admin/reports/general.php
@@ -4,6 +4,7 @@ return [
     'info'   => 'Dewiswch yr opsiynau rydych chi eu heisiau ar gyfer eich adroddiad ased.',
     'deleted_user' => 'Deleted user',
     'send_reminder' => 'Send reminder',
+    'cannot_send_reminder' => 'User has been deleted or does not have an email address so cannot receive a reminder',
     'reminder_sent' => 'Reminder sent',
     'acceptance_deleted' => 'Acceptance request deleted',
     'acceptance_request' => 'Acceptance request',
@@ -13,5 +14,10 @@ return [
         'user_state' => 'User State',
         'user_country' => 'User Country',
         'user_zip' => 'User Zip'
-    ]
-];
\ No newline at end of file
+    ],
+    'open_saved_template' => 'Open Saved Template',
+    'save_template' =>  'Save Template',
+    'select_a_template' => 'Select a Template',
+    'template_name' => 'Template Name',
+    'update_template' => 'Update Template',
+];
diff --git a/resources/lang/cy-GB/admin/reports/message.php b/resources/lang/cy-GB/admin/reports/message.php
index 9864b0924a..2800bbdf0b 100644
--- a/resources/lang/cy-GB/admin/reports/message.php
+++ b/resources/lang/cy-GB/admin/reports/message.php
@@ -1,5 +1,16 @@
 <?php
 
-return array(
-    'error'   => 'Rhaid i chi ddewis o leiaf un opsiwn.'
-);
+return [
+    'about_templates' => 'About Saved Templates',
+    'saving_templates_description' => 'Select your options, then enter the name of your template in the box above and click the \'Save Template\' button. Use the dropdown to select a previously saved template.',
+    'create'  => [
+        'success' => 'Template saved successfully',
+    ],
+    'update' => [
+        'success' => 'Template updated successfully',
+    ],
+    'delete' => [
+        'success' => 'Template deleted',
+        'no_delete_permission' => 'Template does not exist or you do not have permission to delete it.',
+    ],
+];
diff --git a/resources/lang/cy-GB/admin/settings/general.php b/resources/lang/cy-GB/admin/settings/general.php
index 0559776548..de0ceb8531 100644
--- a/resources/lang/cy-GB/admin/settings/general.php
+++ b/resources/lang/cy-GB/admin/settings/general.php
@@ -8,13 +8,13 @@ return [
     'ad_append_domain'          => 'Append domain name to username field',
     'ad_append_domain_help'     => 'User isn\'t required to write "username@domain.local", they can just type "username".',
     '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.',
+    'admin_cc_email_help'       => 'Send a copy of checkin/checkout emails to this address.',
     'admin_settings'            => 'Admin Settings',
     'is_ad'				        => 'Mae hwn yn Server Active Directory',
     'alerts'                	=> 'Alerts',
     'alert_title'               => 'Update Notification Settings',
     'alert_email'				=> 'Gyrru rhybuddion i',
-    'alert_email_help'    => 'Email addresses or distribution lists you want alerts to be sent to, comma separated',
+    'alert_email_help'          => 'Email addresses or distribution lists you want alerts to be sent to, comma separated.',
     'alerts_enabled'			=> 'Rhybuddion ebost wedi alluogi',
     'alert_interval'			=> 'Trothwy Rhybuddion sy\'n Dod i Ben (mewn dyddiau)',
     'alert_inv_threshold'		=> 'Trothwy Rhybudd Rhestr',
@@ -31,15 +31,18 @@ return [
     'backups'					=> 'Copi wrth gefn',
     'backups_help'              => 'Create, download, and restore backups ',
     'backups_restoring'         => 'Restoring from Backup',
+    'backups_clean' => 'Clean the backed-up database before restore',
+    'backups_clean_helptext' => "This can be useful if you're changing between database versions",
     'backups_upload'            => 'Upload Backup',
     'backups_path'              => 'Backups on the server are stored in <code>:path</code>',
-    'backups_restore_warning'   => 'Use the restore button <small><span class="btn btn-xs btn-warning"><i class="text-white fas fa-retweet" aria-hidden="true"></i></span></small> to restore from a previous backup. (This does not currently work with S3 file storage or Docker.)<br><br>Your <strong>entire :app_name database and any uploaded files will be completely replaced</strong> by what\'s in the backup file.  ',
+    'backups_restore_warning'   => 'Use the restore button <small><span class="btn btn-xs btn-warning"><i class="text-white fas fa-retweet" aria-hidden="true"></i></span></small> to restore from a previous backup. (This does not currently work with S3 file storage or Docker.)<br><br>Your <strong>entire :app_name database and any uploaded files will be completely replaced</strong> by what\'s in the backup file  ',
     'backups_logged_out'         => 'All existing users, including you, will be logged out once your restore is complete.',
     'backups_large'             => 'Very large backups may time out on the restore attempt and may still need to be run via command line. ',
     'barcode_settings'			=> 'Gosodiadau Barcode',
     'confirm_purge'			    => 'Cadarnhau Clirio',
     'confirm_purge_help'		=> 'Enter the text "DELETE" in the box below to purge your deleted records. This action cannot be undone and will PERMANENTLY delete all soft-deleted items and users. (You should make a backup first, just to be safe.)',
     'custom_css'				=> 'Addasu CSS',
+    'custom_css_placeholder'	=> 'Add your custom 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.',
@@ -47,34 +50,34 @@ return [
     '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_eula_text_placeholder' => 'Add your default EULA text',
     'default_language'			=> 'Iaith Diofyn',
     'default_eula_help_text'	=> 'Yn ogystal, fedrwch perthnasu CTDT yn erbyn asedau penodol.',
     'acceptance_note'           => 'Add a note for your decision (Optional)',
     '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_qr'                => 'Display 2D barcode',
     'display_alt_barcode'		=> 'Arddangos barcode 1D',
-    'email_logo'                => 'Logo ebyst',
     'barcode_type'				=> 'Math Barcode 2D',
     'alt_barcode_type'			=> 'Math Barcode 1D',
-    'email_logo_size'       => 'Logo sgwar sydd edrych orau mewn ebost. ',
     'enabled'                   => 'Enabled',
     '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>.',
+    'empty_row_count'           => 'Field Start Offset (Empty Rows)',
+    'empty_row_count_help'      => 'Fields will begin populating after this many empty rows are skipped at the top of the label.',
     'favicon'                   => 'Favicon',
     'favicon_format'            => 'Mathau o ffeiliau a dderbynnir yw ico, png, a gif. Mae\'n bosib cewch trafferthion hefo rhai gwahanol mewn rhai porrwyr.',
     'favicon_size'          => 'Dylith favicons bod yn delweddau sgwar 16x16 pixels.',
     '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.',
+    'footer_text_placeholder'   => 'Optional footer text',
     'general_settings'			=> 'Gosodiadau Cyffredinol',
-    'general_settings_keywords' => 'company support, signature, acceptance, email format, username format, images, per page, thumbnail, eula, gravatar, tos, dashboard, privacy',
     'general_settings_help'     => 'Default EULA and more',
     'generate_backup'			=> 'Creu copi-wrth-gefn',
     'google_workspaces'         => 'Google Workspaces',
     'header_color'              => 'Lliw penawd',
     'info'                      => 'Mae\'r gosodiadau yma yn caniatau i chi addasu elfennau o\'r system.',
-    'label_logo'                => 'Logo Label',
     'label_logo_size'           => 'Logos sgwar sydd orau - dangosir ar y dde ar top label ased. ',
     'laravel'                   => 'Fersiwn Laravel',
     'ldap'                      => 'LDAP',
@@ -94,7 +97,7 @@ return [
     '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_manager'              => 'LDAP Manager',
     '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_help'          => 'This should start with ldap:// (for unencrypted) or ldaps:// (for TLS or 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.',
@@ -108,8 +111,8 @@ return [
     '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_pw_sync'              => 'Cache LDAP Passwords',
+    'ldap_pw_sync_help'         => 'Uncheck this box if you do not wish to keep LDAP passwords cached as local hashed passwords. Disabling this means that your users may not be able to login if your LDAP server is unreachable for some reason.',
     'ldap_username_field'       => 'Maes Enw Defnyddiwr',
     'ldap_lname_field'          => 'Enw Olaf',
     'ldap_fname_field'          => 'Enw Cyntaf LDAP',
@@ -117,13 +120,15 @@ return [
     'ldap_version'              => 'Fersiwn LDAP',
     'ldap_active_flag'          => 'Nodi bod LDAP yn weithredol',
     'ldap_activated_flag_help'  => 'This value is used to determine whether a synced user can login to Snipe-IT. <strong>It does not affect the ability to check items in or out to them</strong>, and should be the <strong>attribute name</strong> within your AD/LDAP, <strong>not the value</strong>. <br><br>If this field is set to a field name that does not exist in your AD/LDAP, or the value in the AD/LDAP field is set to <code>0</code> or <code>false</code>, <strong>user login will be disabled</strong>. If the value in the AD/LDAP field is set to <code>1</code> or <code>true</code> or <em>any other text</em> means the user can log in. When the field is blank in your AD, we respect the <code>userAccountControl</code> attribute, which usually allows non-suspended users to log in.',
+    'ldap_invert_active_flag'   => 'LDAP Invert Active Flag',
+    'ldap_invert_active_flag_help'     => 'If enabled: when the value returned by LDAP Active Flag is <code>0</code> or <code>false</code> the user account will be active.',
     'ldap_emp_num'              => 'LDAP Rhif Cyflogai',
     'ldap_email'                => 'Ebost LDAP',
     'ldap_test'                 => 'Test LDAP',
     'ldap_test_sync'            => 'Test LDAP Synchronization',
     'license'                   => 'Trwydded Meddalwedd',
-    'load_remote'               => 'Use Gravatar',
-    'load_remote_help_text'		=> 'Uncheck this box if your install cannot load scripts from the outside internet. This will prevent Snipe-IT from trying load images from Gravatar.',
+    'load_remote'               => 'Load Remote Avatars',
+    'load_remote_help_text'		=> 'Uncheck this box if your install cannot load scripts from the outside internet. This will prevent Snipe-IT from trying load avatars from Gravatar or other outside sources.',
     'login'                     => 'Login Attempts',
     'login_attempt'             => 'Login Attempt',
     'login_ip'                  => 'Cyfeiriad IP',
@@ -131,6 +136,7 @@ return [
     'login_user_agent'          => 'User Agent',
     'login_help'                => 'List of attempted logins',
     'login_note'                => 'Nodyn Mewngofnodi',
+    'login_note_placeholder'            => "If you do not have a login or have found a device belonging to this company, please call technical support at 888-555-1212. Thank you.",
     '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',
@@ -146,13 +152,16 @@ return [
     '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',
+    'scope_locations_fmcs_support_text'  => 'Scope Locations with Full Multiple Companies Support',
+    'scope_locations_fmcs_support_help_text'  => 'Restrict locations to their selected company.',
+    'scope_locations_fmcs_check_button' => 'Check Compatibility',
+    'scope_locations_fmcs_support_disabled_text'  => 'This option is disabled because you have conflicting locations set for :count or more items.',
     'show_in_model_list'   => 'Dangos mewn dewislen modelau',
     'optional'					=> 'dewisol',
     'per_page'                  => 'Canlyniadau fesul tudalen',
     'php'                       => 'Fersiwn PHP',
-    'php_info'                  => 'PHP Info',
+    'php_info'                  => 'PHP info',
     'php_overview'              => 'PHP',
-    'php_overview_keywords'     => 'phpinfo, system, info',
     'php_overview_help'         => 'PHP System info',
     '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.',
@@ -218,6 +227,8 @@ return [
     'webhook_integration_help'    => ':app integration is optional, however the endpoint and channel are required if you wish to use it. To configure :app integration, you must first <a href=":webhook_link" target="_new" rel="noopener">create an incoming webhook</a> on your :app account. Click on the <strong>Test :app Integration</strong> button to confirm your settings are correct before saving. ',
     'webhook_integration_help_button'    => 'Once you have saved your :app information, a test button will appear.',
     'webhook_test_help'           => 'Test whether your :app integration is configured correctly. YOU MUST SAVE YOUR UPDATED :app SETTINGS FIRST.',
+    'shortcuts_enabled'         => 'Enable Shortcuts',
+    'shortcuts_help_text'       => '<strong>Windows</strong>: Alt + Access key, <strong>Mac</strong>: Control + Option + Access key',
     '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',
@@ -227,7 +238,6 @@ return [
     'update'                    => 'Diweddaru Gosodiadau',
     'value'                     => 'Gwerth',
     'brand'                     => 'Brandio',
-    'brand_keywords'            => 'footer, logo, print, theme, skin, header, colors, color, css',
     'brand_help'                => 'Logo, Enw\'r Wefan',
     'web_brand'                 => 'Web Branding Type',
     'about_settings_title'      => 'Amdan Gosodiadau',
@@ -276,6 +286,8 @@ return [
     '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.',
+    'require_checkinout_notes'  => 'Require Notes on Checkin/Checkout',
+    'require_checkinout_notes_help_text'    => 'Enabling this feature will require the note fields to be populated when checking in or checking out an asset.',
     'left'        => 'chwith',
     'right'        => 'dde',
     'top'        => 'top',
@@ -313,24 +325,24 @@ return [
     'filter_by_keyword' => 'Filter by setting keyword',
     'security' => 'Diogelwch',
     'security_title' => 'Update Security Settings',
-    'security_keywords' => 'password, passwords, requirements, two factor, two-factor, common passwords, remote login, logout, authentication',
     'security_help' => 'Two-factor, Password Restrictions',
-    'groups_keywords' => 'permissions, permission groups, authorization',
     'groups_help' => 'Account permission groups',
     'localization' => 'Localization',
     'localization_title' => 'Update Localization Settings',
-    'localization_keywords' => 'localization, currency, local, locale, time zone, timezone, international, internatinalization, language, languages, translation',
     'localization_help' => 'Language, date display',
     'notifications' => 'Notifications',
     'notifications_help' => 'Email Alerts & Audit Settings',
     'asset_tags_help' => 'Incrementing and prefixes',
     'labels' => 'Labelau',
     'labels_title' => 'Update Label Settings',
-    'labels_help' => 'Label sizes &amp; settings',
-    'purge_keywords' => 'permanently delete',
+    'labels_help' => 'Barcodes &amp; label settings',
     'purge_help' => 'Clirio cofnodion sydd wedi\'i dileu',
     'ldap_extension_warning' => 'It does not look like the LDAP extension is installed or enabled on this server. You can still save your settings, but you will need to enable the LDAP extension for PHP before LDAP syncing or login will work.',
     'ldap_ad' => 'LDAP/AD',
+    'ldap_test_label' => 'Test LDAP Sync',
+    'ldap_test_login' => ' Test LDAP Login',
+    'ldap_username_placeholder' => 'LDAP Username',
+    'ldap_password_placeholder' => 'LDAP Password',
     'employee_number' => 'Employee Number',
     'create_admin_user' => 'Create a User ::',
     'create_admin_success' => 'Success! Your admin user has been added!',
@@ -342,6 +354,8 @@ return [
     'setup_migration_create_user' => 'Next: Create User',
     'ldap_settings_link' => 'LDAP Settings Page',
     'slack_test' => 'Test <i class="fab fa-slack"></i> Integration',
+    'status_label_name' => 'Status Label Name',
+    'super_admin_only'  => 'Super Admin Only',
     'label2_enable'           => 'New Label Engine',
     'label2_enable_help'      => 'Switch to the new label engine. <b>Note: You will need to save this setting before setting others.</b>',
     'label2_template'         => 'Template',
@@ -356,12 +370,15 @@ return [
     'label2_2d_type'          => 'Math Barcode 2D',
     'label2_2d_type_help'     => 'Format for 2D barcodes',
     'label2_2d_target'        => '2D Barcode Target',
-    'label2_2d_target_help'   => 'The URL the 2D barcode points to when scanned',
+    'label2_2d_target_help'   => 'The data that will be contained in the 2D barcode',
     'label2_fields'           => 'Field Definitions',
     'label2_fields_help'      => 'Fields can be added, removed, and reordered in the left column. For each field, multiple options for Label and DataSource can be added, removed, and reordered in the right column.',
+    'purge_barcodes' => 'Purge Barcodes',
     'help_asterisk_bold'    => 'Text entered as <code>**text**</code> will be displayed as bold',
     'help_blank_to_use'     => 'Leave blank to use the value from <code>:setting_name</code>',
     'help_default_will_use' => '<code>:default</code> will use the value from <code>:setting_name</code>. <br>Note that the value of the barcodes must comply with the respective barcode spec in order to be successfully generated. Please see <a href="https://snipe-it.readme.io/docs/barcodes">the documentation <i class="fa fa-external-link"></i></a> for more details. ',
+    'asset_id'              => 'Asset ID',
+    'data'               => 'Data',
     'default'               => 'Default',
     'none'                  => 'None',
     'google_callback_help' => 'This should be entered as the callback URL in your Google OAuth app settings in your organization&apos;s <strong><a href="https://console.cloud.google.com/" target="_blank">Google developer console <i class="fa fa-external-link" aria-hidden="true"></i></a></strong>.',
@@ -373,7 +390,100 @@ return [
     'database_driver' => 'Database Driver',
     'bs_table_storage' => 'Table Storage',
     'timezone' => 'Timezone',
+    'test_mail' => 'Test Mail',
     'profile_edit'          => 'Edit Profile',
     'profile_edit_help'          => 'Allow users to edit their own profiles.',
+    'default_avatar' => 'Custom Default Avatar',
+    'default_avatar_help' => 'This image will be displayed as a profile if a user does not have a profile photo.',
+    'restore_default_avatar' => 'Restore <a href=":default_avatar" data-toggle="lightbox" data-type="image">original system default avatar</a>',
+    'restore_default_avatar_help' => '',
+    'due_checkin_days' => 'Due For Checkin Warning',
+    'due_checkin_days_help' => 'How many days before the expected checkin of an asset should it be listed in the "Due for checkin" page?',
+    'no_groups' => 'No groups have been created yet. Visit <code>Admin Settings > Permission Groups</code> to add one.',
+    'text' => 'Text',
+
+    'username_formats' => [
+        'username_format'		=> 'Fformat enw defnyddiwr',
+        'firstname_lastname_format'	=> 'Enw Cyntaf Enw Olaf (jane.smith)',
+        'first_name_format'	        => 'First Name (jane)',
+        'last_name_format'		=> 'Last Name (doe)',
+        'filastname_format'			=> 'First Initial Last Name (jsmith)',
+        'lastnamefirstinitial_format' =>  'Last Name First Initial (smithj)',
+        'firstname_lastname_underscore_format' => 'First Name Last Name (jane_smith)',
+        'firstinitial.lastname' => 'First Initial Last Name (j.smith)',
+        'lastname_firstinitial' => 'Last Name First Initial (smith_j)',
+        'lastname_dot_firstinitial_format' => 'Last Name First Initial (smith.j)',
+        'firstnamelastname'     => 'First Name Last Name (janesmith)',
+        'firstnamelastinitial'  => 'First Name Last Initial (janes)',
+        'lastnamefirstname'      => 'Last Name.First Name (smith.jane)',
+    ],
+
+    'email_formats' => [
+        'email_format'			=> 'Fformat Ebost',
+        'firstname_lastname_format'	=> 'Enw Cyntaf Enw Olaf (jane.smith@example.com)',
+        'first_name_format'		=> 'Enw Cyntaf (jane@example.com)',
+        'last_name_format'		=> 'Last Name (doe@example.com)',
+        'filastname_format'			=> 'Llythyren Cyntaf Enw Cyntaf Cyfenw (jsmith@example.com)',
+        'lastnamefirstinitial_format' =>  'Enw Olaf Llythyren Cyntaf Enw Cyntaf (smithj@example.com)',
+        'firstname_lastname_underscore_format' => 'Enw Cyntaf Enw Olaf (jane.smith@example.com)',
+        'firstinitial.lastname' => 'Llythyren Cyntaf Enw Cyntaf Cyfenw (jsmith@example.com)',
+        'lastname_firstinitial' => 'Last Name First Initial (smith_j@example.com)',
+        'lastname_dot_firstinitial_format' => 'Last Name First Initial (smith.j@example.com)',
+        'firstnamelastname'     => 'First Name Last Name (janesmith@example.com)',
+        'firstnamelastinitial'  => 'First Name Last Initial (janes@example.com)',
+        'lastnamefirstname'      => 'Last Name.First Name (smith.jane@example.com)',
+    ],
+
+
+
+    'logo_labels' => [
+        'acceptance_pdf_logo'       => 'PDF Logo',
+        'email_logo'                => 'Logo ebyst',
+        'label_logo'                => 'Logo Label',
+        'logo'                      => 'Site Logo',
+        'favicon'                   => 'Favicon',
+    ],
+
+    'logo_help' => [
+        'email_logo_size'       => 'Logo sgwar sydd edrych orau mewn ebost. ',
+    ],
+
+    'logo_option_types' => [
+        'text' => 'Text',
+        'logo' => 'Logo',
+        'logo_and_text' => 'Logo and Text',
+    ],
+
+
+    'legends' => [
+        'scoping' => 'Scoping',
+        'formats' => 'Default Formats',
+        'profiles' => 'User Profiles',
+        'eula' => 'EULA & Acceptance Preferences',
+        'misc_display' => 'Miscellaneous Display Options',
+        'email' => 'Email Preferences',
+        'checkin' => 'Checkin Preferences',
+        'dashboard' => 'Login & Dashboard Preferences',
+        'misc' => 'Miscellaneous',
+        'logos' => 'Logos & Display',
+        'colors' => 'Colors & Skins',
+        'footer' => 'Footer Preferences',
+        'security' => 'Security Preferences',
+        'general' => 'General',
+        'intervals' => 'Intervals & Thresholds',
+    ],
+
+
+    /* Keywords for settings overview help */
+    'keywords' => [
+        'brand'             => 'footer, logo, print, theme, skin, header, colors, color, css',
+        'general_settings'  => 'company support, signature, acceptance, email format, username format, images, per page, thumbnail, eula, gravatar, tos, dashboard, privacy',
+        'groups'            => 'permissions, permission groups, authorization',
+        'labels'            => 'labels, barcodes, barcode, sheets, print, upc, qr, 1d, 2d',
+        'localization'      => 'localization, currency, local, locale, time zone, timezone, international, internatinalization, language, languages, translation',
+        'php_overview'      => 'phpinfo, system, info',
+        'purge'             => 'permanently delete',
+        'security'          => 'password, passwords, requirements, two factor, two-factor, common passwords, remote login, logout, authentication',
+    ],
 
 ];
diff --git a/resources/lang/cy-GB/admin/settings/message.php b/resources/lang/cy-GB/admin/settings/message.php
index cd2d0ae322..0459050c69 100644
--- a/resources/lang/cy-GB/admin/settings/message.php
+++ b/resources/lang/cy-GB/admin/settings/message.php
@@ -14,6 +14,9 @@ return [
         'restore_warning'       => 'Yes, restore it. I acknowledge that this will overwrite any existing data currently in the database. This will also log out all of your existing users (including you).',
         'restore_confirm'       => 'Are you sure you wish to restore your database from :filename?'
     ],
+    'restore' => [
+        'success'               => 'Your system backup has been restored. Please log in again.'
+    ],
     'purge' => [
         'error'     => 'Gwall wedi digwydd wrth glirio. ',
         'validation_failed'     => 'Mae eich cadarnhad i clirio yn anghywir. Teipiwch y gair "DELETE" yn y bocs cadarnhad.',
@@ -33,6 +36,9 @@ return [
         'testing_authentication' => 'Testing LDAP Authentication...',
         'authentication_success' => 'User authenticated against LDAP successfully!'
     ],
+    'labels' => [
+        'null_template' => 'Label template not found. Please select a template.',
+        ],
     'webhook' => [
         'sending' => 'Sending :app test message...',
         'success' => 'Your :webhook_name Integration works!',
@@ -42,5 +48,12 @@ return [
         'error' => 'Something went wrong. :app responded with: :error_message',
         'error_redirect' => 'ERROR: 301/302 :endpoint returns a redirect. For security reasons, we don’t follow redirects. Please use the actual endpoint.',
         'error_misc' => 'Something went wrong. :( ',
-    ]
+        'webhook_fail' => ' webhook notification failed: Check to make sure the URL is still valid.',
+        'webhook_channel_not_found' => ' webhook channel not found.',
+        'ms_teams_deprecation' => 'The selected Microsoft Teams webhook URL will be deprecated Dec 31st, 2025. Please use a workflow URL. Microsoft\'s documentation on creating a workflow can be found <a href="https://support.microsoft.com/en-us/office/create-incoming-webhooks-with-workflows-for-microsoft-teams-8ae491c7-0394-4861-ba59-055e33f75498" target="_blank"> here.</a>',
+    ],
+    'location_scoping' => [
+        'not_saved' => 'Your settings were not saved.',
+        'mismatch' => 'There is 1 item in the database that need your attention before you can enable location scoping.|There are :count items in the database that need your attention before you can enable location scoping.',
+    ],
 ];
diff --git a/resources/lang/cy-GB/admin/statuslabels/table.php b/resources/lang/cy-GB/admin/statuslabels/table.php
index 8bbb0b95c8..c6524d6266 100644
--- a/resources/lang/cy-GB/admin/statuslabels/table.php
+++ b/resources/lang/cy-GB/admin/statuslabels/table.php
@@ -1,14 +1,14 @@
 <?php
 
 return array(
-    'about'      	=> 'Amdan Labeli Statws',
+    'about'      	=> 'About Status Types',
     'archived'      	=> 'Archifwyd',
     'create'      	=> 'Creu Label Statws',
     'color'      	=> 'Lliw Siart',
     'default_label' => 'Label diofyn',
     'default_label_help' => 'Defnyddir hyn i sicrhau bod y label statws rydych yn defnyddio mwyaf yn ymddangos gyntaf wrth cre/addasu asedau.',
     'deployable'      	=> 'Gellir ei ddefnyddio',
-    'info'      	=> 'Defnyddir labeli statws i ddisgrifio os yw ased allan i\'w drwsio, ar goll ayyb. Cewch creu labeli newydd ar gyfer asedau sydd ar gael, angen sylw neu wedi archifio.',
+    'info'      	=> 'Status label types are used to describe the various states your assets could be in. They may be out for repair, lost/stolen, etc. You can create new status labels for your deployable, pending and archived assets according to your own workflow. For more information, <a href="https://snipe-it.readme.io/docs/overview#status-labels" target="_blank">see the documentation <i class="fa fa-external-link"></i></a>.',
     'name'      	=> 'Enw Statws',
     'pending'      	=> 'Yn aros',
     'status_type'   => 'Math Statws',
diff --git a/resources/lang/cy-GB/admin/users/general.php b/resources/lang/cy-GB/admin/users/general.php
index d0003c5994..ed0da98179 100644
--- a/resources/lang/cy-GB/admin/users/general.php
+++ b/resources/lang/cy-GB/admin/users/general.php
@@ -19,6 +19,8 @@ return [
     'print_assigned'    => 'Argraffu Asedau',
     'email_assigned'    => 'Email List of All Assigned',
     'user_notified'     => 'User has been emailed a list of their currently assigned items.',
+    'users_notified'    => 'The user has been emailed a list of their currently assigned items.|:count users have been emailed a list of their currently assigned items.',
+    'users_notified_warning' => ':count user has been emailed a list of their currently assigned items, however :no_email users did not have an email address so could not be emailed.|:count users have been emailed a list of their currently assigned items, however :no_email user(s) did not have an email address so could not be emailed.',
     'auto_assign_label' => 'Include this user when auto-assigning eligible licenses',
     'auto_assign_help'  => 'Skip this user in auto assignment of licenses',
     'software_user'     => 'Meddalwedd allan i :name',
diff --git a/resources/lang/cy-GB/admin/users/message.php b/resources/lang/cy-GB/admin/users/message.php
index 63046b048d..a84e021d07 100644
--- a/resources/lang/cy-GB/admin/users/message.php
+++ b/resources/lang/cy-GB/admin/users/message.php
@@ -6,7 +6,7 @@ return array(
     'declined'                  => 'Rydych wedi llwyddo I wrthod yr ased yma.',
     'bulk_manager_warn'	        => 'Mae eich defnyddwyr wedi diweddaru\'n llwyddiannus ond mae\'r blwch rheolwr heb newid gan fod y rheolwr yn y rhestr o defnyddwyr. Dewisiwch eto heb cynnwys y rheolwr.',
     'user_exists'               => 'Defnyddiwr yn bodoli yn barod!',
-    'user_not_found'            => 'Nid yw\'r defnyddiwr yn bodoli.',
+    'user_not_found'            => 'User does not exist or you do not have permission view them.',
     'user_login_required'       => 'Mae angen llenwi\'r maes login',
     'user_has_no_assets_assigned' => 'No assets currently assigned to user.',
     'user_password_required'    => 'Rhaid gosod cyfrinair.',
@@ -53,6 +53,7 @@ return array(
         'ldap_could_not_search' => 'Wedi methu cyraedd y server LDAP. Gwiriwch eich gosodiadau LDAP. <br>Error from LDAP Server:',
         'ldap_could_not_get_entries' => 'Wedi methu llwytho data trwy LDAP. Gwiriwch eich gosodiadau LDAP. <br>Error from LDAP Server:',
         'password_ldap' => 'Mae eich cyfrinair wedi\'i rheoli trwy LDAP/Active Directory. Cysylltwch a\'r Adran TGCh i\'w newid. ',
+        'multi_company_items_assigned' => 'This user has items assigned that belong to a different company. Please check them in or edit their company.'
     ),
 
     'deletefile' => array(
diff --git a/resources/lang/cy-GB/admin/users/table.php b/resources/lang/cy-GB/admin/users/table.php
index 3a3aa01b62..3e4ed740a6 100644
--- a/resources/lang/cy-GB/admin/users/table.php
+++ b/resources/lang/cy-GB/admin/users/table.php
@@ -22,7 +22,7 @@ return array(
     'managed_locations'     => 'Lleoliadau a Reolir',
     'managed_users'         => 'Managed Users',
     'name' 					=> 'Enw',
-    'nogroup'               => 'No groups have been created yet. To add one, visit: ',
+    'nogroup'               => 'No groups have been created yet. To add one, visit:',
     'notes'                 => 'Nodiadau',
     'password_confirm' 		=> 'Cadarnhau\'r Cyfrinair',
     'password' 				=> 'Cyfrinair',
diff --git a/resources/lang/cy-GB/auth.php b/resources/lang/cy-GB/auth.php
index db310aa1bb..14d8acfce0 100644
--- a/resources/lang/cy-GB/auth.php
+++ b/resources/lang/cy-GB/auth.php
@@ -15,6 +15,6 @@ return array(
 
     'failed' => 'These credentials do not match our records.',
     'password' => 'The provided password is incorrect.',
-    'throttle' => 'Too many login attempts. Please try again in :seconds seconds.',
+    'throttle' => 'Too many login attempts. Please try again in :minutes minute(s).',
 
 );
diff --git a/resources/lang/cy-GB/auth/message.php b/resources/lang/cy-GB/auth/message.php
index c07872a652..9559f44f6b 100644
--- a/resources/lang/cy-GB/auth/message.php
+++ b/resources/lang/cy-GB/auth/message.php
@@ -6,8 +6,6 @@ return array(
     'account_not_found'      => 'Mae eich enw defnyddiwr neu gyfrinair yn anghywir.',
     'account_not_activated'  => 'Nid yw\'r cyfrif defnyddiwr hwn wedi\'i actifadu.',
     'account_suspended'      => 'Mae\'r cyfrif defnyddiwr hwn wedi\'i atal.',
-    'account_banned'         => 'Mae\'r cyfrif defnyddiwr hwn wedi\'i atal.',
-    'throttle'               => 'Too many failed login attempts. Please try again in :minutes minutes.',
 
     'two_factor' => array(
         'already_enrolled'      => 'Your device is already enrolled.',
diff --git a/resources/lang/cy-GB/button.php b/resources/lang/cy-GB/button.php
index b5514d7020..f868c5b4ec 100644
--- a/resources/lang/cy-GB/button.php
+++ b/resources/lang/cy-GB/button.php
@@ -7,6 +7,7 @@ return [
     'checkin_and_delete'  	    => 'Checkin All / Delete User',
     'delete'  	                => 'Dileu',
     'edit'    	                => 'Addasu',
+    'clone'    	                => 'Clone',
     'restore' 	                => 'Adfer',
     'remove'                    => 'Cael gwared',
     'request'                   => 'Gofynnwyd amdano',
@@ -21,4 +22,13 @@ return [
     'add_maintenance'           => 'Add Maintenance',
     'append'                    => 'Append',
     'new'                       => 'Newydd',
+    'var' => [
+        'clone'     => 'Clone :item_type',
+        'edit'      => 'Edit :item_type',
+        'delete'    => 'Delete :item_type',
+        'restore'   => 'Restore :item_type',
+        'create'    => 'Create New :item_type',
+        'checkout'  => 'Checkout :item_type',
+        'checkin'   => 'Checkin :item_type',
+    ]
 ];
diff --git a/resources/lang/cy-GB/general.php b/resources/lang/cy-GB/general.php
index ef714551b3..fa650e8e1f 100644
--- a/resources/lang/cy-GB/general.php
+++ b/resources/lang/cy-GB/general.php
@@ -10,7 +10,7 @@ return [
     'action'                => 'Gweithred',
     'activity_report'		=> 'Adroddiad gweithgaredd',
     'address'				=> 'Cyfeiriad',
-    'admin'					=> 'Gweinyddol',
+    'admin'					=> 'Admin Settings',
     'admin_tooltip'			=> 'This user has admin privileges',
     'superuser'				=> 'Superuser',
     'superuser_tooltip'		=> 'This user has superuser privileges',
@@ -23,13 +23,16 @@ return [
     'asset_models'			=> 'Modelau Ased',
     'asset_model'			=> 'Model',
     'asset'					=> 'Ased',
+    'asset_previous'        => 'Asset (Previously Assigned)',
     'asset_report'          => 'Adroddiad Ased',
     'asset_tag'				=> 'Tag Ased',
     'asset_tags'            => 'Asset Tags',
     'assets_available'		=> 'Asedau ar gael',
     'accept_assets'         => 'Accept Assets :name',
     'accept_assets_menu'    => 'Accept Assets',
+    'accept_item'           => 'Accept Item',
     'audit'				    => 'Awdit',
+    'audits'				=> 'Audits',
     'audit_report'			=> 'Log Awdit',
     'assets'				=> 'Asedau',
     'assets_audited'        => 'assets audited',
@@ -61,9 +64,12 @@ return [
     'changepassword'  		=> 'Newid cyfrinair',
     'checkin'  				=> 'Nodi i mewn',
     'checkin_from'  		=> 'Nodi i fewn ers',
+    'checkin_note'  		=> 'Checkin Note',
+    'checkout_note'  		=> 'Checkout Note',
     'checkout'  			=> 'Nodi allan',
     'checkouts_count'       => 'Sawl allan',
     'checkins_count'        => 'Sawl i mewn',
+    'checkin_and_delete'  	=> 'Checkin and Delete',
     'user_requests_count'   => 'Ceisiadau',
     'city'  				=> 'Dinas',
     'click_here'			=> 'Cliciwch yma',
@@ -77,7 +83,7 @@ return [
     'consumables'			=> 'Nwyddau traul',
     'country'  				=> 'Gwlad',
     'could_not_restore'     => 'Error restoring :item_type: :error',
-    'not_deleted'           => 'The :item_type is not deleted so it cannot be restored',
+    'not_deleted'           => 'The :item_type was not deleted and therefore cannot be restored',
     'create'				=> 'Creu newydd',
     'created'               => 'Eitem wedi\'i Greu',
     'created_asset'			=> 'ased wedi creu',
@@ -86,11 +92,13 @@ return [
     'record_created' 		=> 'Record Created',
     'updated_at' 			=> 'Diweddarwyd ar',
     'currency'  			=> '$', // this is deprecated
+    'currency_text'  		=> 'Currency', //
     'current'  				=> 'Cyfredol',
     'current_password'      => 'Current Password',
     'customize_report'      => 'Customize Report',
     'custom_report'         => 'Adroddiad Asedau Addasedig',
     'dashboard'				=> 'Dashfwrdd',
+    'data_source'           => 'Data Source',
     'days'      			=> 'dyddiau',
     'days_to_next_audit'    => 'Dyddiau tan yr awdit nesaf',
     'date'					=> 'Dyddiad',
@@ -98,7 +106,7 @@ return [
     'debug_warning_text'    => 'Mae\'r cymhwysiad hwn yn rhedeg yn y modd cynhyrchu gyda debugging wedi\'i alluogi. Gall hyn ddatgelu data sensitif os yw\'ch cais yn hygyrch i\'r byd y tu allan. Analluoga modd dadfygio trwy osod y <code>APP_DEBUG</code> gwerth yn <code>.env</code> ffeil i<code>false</code>.',
     'delete'  				=> 'Dileu',
     'delete_confirm'  		=> 'Ydych chi\'n sicr eich bod eisiau dileu\'r :item?',
-    'delete_confirm_no_undo' => 'Are you sure you wish to delete :item? This can not be undone.',
+    'delete_confirm_no_undo' => 'Are you sure, you wish to delete :item? This cannot be undone.',
     'deleted'  				=> 'Wedi Dileu',
     'delete_seats'  		=> 'Seddi wedi dileu',
     'deletion_failed'       => 'Deletion failed',
@@ -114,29 +122,13 @@ return [
     'editprofile'  			=> 'Golygu eich Proffil',
     'eol'					=> 'DB',
     'email_domain'			=> 'Parth Ebost',
-    'email_format'			=> 'Fformat Ebost',
     'employee_number'       => 'Employee Number',
     'email_domain_help'		=> 'Defnyddir hwn i gynhyrchu cyfeiriadau e-bost wrth fewnforio',
     'error'				    => 'Gwall',
     'exclude_archived'      => 'Exclude Archived Assets',
     'exclude_deleted'       => 'Exclude Deleted Assets',
     'example'				=> 'Example: ',
-    'filastname_format'			=> 'Llythyren Cyntaf Enw Cyntaf Cyfenw (jsmith@example.com)',
-    'firstname_lastname_format'	=> 'Enw Cyntaf Enw Olaf (jane.smith@example.com)',
-    'firstname_lastname_underscore_format' => 'Enw Cyntaf Enw Olaf (jane.smith@example.com)',
-    'lastnamefirstinitial_format' =>  'Enw Olaf Llythyren Cyntaf Enw Cyntaf (smithj@example.com)',
-    'firstintial_dot_lastname_format' => 'Llythyren Cyntaf Enw Cyntaf Cyfenw (jsmith@example.com)',
-    'firstname_lastname_display'	=> 'First Name Last Name (Jane Smith)',
-    'lastname_firstname_display'	=> 'Last Name First Name (Smith Jane)',
-    'name_display_format'	=> 'Name Display Format',
-    'first'					=> 'Cyntaf',
-    'firstnamelastname'     => 'First Name Last Name (janesmith@example.com)',
-    'lastname_firstinitial' => 'Last Name First Initial (smith_j@example.com)',
-    'firstinitial.lastname' => 'Llythyren Cyntaf Enw Cyntaf Cyfenw (jsmith@example.com)',
-    'firstnamelastinitial'  => 'First Name Last Initial (janes@example.com)',
-    'lastnamefirstname'      => 'Last Name First Name (smith.jane@example.com)',
-    'first_name'			=> 'Enw cyntaf',
-    'first_name_format'		=> 'Enw Cyntaf (jane@example.com)',
+
     'files'                 => 'Ffeiliau',
     'file_name'				=> 'Ffeil',
     'file_type'             => 'File Type',
@@ -156,9 +148,9 @@ return [
     'image_delete'         	=> 'Dileu Delwedd',
     'include_deleted'       => 'Include Deleted Assets',
     'image_upload'         	=> 'Uwchlwytho delwedd',
-    'filetypes_accepted_help'    => 'Accepted filetype is :types. Max upload size allowed is :size.|Accepted filetypes are :types. Max upload size allowed is :size.',
-    'filetypes_size_help'   => 'Max upload size allowed is :size.',
-    'image_filetypes_help'  => 'Accepted filetypes are jpg, webp, png, gif, svg, and avif. Max upload size allowed is :size.',
+    'filetypes_accepted_help'    => 'Accepted filetype is :types. The maximum size allowed is :size.|Accepted filetypes are :types. The maximum upload size allowed is :size.',
+    'filetypes_size_help'   => 'The maximum upload size allowed is :size.',
+    'image_filetypes_help'  => 'Accepted Filetypes are jpg, webp, png, gif, svg, and avif. The maximum upload size allowed is :size.',
     'unaccepted_image_type'  => 'This image file was not readable. Accepted filetypes are jpg, webp, png, gif, and svg. The mimetype of this file is: :mimetype.',
     'import'         	    => 'Mewnforio',
     'import_this_file'      => 'Map fields and process this file',
@@ -178,12 +170,17 @@ return [
     'last'					=> 'Olaf',
     'last_login'            => 'Mewngofnododd Diwethaf',
     'last_name'             => 'Enw Olaf',
+    'firstname_lastname_display'	=> 'First Name Last Name (Jane Smith)',
+    'lastname_firstname_display'	=> 'Last Name First Name (Smith Jane)',
+    'name_display_format'	=> 'Name Display Format',
+    'first'					=> 'Cyntaf',
+    'first_name'			=> 'Enw cyntaf',
     'license'				=> 'Trwydded',
     'license_report'        => 'Adroddiad Trwydded',
     'licenses_available'	=> 'Licenses available',
     'licenses'				=> 'Trwyddedau',
     'list_all'				=> 'Rhestru holl',
-    'loading'				=> 'Loading... please wait....',
+    'loading'				=> 'Loading... please wait...',
     'lock_passwords'        => 'This field value will not be saved in a demo installation.',
     'feature_disabled'      => 'Mae\'r nodwedd hon wedi\'i anablu ar gyfer y gosodiad demo.',
     'location'              => 'Lleoliad',
@@ -193,7 +190,7 @@ return [
     'logout'				=> 'Allgofnodi',
     'lookup_by_tag'     => 'Chwilio gan tag ased',
     'maintenances'          => 'Cynnal a Chadw',
-    'manage_api_keys'       => 'Manage API Keys',
+    'manage_api_keys'       => 'Manage API keys',
     'manufacturer'			=> 'Gwneuthyrwr',
     'manufacturers'			=> 'Gwneuthyrwr',
     'markdown'				=> 'Mae\'r maes yma yn derbyn<a href="https://help.github.com/articles/github-flavored-markdown/">markdown GitHub</a>.',
@@ -215,6 +212,14 @@ return [
     'no_results'			=> 'Dim canlyniadau.',
     'no'  					=> 'Na',
     'notes'  				=> 'Nodiadau',
+    'note_added'            => 'Note Added',
+    'options'				=> 'Options',
+    'preview'				=> 'Preview',
+    'add_note'              => 'Add Note',
+    'note_edited'            => 'Note Edited',
+    'edit_note'              => 'Edit Note',
+    'note_deleted'            => 'Note Deleted',
+    'delete_note'              => 'Delete Note',
     'order_number'          => 'Rhif Archeb',
     'only_deleted'          => 'Only Deleted Assets',
     'page_menu'				=> 'Showing _MENU_ items',
@@ -229,7 +234,7 @@ return [
     'purchase_date'         => 'Dyddiad Pwrcasu',
     'qty'		            => 'Nifer',
     'quantity'		        => 'Nifer',
-    'quantity_minimum'      => 'You have :count items below or almost below minimum quantity levels',
+    'quantity_minimum'      => 'You have one item below or almost below minimum quantity levels|You have :count items below or almost below minimum quantity levels',
     'quickscan_checkin'  	=> 'Quick Scan Checkin',
     'quickscan_checkin_status'  	=> 'Checkin Status',
     'ready_to_deploy'		=> 'Barod i\'w defnyddio',
@@ -254,7 +259,7 @@ return [
     'select_all'            => 'Dewis Popeth',
     'search'				=> 'Chwilio',
     'select_category'       => 'Dewis Categorï',
-    'select_datasource' => 'Select a Datasource',
+    'select_datasource' => 'Select a data source',
     'select_department'     => 'Dewsi Adran',
     'select_depreciation'	=> 'Dewis math o dibrisiant',
     'select_location'		=> 'Dewis lleoliad',
@@ -274,13 +279,15 @@ return [
     'signed_off_by'         => 'Signed Off By',
     'skin'       			=> 'Skin',
     'webhook_msg_note'        => 'A notification will be sent via webhook',
-    'webhook_test_msg'        => 'Oh hai! Looks like your :app integration with Snipe-IT is working!',
+    'webhook_test_msg'        => 'Oh hai! It looks like your :app integration with Snipe-IT is working!',
     'some_features_disabled' => 'MODE DEMO: Mae rhai nodweddion wedi analluogi ar gyfer y gosodiad hwn.',
     'site_name'				=> 'Enw Safle',
     'state'  				=> 'Talaith',
     'status_labels'			=> 'Labeli Statws',
+    'status_label'			=> 'Status Label',
     'status'    			=> 'Statws',
     'accept_eula'           => 'Acceptance Agreement',
+    'show_or_hide_eulas' => 'Show/Hide EULAs',
     'supplier'              => 'Cyflenwr',
     'suppliers'  			=> 'Cyflenwyr',
     'sure_to_delete'        => 'Ydych chi\'n sicr eich bod eisiau dileu',
@@ -296,9 +303,9 @@ return [
     'type'  				=> 'Math',
     'undeployable'			=> 'Ddim modd nodi allan',
     'unknown_admin'			=> 'Gweinydd Anhysbys',
-    'username_format'		=> 'Fformat enw defnyddiwr',
     'username'              => 'Enw defnyddiwr',
     'update'                => 'Diweddaru',
+    'updating_item' => 'Updating :item',
     'upload_filetypes_help'      => 'Allowed filetypes are png, gif, jpg, jpeg, doc, docx, pdf, xls, xlsx, txt, lic, xml, zip, rtf and rar. Max upload size allowed is :size.',
     'uploaded'              => 'Wedi Uwchlwytho',
     'user'					=> 'Defnyddiwr',
@@ -323,10 +330,10 @@ return [
     'token_expired'         => 'Mae eich sesiwn wedi dod i ben. Mewngofnodwch eto os gwelwch yn dda.',
     'login_enabled'         => 'Login Enabled',
     'audit_due'             => 'Due for Audit',
-    'audit_due_days'        => 'Assets Due for Audit Within :days Day|Assets Due for Audit Within :days Days',
+    'audit_due_days'        => '{}Assets Due or Overdue for Audit|[1]Assets Due or Overdue for Audit Within a Day|[2,*]Assets Due or Overdue for Audit Within :days Days',
     'checkin_due'           => 'Due for Checkin',
     'checkin_overdue'       => 'Overdue for Checkin',
-    'checkin_due_days'      => 'Assets Due for Checkin Within :days Day|Assets Due for Checkin Within :days Days',
+    'checkin_due_days'      => '{}Due for Checkin|[1]Assets Due for Checkin Within :days Day|[2,*]Assets Due for Checkin Within :days Days',
     'audit_overdue'         => 'Overdue for Audit',
     'accept'                => 'Accept :asset',
     'i_accept'              => 'I accept',
@@ -339,16 +346,16 @@ return [
     'view_all'              => 'view all',
     'hide_deleted'          => 'Hide Deleted',
     'email'                 => 'Ebost',
-    'do_not_change'         => 'Do Not Change',
-    'bug_report'            => 'Report a Bug',
+    'do_not_change'         => 'Do not change',
+    'bug_report'            => 'Report a bug',
     'user_manual'           => 'User\'s Manual',
     'setup_step_1'          => 'Step 1',
     'setup_step_2'          => 'Step 2',
     'setup_step_3'          => 'Step 3',
     'setup_step_4'          => 'Step 4',
     'setup_config_check'    => 'Configuration Check',
-    'setup_create_database' => 'Create Database Tables',
-    'setup_create_admin'    => 'Create Admin User',
+    'setup_create_database' => 'Create database tables',
+    'setup_create_admin'    => 'Create an admin user',
     'setup_done'            => 'Finished!',
     'bulk_edit_about_to'    => 'You are about to edit the following: ',
     'checked_out'           => 'Allan',
@@ -383,6 +390,8 @@ return [
     'new_license'           => 'New License',
     'new_accessory'         => 'New Accessory',
     'new_consumable'        => 'New Consumable',
+    'new_component'         => 'New Component',
+    'new_user'              => 'New User',
     'collapse'              => 'Collapse',
     'assigned'              => 'Assigned',
     'asset_count'           => 'Asset Count',
@@ -418,19 +427,20 @@ return [
     'bulk_soft_delete'      =>'Also soft-delete these users. Their asset history will remain intact unless/until you purge deleted records in the Admin Settings.',
     'bulk_checkin_delete_success' => 'Your selected users have been deleted and their items have been checked in.',
     'bulk_checkin_success' => 'The items for the selected users have been checked in.',
-    'set_to_null'           => 'Delete values for this asset|Delete values for all :asset_count assets ',
+    'set_to_null'           => 'Delete values for this selection|Delete values for all :selection_count selections ',
     'set_users_field_to_null'  => 'Delete :field values for this user|Delete :field values for all :user_count users ',
     'na_no_purchase_date'   => 'N/A - No purchase date provided',
     'assets_by_status'      => 'Assets by Status',
     'assets_by_status_type'      => 'Assets by Status Type',
     'pie_chart_type'        => 'Dashboard Pie Chart Type',
     'hello_name'            => 'Hello, :name!',
-    'unaccepted_profile_warning'   => 'You have :count items requiring acceptance. Click here to accept or decline them',
+    'unaccepted_profile_warning'   => 'You have one item requiring acceptance. Click here to accept or decline it | You have :count items requiring acceptance. Click here to accept or decline them',
     'start_date'            => 'Start Date',
     'end_date'            => 'End Date',
     'alt_uploaded_image_thumbnail' => 'Uploaded thumbnail',
     'placeholder_kit'       => 'Select a kit',
     'file_not_found'        => 'File not found',
+    'log_record_not_found'  => 'No record for that log entry was found.',
     'preview_not_available' => '(no preview)',
     'setup'                 => 'Setup',
     'pre_flight'            => 'Pre-Flight',
@@ -512,7 +522,7 @@ return [
     'checked_out_to_fields' => 'Checked Out To Fields',
     'percent_complete' => '% wedi cwbwlhau',
     'uploading' => 'Uploading... ',
-    'upload_error' => 'Error uploading file. Please check that there are no empty rows and that no column names are duplicated.',
+    'upload_error' => 'Error uploading file. Please check that you have no empty rows or duplicated column names in your CSV, and that the server permissions allow uploads.',
     'copy_to_clipboard' => 'Copy to Clipboard',
     'copied' => 'Copied!',
     'status_compatibility' => 'If assets are already assigned, they cannot be changed to a non-deployable status type and this value change will be skipped.',
@@ -549,6 +559,71 @@ return [
         'license_seats'  => ':count License Seat|:count License Seats',
         'consumables'  => ':count Consumable|:count Consumables',
         'components'  => ':count Component|:count Components',
-    ]
+    ],
+
+    'more_info' => 'Mwy o wybodaeth',
+    'quickscan_bulk_help' => 'Checking this box will edit the asset record to reflect this new location. Leaving it unchecked will simply note the location in the audit log. Note that if this asset is checked out, it will not change the location of the person, asset or location it is checked out to.',
+    'whoops' => 'Whoops!',
+    'something_went_wrong' => 'Something went wrong with your request.',
+    'close' => 'Close',
+    'expires' => 'Dod i ben',
+    'map_fields'=> 'Map :item_type Fields',
+    'remaining_var' => ':count Remaining',
+    'label' => 'Label',
+    'import_asset_tag_exists' => 'An asset with the asset tag :asset_tag already exists and an update was not requested. No change was made.',
+    'countries_manually_entered_help' => 'Values with an asterisk (*) were manually entered and do not match existing ISO 3166 dropdown values',
+    'accessories_assigned' => 'Assigned Accessories',
+    'user_managed_passwords' => 'Password Management',
+    'user_managed_passwords_disallow' => 'Disallow users from managing their own passwords',
+    'user_managed_passwords_allow' => 'Allow users to manage their own passwords',
+    'from' => 'From',
+    'by' => 'Erbyn',
+
+// Add form placeholders here
+    'placeholders' => [
+        'notes'  => 'Add a note',
+    ],
+
+    'breadcrumb_button_actions' => [
+        'edit_item' => 'Edit :name',
+        'checkout_item' => 'Checkout :name',
+        'checkin_item' => 'Checkin :name',
+    ],
+
+    'skins' => [
+        'site_default' => 'Site Default',
+        'default_blue' => 'Default Blue',
+        'blue_dark' => 'Blue (Dark Mode)',
+        'green' => 'Green Dark',
+        'green_dark' => 'Green (Dark Mode)',
+        'red' => 'Red Dark',
+        'red_dark' => 'Red (Dark Mode)',
+        'orange' => 'Orange Dark',
+        'orange_dark' => 'Orange (Dark Mode)',
+        'black' => 'Black',
+        'black_dark' => 'Black (Dark Mode)',
+        'purple' => 'Purple',
+        'purple_dark' => 'Purple (Dark Mode)',
+        'yellow' => 'Yellow',
+        'yellow_dark' => 'Yellow (Dark Mode)',
+        'high_contrast' => 'High Contrast',
+
+    ],
+
+    'select_all_none' => 'Select/Unselect All',
+    'generic_model_not_found' => 'That :model was not found or you do not have permission to access it',
+    'deleted_models' => 'Deleted Asset Models',
+    'deleted_users' => 'Deleted Users',
+    'cost_each' => ':amount each',
+    'remove_current_image' => 'Remove current :type image',
+
+    'seeding' => [
+        'manufacturers' => [
+            'button' => 'Create Manufacturers',
+            'prompt' => 'You do not have any manufacturers yet. Would you like to seed a list of common manufacturers? (THIS WILL OVERWRITE EXISTING MANUFACTURERS, including those that have been soft-deleted.)',
+            'success' => 'Manufacturers seeded successfully',
+            'error' => 'Could not seed manufacturers. A manufacturer record already exists and seeding would overwrite it.|Could not seed manufacturers. :count manufacturer records already exist and seeding would overwrite them.',
+        ],
+    ],
 
 ];
diff --git a/resources/lang/cy-GB/localizations.php b/resources/lang/cy-GB/localizations.php
index f1232dd138..827ed4fca1 100644
--- a/resources/lang/cy-GB/localizations.php
+++ b/resources/lang/cy-GB/localizations.php
@@ -2,7 +2,7 @@
 
 return [
 
-    'select_language' => 'Select a language',
+    'select_language' => 'Select a Language',
     'languages' => [
         'en-US'=> 'English, US',
         'en-GB'=> 'English, UK',
@@ -40,7 +40,9 @@ return [
         'ms-MY'=> 'Malay',
         'mi-NZ'=> 'Maori',
         'mn-MN'=> 'Mongolian',
-        'no-NO'=> 'Norwegian',
+        'nb-NO'=> 'Norwegian Bokmål',
+        'om-ET' => 'Oromo (Ethiopian)',
+        //'nn-NO'=> 'Norwegian Nynorsk',
         'fa-IR'=> 'Persian',
         'pl-PL'=> 'Polish',
         'pt-PT'=> 'Portuguese',
@@ -66,7 +68,7 @@ return [
         'zu-ZA'=> 'Zulu',
     ],
 
-    'select_country' => 'Select a country',
+    'select_country' => 'Select a Country',
     
     'countries' => [
         'AC'=>'Ascension Island',
@@ -133,6 +135,7 @@ return [
         'EC'=>'Ecuador',
         'EE'=>'Estonia',
         'EG'=>'Egypt',
+        'GB-ENG'=>'England',
         'ER'=>'Eritrea',
         'ES'=>'Spain',
         'ET'=>'Ethiopia',
@@ -231,6 +234,7 @@ return [
         'NG'=>'Nigeria',
         'NI'=>'Nicaragua',
         'NL'=>'Netherlands',
+        'GB-NIR' => 'Northern Ireland',
         'NO'=>'Norway',
         'NP'=>'Nepal',
         'NR'=>'Nauru',
@@ -258,7 +262,7 @@ return [
         'RU'=>'Russian Federation',
         'RW'=>'Rwanda',
         'SA'=>'Saudi Arabia',
-        'UK'=>'Scotland',
+        'GB-SCT'=>'Scotland',
         'SB'=>'Solomon Islands',
         'SC'=>'Seychelles',
         'SS'=>'South Sudan',
@@ -310,6 +314,7 @@ return [
         'VI'=>'Virgin Islands (U.S.)',
         'VN'=>'Viet Nam',
         'VU'=>'Vanuatu',
+        'GB-WLS' =>'Wales',
         'WF'=>'Wallis And Futuna Islands',
         'WS'=>'Samoa',
         'YE'=>'Yemen',
diff --git a/resources/lang/cy-GB/mail.php b/resources/lang/cy-GB/mail.php
index dbf900f71c..df16543f57 100644
--- a/resources/lang/cy-GB/mail.php
+++ b/resources/lang/cy-GB/mail.php
@@ -23,24 +23,25 @@ return [
     'Item_Requested' => 'Wedi gwneud cais am eitem',
     'License_Checkin_Notification' => 'License checked in',
     'License_Checkout_Notification' => 'License checked out',
+    'license_for'   => 'License for',
     'Low_Inventory_Report' => 'Adroddiad Inventory Isel',
     'a_user_canceled' => 'Mae defnyddiwr wedi canslo cais am eitem ar y wefan',
     'a_user_requested' => 'Mae defnyddiwr wedi gwneud cais am eitem ar y wefan',
     'acceptance_asset_accepted' => 'A user has accepted an item',
     'acceptance_asset_declined' => 'A user has declined an item',
-    'accessory_name' => 'Enw Ategolyn:',
-    'additional_notes' => 'Nodiadau ychwanegol:',
+    'accessory_name' => 'Enw Ategolyn',
+    'additional_notes' => 'Nodiadau ychwanegol',
     'admin_has_created' => 'Mae gweinyddwr wedi creu cyfrif i chi a yr :web wefan.',
-    'asset' => 'Ased:',
-    'asset_name' => 'Enw Ased:',
+    'asset' => 'Ased',
+    'asset_name' => 'Enw Ased',
     'asset_requested' => 'Gofynnwyd am ased',
     'asset_tag' => 'Tag Ased',
     'assets_warrantee_alert' => 'There is :count asset with a warranty expiring in the next :threshold days.|There are :count assets with warranties expiring in the next :threshold days.',
     'assigned_to' => 'Wedi Neilltuo i',
     'best_regards' => 'Cofon gorau,',
-    'canceled' => 'Wedi canslo:',
-    'checkin_date' => 'Dyddian i mewn:',
-    'checkout_date' => 'Dyddiad Allan:',
+    'canceled' => 'Wedi canslo',
+    'checkin_date' => 'Dyddian i mewn',
+    'checkout_date' => 'Dyddiad Allan',
     'checkedout_from' => 'Checked out from',
     'checkedin_from'  => 'Checked in from',
     'checked_into' => 'Checked into',
@@ -49,27 +50,30 @@ return [
     'click_to_confirm' => 'Cliciwch ar y ddolen ganlynol i gadarnhau eich cyfrif :gwe:',
     'current_QTY' => 'Nifer cyfredol',
     'days' => 'Dydd',
-    'expecting_checkin_date' => 'Dyddiad disgwl i mewn:',
+    'expecting_checkin_date' => 'Dyddiad disgwl i mewn',
     'expires' => 'Dod i ben',
     'hello' => 'Helo',
     'hi' => 'Hi',
     'i_have_read' => 'Rwyf wedi darllen a chytuno â\'r telerau defnyddio, ac wedi derbyn yr eitem hon.',
     'inventory_report' => 'Inventory Report',
-    'item' => 'Eitem:',
+    'item' => 'Eitem',
+    'item_checked_reminder' => 'This is a reminder that you currently have :count items checked out to you that you have not accepted or declined. Please click the link below to confirm your decision.',
     'license_expiring_alert' => 'Mae yna :count trwydded yn dod i ben yn ystod y :threshold diwrnod nesaf | Mae :count trwyddedau yn dod i ben yn y :threshold diwrnod nesaf.',
     'link_to_update_password' => 'Cliciwch ar y ddolen ganlynol i gadarnhau eich cyfrinair :gwe:',
-    'login' => 'Mewngofnodi:',
+    'login' => 'Mewngofnodi',
     'login_first_admin' => 'Mewngofnodi i\'ch gosodiad Snipe-IT newydd gan ddefnyddio\'r manylion isod:',
     'low_inventory_alert' => 'Mae yna :count eitem sy\'n is na\'r isafswm neu a fydd yn isel cyn bo hir. | Mae yna :count eitemau sy\'n is na\'r isafswm neu a fydd yn isel cyn bo hir.',
     'min_QTY' => 'Nifer Lleiaf',
     'name' => 'Enw',
     'new_item_checked' => 'Mae eitem newydd wedi\'i gwirio o dan eich enw, mae\'r manylion isod.',
+    'new_item_checked_with_acceptance' => 'A new item has been checked out under your name that requires acceptance, details are below.',
+    'recent_item_checked' => 'An item was recently checked out under your name that requires acceptance, details are below.',
     'notes' => 'Nodiadau',
-    'password' => 'Cyfrinair:',
+    'password' => 'Cyfrinair',
     'password_reset' => 'Ailosod Cyfrinair',
     'read_the_terms' => 'Darllenwch y telerau defnyddio isod.',
     'read_the_terms_and_click' => 'Please read the terms of use below, and click on the link at the bottom to confirm that you read and agree to the terms of use, and have received the asset.',
-    'requested' => 'Gofynnwyd amdano:',
+    'requested' => 'Gofynnwyd amdano',
     'reset_link' => 'Eich dolen Ail-osod Cyfrinair',
     'reset_password' => 'Cliciwch yma i ailosod eich cyfrinair:',
     'rights_reserved' => 'All rights reserved.',
@@ -86,8 +90,10 @@ return [
     'upcoming-audits' => 'There is :count asset that is coming up for audit within :threshold days.|There are :count assets that are coming up for audit within :threshold days.',
     'user' => 'Defnyddiwr',
     'username' => 'Enw defnyddiwr',
+    'unaccepted_asset_reminder' => 'Reminder: You have Unaccepted Assets.',
     'welcome' => 'Croeso, :name',
     'welcome_to' => 'Croeso i :web!',
     'your_assets' => 'View Your Assets',
     'your_credentials' => 'Eich manylion defnyddiwr Snipe-IT',
+    'mail_sent' => 'Mail sent successfully!',
 ];
diff --git a/resources/lang/cy-GB/validation.php b/resources/lang/cy-GB/validation.php
index 14ee3535de..d737c718f8 100644
--- a/resources/lang/cy-GB/validation.php
+++ b/resources/lang/cy-GB/validation.php
@@ -13,87 +13,150 @@ return [
     |
     */
 
-    'accepted'             => 'Rhaid derbyn y :attribute.',
-    'active_url'           => 'Nid ywr :attribute yn URL dilys.',
-    'after'                => 'Rhaid i\'r :attribute bod yn dyddiad ar ol :date.',
-    'after_or_equal'       => 'Rhaid i\'r :attribute bod yn dyddiad ar ol neu yn hafal i :date.',
-    'alpha'                => 'Rhaid ir :attribute cynnwys llythrennau yn unig.',
-    'alpha_dash'           => 'Fedrith y :attribute dim ond cynnwys llythrennau, rhifau a dashes.',
-    'alpha_num'            => 'Rhaid ir :attribute cynnwys llythrennau a rhifau yn unig.',
-    'array'                => 'Rhaid i :attribute fod yn array.',
-    'before'               => 'Rhaid i\'r :attribute bod yn dyddiad cyn :date.',
-    'before_or_equal'      => 'Rhaid i\'r :attribute bod yn dyddiad cyn neu yn hafal i :date.',
-    'between'              => [
-        'numeric' => 'Rhaid i\'r :attribute bod rhwng :min - :max.',
-        'file'    => 'Rhaid i\'r :attribute bod rhwng :min - :max kilobytes.',
-        'string'  => 'Rhaid i\'r :attribute bod rhwng :min - :max characters.',
-        'array'   => 'Rhaid i\'r :attribute cael rhwng :min - :max o eitemau.',
+    'accepted' => 'The :attribute field must be accepted.',
+    'accepted_if' => 'The :attribute field must be accepted when :other is :value.',
+    'active_url' => 'The :attribute field must be a valid URL.',
+    'after' => 'The :attribute field must be a date after :date.',
+    'after_or_equal' => 'The :attribute field must be a date after or equal to :date.',
+    'alpha' => 'The :attribute field must only contain letters.',
+    'alpha_dash' => 'The :attribute field must only contain letters, numbers, dashes, and underscores.',
+    'alpha_num' => 'The :attribute field must only contain letters and numbers.',
+    'array' => 'The :attribute field must be an array.',
+    'ascii' => 'The :attribute field must only contain single-byte alphanumeric characters and symbols.',
+    'before' => 'The :attribute field must be a date before :date.',
+    'before_or_equal' => 'The :attribute field must be a date before or equal to :date.',
+    'between' => [
+        'array' => 'The :attribute field must have between :min and :max items.',
+        'file' => 'The :attribute field must be between :min and :max kilobytes.',
+        'numeric' => 'The :attribute field must be between :min and :max.',
+        'string' => 'The :attribute field must be between :min and :max characters.',
     ],
-    'boolean'              => 'Rhaid i :attribute fod yn wir neu ddim.',
-    'confirmed'            => 'Dydi\'r cadarnhad :attribute ddim yn cydfynd.',
-    'date'                 => 'Nid yw\'r :attribute yn dyddiad dilys.',
-    'date_format'          => 'Nid yw\'r :attribute yn cydfynd ar format :format.',
-    'different'            => 'Rhaid i :attribute a :other bod yn wahanol.',
-    'digits'               => 'Rhai i\'r :attribute bod yn :digits o ddigidau.',
-    'digits_between'       => 'Rhaid i\'r :attribute bodrhwng :min - :max o digidau.',
-    'dimensions'           => 'Mae\'r :attribute hefo maint annilys.',
-    'distinct'             => 'Mae\'r :attribute hefo maes sydd wedi\'i dyblygu.',
-    'email'                => 'Mae fformat :attribute yn annilys.',
-    'exists'               => 'Mae\'r :attribute a dewisir yn annilys.',
-    'file'                 => 'Rhaid i\'r :attribute bod yn ffeil.',
-    'filled'               => 'Rhaid i\'r maes :attribute cael gwerth.',
-    'image'                => 'Rhaid i\'r :attribute bod yn delwedd.',
+    'boolean' => 'The :attribute field must be true or false.',
+    'can' => 'The :attribute field contains an unauthorized value.',
+    'confirmed' => 'The :attribute field confirmation does not match.',
+    'contains' => 'The :attribute field is missing a required value.',
+    'current_password' => 'The password is incorrect.',
+    'date' => 'The :attribute field must be a valid date.',
+    'date_equals' => 'The :attribute field must be a date equal to :date.',
+    'date_format' => 'The :attribute field must match the format :format.',
+    'decimal' => 'The :attribute field must have :decimal decimal places.',
+    'declined' => 'The :attribute field must be declined.',
+    'declined_if' => 'The :attribute field must be declined when :other is :value.',
+    'different' => 'The :attribute field and :other must be different.',
+    'digits' => 'The :attribute field must be :digits digits.',
+    'digits_between' => 'The :attribute field must be between :min and :max digits.',
+    'dimensions' => 'The :attribute field has invalid image dimensions.',
+    'distinct' => 'Mae\'r :attribute hefo maes sydd wedi\'i dyblygu.',
+    'doesnt_end_with' => 'The :attribute field must not end with one of the following: :values.',
+    'doesnt_start_with' => 'The :attribute field must not start with one of the following: :values.',
+    'email' => 'The :attribute field must be a valid email address.',
+    'ends_with' => 'The :attribute field must end with one of the following: :values.',
+    'enum' => 'Mae\'r :attribute a dewisir yn annilys.',
+    'exists' => 'Mae\'r :attribute a dewisir yn annilys.',
+    'extensions' => 'The :attribute field must have one of the following extensions: :values.',
+    'file' => 'The :attribute field must be a file.',
+    'filled' => 'Rhaid i\'r maes :attribute cael gwerth.',
+    'gt' => [
+        'array' => 'The :attribute field must have more than :value items.',
+        'file' => 'The :attribute field must be greater than :value kilobytes.',
+        'numeric' => 'The :attribute field must be greater than :value.',
+        'string' => 'The :attribute field must be greater than :value characters.',
+    ],
+    'gte' => [
+        'array' => 'The :attribute field must have :value items or more.',
+        'file' => 'The :attribute field must be greater than or equal to :value kilobytes.',
+        'numeric' => 'The :attribute field must be greater than or equal to :value.',
+        'string' => 'The :attribute field must be greater than or equal to :value characters.',
+    ],
+    'hex_color' => 'The :attribute field must be a valid hexadecimal color.',
+    'image' => 'The :attribute field must be an image.',
     'import_field_empty'    => 'The value for :fieldname cannot be null.',
-    'in'                   => 'Mae\'r :attribute a dewisir yn annilys.',
-    'in_array'             => 'Nid yw\'r maes :attribute yn bodoli yn :other.',
-    'integer'              => 'Rhaid i\'r :attribute bod yn cyfanrif.',
-    'ip'                   => 'Rhaid i\'r :attribute bod yn cyfeiriad IP dilys.',
-    'ipv4'                 => 'Rhaid i\'r :attribute bod yn cyfeiriad IPv4 dilys.',
-    'ipv6'                 => 'Rhaid i\'r :attribute bod yn cyfeiriad IPv6 dilys.',
-    'is_unique_department' => 'The :attribute must be unique to this Company Location',
-    'json'                 => 'Rhaid i\'r :attribute bod yn llinyn JSON dilys.',
-    'max'                  => [
-        'numeric' => 'Ni ellir :attribute bod yn fwy na :max.',
-        'file'    => 'Ni ellir :attribute bod yn fwy na :max kilobytes.',
-        'string'  => 'Ni ellir :attribute bod yn fwy na :max chaaracters.',
-        'array'   => 'Ni ellir :attribute cael mwy na :max o eitemau.',
+    'in' => 'Mae\'r :attribute a dewisir yn annilys.',
+    'in_array' => 'The :attribute field must exist in :other.',
+    'integer' => 'The :attribute field must be an integer.',
+    'ip' => 'The :attribute field must be a valid IP address.',
+    'ipv4' => 'The :attribute field must be a valid IPv4 address.',
+    'ipv6' => 'The :attribute field must be a valid IPv6 address.',
+    'json' => 'The :attribute field must be a valid JSON string.',
+    'list' => 'The :attribute field must be a list.',
+    'lowercase' => 'The :attribute field must be lowercase.',
+    'lt' => [
+        'array' => 'The :attribute field must have less than :value items.',
+        'file' => 'The :attribute field must be less than :value kilobytes.',
+        'numeric' => 'The :attribute field must be less than :value.',
+        'string' => 'The :attribute field must be less than :value characters.',
     ],
-    'mimes'                => 'Rhaid i\'r :attribute bod yn ffeil o\'r math :values.',
-    'mimetypes'            => 'Rhaid i\'r :attribute bod yn ffeil o\'r math: :values.',
-    'min'                  => [
-        'numeric' => 'Rhaid i\'r :attribute bod o leiaf :min.',
-        'file'    => 'Rhaid i\'r :attribute bod o leiaf :min kilobytes.',
-        'string'  => 'Rhaid i\'r :attribute bod o leiaf :min characters.',
-        'array'   => 'Rhaid i\'r :attribute cael o leiaf :min o eitemau.',
+    'lte' => [
+        'array' => 'The :attribute field must not have more than :value items.',
+        'file' => 'The :attribute field must be less than or equal to :value kilobytes.',
+        'numeric' => 'The :attribute field must be less than or equal to :value.',
+        'string' => 'The :attribute field must be less than or equal to :value characters.',
     ],
-    'starts_with'          => 'The :attribute must start with one of the following: :values.',
-    'ends_with'            => 'The :attribute must end with one of the following: :values.',
+    'mac_address' => 'The :attribute field must be a valid MAC address.',
+    'max' => [
+        'array' => 'The :attribute field must not have more than :max items.',
+        'file' => 'The :attribute field must not be greater than :max kilobytes.',
+        'numeric' => 'The :attribute field must not be greater than :max.',
+        'string' => 'The :attribute field must not be greater than :max characters.',
+    ],
+    'max_digits' => 'The :attribute field must not have more than :max digits.',
+    'mimes' => 'The :attribute field must be a file of type: :values.',
+    'mimetypes' => 'The :attribute field must be a file of type: :values.',
+    'min' => [
+        'array' => 'The :attribute field must have at least :min items.',
+        'file' => 'The :attribute field must be at least :min kilobytes.',
+        'numeric' => 'The :attribute field must be at least :min.',
+        'string' => 'The :attribute field must be at least :min characters.',
+    ],
+    'min_digits' => 'The :attribute field must have at least :min digits.',
+    'missing' => 'The :attribute field must be missing.',
+    'missing_if' => 'The :attribute field must be missing when :other is :value.',
+    'missing_unless' => 'The :attribute field must be missing unless :other is :value.',
+    'missing_with' => 'The :attribute field must be missing when :values is present.',
+    'missing_with_all' => 'The :attribute field must be missing when :values are present.',
+    'multiple_of' => 'The :attribute field must be a multiple of :value.',
+    'not_in' => 'Mae\'r :attribute a dewisir yn annilys.',
+    'not_regex' => 'The :attribute field format is invalid.',
+    'numeric' => 'The :attribute field must be a number.',
+    'password' => [
+        'letters' => 'The :attribute field must contain at least one letter.',
+        'mixed' => 'The :attribute field must contain at least one uppercase and one lowercase letter.',
+        'numbers' => 'The :attribute field must contain at least one number.',
+        'symbols' => 'The :attribute field must contain at least one symbol.',
+        'uncompromised' => 'The given :attribute has appeared in a data leak. Please choose a different :attribute.',
+    ],
+    'percent'       => 'The depreciation minimum must be between 0 and 100 when depreciation type is percentage.',
 
-    'not_in'               => 'Mae\'r :attribute a dewisir yn annilys.',
-    'numeric'              => 'Rhaid i\'r :attribute bod yn rhif.',
-    'present'              => 'Rhaid i\'r maes :attribute bod yn presennol.',
-    'valid_regex'          => 'Nid yw hyn yn Regex dilys. ',
-    'regex'                => 'Mae\'r fformat :attribute yn annilys.',
-    'required'             => 'Mae angen llenwi\'r maes :attribute.',
-    'required_if'          => 'Mae angen y maes :attribute pan :other yw :value.',
-    'required_unless'      => 'Mae angen y maes :attribute pan :other yn :values.',
-    'required_with'        => 'Mae angen y maes :attribute pan mae :values yn bresennol.',
-    'required_with_all'    => 'Mae angen y maes :attribute pan mae :values yn bresennol.',
-    'required_without'     => 'Mae angen y maes :attribute os dydi\'r :values ddim yn bresennol.',
+    'present' => 'Rhaid i\'r maes :attribute bod yn presennol.',
+    'present_if' => 'The :attribute field must be present when :other is :value.',
+    'present_unless' => 'The :attribute field must be present unless :other is :value.',
+    'present_with' => 'The :attribute field must be present when :values is present.',
+    'present_with_all' => 'The :attribute field must be present when :values are present.',
+    'prohibited' => 'The :attribute field is prohibited.',
+    'prohibited_if' => 'The :attribute field is prohibited when :other is :value.',
+    'prohibited_unless' => 'The :attribute field is prohibited unless :other is in :values.',
+    'prohibits' => 'The :attribute field prohibits :other from being present.',
+    'regex' => 'The :attribute field format is invalid.',
+    'required' => 'Mae angen llenwi\'r maes :attribute.',
+    'required_array_keys' => 'The :attribute field must contain entries for: :values.',
+    'required_if' => 'Mae angen y maes :attribute pan :other yw :value.',
+    'required_if_accepted' => 'The :attribute field is required when :other is accepted.',
+    'required_if_declined' => 'The :attribute field is required when :other is declined.',
+    'required_unless' => 'Mae angen y maes :attribute pan :other yn :values.',
+    'required_with' => 'Mae angen y maes :attribute pan mae :values yn bresennol.',
+    'required_with_all' => 'The :attribute field is required when :values are present.',
+    'required_without' => 'Mae angen y maes :attribute os dydi\'r :values ddim yn bresennol.',
     'required_without_all' => 'Mae angen y maes :attribute os dydi\'r un o :values yn bresennol.',
-    'same'                 => 'Rhaid i :attribute a :other cydfynd.',
-    'size'                 => [
-        'numeric' => 'Rhaid i\'r :attribute bod :size.',
-        'file'    => 'Rhaid i\'r :attribute bod o leiaf :size kilobytes.',
-        'string'  => 'Rhaid i\'r :attribute bod o leiaf :size characters.',
-        'array'   => 'Rhaid ir :attribute cynnwys :size eitemau.',
+    'same' => 'The :attribute field must match :other.',
+    'size' => [
+        'array' => 'The :attribute field must contain :size items.',
+        'file' => 'The :attribute field must be :size kilobytes.',
+        'numeric' => 'The :attribute field must be :size.',
+        'string' => 'The :attribute field must be :size characters.',
     ],
+    'starts_with' => 'The :attribute field must start with one of the following: :values.',
     'string'               => 'Rhaid i\'r :attribute bod yn string.',
-    'timezone'             => 'Rhaid i\'r :attribute bod yn barth dilys.',
     'two_column_unique_undeleted' => 'The :attribute must be unique across :table1 and :table2. ',
-    'unique'               => 'Mae\'r :attribute wedi cymeryd yn barod.',
-    'uploaded'             => 'Mae\'r :attribute wedi fethu uwchlwytho.',
-    'url'                  => 'Mae fformat :attribute yn annilys.',
     'unique_undeleted'     => 'Rhaid i\'r :attribute bod yn unigryw.',
     'non_circular'         => 'The :attribute must not create a circular reference.',
     'not_array'            => ':attribute cannot be an array.',
@@ -102,11 +165,14 @@ return [
     'numbers'              => 'Password must contain at least one number.',
     'case_diff'            => 'Password must use mixed case.',
     'symbols'              => 'Password must contain symbols.',
-    'gte'                  => [
-        'numeric'          => 'Value cannot be negative'
-    ],
-    'checkboxes'           => ':attribute contains invalid options.',
-    'radio_buttons'        => ':attribute is invalid.',
+    'timezone' => 'The :attribute field must be a valid timezone.',
+    'unique' => 'Mae\'r :attribute wedi cymeryd yn barod.',
+    'uploaded' => 'Mae\'r :attribute wedi fethu uwchlwytho.',
+    'uppercase' => 'The :attribute field must be uppercase.',
+    'url' => 'The :attribute field must be a valid URL.',
+    'ulid' => 'The :attribute field must be a valid ULID.',
+    'uuid' => 'The :attribute field must be a valid UUID.',
+    'fmcs_location' => 'Full multiple company support and location scoping is enabled in the Admin Settings, and the selected location and selected company are not compatible.',
 
 
     /*
@@ -120,16 +186,22 @@ return [
     |
     */
 
+    'email_array'      => 'Mae un neu fwy o gyfeiriadau e-bost yn annilys.',
+    'checkboxes'           => ':attribute contains invalid options.',
+    'radio_buttons'        => ':attribute is invalid.',
+    
     'custom' => [
         'alpha_space' => 'Mae\'r maes :attribute yn cynnwys cymeriad na chaniateir.',
-        'email_array'      => 'Mae un neu fwy o gyfeiriadau e-bost yn annilys.',
+
         'hashed_pass'      => 'Mae eich cyfrinair cyfredol yn anghywir',
         'dumbpwd'          => 'Mae\'r cyfrinair hwnnw\'n rhy gyffredin.',
         'statuslabel_type' => 'Rhaid i chi ddewis math label statws dilys',
+        'custom_field_not_found'          => 'This field does not seem to exist, please double check your custom field names.',
+        'custom_field_not_found_on_model' => 'This field seems to exist, but is not available on this Asset Model\'s fieldset.',
 
         // date_format validation with slightly less stupid messages. It duplicates a lot, but it gets the job done :(
-        // We use this because the default error message for date_format is reflects php Y-m-d, which non-PHP
-        // people won't know how to format. 
+        // We use this because the default error message for date_format reflects php Y-m-d, which non-PHP
+        // people won't know how to format.
         'purchase_date.date_format'     => 'The :attribute must be a valid date in YYYY-MM-DD format',
         'last_audit_date.date_format'   =>  'The :attribute must be a valid date in YYYY-MM-DD hh:mm:ss format',
         'expiration_date.date_format'   =>  'The :attribute must be a valid date in YYYY-MM-DD format',
@@ -137,9 +209,15 @@ return [
         'expected_checkin.date_format'  =>  'The :attribute must be a valid date in YYYY-MM-DD format',
         'start_date.date_format'        =>  'The :attribute must be a valid date in YYYY-MM-DD format',
         'end_date.date_format'          =>  'The :attribute must be a valid date in YYYY-MM-DD format',
+        'invalid_value_in_field' => 'Invalid value included in this field',
 
-    ],
+        'ldap_username_field' => [
+            'not_in' =>         '<code>sAMAccountName</code> (mixed case) will likely not work. You should use <code>samaccountname</code> (lowercase) instead.'
+        ],
+        'ldap_auth_filter_query' => ['not_in' => '<code>uid=samaccountname</code> is probably not a valid auth filter. You probably want <code>uid=</code> '],
+        'ldap_filter' => ['regex' => 'This value should probably not be wrapped in parentheses.'],
 
+        ],
     /*
     |--------------------------------------------------------------------------
     | Custom Validation Attributes
@@ -155,8 +233,16 @@ return [
 
     /*
     |--------------------------------------------------------------------------
-    | Generic Validation Messages
+    | Generic Validation Messages - we use these in the jquery validation where we don't have
+    | access to the :attribute
     |--------------------------------------------------------------------------
     */
-    'invalid_value_in_field' => 'Invalid value included in this field',
+
+    'generic' => [
+        'invalid_value_in_field' => 'Invalid value included in this field',
+        'required' => 'This field is required',
+        'email' => 'Please enter a valid email address',
+    ],
+
+
 ];
diff --git a/resources/lang/da-DK/account/general.php b/resources/lang/da-DK/account/general.php
index 3f66906786..d4935dc8cc 100644
--- a/resources/lang/da-DK/account/general.php
+++ b/resources/lang/da-DK/account/general.php
@@ -2,10 +2,16 @@
 
 return array(
     'personal_api_keys' => 'Personlige API-nøgler',
+    'personal_access_token' => 'Personal Access Token',
+    'personal_api_keys_success' => 'Personal API Key :key created sucessfully',
+    'here_is_api_key' => 'Here is your new personal access token. This is the only time it will be shown so do not lose it! You may now use this token to make API requests.',
     'api_key_warning' => 'When generating an API token, be sure to copy it down immediately as they will not be visible to you again.',
     'api_base_url' => 'Din basisadressen til API\'en er:',
     'api_base_url_endpoint' => '/&lt;endpoint&gt;',
     'api_token_expiration_time' => 'API-nøgler er indstillet til at udløbe efter:',
     'api_reference' => 'Please check the <a href="https://snipe-it.readme.io/reference" target="_blank">API reference</a> to find specific API endpoints and additional API documentation.',
     'profile_updated' => 'Account successfully updated',
+    'no_tokens' => 'You have not created any personal access tokens.',
+    'enable_sounds' => 'Enable sound effects',
+    'enable_confetti' => 'Enable confetti effects',
 );
diff --git a/resources/lang/da-DK/admin/accessories/message.php b/resources/lang/da-DK/admin/accessories/message.php
index 0f8363e25b..394d705325 100644
--- a/resources/lang/da-DK/admin/accessories/message.php
+++ b/resources/lang/da-DK/admin/accessories/message.php
@@ -26,7 +26,11 @@ return array(
         'error'   		=> 'Tilbehør blev ikke tjekket ud, prøv igen',
         'success' 		=> 'Tilbehør er tjekket ud.',
         'unavailable'   => 'Tilbehør er ikke tilgængeligt til kassen. Tjek antal tilgængelige',
-        'user_does_not_exist' => 'Den bruger er ikke gyldig. Prøv igen.'
+        'user_does_not_exist' => 'Den bruger er ikke gyldig. Prøv igen.',
+         'checkout_qty' => array(
+            'lte'  => 'There is currently only one available accessory of this type, and you are trying to check out :checkout_qty. Please adjust the checkout quantity or the total stock of this accessory and try again.|There are :number_currently_remaining total available accessories, and you are trying to check out :checkout_qty. Please adjust the checkout quantity or the total stock of this accessory and try again.',
+            ),
+           
     ),
 
     'checkin' => array(
diff --git a/resources/lang/da-DK/admin/accessories/table.php b/resources/lang/da-DK/admin/accessories/table.php
index 7298f8e58b..c6f0c228c5 100644
--- a/resources/lang/da-DK/admin/accessories/table.php
+++ b/resources/lang/da-DK/admin/accessories/table.php
@@ -6,6 +6,4 @@ return array(
     'id'      					=> 'ID',
     'require_acceptance'      	=> 'Accept',
     'title'      				=> 'Tilbehør Navn',
-
-
 );
diff --git a/resources/lang/da-DK/admin/components/message.php b/resources/lang/da-DK/admin/components/message.php
index 196965c82f..16c987981b 100644
--- a/resources/lang/da-DK/admin/components/message.php
+++ b/resources/lang/da-DK/admin/components/message.php
@@ -17,7 +17,8 @@ return array(
     'delete' => array(
         'confirm'   => 'Er du sikker på, at du vil slette denne komponent?',
         'error'   => 'Der opstod et problem ved at slette komponenten. Prøv igen.',
-        'success' => 'Komponenten blev slettet korrekt.'
+        'success' => 'Komponenten blev slettet korrekt.',
+        'error_qty'   => 'Some components of this type are still checked out. Please check them in and try again.',
     ),
 
      'checkout' => array(
diff --git a/resources/lang/da-DK/admin/consumables/general.php b/resources/lang/da-DK/admin/consumables/general.php
index 4363e9fa4e..cc80a5e5f5 100644
--- a/resources/lang/da-DK/admin/consumables/general.php
+++ b/resources/lang/da-DK/admin/consumables/general.php
@@ -8,4 +8,5 @@ return array(
     'remaining' 			            => 'Resterende',
     'total' 			                => 'Total',
     'update'                            => 'Opdater forbrugsstoffer',
+    'inventory_warning'                 => 'The inventory of this consumable is below the minimum amount of :min_count',
 );
diff --git a/resources/lang/da-DK/admin/consumables/message.php b/resources/lang/da-DK/admin/consumables/message.php
index 25c33561b7..3ccd3b6070 100644
--- a/resources/lang/da-DK/admin/consumables/message.php
+++ b/resources/lang/da-DK/admin/consumables/message.php
@@ -2,6 +2,7 @@
 
 return array(
 
+    'invalid_category_type' => 'The category must be a consumable category.',
     'does_not_exist' => 'Forbrugsstoffer findes ikke.',
 
     'create' => array(
diff --git a/resources/lang/da-DK/admin/custom_fields/general.php b/resources/lang/da-DK/admin/custom_fields/general.php
index c86379e7e0..a9f07f5ead 100644
--- a/resources/lang/da-DK/admin/custom_fields/general.php
+++ b/resources/lang/da-DK/admin/custom_fields/general.php
@@ -35,7 +35,7 @@ return [
     'create_field_title' => 'Opret et nyt brugerdefineret felt',
     'value_encrypted'      	        => 'Værdien af dette felt er krypteret i databasen. Kun admins vil være i stand til at se den krypteret værdi',
     'show_in_email'     => 'Inkludér værdien af ​​dette felt i tjekud-e-mail til brugeren? Krypterede felter kan ikke medtages i e-mails',
-    'show_in_email_short'     => 'Inkluder i e-mails.',
+    'show_in_email_short' => 'Inkluder i e-mails',
     'help_text' => 'Hjælp Tekst',
     'help_text_description' => 'Dette er valgfri tekst, der vises under formelementerne, mens du redigerer et aktiv for at give kontekst på feltet.',
     'about_custom_fields_title' => 'Om Brugerdefinerede Felter',
@@ -57,5 +57,8 @@ return [
     'show_in_requestable_list_short' => 'Vis i liste over anfordringsberettigede aktiver',
     'show_in_requestable_list' => 'Vis værdi i liste over anfordringsaktiver. Krypterede felter vil ikke blive vist',
     'encrypted_options' => 'Dette felt er krypteret, så nogle visningsindstillinger vil ikke være tilgængelige.',
+    'display_checkin' => 'Display in checkin forms',
+    'display_checkout' => 'Display in checkout forms',
+    'display_audit' => 'Display in audit forms',
 
 ];
diff --git a/resources/lang/da-DK/admin/custom_fields/message.php b/resources/lang/da-DK/admin/custom_fields/message.php
index d2d527d86a..26e28a573f 100644
--- a/resources/lang/da-DK/admin/custom_fields/message.php
+++ b/resources/lang/da-DK/admin/custom_fields/message.php
@@ -5,6 +5,7 @@ return array(
     'field' => array(
         'invalid'   => 'Dette felt findes ikke.',
         'already_added'   => 'Feltet allerede tilføjet',
+        'none_selected'   => 'No field selected',
 
         'create' => array(
             'error'   => 'Feltet blev ikke oprettet, prøve igen.',
diff --git a/resources/lang/da-DK/admin/depreciations/general.php b/resources/lang/da-DK/admin/depreciations/general.php
index 486c285c94..70dd33eb66 100644
--- a/resources/lang/da-DK/admin/depreciations/general.php
+++ b/resources/lang/da-DK/admin/depreciations/general.php
@@ -13,4 +13,8 @@ return [
     'no_depreciations_warning'               => '<strong>Advarsel: </strong>
                       Du har i øjeblikket ikke opsat nogen afskrivninger.
                       Opsæt mindst én afskrivning for at se afskrivningsrapporten.',
+    'depreciation_method'                   => 'Afskrivningsrapport',
+    'linear_depreciation'                   => 'Linear (Default)',
+    'half_1'                                => 'Half-year convention, always applied',
+    'half_2'                                => 'Half-year convention, applied with condition',
 ];
diff --git a/resources/lang/da-DK/admin/hardware/form.php b/resources/lang/da-DK/admin/hardware/form.php
index b35ccd2b2b..1130e7540c 100644
--- a/resources/lang/da-DK/admin/hardware/form.php
+++ b/resources/lang/da-DK/admin/hardware/form.php
@@ -55,8 +55,11 @@ return [
     'asset_location_update_default' => 'Opdater kun standardplacering',
     'asset_location_update_actual' => 'Opdater kun den faktiske placering',
     'asset_not_deployable' => 'Denne aktivstatus er ikke implementerbar. Dette aktiv kan ikke tjekkes ud.',
-    'asset_deployable' => 'Denne status er anvendelig. Dette aktiv kan tjekkes ud.',
+    'asset_not_deployable_checkin' => 'That asset status is not deployable. Using this status label will checkin the asset.',
+    'asset_deployable' => 'This asset can be checked out.',
     'processing_spinner' => 'Behandler... (Dette kan tage lidt tid på store filer)',
+    'processing' => 'Processing... ',
     'optional_infos'  => 'Valgfri Information',
-    'order_details'   => 'Ordre Relateret Information'
+    'order_details'   => 'Ordre Relateret Information',
+    'calc_eol'    => 'If nulling the EOL date, use automatic EOL calculation based on the purchase date and EOL rate.',
 ];
diff --git a/resources/lang/da-DK/admin/hardware/general.php b/resources/lang/da-DK/admin/hardware/general.php
index 3e0d5c7d4c..ffff73b913 100644
--- a/resources/lang/da-DK/admin/hardware/general.php
+++ b/resources/lang/da-DK/admin/hardware/general.php
@@ -5,8 +5,8 @@ return [
     'about_assets_text'            => 'Aktiver er poster sporet af serienummer eller aktiv tag. De har tendens til at være højere værdi elementer, hvor identifikation af en bestemt genstand betyder noget.',
     'archived'  				=> 'arkiverede',
     'asset'  					=> 'Asset',
-    'bulk_checkout'             => 'Udtjek aktiv',
-    'bulk_checkin'              => 'Checkin Assets',
+    'bulk_checkout'             => 'Masseudtjekning',
+    'bulk_checkin'              => 'Bulk Checkin',
     'checkin'  					=> 'Checkin Asset',
     'checkout'  				=> 'Checkout Asset',
     'clone'  					=> 'Klonaktiver',
@@ -27,8 +27,7 @@ return [
     'undeployable_tooltip'  	=> 'Dette aktiv har en status etiket, der ikke kan installeres og kan ikke tjekkes ud på dette tidspunkt.',
     'view'  					=> 'Se aktiv',
     'csv_error' => 'Du har en fejl i din CSV-fil:',
-    'import_text' => '<p>Upload en CSV, der indeholder aktivhistorik. Aktiver og brugere SKAL allerede findes i systemet, eller de vil blive sprunget over. Matchende aktiver for historik import sker mod asset tag. Vi vil forsøge at finde en matchende bruger baseret på den brugers navn, du giver, og de kriterier, du vælger nedenfor. Hvis du ikke vælger nogen kriterier nedenfor, det vil blot forsøge at matche på det brugernavn format, du konfigurerede i <code>Admin &gt; Generelle indstillinger</code>.</p><p>Felter inkluderet i CSV skal matche overskrifterne: <strong>Asset Tag, Navn, Checkout Dato, Checkin Date</strong>. Eventuelle yderligere felter vil blive ignoreret. </p><p>Checkin Dato: tom eller fremtidig checkin datoer vil checkout elementer til tilknyttet bruger. Eksklusive Checkin Date kolonnen vil oprette en checkin dato med dagens dato.</p>
-    ',
+    'import_text' => '<p>Upload a CSV that contains asset history. The assets and users MUST already exist in the system, or they will be skipped. Matching assets for history import happens against the asset tag. We will try to find a matching user based on the user\'s name you provide, and the criteria you select below. If you do not select any criteria below, it will simply try to match on the username format you configured in the <code>Admin &gt; General Settings</code>.</p><p>Fields included in the CSV must match the headers: <strong>Asset Tag, Name, Checkout Date, Checkin Date</strong>. Any additional fields will be ignored. </p><p>Checkin Date: blank or future checkin dates will checkout items to associated user.  Excluding the Checkin Date column will create a checkin date with todays date.</p>    ',
     'csv_import_match_f-l' => 'Prøv at matche brugere med <strong>fornavn.lastname</strong> (<code>jane.smith</code>) format',
     'csv_import_match_initial_last' => 'Prøv at matche brugere med <strong>første oprindelige efternavn</strong> (<code>jsmith</code>) format',
     'csv_import_match_first' => 'Prøv at matche brugere med <strong>fornavn</strong> (<code>jane</code>) format',
diff --git a/resources/lang/da-DK/admin/hardware/message.php b/resources/lang/da-DK/admin/hardware/message.php
index a32011e9c6..d307f1b649 100644
--- a/resources/lang/da-DK/admin/hardware/message.php
+++ b/resources/lang/da-DK/admin/hardware/message.php
@@ -2,18 +2,23 @@
 
 return [
 
-    'undeployable' 		=> '<strong>Advarsel: </strong> Dette aktiv er blevet markeret som uudnytteligt. Hvis denne status er ændret, skal du opdatere aktivstatus.',
-    'does_not_exist' 	=> 'Asset eksisterer ikke.',
-    'does_not_exist_var'=> 'Asset with tag :asset_tag not found.',
-    'no_tag' 	        => 'No asset tag provided.',
+    'undeployable' 		 => '<strong>Warning: </strong> This asset has been marked as currently undeployable. If this status has changed, please update the asset status.',
+    'does_not_exist' 	 => 'Asset eksisterer ikke.',
+    'does_not_exist_var' => 'Asset with tag :asset_tag not found.',
+    'no_tag' 	         => 'No asset tag provided.',
     'does_not_exist_or_not_requestable' => 'Dette aktiv findes ikke eller er ikke påkrævet.',
-    'assoc_users'	 	=> 'Dette aktiv er i øjeblikket tjekket ud til en bruger og kan ikke slettes. Kontroller aktivet først, og prøv derefter at slette igen.',
+    'assoc_users'	 	 => 'Dette aktiv er i øjeblikket tjekket ud til en bruger og kan ikke slettes. Kontroller aktivet først, og prøv derefter at slette igen.',
     'warning_audit_date_mismatch' 	=> 'This asset\'s next audit date (:next_audit_date) is before the last audit date (:last_audit_date). Please update the next audit date.',
+    'labels_generated'   => 'Labels were successfully generated.',
+    'error_generating_labels' => 'Error while generating labels.',
+    'no_assets_selected' => 'No assets selected.',
 
     'create' => [
         'error'   		=> 'Akten blev ikke oprettet, prøv igen. :(',
         'success' 		=> 'Aktivet blev oprettet med succes. :)',
         'success_linked' => 'Aktiv med tag :tag blev oprettet. <strong><a href=":link" style="color: white;">Klik her for at se</a></strong>.',
+        'multi_success_linked' => 'Asset with tag :links was created successfully.|:count assets were created succesfully. :links.',
+        'partial_failure' => 'An asset was unable to be created. Reason: :failures|:count assets were unable to be created. Reasons: :failures',
     ],
 
     'update' => [
@@ -51,20 +56,24 @@ return [
     ],
 
     'import' => [
+        'import_button'         => 'Process Import',
         'error'                 => 'Nogle elementer importerede ikke korrekt.',
         'errorDetail'           => 'Følgende elementer blev ikke importeret på grund af fejl.',
         'success'               => 'Din fil er blevet importeret',
         'file_delete_success'   => 'Din fil er blevet slettet korrekt',
         'file_delete_error'      => 'Filen kunne ikke slettes',
         'file_missing' => 'Den valgte fil mangler',
+        'file_already_deleted' => 'The file selected was already deleted',
         'header_row_has_malformed_characters' => 'En eller flere attributter i overskriftsrækken indeholder misdannede UTF-8 tegn',
         'content_row_has_malformed_characters' => 'En eller flere attributter i den første række indhold indeholder misdannede UTF-8 tegn',
+        'transliterate_failure' => 'Transliteration from :encoding to UTF-8 failed due to invalid characters in input'
     ],
 
 
     'delete' => [
         'confirm'   	=> 'Er du sikker på, at du vil slette dette aktiv?',
         'error'   		=> 'Der opstod et problem ved at slette aktivet. Prøv igen.',
+        'assigned_to_error' => '{1}Asset Tag: :asset_tag is currently checked out. Check in this device before deletion.|[2,*]Asset Tags: :asset_tag are currently checked out. Check in these devices before deletion.',
         'nothing_updated'   => 'Ingen aktiver blev valgt, så intet blev slettet.',
         'success' 		=> 'Aktivet blev slettet med succes.',
     ],
@@ -77,6 +86,11 @@ return [
         'no_assets_selected' => 'Du skal vælge mindst ét aktiv fra listen',
     ],
 
+    'multi-checkout' => [
+        'error'   => 'Asset was not checked out, please try again|Assets were not checked out, please try again',
+        'success' => 'Asset checked out successfully.|Assets checked out successfully.',
+    ],
+
     'checkin' => [
         'error'   		=> 'Akten blev ikke tjekket ind, prøv igen',
         'success' 		=> 'Asset tjekket ind med succes.',
@@ -86,9 +100,10 @@ return [
     ],
 
     'requests' => [
-        'error'   		=> 'Akten blev ikke anmodet om, prøv igen',
-        'success' 		=> 'Akten blev bedt om succes.',
-        'canceled'      => 'Afbestillingsanmodningen er aflyst',
+        'error'   		=> 'Request was not successful, please try again.',
+        'success' 		=> 'Request successfully submitted.',
+        'canceled'      => 'Request successfully canceled.',
+        'cancel'        => 'Annuller denne vareanmodning',
     ],
 
 ];
diff --git a/resources/lang/da-DK/admin/hardware/table.php b/resources/lang/da-DK/admin/hardware/table.php
index 3305b58b49..f9b4831bd9 100644
--- a/resources/lang/da-DK/admin/hardware/table.php
+++ b/resources/lang/da-DK/admin/hardware/table.php
@@ -25,7 +25,6 @@ return [
     'image'		    => 'Enhedsbillede',
     'days_without_acceptance' => 'Dage uden accept',
     'monthly_depreciation' => 'Månedlig afskrivning',
-    'assigned_to'    => 'Tildelt',
     'requesting_user' => 'Anmoder Om Bruger',
     'requested_date' => 'Anmodningsdato',
     'changed'       => 'Ændret',
diff --git a/resources/lang/da-DK/admin/kits/general.php b/resources/lang/da-DK/admin/kits/general.php
index 03b625bd7d..f48974c3eb 100644
--- a/resources/lang/da-DK/admin/kits/general.php
+++ b/resources/lang/da-DK/admin/kits/general.php
@@ -47,4 +47,5 @@ return [
     'kit_deleted'                       => 'Kit blev slettet',
     'kit_model_updated'                 => 'Model blev opdateret',
     'kit_model_detached'                => 'Model blev fjernet',
+    'model_already_attached'            => 'Model already attached to kit',
 ];
diff --git a/resources/lang/da-DK/admin/licenses/general.php b/resources/lang/da-DK/admin/licenses/general.php
index 038e2fb8bb..29594da38f 100644
--- a/resources/lang/da-DK/admin/licenses/general.php
+++ b/resources/lang/da-DK/admin/licenses/general.php
@@ -14,6 +14,7 @@ return array(
     'info'  					=> 'Licens Info',
     'license_seats'  			=> 'Licenssæder',
     'seat'  					=> 'Sæde',
+    'seat_count'  				=> 'Seat :count',
     'seats'  					=> 'Sæder',
     'software_licenses'  		=> 'Softwarelicenser',
     'user'  					=> 'Bruger',
@@ -23,12 +24,12 @@ return array(
         [
             'checkin_all'           => [
                 'button'            => 'Tjek Alle Pladser Ind',
-                'modal'             => 'Dette vil handle checkin et sæde. - Denne handling vil tjekke alle :checkedout_seats_count sæder for denne licens.',
+                'modal'             => 'This action will checkin one seat. | This action will checkin all :checkedout_seats_count seats for this license.',
                 'enabled_tooltip'   => 'Checkin ALLE pladser til denne licens fra både brugere og aktiver',
                 'disabled_tooltip'  => 'Dette er deaktiveret, fordi der ikke er nogen pladser i øjeblikket tjekket ud',
                 'disabled_tooltip_reassignable'  => 'Dette er deaktiveret fordi licensen ikke kan gentildeles',
                 'success'           => 'Licensen blev tjekket ind! - Alle licenser blev tjekket ind!',
-                'log_msg'           => 'Checket ind via bulk licens checkout i licens GUI',
+                'log_msg'           => 'Checked in via bulk license checkin in license GUI',
             ],
 
             'checkout_all'              => [
diff --git a/resources/lang/da-DK/admin/licenses/message.php b/resources/lang/da-DK/admin/licenses/message.php
index 58ee9cd683..5d89acf1e7 100644
--- a/resources/lang/da-DK/admin/licenses/message.php
+++ b/resources/lang/da-DK/admin/licenses/message.php
@@ -44,10 +44,13 @@ return array(
         'error'   => 'Der var et problem med at tjekke licensen. Prøv igen.',
         'success' => 'Licensen blev tjekket ud med succes',
         'not_enough_seats' => 'Ikke nok licenser til rådighed til kassen',
+        'mismatch' => 'The license seat provided does not match the license',
+        'unavailable' => 'This seat is not available for checkout.',
     ),
 
     'checkin' => array(
         'error'   => 'Der var et problem at kontrollere licensen. Prøv igen.',
+        'not_reassignable' => 'License not reassignable',
         'success' => 'Licensen blev tjekket ind med succes'
     ),
 
diff --git a/resources/lang/da-DK/admin/locations/message.php b/resources/lang/da-DK/admin/locations/message.php
index 7c583ee891..897d23fe70 100644
--- a/resources/lang/da-DK/admin/locations/message.php
+++ b/resources/lang/da-DK/admin/locations/message.php
@@ -3,11 +3,12 @@
 return array(
 
     'does_not_exist' => 'Beliggenhed findes ikke.',
-    'assoc_users'    => 'This location is not currently deletable because it is the location of record for at least one asset or user, has assets assigned to it, or is the parent location of another location. Please update your models to no longer reference this company and try again. ',
+    'assoc_users'    => 'This location is not currently deletable because it is the location of record for at least one asset or user, has assets assigned to it, or is the parent location of another location. Please update your records to no longer reference this location and try again ',
     'assoc_assets'	 => 'Denne placering er i øjeblikket forbundet med mindst ét ​​aktiv og kan ikke slettes. Opdater dine aktiver for ikke længere at henvise til denne placering, og prøv igen.',
     'assoc_child_loc'	 => 'Denne placering er for øjeblikket forælder på mindst et barns placering og kan ikke slettes. Opdater dine placeringer for ikke længere at henvise til denne placering, og prøv igen.',
     'assigned_assets' => 'Tildelte aktiver',
     'current_location' => 'Aktuel lokation',
+    'open_map' => 'Open in :map_provider_icon Maps',
 
 
     'create' => array(
@@ -20,6 +21,11 @@ return array(
         'success' => 'Placering opdateret med succes.'
     ),
 
+    'restore' => array(
+        'error'   => 'Location was not restored, please try again',
+        'success' => 'Location restored successfully.'
+    ),
+
     'delete' => array(
         'confirm'   	=> 'Er du sikker på, at du vil slette denne placering?',
         'error'   => 'Der opstod et problem ved at slette placeringen. Prøv igen.',
diff --git a/resources/lang/da-DK/admin/locations/table.php b/resources/lang/da-DK/admin/locations/table.php
index 7ead38d0bc..db8726697b 100644
--- a/resources/lang/da-DK/admin/locations/table.php
+++ b/resources/lang/da-DK/admin/locations/table.php
@@ -39,4 +39,5 @@ return [
     'signed_by_finance_auditor' => 'Godkendt af (finanskontrollant):',
     'signed_by_location_manager' => 'Godkendt af (Lokationsadministrator):',
     'signed_by'                 => 'Godkendt af:',
+    'clone'  					=> 'Clone Location',
 ];
diff --git a/resources/lang/da-DK/admin/models/general.php b/resources/lang/da-DK/admin/models/general.php
index d639ebafb3..19a35e3ad1 100644
--- a/resources/lang/da-DK/admin/models/general.php
+++ b/resources/lang/da-DK/admin/models/general.php
@@ -3,7 +3,7 @@
 return array(
     'about_models_title'     => 'Om aktiv modeller',
     'about_models_text'           => 'Aktiv modeller er en måde at gruppere identiske aktiver. "MBP 2013", "IPhone 6s", osv.',
-    'deleted'  					        => 'Denne model er blevet slettet.',
+    'deleted'  					=> 'Denne model er blevet slettet.',
     'bulk_delete'               => 'Slet flere aktivmodeller',
     'bulk_delete_help'               => 'Brug checkboksene nedenfor til at bekræfte sletning af valgte aktivmodeller. Aktivmodeller med tilknyttede aktiver kan ikke slettes før aktivet er knyttet til en anden model.',
     'bulk_delete_warn'          => 'Du er ved at slette en asset-model: Du er ved at slette :model_count asset-modeller.',
diff --git a/resources/lang/da-DK/admin/models/message.php b/resources/lang/da-DK/admin/models/message.php
index 9739e353ad..402159ffe6 100644
--- a/resources/lang/da-DK/admin/models/message.php
+++ b/resources/lang/da-DK/admin/models/message.php
@@ -7,7 +7,7 @@ return array(
     'no_association' => 'ADVARSEL! Aktivmodellen for dette element er ugyldig eller mangler!',
     'no_association_fix' => 'Dette vil ødelægge ting på underlige og forfærdelige måder. Rediger dette aktiv nu for at tildele det en model.',
     'assoc_users'	 => 'Denne model er knyttet til en eller flere aktiver og ikke kan slettes. Slet venligst aktiver, og prøv derefter at slette igen. ',
-
+    'invalid_category_type' => 'This category must be an asset category.',
 
     'create' => array(
         'error'   => 'Modellen blev ikke oprettet, prøve igen.',
diff --git a/resources/lang/da-DK/admin/reports/general.php b/resources/lang/da-DK/admin/reports/general.php
index 69586db353..54e401eaee 100644
--- a/resources/lang/da-DK/admin/reports/general.php
+++ b/resources/lang/da-DK/admin/reports/general.php
@@ -4,6 +4,7 @@ return [
     'info'   => 'Vælg de ønskede muligheder for din aktivrapport.',
     'deleted_user' => 'Slettet bruger',
     'send_reminder' => 'Send påmindelse',
+    'cannot_send_reminder' => 'User has been deleted or does not have an email address so cannot receive a reminder',
     'reminder_sent' => 'Påmindelse sendt',
     'acceptance_deleted' => 'Accept-anmodning slettet',
     'acceptance_request' => 'Anmodning om accept',
@@ -13,5 +14,10 @@ return [
         'user_state' => 'Bruger Status',
         'user_country' => 'Bruger Land',
         'user_zip' => 'Bruger Zip'
-    ]
-];
\ No newline at end of file
+    ],
+    'open_saved_template' => 'Open Saved Template',
+    'save_template' =>  'Save Template',
+    'select_a_template' => 'Select a Template',
+    'template_name' => 'Template Name',
+    'update_template' => 'Update Template',
+];
diff --git a/resources/lang/da-DK/admin/reports/message.php b/resources/lang/da-DK/admin/reports/message.php
index 4df74bf0b2..2800bbdf0b 100644
--- a/resources/lang/da-DK/admin/reports/message.php
+++ b/resources/lang/da-DK/admin/reports/message.php
@@ -1,5 +1,16 @@
 <?php
 
-return array(
-    'error'   => 'Du skal vælge mindst en mulighed.'
-);
+return [
+    'about_templates' => 'About Saved Templates',
+    'saving_templates_description' => 'Select your options, then enter the name of your template in the box above and click the \'Save Template\' button. Use the dropdown to select a previously saved template.',
+    'create'  => [
+        'success' => 'Template saved successfully',
+    ],
+    'update' => [
+        'success' => 'Template updated successfully',
+    ],
+    'delete' => [
+        'success' => 'Template deleted',
+        'no_delete_permission' => 'Template does not exist or you do not have permission to delete it.',
+    ],
+];
diff --git a/resources/lang/da-DK/admin/settings/general.php b/resources/lang/da-DK/admin/settings/general.php
index 8cfedcb82b..16f9bb5526 100644
--- a/resources/lang/da-DK/admin/settings/general.php
+++ b/resources/lang/da-DK/admin/settings/general.php
@@ -8,13 +8,13 @@ return [
     'ad_append_domain'          => 'Tilføj domænenavn til feltet brugernavn',
     'ad_append_domain_help'     => 'Brugeren er ikke forpligtet til at skrive "username@domain.local", de kan bare skrive "brugernavn".',
     'admin_cc_email'            => 'CC email',
-    'admin_cc_email_help'       => 'Hvis du vil sende en kopi af checkin/checkout emails som er sendt til brugere til en ekstra email konto, så tilføj den her. Ellers efterlad feltet tomt.',
+    'admin_cc_email_help'       => 'Send a copy of checkin/checkout emails to this address.',
     'admin_settings'            => 'Admin Indstillinger',
     'is_ad'				        => 'Dette er en Active Directory-server',
     'alerts'                	=> 'Advarsler',
     'alert_title'               => 'Opdater Notifikationsindstillinger',
     'alert_email'				=> 'Send advarsler til',
-    'alert_email_help'    => 'E-mail-adresser eller distributionslister du vil have advarsler sendt til, kommasepareret',
+    'alert_email_help'          => 'E-mail-adresser eller distributionslister du vil have advarsler sendt til, kommasepareret.',
     'alerts_enabled'			=> 'Advarsler aktiveret',
     'alert_interval'			=> 'Udløbsvarsel Threshold (i dage)',
     'alert_inv_threshold'		=> 'Lagervarsletærskel',
@@ -31,15 +31,18 @@ return [
     'backups'					=> 'Backups',
     'backups_help'              => 'Opret, download og gendan sikkerhedskopier ',
     'backups_restoring'         => 'Gendanner fra sikkerhedskopi',
+    'backups_clean' => 'Clean the backed-up database before restore',
+    'backups_clean_helptext' => "This can be useful if you're changing between database versions",
     'backups_upload'            => 'Upload Sikkerhedskopi',
     'backups_path'              => 'Sikkerhedskopier på serveren gemmes i <code>:path</code>',
-    'backups_restore_warning'   => 'Brug gendannelsesknappen <small><span class="btn btn-xs btn-warning"><i class="text-white fas fa-retweet" aria-hidden="true"></i></span></small> til at gendanne fra en tidligere sikkerhedskopi. (Dette virker ikke i øjeblikket med S3 fillagring eller Docker.<br><br>Hele din <strong>:app_name database og eventuelle uploadede filer vil blive fuldstændig erstattet</strong> af, hvad der er i backup-filen.  ',
+    'backups_restore_warning'   => 'Use the restore button <small><span class="btn btn-xs btn-warning"><i class="text-white fas fa-retweet" aria-hidden="true"></i></span></small> to restore from a previous backup. (This does not currently work with S3 file storage or Docker.)<br><br>Your <strong>entire :app_name database and any uploaded files will be completely replaced</strong> by what\'s in the backup file  ',
     'backups_logged_out'         => 'Alle eksisterende brugere, herunder dig, vil blive logget ud, når din gendannelse er fuldført.',
     'backups_large'             => 'Meget store sikkerhedskopier kan timeout på gendannelsesforsøg og kan stadig være nødvendigt at køre via kommandolinjen. ',
     'barcode_settings'			=> 'Stregkodeindstillinger',
     'confirm_purge'			    => 'Bekræft rensning',
     'confirm_purge_help'		=> 'Indtast teksten "DELETE" i boksen nedenfor for at tømme dine slettede poster. Denne handling kan ikke fortrydes og vil slette alle soft-slettede elementer og brugere PERMANENT. (Du bør lave en sikkerhedskopi først, bare for at være sikker.)',
     'custom_css'				=> 'Brugerdefineret CSS',
+    'custom_css_placeholder'	=> 'Add your custom CSS',
     'custom_css_help'			=> 'Indtast eventuelle brugerdefinerede CSS overskridelser, du gerne vil bruge. Indsæt ikke de &lt;style&gt;&lt;/style&gt; tags.',
     'custom_forgot_pass_url'	=> 'Tilpasset Kodeord reset URL',
     'custom_forgot_pass_url_help'	=> 'Dette anvendes i stedet for den indbyggede URL til "glemt kodeord" på login billedet, anvendelig til at sende besøgende til en intern eller hosted LDAP kodeord reset funktion. Den vil effektivt afstille den lokale "glemt kodeord" funktionalitet.',
@@ -47,34 +50,34 @@ return [
     'dashboard_message_help'	=> 'Denne tekst vil vises på dashboard for alle som har tilladelse til at se dashbordet.',
     'default_currency'  		=> 'Standardvaluta',
     'default_eula_text'			=> 'Standard EULA',
+    'default_eula_text_placeholder' => 'Add your default EULA text',
     'default_language'			=> 'Standard sprog',
     'default_eula_help_text'	=> 'Du kan også knytte brugerdefinerede EULA til specifikke aktivkategorier.',
     'acceptance_note'           => 'Add a note for your decision (Optional)',
     'display_asset_name'        => 'Vis aktivnavn',
     'display_checkout_date'     => 'Vis checkout dato',
     'display_eol'               => 'Vis EOL i tabelvisning',
-    'display_qr'                => 'Vis firkantede koder',
+    'display_qr'                => 'Display 2D barcode',
     'display_alt_barcode'		=> 'Vis 1D stregkode',
-    'email_logo'                => 'Email Logo',
     'barcode_type'				=> '2D stregkode type',
     'alt_barcode_type'			=> '1D stregkode type',
-    'email_logo_size'       => 'Kvadratiske logoer i e-mail ser bedst ud. ',
     'enabled'                   => 'Aktiveret',
     'eula_settings'				=> 'EULA-indstillinger',
     'eula_markdown'				=> 'Denne EULA tillader <a href="https://help.github.com/articles/github-flavored-markdown/">Github smagsmærket markdown</a>.',
+    'empty_row_count'           => 'Field Start Offset (Empty Rows)',
+    'empty_row_count_help'      => 'Fields will begin populating after this many empty rows are skipped at the top of the label.',
     'favicon'                   => 'Favicon',
     'favicon_format'            => 'Accepterede filtyper er ico, png, og gif. Andre billedformater fungerer muligvis ikke i alle browsere.',
     'favicon_size'          => 'Favicons skal være firkantede billeder, 16x16 pixels.',
     'footer_text'               => 'Ekstra footer tekst ',
     'footer_text_help'          => 'Denne tekst vil vises i footeren i højre side. Der kan anvendes links ved hjælp af <a href="https://help.github.com/articles/github-flavored-markdown/">Github flavored markdown</a>. Linjeskift, headere, billeder etc. kan føre til uforudsigelige resultater.',
+    'footer_text_placeholder'   => 'Optional footer text',
     'general_settings'			=> 'Generelle indstillinger',
-    'general_settings_keywords' => 'firma support, signatur, accept, e-mail format, brugernavn format, billeder, per side, miniaturebillede, eula, gravatar, tos, instrumentbræt, privatliv',
     'general_settings_help'     => 'Standard slutbrugerlicens og mere',
     'generate_backup'			=> 'Generer sikkerhedskopiering',
     'google_workspaces'         => 'Google Workspaces',
     'header_color'              => 'Hovedfarge',
     'info'                      => 'Disse indstillinger giver dig mulighed for at tilpasse visse aspekter af din installation.',
-    'label_logo'                => 'Etiketlogo',
     'label_logo_size'           => 'Firkantede logoer ser bedst ud - vil blive vist øverst til højre på hver aktiv etiket. ',
     'laravel'                   => 'Laravel Version',
     'ldap'                      => 'LDAP',
@@ -94,7 +97,7 @@ return [
     'ldap_login_sync_help'      => 'Dette tester kun om LDAP kan synkronisere korrekt. Hvis din LDAP authentisering ikke er korrekt, er det usikkert om brugere kan logge ind. DU SKAL FØRST OPDATERE OG GEMME DINE LDAP INDSTILLINGER.',
     'ldap_manager'              => 'LDAP Manager',
     'ldap_server'               => 'LDAP-server',
-    'ldap_server_help'          => 'Dette skal starte med ldap: // (for ukrypteret eller TLS) eller ldaps: // (for SSL)',
+    'ldap_server_help'          => 'This should start with ldap:// (for unencrypted) or ldaps:// (for TLS or SSL)',
     'ldap_server_cert'			=> 'Validering af LDAP SSL-certifikat',
     'ldap_server_cert_ignore'	=> 'Tillad ugyldigt SSL-certifikat',
     'ldap_server_cert_help'		=> 'Marker dette afkrydsningsfelt, hvis du bruger et selvtegnet SSL cert og vil gerne acceptere et ugyldigt SSL-certifikat.',
@@ -108,8 +111,8 @@ return [
     'ldap_pword'                => 'LDAP-bindingsadgangskode',
     'ldap_basedn'               => 'Base Bind DN',
     'ldap_filter'               => 'LDAP-filter',
-    'ldap_pw_sync'              => 'LDAP Password Sync',
-    'ldap_pw_sync_help'         => 'Fjern markeringen i dette felt, hvis du ikke vil beholde LDAP-adgangskoder synkroniseret med lokale adgangskoder. Deaktivering dette betyder, at dine brugere muligvis ikke kan logge ind, hvis din LDAP-server ikke er tilgængelig af en eller anden grund.',
+    'ldap_pw_sync'              => 'Cache LDAP Passwords',
+    'ldap_pw_sync_help'         => 'Uncheck this box if you do not wish to keep LDAP passwords cached as local hashed passwords. Disabling this means that your users may not be able to login if your LDAP server is unreachable for some reason.',
     'ldap_username_field'       => 'Brugernavn felt',
     'ldap_lname_field'          => 'Efternavn',
     'ldap_fname_field'          => 'LDAP fornavn',
@@ -117,13 +120,15 @@ return [
     'ldap_version'              => 'LDAP Version',
     'ldap_active_flag'          => 'LDAP Active Flag',
     'ldap_activated_flag_help'  => 'Denne værdi bruges til at afgøre, om en synkroniseret bruger kan logge ind på Snipe-IT. <strong>Det påvirker ikke muligheden for at tjekke elementer ind eller ud til dem</strong>, and should be the <strong>attribute name</strong> within your AD/LDAP, <strong>not the value</strong>. <br><br>Hvis dette felt er sat til et feltnavn, der ikke findes i din AD/LDAP, eller værdien i AD/LDAP feltet er sat til <code>0</code> eller <code>false</code>, <strong>bruger login vil blive deaktiveret</strong>. Hvis værdien i AD/LDAP feltet er sat til <code>1</code> eller <code>true</code> eller <em>enhver anden tekst</em> betyder, at brugeren kan logge ind. Når feltet er tomt i din AD, respekterer vi <code>userAccountControl</code> attributten, som normalt tillader ikke-suspenderede brugere at logge ind.',
+    'ldap_invert_active_flag'   => 'LDAP Invert Active Flag',
+    'ldap_invert_active_flag_help'     => 'If enabled: when the value returned by LDAP Active Flag is <code>0</code> or <code>false</code> the user account will be active.',
     'ldap_emp_num'              => 'LDAP medarbejdernummer',
     'ldap_email'                => 'LDAP Email',
     'ldap_test'                 => 'Test LDAP',
     'ldap_test_sync'            => 'Test LDAP Synkronisering',
     'license'                   => 'Software licens',
-    'load_remote'               => 'Brug Gravatar',
-    'load_remote_help_text'		=> 'Afmarkér dette felt, hvis din installation ikke kan indlæse scripts fra det eksterne internet. Dette vil forhindre Snipe-IT i at prøve at indlæse billeder fra Gravatar.',
+    'load_remote'               => 'Load Remote Avatars',
+    'load_remote_help_text'		=> 'Uncheck this box if your install cannot load scripts from the outside internet. This will prevent Snipe-IT from trying load avatars from Gravatar or other outside sources.',
     'login'                     => 'Log Ind Forsøg',
     'login_attempt'             => 'Log Ind Forsøg',
     'login_ip'                  => 'Ip Adresse',
@@ -131,6 +136,7 @@ return [
     'login_user_agent'          => 'Bruger Agent',
     'login_help'                => 'Liste over forsøg på logins',
     'login_note'                => 'Login Note',
+    'login_note_placeholder'            => "If you do not have a login or have found a device belonging to this company, please call technical support at 888-555-1212. Thank you.",
     'login_note_help'           => 'Indsæt eventuelt nogle sætninger på din loginskærm, for eksempel for at hjælpe personer, der har fundet en tabt eller stjålet enhed. Dette felt accepterer <a href="https://help.github.com/articles/github-flavored-markdown/">Github flavored markdown</a>',
     'login_remote_user_text'    => 'Loginoptions for fjernbrugere',
     'login_remote_user_enabled_text' => 'Tillad login med fjernbrugerheader',
@@ -146,13 +152,16 @@ return [
     'logo_print_assets_help'    => 'Brug branding på udskrevne aktivlister ',
     'full_multiple_companies_support_help_text' => 'Begrænsning af brugere (herunder admins) tildelt virksomheder til deres virksomheds aktiver.',
     'full_multiple_companies_support_text' => 'Fuld flere virksomheder support',
+    'scope_locations_fmcs_support_text'  => 'Scope Locations with Full Multiple Companies Support',
+    'scope_locations_fmcs_support_help_text'  => 'Restrict locations to their selected company.',
+    'scope_locations_fmcs_check_button' => 'Check Compatibility',
+    'scope_locations_fmcs_support_disabled_text'  => 'This option is disabled because you have conflicting locations set for :count or more items.',
     'show_in_model_list'   => 'Vis i modeldropdown',
     'optional'					=> 'valgfri',
     'per_page'                  => 'Resultater pr. Side',
     'php'                       => 'PHP Version',
-    'php_info'                  => 'PHP Info',
+    'php_info'                  => 'PHP info',
     'php_overview'              => 'PHP',
-    'php_overview_keywords'     => 'phpinfo, system, info',
     'php_overview_help'         => 'Php System info',
     'php_gd_info'               => 'Du skal installere php-gd for at vise QR-koder, se installationsvejledningen.',
     'php_gd_warning'            => 'PHP Image Processing og GD plugin er IKKE installeret.',
@@ -218,6 +227,8 @@ return [
     'webhook_integration_help'    => ':app integration er valgfri, men endepunktet og kanalen er påkrævet, hvis du ønsker at bruge det. For at konfigurere :app integration, skal du først <a href=":webhook_link" target="_new" rel="noopener">oprette en indgående webhook</a> på din :app konto. Klik på knappen <strong>Test :app Integration</strong> for at bekræfte, at dine indstillinger er korrekte, før du gemmer. ',
     'webhook_integration_help_button'    => 'Når du har gemt dine :app oplysninger, vil en test knap vises.',
     'webhook_test_help'           => 'Test om din :app integration er konfigureret korrekt. DU SKAL GEM DIN OPDATERET: app INDSTILLINGER FØRST.',
+    'shortcuts_enabled'         => 'Enable Shortcuts',
+    'shortcuts_help_text'       => '<strong>Windows</strong>: Alt + Access key, <strong>Mac</strong>: Control + Option + Access key',
     'snipe_version'  			=> 'Snipe-IT version',
     'support_footer'            => 'Understøt footer links ',
     'support_footer_help'       => 'Angiv hvem der kan se links i Snipe-IT Support info og brugermanual',
@@ -227,7 +238,6 @@ return [
     'update'                    => 'Opdater indstillinger',
     'value'                     => 'Værdi',
     'brand'                     => 'Branding',
-    'brand_keywords'            => 'footer, logo, print, tema, hud, header, farver, farve, css',
     'brand_help'                => 'Logo, Webstedsnavn',
     'web_brand'                 => 'Web Branding Type',
     'about_settings_title'      => 'Om indstillinger',
@@ -276,6 +286,8 @@ return [
     'two_factor_enrollment_text'	=> "To faktor godkendelse er påkrævet, men din enhed er endnu ikke blevet tilmeldt. Åbn din Google Authenticator-app og scan QR-koden nedenfor for at tilmelde din enhed. Når du har tilmeldt din enhed, skal du indtaste koden nedenfor",
     'require_accept_signature'      => 'Kræver Signatur',
     'require_accept_signature_help_text'      => 'Aktivering af denne funktion kræver, at brugerne fysisk logger af ved at acceptere et aktiv.',
+    'require_checkinout_notes'  => 'Require Notes on Checkin/Checkout',
+    'require_checkinout_notes_help_text'    => 'Enabling this feature will require the note fields to be populated when checking in or checking out an asset.',
     'left'        => 'venstre',
     'right'        => 'højre',
     'top'        => 'top',
@@ -313,24 +325,24 @@ return [
     'filter_by_keyword' => 'Filtrer efter indstilling af søgeord',
     'security' => 'Sikkerhed',
     'security_title' => 'Opdater Sikkerhedsindstillinger',
-    'security_keywords' => 'adgangskode, adgangskoder, krav, to faktor, to-faktor, almindelige adgangskoder, fjernlogin, logout, godkendelse',
     'security_help' => 'To-faktor, Adgangskodebegrænsninger',
-    'groups_keywords' => 'tilladelser, tilladelsesgrupper, tilladelse',
     'groups_help' => 'Konto tilladelsesgrupper',
     'localization' => 'Lokalisering',
     'localization_title' => 'Opdater Lokaliseringsindstillinger',
-    'localization_keywords' => 'lokalisering, valuta, lokal, lokal, tidszone, international, internatinalisering, sprog, oversættelse',
     'localization_help' => 'Sprog og datovisning',
     'notifications' => 'Notifikationer',
     'notifications_help' => 'E-Mail Advarsler Og Revisionsindstillinger',
     'asset_tags_help' => 'Stigende og præfikser',
     'labels' => 'Etiketter',
     'labels_title' => 'Opdater Etiketindstillinger',
-    'labels_help' => 'Etiketstørrelser &amp; indstillinger',
-    'purge_keywords' => 'slet permanent',
+    'labels_help' => 'Barcodes &amp; label settings',
     'purge_help' => 'Ryd slettet poster',
     'ldap_extension_warning' => 'Det ser ikke ud som om LDAP- udvidelsen er installeret eller aktiveret på denne server. Du kan stadig gemme dine indstillinger, men du bliver nødt til at aktivere LDAP-udvidelsen til PHP, før LDAP-synkronisering eller login vil virke.',
     'ldap_ad' => 'LDAP/AD',
+    'ldap_test_label' => 'Test LDAP Sync',
+    'ldap_test_login' => ' Test LDAP Login',
+    'ldap_username_placeholder' => 'LDAP Username',
+    'ldap_password_placeholder' => 'LDAP Password',
     'employee_number' => 'Medarbejdernummer',
     'create_admin_user' => 'Opret en bruger ::',
     'create_admin_success' => 'Succes! Din admin bruger er blevet tilføjet!',
@@ -342,6 +354,8 @@ return [
     'setup_migration_create_user' => 'Næste: Opret Bruger',
     'ldap_settings_link' => 'LDAP- Indstillingsside',
     'slack_test' => 'Integration Af Test <i class="fab fa-slack"></i>',
+    'status_label_name' => 'Status Label Name',
+    'super_admin_only'  => 'Super Admin Only',
     'label2_enable'           => 'Ny Etiketmotor',
     'label2_enable_help'      => 'Skift til den nye etiketmotor. <b>Bemærk: Du skal gemme denne indstilling, før du indstiller andre.</b>',
     'label2_template'         => 'Skabelon',
@@ -356,12 +370,15 @@ return [
     'label2_2d_type'          => '2D stregkode type',
     'label2_2d_type_help'     => 'Format for 2D stregkoder',
     'label2_2d_target'        => '2D Stregkode Mål',
-    'label2_2d_target_help'   => 'URL\'en 2D stregkode peger på, når der scannes',
+    'label2_2d_target_help'   => 'The data that will be contained in the 2D barcode',
     'label2_fields'           => 'Feltdefinitioner',
     'label2_fields_help'      => 'Felter kan tilføjes, fjernes og omordnes i venstre kolonne. For hvert felt kan flere muligheder for Label og DataSource tilføjes, fjernes og omordnet i den rigtige kolonne.',
+    'purge_barcodes' => 'Purge Barcodes',
     'help_asterisk_bold'    => 'Tekst indtastet som <code>**text**</code> vil blive vist som fed',
     'help_blank_to_use'     => 'Efterlad blank for at bruge værdien fra <code>:setting_name</code>',
-    'help_default_will_use' => '<code>:default</code> vil bruge værdien fra <code>:setting_name</code>. <br>Bemærk, at værdien af stregkoderne skal overholde den respektive stregkode spec for at blive genereret med succes. Se venligst <a href="https://snipe-it.readme.io/docs/barcodes">dokumentationen <i class="fa fa-external-link"></i></a> for flere detaljer. ',
+    'help_default_will_use' => '<code>:default</code> will use the value from <code>:setting_name</code>. <br>Note that the value of the barcodes must comply with the respective barcode spec in order to be successfully generated. Please see <a href="https://snipe-it.readme.io/docs/barcodes">the documentation <i class="fa fa-external-link"></i></a> for more details. ',
+    'asset_id'              => 'Asset ID',
+    'data'               => 'Data',
     'default'               => 'Standard',
     'none'                  => 'Ingen',
     'google_callback_help' => 'Dette skal indtastes som callback URL i dine Google OAuth app indstillinger i din organisation&apos;s <strong><a href="https://console.cloud.google.com/" target="_blank">Google udvikler konsol <i class="fa fa-external-link" aria-hidden="true"></i></a></strong>.',
@@ -373,7 +390,100 @@ return [
     'database_driver' => 'Database Chauffør',
     'bs_table_storage' => 'Lagerplads I Tabel',
     'timezone' => 'Timezone',
+    'test_mail' => 'Test Mail',
     'profile_edit'          => 'Edit Profile',
     'profile_edit_help'          => 'Allow users to edit their own profiles.',
+    'default_avatar' => 'Custom Default Avatar',
+    'default_avatar_help' => 'This image will be displayed as a profile if a user does not have a profile photo.',
+    'restore_default_avatar' => 'Restore <a href=":default_avatar" data-toggle="lightbox" data-type="image">original system default avatar</a>',
+    'restore_default_avatar_help' => '',
+    'due_checkin_days' => 'Due For Checkin Warning',
+    'due_checkin_days_help' => 'How many days before the expected checkin of an asset should it be listed in the "Due for checkin" page?',
+    'no_groups' => 'No groups have been created yet. Visit <code>Admin Settings > Permission Groups</code> to add one.',
+    'text' => 'Text',
+
+    'username_formats' => [
+        'username_format'		=> 'Brugernavn Format',
+        'firstname_lastname_format'	=> 'Fornavn Efternavn (jane.smith)',
+        'first_name_format'	        => 'First Name (jane)',
+        'last_name_format'		=> 'Last Name (doe)',
+        'filastname_format'			=> 'First Initial Last Name (jsmith)',
+        'lastnamefirstinitial_format' =>  'Last Name First Initial (smithj)',
+        'firstname_lastname_underscore_format' => 'First Name Last Name (jane_smith)',
+        'firstinitial.lastname' => 'First Initial Last Name (j.smith)',
+        'lastname_firstinitial' => 'Last Name First Initial (smith_j)',
+        'lastname_dot_firstinitial_format' => 'Last Name First Initial (smith.j)',
+        'firstnamelastname'     => 'First Name Last Name (janesmith)',
+        'firstnamelastinitial'  => 'First Name Last Initial (janes)',
+        'lastnamefirstname'      => 'Last Name.First Name (smith.jane)',
+    ],
+
+    'email_formats' => [
+        'email_format'			=> 'Email formattering',
+        'firstname_lastname_format'	=> 'Fornavn Efternavn (jane.smith@example.com)',
+        'first_name_format'		=> 'Fornavn (jane@example.com)',
+        'last_name_format'		=> 'Last Name (doe@example.com)',
+        'filastname_format'			=> 'Fornavnskarakter Efternavn (jsmith@example.com)',
+        'lastnamefirstinitial_format' =>  'Efternavn Første initial (smithj@example.com)',
+        'firstname_lastname_underscore_format' => 'Fornavn Efternavn (jane_smith@example.com)',
+        'firstinitial.lastname' => 'Første bogstav i fornavn.efternavn (j.smith@example.com)',
+        'lastname_firstinitial' => 'Efternavn første bogstav i fornavn (smith_j@example.com)',
+        'lastname_dot_firstinitial_format' => 'Last Name First Initial (smith.j@example.com)',
+        'firstnamelastname'     => 'Fornavn efternavn (janesmith@example.com)',
+        'firstnamelastinitial'  => 'Fornavn førstebogstav i efternavn (janes@example.com)',
+        'lastnamefirstname'      => 'Last Name.First Name (smith.jane@example.com)',
+    ],
+
+
+
+    'logo_labels' => [
+        'acceptance_pdf_logo'       => 'PDF Logo',
+        'email_logo'                => 'Email Logo',
+        'label_logo'                => 'Etiketlogo',
+        'logo'                      => 'Site Logo',
+        'favicon'                   => 'Favicon',
+    ],
+
+    'logo_help' => [
+        'email_logo_size'       => 'Kvadratiske logoer i e-mail ser bedst ud. ',
+    ],
+
+    'logo_option_types' => [
+        'text' => 'Text',
+        'logo' => 'Logo',
+        'logo_and_text' => 'Logo and Text',
+    ],
+
+
+    'legends' => [
+        'scoping' => 'Scoping',
+        'formats' => 'Default Formats',
+        'profiles' => 'User Profiles',
+        'eula' => 'EULA & Acceptance Preferences',
+        'misc_display' => 'Miscellaneous Display Options',
+        'email' => 'Email Preferences',
+        'checkin' => 'Checkin Preferences',
+        'dashboard' => 'Login & Dashboard Preferences',
+        'misc' => 'Miscellaneous',
+        'logos' => 'Logos & Display',
+        'colors' => 'Colors & Skins',
+        'footer' => 'Footer Preferences',
+        'security' => 'Security Preferences',
+        'general' => 'General',
+        'intervals' => 'Intervals & Thresholds',
+    ],
+
+
+    /* Keywords for settings overview help */
+    'keywords' => [
+        'brand'             => 'footer, logo, print, tema, hud, header, farver, farve, css',
+        'general_settings'  => 'firma support, signatur, accept, e-mail format, brugernavn format, billeder, per side, miniaturebillede, eula, gravatar, tos, instrumentbræt, privatliv',
+        'groups'            => 'tilladelser, tilladelsesgrupper, tilladelse',
+        'labels'            => 'labels, barcodes, barcode, sheets, print, upc, qr, 1d, 2d',
+        'localization'      => 'lokalisering, valuta, lokal, lokal, tidszone, international, internatinalisering, sprog, oversættelse',
+        'php_overview'      => 'phpinfo, system, info',
+        'purge'             => 'slet permanent',
+        'security'          => 'adgangskode, adgangskoder, krav, to faktor, to-faktor, almindelige adgangskoder, fjernlogin, logout, godkendelse',
+    ],
 
 ];
diff --git a/resources/lang/da-DK/admin/settings/message.php b/resources/lang/da-DK/admin/settings/message.php
index ec3eb4472f..688cfc5044 100644
--- a/resources/lang/da-DK/admin/settings/message.php
+++ b/resources/lang/da-DK/admin/settings/message.php
@@ -14,6 +14,9 @@ return [
         'restore_warning'       => 'Ja, gendanne den. Jeg anerkender, at dette vil overskrive alle eksisterende data i databasen. Dette vil også logge ud alle dine eksisterende brugere (inklusive dig).',
         'restore_confirm'       => 'Er du sikker på, at du vil gendanne din database fra :filnavn?'
     ],
+    'restore' => [
+        'success'               => 'Your system backup has been restored. Please log in again.'
+    ],
     'purge' => [
         'error'     => 'Der opstod en fejl under udrensning.',
         'validation_failed'     => 'Din udrensningsbekræftelse er forkert. Indtast ordet "DELETE" i bekræftelsesboksen.',
@@ -33,6 +36,9 @@ return [
         'testing_authentication' => 'Test LDAP Autentificering...',
         'authentication_success' => 'Bruger godkendt mod LDAP!'
     ],
+    'labels' => [
+        'null_template' => 'Label template not found. Please select a template.',
+        ],
     'webhook' => [
         'sending' => 'Sender :app test besked...',
         'success' => 'Dine :webhook_name Integration virker!',
@@ -42,5 +48,12 @@ return [
         'error' => 'Noget gik galt. :app svarede med: :error_message',
         'error_redirect' => 'FEJL: 301/302: endpoint returnerer en omdirigering. Af sikkerhedsmæssige årsager følger vi ikke omdirigeringer. Brug det faktiske slutpunkt.',
         'error_misc' => 'Noget gik galt. :( ',
-    ]
+        'webhook_fail' => ' webhook notification failed: Check to make sure the URL is still valid.',
+        'webhook_channel_not_found' => ' webhook channel not found.',
+        'ms_teams_deprecation' => 'The selected Microsoft Teams webhook URL will be deprecated Dec 31st, 2025. Please use a workflow URL. Microsoft\'s documentation on creating a workflow can be found <a href="https://support.microsoft.com/en-us/office/create-incoming-webhooks-with-workflows-for-microsoft-teams-8ae491c7-0394-4861-ba59-055e33f75498" target="_blank"> here.</a>',
+    ],
+    'location_scoping' => [
+        'not_saved' => 'Your settings were not saved.',
+        'mismatch' => 'There is 1 item in the database that need your attention before you can enable location scoping.|There are :count items in the database that need your attention before you can enable location scoping.',
+    ],
 ];
diff --git a/resources/lang/da-DK/admin/statuslabels/table.php b/resources/lang/da-DK/admin/statuslabels/table.php
index afea668ede..5e8904c281 100644
--- a/resources/lang/da-DK/admin/statuslabels/table.php
+++ b/resources/lang/da-DK/admin/statuslabels/table.php
@@ -1,14 +1,14 @@
 <?php
 
 return array(
-    'about'      	=> 'Om status labels',
+    'about'      	=> 'About Status Types',
     'archived'      	=> 'arkiverede',
     'create'      	=> 'Opret status label',
     'color'      	=> 'Diagramfarve',
     'default_label' => 'Default etiket',
     'default_label_help' => 'Dette anvendes for at sikre at din mest anvendte statusetiket ses øverst i valgene når du opretter/retter aktiver.',
     'deployable'      	=> 'Deployable',
-    'info'      	=> 'Statusetiketter bruges til at beskrive de forskellige stater, dine aktiver kan være i. De kan være ude til reparation, tabt / stjålet osv. Du kan oprette nye statusetiketter til implementerbare, ventende og arkiverede aktiver.',
+    'info'      	=> 'Status label types are used to describe the various states your assets could be in. They may be out for repair, lost/stolen, etc. You can create new status labels for your deployable, pending and archived assets according to your own workflow. For more information, <a href="https://snipe-it.readme.io/docs/overview#status-labels" target="_blank">see the documentation <i class="fa fa-external-link"></i></a>.',
     'name'      	=> 'Status navn',
     'pending'      	=> 'Verserende',
     'status_type'   => 'Status Type',
diff --git a/resources/lang/da-DK/admin/users/general.php b/resources/lang/da-DK/admin/users/general.php
index 7ebaab80be..48b660e313 100644
--- a/resources/lang/da-DK/admin/users/general.php
+++ b/resources/lang/da-DK/admin/users/general.php
@@ -19,6 +19,8 @@ return [
     'print_assigned'    => 'Udskriv alle tildelte',
     'email_assigned'    => 'E-mail liste over alle tildelt',
     'user_notified'     => 'Brugeren er blevet sendt en liste over deres aktuelt tildelte elementer.',
+    'users_notified'    => 'The user has been emailed a list of their currently assigned items.|:count users have been emailed a list of their currently assigned items.',
+    'users_notified_warning' => ':count user has been emailed a list of their currently assigned items, however :no_email users did not have an email address so could not be emailed.|:count users have been emailed a list of their currently assigned items, however :no_email user(s) did not have an email address so could not be emailed.',
     'auto_assign_label' => 'Inkludér denne bruger ved automatisk tildeling af kvalificerede licenser',
     'auto_assign_help'  => 'Spring denne bruger over i auto-tildeling af licenser',
     'software_user'     => 'Software Checket ud til: navn',
diff --git a/resources/lang/da-DK/admin/users/message.php b/resources/lang/da-DK/admin/users/message.php
index d9ac4b2446..add1e68f6a 100644
--- a/resources/lang/da-DK/admin/users/message.php
+++ b/resources/lang/da-DK/admin/users/message.php
@@ -6,7 +6,7 @@ return array(
     'declined'                  => 'Du har afvist dette aktiv.',
     'bulk_manager_warn'	        => 'Dine brugere er blevet opdateret, men din administratorindgang blev ikke gemt, fordi den valgte leder også var på brugerlisten, der skulle redigeres, og brugerne er måske ikke deres egen administrator. Vælg venligst dine brugere igen, undtagen manager.',
     'user_exists'               => 'Bruger eksistere allerede!',
-    'user_not_found'            => 'Bruger eksisterer ikke.',
+    'user_not_found'            => 'User does not exist or you do not have permission view them.',
     'user_login_required'       => 'Login-feltet er påkrævet',
     'user_has_no_assets_assigned' => 'Ingen aktiver i øjeblikket tildelt brugeren.',
     'user_password_required'    => 'Adgangskoden er påkrævet.',
@@ -53,6 +53,7 @@ return array(
         'ldap_could_not_search' => 'Kunne ikke søge på LDAP-serveren. Tjek venligst din LDAP-serverkonfiguration i LDAP-konfigurationsfilen. <br>Error fra LDAP-server:',
         'ldap_could_not_get_entries' => 'Kunne ikke få poster fra LDAP-serveren. Tjek venligst din LDAP-serverkonfiguration i LDAP-konfigurationsfilen. <br>Error fra LDAP-server:',
         'password_ldap' => 'Adgangskoden til denne konto administreres af LDAP / Active Directory. Kontakt din it-afdeling for at ændre dit kodeord.',
+        'multi_company_items_assigned' => 'This user has items assigned that belong to a different company. Please check them in or edit their company.'
     ),
 
     'deletefile' => array(
diff --git a/resources/lang/da-DK/admin/users/table.php b/resources/lang/da-DK/admin/users/table.php
index 99172023e3..9ed28ed42c 100644
--- a/resources/lang/da-DK/admin/users/table.php
+++ b/resources/lang/da-DK/admin/users/table.php
@@ -22,7 +22,7 @@ return array(
     'managed_locations'     => 'Administrerede placeringer',
     'managed_users'         => 'Administrerede Brugere',
     'name' 					=> 'Navn',
-    'nogroup'               => 'Ingen grupper er blevet oprettet endnu. For at tilføje en, besøg: ',
+    'nogroup'               => 'Ingen grupper er blevet oprettet endnu. For at tilføje en, besøg:',
     'notes'                 => 'Noter',
     'password_confirm' 		=> 'Bekræft adgangskode',
     'password' 				=> 'Adgangskode',
diff --git a/resources/lang/da-DK/auth.php b/resources/lang/da-DK/auth.php
index 6569980d21..6519eed985 100644
--- a/resources/lang/da-DK/auth.php
+++ b/resources/lang/da-DK/auth.php
@@ -15,6 +15,6 @@ return array(
 
     'failed' => 'Disse oplysninger passer ikke med de gemte.',
     'password' => 'Adgangskoden er forkert.',
-    'throttle' => 'For mange loginforsøg. Prøv igen om :seconds sekunder.',
+    'throttle' => 'Too many login attempts. Please try again in :minutes minute(s).',
 
 );
diff --git a/resources/lang/da-DK/auth/message.php b/resources/lang/da-DK/auth/message.php
index ebc4ae7ba3..08ecacab6e 100644
--- a/resources/lang/da-DK/auth/message.php
+++ b/resources/lang/da-DK/auth/message.php
@@ -6,8 +6,6 @@ return array(
     'account_not_found'      => 'Brugernavn eller kodeord er forkert.',
     'account_not_activated'  => 'Denne brugerkonto er ikke aktiveret.',
     'account_suspended'      => 'Denne brugerkonto er suspenderet.',
-    'account_banned'         => 'Denne brugerkonto er blokeret.',
-    'throttle'               => 'For mange mislykkede loginforsøg. Prøv igen om : minutter minutter.',
 
     'two_factor' => array(
         'already_enrolled'      => 'Din enhed er allerede tilmeldt.',
diff --git a/resources/lang/da-DK/button.php b/resources/lang/da-DK/button.php
index 92dc920c36..8a36105ce5 100644
--- a/resources/lang/da-DK/button.php
+++ b/resources/lang/da-DK/button.php
@@ -7,6 +7,7 @@ return [
     'checkin_and_delete'  	    => 'Tjek alt ind og slet bruger',
     'delete'  	                => 'Slet',
     'edit'    	                => 'Rediger',
+    'clone'    	                => 'Clone',
     'restore' 	                => 'Gendan',
     'remove'                    => 'Fjern',
     'request'                   => 'Anmodning',
@@ -21,4 +22,13 @@ return [
     'add_maintenance'           => 'Tilføj vedligehold',
     'append'                    => 'Tilføj',
     'new'                       => 'Ny',
+    'var' => [
+        'clone'     => 'Clone :item_type',
+        'edit'      => 'Edit :item_type',
+        'delete'    => 'Delete :item_type',
+        'restore'   => 'Restore :item_type',
+        'create'    => 'Create New :item_type',
+        'checkout'  => 'Checkout :item_type',
+        'checkin'   => 'Checkin :item_type',
+    ]
 ];
diff --git a/resources/lang/da-DK/general.php b/resources/lang/da-DK/general.php
index 4d65bc58ed..9a55f892df 100644
--- a/resources/lang/da-DK/general.php
+++ b/resources/lang/da-DK/general.php
@@ -10,7 +10,7 @@ return [
     'action'                => 'Handling',
     'activity_report'		=> 'Aktivitetsrapport',
     'address'				=> 'Addresse',
-    'admin'					=> 'Admin',
+    'admin'					=> 'Admin Indstillinger',
     'admin_tooltip'			=> 'This user has admin privileges',
     'superuser'				=> 'Superuser',
     'superuser_tooltip'		=> 'This user has superuser privileges',
@@ -23,13 +23,16 @@ return [
     'asset_models'			=> 'Aktiv Modeller',
     'asset_model'			=> 'Model',
     'asset'					=> 'Aktiv',
+    'asset_previous'        => 'Asset (Previously Assigned)',
     'asset_report'          => 'Aktiv Rapport',
     'asset_tag'				=> 'Aktiv Mærkat',
     'asset_tags'            => 'Aktivetiketter',
     'assets_available'		=> 'Tilgængelige aktiver',
     'accept_assets'         => 'Accepter aktiver :name',
     'accept_assets_menu'    => 'Accepter aktiver',
+    'accept_item'           => 'Accept Item',
     'audit'				    => 'Revidere',
+    'audits'				=> 'Audits',
     'audit_report'			=> 'Revisionslog',
     'assets'				=> 'Aktiver',
     'assets_audited'        => 'aktiver revideret',
@@ -61,9 +64,12 @@ return [
     'changepassword'  		=> 'Skift adgangskode',
     'checkin'  				=> 'Tjek Ind',
     'checkin_from'  		=> 'Tjek ind fra',
+    'checkin_note'  		=> 'Checkin Note',
+    'checkout_note'  		=> 'Checkout Note',
     'checkout'  			=> 'Tjek Ud',
     'checkouts_count'       => 'Checkouts',
     'checkins_count'        => 'Checkins',
+    'checkin_and_delete'  	=> 'Checkin and Delete',
     'user_requests_count'   => 'Forespørgsler',
     'city'  				=> 'By',
     'click_here'			=> 'Klik her',
@@ -77,7 +83,7 @@ return [
     'consumables'			=> 'Forbrugsstoffer',
     'country'  				=> 'Land',
     'could_not_restore'     => 'Fejl under gendannelse af :item_type: :error',
-    'not_deleted'           => 'The :item_type is not deleted so it cannot be restored',
+    'not_deleted'           => 'The :item_type was not deleted and therefore cannot be restored',
     'create'				=> 'Opret ny',
     'created'               => 'Elementet er oprettet',
     'created_asset'			=> 'skabte aktiver',
@@ -86,11 +92,13 @@ return [
     'record_created' 		=> 'Record dannet',
     'updated_at' 			=> 'Opdateret kl',
     'currency'  			=> '$', // this is deprecated
+    'currency_text'  		=> 'Valuta', //
     'current'  				=> 'Aktuelle',
     'current_password'      => 'Nuværende adgangskode',
     'customize_report'      => 'Tilpas rapport',
     'custom_report'         => 'Tilpasset Aktiv Rapport',
     'dashboard'				=> 'Oversigtspanel',
+    'data_source'           => 'Data Source',
     'days'      			=> 'dage',
     'days_to_next_audit'    => 'Dage til næste revision',
     'date'					=> 'Dato',
@@ -98,7 +106,7 @@ return [
     'debug_warning_text'    => 'Denne applikation kører i produktionstilstand med debugging aktiveret. Dette kan udsætte følsomme data, hvis din ansøgning er tilgængelig for omverdenen. Deaktiver fejlsøgningsmodus ved at indstille værdien <code>APP_DEBUG</code> i din <code>.env</code> fil til <code>false</code>.',
     'delete'  				=> 'Slet',
     'delete_confirm'  		=> 'Er du sikker på at du vil slette :item?',
-    'delete_confirm_no_undo' => 'Er du sikker på du vil slette :item? Dette kan ikke fortrydes.',
+    'delete_confirm_no_undo' => 'Are you sure, you wish to delete :item? This cannot be undone.',
     'deleted'  				=> 'Slettet',
     'delete_seats'  		=> 'Slettede pladser',
     'deletion_failed'       => 'Sletning mislykkedes',
@@ -114,29 +122,13 @@ return [
     'editprofile'  			=> 'Ret Din Profil',
     'eol'					=> 'EOL',
     'email_domain'			=> 'Email domæne',
-    'email_format'			=> 'Email formattering',
     'employee_number'       => 'Medarbejdernummer',
     'email_domain_help'		=> 'Dette bruges til at generere email-adresser ved importering',
     'error'				    => 'Fejl',
     'exclude_archived'      => 'Udeluk arkiverede aktiver',
     'exclude_deleted'       => 'Udeluk slettede aktiver',
     'example'				=> 'Eksempel: ',
-    'filastname_format'			=> 'Fornavnskarakter Efternavn (jsmith@example.com)',
-    'firstname_lastname_format'	=> 'Fornavn Efternavn (jane.smith@example.com)',
-    'firstname_lastname_underscore_format' => 'Fornavn Efternavn (jane_smith@example.com)',
-    'lastnamefirstinitial_format' =>  'Efternavn Første initial (smithj@example.com)',
-    'firstintial_dot_lastname_format' => 'Første bogstav i fornavn efternavn (jsmith@example.com)',
-    'firstname_lastname_display'	=> 'Fornavn Efternavn (Jane Smith)',
-    'lastname_firstname_display'	=> 'Efternavn Fornavn (Smith Jane)',
-    'name_display_format'	=> 'Navn Visningsformat',
-    'first'					=> 'Første',
-    'firstnamelastname'     => 'Fornavn efternavn (janesmith@example.com)',
-    'lastname_firstinitial' => 'Efternavn første bogstav i fornavn (smith_j@example.com)',
-    'firstinitial.lastname' => 'Første bogstav i fornavn.efternavn (j.smith@example.com)',
-    'firstnamelastinitial'  => 'Fornavn førstebogstav i efternavn (janes@example.com)',
-    'lastnamefirstname'      => 'Last Name First Name (smith.jane@example.com)',
-    'first_name'			=> 'Fornavn',
-    'first_name_format'		=> 'Fornavn (jane@example.com)',
+
     'files'                 => 'Filer',
     'file_name'				=> 'Fil',
     'file_type'             => 'Filtype',
@@ -156,9 +148,9 @@ return [
     'image_delete'         	=> 'Slet billede',
     'include_deleted'       => 'Inkludér slettede aktiver',
     'image_upload'         	=> 'Upload billede',
-    'filetypes_accepted_help'    => 'Accepteret filtype er :types. Filstørrelsen må højst være :size.|Accepterede filtyper er :types. Filstørrelsen må højst være :size.',
-    'filetypes_size_help'   => 'Filstørrelsen må højst være :size.',
-    'image_filetypes_help'  => 'Accepted filetypes are jpg, webp, png, gif, svg, and avif. Max upload size allowed is :size.',
+    'filetypes_accepted_help'    => 'Accepted filetype is :types. The maximum size allowed is :size.|Accepted filetypes are :types. The maximum upload size allowed is :size.',
+    'filetypes_size_help'   => 'The maximum upload size allowed is :size.',
+    'image_filetypes_help'  => 'Accepted Filetypes are jpg, webp, png, gif, svg, and avif. The maximum upload size allowed is :size.',
     'unaccepted_image_type'  => 'Denne billedfil var ikke læsbar. Accepterede filtyper er jpg, webp, png, gif og svg. Mimetypen for denne fil er: :mimetype.',
     'import'         	    => 'Importér',
     'import_this_file'      => 'Kortfelter og behandl denne fil',
@@ -178,12 +170,17 @@ return [
     'last'					=> 'Sidste',
     'last_login'            => 'Sidste login',
     'last_name'             => 'Efternavn',
+    'firstname_lastname_display'	=> 'Fornavn Efternavn (Jane Smith)',
+    'lastname_firstname_display'	=> 'Efternavn Fornavn (Smith Jane)',
+    'name_display_format'	=> 'Navn Visningsformat',
+    'first'					=> 'Første',
+    'first_name'			=> 'Fornavn',
     'license'				=> 'Licens',
     'license_report'        => 'Licensrapport',
     'licenses_available'	=> 'Tilgængelige licenser',
     'licenses'				=> 'Licenser',
     'list_all'				=> 'Vis alle',
-    'loading'				=> 'Indlæser... Vent venligst...',
+    'loading'				=> 'Loading... please wait...',
     'lock_passwords'        => 'Feltværdien vil ikke blive gemt i en demoinstallation.',
     'feature_disabled'      => 'Denne funktion er blevet deaktiveret til demoinstallationen.',
     'location'              => 'Lokation',
@@ -193,7 +190,7 @@ return [
     'logout'				=> 'Log ud',
     'lookup_by_tag'     => 'Søg på aktivkode',
     'maintenances'          => 'Vedligeholdelse',
-    'manage_api_keys'       => 'Administrer API-nøgler',
+    'manage_api_keys'       => 'Manage API keys',
     'manufacturer'			=> 'Producent',
     'manufacturers'			=> 'Producenter',
     'markdown'				=> 'Dette felt tillader <a href="https://help.github.com/articles/github-flavored-markdown/">Github koder</a>.',
@@ -215,6 +212,14 @@ return [
     'no_results'			=> 'Ingen Resultater.',
     'no'  					=> 'Nej',
     'notes'  				=> 'Noter',
+    'note_added'            => 'Note Added',
+    'options'				=> 'Options',
+    'preview'				=> 'Preview',
+    'add_note'              => 'Add Note',
+    'note_edited'            => 'Note Edited',
+    'edit_note'              => 'Edit Note',
+    'note_deleted'            => 'Note Deleted',
+    'delete_note'              => 'Delete Note',
     'order_number'          => 'Ordrenummer',
     'only_deleted'          => 'Kun slettede aktiver',
     'page_menu'				=> 'Viser _MENU_ emner',
@@ -229,7 +234,7 @@ return [
     'purchase_date'         => 'Købsdato',
     'qty'		            => 'STK',
     'quantity'		        => 'Antal',
-    'quantity_minimum'      => 'Du har :count emner under eller næsten under minimumsbeholdning',
+    'quantity_minimum'      => 'You have one item below or almost below minimum quantity levels|You have :count items below or almost below minimum quantity levels',
     'quickscan_checkin'  	=> 'Hurtig tjek ind ved skanning',
     'quickscan_checkin_status'  	=> 'Status for tjek ind',
     'ready_to_deploy'		=> 'Klar til Implementering',
@@ -254,7 +259,7 @@ return [
     'select_all'            => 'Vælg alle',
     'search'				=> 'Søg',
     'select_category'       => 'Vælg en kategori',
-    'select_datasource' => 'Vælg en datasource',
+    'select_datasource' => 'Select a data source',
     'select_department'     => 'Vælg en afdeling',
     'select_depreciation'	=> 'Vælg en afskrivningstype',
     'select_location'		=> 'Vælg en placering',
@@ -274,13 +279,15 @@ return [
     'signed_off_by'         => 'Godkendt af',
     'skin'       			=> 'Skin',
     'webhook_msg_note'        => 'En notifikation vil blive sendt via webhook',
-    'webhook_test_msg'        => 'Åh hai! Det ser ud til, at din :app-integration med Snipe-IT fungerer!',
+    'webhook_test_msg'        => 'Oh hai! It looks like your :app integration with Snipe-IT is working!',
     'some_features_disabled' => 'DEMO MODE: Nogle funktioner er deaktiveret for denne installation.',
     'site_name'				=> 'Site Navn',
     'state'  				=> 'Stat',
     'status_labels'			=> 'Status labels',
+    'status_label'			=> 'Status Label',
     'status'    			=> 'Status',
     'accept_eula'           => 'Licensaftale',
+    'show_or_hide_eulas' => 'Show/Hide EULAs',
     'supplier'              => 'Leverandør',
     'suppliers'  			=> 'Leverandører',
     'sure_to_delete'        => 'Er du sikker på, at du vil slette',
@@ -296,9 +303,9 @@ return [
     'type'  				=> 'Type',
     'undeployable'			=> 'Ikke implementerbar',
     'unknown_admin'			=> 'Ukendt Admin',
-    'username_format'		=> 'Brugernavn Format',
     'username'              => 'Brugernavn',
     'update'                => 'Opdatering',
+    'updating_item' => 'Updating :item',
     'upload_filetypes_help'      => 'Tilladte filtyper er png, gif, jpg, jpeg, doc, docx, pdf, xls, txt, lic, zip, og rar. Maksimalt tilladte uploadstørrelse er :size.',
     'uploaded'              => 'uploaded',
     'user'					=> 'Bruger',
@@ -323,10 +330,10 @@ return [
     'token_expired'         => 'Din form session er udløbet. Prøv igen.',
     'login_enabled'         => 'Login aktiveret',
     'audit_due'             => 'Forfalder til tilsyn',
-    'audit_due_days'        => 'Aktiver som er forfaldne for revision inden :days Dagsaktiver forfaldne for revision inden :days Dage',
+    'audit_due_days'        => '{}Assets Due or Overdue for Audit|[1]Assets Due or Overdue for Audit Within a Day|[2,*]Assets Due or Overdue for Audit Within :days Days',
     'checkin_due'           => 'Forfalder til Checkin',
     'checkin_overdue'       => 'Forfaldne til tjek',
-    'checkin_due_days'      => 'Aktiver forfalden for tjek inden :days Dagsaktiver forfalden for tjek inden :days Dage',
+    'checkin_due_days'      => '{}Due for Checkin|[1]Assets Due for Checkin Within :days Day|[2,*]Assets Due for Checkin Within :days Days',
     'audit_overdue'         => 'Forfalden til tilsyn',
     'accept'                => 'Accepter :asset',
     'i_accept'              => 'Jeg accepterer',
@@ -339,16 +346,16 @@ return [
     'view_all'              => 'vis alle',
     'hide_deleted'          => 'Skjul slettede',
     'email'                 => 'Email',
-    'do_not_change'         => 'Må ikke ændres',
-    'bug_report'            => 'Rapporter en fejl',
+    'do_not_change'         => 'Do not change',
+    'bug_report'            => 'Report a bug',
     'user_manual'           => 'Brugermanual',
     'setup_step_1'          => 'Trin 1',
     'setup_step_2'          => 'Trin 2',
     'setup_step_3'          => 'Trin 3',
     'setup_step_4'          => 'Trin 4',
     'setup_config_check'    => 'Kontrollerer opsætning',
-    'setup_create_database' => 'Opret databasetabeller',
-    'setup_create_admin'    => 'Opret admin-bruger',
+    'setup_create_database' => 'Create database tables',
+    'setup_create_admin'    => 'Create an admin user',
     'setup_done'            => 'Udført!',
     'bulk_edit_about_to'    => 'Du skal til at redigere følgende: ',
     'checked_out'           => 'Tjekket ud',
@@ -383,6 +390,8 @@ return [
     'new_license'           => 'Ny licens',
     'new_accessory'         => 'Nyt tilbehør',
     'new_consumable'        => 'Ny forbrugsvare',
+    'new_component'         => 'New Component',
+    'new_user'              => 'New User',
     'collapse'              => 'Skjul',
     'assigned'              => 'Tildelt',
     'asset_count'           => 'Antal aktiver',
@@ -418,19 +427,20 @@ return [
     'bulk_soft_delete'      =>'Fjern også disse brugere. Deres asset historie vil forblive intakte medmindre/indtil du fjerner slettede poster i administratorindstillingerne.',
     'bulk_checkin_delete_success' => 'Dine valgte brugere er blevet slettet og deres emner er blevet tjekket ind.',
     'bulk_checkin_success' => 'Emnerne for de valgte brugere er blevet tjekket ind.',
-    'set_to_null'           => 'Slet værdier for dette aktiv|Slet værdier for alle :asset_count aktiver ',
+    'set_to_null'           => 'Delete values for this selection|Delete values for all :selection_count selections ',
     'set_users_field_to_null'  => 'Slet :field værdier for denne bruger, Slet :field værdier for alle :user_count brugere ',
     'na_no_purchase_date'   => 'Ikke relevant - ingen købsdato angivet',
     'assets_by_status'      => 'Aktiver efter status',
     'assets_by_status_type'      => 'Aktiver efter statustype',
     'pie_chart_type'        => 'Lagkagediagramtype for oversigten',
     'hello_name'            => 'Hej, :name!',
-    'unaccepted_profile_warning'   => 'Du har :count emner, der kræver accept. Klik her for at acceptere eller afvise dem',
+    'unaccepted_profile_warning'   => 'You have one item requiring acceptance. Click here to accept or decline it | You have :count items requiring acceptance. Click here to accept or decline them',
     'start_date'            => 'Startdato',
     'end_date'            => 'Slutdato',
     'alt_uploaded_image_thumbnail' => 'Uploadet miniature',
     'placeholder_kit'       => 'Vælg et sæt',
     'file_not_found'        => 'Filen blev ikke fundet',
+    'log_record_not_found'  => 'No record for that log entry was found.',
     'preview_not_available' => '(ingen forhåndsvisning)',
     'setup'                 => 'Opsætning',
     'pre_flight'            => 'Forhåndsopsætning',
@@ -512,7 +522,7 @@ return [
     'checked_out_to_fields' => 'Checked Out To Fields',
     'percent_complete' => '% komplet',
     'uploading' => 'Uploader... ',
-    'upload_error' => 'Fejl under upload af fil. Kontroller, at der ikke er nogen tomme rækker og at ingen kolonnenavne er duplikeret.',
+    'upload_error' => 'Error uploading file. Please check that you have no empty rows or duplicated column names in your CSV, and that the server permissions allow uploads.',
     'copy_to_clipboard' => 'Kopiér til udklipsholder',
     'copied' => 'Kopieret!',
     'status_compatibility' => 'Hvis aktiverne allerede er tildelt, kan de ikke ændres til en ikke-deployérbar statustype og denne værdiændring vil blive sprunget over.',
@@ -549,6 +559,71 @@ return [
         'license_seats'  => ':count Licenssæde:count Licenssæder',
         'consumables'  => ':count Forbrugsparti:count Forbrugsvarer',
         'components'  => ':count Komponent:count Komponenter',
-    ]
+    ],
+
+    'more_info' => 'Mere Info',
+    'quickscan_bulk_help' => 'Checking this box will edit the asset record to reflect this new location. Leaving it unchecked will simply note the location in the audit log. Note that if this asset is checked out, it will not change the location of the person, asset or location it is checked out to.',
+    'whoops' => 'Whoops!',
+    'something_went_wrong' => 'Something went wrong with your request.',
+    'close' => 'Close',
+    'expires' => 'Udløber',
+    'map_fields'=> 'Map :item_type Fields',
+    'remaining_var' => ':count Remaining',
+    'label' => 'Label',
+    'import_asset_tag_exists' => 'An asset with the asset tag :asset_tag already exists and an update was not requested. No change was made.',
+    'countries_manually_entered_help' => 'Values with an asterisk (*) were manually entered and do not match existing ISO 3166 dropdown values',
+    'accessories_assigned' => 'Assigned Accessories',
+    'user_managed_passwords' => 'Password Management',
+    'user_managed_passwords_disallow' => 'Disallow users from managing their own passwords',
+    'user_managed_passwords_allow' => 'Allow users to manage their own passwords',
+    'from' => 'From',
+    'by' => 'Af',
+
+// Add form placeholders here
+    'placeholders' => [
+        'notes'  => 'Add a note',
+    ],
+
+    'breadcrumb_button_actions' => [
+        'edit_item' => 'Edit :name',
+        'checkout_item' => 'Checkout :name',
+        'checkin_item' => 'Checkin :name',
+    ],
+
+    'skins' => [
+        'site_default' => 'Site Default',
+        'default_blue' => 'Default Blue',
+        'blue_dark' => 'Blue (Dark Mode)',
+        'green' => 'Green Dark',
+        'green_dark' => 'Green (Dark Mode)',
+        'red' => 'Red Dark',
+        'red_dark' => 'Red (Dark Mode)',
+        'orange' => 'Orange Dark',
+        'orange_dark' => 'Orange (Dark Mode)',
+        'black' => 'Black',
+        'black_dark' => 'Black (Dark Mode)',
+        'purple' => 'Purple',
+        'purple_dark' => 'Purple (Dark Mode)',
+        'yellow' => 'Yellow',
+        'yellow_dark' => 'Yellow (Dark Mode)',
+        'high_contrast' => 'High Contrast',
+
+    ],
+
+    'select_all_none' => 'Select/Unselect All',
+    'generic_model_not_found' => 'That :model was not found or you do not have permission to access it',
+    'deleted_models' => 'Deleted Asset Models',
+    'deleted_users' => 'Deleted Users',
+    'cost_each' => ':amount each',
+    'remove_current_image' => 'Remove current :type image',
+
+    'seeding' => [
+        'manufacturers' => [
+            'button' => 'Create Manufacturers',
+            'prompt' => 'You do not have any manufacturers yet. Would you like to seed a list of common manufacturers? (THIS WILL OVERWRITE EXISTING MANUFACTURERS, including those that have been soft-deleted.)',
+            'success' => 'Manufacturers seeded successfully',
+            'error' => 'Could not seed manufacturers. A manufacturer record already exists and seeding would overwrite it.|Could not seed manufacturers. :count manufacturer records already exist and seeding would overwrite them.',
+        ],
+    ],
 
 ];
diff --git a/resources/lang/da-DK/localizations.php b/resources/lang/da-DK/localizations.php
index 755faba880..503386edf1 100644
--- a/resources/lang/da-DK/localizations.php
+++ b/resources/lang/da-DK/localizations.php
@@ -2,7 +2,7 @@
 
 return [
 
-    'select_language' => 'Vælg et sprog',
+    'select_language' => 'Select a Language',
     'languages' => [
         'en-US'=> 'Engelsk (US)',
         'en-GB'=> 'Engelsk (UK)',
@@ -40,7 +40,9 @@ return [
         'ms-MY'=> 'Malaysisk',
         'mi-NZ'=> 'Maori',
         'mn-MN'=> 'Mongolsk',
-        'no-NO'=> 'Norsk',
+        'nb-NO'=> 'Norwegian Bokmål',
+        'om-ET' => 'Oromo (Ethiopian)',
+        //'nn-NO'=> 'Norwegian Nynorsk',
         'fa-IR'=> 'Persisk',
         'pl-PL'=> 'Polsk',
         'pt-PT'=> 'Portugisisk',
@@ -66,7 +68,7 @@ return [
         'zu-ZA'=> 'Zulu',
     ],
 
-    'select_country' => 'Vælg et land',
+    'select_country' => 'Select a Country',
     
     'countries' => [
         'AC'=>'Ascension Island',
@@ -133,6 +135,7 @@ return [
         'EC'=>'Ecuador',
         'EE'=>'Estland',
         'EG'=>'Egypten',
+        'GB-ENG'=>'England',
         'ER'=>'Eritrea',
         'ES'=>'Spanien',
         'ET'=>'Etiopien',
@@ -231,6 +234,7 @@ return [
         'NG'=>'Nigeria',
         'NI'=>'Nicaragua',
         'NL'=>'Holland',
+        'GB-NIR' => 'Northern Ireland',
         'NO'=>'Norge',
         'NP'=>'Nepal',
         'NR'=>'Nauru',
@@ -258,7 +262,7 @@ return [
         'RU'=>'Rusland (Den Russiske Føderation)',
         'RW'=>'Rwanda',
         'SA'=>'Saudi-Arabien',
-        'UK'=>'Skotland',
+        'GB-SCT'=>'Skotland',
         'SB'=>'Salomonøerne',
         'SC'=>'Seychellerne',
         'SS'=>'Sydsudan',
@@ -310,6 +314,7 @@ return [
         'VI'=>'Jomfruøerne (USA)',
         'VN'=>'Vietnam',
         'VU'=>'Vanuatu',
+        'GB-WLS' =>'Wales',
         'WF'=>'Wallis- og Futunaøerne',
         'WS'=>'Samoa',
         'YE'=>'Yemen',
diff --git a/resources/lang/da-DK/mail.php b/resources/lang/da-DK/mail.php
index 7fe1a3bc7a..700ecfbd52 100644
--- a/resources/lang/da-DK/mail.php
+++ b/resources/lang/da-DK/mail.php
@@ -23,24 +23,25 @@ return [
     'Item_Requested' => 'Vareanmodning',
     'License_Checkin_Notification' => 'Licens tjekket ind',
     'License_Checkout_Notification' => 'Licens tjekket ud',
+    'license_for'   => 'License for',
     'Low_Inventory_Report' => 'Lav lagerrapport',
     'a_user_canceled' => 'En bruger har annulleret en vareforespørgsel på hjemmesiden',
     'a_user_requested' => 'En bruger har anmodet om et emne på hjemmesiden',
     'acceptance_asset_accepted' => 'En bruger har accepteret et emne',
     'acceptance_asset_declined' => 'En bruger har afvist et emne',
-    'accessory_name' => 'Tilbehør Navn:',
-    'additional_notes' => 'Yderligere bemærkninger:',
+    'accessory_name' => 'Tilbehør Navn',
+    'additional_notes' => 'Yderligere bemærkninger',
     'admin_has_created' => 'En administrator har oprettet en konto til dig på webstedet:.',
-    'asset' => 'aktiv:',
-    'asset_name' => 'Aktivnavn:',
+    'asset' => 'Asset',
+    'asset_name' => 'Aktivnavn',
     'asset_requested' => 'Aktiver bedt om',
     'asset_tag' => 'Inventarnummer',
     'assets_warrantee_alert' => 'Der er :count aktiv hvor garantien udløber indenfor de næste :threshold dage.|Der er :count aktiver hvor garantien udløber indenfor de næste :threshold dage.',
     'assigned_to' => 'Tildelt',
     'best_regards' => 'Med venlig hilsen,',
-    'canceled' => 'annulleret:',
-    'checkin_date' => 'Checkin dato:',
-    'checkout_date' => 'Checkout dato:',
+    'canceled' => 'annulleret',
+    'checkin_date' => 'Tjekket Ind Dato',
+    'checkout_date' => 'Checkout dato',
     'checkedout_from' => 'Tjekket ud fra',
     'checkedin_from'  => 'Tjekket ind fra',
     'checked_into' => 'Tjekket ind',
@@ -49,27 +50,30 @@ return [
     'click_to_confirm' => 'Venligst klik på følgende link for at bekræfte din: web-konto:',
     'current_QTY' => 'Nuværende QTY',
     'days' => 'Dage',
-    'expecting_checkin_date' => 'Forventet Checkin Date:',
+    'expecting_checkin_date' => 'Forventet indtjekningsdato',
     'expires' => 'udløber',
     'hello' => 'Hej',
     'hi' => 'Hej',
     'i_have_read' => 'Jeg har læst og accepterer vilkårene for brug og har modtaget denne vare.',
     'inventory_report' => 'Lagerrapport',
-    'item' => 'Vare:',
+    'item' => 'Emne',
+    'item_checked_reminder' => 'This is a reminder that you currently have :count items checked out to you that you have not accepted or declined. Please click the link below to confirm your decision.',
     'license_expiring_alert' => 'Der er :count licens(er) der udløber indenfor den/de næste :threshold dag(e).',
     'link_to_update_password' => 'Venligst klik på følgende link for at opdatere din: webadgangskode:',
-    'login' => 'Log på:',
+    'login' => 'Login',
     'login_first_admin' => 'Log ind på din nye Snipe-IT-installation ved hjælp af nedenstående referencer:',
     'low_inventory_alert' => 'Der er :count enhed som er under minimum lagertal eller som snart vil være det.|Der er :count enheder som er under minimum lagertal eller som snart vil være det.',
     'min_QTY' => 'Min QTY',
     'name' => 'Navn',
     'new_item_checked' => 'En ny vare er blevet tjekket ud under dit navn, detaljerne er nedenfor.',
+    'new_item_checked_with_acceptance' => 'A new item has been checked out under your name that requires acceptance, details are below.',
+    'recent_item_checked' => 'An item was recently checked out under your name that requires acceptance, details are below.',
     'notes' => 'Noter',
-    'password' => 'Adgangskode:',
+    'password' => 'Adgangskode',
     'password_reset' => 'Nulstil kodeord',
     'read_the_terms' => 'Læs venligst brugsbetingelserne nedenfor.',
     'read_the_terms_and_click' => 'Læs venligst vilkårene for brug nedenfor, og klik på linket nederst for at bekræfte, at du læser og accepterer vilkårene for brug, og har modtaget aktivet.',
-    'requested' => 'Anmodede om:',
+    'requested' => 'Anmodet',
     'reset_link' => 'Din Password Reset Link',
     'reset_password' => 'Klik her for at nulstille adgangskoden:',
     'rights_reserved' => 'Alle rettigheder forbeholdt.',
@@ -86,8 +90,10 @@ return [
     'upcoming-audits' => 'Der er :count asset, som skal tilses inden :threshold dage. |Der er :count assets, som skal tilses inden :threshold dage.',
     'user' => 'Bruger',
     'username' => 'Brugernavn',
+    'unaccepted_asset_reminder' => 'Reminder: You have Unaccepted Assets.',
     'welcome' => 'Velkommen :navn',
     'welcome_to' => 'Velkommen til :web!',
     'your_assets' => 'Se dine assets',
     'your_credentials' => 'Dine Snipe-IT Legitimationsoplysninger',
+    'mail_sent' => 'Mail sent successfully!',
 ];
diff --git a/resources/lang/da-DK/validation.php b/resources/lang/da-DK/validation.php
index f1b5a5cf99..11a18cb036 100644
--- a/resources/lang/da-DK/validation.php
+++ b/resources/lang/da-DK/validation.php
@@ -13,87 +13,150 @@ return [
     |
     */
 
-    'accepted'             => ':attribute skal være accepteret.',
-    'active_url'           => ':attribute er ikke en gyldig URL.',
-    'after'                => ':attribute skal være en dato efter :date.',
-    'after_or_equal'       => 'Attributten skal være en dato efter eller lig med: dato.',
-    'alpha'                => ':attribute må kun indeholde bogstaver.',
-    'alpha_dash'           => ':attribute må kun indeholde bogstaver, tal eller bindestreger.',
-    'alpha_num'            => ':attribute må kun indeholde bogstaver eller tal.',
-    'array'                => 'Attributten skal være en matrix.',
-    'before'               => ':attribute skal være en dato før :date.',
-    'before_or_equal'      => 'Attributten skal være en dato før eller lig med: dato.',
-    'between'              => [
-        'numeric' => ':attribute skal være imellem :min - :max.',
-        'file'    => ':attribute skal være imellem :min - :max kilobytes.',
-        'string'  => ':attribute skal være imellem :min - :max tegn.',
-        'array'   => 'Attributten skal have mellem: min og: maks. Emner.',
+    'accepted' => 'The :attribute field must be accepted.',
+    'accepted_if' => 'The :attribute field must be accepted when :other is :value.',
+    'active_url' => 'The :attribute field must be a valid URL.',
+    'after' => 'The :attribute field must be a date after :date.',
+    'after_or_equal' => 'The :attribute field must be a date after or equal to :date.',
+    'alpha' => 'The :attribute field must only contain letters.',
+    'alpha_dash' => 'The :attribute field must only contain letters, numbers, dashes, and underscores.',
+    'alpha_num' => 'The :attribute field must only contain letters and numbers.',
+    'array' => 'The :attribute field must be an array.',
+    'ascii' => 'The :attribute field must only contain single-byte alphanumeric characters and symbols.',
+    'before' => 'The :attribute field must be a date before :date.',
+    'before_or_equal' => 'The :attribute field must be a date before or equal to :date.',
+    'between' => [
+        'array' => 'The :attribute field must have between :min and :max items.',
+        'file' => 'The :attribute field must be between :min and :max kilobytes.',
+        'numeric' => 'The :attribute field must be between :min and :max.',
+        'string' => 'The :attribute field must be between :min and :max characters.',
     ],
-    'boolean'              => 'Attributfeltet skal være sandt eller falsk.',
-    'confirmed'            => 'Attributbevisningen stemmer ikke overens.',
-    'date'                 => ':attribute er ikke en gyldig dato.',
-    'date_format'          => ':attribute svarer ikke til formatet :format.',
-    'different'            => ':attribute og :other skal være forskellige.',
-    'digits'               => ':attribute skal være :digits cifre.',
-    'digits_between'       => ':attribute skal være imellem :min og :max cifre.',
-    'dimensions'           => 'Attributten har ugyldige billeddimensioner.',
-    'distinct'             => 'Attributfeltet har en duplikatværdi.',
-    'email'                => ':attribute formatet er ugylidgt.',
-    'exists'               => 'Den valgte :attribute er ugyldig.',
-    'file'                 => 'Attributten skal være en fil.',
-    'filled'               => 'Attributfeltet skal have en værdi.',
-    'image'                => ':attribute skal være et billede.',
+    'boolean' => 'Attributfeltet skal være sandt eller falsk.',
+    'can' => 'The :attribute field contains an unauthorized value.',
+    'confirmed' => 'The :attribute field confirmation does not match.',
+    'contains' => 'The :attribute field is missing a required value.',
+    'current_password' => 'The password is incorrect.',
+    'date' => 'The :attribute field must be a valid date.',
+    'date_equals' => 'The :attribute field must be a date equal to :date.',
+    'date_format' => 'The :attribute field must match the format :format.',
+    'decimal' => 'The :attribute field must have :decimal decimal places.',
+    'declined' => 'The :attribute field must be declined.',
+    'declined_if' => 'The :attribute field must be declined when :other is :value.',
+    'different' => 'The :attribute field and :other must be different.',
+    'digits' => 'The :attribute field must be :digits digits.',
+    'digits_between' => 'The :attribute field must be between :min and :max digits.',
+    'dimensions' => 'The :attribute field has invalid image dimensions.',
+    'distinct' => 'Attributfeltet har en duplikatværdi.',
+    'doesnt_end_with' => 'The :attribute field must not end with one of the following: :values.',
+    'doesnt_start_with' => 'The :attribute field must not start with one of the following: :values.',
+    'email' => 'The :attribute field must be a valid email address.',
+    'ends_with' => 'The :attribute field must end with one of the following: :values.',
+    'enum' => 'Den valgte :attribute er ugyldig.',
+    'exists' => 'Den valgte :attribute er ugyldig.',
+    'extensions' => 'The :attribute field must have one of the following extensions: :values.',
+    'file' => 'The :attribute field must be a file.',
+    'filled' => 'Attributfeltet skal have en værdi.',
+    'gt' => [
+        'array' => 'The :attribute field must have more than :value items.',
+        'file' => 'The :attribute field must be greater than :value kilobytes.',
+        'numeric' => 'The :attribute field must be greater than :value.',
+        'string' => 'The :attribute field must be greater than :value characters.',
+    ],
+    'gte' => [
+        'array' => 'The :attribute field must have :value items or more.',
+        'file' => 'The :attribute field must be greater than or equal to :value kilobytes.',
+        'numeric' => 'The :attribute field must be greater than or equal to :value.',
+        'string' => 'The :attribute field must be greater than or equal to :value characters.',
+    ],
+    'hex_color' => 'The :attribute field must be a valid hexadecimal color.',
+    'image' => 'The :attribute field must be an image.',
     'import_field_empty'    => 'Værdien for :fieldname kan ikke være null.',
-    'in'                   => 'Det valgte :attribute er ugyldigt.',
-    'in_array'             => 'Attributfeltet findes ikke i: andet.',
-    'integer'              => ':attribute skal være et heltal.',
-    'ip'                   => ':attribute skal være en gyldig IP adresse.',
-    'ipv4'                 => 'Attributten skal være en gyldig IPv4-adresse.',
-    'ipv6'                 => 'Attributten skal være en gyldig IPv6-adresse.',
-    'is_unique_department' => ':attribute skal være unik for denne virksomhedsplacering',
-    'json'                 => 'Attributten skal være en gyldig JSON-streng.',
-    'max'                  => [
-        'numeric' => ':attribute må ikke overstige :max.',
-        'file'    => ':attribute må ikke overstige :max. kilobytes.',
-        'string'  => ':attribute må ikke overstige :max. tegn.',
-        'array'   => 'Attributten må ikke have mere end: maks. Emner.',
+    'in' => 'Det valgte :attribute er ugyldigt.',
+    'in_array' => 'The :attribute field must exist in :other.',
+    'integer' => 'The :attribute field must be an integer.',
+    'ip' => 'The :attribute field must be a valid IP address.',
+    'ipv4' => 'The :attribute field must be a valid IPv4 address.',
+    'ipv6' => 'The :attribute field must be a valid IPv6 address.',
+    'json' => 'The :attribute field must be a valid JSON string.',
+    'list' => 'The :attribute field must be a list.',
+    'lowercase' => 'The :attribute field must be lowercase.',
+    'lt' => [
+        'array' => 'The :attribute field must have less than :value items.',
+        'file' => 'The :attribute field must be less than :value kilobytes.',
+        'numeric' => 'The :attribute field must be less than :value.',
+        'string' => 'The :attribute field must be less than :value characters.',
     ],
-    'mimes'                => ':attribute skal være en fil af typen: :values.',
-    'mimetypes'            => 'Attributten skal være en fil af typen:: værdier.',
-    'min'                  => [
-        'numeric' => ':attribute skal mindst være :min.',
-        'file'    => ':attribute skal mindst være :min kilobytes.',
-        'string'  => ':attribute skal mindst være :min tegn.',
-        'array'   => 'Attributten skal have mindst: min elementer.',
+    'lte' => [
+        'array' => 'The :attribute field must not have more than :value items.',
+        'file' => 'The :attribute field must be less than or equal to :value kilobytes.',
+        'numeric' => 'The :attribute field must be less than or equal to :value.',
+        'string' => 'The :attribute field must be less than or equal to :value characters.',
     ],
-    'starts_with'          => ':attribute skal starte med en af følgende: :values',
-    'ends_with'            => 'Attributten skal slutte med en af følgende: :values.',
+    'mac_address' => 'The :attribute field must be a valid MAC address.',
+    'max' => [
+        'array' => 'The :attribute field must not have more than :max items.',
+        'file' => 'The :attribute field must not be greater than :max kilobytes.',
+        'numeric' => 'The :attribute field must not be greater than :max.',
+        'string' => 'The :attribute field must not be greater than :max characters.',
+    ],
+    'max_digits' => 'The :attribute field must not have more than :max digits.',
+    'mimes' => 'The :attribute field must be a file of type: :values.',
+    'mimetypes' => 'The :attribute field must be a file of type: :values.',
+    'min' => [
+        'array' => 'The :attribute field must have at least :min items.',
+        'file' => 'The :attribute field must be at least :min kilobytes.',
+        'numeric' => 'The :attribute field must be at least :min.',
+        'string' => 'The :attribute field must be at least :min characters.',
+    ],
+    'min_digits' => 'The :attribute field must have at least :min digits.',
+    'missing' => 'The :attribute field must be missing.',
+    'missing_if' => 'The :attribute field must be missing when :other is :value.',
+    'missing_unless' => 'The :attribute field must be missing unless :other is :value.',
+    'missing_with' => 'The :attribute field must be missing when :values is present.',
+    'missing_with_all' => 'The :attribute field must be missing when :values are present.',
+    'multiple_of' => 'The :attribute field must be a multiple of :value.',
+    'not_in' => 'Den valgte :attribute er ugyldig.',
+    'not_regex' => 'The :attribute field format is invalid.',
+    'numeric' => 'The :attribute field must be a number.',
+    'password' => [
+        'letters' => 'The :attribute field must contain at least one letter.',
+        'mixed' => 'The :attribute field must contain at least one uppercase and one lowercase letter.',
+        'numbers' => 'The :attribute field must contain at least one number.',
+        'symbols' => 'The :attribute field must contain at least one symbol.',
+        'uncompromised' => 'The given :attribute has appeared in a data leak. Please choose a different :attribute.',
+    ],
+    'percent'       => 'The depreciation minimum must be between 0 and 100 when depreciation type is percentage.',
 
-    'not_in'               => 'Den valgte :attribute er ugyldig.',
-    'numeric'              => ':attribute skal være et tal.',
-    'present'              => 'Attributfeltet skal være til stede.',
-    'valid_regex'          => 'Det er ikke et validt regex. ',
-    'regex'                => ':attribute formatet er ugyldigt.',
-    'required'             => ':attribute feltet er krævet.',
-    'required_if'          => ':attribute feltet er krævet når :other er :value.',
-    'required_unless'      => 'Attributfeltet er påkrævet, medmindre: andet er i: værdier.',
-    'required_with'        => ':attribute er krævet når :values forekommer.',
-    'required_with_all'    => 'Attributfeltet er påkrævet, når: værdier er til stede.',
-    'required_without'     => ':attribute er krævet når :values ikke forekommer.',
+    'present' => 'Attributfeltet skal være til stede.',
+    'present_if' => 'The :attribute field must be present when :other is :value.',
+    'present_unless' => 'The :attribute field must be present unless :other is :value.',
+    'present_with' => 'The :attribute field must be present when :values is present.',
+    'present_with_all' => 'The :attribute field must be present when :values are present.',
+    'prohibited' => 'The :attribute field is prohibited.',
+    'prohibited_if' => 'The :attribute field is prohibited when :other is :value.',
+    'prohibited_unless' => 'The :attribute field is prohibited unless :other is in :values.',
+    'prohibits' => 'The :attribute field prohibits :other from being present.',
+    'regex' => 'The :attribute field format is invalid.',
+    'required' => ':attribute feltet er krævet.',
+    'required_array_keys' => 'The :attribute field must contain entries for: :values.',
+    'required_if' => ':attribute feltet er krævet når :other er :value.',
+    'required_if_accepted' => 'The :attribute field is required when :other is accepted.',
+    'required_if_declined' => 'The :attribute field is required when :other is declined.',
+    'required_unless' => 'Attributfeltet er påkrævet, medmindre: andet er i: værdier.',
+    'required_with' => ':attribute er krævet når :values forekommer.',
+    'required_with_all' => 'The :attribute field is required when :values are present.',
+    'required_without' => ':attribute er krævet når :values ikke forekommer.',
     'required_without_all' => 'Attributfeltet er påkrævet, når ingen af: værdier er til stede.',
-    'same'                 => ':attribute og :other skal være ens.',
-    'size'                 => [
-        'numeric' => ':attribute skal være :size.',
-        'file'    => ':attribute skal være :size kilobytes.',
-        'string'  => ':attribute skal være :size tegn.',
-        'array'   => 'Attributten skal indeholde: størrelseselementer.',
+    'same' => 'The :attribute field must match :other.',
+    'size' => [
+        'array' => 'The :attribute field must contain :size items.',
+        'file' => 'The :attribute field must be :size kilobytes.',
+        'numeric' => 'The :attribute field must be :size.',
+        'string' => 'The :attribute field must be :size characters.',
     ],
+    'starts_with' => 'The :attribute field must start with one of the following: :values.',
     'string'               => 'Attributten skal være en streng.',
-    'timezone'             => 'Attributten skal være en gyldig zone.',
     'two_column_unique_undeleted' => 'Attributten skal være unik på tværs af :table1 og: table2. ',
-    'unique'               => ':attribute er allerede taget.',
-    'uploaded'             => 'Attributtet kunne ikke uploades.',
-    'url'                  => ':attribute formatet er ugyldigt.',
     'unique_undeleted'     => ':attribute skal være unik.',
     'non_circular'         => ':attribute må ikke oprette en cirkulær reference.',
     'not_array'            => ':attribute kan ikke være et array.',
@@ -102,11 +165,14 @@ return [
     'numbers'              => 'Adgangskoden skal indeholde mindst ét tal.',
     'case_diff'            => 'Adgangskoden skal bruge både store og små bogstaver.',
     'symbols'              => 'Adgangskoden skal indeholde specialtegn.',
-    'gte'                  => [
-        'numeric'          => 'Værdien må ikke være negativ'
-    ],
-    'checkboxes'           => ':attribute indeholder ugyldige indstillinger.',
-    'radio_buttons'        => ':attribute er ugyldig.',
+    'timezone' => 'The :attribute field must be a valid timezone.',
+    'unique' => ':attribute er allerede taget.',
+    'uploaded' => 'Attributtet kunne ikke uploades.',
+    'uppercase' => 'The :attribute field must be uppercase.',
+    'url' => 'The :attribute field must be a valid URL.',
+    'ulid' => 'The :attribute field must be a valid ULID.',
+    'uuid' => 'The :attribute field must be a valid UUID.',
+    'fmcs_location' => 'Full multiple company support and location scoping is enabled in the Admin Settings, and the selected location and selected company are not compatible.',
 
 
     /*
@@ -120,16 +186,22 @@ return [
     |
     */
 
+    'email_array'      => 'En eller flere email-adresser er ugyldige.',
+    'checkboxes'           => ':attribute indeholder ugyldige indstillinger.',
+    'radio_buttons'        => ':attribute er ugyldig.',
+    
     'custom' => [
         'alpha_space' => 'Attributfeltet indeholder et tegn, der ikke er tilladt.',
-        'email_array'      => 'En eller flere e-mailadresser er ugyldige.',
+
         'hashed_pass'      => 'Din nuværende adgangskode er forkert',
         'dumbpwd'          => 'Denne adgangskode er for almindelig.',
         'statuslabel_type' => 'Du skal vælge en gyldig statusetiketype',
+        'custom_field_not_found'          => 'This field does not seem to exist, please double check your custom field names.',
+        'custom_field_not_found_on_model' => 'This field seems to exist, but is not available on this Asset Model\'s fieldset.',
 
         // date_format validation with slightly less stupid messages. It duplicates a lot, but it gets the job done :(
-        // We use this because the default error message for date_format is reflects php Y-m-d, which non-PHP
-        // people won't know how to format. 
+        // We use this because the default error message for date_format reflects php Y-m-d, which non-PHP
+        // people won't know how to format.
         'purchase_date.date_format'     => ':attribute skal være en gyldig dato i YYYY-MM-DD format',
         'last_audit_date.date_format'   =>  ':attribute skal være en gyldig dato i YYYY-MM-DD hh:mm:ss format',
         'expiration_date.date_format'   =>  ':attribute skal være en gyldig dato i YYYY-MM-DD format',
@@ -137,9 +209,15 @@ return [
         'expected_checkin.date_format'  =>  ':attribute skal være en gyldig dato i YYYY-MM-DD format',
         'start_date.date_format'        =>  ':attribute skal være en gyldig dato i YYYY-MM-DD format',
         'end_date.date_format'          =>  ':attribute skal være en gyldig dato i YYYY-MM-DD format',
+        'invalid_value_in_field' => 'Ugyldig værdi inkluderet i dette felt',
 
-    ],
+        'ldap_username_field' => [
+            'not_in' =>         '<code>sAMAccountName</code> (mixed case) will likely not work. You should use <code>samaccountname</code> (lowercase) instead.'
+        ],
+        'ldap_auth_filter_query' => ['not_in' => '<code>uid=samaccountname</code> is probably not a valid auth filter. You probably want <code>uid=</code> '],
+        'ldap_filter' => ['regex' => 'This value should probably not be wrapped in parentheses.'],
 
+        ],
     /*
     |--------------------------------------------------------------------------
     | Custom Validation Attributes
@@ -155,8 +233,16 @@ return [
 
     /*
     |--------------------------------------------------------------------------
-    | Generic Validation Messages
+    | Generic Validation Messages - we use these in the jquery validation where we don't have
+    | access to the :attribute
     |--------------------------------------------------------------------------
     */
-    'invalid_value_in_field' => 'Ugyldig værdi inkluderet i dette felt',
+
+    'generic' => [
+        'invalid_value_in_field' => 'Ugyldig værdi inkluderet i dette felt',
+        'required' => 'This field is required',
+        'email' => 'Please enter a valid email address',
+    ],
+
+
 ];
diff --git a/resources/lang/de-DE/account/general.php b/resources/lang/de-DE/account/general.php
index d533326d18..a57690d629 100644
--- a/resources/lang/de-DE/account/general.php
+++ b/resources/lang/de-DE/account/general.php
@@ -2,10 +2,16 @@
 
 return array(
     'personal_api_keys' => 'Persönliche API-Schlüssel',
-    'api_key_warning' => 'When generating an API token, be sure to copy it down immediately as they will not be visible to you again.',
+    'personal_access_token' => 'Persönlicher Zugangs-Token',
+    'personal_api_keys_success' => 'Persönlicher API-Schlüssel :key erfolgreich erstellt',
+    'here_is_api_key' => 'Hier ist Ihr neuer persönlicher Zugangs-Token. Dieser wird nur ein einziges Mal angezeigt, verlieren Sie ihn nicht! Sie können nun diesen Token verwenden, um API-Anfragen zu erstellen.',
+    'api_key_warning' => 'Wenn Sie ein API-Token generieren, stellen Sie sicher, dass Sie diesen sofort kopieren, da er danach nicht mehr für Sie sichtbar sein wird.',
     'api_base_url' => 'Ihre API Basis-URL befindet sich unter:',
     'api_base_url_endpoint' => '/&lt;Endpunkt&gt;',
     'api_token_expiration_time' => 'API-Token sollen ablaufen in:',
-    'api_reference' => 'Please check the <a href="https://snipe-it.readme.io/reference" target="_blank">API reference</a> to find specific API endpoints and additional API documentation.',
+    'api_reference' => 'Bitte lesen Sie die <a href="https://snipe-it.readme.io/reference" target="_blank">API Dokumentation</a> um Informationen über die verfügbaren API-Endpunkte zu erhalten.',
     'profile_updated' => 'Konto erfolgreich aktualisiert',
+    'no_tokens' => 'Sie haben noch keinen persönlichen Zugangs-Token erstellt.',
+    'enable_sounds' => 'Soundeffekte aktivieren',
+    'enable_confetti' => 'Konfetti-Effekte aktivieren',
 );
diff --git a/resources/lang/de-DE/admin/accessories/message.php b/resources/lang/de-DE/admin/accessories/message.php
index a78440ddde..72c00074ec 100644
--- a/resources/lang/de-DE/admin/accessories/message.php
+++ b/resources/lang/de-DE/admin/accessories/message.php
@@ -26,7 +26,11 @@ return array(
         'error'   		=> 'Zubehör konnte nicht herausgegeben werden. Bitte versuchen Sie es erneut',
         'success' 		=> 'Zubehör erfolgreich herausgegeben.',
         'unavailable'   => 'Zubehör ist nicht verfügbar, um herausgegeben zu werden. Prüfen Sie die verfügbare Menge',
-        'user_does_not_exist' => 'Dieser Benutzer existiert nicht. Bitte versuchen Sie es erneut.'
+        'user_does_not_exist' => 'Dieser Benutzer existiert nicht. Bitte versuchen Sie es erneut.',
+         'checkout_qty' => array(
+            'lte'  => 'Derzeit ist nur ein Zubehör dieses Typs verfügbar, und Sie versuchen :checkout_qty herauszugeben. Bitte passen Sie die Herausgabe-Menge oder den Gesamtbestand des Zubehörs an, und versuchen Sie es erneut. Es gibt :number_currently_remaining insgesamt verfügbare Zubehör, und Sie versuchen, :checkout_qty herauszugeben. Bitte passen Sie die Herausgabe-Menge oder den Gesamtbestand des Zubehörs an und versuchen Sie es erneut.',
+            ),
+           
     ),
 
     'checkin' => array(
diff --git a/resources/lang/de-DE/admin/accessories/table.php b/resources/lang/de-DE/admin/accessories/table.php
index af01edf6b1..af3de34e4e 100644
--- a/resources/lang/de-DE/admin/accessories/table.php
+++ b/resources/lang/de-DE/admin/accessories/table.php
@@ -6,6 +6,4 @@ return array(
     'id'      					=> 'ID',
     'require_acceptance'      	=> 'Zustimmung',
     'title'      				=> 'Zubehör Name',
-
-
 );
diff --git a/resources/lang/de-DE/admin/components/message.php b/resources/lang/de-DE/admin/components/message.php
index e7c93558e8..305b525950 100644
--- a/resources/lang/de-DE/admin/components/message.php
+++ b/resources/lang/de-DE/admin/components/message.php
@@ -17,7 +17,8 @@ return array(
     'delete' => array(
         'confirm'   => 'Sind Sie sich sicher das sie diese Komponente löschen wollen?',
         'error'   => 'Beim Löschen der Komponente ist ein Fehler aufgetreten. Bitte probieren Sie es noch einmal.',
-        'success' => 'Die Komponente wurde erfolgreich gelöscht.'
+        'success' => 'Die Komponente wurde erfolgreich gelöscht.',
+        'error_qty'   => 'Einige Komponenten dieses Typs sind noch herausgegeben. Bitte nehmen Sie sie zurück und versuchen Sie es erneut.',
     ),
 
      'checkout' => array(
diff --git a/resources/lang/de-DE/admin/consumables/general.php b/resources/lang/de-DE/admin/consumables/general.php
index 5e13c1c97c..8e40b422f7 100644
--- a/resources/lang/de-DE/admin/consumables/general.php
+++ b/resources/lang/de-DE/admin/consumables/general.php
@@ -8,4 +8,5 @@ return array(
     'remaining' 			            => 'Verbleibend',
     'total' 			                => 'Gesamt',
     'update'                            => 'Verbrauchsmaterial bearbeiten',
+    'inventory_warning'                 => 'Der Bestand dieses Verbrauchsmaterials liegt unter der Mindestmenge von :min_count',
 );
diff --git a/resources/lang/de-DE/admin/consumables/message.php b/resources/lang/de-DE/admin/consumables/message.php
index 2e3dc7540e..5ea1bc6a74 100644
--- a/resources/lang/de-DE/admin/consumables/message.php
+++ b/resources/lang/de-DE/admin/consumables/message.php
@@ -2,6 +2,7 @@
 
 return array(
 
+    'invalid_category_type' => 'Diese Kategorie muss eine Kategorie vom Typ Verbrauchsmaterialien sein.',
     'does_not_exist' => 'Verbrauchsmaterial existiert nicht.',
 
     'create' => array(
diff --git a/resources/lang/de-DE/admin/custom_fields/general.php b/resources/lang/de-DE/admin/custom_fields/general.php
index a2937a1160..4f2869b436 100644
--- a/resources/lang/de-DE/admin/custom_fields/general.php
+++ b/resources/lang/de-DE/admin/custom_fields/general.php
@@ -5,7 +5,7 @@ return [
     'manage'                    => 'Verwalten',
     'field'		                => 'Feld',
     'about_fieldsets_title'		=> 'Über Feldsätze',
-    'about_fieldsets_text'		=> 'Ein Feldsatz ist eine Gruppe von benutzerdefinierten Feldern, die häufig für bestimmte Asset-Modelltypen wiederverwendet werden.',
+    'about_fieldsets_text'		=> 'Feldsätze sind Gruppen von benutzerdefinierten Feldern, die häufig für bestimmte Asset-Modelltypen wiederverwendet werden.',
     'custom_format'             => 'Benutzerdefiniertes Regex-Format...',
     'encrypt_field'      	        => 'Den Wert dieses Feldes in der Datenbank verschlüsseln',
     'encrypt_field_help'      => 'WARNUNG: Ein verschlüsseltes Feld kann nicht durchsucht werden.',
@@ -35,7 +35,7 @@ return [
     'create_field_title' => 'Neues benutzerdefiniertes Feld erstellen',
     'value_encrypted'      	        => 'Der Wert dieses Feldes ist in der Datenbank verschlüsselt. Nur Benutzer mit Administratorrechten können den entschlüsselten Wert anzeigen',
     'show_in_email'     => 'Feld miteinbeziehen bei Herausgabe-Emails an die Benutzer? Verschlüsselte Felder können nicht miteinbezogen werden',
-    'show_in_email_short'     => 'In E-Mails mit einbeziehen.',
+    'show_in_email_short' => 'In E-Mails mit einbeziehen',
     'help_text' => 'Hilfetext',
     'help_text_description' => 'Dies ist ein optionaler Text, der unter den Formularelementen erscheint, während eine Datei bearbeitet wird, um Kontext für das Feld bereitzustellen.',
     'about_custom_fields_title' => 'Über benutzerdefinierte Felder',
@@ -57,5 +57,8 @@ return [
     'show_in_requestable_list_short' => 'In anforderbarer Asset-Liste anzeigen',
     'show_in_requestable_list' => 'Wert in der anforderbaren Asset-Liste anzeigen. Verschlüsselte Felder werden nicht angezeigt',
     'encrypted_options' => 'Dieses Feld ist verschlüsselt, so dass einige Anzeigeoptionen nicht verfügbar sind.',
+    'display_checkin' => 'In Check-in-Formularen anzeigen',
+    'display_checkout' => 'In Check-out-Formularen anzeigen',
+    'display_audit' => 'In Audit-Formularen anzeigen',
 
 ];
diff --git a/resources/lang/de-DE/admin/custom_fields/message.php b/resources/lang/de-DE/admin/custom_fields/message.php
index d6436bd897..5a97646a80 100644
--- a/resources/lang/de-DE/admin/custom_fields/message.php
+++ b/resources/lang/de-DE/admin/custom_fields/message.php
@@ -5,6 +5,7 @@ return array(
     'field' => array(
         'invalid'   => 'Dieses Feld existiert nicht.',
         'already_added'   => 'Feld wurde bereits hinzugefügt',
+        'none_selected'   => 'Kein Feld ausgewählt',
 
         'create' => array(
             'error'   => 'Feld wurde nicht erstellt. Bitte versuchen Sie es erneut.',
diff --git a/resources/lang/de-DE/admin/depreciations/general.php b/resources/lang/de-DE/admin/depreciations/general.php
index b864135489..12475696ee 100644
--- a/resources/lang/de-DE/admin/depreciations/general.php
+++ b/resources/lang/de-DE/admin/depreciations/general.php
@@ -13,4 +13,8 @@ return [
     'no_depreciations_warning'               => '<strong>Warnung: </strong>
                       Sie haben derzeit keine Abschreibungen eingerichtet.
                       Bitte richten Sie mindestens eine Abschreibung ein, um den Abschreibungsbericht anzuzeigen.',
+    'depreciation_method'                   => 'Abschreibungsbericht',
+    'linear_depreciation'                   => 'Linear (Standard)',
+    'half_1'                                => 'Halbjahreskonvention, immer gültig',
+    'half_2'                                => 'Halbjahreskonvention, mit Bedingung angewendet',
 ];
diff --git a/resources/lang/de-DE/admin/hardware/form.php b/resources/lang/de-DE/admin/hardware/form.php
index 90548cc13b..da4c1bd8fb 100644
--- a/resources/lang/de-DE/admin/hardware/form.php
+++ b/resources/lang/de-DE/admin/hardware/form.php
@@ -39,8 +39,8 @@ return [
     'order'				=> 'Auftragsnummer',
     'qr'				=> 'QR-Code',
     'requestable'		=> 'Benutzer dürfen dieses Asset anfordern',
-    'redirect_to_all'   => 'Return to all :type',
-    'redirect_to_type'   => 'Go to :type',
+    'redirect_to_all'   => 'Zurück zu allen :type',
+    'redirect_to_type'   => 'Zu :type gehen',
     'redirect_to_checked_out_to'   => 'Go to Checked Out to',
     'select_statustype'	=> 'Status Typ auswählen',
     'serial'			=> 'Seriennummer',
@@ -55,8 +55,11 @@ return [
     'asset_location_update_default' => 'Nur den Standardort aktualisieren',
     'asset_location_update_actual' => 'Nur aktuellen Standort aktualisieren',
     'asset_not_deployable' => 'Dieses Asset ist nicht verfügbar und kann nicht herausgegeben werden.',
-    'asset_deployable' => 'Dieses Asset ist verfügbar und kann herausgegeben werden.',
+    'asset_not_deployable_checkin' => 'Dieser Asset-Status ist nicht einsetzbar, da mit diesem das Asset eingecheckt wird.',
+    'asset_deployable' => 'Dieses Asset kann herausgegeben werden.',
     'processing_spinner' => 'Verarbeitung... (Dies kann bei großen Dateien etwas Zeit in Anspruch nehmen)',
+    'processing' => 'Wird verarbeitet... ',
     'optional_infos'  => 'Optionale Informationen',
-    'order_details'   => 'Bestellinformationen'
+    'order_details'   => 'Bestellinformationen',
+    'calc_eol'    => 'Wenn Sie das EOL-Datum auf Null setzen, dann verwenden Sie die automatische EOL-Berechnung basierend auf dem Kaufdatum und der EOL-Rate.',
 ];
diff --git a/resources/lang/de-DE/admin/hardware/general.php b/resources/lang/de-DE/admin/hardware/general.php
index be674aca13..16e5967acb 100644
--- a/resources/lang/de-DE/admin/hardware/general.php
+++ b/resources/lang/de-DE/admin/hardware/general.php
@@ -5,8 +5,8 @@ return [
     'about_assets_text'            => 'Assets sind Gegenstände die durch eine Seriennummer oder einem Asset-Tag identifiziert werden. Meistens sind diese Gegenstände von höherem Wert, weshalb es Sinn ergibt diese spezifisch zu kennzeichnen.',
     'archived'  				=> 'Archiviert',
     'asset'  					=> 'Asset',
-    'bulk_checkout'             => 'Assets herausgeben',
-    'bulk_checkin'              => 'Assets zurücknehmen',
+    'bulk_checkout'             => 'Massen-Herausgabe',
+    'bulk_checkin'              => 'Masseneinchecken',
     'checkin'  					=> 'Asset zurücknehmen',
     'checkout'  				=> 'Asset herausgeben',
     'clone'  					=> 'Asset duplizieren',
@@ -15,8 +15,8 @@ return [
     'delete_confirm'            => 'Sind Sie sich sicher, dass Sie dieses Asset löschen möchten?',
     'edit'  					=> 'Asset bearbeiten',
     'model_deleted'  			=> 'Dieses Modell für Assets wurde gelöscht. Sie müssen das Modell wiederherstellen, bevor Sie das Asset wiederherstellen können.',
-    'model_invalid'             => 'This model for this asset is invalid.',
-    'model_invalid_fix'         => 'The asset must be updated use a valid asset model before attempting to check it in or out, or to audit it.',
+    'model_invalid'             => 'Dieses Modell für dieses Asset ist ungültig.',
+    'model_invalid_fix'         => 'Das Asset muss mithilfe eines gültigen Asset-Modells aktualisiert werden, bevor Sie versuchen, es ein- oder auszuchecken oder zu prüfen.',
     'requestable'               => 'Anforderbar',
     'requested'				    => 'Angefordert',
     'not_requestable'           => 'Kann nicht angefordert werden',
@@ -27,7 +27,7 @@ return [
     'undeployable_tooltip'  	=> 'Dieses Asset hat eine Statusbezeichnung, die nicht einsetzbar ist und zu diesem Zeitpunkt nicht ausgecheckt werden kann.',
     'view'  					=> 'Asset ansehen',
     'csv_error' => 'Es gibt einen Fehler in der CSV-Datei:',
-    'import_text' => '<p>Laden Sie eine CSV hoch, das den Assetverlauf enthält. Die Assets und Benutzer MÜSSEN bereits im System vorhanden sein oder sie werden übersprungen. Für den Verlaufsimport passende Assets werden über den Asset-Tag zugeordnet. Wir werden versuchen, einen passenden Benutzer, basierend auf dem von Ihnen angegebenen Benutzernamen und den unten ausgewählten Kriterien, zu finden. Wenn Sie keine Kriterien auswählen, wird über das Benutzernamensformat, das Sie in <code>Admin- &gt; Allgemeine Einstellungen</code>konfiguriert haben, eine Zuordnung versucht.</p><p>Felder, die in der CSV enthalten sind, müssen mit den Kopfzeilen übereinstimmen: <strong>Asset Tag, Name, Checkout Datum, Check-in Datum</strong>. Zusätzliche Felder werden ignoriert. </p><p>Check-in Datum: Bei leeren oder zukünftiger Check-in Daten werden die Elemente direkt dem genannten User ausgecheckt. Ohne die Spalte Check-in Datum wird das aktuelle Datum gesetzt.</p>
+    'import_text' => '<p>Laden Sie eine CSV hoch, das den Assetverlauf enthält. Die Assets und Benutzer MÜSSEN bereits im System vorhanden sein oder sie werden übersprungen. Für den Verlaufsimport passende Assets werden über das Asset-Tag zugeordnet. Wir werden versuchen, einen passenden Benutzer, basierend auf dem von Ihnen angegebenen Benutzernamen und den unten ausgewählten Kriterien, zu finden. Wenn Sie keine Kriterien auswählen, wird über das Benutzernamensformat, das Sie in <code>Admin- &gt; Allgemeine Einstellungen</code>konfiguriert haben, eine Zuordnung versucht.</p><p>Felder, die in der CSV enthalten sind, müssen mit den Kopfzeilen übereinstimmen: <strong>Asset Tag, Name, Checkout Datum, Check-in Datum</strong>. Zusätzliche Felder werden ignoriert. </p><p>Check-in Datum: Bei leeren oder zukünftigen Check-in Daten werden die Elemente direkt dem genannten User ausgecheckt. Ohne die Spalte Check-in Datum wird das aktuelle Datum gesetzt.</p>
     ',
     'csv_import_match_f-l' => 'Versuchen Sie, Benutzer im <strong>Vorname.Nachname</strong> (<code>jane.smith</code>) Format zu finden',
     'csv_import_match_initial_last' => 'Versuchen Sie, Benutzer im <strong>ersten ersten Nachnamen</strong> (<code>jsmith</code>) Format zu finden',
diff --git a/resources/lang/de-DE/admin/hardware/message.php b/resources/lang/de-DE/admin/hardware/message.php
index 2ce1f69d6a..e7c4453876 100644
--- a/resources/lang/de-DE/admin/hardware/message.php
+++ b/resources/lang/de-DE/admin/hardware/message.php
@@ -2,19 +2,23 @@
 
 return [
 
-    'undeployable' 		=> '<strong>Achtung:</strong>Dieses Asset wurde kürzlich als nicht verteilbar markiert.
-                        Falls sich dieser Status verändert hat, aktualisieren Sie bitte den Asset Status.',
-    'does_not_exist' 	=> 'Asset existiert nicht.',
-    'does_not_exist_var'=> 'Asset mit Tag :asset_tag nicht gefunden.',
-    'no_tag' 	        => 'Kein Asset Tag angegeben.',
+    'undeployable' 		 => '<b>Warnung:</b> Dieses Asset wurde als nicht zur Herausgabe bereit markiert. Falls sich dieser Status geändert hat, aktualisieren Sie bitte den Asset Status.',
+    'does_not_exist' 	 => 'Asset existiert nicht.',
+    'does_not_exist_var' => 'Asset mit Tag :asset_tag nicht gefunden.',
+    'no_tag' 	         => 'Kein Asset Tag angegeben.',
     'does_not_exist_or_not_requestable' => 'Dieses Asset existiert nicht oder kann nicht angefordert werden.',
-    'assoc_users'	 	=> 'Dieses Asset ist im Moment an einen Benutzer herausgegeben und kann nicht entfernt werden. Bitte buchen sie das Asset wieder ein und versuchen Sie dann erneut es zu entfernen. ',
-    'warning_audit_date_mismatch' 	=> 'This asset\'s next audit date (:next_audit_date) is before the last audit date (:last_audit_date). Please update the next audit date.',
+    'assoc_users'	 	 => 'Dieses Asset ist im Moment an einen Benutzer herausgegeben und kann nicht entfernt werden. Bitte buchen sie das Asset wieder ein und versuchen Sie dann erneut es zu entfernen. ',
+    'warning_audit_date_mismatch' 	=> 'Das nächste Prüfdatum dieses Assets (:next_audit_date) liegt vor dem letzten Prüfungsdatum (:last_audit_date). Bitte aktualisieren Sie daher das nächste Prüfungsdatum.',
+    'labels_generated'   => 'Labels wurden erfolgreich generiert.',
+    'error_generating_labels' => 'Fehler beim Generieren der Labels.',
+    'no_assets_selected' => 'Keine Assets ausgewählt.',
 
     'create' => [
         'error'   		=> 'Asset wurde nicht erstellt. Bitte versuchen Sie es erneut. :(',
         'success' 		=> 'Asset wurde erfolgreich erstellt. :)',
         'success_linked' => 'Asset mit Tag :tag wurde erfolgreich erstellt. <strong><a href=":link" style="color: white;">Klicken Sie hier, um</a></strong> anzuzeigen.',
+        'multi_success_linked' => 'Asset mit Tag :links wurde erfolgreich erstellt.|:count Assets wurden erfolgreich erstellt. :links.',
+        'partial_failure' => 'Ein Asset konnte nicht erstellt werden. Grund: :failures|:count Assets konnten nicht erstellt werden. Gründe: :failures',
     ],
 
     'update' => [
@@ -34,7 +38,7 @@ return [
     ],
 
     'audit' => [
-        'error'   		=> 'Asset audit unsuccessful: :error ',
+        'error'   		=> 'Asset Audit fehlgeschlagen: :error ',
         'success' 		=> 'Asset-Audit erfolgreich protokolliert.',
     ],
 
@@ -52,20 +56,24 @@ return [
     ],
 
     'import' => [
+        'import_button'         => 'Prozess Import',
         'error'                 => 'Einige Elemente wurden nicht korrekt importiert.',
         'errorDetail'           => 'Die folgenden Elemente wurden aufgrund von Fehlern nicht importiert.',
         'success'               => 'Ihre Datei wurde importiert',
         'file_delete_success'   => 'Die Datei wurde erfolgreich gelöscht',
         'file_delete_error'      => 'Die Datei konnte nicht gelöscht werden',
         'file_missing' => 'Die ausgewählte Datei fehlt',
+        'file_already_deleted' => 'Die ausgewählte Datei wurde bereits gelöscht',
         'header_row_has_malformed_characters' => 'Ein oder mehrere Attribute in der Kopfzeile enthalten fehlerhafte UTF-8 Zeichen',
         'content_row_has_malformed_characters' => 'Ein oder mehrere Attribute in der ersten Zeile des Inhalts enthalten fehlerhafte UTF-8-Zeichen',
+        'transliterate_failure' => 'Umschreibung von :encoding nach UTF-8 fehlgeschlagen wegen ungültiger Zeichen in Eingabe'
     ],
 
 
     'delete' => [
         'confirm'   	=> 'Sind Sie sicher, dass Sie dieses Asset entfernen möchten?',
         'error'   		=> 'Beim Entfernen dieses Assets ist ein Fehler aufgetreten. Bitte versuchen Sie es erneut.',
+        'assigned_to_error' => '{1}Asset Tag: :asset_tag ist derzeit herausgegeben. Überprüfen Sie dieses Gerät bevor Sie es löschen. [2,*]Asset Tags: :asset_tag sind derzeit herausgegeben. Überprüfen Sie diese Geräte bevor Sie sie löschen.',
         'nothing_updated'   => 'Es wurden keine Assets ausgewählt, somit wurde auch nichts gelöscht.',
         'success' 		=> 'Dieses Asset wurde erfolgreich entfernt.',
     ],
@@ -78,6 +86,11 @@ return [
         'no_assets_selected' => 'Sie müssen mindestens ein Asset aus der Liste auswählen',
     ],
 
+    'multi-checkout' => [
+        'error'   => 'Asset wurde nicht ausgebucht, bitte versuchen Sie es erneut|Assets wurden nicht ausgebucht, bitte versuchen Sie es erneut',
+        'success' => 'Asset erfolgreich ausgbucht.|Assets erfolgreich ausgebucht.',
+    ],
+
     'checkin' => [
         'error'   		=> 'Asset konnte nicht zurückgenommen werden. Bitte versuchen Sie es erneut',
         'success' 		=> 'Asset wurde erfolgreich zurückgenommen.',
@@ -87,9 +100,10 @@ return [
     ],
 
     'requests' => [
-        'error'   		=> 'Das Asset wurde nicht angefordert, bitte versuchen Sie es erneut',
-        'success' 		=> 'Gegenstand erfolgreich angefordert.',
-        'canceled'      => 'Herausgeben erfolgreich abgebrochen',
+        'error'   		=> 'Die Anfrage war nicht erfolgreich, bitte versuchen Sie es erneut.',
+        'success' 		=> 'Anfrage erfolgreich eingereicht.',
+        'canceled'      => 'Anfrage erfolgreich abgebrochen.',
+        'cancel'        => 'Diese Artikelanfrage abbrechen',
     ],
 
 ];
diff --git a/resources/lang/de-DE/admin/hardware/table.php b/resources/lang/de-DE/admin/hardware/table.php
index 9b1fcc196a..cbe6c0ea46 100644
--- a/resources/lang/de-DE/admin/hardware/table.php
+++ b/resources/lang/de-DE/admin/hardware/table.php
@@ -25,7 +25,6 @@ return [
     'image'		    => 'Geräte-Bild',
     'days_without_acceptance' => 'Tage ohne Akzeptierung',
     'monthly_depreciation' => 'Monatliche Abschreibung',
-    'assigned_to'    => 'Zugewiesen an',
     'requesting_user' => 'Benutzer anfordern',
     'requested_date' => 'Angefordertes Datum',
     'changed'       => 'Geändert',
diff --git a/resources/lang/de-DE/admin/kits/general.php b/resources/lang/de-DE/admin/kits/general.php
index 530d2042da..65900212f1 100644
--- a/resources/lang/de-DE/admin/kits/general.php
+++ b/resources/lang/de-DE/admin/kits/general.php
@@ -47,4 +47,5 @@ return [
     'kit_deleted'                       => 'Kit wurde erfolgreich gelöscht',
     'kit_model_updated'                 => 'Modell wurde erfolgreich aktualisiert',
     'kit_model_detached'                => 'Modell wurde erfolgreich gelöst',
+    'model_already_attached'            => 'Dieses Modell ist bereits einem Kit zugewiesen',
 ];
diff --git a/resources/lang/de-DE/admin/labels/table.php b/resources/lang/de-DE/admin/labels/table.php
index c26f4406cd..39f5dadcf8 100644
--- a/resources/lang/de-DE/admin/labels/table.php
+++ b/resources/lang/de-DE/admin/labels/table.php
@@ -1,13 +1,13 @@
 <?php
 
 return [
-    'example_company'    => 'Testfirma limitiert',
+    'example_company'    => 'Beispielfirma AG',
     'example_defaultloc' => 'Gebäude 1',
     'example_category'   => 'Testkategorie',
     'example_location'   => 'Baue 2',
     'example_manufacturer'  => 'Test Manufacturing Inc.',
     'example_model'      => 'Testmodell',
-    'example_supplier'   => 'Testfirma limitiert',
+    'example_supplier'   => 'Beispielfirma AG',
     'labels_per_page'    => 'Label',
     'support_fields'     => 'Felder',
     'support_asset_tag'  => 'Tag',
diff --git a/resources/lang/de-DE/admin/licenses/general.php b/resources/lang/de-DE/admin/licenses/general.php
index b66462fd6e..f2d6e9bf9a 100644
--- a/resources/lang/de-DE/admin/licenses/general.php
+++ b/resources/lang/de-DE/admin/licenses/general.php
@@ -14,6 +14,7 @@ return array(
     'info'  					=> 'Lizenzinfo',
     'license_seats'  			=> 'Lizenzaktivierungen',
     'seat'  					=> 'Lizenz',
+    'seat_count'  				=> 'Platz :count',
     'seats'  					=> 'Verfügbare Lizenzen',
     'software_licenses'  		=> 'Software Lizenzen',
     'user'  					=> 'Nutzer',
@@ -23,12 +24,12 @@ return array(
         [
             'checkin_all'           => [
                 'button'            => 'Alle Plätze zurücknehmen',
-                'modal'             => 'Diese Aktion wird einen Sitz zurücknehmen. | Diese Aktion wird alle :checkedout_seats_count Sitze für diese Lizenz zurücknehmen.',
+                'modal'             => 'Diese Aktion wird einen Platz zurücknehmen. | Diese Aktion wird alle :checkedout_seats_count Sitze für diese Lizenz zurücknehmen.',
                 'enabled_tooltip'   => 'ALLE Plätze für diese Lizenz zurücknehmen, sowohl von Benutzern als auch von Assets',
                 'disabled_tooltip'  => 'Es ist deaktiviert, da derzeit keine Plätze zum herausgegeben verfügbar sind',
                 'disabled_tooltip_reassignable'  => 'Dies ist deaktiviert, da die Lizenz nicht zuweisbar ist',
                 'success'           => 'Lizenz erfolgreich zurückgenommen! | Alle Lizenzen wurden erfolgreich zurückgenommen!',
-                'log_msg'           => 'Zurückgenommen über Massen-Zurücknehmen in der Lizenzübersicht',
+                'log_msg'           => 'Zurückgenommen über Massen-Rücknahme in der Lizenzübersicht',
             ],
 
             'checkout_all'              => [
diff --git a/resources/lang/de-DE/admin/licenses/message.php b/resources/lang/de-DE/admin/licenses/message.php
index 6b89054936..24cc2310e0 100644
--- a/resources/lang/de-DE/admin/licenses/message.php
+++ b/resources/lang/de-DE/admin/licenses/message.php
@@ -44,10 +44,13 @@ return array(
         'error'   => 'Lizenz wurde nicht herausgegeben, bitte versuchen Sie es erneut.',
         'success' => 'Lizenz wurde erfolgreich herausgegeben',
         'not_enough_seats' => 'Nicht genügend Lizenz-Sitze zur Herausgabe verfügbar',
+        'mismatch' => 'Der angegebene Lizenzplatz entspricht nicht der Lizenz',
+        'unavailable' => 'Dieser Platz ist nicht zur Herausgabe verfügbar.',
     ),
 
     'checkin' => array(
         'error'   => 'Lizenz wurde nicht zurückgenommen, bitte versuchen Sie es erneut.',
+        'not_reassignable' => 'Lizenz nicht neu zuweisbar',
         'success' => 'Die Lizenz wurde erfolgreich zurückgenommen'
     ),
 
diff --git a/resources/lang/de-DE/admin/locations/message.php b/resources/lang/de-DE/admin/locations/message.php
index bdcfbfe06a..d553556633 100644
--- a/resources/lang/de-DE/admin/locations/message.php
+++ b/resources/lang/de-DE/admin/locations/message.php
@@ -3,11 +3,12 @@
 return array(
 
     'does_not_exist' => 'Standort nicht verfügbar.',
-    'assoc_users'    => 'This location is not currently deletable because it is the location of record for at least one asset or user, has assets assigned to it, or is the parent location of another location. Please update your models to no longer reference this company and try again. ',
+    'assoc_users'    => 'Dieser Standort kann derzeit nicht gelöscht werden, da er der Standort eines Datensatzes für mindestens ein Asset oder einen Benutzer ist, ihm Assets zugewiesen sind oder er der übergeordnete Standort eines anderen Standorts ist. Aktualisieren Sie Ihre Datensätze, sodass dieser Standort nicht mehr referenziert wird, und versuchen Sie es erneut ',
     'assoc_assets'	 => 'Dieser Standort ist aktuell mindestens einem Gegenstand zugewiesen und kann nicht gelöscht werden. Bitte entfernen Sie die Standortzuweisung bei den jeweiligen Gegenständen und versuchen Sie es erneut diesen Standort zu entfernen. ',
     'assoc_child_loc'	 => 'Dieser Ort ist aktuell mindestens einem anderen Ort übergeordnet und kann nicht gelöscht werden. Bitte Orte aktualisieren, so dass dieser Standort nicht mehr verknüpft ist und erneut versuchen. ',
     'assigned_assets' => 'Zugeordnete Assets',
     'current_location' => 'Aktueller Standort',
+    'open_map' => 'Öffnen in :map_provider_icon Karten',
 
 
     'create' => array(
@@ -20,6 +21,11 @@ return array(
         'success' => 'Standort erfolgreich aktualisiert.'
     ),
 
+    'restore' => array(
+        'error'   => 'Der Standort wurde nicht wiederhergestellt. Bitte versuchen Sie es erneut',
+        'success' => 'Standort erfolgreich wiederhergestellt.'
+    ),
+
     'delete' => array(
         'confirm'   	=> 'Möchten Sie diesen Standort wirklich entfernen?',
         'error'   => 'Es gab einen Fehler beim Löschen des Standorts. Bitte erneut versuchen.',
diff --git a/resources/lang/de-DE/admin/locations/table.php b/resources/lang/de-DE/admin/locations/table.php
index 5a997800ee..b90725eb24 100644
--- a/resources/lang/de-DE/admin/locations/table.php
+++ b/resources/lang/de-DE/admin/locations/table.php
@@ -39,4 +39,5 @@ return [
     'signed_by_finance_auditor' => 'Unterschrieben von (Finanzprüfer):',
     'signed_by_location_manager' => 'Unterschrieben von (Standortmanager):',
     'signed_by'                 => 'Unterschrieben von:',
+    'clone'  					=> 'Standort klonen',
 ];
diff --git a/resources/lang/de-DE/admin/models/general.php b/resources/lang/de-DE/admin/models/general.php
index 388afe4509..3294821eab 100644
--- a/resources/lang/de-DE/admin/models/general.php
+++ b/resources/lang/de-DE/admin/models/general.php
@@ -3,7 +3,7 @@
 return array(
     'about_models_title'     => 'Über Asset-Modelle',
     'about_models_text'           => 'Asset-Modelle sind eine Möglichkeit, identische Assets zu gruppieren. "MBP 2013", "IPhone 6 s" usw.',
-    'deleted'  					        => 'Dieses Modell wurde gelöscht.',
+    'deleted'  					=> 'Dieses Modell wurde gelöscht.',
     'bulk_delete'               => 'Massenlöschen von Asset-Modellen',
     'bulk_delete_help'               => 'Nutzen Sie die nachfolgenden Kontrollkästchen, um die Löschung der Asset-Modelle zu bestätigen. Asset-Modelle, die noch zugewiesene Assets haben, können nur dann gelöscht werden, wenn die enthaltenen Assets einem anderen Asset-Modell zugewiesen werden.',
     'bulk_delete_warn'          => 'Sie sind dabei, ein Asset Modell zu löschen.|Sie sind dabei, :model_count Asset Modelle zu löschen.',
diff --git a/resources/lang/de-DE/admin/models/message.php b/resources/lang/de-DE/admin/models/message.php
index e22d625cff..a99f9e7335 100644
--- a/resources/lang/de-DE/admin/models/message.php
+++ b/resources/lang/de-DE/admin/models/message.php
@@ -7,7 +7,7 @@ return array(
     'no_association' => 'WARNUNG! Das Asset Modell für dieses Element ist ungültig oder fehlt!',
     'no_association_fix' => 'Dies wird Dinge auf seltsame und schreckliche Weise zerstören. Bearbeite dieses Asset jetzt, um ihm ein Modell zuzuordnen.',
     'assoc_users'	 => 'Dieses Modell ist zurzeit mit einem oder mehreren Assets verknüpft und kann nicht gelöscht werden. Bitte lösche die Assets und versuche dann erneut das Modell zu löschen. ',
-
+    'invalid_category_type' => 'Diese Kategorie muss eine Asset-Kategorie sein.',
 
     'create' => array(
         'error'   => 'Modell wurde nicht erstellt. Bitte versuch es noch einmal.',
diff --git a/resources/lang/de-DE/admin/reports/general.php b/resources/lang/de-DE/admin/reports/general.php
index ed262434bf..505922399b 100644
--- a/resources/lang/de-DE/admin/reports/general.php
+++ b/resources/lang/de-DE/admin/reports/general.php
@@ -4,6 +4,7 @@ return [
     'info'   => 'Wähle eine Option für deinen Asset Bericht.',
     'deleted_user' => 'Gelöschter Benutzer',
     'send_reminder' => 'Erinnerung senden',
+    'cannot_send_reminder' => 'Benutzer wurde gelöscht oder hat keine E-Mail-Adresse, daher kann keine Erinnerung empfangen',
     'reminder_sent' => 'Erinnerung gesendet',
     'acceptance_deleted' => 'Akzeptanzanfrage gelöscht',
     'acceptance_request' => 'Akzeptierungsanfrage',
@@ -13,5 +14,10 @@ return [
         'user_state' => 'Stadt des Benutzers',
         'user_country' => 'Land des Benutzers',
         'user_zip' => 'Postleitzahl des Benutzers'
-    ]
-];
\ No newline at end of file
+    ],
+    'open_saved_template' => 'Gespeicherte Vorlage öffnen',
+    'save_template' =>  'Vorlage speichern',
+    'select_a_template' => 'Wählen Sie eine Vorlage aus',
+    'template_name' => 'Vorlagenname',
+    'update_template' => 'Vorlage aktualisieren',
+];
diff --git a/resources/lang/de-DE/admin/reports/message.php b/resources/lang/de-DE/admin/reports/message.php
index 55e5d295f4..dfc487b007 100644
--- a/resources/lang/de-DE/admin/reports/message.php
+++ b/resources/lang/de-DE/admin/reports/message.php
@@ -1,5 +1,16 @@
 <?php
 
-return array(
-    'error'   => 'Sie müssen mindestens eine Option auswählen.'
-);
+return [
+    'about_templates' => 'Über gespeicherte Vorlagen',
+    'saving_templates_description' => 'Wählen Sie Ihre Optionen aus, geben Sie dann den Namen Ihrer Vorlage in das Feld oben ein und klicken Sie auf die Schaltfläche „Vorlage speichern“. Verwenden Sie das Dropdown-Menü, um eine zuvor gespeicherte Vorlage auszuwählen.',
+    'create'  => [
+        'success' => 'Vorlage erfolgreich gespeichert',
+    ],
+    'update' => [
+        'success' => 'Vorlage erfolgreich aktualisiert',
+    ],
+    'delete' => [
+        'success' => 'Vorlage gelöscht',
+        'no_delete_permission' => 'Die Vorlage existiert nicht oder Sie sind nicht berechtigt, sie zu löschen.',
+    ],
+];
diff --git a/resources/lang/de-DE/admin/settings/general.php b/resources/lang/de-DE/admin/settings/general.php
index 01e9cff568..169f7c10bf 100644
--- a/resources/lang/de-DE/admin/settings/general.php
+++ b/resources/lang/de-DE/admin/settings/general.php
@@ -6,15 +6,15 @@ return [
     'ad_domain_help'			=> 'Meistens dieselbe wie die E-Mail Domäne.',
     'ad_append_domain_label'    => 'Domänenname anhängen',
     'ad_append_domain'          => 'Domänenname an das Feld Benutzername anhängen',
-    'ad_append_domain_help'     => 'Benutzer muss nicht "username@domain.local" eingeben, "username" ist ausreichend.',
+    'ad_append_domain_help'     => 'Der Benutzer muss nicht "username@domain.local" eingeben, "username" ist ausreichend.',
     'admin_cc_email'            => 'CC Email',
-    'admin_cc_email_help'       => 'Wenn Sie eine Kopie der Rücknahme- / Herausgabe-E-Mails, die an Benutzer gehen auch an zusätzliche E-Mail-Empfänger versenden möchten, geben Sie sie hier ein. Ansonsten lassen Sie dieses Feld leer.',
+    'admin_cc_email_help'       => 'Senden Sie eine Kopie der Checkin/Checkout-E-Mails an diese Adresse.',
     'admin_settings'            => 'Admin-Einstellungen',
     'is_ad'				        => 'Dies ist ein Active Directory Server',
     'alerts'                	=> 'Alarme',
     'alert_title'               => 'Benachrichtigungseinstellungen ändern',
     'alert_email'				=> 'Alarme senden an',
-    'alert_email_help'    => 'E-Mail-Adressen oder Verteilerlisten an die Warnungen gesendet werden sollen, durch Komma getrennt',
+    'alert_email_help'          => 'E-Mail-Adressen oder Verteilerlisten an die Warnungen gesendet werden sollen, durch Komma getrennt.',
     'alerts_enabled'			=> 'E-Mail-Benachrichtigungen aktiviert',
     'alert_interval'			=> 'Ablauf Alarmschwelle (in Tagen)',
     'alert_inv_threshold'		=> 'Inventar Alarmschwelle',
@@ -31,15 +31,18 @@ return [
     'backups'					=> 'Sicherungen',
     'backups_help'              => 'Backups erstellen, herunterladen und wiederherstellen ',
     'backups_restoring'         => 'Aus Backup wiederherstellen',
+    'backups_clean' => 'Bereinigen Sie die gesicherte Datenbank vor der Wiederherstellung',
+    'backups_clean_helptext' => "Dies kann nützlich sein, wenn Sie zwischen Datenbankversionen wechseln",
     'backups_upload'            => 'Backup hochladen',
     'backups_path'              => 'Sicherungen auf dem Server werden in <code>:path</code> gespeichert',
-    'backups_restore_warning'   => 'Klicke den Wiederherstellungs-Knopf <small><span class="btn btn-xs btn-warning"><i class="text-white fas fa-retweet" aria-hidden="true"></i></span></small> um ein Backup wiederherzustellen. (Funktioniert derzeit nicht mit S3 Datenspeicher oder Docker.)<br><br><strong>Die gesamte :app_name Datenbank und alle hochgeladenen Dateien werden mit den Inhalten des Backups überschrieben.</strong>  ',
+    'backups_restore_warning'   => 'Wählen Sie die Wiederherstellung <small><span class="btn btn-xs btn-warning"><i class="text-white fas fa-retweet" aria-hidden="true"></i></span></small> um ein Backup wieder herzustellen. (Funktioniert derzeit nicht mit S3 Datenspeicher oder Docker)<br><br>Die <strong>gesamte :app_name Datebank und alle Uploads werden mit den Inhalten des Backups überschrieben</strong>.  ',
     'backups_logged_out'         => 'Alle vorhandenen Benutzer, auch Sie, werden abgemeldet, sobald Ihre Wiederherstellung abgeschlossen ist.',
     'backups_large'             => 'Sehr große Sicherungen können beim Wiederherstellungsversuch ausfallen (Time-Out) und müssen eventuell über die Kommandozeile ausgeführt werden. ',
     'barcode_settings'			=> 'Barcode Einstellungen',
     'confirm_purge'			    => 'Bereinigung bestätigen',
     'confirm_purge_help'		=> 'Geben Sie den Text "DELETE" in das Feld unten ein, um die gelöschten Datensätze zu löschen. Diese Aktion kann nicht rückgängig gemacht werden. Alle Einträge und Benutzer werden DAUERHAFT gelöscht. (Um sicher zu gehen, sollten Sie zuerst ein Backup erstellen)',
     'custom_css'				=> 'Eigenes CSS',
+    'custom_css_placeholder'	=> 'Fügen Sie Ihr benutzerdefiniertes CSS hinzu',
     'custom_css_help'			=> 'Füge eigenes CSS hinzu. Benutze keine &lt;style&gt;&lt;/style&gt; tags.',
     'custom_forgot_pass_url'	=> 'Benutzerdefinierte Passwort Reset URL',
     'custom_forgot_pass_url_help'	=> 'Dadurch wird die integrierte URL für vergessene Passwörter auf dem Anmeldebildschirm ersetzt. Dies ist nützlich, um Benutzer zur internen oder gehosteten Funktion zum Zurücksetzen von LDAP-Passwörtern zu leiten. Es wird effektiv die Funktionalität des lokalen, vergessenen Passworts deaktiviert.',
@@ -47,34 +50,34 @@ return [
     'dashboard_message_help'	=> 'Dieser Text wird für jeden sichtbar sein, der Berechtigungen hat das Dashboard zu sehen.',
     'default_currency'  		=> 'Standardwährung',
     'default_eula_text'			=> 'Standard EULA',
+    'default_eula_text_placeholder' => 'Fügen Sie Ihren Standard-EULA Text hinzu',
     'default_language'			=> 'Standardsprache',
     'default_eula_help_text'	=> 'Sie können ebenfalls eigene EULA\'s mit spezifischen Asset Kategorien verknüpfen.',
     'acceptance_note'           => 'Notiz für Ihre Entscheidung hinzufügen (Optional)',
     'display_asset_name'        => 'Zeige Assetname an',
     'display_checkout_date'     => 'Zeige Herausgabedatum',
     'display_eol'               => 'Zeige EOL in der Tabellenansicht',
-    'display_qr'                => 'Zeige quadratische Codes',
+    'display_qr'                => '2D-Barcode anzeigen',
     'display_alt_barcode'		=> 'Zeige 1D Barcode an',
-    'email_logo'                => 'E-Mail-Logo',
     'barcode_type'				=> '2D Barcode Typ',
     'alt_barcode_type'			=> '1D Barcode Typ',
-    'email_logo_size'       => 'Quadratische Logos in E-Mails sehen am besten aus. ',
     'enabled'                   => 'Aktiviert',
     'eula_settings'				=> 'EULA Einstellungen',
     'eula_markdown'				=> 'Diese EULA <a href="https://help.github.com/articles/github-flavored-markdown/"> erlaubt Github Flavored Markdown</a>.',
+    'empty_row_count'           => 'Feld-Start-Versatz (Leere Zeilen)',
+    'empty_row_count_help'      => 'Felder werden gefüllt, nachdem diese vielen leeren Zeilen am oberen Rand des Labels übersprungen wurden.',
     'favicon'                   => 'Favicon',
     'favicon_format'            => 'Zulässige Dateitypen sind ico, png und gif. Andere Bildformate funktionieren möglicherweise nicht in allen Browsern.',
     'favicon_size'          => 'Favicons sollten quadratische Bilder mit 16x16 Pixel sein.',
     'footer_text'               => 'Zusätzlicher Fußzeilentext ',
     'footer_text_help'          => 'Dieser Text wird in der rechten Fußzeile angezeigt. Links sind erlaubt mit <a href="https://help.github.com/articles/github-flavored-markdown/">Github Flavored Markdown</a>. Zeilenumbrüche, Kopfzeilen, Bilder usw. können zu unvorhersehbaren Verhalten führen.',
+    'footer_text_placeholder'   => 'Optionaler Fußzeilentext',
     'general_settings'			=> 'Allgemeine Einstellungen',
-    'general_settings_keywords' => 'Firmenunterstützung, Unterschrift, Akzeptanz, E-Mail-Format, Benutzernamenformat, Bilder, pro Seite, Vorschaubilder, EULA, Gravatar, TOS, Dashboard, Privatsphäre',
     'general_settings_help'     => 'Standard EULA und mehr',
     'generate_backup'			=> 'Backup erstellen',
     'google_workspaces'         => 'Google Workspaces',
     'header_color'              => 'Farbe der Kopfzeile',
     'info'                      => 'Mit diesen Einstellungen können Sie verschiedene Bereiche Ihrer Installation anpassen.',
-    'label_logo'                => 'Label-Logo',
     'label_logo_size'           => 'Quadratische Logos sehen am besten aus und werden rechts oben auf jedem Asset-Label angezeigt. ',
     'laravel'                   => 'Laravel Version',
     'ldap'                      => 'LDAP',
@@ -94,7 +97,7 @@ return [
     'ldap_login_sync_help'      => 'Dies testet nur, ob LDAP korrekt synchronisiert werden kann. Wenn Ihre LDAP-Authentifizierungsabfrage nicht korrekt ist, können sich Benutzer möglicherweise nicht anmelden. SIE MÜSSEN IHRE AKTUALISIERTEN LDAP-EINSTELLUNGEN ZUERST SPEICHERN.',
     'ldap_manager'              => 'LDAP Manager',
     'ldap_server'               => 'LDAP Server',
-    'ldap_server_help'          => 'Sollte mit ldap:// (für unencrypted oder TLS) oder ldaps:// (für SSL) starten',
+    'ldap_server_help'          => 'Dies sollte mit ldap:// (für unverschlüsselt) oder ldaps:// (für TLS oder SSL) beginnen',
     'ldap_server_cert'			=> 'LDAP SSL Zertifikatsüberprüfung',
     'ldap_server_cert_ignore'	=> 'Erlaube ungültige SSL Zertifikate',
     'ldap_server_cert_help'		=> 'Wählen Sie diese Option, wenn Sie selbstsignierte SSL Zertifikate verwenden und diese gegebenenfalls ungültigen Zertifikate akzeptieren möchten.',
@@ -108,8 +111,8 @@ return [
     'ldap_pword'                => 'LDAP Bind Passwort',
     'ldap_basedn'               => 'Basis Bind DN',
     'ldap_filter'               => 'LDAP Filter',
-    'ldap_pw_sync'              => 'LDAP Passwörter synchronisieren',
-    'ldap_pw_sync_help'         => 'Deaktivieren Sie diese Option, wenn Sie nicht möchten, dass LDAP-Passwörter mit lokalen Passwörtern synchronisiert werden. Wenn Sie dies deaktivieren, kann es sein, dass Benutzer sich möglicherweise nicht anmelden können falls der LDAP-Server aus irgendeinem Grund nicht erreichbar ist.',
+    'ldap_pw_sync'              => 'LDAP-Passwörter zwischenspeichern',
+    'ldap_pw_sync_help'         => 'Deaktivieren Sie dieses Kontrollkästchen, wenn Sie LDAP-Passwörter nicht als lokale Hash-Passwörter zwischenspeichern möchten. Wenn Sie diese Option deaktivieren, können sich Ihre Benutzer möglicherweise nicht anmelden, wenn Ihr LDAP-Server aus irgendeinem Grund nicht erreichbar ist.',
     'ldap_username_field'       => 'Benutzername',
     'ldap_lname_field'          => 'Nachname',
     'ldap_fname_field'          => 'LDAP Vorname',
@@ -117,13 +120,15 @@ return [
     'ldap_version'              => 'LDAP Version',
     'ldap_active_flag'          => 'LDAP Aktiv-Markierung',
     'ldap_activated_flag_help'  => 'Dieser Wert wird benutzt um zu entscheiden, ob synchronisierte Nutzer sich in Snipe-IT anmelden können. <strong> Items können unabhängig von ihm zum Nutzer zugewiesen werden</strong>. Der Wert sollte der <strong>Attributname</strong> im AD/LDAP sein <strong>und nicht der Wert</strong>.<br><br>Wenn diesem Feld ein Name zugewiesen wird, der im AD/LDAP nicht existiert bzw. der Wert im AD/LDAP <code>0</code> oder <code>false</code> ist <strong> wird der Nutzerlogin deaktiviert</strong>. Ist der Wert im AD\\LDAP <code>1</code> oder <code>true</code> oder <em>jeder beliebige andere Text</em> dann kann sich der Nutzer anmelden. Wenn das Feld im AD leer ist, dann gilt das <code>userAccountControl</code> Attribut, was normalerweise bedeutet, dass sich nicht deaktivierte Nutzer anmelden können.',
+    'ldap_invert_active_flag'   => 'LDAP-Active-Flag umkehren',
+    'ldap_invert_active_flag_help'     => 'Wenn aktiviert: Wenn der vom LDAP Active Flag zurückgegebene Wert <code>0</code> oder <code>false</code> ist, ist das Benutzerkonto aktiv.',
     'ldap_emp_num'              => 'LDAP Mitarbeiternummer',
     'ldap_email'                => 'LDAP E-Mail',
     'ldap_test'                 => 'LDAP testen',
     'ldap_test_sync'            => 'LDAP-Synchronisierung testen',
     'license'                   => 'Softwarelizenz',
-    'load_remote'               => 'Gravatar verwenden',
-    'load_remote_help_text'		=> 'Deaktivieren Sie dieses Kästchen, wenn Ihre Installation keine Skripte aus dem externen Internet laden kann. Das verhindert, dass Snipe-IT versucht, Bilder von Gravatar zu laden.',
+    'load_remote'               => 'Externe Avatare laden',
+    'load_remote_help_text'		=> 'Deaktivieren Sie dieses Kästchen, wenn Ihre Installation keine Skripte aus dem externen Internet laden kann. Das verhindert, dass Snipe-IT versucht, Bilder von Gravatar oder anderen externen Quellen zu laden.',
     'login'                     => 'Anmeldeversuche',
     'login_attempt'             => 'Anmeldeversuch',
     'login_ip'                  => 'IP-Adresse',
@@ -131,6 +136,7 @@ return [
     'login_user_agent'          => 'User Agent',
     'login_help'                => 'Liste der versuchten Logins',
     'login_note'                => 'Anmeldenotiz',
+    'login_note_placeholder'            => "Wenn Sie keine Anmeldedaten haben oder ein Gerät dieser Firma gefunden haben, wenden Sie sich bitte an den technischen Support unter 888-555-1212. Vielen Dank.",
     'login_note_help'           => 'Fügen Sie optional ein paar Sätze zu Ihrem Anmeldebildschirm hinzu, beispielsweise um Personen zu helfen, welche ein verlorenes oder gestohlenes Gerät gefunden haben. Dieses Feld akzeptiert <a href="https://help.github.com/articles/github-flavored-markdown/">Github flavored markdown</a>',
     'login_remote_user_text'    => 'Remote Benutzer Login Optionen',
     'login_remote_user_enabled_text' => 'Aktiviere Login mit Remote User Header',
@@ -146,13 +152,16 @@ return [
     'logo_print_assets_help'    => 'Firmenlogo anzeigen beim Drucken der Asset-Liste ',
     'full_multiple_companies_support_help_text' => 'Beschränkung von Benutzern (inklusive Administratoren) die einer Firma zugewiesen sind zu den Assets der Firma.',
     'full_multiple_companies_support_text' => 'Volle Mehrmandanten-Unterstützung für Firmen',
+    'scope_locations_fmcs_support_text'  => 'Bereicherte Standorte mit vollständiger Unterstützung für mehrere Unternehmen',
+    'scope_locations_fmcs_support_help_text'  => 'Standorte auf das ausgewählte Unternehmen beschränken.',
+    'scope_locations_fmcs_check_button' => 'Kompatibilität prüfen',
+    'scope_locations_fmcs_support_disabled_text'  => 'Diese Option ist deaktiviert, da für :count oder mehr Elemente widersprüchliche Standorte gesetzt sind.',
     'show_in_model_list'   => 'In Modell-Dropdown-Liste anzeigen',
     'optional'					=> 'optional',
     'per_page'                  => 'Ergebnisse pro Seite',
     'php'                       => 'PHP Version',
     'php_info'                  => 'PHP Info',
     'php_overview'              => 'PHP',
-    'php_overview_keywords'     => 'php Info, System, Info',
     'php_overview_help'         => 'PHP-Systeminfo',
     'php_gd_info'               => 'Um QR-Codes anzeigen zu können muss php-gd installiert sein, siehe Installationshinweise.',
     'php_gd_warning'            => 'PHP Image Processing and GD Plugin ist NICHT installiert.',
@@ -218,6 +227,8 @@ return [
     'webhook_integration_help'    => ':app Integration ist optional, allerdings sind Endpunkt und Kanal erforderlich, wenn Sie sie verwenden möchten. Um die :app Integration zu konfigurieren, musst du zuerst in deinem :app Account <a href=":webhook_link" target="_new" rel="noopener">einen eingehenden Webhook erstellen</a>. Klicken Sie auf den <strong>:app Integration testen</strong> -Knopf, um zu bestätigen, dass die Einstellungen vor dem Speichern korrekt sind. ',
     'webhook_integration_help_button'    => 'Sobald Sie Ihre :app Informationen gespeichert haben, erscheint ein Test-Knopf.',
     'webhook_test_help'           => 'Testen Sie, ob Ihre :app Integration korrekt konfiguriert ist. SIE MÜSSEN SIE IHRE AKTUELLEN :app EINSTELLUNGEN ZUERST SPEICHERN.',
+    'shortcuts_enabled'         => 'Shortcuts aktivieren',
+    'shortcuts_help_text'       => '<strong>Windows</strong>: Alt + Access-Taste, <strong>Mac</strong>: Control + Option + Access-Taste',
     'snipe_version'  			=> 'Snipe-IT Version',
     'support_footer'            => 'Fußzeile Support-Link ',
     'support_footer_help'       => 'Geben Sie an, wer die Links zum Snipe-IT Support-Info und Benutzerhandbuch sieht',
@@ -227,7 +238,6 @@ return [
     'update'                    => 'Einstellungen übernehmen',
     'value'                     => 'Wert',
     'brand'                     => 'Branding',
-    'brand_keywords'            => 'Fußzeile, Logo, Druck, Theme, Skin, Header, Farben, Farbe, CSS',
     'brand_help'                => 'Logo, Seitenname',
     'web_brand'                 => 'Web Branding Typ',
     'about_settings_title'      => 'Über Einstellungen',
@@ -276,6 +286,8 @@ return [
     'two_factor_enrollment_text'	=> "Zwei-Faktor-Authentifizierung ist erforderlich, Ihr Gerät wurde jedoch noch nicht hinzugefügt. Öffnen Sie die Google Authenticator App und scannen Sie den QR-Code unterhalb um Ihr Gerät hinzuzufügen. Geben Sie anschließend den Code ein",
     'require_accept_signature'      => 'Signatur erforderlich',
     'require_accept_signature_help_text'      => 'Wenn aktiviert, wird eine physische Unterschrift durch den Benutzer notwendig, der das Asset erhält.',
+    'require_checkinout_notes'  => 'Notizen beim Ein-/Auschecken erforderlich',
+    'require_checkinout_notes_help_text'    => 'Wenn Sie diese Funktion aktivieren, müssen die Notizfelder beim Einchecken oder Auschecken eines Assets ausgefüllt werden.',
     'left'        => 'links',
     'right'        => 'rechts',
     'top'        => 'Oben',
@@ -290,15 +302,15 @@ return [
     'oauth_clients' => 'OAuth Clients',
     'oauth' => 'OAuth',
     'oauth_help' => 'OAuth Endpunkt Einstellungen',
-    'oauth_no_clients' => 'You have not created any OAuth clients yet.',
+    'oauth_no_clients' => 'Sie haben noch keine OAuth-Clients erstellt.',
     'oauth_secret' => 'Secret',
-    'oauth_authorized_apps' => 'Authorized Applications',
-    'oauth_redirect_url' => 'Redirect URL',
-    'oauth_name_help' => ' Something your users will recognize and trust.',
-    'oauth_scopes' => 'Scopes',
-    'oauth_callback_url' => 'Your application authorization callback URL.',
-    'create_client' => 'Create Client',
-    'no_scopes' => 'No scopes',
+    'oauth_authorized_apps' => 'Autorisierte Anwendungen',
+    'oauth_redirect_url' => 'Weiterleitungs-URL',
+    'oauth_name_help' => ' Etwas, das Ihre Benutzer erkennen und dem sie vertrauen.',
+    'oauth_scopes' => 'Bereiche',
+    'oauth_callback_url' => 'Ihr App-Autorisierungs-Callback-URL.',
+    'create_client' => 'Client erstellen',
+    'no_scopes' => 'Keine Bereiche',
     'asset_tag_title' => 'Asset Tag Einstellungen aktualisieren',
     'barcode_title' => 'Barcode Einstellungen aktualisieren',
     'barcodes' => 'Barcodes',
@@ -313,24 +325,24 @@ return [
     'filter_by_keyword' => 'Nach Stichwort filtern',
     'security' => 'Sicherheit',
     'security_title' => 'Sicherheitseinstellungen aktualisieren',
-    'security_keywords' => 'Passwort, Passwörter, Anforderungen, Zwei-Faktor, Zwei-Faktor, übliche Passwörter, Remote-Login, Logout, Authentifizierung',
     'security_help' => 'Zwei-Faktor, Passwort-Einschränkungen',
-    'groups_keywords' => 'Berechtigungen, Berechtigungsgruppen, Autorisierung',
     'groups_help' => 'Account-Berechtigungsgruppen',
     'localization' => 'Lokalisierung',
     'localization_title' => 'Lokalisierungseinstellungen aktualisieren',
-    'localization_keywords' => 'Lokalisierung, Währung, lokal, Lokal, Zeitzone, International, Internationalisierung, Sprache, Sprachen, Übersetzung',
     'localization_help' => 'Sprache, Datumsanzeige',
     'notifications' => 'Benachrichtigungen',
     'notifications_help' => 'E-Mail-Benachrichtigungen & Audit-Einstellungen',
     'asset_tags_help' => 'Inkrementieren und Präfixe',
     'labels' => 'Etiketten',
     'labels_title' => 'Etiketten-Einstellungen aktualisieren',
-    'labels_help' => 'Labelgrößen &amp; Einstellungen',
-    'purge_keywords' => 'Endgültig löschen',
+    'labels_help' => 'Barcodes &amp; Etiketteneinstellungen',
     'purge_help' => 'Gelöschte Einträge bereinigen',
     'ldap_extension_warning' => 'Es sieht nicht so aus, als ob die LDAP-Erweiterung auf diesem Server installiert oder aktiviert ist. Sie können Ihre Einstellungen trotzdem speichern, aber Sie müssen die LDAP-Erweiterung für PHP aktivieren, bevor die LDAP-Synchronisierung oder der Login funktioniert.',
     'ldap_ad' => 'LDAP/AD',
+    'ldap_test_label' => 'LDAP-Synchronisierung testen',
+    'ldap_test_login' => ' LDAP-Anmeldung testen',
+    'ldap_username_placeholder' => 'LDAP-Benutzername',
+    'ldap_password_placeholder' => 'LDAP-Passwort',
     'employee_number' => 'Mitarbeiternummer',
     'create_admin_user' => 'Benutzer erstellen ::',
     'create_admin_success' => 'Erfolgreich! Ihr Admin-Benutzer wurde hinzugefügt!',
@@ -342,6 +354,8 @@ return [
     'setup_migration_create_user' => 'Weiter: Benutzer erstellen',
     'ldap_settings_link' => 'LDAP Einstellungsseite',
     'slack_test' => '<i class="fab fa-slack"></i> Integration testen',
+    'status_label_name' => 'Status Etikett Name',
+    'super_admin_only'  => 'Nur Super-Admin',
     'label2_enable'           => 'Neuer Label-Generator',
     'label2_enable_help'      => 'Wechseln Sie zum neuen Label-Generator. <b>Hinweis: Sie müssen diese Einstellung speichern, bevor Sie andere Anpassungen vornehmen.</b>',
     'label2_template'         => 'Vorlage',
@@ -356,12 +370,15 @@ return [
     'label2_2d_type'          => '2D Barcode Typ',
     'label2_2d_type_help'     => 'Format für 2D Barcodes',
     'label2_2d_target'        => '2D Barcode Ausgabe',
-    'label2_2d_target_help'   => 'Die URL, auf die der 2D Barcode beim Scannen verweist',
+    'label2_2d_target_help'   => 'Die Daten, die im 2D Barcode enthalten sein werden',
     'label2_fields'           => 'Felddefinitionen',
     'label2_fields_help'      => 'Felder können in der linken Spalte hinzugefügt, entfernt und neu sortiert werden. In jedem Feld können mehrere Optionen für Label und Datenquelle in der rechten Spalte hinzugefügt, entfernt und neu angeordnet werden.',
+    'purge_barcodes' => 'Barcodes löschen',
     'help_asterisk_bold'    => 'Der eingegebene Text <code>**text**</code> wird in Fettschrift angezeigt',
     'help_blank_to_use'     => 'Leer lassen, um den Wert von <code>:setting_name</code> zu verwenden',
-    'help_default_will_use' => '<code>:default</code> verwendet den Wert von <code>:setting_name</code>. <br>Beachten Sie, dass der Wert der Barcodes mit der jeweiligen Strichcode-Spezifikation übereinstimmen muss, um erfolgreich generiert zu werden. Bitte lesen Sie <a href="https://snipe-it.readme.io/docs/barcodes">die Dokumentation <i class="fa fa-external-link"></i></a> für weitere Details. ',
+    'help_default_will_use' => '<code>:default</code> verwendet den Wert aus <code>:setting_name</code>. <br>Beachten Sie, dass der Wert der Barcodes der jeweiligen Barcode-Spezifikation entsprechen muss, damit sie erfolgreich generiert werden können. Weitere Einzelheiten finden Sie in der <a href="https://snipe-it.readme.io/docs/barcodes">Dokumentation <i class="fa fa-external-link"></i></a>. ',
+    'asset_id'              => 'Asset-ID',
+    'data'               => 'Daten',
     'default'               => 'Standard',
     'none'                  => 'Nichts',
     'google_callback_help' => 'Dies sollte als Callback-URL in den Google OAuth App-Einstellungen in deinem Unternehmen eingegeben werden&apos;s <strong><a href="https://console.cloud.google.com/" target="_blank">Google Developer Konsole <i class="fa fa-external-link" aria-hidden="true"></i></a></strong>.',
@@ -373,7 +390,100 @@ return [
     'database_driver' => 'Datenbanktreiber',
     'bs_table_storage' => 'Tabellen Speicher',
     'timezone' => 'Zeitzone',
-    'profile_edit'          => 'Edit Profile',
-    'profile_edit_help'          => 'Allow users to edit their own profiles.',
+    'test_mail' => 'Test-Mail',
+    'profile_edit'          => 'Profil bearbeiten',
+    'profile_edit_help'          => 'Benutzern erlauben, ihre eigenen Profile zu bearbeiten.',
+    'default_avatar' => 'Benutzerdefinierter Standard-Avatar',
+    'default_avatar_help' => 'Dieses Bild wird als Profilbild angezeigt, wenn ein Benutzer kein Profilbild festgelegt hat.',
+    'restore_default_avatar' => '<a href=":default_avatar" data-toggle="lightbox" data-type="image">Ursprünglichen Standard-Avatar des Systems</a> wiederherstellen',
+    'restore_default_avatar_help' => '',
+    'due_checkin_days' => 'Zum Einchecken fällig Warnung',
+    'due_checkin_days_help' => 'Wie viele Tage vor dem voraussichtlichen Check-in eines Vermögenswerts soll dieser auf der Seite „Zur Eincheckzeit fällig“ aufgeführt werden?',
+    'no_groups' => 'Es wurden noch keine Gruppen erstellt. Navigieren Sie zu <code>Admin-Einstellungen > Berechtigungsgruppen</code>, um eine hinzuzufügen.',
+    'text' => 'Text',
+
+    'username_formats' => [
+        'username_format'		=> 'Format der Benutzernamen',
+        'firstname_lastname_format'	=> 'Vorname Nachname (erika.mustermann)',
+        'first_name_format'	        => 'Vorname (erika)',
+        'last_name_format'		=> 'Nachname (mustermann)',
+        'filastname_format'			=> 'Initial des Vornamen & Nachname (emustermann)',
+        'lastnamefirstinitial_format' =>  'Nachname Initial des Vornamens (mustermanne)',
+        'firstname_lastname_underscore_format' => 'Vorname Nachname (erika_mustermann)',
+        'firstinitial.lastname' => 'Initial des Vornamen & Nachname (e.mustermann)',
+        'lastname_firstinitial' => 'Nachname Initial des Vornamens (mustermann_e)',
+        'lastname_dot_firstinitial_format' => 'Nachname & Initial des Vornamens (mustermann.e)',
+        'firstnamelastname'     => 'Vorname Nachname (erikamustermann)',
+        'firstnamelastinitial'  => 'Vorname und Initial des Nachnamen (erikam)',
+        'lastnamefirstname'      => 'Nachname.Vorname (mustermann.erika)',
+    ],
+
+    'email_formats' => [
+        'email_format'			=> 'E-Mail Format',
+        'firstname_lastname_format'	=> 'Vorname.Nachname (erika.mustermann@example.com)',
+        'first_name_format'		=> 'Vorname (erika@example.com)',
+        'last_name_format'		=> 'Nachname (mustermann@beispiel.com)',
+        'filastname_format'			=> 'Initial des Vornamen & Nachname (emustermann@example.com)',
+        'lastnamefirstinitial_format' =>  'Nachname & Initiale des Vornamens (mustere@example.com)',
+        'firstname_lastname_underscore_format' => 'Vorname_Nachname (erika_mustermann@example.com)',
+        'firstinitial.lastname' => 'Initiale des Vornamen.Nachname (e.mustermann@example.com)',
+        'lastname_firstinitial' => 'Nachname_Initiale des Vornamens (mustermann_e@example.com)',
+        'lastname_dot_firstinitial_format' => 'Nachname & Initiale des Vornamens (mustermann.e@example.com)',
+        'firstnamelastname'     => 'Vorname & Nachname (erikamustermann@example.com)',
+        'firstnamelastinitial'  => 'Vorname und Initiale des Nachnamen (erikam@example.com)',
+        'lastnamefirstname'      => 'Nachname.Vorname (mustermann.erika@example.com)',
+    ],
+
+
+
+    'logo_labels' => [
+        'acceptance_pdf_logo'       => 'PDF-Logo',
+        'email_logo'                => 'E-Mail-Logo',
+        'label_logo'                => 'Label-Logo',
+        'logo'                      => 'Seiten-Logo',
+        'favicon'                   => 'Favicon',
+    ],
+
+    'logo_help' => [
+        'email_logo_size'       => 'Quadratische Logos in E-Mails sehen am besten aus. ',
+    ],
+
+    'logo_option_types' => [
+        'text' => 'Text',
+        'logo' => 'Logo',
+        'logo_and_text' => 'Logo und Text',
+    ],
+
+
+    'legends' => [
+        'scoping' => 'Ummantelung',
+        'formats' => 'Standardformat',
+        'profiles' => 'Benutzerprofile',
+        'eula' => 'EULA & Akzeptanzeinstellungen',
+        'misc_display' => 'Verschiedene Anzeigeoptionen',
+        'email' => 'E-Mail-Einstellungen',
+        'checkin' => 'Checkin Einstellungen',
+        'dashboard' => 'Anmeldung & Dashboard Einstellungen',
+        'misc' => 'Sonstiges',
+        'logos' => 'Logos & Bildschirm',
+        'colors' => 'Farben & Skins',
+        'footer' => 'Fußzeileneinstellungen',
+        'security' => 'Sicherheitseinstellungen',
+        'general' => 'Allgemein',
+        'intervals' => 'Intervalle & Grenzwerte',
+    ],
+
+
+    /* Keywords for settings overview help */
+    'keywords' => [
+        'brand'             => 'Fußzeile, Logo, Drucken, Thema, Oberflächendesign, Header, Farben, Farbe, CSS',
+        'general_settings'  => 'Firmensupport, Unterschrift, Akzeptanz, E-Mail-Format, Benutzernamenformat, Bilder, pro Seite, Miniaturansicht, EULA, Gravatar, Nutzungsbedingungen, Dashboard, Datenschutz',
+        'groups'            => 'Berechtigungen, Berechtigungsgruppen, Autorisierung',
+        'labels'            => 'Etiketten, Barcodes, Strichcode, Tabellen, Druck, UPC, QR, 1D, 2D',
+        'localization'      => 'Lokalisierung, Währung, lokal, Sprache, Zeitzone, Zeitzone, international, Internationalisierung, Sprache, Sprachen, Übersetzung',
+        'php_overview'      => 'PHP-Info, System, Info',
+        'purge'             => 'endgültig löschen',
+        'security'          => 'Passwort, Passwörter, Anforderungen, Zwei-Faktor, Zwei-Faktor, übliche Passwörter, Remote-Login, Logout, Authentifizierung',
+    ],
 
 ];
diff --git a/resources/lang/de-DE/admin/settings/message.php b/resources/lang/de-DE/admin/settings/message.php
index c5130f0b44..07a1d2344f 100644
--- a/resources/lang/de-DE/admin/settings/message.php
+++ b/resources/lang/de-DE/admin/settings/message.php
@@ -14,6 +14,9 @@ return [
         'restore_warning'       => 'Ja, wiederherstellen. Ich bestätige, dass dies alle vorhandenen Daten überschreibt, die derzeit in der Datenbank vorhanden sind. Diese Aktion wird auch alle bestehenden Benutzer abmelden (einschließlich Ihnen).',
         'restore_confirm'       => 'Sind Sie sicher, dass Sie Ihre Datenbank aus :filename wiederherstellen möchten?'
     ],
+    'restore' => [
+        'success'               => 'Ihr Systembackup wurde wiederhergestellt. Bitte melden Sie sich erneut an.'
+    ],
     'purge' => [
         'error'     => 'Beim Bereinigen ist ein Fehler augetreten. ',
         'validation_failed'     => 'Falsche Bereinigungsbestätigung. Bitte geben Sie das Wort "DELETE" im Bestätigungsfeld ein.',
@@ -33,6 +36,9 @@ return [
         'testing_authentication' => 'LDAP-Authentifizierung wird getestet...',
         'authentication_success' => 'Benutzer wurde erfolgreich gegen LDAP authentifiziert!'
     ],
+    'labels' => [
+        'null_template' => 'Etikettenvorlage nicht gefunden. Bitte wählen Sie eine Vorlage aus.',
+        ],
     'webhook' => [
         'sending' => ':app Testnachricht wird gesendet...',
         'success' => 'Ihre :webhook_name Integration funktioniert!',
@@ -42,5 +48,12 @@ return [
         'error' => 'Etwas ist schief gelaufen. :app antwortete mit: :error_message',
         'error_redirect' => 'FEHLER: 301/302 :endpoint gibt eine Umleitung zurück. Aus Sicherheitsgründen folgen wir keinen Umleitungen. Bitte verwenden Sie den aktuellen Endpunkt.',
         'error_misc' => 'Etwas ist schiefgelaufen. :( ',
-    ]
+        'webhook_fail' => ' Webhook-Benachrichtigung fehlgeschlagen: Überprüfen Sie, ob die URL noch gültig ist.',
+        'webhook_channel_not_found' => ' Webhook-Channel nicht gefunden.',
+        'ms_teams_deprecation' => 'Die ausgewählte Microsoft Teams-Webhook-URL wird zum 31. Dezember 2025 eingestellt. Bitte verwenden Sie stattdessen eine Workflow-URL. Die Dokumentation von Microsoft zur Erstellung eines Workflows finden Sie <a href="https://support.microsoft.com/en-us/office/create-incoming-webhooks-with-workflows-for-microsoft-teams-8ae491c7-0394-4861-ba59-055e33f75498" target="_blank">hier.</a>',
+    ],
+    'location_scoping' => [
+        'not_saved' => 'Ihre Einstellungen wurden nicht gespeichert.',
+        'mismatch' => 'Es gibt 1 Element in der Datenbank, das Ihre Aufmerksamkeit benötigt, bevor Sie die Standortbereicherung aktivieren können. Es gibt :count Elemente in der Datenbank, die Ihre Aufmerksamkeit benötigen, bevor Sie die Standortbereicherung aktivieren können.',
+    ],
 ];
diff --git a/resources/lang/de-DE/admin/statuslabels/message.php b/resources/lang/de-DE/admin/statuslabels/message.php
index ff32e7b388..a683724720 100644
--- a/resources/lang/de-DE/admin/statuslabels/message.php
+++ b/resources/lang/de-DE/admin/statuslabels/message.php
@@ -24,7 +24,7 @@ return [
 
     'help' => [
         'undeployable'   => 'Diese Assets können niemandem zugeordnet werden.',
-        'deployable'   => 'Diese Assets können ausgecheckt werden. Sobald sie zugewiesen sind, nehmen sie den Meta-Status <i class="fas fa-circle text-blue"></i> <strong>Platziert</strong> an.',
+        'deployable'   => 'Diese Assets können ausgecheckt werden. Sobald sie zugewiesen sind, nehmen sie den Meta-Status <i class="fas fa-circle text-blue"></i> <strong>Herausgegeben</strong> an.',
         'archived'   => 'Diese Assets können nicht ausgecheckt werden und erscheinen nur in der Ansicht "Archiviert". Dies ist nützlich, um Informationen zu Assets für Budgetierungs- / historische Zwecke beizubehalten, aber sie aus der täglichen Assetliste herauszuhalten.',
         'pending'   => 'Diese Assets können vorübergehend niemandem zugewiesen werden. Wird häufig für Gegenstände verwendet, die in Reparatur sind, aber voraussichtlich in den Kreislauf zurückkehren werden.',
     ],
diff --git a/resources/lang/de-DE/admin/statuslabels/table.php b/resources/lang/de-DE/admin/statuslabels/table.php
index 2f25bce46c..3a3073fe84 100644
--- a/resources/lang/de-DE/admin/statuslabels/table.php
+++ b/resources/lang/de-DE/admin/statuslabels/table.php
@@ -1,14 +1,14 @@
 <?php
 
 return array(
-    'about'      	=> 'Über Statusbezeichnungen',
+    'about'      	=> 'Statusbezeichnungen erklärt',
     'archived'      	=> 'Archiviert',
     'create'      	=> 'Statusbezeichnung erstellen',
     'color'      	=> 'Diagrammfarbe',
     'default_label' => 'Standardbezeichnung',
     'default_label_help' => 'Dies wird verwendet, um sicherzustellen, dass die am häufigsten verwendeten Statusbeschriftungen beim Erstellen / Bearbeiten von Assets oben im Auswahlfeld angezeigt werden.',
     'deployable'      	=> 'Einsetzbar',
-    'info'      	=> 'Statusbezeichnungen werden eingesetzt, um diverse Zustände Ihrer Assets zu beschreiben. Diese können z. B. in Reparatur, gestohlen oder verloren sein. Sie können neue Statusbezeichnungen für einsetzbare, ausstehende und archivierte Assets erstellen.',
+    'info'      	=> 'Statusbezeichnungen werden verwendet, um die verschiedenen Zustände Ihrer Assets zu beschreiben. Diese können z. B. in Reparatur, verloren oder gestohlen sein. Sie können eigene Statusbezeichnungen für einsetzbare, ausstehende und archivierte Assets gemäß Ihrem Workflow erstellen. Weitere Informationen finden Sie in der <a href="https://snipe-it.readme.io/docs/overview#status-labels" target="_blank">Dokumentation <i class="fa fa-external-link"></i></a>.',
     'name'      	=> 'Statusname',
     'pending'      	=> 'Ausstehend',
     'status_type'   => 'Statustyp',
diff --git a/resources/lang/de-DE/admin/users/general.php b/resources/lang/de-DE/admin/users/general.php
index 385e206780..3ea51c02cb 100644
--- a/resources/lang/de-DE/admin/users/general.php
+++ b/resources/lang/de-DE/admin/users/general.php
@@ -19,6 +19,8 @@ return [
     'print_assigned'    => 'Alles zugewiesene drucken',
     'email_assigned'    => 'Alles zugewiesene per Mail zusenden',
     'user_notified'     => 'Der Benutzer hat eine Liste seiner aktuell zugewiesenen Artikel per E-Mail erhalten.',
+    'users_notified'    => 'Dem Benutzer wurde eine Liste seiner aktuell zugewiesenen Gegenstände per E-Mail zugesendet.|:count Benutzer wurden eine Liste ihrer aktuell zugewiesenen Gegenstände per E-Mail zugesendet.',
+    'users_notified_warning' => ':count Benutzer hat eine Liste der aktuell zugewiesenen Gegenstände per E-Mail erhalten, jedoch hatten :no_email Benutzer keine E-Mail-Adresse, so dass sie nicht per E-Mail empfangen werden konnten. :count Benutzer haben eine Liste der aktuell zugewiesenen Gegenstände per E-Mail erhalten, jedoch hatten :no_email Benutzer keine E-Mail-Adresse, so dass sie nicht per E-Mail empfangen werden konnten.',
     'auto_assign_label' => 'Diesen Benutzer bei der automatischen Zuweisung berechtigter Lizenzen einbeziehen',
     'auto_assign_help'  => 'Diesen Benutzer bei der automatischen Zuweisung von Lizenzen überspringen',
     'software_user'     => 'Software herausgegeben an :name',
diff --git a/resources/lang/de-DE/admin/users/message.php b/resources/lang/de-DE/admin/users/message.php
index db0e5cfcde..b5ddeff55c 100644
--- a/resources/lang/de-DE/admin/users/message.php
+++ b/resources/lang/de-DE/admin/users/message.php
@@ -6,7 +6,7 @@ return array(
     'declined'                  => 'Sie haben diesen Gegenstand abgelehnt.',
     'bulk_manager_warn'	        => 'Benutzer erfolgreich geändert. Vorgesetzter sollte auch bearbeitet werden und konnte nicht angepasst werden, weil er sich nicht selbst als Vorgesetzter eingetragen haben kann. Bitte Benutzer ohne den Vorgesetzten nochmal bearbeiten.',
     'user_exists'               => 'Benutzer existiert bereits!',
-    'user_not_found'            => 'Benutzer existiert nicht.',
+    'user_not_found'            => 'Der Benutzer existiert nicht oder Sie sind nicht berechtigt, ihn anzuzeigen.',
     'user_login_required'       => 'Das Loginfeld ist erforderlich',
     'user_has_no_assets_assigned' => 'Derzeit sind keine Assets dem Benutzer zugewiesen.',
     'user_password_required'    => 'Das Passswortfeld ist erforderlich.',
@@ -37,22 +37,23 @@ return array(
         'update' => 'Beim Aktualisieren des Benutzers ist ein Fehler aufgetreten. Bitte probieren Sie es noch einmal.',
         'delete' => 'Beim Entfernen des Benutzers ist ein Fehler aufgetreten. Bitte versuchen Sie es erneut.',
         'delete_has_assets' => 'Der Benutzer konnte nicht gelöscht werden, da ihm Gegenstände zugeordnet sind.',
-        'delete_has_assets_var' => 'This user still has an asset assigned. Please check it in first.|This user still has :count assets assigned. Please check their assets in first.',
-        'delete_has_licenses_var' => 'This user still has a license seats assigned. Please check it in first.|This user still has :count license seats assigned. Please check them in first.',
-        'delete_has_accessories_var' => 'This user still has an accessory assigned. Please check it in first.|This user still has :count accessories assigned. Please check their assets in first.',
-        'delete_has_locations_var' => 'This user still manages a location. Please select another manager first.|This user still manages :count locations. Please select another manager first.',
-        'delete_has_users_var' => 'This user still manages another user. Please select another manager for that user first.|This user still manages :count users. Please select another manager for them first.',
+        'delete_has_assets_var' => 'Diesem Benutzer ist noch ein Asset zugewiesen. Bitte checken Sie es zuerst ein.|Diesem Benutzer sind noch :count Assets zugewiesen. Bitte checken Sie zuerst seine Assets ein.',
+        'delete_has_licenses_var' => 'Diesem Benutzer sind noch Lizenzplätze zugewiesen. Bitte checken Sie diese zuerst ein.|Diesem Benutzer sind noch :count Lizenzplätze zugewiesen. Bitte checken Sie diese zuerst ein.',
+        'delete_has_accessories_var' => 'Diesem Benutzer ist noch ein Zubehör zugewiesen. Bitte checken Sie es zuerst ein.|Diesem Benutzer sind noch :count Zubehöre zugewiesen. Bitte checken Sie zuerst deren Assets ein.',
+        'delete_has_locations_var' => 'Dieser Benutzer verwaltet noch einen anderen Standort. Bitte wählen Sie zuerst einen anderen Manager.|Dieser Benutzer verwaltet noch :count Standorte. Bitte wählen Sie zuerst einen anderen Manager.',
+        'delete_has_users_var' => 'Dieser Benutzer verwaltet noch einen anderen Benutzer. Bitte wählen Sie zuerst einen anderen Manager für diesen Benutzer.|Dieser Benutzer verwaltet noch :count Benutzer. Bitte wählen Sie zuerst einen anderen Manager.',
         'unsuspend' => 'Es gab ein Problem beim reaktivieren des Benutzers. Bitte versuche es erneut.',
         'import'    => 'Es gab ein Problem beim importieren der Benutzer. Bitte noch einmal versuchen.',
         'asset_already_accepted' => 'Dieses Asset wurde bereits akzeptiert.',
         'accept_or_decline' => 'Sie müssen diesen Gegenstand entweder annehmen oder ablehnen.',
-        'cannot_delete_yourself' => 'We would feel really bad if you deleted yourself, please reconsider.',
+        'cannot_delete_yourself' => 'Wir würden uns wirklich schlecht fühlen, wenn Sie sich selbst löschen würden. Überlegen Sie es sich bitte noch einmal.',
         'incorrect_user_accepted' => 'Das Asset, welches Sie versuchen zu aktivieren, wurde nicht für Sie ausgebucht.',
         'ldap_could_not_connect' => 'Konnte keine Verbindung zum LDAP Server herstellen. Bitte LDAP Einstellungen in der LDAP Konfigurationsdatei prüfen. <br>Fehler vom LDAP Server:',
         'ldap_could_not_bind' => 'Konnte keine Verbindung zum LDAP Server herstellen. Bitte LDAP Einstellungen in der LDAP Konfigurationsdatei prüfen. <br>Fehler vom LDAP Server: ',
         'ldap_could_not_search' => 'Konnte LDAP Server nicht suchen. Bitte LDAP Einstellungen in der LDAP Konfigurationsdatei prüfen. <br>Fehler vom LDAP Server:',
         'ldap_could_not_get_entries' => 'Konnte keine Einträge vom LDAP Server abrufen. Bitte LDAP Einstellungen in der LDAP Konfigurationsdatei prüfen. <br>Fehler vom LDAP Server:',
         'password_ldap' => 'Das Passwort für diesen Account wird vom LDAP/Active Directory verwaltet. Bitte kontaktieren Sie Ihre IT-Abteilung, um Ihr Passwort zu ändern. ',
+        'multi_company_items_assigned' => 'Diesem Benutzer sind Dinge zugewiesen, die zu einer anderen Firma gehören. Bitte checken Sie sie ein oder bearbeiten Sie Ihre Firma.'
     ),
 
     'deletefile' => array(
diff --git a/resources/lang/de-DE/admin/users/table.php b/resources/lang/de-DE/admin/users/table.php
index 729c6c8918..486bffe671 100644
--- a/resources/lang/de-DE/admin/users/table.php
+++ b/resources/lang/de-DE/admin/users/table.php
@@ -22,7 +22,7 @@ return array(
     'managed_locations'     => 'Verwaltete Standorte',
     'managed_users'         => 'Verwaltete Benutzer',
     'name' 					=> 'Name',
-    'nogroup'               => 'Es wurden noch keine Gruppen erstellt. Um eine hinzuzufügen, besuchen Sie: ',
+    'nogroup'               => 'Es wurden noch keine Gruppen erstellt. Um eine hinzuzufügen, besuchen Sie:',
     'notes'                 => 'Notizen',
     'password_confirm' 		=> 'Kennwort bestätigen',
     'password' 				=> 'Passwort',
diff --git a/resources/lang/de-DE/auth.php b/resources/lang/de-DE/auth.php
index 7643b8ded7..30997fe41e 100644
--- a/resources/lang/de-DE/auth.php
+++ b/resources/lang/de-DE/auth.php
@@ -15,6 +15,6 @@ return array(
 
     'failed' => 'Diese Anmeldeinformationen entsprechen nicht unseren Angaben.',
     'password' => 'Das angegebene Passwort ist ungültig.',
-    'throttle' => 'Zu viele fehlgeschlagene Anmeldeversuche. Bitte versuchen Sie es erneut in :seconds Sekunden.',
+    'throttle' => 'Zu viele Anmeldeversuche. Bitte versuchen Sie es in :minutes Minute(n) erneut.',
 
 );
diff --git a/resources/lang/de-DE/auth/message.php b/resources/lang/de-DE/auth/message.php
index 90a8d7a541..8e1165c3cc 100644
--- a/resources/lang/de-DE/auth/message.php
+++ b/resources/lang/de-DE/auth/message.php
@@ -6,16 +6,14 @@ return array(
     'account_not_found'      => 'Benutzername oder Passwort sind nicht korrekt.',
     'account_not_activated'  => 'Das Benutzerkonto ist nicht aktiviert.',
     'account_suspended'      => 'Dieses Benutzerkonto ist gesperrt.',
-    'account_banned'         => 'Dieses Benutzerkonto wurde ausgeschlossen.',
-    'throttle'               => 'Zu viele fehlgeschlagene Anmeldeversuche. Bitte versuchen Sie es in :minutes Minuten erneut.',
 
     'two_factor' => array(
         'already_enrolled'      => 'Ihr Gerät ist bereits eingeschrieben.',
         'success'               => 'Sie haben sich erfolgreich eingeloggt.',
         'code_required'         => 'Zwei-Faktor-Code ist erforderlich.',
         'invalid_code'          => 'Zwei-Faktor-Code ist ungültig.',
-        'enter_two_factor_code' => 'Please enter your two-factor authentication code.',
-        'please_enroll'         => 'Please enroll a device in two-factor authentication.',
+        'enter_two_factor_code' => 'Bitte geben Sie Ihren Zwei-Faktor-Authentifizierungscode ein.',
+        'please_enroll'         => 'Bitte registrieren Sie ein Gerät für die Zwei-Faktor-Authentifizierung.',
     ),
 
     'signin' => array(
diff --git a/resources/lang/de-DE/button.php b/resources/lang/de-DE/button.php
index 023d34dc76..5c0f897828 100644
--- a/resources/lang/de-DE/button.php
+++ b/resources/lang/de-DE/button.php
@@ -7,6 +7,7 @@ return [
     'checkin_and_delete'  	    => 'Alle einchecken / Benutzer löschen',
     'delete'  	                => 'Löschen',
     'edit'    	                => 'Bearbeiten',
+    'clone'    	                => 'Duplizieren',
     'restore' 	                => 'Wiederherstellen',
     'remove'                    => 'Entfernen',
     'request'                   => 'Anfragen',
@@ -21,4 +22,13 @@ return [
     'add_maintenance'           => 'Füge Wartung hinzu',
     'append'                    => 'Anhängen',
     'new'                       => 'Neu',
+    'var' => [
+        'clone'     => ':item_type duplizieren',
+        'edit'      => ':item_type bearbeiten',
+        'delete'    => ':item_type löschen',
+        'restore'   => ':item_type wiederherstellen',
+        'create'    => 'Neue&#47;s :item_type erstellen',
+        'checkout'  => ':item_type auschecken',
+        'checkin'   => ':item_type einchecken',
+    ]
 ];
diff --git a/resources/lang/de-DE/general.php b/resources/lang/de-DE/general.php
index f228b1b4dc..bdd4d0929e 100644
--- a/resources/lang/de-DE/general.php
+++ b/resources/lang/de-DE/general.php
@@ -10,10 +10,10 @@ return [
     'action'                => 'Aktion',
     'activity_report'		=> 'Aktivitätsbericht',
     'address'				=> 'Adresse',
-    'admin'					=> 'Administrator',
-    'admin_tooltip'			=> 'This user has admin privileges',
+    'admin'					=> 'Admin-Einstellungen',
+    'admin_tooltip'			=> 'Dieser Benutzer verfügt über Administratorrechte',
     'superuser'				=> 'Superuser',
-    'superuser_tooltip'		=> 'This user has superuser privileges',
+    'superuser_tooltip'		=> 'Dieser Benutzer verfügt über Superuserrechte',
     'administrator'			=> 'Administrator',
     'add_seats'             => 'Plätze hinzugefügt',
     'age'                   => "Alter",
@@ -23,13 +23,16 @@ return [
     'asset_models'			=> 'Asset Modelle',
     'asset_model'			=> 'Modell',
     'asset'					=> 'Asset',
+    'asset_previous'        => 'Asset (Zuvor zugewiesen)',
     'asset_report'          => 'Asset Bericht',
     'asset_tag'				=> 'Asset Tag',
     'asset_tags'            => 'Asset Tags',
     'assets_available'		=> 'Verfügbare Assets',
     'accept_assets'         => 'Assets :name akzeptieren',
     'accept_assets_menu'    => 'Assets akzeptieren',
+    'accept_item'           => 'Gegenstand akzeptieren',
     'audit'				    => 'Prüfung',
+    'audits'				=> 'Prüfung',
     'audit_report'			=> 'Prüfungs-Log',
     'assets'				=> 'Assets',
     'assets_audited'        => 'geprüfte Assets',
@@ -61,9 +64,12 @@ return [
     'changepassword'  		=> 'Passwort ändern',
     'checkin'  				=> 'Zurücknehmen',
     'checkin_from'  		=> 'Zurücknehmen von',
+    'checkin_note'  		=> 'Rücknahme Notiz',
+    'checkout_note'  		=> 'Ausgabe Notiz',
     'checkout'  			=> 'Herausgeben',
     'checkouts_count'       => 'Herausgaben',
     'checkins_count'        => 'Rücknahmen',
+    'checkin_and_delete'  	=> 'Zurücknehmen und Löschen',
     'user_requests_count'   => 'Anfragen',
     'city'  				=> 'Stadt',
     'click_here'			=> 'Hier klicken',
@@ -77,7 +83,7 @@ return [
     'consumables'			=> 'Verbrauchsmaterialien',
     'country'  				=> 'Land',
     'could_not_restore'     => 'Fehler beim Wiederherstellen von :item_type: :error',
-    'not_deleted'           => ':item_type wurde nicht gelöscht, kann daher nicht wiederhergestellt werden',
+    'not_deleted'           => 'Diese/s :item_type wurde nicht gelöscht und kann daher nicht wiederhergestellt werden',
     'create'				=> 'Erstellen',
     'created'               => 'Eintrag erstellt',
     'created_asset'			=> 'Asset angelegt',
@@ -86,11 +92,13 @@ return [
     'record_created' 		=> 'Eintrag erstellt',
     'updated_at' 			=> 'Aktualisiert am',
     'currency'  			=> '€', // this is deprecated
+    'currency_text'  		=> 'Währung', //
     'current'  				=> 'Aktuell',
     'current_password'      => 'Aktuelles Passwort',
     'customize_report'      => 'Bericht anpassen',
     'custom_report'         => 'Benutzerdefinierter Asset-Bericht',
     'dashboard'				=> 'Dashboard',
+    'data_source'           => 'Datenquelle',
     'days'      			=> 'Tage',
     'days_to_next_audit'    => 'Tage bis zur nächsten Prüfung',
     'date'					=> 'Datum',
@@ -98,7 +106,7 @@ return [
     'debug_warning_text'    => 'Diese Anwendung läuft im Produktionsmodus mit Debugging aktiviert. Dies kann sensible Daten verfügbar machen, wenn Ihre Anwendung öffentlich zugänglich ist. Deaktivieren Sie den Debug-Modus, indem Sie den <code>APP_DEBUG</code>-Wert in der <code>.env</code> Datei auf <code>false</code> setzen.',
     'delete'  				=> 'Löschen',
     'delete_confirm'  		=> 'Sind Sie sicher, dass Sie :item löschen möchten?',
-    'delete_confirm_no_undo' => 'Sind Sie sicher, dass Sie :item löschen möchten? Dies kann nicht rückgängig gemacht werden.',
+    'delete_confirm_no_undo' => 'Möchten Sie :item wirklich löschen? Dies kann nicht rückgängig gemacht werden.',
     'deleted'  				=> 'Gelöscht',
     'delete_seats'  		=> 'Gelöschte Plätze',
     'deletion_failed'       => 'Löschen fehlgeschlagen',
@@ -114,29 +122,13 @@ return [
     'editprofile'  			=> 'Profil bearbeiten',
     'eol'					=> 'EOL',
     'email_domain'			=> 'E-Mail-Domäne',
-    'email_format'			=> 'E-Mail Format',
     'employee_number'       => 'Mitarbeiternummer',
     'email_domain_help'		=> 'Dies wird verwendet, um E-Mail-Adressen beim Importieren zu generieren',
     'error'				    => 'Fehler',
     'exclude_archived'      => 'Archivierte Assets ausschließen',
     'exclude_deleted'       => 'Gelöschte Assets ausschließen',
     'example'				=> 'Beispiel: ',
-    'filastname_format'			=> 'Initial des Vornamen + Nachname (jsmith@example.com)',
-    'firstname_lastname_format'	=> 'Vorname.Nachname (jane.smith@example.com)',
-    'firstname_lastname_underscore_format' => 'Vorname_Nachname (max_mustermann@beispiel.com)',
-    'lastnamefirstinitial_format' =>  'Nachname & Initiale des Vornamens (musterm@beispiel.com)',
-    'firstintial_dot_lastname_format' => 'Initiale des Vornamen.Nachname (j.smith@example.com)',
-    'firstname_lastname_display'	=> 'Vorname Nachname (Jane Smith)',
-    'lastname_firstname_display'	=> 'Nachname Vorname (Smith Jane)',
-    'name_display_format'	=> 'Name Anzeigeformat',
-    'first'					=> 'Erste',
-    'firstnamelastname'     => 'VornameNachname (ErikaMustermann@beispiel.de)',
-    'lastname_firstinitial' => 'Nachname_Initiale des Vornamens (mustermann_e@beispiel.de)',
-    'firstinitial.lastname' => 'Initiale des Vornamens.Nachname (e.mustermann@beispiel.de)',
-    'firstnamelastinitial'  => 'Vorname und Initiale des Nachnamen (erika_m@beispiel.de)',
-    'lastnamefirstname'      => 'Last Name First Name (smith.jane@example.com)',
-    'first_name'			=> 'Vorname',
-    'first_name_format'		=> 'Vorname (jane@example.com)',
+
     'files'                 => 'Dateien',
     'file_name'				=> 'Datei',
     'file_type'             => 'Dateityp',
@@ -156,11 +148,11 @@ return [
     'image_delete'         	=> 'Bild löschen',
     'include_deleted'       => 'Gelöschte Gegenstände einbeziehen',
     'image_upload'         	=> 'Bild hochladen',
-    'filetypes_accepted_help'    => 'Akzeptierter Dateityp ist :types. Maximal zulässige Hochlade-Größe ist :size.|Akzeptierte Dateitypen sind :types. Maximal erlaubte Hochlade-Größe ist :size.',
+    'filetypes_accepted_help'    => 'Akzeptierter Dateityp ist :types. Maximal zulässige Größe ist :size.|Akzeptierte Dateitypen sind :types. Maximal erlaubte Hochlade-Größe ist :size.',
     'filetypes_size_help'   => 'Maximal erlaubte Hochlade-Größe ist :size.',
-    'image_filetypes_help'  => 'Accepted filetypes are jpg, webp, png, gif, svg, and avif. Max upload size allowed is :size.',
+    'image_filetypes_help'  => 'Akzeptierte Dateitypen sind jpg, webp, png, gif, svg, und avif. Die maximal zulässige Upload-Größe beträgt :size.',
     'unaccepted_image_type'  => 'Diese Bilddatei ist nicht lesbar. Akzeptierte Dateitypen sind jpg, webp, png, gif und svg. Der MIME-Type dieser Datei ist: :mimetype.',
-    'import'         	    => 'Importieren',
+    'import'         	    => 'Import',
     'import_this_file'      => 'Felder zuordnen und diese Datei bearbeiten',
     'importing'         	=> 'Wird importiert',
     'importing_help'        => 'Sie können Assets, Zubehör, Lizenzen, Komponenten, Verbrauchsmaterialien und Benutzer mittels CSV-Datei importieren. <br><br>Die CSV-Datei sollte kommagetrennt sein und eine Kopfzeile enthalten, die mit den <a href="https://snipe-it.readme.io/docs/importing" target="_new">Beispiel-CSVs aus der Dokumentation</a> übereinstimmen.',
@@ -178,12 +170,17 @@ return [
     'last'					=> 'Letzte',
     'last_login'            => 'Letzte Anmeldung',
     'last_name'             => 'Nachname',
+    'firstname_lastname_display'	=> 'Vorname Nachname (Max Mustermann)',
+    'lastname_firstname_display'	=> 'Nachname Vorname (Mustermann Max)',
+    'name_display_format'	=> 'Name Anzeigeformat',
+    'first'					=> 'Erste',
+    'first_name'			=> 'Vorname',
     'license'				=> 'Lizenz',
     'license_report'        => 'Lizenzbericht',
     'licenses_available'	=> 'Verfügbare Lizenzen',
     'licenses'				=> 'Lizenzen',
     'list_all'				=> 'Alle auflisten',
-    'loading'				=> 'Wird geladen... Bitte warten....',
+    'loading'				=> 'Wird geladen... Bitte warten...',
     'lock_passwords'        => 'Dieser Feldwert wird in einer Demo-Installation nicht gespeichert.',
     'feature_disabled'      => 'Dieses Feature wurde für die Demo-Installation deaktiviert.',
     'location'              => 'Standort',
@@ -206,8 +203,8 @@ return [
     'new_password'          => 'Neues Passwort',
     'next'					=> 'Nächste',
     'next_audit_date'		=> 'Nächstes Prüfungsdatum',
-    'next_audit_date_help'  => 'If you use auditing in your organization, this is usually automatically calculated based on the asset&apos;s last audit date and audit frequency (in <code>Admin Settings &gt; Alerts</code>) and you can leave this blank. You can manually set this date here if you need to, but it must be later than the last audit date. ',
-    'audit_images_help'     => 'You can find audit images in the asset\'s history tab.',
+    'next_audit_date_help'  => 'Wenn Sie in Ihrer Organisation Prüfungen verwenden, wird dies normalerweise automatisch basierend auf dem letzten Prüfungsdatum und der Prüfungshäufigkeit des Assets berechnet (in <code>Admin-Einstellungen &gt; Warnungen</code>) und Sie können dieses Feld leer lassen. Sie können dieses Datum auch hier bei Bedarf manuell festlegen, es muss jedoch nach dem letzten Prüfungsdatum liegen. ',
+    'audit_images_help'     => 'Sie können Prüfbilder in der Asset-Historie finden.',
     'no_email'              => 'Es ist keine E-Mail-Adresse mit diesem Benutzer verknüpft',
     'last_audit'		    => 'Letzte Prüfung',
     'new'					=> 'Neu!',
@@ -215,6 +212,14 @@ return [
     'no_results'			=> 'Keine Treffer.',
     'no'  					=> 'Nein',
     'notes'  				=> 'Notizen',
+    'note_added'            => 'Notiz hinzugefügt',
+    'options'				=> 'Optionen',
+    'preview'				=> 'Vorschau',
+    'add_note'              => 'Notiz hinzufügen',
+    'note_edited'            => 'Notiz bearbeitet',
+    'edit_note'              => 'Notiz bearbeiten',
+    'note_deleted'            => 'Notiz gelöscht',
+    'delete_note'              => 'Notiz löschen',
     'order_number'          => 'Bestellnummer',
     'only_deleted'          => 'Nur gelöschte Gegenstände',
     'page_menu'				=> 'Zeige _MENU_ Einträge',
@@ -229,7 +234,7 @@ return [
     'purchase_date'         => 'Kaufdatum',
     'qty'		            => 'Menge',
     'quantity'		        => 'Menge',
-    'quantity_minimum'      => ':count Artikel sind unter oder fast unter der Mindestmenge',
+    'quantity_minimum'      => 'Sie haben einen Artikel unter oder fast unter Mindestmenge Level|Sie haben :count Artikel unterhalb oder fast unter Mindestmenge',
     'quickscan_checkin'  	=> 'Schnell-Rücknahme',
     'quickscan_checkin_status'  	=> 'Rückgabe Status',
     'ready_to_deploy'		=> 'Bereit zum Herausgeben',
@@ -240,7 +245,7 @@ return [
     'restored'				=> 'wiederhergestellt',
     'restore'				=> 'Wiederherstellen',
     'requestable_models'    => 'Angeforderte Modelle',
-    'requestable_items'     => 'Requestable Items',
+    'requestable_items'     => 'Anforderbare Gegenstände',
     'requested'				=> 'Angefordert',
     'requested_date'        => 'Angefordertes Datum',
     'requested_assets'      => 'Angeforderte Assets',
@@ -265,7 +270,7 @@ return [
     'select_date'			=> 'Wählen Sie ein Datum (JJJJ-MM-DD)',
     'select_statuslabel'	=> 'Status auswählen',
     'select_company'    	=> 'Firma auswählen',
-    'select_asset'    		=> 'Asset auswählen',
+    'select_asset'    		=> 'Wählen Sie ein Asset',
     'settings'				=> 'Einstellungen',
     'show_deleted'  		=> 'Gelöschte anzeigen',
     'show_current'  		=> 'Aktuelles anzeigen',
@@ -274,13 +279,15 @@ return [
     'signed_off_by'         => 'Freigegeben von',
     'skin'       			=> 'Skin',
     'webhook_msg_note'        => 'Eine Benachrichtigung wird über den Webhook gesendet',
-    'webhook_test_msg'        => 'Oh hey! Sieht so aus, als ob Ihre :app Integration mit Snipe-IT funktioniert!',
+    'webhook_test_msg'        => 'Oh hi! Sieht so aus, als ob Ihre :app Integration mit Snipe-IT funktioniert!',
     'some_features_disabled' => 'DEMO-MODE: Einige Funktionen sind für diese Installation deaktiviert.',
     'site_name'				=> 'Seitenname',
     'state'  				=> 'Bundesland',
     'status_labels'			=> 'Statusbezeichnungen',
+    'status_label'			=> 'Statusbezeichnung',
     'status'    			=> 'Status',
     'accept_eula'           => 'Annahmeerklärung',
+    'show_or_hide_eulas' => 'EULAs ein-/ausblenden',
     'supplier'              => 'Lieferant',
     'suppliers'  			=> 'Lieferanten',
     'sure_to_delete'        => 'Sind Sie sich sicher, dass Sie löschen möchten?',
@@ -296,15 +303,15 @@ return [
     'type'  				=> 'Typ',
     'undeployable'			=> 'Nicht herausgebbar',
     'unknown_admin'			=> 'Unbekannter Administrator',
-    'username_format'		=> 'Format der Benutzernamen',
     'username'              => 'Benutzername',
     'update'                => 'Aktualisieren',
+    'updating_item' => ':item wird aktualisiert',
     'upload_filetypes_help'      => 'Erlaubte Dateitypen sind png, gif, jpg, jpeg, doc, docx, pdf, xls, xlsx, txt, lic, xml, zip, rtf und rar. Maximale Uploadgröße beträgt :size.',
     'uploaded'              => 'Hochgeladen',
     'user'					=> 'Benutzer',
     'accepted'			    => 'angenommen',
     'declined'			    => 'abgelehnt',
-    'declined_note'         => 'Declined Notes',
+    'declined_note'         => 'Abgelehnte Notizen',
     'unassigned'            => 'Nicht zugewiesen',
     'unaccepted_asset_report' => 'Nicht akzeptierte Assets',
     'users'                 => 'Benutzer',
@@ -323,10 +330,10 @@ return [
     'token_expired'         => 'Ihre Sitzung ist abgelaufen. Bitte versuchen Sie es erneut.',
     'login_enabled'         => 'Login aktiviert',
     'audit_due'             => 'Prüfung fällig',
-    'audit_due_days'        => 'Fällige Assets für Prüfung innerhalb von :days Tag|Fällige Assets für Prüfung innerhalb von :days',
+    'audit_due_days'        => '{}Vermögenswerte, die innerhalb eines Tages zur Prüfung fällig oder überfällig sind|[1]Vermögenswerte, die innerhalb eines Tages zur Prüfung fällig oder überfällig sind|[2,*]Vermögenswerte, die innerhalb von :days Tagen zur Prüfung fällig oder überfällig sind',
     'checkin_due'           => 'Fällig zum Check-in',
     'checkin_overdue'       => 'Überfällig für den Check-in',
-    'checkin_due_days'      => 'Fällige Assets für den Check-in innerhalb von :days Tag|Fällige Assets für den Check-in innerhalb von :days',
+    'checkin_due_days'      => '{}Zum Einchecken fällig|[1]Vermögenswerte müssen innerhalb von :days am Tag eingecheckt werden|[2,*]Vermögenswerte müssen innerhalb von :days Days eingecheckt werden',
     'audit_overdue'         => 'Prüfung überfällig',
     'accept'                => ':asset akzeptieren',
     'i_accept'              => 'Ich akzeptiere',
@@ -357,9 +364,9 @@ return [
     'last_checkout'         => 'Letzte Herausgabe',
     'due_to_checkin'        => 'Folgende :count Elemente werden demnächst zurückgenommen:',
     'expected_checkin'      => 'Erwartetes Rückgabedatum',
-    'reminder_checked_out_items' => 'Dies ist eine Erinnerung an die Artikel, die gerade an Sie herausgegeben sind. Wenn Sie der Meinung sind, dass die Angaben falsch sind (fehlender Artikel oder Artikel, den Sie nie erhalten haben), senden Sie bitte eine E-Mail an :reply_to_name unter :reply_to_address.',
+    'reminder_checked_out_items' => 'Dies ist eine Erinnerung an Sie bezüglich der Artikel, die gerade an Sie herausgegeben sind. Wenn Sie der Meinung sind, dass die Angaben falsch sind (fehlende/r Artikel oder Artikel, den/die Sie nie erhalten haben), senden Sie bitte eine E-Mail an :reply_to_name unter :reply_to_address.',
     'changed'               => 'Geändert',
-    'to'                    => 'An',
+    'to'                    => 'bis',
     'report_fields_info'    => '<p>Wählen Sie die Felder aus, die Sie in Ihren benutzerdefinierten Bericht einfügen möchten, und klicken Sie auf Generieren. Die Datei (custom-asset-report-YYYY-mm-dd.csv) wird automatisch heruntergeladen und Sie können sie in Excel öffnen.</p>
             <p>Wenn Sie nur bestimmte Artikel exportieren möchten, verwenden Sie die folgenden Optionen, um Ihre Ergebnisse zu verfeinern.</p>',
     'range'                 => 'Bereich',
@@ -383,6 +390,8 @@ return [
     'new_license'           => 'Neue Lizenz',
     'new_accessory'         => 'Neues Zubehör',
     'new_consumable'        => 'Neues Verbrauchsmaterial',
+    'new_component'         => 'Neue Komponente',
+    'new_user'              => 'Neuer Benutzer',
     'collapse'              => 'Zusammenklappen',
     'assigned'              => 'Zugewiesen',
     'asset_count'           => 'Anzahl Assets',
@@ -418,19 +427,20 @@ return [
     'bulk_soft_delete'      =>'Die Benutzer auch "soft-löschen". Die Historie der Gegenstände bleibt erhalten, solange die markierten Datensätze nicht in den Admin-Einstellungen endgültig gelöscht werden.',
     'bulk_checkin_delete_success' => 'Die ausgewählten Benutzer wurden gelöscht und ihre Gegenstände wurden eingecheckt.',
     'bulk_checkin_success' => 'Die Gegenstände für die ausgewählten Benutzer wurden eingecheckt.',
-    'set_to_null'           => 'Werte für dieses Asset|Werte für alle :asset_count Assets löschen ',
+    'set_to_null'           => 'Werte für diese Auswahl löschen|Werte für alle :selection_count Auswahlen löschen ',
     'set_users_field_to_null'  => ':field Werte für diesen Benutzer löschen|:field Werte für alle :user_count Benutzer löschen ',
     'na_no_purchase_date'   => 'N/A - Kein Kaufdatum angegeben',
     'assets_by_status'      => 'Assets sortiert nach Status',
     'assets_by_status_type'      => 'Assets sortiert nach Statustyp',
     'pie_chart_type'        => 'Dashboard Kreisdiagramm Typ',
     'hello_name'            => 'Hallo, :name!',
-    'unaccepted_profile_warning'   => 'Sie haben :count Gegenstände, die akzeptiert werden müssen. Klicken Sie hier, um diese anzunehmen oder abzulehnen',
+    'unaccepted_profile_warning'   => 'Sie haben einen Artikel, der akzeptiert werden muss. Klicken Sie hier, um ihn zu akzeptieren oder abzulehnen. | Sie haben :count Artikel, die akzeptiert werden müssen. Klicken Sie hier, um sie zu akzeptieren oder abzulehnen',
     'start_date'            => 'Startdatum',
     'end_date'            => 'Enddatum',
     'alt_uploaded_image_thumbnail' => 'Hochgeladene Miniaturansicht',
     'placeholder_kit'       => 'Kit auswählen',
     'file_not_found'        => 'Datei wurde nicht gefunden',
+    'log_record_not_found'  => 'Es wurde kein Eintrag für diesen Logeintrag gefunden.',
     'preview_not_available' => '(keine Vorschau vorhanden)',
     'setup'                 => 'Setup',
     'pre_flight'            => 'Pre-Flight',
@@ -509,10 +519,10 @@ return [
         'import_note' => 'Mit CSV-Importer importiert',
     ],
     'remove_customfield_association' => 'Dieses Feld aus dem Feldsatz entfernen. Das benutzerdefinierte Feld wird nicht gelöscht, nur die Verbindung des Feldes mit diesem Feldsatz.',
-    'checked_out_to_fields' => 'Checked Out To Fields',
+    'checked_out_to_fields' => 'Folgenden Feldern zugewiesen',
     'percent_complete' => '% vollständig',
     'uploading' => 'Wird hochgeladen ... ',
-    'upload_error' => 'Fehler beim Hochladen der Datei. Bitte überprüfen Sie, dass keine leeren Zeilen vorhanden sind und keine Spaltennamen dupliziert werden.',
+    'upload_error' => 'Fehler beim Hochladen der Datei. Bitte überprüfen Sie, ob Sie keine leeren Zeilen oder doppelte Spaltennamen in Ihrem CSV haben und dass die Serverrechte das Hochladen erlauben.',
     'copy_to_clipboard' => 'In die Zwischenablage kopieren',
     'copied' => 'Kopiert!',
     'status_compatibility' => 'Wenn Assets bereits zugewiesen sind, können sie nicht zu einem nicht einsetzbaren Statustyp geändert werden, und diese Änderung wird übersprungen.',
@@ -528,7 +538,7 @@ return [
     'permission_denied_superuser_demo' => 'Zugriff verweigert. Die Benutzerinformationen für Superadministratoren in der Demoinstallation können nicht aktualisiert werden.',
     'pwd_reset_not_sent' => 'Benutzer ist nicht aktiviert, ist mit LDAP synchronisiert oder hat keine E-Mail-Adresse',
     'error_sending_email' => 'Fehler beim Senden der E-Mail',
-    'sad_panda' => 'Sad panda. You are not authorized to do the thing. Maybe <a href=":link">return to the dashboard</a>, or contact your administrator.',
+    'sad_panda' => 'Trauriger Panda. Sie sind nicht berechtigt, das zu tun. <a href=":link">Kehren Sie zum Dashboard zurück</a> oder wenden Sie sich an Ihren Administrator.',
     'bulk' => [
             'delete' =>
                 [
@@ -549,6 +559,71 @@ return [
         'license_seats'  => ':count Lizenzplatz|:count Lizenzplätze',
         'consumables'  => ':count Verbrauchsmaterial|:count Verbrauchsmaterialien',
         'components'  => ':count Komponente|:count Komponenten',
-    ]
+    ],
+
+    'more_info' => 'Mehr Informationen',
+    'quickscan_bulk_help' => 'Wenn Sie dieses Kontrollkästchen aktivieren, wird der Asset-Datensatz so bearbeitet, dass dieser neue Standort angezeigt wird. Wenn Sie es nicht aktivieren, wird der Standort einfach im Prüfprotokoll vermerkt. Beachten Sie, dass sich der Standort der Person, des Assets oder des Standorts, an den es ausgecheckt wurde, nicht ändert, wenn dieses Asset ausgecheckt wird.',
+    'whoops' => 'Hoppla!',
+    'something_went_wrong' => 'Bei Ihrer Anfrage ist ein Fehler aufgetreten.',
+    'close' => 'Schließen',
+    'expires' => 'Ablaufdatum',
+    'map_fields'=> ':item_type Feld zuordnen',
+    'remaining_var' => ':count verbleibend',
+    'label' => 'Label',
+    'import_asset_tag_exists' => 'Ein Asset mit dem Asset-Tag :asset_tag ist bereits vorhanden und es wurde keine Aktualisierung angefordert. Es wurden keine Änderungen vorgenommen.',
+    'countries_manually_entered_help' => 'Werte mit einem Sternchen (*) wurden manuell eingegeben und stimmen nicht mit vorhandenen Dropdown-Werten nach ISO 3166 überein',
+    'accessories_assigned' => 'Zugewiesenes Zubehör',
+    'user_managed_passwords' => 'Passwortverwaltung',
+    'user_managed_passwords_disallow' => 'Benutzern die Verwaltung ihrer eigenen Passwörter verbieten',
+    'user_managed_passwords_allow' => 'Benutzern erlauben, ihre eigenen Passwörter zu verwalten',
+    'from' => 'Von',
+    'by' => 'Von',
+
+// Add form placeholders here
+    'placeholders' => [
+        'notes'  => 'Notiz hinzufügen',
+    ],
+
+    'breadcrumb_button_actions' => [
+        'edit_item' => ':name bearbeiten',
+        'checkout_item' => ':name herausgeben',
+        'checkin_item' => ':name zurücknehmen',
+    ],
+
+    'skins' => [
+        'site_default' => 'Seiten Standard',
+        'default_blue' => 'Standard Blau',
+        'blue_dark' => 'Blau (Dunkler Modus)',
+        'green' => 'Grün Dunkel',
+        'green_dark' => 'Grün (Dunkler Modus)',
+        'red' => 'Rot Dunkel',
+        'red_dark' => 'Rot (Dunkler Modus)',
+        'orange' => 'Orange Dunkel',
+        'orange_dark' => 'Orange (Dunkler Modus)',
+        'black' => 'Schwarz',
+        'black_dark' => 'Schwarz (Dunkler Modus)',
+        'purple' => 'Lila',
+        'purple_dark' => 'Lila (Dunkler Modus)',
+        'yellow' => 'Gelb',
+        'yellow_dark' => 'Gelb (Dunkler Modus)',
+        'high_contrast' => 'Hoher Kontrast',
+
+    ],
+
+    'select_all_none' => 'Alle auswählen/abwählen',
+    'generic_model_not_found' => 'Dieses :model wurde nicht gefunden oder Sie haben keine Berechtigung, darauf zuzugreifen',
+    'deleted_models' => 'Gelöschtes Asset-Modelle',
+    'deleted_users' => 'Gelöschte Benutzer',
+    'cost_each' => 'je :amount',
+    'remove_current_image' => 'Aktuelles :type Bild entfernen',
+
+    'seeding' => [
+        'manufacturers' => [
+            'button' => 'Hersteller anlegen',
+            'prompt' => 'Sie haben noch keine Hersteller. Möchten Sie eine Liste von gängigen Herstellern anbieten? (DIESE ÜBERSCHREIBEN BESTEHENDE HERSTELLER, einschließlich derer, die sanft gelöscht wurden.)',
+            'success' => 'Hersteller erfolgreich vorgefüllt',
+            'error' => 'Hersteller konnten nicht vorgefüllt werden. Ein Herstellerrekord existiert bereits, und das Füllen würde ihn überschreiben. Konnte Hersteller nicht liefern. :count Herstelleraufzeichnungen existieren bereits, und Füllung würde sie überschreiben.',
+        ],
+    ],
 
 ];
diff --git a/resources/lang/de-DE/localizations.php b/resources/lang/de-DE/localizations.php
index e261e982f2..02551a3db2 100644
--- a/resources/lang/de-DE/localizations.php
+++ b/resources/lang/de-DE/localizations.php
@@ -2,7 +2,7 @@
 
 return [
 
-    'select_language' => 'Sprache auswählen',
+    'select_language' => 'Wählen Sie eine Sprache',
     'languages' => [
         'en-US'=> 'Englisch, USA',
         'en-GB'=> 'Englisch, UK',
@@ -40,7 +40,9 @@ return [
         'ms-MY'=> 'Malaiisch',
         'mi-NZ'=> 'Maori',
         'mn-MN'=> 'Mongolisch',
-        'no-NO'=> 'Norwegisch',
+        'nb-NO'=> 'Norwegisch Bokmål',
+        'om-ET' => 'Oromo (Äthiopisch)',
+        //'nn-NO'=> 'Norwegian Nynorsk',
         'fa-IR'=> 'Persisch',
         'pl-PL'=> 'Polnisch',
         'pt-PT'=> 'Portugiesisch',
@@ -66,7 +68,7 @@ return [
         'zu-ZA'=> 'Zulu',
     ],
 
-    'select_country' => 'Land auswählen',
+    'select_country' => 'Wählen Sie ein Land',
     
     'countries' => [
         'AC'=>'Ascensionsinsel',
@@ -133,6 +135,7 @@ return [
         'EC'=>'Ecuador',
         'EE'=>'Estland',
         'EG'=>'Ägypten',
+        'GB-ENG'=>'England',
         'ER'=>'Eritrea',
         'ES'=>'Spanien',
         'ET'=>'Äthiopien',
@@ -232,6 +235,7 @@ im Indischen Ozean',
         'NG'=>'Nigeria',
         'NI'=>'Nicaragua',
         'NL'=>'Niederlande',
+        'GB-NIR' => 'Nordirland',
         'NO'=>'Norwegen',
         'NP'=>'Nepal',
         'NR'=>'Nauru',
@@ -259,7 +263,7 @@ im Indischen Ozean',
         'RU'=>'Russland',
         'RW'=>'Ruanda',
         'SA'=>'Saudi-Arabien',
-        'UK'=>'Schottland',
+        'GB-SCT'=>'Schottland',
         'SB'=>'Salomon-Inseln',
         'SC'=>'Seychellen',
         'SS'=>'Südsudan',
@@ -311,6 +315,7 @@ im Indischen Ozean',
         'VI'=>'Amerikanische Jungferninseln',
         'VN'=>'Vietnam',
         'VU'=>'Vanuatu',
+        'GB-WLS' =>'Wales',
         'WF'=>'Wallis und Futuna',
         'WS'=>'Samoa',
         'YE'=>'Jemen',
diff --git a/resources/lang/de-DE/mail.php b/resources/lang/de-DE/mail.php
index 5f088745bb..382815c20e 100644
--- a/resources/lang/de-DE/mail.php
+++ b/resources/lang/de-DE/mail.php
@@ -23,24 +23,25 @@ return [
     'Item_Requested' => 'Gegenstand angefordert',
     'License_Checkin_Notification' => 'Lizenz zurückgenommen',
     'License_Checkout_Notification' => 'Lizenz herausgegeben',
+    'license_for'   => 'Lizenz für',
     'Low_Inventory_Report' => 'Bericht über niedrige Lagerbestände',
     'a_user_canceled' => 'Eine Geräte-Anfrage auf der Webseite wurde vom Benutzer abgebrochen',
     'a_user_requested' => 'Ein Benutzer hat ein Gerät auf der Webseite angefordert',
     'acceptance_asset_accepted' => 'Ein Benutzer hat einen Gegenstand akzeptiert',
     'acceptance_asset_declined' => 'Ein Benutzer hat einen Gegenstand abgelehnt',
-    'accessory_name' => 'Zubehör Name:',
-    'additional_notes' => 'Zusätzliche Bemerkungen:',
+    'accessory_name' => 'Zubehör Name',
+    'additional_notes' => 'Zusätzliche Bemerkungen',
     'admin_has_created' => 'Ein Administrator hat auf der :web Webseite ein Konto für Sie erstellt.',
-    'asset' => 'Asset:',
-    'asset_name' => 'Name des Gegenstandes:',
+    'asset' => 'Asset',
+    'asset_name' => 'Asset Name',
     'asset_requested' => 'Gegenstand angefordert',
     'asset_tag' => 'Asset Tag',
     'assets_warrantee_alert' => 'Die Garantie von :count Asset wird in :threshold Tagen auslaufen.|Die Garantie von :count Assets wird in :threshold Tagen auslaufen.',
     'assigned_to' => 'Zugewiesen an',
     'best_regards' => 'Grüße,',
-    'canceled' => 'Abgebrochen:',
-    'checkin_date' => 'Rücknahmedatum:',
-    'checkout_date' => 'Herausgabedatum:',
+    'canceled' => 'Abgebrochen',
+    'checkin_date' => 'Rücknahmedatum',
+    'checkout_date' => 'Herausgabedatum',
     'checkedout_from' => 'Herausgegeben von',
     'checkedin_from'  => 'Eingecheckt von',
     'checked_into' => 'Zurückgenommen in',
@@ -49,27 +50,30 @@ return [
     'click_to_confirm' => 'Bitte klicken Sie zum Bestätigen Ihres :web Kontos auf den folgenden Link:',
     'current_QTY' => 'Aktuelle Menge',
     'days' => 'Tage',
-    'expecting_checkin_date' => 'Erwartetes Rückgabedatum:',
+    'expecting_checkin_date' => 'Erwartetes Rückgabedatum',
     'expires' => 'Ablaufdatum',
     'hello' => 'Hallo',
     'hi' => 'Hallo',
     'i_have_read' => 'Ich habe die Nutzungsbedingungen gelesen und stimme diesen zu, und ich habe diesen Gegenstand erhalten.',
     'inventory_report' => 'Bestandsbericht',
-    'item' => 'Gegenstand:',
+    'item' => 'Gegenstand',
+    'item_checked_reminder' => 'Dies ist eine Erinnerung daran, dass Sie derzeit :count Artikel ausgeliehen haben, die Sie weder angenommen noch abgelehnt haben. Klicken Sie bitte auf den untenstehenden Link, um diese entweder anzunehmen oder abzulehnen.',
     'license_expiring_alert' => 'Es gibt :count auslaufende Lizenz in den nächsten :threshold Tagen.|Es gibt :count auslaufende Lizenzen in den nächsten :threshold Tagen.',
     'link_to_update_password' => 'Klicken Sie bitte auf den folgenden Link zum Aktualisieren Ihres :web Passworts:',
-    'login' => 'Benutzername:',
+    'login' => 'Login',
     'login_first_admin' => 'Melden Sie sich zu Ihrer neuen Snipe-IT-Installation mithilfe der unten stehenden Anmeldeinformationen an:',
     'low_inventory_alert' => 'Es gibt :count Artikel, der unter dem Minimum ist oder kurz davor ist.|Es gibt :count Artikel, die unter dem Minimum sind oder kurz davor sind.',
     'min_QTY' => 'Mindestmenge',
     'name' => 'Name',
     'new_item_checked' => 'Ein neuer Gegenstand wurde unter Ihrem Namen ausgecheckt. Details finden Sie weiter unten.',
+    'new_item_checked_with_acceptance' => 'Ein neuer Gegenstand, der eine Annahme erfordert, wurde unter Ihrem Namen ausgecheckt. Details finden Sie weiter unten.',
+    'recent_item_checked' => 'Ein Gegenstand, der eine Annahme erfordert, wurde unter Ihrem Namen ausgecheckt. Details finden Sie weiter unten.',
     'notes' => 'Notizen',
-    'password' => 'Passwort:',
+    'password' => 'Passwort',
     'password_reset' => 'Passwort zurücksetzen',
     'read_the_terms' => 'Bitte lesen Sie die nachfolgenden Nutzungsbedingungen.',
     'read_the_terms_and_click' => 'Bitte lesen Sie die Nutzungsbedingungen unten, und klicken Sie auf den Link am unteren Ende, um zu bestätigen, dass Sie die Nutzungsbedingungen gelesen und akzeptiert haben und das Asset erhalten haben.',
-    'requested' => 'Angefordert:',
+    'requested' => 'Angefordert',
     'reset_link' => 'Ihr Link zum Zurücksetzen des Kennworts',
     'reset_password' => 'Klicken Sie hier, um Ihr Passwort zurückzusetzen:',
     'rights_reserved' => 'Alle Rechte vorbehalten.',
@@ -79,15 +83,17 @@ return [
     'supplier' => 'Lieferant',
     'tag' => 'Kennzeichnung',
     'test_email' => 'Test E-Mail von Snipe-IT',
-    'test_mail_text' => 'Dies ist ein Test von Snipe-IT-Asset-Management-System. Wenn Sie das erhalten haben, funktioniert das Senden von Mails :)',
+    'test_mail_text' => 'Dies ist ein Test des Snipe-IT Asset Management Systems. Wenn Sie das erhalten haben, funktioniert das Senden von Mails :)',
     'the_following_item' => 'Der folgende Gegenstand wurde eingecheckt: ',
     'to_reset' => 'Zum Zurücksetzen Ihres :web Passwortes, füllen Sie bitte dieses Formular aus:',
     'type' => 'Typ',
     'upcoming-audits' => 'Es ist :count Asset vorhanden, für das innerhalb von :threshold Tagen ein Audit durchzuführen ist. |Es gibt :count Assets, für die innerhalb von :threshold Tagen Audits durchzuführen sind.',
     'user' => 'Benutzer',
     'username' => 'Benutzername',
-    'welcome' => 'Wilkommen, :name',
+    'unaccepted_asset_reminder' => 'Erinnerung: Sie haben nicht akzeptierte Assets.',
+    'welcome' => 'Willkommen, :name',
     'welcome_to' => 'Willkommen bei :web!',
     'your_assets' => 'Ihre Assets anzeigen',
     'your_credentials' => 'Ihre Snipe-IT Anmeldedaten',
+    'mail_sent' => 'Mail erfolgreich gesendet!',
 ];
diff --git a/resources/lang/de-DE/validation.php b/resources/lang/de-DE/validation.php
index 11c7a92347..f8fc03a802 100644
--- a/resources/lang/de-DE/validation.php
+++ b/resources/lang/de-DE/validation.php
@@ -13,87 +13,150 @@ return [
     |
     */
 
-    'accepted'             => ':attribute muss akzeptiert werden.',
-    'active_url'           => ':attribute ist keine gültige URL.',
-    'after'                => ':attribute muss ein Datum nach dem :date sein.',
-    'after_or_equal'       => 'Das :attribute muss ein Datum nach oder gleich :date sein.',
-    'alpha'                => ':attribute darf nur aus Buchstaben bestehen.',
-    'alpha_dash'           => ':attribute darf nur aus Buchstaben, Zahlen und Gedankenstrichen bestehen.',
-    'alpha_num'            => ':attribute darf nur aus Buchstaben und Zahlen bestehen.',
-    'array'                => 'Das Attribut muss ein Array sein.',
-    'before'               => ':attribute muss ein Datum vor dem :date sein.',
-    'before_or_equal'      => 'Das Attribut muss ein Datum vor oder gleich: date sein.',
-    'between'              => [
-        'numeric' => ':attribute muss zwischen :min und :max liegen.',
-        'file'    => ':attribute darf nur zwischen :min und :max kilobytes groß sein.',
-        'string'  => ':attribute muss mindestens :min und maximal :max Zeichen enthalten.',
-        'array'   => ':attribute muss mindestens :min und darf maximal :max Einträge haben.',
+    'accepted' => 'Dieses :attribute Feld muss akzeptiert werden.',
+    'accepted_if' => 'Dieses :attribute Feld muss akzeptiert werden wenn :other :value ist.',
+    'active_url' => 'Dieses :attribute Feld muss eine gültige URL sein.',
+    'after' => 'Das Feld :attribute muss ein Datum nach :date sein.',
+    'after_or_equal' => 'Das Feld :attribute muss ein Datum nach oder gleich :date sein.',
+    'alpha' => 'Das Feld :attribute darf nur Buchstaben enthalten.',
+    'alpha_dash' => 'Das Feld :attribute darf nur Buchstaben, Zahlen, Binde- und Unterstriche enthalten.',
+    'alpha_num' => 'Das Feld :attribute darf nur Buchstaben und Zahlen enthalten.',
+    'array' => 'Das Feld :attribute muss ein Array sein.',
+    'ascii' => 'Das Feld :attribute darf nur einbyteige alphanumerische Zeichen und Symbole enthalten.',
+    'before' => 'Das Feld :attribute muss ein Datum vor dem :date sein.',
+    'before_or_equal' => 'Das Feld :attribute muss ein Datum vor oder gleich dem :date sein.',
+    'between' => [
+        'array' => 'Das Feld :attribute muss zwischen :min und :max Elemente enthalten.',
+        'file' => 'Das Feld :attribute muss zwischen :min und :max Kilobyte liegen.',
+        'numeric' => 'Das Feld :attribute muss zwischen :min und :max liegen.',
+        'string' => 'Das Feld :attribute muss zwischen :min und :max Zeichen enthalten.',
     ],
-    'boolean'              => ':attribute muss wahr oder falsch sein.',
-    'confirmed'            => ':attribute Bestätigung stimmt nicht überein.',
-    'date'                 => ':attribute ist kein gültiges Datum.',
-    'date_format'          => ':attribute passt nicht zur :format Formatierung.',
-    'different'            => ':attribute und :other müssen sich unterscheiden.',
-    'digits'               => ':attribute muss :digits Stellen haben.',
-    'digits_between'       => ':attribute soll mindestens :min und darf maximal :max Stellen haben.',
-    'dimensions'           => ':attribute hat ein ungültiges Bildformat.',
-    'distinct'             => 'Das Attributfeld hat einen doppelten Wert.',
-    'email'                => 'Das Format von :attribute ist ungültig.',
-    'exists'               => 'Das ausgewählte :attribute ist ungültig.',
-    'file'                 => ':attribute muss eine Datei sein.',
-    'filled'               => 'Das :attribute Feld muss einen Wert haben.',
-    'image'                => ':attribute muss ein Bild sein.',
+    'boolean' => 'Das Feld :attribute muss true oder false sein.',
+    'can' => 'Das Feld :attribute enthält einen nicht autorisierten Wert.',
+    'confirmed' => 'Die Bestätigung des Feldes :attribute stimmt nicht überein.',
+    'contains' => 'Im Feld :attribute fehlt ein erforderlicher Wert.',
+    'current_password' => 'Das Passwort ist ungültig.',
+    'date' => 'Das Feld :attribute muss ein gültiges Datum enthalten.',
+    'date_equals' => 'Das Feld :attribute muss ein Datum enthalten, das dem Wert :date entspricht.',
+    'date_format' => 'Das Feld :attribute muss dem Format :format entsprechen.',
+    'decimal' => 'Das Feld :attribute muss :decimal Dezimalstellen haben.',
+    'declined' => 'Das Feld :attribute muss abgelehnt werden.',
+    'declined_if' => 'Das Feld :attribute muss abgelehnt werden, wenn :other :value ist.',
+    'different' => 'Die Felder :attribute und :other müssen unterschiedlich sein.',
+    'digits' => 'Das Feld :attribute muss :digits Ziffern enthalten.',
+    'digits_between' => 'Das Feld :attribute muss zwischen :min und :max Ziffern enthalten.',
+    'dimensions' => 'Das Feld :attribute hat ungültige Bilddimensionen.',
+    'distinct' => 'Das Attributfeld hat einen doppelten Wert.',
+    'doesnt_end_with' => 'Das Feld :attribute darf nicht mit einem der folgenden Elemente enden: :values.',
+    'doesnt_start_with' => 'Das Feld :attribute darf nicht mit einem der folgenden Elemente enden: :values.',
+    'email' => 'Das Feld :attribute muss eine gültige E-Mail-Adresse enthalten.',
+    'ends_with' => 'Das Feld :attribute muss mit einem der folgenden enden: :values.',
+    'enum' => 'Auswahl :attribute ist ungültig.',
+    'exists' => 'Das ausgewählte :attribute ist ungültig.',
+    'extensions' => 'Das Feld :attribute muss eine der folgenden Erweiterungen haben: :values.',
+    'file' => 'Das Feld :attribute muss eine Datei sein.',
+    'filled' => 'Das :attribute Feld muss einen Wert haben.',
+    'gt' => [
+        'array' => 'Das Feld :attribute muss mehr als :value Elemente haben.',
+        'file' => 'Das Feld :attribute muss größer als :value Kilobyte sein.',
+        'numeric' => 'Das Feld :attribute muss größer sein als :value.',
+        'string' => 'Das Feld :attribute muss größer als :value Zeichen sein.',
+    ],
+    'gte' => [
+        'array' => 'Das Feld :attribute muss :value Elemente oder mehr enthalten.',
+        'file' => 'Das Feld :attribute muss größer oder gleich :value Kilobyte sein.',
+        'numeric' => 'Das Feld :attribute muss größer oder gleich :value sein.',
+        'string' => 'Das Feld :attribute muss größer oder gleich :value Zeichen sein.',
+    ],
+    'hex_color' => 'Das Feld :attribute muss eine gültige hexadezimale Farbe sein.',
+    'image' => 'Das Feld :attribute muss ein Bild sein.',
     'import_field_empty'    => ':fieldname darf nicht leer sein.',
-    'in'                   => 'Auswahl :attribute ist ungültig.',
-    'in_array'             => 'Das Feld :attribute existiert nicht in :other.',
-    'integer'              => ':attribute muss eine ganze Zahl sein.',
-    'ip'                   => ':attribute muss eine gültige IP Adresse sein.',
-    'ipv4'                 => ':attribute muss eine gültige IPv4 Adresse sein.',
-    'ipv6'                 => ':attribute muss eine gültige IPv6 Adresse sein.',
-    'is_unique_department' => ':attribute muss einzigartig an diesem Standort sein',
-    'json'                 => 'Das Attribut muss eine gültige JSON-Zeichenfolge sein.',
-    'max'                  => [
-        'numeric' => ':attribute darf nicht größer als :max sein.',
-        'file'    => ':attribute darf nicht größer als :max Kilobyte sein.',
-        'string'  => ':attribute darf nicht mehr als :max Zeichen sein.',
-        'array'   => 'Das: -Attribut darf nicht mehr als: maximale Elemente haben.',
+    'in' => 'Auswahl :attribute ist ungültig.',
+    'in_array' => 'Das Feld :attribute muss in :other vorhanden sein.',
+    'integer' => 'Das Feld :attribute muss ein Integer sein.',
+    'ip' => 'Das Feld :attribute muss eine gültige IP-Adresse sein.',
+    'ipv4' => 'Das Feld :attribute muss eine gültige IPv4-Adresse sein.',
+    'ipv6' => 'Das Feld :attribute muss eine gültige IPv6-Adresse sein.',
+    'json' => 'Das Feld :attribute muss eine gültige JSON-Zeichenfolge sein.',
+    'list' => 'Das Feld :attribute muss eine Liste sein.',
+    'lowercase' => 'Das Feld :attribute muss klein geschrieben sein.',
+    'lt' => [
+        'array' => 'Das Feld :attribute muss weniger als :value Elemente haben.',
+        'file' => 'Das Feld :attribute muss kleiner als :value Kilobyte sein.',
+        'numeric' => 'Das Feld :attribute muss kleiner sein als :value.',
+        'string' => 'Das Feld :attribut muss weniger als :value Zeichen enthalten.',
     ],
-    'mimes'                => ':attribute muss eine Datei des Typs :values sein.',
-    'mimetypes'            => ':attribute muss eine Datei vom Typ: :values sein.',
-    'min'                  => [
-        'numeric' => ':attribute muss kleiner als :min sein.',
-        'file'    => ':attribute muss mindestens :min Kilobyte groß sein.',
-        'string'  => ':attribute benötigt mindestens :min Zeichen.',
-        'array'   => ':attribute muss mindestens :min Elemente enthalten.',
+    'lte' => [
+        'array' => 'Das Feld :attribute darf nicht mehr als :value Elemente enthalten.',
+        'file' => 'Das Feld :attribute muss kleiner oder gleich :value Kilobyte sein.',
+        'numeric' => 'Das Feld :attribute muss kleiner oder gleich :value sein.',
+        'string' => 'Das Feld :attribute muss kleiner oder gleich :value Zeichen sein.',
     ],
-    'starts_with'          => ':attribute muss mit einem der folgenden Werte beginnen: :values.',
-    'ends_with'            => ':attribute muss mit einem der folgenden Werte enden: :values.',
+    'mac_address' => 'Das Feld :attribute muss eine gültige MAC-Adresse sein.',
+    'max' => [
+        'array' => 'Das Feld :attribute darf nicht mehr als :max Elemente enthalten.',
+        'file' => 'Das Feld :attribute darf nicht größer als :max Kilobyte sein.',
+        'numeric' => 'Das Feld :attribute darf nicht größer als :max sein.',
+        'string' => 'Das Feld :attribute darf nicht größer als :max Zeichen sein.',
+    ],
+    'max_digits' => 'Das Feld :attribute darf nicht mehr als :max Ziffern haben.',
+    'mimes' => 'Das Feld :attribute muss eine Datei vom Typ: :values ​​sein.',
+    'mimetypes' => 'Das Feld :attribute muss eine Datei vom Typ: :values ​​sein.',
+    'min' => [
+        'array' => 'Das Feld :attribute muss mindestens :min Elemente enthalten.',
+        'file' => 'Das Feld :attribute muss mindestens :min Kilobyte groß sein.',
+        'numeric' => 'Das Feld :attribute muss mindestens :min sein.',
+        'string' => 'Das Feld :attribute muss mindestens :min Zeichen enthalten.',
+    ],
+    'min_digits' => 'Das Feld :attribute muss mindestens :min Ziffern haben.',
+    'missing' => 'Das Feld :attribute muss fehlen.',
+    'missing_if' => 'Das Feld :attribute muss fehlen, wenn :other :value ist.',
+    'missing_unless' => 'Das Feld :attribute muss fehlen, es sei denn, :other ist :value.',
+    'missing_with' => 'Das Feld :attribute muss fehlen, wenn :values ​​vorhanden ist.',
+    'missing_with_all' => 'Das Feld :attribute muss fehlen, wenn :values ​​vorhanden sind.',
+    'multiple_of' => 'Das Feld :attribute muss ein Vielfaches von :value sein.',
+    'not_in' => 'Auswahl :attribute ist ungültig.',
+    'not_regex' => 'Das Format von dem Feld :attribute ist ungültig.',
+    'numeric' => 'Das Feld :attribute muss eine Zahl sein.',
+    'password' => [
+        'letters' => 'Das Feld :attribute muss mindestens einen Buchstaben enthalten.',
+        'mixed' => 'Das Feld :attribute muss mindestens einen Groß- und einen Kleinbuchstaben enthalten.',
+        'numbers' => 'Das Feld :attribute muss mindestens eine Zahl enthalten.',
+        'symbols' => 'Das Feld :attribute muss mindestens ein Symbol enthalten.',
+        'uncompromised' => 'Das angegebene :attribute ist in einem Datenleck aufgetaucht. Bitte wählen Sie ein anderes :attribute.',
+    ],
+    'percent'       => 'Bei einer prozentualen Abschreibung muss der Mindestabschreibungswert zwischen 0 und 100 liegen.',
 
-    'not_in'               => 'Auswahl :attribute ist ungültig.',
-    'numeric'              => ':attribute muss eine Zahl sein.',
-    'present'              => ':attribute muss vorhanden sein.',
-    'valid_regex'          => 'Dies ist kein gültiger Regex-Ausdruck. ',
-    'regex'                => ':attribute Format ungültig.',
-    'required'             => ':attribute Feld muss ausgefüllt sein.',
-    'required_if'          => ':attribute wird benötigt, wenn :other :value entspricht.',
-    'required_unless'      => ':attribute ist erforderlich, es sei denn :other ist in :values.',
-    'required_with'        => ':attribute wird benötigt wenn :value ausgewählt ist.',
-    'required_with_all'    => ':attribute field ist erforderlich, wenn :values vorhanden sind.',
-    'required_without'     => ':attribute wird benötigt wenn :value nicht ausgewählt ist.',
+    'present' => ':attribute muss vorhanden sein.',
+    'present_if' => 'Das Feld :attribute muss vorhanden sein, wenn :other :value ist.',
+    'present_unless' => 'Das Feld :attribute muss vorhanden sein, es sei denn, :other ist :value.',
+    'present_with' => 'Das Feld :attribute muss vorhanden sein, wenn :values ​​vorhanden ist.',
+    'present_with_all' => 'Das Feld :attribute muss vorhanden sein, wenn :values ​​vorhanden sind.',
+    'prohibited' => 'Das Feld :attribute ist nicht erlaubt.',
+    'prohibited_if' => 'Das Feld :attribute ist nicht erlaubt, wenn :other :value ist.',
+    'prohibited_unless' => 'Das Feld :attribute ist nicht erlaubt, sofern :other nicht in :values ​​enthalten ist.',
+    'prohibits' => 'Das Feld :attribute verhindert die Anwesenheit von :other.',
+    'regex' => 'Das Format von dem Feld :attribute ist ungültig.',
+    'required' => ':attribute Feld muss ausgefüllt sein.',
+    'required_array_keys' => 'Das Feld :attribute muss Einträge für: :values ​​enthalten.',
+    'required_if' => ':attribute wird benötigt, wenn :other :value entspricht.',
+    'required_if_accepted' => 'Das Feld :attribute ist erforderlich, wenn :other akzeptiert wird.',
+    'required_if_declined' => 'Das Feld :attribute ist erforderlich, wenn :other abgelehnt wird.',
+    'required_unless' => ':attribute ist erforderlich, es sei denn :other ist in :values.',
+    'required_with' => ':attribute wird benötigt wenn :value ausgewählt ist.',
+    'required_with_all' => 'Das Feld :attribute ist erforderlich, wenn :values ​​vorhanden sind.',
+    'required_without' => ':attribute wird benötigt wenn :value nicht ausgewählt ist.',
     'required_without_all' => 'Das: Attributfeld ist erforderlich, wenn keine der folgenden Werte vorhanden sind:',
-    'same'                 => ':attribute und :other müssen übereinstimmen.',
-    'size'                 => [
-        'numeric' => ':attribute muss :size groß sein.',
-        'file'    => ':attribute muss :size Kilobyte groß sein.',
-        'string'  => ':attribute muss :size Zeichen haben.',
-        'array'   => 'Das Attribut muss Folgendes enthalten: Größenelemente.',
+    'same' => 'Das Feld :attribute muss mit :other übereinstimmen.',
+    'size' => [
+        'array' => 'Das Feld :attribute muss :size Elemente enthalten.',
+        'file' => 'Das Feld :attribute muss :size Kilobyte groß sein.',
+        'numeric' => 'Das Feld :attribute muss :size sein.',
+        'string' => 'Das Feld :attribute muss :size Zeichen enthalten.',
     ],
+    'starts_with' => 'Das Feld :attribute muss mit einem der folgenden beginnen: :values.',
     'string'               => 'Das Attribut muss eine Zeichenfolge sein.',
-    'timezone'             => ':attribute muss eine gültige Zeitzone sein.',
     'two_column_unique_undeleted' => ':attribute muss in :table1 und :table2 einzigartig sein. ',
-    'unique'               => ':attribute schon benutzt.',
-    'uploaded'             => ':attribute konnte nicht hochgeladen werden.',
-    'url'                  => ':attribute Format ist ungültig.',
     'unique_undeleted'     => 'Die Variable :attribute muss eindeutig sein.',
     'non_circular'         => 'Das :attribute darf keinen Zirkelbezug ergeben.',
     'not_array'            => ':attribute darf kein Array sein.',
@@ -102,11 +165,14 @@ return [
     'numbers'              => 'Das Passwort muss mindestens eine Zahl beinhalten.',
     'case_diff'            => 'Das Passwort muss Groß- und Kleinschreibung beinhalten.',
     'symbols'              => 'Das Passwort muss Sonderzeichen beinhalten.',
-    'gte'                  => [
-        'numeric'          => 'Wert darf nicht negativ sein'
-    ],
-    'checkboxes'           => ':attribute enthält ungültige Optionen.',
-    'radio_buttons'        => ':attribute ist ungültig.',
+    'timezone' => 'Das Feld :attribute muss eine gültige Zeitzone sein.',
+    'unique' => ':attribute schon benutzt.',
+    'uploaded' => ':attribute konnte nicht hochgeladen werden.',
+    'uppercase' => 'Das Feld :attribute muss groß geschrieben werden.',
+    'url' => 'Das Feld :attribute muss eine gültige URL sein.',
+    'ulid' => 'Das Feld :attribute muss eine gültige ULID sein.',
+    'uuid' => 'Das Feld :attribute muss eine gültige UUID sein.',
+    'fmcs_location' => 'In den Admin-Einstellungen ist eine vollständige Mehrfachunterstützung für Unternehmen und Standortbereicherung aktiviert und der ausgewählte Standort und die ausgewählte Firma sind nicht kompatibel.',
 
 
     /*
@@ -120,16 +186,22 @@ return [
     |
     */
 
+    'email_array'      => 'Eine oder mehrere Email Adressen sind ungültig.',
+    'checkboxes'           => ':attribute enthält ungültige Optionen.',
+    'radio_buttons'        => ':attribute ist ungültig.',
+    
     'custom' => [
         'alpha_space' => 'Das :attribute Feld enthält ein nicht erlaubtes Zeichen.',
-        'email_array'      => 'Eine oder mehrere Email Adressen sind ungültig.',
+
         'hashed_pass'      => 'Ihr derzeitiges Passwort ist nicht korrekt',
         'dumbpwd'          => 'Das Passwort ist zu gebräuchlich.',
         'statuslabel_type' => 'Sie müssen einen gültigen Statuslabel-Typ auswählen',
+        'custom_field_not_found'          => 'Dieses Feld scheint nicht zu existieren. Bitte überprüfen Sie Ihre benutzerdefinierten Feldnamen noch einmal.',
+        'custom_field_not_found_on_model' => 'Dieses Feld scheint vorhanden zu sein, ist aber im Feldsatz dieses Asset-Modells nicht verfügbar.',
 
         // date_format validation with slightly less stupid messages. It duplicates a lot, but it gets the job done :(
-        // We use this because the default error message for date_format is reflects php Y-m-d, which non-PHP
-        // people won't know how to format. 
+        // We use this because the default error message for date_format reflects php Y-m-d, which non-PHP
+        // people won't know how to format.
         'purchase_date.date_format'     => ':attribute muss ein gültiges Datum im Format JJJJ-MM-TT sein',
         'last_audit_date.date_format'   =>  ':attribute muss ein gültiges Datum im Format JJJJ-MM-TT hh:mm:ss sein',
         'expiration_date.date_format'   =>  ':attribute muss ein gültiges Datum im Format JJJJ-MM-TT sein',
@@ -137,9 +209,15 @@ return [
         'expected_checkin.date_format'  =>  ':attribute muss ein gültiges Datum im Format JJJJ-MM-TT sein',
         'start_date.date_format'        =>  ':attribute muss ein gültiges Datum im Format JJJJ-MM-TT sein',
         'end_date.date_format'          =>  ':attribute muss ein gültiges Datum im Format JJJJ-MM-TT sein',
+        'invalid_value_in_field' => 'Ungültiger Wert in diesem Feld enthalten',
 
-    ],
+        'ldap_username_field' => [
+            'not_in' =>         '<code>sAMAccountName</code> (Groß- und Kleinschreibung) funktioniert wahrscheinlich nicht. Sie sollten stattdessen <code>samaccountname</code> (Kleinschreibung) verwenden.'
+        ],
+        'ldap_auth_filter_query' => ['not_in' => '<code>uid=samaccountname</code> ist wahrscheinlich kein gültiger Authentifizierungsfilter. Wahrscheinlich möchten Sie <code>uid=</code> '],
+        'ldap_filter' => ['regex' => 'Dieser Wert sollte wahrscheinlich nicht in Klammern gesetzt werden.'],
 
+        ],
     /*
     |--------------------------------------------------------------------------
     | Custom Validation Attributes
@@ -155,8 +233,16 @@ return [
 
     /*
     |--------------------------------------------------------------------------
-    | Generic Validation Messages
+    | Generic Validation Messages - we use these in the jquery validation where we don't have
+    | access to the :attribute
     |--------------------------------------------------------------------------
     */
-    'invalid_value_in_field' => 'Ungültiger Wert in diesem Feld enthalten',
+
+    'generic' => [
+        'invalid_value_in_field' => 'Ungültiger Wert in diesem Feld enthalten',
+        'required' => 'Dieses Feld ist erforderlich',
+        'email' => 'Bitte geben Sie eine gültige E-Mail-Adresse ein',
+    ],
+
+
 ];
diff --git a/resources/lang/de-if/account/general.php b/resources/lang/de-if/account/general.php
index 1544c4dd26..9bb8fe872f 100644
--- a/resources/lang/de-if/account/general.php
+++ b/resources/lang/de-if/account/general.php
@@ -2,10 +2,16 @@
 
 return array(
     'personal_api_keys' => 'Persönliche API-Schlüssel',
-    'api_key_warning' => 'When generating an API token, be sure to copy it down immediately as they will not be visible to you again.',
+    'personal_access_token' => 'Persönlicher Zugangsschlüssel',
+    'personal_api_keys_success' => 'Persönlicher API-Schlüssel :key erfolgreich erstellt',
+    'here_is_api_key' => 'Hier ist Ihr neuer persönlicher Zugangsschlüssel. Dies ist das einzige Mal, dass er angezeigt wird, also verlieren Sie ihn nicht! Sie können diesen Schlüssel jetzt verwenden, um API-Anfragen zu stellen.',
+    'api_key_warning' => 'Wenn du ein API-Token generierst, stelle sicher, dass du diesen sofort kopierst, da er danach nicht mehr für dich sichtbar sein wird.',
     'api_base_url' => 'Deine API Basis-URL befindet sich unter:',
     'api_base_url_endpoint' => '/&lt;Endpunkt&gt;',
     'api_token_expiration_time' => 'API-Token sollen ablaufen in:',
-    'api_reference' => 'Please check the <a href="https://snipe-it.readme.io/reference" target="_blank">API reference</a> to find specific API endpoints and additional API documentation.',
+    'api_reference' => 'Bitte lese die <a href="https://snipe-it.readme.io/reference" target="_blank">API Dokumentation</a> um Informationen über die verfügbaren API-Endpunkte zu bekommen.',
     'profile_updated' => 'Konto erfolgreich aktualisiert',
+    'no_tokens' => 'Sie haben keine persönlichen Zugangsschlüssel erstellt.',
+    'enable_sounds' => 'Soundeffekte aktivieren',
+    'enable_confetti' => 'Konfetti-Effekte aktivieren',
 );
diff --git a/resources/lang/de-if/admin/accessories/general.php b/resources/lang/de-if/admin/accessories/general.php
index 49915e7979..9aa93ed7ed 100644
--- a/resources/lang/de-if/admin/accessories/general.php
+++ b/resources/lang/de-if/admin/accessories/general.php
@@ -8,7 +8,7 @@ return array(
     'create'  							=> 'Zubehör erstellen',
     'edit'  							=> 'Zubehör bearbeiten',
     'eula_text'							=> 'Kategorie EULA',
-    'eula_text_help'					=> 'Dieses Feld erlaubt Dir, die EULA je nach Asset-Typ anzupassen. Wenn Du nur eine EULA für alle Assets haben möchtest, aktiviere die Checkbox unten, um die Standard-EULA zu verwenden.',
+    'eula_text_help'					=> 'Dieses Feld erlaubt dir, die EULA je nach Asset-Typ anzupassen. Wenn du nur eine EULA für alle Assets haben möchtest, aktiviere die Checkbox unten, um die Standard-EULA zu verwenden.',
     'require_acceptance'				=> 'Benutzer müssen die Annahme von Assets dieser Kategorie bestätigen.',
     'no_default_eula'					=> 'Keine Standard EULA gefunden. Füge eine in den Einstellungen hinzu.',
     'total'  							=> 'Gesamt',
diff --git a/resources/lang/de-if/admin/accessories/message.php b/resources/lang/de-if/admin/accessories/message.php
index 2ffe7d897e..0e3fc8edc5 100644
--- a/resources/lang/de-if/admin/accessories/message.php
+++ b/resources/lang/de-if/admin/accessories/message.php
@@ -17,7 +17,7 @@ return array(
     ),
 
     'delete' => array(
-        'confirm'   => 'Bist Du sicher, dass Du dieses Zubehör löschen möchtest?',
+        'confirm'   => 'Bist du sicher, dass du dieses Zubehör löschen möchtest?',
         'error'   => 'Beim Löschen dieses Zubehörs ist ein Problem aufgetreten. Bitte versuche es erneut.',
         'success' => 'Das Zubehör wurde erfolgreich gelöscht.'
     ),
@@ -26,7 +26,11 @@ return array(
         'error'   		=> 'Zubehör konnte nicht herausgegeben werden. Bitte versuche es erneut',
         'success' 		=> 'Zubehör erfolgreich herausgegeben.',
         'unavailable'   => 'Zubehör ist nicht verfügbar, um herausgegeben zu werden. Prüfe die verfügbare Menge',
-        'user_does_not_exist' => 'Dieser Benutzer ist ungültig. Bitte versuche es erneut.'
+        'user_does_not_exist' => 'Dieser Benutzer ist ungültig. Bitte versuche es erneut.',
+         'checkout_qty' => array(
+            'lte'  => 'Derzeit steht nur ein Zubehörteil dieses Typs zur Verfügung, und Sie versuchen, :checkout_qty auszuleihen. Bitte passen Sie entweder die Ausleihmenge oder den Gesamtbestand dieses Zubehörs an und versuchen Sie es erneut.|Es sind insgesamt :number_currently_remaining verfügbare Zubehörteile vorhanden, und Sie versuchen, :checkout_qty auszuleihen. Bitte passen Sie entweder die Ausleihmenge oder den Gesamtbestand dieses Zubehörs an und versuchen Sie es erneut.',
+            ),
+           
     ),
 
     'checkin' => array(
diff --git a/resources/lang/de-if/admin/accessories/table.php b/resources/lang/de-if/admin/accessories/table.php
index af01edf6b1..af3de34e4e 100644
--- a/resources/lang/de-if/admin/accessories/table.php
+++ b/resources/lang/de-if/admin/accessories/table.php
@@ -6,6 +6,4 @@ return array(
     'id'      					=> 'ID',
     'require_acceptance'      	=> 'Zustimmung',
     'title'      				=> 'Zubehör Name',
-
-
 );
diff --git a/resources/lang/de-if/admin/categories/general.php b/resources/lang/de-if/admin/categories/general.php
index 902e7537ab..4778417939 100644
--- a/resources/lang/de-if/admin/categories/general.php
+++ b/resources/lang/de-if/admin/categories/general.php
@@ -11,7 +11,7 @@ return array(
     'email_will_be_sent_due_to_global_eula' => 'Eine E-Mail wird an den Benutzer gesendet, da die globale EULA verwendet wird.',
     'email_will_be_sent_due_to_category_eula' => 'Eine E-Mail wird an den Benutzer gesendet, da eine EULA für diese Kategorie festgelegt ist.',
     'eula_text'							=> 'Kategorie EULA',
-    'eula_text_help'					=> 'Dieses Feld erlaubt Dir, die EULA je nach Asset-Typ anzupassen. Wenn Du nur eine EULA für alle Assets haben möchtest, aktiviere die Checkbox unten, um die Standard-EULA zu verwenden.',
+    'eula_text_help'					=> 'Dieses Feld erlaubt dir, die EULA je nach Asset-Typ anzupassen. Wenn du nur eine EULA für alle Assets haben möchtest, aktiviere die Checkbox unten, um die Standard-EULA zu verwenden.',
     'name'                              => 'Kategoriename',
     'require_acceptance'				=> 'Benutzer müssen die Annahme von Assets dieser Kategorie bestätigen.',
     'required_acceptance'				=> 'Dieser Benutzer erhält eine E-Mail zur Bestätigung der Annahme des Gegenstands.',
diff --git a/resources/lang/de-if/admin/categories/message.php b/resources/lang/de-if/admin/categories/message.php
index bac81f0a6f..107bb3ccb1 100644
--- a/resources/lang/de-if/admin/categories/message.php
+++ b/resources/lang/de-if/admin/categories/message.php
@@ -18,7 +18,7 @@ return array(
     ),
 
     'delete' => array(
-        'confirm'   => 'Bist Du sicher, dass Du diese Kategorie löschen willst?',
+        'confirm'   => 'Bist Du sicher, dass du diese Kategorie löschen willst?',
         'error'   => 'Beim löschen der Kategorie ist ein Problem aufgetreten. Bitte versuche es erneut.',
         'success' => 'Die Kategorie wurde erfolgreich gelöscht.'
     )
diff --git a/resources/lang/de-if/admin/companies/message.php b/resources/lang/de-if/admin/companies/message.php
index 75a2b72cae..8c268f707f 100644
--- a/resources/lang/de-if/admin/companies/message.php
+++ b/resources/lang/de-if/admin/companies/message.php
@@ -13,7 +13,7 @@ return [
         'success' => 'Firma erfolgreich aktualisiert.',
     ],
     'delete' => [
-        'confirm' => 'Bist Du sicher, dass Du diese Firma löschen willst?',
+        'confirm' => 'Bist du sicher, dass du diese Firma löschen willst?',
         'error'   => 'Es gab ein Problem beim Löschen der Firma. Bitte versuche es erneut.',
         'success' => 'Die Firma wurde erfolgreich gelöscht.',
     ],
diff --git a/resources/lang/de-if/admin/components/message.php b/resources/lang/de-if/admin/components/message.php
index 5466746668..bbed55a0a2 100644
--- a/resources/lang/de-if/admin/components/message.php
+++ b/resources/lang/de-if/admin/components/message.php
@@ -15,9 +15,10 @@ return array(
     ),
 
     'delete' => array(
-        'confirm'   => 'Bist Du sicher, dass Du diese Komponente löschen möchtest?',
+        'confirm'   => 'Bist du sicher, dass du diese Komponente löschen möchtest?',
         'error'   => 'Es gab ein Problem beim Löschen der Firma. Bitte versuche es erneut.',
-        'success' => 'Die Komponente wurde erfolgreich gelöscht.'
+        'success' => 'Die Komponente wurde erfolgreich gelöscht.',
+        'error_qty'   => 'Einige Komponenten dieses Typs sind noch herausgegeben. Bitte nehmen Sie sie zurück und versuchen Sie es erneut.',
     ),
 
      'checkout' => array(
diff --git a/resources/lang/de-if/admin/consumables/general.php b/resources/lang/de-if/admin/consumables/general.php
index ce5fc13d38..6c036427b4 100644
--- a/resources/lang/de-if/admin/consumables/general.php
+++ b/resources/lang/de-if/admin/consumables/general.php
@@ -8,4 +8,5 @@ return array(
     'remaining' 			            => 'Verbleibend',
     'total' 			                => 'Gesamt',
     'update'                            => 'Verbrauchsmaterial aktualisieren',
+    'inventory_warning'                 => 'Der Bestand des Verbrauchsmaterials liegt unter der Mindestmenge von :min_count',
 );
diff --git a/resources/lang/de-if/admin/consumables/message.php b/resources/lang/de-if/admin/consumables/message.php
index 45d5e12bb4..99929088ab 100644
--- a/resources/lang/de-if/admin/consumables/message.php
+++ b/resources/lang/de-if/admin/consumables/message.php
@@ -2,6 +2,7 @@
 
 return array(
 
+    'invalid_category_type' => 'Die Kategorie muss eine Kategorie mit Verbrauchsmaterialien sein.',
     'does_not_exist' => 'Verbrauchsmaterial existiert nicht.',
 
     'create' => array(
@@ -15,7 +16,7 @@ return array(
     ),
 
     'delete' => array(
-        'confirm'   => 'Bist Du sicher, dass Du dieses Verbrauchsmaterial löschen möchtest?',
+        'confirm'   => 'Bist du sicher, dass du dieses Verbrauchsmaterial löschen möchtest?',
         'error'   => 'Es gab ein Problem beim Löschen des Verbrauchsmaterials. Bitte versuche es erneut.',
         'success' => 'Das Verbrauchsmaterial wurde erfolgreich gelöscht.'
     ),
diff --git a/resources/lang/de-if/admin/custom_fields/general.php b/resources/lang/de-if/admin/custom_fields/general.php
index 940ef407bd..4e4b8dc6d6 100644
--- a/resources/lang/de-if/admin/custom_fields/general.php
+++ b/resources/lang/de-if/admin/custom_fields/general.php
@@ -5,7 +5,7 @@ return [
     'manage'                    => 'Verwalten',
     'field'		                => 'Feld',
     'about_fieldsets_title'		=> 'Über Feldsätze',
-    'about_fieldsets_text'		=> 'Ein Feldsatz ist eine Gruppe von benutzerdefinierten Feldern, die häufig für bestimmte Asset-Modelltypen wiederverwendet werden.',
+    'about_fieldsets_text'		=> 'Feldsätze sind Gruppen von benutzerdefinierten Feldern, die häufig für bestimmte Asset-Modelltypen wiederverwendet werden.',
     'custom_format'             => 'Benutzerdefiniertes Regex-Format...',
     'encrypt_field'      	        => 'Den Wert dieses Feldes in der Datenbank verschlüsseln',
     'encrypt_field_help'      => 'WARNUNG: Ein verschlüsseltes Feld kann nicht durchsucht werden.',
@@ -21,7 +21,7 @@ return [
     'field_element_short'     => 'Element',
     'field_format'            => 'Format',
     'field_custom_format'     => 'Benutzerdefiniertes Regex-Format',
-    'field_custom_format_help'     => 'In diesem Feld kannst Du einen Regex-Ausdruck zur Validierung verwenden. Er sollte mit "regex:" beginnen. Um beispielsweise zu validieren, dass ein benutzerdefiniertes Feld eine gültige IMEI (15 numerische Ziffern) enthält, würdest Du <code>regex:/^[0-9]{15}$/</code> nutzen.',
+    'field_custom_format_help'     => 'In diesem Feld kannst du einen Regex-Ausdruck zur Validierung verwenden. Er sollte mit "regex:" beginnen. Um beispielsweise zu validieren, dass ein benutzerdefiniertes Feld eine gültige IMEI (15 numerische Ziffern) enthält, würdest du <code>regex:/^[0-9]{15}$/</code> nutzen.',
     'required'   		          => 'Pflichtfeld',
     'req'   		              => 'Erf.',
     'used_by_models'   		    => 'Von Modellen benutzt',
@@ -35,7 +35,7 @@ return [
     'create_field_title' => 'Neues benutzerdefiniertes Feld erstellen',
     'value_encrypted'      	        => 'Der Wert dieses Feldes ist in der Datenbank verschlüsselt. Nur Benutzer mit Administratorrechten können den entschlüsselten Wert anzeigen',
     'show_in_email'     => 'Feld miteinbeziehen bei Herausgabe-Emails an die Benutzer? Verschlüsselte Felder können nicht miteinbezogen werden',
-    'show_in_email_short'     => 'In E-Mails einbeziehen.',
+    'show_in_email_short' => 'In E-Mails einbeziehen',
     'help_text' => 'Hilfetext',
     'help_text_description' => 'Dies ist ein optionaler Text, der unter den Formularelementen erscheint, während eine Datei bearbeitet wird, um Kontext für das Feld bereitzustellen.',
     'about_custom_fields_title' => 'Über benutzerdefinierte Felder',
@@ -57,5 +57,8 @@ return [
     'show_in_requestable_list_short' => 'In anforderbarer Asset-Liste anzeigen',
     'show_in_requestable_list' => 'Wert in der anforderbaren Asset-Liste anzeigen. Verschlüsselte Felder werden nicht angezeigt',
     'encrypted_options' => 'Dieses Feld ist verschlüsselt, so dass einige Display-Optionen nicht verfügbar sind.',
+    'display_checkin' => 'In Check-in-Formularen anzeigen',
+    'display_checkout' => 'In Check-out-Formularen anzeigen',
+    'display_audit' => 'In Audit-Formularen anzeigen',
 
 ];
diff --git a/resources/lang/de-if/admin/custom_fields/message.php b/resources/lang/de-if/admin/custom_fields/message.php
index ab3325bb3f..9b26b128ac 100644
--- a/resources/lang/de-if/admin/custom_fields/message.php
+++ b/resources/lang/de-if/admin/custom_fields/message.php
@@ -5,6 +5,7 @@ return array(
     'field' => array(
         'invalid'   => 'Dieses Feld existiert nicht.',
         'already_added'   => 'Feld wurde bereits hinzugefügt',
+        'none_selected'   => 'Kein Feld ausgewählt',
 
         'create' => array(
             'error'   => 'Feld wurde nicht erstellt. Bitte versuche es erneut.',
@@ -18,7 +19,7 @@ return array(
         ),
 
         'delete' => array(
-            'confirm'   	=> 'Bist Du sicher, dass Du dieses Feld löschen möchtest?',
+            'confirm'   	=> 'Bist du sicher, dass du dieses Feld löschen möchtest?',
             'error'   => 'Beim Löschen des Felds ist ein Fehler aufgetreten. Bitte versuche es erneut.',
             'success' => 'Das Feld wurde erfolgreich gelöscht.',
             'in_use'   => 'Dieses Feld wird derzeit noch verwendet.',
@@ -41,7 +42,7 @@ return array(
         ),
 
         'delete' => array(
-            'confirm'   	=> 'Bist Du sicher, dass Du diesen Feldsatz löschen möchten?',
+            'confirm'   	=> 'Bist du sicher, dass du diesen Feldsatz löschen möchten?',
             'error'   => 'Beim Löschen des Feldsatzes ist ein Fehler aufgetreten. Bitte versuche es erneut.',
             'success' => 'Der Feldsatz wurde erfolgreich gelöscht.',
             'in_use'   => 'Dieser Feldsatz wird derzeit noch verwendet.',
diff --git a/resources/lang/de-if/admin/departments/message.php b/resources/lang/de-if/admin/departments/message.php
index 07ee07e1d9..fdec3cffcd 100644
--- a/resources/lang/de-if/admin/departments/message.php
+++ b/resources/lang/de-if/admin/departments/message.php
@@ -14,7 +14,7 @@ return array(
         'success' => 'Abteilung wurde erfolgreich aktualisiert.'
     ),
     'delete' => array(
-        'confirm'   	=> 'Bist Du sicher, dass Du diese Abteilung löschen möchtest?',
+        'confirm'   	=> 'Bist du sicher, dass du diese Abteilung löschen möchtest?',
         'error'   => 'Beim Löschen der Abteilung ist ein Fehler aufgetreten. Bitte versuche es erneut.',
         'success' => 'Die Abteilung wurde erfolgreich gelöscht.'
     )
diff --git a/resources/lang/de-if/admin/depreciations/general.php b/resources/lang/de-if/admin/depreciations/general.php
index a8dc33c9bb..e4ef727867 100644
--- a/resources/lang/de-if/admin/depreciations/general.php
+++ b/resources/lang/de-if/admin/depreciations/general.php
@@ -13,4 +13,8 @@ return [
     'no_depreciations_warning'               => '<strong>Warnung: </strong>
                       Du hast derzeit keine Abschreibungen eingerichtet.
                       Bitte richte mindestens eine Abschreibung ein, um den Abschreibungsbericht anzuzeigen.',
+    'depreciation_method'                   => 'Abschreibungsbericht',
+    'linear_depreciation'                   => 'Linear (Standard)',
+    'half_1'                                => 'Halbjahreskonvention, immer angewendet',
+    'half_2'                                => 'Halbjahreskonvention, mit Bedingung angewendet',
 ];
diff --git a/resources/lang/de-if/admin/depreciations/message.php b/resources/lang/de-if/admin/depreciations/message.php
index d8231c8810..a582bd8235 100644
--- a/resources/lang/de-if/admin/depreciations/message.php
+++ b/resources/lang/de-if/admin/depreciations/message.php
@@ -17,7 +17,7 @@ return array(
     ),
 
     'delete' => array(
-        'confirm'   => 'Bist Du sicher, dass Du diese Abschreibungsklasse löschen willst?',
+        'confirm'   => 'Bist du sicher, dass du diese Abschreibungsklasse löschen willst?',
         'error'   => 'Beim Löschen der Abschreibungsklasse ist ein Problem aufgetreten. Bitte versuche es erneut.',
         'success' => 'Die Abschreibungsklasse wurde erfolgreich gelöscht.'
     )
diff --git a/resources/lang/de-if/admin/groups/message.php b/resources/lang/de-if/admin/groups/message.php
index 1a7357a236..9675e85156 100644
--- a/resources/lang/de-if/admin/groups/message.php
+++ b/resources/lang/de-if/admin/groups/message.php
@@ -13,7 +13,7 @@ return array(
     ),
 
     'delete' => array(
-        'confirm'   => 'Bist Du sicher, dass Du die Gruppe löschen willst?',
+        'confirm'   => 'Bist du sicher, dass du diese Gruppe löschen möchtest?',
         'create' => 'Beim Erstellen der Gruppe ist ein Fehler aufgetreten. Bitte versuche es erneut.',
         'update' => 'Beim Aktualisieren der Gruppe ist ein Fehler aufgetreten. Bitte versuche es erneut.',
         'delete' => 'Beim Löschen der Gruppe ist ein Fehler aufgetreten. Bitte versuche es erneut.',
diff --git a/resources/lang/de-if/admin/hardware/form.php b/resources/lang/de-if/admin/hardware/form.php
index ad83aed39b..1e422cc588 100644
--- a/resources/lang/de-if/admin/hardware/form.php
+++ b/resources/lang/de-if/admin/hardware/form.php
@@ -8,7 +8,7 @@ return [
   'bulk_delete_warn'	=> 'Du bist im Begriff :asset_count Assets zu löschen.',
   'bulk_restore_warn'	=> 'Sie sind dabei, :asset_count Assets wiederherzustellen.',
     'bulk_update'		=> 'Massenaktualisierung von Assets',
-    'bulk_update_help'	=> 'Diese Eingabemaske erlaubt Dir die Aktualisierung von mehreren Assets zugleich. Fülle die Felder aus, die Du ändern möchtest. Alle leeren Felder bleiben unverändert. ',
+    'bulk_update_help'	=> 'Diese Eingabemaske erlaubt dir die Aktualisierung von mehreren Assets zugleich. Fülle die Felder aus, die du ändern möchtest. Alle leeren Felder bleiben unverändert. ',
     'bulk_update_warn'	=> 'Du bearbeitest die Eigenschaften eines Assets.|Du bearbeitest die Eigenschaften von :asset_count Assets.',
     'bulk_update_with_custom_field' => 'Beachte, dass die Assets :asset_model_count verschiedene Arten von Modellen sind.',
     'bulk_update_model_prefix' => 'Auf Modellen', 
@@ -39,9 +39,9 @@ return [
     'order'				=> 'Auftragsnummer',
     'qr'				=> 'QR-Code',
     'requestable'		=> 'Benutzer dürfen dieses Asset anfordern',
-    'redirect_to_all'   => 'Return to all :type',
-    'redirect_to_type'   => 'Go to :type',
-    'redirect_to_checked_out_to'   => 'Go to Checked Out to',
+    'redirect_to_all'   => 'Zurück zu allen :type',
+    'redirect_to_type'   => 'Gehe zu :type',
+    'redirect_to_checked_out_to'   => 'Gehe von herausgegeben zu',
     'select_statustype'	=> 'Status Typ auswählen',
     'serial'			=> 'Seriennummer',
     'status'			=> 'Status',
@@ -55,8 +55,11 @@ return [
     'asset_location_update_default' => 'Nur den Standardort aktualisieren',
     'asset_location_update_actual' => 'Nur eigentlichen Standort aktualisieren',
     'asset_not_deployable' => 'Dieses Asset ist nicht verfügbar und kann nicht herausgegeben werden.',
-    'asset_deployable' => 'Dieses Asset ist verfügbar und kann herausgegeben werden.',
+    'asset_not_deployable_checkin' => 'Dieser Asset-Status ist nicht einsetzbar, da mit diesem das Asset eingecheckt wird.',
+    'asset_deployable' => 'Dieses Asset kann herausgegeben werden.',
     'processing_spinner' => 'Verarbeitung... (Dies kann bei großen Dateien etwas Zeit in Anspruch nehmen)',
+    'processing' => 'Wird verarbeitet... ',
     'optional_infos'  => 'Optionale Informationen',
-    'order_details'   => 'Bestellinformationen'
+    'order_details'   => 'Bestellinformationen',
+    'calc_eol'    => 'Wenn du das EOL-Datum auf Null setzt, dann verwende die automatische EOL-Berechnung basierend auf dem Kaufdatum und der EOL-Rate.',
 ];
diff --git a/resources/lang/de-if/admin/hardware/general.php b/resources/lang/de-if/admin/hardware/general.php
index 841cbf995f..67c082f396 100644
--- a/resources/lang/de-if/admin/hardware/general.php
+++ b/resources/lang/de-if/admin/hardware/general.php
@@ -2,11 +2,11 @@
 
 return [
     'about_assets_title'           => 'Über Assets',
-    'about_assets_text'            => 'Assets sind Gegenstände die durch eine Seriennummer oder einem Asset-Tag identifiziert werden. Meistens sind diese Gegenstände von höherem Wert, weshalb es Sinn ergibt diese spezifisch zu kennzeichnen.',
+    'about_assets_text'            => 'Assets sind Gegenstände die durch eine Seriennummer oder einem Asset-Tag identifiziert werden. Meistens sind diese Gegenstände von höherem Wert, weshalb es Sinn ergibt, diese spezifisch zu kennzeichnen.',
     'archived'  				=> 'Archiviert',
     'asset'  					=> 'Asset',
-    'bulk_checkout'             => 'Assets herausgeben',
-    'bulk_checkin'              => 'Assets zurücknehmen',
+    'bulk_checkout'             => 'Massenherausgabe',
+    'bulk_checkin'              => 'Massen-Rücknahme',
     'checkin'  					=> 'Asset zurücknehmen',
     'checkout'  				=> 'Asset herausgeben',
     'clone'  					=> 'Asset duplizieren',
@@ -14,7 +14,7 @@ return [
     'deleted'  					=> 'Dieses Asset wurde gelöscht.',
     'delete_confirm'            => 'Bist du sicher, dass du dieses Asset löschen möchtest?',
     'edit'  					=> 'Asset bearbeiten',
-    'model_deleted'  			=> 'Dieses Modell für Assets wurde gelöscht. Du musst das Modell wiederherstellen, bevor Du das Asset wiederherstellen kannst.',
+    'model_deleted'  			=> 'Dieses Modell für Assets wurde gelöscht. Du musst das Modell wiederherstellen, bevor du das Asset wiederherstellen kannst.',
     'model_invalid'             => 'Das Modell für dieses Asset ist ungültig.',
     'model_invalid_fix'         => 'Das Asset muss aktualisiert und ein gültiges Asset-Modell verwendet werden, bevor versucht wird, es ein- oder auszuchecken oder es zu prüfen.',
     'requestable'               => 'Anforderbar',
@@ -27,7 +27,7 @@ return [
     'undeployable_tooltip'  	=> 'Dieses Asset hat eine Statusbezeichnung, die nicht einsetzbar ist und zu diesem Zeitpunkt nicht ausgecheckt werden kann.',
     'view'  					=> 'Asset ansehen',
     'csv_error' => 'Es gibt einen Fehler in der CSV-Datei:',
-    'import_text' => '<p>Laden Sie ein CSV hoch, das Assetverlauf enthält. Die Assets und Benutzer MÜSSEN bereits im System vorhanden oder sie werden übersprungen. Passende Assets für den History-Import geschieht mit dem Asset-Tag. Wir werden versuchen, einen passenden Benutzer zu finden, basierend auf dem von Ihnen angegebenen Benutzernamen und den Kriterien, die Sie unten auswählen. Wenn Sie keine Kriterien unten auswählen, es wird einfach versuchen, auf das Benutzernamensformat zu passen, das Sie in den <code>Admin- &gt; Allgemeine Einstellungen</code>konfiguriert haben.</p><p>Felder, die im CSV enthalten sind, müssen mit den Kopfzeilen übereinstimmen: <strong>Asset Tag, Name, Checkout Datum, Check-in Datum</strong>. Zusätzliche Felder werden ignoriert. </p><p>Check-in Datum: Leer oder zukünftiger Check-in Datum werden Elemente an zugeordnete Benutzer auschecken. Ohne die Spalte Check-in Datum wird ein Datum mit dem heutigen Datum erzeugt.</p>
+    'import_text' => '<p>Lade ein CSV hoch, das den Assetverlauf enthält. Die Assets und Benutzer MÜSSEN bereits im System vorhanden sein oder sie werden übersprungen. Für den Verlaufsimport passende Assets werden über das Asset-Tag zugeordnet. Wir werden versuchen, einen passenden Benutzer, basierend auf dem von Dir angegebenen Benutzernamen und den unten ausgewählten Kriterien, zu finden. Wenn Du keine Kriterien auswählst, wird über das Benutzernamensformat, das Du in <code>Admin- &gt; Allgemeine Einstellungen</code>konfiguriert haben, eine Zuordnung versucht.</p><p>Felder, die in der CSV enthalten sind, müssen mit den Kopfzeilen übereinstimmen: <strong>Asset Tag, Name, Checkout Datum, Check-in Datum</strong>. Zusätzliche Felder werden ignoriert. </p><p>Check-in Datum: Bei leeren oder zukünftigen Check-in Daten werden die Elemente direkt dem genannten User ausgecheckt. Ohne die Spalte Check-in Datum wird das aktuelle Datum gesetzt.</p>
     ',
     'csv_import_match_f-l' => 'Versuchen Sie, Benutzer im <strong>Vorname.Nachname</strong> (<code>jane.smith</code>) Format zu finden',
     'csv_import_match_initial_last' => 'Versuchen Sie, Benutzer im <strong>ersten ersten Nachnamen</strong> (<code>jsmith</code>) Format zu finden',
diff --git a/resources/lang/de-if/admin/hardware/message.php b/resources/lang/de-if/admin/hardware/message.php
index 7fa02be239..00815241d2 100644
--- a/resources/lang/de-if/admin/hardware/message.php
+++ b/resources/lang/de-if/admin/hardware/message.php
@@ -2,19 +2,23 @@
 
 return [
 
-    'undeployable' 		=> '<strong>Achtung:</strong>Dieses Asset wurde kürzlich als nicht verteilbar markiert.
-                        Falls sich dieser Status verändert hat, aktualisiere bitte den Asset Status.',
-    'does_not_exist' 	=> 'Asset existiert nicht.',
-    'does_not_exist_var'=> 'Asset mit Tag :asset_tag nicht gefunden.',
-    'no_tag' 	        => 'Kein Asset Tag angegeben.',
+    'undeployable' 		 => '<strong>Warnung: </strong> Dieses Asset wurde als derzeit nicht einsetzbar markiert. Wenn sich dieser Status geändert hat, aktualisiere bitte den Asset-Status.',
+    'does_not_exist' 	 => 'Asset existiert nicht.',
+    'does_not_exist_var' => 'Asset mit Asset-Tag :asset_tag nicht gefunden.',
+    'no_tag' 	         => 'Kein Asset-Tag angegeben.',
     'does_not_exist_or_not_requestable' => 'Dieses Asset existiert nicht oder kann nicht angefordert werden.',
-    'assoc_users'	 	=> 'Dieses Asset ist im Moment an einen Benutzer herausgegeben und kann nicht entfernt werden. Bitte buche das Asset wieder ein und versuche dann erneut, es zu entfernen. ',
+    'assoc_users'	 	 => 'Dieses Asset ist im Moment an einen Benutzer herausgegeben und kann nicht entfernt werden. Bitte buche das Asset wieder ein und versuche dann erneut, es zu entfernen. ',
     'warning_audit_date_mismatch' 	=> 'Das nächste Prüfdatum dieses Assets (:next_audit_date) liegt vor dem letzten Prüfdatum (:last_audit_date). Bitte aktualisieren Sie das nächste Prüfdatum.',
+    'labels_generated'   => 'Labels wurden erfolgreich generiert.',
+    'error_generating_labels' => 'Fehler beim Generieren der Labels.',
+    'no_assets_selected' => 'Keine Assets ausgewählt.',
 
     'create' => [
         'error'   		=> 'Asset wurde nicht erstellt. Bitte versuche es erneut. :(',
         'success' 		=> 'Asset wurde erfolgreich erstellt. :)',
         'success_linked' => 'Asset mit Tag :tag wurde erfolgreich erstellt. <strong><a href=":link" style="color: white;">Klicke hier, um</a></strong> anzuzeigen.',
+        'multi_success_linked' => 'Asset mit Tag :links wurde erfolgreich erstellt.|:count Assets wurden erfolgreich erstellt. :links.',
+        'partial_failure' => 'Ein Asset konnte nicht erstellt werden. Grund: :failures|:count Assets konnten nicht erstellt werden. Gründe: :failures',
     ],
 
     'update' => [
@@ -47,25 +51,29 @@ return [
     'upload' => [
         'error'   => 'Datei(en) wurde(n) nicht hochgeladen. Bitte versuche es erneut.',
         'success' => 'Datei(en) wurden erfolgreich hochgeladen.',
-        'nofiles' => 'Du hast keine Datei zum Hochladen ausgewählt, oder die Datei, die Du hochladen möchtest, ist zu groß',
+        'nofiles' => 'Du hast keine Datei zum Hochladen ausgewählt, oder die Datei, die du hochladen möchtest, ist zu groß',
         'invalidfiles' => 'Eine oder mehrere Deiner Dateien sind zu groß, oder deren Dateityp ist nicht zugelassen. Zugelassene Dateitypen sind png, gif, jpg, doc, docx, pdf, und txt.',
     ],
 
     'import' => [
+        'import_button'         => 'Importvorgang',
         'error'                 => 'Einige Elemente wurden nicht korrekt importiert.',
         'errorDetail'           => 'Die folgenden Elemente wurden aufgrund von Fehlern nicht importiert.',
         'success'               => 'Deine Datei wurde importiert',
         'file_delete_success'   => 'Deine Datei wurde erfolgreich gelöscht',
         'file_delete_error'      => 'Die Datei konnte nicht gelöscht werden',
         'file_missing' => 'Die ausgewählte Datei fehlt',
+        'file_already_deleted' => 'Die ausgewählte Datei wurde bereits gelöscht',
         'header_row_has_malformed_characters' => 'Ein oder mehrere Attribute in der Kopfzeile enthalten fehlerhafte UTF-8 Zeichen',
         'content_row_has_malformed_characters' => 'Ein oder mehrere Attribute in der ersten Zeile des Inhalts enthalten fehlerhafte UTF-8-Zeichen',
+        'transliterate_failure' => 'Umschreibung von :encoding nach UTF-8 fehlgeschlagen wegen ungültiger Zeichen in Eingabe'
     ],
 
 
     'delete' => [
-        'confirm'   	=> 'Bist Du sicher, dass Du dieses Asset entfernen möchtest?',
+        'confirm'   	=> 'Bist du sicher, dass du dieses Asset entfernen möchtest?',
         'error'   		=> 'Beim Entfernen dieses Assets ist ein Fehler aufgetreten. Bitte versuche es erneut.',
+        'assigned_to_error' => '{1}Asset Tag: :asset_tag ist derzeit ausgebucht. Überprüfe dieses Gerät bevor Du es löschst. [2,*]Asset Tags: :asset_tag sind derzeit ausgebucht. Überprüfe diese Geräte bevor Du sie löschst.',
         'nothing_updated'   => 'Es wurden keine Assets ausgewählt, somit wurde auch nichts gelöscht.',
         'success' 		=> 'Dass Asset wurde erfolgreich entfernt.',
     ],
@@ -78,6 +86,11 @@ return [
         'no_assets_selected' => 'Du musst mindestens ein Asset aus der Liste auswählen',
     ],
 
+    'multi-checkout' => [
+        'error'   => 'Asset wurde nicht ausgecheckt, bitte versuche es erneut.|Assets wurden nicht ausgecheckt, bitte versuche es erneut',
+        'success' => 'Asset erfolgreich ausgecheckt.|Assets erfolgreich ausgecheckt.',
+    ],
+
     'checkin' => [
         'error'   		=> 'Asset konnte nicht zurückgenommen werden. Bitte versuche es erneut',
         'success' 		=> 'Asset wurde erfolgreich zurückgenommen.',
@@ -87,9 +100,10 @@ return [
     ],
 
     'requests' => [
-        'error'   		=> 'Das Asset wurde nicht angefordert, bitte versuche es erneut',
-        'success' 		=> 'Asset erfolgreich angefordert.',
-        'canceled'      => 'Herausgeben erfolgreich abgebrochen',
+        'error'   		=> 'Das Asset wurde nicht angefordert, bitte versuche es erneut.',
+        'success' 		=> 'Anfrage erfolgreich eingereicht.',
+        'canceled'      => 'Anfrage erfolgreich abgebrochen.',
+        'cancel'        => 'Storniere diese Gegenstandanfrage',
     ],
 
 ];
diff --git a/resources/lang/de-if/admin/hardware/table.php b/resources/lang/de-if/admin/hardware/table.php
index 633dc2d671..e53d3865b3 100644
--- a/resources/lang/de-if/admin/hardware/table.php
+++ b/resources/lang/de-if/admin/hardware/table.php
@@ -25,7 +25,6 @@ return [
     'image'		    => 'Geräte-Bild',
     'days_without_acceptance' => 'Tage ohne Akzeptierung',
     'monthly_depreciation' => 'Monatliche Abschreibung',
-    'assigned_to'    => 'Zugewiesen an',
     'requesting_user' => 'Benutzer anfordern',
     'requested_date' => 'Anfragedatum',
     'changed'       => 'Geändert',
diff --git a/resources/lang/de-if/admin/kits/general.php b/resources/lang/de-if/admin/kits/general.php
index 32471ce001..024d8605e6 100644
--- a/resources/lang/de-if/admin/kits/general.php
+++ b/resources/lang/de-if/admin/kits/general.php
@@ -2,7 +2,7 @@
 
 return [
     'about_kits_title'                  => 'Über vordefinierte Kits',
-    'about_kits_text'                   => 'Mit vordefinierten Kits kannst Du schnell eine Sammlung von Elementen (Assets, Lizenzen, etc.) an einen Benutzer ausgeben. Dies kann hilfreich sein, wenn Ihr Onboarding-Prozess über viele Nutzer hinweg einheitlich ist und alle Nutzer die gleichen Artikel erhalten.',
+    'about_kits_text'                   => 'Mit vordefinierten Kits kannst du schnell eine Sammlung von Elementen (Assets, Lizenzen, etc.) an einen Benutzer ausgeben. Dies kann hilfreich sein, wenn dein Onboarding-Prozess über viele Nutzer hinweg einheitlich ist und alle Nutzer die gleichen Artikel erhalten.',
     'checkout'                          => 'Kit herausgeben ',
     'create_success'                    => 'Kit wurde erfolgreich erstellt.',
     'create'                            => 'Vordefiniertes Kit erstellen',
@@ -47,4 +47,5 @@ return [
     'kit_deleted'                       => 'Kit wurde erfolgreich gelöscht',
     'kit_model_updated'                 => 'Modell wurde erfolgreich aktualisiert',
     'kit_model_detached'                => 'Modell wurde erfolgreich gelöst',
+    'model_already_attached'            => 'Dieses Modell ist bereits einem Kit zugewiesen',
 ];
diff --git a/resources/lang/de-if/admin/licenses/general.php b/resources/lang/de-if/admin/licenses/general.php
index 5ece023c34..2bf14b95f8 100644
--- a/resources/lang/de-if/admin/licenses/general.php
+++ b/resources/lang/de-if/admin/licenses/general.php
@@ -14,6 +14,7 @@ return array(
     'info'  					=> 'Lizenzinfo',
     'license_seats'  			=> 'Lizenzaktivierungen',
     'seat'  					=> 'Lizenz',
+    'seat_count'  				=> 'Platz :count',
     'seats'  					=> 'Lizenzen',
     'software_licenses'  		=> 'Software Lizenzen',
     'user'  					=> 'Benutzer',
@@ -23,12 +24,12 @@ return array(
         [
             'checkin_all'           => [
                 'button'            => 'Alle Plätze zurücknehmen',
-                'modal'             => 'Diese Aktion wird einen Sitz zurücknehmen. | Diese Aktion wird alle :checkedout_seats_count Plätze für diese Lizenz zurücknehmen.',
+                'modal'             => 'Diese Aktion wird einen Platz einchecken. | Diese Aktion wird alle :checkedout_seats_count Plätze dieser Lizenz einchecken.',
                 'enabled_tooltip'   => 'ALLE Plätze für diese Lizenz zurücknehmen, sowohl von Benutzern als auch von Assets',
                 'disabled_tooltip'  => 'Es ist deaktiviert, da derzeit keine Plätze zum herausgegeben verfügbar sind',
                 'disabled_tooltip_reassignable'  => 'Dies ist deaktiviert, da die Lizenz nicht zuweisbar ist',
                 'success'           => 'Lizenz erfolgreich zurückgenommen! | Alle Lizenzen wurden erfolgreich zurückgenommen!',
-                'log_msg'           => 'Zurückgenommen über Massen-Zurücknehmen in der Lizenzübersicht',
+                'log_msg'           => 'Über die Massenrückgabe in der Lizenz-Benutzeroberfläche eingebucht',
             ],
 
             'checkout_all'              => [
diff --git a/resources/lang/de-if/admin/licenses/message.php b/resources/lang/de-if/admin/licenses/message.php
index a4938e9a4f..df0ed3a999 100644
--- a/resources/lang/de-if/admin/licenses/message.php
+++ b/resources/lang/de-if/admin/licenses/message.php
@@ -2,10 +2,10 @@
 
 return array(
 
-    'does_not_exist' => 'Die Lizenz existiert nicht oder Du hast keine Berechtigung, sie anzusehen.',
+    'does_not_exist' => 'Die Lizenz existiert nicht oder du hast keine Berechtigung, sie anzusehen.',
     'user_does_not_exist' => 'Benutzer existiert nicht oder Sie haben keine Berechtigung, sie anzusehen.',
-    'asset_does_not_exist' 	=> 'Der Gegenstand, mit dem Du diese Lizenz verknüpfen möchtest, existiert nicht.',
-    'owner_doesnt_match_asset' => 'Der Gegenstand, den Du mit dieser Lizenz verknüpfen möchtest, gehört jemand anderem als der im Dropdown-Feld ausgewählten Person.',
+    'asset_does_not_exist' 	=> 'Der Gegenstand, mit dem du diese Lizenz verknüpfen möchtest, existiert nicht.',
+    'owner_doesnt_match_asset' => 'Der Gegenstand, den du mit dieser Lizenz verknüpfen möchtest, gehört jemand anderem als der im Dropdown-Feld ausgewählten Person.',
     'assoc_users'	 => 'Diese Lizenz ist derzeit einem Benutzer zugeordnet und kann nicht gelöscht werden. Bitte nimm die Lizenz zurück und versuche anschließend erneut, diese zu löschen. ',
     'select_asset_or_person' => 'Du musst ein Asset oder einen Benutzer auswählen, aber nicht beides.',
     'not_found' => 'Lizenz nicht gefunden',
@@ -25,7 +25,7 @@ return array(
     'upload' => array(
         'error'   => 'Datei(en) wurde(n) nicht hochgeladen. Bitte versuche es erneut.',
         'success' => 'Datei(en) wurden erfolgreich hochgeladen.',
-        'nofiles' => 'Du hast keine Datei zum Hochladen ausgewählt, oder die Datei, die Du hochladen möchtest, ist zu groß',
+        'nofiles' => 'Du hast keine Datei zum Hochladen ausgewählt, oder die Datei, die du hochladen möchtest, ist zu groß',
         'invalidfiles' => 'Eine oder mehrere Deiner Dateien sind zu groß oder ist ein Dateityp, der nicht zulässig ist. Erlaubte Dateitypen sind png, gif, jpg, jpeg, doc, docx, pdf, txt, zip, rar, rtf, xml und lic.',
     ),
 
@@ -35,7 +35,7 @@ return array(
     ),
 
     'delete' => array(
-        'confirm'   => 'Bist Du sicher, dass Du diese Lizenz löschen willst?',
+        'confirm'   => 'Bist du sicher, dass du diese Lizenz löschen willst?',
         'error'   => 'Beim Löschen der Lizenz ist ein Problem aufgetreten. Bitte versuche es erneut.',
         'success' => 'Die Lizenz wurde erfolgreich gelöscht.'
     ),
@@ -44,10 +44,13 @@ return array(
         'error'   => 'Lizenz wurde nicht herausgegeben, bitte versuche es erneut.',
         'success' => 'Lizenz wurde erfolgreich herausgegeben',
         'not_enough_seats' => 'Nicht genügend Lizenz-Plätze zur Herausgabe verfügbar',
+        'mismatch' => 'Die bereitgestellte Lizenzplatzierung entspricht nicht der Lizenz',
+        'unavailable' => 'Dieser Platz ist nicht zur Ausleihe verfügbar.',
     ),
 
     'checkin' => array(
         'error'   => 'Lizenz wurde nicht zurückgenommen, bitte versuche es erneut.',
+        'not_reassignable' => 'Lizenz nicht neu zuweisbar',
         'success' => 'Die Lizenz wurde erfolgreich zurückgenommen'
     ),
 
diff --git a/resources/lang/de-if/admin/locations/message.php b/resources/lang/de-if/admin/locations/message.php
index cba3b0b1af..f62f15abf4 100644
--- a/resources/lang/de-if/admin/locations/message.php
+++ b/resources/lang/de-if/admin/locations/message.php
@@ -3,11 +3,12 @@
 return array(
 
     'does_not_exist' => 'Standort existiert nicht.',
-    'assoc_users'    => 'This location is not currently deletable because it is the location of record for at least one asset or user, has assets assigned to it, or is the parent location of another location. Please update your models to no longer reference this company and try again. ',
+    'assoc_users'    => 'Dieser Standort kann derzeit nicht gelöscht werden, da er der Standort eines Datensatzes für mindestens ein Asset oder einen Benutzer ist, ihm Assets zugewiesen sind oder er der übergeordnete Standort eines anderen Standorts ist. Aktualisiere Deine Datensätze, sodass dieser Standort nicht mehr referenziert wird, und versuche es erneut ',
     'assoc_assets'	 => 'Dieser Standort ist mindestens einem Gegenstand zugewiesen und kann nicht gelöscht werden. Bitte entferne die Standortzuweisung bei den jeweiligen Gegenständen und versuche erneut, diesen Standort zu entfernen. ',
     'assoc_child_loc'	 => 'Dieser Standort ist mindestens einem anderen Ort übergeordnet und kann nicht gelöscht werden. Bitte aktualisiere Deine Standorte, so dass dieser Standort nicht mehr verknüpft ist, und versuche es erneut. ',
     'assigned_assets' => 'Zugeordnete Assets',
     'current_location' => 'Aktueller Standort',
+    'open_map' => 'Öffnen in :map_provider_icon Karten',
 
 
     'create' => array(
@@ -20,8 +21,13 @@ return array(
         'success' => 'Standort erfolgreich aktualisiert.'
     ),
 
+    'restore' => array(
+        'error'   => 'Der Standort wurde nicht wiederhergestellt. Bitte versuche es erneut',
+        'success' => 'Standort erfolgreich wiederhergestellt.'
+    ),
+
     'delete' => array(
-        'confirm'   	=> 'Bist Du sicher, dass Du diesen Standort löschen willst?',
+        'confirm'   	=> 'Bist du sicher, dass du diesen Standort löschen willst?',
         'error'   => 'Es gab einen Fehler beim Löschen des Standorts. Bitte erneut versuchen.',
         'success' => 'Der Standort wurde erfolgreich gelöscht.'
     )
diff --git a/resources/lang/de-if/admin/locations/table.php b/resources/lang/de-if/admin/locations/table.php
index 332dba7a59..048991ffb9 100644
--- a/resources/lang/de-if/admin/locations/table.php
+++ b/resources/lang/de-if/admin/locations/table.php
@@ -39,4 +39,5 @@ return [
     'signed_by_finance_auditor' => 'Unterschrieben von (Finanzprüfer):',
     'signed_by_location_manager' => 'Unterschrieben von (Standortmanager):',
     'signed_by'                 => 'Unterschrieben von:',
+    'clone'  					=> 'Standort klonen',
 ];
diff --git a/resources/lang/de-if/admin/manufacturers/message.php b/resources/lang/de-if/admin/manufacturers/message.php
index 6255e5e845..5c8318dfcc 100644
--- a/resources/lang/de-if/admin/manufacturers/message.php
+++ b/resources/lang/de-if/admin/manufacturers/message.php
@@ -22,7 +22,7 @@ return array(
     ),
 
     'delete' => array(
-        'confirm'   => 'Bist Du sicher, dass Du diesen Hersteller löschen willst?',
+        'confirm'   => 'Bist du sicher, dass du diesen Hersteller löschen willst?',
         'error'   => 'Beim löschen des Herstellers ist ein Problem aufgetreten. Bitte versuche es erneut.',
         'success' => 'Der Hersteller wurde erfolgreich gelöscht.'
     )
diff --git a/resources/lang/de-if/admin/manufacturers/table.php b/resources/lang/de-if/admin/manufacturers/table.php
index f3df7aed63..17ca29500d 100644
--- a/resources/lang/de-if/admin/manufacturers/table.php
+++ b/resources/lang/de-if/admin/manufacturers/table.php
@@ -2,7 +2,7 @@
 
 return array(
     'about_manufacturers_title'    => 'Über Hersteller',
-    'about_manufacturers_text'  => 'Hersteller sind die Firmen, die Deine Assets herstellen. Hier kannst Du wichtige Supportkontakte eintragen, die in den Assetdetails angezeigt werden.',
+    'about_manufacturers_text'  => 'Hersteller sind die Firmen, die deine Assets herstellen. Hier kannst du wichtige Support-Kontaktinformationen eintragen, die in den Asset-Details angezeigt werden.',
     'asset_manufacturers'	=> 'Asset Hersteller',
     'create'				=> 'Hersteller anlegen',
     'id'   					=> 'ID',
diff --git a/resources/lang/de-if/admin/models/general.php b/resources/lang/de-if/admin/models/general.php
index 41b2227c00..8eb7ca2085 100644
--- a/resources/lang/de-if/admin/models/general.php
+++ b/resources/lang/de-if/admin/models/general.php
@@ -3,7 +3,7 @@
 return array(
     'about_models_title'     => 'Über Asset-Modelle',
     'about_models_text'           => 'Asset-Modelle sind eine Möglichkeit, identische Assets zu gruppieren. "MBP 2013", "IPhone 6 s" usw.',
-    'deleted'  					        => 'Dieses Modell wurde gelöscht.',
+    'deleted'  					=> 'Dieses Modell wurde gelöscht.',
     'bulk_delete'               => 'Massenlöschen von Asset-Modellen',
     'bulk_delete_help'               => 'Nutze die nachfolgenden Kontrollkästchen, um die Löschung der Asset-Modelle zu bestätigen. Asset-Modelle, die noch zugewiesene Assets haben, können nur dann gelöscht werden, wenn die enthaltenen Assets einem anderen Asset-Modell zugewiesen werden.',
     'bulk_delete_warn'          => 'Du bist dabei, ein Asset Modell zu löschen.|Du bist dabei, :model_count Asset Modelle zu löschen.',
diff --git a/resources/lang/de-if/admin/models/message.php b/resources/lang/de-if/admin/models/message.php
index 553d4fe92b..971dd3da31 100644
--- a/resources/lang/de-if/admin/models/message.php
+++ b/resources/lang/de-if/admin/models/message.php
@@ -7,7 +7,7 @@ return array(
     'no_association' => 'WARNUNG! Das Asset Modell für dieses Element ist ungültig oder fehlt!',
     'no_association_fix' => 'Dies wird Dinge auf seltsame und schreckliche Weise zerstören. Bearbeite dieses Asset jetzt, um ihm ein Modell zuzuordnen.',
     'assoc_users'	 => 'Dieses Modell ist zur Zeit mit einem oder mehreren Assets verknüpft und kann nicht gelöscht werden. Bitte lösche die Assets und versuche dann erneut, das Modell zu löschen. ',
-
+    'invalid_category_type' => 'Diese Kategorie muss eine Asset-Kategorie sein.',
 
     'create' => array(
         'error'   => 'Modell wurde nicht erstellt. Bitte versuche es noch einmal.',
@@ -21,7 +21,7 @@ return array(
     ),
 
     'delete' => array(
-        'confirm'   => 'Bist Du sicher, dass Du dieses Asset-Modell entfernen möchtest?',
+        'confirm'   => 'Bist du sicher, dass du dieses Asset-Modell entfernen möchtest?',
         'error'   => 'Beim Löschen des Modell ist ein Fehler aufgetreten. Bitte versuche es noch einmal.',
         'success' => 'Das Modell wurde erfolgreich gelöscht.'
     ),
diff --git a/resources/lang/de-if/admin/reports/general.php b/resources/lang/de-if/admin/reports/general.php
index e195529077..989dc131c1 100644
--- a/resources/lang/de-if/admin/reports/general.php
+++ b/resources/lang/de-if/admin/reports/general.php
@@ -4,6 +4,7 @@ return [
     'info'   => 'Wähle die Optionen für Deinen Asset Bericht.',
     'deleted_user' => 'Gelöschter Benutzer',
     'send_reminder' => 'Erinnerung senden',
+    'cannot_send_reminder' => 'Benutzer wurde gelöscht oder hat keine E-Mail-Adresse, und kann daher keine Erinnerung empfangen',
     'reminder_sent' => 'Erinnerung gesendet',
     'acceptance_deleted' => 'Akzeptanzanfrage gelöscht',
     'acceptance_request' => 'Akzeptierungsanfrage',
@@ -13,5 +14,10 @@ return [
         'user_state' => 'Benutzerstaat',
         'user_country' => 'Benutzerland',
         'user_zip' => 'Benutzer PLZ'
-    ]
-];
\ No newline at end of file
+    ],
+    'open_saved_template' => 'Gespeicherte Vorlage öffnen',
+    'save_template' =>  'Vorlage speichern',
+    'select_a_template' => 'Wähle eine Vorlage aus',
+    'template_name' => 'Vorlagen-Name',
+    'update_template' => 'Vorlage aktualisieren',
+];
diff --git a/resources/lang/de-if/admin/reports/message.php b/resources/lang/de-if/admin/reports/message.php
index 645f275d67..e1b6ca5be8 100644
--- a/resources/lang/de-if/admin/reports/message.php
+++ b/resources/lang/de-if/admin/reports/message.php
@@ -1,5 +1,16 @@
 <?php
 
-return array(
-    'error'   => 'Du musst mindestens eine Option auswählen.'
-);
+return [
+    'about_templates' => 'Über gespeicherte Vorlagen',
+    'saving_templates_description' => 'Wähle Deine Optionen aus, gib dann den Namen Deiner Vorlage in das Feld oben ein und klicke auf die Schaltfläche „Vorlage speichern“. Verwende das Dropdown-Menü, um eine zuvor gespeicherte Vorlage auszuwählen.',
+    'create'  => [
+        'success' => 'Vorlage erfolgreich gespeichert',
+    ],
+    'update' => [
+        'success' => 'Vorlage erfolgreich aktualisiert',
+    ],
+    'delete' => [
+        'success' => 'Vorlage gelöscht',
+        'no_delete_permission' => 'Die Vorlage existiert nicht oder Du bist nicht berechtigt, sie zu löschen.',
+    ],
+];
diff --git a/resources/lang/de-if/admin/settings/general.php b/resources/lang/de-if/admin/settings/general.php
index 5c2d2ae078..d62aebb156 100644
--- a/resources/lang/de-if/admin/settings/general.php
+++ b/resources/lang/de-if/admin/settings/general.php
@@ -6,40 +6,43 @@ return [
     'ad_domain_help'			=> 'Dies ist manchmal dasselbe wie Deine E-Mail-Domain, aber nicht immer.',
     'ad_append_domain_label'    => 'Domänenname anhängen',
     'ad_append_domain'          => 'Domänenname an das Feld Benutzername anhängen',
-    'ad_append_domain_help'     => 'Benutzer muss nicht "username@domain.local" eingeben, "username" ist ausreichend.',
+    'ad_append_domain_help'     => 'Der Benutzer muss nicht "username@domain.local" eingeben, "username" ist ausreichend.',
     'admin_cc_email'            => 'CC Email',
-    'admin_cc_email_help'       => 'Wenn Du eine Kopie der Rücknahme-/Herausgabe-E-Mails, die an Benutzer gehen, auch an zusätzliche E-Mail-Empfänger versenden möchtest, gebe sie hier ein. Ansonsten lass dieses Feld blank.',
+    'admin_cc_email_help'       => 'Sende eine Kopie der Checkin/Checkout-E-Mails an diese Adresse.',
     'admin_settings'            => 'Admin-Einstellungen',
     'is_ad'				        => 'Dies ist ein Active Directory Server',
     'alerts'                	=> 'Alarme',
     'alert_title'               => 'Benachrichtigungseinstellungen ändern',
     'alert_email'				=> 'Alarme senden an',
-    'alert_email_help'    => 'E-Mail-Adressen oder Verteilerlisten an die Warnungen gesendet werden sollen, durch Komma getrennt',
+    'alert_email_help'          => 'E-Mail-Adressen oder Verteilerlisten, an die Benachrichtigungen gesendet werden sollen, durch Kommas getrennt.',
     'alerts_enabled'			=> 'E-Mail-Benachrichtigungen aktiviert',
     'alert_interval'			=> 'Ablauf Alarmschwelle (in Tagen)',
     'alert_inv_threshold'		=> 'Inventar Alarmschwelle',
     'allow_user_skin'           => 'Benutzerdesign erlauben',
-    'allow_user_skin_help_text' => 'Wenn Du dieses Kästchen aktivierst, kann ein Benutzer das Design mit einem anderen überschreiben.',
+    'allow_user_skin_help_text' => 'Wenn du dieses Kästchen aktivierst, kann ein Benutzer das Design mit einem anderen überschreiben.',
     'asset_ids'					=> 'Asset IDs',
     'audit_interval'            => 'Auditintervall',
-    'audit_interval_help'       => 'Wenn Du verpflichtet bist, Deine Assets regelmäßig physisch zu überprüfen, geben das Intervall in Monaten an. Wenn Du diesen Wert aktualisiert, werden alle "nächsten Audittermine" für Assets mit einem anstehenden Prüfungsdatum aktualisiert.',
+    'audit_interval_help'       => 'Wenn du Anlagen regelmäßig physisch prüfen musst, gebe das von Ihnen verwendete Intervall in Monaten ein. Wenn du diesen Wert aktualisierst, werden alle „nächsten Prüftermine“ für Anlagen mit einem bevorstehenden Prüftermin aktualisiert.',
     'audit_warning_days'        => 'Audit-Warnschwelle',
-    'audit_warning_days_help'   => 'Wie viele Tage im Voraus sollen wir Dich warnen, wenn Assets zur Prüfung fällig werden?',
-    'auto_increment_assets'		=> 'Erzeugen von fortlaufenden Asset Tags',
+    'audit_warning_days_help'   => 'Wie viele Tage im Voraus sollen wir dich benachrichtigen, wenn eine Prüfung der Vermögenswerte ansteht?',
+    'auto_increment_assets'		=> 'Erstellen von fortlaufenden Asset Tags',
     'auto_increment_prefix'		=> 'Präfix (optional)',
     'auto_incrementing_help'    => 'Aktiviere zuerst fortlaufende Asset Tags um dies zu setzen',
     'backups'					=> 'Backups',
     'backups_help'              => 'Backups erstellen, herunterladen und wiederherstellen ',
     'backups_restoring'         => 'Aus Backup wiederherstellen',
+    'backups_clean' => 'Bereinige die gesicherte Datenbank vor der Wiederherstellung',
+    'backups_clean_helptext' => "Dies kann nützlich sein, wenn du zwischen Datenbankversionen wechselst",
     'backups_upload'            => 'Backup hochladen',
     'backups_path'              => 'Backups auf dem Server werden in <code>:path</code> gespeichert',
-    'backups_restore_warning'   => 'Klicke den Wiederherstellungs-Knopf <small><span class="btn btn-xs btn-warning"><i class="text-white fas fa-retweet" aria-hidden="true"></i></span></small> um ein Backup wiederherzustellen. (Funktioniert derzeit nicht mit S3 Datenspeicher oder Docker.)<br><br><strong>Die gesamte :app_name Datenbank und alle hochgeladenen Dateien werden mit den Inhalten des Backups überschrieben.</strong>  ',
-    'backups_logged_out'         => 'Alle vorhandenen Benutzer, auch Du, werden abgemeldet, sobald Deine Wiederherstellung abgeschlossen ist.',
+    'backups_restore_warning'   => 'Wähle die Wiederherstellung <small><span class="btn btn-xs btn-warning"><i class="text-white fas fa-retweet" aria-hidden="true"></i></span></small> um ein Backup wieder herzustellen. (Funktioniert derzeit nicht mit S3 Datenspeicher oder Docker)<br><br>Die <strong>gesamte :app_name Datebank und alle Uploads werden mit den Inhalten des Backups überschrieben</strong>.  ',
+    'backups_logged_out'         => 'Alle vorhandenen Benutzer, einschließlich dir selbst, werden abgemeldet, sobald die Wiederherstellung abgeschlossen ist.',
     'backups_large'             => 'Sehr große Backups können beim Wiederherstellungsversuch ausfallen (Time-Out) und müssen eventuell über die Kommandozeile ausgeführt werden. ',
     'barcode_settings'			=> 'Barcode Einstellungen',
     'confirm_purge'			    => 'Bereinigung bestätigen',
     'confirm_purge_help'		=> 'Gib den Text "LÖSCHEN" in das Feld unten ein, um die gelöschten Datensätze zu löschen. Diese Aktion kann nicht rückgängig gemacht werden. Alle Einträge und Benutzer werden DAUERHAFT gelöscht. (Um sicher zu gehen, solltest Du zuerst ein Backup erstellen)',
     'custom_css'				=> 'Benutzerdefiniertes CSS',
+    'custom_css_placeholder'	=> 'Füge Dein benutzerdefiniertes CSS hinzu',
     'custom_css_help'			=> 'Füge eigenes CSS hinzu. Benutze keine &lt;style&gt;&lt;/style&gt; tags.',
     'custom_forgot_pass_url'	=> 'Benutzerdefinierte Passwort Zurücksetzungs-URL',
     'custom_forgot_pass_url_help'	=> 'Dies ersetzt die integrierte URL für vergessene Passwörter auf dem Anmeldebildschirm. Das ist nützlich, um Benutzer zur internen oder gehosteten Funktion zum Zurücksetzen von LDAP-Passwörtern zu leiten. Dementsprechend wird die Funktion zur Zurücksetzung des lokalen Passwortes deaktiviert.',
@@ -47,34 +50,34 @@ return [
     'dashboard_message_help'	=> 'Dieser Text wird für jeden sichtbar sein, der Berechtigungen hat das Dashboard zu sehen.',
     'default_currency'  		=> 'Standardwährung',
     'default_eula_text'			=> 'Standard EULA',
+    'default_eula_text_placeholder' => 'Füge Deinen Standard-EULA Text hinzu',
     'default_language'			=> 'Standardsprache',
     'default_eula_help_text'	=> 'Du kannst ebenso benutzerdefinierte EULAs bestimmten Asset-Kategorien zuordnen.',
-    'acceptance_note'           => 'Notiz für Ihre Entscheidung hinzufügen (Optional)',
+    'acceptance_note'           => 'Füge eine Notiz zu deiner Entscheidung hinzu (optional)',
     'display_asset_name'        => 'Asset-Name anzeigen',
     'display_checkout_date'     => 'Checkout-Datum anzeigen',
     'display_eol'               => 'EOL in Tabellenansicht anzeigen',
-    'display_qr'                => 'Qr-Codes anzeigen',
+    'display_qr'                => '2D-Barcode anzeigen',
     'display_alt_barcode'		=> '1D Barcode anzeigen',
-    'email_logo'                => 'E-Mail-Logo',
     'barcode_type'				=> '2D Barcode Typ',
     'alt_barcode_type'			=> '1D Barcode Typ',
-    'email_logo_size'       => 'Quadratische Logos in E-Mails sehen am besten aus. ',
     'enabled'                   => 'Aktiviert',
     'eula_settings'				=> 'EULA Einstellungen',
     'eula_markdown'				=> 'Diese EULA erlaubt <a href="https://help.github.com/articles/github-flavored-markdown/">Github Flavored Markdown</a>.',
+    'empty_row_count'           => 'Feld-Start-Versatz (Leere Zeilen)',
+    'empty_row_count_help'      => 'Felder werden gefüllt, nachdem diese vielen leeren Zeilen am oberen Rand des Labels übersprungen wurden.',
     'favicon'                   => 'Favicon',
     'favicon_format'            => 'Akzeptierte Dateitypen sind ico, png und gif. Andere Bildformate funktionieren möglicherweise nicht in allen Browsern.',
     'favicon_size'          => 'Favicons sollten quadratische Bilder mit 16x16 Pixel sein.',
     'footer_text'               => 'Zusätzlicher Fußzeilentext ',
     'footer_text_help'          => 'Dieser Text wird in der rechten Fußzeile angezeigt. Links sind erlaubt mit <a href="https://help.github.com/articles/github-flavored-markdown/">Github Flavored Markdown</a>. Zeilenumbrüche, Kopfzeilen, Bilder usw. können zu unvorhersehbaren Ergebnissen führen.',
+    'footer_text_placeholder'   => 'Optionaler Fußzeilentext',
     'general_settings'			=> 'Allgemeine Einstellungen',
-    'general_settings_keywords' => 'firmenunterstützung, Unterschrift, Akzeptanz, E-Mail-Format, Benutzername Format, Bilder, pro Seite, Vorschaubilder, eula, gravatar, tos, Dashboard, Privatsphäre',
     'general_settings_help'     => 'Standard EULA und mehr',
     'generate_backup'			=> 'Backup erstellen',
     'google_workspaces'         => 'Google Arbeitsbereiche',
     'header_color'              => 'Kopfzeilenfarbe',
-    'info'                      => 'Mit diesen Einstellungen kannst Du verschiedene Bereiche Deiner Installation anpassen.',
-    'label_logo'                => 'Label-Logo',
+    'info'                      => 'Mit diesen Einstellungen kannst du verschiedene Bereiche deiner Installation anpassen.',
     'label_logo_size'           => 'Quadratische Logos sehen am besten aus und werden rechts oben auf jedem Asset-Label angezeigt. ',
     'laravel'                   => 'Laravel Version',
     'ldap'                      => 'LDAP',
@@ -87,17 +90,17 @@ return [
     'ldap_enabled'              => 'LDAP aktiviert',
     'ldap_integration'          => 'LDAP Integration',
     'ldap_settings'             => 'LDAP Einstellungen',
-    'ldap_client_tls_cert_help' => 'Client-seitige TLS-Zertifikat und Schlüssel für LDAP Verbindungen sind in der Regel nur in Google Workspace Konfigurationen mit "Secure LDAP" nützlich. Beide werden benötigt.',
+    'ldap_client_tls_cert_help' => 'Clientseitiges TLS-Zertifikat und Schlüssel für LDAP-Verbindungen sind normalerweise nur in Google Workspace-Konfigurationen mit „Secure LDAP“ nützlich. Beide sind aber erforderlich.',
     'ldap_location'             => 'LDAP Standort',
 'ldap_location_help'             => 'Das Feld LDAP Standort sollte verwendet werden, wenn <strong>keine OU im Basis Bind DN verwendet wird.</strong> Leer lassen, wenn eine OU-Suche verwendet wird.',
     'ldap_login_test_help'      => 'Gib einen gültigen LDAP-Benutzernamen und ein Passwort von der oben angegebenen Basis-DN ein, um zu testen, ob Deine LDAP-Anmeldung korrekt konfiguriert ist. DU MUSST DEINE AKTUALISIERTEN LDAP-EINSTELLUNGEN ZUERST SPEICHERN.',
-    'ldap_login_sync_help'      => 'Dies testet nur, ob LDAP korrekt synchronisiert werden kann. Falls Deine LDAP-Authentifizierungsabfrage nicht korrekt ist, können sich Benutzer möglicherweise nicht anmelden. DU MUSST DEINE AKTUALISIERTEN LDAP-EINSTELLUNGEN ZUERST SPEICHERN.',
+    'ldap_login_sync_help'      => 'Dies testet nur, ob LDAP korrekt synchronisiert werden kann. Falls deine LDAP-Authentifizierungsabfrage nicht korrekt ist, können sich Benutzer möglicherweise nicht anmelden. DU MUSST DEINE AKTUALISIERTEN LDAP-EINSTELLUNGEN ZUERST SPEICHERN.',
     'ldap_manager'              => 'LDAP Manager',
     'ldap_server'               => 'LDAP-Server',
-    'ldap_server_help'          => 'Dies sollte mit ldap:// (für unverschlüsselt oder TLS) oder ldaps:// (für SSL) beginnen',
+    'ldap_server_help'          => 'Dies sollte mit ldap:// (für unverschlüsselt) oder ldaps:// (für TLS oder SSL) beginnen',
     'ldap_server_cert'			=> 'LDAP-SSL-Zertifikatsüberprüfung',
     'ldap_server_cert_ignore'	=> 'Ungültiges SSL-Zertifikat erlauben',
-    'ldap_server_cert_help'		=> 'Wähle diese Option, wenn Du selbstsignierte SSL Zertifikate verwenden und diese gegebenenfalls ungültigen Zertifikate akzeptieren möchtest.',
+    'ldap_server_cert_help'		=> 'Aktiviere diese Option, wenn du ein selbstsigniertes SSL-Zertifikat verwendest und ein ungültiges SSL-Zertifikat akzeptieren möchtest.',
     'ldap_tls'                  => 'TLS verwenden',
     'ldap_tls_help'             => 'Diese Option sollte nur aktiviert werden, wenn STARTTLS auf Deinem LDAP-Server ausgeführt wird. ',
     'ldap_uname'                => 'LDAP Bind Benutzername',
@@ -108,8 +111,8 @@ return [
     'ldap_pword'                => 'LDAP Bind Passwort',
     'ldap_basedn'               => 'Basis Bind DN',
     'ldap_filter'               => 'LDAP Filter',
-    'ldap_pw_sync'              => 'LDAP-Passwort-Sync',
-    'ldap_pw_sync_help'         => 'Deaktiviere diese Option, wenn Du LDAP-Passwörter nicht mit lokalen Passwörtern synchronisieren möchtest. Wenn Du dies deaktivierst, können sich Deine Benutzer möglicherweise nicht einloggen, wenn Dein LDAP-Server aus irgendeinem Grund nicht erreichbar ist.',
+    'ldap_pw_sync'              => 'LDAP-Passwörter zwischenspeichern',
+    'ldap_pw_sync_help'         => 'Deaktiviere dieses Kontrollkästchen, wenn Du LDAP-Passwörter nicht als lokale Hash-Passwörter zwischenspeichern möchtest. Wenn Du diese Option deaktivierst, können sich Deine Benutzer möglicherweise nicht anmelden, wenn Dein LDAP-Server aus irgendeinem Grund nicht erreichbar ist.',
     'ldap_username_field'       => 'Benutzernamen Feld',
     'ldap_lname_field'          => 'Nachname',
     'ldap_fname_field'          => 'LDAP Vorname',
@@ -117,13 +120,15 @@ return [
     'ldap_version'              => 'LDAP Version',
     'ldap_active_flag'          => 'LDAP Aktiv-Markierung',
     'ldap_activated_flag_help'  => 'Dieser Wert wird benutzt, um zu entscheiden, ob synchronisierte Nutzer sich in Snipe-IT anmelden können. <strong> Items können unabhängig von ihm zum Nutzer zugewiesen werden</strong>. Der Wert sollte der <strong>Attributname</strong> im AD/LDAP sein <strong>und nicht der Wert</strong>.<br><br>Wenn diesem Feld ein Name zugewiesen wird, der im AD/LDAP nicht existiert bzw. der Wert im AD/LDAP <code>0</code> oder <code>false</code> ist <strong> wird der Nutzerlogin deaktiviert</strong>. Ist der Wert im AD\\LDAP <code>1</code> oder <code>true</code> oder <em>jeder beliebige andere Text</em> dann kann sich der Nutzer anmelden. Wenn das Feld im AD leer ist, dann gilt das <code>userAccountControl</code> Attribut, was normalerweise bedeutet, dass sich nicht deaktivierte Nutzer anmelden können.',
+    'ldap_invert_active_flag'   => 'LDAP-Aktive Markierung umkehren',
+    'ldap_invert_active_flag_help'     => 'Wenn aktiviert: Wenn der vom LDAP Active Flag zurückgegebene Wert <code>0</code> oder <code>false</code> ist, ist das Benutzerkonto aktiv.',
     'ldap_emp_num'              => 'LDAP Mitarbeiternummer',
     'ldap_email'                => 'LDAP E-Mail',
     'ldap_test'                 => 'LDAP testen',
     'ldap_test_sync'            => 'LDAP-Synchronisierung testen',
     'license'                   => 'Softwarelizenz',
-    'load_remote'               => 'Gravatar verwenden',
-    'load_remote_help_text'		=> 'Deaktivieren Sie dieses Kästchen, wenn Ihre Installation keine Skripte aus dem externen Internet laden kann. Dies wird verhindern, dass Snipe-IT Bilder von Gravatar laden kann.',
+    'load_remote'               => 'Externe Avatare laden',
+    'load_remote_help_text'		=> 'Deaktiviere dieses Kästchen, wenn deine Installation keine Skripte aus dem externen Internet laden kann. Das verhindert, dass Snipe-IT versucht, Bilder von Gravatar oder anderen externen Quellen zu laden.',
     'login'                     => 'Anmeldeversuche',
     'login_attempt'             => 'Anmeldeversuch',
     'login_ip'                  => 'IP-Adresse',
@@ -131,12 +136,13 @@ return [
     'login_user_agent'          => 'User Agent',
     'login_help'                => 'Liste der versuchten Logins',
     'login_note'                => 'Anmeldenotiz',
+    'login_note_placeholder'            => "Wenn Du keine Anmeldedaten hast oder ein Gerät dieser Firma gefunden hast, wende Dich bitte an den technischen Support unter 888-555-1212. Vielen Dank.",
     'login_note_help'           => 'Füge optional ein paar Sätze zu Deinem Anmeldebildschirm hinzu, beispielsweise um Personen zu helfen, welche ein verlorenes oder gestohlenes Gerät gefunden haben. Dieses Feld akzeptiert <a href="https://help.github.com/articles/github-flavored-markdown/">Github flavored markdown</a>',
     'login_remote_user_text'    => 'Remote Benutzer Login Optionen',
     'login_remote_user_enabled_text' => 'Login mit Remote-Benutzer-Header aktivieren',
     'login_remote_user_enabled_help' => 'Diese Option aktiviert die Authentifizierung über den REMOTE_USER Header gemäß dem "Common Gateway Interface (rfc3875)"',
     'login_common_disabled_text' => 'Deaktiviere andere Authentifizierungsmethoden',
-    'login_common_disabled_help' => 'Diese Option deaktiviert andere Authentifizierungsmethoden. Aktiviere diese Option nur, wenn Du Dir sicher bist, dass REMOTE_USER Login bereits funktioniert',
+    'login_common_disabled_help' => 'Diese Option deaktiviert andere Authentifizierungsmethoden. Aktiviere diese Option nur, wenn du dir sicher bist, dass REMOTE_USER Login bereits funktioniert',
     'login_remote_user_custom_logout_url_text' => 'Benutzerdefinierte Abmelde-URL',
     'login_remote_user_custom_logout_url_help' => 'Sofern hier eine URL angegeben ist, werden Benutzer automatisch zu dieser URL weitergeleitet, nachdem der Benutzer sich aus Snipe-IT ausloggt. Dies ist nützlich, um die Benutzersitzung Deines Authentifizierungsproviders korrekt zu beenden.',
     'login_remote_user_header_name_text' => 'Benutzerdefinierter Benutzername Header',
@@ -146,18 +152,21 @@ return [
     'logo_print_assets_help'    => 'Firmenlogo anzeigen beim Drucken der Asset-Liste ',
     'full_multiple_companies_support_help_text' => 'Beschränkung von Benutzern (inklusive Administratoren), die einer Firma zugewiesen sind, zu den Assets der Firma.',
     'full_multiple_companies_support_text' => 'Volle Unterstützung für mehrere Unternehmen',
+    'scope_locations_fmcs_support_text'  => 'Bereicherte Standorte mit vollständiger Unterstützung für mehrere Unternehmen',
+    'scope_locations_fmcs_support_help_text'  => 'Standorte auf das ausgewählte Unternehmen beschränken.',
+    'scope_locations_fmcs_check_button' => 'Kompatibilität prüfen',
+    'scope_locations_fmcs_support_disabled_text'  => 'Diese Option ist deaktiviert, da für :count oder mehr Elemente widersprüchliche Standorte gesetzt sind.',
     'show_in_model_list'   => 'In Modell-Dropdown-Liste anzeigen',
     'optional'					=> 'optional',
     'per_page'                  => 'Ergebnisse pro Seite',
     'php'                       => 'PHP Version',
     'php_info'                  => 'PHP Info',
     'php_overview'              => 'PHP',
-    'php_overview_keywords'     => 'phpinfo, System, Info',
     'php_overview_help'         => 'PHP-Systeminfo',
     'php_gd_info'               => 'Um QR-Codes anzeigen zu können muss php-gd installiert sein, siehe Installationsanweisungen.',
     'php_gd_warning'            => 'PHP Image Processing and GD Plugin ist NICHT installiert.',
     'pwd_secure_complexity'     => 'Passwortkomplexität',
-    'pwd_secure_complexity_help' => 'Wählen Sie aus, welche Komplexitätsregeln Du für Passwörter durchsetzen möchtest.',
+    'pwd_secure_complexity_help' => 'Wähle aus, welche Komplexitätsregeln du für Passwörter durchsetzen möchtest.',
     'pwd_secure_complexity_disallow_same_pwd_as_user_fields' => 'Passwort darf nicht mit Vorname, Nachname, E-Mail oder Benutzername identisch sein',
     'pwd_secure_complexity_letters' => 'Mindestens ein Buchstabe erforderlich',
     'pwd_secure_complexity_numbers' => 'Mindestens eine Zahl erforderlich',
@@ -166,7 +175,7 @@ return [
     'pwd_secure_min'            => 'Minimale Passwortlänge',
     'pwd_secure_min_help'       => 'Minimal zulässiger Wert ist 8',
     'pwd_secure_uncommon'       => 'Gewöhnliche Passwörter verhindern',
-    'pwd_secure_uncommon_help'  => 'Verhindert die Verwendung der 10.000 häufigsten Passwörter aus im Internet geleakten Quellen.',
+    'pwd_secure_uncommon_help'  => 'Dadurch wird verhindert, dass Benutzer gängige Passwörter aus den 10.000 am häufigsten bei Daten-Leaks gemeldeten Passwörtern verwenden.',
     'qr_help'                   => 'Schalte zuerst QR Codes an um dies zu setzen',
     'qr_text'                   => 'QR Code Text',
     'saml'                      => 'SAML',
@@ -218,6 +227,8 @@ return [
     'webhook_integration_help'    => ':app Integration ist optional, allerdings sind Endpunkt und Kanal erforderlich, wenn du sie verwenden möchtet. Um die :app Integration zu konfigurieren, musst du zuerst in deinem :app Account <a href=":webhook_link" target="_new" rel="noopener">einen eingehenden Webhook erstellen</a>. Klicke auf den <strong>:app Integration testen</strong>-Knopf, um zu bestätigen, dass die Einstellungen vor dem Speichern korrekt sind. ',
     'webhook_integration_help_button'    => 'Sobald die :app Einstellungen gespeichert wurden, erscheint eine Schaltfläche zum testen.',
     'webhook_test_help'           => 'Teste, ob deine :app Integration korrekt konfiguriert ist. DIE AKTUELLEN :app EINSTELLUNGEN MÜSSEN ZUERST GESPEICHERT WERDEN.',
+    'shortcuts_enabled'         => 'Shortcuts aktivieren',
+    'shortcuts_help_text'       => '<strong>Windows</strong>: Alt + Access-Taste, <strong>Mac</strong>: Control + Option + Access-Taste',
     'snipe_version'  			=> 'Snipe-IT Version',
     'support_footer'            => 'Support-Link in der Fußzeile ',
     'support_footer_help'       => 'Lege fest, wer die Links zu Snipe-IT Support-Information und Benutzerhandbuch sieht',
@@ -227,11 +238,10 @@ return [
     'update'                    => 'Einstellungen aktualisieren',
     'value'                     => 'Wert',
     'brand'                     => 'Branding',
-    'brand_keywords'            => 'Fußzeile, Logo, Druck, Thema, Skin, Header, Farben, Farbe, CSS',
     'brand_help'                => 'Logo, Seitenname',
     'web_brand'                 => 'Web Branding Typ',
     'about_settings_title'      => 'Über Einstellungen',
-    'about_settings_text'       => 'Mit diesen Einstellungen kannst Du verschiedene Aspekte Ihrer Installation anpassen.',
+    'about_settings_text'       => 'Mit diesen Einstellungen kannst du verschiedene Aspekte deiner Installation anpassen.',
     'labels_per_page'           => 'Etiketten pro Seite',
     'label_dimensions'          => 'Etikettengröße (Zoll)',
     'next_auto_tag_base'        => 'Nächster Auto-Inkrement',
@@ -253,7 +263,7 @@ return [
     'width_w'        => 'b',
     'height_h'        => 'h',
     'show_url_in_emails'                => 'Link zu Snipe-IT in E-Mails',
-    'show_url_in_emails_help_text'      => 'Deaktiviere dieses Kästchen, wenn Du nicht auf Deine Snipe-IT-Installation in Deinen E-Mail-Fußzeilen verlinken möchtest. Nützlich, wenn sich die meisten Nutzer nie anmelden. ',
+    'show_url_in_emails_help_text'      => 'Deaktiviere dieses Kästchen, wenn du nicht auf deine Snipe-IT-Installation in deinen E-Mail-Fußzeilen verlinken möchtest. Nützlich, wenn sich die meisten Nutzer nie anmelden. ',
     'text_pt'        => 'pkt',
     'thumbnail_max_h'   => 'Maximale Höhe der Miniaturansicht',
     'thumbnail_max_h_help'   => 'Maximale Höhe in Pixeln, die Miniaturbilder in der Listenansicht anzeigen dürfen. Min. 25, max. 500.',
@@ -265,7 +275,7 @@ return [
     'two_factor_reset_help'        => 'Dies zwingt den Benutzer, sein Gerät erneut mit seiner Authentifizierungs-App zu registrieren. Dies kann nützlich sein, wenn ihr derzeit angemeldetes Gerät verloren geht oder gestohlen wird. ',
     'two_factor_reset_success'          => 'Zwei-Faktor-Gerät erfolgreich zurückgesetzt',
     'two_factor_reset_error'          => 'Zwei-Faktor-Gerät zurücksetzen ist fehlgeschlagen',
-    'two_factor_enabled_warning'        => 'Die Aktivierung der Zwei-Faktor-Authentifizierung bewirkt, dass Du Dich sofort mit einem bei Google Authenticator registrierten Gerät authentifizieren musst. Du hast die Möglichkeit, Dein Gerät hinzuzufügen, falls derzeit keines registriert ist.',
+    'two_factor_enabled_warning'        => 'Die Aktivierung der Zwei-Faktor-Authentifizierung bewirkt, dass du dich sofort mit einem bei Google-Authentikator registrierten Gerät authentifizieren musst. Du hast die Möglichkeit, dein Gerät hinzuzufügen, falls derzeit keines registriert ist.',
     'two_factor_enabled_help'        => 'Damit wird die Zwei-Faktor-Authentifizierung mit dem Google Authenticator aktiviert.',
     'two_factor_optional'        => 'Auswählbar (Benutzer können aktivieren oder deaktivieren, wenn erlaubt)',
     'two_factor_required'        => 'Für alle Benutzer erforderlich',
@@ -276,6 +286,8 @@ return [
     'two_factor_enrollment_text'	=> "Zwei-Faktor-Authentifizierung ist erforderlich, Dein Gerät wurde jedoch noch nicht hinzugefügt. Öffne die Google Authenticator App und scanne den QR-Code unten, um Dein Gerät hinzuzufügen. Gebe anschließend den Code ein",
     'require_accept_signature'      => 'Unterschrift erforderlich',
     'require_accept_signature_help_text'      => 'Wenn aktiviert, wird eine physische Unterschrift durch den Benutzer bei der Annahme des Assets notwendig.',
+    'require_checkinout_notes'  => 'Notizen beim Ein-/Auschecken erforderlich',
+    'require_checkinout_notes_help_text'    => 'Wenn Du diese Funktion aktivierst, müssen die Notizfelder beim Einchecken oder Auschecken eines Assets ausgefüllt werden.',
     'left'        => 'links',
     'right'        => 'rechts',
     'top'        => 'oben',
@@ -290,15 +302,15 @@ return [
     'oauth_clients' => 'OAuth Clients',
     'oauth' => 'OAuth',
     'oauth_help' => 'Oauth Endpunkt Einstellungen',
-    'oauth_no_clients' => 'You have not created any OAuth clients yet.',
+    'oauth_no_clients' => 'Du hast noch keine OAuth-Clients erstellt.',
     'oauth_secret' => 'Secret',
-    'oauth_authorized_apps' => 'Authorized Applications',
-    'oauth_redirect_url' => 'Redirect URL',
-    'oauth_name_help' => ' Something your users will recognize and trust.',
-    'oauth_scopes' => 'Scopes',
-    'oauth_callback_url' => 'Your application authorization callback URL.',
-    'create_client' => 'Create Client',
-    'no_scopes' => 'No scopes',
+    'oauth_authorized_apps' => 'Autorisierte Anwendungen',
+    'oauth_redirect_url' => 'Weiterleitungs-URL',
+    'oauth_name_help' => ' Etwas, das eure Nutzer kennen und dem sie vertrauen.',
+    'oauth_scopes' => 'Bereiche',
+    'oauth_callback_url' => 'Dein App-Autorisierungs-Callback-URL.',
+    'create_client' => 'Client erstellen',
+    'no_scopes' => 'Keine Bereiche',
     'asset_tag_title' => 'Asset Tag Einstellungen aktualisieren',
     'barcode_title' => 'Barcode Einstellungen aktualisieren',
     'barcodes' => 'Barcodes',
@@ -313,24 +325,24 @@ return [
     'filter_by_keyword' => 'Nach Stichwort filtern',
     'security' => 'Sicherheit',
     'security_title' => 'Sicherheitseinstellungen aktualisieren',
-    'security_keywords' => 'Passwort, Passwörter, Anforderungen, Zwei-Faktor, Zwei-Faktor, übliche Passwörter, Remote-Login, Logout, Authentifizierung',
     'security_help' => 'Zwei-Faktor, Passwort-Einschränkungen',
-    'groups_keywords' => 'berechtigungen, Berechtigungsgruppen, Autorisierung',
     'groups_help' => 'Account-Berechtigungsgruppen',
     'localization' => 'Lokalisierung',
     'localization_title' => 'Lokalisierungseinstellungen aktualisieren',
-    'localization_keywords' => 'lokalisierung, Währung, lokal, Lokal, Zeitzone, International, Internationalisierung, Sprache, Sprachen, Übersetzung',
     'localization_help' => 'Sprache, Datumsanzeige',
     'notifications' => 'Benachrichtigungen',
     'notifications_help' => 'E-Mail-Benachrichtigungen & Audit-Einstellungen',
     'asset_tags_help' => 'Inkrementieren und Präfixe',
     'labels' => 'Etiketten',
     'labels_title' => 'Etiketten-Einstellungen aktualisieren',
-    'labels_help' => 'Etikettengrößen &amp; Einstellungen',
-    'purge_keywords' => 'Endgültig löschen',
+    'labels_help' => 'Barcodes &amp; Etiketteneinstellungen',
     'purge_help' => 'Gelöschte Einträge bereinigen',
-    'ldap_extension_warning' => 'Es sieht nicht so aus, als ob die LDAP-Erweiterung auf diesem Server installiert oder aktiviert ist. Du kannst Deine Einstellungen trotzdem speichern, aber Du musst die LDAP-Erweiterung für PHP aktivieren, bevor die LDAP-Synchronisierung oder der Login funktioniert.',
+    'ldap_extension_warning' => 'Es sieht nicht so aus, als ob die LDAP-Erweiterung auf diesem Server installiert oder aktiviert ist. Du kannst deine Einstellungen trotzdem speichern, aber du musst die LDAP-Erweiterung für PHP aktivieren, bevor die LDAP-Synchronisierung oder der Login funktioniert.',
     'ldap_ad' => 'LDAP/AD',
+    'ldap_test_label' => 'LDAP-Synchronisierung testen',
+    'ldap_test_login' => ' LDAP-Anmeldung testen',
+    'ldap_username_placeholder' => 'LDAP-Benutzername',
+    'ldap_password_placeholder' => 'LDAP-Passwort',
     'employee_number' => 'Mitarbeiternummer',
     'create_admin_user' => 'Benutzer erstellen ::',
     'create_admin_success' => 'Erfolgreich! Ihr Admin-Benutzer wurde hinzugefügt!',
@@ -342,6 +354,8 @@ return [
     'setup_migration_create_user' => 'Weiter: Benutzer erstellen',
     'ldap_settings_link' => 'LDAP Einstellungsseite',
     'slack_test' => '<i class="fab fa-slack"></i> Integration testen',
+    'status_label_name' => 'Status Etikett Name',
+    'super_admin_only'  => 'Nur Super-Admin',
     'label2_enable'           => 'Neuer Label-Generator',
     'label2_enable_help'      => 'Wechsle zum neuen Label-Generator. <b>Hinweis: Du musst diese Einstellung speichern, bevor du andere Anpassungen vornimmst.</b>',
     'label2_template'         => 'Vorlage',
@@ -356,12 +370,15 @@ return [
     'label2_2d_type'          => '2D Barcode Typ',
     'label2_2d_type_help'     => 'Format für 2D Barcodes',
     'label2_2d_target'        => '2D Barcode Ausgabe',
-    'label2_2d_target_help'   => 'Die URL, auf die der 2D Barcode beim Scannen verweist',
+    'label2_2d_target_help'   => 'Die Daten, die im 2D Barcode enthalten sein werden',
     'label2_fields'           => 'Felddefinitionen',
     'label2_fields_help'      => 'Felder können in der linken Spalte hinzugefügt, entfernt und neu sortiert werden. In jedem Feld können mehrere Optionen für Label und Datenquelle in der rechten Spalte hinzugefügt, entfernt und neu angeordnet werden.',
+    'purge_barcodes' => 'Barcodes löschen',
     'help_asterisk_bold'    => 'Der eingegebene Text <code>**text**</code> wird in Fettschrift angezeigt',
     'help_blank_to_use'     => 'Leer lassen, um den Wert von <code>:setting_name</code> zu verwenden',
     'help_default_will_use' => '<code>:default</code> verwendet den Wert von <code>:setting_name</code>. <br>Beachte, dass der Wert der Barcodes mit der jeweiligen Strichcode-Spezifikation übereinstimmen muss, um erfolgreich generiert zu werden. Bitte lese <a href="https://snipe-it.readme.io/docs/barcodes">die Dokumentation <i class="fa fa-external-link"></i></a> für weitere Details. ',
+    'asset_id'              => 'Asset-ID',
+    'data'               => 'Daten',
     'default'               => 'Standard',
     'none'                  => 'Nichts',
     'google_callback_help' => 'Dies sollte als Callback-URL in den Google OAuth App-Einstellungen in deinem Unternehmen eingegeben werden&apos;s <strong><a href="https://console.cloud.google.com/" target="_blank">Google Developer Konsole <i class="fa fa-external-link" aria-hidden="true"></i></a></strong>.',
@@ -373,7 +390,100 @@ return [
     'database_driver' => 'Datenbanktreiber',
     'bs_table_storage' => 'Tabellen Speicher',
     'timezone' => 'Zeitzone',
-    'profile_edit'          => 'Edit Profile',
-    'profile_edit_help'          => 'Allow users to edit their own profiles.',
+    'test_mail' => 'Test-Mail',
+    'profile_edit'          => 'Profil bearbeiten',
+    'profile_edit_help'          => 'Benutzern erlauben, ihre eigenen Profile zu bearbeiten.',
+    'default_avatar' => 'Benutzerdefinierter Standard-Avatar',
+    'default_avatar_help' => 'Dieses Bild wird als Profilbild angezeigt, wenn ein Benutzer kein Profilbild festgelegt hat.',
+    'restore_default_avatar' => '<a href=":default_avatar" data-toggle="lightbox" data-type="image">Ursprünglichen Standard-Avatar des Systems</a> wiederherstellen',
+    'restore_default_avatar_help' => '',
+    'due_checkin_days' => 'Zum Einchecken fällig Warnung',
+    'due_checkin_days_help' => 'Wie viele Tage vor dem voraussichtlichen Check-in eines Vermögenswerts soll dieser auf der Seite „Zur Eincheckzeit fällig“ aufgeführt werden?',
+    'no_groups' => 'Es wurden noch keine Gruppen erstellt. Navigiere zu <code>Admin-Einstellungen > Berechtigungsgruppen</code>, um eine hinzuzufügen.',
+    'text' => 'Text',
+
+    'username_formats' => [
+        'username_format'		=> 'Format der Benutzernamen',
+        'firstname_lastname_format'	=> 'Vorname Nachname (erika.mustermann)',
+        'first_name_format'	        => 'Vorname (erika)',
+        'last_name_format'		=> 'Nachname (mustermann)',
+        'filastname_format'			=> 'Initial des Vornamen & Nachname (emustermann)',
+        'lastnamefirstinitial_format' =>  'Nachname Initial des Vornamens (mustermanne)',
+        'firstname_lastname_underscore_format' => 'Vorname Nachname (erika_mustermann)',
+        'firstinitial.lastname' => 'Initial des Vornamen & Nachname (e.mustermann)',
+        'lastname_firstinitial' => 'Nachname Initial des Vornamens (mustermann_e)',
+        'lastname_dot_firstinitial_format' => 'Nachname Initial des Vornamens (mustermann.e)',
+        'firstnamelastname'     => 'Vorname Nachname (erikamustermann)',
+        'firstnamelastinitial'  => 'Vorname Initial des Nachnamen (erikam)',
+        'lastnamefirstname'      => 'Nachname.Vorname (mustermann.erika)',
+    ],
+
+    'email_formats' => [
+        'email_format'			=> 'E-Mail-Format',
+        'firstname_lastname_format'	=> 'Vorname.Nachname (erika.mustermann@example.com)',
+        'first_name_format'		=> 'Vorname (erika@example.com)',
+        'last_name_format'		=> 'Nachname (mustermann@beispiel.com)',
+        'filastname_format'			=> 'Initial des Vornamen & Nachname (emustermann@example.com)',
+        'lastnamefirstinitial_format' =>  'Nachname & Initial des Vornamens (mustere@example.com)',
+        'firstname_lastname_underscore_format' => 'Vorname Nachname (erika_mustermann@example.com)',
+        'firstinitial.lastname' => 'Initial des Vornamens Nachname (e.mustermann@example.com)',
+        'lastname_firstinitial' => 'Nachname Initial des Vornamens (mustermann_e@example.com)',
+        'lastname_dot_firstinitial_format' => 'Nachname & Initiale des Vornamens (mustermann.e@example.com)',
+        'firstnamelastname'     => 'Vorname Nachname (erikamustermann@example.com)',
+        'firstnamelastinitial'  => 'Vorname Initial des Nachnamen (erikam@example.com)',
+        'lastnamefirstname'      => 'Nachname.Vorname (mustermann.erika@example.com)',
+    ],
+
+
+
+    'logo_labels' => [
+        'acceptance_pdf_logo'       => 'PDF-Logo',
+        'email_logo'                => 'E-Mail-Logo',
+        'label_logo'                => 'Label-Logo',
+        'logo'                      => 'Seiten-Logo',
+        'favicon'                   => 'Favicon',
+    ],
+
+    'logo_help' => [
+        'email_logo_size'       => 'Quadratische Logos in E-Mails sehen am besten aus. ',
+    ],
+
+    'logo_option_types' => [
+        'text' => 'Text',
+        'logo' => 'Logo',
+        'logo_and_text' => 'Logo und Text',
+    ],
+
+
+    'legends' => [
+        'scoping' => 'Ummantelung',
+        'formats' => 'Standardformate',
+        'profiles' => 'Benutzerprofile',
+        'eula' => 'EULA & Akzeptanzeinstellungen',
+        'misc_display' => 'Verschiedene Anzeigeoptionen',
+        'email' => 'E-Mail-Einstellungen',
+        'checkin' => 'Checkin Einstellungen',
+        'dashboard' => 'Login & Dashboard Einstellungen',
+        'misc' => 'Sonstiges',
+        'logos' => 'Logos & Bildschirm',
+        'colors' => 'Farben & Skins',
+        'footer' => 'Fußzeileneinstellungen',
+        'security' => 'Sicherheitseinstellungen',
+        'general' => 'Allgemein',
+        'intervals' => 'Intervalle & Grenzwerte',
+    ],
+
+
+    /* Keywords for settings overview help */
+    'keywords' => [
+        'brand'             => 'Fußzeile, Logo, Druck, Thema, Skin, Header, Farben, Farbe, CSS',
+        'general_settings'  => 'firmenunterstützung, Unterschrift, Akzeptanz, E-Mail-Format, Benutzername Format, Bilder, pro Seite, Vorschaubilder, eula, gravatar, tos, Dashboard, Privatsphäre',
+        'groups'            => 'berechtigungen, Berechtigungsgruppen, Autorisierung',
+        'labels'            => 'Etiketten, Barcodes, Strichcode, Tabellen, Druck, Upc, Qr, 1D, 2D',
+        'localization'      => 'lokalisierung, Währung, lokal, Lokal, Zeitzone, International, Internationalisierung, Sprache, Sprachen, Übersetzung',
+        'php_overview'      => 'phpinfo, System, Info',
+        'purge'             => 'Endgültig löschen',
+        'security'          => 'Passwort, Passwörter, Anforderungen, Zwei-Faktor, Zwei-Faktor, übliche Passwörter, Remote-Login, Logout, Authentifizierung',
+    ],
 
 ];
diff --git a/resources/lang/de-if/admin/settings/message.php b/resources/lang/de-if/admin/settings/message.php
index 1748701bef..8fe228b803 100644
--- a/resources/lang/de-if/admin/settings/message.php
+++ b/resources/lang/de-if/admin/settings/message.php
@@ -12,7 +12,10 @@ return [
         'generated'             => 'Neue Backup Datei erfolgreich erstellt.',
         'file_not_found'        => 'Backup Datei konnte nicht gefunden werden.',
         'restore_warning'       => 'Ja, wiederherstellen. Ich bestätige, dass dies alle vorhandenen Daten überschreibt, die derzeit in der Datenbank vorhanden sind. Diese Aktion wird auch alle bestehenden Benutzer abmelden (einschließlich Dir).',
-        'restore_confirm'       => 'Bist Du sicher, dass Du Deine Datenbank aus :filename wiederherstellen möchten?'
+        'restore_confirm'       => 'Bist du sicher, dass du deine Datenbank aus :filename wiederherstellen möchten?'
+    ],
+    'restore' => [
+        'success'               => 'Ihr Systembackup wurde wiederhergestellt. Bitte melde dich erneut an.'
     ],
     'purge' => [
         'error'     => 'Beim Bereinigen ist ein Fehler augetreten. ',
@@ -23,7 +26,7 @@ return [
         'sending' => 'Test E-Mail wird gesendet...',
         'success' => 'Mail gesendet!',
         'error' => 'E-Mail konnte nicht gesendet werden.',
-        'additional' => 'Keine zusätzliche Fehlermeldung vorhanden. Überprüfe Deine E-Mail-Einstellungen und Dein App-Protokoll.'
+        'additional' => 'Keine zusätzliche Fehlermeldung vorhanden. Überprüfe deine E-Mail-Einstellungen und dein App-Protokoll.'
     ],
     'ldap' => [
         'testing' => 'Teste LDAP Verbindung, Binding & Abfrage ...',
@@ -33,6 +36,9 @@ return [
         'testing_authentication' => 'LDAP-Authentifizierung wird getestet...',
         'authentication_success' => 'Benutzer wurde erfolgreich gegen LDAP authentifiziert!'
     ],
+    'labels' => [
+        'null_template' => 'Etikettenvorlage nicht gefunden. Bitte wähle eine Vorlage aus.',
+        ],
     'webhook' => [
         'sending' => ':app Testnachricht wird gesendet ...',
         'success' => 'Deine :webhook_name Integration funktioniert!',
@@ -42,5 +48,12 @@ return [
         'error' => 'Etwas ist schiefgelaufen. :app antwortete mit: :error_message',
         'error_redirect' => 'FEHLER: 301/302 :endpoint gibt eine Umleitung zurück. Aus Sicherheitsgründen folgen wir keine Umleitungen. Bitte verwende den aktuellen Endpunkt.',
         'error_misc' => 'Etwas ist schiefgelaufen! :( ',
-    ]
+        'webhook_fail' => ' Webhook-Benachrichtigung fehlgeschlagen: Überprüfe, ob die URL noch gültig ist.',
+        'webhook_channel_not_found' => ' Webhook-Channel nicht gefunden.',
+        'ms_teams_deprecation' => 'Die ausgewählte Microsoft Teams-Webhook-URL wird am 31. Dezember 2025 abgeschaltet. Bitte nutze stattdessen eine Workflow-URL. Wie du so einen Workflow erstellst, steht in der Microsoft-Dokumentation <a href="https://support.microsoft.com/en-us/office/create-incoming-webhooks-with-workflows-for-microsoft-teams-8ae491c7-0394-4861-ba59-055e33f75498" target="_blank">hier.</a>',
+    ],
+    'location_scoping' => [
+        'not_saved' => 'Deine Einstellungen wurden nicht gespeichert.',
+        'mismatch' => 'Es gibt 1 Element in der Datenbank, das Deine Aufmerksamkeit benötigt, bevor Du die Standortbereicherung aktivieren kannst. Es gibt :count Elemente in der Datenbank, die Deine Aufmerksamkeit benötigen, bevor Du die Standortbereicherung aktivieren kannst.',
+    ],
 ];
diff --git a/resources/lang/de-if/admin/statuslabels/message.php b/resources/lang/de-if/admin/statuslabels/message.php
index 0b6937b035..8eb7361d80 100644
--- a/resources/lang/de-if/admin/statuslabels/message.php
+++ b/resources/lang/de-if/admin/statuslabels/message.php
@@ -17,7 +17,7 @@ return [
     ],
 
     'delete' => [
-        'confirm'   => 'Bist Du sicher, dass Du diese Statusbezeichnung löschen willst?',
+        'confirm'   => 'Bist du sicher, dass du diese Statusbezeichnung löschen willst?',
         'error'   => 'Es trat ein Fehler beim Löschen der Statusbezeichnung auf. Bitte versuche es erneut.',
         'success' => 'Die Statusbezeichnung wurde erfolgreich gelöscht.',
     ],
diff --git a/resources/lang/de-if/admin/statuslabels/table.php b/resources/lang/de-if/admin/statuslabels/table.php
index a605b7d294..b125434c78 100644
--- a/resources/lang/de-if/admin/statuslabels/table.php
+++ b/resources/lang/de-if/admin/statuslabels/table.php
@@ -1,14 +1,14 @@
 <?php
 
 return array(
-    'about'      	=> 'Über Statusbezeichnungen',
+    'about'      	=> 'Statusbezeichnungen erklärt',
     'archived'      	=> 'Archiviert',
     'create'      	=> 'Statusbezeichnung erstellen',
     'color'      	=> 'Diagrammfarbe',
     'default_label' => 'Standardbezeichnung',
     'default_label_help' => 'Dies wird verwendet, um sicherzustellen, dass die am häufigsten verwendeten Statusbeschriftungen beim Erstellen / Bearbeiten von Assets oben im Auswahlfeld angezeigt werden.',
     'deployable'      	=> 'Einsetzbar',
-    'info'      	=> 'Statusbezeichnungen werden eingesetzt, um diverse Zustände Deiner Assets zu beschreiben. Diese können z. B. in Reparatur sein, gestohlen oder verloren worden sein. Du kannst neue Statusbezeichnungen für einsetzbare, ausstehende und archivierte Assets erstellen.',
+    'info'      	=> 'Statusbezeichnungen beschreiben die verschiedenen Zustände, in denen sich deine Assets befinden können – z. B. zur Reparatur, verloren oder gestohlen. Du kannst eigene Statusbezeichnungen für einsetzbare, ausstehende und archivierte Assets anlegen, passend zu deinem Workflow. Mehr Infos findest du in der <a href="https://snipe-it.readme.io/docs/overview#status-labels" target="_blank">Dokumentation <i class="fa fa-external-link"></i></a>.',
     'name'      	=> 'Statusname',
     'pending'      	=> 'Ausstehend',
     'status_type'   => 'Statustyp',
diff --git a/resources/lang/de-if/admin/suppliers/message.php b/resources/lang/de-if/admin/suppliers/message.php
index ab6a21f565..7c753552c8 100644
--- a/resources/lang/de-if/admin/suppliers/message.php
+++ b/resources/lang/de-if/admin/suppliers/message.php
@@ -17,7 +17,7 @@ return array(
     ),
 
     'delete' => array(
-        'confirm'   => 'Bist Du sicher, dass Du diesen Lieferanten löschen möchtest?',
+        'confirm'   => 'Bist du sicher, dass du diesen Lieferanten löschen möchtest?',
         'error'   => 'Beim Löschen des Lieferanten ist ein Fehler aufgetreten. Bitte versuche es erneut.',
         'success' => 'Lieferant wurde erfolgreich gelöscht.',
         'assoc_assets'	 => 'Dieser Lieferant ist derzeit :asset_count Asset(s) zugeordnet und kann nicht gelöscht werden. Bitte aktualisiere Deine Assets, so dass sie nicht mehr auf diesen Lieferant verweisen und versuche es erneut. ',
diff --git a/resources/lang/de-if/admin/users/general.php b/resources/lang/de-if/admin/users/general.php
index 10b5b0d236..878f841b82 100644
--- a/resources/lang/de-if/admin/users/general.php
+++ b/resources/lang/de-if/admin/users/general.php
@@ -2,9 +2,9 @@
 
 return [
     'activated_help_text' => 'Der Nutzer kann sich einloggen',
-    'activated_disabled_help_text' => 'Du kannst den Aktiverungsstatus für Dein eigenes Account nicht ändern.',
+    'activated_disabled_help_text' => 'Du kannst den Aktivierungsstatus für deinen eigenen Account nicht bearbeiten.',
     'assets_user'       => 'Assets zugewiesen an :name',
-    'bulk_update_warn'	=> 'Du bist dabei, die Eigenschaften von :user_count Benutzern zu bearbeiten. Bitte beachte, dass Du Deine eigenen Benutzerattribute nicht über dieses Formular ändern kansst. Du musst Deinen eigenen Benutzer einzeln bearbeiten.',
+    'bulk_update_warn'	=> 'Du bist dabei, die Eigenschaften von :user_count Benutzern zu bearbeiten. Bitte beachte, dass du deine eigenen Benutzerattribute nicht über dieses Formular ändern kannst und Änderungen an deinem eigenen Benutzer einzeln vornehmen musst.',
     'bulk_update_help'	=> 'Hier können mehrere Benutzer gleichzeitig bearbeitet werden. Nur Felder ausfüllen, welche geändert werden sollen. Leere Felder werden nicht geändert.',
     'current_assets'    => 'Asset wurde an nachfolgenden Benutzer ausgegeben',
     'clone'             => 'Benutzer kopieren',
@@ -19,13 +19,15 @@ return [
     'print_assigned'    => 'Alles Zugewiesene drucken',
     'email_assigned'    => 'E-Mail-Liste aller Zugewiesenen',
     'user_notified'     => 'Der Benutzer hat eine Liste seiner aktuell zugewiesenen Artikel per E-Mail erhalten.',
+    'users_notified'    => 'Dem Benutzer wurde eine Liste der aktuell zugewiesenen Artikel per E-Mail gesendet.|:count Benutzer wurden per E-Mail die Liste ihrer aktuell zugewiesenen Artikel gesendet.',
+    'users_notified_warning' => ':count Benutzer hat eine Liste der aktuell zugewiesenen Gegenstände per E-Mail erhalten, jedoch hatten :no_email Benutzer keine E-Mail-Adresse, so dass sie nicht per E-Mail empfangen werden konnten. :count Benutzer haben eine Liste der aktuell zugewiesenen Elemente per E-Mail erhalten, jedoch hatten :no_email Benutzer keine E-Mail-Adresse, so dass sie nicht per E-Mail empfangen werden konnten.',
     'auto_assign_label' => 'Diesen Benutzer bei der automatischen Zuweisung berechtigter Lizenzen einbeziehen',
     'auto_assign_help'  => 'Diesen Benutzer bei der automatischen Zuweisung von Lizenzen überspringen',
     'software_user'     => 'Software herausgegeben an :name',
     'send_email_help'   => 'Du musst eine E-Mail-Adresse angeben, um dem Benutzer Zugangsdaten zu zusenden. Das Versenden von Zugangsdaten ist nur bei der Erstellung eines Benutzers möglich. Passwörter werden in einem Einweg-Hash gespeichert und können danach nicht mehr ausgelesen werden.',
     'view_user'         => 'Benutzer :name ansehen',
     'usercsv'           => 'CSV Datei',
-    'two_factor_admin_optin_help' => 'Ihre aktuellen Administrator-Einstellungen erlauben die selektive Durchführung der zwei-Faktor-Authentifizierung.  ',
+    'two_factor_admin_optin_help' => 'Ihre aktuellen Administrator-Einstellungen erlauben die selektive Durchführung der Zwei-Faktor-Authentifizierung.  ',
     'two_factor_enrolled' => '2FA-Gerät registriert ',
     'two_factor_active'   => '2FA aktiv ',
     'user_deactivated'  => 'Benutzer kann sich nicht anmelden',
@@ -40,12 +42,12 @@ return [
     'checkin_user_properties' => 'Alle diesen Benutzern zugeordneten Objekte zurücknehmen',
     'remote_label'   => 'Dies ist ein externer Benutzer',
     'remote'   => 'Extern',
-    'remote_help' => 'Dies kann nützlich sein, wenn Du nach externen Benutzern filtern musst, die niemals oder nur selten an Ihre physischen Standorte kommen.',
+    'remote_help' => 'Dies kann nützlich sein, wenn du nach externen Benutzern filtern musst, die niemals oder nur selten an Ihre physischen Standorte kommen.',
     'not_remote_label' => 'Dies ist kein externer Benutzer',
     'vip_label' => 'VIP Benutzer',
     'vip_help' => 'Dies kann hilfreich sein, um wichtige Personen zu markieren, wenn du möchtest.',
     'create_user' => 'Benutzer erstellen',
-    'create_user_page_explanation' => 'Dies sind die Anmeldeinformationen, die Du verwendest, um zum ersten Mal auf die Webseite zuzugreifen.',
+    'create_user_page_explanation' => 'Dies sind die Anmeldeinformationen, die du verwendest, um zum ersten Mal auf die Webseite zuzugreifen.',
     'email_credentials' => 'E-Mail-Anmeldedaten',
     'email_credentials_text' => 'Meine Zugangsdaten an die oben genannte E-Mail-Adresse senden',
     'next_save_user' => 'Weiter: Benutzer speichern',
diff --git a/resources/lang/de-if/admin/users/message.php b/resources/lang/de-if/admin/users/message.php
index 8182ff6586..f56f0e36d5 100644
--- a/resources/lang/de-if/admin/users/message.php
+++ b/resources/lang/de-if/admin/users/message.php
@@ -4,9 +4,9 @@ return array(
 
     'accepted'                  => 'Du hast den Gegenstand erfolgreich angenommen.',
     'declined'                  => 'Du hast diesen Gegenstand erfolgreich abgelehnt.',
-    'bulk_manager_warn'	        => 'Deine Benutzer wurden erfolgreich aktualisiert, aber Dein Manager-Eintrag wurde nicht gespeichert, da der Manager, den Du ausgewählt hast, auch in der zu bearbeitenden Liste war, und Benutzer dürfen nicht ihr eigener Manager sein. Bitte wähle Deine Benutzer erneut aus, ohne den Manager.',
+    'bulk_manager_warn'	        => 'Deine Benutzer wurden erfolgreich aktualisiert, aber dein Manager-Eintrag wurde nicht gespeichert, da der Manager, den du ausgewählt hast, auch in der zu bearbeitenden Liste war, und Benutzer dürfen nicht ihr eigener Manager sein. Bitte wähle deine Benutzer erneut aus, ohne diesen Manager.',
     'user_exists'               => 'Benutzer existiert bereits!',
-    'user_not_found'            => 'Benutzer existiert nicht.',
+    'user_not_found'            => 'Der Benutzer existiert nicht oder du bistnicht berechtigt, ihn anzuzeigen.',
     'user_login_required'       => 'Das Loginfeld ist erforderlich',
     'user_has_no_assets_assigned' => 'Derzeit sind keine Assets dem Benutzer zugewiesen.',
     'user_password_required'    => 'Das Passswortfeld ist erforderlich.',
@@ -37,22 +37,23 @@ return array(
         'update' => 'Beim Aktualisieren des Benutzers ist ein Fehler aufgetreten. Bitte probiere es noch einmal.',
         'delete' => 'Beim Löschen des Benutzers ist ein Fehler aufgetreten. Bitte versuche es erneut.',
         'delete_has_assets' => 'Der Benutzer konnte nicht gelöscht werden, da ihm Gegenstände zugeordnet sind.',
-        'delete_has_assets_var' => 'This user still has an asset assigned. Please check it in first.|This user still has :count assets assigned. Please check their assets in first.',
-        'delete_has_licenses_var' => 'This user still has a license seats assigned. Please check it in first.|This user still has :count license seats assigned. Please check them in first.',
-        'delete_has_accessories_var' => 'This user still has an accessory assigned. Please check it in first.|This user still has :count accessories assigned. Please check their assets in first.',
-        'delete_has_locations_var' => 'This user still manages a location. Please select another manager first.|This user still manages :count locations. Please select another manager first.',
-        'delete_has_users_var' => 'This user still manages another user. Please select another manager for that user first.|This user still manages :count users. Please select another manager for them first.',
+        'delete_has_assets_var' => 'Dieser Benutzer hat noch ein Asset zugewiesen. Bitte nehme es zuerst zurück.|Dieser Benutzer hat noch :count Assets zugewiesen. Bitte nehme diese zuerst zurück.',
+        'delete_has_licenses_var' => 'Dieser Benutzer hat noch einen Lizenzplatz zugewiesen. Bitte nehme es zuerst zurück.|Dieser Benutzer hat noch :count Lizenzplätze zugewiesen. Bitte nehme diese zuerst zurück.',
+        'delete_has_accessories_var' => 'Dieser Benutzer hat noch ein Zubehör zugewiesen. Bitte nehme es zuerst zurück.|Dieser Benutzer hat noch :count Zubehöre zugewiesen. Bitte nehme diese zuerst zurück.',
+        'delete_has_locations_var' => 'Dieser Benutzer verwaltet noch einen anderen Standort. Bitte wähle zuerst einen anderen Manager.|Dieser Benutzer verwaltet noch :count Standorte. Bitte wähle zuerst einen anderen Manager.',
+        'delete_has_users_var' => 'Dieser Benutzer verwaltet noch einen anderen Benutzer. Bitte wähle zuerst einen anderen Manager für diesen Benutzer.|Dieser Benutzer verwaltet noch :count Benutzer. Bitte wähle zuerst einen anderen Manager.',
         'unsuspend' => 'Es gab ein Problem beim reaktivieren des Benutzers. Bitte versuche es erneut.',
         'import'    => 'Es gab ein Problem beim Importieren der Benutzer. Bitte noch einmal versuchen.',
         'asset_already_accepted' => 'Dieses Asset wurde bereits akzeptiert.',
         'accept_or_decline' => 'Du musst diesen Gegenstand entweder annehmen oder ablehnen.',
-        'cannot_delete_yourself' => 'We would feel really bad if you deleted yourself, please reconsider.',
-        'incorrect_user_accepted' => 'Das Asset, dass Du versuchst zu aktivieren, wurde nicht an Dich ausgebucht.',
+        'cannot_delete_yourself' => 'Wir würden uns wirklich schlecht fühlen, wenn du dich selbst löschen würdest. Überlege es dir bitte noch einmal.',
+        'incorrect_user_accepted' => 'Das Asset, das du annehmen willst, wurde nicht an dich ausgecheckt.',
         'ldap_could_not_connect' => 'Konnte keine Verbindung zum LDAP Server herstellen. Bitte LDAP Einstellungen in der LDAP Konfigurationsdatei prüfen. <br>Fehler vom LDAP Server:',
         'ldap_could_not_bind' => 'Konnte keine Verbindung zum LDAP Server herstellen. Bitte LDAP Einstellungen in der LDAP Konfigurationsdatei prüfen. <br>Fehler vom LDAP Server: ',
         'ldap_could_not_search' => 'Konnte LDAP Server nicht suchen. Bitte LDAP Einstellungen in der LDAP Konfigurationsdatei prüfen. <br>Fehler vom LDAP Server:',
         'ldap_could_not_get_entries' => 'Konnte keine Einträge vom LDAP Server abrufen. Bitte LDAP Einstellungen in der LDAP Konfigurationsdatei prüfen. <br>Fehler vom LDAP Server:',
         'password_ldap' => 'Das Passwort für diesen Account wird vom LDAP/Active Directory verwaltet. Bitte kontaktiere Deine IT-Abteilung, um Dein Passwort zu ändern. ',
+        'multi_company_items_assigned' => 'Diesem Benutzer sind Dinge zugewiesen, die zu einer anderen Firma gehören. Bitte checke sie ein oder bearbeite deine Firma.'
     ),
 
     'deletefile' => array(
diff --git a/resources/lang/de-if/admin/users/table.php b/resources/lang/de-if/admin/users/table.php
index f240ae35a9..478b090b93 100644
--- a/resources/lang/de-if/admin/users/table.php
+++ b/resources/lang/de-if/admin/users/table.php
@@ -22,7 +22,7 @@ return array(
     'managed_locations'     => 'Verwaltete Standorte',
     'managed_users'         => 'Verwaltete Benutzer',
     'name' 					=> 'Name',
-    'nogroup'               => 'Es wurden noch keine Gruppen erstellt. Um eine hinzuzufügen, besuche: ',
+    'nogroup'               => 'Es wurden noch keine Gruppen erstellt. Um eine hinzuzufügen, besuche:',
     'notes'                 => 'Notizen',
     'password_confirm' 		=> 'Passwort bestätigen',
     'password' 				=> 'Passwort',
@@ -35,7 +35,7 @@ return array(
     'updateuser' 			=> 'Benutzer aktualisieren',
     'username' 				=> 'Benutzername',
 	'user_deleted_text' 	=> 'Dieser Benutzer wurde als gelöscht markiert.',
-    'username_note' 		=> '(Dies wird nur für Active Directory Bindung verwendet, nicht für Login.)',
+    'username_note' 		=> '(Dies wird nur für die Active Directory-Bindung verwendet, nicht für die Anmeldung.)',
     'cloneuser'             => 'Benutzer kopieren',
     'viewusers' 			=> 'Benutzer anzeigen',
 );
diff --git a/resources/lang/de-if/auth.php b/resources/lang/de-if/auth.php
index e06a11f911..941c4086c9 100644
--- a/resources/lang/de-if/auth.php
+++ b/resources/lang/de-if/auth.php
@@ -15,6 +15,6 @@ return array(
 
     'failed' => 'Diese Zugangsdaten stimmen nicht mit unseren Datensätzen überein.',
     'password' => 'Das angegebene Passwort ist ungültig.',
-    'throttle' => 'Zu viele fehlgeschlagene Anmeldeversuche. Bitte versuche es erneut in :seconds Sekunden.',
+    'throttle' => 'Zu viele fehlgeschlagene Anmeldeversuche. Bitte versuche es in :minutes Minute(n) erneut.',
 
 );
diff --git a/resources/lang/de-if/auth/general.php b/resources/lang/de-if/auth/general.php
index f7fbdfdcfe..eca2f213c4 100644
--- a/resources/lang/de-if/auth/general.php
+++ b/resources/lang/de-if/auth/general.php
@@ -11,7 +11,7 @@ return [
     'ldap_reset_password'           => 'Bitte klicke hier, um Dein LDAP-Passwort zurückzusetzen',
     'remember_me'                   => 'Benutzername merken',
     'username_help_top'                 => '<strong>Benutzernamen</strong> eingeben, um einen Link zum Zurücksetzen des Passwortes per E-Mail zu erhalten.',
-    'username_help_bottom'          => 'Abhängig von der Konfiguration, <em>kann</em> der Benutzername identisch mit ihrer E-Mailadresse sein. Falls Du Deinen Benutzernamen vergessen hast, kontaktiere Deinen Administrator.<br><br><strong>Benutzernamen ohne zugeordnete E-Mailadresse erhalten keine E-Mail zum Zurücksetzen des Passwortes.</strong> ',
+    'username_help_bottom'          => 'Abhängig von der Konfiguration, <em>kann</em> der Benutzername identisch mit ihrer E-Mailadresse sein. Falls du deinen Benutzernamen vergessen hast, kontaktiere deinen Administrator.<br><br><strong>Benutzernamen ohne zugeordnete E-Mailadresse erhalten keine E-Mail zum Zurücksetzen des Passwortes.</strong> ',
     'google_login'                  => 'Mit Google Workspace anmelden',
     'google_login_failed'           => 'Anmeldung fehlgeschlagen, bitte melde dich erneut an!',
 ];
diff --git a/resources/lang/de-if/auth/message.php b/resources/lang/de-if/auth/message.php
index 775c87c58f..2f37972b9d 100644
--- a/resources/lang/de-if/auth/message.php
+++ b/resources/lang/de-if/auth/message.php
@@ -6,26 +6,24 @@ return array(
     'account_not_found'      => 'Benutzername oder Passwort sind nicht korrekt.',
     'account_not_activated'  => 'Das Benutzerkonto ist nicht aktiviert.',
     'account_suspended'      => 'Dieses Benutzerkonto ist gesperrt.',
-    'account_banned'         => 'Dieses Benutzerkonto wurde ausgeschlossen.',
-    'throttle'               => 'Zu viele fehlgeschlagene Anmeldeversuche. Bitte versuche es in :minutes Minuten erneut.',
 
     'two_factor' => array(
         'already_enrolled'      => 'Dein Gerät ist bereits eingeschrieben.',
-        'success'               => 'Du hast Dich erfolgreich angemeldet.',
+        'success'               => 'Du hast dich erfolgreich angemeldet.',
         'code_required'         => 'Zwei-Faktor-Code ist erforderlich.',
         'invalid_code'          => 'Zwei-Faktor-Code ist ungültig.',
-        'enter_two_factor_code' => 'Please enter your two-factor authentication code.',
-        'please_enroll'         => 'Please enroll a device in two-factor authentication.',
+        'enter_two_factor_code' => 'Bitte gebe deinen Zwei-Faktor-Authentifizierungscode ein.',
+        'please_enroll'         => 'Bitte registriere ein Gerät für die Zwei-Faktor-Authentifizierung.',
     ),
 
     'signin' => array(
         'error'   => 'Bei der Anmeldung ist ein Problem aufgetreten, bitte versuche es erneut.',
-        'success' => 'Du hast Dich erfolgreich angemeldet.',
+        'success' => 'Du hast dich erfolgreich angemeldet.',
     ),
 
     'logout' => array(
         'error'   => 'Beim Abmelden ist ein Fehler aufgetreten. Bitte versuche es erneut.',
-        'success' => 'Du hast Dich erfolgreich abgemeldet.',
+        'success' => 'Du hast dich erfolgreich abgemeldet.',
     ),
 
     'signup' => array(
diff --git a/resources/lang/de-if/button.php b/resources/lang/de-if/button.php
index 4e1c4424ef..b0ef0e5936 100644
--- a/resources/lang/de-if/button.php
+++ b/resources/lang/de-if/button.php
@@ -7,6 +7,7 @@ return [
     'checkin_and_delete'  	    => 'Alles einchecken / Benutzer löschen',
     'delete'  	                => 'Löschen',
     'edit'    	                => 'Bearbeiten',
+    'clone'    	                => 'Duplizieren',
     'restore' 	                => 'Wiederherstellen',
     'remove'                    => 'Entfernen',
     'request'                   => 'Anfrage',
@@ -21,4 +22,13 @@ return [
     'add_maintenance'           => 'Füge Wartung hinzu',
     'append'                    => 'Anhängen',
     'new'                       => 'Neu',
+    'var' => [
+        'clone'     => ':item_type duplizieren',
+        'edit'      => ':item_type bearbeiten',
+        'delete'    => ':item_type löschen',
+        'restore'   => ':item_type wiederherstellen',
+        'create'    => 'Neue&#47;s :item_type erstellen',
+        'checkout'  => ':item_type herausgeben',
+        'checkin'   => ':item_type zurücknehmen',
+    ]
 ];
diff --git a/resources/lang/de-if/general.php b/resources/lang/de-if/general.php
index 40a859769b..68a87f375f 100644
--- a/resources/lang/de-if/general.php
+++ b/resources/lang/de-if/general.php
@@ -10,7 +10,7 @@ return [
     'action'                => 'Aktion',
     'activity_report'		=> 'Aktivitätsbericht',
     'address'				=> 'Adresse',
-    'admin'					=> 'Admin',
+    'admin'					=> 'Admin-Einstellungen',
     'admin_tooltip'			=> 'Dieser Benutzer hat Administratorrechte',
     'superuser'				=> 'Superbenutzer',
     'superuser_tooltip'		=> 'Dieser Benutzer hat Superbenutzer-Rechte',
@@ -23,19 +23,22 @@ return [
     'asset_models'			=> 'Modellbezeichnungen',
     'asset_model'			=> 'Modell',
     'asset'					=> 'Asset',
+    'asset_previous'        => 'Asset (Zuvor zugewiesen)',
     'asset_report'          => 'Bestandsbericht',
     'asset_tag'				=> 'Kennzeichnung',
     'asset_tags'            => 'Inventarnummern',
     'assets_available'		=> 'Verfügbare Assets',
     'accept_assets'         => 'Assets :name akzeptieren',
     'accept_assets_menu'    => 'Assets akzeptieren',
+    'accept_item'           => 'Gegenstand akzeptieren',
     'audit'				    => 'Prüfung',
+    'audits'				=> 'Prüfung',
     'audit_report'			=> 'Prüfungsbericht',
     'assets'				=> 'Assets',
     'assets_audited'        => 'Assets geprüft',
     'assets_checked_in_count'     => 'Asset zurückgenommen',
     'assets_checked_out_count'     => 'Assets herausgegeben',
-    'asset_deleted_warning'     => 'Dieses Asset wurde gelöscht. Du musst es wiederherstellen, bevor Du es jemandem zuweisen kannst.',
+    'asset_deleted_warning'     => 'Dieses Asset wurde gelöscht. Du musst es wiederherstellen, bevor du es jemandem zuweisen kannst.',
     'assigned_date'         => 'Zuweisungsdatum',
     'assigned_to'           => 'Herausgegeben an :name',
     'assignee'              => 'Herausgegeben an',
@@ -61,9 +64,12 @@ return [
     'changepassword'  		=> 'Passwort ändern',
     'checkin'  				=> 'Zurücknehmen',
     'checkin_from'  		=> 'Zurücknehmen von',
+    'checkin_note'  		=> 'Rücknahme Notiz',
+    'checkout_note'  		=> 'Ausgabe Notiz',
     'checkout'  			=> 'Herausgeben',
     'checkouts_count'       => 'Herausgaben',
     'checkins_count'        => 'Rücknahmen',
+    'checkin_and_delete'  	=> 'Zurücknehmen und Löschen',
     'user_requests_count'   => 'Anfragen',
     'city'  				=> 'Stadt',
     'click_here'			=> 'Hier klicken',
@@ -77,7 +83,7 @@ return [
     'consumables'			=> 'Verbrauchsmaterialien',
     'country'  				=> 'Land',
     'could_not_restore'     => 'Fehler beim Wiederherstellen von :item_type: :error',
-    'not_deleted'           => ':item_type wurde nicht gelöscht, kann daher nicht wiederhergestellt werden',
+    'not_deleted'           => 'Diese/s :item_type wurde nicht gelöscht und kann daher nicht wiederhergestellt werden',
     'create'				=> 'Hinzufügen',
     'created'               => 'Eintrag erstellt',
     'created_asset'			=> 'Asset angelegt',
@@ -86,11 +92,13 @@ return [
     'record_created' 		=> 'Eintrag erstellt',
     'updated_at' 			=> 'Aktualisiert am',
     'currency'  			=> '€', // this is deprecated
+    'currency_text'  		=> 'Währung', //
     'current'  				=> 'Aktuell',
     'current_password'      => 'Aktuelles Passwort',
     'customize_report'      => 'Bericht anpassen',
     'custom_report'         => 'Benutzerdefinierter Asset-Bericht',
     'dashboard'				=> 'Dashboard',
+    'data_source'           => 'Datenquelle',
     'days'      			=> 'Tage',
     'days_to_next_audit'    => 'Tage bis zur nächsten Prüfung',
     'date'					=> 'Datum',
@@ -98,7 +106,7 @@ return [
     'debug_warning_text'    => 'Diese Anwendung läuft im Produktionsmodus mit debugging aktiviert. Dies kann sensible Daten verfügbar machen, wenn Ihre Anwendung öffentlich zugänglich ist. Deaktiviere den Debug-Modus, indem du den <code>APP_DEBUG</code>-Wert in der <code>.env</code> Datei auf <code>false</code> setzt.',
     'delete'  				=> 'Löschen',
     'delete_confirm'  		=> 'Bist du sicher, dass du :item löschen möchtest?',
-    'delete_confirm_no_undo' => 'Möchtest du :item wirklich löschen? Diese Aktion kann nicht rückgängig gemacht werden.',
+    'delete_confirm_no_undo' => 'Möchtest du :item wirklich löschen? Dies kann nicht rückgängig gemacht werden.',
     'deleted'  				=> 'Gelöscht',
     'delete_seats'  		=> 'Gelöschte Lizenzen',
     'deletion_failed'       => 'Löschen fehlgeschlagen',
@@ -114,29 +122,13 @@ return [
     'editprofile'  			=> 'Profil bearbeiten',
     'eol'					=> 'EOL',
     'email_domain'			=> 'E-Mail-Domain',
-    'email_format'			=> 'E-Mail-Format',
     'employee_number'       => 'Mitarbeiternummer',
     'email_domain_help'		=> 'Dies wird verwendet, um E-Mail-Adressen bei Imports zu generieren',
     'error'				    => 'Fehler',
     'exclude_archived'      => 'Archivierte Assets ausschließen',
     'exclude_deleted'       => 'Gelöschte Assets ausschließen',
     'example'				=> 'Beispiel: ',
-    'filastname_format'			=> 'Initial des VornamenNachname (emustermann@beispiel.de)',
-    'firstname_lastname_format'	=> 'Vorname.Nachname (Erika.Mustermann@beispiel.de)',
-    'firstname_lastname_underscore_format' => 'Vorname Nachname (Erika_Mustermann@beispiel.de)',
-    'lastnamefirstinitial_format' =>  'NachnameInitial des Vornamens (mustermanne@beispiel.de)',
-    'firstintial_dot_lastname_format' => 'Initial des Vorname.Nachname (e.mustermann@beispiel.de)',
-    'firstname_lastname_display'	=> 'Vorname Nachname (Jane Smith)',
-    'lastname_firstname_display'	=> 'Nachname Vorname (Smith Jane)',
-    'name_display_format'	=> 'Name Anzeigeformat',
-    'first'					=> 'Erste',
-    'firstnamelastname'     => 'VornameNachname (ErikaMustermann@beispiel.de)',
-    'lastname_firstinitial' => 'Nachname_Initial des Vornamens (mustermann_e@beispiel.de)',
-    'firstinitial.lastname' => 'Initial des Vornamens.Nachname (e.mustermann@beispiel.de)',
-    'firstnamelastinitial'  => 'Vorname_Initial des Nachnamen (erika_m@beispiel.de)',
-    'lastnamefirstname'      => 'Nach- und Vorname (mustermann.jana@example.com)',
-    'first_name'			=> 'Vorname',
-    'first_name_format'		=> 'Vorname (erika@beispiel.de)',
+
     'files'                 => 'Dateien',
     'file_name'				=> 'Datei',
     'file_type'             => 'Dateityp',
@@ -156,9 +148,9 @@ return [
     'image_delete'         	=> 'Bild löschen',
     'include_deleted'       => 'Gelöschte Assets einbeziehen',
     'image_upload'         	=> 'Bild hochladen',
-    'filetypes_accepted_help'    => 'Akzeptierter Dateityp ist :types. Maximal zulässige Upload-Größe ist :size.|Akzeptierte Dateitypen sind :types. Maximal erlaubte Upload-Größe ist :size.',
-    'filetypes_size_help'   => 'Maximal erlaubte Upload-Größe ist :size.',
-    'image_filetypes_help'  => 'Accepted filetypes are jpg, webp, png, gif, svg, and avif. Max upload size allowed is :size.',
+    'filetypes_accepted_help'    => 'Akzeptierter Dateityp ist :types. Maximal zulässige Größe ist :size.|Akzeptierte Dateitypen sind :types. Maximal erlaubte Hochlade-Größe ist :size.',
+    'filetypes_size_help'   => 'Die maximal erlaubte Upload-Größe ist :size.',
+    'image_filetypes_help'  => 'Akzeptierte Dateitypen sind jpg, webp, png, gif, svg, und avif. Die maximal zulässige Upload-Größe beträgt :size.',
     'unaccepted_image_type'  => 'Diese Bilddatei ist nicht lesbar. Akzeptierte Dateitypen sind jpg, webp, png, gif und svg. Der MIME-Type dieser Datei ist: :mimetype.',
     'import'         	    => 'Import',
     'import_this_file'      => 'Felder zuordnen und diese Datei bearbeiten',
@@ -178,12 +170,17 @@ return [
     'last'					=> 'Letzte',
     'last_login'            => 'Letzte Anmeldung',
     'last_name'             => 'Nachname',
+    'firstname_lastname_display'	=> 'Vorname Nachname (Max Mustermann)',
+    'lastname_firstname_display'	=> 'Nachname Vorname (Mustermann Max)',
+    'name_display_format'	=> 'Name Anzeigeformat',
+    'first'					=> 'Erste',
+    'first_name'			=> 'Vorname',
     'license'				=> 'Lizenz',
     'license_report'        => 'Lizenzbericht',
     'licenses_available'	=> 'Verfügbare Lizenzen',
     'licenses'				=> 'Lizenzen',
     'list_all'				=> 'Alle auflisten',
-    'loading'				=> 'Wird geladen, bitte warten...',
+    'loading'				=> 'Wird geladen... Bitte warten...',
     'lock_passwords'        => 'Dieser Feldwert wird in einer Demo-Installation nicht gespeichert.',
     'feature_disabled'      => 'Diese Funktion wurde für die Demo-Installation deaktiviert.',
     'location'              => 'Standort',
@@ -207,7 +204,7 @@ return [
     'next'					=> 'Nächste',
     'next_audit_date'		=> 'Nächstes Prüfdatum',
     'next_audit_date_help'  => 'Wenn Sie Auditing in Ihrer Organisation verwenden, dies wird in der Regel automatisch anhand des letzten Prüfdatums und der Prüffrequenz (in <code>Admin-Einstellungen &gt; Alarme</code>) berechnet und Sie können dies leer lassen. Sie können dieses Datum hier manuell festlegen, wenn Sie es benötigen, aber es muss später als das letzte Prüfungsdatum sein. ',
-    'audit_images_help'     => 'You can find audit images in the asset\'s history tab.',
+    'audit_images_help'     => 'Du kannst Prüfbilder in der Asset-Historie finden.',
     'no_email'              => 'Keine E-Mail-Adresse mit diesem Benutzer verknüpft',
     'last_audit'		    => 'Letzte Prüfung',
     'new'					=> 'Neu!',
@@ -215,6 +212,14 @@ return [
     'no_results'			=> 'Keine Treffer.',
     'no'  					=> 'Nein',
     'notes'  				=> 'Anmerkungen',
+    'note_added'            => 'Notiz hinzugefügt',
+    'options'				=> 'Optionen',
+    'preview'				=> 'Vorschau',
+    'add_note'              => 'Notiz hinzufügen',
+    'note_edited'            => 'Notiz bearbeitet',
+    'edit_note'              => 'Notiz bearbeiten',
+    'note_deleted'            => 'Notiz gelöscht',
+    'delete_note'              => 'Notiz löschen',
     'order_number'          => 'Auftragsnummer',
     'only_deleted'          => 'Nur gelöschte Assets',
     'page_menu'				=> 'Zeige _MENU_ Einträge',
@@ -229,7 +234,7 @@ return [
     'purchase_date'         => 'Kaufdatum',
     'qty'		            => 'Menge',
     'quantity'		        => 'Anzahl',
-    'quantity_minimum'      => ':count Artikel sind unter oder fast unter der Mindestmenge',
+    'quantity_minimum'      => 'Du hast einen Artikel unter oder fast unter Mindestmenge Level|Du hast :count Artikel unterhalb oder fast unter Mindestmenge',
     'quickscan_checkin'  	=> 'Schnell Rücknahme',
     'quickscan_checkin_status'  	=> 'Rückgabe Status',
     'ready_to_deploy'		=> 'Bereit zum Herausgeben',
@@ -240,7 +245,7 @@ return [
     'restored'				=> 'Wiederhergestellt',
     'restore'				=> 'Wiederherstellen',
     'requestable_models'    => 'Angeforderte Modelle',
-    'requestable_items'     => 'Requestable Items',
+    'requestable_items'     => 'Anforderbare Gegenstände',
     'requested'				=> 'Angefragt',
     'requested_date'        => 'Anfragedatum',
     'requested_assets'      => 'Angeforderte Assets',
@@ -265,7 +270,7 @@ return [
     'select_date'			=> 'Datum auswählen (JJJJ-MM-TT)',
     'select_statuslabel'	=> 'Wähle einen Status',
     'select_company'    	=> 'Firma auswählen',
-    'select_asset'    		=> 'Asset auswählen',
+    'select_asset'    		=> 'Wähle ein Asset',
     'settings'				=> 'Einstellungen',
     'show_deleted'  		=> 'Gelöschte anzeigen',
     'show_current'  		=> 'Aktuelles anzeigen',
@@ -274,17 +279,19 @@ return [
     'signed_off_by'         => 'Unterschrieben von',
     'skin'       			=> 'Skin',
     'webhook_msg_note'        => 'Eine Benachrichtigung wird über den Webhook gesendet',
-    'webhook_test_msg'        => 'Oh hey! Sieht so aus, als ob Deine :app Integration mit Snipe-IT funktioniert!',
+    'webhook_test_msg'        => 'Oh hi! Sieht so aus, als ob Deine :app Integration mit Snipe-IT funktioniert!',
     'some_features_disabled' => 'Einige Funktionen sind für den DEMO-Modus deaktiviert.',
     'site_name'				=> 'Seitenname',
     'state'  				=> 'Bundesland',
     'status_labels'			=> 'Statusbezeichnungen',
+    'status_label'			=> 'Statusbezeichnung',
     'status'    			=> 'Status',
     'accept_eula'           => 'Annahmeerklärung',
+    'show_or_hide_eulas' => 'EULAs ein-/ausblenden',
     'supplier'              => 'Lieferant',
     'suppliers'  			=> 'Lieferanten',
-    'sure_to_delete'        => 'Bist Du Dir sicher, dass du das löschen möchtest',
-    'sure_to_delete_var'    => 'Willst Du :item wirklich löschen?',
+    'sure_to_delete'        => 'Bist du dir sicher, dass du das löschen möchtest',
+    'sure_to_delete_var'    => 'Willst du :item wirklich löschen?',
     'delete_what'           => ':item löschen',
     'submit'				=> 'Abschicken',
     'target'                => 'Ziel',
@@ -296,15 +303,15 @@ return [
     'type'  				=> 'Typ',
     'undeployable'			=> 'Nicht herausgebbar',
     'unknown_admin'			=> 'Unbekannter Administrator',
-    'username_format'		=> 'Format der Benutzernamen',
     'username'              => 'Benutzername',
     'update'                => 'Aktualisieren',
+    'updating_item' => ':item wird aktualisiert',
     'upload_filetypes_help'      => 'Erlaubte Dateitypen sind png, gif, jpg, jpeg, doc, docx, pdf, xls, xlsx, txt, lic, xml, zip, rtf und rar. Maximale Uploadgröße beträgt :size.',
     'uploaded'              => 'Hochgeladen',
     'user'					=> 'Benutzer',
     'accepted'			    => 'angenommen',
     'declined'			    => 'abgelehnt',
-    'declined_note'         => 'Declined Notes',
+    'declined_note'         => 'Abgelehnte Notiz',
     'unassigned'            => 'Nicht zugewiesen',
     'unaccepted_asset_report' => 'Nicht akzeptierte Assets',
     'users'                 => 'Benutzer',
@@ -323,10 +330,10 @@ return [
     'token_expired'         => 'Deine Sitzung ist abgelaufen. Bitte versuche es erneut.',
     'login_enabled'         => 'Login aktiviert',
     'audit_due'             => 'Prüfung fällig',
-    'audit_due_days'        => 'Fällige Assets für Prüfung innerhalb von :days Tag|Fällige Assets für Prüfung innerhalb von :days',
+    'audit_due_days'        => '{}Vermögenswerte, die zur Prüfung fällig oder überfällig sind|[1]Vermögenswerte, die innerhalb eines Tages zur Prüfung fällig oder überfällig sind|[2,*]Vermögenswerte, die innerhalb von :days Tagen zur Prüfung fällig oder überfällig sind',
     'checkin_due'           => 'Fällig zum Check-in',
     'checkin_overdue'       => 'Überfällig für den Check-in',
-    'checkin_due_days'      => 'Fällige Assets für den Check-in innerhalb von :days Tag|Fällige Assets für den Check-in innerhalb von :days',
+    'checkin_due_days'      => '{}Zum Einchecken fällig|[1]Assets fällig zum Einchecken innerhalb von :days Tag|[2,*]Assets fällig zum Einchecken innerhalb von :days Tagen',
     'audit_overdue'         => 'Prüfung überfällig',
     'accept'                => 'Erhalt bestätigen: :asset',
     'i_accept'              => 'Ich akzeptiere',
@@ -357,11 +364,11 @@ return [
     'last_checkout'         => 'Letzte Herausgabe',
     'due_to_checkin'        => 'Folgende :count Elemente werden demnächst zurückgenommen:',
     'expected_checkin'      => 'Erwartetes Rückgabedatum',
-    'reminder_checked_out_items' => 'Dies ist eine Erinnerung an die Artikel, die gerade an Dich herausgegeben sind. Wenn Du der Meinung bist, dass die Angaben falsch sind (fehlender Artikel oder Artikel, den Du nie erhalten hast), sende bitte eine E-Mail an :reply_to_name unter :reply_to_address.',
+    'reminder_checked_out_items' => 'Dies ist eine Erinnerung an die Artikel, die gerade an dich herausgegeben sind. Wenn du der Meinung bist, dass die Angaben falsch sind (fehlender Artikel oder Artikel, den du nie erhalten hast), sende bitte eine E-Mail an :reply_to_name unter :reply_to_address.',
     'changed'               => 'Geändert',
     'to'                    => 'An',
-    'report_fields_info'    => '<p>Wähle die Felder aus, die Du in Deinem benutzerdefinierten Bericht einfügen möchtest, und klicke auf Generieren. Die Datei (custom-asset-report-YYYY-mm-dd.csv) wird automatisch heruntergeladen und Du kannst diese in Excel öffnen.</p>
-            <p>Wenn Du nur bestimmte Artikel exportieren möchten, verwende die folgenden Optionen, um das Ergebnis zu verfeinern.</p>',
+    'report_fields_info'    => '<p>Wähle die Felder aus, die du in deinem benutzerdefinierten Bericht einfügen möchtest, und klicke auf Generieren. Die Datei (custom-asset-report-YYYY-mm-dd.csv) wird automatisch heruntergeladen und du kannst diese in Excel öffnen.</p>
+            <p>Wenn du nur bestimmte Artikel exportieren möchten, verwende die folgenden Optionen, um das Ergebnis zu verfeinern.</p>',
     'range'                 => 'Bereich',
     'bom_remark'            => 'Füge ein BOM (Byte-Reihenfolge-Markierung) zu dieser CSV hinzu',
     'improvements'          => 'Verbesserungen',
@@ -378,11 +385,13 @@ return [
     'invalid_item_category_single' => 'Ungültige oder fehlende :type Kategorie. Bitte aktualisiere die Kategorie dieses :type um eine gültige Kategorie vor dem Auschecken hinzuzufügen.',
     'dashboard_info'        => 'Das ist Dein Dashboard. Es gibt viele wie dieses, aber das hier ist Deins.',
     '60_percent_warning'    => '60% abgeschlossen (Warnung)',
-    'dashboard_empty'       => 'Es sieht so aus, als hättest Du noch nichts hinzugefügt, sodass wir nichts Großartiges zum Anzeigen haben. Beginne jetzt mit dem Hinzufügen einiger Gegenstände, Zubehör, Verbrauchsmaterialien oder Lizenzen!',
+    'dashboard_empty'       => 'Es sieht so aus, als hättest du noch nichts hinzugefügt, sodass wir nichts Großartiges zum Anzeigen haben. Beginne jetzt mit dem Hinzufügen einiger Gegenstände, Zubehör, Verbrauchsmaterialien oder Lizenzen!',
     'new_asset'             => 'Neues Asset',
     'new_license'           => 'Neue Lizenz',
     'new_accessory'         => 'Neues Zubehör',
     'new_consumable'        => 'Neues Verbrauchsmaterial',
+    'new_component'         => 'Neue Komponente',
+    'new_user'              => 'Neuer Benutzer',
     'collapse'              => 'Zusammenklappen',
     'assigned'              => 'Zugewiesen',
     'asset_count'           => 'Anzahl Assets',
@@ -407,30 +416,31 @@ return [
     'checkout_tooltip' => 'Diesen Gegenstand heraugeben',
     'checkin_tooltip' => 'Externer Link zu',
     'checkout_user_tooltip' => 'Diesen Artikel an einen Benutzer herausgeben',
-    'checkin_to_diff_location' => 'Sie können sich dafür entscheiden, dieses Asset an einem anderen Ort als dem standardmäßigen Standort :default_location einzuchecken, falls einer festgelegt ist',
+    'checkin_to_diff_location' => 'Du kannst dich dafür entscheiden, dieses Asset an einem anderen Ort als dem standardmäßigen Standort :default_location einzuchecken, falls einer festgelegt ist',
     'maintenance_mode'      => 'Der Dienst ist wegen Wartungsarbeiten vorübergehend nicht verfügbar. Bitte versuche es später noch einmal.',
     'maintenance_mode_title' => 'System vorübergehend nicht verfügbar',
     'ldap_import'           => 'Benutzerkennwort sollte nicht von LDAP verwaltet werden. (Das erlaubt es Dir, Passwortrücksetzungen zu versenden.)',
     'purge_not_allowed'     => 'Löschen von "gelöschten Daten" wurde in der .env-Datei verboten. Kontaktiere den Support oder Deinen Systemadministrator.',
     'backup_delete_not_allowed'     => 'Das Löschen von Sicherungen wurde in der .env-Datei verboten. Kontaktiere den Support oder Deinen Systemadministrator.',
     'additional_files'           => 'Zusätzliche Dateien',
-    'shitty_browser'        => 'Keine Signatur erkannt. Wenn Du einen älteren Browser benutzt, verwende bitte einen moderneren Browser, um den Erhalt zu bestätigen.',
+    'shitty_browser'        => 'Keine Signatur erkannt. Wenn du einen älteren Browser benutzt, verwende bitte einen moderneren Browser, um den Erhalt zu bestätigen.',
     'bulk_soft_delete'      =>'Auch diese Benutzer soft-löschen. Die Assets-Historie bleibt erhalten, solange/bis die markierten Datensätze nicht in den Admin-Einstellungen endgültig gelöscht werden.',
     'bulk_checkin_delete_success' => 'Die ausgewählten Benutzer wurden gelöscht und ihre Assets wurden eingecheckt.',
     'bulk_checkin_success' => 'Die Assets der ausgewählten Benutzer wurden eingecheckt.',
-    'set_to_null'           => 'Werte für dieses Asset|Werte für alle :asset_count Assets löschen ',
+    'set_to_null'           => 'Werte für diese Auswahl löschen|Werte für alle :selection_count Auswahlen löschen ',
     'set_users_field_to_null'  => ':field Werte für diesen Benutzer löschen|:field Werte für alle :user_count Benutzer löschen ',
     'na_no_purchase_date'   => 'N/A - Kein Kaufdatum angegeben',
     'assets_by_status'      => 'Assets sortiert nach Status',
     'assets_by_status_type'      => 'Assets sortiert nach Statustyp',
     'pie_chart_type'        => 'Dashboard Kreisdiagramm Typ',
     'hello_name'            => 'Hallo, :name!',
-    'unaccepted_profile_warning'   => 'Du hast :count Gegenstände, die akzeptiert werden müssen. Klicke hier, um sie anzunehmen oder abzulehnen',
+    'unaccepted_profile_warning'   => 'Du hast einen Artikel, der akzeptiert werden muss. Klicken hier, um ihn zu akzeptieren oder abzulehnen. | Du hast :count Artikel, die akzeptiert werden müssen. Klicke hier, um sie zu akzeptieren oder abzulehnen',
     'start_date'            => 'Startdatum',
     'end_date'            => 'Enddatum',
     'alt_uploaded_image_thumbnail' => 'Hochgeladene Miniaturansicht',
     'placeholder_kit'       => 'Kit auswählen',
     'file_not_found'        => 'Datei wurde nicht gefunden',
+    'log_record_not_found'  => 'Es wurde kein Eintrag für diesen Logeintrag gefunden.',
     'preview_not_available' => '(keine Vorschau vorhanden)',
     'setup'                 => 'Setup',
     'pre_flight'            => 'Pre-Flight',
@@ -443,7 +453,7 @@ return [
     'integration_option'    => 'Integrationsoptionen',
     'log_does_not_exist'    => 'Es existiert kein passender Logeintrag.',
     'merge_users'           => 'Benutzer zusammenführen',
-    'merge_information' =>  'Dies wird die :count Benutzer zu einem Benutzer zusammenführen. Wähle den Benutzer, in den Du die anderen zusammenführen möchtest. Die zugehörigen Assets, Lizenzen, etc. werden in den ausgewählten Benutzer verschoben und die anderen Benutzer werden als gelöscht markiert.',
+    'merge_information' =>  'Dies wird die :count Benutzer zu einem Benutzer zusammenführen. Wähle den Benutzer, in den du die anderen zusammenführen möchtest. Die zugehörigen Assets, Lizenzen, etc. werden in den ausgewählten Benutzer verschoben und die anderen Benutzer werden als gelöscht markiert.',
     'warning_merge_information' => 'Diese Aktion kann NICHT rückgängig gemacht werden und sollte NUR verwendet werden, wenn Benutzer aufgrund eines falschen Imports oder einer fehlerhaften Synchronisation zusammengeführt werden müssen. Stelle sicher, dass zuerst ein Backup erstellt wird.',
     'no_users_selected'     => 'Keine Benutzer ausgewählt',
     'not_enough_users_selected'     => 'Mindestens :count Benutzer müssen ausgewählt sein',
@@ -477,7 +487,7 @@ return [
     'autoassign_licenses_help' => 'Erlaube diesem Benutzer die Zuweisung von Lizenzen über die Benutzeroberfläche für die Massenzuweisung von Lizenzen oder über die CLI-Tools.',
     'autoassign_licenses_help_long' => 'Es erlaubt einem Benutzer, Lizenzen über die Massen-Zuweisung GUI oder CLI-Tools zugewiesen zu bekommen. (Zum Beispiel möchtest du den Auftragnehmern möglicherweise nicht automatisch eine Lizenz zuweisen, die nur Mitarbeitern zur Verfügung stehen würde. Du kannst diesen Benutzern weiterhin einzelne Lizenzen zuweisen, aber sie werden nicht in der Lizenzen Massenherausgabe der Benutzer berücksichtigt.)',
     'no_autoassign_licenses_help' => 'Den Benutzer nicht bei der Lizenzen Massen-Zuweisung GUI oder CLI-Tools berücksichtigen.',
-    'modal_confirm_generic'      => 'Bist Du dir sicher?',
+    'modal_confirm_generic'      => 'Bist du dir sicher?',
     'cannot_be_deleted'      => 'Dieser Gegenstand kann nicht gelöscht werden',
     'cannot_be_edited'      => 'Dieser Gegenstand kann nicht bearbeitet werden.',
     'undeployable_tooltip'      => 'Dieser Gegenstand kann nicht herausgegeben werden. Überprüfe die verbleibende Menge.',
@@ -485,7 +495,7 @@ return [
     'item_notes' => ':item Notizen',
     'item_name_var' => ':item Name',
     'error_user_company' => 'Checkout Zielfirma und Asset-Gesellschaft stimmen nicht überein',
-    'error_user_company_accept_view' => 'Ein Asset, welches Dir zugewiesen wurde, gehört einem anderen Unternehmen, sodass Du es nicht akzeptieren oder ablehnen kannst. Bitte prüfe das mit deinem Vorgesetzten',
+    'error_user_company_accept_view' => 'Ein Asset, welches dir zugewiesen wurde, gehört einem anderen Unternehmen, sodass du es nicht akzeptieren oder ablehnen kannst. Bitte prüfe das mit deinem Vorgesetzten',
     'importer' => [
         'checked_out_to_fullname' => 'Herausgegeben an: Voller Name',
         'checked_out_to_first_name' => 'Herausgegeben an: Vorname',
@@ -508,11 +518,11 @@ return [
         'address2' => 'Adresszeile 2',
         'import_note' => 'Mit CSV-Importer importiert',
     ],
-    'remove_customfield_association' => 'Entfernen Sie dieses Feld aus dem Feldsatz. Dies wird das benutzerdefinierte Feld nicht löschen, sondern nur die Zuordnung dieses Feldes zu diesem Feldsatz entfernen.',
-    'checked_out_to_fields' => 'Checked Out To Fields',
+    'remove_customfield_association' => 'Entfernst du dieses Feld aus dem Feldsatz, wird das benutzerdefinierte Feld nicht gelöscht, sondern nur die Zuordnung dieses Feldes zu diesem Feldsatz.',
+    'checked_out_to_fields' => 'Auf folgende Felder herausgegeben',
     'percent_complete' => '% vollständig',
     'uploading' => 'Hochladen... ',
-    'upload_error' => 'Fehler beim Hochladen der Datei. Bitte überprüfe, dass keine leeren Zeilen vorhanden sind und keine Spaltennamen dupliziert werden.',
+    'upload_error' => 'Fehler beim Hochladen der Datei. Bitte überprüfen Sie, ob Sie keine leeren Zeilen oder doppelte Spaltennamen in Ihrem CSV haben und dass die Serverrechte das Hochladen erlauben.',
     'copy_to_clipboard' => 'In Zwischenablage kopieren',
     'copied' => 'Kopiert!',
     'status_compatibility' => 'Wenn Assets bereits zugewiesen sind, können sie nicht zu einem nicht einsetzbaren Statustyp geändert werden, und diese Änderung wird übersprungen.',
@@ -528,7 +538,7 @@ return [
     'permission_denied_superuser_demo' => 'Zugriff verweigert. Benutzerinformationen für Superadministratoren auf der Demo können nicht aktualisiert werden.',
     'pwd_reset_not_sent' => 'Benutzer ist nicht aktiviert, ist LDAP-synchronisiert oder hat keine E-Mail-Adresse',
     'error_sending_email' => 'Fehler beim Senden der E-Mail',
-    'sad_panda' => 'Sad panda. You are not authorized to do the thing. Maybe <a href=":link">return to the dashboard</a>, or contact your administrator.',
+    'sad_panda' => 'Trauriger Panda. Du bist nicht berechtigt, das zu tun. <a href=":link">Kehre zum Dashboard zurück</a> oder wende dich an deinen Administrator.',
     'bulk' => [
             'delete' =>
                 [
@@ -549,6 +559,71 @@ return [
         'license_seats'  => ':count Lizenzsitze|:count Lizenzsitze',
         'consumables'  => ':count Verbrauchsmaterialien|:count Verbrauchsmaterialien',
         'components'  => ':count Komponente|:count Komponenten',
-    ]
+    ],
+
+    'more_info' => 'Mehr Info',
+    'quickscan_bulk_help' => 'Wenn du dieses Kontrollkästchen aktivierst, wird der Asset-Datensatz so bearbeitet, dass der neue Standort angezeigt wird. Wenn du es nicht aktivierst, wird der Standort nur im Prüfprotokoll vermerkt. Beachte, dass sich der Standort der Person, des Assets oder des Standorts, an den es ausgecheckt wurde, nicht ändert, wenn dieses Asset ausgecheckt wird.',
+    'whoops' => 'Hoppla!',
+    'something_went_wrong' => 'Etwas ist bei Ihrer Anfrage schiefgegangen.',
+    'close' => 'Schließen',
+    'expires' => 'Ablaufdatum',
+    'map_fields'=> ':item_type Feld zuordnen',
+    'remaining_var' => ':count verbleibend',
+    'label' => 'Label',
+    'import_asset_tag_exists' => 'Ein Asset mit dem Asset-Tag :asset_tag ist bereits vorhanden und es wurde keine Aktualisierung angefordert. Es wurden keine Änderungen vorgenommen.',
+    'countries_manually_entered_help' => 'Werte mit einem Sternchen (*) wurden manuell eingegeben und stimmen nicht mit vorhandenen Dropdown-Werten nach ISO 3166 überein',
+    'accessories_assigned' => 'Zugewiesenes Zubehör',
+    'user_managed_passwords' => 'Passwort-Verwaltung',
+    'user_managed_passwords_disallow' => 'Benutzern die Verwaltung ihrer eigenen Passwörter verbieten',
+    'user_managed_passwords_allow' => 'Benutzern erlauben, ihre eigenen Passwörter zu verwalten',
+    'from' => 'Von',
+    'by' => 'Von',
+
+// Add form placeholders here
+    'placeholders' => [
+        'notes'  => 'Notiz hinzufügen',
+    ],
+
+    'breadcrumb_button_actions' => [
+        'edit_item' => ':name bearbeiten',
+        'checkout_item' => ':name herausgeben',
+        'checkin_item' => ':name zurücknehmen',
+    ],
+
+    'skins' => [
+        'site_default' => 'Seiten Standard',
+        'default_blue' => 'Standard Blau',
+        'blue_dark' => 'Blau (Dunkler Modus)',
+        'green' => 'Grün Dunkel',
+        'green_dark' => 'Grün (Dunkler Modus)',
+        'red' => 'Rot Dunkel',
+        'red_dark' => 'Rot (Dunkler Modus)',
+        'orange' => 'Orange Dunkel',
+        'orange_dark' => 'Orange (Dunkler Modus)',
+        'black' => 'Schwarz',
+        'black_dark' => 'Schwarz (Dunkler Modus)',
+        'purple' => 'Lila',
+        'purple_dark' => 'Lila (Dunkler Modus)',
+        'yellow' => 'Gelb',
+        'yellow_dark' => 'Gelb (Dunkler Modus)',
+        'high_contrast' => 'Hoher Kontrast',
+
+    ],
+
+    'select_all_none' => 'Alle auswählen/abwählen',
+    'generic_model_not_found' => 'Dieses :model wurde nicht gefunden oder Du hast keine Berechtigung, darauf zuzugreifen',
+    'deleted_models' => 'Gelöschtes Asset-Modelle',
+    'deleted_users' => 'Gelöschte Benutzer',
+    'cost_each' => 'je:amount',
+    'remove_current_image' => 'Aktuelles :type Bild entfernen',
+
+    'seeding' => [
+        'manufacturers' => [
+            'button' => 'Hersteller anlegen',
+            'prompt' => 'Du hast noch keine Hersteller. Möchtest Du eine Liste von gängigen Herstellern anbieten? (DIESE ÜBERSCHREIBEN BESTEHENDE HERSTELLER, einschließlich derer, die sanft gelöscht wurden.)',
+            'success' => 'Hersteller erfolgreich vorgefüllt',
+            'error' => 'Hersteller konnten nicht vorgefüllt werden. Ein Herstellerrekord existiert bereits, und das Füllen würde ihn überschreiben. Konnte Hersteller nicht liefern. :count Herstelleraufzeichnungen existieren bereits, und Füllung würde sie überschreiben.',
+        ],
+    ],
 
 ];
diff --git a/resources/lang/de-if/help.php b/resources/lang/de-if/help.php
index 27be1a5b27..4f443e60d0 100644
--- a/resources/lang/de-if/help.php
+++ b/resources/lang/de-if/help.php
@@ -19,9 +19,9 @@ return [
 
     'assets' => 'Assets sind Elemente, die mit Seriennummer oder einem Asset-Tag versehen sind. Sie sind meist höhere Werte, bei denen die Identifizierung eines bestimmten Gegenstands von Bedeutung ist.',
 
-    'categories' => 'Kategorien helfen Dir beim Organisieren von Assets. Beispielkategorien sind &quot;PCs&quot;, &quot;Laptops&quot;, &quot;Mobiltelefone&quot;, &quot;Tablets&quot; usw., jedoch kannst Du Kategorien nutzen, wie Du es für sinnvoll erachtest.',
+    'categories' => 'Kategorien helfen dir beim Organisieren von Assets. Beispielkategorien sind &quot;PCs&quot;, &quot;Laptops&quot;, &quot;Mobiltelefone&quot;, &quot;Tablets&quot; usw., jedoch kannst du Kategorien nutzen, wie du es für sinnvoll erachtest.',
 
-    'accessories' => 'Ein Zubehör ist alles, was Du an einen Benutzer ausgeben kannst, jedoch keine Seriennummer besitzt (oder es keinen Sinn macht diese zu verwalten). Zum Beispiel: Mäuse und Tastaturen.',
+    'accessories' => 'Ein Zubehör ist alles, was du an einen Benutzer ausgeben kannst, jedoch keine Seriennummer besitzt (oder es keinen Sinn macht diese zu verwalten). Zum Beispiel: Mäuse und Tastaturen.',
 
     'companies'     => 'Unternehmen können als einfaches Identifikationsfeld oder zur Begrenzung der Sichtbarkeit von Assets, Benutzer usw. verwendet werden, wenn die volle Unterstützung für Unternehmen in Ihren Admin-Einstellungen aktiviert ist.',
 
diff --git a/resources/lang/de-if/localizations.php b/resources/lang/de-if/localizations.php
index b351a2e499..cdd3bc6592 100644
--- a/resources/lang/de-if/localizations.php
+++ b/resources/lang/de-if/localizations.php
@@ -2,7 +2,7 @@
 
 return [
 
-    'select_language' => 'Sprache auswählen',
+    'select_language' => 'Wähle eine Sprache',
     'languages' => [
         'en-US'=> 'Englisch, USA',
         'en-GB'=> 'Englisch, UK',
@@ -40,7 +40,9 @@ return [
         'ms-MY'=> 'Malaiisch',
         'mi-NZ'=> 'Maori',
         'mn-MN'=> 'Mongolisch',
-        'no-NO'=> 'Norwegisch',
+        'nb-NO'=> 'Norwegisch Bokmål',
+        'om-ET' => 'Oromo (Äthiopisch)',
+        //'nn-NO'=> 'Norwegian Nynorsk',
         'fa-IR'=> 'Persisch',
         'pl-PL'=> 'Polnisch',
         'pt-PT'=> 'Portugiesisch',
@@ -66,7 +68,7 @@ return [
         'zu-ZA'=> 'Zulu',
     ],
 
-    'select_country' => 'Land auswählen',
+    'select_country' => 'Wähle ein Land',
     
     'countries' => [
         'AC'=>'Ascensionsinsel',
@@ -133,6 +135,7 @@ return [
         'EC'=>'Ecuador',
         'EE'=>'Estland',
         'EG'=>'Ägypten',
+        'GB-ENG'=>'England',
         'ER'=>'Eritrea',
         'ES'=>'Spanien',
         'ET'=>'Äthiopien',
@@ -232,6 +235,7 @@ im Indischen Ozean',
         'NG'=>'Nigeria',
         'NI'=>'Nicaragua',
         'NL'=>'Niederlande',
+        'GB-NIR' => 'Nordirland',
         'NO'=>'Norwegen',
         'NP'=>'Nepal',
         'NR'=>'Nauru',
@@ -259,7 +263,7 @@ im Indischen Ozean',
         'RU'=>'Russland',
         'RW'=>'Ruanda',
         'SA'=>'Saudi-Arabien',
-        'UK'=>'Schottland',
+        'GB-SCT'=>'Schottland',
         'SB'=>'Salomon-Inseln',
         'SC'=>'Seychellen',
         'SS'=>'Südsudan',
@@ -311,6 +315,7 @@ im Indischen Ozean',
         'VI'=>'Amerikanische Jungferninseln',
         'VN'=>'Vietnam',
         'VU'=>'Vanuatu',
+        'GB-WLS' =>'Wales',
         'WF'=>'Wallis und Futuna',
         'WS'=>'Samoa',
         'YE'=>'Jemen',
diff --git a/resources/lang/de-if/mail.php b/resources/lang/de-if/mail.php
index f23bce2c10..6a9cb7e9bd 100644
--- a/resources/lang/de-if/mail.php
+++ b/resources/lang/de-if/mail.php
@@ -23,24 +23,25 @@ return [
     'Item_Requested' => 'Gegenstand angefordert',
     'License_Checkin_Notification' => 'Lizenz zurückgenommen',
     'License_Checkout_Notification' => 'Lizenz herausgegeben',
+    'license_for'   => 'Lizenz für',
     'Low_Inventory_Report' => 'Bericht über niedrige Lagerbestände',
     'a_user_canceled' => 'Eine Geräte-Anfrage auf der Webseite wurde vom Benutzer abgebrochen',
     'a_user_requested' => 'Ein Benutzer hat ein Gerät auf der Webseite angefordert',
     'acceptance_asset_accepted' => 'Ein Benutzer hat einen Gegenstand akzeptiert',
     'acceptance_asset_declined' => 'Ein Benutzer hat einen Gegenstand abgelehnt',
-    'accessory_name' => 'Zubehörname:',
-    'additional_notes' => 'Zusätzliche Bemerkungen:',
+    'accessory_name' => 'Zubehör Name',
+    'additional_notes' => 'Zusätzliche Bemerkungen',
     'admin_has_created' => 'Ein Administrator hat auf der :web Webseite ein Konto für Dich erstellt.',
-    'asset' => 'Asset:',
-    'asset_name' => 'Assetname:',
+    'asset' => 'Asset',
+    'asset_name' => 'Asset Name',
     'asset_requested' => 'Gegenstand angefordert',
     'asset_tag' => 'Asset Tag',
     'assets_warrantee_alert' => 'Die Garantie von :count Asset wird in :threshold Tagen auslaufen.|Die Garantie von :count Assets wird in :threshold Tagen auslaufen.',
     'assigned_to' => 'Zugewiesen an',
     'best_regards' => 'Grüße,',
-    'canceled' => 'Abgebrochen:',
-    'checkin_date' => 'Rücknahmedatum:',
-    'checkout_date' => 'Herausgabedatum:',
+    'canceled' => 'Abgebrochen',
+    'checkin_date' => 'Rücknahmedatum',
+    'checkout_date' => 'Herausgabedatum',
     'checkedout_from' => 'Herausgegeben von',
     'checkedin_from'  => 'Eingecheckt von',
     'checked_into' => 'Zurückgenommen in',
@@ -49,27 +50,30 @@ return [
     'click_to_confirm' => 'Bitte klicke zum Bestätigen Deines :web Kontos auf den folgenden Link:',
     'current_QTY' => 'Aktuelle Menge',
     'days' => 'Tage',
-    'expecting_checkin_date' => 'Erwartetes Rückgabedatum:',
+    'expecting_checkin_date' => 'Erwartetes Rückgabedatum',
     'expires' => 'Ablaufdatum',
     'hello' => 'Hallo',
     'hi' => 'Hi',
     'i_have_read' => 'Ich habe die Nutzungsbedingungen gelesen und stimme diesen zu, und ich habe diesen Gegenstand erhalten.',
     'inventory_report' => 'Bestandsbericht',
-    'item' => 'Gegenstand:',
+    'item' => 'Gegenstand',
+    'item_checked_reminder' => 'Dies ist eine Erinnerung, dass Sie derzeit :count Artikel ausgeliehen haben, die dunoch nicht akzeptiert oder abgelehnt hast. Bitte klicke auf den untenstehenden Link, um deine Entscheidung zu treffen.',
     'license_expiring_alert' => 'Es gibt :count auslaufende Lizenz in den nächsten :threshold Tagen.|Es gibt :count auslaufende Lizenzen in den nächsten :threshold Tagen.',
     'link_to_update_password' => 'Klicken Sie bitte auf den folgenden Link zum Aktualisieren Ihres :web Passworts:',
-    'login' => 'Anmelden:',
+    'login' => 'Anmelden',
     'login_first_admin' => 'Melde Diche zu Deiner neuen Snipe-IT-Installation mithilfe der unten stehenden Anmeldeinformationen an:',
     'low_inventory_alert' => 'Es gibt :count Artikel, der unter dem Minimum ist oder kurz davor ist.|Es gibt :count Artikel, die unter dem Minimum sind oder kurz davor sind.',
     'min_QTY' => 'Mindestmenge',
     'name' => 'Name',
     'new_item_checked' => 'Ein neuer Gegenstand wurde unter Ihrem Namen ausgecheckt. Details folgen.',
+    'new_item_checked_with_acceptance' => 'Ein neuer Gegenstand, der eine Annahme erfordert, wurde unter Deinem Namen ausgecheckt. Details findest Du weiter unten.',
+    'recent_item_checked' => 'Ein Gegenstand, der eine Annahme erfordert, wurde unter Deinem Namen ausgecheckt. Details findest Du weiter unten.',
     'notes' => 'Notizen',
-    'password' => 'Passwort:',
+    'password' => 'Passwort',
     'password_reset' => 'Passwort zurücksetzen',
     'read_the_terms' => 'Bitte lese die nachfolgenden Nutzungsbedingungen.',
-    'read_the_terms_and_click' => 'Bitte lese die Nutzungsbedingungen unten, und klicke auf den Link am unteren Ende, um zu bestätigen, dass Du die Nutzungsbedingungen gelesen und akzeptiert hast und das Asset erhalten hast.',
-    'requested' => 'Angefordert:',
+    'read_the_terms_and_click' => 'Bitte lese die unten stehenden Nutzungsbedingungen und klicke auf den Link unten, um zu bestätigen, dass du die Nutzungsbedingungen gelesen hast, diesen zustimmst und das Asset erhalten hast.',
+    'requested' => 'Angefragt',
     'reset_link' => 'Sein Link zum Zurücksetzen des Kennworts',
     'reset_password' => 'Klicke hier, um Dein Passwort zurückzusetzen:',
     'rights_reserved' => 'Alle Rechte vorbehalten.',
@@ -79,15 +83,17 @@ return [
     'supplier' => 'Lieferant',
     'tag' => 'Kennzeichnung',
     'test_email' => 'Test E-Mail von Snipe-IT',
-    'test_mail_text' => 'Dies ist ein Test von Snipe-IT-Asset-Management-System. Wenn Du das erhalten hast, funktioniert das Senden von Mails :)',
+    'test_mail_text' => 'Dies ist ein Test des Snipe-IT Asset Management Systems. Wenn du das erhalten hast, funktioniert das Senden von Mails :)',
     'the_following_item' => 'Der folgende Gegenstand wurde eingecheckt: ',
     'to_reset' => 'Zum Zurücksetzen Ihres :web Passwortes, fülle bitte dieses Formular aus:',
     'type' => 'Typ',
     'upcoming-audits' => 'Es ist :count Asset vorhanden, für das innerhalb von :threshold Tagen ein Audit durchzuführen ist. |Es gibt :count Assets, für die innerhalb von :threshold Tagen Audits durchzuführen sind.',
     'user' => 'Benutzer',
     'username' => 'Benutzername',
-    'welcome' => 'Wilkommen, :name',
+    'unaccepted_asset_reminder' => 'Erinnerung: Du hast nicht akzeptierte Assets.',
+    'welcome' => 'Willkommen, :name',
     'welcome_to' => 'Willkommen bei :web!',
     'your_assets' => 'Deine Assets anzeigen',
     'your_credentials' => 'Ihre Snipe-IT Anmeldedaten',
+    'mail_sent' => 'E-Mail erfolgreich gesendet!',
 ];
diff --git a/resources/lang/de-if/validation.php b/resources/lang/de-if/validation.php
index d96cd772f0..af4ebfc943 100644
--- a/resources/lang/de-if/validation.php
+++ b/resources/lang/de-if/validation.php
@@ -13,87 +13,150 @@ return [
     |
     */
 
-    'accepted'             => ':attribute muss akzeptiert werden.',
-    'active_url'           => ':attribute ist keine gültige URL.',
-    'after'                => ':attribute muss ein Datum nach dem :date sein.',
-    'after_or_equal'       => ':attribute muss ein Datum nach oder gleich :date sein.',
-    'alpha'                => ':attribute darf nur aus Buchstaben bestehen.',
-    'alpha_dash'           => ':attribute darf nur aus Buchstaben, Zahlen und Gedankenstrichen bestehen.',
-    'alpha_num'            => ':attribute darf nur aus Buchstaben und Zahlen bestehen.',
-    'array'                => ':attribute muss ein Array sein.',
-    'before'               => ':attribute muss ein Datum vor dem :date sein.',
-    'before_or_equal'      => ':attribute muss ein Datum vor oder gleich dem :date sein.',
-    'between'              => [
-        'numeric' => ':attribute muss zwischen :min und :max liegen.',
-        'file'    => ':attribute darf nur zwischen :min und :max kilobytes groß sein.',
-        'string'  => ':attribute muss mindestens :min und maximal :max Zeichen enthalten.',
-        'array'   => ':attribute muss mindestens :min und darf maximal :max Einträge haben.',
+    'accepted' => 'Das Feld :attribute muss akzeptiert werden.',
+    'accepted_if' => 'Das Feld :attribute muss akzeptiert werden, wenn :other :value ist.',
+    'active_url' => 'Das Feld :attribute muss eine gültige URL sein.',
+    'after' => 'Das Feld :attribute muss ein Datum nach dem :date sein.',
+    'after_or_equal' => 'Das Feld :attribute muss ein Datum sein, das nach dem :date liegt oder diesem entspricht.',
+    'alpha' => 'Das Feld :attribute darf nur Buchstaben enthalten.',
+    'alpha_dash' => 'Das Feld :attribute darf nur Buchstaben, Zahlen, Bindestriche und Unterstriche enthalten.',
+    'alpha_num' => 'Das Feld :attribute darf nur Buchstaben und Zahlen enthalten.',
+    'array' => 'Das Feld :attribute muss ein Array sein.',
+    'ascii' => 'Das Feld :attribute darf nur alphanumerische Zeichen und Symbole enthalten.',
+    'before' => 'Das Feld :attribute muss ein Datum vor dem :date sein.',
+    'before_or_equal' => 'Das Feld :attribute muss ein Datum sein, das vor dem :date liegt oder diesem entspricht.',
+    'between' => [
+        'array' => 'Das Feld :attribute muss zwischen :min und :max Elemente haben.',
+        'file' => 'Das Feld :attribute muss zwischen :min und :max Kilobytes groß sein.',
+        'numeric' => 'Das Feld :attribute muss zwischen :min und :max liegen.',
+        'string' => 'Das Feld :attribute muss zwischen :min und :max Zeichen lang sein.',
     ],
-    'boolean'              => ':attribute muss wahr oder falsch sein.',
-    'confirmed'            => ':attribute Bestätigung stimmt nicht überein.',
-    'date'                 => ':attribute ist kein gültiges Datum.',
-    'date_format'          => ':attribute passt nicht zur :format Formatierung.',
-    'different'            => ':attribute und :other müssen sich unterscheiden.',
-    'digits'               => ':attribute muss :digits Stellen haben.',
-    'digits_between'       => ':attribute soll mindestens :min und darf maximal :max Stellen haben.',
-    'dimensions'           => ':attribute hat ein ungültiges Bildformat.',
-    'distinct'             => ':attribute hat einen doppelten Wert.',
-    'email'                => 'Das Format von :attribute ist ungültig.',
-    'exists'               => 'Auswahl :attribute ist ungültig.',
-    'file'                 => ':attribute muss eine Datei sein.',
-    'filled'               => ':attribute muss einen Wert haben.',
-    'image'                => ':attribute muss ein Bild sein.',
+    'boolean' => 'Das Feld :attribute muss wahr oder falsch sein.',
+    'can' => 'Das Feld :attribute enthält einen nicht autorisierten Wert.',
+    'confirmed' => 'Die Bestätigung für das Feld :attribute stimmt nicht überein.',
+    'contains' => 'Im Feld :attribute fehlt ein erforderlicher Wert.',
+    'current_password' => 'Das Passwort ist falsch.',
+    'date' => 'Das Feld :attribute muss ein gültiges Datum sein.',
+    'date_equals' => 'Das Feld :attribute muss ein Datum sein, das dem :date entspricht.',
+    'date_format' => 'Das Feld :attribute muss dem Format :format entsprechen.',
+    'decimal' => 'Das Feld :attribute muss :decimal Dezimalstellen haben.',
+    'declined' => 'Das Feld :attribute muss abgelehnt werden.',
+    'declined_if' => 'Das Feld :attribute muss abgelehnt werden, wenn :other den Wert :value hat.',
+    'different' => 'Das Feld :attribute und :other müssen sich unterscheiden.',
+    'digits' => 'Das Feld :attribute muss :digits Ziffern enthalten.',
+    'digits_between' => 'Das Feld :attribute muss zwischen :min und :max Ziffern haben.',
+    'dimensions' => 'Das Feld :attribute hat ungültige Bildabmessungen.',
+    'distinct' => ':attribute hat einen doppelten Wert.',
+    'doesnt_end_with' => 'Das Feld :attribute darf nicht mit einem der folgenden Werte enden: :values.',
+    'doesnt_start_with' => 'Das Feld :attribute darf nicht mit einem der folgenden Werte beginnen: :values.',
+    'email' => 'Das Feld :attribute muss eine gültige E-Mail-Adresse sein.',
+    'ends_with' => 'Das Feld :attribute muss mit einem der folgenden Werte enden: :values.',
+    'enum' => 'Auswahl :attribute ist ungültig.',
+    'exists' => 'Auswahl :attribute ist ungültig.',
+    'extensions' => 'Das Feld :attribute muss eine der folgenden Erweiterungen haben: :values.',
+    'file' => 'Das Feld :attribute muss eine Datei sein.',
+    'filled' => ':attribute muss einen Wert haben.',
+    'gt' => [
+        'array' => 'Das Feld :attribute muss mehr als :value Elemente haben.',
+        'file' => 'Das Feld :attribute muss größer als :value Kilobytes sein.',
+        'numeric' => 'Das Feld :attribute muss größer als :value sein.',
+        'string' => 'Das Feld :attribute muss mehr als :value Zeichen enthalten.',
+    ],
+    'gte' => [
+        'array' => 'Das Feld :attribute muss :value Elemente oder mehr haben.',
+        'file' => 'Das Feld :attribute muss größer oder gleich :value Kilobytes sein.',
+        'numeric' => 'Das Feld :attribute muss größer oder gleich :value sein.',
+        'string' => 'Das Feld :attribute muss größer oder gleich :value Zeichen sein.',
+    ],
+    'hex_color' => 'Das Feld :attribute muss eine gültige hexadezimale Farbe sein.',
+    'image' => 'Das Feld :attribute muss ein Bild sein.',
     'import_field_empty'    => ':fieldname darf nicht leer sein.',
-    'in'                   => 'Auswahl :attribute ist ungültig.',
-    'in_array'             => 'Das Feld :attribute existiert nicht in :other.',
-    'integer'              => ':attribute muss eine ganze Zahl sein.',
-    'ip'                   => ':attribute muss eine gültige IP Adresse sein.',
-    'ipv4'                 => ':attribute muss eine gültige IPv4 Adresse sein.',
-    'ipv6'                 => ':attribute muss eine gültige IPv6 Adresse sein.',
-    'is_unique_department' => ':attribute muss einzigartig an diesem Standort sein',
-    'json'                 => 'Das Attribut muss eine gültige JSON-Zeichenfolge sein.',
-    'max'                  => [
-        'numeric' => ':attribute darf nicht größer als :max sein.',
-        'file'    => ':attribute darf nicht größer als :max Kilobyte sein.',
-        'string'  => ':attribute darf nicht mehr als :max Zeichen sein.',
-        'array'   => 'Das: -Attribut darf nicht mehr als: maximale Elemente haben.',
+    'in' => 'Auswahl :attribute ist ungültig.',
+    'in_array' => 'Das Feld :attribute muss in :other existieren.',
+    'integer' => 'Das Feld :attribute muss eine Ganzzahl sein.',
+    'ip' => 'Das Feld :attribute muss eine gültige IP-Adresse sein.',
+    'ipv4' => 'Das Feld :attribute muss eine gültige IPv4-Adresse sein.',
+    'ipv6' => 'Das Feld :attribute muss eine gültige IPv6-Adresse sein.',
+    'json' => 'Das Feld :attribute muss eine gültige JSON-Zeichenkette sein.',
+    'list' => 'Das Feld :attribute muss eine Liste sein.',
+    'lowercase' => 'Das Feld :attribute muss in Kleinbuchstaben sein.',
+    'lt' => [
+        'array' => 'Das Feld :attribute muss weniger als :value Elemente haben.',
+        'file' => 'Das Feld :attribute muss kleiner als :value Kilobytes sein.',
+        'numeric' => 'Das Feld :attribute muss kleiner als :value sein.',
+        'string' => 'Das Feld :attribute muss weniger als :value Zeichen haben.',
     ],
-    'mimes'                => ':attribute muss eine Datei des Typs :values sein.',
-    'mimetypes'            => ':attribute muss eine Datei vom Typ: :values sein.',
-    'min'                  => [
-        'numeric' => ':attribute muss kleiner als :min sein.',
-        'file'    => ':attribute muss mindestens :min Kilobyte groß sein.',
-        'string'  => ':attribute benötigt mindestens :min Zeichen.',
-        'array'   => ':attribute muss mindestens :min Elemente enthalten.',
+    'lte' => [
+        'array' => 'Das Feld :attribute darf nicht mehr als :value Elemente haben.',
+        'file' => 'Das Feld :attribute muss kleiner oder gleich :value Kilobytes sein.',
+        'numeric' => 'Das Feld :attribute muss kleiner oder gleich :value sein.',
+        'string' => 'Das Feld :attribute muss weniger oder gleich :value Zeichen haben.',
     ],
-    'starts_with'          => ':attribute muss mit einem der folgenden Werte beginnen: :values.',
-    'ends_with'            => ':attribute muss mit einem der folgenden Werte enden: :values.',
+    'mac_address' => 'Das Feld :attribute muss eine gültige MAC-Adresse sein.',
+    'max' => [
+        'array' => 'Das Feld :attribute darf nicht mehr als :max Elemente haben.',
+        'file' => 'Das Feld :attribute darf nicht größer als :max Kilobytes sein.',
+        'numeric' => 'Das Feld :attribute darf nicht größer als :max sein.',
+        'string' => 'Das Feld :attribute darf nicht mehr als :max Zeichen haben.',
+    ],
+    'max_digits' => 'Das Feld :attribute darf nicht mehr als :max Ziffern haben.',
+    'mimes' => 'Das Feld :attribute muss eine Datei vom Typ :values sein.',
+    'mimetypes' => 'Das Feld :attribute muss eine Datei vom Typ :values sein.',
+    'min' => [
+        'array' => 'Das Feld :attribute muss mindestens :min Elemente haben.',
+        'file' => 'Das Feld :attribute muss mindestens :min Kilobytes groß sein.',
+        'numeric' => 'Das Feld :attribute muss mindestens :min sein.',
+        'string' => 'Das Feld :attribute muss mindestens :min Zeichen haben.',
+    ],
+    'min_digits' => 'Das Feld :attribute muss mindestens :min Ziffern haben.',
+    'missing' => 'Das Feld :attribute muss fehlen.',
+    'missing_if' => 'Das Feld :attribute muss fehlen, wenn :other :value ist.',
+    'missing_unless' => 'Das Feld :attribute muss fehlen, es sei denn :other ist :value.',
+    'missing_with' => 'Das Feld :attribute muss fehlen, wenn :values vorhanden ist.',
+    'missing_with_all' => 'Das Feld :attribute muss fehlen, wenn :values vorhanden sind.',
+    'multiple_of' => 'Das Feld :attribute muss ein Vielfaches von :value sein.',
+    'not_in' => 'Auswahl :attribute ist ungültig.',
+    'not_regex' => 'Das Format des Feldes :attribute ist ungültig.',
+    'numeric' => 'Das Feld :attribute muss eine Zahl sein.',
+    'password' => [
+        'letters' => 'Das Feld :attribute muss mindestens einen Buchstaben enthalten.',
+        'mixed' => 'Das Feld :attribute muss mindestens einen Groß- und einen Kleinbuchstaben enthalten.',
+        'numbers' => 'Das Feld :attribute muss mindestens eine Zahl enthalten.',
+        'symbols' => 'Das Feld :attribute muss mindestens ein Symbol enthalten.',
+        'uncompromised' => 'Das angegebene :attribute ist in einem Datenleck aufgetaucht. Bitte wählen Sie ein anderes :attribute.',
+    ],
+    'percent'       => 'Bei einer prozentualen Abschreibung muss der Mindestabschreibungswert zwischen 0 und 100 liegen.',
 
-    'not_in'               => 'Auswahl :attribute ist ungültig.',
-    'numeric'              => ':attribute muss eine Zahl sein.',
-    'present'              => ':attribute muss vorhanden sein.',
-    'valid_regex'          => 'Dies ist kein gültiger Regex-Ausdruck. ',
-    'regex'                => ':attribute Format ungültig.',
-    'required'             => ':attribute Feld muss ausgefüllt sein.',
-    'required_if'          => ':attribute wird benötigt, wenn :other :value entspricht.',
-    'required_unless'      => ':attribute ist erforderlich, es sei denn :other ist in :values.',
-    'required_with'        => ':attribute wird benötigt wenn :value ausgewählt ist.',
-    'required_with_all'    => ':attribute field ist erforderlich, wenn :values vorhanden sind.',
-    'required_without'     => ':attribute wird benötigt wenn :value nicht ausgewählt ist.',
+    'present' => ':attribute muss vorhanden sein.',
+    'present_if' => 'Das Feld :attribute muss vorhanden sein, wenn :other :value ist.',
+    'present_unless' => 'Das Feld :attribute muss vorhanden sein, es sei denn, :other ist :value.',
+    'present_with' => 'Das Feld :attribute muss vorhanden sein, wenn :values vorhanden ist.',
+    'present_with_all' => 'Das Feld :attribute muss vorhanden sein, wenn :values vorhanden sind.',
+    'prohibited' => 'Das Feld :attribute ist verboten.',
+    'prohibited_if' => 'Das Feld :attribute ist verboten, wenn :other :value ist.',
+    'prohibited_unless' => 'Das Feld :attribute ist verboten, es sei denn, :other befindet sich in :values.',
+    'prohibits' => 'Das Feld :attribute verhindert, dass :other vorhanden ist.',
+    'regex' => 'Das Format des Feldes :attribute ist ungültig.',
+    'required' => ':attribute Feld muss ausgefüllt sein.',
+    'required_array_keys' => 'Das Feld :attribute muss Einträge für folgende Werte enthalten: :values.',
+    'required_if' => ':attribute wird benötigt, wenn :other :value entspricht.',
+    'required_if_accepted' => 'Das Feld :attribute ist erforderlich, wenn :other akzeptiert wird.',
+    'required_if_declined' => 'Das Feld :attribute ist erforderlich, wenn :other abgelehnt wird.',
+    'required_unless' => ':attribute ist erforderlich, es sei denn :other ist in :values.',
+    'required_with' => ':attribute wird benötigt wenn :value ausgewählt ist.',
+    'required_with_all' => 'Das Feld :attribute ist erforderlich, wenn :values vorhanden sind.',
+    'required_without' => ':attribute wird benötigt wenn :value nicht ausgewählt ist.',
     'required_without_all' => 'Das: Attributfeld ist erforderlich, wenn keine der folgenden Werte vorhanden sind.',
-    'same'                 => ':attribute und :other müssen übereinstimmen.',
-    'size'                 => [
-        'numeric' => ':attribute muss :size groß sein.',
-        'file'    => ':attribute muss :size Kilobyte groß sein.',
-        'string'  => ':attribute muss :size Zeichen haben.',
-        'array'   => 'Das Attribut muss Folgendes enthalten: Größenelemente.',
+    'same' => 'Das Feld :attribute muss mit :other übereinstimmen.',
+    'size' => [
+        'array' => 'Das Feld :attribute muss :size Elemente enthalten.',
+        'file' => 'Das Feld :attribute muss :size Kilobytes groß sein.',
+        'numeric' => 'Das Feld :attribute muss :size sein.',
+        'string' => 'Das Feld :attribute muss :size Zeichen enthalten.',
     ],
+    'starts_with' => 'Das Feld :attribute muss mit einem der folgenden Werte beginnen: :values.',
     'string'               => 'Das Attribut muss eine Zeichenfolge sein.',
-    'timezone'             => ':attribute muss eine gültige Zone sein.',
     'two_column_unique_undeleted' => ':attribute muss in :table1 und :table2 einzigartig sein. ',
-    'unique'               => ':attribute ist bereits vergeben.',
-    'uploaded'             => ':attribute konnte nicht hochgeladen werden.',
-    'url'                  => ':attribute Format ungültig.',
     'unique_undeleted'     => 'Die Variable :attribute muss eindeutig sein.',
     'non_circular'         => 'Das :attribute darf keinen Zirkelbezug ergeben.',
     'not_array'            => ':attribute darf kein Array sein.',
@@ -102,11 +165,14 @@ return [
     'numbers'              => 'Das Passwort muss mindestens eine Zahl beinhalten.',
     'case_diff'            => 'Das Passwort muss Groß- und Kleinschreibung beinhalten.',
     'symbols'              => 'Das Passwort muss Sonderzeichen beinhalten.',
-    'gte'                  => [
-        'numeric'          => 'Wert darf nicht negativ sein'
-    ],
-    'checkboxes'           => ':attribute enthält ungültige Optionen.',
-    'radio_buttons'        => ':attribute ist ungültig.',
+    'timezone' => 'Das Feld :attribute muss eine gültige Zeitzone sein.',
+    'unique' => ':attribute ist bereits vergeben.',
+    'uploaded' => ':attribute konnte nicht hochgeladen werden.',
+    'uppercase' => 'Das Feld :attribute muss in Großbuchstaben sein.',
+    'url' => 'Das Feld :attribute muss eine gültige URL sein.',
+    'ulid' => 'Das Feld :attribute muss eine gültige ULID sein.',
+    'uuid' => 'Das Feld :attribute muss eine gültige UUID sein.',
+    'fmcs_location' => 'In den Admin-Einstellungen ist eine vollständige Mehrfachunterstützung für Unternehmen und Standortbereicherung aktiviert und der ausgewählte Standort und die ausgewählte Firma sind nicht kompatibel.',
 
 
     /*
@@ -120,16 +186,22 @@ return [
     |
     */
 
+    'email_array'      => 'Eine oder mehrere Email Adressen sind ungültig.',
+    'checkboxes'           => ':attribute enthält ungültige Optionen.',
+    'radio_buttons'        => ':attribute ist ungültig.',
+    
     'custom' => [
         'alpha_space' => 'Das :attribute Feld enthält ein nicht erlaubtes Zeichen.',
-        'email_array'      => 'Eine oder mehrere Email Adressen sind ungültig.',
+
         'hashed_pass'      => 'Ihr derzeitiges Passwort ist nicht korrekt',
         'dumbpwd'          => 'Das Passwort ist zu gebräuchlich.',
         'statuslabel_type' => 'Du musst einen gültigen Statuslabel-Typ auswählen',
+        'custom_field_not_found'          => 'Dieses Feld scheint nicht zu existieren. Bitte überprüfe deine benutzerdefinierten Feldnamen noch einmal.',
+        'custom_field_not_found_on_model' => 'Dieses Feld scheint vorhanden zu sein, ist aber im Feldsatz dieses Asset-Modells nicht verfügbar.',
 
         // date_format validation with slightly less stupid messages. It duplicates a lot, but it gets the job done :(
-        // We use this because the default error message for date_format is reflects php Y-m-d, which non-PHP
-        // people won't know how to format. 
+        // We use this because the default error message for date_format reflects php Y-m-d, which non-PHP
+        // people won't know how to format.
         'purchase_date.date_format'     => ':attribute muss ein gültiges Datum im Format JJJJ-MM-TT sein',
         'last_audit_date.date_format'   =>  ':attribute muss ein gültiges Datum im Format JJJJ-MM-TT hh:mm:ss sein',
         'expiration_date.date_format'   =>  ':attribute muss ein gültiges Datum im Format JJJJ-MM-TT sein',
@@ -137,9 +209,15 @@ return [
         'expected_checkin.date_format'  =>  ':attribute muss ein gültiges Datum im Format JJJJ-MM-TT sein',
         'start_date.date_format'        =>  ':attribute muss ein gültiges Datum im Format JJJJ-MM-TT sein',
         'end_date.date_format'          =>  ':attribute muss ein gültiges Datum im Format JJJJ-MM-TT sein',
+        'invalid_value_in_field' => 'Ungültiger Wert in diesem Feld enthalten',
 
-    ],
+        'ldap_username_field' => [
+            'not_in' =>         '<code>sAMAccountName</code> (Groß- und Kleinschreibung) funktioniert wahrscheinlich nicht. Du solltest stattdessen <code>samaccountname</code> (Kleinschreibung) verwenden.'
+        ],
+        'ldap_auth_filter_query' => ['not_in' => '<code>uid=samaccountname</code> ist wahrscheinlich kein gültiger Authentifizierungsfilter. Du möchtest wahrscheinlich <code>uid=</code> '],
+        'ldap_filter' => ['regex' => 'Dieser Wert sollte wahrscheinlich nicht in Klammern gesetzt werden.'],
 
+        ],
     /*
     |--------------------------------------------------------------------------
     | Custom Validation Attributes
@@ -155,8 +233,16 @@ return [
 
     /*
     |--------------------------------------------------------------------------
-    | Generic Validation Messages
+    | Generic Validation Messages - we use these in the jquery validation where we don't have
+    | access to the :attribute
     |--------------------------------------------------------------------------
     */
-    'invalid_value_in_field' => 'Ungültiger Wert in diesem Feld enthalten',
+
+    'generic' => [
+        'invalid_value_in_field' => 'Ungültiger Wert in diesem Feld enthalten',
+        'required' => 'Dieses Feld ist erforderlich',
+        'email' => 'Bitte geben Sie eine gültige E-Mail-Adresse ein',
+    ],
+
+
 ];
diff --git a/resources/lang/el-GR/account/general.php b/resources/lang/el-GR/account/general.php
index 081eb271c0..1d9739ea1c 100644
--- a/resources/lang/el-GR/account/general.php
+++ b/resources/lang/el-GR/account/general.php
@@ -2,10 +2,16 @@
 
 return array(
     'personal_api_keys' => 'Προσωπικά Κλειδιά Api',
+    'personal_access_token' => 'Personal Access Token',
+    'personal_api_keys_success' => 'Personal API Key :key created sucessfully',
+    'here_is_api_key' => 'Here is your new personal access token. This is the only time it will be shown so do not lose it! You may now use this token to make API requests.',
     'api_key_warning' => 'When generating an API token, be sure to copy it down immediately as they will not be visible to you again.',
     'api_base_url' => 'Η βάση url σας API βρίσκεται στο:',
     'api_base_url_endpoint' => '/&lt;endpoint&gt;',
     'api_token_expiration_time' => 'Τα API tokens έχουν οριστεί να λήγουν:',
     'api_reference' => 'Please check the <a href="https://snipe-it.readme.io/reference" target="_blank">API reference</a> to find specific API endpoints and additional API documentation.',
     'profile_updated' => 'Account successfully updated',
+    'no_tokens' => 'You have not created any personal access tokens.',
+    'enable_sounds' => 'Enable sound effects',
+    'enable_confetti' => 'Enable confetti effects',
 );
diff --git a/resources/lang/el-GR/admin/accessories/message.php b/resources/lang/el-GR/admin/accessories/message.php
index cafc600c66..295f11a455 100644
--- a/resources/lang/el-GR/admin/accessories/message.php
+++ b/resources/lang/el-GR/admin/accessories/message.php
@@ -26,7 +26,11 @@ return array(
         'error'   		=> 'Το αξεσουάρ δεν έχει ελεγχθεί, δοκιμάστε ξανά',
         'success' 		=> 'Το αξεσουάρ ολοκληρώθηκε με επιτυχία.',
         'unavailable'   => 'Το αξεσουάρ δεν είναι διαθέσιμο για ολοκλήρωση της παραγγελίας. Ελέγξτε την διαθέσιμη ποσότητα',
-        'user_does_not_exist' => 'Αυτός ο χρήστης δεν είναι έγκυρος. Παρακαλώ δοκιμάστε ξανά.'
+        'user_does_not_exist' => 'Αυτός ο χρήστης δεν είναι έγκυρος. Παρακαλώ δοκιμάστε ξανά.',
+         'checkout_qty' => array(
+            'lte'  => 'There is currently only one available accessory of this type, and you are trying to check out :checkout_qty. Please adjust the checkout quantity or the total stock of this accessory and try again.|There are :number_currently_remaining total available accessories, and you are trying to check out :checkout_qty. Please adjust the checkout quantity or the total stock of this accessory and try again.',
+            ),
+           
     ),
 
     'checkin' => array(
diff --git a/resources/lang/el-GR/admin/accessories/table.php b/resources/lang/el-GR/admin/accessories/table.php
index 75595b87ff..058de65cd6 100644
--- a/resources/lang/el-GR/admin/accessories/table.php
+++ b/resources/lang/el-GR/admin/accessories/table.php
@@ -6,6 +6,4 @@ return array(
     'id'      					=> 'ID',
     'require_acceptance'      	=> 'Αποδοχή',
     'title'      				=> 'Όνομα ανταλλακτικού',
-
-
 );
diff --git a/resources/lang/el-GR/admin/components/message.php b/resources/lang/el-GR/admin/components/message.php
index 6b2764b674..dc2584affd 100644
--- a/resources/lang/el-GR/admin/components/message.php
+++ b/resources/lang/el-GR/admin/components/message.php
@@ -17,7 +17,8 @@ return array(
     'delete' => array(
         'confirm'   => 'Είστε βέβαιοι ότι θέλετε να διαγράψετε αυτό το εξάρτημα;',
         'error'   => 'Παρουσιάστηκε ένα ζήτημα κατάργησης του στοιχείου. ΠΑΡΑΚΑΛΩ προσπαθησε ξανα.',
-        'success' => 'Το εξάρτημα έχει διαγραφεί με επιτυχία.'
+        'success' => 'Το εξάρτημα έχει διαγραφεί με επιτυχία.',
+        'error_qty'   => 'Some components of this type are still checked out. Please check them in and try again.',
     ),
 
      'checkout' => array(
diff --git a/resources/lang/el-GR/admin/consumables/general.php b/resources/lang/el-GR/admin/consumables/general.php
index f14b68f1f9..dbe705d9d8 100644
--- a/resources/lang/el-GR/admin/consumables/general.php
+++ b/resources/lang/el-GR/admin/consumables/general.php
@@ -8,4 +8,5 @@ return array(
     'remaining' 			            => 'Απομένουν',
     'total' 			                => 'Σύνολο',
     'update'                            => 'Ενημέρωση αναλώσιμων',
+    'inventory_warning'                 => 'The inventory of this consumable is below the minimum amount of :min_count',
 );
diff --git a/resources/lang/el-GR/admin/consumables/message.php b/resources/lang/el-GR/admin/consumables/message.php
index 4fc714b928..68f64a1a47 100644
--- a/resources/lang/el-GR/admin/consumables/message.php
+++ b/resources/lang/el-GR/admin/consumables/message.php
@@ -2,6 +2,7 @@
 
 return array(
 
+    'invalid_category_type' => 'The category must be a consumable category.',
     'does_not_exist' => 'Το αναλώσιμο δεν υπάρχει.',
 
     'create' => array(
diff --git a/resources/lang/el-GR/admin/custom_fields/general.php b/resources/lang/el-GR/admin/custom_fields/general.php
index d2b19da44c..9f55d082af 100644
--- a/resources/lang/el-GR/admin/custom_fields/general.php
+++ b/resources/lang/el-GR/admin/custom_fields/general.php
@@ -35,7 +35,7 @@ return [
     'create_field_title' => 'Δημιουργία νέου προσαρμοσμένου πεδίου',
     'value_encrypted'      	        => 'Η τιμή αυτού του πεδίου είναι κρυπτογραφημένη στη βάση δεδομένων. Μόνο οι διαχειριστές θα μπορούν να δουν την αποκρυπτογραφημένη τιμή',
     'show_in_email'     => 'Να περιλαμβάνεται η τιμή αυτού του πεδίου στα emails χρέωσης ου αποστέλονται στους χρήστες; Κρυπτογραφημένα πεδία δεν μπορούν να περιληφθούν σε emails',
-    'show_in_email_short'     => 'Συμπερίληψη στα email.',
+    'show_in_email_short' => 'Συμπερίληψη στα email',
     'help_text' => 'Κείμενο Βοήθειας',
     'help_text_description' => 'Αυτό είναι προαιρετικό κείμενο που θα εμφανίζεται κάτω από τα στοιχεία της φόρμας κατά την επεξεργασία ενός περιουσιακού στοιχείου για να παρέχει το πλαίσιο στο πεδίο.',
     'about_custom_fields_title' => 'Σχετικά Με Προσαρμοσμένα Πεδία',
@@ -57,5 +57,8 @@ return [
     'show_in_requestable_list_short' => 'Εμφάνιση στη λίστα απαιτούμενων στοιχείων',
     'show_in_requestable_list' => 'Εμφάνιση τιμής στη λίστα Απαιτούμενων στοιχείων. Κρυπτογραφημένα πεδία δεν θα εμφανίζονται',
     'encrypted_options' => 'Αυτό το πεδίο είναι κρυπτογραφημένο, οπότε ορισμένες επιλογές εμφάνισης δεν θα είναι διαθέσιμες.',
+    'display_checkin' => 'Display in checkin forms',
+    'display_checkout' => 'Display in checkout forms',
+    'display_audit' => 'Display in audit forms',
 
 ];
diff --git a/resources/lang/el-GR/admin/custom_fields/message.php b/resources/lang/el-GR/admin/custom_fields/message.php
index 5d13f79b92..d76b2d6635 100644
--- a/resources/lang/el-GR/admin/custom_fields/message.php
+++ b/resources/lang/el-GR/admin/custom_fields/message.php
@@ -5,6 +5,7 @@ return array(
     'field' => array(
         'invalid'   => 'Αυτό το πεδίο δεν υπάρχει.',
         'already_added'   => 'Το πεδίο έχει ήδη προσθέσει',
+        'none_selected'   => 'No field selected',
 
         'create' => array(
             'error'   => 'Το πεδία δεν δημιουργήθηκαν, παρακαλώ προσπαθήστε ξανά.',
diff --git a/resources/lang/el-GR/admin/depreciations/general.php b/resources/lang/el-GR/admin/depreciations/general.php
index b2b474697a..321717c772 100644
--- a/resources/lang/el-GR/admin/depreciations/general.php
+++ b/resources/lang/el-GR/admin/depreciations/general.php
@@ -13,4 +13,8 @@ return [
     'no_depreciations_warning'               => '<strong>Προειδοποίηση: </strong>
                       Αυτή τη στιγμή δεν έχετε κάποια απόσβεση ρυθμισμένη.
                       Παρακαλείστε να ορίσετε τουλάχιστον μία απόσβεση για να δείτε την έκθεση απόσβεσης.',
+    'depreciation_method'                   => 'Αναφορά απόσβεσης',
+    'linear_depreciation'                   => 'Linear (Default)',
+    'half_1'                                => 'Half-year convention, always applied',
+    'half_2'                                => 'Half-year convention, applied with condition',
 ];
diff --git a/resources/lang/el-GR/admin/hardware/form.php b/resources/lang/el-GR/admin/hardware/form.php
index 7a17bb6983..dfcf96d511 100644
--- a/resources/lang/el-GR/admin/hardware/form.php
+++ b/resources/lang/el-GR/admin/hardware/form.php
@@ -55,8 +55,11 @@ return [
     'asset_location_update_default' => 'Ενημέρωση μόνο προεπιλεγμένης τοποθεσίας',
     'asset_location_update_actual' => 'Ενημέρωση μόνο πραγματικής τοποθεσίας',
     'asset_not_deployable' => 'Αυτή η κατάσταση ενεργητικού δεν μπορεί να αναπτυχθεί. Αυτό το στοιχείο δεν μπορεί να ελεγχθεί.',
-    'asset_deployable' => 'Αυτή η κατάσταση μπορεί να χρησιμοποιηθεί. Αυτό το στοιχείο μπορεί να ελεγχθεί.',
+    'asset_not_deployable_checkin' => 'That asset status is not deployable. Using this status label will checkin the asset.',
+    'asset_deployable' => 'This asset can be checked out.',
     'processing_spinner' => 'Επεξεργασία... (Αυτό μπορεί να πάρει λίγο χρόνο σε μεγάλα αρχεία)',
+    'processing' => 'Processing... ',
     'optional_infos'  => 'Προαιρετικές Πληροφορίες',
-    'order_details'   => 'Σχετικές Πληροφορίες Παραγγελίας'
+    'order_details'   => 'Σχετικές Πληροφορίες Παραγγελίας',
+    'calc_eol'    => 'If nulling the EOL date, use automatic EOL calculation based on the purchase date and EOL rate.',
 ];
diff --git a/resources/lang/el-GR/admin/hardware/general.php b/resources/lang/el-GR/admin/hardware/general.php
index 172e972155..21ec6965d8 100644
--- a/resources/lang/el-GR/admin/hardware/general.php
+++ b/resources/lang/el-GR/admin/hardware/general.php
@@ -5,8 +5,8 @@ return [
     'about_assets_text'            => 'Τα στοιχεία ενεργητικού είναι στοιχεία που παρακολουθούνται με αύξοντα αριθμό ή ετικέτα στοιχείων. Έχουν την τάση να είναι στοιχεία υψηλότερης αξίας, όπου ο εντοπισμός ενός συγκεκριμένου στοιχείου έχει σημασία.',
     'archived'  				=> 'Αρχειοθετημένα',
     'asset'  					=> 'Πάγιο',
-    'bulk_checkout'             => 'Στοιχεία Ολοκλήρωσης Παραγγελίας',
-    'bulk_checkin'              => 'Checkin Assets',
+    'bulk_checkout'             => 'Μαζικός έλεγχος',
+    'bulk_checkin'              => 'Bulk Checkin',
     'checkin'  					=> 'Checkin Asset',
     'checkout'  				=> 'Ταμείο ελέγχου',
     'clone'  					=> 'Κλώνος χρήστη',
@@ -27,8 +27,7 @@ return [
     'undeployable_tooltip'  	=> 'Αυτό το στοιχείο έχει μια ετικέτα κατάστασης που δεν είναι δυνατή η εγκατάσταση και δεν μπορεί να ελεγχθεί αυτή τη στιγμή.',
     'view'  					=> 'Προβολή παγίου',
     'csv_error' => 'Έχετε ένα σφάλμα στο αρχείο CSV σας:',
-    'import_text' => '<p>Upload a CSV that contains asset history. The assets and users MUST already exist in the system, or they will be skipped. Matching assets for history import happens against the asset tag. We will try to find a matching user based on the user\'s name you provide, and the criteria you select below. If you do not select any criteria below, it will simply try to match on the username format you configured in the <code>Admin &gt; General Settings</code>.</p><p>Fields included in the CSV must match the headers: <strong>Asset Tag, Name, Checkout Date, Checkin Date</strong>. Any additional fields will be ignored. </p><p>Checkin Date: blank or future checkin dates will checkout items to associated user.  Excluding the Checkin Date column will create a checkin date with todays date.</p>
-    ',
+    'import_text' => '<p>Upload a CSV that contains asset history. The assets and users MUST already exist in the system, or they will be skipped. Matching assets for history import happens against the asset tag. We will try to find a matching user based on the user\'s name you provide, and the criteria you select below. If you do not select any criteria below, it will simply try to match on the username format you configured in the <code>Admin &gt; General Settings</code>.</p><p>Fields included in the CSV must match the headers: <strong>Asset Tag, Name, Checkout Date, Checkin Date</strong>. Any additional fields will be ignored. </p><p>Checkin Date: blank or future checkin dates will checkout items to associated user.  Excluding the Checkin Date column will create a checkin date with todays date.</p>    ',
     'csv_import_match_f-l' => 'Try to match users by <strong>firstname.lastname</strong> (<code>jane.smith</code>) format',
     'csv_import_match_initial_last' => 'Try to match users by <strong>first last name</strong> (<code>jsmith</code>) format',
     'csv_import_match_first' => 'Try to match users by <strong>name</strong> (<code>jane</code>) format',
diff --git a/resources/lang/el-GR/admin/hardware/message.php b/resources/lang/el-GR/admin/hardware/message.php
index 0bf485eab1..7f99565a56 100644
--- a/resources/lang/el-GR/admin/hardware/message.php
+++ b/resources/lang/el-GR/admin/hardware/message.php
@@ -2,19 +2,23 @@
 
 return [
 
-    'undeployable' 		=> '<strong>Warning: </strong> Το περιουσιακό αυτό στοιχείο έχει επισημανθεί ως επί του παρόντος undeployable.
-                        Εάν αυτή η κατάσταση έχει αλλάξει, παρακαλούμε να ενημερώσετε την κατάσταση των περιουσιακών στοιχείων.',
-    'does_not_exist' 	=> 'To πάγιο δεν υπάρχει.',
-    'does_not_exist_var'=> 'Asset with tag :asset_tag not found.',
-    'no_tag' 	        => 'No asset tag provided.',
+    'undeployable' 		 => '<strong>Warning: </strong> This asset has been marked as currently undeployable. If this status has changed, please update the asset status.',
+    'does_not_exist' 	 => 'To πάγιο δεν υπάρχει.',
+    'does_not_exist_var' => 'Asset with tag :asset_tag not found.',
+    'no_tag' 	         => 'No asset tag provided.',
     'does_not_exist_or_not_requestable' => 'Αυτό το στοιχείο δεν υπάρχει ή δεν απαιτείται.',
-    'assoc_users'	 	=> 'Αυτό το στοιχείο είναι συνήθως αποσυνδεδεμένο από έναν χρήστη και δεν μπορεί να διαγραφεί. Ελέγξτε πρώτα το στοιχείο και, στη συνέχεια, δοκιμάστε ξανά τη διαγραφή.',
+    'assoc_users'	 	 => 'Αυτό το στοιχείο είναι συνήθως αποσυνδεδεμένο από έναν χρήστη και δεν μπορεί να διαγραφεί. Ελέγξτε πρώτα το στοιχείο και, στη συνέχεια, δοκιμάστε ξανά τη διαγραφή.',
     'warning_audit_date_mismatch' 	=> 'This asset\'s next audit date (:next_audit_date) is before the last audit date (:last_audit_date). Please update the next audit date.',
+    'labels_generated'   => 'Labels were successfully generated.',
+    'error_generating_labels' => 'Error while generating labels.',
+    'no_assets_selected' => 'No assets selected.',
 
     'create' => [
         'error'   		=> 'Το περιουσιακού στοιχείο δεν δημιουργήθηκε, παρακαλώ προσπαθήστε ξανά. :(',
         'success' 		=> 'Το πάγιο δημιουργήθηκε επιτυχώς',
         'success_linked' => 'Asset with tag :tag was created successfully. <strong><a href=":link" style="color: white;">Click here to view</a></strong>.',
+        'multi_success_linked' => 'Asset with tag :links was created successfully.|:count assets were created succesfully. :links.',
+        'partial_failure' => 'An asset was unable to be created. Reason: :failures|:count assets were unable to be created. Reasons: :failures',
     ],
 
     'update' => [
@@ -52,20 +56,24 @@ return [
     ],
 
     'import' => [
+        'import_button'         => 'Process Import',
         'error'                 => 'Ορισμένα στοιχεία δεν έχουν εισαχθεί σωστά.',
         'errorDetail'           => 'Τα παρακάτω στοιχεία δεν εισήχθησαν εξαιτίας σφαλμάτων.',
         'success'               => 'Το αρχείο σας έχει εισαχθεί',
         'file_delete_success'   => 'Το αρχείο σας έχει διαγραφεί με επιτυχία',
         'file_delete_error'      => 'Το αρχείο δεν μπόρεσε να διαγραφεί',
         'file_missing' => 'Λείπει το επιλεγμένο αρχείο',
+        'file_already_deleted' => 'The file selected was already deleted',
         'header_row_has_malformed_characters' => 'Ένα ή περισσότερα χαρακτηριστικά στη σειρά κεφαλίδας περιέχουν κακοσχηματισμένους UTF-8 χαρακτήρες',
         'content_row_has_malformed_characters' => 'Ένα ή περισσότερα χαρακτηριστικά στην πρώτη σειρά περιεχομένου περιέχουν κακοσχηματισμένους UTF-8 χαρακτήρες',
+        'transliterate_failure' => 'Transliteration from :encoding to UTF-8 failed due to invalid characters in input'
     ],
 
 
     'delete' => [
         'confirm'   	=> 'Είστε σίγουροι ότι θέλετε να διαγράψετε αυτό το πάγιο;',
         'error'   		=> 'Παρουσιάστηκε ένα ζήτημα κατάργησης του στοιχείου. ΠΑΡΑΚΑΛΩ προσπαθησε ξανα.',
+        'assigned_to_error' => '{1}Asset Tag: :asset_tag is currently checked out. Check in this device before deletion.|[2,*]Asset Tags: :asset_tag are currently checked out. Check in these devices before deletion.',
         'nothing_updated'   => 'Δεν επιλέχθηκαν στοιχεία ενεργητικού, οπότε τίποτα δεν διαγράφηκε.',
         'success' 		=> 'Το πάγιο διαγράφηκε με επιτυχία.',
     ],
@@ -78,6 +86,11 @@ return [
         'no_assets_selected' => 'Πρέπει να επιλέξετε τουλάχιστον ένα στοιχείο προς δημοσίευση.',
     ],
 
+    'multi-checkout' => [
+        'error'   => 'Asset was not checked out, please try again|Assets were not checked out, please try again',
+        'success' => 'Asset checked out successfully.|Assets checked out successfully.',
+    ],
+
     'checkin' => [
         'error'   		=> 'Το στοιχείο δεν έχει επιλεγεί, δοκιμάστε ξανά',
         'success' 		=> 'Το ενεργό στοιχείο ολοκληρώθηκε με επιτυχία.',
@@ -87,9 +100,10 @@ return [
     ],
 
     'requests' => [
-        'error'   		=> 'Το στοιχείο δεν ζητήθηκε, δοκιμάστε ξανά',
-        'success' 		=> 'Τα πάγια ενημερώθηκαν επιτυχώς.',
-        'canceled'      => 'Η αίτηση πληρωμής ακυρώθηκε με επιτυχία',
+        'error'   		=> 'Request was not successful, please try again.',
+        'success' 		=> 'Request successfully submitted.',
+        'canceled'      => 'Request successfully canceled.',
+        'cancel'        => 'Ακυρώστε αυτό το αίτημα στοιχείου',
     ],
 
 ];
diff --git a/resources/lang/el-GR/admin/hardware/table.php b/resources/lang/el-GR/admin/hardware/table.php
index 47ce533367..9283c5c7cb 100644
--- a/resources/lang/el-GR/admin/hardware/table.php
+++ b/resources/lang/el-GR/admin/hardware/table.php
@@ -25,7 +25,6 @@ return [
     'image'		    => 'Φωτογραφία συσκευής',
     'days_without_acceptance' => 'Ημέρες χωρίς αποδοχή',
     'monthly_depreciation' => 'Μηνιαία Απόσβεση',
-    'assigned_to'    => 'Ανατέθηκε στον',
     'requesting_user' => 'Αίτηση Χρήστη',
     'requested_date' => 'Ημερομηνία Που Ζητήθηκε',
     'changed'       => 'Άλλαξε',
diff --git a/resources/lang/el-GR/admin/kits/general.php b/resources/lang/el-GR/admin/kits/general.php
index 49d64a2cef..b004cc2056 100644
--- a/resources/lang/el-GR/admin/kits/general.php
+++ b/resources/lang/el-GR/admin/kits/general.php
@@ -47,4 +47,5 @@ return [
     'kit_deleted'                       => 'Το κιτ διαγράφηκε με επιτυχία',
     'kit_model_updated'                 => 'Το μοντέλο ενημερώθηκε με επιτυχία',
     'kit_model_detached'                => 'Το μοντέλο αποσυνδέθηκε με επιτυχία',
+    'model_already_attached'            => 'Model already attached to kit',
 ];
diff --git a/resources/lang/el-GR/admin/licenses/general.php b/resources/lang/el-GR/admin/licenses/general.php
index cb2691ea62..8adfd56466 100644
--- a/resources/lang/el-GR/admin/licenses/general.php
+++ b/resources/lang/el-GR/admin/licenses/general.php
@@ -14,6 +14,7 @@ return array(
     'info'  					=> 'Πληροφορίες άδειας',
     'license_seats'  			=> 'Άδειες Θέσεις',
     'seat'  					=> 'Εδρα',
+    'seat_count'  				=> 'Seat :count',
     'seats'  					=> 'Καθίσματα',
     'software_licenses'  		=> 'Άδειες λογισμικού',
     'user'  					=> 'Χρήστης',
@@ -23,12 +24,12 @@ return array(
         [
             'checkin_all'           => [
                 'button'            => 'Checkin Όλα Τα Καθίσματα',
-                'modal'             => 'Αυτό θα ενεργοποιήσει τον έλεγχο μιας θέσης. "Αυτή η ενέργεια θα ελέγξει όλα τα :checkedout_seats_count καθίσματα για αυτήν την άδεια.',
+                'modal'             => 'This action will checkin one seat. | This action will checkin all :checkedout_seats_count seats for this license.',
                 'enabled_tooltip'   => 'Checkin ΟΛΕΣ τις θέσεις για αυτή την άδεια χρήσης τόσο από τους χρήστες όσο και από τα περιουσιακά στοιχεία',
                 'disabled_tooltip'  => 'Αυτό είναι απενεργοποιημένο, επειδή δεν υπάρχουν καθίσματα επί του παρόντος ελεγμένο',
                 'disabled_tooltip_reassignable'  => 'Αυτό είναι απενεργοποιημένο επειδή η Άδεια δεν είναι επανασχεδιασμένη',
                 'success'           => 'Η άδεια ελέγχθηκε με επιτυχία! "Όλες οι άδειες ελέγχθηκαν επιτυχώς!',
-                'log_msg'           => 'Έγινε έλεγχος μέσω μαζικού checkout άδειας χρήσης στο GUI άδειας',
+                'log_msg'           => 'Checked in via bulk license checkin in license GUI',
             ],
 
             'checkout_all'              => [
diff --git a/resources/lang/el-GR/admin/licenses/message.php b/resources/lang/el-GR/admin/licenses/message.php
index e6790e0b1c..d377548466 100644
--- a/resources/lang/el-GR/admin/licenses/message.php
+++ b/resources/lang/el-GR/admin/licenses/message.php
@@ -44,10 +44,13 @@ return array(
         'error'   => 'Παρουσιάστηκε πρόβλημα κατά την εξακρίβωση της άδειας. ΠΑΡΑΚΑΛΩ προσπαθησε ξανα.',
         'success' => 'Η άδεια εκτυπώθηκε με επιτυχία',
         'not_enough_seats' => 'Δεν υπάρχουν αρκετές θέσεις άδειας χρήσης για ολοκλήρωση της παραγγελίας',
+        'mismatch' => 'The license seat provided does not match the license',
+        'unavailable' => 'This seat is not available for checkout.',
     ),
 
     'checkin' => array(
         'error'   => 'Παρουσιάστηκε ένα ζήτημα ελέγχου της άδειας. ΠΑΡΑΚΑΛΩ προσπαθησε ξανα.',
+        'not_reassignable' => 'License not reassignable',
         'success' => 'Η άδεια έχει ελεγχθεί με επιτυχία'
     ),
 
diff --git a/resources/lang/el-GR/admin/locations/message.php b/resources/lang/el-GR/admin/locations/message.php
index e1f784000b..1470363052 100644
--- a/resources/lang/el-GR/admin/locations/message.php
+++ b/resources/lang/el-GR/admin/locations/message.php
@@ -3,11 +3,12 @@
 return array(
 
     'does_not_exist' => 'Η τοποθεσία δεν υπάρχει.',
-    'assoc_users'    => 'This location is not currently deletable because it is the location of record for at least one asset or user, has assets assigned to it, or is the parent location of another location. Please update your models to no longer reference this company and try again. ',
+    'assoc_users'    => 'This location is not currently deletable because it is the location of record for at least one asset or user, has assets assigned to it, or is the parent location of another location. Please update your records to no longer reference this location and try again ',
     'assoc_assets'	 => 'Αυτή η τοποθεσία συσχετίζεται προς το παρόν με τουλάχιστον ένα στοιχείο και δεν μπορεί να διαγραφεί. Ενημερώστε τα στοιχεία σας ώστε να μην αναφέρονται πλέον στην τοποθεσία αυτή και να προσπαθήσετε ξανά.',
     'assoc_child_loc'	 => 'Αυτή η τοποθεσία είναι αυτήν τη στιγμή γονέας τουλάχιστον μιας τοποθεσίας παιδιού και δεν μπορεί να διαγραφεί. Ενημερώστε τις τοποθεσίες σας ώστε να μην αναφέρονται πλέον σε αυτήν την τοποθεσία και δοκιμάστε ξανά.',
     'assigned_assets' => 'Αντιστοιχισμένα Στοιχεία Ενεργητικού',
     'current_location' => 'Τρέχουσα Τοποθεσία',
+    'open_map' => 'Open in :map_provider_icon Maps',
 
 
     'create' => array(
@@ -20,6 +21,11 @@ return array(
         'success' => 'Η τοποθεσία αναβαθμίστηκε επιτυχώς.'
     ),
 
+    'restore' => array(
+        'error'   => 'Location was not restored, please try again',
+        'success' => 'Location restored successfully.'
+    ),
+
     'delete' => array(
         'confirm'   	=> 'Είστε βέβαιοι ότι θέλετε να διαγράψετε αυτήν την τοποθεσία;',
         'error'   => 'Παρουσιάστηκε πρόβλημα κατά τη διαγραφή της τοποθεσίας. ΠΑΡΑΚΑΛΩ προσπαθησε ξανα.',
diff --git a/resources/lang/el-GR/admin/locations/table.php b/resources/lang/el-GR/admin/locations/table.php
index 259b8f629f..b6131d7dba 100644
--- a/resources/lang/el-GR/admin/locations/table.php
+++ b/resources/lang/el-GR/admin/locations/table.php
@@ -39,4 +39,5 @@ return [
     'signed_by_finance_auditor' => 'Υπογράφηκε Από (Ελεγκτή Χρηματοδότησης):',
     'signed_by_location_manager' => 'Υπογράφηκε Από (Location Manager):',
     'signed_by'                 => 'Υπεγράφη Από:',
+    'clone'  					=> 'Clone Location',
 ];
diff --git a/resources/lang/el-GR/admin/models/general.php b/resources/lang/el-GR/admin/models/general.php
index 6d79c92982..c8051eb74b 100644
--- a/resources/lang/el-GR/admin/models/general.php
+++ b/resources/lang/el-GR/admin/models/general.php
@@ -3,7 +3,7 @@
 return array(
     'about_models_title'     => 'Σχετικά με τους τύπους παγίων',
     'about_models_text'           => 'Τα μοντέλα περιουσιακών στοιχείων είναι ένας τρόπος για να ομαδοποιήσετε ταυτόσημα περιουσιακά στοιχεία "MBP 2013", "IPhone 6s" κ.λπ.',
-    'deleted'  					        => 'Αυτό το μοντέλο έχει διαγραφεί.',
+    'deleted'  					=> 'Αυτό το μοντέλο έχει διαγραφεί.',
     'bulk_delete'               => 'Μαζική διαγραφή μοντέλου Asset',
     'bulk_delete_help'               => 'Χρησιμοποιήστε τα παρακάτω πλαίσια ελέγχου για να επιβεβαιώσετε τη διαγραφή των επιλεγμένων μοντέλων στοιχείων. Τα μοντέλα στοιχείων που έχουν στοιχεία που σχετίζονται με αυτά δεν μπορούν να διαγραφούν έως ότου τα στοιχεία συσχετιστούν με διαφορετικό μοντέλο.',
     'bulk_delete_warn'          => 'Πρόκειται να διαγράψετε ένα μοντέλο στοιχείων ενεργητικού. Πρόκειται να διαγράψετε :model_count μοντέλων ενεργητικού.',
diff --git a/resources/lang/el-GR/admin/models/message.php b/resources/lang/el-GR/admin/models/message.php
index 48af07b2d2..f9ab48b1d3 100644
--- a/resources/lang/el-GR/admin/models/message.php
+++ b/resources/lang/el-GR/admin/models/message.php
@@ -7,7 +7,7 @@ return array(
     'no_association' => 'ΠΡΟΣΟΧΗ! Το μοντέλο στοιχείων ενεργητικού για αυτό το στοιχείο δεν είναι έγκυρο ή λείπει!',
     'no_association_fix' => 'Αυτό θα σπάσει τα πράγματα με περίεργους και φρικτούς τρόπους. Επεξεργαστείτε αυτό το στοιχείο τώρα για να το αντιστοιχίσετε ένα μοντέλο.',
     'assoc_users'	 => 'Αυτό το μοντέλο συσχετίζεται επί του παρόντος με ένα ή περισσότερα στοιχεία και δεν μπορεί να διαγραφεί. Διαγράψτε τα στοιχεία και, στη συνέχεια, δοκιμάστε ξανά τη διαγραφή.',
-
+    'invalid_category_type' => 'This category must be an asset category.',
 
     'create' => array(
         'error'   => 'Το μοντέλο δεν δημιουργήθηκε, παρακαλώ προσπαθήστε ξανά.',
diff --git a/resources/lang/el-GR/admin/reports/general.php b/resources/lang/el-GR/admin/reports/general.php
index 2f6c74f53f..3662ac62b8 100644
--- a/resources/lang/el-GR/admin/reports/general.php
+++ b/resources/lang/el-GR/admin/reports/general.php
@@ -4,6 +4,7 @@ return [
     'info'   => 'Επιλέξτε τις επιλογές που θέλετε για την αναφορά των παγίων σας.',
     'deleted_user' => 'Διαγραφή χρήστη',
     'send_reminder' => 'Αποστολή υπενθύμισης',
+    'cannot_send_reminder' => 'User has been deleted or does not have an email address so cannot receive a reminder',
     'reminder_sent' => 'Υπενθύμιση εστάλη',
     'acceptance_deleted' => 'Η αίτηση αποδοχής διαγράφηκε',
     'acceptance_request' => 'Αίτημα αποδοχής',
@@ -13,5 +14,10 @@ return [
         'user_state' => 'Κατάσταση Χρήστη',
         'user_country' => 'Χώρα Χρήστη',
         'user_zip' => 'Zip Χρήστη'
-    ]
-];
\ No newline at end of file
+    ],
+    'open_saved_template' => 'Open Saved Template',
+    'save_template' =>  'Save Template',
+    'select_a_template' => 'Select a Template',
+    'template_name' => 'Template Name',
+    'update_template' => 'Update Template',
+];
diff --git a/resources/lang/el-GR/admin/reports/message.php b/resources/lang/el-GR/admin/reports/message.php
index 8113d019e5..2800bbdf0b 100644
--- a/resources/lang/el-GR/admin/reports/message.php
+++ b/resources/lang/el-GR/admin/reports/message.php
@@ -1,5 +1,16 @@
 <?php
 
-return array(
-    'error'   => 'Πρέπει να επιλέξετε τουλάχιστον μία επιλογή.'
-);
+return [
+    'about_templates' => 'About Saved Templates',
+    'saving_templates_description' => 'Select your options, then enter the name of your template in the box above and click the \'Save Template\' button. Use the dropdown to select a previously saved template.',
+    'create'  => [
+        'success' => 'Template saved successfully',
+    ],
+    'update' => [
+        'success' => 'Template updated successfully',
+    ],
+    'delete' => [
+        'success' => 'Template deleted',
+        'no_delete_permission' => 'Template does not exist or you do not have permission to delete it.',
+    ],
+];
diff --git a/resources/lang/el-GR/admin/settings/general.php b/resources/lang/el-GR/admin/settings/general.php
index 1049dda49d..592744703f 100644
--- a/resources/lang/el-GR/admin/settings/general.php
+++ b/resources/lang/el-GR/admin/settings/general.php
@@ -8,13 +8,13 @@ return [
     'ad_append_domain'          => 'Προσάρτηση ονόματος τομέα στο πεδίο ονόματος χρήστη',
     'ad_append_domain_help'     => 'Ο χρήστης δεν απαιτείται για να γράψει "username@domain.local", μπορεί απλά να πληκτρολογήσει "username".',
     'admin_cc_email'            => 'Επασύναψη email',
-    'admin_cc_email_help'       => 'Εάν θέλετε να στείλετε ένα αντίγραφο checkin/checkout emails που αποστέλλονται στους χρήστες σε έναν επιπλέον λογαριασμό email, εισαγάγετέ το εδώ. Διαφορετικά, αφήστε αυτό το πεδίο κενό.',
+    'admin_cc_email_help'       => 'Send a copy of checkin/checkout emails to this address.',
     'admin_settings'            => 'Ρυθμίσεις Διαχειριστή',
     'is_ad'				        => 'Αυτός είναι ένας διακομιστής υπηρεσίας καταλόγου Active Directory',
     'alerts'                	=> 'Ειδοποιήσεις',
     'alert_title'               => 'Ενημέρωση Ρυθμίσεων Ειδοποιήσεων',
     'alert_email'				=> 'Αποστολή ειδοποιήσεων προς',
-    'alert_email_help'    => 'Διευθύνσεις ηλεκτρονικού ταχυδρομείου ή λίστες διανομής στις οποίες θέλετε να αποστέλλονται ειδοποιήσεις, χωρισμένες με κόμμα',
+    'alert_email_help'          => 'Διευθύνσεις ηλεκτρονικού ταχυδρομείου ή λίστες διανομής στις οποίες θέλετε να αποστέλλονται ειδοποιήσεις, χωρισμένες με κόμμα.',
     'alerts_enabled'			=> 'Ειδοποιήσεις ενεργοποιημένες',
     'alert_interval'			=> 'Ελάχιστο όριο λήξης ειδοποιήσεων (σε ημέρες)',
     'alert_inv_threshold'		=> 'Ειδοποιήση ορίου αποθήκης',
@@ -31,15 +31,18 @@ return [
     'backups'					=> 'Αντίγραφα Ασφαλείας',
     'backups_help'              => 'Δημιουργήστε, κατεβάστε και επαναφέρετε αντίγραφα ασφαλείας ',
     'backups_restoring'         => 'Επαναφορά από αντίγραφο ασφαλείας',
+    'backups_clean' => 'Clean the backed-up database before restore',
+    'backups_clean_helptext' => "This can be useful if you're changing between database versions",
     'backups_upload'            => 'Μεταφόρτωση Αντιγράφου Ασφαλείας',
     'backups_path'              => 'Τα αντίγραφα ασφαλείας στο διακομιστή αποθηκεύονται στο <code>:path</code>',
-    'backups_restore_warning'   => 'Use the restore button <small><span class="btn btn-xs btn-warning"><i class="text-white fas fa-retweet" aria-hidden="true"></i></span></small> to restore from a previous backup. (This does not currently work with S3 file storage or Docker.)<br><br>Your <strong>entire :app_name database and any uploaded files will be completely replaced</strong> by what\'s in the backup file.  ',
+    'backups_restore_warning'   => 'Use the restore button <small><span class="btn btn-xs btn-warning"><i class="text-white fas fa-retweet" aria-hidden="true"></i></span></small> to restore from a previous backup. (This does not currently work with S3 file storage or Docker.)<br><br>Your <strong>entire :app_name database and any uploaded files will be completely replaced</strong> by what\'s in the backup file  ',
     'backups_logged_out'         => 'Όλοι οι υπάρχοντες χρήστες, συμπεριλαμβανομένου και σας, θα αποσυνδεθούν μόλις ολοκληρωθεί η επαναφορά σας.',
     'backups_large'             => 'Πολύ μεγάλα αντίγραφα ασφαλείας μπορεί να τερματίσουν στην προσπάθεια επαναφοράς και μπορεί ακόμα να χρειαστεί να εκτελεστούν μέσω της γραμμής εντολών. ',
     'barcode_settings'			=> 'Ρυθμίσεις γραμμωτού κώδικα',
     'confirm_purge'			    => 'Επιβεβαίωση καθαρισμού',
     'confirm_purge_help'		=> 'Εισάγετε το κείμενο "Διαγραφή" στο παρακάτω πλαίσιο για να καθαρίσετε τις διαγραμμένες εγγραφές σας. Αυτή η ενέργεια δεν μπορεί να αναιρεθεί και θα διαγράψει PERMANENTLY όλα τα μαλακά διαγραμμένα στοιχεία και χρήστες. (Θα πρέπει να κάνετε ένα αντίγραφο ασφαλείας πρώτα, μόνο για να είστε ασφαλείς).',
     'custom_css'				=> 'Προσαρμοσμένο CSS',
+    'custom_css_placeholder'	=> 'Add your custom CSS',
     'custom_css_help'			=> 'Εισαγάγετε τυχόν προσαρμοσμένες επικαλύψεις CSS που θέλετε να χρησιμοποιήσετε. Μην συμπεριλάβετε τις ετικέτες &lt;style&gt;&lt;/style&gt;.',
     'custom_forgot_pass_url'	=> 'URL επαναφοράς προσαρμοσμένου κωδικού πρόσβασης',
     'custom_forgot_pass_url_help'	=> 'Αυτό αντικαθιστά την ενσωματωμένη ξεχασμένη διεύθυνση URL κωδικού πρόσβασης στην οθόνη σύνδεσης, χρήσιμη για να κατευθύνει τα άτομα σε λειτουργία εσωτερικής ή φιλοξενούμενης επαναφοράς κωδικού πρόσβασης LDAP. Θα απενεργοποιήσει αποτελεσματικά τη λειτουργικότητα ξεχασμένου κωδικού πρόσβασης τοπικού χρήστη.',
@@ -47,34 +50,34 @@ return [
     'dashboard_message_help'	=> 'Αυτό το κείμενο θα εμφανίζεται στον πίνακα ελέγχου για οποιονδήποτε έχει άδεια να δει τον πίνακα ελέγχου.',
     'default_currency'  		=> 'Προεπιλεγμένο νόμισμα',
     'default_eula_text'			=> 'Προεπιλογή EULA',
+    'default_eula_text_placeholder' => 'Add your default EULA text',
     'default_language'			=> 'Προκαθορισμένη γλώσσα',
     'default_eula_help_text'	=> 'Μπορείτε επίσης να συσχετίσετε προσαρμοσμένες ΑΔΕΚ με συγκεκριμένες κατηγορίες περιουσιακών στοιχείων.',
     'acceptance_note'           => 'Add a note for your decision (Optional)',
     'display_asset_name'        => 'Εμφάνιση ονόματος παγίου',
     'display_checkout_date'     => 'Εμφάνιση ημερομηνίας αποχώρησης',
     'display_eol'               => 'Εμφάνιση του EOL στην προβολή πίνακα',
-    'display_qr'                => 'Εμφάνιση τετραγώνων κωδίκων',
+    'display_qr'                => 'Display 2D barcode',
     'display_alt_barcode'		=> 'Εμφάνιση 1D barcode',
-    'email_logo'                => 'Λογότυπο Email',
     'barcode_type'				=> '2D Barcode Type',
     'alt_barcode_type'			=> '1D τύπο γραμμωτού κώδικα',
-    'email_logo_size'       => 'Πλατεία λογότυπα στο email φαίνονται καλύτερα. ',
     'enabled'                   => 'Ενεργοποιημένο',
     'eula_settings'				=> 'Ρυθμίσεις EULA',
     'eula_markdown'				=> 'Αυτή η EULA επιτρέπει <a href="https://help.github.com/articles/github-flavored-markdown/">Github flavored markdown</a>.',
+    'empty_row_count'           => 'Field Start Offset (Empty Rows)',
+    'empty_row_count_help'      => 'Fields will begin populating after this many empty rows are skipped at the top of the label.',
     'favicon'                   => 'Αγαπημένο',
     'favicon_format'            => 'Αποδεκτοί τύποι αρχείων είναι ico, png και gif. Άλλες μορφές εικόνας μπορεί να μην λειτουργούν σε όλα τα προγράμματα περιήγησης.',
     'favicon_size'          => 'Τα Favicons πρέπει να είναι τετράγωνες εικόνες, 16x16 pixels.',
     'footer_text'               => 'Πρόσθετο κείμενο Footer',
     'footer_text_help'          => 'Αυτό το κείμενο θα εμφανιστεί στο υποσέλιδο στη δεξιά πλευρά. Οι σύνδεσμοι επιτρέπονται χρησιμοποιώντας την <a href="https://help.github.com/articles/github-flavored-markdown/"> Github flavored markdown </a>. Διακοπή γραμμής, κεφαλίδες, εικόνες κ.λπ. μπορεί να οδηγήσουν σε απρόβλεπτα αποτελέσματα.',
+    'footer_text_placeholder'   => 'Optional footer text',
     'general_settings'			=> 'Γενικές ρυθμίσεις',
-    'general_settings_keywords' => 'υποστήριξη της εταιρείας, υπογραφή, αποδοχή, μορφή ηλεκτρονικού ταχυδρομείου, μορφή ονόματος χρήστη, εικόνες, ανά σελίδα, μικρογραφία, eula, gravatar, tos, ταμπλό, ιδιωτικότητα',
     'general_settings_help'     => 'Προεπιλογή EULA και άλλα',
     'generate_backup'			=> 'Δημιουργία Αντίγραφου Ασφαλείας',
     'google_workspaces'         => 'Χώροι Εργασίας Google',
     'header_color'              => 'Χρώμα επικεφαλίδας',
     'info'                      => 'Αυτές οι ρυθμίσεις σάς επιτρέπουν να προσαρμόσετε ορισμένες πτυχές της εγκατάστασής σας.',
-    'label_logo'                => 'Λογότυπο Ετικέτας',
     'label_logo_size'           => 'Τετραγωνικά λογότυπα φαίνονται καλύτερα - θα εμφανιστεί στην επάνω δεξιά γωνία της κάθε ετικέτας περιουσιακών στοιχείων. ',
     'laravel'                   => 'Έκδοση οδηγού',
     'ldap'                      => 'LDAP',
@@ -94,7 +97,7 @@ return [
     'ldap_login_sync_help'      => 'Αυτό ελέγχει μόνο ότι το LDAP μπορεί να συγχρονιστεί σωστά. Εάν το Authentication στο LDAP δεν είναι σωστό, οι χρήστες ενδέχεται να μην μπορούν να συνδεθούν. ΠΡΩΤΑ ΑΠΟΘΗΚΕΥΣΤΕ ΤΙΣ ΡΥΘΜΙΣΕΙΣ ΣΑΣ ΣΤΟ LDAP.',
     'ldap_manager'              => 'Διαχειριστής LDAP',
     'ldap_server'               => 'LDAP Server',
-    'ldap_server_help'          => 'Αυτό θα πρέπει να ξεκινά με το ldap: // (για μη κρυπτογραφημένο ή TLS) ή ldaps: // (για SSL)',
+    'ldap_server_help'          => 'This should start with ldap:// (for unencrypted) or ldaps:// (for TLS or SSL)',
     'ldap_server_cert'			=> 'Πιστοποίηση πιστοποιητικού SSL για LDAP',
     'ldap_server_cert_ignore'	=> 'Να επιτρέπεται η μη έγκυρη πιστοποίηση SSL',
     'ldap_server_cert_help'		=> 'Επιλέξτε αυτό το πλαίσιο ελέγχου εάν χρησιμοποιείτε έναν αυτόματο έλεγχο SSL και θέλετε να αποδεχτείτε ένα μη έγκυρο πιστοποιητικό SSL.',
@@ -108,8 +111,8 @@ return [
     'ldap_pword'                => 'Κωδικός πρόσβασης δεσμού LDAP',
     'ldap_basedn'               => 'Δέσμευση βάσης DN',
     'ldap_filter'               => 'LDAP Φίλτρο',
-    'ldap_pw_sync'              => 'LDAP συγχρονισμός κωδικού πρόσβασης',
-    'ldap_pw_sync_help'         => 'Καταργήστε την επιλογή αυτού του πλαισίου αν δεν θέλετε να διατηρείτε τους κωδικούς LDAP συγχρονισμένους με τοπικούς κωδικούς πρόσβασης. Απενεργοποιώντας αυτό σημαίνει ότι οι χρήστες σας ενδέχεται να μην μπορούν να συνδεθούν αν ο διακομιστής LDAP δεν είναι προσβάσιμος για κάποιο λόγο.',
+    'ldap_pw_sync'              => 'Cache LDAP Passwords',
+    'ldap_pw_sync_help'         => 'Uncheck this box if you do not wish to keep LDAP passwords cached as local hashed passwords. Disabling this means that your users may not be able to login if your LDAP server is unreachable for some reason.',
     'ldap_username_field'       => 'Πεδίο ονόματος χρήστη',
     'ldap_lname_field'          => 'Επίθετο',
     'ldap_fname_field'          => 'Όνομα LDAP',
@@ -117,13 +120,15 @@ return [
     'ldap_version'              => 'Έκδοση LDAP',
     'ldap_active_flag'          => 'Ενεργή σημαία LDAP',
     'ldap_activated_flag_help'  => 'Αυτή η τιμή χρησιμοποιείται για να καθοριστεί αν ένας συγχρονισμένος χρήστης μπορεί να συνδεθεί στο Snipe-IT. <strong>Δεν επηρεάζει τη δυνατότητα ελέγχου αντικειμένων μέσα ή έξω σε αυτά</strong>, and should be the <strong>attribute name</strong> within your AD/LDAP, <strong>not the value</strong>. <br><br>Εάν αυτό το πεδίο έχει οριστεί σε ένα όνομα πεδίου που δεν υπάρχει στην AD/LDAP, ή η τιμή στο πεδίο AD/LDAP ορίζεται σε <code>0</code> ή <code>false</code>, <strong>η σύνδεση χρήστη θα απενεργοποιηθεί</strong>. Εάν η τιμή στο πεδίο AD/LDAP έχει οριστεί σε <code>1</code> ή <code>true</code> ή <em>οποιοδήποτε άλλο κείμενο</em> σημαίνει ότι ο χρήστης μπορεί να συνδεθεί. Όταν το πεδίο είναι κενό στη AD, σεβόμαστε το χαρακτηριστικό <code>userAccountControl</code> , το οποίο συνήθως επιτρέπει στους χρήστες να συνδεθούν.',
+    'ldap_invert_active_flag'   => 'LDAP Invert Active Flag',
+    'ldap_invert_active_flag_help'     => 'If enabled: when the value returned by LDAP Active Flag is <code>0</code> or <code>false</code> the user account will be active.',
     'ldap_emp_num'              => 'Αριθμός υπαλλήλου LDAP',
     'ldap_email'                => 'LDAP Email',
     'ldap_test'                 => 'Δοκιμή LDAP',
     'ldap_test_sync'            => 'Δοκιμή Συγχρονισμού Ldap',
     'license'                   => 'Άδειες λογισμικού',
-    'load_remote'               => 'Χρήση Gravatar',
-    'load_remote_help_text'		=> 'Απενεργοποιήστε αυτό το πλαίσιο αν η εγκατάστασή σας δεν μπορεί να φορτώσει δέσμες ενεργειών από το εξωτερικό internet. Αυτό θα αποτρέψει το Snipe-IT από το να προσπαθήσει να φορτώσει εικόνες από το Gravatar.',
+    'load_remote'               => 'Load Remote Avatars',
+    'load_remote_help_text'		=> 'Uncheck this box if your install cannot load scripts from the outside internet. This will prevent Snipe-IT from trying load avatars from Gravatar or other outside sources.',
     'login'                     => 'Προσπάθειες Σύνδεσης',
     'login_attempt'             => 'Προσπάθεια Σύνδεσης',
     'login_ip'                  => 'Διεύθυνση IP',
@@ -131,6 +136,7 @@ return [
     'login_user_agent'          => 'Πράκτορας Χρήστη',
     'login_help'                => 'Λίστα των επιχειρούμενων συνδέσεων',
     'login_note'                => 'Σύνδεση Σημείωση',
+    'login_note_placeholder'            => "If you do not have a login or have found a device belonging to this company, please call technical support at 888-555-1212. Thank you.",
     'login_note_help'           => 'Προαιρετικά συμπεριλάβετε μερικές προτάσεις στην οθόνη σύνδεσης, για παράδειγμα για να βοηθήσετε άτομα που έχουν βρει μια χαμένη ή κλεμμένη συσκευή. Αυτό το πεδίο δέχεται <a href="https://help.github.com/articles/github-flavored-markdown/">Github flavored markdown</a>',
     'login_remote_user_text'    => 'Επιλογές σύνδεσης απομακρυσμένου χρήστη',
     'login_remote_user_enabled_text' => 'Ενεργοποίηση απομακρησμένου χρήστη',
@@ -146,13 +152,16 @@ return [
     'logo_print_assets_help'    => 'Χρήση εμπορικών σημάτων σε λίστες εκτυπώσιμων στοιχείων ',
     'full_multiple_companies_support_help_text' => 'Περιορισμός των χρηστών (συμπεριλαμβανομένων των διαχειριστών) που εκχωρούνται σε εταιρείες στα περιουσιακά στοιχεία της εταιρείας τους.',
     'full_multiple_companies_support_text' => 'Πλήρης υποστήριξη πολλαπλών εταιρειών',
+    'scope_locations_fmcs_support_text'  => 'Scope Locations with Full Multiple Companies Support',
+    'scope_locations_fmcs_support_help_text'  => 'Restrict locations to their selected company.',
+    'scope_locations_fmcs_check_button' => 'Check Compatibility',
+    'scope_locations_fmcs_support_disabled_text'  => 'This option is disabled because you have conflicting locations set for :count or more items.',
     'show_in_model_list'   => 'Εμφάνιση στο μοντέλο Dropdowns',
     'optional'					=> 'προαιρετικός',
     'per_page'                  => 'Αποτελέσματα ανά σελίδα',
     'php'                       => 'Έκδοση PHP',
-    'php_info'                  => 'PHP Info',
+    'php_info'                  => 'PHP info',
     'php_overview'              => 'PHP',
-    'php_overview_keywords'     => 'phpinfo, σύστημα, πληροφορίες',
     'php_overview_help'         => 'Πληροφορίες συστήματος PHP',
     'php_gd_info'               => 'Πρέπει να εγκαταστήσετε το php-gd για να εμφανίσετε τους QR κώδικες, δείτε τις οδηγίες εγκατάστασης.',
     'php_gd_warning'            => 'Η επεξεργασία εικόνας PHP και το πρόσθετο GD ΔΕΝ έχουν εγκατασταθεί.',
@@ -218,6 +227,8 @@ return [
     'webhook_integration_help'    => ':app integration is optional, however the endpoint and channel are required if you wish to use it. To configure :app integration, you must first <a href=":webhook_link" target="_new" rel="noopener">create an incoming webhook</a> on your :app account. Click on the <strong>Test :app Integration</strong> button to confirm your settings are correct before saving. ',
     'webhook_integration_help_button'    => 'Μόλις αποθηκεύσετε τις πληροφορίες :app, θα εμφανιστεί ένα κουμπί δοκιμής.',
     'webhook_test_help'           => 'Ελέγξτε αν η :app ενσωμάτωση σας έχει ρυθμιστεί σωστά. ΠΡΕΠΕΙ ΝΑ ΑΠΟΘΗΚΕΥΣΕΤΕ ΝΑ ΑΝΑΦΕΡΕΤΑΙ :app ΡΥΘΜΙΣΕΙΣ ΠΡΩΤΩΝ.',
+    'shortcuts_enabled'         => 'Enable Shortcuts',
+    'shortcuts_help_text'       => '<strong>Windows</strong>: Alt + Access key, <strong>Mac</strong>: Control + Option + Access key',
     'snipe_version'  			=> 'Snipe-It έκδοση',
     'support_footer'            => 'Σύνδεσμοι Υποσέλιδου Υποστήριξης ',
     'support_footer_help'       => 'Καθορίστε ποιος βλέπει τους συνδέσμους με τις πληροφορίες υποστήριξης Snipe-IT και το εγχειρίδιο χρήσης',
@@ -227,7 +238,6 @@ return [
     'update'                    => 'Ενημέρωση ρυθμίσεων',
     'value'                     => 'Τιμή',
     'brand'                     => 'Μάρκα',
-    'brand_keywords'            => 'υποσέλιδο, λογότυπο, εκτύπωση, θέμα, δέρμα, κεφαλίδα, χρώματα, χρώμα, css',
     'brand_help'                => 'Λογότυπο, Όνομα Ιστοσελίδας',
     'web_brand'                 => 'Τύπος Μάρκετινγκ Web',
     'about_settings_title'      => 'Σχετικά με τις ρυθμίσεις',
@@ -276,6 +286,8 @@ return [
     'two_factor_enrollment_text'	=> "Απαιτείται έλεγχος ταυτότητας δύο παραγόντων, ωστόσο η συσκευή σας δεν έχει εγγραφεί ακόμα. Ανοίξτε την εφαρμογή Google Authenticator και σαρώστε τον παρακάτω κωδικό QR για να εγγραφείτε στη συσκευή σας. Μόλις εγγραφείτε στη συσκευή σας, πληκτρολογήστε τον παρακάτω κώδικα",
     'require_accept_signature'      => 'Απαιτείται υπογραφή',
     'require_accept_signature_help_text'      => 'Η ενεργοποίηση αυτής της λειτουργίας θα απαιτεί από τους χρήστες να αποδεχθούν φυσικά την αποδοχή ενός στοιχείου.',
+    'require_checkinout_notes'  => 'Require Notes on Checkin/Checkout',
+    'require_checkinout_notes_help_text'    => 'Enabling this feature will require the note fields to be populated when checking in or checking out an asset.',
     'left'        => 'αριστερά',
     'right'        => 'δεξιά',
     'top'        => 'κορυφή',
@@ -313,24 +325,24 @@ return [
     'filter_by_keyword' => 'Φιλτράρισμα κατά ρύθμιση λέξης-κλειδιού',
     'security' => 'Ασφάλεια',
     'security_title' => 'Ενημέρωση Ρυθμίσεων Ασφαλείας',
-    'security_keywords' => 'κωδικός πρόσβασης, κωδικοί πρόσβασης, απαιτήσεις, δύο παράγοντες, δύο παράγοντες, κοινοί κωδικοί πρόσβασης, απομακρυσμένη σύνδεση, αποσύνδεση, έλεγχος ταυτότητας',
     'security_help' => 'Δύο Παράγοντες, Περιορισμοί Κωδικού Πρόσβασης',
-    'groups_keywords' => 'άδειες, ομάδες δικαιωμάτων, εξουσιοδότηση',
     'groups_help' => 'Ομάδες δικαιωμάτων λογαριασμού',
     'localization' => 'Τοπικοποίηση',
     'localization_title' => 'Ενημέρωση Ρυθμίσεων Τοπικοποίησης',
-    'localization_keywords' => 'τοπικοποίηση, νόμισμα, τοπική, τοπική, ζώνη ώρας, ζώνη ώρας, διεθνές, διαγεννητικότητα, γλώσσα, γλώσσες, μετάφραση',
     'localization_help' => 'Γλώσσα, εμφάνιση ημερομηνίας',
     'notifications' => 'Ειδοποιήσεις',
     'notifications_help' => 'Ρυθμίσεις Ειδοποιήσεων & Ελέγχου Email',
     'asset_tags_help' => 'Αυξήσεις και προθέματα',
     'labels' => 'Ετικέτες',
     'labels_title' => 'Ενημέρωση Ρυθμίσεων Ετικετών',
-    'labels_help' => 'Label sizes &amp; settings',
-    'purge_keywords' => 'μόνιμη διαγραφή',
+    'labels_help' => 'Barcodes &amp; label settings',
     'purge_help' => 'Καθαρισμός αρχείων που έχουν διαγραφεί',
     'ldap_extension_warning' => 'Δεν φαίνεται ότι η επέκταση LDAP είναι εγκατεστημένη ή ενεργοποιημένη σε αυτόν τον διακομιστή. Μπορείτε ακόμα να αποθηκεύσετε τις ρυθμίσεις σας, αλλά θα πρέπει να ενεργοποιήσετε την επέκταση LDAP για PHP πριν το συγχρονισμό LDAP ή σύνδεση θα λειτουργήσει.',
     'ldap_ad' => 'LDAP/AD',
+    'ldap_test_label' => 'Test LDAP Sync',
+    'ldap_test_login' => ' Test LDAP Login',
+    'ldap_username_placeholder' => 'LDAP Username',
+    'ldap_password_placeholder' => 'LDAP Password',
     'employee_number' => 'Αριθμός Υπάλληλου',
     'create_admin_user' => 'Δημιουργία χρήστη ::',
     'create_admin_success' => 'Επιτυχία! Ο διαχειριστής σας έχει προστεθεί!',
@@ -342,6 +354,8 @@ return [
     'setup_migration_create_user' => 'Επόμενο: Δημιουργία Χρήστη',
     'ldap_settings_link' => 'Σελίδα Ρυθμίσεων Ldap',
     'slack_test' => 'Δοκιμή <i class="fab fa-slack"></i> Ενσωμάτωση',
+    'status_label_name' => 'Status Label Name',
+    'super_admin_only'  => 'Super Admin Only',
     'label2_enable'           => 'Νέα Μηχανή Ετικέτας',
     'label2_enable_help'      => 'Μετάβαση στη νέα μηχανή ετικετών. <b>Σημείωση: Θα χρειαστεί να αποθηκεύσετε αυτήν τη ρύθμιση πριν ρυθμίσετε άλλες.</b>',
     'label2_template'         => 'Πρότυπο',
@@ -356,12 +370,15 @@ return [
     'label2_2d_type'          => '2D Barcode Type',
     'label2_2d_type_help'     => 'Μορφή για barcodes 2D',
     'label2_2d_target'        => 'Στόχος 2D Barcode',
-    'label2_2d_target_help'   => 'Το URL των σημείων 2D γραμμωτού κώδικα όταν σαρωθεί',
+    'label2_2d_target_help'   => 'The data that will be contained in the 2D barcode',
     'label2_fields'           => 'Ορισμοί Πεδίων',
     'label2_fields_help'      => 'Τα πεδία μπορούν να προστεθούν, να αφαιρεθούν και να παραγγελθούν στην αριστερή στήλη. Για κάθε πεδίο, μπορούν να προστεθούν, να αφαιρεθούν πολλαπλές επιλογές για την Ετικέτα και την Πηγή Δεδομένων και να παραγγελθούν στη δεξιά στήλη.',
+    'purge_barcodes' => 'Purge Barcodes',
     'help_asterisk_bold'    => 'Το κείμενο που έχει εισαχθεί ως <code>**text**</code> θα εμφανιστεί ως έντονο',
     'help_blank_to_use'     => 'Αφήστε κενό για να χρησιμοποιήσετε την τιμή από <code>:setting_name</code>',
     'help_default_will_use' => '<code>:default</code> will use the value from <code>:setting_name</code>. <br>Note that the value of the barcodes must comply with the respective barcode spec in order to be successfully generated. Please see <a href="https://snipe-it.readme.io/docs/barcodes">the documentation <i class="fa fa-external-link"></i></a> for more details. ',
+    'asset_id'              => 'Asset ID',
+    'data'               => 'Data',
     'default'               => 'Προεπιλογή',
     'none'                  => 'Κανένα',
     'google_callback_help' => 'Αυτό θα πρέπει να εισαχθεί ως το URL επιστροφής κλήσης στις ρυθμίσεις της εφαρμογής Google OAuth στον οργανισμό σας&apos;s <strong><a href="https://console.cloud.google.com/" target="_blank">κονσόλα προγραμματιστών Google <i class="fa fa-external-link" aria-hidden="true"></i></a></strong>.',
@@ -373,7 +390,100 @@ return [
     'database_driver' => 'Οδηγός Βάσης Δεδομένων',
     'bs_table_storage' => 'Αποθηκευτικός Χώρος',
     'timezone' => 'Timezone',
+    'test_mail' => 'Test Mail',
     'profile_edit'          => 'Edit Profile',
     'profile_edit_help'          => 'Allow users to edit their own profiles.',
+    'default_avatar' => 'Custom Default Avatar',
+    'default_avatar_help' => 'This image will be displayed as a profile if a user does not have a profile photo.',
+    'restore_default_avatar' => 'Restore <a href=":default_avatar" data-toggle="lightbox" data-type="image">original system default avatar</a>',
+    'restore_default_avatar_help' => '',
+    'due_checkin_days' => 'Due For Checkin Warning',
+    'due_checkin_days_help' => 'How many days before the expected checkin of an asset should it be listed in the "Due for checkin" page?',
+    'no_groups' => 'No groups have been created yet. Visit <code>Admin Settings > Permission Groups</code> to add one.',
+    'text' => 'Text',
+
+    'username_formats' => [
+        'username_format'		=> 'Τύπος ονόματος',
+        'firstname_lastname_format'	=> 'Όνομα Επώνυμο (jane.smith)',
+        'first_name_format'	        => 'First Name (jane)',
+        'last_name_format'		=> 'Last Name (doe)',
+        'filastname_format'			=> 'First Initial Last Name (jsmith)',
+        'lastnamefirstinitial_format' =>  'Last Name First Initial (smithj)',
+        'firstname_lastname_underscore_format' => 'First Name Last Name (jane_smith)',
+        'firstinitial.lastname' => 'First Initial Last Name (j.smith)',
+        'lastname_firstinitial' => 'Last Name First Initial (smith_j)',
+        'lastname_dot_firstinitial_format' => 'Last Name First Initial (smith.j)',
+        'firstnamelastname'     => 'First Name Last Name (janesmith)',
+        'firstnamelastinitial'  => 'First Name Last Initial (janes)',
+        'lastnamefirstname'      => 'Last Name.First Name (smith.jane)',
+    ],
+
+    'email_formats' => [
+        'email_format'			=> 'Μορφή ηλεκτρονικού ταχυδρομείου',
+        'firstname_lastname_format'	=> 'Όνομα Επώνυμο (jane.smith@example.com)',
+        'first_name_format'		=> 'Όνομα (jane@example.com)',
+        'last_name_format'		=> 'Last Name (doe@example.com)',
+        'filastname_format'			=> 'Πρώτο αρχικό όνομα (jsmith@example.com)',
+        'lastnamefirstinitial_format' =>  'Επίθετο και πρώτο γράμμα ονόματος (smithj@example.com)',
+        'firstname_lastname_underscore_format' => 'Όνομα και επίθετο (jane_smith@example.com)',
+        'firstinitial.lastname' => 'Πρώτο Αρχικό Όνομα (j.smith@example.com)',
+        'lastname_firstinitial' => 'Πρώτο Όνομα Αρχικό (smith_j@example.com)',
+        'lastname_dot_firstinitial_format' => 'Last Name First Initial (smith.j@example.com)',
+        'firstnamelastname'     => 'Επώνυμο Ονόματος (janesmith@example.com)',
+        'firstnamelastinitial'  => 'Επίθετο Όνομα (janes@example.com)',
+        'lastnamefirstname'      => 'Last Name.First Name (smith.jane@example.com)',
+    ],
+
+
+
+    'logo_labels' => [
+        'acceptance_pdf_logo'       => 'PDF Logo',
+        'email_logo'                => 'Λογότυπο Email',
+        'label_logo'                => 'Λογότυπο Ετικέτας',
+        'logo'                      => 'Site Logo',
+        'favicon'                   => 'Αγαπημένο',
+    ],
+
+    'logo_help' => [
+        'email_logo_size'       => 'Πλατεία λογότυπα στο email φαίνονται καλύτερα. ',
+    ],
+
+    'logo_option_types' => [
+        'text' => 'Text',
+        'logo' => 'Λογότυπο',
+        'logo_and_text' => 'Logo and Text',
+    ],
+
+
+    'legends' => [
+        'scoping' => 'Scoping',
+        'formats' => 'Default Formats',
+        'profiles' => 'User Profiles',
+        'eula' => 'EULA & Acceptance Preferences',
+        'misc_display' => 'Miscellaneous Display Options',
+        'email' => 'Email Preferences',
+        'checkin' => 'Checkin Preferences',
+        'dashboard' => 'Login & Dashboard Preferences',
+        'misc' => 'Miscellaneous',
+        'logos' => 'Logos & Display',
+        'colors' => 'Colors & Skins',
+        'footer' => 'Footer Preferences',
+        'security' => 'Security Preferences',
+        'general' => 'General',
+        'intervals' => 'Intervals & Thresholds',
+    ],
+
+
+    /* Keywords for settings overview help */
+    'keywords' => [
+        'brand'             => 'υποσέλιδο, λογότυπο, εκτύπωση, θέμα, δέρμα, κεφαλίδα, χρώματα, χρώμα, css',
+        'general_settings'  => 'υποστήριξη της εταιρείας, υπογραφή, αποδοχή, μορφή ηλεκτρονικού ταχυδρομείου, μορφή ονόματος χρήστη, εικόνες, ανά σελίδα, μικρογραφία, eula, gravatar, tos, ταμπλό, ιδιωτικότητα',
+        'groups'            => 'άδειες, ομάδες δικαιωμάτων, εξουσιοδότηση',
+        'labels'            => 'labels, barcodes, barcode, sheets, print, upc, qr, 1d, 2d',
+        'localization'      => 'τοπικοποίηση, νόμισμα, τοπική, τοπική, ζώνη ώρας, ζώνη ώρας, διεθνές, διαγεννητικότητα, γλώσσα, γλώσσες, μετάφραση',
+        'php_overview'      => 'phpinfo, σύστημα, πληροφορίες',
+        'purge'             => 'μόνιμη διαγραφή',
+        'security'          => 'κωδικός πρόσβασης, κωδικοί πρόσβασης, απαιτήσεις, δύο παράγοντες, δύο παράγοντες, κοινοί κωδικοί πρόσβασης, απομακρυσμένη σύνδεση, αποσύνδεση, έλεγχος ταυτότητας',
+    ],
 
 ];
diff --git a/resources/lang/el-GR/admin/settings/message.php b/resources/lang/el-GR/admin/settings/message.php
index 02f611d35b..07f5ed5103 100644
--- a/resources/lang/el-GR/admin/settings/message.php
+++ b/resources/lang/el-GR/admin/settings/message.php
@@ -14,6 +14,9 @@ return [
         'restore_warning'       => 'Ναι, να το αποκαταστήσω, αναγνωρίζω ότι αυτό θα αντικαταστήσει όλα τα υπάρχοντα δεδομένα που υπάρχουν αυτή τη στιγμή στη βάση δεδομένων. Αυτό θα αποσυνδεθεί επίσης από όλους τους υπάρχοντες χρήστες (συμπεριλαμβανομένων και εσείς).',
         'restore_confirm'       => 'Είστε βέβαιοι ότι θέλετε να επαναφέρετε τη βάση δεδομένων σας από :filename?'
     ],
+    'restore' => [
+        'success'               => 'Your system backup has been restored. Please log in again.'
+    ],
     'purge' => [
         'error'     => 'Παρουσιάστηκε ένα σφάλμα κατά την εκκαθάριση. ',
         'validation_failed'     => 'Η επιβεβαίωση καθαρισμού είναι εσφαλμένη. Παρακαλούμε πληκτρολογήστε τη λέξη «Διαγραφή» στο πλαίσιο επιβεβαίωσης.',
@@ -33,6 +36,9 @@ return [
         'testing_authentication' => 'Δοκιμή Πιστοποίησης Ldap...',
         'authentication_success' => 'Ο χρήστης πιστοποιήθηκε με επιτυχία στο LDAP!'
     ],
+    'labels' => [
+        'null_template' => 'Label template not found. Please select a template.',
+        ],
     'webhook' => [
         'sending' => 'Αποστολή δοκιμαστικού μηνύματος :app...',
         'success' => 'Το :webhook_name σας λειτουργεί!',
@@ -42,5 +48,12 @@ return [
         'error' => 'Κάτι πήγε στραβά. :app απάντησε με: :error_message',
         'error_redirect' => 'ΣΦΑΛΜΑ: 301/302:endpoint επιστρέφει μια ανακατεύθυνση. Για λόγους ασφαλείας, δεν ακολουθούμε ανακατευθύνσεις. Παρακαλούμε χρησιμοποιήστε το πραγματικό τελικό σημείο.',
         'error_misc' => 'Κάτι πήγε στραβά. :( ',
-    ]
+        'webhook_fail' => ' webhook notification failed: Check to make sure the URL is still valid.',
+        'webhook_channel_not_found' => ' webhook channel not found.',
+        'ms_teams_deprecation' => 'The selected Microsoft Teams webhook URL will be deprecated Dec 31st, 2025. Please use a workflow URL. Microsoft\'s documentation on creating a workflow can be found <a href="https://support.microsoft.com/en-us/office/create-incoming-webhooks-with-workflows-for-microsoft-teams-8ae491c7-0394-4861-ba59-055e33f75498" target="_blank"> here.</a>',
+    ],
+    'location_scoping' => [
+        'not_saved' => 'Your settings were not saved.',
+        'mismatch' => 'There is 1 item in the database that need your attention before you can enable location scoping.|There are :count items in the database that need your attention before you can enable location scoping.',
+    ],
 ];
diff --git a/resources/lang/el-GR/admin/statuslabels/table.php b/resources/lang/el-GR/admin/statuslabels/table.php
index 30d4e0e3ca..7fad3a7aa6 100644
--- a/resources/lang/el-GR/admin/statuslabels/table.php
+++ b/resources/lang/el-GR/admin/statuslabels/table.php
@@ -1,14 +1,14 @@
 <?php
 
 return array(
-    'about'      	=> 'Σχετικά με το καθεστώς ετικετών',
+    'about'      	=> 'About Status Types',
     'archived'      	=> 'Αρχειοθετημένα',
     'create'      	=> 'Δημιουργία ετικέτας κατάστασης',
     'color'      	=> 'Χρώμα Γραφήματος',
     'default_label' => 'Προεπιλεγμένη Ετικέτα',
     'default_label_help' => 'Αυτό χρησιμοποιείται για να εξασφαλίσει ότι οι ετικέτες κατάστασης που χρησιμοποιούνται πιο συχνά εμφανίζονται στην κορυφή του πλαισίου επιλογής κατά τη δημιουργία/επεξεργασία των περιουσιακών στοιχείων.',
     'deployable'      	=> 'Προς ανάπτυξη',
-    'info'      	=> 'Οι ετικέτες κατάστασης χρησιμοποιούνται για να περιγράψουν τις διάφορες καταστάσεις στις οποίες θα μπορούσαν να βρίσκονται τα περιουσιακά στοιχεία σας. Μπορεί να είναι έξω για επισκευή, απώλεια / κλοπή κ.λπ. Μπορείτε να δημιουργήσετε νέες ετικέτες κατάστασης για αναπτυσσόμενα, εκκρεμή και αρχειοθετημένα στοιχεία ενεργητικού.',
+    'info'      	=> 'Status label types are used to describe the various states your assets could be in. They may be out for repair, lost/stolen, etc. You can create new status labels for your deployable, pending and archived assets according to your own workflow. For more information, <a href="https://snipe-it.readme.io/docs/overview#status-labels" target="_blank">see the documentation <i class="fa fa-external-link"></i></a>.',
     'name'      	=> 'Όνομα κατάστασης',
     'pending'      	=> 'Εκκρεμεί',
     'status_type'   => 'Τύπος κατάστασης',
diff --git a/resources/lang/el-GR/admin/users/general.php b/resources/lang/el-GR/admin/users/general.php
index eabb449380..fe9bae6ad6 100644
--- a/resources/lang/el-GR/admin/users/general.php
+++ b/resources/lang/el-GR/admin/users/general.php
@@ -19,6 +19,8 @@ return [
     'print_assigned'    => 'Εκτύπωση Όλων Των Ανατεθέντων',
     'email_assigned'    => 'Λίστα Email όλων των ανατεθέντων',
     'user_notified'     => 'Ο χρήστης έχει αποσταλεί μέσω ηλεκτρονικού ταχυδρομείου σε μια λίστα των αντιστοιχισμένων αντικειμένων του.',
+    'users_notified'    => 'The user has been emailed a list of their currently assigned items.|:count users have been emailed a list of their currently assigned items.',
+    'users_notified_warning' => ':count user has been emailed a list of their currently assigned items, however :no_email users did not have an email address so could not be emailed.|:count users have been emailed a list of their currently assigned items, however :no_email user(s) did not have an email address so could not be emailed.',
     'auto_assign_label' => 'Συμπερίληψη αυτού του χρήστη κατά την αυτόματη εκχώρηση κατάλληλων αδειών',
     'auto_assign_help'  => 'Παράλειψη αυτού του χρήστη στην αυτόματη ανάθεση αδειών',
     'software_user'     => 'Λογισμικό Έγινε έλεγχος σε: όνομα',
diff --git a/resources/lang/el-GR/admin/users/message.php b/resources/lang/el-GR/admin/users/message.php
index dee0a51b4f..cc07d73fc6 100644
--- a/resources/lang/el-GR/admin/users/message.php
+++ b/resources/lang/el-GR/admin/users/message.php
@@ -6,7 +6,7 @@ return array(
     'declined'                  => 'Έχετε απορρίψει επιτυχώς αυτό το στοιχείο.',
     'bulk_manager_warn'	        => 'Οι χρήστες σας ενημερώθηκαν με επιτυχία, ωστόσο η καταχώριση του διαχειριστή σας δεν αποθηκεύτηκε, επειδή ο διαχειριστής που επιλέξατε ήταν επίσης στη λίστα χρηστών για επεξεργασία και οι χρήστες ενδέχεται να μην είναι ο δικός τους διαχειριστής. Επιλέξτε ξανά τους χρήστες σας, εξαιρουμένου του διαχειριστή.',
     'user_exists'               => 'Ο χρήστης υπάρχει ήδη!',
-    'user_not_found'            => 'Ο χρήστης δεν υπάρχει.',
+    'user_not_found'            => 'User does not exist or you do not have permission view them.',
     'user_login_required'       => 'Το πεδίο εισόδου είναι υποχρεωτικό',
     'user_has_no_assets_assigned' => 'Δεν έχουν εκχωρηθεί στοιχεία ενεργητικού στο χρήστη.',
     'user_password_required'    => 'Ο κωδικός είναι απαραίτητος.',
@@ -53,6 +53,7 @@ return array(
         'ldap_could_not_search' => 'Δεν ήταν δυνατή η αναζήτηση στον διακομιστή LDAP. Ελέγξτε τη διαμόρφωση του διακομιστή LDAP στο αρχείο ρύθμισης LDAP. <br>Ερώτηση από διακομιστή LDAP:',
         'ldap_could_not_get_entries' => 'Δεν ήταν δυνατή η λήψη καταχωρήσεων από το διακομιστή LDAP. Ελέγξτε τη διαμόρφωση του διακομιστή LDAP στο αρχείο ρύθμισης LDAP. <br>Ερώτηση από διακομιστή LDAP:',
         'password_ldap' => 'Ο κωδικός πρόσβασης για αυτόν τον λογαριασμό γίνεται από το LDAP / Active Directory. Επικοινωνήστε με το τμήμα πληροφορικής σας για να αλλάξετε τον κωδικό πρόσβασής σας.',
+        'multi_company_items_assigned' => 'This user has items assigned that belong to a different company. Please check them in or edit their company.'
     ),
 
     'deletefile' => array(
diff --git a/resources/lang/el-GR/admin/users/table.php b/resources/lang/el-GR/admin/users/table.php
index 74be70a125..9a247c720b 100644
--- a/resources/lang/el-GR/admin/users/table.php
+++ b/resources/lang/el-GR/admin/users/table.php
@@ -22,7 +22,7 @@ return array(
     'managed_locations'     => 'Διαχειριζόμενες τοποθεσίες',
     'managed_users'         => 'Διαχειριζόμενοι Χρήστες',
     'name' 					=> 'Όνομα',
-    'nogroup'               => 'Καμία ομάδα δεν έχει δημιουργηθεί ακόμα. Για να προσθέσετε μία, επισκεφθείτε: ',
+    'nogroup'               => 'Καμία ομάδα δεν έχει δημιουργηθεί ακόμα. Για να προσθέσετε μία, επισκεφθείτε:',
     'notes'                 => 'Σημειώσεις',
     'password_confirm' 		=> 'Επιβεβαίωση Κωδικού Πρόσβασης',
     'password' 				=> 'Κωδικός Πρόσβασης',
diff --git a/resources/lang/el-GR/auth.php b/resources/lang/el-GR/auth.php
index 65d9abf636..4cf01bbed0 100644
--- a/resources/lang/el-GR/auth.php
+++ b/resources/lang/el-GR/auth.php
@@ -15,6 +15,6 @@ return array(
 
     'failed' => 'Αυτά τα διαπιστευτήρια δεν ταιριάζουν με τα αρχεία μας.',
     'password' => 'Ο παρεχόμενος κωδικός πρόσβασης είναι εσφαλμένος.',
-    'throttle' => 'Πάρα πολλές προσπάθειες σύνδεσης. Παρακαλώ δοκιμάστε ξανά σε :seconds δευτερόλεπτα.',
+    'throttle' => 'Too many login attempts. Please try again in :minutes minute(s).',
 
 );
diff --git a/resources/lang/el-GR/auth/message.php b/resources/lang/el-GR/auth/message.php
index a7ecbe88c7..f92d4e1a7d 100644
--- a/resources/lang/el-GR/auth/message.php
+++ b/resources/lang/el-GR/auth/message.php
@@ -6,8 +6,6 @@ return array(
     'account_not_found'      => 'Το όνομα χρήστη ή ο κωδικός πρόσβασης είναι εσφαλμένα.',
     'account_not_activated'  => 'Αυτός ο λογαριασμός χρήστη δεν είναι ενεργοποιημένος.',
     'account_suspended'      => 'Αυτός ο λογαριασμός χρήστη έχει ανασταλεί.',
-    'account_banned'         => 'Αυτός ο λογαριασμός χρήστη έχει απαγορευτεί.',
-    'throttle'               => 'Πάρα πολλές αποτυχημένες προσπάθειες σύνδεσης. Παρακαλώ δοκιμάστε ξανά σε :minutes λεπτά.',
 
     'two_factor' => array(
         'already_enrolled'      => 'Η συσκευή σας έχει ήδη εγγραφεί.',
diff --git a/resources/lang/el-GR/button.php b/resources/lang/el-GR/button.php
index ba53e0ceb9..4aafe4b4c8 100644
--- a/resources/lang/el-GR/button.php
+++ b/resources/lang/el-GR/button.php
@@ -7,6 +7,7 @@ return [
     'checkin_and_delete'  	    => 'Checkin Όλων / Διαγραφή Χρήστη',
     'delete'  	                => 'Διαγραφή',
     'edit'    	                => 'Επεξεργασία',
+    'clone'    	                => 'Clone',
     'restore' 	                => 'Επαναφορά',
     'remove'                    => 'Αφαίρεση',
     'request'                   => 'Αίτημα',
@@ -21,4 +22,13 @@ return [
     'add_maintenance'           => 'Προσθήκη Συντήρησης',
     'append'                    => 'Προσάρτηση',
     'new'                       => 'Νεό',
+    'var' => [
+        'clone'     => 'Clone :item_type',
+        'edit'      => 'Edit :item_type',
+        'delete'    => 'Delete :item_type',
+        'restore'   => 'Restore :item_type',
+        'create'    => 'Create New :item_type',
+        'checkout'  => 'Checkout :item_type',
+        'checkin'   => 'Checkin :item_type',
+    ]
 ];
diff --git a/resources/lang/el-GR/general.php b/resources/lang/el-GR/general.php
index fc1b5bf154..3a2a410625 100644
--- a/resources/lang/el-GR/general.php
+++ b/resources/lang/el-GR/general.php
@@ -10,7 +10,7 @@ return [
     'action'                => 'Ενέργεια',
     'activity_report'		=> 'Έκθεση Δραστηριότητας',
     'address'				=> 'Διεύθυνση',
-    'admin'					=> 'Διαχειριστής',
+    'admin'					=> 'Ρυθμίσεις Διαχειριστή',
     'admin_tooltip'			=> 'This user has admin privileges',
     'superuser'				=> 'Superuser',
     'superuser_tooltip'		=> 'This user has superuser privileges',
@@ -23,13 +23,16 @@ return [
     'asset_models'			=> 'Μοντέλα Παγίων',
     'asset_model'			=> 'Μοντέλο',
     'asset'					=> 'Πάγιο',
+    'asset_previous'        => 'Asset (Previously Assigned)',
     'asset_report'          => 'Αναφορά παγίων',
     'asset_tag'				=> 'Ετικέτα παγίων',
     'asset_tags'            => 'Ετικέτες Παγίου',
     'assets_available'		=> 'Διαθέσιμα στοιχεία',
     'accept_assets'         => 'Αποδοχή Αντικειμένων :name',
     'accept_assets_menu'    => 'Αποδοχή Αντικειμένων',
+    'accept_item'           => 'Accept Item',
     'audit'				    => 'Ελεγχος',
+    'audits'				=> 'Audits',
     'audit_report'			=> 'Αρχείο ελέγχου',
     'assets'				=> 'Πάγια',
     'assets_audited'        => 'στοιχεία ενεργητικού ελεγμένα',
@@ -61,9 +64,12 @@ return [
     'changepassword'  		=> 'Αλλαγή κωδικού',
     'checkin'  				=> 'Μεταβίβαση ελέγχου',
     'checkin_from'  		=> 'Μεταβίβαση ελέγχου από',
+    'checkin_note'  		=> 'Checkin Note',
+    'checkout_note'  		=> 'Checkout Note',
     'checkout'  			=> 'Ολοκλήρωση αγοράς',
     'checkouts_count'       => 'Έλεγχοι',
     'checkins_count'        => 'Checkins',
+    'checkin_and_delete'  	=> 'Checkin and Delete',
     'user_requests_count'   => 'Αιτήματα',
     'city'  				=> 'Πόλη',
     'click_here'			=> 'Κάντε κλικ ΕΔΩ',
@@ -77,7 +83,7 @@ return [
     'consumables'			=> 'Αναλώσιμα',
     'country'  				=> 'Χώρα',
     'could_not_restore'     => 'Σφάλμα επαναφοράς :item_type: :error',
-    'not_deleted'           => 'Το :item_type δεν διαγράφεται έτσι ώστε να μην μπορεί να αποκατασταθεί',
+    'not_deleted'           => 'The :item_type was not deleted and therefore cannot be restored',
     'create'				=> 'Δημιουργία νέου',
     'created'               => 'Το αντικείμενο δημιουργήθηκε',
     'created_asset'			=> 'δημιουργία παγίου',
@@ -86,11 +92,13 @@ return [
     'record_created' 		=> 'Η Εγγραφή Δημιουργήθηκε',
     'updated_at' 			=> 'Ενημερώθηκε στο',
     'currency'  			=> '$', // this is deprecated
+    'currency_text'  		=> 'Νόμισμα', //
     'current'  				=> 'Τρέχουσα',
     'current_password'      => 'Τρέχων Κωδικός Πρόσβασης',
     'customize_report'      => 'Προσαρμογή Αναφοράς',
     'custom_report'         => 'Αναφορά προσαρμοσμένων στοιχείων ενεργητικού',
     'dashboard'				=> 'Πίνακας ελέγχου',
+    'data_source'           => 'Data Source',
     'days'      			=> 'ημέρες',
     'days_to_next_audit'    => 'Ημέρες έως επόμενο έλεγχο',
     'date'					=> 'Ημερομηνία',
@@ -98,7 +106,7 @@ return [
     'debug_warning_text'    => 'Αυτή η εφαρμογή εκτελείται σε λειτουργία παραγωγής με ενεργοποιημένο τον εντοπισμό σφαλμάτων. Αυτό μπορεί να εκθέσει τα ευαίσθητα δεδομένα, εάν η εφαρμογή σας είναι προσβάσιμη στον έξω κόσμο. Απενεργοποιήσετε την κατάσταση λειτουργίας εντοπισμού σφαλμάτων, ορίζοντας την τιμή <code>APP_DEBUG</code> στο αρχείο <code>.env</code> για να <code>false</code>.',
     'delete'  				=> 'Διαγραφή',
     'delete_confirm'  		=> 'Επιθυμείτε την διαφραφή :item;',
-    'delete_confirm_no_undo' => 'Είστε βέβαιοι ότι θέλετε να διαγράψετε :αντικείμενο? Αυτό δεν μπορεί να αναιρεθεί.',
+    'delete_confirm_no_undo' => 'Are you sure, you wish to delete :item? This cannot be undone.',
     'deleted'  				=> 'Διαγράφηκε',
     'delete_seats'  		=> 'Διαγραμμένα καθίσματα',
     'deletion_failed'       => 'Αποτυχία διαγραφής',
@@ -114,29 +122,13 @@ return [
     'editprofile'  			=> 'Επεξεργασία Προφίλ',
     'eol'					=> 'EOL',
     'email_domain'			=> 'Email Domain',
-    'email_format'			=> 'Μορφή ηλεκτρονικού ταχυδρομείου',
     'employee_number'       => 'Αριθμός Υπάλληλου',
     'email_domain_help'		=> 'Αυτό χρησιμοποιείται για τη δημιουργία διευθύνσεων ηλεκτρονικού ταχυδρομείου κατά την εισαγωγή',
     'error'				    => 'Σφάλμα',
     'exclude_archived'      => 'Εξαίρεση Αρχειοθετημένων Αντικειμένων',
     'exclude_deleted'       => 'Εξαίρεση Διαγραμμένων Περιουσιακών Στοιχείων',
     'example'				=> 'Παράδειγμα: ',
-    'filastname_format'			=> 'Πρώτο αρχικό όνομα (jsmith@example.com)',
-    'firstname_lastname_format'	=> 'Όνομα Επώνυμο (jane.smith@example.com)',
-    'firstname_lastname_underscore_format' => 'Όνομα και επίθετο (jane_smith@example.com)',
-    'lastnamefirstinitial_format' =>  'Επίθετο και πρώτο γράμμα ονόματος (smithj@example.com)',
-    'firstintial_dot_lastname_format' => 'Πρώτο Αρχικό Όνομα (j.smith@example.com)',
-    'firstname_lastname_display'	=> 'Όνομα Επώνυμο (Jane Smith)',
-    'lastname_firstname_display'	=> 'Επώνυμο Όνομα (Smith Jane)',
-    'name_display_format'	=> 'Μορφή Εμφάνισης Ονόματος',
-    'first'					=> 'Πρώτο',
-    'firstnamelastname'     => 'Επώνυμο Ονόματος (janesmith@example.com)',
-    'lastname_firstinitial' => 'Πρώτο Όνομα Αρχικό (smith_j@example.com)',
-    'firstinitial.lastname' => 'Πρώτο Αρχικό Όνομα (j.smith@example.com)',
-    'firstnamelastinitial'  => 'Επίθετο Όνομα (janes@example.com)',
-    'lastnamefirstname'      => 'Last Name First Name (smith.jane@example.com)',
-    'first_name'			=> 'Όνομα',
-    'first_name_format'		=> 'Όνομα (jane@example.com)',
+
     'files'                 => 'Αρχεία',
     'file_name'				=> 'Αρχείο',
     'file_type'             => 'Τύπος Αρχείου',
@@ -156,9 +148,9 @@ return [
     'image_delete'         	=> 'Διαγραφή εικόνας',
     'include_deleted'       => 'Συμπερίληψη Διαγραμμένων Αντικειμένων',
     'image_upload'         	=> 'Μεταφόρτωση εικόνας',
-    'filetypes_accepted_help'    => 'Ο τύπος αρχείου είναι :types. Το μέγιστο επιτρεπόμενο μέγεθος μεταφορτώσεων είναι :size."Οι αποδεκτοί τύποι αρχείων είναι :types. Το μέγιστο επιτρεπόμενο μέγεθος αποστολής είναι :size.',
-    'filetypes_size_help'   => 'Το μέγιστο επιτρεπόμενο μέγεθος ανεβάσματος είναι :size.',
-    'image_filetypes_help'  => 'Accepted filetypes are jpg, webp, png, gif, svg, and avif. Max upload size allowed is :size.',
+    'filetypes_accepted_help'    => 'Accepted filetype is :types. The maximum size allowed is :size.|Accepted filetypes are :types. The maximum upload size allowed is :size.',
+    'filetypes_size_help'   => 'The maximum upload size allowed is :size.',
+    'image_filetypes_help'  => 'Accepted Filetypes are jpg, webp, png, gif, svg, and avif. The maximum upload size allowed is :size.',
     'unaccepted_image_type'  => 'Αυτό το αρχείο εικόνας δεν ήταν αναγνώσιμο. Οι αποδεκτοί τύποι αρχείων είναι jpg, webp, png, gif, και svg. Ο τύπος mime αυτού του αρχείου είναι: :mimetype.',
     'import'         	    => 'Εισαγωγή',
     'import_this_file'      => 'Χάρτης πεδίων και επεξεργασία αυτού του αρχείου',
@@ -178,12 +170,17 @@ return [
     'last'					=> 'Τελευταίο',
     'last_login'            => 'Τελευταία είσοδος',
     'last_name'             => 'Επίθετο',
+    'firstname_lastname_display'	=> 'Όνομα Επώνυμο (Jane Smith)',
+    'lastname_firstname_display'	=> 'Επώνυμο Όνομα (Smith Jane)',
+    'name_display_format'	=> 'Μορφή Εμφάνισης Ονόματος',
+    'first'					=> 'Πρώτο',
+    'first_name'			=> 'Όνομα',
     'license'				=> 'Άδεια Χρήσεως',
     'license_report'        => 'Αναφορά άδειας',
     'licenses_available'	=> 'Διαθέσιμες άδειες',
     'licenses'				=> 'Άδειες',
     'list_all'				=> 'Λίστα όλων',
-    'loading'				=> 'Φόρτωση... παρακαλώ περιμένετε...',
+    'loading'				=> 'Loading... please wait...',
     'lock_passwords'        => 'Αυτή η τιμή πεδίου δεν θα αποθηκευτεί σε μια εγκατάσταση επίδειξης.',
     'feature_disabled'      => 'Αυτή η λειτουργία έχει απενεργοποιηθεί για την εγκατάσταση επίδειξης.',
     'location'              => 'Τοποθεσία',
@@ -193,7 +190,7 @@ return [
     'logout'				=> 'Αποσύνδεση',
     'lookup_by_tag'     => 'Αναζήτηση με ετικέτα περιουσιακών στοιχείων',
     'maintenances'          => 'Συντήρηση',
-    'manage_api_keys'       => 'Διαχείριση Κλειδιών Api',
+    'manage_api_keys'       => 'Manage API keys',
     'manufacturer'			=> 'Κατασκευαστής',
     'manufacturers'			=> 'Κατασκευαστές',
     'markdown'				=> 'Αυτό το πεδίο επιτρέπει <a href="https://help.github.com/articles/github-flavored-markdown/">Github flavored markdown</a>.',
@@ -215,6 +212,14 @@ return [
     'no_results'			=> 'Δεν βρέθηκαν αποτελέσματα.',
     'no'  					=> '\'Οχι',
     'notes'  				=> 'Σημειώσεις',
+    'note_added'            => 'Note Added',
+    'options'				=> 'Options',
+    'preview'				=> 'Preview',
+    'add_note'              => 'Add Note',
+    'note_edited'            => 'Note Edited',
+    'edit_note'              => 'Edit Note',
+    'note_deleted'            => 'Note Deleted',
+    'delete_note'              => 'Delete Note',
     'order_number'          => 'Αριθμός παραγγελίας',
     'only_deleted'          => 'Μόνο Διαγραμμένα Περιουσιακά Στοιχεία',
     'page_menu'				=> 'Εμφάνιση _MENU_ αντικειμένων',
@@ -229,7 +234,7 @@ return [
     'purchase_date'         => 'Ημερομηνία αγοράς',
     'qty'		            => 'Τεμάχια',
     'quantity'		        => 'Ποσότητα',
-    'quantity_minimum'      => 'Έχετε :count στοιχεία κάτω ή σχεδόν κάτω από τα ελάχιστα επίπεδα ποσότητας',
+    'quantity_minimum'      => 'You have one item below or almost below minimum quantity levels|You have :count items below or almost below minimum quantity levels',
     'quickscan_checkin'  	=> 'Γρήγορη Σάρωση Checkin',
     'quickscan_checkin_status'  	=> 'Checkin Status',
     'ready_to_deploy'		=> 'Είστε έτοιμοι να αναπτύξετε',
@@ -254,7 +259,7 @@ return [
     'select_all'            => 'Επιλογή Όλων',
     'search'				=> 'Αναζήτηση',
     'select_category'       => 'Επιλέξτε μια κατηγορία',
-    'select_datasource' => 'Επιλέξτε ένα Datasource',
+    'select_datasource' => 'Select a data source',
     'select_department'     => 'Επιλέξτε ένα Τμήμα',
     'select_depreciation'	=> 'Επιλέξτε τύπο απόσβεσης',
     'select_location'		=> 'Επιλέξτε τοποθεσία',
@@ -274,13 +279,15 @@ return [
     'signed_off_by'         => 'Υπογραφή Από',
     'skin'       			=> 'Θέμα',
     'webhook_msg_note'        => 'Μια ειδοποίηση θα σταλεί μέσω webhook',
-    'webhook_test_msg'        => 'Ωχ χάλι! Φαίνεται σαν την ενσωμάτωσή σας :app με Snipe-IT λειτουργεί!',
+    'webhook_test_msg'        => 'Oh hai! It looks like your :app integration with Snipe-IT is working!',
     'some_features_disabled' => 'ΛΕΙΤΟΥΡΓΙΑ DEMO: Ορισμένες λειτουργίες είναι απενεργοποιημένες για αυτήν την εγκατάσταση.',
     'site_name'				=> 'Όνομα ιστότοπου',
     'state'  				=> 'Κατάσταση',
     'status_labels'			=> 'Ετικέτα Κατάστασης',
+    'status_label'			=> 'Status Label',
     'status'    			=> 'Κατάσταση',
     'accept_eula'           => 'Συμφωνία Αποδοχής',
+    'show_or_hide_eulas' => 'Show/Hide EULAs',
     'supplier'              => 'Προμηθευτής',
     'suppliers'  			=> 'Προμηθευτές',
     'sure_to_delete'        => 'Είστε βέβαιοι ότι θέλετε να διαγράψετε',
@@ -296,9 +303,9 @@ return [
     'type'  				=> 'Είδος',
     'undeployable'			=> 'Δεν μπορεί να αναπτυχθεί',
     'unknown_admin'			=> 'Άγνωστο Admin',
-    'username_format'		=> 'Τύπος ονόματος',
     'username'              => 'Όνομα χρήστη',
     'update'                => 'Ενημέρωση',
+    'updating_item' => 'Updating :item',
     'upload_filetypes_help'      => 'Επιτρεπόμενοι τύποι αρχείων είναι png, gif, jpg, jpeg, doc, docx, pdf, xls, xlsx, txt, lic, xml, zip, rtf και rar. Το μέγιστο επιτρεπόμενο μέγεθος upload είναι :size.',
     'uploaded'              => 'Ανέβηκε',
     'user'					=> 'Χρήστης',
@@ -323,10 +330,10 @@ return [
     'token_expired'         => 'Έχει λήξει η συνεδρία σας. Παρακαλώ συνδεθείτε ξανά.',
     'login_enabled'         => 'Ενεργοποίηση Σύνδεσης',
     'audit_due'             => 'Οφειλόμενη για έλεγχο',
-    'audit_due_days'        => 'Στοιχεία που οφείλονται για έλεγχο Εντός :days Ημερήσια Εξόφληση περιουσιακών στοιχείων για έλεγχο Εντός :days',
+    'audit_due_days'        => '{}Assets Due or Overdue for Audit|[1]Assets Due or Overdue for Audit Within a Day|[2,*]Assets Due or Overdue for Audit Within :days Days',
     'checkin_due'           => 'Πληρωμή για Checkin',
     'checkin_overdue'       => 'Εκπρόθεσμο για Checkin',
-    'checkin_due_days'      => 'Τα περιουσιακά στοιχεία που οφείλονται για Checkin Εντός :days Ημερήσια Πάγια Checkin Μέσα σε :days Ημέρες',
+    'checkin_due_days'      => '{}Due for Checkin|[1]Assets Due for Checkin Within :days Day|[2,*]Assets Due for Checkin Within :days Days',
     'audit_overdue'         => 'Εκπρόθεσμο για έλεγχο',
     'accept'                => 'Αποδοχή :asset',
     'i_accept'              => 'Αποδέχομαι',
@@ -339,16 +346,16 @@ return [
     'view_all'              => 'προβολή όλων',
     'hide_deleted'          => 'Απόκρυψη Διαγραμμένων',
     'email'                 => 'Ηλεκτρονικό ταχυδρομείο',
-    'do_not_change'         => 'Να Μη Γίνει Αλλαγή',
-    'bug_report'            => 'Αναφορά σφάλματος',
+    'do_not_change'         => 'Do not change',
+    'bug_report'            => 'Report a bug',
     'user_manual'           => 'Εγχειρίδιο Χρήστη',
     'setup_step_1'          => 'Βήμα 1',
     'setup_step_2'          => 'Βήμα 2',
     'setup_step_3'          => 'Βήμα 3',
     'setup_step_4'          => '4Ο Βήμα.',
     'setup_config_check'    => 'Έλεγχος Ρύθμισης',
-    'setup_create_database' => 'Δημιουργία Πινάκων Βάσης Δεδομένων',
-    'setup_create_admin'    => 'Δημιουργία Χρήστη Διαχειριστή',
+    'setup_create_database' => 'Create database tables',
+    'setup_create_admin'    => 'Create an admin user',
     'setup_done'            => 'Ολοκληρώθηκε!',
     'bulk_edit_about_to'    => 'Πρόκειται να επεξεργαστείτε τα ακόλουθα: ',
     'checked_out'           => 'Checked Out',
@@ -383,6 +390,8 @@ return [
     'new_license'           => 'Νέα Άδεια',
     'new_accessory'         => 'Νέο Αξεσουάρ',
     'new_consumable'        => 'Νέο Αναλώσιμο',
+    'new_component'         => 'New Component',
+    'new_user'              => 'New User',
     'collapse'              => 'Σύμπτυξη',
     'assigned'              => 'Ανατεθειμένο',
     'asset_count'           => 'Μετρητής Περιουσιακών Στοιχείων',
@@ -407,7 +416,7 @@ return [
     'checkout_tooltip' => 'Ελέγξτε αυτό το στοιχείο έξω',
     'checkin_tooltip' => 'Check this item in so that it is available for re-issue, re-imaging, etc',
     'checkout_user_tooltip' => 'Επιλέξτε αυτό το στοιχείο έξω σε ένα χρήστη',
-    'checkin_to_diff_location' => 'You can choose to check this asset in to a location other than this asset\'s default location of :default_location if one is set',
+    'checkin_to_diff_location' => 'Μπορείτε να επιλέξετε να ελέγξετε αυτό το στοιχείο σε μια τοποθεσία άλλη από την προεπιλεγμένη θέση αυτού του περιουσιακού στοιχείου του :default_location αν έχει οριστεί',
     'maintenance_mode'      => 'Η υπηρεσία δεν είναι προσωρινά διαθέσιμη για ενημερώσεις συστήματος. Παρακαλούμε ελέγξτε ξανά αργότερα.',
     'maintenance_mode_title' => 'Προσωρινά Μη Διαθέσιμο Σύστημα',
     'ldap_import'           => 'Ο κωδικός πρόσβασης χρήστη δεν πρέπει να γίνεται από το LDAP. (Αυτό σας επιτρέπει να στείλετε αιτήματα ξεχασμένων κωδικών.)',
@@ -418,19 +427,20 @@ return [
     'bulk_soft_delete'      =>'Επίσης απαλή διαγραφή αυτών των χρηστών. Το ιστορικό των περιουσιακών στοιχείων τους θα παραμείνει άθικτο χωρίς / μέχρι να καθαρίσετε τις διαγραφές εγγραφών στις Ρυθμίσεις Διαχειριστή.',
     'bulk_checkin_delete_success' => 'Οι επιλεγμένοι χρήστες έχουν διαγραφεί και τα στοιχεία τους έχουν ελεγχθεί.',
     'bulk_checkin_success' => 'Τα στοιχεία για τους επιλεγμένους χρήστες έχουν ελεγχθεί.',
-    'set_to_null'           => 'Διαγραφή τιμών για αυτό το στοιχείο:asset_count στοιχείων ενεργητικού ',
+    'set_to_null'           => 'Delete values for this selection|Delete values for all :selection_count selections ',
     'set_users_field_to_null'  => 'Διαγραφή τιμών :field για αυτόν τον χρήστη: Διαγραφή τιμών :field για όλους τους χρήστες :user_count ',
     'na_no_purchase_date'   => 'N/A - Δεν δόθηκε ημερομηνία αγοράς',
     'assets_by_status'      => 'Ενεργητικό ανά κατάσταση',
     'assets_by_status_type'      => 'Ενεργητικό ανά τύπο κατάστασης',
     'pie_chart_type'        => 'Τύπος Γραφήματος Πίτας Ταινιών',
     'hello_name'            => 'Γεια Σε, :name!',
-    'unaccepted_profile_warning'   => 'Έχετε :count στοιχεία που απαιτούν αποδοχή. Κάντε κλικ εδώ για να τα αποδεχτείτε ή να τα απορρίψετε',
+    'unaccepted_profile_warning'   => 'You have one item requiring acceptance. Click here to accept or decline it | You have :count items requiring acceptance. Click here to accept or decline them',
     'start_date'            => 'Ημερομηνία Έναρξης',
     'end_date'            => 'Ημερομηνία Λήξης',
     'alt_uploaded_image_thumbnail' => 'Ανεβασμένη μικρογραφία',
     'placeholder_kit'       => 'Επιλέξτε ένα κιτ',
     'file_not_found'        => 'Το αρχείο δεν βρέθηκε',
+    'log_record_not_found'  => 'No record for that log entry was found.',
     'preview_not_available' => '(χωρίς προεπισκόπηση)',
     'setup'                 => 'Ρύθμιση',
     'pre_flight'            => 'Προ-Φωτισμός',
@@ -512,7 +522,7 @@ return [
     'checked_out_to_fields' => 'Checked Out To Fields',
     'percent_complete' => '% πλήρης',
     'uploading' => 'Μεταφόρτωση... ',
-    'upload_error' => 'Σφάλμα κατά τη μεταφόρτωση του αρχείου. Παρακαλώ ελέγξτε ότι δεν υπάρχουν κενές γραμμές και ότι δεν υπάρχουν διπλότυπα ονόματα στηλών.',
+    'upload_error' => 'Error uploading file. Please check that you have no empty rows or duplicated column names in your CSV, and that the server permissions allow uploads.',
     'copy_to_clipboard' => 'Αντιγραφή στο πρόχειρο',
     'copied' => 'Αντιγράφηκε!',
     'status_compatibility' => 'Εάν τα περιουσιακά στοιχεία έχουν ήδη εκχωρηθεί, δεν μπορούν να αλλάξουν σε μη εγκατεστημένο τύπο κατάστασης και αυτή η αλλαγή αξίας θα παραλειφθεί.',
@@ -549,6 +559,71 @@ return [
         'license_seats'  => ':count Εξαρτήματα |:count  Εξαρτήματα',
         'consumables'  => ':count Αναλώσιμα |:count Αναλώσιμα',
         'components'  => ':count Εξαρτήματα |:count  Εξαρτήματα',
-    ]
+    ],
+
+    'more_info' => 'Περισσότερες Πληροφορίες',
+    'quickscan_bulk_help' => 'Checking this box will edit the asset record to reflect this new location. Leaving it unchecked will simply note the location in the audit log. Note that if this asset is checked out, it will not change the location of the person, asset or location it is checked out to.',
+    'whoops' => 'Whoops!',
+    'something_went_wrong' => 'Something went wrong with your request.',
+    'close' => 'Close',
+    'expires' => 'Λήξη',
+    'map_fields'=> 'Map :item_type Fields',
+    'remaining_var' => ':count Remaining',
+    'label' => 'Label',
+    'import_asset_tag_exists' => 'An asset with the asset tag :asset_tag already exists and an update was not requested. No change was made.',
+    'countries_manually_entered_help' => 'Values with an asterisk (*) were manually entered and do not match existing ISO 3166 dropdown values',
+    'accessories_assigned' => 'Assigned Accessories',
+    'user_managed_passwords' => 'Password Management',
+    'user_managed_passwords_disallow' => 'Disallow users from managing their own passwords',
+    'user_managed_passwords_allow' => 'Allow users to manage their own passwords',
+    'from' => 'From',
+    'by' => 'Από',
+
+// Add form placeholders here
+    'placeholders' => [
+        'notes'  => 'Add a note',
+    ],
+
+    'breadcrumb_button_actions' => [
+        'edit_item' => 'Edit :name',
+        'checkout_item' => 'Checkout :name',
+        'checkin_item' => 'Checkin :name',
+    ],
+
+    'skins' => [
+        'site_default' => 'Site Default',
+        'default_blue' => 'Default Blue',
+        'blue_dark' => 'Blue (Dark Mode)',
+        'green' => 'Green Dark',
+        'green_dark' => 'Green (Dark Mode)',
+        'red' => 'Red Dark',
+        'red_dark' => 'Red (Dark Mode)',
+        'orange' => 'Orange Dark',
+        'orange_dark' => 'Orange (Dark Mode)',
+        'black' => 'Black',
+        'black_dark' => 'Black (Dark Mode)',
+        'purple' => 'Purple',
+        'purple_dark' => 'Purple (Dark Mode)',
+        'yellow' => 'Yellow',
+        'yellow_dark' => 'Yellow (Dark Mode)',
+        'high_contrast' => 'High Contrast',
+
+    ],
+
+    'select_all_none' => 'Select/Unselect All',
+    'generic_model_not_found' => 'That :model was not found or you do not have permission to access it',
+    'deleted_models' => 'Deleted Asset Models',
+    'deleted_users' => 'Deleted Users',
+    'cost_each' => ':amount each',
+    'remove_current_image' => 'Remove current :type image',
+
+    'seeding' => [
+        'manufacturers' => [
+            'button' => 'Create Manufacturers',
+            'prompt' => 'You do not have any manufacturers yet. Would you like to seed a list of common manufacturers? (THIS WILL OVERWRITE EXISTING MANUFACTURERS, including those that have been soft-deleted.)',
+            'success' => 'Manufacturers seeded successfully',
+            'error' => 'Could not seed manufacturers. A manufacturer record already exists and seeding would overwrite it.|Could not seed manufacturers. :count manufacturer records already exist and seeding would overwrite them.',
+        ],
+    ],
 
 ];
diff --git a/resources/lang/el-GR/localizations.php b/resources/lang/el-GR/localizations.php
index 739d55b193..cb1071166c 100644
--- a/resources/lang/el-GR/localizations.php
+++ b/resources/lang/el-GR/localizations.php
@@ -2,7 +2,7 @@
 
 return [
 
-    'select_language' => 'Επιλέξτε μια γλώσσα',
+    'select_language' => 'Select a Language',
     'languages' => [
         'en-US'=> 'Αγγλικά, ΗΠΑ',
         'en-GB'=> 'Αγγλικά, Ηνωμένο Βασίλειο',
@@ -40,7 +40,9 @@ return [
         'ms-MY'=> 'Μαλαισιανά',
         'mi-NZ'=> 'Maori',
         'mn-MN'=> 'Μογγολικά',
-        'no-NO'=> 'Νορβηγικά',
+        'nb-NO'=> 'Norwegian Bokmål',
+        'om-ET' => 'Oromo (Ethiopian)',
+        //'nn-NO'=> 'Norwegian Nynorsk',
         'fa-IR'=> 'Περσικά',
         'pl-PL'=> 'Πολωνικά',
         'pt-PT'=> 'Πορτογαλικά',
@@ -66,7 +68,7 @@ return [
         'zu-ZA'=> 'Zulu',
     ],
 
-    'select_country' => 'Επιλέξτε μια χώρα',
+    'select_country' => 'Select a Country',
     
     'countries' => [
         'AC'=>'Νήσος Αναλήψεως',
@@ -133,6 +135,7 @@ return [
         'EC'=>'Ecuador',
         'EE'=>'Εσθονία',
         'EG'=>'Αίγυπτος',
+        'GB-ENG'=>'England',
         'ER'=>'Ερυθραία',
         'ES'=>'Ισπανία',
         'ET'=>'Ethiopia',
@@ -231,6 +234,7 @@ return [
         'NG'=>'Nigeria',
         'NI'=>'Nicaragua',
         'NL'=>'Ολλανδία',
+        'GB-NIR' => 'Northern Ireland',
         'NO'=>'Νορβηγία',
         'NP'=>'Νεπάλ',
         'NR'=>'Nauru',
@@ -258,7 +262,7 @@ return [
         'RU'=>'Ρωσική Ομοσπονδία',
         'RW'=>'Rwanda',
         'SA'=>'Σαουδική Αραβία',
-        'UK'=>'Σκωτία',
+        'GB-SCT'=>'Σκωτία',
         'SB'=>'Νήσοι Σολομώντος',
         'SC'=>'Seychelles',
         'SS'=>'Νότιο Σουδάν',
@@ -310,6 +314,7 @@ return [
         'VI'=>'Παρθένες Νήσοι (Η.Π.Α.)',
         'VN'=>'Viet Nam',
         'VU'=>'Vanuatu',
+        'GB-WLS' =>'Wales',
         'WF'=>'Νήσοι Ουώλλις Και Φουτούνα',
         'WS'=>'Samoa',
         'YE'=>'Υεμένη',
diff --git a/resources/lang/el-GR/mail.php b/resources/lang/el-GR/mail.php
index 044030c28a..f673edffb4 100644
--- a/resources/lang/el-GR/mail.php
+++ b/resources/lang/el-GR/mail.php
@@ -23,24 +23,25 @@ return [
     'Item_Requested' => 'Στοιχείο που ζητήθηκε',
     'License_Checkin_Notification' => 'Η άδεια επανήλθε',
     'License_Checkout_Notification' => 'Η άδεια έχει ελεγχθεί',
+    'license_for'   => 'License for',
     'Low_Inventory_Report' => 'Αναφορά χαμηλού αποθέματος',
     'a_user_canceled' => 'Ένας χρήστης έχει ακυρώσει μια αίτηση στοιχείο στην ιστοσελίδα',
     'a_user_requested' => 'Ο χρήστης έχει ζητήσει ένα στοιχείο στην ιστοσελίδα',
     'acceptance_asset_accepted' => 'Ένας χρήστης έχει αποδεχθεί ένα αντικείμενο',
     'acceptance_asset_declined' => 'Ένας χρήστης έχει απορρίψει ένα στοιχείο',
-    'accessory_name' => 'Όνομα ανταλλακτικού:',
-    'additional_notes' => 'Πρόσθετες σημειώσεις:',
+    'accessory_name' => 'Όνομα ανταλλακτικού',
+    'additional_notes' => 'Πρόσθετες σημειώσεις',
     'admin_has_created' => 'Ένας διαχειριστής έχει δημιουργήσει ένα λογαριασμό για εσάς στην: web ιστοσελίδα.',
-    'asset' => 'Πάγιο:',
-    'asset_name' => 'Όνομα του περιουσιακού στοιχείου:',
+    'asset' => 'Πάγιο',
+    'asset_name' => 'Ονομασία του παγίου',
     'asset_requested' => 'Πάγιο αίτήθηκε',
     'asset_tag' => 'Ετικέτα παγίων',
     'assets_warrantee_alert' => 'Υπάρχει :count περιουσιακό στοιχείο με μια εγγύηση που λήγει στις επόμενες :threshold days.°C. Υπάρχουν :count περιουσιακά στοιχεία με εγγυήσεις που λήγουν στις επόμενες :threshold ημέρες.',
     'assigned_to' => 'Ανατέθηκε στον',
     'best_regards' => 'Τις καλύτερες ευχές,',
-    'canceled' => 'Ακυρωμένο:',
-    'checkin_date' => 'Ημερομηνία άφιξης:',
-    'checkout_date' => 'Ημερομηνία αποχώρησης:',
+    'canceled' => 'Ακυρωμένο',
+    'checkin_date' => 'Ημερομηνία άφιξης',
+    'checkout_date' => 'Ημερομηνία αποχώρησης',
     'checkedout_from' => 'Έγινε έλεγχος από',
     'checkedin_from'  => 'Έγινε έλεγχος από',
     'checked_into' => 'Έγινε έλεγχος',
@@ -49,27 +50,30 @@ return [
     'click_to_confirm' => 'Κάντε κλικ στον παρακάτω σύνδεσμο για να επιβεβαιώσετε τον λογαριασμό σας στο διαδίκτυο:',
     'current_QTY' => 'Τρέχουσα ποσότητα',
     'days' => 'Ημέρες',
-    'expecting_checkin_date' => 'Αναμενόμενη ημερομηνία checkin:',
+    'expecting_checkin_date' => 'Αναμενώμενη ημέρα άφιξης',
     'expires' => 'Λήξη',
     'hello' => 'Γεια',
     'hi' => 'Γεια σας',
     'i_have_read' => 'Έχω διαβάσει και συμφωνώ με τους όρους χρήσης, και έχω λάβει αυτό το στοιχείο.',
     'inventory_report' => 'Έκθεση Αποθέματος',
-    'item' => 'Αντικείμενο:',
+    'item' => 'Αντικείμενο',
+    'item_checked_reminder' => 'This is a reminder that you currently have :count items checked out to you that you have not accepted or declined. Please click the link below to confirm your decision.',
     'license_expiring_alert' => 'Υπάρχει :count άδεια που λήγει στις επόμενες :threshold ημέρες."Υπάρχουν :count άδειες που λήγουν στις επόμενες :threshold ημέρες.',
     'link_to_update_password' => 'Κάντε κλικ στον παρακάτω σύνδεσμο για να ενημερώσετε τον κωδικό: web:',
-    'login' => 'Σύνδεση:',
+    'login' => 'Είσοδος',
     'login_first_admin' => 'Συνδεθείτε στη νέα σας εγκατάσταση Snipe-IT χρησιμοποιώντας τα παρακάτω διαπιστευτήρια:',
     'low_inventory_alert' => 'Υπάρχει :count στοιχείο που είναι κάτω από το ελάχιστο απόθεμα ή σύντομα θα είναι χαμηλό. Υπάρχουν :count στοιχεία που είναι κάτω από το ελάχιστο απόθεμα ή σύντομα θα είναι χαμηλή.',
     'min_QTY' => 'Ελάχιστη ποσότητα',
     'name' => 'Όνομα',
     'new_item_checked' => 'Ένα νέο στοιχείο έχει ελεγχθεί με το όνομά σας, οι λεπτομέρειες είναι παρακάτω.',
+    'new_item_checked_with_acceptance' => 'A new item has been checked out under your name that requires acceptance, details are below.',
+    'recent_item_checked' => 'An item was recently checked out under your name that requires acceptance, details are below.',
     'notes' => 'Σημειώσεις',
-    'password' => 'Κωδικός:',
+    'password' => 'Κωδικός Πρόσβασης',
     'password_reset' => 'Επαναφορά κωδικού πρόσβασης',
     'read_the_terms' => 'Παρακαλώ διαβάστε του παρακάτω όρους.',
     'read_the_terms_and_click' => 'Παρακαλούμε διαβάστε τους όρους χρήσης παρακάτω, και κάντε κλικ στο σύνδεσμο στο κάτω μέρος για να επιβεβαιώσετε ότι διαβάζετε και συμφωνείτε με τους όρους χρήσης και έχετε λάβει το περιουσιακό στοιχείο.',
-    'requested' => 'Ζητήθηκαν:',
+    'requested' => 'Ζητήθηκαν',
     'reset_link' => 'Αποστολή συνδέσμου ακύρωσης κωδικού',
     'reset_password' => 'Κάντε κλικ εδώ για να επαναφέρετε τον κωδικό πρόσβασής σας:',
     'rights_reserved' => 'Με επιφύλαξη παντός δικαιώματος.',
@@ -86,8 +90,10 @@ return [
     'upcoming-audits' => 'Υπάρχει :count περιουσιακό στοιχείο που έρχεται για έλεγχο μέσα σε :threshold days.°C. Υπάρχουν :count περιουσιακά στοιχεία που έρχονται για έλεγχο εντός :threshold ημερών.',
     'user' => 'Χρήστης',
     'username' => 'Όνομα χρήστη',
+    'unaccepted_asset_reminder' => 'Reminder: You have Unaccepted Assets.',
     'welcome' => 'Καλώς ήρθατε, %name',
     'welcome_to' => 'Καλώς ήλθατε στο!',
     'your_assets' => 'Προβολή Των Αντικειμένων Σας',
     'your_credentials' => 'Τα διαπιστευτήρια σας Snipe-IT',
+    'mail_sent' => 'Mail sent successfully!',
 ];
diff --git a/resources/lang/el-GR/validation.php b/resources/lang/el-GR/validation.php
index 6f631a58f7..ea6f99d8b6 100644
--- a/resources/lang/el-GR/validation.php
+++ b/resources/lang/el-GR/validation.php
@@ -13,87 +13,150 @@ return [
     |
     */
 
-    'accepted'             => 'Το: χαρακτηριστικό πρέπει να γίνει δεκτό.',
-    'active_url'           => 'Η: το χαρακτηριστικό δεν έχει έγκυρη διεύθυνση URL.',
-    'after'                => 'Η ιδιότητα: πρέπει να είναι ημερομηνία μετά την ημερομηνία.',
-    'after_or_equal'       => 'Η ιδιότητα: πρέπει να είναι ημερομηνία μετά ή ίσο με: ημερομηνία.',
-    'alpha'                => 'Η: το χαρακτηριστικό μπορεί να περιέχει μόνο γράμματα.',
-    'alpha_dash'           => 'Το χαρακτηριστικό:: μπορεί να περιέχει μόνο γράμματα, αριθμούς και παύλες.',
-    'alpha_num'            => 'Το χαρακτηριστικό:: μπορεί να περιέχει μόνο γράμματα και αριθμούς.',
-    'array'                => 'Το χαρακτηριστικό πρέπει να είναι ένας πίνακας.',
-    'before'               => 'Η ιδιότητα: πρέπει να είναι μια ημερομηνία πριν: η ημερομηνία.',
-    'before_or_equal'      => 'Η ιδιότητα: πρέπει να είναι ημερομηνία πριν ή ίσο με: ημερομηνία.',
-    'between'              => [
-        'numeric' => 'Το χαρακτηριστικό πρέπει να είναι μεταξύ: min - :max.',
-        'file'    => 'Το χαρακτηριστικό πρέπει να είναι μεταξύ: min και: max kilobytes.',
-        'string'  => 'Η ιδιότητα: πρέπει να είναι μεταξύ: min και max χαρακτήρες.',
-        'array'   => 'Η ιδιότητα: πρέπει να έχει μεταξύ: min και max στοιχεία.',
+    'accepted' => 'The :attribute field must be accepted.',
+    'accepted_if' => 'The :attribute field must be accepted when :other is :value.',
+    'active_url' => 'The :attribute field must be a valid URL.',
+    'after' => 'The :attribute field must be a date after :date.',
+    'after_or_equal' => 'The :attribute field must be a date after or equal to :date.',
+    'alpha' => 'The :attribute field must only contain letters.',
+    'alpha_dash' => 'The :attribute field must only contain letters, numbers, dashes, and underscores.',
+    'alpha_num' => 'The :attribute field must only contain letters and numbers.',
+    'array' => 'The :attribute field must be an array.',
+    'ascii' => 'The :attribute field must only contain single-byte alphanumeric characters and symbols.',
+    'before' => 'The :attribute field must be a date before :date.',
+    'before_or_equal' => 'The :attribute field must be a date before or equal to :date.',
+    'between' => [
+        'array' => 'The :attribute field must have between :min and :max items.',
+        'file' => 'The :attribute field must be between :min and :max kilobytes.',
+        'numeric' => 'The :attribute field must be between :min and :max.',
+        'string' => 'The :attribute field must be between :min and :max characters.',
     ],
-    'boolean'              => 'Το πεδίο ιδιοτήτων πρέπει να είναι αληθές ή ψευδές.',
-    'confirmed'            => 'Η επιβεβαίωση του χαρακτηριστικού δεν αντιστοιχεί.',
-    'date'                 => 'Το χαρακτηριστικό: δεν είναι έγκυρη.',
-    'date_format'          => 'Το χαρακτηριστικό: δεν αντιστοιχεί στη μορφή: format.',
-    'different'            => 'Το χαρακτηριστικό: και: άλλα πρέπει να είναι διαφορετικά.',
-    'digits'               => 'Το χαρακτηριστικό: πρέπει να είναι: ψηφία ψηφία.',
-    'digits_between'       => 'Το χαρακτηριστικό: πρέπει να είναι μεταξύ: min και max.',
-    'dimensions'           => 'Το χαρακτηριστικό:: έχει μη έγκυρες διαστάσεις εικόνας.',
-    'distinct'             => 'Το πεδίο ιδιοτήτων: έχει διπλή τιμή.',
-    'email'                => 'Το χαρακτηριστικό: πρέπει να είναι έγκυρη διεύθυνση ηλεκτρονικού ταχυδρομείου.',
-    'exists'               => 'Το επιλεγμένο: χαρακτηριστικό δεν είναι έγκυρο.',
-    'file'                 => 'Το χαρακτηριστικό πρέπει να είναι ένα αρχείο.',
-    'filled'               => 'Το πεδίο ιδιοτήτων πρέπει να έχει τιμή.',
-    'image'                => 'Το: χαρακτηριστικό πρέπει να είναι μια εικόνα.',
+    'boolean' => 'Το πεδίο ιδιοτήτων πρέπει να είναι αληθές ή ψευδές.',
+    'can' => 'The :attribute field contains an unauthorized value.',
+    'confirmed' => 'The :attribute field confirmation does not match.',
+    'contains' => 'The :attribute field is missing a required value.',
+    'current_password' => 'The password is incorrect.',
+    'date' => 'The :attribute field must be a valid date.',
+    'date_equals' => 'The :attribute field must be a date equal to :date.',
+    'date_format' => 'The :attribute field must match the format :format.',
+    'decimal' => 'The :attribute field must have :decimal decimal places.',
+    'declined' => 'The :attribute field must be declined.',
+    'declined_if' => 'The :attribute field must be declined when :other is :value.',
+    'different' => 'The :attribute field and :other must be different.',
+    'digits' => 'The :attribute field must be :digits digits.',
+    'digits_between' => 'The :attribute field must be between :min and :max digits.',
+    'dimensions' => 'The :attribute field has invalid image dimensions.',
+    'distinct' => 'Το πεδίο ιδιοτήτων: έχει διπλή τιμή.',
+    'doesnt_end_with' => 'The :attribute field must not end with one of the following: :values.',
+    'doesnt_start_with' => 'The :attribute field must not start with one of the following: :values.',
+    'email' => 'The :attribute field must be a valid email address.',
+    'ends_with' => 'The :attribute field must end with one of the following: :values.',
+    'enum' => 'Το επιλεγμένο: χαρακτηριστικό δεν είναι έγκυρο.',
+    'exists' => 'Το επιλεγμένο: χαρακτηριστικό δεν είναι έγκυρο.',
+    'extensions' => 'The :attribute field must have one of the following extensions: :values.',
+    'file' => 'The :attribute field must be a file.',
+    'filled' => 'Το πεδίο ιδιοτήτων πρέπει να έχει τιμή.',
+    'gt' => [
+        'array' => 'The :attribute field must have more than :value items.',
+        'file' => 'The :attribute field must be greater than :value kilobytes.',
+        'numeric' => 'The :attribute field must be greater than :value.',
+        'string' => 'The :attribute field must be greater than :value characters.',
+    ],
+    'gte' => [
+        'array' => 'The :attribute field must have :value items or more.',
+        'file' => 'The :attribute field must be greater than or equal to :value kilobytes.',
+        'numeric' => 'The :attribute field must be greater than or equal to :value.',
+        'string' => 'The :attribute field must be greater than or equal to :value characters.',
+    ],
+    'hex_color' => 'The :attribute field must be a valid hexadecimal color.',
+    'image' => 'The :attribute field must be an image.',
     'import_field_empty'    => 'Η τιμή για :fieldname δεν μπορεί να είναι μηδενική.',
-    'in'                   => 'Το χαρακτηριστικό επιλεγμένο: δεν είναι έγκυρο.',
-    'in_array'             => 'Το πεδίο ιδιοτήτων: δεν υπάρχει σε: άλλο.',
-    'integer'              => 'Το χαρακτηριστικό: πρέπει να είναι ένας ακέραιος αριθμός.',
-    'ip'                   => 'Το χαρακτηριστικό: πρέπει να είναι μια έγκυρη διεύθυνση IP.',
-    'ipv4'                 => 'Το χαρακτηριστικό: πρέπει να είναι μια έγκυρη διεύθυνση IPv4.',
-    'ipv6'                 => 'Το χαρακτηριστικό: πρέπει να είναι μια έγκυρη διεύθυνση IPv6.',
-    'is_unique_department' => 'Το :attribute πρέπει να είναι μοναδικό σε αυτή την Τοποθεσία Εταιρείας',
-    'json'                 => 'Το χαρακτηριστικό: πρέπει να είναι μια έγκυρη συμβολοσειρά JSON.',
-    'max'                  => [
-        'numeric' => 'Η ιδιότητα: δεν μπορεί να είναι μεγαλύτερη από: max.',
-        'file'    => 'Η ιδιότητα: δεν μπορεί να είναι μεγαλύτερη από: μέγιστα kilobyte.',
-        'string'  => 'Το χαρακτηριστικό:: δεν μπορεί να είναι μεγαλύτερο από: max χαρακτήρες.',
-        'array'   => 'Το χαρακτηριστικό:: δεν μπορεί να έχει περισσότερα από: max στοιχεία.',
+    'in' => 'Το χαρακτηριστικό επιλεγμένο: δεν είναι έγκυρο.',
+    'in_array' => 'The :attribute field must exist in :other.',
+    'integer' => 'The :attribute field must be an integer.',
+    'ip' => 'The :attribute field must be a valid IP address.',
+    'ipv4' => 'The :attribute field must be a valid IPv4 address.',
+    'ipv6' => 'The :attribute field must be a valid IPv6 address.',
+    'json' => 'The :attribute field must be a valid JSON string.',
+    'list' => 'The :attribute field must be a list.',
+    'lowercase' => 'The :attribute field must be lowercase.',
+    'lt' => [
+        'array' => 'The :attribute field must have less than :value items.',
+        'file' => 'The :attribute field must be less than :value kilobytes.',
+        'numeric' => 'The :attribute field must be less than :value.',
+        'string' => 'The :attribute field must be less than :value characters.',
     ],
-    'mimes'                => 'Το χαρακτηριστικό: πρέπει να είναι ένα αρχείο τύπου:: τιμές.',
-    'mimetypes'            => 'Το χαρακτηριστικό: πρέπει να είναι ένα αρχείο τύπου:: τιμές.',
-    'min'                  => [
-        'numeric' => 'Η ιδιότητα: πρέπει να είναι τουλάχιστον: min.',
-        'file'    => 'Το χαρακτηριστικό πρέπει να είναι τουλάχιστον: min kilobytes.',
-        'string'  => 'Το χαρακτηριστικό: πρέπει να είναι τουλάχιστον: min χαρακτήρες.',
-        'array'   => 'Το χαρακτηριστικό: πρέπει να έχει τουλάχιστον: λεπτά στοιχεία.',
+    'lte' => [
+        'array' => 'The :attribute field must not have more than :value items.',
+        'file' => 'The :attribute field must be less than or equal to :value kilobytes.',
+        'numeric' => 'The :attribute field must be less than or equal to :value.',
+        'string' => 'The :attribute field must be less than or equal to :value characters.',
     ],
-    'starts_with'          => 'Το :attribute πρέπει να ξεκινά με ένα από τα εξής: :values.',
-    'ends_with'            => 'Το :attribute πρέπει να τελειώνει με ένα από τα εξής: :values.',
+    'mac_address' => 'The :attribute field must be a valid MAC address.',
+    'max' => [
+        'array' => 'The :attribute field must not have more than :max items.',
+        'file' => 'The :attribute field must not be greater than :max kilobytes.',
+        'numeric' => 'The :attribute field must not be greater than :max.',
+        'string' => 'The :attribute field must not be greater than :max characters.',
+    ],
+    'max_digits' => 'The :attribute field must not have more than :max digits.',
+    'mimes' => 'The :attribute field must be a file of type: :values.',
+    'mimetypes' => 'The :attribute field must be a file of type: :values.',
+    'min' => [
+        'array' => 'The :attribute field must have at least :min items.',
+        'file' => 'The :attribute field must be at least :min kilobytes.',
+        'numeric' => 'The :attribute field must be at least :min.',
+        'string' => 'The :attribute field must be at least :min characters.',
+    ],
+    'min_digits' => 'The :attribute field must have at least :min digits.',
+    'missing' => 'The :attribute field must be missing.',
+    'missing_if' => 'The :attribute field must be missing when :other is :value.',
+    'missing_unless' => 'The :attribute field must be missing unless :other is :value.',
+    'missing_with' => 'The :attribute field must be missing when :values is present.',
+    'missing_with_all' => 'The :attribute field must be missing when :values are present.',
+    'multiple_of' => 'The :attribute field must be a multiple of :value.',
+    'not_in' => 'Το επιλεγμένο: χαρακτηριστικό δεν είναι έγκυρο.',
+    'not_regex' => 'The :attribute field format is invalid.',
+    'numeric' => 'The :attribute field must be a number.',
+    'password' => [
+        'letters' => 'The :attribute field must contain at least one letter.',
+        'mixed' => 'The :attribute field must contain at least one uppercase and one lowercase letter.',
+        'numbers' => 'The :attribute field must contain at least one number.',
+        'symbols' => 'The :attribute field must contain at least one symbol.',
+        'uncompromised' => 'The given :attribute has appeared in a data leak. Please choose a different :attribute.',
+    ],
+    'percent'       => 'The depreciation minimum must be between 0 and 100 when depreciation type is percentage.',
 
-    'not_in'               => 'Το επιλεγμένο: χαρακτηριστικό δεν είναι έγκυρο.',
-    'numeric'              => 'Το χαρακτηριστικό πρέπει να είναι ένας αριθμός.',
-    'present'              => 'Πρέπει να υπάρχει το πεδίο ιδιοτήτων: attribute.',
-    'valid_regex'          => 'Μη έγκυρη συμβολοσειρά χαρακτήρων ελέγχου πρότυπου. ',
-    'regex'                => 'Η μορφή του χαρακτηριστικού είναι μη έγκυρη.',
-    'required'             => 'Το πεδίο ιδιοτήτων: απαιτείται.',
-    'required_if'          => 'Το πεδίο ιδιοτήτων: απαιτείται όταν: το άλλο είναι: τιμή.',
-    'required_unless'      => 'Το πεδίο ιδιοτήτων: απαιτείται εκτός εάν: το άλλο είναι σε: τιμές.',
-    'required_with'        => 'Το πεδίο ιδιοτήτων: απαιτείται όταν υπάρχουν: τιμές.',
-    'required_with_all'    => 'Το πεδίο ιδιοτήτων: απαιτείται όταν υπάρχουν: τιμές.',
-    'required_without'     => 'Το πεδίο ιδιοτήτων: απαιτείται όταν: δεν υπάρχουν τιμές.',
+    'present' => 'Πρέπει να υπάρχει το πεδίο ιδιοτήτων: attribute.',
+    'present_if' => 'The :attribute field must be present when :other is :value.',
+    'present_unless' => 'The :attribute field must be present unless :other is :value.',
+    'present_with' => 'The :attribute field must be present when :values is present.',
+    'present_with_all' => 'The :attribute field must be present when :values are present.',
+    'prohibited' => 'The :attribute field is prohibited.',
+    'prohibited_if' => 'The :attribute field is prohibited when :other is :value.',
+    'prohibited_unless' => 'The :attribute field is prohibited unless :other is in :values.',
+    'prohibits' => 'The :attribute field prohibits :other from being present.',
+    'regex' => 'The :attribute field format is invalid.',
+    'required' => 'Το πεδίο ιδιοτήτων: απαιτείται.',
+    'required_array_keys' => 'The :attribute field must contain entries for: :values.',
+    'required_if' => 'Το πεδίο ιδιοτήτων: απαιτείται όταν: το άλλο είναι: τιμή.',
+    'required_if_accepted' => 'The :attribute field is required when :other is accepted.',
+    'required_if_declined' => 'The :attribute field is required when :other is declined.',
+    'required_unless' => 'Το πεδίο ιδιοτήτων: απαιτείται εκτός εάν: το άλλο είναι σε: τιμές.',
+    'required_with' => 'Το πεδίο ιδιοτήτων: απαιτείται όταν υπάρχουν: τιμές.',
+    'required_with_all' => 'The :attribute field is required when :values are present.',
+    'required_without' => 'Το πεδίο ιδιοτήτων: απαιτείται όταν: δεν υπάρχουν τιμές.',
     'required_without_all' => 'Το πεδίο ιδιοτήτων είναι απαραίτητο όταν δεν υπάρχουν καμία από τις τιμές.',
-    'same'                 => 'Το χαρακτηριστικό: και: άλλα πρέπει να ταιριάζουν.',
-    'size'                 => [
-        'numeric' => 'Το χαρακτηριστικό: πρέπει να είναι: μέγεθος.',
-        'file'    => 'Το χαρακτηριστικό: πρέπει να είναι: kilobytes μεγέθους.',
-        'string'  => 'Το χαρακτηριστικό: πρέπει να είναι: χαρακτήρες μεγέθους.',
-        'array'   => 'Το χαρακτηριστικό: πρέπει να περιέχει: στοιχεία μεγέθους.',
+    'same' => 'The :attribute field must match :other.',
+    'size' => [
+        'array' => 'The :attribute field must contain :size items.',
+        'file' => 'The :attribute field must be :size kilobytes.',
+        'numeric' => 'The :attribute field must be :size.',
+        'string' => 'The :attribute field must be :size characters.',
     ],
+    'starts_with' => 'The :attribute field must start with one of the following: :values.',
     'string'               => 'Το χαρακτηριστικό πρέπει να είναι μια συμβολοσειρά.',
-    'timezone'             => 'Το χαρακτηριστικό: πρέπει να είναι μια έγκυρη ζώνη.',
     'two_column_unique_undeleted' => 'Το :attribute πρέπει να είναι μοναδικό σε :table1 και :table2. ',
-    'unique'               => 'Το χαρακτηριστικό: έχει ήδη ληφθεί.',
-    'uploaded'             => 'Το χαρακτηριστικό:: απέτυχε να μεταφορτωθεί.',
-    'url'                  => 'Η μορφή του χαρακτηριστικού είναι μη έγκυρη.',
     'unique_undeleted'     => 'Το :χαρακτηριστικό πρέπει να είναι μοναδικό.',
     'non_circular'         => 'Το χαρακτηριστικό: δεν πρέπει να δημιουργήσει μια κυκλική αναφορά.',
     'not_array'            => ':attribute δεν μπορεί να είναι ένας πίνακας.',
@@ -102,11 +165,14 @@ return [
     'numbers'              => 'Ο κωδικός πρόσβασης πρέπει να περιέχει τουλάχιστον έναν αριθμό.',
     'case_diff'            => 'Ο κωδικός πρόσβασης πρέπει να χρησιμοποιεί κεφαλαία μικτά.',
     'symbols'              => 'Ο κωδικός πρόσβασης πρέπει να περιέχει σύμβολα.',
-    'gte'                  => [
-        'numeric'          => 'Η τιμή δεν μπορεί να είναι αρνητική'
-    ],
-    'checkboxes'           => ':attribute περιέχει μη έγκυρες επιλογές.',
-    'radio_buttons'        => ':attribute δεν είναι έγκυρο.',
+    'timezone' => 'The :attribute field must be a valid timezone.',
+    'unique' => 'Το χαρακτηριστικό: έχει ήδη ληφθεί.',
+    'uploaded' => 'Το χαρακτηριστικό:: απέτυχε να μεταφορτωθεί.',
+    'uppercase' => 'The :attribute field must be uppercase.',
+    'url' => 'The :attribute field must be a valid URL.',
+    'ulid' => 'The :attribute field must be a valid ULID.',
+    'uuid' => 'The :attribute field must be a valid UUID.',
+    'fmcs_location' => 'Full multiple company support and location scoping is enabled in the Admin Settings, and the selected location and selected company are not compatible.',
 
 
     /*
@@ -120,16 +186,22 @@ return [
     |
     */
 
+    'email_array'      => 'Μία ή περισσότερες διευθύνσεις ηλεκτρονικού ταχυδρομείου δεν είναι έγκυρες.',
+    'checkboxes'           => ':attribute περιέχει μη έγκυρες επιλογές.',
+    'radio_buttons'        => ':attribute δεν είναι έγκυρο.',
+    
     'custom' => [
         'alpha_space' => 'Το πεδίο ιδιοτήτων: περιέχει ένα χαρακτήρα που δεν επιτρέπεται.',
-        'email_array'      => 'Μία ή περισσότερες διευθύνσεις ηλεκτρονικού ταχυδρομείου δεν είναι έγκυρες.',
+
         'hashed_pass'      => 'Ο τρέχων κωδικός πρόσβασης είναι εσφαλμένος',
         'dumbpwd'          => 'Αυτός ο κωδικός πρόσβασης είναι πολύ συνηθισμένος.',
         'statuslabel_type' => 'Πρέπει να επιλέξετε έναν έγκυρο τύπο ετικέτας κατάστασης',
+        'custom_field_not_found'          => 'This field does not seem to exist, please double check your custom field names.',
+        'custom_field_not_found_on_model' => 'This field seems to exist, but is not available on this Asset Model\'s fieldset.',
 
         // date_format validation with slightly less stupid messages. It duplicates a lot, but it gets the job done :(
-        // We use this because the default error message for date_format is reflects php Y-m-d, which non-PHP
-        // people won't know how to format. 
+        // We use this because the default error message for date_format reflects php Y-m-d, which non-PHP
+        // people won't know how to format.
         'purchase_date.date_format'     => 'Το χαρακτηριστικό: πρέπει να είναι έγκυρη ημερομηνία σε μορφή YYYY-MM-DD',
         'last_audit_date.date_format'   =>  'Το :attribute πρέπει να είναι έγκυρη ημερομηνία σε μορφή YYYY-MM-DD hh:mm:ss',
         'expiration_date.date_format'   =>  'Το χαρακτηριστικό: πρέπει να είναι έγκυρη ημερομηνία σε μορφή YYYY-MM-DD',
@@ -137,9 +209,15 @@ return [
         'expected_checkin.date_format'  =>  'Το χαρακτηριστικό: πρέπει να είναι έγκυρη ημερομηνία σε μορφή YYYY-MM-DD',
         'start_date.date_format'        =>  'Το χαρακτηριστικό: πρέπει να είναι έγκυρη ημερομηνία σε μορφή YYYY-MM-DD',
         'end_date.date_format'          =>  'Το χαρακτηριστικό: πρέπει να είναι έγκυρη ημερομηνία σε μορφή YYYY-MM-DD',
+        'invalid_value_in_field' => 'Μη έγκυρη τιμή που περιλαμβάνεται σε αυτό το πεδίο',
 
-    ],
+        'ldap_username_field' => [
+            'not_in' =>         '<code>sAMAccountName</code> (mixed case) will likely not work. You should use <code>samaccountname</code> (lowercase) instead.'
+        ],
+        'ldap_auth_filter_query' => ['not_in' => '<code>uid=samaccountname</code> is probably not a valid auth filter. You probably want <code>uid=</code> '],
+        'ldap_filter' => ['regex' => 'This value should probably not be wrapped in parentheses.'],
 
+        ],
     /*
     |--------------------------------------------------------------------------
     | Custom Validation Attributes
@@ -155,8 +233,16 @@ return [
 
     /*
     |--------------------------------------------------------------------------
-    | Generic Validation Messages
+    | Generic Validation Messages - we use these in the jquery validation where we don't have
+    | access to the :attribute
     |--------------------------------------------------------------------------
     */
-    'invalid_value_in_field' => 'Μη έγκυρη τιμή που περιλαμβάνεται σε αυτό το πεδίο',
+
+    'generic' => [
+        'invalid_value_in_field' => 'Μη έγκυρη τιμή που περιλαμβάνεται σε αυτό το πεδίο',
+        'required' => 'This field is required',
+        'email' => 'Please enter a valid email address',
+    ],
+
+
 ];
diff --git a/resources/lang/en-GB/account/general.php b/resources/lang/en-GB/account/general.php
index 556f92db0c..d55d06c7b7 100644
--- a/resources/lang/en-GB/account/general.php
+++ b/resources/lang/en-GB/account/general.php
@@ -2,10 +2,16 @@
 
 return array(
     'personal_api_keys' => 'Personal API Keys',
+    'personal_access_token' => 'Personal Access Token',
+    'personal_api_keys_success' => 'Personal API Key :key created sucessfully',
+    'here_is_api_key' => 'Here is your new personal access token. This is the only time it will be shown so do not lose it! You may now use this token to make API requests.',
     'api_key_warning' => 'When generating an API token, be sure to copy it down immediately as they will not be visible to you again.',
     'api_base_url' => 'Your API base URL is located at:',
     'api_base_url_endpoint' => '/&lt;endpoint&gt;',
     'api_token_expiration_time' => 'API tokens are set to expire in:',
     'api_reference' => 'Please check the <a href="https://snipe-it.readme.io/reference" target="_blank">API reference</a> to find specific API endpoints and additional API documentation.',
     'profile_updated' => 'Account successfully updated',
+    'no_tokens' => 'You have not created any personal access tokens.',
+    'enable_sounds' => 'Enable sound effects',
+    'enable_confetti' => 'Enable confetti effects',
 );
diff --git a/resources/lang/en-GB/admin/accessories/message.php b/resources/lang/en-GB/admin/accessories/message.php
index 064dd56cc9..54b0f2dd5c 100644
--- a/resources/lang/en-GB/admin/accessories/message.php
+++ b/resources/lang/en-GB/admin/accessories/message.php
@@ -26,7 +26,11 @@ return array(
         'error'   		=> 'Accessory was not checked out, please try again',
         'success' 		=> 'Accessory checked out successfully.',
         'unavailable'   => 'Accessory is not available for checkout. Check quantity available',
-        'user_does_not_exist' => 'That user is invalid. Please try again.'
+        'user_does_not_exist' => 'That user is invalid. Please try again.',
+         'checkout_qty' => array(
+            'lte'  => 'There is currently only one available accessory of this type, and you are trying to check out :checkout_qty. Please adjust the checkout quantity or the total stock of this accessory and try again.|There are :number_currently_remaining total available accessories, and you are trying to check out :checkout_qty. Please adjust the checkout quantity or the total stock of this accessory and try again.',
+            ),
+           
     ),
 
     'checkin' => array(
diff --git a/resources/lang/en-GB/admin/accessories/table.php b/resources/lang/en-GB/admin/accessories/table.php
index e02d9f22e4..80df687161 100644
--- a/resources/lang/en-GB/admin/accessories/table.php
+++ b/resources/lang/en-GB/admin/accessories/table.php
@@ -6,6 +6,4 @@ return array(
     'id'      					=> 'ID',
     'require_acceptance'      	=> 'Acceptance',
     'title'      				=> 'Accessory Name',
-
-
 );
diff --git a/resources/lang/en-GB/admin/components/message.php b/resources/lang/en-GB/admin/components/message.php
index 0a7dd8d954..ec39dc4178 100644
--- a/resources/lang/en-GB/admin/components/message.php
+++ b/resources/lang/en-GB/admin/components/message.php
@@ -17,7 +17,8 @@ return array(
     'delete' => array(
         'confirm'   => 'Are you sure you wish to delete this component?',
         'error'   => 'There was an issue deleting the component. Please try again.',
-        'success' => 'The component was deleted successfully.'
+        'success' => 'The component was deleted successfully.',
+        'error_qty'   => 'Some components of this type are still checked out. Please check them in and try again.',
     ),
 
      'checkout' => array(
diff --git a/resources/lang/en-GB/admin/consumables/general.php b/resources/lang/en-GB/admin/consumables/general.php
index 7c6bb32968..29acfedc1b 100644
--- a/resources/lang/en-GB/admin/consumables/general.php
+++ b/resources/lang/en-GB/admin/consumables/general.php
@@ -8,4 +8,5 @@ return array(
     'remaining' 			            => 'Remaining',
     'total' 			                => 'Total',
     'update'                            => 'Update Consumable',
+    'inventory_warning'                 => 'The inventory of this consumable is below the minimum amount of :min_count',
 );
diff --git a/resources/lang/en-GB/admin/consumables/message.php b/resources/lang/en-GB/admin/consumables/message.php
index c0d0aa7f68..e2591503bf 100644
--- a/resources/lang/en-GB/admin/consumables/message.php
+++ b/resources/lang/en-GB/admin/consumables/message.php
@@ -2,6 +2,7 @@
 
 return array(
 
+    'invalid_category_type' => 'The category must be a consumable category.',
     'does_not_exist' => 'Consumable does not exist.',
 
     'create' => array(
diff --git a/resources/lang/en-GB/admin/custom_fields/general.php b/resources/lang/en-GB/admin/custom_fields/general.php
index 118ee67fb4..37eb114099 100644
--- a/resources/lang/en-GB/admin/custom_fields/general.php
+++ b/resources/lang/en-GB/admin/custom_fields/general.php
@@ -35,7 +35,7 @@ return [
     'create_field_title' => 'Create a new custom field',
     'value_encrypted'      	        => 'The value of this field is encrypted in the database. Only admin users will be able to view the decrypted value',
     'show_in_email'     => 'Include the value of this field in checkout emails sent to the user? Encrypted fields cannot be included in emails',
-    'show_in_email_short'     => 'Include in emails.',
+    'show_in_email_short' => 'Include in emails',
     'help_text' => 'Help Text',
     'help_text_description' => 'This is optional text that will appear below the form elements while editing an asset to provide context on the field.',
     'about_custom_fields_title' => 'About Custom Fields',
@@ -57,5 +57,8 @@ return [
     'show_in_requestable_list_short' => 'Show in requestable assets list',
     'show_in_requestable_list' => 'Show value in requestable assets list. Encrypted fields will not be shown',
     'encrypted_options' => 'This field is encrypted, so some display options will not be available.',
+    'display_checkin' => 'Display in checkin forms',
+    'display_checkout' => 'Display in checkout forms',
+    'display_audit' => 'Display in audit forms',
 
 ];
diff --git a/resources/lang/en-GB/admin/custom_fields/message.php b/resources/lang/en-GB/admin/custom_fields/message.php
index 43ba821821..6442359b7f 100644
--- a/resources/lang/en-GB/admin/custom_fields/message.php
+++ b/resources/lang/en-GB/admin/custom_fields/message.php
@@ -5,6 +5,7 @@ return array(
     'field' => array(
         'invalid'   => 'That field does not exist.',
         'already_added'   => 'Field already added',
+        'none_selected'   => 'No field selected',
 
         'create' => array(
             'error'   => 'Field was not created, please try again.',
diff --git a/resources/lang/en-GB/admin/depreciations/general.php b/resources/lang/en-GB/admin/depreciations/general.php
index 1a5666f9dc..90246e9cd8 100644
--- a/resources/lang/en-GB/admin/depreciations/general.php
+++ b/resources/lang/en-GB/admin/depreciations/general.php
@@ -13,4 +13,8 @@ return [
     'no_depreciations_warning'               => '<strong>Warning: </strong>
                       You do not currently have any depreciations set up.
                       Please set up at least one depreciation to view the depreciation report.',
+    'depreciation_method'                   => 'Depreciation Report',
+    'linear_depreciation'                   => 'Linear (Default)',
+    'half_1'                                => 'Half-year convention, always applied',
+    'half_2'                                => 'Half-year convention, applied with condition',
 ];
diff --git a/resources/lang/en-GB/admin/hardware/form.php b/resources/lang/en-GB/admin/hardware/form.php
index 0b5062fdae..f3bfea3d27 100644
--- a/resources/lang/en-GB/admin/hardware/form.php
+++ b/resources/lang/en-GB/admin/hardware/form.php
@@ -55,8 +55,11 @@ return [
     'asset_location_update_default' => 'Update only default location',
     'asset_location_update_actual' => 'Update only actual location',
     'asset_not_deployable' => 'That asset status is not deployable. This asset cannot be checked out.',
-    'asset_deployable' => 'That status is deployable. This asset can be checked out.',
+    'asset_not_deployable_checkin' => 'That asset status is not deployable. Using this status label will checkin the asset.',
+    'asset_deployable' => 'This asset can be checked out.',
     'processing_spinner' => 'Processing… (This might take a bit of time on large files)',
+    'processing' => 'Processing... ',
     'optional_infos'  => 'Optional Information',
-    'order_details'   => 'Order-related Information'
+    'order_details'   => 'Order-related Information',
+    'calc_eol'    => 'If nulling the EOL date, use automatic EOL calculation based on the purchase date and EOL rate.',
 ];
diff --git a/resources/lang/en-GB/admin/hardware/general.php b/resources/lang/en-GB/admin/hardware/general.php
index b69d045b51..ac3f6b21ae 100644
--- a/resources/lang/en-GB/admin/hardware/general.php
+++ b/resources/lang/en-GB/admin/hardware/general.php
@@ -5,8 +5,8 @@ return [
     'about_assets_text'            => 'Assets are items tracked by serial number or asset tag.  They tend to be higher value items where identifying a specific item matters.',
     'archived'  				=> 'Archived',
     'asset'  					=> 'Asset',
-    'bulk_checkout'             => 'Checkout Assets',
-    'bulk_checkin'              => 'Checkin Assets',
+    'bulk_checkout'             => 'Bulk Checkout',
+    'bulk_checkin'              => 'Bulk Checkin',
     'checkin'  					=> 'Checkin Asset',
     'checkout'  				=> 'Checkout Asset',
     'clone'  					=> 'Clone Asset',
@@ -27,8 +27,7 @@ return [
     'undeployable_tooltip'  	=> 'This asset has an undeployable status label, so cannot be checked out.',
     'view'  					=> 'View Asset',
     'csv_error' => 'You have an error in your CSV file:',
-    'import_text' => '<p>Upload a CSV that contains asset history. The assets and users MUST already exist in the system, or they will be skipped. Matching assets for history import happens against the asset tag. We will try to find a matching user based on the user\'s name you provide, and the criteria you select below. If you do not select any criteria below, it will simply try to match on the username format you configured in the <code>Admin &gt; General Settings</code>.</p><p>Fields included in the CSV must match the headers: <strong>Asset Tag, Name, Checkout Date, Checkin Date</strong>. Any additional fields will be ignored. </p><p>Checkin Date: blank or future checkin dates will checkout items to associated user.  Excluding the Checkin Date column will create a checkin date with todays date.</p>
-    ',
+    'import_text' => '<p>Upload a CSV that contains asset history. The assets and users MUST already exist in the system, or they will be skipped. Matching assets for history import happens against the asset tag. We will try to find a matching user based on the user\'s name you provide, and the criteria you select below. If you do not select any criteria below, it will simply try to match on the username format you configured in the <code>Admin &gt; General Settings</code>.</p><p>Fields included in the CSV must match the headers: <strong>Asset Tag, Name, Checkout Date, Checkin Date</strong>. Any additional fields will be ignored. </p><p>Checkin Date: blank or future checkin dates will checkout items to associated user.  Excluding the Checkin Date column will create a checkin date with todays date.</p>    ',
     'csv_import_match_f-l' => 'Try to match users by <strong>firstname.lastname</strong> (<code>jane.smith</code>) format',
     'csv_import_match_initial_last' => 'Try to match users by <strong>first initial last name</strong> (<code>jsmith</code>) format',
     'csv_import_match_first' => 'Try to match users by <strong>first name</strong> (<code>jane</code>) format',
diff --git a/resources/lang/en-GB/admin/hardware/message.php b/resources/lang/en-GB/admin/hardware/message.php
index 3af3dbc6e3..4d432719d2 100644
--- a/resources/lang/en-GB/admin/hardware/message.php
+++ b/resources/lang/en-GB/admin/hardware/message.php
@@ -2,19 +2,24 @@
 
 return [
 
-    'undeployable' 		=> '<strong>Warning: </strong> This asset has been marked as currently undeployable.
+    'undeployable' 		 => '<strong>Warning: </strong> This asset has been marked as currently undeployable.
                         If this status has changed, please update the asset status.',
-    'does_not_exist' 	=> 'Asset does not exist.',
-    'does_not_exist_var'=> 'Asset with tag :asset_tag not found.',
-    'no_tag' 	        => 'No asset tag provided.',
+    'does_not_exist' 	 => 'Asset does not exist.',
+    'does_not_exist_var' => 'Asset with tag :asset_tag not found.',
+    'no_tag' 	         => 'No asset tag provided.',
     'does_not_exist_or_not_requestable' => 'That asset does not exist or is not requestable.',
-    'assoc_users'	 	=> 'This asset is currently checked out to a user and cannot be deleted. Please check the asset in first, and then try deleting again. ',
+    'assoc_users'	 	 => 'This asset is currently checked out to a user and cannot be deleted. Please check the asset in first, and then try deleting again. ',
     'warning_audit_date_mismatch' 	=> 'This asset\'s next audit date (:next_audit_date) is before the last audit date (:last_audit_date). Please update the next audit date.',
+    'labels_generated'   => 'Labels were successfully generated.',
+    'error_generating_labels' => 'Error while generating labels.',
+    'no_assets_selected' => 'No assets selected.',
 
     'create' => [
         'error'   		=> 'Asset was not created, please try again. :(',
         'success' 		=> 'Asset created successfully. :)',
         'success_linked' => 'Asset with tag :tag was created successfully. <strong><a href=":link" style="color: white;">Click here to view</a></strong>.',
+        'multi_success_linked' => 'Asset with tag :links was created successfully.|:count assets were created succesfully. :links.',
+        'partial_failure' => 'An asset was unable to be created. Reason: :failures|:count assets were unable to be created. Reasons: :failures',
     ],
 
     'update' => [
@@ -52,20 +57,24 @@ return [
     ],
 
     'import' => [
+        'import_button'         => 'Process Import',
         'error'                 => 'Some items did not import correctly.',
         'errorDetail'           => 'The following Items were not imported because of errors.',
         'success'               => 'Your file has been imported',
         'file_delete_success'   => 'Your file has been been successfully deleted',
         'file_delete_error'      => 'The file was unable to be deleted',
         'file_missing' => 'The file selected is missing',
+        'file_already_deleted' => 'The file selected was already deleted',
         'header_row_has_malformed_characters' => 'One or more attributes in the header row contain malformed UTF-8 characters',
         'content_row_has_malformed_characters' => 'One or more attributes in the first row of content contain malformed UTF-8 characters',
+        'transliterate_failure' => 'Transliteration from :encoding to UTF-8 failed due to invalid characters in input'
     ],
 
 
     'delete' => [
         'confirm'   	=> 'Are you sure you wish to delete this asset?',
         'error'   		=> 'There was an issue deleting the asset. Please try again.',
+        'assigned_to_error' => '{1}Asset Tag: :asset_tag is currently checked out. Check in this device before deletion.|[2,*]Asset Tags: :asset_tag are currently checked out. Check in these devices before deletion.',
         'nothing_updated'   => 'No assets were selected, so nothing was deleted.',
         'success' 		=> 'The asset was deleted successfully.',
     ],
@@ -78,6 +87,11 @@ return [
         'no_assets_selected' => 'You must select at least one asset from the list',
     ],
 
+    'multi-checkout' => [
+        'error'   => 'Asset was not checked out, please try again|Assets were not checked out, please try again',
+        'success' => 'Asset checked out successfully.|Assets checked out successfully.',
+    ],
+
     'checkin' => [
         'error'   		=> 'Asset was not checked in, please try again',
         'success' 		=> 'Asset checked in successfully.',
@@ -87,9 +101,10 @@ return [
     ],
 
     'requests' => [
-        'error'   		=> 'Asset was not requested, please try again',
-        'success' 		=> 'Asset requested successfully.',
-        'canceled'      => 'Checkout request successfully canceled',
+        'error'   		=> 'Request was not successful, please try again.',
+        'success' 		=> 'Request successfully submitted.',
+        'canceled'      => 'Request successfully canceled.',
+        'cancel'        => 'Cancel this item request',
     ],
 
 ];
diff --git a/resources/lang/en-GB/admin/hardware/table.php b/resources/lang/en-GB/admin/hardware/table.php
index 92b228dccd..2d88c6c131 100644
--- a/resources/lang/en-GB/admin/hardware/table.php
+++ b/resources/lang/en-GB/admin/hardware/table.php
@@ -25,7 +25,6 @@ return [
     'image'		    => 'Device Image',
     'days_without_acceptance' => 'Days Without Acceptance',
     'monthly_depreciation' => 'Monthly Depreciation',
-    'assigned_to'    => 'Assigned To',
     'requesting_user' => 'Requesting User',
     'requested_date' => 'Requested Date',
     'changed'       => 'Changed',
diff --git a/resources/lang/en-GB/admin/kits/general.php b/resources/lang/en-GB/admin/kits/general.php
index 3afeb9c9b3..9e3db9323a 100644
--- a/resources/lang/en-GB/admin/kits/general.php
+++ b/resources/lang/en-GB/admin/kits/general.php
@@ -47,4 +47,5 @@ return [
     'kit_deleted'                       => 'Kit was successfully deleted',
     'kit_model_updated'                 => 'Model was successfully updated',
     'kit_model_detached'                => 'Model was successfully detached',
+    'model_already_attached'            => 'Model already attached to kit',
 ];
diff --git a/resources/lang/en-GB/admin/licenses/general.php b/resources/lang/en-GB/admin/licenses/general.php
index cf12a382ad..6feb8de61b 100644
--- a/resources/lang/en-GB/admin/licenses/general.php
+++ b/resources/lang/en-GB/admin/licenses/general.php
@@ -14,6 +14,7 @@ return array(
     'info'  					=> 'License Info',
     'license_seats'  			=> 'License Seats',
     'seat'  					=> 'Seat',
+    'seat_count'  				=> 'Seat :count',
     'seats'  					=> 'Seats',
     'software_licenses'  		=> 'Software Licenses',
     'user'  					=> 'User',
@@ -23,12 +24,12 @@ return array(
         [
             'checkin_all'           => [
                 'button'            => 'Check In All Seats',
-                'modal'             => 'This will action check in one seat. | This action will check in all :checkedout_seats_count seats for this licence.',
+                'modal'             => 'This action will checkin one seat. | This action will checkin all :checkedout_seats_count seats for this license.',
                 'enabled_tooltip'   => 'Check in ALL seats for this licence from both users and assets',
                 'disabled_tooltip'  => 'This is disabled because there are no seats currently checked out',
                 'disabled_tooltip_reassignable'  => 'This is disabled because the Licence is not re-assignable',
                 'success'           => 'Licence successfully checked in! | All licences were successfully checked in!',
-                'log_msg'           => 'Checked in via bulk licence checkout in licence GUI',
+                'log_msg'           => 'Checked in via bulk license checkin in license GUI',
             ],
 
             'checkout_all'              => [
@@ -46,6 +47,6 @@ return array(
             ],
     ],
 
-    'below_threshold' => 'There are only :remaining_count seats left for this license with a minimum quantity of :min_amt. You may want to consider purchasing more seats.',
+    'below_threshold' => 'There are only :remaining_count seats left for this licence with a minimum quantity of :min_amt. You may want to consider purchasing more seats.',
     'below_threshold_short' => 'This item is below the minimum required quantity.',
 );
diff --git a/resources/lang/en-GB/admin/licenses/message.php b/resources/lang/en-GB/admin/licenses/message.php
index 2ba5b4952f..bfe70eff5e 100644
--- a/resources/lang/en-GB/admin/licenses/message.php
+++ b/resources/lang/en-GB/admin/licenses/message.php
@@ -43,11 +43,14 @@ return array(
     'checkout' => array(
         'error'   => 'There was an issue checking out the license. Please try again.',
         'success' => 'The license was checked out successfully',
-        'not_enough_seats' => 'Not enough license seats available for checkout',
+        'not_enough_seats' => 'Not enough licence seats available for checkout',
+        'mismatch' => 'The license seat provided does not match the license',
+        'unavailable' => 'This seat is not available for checkout.',
     ),
 
     'checkin' => array(
         'error'   => 'There was an issue checking in the license. Please try again.',
+        'not_reassignable' => 'License not reassignable',
         'success' => 'The license was checked in successfully'
     ),
 
diff --git a/resources/lang/en-GB/admin/locations/message.php b/resources/lang/en-GB/admin/locations/message.php
index 8121b80687..b21c70ad89 100644
--- a/resources/lang/en-GB/admin/locations/message.php
+++ b/resources/lang/en-GB/admin/locations/message.php
@@ -3,11 +3,12 @@
 return array(
 
     'does_not_exist' => 'Location does not exist.',
-    'assoc_users'    => 'This location is not currently deletable because it is the location of record for at least one asset or user, has assets assigned to it, or is the parent location of another location. Please update your models to no longer reference this company and try again. ',
+    'assoc_users'    => 'This location is not currently deletable because it is the location of record for at least one asset or user, has assets assigned to it, or is the parent location of another location. Please update your records to no longer reference this location and try again ',
     'assoc_assets'	 => 'This location is currently associated with at least one asset and cannot be deleted. Please update your assets to no longer reference this location and try again. ',
     'assoc_child_loc'	 => 'This location is currently the parent of at least one child location and cannot be deleted. Please update your locations to no longer reference this location and try again. ',
     'assigned_assets' => 'Assigned Assets',
     'current_location' => 'Current Location',
+    'open_map' => 'Open in :map_provider_icon Maps',
 
 
     'create' => array(
@@ -20,6 +21,11 @@ return array(
         'success' => 'Location updated successfully.'
     ),
 
+    'restore' => array(
+        'error'   => 'Location was not restored, please try again',
+        'success' => 'Location restored successfully.'
+    ),
+
     'delete' => array(
         'confirm'   	=> 'Are you sure you wish to delete this location?',
         'error'   => 'There was an issue deleting the location. Please try again.',
diff --git a/resources/lang/en-GB/admin/locations/table.php b/resources/lang/en-GB/admin/locations/table.php
index ed3f96f6b4..53176d8a4e 100644
--- a/resources/lang/en-GB/admin/locations/table.php
+++ b/resources/lang/en-GB/admin/locations/table.php
@@ -39,4 +39,5 @@ return [
     'signed_by_finance_auditor' => 'Signed By (Finance Auditor):',
     'signed_by_location_manager' => 'Signed By (Location Manager):',
     'signed_by'                 => 'Signed Off By:',
+    'clone'  					=> 'Clone Location',
 ];
diff --git a/resources/lang/en-GB/admin/models/general.php b/resources/lang/en-GB/admin/models/general.php
index 7e4a77adbc..9a61b53fd0 100644
--- a/resources/lang/en-GB/admin/models/general.php
+++ b/resources/lang/en-GB/admin/models/general.php
@@ -3,7 +3,7 @@
 return array(
     'about_models_title'     => 'About Asset Models',
     'about_models_text'           => 'Asset Models are a way to group identical assets. "MBP 2013", "IPhone 6s", etc.',
-    'deleted'  					        => 'This model has been deleted.',
+    'deleted'  					=> 'This model has been deleted.',
     'bulk_delete'               => 'Bulk Delete Asset Models',
     'bulk_delete_help'               => 'Use the checkboxes below to confirm the deletion of the selected asset models. Asset models that have assets associated with them cannot be deleted until the assets are associated with a different model.',
     'bulk_delete_warn'          => 'You are about to delete one asset model.|You are about to delete :model_count asset models.',
diff --git a/resources/lang/en-GB/admin/models/message.php b/resources/lang/en-GB/admin/models/message.php
index cc38c54530..ae3bc34eed 100644
--- a/resources/lang/en-GB/admin/models/message.php
+++ b/resources/lang/en-GB/admin/models/message.php
@@ -7,7 +7,7 @@ return array(
     'no_association' => 'WARNING! The asset model for this item is invalid or missing!',
     'no_association_fix' => 'This will break things in weird and horrible ways. Edit this asset now to assign it a model.',
     'assoc_users'	 => 'This model is currently associated with one or more assets and cannot be deleted. Please delete the assets, and then try deleting again. ',
-
+    'invalid_category_type' => 'This category must be an asset category.',
 
     'create' => array(
         'error'   => 'Model was not created, please try again.',
diff --git a/resources/lang/en-GB/admin/reports/general.php b/resources/lang/en-GB/admin/reports/general.php
index 22888e28f6..f61b07b9b8 100644
--- a/resources/lang/en-GB/admin/reports/general.php
+++ b/resources/lang/en-GB/admin/reports/general.php
@@ -4,6 +4,7 @@ return [
     'info'   => 'Select the options you want for your asset report.',
     'deleted_user' => 'Deleted user',
     'send_reminder' => 'Send reminder',
+    'cannot_send_reminder' => 'User has been deleted or does not have an email address so cannot receive a reminder',
     'reminder_sent' => 'Reminder sent',
     'acceptance_deleted' => 'Acceptance request deleted',
     'acceptance_request' => 'Acceptance request',
@@ -13,5 +14,10 @@ return [
         'user_state' => 'User State',
         'user_country' => 'User Country',
         'user_zip' => 'User Postcode'
-    ]
-];
\ No newline at end of file
+    ],
+    'open_saved_template' => 'Open Saved Template',
+    'save_template' =>  'Save Template',
+    'select_a_template' => 'Select a Template',
+    'template_name' => 'Template Name',
+    'update_template' => 'Update Template',
+];
diff --git a/resources/lang/en-GB/admin/reports/message.php b/resources/lang/en-GB/admin/reports/message.php
index d4c8f8198f..2800bbdf0b 100644
--- a/resources/lang/en-GB/admin/reports/message.php
+++ b/resources/lang/en-GB/admin/reports/message.php
@@ -1,5 +1,16 @@
 <?php
 
-return array(
-    'error'   => 'You must select at least ONE option.'
-);
+return [
+    'about_templates' => 'About Saved Templates',
+    'saving_templates_description' => 'Select your options, then enter the name of your template in the box above and click the \'Save Template\' button. Use the dropdown to select a previously saved template.',
+    'create'  => [
+        'success' => 'Template saved successfully',
+    ],
+    'update' => [
+        'success' => 'Template updated successfully',
+    ],
+    'delete' => [
+        'success' => 'Template deleted',
+        'no_delete_permission' => 'Template does not exist or you do not have permission to delete it.',
+    ],
+];
diff --git a/resources/lang/en-GB/admin/settings/general.php b/resources/lang/en-GB/admin/settings/general.php
index 73cd5493f0..4b404b0afe 100644
--- a/resources/lang/en-GB/admin/settings/general.php
+++ b/resources/lang/en-GB/admin/settings/general.php
@@ -8,13 +8,13 @@ return [
     'ad_append_domain'          => 'Append domain name to username field',
     'ad_append_domain_help'     => 'User isn\'t required to write "username@domain.local", they can just type "username".',
     'admin_cc_email'            => 'CC Email',
-    'admin_cc_email_help'       => 'If you would like to send a copy of checkin/checkout emails that are sent to users to an additional email account, enter it here. Otherwise leave this field blank.',
+    'admin_cc_email_help'       => 'Send a copy of checkin/checkout emails to this address.',
     'admin_settings'            => 'Admin Settings',
     'is_ad'				        => 'This is an Active Directory server',
     'alerts'                	=> 'Alerts',
     'alert_title'               => 'Update Notification Settings',
     'alert_email'				=> 'Send alerts to',
-    'alert_email_help'    => 'Email addresses or distribution lists you want alerts to be sent to, comma separated',
+    'alert_email_help'          => 'Email addresses or distribution lists you want alerts to be sent to, comma separated.',
     'alerts_enabled'			=> 'Alerts Enabled',
     'alert_interval'			=> 'Expiring Alerts Threshold (in days)',
     'alert_inv_threshold'		=> 'Inventory Alert Threshold',
@@ -31,15 +31,18 @@ return [
     'backups'					=> 'Backups',
     'backups_help'              => 'Create, Download &amp; Restore Backups',
     'backups_restoring'         => 'Restoring from Backup',
+    'backups_clean' => 'Clean the backed-up database before restore',
+    'backups_clean_helptext' => "This can be useful if you're changing between database versions",
     'backups_upload'            => 'Upload Backup',
     'backups_path'              => 'Backups on the server are stored in <code>:path</code>',
-    'backups_restore_warning'   => 'Use the restore button <small><span class="btn btn-xs btn-warning"><i class="text-white fas fa-retweet" aria-hidden="true"></i></span></small> to restore from a previous backup. (This does not currently work with S3 file storage or Docker.)<br><br>Your <strong>entire :app_name database and any uploaded files will be completely replaced</strong> by what\'s in the backup file.  ',
+    'backups_restore_warning'   => 'Use the restore button <small><span class="btn btn-xs btn-warning"><i class="text-white fas fa-retweet" aria-hidden="true"></i></span></small> to restore from a previous backup. (This does not currently work with S3 file storage or Docker.)<br><br>Your <strong>entire :app_name database and any uploaded files will be completely replaced</strong> by what\'s in the backup file  ',
     'backups_logged_out'         => 'All existing users, including you, will be logged out once your restore is complete.',
     'backups_large'             => 'Very large backups may time out on the restore attempt and may still need to be run via command line. ',
     'barcode_settings'			=> 'Barcode Settings',
     'confirm_purge'			    => 'Confirm Purge',
     'confirm_purge_help'		=> 'Enter the text "DELETE" in the box below to purge your deleted records. This action cannot be undone and will PERMANENTLY delete all soft-deleted items and users. (You should make a backup first, just to be safe.)',
     'custom_css'				=> 'Custom CSS',
+    'custom_css_placeholder'	=> 'Add your custom CSS',
     'custom_css_help'			=> 'Enter any custom CSS overrides you would like to use. Do not include the &lt;style&gt;&lt;/style&gt; tags.',
     'custom_forgot_pass_url'	=> 'Custom Password Reset URL',
     'custom_forgot_pass_url_help'	=> 'This replaces the built-in forgotten password URL on the login screen, useful to direct people to internal or hosted LDAP password reset functionality. It will effectively disable local user forgotten password functionality.',
@@ -47,34 +50,34 @@ return [
     'dashboard_message_help'	=> 'This text will appear on the dashboard for anyone with permission to view the dashboard.',
     'default_currency'  		=> 'Default Currency',
     'default_eula_text'			=> 'Default EULA',
+    'default_eula_text_placeholder' => 'Add your default EULA text',
     'default_language'			=> 'Default Language',
     'default_eula_help_text'	=> 'You can also associate custom EULAs to specific asset categories.',
     'acceptance_note'           => 'Add a note for your decision (Optional)',
     'display_asset_name'        => 'Display Asset Name',
     'display_checkout_date'     => 'Display Checkout Date',
     'display_eol'               => 'Display EOL in table view',
-    'display_qr'                => 'Display 3D Codes',
+    'display_qr'                => 'Display 2D barcode',
     'display_alt_barcode'		=> 'Display 1D barcode',
-    'email_logo'                => 'Email Logo',
     'barcode_type'				=> '2D Barcode Type',
     'alt_barcode_type'			=> '1D barcode type',
-    'email_logo_size'       => 'Square logos in email look best. ',
     'enabled'                   => 'Enabled',
     'eula_settings'				=> 'EULA Settings',
     'eula_markdown'				=> 'This EULA allows <a href="https://help.github.com/articles/github-flavored-markdown/">Github flavored markdown</a>.',
+    'empty_row_count'           => 'Field Start Offset (Empty Rows)',
+    'empty_row_count_help'      => 'Fields will begin populating after this many empty rows are skipped at the top of the label.',
     'favicon'                   => 'Favicon',
     'favicon_format'            => 'Accepted filetypes are ico, png, and gif. Other image formats may not work in all browsers.',
     'favicon_size'          => 'Favicons should be square images, 16x16 pixels.',
     'footer_text'               => 'Additional Footer Text ',
     'footer_text_help'          => 'This text will appear in the right-side footer. Links are allowed using <a href="https://help.github.com/articles/github-flavored-markdown/">Github flavoured markdown</a>. Line breaks, headers, images, etc may result in unpredictable results.',
+    'footer_text_placeholder'   => 'Optional footer text',
     'general_settings'			=> 'General Settings',
-    'general_settings_keywords' => 'company support, signature, acceptance, email format, username format, images, per page, thumbnail, eula, gravatar, tos, dashboard, privacy',
     'general_settings_help'     => 'Default EULA and more',
     'generate_backup'			=> 'Generate Backup',
     'google_workspaces'         => 'Google Workspaces',
     'header_color'              => 'Header Color',
     'info'                      => 'These settings let you customize certain aspects of your installation.',
-    'label_logo'                => 'Label Logo',
     'label_logo_size'           => 'Square logos look best - will be displayed in the top right of each asset label. ',
     'laravel'                   => 'Laravel Version',
     'ldap'                      => 'LDAP',
@@ -94,7 +97,7 @@ return [
     'ldap_login_sync_help'      => 'This only tests that LDAP can sync correctly. If your LDAP Authentication query is not correct, users may still not be able to login. YOU MUST SAVE YOUR UPDATED LDAP SETTINGS FIRST.',
     'ldap_manager'              => 'LDAP Manager',
     'ldap_server'               => 'LDAP Server',
-    'ldap_server_help'          => 'This should start with ldap:// (for unencrypted or TLS) or ldaps:// (for SSL)',
+    'ldap_server_help'          => 'This should start with ldap:// (for unencrypted) or ldaps:// (for TLS or SSL)',
     'ldap_server_cert'			=> 'LDAP SSL certificate validation',
     'ldap_server_cert_ignore'	=> 'Allow invalid SSL Certificate',
     'ldap_server_cert_help'		=> 'Select this checkbox if you are using a self signed SSL cert and would like to accept an invalid SSL certificate.',
@@ -108,8 +111,8 @@ return [
     'ldap_pword'                => 'LDAP Bind Password',
     'ldap_basedn'               => 'Base Bind DN',
     'ldap_filter'               => 'LDAP Filter',
-    'ldap_pw_sync'              => 'LDAP Password Sync',
-    'ldap_pw_sync_help'         => 'Uncheck this box if you do not wish to keep LDAP passwords synced with local passwords. Disabling this means that your users may not be able to login if your LDAP server is unreachable for some reason.',
+    'ldap_pw_sync'              => 'Cache LDAP Passwords',
+    'ldap_pw_sync_help'         => 'Uncheck this box if you do not wish to keep LDAP passwords cached as local hashed passwords. Disabling this means that your users may not be able to login if your LDAP server is unreachable for some reason.',
     'ldap_username_field'       => 'Username Field',
     'ldap_lname_field'          => 'Last Name',
     'ldap_fname_field'          => 'LDAP First Name',
@@ -117,13 +120,15 @@ return [
     'ldap_version'              => 'LDAP Version',
     'ldap_active_flag'          => 'LDAP Active Flag',
     'ldap_activated_flag_help'  => 'This value is used to determine whether a synced user can login to Snipe-IT. <strong>It does not affect the ability to check items in or out to them</strong>, and should be the <strong>attribute name</strong> within your AD/LDAP, <strong>not the value</strong>. <br><br>If this field is set to a field name that does not exist in your AD/LDAP, or the value in the AD/LDAP field is set to <code>0</code> or <code>false</code>, <strong>user login will be disabled</strong>. If the value in the AD/LDAP field is set to <code>1</code> or <code>true</code> or <em>any other text</em> means the user can log in. When the field is blank in your AD, we respect the <code>userAccountControl</code> attribute, which usually allows non-suspended users to log in.',
+    'ldap_invert_active_flag'   => 'LDAP Invert Active Flag',
+    'ldap_invert_active_flag_help'     => 'If enabled: when the value returned by LDAP Active Flag is <code>0</code> or <code>false</code> the user account will be active.',
     'ldap_emp_num'              => 'LDAP Employee Number',
     'ldap_email'                => 'LDAP Email',
     'ldap_test'                 => 'Test LDAP',
     'ldap_test_sync'            => 'Test LDAP Synchronization',
     'license'                   => 'Software License',
-    'load_remote'               => 'Use Gravatar',
-    'load_remote_help_text'		=> 'Uncheck this box if your install cannot load scripts from the outside internet. This will prevent Snipe-IT from trying load images from Gravatar.',
+    'load_remote'               => 'Load Remote Avatars',
+    'load_remote_help_text'		=> 'Uncheck this box if your install cannot load scripts from the outside internet. This will prevent Snipe-IT from trying load avatars from Gravatar or other outside sources.',
     'login'                     => 'Login Attempts',
     'login_attempt'             => 'Login Attempt',
     'login_ip'                  => 'IP Address',
@@ -131,6 +136,7 @@ return [
     'login_user_agent'          => 'User Agent',
     'login_help'                => 'List of attempted logins',
     'login_note'                => 'Login Note',
+    'login_note_placeholder'            => "If you do not have a login or have found a device belonging to this company, please call technical support at 888-555-1212. Thank you.",
     'login_note_help'           => 'Optionally include a few sentences on your login screen, for example to assist people who have found a lost or stolen device. This field accepts <a href="https://help.github.com/articles/github-flavored-markdown/">Github flavored markdown</a>',
     'login_remote_user_text'    => 'Remote User login options',
     'login_remote_user_enabled_text' => 'Enable Login with Remote User Header',
@@ -146,13 +152,16 @@ return [
     'logo_print_assets_help'    => 'Use branding on printable asset lists ',
     'full_multiple_companies_support_help_text' => 'Restricting users (including admins) assigned to companies to their company\'s assets.',
     'full_multiple_companies_support_text' => 'Full Multiple Companies Support',
+    'scope_locations_fmcs_support_text'  => 'Scope Locations with Full Multiple Companies Support',
+    'scope_locations_fmcs_support_help_text'  => 'Restrict locations to their selected company.',
+    'scope_locations_fmcs_check_button' => 'Check Compatibility',
+    'scope_locations_fmcs_support_disabled_text'  => 'This option is disabled because you have conflicting locations set for :count or more items.',
     'show_in_model_list'   => 'Show in Model Dropdowns',
     'optional'					=> 'optional',
     'per_page'                  => 'Results Per Page',
     'php'                       => 'PHP Version',
-    'php_info'                  => 'PHP Info',
+    'php_info'                  => 'PHP info',
     'php_overview'              => 'PHP',
-    'php_overview_keywords'     => 'phpinfo, system, info',
     'php_overview_help'         => 'PHP System info',
     'php_gd_info'               => 'You must install php-gd to display QR codes, see install instructions.',
     'php_gd_warning'            => 'PHP Image Processing and GD plugin is NOT installed.',
@@ -218,6 +227,8 @@ return [
     'webhook_integration_help'    => ':app integration is optional, however the endpoint and channel are required if you wish to use it. To configure :app integration, you must first <a href=":webhook_link" target="_new" rel="noopener">create an incoming webhook</a> on your :app account. Click on the <strong>Test :app Integration</strong> button to confirm your settings are correct before saving. ',
     'webhook_integration_help_button'    => 'Once you have saved your :app information, a test button will appear.',
     'webhook_test_help'           => 'Test whether your :app integration is configured correctly. YOU MUST SAVE YOUR UPDATED :app SETTINGS FIRST.',
+    'shortcuts_enabled'         => 'Enable Shortcuts',
+    'shortcuts_help_text'       => '<strong>Windows</strong>: Alt + Access key, <strong>Mac</strong>: Control + Option + Access key',
     'snipe_version'  			=> 'Snipe-IT version',
     'support_footer'            => 'Support Footer Links ',
     'support_footer_help'       => 'Specify who sees the links to the Snipe-IT Support info and Users Manual',
@@ -227,7 +238,6 @@ return [
     'update'                    => 'Update Settings',
     'value'                     => 'Value',
     'brand'                     => 'Branding',
-    'brand_keywords'            => 'footer, logo, print, theme, skin, header, colours, colour, css',
     'brand_help'                => 'Logo, Site Name & Skin',
     'web_brand'                 => 'Web Branding Type',
     'about_settings_title'      => 'About Settings',
@@ -276,6 +286,8 @@ return [
     'two_factor_enrollment_text'	=> "Two factor authentication is required, however your device has not been enrolled yet. Open your Google Authenticator app and scan the QR code below to enroll your device. Once you've enrolled your device, enter the code below",
     'require_accept_signature'      => 'Require Signature',
     'require_accept_signature_help_text'      => 'Enabling this feature will require users to physically sign off on accepting an asset.',
+    'require_checkinout_notes'  => 'Require Notes on Checkin/Checkout',
+    'require_checkinout_notes_help_text'    => 'Enabling this feature will require the note fields to be populated when checking in or checking out an asset.',
     'left'        => 'left',
     'right'        => 'right',
     'top'        => 'top',
@@ -313,24 +325,24 @@ return [
     'filter_by_keyword' => 'Filter by setting keyword',
     'security' => 'Security',
     'security_title' => 'Update Security Settings',
-    'security_keywords' => 'password, passwords, requirements, two factor, two-factor, common passwords, remote login, logout, authentication',
     'security_help' => 'Two-Factor, Password Restrictions',
-    'groups_keywords' => 'permissions, permission groups, authorization',
     'groups_help' => 'Account Permission Groups',
     'localization' => 'Localization',
     'localization_title' => 'Update Localization Settings',
-    'localization_keywords' => 'localization, currency, local, locale, time zone, timezone, international, internatinalization, language, languages, translation',
     'localization_help' => 'Language, Date & Currency Display',
     'notifications' => 'Notifications',
     'notifications_help' => 'Email Alerts & Audit Settings',
     'asset_tags_help' => 'Incrementing and prefixes',
     'labels' => 'Labels',
     'labels_title' => 'Update Label Settings',
-    'labels_help' => 'Label sizes &amp; settings',
-    'purge_keywords' => 'permanently delete',
+    'labels_help' => 'Barcodes &amp; label settings',
     'purge_help' => 'Purge Deleted Records',
     'ldap_extension_warning' => 'It does not look like the LDAP extension is installed or enabled on this server. You can still save your settings, but you will need to enable the LDAP extension for PHP before LDAP syncing or login will work.',
     'ldap_ad' => 'LDAP/AD',
+    'ldap_test_label' => 'Test LDAP Sync',
+    'ldap_test_login' => ' Test LDAP Login',
+    'ldap_username_placeholder' => 'LDAP Username',
+    'ldap_password_placeholder' => 'LDAP Password',
     'employee_number' => 'Employee Number',
     'create_admin_user' => 'Create a User ::',
     'create_admin_success' => 'Success! Your admin user has been added!',
@@ -342,6 +354,8 @@ return [
     'setup_migration_create_user' => 'Next: Create User',
     'ldap_settings_link' => 'LDAP Settings Page',
     'slack_test' => 'Test <i class="fab fa-slack"></i> Integration',
+    'status_label_name' => 'Status Label Name',
+    'super_admin_only'  => 'Super Admin Only',
     'label2_enable'           => 'New Label Engine',
     'label2_enable_help'      => 'Switch to the new label engine. <b>Note: You will need to save this setting before setting others.</b>',
     'label2_template'         => 'Template',
@@ -356,12 +370,15 @@ return [
     'label2_2d_type'          => '2D Barcode Type',
     'label2_2d_type_help'     => 'Format for 2D barcodes',
     'label2_2d_target'        => '2D Barcode Target',
-    'label2_2d_target_help'   => 'The URL the 2D barcode points to when scanned',
+    'label2_2d_target_help'   => 'The data that will be contained in the 2D barcode',
     'label2_fields'           => 'Field Definitions',
     'label2_fields_help'      => 'Fields can be added, removed, and reordered in the left column. For each field, multiple options for Label and DataSource can be added, removed, and reordered in the right column.',
+    'purge_barcodes' => 'Purge Barcodes',
     'help_asterisk_bold'    => 'Text entered as <code>**text**</code> will be displayed as bold',
     'help_blank_to_use'     => 'Leave blank to use the value from <code>:setting_name</code>',
     'help_default_will_use' => '<code>:default</code> will use the value from <code>:setting_name</code>. <br>Note that the value of the barcodes must comply with the respective barcode spec in order to be successfully generated. Please see <a href="https://snipe-it.readme.io/docs/barcodes">the documentation <i class="fa fa-external-link"></i></a> for more details. ',
+    'asset_id'              => 'Asset ID',
+    'data'               => 'Data',
     'default'               => 'Default',
     'none'                  => 'None',
     'google_callback_help' => 'This should be entered as the callback URL in your Google OAuth app settings in your organization&apos;s <strong><a href="https://console.cloud.google.com/" target="_blank">Google developer console <i class="fa fa-external-link" aria-hidden="true"></i></a></strong>.',
@@ -373,7 +390,100 @@ return [
     'database_driver' => 'Database Driver',
     'bs_table_storage' => 'Table Storage',
     'timezone' => 'Timezone',
+    'test_mail' => 'Test Mail',
     'profile_edit'          => 'Edit Profile',
     'profile_edit_help'          => 'Allow users to edit their own profiles.',
+    'default_avatar' => 'Custom Default Avatar',
+    'default_avatar_help' => 'This image will be displayed as a profile if a user does not have a profile photo.',
+    'restore_default_avatar' => 'Restore <a href=":default_avatar" data-toggle="lightbox" data-type="image">original system default avatar</a>',
+    'restore_default_avatar_help' => '',
+    'due_checkin_days' => 'Due For Checkin Warning',
+    'due_checkin_days_help' => 'How many days before the expected checkin of an asset should it be listed in the "Due for checkin" page?',
+    'no_groups' => 'No groups have been created yet. Visit <code>Admin Settings > Permission Groups</code> to add one.',
+    'text' => 'Text',
+
+    'username_formats' => [
+        'username_format'		=> 'Username Format',
+        'firstname_lastname_format'	=> 'First Name Last Name (jane.smith)',
+        'first_name_format'	        => 'First Name (jane)',
+        'last_name_format'		=> 'Last Name (doe)',
+        'filastname_format'			=> 'First Initial Last Name (jsmith)',
+        'lastnamefirstinitial_format' =>  'Last Name First Initial (smithj)',
+        'firstname_lastname_underscore_format' => 'First Name Last Name (jane_smith)',
+        'firstinitial.lastname' => 'First Initial Last Name (j.smith)',
+        'lastname_firstinitial' => 'Last Name First Initial (smith_j)',
+        'lastname_dot_firstinitial_format' => 'Last Name First Initial (smith.j)',
+        'firstnamelastname'     => 'First Name Last Name (janesmith)',
+        'firstnamelastinitial'  => 'First Name Last Initial (janes)',
+        'lastnamefirstname'      => 'Last Name.First Name (smith.jane)',
+    ],
+
+    'email_formats' => [
+        'email_format'			=> 'Email Format',
+        'firstname_lastname_format'	=> 'First Name Last Name (jane.smith@example.com)',
+        'first_name_format'		=> 'First Name (jane@example.com)',
+        'last_name_format'		=> 'Last Name (doe@example.com)',
+        'filastname_format'			=> 'First Initial Last Name (jsmith@example.com)',
+        'lastnamefirstinitial_format' =>  'Last Name First Initial (smithj@example.com)',
+        'firstname_lastname_underscore_format' => 'First Name Last Name (jane_smith@example.com)',
+        'firstinitial.lastname' => 'First Initial Last Name (j.smith@example.com)',
+        'lastname_firstinitial' => 'Last Name First Initial (smith_j@example.com)',
+        'lastname_dot_firstinitial_format' => 'Last Name First Initial (smith.j@example.com)',
+        'firstnamelastname'     => 'First Name Last Name (janesmith@example.com)',
+        'firstnamelastinitial'  => 'First Name Last Initial (janes@example.com)',
+        'lastnamefirstname'      => 'Last Name.First Name (smith.jane@example.com)',
+    ],
+
+
+
+    'logo_labels' => [
+        'acceptance_pdf_logo'       => 'PDF Logo',
+        'email_logo'                => 'Email Logo',
+        'label_logo'                => 'Label Logo',
+        'logo'                      => 'Site Logo',
+        'favicon'                   => 'Favicon',
+    ],
+
+    'logo_help' => [
+        'email_logo_size'       => 'Square logos in email look best. ',
+    ],
+
+    'logo_option_types' => [
+        'text' => 'Text',
+        'logo' => 'Logo',
+        'logo_and_text' => 'Logo and Text',
+    ],
+
+
+    'legends' => [
+        'scoping' => 'Scoping',
+        'formats' => 'Default Formats',
+        'profiles' => 'User Profiles',
+        'eula' => 'EULA & Acceptance Preferences',
+        'misc_display' => 'Miscellaneous Display Options',
+        'email' => 'Email Preferences',
+        'checkin' => 'Checkin Preferences',
+        'dashboard' => 'Login & Dashboard Preferences',
+        'misc' => 'Miscellaneous',
+        'logos' => 'Logos & Display',
+        'colors' => 'Colors & Skins',
+        'footer' => 'Footer Preferences',
+        'security' => 'Security Preferences',
+        'general' => 'General',
+        'intervals' => 'Intervals & Thresholds',
+    ],
+
+
+    /* Keywords for settings overview help */
+    'keywords' => [
+        'brand'             => 'footer, logo, print, theme, skin, header, colours, colour, css',
+        'general_settings'  => 'company support, signature, acceptance, email format, username format, images, per page, thumbnail, eula, gravatar, tos, dashboard, privacy',
+        'groups'            => 'permissions, permission groups, authorization',
+        'labels'            => 'labels, barcodes, barcode, sheets, print, upc, qr, 1d, 2d',
+        'localization'      => 'localization, currency, local, locale, time zone, timezone, international, internatinalization, language, languages, translation',
+        'php_overview'      => 'phpinfo, system, info',
+        'purge'             => 'permanently delete',
+        'security'          => 'password, passwords, requirements, two factor, two-factor, common passwords, remote login, logout, authentication',
+    ],
 
 ];
diff --git a/resources/lang/en-GB/admin/settings/message.php b/resources/lang/en-GB/admin/settings/message.php
index c9b0f34217..58abf14c5c 100644
--- a/resources/lang/en-GB/admin/settings/message.php
+++ b/resources/lang/en-GB/admin/settings/message.php
@@ -14,6 +14,9 @@ return [
         'restore_warning'       => 'Yes, restore it. I acknowledge that this will overwrite any existing data currently in the database. This will also log out all of your existing users (including you).',
         'restore_confirm'       => 'Are you sure you wish to restore your database from :filename?'
     ],
+    'restore' => [
+        'success'               => 'Your system backup has been restored. Please log in again.'
+    ],
     'purge' => [
         'error'     => 'An error has occurred while purging. ',
         'validation_failed'     => 'Your purge confirmation is incorrect. Please type the word "DELETE" in the confirmation box.',
@@ -33,6 +36,9 @@ return [
         'testing_authentication' => 'Testing LDAP Authentication...',
         'authentication_success' => 'User authenticated against LDAP successfully!'
     ],
+    'labels' => [
+        'null_template' => 'Label template not found. Please select a template.',
+        ],
     'webhook' => [
         'sending' => 'Sending :app test message...',
         'success' => 'Your :webhook_name Integration works!',
@@ -42,5 +48,12 @@ return [
         'error' => 'Something went wrong. :app responded with: :error_message',
         'error_redirect' => 'ERROR: 301/302 :endpoint returns a redirect. For security reasons, we don’t follow redirects. Please use the actual endpoint.',
         'error_misc' => 'Something went wrong. :( ',
-    ]
+        'webhook_fail' => ' webhook notification failed: Check to make sure the URL is still valid.',
+        'webhook_channel_not_found' => ' webhook channel not found.',
+        'ms_teams_deprecation' => 'The selected Microsoft Teams webhook URL will be deprecated Dec 31st, 2025. Please use a workflow URL. Microsoft\'s documentation on creating a workflow can be found <a href="https://support.microsoft.com/en-us/office/create-incoming-webhooks-with-workflows-for-microsoft-teams-8ae491c7-0394-4861-ba59-055e33f75498" target="_blank"> here.</a>',
+    ],
+    'location_scoping' => [
+        'not_saved' => 'Your settings were not saved.',
+        'mismatch' => 'There is 1 item in the database that need your attention before you can enable location scoping.|There are :count items in the database that need your attention before you can enable location scoping.',
+    ],
 ];
diff --git a/resources/lang/en-GB/admin/statuslabels/table.php b/resources/lang/en-GB/admin/statuslabels/table.php
index 27befb5ef7..1a0fab891e 100644
--- a/resources/lang/en-GB/admin/statuslabels/table.php
+++ b/resources/lang/en-GB/admin/statuslabels/table.php
@@ -1,14 +1,14 @@
 <?php
 
 return array(
-    'about'      	=> 'About Status Labels',
+    'about'      	=> 'About Status Types',
     'archived'      	=> 'Archived',
     'create'      	=> 'Create Status Label',
     'color'      	=> 'Chart Color',
     'default_label' => 'Default Label',
     'default_label_help' => 'This is used to ensure your most commonly used status labels appear at the top of the select box when creating/editing assets.',
     'deployable'      	=> 'Deployable',
-    'info'      	=> 'Status labels are used to describe the various states your assets could be in. They may be out for repair, lost/stolen, etc. You can create new status labels for deployable, pending and archived assets.',
+    'info'      	=> 'Status label types are used to describe the various states your assets could be in. They may be out for repair, lost/stolen, etc. You can create new status labels for your deployable, pending and archived assets according to your own workflow. For more information, <a href="https://snipe-it.readme.io/docs/overview#status-labels" target="_blank">see the documentation <i class="fa fa-external-link"></i></a>.',
     'name'      	=> 'Status Name',
     'pending'      	=> 'Pending',
     'status_type'   => 'Status Type',
diff --git a/resources/lang/en-GB/admin/users/general.php b/resources/lang/en-GB/admin/users/general.php
index e195e2d52a..b374a36fc8 100644
--- a/resources/lang/en-GB/admin/users/general.php
+++ b/resources/lang/en-GB/admin/users/general.php
@@ -19,6 +19,8 @@ return [
     'print_assigned'    => 'Print All Assigned',
     'email_assigned'    => 'Email List of All Assigned',
     'user_notified'     => 'User has been emailed a list of their currently assigned items.',
+    'users_notified'    => 'The user has been emailed a list of their currently assigned items.|:count users have been emailed a list of their currently assigned items.',
+    'users_notified_warning' => ':count user has been emailed a list of their currently assigned items, however :no_email users did not have an email address so could not be emailed.|:count users have been emailed a list of their currently assigned items, however :no_email user(s) did not have an email address so could not be emailed.',
     'auto_assign_label' => 'Include this user when auto-assigning eligible licences',
     'auto_assign_help'  => 'Skip this user in auto assignment of licences',
     'software_user'     => 'Software Checked out to :name',
diff --git a/resources/lang/en-GB/admin/users/message.php b/resources/lang/en-GB/admin/users/message.php
index 8bb5f85018..7383163043 100644
--- a/resources/lang/en-GB/admin/users/message.php
+++ b/resources/lang/en-GB/admin/users/message.php
@@ -6,7 +6,7 @@ return array(
     'declined'                  => 'You have successfully declined this asset.',
     'bulk_manager_warn'	        => 'Your users have been successfully updated, however your manager entry was not saved because the manager you selected was also in the user list to be edited, and users may not be their own manager. Please select your users again, excluding the manager.',
     'user_exists'               => 'User already exists!',
-    'user_not_found'            => 'User does not exist.',
+    'user_not_found'            => 'User does not exist or you do not have permission view them.',
     'user_login_required'       => 'The login field is required',
     'user_has_no_assets_assigned' => 'No assets currently assigned to user.',
     'user_password_required'    => 'The password is required.',
@@ -38,7 +38,7 @@ return array(
         'delete' => 'There was an issue deleting the user. Please try again.',
         'delete_has_assets' => 'This user has items assigned and could not be deleted.',
         'delete_has_assets_var' => 'This user still has an asset assigned. Please check it in first.|This user still has :count assets assigned. Please check their assets in first.',
-        'delete_has_licenses_var' => 'This user still has a license seats assigned. Please check it in first.|This user still has :count license seats assigned. Please check them in first.',
+        'delete_has_licenses_var' => 'This user still has a licence seats assigned. Please check it in first.|This user still has :count licence seats assigned. Please check them in first.',
         'delete_has_accessories_var' => 'This user still has an accessory assigned. Please check it in first.|This user still has :count accessories assigned. Please check their assets in first.',
         'delete_has_locations_var' => 'This user still manages a location. Please select another manager first.|This user still manages :count locations. Please select another manager first.',
         'delete_has_users_var' => 'This user still manages another user. Please select another manager for that user first.|This user still manages :count users. Please select another manager for them first.',
@@ -53,6 +53,7 @@ return array(
         'ldap_could_not_search' => 'Could not search the LDAP server. Please check your LDAP server configuration in the LDAP config file. <br>Error from LDAP Server:',
         'ldap_could_not_get_entries' => 'Could not get entries from the LDAP server. Please check your LDAP server configuration in the LDAP config file. <br>Error from LDAP Server:',
         'password_ldap' => 'The password for this account is managed by LDAP/Active Directory. Please contact your IT department to change your password. ',
+        'multi_company_items_assigned' => 'This user has items assigned that belong to a different company. Please check them in or edit their company.'
     ),
 
     'deletefile' => array(
diff --git a/resources/lang/en-GB/admin/users/table.php b/resources/lang/en-GB/admin/users/table.php
index 1186f86194..983d16237f 100644
--- a/resources/lang/en-GB/admin/users/table.php
+++ b/resources/lang/en-GB/admin/users/table.php
@@ -22,7 +22,7 @@ return array(
     'managed_locations'     => 'Managed Locations',
     'managed_users'         => 'Managed Users',
     'name' 					=> 'Name',
-    'nogroup'               => 'No groups have been created yet. To add one, visit: ',
+    'nogroup'               => 'No groups have been created yet. To add one, visit:',
     'notes'                 => 'Notes',
     'password_confirm' 		=> 'Confirm Password',
     'password' 				=> 'Password',
diff --git a/resources/lang/en-GB/auth.php b/resources/lang/en-GB/auth.php
index db310aa1bb..14d8acfce0 100644
--- a/resources/lang/en-GB/auth.php
+++ b/resources/lang/en-GB/auth.php
@@ -15,6 +15,6 @@ return array(
 
     'failed' => 'These credentials do not match our records.',
     'password' => 'The provided password is incorrect.',
-    'throttle' => 'Too many login attempts. Please try again in :seconds seconds.',
+    'throttle' => 'Too many login attempts. Please try again in :minutes minute(s).',
 
 );
diff --git a/resources/lang/en-GB/auth/message.php b/resources/lang/en-GB/auth/message.php
index 588c9069ca..08f638d058 100644
--- a/resources/lang/en-GB/auth/message.php
+++ b/resources/lang/en-GB/auth/message.php
@@ -6,8 +6,6 @@ return array(
     'account_not_found'      => 'The username or password is incorrect.',
     'account_not_activated'  => 'This user account is not activated.',
     'account_suspended'      => 'This user account is suspended.',
-    'account_banned'         => 'This user account is banned.',
-    'throttle'               => 'Too many failed login attempts. Please try again in :minutes minutes.',
 
     'two_factor' => array(
         'already_enrolled'      => 'Your device is already enrolled.',
diff --git a/resources/lang/en-GB/button.php b/resources/lang/en-GB/button.php
index 22821b8157..8a838e8faf 100644
--- a/resources/lang/en-GB/button.php
+++ b/resources/lang/en-GB/button.php
@@ -7,6 +7,7 @@ return [
     'checkin_and_delete'  	    => 'Checkin All / Delete User',
     'delete'  	                => 'Delete',
     'edit'    	                => 'Edit',
+    'clone'    	                => 'Clone',
     'restore' 	                => 'Restore',
     'remove'                    => 'Remove',
     'request'                   => 'Request',
@@ -21,4 +22,13 @@ return [
     'add_maintenance'           => 'Add Maintenance',
     'append'                    => 'Append',
     'new'                       => 'New',
+    'var' => [
+        'clone'     => 'Clone :item_type',
+        'edit'      => 'Edit :item_type',
+        'delete'    => 'Delete :item_type',
+        'restore'   => 'Restore :item_type',
+        'create'    => 'Create New :item_type',
+        'checkout'  => 'Checkout :item_type',
+        'checkin'   => 'Checkin :item_type',
+    ]
 ];
diff --git a/resources/lang/en-GB/general.php b/resources/lang/en-GB/general.php
index d274e6a54f..6cf214560d 100644
--- a/resources/lang/en-GB/general.php
+++ b/resources/lang/en-GB/general.php
@@ -10,7 +10,7 @@ return [
     'action'                => 'Action',
     'activity_report'		=> 'Activity Report',
     'address'				=> 'Address',
-    'admin'					=> 'Admin',
+    'admin'					=> 'Admin Settings',
     'admin_tooltip'			=> 'This user has admin privileges',
     'superuser'				=> 'Superuser',
     'superuser_tooltip'		=> 'This user has superuser privileges',
@@ -23,13 +23,16 @@ return [
     'asset_models'			=> 'Asset Models',
     'asset_model'			=> 'Model',
     'asset'					=> 'Asset',
+    'asset_previous'        => 'Asset (Previously Assigned)',
     'asset_report'          => 'Asset Report',
     'asset_tag'				=> 'Asset Tag',
     'asset_tags'            => 'Asset Tags',
     'assets_available'		=> 'Assets available',
     'accept_assets'         => 'Accept Assets :name',
     'accept_assets_menu'    => 'Accept Assets',
+    'accept_item'           => 'Accept Item',
     'audit'				    => 'Audit',
+    'audits'				=> 'Audits',
     'audit_report'			=> 'Audit Log',
     'assets'				=> 'Assets',
     'assets_audited'        => 'assets audited',
@@ -61,9 +64,12 @@ return [
     'changepassword'  		=> 'Change Password',
     'checkin'  				=> 'Checkin',
     'checkin_from'  		=> 'Checkin from',
+    'checkin_note'  		=> 'Checkin Note',
+    'checkout_note'  		=> 'Checkout Note',
     'checkout'  			=> 'Checkout',
     'checkouts_count'       => 'Checkouts',
     'checkins_count'        => 'Checkins',
+    'checkin_and_delete'  	=> 'Checkin and Delete',
     'user_requests_count'   => 'Requests',
     'city'  				=> 'City',
     'click_here'			=> 'Click here',
@@ -77,7 +83,7 @@ return [
     'consumables'			=> 'Consumables',
     'country'  				=> 'Country',
     'could_not_restore'     => 'Error restoring :item_type: :error',
-    'not_deleted'           => 'The :item_type is not deleted, so it cannot be restored',
+    'not_deleted'           => 'The :item_type was not deleted and therefore cannot be restored',
     'create'				=> 'Create New',
     'created'               => 'Item Created',
     'created_asset'			=> 'created asset',
@@ -86,11 +92,13 @@ return [
     'record_created' 		=> 'Record Created',
     'updated_at' 			=> 'Updated at',
     'currency'  			=> '£', // this is deprecated
+    'currency_text'  		=> 'Currency', //
     'current'  				=> 'Current',
     'current_password'      => 'Current Password',
     'customize_report'      => 'Customise Report',
     'custom_report'         => 'Custom Asset Report',
     'dashboard'				=> 'Dashboard',
+    'data_source'           => 'Data Source',
     'days'      			=> 'days',
     'days_to_next_audit'    => 'Days to Next Audit',
     'date'					=> 'Date',
@@ -98,7 +106,7 @@ return [
     'debug_warning_text'    => 'This application is running in production mode with debugging enabled. This can expose sensitive data if your application is accessible to the outside world. Disable debug mode by setting the <code>APP_DEBUG</code> value in your <code>.env</code> file to <code>false</code>.',
     'delete'  				=> 'Delete',
     'delete_confirm'  		=> 'Are you sure you wish to delete :item?',
-    'delete_confirm_no_undo' => 'Are you sure you wish to delete :item? This can not be undone.',
+    'delete_confirm_no_undo' => 'Are you sure, you wish to delete :item? This cannot be undone.',
     'deleted'  				=> 'Deleted',
     'delete_seats'  		=> 'Deleted Seats',
     'deletion_failed'       => 'Deletion failed',
@@ -114,29 +122,13 @@ return [
     'editprofile'  			=> 'Edit Your Profile',
     'eol'					=> 'EOL',
     'email_domain'			=> 'Email Domain',
-    'email_format'			=> 'Email Format',
     'employee_number'       => 'Employee Number',
     'email_domain_help'		=> 'This is used to generate email addresses when importing',
     'error'				    => 'Error',
     'exclude_archived'      => 'Exclude Archived Assets',
     'exclude_deleted'       => 'Exclude Deleted Assets',
     'example'				=> 'Example: ',
-    'filastname_format'			=> 'First Initial Last Name (jsmith@example.com)',
-    'firstname_lastname_format'	=> 'First Name Last Name (jane.smith@example.com)',
-    'firstname_lastname_underscore_format' => 'First Name Last Name (jane_smith@example.com)',
-    'lastnamefirstinitial_format' =>  'Last Name First Initial (smithj@example.com)',
-    'firstintial_dot_lastname_format' => 'First Initial Last Name (j.smith@example.com)',
-    'firstname_lastname_display'	=> 'First Name Last Name (Jane Smith)',
-    'lastname_firstname_display'	=> 'Last Name First Name (Smith Jane)',
-    'name_display_format'	=> 'Name Display Format',
-    'first'					=> 'First',
-    'firstnamelastname'     => 'First Name Last Name (janesmith@example.com)',
-    'lastname_firstinitial' => 'Last Name First Initial (smith_j@example.com)',
-    'firstinitial.lastname' => 'First Initial Last Name (j.smith@example.com)',
-    'firstnamelastinitial'  => 'First Name Last Initial (janes@example.com)',
-    'lastnamefirstname'      => 'Last Name First Name (smith.jane@example.com)',
-    'first_name'			=> 'First Name',
-    'first_name_format'		=> 'First Name (jane@example.com)',
+
     'files'                 => 'Files',
     'file_name'				=> 'File',
     'file_type'             => 'File Type',
@@ -156,9 +148,9 @@ return [
     'image_delete'         	=> 'Delete Image',
     'include_deleted'       => 'Include Deleted Assets',
     'image_upload'         	=> 'Upload Image',
-    'filetypes_accepted_help'    => 'Accepted filetype is :types. Max upload size allowed is :size.|Accepted filetypes are :types. Max upload size allowed is :size.',
-    'filetypes_size_help'   => 'Max upload size allowed is :size.',
-    'image_filetypes_help'  => 'Accepted filetypes are jpg, webp, png, gif, svg, and avif. Max upload size allowed is :size.',
+    'filetypes_accepted_help'    => 'Accepted filetype is :types. The maximum size allowed is :size.|Accepted filetypes are :types. The maximum upload size allowed is :size.',
+    'filetypes_size_help'   => 'The maximum upload size allowed is :size.',
+    'image_filetypes_help'  => 'Accepted Filetypes are jpg, webp, png, gif, svg, and avif. The maximum upload size allowed is :size.',
     'unaccepted_image_type'  => 'This image file was not readable. Accepted filetypes are jpg, webp, png, gif, and svg. The mimetype of this file is: :mimetype.',
     'import'         	    => 'Import',
     'import_this_file'      => 'Map fields and process this file',
@@ -178,12 +170,17 @@ return [
     'last'					=> 'Last',
     'last_login'            => 'Last Login',
     'last_name'             => 'Last Name',
+    'firstname_lastname_display'	=> 'First Name Last Name (Jane Smith)',
+    'lastname_firstname_display'	=> 'Last Name First Name (Smith Jane)',
+    'name_display_format'	=> 'Name Display Format',
+    'first'					=> 'First',
+    'first_name'			=> 'First Name',
     'license'				=> 'License',
     'license_report'        => 'License Report',
-    'licenses_available'	=> 'Licenses available',
+    'licenses_available'	=> 'Licences available',
     'licenses'				=> 'Licenses',
     'list_all'				=> 'List All',
-    'loading'				=> 'Loading... please wait....',
+    'loading'				=> 'Loading... please wait...',
     'lock_passwords'        => 'This field value will not be saved in a demo installation.',
     'feature_disabled'      => 'This feature has been disabled for the demo installation.',
     'location'              => 'Location',
@@ -193,7 +190,7 @@ return [
     'logout'				=> 'Logout',
     'lookup_by_tag'     => 'Lookup by Asset Tag',
     'maintenances'          => 'Maintenances',
-    'manage_api_keys'       => 'Manage API Keys',
+    'manage_api_keys'       => 'Manage API keys',
     'manufacturer'			=> 'Manufacturer',
     'manufacturers'			=> 'Manufacturers',
     'markdown'				=> 'This field allows <a href="https://help.github.com/articles/github-flavored-markdown/">Github flavored markdown</a>.',
@@ -206,7 +203,7 @@ return [
     'new_password'          => 'New Password',
     'next'					=> 'Next',
     'next_audit_date'		=> 'Next Audit Date',
-    'next_audit_date_help'  => 'If you use auditing in your organization, this is usually automatically calculated based on the asset&apos;s last audit date and audit frequency (in <code>Admin Settings &gt; Alerts</code>) and you can leave this blank. You can manually set this date here if you need to, but it must be later than the last audit date. ',
+    'next_audit_date_help'  => 'If you use auditing in your organisation, this is usually automatically calculated based on the asset&apos;s last audit date and audit frequency (in <code>Admin Settings &gt; Alerts</code>) and you can leave this blank. You can manually set this date here if you need to, but it must be later than the last audit date. ',
     'audit_images_help'     => 'You can find audit images in the asset\'s history tab.',
     'no_email'              => 'No email address associated with this user',
     'last_audit'		    => 'Last Audit',
@@ -215,6 +212,14 @@ return [
     'no_results'			=> 'No Results.',
     'no'  					=> 'No',
     'notes'  				=> 'Notes',
+    'note_added'            => 'Note Added',
+    'options'				=> 'Options',
+    'preview'				=> 'Preview',
+    'add_note'              => 'Add Note',
+    'note_edited'            => 'Note Edited',
+    'edit_note'              => 'Edit Note',
+    'note_deleted'            => 'Note Deleted',
+    'delete_note'              => 'Delete Note',
     'order_number'          => 'Order Number',
     'only_deleted'          => 'Only Deleted Assets',
     'page_menu'				=> 'Showing _MENU_ items',
@@ -229,7 +234,7 @@ return [
     'purchase_date'         => 'Purchase Date',
     'qty'		            => 'QTY',
     'quantity'		        => 'Quantity',
-    'quantity_minimum'      => 'You have :count items below or almost below minimum quantity levels',
+    'quantity_minimum'      => 'You have one item below or almost below minimum quantity levels|You have :count items below or almost below minimum quantity levels',
     'quickscan_checkin'  	=> 'Quick Scan Checkin',
     'quickscan_checkin_status'  	=> 'Checkin Status',
     'ready_to_deploy'		=> 'Ready to Deploy',
@@ -254,7 +259,7 @@ return [
     'select_all'            => 'Select All',
     'search'				=> 'Search',
     'select_category'       => 'Select a Category',
-    'select_datasource' => 'Select a Datasource',
+    'select_datasource' => 'Select a data source',
     'select_department'     => 'Select a Department',
     'select_depreciation'	=> 'Select a Depreciation Type',
     'select_location'		=> 'Select a Location',
@@ -274,13 +279,15 @@ return [
     'signed_off_by'         => 'Signed Off By',
     'skin'       			=> 'Skin',
     'webhook_msg_note'        => 'A notification will be sent via webhook',
-    'webhook_test_msg'        => 'Oh hello! Looks like your :app integration with Snipe-IT is working!',
+    'webhook_test_msg'        => 'Oh hai! It looks like your :app integration with Snipe-IT is working!',
     'some_features_disabled' => 'DEMO MODE: Some features are disabled for this installation.',
     'site_name'				=> 'Site Name',
     'state'  				=> 'State',
     'status_labels'			=> 'Status Labels',
+    'status_label'			=> 'Status Label',
     'status'    			=> 'Status',
     'accept_eula'           => 'Acceptance Agreement',
+    'show_or_hide_eulas' => 'Show/Hide EULAs',
     'supplier'              => 'Supplier',
     'suppliers'  			=> 'Suppliers',
     'sure_to_delete'        => 'Are you sure you wish to delete',
@@ -296,9 +303,9 @@ return [
     'type'  				=> 'Type',
     'undeployable'			=> 'Un-deployable',
     'unknown_admin'			=> 'Unknown Admin',
-    'username_format'		=> 'Username Format',
     'username'              => 'Username',
     'update'                => 'Update',
+    'updating_item' => 'Updating :item',
     'upload_filetypes_help'      => 'Allowed filetypes are png, gif, jpg, jpeg, doc, docx, pdf, xls, xlsx, txt, lic, xml, zip, rtf and rar. Max upload size allowed is :size.',
     'uploaded'              => 'Uploaded',
     'user'					=> 'User',
@@ -323,10 +330,10 @@ return [
     'token_expired'         => 'Your form session has expired. Please try again.',
     'login_enabled'         => 'Login Enabled',
     'audit_due'             => 'Due for Audit',
-    'audit_due_days'        => 'Assets Due for Audit Within :days Day|Assets Due for Audit Within :days Days',
+    'audit_due_days'        => '{}Assets Due or Overdue for Audit|[1]Assets Due or Overdue for Audit Within a Day|[2,*]Assets Due or Overdue for Audit Within :days Days',
     'checkin_due'           => 'Due for Checkin',
     'checkin_overdue'       => 'Overdue for Checkin',
-    'checkin_due_days'      => 'Assets Due for Checkin Within :days Day|Assets Due for Checkin Within :days Days',
+    'checkin_due_days'      => '{}Due for Checkin|[1]Assets Due for Checkin Within :days Day|[2,*]Assets Due for Checkin Within :days Days',
     'audit_overdue'         => 'Overdue for Audit',
     'accept'                => 'Accept :asset',
     'i_accept'              => 'I accept',
@@ -339,16 +346,16 @@ return [
     'view_all'              => 'view all',
     'hide_deleted'          => 'Hide Deleted',
     'email'                 => 'Email',
-    'do_not_change'         => 'Do Not Change',
-    'bug_report'            => 'Report a Bug',
+    'do_not_change'         => 'Do not change',
+    'bug_report'            => 'Report a bug',
     'user_manual'           => 'User\'s Manual',
     'setup_step_1'          => 'Step 1',
     'setup_step_2'          => 'Step 2',
     'setup_step_3'          => 'Step 3',
     'setup_step_4'          => 'Step 4',
     'setup_config_check'    => 'Configuration Check',
-    'setup_create_database' => 'Create Database Tables',
-    'setup_create_admin'    => 'Create Admin User',
+    'setup_create_database' => 'Create database tables',
+    'setup_create_admin'    => 'Create an admin user',
     'setup_done'            => 'Finished!',
     'bulk_edit_about_to'    => 'You are about to edit the following: ',
     'checked_out'           => 'Checked Out',
@@ -383,6 +390,8 @@ return [
     'new_license'           => 'New License',
     'new_accessory'         => 'New Accessory',
     'new_consumable'        => 'New Consumable',
+    'new_component'         => 'New Component',
+    'new_user'              => 'New User',
     'collapse'              => 'Collapse',
     'assigned'              => 'Assigned',
     'asset_count'           => 'Asset Count',
@@ -418,19 +427,20 @@ return [
     'bulk_soft_delete'      =>'Also soft-delete these users. Their asset history will remain intact unless/until you purge deleted records in the Admin settings.',
     'bulk_checkin_delete_success' => 'Your selected users have been deleted and their items have been checked in.',
     'bulk_checkin_success' => 'The items for the selected users have been checked in.',
-    'set_to_null'           => 'Delete values for this asset|Delete values for all :asset_count assets ',
+    'set_to_null'           => 'Delete values for this selection|Delete values for all :selection_count selections ',
     'set_users_field_to_null'  => 'Delete :field values for this user|Delete :field values for all :user_count users ',
     'na_no_purchase_date'   => 'No purchase date provided',
     'assets_by_status'      => 'Assets by Status',
     'assets_by_status_type'      => 'Assets by Status Type',
     'pie_chart_type'        => 'Dashboard Pie Chart Type',
     'hello_name'            => 'Hello, :name.',
-    'unaccepted_profile_warning'   => 'You have :count items requiring acceptance. Click here to accept or decline them',
+    'unaccepted_profile_warning'   => 'You have one item requiring acceptance. Click here to accept or decline it | You have :count items requiring acceptance. Click here to accept or decline them',
     'start_date'            => 'Start Date',
     'end_date'            => 'End Date',
     'alt_uploaded_image_thumbnail' => 'Uploaded thumbnail',
     'placeholder_kit'       => 'Select a kit',
     'file_not_found'        => 'File not found',
+    'log_record_not_found'  => 'No record for that log entry was found.',
     'preview_not_available' => '(no preview)',
     'setup'                 => 'Setup',
     'pre_flight'            => 'Pre-Flight',
@@ -512,7 +522,7 @@ return [
     'checked_out_to_fields' => 'Checked Out To Fields',
     'percent_complete' => '% complete',
     'uploading' => 'Uploading... ',
-    'upload_error' => 'Error uploading file. Please check that there are no empty rows and that no column names are duplicated.',
+    'upload_error' => 'Error uploading file. Please check that you have no empty rows or duplicated column names in your CSV, and that the server permissions allow uploads.',
     'copy_to_clipboard' => 'Copy to Clipboard',
     'copied' => 'Copied!',
     'status_compatibility' => 'If assets are already assigned, they cannot be changed to a non-deployable status type and this value change will be skipped.',
@@ -528,7 +538,7 @@ return [
     'permission_denied_superuser_demo' => 'Permission denied. You cannot update user information for superadmins on the demo.',
     'pwd_reset_not_sent' => 'User is not activated, is LDAP synced, or does not have an email address',
     'error_sending_email' => 'Error sending email',
-    'sad_panda' => 'Sad panda. You are not authorized to do the thing. Maybe <a href=":link">return to the dashboard</a>, or contact your administrator.',
+    'sad_panda' => 'Sad panda. You are not authorised to do the thing. Maybe <a href=":link">return to the dashboard</a>, or contact your administrator.',
     'bulk' => [
             'delete' =>
                 [
@@ -545,10 +555,75 @@ return [
     'countable' => [
         'accessories'  => ':count Accessory|:count Accessories',
         'assets'  => ':count Asset|:count Assets',
-        'licenses'  => ':count License|:count Licenses',
-        'license_seats'  => ':count License Seat|:count License Seats',
+        'licenses'  => ':count Licence|:count Licences',
+        'license_seats'  => ':count Licence Seat|:count Licence Seats',
         'consumables'  => ':count Consumable|:count Consumables',
         'components'  => ':count Component|:count Components',
-    ]
+    ],
+
+    'more_info' => 'More Info',
+    'quickscan_bulk_help' => 'Checking this box will edit the asset record to reflect this new location. Leaving it unchecked will simply note the location in the audit log. Note that if this asset is checked out, it will not change the location of the person, asset or location it is checked out to.',
+    'whoops' => 'Whoops!',
+    'something_went_wrong' => 'Something went wrong with your request.',
+    'close' => 'Close',
+    'expires' => 'Expires',
+    'map_fields'=> 'Map :item_type Fields',
+    'remaining_var' => ':count Remaining',
+    'label' => 'Label',
+    'import_asset_tag_exists' => 'An asset with the asset tag :asset_tag already exists and an update was not requested. No change was made.',
+    'countries_manually_entered_help' => 'Values with an asterisk (*) were manually entered and do not match existing ISO 3166 dropdown values',
+    'accessories_assigned' => 'Assigned Accessories',
+    'user_managed_passwords' => 'Password Management',
+    'user_managed_passwords_disallow' => 'Disallow users from managing their own passwords',
+    'user_managed_passwords_allow' => 'Allow users to manage their own passwords',
+    'from' => 'From',
+    'by' => 'By',
+
+// Add form placeholders here
+    'placeholders' => [
+        'notes'  => 'Add a note',
+    ],
+
+    'breadcrumb_button_actions' => [
+        'edit_item' => 'Edit :name',
+        'checkout_item' => 'Checkout :name',
+        'checkin_item' => 'Checkin :name',
+    ],
+
+    'skins' => [
+        'site_default' => 'Site Default',
+        'default_blue' => 'Default Blue',
+        'blue_dark' => 'Blue (Dark Mode)',
+        'green' => 'Green Dark',
+        'green_dark' => 'Green (Dark Mode)',
+        'red' => 'Red Dark',
+        'red_dark' => 'Red (Dark Mode)',
+        'orange' => 'Orange Dark',
+        'orange_dark' => 'Orange (Dark Mode)',
+        'black' => 'Black',
+        'black_dark' => 'Black (Dark Mode)',
+        'purple' => 'Purple',
+        'purple_dark' => 'Purple (Dark Mode)',
+        'yellow' => 'Yellow',
+        'yellow_dark' => 'Yellow (Dark Mode)',
+        'high_contrast' => 'High Contrast',
+
+    ],
+
+    'select_all_none' => 'Select/Unselect All',
+    'generic_model_not_found' => 'That :model was not found or you do not have permission to access it',
+    'deleted_models' => 'Deleted Asset Models',
+    'deleted_users' => 'Deleted Users',
+    'cost_each' => ':amount each',
+    'remove_current_image' => 'Remove current :type image',
+
+    'seeding' => [
+        'manufacturers' => [
+            'button' => 'Create Manufacturers',
+            'prompt' => 'You do not have any manufacturers yet. Would you like to seed a list of common manufacturers? (THIS WILL OVERWRITE EXISTING MANUFACTURERS, including those that have been soft-deleted.)',
+            'success' => 'Manufacturers seeded successfully',
+            'error' => 'Could not seed manufacturers. A manufacturer record already exists and seeding would overwrite it.|Could not seed manufacturers. :count manufacturer records already exist and seeding would overwrite them.',
+        ],
+    ],
 
 ];
diff --git a/resources/lang/en-GB/localizations.php b/resources/lang/en-GB/localizations.php
index 2dfb05a2ac..a2c596233f 100644
--- a/resources/lang/en-GB/localizations.php
+++ b/resources/lang/en-GB/localizations.php
@@ -2,7 +2,7 @@
 
 return [
 
-    'select_language' => 'Select a language',
+    'select_language' => 'Select a Language',
     'languages' => [
         'en-US'=> 'English, US',
         'en-GB'=> 'English, UK',
@@ -40,7 +40,9 @@ return [
         'ms-MY'=> 'Malay',
         'mi-NZ'=> 'Maori',
         'mn-MN'=> 'Mongolian',
-        'no-NO'=> 'Norwegian',
+        'nb-NO'=> 'Norwegian Bokmål',
+        'om-ET' => 'Oromo (Ethiopian)',
+        //'nn-NO'=> 'Norwegian Nynorsk',
         'fa-IR'=> 'Persian',
         'pl-PL'=> 'Polish',
         'pt-PT'=> 'Portuguese',
@@ -66,7 +68,7 @@ return [
         'zu-ZA'=> 'Zulu',
     ],
 
-    'select_country' => 'Select a country',
+    'select_country' => 'Select a Country',
     
     'countries' => [
         'AC'=>'Ascension Island',
@@ -133,6 +135,7 @@ return [
         'EC'=>'Ecuador',
         'EE'=>'Estonia',
         'EG'=>'Egypt',
+        'GB-ENG'=>'England',
         'ER'=>'Eritrea',
         'ES'=>'Spain',
         'ET'=>'Ethiopia',
@@ -231,6 +234,7 @@ return [
         'NG'=>'Nigeria',
         'NI'=>'Nicaragua',
         'NL'=>'Netherlands',
+        'GB-NIR' => 'Northern Ireland',
         'NO'=>'Norway',
         'NP'=>'Nepal',
         'NR'=>'Nauru',
@@ -258,7 +262,7 @@ return [
         'RU'=>'Russian Federation',
         'RW'=>'Rwanda',
         'SA'=>'Saudi Arabia',
-        'UK'=>'Scotland',
+        'GB-SCT'=>'Scotland',
         'SB'=>'Solomon Islands',
         'SC'=>'Seychelles',
         'SS'=>'South Sudan',
@@ -310,6 +314,7 @@ return [
         'VI'=>'Virgin Islands (U.S.)',
         'VN'=>'Viet Nam',
         'VU'=>'Vanuatu',
+        'GB-WLS' =>'Wales',
         'WF'=>'Wallis And Futuna Islands',
         'WS'=>'Samoa',
         'YE'=>'Yemen',
diff --git a/resources/lang/en-GB/mail.php b/resources/lang/en-GB/mail.php
index 759ff0f5e8..04bb2d01e6 100644
--- a/resources/lang/en-GB/mail.php
+++ b/resources/lang/en-GB/mail.php
@@ -22,25 +22,26 @@ return [
     'Item_Request_Canceled' => 'Item Request Canceled',
     'Item_Requested' => 'Item Requested',
     'License_Checkin_Notification' => 'License checked in',
-    'License_Checkout_Notification' => 'License checked out',
+    'License_Checkout_Notification' => 'Licence checked out',
+    'license_for'   => 'Licence for',
     'Low_Inventory_Report' => 'Low Inventory Report',
     'a_user_canceled' => 'A user has canceled an item request on the website',
     'a_user_requested' => 'A user has requested an item on the website',
     'acceptance_asset_accepted' => 'A user has accepted an item',
     'acceptance_asset_declined' => 'A user has declined an item',
-    'accessory_name' => 'Accessory Name:',
-    'additional_notes' => 'Additional Notes:',
+    'accessory_name' => 'Accessory Name',
+    'additional_notes' => 'Additional Notes',
     'admin_has_created' => 'An administrator has created an account for you on the :web website.',
-    'asset' => 'Asset:',
-    'asset_name' => 'Asset Name:',
+    'asset' => 'Asset',
+    'asset_name' => 'Asset Name',
     'asset_requested' => 'Asset requested',
     'asset_tag' => 'Asset Tag',
     'assets_warrantee_alert' => 'There is :count asset with a warranty expiring in the next :threshold days.|There are :count assets with warranties expiring in the next :threshold days.',
     'assigned_to' => 'Assigned To',
     'best_regards' => 'Best regards,',
-    'canceled' => 'Canceled:',
-    'checkin_date' => 'Checkin Date:',
-    'checkout_date' => 'Checkout Date:',
+    'canceled' => 'Canceled',
+    'checkin_date' => 'Checkin Date',
+    'checkout_date' => 'Checkout Date',
     'checkedout_from' => 'Checked out from',
     'checkedin_from'  => 'Checked in from',
     'checked_into' => 'Checked into',
@@ -49,27 +50,30 @@ return [
     'click_to_confirm' => 'Please click on the following link to confirm your :web account:',
     'current_QTY' => 'Current QTY',
     'days' => 'Days',
-    'expecting_checkin_date' => 'Expected Checkin Date:',
+    'expecting_checkin_date' => 'Expected Checkin Date',
     'expires' => 'Expires',
     'hello' => 'Hello',
     'hi' => 'Hi',
     'i_have_read' => 'I have read and agree to the terms of use, and have received this item.',
     'inventory_report' => 'Inventory Report',
-    'item' => 'Item:',
+    'item' => 'Item',
+    'item_checked_reminder' => 'This is a reminder that you currently have :count items checked out to you that you have not accepted or declined. Please click the link below to confirm your decision.',
     'license_expiring_alert' => 'There is :count license expiring in the next :threshold days.|There are :count licenses expiring in the next :threshold days.',
     'link_to_update_password' => 'Please click on the following link to update your :web password:',
-    'login' => 'Login:',
+    'login' => 'Login',
     'login_first_admin' => 'Login to your new Snipe-IT installation using the credentials below:',
     'low_inventory_alert' => 'There is :count item that is below minimum inventory or will soon be low.|There are :count items that are below minimum inventory or will soon be low.',
     'min_QTY' => 'Min QTY',
     'name' => 'Name',
     'new_item_checked' => 'A new item has been checked out under your name, details are below.',
+    'new_item_checked_with_acceptance' => 'A new item has been checked out under your name that requires acceptance, details are below.',
+    'recent_item_checked' => 'An item was recently checked out under your name that requires acceptance, details are below.',
     'notes' => 'Notes',
-    'password' => 'Password:',
+    'password' => 'Password',
     'password_reset' => 'Password Reset',
     'read_the_terms' => 'Please read the terms of use below.',
     'read_the_terms_and_click' => 'Please read the terms of use below, and click on the link at the bottom to confirm that you read and agree to the terms of use, and have received the asset.',
-    'requested' => 'Requested:',
+    'requested' => 'Requested',
     'reset_link' => 'Your Password Reset Link',
     'reset_password' => 'Click here to reset your password:',
     'rights_reserved' => 'All rights reserved.',
@@ -86,8 +90,10 @@ return [
     'upcoming-audits' => 'There is :count asset that is coming up for audit within :threshold days.|There are :count assets that are coming up for audit within :threshold days.',
     'user' => 'User',
     'username' => 'Username',
+    'unaccepted_asset_reminder' => 'Reminder: You have Unaccepted Assets.',
     'welcome' => 'Welcome :name',
     'welcome_to' => 'Welcome to :web!',
     'your_assets' => 'View Your Assets',
     'your_credentials' => 'Your Snipe-IT credentials',
+    'mail_sent' => 'Mail sent successfully!',
 ];
diff --git a/resources/lang/en-GB/validation.php b/resources/lang/en-GB/validation.php
index 05374e23af..ce7fba19cc 100644
--- a/resources/lang/en-GB/validation.php
+++ b/resources/lang/en-GB/validation.php
@@ -13,87 +13,150 @@ return [
     |
     */
 
-    'accepted'             => 'The :attribute must be accepted.',
-    'active_url'           => 'The :attribute is not a valid URL.',
-    'after'                => 'The :attribute must be a date after :date.',
-    'after_or_equal'       => 'The :attribute must be a date after or equal to :date.',
-    'alpha'                => 'The :attribute may only contain letters.',
-    'alpha_dash'           => 'The :attribute may only contain letters, numbers, and dashes.',
-    'alpha_num'            => 'The :attribute may only contain letters and numbers.',
-    'array'                => 'The :attribute must be an array.',
-    'before'               => 'The :attribute must be a date before :date.',
-    'before_or_equal'      => 'The :attribute must be a date before or equal to :date.',
-    'between'              => [
-        'numeric' => 'The :attribute must be between :min - :max.',
-        'file'    => 'The :attribute must be between :min - :max kilobytes.',
-        'string'  => 'The :attribute must be between :min - :max characters.',
-        'array'   => 'The :attribute must have between :min and :max items.',
+    'accepted' => 'The :attribute field must be accepted.',
+    'accepted_if' => 'The :attribute field must be accepted when :other is :value.',
+    'active_url' => 'The :attribute field must be a valid URL.',
+    'after' => 'The :attribute field must be a date after :date.',
+    'after_or_equal' => 'The :attribute field must be a date after or equal to :date.',
+    'alpha' => 'The :attribute field must only contain letters.',
+    'alpha_dash' => 'The :attribute field must only contain letters, numbers, dashes, and underscores.',
+    'alpha_num' => 'The :attribute field must only contain letters and numbers.',
+    'array' => 'The :attribute field must be an array.',
+    'ascii' => 'The :attribute field must only contain single-byte alphanumeric characters and symbols.',
+    'before' => 'The :attribute field must be a date before :date.',
+    'before_or_equal' => 'The :attribute field must be a date before or equal to :date.',
+    'between' => [
+        'array' => 'The :attribute field must have between :min and :max items.',
+        'file' => 'The :attribute field must be between :min and :max kilobytes.',
+        'numeric' => 'The :attribute field must be between :min and :max.',
+        'string' => 'The :attribute field must be between :min and :max characters.',
     ],
-    'boolean'              => 'The :attribute must be true or false.',
-    'confirmed'            => 'The :attribute confirmation does not match.',
-    'date'                 => 'The :attribute is not a valid date.',
-    'date_format'          => 'The :attribute does not match the format :format.',
-    'different'            => 'The :attribute and :other must be different.',
-    'digits'               => 'The :attribute must be :digits digits.',
-    'digits_between'       => 'The :attribute must be between :min and :max digits.',
-    'dimensions'           => 'The :attribute has invalid image dimensions.',
-    'distinct'             => 'The :attribute field has a duplicate value.',
-    'email'                => 'The :attribute format is invalid.',
-    'exists'               => 'The selected :attribute is invalid.',
-    'file'                 => 'The :attribute must be a file.',
-    'filled'               => 'The :attribute field must have a value.',
-    'image'                => 'The :attribute must be an image.',
+    'boolean' => 'The :attribute field must be true or false.',
+    'can' => 'The :attribute field contains an unauthorised value.',
+    'confirmed' => 'The :attribute field confirmation does not match.',
+    'contains' => 'The :attribute field is missing a required value.',
+    'current_password' => 'The password is incorrect.',
+    'date' => 'The :attribute field must be a valid date.',
+    'date_equals' => 'The :attribute field must be a date equal to :date.',
+    'date_format' => 'The :attribute field must match the format :format.',
+    'decimal' => 'The :attribute field must have :decimal decimal places.',
+    'declined' => 'The :attribute field must be declined.',
+    'declined_if' => 'The :attribute field must be declined when :other is :value.',
+    'different' => 'The :attribute field and :other must be different.',
+    'digits' => 'The :attribute field must be :digits digits.',
+    'digits_between' => 'The :attribute field must be between :min and :max digits.',
+    'dimensions' => 'The :attribute field has invalid image dimensions.',
+    'distinct' => 'The :attribute field has a duplicate value.',
+    'doesnt_end_with' => 'The :attribute field must not end with one of the following: :values.',
+    'doesnt_start_with' => 'The :attribute field must not start with one of the following: :values.',
+    'email' => 'The :attribute field must be a valid email address.',
+    'ends_with' => 'The :attribute field must end with one of the following: :values.',
+    'enum' => 'The selected :attribute is invalid.',
+    'exists' => 'The selected :attribute is invalid.',
+    'extensions' => 'The :attribute field must have one of the following extensions: :values.',
+    'file' => 'The :attribute field must be a file.',
+    'filled' => 'The :attribute field must have a value.',
+    'gt' => [
+        'array' => 'The :attribute field must have more than :value items.',
+        'file' => 'The :attribute field must be greater than :value kilobytes.',
+        'numeric' => 'The :attribute field must be greater than :value.',
+        'string' => 'The :attribute field must be greater than :value characters.',
+    ],
+    'gte' => [
+        'array' => 'The :attribute field must have :value items or more.',
+        'file' => 'The :attribute field must be greater than or equal to :value kilobytes.',
+        'numeric' => 'The :attribute field must be greater than or equal to :value.',
+        'string' => 'The :attribute field must be greater than or equal to :value characters.',
+    ],
+    'hex_color' => 'The :attribute field must be a valid hexadecimal color.',
+    'image' => 'The :attribute field must be an image.',
     'import_field_empty'    => 'The value for :fieldname cannot be null.',
-    'in'                   => 'The selected :attribute is invalid.',
-    'in_array'             => 'The :attribute field does not exist in :other.',
-    'integer'              => 'The :attribute must be an integer.',
-    'ip'                   => 'The :attribute must be a valid IP address.',
-    'ipv4'                 => 'The :attribute must be a valid IPv4 address.',
-    'ipv6'                 => 'The :attribute must be a valid IPv6 address.',
-    'is_unique_department' => 'The :attribute must be unique to this Company Location',
-    'json'                 => 'The :attribute must be a valid JSON string.',
-    'max'                  => [
-        'numeric' => 'The :attribute may not be greater than :max.',
-        'file'    => 'The :attribute may not be greater than :max kilobytes.',
-        'string'  => 'The :attribute may not be greater than :max characters.',
-        'array'   => 'The :attribute may not have more than :max items.',
+    'in' => 'The selected :attribute is invalid.',
+    'in_array' => 'The :attribute field must exist in :other.',
+    'integer' => 'The :attribute field must be an integer.',
+    'ip' => 'The :attribute field must be a valid IP address.',
+    'ipv4' => 'The :attribute field must be a valid IPv4 address.',
+    'ipv6' => 'The :attribute field must be a valid IPv6 address.',
+    'json' => 'The :attribute field must be a valid JSON string.',
+    'list' => 'The :attribute field must be a list.',
+    'lowercase' => 'The :attribute field must be lowercase.',
+    'lt' => [
+        'array' => 'The :attribute field must have less than :value items.',
+        'file' => 'The :attribute field must be less than :value kilobytes.',
+        'numeric' => 'The :attribute field must be less than :value.',
+        'string' => 'The :attribute field must be less than :value characters.',
     ],
-    'mimes'                => 'The :attribute must be a file of type: :values.',
-    'mimetypes'            => 'The :attribute must be a file of type: :values.',
-    'min'                  => [
-        'numeric' => 'The :attribute must be at least :min.',
-        'file'    => 'The :attribute must be at least :min kilobytes.',
-        'string'  => 'The :attribute must be at least :min characters.',
-        'array'   => 'The :attribute must have at least :min items.',
+    'lte' => [
+        'array' => 'The :attribute field must not have more than :value items.',
+        'file' => 'The :attribute field must be less than or equal to :value kilobytes.',
+        'numeric' => 'The :attribute field must be less than or equal to :value.',
+        'string' => 'The :attribute field must be less than or equal to :value characters.',
     ],
-    'starts_with'          => 'The :attribute must start with one of the following: :values.',
-    'ends_with'            => 'The :attribute must end with one of the following: :values.',
+    'mac_address' => 'The :attribute field must be a valid MAC address.',
+    'max' => [
+        'array' => 'The :attribute field must not have more than :max items.',
+        'file' => 'The :attribute field must not be greater than :max kilobytes.',
+        'numeric' => 'The :attribute field must not be greater than :max.',
+        'string' => 'The :attribute field must not be greater than :max characters.',
+    ],
+    'max_digits' => 'The :attribute field must not have more than :max digits.',
+    'mimes' => 'The :attribute field must be a file of type: :values.',
+    'mimetypes' => 'The :attribute field must be a file of type: :values.',
+    'min' => [
+        'array' => 'The :attribute field must have at least :min items.',
+        'file' => 'The :attribute field must be at least :min kilobytes.',
+        'numeric' => 'The :attribute field must be at least :min.',
+        'string' => 'The :attribute field must be at least :min characters.',
+    ],
+    'min_digits' => 'The :attribute field must have at least :min digits.',
+    'missing' => 'The :attribute field must be missing.',
+    'missing_if' => 'The :attribute field must be missing when :other is :value.',
+    'missing_unless' => 'The :attribute field must be missing unless :other is :value.',
+    'missing_with' => 'The :attribute field must be missing when :values is present.',
+    'missing_with_all' => 'The :attribute field must be missing when :values are present.',
+    'multiple_of' => 'The :attribute field must be a multiple of :value.',
+    'not_in' => 'The selected :attribute is invalid.',
+    'not_regex' => 'The :attribute field format is invalid.',
+    'numeric' => 'The :attribute field must be a number.',
+    'password' => [
+        'letters' => 'The :attribute field must contain at least one letter.',
+        'mixed' => 'The :attribute field must contain at least one uppercase and one lowercase letter.',
+        'numbers' => 'The :attribute field must contain at least one number.',
+        'symbols' => 'The :attribute field must contain at least one symbol.',
+        'uncompromised' => 'The given :attribute has appeared in a data leak. Please choose a different :attribute.',
+    ],
+    'percent'       => 'The depreciation minimum must be between 0 and 100 when depreciation type is percentage.',
 
-    'not_in'               => 'The selected :attribute is invalid.',
-    'numeric'              => 'The :attribute must be a number.',
-    'present'              => 'The :attribute field must be present.',
-    'valid_regex'          => 'That is not a valid regex. ',
-    'regex'                => 'The :attribute format is invalid.',
-    'required'             => 'The :attribute field is required.',
-    'required_if'          => 'The :attribute field is required when :other is :value.',
-    'required_unless'      => 'The :attribute field is required unless :other is in :values.',
-    'required_with'        => 'The :attribute field is required when :values is present.',
-    'required_with_all'    => 'The :attribute field is required when :values is present.',
-    'required_without'     => 'The :attribute field is required when :values is not present.',
+    'present' => 'The :attribute field must be present.',
+    'present_if' => 'The :attribute field must be present when :other is :value.',
+    'present_unless' => 'The :attribute field must be present unless :other is :value.',
+    'present_with' => 'The :attribute field must be present when :values is present.',
+    'present_with_all' => 'The :attribute field must be present when :values are present.',
+    'prohibited' => 'The :attribute field is prohibited.',
+    'prohibited_if' => 'The :attribute field is prohibited when :other is :value.',
+    'prohibited_unless' => 'The :attribute field is prohibited unless :other is in :values.',
+    'prohibits' => 'The :attribute field prohibits :other from being present.',
+    'regex' => 'The :attribute field format is invalid.',
+    'required' => 'The :attribute field is required.',
+    'required_array_keys' => 'The :attribute field must contain entries for: :values.',
+    'required_if' => 'The :attribute field is required when :other is :value.',
+    'required_if_accepted' => 'The :attribute field is required when :other is accepted.',
+    'required_if_declined' => 'The :attribute field is required when :other is declined.',
+    'required_unless' => 'The :attribute field is required unless :other is in :values.',
+    'required_with' => 'The :attribute field is required when :values is present.',
+    'required_with_all' => 'The :attribute field is required when :values are present.',
+    'required_without' => 'The :attribute field is required when :values is not present.',
     'required_without_all' => 'The :attribute field is required when none of :values are present.',
-    'same'                 => 'The :attribute and :other must match.',
-    'size'                 => [
-        'numeric' => 'The :attribute must be :size.',
-        'file'    => 'The :attribute must be :size kilobytes.',
-        'string'  => 'The :attribute must be :size characters.',
-        'array'   => 'The :attribute must contain :size items.',
+    'same' => 'The :attribute field must match :other.',
+    'size' => [
+        'array' => 'The :attribute field must contain :size items.',
+        'file' => 'The :attribute field must be :size kilobytes.',
+        'numeric' => 'The :attribute field must be :size.',
+        'string' => 'The :attribute field must be :size characters.',
     ],
+    'starts_with' => 'The :attribute field must start with one of the following: :values.',
     'string'               => 'The :attribute must be a string.',
-    'timezone'             => 'The :attribute must be a valid zone.',
     'two_column_unique_undeleted' => 'The :attribute must be unique across :table1 and :table2. ',
-    'unique'               => 'The :attribute has already been taken.',
-    'uploaded'             => 'The :attribute failed to upload.',
-    'url'                  => 'The :attribute format is invalid.',
     'unique_undeleted'     => 'The :attribute must be unique.',
     'non_circular'         => 'The :attribute must not create a circular reference.',
     'not_array'            => ':attribute cannot be an array.',
@@ -102,11 +165,14 @@ return [
     'numbers'              => 'Password must contain at least one number.',
     'case_diff'            => 'Password must use mixed case.',
     'symbols'              => 'Password must contain symbols.',
-    'gte'                  => [
-        'numeric'          => 'Value cannot be negative'
-    ],
-    'checkboxes'           => ':attribute contains invalid options.',
-    'radio_buttons'        => ':attribute is invalid.',
+    'timezone' => 'The :attribute field must be a valid timezone.',
+    'unique' => 'The :attribute has already been taken.',
+    'uploaded' => 'The :attribute failed to upload.',
+    'uppercase' => 'The :attribute field must be uppercase.',
+    'url' => 'The :attribute field must be a valid URL.',
+    'ulid' => 'The :attribute field must be a valid ULID.',
+    'uuid' => 'The :attribute field must be a valid UUID.',
+    'fmcs_location' => 'Full multiple company support and location scoping is enabled in the Admin Settings, and the selected location and selected company are not compatible.',
 
 
     /*
@@ -120,16 +186,22 @@ return [
     |
     */
 
+    'email_array'      => 'One or more email addresses is invalid.',
+    'checkboxes'           => ':attribute contains invalid options.',
+    'radio_buttons'        => ':attribute is invalid.',
+    
     'custom' => [
         'alpha_space' => 'The :attribute field contains a character that is not allowed.',
-        'email_array'      => 'One or more email addresses is invalid.',
+
         'hashed_pass'      => 'Your current password is incorrect',
         'dumbpwd'          => 'That password is too common.',
         'statuslabel_type' => 'You must select a valid status label type',
+        'custom_field_not_found'          => 'This field does not seem to exist, please double check your custom field names.',
+        'custom_field_not_found_on_model' => 'This field seems to exist, but is not available on this Asset Model\'s fieldset.',
 
         // date_format validation with slightly less stupid messages. It duplicates a lot, but it gets the job done :(
-        // We use this because the default error message for date_format is reflects php Y-m-d, which non-PHP
-        // people won't know how to format. 
+        // We use this because the default error message for date_format reflects php Y-m-d, which non-PHP
+        // people won't know how to format.
         'purchase_date.date_format'     => 'The :attribute must be a valid date in YYYY-MM-DD format',
         'last_audit_date.date_format'   =>  'The :attribute must be a valid date in YYYY-MM-DD hh:mm:ss format',
         'expiration_date.date_format'   =>  'The :attribute must be a valid date in YYYY-MM-DD format',
@@ -137,9 +209,15 @@ return [
         'expected_checkin.date_format'  =>  'The :attribute must be a valid date in YYYY-MM-DD format',
         'start_date.date_format'        =>  'The :attribute must be a valid date in YYYY-MM-DD format',
         'end_date.date_format'          =>  'The :attribute must be a valid date in YYYY-MM-DD format',
+        'invalid_value_in_field' => 'Invalid value included in this field',
 
-    ],
+        'ldap_username_field' => [
+            'not_in' =>         '<code>sAMAccountName</code> (mixed case) will likely not work. You should use <code>samaccountname</code> (lowercase) instead.'
+        ],
+        'ldap_auth_filter_query' => ['not_in' => '<code>uid=samaccountname</code> is probably not a valid auth filter. You probably want <code>uid=</code> '],
+        'ldap_filter' => ['regex' => 'This value should probably not be wrapped in parentheses.'],
 
+        ],
     /*
     |--------------------------------------------------------------------------
     | Custom Validation Attributes
@@ -155,8 +233,16 @@ return [
 
     /*
     |--------------------------------------------------------------------------
-    | Generic Validation Messages
+    | Generic Validation Messages - we use these in the jquery validation where we don't have
+    | access to the :attribute
     |--------------------------------------------------------------------------
     */
-    'invalid_value_in_field' => 'Invalid value included in this field',
+
+    'generic' => [
+        'invalid_value_in_field' => 'Invalid value included in this field',
+        'required' => 'This field is required',
+        'email' => 'Please enter a valid email address',
+    ],
+
+
 ];
diff --git a/resources/lang/en-ID/account/general.php b/resources/lang/en-ID/account/general.php
index 1a9e2c03b8..7f9e2f848e 100644
--- a/resources/lang/en-ID/account/general.php
+++ b/resources/lang/en-ID/account/general.php
@@ -2,10 +2,16 @@
 
 return array(
     'personal_api_keys' => 'Personal API Keys',
+    'personal_access_token' => 'Personal Access Token',
+    'personal_api_keys_success' => 'Personal API Key :key created sucessfully',
+    'here_is_api_key' => 'Here is your new personal access token. This is the only time it will be shown so do not lose it! You may now use this token to make API requests.',
     'api_key_warning' => 'When generating an API token, be sure to copy it down immediately as they will not be visible to you again.',
     'api_base_url' => 'Your API base url is located at:',
     'api_base_url_endpoint' => '/&lt;endpoint&gt;',
     'api_token_expiration_time' => 'API tokens are set to expire in:',
     'api_reference' => 'Please check the <a href="https://snipe-it.readme.io/reference" target="_blank">API reference</a> to find specific API endpoints and additional API documentation.',
     'profile_updated' => 'Account successfully updated',
+    'no_tokens' => 'You have not created any personal access tokens.',
+    'enable_sounds' => 'Enable sound effects',
+    'enable_confetti' => 'Enable confetti effects',
 );
diff --git a/resources/lang/en-ID/admin/accessories/message.php b/resources/lang/en-ID/admin/accessories/message.php
index f939369dd6..d384303573 100644
--- a/resources/lang/en-ID/admin/accessories/message.php
+++ b/resources/lang/en-ID/admin/accessories/message.php
@@ -26,7 +26,11 @@ return array(
         'error'   		=> 'Aksesori belum diperiksa, silakan coba lagi',
         'success' 		=> 'Aksesori berhasil diperiksa.',
         'unavailable'   => 'Accessory is not available for checkout. Check quantity available',
-        'user_does_not_exist' => 'Pengguna yang tidak valid. Silakan coba lagi.'
+        'user_does_not_exist' => 'Pengguna yang tidak valid. Silakan coba lagi.',
+         'checkout_qty' => array(
+            'lte'  => 'There is currently only one available accessory of this type, and you are trying to check out :checkout_qty. Please adjust the checkout quantity or the total stock of this accessory and try again.|There are :number_currently_remaining total available accessories, and you are trying to check out :checkout_qty. Please adjust the checkout quantity or the total stock of this accessory and try again.',
+            ),
+           
     ),
 
     'checkin' => array(
diff --git a/resources/lang/en-ID/admin/accessories/table.php b/resources/lang/en-ID/admin/accessories/table.php
index fe36d202a9..4d44423c5d 100644
--- a/resources/lang/en-ID/admin/accessories/table.php
+++ b/resources/lang/en-ID/admin/accessories/table.php
@@ -6,6 +6,4 @@ return array(
     'id'      					=> 'ID',
     'require_acceptance'      	=> 'Penerimaan',
     'title'      				=> 'Nama Aksesoris',
-
-
 );
diff --git a/resources/lang/en-ID/admin/categories/message.php b/resources/lang/en-ID/admin/categories/message.php
index a3b42e7d86..6a10dc04fa 100644
--- a/resources/lang/en-ID/admin/categories/message.php
+++ b/resources/lang/en-ID/admin/categories/message.php
@@ -14,7 +14,7 @@ return array(
     'update' => array(
         'error'   => 'Kategori gagal diupdate, silahkan coba lagi',
         'success' => 'Kategori berhasil diupdate.',
-        'cannot_change_category_type'   => 'You cannot change the category type once it has been created',
+        'cannot_change_category_type'   => 'Anda tidak bisa mengubah tipe kategori jika sudah dibuat',
     ),
 
     'delete' => array(
diff --git a/resources/lang/en-ID/admin/components/message.php b/resources/lang/en-ID/admin/components/message.php
index 073e1b8a21..6e7ae7d1fb 100644
--- a/resources/lang/en-ID/admin/components/message.php
+++ b/resources/lang/en-ID/admin/components/message.php
@@ -17,7 +17,8 @@ return array(
     'delete' => array(
         'confirm'   => 'Anda yakin akan mengahpus komponen ini?',
         'error'   => 'Ada masalah untuk hapus komponen, silahkan coba kembali.',
-        'success' => 'Komponen berhasil dihapus.'
+        'success' => 'Komponen berhasil dihapus.',
+        'error_qty'   => 'Some components of this type are still checked out. Please check them in and try again.',
     ),
 
      'checkout' => array(
diff --git a/resources/lang/en-ID/admin/consumables/general.php b/resources/lang/en-ID/admin/consumables/general.php
index 3cc2dcc073..8e81b171b6 100644
--- a/resources/lang/en-ID/admin/consumables/general.php
+++ b/resources/lang/en-ID/admin/consumables/general.php
@@ -8,4 +8,5 @@ return array(
     'remaining' 			            => 'Tersisa',
     'total' 			                => 'Total',
     'update'                            => 'Update Consumable',
+    'inventory_warning'                 => 'The inventory of this consumable is below the minimum amount of :min_count',
 );
diff --git a/resources/lang/en-ID/admin/consumables/message.php b/resources/lang/en-ID/admin/consumables/message.php
index 61574c9cc2..decfe29c34 100644
--- a/resources/lang/en-ID/admin/consumables/message.php
+++ b/resources/lang/en-ID/admin/consumables/message.php
@@ -2,6 +2,7 @@
 
 return array(
 
+    'invalid_category_type' => 'The category must be a consumable category.',
     'does_not_exist' => 'Consumable Tidak ada.',
 
     'create' => array(
diff --git a/resources/lang/en-ID/admin/custom_fields/general.php b/resources/lang/en-ID/admin/custom_fields/general.php
index f0d9c31258..b4a3a68f43 100644
--- a/resources/lang/en-ID/admin/custom_fields/general.php
+++ b/resources/lang/en-ID/admin/custom_fields/general.php
@@ -5,7 +5,7 @@ return [
     'manage'                    => 'Manage',
     'field'		                => 'Bidang',
     'about_fieldsets_title'		=> 'Tentang Fieldsets',
-    'about_fieldsets_text'		=> 'Fieldsets allow you to create groups of custom fields that are frequently re-used for specific asset model types.',
+    'about_fieldsets_text'		=> 'Fieldsets allow you to create groups of custom fields that are frequently re-used used for specific asset model types.',
     'custom_format'             => 'Custom Regex format...',
     'encrypt_field'      	        => 'Enkripsikan nilai bidang ini di database',
     'encrypt_field_help'      => 'PERINGATAN: Mengenkripsi sebuah field membuatnya tidak bisa ditelusuri.
@@ -36,7 +36,7 @@ return [
     'create_field_title' => 'Create a new custom field',
     'value_encrypted'      	        => 'Nilai field ini dienkripsi dalam database. Hanya pengguna admin yang bisa melihat nilai dekripsi',
     'show_in_email'     => 'Sertakan nilai bidang ini dalam semua email keluar yang dikirim ke pengguna? Bidang yang terenkripsi tidak dapat disertakan dalam email',
-    'show_in_email_short'     => 'Include in emails.',
+    'show_in_email_short' => 'Include in emails',
     'help_text' => 'Help Text',
     'help_text_description' => 'This is optional text that will appear below the form elements while editing an asset to provide context on the field.',
     'about_custom_fields_title' => 'About Custom Fields',
@@ -58,5 +58,8 @@ return [
     'show_in_requestable_list_short' => 'Show in requestable assets list',
     'show_in_requestable_list' => 'Show value in requestable assets list. Encrypted fields will not be shown',
     'encrypted_options' => 'This field is encrypted, so some display options will not be available.',
+    'display_checkin' => 'Display in checkin forms',
+    'display_checkout' => 'Display in checkout forms',
+    'display_audit' => 'Display in audit forms',
 
 ];
diff --git a/resources/lang/en-ID/admin/custom_fields/message.php b/resources/lang/en-ID/admin/custom_fields/message.php
index 5b287a9c04..fc72d7f2d0 100644
--- a/resources/lang/en-ID/admin/custom_fields/message.php
+++ b/resources/lang/en-ID/admin/custom_fields/message.php
@@ -5,6 +5,7 @@ return array(
     'field' => array(
         'invalid'   => 'Bidang tersebut tidak tersedia.',
         'already_added'   => 'Bidang sudah ditambahkan',
+        'none_selected'   => 'No field selected',
 
         'create' => array(
             'error'   => 'Bidang gagal dibuat, silahkan coba lagi.',
diff --git a/resources/lang/en-ID/admin/depreciations/general.php b/resources/lang/en-ID/admin/depreciations/general.php
index 20af94a7f7..2db38cca23 100644
--- a/resources/lang/en-ID/admin/depreciations/general.php
+++ b/resources/lang/en-ID/admin/depreciations/general.php
@@ -13,4 +13,8 @@ return [
     'no_depreciations_warning'               => '<strong>Warning: </strong>
                       You do not currently have any depreciations set up.
                       Please set up at least one depreciation to view the depreciation report.',
+    'depreciation_method'                   => 'Laporan Penurunan',
+    'linear_depreciation'                   => 'Linear (Default)',
+    'half_1'                                => 'Half-year convention, always applied',
+    'half_2'                                => 'Half-year convention, applied with condition',
 ];
diff --git a/resources/lang/en-ID/admin/hardware/form.php b/resources/lang/en-ID/admin/hardware/form.php
index 9c4af6caef..32a312a0be 100644
--- a/resources/lang/en-ID/admin/hardware/form.php
+++ b/resources/lang/en-ID/admin/hardware/form.php
@@ -55,8 +55,11 @@ return [
     'asset_location_update_default' => 'Update only default location',
     'asset_location_update_actual' => 'Update only actual location',
     'asset_not_deployable' => 'That asset status is not deployable. This asset cannot be checked out.',
-    'asset_deployable' => 'That status is deployable. This asset can be checked out.',
-    'processing_spinner' => 'Processing... (This might take a bit of time on large files)',
-    'optional_infos'  => 'Optional Information',
-    'order_details'   => 'Order Related Information'
+    'asset_not_deployable_checkin' => 'That asset status is not deployable. Using this status label will checkin the asset.',
+    'asset_deployable' => 'This asset can be checked out.',
+    'processing_spinner' => 'Memproses ( Hal ini mungkin memerlukan waktu untuk data yang besar)',
+    'processing' => 'Processing... ',
+    'optional_infos'  => 'Informasi Pilihan',
+    'order_details'   => 'Order Related Information',
+    'calc_eol'    => 'If nulling the EOL date, use automatic EOL calculation based on the purchase date and EOL rate.',
 ];
diff --git a/resources/lang/en-ID/admin/hardware/general.php b/resources/lang/en-ID/admin/hardware/general.php
index 24e5a40d27..c2dd2c0658 100644
--- a/resources/lang/en-ID/admin/hardware/general.php
+++ b/resources/lang/en-ID/admin/hardware/general.php
@@ -5,8 +5,8 @@ return [
     'about_assets_text'            => 'Aset adalah item yang dilacak dengan nomor seri atau tag aset. Mereka cenderung menjadi item nilai lebih tinggi di mana mengidentifikasi item tertentu yang penting.',
     'archived'  				=> 'Diarsipkan',
     'asset'  					=> 'Aset',
-    'bulk_checkout'             => 'Pengeluaran Aset',
-    'bulk_checkin'              => 'Checkin Assets',
+    'bulk_checkout'             => 'Periksa Bulk',
+    'bulk_checkin'              => 'Bulk Checkin',
     'checkin'  					=> 'Mendaftar aset',
     'checkout'  				=> 'Periksa aset',
     'clone'  					=> 'Gandakan aset',
@@ -27,8 +27,7 @@ return [
     'undeployable_tooltip'  	=> 'This asset has a status label that is undeployable and cannot be checked out at this time.',
     'view'  					=> 'Lihat aset',
     'csv_error' => 'You have an error in your CSV file:',
-    'import_text' => '<p>Upload a CSV that contains asset history. The assets and users MUST already exist in the system, or they will be skipped. Matching assets for history import happens against the asset tag. We will try to find a matching user based on the user\'s name you provide, and the criteria you select below. If you do not select any criteria below, it will simply try to match on the username format you configured in the <code>Admin &gt; General Settings</code>.</p><p>Fields included in the CSV must match the headers: <strong>Asset Tag, Name, Checkout Date, Checkin Date</strong>. Any additional fields will be ignored. </p><p>Checkin Date: blank or future checkin dates will checkout items to associated user.  Excluding the Checkin Date column will create a checkin date with todays date.</p>
-    ',
+    'import_text' => '<p>Upload a CSV that contains asset history. The assets and users MUST already exist in the system, or they will be skipped. Matching assets for history import happens against the asset tag. We will try to find a matching user based on the user\'s name you provide, and the criteria you select below. If you do not select any criteria below, it will simply try to match on the username format you configured in the <code>Admin &gt; General Settings</code>.</p><p>Fields included in the CSV must match the headers: <strong>Asset Tag, Name, Checkout Date, Checkin Date</strong>. Any additional fields will be ignored. </p><p>Checkin Date: blank or future checkin dates will checkout items to associated user.  Excluding the Checkin Date column will create a checkin date with todays date.</p>    ',
     'csv_import_match_f-l' => 'Try to match users by <strong>firstname.lastname</strong> (<code>jane.smith</code>) format',
     'csv_import_match_initial_last' => 'Try to match users by <strong>first initial last name</strong> (<code>jsmith</code>) format',
     'csv_import_match_first' => 'Try to match users by <strong>first name</strong> (<code>jane</code>) format',
diff --git a/resources/lang/en-ID/admin/hardware/message.php b/resources/lang/en-ID/admin/hardware/message.php
index 4896695986..15a2e97e51 100644
--- a/resources/lang/en-ID/admin/hardware/message.php
+++ b/resources/lang/en-ID/admin/hardware/message.php
@@ -2,18 +2,23 @@
 
 return [
 
-    'undeployable' 		=> '<strong>Peringatan:</strong>Aset ini telah ditandai karena saat ini tidak dapat dipasangkan lagi. Jika status ini telah berubah, harap perbarui status aset.',
-    'does_not_exist' 	=> 'Aset tidak ada.',
-    'does_not_exist_var'=> 'Asset with tag :asset_tag not found.',
-    'no_tag' 	        => 'No asset tag provided.',
+    'undeployable' 		 => '<strong>Warning: </strong> This asset has been marked as currently undeployable. If this status has changed, please update the asset status.',
+    'does_not_exist' 	 => 'Aset tidak ada.',
+    'does_not_exist_var' => 'Asset with tag :asset_tag not found.',
+    'no_tag' 	         => 'No asset tag provided.',
     'does_not_exist_or_not_requestable' => 'That asset does not exist or is not requestable.',
-    'assoc_users'	 	=> 'Aset ini saat ini diperiksa ke pengguna dan tidak dapat dihapus. Harap periksa dulu asetnya, lalu coba hapus lagi. ',
+    'assoc_users'	 	 => 'Aset ini saat ini diperiksa ke pengguna dan tidak dapat dihapus. Harap periksa dulu asetnya, lalu coba hapus lagi. ',
     'warning_audit_date_mismatch' 	=> 'This asset\'s next audit date (:next_audit_date) is before the last audit date (:last_audit_date). Please update the next audit date.',
+    'labels_generated'   => 'Labels were successfully generated.',
+    'error_generating_labels' => 'Error while generating labels.',
+    'no_assets_selected' => 'No assets selected.',
 
     'create' => [
         'error'   		=> 'Aset tidak dibuat, coba lagi. :(',
         'success' 		=> 'Aset berhasil dibuat. :)',
         'success_linked' => 'Asset with tag :tag was created successfully. <strong><a href=":link" style="color: white;">Click here to view</a></strong>.',
+        'multi_success_linked' => 'Asset with tag :links was created successfully.|:count assets were created succesfully. :links.',
+        'partial_failure' => 'An asset was unable to be created. Reason: :failures|:count assets were unable to be created. Reasons: :failures',
     ],
 
     'update' => [
@@ -51,20 +56,24 @@ return [
     ],
 
     'import' => [
+        'import_button'         => 'Process Import',
         'error'                 => 'Beberapa item tidak diimpor dengan benar.',
         'errorDetail'           => 'Item berikut tidak diimpor karena kesalahan.',
         'success'               => 'File Anda telah diimpor',
         'file_delete_success'   => 'File anda telah berhasil dihapus',
         'file_delete_error'      => 'File tidak dapat dihapus',
         'file_missing' => 'The file selected is missing',
+        'file_already_deleted' => 'The file selected was already deleted',
         'header_row_has_malformed_characters' => 'One or more attributes in the header row contain malformed UTF-8 characters',
         'content_row_has_malformed_characters' => 'One or more attributes in the first row of content contain malformed UTF-8 characters',
+        'transliterate_failure' => 'Transliteration from :encoding to UTF-8 failed due to invalid characters in input'
     ],
 
 
     'delete' => [
         'confirm'   	=> 'Yakin ingin menghapus aset ini?',
         'error'   		=> 'Terjadi masalah saat menghapus aset. Silahkan coba lagi.',
+        'assigned_to_error' => '{1}Asset Tag: :asset_tag is currently checked out. Check in this device before deletion.|[2,*]Asset Tags: :asset_tag are currently checked out. Check in these devices before deletion.',
         'nothing_updated'   => 'Tidak ada aset yang dipilih, jadi tidak ada yang diperbarui.',
         'success' 		=> 'Aset berhasil dihapus.',
     ],
@@ -77,6 +86,11 @@ return [
         'no_assets_selected' => 'Anda harus memilih setidaknya satu aset dari daftar',
     ],
 
+    'multi-checkout' => [
+        'error'   => 'Asset was not checked out, please try again|Assets were not checked out, please try again',
+        'success' => 'Asset checked out successfully.|Assets checked out successfully.',
+    ],
+
     'checkin' => [
         'error'   		=> 'Aset tidak dicek, coba lagi',
         'success' 		=> 'Aset berhasil dicek.',
@@ -86,9 +100,10 @@ return [
     ],
 
     'requests' => [
-        'error'   		=> 'Aset tidak dikembalikan, coba lagi',
-        'success' 		=> 'Aset Berhasil dikembalikan.',
-        'canceled'      => 'Permintaan checkout berhasil dibatalkan',
+        'error'   		=> 'Request was not successful, please try again.',
+        'success' 		=> 'Request successfully submitted.',
+        'canceled'      => 'Request successfully canceled.',
+        'cancel'        => 'Cancel this item request',
     ],
 
 ];
diff --git a/resources/lang/en-ID/admin/hardware/table.php b/resources/lang/en-ID/admin/hardware/table.php
index 5c686828d9..fe1d6541e1 100644
--- a/resources/lang/en-ID/admin/hardware/table.php
+++ b/resources/lang/en-ID/admin/hardware/table.php
@@ -5,12 +5,12 @@ return [
     'asset_tag'   	=> 'Tag Aset',
     'asset_model'       => 'Model',
     'assigned_to'   => 'Ditetapkan untuk',
-    'book_value'  	=> 'Current Value',
+    'book_value'  	=> 'Nilai saat ini',
     'change' 		=> 'Masuk/keluar',
     'checkout_date' => 'Tanggal Check out',
     'checkoutto' 	=> 'Memeriksa',
     'components_cost' => 'Total Components Cost',
-    'current_value' => 'Current Value',
+    'current_value' => 'Nilai saat ini',
     'diff' 			=> 'Diff',
     'dl_csv' 		=> 'Unduh CSV',
     'eol' 			=> 'EOL',
@@ -25,7 +25,6 @@ return [
     'image'		    => 'Perangkat Gambar',
     'days_without_acceptance' => 'Hari tanpa penerimaan',
     'monthly_depreciation' => 'Penyusutan Bulanan',
-    'assigned_to'    => 'Ditetapkan untuk',
     'requesting_user' => 'Requesting User',
     'requested_date' => 'Requested Date',
     'changed'       => 'Changed',
diff --git a/resources/lang/en-ID/admin/kits/general.php b/resources/lang/en-ID/admin/kits/general.php
index 217888ce1c..381317b821 100644
--- a/resources/lang/en-ID/admin/kits/general.php
+++ b/resources/lang/en-ID/admin/kits/general.php
@@ -47,4 +47,5 @@ return [
     'kit_deleted'                       => 'Kit was successfully deleted',
     'kit_model_updated'                 => 'Model was successfully updated',
     'kit_model_detached'                => 'Model was successfully detached',
+    'model_already_attached'            => 'Model already attached to kit',
 ];
diff --git a/resources/lang/en-ID/admin/licenses/general.php b/resources/lang/en-ID/admin/licenses/general.php
index d21f79477d..eb004f102a 100644
--- a/resources/lang/en-ID/admin/licenses/general.php
+++ b/resources/lang/en-ID/admin/licenses/general.php
@@ -14,6 +14,7 @@ return array(
     'info'  					=> 'Informasi lisensi',
     'license_seats'  			=> 'Lisensi seat',
     'seat'  					=> 'Seat',
+    'seat_count'  				=> 'Seat :count',
     'seats'  					=> 'Seat',
     'software_licenses'  		=> 'Lisensi perangkat lunak',
     'user'  					=> 'Pengguna',
@@ -23,12 +24,12 @@ return array(
         [
             'checkin_all'           => [
                 'button'            => 'Checkin All Seats',
-                'modal'             => 'This will action checkin one seat. | This action will checkin all :checkedout_seats_count seats for this license.',
+                'modal'             => 'This action will checkin one seat. | This action will checkin all :checkedout_seats_count seats for this license.',
                 'enabled_tooltip'   => 'Checkin ALL seats for this license from both users and assets',
                 'disabled_tooltip'  => 'This is disabled because there are no seats currently checked out',
                 'disabled_tooltip_reassignable'  => 'This is disabled because the License is not reassignable',
                 'success'           => 'License successfully checked in! | All licenses were successfully checked in!',
-                'log_msg'           => 'Checked in via bulk license checkout in license GUI',
+                'log_msg'           => 'Checked in via bulk license checkin in license GUI',
             ],
 
             'checkout_all'              => [
diff --git a/resources/lang/en-ID/admin/licenses/message.php b/resources/lang/en-ID/admin/licenses/message.php
index 05ab8230df..693fc1f9e5 100644
--- a/resources/lang/en-ID/admin/licenses/message.php
+++ b/resources/lang/en-ID/admin/licenses/message.php
@@ -44,10 +44,13 @@ return array(
         'error'   => 'Terjadi masalah saat menghapus lisensi. Silahkan coba lagi.',
         'success' => 'Lisensi berhasil diperiksa',
         'not_enough_seats' => 'Not enough license seats available for checkout',
+        'mismatch' => 'The license seat provided does not match the license',
+        'unavailable' => 'This seat is not available for checkout.',
     ),
 
     'checkin' => array(
         'error'   => 'Terjadi masalah saat menghapus lisensi. Silahkan coba lagi.',
+        'not_reassignable' => 'License not reassignable',
         'success' => 'Lisensi berhasil diperiksa'
     ),
 
diff --git a/resources/lang/en-ID/admin/locations/message.php b/resources/lang/en-ID/admin/locations/message.php
index e74310ae89..66e854c59e 100644
--- a/resources/lang/en-ID/admin/locations/message.php
+++ b/resources/lang/en-ID/admin/locations/message.php
@@ -3,11 +3,12 @@
 return array(
 
     'does_not_exist' => 'Lokasi tidak ada.',
-    'assoc_users'    => 'This location is not currently deletable because it is the location of record for at least one asset or user, has assets assigned to it, or is the parent location of another location. Please update your models to no longer reference this company and try again. ',
+    'assoc_users'    => 'This location is not currently deletable because it is the location of record for at least one asset or user, has assets assigned to it, or is the parent location of another location. Please update your records to no longer reference this location and try again ',
     'assoc_assets'	 => 'Saat ini kategori ini terkait dengan setidaknya satu pengguna dan tidak dapat dihapus. Silahkan perbaharui pengguna anda untuk tidak lagi tereferensi dengan kategori ini dan coba lagi. ',
     'assoc_child_loc'	 => 'Lokasi ini saat ini merupakan induk dari setidaknya satu lokasi anak dan tidak dapat dihapus. Perbarui lokasi Anda agar tidak lagi merujuk lokasi ini dan coba lagi. ',
     'assigned_assets' => 'Assigned Assets',
-    'current_location' => 'Current Location',
+    'current_location' => 'Lokasi saat ini',
+    'open_map' => 'Open in :map_provider_icon Maps',
 
 
     'create' => array(
@@ -20,6 +21,11 @@ return array(
         'success' => 'Lokasi berhasil diperbarui.'
     ),
 
+    'restore' => array(
+        'error'   => 'Location was not restored, please try again',
+        'success' => 'Location restored successfully.'
+    ),
+
     'delete' => array(
         'confirm'   	=> 'Apakah anda yakin ingin menghapus lokasi ini?',
         'error'   => 'Terjadi masalah saat menghapus lokasi. Silahkan coba lagi.',
diff --git a/resources/lang/en-ID/admin/locations/table.php b/resources/lang/en-ID/admin/locations/table.php
index 847b2e44cd..0eea824f9e 100644
--- a/resources/lang/en-ID/admin/locations/table.php
+++ b/resources/lang/en-ID/admin/locations/table.php
@@ -39,4 +39,5 @@ return [
     'signed_by_finance_auditor' => 'Signed By (Finance Auditor):',
     'signed_by_location_manager' => 'Signed By (Location Manager):',
     'signed_by'                 => 'Signed Off By:',
+    'clone'  					=> 'Clone Location',
 ];
diff --git a/resources/lang/en-ID/admin/models/general.php b/resources/lang/en-ID/admin/models/general.php
index d083b8c5fe..d00fc67d51 100644
--- a/resources/lang/en-ID/admin/models/general.php
+++ b/resources/lang/en-ID/admin/models/general.php
@@ -3,7 +3,7 @@
 return array(
     'about_models_title'     => 'Tentang Model Aset',
     'about_models_text'           => 'Model Aset adalah cara untuk mengelompokkan aset identik. "MBP 2013", "IPhone 6s", dll.',
-    'deleted'  					        => 'This model has been deleted.',
+    'deleted'  					=> 'This model has been deleted.',
     'bulk_delete'               => 'Bulk hapus model aset',
     'bulk_delete_help'               => 'Gunakan kotak centang di bawah untuk mengkonfirmasi penghapusan model aset yang dipilih. Model aset yang memiliki aset yang terkait dengannya tidak dapat dihapus sampai aset dikaitkan dengan model yang berbeda.',
     'bulk_delete_warn'          => 'You are about to delete one asset model.|You are about to delete :model_count asset models.',
diff --git a/resources/lang/en-ID/admin/models/message.php b/resources/lang/en-ID/admin/models/message.php
index 146ee18f40..ac1cb17926 100644
--- a/resources/lang/en-ID/admin/models/message.php
+++ b/resources/lang/en-ID/admin/models/message.php
@@ -2,12 +2,12 @@
 
 return array(
 
-    'deleted' => 'Deleted asset model',
+    'deleted' => 'Hapus model asset',
     'does_not_exist' => 'Model tidak ada.',
-    'no_association' => 'WARNING! The asset model for this item is invalid or missing!',
-    'no_association_fix' => 'This will break things in weird and horrible ways. Edit this asset now to assign it a model.',
+    'no_association' => '!',
+    'no_association_fix' => '.',
     'assoc_users'	 => 'Model ini saat ini dikaitkan dengan satu atau lebih aset dan tidak dapat dihapus. Harap hapus asetnya, lalu coba hapus lagi. ',
-
+    'invalid_category_type' => 'This category must be an asset category.',
 
     'create' => array(
         'error'   => 'Model tidak dibuat, silahkan dicoba lagi.',
diff --git a/resources/lang/en-ID/admin/reports/general.php b/resources/lang/en-ID/admin/reports/general.php
index a5bee42432..39dd2ba70c 100644
--- a/resources/lang/en-ID/admin/reports/general.php
+++ b/resources/lang/en-ID/admin/reports/general.php
@@ -4,6 +4,7 @@ return [
     'info'   => 'Pilih opsi yang Anda inginkan untuk laporan aset Anda.',
     'deleted_user' => 'Deleted user',
     'send_reminder' => 'Send reminder',
+    'cannot_send_reminder' => 'User has been deleted or does not have an email address so cannot receive a reminder',
     'reminder_sent' => 'Reminder sent',
     'acceptance_deleted' => 'Acceptance request deleted',
     'acceptance_request' => 'Acceptance request',
@@ -13,5 +14,10 @@ return [
         'user_state' => 'User State',
         'user_country' => 'User Country',
         'user_zip' => 'User Zip'
-    ]
-];
\ No newline at end of file
+    ],
+    'open_saved_template' => 'Open Saved Template',
+    'save_template' =>  'Save Template',
+    'select_a_template' => 'Select a Template',
+    'template_name' => 'Template Name',
+    'update_template' => 'Update Template',
+];
diff --git a/resources/lang/en-ID/admin/reports/message.php b/resources/lang/en-ID/admin/reports/message.php
index 1ef096520e..2800bbdf0b 100644
--- a/resources/lang/en-ID/admin/reports/message.php
+++ b/resources/lang/en-ID/admin/reports/message.php
@@ -1,5 +1,16 @@
 <?php
 
-return array(
-    'error'   => 'Anda harus memilih setidaknya satu pilihan.'
-);
+return [
+    'about_templates' => 'About Saved Templates',
+    'saving_templates_description' => 'Select your options, then enter the name of your template in the box above and click the \'Save Template\' button. Use the dropdown to select a previously saved template.',
+    'create'  => [
+        'success' => 'Template saved successfully',
+    ],
+    'update' => [
+        'success' => 'Template updated successfully',
+    ],
+    'delete' => [
+        'success' => 'Template deleted',
+        'no_delete_permission' => 'Template does not exist or you do not have permission to delete it.',
+    ],
+];
diff --git a/resources/lang/en-ID/admin/settings/general.php b/resources/lang/en-ID/admin/settings/general.php
index 502316b055..1b680bc646 100644
--- a/resources/lang/en-ID/admin/settings/general.php
+++ b/resources/lang/en-ID/admin/settings/general.php
@@ -8,13 +8,13 @@ return [
     'ad_append_domain'          => 'Sisipkan nama domain pada baris nama pengguna',
     'ad_append_domain_help'     => 'Pengguna tidak diperlukan untuk menulis"namapengguna@domail.lokal", mereka dapat hanya menuliskan "namapengguna".',
     'admin_cc_email'            => 'Tembusan Email',
-    'admin_cc_email_help'       => 'Jika Anda ingin mengirim salinan email checkin / checkout yang dikirimkan ke pengguna akun email tambahan, masukkan di sini. Jika tidak, biarkan bidang ini kosong.',
+    'admin_cc_email_help'       => 'Send a copy of checkin/checkout emails to this address.',
     'admin_settings'            => 'Admin Settings',
     'is_ad'				        => 'Ini adalah server aktif direktori',
     'alerts'                	=> 'Alerts',
     'alert_title'               => 'Update Notification Settings',
     'alert_email'				=> 'Kirim peringatan kepada',
-    'alert_email_help'    => 'Email addresses or distribution lists you want alerts to be sent to, comma separated',
+    'alert_email_help'          => 'Email addresses or distribution lists you want alerts to be sent to, comma separated.',
     'alerts_enabled'			=> 'Peringatan Email Diaktifkan',
     'alert_interval'			=> 'Ambang batas waktu kadaluwarsa (dalam beberapa hari)',
     'alert_inv_threshold'		=> 'Ambang Batas Invertaris',
@@ -31,15 +31,18 @@ return [
     'backups'					=> 'Cadangkan',
     'backups_help'              => 'Create, download, and restore backups ',
     'backups_restoring'         => 'Restoring from Backup',
+    'backups_clean' => 'Clean the backed-up database before restore',
+    'backups_clean_helptext' => "This can be useful if you're changing between database versions",
     'backups_upload'            => 'Upload Backup',
     'backups_path'              => 'Backups on the server are stored in <code>:path</code>',
-    'backups_restore_warning'   => 'Use the restore button <small><span class="btn btn-xs btn-warning"><i class="text-white fas fa-retweet" aria-hidden="true"></i></span></small> to restore from a previous backup. (This does not currently work with S3 file storage or Docker.)<br><br>Your <strong>entire :app_name database and any uploaded files will be completely replaced</strong> by what\'s in the backup file.  ',
+    'backups_restore_warning'   => 'Use the restore button <small><span class="btn btn-xs btn-warning"><i class="text-white fas fa-retweet" aria-hidden="true"></i></span></small> to restore from a previous backup. (This does not currently work with S3 file storage or Docker.)<br><br>Your <strong>entire :app_name database and any uploaded files will be completely replaced</strong> by what\'s in the backup file  ',
     'backups_logged_out'         => 'All existing users, including you, will be logged out once your restore is complete.',
     'backups_large'             => 'Very large backups may time out on the restore attempt and may still need to be run via command line. ',
     'barcode_settings'			=> 'Pengaturan Kode batang',
     'confirm_purge'			    => 'Konfirmasi Pembersihan',
     'confirm_purge_help'		=> 'Masukkan teks "DELETE" di dalam kotak dibawah untuk menghapus total rekaman yang telah dihapus. Tindakan ini tidak dapat dikembalikan dan akan menghapus sermua item dan pengguna yang terhapus-lunak secara PERMANEN. (Anda garus membuat sebuah cadangan terlebih dahulu, untuk berjaga-jaga.)',
     'custom_css'				=> 'Kustom CSS',
+    'custom_css_placeholder'	=> 'Add your custom CSS',
     'custom_css_help'			=> 'Masukkan setiap penimpaan CSS ubah sesuai yang ingin anda gunakan jangan sertakan&lt;gaya&lt;/gaya&gt;tag.',
     'custom_forgot_pass_url'	=> 'Atur Ulang Kata Sandi URL tempahan',
     'custom_forgot_pass_url_help'	=> 'Ini menggantikan URL lupa sandi bawaan dilayar masuk, berguna untuk mengarahkan orang ke fungsi penyetelan ulang kata sandi bawaan internal atau yang dihost. Ini akan secara efektif menonaktifkan pengguna lupa fungsi kata sandi.',
@@ -47,34 +50,34 @@ return [
     'dashboard_message_help'	=> 'Tulisan ini akan muncul di beranda bagi siapa saja yang memiliki izin untuk melihat beranda.',
     'default_currency'  		=> 'Mata Uang bawaan',
     'default_eula_text'			=> 'EULA bawaan',
+    'default_eula_text_placeholder' => 'Add your default EULA text',
     'default_language'			=> 'Bahasa Dasar',
     'default_eula_help_text'	=> 'Anda juga dapat mengaitkan EULA kastom dengan kategori aset tertentu.',
     'acceptance_note'           => 'Add a note for your decision (Optional)',
     'display_asset_name'        => 'Tampilan nama aset',
     'display_checkout_date'     => 'Tampilan tanggal keluar',
     'display_eol'               => 'Tampilkan EOL dalam tampilan tabel',
-    'display_qr'                => 'Kode Tampilan Persegi',
+    'display_qr'                => 'Display 2D barcode',
     'display_alt_barcode'		=> 'Tampilkan kode batang 1D',
-    'email_logo'                => 'Logo Email',
     'barcode_type'				=> 'Tipe Kode Batang 2D',
     'alt_barcode_type'			=> 'Tipe Kode Batang 1D',
-    'email_logo_size'       => 'Logo berbentuk kotak terlihat bagus pada email. ',
     'enabled'                   => 'Enabled',
     'eula_settings'				=> 'Pengaturan EULA',
     'eula_markdown'				=> 'EULA ini memungkinkan <a href="https://help.github.com/articles/github-flavored-markdown/">Github merasakan penurunan harga</a>.',
+    'empty_row_count'           => 'Field Start Offset (Empty Rows)',
+    'empty_row_count_help'      => 'Fields will begin populating after this many empty rows are skipped at the top of the label.',
     'favicon'                   => 'Ikonfavorit',
     'favicon_format'            => 'Jenis berkas yang diterima adalah ico, png, dan gif. Format gambar lainnya mungkin tidak bekerja di semua peramban web.',
     'favicon_size'          => 'Ikonfavorit harus berupa gambar berbentuk kotak. 16x16 piksel.',
     'footer_text'               => 'Teks Footer Tambahan ',
     'footer_text_help'          => 'Teks ini akan muncul di footer sisi kanan. Tautan diizinkan menggunakan <a href="https://help.github.com/articles/github-flavored-markdown/">Github flavored markdown</a>. Jeda, tajuk, gambar, dll bisa mengakibatkan hasil yang tidak dapat diprediksi.',
+    'footer_text_placeholder'   => 'Optional footer text',
     'general_settings'			=> 'Pengaturan Umum',
-    'general_settings_keywords' => 'company support, signature, acceptance, email format, username format, images, per page, thumbnail, eula, gravatar, tos, dashboard, privacy',
     'general_settings_help'     => 'Default EULA and more',
     'generate_backup'			=> 'Membuat Cadangan',
     'google_workspaces'         => 'Google Workspaces',
     'header_color'              => 'Warna Header',
     'info'                      => 'Penggaturan ini memungkinkan anda menyesuaikan aspek-aspek tertentu dari instalasi anda.',
-    'label_logo'                => 'Logo Label',
     'label_logo_size'           => 'Logo berbentuk kotak terlihat bagus - akan ditampilkan pada bagian kanan atas dari setiap label aset. ',
     'laravel'                   => 'Versi Laravel',
     'ldap'                      => 'LDAP',
@@ -94,7 +97,7 @@ return [
     'ldap_login_sync_help'      => 'Ini hanya tes yang bisa dilacak LDAP dengan benar. Jika pengesahan LDAP anda tidak benar, pengguna mungkin masih belum dapat masuk. ANDA HARUS MENYIMPAN PENGATURAN LDAP YANG ANDA PERBARUI PERTAMA.',
     'ldap_manager'              => 'LDAP Manager',
     'ldap_server'               => 'Server LDAP',
-    'ldap_server_help'          => 'Ini harus dimulai dengan ldap:// (for unencrypted or TLS) or ldaps:// (for SSL)',
+    'ldap_server_help'          => 'This should start with ldap:// (for unencrypted) or ldaps:// (for TLS or SSL)',
     'ldap_server_cert'			=> 'Validasi sertifikat SSL LDAP',
     'ldap_server_cert_ignore'	=> 'Izinkan Sertifikat SSL yang tidak sah',
     'ldap_server_cert_help'		=> 'Pilih kotak centang ini jika anda menggunakan sertifikat SSL yang masuk sendiri dan ingin menerima sertifikat SSL yang tidak sah.',
@@ -108,8 +111,8 @@ return [
     'ldap_pword'                => 'LDAP Bind sandi',
     'ldap_basedn'               => 'Mengikat Dasar DN',
     'ldap_filter'               => 'Saring LDAP',
-    'ldap_pw_sync'              => 'Sinkronisasi kata sandi LDAP',
-    'ldap_pw_sync_help'         => 'Hapus centang pada kotak ini jika anda tidak ingin menyimpan kata sandi LDAP yang disinkronkan dengan kata sandi lokal. Menonaktifkan ini berarti pengguna anda tidak dapat masuk jika server LDAP anda tidak dapat dijangkau karena alasan tertentu.',
+    'ldap_pw_sync'              => 'Cache LDAP Passwords',
+    'ldap_pw_sync_help'         => 'Uncheck this box if you do not wish to keep LDAP passwords cached as local hashed passwords. Disabling this means that your users may not be able to login if your LDAP server is unreachable for some reason.',
     'ldap_username_field'       => 'Bidang Nama Pengguna',
     'ldap_lname_field'          => 'Nama Terakhir',
     'ldap_fname_field'          => 'Nama Depan LDAP',
@@ -117,13 +120,15 @@ return [
     'ldap_version'              => 'Versi LDAP',
     'ldap_active_flag'          => 'Bendera Aktif LDAP',
     'ldap_activated_flag_help'  => 'This value is used to determine whether a synced user can login to Snipe-IT. <strong>It does not affect the ability to check items in or out to them</strong>, and should be the <strong>attribute name</strong> within your AD/LDAP, <strong>not the value</strong>. <br><br>If this field is set to a field name that does not exist in your AD/LDAP, or the value in the AD/LDAP field is set to <code>0</code> or <code>false</code>, <strong>user login will be disabled</strong>. If the value in the AD/LDAP field is set to <code>1</code> or <code>true</code> or <em>any other text</em> means the user can log in. When the field is blank in your AD, we respect the <code>userAccountControl</code> attribute, which usually allows non-suspended users to log in.',
+    'ldap_invert_active_flag'   => 'LDAP Invert Active Flag',
+    'ldap_invert_active_flag_help'     => 'If enabled: when the value returned by LDAP Active Flag is <code>0</code> or <code>false</code> the user account will be active.',
     'ldap_emp_num'              => 'Nomor Karyawan LDAP',
     'ldap_email'                => 'Email LDAP',
     'ldap_test'                 => 'Test LDAP',
     'ldap_test_sync'            => 'Test LDAP Synchronization',
     'license'                   => 'Lisensi perangkat lunak',
-    'load_remote'               => 'Use Gravatar',
-    'load_remote_help_text'		=> 'Uncheck this box if your install cannot load scripts from the outside internet. This will prevent Snipe-IT from trying load images from Gravatar.',
+    'load_remote'               => 'Load Remote Avatars',
+    'load_remote_help_text'		=> 'Uncheck this box if your install cannot load scripts from the outside internet. This will prevent Snipe-IT from trying load avatars from Gravatar or other outside sources.',
     'login'                     => 'Login Attempts',
     'login_attempt'             => 'Login Attempt',
     'login_ip'                  => 'IP Address',
@@ -131,6 +136,7 @@ return [
     'login_user_agent'          => 'User Agent',
     'login_help'                => 'List of attempted logins',
     'login_note'                => 'Catatan Masuk',
+    'login_note_placeholder'            => "If you do not have a login or have found a device belonging to this company, please call technical support at 888-555-1212. Thank you.",
     'login_note_help'           => 'Opsional memasukkan beberapa kalimat di layar masuk anda, misalnya membantu orang-orang yang telah menemukan perangkat yang hilang atau dicuri. Bidang ini menerima <a href="https://help.github.com/articles/github-flavored-markdown/">Rasa penurunan Github</a>',
     'login_remote_user_text'    => 'Opsi masuk untuk Pengguna Jarak Jauh',
     'login_remote_user_enabled_text' => 'Aktifkan Login dengan Remote User Header',
@@ -146,13 +152,16 @@ return [
     'logo_print_assets_help'    => 'Menggunakan branding Anda pada semua hasil cetak daftar aset ',
     'full_multiple_companies_support_help_text' => 'Membatasi pengguna (termasuk admin) yang ditugaskan ke perusahaan untuk aset perusahaan mereka.',
     'full_multiple_companies_support_text' => 'Dukungan Banyak Perusahaan',
+    'scope_locations_fmcs_support_text'  => 'Scope Locations with Full Multiple Companies Support',
+    'scope_locations_fmcs_support_help_text'  => 'Restrict locations to their selected company.',
+    'scope_locations_fmcs_check_button' => 'Check Compatibility',
+    'scope_locations_fmcs_support_disabled_text'  => 'This option is disabled because you have conflicting locations set for :count or more items.',
     'show_in_model_list'   => 'Tunjukkan di Model dalam urutan ke bawah',
     'optional'					=> 'pilihan',
     'per_page'                  => 'Hasil Per Halaman',
     'php'                       => 'Versi PHP',
-    'php_info'                  => 'PHP Info',
+    'php_info'                  => 'PHP info',
     'php_overview'              => 'PHP',
-    'php_overview_keywords'     => 'phpinfo, system, info',
     'php_overview_help'         => 'PHP System info',
     'php_gd_info'               => 'Anda harus menginstall php-gd untuk menampilkan kode QR, lihat petunjuk pemasangan.',
     'php_gd_warning'            => 'Pengolahan gambar PHP dan plugin GD TIDAK terpasang.',
@@ -218,6 +227,8 @@ return [
     'webhook_integration_help'    => ':app integration is optional, however the endpoint and channel are required if you wish to use it. To configure :app integration, you must first <a href=":webhook_link" target="_new" rel="noopener">create an incoming webhook</a> on your :app account. Click on the <strong>Test :app Integration</strong> button to confirm your settings are correct before saving. ',
     'webhook_integration_help_button'    => 'Once you have saved your :app information, a test button will appear.',
     'webhook_test_help'           => 'Test whether your :app integration is configured correctly. YOU MUST SAVE YOUR UPDATED :app SETTINGS FIRST.',
+    'shortcuts_enabled'         => 'Enable Shortcuts',
+    'shortcuts_help_text'       => '<strong>Windows</strong>: Alt + Access key, <strong>Mac</strong>: Control + Option + Access key',
     'snipe_version'  			=> 'Versi Snipe-IT',
     'support_footer'            => 'Link footer pendukung ',
     'support_footer_help'       => 'Tentukan siapa yang melihat tautan ke informasi pendukung dan panduan pengguna Snipe-IT',
@@ -227,7 +238,6 @@ return [
     'update'                    => 'Perbarui Setelan',
     'value'                     => 'Jumlah',
     'brand'                     => 'Bermerek',
-    'brand_keywords'            => 'footer, logo, print, theme, skin, header, colors, color, css',
     'brand_help'                => 'Logo, Site Name',
     'web_brand'                 => 'Web Branding Type',
     'about_settings_title'      => 'Tentang Pengaturan',
@@ -276,6 +286,8 @@ return [
     'two_factor_enrollment_text'	=> "Diperlukan dua faktor otentikasi, namun perangkat anda belum terdaftar. Buka aplikasi Google Authenticator anda dan pindai kode QR dibawah ini untuk mendaftarkan perangkat anda. Setelah perangkat anda terdaftar, masukkan kode dibawah ini",
     'require_accept_signature'      => 'Membutuhkan Tanda Tangan',
     'require_accept_signature_help_text'      => 'Mengaktifkan fitur ini akan mengharuskan pengguna secara fisik menandatangani untuk menerima aset.',
+    'require_checkinout_notes'  => 'Require Notes on Checkin/Checkout',
+    'require_checkinout_notes_help_text'    => 'Enabling this feature will require the note fields to be populated when checking in or checking out an asset.',
     'left'        => 'kiri',
     'right'        => 'kanan',
     'top'        => 'atas',
@@ -313,24 +325,24 @@ return [
     'filter_by_keyword' => 'Filter by setting keyword',
     'security' => 'Security',
     'security_title' => 'Update Security Settings',
-    'security_keywords' => 'password, passwords, requirements, two factor, two-factor, common passwords, remote login, logout, authentication',
     'security_help' => 'Two-factor, Password Restrictions',
-    'groups_keywords' => 'permissions, permission groups, authorization',
     'groups_help' => 'Account permission groups',
     'localization' => 'Localization',
     'localization_title' => 'Update Localization Settings',
-    'localization_keywords' => 'localization, currency, local, locale, time zone, timezone, international, internatinalization, language, languages, translation',
     'localization_help' => 'Language, date display',
     'notifications' => 'Notifications',
     'notifications_help' => 'Email Alerts & Audit Settings',
     'asset_tags_help' => 'Incrementing and prefixes',
     'labels' => 'Labels',
     'labels_title' => 'Update Label Settings',
-    'labels_help' => 'Label sizes &amp; settings',
-    'purge_keywords' => 'permanently delete',
+    'labels_help' => 'Barcodes &amp; label settings',
     'purge_help' => 'Bersihkan Arsip yang Dihapus',
     'ldap_extension_warning' => 'It does not look like the LDAP extension is installed or enabled on this server. You can still save your settings, but you will need to enable the LDAP extension for PHP before LDAP syncing or login will work.',
     'ldap_ad' => 'LDAP/AD',
+    'ldap_test_label' => 'Test LDAP Sync',
+    'ldap_test_login' => ' Test LDAP Login',
+    'ldap_username_placeholder' => 'LDAP Username',
+    'ldap_password_placeholder' => 'LDAP Password',
     'employee_number' => 'Employee Number',
     'create_admin_user' => 'Create a User ::',
     'create_admin_success' => 'Success! Your admin user has been added!',
@@ -342,6 +354,8 @@ return [
     'setup_migration_create_user' => 'Next: Create User',
     'ldap_settings_link' => 'LDAP Settings Page',
     'slack_test' => 'Test <i class="fab fa-slack"></i> Integration',
+    'status_label_name' => 'Status Label Name',
+    'super_admin_only'  => 'Super Admin Only',
     'label2_enable'           => 'New Label Engine',
     'label2_enable_help'      => 'Switch to the new label engine. <b>Note: You will need to save this setting before setting others.</b>',
     'label2_template'         => 'Template',
@@ -356,12 +370,15 @@ return [
     'label2_2d_type'          => 'Tipe Kode Batang 2D',
     'label2_2d_type_help'     => 'Format for 2D barcodes',
     'label2_2d_target'        => '2D Barcode Target',
-    'label2_2d_target_help'   => 'The URL the 2D barcode points to when scanned',
+    'label2_2d_target_help'   => 'The data that will be contained in the 2D barcode',
     'label2_fields'           => 'Field Definitions',
     'label2_fields_help'      => 'Fields can be added, removed, and reordered in the left column. For each field, multiple options for Label and DataSource can be added, removed, and reordered in the right column.',
+    'purge_barcodes' => 'Purge Barcodes',
     'help_asterisk_bold'    => 'Text entered as <code>**text**</code> will be displayed as bold',
     'help_blank_to_use'     => 'Leave blank to use the value from <code>:setting_name</code>',
     'help_default_will_use' => '<code>:default</code> will use the value from <code>:setting_name</code>. <br>Note that the value of the barcodes must comply with the respective barcode spec in order to be successfully generated. Please see <a href="https://snipe-it.readme.io/docs/barcodes">the documentation <i class="fa fa-external-link"></i></a> for more details. ',
+    'asset_id'              => 'Asset ID',
+    'data'               => 'Data',
     'default'               => 'Default',
     'none'                  => 'None',
     'google_callback_help' => 'This should be entered as the callback URL in your Google OAuth app settings in your organization&apos;s <strong><a href="https://console.cloud.google.com/" target="_blank">Google developer console <i class="fa fa-external-link" aria-hidden="true"></i></a></strong>.',
@@ -373,7 +390,100 @@ return [
     'database_driver' => 'Database Driver',
     'bs_table_storage' => 'Table Storage',
     'timezone' => 'Timezone',
+    'test_mail' => 'Test Mail',
     'profile_edit'          => 'Edit Profile',
     'profile_edit_help'          => 'Allow users to edit their own profiles.',
+    'default_avatar' => 'Custom Default Avatar',
+    'default_avatar_help' => 'This image will be displayed as a profile if a user does not have a profile photo.',
+    'restore_default_avatar' => 'Restore <a href=":default_avatar" data-toggle="lightbox" data-type="image">original system default avatar</a>',
+    'restore_default_avatar_help' => '',
+    'due_checkin_days' => 'Due For Checkin Warning',
+    'due_checkin_days_help' => 'How many days before the expected checkin of an asset should it be listed in the "Due for checkin" page?',
+    'no_groups' => 'No groups have been created yet. Visit <code>Admin Settings > Permission Groups</code> to add one.',
+    'text' => 'Text',
+
+    'username_formats' => [
+        'username_format'		=> 'Format nama pengguna',
+        'firstname_lastname_format'	=> 'Nama Depan Nama Belakang (jane.smith)',
+        'first_name_format'	        => 'First Name (jane)',
+        'last_name_format'		=> 'Last Name (doe)',
+        'filastname_format'			=> 'First Initial Last Name (jsmith)',
+        'lastnamefirstinitial_format' =>  'Last Name First Initial (smithj)',
+        'firstname_lastname_underscore_format' => 'First Name Last Name (jane_smith)',
+        'firstinitial.lastname' => 'First Initial Last Name (j.smith)',
+        'lastname_firstinitial' => 'Last Name First Initial (smith_j)',
+        'lastname_dot_firstinitial_format' => 'Last Name First Initial (smith.j)',
+        'firstnamelastname'     => 'First Name Last Name (janesmith)',
+        'firstnamelastinitial'  => 'First Name Last Initial (janes)',
+        'lastnamefirstname'      => 'Last Name.First Name (smith.jane)',
+    ],
+
+    'email_formats' => [
+        'email_format'			=> 'Format Surel',
+        'firstname_lastname_format'	=> 'Nama Depan Nama Belakang (jane.smith@example.com)',
+        'first_name_format'		=> 'Nama Depan (jane@example.com)',
+        'last_name_format'		=> 'Last Name (doe@example.com)',
+        'filastname_format'			=> 'Nama Depan Nama Belakang (jane.smith@example.com)',
+        'lastnamefirstinitial_format' =>  'Nama Depan First Initial (smithj@example.com)',
+        'firstname_lastname_underscore_format' => 'Nama Depan Nama Belakang (jane.smith@example.com)',
+        'firstinitial.lastname' => 'First Initial Last Name (j.smith@example.com)',
+        'lastname_firstinitial' => 'Last Name First Initial (smith_j@example.com)',
+        'lastname_dot_firstinitial_format' => 'Last Name First Initial (smith.j@example.com)',
+        'firstnamelastname'     => 'First Name Last Name (janesmith@example.com)',
+        'firstnamelastinitial'  => 'First Name Last Initial (janes@example.com)',
+        'lastnamefirstname'      => 'Last Name.First Name (smith.jane@example.com)',
+    ],
+
+
+
+    'logo_labels' => [
+        'acceptance_pdf_logo'       => 'PDF Logo',
+        'email_logo'                => 'Logo Email',
+        'label_logo'                => 'Logo Label',
+        'logo'                      => 'Site Logo',
+        'favicon'                   => 'Ikonfavorit',
+    ],
+
+    'logo_help' => [
+        'email_logo_size'       => 'Logo berbentuk kotak terlihat bagus pada email. ',
+    ],
+
+    'logo_option_types' => [
+        'text' => 'Text',
+        'logo' => 'Logo',
+        'logo_and_text' => 'Logo and Text',
+    ],
+
+
+    'legends' => [
+        'scoping' => 'Scoping',
+        'formats' => 'Default Formats',
+        'profiles' => 'User Profiles',
+        'eula' => 'EULA & Acceptance Preferences',
+        'misc_display' => 'Miscellaneous Display Options',
+        'email' => 'Email Preferences',
+        'checkin' => 'Checkin Preferences',
+        'dashboard' => 'Login & Dashboard Preferences',
+        'misc' => 'Miscellaneous',
+        'logos' => 'Logos & Display',
+        'colors' => 'Colors & Skins',
+        'footer' => 'Footer Preferences',
+        'security' => 'Security Preferences',
+        'general' => 'General',
+        'intervals' => 'Intervals & Thresholds',
+    ],
+
+
+    /* Keywords for settings overview help */
+    'keywords' => [
+        'brand'             => 'footer, logo, print, theme, skin, header, colors, color, css',
+        'general_settings'  => 'company support, signature, acceptance, email format, username format, images, per page, thumbnail, eula, gravatar, tos, dashboard, privacy',
+        'groups'            => 'permissions, permission groups, authorization',
+        'labels'            => 'labels, barcodes, barcode, sheets, print, upc, qr, 1d, 2d',
+        'localization'      => 'localization, currency, local, locale, time zone, timezone, international, internatinalization, language, languages, translation',
+        'php_overview'      => 'phpinfo, system, info',
+        'purge'             => 'permanently delete',
+        'security'          => 'password, passwords, requirements, two factor, two-factor, common passwords, remote login, logout, authentication',
+    ],
 
 ];
diff --git a/resources/lang/en-ID/admin/settings/message.php b/resources/lang/en-ID/admin/settings/message.php
index 7ce0ee8d8f..924dc23890 100644
--- a/resources/lang/en-ID/admin/settings/message.php
+++ b/resources/lang/en-ID/admin/settings/message.php
@@ -14,6 +14,9 @@ return [
         'restore_warning'       => 'Yes, restore it. I acknowledge that this will overwrite any existing data currently in the database. This will also log out all of your existing users (including you).',
         'restore_confirm'       => 'Are you sure you wish to restore your database from :filename?'
     ],
+    'restore' => [
+        'success'               => 'Your system backup has been restored. Please log in again.'
+    ],
     'purge' => [
         'error'     => 'Terjadi kesalahan saat membersihkan. ',
         'validation_failed'     => 'Konfirmasi pembersihan Anda salah Ketikkan kata "HAPUS" di kotak konfirmasi.',
@@ -33,6 +36,9 @@ return [
         'testing_authentication' => 'Testing LDAP Authentication...',
         'authentication_success' => 'User authenticated against LDAP successfully!'
     ],
+    'labels' => [
+        'null_template' => 'Label template not found. Please select a template.',
+        ],
     'webhook' => [
         'sending' => 'Sending :app test message...',
         'success' => 'Your :webhook_name Integration works!',
@@ -42,5 +48,12 @@ return [
         'error' => 'Something went wrong. :app responded with: :error_message',
         'error_redirect' => 'ERROR: 301/302 :endpoint returns a redirect. For security reasons, we don’t follow redirects. Please use the actual endpoint.',
         'error_misc' => 'Something went wrong. :( ',
-    ]
+        'webhook_fail' => ' webhook notification failed: Check to make sure the URL is still valid.',
+        'webhook_channel_not_found' => ' webhook channel not found.',
+        'ms_teams_deprecation' => 'The selected Microsoft Teams webhook URL will be deprecated Dec 31st, 2025. Please use a workflow URL. Microsoft\'s documentation on creating a workflow can be found <a href="https://support.microsoft.com/en-us/office/create-incoming-webhooks-with-workflows-for-microsoft-teams-8ae491c7-0394-4861-ba59-055e33f75498" target="_blank"> here.</a>',
+    ],
+    'location_scoping' => [
+        'not_saved' => 'Your settings were not saved.',
+        'mismatch' => 'There is 1 item in the database that need your attention before you can enable location scoping.|There are :count items in the database that need your attention before you can enable location scoping.',
+    ],
 ];
diff --git a/resources/lang/en-ID/admin/statuslabels/message.php b/resources/lang/en-ID/admin/statuslabels/message.php
index 7096987ed4..9e97935e36 100644
--- a/resources/lang/en-ID/admin/statuslabels/message.php
+++ b/resources/lang/en-ID/admin/statuslabels/message.php
@@ -3,7 +3,7 @@
 return [
 
     'does_not_exist' => 'Label Status tidak tersedia.',
-    'deleted_label' => 'Deleted Status Label',
+    'deleted_label' => 'Hapus status Label',
     'assoc_assets'	 => 'Label status ini dikaitkan dengan setidaknya satu aset dan tidak dapat dihapus. Harap perbarui aset anda agar tidak merujuk pada status ini dan coba lagi. ',
 
     'create' => [
diff --git a/resources/lang/en-ID/admin/statuslabels/table.php b/resources/lang/en-ID/admin/statuslabels/table.php
index 4ae772ca9d..04e3a268f2 100644
--- a/resources/lang/en-ID/admin/statuslabels/table.php
+++ b/resources/lang/en-ID/admin/statuslabels/table.php
@@ -1,14 +1,14 @@
 <?php
 
 return array(
-    'about'      	=> 'Tentang Label Status',
+    'about'      	=> 'About Status Types',
     'archived'      	=> 'Diarsipkan',
     'create'      	=> 'Buat label status',
     'color'      	=> 'Warna bagan',
     'default_label' => 'Label standar',
     'default_label_help' => 'Ini digunakan untuk memastikan label status yang paling sering digunakan muncul di bagian atas kotak pilih saat membuat / mengedit aset.',
     'deployable'      	=> 'Bisa disebarkan',
-    'info'      	=> 'Label status digunakan untuk menggambarkan berbagai keadaan aset Anda. Mungkin ada perbaikan, kehilangan / pencurian, dll. Anda dapat membuat label status baru untuk aset yang dapat dideplesikan, tertunda dan diarsipkan.',
+    'info'      	=> 'Status label types are used to describe the various states your assets could be in. They may be out for repair, lost/stolen, etc. You can create new status labels for your deployable, pending and archived assets according to your own workflow. For more information, <a href="https://snipe-it.readme.io/docs/overview#status-labels" target="_blank">see the documentation <i class="fa fa-external-link"></i></a>.',
     'name'      	=> 'Nama status',
     'pending'      	=> 'Tertunda',
     'status_type'   => 'Tipe status',
diff --git a/resources/lang/en-ID/admin/users/general.php b/resources/lang/en-ID/admin/users/general.php
index 3de10a0bf5..2ffb859b2b 100644
--- a/resources/lang/en-ID/admin/users/general.php
+++ b/resources/lang/en-ID/admin/users/general.php
@@ -19,6 +19,8 @@ return [
     'print_assigned'    => 'Cetak semua yang ditetapkan',
     'email_assigned'    => 'Email List of All Assigned',
     'user_notified'     => 'User has been emailed a list of their currently assigned items.',
+    'users_notified'    => 'The user has been emailed a list of their currently assigned items.|:count users have been emailed a list of their currently assigned items.',
+    'users_notified_warning' => ':count user has been emailed a list of their currently assigned items, however :no_email users did not have an email address so could not be emailed.|:count users have been emailed a list of their currently assigned items, however :no_email user(s) did not have an email address so could not be emailed.',
     'auto_assign_label' => 'Include this user when auto-assigning eligible licenses',
     'auto_assign_help'  => 'Skip this user in auto assignment of licenses',
     'software_user'     => 'Software diperiksa untuk :name',
diff --git a/resources/lang/en-ID/admin/users/message.php b/resources/lang/en-ID/admin/users/message.php
index 868d53fa50..bbb4df558a 100644
--- a/resources/lang/en-ID/admin/users/message.php
+++ b/resources/lang/en-ID/admin/users/message.php
@@ -6,7 +6,7 @@ return array(
     'declined'                  => 'Anda sudah berhasil menolak aset ini.',
     'bulk_manager_warn'	        => 'Pengguna anda sudah berhasil diperbarui, namun entri manajer anda tidak disimpan karena manajer yang anda pilih juga berada dalam daftar pengguna untuk disunting, dan pengguna mungkin bukan manajer mereka sendiri. Silahkan pilih pengguna anda lagi, tidak termasuk manajernya.',
     'user_exists'               => 'Pengguna sudah ada!',
-    'user_not_found'            => 'Pengguna tidak ada.',
+    'user_not_found'            => 'User does not exist or you do not have permission view them.',
     'user_login_required'       => 'Bidang masuk diperlukan',
     'user_has_no_assets_assigned' => 'No assets currently assigned to user.',
     'user_password_required'    => 'Kata sandi diperlukan.',
@@ -53,6 +53,7 @@ return array(
         'ldap_could_not_search' => 'Tidak dapat mencari peladen LDAP. Silahkan periksa konfigurasi peladen LDAP anda di berkas konfigurasi LDAP.<br>Kesalahan dari peladen LDAP:',
         'ldap_could_not_get_entries' => 'Tidak bisa mendapatkan entri dari peladen LDAP. Silakan periksa konfigurasi peladen LDAP Anda di berkas konfigurasi LDAP. <br> Kesalahan dari peladen LDAP:',
         'password_ldap' => 'Kata sandi untuk akun ini dikelola oleh LDAP/Direktori Aktif. Silakan hubungi departemen IT Anda untuk mengubah kata sandi Anda. ',
+        'multi_company_items_assigned' => 'This user has items assigned that belong to a different company. Please check them in or edit their company.'
     ),
 
     'deletefile' => array(
diff --git a/resources/lang/en-ID/admin/users/table.php b/resources/lang/en-ID/admin/users/table.php
index e3269b25df..0bf7d9ceb8 100644
--- a/resources/lang/en-ID/admin/users/table.php
+++ b/resources/lang/en-ID/admin/users/table.php
@@ -22,7 +22,7 @@ return array(
     'managed_locations'     => 'Lokasi yang Dikelola',
     'managed_users'         => 'Managed Users',
     'name' 					=> 'Nama',
-    'nogroup'               => 'No groups have been created yet. To add one, visit: ',
+    'nogroup'               => 'No groups have been created yet. To add one, visit:',
     'notes'                 => 'Catatan',
     'password_confirm' 		=> 'Konfirmasi kata sandi',
     'password' 				=> 'Kata Sandi',
diff --git a/resources/lang/en-ID/auth.php b/resources/lang/en-ID/auth.php
index db310aa1bb..14d8acfce0 100644
--- a/resources/lang/en-ID/auth.php
+++ b/resources/lang/en-ID/auth.php
@@ -15,6 +15,6 @@ return array(
 
     'failed' => 'These credentials do not match our records.',
     'password' => 'The provided password is incorrect.',
-    'throttle' => 'Too many login attempts. Please try again in :seconds seconds.',
+    'throttle' => 'Too many login attempts. Please try again in :minutes minute(s).',
 
 );
diff --git a/resources/lang/en-ID/auth/message.php b/resources/lang/en-ID/auth/message.php
index 1c234cba0c..501715dd4f 100644
--- a/resources/lang/en-ID/auth/message.php
+++ b/resources/lang/en-ID/auth/message.php
@@ -6,8 +6,6 @@ return array(
     'account_not_found'      => 'Nama pengguna atau kata sandi salah.',
     'account_not_activated'  => 'Akun pengguna ini tidak aktif.',
     'account_suspended'      => 'Akun pengguna ini ditangguhkan.',
-    'account_banned'         => 'Akun pengguna ini diblokir.',
-    'throttle'               => 'Too many failed login attempts. Please try again in :minutes minutes.',
 
     'two_factor' => array(
         'already_enrolled'      => 'Your device is already enrolled.',
diff --git a/resources/lang/en-ID/button.php b/resources/lang/en-ID/button.php
index 2d87a1e11b..dc03568d1e 100644
--- a/resources/lang/en-ID/button.php
+++ b/resources/lang/en-ID/button.php
@@ -7,6 +7,7 @@ return [
     'checkin_and_delete'  	    => 'Checkin All / Delete User',
     'delete'  	                => 'Hapus',
     'edit'    	                => 'Sunting',
+    'clone'    	                => 'Clone',
     'restore' 	                => 'Kembalikan',
     'remove'                    => 'Remove',
     'request'                   => 'Permintaan',
@@ -21,4 +22,13 @@ return [
     'add_maintenance'           => 'Add Maintenance',
     'append'                    => 'Append',
     'new'                       => 'Baru',
+    'var' => [
+        'clone'     => 'Clone :item_type',
+        'edit'      => 'Edit :item_type',
+        'delete'    => 'Delete :item_type',
+        'restore'   => 'Restore :item_type',
+        'create'    => 'Create New :item_type',
+        'checkout'  => 'Checkout :item_type',
+        'checkin'   => 'Checkin :item_type',
+    ]
 ];
diff --git a/resources/lang/en-ID/general.php b/resources/lang/en-ID/general.php
index d9afdbea23..4d27619cf6 100644
--- a/resources/lang/en-ID/general.php
+++ b/resources/lang/en-ID/general.php
@@ -10,7 +10,7 @@ return [
     'action'                => 'Langkah',
     'activity_report'		=> 'Laporan Aktifitas',
     'address'				=> 'Alamat',
-    'admin'					=> 'Admin',
+    'admin'					=> 'Admin Settings',
     'admin_tooltip'			=> 'This user has admin privileges',
     'superuser'				=> 'Superuser',
     'superuser_tooltip'		=> 'This user has superuser privileges',
@@ -23,13 +23,16 @@ return [
     'asset_models'			=> 'Model aset',
     'asset_model'			=> 'Model',
     'asset'					=> 'Aset',
+    'asset_previous'        => 'Asset (Previously Assigned)',
     'asset_report'          => 'Laporan aset',
     'asset_tag'				=> 'Penanda aset',
     'asset_tags'            => 'Asset Tags',
     'assets_available'		=> 'Assets available',
     'accept_assets'         => 'Accept Assets :name',
     'accept_assets_menu'    => 'Accept Assets',
+    'accept_item'           => 'Accept Item',
     'audit'				    => 'Audit',
+    'audits'				=> 'Audits',
     'audit_report'			=> 'Audit Log',
     'assets'				=> 'Aset',
     'assets_audited'        => 'assets audited',
@@ -61,9 +64,12 @@ return [
     'changepassword'  		=> 'Ubah kata sandi',
     'checkin'  				=> 'Mendaftar',
     'checkin_from'  		=> 'Checkin dari',
+    'checkin_note'  		=> 'Checkin Note',
+    'checkout_note'  		=> 'Checkout Note',
     'checkout'  			=> 'Checkout',
     'checkouts_count'       => 'Keluar',
     'checkins_count'        => 'Masuk',
+    'checkin_and_delete'  	=> 'Checkin and Delete',
     'user_requests_count'   => 'Permintaan',
     'city'  				=> 'Kota',
     'click_here'			=> 'Klik disini',
@@ -77,7 +83,7 @@ return [
     'consumables'			=> 'Dapat dikonsumsi',
     'country'  				=> 'Negara',
     'could_not_restore'     => 'Error restoring :item_type: :error',
-    'not_deleted'           => 'The :item_type is not deleted so it cannot be restored',
+    'not_deleted'           => 'The :item_type was not deleted and therefore cannot be restored',
     'create'				=> 'Buat baru',
     'created'               => 'Item telah dibuat',
     'created_asset'			=> 'buat aset',
@@ -86,11 +92,13 @@ return [
     'record_created' 		=> 'Record Created',
     'updated_at' 			=> 'Diperbarui pada',
     'currency'  			=> 'IDR', // this is deprecated
+    'currency_text'  		=> 'Currency', //
     'current'  				=> 'Saat ini',
     'current_password'      => 'Current Password',
     'customize_report'      => 'Customize Report',
     'custom_report'         => 'Laporan aset kostum',
     'dashboard'				=> 'Dashboard',
+    'data_source'           => 'Data Source',
     'days'      			=> 'hari',
     'days_to_next_audit'    => 'Hari untuk audit selanjutnya',
     'date'					=> 'Tanggal',
@@ -98,7 +106,7 @@ return [
     'debug_warning_text'    => 'Aplikasi ini berjalan dalam mode produksi dengan debugging diaktifkan. Hal ini dapat mengekspos data sensitif jika aplikasi Anda dapat diakses oleh dunia luar. Nonaktifkan mode debug dengan menetapkan nilai <code>APP_DEBUG</code> value in your <code>.env</code> file to <code>false</code>.',
     'delete'  				=> 'Hapus',
     'delete_confirm'  		=> 'Apa Anda yakin untuk menghapus :item?',
-    'delete_confirm_no_undo' => 'Are you sure you wish to delete :item? This can not be undone.',
+    'delete_confirm_no_undo' => 'Are you sure, you wish to delete :item? This cannot be undone.',
     'deleted'  				=> 'Dihapus',
     'delete_seats'  		=> 'Tempat dihapus',
     'deletion_failed'       => 'Deletion failed',
@@ -114,29 +122,13 @@ return [
     'editprofile'  			=> 'Sunting profil anda',
     'eol'					=> 'EOL',
     'email_domain'			=> 'Email Domain',
-    'email_format'			=> 'Format Surel',
     'employee_number'       => 'Employee Number',
     'email_domain_help'		=> 'Ini digunakan untuk menghasilkan alamat surel ketika saat mengimpor',
     'error'				    => 'Error',
     'exclude_archived'      => 'Exclude Archived Assets',
     'exclude_deleted'       => 'Exclude Deleted Assets',
     'example'				=> 'Example: ',
-    'filastname_format'			=> 'Nama Depan Nama Belakang (jane.smith@example.com)',
-    'firstname_lastname_format'	=> 'Nama Depan Nama Belakang (jane.smith@example.com)',
-    'firstname_lastname_underscore_format' => 'Nama Depan Nama Belakang (jane.smith@example.com)',
-    'lastnamefirstinitial_format' =>  'Nama Depan First Initial (smithj@example.com)',
-    'firstintial_dot_lastname_format' => 'First Initial Last Name (j.smith@example.com)',
-    'firstname_lastname_display'	=> 'First Name Last Name (Jane Smith)',
-    'lastname_firstname_display'	=> 'Last Name First Name (Smith Jane)',
-    'name_display_format'	=> 'Name Display Format',
-    'first'					=> 'Pertama',
-    'firstnamelastname'     => 'First Name Last Name (janesmith@example.com)',
-    'lastname_firstinitial' => 'Last Name First Initial (smith_j@example.com)',
-    'firstinitial.lastname' => 'First Initial Last Name (j.smith@example.com)',
-    'firstnamelastinitial'  => 'First Name Last Initial (janes@example.com)',
-    'lastnamefirstname'      => 'Last Name First Name (smith.jane@example.com)',
-    'first_name'			=> 'Nama Pertama',
-    'first_name_format'		=> 'Nama Depan (jane@example.com)',
+
     'files'                 => 'Berkas',
     'file_name'				=> 'Berkas',
     'file_type'             => 'File Type',
@@ -156,9 +148,9 @@ return [
     'image_delete'         	=> 'Hapus Gambar',
     'include_deleted'       => 'Include Deleted Assets',
     'image_upload'         	=> 'Unggah Gambar',
-    'filetypes_accepted_help'    => 'Accepted filetype is :types. Max upload size allowed is :size.|Accepted filetypes are :types. Max upload size allowed is :size.',
-    'filetypes_size_help'   => 'Max upload size allowed is :size.',
-    'image_filetypes_help'  => 'Accepted filetypes are jpg, webp, png, gif, svg, and avif. Max upload size allowed is :size.',
+    'filetypes_accepted_help'    => 'Accepted filetype is :types. The maximum size allowed is :size.|Accepted filetypes are :types. The maximum upload size allowed is :size.',
+    'filetypes_size_help'   => 'The maximum upload size allowed is :size.',
+    'image_filetypes_help'  => 'Accepted Filetypes are jpg, webp, png, gif, svg, and avif. The maximum upload size allowed is :size.',
     'unaccepted_image_type'  => 'This image file was not readable. Accepted filetypes are jpg, webp, png, gif, and svg. The mimetype of this file is: :mimetype.',
     'import'         	    => 'Impor',
     'import_this_file'      => 'Map fields and process this file',
@@ -178,12 +170,17 @@ return [
     'last'					=> 'Terakhir',
     'last_login'            => 'Login terakhir',
     'last_name'             => 'Nama Belakang',
+    'firstname_lastname_display'	=> 'First Name Last Name (Jane Smith)',
+    'lastname_firstname_display'	=> 'Last Name First Name (Smith Jane)',
+    'name_display_format'	=> 'Name Display Format',
+    'first'					=> 'Pertama',
+    'first_name'			=> 'Nama Pertama',
     'license'				=> 'Lisensi',
     'license_report'        => 'Laporan Lisensi',
     'licenses_available'	=> 'Licenses available',
     'licenses'				=> 'Lisensi',
     'list_all'				=> 'Tampilkan semua',
-    'loading'				=> 'Loading... please wait....',
+    'loading'				=> 'Loading... please wait...',
     'lock_passwords'        => 'This field value will not be saved in a demo installation.',
     'feature_disabled'      => 'Fitur ini telah dinonaktifkan untuk instalasi demo.',
     'location'              => 'Lokasi',
@@ -193,7 +190,7 @@ return [
     'logout'				=> 'Keluar',
     'lookup_by_tag'     => 'Mencari berdasarkan tag aset',
     'maintenances'          => 'Pemeliharaan',
-    'manage_api_keys'       => 'Manage API Keys',
+    'manage_api_keys'       => 'Manage API keys',
     'manufacturer'			=> 'Pabrikan',
     'manufacturers'			=> 'Pabrikan',
     'markdown'				=> 'Bidang ini mengizinkan penggunaan <a href="https://help.github.com/articles/github-flavored-markdown/">kode markup milik Github</a>.',
@@ -215,6 +212,14 @@ return [
     'no_results'			=> 'Tidak ada Hasil.',
     'no'  					=> 'Tidak',
     'notes'  				=> 'Catatan',
+    'note_added'            => 'Note Added',
+    'options'				=> 'Options',
+    'preview'				=> 'Preview',
+    'add_note'              => 'Add Note',
+    'note_edited'            => 'Note Edited',
+    'edit_note'              => 'Edit Note',
+    'note_deleted'            => 'Note Deleted',
+    'delete_note'              => 'Delete Note',
     'order_number'          => 'Nomor Pemesanan',
     'only_deleted'          => 'Only Deleted Assets',
     'page_menu'				=> 'Menampilkan item _MENU_',
@@ -229,7 +234,7 @@ return [
     'purchase_date'         => 'Tanggal Pembelian',
     'qty'		            => 'JML',
     'quantity'		        => 'Jumlah',
-    'quantity_minimum'      => 'You have :count items below or almost below minimum quantity levels',
+    'quantity_minimum'      => 'You have one item below or almost below minimum quantity levels|You have :count items below or almost below minimum quantity levels',
     'quickscan_checkin'  	=> 'Quick Scan Checkin',
     'quickscan_checkin_status'  	=> 'Checkin Status',
     'ready_to_deploy'		=> 'Siap digunakan',
@@ -254,7 +259,7 @@ return [
     'select_all'            => 'Select All',
     'search'				=> 'Cari',
     'select_category'       => 'Pilih kategori',
-    'select_datasource' => 'Select a Datasource',
+    'select_datasource' => 'Select a data source',
     'select_department'     => 'Pilih Departemen',
     'select_depreciation'	=> 'Pilih Jenis Penyusutan',
     'select_location'		=> 'Pilih lokasi',
@@ -274,13 +279,15 @@ return [
     'signed_off_by'         => 'Signed Off By',
     'skin'       			=> 'Tema',
     'webhook_msg_note'        => 'A notification will be sent via webhook',
-    'webhook_test_msg'        => 'Oh hai! Looks like your :app integration with Snipe-IT is working!',
+    'webhook_test_msg'        => 'Oh hai! It looks like your :app integration with Snipe-IT is working!',
     'some_features_disabled' => 'DEMO MODE: Beberapa fitur dinonaktifkan untuk penginstalan ini.',
     'site_name'				=> 'Nama Situs',
     'state'  				=> 'Negara',
     'status_labels'			=> 'Status Labels',
+    'status_label'			=> 'Status Label',
     'status'    			=> 'Status',
     'accept_eula'           => 'Acceptance Agreement',
+    'show_or_hide_eulas' => 'Show/Hide EULAs',
     'supplier'              => 'Pemasok',
     'suppliers'  			=> 'Pemasok',
     'sure_to_delete'        => 'Apakah anda yakin ingin menghapus',
@@ -296,9 +303,9 @@ return [
     'type'  				=> 'Jenis',
     'undeployable'			=> 'Tidak dapat disebarkan',
     'unknown_admin'			=> 'Admin tidak diketahui',
-    'username_format'		=> 'Format nama pengguna',
     'username'              => 'Nama Pengguna',
     'update'                => 'Perbarui',
+    'updating_item' => 'Updating :item',
     'upload_filetypes_help'      => 'Allowed filetypes are png, gif, jpg, jpeg, doc, docx, pdf, xls, xlsx, txt, lic, xml, zip, rtf and rar. Max upload size allowed is :size.',
     'uploaded'              => 'Unggah',
     'user'					=> 'Pengguna',
@@ -323,10 +330,10 @@ return [
     'token_expired'         => 'Sesi formulir anda sudah berakhir. Silahkan coba lagi.',
     'login_enabled'         => 'Login Enabled',
     'audit_due'             => 'Due for Audit',
-    'audit_due_days'        => 'Assets Due for Audit Within :days Day|Assets Due for Audit Within :days Days',
+    'audit_due_days'        => '{}Assets Due or Overdue for Audit|[1]Assets Due or Overdue for Audit Within a Day|[2,*]Assets Due or Overdue for Audit Within :days Days',
     'checkin_due'           => 'Due for Checkin',
     'checkin_overdue'       => 'Overdue for Checkin',
-    'checkin_due_days'      => 'Assets Due for Checkin Within :days Day|Assets Due for Checkin Within :days Days',
+    'checkin_due_days'      => '{}Due for Checkin|[1]Assets Due for Checkin Within :days Day|[2,*]Assets Due for Checkin Within :days Days',
     'audit_overdue'         => 'Overdue for Audit',
     'accept'                => 'Accept :asset',
     'i_accept'              => 'I accept',
@@ -339,16 +346,16 @@ return [
     'view_all'              => 'view all',
     'hide_deleted'          => 'Hide Deleted',
     'email'                 => 'Email',
-    'do_not_change'         => 'Do Not Change',
-    'bug_report'            => 'Report a Bug',
+    'do_not_change'         => 'Do not change',
+    'bug_report'            => 'Report a bug',
     'user_manual'           => 'User\'s Manual',
     'setup_step_1'          => 'Step 1',
     'setup_step_2'          => 'Step 2',
     'setup_step_3'          => 'Step 3',
     'setup_step_4'          => 'Step 4',
     'setup_config_check'    => 'Configuration Check',
-    'setup_create_database' => 'Create Database Tables',
-    'setup_create_admin'    => 'Create Admin User',
+    'setup_create_database' => 'Create database tables',
+    'setup_create_admin'    => 'Create an admin user',
     'setup_done'            => 'Finished!',
     'bulk_edit_about_to'    => 'You are about to edit the following: ',
     'checked_out'           => 'Memeriksa',
@@ -383,6 +390,8 @@ return [
     'new_license'           => 'New License',
     'new_accessory'         => 'New Accessory',
     'new_consumable'        => 'New Consumable',
+    'new_component'         => 'New Component',
+    'new_user'              => 'New User',
     'collapse'              => 'Collapse',
     'assigned'              => 'Assigned',
     'asset_count'           => 'Asset Count',
@@ -418,19 +427,20 @@ return [
     'bulk_soft_delete'      =>'Also soft-delete these users. Their asset history will remain intact unless/until you purge deleted records in the Admin Settings.',
     'bulk_checkin_delete_success' => 'Your selected users have been deleted and their items have been checked in.',
     'bulk_checkin_success' => 'The items for the selected users have been checked in.',
-    'set_to_null'           => 'Delete values for this asset|Delete values for all :asset_count assets ',
+    'set_to_null'           => 'Delete values for this selection|Delete values for all :selection_count selections ',
     'set_users_field_to_null'  => 'Delete :field values for this user|Delete :field values for all :user_count users ',
     'na_no_purchase_date'   => 'N/A - No purchase date provided',
     'assets_by_status'      => 'Assets by Status',
     'assets_by_status_type'      => 'Assets by Status Type',
     'pie_chart_type'        => 'Dashboard Pie Chart Type',
     'hello_name'            => 'Hello, :name!',
-    'unaccepted_profile_warning'   => 'You have :count items requiring acceptance. Click here to accept or decline them',
+    'unaccepted_profile_warning'   => 'You have one item requiring acceptance. Click here to accept or decline it | You have :count items requiring acceptance. Click here to accept or decline them',
     'start_date'            => 'Tanggal Mulai',
     'end_date'            => 'End Date',
     'alt_uploaded_image_thumbnail' => 'Uploaded thumbnail',
     'placeholder_kit'       => 'Select a kit',
     'file_not_found'        => 'File not found',
+    'log_record_not_found'  => 'No record for that log entry was found.',
     'preview_not_available' => '(no preview)',
     'setup'                 => 'Setup',
     'pre_flight'            => 'Pre-Flight',
@@ -512,7 +522,7 @@ return [
     'checked_out_to_fields' => 'Checked Out To Fields',
     'percent_complete' => '% lengkap',
     'uploading' => 'Uploading... ',
-    'upload_error' => 'Error uploading file. Please check that there are no empty rows and that no column names are duplicated.',
+    'upload_error' => 'Error uploading file. Please check that you have no empty rows or duplicated column names in your CSV, and that the server permissions allow uploads.',
     'copy_to_clipboard' => 'Copy to Clipboard',
     'copied' => 'Copied!',
     'status_compatibility' => 'If assets are already assigned, they cannot be changed to a non-deployable status type and this value change will be skipped.',
@@ -549,6 +559,71 @@ return [
         'license_seats'  => ':count License Seat|:count License Seats',
         'consumables'  => ':count Consumable|:count Consumables',
         'components'  => ':count Component|:count Components',
-    ]
+    ],
+
+    'more_info' => 'Info Lengkap',
+    'quickscan_bulk_help' => 'Checking this box will edit the asset record to reflect this new location. Leaving it unchecked will simply note the location in the audit log. Note that if this asset is checked out, it will not change the location of the person, asset or location it is checked out to.',
+    'whoops' => 'Whoops!',
+    'something_went_wrong' => 'Something went wrong with your request.',
+    'close' => 'Close',
+    'expires' => 'Berakhir',
+    'map_fields'=> 'Map :item_type Fields',
+    'remaining_var' => ':count Remaining',
+    'label' => 'Label',
+    'import_asset_tag_exists' => 'An asset with the asset tag :asset_tag already exists and an update was not requested. No change was made.',
+    'countries_manually_entered_help' => 'Values with an asterisk (*) were manually entered and do not match existing ISO 3166 dropdown values',
+    'accessories_assigned' => 'Assigned Accessories',
+    'user_managed_passwords' => 'Password Management',
+    'user_managed_passwords_disallow' => 'Disallow users from managing their own passwords',
+    'user_managed_passwords_allow' => 'Allow users to manage their own passwords',
+    'from' => 'From',
+    'by' => 'Oleh',
+
+// Add form placeholders here
+    'placeholders' => [
+        'notes'  => 'Add a note',
+    ],
+
+    'breadcrumb_button_actions' => [
+        'edit_item' => 'Edit :name',
+        'checkout_item' => 'Checkout :name',
+        'checkin_item' => 'Checkin :name',
+    ],
+
+    'skins' => [
+        'site_default' => 'Site Default',
+        'default_blue' => 'Default Blue',
+        'blue_dark' => 'Blue (Dark Mode)',
+        'green' => 'Green Dark',
+        'green_dark' => 'Green (Dark Mode)',
+        'red' => 'Red Dark',
+        'red_dark' => 'Red (Dark Mode)',
+        'orange' => 'Orange Dark',
+        'orange_dark' => 'Orange (Dark Mode)',
+        'black' => 'Black',
+        'black_dark' => 'Black (Dark Mode)',
+        'purple' => 'Purple',
+        'purple_dark' => 'Purple (Dark Mode)',
+        'yellow' => 'Yellow',
+        'yellow_dark' => 'Yellow (Dark Mode)',
+        'high_contrast' => 'High Contrast',
+
+    ],
+
+    'select_all_none' => 'Select/Unselect All',
+    'generic_model_not_found' => 'That :model was not found or you do not have permission to access it',
+    'deleted_models' => 'Deleted Asset Models',
+    'deleted_users' => 'Deleted Users',
+    'cost_each' => ':amount each',
+    'remove_current_image' => 'Remove current :type image',
+
+    'seeding' => [
+        'manufacturers' => [
+            'button' => 'Create Manufacturers',
+            'prompt' => 'You do not have any manufacturers yet. Would you like to seed a list of common manufacturers? (THIS WILL OVERWRITE EXISTING MANUFACTURERS, including those that have been soft-deleted.)',
+            'success' => 'Manufacturers seeded successfully',
+            'error' => 'Could not seed manufacturers. A manufacturer record already exists and seeding would overwrite it.|Could not seed manufacturers. :count manufacturer records already exist and seeding would overwrite them.',
+        ],
+    ],
 
 ];
diff --git a/resources/lang/en-ID/localizations.php b/resources/lang/en-ID/localizations.php
index f1232dd138..827ed4fca1 100644
--- a/resources/lang/en-ID/localizations.php
+++ b/resources/lang/en-ID/localizations.php
@@ -2,7 +2,7 @@
 
 return [
 
-    'select_language' => 'Select a language',
+    'select_language' => 'Select a Language',
     'languages' => [
         'en-US'=> 'English, US',
         'en-GB'=> 'English, UK',
@@ -40,7 +40,9 @@ return [
         'ms-MY'=> 'Malay',
         'mi-NZ'=> 'Maori',
         'mn-MN'=> 'Mongolian',
-        'no-NO'=> 'Norwegian',
+        'nb-NO'=> 'Norwegian Bokmål',
+        'om-ET' => 'Oromo (Ethiopian)',
+        //'nn-NO'=> 'Norwegian Nynorsk',
         'fa-IR'=> 'Persian',
         'pl-PL'=> 'Polish',
         'pt-PT'=> 'Portuguese',
@@ -66,7 +68,7 @@ return [
         'zu-ZA'=> 'Zulu',
     ],
 
-    'select_country' => 'Select a country',
+    'select_country' => 'Select a Country',
     
     'countries' => [
         'AC'=>'Ascension Island',
@@ -133,6 +135,7 @@ return [
         'EC'=>'Ecuador',
         'EE'=>'Estonia',
         'EG'=>'Egypt',
+        'GB-ENG'=>'England',
         'ER'=>'Eritrea',
         'ES'=>'Spain',
         'ET'=>'Ethiopia',
@@ -231,6 +234,7 @@ return [
         'NG'=>'Nigeria',
         'NI'=>'Nicaragua',
         'NL'=>'Netherlands',
+        'GB-NIR' => 'Northern Ireland',
         'NO'=>'Norway',
         'NP'=>'Nepal',
         'NR'=>'Nauru',
@@ -258,7 +262,7 @@ return [
         'RU'=>'Russian Federation',
         'RW'=>'Rwanda',
         'SA'=>'Saudi Arabia',
-        'UK'=>'Scotland',
+        'GB-SCT'=>'Scotland',
         'SB'=>'Solomon Islands',
         'SC'=>'Seychelles',
         'SS'=>'South Sudan',
@@ -310,6 +314,7 @@ return [
         'VI'=>'Virgin Islands (U.S.)',
         'VN'=>'Viet Nam',
         'VU'=>'Vanuatu',
+        'GB-WLS' =>'Wales',
         'WF'=>'Wallis And Futuna Islands',
         'WS'=>'Samoa',
         'YE'=>'Yemen',
diff --git a/resources/lang/en-ID/mail.php b/resources/lang/en-ID/mail.php
index 8b44a2b3fa..0401546f5b 100644
--- a/resources/lang/en-ID/mail.php
+++ b/resources/lang/en-ID/mail.php
@@ -23,24 +23,25 @@ return [
     'Item_Requested' => 'Item yang diminta',
     'License_Checkin_Notification' => 'License checked in',
     'License_Checkout_Notification' => 'License checked out',
+    'license_for'   => 'License for',
     'Low_Inventory_Report' => 'Laporan Inventaris Rendah',
     'a_user_canceled' => 'Pengguna sudah membatalkan permintaan item di situs web',
     'a_user_requested' => 'Pengguna sudah meminta sebuah item di situs web',
     'acceptance_asset_accepted' => 'A user has accepted an item',
     'acceptance_asset_declined' => 'A user has declined an item',
-    'accessory_name' => 'Nama Aksesoris:',
-    'additional_notes' => 'Catatan Tambahan:',
+    'accessory_name' => 'Nama Aksesoris',
+    'additional_notes' => 'Catatan Tambahan',
     'admin_has_created' => 'Admin sudah membuat akun untuk anda di :web situs web.',
-    'asset' => 'Aset:',
-    'asset_name' => 'Nama Aset:',
+    'asset' => 'Aset',
+    'asset_name' => 'Nama Aset',
     'asset_requested' => 'Permintaan aset',
     'asset_tag' => 'Penanda aset',
     'assets_warrantee_alert' => 'There is :count asset with a warranty expiring in the next :threshold days.|There are :count assets with warranties expiring in the next :threshold days.',
     'assigned_to' => 'Ditetapkan untuk',
     'best_regards' => 'Salam hormat,',
-    'canceled' => 'Dibatalkan:',
-    'checkin_date' => 'Tanggal Check in:',
-    'checkout_date' => 'Tanggal Check out:',
+    'canceled' => 'Dibatalkan',
+    'checkin_date' => 'Tanggal Check in',
+    'checkout_date' => 'Tanggal Check out',
     'checkedout_from' => 'Checked out from',
     'checkedin_from'  => 'Checked in from',
     'checked_into' => 'Checked into',
@@ -49,27 +50,30 @@ return [
     'click_to_confirm' => 'Silahkan klik pada link berikut untuk mengkonfirmasi :akun web Anda:',
     'current_QTY' => 'QTY saat ini',
     'days' => 'Hari',
-    'expecting_checkin_date' => 'Tanggal Checkin yang Diharapkan:',
+    'expecting_checkin_date' => 'Tanggal Checkin yang Diharapkan',
     'expires' => 'Berakhir',
     'hello' => 'Halo',
     'hi' => 'Hai',
     'i_have_read' => 'Saya sudah baca dan menyetujui syarat penggunaan, dan sudah menerima item ini.',
     'inventory_report' => 'Inventory Report',
-    'item' => 'Item:',
+    'item' => 'Item',
+    'item_checked_reminder' => 'This is a reminder that you currently have :count items checked out to you that you have not accepted or declined. Please click the link below to confirm your decision.',
     'license_expiring_alert' => 'Ada :count lisensi yang masa berlakunya akan habis dalam :threshold hari.|Ada :count lisensi yang masa berlakunya akan habis dalam :threshold hari.',
     'link_to_update_password' => 'Silahkan klik pada link berikut untuk memperbarui :web password:',
-    'login' => 'Masuk:',
+    'login' => 'Masuk',
     'login_first_admin' => 'Login ke instalasi Snipe-IT baru Anda dengan menggunakan kredensial di bawah ini:',
     'low_inventory_alert' => 'Ada :count item yang di bawah minimum persediaan atau akan segera habis.|Ada :count item yang di bawah minimum persediaan atau akan segera habis.',
     'min_QTY' => 'QTY minimum',
     'name' => 'Nama',
     'new_item_checked' => 'Item baru sudah diperiksa atas nama anda, rinciannya dibawah ini.',
+    'new_item_checked_with_acceptance' => 'A new item has been checked out under your name that requires acceptance, details are below.',
+    'recent_item_checked' => 'An item was recently checked out under your name that requires acceptance, details are below.',
     'notes' => 'Catatan',
-    'password' => 'Kata Sandi:',
+    'password' => 'Kata Sandi',
     'password_reset' => 'Atur ulang kata sandi',
     'read_the_terms' => 'Silahkan baca syarat penggunaan dibawah ini.',
     'read_the_terms_and_click' => 'Please read the terms of use below, and click on the link at the bottom to confirm that you read and agree to the terms of use, and have received the asset.',
-    'requested' => 'Diminta:',
+    'requested' => 'Diminta',
     'reset_link' => 'Tautan Atur ulang kata sandi anda',
     'reset_password' => 'Klik disini untuk atur ulang kata sandi anda:',
     'rights_reserved' => 'All rights reserved.',
@@ -86,8 +90,10 @@ return [
     'upcoming-audits' => 'There is :count asset that is coming up for audit within :threshold days.|There are :count assets that are coming up for audit within :threshold days.',
     'user' => 'Pengguna',
     'username' => 'Nama Pengguna',
+    'unaccepted_asset_reminder' => 'Reminder: You have Unaccepted Assets.',
     'welcome' => 'Selamat datang :nama',
     'welcome_to' => 'Selamat datang di :Web!',
     'your_assets' => 'View Your Assets',
     'your_credentials' => 'Kredensial Snipe-IT Anda',
+    'mail_sent' => 'Mail sent successfully!',
 ];
diff --git a/resources/lang/en-ID/validation.php b/resources/lang/en-ID/validation.php
index 8f562281a1..614ae1ccf6 100644
--- a/resources/lang/en-ID/validation.php
+++ b/resources/lang/en-ID/validation.php
@@ -13,87 +13,150 @@ return [
     |
     */
 
-    'accepted'             => 'Atribut :harus diterima.',
-    'active_url'           => 'Atribut :bukan URL yang valid.',
-    'after'                => 'Atribut :harus tanggal setelah: tanggal.',
-    'after_or_equal'       => 'Atribut :harus tanggal setelah atau sama dengan: tanggal.',
-    'alpha'                => 'Atribut :hanya boleh berisi huruf.',
-    'alpha_dash'           => 'Atribut :hanya boleh berisi huruf, angka, dan tanda hubung.',
-    'alpha_num'            => 'Atribut :hanya boleh berisi huruf dan angka.',
-    'array'                => 'Atribut :harus berupa array.',
-    'before'               => 'Atribut :harus tanggal setelah: tanggal.',
-    'before_or_equal'      => 'Atribut :harus tanggal setelah atau sama dengan: tanggal.',
-    'between'              => [
-        'numeric' => 'Atribut harus antara :min - : max.',
-        'file'    => 'Atribut harus antara :min - : max.',
-        'string'  => 'Atribut harus antara :min - : maks karakter.',
-        'array'   => 'Atribut :harus antara :min dan : max item.',
+    'accepted' => 'The :attribute field must be accepted.',
+    'accepted_if' => 'The :attribute field must be accepted when :other is :value.',
+    'active_url' => 'The :attribute field must be a valid URL.',
+    'after' => 'The :attribute field must be a date after :date.',
+    'after_or_equal' => 'The :attribute field must be a date after or equal to :date.',
+    'alpha' => 'The :attribute field must only contain letters.',
+    'alpha_dash' => 'The :attribute field must only contain letters, numbers, dashes, and underscores.',
+    'alpha_num' => 'The :attribute field must only contain letters and numbers.',
+    'array' => 'The :attribute field must be an array.',
+    'ascii' => 'The :attribute field must only contain single-byte alphanumeric characters and symbols.',
+    'before' => 'The :attribute field must be a date before :date.',
+    'before_or_equal' => 'The :attribute field must be a date before or equal to :date.',
+    'between' => [
+        'array' => 'The :attribute field must have between :min and :max items.',
+        'file' => 'The :attribute field must be between :min and :max kilobytes.',
+        'numeric' => 'The :attribute field must be between :min and :max.',
+        'string' => 'The :attribute field must be between :min and :max characters.',
     ],
-    'boolean'              => 'Atribut: harus benar atau salah.',
-    'confirmed'            => 'The: konfirmasi atribut tidak cocok.',
-    'date'                 => 'Atribut :bukan Tanggal yang valid.',
-    'date_format'          => 'The: atribut tidak sesuai format: format.',
-    'different'            => 'The: atribut dan: lainnya harus berbeda.',
-    'digits'               => 'Atribut: harus: digit digit.',
-    'digits_between'       => 'Atribut :harus antara :min dan : max digit.',
-    'dimensions'           => 'Atribut: atribut memiliki dimensi gambar yang tidak benar.',
-    'distinct'             => 'The :Bidang atribut memiliki nilai duplikat.',
-    'email'                => 'Format atribut tidak valid.',
-    'exists'               => 'Yang dipilih: atribut tidak valid.',
-    'file'                 => 'The: atribut harus berupa file.',
-    'filled'               => 'Bidang atribut harus memiliki nilai.',
-    'image'                => 'Atribut: harus berupa gambar.',
+    'boolean' => 'The :attribute field must be true or false.',
+    'can' => 'The :attribute field contains an unauthorized value.',
+    'confirmed' => 'The :attribute field confirmation does not match.',
+    'contains' => 'The :attribute field is missing a required value.',
+    'current_password' => 'The password is incorrect.',
+    'date' => 'The :attribute field must be a valid date.',
+    'date_equals' => 'The :attribute field must be a date equal to :date.',
+    'date_format' => 'The :attribute field must match the format :format.',
+    'decimal' => 'The :attribute field must have :decimal decimal places.',
+    'declined' => 'The :attribute field must be declined.',
+    'declined_if' => 'The :attribute field must be declined when :other is :value.',
+    'different' => 'The :attribute field and :other must be different.',
+    'digits' => 'The :attribute field must be :digits digits.',
+    'digits_between' => 'The :attribute field must be between :min and :max digits.',
+    'dimensions' => 'The :attribute field has invalid image dimensions.',
+    'distinct' => 'The :Bidang atribut memiliki nilai duplikat.',
+    'doesnt_end_with' => 'The :attribute field must not end with one of the following: :values.',
+    'doesnt_start_with' => 'The :attribute field must not start with one of the following: :values.',
+    'email' => 'The :attribute field must be a valid email address.',
+    'ends_with' => 'The :attribute field must end with one of the following: :values.',
+    'enum' => 'Yang dipilih: atribut tidak valid.',
+    'exists' => 'Yang dipilih: atribut tidak valid.',
+    'extensions' => 'The :attribute field must have one of the following extensions: :values.',
+    'file' => 'The :attribute field must be a file.',
+    'filled' => 'Bidang atribut harus memiliki nilai.',
+    'gt' => [
+        'array' => 'The :attribute field must have more than :value items.',
+        'file' => 'The :attribute field must be greater than :value kilobytes.',
+        'numeric' => 'The :attribute field must be greater than :value.',
+        'string' => 'The :attribute field must be greater than :value characters.',
+    ],
+    'gte' => [
+        'array' => 'The :attribute field must have :value items or more.',
+        'file' => 'The :attribute field must be greater than or equal to :value kilobytes.',
+        'numeric' => 'The :attribute field must be greater than or equal to :value.',
+        'string' => 'The :attribute field must be greater than or equal to :value characters.',
+    ],
+    'hex_color' => 'The :attribute field must be a valid hexadecimal color.',
+    'image' => 'The :attribute field must be an image.',
     'import_field_empty'    => 'The value for :fieldname cannot be null.',
-    'in'                   => 'Yang dipilih :atribut tidak valid.',
-    'in_array'             => 'Bidang atribut :tidak ada di :lainnya.',
-    'integer'              => 'Atribut harus integer.',
-    'ip'                   => 'Atribut :harus alamat IP yang valid.',
-    'ipv4'                 => 'Atribut :harus alamat IPv4 yang valid.',
-    'ipv6'                 => 'Atribut :harus alamat IPv6 yang valid.',
-    'is_unique_department' => 'The :attribute must be unique to this Company Location',
-    'json'                 => 'Atribut: harus string JSON yang valid.',
-    'max'                  => [
-        'numeric' => 'Atribut: mungkin tidak lebih besar dari: maks.',
-        'file'    => 'Atribut :mungkin tidak lebih besar dari :max kilobyte.',
-        'string'  => 'Atribut :mungkin tidak lebih besar dari :karakter maks.',
-        'array'   => 'Atribut :mungkin tidak lebih dari :item maks.',
+    'in' => 'Yang dipilih :atribut tidak valid.',
+    'in_array' => 'The :attribute field must exist in :other.',
+    'integer' => 'The :attribute field must be an integer.',
+    'ip' => 'The :attribute field must be a valid IP address.',
+    'ipv4' => 'The :attribute field must be a valid IPv4 address.',
+    'ipv6' => 'The :attribute field must be a valid IPv6 address.',
+    'json' => 'The :attribute field must be a valid JSON string.',
+    'list' => 'The :attribute field must be a list.',
+    'lowercase' => 'The :attribute field must be lowercase.',
+    'lt' => [
+        'array' => 'The :attribute field must have less than :value items.',
+        'file' => 'The :attribute field must be less than :value kilobytes.',
+        'numeric' => 'The :attribute field must be less than :value.',
+        'string' => 'The :attribute field must be less than :value characters.',
     ],
-    'mimes'                => 'Atribut harus berupa file tipe: :niai.',
-    'mimetypes'            => 'Atribut harus berupa file tipe: : nilai.',
-    'min'                  => [
-        'numeric' => 'Atribut :minimal harus :min.',
-        'file'    => 'Atribut :minimal harus :min kilobyte.',
-        'string'  => 'Atribut :minimal harus :min karakter.',
-        'array'   => 'Atribut :setidaknya harus memiliki :item min.',
+    'lte' => [
+        'array' => 'The :attribute field must not have more than :value items.',
+        'file' => 'The :attribute field must be less than or equal to :value kilobytes.',
+        'numeric' => 'The :attribute field must be less than or equal to :value.',
+        'string' => 'The :attribute field must be less than or equal to :value characters.',
     ],
-    'starts_with'          => 'The :attribute must start with one of the following: :values.',
-    'ends_with'            => 'The :attribute must end with one of the following: :values.',
+    'mac_address' => 'The :attribute field must be a valid MAC address.',
+    'max' => [
+        'array' => 'The :attribute field must not have more than :max items.',
+        'file' => 'The :attribute field must not be greater than :max kilobytes.',
+        'numeric' => 'The :attribute field must not be greater than :max.',
+        'string' => 'The :attribute field must not be greater than :max characters.',
+    ],
+    'max_digits' => 'The :attribute field must not have more than :max digits.',
+    'mimes' => 'The :attribute field must be a file of type: :values.',
+    'mimetypes' => 'The :attribute field must be a file of type: :values.',
+    'min' => [
+        'array' => 'The :attribute field must have at least :min items.',
+        'file' => 'The :attribute field must be at least :min kilobytes.',
+        'numeric' => 'The :attribute field must be at least :min.',
+        'string' => 'The :attribute field must be at least :min characters.',
+    ],
+    'min_digits' => 'The :attribute field must have at least :min digits.',
+    'missing' => 'The :attribute field must be missing.',
+    'missing_if' => 'The :attribute field must be missing when :other is :value.',
+    'missing_unless' => 'The :attribute field must be missing unless :other is :value.',
+    'missing_with' => 'The :attribute field must be missing when :values is present.',
+    'missing_with_all' => 'The :attribute field must be missing when :values are present.',
+    'multiple_of' => 'The :attribute field must be a multiple of :value.',
+    'not_in' => 'Yang dipilih: atribut tidak valid.',
+    'not_regex' => 'The :attribute field format is invalid.',
+    'numeric' => 'The :attribute field must be a number.',
+    'password' => [
+        'letters' => 'The :attribute field must contain at least one letter.',
+        'mixed' => 'The :attribute field must contain at least one uppercase and one lowercase letter.',
+        'numbers' => 'The :attribute field must contain at least one number.',
+        'symbols' => 'The :attribute field must contain at least one symbol.',
+        'uncompromised' => 'The given :attribute has appeared in a data leak. Please choose a different :attribute.',
+    ],
+    'percent'       => 'The depreciation minimum must be between 0 and 100 when depreciation type is percentage.',
 
-    'not_in'               => 'Yang dipilih: atribut tidak valid.',
-    'numeric'              => 'The: atribut harus berupa angka.',
-    'present'              => 'Bidang atribut harus ada.',
-    'valid_regex'          => 'Ini bukan regex yang valid. ',
-    'regex'                => 'Format atribut tidak valid.',
-    'required'             => 'Bidang :attribute harus diisi.',
-    'required_if'          => 'Kolom :attribute wajib di-isi ketika :other nya :value.',
-    'required_unless'      => 'Kolom :attribute wajib di-isi kecuali :other nya :value.',
-    'required_with'        => 'Kolom :attribute wajib di-isi ketika :values terisi.',
-    'required_with_all'    => 'Kolom :attribute wajib di-isi ketika :values terisi.',
-    'required_without'     => 'Kolom :attribute wajib di-isi ketika :values kosong.',
+    'present' => 'Bidang atribut harus ada.',
+    'present_if' => 'The :attribute field must be present when :other is :value.',
+    'present_unless' => 'The :attribute field must be present unless :other is :value.',
+    'present_with' => 'The :attribute field must be present when :values is present.',
+    'present_with_all' => 'The :attribute field must be present when :values are present.',
+    'prohibited' => 'The :attribute field is prohibited.',
+    'prohibited_if' => 'The :attribute field is prohibited when :other is :value.',
+    'prohibited_unless' => 'The :attribute field is prohibited unless :other is in :values.',
+    'prohibits' => 'The :attribute field prohibits :other from being present.',
+    'regex' => 'The :attribute field format is invalid.',
+    'required' => 'Bidang :attribute harus diisi.',
+    'required_array_keys' => 'The :attribute field must contain entries for: :values.',
+    'required_if' => 'Kolom :attribute wajib di-isi ketika :other nya :value.',
+    'required_if_accepted' => 'The :attribute field is required when :other is accepted.',
+    'required_if_declined' => 'The :attribute field is required when :other is declined.',
+    'required_unless' => 'Kolom :attribute wajib di-isi kecuali :other nya :value.',
+    'required_with' => 'Kolom :attribute wajib di-isi ketika :values terisi.',
+    'required_with_all' => 'The :attribute field is required when :values are present.',
+    'required_without' => 'Kolom :attribute wajib di-isi ketika :values kosong.',
     'required_without_all' => 'Kolom :attribute wajib di-isi jika tidak ada :values yang terisi.',
-    'same'                 => ':attribute dan :other harus mirip.',
-    'size'                 => [
-        'numeric' => ':attribute harus :size.',
-        'file'    => ':attribute harus berukuran :size kilobytes.',
-        'string'  => ':attribute harus memiliki :size karakter.',
-        'array'   => ':attribute harus memiliki sebanyak :size item.',
+    'same' => 'The :attribute field must match :other.',
+    'size' => [
+        'array' => 'The :attribute field must contain :size items.',
+        'file' => 'The :attribute field must be :size kilobytes.',
+        'numeric' => 'The :attribute field must be :size.',
+        'string' => 'The :attribute field must be :size characters.',
     ],
+    'starts_with' => 'The :attribute field must start with one of the following: :values.',
     'string'               => ':attribute haruslah sebuah string.',
-    'timezone'             => ':attribute haruslah sebuah zone yang valid.',
     'two_column_unique_undeleted' => 'The :attribute must be unique across :table1 and :table2. ',
-    'unique'               => ':attribute sudah pernah digunakan.',
-    'uploaded'             => ':attribute gagal di-upload.',
-    'url'                  => 'Format :attribute tidaklah benar.',
     'unique_undeleted'     => ':attribute haruslah unik.',
     'non_circular'         => 'The :attribute must not create a circular reference.',
     'not_array'            => ':attribute cannot be an array.',
@@ -102,11 +165,14 @@ return [
     'numbers'              => 'Password must contain at least one number.',
     'case_diff'            => 'Password must use mixed case.',
     'symbols'              => 'Password must contain symbols.',
-    'gte'                  => [
-        'numeric'          => 'Value cannot be negative'
-    ],
-    'checkboxes'           => ':attribute contains invalid options.',
-    'radio_buttons'        => ':attribute is invalid.',
+    'timezone' => 'The :attribute field must be a valid timezone.',
+    'unique' => ':attribute sudah pernah digunakan.',
+    'uploaded' => ':attribute gagal di-upload.',
+    'uppercase' => 'The :attribute field must be uppercase.',
+    'url' => 'The :attribute field must be a valid URL.',
+    'ulid' => 'The :attribute field must be a valid ULID.',
+    'uuid' => 'The :attribute field must be a valid UUID.',
+    'fmcs_location' => 'Full multiple company support and location scoping is enabled in the Admin Settings, and the selected location and selected company are not compatible.',
 
 
     /*
@@ -120,16 +186,22 @@ return [
     |
     */
 
+    'email_array'      => 'Satu atau lebih alamat surel tidak valid.',
+    'checkboxes'           => ':attribute contains invalid options.',
+    'radio_buttons'        => ':attribute is invalid.',
+    
     'custom' => [
         'alpha_space' => 'Kolom :attribute mengandung karakter yang dilarang.',
-        'email_array'      => 'Satu atau lebih alamat surel tidak valid.',
+
         'hashed_pass'      => 'Kata sandi anda saat ini salah',
         'dumbpwd'          => 'Kata sandi itu terlalu umum.',
         'statuslabel_type' => 'Anda harus pilih jenis label status yang valid',
+        'custom_field_not_found'          => 'This field does not seem to exist, please double check your custom field names.',
+        'custom_field_not_found_on_model' => 'This field seems to exist, but is not available on this Asset Model\'s fieldset.',
 
         // date_format validation with slightly less stupid messages. It duplicates a lot, but it gets the job done :(
-        // We use this because the default error message for date_format is reflects php Y-m-d, which non-PHP
-        // people won't know how to format. 
+        // We use this because the default error message for date_format reflects php Y-m-d, which non-PHP
+        // people won't know how to format.
         'purchase_date.date_format'     => 'The :attribute must be a valid date in YYYY-MM-DD format',
         'last_audit_date.date_format'   =>  'The :attribute must be a valid date in YYYY-MM-DD hh:mm:ss format',
         'expiration_date.date_format'   =>  'The :attribute must be a valid date in YYYY-MM-DD format',
@@ -137,9 +209,15 @@ return [
         'expected_checkin.date_format'  =>  'The :attribute must be a valid date in YYYY-MM-DD format',
         'start_date.date_format'        =>  'The :attribute must be a valid date in YYYY-MM-DD format',
         'end_date.date_format'          =>  'The :attribute must be a valid date in YYYY-MM-DD format',
+        'invalid_value_in_field' => 'Invalid value included in this field',
 
-    ],
+        'ldap_username_field' => [
+            'not_in' =>         '<code>sAMAccountName</code> (mixed case) will likely not work. You should use <code>samaccountname</code> (lowercase) instead.'
+        ],
+        'ldap_auth_filter_query' => ['not_in' => '<code>uid=samaccountname</code> is probably not a valid auth filter. You probably want <code>uid=</code> '],
+        'ldap_filter' => ['regex' => 'This value should probably not be wrapped in parentheses.'],
 
+        ],
     /*
     |--------------------------------------------------------------------------
     | Custom Validation Attributes
@@ -155,8 +233,16 @@ return [
 
     /*
     |--------------------------------------------------------------------------
-    | Generic Validation Messages
+    | Generic Validation Messages - we use these in the jquery validation where we don't have
+    | access to the :attribute
     |--------------------------------------------------------------------------
     */
-    'invalid_value_in_field' => 'Invalid value included in this field',
+
+    'generic' => [
+        'invalid_value_in_field' => 'Invalid value included in this field',
+        'required' => 'This field is required',
+        'email' => 'Please enter a valid email address',
+    ],
+
+
 ];
diff --git a/resources/lang/en-US/account/general.php b/resources/lang/en-US/account/general.php
index 1a9e2c03b8..7f9e2f848e 100644
--- a/resources/lang/en-US/account/general.php
+++ b/resources/lang/en-US/account/general.php
@@ -2,10 +2,16 @@
 
 return array(
     'personal_api_keys' => 'Personal API Keys',
+    'personal_access_token' => 'Personal Access Token',
+    'personal_api_keys_success' => 'Personal API Key :key created sucessfully',
+    'here_is_api_key' => 'Here is your new personal access token. This is the only time it will be shown so do not lose it! You may now use this token to make API requests.',
     'api_key_warning' => 'When generating an API token, be sure to copy it down immediately as they will not be visible to you again.',
     'api_base_url' => 'Your API base url is located at:',
     'api_base_url_endpoint' => '/&lt;endpoint&gt;',
     'api_token_expiration_time' => 'API tokens are set to expire in:',
     'api_reference' => 'Please check the <a href="https://snipe-it.readme.io/reference" target="_blank">API reference</a> to find specific API endpoints and additional API documentation.',
     'profile_updated' => 'Account successfully updated',
+    'no_tokens' => 'You have not created any personal access tokens.',
+    'enable_sounds' => 'Enable sound effects',
+    'enable_confetti' => 'Enable confetti effects',
 );
diff --git a/resources/lang/en-US/admin/accessories/message.php b/resources/lang/en-US/admin/accessories/message.php
index c688d5e03d..f60d41957b 100644
--- a/resources/lang/en-US/admin/accessories/message.php
+++ b/resources/lang/en-US/admin/accessories/message.php
@@ -26,7 +26,11 @@ return array(
         'error'   		=> 'Accessory was not checked out, please try again',
         'success' 		=> 'Accessory checked out successfully.',
         'unavailable'   => 'Accessory is not available for checkout. Check quantity available',
-        'user_does_not_exist' => 'That user is invalid. Please try again.'
+        'user_does_not_exist' => 'That user is invalid. Please try again.',
+         'checkout_qty' => array(
+            'lte'  => 'There is currently only one available accessory of this type, and you are trying to check out :checkout_qty. Please adjust the checkout quantity or the total stock of this accessory and try again.|There are :number_currently_remaining total available accessories, and you are trying to check out :checkout_qty. Please adjust the checkout quantity or the total stock of this accessory and try again.',
+            ),
+           
     ),
 
     'checkin' => array(
diff --git a/resources/lang/en-US/admin/accessories/table.php b/resources/lang/en-US/admin/accessories/table.php
index e02d9f22e4..80df687161 100644
--- a/resources/lang/en-US/admin/accessories/table.php
+++ b/resources/lang/en-US/admin/accessories/table.php
@@ -6,6 +6,4 @@ return array(
     'id'      					=> 'ID',
     'require_acceptance'      	=> 'Acceptance',
     'title'      				=> 'Accessory Name',
-
-
 );
diff --git a/resources/lang/en-US/admin/asset_maintenances/form.php b/resources/lang/en-US/admin/asset_maintenances/form.php
index 785d06b08f..c69921b214 100644
--- a/resources/lang/en-US/admin/asset_maintenances/form.php
+++ b/resources/lang/en-US/admin/asset_maintenances/form.php
@@ -1,6 +1,7 @@
 <?php
 
     return [
+        'select_type'            => 'Select Maintenance Type',
         'asset_maintenance_type' => 'Asset Maintenance Type',
         'title'                  => 'Title',
         'start_date'             => 'Start Date',
diff --git a/resources/lang/en-US/admin/categories/general.php b/resources/lang/en-US/admin/categories/general.php
index 2fe448b44e..a468bf3e08 100644
--- a/resources/lang/en-US/admin/categories/general.php
+++ b/resources/lang/en-US/admin/categories/general.php
@@ -21,5 +21,9 @@ return array(
     'use_default_eula'					=> 'Use the <a href="#" data-toggle="modal" data-target="#eulaModal">primary default EULA</a> instead.',
     'use_default_eula_disabled'			=> '<del>Use the primary default EULA instead.</del> No primary default EULA is set. Please add one in Settings.',
     'use_default_eula_column'			=> 'Use default EULA',
+    'import_require_acceptance'         => 'Require Acceptance',
+    'import_checkin_email'              => 'Send Checkin Email',
+    'import_eula_text'                  => 'EULA text',
+    'import_category_type'              => 'Category Type',
 
 );
diff --git a/resources/lang/en-US/admin/components/message.php b/resources/lang/en-US/admin/components/message.php
index 0a7dd8d954..ec39dc4178 100644
--- a/resources/lang/en-US/admin/components/message.php
+++ b/resources/lang/en-US/admin/components/message.php
@@ -17,7 +17,8 @@ return array(
     'delete' => array(
         'confirm'   => 'Are you sure you wish to delete this component?',
         'error'   => 'There was an issue deleting the component. Please try again.',
-        'success' => 'The component was deleted successfully.'
+        'success' => 'The component was deleted successfully.',
+        'error_qty'   => 'Some components of this type are still checked out. Please check them in and try again.',
     ),
 
      'checkout' => array(
diff --git a/resources/lang/en-US/admin/consumables/general.php b/resources/lang/en-US/admin/consumables/general.php
index 7c6bb32968..29acfedc1b 100644
--- a/resources/lang/en-US/admin/consumables/general.php
+++ b/resources/lang/en-US/admin/consumables/general.php
@@ -8,4 +8,5 @@ return array(
     'remaining' 			            => 'Remaining',
     'total' 			                => 'Total',
     'update'                            => 'Update Consumable',
+    'inventory_warning'                 => 'The inventory of this consumable is below the minimum amount of :min_count',
 );
diff --git a/resources/lang/en-US/admin/consumables/message.php b/resources/lang/en-US/admin/consumables/message.php
index c0d0aa7f68..e2591503bf 100644
--- a/resources/lang/en-US/admin/consumables/message.php
+++ b/resources/lang/en-US/admin/consumables/message.php
@@ -2,6 +2,7 @@
 
 return array(
 
+    'invalid_category_type' => 'The category must be a consumable category.',
     'does_not_exist' => 'Consumable does not exist.',
 
     'create' => array(
diff --git a/resources/lang/en-US/admin/custom_fields/general.php b/resources/lang/en-US/admin/custom_fields/general.php
index e3c21d1f0c..8841a8fad3 100644
--- a/resources/lang/en-US/admin/custom_fields/general.php
+++ b/resources/lang/en-US/admin/custom_fields/general.php
@@ -5,7 +5,7 @@ return [
     'manage'                    => 'Manage',
     'field'		                => 'Field',
     'about_fieldsets_title'		=> 'About Fieldsets',
-    'about_fieldsets_text'		=> 'Fieldsets allow you to create groups of custom fields that are frequently re-used for specific asset model types.',
+    'about_fieldsets_text'		=> 'Fieldsets allow you to create groups of custom fields that are frequently re-used used for specific asset model types.',
     'custom_format'             => 'Custom Regex format...',
     'encrypt_field'      	        => 'Encrypt the value of this field in the database',
     'encrypt_field_help'      => 'WARNING: Encrypting a field makes it unsearchable.',
@@ -35,7 +35,7 @@ return [
     'create_field_title' => 'Create a new custom field',
     'value_encrypted'      	        => 'The value of this field is encrypted in the database. Only admin users will be able to view the decrypted value',
     'show_in_email'     => 'Include the value of this field in checkout emails sent to the user? Encrypted fields cannot be included in emails',
-    'show_in_email_short'     => 'Include in emails.',
+    'show_in_email_short' => 'Include in emails',
     'help_text' => 'Help Text',
     'help_text_description' => 'This is optional text that will appear below the form elements while editing an asset to provide context on the field.',
     'about_custom_fields_title' => 'About Custom Fields',
@@ -57,5 +57,14 @@ return [
     'show_in_requestable_list_short' => 'Show in requestable assets list',
     'show_in_requestable_list' => 'Show value in requestable assets list. Encrypted fields will not be shown',
     'encrypted_options' => 'This field is encrypted, so some display options will not be available.',
-
+    'display_checkin' => 'Display in checkin forms',
+    'display_checkout' => 'Display in checkout forms',
+    'display_audit' => 'Display in audit forms',
+    'types' => [
+        'text' => 'Text Box',
+        'listbox' => 'List Box',
+        'textarea' => 'Textarea (multi-line)',
+        'checkbox' => 'Checkbox',
+        'radio' => 'Radio Buttons',
+    ],
 ];
diff --git a/resources/lang/en-US/admin/custom_fields/message.php b/resources/lang/en-US/admin/custom_fields/message.php
index 43ba821821..6442359b7f 100644
--- a/resources/lang/en-US/admin/custom_fields/message.php
+++ b/resources/lang/en-US/admin/custom_fields/message.php
@@ -5,6 +5,7 @@ return array(
     'field' => array(
         'invalid'   => 'That field does not exist.',
         'already_added'   => 'Field already added',
+        'none_selected'   => 'No field selected',
 
         'create' => array(
             'error'   => 'Field was not created, please try again.',
diff --git a/resources/lang/en-US/admin/depreciations/general.php b/resources/lang/en-US/admin/depreciations/general.php
index 1a5666f9dc..90246e9cd8 100644
--- a/resources/lang/en-US/admin/depreciations/general.php
+++ b/resources/lang/en-US/admin/depreciations/general.php
@@ -13,4 +13,8 @@ return [
     'no_depreciations_warning'               => '<strong>Warning: </strong>
                       You do not currently have any depreciations set up.
                       Please set up at least one depreciation to view the depreciation report.',
+    'depreciation_method'                   => 'Depreciation Report',
+    'linear_depreciation'                   => 'Linear (Default)',
+    'half_1'                                => 'Half-year convention, always applied',
+    'half_2'                                => 'Half-year convention, applied with condition',
 ];
diff --git a/resources/lang/en-US/admin/hardware/form.php b/resources/lang/en-US/admin/hardware/form.php
index edec543637..8fbd0b4e87 100644
--- a/resources/lang/en-US/admin/hardware/form.php
+++ b/resources/lang/en-US/admin/hardware/form.php
@@ -55,8 +55,11 @@ return [
     'asset_location_update_default' => 'Update only default location',
     'asset_location_update_actual' => 'Update only actual location',
     'asset_not_deployable' => 'That asset status is not deployable. This asset cannot be checked out.',
-    'asset_deployable' => 'That status is deployable. This asset can be checked out.',
+    'asset_not_deployable_checkin' => 'That asset status is not deployable. Using this status label will checkin the asset.',
+    'asset_deployable' => 'This asset can be checked out.',
     'processing_spinner' => 'Processing... (This might take a bit of time on large files)',
+    'processing' => 'Processing... ',
     'optional_infos'  => 'Optional Information',
-    'order_details'   => 'Order Related Information'
+    'order_details'   => 'Order Related Information',
+    'calc_eol'    => 'If nulling the EOL date, use automatic EOL calculation based on the purchase date and EOL rate.',
 ];
diff --git a/resources/lang/en-US/admin/hardware/general.php b/resources/lang/en-US/admin/hardware/general.php
index 34ac4e63ee..bc972da290 100644
--- a/resources/lang/en-US/admin/hardware/general.php
+++ b/resources/lang/en-US/admin/hardware/general.php
@@ -5,10 +5,11 @@ return [
     'about_assets_text'            => 'Assets are items tracked by serial number or asset tag.  They tend to be higher value items where identifying a specific item matters.',
     'archived'  				=> 'Archived',
     'asset'  					=> 'Asset',
-    'bulk_checkout'             => 'Checkout Assets',
-    'bulk_checkin'              => 'Checkin Assets',
+    'bulk_checkout'             => 'Bulk Checkout',
+    'bulk_checkin'              => 'Bulk Checkin',
     'checkin'  					=> 'Checkin Asset',
     'checkout'  				=> 'Checkout Asset',
+    'clear'                     => 'Clear',
     'clone'  					=> 'Clone Asset',
     'deployable'  				=> 'Deployable',
     'deleted'  					=> 'This asset has been deleted.',
@@ -27,8 +28,7 @@ return [
     'undeployable_tooltip'  	=> 'This asset has a status label that is undeployable and cannot be checked out at this time.',
     'view'  					=> 'View Asset',
     'csv_error' => 'You have an error in your CSV file:',
-    'import_text' => '<p>Upload a CSV that contains asset history. The assets and users MUST already exist in the system, or they will be skipped. Matching assets for history import happens against the asset tag. We will try to find a matching user based on the user\'s name you provide, and the criteria you select below. If you do not select any criteria below, it will simply try to match on the username format you configured in the <code>Admin &gt; General Settings</code>.</p><p>Fields included in the CSV must match the headers: <strong>Asset Tag, Name, Checkout Date, Checkin Date</strong>. Any additional fields will be ignored. </p><p>Checkin Date: blank or future checkin dates will checkout items to associated user.  Excluding the Checkin Date column will create a checkin date with todays date.</p>
-    ',
+    'import_text' => '<p>Upload a CSV that contains asset history. The assets and users MUST already exist in the system, or they will be skipped. Matching assets for history import happens against the asset tag. We will try to find a matching user based on the user\'s name you provide, and the criteria you select below. If you do not select any criteria below, it will simply try to match on the username format you configured in the <code>Admin &gt; General Settings</code>.</p><p>Fields included in the CSV must match the headers: <strong>Asset Tag, Name, Checkout Date, Checkin Date</strong>. Any additional fields will be ignored. </p><p>Checkin Date: blank or future checkin dates will checkout items to associated user.  Excluding the Checkin Date column will create a checkin date with todays date.</p>    ',
     'csv_import_match_f-l' => 'Try to match users by <strong>firstname.lastname</strong> (<code>jane.smith</code>) format',
     'csv_import_match_initial_last' => 'Try to match users by <strong>first initial last name</strong> (<code>jsmith</code>) format',
     'csv_import_match_first' => 'Try to match users by <strong>first name</strong> (<code>jane</code>) format',
diff --git a/resources/lang/en-US/admin/hardware/message.php b/resources/lang/en-US/admin/hardware/message.php
index 32698b1c07..9d318c40f1 100644
--- a/resources/lang/en-US/admin/hardware/message.php
+++ b/resources/lang/en-US/admin/hardware/message.php
@@ -2,19 +2,28 @@
 
 return [
 
-    'undeployable' 		=> '<strong>Warning: </strong> This asset has been marked as currently undeployable.
-                        If this status has changed, please update the asset status.',
-    'does_not_exist' 	=> 'Asset does not exist.',
-    'does_not_exist_var'=> 'Asset with tag :asset_tag not found.',
-    'no_tag' 	        => 'No asset tag provided.',
+    'undeployable' 		 => 'The following assets cannot be deployed and have been removed from checkout: :asset_tags',
+    'does_not_exist' 	 => 'Asset does not exist.',
+    'does_not_exist_var' => 'Asset with tag :asset_tag not found.',
+    'no_tag' 	         => 'No asset tag provided.',
     'does_not_exist_or_not_requestable' => 'That asset does not exist or is not requestable.',
-    'assoc_users'	 	=> 'This asset is currently checked out to a user and cannot be deleted. Please check the asset in first, and then try deleting again. ',
+    'assoc_users'	 	 => 'This asset is currently checked out to a user and cannot be deleted. Please check the asset in first, and then try deleting again. ',
     'warning_audit_date_mismatch' 	=> 'This asset\'s next audit date (:next_audit_date) is before the last audit date (:last_audit_date). Please update the next audit date.',
+    'labels_generated'   => 'Labels were successfully generated.',
+    'error_generating_labels' => 'Error while generating labels.',
+    'no_assets_selected' => 'No assets selected.',
 
     'create' => [
         'error'   		=> 'Asset was not created, please try again. :(',
         'success' 		=> 'Asset created successfully. :)',
         'success_linked' => 'Asset with tag :tag was created successfully. <strong><a href=":link" style="color: white;">Click here to view</a></strong>.',
+        'multi_success_linked' => 'Asset with tag :links was created successfully.|:count assets were created succesfully. :links.',
+        'partial_failure' => 'An asset was unable to be created. Reason: :failures|:count assets were unable to be created. Reasons: :failures',
+        'target_not_found' => [
+            'user' => 'The assigned user could not be found.',
+            'asset' => 'The assigned asset could not be found.',
+            'location' => 'The assigned location could not be found.',
+        ],
     ],
 
     'update' => [
@@ -52,20 +61,24 @@ return [
     ],
 
     'import' => [
+        'import_button'         => 'Process Import',
         'error'                 => 'Some items did not import correctly.',
         'errorDetail'           => 'The following Items were not imported because of errors.',
         'success'               => 'Your file has been imported',
         'file_delete_success'   => 'Your file has been been successfully deleted',
         'file_delete_error'      => 'The file was unable to be deleted',
         'file_missing' => 'The file selected is missing',
+        'file_already_deleted' => 'The file selected was already deleted',
         'header_row_has_malformed_characters' => 'One or more attributes in the header row contain malformed UTF-8 characters',
         'content_row_has_malformed_characters' => 'One or more attributes in the first row of content contain malformed UTF-8 characters',
+        'transliterate_failure' => 'Transliteration from :encoding to UTF-8 failed due to invalid characters in input'
     ],
 
 
     'delete' => [
         'confirm'   	=> 'Are you sure you wish to delete this asset?',
         'error'   		=> 'There was an issue deleting the asset. Please try again.',
+        'assigned_to_error' => '{1}Asset Tag: :asset_tag is currently checked out. Check in this device before deletion.|[2,*]Asset Tags: :asset_tag are currently checked out. Check in these devices before deletion.',
         'nothing_updated'   => 'No assets were selected, so nothing was deleted.',
         'success' 		=> 'The asset was deleted successfully.',
     ],
@@ -78,6 +91,11 @@ return [
         'no_assets_selected' => 'You must select at least one asset from the list',
     ],
 
+    'multi-checkout' => [
+        'error'   => 'Asset was not checked out, please try again|Assets were not checked out, please try again',
+        'success' => 'Asset checked out successfully.|Assets checked out successfully.',
+    ],
+
     'checkin' => [
         'error'   		=> 'Asset was not checked in, please try again',
         'success' 		=> 'Asset checked in successfully.',
@@ -87,9 +105,10 @@ return [
     ],
 
     'requests' => [
-        'error'   		=> 'Asset was not requested, please try again',
-        'success' 		=> 'Asset requested successfully.',
-        'canceled'      => 'Checkout request successfully canceled',
+        'error'   		=> 'Request was not successful, please try again.',
+        'success' 		=> 'Request successfully submitted.',
+        'canceled'      => 'Request successfully canceled.',
+        'cancel'        => 'Cancel this item request',
     ],
 
 ];
diff --git a/resources/lang/en-US/admin/hardware/table.php b/resources/lang/en-US/admin/hardware/table.php
index 92b228dccd..2d88c6c131 100644
--- a/resources/lang/en-US/admin/hardware/table.php
+++ b/resources/lang/en-US/admin/hardware/table.php
@@ -25,7 +25,6 @@ return [
     'image'		    => 'Device Image',
     'days_without_acceptance' => 'Days Without Acceptance',
     'monthly_depreciation' => 'Monthly Depreciation',
-    'assigned_to'    => 'Assigned To',
     'requesting_user' => 'Requesting User',
     'requested_date' => 'Requested Date',
     'changed'       => 'Changed',
diff --git a/resources/lang/en-US/admin/kits/general.php b/resources/lang/en-US/admin/kits/general.php
index f57fb645c4..2b5c2d9cd0 100644
--- a/resources/lang/en-US/admin/kits/general.php
+++ b/resources/lang/en-US/admin/kits/general.php
@@ -47,4 +47,5 @@ return [
     'kit_deleted'                       => 'Kit was successfully deleted',
     'kit_model_updated'                 => 'Model was successfully updated',
     'kit_model_detached'                => 'Model was successfully detached',
+    'model_already_attached'            => 'Model already attached to kit',
 ];
diff --git a/resources/lang/en-US/admin/licenses/general.php b/resources/lang/en-US/admin/licenses/general.php
index 79b69a3d94..b39030afd4 100644
--- a/resources/lang/en-US/admin/licenses/general.php
+++ b/resources/lang/en-US/admin/licenses/general.php
@@ -14,6 +14,7 @@ return array(
     'info'  					=> 'License Info',
     'license_seats'  			=> 'License Seats',
     'seat'  					=> 'Seat',
+    'seat_count'  				=> 'Seat :count',
     'seats'  					=> 'Seats',
     'software_licenses'  		=> 'Software Licenses',
     'user'  					=> 'User',
@@ -23,12 +24,12 @@ return array(
         [
             'checkin_all'           => [
                 'button'            => 'Checkin All Seats',
-                'modal'             => 'This will action checkin one seat. | This action will checkin all :checkedout_seats_count seats for this license.',
+                'modal'             => 'This action will checkin one seat. | This action will checkin all :checkedout_seats_count seats for this license.',
                 'enabled_tooltip'   => 'Checkin ALL seats for this license from both users and assets',
                 'disabled_tooltip'  => 'This is disabled because there are no seats currently checked out',
                 'disabled_tooltip_reassignable'  => 'This is disabled because the License is not reassignable',
                 'success'           => 'License successfully checked in! | All licenses were successfully checked in!',
-                'log_msg'           => 'Checked in via bulk license checkout in license GUI',
+                'log_msg'           => 'Checked in via bulk license checkin in license GUI',
             ],
 
             'checkout_all'              => [
diff --git a/resources/lang/en-US/admin/licenses/message.php b/resources/lang/en-US/admin/licenses/message.php
index 27fbfe38a9..74e1d7af5a 100644
--- a/resources/lang/en-US/admin/licenses/message.php
+++ b/resources/lang/en-US/admin/licenses/message.php
@@ -44,10 +44,13 @@ return array(
         'error'   => 'There was an issue checking out the license. Please try again.',
         'success' => 'The license was checked out successfully',
         'not_enough_seats' => 'Not enough license seats available for checkout',
+        'mismatch' => 'The license seat provided does not match the license',
+        'unavailable' => 'This seat is not available for checkout.',
     ),
 
     'checkin' => array(
         'error'   => 'There was an issue checking in the license. Please try again.',
+        'not_reassignable' => 'License not reassignable',
         'success' => 'The license was checked in successfully'
     ),
 
diff --git a/resources/lang/en-US/admin/locations/message.php b/resources/lang/en-US/admin/locations/message.php
index 8121b80687..b21c70ad89 100644
--- a/resources/lang/en-US/admin/locations/message.php
+++ b/resources/lang/en-US/admin/locations/message.php
@@ -3,11 +3,12 @@
 return array(
 
     'does_not_exist' => 'Location does not exist.',
-    'assoc_users'    => 'This location is not currently deletable because it is the location of record for at least one asset or user, has assets assigned to it, or is the parent location of another location. Please update your models to no longer reference this company and try again. ',
+    'assoc_users'    => 'This location is not currently deletable because it is the location of record for at least one asset or user, has assets assigned to it, or is the parent location of another location. Please update your records to no longer reference this location and try again ',
     'assoc_assets'	 => 'This location is currently associated with at least one asset and cannot be deleted. Please update your assets to no longer reference this location and try again. ',
     'assoc_child_loc'	 => 'This location is currently the parent of at least one child location and cannot be deleted. Please update your locations to no longer reference this location and try again. ',
     'assigned_assets' => 'Assigned Assets',
     'current_location' => 'Current Location',
+    'open_map' => 'Open in :map_provider_icon Maps',
 
 
     'create' => array(
@@ -20,6 +21,11 @@ return array(
         'success' => 'Location updated successfully.'
     ),
 
+    'restore' => array(
+        'error'   => 'Location was not restored, please try again',
+        'success' => 'Location restored successfully.'
+    ),
+
     'delete' => array(
         'confirm'   	=> 'Are you sure you wish to delete this location?',
         'error'   => 'There was an issue deleting the location. Please try again.',
diff --git a/resources/lang/en-US/admin/locations/table.php b/resources/lang/en-US/admin/locations/table.php
index ed3f96f6b4..53176d8a4e 100644
--- a/resources/lang/en-US/admin/locations/table.php
+++ b/resources/lang/en-US/admin/locations/table.php
@@ -39,4 +39,5 @@ return [
     'signed_by_finance_auditor' => 'Signed By (Finance Auditor):',
     'signed_by_location_manager' => 'Signed By (Location Manager):',
     'signed_by'                 => 'Signed Off By:',
+    'clone'  					=> 'Clone Location',
 ];
diff --git a/resources/lang/en-US/admin/models/general.php b/resources/lang/en-US/admin/models/general.php
index 7e4a77adbc..9a61b53fd0 100644
--- a/resources/lang/en-US/admin/models/general.php
+++ b/resources/lang/en-US/admin/models/general.php
@@ -3,7 +3,7 @@
 return array(
     'about_models_title'     => 'About Asset Models',
     'about_models_text'           => 'Asset Models are a way to group identical assets. "MBP 2013", "IPhone 6s", etc.',
-    'deleted'  					        => 'This model has been deleted.',
+    'deleted'  					=> 'This model has been deleted.',
     'bulk_delete'               => 'Bulk Delete Asset Models',
     'bulk_delete_help'               => 'Use the checkboxes below to confirm the deletion of the selected asset models. Asset models that have assets associated with them cannot be deleted until the assets are associated with a different model.',
     'bulk_delete_warn'          => 'You are about to delete one asset model.|You are about to delete :model_count asset models.',
diff --git a/resources/lang/en-US/admin/models/message.php b/resources/lang/en-US/admin/models/message.php
index cc38c54530..ae3bc34eed 100644
--- a/resources/lang/en-US/admin/models/message.php
+++ b/resources/lang/en-US/admin/models/message.php
@@ -7,7 +7,7 @@ return array(
     'no_association' => 'WARNING! The asset model for this item is invalid or missing!',
     'no_association_fix' => 'This will break things in weird and horrible ways. Edit this asset now to assign it a model.',
     'assoc_users'	 => 'This model is currently associated with one or more assets and cannot be deleted. Please delete the assets, and then try deleting again. ',
-
+    'invalid_category_type' => 'This category must be an asset category.',
 
     'create' => array(
         'error'   => 'Model was not created, please try again.',
diff --git a/resources/lang/en-US/admin/reports/general.php b/resources/lang/en-US/admin/reports/general.php
index 9b682f8ecd..ed8bf1a156 100644
--- a/resources/lang/en-US/admin/reports/general.php
+++ b/resources/lang/en-US/admin/reports/general.php
@@ -4,6 +4,7 @@ return [
     'info'   => 'Select the options you want for your asset report.',
     'deleted_user' => 'Deleted user',
     'send_reminder' => 'Send reminder',
+    'cannot_send_reminder' => 'User has been deleted or does not have an email address so cannot receive a reminder',
     'reminder_sent' => 'Reminder sent',
     'acceptance_deleted' => 'Acceptance request deleted',
     'acceptance_request' => 'Acceptance request',
@@ -13,5 +14,10 @@ return [
         'user_state' => 'User State',
         'user_country' => 'User Country',
         'user_zip' => 'User Zip'
-    ]
-];
\ No newline at end of file
+    ],
+    'open_saved_template' => 'Open Saved Template',
+    'save_template' =>  'Save Template',
+    'select_a_template' => 'Select a Template',
+    'template_name' => 'Template Name',
+    'update_template' => 'Update Template',
+];
diff --git a/resources/lang/en-US/admin/reports/message.php b/resources/lang/en-US/admin/reports/message.php
index d4c8f8198f..2800bbdf0b 100644
--- a/resources/lang/en-US/admin/reports/message.php
+++ b/resources/lang/en-US/admin/reports/message.php
@@ -1,5 +1,16 @@
 <?php
 
-return array(
-    'error'   => 'You must select at least ONE option.'
-);
+return [
+    'about_templates' => 'About Saved Templates',
+    'saving_templates_description' => 'Select your options, then enter the name of your template in the box above and click the \'Save Template\' button. Use the dropdown to select a previously saved template.',
+    'create'  => [
+        'success' => 'Template saved successfully',
+    ],
+    'update' => [
+        'success' => 'Template updated successfully',
+    ],
+    'delete' => [
+        'success' => 'Template deleted',
+        'no_delete_permission' => 'Template does not exist or you do not have permission to delete it.',
+    ],
+];
diff --git a/resources/lang/en-US/admin/settings/general.php b/resources/lang/en-US/admin/settings/general.php
index 8074f5082e..8c4ae35365 100644
--- a/resources/lang/en-US/admin/settings/general.php
+++ b/resources/lang/en-US/admin/settings/general.php
@@ -8,13 +8,15 @@ return [
     'ad_append_domain'          => 'Append domain name to username field',
     'ad_append_domain_help'     => 'User isn\'t required to write "username@domain.local", they can just type "username".',
     'admin_cc_email'            => 'CC Email',
-    'admin_cc_email_help'       => 'If you would like to send a copy of checkin/checkout emails that are sent to users to an additional email account, enter it here. Otherwise leave this field blank.',
+    'admin_cc_email_help'       => 'Send a copy of checkin/checkout emails to this address.',
+    'admin_cc_always' => 'Always send copy upon checkin/checkout',
+    'admin_cc_when_acceptance_required' => 'Only send copy upon checkout if acceptance is required',
     'admin_settings'            => 'Admin Settings',
     'is_ad'				        => 'This is an Active Directory server',
     'alerts'                	=> 'Alerts',
     'alert_title'               => 'Update Notification Settings',
     'alert_email'				=> 'Send alerts to',
-    'alert_email_help'    => 'Email addresses or distribution lists you want alerts to be sent to, comma separated',
+    'alert_email_help'          => 'Email addresses or distribution lists you want alerts to be sent to, comma separated.',
     'alerts_enabled'			=> 'Email Alerts Enabled',
     'alert_interval'			=> 'Expiring Alerts Threshold (in days)',
     'alert_inv_threshold'		=> 'Inventory Alert Threshold',
@@ -31,15 +33,18 @@ return [
     'backups'					=> 'Backups',
     'backups_help'              => 'Create, download, and restore backups ',
     'backups_restoring'         => 'Restoring from Backup',
+    'backups_clean' => 'Clean the backed-up database before restore',
+    'backups_clean_helptext' => "This can be useful if you're changing between database versions",
     'backups_upload'            => 'Upload Backup',
     'backups_path'              => 'Backups on the server are stored in <code>:path</code>',
-    'backups_restore_warning'   => 'Use the restore button <small><span class="btn btn-xs btn-warning"><i class="text-white fas fa-retweet" aria-hidden="true"></i></span></small> to restore from a previous backup. (This does not currently work with S3 file storage or Docker.)<br><br>Your <strong>entire :app_name database and any uploaded files will be completely replaced</strong> by what\'s in the backup file.  ',
+    'backups_restore_warning'   => 'Use the restore button <small><span class="btn btn-xs btn-warning"><i class="text-white fas fa-retweet" aria-hidden="true"></i></span></small> to restore from a previous backup. (This does not currently work with S3 file storage or Docker.)<br><br>Your <strong>entire :app_name database and any uploaded files will be completely replaced</strong> by what\'s in the backup file  ',
     'backups_logged_out'         => 'All existing users, including you, will be logged out once your restore is complete.',
     'backups_large'             => 'Very large backups may time out on the restore attempt and may still need to be run via command line. ',
     'barcode_settings'			=> 'Barcode Settings',
     'confirm_purge'			    => 'Confirm Purge',
     'confirm_purge_help'		=> 'Enter the text "DELETE" in the box below to purge your deleted records. This action cannot be undone and will PERMANENTLY delete all soft-deleted items and users. (You should make a backup first, just to be safe.)',
     'custom_css'				=> 'Custom CSS',
+    'custom_css_placeholder'	=> 'Add your custom CSS',
     'custom_css_help'			=> 'Enter any custom CSS overrides you would like to use. Do not include the &lt;style&gt;&lt;/style&gt; tags.',
     'custom_forgot_pass_url'	=> 'Custom Password Reset URL',
     'custom_forgot_pass_url_help'	=> 'This replaces the built-in forgotten password URL on the login screen, useful to direct people to internal or hosted LDAP password reset functionality. It will effectively disable local user forgotten password functionality.',
@@ -47,34 +52,34 @@ return [
     'dashboard_message_help'	=> 'This text will appear on the dashboard for anyone with permission to view the dashboard.',
     'default_currency'  		=> 'Default Currency',
     'default_eula_text'			=> 'Default EULA',
+    'default_eula_text_placeholder' => 'Add your default EULA text',
     'default_language'			=> 'Default Language',
     'default_eula_help_text'	=> 'You can also associate custom EULAs to specific asset categories.',
     'acceptance_note'           => 'Add a note for your decision (Optional)',
     'display_asset_name'        => 'Display Asset Name',
     'display_checkout_date'     => 'Display Checkout Date',
     'display_eol'               => 'Display EOL in table view',
-    'display_qr'                => 'Display Square Codes',
+    'display_qr'                => 'Display 2D barcode',
     'display_alt_barcode'		=> 'Display 1D barcode',
-    'email_logo'                => 'Email Logo',
     'barcode_type'				=> '2D Barcode Type',
     'alt_barcode_type'			=> '1D barcode type',
-    'email_logo_size'       => 'Square logos in email look best. ',
     'enabled'                   => 'Enabled',
     'eula_settings'				=> 'EULA Settings',
     'eula_markdown'				=> 'This EULA allows <a href="https://help.github.com/articles/github-flavored-markdown/">Github flavored markdown</a>.',
+    'empty_row_count'           => 'Field Start Offset (Empty Rows)',
+    'empty_row_count_help'      => 'Fields will begin populating after this many empty rows are skipped at the top of the label.',
     'favicon'                   => 'Favicon',
     'favicon_format'            => 'Accepted filetypes are ico, png, and gif. Other image formats may not work in all browsers.',
     'favicon_size'          => 'Favicons should be square images, 16x16 pixels.',
     'footer_text'               => 'Additional Footer Text ',
     'footer_text_help'          => 'This text will appear in the right-side footer. Links are allowed using <a href="https://help.github.com/articles/github-flavored-markdown/">Github flavored markdown</a>. Line breaks, headers, images, etc may result in unpredictable results.',
+    'footer_text_placeholder'   => 'Optional footer text',
     'general_settings'			=> 'General Settings',
-    'general_settings_keywords' => 'company support, signature, acceptance, email format, username format, images, per page, thumbnail, eula, gravatar, tos, dashboard, privacy',
     'general_settings_help'     => 'Default EULA and more',
     'generate_backup'			=> 'Generate Backup',
     'google_workspaces'         => 'Google Workspaces',
     'header_color'              => 'Header Color',
     'info'                      => 'These settings let you customize certain aspects of your installation.',
-    'label_logo'                => 'Label Logo',
     'label_logo_size'           => 'Square logos look best - will be displayed in the top right of each asset label. ',
     'laravel'                   => 'Laravel Version',
     'ldap'                      => 'LDAP',
@@ -94,7 +99,7 @@ return [
     'ldap_login_sync_help'      => 'This only tests that LDAP can sync correctly. If your LDAP Authentication query is not correct, users may still not be able to login. YOU MUST SAVE YOUR UPDATED LDAP SETTINGS FIRST.',
     'ldap_manager'              => 'LDAP Manager',
     'ldap_server'               => 'LDAP Server',
-    'ldap_server_help'          => 'This should start with ldap:// (for unencrypted or TLS) or ldaps:// (for SSL)',
+    'ldap_server_help'          => 'This should start with ldap:// (for unencrypted) or ldaps:// (for TLS or SSL)',
     'ldap_server_cert'			=> 'LDAP SSL certificate validation',
     'ldap_server_cert_ignore'	=> 'Allow invalid SSL Certificate',
     'ldap_server_cert_help'		=> 'Select this checkbox if you are using a self signed SSL cert and would like to accept an invalid SSL certificate.',
@@ -108,8 +113,8 @@ return [
     'ldap_pword'                => 'LDAP Bind Password',
     'ldap_basedn'               => 'Base Bind DN',
     'ldap_filter'               => 'LDAP Filter',
-    'ldap_pw_sync'              => 'LDAP Password Sync',
-    'ldap_pw_sync_help'         => 'Uncheck this box if you do not wish to keep LDAP passwords synced with local passwords. Disabling this means that your users may not be able to login if your LDAP server is unreachable for some reason.',
+    'ldap_pw_sync'              => 'Cache LDAP Passwords',
+    'ldap_pw_sync_help'         => 'Uncheck this box if you do not wish to keep LDAP passwords cached as local hashed passwords. Disabling this means that your users may not be able to login if your LDAP server is unreachable for some reason.',
     'ldap_username_field'       => 'Username Field',
     'ldap_lname_field'          => 'Last Name',
     'ldap_fname_field'          => 'LDAP First Name',
@@ -117,13 +122,15 @@ return [
     'ldap_version'              => 'LDAP Version',
     'ldap_active_flag'          => 'LDAP Active Flag',
     'ldap_activated_flag_help'  => 'This value is used to determine whether a synced user can login to Snipe-IT. <strong>It does not affect the ability to check items in or out to them</strong>, and should be the <strong>attribute name</strong> within your AD/LDAP, <strong>not the value</strong>. <br><br>If this field is set to a field name that does not exist in your AD/LDAP, or the value in the AD/LDAP field is set to <code>0</code> or <code>false</code>, <strong>user login will be disabled</strong>. If the value in the AD/LDAP field is set to <code>1</code> or <code>true</code> or <em>any other text</em> means the user can log in. When the field is blank in your AD, we respect the <code>userAccountControl</code> attribute, which usually allows non-suspended users to log in.',
+    'ldap_invert_active_flag'   => 'LDAP Invert Active Flag',
+    'ldap_invert_active_flag_help'     => 'If enabled: when the value returned by LDAP Active Flag is <code>0</code> or <code>false</code> the user account will be active.',
     'ldap_emp_num'              => 'LDAP Employee Number',
     'ldap_email'                => 'LDAP Email',
     'ldap_test'                 => 'Test LDAP',
     'ldap_test_sync'            => 'Test LDAP Synchronization',
     'license'                   => 'Software License',
-    'load_remote'               => 'Use Gravatar',
-    'load_remote_help_text'		=> 'Uncheck this box if your install cannot load scripts from the outside internet. This will prevent Snipe-IT from trying load images from Gravatar.',
+    'load_remote'               => 'Load Remote Avatars',
+    'load_remote_help_text'		=> 'Uncheck this box if your install cannot load scripts from the outside internet. This will prevent Snipe-IT from trying load avatars from Gravatar or other outside sources.',
     'login'                     => 'Login Attempts',
     'login_attempt'             => 'Login Attempt',
     'login_ip'                  => 'IP Address',
@@ -131,6 +138,7 @@ return [
     'login_user_agent'          => 'User Agent',
     'login_help'                => 'List of attempted logins',
     'login_note'                => 'Login Note',
+    'login_note_placeholder'            => "If you do not have a login or have found a device belonging to this company, please call technical support at 888-555-1212. Thank you.",
     'login_note_help'           => 'Optionally include a few sentences on your login screen, for example to assist people who have found a lost or stolen device. This field accepts <a href="https://help.github.com/articles/github-flavored-markdown/">Github flavored markdown</a>',
     'login_remote_user_text'    => 'Remote User login options',
     'login_remote_user_enabled_text' => 'Enable Login with Remote User Header',
@@ -146,13 +154,16 @@ return [
     'logo_print_assets_help'    => 'Use branding on printable asset lists ',
     'full_multiple_companies_support_help_text' => 'Restricting users (including admins) assigned to companies to their company\'s assets.',
     'full_multiple_companies_support_text' => 'Full Multiple Companies Support',
+    'scope_locations_fmcs_support_text'  => 'Scope Locations with Full Multiple Companies Support',
+    'scope_locations_fmcs_support_help_text'  => 'Restrict locations to their selected company.',
+    'scope_locations_fmcs_check_button' => 'Check Compatibility',
+    'scope_locations_fmcs_support_disabled_text'  => 'This option is disabled because you have conflicting locations set for :count or more items.',
     'show_in_model_list'   => 'Show in Model Dropdowns',
     'optional'					=> 'optional',
     'per_page'                  => 'Results Per Page',
     'php'                       => 'PHP Version',
-    'php_info'                  => 'PHP Info',
+    'php_info'                  => 'PHP info',
     'php_overview'              => 'PHP',
-    'php_overview_keywords'     => 'phpinfo, system, info',
     'php_overview_help'         => 'PHP System info',
     'php_gd_info'               => 'You must install php-gd to display QR codes, see install instructions.',
     'php_gd_warning'            => 'PHP Image Processing and GD plugin is NOT installed.',
@@ -218,6 +229,8 @@ return [
     'webhook_integration_help'    => ':app integration is optional, however the endpoint and channel are required if you wish to use it. To configure :app integration, you must first <a href=":webhook_link" target="_new" rel="noopener">create an incoming webhook</a> on your :app account. Click on the <strong>Test :app Integration</strong> button to confirm your settings are correct before saving. ',
     'webhook_integration_help_button'    => 'Once you have saved your :app information, a test button will appear.',
     'webhook_test_help'           => 'Test whether your :app integration is configured correctly. YOU MUST SAVE YOUR UPDATED :app SETTINGS FIRST.',
+    'shortcuts_enabled'         => 'Enable Shortcuts',
+    'shortcuts_help_text'       => '<strong>Windows</strong>: Alt + Access key, <strong>Mac</strong>: Control + Option + Access key',
     'snipe_version'  			=> 'Snipe-IT version',
     'support_footer'            => 'Support Footer Links ',
     'support_footer_help'       => 'Specify who sees the links to the Snipe-IT Support info and Users Manual',
@@ -227,7 +240,6 @@ return [
     'update'                    => 'Update Settings',
     'value'                     => 'Value',
     'brand'                     => 'Branding',
-    'brand_keywords'            => 'footer, logo, print, theme, skin, header, colors, color, css',
     'brand_help'                => 'Logo, Site Name',
     'web_brand'                 => 'Web Branding Type',
     'about_settings_title'      => 'About Settings',
@@ -276,6 +288,8 @@ return [
     'two_factor_enrollment_text'	=> "Two factor authentication is required, however your device has not been enrolled yet. Open your Google Authenticator app and scan the QR code below to enroll your device. Once you've enrolled your device, enter the code below",
     'require_accept_signature'      => 'Require Signature',
     'require_accept_signature_help_text'      => 'Enabling this feature will require users to physically sign off on accepting an asset.',
+    'require_checkinout_notes'  => 'Require Notes on Checkin/Checkout',
+    'require_checkinout_notes_help_text'    => 'Enabling this feature will require the note fields to be populated when checking in or checking out an asset.',
     'left'        => 'left',
     'right'        => 'right',
     'top'        => 'top',
@@ -313,24 +327,24 @@ return [
     'filter_by_keyword' => 'Filter by setting keyword',
     'security' => 'Security',
     'security_title' => 'Update Security Settings',
-    'security_keywords' => 'password, passwords, requirements, two factor, two-factor, common passwords, remote login, logout, authentication',
     'security_help' => 'Two-factor, Password Restrictions',
-    'groups_keywords' => 'permissions, permission groups, authorization',
     'groups_help' => 'Account permission groups',
     'localization' => 'Localization',
     'localization_title' => 'Update Localization Settings',
-    'localization_keywords' => 'localization, currency, local, locale, time zone, timezone, international, internatinalization, language, languages, translation',
     'localization_help' => 'Language, date display',
     'notifications' => 'Notifications',
     'notifications_help' => 'Email Alerts & Audit Settings',
     'asset_tags_help' => 'Incrementing and prefixes',
     'labels' => 'Labels',
     'labels_title' => 'Update Label Settings',
-    'labels_help' => 'Label sizes &amp; settings',
-    'purge_keywords' => 'permanently delete',
+    'labels_help' => 'Barcodes &amp; label settings',
     'purge_help' => 'Purge Deleted Records',
     'ldap_extension_warning' => 'It does not look like the LDAP extension is installed or enabled on this server. You can still save your settings, but you will need to enable the LDAP extension for PHP before LDAP syncing or login will work.',
     'ldap_ad' => 'LDAP/AD',
+    'ldap_test_label' => 'Test LDAP Sync',
+    'ldap_test_login' => ' Test LDAP Login',
+    'ldap_username_placeholder' => 'LDAP Username',
+    'ldap_password_placeholder' => 'LDAP Password',
     'employee_number' => 'Employee Number',
     'create_admin_user' => 'Create a User ::',
     'create_admin_success' => 'Success! Your admin user has been added!',
@@ -342,6 +356,8 @@ return [
     'setup_migration_create_user' => 'Next: Create User',
     'ldap_settings_link' => 'LDAP Settings Page',
     'slack_test' => 'Test <i class="fab fa-slack"></i> Integration',
+    'status_label_name' => 'Status Label Name',
+    'super_admin_only'  => 'Super Admin Only',
     'label2_enable'           => 'New Label Engine',
     'label2_enable_help'      => 'Switch to the new label engine. <b>Note: You will need to save this setting before setting others.</b>',
     'label2_template'         => 'Template',
@@ -356,12 +372,15 @@ return [
     'label2_2d_type'          => '2D Barcode Type',
     'label2_2d_type_help'     => 'Format for 2D barcodes',
     'label2_2d_target'        => '2D Barcode Target',
-    'label2_2d_target_help'   => 'The URL the 2D barcode points to when scanned',
+    'label2_2d_target_help'   => 'The data that will be contained in the 2D barcode',
     'label2_fields'           => 'Field Definitions',
     'label2_fields_help'      => 'Fields can be added, removed, and reordered in the left column. For each field, multiple options for Label and DataSource can be added, removed, and reordered in the right column.',
+    'purge_barcodes' => 'Purge Barcodes',
     'help_asterisk_bold'    => 'Text entered as <code>**text**</code> will be displayed as bold',
     'help_blank_to_use'     => 'Leave blank to use the value from <code>:setting_name</code>',
     'help_default_will_use' => '<code>:default</code> will use the value from <code>:setting_name</code>. <br>Note that the value of the barcodes must comply with the respective barcode spec in order to be successfully generated. Please see <a href="https://snipe-it.readme.io/docs/barcodes">the documentation <i class="fa fa-external-link"></i></a> for more details. ',
+    'asset_id'              => 'Asset ID',
+    'data'               => 'Data',
     'default'               => 'Default',
     'none'                  => 'None',
     'google_callback_help' => 'This should be entered as the callback URL in your Google OAuth app settings in your organization&apos;s <strong><a href="https://console.cloud.google.com/" target="_blank">Google developer console <i class="fa fa-external-link" aria-hidden="true"></i></a></strong>.',
@@ -373,7 +392,101 @@ return [
     'database_driver' => 'Database Driver',
     'bs_table_storage' => 'Table Storage',
     'timezone' => 'Timezone',
+    'test_mail' => 'Test Mail',
     'profile_edit'          => 'Edit Profile',
     'profile_edit_help'          => 'Allow users to edit their own profiles.',
+    'default_avatar' => 'Custom Default Avatar',
+    'default_avatar_help' => 'This image will be displayed as a profile if a user does not have a profile photo.',
+    'restore_default_avatar' => 'Restore <a href=":default_avatar" data-toggle="lightbox" data-type="image">original system default avatar</a>',
+    'restore_default_avatar_help' => '',
+    'due_checkin_days' => 'Due For Checkin Warning',
+    'due_checkin_days_help' => 'How many days before the expected checkin of an asset should it be listed in the "Due for checkin" page?',
+    'no_groups' => 'No groups have been created yet. Visit <code>Admin Settings > Permission Groups</code> to add one.',
+    'text' => 'Text',
+
+    'username_formats' => [
+        'username_format'		=> 'Username Format',
+        'firstname_lastname_format'	=> 'First Name Last Name (jane.smith)',
+        'first_name_format'	        => 'First Name (jane)',
+        'last_name_format'		=> 'Last Name (doe)',
+        'filastname_format'			=> 'First Initial Last Name (jsmith)',
+        'lastnamefirstinitial_format' =>  'Last Name First Initial (smithj)',
+        'firstname_lastname_underscore_format' => 'First Name Last Name (jane_smith)',
+        'firstinitial_lastname' => 'First Initial Last Name (j.smith)',
+        'lastname_firstinitial' => 'Last Name First Initial (smith_j)',
+        'lastname_dot_firstinitial_format' => 'Last Name First Initial (smith.j)',
+        'firstnamelastname'     => 'First Name Last Name (janesmith)',
+        'firstnamelastinitial'  => 'First Name Last Initial (janes)',
+        'lastnamefirstname'      => 'Last Name.First Name (smith.jane)',
+    ],
+
+    'email_formats' => [
+        'email_format'			=> 'Email Format',
+        'firstname_lastname_format'	=> 'First Name Last Name (jane.smith@example.com)',
+        'first_name_format'		=> 'First Name (jane@example.com)',
+        'last_name_format'		=> 'Last Name (doe@example.com)',
+        'filastname_format'			=> 'First Initial Last Name (jsmith@example.com)',
+        'lastnamefirstinitial_format' =>  'Last Name First Initial (smithj@example.com)',
+        'firstname_lastname_underscore_format' => 'First Name Last Name (jane_smith@example.com)',
+        'firstinitial_lastname' => 'First Initial Last Name (j.smith@example.com)',
+        'lastname_firstinitial' => 'Last Name First Initial (smith_j@example.com)',
+        'lastname_dot_firstinitial_format' => 'Last Name First Initial (smith.j@example.com)',
+        'firstnamelastname'     => 'First Name Last Name (janesmith@example.com)',
+        'firstnamelastinitial'  => 'First Name Last Initial (janes@example.com)',
+        'lastnamefirstname'      => 'Last Name.First Name (smith.jane@example.com)',
+    ],
+
+
+
+    'logo_labels' => [
+        'acceptance_pdf_logo'       => 'PDF Logo',
+        'email_logo'                => 'Email Logo',
+        'label_logo'                => 'Label Logo',
+        'logo'                      => 'Site Logo',
+        'favicon'                   => 'Favicon',
+    ],
+
+    'logo_help' => [
+        'email_logo_size'       => 'Square logos in email look best. ',
+    ],
+
+    'logo_option_types' => [
+        'text' => 'Text',
+        'logo' => 'Logo',
+        'logo_and_text' => 'Logo and Text',
+    ],
+
+
+    'legends' => [
+        'scoping' => 'Scoping',
+        'formats' => 'Default Formats',
+        'profiles' => 'User Profiles',
+        'eula' => 'EULA & Acceptance Preferences',
+        'misc_display' => 'Miscellaneous Display Options',
+        'email' => 'Email Preferences',
+        'checkin' => 'Checkin Preferences',
+        'dashboard' => 'Login & Dashboard Preferences',
+        'misc' => 'Miscellaneous',
+        'logos' => 'Logos & Display',
+        'colors' => 'Colors & Skins',
+        'footer' => 'Footer Preferences',
+        'security' => 'Security Preferences',
+        'general' => 'General',
+        'intervals' => 'Intervals & Thresholds',
+    ],
+
+
+    /* Keywords for settings overview help */
+    'keywords' => [
+        'brand'             => 'footer, logo, print, theme, skin, header, colors, color, css',
+        'general_settings'  => 'company support, signature, acceptance, email format, username format, images, per page, thumbnail, eula, gravatar, tos, dashboard, privacy',
+        'groups'            => 'permissions, permission groups, authorization',
+        'labels'            => 'labels, barcodes, barcode, sheets, print, upc, qr, 1d, 2d',
+        'localization'      => 'localization, currency, local, locale, time zone, timezone, international, internatinalization, language, languages, translation',
+        'php_overview'      => 'phpinfo, system, info',
+        'purge'             => 'permanently delete',
+        'security'          => 'password, passwords, requirements, two factor, two-factor, common passwords, remote login, logout, authentication',
+        'notifications'     => 'alerts, email, notifications, audit, threshold, email alerts, cc',
+    ],
 
 ];
diff --git a/resources/lang/en-US/admin/settings/message.php b/resources/lang/en-US/admin/settings/message.php
index c9b0f34217..58abf14c5c 100644
--- a/resources/lang/en-US/admin/settings/message.php
+++ b/resources/lang/en-US/admin/settings/message.php
@@ -14,6 +14,9 @@ return [
         'restore_warning'       => 'Yes, restore it. I acknowledge that this will overwrite any existing data currently in the database. This will also log out all of your existing users (including you).',
         'restore_confirm'       => 'Are you sure you wish to restore your database from :filename?'
     ],
+    'restore' => [
+        'success'               => 'Your system backup has been restored. Please log in again.'
+    ],
     'purge' => [
         'error'     => 'An error has occurred while purging. ',
         'validation_failed'     => 'Your purge confirmation is incorrect. Please type the word "DELETE" in the confirmation box.',
@@ -33,6 +36,9 @@ return [
         'testing_authentication' => 'Testing LDAP Authentication...',
         'authentication_success' => 'User authenticated against LDAP successfully!'
     ],
+    'labels' => [
+        'null_template' => 'Label template not found. Please select a template.',
+        ],
     'webhook' => [
         'sending' => 'Sending :app test message...',
         'success' => 'Your :webhook_name Integration works!',
@@ -42,5 +48,12 @@ return [
         'error' => 'Something went wrong. :app responded with: :error_message',
         'error_redirect' => 'ERROR: 301/302 :endpoint returns a redirect. For security reasons, we don’t follow redirects. Please use the actual endpoint.',
         'error_misc' => 'Something went wrong. :( ',
-    ]
+        'webhook_fail' => ' webhook notification failed: Check to make sure the URL is still valid.',
+        'webhook_channel_not_found' => ' webhook channel not found.',
+        'ms_teams_deprecation' => 'The selected Microsoft Teams webhook URL will be deprecated Dec 31st, 2025. Please use a workflow URL. Microsoft\'s documentation on creating a workflow can be found <a href="https://support.microsoft.com/en-us/office/create-incoming-webhooks-with-workflows-for-microsoft-teams-8ae491c7-0394-4861-ba59-055e33f75498" target="_blank"> here.</a>',
+    ],
+    'location_scoping' => [
+        'not_saved' => 'Your settings were not saved.',
+        'mismatch' => 'There is 1 item in the database that need your attention before you can enable location scoping.|There are :count items in the database that need your attention before you can enable location scoping.',
+    ],
 ];
diff --git a/resources/lang/en-US/admin/statuslabels/table.php b/resources/lang/en-US/admin/statuslabels/table.php
index 27befb5ef7..1a0fab891e 100644
--- a/resources/lang/en-US/admin/statuslabels/table.php
+++ b/resources/lang/en-US/admin/statuslabels/table.php
@@ -1,14 +1,14 @@
 <?php
 
 return array(
-    'about'      	=> 'About Status Labels',
+    'about'      	=> 'About Status Types',
     'archived'      	=> 'Archived',
     'create'      	=> 'Create Status Label',
     'color'      	=> 'Chart Color',
     'default_label' => 'Default Label',
     'default_label_help' => 'This is used to ensure your most commonly used status labels appear at the top of the select box when creating/editing assets.',
     'deployable'      	=> 'Deployable',
-    'info'      	=> 'Status labels are used to describe the various states your assets could be in. They may be out for repair, lost/stolen, etc. You can create new status labels for deployable, pending and archived assets.',
+    'info'      	=> 'Status label types are used to describe the various states your assets could be in. They may be out for repair, lost/stolen, etc. You can create new status labels for your deployable, pending and archived assets according to your own workflow. For more information, <a href="https://snipe-it.readme.io/docs/overview#status-labels" target="_blank">see the documentation <i class="fa fa-external-link"></i></a>.',
     'name'      	=> 'Status Name',
     'pending'      	=> 'Pending',
     'status_type'   => 'Status Type',
diff --git a/resources/lang/en-US/admin/users/general.php b/resources/lang/en-US/admin/users/general.php
index 9c1042d44d..cecf786ce2 100644
--- a/resources/lang/en-US/admin/users/general.php
+++ b/resources/lang/en-US/admin/users/general.php
@@ -19,6 +19,8 @@ return [
     'print_assigned'    => 'Print All Assigned',
     'email_assigned'    => 'Email List of All Assigned',
     'user_notified'     => 'User has been emailed a list of their currently assigned items.',
+    'users_notified'    => 'The user has been emailed a list of their currently assigned items.|:count users have been emailed a list of their currently assigned items.',
+    'users_notified_warning' => ':count user has been emailed a list of their currently assigned items, however :no_email users did not have an email address so could not be emailed.|:count users have been emailed a list of their currently assigned items, however :no_email user(s) did not have an email address so could not be emailed.',
     'auto_assign_label' => 'Include this user when auto-assigning eligible licenses',
     'auto_assign_help'  => 'Skip this user in auto assignment of licenses',
     'software_user'     => 'Software Checked out to :name',
diff --git a/resources/lang/en-US/admin/users/message.php b/resources/lang/en-US/admin/users/message.php
index 4d014775bd..b6ddad3aac 100644
--- a/resources/lang/en-US/admin/users/message.php
+++ b/resources/lang/en-US/admin/users/message.php
@@ -6,7 +6,7 @@ return array(
     'declined'                  => 'You have successfully declined this asset.',
     'bulk_manager_warn'	        => 'Your users have been successfully updated, however your manager entry was not saved because the manager you selected was also in the user list to be edited, and users may not be their own manager. Please select your users again, excluding the manager.',
     'user_exists'               => 'User already exists!',
-    'user_not_found'            => 'User does not exist.',
+    'user_not_found'            => 'User does not exist or you do not have permission view them.',
     'user_login_required'       => 'The login field is required',
     'user_has_no_assets_assigned' => 'No assets currently assigned to user.',
     'user_password_required'    => 'The password is required.',
@@ -53,6 +53,7 @@ return array(
         'ldap_could_not_search' => 'Could not search the LDAP server. Please check your LDAP server configuration in the LDAP config file. <br>Error from LDAP Server:',
         'ldap_could_not_get_entries' => 'Could not get entries from the LDAP server. Please check your LDAP server configuration in the LDAP config file. <br>Error from LDAP Server:',
         'password_ldap' => 'The password for this account is managed by LDAP/Active Directory. Please contact your IT department to change your password. ',
+        'multi_company_items_assigned' => 'This user has items assigned that belong to a different company. Please check them in or edit their company.'
     ),
 
     'deletefile' => array(
diff --git a/resources/lang/en-US/admin/users/table.php b/resources/lang/en-US/admin/users/table.php
index 7c5fb2cad5..094cdbc412 100644
--- a/resources/lang/en-US/admin/users/table.php
+++ b/resources/lang/en-US/admin/users/table.php
@@ -22,7 +22,7 @@ return array(
     'managed_locations'     => 'Managed Locations',
     'managed_users'         => 'Managed Users',
     'name' 					=> 'Name',
-    'nogroup'               => 'No groups have been created yet. To add one, visit: ',
+    'nogroup'               => 'No groups have been created yet. To add one, visit:',
     'notes'                 => 'Notes',
     'password_confirm' 		=> 'Confirm Password',
     'password' 				=> 'Password',
diff --git a/resources/lang/en-US/auth.php b/resources/lang/en-US/auth.php
index db310aa1bb..14d8acfce0 100644
--- a/resources/lang/en-US/auth.php
+++ b/resources/lang/en-US/auth.php
@@ -15,6 +15,6 @@ return array(
 
     'failed' => 'These credentials do not match our records.',
     'password' => 'The provided password is incorrect.',
-    'throttle' => 'Too many login attempts. Please try again in :seconds seconds.',
+    'throttle' => 'Too many login attempts. Please try again in :minutes minute(s).',
 
 );
diff --git a/resources/lang/en-US/auth/message.php b/resources/lang/en-US/auth/message.php
index 588c9069ca..08f638d058 100644
--- a/resources/lang/en-US/auth/message.php
+++ b/resources/lang/en-US/auth/message.php
@@ -6,8 +6,6 @@ return array(
     'account_not_found'      => 'The username or password is incorrect.',
     'account_not_activated'  => 'This user account is not activated.',
     'account_suspended'      => 'This user account is suspended.',
-    'account_banned'         => 'This user account is banned.',
-    'throttle'               => 'Too many failed login attempts. Please try again in :minutes minutes.',
 
     'two_factor' => array(
         'already_enrolled'      => 'Your device is already enrolled.',
diff --git a/resources/lang/en-US/button.php b/resources/lang/en-US/button.php
index 22821b8157..8a838e8faf 100644
--- a/resources/lang/en-US/button.php
+++ b/resources/lang/en-US/button.php
@@ -7,6 +7,7 @@ return [
     'checkin_and_delete'  	    => 'Checkin All / Delete User',
     'delete'  	                => 'Delete',
     'edit'    	                => 'Edit',
+    'clone'    	                => 'Clone',
     'restore' 	                => 'Restore',
     'remove'                    => 'Remove',
     'request'                   => 'Request',
@@ -21,4 +22,13 @@ return [
     'add_maintenance'           => 'Add Maintenance',
     'append'                    => 'Append',
     'new'                       => 'New',
+    'var' => [
+        'clone'     => 'Clone :item_type',
+        'edit'      => 'Edit :item_type',
+        'delete'    => 'Delete :item_type',
+        'restore'   => 'Restore :item_type',
+        'create'    => 'Create New :item_type',
+        'checkout'  => 'Checkout :item_type',
+        'checkin'   => 'Checkin :item_type',
+    ]
 ];
diff --git a/resources/lang/en-US/datepicker.php b/resources/lang/en-US/datepicker.php
new file mode 100644
index 0000000000..1abad03a81
--- /dev/null
+++ b/resources/lang/en-US/datepicker.php
@@ -0,0 +1,78 @@
+<?php
+
+return array(
+
+    /*
+    |--------------------------------------------------------------------------
+    | Authentication Language Lines
+    |--------------------------------------------------------------------------
+    |
+    | The following language lines are used during authentication for various
+    | messages that we need to display to the user. You are free to modify
+    | these language lines according to your application's requirements.
+    |
+    */
+
+    'today' => 'Today',
+    'clear' => 'Clear',
+    'days' => [
+        'sunday' => 'Sunday',
+        'monday' => 'Monday',
+        'tuesday' => 'Tuesday',
+        'wednesday' =>  'Wednesday',
+        'thursday' =>  'Thursday',
+        'friday' =>  'Friday',
+        'saturday' =>  'Saturday',
+        ],
+
+    'short_days' => [
+        'sunday' => 'Sun',
+        'monday' => 'Mon',
+        'tuesday' => 'Tue',
+        'wednesday' =>  'Wed',
+        'thursday' =>  'Thu',
+        'friday' =>  'Fri',
+        'saturday' =>  'Sat',
+    ],
+
+    'min_days' => [
+        'sunday' => 'Su',
+        'monday' => 'Mo',
+        'tuesday' => 'Tu',
+        'wednesday' =>  'We',
+        'thursday' =>  'Th',
+        'friday' =>  'Fr',
+        'saturday' =>  'Sa',
+    ],
+
+    'months' => [
+        'january' => 'January',
+        'february' => 'February',
+        'march' => 'March',
+        'april' => 'April',
+        'may' => 'May',
+        'june' => 'June',
+        'july' => 'July',
+        'august' => 'August',
+        'september' => 'September',
+        'october' => 'October',
+        'november' => 'November',
+        'december' => 'December',
+    ],
+
+    'months_short' => [
+        'january' => 'Jan',
+        'february' => 'Feb',
+        'march' => 'Mar',
+        'april' => 'Apr',
+        'may' => 'May',
+        'june' => 'Jun',
+        'july' => 'Jul',
+        'august' => 'Aug',
+        'september' => 'Sep',
+        'october' => 'Oct',
+        'november' => 'Nov',
+        'december' => 'Dec',
+    ],
+
+);
diff --git a/resources/lang/en-US/general.php b/resources/lang/en-US/general.php
index 5b1d0e9b3c..b21caa8168 100644
--- a/resources/lang/en-US/general.php
+++ b/resources/lang/en-US/general.php
@@ -8,9 +8,11 @@ return [
     'accessory'				=> 'Accessory',
     'accessory_report'		=> 'Accessory Report',
     'action'                => 'Action',
+    'action_date'			=> 'Action Date',
     'activity_report'		=> 'Activity Report',
     'address'				=> 'Address',
-    'admin'					=> 'Admin',
+    'admin'					=> 'Admin Settings',
+    'admin_user'			=> 'Admin User',
     'admin_tooltip'			=> 'This user has admin privileges',
     'superuser'				=> 'Superuser',
     'superuser_tooltip'		=> 'This user has superuser privileges',
@@ -23,13 +25,16 @@ return [
     'asset_models'			=> 'Asset Models',
     'asset_model'			=> 'Model',
     'asset'					=> 'Asset',
+    'asset_previous'        => 'Asset (Previously Assigned)',
     'asset_report'          => 'Asset Report',
     'asset_tag'				=> 'Asset Tag',
     'asset_tags'            => 'Asset Tags',
     'assets_available'		=> 'Assets available',
     'accept_assets'         => 'Accept Assets :name',
     'accept_assets_menu'    => 'Accept Assets',
+    'accept_item'           => 'Accept Item',
     'audit'				    => 'Audit',
+    'audits'				=> 'Audits',
     'audit_report'			=> 'Audit Log',
     'assets'				=> 'Assets',
     'assets_audited'        => 'assets audited',
@@ -61,9 +66,12 @@ return [
     'changepassword'  		=> 'Change Password',
     'checkin'  				=> 'Checkin',
     'checkin_from'  		=> 'Checkin from',
+    'checkin_note'  		=> 'Checkin Note',
+    'checkout_note'  		=> 'Checkout Note',
     'checkout'  			=> 'Checkout',
     'checkouts_count'       => 'Checkouts',
     'checkins_count'        => 'Checkins',
+    'checkin_and_delete'  	=> 'Checkin and Delete',
     'user_requests_count'   => 'Requests',
     'city'  				=> 'City',
     'click_here'			=> 'Click here',
@@ -77,7 +85,7 @@ return [
     'consumables'			=> 'Consumables',
     'country'  				=> 'Country',
     'could_not_restore'     => 'Error restoring :item_type: :error',
-    'not_deleted'           => 'The :item_type is not deleted so it cannot be restored',
+    'not_deleted'           => 'The :item_type was not deleted and therefore cannot be restored',
     'create'				=> 'Create New',
     'created'               => 'Item Created',
     'created_asset'			=> 'created asset',
@@ -86,11 +94,13 @@ return [
     'record_created' 		=> 'Record Created',
     'updated_at' 			=> 'Updated at',
     'currency'  			=> '$', // this is deprecated
+    'currency_text'  		=> 'Currency', //
     'current'  				=> 'Current',
     'current_password'      => 'Current Password',
     'customize_report'      => 'Customize Report',
     'custom_report'         => 'Custom Asset Report',
     'dashboard'				=> 'Dashboard',
+    'data_source'           => 'Data Source',
     'days'      			=> 'days',
     'days_to_next_audit'    => 'Days to Next Audit',
     'date'					=> 'Date',
@@ -98,7 +108,7 @@ return [
     'debug_warning_text'    => 'This application is running in production mode with debugging enabled. This can expose sensitive data if your application is accessible to the outside world. Disable debug mode by setting the <code>APP_DEBUG</code> value in your <code>.env</code> file to <code>false</code>.',
     'delete'  				=> 'Delete',
     'delete_confirm'  		=> 'Are you sure you wish to delete :item?',
-    'delete_confirm_no_undo' => 'Are you sure you wish to delete :item? This can not be undone.',
+    'delete_confirm_no_undo' => 'Are you sure, you wish to delete :item? This cannot be undone.',
     'deleted'  				=> 'Deleted',
     'delete_seats'  		=> 'Deleted Seats',
     'deletion_failed'       => 'Deletion failed',
@@ -114,29 +124,13 @@ return [
     'editprofile'  			=> 'Edit Your Profile',
     'eol'					=> 'EOL',
     'email_domain'			=> 'Email Domain',
-    'email_format'			=> 'Email Format',
     'employee_number'       => 'Employee Number',
     'email_domain_help'		=> 'This is used to generate email addresses when importing',
     'error'				    => 'Error',
     'exclude_archived'      => 'Exclude Archived Assets',
     'exclude_deleted'       => 'Exclude Deleted Assets',
     'example'				=> 'Example: ',
-    'filastname_format'			=> 'First Initial Last Name (jsmith@example.com)',
-    'firstname_lastname_format'	=> 'First Name Last Name (jane.smith@example.com)',
-    'firstname_lastname_underscore_format' => 'First Name Last Name (jane_smith@example.com)',
-    'lastnamefirstinitial_format' =>  'Last Name First Initial (smithj@example.com)',
-    'firstintial_dot_lastname_format' => 'First Initial Last Name (j.smith@example.com)',
-    'firstname_lastname_display'	=> 'First Name Last Name (Jane Smith)',
-    'lastname_firstname_display'	=> 'Last Name First Name (Smith Jane)',
-    'name_display_format'	=> 'Name Display Format',
-    'first'					=> 'First',
-    'firstnamelastname'     => 'First Name Last Name (janesmith@example.com)',
-    'lastname_firstinitial' => 'Last Name First Initial (smith_j@example.com)',
-    'firstinitial.lastname' => 'First Initial Last Name (j.smith@example.com)',
-    'firstnamelastinitial'  => 'First Name Last Initial (janes@example.com)',
-    'lastnamefirstname'      => 'Last Name First Name (smith.jane@example.com)',
-    'first_name'			=> 'First Name',
-    'first_name_format'		=> 'First Name (jane@example.com)',
+
     'files'                 => 'Files',
     'file_name'				=> 'File',
     'file_type'             => 'File Type',
@@ -156,9 +150,9 @@ return [
     'image_delete'         	=> 'Delete Image',
     'include_deleted'       => 'Include Deleted Assets',
     'image_upload'         	=> 'Upload Image',
-    'filetypes_accepted_help'    => 'Accepted filetype is :types. Max upload size allowed is :size.|Accepted filetypes are :types. Max upload size allowed is :size.',
-    'filetypes_size_help'   => 'Max upload size allowed is :size.',
-    'image_filetypes_help'  => 'Accepted filetypes are jpg, webp, png, gif, svg, and avif. Max upload size allowed is :size.',
+    'filetypes_accepted_help'    => 'Accepted filetype is :types. The maximum size allowed is :size.|Accepted filetypes are :types. The maximum upload size allowed is :size.',
+    'filetypes_size_help'   => 'The maximum upload size allowed is :size.',
+    'image_filetypes_help'  => 'Accepted Filetypes are jpg, webp, png, gif, svg, and avif. The maximum upload size allowed is :size.',
     'unaccepted_image_type'  => 'This image file was not readable. Accepted filetypes are jpg, webp, png, gif, and svg. The mimetype of this file is: :mimetype.',
     'import'         	    => 'Import',
     'import_this_file'      => 'Map fields and process this file',
@@ -178,12 +172,17 @@ return [
     'last'					=> 'Last',
     'last_login'            => 'Last Login',
     'last_name'             => 'Last Name',
+    'firstname_lastname_display'	=> 'First Name Last Name (Jane Smith)',
+    'lastname_firstname_display'	=> 'Last Name First Name (Smith Jane)',
+    'name_display_format'	=> 'Name Display Format',
+    'first'					=> 'First',
+    'first_name'			=> 'First Name',
     'license'				=> 'License',
     'license_report'        => 'License Report',
     'licenses_available'	=> 'Licenses available',
     'licenses'				=> 'Licenses',
     'list_all'				=> 'List All',
-    'loading'				=> 'Loading... please wait....',
+    'loading'				=> 'Loading... please wait...',
     'lock_passwords'        => 'This field value will not be saved in a demo installation.',
     'feature_disabled'      => 'This feature has been disabled for the demo installation.',
     'location'              => 'Location',
@@ -193,7 +192,7 @@ return [
     'logout'				=> 'Logout',
     'lookup_by_tag'     => 'Lookup by Asset Tag',
     'maintenances'          => 'Maintenances',
-    'manage_api_keys'       => 'Manage API Keys',
+    'manage_api_keys'       => 'Manage API keys',
     'manufacturer'			=> 'Manufacturer',
     'manufacturers'			=> 'Manufacturers',
     'markdown'				=> 'This field allows <a href="https://help.github.com/articles/github-flavored-markdown/">Github flavored markdown</a>.',
@@ -215,6 +214,14 @@ return [
     'no_results'			=> 'No Results.',
     'no'  					=> 'No',
     'notes'  				=> 'Notes',
+    'note_added'            => 'Note Added',
+    'options'				=> 'Options',
+    'preview'				=> 'Preview',
+    'add_note'              => 'Add Note',
+    'note_edited'            => 'Note Edited',
+    'edit_note'              => 'Edit Note',
+    'note_deleted'            => 'Note Deleted',
+    'delete_note'              => 'Delete Note',
     'order_number'          => 'Order Number',
     'only_deleted'          => 'Only Deleted Assets',
     'page_menu'				=> 'Showing _MENU_ items',
@@ -229,7 +236,7 @@ return [
     'purchase_date'         => 'Purchase Date',
     'qty'		            => 'QTY',
     'quantity'		        => 'Quantity',
-    'quantity_minimum'      => 'You have :count items below or almost below minimum quantity levels',
+    'quantity_minimum'      => 'You have one item below or almost below minimum quantity levels|You have :count items below or almost below minimum quantity levels',
     'quickscan_checkin'  	=> 'Quick Scan Checkin',
     'quickscan_checkin_status'  	=> 'Checkin Status',
     'ready_to_deploy'		=> 'Ready to Deploy',
@@ -254,7 +261,7 @@ return [
     'select_all'            => 'Select All',
     'search'				=> 'Search',
     'select_category'       => 'Select a Category',
-    'select_datasource' => 'Select a Datasource',
+    'select_datasource' => 'Select a data source',
     'select_department'     => 'Select a Department',
     'select_depreciation'	=> 'Select a Depreciation Type',
     'select_location'		=> 'Select a Location',
@@ -274,13 +281,17 @@ return [
     'signed_off_by'         => 'Signed Off By',
     'skin'       			=> 'Skin',
     'webhook_msg_note'        => 'A notification will be sent via webhook',
-    'webhook_test_msg'        => 'Oh hai! Looks like your :app integration with Snipe-IT is working!',
+    'webhook_test_msg'        => 'Oh hai! It looks like your :app integration with Snipe-IT is working!',
     'some_features_disabled' => 'DEMO MODE: Some features are disabled for this installation.',
     'site_name'				=> 'Site Name',
     'state'  				=> 'State',
     'status_labels'			=> 'Status Labels',
+    'status_label'			=> 'Status Label',
     'status'    			=> 'Status',
     'accept_eula'           => 'Acceptance Agreement',
+    'eula'                  => 'EULAs',
+    'eula_long'             => 'End-User License Agreements',
+    'show_or_hide_eulas' => 'Show/Hide EULAs',
     'supplier'              => 'Supplier',
     'suppliers'  			=> 'Suppliers',
     'sure_to_delete'        => 'Are you sure you wish to delete',
@@ -296,9 +307,10 @@ return [
     'type'  				=> 'Type',
     'undeployable'			=> 'Un-deployable',
     'unknown_admin'			=> 'Unknown Admin',
-    'username_format'		=> 'Username Format',
+    'unknown_user'          => 'Unknown User',
     'username'              => 'Username',
     'update'                => 'Update',
+    'updating_item' => 'Updating :item',
     'upload_filetypes_help'      => 'Allowed filetypes are png, gif, jpg, jpeg, doc, docx, pdf, xls, xlsx, txt, lic, xml, zip, rtf and rar. Max upload size allowed is :size.',
     'uploaded'              => 'Uploaded',
     'user'					=> 'User',
@@ -323,10 +335,10 @@ return [
     'token_expired'         => 'Your form session has expired. Please try again.',
     'login_enabled'         => 'Login Enabled',
     'audit_due'             => 'Due for Audit',
-    'audit_due_days'        => 'Assets Due for Audit Within :days Day|Assets Due for Audit Within :days Days',
+    'audit_due_days'        => '{}Assets Due or Overdue for Audit|[1]Assets Due or Overdue for Audit Within a Day|[2,*]Assets Due or Overdue for Audit Within :days Days',
     'checkin_due'           => 'Due for Checkin',
     'checkin_overdue'       => 'Overdue for Checkin',
-    'checkin_due_days'      => 'Assets Due for Checkin Within :days Day|Assets Due for Checkin Within :days Days',
+    'checkin_due_days'      => '{}Due for Checkin|[1]Assets Due for Checkin Within :days Day|[2,*]Assets Due for Checkin Within :days Days',
     'audit_overdue'         => 'Overdue for Audit',
     'accept'                => 'Accept :asset',
     'i_accept'              => 'I accept',
@@ -339,16 +351,16 @@ return [
     'view_all'              => 'view all',
     'hide_deleted'          => 'Hide Deleted',
     'email'                 => 'Email',
-    'do_not_change'         => 'Do Not Change',
-    'bug_report'            => 'Report a Bug',
+    'do_not_change'         => 'Do not change',
+    'bug_report'            => 'Report a bug',
     'user_manual'           => 'User\'s Manual',
     'setup_step_1'          => 'Step 1',
     'setup_step_2'          => 'Step 2',
     'setup_step_3'          => 'Step 3',
     'setup_step_4'          => 'Step 4',
     'setup_config_check'    => 'Configuration Check',
-    'setup_create_database' => 'Create Database Tables',
-    'setup_create_admin'    => 'Create Admin User',
+    'setup_create_database' => 'Create database tables',
+    'setup_create_admin'    => 'Create an admin user',
     'setup_done'            => 'Finished!',
     'bulk_edit_about_to'    => 'You are about to edit the following: ',
     'checked_out'           => 'Checked Out',
@@ -383,6 +395,8 @@ return [
     'new_license'           => 'New License',
     'new_accessory'         => 'New Accessory',
     'new_consumable'        => 'New Consumable',
+    'new_component'         => 'New Component',
+    'new_user'              => 'New User',
     'collapse'              => 'Collapse',
     'assigned'              => 'Assigned',
     'asset_count'           => 'Asset Count',
@@ -418,19 +432,20 @@ return [
     'bulk_soft_delete'      =>'Also soft-delete these users. Their asset history will remain intact unless/until you purge deleted records in the Admin Settings.',
     'bulk_checkin_delete_success' => 'Your selected users have been deleted and their items have been checked in.',
     'bulk_checkin_success' => 'The items for the selected users have been checked in.',
-    'set_to_null'           => 'Delete values for this asset|Delete values for all :asset_count assets ',
+    'set_to_null'           => 'Delete values for this selection|Delete values for all :selection_count selections ',
     'set_users_field_to_null'  => 'Delete :field values for this user|Delete :field values for all :user_count users ',
     'na_no_purchase_date'   => 'N/A - No purchase date provided',
     'assets_by_status'      => 'Assets by Status',
     'assets_by_status_type'      => 'Assets by Status Type',
     'pie_chart_type'        => 'Dashboard Pie Chart Type',
     'hello_name'            => 'Hello, :name!',
-    'unaccepted_profile_warning'   => 'You have :count items requiring acceptance. Click here to accept or decline them',
+    'unaccepted_profile_warning'   => 'You have one item requiring acceptance. Click here to accept or decline it | You have :count items requiring acceptance. Click here to accept or decline them',
     'start_date'            => 'Start Date',
     'end_date'            => 'End Date',
     'alt_uploaded_image_thumbnail' => 'Uploaded thumbnail',
     'placeholder_kit'       => 'Select a kit',
     'file_not_found'        => 'File not found',
+    'log_record_not_found'  => 'No record for that log entry was found.',
     'preview_not_available' => '(no preview)',
     'setup'                 => 'Setup',
     'pre_flight'            => 'Pre-Flight',
@@ -512,7 +527,7 @@ return [
     'checked_out_to_fields' => 'Checked Out To Fields',
     'percent_complete' => '% complete',
     'uploading' => 'Uploading... ',
-    'upload_error' => 'Error uploading file. Please check that there are no empty rows and that no column names are duplicated.',
+    'upload_error' => 'Error uploading file. Please check that you have no empty rows or duplicated column names in your CSV, and that the server permissions allow uploads.',
     'copy_to_clipboard' => 'Copy to Clipboard',
     'copied' => 'Copied!',
     'status_compatibility' => 'If assets are already assigned, they cannot be changed to a non-deployable status type and this value change will be skipped.',
@@ -524,6 +539,9 @@ return [
     'action_source' => 'Action Source',
     'or' => 'or',
     'url'                   => 'URL',
+    'phone'                   => 'Phone',
+    'fax'                   => 'Fax',
+    'contact'                   => 'Contact',
     'edit_fieldset' => 'Edit fieldset fields and options',
     'permission_denied_superuser_demo' => 'Permission denied. You cannot update user information for superadmins on the demo.',
     'pwd_reset_not_sent' => 'User is not activated, is LDAP synced, or does not have an email address',
@@ -549,6 +567,74 @@ return [
         'license_seats'  => ':count License Seat|:count License Seats',
         'consumables'  => ':count Consumable|:count Consumables',
         'components'  => ':count Component|:count Components',
-    ]
+    ],
+
+    'more_info' => 'More Info',
+    'quickscan_bulk_help' => 'Checking this box will edit the asset record to reflect this new location. Leaving it unchecked will simply note the location in the audit log. Note that if this asset is checked out, it will not change the location of the person, asset or location it is checked out to.',
+    'whoops' => 'Whoops!',
+    'something_went_wrong' => 'Something went wrong with your request.',
+    'close' => 'Close',
+    'expires' => 'Expires',
+    'map_fields'=> 'Map :item_type Fields',
+    'remaining_var' => ':count Remaining',
+    'label' => 'Label',
+    'import_asset_tag_exists' => 'An asset with the asset tag :asset_tag already exists and an update was not requested. No change was made.',
+    'countries_manually_entered_help' => 'Values with an asterisk (*) were manually entered and do not match existing ISO 3166 dropdown values',
+    'accessories_assigned' => 'Assigned Accessories',
+    'user_managed_passwords' => 'Password Management',
+    'user_managed_passwords_disallow' => 'Disallow users from managing their own passwords',
+    'user_managed_passwords_allow' => 'Allow users to manage their own passwords',
+    'from' => 'From',
+    'by' => 'By',
+    'version' => 'Version',
+    'build' => 'build',
+    'footer_credit' => '<a target="_blank" href="https://snipeitapp.com" rel="noopener">Snipe-IT</a> is open source software, made with <i class="fa fa-heart" aria-hidden="true" style="color: #a94442; font-size: 10px" /></i><span class="sr-only">love</span> by <a href="https://bsky.app/profile/snipeitapp.com" rel="noopener">@snipeitapp.com</a>.',
+
+// Add form placeholders here
+    'placeholders' => [
+        'notes'  => 'Add a note',
+    ],
+
+    'breadcrumb_button_actions' => [
+        'edit_item' => 'Edit :name',
+        'checkout_item' => 'Checkout :name',
+        'checkin_item' => 'Checkin :name',
+    ],
+
+    'skins' => [
+        'site_default' => 'Site Default',
+        'default_blue' => 'Default Blue',
+        'blue_dark' => 'Blue (Dark Mode)',
+        'green' => 'Green Dark',
+        'green_dark' => 'Green (Dark Mode)',
+        'red' => 'Red Dark',
+        'red_dark' => 'Red (Dark Mode)',
+        'orange' => 'Orange Dark',
+        'orange_dark' => 'Orange (Dark Mode)',
+        'black' => 'Black',
+        'black_dark' => 'Black (Dark Mode)',
+        'purple' => 'Purple',
+        'purple_dark' => 'Purple (Dark Mode)',
+        'yellow' => 'Yellow',
+        'yellow_dark' => 'Yellow (Dark Mode)',
+        'high_contrast' => 'High Contrast',
+
+    ],
+
+    'select_all_none' => 'Select/Unselect All',
+    'generic_model_not_found' => 'That :model was not found or you do not have permission to access it',
+    'deleted_models' => 'Deleted Asset Models',
+    'deleted_users' => 'Deleted Users',
+    'cost_each' => ':amount each',
+    'remove_current_image' => 'Remove current :type image',
+
+    'seeding' => [
+        'manufacturers' => [
+            'button' => 'Create Manufacturers',
+            'prompt' => 'You do not have any manufacturers yet. Would you like to seed a list of common manufacturers? (THIS WILL OVERWRITE EXISTING MANUFACTURERS, including those that have been soft-deleted.)',
+            'success' => 'Manufacturers seeded successfully',
+            'error' => 'Could not seed manufacturers. A manufacturer record already exists and seeding would overwrite it.|Could not seed manufacturers. :count manufacturer records already exist and seeding would overwrite them.',
+        ],
+    ],
 
 ];
diff --git a/resources/lang/en-US/localizations.php b/resources/lang/en-US/localizations.php
index f1232dd138..827ed4fca1 100644
--- a/resources/lang/en-US/localizations.php
+++ b/resources/lang/en-US/localizations.php
@@ -2,7 +2,7 @@
 
 return [
 
-    'select_language' => 'Select a language',
+    'select_language' => 'Select a Language',
     'languages' => [
         'en-US'=> 'English, US',
         'en-GB'=> 'English, UK',
@@ -40,7 +40,9 @@ return [
         'ms-MY'=> 'Malay',
         'mi-NZ'=> 'Maori',
         'mn-MN'=> 'Mongolian',
-        'no-NO'=> 'Norwegian',
+        'nb-NO'=> 'Norwegian Bokmål',
+        'om-ET' => 'Oromo (Ethiopian)',
+        //'nn-NO'=> 'Norwegian Nynorsk',
         'fa-IR'=> 'Persian',
         'pl-PL'=> 'Polish',
         'pt-PT'=> 'Portuguese',
@@ -66,7 +68,7 @@ return [
         'zu-ZA'=> 'Zulu',
     ],
 
-    'select_country' => 'Select a country',
+    'select_country' => 'Select a Country',
     
     'countries' => [
         'AC'=>'Ascension Island',
@@ -133,6 +135,7 @@ return [
         'EC'=>'Ecuador',
         'EE'=>'Estonia',
         'EG'=>'Egypt',
+        'GB-ENG'=>'England',
         'ER'=>'Eritrea',
         'ES'=>'Spain',
         'ET'=>'Ethiopia',
@@ -231,6 +234,7 @@ return [
         'NG'=>'Nigeria',
         'NI'=>'Nicaragua',
         'NL'=>'Netherlands',
+        'GB-NIR' => 'Northern Ireland',
         'NO'=>'Norway',
         'NP'=>'Nepal',
         'NR'=>'Nauru',
@@ -258,7 +262,7 @@ return [
         'RU'=>'Russian Federation',
         'RW'=>'Rwanda',
         'SA'=>'Saudi Arabia',
-        'UK'=>'Scotland',
+        'GB-SCT'=>'Scotland',
         'SB'=>'Solomon Islands',
         'SC'=>'Seychelles',
         'SS'=>'South Sudan',
@@ -310,6 +314,7 @@ return [
         'VI'=>'Virgin Islands (U.S.)',
         'VN'=>'Viet Nam',
         'VU'=>'Vanuatu',
+        'GB-WLS' =>'Wales',
         'WF'=>'Wallis And Futuna Islands',
         'WS'=>'Samoa',
         'YE'=>'Yemen',
diff --git a/resources/lang/en-US/mail.php b/resources/lang/en-US/mail.php
index 759ff0f5e8..797f735a2b 100644
--- a/resources/lang/en-US/mail.php
+++ b/resources/lang/en-US/mail.php
@@ -23,24 +23,25 @@ return [
     'Item_Requested' => 'Item Requested',
     'License_Checkin_Notification' => 'License checked in',
     'License_Checkout_Notification' => 'License checked out',
+    'license_for'   => 'License for',
     'Low_Inventory_Report' => 'Low Inventory Report',
     'a_user_canceled' => 'A user has canceled an item request on the website',
     'a_user_requested' => 'A user has requested an item on the website',
     'acceptance_asset_accepted' => 'A user has accepted an item',
     'acceptance_asset_declined' => 'A user has declined an item',
-    'accessory_name' => 'Accessory Name:',
-    'additional_notes' => 'Additional Notes:',
+    'accessory_name' => 'Accessory Name',
+    'additional_notes' => 'Additional Notes',
     'admin_has_created' => 'An administrator has created an account for you on the :web website.',
-    'asset' => 'Asset:',
-    'asset_name' => 'Asset Name:',
+    'asset' => 'Asset',
+    'asset_name' => 'Asset Name',
     'asset_requested' => 'Asset requested',
     'asset_tag' => 'Asset Tag',
     'assets_warrantee_alert' => 'There is :count asset with a warranty expiring in the next :threshold days.|There are :count assets with warranties expiring in the next :threshold days.',
     'assigned_to' => 'Assigned To',
     'best_regards' => 'Best regards,',
-    'canceled' => 'Canceled:',
-    'checkin_date' => 'Checkin Date:',
-    'checkout_date' => 'Checkout Date:',
+    'canceled' => 'Canceled',
+    'checkin_date' => 'Checkin Date',
+    'checkout_date' => 'Checkout Date',
     'checkedout_from' => 'Checked out from',
     'checkedin_from'  => 'Checked in from',
     'checked_into' => 'Checked into',
@@ -49,27 +50,30 @@ return [
     'click_to_confirm' => 'Please click on the following link to confirm your :web account:',
     'current_QTY' => 'Current QTY',
     'days' => 'Days',
-    'expecting_checkin_date' => 'Expected Checkin Date:',
+    'expecting_checkin_date' => 'Expected Checkin Date',
     'expires' => 'Expires',
     'hello' => 'Hello',
     'hi' => 'Hi',
     'i_have_read' => 'I have read and agree to the terms of use, and have received this item.',
     'inventory_report' => 'Inventory Report',
-    'item' => 'Item:',
+    'item' => 'Item',
+    'item_checked_reminder' => 'This is a reminder that you currently have :count items checked out to you that you have not accepted or declined. Please click the link below to confirm your decision.',
     'license_expiring_alert' => 'There is :count license expiring in the next :threshold days.|There are :count licenses expiring in the next :threshold days.',
     'link_to_update_password' => 'Please click on the following link to update your :web password:',
-    'login' => 'Login:',
+    'login' => 'Login',
     'login_first_admin' => 'Login to your new Snipe-IT installation using the credentials below:',
     'low_inventory_alert' => 'There is :count item that is below minimum inventory or will soon be low.|There are :count items that are below minimum inventory or will soon be low.',
     'min_QTY' => 'Min QTY',
     'name' => 'Name',
     'new_item_checked' => 'A new item has been checked out under your name, details are below.',
+    'new_item_checked_with_acceptance' => 'A new item has been checked out under your name that requires acceptance, details are below.',
+    'recent_item_checked' => 'An item was recently checked out under your name that requires acceptance, details are below.',
     'notes' => 'Notes',
-    'password' => 'Password:',
+    'password' => 'Password',
     'password_reset' => 'Password Reset',
     'read_the_terms' => 'Please read the terms of use below.',
     'read_the_terms_and_click' => 'Please read the terms of use below, and click on the link at the bottom to confirm that you read and agree to the terms of use, and have received the asset.',
-    'requested' => 'Requested:',
+    'requested' => 'Requested',
     'reset_link' => 'Your Password Reset Link',
     'reset_password' => 'Click here to reset your password:',
     'rights_reserved' => 'All rights reserved.',
@@ -86,8 +90,10 @@ return [
     'upcoming-audits' => 'There is :count asset that is coming up for audit within :threshold days.|There are :count assets that are coming up for audit within :threshold days.',
     'user' => 'User',
     'username' => 'Username',
+    'unaccepted_asset_reminder' => 'Reminder: You have Unaccepted Assets.',
     'welcome' => 'Welcome :name',
     'welcome_to' => 'Welcome to :web!',
     'your_assets' => 'View Your Assets',
     'your_credentials' => 'Your Snipe-IT credentials',
+    'mail_sent' => 'Mail sent successfully!',
 ];
diff --git a/resources/lang/en-US/validation.php b/resources/lang/en-US/validation.php
index 05374e23af..f80dd70163 100644
--- a/resources/lang/en-US/validation.php
+++ b/resources/lang/en-US/validation.php
@@ -13,87 +13,151 @@ return [
     |
     */
 
-    'accepted'             => 'The :attribute must be accepted.',
-    'active_url'           => 'The :attribute is not a valid URL.',
-    'after'                => 'The :attribute must be a date after :date.',
-    'after_or_equal'       => 'The :attribute must be a date after or equal to :date.',
-    'alpha'                => 'The :attribute may only contain letters.',
-    'alpha_dash'           => 'The :attribute may only contain letters, numbers, and dashes.',
-    'alpha_num'            => 'The :attribute may only contain letters and numbers.',
-    'array'                => 'The :attribute must be an array.',
-    'before'               => 'The :attribute must be a date before :date.',
-    'before_or_equal'      => 'The :attribute must be a date before or equal to :date.',
-    'between'              => [
-        'numeric' => 'The :attribute must be between :min - :max.',
-        'file'    => 'The :attribute must be between :min - :max kilobytes.',
-        'string'  => 'The :attribute must be between :min - :max characters.',
-        'array'   => 'The :attribute must have between :min and :max items.',
+    'accepted' => 'The :attribute field must be accepted.',
+    'accepted_if' => 'The :attribute field must be accepted when :other is :value.',
+    'active_url' => 'The :attribute field must be a valid URL.',
+    'after' => 'The :attribute field must be a date after :date.',
+    'after_or_equal' => 'The :attribute field must be a date after or equal to :date.',
+    'alpha' => 'The :attribute field must only contain letters.',
+    'alpha_dash' => 'The :attribute field must only contain letters, numbers, dashes, and underscores.',
+    'alpha_num' => 'The :attribute field must only contain letters and numbers.',
+    'array' => 'The :attribute field must be an array.',
+    'ascii' => 'The :attribute field must only contain single-byte alphanumeric characters and symbols.',
+    'before' => 'The :attribute field must be a date before :date.',
+    'before_or_equal' => 'The :attribute field must be a date before or equal to :date.',
+    'between' => [
+        'array' => 'The :attribute field must have between :min and :max items.',
+        'file' => 'The :attribute field must be between :min and :max kilobytes.',
+        'numeric' => 'The :attribute field must be between :min and :max.',
+        'string' => 'The :attribute field must be between :min and :max characters.',
     ],
-    'boolean'              => 'The :attribute must be true or false.',
-    'confirmed'            => 'The :attribute confirmation does not match.',
-    'date'                 => 'The :attribute is not a valid date.',
-    'date_format'          => 'The :attribute does not match the format :format.',
-    'different'            => 'The :attribute and :other must be different.',
-    'digits'               => 'The :attribute must be :digits digits.',
-    'digits_between'       => 'The :attribute must be between :min and :max digits.',
-    'dimensions'           => 'The :attribute has invalid image dimensions.',
-    'distinct'             => 'The :attribute field has a duplicate value.',
-    'email'                => 'The :attribute format is invalid.',
-    'exists'               => 'The selected :attribute is invalid.',
-    'file'                 => 'The :attribute must be a file.',
-    'filled'               => 'The :attribute field must have a value.',
-    'image'                => 'The :attribute must be an image.',
+    'valid_regex' => 'The regular expression is invalid.',
+    'boolean' => 'The :attribute field must be true or false.',
+    'can' => 'The :attribute field contains an unauthorized value.',
+    'confirmed' => 'The :attribute field confirmation does not match.',
+    'contains' => 'The :attribute field is missing a required value.',
+    'current_password' => 'The password is incorrect.',
+    'date' => 'The :attribute field must be a valid date.',
+    'date_equals' => 'The :attribute field must be a date equal to :date.',
+    'date_format' => 'The :attribute field must match the format :format.',
+    'decimal' => 'The :attribute field must have :decimal decimal places.',
+    'declined' => 'The :attribute field must be declined.',
+    'declined_if' => 'The :attribute field must be declined when :other is :value.',
+    'different' => 'The :attribute field and :other must be different.',
+    'digits' => 'The :attribute field must be :digits digits.',
+    'digits_between' => 'The :attribute field must be between :min and :max digits.',
+    'dimensions' => 'The :attribute field has invalid image dimensions.',
+    'distinct' => 'The :attribute field has a duplicate value.',
+    'doesnt_end_with' => 'The :attribute field must not end with one of the following: :values.',
+    'doesnt_start_with' => 'The :attribute field must not start with one of the following: :values.',
+    'email' => 'The :attribute field must be a valid email address.',
+    'ends_with' => 'The :attribute field must end with one of the following: :values.',
+    'enum' => 'The selected :attribute is invalid.',
+    'exists' => 'The selected :attribute is invalid.',
+    'extensions' => 'The :attribute field must have one of the following extensions: :values.',
+    'file' => 'The :attribute field must be a file.',
+    'filled' => 'The :attribute field must have a value.',
+    'gt' => [
+        'array' => 'The :attribute field must have more than :value items.',
+        'file' => 'The :attribute field must be greater than :value kilobytes.',
+        'numeric' => 'The :attribute field must be greater than :value.',
+        'string' => 'The :attribute field must be greater than :value characters.',
+    ],
+    'gte' => [
+        'array' => 'The :attribute field must have :value items or more.',
+        'file' => 'The :attribute field must be greater than or equal to :value kilobytes.',
+        'numeric' => 'The :attribute field must be greater than or equal to :value.',
+        'string' => 'The :attribute field must be greater than or equal to :value characters.',
+    ],
+    'hex_color' => 'The :attribute field must be a valid hexadecimal color.',
+    'image' => 'The :attribute field must be an image.',
     'import_field_empty'    => 'The value for :fieldname cannot be null.',
-    'in'                   => 'The selected :attribute is invalid.',
-    'in_array'             => 'The :attribute field does not exist in :other.',
-    'integer'              => 'The :attribute must be an integer.',
-    'ip'                   => 'The :attribute must be a valid IP address.',
-    'ipv4'                 => 'The :attribute must be a valid IPv4 address.',
-    'ipv6'                 => 'The :attribute must be a valid IPv6 address.',
-    'is_unique_department' => 'The :attribute must be unique to this Company Location',
-    'json'                 => 'The :attribute must be a valid JSON string.',
-    'max'                  => [
-        'numeric' => 'The :attribute may not be greater than :max.',
-        'file'    => 'The :attribute may not be greater than :max kilobytes.',
-        'string'  => 'The :attribute may not be greater than :max characters.',
-        'array'   => 'The :attribute may not have more than :max items.',
+    'in' => 'The selected :attribute is invalid.',
+    'in_array' => 'The :attribute field must exist in :other.',
+    'integer' => 'The :attribute field must be an integer.',
+    'ip' => 'The :attribute field must be a valid IP address.',
+    'ipv4' => 'The :attribute field must be a valid IPv4 address.',
+    'ipv6' => 'The :attribute field must be a valid IPv6 address.',
+    'json' => 'The :attribute field must be a valid JSON string.',
+    'list' => 'The :attribute field must be a list.',
+    'lowercase' => 'The :attribute field must be lowercase.',
+    'lt' => [
+        'array' => 'The :attribute field must have less than :value items.',
+        'file' => 'The :attribute field must be less than :value kilobytes.',
+        'numeric' => 'The :attribute field must be less than :value.',
+        'string' => 'The :attribute field must be less than :value characters.',
     ],
-    'mimes'                => 'The :attribute must be a file of type: :values.',
-    'mimetypes'            => 'The :attribute must be a file of type: :values.',
-    'min'                  => [
-        'numeric' => 'The :attribute must be at least :min.',
-        'file'    => 'The :attribute must be at least :min kilobytes.',
-        'string'  => 'The :attribute must be at least :min characters.',
-        'array'   => 'The :attribute must have at least :min items.',
+    'lte' => [
+        'array' => 'The :attribute field must not have more than :value items.',
+        'file' => 'The :attribute field must be less than or equal to :value kilobytes.',
+        'numeric' => 'The :attribute field must be less than or equal to :value.',
+        'string' => 'The :attribute field must be less than or equal to :value characters.',
     ],
-    'starts_with'          => 'The :attribute must start with one of the following: :values.',
-    'ends_with'            => 'The :attribute must end with one of the following: :values.',
+    'mac_address' => 'The :attribute field must be a valid MAC address.',
+    'max' => [
+        'array' => 'The :attribute field must not have more than :max items.',
+        'file' => 'The :attribute field must not be greater than :max kilobytes.',
+        'numeric' => 'The :attribute field must not be greater than :max.',
+        'string' => 'The :attribute field must not be greater than :max characters.',
+    ],
+    'max_digits' => 'The :attribute field must not have more than :max digits.',
+    'mimes' => 'The :attribute field must be a file of type: :values.',
+    'mimetypes' => 'The :attribute field must be a file of type: :values.',
+    'min' => [
+        'array' => 'The :attribute field must have at least :min items.',
+        'file' => 'The :attribute field must be at least :min kilobytes.',
+        'numeric' => 'The :attribute field must be at least :min.',
+        'string' => 'The :attribute field must be at least :min characters.',
+    ],
+    'min_digits' => 'The :attribute field must have at least :min digits.',
+    'missing' => 'The :attribute field must be missing.',
+    'missing_if' => 'The :attribute field must be missing when :other is :value.',
+    'missing_unless' => 'The :attribute field must be missing unless :other is :value.',
+    'missing_with' => 'The :attribute field must be missing when :values is present.',
+    'missing_with_all' => 'The :attribute field must be missing when :values are present.',
+    'multiple_of' => 'The :attribute field must be a multiple of :value.',
+    'not_in' => 'The selected :attribute is invalid.',
+    'not_regex' => 'The :attribute field format is invalid.',
+    'numeric' => 'The :attribute field must be a number.',
+    'password' => [
+        'letters' => 'The :attribute field must contain at least one letter.',
+        'mixed' => 'The :attribute field must contain at least one uppercase and one lowercase letter.',
+        'numbers' => 'The :attribute field must contain at least one number.',
+        'symbols' => 'The :attribute field must contain at least one symbol.',
+        'uncompromised' => 'The given :attribute has appeared in a data leak. Please choose a different :attribute.',
+    ],
+    'percent'       => 'The depreciation minimum must be between 0 and 100 when depreciation type is percentage.',
 
-    'not_in'               => 'The selected :attribute is invalid.',
-    'numeric'              => 'The :attribute must be a number.',
-    'present'              => 'The :attribute field must be present.',
-    'valid_regex'          => 'That is not a valid regex. ',
-    'regex'                => 'The :attribute format is invalid.',
-    'required'             => 'The :attribute field is required.',
-    'required_if'          => 'The :attribute field is required when :other is :value.',
-    'required_unless'      => 'The :attribute field is required unless :other is in :values.',
-    'required_with'        => 'The :attribute field is required when :values is present.',
-    'required_with_all'    => 'The :attribute field is required when :values is present.',
-    'required_without'     => 'The :attribute field is required when :values is not present.',
+    'present' => 'The :attribute field must be present.',
+    'present_if' => 'The :attribute field must be present when :other is :value.',
+    'present_unless' => 'The :attribute field must be present unless :other is :value.',
+    'present_with' => 'The :attribute field must be present when :values is present.',
+    'present_with_all' => 'The :attribute field must be present when :values are present.',
+    'prohibited' => 'The :attribute field is prohibited.',
+    'prohibited_if' => 'The :attribute field is prohibited when :other is :value.',
+    'prohibited_unless' => 'The :attribute field is prohibited unless :other is in :values.',
+    'prohibits' => 'The :attribute field prohibits :other from being present.',
+    'regex' => 'The :attribute field format is invalid.',
+    'required' => 'The :attribute field is required.',
+    'required_array_keys' => 'The :attribute field must contain entries for: :values.',
+    'required_if' => 'The :attribute field is required when :other is :value.',
+    'required_if_accepted' => 'The :attribute field is required when :other is accepted.',
+    'required_if_declined' => 'The :attribute field is required when :other is declined.',
+    'required_unless' => 'The :attribute field is required unless :other is in :values.',
+    'required_with' => 'The :attribute field is required when :values is present.',
+    'required_with_all' => 'The :attribute field is required when :values are present.',
+    'required_without' => 'The :attribute field is required when :values is not present.',
     'required_without_all' => 'The :attribute field is required when none of :values are present.',
-    'same'                 => 'The :attribute and :other must match.',
-    'size'                 => [
-        'numeric' => 'The :attribute must be :size.',
-        'file'    => 'The :attribute must be :size kilobytes.',
-        'string'  => 'The :attribute must be :size characters.',
-        'array'   => 'The :attribute must contain :size items.',
+    'same' => 'The :attribute field must match :other.',
+    'size' => [
+        'array' => 'The :attribute field must contain :size items.',
+        'file' => 'The :attribute field must be :size kilobytes.',
+        'numeric' => 'The :attribute field must be :size.',
+        'string' => 'The :attribute field must be :size characters.',
     ],
+    'starts_with' => 'The :attribute field must start with one of the following: :values.',
     'string'               => 'The :attribute must be a string.',
-    'timezone'             => 'The :attribute must be a valid zone.',
     'two_column_unique_undeleted' => 'The :attribute must be unique across :table1 and :table2. ',
-    'unique'               => 'The :attribute has already been taken.',
-    'uploaded'             => 'The :attribute failed to upload.',
-    'url'                  => 'The :attribute format is invalid.',
     'unique_undeleted'     => 'The :attribute must be unique.',
     'non_circular'         => 'The :attribute must not create a circular reference.',
     'not_array'            => ':attribute cannot be an array.',
@@ -102,11 +166,14 @@ return [
     'numbers'              => 'Password must contain at least one number.',
     'case_diff'            => 'Password must use mixed case.',
     'symbols'              => 'Password must contain symbols.',
-    'gte'                  => [
-        'numeric'          => 'Value cannot be negative'
-    ],
-    'checkboxes'           => ':attribute contains invalid options.',
-    'radio_buttons'        => ':attribute is invalid.',
+    'timezone' => 'The :attribute field must be a valid timezone.',
+    'unique' => 'The :attribute has already been taken.',
+    'uploaded' => 'The :attribute failed to upload.',
+    'uppercase' => 'The :attribute field must be uppercase.',
+    'url' => 'The :attribute field must be a valid URL.',
+    'ulid' => 'The :attribute field must be a valid ULID.',
+    'uuid' => 'The :attribute field must be a valid UUID.',
+    'fmcs_location' => 'Full multiple company support and location scoping is enabled in the Admin Settings, and the selected location and selected company are not compatible.',
 
 
     /*
@@ -120,16 +187,22 @@ return [
     |
     */
 
+    'email_array'      => 'One or more email addresses is invalid.',
+    'checkboxes'           => ':attribute contains invalid options.',
+    'radio_buttons'        => ':attribute is invalid.',
+    
     'custom' => [
         'alpha_space' => 'The :attribute field contains a character that is not allowed.',
-        'email_array'      => 'One or more email addresses is invalid.',
+
         'hashed_pass'      => 'Your current password is incorrect',
         'dumbpwd'          => 'That password is too common.',
         'statuslabel_type' => 'You must select a valid status label type',
+        'custom_field_not_found'          => 'This field does not seem to exist, please double check your custom field names.',
+        'custom_field_not_found_on_model' => 'This field seems to exist, but is not available on this Asset Model\'s fieldset.',
 
         // date_format validation with slightly less stupid messages. It duplicates a lot, but it gets the job done :(
-        // We use this because the default error message for date_format is reflects php Y-m-d, which non-PHP
-        // people won't know how to format. 
+        // We use this because the default error message for date_format reflects php Y-m-d, which non-PHP
+        // people won't know how to format.
         'purchase_date.date_format'     => 'The :attribute must be a valid date in YYYY-MM-DD format',
         'last_audit_date.date_format'   =>  'The :attribute must be a valid date in YYYY-MM-DD hh:mm:ss format',
         'expiration_date.date_format'   =>  'The :attribute must be a valid date in YYYY-MM-DD format',
@@ -137,9 +210,15 @@ return [
         'expected_checkin.date_format'  =>  'The :attribute must be a valid date in YYYY-MM-DD format',
         'start_date.date_format'        =>  'The :attribute must be a valid date in YYYY-MM-DD format',
         'end_date.date_format'          =>  'The :attribute must be a valid date in YYYY-MM-DD format',
+        'invalid_value_in_field' => 'Invalid value included in this field',
 
-    ],
+        'ldap_username_field' => [
+            'not_in' =>         '<code>sAMAccountName</code> (mixed case) will likely not work. You should use <code>samaccountname</code> (lowercase) instead.'
+        ],
+        'ldap_auth_filter_query' => ['not_in' => '<code>uid=samaccountname</code> is probably not a valid auth filter. You probably want <code>uid=</code> '],
+        'ldap_filter' => ['regex' => 'This value should probably not be wrapped in parentheses.'],
 
+        ],
     /*
     |--------------------------------------------------------------------------
     | Custom Validation Attributes
@@ -155,8 +234,16 @@ return [
 
     /*
     |--------------------------------------------------------------------------
-    | Generic Validation Messages
+    | Generic Validation Messages - we use these in the jquery validation where we don't have
+    | access to the :attribute
     |--------------------------------------------------------------------------
     */
-    'invalid_value_in_field' => 'Invalid value included in this field',
+
+    'generic' => [
+        'invalid_value_in_field' => 'Invalid value included in this field',
+        'required' => 'This field is required',
+        'email' => 'Please enter a valid email address',
+    ],
+
+
 ];
diff --git a/resources/lang/es-CO/account/general.php b/resources/lang/es-CO/account/general.php
index 7e637a3bef..b727b63023 100644
--- a/resources/lang/es-CO/account/general.php
+++ b/resources/lang/es-CO/account/general.php
@@ -2,10 +2,16 @@
 
 return array(
     'personal_api_keys' => 'Claves API personales',
-    'api_key_warning' => 'When generating an API token, be sure to copy it down immediately as they will not be visible to you again.',
-    'api_base_url' => 'La url base de tu API se encuentra en:',
+    'personal_access_token' => 'Credencial de acceso personal',
+    'personal_api_keys_success' => 'Clave API personal :key creada correctamente',
+    'here_is_api_key' => 'Aquí tiene su nueva credencial de acceso personal. Esta es la única vez que se mostrará, así que no la pierda. Ahora puede utilizar esta credencial para realizar solicitudes a la API.',
+    'api_key_warning' => 'Al generar una credencial para la API, asegúrese de copiarla inmediatamente, ya que no podrá volver a verla.',
+    'api_base_url' => 'La url base de su API se encuentra en:',
     'api_base_url_endpoint' => '/&lt;endpoint&gt;',
-    'api_token_expiration_time' => 'Los tokens de la API están establecidos para expirar en:',
-    'api_reference' => 'Please check the <a href="https://snipe-it.readme.io/reference" target="_blank">API reference</a> to find specific API endpoints and additional API documentation.',
-    'profile_updated' => 'Cuenta actualizada exitosamente',
+    'api_token_expiration_time' => 'Las credenciales de la API están establecidas para expirar en:',
+    'api_reference' => 'Consulte <a href="https://snipe-it.readme.io/reference" target="_blank">API reference</a> para encontrar los puntos finales (endpoins) de la API y documentación adicional.',
+    'profile_updated' => 'La cuenta fue actualizada exitosamente',
+    'no_tokens' => 'No ha creado ninguna credencial de acceso personal.',
+    'enable_sounds' => 'Habilitar efectos de sonido',
+    'enable_confetti' => 'Activar los efectos confeti',
 );
diff --git a/resources/lang/es-CO/admin/accessories/general.php b/resources/lang/es-CO/admin/accessories/general.php
index a0d9dba96c..5357639447 100644
--- a/resources/lang/es-CO/admin/accessories/general.php
+++ b/resources/lang/es-CO/admin/accessories/general.php
@@ -3,20 +3,20 @@
 return array(
     'accessory_category' 				=> 'Categoría de accesorio',
     'accessory_name'  					=> 'Nombre de accesorio',
-    'checkout'  							=> 'Retirar Accesorio',
-    'checkin'  							=> 'Registrar Accesorio',
-    'create'  							=> 'Crear Accesorio',
-    'edit'  							=> 'Editar Accesorio',
+    'checkout'  							=> 'Asignar accesorio',
+    'checkin'  							=> 'Ingresar accesorio',
+    'create'  							=> 'Crear accesorio',
+    'edit'  							=> 'Editar accesorio',
     'eula_text'							=> 'Acuerdo de uso de la categoría',
-    'eula_text_help'					=> 'Este campo permite personalizar los acuerdos de uso para tipos específicos de activos. Si solo tiene un acuerdo de uso para todos sus activos, puede seleccionar la siguiente opción para usar el valor por predeterminado.',
-    'require_acceptance'				=> 'Pedir a los usuarios confirmación de aceptación de los elementos en esta categoría.',
+    'eula_text_help'					=> 'Este campo permite personalizar los acuerdos de uso para tipos específicos de activos. Si solo tiene un acuerdo de uso para todos sus activos, puede seleccionar la siguiente opción para usar el valor predeterminado.',
+    'require_acceptance'				=> 'Pedir a los usuarios confirmación de aceptación de los activos en esta categoría.',
     'no_default_eula'					=> 'No se encontró el acuerdo de uso predeterminado. Agregue unos en Configuración.',
     'total'  							=> 'Total ',
     'remaining'  						=> 'Disponibles',
-    'update'  							=> 'Actualizar Accesorio',
-    'use_default_eula'					=> 'En su lugar, el <a href="#" data-toggle="modal" data-target="#eulaModal">acuerdo de uso predeterminado</a>.',
-    'use_default_eula_disabled'			=> '<del>En su lugar, use el acuerdo de uso predeterminado.</del> No está configurado el acuerdo de uso predeterminado. Por favor agregue uno en Configuración.',
+    'update'  							=> 'Actualizar accesorio',
+    'use_default_eula'					=> 'En su lugar, utilice el <a href="#" data-toggle="modal" data-target="#eulaModal">acuerdo de uso predeterminado</a>.',
+    'use_default_eula_disabled'			=> '<del>En su lugar, utilice el acuerdo de uso predeterminado.</del> No está configurado el acuerdo de uso predeterminado. Por favor agregue uno en Configuración.',
     'clone'                             => 'Clonar accesorio',
-    'delete_disabled'                   => 'Este accesorio no se puede eliminar aún porque algunos artículos todavía están retirados.',
+    'delete_disabled'                   => 'Este accesorio no se puede eliminar aún porque algunos elementos todavía están asignados.',
 
 );
diff --git a/resources/lang/es-CO/admin/accessories/message.php b/resources/lang/es-CO/admin/accessories/message.php
index 72c61d52d5..fdd1adb8da 100644
--- a/resources/lang/es-CO/admin/accessories/message.php
+++ b/resources/lang/es-CO/admin/accessories/message.php
@@ -4,35 +4,39 @@ return array(
 
     'does_not_exist' => 'El accesorio [:id] no existe.',
     'not_found' => 'Ese accesorio no fue encontrado.',
-    'assoc_users'	 => 'Este accesorio actualmente tiene :count entregados a usuarios. Por favor ingrese los accesorios y vuelva a intentar. ',
+    'assoc_users'	 => 'Este accesorio actualmente tiene :count elemento(s) asignado(s) a usuarios. Por favor realice el ingreso de los accesorios y vuelva a intentar. ',
 
     'create' => array(
-        'error'   => 'Accesorio no fue creado, por favor vuelva a intentarlo.',
-        'success' => 'Accesorio creado satisfactoriamente.'
+        'error'   => 'El accesorio no fue creado, por favor inténtelo de nuevo.',
+        'success' => 'Accesorio creado correctamente.'
     ),
 
     'update' => array(
-        'error'   => 'Accesorio no fue actualizado, por favor, inténtalo de nuevo',
-        'success' => 'Accesorio creado satisfactoriamente.'
+        'error'   => 'El accesorio no fue actualizado, por favor, inténtelo de nuevo',
+        'success' => 'El accesorio fue actualizado con éxito.'
     ),
 
     'delete' => array(
         'confirm'   => '¿Está seguro de que desea eliminar este accesorio?',
-        'error'   => 'Hubo un problema eliminando el accesorio. Por favor, inténtalo de nuevo.',
+        'error'   => 'Hubo un problema eliminando el accesorio. Por favor, inténtelo de nuevo.',
         'success' => 'El accesorio ha sido borrado con éxito.'
     ),
 
      'checkout' => array(
-        'error'   		=> 'El accesorio no fue retirado, por favor vuelva a intentarlo',
-        'success' 		=> 'Accesorio retirado correctamente.',
-        'unavailable'   => 'El accesorio no está disponible para la compra. Compruebe la cantidad disponible',
-        'user_does_not_exist' => 'Este usuario es inválido. Inténtalo de nuevo.'
+        'error'   		=> 'El accesorio no fue asignado, por favor vuelva a intentarlo',
+        'success' 		=> 'Accesorio asignado correctamente.',
+        'unavailable'   => 'El accesorio no está disponible para ser asignado. Compruebe la cantidad disponible',
+        'user_does_not_exist' => 'Este usuario no es válido. Por favor, inténtelo de nuevo.',
+         'checkout_qty' => array(
+            'lte'  => 'En este momento solo existe un accesorio disponible de este tipo y está tratando de asignar :checkout_qty. Por favor, ajuste la cantidad asignada o el total de existencias de este accesorio e intente nuevamente.|Existen en total :number_currently_remaining accesorios disponibles y está tratando de asignar :checkout_qty. Por favor, ajuste la cantidad asignada o el total de existencias de este accesorio e intente nuevamente.',
+            ),
+           
     ),
 
     'checkin' => array(
-        'error'   		=> 'El accesorio no fue agregado, favor vuelva a intentarlo',
-        'success' 		=> 'Accesorio devuelto correctamente.',
-        'user_does_not_exist' => 'Este usuario es inválido. Inténtalo de nuevo.'
+        'error'   		=> 'El accesorio no fue recibido, por favor vuelva a intentarlo',
+        'success' 		=> 'El accesorio ha sido ingresado correctamente.',
+        'user_does_not_exist' => 'Ese usuario no es válido. Por favor, inténtelo de nuevo.'
     )
 
 
diff --git a/resources/lang/es-CO/admin/accessories/table.php b/resources/lang/es-CO/admin/accessories/table.php
index 689f74d94f..05184e79e3 100644
--- a/resources/lang/es-CO/admin/accessories/table.php
+++ b/resources/lang/es-CO/admin/accessories/table.php
@@ -5,7 +5,5 @@ return array(
 	'eula_text'      			=> 'Acuerdo de uso',
     'id'      					=> 'ID',
     'require_acceptance'      	=> 'Aceptación',
-    'title'      				=> 'Nombre de accesorio',
-
-
+    'title'      				=> 'Nombre del accesorio',
 );
diff --git a/resources/lang/es-CO/admin/asset_maintenances/form.php b/resources/lang/es-CO/admin/asset_maintenances/form.php
index 5c3956090e..dfda6be9c5 100644
--- a/resources/lang/es-CO/admin/asset_maintenances/form.php
+++ b/resources/lang/es-CO/admin/asset_maintenances/form.php
@@ -1,14 +1,14 @@
 <?php
 
     return [
-        'asset_maintenance_type' => 'Tipo de Mantenimiento de Equipo',
+        'asset_maintenance_type' => 'Tipo de mantenimiento del activo',
         'title'                  => 'Título',
         'start_date'             => 'Fecha de inicio',
         'completion_date'        => 'Fecha de finalización',
-        'cost'                   => 'Precio',
-        'is_warranty'            => 'Mejora de la Garantía',
-        'asset_maintenance_time' => 'Tiempo de mantenimiento de activos (en días)',
+        'cost'                   => 'Costo',
+        'is_warranty'            => 'Mejora de la garantía',
+        'asset_maintenance_time' => 'Duración del mantenimiento (en días)',
         'notes'                  => 'Notas',
-        'update'                 => 'Actualizar Mantenimiento de Equipo',
-        'create'                 => 'Crear Mantenimiento de Equipo'
+        'update'                 => 'Actualizar mantenimiento del activo',
+        'create'                 => 'Crear mantenimiento del activo'
     ];
diff --git a/resources/lang/es-CO/admin/asset_maintenances/general.php b/resources/lang/es-CO/admin/asset_maintenances/general.php
index d98b8dedef..77c6a419f0 100644
--- a/resources/lang/es-CO/admin/asset_maintenances/general.php
+++ b/resources/lang/es-CO/admin/asset_maintenances/general.php
@@ -2,12 +2,12 @@
 
     return [
         'asset_maintenances' => 'Mantenimiento de activos',
-        'edit'               => 'Editar Mantenimiento de Activos',
-        'delete'             => 'Eliminar Mantenimiento de Activos',
-        'view'               => 'Ver Detalles de Mantenimiento de Activos',
-        'repair'             => 'Reparación',
+        'edit'               => 'Editar mantenimiento del activo',
+        'delete'             => 'Eliminar mantenimiento del activo',
+        'view'               => 'Ver detalles del mantenimiento del activo',
+        'repair'             => 'Reparar',
         'maintenance'        => 'Mantenimiento',
-        'upgrade'            => 'Mejora',
+        'upgrade'            => 'Mejorar',
         'calibration'        => 'Calibración',
         'software_support'   => 'Soporte de software',
         'hardware_support'   => 'Soporte de hardware',
diff --git a/resources/lang/es-CO/admin/asset_maintenances/message.php b/resources/lang/es-CO/admin/asset_maintenances/message.php
index ba34a18cc5..5fe5b2cf81 100644
--- a/resources/lang/es-CO/admin/asset_maintenances/message.php
+++ b/resources/lang/es-CO/admin/asset_maintenances/message.php
@@ -4,18 +4,18 @@
         'not_found'                    => '¡El mantenimiento del activo que estaba buscando no se encontró!',
         'delete'                       => [
             'confirm' => '¿Está seguro de que desea eliminar el mantenimiento de este activo?',
-            'error'   => 'Hubo un problema al eliminar el mantenimiento del activo. Por favor intentelo nuevamente.',
+            'error'   => 'Hubo un problema al eliminar el mantenimiento del activo. Por favor inténtelo nuevamente.',
             'success' => 'El mantenimiento del activo fue eliminado de manera exitosa.',
         ],
         'create'                       => [
             'error'   => 'Mantenimiento de Activos no fue creado, por favor intentelo de nuevo.',
-            'success' => 'Mantenimiento de Activo creado correctamente.',
+            'success' => 'El mantenimiento del activo fue creado de manera exitosa.',
         ],
         'edit'                       => [
-            'error'   => 'El mantenimiento de activo no fue editado. Por favor, intenta de nuevo.',
-            'success' => 'Mantenimiento de activo editado con éxito.',
+            'error'   => 'El mantenimiento del activo no fue editado. Por favor, inténtelo de nuevo.',
+            'success' => 'Mantenimiento del activo editado con éxito.',
         ],
-        'asset_maintenance_incomplete' => 'Sin Completar',
+        'asset_maintenance_incomplete' => 'Aún no se ha completado',
         'warranty'                     => 'Garantía',
-        'not_warranty'                 => 'Sin Garantía',
+        'not_warranty'                 => 'Sin garantía',
     ];
diff --git a/resources/lang/es-CO/admin/asset_maintenances/table.php b/resources/lang/es-CO/admin/asset_maintenances/table.php
index 2cbc929d59..6da43b1c77 100644
--- a/resources/lang/es-CO/admin/asset_maintenances/table.php
+++ b/resources/lang/es-CO/admin/asset_maintenances/table.php
@@ -1,7 +1,7 @@
 <?php
 
     return [
-        'title'         => 'Mantenimiento de Activos',
+        'title'         => 'Mantenimiento del activo',
         'asset_name'    => 'Nombre del activo',
         'is_warranty'   => 'Garantía',
         'dl_csv'        => 'Descargar CSV',
diff --git a/resources/lang/es-CO/admin/categories/general.php b/resources/lang/es-CO/admin/categories/general.php
index 3e0ddf7eaf..b862429686 100644
--- a/resources/lang/es-CO/admin/categories/general.php
+++ b/resources/lang/es-CO/admin/categories/general.php
@@ -3,8 +3,8 @@
 return array(
     'asset_categories' 					=> 'Categorías de activos',
     'category_name'  					=> 'Nombre de la categoría',
-    'checkin_email'                     => 'Enviar un correo al usuario al devolver/asignar.',
-    'checkin_email_notification'        => 'A este usuario se le enviará un correo electrónico al devolver/asignar.',
+    'checkin_email'                     => 'Enviar un correo electrónico al usuario al recibir/devolver.',
+    'checkin_email_notification'        => 'A este usuario se le enviará un correo electrónico al recibir/devolver.',
     'clone'                             => 'Clonar categoría',
     'create'  							=> 'Crear categoría',
     'edit'                              => 'Editar categoría',
diff --git a/resources/lang/es-CO/admin/categories/message.php b/resources/lang/es-CO/admin/categories/message.php
index 9875a01d88..997487469e 100644
--- a/resources/lang/es-CO/admin/categories/message.php
+++ b/resources/lang/es-CO/admin/categories/message.php
@@ -3,8 +3,8 @@
 return array(
 
     'does_not_exist' => 'La categoría no existe.',
-    'assoc_models'	 => 'Esta categoría está asociada actualmente con al menos un modelo y no se puede eliminar. Por favor actualice sus modelos para que no hagan referencia a esta categoría e inténtelo de nuevo. ',
-    'assoc_items'	 => 'Esta categoría está asociada actualmente con al menos un: asset_type y no se puede eliminar. Por favor actualice su: asset_type para que no haga referencia a esta categoría e inténtelo de nuevo. ',
+    'assoc_models'	 => 'Esta categoría está asociada actualmente con al menos un modelo y no puede ser eliminada. Actualice los modelos para que ya no hagan referencia a esta categoría e inténtelo de nuevo. ',
+    'assoc_items'	 => 'Esta categoría está asociada actualmente con al menos un: asset_type y no puede ser eliminada. Actualice su :asset_type para que ya no haga referencia a esta categoría e inténtelo de nuevo. ',
 
     'create' => array(
         'error'   => 'La categoría no fue creada, por favor inténtelo de nuevo.',
diff --git a/resources/lang/es-CO/admin/categories/table.php b/resources/lang/es-CO/admin/categories/table.php
index e3bb551e93..fc18e5ac6f 100644
--- a/resources/lang/es-CO/admin/categories/table.php
+++ b/resources/lang/es-CO/admin/categories/table.php
@@ -3,7 +3,7 @@
 return array(
 	'eula_text'      			=> 'Acuerdo de uso',
     'id'      					=> 'ID',
-    'parent'   					=> 'Padre',
+    'parent'   					=> 'Ubicación padre',
     'require_acceptance'      	=> 'Aceptación',
     'title'      				=> 'Nombre de la categoría del activo',
 
diff --git a/resources/lang/es-CO/admin/companies/general.php b/resources/lang/es-CO/admin/companies/general.php
index fd18d9f752..8fb72d5b94 100644
--- a/resources/lang/es-CO/admin/companies/general.php
+++ b/resources/lang/es-CO/admin/companies/general.php
@@ -1,7 +1,7 @@
 <?php
 
 return [
-    'select_company' => 'Seleccione una compañía',
+    'select_company' => 'Seleccionar una compañía',
     'about_companies' => 'Acerca de las compañías',
     'about_companies_description' => '        Puede utilizar las compañías como un simple campo informativo, o puede utilizarlas para restringir la visibilidad y la disponibilidad de los activos a los usuarios con una compañía específica habilitando la opción "Soporte completo a múltiples compañías" en "Configuración de administración"',
 ];
diff --git a/resources/lang/es-CO/admin/companies/message.php b/resources/lang/es-CO/admin/companies/message.php
index 7d2441e051..8f2cb9323e 100644
--- a/resources/lang/es-CO/admin/companies/message.php
+++ b/resources/lang/es-CO/admin/companies/message.php
@@ -1,20 +1,20 @@
 <?php
 
 return [
-    'does_not_exist' => 'La Compañía no existe.',
+    'does_not_exist' => 'La compañía no existe.',
     'deleted'        => 'Compañía eliminada',
-    'assoc_users'    => 'Esta compañía está actualmente asociada con al menos un modelo y no puede ser eliminada. Por favor actualiza tus modelos para no referenciar más esta compañía e inténtalo de nuevo. ',
+    'assoc_users'    => 'Esta compañía está actualmente asociada con al menos un modelo y no puede ser eliminada. Por favor actualice sus modelos para que no hagan referencia a esta compañía e inténtelo de nuevo. ',
     'create' => [
-        'error'   => 'La compañía no fue creada, por favor, inténtalo de nuevo.',
-        'success' => 'La compañía fue creada con éxito.',
+        'error'   => 'La compañía no fue creada, por favor, inténtelo de nuevo.',
+        'success' => 'Compañía creada satisfactoriamente.',
     ],
     'update' => [
-        'error'   => 'La compañía no fue actualizada, por favor, inténtalo de nuevo',
-        'success' => 'Compañía actualizada con éxito.',
+        'error'   => 'La compañía no fue actualizada, por favor, inténtelo de nuevo',
+        'success' => 'Compañía actualizada correctamente.',
     ],
     'delete' => [
         'confirm' => '¿Está seguro de que quiere eliminar esta compañía?',
-        'error'   => 'Hubo un problema eliminando la compañía. Por favor, inténtalo de nuevo.',
-        'success' => 'La compañía fue eliminada con éxito.',
+        'error'   => 'Hubo un problema eliminando la compañía. Por favor, inténtelo de nuevo.',
+        'success' => 'La compañía fue eliminada correctamente.',
     ],
 ];
diff --git a/resources/lang/es-CO/admin/companies/table.php b/resources/lang/es-CO/admin/companies/table.php
index dc5d0c230f..1cc605dfd1 100644
--- a/resources/lang/es-CO/admin/companies/table.php
+++ b/resources/lang/es-CO/admin/companies/table.php
@@ -1,11 +1,11 @@
 <?php
 return array(
     'companies' => 'Compañías',
-    'create'    => 'Crear Compañía',
+    'create'    => 'Crear una compañía',
     'email'     => 'Correo electrónico de la compañía',
     'title'     => 'Compañía',
     'phone'     => 'Teléfono de la compañía',
-    'update'    => 'Actualizar Compañía',
-    'name'      => 'Nombre de Compañía',
+    'update'    => 'Actualizar compañía',
+    'name'      => 'Nombre de la compañía',
     'id'        => 'ID',
 );
diff --git a/resources/lang/es-CO/admin/components/general.php b/resources/lang/es-CO/admin/components/general.php
index 57a21580f6..4f4a97e381 100644
--- a/resources/lang/es-CO/admin/components/general.php
+++ b/resources/lang/es-CO/admin/components/general.php
@@ -1,16 +1,16 @@
 <?php
 
 return array(
-    'component_name'                  => 'Nombre de Componente',
-    'checkin'                             => 'Registrar Componente',
-    'checkout'                             => 'Retirar Componente',
-    'cost'				=> 'Costo de Compra',
-    'create'                             => 'Crear Componente',
-    'edit'                             => 'Editar Componente',
-    'date'					=> 'Fecha de Compra',
+    'component_name'                  => 'Nombre del componente',
+    'checkin'                             => 'Ingresar componente',
+    'checkout'                             => 'Asignar componente',
+    'cost'				=> 'Costo de compra',
+    'create'                             => 'Crear componente',
+    'edit'                             => 'Editar componente',
+    'date'					=> 'Fecha de compra',
     'order'					=> 'Número de orden',
     'remaining' 			             => 'Restante',
     'total' 			                 => 'Total',
-    'update'                            => 'Actualizar Componente',
-    'checkin_limit'            => 'La cantidad devuelta debe ser igual o menor que :assigned_qty'
+    'update'                            => 'Actualizar componente',
+    'checkin_limit'            => 'La cantidad ingresada debe ser igual o menor que :assigned_qty'
 );
diff --git a/resources/lang/es-CO/admin/components/message.php b/resources/lang/es-CO/admin/components/message.php
index ee272f2ad8..e38968a588 100644
--- a/resources/lang/es-CO/admin/components/message.php
+++ b/resources/lang/es-CO/admin/components/message.php
@@ -5,32 +5,33 @@ return array(
     'does_not_exist' => 'El componente no existe.',
 
     'create' => array(
-        'error'   => 'El componente no fue creado, por favor inténtalo de nuevo.',
-        'success' => 'Componente creado con éxito.'
+        'error'   => 'El componente no fue creado, por favor inténtelo de nuevo.',
+        'success' => 'El componente se creó satisfactoriamente.'
     ),
 
     'update' => array(
-        'error'   => 'El componente no se actualizó, por favor inténtalo de nuevo',
-        'success' => 'Componente actualizado con éxito.'
+        'error'   => 'El componente no se actualizó, por favor inténtelo de nuevo',
+        'success' => 'Componente actualizado correctamente.'
     ),
 
     'delete' => array(
         'confirm'   => '¿Está seguro de que desea eliminar este componente?',
-        'error'   => 'Hubo un problema eliminando el componente. Por favor, inténtalo de nuevo.',
-        'success' => 'El componente fue eliminado con éxito.'
+        'error'   => 'Hubo un problema eliminando el componente. Por favor, inténtelo de nuevo.',
+        'success' => 'El componente fue borrado correctamente.',
+        'error_qty'   => 'Some components of this type are still checked out. Please check them in and try again.',
     ),
 
      'checkout' => array(
-        'error'   		=> 'El componente no fue retirado, por favor, inténtalo de nuevo',
-        'success' 		=> 'Componente retirado con éxito.',
-        'user_does_not_exist' => 'Este usuario es inválido. Por favor, inténtalo de nuevo.',
-        'unavailable'      => 'No quedan suficientes componentes: :remaining resting, :requested ',
+        'error'   		=> 'El componente no fue asignado, por favor, inténtelo de nuevo',
+        'success' 		=> 'El componente se ha asignado correctamente.',
+        'user_does_not_exist' => 'Ese usuario no es válido. Por favor, inténtelo de nuevo.',
+        'unavailable'      => 'No quedan suficientes componentes: :remaining disponibles, :requested solicitados ',
     ),
 
     'checkin' => array(
-        'error'   		=> 'El componente no fue registrado, por favor inténtalo de nuevo',
-        'success' 		=> 'Componente registrado con éxito.',
-        'user_does_not_exist' => 'El usuario no es válido. Por favor inténtalo de nuevo.'
+        'error'   		=> 'No se realizó el ingreso del componente, por favor inténtelo de nuevo',
+        'success' 		=> 'Componente ingresado con éxito.',
+        'user_does_not_exist' => 'Ese usuario no es válido. Por favor, inténtelo de nuevo.'
     )
 
 
diff --git a/resources/lang/es-CO/admin/components/table.php b/resources/lang/es-CO/admin/components/table.php
index 72f0b866d2..8f4de5c93c 100644
--- a/resources/lang/es-CO/admin/components/table.php
+++ b/resources/lang/es-CO/admin/components/table.php
@@ -1,5 +1,5 @@
 <?php
 
 return array(
-    'title'      				=> 'Nombre del Componente',
+    'title'      				=> 'Nombre de componente',
 );
diff --git a/resources/lang/es-CO/admin/consumables/general.php b/resources/lang/es-CO/admin/consumables/general.php
index e464586323..579a705fb2 100644
--- a/resources/lang/es-CO/admin/consumables/general.php
+++ b/resources/lang/es-CO/admin/consumables/general.php
@@ -1,11 +1,12 @@
 <?php
 
 return array(
-    'checkout'                          => 'Retirar Consumible al Usuario',
-    'consumable_name'                   => 'Nombre del Consumible',
-    'create'                            => 'Crear Consumible',
-    'item_no'                           => 'Elemento No.',
+    'checkout'                          => 'Asignar consumible a usuario',
+    'consumable_name'                   => 'Nombre del consumible',
+    'create'                            => 'Crear consumible',
+    'item_no'                           => 'Artículo No.',
     'remaining' 			            => 'Restante',
     'total' 			                => 'Total',
-    'update'                            => 'Actualizar Consumibles',
+    'update'                            => 'Actualizar consumible',
+    'inventory_warning'                 => 'El inventario de este consumible está por debajo de la cantidad mínima de :min_count',
 );
diff --git a/resources/lang/es-CO/admin/consumables/message.php b/resources/lang/es-CO/admin/consumables/message.php
index 8431f6e370..ca3da8895a 100644
--- a/resources/lang/es-CO/admin/consumables/message.php
+++ b/resources/lang/es-CO/admin/consumables/message.php
@@ -2,35 +2,36 @@
 
 return array(
 
+    'invalid_category_type' => 'La categoría debe ser una categoría para consumibles.',
     'does_not_exist' => 'El consumible no existe.',
 
     'create' => array(
-        'error'   => 'El consumible no fue creado, por favor, inténtalo de nuevo.',
+        'error'   => 'El consumible no fue creado, por favor inténtelo nuevamente.',
         'success' => 'Consumible creado con éxito.'
     ),
 
     'update' => array(
-        'error'   => 'El consumible no fue actualizado, por favor, inténtalo de nuevo',
-        'success' => 'Consumible actualizado con éxito.'
+        'error'   => 'El consumible no fue actualizado, por favor, inténtelo de nuevo',
+        'success' => 'Consumible actualizado correctamente.'
     ),
 
     'delete' => array(
         'confirm'   => '¿Está seguro de que desea eliminar este consumible?',
         'error'   => 'Hubo un problema al eliminar el consumible. Por favor inténtelo de nuevo.',
-        'success' => 'El consumible fue eliminado con éxito.'
+        'success' => 'El consumible ha sido eliminado correctamente.'
     ),
 
      'checkout' => array(
         'error'   		=> 'El consumible no fue asignado, por favor inténtelo de nuevo',
-        'success' 		=> 'Consumible retirado con éxito.',
-        'user_does_not_exist' => 'Este usuario es inválido. Por favor, inténtalo de nuevo.',
-         'unavailable'      => 'No hay suficientes consumibles para este pago. Por favor, compruebe la cantidad restante. ',
+        'success' 		=> 'Consumible asignado correctamente.',
+        'user_does_not_exist' => 'Ese usuario no es válido. Por favor, inténtelo de nuevo.',
+         'unavailable'      => 'No hay suficientes consumibles para esta asignación. Por favor, compruebe la cantidad disponible. ',
     ),
 
     'checkin' => array(
-        'error'   		=> 'Consumible no fue devuelto, por favor inténtelo de nuevo',
-        'success' 		=> 'Consumible fue registrado con éxito.',
-        'user_does_not_exist' => 'El usuario no es válido. Por favor inténtalo de nuevo.'
+        'error'   		=> 'El consumible no fue ingresado, por favor inténtelo de nuevo',
+        'success' 		=> 'El consumible fue ingresado correctamente.',
+        'user_does_not_exist' => 'Ese usuario no es válido. Por favor, inténtelo de nuevo.'
     )
 
 
diff --git a/resources/lang/es-CO/admin/consumables/table.php b/resources/lang/es-CO/admin/consumables/table.php
index befcfc511b..2e346e2962 100644
--- a/resources/lang/es-CO/admin/consumables/table.php
+++ b/resources/lang/es-CO/admin/consumables/table.php
@@ -1,5 +1,5 @@
 <?php
 
 return array(
-    'title'      				=> 'Nombre del Consumible',
+    'title'      				=> 'Nombre del consumible',
 );
diff --git a/resources/lang/es-CO/admin/custom_fields/general.php b/resources/lang/es-CO/admin/custom_fields/general.php
index 5b705a9f79..e8a572b16a 100644
--- a/resources/lang/es-CO/admin/custom_fields/general.php
+++ b/resources/lang/es-CO/admin/custom_fields/general.php
@@ -2,60 +2,63 @@
 
 return [
     'custom_fields'		        => 'Campos personalizados',
-    'manage'                    => 'Gestionar',
+    'manage'                    => 'Administrar',
     'field'		                => 'Campo',
     'about_fieldsets_title'		=> 'Acerca de los grupos de campos',
     'about_fieldsets_text'		=> 'Los grupos de campos le permiten agrupar campos personalizados que se reutilizan frecuentemente para determinados modelos de activos.',
-    'custom_format'             => 'Formato de Regex personalizado...',
-    'encrypt_field'      	        => 'Encriptar el valor de este campo en la base de datos',
-    'encrypt_field_help'      => 'ADVERTENCIA: Encriptar un campo hace que no se pueda buscar.',
-    'encrypted'      	        => 'Encriptado',
+    'custom_format'             => 'Expresión regular personalizada...',
+    'encrypt_field'      	        => 'Cifrar el valor de este campo en la base de datos',
+    'encrypt_field_help'      => 'ADVERTENCIA: Cifrar un campo hace que no se pueda buscar.',
+    'encrypted'      	        => 'Cifrado',
     'fieldset'      	        => 'Grupo de campos',
     'qty_fields'      	      => 'Campos de cantidad',
-    'fieldsets'      	        => 'Grupo de campos',
+    'fieldsets'      	        => 'Grupos de campos',
     'fieldset_name'           => 'Nombre del grupo de campos',
-    'field_name'              => 'Nombre del Campo',
-    'field_values'            => 'Valores del Campo',
-    'field_values_help'       => 'Añade opciones seleccionables, una por línea. Líneas en blanco además de la primera será ignorada.',
-    'field_element'           => 'Elemento de Formulario',
+    'field_name'              => 'Nombre del campo',
+    'field_values'            => 'Valores de los campos',
+    'field_values_help'       => 'Agregue opciones seleccionables, una por línea. Se ignorarán las líneas en blanco que no sean la primera.',
+    'field_element'           => 'Elemento de formulario',
     'field_element_short'     => 'Elemento',
     'field_format'            => 'Formato',
-    'field_custom_format'     => 'Formato Regex Personalizado',
-    'field_custom_format_help'     => 'Este campo te permite usar una expresión regex para la validación. Este debe empezar con "regex:" - por ejemplo, para validar que un valor de campo personalizado contiene un IMEI válido (15 dígitos numéricos), podrías usar <code>regex:/^[0-9]{15}$/</code>.',
+    'field_custom_format'     => 'Expresión regular personalizada',
+    'field_custom_format_help'     => 'Este campo le permite usar una expresión regular para la validación. Debería empezar con "regex:" - por ejemplo, para validar que un valor de campo personalizado contiene un IMEI válido (15 dígitos numéricos), podría usar <code>regex:/^[0-9]{15}$/</code>.',
     'required'   		          => 'Obligatorio',
     'req'   		              => 'Obl.',
-    'used_by_models'   		    => 'Usado por Modelos',
+    'used_by_models'   		    => 'Usado por los modelos',
     'order'   		            => 'Orden',
     'create_fieldset'         => 'Nuevo grupo de campos',
     'update_fieldset'         => 'Actualizar grupo de campos',
     'fieldset_does_not_exist'   => 'El grupo de campos :id no existe',
-    'fieldset_updated'         => 'Conjunto de campos actualizado',
-    'create_fieldset_title' => 'Crear un nuevo conjunto de campos',
-    'create_field'            => 'Nuevo Campo Personalizado',
+    'fieldset_updated'         => 'Se actualizó el grupo de campos',
+    'create_fieldset_title' => 'Crear un nuevo grupo de campos',
+    'create_field'            => 'Nuevo campo personalizado',
     'create_field_title' => 'Crear un nuevo campo personalizado',
-    'value_encrypted'      	        => 'El valor de este campo está encriptado en la base de datos. Sólo los administradores pueden ver el valor desencriptado',
-    'show_in_email'     => '¿Incluye el valor de este campo en los correos de pago enviados al usuario? Los campos cifrados no se pueden incluir en los correos electrónicos',
-    'show_in_email_short'     => 'Incluye en correos electrónicos.',
+    'value_encrypted'      	        => 'El valor de este campo está cifrado en la base de datos. Solo los administradores pueden ver el valor descifrado',
+    'show_in_email'     => '¿Incluir el valor de este campo en los correos de asignación enviados al usuario? Los campos cifrados no se pueden incluir en los correos electrónicos',
+    'show_in_email_short' => 'Incluir en los correos electrónicos',
     'help_text' => 'Texto de ayuda',
-    'help_text_description' => 'Este es un texto opcional que aparecerá debajo de los elementos del formulario mientras se edita un activo para proporcionar contexto en el campo.',
-    'about_custom_fields_title' => 'Acerca de campos personalizados',
+    'help_text_description' => 'Este es un texto opcional que aparecerá debajo de los campos del formulario cuando se edite un activo para proporcionar contexto adicional.',
+    'about_custom_fields_title' => 'Acerca de los campos personalizados',
     'about_custom_fields_text' => 'Los campos personalizados le permiten añadir atributos arbitrarios a los activos.',
-    'add_field_to_fieldset' => 'Añadir campo al conjunto de campos',
-    'make_optional' => 'Requerido - haga clic para hacer opcional',
-    'make_required' => 'Opcional - haga clic para hacer necesario',
+    'add_field_to_fieldset' => 'Añadir campo al grupo de campos',
+    'make_optional' => 'Obligatorio - haga clic para hacerlo opcional',
+    'make_required' => 'Opcional - haga clic para que sea obligatorio',
     'reorder' => 'Reordenar',
-    'db_field' => 'Campo DB',
+    'db_field' => 'Campo en base de datos',
     'db_convert_warning' => 'ADVERTENCIA. Este campo está en la tabla de campos personalizados como <code>:db_column</code> pero debe ser <code>:expected</code>.',
-    'is_unique' => 'Este valor debe ser único en todos los activos',
+    'is_unique' => 'Este valor debe ser único para todos los activos',
     'unique' => 'Único',
-    'display_in_user_view' => 'Permitir al usuario retirado ver estos valores en su página Ver Recursos asignados',
+    'display_in_user_view' => 'Permitir al usuario ver estos valores en la página "Ver activos asignados"',
     'display_in_user_view_table' => 'Visible para el usuario',
-    'auto_add_to_fieldsets' => 'Añadir automáticamente a cada nuevo conjunto de campos',
-    'add_to_preexisting_fieldsets' => 'Añadir a cualquier conjunto de campos existente',
-    'show_in_listview' => 'Mostrar por defecto en las vistas de la lista. Los usuarios autorizados podrán mostrar/ocultar a través del selector de columnas',
-    'show_in_listview_short' => 'Mostrar en listas',
+    'auto_add_to_fieldsets' => 'Añadir automáticamente a cada nuevo grupo de campos',
+    'add_to_preexisting_fieldsets' => 'Añadir a cualquier grupo de campos existente',
+    'show_in_listview' => 'Mostrar por defecto en las consultas. Los usuarios autorizados podrán mostrar/ocultar a través del selector de columnas',
+    'show_in_listview_short' => 'Mostrar en las listas',
     'show_in_requestable_list_short' => 'Mostrar en la lista de activos que se pueden solicitar',
     'show_in_requestable_list' => 'Mostrar el valor en la lista de activos que se pueden solicitar. Los campos cifrados no se mostrarán',
     'encrypted_options' => 'Este campo está cifrado, por lo que algunas opciones de visualización no estarán disponibles.',
+    'display_checkin' => 'Display in checkin forms',
+    'display_checkout' => 'Display in checkout forms',
+    'display_audit' => 'Display in audit forms',
 
 ];
diff --git a/resources/lang/es-CO/admin/custom_fields/message.php b/resources/lang/es-CO/admin/custom_fields/message.php
index 653f4c710a..01bc9c7c5d 100644
--- a/resources/lang/es-CO/admin/custom_fields/message.php
+++ b/resources/lang/es-CO/admin/custom_fields/message.php
@@ -5,21 +5,22 @@ return array(
     'field' => array(
         'invalid'   => 'El campo no existe.',
         'already_added'   => 'El campo ya fue añadido',
+        'none_selected'   => 'No se ha seleccionado ningún campo',
 
         'create' => array(
             'error'   => 'El campo no fue creado, por favor, inténtalo de nuevo.',
-            'success' => 'Campo creado con éxito.',
-            'assoc_success' => 'Campo agregado al fieldset con éxito.'
+            'success' => 'Campo creado correctamente.',
+            'assoc_success' => 'Campo correctamente añadido al grupo de campos.'
         ),
 
         'update' => array(
-            'error'   => 'El campo no fue actualizado, por favor inténtalo de nuevo',
-            'success' => 'Campo actualizado con éxito.'
+            'error'   => 'El campo no fue actualizado, por favor, inténtelo de nuevo',
+            'success' => 'Campo actualizado correctamente.'
         ),
 
         'delete' => array(
             'confirm'   	=> '¿Está seguro de que quiere eliminar este campo?',
-            'error'   => 'Hubo un problema al eliminar el campo. Por favor inténtalo de nuevo.',
+            'error'   => 'Hubo un problema al eliminar el campo. Por favor, inténtelo de nuevo.',
             'success' => 'Este campo fue eliminado con éxito.',
             'in_use'   => 'El campo aún está en uso.',
         )
@@ -28,30 +29,30 @@ return array(
 
     'fieldset' => array(
 
-        'does_not_exist' => 'El fieldset no existe',
+        'does_not_exist' => 'El grupo de campos no existe',
 
         'create' => array(
-            'error'   => 'El fieldset no fue creado, por favor inténtalo de nuevo.',
-            'success' => 'Fieldset creado con éxito.'
+            'error'   => 'El grupo de campos no ha sido creado, por favor inténtelo de nuevo.',
+            'success' => 'Grupo de campos creado satisfactoriamente.'
         ),
 
         'update' => array(
-            'error'   => 'El fieldset no fue actualizado, por favor, inténtalo de nuevo',
-            'success' => 'Fieldset actualizado con éxito.'
+            'error'   => 'El grupo de campos no ha sido actualizado, por favor inténtelo de nuevo',
+            'success' => 'Grupo de campos actualizado correctamente.'
         ),
 
         'delete' => array(
             'confirm'   	=> '¿Está seguro de que quiere eliminar este grupo de campos?',
-            'error'   => 'Hubo un problema al eliminar este fieldset. Por favor inténtalo de nuevo.',
-            'success' => 'El fieldset fue eliminado con éxito.',
-            'in_use'   => 'El fieldset está aún en uso.',
+            'error'   => 'Hubo un problema al eliminar el grupo de campos. Inténtelo de nuevo.',
+            'success' => 'El grupo de campos se eliminó correctamente.',
+            'in_use'   => 'El grupo de campos aún está en uso.',
         )
 
     ),
 
     'fieldset_default_value' => array(
 
-        'error' => 'Error al validar los valores por defecto del conjunto de campos.',
+        'error' => 'Error al validar los valores predeterminados del grupo de campos.',
 
     ),
 
diff --git a/resources/lang/es-CO/admin/departments/message.php b/resources/lang/es-CO/admin/departments/message.php
index 59f226bea0..eabf4774d8 100644
--- a/resources/lang/es-CO/admin/departments/message.php
+++ b/resources/lang/es-CO/admin/departments/message.php
@@ -4,19 +4,19 @@ return array(
 
     'does_not_exist' => 'El departamento no existe.',
     'department_already_exists' => 'Ya existe un departamento con ese nombre en esta ubicación de la compañía. O elija un nombre más específico para este departamento. ',
-    'assoc_users'	 => 'Este departamento está actualmente asociado con al menos un usuario y no puede ser eliminado. Por favor, actualiza tus usuarios para no referenciar más este departamento e inténtalo de nuevo. ',
+    'assoc_users'	 => 'Este departamento está actualmente asociado con al menos un usuario y no puede ser eliminado. Por favor, actualice sus usuarios para que no hagan referencia a este departamento e inténtelo de nuevo. ',
     'create' => array(
-        'error'   => 'El departamento no fue creado, por favor, inténtalo de nuevo.',
-        'success' => 'Departamento fue creado con éxito.'
+        'error'   => 'El departamento no fue creado, por favor, inténtelo de nuevo.',
+        'success' => 'Departamento creado correctamente.'
     ),
     'update' => array(
-        'error'   => 'El departamento no fue actualizado, por favor inténtalo de nuevo',
+        'error'   => 'El departamento no fue actualizado, por favor inténtelo de nuevo',
         'success' => 'Departamento actualizado con éxito.'
     ),
     'delete' => array(
         'confirm'   	=> '¿Está seguro de que desea eliminar este departamento?',
-        'error'   => 'Hubo un problema al eliminar este departamento. Por favor inténtalo de nuevo.',
-        'success' => 'El departamento fue eliminado con éxito.'
+        'error'   => 'Hubo un problema al borrar el departamento. Por favor, inténtelo de nuevo.',
+        'success' => 'El departamento fue eliminado correctamente.'
     )
 
 );
diff --git a/resources/lang/es-CO/admin/departments/table.php b/resources/lang/es-CO/admin/departments/table.php
index d857c08c65..da02f3e3a3 100644
--- a/resources/lang/es-CO/admin/departments/table.php
+++ b/resources/lang/es-CO/admin/departments/table.php
@@ -3,9 +3,9 @@
 return array(
 
     'id'                        => 'ID',
-    'name'                      => 'Nombre de Departamento',
+    'name'                      => 'Nombre del departamento',
     'manager'                   => 'Supervisor',
     'location'                  => 'Ubicación',
-    'create'                    => 'Crear Departamento',
-    'update'                    => 'Actualizar Departamento',
+    'create'                    => 'Crear departamento',
+    'update'                    => 'Actualizar departamento',
     );
diff --git a/resources/lang/es-CO/admin/depreciations/general.php b/resources/lang/es-CO/admin/depreciations/general.php
index a99d8917e7..62844e7004 100644
--- a/resources/lang/es-CO/admin/depreciations/general.php
+++ b/resources/lang/es-CO/admin/depreciations/general.php
@@ -6,11 +6,15 @@ return [
     'asset_depreciations'  					=> 'Depreciación de activos',
     'create'  					            => 'Crear depreciación',
     'depreciation_name'  					=> 'Nombre de depreciación',
-    'depreciation_min'                      => 'Valor del piso de la depreciación',
-    'number_of_months'  					=> 'Número de Meses',
-    'update'  					            => 'Actualizar Depreciación',
+    'depreciation_min'                      => 'Valor mínimo de depreciación',
+    'number_of_months'  					=> 'Número de meses',
+    'update'  					            => 'Actualizar depreciación',
     'depreciation_min'                      => 'Valor mínimo después de depreciación',
     'no_depreciations_warning'               => '<strong>Advertencia: </strong>
                       No tiene ninguna depreciación configurada.
-                      Por favor, configure al menos una depreciación para ver el informe de depreciaciones.',
+                      Por favor, configure al menos una depreciación para ver el informe de depreciación.',
+    'depreciation_method'                   => 'Informe de depreciación',
+    'linear_depreciation'                   => 'Linear (Default)',
+    'half_1'                                => 'Half-year convention, always applied',
+    'half_2'                                => 'Convención semestral, aplicada con condición',
 ];
diff --git a/resources/lang/es-CO/admin/depreciations/message.php b/resources/lang/es-CO/admin/depreciations/message.php
index 6009b15fd4..6f2875bbb1 100644
--- a/resources/lang/es-CO/admin/depreciations/message.php
+++ b/resources/lang/es-CO/admin/depreciations/message.php
@@ -3,22 +3,22 @@
 return array(
 
     'does_not_exist' => 'La clase de depreciación no existe.',
-    'assoc_users'	 => 'Esta depreciación está actualmente asociada con uno o mas modelos y no puede ser eliminada. Por favor, elimina los modelos y luego intenta borrarlas de nuevo. ',
+    'assoc_users'	 => 'Esta depreciación está actualmente asociada con uno o más modelos y no puede ser eliminada. Por favor, elimine los modelos y luego intente borrarlas de nuevo. ',
 
 
     'create' => array(
-        'error'   => 'La clase de depreciación no fue creada, por favor, inténtalo de nuevo. :(',
+        'error'   => 'El tipo de depreciación no fue creado, por favor, inténtelo de nuevo. :(',
         'success' => 'La clase de depreciación fue creada con éxito. :)'
     ),
 
     'update' => array(
-        'error'   => 'La clase de depreciación no fue actualizada, por favor, inténtalo de nuevo',
+        'error'   => 'El tipo de depreciación no fue actualizado, por favor, inténtelo de nuevo',
         'success' => 'La clase de depreciación fue creada con éxito.'
     ),
 
     'delete' => array(
         'confirm'   => '¿Está seguro de que desea eliminar esta clase de depreciación?',
-        'error'   => 'Ha sucedido un error eliminando la clase de depreciación, por favor intente de nuevo.',
+        'error'   => 'Ha sucedido un error eliminando el tipo de depreciación, por favor intente de nuevo.',
         'success' => 'La clase de depreciación fue eliminada con éxito.'
     )
 
diff --git a/resources/lang/es-CO/admin/depreciations/table.php b/resources/lang/es-CO/admin/depreciations/table.php
index ad042d1640..b4f03dafc9 100644
--- a/resources/lang/es-CO/admin/depreciations/table.php
+++ b/resources/lang/es-CO/admin/depreciations/table.php
@@ -6,6 +6,6 @@ return [
     'months'   => 'Meses',
     'term'   => 'Períodos',
     'title'      => 'Nombre ',
-    'depreciation_min' => 'Valor del piso',
+    'depreciation_min' => 'Valor mínimo',
 
 ];
diff --git a/resources/lang/es-CO/admin/groups/message.php b/resources/lang/es-CO/admin/groups/message.php
index b7c1f82a0d..3fc20db4b9 100644
--- a/resources/lang/es-CO/admin/groups/message.php
+++ b/resources/lang/es-CO/admin/groups/message.php
@@ -2,9 +2,9 @@
 
 return array(
 
-    'group_exists'        => 'El grupo ya existe!',
+    'group_exists'        => '!El grupo ya existe!',
     'group_not_found'     => 'El ID del grupo :id no existe.',
-    'group_name_required' => 'El campo nombre es requerido',
+    'group_name_required' => 'El campo nombre es obligatorio',
 
     'success' => array(
         'create' => 'El grupo fue creado exitosamente.',
@@ -14,7 +14,7 @@ return array(
 
     'delete' => array(
         'confirm'   => '¿Está seguro de que desea eliminar este grupo?',
-        'create' => 'Hubo un problema creando el grupo. Por favor intente nuevamente.',
+        'create' => 'Hubo un problema creando el grupo. Por favor, intente nuevamente.',
         'update' => 'Hubo un problema actualizando el grupo. Por favor, intente nuevamente.',
         'delete' => 'Hubo un problema eliminando el grupo. Por favor, intente nuevamente.',
     ),
diff --git a/resources/lang/es-CO/admin/groups/titles.php b/resources/lang/es-CO/admin/groups/titles.php
index 5ede057604..b6aaf38985 100644
--- a/resources/lang/es-CO/admin/groups/titles.php
+++ b/resources/lang/es-CO/admin/groups/titles.php
@@ -1,13 +1,13 @@
 <?php
 
 return [
-    'about_groups_title'            => 'Acerca de Grupos',
+    'about_groups_title'            => 'Acerca de los grupos',
     'about_groups'                  => 'Los grupos se utilizan para generalizar los permisos de usuario.',
-    'group_management' 	 	=> 'Gestión de grupos',
-    'create' 	 	 	    => 'Crear un Nuevo Grupo',
-    'update' 	 		        => 'Editar Grupo',
+    'group_management' 	 	=> 'Administración de grupos',
+    'create' 	 	 	    => 'Crear un grupo nuevo',
+    'update' 	 		        => 'Editar grupo',
     'group_name' 	 		=> 'Nombre del Grupo',
-    'group_admin' 	 		=> 'Administración del Grupo',
+    'group_admin' 	 		=> 'Grupo administrador',
     'allow' 	 			=> 'Permitir',
     'deny' 	 				=> 'Denegar',
     'permission'            => 'Permiso',
diff --git a/resources/lang/es-CO/admin/hardware/form.php b/resources/lang/es-CO/admin/hardware/form.php
index 72ec4f9fd6..2e219a9db7 100644
--- a/resources/lang/es-CO/admin/hardware/form.php
+++ b/resources/lang/es-CO/admin/hardware/form.php
@@ -1,35 +1,35 @@
 <?php
 
 return [
-    'bulk_delete'		=> 'Confirma la Eliminación Masiva de Equipos',
+    'bulk_delete'		=> 'Confirmar eliminación masiva de activos',
     'bulk_restore'      => 'Confirmar recuperación masiva de activos', 
-  'bulk_delete_help'	=> 'Revisar los equipos para eliminación masiva. Una vez eliminados, esos equipos pueden ser restaurados, pero no volverán a estar asociados a ninguno de los usuarios a los que estén asignados actualmente.',
+  'bulk_delete_help'	=> 'Revise a continuación los activos para eliminación masiva. Una vez eliminados, estos activos se pueden restaurar, pero ya no estarán asociados a ningún usuario al que estén asignados actualmente.',
   'bulk_restore_help'	=> 'Revisar los activos para la restauración en masa a continuación. Una vez restaurados, estos activos no estarán asociados con los usuarios a los que fueron asignados anteriormente.',
   'bulk_delete_warn'	=> 'Va a eliminar :asset_count activos.',
   'bulk_restore_warn'	=> 'Está a punto de restaurar :asset_count activos.',
-    'bulk_update'		=> 'Actualización masiva de Equipos',
-    'bulk_update_help'	=> 'Este formulario te permite actualizar múltiples equipos simultáneamente. Solo debes completar los campos que quieres modificar. Todo campo en blanco permanecerá sin cambios. ',
-    'bulk_update_warn'	=> 'Está a punto de editar las propiedades de un solo recurso.|Está a punto de editar las propiedades de :asset_count activos.',
-    'bulk_update_with_custom_field' => 'Tenga en cuenta que los activos son :asset_model_count diferentes tipos de modelos.',
+    'bulk_update'		=> 'Actualización masiva de activos',
+    'bulk_update_help'	=> 'Este formulario le permite actualizar varios activos a la vez. Complete solo los campos que necesite modificar. Los campos que se dejen en blanco no se modificarán. ',
+    'bulk_update_warn'	=> 'Está a punto de editar las propiedades de un solo activo.|Está a punto de editar las propiedades de :asset_count activos.',
+    'bulk_update_with_custom_field' => 'Tenga en cuenta que los activos corresponden a :asset_model_count tipos diferentes de modelos.',
     'bulk_update_model_prefix' => 'En modelos', 
-    'bulk_update_custom_field_unique' => 'Este es un campo único y no puede ser editado a granel.',
+    'bulk_update_custom_field_unique' => 'Este es un campo único y no puede ser editado de forma masiva.',
     'checkedout_to'		=> 'Asignado a',
     'checkout_date'		=> 'Fecha de asignación',
-    'checkin_date'		=> 'Fecha de devolución',
+    'checkin_date'		=> 'Fecha de ingreso',
     'checkout_to'		=> 'Asignar a',
     'cost'				=> 'Precio de compra',
-    'create'			=> 'Creación de Equipo',
+    'create'			=> 'Crear activo',
     'date'				=> 'Fecha de compra',
     'depreciation'	    => 'Depreciación',
     'depreciates_on'	=> 'Se deprecia en',
     'default_location'	=> 'Ubicación predeterminada',
-    'default_location_phone' => 'Teléfono de ubicación por defecto',
+    'default_location_phone' => 'Teléfono de ubicación predeterminada',
     'eol_date'			=> 'Fecha fin de soporte (EOL)',
-    'eol_rate'			=> 'Vita Útil',
+    'eol_rate'			=> 'Tasa fin de soporte (EOL)',
     'expected_checkin'  => 'Fecha esperada de devolución',
-    'expires'			=> 'Expira',
-    'fully_depreciated'	=> 'Totalmente Depreciado',
-    'help_checkout'		=> 'Si deseas asignar este equipo inmediatamente, selecciona "Listo para Asignar" de la lista de estados de arriba. ',
+    'expires'			=> 'Vence',
+    'fully_depreciated'	=> 'Totalmente depreciado',
+    'help_checkout'		=> 'Si desea asignar este equipo inmediatamente, seleccione "Listo para asignar" de la lista de estados de arriba. ',
     'mac_address'		=> 'Dirección MAC',
     'manufacturer'		=> 'Fabricante',
     'model'				=> 'Modelo',
@@ -39,24 +39,27 @@ return [
     'order'				=> 'Número de orden',
     'qr'				=> 'Código QR',
     'requestable'		=> 'Los usuarios pueden solicitar este elemento',
-    'redirect_to_all'   => 'Return to all :type',
+    'redirect_to_all'   => 'Regresar a :type',
     'redirect_to_type'   => 'Ir a :type',
-    'redirect_to_checked_out_to'   => 'Go to Checked Out to',
-    'select_statustype'	=> 'Seleccione un tipo de estado',
+    'redirect_to_checked_out_to'   => 'Ir a elementos asignados',
+    'select_statustype'	=> 'Seleccionar un tipo de estado',
     'serial'			=> 'Número de serie',
     'status'			=> 'Estado',
-    'tag'				=> 'Etiqueta del activo',
-    'update'			=> 'Actualizar Equipo',
+    'tag'				=> 'Placa del activo',
+    'update'			=> 'Actualizar activo',
     'warranty'			=> 'Garantía',
-        'warranty_expires'		=> 'Vencimiento de Garantía',
+        'warranty_expires'		=> 'Vencimiento de la garantía',
     'years'				=> 'años',
-    'asset_location' => 'Actualizar ubicación del recurso',
+    'asset_location' => 'Actualizar ubicación del activo',
     'asset_location_update_default_current' => 'Actualizar ubicación predeterminada y ubicación actual',
     'asset_location_update_default' => 'Actualizar sólo la ubicación predeterminada',
     'asset_location_update_actual' => 'Actualizar sólo la ubicación actual',
     'asset_not_deployable' => 'Ese estado de activos es no utilizable. Este activo no puede ser asignado.',
-    'asset_deployable' => 'El estado indica que es utilizable. Este activo puede ser asignado.',
+    'asset_not_deployable_checkin' => 'Ese estado del activo no es utilizable. El uso de esta etiqueta de estado ingresará el activo.',
+    'asset_deployable' => 'This asset can be checked out.',
     'processing_spinner' => 'Procesando... (Esto puede tomar un poco de tiempo en archivos grandes)',
+    'processing' => 'Procesando... ',
     'optional_infos'  => 'Información opcional',
-    'order_details'   => 'Información relacionada con el pedido'
+    'order_details'   => 'Información relacionada con el pedido',
+    'calc_eol'    => 'Si deja nula la fecha EOL, utilice el cálculo automático basado en la fecha de compra y la frecuencia de EOL.',
 ];
diff --git a/resources/lang/es-CO/admin/hardware/general.php b/resources/lang/es-CO/admin/hardware/general.php
index 1b4a71d50d..172b4c5147 100644
--- a/resources/lang/es-CO/admin/hardware/general.php
+++ b/resources/lang/es-CO/admin/hardware/general.php
@@ -1,42 +1,42 @@
 <?php
 
 return [
-    'about_assets_title'           => 'Acerca de los Equipos',
-    'about_assets_text'            => 'Los activos son elementos con número de serie o etiqueta de activos. Tienden a ser artículos de alto valor donde es importante identificar un elemento específico.',
+    'about_assets_title'           => 'Acerca de los activos',
+    'about_assets_text'            => 'Los activos son artículos rastreados por número de serie o placa de activo.  Suelen ser artículos de alto valor en los que es importante identificar un elemento específico.',
     'archived'  				=> 'Archivado',
-    'asset'  					=> 'Equipo',
-    'bulk_checkout'             => 'Asignar Equipos',
-    'bulk_checkin'              => 'Devolver activos',
-    'checkin'  					=> 'Devolver activo',
-    'checkout'  				=> 'Asignar Equipo',
+    'asset'  					=> 'Activo',
+    'bulk_checkout'             => 'Asignación masiva',
+    'bulk_checkin'              => 'Bulk Checkin',
+    'checkin'  					=> 'Ingresar activo',
+    'checkout'  				=> 'Asignar activo',
     'clone'  					=> 'Clonar activo',
     'deployable'  				=> 'Utilizable',
-    'deleted'  					=> 'Este activo ha sido borrado.',
-    'delete_confirm'            => '¿Está seguro de que desea eliminar este recurso?',
+    'deleted'  					=> 'Este activo ha sido eliminado.',
+    'delete_confirm'            => '¿Está seguro de que desea eliminar este activo?',
     'edit'  					=> 'Editar activo',
-    'model_deleted'  			=> 'El modelo de este activo ha sido borrado. Debe restaurar el modelo antes de restaurar o crear el activo.',
+    'model_deleted'  			=> 'Este modelo de activo ha sido eliminado. Debe restaurar este modelo antes de poder restaurar el activo.',
     'model_invalid'             => 'Este modelo para este activo es inválido.',
-    'model_invalid_fix'         => 'El activo debe ser actualizado, use un modelo de activo válido antes de intentar asignarlo, devolverlo o auditarlo.',
+    'model_invalid_fix'         => 'El activo debe ser actualizado, use un modelo de activo válido antes de intentar ingresarlo, asignarlo o auditarlo.',
     'requestable'               => 'Puede solicitarse',
     'requested'				    => 'Solicitado',
     'not_requestable'           => 'No puede solicitarse',
     'requestable_status_warning' => 'No cambiar el estado solicitable',
-    'restore'  					=> 'Restaurar equipo',
+    'restore'  					=> 'Restaurar activo',
     'pending'  					=> 'Pendiente',
     'undeployable'  			=> 'No utilizable',
     'undeployable_tooltip'  	=> 'Este activo tiene una etiqueta de estado que no es desplegable y no puede ser revisado en este momento.',
     'view'  					=> 'Ver activo',
     'csv_error' => 'Tiene un error en su archivo CSV:',
-    'import_text' => '<p>Sube un archivo CSV que contenga el historial de activos. Los activos y los usuarios DEBEN existir ya en el sistema, o serán omitidos. La importación del historial busca activos que coincidan con la etiqueta de activo.  Intentaremos encontrar un usuario usando el nombre del usuario que proporciones y los criterios que selecciones a continuación. Si no seleccionas ningún criterio a continuación, el sistema simplemente intentará usar el formato de nombre de usuario que configuraste en <code>Admin &gt;  Opciones Generales</code>.</p><p>Los campos incluidos en el CSV deben coincidir con los encabezados: <strong>Asset Tag, Name, Checkout Date, Checkin Date</strong>. Cualquier campo adicional será ignorado.</p><p>Checkin Date(Fecha de Devolución): dejar en blanco o usar fechas futuras asignará los ítems al usuario asociado. Excluir la columna Checkin Date creará una fecha de devolución con la fecha de hoy.</p>    ',
-    'csv_import_match_f-l' => 'Intenta emparejar usuarios con formato <strong>nombre.lastname</strong> (<code>jane.smith</code>)',
-    'csv_import_match_initial_last' => 'Intentar emparejar a los usuarios con un formato <strong>primer apellido inicial</strong> (<code>jsmith</code>)',
-    'csv_import_match_first' => 'Intentar emparejar a los usuarios con formato <strong>primer nombre</strong> (<code>jane</code>)',
-    'csv_import_match_email' => 'Intenta emparejar a los usuarios por <strong>email</strong> como nombre de usuario',
-    'csv_import_match_username' => 'Intentar emparejar los usuarios usando la propiedad <strong>Usuario</strong>',
+    'import_text' => '<p>Upload a CSV that contains asset history. The assets and users MUST already exist in the system, or they will be skipped. Matching assets for history import happens against the asset tag. We will try to find a matching user based on the user\'s name you provide, and the criteria you select below. If you do not select any criteria below, it will simply try to match on the username format you configured in the <code>Admin &gt; General Settings</code>.</p><p>Fields included in the CSV must match the headers: <strong>Asset Tag, Name, Checkout Date, Checkin Date</strong>. Any additional fields will be ignored. </p><p>Checkin Date: blank or future checkin dates will checkout items to associated user.  Excluding the Checkin Date column will create a checkin date with todays date.</p>    ',
+    'csv_import_match_f-l' => 'Intente asociar usuarios usando el formato <strong>nombre.apellido</strong> (<code>jane.smith</code>)',
+    'csv_import_match_initial_last' => 'Intente asociar los usuarios usando el formato <strong>inicial del nombre y apellido</strong> (<code>jsmith</code>)',
+    'csv_import_match_first' => 'Intentar asociar los usuarios usando el formato <strong>primer nombre</strong> (<code>jane</code>)',
+    'csv_import_match_email' => 'Intente asociar los usuarios usando <strong>correo electrónico</strong> como nombre de usuario',
+    'csv_import_match_username' => 'Intente asociar los usuarios usando <strong>nombre de usuario</strong>',
     'error_messages' => 'Mensajes de error:',
     'success_messages' => 'Mensajes de éxito:',
     'alert_details' => 'Por favor vea abajo para más detalles.',
-    'custom_export' => 'Exportación personalizada',
-    'mfg_warranty_lookup' => ':fabricante Garantía Estado Búsqueda',
-    'user_department' => 'Departamento de Usuario',
+    'custom_export' => 'Personalizar exportación',
+    'mfg_warranty_lookup' => 'Búsqueda del estado de garantía para :manufacturer',
+    'user_department' => 'Departamento del usuario',
 ];
diff --git a/resources/lang/es-CO/admin/hardware/message.php b/resources/lang/es-CO/admin/hardware/message.php
index cd9b014616..eb36f57039 100644
--- a/resources/lang/es-CO/admin/hardware/message.php
+++ b/resources/lang/es-CO/admin/hardware/message.php
@@ -2,45 +2,49 @@
 
 return [
 
-    'undeployable' 		=> '<strong>Atención:</strong> Este elemento ha sido marcado como no utilizable.
-                        Si no es correcto, actualice el estado.',
-    'does_not_exist' 	=> 'El recurso no existe.',
-    'does_not_exist_var'=> 'Activo con etiqueta :asset_tag no encontrado.',
-    'no_tag' 	        => 'No se ha proporcionado ninguna etiqueta de activo.',
-    'does_not_exist_or_not_requestable' => 'Ese activo no existe o no es solicitable.',
-    'assoc_users'	 	=> 'Este activo está actualmente reservado a un usuario y no puede ser eliminado. Por favor, compruebe el activo primero y vuelva a intentarlo. ',
+    'undeployable' 		 => '<strong>Advertencia:</strong> Este activo actualmente está marcado como no utilizable. Si este estado ha cambiado, por favor, actualice el estado del activo.',
+    'does_not_exist' 	 => 'El recurso no existe.',
+    'does_not_exist_var' => 'Activo con placa :asset_tag no encontrado.',
+    'no_tag' 	         => 'No se ha proporcionado ninguna placa de activo.',
+    'does_not_exist_or_not_requestable' => 'Ese activo no existe o no puede ser solicitado.',
+    'assoc_users'	 	 => 'Actualmente este activo está asignado a un usuario y no puede ser eliminado. Por favor, primero ingrese el activo y vuelva a intentarlo. ',
     'warning_audit_date_mismatch' 	=> 'La próxima fecha de auditoría de este activo (:next_audit_date) es anterior a la última fecha de auditoría (:last_audit_date). Por favor, actualice la próxima fecha de auditoría.',
+    'labels_generated'   => 'Las etiquetas fueron generadas exitosamente.',
+    'error_generating_labels' => 'Error en la generación de etiquetas.',
+    'no_assets_selected' => 'No se han seleccionado activos.',
 
     'create' => [
         'error'   		=> 'El activo no fue creado, por favor, inténtelo de nuevo. :(',
-        'success' 		=> 'Equipo creado con éxito. :)',
-        'success_linked' => 'Activo con etiqueta :tag creado con éxito. <strong><a href=":link" style="color: white;">Haga clic aquí para ver</a></strong>.',
+        'success' 		=> 'Activo creado con éxito. :)',
+        'success_linked' => 'Activo con placa :tag creado con éxito. <strong><a href=":link" style="color: white;">Haga clic aquí para ver</a></strong>.',
+        'multi_success_linked' => 'Activo con etiqueta :links fue creado exitosamente.|:count activos fueron creados correctamente. :links.',
+        'partial_failure' => 'No se ha podido crear un activo: Motivo: :failures|No se pudieron crear :count activos. Motivos: :faiulres',
     ],
 
     'update' => [
-        'error'   			=> 'Equipo no actualizado, por favor inténtalo de nuevo',
+        'error'   			=> 'El activo no pudo ser actualizado, por favor inténtelo de nuevo',
         'success' 			=> 'Equipo actualizado correctamente.',
-        'encrypted_warning' => 'Activo actualizado con éxito, pero los campos personalizados cifrados no se debieron a permisos',
-        'nothing_updated'	=>  'No se seleccionaron campos, por lo que no se actualizó nada.',
-        'no_assets_selected'  =>  'Ningún recurso fue seleccionado, por lo que no se actualizó nada.',
+        'encrypted_warning' => 'El activo se actualizó correctamente, pero los campos personalizados cifrados no lo hicieron debido a los permisos',
+        'nothing_updated'	=>  'Ningún campo fue seleccionado, por lo que no se actualizó nada.',
+        'no_assets_selected'  =>  'Ningún activo fue seleccionado, por lo que no se actualizó nada.',
         'assets_do_not_exist_or_are_invalid' => 'Los activos seleccionados no se pueden actualizar.',
     ],
 
     'restore' => [
-        'error'   		=> 'Equipo no restaurado, por favor inténtalo de nuevo',
-        'success' 		=> 'Equipo restaurado con éxito.',
-        'bulk_success' 		=> 'Equipo restaurado con éxito.',
+        'error'   		=> 'El activo no fue restaurado, por favor inténtelo nuevamente',
+        'success' 		=> 'Activo restaurado exitosamente.',
+        'bulk_success' 		=> 'Activo restaurado exitosamente.',
         'nothing_updated'   => 'No se seleccionaron activos, por lo que no se restauró nada.', 
     ],
 
     'audit' => [
         'error'   		=> 'Auditoría de activos fallida: :error ',
-        'success' 		=> 'Auditoría de activos registrada con éxito.',
+        'success' 		=> 'Auditoría de activos registrada correctamente.',
     ],
 
 
     'deletefile' => [
-        'error'   => 'Archivo no eliminado. Vuelve a intentarlo.',
+        'error'   => 'Archivo no eliminado. Por favor inténtelo nuevamente.',
         'success' => 'Archivo eliminado correctamente.',
     ],
 
@@ -48,48 +52,58 @@ return [
         'error'   => 'Archivo(s) no cargado(s). Por favor, inténtelo nuevamente.',
         'success' => 'Archivo(s) cargado(s) exitosamente.',
         'nofiles' => 'No seleccionó ningún archivo para ser cargado, o el archivo que está tratando de cargar es demasiado grande',
-        'invalidfiles' => 'Uno o más de sus archivos es demasiado grande o es un tipo de archivo que no está permitido. Los tipos de archivo permitidos son png, gif, jpg, doc, docx, pdf y txt.',
+        'invalidfiles' => 'Uno o más de sus archivos son demasiado grandes o son de un tipo de archivo que no está permitido. Los tipos de archivo permitidos son png, gif, jpg, doc, docx, pdf y txt.',
     ],
 
     'import' => [
-        'error'                 => 'Algunos artículos no importaron correctamente.',
-        'errorDetail'           => 'Los siguientes artículos no fueron importados debido a errores.',
-        'success'               => 'Tu archivo ha sido importado',
+        'import_button'         => 'Importar',
+        'error'                 => 'Algunos elementos no se pudieron importar correctamente.',
+        'errorDetail'           => 'Los siguientes elementos no fueron importados debido a errores.',
+        'success'               => 'Su archivo ha sido importado',
         'file_delete_success'   => 'Su archivo se ha eliminado correctamente',
-        'file_delete_error'      => 'El archivo no pudo ser eliminado',
+        'file_delete_error'      => 'El archivo no se pudo eliminar',
         'file_missing' => 'Falta el archivo seleccionado',
+        'file_already_deleted' => 'El archivo seleccionado ya fue eliminado',
         'header_row_has_malformed_characters' => 'Uno o más atributos en la fila del encabezado contienen caracteres UTF-8 mal formados',
-        'content_row_has_malformed_characters' => 'Uno o más atributos en la primera fila de contenido contienen caracteres UTF-8 mal formados',
+        'content_row_has_malformed_characters' => 'Uno o más atributos en la primera fila contienen caracteres UTF-8 mal formados',
+        'transliterate_failure' => 'Transliteration from :encoding to UTF-8 failed due to invalid characters in input'
     ],
 
 
     'delete' => [
         'confirm'   	=> '¿Está seguro de que desea eliminar este activo?',
         'error'   		=> 'Hubo un problema al eliminar el activo. Por favor, inténtelo de nuevo.',
+        'assigned_to_error' => '{1}Asset Tag: :asset_tag is currently checked out. Check in this device before deletion.|[2,*]Asset Tags: :asset_tag are currently checked out. Check in these devices before deletion.',
         'nothing_updated'   => 'No se seleccionaron activos, por lo que no se eliminó nada.',
-        'success' 		=> 'El recurso se ha eliminado correctamente.',
+        'success' 		=> 'El activo se ha eliminado correctamente.',
     ],
 
     'checkout' => [
         'error'   		=> 'El activo no fue asignado, por favor inténtelo de nuevo',
-        'success' 		=> 'Equipo retirado con éxito.',
-        'user_does_not_exist' => 'Este usuario es inválido. Por favor, inténtalo de nuevo.',
-        'not_available' => '¡Ese equipo no está disponible para asignar!',
-        'no_assets_selected' => 'Debes seleccionar al menos un equipo de la lista',
+        'success' 		=> 'Equipo asignado correctamente.',
+        'user_does_not_exist' => 'Este usuario no es correcto. Por favor, inténtelo de nuevo.',
+        'not_available' => '¡Ese equipo no está disponible para ser asignado!',
+        'no_assets_selected' => 'Debe seleccionar al menos un activo de la lista',
+    ],
+
+    'multi-checkout' => [
+        'error'   => 'El activo no fue asignado, por favor, intente nuevamente|Los activos no fueron asignados, por favor, intente nuevamente',
+        'success' => 'El activo fue asignado correctamente|Los activos fueron asignados correctamente.',
     ],
 
     'checkin' => [
-        'error'   		=> 'El equipo no se pudo devolver, por favor inténtelo de nuevo',
-        'success' 		=> 'El activo fue devuelto exitosamente.',
-        'user_does_not_exist' => 'Es usuario no es correcto, por favor inténtelo de nuevo.',
-        'already_checked_in'  => 'El equipo ya ha sido devuelto.',
+        'error'   		=> 'El activo no se pudo ingresar, por favor inténtelo de nuevo',
+        'success' 		=> 'El activo fue ingresado exitosamente.',
+        'user_does_not_exist' => 'Este usuario no es correcto. Por favor, inténtelo de nuevo.',
+        'already_checked_in'  => 'El equipo ya ha sido recibido.',
 
     ],
 
     'requests' => [
-        'error'   		=> 'El equipo no pudo ser solicitado, por favor inténtalo de nuevo',
-        'success' 		=> 'El equipos fue solicitado exitosamente.',
-        'canceled'      => 'La solicitud de asignación fue cancelada de forma exitosa',
+        'error'   		=> 'Request was not successful, please try again.',
+        'success' 		=> 'Request successfully submitted.',
+        'canceled'      => 'Request successfully canceled.',
+        'cancel'        => 'Cancelar solicitud para este elemento',
     ],
 
 ];
diff --git a/resources/lang/es-CO/admin/hardware/table.php b/resources/lang/es-CO/admin/hardware/table.php
index 23132cee7a..3419d42bd2 100644
--- a/resources/lang/es-CO/admin/hardware/table.php
+++ b/resources/lang/es-CO/admin/hardware/table.php
@@ -2,20 +2,20 @@
 
 return [
 
-    'asset_tag'   	=> 'Etiqueta de equipo',
+    'asset_tag'   	=> 'Placa del activo',
     'asset_model'       => 'Modelo',
     'assigned_to'   => 'Asignado a',
     'book_value'  	=> 'Valor actual',
-    'change' 		=> 'Entrada/Salida',
-    'checkout_date' => 'Fecha de devolución',
+    'change' 		=> 'Operación',
+    'checkout_date' => 'Fecha de asignación',
     'checkoutto' 	=> 'Asignado a',
     'components_cost' => 'Coste total de componentes',
     'current_value' => 'Valor actual',
     'diff' 			=> 'Diferencia',
     'dl_csv' 		=> 'Descargar CSV',
-    'eol' 			=> 'Vida útil',
+    'eol' 			=> 'Fin de soporte (EOL)',
     'id'      		=> 'ID',
-    'last_checkin_date' => 'Última fecha de devolución',
+    'last_checkin_date' => 'Última fecha de ingreso',
     'location' 		=> 'Ubicación',
     'purchase_cost'	=> 'Precio',
     'purchase_date'	=> 'Comprado',
@@ -25,9 +25,8 @@ return [
     'image'		    => 'Imagen del dispositivo',
     'days_without_acceptance' => 'Días sin aceptación',
     'monthly_depreciation' => 'Depreciación mensual',
-    'assigned_to'    => 'Asignado a',
-    'requesting_user' => 'Solicitando usuario',
+    'requesting_user' => 'Usuario solicitante',
     'requested_date' => 'Fecha solicitada',
-    'changed'       => 'Cambiado',
-    'icon' => 'Icono',
+    'changed'       => 'Cambios',
+    'icon' => 'Ícono',
 ];
diff --git a/resources/lang/es-CO/admin/kits/general.php b/resources/lang/es-CO/admin/kits/general.php
index 81d3fae0b0..d1f9c313a3 100644
--- a/resources/lang/es-CO/admin/kits/general.php
+++ b/resources/lang/es-CO/admin/kits/general.php
@@ -1,50 +1,51 @@
 <?php
 
 return [
-    'about_kits_title'                  => 'Acerca de Kits predefinidos',
-    'about_kits_text'                   => 'Kits predefinidos le permiten revisar rápidamente una colección de elementos (activos, licencias, etc.) a un usuario. Esto puede ser útil cuando su proceso de incorporación es consistente entre muchos usuarios y todos los usuarios reciben los mismos artículos.',
-    'checkout'                          => 'Kit de pago ',
+    'about_kits_title'                  => 'Acerca de kits predefinidos',
+    'about_kits_text'                   => 'Los kits predefinidos le permiten rápidamente asignar un conjunto de elementos (activos, licencias, etc.) a un usuario. Esto puede ser útil cuando su proceso de incorporación de usuarios es similar para muchos usuarios y todos reciben los mismos elementos.',
+    'checkout'                          => 'Asignar kit ',
     'create_success'                    => 'Kit se ha creado correctamente.',
     'create'                            => 'Crear kit predefinido',
     'update'                            => 'Actualizar kit predefinido',
     'delete_success'                    => 'Kit eliminado correctamente.',
     'update_success'                    => 'Kit se ha actualizado correctamente.',
-    'none_models'                       => 'No hay suficientes recursos disponibles para :model para pagar. :qty son requeridos. ',
-    'none_licenses'                     => 'No hay suficientes asientos disponibles para :license para pagar. :qty son requeridos. ',
-    'none_consumables'                  => 'No hay suficientes unidades disponibles de :consumible para pagar. :qty son requeridas. ',
-    'none_accessory'                    => 'No hay suficientes unidades disponibles de :accesory para pagar. :qty son requeridas. ',
+    'none_models'                       => 'No hay suficientes activos disponibles de :model para asignar. Se requieren :qty. ',
+    'none_licenses'                     => 'No hay suficientes licencias disponibles de :license para asignar. Se requieren :qty. ',
+    'none_consumables'                  => 'No hay suficientes unidades disponibles de :consumable para asignar. Se requieren :qty. ',
+    'none_accessory'                    => 'No hay suficientes unidades disponibles de :accessory para asignar. Se requieren :qty. ',
     'append_accessory'                  => 'Añadir accesorio',
-    'update_appended_accessory'         => 'Actualizar accesorio adjunto',
+    'update_appended_accessory'         => 'Actualizar accesorio añadido',
     'append_consumable'                 => 'Añadir consumible',
-    'update_appended_consumable'        => 'Actualizar consumible adjunto',
+    'update_appended_consumable'        => 'Actualizar consumible añadido',
     'append_license'                    => 'Añadir licencia',
     'update_appended_license'           => 'Actualizar licencia añadida',
     'append_model'                      => 'Añadir modelo',
     'update_appended_model'             => 'Actualizar modelo añadido',
-    'license_error'                     => 'Licencia ya adjunta al kit',
+    'license_error'                     => 'Licencia ya vinculada al kit',
     'license_added_success'             => 'Licencia añadida correctamente',
-    'license_updated'                   => 'La licencia se ha actualizado correctamente',
+    'license_updated'                   => 'La licencia fue actualizada correctamente',
     'license_none'                      => 'La licencia no existe',
-    'license_detached'                  => 'Licencia fue separada con éxito',
+    'license_detached'                  => 'Licencia desvinculada correctamente',
     'consumable_added_success'          => 'Consumible añadido correctamente',
-    'consumable_updated'                => 'Consumible se ha actualizado correctamente',
+    'consumable_updated'                => 'El consumible fue actualizado correctamente',
     'consumable_error'                  => 'Consumible ya conectado al kit',
     'consumable_deleted'                => 'El borrado fue exitoso',
     'consumable_none'                   => 'El consumible no existe',
-    'consumable_detached'               => 'Consumible fue separado con éxito',
+    'consumable_detached'               => 'Consumible desvinculado correctamente',
     'accessory_added_success'           => 'Accesorio añadido correctamente',
-    'accessory_updated'                 => 'El accesorio se ha actualizado correctamente',
-    'accessory_detached'                => 'Accesorio fue separado con éxito',
-    'accessory_error'                   => 'El accesorio ya está conectado al kit',
+    'accessory_updated'                 => 'El accesorio fue actualizado correctamente',
+    'accessory_detached'                => 'Accesorio desvinculado correctamente',
+    'accessory_error'                   => 'El accesorio ya está vinculado al kit',
     'accessory_deleted'                 => 'El borrado fue exitoso',
     'accessory_none'                    => 'El accesorio no existe',
-    'checkout_success'                  => 'El pago fue exitoso',
-    'checkout_error'                    => 'Error de pago',
+    'checkout_success'                  => 'Asignación correcta',
+    'checkout_error'                    => 'Error al asignar',
     'kit_none'                          => 'El kit no existe',
     'kit_created'                       => 'Kit creado correctamente',
-    'kit_updated'                       => 'Kit actualizado correctamente',
+    'kit_updated'                       => 'El kit fue actualizado correctamente',
     'kit_not_found'                     => 'Kit no encontrado',
-    'kit_deleted'                       => 'Kit eliminado correctamente',
-    'kit_model_updated'                 => 'El modelo se ha actualizado correctamente',
-    'kit_model_detached'                => 'Modelo fue separado con éxito',
+    'kit_deleted'                       => 'El kit fue eliminado correctamente',
+    'kit_model_updated'                 => 'El modelo fue actualizado correctamente',
+    'kit_model_detached'                => 'El modelo fue desvinculado correctamente',
+    'model_already_attached'            => 'Modelo ya vinculado al kit',
 ];
diff --git a/resources/lang/es-CO/admin/labels/message.php b/resources/lang/es-CO/admin/labels/message.php
index 6f03c94699..f97118deb2 100644
--- a/resources/lang/es-CO/admin/labels/message.php
+++ b/resources/lang/es-CO/admin/labels/message.php
@@ -2,9 +2,9 @@
 
 return [
 
-    'invalid_return_count' => 'El recuento no es válido desde :name. Esperado :expected, tiene :actual.',
-    'invalid_return_type'  => 'Tipo no válido devuelto desde :name. Esperado :expected, obtuvo :actual.',
-    'invalid_return_value' => 'Valor no válido devuelto de :name. Esperado :expected, obtuvo :actual.',
+    'invalid_return_count' => 'Cantidad incorrecta devuelta por :name. Se esperaba :expected, obtenido :actual.',
+    'invalid_return_type'  => 'Tipo no válido devuelto por :name. Esperado :expected, obtenido :actual.',
+    'invalid_return_value' => 'Valor no válido devuelto por :name. Esperado :expected, obtenido :actual.',
 
     'does_not_exist' => 'La etiqueta no existe',
     
diff --git a/resources/lang/es-CO/admin/labels/table.php b/resources/lang/es-CO/admin/labels/table.php
index 9831a9551d..fab4d8f9db 100644
--- a/resources/lang/es-CO/admin/labels/table.php
+++ b/resources/lang/es-CO/admin/labels/table.php
@@ -3,14 +3,14 @@
 return [
     'example_company'    => 'Compañía de prueba limitada',
     'example_defaultloc' => 'Construcción 1',
-    'example_category'   => 'Probar categoría',
+    'example_category'   => 'Categoría de prueba',
     'example_location'   => 'Edificio 2',
     'example_manufacturer'  => 'Test Manufacturing Inc.',
     'example_model'      => 'Modelo de prueba',
     'example_supplier'   => 'Compañía de prueba limitada',
     'labels_per_page'    => 'Etiquetas',
     'support_fields'     => 'Campos',
-    'support_asset_tag'  => 'Etiqueta',
+    'support_asset_tag'  => 'Placa',
     'support_1d_barcode' => '1D',
     'support_2d_barcode' => '2D',
     'support_logo'       => 'Logo',
diff --git a/resources/lang/es-CO/admin/licenses/form.php b/resources/lang/es-CO/admin/licenses/form.php
index bf692e7405..fcb84c54b8 100644
--- a/resources/lang/es-CO/admin/licenses/form.php
+++ b/resources/lang/es-CO/admin/licenses/form.php
@@ -2,21 +2,21 @@
 
 return array(
 
-    'asset'             => 'Equipo',
-    'checkin'           => 'Devolver',
+    'asset'             => 'Activo',
+    'checkin'           => 'Ingresar',
     'create'            => 'Crear licencia',
-    'expiration'        => 'Fecha de caducidad',
+    'expiration'        => 'Fecha de vencimiento',
     'license_key'       => 'Clave del producto',
-    'maintained'        => 'Mantenido',
+    'maintained'        => 'Tiene mantenimiento',
     'name'              => 'Nombre del software',
     'no_depreciation'   => 'No depreciar',
     'purchase_order'    => 'Número de orden de compra',
     'reassignable'      => 'Reasignable',
-    'remaining_seats'   => 'Asientos restantes',
-    'seats'             => 'Asientos',
-    'termination_date'  => 'Fecha de Terminación',
-    'to_email'          => 'Licenciado a Email',
-    'to_name'           => 'Licenciado a Nombre',
-    'update'            => 'Actualizar Licencia',
+    'remaining_seats'   => 'Disponibles',
+    'seats'             => 'Total de licencias',
+    'termination_date'  => 'Fecha de finalización',
+    'to_email'          => 'Correo electrónico asociado a la licencia',
+    'to_name'           => 'Nombre de la persona asociada a la licencia',
+    'update'            => 'Actualizar licencia',
     'checkout_help'     => 'Debe asignar una licencia a un activo de hardware o a una persona. Puede seleccionar ambos, pero el propietario del activo debe coincidir con la persona a la que está asignado el activo.'
 );
diff --git a/resources/lang/es-CO/admin/licenses/general.php b/resources/lang/es-CO/admin/licenses/general.php
index 6b59e92068..b0d120339d 100644
--- a/resources/lang/es-CO/admin/licenses/general.php
+++ b/resources/lang/es-CO/admin/licenses/general.php
@@ -2,50 +2,51 @@
 
 return array(
     'about_licenses_title'      => 'Acerca de licencias',
-    'about_licenses'            => 'Las licencias se utilizan para rastrear software. Tienen un número específico de asientos que pueden ser revisados a individuos',
-    'checkin'  					=> 'Comprobar licencia',
-    'checkout_history'  		=> 'Historial de pago',
-    'checkout'  				=> 'Comprobar licencia Seat',
-    'edit'  					=> 'Editar Licencia',
+    'about_licenses'            => 'Las licencias se utilizan para hacer un seguimiento del software.  Tienen una cantidad determinada que puede ser asignada a individuos',
+    'checkin'  					=> 'Ingresar licencia',
+    'checkout_history'  		=> 'Historial de asignaciones',
+    'checkout'  				=> 'Asignar licencia',
+    'edit'  					=> 'Editar licencia',
     'filetype_info'				=> 'Los tipos de archivo permitidos son png, gif, jpg, jpeg, doc, docx, pdf, txt, zip, y rar.',
     'clone'  					=> 'Clonar licencia',
     'history_for'  				=> 'Historial para ',
     'in_out'  					=> 'Entrada/Salida',
     'info'  					=> 'Información de licencia',
-    'license_seats'  			=> 'Asientos de licencia',
-    'seat'  					=> 'Comer',
-    'seats'  					=> 'Asientos',
+    'license_seats'  			=> 'Total de licencias',
+    'seat'  					=> 'Licencia',
+    'seat_count'  				=> 'Licencia :count',
+    'seats'  					=> 'Total de licencias',
     'software_licenses'  		=> 'Licencias de software',
     'user'  					=> 'Usuario',
-    'view'  					=> 'Ver Licencia',
-    'delete_disabled'           => 'Esta licencia no se puede eliminar aún porque algunos asientos todavía están retirados.',
+    'view'  					=> 'Ver licencia',
+    'delete_disabled'           => 'Esta licencia no se puede eliminar porque todavía está asignada.',
     'bulk'                      =>
         [
             'checkin_all'           => [
-                'button'            => 'Comprobar todos los asientos',
-                'modal'             => 'Esto activará el checkin de un asiento. | Esta acción registrará todos los asientos :checkedout_seats_count para esta licencia.',
-                'enabled_tooltip'   => 'Checkin TODOS los asientos para esta licencia tanto de usuarios como de activos',
-                'disabled_tooltip'  => 'Esto está deshabilitado porque no hay asientos seleccionados actualmente',
+                'button'            => 'Ingresar todas las licencias',
+                'modal'             => 'Esta acción ingresará una licencia. | Esta acción ingresará todas las :checkedout_seats_count licencias.',
+                'enabled_tooltip'   => 'Recibir TODAS las licencias tanto de usuarios como de activos',
+                'disabled_tooltip'  => 'Esto está deshabilitado porque no hay licencias asignadas actualmente',
                 'disabled_tooltip_reassignable'  => 'Esto está desactivado porque la licencia no es reasignable',
-                'success'           => '¡Licencia registrada con éxito! | ¡Todas las licencias fueron registradas con éxito!',
-                'log_msg'           => 'Check-in a través de pago de licencia en licencia GUI',
+                'success'           => '¡Licencia recibida correctamente! | ¡Todas las licencias fueron recibidas correctamente!',
+                'log_msg'           => 'Ingresada mediante ingreso masivo en página de licencias',
             ],
 
             'checkout_all'              => [
-                'button'                => 'Salir todos los asientos',
-                'modal'                 => 'Esta acción comprobará un asiento para el primer usuario disponible. | Esta acción verificará todos los asientos :available_seats_count para los primeros usuarios disponibles. Se considera que un usuario está disponible para este asiento si aún no tiene esta licencia revisada para ellos, y la propiedad Auto-Asignación de Licencia está habilitada en su cuenta de usuario.',
-                'enabled_tooltip'   => 'Checkout TODOS los asientos (o tantos como estén disponibles) para TODOS los usuarios',
-                'disabled_tooltip'  => 'Esto está deshabilitado porque no hay asientos disponibles actualmente',
-                'success'           => '¡Licencia retirada con éxito! | ¡Licencias :count fueron retiradas con éxito!',
-                'error_no_seats'    => 'No quedan plazas restantes para esta licencia.',
-                'warn_not_enough_seats'    => ':count usuarios fueron asignados a esta licencia, pero nos quedamos sin plazas de licencia disponibles.',
+                'button'                => 'Asignar todas las licencias',
+                'modal'                 => 'Esta acción asignará una licencia para el primer usuario disponible. | Esta acción asignará todas las :available_seats_count licencias a los primeros usuarios disponibles. Se considera que un usuario está disponible si aún no tiene esta licencia asignada y la propiedad "Autoasignación de licencia" está habilitada en su cuenta de usuario.',
+                'enabled_tooltip'   => 'Asignar TODAS las licencias (o tantas como estén disponibles) para TODOS los usuarios',
+                'disabled_tooltip'  => 'Esto está deshabilitado porque actualmente no hay licencias disponibles',
+                'success'           => '¡Licencia asignada exitosamente! | ¡Licencias :count asignadas exitosamente!',
+                'error_no_seats'    => 'No quedan licencias disponibles.',
+                'warn_not_enough_seats'    => 'Se asignaron :count usuarios a esta licencia, y se agotaron las licencias disponibles.',
                 'warn_no_avail_users'    => 'Nada que hacer. No hay usuarios que no tengan esta licencia asignada.',
-                'log_msg'           => 'Checado mediante pago masivo de licencia en GUI licencia',
+                'log_msg'           => 'Asignada vía asignación masiva en página de licencias',
 
 
             ],
     ],
 
-    'below_threshold' => 'Solo quedan :remaining_count asientos para esta licencia con una cantidad mínima de :min_amt. Puede considerar comprar más asientos.',
+    'below_threshold' => 'Solo quedan :remaining_count licencias y su cantidad mínima es de :min_amt. Puede que desee considerar la compra de más licencias.',
     'below_threshold_short' => 'Este artículo está por debajo de la cantidad mínima requerida.',
 );
diff --git a/resources/lang/es-CO/admin/licenses/message.php b/resources/lang/es-CO/admin/licenses/message.php
index d8b2666ae8..059af6f348 100644
--- a/resources/lang/es-CO/admin/licenses/message.php
+++ b/resources/lang/es-CO/admin/licenses/message.php
@@ -4,51 +4,54 @@ return array(
 
     'does_not_exist' => 'La licencia no existe o no tiene permiso para verla.',
     'user_does_not_exist' => 'El usuario no existe o no tiene permiso para verlos.',
-    'asset_does_not_exist' 	=> 'El activo que está intentando asociar con esta licencia no existe.',
+    'asset_does_not_exist' 	=> 'El activo que intenta asociar con esta licencia no existe.',
     'owner_doesnt_match_asset' => 'El activo que está intentando asignar con esta licencia está asignado a un usuario diferente al de la persona seleccionada de la lista.',
-    'assoc_users'	 => 'Esta licencia está actualmente reservada a un usuario y no puede ser eliminada. Por favor, compruebe la licencia en primer lugar y vuelva a intentarlo. ',
+    'assoc_users'	 => 'Esta licencia está actualmente asignada a un usuario y no puede ser eliminada. Por favor, reciba primero la licencia y vuelva a intentarlo. ',
     'select_asset_or_person' => 'Debe seleccionar un activo o un usuario, pero no ambos.',
     'not_found' => 'Licencia no encontrada',
-    'seats_available' => ':seat_count plazas disponibles',
+    'seats_available' => ':seat_count disponibles',
 
 
     'create' => array(
-        'error'   => 'La licencia no fue creada, por favor inténtalo de nuevo.',
-        'success' => 'Licencia creada con éxito.'
+        'error'   => 'La licencia no fue creada, por favor inténtelo de nuevo.',
+        'success' => 'Categoría creada correctamente.'
     ),
 
     'deletefile' => array(
-        'error'   => 'Archivo no eliminado. Vuelve a intentarlo.',
+        'error'   => 'Archivo no eliminado. Por favor, vuelva a intentarlo.',
         'success' => 'Archivo eliminado correctamente.',
     ),
 
     'upload' => array(
-        'error'   => 'Archivo(s) no cargados. Por favor, inténtelo de nuevo.',
+        'error'   => 'Archivo(s) no cargado(s). Por favor, inténtelo de nuevo.',
         'success' => 'Archivo(s) cargados correctamente.',
         'nofiles' => 'No seleccionó ningún archivo para ser cargado, o el archivo que seleccionó es demasiado grande',
         'invalidfiles' => 'Uno o más de sus archivos es demasiado grande o es un tipo de archivo que no está permitido. Los tipos de archivo permitidos son png, gif, jpg, jpeg, doc, docx, pdf, txt, zip, rar, rtf, xml y lic.',
     ),
 
     'update' => array(
-        'error'   => 'La licencia no fue actualizada, por favor inténtalo de nuevo',
+        'error'   => 'La licencia no fue actualizada, por favor inténtelo de nuevo',
         'success' => 'Licencia actualizada correctamente.'
     ),
 
     'delete' => array(
         'confirm'   => '¿Está seguro de que desea eliminar esta licencia?',
-        'error'   => 'Hubo un problema al eliminar la licencia. Por favor, inténtalo de nuevo.',
+        'error'   => 'Hubo un problema al eliminar la licencia. Por favor, inténtelo de nuevo.',
         'success' => 'La licencia se ha eliminado correctamente.'
     ),
 
     'checkout' => array(
-        'error'   => 'Hubo un problema al revisar la licencia. Por favor, inténtalo de nuevo.',
-        'success' => 'La licencia fue retirada con éxito',
-        'not_enough_seats' => 'No hay suficientes asientos de licencia disponibles para la compra',
+        'error'   => 'Hubo un problema asignando la licencia. Por favor, inténtelo de nuevo.',
+        'success' => 'La licencia fue asignada con éxito',
+        'not_enough_seats' => 'No hay suficientes licencias disponibles para asignar',
+        'mismatch' => 'La licencia proporcionada no coincide con la licencia seleccionada',
+        'unavailable' => 'Esta licencia no está disponible para ser asignada.',
     ),
 
     'checkin' => array(
-        'error'   => 'Hubo un problema devolviendo la licencia. Por favor, inténtalo de nuevo.',
-        'success' => 'La licencia fue registrada con éxito'
+        'error'   => 'Hubo un problema ingresando la licencia. Por favor, inténtelo de nuevo.',
+        'not_reassignable' => 'La licencia no se puede volver a asignar',
+        'success' => 'La licencia fue ingresada correctamente'
     ),
 
 );
diff --git a/resources/lang/es-CO/admin/licenses/table.php b/resources/lang/es-CO/admin/licenses/table.php
index 575201c9fc..6413ef9e71 100644
--- a/resources/lang/es-CO/admin/licenses/table.php
+++ b/resources/lang/es-CO/admin/licenses/table.php
@@ -6,11 +6,11 @@ return array(
     'checkout'   		=> 'Entrada/Salida',
     'deleted_at'        => 'Eliminado el',
     'id'      			=> 'ID',
-    'license_email'   	=> 'Email de licencia',
+    'license_email'   	=> 'Correo electrónico de la licencia',
     'license_name'   	=> 'Licenciado a',
     'purchase_date'   	=> 'Fecha de compra',
     'purchased'   		=> 'Comprado',
-    'seats'   			=> 'Asientos',
+    'seats'   			=> 'Total de licencias',
     'hardware'   		=> 'Hardware',
     'serial'   			=> 'Número de serie',
     'title'      		=> 'Licencia',
diff --git a/resources/lang/es-CO/admin/locations/message.php b/resources/lang/es-CO/admin/locations/message.php
index ab148a54b6..34e02a05a5 100644
--- a/resources/lang/es-CO/admin/locations/message.php
+++ b/resources/lang/es-CO/admin/locations/message.php
@@ -3,15 +3,16 @@
 return array(
 
     'does_not_exist' => 'La ubicación no existe.',
-    'assoc_users'    => 'This location is not currently deletable because it is the location of record for at least one asset or user, has assets assigned to it, or is the parent location of another location. Please update your models to no longer reference this company and try again. ',
+    'assoc_users'    => 'Esta ubicación no se puede eliminar actualmente porque es la ubicación de al menos un activo o usuario, tiene activos asignados o es la ubicación padre de otra ubicación. Por favor, actualice sus registros para que ya no hagan referencia a esta ubicación e inténtalo de nuevo ',
     'assoc_assets'	 => 'Esta ubicación está actualmente asociada con al menos un activo y no puede ser eliminada. Por favor actualice sus activos para que ya no hagan referencia a esta ubicación e inténtelo de nuevo. ',
     'assoc_child_loc'	 => 'Esta ubicación es actualmente el padre de al menos una ubicación hija y no puede ser eliminada.   Por favor actualice sus ubicaciones para que ya no hagan referencia a esta ubicación e inténtelo de nuevo. ',
-    'assigned_assets' => 'Recursos asignados',
+    'assigned_assets' => 'Activos asignados',
     'current_location' => 'Ubicación actual',
+    'open_map' => 'Abrir en mapas :map_provider_icon',
 
 
     'create' => array(
-        'error'   => 'La ubicación no pudo ser creada, por favor inténtalo de nuevo.',
+        'error'   => 'La ubicación no pudo ser creada, por favor, inténtelo de nuevo.',
         'success' => 'La ubicación fue creada exitosamente.'
     ),
 
@@ -20,6 +21,11 @@ return array(
         'success' => 'La ubicación fue actualizada exitosamente.'
     ),
 
+    'restore' => array(
+        'error'   => 'No se ha restaurado la ubicación, inténtelo de nuevo',
+        'success' => 'La ubicación fue restaurada exitosamente.'
+    ),
+
     'delete' => array(
         'confirm'   	=> '¿Está seguro de que desea eliminar esta ubicación?',
         'error'   => 'Hubo un problema eliminando la ubicación. Por favor, inténtelo de nuevo.',
diff --git a/resources/lang/es-CO/admin/locations/table.php b/resources/lang/es-CO/admin/locations/table.php
index 99add9c8e0..790e6b0b2e 100644
--- a/resources/lang/es-CO/admin/locations/table.php
+++ b/resources/lang/es-CO/admin/locations/table.php
@@ -1,8 +1,8 @@
 <?php
 
 return [
-    'about_locations_title'     => 'Acerca de Ubicaciones',
-    'about_locations'           => 'Las ubicaciones son utilizadas para hacer seguimiento de la información sobre ubicación de usuarios, activos, y otros ítems',
+    'about_locations_title'     => 'Acerca de las ubicaciones',
+    'about_locations'           => 'Las ubicaciones se utilizan para hacer un seguimiento de la ubicación de usuarios, activos y otros elementos',
     'assets_rtd'                => 'Activos', // This has NEVER meant Assets Retired. I don't know how it keeps getting reverted.
     'assets_checkedout'         => 'Activos asignados',
     'id'                        => 'ID',
@@ -24,7 +24,7 @@ return [
     'user_name'                 => 'Usuario',
     'department'                => 'Departamento',
     'location'                  => 'Ubicación',
-    'asset_tag'                 => 'Etiqueta de recursos',
+    'asset_tag'                 => 'Placa del activo',
     'asset_name'                => 'Nombre',
     'asset_category'            => 'Categoría',
     'asset_manufacturer'        => 'Fabricante',
@@ -35,8 +35,9 @@ return [
     'asset_expected_checkin'    => 'Fecha esperada de devolución',
     'date'                      => 'Fecha:',
     'phone'                     => 'Teléfono ubicación',
-    'signed_by_asset_auditor'   => 'Firmado por (Juego de Acciones):',
-    'signed_by_finance_auditor' => 'Firmado por (Monitor de Finanzas):',
-    'signed_by_location_manager' => 'Firmado por (Administrador de ubicación):',
+    'signed_by_asset_auditor'   => 'Firmado por (Auditor de Activos):',
+    'signed_by_finance_auditor' => 'Firmado por (Auditor de Finanzas):',
+    'signed_by_location_manager' => 'Firmado por (Supervisor de la ubicación):',
     'signed_by'                 => 'Firmado por:',
+    'clone'  					=> 'Clone Location',
 ];
diff --git a/resources/lang/es-CO/admin/manufacturers/message.php b/resources/lang/es-CO/admin/manufacturers/message.php
index a6001d158e..4e25322f0c 100644
--- a/resources/lang/es-CO/admin/manufacturers/message.php
+++ b/resources/lang/es-CO/admin/manufacturers/message.php
@@ -2,28 +2,28 @@
 
 return array(
 
-    'support_url_help' => 'Variables <code>{LOCALE}</code>, <code>{SERIAL}</code>, <code>{MODEL_NUMBER}</code>, y <code>{MODEL_NAME}</code> se puede utilizar en tu URL para que esos valores se llenen automáticamente al ver los activos - por ejemplo https://checkcoverage. pple.com/{LOCALE}/{SERIAL}.',
+    'support_url_help' => 'Variables <code>{LOCALE}</code>, <code>{SERIAL}</code>, <code>{MODEL_NUMBER}</code>, y <code>{MODEL_NAME}</code> se pueden utilizar en su URL para que esos valores se llenen automáticamente al ver los activos - por ejemplo https://checkcoverage. pple.com/{LOCALE}/{SERIAL}.',
     'does_not_exist' => 'El fabricante no existe.',
     'assoc_users'	 => 'Este fabricante está actualmente asociado con al menos un modelo y no se puede eliminar. Por favor, actualice sus modelos para dejar de hacer referencia a este fabricante y vuelva a intentarlo. ',
 
     'create' => array(
-        'error'   => 'El fabricante no ha sido creado, por favor inténtelo de nuevo.',
-        'success' => 'Fabricante creado con éxito.'
+        'error'   => 'El fabricante no fue creado, por favor inténtelo de nuevo.',
+        'success' => 'Fabricante creado exitosamente.'
     ),
 
     'update' => array(
-        'error'   => 'El fabricante no ha sido actualizado, por favor inténtalo de nuevo',
-        'success' => 'El fabricante se ha actualizado correctamente.'
+        'error'   => 'El fabricante no fue actualizado, por favor, inténtelo de nuevo',
+        'success' => 'El fabricante se ha actualizado exitosamente.'
     ),
 
     'restore' => array(
-        'error'   => 'El fabricante no ha sido restaurado, por favor inténtalo de nuevo',
-        'success' => 'Fabricante restaurado con éxito.'
+        'error'   => 'El fabricante no fue restaurado, por favor, inténtelo de nuevo',
+        'success' => 'El fabricante fue restaurado exitosamente.'
     ),
 
     'delete' => array(
         'confirm'   => '¿Está seguro de que desea eliminar este fabricante?',
-        'error'   => 'Hubo un problema al eliminar el fabricante. Por favor, inténtelo de nuevo.',
+        'error'   => 'Ocurrió un problema eliminando el fabricante. Por favor, intente nuevamente.',
         'success' => 'El fabricante se ha eliminado correctamente.'
     )
 
diff --git a/resources/lang/es-CO/admin/manufacturers/table.php b/resources/lang/es-CO/admin/manufacturers/table.php
index 2cc8948c3f..e2c4bef88e 100644
--- a/resources/lang/es-CO/admin/manufacturers/table.php
+++ b/resources/lang/es-CO/admin/manufacturers/table.php
@@ -1,16 +1,16 @@
 <?php
 
 return array(
-    'about_manufacturers_title'    => 'Acerca de fabricantes',
+    'about_manufacturers_title'    => 'Sobre los fabricantes',
     'about_manufacturers_text'  => 'Los fabricantes son las empresas que crean sus activos. Aquí puede almacenar importante información de contacto para soporte, la cual se mostrará en las páginas de detalle de sus activos.',
     'asset_manufacturers'	=> 'Fabricantes de activos',
     'create'				=> 'Crear fabricante',
     'id'   					=> 'ID',
     'name'      			=> 'Nombre',
-    'support_email'   		=> 'Email de soporte',
+    'support_email'   		=> 'Correo electrónico de soporte',
     'support_phone'   		=> 'Teléfono de soporte',
     'support_url'   		=> 'URL de soporte',
     'warranty_lookup_url'   => 'URL de búsqueda de garantía',
-    'update'				=> 'Actualizar Manufacturer',
+    'update'				=> 'Actualizar fabricante',
 
 );
diff --git a/resources/lang/es-CO/admin/models/general.php b/resources/lang/es-CO/admin/models/general.php
index 8ba0441f45..bfacb43c27 100644
--- a/resources/lang/es-CO/admin/models/general.php
+++ b/resources/lang/es-CO/admin/models/general.php
@@ -1,18 +1,18 @@
 <?php
 
 return array(
-    'about_models_title'     => 'Acerca de Modelos de Activos',
+    'about_models_title'     => 'Acerca de los modelos de activos',
     'about_models_text'           => 'Los modelos de activos son una forma de agrupar activos idénticos. "MBP 2013", "IPhone 6s", etc.',
-    'deleted'  					        => 'Este modelo ha sido eliminado.',
-    'bulk_delete'               => 'Eliminar Modelos de Activos',
+    'deleted'  					=> 'Este modelo ha sido eliminado.',
+    'bulk_delete'               => 'Eliminación masiva de modelos de activos',
     'bulk_delete_help'               => 'Utilice las casillas a continuación para confirmar la eliminación de los modelos de activos seleccionados. Los modelos de activos que tienen activos asociados a ellos no se pueden eliminar hasta que los activos estén asociados con un modelo diferente.',
     'bulk_delete_warn'          => 'Está a punto de eliminar un modelo de activo.|Está a punto de eliminar :model_count modelos de activos.',
     'restore'                   => 'Restaurar modelo',
     'requestable'               => 'Los usuarios pueden solicitar este modelo',
-	'show_mac_address'			      => 'Mostrar campo de dirección MAC en los activos de este modelo',
-    'view_deleted'              => 'Vista eliminada',
+	'show_mac_address'			      => 'Mostrar el campo de dirección MAC en los activos de este modelo',
+    'view_deleted'              => 'Ver borrados',
     'view_models'               => 'Ver modelos',
-    'fieldset'                  => 'Grupos de campo',
+    'fieldset'                  => 'Grupo de campos',
     'no_custom_field'           => 'No hay campos personalizados',
-    'add_default_values'        => 'Añadir valores por defecto',
+    'add_default_values'        => 'Agregar valores predeterminados',
 );
diff --git a/resources/lang/es-CO/admin/models/message.php b/resources/lang/es-CO/admin/models/message.php
index 6b67b03ec3..366da96779 100644
--- a/resources/lang/es-CO/admin/models/message.php
+++ b/resources/lang/es-CO/admin/models/message.php
@@ -2,21 +2,21 @@
 
 return array(
 
-    'deleted' => 'Modelo de recurso eliminado',
+    'deleted' => 'Se eliminó el modelo del activo',
     'does_not_exist' => 'Modelo inexistente.',
-    'no_association' => '¡ATENCIÓN! ¡El modelo de activo para este artículo no es válido o falta!',
-    'no_association_fix' => 'Esto romperá cosas de formas extrañas y horribles. Edite este activo ahora para asignarle un modelo.',
-    'assoc_users'	 => 'Este modelo está asociado a uno o más equipos actualmente, por lo que no puede ser eliminado. Por favor elimina los equipos asociados, e inténtalo de nuevo. ',
-
+    'no_association' => '¡ADVERTENCIA! ¡El modelo de activo para este artículo no es válido o no existe!',
+    'no_association_fix' => 'Esto causará problemas raros y horribles. Edite este activo ahora para asignarle un modelo.',
+    'assoc_users'	 => 'Este modelo está asociado a uno o más activos y no puede ser eliminado. Por favor, elimine los activos y vuelva a intentarlo. ',
+    'invalid_category_type' => 'El tipo de esta categoría debe ser categoría de activos.',
 
     'create' => array(
-        'error'   => 'El modelo no fue creado, por favor inténtalo de nuevo.',
+        'error'   => 'El modelo no fue creado, por favor inténtelo de nuevo.',
         'success' => 'El modelo fue creado exitosamente.',
-        'duplicate_set' => 'Ya existe un modelo de equipo con el mismo nombre, fabricante y número de modelo.',
+        'duplicate_set' => 'Ya existe un modelo de activo con el mismo nombre, fabricante y número de modelo.',
     ),
 
     'update' => array(
-        'error'   => 'El modelo no pudo ser actualizado, por favor inténtalo de nuevo',
+        'error'   => 'El modelo no pudo ser actualizado, por favor inténtelo de nuevo',
         'success' => 'El modelo fue actualizado exitosamente.',
     ),
 
@@ -27,12 +27,12 @@ return array(
     ),
 
     'restore' => array(
-        'error'   		=> 'El modelo no pudo ser restaurado, por favor inténtalo de nuevo',
+        'error'   		=> 'El modelo no fue restaurado, por favor intente nuevamente',
         'success' 		=> 'El modelo fue restaurado exitosamente.'
     ),
 
     'bulkedit' => array(
-        'error'   		=> 'Ningún campo ha cambiado, no hay nada que actualizar.',
+        'error'   		=> 'Ningún cambio fue cambiado, así que nada se actualizó.',
         'success' 		=> 'Modelo actualizado correctamente. |:model_count modelos actualizados correctamente.',
         'warn'          => 'Está a punto de actualizar las propiedades del siguiente modelo:|Está a punto de editar las propiedades de los siguientes :model_count modelos:',
 
@@ -41,7 +41,7 @@ return array(
     'bulkdelete' => array(
         'error'   		    => 'Ningún modelo fue seleccionado, no se eliminó nada.',
         'success' 		    => 'Modelo eliminado!|:success_count modelos eliminados!',
-        'success_partial' 	=> ':success_count modelos fueron eliminados, sin embargo, :fail_count no pudieron ser eliminados debido a que aún tienen equipos asociados a ellos.'
+        'success_partial' 	=> ':success_count modelo(s) fueron eliminados, sin embargo, :fail_count no pudieron ser eliminados debido a que aún tienen activos asociados a ellos.'
     ),
 
 );
diff --git a/resources/lang/es-CO/admin/models/table.php b/resources/lang/es-CO/admin/models/table.php
index 881b1e463b..312944b9cd 100644
--- a/resources/lang/es-CO/admin/models/table.php
+++ b/resources/lang/es-CO/admin/models/table.php
@@ -2,16 +2,16 @@
 
 return array(
 
-    'create'				=> 'Crear Modelo de Equipo',
+    'create'				=> 'Crear modelo de activo',
     'created_at' 			=> 'Creado el',
-    'eol'	 				=> 'Vida útil',
-    'modelnumber'   		=> 'Modelo Nro.',
+    'eol'	 				=> 'Fin de soporte (EOL)',
+    'modelnumber'   		=> 'Modelo No.',
     'name'      			=> 'Nombre del modelo de activo',
-    'numassets' 			=> 'Equipos',
-    'title'					=> 'Modelos de equipo',
+    'numassets' 			=> 'Activos',
+    'title'					=> 'Modelos de activos',
     'update'				=> 'Actualizar modelo de activo',
-    'view'					=> 'Ver Modelo de Equipo',
+    'view'					=> 'Ver modelo de activo',
     'update'				=> 'Actualizar modelo de activo',
-    'clone'				=> 'Clonar Modelo',
-    'edit'				=> 'Editar Modelo',
+    'clone'				=> 'Clonar modelo',
+    'edit'				=> 'Editar modelo',
 );
diff --git a/resources/lang/es-CO/admin/reports/general.php b/resources/lang/es-CO/admin/reports/general.php
index 8d017d7daa..510fbbe4e2 100644
--- a/resources/lang/es-CO/admin/reports/general.php
+++ b/resources/lang/es-CO/admin/reports/general.php
@@ -1,17 +1,23 @@
 <?php
 
 return [
-    'info'   => 'Seleccione las opciones que desea para su informe de activos.',
+    'info'   => 'Seleccione las opciones que desee para su informe de activos.',
     'deleted_user' => 'Usuario eliminado',
     'send_reminder' => 'Enviar recordatorio',
+    'cannot_send_reminder' => 'User has been deleted or does not have an email address so cannot receive a reminder',
     'reminder_sent' => 'Recordatorio enviado',
     'acceptance_deleted' => 'Solicitud de aceptación eliminada',
     'acceptance_request' => 'Solicitud de aceptación',
     'custom_export' => [
         'user_address' => 'Dirección de usuario',
-        'user_city' => 'Ciudad del Usuario',
+        'user_city' => 'Ciudad del usuario',
         'user_state' => 'Estado del usuario',
-        'user_country' => 'País de usuario',
-        'user_zip' => 'Usuario Zip'
-    ]
-];
\ No newline at end of file
+        'user_country' => 'País del usuario',
+        'user_zip' => 'Código postal del usuario'
+    ],
+    'open_saved_template' => 'Abrir plantilla guardada',
+    'save_template' =>  'Guardar plantilla',
+    'select_a_template' => 'Seleccione una plantilla',
+    'template_name' => 'Nombre de la plantilla',
+    'update_template' => 'Actualizar plantilla',
+];
diff --git a/resources/lang/es-CO/admin/reports/message.php b/resources/lang/es-CO/admin/reports/message.php
index dcd9c52741..a1c4522eba 100644
--- a/resources/lang/es-CO/admin/reports/message.php
+++ b/resources/lang/es-CO/admin/reports/message.php
@@ -1,5 +1,16 @@
 <?php
 
-return array(
-    'error'   => 'Debe seleccionar al menos UNA opción.'
-);
+return [
+    'about_templates' => 'Acerca de las plantillas guardadas',
+    'saving_templates_description' => 'Seleccione sus opciones, luego ingrese el nombre de su plantilla en el campo de arriba y haga clic en el botón \'Guardar plantilla\'. Use la lista desplegable para seleccionar una plantilla guardada previamente.',
+    'create'  => [
+        'success' => 'Plantilla guardada exitosamente',
+    ],
+    'update' => [
+        'success' => 'Plantilla actualizada exitosamente',
+    ],
+    'delete' => [
+        'success' => 'Plantilla eliminada',
+        'no_delete_permission' => 'La plantilla no existe o no tiene permisos para eliminarla.',
+    ],
+];
diff --git a/resources/lang/es-CO/admin/settings/general.php b/resources/lang/es-CO/admin/settings/general.php
index 4010a7ff39..50fbb6f616 100644
--- a/resources/lang/es-CO/admin/settings/general.php
+++ b/resources/lang/es-CO/admin/settings/general.php
@@ -3,159 +3,168 @@
 return [
     'ad'				        => 'Directorio activo',
     'ad_domain'				    => 'Dominio de directorio activo',
-    'ad_domain_help'			=> 'Esto es a veces el mismo que tu dominio de correo electrónico, pero no siempre.',
+    'ad_domain_help'			=> 'Algunas veces coincide con el dominio de su correo electrónico, pero no siempre.',
     'ad_append_domain_label'    => 'Añadir nombre de dominio',
     'ad_append_domain'          => 'Añadir nombre de dominio al campo de nombre de usuario',
-    'ad_append_domain_help'     => 'El usuario no necesita escribir "username@domain.local", puede escribir únicamente "username".',
+    'ad_append_domain_help'     => 'El usuario no necesita escribir "usuario@dominio.local", puede escribir únicamente "usuario".',
     'admin_cc_email'            => 'Copiar en correo electrónico',
-    'admin_cc_email_help'       => 'Si desea enviar una copia de los correos electrónicos de devolución/asignación que se envían a los usuarios a una cuenta de correo electrónico adicional, escríbala aquí. De lo contrario, deje este campo en blanco.',
+    'admin_cc_email_help'       => 'Send a copy of checkin/checkout emails to this address.',
     'admin_settings'            => 'Configuración de administración',
     'is_ad'				        => 'Este es un servidor de Active Directory',
     'alerts'                	=> 'Alertas',
     'alert_title'               => 'Actualizar ajustes de notificación',
     'alert_email'				=> 'Enviar alertas a',
-    'alert_email_help'    => 'Direcciones de correo electrónico o listas de distribución a las que desea que se envíen alertas separadas por comas',
-    'alerts_enabled'			=> 'Alertas de email habilitadas',
-    'alert_interval'			=> 'Umbral de alertas de caducidad (en días)',
-    'alert_inv_threshold'		=> 'Umbral de alerta de inventario',
-    'allow_user_skin'           => 'Permitir Skin de usuario',
-    'allow_user_skin_help_text' => 'Marcar esta casilla permitirá a un usuario reemplazar la apariencia de la interfaz de usuario con una diferente.',
-    'asset_ids'					=> 'Asset IDs',
+    'alert_email_help'          => 'Direcciones de correo electrónico o listas de distribución a las que desea que se envíen alertas separadas por comas.',
+    'alerts_enabled'			=> 'Alertas de correo electrónico habilitadas',
+    'alert_interval'			=> 'Umbral para las alertas de caducidad (en días)',
+    'alert_inv_threshold'		=> 'Umbral para alerta de inventario',
+    'allow_user_skin'           => 'Permitir al usuario cambiar la apariencia',
+    'allow_user_skin_help_text' => 'Si se marca esta casilla, el usuario podrá reemplazar la apariencia de la interfaz con una diferente.',
+    'asset_ids'					=> 'Códigos de los activos',
     'audit_interval'            => 'Intervalo de auditoría',
     'audit_interval_help'       => 'Si está obligado a auditar físicamente sus activos con regularidad, introduzca el intervalo en meses que utilice. Si actualiza este valor, se actualizarán todas las "próximas fechas de auditoría" de los activos con una fecha de auditoría próxima.',
-    'audit_warning_days'        => 'Umbral de advertencia de auditoría',
+    'audit_warning_days'        => 'Umbral para aviso de auditoría',
     'audit_warning_days_help'   => '¿Con cuántos días de antelación es necesario avisar que se deben auditar los activos?',
-    'auto_increment_assets'		=> 'Generar etiquetas de activos que incrementan automáticamente',
+    'auto_increment_assets'		=> 'Generar incremento automático en las placas de activos',
     'auto_increment_prefix'		=> 'Prefijo (opcional)',
-    'auto_incrementing_help'    => 'Habilitar etiquetas de activos auto-incrementantes primero para establecer esto',
+    'auto_incrementing_help'    => 'Habilite primero el incremento automático de las placas de activos antes de configurar esto',
     'backups'					=> 'Copias de seguridad',
     'backups_help'              => 'Crear, descargar y restaurar copias de seguridad ',
     'backups_restoring'         => 'Restaurando desde la copia de seguridad',
+    'backups_clean' => 'Depure la base de datos de la copia de seguridad antes de restaurarla',
+    'backups_clean_helptext' => "Esto puede ser útil si está cambiando entre versiones de bases de datos",
     'backups_upload'            => 'Cargar copia de seguridad',
     'backups_path'              => 'Las copias de seguridad en el servidor se almacenan en <code>:path</code>',
-    'backups_restore_warning'   => 'Utilice el botón de restauración <small><span class="btn btn-xs btn-warning"><i class="text-white fas fa-retweet" aria-hidden="true"></i></span></small> para restaurar desde una copia de seguridad anterior. (Actualmente esto no funciona con almacenamiento de archivos S3 o Docker.)<br><br>Su <strong>base de datos completa de :app_name y cualquier archivo subido será completamente reemplazado</strong> por lo que hay en el archivo de copia de seguridad.  ',
+    'backups_restore_warning'   => 'Use the restore button <small><span class="btn btn-xs btn-warning"><i class="text-white fas fa-retweet" aria-hidden="true"></i></span></small> to restore from a previous backup. (This does not currently work with S3 file storage or Docker.)<br><br>Your <strong>entire :app_name database and any uploaded files will be completely replaced</strong> by what\'s in the backup file  ',
     'backups_logged_out'         => 'A todos los usuarios existentes, incluido usted, se le cerrará la sesión una vez que la restauración haya finalizado.',
     'backups_large'             => 'Las copias de seguridad muy grandes pueden agotar el tiempo de espera en el intento de restauración y todavía pueden necesitar ser ejecutadas a través de la línea de comandos. ',
-    'barcode_settings'			=> 'Ajustes de código de barras',
+    'barcode_settings'			=> 'Configuración del código de barras',
     'confirm_purge'			    => 'Confirmar purga',
-    'confirm_purge_help'		=> 'Introduzca el texto "DELETE" en el cuadro de abajo para purgar sus registros borrados. Esta acción no se puede deshacer y borrará PERMANENTAMENTE todos los elementos y usuarios eliminados de forma soft. (Primero debes hacer una copia de seguridad, solo para estar seguro).',
+    'confirm_purge_help'		=> 'Introduzca el texto "DELETE" en la casilla de abajo para purgar sus registros borrados. Esta acción no se puede deshacer y borrará PERMANENTAMENTE todos los elementos y usuarios eliminados. Debería hacer primero una copia de seguridad, para estar seguro.',
     'custom_css'				=> 'Custom CSS',
+    'custom_css_placeholder'	=> 'Add your custom CSS',
     'custom_css_help'			=> 'Introduzca cualquier CSS personalizado que desee utilizar. No incluya las etiquetas &lt;style&gt;&lt;/style&gt;.',
     'custom_forgot_pass_url'	=> 'URL de restablecimiento de contraseña personalizada',
-    'custom_forgot_pass_url_help'	=> 'Esto reemplaza la URL de la contraseña olvidada en la pantalla de inicio de sesión, útil para dirigir a la gente a la funcionalidad interna o alojada para restablecer la contraseña LDAP. Deshabilitará efectivamente la funcionalidad de contraseña olvidada por el usuario local.',
+    'custom_forgot_pass_url_help'	=> 'Esto reemplaza la URL de contraseña olvidada incorporada en la pantalla de inicio de sesión, es útil para dirigir a las personas a la funcionalidad de restablecimiento de contraseña LDAP interna o alojada. Deshabilitará efectivamente la funcionalidad de olvido de contraseña del usuario local.',
     'dashboard_message'			=> 'Mensaje en el tablero',
     'dashboard_message_help'	=> 'Este texto aparecerá en el panel de control para cualquiera con permiso para ver el tablero.',
-    'default_currency'  		=> 'Moneda por defecto',
-    'default_eula_text'			=> 'Acuerdo de uso predeterrminado',
-    'default_language'			=> 'Idioma por defecto',
+    'default_currency'  		=> 'Divisa predeterminada',
+    'default_eula_text'			=> 'Acuerdo de uso predeterminado',
+    'default_eula_text_placeholder' => 'Add your default EULA text',
+    'default_language'			=> 'Idioma predeterminado',
     'default_eula_help_text'	=> 'También puede asociar acuerdos de uso personalizados a categorías específicas.',
     'acceptance_note'           => 'Añada una nota para su decisión (opcional)',
     'display_asset_name'        => 'Mostrar nombre del activo',
     'display_checkout_date'     => 'Mostrar fecha de asignación',
-    'display_eol'               => 'Mostrar EOL en vista de tabla',
-    'display_qr'                => 'Mostrar códigos cuadrados',
-    'display_alt_barcode'		=> 'Mostrar código de barras 1D',
-    'email_logo'                => 'Logo de correo electrónico',
-    'barcode_type'				=> 'Tipo de código de barras 2D',
-    'alt_barcode_type'			=> 'Tipo de código de barras 1D',
-    'email_logo_size'       => 'Los logotipos cuadrados en el correo electrónico se ven mejor. ',
+    'display_eol'               => 'Mostrar fin de soporte (EOL) en la vista de tabla',
+    'display_qr'                => 'Mostrar código de barras en 2D',
+    'display_alt_barcode'		=> 'Mostrar códigos de barras de 1D',
+    'barcode_type'				=> 'Tipo de código de barras de 2D',
+    'alt_barcode_type'			=> 'Tipo de código de barras de 1D',
     'enabled'                   => 'Activado',
     'eula_settings'				=> 'Configuración de los acuerdos de uso',
     'eula_markdown'				=> 'Estos acuerdos de uso permiten <a href="https://help.github.com/articles/github-flavored-markdown/">markdown estilo Github</a>.',
+    'empty_row_count'           => 'Field Start Offset (Empty Rows)',
+    'empty_row_count_help'      => 'Fields will begin populating after this many empty rows are skipped at the top of the label.',
     'favicon'                   => 'Favicon',
-    'favicon_format'            => 'Los tipos de archivo aceptados son ico, png y gif. Otros formatos de imagen pueden no funcionar en todos los navegadores.',
-    'favicon_size'          => 'Favicons deben ser imágenes cuadradas, 16x16 píxeles.',
-    'footer_text'               => 'Texto adicional del pie de página ',
-    'footer_text_help'          => 'Este texto aparecerá en el lado derecho del pie de página. Se permiten enlaces usando <a href="https://help.github.com/articles/github-flavored-markdown/">Github con sabor a markdown</a>. Saltos de línea, cabeceras, imágenes, etc. pueden resultar impredecibles.',
-    'general_settings'			=> 'Configuración General',
-    'general_settings_keywords' => 'soporte de la compañía, firma, aceptación, formato de correo electrónico, formato de nombre de usuario, imágenes, por página, miniatura, acuerdo de uso, términos y condiciones, gravatar, términos de servicio, tablero de indicadores, privacidad',
+    'favicon_format'            => 'Los tipos de archivo aceptados son ico, png y gif. Es posible que otros formatos de imagen no funcionen en todos los navegadores.',
+    'favicon_size'          => 'Los Favicons deben ser imágenes cuadradas, de 16x16 píxeles.',
+    'footer_text'               => 'Texto adicional en el pie de página ',
+    'footer_text_help'          => 'Este texto aparecerá en el lado derecho del pie de página. Los enlaces son permitidos usando <a href="https://help.github.com/articles/github-flavored-markdown/">markdown estilo Github</a>. Los saltos de línea, encabezados, imágenes, etc. pueden dar lugar a resultados impredecibles.',
+    'footer_text_placeholder'   => 'Optional footer text',
+    'general_settings'			=> 'Configuración general',
     'general_settings_help'     => 'Acuerdo de uso predeterminado y más',
     'generate_backup'			=> 'Generar copia de seguridad',
-    'google_workspaces'         => 'Espacios de trabajo de Google',
-    'header_color'              => 'Color de cabecera',
+    'google_workspaces'         => 'Google Workspace',
+    'header_color'              => 'Color del encabezado',
     'info'                      => 'Estos ajustes le permiten personalizar ciertos aspectos de su instalación.',
-    'label_logo'                => 'Logo de etiqueta',
     'label_logo_size'           => 'Los logos cuadrados se ven mejor - se mostrarán en la parte superior derecha de cada etiqueta de activo. ',
     'laravel'                   => 'Versión de Laravel',
     'ldap'                      => 'LDAP',
-    'ldap_default_group'        => 'Grupo de permisos por defecto',
+    'ldap_default_group'        => 'Grupo de permisos predeterminado',
     'ldap_default_group_info'   => 'Seleccione un grupo para asignar a los usuarios recién sincronizados. Recuerde que un usuario asume los permisos del grupo que le han asignado.',
     'no_default_group'          => 'Ningún grupo por defecto',
-    'ldap_help'                 => 'Directorio LDAP/Activo',
+    'ldap_help'                 => 'LDAP/Directorio Activo',
     'ldap_client_tls_key'       => 'Llave TLS del cliente LDAP',
-    'ldap_client_tls_cert'      => 'Certificado LDAP cliente-lado TLS',
+    'ldap_client_tls_cert'      => 'LDAP Certificado TLS del lado del cliente',
     'ldap_enabled'              => 'LDAP activado',
     'ldap_integration'          => 'Integración LDAP',
-    'ldap_settings'             => 'Ajustes LDAP',
-    'ldap_client_tls_cert_help' => 'El certificado TLS lateral del cliente y la clave para las conexiones LDAP normalmente sólo son útiles en las configuraciones del espacio de trabajo de Google con "Secure LDAP". Ambas son requeridas.',
+    'ldap_settings'             => 'Configuración LDAP',
+    'ldap_client_tls_cert_help' => 'El certificado TLS del lado del cliente y la clave para las conexiones LDAP normalmente solo son útiles en las configuraciones de Google Workspace con "LDAP Seguro". Ambas son requeridas.',
     'ldap_location'             => 'Ubicación LDAP',
 'ldap_location_help'             => 'El campo Location (ubicación) de Ldap debe utilizarse si <strong>una OU no está siendo utilizada en el Base Bind DN (DN del enlace base).</strong> Deje este espacio en blanco si se utiliza una búsqueda OU.',
-    'ldap_login_test_help'      => 'Introduzca un nombre de usuario y contraseña LDAP válidos del DN base que especificó anteriormente para comprobar si su inicio de sesión LDAP está configurado correctamente. DEBES GUARDAR SUS SETTINGS LDAP ACTUALIZADOS.',
-    'ldap_login_sync_help'      => 'Esto sólo prueba que LDAP puede sincronizar correctamente. Si su consulta de autenticación LDAP no es correcta, es posible que los usuarios todavía no puedan iniciar sesión. DEBES GUARDAR SUS SETTINGS LDAP ACTUALIZADOS.',
+    'ldap_login_test_help'      => 'Introduzca un nombre de usuario y una contraseña LDAP válidos del DN base que especificó anteriormente para comprobar si el inicio de sesión LDAP está configurado correctamente. PRIMERO DEBE GUARDAR LA CONFIGURACIÓN LDAP ACTUALIZADA.',
+    'ldap_login_sync_help'      => 'Esto solo comprueba que el LDAP puede sincronizarse correctamente. Si su solicitud de autenticación LDAP no es correcta, los usuarios aún no podrían iniciar sesión. PRIMERO DEBE GUARDAR LA CONFIGURACIÓN LDAP ACTUALIZADA.',
     'ldap_manager'              => 'Gestor LDAP',
     'ldap_server'               => 'Servidor LDAP',
-    'ldap_server_help'          => 'Esto debería comenzar con ldap:// (para no cifrado o TLS) o ldaps:// (para SSL)',
+    'ldap_server_help'          => 'Esto debería comenzar con ldap:// (sin cifrado) o con ldaps:// (para TLS o SSL)',
     'ldap_server_cert'			=> 'Validación del certificado LDAP SSL',
     'ldap_server_cert_ignore'	=> 'Permitir certificado SSL inválido',
     'ldap_server_cert_help'		=> 'Seleccione esta casilla si está utilizando un certificado SSL autofirmado y desea aceptar un certificado SSL inválido.',
     'ldap_tls'                  => 'Usar TLS',
     'ldap_tls_help'             => 'Esto se debe seleccionar si se está ejecutando STARTTLS en el servidor LDAP. ',
-    'ldap_uname'                => 'LDAP Bind Username',
+    'ldap_uname'                => 'Nombre de usuario de enlace LDAP (LDAP Bind Username)',
     'ldap_dept'                 => 'Departamento LDAP',
     'ldap_phone'                => 'Número de teléfono LDAP',
     'ldap_jobtitle'             => 'Cargo LDAP',
     'ldap_country'              => 'País LDAP',
     'ldap_pword'                => 'Contraseña de enlace LDAP',
-    'ldap_basedn'               => 'Base Bind DN',
+    'ldap_basedn'               => 'DN del enlace base (Base Bind DN)',
     'ldap_filter'               => 'Filtro LDAP',
-    'ldap_pw_sync'              => 'Sincronización de contraseña LDAP',
-    'ldap_pw_sync_help'         => 'Desmarque esta casilla si no desea mantener las contraseñas LDAP sincronizadas con las contraseñas locales. Deshabilitar esto significa que los usuarios pueden no poder iniciar sesión si su servidor LDAP es inaccesible por alguna razón.',
-    'ldap_username_field'       => 'Campo Usuario',
-    'ldap_lname_field'          => 'Apellidos',
+    'ldap_pw_sync'              => 'Cache LDAP Passwords',
+    'ldap_pw_sync_help'         => 'Uncheck this box if you do not wish to keep LDAP passwords cached as local hashed passwords. Disabling this means that your users may not be able to login if your LDAP server is unreachable for some reason.',
+    'ldap_username_field'       => 'Campo nombre de usuario',
+    'ldap_lname_field'          => 'Apellido',
     'ldap_fname_field'          => 'Nombre LDAP',
     'ldap_auth_filter_query'    => 'Consulta de autenticación LDAP',
     'ldap_version'              => 'Versión LDAP',
     'ldap_active_flag'          => 'Bandera activa LDAP',
-    'ldap_activated_flag_help'  => 'Este valor se utiliza para determinar si un usuario sincronizado puede iniciar sesión en Snipe-IT. <strong>No afecta a la capacidad de asignarles o retirarles items</strong>, y debería ser el <strong>nombre de atributo</strong> dentro de su AD/LDAP, <strong>no el valor</strong>. <br><br>Si este campo está configurado a un nombre de campo que no existe en su AD/LDAP, o el valor en el campo AD/LDAP se establece en <code>0</code> o <code>falso</code>, <strong>el inicio de sesión de usuario será deshabilitado</strong>. Si el valor en el campo AD/LDAP está establecido en <code>1</code> o <code>true</code> o <em>cualquier otro texto</em> significa que el usuario puede iniciar sesión. Cuando el campo está en blanco en su AD, respetamos el atributo <code>userAccountControl</code>, que generalmente permite a los usuarios no suspendidos iniciar sesión.',
+    'ldap_activated_flag_help'  => 'Este valor se utiliza para determinar si un usuario sincronizado puede iniciar sesión en Snipe-IT. <strong>No afecta a la capacidad de asignarles o retirarles elementos</strong>, y debería ser el <strong>nombre de atributo</strong> dentro de su AD/LDAP, <strong>no el valor</strong>. <br><br>Si este campo está configurado a un nombre de campo que no existe en su AD/LDAP, o el valor en el campo AD/LDAP se establece en <code>0</code> o <code>falso</code>, <strong>el inicio de sesión de usuario será deshabilitado</strong>. Si el valor en el campo AD/LDAP está establecido en <code>1</code> o <code>true</code> o <em>cualquier otro texto</em> significa que el usuario puede iniciar sesión. Cuando el campo está en blanco en su AD, respetamos el atributo <code>userAccountControl</code>, que generalmente permite a los usuarios no suspendidos iniciar sesión.',
+    'ldap_invert_active_flag'   => 'LDAP Invert Active Flag',
+    'ldap_invert_active_flag_help'     => 'If enabled: when the value returned by LDAP Active Flag is <code>0</code> or <code>false</code> the user account will be active.',
     'ldap_emp_num'              => 'Número de empleado LDAP',
-    'ldap_email'                => 'LDAP Email',
+    'ldap_email'                => 'Correo electrónico LDAP',
     'ldap_test'                 => 'Probar LDAP',
     'ldap_test_sync'            => 'Prueba de sincronización LDAP',
     'license'                   => 'Licencia de software',
-    'load_remote'               => 'Usar Gravatar',
-    'load_remote_help_text'		=> 'Desmarque esta casilla si su instalación no puede cargar scripts desde el Internet externo. Esto evitará que Snipe-IT intente cargar imágenes desde Gravatar.',
+    'load_remote'               => 'Cargar avatares remotos',
+    'load_remote_help_text'		=> 'Desmarque esta casilla si su instalación no puede cargar secuencias de comandos (scripts) desde Internet . Esto evitará que Snipe-IT intente cargar avatares de Gravatar u otras fuentes externas.',
     'login'                     => 'Intentos de inicio de sesión',
     'login_attempt'             => 'Intento de inicio de sesión',
     'login_ip'                  => 'Dirección IP',
-    'login_success'             => '¿Éxito?',
+    'login_success'             => '¿Exitoso?',
     'login_user_agent'          => 'Agente de usuario',
     'login_help'                => 'Lista de intentos de inicio de sesión',
-    'login_note'                => 'Nota de acceso',
-    'login_note_help'           => 'Opcionalmente incluye algunas frases en la pantalla de inicio de sesión, por ejemplo para ayudar a las personas que han encontrado un dispositivo perdido o robado. Este campo acepta <a href="https://help.github.com/articles/github-flavored-markdown/">Github con sabor a markdown</a>',
-    'login_remote_user_text'    => 'Opciones de usuario remoto',
+    'login_note'                => 'Nota en inicio de sesión',
+    'login_note_placeholder'            => "If you do not have a login or have found a device belonging to this company, please call technical support at 888-555-1212. Thank you.",
+    'login_note_help'           => 'Opcionalmente incluya algunas frases en su pantalla de inicio de sesión, por ejemplo para ayudar a las personas que han encontrado un dispositivo perdido o robado. Este campo acepta <a href="https://help.github.com/articles/github-flavored-markdown/">markdown estilo Github</a>',
+    'login_remote_user_text'    => 'Opciones de inicio de sesión de usuario remoto',
     'login_remote_user_enabled_text' => 'Activar inicio de sesión con la cabecera de usuario remota',
-    'login_remote_user_enabled_help' => 'Esta opción permite la autenticación a través del encabezado REMOTE_USER de acuerdo a la "Interfaz común de puerta de enlace (rfc3875)"',
+    'login_remote_user_enabled_help' => 'Esta opción habilita la autenticación mediante el encabezado REMOTE_USER de acuerdo con la "Interfaz de puerta de enlace común (rfc3875)"',
     'login_common_disabled_text' => 'Desactivar otros mecanismos de autenticación',
     'login_common_disabled_help' => 'Esta opción desactiva otros mecanismos de autenticación. Sólo habilite esta opción si está seguro de que su inicio de sesión REMOTE_USER ya está funcionando',
-    'login_remote_user_custom_logout_url_text' => 'URL de salida personalizada',
-    'login_remote_user_custom_logout_url_help' => 'Si se proporciona una url aquí, los usuarios serán redireccionados a esta URL después de que el usuario se desconecte de Snipe-IT. Esto es útil para cerrar correctamente las sesiones de usuario de su proveedor de autenticación.',
+    'login_remote_user_custom_logout_url_text' => 'URL de cierre de sesión personalizado',
+    'login_remote_user_custom_logout_url_help' => 'Si se proporciona una URL aquí, los usuarios serán redirigidos a esta URL después de que el usuario cierre la sesión de Snipe-IT. Esto es útil para cerrar correctamente las sesiones de usuario de su proveedor de autenticación.',
     'login_remote_user_header_name_text' => 'Cabecera de nombre de usuario personalizado',
     'login_remote_user_header_name_help' => 'Usar la cabecera especificada en lugar de REMOTE_USER',
     'logo'                    	=> 'Logo',
     'logo_print_assets'         => 'Usar en la impresión',
-    'logo_print_assets_help'    => 'Usar marca en listas de activos imprimibles ',
+    'logo_print_assets_help'    => 'Utilice la marca de la empresa en las listas de activos imprimibles ',
     'full_multiple_companies_support_help_text' => 'Limitar los usuarios asignados a compañías (incluyendo administradores) solo a los activos de esa compañía.',
     'full_multiple_companies_support_text' => 'Soporte completo a múltiples compañías',
+    'scope_locations_fmcs_support_text'  => 'Scope Locations with Full Multiple Companies Support',
+    'scope_locations_fmcs_support_help_text'  => 'Restrict locations to their selected company.',
+    'scope_locations_fmcs_check_button' => 'Check Compatibility',
+    'scope_locations_fmcs_support_disabled_text'  => 'This option is disabled because you have conflicting locations set for :count or more items.',
     'show_in_model_list'   => 'Mostrar en menús desplegables de modelos',
     'optional'					=> 'opcional',
     'per_page'                  => 'Resultados por página',
-    'php'                       => 'Versión PHP',
-    'php_info'                  => 'PHP Info',
+    'php'                       => 'Versión de PHP',
+    'php_info'                  => 'Información de PHP',
     'php_overview'              => 'PHP',
-    'php_overview_keywords'     => 'phpinfo, sistema, información',
     'php_overview_help'         => 'Información del sistema PHP',
-    'php_gd_info'               => 'Debe instalar php-gd para mostrar los códigos QR, ver las instrucciones de instalación.',
-    'php_gd_warning'            => 'PHP Image Processing y GD plugin NO está instalado.',
+    'php_gd_info'               => 'Debe instalar php-gd para mostrar códigos QR, consulte las instrucciones de instalación.',
+    'php_gd_warning'            => 'PHP Image Processing y GD plugin NO están instalados.',
     'pwd_secure_complexity'     => 'Complejidad de contraseña',
     'pwd_secure_complexity_help' => 'Seleccione las reglas de complejidad de contraseña que desee aplicar.',
     'pwd_secure_complexity_disallow_same_pwd_as_user_fields' => 'La contraseña no puede ser la misma que el nombre, apellido, correo electrónico o nombre de usuario',
@@ -166,9 +175,9 @@ return [
     'pwd_secure_min'            => 'Caracteres mínimos de la contraseña',
     'pwd_secure_min_help'       => 'El valor mínimo permitido es 8',
     'pwd_secure_uncommon'       => 'Evitar contraseñas comunes',
-    'pwd_secure_uncommon_help'  => 'Esto impedirá que los usuarios usen contraseñas comunes de los 10.000 mejores contraseñas reportadas en infracciones.',
-    'qr_help'                   => 'Habilita primero los códigos QR para establecer esto',
-    'qr_text'                   => 'QR Code Text',
+    'pwd_secure_uncommon_help'  => 'Esto impedirá que los usuarios usen contraseñas comunes de las 10,000 contraseñas más usuales reportadas en fugas de datos.',
+    'qr_help'                   => 'Habilite primero los códigos QR para configurar esto',
+    'qr_text'                   => 'Texto del código QR',
     'saml'                      => 'SAML',
     'saml_title'                => 'Actualizar ajustes de SAML',
     'saml_help'                 => 'Configuración SAML',
@@ -181,199 +190,300 @@ return [
     'saml_sp_metadata_url'      => 'URL de metadatos',
     'saml_idp_metadata'         => 'Metadatos SAML IdP',
     'saml_idp_metadata_help'    => 'Puede especificar los metadatos IdP usando un archivo URL o XML.',
-    'saml_attr_mapping_username' => 'Mapeo de Atributos - Nombre de Usuario',
-    'saml_attr_mapping_username_help' => 'NameID se utilizará si el mapeo de atributos no está especificado o no es válido.',
+    'saml_attr_mapping_username' => 'Asociar atributo - Nombre de usuario',
+    'saml_attr_mapping_username_help' => 'NameID se utilizará si la asociación de atributos no está especificada o no es válida.',
     'saml_forcelogin_label'     => 'Forzar inicio de sesión SAML',
-    'saml_forcelogin'           => 'Hacer SAML el inicio de sesión principal',
-    'saml_forcelogin_help'      => 'Puedes usar \'/login?nosaml\' para llegar a la página de inicio de sesión normal.',
+    'saml_forcelogin'           => 'Hacer de SAML el método de inicio de sesión principal',
+    'saml_forcelogin_help'      => 'Puede usar \'/login?nosaml\' para ir a la página de inicio de sesión normal.',
     'saml_slo_label'            => 'Cerrar sesión única SAML',
     'saml_slo'                  => 'Enviar una solicitud de salida a IdP al cerrar sesión',
     'saml_slo_help'             => 'Esto causará que el usuario sea redirigido primero a la IdP al cerrar sesión. Dejar desmarcado si el IdP no soporta correctamente SAML SLO iniciado por SL.',
     'saml_custom_settings'      => 'Configuración personalizada SAML',
-    'saml_custom_settings_help' => 'Puedes especificar ajustes adicionales a la biblioteca onelogin/php-saml. Úsalo bajo tu propio riesgo.',
+    'saml_custom_settings_help' => 'Puede especificar ajustes adicionales a la biblioteca onelogin/php-saml. Úselo bajo su propio riesgo.',
     'saml_download'             => 'Descargar metadatos',
-    'setting'                   => 'Ajustes',
-    'settings'                  => 'Ajustes',
+    'setting'                   => 'Configuración',
+    'settings'                  => 'Configuraciones',
     'show_alerts_in_menu'       => 'Mostrar alertas en el menú superior',
     'show_archived_in_list'     => 'Activos archivados',
-    'show_archived_in_list_text'     => 'Mostrar recursos archivados en el listado de "todos los activos"',
+    'show_archived_in_list_text'     => 'Mostrar activos archivados en el listado de "todos los activos"',
     'show_assigned_assets'      => 'Mostrar activos asignados a activos',
     'show_assigned_assets_help' => 'Mostrar activos que fueron asignados a otros activos en Ver usuario -> Activos, Ver usuario -> Información -> Imprimir todos los asignados y en Cuenta -> Ver elementos asignados.',
-    'show_images_in_email'     => 'Mostrar imágenes en emails',
-    'show_images_in_email_help'   => 'Desmarque esta casilla si su instalación de Snipe-IT está detrás de una VPN o red cerrada y los usuarios fuera de la red no podrán cargar imágenes servidas desde esta instalación en sus correos electrónicos.',
+    'show_images_in_email'     => 'Mostrar imágenes en correos electrónicos',
+    'show_images_in_email_help'   => 'Desmarque esta casilla si su instalación de Snipe-IT está detrás de una red privada o VPN y los usuarios fuera de la red no pueden cargar las imágenes publicadas desde este servidor de Snipe-IT en sus correos electrónicos.',
     'site_name'                 => 'Nombre del sitio',
     'integrations'               => 'Integraciones',
     'slack'                     => 'Slack',
     'general_webhook'           => 'Webhook general',
-    'ms_teams'                  => 'Equipos Microsoft',
+    'ms_teams'                  => 'Microsoft Teams',
     'webhook'                   => ':app',
     'webhook_presave'           => 'Probar para guardar',
     'webhook_title'               => 'Actualizar ajustes de Webhook',
     'webhook_help'                => 'Ajustes de integración',
-    'webhook_botname'             => ':app Nombre',
-    'webhook_channel'             => ':app Canal',
-    'webhook_endpoint'            => ':app Endpoint',
-    'webhook_integration'         => ':app Ajustes',
-    'webhook_test'                 =>'Probar :app integración',
-    'webhook_integration_help'    => 'La integración de :app es opcional, sin embargo el extremo y el canal son necesarios si desea usarlo. Para configurar la integración de :app, primero debes crear <a href=":webhook_link" target="_new" rel="noopener">un webhook entrante</a> en tu cuenta :app. Haga clic en el botón <strong>Test :app Integración</strong> para confirmar que su configuración es correcta antes de guardar. ',
-    'webhook_integration_help_button'    => 'Una vez que hayas guardado la información de :app, aparecerá un botón de prueba.',
-    'webhook_test_help'           => 'Comprueba si tu integración con :app está configurada correctamente. DEBES GUARDAR TU ACTUALIZADO :app SETTINGS FIRST.',
+    'webhook_botname'             => 'Nombre de Bot de :app',
+    'webhook_channel'             => 'Canal de :app',
+    'webhook_endpoint'            => 'Endpoint de :app',
+    'webhook_integration'         => 'Configuración de :app',
+    'webhook_test'                 =>'Probar integración con :app',
+    'webhook_integration_help'    => 'La integración con :app es opcional, sin embargo, el punto final (endpoint) y el canal son necesarios si desea usarla. Para configurar la integración con :app, primero debe crear <a href=":webhook_link" target="_new" rel="noopener">un webhook entrante</a> en su cuenta :app. Haga clic en el botón <strong>Probar integración con :app</strong> para confirmar que su configuración es correcta antes de guardar. ',
+    'webhook_integration_help_button'    => 'Una vez que haya guardado la información de :app, aparecerá un botón de prueba.',
+    'webhook_test_help'           => 'Compruebe si su integración con :app está configurada correctamente. PRIMERO DEBE GUARDAR LA CONFIGURACION ACTUALIZADA DE :app.',
+    'shortcuts_enabled'         => 'Habilitar accesos directos',
+    'shortcuts_help_text'       => '<strong>Windows</strong>: Alt + tecla de acceso, <strong>Mac</strong>: Control + Opción + Clave de acceso',
     'snipe_version'  			=> 'Versión de Snipe-IT',
     'support_footer'            => 'Enlace al soporte en el pie de página ',
-    'support_footer_help'       => 'Especifique quién ve los enlaces a la información de Soporte de Snipe-IT y Manual de Usuarios',
+    'support_footer_help'       => 'Especifique quién puede ver los enlaces a la información de soporte de Snipe-IT y al manual de usuario',
     'version_footer'            => 'Versión en el pie de página ',
-    'version_footer_help'       => 'Especifique quién ve la versión de Snipe-IT y el número de compilación.',
+    'version_footer_help'       => 'Especifique quién puede ver la versión de Snipe-IT y el número de compilación.',
     'system'                    => 'Información del sistema',
-    'update'                    => 'Actualizar ajustes',
-    'value'                     => 'Precio',
+    'update'                    => 'Actualizar configuraciones',
+    'value'                     => 'Valor',
     'brand'                     => 'Marca',
-    'brand_keywords'            => 'pie de página, logotipo, impresión, tema, piel, cabeza, colores, color, c(debate)',
     'brand_help'                => 'Logo, nombre del sitio',
-    'web_brand'                 => 'Tipo de marca web',
-    'about_settings_title'      => 'Sobre ajustes',
-    'about_settings_text'       => 'Estos ajustes le permiten personalizar ciertos aspectos de su instalación.',
+    'web_brand'                 => 'Tipo de marca en la web',
+    'about_settings_title'      => 'Acerca de las configuraciones',
+    'about_settings_text'       => 'Estas configuraciones le permiten personalizar ciertos aspectos de su instalación.',
     'labels_per_page'           => 'Etiquetas por página',
     'label_dimensions'          => 'Dimensiones de la etiqueta (pulgadas)',
-    'next_auto_tag_base'        => 'Siguiente autoincremento',
-    'page_padding'              => 'Margen de página (pulgadas)',
+    'next_auto_tag_base'        => 'Siguiente incremento automático',
+    'page_padding'              => 'Márgenes de página (pulgadas)',
     'privacy_policy_link'       => 'Enlace a la política de privacidad',
     'privacy_policy'            => 'Política de privacidad',
     'privacy_policy_link_help'  => 'Si se incluye una url aquí, un enlace a su política de privacidad se incluirá en el pie de página de la aplicación y en cualquier correo electrónico que el sistema envíe, de conformidad con el GDPR. ',
     'purge'                     => 'Purgar registros eliminados',
     'purge_deleted'             => 'Purgar eliminados ',
-    'labels_display_bgutter'    => 'Etiqueta inferior gutter',
-    'labels_display_sgutter'    => 'Guiador lateral de etiqueta',
-    'labels_fontsize'           => 'Label font size',
+    'labels_display_bgutter'    => 'Borde inferior de la etiqueta',
+    'labels_display_sgutter'    => 'Borde lateral de la etiqueta',
+    'labels_fontsize'           => 'Tamaño de letra de la etiqueta',
     'labels_pagewidth'          => 'Ancho de la hoja de etiqueta',
     'labels_pageheight'         => 'Altura de la hoja de etiqueta',
-    'label_gutters'        => 'Espacio de etiqueta (pulgadas)',
+    'label_gutters'        => 'Espacio entre etiquetas (pulgadas)',
     'page_dimensions'        => 'Dimensiones de página (pulgadas)',
     'label_fields'          => 'Campos visibles de etiqueta',
     'inches'        => 'pulgadas',
-    'width_w'        => 'i',
-    'height_h'        => 'h',
+    'width_w'        => 'ancho',
+    'height_h'        => 'alto',
     'show_url_in_emails'                => 'Enlace a Snipe-IT en correos electrónicos',
-    'show_url_in_emails_help_text'      => 'Desmarque esta casilla si no desea enlazar de nuevo a su instalación de Snipe-IT en sus pie de página de correo electrónico. Útil si la mayoría de tus usuarios nunca se conectan. ',
-    'text_pt'        => 'pt',
+    'show_url_in_emails_help_text'      => 'Desmarque esta casilla si no desea vincular su instalación de Snipe-IT en el pie de página de correo electrónico. Útil si la mayoría de sus usuarios nunca se conectan. ',
+    'text_pt'        => 'puntos',
     'thumbnail_max_h'   => 'Altura máxima de la miniatura',
-    'thumbnail_max_h_help'   => 'Altura máxima en píxeles que las miniaturas pueden mostrar en la vista de listado. Mínimo 25, máximo 500.',
+    'thumbnail_max_h_help'   => 'Altura máxima en píxeles para mostrar las miniaturas en la vista de listado. Mín 25, máx 500.',
     'two_factor'        => 'Autenticación de dos factores',
     'two_factor_secret'        => 'Código de verificación de dos factores',
     'two_factor_enrollment'        => 'Inscripción en verificación de dos factores',
     'two_factor_enabled_text'        => 'Activar la verificación de dos factores',
     'two_factor_reset'        => 'Restablecer el secreto en verificación de dos factores',
-    'two_factor_reset_help'        => 'Esto obligará al usuario a volver a inscribir su dispositivo en su aplicación de autenticación. Esto puede ser útil si su dispositivo actualmente inscrito es perdido o robado. ',
-    'two_factor_reset_success'          => 'Dispositivo de doble factor restablecido con éxito',
-    'two_factor_reset_error'          => 'Error al restablecer el dispositivo de doble factor',
+    'two_factor_reset_help'        => 'Esto obligará al usuario a inscribir de nuevo su dispositivo en su aplicación de autenticación. Esto puede ser útil en caso de pérdida o robo del dispositivo actualmente registrado. ',
+    'two_factor_reset_success'          => 'Dispositivo de verificación de dos factores restablecido correctamente',
+    'two_factor_reset_error'          => 'Error al restablecer el dispositivo de verificación de doble factor',
     'two_factor_enabled_warning'        => 'Al activar el doble factor si no está activado, se le obligará inmediatamente a autenticarse con un dispositivo registrado en Google Auth. Tendrá la posibilidad de inscribir su dispositivo si uno no está inscrito actualmente.',
-    'two_factor_enabled_help'        => 'Esto activará la autenticación de dos factores usando Google Authenticator.',
+    'two_factor_enabled_help'        => 'Esto activará la autenticación de dos factores mediante Google Authenticator.',
     'two_factor_optional'        => 'Selectivo (los usuarios pueden activar o desactivar si está permitido)',
     'two_factor_required'        => 'Requerido para todos los usuarios',
-    'two_factor_disabled'        => 'Deshabilitado',
+    'two_factor_disabled'        => 'Desactivado',
     'two_factor_enter_code'	=> 'Ingrese el código de verificación de dos factores',
     'two_factor_config_complete'	=> 'Enviar código',
-    'two_factor_enabled_edit_not_allowed' => 'Su administrador no le permite editar esta configuración.',
-    'two_factor_enrollment_text'	=> "Se requiere autenticación de dos factores, sin embargo su dispositivo aún no ha sido inscrito. Abra su aplicación Google Authenticator y escanee el código QR de abajo para inscribir su dispositivo. Una vez que lo haya inscrito, introduzca el código en la parte inferior",
+    'two_factor_enabled_edit_not_allowed' => 'El administrador no le permite modificar esta configuración.',
+    'two_factor_enrollment_text'	=> "Se requiere autenticación de dos factores, sin embargo su dispositivo aún no ha sido inscrito. Abra la aplicación Google Authenticator y escanee el código QR que aparece a continuación para registrar su dispositivo. Una vez que haya registrado su dispositivo, introduzca el código en la parte inferior",
     'require_accept_signature'      => 'Solicitar firma',
-    'require_accept_signature_help_text'      => 'Activar esta función requiere que los usuarios firmen físicamente aceptando un elemento.',
-    'left'        => 'restante',
+    'require_accept_signature_help_text'      => 'Al activar esta función, los usuarios tendrán que firmar físicamente la aceptación de un activo.',
+    'require_checkinout_notes'  => 'Exigir notas en el ingreso/asignación',
+    'require_checkinout_notes_help_text'    => 'Al activar esta característica, los campos de notas deberán rellenarse al ingresar o asignar un activo.',
+    'left'        => 'izquierda',
     'right'        => 'derecha',
     'top'        => 'arriba',
     'bottom'        => 'abajo',
     'vertical'        => 'vertical',
     'horizontal'        => 'horizontal',
     'unique_serial'                => 'Números de serie únicos',
-    'unique_serial_help_text'                => 'Marcando esta casilla se aplicará una restricción de singularidad en las publicaciones seriadas de activos',
-    'zerofill_count'        => 'Longitud de etiquetas de activos, incluyendo zerofill',
+    'unique_serial_help_text'                => 'Al marcar esta casilla, se aplicará una restricción a los activos para tener números de serie únicos',
+    'zerofill_count'        => 'Longitud de los números en las placas de los activos, incluyendo los ceros de relleno',
     'username_format_help'   => 'Esta configuración solo será utilizada por el proceso de importación si no se proporciona un nombre de usuario y tenemos que generar un nombre de usuario por usted.',
     'oauth_title' => 'Configuración de la API de OAuth',
-    'oauth_clients' => 'OAuth Clients',
+    'oauth_clients' => 'Clientes OAuth',
     'oauth' => 'OAuth',
-    'oauth_help' => 'Configuración de Oauth Endpoint',
-    'oauth_no_clients' => 'You have not created any OAuth clients yet.',
-    'oauth_secret' => 'Secret',
-    'oauth_authorized_apps' => 'Authorized Applications',
-    'oauth_redirect_url' => 'Redirect URL',
-    'oauth_name_help' => ' Something your users will recognize and trust.',
+    'oauth_help' => 'Configuración del punto final (endpoint) OAuth',
+    'oauth_no_clients' => 'Aún no ha creado ningún cliente OAuth.',
+    'oauth_secret' => 'Secreto',
+    'oauth_authorized_apps' => 'Aplicaciones autorizadas',
+    'oauth_redirect_url' => 'URL de redireccionamiento',
+    'oauth_name_help' => ' Algo que sus usuarios reconocerán y en lo que confiarán.',
     'oauth_scopes' => 'Scopes',
-    'oauth_callback_url' => 'Your application authorization callback URL.',
-    'create_client' => 'Create Client',
-    'no_scopes' => 'No scopes',
-    'asset_tag_title' => 'Actualizar configuración de etiquetas de activos',
-    'barcode_title' => 'Actualizar ajustes de código de barras',
-    'barcodes' => 'Barcodes',
+    'oauth_callback_url' => 'URL de devolución de llamada de autorización de su aplicación (callback URL).',
+    'create_client' => 'Crear cliente',
+    'no_scopes' => 'Sin scopes',
+    'asset_tag_title' => 'Actualizar la configuración de las placas de activos',
+    'barcode_title' => 'Actualizar la configuración de los códigos de barras',
+    'barcodes' => 'Códigos de barras',
     'barcodes_help_overview' => 'Configuración de código de barras &amp; QR',
     'barcodes_help' => 'Esto intentará eliminar códigos de barras almacenados en caché. Normalmente solo se usa si la configuración del código de barras ha cambiado o si ha cambiado la URL de Snipe-IT. Los códigos de barras se volverán a generar la próxima vez que se acceda a ellos.',
     'barcodes_spinner' => 'Intentando eliminar archivos...',
     'barcode_delete_cache' => 'Borrar caché de código de barras',
-    'branding_title' => 'Actualizar ajustes de marca',
-    'general_title' => 'Actualizar ajustes generales',
+    'branding_title' => 'Actualizar la configuración de la marca',
+    'general_title' => 'Actualizar la configuración general',
     'mail_test' => 'Enviar prueba',
     'mail_test_help' => 'Esto intentará enviar un correo de prueba a :replyto.',
     'filter_by_keyword' => 'Filtrar por palabra clave',
     'security' => 'Seguridad',
-    'security_title' => 'Actualizar ajustes de seguridad',
-    'security_keywords' => 'contraseña, contraseñas, requisitos, dos factores, dos factores, contraseñas comunes, inicio de sesión remoto, autenticación',
-    'security_help' => 'Restricciones de contraseña de dos factores',
-    'groups_keywords' => 'permisos, grupos de permisos, autorización',
-    'groups_help' => 'Grupos de permisos de cuenta',
-    'localization' => 'Ubicación',
-    'localization_title' => 'Actualizar ajustes de localización',
-    'localization_keywords' => 'localización, moneda, local, locale, zona horaria, zona horaria, internacional, internatinalización, idioma, idioma, traducción',
-    'localization_help' => 'Idioma, fecha',
+    'security_title' => 'Actualizar la configuración de seguridad',
+    'security_help' => 'Verificación de dos factores y restricciones de contraseña',
+    'groups_help' => 'Grupos de permisos',
+    'localization' => 'Localización',
+    'localization_title' => 'Actualizar la configuración de localización',
+    'localization_help' => 'Idioma, visualización de la fecha',
     'notifications' => 'Notificaciones',
-    'notifications_help' => 'Configuración de alertas por email y auditoría',
+    'notifications_help' => 'Configuración de alertas por correo electrónico y de auditoría',
     'asset_tags_help' => 'Incrementos y prefijos',
     'labels' => 'Etiquetas',
     'labels_title' => 'Actualizar configuración de etiquetas',
-    'labels_help' => 'Tamaños de etiqueta &amp; ajustes',
-    'purge_keywords' => 'eliminar permanentemente',
+    'labels_help' => 'Configuración de códigos de barras &amp; etiquetas',
     'purge_help' => 'Purgar registros eliminados',
     'ldap_extension_warning' => 'No parece que la extensión LDAP esté instalada o habilitada en este servidor. Todavía puede guardar su configuración, pero necesitará habilitar la extensión LDAP para PHP antes de que funcione la sincronización LDAP o el inicio de sesión.',
     'ldap_ad' => 'LDAP/AD',
+    'ldap_test_label' => 'Test LDAP Sync',
+    'ldap_test_login' => ' Test LDAP Login',
+    'ldap_username_placeholder' => 'LDAP Username',
+    'ldap_password_placeholder' => 'LDAP Password',
     'employee_number' => 'Número de empleado',
     'create_admin_user' => 'Crear un usuario ::',
-    'create_admin_success' => '¡Éxito! ¡Tu usuario admin ha sido añadido!',
-    'create_admin_redirect' => '¡Haz clic aquí para acceder a tu aplicación!',
+    'create_admin_success' => '¡Éxito! ¡Su usuario admin ha sido añadido!',
+    'create_admin_redirect' => '¡Haga clic aquí para acceder a su aplicación!',
     'setup_migrations' => 'Migraciones de base de datos ::',
     'setup_no_migrations' => 'No hay nada que migrar. ¡Las tablas de la base de datos ya estaban configuradas!',
     'setup_successful_migrations' => 'Se han creado las tablas de la base de datos',
     'setup_migration_output' => 'Salida de Migración:',
     'setup_migration_create_user' => 'Siguiente: Crear usuario',
-    'ldap_settings_link' => 'Página de ajustes LDAP',
-    'slack_test' => 'Prueba <i class="fab fa-slack"></i> Integración',
-    'label2_enable'           => 'Nuevo motor de etiqueta',
+    'ldap_settings_link' => 'Página de configuración de LDAP',
+    'slack_test' => 'Prueba de integración de <i class="fab fa-slack"></i>',
+    'status_label_name' => 'Status Label Name',
+    'super_admin_only'  => 'Super Admin Only',
+    'label2_enable'           => 'Nuevo motor de etiquetas',
     'label2_enable_help'      => 'Cambiar al nuevo motor de etiquetas. <b>Nota: Deberá guardar esta configuración antes de configurar otros parámetros.</b>',
     'label2_template'         => 'Plantilla',
     'label2_template_help'    => 'Seleccione qué plantilla utilizar para la generación de etiquetas',
     'label2_title'            => 'Título',
     'label2_title_help'       => 'El título para mostrar en etiquetas que lo soportan',
     'label2_title_help_phold' => 'El marcador de posición <code>{COMPANY}</code> será reemplazado con el nombre de la compañía del activo',
-    'label2_asset_logo'       => 'Usar Logo de Activos',
+    'label2_asset_logo'       => 'Usar logo de activos',
     'label2_asset_logo_help'  => 'Utilice el logotipo de la compañía asignada, en lugar del valor en <code>:setting_name</code>',
     'label2_1d_type'          => 'Tipo de código de barras 1D',
     'label2_1d_type_help'     => 'Formato para códigos de barras 1D',
     'label2_2d_type'          => 'Tipo de código de barras 2D',
     'label2_2d_type_help'     => 'Formato para códigos de barras 2D',
     'label2_2d_target'        => 'Apuntamiento del código de barras 2D',
-    'label2_2d_target_help'   => 'La URL a la que apunta el código de barras 2D cuando se escanea',
-    'label2_fields'           => 'Definiciones de campo',
-    'label2_fields_help'      => 'Los campos pueden ser agregados, eliminados y reordenados en la columna izquierda. Para cada campo, múltiples opciones para Etiqueta y DataSource pueden ser agregadas, eliminadas y reordenadas en la columna derecha.',
+    'label2_2d_target_help'   => 'Los datos que incluirá el código de barra 2D',
+    'label2_fields'           => 'Definiciones del campo',
+    'label2_fields_help'      => 'Los campos se pueden añadir, eliminar y reordenar en la columna izquierda. Para cada campo, se pueden agregar, eliminar y reordenar múltiples opciones para etiquetas y para orígenes de datos en la columna derecha.',
+    'purge_barcodes' => 'Purge Barcodes',
     'help_asterisk_bold'    => 'Texto introducido como <code>**texto**</code> se mostrará como negrita',
     'help_blank_to_use'     => 'Deje en blanco para usar el valor de <code>:setting_name</code>',
-    'help_default_will_use' => '<code>:default</code> usará el valor de <code>:setting_name</code>. <br>Tenga en cuenta que el valor de los códigos de barra debe estar en cumplimiento con la especificación respectiva para que sean generados exitosamente. Por favor lea <a href="https://snipe-it.readme.io/docs/barcodes">la documentación <i class="fa fa-external-link"></i></a> para más detalles. ',
+    'help_default_will_use' => '<code>:default</code> usará el valor de <code>:setting_name</code>. <br>Tenga en cuenta que el valor de los códigos de barras debe cumplir la especificación respectiva para que sean generados exitosamente. Por favor lea <a href="https://snipe-it.readme.io/docs/barcodes">la documentación <i class="fa fa-external-link"></i></a> para más detalles. ',
+    'asset_id'              => 'ID del activo',
+    'data'               => 'Datos',
     'default'               => 'Por defecto',
     'none'                  => 'Ninguna',
     'google_callback_help' => 'Esto debe introducirse como URL de devolución de llamada (callback) en la configuración de su aplicación de Google OAuth en la <strong><a href="https://console.cloud.google.com/" target="_blank">consola de desarrollador de Google <i class="fa fa-external-link" aria-hidden="true"></i></a></strong> de su organización .',
     'google_login'      => 'Configuración de inicio de sesión de Google Workspace',
     'enable_google_login'  => 'Permitir a los usuarios iniciar sesión con Google Workspace',
-    'enable_google_login_help'  => 'Los usuarios no serán provistos automáticamente. Deben tener una cuenta existente aquí AND en Google Workspace, y su nombre de usuario debe coincidir con su dirección de correo electrónico de Google Workspace. ',
+    'enable_google_login_help'  => 'Los usuarios no serán creados automáticamente. Deben tener una cuenta existente aquí Y en Google Workspace, y su nombre de usuario aquí debe coincidir con su dirección de correo electrónico de Google Workspace. ',
     'mail_reply_to' => 'Dirección de respuesta de correo',
     'mail_from' => 'Correo desde la dirección',
     'database_driver' => 'Controlador de base de datos',
     'bs_table_storage' => 'Almacenamiento de tabla',
-    'timezone' => 'Timezone',
+    'timezone' => 'Zona horaria',
+    'test_mail' => 'Test Mail',
     'profile_edit'          => 'Editar perfil',
     'profile_edit_help'          => 'Permitir que los usuarios editen sus propios perfiles.',
+    'default_avatar' => 'Custom Default Avatar',
+    'default_avatar_help' => 'Esta imagen se mostrará como la imagen de perfil si el usuario no tiene foto de perfil.',
+    'restore_default_avatar' => 'Restaurar <a href=":default_avatar" data-toggle="lightbox" data-type="image">avatar original por defecto del sistema</a>',
+    'restore_default_avatar_help' => '',
+    'due_checkin_days' => 'Advertencia para próximos ingresos',
+    'due_checkin_days_help' => '¿Cuántos días antes de la fecha prevista de ingreso de un activo debe figurar en la página «Próximos a ingresar»?',
+    'no_groups' => 'Todavía no se han creado grupos. Para agregar uno, visite<code>Configuración de administración > Grupos de permisos</code>.',
+    'text' => 'Text',
+
+    'username_formats' => [
+        'username_format'		=> 'Formato de nombre de usuario',
+        'firstname_lastname_format'	=> 'First Name Last Name (jane.smith)',
+        'first_name_format'	        => 'First Name (jane)',
+        'last_name_format'		=> 'Last Name (doe)',
+        'filastname_format'			=> 'First Initial Last Name (jsmith)',
+        'lastnamefirstinitial_format' =>  'Last Name First Initial (smithj)',
+        'firstname_lastname_underscore_format' => 'First Name Last Name (jane_smith)',
+        'firstinitial.lastname' => 'First Initial Last Name (j.smith)',
+        'lastname_firstinitial' => 'Last Name First Initial (smith_j)',
+        'lastname_dot_firstinitial_format' => 'Last Name First Initial (smith.j)',
+        'firstnamelastname'     => 'First Name Last Name (janesmith)',
+        'firstnamelastinitial'  => 'First Name Last Initial (janes)',
+        'lastnamefirstname'      => 'Apellido.Nombre (smith.jane)',
+    ],
+
+    'email_formats' => [
+        'email_format'			=> 'Formato de correo electrónico',
+        'firstname_lastname_format'	=> 'Nombre y apellido (jane.smith@ejemplo.com)',
+        'first_name_format'		=> 'Nombre (jane@ejemplo.com)',
+        'last_name_format'		=> 'Last Name (doe@example.com)',
+        'filastname_format'			=> 'Inicial del nombre y apellido (jsmith@ejemplo.com)',
+        'lastnamefirstinitial_format' =>  'Apellido e inicial del nombre (smithj@example.com)',
+        'firstname_lastname_underscore_format' => 'Nombre y apellido (jane_smith@ejemplo.com)',
+        'firstinitial.lastname' => 'Inicial del nombre y apellido (j.smith@ejemplo.com)',
+        'lastname_firstinitial' => 'Apellido e inicial del nombre (smith_j@ejemplo.com)',
+        'lastname_dot_firstinitial_format' => 'Last Name First Initial (smith.j@example.com)',
+        'firstnamelastname'     => 'Nombre y apellido (janesmith@example.com)',
+        'firstnamelastinitial'  => 'Nombre e inicial del apellido (janes@example.com)',
+        'lastnamefirstname'      => 'Apellido.Nombre (smith.jane@example.com)',
+    ],
+
+
+
+    'logo_labels' => [
+        'acceptance_pdf_logo'       => 'PDF Logo',
+        'email_logo'                => 'Logo de correo electrónico',
+        'label_logo'                => 'Logo de etiqueta',
+        'logo'                      => 'Site Logo',
+        'favicon'                   => 'Favicon',
+    ],
+
+    'logo_help' => [
+        'email_logo_size'       => 'Los logotipos cuadrados en el correo electrónico se ven mejor. ',
+    ],
+
+    'logo_option_types' => [
+        'text' => 'Text',
+        'logo' => 'Logo',
+        'logo_and_text' => 'Logo and Text',
+    ],
+
+
+    'legends' => [
+        'scoping' => 'Scoping',
+        'formats' => 'Default Formats',
+        'profiles' => 'User Profiles',
+        'eula' => 'EULA & Acceptance Preferences',
+        'misc_display' => 'Miscellaneous Display Options',
+        'email' => 'Email Preferences',
+        'checkin' => 'Checkin Preferences',
+        'dashboard' => 'Login & Dashboard Preferences',
+        'misc' => 'Miscellaneous',
+        'logos' => 'Logos & Display',
+        'colors' => 'Colors & Skins',
+        'footer' => 'Footer Preferences',
+        'security' => 'Security Preferences',
+        'general' => 'General',
+        'intervals' => 'Intervals & Thresholds',
+    ],
+
+
+    /* Keywords for settings overview help */
+    'keywords' => [
+        'brand'             => 'pie de página, logotipo, impresión, tema, apariencia, encabezado, colores, color, css',
+        'general_settings'  => 'soporte de la compañía, firma, aceptación, formato de correo electrónico, formato de nombre de usuario, imágenes, por página, miniatura, acuerdo de uso, términos y condiciones, gravatar, términos de servicio, tablero de indicadores, privacidad',
+        'groups'            => 'permisos, grupos de permisos, autorización',
+        'labels'            => 'etiquetas, código de barras, código de barra, hojas, imprimir, upc, qr, 1d, 2d',
+        'localization'      => 'localización, moneda, local, ubicación, zona horaria, internacional, internacionalización, idioma, traducción',
+        'php_overview'      => 'phpinfo, sistema, información',
+        'purge'             => 'eliminar permanentemente',
+        'security'          => 'contraseña, contraseñas, requisitos, dos factores, contraseñas comunes, inicio de sesión remoto, autenticación',
+    ],
 
 ];
diff --git a/resources/lang/es-CO/admin/settings/message.php b/resources/lang/es-CO/admin/settings/message.php
index 00d46e012a..cea38bd3b6 100644
--- a/resources/lang/es-CO/admin/settings/message.php
+++ b/resources/lang/es-CO/admin/settings/message.php
@@ -9,13 +9,16 @@ return [
     'backup' => [
         'delete_confirm'        => '¿Está seguro de que desea eliminar este archivo de respaldo? Esta acción no puede se puede deshacer. ',
         'file_deleted'          => 'El archivo de copia de seguridad se ha eliminado correctamente. ',
-        'generated'             => 'Se ha creado un nuevo archivo de copia de seguridad.',
+        'generated'             => 'Se ha creado correctamente un nuevo archivo de copia de seguridad.',
         'file_not_found'        => 'Ese archivo de copia de seguridad no se pudo encontrar en el servidor.',
         'restore_warning'       => 'Sí, restaurarlo. Reconozco que esto sobrescribirá cualquier dato existente actualmente en la base de datos. Esto también cerrará la sesión de todos sus usuarios existentes (incluido usted).',
         'restore_confirm'       => '¿Está seguro que desea restaurar su base de datos desde :filename?'
     ],
+    'restore' => [
+        'success'               => 'Se ha restaurado la copia de seguridad de su sistema. Por favor, vuelva a iniciar sesión.'
+    ],
     'purge' => [
-        'error'     => 'Se ha producido un error al purgar. ',
+        'error'     => 'Ha ocurrido un error mientras se realizaba el purgado. ',
         'validation_failed'     => 'Su confirmación de purga es incorrecta. Por favor, escriba la palabra "DELETE" en el cuadro de confirmación.',
         'success'               => 'Los registros eliminados se han purgado correctamente.',
     ],
@@ -23,24 +26,34 @@ return [
         'sending' => 'Enviando correo electrónico de prueba...',
         'success' => '¡Correo enviado!',
         'error' => 'El correo no pudo ser enviado.',
-        'additional' => 'Ningún mensaje de error adicional proporcionado. Comprueba la configuración de tu correo y el registro de tu aplicación.'
+        'additional' => 'No se proporciona ningún mensaje de error adicional. Compruebe la configuración de su correo y el registro de errores de la aplicación.'
     ],
     'ldap' => [
-        'testing' => 'Probando conexión LDAP, Binding & Query ...',
-        '500' => 'Error 500 del servidor. Por favor, compruebe los registros de su servidor para más información.',
+        'testing' => 'Probando conexión al LDAP, Binding & Query ...',
+        '500' => 'Error 500 del servidor. Por favor, compruebe los registros de error de su servidor para más información.',
         'error' => 'Algo salió mal :(',
         'sync_success' => 'Una muestra de 10 usuarios devueltos desde el servidor LDAP basado en su configuración:',
         'testing_authentication' => 'Probando autenticación LDAP...',
         'authentication_success' => 'Usuario autenticado contra LDAP con éxito!'
     ],
+    'labels' => [
+        'null_template' => 'Label template not found. Please select a template.',
+        ],
     'webhook' => [
         'sending' => 'Enviando mensaje de prueba :app...',
-        'success' => '¡Su Integración :webhook_name funciona!',
-        'success_pt1' => '¡Éxito! Comprueba el ',
+        'success' => '¡Su integración :webhook_name funciona!',
+        'success_pt1' => '¡Éxito! Compruebe el ',
         'success_pt2' => ' para su mensaje de prueba, y asegúrese de hacer clic en GUARDAR abajo para guardar su configuración.',
         '500' => 'Error 500 del servidor.',
         'error' => 'Algo salió mal. :app respondió con: :error_message',
         'error_redirect' => 'ERROR: 301/302 :endpoint devuelve una redirección. Por razones de seguridad, no seguimos redirecciones. Por favor, utilice el punto final actual.',
         'error_misc' => 'Algo salió mal. :( ',
-    ]
+        'webhook_fail' => ' Notificación de webhook fallida: Compruebe que la URL sigue siendo válida.',
+        'webhook_channel_not_found' => ' webhook channel not found.',
+        'ms_teams_deprecation' => 'The selected Microsoft Teams webhook URL will be deprecated Dec 31st, 2025. Please use a workflow URL. Microsoft\'s documentation on creating a workflow can be found <a href="https://support.microsoft.com/en-us/office/create-incoming-webhooks-with-workflows-for-microsoft-teams-8ae491c7-0394-4861-ba59-055e33f75498" target="_blank"> here.</a>',
+    ],
+    'location_scoping' => [
+        'not_saved' => 'Your settings were not saved.',
+        'mismatch' => 'There is 1 item in the database that need your attention before you can enable location scoping.|There are :count items in the database that need your attention before you can enable location scoping.',
+    ],
 ];
diff --git a/resources/lang/es-CO/admin/statuslabels/message.php b/resources/lang/es-CO/admin/statuslabels/message.php
index 0474cbea52..d78a99dda7 100644
--- a/resources/lang/es-CO/admin/statuslabels/message.php
+++ b/resources/lang/es-CO/admin/statuslabels/message.php
@@ -7,7 +7,7 @@ return [
     'assoc_assets'	 => 'Esta etiqueta de estado está actualmente asociada con al menos un activo y no se puede eliminar. Por favor actualice sus activos para que ya no hagan referencia a este estado e inténtelo de nuevo. ',
 
     'create' => [
-        'error'   => 'La etiqueta de estado no pudo ser creada, por favor inténtalo de nuevo.',
+        'error'   => 'La etiqueta de estado no pudo ser creada, por favor inténtelo de nuevo.',
         'success' => 'La etiqueta de estado fue creada exitosamente.',
     ],
 
@@ -18,14 +18,14 @@ return [
 
     'delete' => [
         'confirm'   => '¿Está seguro de que desea eliminar esta etiqueta de estado?',
-        'error'   => 'Hubo un problema al eliminar la etiqueta de estado. Por favor inténtalo de nuevo.',
+        'error'   => 'Hubo un problema borrando la etiqueta de estado. Por favor, inténtelo de nuevo.',
         'success' => 'La etiqueta de estado fue eliminada de forma exitosa.',
     ],
 
     'help' => [
-        'undeployable'   => 'Estos equipos no pueden ser asignados.',
+        'undeployable'   => 'Estos activos no pueden ser asignados.',
         'deployable'   => 'Estos activos pueden ser asignados. Una vez estén asignados, asumirán el meta estado de <i class="fas fa-circle text-blue"></i> <strong>Asignado</strong>.',
-        'archived'   => 'Estos equipos no pueden ser asignados y solo se mostrarán en la vista de Archivados. Esto es útil para mantener información de activos por razones de presupuesto o de revisión histórica y al mismo tiempo se excluyen de los activos que se pueden usar en el día a día.',
+        'archived'   => 'Estos activos no pueden ser asignados y solo se mostrarán en la vista de Archivados. Esto es útil para mantener información de activos por razones de presupuesto o de revisión histórica y al mismo tiempo se excluyen de los activos que se pueden usar en el día a día.',
         'pending'   => 'Estos activos aún no pueden asignarse, y suelen utilizarse para elementos que están en reparación, pero que se espera que regresen a circulación.',
     ],
 
diff --git a/resources/lang/es-CO/admin/statuslabels/table.php b/resources/lang/es-CO/admin/statuslabels/table.php
index 459ee3dd92..05daeda180 100644
--- a/resources/lang/es-CO/admin/statuslabels/table.php
+++ b/resources/lang/es-CO/admin/statuslabels/table.php
@@ -1,19 +1,19 @@
 <?php
 
 return array(
-    'about'      	=> 'Acerca de las etiquetas de estado',
+    'about'      	=> 'About Status Types',
     'archived'      	=> 'Archivado',
     'create'      	=> 'Crear etiqueta de estado',
     'color'      	=> 'Color en el gráfico',
     'default_label' => 'Etiqueta predeterminada',
     'default_label_help' => 'Esto se usa para asegurar que sus etiquetas de estado que utiliza con más frecuencia aparezcan en la parte superior del cuadro de selección al crear / editar activos.',
     'deployable'      	=> 'Utilizable',
-    'info'      	=> 'Las etiquetas de estado se usan para describir los diferentes estados en que pueden estar sus equipos. Por ejemplo: en reparación, perdidos/robados, etc. Puede crear nuevas etiquetas de estado para equipos utilizables, pendientes o archivados.',
+    'info'      	=> 'Status label types are used to describe the various states your assets could be in. They may be out for repair, lost/stolen, etc. You can create new status labels for your deployable, pending and archived assets according to your own workflow. For more information, <a href="https://snipe-it.readme.io/docs/overview#status-labels" target="_blank">see the documentation <i class="fa fa-external-link"></i></a>.',
     'name'      	=> 'Nombre de estado',
     'pending'      	=> 'Pendiente',
     'status_type'   => 'Tipo de estado',
-    'show_in_nav'   => 'Mostrar en barra lateral',
+    'show_in_nav'   => 'Mostrar en la barra lateral',
     'title'      	=> 'Etiquetas de estado',
     'undeployable'  => 'No utilizable',
-    'update'      	=> 'Actualizar Etiqueta de Estado',
+    'update'      	=> 'Actualizar la etiqueta de estado',
 );
diff --git a/resources/lang/es-CO/admin/suppliers/message.php b/resources/lang/es-CO/admin/suppliers/message.php
index 56673eac51..7ea9253fda 100644
--- a/resources/lang/es-CO/admin/suppliers/message.php
+++ b/resources/lang/es-CO/admin/suppliers/message.php
@@ -7,22 +7,22 @@ return array(
 
 
     'create' => array(
-        'error'   => 'Proveedor no fue creado, por favor inténtelo de nuevo.',
+        'error'   => 'El proveedor no fue creado, por favor inténtelo de nuevo.',
         'success' => 'Proveedor creado con éxito.'
     ),
 
     'update' => array(
-        'error'   => 'Proveedor no actualizado, por favor inténtalo de nuevo',
+        'error'   => 'El proveedor no fue actualizado, por favor inténtelo de nuevo',
         'success' => 'Proveedor actualizado correctamente.'
     ),
 
     'delete' => array(
         'confirm'   => '¿Está seguro de que desea eliminar este proveedor?',
-        'error'   => 'Hubo un problema al eliminar el proveedor. Inténtalo de nuevo.',
+        'error'   => 'Hubo un problema al eliminar el proveedor, por favor inténtelo de nuevo.',
         'success' => 'Proveedor eliminado correctamente.',
-        'assoc_assets'	 => 'Este proveedor está asociado con :asset_count activo(s) y no puede ser eliminado. Por favor, actualice sus activos para dejar de hacer referencia a este proveedor y vuelva a intentarlo. ',
-        'assoc_licenses'	 => 'Este proveedor está asociado actualmente con :licenses_count licences(s) y no puede ser eliminado. Por favor, actualice sus licencias para dejar de hacer referencia a este proveedor e inténtelo de nuevo. ',
-        'assoc_maintenances'	 => 'Este proveedor está actualmente asociado con :asset_maintainances_count mantenimiento(s) y no puede ser eliminado. Por favor, actualice el mantenimiento de sus activos para no hacer referencia a este proveedor y vuelva a intentarlo. ',
+        'assoc_assets'	 => 'Este proveedor está actualmente asociado con :asset_count activo(s) y no puede ser eliminado. Actualice sus activos para que ya no hagan referencia a este proveedor e inténtelo de nuevo. ',
+        'assoc_licenses'	 => 'Este proveedor está asociado actualmente con :licenses_count licences(s) y no puede ser eliminado. Actualice sus licencias para que ya no hagan referencia a este proveedor e inténtelo de nuevo. ',
+        'assoc_maintenances'	 => 'Este proveedor está actualmente asociado con :asset_maintainances_count mantenimiento(s) de activo(s) y no puede ser eliminado. Por favor, actualice el mantenimiento de sus activos para no hacer referencia a este proveedor y vuelva a intentarlo. ',
     )
 
 );
diff --git a/resources/lang/es-CO/admin/suppliers/table.php b/resources/lang/es-CO/admin/suppliers/table.php
index d5f8090975..e1a1cf49a4 100644
--- a/resources/lang/es-CO/admin/suppliers/table.php
+++ b/resources/lang/es-CO/admin/suppliers/table.php
@@ -1,14 +1,14 @@
 <?php
 
 return array(
-    'about_suppliers_title' => 'Acerca de Proveedores',
-    'about_suppliers_text'  => 'Los proveedores se utilizan para rastrear la fuente de los artículos',
+    'about_suppliers_title' => 'Acerca de los proveedores',
+    'about_suppliers_text'  => 'Los proveedores se utilizan para hacer seguimiento al origen de los elementos',
     'address'               => 'Dirección del proveedor',
     'assets'                => 'Activos',
     'city'                  => 'Ciudad',
     'contact'               => 'Nombre de contacto',
     'country'               => 'País',
-    'create'                => 'Crear Proveedor',
+    'create'                => 'Crear un proveedor',
     'email'                 => 'Correo electrónico',
     'fax'                   => 'Fax',
     'id'                    => 'ID',
@@ -19,7 +19,7 @@ return array(
     'state'                 => 'Departamento',
     'suppliers'             => 'Proveedores',
     'update'                => 'Actualizar proveedor',
-    'view'                  => 'Ver Proveedor',
+    'view'                  => 'Ver proveedor',
     'view_assets_for'       => 'Ver activos para',
     'zip'                   => 'Código postal',
 
diff --git a/resources/lang/es-CO/admin/users/general.php b/resources/lang/es-CO/admin/users/general.php
index 10c4618798..770c6d9e16 100644
--- a/resources/lang/es-CO/admin/users/general.php
+++ b/resources/lang/es-CO/admin/users/general.php
@@ -2,41 +2,43 @@
 
 return [
     'activated_help_text' => 'Este usuario puede iniciar sesión',
-    'activated_disabled_help_text' => 'No puedes editar el estado de activación de tu propia cuenta.',
-    'assets_user'       => 'Recursos asignados a :name',
+    'activated_disabled_help_text' => 'No puede editar el estado de activación de su propia cuenta.',
+    'assets_user'       => 'Activos asignados a :name',
     'bulk_update_warn'	=> 'Está a punto de modificar las propiedades de :user_count usuarios. Por favor, tenga en cuenta que no puede modificar las propiedades de su propio usuario con este formulario, y debe realizar las modificaciones a su propio usuario de forma individual.',
-    'bulk_update_help'	=> 'Este formulario le permite actualizar varios usuarios a la vez. Sólo rellene los campos que necesita cambiar. Cualquier campo que deje en blanco permanecerá sin cambios.',
-    'current_assets'    => 'Activos reservados a este usuario',
+    'bulk_update_help'	=> 'Este formulario le permite actualizar varios usuarios a la vez. Solo diligencie los campos que necesita modificar. Los campos que queden en blanco no se modificarán.',
+    'current_assets'    => 'Activos actualmente asignados a este usuario',
     'clone'             => 'Clonar usuario',
     'contact_user'      => 'Contacto :name',
     'edit'              => 'Editar usuario',
     'filetype_info'     => 'Los tipos de archivo permitidos son png, gif, jpg, jpeg, doc, docx, pdf, txt, zip, y rar.',
     'history_user'      => 'Historial de :name',
-    'info'				=> 'Info',
+    'info'				=> 'Información',
     'restore_user'		=> 'Haga clic aquí para restaurarlos.',
     'last_login'        => 'Último acceso',
-    'ldap_config_text'  => 'Los ajustes de configuración LDAP se pueden encontrar Admin > Configuración. La ubicación (opcional) seleccionada se establecerá para todos los usuarios importados.',
+    'ldap_config_text'  => 'Los ajustes de configuración para LDAP se pueden encontrar en Administrador> LDAP. La ubicación (opcional) seleccionada se establecerá para todos los usuarios importados.',
     'print_assigned'    => 'Imprimir todos los asignados',
     'email_assigned'    => 'Enviar correo con todos los asignados',
-    'user_notified'     => 'El usuario ha sido enviado por correo electrónico a una lista de sus elementos asignados actualmente.',
+    'user_notified'     => 'Se ha enviado al usuario un correo electrónico con lista de los elementos que tiene asignados actualmente.',
+    'users_notified'    => 'The user has been emailed a list of their currently assigned items.|:count users have been emailed a list of their currently assigned items.',
+    'users_notified_warning' => ':count user has been emailed a list of their currently assigned items, however :no_email users did not have an email address so could not be emailed.|:count users have been emailed a list of their currently assigned items, however :no_email user(s) did not have an email address so could not be emailed.',
     'auto_assign_label' => 'Incluye a este usuario al asignar automáticamente licencias elegibles',
     'auto_assign_help'  => 'Omitir este usuario en la asignación automática de licencias',
-    'software_user'     => 'Software comprado a :name',
+    'software_user'     => 'Software asignado a :name',
     'send_email_help'   => 'Debe proporcionar una dirección de correo electrónico para este usuario para poder enviarle las credenciales. Únicamente pueden enviarse las credenciales por correo eléctronico durante la creación del usuario. Las contraseñas se almacenan en un hash de un solo sentido y no se pueden recuperar una vez guardadas.',
     'view_user'         => 'Ver usuario :name',
     'usercsv'           => 'Archivo CSV',
     'two_factor_admin_optin_help' => 'La configuración actual permite la aplicación selectiva de la autenticación de dos factores.  ',
-    'two_factor_enrolled' => 'Dispositivo 2FA inscrito ',
+    'two_factor_enrolled' => 'Dispositivo con 2FA inscrito ',
     'two_factor_active'   => '2FA activo ',
-    'user_deactivated'  => 'Usuario no puede iniciar sesión',
-    'user_activated'  => 'Usuario puede iniciar sesión',
+    'user_deactivated'  => 'El usuario no puede iniciar sesión',
+    'user_activated'  => 'El usuario puede iniciar sesión',
     'activation_status_warning' => 'No cambiar el estado de activación',
     'group_memberships_helpblock' => 'Sólo los superadministradores pueden editar membresías de grupo.',
     'superadmin_permission_warning' => 'Sólo los superadministradores pueden conceder acceso a un usuario superadministrador.',
     'admin_permission_warning' => 'Sólo los usuarios con derechos de administrador o mayores pueden conceder acceso de administrador a los usuarios.',
     'remove_group_memberships' => 'Eliminar membresías de grupo',
-    'warning_deletion_information' => 'Está a punto de devolver TODOS los elementos de :count usuario(s) listados a continuación. Los nombres de usuarios con permisos Super Administrador están resaltados en rojo.',
-    'update_user_assets_status' => 'Actualizar todos los recursos para estos usuarios a este estado',
+    'warning_deletion_information' => 'Está a punto de ingresar TODOS los elementos de :count usuario(s) listados a continuación. Los nombres de usuarios con permisos Super Administrador están resaltados en rojo.',
+    'update_user_assets_status' => 'Actualizar todos los activos para estos usuarios a este estado',
     'checkin_user_properties' => 'Comprobar todas las propiedades asociadas a estos usuarios',
     'remote_label'   => 'Este es un usuario remoto',
     'remote'   => 'Remoto',
@@ -46,9 +48,9 @@ return [
     'vip_help' => 'Esto puede ser útil como indicador de personas importantes en su organización si desea tratarlas de forma especial.',
     'create_user' => 'Crear un usuario',
     'create_user_page_explanation' => 'Esta es la información de la cuenta que usará para acceder al sitio por primera vez.',
-    'email_credentials' => 'Credenciales de email',
-    'email_credentials_text' => 'Enviar mis credenciales a la dirección de correo de arriba',
+    'email_credentials' => 'Credenciales de correo electrónico',
+    'email_credentials_text' => 'Enviar mis credenciales a la dirección de correo electrónico de arriba',
     'next_save_user' => 'Siguiente: Guardar usuario',
     'all_assigned_list_generation' => 'Generado el:',
-    'email_user_creds_on_create' => '¿Enviar a este usuario sus credenciales?',
+    'email_user_creds_on_create' => '¿Enviar las credenciales por correo electrónico a este usuario?',
 ];
diff --git a/resources/lang/es-CO/admin/users/message.php b/resources/lang/es-CO/admin/users/message.php
index d61b278fdf..5b28e7ba73 100644
--- a/resources/lang/es-CO/admin/users/message.php
+++ b/resources/lang/es-CO/admin/users/message.php
@@ -3,29 +3,29 @@
 return array(
 
     'accepted'                  => 'Ha aceptado este artículo exitosamente.',
-    'declined'                  => 'Ha rechazado este activo con éxito.',
-    'bulk_manager_warn'	        => 'Sus usuarios han sido actualizados con éxito, sin embargo, la entrada de administrador no fue guardada porque el gerente seleccionado también estaba en la lista de usuarios a ser editada, y los usuarios no pueden ser sus propios gerentes. Vuelva a seleccionar los usuarios, excluyendo al gerente.',
+    'declined'                  => 'Ha rechazado correctamente este activo.',
+    'bulk_manager_warn'	        => 'Sus usuarios han sido actualizados con éxito, sin embargo, la entrada supervisor (manager) no fue guardada porque el supervisor seleccionado también estaba en la lista de usuarios a editar, y los usuarios no pueden ser su propio supervisor. Vuelva a seleccionar los usuarios, excluyendo al supervisor.',
     'user_exists'               => '¡El usuario ya existe!',
-    'user_not_found'            => 'El usuario no existe.',
+    'user_not_found'            => 'El usuario no existe o usted no tiene permisos para verlo.',
     'user_login_required'       => 'El campo usuario es obligatorio',
     'user_has_no_assets_assigned' => 'No hay activos asignados al usuario.',
     'user_password_required'    => 'La contraseña es obligatoria.',
     'insufficient_permissions'  => 'Permisos insuficientes.',
     'user_deleted_warning'      => 'Este usuario ha sido eliminado. Tendrá que restaurar este usuario para editarlo o para asignarle nuevos activos.',
-    'ldap_not_configured'        => 'La integración LDAP no ha sido configurada para esta instalación.',
+    'ldap_not_configured'        => 'La integración con LDAP no ha sido configurada para esta instalación.',
     'password_resets_sent'      => 'Los usuarios seleccionados que están activados y tienen una dirección de correo electrónico válida han sido enviados un enlace de restablecimiento de contraseña.',
     'password_reset_sent'       => 'Un enlace para restablecer la contraseña ha sido enviado a :email!',
     'user_has_no_email'         => 'Este usuario no tiene una dirección de correo electrónico en su perfil.',
-    'log_record_not_found'        => 'No se pudo encontrar un registro de registro coincidente para este usuario.',
+    'log_record_not_found'        => 'No se pudo encontrar un registro de eventos que coincida con este usuario.',
 
 
     'success' => array(
-        'create'    => 'El usuario se ha creado correctamente.',
+        'create'    => 'El usuario fue creado correctamente.',
         'update'    => 'Usuario actualizado exitosamente.',
         'update_bulk'    => '¡Usuarios actualizados con éxito!',
         'delete'    => 'El usuario se ha eliminado correctamente.',
         'ban'       => 'El usuario fue baneado con éxito.',
-        'unban'     => 'El usuario se ha desbaneado correctamente.',
+        'unban'     => 'El usuario fue desbloqueado correctamente.',
         'suspend'   => 'El usuario fue suspendido correctamente.',
         'unsuspend' => 'El usuario no fue suspendido correctamente.',
         'restored'  => 'Usuario restaurado correctamente.',
@@ -36,35 +36,36 @@ return array(
         'create' => 'Hubo un problema al crear el usuario. Por favor, inténtelo de nuevo.',
         'update' => 'Hubo un problema al actualizar el usuario. Por favor, inténtelo de nuevo.',
         'delete' => 'Hubo un problema al eliminar el usuario. Por favor, inténtelo de nuevo.',
-        'delete_has_assets' => 'Este usuario tiene elementos asignados y no se ha podido eliminar.',
-        'delete_has_assets_var' => 'Este usuario todavía tienen un activo asignado. Por favor devuélvalo primero.| Este usuario todavía tienen :count activos asignados. Por favor devuélvalos primero.',
-        'delete_has_licenses_var' => 'Este usuario todavía tiene una licencia asignada. Por favor primero haga su devolución.|Este usuario todavía tiene :count licencias asignadas. Por favor primero haga su devolución.',
-        'delete_has_accessories_var' => 'Este usuario todavía tiene un accesorio asignado. Por favor primero haga su devolución.|Este usuario todavía tiene :count accesorios asignados. Por favor primero haga su devolución.',
-        'delete_has_locations_var' => 'Este usuario todavía supervisa una ubicación. Por favor seleccione otro supervisor primero.|Este usuario todavía supervisa :count ubicaciones. Por favor seleccione otro supervisor primero.',
+        'delete_has_assets' => 'Este usuario tiene elementos asignados y no se pudo eliminar.',
+        'delete_has_assets_var' => 'Este usuario todavía tiene un activo asignado. Por favor ingréselo primero.|Este usuario todavía tiene :count activos asignados. Por favor ingréselos primero.',
+        'delete_has_licenses_var' => 'Este usuario todavía tiene una licencia asignada. Por favor ingrésela primero.|Este usuario todavía tiene :count licencias asignadas. Por favor ingréselas primero.',
+        'delete_has_accessories_var' => 'Este usuario todavía tiene un accesorio asignado. Por favor ingréselo primero.|Este usuario todavía tiene :count accesorios asignados. Por favor ingréselos primero.',
+        'delete_has_locations_var' => 'Este usuario todavía supervisa una ubicación. Por favor primero seleccione otro supervisor.|Este usuario todavía supervisa :count ubicaciones. Por favor primero seleccione otro supervisor.',
         'delete_has_users_var' => 'Este usuario todavía supervisa a otro usuario. Por favor primero seleccione otro supervisor para ese usuario.|Este usuario todavía supervisa :count usuarios. Por favor primero seleccione otro supervisor para ellos.',
-        'unsuspend' => 'Hubo un problema sin suspender al usuario. Por favor, inténtelo de nuevo.',
-        'import'    => 'Hubo un problema importando usuarios. Por favor, inténtelo de nuevo.',
+        'unsuspend' => 'Hubo un problema marcando como no suspendido al usuario. Por favor, inténtelo de nuevo.',
+        'import'    => 'Hubo un problema importando los usuarios. Por favor, inténtelo de nuevo.',
         'asset_already_accepted' => 'Este activo ya ha sido aceptado.',
         'accept_or_decline' => 'Debe aceptar o rechazar este activo.',
         'cannot_delete_yourself' => 'Nos sentiríamos muy mal si usted se eliminara, por favor reconsidérelo.',
         'incorrect_user_accepted' => 'El elemento que ha intentado aceptar no fue asignado a usted.',
         'ldap_could_not_connect' => 'No se pudo conectar al servidor LDAP. Por favor, compruebe la configuración del servidor LDAP en el archivo de configuración LDAP. <br>Error del servidor LDAP:',
-        'ldap_could_not_bind' => 'No se pudo enlazar al servidor LDAP. Por favor, compruebe la configuración del servidor LDAP en el archivo de configuración LDAP. <br>Error del servidor LDAP: ',
+        'ldap_could_not_bind' => 'No se ha podido vincular al servidor LDAP. Por favor verifique la configuración de su servidor LDAP en su archivo de configuración.<br> Error del servidor LDAP: ',
         'ldap_could_not_search' => 'No se pudo buscar en el servidor LDAP. Por favor, compruebe la configuración del servidor LDAP en el archivo de configuración LDAP. <br>Error del servidor LDAP:',
         'ldap_could_not_get_entries' => 'No se han podido obtener entradas del servidor LDAP. Por favor, compruebe la configuración del servidor LDAP en el archivo de configuración LDAP. <br>Error del servidor LDAP:',
-        'password_ldap' => 'La contraseña de esta cuenta es administrada por LDAP/Active Directory. Póngase en contacto con su departamento de TI para cambiar su contraseña. ',
+        'password_ldap' => 'La contraseña para esta cuenta es administrada por LDAP / Active Directory. Póngase en contacto con su departamento de TI para cambiar su contraseña. ',
+        'multi_company_items_assigned' => 'Este usuario tiene elementos asignados que pertenecen a una empresa diferente. Por favor, ingréselos o edite su empresa.'
     ),
 
     'deletefile' => array(
-        'error'   => 'Archivo no eliminado. Vuelve a intentarlo.',
+        'error'   => 'El archivo no fue borrado. Por favor, inténtelo de nuevo.',
         'success' => 'Archivo eliminado correctamente.',
     ),
 
     'upload' => array(
         'error'   => 'Archivo(s) no cargados. Por favor, inténtelo de nuevo.',
         'success' => 'Archivo(s) cargados correctamente.',
-        'nofiles' => 'No has seleccionado ningún archivo para subir',
-        'invalidfiles' => 'Uno o más de sus archivos es demasiado grande o es un tipo de archivo que no está permitido. Los tipos de archivo permitidos son png, gif, jpg, doc, docx, pdf y txt.',
+        'nofiles' => 'No seleccionó ningún archivo para cargar',
+        'invalidfiles' => 'Uno o más de sus archivos son demasiado grandes o son de un tipo de archivo que no está permitido. Los tipos de archivo permitidos son png, gif, jpg, doc, docx, pdf y txt.',
     ),
 
     'inventorynotification' => array(
diff --git a/resources/lang/es-CO/admin/users/table.php b/resources/lang/es-CO/admin/users/table.php
index a3fd73969e..a3d9c528e5 100644
--- a/resources/lang/es-CO/admin/users/table.php
+++ b/resources/lang/es-CO/admin/users/table.php
@@ -3,18 +3,18 @@
 return array(
     'activated'  			=> 'Activo',
     'allow'  				=> 'Permitir',
-    'checkedout'  			=> 'Equipos',
+    'checkedout'  			=> 'Activos',
     'created_at' 			=> 'Creado',
-    'createuser' 			=> 'Crear Usuario',
+    'createuser' 			=> 'Crear usuario',
     'deny'  				=> 'Denegar',
     'email'      			=> 'Correo electrónico',
     'employee_num'      	=> 'Nro. Empleado',
     'first_name' 			=> 'Nombre',
     'groupnotes'			=> 'Seleccione un grupo para asignar al usuario, recuerde que un usuario asume los permisos del grupo al que se le asigna. Use ctrl+click (o cmd+click en MacOS) para anular la selección de grupos.',
     'id'         			=> 'Id',
-    'inherit'  				=> 'Heredar',
+    'inherit'  				=> 'Hereda de',
     'job' 					=> 'Cargo',
-    'last_login'  			=> 'Último acceso',
+    'last_login'  			=> 'Último inicio de sesión',
     'last_name'  			=> 'Apellidos',
     'location'  			=> 'Ubicación',
     'lock_passwords'		=> 'Los detalles de inicio de sesión no pueden ser cambiados en esta instalación.',
@@ -22,7 +22,7 @@ return array(
     'managed_locations'     => 'Ubicaciones gestionadas',
     'managed_users'         => 'Usuarios gestionados',
     'name' 					=> 'Nombre',
-    'nogroup'               => 'Aún no se han creado grupos. Para añadir uno, visite: ',
+    'nogroup'               => 'Aún no se han creado grupos. Para añadir uno, visite:',
     'notes'                 => 'Notas',
     'password_confirm' 		=> 'Confirmar contraseña',
     'password' 				=> 'Contraseña',
@@ -31,9 +31,9 @@ return array(
     'show_deleted'          => 'Mostrar usuarios eliminados',
     'title' 				=> 'Cargo',
 	'to_restore_them'		=> 'para restaurarlos.',
-    'total_assets_cost'     => "Coste total de activos",
+    'total_assets_cost'     => "Costo total de activos",
     'updateuser' 			=> 'Actualizar usuario',
-    'username' 				=> 'Usuario',
+    'username' 				=> 'Nombre de usuario',
 	'user_deleted_text' 	=> 'Este usuario ha sido marcado como eliminado.',
     'username_note' 		=> '(Esto se utiliza sólo para enlazar Active Directory, no para iniciar sesión.)',
     'cloneuser'             => 'Clonar usuario',
diff --git a/resources/lang/es-CO/auth.php b/resources/lang/es-CO/auth.php
index 387ea794b6..d4c25934f4 100644
--- a/resources/lang/es-CO/auth.php
+++ b/resources/lang/es-CO/auth.php
@@ -15,6 +15,6 @@ return array(
 
     'failed' => 'Estas credenciales no coinciden con nuestros registros.',
     'password' => 'La contraseña proporcionada es incorrecta.',
-    'throttle' => 'Demasiados intentos de inicio de sesión. Por favor, inténtalo de nuevo en :seconds segundos.',
+    'throttle' => 'Too many login attempts. Please try again in :minutes minute(s).',
 
 );
diff --git a/resources/lang/es-CO/auth/general.php b/resources/lang/es-CO/auth/general.php
index df9eb711d6..1f56aa644d 100644
--- a/resources/lang/es-CO/auth/general.php
+++ b/resources/lang/es-CO/auth/general.php
@@ -2,10 +2,10 @@
 
 return [
     'send_password_link'	        => 'Enviar enlace de restablecimiento de contraseña',
-    'email_reset_password'			=> 'Enviar correo',
+    'email_reset_password'			=> 'Enviar correo electrónico para restablecer la contraseña',
     'reset_password'			    => 'Restablecer contraseña',
     'saml_login'                    => 'Iniciar sesión a través de SAML',
-    'login'                         => 'Entrar',
+    'login'                         => 'Iniciar sesión',
     'login_prompt'                  => 'Por favor inicie sesión',
     'forgot_password'               => 'Olvidé mi contraseña',
     'ldap_reset_password'           => 'Haga clic aquí para restablecer su contraseña LDAP',
@@ -13,6 +13,6 @@ return [
     'username_help_top'                 => 'Ingrese su <strong>nombre de usuario</strong> para enviar un enlace de restablecimiento de contraseña.',
     'username_help_bottom'          => 'Su nombre de usuario y correo electrónico <em>pueden</em> ser el mismo, pero puede que no lo sean, dependiendo de su configuración. Si no recuerda su nombre de usuario, contacte al administrador. <br><br><strong>A los nombres de usuario que no tengan un correo electrónico asociado, no se les enviará el enlace de cambio de contraseña.</strong> ',
     'google_login'                  => 'Iniciar sesión con Google Workspace',
-    'google_login_failed'           => 'Error al iniciar sesión en Google. Vuelve a intentarlo.',
+    'google_login_failed'           => 'Error al iniciar sesión en Google, por favor, vuelva a intentarlo.',
 ];
 
diff --git a/resources/lang/es-CO/auth/message.php b/resources/lang/es-CO/auth/message.php
index 776b526f5b..dbb7265554 100644
--- a/resources/lang/es-CO/auth/message.php
+++ b/resources/lang/es-CO/auth/message.php
@@ -6,40 +6,38 @@ return array(
     'account_not_found'      => 'El nombre de usuario o la contraseña son incorrectos.',
     'account_not_activated'  => 'Esta cuenta de usuario no está activada.',
     'account_suspended'      => 'Esta cuenta de usuario está suspendida.',
-    'account_banned'         => 'Esta cuenta de usuario está bloqueada.',
-    'throttle'               => 'Demasiados intentos fallidos de inicio de sesión. Por favor, inténtalo de nuevo en :minutes minutos.',
 
     'two_factor' => array(
         'already_enrolled'      => 'Su dispositivo ya está inscrito.',
-        'success'               => 'Has iniciado sesión con éxito.',
-        'code_required'         => 'El código de doble factor es necesario.',
+        'success'               => 'Ha iniciado sesión exitosamente.',
+        'code_required'         => 'Se requiere el código de autenticación de doble factor (2FA).',
         'invalid_code'          => 'El código de doble factor no es válido.',
-        'enter_two_factor_code' => 'Please enter your two-factor authentication code.',
-        'please_enroll'         => 'Please enroll a device in two-factor authentication.',
+        'enter_two_factor_code' => 'Por favor ingrese su código de autenticación de doble factor.',
+        'please_enroll'         => 'Por favor inscriba un dispositivo en la autenticación de dos factores.',
     ),
 
     'signin' => array(
-        'error'   => 'Hubo un problema al intentar iniciar sesión, por favor inténtelo de nuevo.',
-        'success' => 'Has iniciado sesión con éxito.',
+        'error'   => 'Ha habido un problema al iniciar sesión. Por favor, inténtelo de nuevo.',
+        'success' => 'Ha iniciado sesión exitosamente.',
     ),
 
     'logout' => array(
         'error'   => 'Hubo un problema al intentar cerrar la sesión, por favor inténtelo de nuevo.',
-        'success' => 'Has cerrado la sesión con éxito.',
+        'success' => 'Ha cerrado la sesión exitosamente.',
     ),
 
     'signup' => array(
-        'error'   => 'Hubo un problema al intentar crear tu cuenta. Por favor, inténtalo de nuevo.',
+        'error'   => 'Hubo un problema al crear la cuenta. Por favor, inténtelo de nuevo.',
         'success' => 'Cuenta creada correctamente.',
     ),
 
     'forgot-password' => array(
-        'error'   => 'Hubo un problema al intentar restablecer el código de contraseña, por favor inténtalo de nuevo.',
+        'error'   => 'Ha habido un problema al obtener un código de restablecimiento de la contraseña. Por favor, inténtelo de nuevo.',
         'success' => 'Si esa dirección de correo electrónico existe en nuestro sistema, se ha enviado un correo electrónico de recuperación de contraseña.',
     ),
 
     'forgot-password-confirm' => array(
-        'error'   => 'Hubo un problema al intentar restablecer su contraseña, por favor inténtelo de nuevo.',
+        'error'   => 'Hubo un problema al intentar restablecer su contraseña, por favor, inténtelo de nuevo.',
         'success' => 'Su contraseña se ha restablecido correctamente.',
     ),
 
diff --git a/resources/lang/es-CO/button.php b/resources/lang/es-CO/button.php
index fd86fa36ad..0620e4edba 100644
--- a/resources/lang/es-CO/button.php
+++ b/resources/lang/es-CO/button.php
@@ -4,21 +4,31 @@ return [
     'actions' 	                => 'Acciones',
     'add'    	                => 'Agregar nuevo',
     'cancel'                    => 'Cancelar',
-    'checkin_and_delete'  	    => 'Devolver todo / Eliminar usuario',
+    'checkin_and_delete'  	    => 'Ingresar todo / Eliminar usuario',
     'delete'  	                => 'Eliminar',
     'edit'    	                => 'Editar',
+    'clone'    	                => 'Clonar',
     'restore' 	                => 'Restaurar',
     'remove'                    => 'Eliminar',
     'request'                   => 'Solicitud',
     'submit'  	                => 'Enviar',
     'upload'                    => 'Cargar',
-    'select_file'				=> 'Seleccione un archivo...',
+    'select_file'				=> 'Seleccionar un archivo...',
     'select_files'				=> 'Seleccionar archivos...',
-    'generate_labels'           => '{1} Generar Etiqueta|[2,*] Generar Etiquetas',
-    'send_password_link'        => 'Enviar enlace de restablecimiento de contraseña',
+    'generate_labels'           => '{1} Generar etiqueta|[2,*] Generar etiquetas',
+    'send_password_link'        => 'Enviar enlace para restablecer la contraseña',
     'go'                        => 'Ir',
-    'bulk_actions'              => 'Acciones en masa',
+    'bulk_actions'              => 'Acciones masivas',
     'add_maintenance'           => 'Añadir mantenimiento',
     'append'                    => 'Añadir',
     'new'                       => 'Nuevo',
+    'var' => [
+        'clone'     => 'Clonar :item_type',
+        'edit'      => 'Editar :item_type',
+        'delete'    => 'Eliminar :item_type',
+        'restore'   => 'Restaurar :item_type',
+        'create'    => 'Crear nuevo :item_type',
+        'checkout'  => 'Asignar :item_type',
+        'checkin'   => 'Ingresar :item_type',
+    ]
 ];
diff --git a/resources/lang/es-CO/general.php b/resources/lang/es-CO/general.php
index 9659adef9d..317d6df501 100644
--- a/resources/lang/es-CO/general.php
+++ b/resources/lang/es-CO/general.php
@@ -1,21 +1,21 @@
 <?php
 
 return [
-    '2FA_reset'             => '2FA reset',
+    '2FA_reset'             => 'Restablecer 2FA',
     'accessories'			=> 'Accesorios',
     'activated'			    => 'Activado',
-    'accepted_date'         => 'Fecha aceptada',
+    'accepted_date'         => 'Fecha de aceptación',
     'accessory'				=> 'Accesorio',
     'accessory_report'		=> 'Informe de accesorios',
     'action'                => 'Acción',
     'activity_report'		=> 'Informe de actividad',
     'address'				=> 'Dirección',
-    'admin'					=> 'Admin',
+    'admin'					=> 'Configuración de administración',
     'admin_tooltip'			=> 'Este usuario tiene privilegios de superadministrador',
     'superuser'				=> 'Superusuario',
     'superuser_tooltip'		=> 'Este usuario es superadministrador',
     'administrator'			=> 'Administrador',
-    'add_seats'             => 'Sitios añadidos',
+    'add_seats'             => 'Licencias añadidas',
     'age'                   => "Edad",
     'all_assets'			=> 'Todos los activos',
     'all'       			=> 'Todo',
@@ -23,20 +23,23 @@ return [
     'asset_models'			=> 'Modelos de activos',
     'asset_model'			=> 'Modelo',
     'asset'					=> 'Activo',
-    'asset_report'          => 'Reporte de Activos',
-    'asset_tag'				=> 'Etiqueta de activo',
-    'asset_tags'            => 'Etiquetas de Activos',
-    'assets_available'		=> 'Recursos disponibles',
+    'asset_previous'        => 'Asset (Previously Assigned)',
+    'asset_report'          => 'Informe de activos',
+    'asset_tag'				=> 'Placa del activo',
+    'asset_tags'            => 'Placas de activos',
+    'assets_available'		=> 'Activos disponibles',
     'accept_assets'         => 'Aceptar activos :name',
     'accept_assets_menu'    => 'Aceptar activos',
-    'audit'				    => 'Auditoría',
+    'accept_item'           => 'Accept Item',
+    'audit'				    => 'Auditar',
+    'audits'				=> 'Audits',
     'audit_report'			=> 'Registro de auditoría',
     'assets'				=> 'Activos',
     'assets_audited'        => 'activos auditados',
-    'assets_checked_in_count'     => 'activos facturados',
-    'assets_checked_out_count'     => 'activos reservados',
-    'asset_deleted_warning'     => 'Este recurso ha sido eliminado. Debe restaurarlo antes de poder asignarlo a alguien.',
-    'assigned_date'         => 'Fecha asignada',
+    'assets_checked_in_count'     => 'activos ingresados',
+    'assets_checked_out_count'     => 'activos asignados',
+    'asset_deleted_warning'     => 'Este activo ha sido eliminado. Debe restaurarlo antes de poder asignarlo a alguien.',
+    'assigned_date'         => 'Fecha de asignación',
     'assigned_to'           => 'Asignado a :name',
     'assignee'              => 'Asignado a',
     'avatar_delete'         => 'Eliminar Avatar',
@@ -44,29 +47,32 @@ return [
     'back'      			=> 'Atrás',
     'bad_data'      		=> 'No se ha encontrado nada. ¿Tal vez datos erróneos?',
     'bulkaudit'             => 'Auditoría masiva',
-    'bulkaudit_status'      => 'Estado de auditoría',
+    'bulkaudit_status'      => 'Estado de la auditoría',
     'bulk_checkout'  		=> 'Asignación masiva',
     'bulk_edit'             => 'Edición masiva',
-    'bulk_delete'           => 'Eliminar en masa',
-    'bulk_actions'          => 'Acciones en masa',
-    'bulk_checkin_delete'   => 'Checkin en masa / Eliminar usuarios',
+    'bulk_delete'           => 'Borrado masivo',
+    'bulk_actions'          => 'Acciones masivas',
+    'bulk_checkin_delete'   => 'Ingresar elementos / Borrar usuarios',
     'byod'                  => 'BYOD',
     'byod_help'             => 'Este dispositivo es propiedad del usuario',
-    'bystatus'              => 'por Estado',
+    'bystatus'              => 'por estado',
     'cancel'  				=> 'Cancelar',
     'categories'			=> 'Categorías',
     'category'				=> 'Categoría',
     'change' 		        => 'Entrada/Salida',
-    'changeemail'  			=> 'Cambiar dirección de email',
+    'changeemail'  			=> 'Cambiar dirección de correo electrónico',
     'changepassword'  		=> 'Cambiar contraseña',
-    'checkin'  				=> 'Devolver',
-    'checkin_from'  		=> 'Devolución de',
+    'checkin'  				=> 'Ingresar',
+    'checkin_from'  		=> 'Ingreso proveniente de',
+    'checkin_note'  		=> 'Checkin Note',
+    'checkout_note'  		=> 'Checkout Note',
     'checkout'  			=> 'Asignar',
     'checkouts_count'       => 'Asignaciones',
-    'checkins_count'        => 'Devoluciones',
+    'checkins_count'        => 'Ingresos',
+    'checkin_and_delete'  	=> 'Ingresar y borrar',
     'user_requests_count'   => 'Solicitudes',
     'city'  				=> 'Ciudad',
-    'click_here'			=> 'Haz clic aquí',
+    'click_here'			=> 'Haga clic aquí',
     'clear_selection'		=> 'Borrar selección',
     'companies'			    => 'Compañías',
     'company'				=> 'Compañía',
@@ -77,30 +83,32 @@ return [
     'consumables'			=> 'Consumibles',
     'country'  				=> 'País',
     'could_not_restore'     => 'Error al restaurar :item_type: :error',
-    'not_deleted'           => 'El :item_type no está borrado por lo que no puede ser restaurado',
+    'not_deleted'           => 'El tipo :item_type no se ha borrado y, por lo tanto, no se puede restaurar',
     'create'				=> 'Crear nuevo',
     'created'               => 'Artículo creado',
     'created_asset'			=> 'activo creado',
-    'created_at' 			=> 'Creado el',
+    'created_at' 			=> 'Fecha de creación',
     'created_by'            => 'Creado por',
     'record_created' 		=> 'Registro Creado',
     'updated_at' 			=> 'Actualizado el',
     'currency'  			=> '$', // this is deprecated
+    'currency_text'  		=> 'Moneda', //
     'current'  				=> 'Actual',
     'current_password'      => 'Contraseña actual',
     'customize_report'      => 'Personalizar informe',
     'custom_report'         => 'Informe personalizado de activos',
     'dashboard'				=> 'Tablero',
-    'days'      			=> 'dias',
-    'days_to_next_audit'    => 'Días a la siguiente auditoría',
+    'data_source'           => 'Data Source',
+    'days'      			=> 'días',
+    'days_to_next_audit'    => 'Días hasta la siguiente auditoría',
     'date'					=> 'Fecha',
-    'debug_warning'         => '¡Alerta!',
-    'debug_warning_text'    => 'Esta aplicación se está ejecutando en modo producción con depuración habilitada. Esto puede exponer datos sensibles si su aplicación es accesible al mundo exterior. Deshabilita el modo de depuración configurando el valor <code>APP_DEBUG</code> en tu <code>. nv</code> archivo a <code>false</code>.',
-    'delete'  				=> 'Eliminar',
+    'debug_warning'         => '¡Advertencia!',
+    'debug_warning_text'    => 'Esta aplicación se está ejecutando en modo producción con depuración habilitada. Esto puede exponer datos sensibles si su aplicación es accedida desde el mundo exterior. Deshabilite el modo de depuración configurando el valor <code>APP_DEBUG</code> en su archivo <code>.env</code> a <code>false</code>.',
+    'delete'  				=> 'Borrar',
     'delete_confirm'  		=> '¿Está seguro de que desea eliminar :item?',
     'delete_confirm_no_undo' => '¿Está seguro de que desea eliminar :item? Esto no se puede deshacer.',
-    'deleted'  				=> 'Eliminado',
-    'delete_seats'  		=> 'Asientos eliminados',
+    'deleted'  				=> 'Borrado',
+    'delete_seats'  		=> 'Licencias eliminadas',
     'deletion_failed'       => 'Error al eliminar',
     'departments'           => 'Departamentos',
     'department'            => 'Departamento',
@@ -112,43 +120,27 @@ return [
     'download'				=> 'Descargar',
     'download_all'		    => 'Descargar todo',
     'editprofile'  			=> 'Editar perfil',
-    'eol'					=> 'Vida útil',
-    'email_domain'			=> 'Dominio de Email',
-    'email_format'			=> 'Formato de correo electrónico',
+    'eol'					=> 'Fin de soporte (EOL)',
+    'email_domain'			=> 'Dominio de correo electrónico',
     'employee_number'       => 'Número de empleado',
-    'email_domain_help'		=> 'Esto se utiliza para generar direcciones de correo electrónico al importar',
+    'email_domain_help'		=> 'Se utiliza para generar direcciones de correo electrónico al importar',
     'error'				    => 'Error',
     'exclude_archived'      => 'Excluir activos archivados',
     'exclude_deleted'       => 'Excluir activos eliminados',
     'example'				=> 'Ejemplo: ',
-    'filastname_format'			=> 'Inicial del nombre y apellido (jsmith@ejemplo.com)',
-    'firstname_lastname_format'	=> 'Nombre y apellido (jane.smith@ejemplo.com)',
-    'firstname_lastname_underscore_format' => 'Nombre y apellido (jane_smith@ejemplo.com)',
-    'lastnamefirstinitial_format' =>  'Apellido e inicial del nombre (smithj@example.com)',
-    'firstintial_dot_lastname_format' => 'Inicial del nombre y apellido (j.smith@ejemplo.com)',
-    'firstname_lastname_display'	=> 'Nombre y apellido (Jane Smith)',
-    'lastname_firstname_display'	=> 'Apellido y nombre (Smith Jane)',
-    'name_display_format'	=> 'Formato para mostrar nombres',
-    'first'					=> 'Primero',
-    'firstnamelastname'     => 'Nombre y apellido (janesmith@example.com)',
-    'lastname_firstinitial' => 'Apellido e inicial del nombre (smith_j@ejemplo.com)',
-    'firstinitial.lastname' => 'Inicial nombre y apellido (j.smith@ejemplo.com)',
-    'firstnamelastinitial'  => 'Nombre e inicial del apellido(janes@example.com)',
-    'lastnamefirstname'      => 'Apellido y nombre (smith.jane@example.com)',
-    'first_name'			=> 'Nombres',
-    'first_name_format'		=> 'Nombre (jane@ejemplo.com)',
+
     'files'                 => 'Archivos',
-    'file_name'				=> 'Fichero',
+    'file_name'				=> 'Archivo',
     'file_type'             => 'Tipo de archivo',
     'filesize'              => 'Tamaño del archivo',
     'file_uploads'			=> 'Subir archivos',
-    'file_upload'           => 'Subir archivo',
+    'file_upload'           => 'Cargar archivo',
     'generate'				=> 'Generar',
     'generate_labels'       => 'Generar etiquetas',
     'github_markdown'      => 'Este campo acepta <a href="https://help.github.com/articles/github-flavored-markdown/">Github con sabor a markdown</a>.',
     'groups'				=> 'Grupos',
-    'gravatar_email'        => 'Dirección de correo Gravatar',
-    'gravatar_url'          => '<a href="http://gravatar.com"><small>Cambia tu avatar en Gravatar.com</small></a>.',
+    'gravatar_email'        => 'Dirección de correo electrónico de Gravatar',
+    'gravatar_url'          => '<a href="http://gravatar.com"><small>Cambie su avatar en Gravatar.com</small></a>.',
     'history'  			    => 'Historial',
     'history_for'  			=> 'Historial para',
     'id'  					=> 'ID',
@@ -156,49 +148,54 @@ return [
     'image_delete'         	=> 'Borrar imagen',
     'include_deleted'       => 'Incluir activos eliminados',
     'image_upload'         	=> 'Cargar imagen',
-    'filetypes_accepted_help'    => 'El tipo de archivo aceptado es :types. El tamaño máximo permitido para subir es :size.|Los tipos de archivo aceptados son :types. El tamaño máximo permitido es :size.',
-    'filetypes_size_help'   => 'El tamaño máximo permitido para subir es :size.',
-    'image_filetypes_help'  => 'Accepted filetypes are jpg, webp, png, gif, svg, and avif. Max upload size allowed is :size.',
-    'unaccepted_image_type'  => 'Este archivo de imagen no fue legible. Los tipos de archivo aceptados son jpg, webp, png, gif y svg. El tipo mimetype de este archivo es: :mimetype.',
+    'filetypes_accepted_help'    => 'El tipo de archivo aceptado es :types. El tamaño máximo permitido es :size.|Los tipos de archivo aceptados son :types. El tamaño máximo permitido para cargar es :size.',
+    'filetypes_size_help'   => 'El tamaño máximo permitido para cargar es :size.',
+    'image_filetypes_help'  => 'Los tipos de archivo aceptados son jpg, webp, png, gif, svg y avif. El tamaño máximo permitido es :size.',
+    'unaccepted_image_type'  => 'No se pudo leer este archivo de imagen. Los tipos de archivo aceptados son jpg, webp, png, gif y svg. El tipo MIME de este archivo es: :mimetype.',
     'import'         	    => 'Importar',
-    'import_this_file'      => 'Mapear campos y procesar este archivo',
-    'importing'         	=> 'Importando',
-    'importing_help'        => 'Puede importar activos, accesorios, licencias, componentes, consumibles y usuarios a través del archivo CSV. <br><br>El CSV debe estar delimitado por comas y formateado con encabezados que coincidan con los del CSVs <a href="https://snipe-it.readme.io/docs/importing" target="_new">de muestra en la documentación</a>.',
+    'import_this_file'      => 'Asociar campos y procesar este archivo',
+    'importing'         	=> 'Importar datos',
+    'importing_help'        => 'Puede importar activos, accesorios, licencias, componentes, consumibles y usuarios a través del archivo CSV. <br><br>El CSV debe estar delimitado por comas y formateado con encabezados que coincidan con los de los <a href="https://snipe-it.readme.io/docs/importing" target="_new">archivos CSV de muestra en la documentación</a>.',
     'import-history'        => 'Importar historial',
-    'asset_maintenance'        => 'Mantenimiento de Activos',
+    'asset_maintenance'        => 'Mantenimiento de activos',
     'asset_maintenance_report' => 'Informe mantenimiento de activos',
     'asset_maintenances'       => 'Mantenimiento de activos',
-    'item'  				=> 'Articulo',
-    'item_name'             => 'Nombre del artículo',
+    'item'  				=> 'Elemento',
+    'item_name'             => 'Nombre del elemento',
     'import_file'  			=> 'importar archivo CSV',
     'import_type'  			=> 'Tipo de importación CSV',
     'insufficient_permissions' => '¡Permisos insuficientes!',
     'kits'       			=> 'Kits predefinidos',
     'language'				=> 'Idioma',
-    'last'					=> 'Última',
-    'last_login'            => 'Último acceso',
+    'last'					=> 'Último',
+    'last_login'            => 'Último inicio de sesión',
     'last_name'             => 'Apellidos',
+    'firstname_lastname_display'	=> 'Nombre y apellido (Jane Smith)',
+    'lastname_firstname_display'	=> 'Apellido y nombre (Smith Jane)',
+    'name_display_format'	=> 'Formato para mostrar el nombre',
+    'first'					=> 'Primero',
+    'first_name'			=> 'Nombres',
     'license'				=> 'Licencia',
     'license_report'        => 'Informe de licencias',
     'licenses_available'	=> 'Licencias disponibles',
     'licenses'				=> 'Licencias',
     'list_all'				=> 'Mostrar todos',
-    'loading'				=> 'Cargando... espere por favor....',
-    'lock_passwords'        => 'Este valor de campo no se guardará en una instalación de demostración.',
-    'feature_disabled'      => 'Esta característica ha sido deshabilitada para la instalación de demostración.',
+    'loading'				=> 'Cargando... por favor espere...',
+    'lock_passwords'        => 'El valor de este campo no se guardará en una instalación de demostración.',
+    'feature_disabled'      => 'Esta característica se ha desactivado para la instalación de demostración.',
     'location'              => 'Ubicación',
     'location_plural'        => 'Ubicación|Ubicaciones',
     'locations'				=> 'Ubicaciones',
-    'logo_size'				=> 'Los logotipos cuadrados se ven mejor con Logo + Texto. El tamaño máximo del Logo es 50px de alta x 500px.  ',
+    'logo_size'				=> 'Los logotipos cuadrados se ven mejor con Logo + Texto. El tamaño máximo del logo es 50px de alto x 500px de ancho.  ',
     'logout'				=> 'Cerrar sesión',
-    'lookup_by_tag'     => 'Buscar etiqueta de activo',
+    'lookup_by_tag'     => 'Buscar placa del activo',
     'maintenances'          => 'Mantenimiento',
-    'manage_api_keys'       => 'Administrar claves API',
+    'manage_api_keys'       => 'Administrar las claves del API',
     'manufacturer'			=> 'Fabricante',
     'manufacturers'			=> 'Fabricantes',
-    'markdown'				=> 'Este campo permite <a href="https://help.github.com/articles/github-flavored-markdown/">Github sabor a markdown</a>.',
+    'markdown'				=> 'Este campo permite <a href="https://help.github.com/articles/github-flavored-markdown/">markdown estilo Github</a>.',
     'min_amt'				=> 'Cantidad mínima',
-    'min_amt_help'          => 'Número mínimo de elementos que deberían estar disponibles antes de que se active una alerta. Deja la cantidad mínima en blanco si no quieres recibir alertas para un inventario bajo.',
+    'min_amt_help'          => 'Número mínimo de elementos que deben estar disponibles antes de que se active una alerta. Deje la cantidad mínima en blanco si no desea recibir alertas de inventario bajo.',
     'model_no'				=> 'Modelo Nro.',
     'months'				=> 'meses',
     'moreinfo'				=> 'Más información',
@@ -210,41 +207,49 @@ return [
     'audit_images_help'     => 'Puede encontrar imágenes de auditoría en la pestaña Historial del activo.',
     'no_email'              => 'No hay dirección de correo electrónico asociada a este usuario',
     'last_audit'		    => 'Última auditoría',
-    'new'					=> 'nuevo!',
+    'new'					=> '¡nuevo!',
     'no_depreciation'		=> 'Sin Depreciación',
     'no_results'			=> 'No hay resultados.',
     'no'  					=> 'No',
     'notes'  				=> 'Notas',
+    'note_added'            => 'Nota agregada',
+    'options'				=> 'Options',
+    'preview'				=> 'Preview',
+    'add_note'              => 'Agregar nota',
+    'note_edited'            => 'Nota editada',
+    'edit_note'              => 'Editar nota',
+    'note_deleted'            => 'Nota eliminada',
+    'delete_note'              => 'Borrar nota',
     'order_number'          => 'Número de orden',
-    'only_deleted'          => 'Sólo activos eliminados',
-    'page_menu'				=> 'Mostrando _MENU_ objetos',
+    'only_deleted'          => 'Solo activos eliminados',
+    'page_menu'				=> 'Mostrando elementos de _MENU_',
     'pagination_info'		=> 'Mostrando _START_ a _END_ de _TOTAL_ elementos',
     'pending'				=> 'Pendientes',
     'people'				=> 'Personas',
     'per_page'				=> 'Resultados por página',
     'previous'				=> 'Anterior',
     'processing'			=> 'Procesando',
-    'profile'				=> 'Tu perfil',
+    'profile'				=> 'Perfil',
     'purchase_cost'                              => 'Precio de compra',
     'purchase_date'         => 'Fecha de compra',
     'qty'		            => 'Cantidad',
     'quantity'		        => 'Cantidad',
-    'quantity_minimum'      => 'Tiene :count artículos por debajo o casi por debajo de los niveles mínimos de cantidad',
-    'quickscan_checkin'  	=> 'Devolución rápida con escaneo',
-    'quickscan_checkin_status'  	=> 'Estado de devolución',
+    'quantity_minimum'      => 'Tiene un artículo por debajo o casi por debajo de los niveles de cantidad mínima|Tiene :count artículos por debajo o casi por debajo de los niveles de cantidad mínima',
+    'quickscan_checkin'  	=> 'Ingreso rápido con escaneo',
+    'quickscan_checkin_status'  	=> 'Resultado del ingreso',
     'ready_to_deploy'		=> 'Listo para asignar',
     'recent_activity'		=> 'Actividad reciente',
     'remaining'             => 'Restante',
-    'remove_company'        => 'Eliminar asociación de la compañía',
+    'remove_company'        => 'Eliminar la asociación de la compañía',
     'reports'				=> 'Informes',
     'restored'				=> 'restaurado',
     'restore'				=> 'Restaurar',
     'requestable_models'    => 'Modelos disponibles para solicitar',
     'requestable_items'     => 'Artículos que se pueden solicitar',
     'requested'				=> 'Solicitado',
-    'requested_date'        => 'Fecha solicitada',
+    'requested_date'        => 'Fecha de solicitud',
     'requested_assets'      => 'Activos solicitados',
-    'requested_assets_menu' => 'Elementos solicitados',
+    'requested_assets_menu' => 'Activos solicitados',
     'request_canceled'      => 'Solicitud cancelada',
     'request_item'          => 'Solicitar este elemento',
     'external_link_tooltip' => 'Enlace externo a',
@@ -253,52 +258,54 @@ return [
     'select'				=> 'Seleccionar',
     'select_all'            => 'Seleccionar todo',
     'search'				=> 'Buscar',
-    'select_category'       => 'Seleccione una categoría',
-    'select_datasource' => 'Seleccione un datoscópico',
-    'select_department'     => 'Seleccione un departamento',
-    'select_depreciation'	=> 'Seleccione un tipo de depreciación',
-    'select_location'		=> 'Seleccione una ubicación',
-    'select_manufacturer'	=> 'Seleccione un fabricante',
-    'select_model'			=> 'Seleccione un modelo',
-    'select_supplier'		=> 'Seleccione un proveedor',
-    'select_user'			=> 'Seleccione un usuario',
-    'select_date'			=> 'Seleccione fecha (AAA-MM-DD)',
-    'select_statuslabel'	=> 'Seleccionar estado',
-    'select_company'    	=> 'Seleccione una compañía',
+    'select_category'       => 'Seleccionar una categoría',
+    'select_datasource' => 'Seleccione un origen de datos',
+    'select_department'     => 'Seleccionar un departamento',
+    'select_depreciation'	=> 'Seleccionar un tipo de amortización',
+    'select_location'		=> 'Seleccionar una ubicación',
+    'select_manufacturer'	=> 'Seleccionar un fabricante',
+    'select_model'			=> 'Seleccionar un modelo',
+    'select_supplier'		=> 'Seleccionar un proveedor',
+    'select_user'			=> 'Seleccionar un usuario',
+    'select_date'			=> 'Seleccione fecha (AAAA-MM-DD)',
+    'select_statuslabel'	=> 'Seleccionar un estado',
+    'select_company'    	=> 'Seleccionar una compañía',
     'select_asset'    		=> 'Seleccionar activo',
-    'settings'				=> 'Ajustes',
+    'settings'				=> 'Configuraciones',
     'show_deleted'  		=> 'Mostrar eliminados',
-    'show_current'  		=> 'Mostrar Actual',
+    'show_current'  		=> 'Mostrar actual',
     'sign_in'				=> 'Iniciar sesión',
     'signature'             => 'Firma',
     'signed_off_by'         => 'Firmado por',
-    'skin'       			=> 'Piel',
+    'skin'       			=> 'Apariencia',
     'webhook_msg_note'        => 'Una notificación se enviará a través de webhook',
-    'webhook_test_msg'        => '¡Oh hai! ¡Parece que tu integración :app con Snipe-IT está funcionando!',
-    'some_features_disabled' => 'DEMO MODE: Algunas características están desactivadas para esta instalación.',
+    'webhook_test_msg'        => '¡Hola! ¡Parece que la integración de :app con Snipe-IT funciona!',
+    'some_features_disabled' => 'MODO DEMOSTRACIÓN: Algunas características están desactivadas para esta instalación.',
     'site_name'				=> 'Nombre del sitio',
     'state'  				=> 'Departamento',
     'status_labels'			=> 'Etiquetas de estado',
+    'status_label'			=> 'Etiqueta de estado',
     'status'    			=> 'Estado',
     'accept_eula'           => 'Acuerdo de aceptación',
+    'show_or_hide_eulas' => 'Mostrar/ocultar acuerdos de uso (EULAs)',
     'supplier'              => 'Proveedor',
     'suppliers'  			=> 'Proveedores',
-    'sure_to_delete'        => '¿Está seguro que desea eliminar',
+    'sure_to_delete'        => '¿Está seguro de que desea eliminar',
     'sure_to_delete_var'    => '¿Está seguro de que desea eliminar :item?',
     'delete_what'           => 'Eliminar :item',
     'submit'				=> 'Enviar',
-    'target'                => 'Target',
-    'time_and_date_display' => 'Mostrar hora y fecha',
-    'total_assets'			=> 'total de activos',
+    'target'                => 'Destino',
+    'time_and_date_display' => 'Visualización de fecha y hora',
+    'total_assets'			=> 'activos',
     'total_licenses'		=> 'licencias totales',
     'total_accessories'		=> 'accesorios totales',
     'total_consumables'		=> 'consumibles totales',
     'type'  				=> 'Tipo',
     'undeployable'			=> 'No utilizable',
-    'unknown_admin'			=> 'Admin desconocido',
-    'username_format'		=> 'Formato de nombre de usuario',
+    'unknown_admin'			=> 'Administrador desconocido',
     'username'              => 'Nombre de usuario',
     'update'                => 'Actualizar',
+    'updating_item' => 'Actualizando :item',
     'upload_filetypes_help'      => 'Los tipos de archivo permitidos son png, gif, jpg, jpeg, doc, docx, pdf, xls, xlsx, txt, lic, xml, zip, rtf y rar. El tamaño máximo permitido es :size.',
     'uploaded'              => 'Cargado',
     'user'					=> 'Usuario',
@@ -308,31 +315,31 @@ return [
     'unassigned'            => 'Sin asignar',
     'unaccepted_asset_report' => 'Activos no aceptados',
     'users'                 => 'Usuarios',
-    'viewall'				=> 'Ver todo',
-    'viewassets'  			=> 'Ver elementos asignados',
+    'viewall'				=> 'Ver todos',
+    'viewassets'  			=> 'Ver activos asignados',
     'viewassetsfor'         => 'Ver activos para :name',
     'website'               => 'Sitio web',
     'welcome'				=> 'Bienvenido, :name',
     'years'					=> 'años',
-    'yes' 					=> 'Sí',
+    'yes' 					=> 'Si',
     'zip'  					=> 'Código postal',
-    'noimage'				=> 'No se ha cargado o no se ha encontrado ninguna imagen.',
+    'noimage'				=> 'No se cargó la imagen o no fue encontrada.',
     'file_does_not_exist'   => 'El archivo solicitado no existe en el servidor.',
     'file_upload_success'   => '¡Archivo cargado exitosamente!',
     'no_files_uploaded'     => '¡Archivo cargado exitosamente!',
     'token_expired'         => 'Su sesión ha caducado. Por favor, inténtelo de nuevo.',
     'login_enabled'         => 'Inicio de sesión activado',
-    'audit_due'             => 'Vence la auditoría',
-    'audit_due_days'        => 'Activos pendientes para auditoría dentro de :days día|Activos pendientes para auditoría dentro de :days días',
-    'checkin_due'           => 'Pendiente por devolver',
-    'checkin_overdue'       => 'Atrasado por devolver',
-    'checkin_due_days'      => 'Activos que deben ser devueltos dentro de :days día|Activos que deben ser devueltos dentro de :days días',
-    'audit_overdue'         => 'Atrasado para la auditoría',
+    'audit_due'             => 'Próximas auditorías',
+    'audit_due_days'        => '{}Assets Due or Overdue for Audit|[1]Assets Due or Overdue for Audit Within a Day|[2,*]Assets Due or Overdue for Audit Within :days Days',
+    'checkin_due'           => 'Próximos a ingresar',
+    'checkin_overdue'       => 'Devolución atrasada',
+    'checkin_due_days'      => '{}Due for Checkin|[1]Assets Due for Checkin Within :days Day|[2,*]Assets Due for Checkin Within :days Days',
+    'audit_overdue'         => 'Auditoría atrasada',
     'accept'                => 'Aceptar :asset',
     'i_accept'              => 'Acepto',
     'i_decline'             => 'Rechazo',
     'accept_decline'        => 'Aceptar/Rechazar',
-    'sign_tos'              => 'Regístrate a continuación para indicar que estás de acuerdo con los términos del servicio:',
+    'sign_tos'              => 'Firme abajo para indicar que está de acuerdo con los términos de servicio:',
     'clear_signature'       => 'Borrar firma',
     'show_help'             => 'Mostrar ayuda',
     'hide_help'             => 'Ocultar ayuda',
@@ -340,30 +347,30 @@ return [
     'hide_deleted'          => 'Ocultar eliminados',
     'email'                 => 'Correo electrónico',
     'do_not_change'         => 'No cambiar',
-    'bug_report'            => 'Reportar un error',
+    'bug_report'            => 'Reporte un error',
     'user_manual'           => 'Manual del usuario',
     'setup_step_1'          => 'Paso 1',
     'setup_step_2'          => 'Paso 2',
     'setup_step_3'          => 'Paso 3',
     'setup_step_4'          => 'Paso 4',
     'setup_config_check'    => 'Comprobar configuración',
-    'setup_create_database' => 'Crear Tablas de Base de Datos',
-    'setup_create_admin'    => 'Crear Usuario Admin',
+    'setup_create_database' => 'Crear tablas de la base de datos',
+    'setup_create_admin'    => 'Crear un usuario administrador',
     'setup_done'            => '¡Terminado!',
     'bulk_edit_about_to'    => 'Está a punto de editar lo siguiente: ',
-    'checked_out'           => 'Asignado a',
-    'checked_out_to'        => 'Comprobado a',
+    'checked_out'           => 'Asignado',
+    'checked_out_to'        => 'Asignado a',
     'fields'                => 'Campos',
-    'last_checkout'         => 'Último pedido',
-    'due_to_checkin'        => 'Los siguientes :count artículos deben ser chequeados pronto:',
-    'expected_checkin'      => 'Checkin Esperado',
-    'reminder_checked_out_items' => 'Este es un recordatorio de los elementos que se te han comprobado actualmente. Si usted siente que esta lista es incorrecta (falta algo o algo que usted cree que nunca ha recibido), por favor envíe un correo electrónico a :reply_to_name a :reply_to_address.',
+    'last_checkout'         => 'Última asignación',
+    'due_to_checkin'        => 'Los siguientes :count elementos están pendientes por ingresar pronto:',
+    'expected_checkin'      => 'Fecha esperada de devolución',
+    'reminder_checked_out_items' => 'Este es un recordatorio de los elementos que se le han asignado actualmente. Si usted cree que esta lista es incorrecta (falta algo o aparece algo que usted cree que nunca ha recibido), por favor envíe un correo electrónico a :reply_to_name a :reply_to_address.',
     'changed'               => 'Cambiado',
     'to'                    => 'A',
-    'report_fields_info'    => '<p>Seleccione los campos que desea incluir en su informe personalizado y haga clic en Generar. El archivo (custom-asset-report-YYYY-mm-dd.csv) se descargará automáticamente y puede abrirlo en Excel.</p>
+    'report_fields_info'    => '<p>Seleccione los campos que desea incluir en su informe personalizado y haga clic en Generar. El archivo (custom-asset-report-YYYY-mm-dd.csv) se descargará automáticamente y podrá abrirlo en Excel.</p>
             <p>Si desea exportar sólo ciertos activos, utilice las siguientes opciones para afinar sus resultados.</p>',
     'range'                 => 'Rango',
-    'bom_remark'            => 'Añadir un BOM (signo de orden de byte) a este CSV',
+    'bom_remark'            => 'Añadir un BOM (marca de orden de bytes) a este CSV',
     'improvements'          => 'Mejoras',
     'information'           => 'Información',
     'permissions'           => 'Permisos',
@@ -371,11 +378,11 @@ return [
     'export'                => 'Exportar',
     'ldap_sync'             => 'Sincronización LDAP',
     'ldap_user_sync'        => 'Sincronización de usuario LDAP',
-    'synchronize'           => 'Synchronize',
+    'synchronize'           => 'Sincronizar',
     'sync_results'          => 'Resultados de sincronización',
-    'license_serial'        => 'Clave de Serial/Producto',
-    'invalid_category'      => 'Categoría no válida o ausente',
-    'invalid_item_category_single' => 'Falta o no válida :type categoría. Por favor actualiza la categoría de este :type para incluir una categoría válida antes de salir.',
+    'license_serial'        => 'Número de serie/clave de producto',
+    'invalid_category'      => 'Categoría no válida o inexistente',
+    'invalid_item_category_single' => 'Falta o no es válida una categoría de tipo :type. Por favor, actualice la categoría de tipo :type para incluir una categoría válida antes de asignar.',
     'dashboard_info'        => 'Este es su panel de control. Hay muchos similares, pero este es suyo.',
     '60_percent_warning'    => '60% completo (advertencia)',
     'dashboard_empty'       => 'Parece que aún no ha añadido nada, así que no tenemos nada impresionante que mostrar. ¡Comience añadiendo algunos activos, accesorios, consumibles o licencias ahora!',
@@ -383,80 +390,83 @@ return [
     'new_license'           => 'Nueva licencia',
     'new_accessory'         => 'Nuevo accesorio',
     'new_consumable'        => 'Nuevo consumible',
-    'collapse'              => 'Colapso',
+    'new_component'         => 'New Component',
+    'new_user'              => 'New User',
+    'collapse'              => 'Contraer',
     'assigned'              => 'Asignado',
     'asset_count'           => 'Cantidad de activos',
-    'accessories_count'     => 'Número de accesorios',
-    'consumables_count'     => 'Número de consumibles',
-    'components_count'      => 'Número de componentes',
-    'licenses_count'        => 'Número de licencias',
+    'accessories_count'     => 'Cantidad de accesorios',
+    'consumables_count'     => 'Cantidad de consumibles',
+    'components_count'      => 'Cantidad de componentes',
+    'licenses_count'        => 'Cantidad de licencias',
     'notification_error'    => 'Error',
     'notification_error_hint' => 'Por favor revise si hay errores en el siguiente formulario',
     'notification_bulk_error_hint' => 'Los siguientes campos tenían errores de validación y no fueron editados:',
     'notification_success'  => 'Éxito',
     'notification_warning'   => 'Advertencia',
-    'notification_info'      => 'Info',
-    'asset_information'     => 'Información del recurso',
+    'notification_info'      => 'Información',
+    'asset_information'     => 'Información del activo',
     'model_name'            => 'Nombre del modelo',
     'asset_name'            => 'Nombre del activo',
-    'consumable_information' => 'Información Consumible:',
+    'consumable_information' => 'Información del consumible:',
     'consumable_name'       => 'Nombre del Consumible:',
     'accessory_information' => 'Información del accesorio:',
-    'accessory_name'       => 'Nombre de accesorio:',
+    'accessory_name'       => 'Nombre del accesorio:',
     'clone_item'            => 'Clonar objeto',
     'checkout_tooltip' => 'Asignar este elemento',
-    'checkin_tooltip' => 'Devuelva este elemento para que esté disponible para resignar, borrar, etc.',
+    'checkin_tooltip' => 'Ingrese este elemento para que esté disponible para reasignar, borrar, etc.',
     'checkout_user_tooltip' => 'Asignar este elemento a un usuario',
-    'checkin_to_diff_location' => 'Puede optar por asignar este activo a una ubicación distinta a la predeterminada :default_location, si es que existe una configurada',
-    'maintenance_mode'      => 'El servicio no está disponible temporalmente para actualizaciones del sistema. Por favor, vuelva más tarde.',
-    'maintenance_mode_title' => 'Sistema temporalmente no disponible',
+    'checkin_to_diff_location' => 'Puede elegir ingresar este activo a una ubicación distinta de la predeterminada :default_location, si es que se ha definido una',
+    'maintenance_mode'      => 'El servicio no está disponible temporalmente debido a actualizaciones del sistema. Por favor, verifique más tarde.',
+    'maintenance_mode_title' => 'El sistema no está disponible temporalmente',
     'ldap_import'           => 'La contraseña del usuario no debe ser administrada por LDAP. (Esto le permite enviar solicitudes de contraseña olvidadas.)',
     'purge_not_allowed'     => 'La purga de datos eliminados ha sido deshabilitada en el archivo .env. Contacte con el soporte técnico o con el administrador de su sistema.',
     'backup_delete_not_allowed'     => 'La eliminación de copias de seguridad se ha desactivado en el archivo .env. Contacte con el soporte técnico o con el administrador de su sistema.',
     'additional_files'           => 'Archivos adicionales',
     'shitty_browser'        => 'No se ha detectado ninguna firma. Si está utilizando un navegador más antiguo, por favor utilice un navegador más moderno para completar la aceptación del elemento.',
     'bulk_soft_delete'      =>'También borra suavemente estos usuarios. Su historial de activos permanecerá intacto a menos/hasta que purgue los registros borrados en la Configuración de administración.',
-    'bulk_checkin_delete_success' => 'Los usuarios seleccionados han sido eliminados y sus elementos han sido registrados.',
-    'bulk_checkin_success' => 'Los elementos para los usuarios seleccionados han sido registrados.',
-    'set_to_null'           => 'Eliminar valores para este activo|Borrar valores para todos los activos :asset_count ',
-    'set_users_field_to_null'  => 'Eliminar :field values for this user|Eliminar :field values for all :user_count users ',
+    'bulk_checkin_delete_success' => 'Los usuarios seleccionados han sido eliminados y sus activos han sido ingresados.',
+    'bulk_checkin_success' => 'Los elementos para los usuarios seleccionados han sido ingresados.',
+    'set_to_null'           => 'Eliminar los valores del elemento seleccionado|Eliminar los valores de los :selection_count elementos seleccionados ',
+    'set_users_field_to_null'  => 'Eliminar valores de :field para este usuario|Eliminar valores de :field para todos los :user_count usuarios ',
     'na_no_purchase_date'   => 'N/A - No se proporcionó fecha de compra',
     'assets_by_status'      => 'Activos por estado',
     'assets_by_status_type'      => 'Activos por tipo de estado',
     'pie_chart_type'        => 'Tipo de gráfico circular en el tablero',
     'hello_name'            => '¡Hola, :name!',
-    'unaccepted_profile_warning'   => 'Tienes :count elementos que requieren aceptación. Haz clic aquí para aceptarlos o rechazarlos',
+    'unaccepted_profile_warning'   => 'Tiene un elemento que requiere aceptación. Haga clic aquí para aceptarlo o rechazarlo | Tiene :count elementos que requieren aceptación. Haga clic aquí para aceptarlos o rechazarlos',
     'start_date'            => 'Fecha de inicio',
-    'end_date'            => 'Fecha de fin',
+    'end_date'            => 'Fecha final',
     'alt_uploaded_image_thumbnail' => 'Miniatura cargada',
     'placeholder_kit'       => 'Seleccione un kit',
     'file_not_found'        => 'Archivo no encontrado',
+    'log_record_not_found'  => 'No se ha encontrado ninguna entrada en el registro de eventos.',
     'preview_not_available' => '(sin vista previa)',
-    'setup'                 => 'Configurar',
-    'pre_flight'            => 'Pre-vuelo',
+    'setup'                 => 'Configuración',
+    'pre_flight'            => 'Preparación',
     'skip_to_main_content'  => 'Ir al contenido principal',
-    'toggle_navigation'     => 'Cambiar navegación',
+    'toggle_navigation'     => 'Alternar navegación',
     'alerts'                => 'Alertas',
     'tasks_view_all'        => 'Ver todas las tareas',
     'true'                  => 'Verdadero',
-    'false'                 => 'False',
+    'false'                 => 'Falso',
     'integration_option'    => 'Opción de integración',
-    'log_does_not_exist'    => 'No existe ningún registro de registro coincidente.',
+    'log_does_not_exist'    => 'No existe ningún registro de eventos que coincida.',
     'merge_users'           => 'Combinar usuarios',
-    'merge_information' =>  'Esto fusionará a los usuarios :count en un solo usuario. Seleccione el usuario en el que desea fusionar a los demás a continuación, y los activos asociados, licencias, etc se moverá al usuario seleccionado y los otros usuarios serán marcados como eliminados.',
-    'warning_merge_information' => 'Esta acción NO PUEDE deshacerse y sólo debe ser usada cuando necesite fusionar usuarios debido a una mala importación o sincronización. Asegúrese de ejecutar una copia de seguridad primero.',
+    'merge_information' =>  'Esto combinará los :count usuarios en un único usuario. Seleccione a continuación el usuario en el que desea combinar los demás, y los activos, licencias, etc. asociados se moverán al usuario seleccionado y los demás usuarios se marcarán como eliminados.',
+    'warning_merge_information' => 'Esta acción NO PUEDE deshacerse y sólo debe ser usada cuando necesite combinar usuarios debido a una mala importación o sincronización. Asegúrese de ejecutar una copia de seguridad primero.',
     'no_users_selected'     => 'Ningún usuario seleccionado',
     'not_enough_users_selected'     => 'Al menos :count usuarios deben ser seleccionados',
-    'merge_success'         => ':count usuarios fusionados con éxito en :into_username!',
-    'merged'                => 'fusionado',
-    'merged_log_this_user_into' => 'Fusionado este usuario (ID :to_id - :to_username) con ID de usuario :from_id (:from_username) ',
-    'merged_log_this_user_from' => 'Fusionado ID de usuario :from_id (:from_username) con este usuario (ID :to_id - :to_username)',
+    'merge_success'         => '!:count usuarios combinados con éxito en :into_username!',
+    'merged'                => 'combinados',
+    'merged_log_this_user_into' => 'Se combinó este usuario (ID :to_id - :to_username) en ID de usuario :from_id (:from_username) ',
+    'merged_log_this_user_from' => 'Se combinó usuario ID :from_id (:from_username) en este usuario (ID :to_id - :to_username)',
     'clear_and_save'            => 'Limpiar y guardar',
     'update_existing_values'    => '¿Actualizar valores existentes?',
-    'auto_incrementing_asset_tags_disabled_so_tags_required' => 'Generar etiquetas de activos auto-incrementantes está desactivado, por lo que todas las filas necesitan tener la columna "Tag de activo" rellenada.',
-    'auto_incrementing_asset_tags_enabled_so_now_assets_will_be_created' => 'Nota: Generar etiquetas de activos que incrementan automáticamente está habilitado, por lo que se crearán recursos para registros que no tengan "Tag de activo" poblado. Las filas que tengan "Etiqueta de activos" pobladas serán actualizadas con la información proporcionada.',
+    'auto_incrementing_asset_tags_disabled_so_tags_required' => 'La generación autoincrementable de las placas de activos está desactivada, por lo que todas las filas deben tener la columna "Asset Tag" con información.',
+    'auto_incrementing_asset_tags_enabled_so_now_assets_will_be_created' => 'Nota: La generación autoincrementable de las placas de activos está activada, por lo que se crearán activos para las filas sin información en la columna "Asset Tag". Las filas que sí tengan información en la columna "Asset Tag" se actualizarán con la información proporcionada.',
     'send_welcome_email_to_users'   => ' ¿Enviar correo de bienvenida para nuevos usuarios?',
-    'send_email'                => 'Enviar Email',
+    'send_email'                => 'Enviar correo electrónico',
     'call'                      => 'Número de llamada',
     'back_before_importing'     => '¿Copia de seguridad antes de importar?',
     'csv_header_field'          => 'Campo de cabecera CSV',
@@ -467,72 +477,72 @@ return [
     'errors_importing'          => 'Se han producido algunos errores al importar: ',
     'warning'                   => 'ADVERTENCIA: :warning',
     'success_redirecting'       => '"Éxito... Redirigiendo.',
-    'cancel_request'            => 'Cancelar esta solicitud de elemento',
+    'cancel_request'            => 'Cancelar solicitud para este elemento',
     'setup_successful_migrations' => 'Se han creado las tablas de la base de datos',
-    'setup_migration_output' => 'Salida de Migración:',
+    'setup_migration_output' => 'Salida de migración:',
     'setup_migration_create_user' => 'Siguiente: Crear usuario',
-    'importer_generic_error'    => 'La importación de tu archivo está completa, pero recibimos un error. Esto normalmente es causado por la limitación de API de terceros desde un webhook de notificación (como Slack) y no habría interferido con la importación en sí. pero debería confirmarlo.',
+    'importer_generic_error'    => 'La importación del archivo se ha completado, pero recibimos un error. Esto suele deberse a la limitación de la API de terceros desde un webhook de notificación (como Slack) y no habría interferido con la importación en sí, pero debería confirmarlo.',
     'confirm' => 'Confirmar',
     'autoassign_licenses' => 'Auto-Asignar licencias',
-    'autoassign_licenses_help' => 'Permitir a este usuario tener licencias asignadas a través de la interfaz de usuario o herramientas de cli asignadas a granel.',
-    'autoassign_licenses_help_long' => 'Esto permite que un usuario tenga licencias asignadas a través de la interfaz de usuario o las herramientas de cli asignadas a granel. (Por ejemplo, puede que no desee que los contratistas sean asignados automáticamente a una licencia que proporcione sólo a los miembros del personal. Todavía puede asignar licencias individualmente a esos usuarios, pero no se incluirán en la licencia de pago a las funciones de todos los usuarios.)',
-    'no_autoassign_licenses_help' => 'No incluya al usuario para asignar a granel a través de la licencia UI o las herramientas de cli.',
+    'autoassign_licenses_help' => 'Permitir a este usuario tener licencias asignadas a través de la asignación masiva en la interfaz de usuario o de las herramientas de la línea de comandos (CLI).',
+    'autoassign_licenses_help_long' => 'Esto permite asignar licencias a un usuario a través de la asignación masiva en la interfaz de usuario o de las herramientas de línea de comandos (CLI). (Por ejemplo, es posible que no desee que a los contratistas se les asigne automáticamente una licencia que usted proporcionaría sólo a los miembros del personal. Puede seguir asignando licencias individualmente a esos usuarios, pero no se incluirán en las funciones de "Asignación de licencias a todos los usuarios").',
+    'no_autoassign_licenses_help' => 'No incluir al usuario en la asignación masiva de licencias en la interfaz de usuario o en las herramientas de línea de comandos (CLI).',
     'modal_confirm_generic'      => '¿Está seguro?',
     'cannot_be_deleted'      => 'Este elemento no puede ser eliminado',
     'cannot_be_edited'      => 'Este elemento no puede ser editado.',
     'undeployable_tooltip'      => 'Este artículo no puede ser asignado. Compruebe la cantidad restante.',
-    'serial_number'        => 'Número Serial',
+    'serial_number'        => 'Número de serie',
     'item_notes' => ':item Notas',
     'item_name_var' => ':item Nombre',
     'error_user_company' => 'La compañía destino de la asignación y la compañía del activo no coinciden',
     'error_user_company_accept_view' => 'Un activo asignado a usted pertenece a una compañía diferente por lo que no puede aceptarlo ni rechazarlo, por favor verifique con su supervisor',
     'importer' => [
-        'checked_out_to_fullname' => 'Pagado a: Nombre Completo',
-        'checked_out_to_first_name' => 'Pagado a: Nombre',
-        'checked_out_to_last_name' => 'Pagado a: Apellido',
-        'checked_out_to_username' => 'Pagado a: Usuario',
-        'checked_out_to_email' => 'Checkout a: Email',
-        'checked_out_to_tag' => 'Checked Out a: Tag de Activos',
-        'manager_first_name' => 'Nombre del administrador',
-        'manager_last_name' => 'Apellido del administrador',
-        'manager_full_name' => 'Nombre completo del administrador',
-        'manager_username' => 'Usuario Administrador',
-        'checkout_type' => 'Tipo de pago',
-        'checkout_location' => 'Pagar a la ubicación',
-        'image_filename' => 'Nombre de imagen',
+        'checked_out_to_fullname' => 'Asignado a: Nombre completo',
+        'checked_out_to_first_name' => 'Asignado a: Nombre',
+        'checked_out_to_last_name' => 'Asignado a: Apellido',
+        'checked_out_to_username' => 'Asignado a: Nombre de usuario',
+        'checked_out_to_email' => 'Asignado a: Correo electrónico',
+        'checked_out_to_tag' => 'Asignado a: Placa de activo',
+        'manager_first_name' => 'Nombre del supervisor',
+        'manager_last_name' => 'Apellido del supervisor',
+        'manager_full_name' => 'Nombre completo del supervisor',
+        'manager_username' => 'Nombre de usuario del supervisor',
+        'checkout_type' => 'Tipo de asignación',
+        'checkout_location' => 'Asignar a la ubicación',
+        'image_filename' => 'Nombre del archivo de la imagen',
         'do_not_import'     => 'No importar',
         'vip' => 'VIP',
         'avatar'  => 'Avatar',
-        'gravatar' => 'Gravatar Email',
+        'gravatar' => 'Correo electrónico Gravatar',
         'currency' => 'Moneda',
         'address2' => 'Dirección línea 2',
         'import_note' => 'Importado usando el importador de csv',
     ],
     'remove_customfield_association' => 'Elimine este campo del grupo de campos. Esto no eliminará el campo personalizado, solo la asociación de este campo con este grupo de campos.',
-    'checked_out_to_fields' => 'Campos sobre quién tiene asignado el elemento',
-    'percent_complete' => '% complete',
+    'checked_out_to_fields' => 'Campos de la persona que tiene asignado el elemento',
+    'percent_complete' => '% completo',
     'uploading' => 'Subiendo... ',
-    'upload_error' => 'Error al cargar el archivo. Por favor, compruebe que no hay filas vacías y que no hay nombres de columna duplicados.',
+    'upload_error' => 'Error uploading file. Please check that you have no empty rows or duplicated column names in your CSV, and that the server permissions allow uploads.',
     'copy_to_clipboard' => 'Copiar al portapapeles',
     'copied' => '¡Copiado!',
     'status_compatibility' => 'Si los activos ya están asignados, no se pueden cambiar a un tipo de estado no utilizable y este cambio de valor se omitirá.',
-    'rtd_location_help' => 'Esta es la ubicación del recurso cuando no está seleccionado',
+    'rtd_location_help' => 'Esta es la ubicación del activo cuando no está asignado',
     'item_not_found' => ':item_type ID :id no existe o ha sido eliminado',
     'action_permission_denied' => 'No tiene permiso para :action :item_type ID :id',
-    'action_permission_generic' => 'No tiene permiso para :action this :item_type',
+    'action_permission_generic' => 'No tiene permiso para :action este :item_type',
     'edit' => 'editar',
-    'action_source' => 'Fuente de acción',
+    'action_source' => 'Origen de la acción',
     'or' => 'o',
     'url'                   => 'URL',
     'edit_fieldset' => 'Editar campos y opciones de grupos de campos',
     'permission_denied_superuser_demo' => 'Permiso denegado. No puede actualizar la información de usuario para superadministradores en la demo.',
     'pwd_reset_not_sent' => 'El usuario no está activado, está sincronizado con LDAP o no tiene una dirección de correo electrónico',
-    'error_sending_email' => 'Error al enviar email',
-    'sad_panda' => 'Sad panda. You are not authorized to do the thing. Maybe <a href=":link">return to the dashboard</a>, or contact your administrator.',
+    'error_sending_email' => 'Error al enviar correo electrónico',
+    'sad_panda' => 'No está autorizado a realizar esta acción. Puede <a href=":link">regresar al tablero</a>, o ponerse en contacto con su administrador.',
     'bulk' => [
             'delete' =>
                 [
-                'header' => 'Eliminar en masa :object_type',
+                'header' => 'Eliminar masivamente :object_type',
                 'warn'   =>  'Está a punto de eliminar un :object_type|Está a punto de eliminar :count :object_type',
                 'success'   =>  'Se ha eliminado correctamente :count :object_type',
                 'error'   =>  'No se pudo eliminar :object_type',
@@ -544,11 +554,76 @@ return [
 
     'countable' => [
         'accessories'  => ':count Accesorio|:count Accesorios',
-        'assets'  => ':count Activos|:count Activos',
-        'licenses'  => ':count Licencia|:count Licencias',
-        'license_seats'  => ':count Asiento de licencia|:count Asientos de licencia',
-        'consumables'  => ':count Consumible|:count Consumibles',
+        'assets'  => ':count activo|:count activos',
+        'licenses'  => ':count licencia|:count licencias',
+        'license_seats'  => ':count licencia|:count licencias',
+        'consumables'  => ':count consumible|:count consumibles',
         'components'  => ':count component|:count componentes',
-    ]
+    ],
+
+    'more_info' => 'Más información',
+    'quickscan_bulk_help' => 'Al marcar esta casilla se actualizará el activo para reflejar esta nueva ubicación. Dejarla sin marcar, simplemente almacenará la ubicación en el registro de auditoría. Tenga en cuenta que si este activo ya está asignado, no cambiará la ubicación de la persona, del activo o de la ubicación a la que esté asignado.',
+    'whoops' => '¡Uy!',
+    'something_went_wrong' => 'Algo falló en su solicitud.',
+    'close' => 'Cerrar',
+    'expires' => 'Vence',
+    'map_fields'=> 'Asociar los campos para :item_type',
+    'remaining_var' => ':count restantes',
+    'label' => 'Etiqueta',
+    'import_asset_tag_exists' => 'Ya existe un activo con la placa :asset_tag y no se ha solicitado una actualización. No se ha realizado ningún cambio.',
+    'countries_manually_entered_help' => 'Los valores con asterisco (*) fueron introducidos manualmente y no coinciden con los valores desplegables ISO 3166 existentes',
+    'accessories_assigned' => 'Accesorios asignados',
+    'user_managed_passwords' => 'Gestión de contraseña',
+    'user_managed_passwords_disallow' => 'Evitar que los usuarios gestionen sus propias contraseñas',
+    'user_managed_passwords_allow' => 'Permitir a los usuarios gestionar sus propias contraseñas',
+    'from' => 'From',
+    'by' => 'Por',
+
+// Add form placeholders here
+    'placeholders' => [
+        'notes'  => 'Add a note',
+    ],
+
+    'breadcrumb_button_actions' => [
+        'edit_item' => 'Edit :name',
+        'checkout_item' => 'Checkout :name',
+        'checkin_item' => 'Checkin :name',
+    ],
+
+    'skins' => [
+        'site_default' => 'Sitio por defecto',
+        'default_blue' => 'Default Blue',
+        'blue_dark' => 'Blue (Dark Mode)',
+        'green' => 'Green Dark',
+        'green_dark' => 'Green (Dark Mode)',
+        'red' => 'Red Dark',
+        'red_dark' => 'Red (Dark Mode)',
+        'orange' => 'Orange Dark',
+        'orange_dark' => 'Orange (Dark Mode)',
+        'black' => 'Black',
+        'black_dark' => 'Black (Dark Mode)',
+        'purple' => 'Purple',
+        'purple_dark' => 'Purple (Dark Mode)',
+        'yellow' => 'Yellow',
+        'yellow_dark' => 'Yellow (Dark Mode)',
+        'high_contrast' => 'High Contrast',
+
+    ],
+
+    'select_all_none' => 'Select/Unselect All',
+    'generic_model_not_found' => 'That :model was not found or you do not have permission to access it',
+    'deleted_models' => 'Deleted Asset Models',
+    'deleted_users' => 'Deleted Users',
+    'cost_each' => ':amount each',
+    'remove_current_image' => 'Remove current :type image',
+
+    'seeding' => [
+        'manufacturers' => [
+            'button' => 'Create Manufacturers',
+            'prompt' => 'You do not have any manufacturers yet. Would you like to seed a list of common manufacturers? (THIS WILL OVERWRITE EXISTING MANUFACTURERS, including those that have been soft-deleted.)',
+            'success' => 'Manufacturers seeded successfully',
+            'error' => 'Could not seed manufacturers. A manufacturer record already exists and seeding would overwrite it.|Could not seed manufacturers. :count manufacturer records already exist and seeding would overwrite them.',
+        ],
+    ],
 
 ];
diff --git a/resources/lang/es-CO/help.php b/resources/lang/es-CO/help.php
index 92cce3855f..13fb579b49 100644
--- a/resources/lang/es-CO/help.php
+++ b/resources/lang/es-CO/help.php
@@ -15,19 +15,19 @@ return [
 
     'more_info_title' => 'Más información',
 
-    'audit_help' => 'Al marcar esta casilla se editará el registro de activos para reflejar esta nueva ubicación. Dejarla desmarcada simplemente se notará la ubicación en el registro de auditoría.<br><br>Tenga en cuenta que si este activo está desprotegido, no cambiará la ubicación de la persona, el activo o la ubicación en la que está verificado.',
+    'audit_help' => 'Al marcar esta casilla se actualizará el activo para reflejar esta nueva ubicación. Dejarla sin marcar, simplemente almacenará la ubicación en el registro de auditoría.<br><br>Tenga en cuenta que si este activo ya está asignado, no cambiará la ubicación de la persona, del activo o de la ubicación a la que esté asignado.',
 
-    'assets' => 'Los activos son elementos con número de serie o etiqueta de activos.  Tienden a ser artículos de alto valor donde es importante identificar un elemento específico.',
+    'assets' => 'Los activos son artículos rastreados por número de serie o placa de activo.  Suelen ser artículos de alto valor en los que es importante identificar un elemento específico.',
 
-    'categories' => 'Las categorías te ayudan a organizar tus elementos. Unos ejemplos de categorías podrían ser: &quot;Pc Escritorios&quot;, &quot;Portátiles&quot;, &quot;Móviles&quot;, &quot;Tabletas&quot;, etc.',
+    'categories' => 'Las categorías le ayudan a organizar sus elementos. Unos ejemplos de categorías podrían ser: &quot;PC Escritorios&quot;, &quot;Portátiles&quot;, &quot;Móviles&quot;, &quot;Tabletas&quot;, etc.',
 
-    'accessories' => 'Los accesorios son cualquier cosa que se le asigne a los usuarios pero que no tenga numero de serie (o no importe realizarle el seguimiento en forma unica). Por ejemplo, mouse o teclados.',
+    'accessories' => 'Los accesorios son cualquier cosa que se le asigne a los usuarios pero que no tenga número de serie (o no importe realizarle el seguimiento en forma única). Por ejemplo, ratones o teclados.',
 
-    'companies'     => 'Las compañías se pueden utilizar como un simple campo identificador, o se pueden utilizar para limitar la visibilidad de los activos, usuarios, etc si la opción "Soporte completo a múltiples compañías" está habilitado en "Configuración de administrador".',
+    'companies'     => 'Las compañías se pueden utilizar como un simple campo identificador, o se pueden utilizar para limitar la visibilidad de los activos, usuarios, etc. si la opción "Soporte completo a múltiples compañías" está habilitada en "Configuración de administración".',
 
-    'components'    => 'Los componentes son elementos que son parte de un activo, por ejemplo HDD, RAM, etc.',
+    'components'    => 'Los componentes son elementos que son parte de un activo, por ejemplo, el disco duro, RAM, etc.',
 
-    'consumables'   => 'Los consumibles son cualquier cosa comprada que se usará con el tiempo. Por ejemplo, tinta de impresora o papel copiador.',
+    'consumables'   => 'Los consumibles son todo aquello que se compra y que se agota con el tiempo. Por ejemplo, tinta de impresora o papel de fotocopiadora.',
 
     'depreciations' => 'Puede configurar la depreciación de activos usando un método de línea recta.',
     
diff --git a/resources/lang/es-CO/localizations.php b/resources/lang/es-CO/localizations.php
index be0ac5f74d..6bb06dde9d 100644
--- a/resources/lang/es-CO/localizations.php
+++ b/resources/lang/es-CO/localizations.php
@@ -40,17 +40,19 @@ return [
         'ms-MY'=> 'Malayo',
         'mi-NZ'=> 'Maori',
         'mn-MN'=> 'Mongol',
-        'no-NO'=> 'Noruego',
+        'nb-NO'=> 'Noruego Bokmål',
+        'om-ET' => 'Oromo (Ethiopian)',
+        //'nn-NO'=> 'Norwegian Nynorsk',
         'fa-IR'=> 'Persa',
         'pl-PL'=> 'Polaco',
         'pt-PT'=> 'Portugués',
-        'pt-BR'=> 'Brasileño',
+        'pt-BR'=> 'Portugués, Brasil',
         'ro-RO'=> 'Rumano',
         'ru-RU'=> 'Ruso',
-        'sr-CS' => 'Serbian (Latin)',
+        'sr-CS' => 'Serbio (Latino)',
         'sk-SK'=> 'Eslovaco',
-        'sl-SI'=> 'Slovenian',
-        'so-SO'=> 'Somali',
+        'sl-SI'=> 'Esloveno',
+        'so-SO'=> 'Somalí',
         'es-ES'=> 'Español',
         'es-CO'=> 'Español, Colombia',
         'es-MX'=> 'Español, México',
@@ -85,15 +87,15 @@ return [
         'AT'=>'Austria',
         'AU'=>'Australia',
         'AW'=>'Aruba',
-        'AX'=>'Superficie de €€',
-        'AZ'=>'Martín',
+        'AX'=>'Islas Aland',
+        'AZ'=>'Azerbaiyán',
         'BA'=>'Bosnia y Herzegovina',
         'BB'=>'Barbados',
         'BE'=>'Bélgica',
         'BD'=>'Bangladesh',
         'BF'=>'Burkina Faso',
         'BG'=>'Bulgaria',
-        'BH'=>'Bahrain',
+        'BH'=>'Baréin',
         'BI'=>'Burundi',
         'BJ'=>'Benin',
         'BM'=>'Bermuda',
@@ -133,6 +135,7 @@ return [
         'EC'=>'Ecuador',
         'EE'=>'Estonia',
         'EG'=>'Egipto',
+        'GB-ENG'=>'Inglaterra',
         'ER'=>'Eritrea',
         'ES'=>'España',
         'ET'=>'Ethiopia',
@@ -231,6 +234,7 @@ return [
         'NG'=>'Nigeria',
         'NI'=>'Nicaragua',
         'NL'=>'Holanda',
+        'GB-NIR' => 'Irlanda del Norte',
         'NO'=>'Noruega',
         'NP'=>'Nepal',
         'NR'=>'Nauru',
@@ -258,7 +262,7 @@ return [
         'RU'=>'Federación Rusa',
         'RW'=>'Rwanda',
         'SA'=>'Arabia Saudita',
-        'UK'=>'Escocia',
+        'GB-SCT'=>'Escocia',
         'SB'=>'Islas Salomón',
         'SC'=>'Seychelles',
         'SS'=>'Sudán del Sur',
@@ -287,11 +291,11 @@ return [
         'TJ'=>'Tajikistan',
         'TK'=>'Tokelau',
         'TI'=>'Timor Oriental',
-        'TM'=>'Turkmenistan',
-        'TN'=>'Tunisia',
+        'TM'=>'Turkmenistán',
+        'TN'=>'Túnez',
         'TO'=>'Tonga',
         'TP'=>'Timor Oriental (código antiguo)',
-        'TR'=>'Pavo',
+        'TR'=>'Turquía',
         'TT'=>'Trinidad y Tobago',
         'TV'=>'Tuvalu',
         'TW'=>'Taiwán',
@@ -310,6 +314,7 @@ return [
         'VI'=>'Islas Virginas (EE.UU.)',
         'VN'=>'Viet Nam',
         'VU'=>'Vanuatu',
+        'GB-WLS' =>'Gales',
         'WF'=>'Islas Wallis y Futuna',
         'WS'=>'Samoa',
         'YE'=>'Yemen',
diff --git a/resources/lang/es-CO/mail.php b/resources/lang/es-CO/mail.php
index 2f597d88c9..b020245410 100644
--- a/resources/lang/es-CO/mail.php
+++ b/resources/lang/es-CO/mail.php
@@ -2,92 +2,98 @@
 
 return [
 
-    'Accessory_Checkin_Notification' => 'Accesorio devuelto',
-    'Accessory_Checkout_Notification' => 'Accesorio reservado',
-    'Asset_Checkin_Notification' => 'Activo devuelto',
-    'Asset_Checkout_Notification' => 'Recurso reservado',
-    'Confirm_Accessory_Checkin' => 'Confirmación de registro de accesorio',
-    'Confirm_Asset_Checkin' => 'Confirmación de devolución de activo',
+    'Accessory_Checkin_Notification' => 'Accesorio ingresado',
+    'Accessory_Checkout_Notification' => 'Accesorio asignado',
+    'Asset_Checkin_Notification' => 'Activo ingresado',
+    'Asset_Checkout_Notification' => 'Activo asignado',
+    'Confirm_Accessory_Checkin' => 'Confirmación de ingreso de accesorio',
+    'Confirm_Asset_Checkin' => 'Confirmación de ingreso de activo',
     'Confirm_accessory_delivery' => 'Confirmación de entrega de accesorio',
     'Confirm_asset_delivery' => 'Confirmación de entrega de activo',
     'Confirm_consumable_delivery' => 'Confirmación de entrega de consumible',
     'Confirm_license_delivery' => 'Confirmación de entrega de licencia',
-    'Consumable_checkout_notification' => 'Consumible comprobado',
-    'Days' => 'Dias',
-    'Expected_Checkin_Date' => 'Un activo asignado a Ud. debe ser devuelto en :date',
+    'Consumable_checkout_notification' => 'Consumible asignado',
+    'Days' => 'Días',
+    'Expected_Checkin_Date' => 'Un activo asignado a Ud. debe ser devuelto el :date',
     'Expected_Checkin_Notification' => 'Recordatorio: :name se acerca la fecha de devolución',
-    'Expected_Checkin_Report' => 'Informe de devolución de activo esperado',
-    'Expiring_Assets_Report' => 'Informe de activos caducados.',
-    'Expiring_Licenses_Report' => 'Informe de licencias caducando.',
-    'Item_Request_Canceled' => 'Solicitud de cancelación de requerimiento',
+    'Expected_Checkin_Report' => 'Informe de próximas devoluciones de activos',
+    'Expiring_Assets_Report' => 'Informe de activos con garantía próxima a vencer.',
+    'Expiring_Licenses_Report' => 'Informe de licencias próximas a vencer.',
+    'Item_Request_Canceled' => 'Solicitud de artículo cancelada',
     'Item_Requested' => 'Artículo solicitado',
     'License_Checkin_Notification' => 'Licencia devuelta',
-    'License_Checkout_Notification' => 'Licencia reservada',
-    'Low_Inventory_Report' => 'Baja informe de inventario',
-    'a_user_canceled' => 'El usuario ha cancelado el item solicitado en la pagina Web',
-    'a_user_requested' => 'Un usuario a solicitado un item en la pagina Web',
+    'License_Checkout_Notification' => 'Licencia asignada',
+    'license_for'   => 'Licenciado para',
+    'Low_Inventory_Report' => 'Informe sobre inventario bajo',
+    'a_user_canceled' => 'El usuario ha cancelado el elemento solicitado en la página web',
+    'a_user_requested' => 'Un usuario ha solicitado un elemento en la página web',
     'acceptance_asset_accepted' => 'Un usuario ha aceptado un elemento',
     'acceptance_asset_declined' => 'Un usuario ha rechazado un elemento',
-    'accessory_name' => 'Nombre de accesorio:',
-    'additional_notes' => 'Notas adicionales:',
+    'accessory_name' => 'Nombre de accesorio',
+    'additional_notes' => 'Notas adicionales',
     'admin_has_created' => 'Un administrador ha creado una cuenta para usted en el sitio :web.',
-    'asset' => 'Activo:',
-    'asset_name' => 'Nombre del activo:',
+    'asset' => 'Activo',
+    'asset_name' => 'Nombre del activo',
     'asset_requested' => 'Activo solicitado',
-    'asset_tag' => 'Etiqueta de equipo',
+    'asset_tag' => 'Placa del activo',
     'assets_warrantee_alert' => 'Hay :count activo con una garantía que expira en los próximos :threshold days.|Hay :count activos con garantías que expiran en los siguientes :threshold days.',
     'assigned_to' => 'Asignado a',
-    'best_regards' => 'Saludos cordiales,',
-    'canceled' => 'Cancelado:',
-    'checkin_date' => 'Fecha de devolución:',
-    'checkout_date' => 'Fecha de asignación:',
-    'checkedout_from' => 'Salido de',
-    'checkedin_from'  => 'Registrado desde',
-    'checked_into' => 'Registrado en',
+    'best_regards' => 'Cordialmente,',
+    'canceled' => 'Cancelado',
+    'checkin_date' => 'Fecha de ingreso',
+    'checkout_date' => 'Fecha de asignación',
+    'checkedout_from' => 'Asignado desde',
+    'checkedin_from'  => 'Devuelto desde',
+    'checked_into' => 'Devuelto en',
     'click_on_the_link_accessory' => 'Haga clic en el enlace en la parte inferior para confirmar que ha recibido el accesorio.',
     'click_on_the_link_asset' => 'Haga clic en el enlace en la parte inferior para confirmar que ha recibido el activo.',
-    'click_to_confirm' => 'Por favor, haga clic en el siguiente enlace para confirmar su cuenta :web:',
+    'click_to_confirm' => 'Por favor, haga clic en el siguiente enlace para confirmar su cuenta de :web:',
     'current_QTY' => 'Cantidad actual',
-    'days' => 'Dias',
-    'expecting_checkin_date' => 'Fecha esperada de devolución:',
-    'expires' => 'Caduca',
+    'days' => 'Días',
+    'expecting_checkin_date' => 'Fecha esperada de devolución',
+    'expires' => 'Vence',
     'hello' => 'Hola',
-    'hi' => 'Hi',
+    'hi' => 'Hola',
     'i_have_read' => 'He leído y aceptado los términos de uso, y he recibido este artículo.',
     'inventory_report' => 'Informe de inventario',
-    'item' => 'Articulo:',
+    'item' => 'Elemento',
+    'item_checked_reminder' => 'Este es un recordatorio de que actualmente tiene :count elemento(s) asignado(s) que no ha aceptado o rechazado. Haga clic en el siguiente enlace para confirmar su decisión.',
     'license_expiring_alert' => 'Hay :count licencia que expira en los próximos :threshold días. | Hay :count licencias que expiran en los próximos :threshold días.',
-    'link_to_update_password' => 'Haga clic en el siguiente enlace para actualizar su: contraseña de la web:',
-    'login' => 'Entrar:',
+    'link_to_update_password' => 'Por favor, haga clic en el siguiente enlace para actualizar su contraseña de :web :',
+    'login' => 'Iniciar sesión',
     'login_first_admin' => 'Inicie sesión en su nueva instalación de Snipe-IT usando las credenciales:',
-    'low_inventory_alert' => 'Hay :count elemento que está por debajo del inventario mínimo o que pronto estará debajo.|Hay :count elementos que están por debajo del inventario mínimo o que pronto serán bajos.',
+    'low_inventory_alert' => 'Hay :count elemento que está por debajo del inventario mínimo o que pronto lo estará.|Hay :count elementos que están por debajo del inventario mínimo o que pronto lo estarán.',
     'min_QTY' => 'Cantidad mínima',
     'name' => 'Nombre',
     'new_item_checked' => 'Un nuevo artículo ha sido asignado a su nombre, los detalles están a continuación.',
+    'new_item_checked_with_acceptance' => 'A new item has been checked out under your name that requires acceptance, details are below.',
+    'recent_item_checked' => 'An item was recently checked out under your name that requires acceptance, details are below.',
     'notes' => 'Notas',
-    'password' => 'Contraseña:',
+    'password' => 'Contraseña',
     'password_reset' => 'Reiniciar la contraseña',
     'read_the_terms' => 'Por favor lea los términos de uso a continuación.',
     'read_the_terms_and_click' => 'Por favor lea los términos de uso a continuación y haga clic en el enlace en la parte inferior para confirmar que usted leyó los términos de uso y los acepta, y que ha recibido el activo.',
-    'requested' => 'Solicitado:',
-    'reset_link' => 'Enlace de restablecimiento de contraseña',
-    'reset_password' => 'Haga Clic aquí para restablecer su contraseña:',
+    'requested' => 'Solicitado',
+    'reset_link' => 'Su enlace de restablecimiento de contraseña',
+    'reset_password' => 'Haaga clic aquí para restablecer tu contraseña:',
     'rights_reserved' => 'Todos los derechos reservados.',
     'serial' => 'Número de serie',
     'snipe_webhook_test' => 'Prueba de integración de Snipe-IT',
     'snipe_webhook_summary' => 'Resumen de la prueba de integración de Snipe-IT',
     'supplier' => 'Proveedor',
-    'tag' => 'Etiqueta',
+    'tag' => 'Placa',
     'test_email' => 'Email de prueba de Snipe-IT',
-    'test_mail_text' => 'Esto es una prueba desde el sistema de gestión de activos de Snipe-IT. Si tienes esto, correo está funcionando :)',
+    'test_mail_text' => 'Esto es una prueba desde el sistema de gestión de activos Snipe-IT. Si recibió este mensaje, el correo está funcionando :)',
     'the_following_item' => 'El siguiente artículo ha sido devuelto: ',
-    'to_reset' => 'Para restaurar tu contraseña de :web, rellena este formulario:',
+    'to_reset' => 'Para restaurar su contraseña de :web, diligencie este formulario:',
     'type' => 'Tipo',
-    'upcoming-audits' => 'Hay :count activo que se está preparando para auditoría dentro de :threshold days.|Hay :count activos que se están preparando para auditoría en :threshold days.',
+    'upcoming-audits' => 'Hay :count activo para ser auditado antes de :threshold días.|Hay :count activos para ser auditados antes de :threshold días.',
     'user' => 'Usuario',
     'username' => 'Nombre de usuario',
+    'unaccepted_asset_reminder' => 'Reminder: You have Unaccepted Assets.',
     'welcome' => 'Bienvenido, :name',
     'welcome_to' => '¡Bienvenido a: web!',
-    'your_assets' => 'Ver tus activos',
-    'your_credentials' => 'Tus credenciales de Snipe-IT',
+    'your_assets' => 'Ver sus activos',
+    'your_credentials' => 'Sus credenciales de Snipe-IT',
+    'mail_sent' => '¡Correo enviado exitosamente!.',
 ];
diff --git a/resources/lang/es-CO/passwords.php b/resources/lang/es-CO/passwords.php
index f337c2c967..75469d1121 100644
--- a/resources/lang/es-CO/passwords.php
+++ b/resources/lang/es-CO/passwords.php
@@ -3,7 +3,7 @@
 return [
     'sent'	        => 'Si existe un usuario con una dirección de correo electrónico válida en nuestro sistema, se ha enviado un correo electrónico de recuperación de contraseña.',
     'user'			=> 'Si existe un usuario con una dirección de correo electrónico válida en nuestro sistema, se ha enviado un correo electrónico de recuperación de contraseña.',
-    'token'         => 'Este token de restablecimiento de contraseña no es válido o ha caducado, o no coincide con el nombre de usuario proporcionado.',
-    'reset'         => '¡Tu contraseña ha sido restablecida!',
+    'token'         => 'Esta sesión de restablecimiento de contraseña es inválida o ha caducado, o no coincide con el nombre de usuario proporcionado.',
+    'reset'         => '¡Su contraseña ha sido restablecida!',
     'password_change'  => '¡Su contraseña ha sido actualizada!',
 ];
diff --git a/resources/lang/es-CO/reminders.php b/resources/lang/es-CO/reminders.php
index 565dcdf12c..98f2819567 100644
--- a/resources/lang/es-CO/reminders.php
+++ b/resources/lang/es-CO/reminders.php
@@ -13,9 +13,9 @@ return array(
     |
     */
 
-    "password" => "Los passwords deben tener mínimo 6 caracteres y coincidir.",
-    "user"     => "Usuario o E-Mail incorrectos",
-    "token"    => 'Este token de restablecimiento de contraseña no es válido o ha caducado, o no coincide con el nombre de usuario proporcionado.',
+    "password" => "Las contraseñas deben ser de seis caracteres y coincidir con la confirmación.",
+    "user"     => "El nombre de usuario o la dirección de correo electrónico son incorrectos",
+    "token"    => 'Esta sesión de restablecimiento de contraseña es inválida o ha caducado, o no coincide con el nombre de usuario proporcionado.',
     'sent'	   => 'Si existe un usuario con una dirección de correo electrónico válida en nuestro sistema, se ha enviado un correo electrónico de recuperación de contraseña.',
 
 );
diff --git a/resources/lang/es-CO/table.php b/resources/lang/es-CO/table.php
index f9a2b34e43..dea24233f7 100644
--- a/resources/lang/es-CO/table.php
+++ b/resources/lang/es-CO/table.php
@@ -5,7 +5,7 @@ return array(
     'actions'	 	        => 'Acciones',
     'action' 		        => 'Acción',
     'by'      		        => 'Por',
-    'item' 			        => 'Articulo',
-    'no_matching_records'   => 'No se encontraron registros coincidentes',
+    'item' 			        => 'Elemento',
+    'no_matching_records'   => 'No se encontraron registros que coincidan',
 
 );
diff --git a/resources/lang/es-CO/validation.php b/resources/lang/es-CO/validation.php
index 902d647c8b..99f22708c2 100644
--- a/resources/lang/es-CO/validation.php
+++ b/resources/lang/es-CO/validation.php
@@ -13,88 +13,151 @@ return [
     |
     */
 
-    'accepted'             => 'El :attribute debe ser aceptado.',
-    'active_url'           => 'El campo :atribute no es una URL válida.',
-    'after'                => 'El campo :atribute debe ser una fecha posterior a :date.',
-    'after_or_equal'       => 'El campo :atribute debe ser una fecha posterior o igual a :date.',
-    'alpha'                => ':attribute solo acepta letras.',
-    'alpha_dash'           => ':attribute solo acepta letras, números y guiones.',
-    'alpha_num'            => ':attribute solo acepta letras y números.',
-    'array'                => 'El: atributo debe ser una matriz.',
-    'before'               => ':attribute debe ser anterior a :date.',
-    'before_or_equal'      => 'El atributo: debe ser una fecha anterior o igual a: fecha.',
-    'between'              => [
-        'numeric' => ':attribute debe estar entre :min - :max.',
-        'file'    => ':attribute debe estar entre :min - :max kilobytes.',
-        'string'  => ':attribute debe estar entre :min - :max caracteres.',
-        'array'   => 'El atributo: debe tener entre: min y: elementos máximos.',
+    'accepted' => 'El campo :attribute debe ser aceptado.',
+    'accepted_if' => 'El campo :attribute debe ser aceptado cuando :other es :value.',
+    'active_url' => 'El campo :attribute debe ser una dirección URL válida.',
+    'after' => 'El campo :attribute debe ser una fecha posterior a :date.',
+    'after_or_equal' => 'El campo :attribute debe ser una fecha posterior o igual a :date.',
+    'alpha' => 'El campo :attribute debe contener únicamente letras.',
+    'alpha_dash' => 'El campo :attribute debe contener únicamente letras, números, guiones y guiones bajos.',
+    'alpha_num' => 'El campo :attribute debe contener únicamente letras y números.',
+    'array' => 'El campo :attribute debe ser un arreglo.',
+    'ascii' => 'El campo :attribute debe contener únicamente caracteres y símbolos alfanuméricos de un byte.',
+    'before' => 'El campo :attribute debe ser una fecha anterior a :date.',
+    'before_or_equal' => 'El campo :attribute debe ser una fecha anterior o igual a :date.',
+    'between' => [
+        'array' => 'El campo :attribute debe tener elementos entre :min y :max.',
+        'file' => 'El campo :attribute debe tener entre :min y :max kilobytes.',
+        'numeric' => 'El campo :attribute debe estar entre :min y :max.',
+        'string' => 'El campo :attribute debe tener entre :min y :max caracteres.',
     ],
-    'boolean'              => ':attribute debe ser verdadero o falso.',
-    'confirmed'            => ':attribute la confirmación no coincide.',
-    'date'                 => ':attribute no es una fecha correcta.',
-    'date_format'          => ':attribute no cumple el formato :format.',
-    'different'            => ':attribute y :other deben ser diferentes.',
-    'digits'               => ':attribute debe tener :digits dígitos.',
-    'digits_between'       => ':attribute debe tener entre :min y :max dígitos.',
-    'dimensions'           => 'El atributo: tiene dimensiones de imagen no válidas.',
-    'distinct'             => 'El campo: atributo tiene un valor duplicado.',
-    'email'                => ':attribute formato incorrecto.',
-    'exists'               => 'El :attribute seleccionado no es correcto.',
-    'file'                 => 'El: atributo debe ser un archivo.',
-    'filled'               => 'El campo: atributo debe tener un valor.',
-    'image'                => ':attribute debe ser una imagen.',
+    'boolean' => 'El campo :attribute debe ser verdadero o falso.',
+    'can' => 'El campo :attribute contiene un valor no autorizado.',
+    'confirmed' => 'La confirmación del campo :attribute no coincide.',
+    'contains' => 'Falta un valor obligatorio en el campo :attribute.',
+    'current_password' => 'La contraseña es incorrecta.',
+    'date' => 'El campo :attribute debe contener una fecha válida.',
+    'date_equals' => 'El campo :attribute debe ser una fecha igual a :date.',
+    'date_format' => 'El campo :attribute debe coincidir con el formato :format.',
+    'decimal' => 'El campo :attribute debe tener :decimal lugares decimales.',
+    'declined' => 'El campo :attribute debe ser rechazado.',
+    'declined_if' => 'El campo :attribute debe ser rechazado cuando :other es :value.',
+    'different' => 'Los campos :attribute y :other deben ser diferentes.',
+    'digits' => 'El campo :attribute debe tener :digits dígitos.',
+    'digits_between' => 'El campo :attribute debe tener entre :min y :max dígitos.',
+    'dimensions' => 'El campo :attribute tiene dimensiones de imagen no válidas.',
+    'distinct' => 'El campo: atributo tiene un valor duplicado.',
+    'doesnt_end_with' => 'El campo :attribute no debe finalizar con uno de los siguientes :values.',
+    'doesnt_start_with' => 'El campo :attribute no debe iniciar con uno de los siguientes :values.',
+    'email' => 'El campo :attribute debe ser una dirección de correo válida.',
+    'ends_with' => 'El campo :attribute debe finalizar con uno de los siguientes :values.',
+    'enum' => 'El :attribute seleccionado no es correcto.',
+    'exists' => 'El :attribute seleccionado no es correcto.',
+    'extensions' => 'El campo :attribute debe tener una de las siguientes extensiones :values.',
+    'file' => 'El campo :attribute debe ser un archivo.',
+    'filled' => 'El campo: atributo debe tener un valor.',
+    'gt' => [
+        'array' => 'El campo :attribute debe tener más de :value elementos.',
+        'file' => 'El campo :attribute debe ser mayor que :value kilobytes.',
+        'numeric' => 'El campo :attribute debe ser mayor que :value.',
+        'string' => 'El campo :attribute debe ser mayor que :value caracteres.',
+    ],
+    'gte' => [
+        'array' => 'El campo :attribute debe tener :value elementos o más.',
+        'file' => 'El campo :attribute debe ser mayor que o igual a :value kilobytes.',
+        'numeric' => 'El campo :attribute debe ser mayor que o igual a :value.',
+        'string' => 'El campo :attribute debe ser mayor que o igual a :value caracteres.',
+    ],
+    'hex_color' => 'El campo :attribute debe ser un color hexadecimal válido.',
+    'image' => 'El campo :attribute debe ser una imagen.',
     'import_field_empty'    => 'El valor para :fieldname no puede ser nulo.',
-    'in'                   => 'El :attribute seleccionado no es correcto.',
-    'in_array'             => 'El campo: atributo no existe en: otro.',
-    'integer'              => ':attribute debe ser un número entero.',
-    'ip'                   => ':attribute debe ser una dirección IP correcta.',
-    'ipv4'                 => 'El atributo: debe ser una dirección IPv4 válida.',
-    'ipv6'                 => 'El atributo: debe ser una dirección IPv6 válida.',
-    'is_unique_department' => 'El atributo :attribute debe ser único para esta ubicación de la compañía',
-    'json'                 => 'El atributo: debe ser una cadena JSON válida.',
-    'max'                  => [
-        'numeric' => ':attribute no debe ser mayor que :max.',
-        'file'    => ':attribute no debe ser mayor que :max kilobytes.',
-        'string'  => ':attribute no debe tener como máximo :max caracteres.',
-        'array'   => 'El atributo: puede no tener más que: elementos máximos.',
+    'in' => 'El :attribute seleccionado no es correcto.',
+    'in_array' => 'El campo :attribute debe existir en :other.',
+    'integer' => 'El campo :attribute debe ser un valor entero.',
+    'ip' => 'El campo :attribute debe ser una dirección IP válida.',
+    'ipv4' => 'El campo :attribute debe ser una dirección IPv4 válida.',
+    'ipv6' => 'El campo :attribute debe ser una dirección IPv6 válida.',
+    'json' => 'El campo :attribute debe ser una cadena de texto JSON válida.',
+    'list' => 'The campo :attribute debe ser una lista.',
+    'lowercase' => 'El campo :attribute debe estar en minúsculas.',
+    'lt' => [
+        'array' => 'El campo :attribute debe tener menos que :value elementos.',
+        'file' => 'El campo :attribute debe ser menor que :value kilobytes.',
+        'numeric' => 'El campo :attribute debe ser menor que :value.',
+        'string' => 'El campo :attribute debe ser menor que :value caracteres.',
     ],
-    'mimes'                => ':attribute debe ser un archivo del tipo: :values.',
-    'mimetypes'            => 'El atributo: debe ser un archivo de tipo:: valores.',
-    'min'                  => [
-        'numeric' => ':attribute debe ser como mínimo :min.',
-        'file'    => ':attribute debe ser como mínimo de :min kilobytes.',
-        'string'  => ':attribute debe contener como mínimo :min caracteres.',
-        'array'   => 'El atributo: debe tener al menos: elementos min.',
+    'lte' => [
+        'array' => 'El campo :attribute no debe tener más de :value elementos.',
+        'file' => 'El campo :attribute debe ser menor que o igual a :value kylobytes.',
+        'numeric' => 'El campo :attribute debe ser menor que o igual a :value.',
+        'string' => 'El campo :attribute debe ser menor que o igual a :value caracteres.',
     ],
-    'starts_with'          => 'El :attribute debe comenzar con uno de los siguientes: :values.',
-    'ends_with'            => 'El campo :attribute debe terminar con uno de los siguientes: :values.',
+    'mac_address' => 'El campo :attribute debe ser una dirección MAC válida.',
+    'max' => [
+        'array' => 'El campo :attribute no debe tener más de :max elementos.',
+        'file' => 'El campo :attribute no debe ser mayor que :max kilobytes.',
+        'numeric' => 'El campo :attribute no debe ser mayor que :max.',
+        'string' => 'El campo :attribute no debe ser mayor que :max caracteres.',
+    ],
+    'max_digits' => 'El campo :attribute no debe tener más de :max dígitos.',
+    'mimes' => 'El campo :attribute debe un archivo de tipo: :values.',
+    'mimetypes' => 'El campo :attribute debe un archivo de tipo: :values.',
+    'min' => [
+        'array' => 'El campo :attribute debe tener al menos :min elementos.',
+        'file' => 'El campo :attribute debe ser de al menos :min kilobytes.',
+        'numeric' => 'El campo :attribute debe ser al menos :min.',
+        'string' => 'El campo :attribute debe contener como mínimo :min caracteres.',
+    ],
+    'min_digits' => 'El campo :attribute debe contener como mínimo :min dígitos.',
+    'missing' => 'El campo :attribute debe estar vacío.',
+    'missing_if' => 'El campo :attribute debe estar vacío cuando :other sea :value.',
+    'missing_unless' => 'El campo :attribute debe estar vacío a menos que :other sea :value.',
+    'missing_with' => 'El campo :attribute debe estar vacío cuando :values esté presente.',
+    'missing_with_all' => 'El campo :attribute debe estar vacío cuando :values estén presentes.',
+    'multiple_of' => 'El campo :attribute debe ser un múltiplo de :value.',
+    'not_in' => 'El :attribute seleccionado no es correcto.',
+    'not_regex' => 'El campo :attribute no es válido.',
+    'numeric' => 'El campo :attribute debe ser un número.',
+    'password' => [
+        'letters' => 'El cammpo :attribute debe contener al menos una letra.',
+        'mixed' => 'El campo :attribute debe contener al menos una letra minúscula y una mayúscula.',
+        'numbers' => 'El campo :attribute debe contener al menos un número.',
+        'symbols' => 'El campo :attribute debe contener al menos un símbolo.',
+        'uncompromised' => 'El valor de :attribute ha aparecido en una fuga de datos. Por favor, seleccione un valor diferente para :attribute.',
+    ],
+    'percent'       => 'El mínimo de amortización debe estar entre 0 y 100 cuando el tipo de amortización es porcentual.',
 
-    'not_in'               => 'El :attribute seleccionado no es correcto.',
-    'numeric'              => ':attribute debe ser un número.',
-    'present'              => 'El campo: atributo debe estar presente.',
-    'valid_regex'          => 'Este no es un regex válido. ',
-    'regex'                => ':attribute formato incorrecto.',
-    'required'             => 'El campo :attribute es obligatorio.',
-    'required_if'          => 'El campo :attribute es obligatorio cuando :other es :value.',
-    'required_unless'      => 'El campo :attribute es obligatorio a menos que :other esté en :values.',
-    'required_with'        => ':attribute es obligatrio cuando :values es present.',
-    'required_with_all'    => 'El campo: atributo se requiere cuando: los valores están presentes.',
-    'required_without'     => ':attribute es obligatrio cuando :values es not present.',
-    'required_without_all' => 'El campo: atributo es necesario cuando ninguno de: valores están presentes.',
-    'same'                 => ':attribute y :other deben coincidir.',
-    'size'                 => [
-        'numeric' => ':attribute debe tener :size.',
-        'file'    => ':attribute debe tener :size kilobytes.',
-        'string'  => ':attribute debe tener :size caracteres.',
-        'array'   => 'El atributo: debe contener: elementos de tamaño.',
+    'present' => 'El campo: atributo debe estar presente.',
+    'present_if' => 'El campo :attribute debe estar presente cuando :other sea :value.',
+    'present_unless' => 'El campo :attribute debe estar presente a menos que :other sea :value.',
+    'present_with' => 'El campo :attribute debe estar presente cuando :values esté presente.',
+    'present_with_all' => 'El campo :attribute debe estar presente cuando :values estén presentes.',
+    'prohibited' => 'El campo :attribute está prohibido.',
+    'prohibited_if' => 'El campo :attribute está prohibido cuando :other sea :value.',
+    'prohibited_unless' => 'El campo :attribute está prohibido a menos que :other esté en :values.',
+    'prohibits' => 'El campo :attribute prohíbe la presencia de :other.',
+    'regex' => 'El formato del campo :attribute no es válido.',
+    'required' => 'El campo :attribute es obligatorio.',
+    'required_array_keys' => 'El campo :attribute debe contener valores para: :values.',
+    'required_if' => 'El campo :attribute es obligatorio cuando :other es :value.',
+    'required_if_accepted' => 'El campo :attribute es obligatorio cuando se acepta :other.',
+    'required_if_declined' => 'El campo :attribute es requerido cuando :other es rechazado.',
+    'required_unless' => 'El campo :attribute es obligatorio a menos que :other esté en :values.',
+    'required_with' => 'El campo :attribute es obligatorio cuando :values está presente.',
+    'required_with_all' => 'El campo :attribute es requerido cuando :values están presentes.',
+    'required_without' => ':attribute es obligatrio cuando :values es not present.',
+    'required_without_all' => 'El campo :attribute es obligatorio cuando no está presente ninguno de los :values.',
+    'same' => 'El campo :attribute debe coincidir con :other.',
+    'size' => [
+        'array' => 'El campo :attribute debe contenter :size elementos.',
+        'file' => 'El campo :attribute debe ser de :size kilobytes.',
+        'numeric' => 'El campo :attribute debe ser :size.',
+        'string' => 'El campo :attribute debe ser de :size caracteres.',
     ],
+    'starts_with' => 'El campo :attribute debe iniciar con uno de los siguientes: :values.',
     'string'               => 'El atributo: debe ser una cadena.',
-    'timezone'             => 'El atributo: debe ser una zona válida.',
-    'two_column_unique_undeleted' => ':attribute debe ser único a través de :table1 y :table2. ',
-    'unique'               => ':attribute ya ha sido introducido.',
-    'uploaded'             => 'El atributo: no se pudo cargar.',
-    'url'                  => ':attribute formato incorrecto.',
-    'unique_undeleted'     => 'El :atrribute debe ser único.',
+    'two_column_unique_undeleted' => ':attribute debe ser único entre la :table1 y :table2. ',
+    'unique_undeleted'     => ':attribute debe ser único.',
     'non_circular'         => ':attribute no debe crear una referencia circular.',
     'not_array'            => ':attribute no puede ser una matriz.',
     'disallow_same_pwd_as_user_fields' => 'La contraseña no puede ser la misma que el nombre de usuario.',
@@ -102,11 +165,14 @@ return [
     'numbers'              => 'La contraseña debe contener al menos un número.',
     'case_diff'            => 'La contraseña debe usar mayúsculas y minúsculas.',
     'symbols'              => 'La contraseña debe contener símbolos.',
-    'gte'                  => [
-        'numeric'          => 'El valor no puede ser negativo'
-    ],
-    'checkboxes'           => ':attribute contiene opciones no válidas.',
-    'radio_buttons'        => ':attribute no es válido.',
+    'timezone' => 'El campo :attribute debe ser una zona horaria válida.',
+    'unique' => ':attribute ya está en uso.',
+    'uploaded' => ':attribute no se pudo cargar.',
+    'uppercase' => 'El campo :attribute debe estar en mayúsculas.',
+    'url' => 'El campo :attribute debe ser una URL válida.',
+    'ulid' => 'El campo :attribute debe ser un ULID válido.',
+    'uuid' => 'El campo :attribute debe ser un UUID válido.',
+    'fmcs_location' => 'Full multiple company support and location scoping is enabled in the Admin Settings, and the selected location and selected company are not compatible.',
 
 
     /*
@@ -120,26 +186,38 @@ return [
     |
     */
 
+    'email_array'      => 'Una o más direcciones de correo electrónico no son válidas.',
+    'checkboxes'           => ':attribute contiene opciones no válidas.',
+    'radio_buttons'        => ':attribute no es válido.',
+    
     'custom' => [
-        'alpha_space' => 'El campo: atributo contiene un carácter que no está permitido.',
-        'email_array'      => 'Una o más direcciones de correo electrónico no es válida.',
-        'hashed_pass'      => 'Tu contraseña actual es incorrecta',
+        'alpha_space' => 'El campo :attribute contiene un carácter que no está permitido.',
+
+        'hashed_pass'      => 'Su contraseña actual es incorrecta',
         'dumbpwd'          => 'Esa contraseña es muy común.',
         'statuslabel_type' => 'Debe seleccionar un tipo de etiqueta de estado válido.',
+        'custom_field_not_found'          => 'Este campo parece que no existe, por favor, compruebe los nombres de sus campos personalizados.',
+        'custom_field_not_found_on_model' => 'Este campo parece existir, pero no está disponible en este conjunto de campos para el modelo de activo.',
 
         // date_format validation with slightly less stupid messages. It duplicates a lot, but it gets the job done :(
-        // We use this because the default error message for date_format is reflects php Y-m-d, which non-PHP
-        // people won't know how to format. 
-        'purchase_date.date_format'     => ':attribute debe ser una fecha válida en formato AAA-MM-DD',
-        'last_audit_date.date_format'   =>  'El campo :attribute debe ser una fecha válida en formato AAA-MM-DD hh:mm:ss',
-        'expiration_date.date_format'   =>  ':attribute debe ser una fecha válida en formato AAA-MM-DD',
-        'termination_date.date_format'  =>  ':attribute debe ser una fecha válida en formato AAA-MM-DD',
-        'expected_checkin.date_format'  =>  ':attribute debe ser una fecha válida en formato AAA-MM-DD',
-        'start_date.date_format'        =>  ':attribute debe ser una fecha válida en formato AAA-MM-DD',
-        'end_date.date_format'          =>  ':attribute debe ser una fecha válida en formato AAA-MM-DD',
+        // We use this because the default error message for date_format reflects php Y-m-d, which non-PHP
+        // people won't know how to format.
+        'purchase_date.date_format'     => ':attribute debe ser una fecha válida en formato AAAA-MM-DD',
+        'last_audit_date.date_format'   =>  'El campo :attribute debe ser una fecha válida en formato AAAA-MM-DD hh:mm:ss',
+        'expiration_date.date_format'   =>  ':attribute debe ser una fecha válida en formato AAAA-MM-DD',
+        'termination_date.date_format'  =>  ':attribute debe ser una fecha válida en formato AAAA-MM-DD',
+        'expected_checkin.date_format'  =>  ':attribute debe ser una fecha válida en formato AAAA-MM-DD',
+        'start_date.date_format'        =>  ':attribute debe ser una fecha válida en formato AAAA-MM-DD',
+        'end_date.date_format'          =>  ':attribute debe ser una fecha válida en formato AAAA-MM-DD',
+        'invalid_value_in_field' => 'Valor no válido incluido en este campo',
 
-    ],
+        'ldap_username_field' => [
+            'not_in' =>         '<code>sAMAccountName</code> (mezcla de mayúsculas y minúsculas) no funcionará. Debe utilizar <code>samaccountname</code> (minúsculas) en su lugar.'
+        ],
+        'ldap_auth_filter_query' => ['not_in' => '<code>uid=samaccountname</code> probablemente no es un filtro de autenticación válido Probablemente quiera <code>uid=</code> '],
+        'ldap_filter' => ['regex' => 'Este valor probablemente no debería ir entre paréntesis.'],
 
+        ],
     /*
     |--------------------------------------------------------------------------
     | Custom Validation Attributes
@@ -155,8 +233,16 @@ return [
 
     /*
     |--------------------------------------------------------------------------
-    | Generic Validation Messages
+    | Generic Validation Messages - we use these in the jquery validation where we don't have
+    | access to the :attribute
     |--------------------------------------------------------------------------
     */
-    'invalid_value_in_field' => 'Valor no válido incluido en este campo',
+
+    'generic' => [
+        'invalid_value_in_field' => 'Valor no válido incluido en este campo',
+        'required' => 'El campo es obligatorio',
+        'email' => 'Por favor, ingrese una dirección de correo electrónico válida.',
+    ],
+
+
 ];
diff --git a/resources/lang/es-ES/account/general.php b/resources/lang/es-ES/account/general.php
index 3303787c2e..b727b63023 100644
--- a/resources/lang/es-ES/account/general.php
+++ b/resources/lang/es-ES/account/general.php
@@ -2,10 +2,16 @@
 
 return array(
     'personal_api_keys' => 'Claves API personales',
-    'api_key_warning' => 'When generating an API token, be sure to copy it down immediately as they will not be visible to you again.',
-    'api_base_url' => 'La url base de tu API es:',
+    'personal_access_token' => 'Credencial de acceso personal',
+    'personal_api_keys_success' => 'Clave API personal :key creada correctamente',
+    'here_is_api_key' => 'Aquí tiene su nueva credencial de acceso personal. Esta es la única vez que se mostrará, así que no la pierda. Ahora puede utilizar esta credencial para realizar solicitudes a la API.',
+    'api_key_warning' => 'Al generar una credencial para la API, asegúrese de copiarla inmediatamente, ya que no podrá volver a verla.',
+    'api_base_url' => 'La url base de su API se encuentra en:',
     'api_base_url_endpoint' => '/&lt;endpoint&gt;',
-    'api_token_expiration_time' => 'Los tokens de la API están establecidos para expirar en:',
-    'api_reference' => 'Please check the <a href="https://snipe-it.readme.io/reference" target="_blank">API reference</a> to find specific API endpoints and additional API documentation.',
-    'profile_updated' => 'Cuenta actualizada exitosamente',
+    'api_token_expiration_time' => 'Las credenciales de la API están establecidas para expirar en:',
+    'api_reference' => 'Consulte <a href="https://snipe-it.readme.io/reference" target="_blank">API reference</a> para encontrar los puntos finales (endpoins) de la API y documentación adicional.',
+    'profile_updated' => 'La cuenta fue actualizada exitosamente',
+    'no_tokens' => 'No ha creado ninguna credencial de acceso personal.',
+    'enable_sounds' => 'Habilitar efectos de sonido',
+    'enable_confetti' => 'Activar los efectos confeti',
 );
diff --git a/resources/lang/es-ES/admin/accessories/general.php b/resources/lang/es-ES/admin/accessories/general.php
index 02beea6a09..5357639447 100644
--- a/resources/lang/es-ES/admin/accessories/general.php
+++ b/resources/lang/es-ES/admin/accessories/general.php
@@ -3,20 +3,20 @@
 return array(
     'accessory_category' 				=> 'Categoría de accesorio',
     'accessory_name'  					=> 'Nombre de accesorio',
-    'checkout'  							=> 'Checkout Accesorio',
-    'checkin'  							=> 'Checkin Accesorio',
-    'create'  							=> 'Crear Accesorio',
-    'edit'  							=> 'Editar Accesorio',
+    'checkout'  							=> 'Asignar accesorio',
+    'checkin'  							=> 'Ingresar accesorio',
+    'create'  							=> 'Crear accesorio',
+    'edit'  							=> 'Editar accesorio',
     'eula_text'							=> 'Acuerdo de uso de la categoría',
-    'eula_text_help'					=> 'Este campo permite personalizar los acuerdos de uso para tipos específicos de activos. Si solo tiene un acuerdo de uso para todos sus activos, puede seleccionar la siguiente opción para usar el valor por predeterminado.',
-    'require_acceptance'				=> 'Pedir a los usuarios confirmación de aceptación de los elementos en esta categoría.',
+    'eula_text_help'					=> 'Este campo permite personalizar los acuerdos de uso para tipos específicos de activos. Si solo tiene un acuerdo de uso para todos sus activos, puede seleccionar la siguiente opción para usar el valor predeterminado.',
+    'require_acceptance'				=> 'Pedir a los usuarios confirmación de aceptación de los activos en esta categoría.',
     'no_default_eula'					=> 'No se encontró el acuerdo de uso predeterminado. Agregue unos en Configuración.',
     'total'  							=> 'Total ',
     'remaining'  						=> 'Disponibles',
-    'update'  							=> 'Actualizar Accesorio',
-    'use_default_eula'					=> 'En su lugar, el <a href="#" data-toggle="modal" data-target="#eulaModal">acuerdo de uso predeterminado</a>.',
-    'use_default_eula_disabled'			=> '<del>En su lugar, use el acuerdo de uso predeterminado.</del> No está configurado el acuerdo de uso predeterminado. Por favor agregue uno en Configuración.',
+    'update'  							=> 'Actualizar accesorio',
+    'use_default_eula'					=> 'En su lugar, utilice el <a href="#" data-toggle="modal" data-target="#eulaModal">acuerdo de uso predeterminado</a>.',
+    'use_default_eula_disabled'			=> '<del>En su lugar, utilice el acuerdo de uso predeterminado.</del> No está configurado el acuerdo de uso predeterminado. Por favor agregue uno en Configuración.',
     'clone'                             => 'Clonar accesorio',
-    'delete_disabled'                   => 'Este accesorio no se puede eliminar aún porque algunos elementos todavía están retirados.',
+    'delete_disabled'                   => 'Este accesorio no se puede eliminar aún porque algunos elementos todavía están asignados.',
 
 );
diff --git a/resources/lang/es-ES/admin/accessories/message.php b/resources/lang/es-ES/admin/accessories/message.php
index cfad604dcd..c2d52963e8 100644
--- a/resources/lang/es-ES/admin/accessories/message.php
+++ b/resources/lang/es-ES/admin/accessories/message.php
@@ -4,35 +4,39 @@ return array(
 
     'does_not_exist' => 'El accesorio [:id] no existe.',
     'not_found' => 'Ese accesorio no fue encontrado.',
-    'assoc_users'	 => 'Este accesorio actualmente tiene :count entregados a usuarios. Por favor ingrese los accesorios y vuelva a intentar. ',
+    'assoc_users'	 => 'Este accesorio actualmente tiene :count elemento(s) asignado(s) a usuarios. Por favor realice el ingreso de los accesorios y vuelva a intentar. ',
 
     'create' => array(
-        'error'   => 'El accesorio no fue creado, por favor, inténtalo de nuevo.',
+        'error'   => 'El accesorio no fue creado, por favor inténtelo de nuevo.',
         'success' => 'Accesorio creado correctamente.'
     ),
 
     'update' => array(
-        'error'   => 'El accesorio no fue actualizado, por favor, inténtalo de nuevo',
-        'success' => 'Accesorio actualizado correctamente.'
+        'error'   => 'El accesorio no fue actualizado, por favor, inténtelo de nuevo',
+        'success' => 'El accesorio fue actualizado con éxito.'
     ),
 
     'delete' => array(
         'confirm'   => '¿Está seguro de que desea eliminar este accesorio?',
-        'error'   => 'Ha habido un problema eliminando este accesorio. Intentalo de nuevo.',
+        'error'   => 'Hubo un problema eliminando el accesorio. Por favor, inténtelo de nuevo.',
         'success' => 'El accesorio fue borrado con éxito.'
     ),
 
      'checkout' => array(
-        'error'   		=> 'El accesorio no fue retirado, por favor vuelva a intentarlo',
-        'success' 		=> 'Accesorio retirado correctamente.',
-        'unavailable'   => 'El accesorio no está disponible para su retirada. Compruebe la cantidad disponible',
-        'user_does_not_exist' => 'Este usuario es inválido . Inténtalo de nuevo.'
+        'error'   		=> 'El accesorio no fue asignado, por favor vuelva a intentarlo',
+        'success' 		=> 'Accesorio asignado correctamente.',
+        'unavailable'   => 'El accesorio no está disponible para ser asignado. Compruebe la cantidad disponible',
+        'user_does_not_exist' => 'Este usuario no es válido. Por favor, inténtelo de nuevo.',
+         'checkout_qty' => array(
+            'lte'  => 'En este momento solo existe un accesorio disponible de este tipo y está tratando de asignar :checkout_qty. Por favor, ajuste la cantidad asignada o el total de existencias de este accesorio e intente nuevamente.|Existen en total :number_currently_remaining accesorios disponibles y está tratando de asignar :checkout_qty. Por favor, ajuste la cantidad asignada o el total de existencias de este accesorio e intente nuevamente.',
+            ),
+           
     ),
 
     'checkin' => array(
-        'error'   		=> 'El accesorio no fue agregado, favor vuelva a intentarlo',
-        'success' 		=> 'Accesorio devuelto correctamente.',
-        'user_does_not_exist' => 'Este usuario es inválido . Inténtalo de nuevo.'
+        'error'   		=> 'El accesorio no fue recibido, por favor vuelva a intentarlo',
+        'success' 		=> 'El accesorio ha sido ingresado correctamente.',
+        'user_does_not_exist' => 'Ese usuario no es válido. Por favor, inténtelo de nuevo.'
     )
 
 
diff --git a/resources/lang/es-ES/admin/accessories/table.php b/resources/lang/es-ES/admin/accessories/table.php
index 1a2d33e1eb..05184e79e3 100644
--- a/resources/lang/es-ES/admin/accessories/table.php
+++ b/resources/lang/es-ES/admin/accessories/table.php
@@ -5,7 +5,5 @@ return array(
 	'eula_text'      			=> 'Acuerdo de uso',
     'id'      					=> 'ID',
     'require_acceptance'      	=> 'Aceptación',
-    'title'      				=> 'Nombre accesorio',
-
-
+    'title'      				=> 'Nombre del accesorio',
 );
diff --git a/resources/lang/es-ES/admin/asset_maintenances/form.php b/resources/lang/es-ES/admin/asset_maintenances/form.php
index 1318740d0f..dfda6be9c5 100644
--- a/resources/lang/es-ES/admin/asset_maintenances/form.php
+++ b/resources/lang/es-ES/admin/asset_maintenances/form.php
@@ -1,14 +1,14 @@
 <?php
 
     return [
-        'asset_maintenance_type' => 'Tipo de Mantenimiento de Equipo',
+        'asset_maintenance_type' => 'Tipo de mantenimiento del activo',
         'title'                  => 'Título',
         'start_date'             => 'Fecha de inicio',
-        'completion_date'        => 'Fecha de Terminación',
+        'completion_date'        => 'Fecha de finalización',
         'cost'                   => 'Costo',
-        'is_warranty'            => 'Mejora de la Garantía',
-        'asset_maintenance_time' => 'Tiempo de Mantenimiento de Equipo (en días)',
+        'is_warranty'            => 'Mejora de la garantía',
+        'asset_maintenance_time' => 'Duración del mantenimiento (en días)',
         'notes'                  => 'Notas',
-        'update'                 => 'Actualizar Mantenimiento de Equipo',
-        'create'                 => 'Crear Mantenimiento de Equipo'
+        'update'                 => 'Actualizar mantenimiento del activo',
+        'create'                 => 'Crear mantenimiento del activo'
     ];
diff --git a/resources/lang/es-ES/admin/asset_maintenances/general.php b/resources/lang/es-ES/admin/asset_maintenances/general.php
index 9a495cd785..77c6a419f0 100644
--- a/resources/lang/es-ES/admin/asset_maintenances/general.php
+++ b/resources/lang/es-ES/admin/asset_maintenances/general.php
@@ -2,15 +2,15 @@
 
     return [
         'asset_maintenances' => 'Mantenimiento de activos',
-        'edit'               => 'Editar Mantenimiento de Equipo',
-        'delete'             => 'Eliminar Mantenimiento de Equipo',
-        'view'               => 'Ver Detalle de Mantenimiento de Equipo',
-        'repair'             => 'Reparación',
+        'edit'               => 'Editar mantenimiento del activo',
+        'delete'             => 'Eliminar mantenimiento del activo',
+        'view'               => 'Ver detalles del mantenimiento del activo',
+        'repair'             => 'Reparar',
         'maintenance'        => 'Mantenimiento',
-        'upgrade'            => 'Mejora',
-        'calibration'        => 'Calibrar',
-        'software_support'   => 'Servicio de software',
-        'hardware_support'   => 'Servicio de software',
+        'upgrade'            => 'Mejorar',
+        'calibration'        => 'Calibración',
+        'software_support'   => 'Soporte de software',
+        'hardware_support'   => 'Soporte de hardware',
         'configuration_change'   => 'Cambio de configuración',
         'pat_test'           => 'Prueba PAT',
     ];
diff --git a/resources/lang/es-ES/admin/asset_maintenances/message.php b/resources/lang/es-ES/admin/asset_maintenances/message.php
index 2a7e98f38b..c7caffb3f4 100644
--- a/resources/lang/es-ES/admin/asset_maintenances/message.php
+++ b/resources/lang/es-ES/admin/asset_maintenances/message.php
@@ -4,18 +4,18 @@
         'not_found'                    => '¡El mantenimiento del activo que estaba buscando no se encontró!',
         'delete'                       => [
             'confirm' => '¿Está seguro de que desea eliminar el mantenimiento de este activo?',
-            'error'   => 'Hubo un problema al eliminar el mantenimiento de equipo. Por favor intente nuevamente.',
-            'success' => 'El mantenimiento de equipo fue eliminado de manera exitosa.',
+            'error'   => 'Hubo un problema al eliminar el mantenimiento del activo. Por favor inténtelo nuevamente.',
+            'success' => 'El mantenimiento del activo fue eliminado de manera exitosa.',
         ],
         'create'                       => [
             'error'   => 'El Mantenimiento de Equipo no fue creado, por favor intente nuevamente.',
-            'success' => 'El Mantenimiento de Equipo fue creado de manera exitosa.',
+            'success' => 'El mantenimiento del activo fue creado de manera exitosa.',
         ],
         'edit'                       => [
-            'error'   => 'El mantenimiento de activo no fue editado. Por favor, intenta de nuevo.',
-            'success' => 'Mantenimiento de activo editado con éxito.',
+            'error'   => 'El mantenimiento del activo no fue editado. Por favor, inténtelo de nuevo.',
+            'success' => 'Mantenimiento del activo editado con éxito.',
         ],
-        'asset_maintenance_incomplete' => 'Sin Completar',
+        'asset_maintenance_incomplete' => 'Aún no se ha completado',
         'warranty'                     => 'Garantía',
-        'not_warranty'                 => 'Sin Garantía',
+        'not_warranty'                 => 'Sin garantía',
     ];
diff --git a/resources/lang/es-ES/admin/asset_maintenances/table.php b/resources/lang/es-ES/admin/asset_maintenances/table.php
index adabb3ff69..6da43b1c77 100644
--- a/resources/lang/es-ES/admin/asset_maintenances/table.php
+++ b/resources/lang/es-ES/admin/asset_maintenances/table.php
@@ -1,7 +1,7 @@
 <?php
 
     return [
-        'title'         => 'Mantenimiento de Equipo',
+        'title'         => 'Mantenimiento del activo',
         'asset_name'    => 'Nombre del activo',
         'is_warranty'   => 'Garantía',
         'dl_csv'        => 'Descargar CSV',
diff --git a/resources/lang/es-ES/admin/categories/general.php b/resources/lang/es-ES/admin/categories/general.php
index 0a94acd238..c0086fae37 100644
--- a/resources/lang/es-ES/admin/categories/general.php
+++ b/resources/lang/es-ES/admin/categories/general.php
@@ -3,18 +3,18 @@
 return array(
     'asset_categories' 					=> 'Categorías de activos',
     'category_name'  					=> 'Nombre de la categoría',
-    'checkin_email'                     => 'Enviar un correo al usuario al devolver/asignar.',
-    'checkin_email_notification'        => 'A este usuario se le enviará un correo electrónico al devolver/asignar.',
+    'checkin_email'                     => 'Enviar un correo electrónico al usuario al recibir/devolver.',
+    'checkin_email_notification'        => 'A este usuario se le enviará un correo electrónico al recibir/devolver.',
     'clone'                             => 'Clonar categoría',
     'create'  							=> 'Crear categoría',
-    'edit'                              => 'Editar Categoría',
+    'edit'                              => 'Editar categoría',
     'email_will_be_sent_due_to_global_eula' => 'Se enviará un correo electrónico al usuario porque se está utilizando el acuerdo de uso global.',
     'email_will_be_sent_due_to_category_eula' => 'Se enviará un correo electrónico al usuario porque se ha establecido un acuerdo de uso para esta categoría.',
     'eula_text'							=> 'Acuerdo de uso de la categoría',
-    'eula_text_help'					=> 'Este campo permite personalizar el acuerdo de uso para tipos específicos de activos. Si solo tiene un acuerdo de uso para todos sus activos, puede seleccionar la siguiente opción para usar la definición predeterminada.',
+    'eula_text_help'					=> 'Este campo permite personalizar los términos y condiciones para tipos específicos de activos. Si solo tiene unos términos y condiciones para todos sus activos, puede seleccionar la siguiente opción para usar la definición por defecto.',
     'name'                              => 'Nombre de la categoría',
     'require_acceptance'				=> 'Requerir a los usuarios que confirmen la aceptación de los elementos en esta categoría.',
-    'required_acceptance'				=> 'Este usuario recibirá un correo con un enlace para confirmar la aceptación de este elemento.',
+    'required_acceptance'				=> 'Este usuario recibirá un correo electrónico con un enlace para confirmar la aceptación de este elemento.',
     'required_eula'						=> 'Se enviará un correo electrónico a este usuario con una copia del acuerdo de uso',
     'no_default_eula'					=> 'No se encontró una definición del acuerdo de uso por defecto. Agregue uno en Configuración.',
     'update'  							=> 'Actualizar categoría',
diff --git a/resources/lang/es-ES/admin/categories/message.php b/resources/lang/es-ES/admin/categories/message.php
index 9875a01d88..997487469e 100644
--- a/resources/lang/es-ES/admin/categories/message.php
+++ b/resources/lang/es-ES/admin/categories/message.php
@@ -3,8 +3,8 @@
 return array(
 
     'does_not_exist' => 'La categoría no existe.',
-    'assoc_models'	 => 'Esta categoría está asociada actualmente con al menos un modelo y no se puede eliminar. Por favor actualice sus modelos para que no hagan referencia a esta categoría e inténtelo de nuevo. ',
-    'assoc_items'	 => 'Esta categoría está asociada actualmente con al menos un: asset_type y no se puede eliminar. Por favor actualice su: asset_type para que no haga referencia a esta categoría e inténtelo de nuevo. ',
+    'assoc_models'	 => 'Esta categoría está asociada actualmente con al menos un modelo y no puede ser eliminada. Actualice los modelos para que ya no hagan referencia a esta categoría e inténtelo de nuevo. ',
+    'assoc_items'	 => 'Esta categoría está asociada actualmente con al menos un: asset_type y no puede ser eliminada. Actualice su :asset_type para que ya no haga referencia a esta categoría e inténtelo de nuevo. ',
 
     'create' => array(
         'error'   => 'La categoría no fue creada, por favor inténtelo de nuevo.',
diff --git a/resources/lang/es-ES/admin/categories/table.php b/resources/lang/es-ES/admin/categories/table.php
index e3bb551e93..fc18e5ac6f 100644
--- a/resources/lang/es-ES/admin/categories/table.php
+++ b/resources/lang/es-ES/admin/categories/table.php
@@ -3,7 +3,7 @@
 return array(
 	'eula_text'      			=> 'Acuerdo de uso',
     'id'      					=> 'ID',
-    'parent'   					=> 'Padre',
+    'parent'   					=> 'Ubicación padre',
     'require_acceptance'      	=> 'Aceptación',
     'title'      				=> 'Nombre de la categoría del activo',
 
diff --git a/resources/lang/es-ES/admin/companies/general.php b/resources/lang/es-ES/admin/companies/general.php
index fd18d9f752..8fb72d5b94 100644
--- a/resources/lang/es-ES/admin/companies/general.php
+++ b/resources/lang/es-ES/admin/companies/general.php
@@ -1,7 +1,7 @@
 <?php
 
 return [
-    'select_company' => 'Seleccione una compañía',
+    'select_company' => 'Seleccionar una compañía',
     'about_companies' => 'Acerca de las compañías',
     'about_companies_description' => '        Puede utilizar las compañías como un simple campo informativo, o puede utilizarlas para restringir la visibilidad y la disponibilidad de los activos a los usuarios con una compañía específica habilitando la opción "Soporte completo a múltiples compañías" en "Configuración de administración"',
 ];
diff --git a/resources/lang/es-ES/admin/companies/message.php b/resources/lang/es-ES/admin/companies/message.php
index 5a3cbffa1d..8f2cb9323e 100644
--- a/resources/lang/es-ES/admin/companies/message.php
+++ b/resources/lang/es-ES/admin/companies/message.php
@@ -3,18 +3,18 @@
 return [
     'does_not_exist' => 'La compañía no existe.',
     'deleted'        => 'Compañía eliminada',
-    'assoc_users'    => 'Esta compañía ya está asociada con al menos un modelo y no puede eliminarse. Por favor, actualiza tus modelos para no referenciar esta compañía de nuevo y prueba otra vez. ',
+    'assoc_users'    => 'Esta compañía está actualmente asociada con al menos un modelo y no puede ser eliminada. Por favor actualice sus modelos para que no hagan referencia a esta compañía e inténtelo de nuevo. ',
     'create' => [
-        'error'   => 'Esta compañía no ha sido creada, por favor pruebe de nuevo.',
+        'error'   => 'La compañía no fue creada, por favor, inténtelo de nuevo.',
         'success' => 'Compañía creada satisfactoriamente.',
     ],
     'update' => [
-        'error'   => 'Compañía no actualizada, por favor inténtelo de nuevo',
+        'error'   => 'La compañía no fue actualizada, por favor, inténtelo de nuevo',
         'success' => 'Compañía actualizada correctamente.',
     ],
     'delete' => [
         'confirm' => '¿Está seguro de que quiere eliminar esta compañía?',
-        'error'   => 'Hubo un problema eliminando esta compañía. Inténtelo de nuevo.',
-        'success' => 'Esta compañía se eliminó satisfactoriamente.',
+        'error'   => 'Hubo un problema eliminando la compañía. Por favor, inténtelo de nuevo.',
+        'success' => 'La compañía fue eliminada correctamente.',
     ],
 ];
diff --git a/resources/lang/es-ES/admin/companies/table.php b/resources/lang/es-ES/admin/companies/table.php
index dc5d0c230f..1cc605dfd1 100644
--- a/resources/lang/es-ES/admin/companies/table.php
+++ b/resources/lang/es-ES/admin/companies/table.php
@@ -1,11 +1,11 @@
 <?php
 return array(
     'companies' => 'Compañías',
-    'create'    => 'Crear Compañía',
+    'create'    => 'Crear una compañía',
     'email'     => 'Correo electrónico de la compañía',
     'title'     => 'Compañía',
     'phone'     => 'Teléfono de la compañía',
-    'update'    => 'Actualizar Compañía',
-    'name'      => 'Nombre de Compañía',
+    'update'    => 'Actualizar compañía',
+    'name'      => 'Nombre de la compañía',
     'id'        => 'ID',
 );
diff --git a/resources/lang/es-ES/admin/components/general.php b/resources/lang/es-ES/admin/components/general.php
index d047e56c14..4f4a97e381 100644
--- a/resources/lang/es-ES/admin/components/general.php
+++ b/resources/lang/es-ES/admin/components/general.php
@@ -1,9 +1,9 @@
 <?php
 
 return array(
-    'component_name'                  => 'Nombre de Componente',
-    'checkin'                             => 'Checkin Componente',
-    'checkout'                             => 'Checkout Componente',
+    'component_name'                  => 'Nombre del componente',
+    'checkin'                             => 'Ingresar componente',
+    'checkout'                             => 'Asignar componente',
     'cost'				=> 'Costo de compra',
     'create'                             => 'Crear componente',
     'edit'                             => 'Editar componente',
@@ -11,6 +11,6 @@ return array(
     'order'					=> 'Número de orden',
     'remaining' 			             => 'Restante',
     'total' 			                 => 'Total',
-    'update'                            => 'Actualizar Componente',
-    'checkin_limit'            => 'La cantidad devuelta debe ser igual o menor que :assigned_qty'
+    'update'                            => 'Actualizar componente',
+    'checkin_limit'            => 'La cantidad ingresada debe ser igual o menor que :assigned_qty'
 );
diff --git a/resources/lang/es-ES/admin/components/message.php b/resources/lang/es-ES/admin/components/message.php
index 56a3562862..e38968a588 100644
--- a/resources/lang/es-ES/admin/components/message.php
+++ b/resources/lang/es-ES/admin/components/message.php
@@ -5,32 +5,33 @@ return array(
     'does_not_exist' => 'El componente no existe.',
 
     'create' => array(
-        'error'   => 'El componente no fuè creado, intentalo de nuevo.',
-        'success' => 'El componente se creò satisfactoriamente.'
+        'error'   => 'El componente no fue creado, por favor inténtelo de nuevo.',
+        'success' => 'El componente se creó satisfactoriamente.'
     ),
 
     'update' => array(
-        'error'   => 'El componente no se actualizò, intentalo de nuevo',
-        'success' => 'Componente actualizado satisfactoriamente.'
+        'error'   => 'El componente no se actualizó, por favor inténtelo de nuevo',
+        'success' => 'Componente actualizado correctamente.'
     ),
 
     'delete' => array(
         'confirm'   => '¿Está seguro de que desea eliminar este componente?',
-        'error'   => 'Hubo un problema al querer borrar el componente, intentalo de nuevo.',
-        'success' => 'El componente fue borrado satisfactoriamente.'
+        'error'   => 'Hubo un problema eliminando el componente. Por favor, inténtelo de nuevo.',
+        'success' => 'El componente fue borrado correctamente.',
+        'error_qty'   => 'Some components of this type are still checked out. Please check them in and try again.',
     ),
 
      'checkout' => array(
-        'error'   		=> 'El componente no hizo check out, intentalo de nuevo',
-        'success' 		=> 'Check out del componente satisfactorio.',
-        'user_does_not_exist' => 'El usuario es invalido, intentalo de nuevo.',
-        'unavailable'      => 'No quedan suficientes componentes: :remaining resting, :requested ',
+        'error'   		=> 'El componente no fue asignado, por favor, inténtelo de nuevo',
+        'success' 		=> 'El componente se ha asignado correctamente.',
+        'user_does_not_exist' => 'Ese usuario no es válido. Por favor, inténtelo de nuevo.',
+        'unavailable'      => 'No quedan suficientes componentes: :remaining disponibles, :requested solicitados ',
     ),
 
     'checkin' => array(
-        'error'   		=> 'El componente no fue checked in, intentalo de nuevo',
-        'success' 		=> 'Check in de componente satisfactorio.',
-        'user_does_not_exist' => 'Es usuario es invalido, intentalo de nuevo.'
+        'error'   		=> 'No se realizó el ingreso del componente, por favor inténtelo de nuevo',
+        'success' 		=> 'Componente ingresado con éxito.',
+        'user_does_not_exist' => 'Ese usuario no es válido. Por favor, inténtelo de nuevo.'
     )
 
 
diff --git a/resources/lang/es-ES/admin/components/table.php b/resources/lang/es-ES/admin/components/table.php
index 92a95311ab..8f4de5c93c 100644
--- a/resources/lang/es-ES/admin/components/table.php
+++ b/resources/lang/es-ES/admin/components/table.php
@@ -1,5 +1,5 @@
 <?php
 
 return array(
-    'title'      				=> 'Nombre de Componente',
+    'title'      				=> 'Nombre de componente',
 );
diff --git a/resources/lang/es-ES/admin/consumables/general.php b/resources/lang/es-ES/admin/consumables/general.php
index 3b2249f8af..579a705fb2 100644
--- a/resources/lang/es-ES/admin/consumables/general.php
+++ b/resources/lang/es-ES/admin/consumables/general.php
@@ -1,11 +1,12 @@
 <?php
 
 return array(
-    'checkout'                          => 'Checkout de consumible a usuario',
-    'consumable_name'                   => 'Nombre del Consumible',
-    'create'                            => 'Crear Consumible',
-    'item_no'                           => 'Artículo núm.',
+    'checkout'                          => 'Asignar consumible a usuario',
+    'consumable_name'                   => 'Nombre del consumible',
+    'create'                            => 'Crear consumible',
+    'item_no'                           => 'Artículo No.',
     'remaining' 			            => 'Restante',
     'total' 			                => 'Total',
-    'update'                            => 'Actualizar Consumible',
+    'update'                            => 'Actualizar consumible',
+    'inventory_warning'                 => 'El inventario de este consumible está por debajo de la cantidad mínima de :min_count',
 );
diff --git a/resources/lang/es-ES/admin/consumables/message.php b/resources/lang/es-ES/admin/consumables/message.php
index e23ddbd9ab..ca3da8895a 100644
--- a/resources/lang/es-ES/admin/consumables/message.php
+++ b/resources/lang/es-ES/admin/consumables/message.php
@@ -2,16 +2,17 @@
 
 return array(
 
+    'invalid_category_type' => 'La categoría debe ser una categoría para consumibles.',
     'does_not_exist' => 'El consumible no existe.',
 
     'create' => array(
-        'error'   => 'El consumible no fue creado, por favor intente nuevamente.',
+        'error'   => 'El consumible no fue creado, por favor inténtelo nuevamente.',
         'success' => 'Consumible creado con éxito.'
     ),
 
     'update' => array(
-        'error'   => 'El consumible no fue actualizado, por favor, inténtalo de nuevo',
-        'success' => 'El consumible fue subido con éxito.'
+        'error'   => 'El consumible no fue actualizado, por favor, inténtelo de nuevo',
+        'success' => 'Consumible actualizado correctamente.'
     ),
 
     'delete' => array(
@@ -22,15 +23,15 @@ return array(
 
      'checkout' => array(
         'error'   		=> 'El consumible no fue asignado, por favor inténtelo de nuevo',
-        'success' 		=> 'Consumible fue retirado satisfactoriamente.',
-        'user_does_not_exist' => 'Este usuario es inválido . Inténtalo de nuevo.',
-         'unavailable'      => 'No hay suficientes consumibles para este pago. Por favor, compruebe la cantidad restante. ',
+        'success' 		=> 'Consumible asignado correctamente.',
+        'user_does_not_exist' => 'Ese usuario no es válido. Por favor, inténtelo de nuevo.',
+         'unavailable'      => 'No hay suficientes consumibles para esta asignación. Por favor, compruebe la cantidad disponible. ',
     ),
 
     'checkin' => array(
-        'error'   		=> 'Consumible no fue devuelto, por favor inténtelo de nuevo',
-        'success' 		=> 'Consumible fue ingresado satisfactoriamente.',
-        'user_does_not_exist' => 'Este usuario es inválido . Inténtalo de nuevo.'
+        'error'   		=> 'El consumible no fue ingresado, por favor inténtelo de nuevo',
+        'success' 		=> 'El consumible fue ingresado correctamente.',
+        'user_does_not_exist' => 'Ese usuario no es válido. Por favor, inténtelo de nuevo.'
     )
 
 
diff --git a/resources/lang/es-ES/admin/consumables/table.php b/resources/lang/es-ES/admin/consumables/table.php
index befcfc511b..2e346e2962 100644
--- a/resources/lang/es-ES/admin/consumables/table.php
+++ b/resources/lang/es-ES/admin/consumables/table.php
@@ -1,5 +1,5 @@
 <?php
 
 return array(
-    'title'      				=> 'Nombre del Consumible',
+    'title'      				=> 'Nombre del consumible',
 );
diff --git a/resources/lang/es-ES/admin/custom_fields/general.php b/resources/lang/es-ES/admin/custom_fields/general.php
index c11f6e3399..f40ed063aa 100644
--- a/resources/lang/es-ES/admin/custom_fields/general.php
+++ b/resources/lang/es-ES/admin/custom_fields/general.php
@@ -7,55 +7,58 @@ return [
     'about_fieldsets_title'		=> 'Acerca de los grupos de campos',
     'about_fieldsets_text'		=> 'Los grupos de campos le permiten agrupar campos personalizados que se reutilizan frecuentemente para determinados modelos de activos.',
     'custom_format'             => 'Expresión regular personalizada...',
-    'encrypt_field'      	        => 'Encriptar el valor de este campo en la base de datos',
-    'encrypt_field_help'      => 'CUIDADO: Encriptar un campo hace que no se pueda buscar por él.',
-    'encrypted'      	        => 'Encriptado',
+    'encrypt_field'      	        => 'Cifrar el valor de este campo en la base de datos',
+    'encrypt_field_help'      => 'ADVERTENCIA: Cifrar un campo hace que no se pueda buscar.',
+    'encrypted'      	        => 'Cifrado',
     'fieldset'      	        => 'Grupo de campos',
     'qty_fields'      	      => 'Campos de cantidad',
-    'fieldsets'      	        => 'Grupo de campos',
+    'fieldsets'      	        => 'Grupos de campos',
     'fieldset_name'           => 'Nombre del grupo de campos',
     'field_name'              => 'Nombre del campo',
-    'field_values'            => 'Valores de los Campos',
-    'field_values_help'       => 'Agregar opciones seleccionables, una por linea. Lineas en blanco ademas de la primera, serán ignoradas.',
+    'field_values'            => 'Valores de los campos',
+    'field_values_help'       => 'Agregue opciones seleccionables, una por línea. Se ignorarán las líneas en blanco que no sean la primera.',
     'field_element'           => 'Elemento de formulario',
     'field_element_short'     => 'Elemento',
     'field_format'            => 'Formato',
-    'field_custom_format'     => 'Formato personalizado',
-    'field_custom_format_help'     => 'Este campo te permite usar una expresión regex para la validación. Debería empezar con "regex:" - por ejemplo, para validar que un valor de campo personalizado contiene un IMEI válido (15 dígitos numéricos), podrías usar <code>regex:/^[0-9]{15}$/</code>.',
+    'field_custom_format'     => 'Expresión regular personalizada',
+    'field_custom_format_help'     => 'Este campo le permite usar una expresión regular para la validación. Debería empezar con "regex:" - por ejemplo, para validar que un valor de campo personalizado contiene un IMEI válido (15 dígitos numéricos), podría usar <code>regex:/^[0-9]{15}$/</code>.',
     'required'   		          => 'Obligatorio',
     'req'   		              => 'Obl.',
-    'used_by_models'   		    => 'Usado Por Modelos',
+    'used_by_models'   		    => 'Usado por los modelos',
     'order'   		            => 'Orden',
     'create_fieldset'         => 'Nuevo grupo de campos',
     'update_fieldset'         => 'Actualizar grupo de campos',
     'fieldset_does_not_exist'   => 'El grupo de campos :id no existe',
-    'fieldset_updated'         => 'Grupo de campos actualizado',
-    'create_fieldset_title' => 'Crear nuevo grupo de campos',
+    'fieldset_updated'         => 'Se actualizó el grupo de campos',
+    'create_fieldset_title' => 'Crear un nuevo grupo de campos',
     'create_field'            => 'Nuevo campo personalizado',
-    'create_field_title' => 'Crear nuevo campo personalizado',
-    'value_encrypted'      	        => 'El valor de este campo está encriptado en la base de datos. Solo los administradores pueden ver el valor desencriptado',
-    'show_in_email'     => '¿Incluye el valor de este campo en los correos de pago enviados al usuario? Los campos cifrados no se pueden incluir en los correos electrónicos',
-    'show_in_email_short'     => 'Incluye en correos electrónicos.',
+    'create_field_title' => 'Crear un nuevo campo personalizado',
+    'value_encrypted'      	        => 'El valor de este campo está cifrado en la base de datos. Solo los administradores pueden ver el valor descifrado',
+    'show_in_email'     => '¿Incluir el valor de este campo en los correos de asignación enviados al usuario? Los campos cifrados no se pueden incluir en los correos electrónicos',
+    'show_in_email_short' => 'Incluir en los correos electrónicos',
     'help_text' => 'Texto de ayuda',
-    'help_text_description' => 'Un texto opcional que aparecerá debajo de los campos del formulario cuando se edite un activo para proporcionar contexto adicional.',
-    'about_custom_fields_title' => 'Acerca de los Campos Personalizados',
+    'help_text_description' => 'Este es un texto opcional que aparecerá debajo de los campos del formulario cuando se edite un activo para proporcionar contexto adicional.',
+    'about_custom_fields_title' => 'Acerca de los campos personalizados',
     'about_custom_fields_text' => 'Los campos personalizados le permiten añadir atributos arbitrarios a los activos.',
-    'add_field_to_fieldset' => 'Añadir campo al grupo',
-    'make_optional' => 'Requerido - clic para hacerlo opcional',
-    'make_required' => 'Opcional - clic para hacerlo requerido',
+    'add_field_to_fieldset' => 'Añadir campo al grupo de campos',
+    'make_optional' => 'Obligatorio - haga clic para hacerlo opcional',
+    'make_required' => 'Opcional - haga clic para que sea obligatorio',
     'reorder' => 'Reordenar',
-    'db_field' => 'Campo de BD',
+    'db_field' => 'Campo en base de datos',
     'db_convert_warning' => 'ADVERTENCIA. Este campo aparece en la tabla de campos personalizados como <code>:db_column</code>, pero se esperaba <code>:expected</code>.',
-    'is_unique' => 'Este valor debe ser único dentro de los activos',
+    'is_unique' => 'Este valor debe ser único para todos los activos',
     'unique' => 'Único',
-    'display_in_user_view' => 'Permitir al usuario ver estos valores en su página Ver Recursos asignados',
+    'display_in_user_view' => 'Permitir al usuario ver estos valores en la página "Ver activos asignados"',
     'display_in_user_view_table' => 'Visible para el usuario',
-    'auto_add_to_fieldsets' => 'Añadir automáticamente a cada nuevo conjunto de campos',
-    'add_to_preexisting_fieldsets' => 'Añadir a cualquier conjunto de campos existente',
-    'show_in_listview' => 'Mostrar por defecto en las vistas de la lista. Los usuarios autorizados podrán mostrar/ocultar a través del selector de columnas',
-    'show_in_listview_short' => 'Mostrar en listas',
+    'auto_add_to_fieldsets' => 'Añadir automáticamente a cada nuevo grupo de campos',
+    'add_to_preexisting_fieldsets' => 'Añadir a cualquier grupo de campos existente',
+    'show_in_listview' => 'Mostrar por defecto en las consultas. Los usuarios autorizados podrán mostrar/ocultar a través del selector de columnas',
+    'show_in_listview_short' => 'Mostrar en las listas',
     'show_in_requestable_list_short' => 'Mostrar en la lista de activos que se pueden solicitar',
     'show_in_requestable_list' => 'Mostrar el valor en la lista de activos que se pueden solicitar. Los campos cifrados no se mostrarán',
     'encrypted_options' => 'Este campo está cifrado, por lo que algunas opciones de visualización no estarán disponibles.',
+    'display_checkin' => 'Display in checkin forms',
+    'display_checkout' => 'Display in checkout forms',
+    'display_audit' => 'Display in audit forms',
 
 ];
diff --git a/resources/lang/es-ES/admin/custom_fields/message.php b/resources/lang/es-ES/admin/custom_fields/message.php
index 4b568c4bb9..11bb8ba285 100644
--- a/resources/lang/es-ES/admin/custom_fields/message.php
+++ b/resources/lang/es-ES/admin/custom_fields/message.php
@@ -5,30 +5,31 @@ return array(
     'field' => array(
         'invalid'   => 'El campo no existe.',
         'already_added'   => 'El campo ya fue añadido',
+        'none_selected'   => 'No se ha seleccionado ningún campo',
 
         'create' => array(
             'error'   => 'Campo no creado, por favor, inténtalo de nuevo.',
             'success' => 'Campo creado correctamente.',
-            'assoc_success' => 'Campo correctamente añadido al grupo.'
+            'assoc_success' => 'Campo correctamente añadido al grupo de campos.'
         ),
 
         'update' => array(
-            'error'   => 'Campo no actualizado, por favor inténtelo de nuevo',
+            'error'   => 'El campo no fue actualizado, por favor, inténtelo de nuevo',
             'success' => 'Campo actualizado correctamente.'
         ),
 
         'delete' => array(
             'confirm'   	=> '¿Está seguro de que quiere eliminar este campo?',
-            'error'   => 'Hubo un problema al eliminar el campo. Inténtelo de nuevo.',
+            'error'   => 'Hubo un problema al eliminar el campo. Por favor, inténtelo de nuevo.',
             'success' => 'El campo se eliminó correctamente.',
-            'in_use'   => 'El campo está aún en uso.',
+            'in_use'   => 'El campo aún está en uso.',
         )
 
     ),
 
     'fieldset' => array(
 
-        'does_not_exist' => 'El conjunto de campos no existe',
+        'does_not_exist' => 'El grupo de campos no existe',
 
         'create' => array(
             'error'   => 'El grupo de campos no ha sido creado, por favor inténtelo de nuevo.',
@@ -36,7 +37,7 @@ return array(
         ),
 
         'update' => array(
-            'error'   => 'El Grupo de campos no ha sido actualizado, por favor inténtelo de nuevo',
+            'error'   => 'El grupo de campos no ha sido actualizado, por favor inténtelo de nuevo',
             'success' => 'Grupo de campos actualizado correctamente.'
         ),
 
@@ -44,14 +45,14 @@ return array(
             'confirm'   	=> '¿Está seguro de que quiere eliminar este grupo de campos?',
             'error'   => 'Hubo un problema al eliminar el grupo de campos. Inténtelo de nuevo.',
             'success' => 'El grupo de campos se eliminó correctamente.',
-            'in_use'   => 'El grupo de campos está aún en uso.',
+            'in_use'   => 'El grupo de campos aún está en uso.',
         )
 
     ),
 
     'fieldset_default_value' => array(
 
-        'error' => 'Error al validar los valores por defecto del grupo de campos.',
+        'error' => 'Error al validar los valores predeterminados del grupo de campos.',
 
     ),
 
diff --git a/resources/lang/es-ES/admin/departments/message.php b/resources/lang/es-ES/admin/departments/message.php
index 6f10cf0eae..eabf4774d8 100644
--- a/resources/lang/es-ES/admin/departments/message.php
+++ b/resources/lang/es-ES/admin/departments/message.php
@@ -4,19 +4,19 @@ return array(
 
     'does_not_exist' => 'El departamento no existe.',
     'department_already_exists' => 'Ya existe un departamento con ese nombre en esta ubicación de la compañía. O elija un nombre más específico para este departamento. ',
-    'assoc_users'	 => 'Esta localización está actualmente asociada con al menos un usuario y no puede ser eliminada, Por favor verifique que ningún usuario haga referencia a esta localización e intente de nuevo. ',
+    'assoc_users'	 => 'Este departamento está actualmente asociado con al menos un usuario y no puede ser eliminado. Por favor, actualice sus usuarios para que no hagan referencia a este departamento e inténtelo de nuevo. ',
     'create' => array(
-        'error'   => 'El departamento no fue creado, por favor intente de nuevo.',
-        'success' => 'Departamento creado con éxito.'
+        'error'   => 'El departamento no fue creado, por favor, inténtelo de nuevo.',
+        'success' => 'Departamento creado correctamente.'
     ),
     'update' => array(
-        'error'   => 'El departamento no se actualizó, por favor intente de nuevo',
+        'error'   => 'El departamento no fue actualizado, por favor inténtelo de nuevo',
         'success' => 'Departamento actualizado con éxito.'
     ),
     'delete' => array(
         'confirm'   	=> '¿Está seguro de que desea eliminar este departamento?',
-        'error'   => 'Hubo un problema al eliminar el departamento. Inténtalo de nuevo.',
-        'success' => 'El departamento ha sido borrado exitosamente'
+        'error'   => 'Hubo un problema al borrar el departamento. Por favor, inténtelo de nuevo.',
+        'success' => 'El departamento fue eliminado correctamente.'
     )
 
 );
diff --git a/resources/lang/es-ES/admin/departments/table.php b/resources/lang/es-ES/admin/departments/table.php
index b24a16d3ae..da02f3e3a3 100644
--- a/resources/lang/es-ES/admin/departments/table.php
+++ b/resources/lang/es-ES/admin/departments/table.php
@@ -2,10 +2,10 @@
 
 return array(
 
-    'id'                        => 'CARNÉ DE IDENTIDAD',
-    'name'                      => 'Nombre de Departamento',
+    'id'                        => 'ID',
+    'name'                      => 'Nombre del departamento',
     'manager'                   => 'Supervisor',
     'location'                  => 'Ubicación',
     'create'                    => 'Crear departamento',
-    'update'                    => 'Departamento de actualización',
+    'update'                    => 'Actualizar departamento',
     );
diff --git a/resources/lang/es-ES/admin/depreciations/general.php b/resources/lang/es-ES/admin/depreciations/general.php
index 8cbf9c1b93..19264bfffe 100644
--- a/resources/lang/es-ES/admin/depreciations/general.php
+++ b/resources/lang/es-ES/admin/depreciations/general.php
@@ -3,14 +3,18 @@
 return [
     'about_asset_depreciations'  			=> 'Sobre amortización de activos',
     'about_depreciations'  					=> 'Puede configurar la depreciación de activos usando un método de línea recta.',
-    'asset_depreciations'  					=> 'Amortizaciones',
+    'asset_depreciations'  					=> 'Depreciación de activos',
     'create'  					            => 'Crear amortización',
     'depreciation_name'  					=> 'Nombre amortización',
     'depreciation_min'                      => 'Valor mínimo de amortización',
-    'number_of_months'  					=> 'Meses',
-    'update'  					            => 'Actualizar Amortización',
+    'number_of_months'  					=> 'Número de meses',
+    'update'  					            => 'Actualizar amortización',
     'depreciation_min'                      => 'Valor mínimo después de la depreciación',
     'no_depreciations_warning'               => '<strong>Advertencia: </strong>
-                      No tiene ninguna amortización configurada.
-                      Por favor, configure al menos una amortización para ver el informe de amortizaciones.',
+                      No tiene ninguna depreciación configurada.
+                      Por favor, configure al menos una depreciación para ver el informe de depreciaciones.',
+    'depreciation_method'                   => 'Informe de amortización',
+    'linear_depreciation'                   => 'Linear (Default)',
+    'half_1'                                => 'Half-year convention, always applied',
+    'half_2'                                => 'Convención semestral, aplicada con condición',
 ];
diff --git a/resources/lang/es-ES/admin/depreciations/message.php b/resources/lang/es-ES/admin/depreciations/message.php
index 024b1ee6e3..b57b54c800 100644
--- a/resources/lang/es-ES/admin/depreciations/message.php
+++ b/resources/lang/es-ES/admin/depreciations/message.php
@@ -2,23 +2,23 @@
 
 return array(
 
-    'does_not_exist' => 'Clase de amortización inexistente.',
-    'assoc_users'	 => 'Esta amortización está asociada a uno o más modelos y no puede ser eliminada.',
+    'does_not_exist' => 'La clase de depreciación no existe.',
+    'assoc_users'	 => 'Esta depreciación está actualmente asociada con uno o más modelos y no puede ser eliminada. Por favor, elimine los modelos y luego intente borrarlas de nuevo. ',
 
 
     'create' => array(
-        'error'   => 'Amortización no creada, intentalo de nuevo. :(',
+        'error'   => 'El tipo de depreciación no fue creado, por favor, inténtelo de nuevo. :(',
         'success' => 'Amortización creada correctamente. :)'
     ),
 
     'update' => array(
-        'error'   => 'Amortización no actualizada, intentalo de nuevo.',
+        'error'   => 'El tipo de depreciación no fue actualizado, por favor, inténtelo de nuevo',
         'success' => 'Amortización actualizada correctamente.'
     ),
 
     'delete' => array(
         'confirm'   => '¿Está seguro de que desea eliminar esta clase de depreciación?',
-        'error'   => 'Amortización no eliminada, intentalo de nuevo.',
+        'error'   => 'Ha sucedido un error eliminando el tipo de depreciación, por favor intente de nuevo.',
         'success' => 'Amortización eliminada correctamente.'
     )
 
diff --git a/resources/lang/es-ES/admin/groups/message.php b/resources/lang/es-ES/admin/groups/message.php
index 7f312625a6..f442d05c91 100644
--- a/resources/lang/es-ES/admin/groups/message.php
+++ b/resources/lang/es-ES/admin/groups/message.php
@@ -2,21 +2,21 @@
 
 return array(
 
-    'group_exists'        => 'El grupo ya existe!',
+    'group_exists'        => '!El grupo ya existe!',
     'group_not_found'     => 'El ID del grupo :id no existe.',
     'group_name_required' => 'El campo nombre es obligatorio',
 
     'success' => array(
         'create' => 'Grupo creado.',
-        'update' => 'Grupo actualizado.',
-        'delete' => 'Grupo eliminado.',
+        'update' => 'El grupo fue actualizado exitosamente.',
+        'delete' => 'El grupo fue eliminado exitosamente.',
     ),
 
     'delete' => array(
         'confirm'   => '¿Está seguro de que desea eliminar este grupo?',
-        'create' => 'Ha habido un problema creando el grupo. Vuelve a intentarlo.',
-        'update' => 'Ha habido un problema actualizando el grupo. Vuelve a intentarlo.',
-        'delete' => 'Ha habido un problema eliminando el grupo. Vuelve a intentarlo.',
+        'create' => 'Hubo un problema creando el grupo. Por favor, intente nuevamente.',
+        'update' => 'Hubo un problema actualizando el grupo. Por favor, intente nuevamente.',
+        'delete' => 'Hubo un problema eliminando el grupo. Por favor, intente nuevamente.',
     ),
 
 );
diff --git a/resources/lang/es-ES/admin/groups/table.php b/resources/lang/es-ES/admin/groups/table.php
index c002d06ba8..1511815185 100644
--- a/resources/lang/es-ES/admin/groups/table.php
+++ b/resources/lang/es-ES/admin/groups/table.php
@@ -2,8 +2,8 @@
 
 return array(
 
-    'id'         => 'ID',
+    'id'         => 'Id',
     'name'       => 'Nombre',
-    'users'      => '# de Usuarios',
+    'users'      => '# de usuarios',
 
 );
diff --git a/resources/lang/es-ES/admin/groups/titles.php b/resources/lang/es-ES/admin/groups/titles.php
index 7660a8055b..d139ee66c7 100644
--- a/resources/lang/es-ES/admin/groups/titles.php
+++ b/resources/lang/es-ES/admin/groups/titles.php
@@ -2,15 +2,15 @@
 
 return [
     'about_groups_title'            => 'Acerca de los grupos',
-    'about_groups'                  => 'Los Grupos son usados para generar permisos de usuarios.',
-    'group_management' 	 	=> 'Gestión de Grupos',
+    'about_groups'                  => 'Los grupos se utilizan para generalizar los permisos de usuario.',
+    'group_management' 	 	=> 'Administración de grupos',
     'create' 	 	 	    => 'Crear un grupo nuevo',
-    'update' 	 		        => 'Editar Grupo',
+    'update' 	 		        => 'Editar grupo',
     'group_name' 	 		=> 'Nombre de Grupo',
-    'group_admin' 	 		=> 'Admin Grupo',
+    'group_admin' 	 		=> 'Grupo administrador',
     'allow' 	 			=> 'Permitir',
     'deny' 	 				=> 'Denegar',
-    'permission'            => 'Permisos',
+    'permission'            => 'Permiso',
     'grant'                 => 'Otorgar',
     'no_permissions'        => 'Este grupo no tiene permisos.'
 ];
diff --git a/resources/lang/es-ES/admin/hardware/form.php b/resources/lang/es-ES/admin/hardware/form.php
index d344f88fa3..f735c673b1 100644
--- a/resources/lang/es-ES/admin/hardware/form.php
+++ b/resources/lang/es-ES/admin/hardware/form.php
@@ -1,36 +1,36 @@
 <?php
 
 return [
-    'bulk_delete'		=> 'Confirmar eliminación masiva de bienes',
+    'bulk_delete'		=> 'Confirmar eliminación masiva de activos',
     'bulk_restore'      => 'Confirmar recuperación masiva de activos', 
-  'bulk_delete_help'	=> 'Revisar los bienes para eliminación masiva. Una vez eliminados, esos bienes pueden ser restaurados, pero no volverán a estar asociados con ningún usuario a los que esté asignado.',
+  'bulk_delete_help'	=> 'Revise a continuación los activos para eliminación masiva. Una vez eliminados, estos activos se pueden restaurar, pero ya no estarán asociados a ningún usuario al que estén asignados actualmente.',
   'bulk_restore_help'	=> 'Revisar los activos para la restauración en masa a continuación. Una vez restaurados, estos activos no estarán asociados con los usuarios a los que fueron asignados anteriormente.',
   'bulk_delete_warn'	=> 'Va a eliminar :asset_count activos.',
   'bulk_restore_warn'	=> 'Está a punto de restaurar :asset_count activos.',
-    'bulk_update'		=> 'Actualización masiva de Equipos',
-    'bulk_update_help'	=> 'Este formulario le permite actualizar múltiples Equipos simultáneamente. Solo complete los campos que quiere modificar. Todo campo en blanco permanecerá sin cambios. ',
+    'bulk_update'		=> 'Actualización masiva de activos',
+    'bulk_update_help'	=> 'Este formulario le permite actualizar varios activos a la vez. Complete solo los campos que necesite modificar. Los campos que se dejen en blanco no se modificarán. ',
     'bulk_update_warn'	=> 'Está a punto de editar las propiedades de un solo activo.|Está a punto de editar las propiedades de :asset_count activos.',
-    'bulk_update_with_custom_field' => 'Tenga en cuenta que los activos son :asset_model_count diferentes tipos de modelos.',
+    'bulk_update_with_custom_field' => 'Tenga en cuenta que los activos corresponden a :asset_model_count tipos diferentes de modelos.',
     'bulk_update_model_prefix' => 'En modelos', 
-    'bulk_update_custom_field_unique' => 'Este es un campo único y no puede ser editado a granel.',
+    'bulk_update_custom_field_unique' => 'Este es un campo único y no puede ser editado de forma masiva.',
     'checkedout_to'		=> 'Asignado a',
     'checkout_date'		=> 'Fecha de asignación',
-    'checkin_date'		=> 'Fecha de devolución',
+    'checkin_date'		=> 'Fecha de ingreso',
     'checkout_to'		=> 'Asignar a',
-    'cost'				=> 'Precio Compra',
-    'create'			=> 'Crear Equipo',
+    'cost'				=> 'Precio de compra',
+    'create'			=> 'Crear activo',
     'date'				=> 'Fecha de compra',
     'depreciation'	    => 'Depreciación',
     'depreciates_on'	=> 'Se deprecia en',
     'default_location'	=> 'Ubicación predeterminada',
-    'default_location_phone' => 'Teléfono de ubicación por defecto',
+    'default_location_phone' => 'Teléfono de ubicación predeterminada',
     'eol_date'			=> 'Fecha fin de soporte (EOL)',
-    'eol_rate'			=> 'Tasa de EOL',
+    'eol_rate'			=> 'Tasa fin de soporte (EOL)',
     'expected_checkin'  => 'Fecha esperada de devolución',
-    'expires'			=> 'Expira',
+    'expires'			=> 'Vence',
     'fully_depreciated'	=> 'Totalmente amortizado',
-    'help_checkout'		=> 'Si desea asignar este equipo inmediatamente, seleccione "Listo para Asignar" de la lista de estados de arriba. ',
-    'mac_address'		=> 'MAC Dirección',
+    'help_checkout'		=> 'Si desea asignar este equipo inmediatamente, seleccione "Listo para asignar" de la lista de estados de arriba. ',
+    'mac_address'		=> 'Dirección MAC',
     'manufacturer'		=> 'Fabricante',
     'model'				=> 'Modelo',
     'months'			=> 'meses',
@@ -39,24 +39,27 @@ return [
     'order'				=> 'Número de orden',
     'qr'				=> 'Código QR',
     'requestable'		=> 'Los usuarios pueden solicitar este elemento',
-    'redirect_to_all'   => 'Return to all :type',
+    'redirect_to_all'   => 'Regresar a :type',
     'redirect_to_type'   => 'Ir a :type',
-    'redirect_to_checked_out_to'   => 'Go to Checked Out to',
-    'select_statustype'	=> 'Seleccione un tipo de estado',
-    'serial'			=> 'N. Serie',
+    'redirect_to_checked_out_to'   => 'Ir a elementos asignados',
+    'select_statustype'	=> 'Seleccionar un tipo de estado',
+    'serial'			=> 'Número de serie',
     'status'			=> 'Estado',
-    'tag'				=> 'Etiqueta del activo',
-    'update'			=> 'Actualizar Equipo',
+    'tag'				=> 'Placa del activo',
+    'update'			=> 'Actualizar activo',
     'warranty'			=> 'Garantía',
-        'warranty_expires'		=> 'Vencimiento de la Garantía',
+        'warranty_expires'		=> 'Vencimiento de la garantía',
     'years'				=> 'años',
-    'asset_location' => 'Actualizar ubicación del recurso',
+    'asset_location' => 'Actualizar ubicación del activo',
     'asset_location_update_default_current' => 'Actualizar ubicación predeterminada y ubicación actual',
     'asset_location_update_default' => 'Actualizar sólo la ubicación predeterminada',
     'asset_location_update_actual' => 'Actualizar sólo la ubicación actual',
     'asset_not_deployable' => 'Ese estado de activos es no utilizable. Este activo no puede ser asignado.',
-    'asset_deployable' => 'El estado indica que es utilizable. Este activo puede ser asignado.',
+    'asset_not_deployable_checkin' => 'Ese estado del activo no es utilizable. El uso de esta etiqueta de estado ingresará el activo.',
+    'asset_deployable' => 'This asset can be checked out.',
     'processing_spinner' => 'Procesando... (Esto puede tomar un poco de tiempo en archivos grandes)',
+    'processing' => 'Procesando... ',
     'optional_infos'  => 'Información opcional',
-    'order_details'   => 'Información relacionada con el pedido'
+    'order_details'   => 'Información relacionada con el pedido',
+    'calc_eol'    => 'Si deja nula la fecha EOL, utilice el cálculo automático basado en la fecha de compra y la frecuencia de EOL.',
 ];
diff --git a/resources/lang/es-ES/admin/hardware/general.php b/resources/lang/es-ES/admin/hardware/general.php
index 78632185b4..5b47f14ff6 100644
--- a/resources/lang/es-ES/admin/hardware/general.php
+++ b/resources/lang/es-ES/admin/hardware/general.php
@@ -1,42 +1,42 @@
 <?php
 
 return [
-    'about_assets_title'           => 'Acerca de Activos',
-    'about_assets_text'            => 'Los activos son elementos con número de serie o etiqueta de activos.  Tienden a ser artículos de alto valor donde es importante identificar un elemento específico.',
+    'about_assets_title'           => 'Acerca de los activos',
+    'about_assets_text'            => 'Los activos son artículos rastreados por número de serie o placa de activo.  Suelen ser artículos de alto valor en los que es importante identificar un elemento específico.',
     'archived'  				=> 'Archivado',
-    'asset'  					=> 'Equipo',
-    'bulk_checkout'             => 'Activos Asignados',
-    'bulk_checkin'              => 'Devolver activos',
-    'checkin'  					=> 'Devolver activo',
-    'checkout'  				=> 'Activo de pago',
+    'asset'  					=> 'Activo',
+    'bulk_checkout'             => 'Asignación masiva',
+    'bulk_checkin'              => 'Bulk Checkin',
+    'checkin'  					=> 'Ingresar activo',
+    'checkout'  				=> 'Asignar activo',
     'clone'  					=> 'Clonar activo',
     'deployable'  				=> 'Utilizable',
     'deleted'  					=> 'Este activo fue eliminado.',
-    'delete_confirm'            => '¿Está seguro de que desea eliminar este recurso?',
+    'delete_confirm'            => '¿Está seguro de que desea eliminar este activo?',
     'edit'  					=> 'Editar activo',
-    'model_deleted'  			=> 'Este Modelo de activo fue eliminado. Debes restaurar este modelo antes de poder restaurar el Activo.',
+    'model_deleted'  			=> 'Este modelo de activo ha sido eliminado. Debe restaurar este modelo antes de poder restaurar el activo.',
     'model_invalid'             => 'Este modelo para este activo es inválido.',
-    'model_invalid_fix'         => 'El activo debe ser actualizado, use un modelo de activo válido antes de intentar asignarlo, devolverlo o auditarlo.',
+    'model_invalid_fix'         => 'El activo debe ser actualizado, use un modelo de activo válido antes de intentar ingresarlo, asignarlo o auditarlo.',
     'requestable'               => 'Puede solicitarse',
     'requested'				    => 'Solicitado',
     'not_requestable'           => 'No puede solicitarse',
     'requestable_status_warning' => 'No cambiar el estado solicitable',
-    'restore'  					=> 'Restaurar equipo',
+    'restore'  					=> 'Restaurar activo',
     'pending'  					=> 'Pendiente',
     'undeployable'  			=> 'No utilizable',
     'undeployable_tooltip'  	=> 'Este activo tiene una etiqueta de estado que es no utilizable y no puede ser asignado en este momento.',
     'view'  					=> 'Ver activo',
     'csv_error' => 'Tiene un error en su archivo CSV:',
-    'import_text' => '<p>Cargue un archivo CSV que contenga el historial de activos. Los activos y los usuarios DEBEN existir ya en el sistema, o serán omitidos. La importación del historial busca activos que coincidan con la etiqueta de activo.  Intentaremos encontrar un usuario usando el nombre del usuario que proporcione y los criterios que seleccione a continuación. Si no selecciona ningún criterio, el sistema simplemente intentará usar el formato de nombre de usuario configurado en <code>Admin &gt;  Opciones Generales</code>.</p><p>Los campos incluidos en el CSV deben coincidir con los encabezados: <strong>Asset Tag, Name, Checkout Date, Checkin Date</strong>. Cualquier campo adicional será ignorado.</p><p>Checkin Date(Fecha de Devolución): dejar en blanco o usar fechas futuras asignará los ítems al usuario asociado. Excluir la columna Checkin Date creará una fecha de devolución con la fecha de hoy.</p>    ',
-    'csv_import_match_f-l' => 'Intenta emparejar usuarios con formato <strong>nombre.lastname</strong> (<code>jane.smith</code>)',
-    'csv_import_match_initial_last' => 'Intentar emparejar a los usuarios con un formato <strong>primer apellido inicial</strong> (<code>jsmith</code>)',
-    'csv_import_match_first' => 'Intentar emparejar a los usuarios con formato <strong>primer nombre</strong> (<code>jane</code>)',
-    'csv_import_match_email' => 'Intenta emparejar a los usuarios por <strong>email</strong> como nombre de usuario',
-    'csv_import_match_username' => 'Intentar coincidir usuarios por <strong>nombre de usuario</strong>',
+    'import_text' => '<p>Upload a CSV that contains asset history. The assets and users MUST already exist in the system, or they will be skipped. Matching assets for history import happens against the asset tag. We will try to find a matching user based on the user\'s name you provide, and the criteria you select below. If you do not select any criteria below, it will simply try to match on the username format you configured in the <code>Admin &gt; General Settings</code>.</p><p>Fields included in the CSV must match the headers: <strong>Asset Tag, Name, Checkout Date, Checkin Date</strong>. Any additional fields will be ignored. </p><p>Checkin Date: blank or future checkin dates will checkout items to associated user.  Excluding the Checkin Date column will create a checkin date with todays date.</p>    ',
+    'csv_import_match_f-l' => 'Intente asociar usuarios usando el formato <strong>nombre.apellido</strong> (<code>jane.smith</code>)',
+    'csv_import_match_initial_last' => 'Intente asociar los usuarios usando el formato <strong>inicial del nombre y apellido</strong> (<code>jsmith</code>)',
+    'csv_import_match_first' => 'Intentar asociar los usuarios usando el formato <strong>primer nombre</strong> (<code>jane</code>)',
+    'csv_import_match_email' => 'Intente asociar los usuarios usando <strong>correo electrónico</strong> como nombre de usuario',
+    'csv_import_match_username' => 'Intente asociar los usuarios usando <strong>nombre de usuario</strong>',
     'error_messages' => 'Mensajes de error:',
     'success_messages' => 'Mensajes de éxito:',
     'alert_details' => 'Por favor vea abajo para más detalles.',
     'custom_export' => 'Personalizar exportación',
-    'mfg_warranty_lookup' => 'Búsqueda del estado de Garantía para :manufacturer',
-    'user_department' => 'Departamento de Usuario',
+    'mfg_warranty_lookup' => 'Búsqueda del estado de garantía para :manufacturer',
+    'user_department' => 'Departamento del usuario',
 ];
diff --git a/resources/lang/es-ES/admin/hardware/message.php b/resources/lang/es-ES/admin/hardware/message.php
index 1d3c459c28..1489eedbb4 100644
--- a/resources/lang/es-ES/admin/hardware/message.php
+++ b/resources/lang/es-ES/admin/hardware/message.php
@@ -2,34 +2,38 @@
 
 return [
 
-    'undeployable' 		=> '<strong>Atención:</strong> Este elemento ha sido marcado como no utilizable.
-                        Si no es correcto, actualice el estado.',
-    'does_not_exist' 	=> 'Equipo inexistente.',
-    'does_not_exist_var'=> 'Activo con etiqueta :asset_tag no encontrado.',
-    'no_tag' 	        => 'No se ha proporcionado ninguna etiqueta de activo.',
+    'undeployable' 		 => '<strong>Advertencia:</strong> Este activo actualmente está marcado como no utilizable. Si este estado ha cambiado, por favor, actualice el estado del activo.',
+    'does_not_exist' 	 => 'El activo no existe.',
+    'does_not_exist_var' => 'Activo con placa :asset_tag no encontrado.',
+    'no_tag' 	         => 'No se ha proporcionado ninguna placa de activo.',
     'does_not_exist_or_not_requestable' => 'Ese activo no existe o no puede ser solicitado.',
-    'assoc_users'	 	=> 'Equipo asignado a un usuario, no se puede eliminar.',
+    'assoc_users'	 	 => 'Actualmente este activo está asignado a un usuario y no puede ser eliminado. Por favor, primero ingrese el activo y vuelva a intentarlo. ',
     'warning_audit_date_mismatch' 	=> 'La próxima fecha de auditoría de este activo (:next_audit_date) es anterior a la última fecha de auditoría (:last_audit_date). Por favor, actualice la próxima fecha de auditoría.',
+    'labels_generated'   => 'Las etiquetas fueron generadas exitosamente.',
+    'error_generating_labels' => 'Error en la generación de etiquetas.',
+    'no_assets_selected' => 'No se han seleccionado activos.',
 
     'create' => [
         'error'   		=> 'El activo no fue creado, por favor, inténtelo de nuevo. :(',
-        'success' 		=> 'Equipo creado. :)',
-        'success_linked' => 'Activo con etiqueta :tag creado con éxito. <strong><a href=":link" style="color: white;">Haga clic aquí para ver</a></strong>.',
+        'success' 		=> 'Activo creado con éxito. :)',
+        'success_linked' => 'Activo con placa :tag creado con éxito. <strong><a href=":link" style="color: white;">Haga clic aquí para ver</a></strong>.',
+        'multi_success_linked' => 'Activo con etiqueta :links fue creado exitosamente.|:count activos fueron creados correctamente. :links.',
+        'partial_failure' => 'No se ha podido crear un activo: Motivo: :failures|No se pudieron crear :count activos. Motivos: :failures',
     ],
 
     'update' => [
-        'error'   			=> 'Equipo no actualizado, intentalo de nuevo',
-        'success' 			=> 'Equipo actualizado.',
-        'encrypted_warning' => 'Activo actualizado con éxito, pero los campos personalizados cifrados no se debieron a permisos',
-        'nothing_updated'	=>  'Ningún campo fue seleccionado, por lo que nada ha sido actualizado.',
-        'no_assets_selected'  =>  'Ningún recurso fue seleccionado, por lo que no se actualizó nada.',
+        'error'   			=> 'El activo no pudo ser actualizado, por favor inténtelo de nuevo',
+        'success' 			=> 'Equipo actualizado correctamente.',
+        'encrypted_warning' => 'El activo se actualizó correctamente, pero los campos personalizados cifrados no lo hicieron debido a los permisos',
+        'nothing_updated'	=>  'Ningún campo fue seleccionado, por lo que no se actualizó nada.',
+        'no_assets_selected'  =>  'Ningún activo fue seleccionado, por lo que no se actualizó nada.',
         'assets_do_not_exist_or_are_invalid' => 'Los activos seleccionados no se pueden actualizar.',
     ],
 
     'restore' => [
-        'error'   		=> 'El equipo no fue restaurado, por favor intente nuevamente',
-        'success' 		=> 'Equipo restaurado correctamente.',
-        'bulk_success' 		=> 'Equipo restaurado correctamente.',
+        'error'   		=> 'El activo no fue restaurado, por favor inténtelo nuevamente',
+        'success' 		=> 'Activo restaurado exitosamente.',
+        'bulk_success' 		=> 'Activo restaurado exitosamente.',
         'nothing_updated'   => 'No se seleccionaron activos, por lo que no se restauró nada.', 
     ],
 
@@ -40,7 +44,7 @@ return [
 
 
     'deletefile' => [
-        'error'   => 'Archivo no eliminado. Por favor, vuelva a intentarlo.',
+        'error'   => 'Archivo no eliminado. Por favor inténtelo nuevamente.',
         'success' => 'Archivo eliminado correctamente.',
     ],
 
@@ -48,48 +52,58 @@ return [
         'error'   => 'Archivo(s) no cargado(s). Por favor, inténtelo nuevamente.',
         'success' => 'Archivo(s) cargado(s) exitosamente.',
         'nofiles' => 'No seleccionó ningún archivo para ser cargado, o el archivo que está tratando de cargar es demasiado grande',
-        'invalidfiles' => 'Uno o más sus archivos es demasiado grande o es de un tipo no permitido. Los tipos de archivo permitidos son png, gif, jpg, doc, docx, pdf y txt.',
+        'invalidfiles' => 'Uno o más de sus archivos son demasiado grandes o son de un tipo de archivo que no está permitido. Los tipos de archivo permitidos son png, gif, jpg, doc, docx, pdf y txt.',
     ],
 
     'import' => [
+        'import_button'         => 'Importar',
         'error'                 => 'Algunos elementos no se pudieron importar correctamente.',
         'errorDetail'           => 'Estos elementos no pudieron importarse debido a errores.',
-        'success'               => 'Tu archivo ha sido importado',
-        'file_delete_success'   => 'Tu archivo ha sido eliminado con éxito',
-        'file_delete_error'      => 'No pudimos eliminar tu archivo',
+        'success'               => 'Su archivo ha sido importado',
+        'file_delete_success'   => 'Su archivo se ha eliminado correctamente',
+        'file_delete_error'      => 'El archivo no se pudo eliminar',
         'file_missing' => 'Falta el archivo seleccionado',
+        'file_already_deleted' => 'El archivo seleccionado ya fue eliminado',
         'header_row_has_malformed_characters' => 'Uno o más atributos en la fila del encabezado contienen caracteres UTF-8 mal formados',
-        'content_row_has_malformed_characters' => 'Uno o más atributos en la primera fila de contenido contienen caracteres UTF-8 mal formados',
+        'content_row_has_malformed_characters' => 'Uno o más atributos en la primera fila contienen caracteres UTF-8 mal formados',
+        'transliterate_failure' => 'Transliteration from :encoding to UTF-8 failed due to invalid characters in input'
     ],
 
 
     'delete' => [
         'confirm'   	=> '¿Está seguro de que desea eliminar este activo?',
-        'error'   		=> 'Equipo no eliminado, intentalo de nuevo.',
+        'error'   		=> 'Hubo un problema al eliminar el activo. Por favor, inténtelo de nuevo.',
+        'assigned_to_error' => '{1}Asset Tag: :asset_tag is currently checked out. Check in this device before deletion.|[2,*]Asset Tags: :asset_tag are currently checked out. Check in these devices before deletion.',
         'nothing_updated'   => 'No se seleccionaron los activos, por lo que no se eliminó nada.',
-        'success' 		=> 'Equipo eliminado.',
+        'success' 		=> 'El activo se ha eliminado correctamente.',
     ],
 
     'checkout' => [
         'error'   		=> 'El activo no fue asignado, por favor inténtelo de nuevo',
-        'success' 		=> 'Equipo asignado.',
-        'user_does_not_exist' => 'Este usuario no es correcto. Intentalo de nuevo.',
-        'not_available' => '¡Ese artículo no está disponible para retirada!',
-        'no_assets_selected' => 'Debes seleccionar al menos un elemento de la lista',
+        'success' 		=> 'Equipo asignado correctamente.',
+        'user_does_not_exist' => 'Este usuario no es correcto. Por favor, inténtelo de nuevo.',
+        'not_available' => '¡Ese equipo no está disponible para ser asignado!',
+        'no_assets_selected' => 'Debe seleccionar al menos un activo de la lista',
+    ],
+
+    'multi-checkout' => [
+        'error'   => 'El activo no fue asignado, por favor, intente nuevamente|Los activos no fueron asignados, por favor, intente nuevamente',
+        'success' => 'El activo fue asignado correctamente|Los activos fueron asignados correctamente.',
     ],
 
     'checkin' => [
-        'error'   		=> 'El equipo no se pudo devolver, por favor inténtelo de nuevo',
-        'success' 		=> 'El activo fue devuelto exitosamente.',
-        'user_does_not_exist' => 'Es usuario no es correcto, por favor inténtelo de nuevo.',
-        'already_checked_in'  => 'El equipo ya ha sido devuelto.',
+        'error'   		=> 'El activo no se pudo ingresar, por favor inténtelo de nuevo',
+        'success' 		=> 'El activo fue ingresado exitosamente.',
+        'user_does_not_exist' => 'Este usuario no es correcto. Por favor, inténtelo de nuevo.',
+        'already_checked_in'  => 'El equipo ya ha sido recibido.',
 
     ],
 
     'requests' => [
-        'error'   		=> 'Bien no solicitado, por favor inténtelo de nuevo',
-        'success' 		=> 'Bien solicitado correctamente.',
-        'canceled'      => 'Solicitud de retirada cancelada con éxito',
+        'error'   		=> 'Request was not successful, please try again.',
+        'success' 		=> 'Request successfully submitted.',
+        'canceled'      => 'Request successfully canceled.',
+        'cancel'        => 'Cancelar esta solicitud de elemento',
     ],
 
 ];
diff --git a/resources/lang/es-ES/admin/hardware/table.php b/resources/lang/es-ES/admin/hardware/table.php
index 9b9e60f6a2..543f4b612c 100644
--- a/resources/lang/es-ES/admin/hardware/table.php
+++ b/resources/lang/es-ES/admin/hardware/table.php
@@ -2,32 +2,31 @@
 
 return [
 
-    'asset_tag'   	=> 'Etiqueta',
+    'asset_tag'   	=> 'Placa del activo',
     'asset_model'       => 'Modelo',
     'assigned_to'   => 'Asignado a',
     'book_value'  	=> 'Valor Actual',
     'change' 		=> 'Operación',
     'checkout_date' => 'Fecha de asignación',
-    'checkoutto' 	=> 'Asignado',
+    'checkoutto' 	=> 'Asignado a',
     'components_cost' => 'Coste total de componentes',
     'current_value' => 'Valor actual',
     'diff' 			=> 'Diferencia',
     'dl_csv' 		=> 'Descargar CSV',
-    'eol' 			=> 'EOL',
+    'eol' 			=> 'Fin de soporte (EOL)',
     'id'      		=> 'ID',
-    'last_checkin_date' => 'Última fecha de devolución',
+    'last_checkin_date' => 'Última fecha de ingreso',
     'location' 		=> 'Ubicación',
     'purchase_cost'	=> 'Costo',
     'purchase_date'	=> 'Comprado',
-    'serial'   		=> 'N. Serie',
+    'serial'   		=> 'Número de serie',
     'status'   		=> 'Estado',
-    'title'      	=> 'Equipo ',
+    'title'      	=> 'Activo ',
     'image'		    => 'Imagen de dispositivo',
     'days_without_acceptance' => 'Días sin aceptación',
     'monthly_depreciation' => 'Depreciación mensual',
-    'assigned_to'    => 'Asignado a',
-    'requesting_user' => 'Solicitando usuario',
+    'requesting_user' => 'Usuario solicitante',
     'requested_date' => 'Fecha solicitada',
-    'changed'       => 'Cambiado',
+    'changed'       => 'Cambios',
     'icon' => 'Ícono',
 ];
diff --git a/resources/lang/es-ES/admin/kits/general.php b/resources/lang/es-ES/admin/kits/general.php
index c1d2e00115..030d3d59d1 100644
--- a/resources/lang/es-ES/admin/kits/general.php
+++ b/resources/lang/es-ES/admin/kits/general.php
@@ -2,49 +2,50 @@
 
 return [
     'about_kits_title'                  => 'Acerca de kits predefinidos',
-    'about_kits_text'                   => 'Los Kits predefinidos le permiten rápidamente entregar un conjunto de elementos (assets, licencias, etc) a un usuario. Esto puede ser útil cuando su proceso de aprovisionar a usuarios nuevos es consistente para varios usuarios y todos reciben los mismos ítems.',
+    'about_kits_text'                   => 'Los kits predefinidos le permiten rápidamente asignar un conjunto de elementos (activos, licencias, etc.) a un usuario. Esto puede ser útil cuando su proceso de incorporación de usuarios es similar para muchos usuarios y todos reciben los mismos elementos.',
     'checkout'                          => 'Asignar kit ',
     'create_success'                    => 'El kit se ha creado correctamente.',
     'create'                            => 'Crear kit predefinido',
     'update'                            => 'Actualizar kit predefinido',
     'delete_success'                    => 'Kit eliminado correctamente.',
     'update_success'                    => 'El kit se ha actualizado correctamente.',
-    'none_models'                       => 'No hay suficientes recursos disponibles para :model para asignar. :qty son requeridos. ',
-    'none_licenses'                     => 'No hay suficientes licencias disponibles de :license para entregar. Se requieren :qty . ',
-    'none_consumables'                  => 'No hay suficientes unidades disponibles de :consumable para entregar. Se requieren :qty . ',
-    'none_accessory'                    => 'No hay suficientes unidades disponibles de :accessory para entregar. Se necesitan :qty . ',
-    'append_accessory'                  => 'Vincular Accesorio',
-    'update_appended_accessory'         => 'Actualizar Accesorio vinculado',
-    'append_consumable'                 => 'Vincular Consumible',
-    'update_appended_consumable'        => 'Actualizar Consumible vinculado',
-    'append_license'                    => 'Vincular licencia',
-    'update_appended_license'           => 'Actualizar licencia vinculada',
-    'append_model'                      => 'Vincular modelo',
-    'update_appended_model'             => 'Actualizar modelo vinculado',
-    'license_error'                     => 'Licencia ya adjunta al kit',
+    'none_models'                       => 'No hay suficientes activos disponibles de :model para asignar. Se requieren :qty. ',
+    'none_licenses'                     => 'No hay suficientes licencias disponibles de :license para asignar. Se requieren :qty. ',
+    'none_consumables'                  => 'No hay suficientes unidades disponibles de :consumable para asignar. Se requieren :qty. ',
+    'none_accessory'                    => 'No hay suficientes unidades disponibles de :accessory para asignar. Se requieren :qty. ',
+    'append_accessory'                  => 'Añadir accesorio',
+    'update_appended_accessory'         => 'Actualizar accesorio añadido',
+    'append_consumable'                 => 'Añadir consumible',
+    'update_appended_consumable'        => 'Actualizar consumible añadido',
+    'append_license'                    => 'Añadir licencia',
+    'update_appended_license'           => 'Actualizar licencia añadida',
+    'append_model'                      => 'Añadir modelo',
+    'update_appended_model'             => 'Actualizar modelo añadido',
+    'license_error'                     => 'Licencia ya vinculada al kit',
     'license_added_success'             => 'Licencia añadida correctamente',
-    'license_updated'                   => 'Licencia actualizada correctamente',
+    'license_updated'                   => 'La licencia fue actualizada correctamente',
     'license_none'                      => 'La licencia no existe',
     'license_detached'                  => 'Licencia desvinculada correctamente',
     'consumable_added_success'          => 'Consumible añadido correctamente',
-    'consumable_updated'                => 'Consumible actualizado correctamente',
+    'consumable_updated'                => 'El consumible fue actualizado correctamente',
     'consumable_error'                  => 'Consumible ya vinculado al kit',
-    'consumable_deleted'                => 'Eliminado correctamente',
-    'consumable_none'                   => 'El Consumible no existe',
+    'consumable_deleted'                => 'El borrado fue exitoso',
+    'consumable_none'                   => 'El consumible no existe',
     'consumable_detached'               => 'Consumible desvinculado correctamente',
     'accessory_added_success'           => 'Accesorio añadido correctamente',
-    'accessory_updated'                 => 'Accesorio actualizado correctamente',
+    'accessory_updated'                 => 'El accesorio fue actualizado correctamente',
     'accessory_detached'                => 'Accesorio desvinculado correctamente',
-    'accessory_error'                   => 'El accesorio ya vinculado al kit',
-    'accessory_deleted'                 => 'Eliminado correctamente',
+    'accessory_error'                   => 'El accesorio ya está vinculado al kit',
+    'accessory_deleted'                 => 'El borrado fue exitoso',
     'accessory_none'                    => 'El accesorio no existe',
     'checkout_success'                  => 'Asignación correcta',
     'checkout_error'                    => 'Error al asignar',
-    'kit_none'                          => 'El Kit no existe',
+    'kit_none'                          => 'El kit no existe',
     'kit_created'                       => 'Kit creado correctamente',
-    'kit_updated'                       => 'Kit actualizado correctamente',
+    'kit_updated'                       => 'El kit fue actualizado correctamente',
     'kit_not_found'                     => 'Kit no encontrado',
-    'kit_deleted'                       => 'Kit eliminado correctamente',
-    'kit_model_updated'                 => 'Modelo actualizado correctamente',
-    'kit_model_detached'                => 'Modelo desvinculado correctamente',
+    'kit_deleted'                       => 'El kit fue eliminado correctamente',
+    'kit_model_updated'                 => 'El modelo fue actualizado correctamente',
+    'kit_model_detached'                => 'El modelo fue desvinculado correctamente',
+    'model_already_attached'            => 'Modelo ya vinculado al kit',
 ];
diff --git a/resources/lang/es-ES/admin/labels/message.php b/resources/lang/es-ES/admin/labels/message.php
index 6f03c94699..9d2ef2cc48 100644
--- a/resources/lang/es-ES/admin/labels/message.php
+++ b/resources/lang/es-ES/admin/labels/message.php
@@ -2,9 +2,9 @@
 
 return [
 
-    'invalid_return_count' => 'El recuento no es válido desde :name. Esperado :expected, tiene :actual.',
-    'invalid_return_type'  => 'Tipo no válido devuelto desde :name. Esperado :expected, obtuvo :actual.',
-    'invalid_return_value' => 'Valor no válido devuelto de :name. Esperado :expected, obtuvo :actual.',
+    'invalid_return_count' => 'Cantidad incorrecta devuelta por :name. Se esperaba :expected, obtenido :actual.',
+    'invalid_return_type'  => 'Tipo no válido devuelto desde :name. Esperado :expected, obtenido :actual.',
+    'invalid_return_value' => 'Valor no válido devuelto por :name. Esperado :expected, obtenido :actual.',
 
     'does_not_exist' => 'La etiqueta no existe',
     
diff --git a/resources/lang/es-ES/admin/labels/table.php b/resources/lang/es-ES/admin/labels/table.php
index 9831a9551d..fab4d8f9db 100644
--- a/resources/lang/es-ES/admin/labels/table.php
+++ b/resources/lang/es-ES/admin/labels/table.php
@@ -3,14 +3,14 @@
 return [
     'example_company'    => 'Compañía de prueba limitada',
     'example_defaultloc' => 'Construcción 1',
-    'example_category'   => 'Probar categoría',
+    'example_category'   => 'Categoría de prueba',
     'example_location'   => 'Edificio 2',
     'example_manufacturer'  => 'Test Manufacturing Inc.',
     'example_model'      => 'Modelo de prueba',
     'example_supplier'   => 'Compañía de prueba limitada',
     'labels_per_page'    => 'Etiquetas',
     'support_fields'     => 'Campos',
-    'support_asset_tag'  => 'Etiqueta',
+    'support_asset_tag'  => 'Placa',
     'support_1d_barcode' => '1D',
     'support_2d_barcode' => '2D',
     'support_logo'       => 'Logo',
diff --git a/resources/lang/es-ES/admin/licenses/form.php b/resources/lang/es-ES/admin/licenses/form.php
index b1d1d180d9..576492224b 100644
--- a/resources/lang/es-ES/admin/licenses/form.php
+++ b/resources/lang/es-ES/admin/licenses/form.php
@@ -2,21 +2,21 @@
 
 return array(
 
-    'asset'             => 'Equipo',
-    'checkin'           => 'Devolver',
+    'asset'             => 'Activo',
+    'checkin'           => 'Ingresar',
     'create'            => 'Crear licencia',
     'expiration'        => 'Fecha de vencimiento',
-    'license_key'       => 'Clave de producto',
-    'maintained'        => 'Mantenido',
-    'name'              => 'Aplicación',
-    'no_depreciation'   => 'No Amortizar',
+    'license_key'       => 'Clave del producto',
+    'maintained'        => 'Tiene mantenimiento',
+    'name'              => 'Nombre del software',
+    'no_depreciation'   => 'No amortizar',
     'purchase_order'    => 'Número de orden de compra',
     'reassignable'      => 'Reasignable',
-    'remaining_seats'   => 'Posiciones Restantes',
-    'seats'             => 'Instalaciones',
-    'termination_date'  => 'Fecha de Fin',
-    'to_email'          => 'Registrado a Email',
-    'to_name'           => 'Registrado a Nombre',
-    'update'            => 'Actualizar Licencia',
+    'remaining_seats'   => 'Disponibles',
+    'seats'             => 'Total de licencias',
+    'termination_date'  => 'Fecha de finalización',
+    'to_email'          => 'Correo electrónico asociado a la licencia',
+    'to_name'           => 'Nombre de la persona asociada a la licencia',
+    'update'            => 'Actualizar licencia',
     'checkout_help'     => 'Debe asignar una licencia a un activo de hardware o a una persona. Puede seleccionar ambos, pero el propietario del activo debe coincidir con la persona a la que está asignado el activo.'
 );
diff --git a/resources/lang/es-ES/admin/licenses/general.php b/resources/lang/es-ES/admin/licenses/general.php
index d571d80114..5b474ef407 100644
--- a/resources/lang/es-ES/admin/licenses/general.php
+++ b/resources/lang/es-ES/admin/licenses/general.php
@@ -2,50 +2,51 @@
 
 return array(
     'about_licenses_title'      => 'Acerca de licencias',
-    'about_licenses'            => 'Las licencias son para identificar software. Tienen un número específico de asientos que pueden ser asignados a individuos',
-    'checkin'  					=> 'Quitar Instalación',
-    'checkout_history'  		=> 'Historial Asignaciones',
-    'checkout'  				=> 'Asignar Instalación',
-    'edit'  					=> 'Editar Usuario',
-    'filetype_info'				=> 'Tipos de archivos permitidos son png, gif, jpg, jpeg, doc, docx, pdf, txt, zip, y rar.',
-    'clone'  					=> 'Clonar Usuario',
+    'about_licenses'            => 'Las licencias se utilizan para hacer un seguimiento del software.  Tienen una cantidad determinada que puede ser asignada a individuos',
+    'checkin'  					=> 'Ingresar licencia',
+    'checkout_history'  		=> 'Historial de asignaciones',
+    'checkout'  				=> 'Asignar licencia',
+    'edit'  					=> 'Editar licencia',
+    'filetype_info'				=> 'Los tipos de archivo permitidos son png, gif, jpg, jpeg, doc, docx, pdf, txt, zip, y rar.',
+    'clone'  					=> 'Clonar licencia',
     'history_for'  				=> 'Historial para ',
     'in_out'  					=> 'Quita/Asigna',
-    'info'  					=> 'Info Licencia',
-    'license_seats'  			=> 'Num. Instalaciones',
-    'seat'  					=> 'Instalación',
-    'seats'  					=> 'Instalaciones',
-    'software_licenses'  		=> 'Licencias Software',
+    'info'  					=> 'Información de licencia',
+    'license_seats'  			=> 'Total de licencias',
+    'seat'  					=> 'Licencia',
+    'seat_count'  				=> 'Licencia :count',
+    'seats'  					=> 'Total de licencias',
+    'software_licenses'  		=> 'Licencias de software',
     'user'  					=> 'Usuario',
-    'view'  					=> 'Ver Licencias',
-    'delete_disabled'           => 'Esta licencia no se puede eliminar aún porque algunos asientos todavía están retirados.',
+    'view'  					=> 'Ver licencia',
+    'delete_disabled'           => 'Esta licencia no se puede eliminar porque todavía está asignada.',
     'bulk'                      =>
         [
             'checkin_all'           => [
-                'button'            => 'Comprobar todos los asientos',
-                'modal'             => 'Esto activará el checkin de un asiento. | Esta acción registrará todos los asientos :checkedout_seats_count para esta licencia.',
-                'enabled_tooltip'   => 'Checkin TODOS los asientos para esta licencia tanto de usuarios como de activos',
-                'disabled_tooltip'  => 'Esto está deshabilitado porque no hay asientos seleccionados actualmente',
+                'button'            => 'Ingresar todas las licencias',
+                'modal'             => 'Esta acción ingresará una licencia. | Esta acción ingresará todas las :checkedout_seats_count licencias.',
+                'enabled_tooltip'   => 'Recibir TODAS las licencias tanto de usuarios como de activos',
+                'disabled_tooltip'  => 'Esto está deshabilitado porque no hay licencias asignadas actualmente',
                 'disabled_tooltip_reassignable'  => 'Esto está desactivado porque la licencia no es reasignable',
-                'success'           => '¡Licencia registrada con éxito! | ¡Todas las licencias fueron registradas con éxito!',
-                'log_msg'           => 'Check-in a través de pago de licencia en licencia GUI',
+                'success'           => '¡Licencia recibida correctamente! | ¡Todas las licencias fueron recibidas correctamente!',
+                'log_msg'           => 'Ingresada mediante ingreso masivo en página de licencias',
             ],
 
             'checkout_all'              => [
-                'button'                => 'Salir todos los asientos',
-                'modal'                 => 'Esta acción comprobará un asiento para el primer usuario disponible. | Esta acción verificará todos los asientos :available_seats_count para los primeros usuarios disponibles. Se considera que un usuario está disponible para este asiento si aún no tiene esta licencia revisada para ellos, y la propiedad Auto-Asignación de Licencia está habilitada en su cuenta de usuario.',
-                'enabled_tooltip'   => 'Checkout TODOS los asientos (o tantos como estén disponibles) para TODOS los usuarios',
-                'disabled_tooltip'  => 'Esto está deshabilitado porque no hay asientos disponibles actualmente',
-                'success'           => '¡Licencia retirada con éxito! | ¡Licencias :count fueron retiradas con éxito!',
-                'error_no_seats'    => 'No quedan plazas restantes para esta licencia.',
-                'warn_not_enough_seats'    => ':count usuarios fueron asignados a esta licencia, pero nos quedamos sin plazas de licencia disponibles.',
+                'button'                => 'Asignar todas las licencias',
+                'modal'                 => 'Esta acción asignará una licencia para el primer usuario disponible. | Esta acción asignará todas las :available_seats_count licencias a los primeros usuarios disponibles. Se considera que un usuario está disponible si aún no tiene esta licencia asignada y la propiedad "Autoasignación de licencia" está habilitada en su cuenta de usuario.',
+                'enabled_tooltip'   => 'Asignar TODAS las licencias (o tantas como estén disponibles) para TODOS los usuarios',
+                'disabled_tooltip'  => 'Esto está deshabilitado porque actualmente no hay licencias disponibles',
+                'success'           => '¡Licencia asignada exitosamente! | ¡Licencias :count asignadas exitosamente!',
+                'error_no_seats'    => 'No quedan licencias disponibles.',
+                'warn_not_enough_seats'    => 'Se asignaron :count usuarios a esta licencia, y se agotaron las licencias disponibles.',
                 'warn_no_avail_users'    => 'Nada que hacer. No hay usuarios que no tengan esta licencia asignada.',
-                'log_msg'           => 'Checado mediante pago masivo de licencia en GUI licencia',
+                'log_msg'           => 'Asignada vía asignación masiva en página de licencias',
 
 
             ],
     ],
 
-    'below_threshold' => 'Solo quedan :remaining_count asientos para esta licencia con una cantidad mínima de :min_amt. Puede considerar comprar más asientos.',
+    'below_threshold' => 'Solo quedan :remaining_count licencias y su cantidad mínima es de :min_amt. Puede que desee considerar la compra de más licencias.',
     'below_threshold_short' => 'Este artículo está por debajo de la cantidad mínima requerida.',
 );
diff --git a/resources/lang/es-ES/admin/licenses/message.php b/resources/lang/es-ES/admin/licenses/message.php
index ec6597c7b0..44140c8ca8 100644
--- a/resources/lang/es-ES/admin/licenses/message.php
+++ b/resources/lang/es-ES/admin/licenses/message.php
@@ -4,16 +4,16 @@ return array(
 
     'does_not_exist' => 'La licencia no existe o no tiene permiso para verla.',
     'user_does_not_exist' => 'El usuario no existe o no tiene permiso para verlos.',
-    'asset_does_not_exist' 	=> 'El equipo que intentas asignar a esta licencia no existe.',
+    'asset_does_not_exist' 	=> 'El activo que intenta asociar con esta licencia no existe.',
     'owner_doesnt_match_asset' => 'El activo que está intentando asignar con esta licencia está asignado a un usuario diferente al de la persona seleccionada de la lista.',
-    'assoc_users'	 => 'Esta categoría está asignada al menos a un modelo y no puede ser eliminada.',
+    'assoc_users'	 => 'Esta licencia está actualmente asignada a un usuario y no puede ser eliminada. Por favor, reciba primero la licencia y vuelva a intentarlo. ',
     'select_asset_or_person' => 'Debe seleccionar un activo o un usuario, pero no ambos.',
     'not_found' => 'Licencia no encontrada',
-    'seats_available' => ':seat_count plazas disponibles',
+    'seats_available' => ':seat_count disponibles',
 
 
     'create' => array(
-        'error'   => 'La categoría no se ha creado, intentalo de nuevo.',
+        'error'   => 'La licencia no fue creada, por favor inténtelo de nuevo.',
         'success' => 'Categoría creada correctamente.'
     ),
 
@@ -23,32 +23,35 @@ return array(
     ),
 
     'upload' => array(
-        'error'   => 'Archivo(s) no cargado. Por favor, vuelva a intentarlo.',
+        'error'   => 'Archivo(s) no cargado(s). Por favor, inténtelo de nuevo.',
         'success' => 'Archivo(s) cargado correctamente.',
         'nofiles' => 'No seleccionó ningún archivo para ser cargado, o el archivo que seleccionó es demasiado grande',
-        'invalidfiles' => 'Uno o más de tus ficheros son demasiado grandes o de un tipo no permitido. Los tipos permitidos son png, gif, jpg, doc, docx, pdf, txt, zip, rar, rtf, xml y lic.',
+        'invalidfiles' => 'Uno o más de sus archivos es demasiado grande o es un tipo de archivo que no está permitido. Los tipos de archivo permitidos son png, gif, jpg, jpeg, doc, docx, pdf, txt, zip, rar, rtf, xml y lic.',
     ),
 
     'update' => array(
-        'error'   => 'La categoría no se ha actualizado, intentalo de nuevo.',
+        'error'   => 'La licencia no fue actualizada, por favor inténtelo de nuevo',
         'success' => 'Categoría actualizada correctamente.'
     ),
 
     'delete' => array(
         'confirm'   => '¿Está seguro de que desea eliminar esta licencia?',
-        'error'   => 'Ha habido un problema eliminando la categoría. Intentalo de nuevo.',
-        'success' => 'Categoría eliminada.'
+        'error'   => 'Hubo un problema al eliminar la licencia. Por favor, inténtelo de nuevo.',
+        'success' => 'La licencia se ha eliminado correctamente.'
     ),
 
     'checkout' => array(
-        'error'   => 'Equipo no asignado, intentalo de nuevo',
-        'success' => 'Equipo asignado.',
-        'not_enough_seats' => 'No hay suficientes asientos de licencia disponibles para la compra',
+        'error'   => 'Hubo un problema asignando la licencia. Por favor, inténtelo de nuevo.',
+        'success' => 'La licencia fue asignada con éxito',
+        'not_enough_seats' => 'No hay suficientes licencias disponibles para asignar',
+        'mismatch' => 'La licencia proporcionada no coincide con la licencia seleccionada',
+        'unavailable' => 'Esta licencia no está disponible para ser asignada.',
     ),
 
     'checkin' => array(
-        'error'   => 'Hubo un problema devolviendo la licencia. Por favor, inténtalo de nuevo.',
-        'success' => 'Equipo quitado correctamente.'
+        'error'   => 'Hubo un problema ingresando la licencia. Por favor, inténtelo de nuevo.',
+        'not_reassignable' => 'La licencia no se puede volver a asignar',
+        'success' => 'La licencia fue ingresada correctamente'
     ),
 
 );
diff --git a/resources/lang/es-ES/admin/licenses/table.php b/resources/lang/es-ES/admin/licenses/table.php
index 2d5286e577..6413ef9e71 100644
--- a/resources/lang/es-ES/admin/licenses/table.php
+++ b/resources/lang/es-ES/admin/licenses/table.php
@@ -2,17 +2,17 @@
 
 return array(
 
-    'assigned_to'   	=> 'Asignada a',
-    'checkout'   		=> 'Quita/Asigna',
+    'assigned_to'   	=> 'Asignado a',
+    'checkout'   		=> 'Entrada/Salida',
     'deleted_at'        => 'Eliminado el',
     'id'      			=> 'ID',
-    'license_email'   	=> 'Email de licencia',
+    'license_email'   	=> 'Correo electrónico de la licencia',
     'license_name'   	=> 'Licenciado a',
     'purchase_date'   	=> 'Fecha de compra',
-    'purchased'   		=> 'Comprada',
-    'seats'   			=> 'Instalaciones',
-    'hardware'   		=> 'Equipo',
-    'serial'   			=> 'N. Serie',
-    'title'      		=> 'Categoría de equipo',
+    'purchased'   		=> 'Comprado',
+    'seats'   			=> 'Total de licencias',
+    'hardware'   		=> 'Hardware',
+    'serial'   			=> 'Número de serie',
+    'title'      		=> 'Licencia',
 
 );
diff --git a/resources/lang/es-ES/admin/locations/message.php b/resources/lang/es-ES/admin/locations/message.php
index 733f9e76c4..34e02a05a5 100644
--- a/resources/lang/es-ES/admin/locations/message.php
+++ b/resources/lang/es-ES/admin/locations/message.php
@@ -3,15 +3,16 @@
 return array(
 
     'does_not_exist' => 'La ubicación no existe.',
-    'assoc_users'    => 'This location is not currently deletable because it is the location of record for at least one asset or user, has assets assigned to it, or is the parent location of another location. Please update your models to no longer reference this company and try again. ',
+    'assoc_users'    => 'Esta ubicación no se puede eliminar actualmente porque es la ubicación de al menos un activo o usuario, tiene activos asignados o es la ubicación padre de otra ubicación. Por favor, actualice sus registros para que ya no hagan referencia a esta ubicación e inténtalo de nuevo ',
     'assoc_assets'	 => 'Esta ubicación está actualmente asociada con al menos un activo y no puede ser eliminada. Por favor actualice sus activos para que ya no hagan referencia a esta ubicación e inténtelo de nuevo. ',
     'assoc_child_loc'	 => 'Esta ubicación es actualmente el padre de al menos una ubicación hija y no puede ser eliminada.   Por favor actualice sus ubicaciones para que ya no hagan referencia a esta ubicación e inténtelo de nuevo. ',
     'assigned_assets' => 'Activos asignados',
     'current_location' => 'Ubicación actual',
+    'open_map' => 'Abrir en mapas :map_provider_icon',
 
 
     'create' => array(
-        'error'   => 'Localización no creada, Intentalo de nuevo.',
+        'error'   => 'La ubicación no pudo ser creada, por favor, inténtelo de nuevo.',
         'success' => 'La ubicación fue creada exitosamente.'
     ),
 
@@ -20,6 +21,11 @@ return array(
         'success' => 'La ubicación fue actualizada exitosamente.'
     ),
 
+    'restore' => array(
+        'error'   => 'No se ha restaurado la ubicación, inténtelo de nuevo',
+        'success' => 'La ubicación fue restaurada exitosamente.'
+    ),
+
     'delete' => array(
         'confirm'   	=> '¿Está seguro de que desea eliminar esta ubicación?',
         'error'   => 'Hubo un problema eliminando la ubicación. Por favor, inténtelo de nuevo.',
diff --git a/resources/lang/es-ES/admin/locations/table.php b/resources/lang/es-ES/admin/locations/table.php
index 038d7752e7..8c30d4dd90 100644
--- a/resources/lang/es-ES/admin/locations/table.php
+++ b/resources/lang/es-ES/admin/locations/table.php
@@ -2,7 +2,7 @@
 
 return [
     'about_locations_title'     => 'Acerca de las ubicaciones',
-    'about_locations'           => 'Las ubicaciones son utilizadas para hacer seguimiento de la información sobre ubicación de usuarios, activos, y otros ítems',
+    'about_locations'           => 'Las ubicaciones se utilizan para hacer un seguimiento de la ubicación de usuarios, activos y otros elementos',
     'assets_rtd'                => 'Activos', // This has NEVER meant Assets Retired. I don't know how it keeps getting reverted.
     'assets_checkedout'         => 'Activos asignados',
     'id'                        => 'ID',
@@ -17,26 +17,27 @@ return [
     'address'                   => 'Dirección',
     'address2'                   => 'Dirección (línea 2)',
     'zip'                       => 'Código postal',
-    'locations'                 => 'Localizaciones',
+    'locations'                 => 'Ubicaciones',
     'parent'                    => 'Ubicación padre',
     'currency'                  => 'Divisa de la ubicación',
     'ldap_ou'                   => 'Búsqueda LDAP OU',
     'user_name'                 => 'Nombre de usuario',
     'department'                => 'Departamento',
     'location'                  => 'Ubicación',
-    'asset_tag'                 => 'Etiqueta de activo',
+    'asset_tag'                 => 'Placa del activo',
     'asset_name'                => 'Nombre',
     'asset_category'            => 'Categoría',
     'asset_manufacturer'        => 'Fabricante',
     'asset_model'               => 'Modelo',
     'asset_serial'              => 'Número de serie',
     'asset_location'            => 'Ubicación',
-    'asset_checked_out'         => 'Asignado',
+    'asset_checked_out'         => 'Asignado a',
     'asset_expected_checkin'    => 'Fecha esperada de devolución',
     'date'                      => 'Fecha:',
     'phone'                     => 'Teléfono ubicación',
-    'signed_by_asset_auditor'   => 'Firmado por (Juego de Acciones):',
-    'signed_by_finance_auditor' => 'Firmado por (Juego de Acciones):',
-    'signed_by_location_manager' => 'Firmado por (Administrador de ubicación):',
+    'signed_by_asset_auditor'   => 'Firmado por (Auditor de Activos):',
+    'signed_by_finance_auditor' => 'Firmado por (Auditor de Finanzas):',
+    'signed_by_location_manager' => 'Firmado por (Supervisor de la ubicación):',
     'signed_by'                 => 'Firmado por:',
+    'clone'  					=> 'Clone Location',
 ];
diff --git a/resources/lang/es-ES/admin/manufacturers/message.php b/resources/lang/es-ES/admin/manufacturers/message.php
index 5632d048ea..4e25322f0c 100644
--- a/resources/lang/es-ES/admin/manufacturers/message.php
+++ b/resources/lang/es-ES/admin/manufacturers/message.php
@@ -2,29 +2,29 @@
 
 return array(
 
-    'support_url_help' => 'Variables <code>{LOCALE}</code>, <code>{SERIAL}</code>, <code>{MODEL_NUMBER}</code>, y <code>{MODEL_NAME}</code> se puede utilizar en tu URL para que esos valores se llenen automáticamente al ver los activos - por ejemplo https://checkcoverage. pple.com/{LOCALE}/{SERIAL}.',
-    'does_not_exist' => 'Fabricante inexistente.',
-    'assoc_users'	 => 'Este Fabricante está asociado al menos a un modelo y no puede ser eliminado',
+    'support_url_help' => 'Variables <code>{LOCALE}</code>, <code>{SERIAL}</code>, <code>{MODEL_NUMBER}</code>, y <code>{MODEL_NAME}</code> se pueden utilizar en su URL para que esos valores se llenen automáticamente al ver los activos - por ejemplo https://checkcoverage. pple.com/{LOCALE}/{SERIAL}.',
+    'does_not_exist' => 'El fabricante no existe.',
+    'assoc_users'	 => 'Este fabricante está actualmente asociado con al menos un modelo y no se puede eliminar. Por favor, actualice sus modelos para dejar de hacer referencia a este fabricante y vuelva a intentarlo. ',
 
     'create' => array(
-        'error'   => 'Fabricante no creado, Intentalo de nuevo.',
-        'success' => 'Fabricante creado.'
+        'error'   => 'El fabricante no fue creado, por favor inténtelo de nuevo.',
+        'success' => 'Fabricante creado exitosamente.'
     ),
 
     'update' => array(
-        'error'   => 'Fabricante no actualizado, Intentalo de nuevo',
-        'success' => 'Fabricante actualizado.'
+        'error'   => 'El fabricante no fue actualizado, por favor, inténtelo de nuevo',
+        'success' => 'El fabricante se ha actualizado exitosamente.'
     ),
 
     'restore' => array(
-        'error'   => 'El fabricante no fue restaurado, intente de nuevo',
-        'success' => 'Fabricante restaurado con éxito.'
+        'error'   => 'El fabricante no fue restaurado, por favor, inténtelo de nuevo',
+        'success' => 'El fabricante fue restaurado exitosamente.'
     ),
 
     'delete' => array(
         'confirm'   => '¿Está seguro de que desea eliminar este fabricante?',
-        'error'   => 'Hubo un problema eliminando el fabricante. Por favor, inténtalo de nuevo.',
-        'success' => 'Fabricante Eliminado.'
+        'error'   => 'Ocurrió un problema eliminando el fabricante. Por favor, intente nuevamente.',
+        'success' => 'El fabricante se ha eliminado correctamente.'
     )
 
 );
diff --git a/resources/lang/es-ES/admin/manufacturers/table.php b/resources/lang/es-ES/admin/manufacturers/table.php
index f06114aa48..e2c4bef88e 100644
--- a/resources/lang/es-ES/admin/manufacturers/table.php
+++ b/resources/lang/es-ES/admin/manufacturers/table.php
@@ -1,16 +1,16 @@
 <?php
 
 return array(
-    'about_manufacturers_title'    => 'Sobre fabricantes',
+    'about_manufacturers_title'    => 'Sobre los fabricantes',
     'about_manufacturers_text'  => 'Los fabricantes son las empresas que crean sus activos. Aquí puede almacenar importante información de contacto para soporte, la cual se mostrará en las páginas de detalle de sus activos.',
     'asset_manufacturers'	=> 'Fabricantes de activos',
-    'create'				=> 'Crear Fabricante',
+    'create'				=> 'Crear fabricante',
     'id'   					=> 'ID',
     'name'      			=> 'Nombre',
-    'support_email'   		=> 'Email de soporte',
+    'support_email'   		=> 'Correo electrónico de soporte',
     'support_phone'   		=> 'Teléfono de soporte',
     'support_url'   		=> 'URL de soporte',
     'warranty_lookup_url'   => 'URL de búsqueda de garantía',
-    'update'				=> 'Actualizar Fabricante',
+    'update'				=> 'Actualizar fabricante',
 
 );
diff --git a/resources/lang/es-ES/admin/models/general.php b/resources/lang/es-ES/admin/models/general.php
index 9170dae593..bfacb43c27 100644
--- a/resources/lang/es-ES/admin/models/general.php
+++ b/resources/lang/es-ES/admin/models/general.php
@@ -1,18 +1,18 @@
 <?php
 
 return array(
-    'about_models_title'     => 'Acerca de modelos de activos',
-    'about_models_text'           => 'Los Modelos de activos son una forma de agrupar activos idénticos. "MBP 2013", "IPhone 6s", etc.',
-    'deleted'  					        => 'Este modelo fue eliminado.',
-    'bulk_delete'               => 'Borrar Grandes Modelos de Activos',
-    'bulk_delete_help'               => 'Usa las casillas de verificación para confirmar la eliminación de los modelos de activos. Los modelos de activos tienen activos asociados que no pueden ser eliminados hasta que los activos sean asociados con un modelo diferente.',
+    'about_models_title'     => 'Acerca de los modelos de activos',
+    'about_models_text'           => 'Los modelos de activos son una forma de agrupar activos idénticos. "MBP 2013", "IPhone 6s", etc.',
+    'deleted'  					=> 'Este modelo ha sido eliminado.',
+    'bulk_delete'               => 'Eliminación masiva de modelos de activos',
+    'bulk_delete_help'               => 'Utilice las casillas a continuación para confirmar la eliminación de los modelos de activos seleccionados. Los modelos de activos que tienen activos asociados a ellos no se pueden eliminar hasta que los activos estén asociados con un modelo diferente.',
     'bulk_delete_warn'          => 'Está a punto de eliminar un modelo de activo.|Está a punto de eliminar :model_count modelos de activos.',
-    'restore'                   => 'Restaurar Modelo',
+    'restore'                   => 'Restaurar modelo',
     'requestable'               => 'Los usuarios pueden solicitar este modelo',
-	'show_mac_address'			      => 'Mostrar el campo de la dirección MAC en los equipos de este modelo',
-    'view_deleted'              => 'Ver Borrados',
+	'show_mac_address'			      => 'Mostrar el campo de dirección MAC en los activos de este modelo',
+    'view_deleted'              => 'Ver borrados',
     'view_models'               => 'Ver modelos',
-    'fieldset'                  => 'Grupos de campo',
+    'fieldset'                  => 'Grupo de campos',
     'no_custom_field'           => 'No hay campos personalizados',
     'add_default_values'        => 'Agregar valores predeterminados',
 );
diff --git a/resources/lang/es-ES/admin/models/message.php b/resources/lang/es-ES/admin/models/message.php
index cf905ac939..731d4c861f 100644
--- a/resources/lang/es-ES/admin/models/message.php
+++ b/resources/lang/es-ES/admin/models/message.php
@@ -2,37 +2,37 @@
 
 return array(
 
-    'deleted' => 'Modelo del activo eliminado',
+    'deleted' => 'Se eliminó el modelo del activo',
     'does_not_exist' => 'Modelo inexistente.',
-    'no_association' => 'ADVERTENCIA! El modelo del activo para este ítem es inválido o no existe!',
-    'no_association_fix' => 'Esto romperá cosas de formas extrañas y horribles. Edite este activo ahora para asignarle un modelo.',
-    'assoc_users'	 => 'Este modelo está asignado a uno o más equipos y no puede ser eliminado',
-
+    'no_association' => '¡ADVERTENCIA! ¡El modelo de activo para este artículo no es válido o no existe!',
+    'no_association_fix' => 'Esto causará problemas raros y horribles. Edite este activo ahora para asignarle un modelo.',
+    'assoc_users'	 => 'Este modelo está asociado a uno o más activos y no puede ser eliminado. Por favor, elimine los activos y vuelva a intentarlo. ',
+    'invalid_category_type' => 'El tipo de esta categoría debe ser categoría de activos.',
 
     'create' => array(
-        'error'   => 'Modelo no creado, Intentalo de nuevo.',
-        'success' => 'Modelo creado.',
-        'duplicate_set' => 'Ya existe un modelo de equipo con el mismo nombre, fabricante y número de modelo.',
+        'error'   => 'El modelo no fue creado, por favor inténtelo de nuevo.',
+        'success' => 'El modelo fue creado exitosamente.',
+        'duplicate_set' => 'Ya existe un modelo de activo con el mismo nombre, fabricante y número de modelo.',
     ),
 
     'update' => array(
-        'error'   => 'Modelo no actualizado, Intentalo de nuevo',
-        'success' => 'Modelo actualizado.',
+        'error'   => 'El modelo no pudo ser actualizado, por favor inténtelo de nuevo',
+        'success' => 'El modelo fue actualizado exitosamente.',
     ),
 
     'delete' => array(
         'confirm'   => '¿Está seguro de que desea eliminar este modelo de activo?',
         'error'   => 'Hubo un problema eliminando el modelo. Por favor, inténtelo de nuevo.',
-        'success' => 'Modelo eliminado.'
+        'success' => 'El modelo fue eliminado exitosamente.'
     ),
 
     'restore' => array(
         'error'   		=> 'El modelo no fue restaurado, por favor intente nuevamente',
-        'success' 		=> 'Modelo restaurado exitosamente.'
+        'success' 		=> 'El modelo fue restaurado exitosamente.'
     ),
 
     'bulkedit' => array(
-        'error'   		=> 'Ningún campo fue seleccionado, por lo que nada ha sido actualizado.',
+        'error'   		=> 'Ningún cambio fue cambiado, así que nada se actualizó.',
         'success' 		=> 'Modelo actualizado correctamente. |:model_count modelos actualizados correctamente.',
         'warn'          => 'Está a punto de actualizar las propiedades del siguiente modelo:|Está a punto de editar las propiedades de los siguientes :model_count modelos:',
 
@@ -41,7 +41,7 @@ return array(
     'bulkdelete' => array(
         'error'   		    => 'Ningún modelo fue seleccionado, así que nada fue eliminado.',
         'success' 		    => 'Modelo eliminado!|:success_count modelos eliminados!',
-        'success_partial' 	=> ':success_count modelo(s) se han eliminado, sin embargo, :fail_count no se pudieron eliminar debido a que aún tienen activos asociados a ellos.'
+        'success_partial' 	=> ':success_count modelo(s) fueron eliminados, sin embargo, :fail_count no pudieron ser eliminados debido a que aún tienen activos asociados a ellos.'
     ),
 
 );
diff --git a/resources/lang/es-ES/admin/models/table.php b/resources/lang/es-ES/admin/models/table.php
index e3ef797e2f..312944b9cd 100644
--- a/resources/lang/es-ES/admin/models/table.php
+++ b/resources/lang/es-ES/admin/models/table.php
@@ -2,16 +2,16 @@
 
 return array(
 
-    'create'				=> 'Crear Modelo Equipo',
+    'create'				=> 'Crear modelo de activo',
     'created_at' 			=> 'Creado el',
-    'eol'	 				=> 'EOL',
+    'eol'	 				=> 'Fin de soporte (EOL)',
     'modelnumber'   		=> 'Modelo No.',
     'name'      			=> 'Nombre del modelo de activo',
-    'numassets' 			=> 'Equipos',
-    'title'					=> 'Modelos Equipos',
+    'numassets' 			=> 'Activos',
+    'title'					=> 'Modelos de activos',
     'update'				=> 'Actualizar modelo de activo',
-    'view'					=> 'Ver Modelo',
+    'view'					=> 'Ver modelo de activo',
     'update'				=> 'Actualizar modelo de activo',
-    'clone'				=> 'Clonar Modelo',
-    'edit'				=> 'Editar Modelo',
+    'clone'				=> 'Clonar modelo',
+    'edit'				=> 'Editar modelo',
 );
diff --git a/resources/lang/es-ES/admin/reports/general.php b/resources/lang/es-ES/admin/reports/general.php
index 90e07caee4..510fbbe4e2 100644
--- a/resources/lang/es-ES/admin/reports/general.php
+++ b/resources/lang/es-ES/admin/reports/general.php
@@ -1,17 +1,23 @@
 <?php
 
 return [
-    'info'   => 'Selecciona las opciones de tu informe de Equipos.',
+    'info'   => 'Seleccione las opciones que desee para su informe de activos.',
     'deleted_user' => 'Usuario eliminado',
     'send_reminder' => 'Enviar recordatorio',
+    'cannot_send_reminder' => 'User has been deleted or does not have an email address so cannot receive a reminder',
     'reminder_sent' => 'Recordatorio enviado',
     'acceptance_deleted' => 'Solicitud de aceptación eliminada',
     'acceptance_request' => 'Solicitud de aceptación',
     'custom_export' => [
         'user_address' => 'Dirección de usuario',
-        'user_city' => 'Ciudad del Usuario',
+        'user_city' => 'Ciudad del usuario',
         'user_state' => 'Estado del usuario',
-        'user_country' => 'País de usuario',
-        'user_zip' => 'Usuario Zip'
-    ]
-];
\ No newline at end of file
+        'user_country' => 'País del usuario',
+        'user_zip' => 'Código postal del usuario'
+    ],
+    'open_saved_template' => 'Abrir plantilla guardada',
+    'save_template' =>  'Guardar plantilla',
+    'select_a_template' => 'Seleccione una plantilla',
+    'template_name' => 'Nombre de la plantilla',
+    'update_template' => 'Actualizar plantilla',
+];
diff --git a/resources/lang/es-ES/admin/reports/message.php b/resources/lang/es-ES/admin/reports/message.php
index a8f61aa993..a1c4522eba 100644
--- a/resources/lang/es-ES/admin/reports/message.php
+++ b/resources/lang/es-ES/admin/reports/message.php
@@ -1,5 +1,16 @@
 <?php
 
-return array(
-    'error'   => 'Debes seleccionar al menos UNA opción.'
-);
+return [
+    'about_templates' => 'Acerca de las plantillas guardadas',
+    'saving_templates_description' => 'Seleccione sus opciones, luego ingrese el nombre de su plantilla en el campo de arriba y haga clic en el botón \'Guardar plantilla\'. Use la lista desplegable para seleccionar una plantilla guardada previamente.',
+    'create'  => [
+        'success' => 'Plantilla guardada exitosamente',
+    ],
+    'update' => [
+        'success' => 'Plantilla actualizada exitosamente',
+    ],
+    'delete' => [
+        'success' => 'Plantilla eliminada',
+        'no_delete_permission' => 'La plantilla no existe o no tiene permisos para eliminarla.',
+    ],
+];
diff --git a/resources/lang/es-ES/admin/settings/general.php b/resources/lang/es-ES/admin/settings/general.php
index 646575556d..b76f5da468 100644
--- a/resources/lang/es-ES/admin/settings/general.php
+++ b/resources/lang/es-ES/admin/settings/general.php
@@ -3,159 +3,168 @@
 return [
     'ad'				        => 'Directorio Activo',
     'ad_domain'				    => 'Dominio del Directorio Activo',
-    'ad_domain_help'			=> 'Esto es a veces el mismo que su correo electrónico de dominio, pero no siempre.',
+    'ad_domain_help'			=> 'Algunas veces coincide con el dominio de su correo electrónico, pero no siempre.',
     'ad_append_domain_label'    => 'Añadir nombre de dominio',
     'ad_append_domain'          => 'Añadir nombre de dominio al campo de nombre de usuario',
-    'ad_append_domain_help'     => 'El usuario no necesita escribir "username@domain.local", puede escribir únicamente "username".',
+    'ad_append_domain_help'     => 'El usuario no necesita escribir "usuario@dominio.local", puede escribir únicamente "usuario".',
     'admin_cc_email'            => 'Copiar en correo electrónico',
-    'admin_cc_email_help'       => 'Si desea enviar una copia de los correos electrónicos de devolución/asignación que se envían a los usuarios a una cuenta de correo electrónico adicional, escríbala aquí. De lo contrario, deje este campo en blanco.',
-    'admin_settings'            => 'Configuración de administrador',
+    'admin_cc_email_help'       => 'Send a copy of checkin/checkout emails to this address.',
+    'admin_settings'            => 'Configuración de administración',
     'is_ad'				        => 'Este es un servidor de Directorio Activo',
     'alerts'                	=> 'Alertas',
     'alert_title'               => 'Actualizar ajustes de notificación',
     'alert_email'				=> 'Enviar alertas a',
-    'alert_email_help'    => 'Direcciones de correo electrónico o listas de distribución a las que desea que se envíen alertas, separadas por comas',
-    'alerts_enabled'			=> 'Alertas habilitadas',
-    'alert_interval'			=> 'Limite de alertas de expiración (en días)',
-    'alert_inv_threshold'		=> 'Umbral de alerta del inventario',
-    'allow_user_skin'           => 'Permitir skin del usuario',
-    'allow_user_skin_help_text' => 'Marcar esta casilla permitirá al usuario reemplazar la apariencia de la interfaz con una diferente.',
-    'asset_ids'					=> 'IDs de Recurso',
+    'alert_email_help'          => 'Direcciones de correo electrónico o listas de distribución a las que desea que se envíen alertas, separadas por comas.',
+    'alerts_enabled'			=> 'Alertas de correo electrónico habilitadas',
+    'alert_interval'			=> 'Umbral para las alertas de caducidad (en días)',
+    'alert_inv_threshold'		=> 'Umbral para alerta de inventario',
+    'allow_user_skin'           => 'Permitir al usuario cambiar la apariencia',
+    'allow_user_skin_help_text' => 'Si se marca esta casilla, el usuario podrá reemplazar la apariencia de la interfaz con una diferente.',
+    'asset_ids'					=> 'Códigos de los activos',
     'audit_interval'            => 'Intervalo de auditoría',
     'audit_interval_help'       => 'Si está obligado a auditar físicamente sus activos con regularidad, introduzca el intervalo en meses que utilice. Si actualiza este valor, se actualizarán todas las "próximas fechas de auditoría" de los activos con una fecha de auditoría próxima.',
-    'audit_warning_days'        => 'Umbral de advertencia de auditoría',
+    'audit_warning_days'        => 'Umbral para aviso de auditoría',
     'audit_warning_days_help'   => '¿Con cuántos días de antelación es necesario avisar que se deben auditar los activos?',
-    'auto_increment_assets'		=> 'Generar etiquetas de activos autoincrementales',
+    'auto_increment_assets'		=> 'Generar incremento automático en las placas de activos',
     'auto_increment_prefix'		=> 'Prefijo (opcional)',
-    'auto_incrementing_help'    => 'Habilitar etiquetas de activos autoincrementales primero para establecer esto',
+    'auto_incrementing_help'    => 'Habilite primero el incremento automático de las placas de activos antes de configurar esto',
     'backups'					=> 'Copias de seguridad',
     'backups_help'              => 'Crear, descargar y restaurar copias de seguridad ',
     'backups_restoring'         => 'Restaurar desde copia de seguridad',
+    'backups_clean' => 'Depure la base de datos de la copia de seguridad antes de restaurarla',
+    'backups_clean_helptext' => "Esto puede ser útil si está cambiando entre versiones de bases de datos",
     'backups_upload'            => 'Cargar copia de seguridad',
     'backups_path'              => 'Las copias de seguridad en el servidor se almacenan en <code>:path</code>',
-    'backups_restore_warning'   => 'Utilice el botón de restauración <small><span class="btn btn-xs btn-warning"><i class="text-white fas fa-retweet" aria-hidden="true"></i></span></small> para restaurar desde una copia de seguridad anterior. (Actualmente esto no funciona con almacenamiento de archivos S3 o Docker.<br><br>Su <strong>base de datos completa de :app_name y cualquier archivo subido será completamente reemplazado</strong> por lo que hay en el archivo de copia de seguridad.  ',
+    'backups_restore_warning'   => 'Use the restore button <small><span class="btn btn-xs btn-warning"><i class="text-white fas fa-retweet" aria-hidden="true"></i></span></small> to restore from a previous backup. (This does not currently work with S3 file storage or Docker.)<br><br>Your <strong>entire :app_name database and any uploaded files will be completely replaced</strong> by what\'s in the backup file  ',
     'backups_logged_out'         => 'A todos los usuarios existentes, incluido usted, se le cerrará la sesión una vez que la restauración haya finalizado.',
     'backups_large'             => 'Las copias de seguridad muy grandes pueden agotar el tiempo de espera en el intento de restauración y todavía pueden necesitar ser ejecutadas a través de la línea de comandos. ',
-    'barcode_settings'			=> 'Configuración de Código de Barras',
+    'barcode_settings'			=> 'Configuración del código de barras',
     'confirm_purge'			    => 'Confirmar la purga',
-    'confirm_purge_help'		=> 'Introduzca el texto "DELETE" en el cuadro de abajo para purgar sus registros borrados. Esta acción no se puede deshacer y borrará PERMANENTAMENTE todos los elementos y usuarios eliminados. (Se recomienda hacer una copia de seguridad previamente, para estar seguro.)',
+    'confirm_purge_help'		=> 'Introduzca el texto "DELETE" en la casilla de abajo para purgar sus registros borrados. Esta acción no se puede deshacer y borrará PERMANENTAMENTE todos los elementos y usuarios eliminados. Debería hacer primero una copia de seguridad, para estar seguro.',
     'custom_css'				=> 'CSS Personalizado',
-    'custom_css_help'			=> 'Ingrese cualquier CSS personalizado que desee utilizar. No incluya tags como: &lt;style&gt;&lt;/style&gt.',
-    'custom_forgot_pass_url'	=> 'Reestablecer URL de Contraseña Personalizada',
-    'custom_forgot_pass_url_help'	=> 'Esto remplaza la URL incorporada para las contraseñas olvidadas en la pantalla de inicio, útil para dirigir a las personas a una funcionalidad de restablecimiento de contraseña LDAP interna o alojada. Esto efectivamente desactivará la funcionalidad local de olvido de contraseña.',
+    'custom_css_placeholder'	=> 'Add your custom CSS',
+    'custom_css_help'			=> 'Introduzca cualquier CSS personalizado que desee utilizar. No incluya las etiquetas &lt;style&gt;&lt;/style&gt;.',
+    'custom_forgot_pass_url'	=> 'URL de restablecimiento de contraseña personalizada',
+    'custom_forgot_pass_url_help'	=> 'Esto reemplaza la URL de contraseña olvidada incorporada en la pantalla de inicio de sesión, es útil para dirigir a las personas a la funcionalidad de restablecimiento de contraseña LDAP interna o alojada. Deshabilitará efectivamente la funcionalidad de olvido de contraseña del usuario local.',
     'dashboard_message'			=> 'Mensaje en el tablero',
     'dashboard_message_help'	=> 'Este texto aparecerá en el panel para cualquiera que tenga permiso de ver el Panel.',
-    'default_currency'  		=> 'Moneda Predeterminada',
+    'default_currency'  		=> 'Divisa predeterminada',
     'default_eula_text'			=> 'Acuerdo de uso predeterminado',
+    'default_eula_text_placeholder' => 'Add your default EULA text',
     'default_language'			=> 'Idioma predeterminado',
     'default_eula_help_text'	=> 'También puede asociar acuerdos de uso personalizados a categorías específicas.',
     'acceptance_note'           => 'Añada una nota para su decisión (opcional)',
     'display_asset_name'        => 'Mostrar nombre del activo',
     'display_checkout_date'     => 'Mostrar fecha de asignación',
-    'display_eol'               => 'Mostrar EOL',
-    'display_qr'                => 'Mostrar Códigos QR',
-    'display_alt_barcode'		=> 'Mostrar códigos de barras en 1D',
-    'email_logo'                => 'Logo de correo electrónico',
-    'barcode_type'				=> 'Tipo de códigos de barras 2D',
-    'alt_barcode_type'			=> 'Tipo de códigos de barras 1D',
-    'email_logo_size'       => 'Los logotipos cuadrados en el correo electrónico se ven mejor. ',
+    'display_eol'               => 'Mostrar fin de soporte (EOL) en la vista de tabla',
+    'display_qr'                => 'Mostrar código de barras en 2D',
+    'display_alt_barcode'		=> 'Mostrar códigos de barras de 1D',
+    'barcode_type'				=> 'Tipo de códigos de barras de 2D',
+    'alt_barcode_type'			=> 'Tipo de código de barras de 1D',
     'enabled'                   => 'Habilitado',
     'eula_settings'				=> 'Configuración de los acuerdos de uso',
     'eula_markdown'				=> 'Estos acuerdos de uso permiten <a href="https://help.github.com/articles/github-flavored-markdown/">markdown estilo Github</a>.',
+    'empty_row_count'           => 'Field Start Offset (Empty Rows)',
+    'empty_row_count_help'      => 'Fields will begin populating after this many empty rows are skipped at the top of the label.',
     'favicon'                   => 'Favicon',
-    'favicon_format'            => 'Los tipos de archivo aceptados son ico, png y gif. Otros formatos de imagen pueden no funcionar en todos los navegadores.',
-    'favicon_size'          => 'Los Favicons deben ser imágenes cuadradas, 16x16 píxeles.',
-    'footer_text'               => 'Texto Adicional de Pie de Página ',
-    'footer_text_help'          => 'Este texto aparecerá en el lado derecho del pie de página. Los enlaces son permitidos usando <a href="https://help.github.com/articles/github-flavored-markdown/">el formato flavored de GitHub</a>. Saltos de línea, cabeceras, imágenes, etc, pueden resultar impredecibles.',
-    'general_settings'			=> 'Configuración General',
-    'general_settings_keywords' => 'soporte de la compañía, firma, aceptación, formato de correo electrónico, formato de nombre de usuario, imágenes, por página, miniatura, acuerdo de uso, términos y condiciones, gravatar, términos de servicio, tablero de indicadores, privacidad',
+    'favicon_format'            => 'Los tipos de archivo aceptados son ico, png y gif. Es posible que otros formatos de imagen no funcionen en todos los navegadores.',
+    'favicon_size'          => 'Los Favicons deben ser imágenes cuadradas, de 16x16 píxeles.',
+    'footer_text'               => 'Texto adicional en el pie de página ',
+    'footer_text_help'          => 'Este texto aparecerá en el lado derecho del pie de página. Los enlaces son permitidos usando <a href="https://help.github.com/articles/github-flavored-markdown/">markdown estilo Github</a>. Los saltos de línea, encabezados, imágenes, etc. pueden dar lugar a resultados impredecibles.',
+    'footer_text_placeholder'   => 'Optional footer text',
+    'general_settings'			=> 'Configuración general',
     'general_settings_help'     => 'Acuerdo de uso predeterminado y más',
     'generate_backup'			=> 'Generar Respaldo',
-    'google_workspaces'         => 'Espacios de trabajo de Google',
-    'header_color'              => 'Color de encabezado',
-    'info'                      => 'Estos parámetros permirten personalizar ciertos aspectos de la aplicación.',
-    'label_logo'                => 'Logo de etiqueta',
+    'google_workspaces'         => 'Google Workspace',
+    'header_color'              => 'Color del encabezado',
+    'info'                      => 'Estos ajustes le permiten personalizar ciertos aspectos de su instalación.',
     'label_logo_size'           => 'Los logos cuadrados se ven mejor - se mostrarán en la parte superior derecha de cada etiqueta de activo. ',
     'laravel'                   => 'Versión de Laravel',
     'ldap'                      => 'LDAP',
-    'ldap_default_group'        => 'Grupo de permisos por defecto',
+    'ldap_default_group'        => 'Grupo de permisos predeterminado',
     'ldap_default_group_info'   => 'Seleccione un grupo para asignar a los usuarios recién sincronizados. Recuerde que un usuario asume los permisos del grupo que le han asignado.',
     'no_default_group'          => 'Ningún grupo por defecto',
     'ldap_help'                 => 'LDAP/Directorio Activo',
     'ldap_client_tls_key'       => 'Llave TLS del cliente LDAP',
-    'ldap_client_tls_cert'      => 'Certificado LDAP TLS del lado cliente',
+    'ldap_client_tls_cert'      => 'LDAP Certificado TLS del lado del cliente',
     'ldap_enabled'              => 'LDAP activado',
     'ldap_integration'          => 'Integración LDAP',
-    'ldap_settings'             => 'Ajustes LDAP',
-    'ldap_client_tls_cert_help' => 'El certificado TLS del cliente y la clave para las conexiones LDAP normalmente sólo son útiles en las configuraciones de Google Workspace con "LDAP Seguro". Ambas son requeridas.',
+    'ldap_settings'             => 'Configuración LDAP',
+    'ldap_client_tls_cert_help' => 'El certificado TLS del lado del cliente y la clave para las conexiones LDAP normalmente solo son útiles en las configuraciones de Google Workspace con "LDAP Seguro". Ambas son requeridas.',
     'ldap_location'             => 'Ubicación LDAP',
 'ldap_location_help'             => 'El campo Location (ubicación) de Ldap debe utilizarse si <strong>una OU no está siendo utilizada en el Base Bind DN (DN del enlace base).</strong> Deje este espacio en blanco si se utiliza una búsqueda OU.',
-    'ldap_login_test_help'      => 'Introduce un nombre de usuario LDAP válido y una contraseña de la DN base que especificaste anteriormente para probar si tu inicio de sesión LDAP está configurado correctamente. DEBES GUARDAR TUS CONFIGURACIONES LDAP ACTUALIZADAS PRIMERO.',
-    'ldap_login_sync_help'      => 'Esto sólo prueba que LDAP puede sincronizarse correctamente. Si tu solicitud de Autenticación LDAP no es correcta, los usuarios aún no podrían iniciar sesión. DEBES GUARDAR TUS CONFIGURACIONES LDAP ACTUALIZADAS PRIMERO.',
+    'ldap_login_test_help'      => 'Introduzca un nombre de usuario y una contraseña LDAP válidos del DN base que especificó anteriormente para comprobar si el inicio de sesión LDAP está configurado correctamente. PRIMERO DEBE GUARDAR LA CONFIGURACIÓN LDAP ACTUALIZADA.',
+    'ldap_login_sync_help'      => 'Esto solo comprueba que el LDAP puede sincronizarse correctamente. Si su solicitud de autenticación LDAP no es correcta, los usuarios aún no podrían iniciar sesión. PRIMERO DEBE GUARDAR LA CONFIGURACIÓN LDAP ACTUALIZADA.',
     'ldap_manager'              => 'Gestor LDAP',
     'ldap_server'               => 'Servidor LDAP',
-    'ldap_server_help'          => 'Esto debería empezar con ldap:// (sin codificar o TLS) o ldaps:// (para SSL)',
-    'ldap_server_cert'			=> 'Certificado de validación SSL LDAP',
-    'ldap_server_cert_ignore'	=> 'Permitir certificados SSL inválidos',
+    'ldap_server_help'          => 'Esto debería comenzar con ldap:// (sin cifrado) o con ldaps:// (para TLS o SSL)',
+    'ldap_server_cert'			=> 'Validación del certificado LDAP SSL',
+    'ldap_server_cert_ignore'	=> 'Permitir certificado SSL inválido',
     'ldap_server_cert_help'		=> 'Seleccione esta casilla si está utilizando un certificado SSL autofirmado y desea aceptar un certificado SSL inválido.',
     'ldap_tls'                  => 'Usar TLS',
     'ldap_tls_help'             => 'Esto se debe seleccionar si se está ejecutando STARTTLS en el servidor LDAP. ',
-    'ldap_uname'                => 'Enlazar usuario LDAP',
+    'ldap_uname'                => 'Nombre de usuario de enlace LDAP (LDAP Bind Username)',
     'ldap_dept'                 => 'Departamento LDAP',
     'ldap_phone'                => 'Número de teléfono LDAP',
     'ldap_jobtitle'             => 'Cargo LDAP',
     'ldap_country'              => 'País LDAP',
-    'ldap_pword'                => 'Enlazar contraseña LDAP',
-    'ldap_basedn'               => 'Enlazar base DN',
+    'ldap_pword'                => 'Contraseña de enlace LDAP',
+    'ldap_basedn'               => 'DN del enlace base (Base Bind DN)',
     'ldap_filter'               => 'Filtro LDAP',
-    'ldap_pw_sync'              => 'Sincronización de Contraseña LDAP',
-    'ldap_pw_sync_help'         => 'Desmarca esta casilla si no quieres mantener las contraseñas LDAP sincronizadas con las contraseñas locales. Desactivar esto significa que tus usuarios no podrán acceder si tu servidor LDAP no está disponible por algún motivo.',
-    'ldap_username_field'       => 'Campo de usuario',
+    'ldap_pw_sync'              => 'Cache LDAP Passwords',
+    'ldap_pw_sync_help'         => 'Uncheck this box if you do not wish to keep LDAP passwords cached as local hashed passwords. Disabling this means that your users may not be able to login if your LDAP server is unreachable for some reason.',
+    'ldap_username_field'       => 'Campo nombre de usuario',
     'ldap_lname_field'          => 'Apellido',
     'ldap_fname_field'          => 'Nombre LDAP',
     'ldap_auth_filter_query'    => 'Consulta de autentificación LDAP',
     'ldap_version'              => 'Versión LDAP',
     'ldap_active_flag'          => 'Flag activo LDAP',
-    'ldap_activated_flag_help'  => 'Este valor se utiliza para determinar si un usuario sincronizado puede iniciar sesión en Snipe-IT. <strong>No afecta a la capacidad de asignarles o retirarles items</strong>, y debería ser el <strong>nombre de atributo</strong> dentro de su AD/LDAP, <strong>no el valor</strong>. <br><br>Si este campo está configurado a un nombre de campo que no existe en su AD/LDAP, o el valor en el campo AD/LDAP se establece en <code>0</code> o <code>falso</code>, <strong>el inicio de sesión de usuario será deshabilitado</strong>. Si el valor en el campo AD/LDAP está establecido en <code>1</code> o <code>true</code> o <em>cualquier otro texto</em> significa que el usuario puede iniciar sesión. Cuando el campo está en blanco en tu AD, respetamos el atributo <code>userAccountControl</code>, que generalmente permite a los usuarios no suspendidos iniciar sesión.',
+    'ldap_activated_flag_help'  => 'Este valor se utiliza para determinar si un usuario sincronizado puede iniciar sesión en Snipe-IT. <strong>No afecta a la capacidad de asignarles o retirarles elementos</strong>, y debería ser el <strong>nombre de atributo</strong> dentro de su AD/LDAP, <strong>no el valor</strong>. <br><br>Si este campo está configurado a un nombre de campo que no existe en su AD/LDAP, o el valor en el campo AD/LDAP se establece en <code>0</code> o <code>falso</code>, <strong>el inicio de sesión de usuario será deshabilitado</strong>. Si el valor en el campo AD/LDAP está establecido en <code>1</code> o <code>true</code> o <em>cualquier otro texto</em> significa que el usuario puede iniciar sesión. Cuando el campo está en blanco en su AD, respetamos el atributo <code>userAccountControl</code>, que generalmente permite a los usuarios no suspendidos iniciar sesión.',
+    'ldap_invert_active_flag'   => 'LDAP Invert Active Flag',
+    'ldap_invert_active_flag_help'     => 'If enabled: when the value returned by LDAP Active Flag is <code>0</code> or <code>false</code> the user account will be active.',
     'ldap_emp_num'              => 'Número de empleado LDAP',
-    'ldap_email'                => 'Email LDAP',
+    'ldap_email'                => 'Correo electrónico LDAP',
     'ldap_test'                 => 'Probar LDAP',
     'ldap_test_sync'            => 'Prueba de sincronización LDAP',
-    'license'                   => 'Licencia de Software',
-    'load_remote'               => 'Usar Gravatar',
-    'load_remote_help_text'		=> 'Desmarque esta casilla si su instalación no puede cargar scripts desde el Internet externo. Esto evitará que Snipe-IT intente cargar imágenes desde Gravatar.',
+    'license'                   => 'Licencia de software',
+    'load_remote'               => 'Cargar avatares remotos',
+    'load_remote_help_text'		=> 'Desmarque esta casilla si su instalación no puede cargar secuencias de comandos (scripts) desde Internet . Esto evitará que Snipe-IT intente cargar avatares de Gravatar u otras fuentes externas.',
     'login'                     => 'Intentos de inicio de sesión',
     'login_attempt'             => 'Intento de inicio de sesión',
     'login_ip'                  => 'Dirección IP',
-    'login_success'             => '¿Éxito?',
-    'login_user_agent'          => 'Navegador',
+    'login_success'             => '¿Exitoso?',
+    'login_user_agent'          => 'Agente de usuario',
     'login_help'                => 'Lista de intentos de inicio de sesión',
-    'login_note'                => 'Nota de inicio de sesión',
-    'login_note_help'           => 'Opcionalmente incluya algunas oraciones en su pantalla de inicio de sesión, por ejemplo para ayudar a las personas que han encontrado un dispositivo perdido o robado. Este campo acepta <a href="https://help.github.com/articles/github-flavored-markdown/">Github con sabor markdown</a>',
+    'login_note'                => 'Nota en inicio de sesión',
+    'login_note_placeholder'            => "If you do not have a login or have found a device belonging to this company, please call technical support at 888-555-1212. Thank you.",
+    'login_note_help'           => 'Opcionalmente incluya algunas frases en su pantalla de inicio de sesión, por ejemplo para ayudar a las personas que han encontrado un dispositivo perdido o robado. Este campo acepta <a href="https://help.github.com/articles/github-flavored-markdown/">markdown estilo Github</a>',
     'login_remote_user_text'    => 'Opciones de inicio de sesión de usuario remoto',
     'login_remote_user_enabled_text' => 'Habilitar inicio de sesión con encabezado de usuario remoto',
-    'login_remote_user_enabled_help' => 'Esta opción habilita la Autenticación mediante el encabezado REMOTE_USER de acuerdo con la "Interfaz de puerta de enlace común (rfc3875)"',
+    'login_remote_user_enabled_help' => 'Esta opción habilita la autenticación mediante el encabezado REMOTE_USER de acuerdo con la "Interfaz de puerta de enlace común (rfc3875)"',
     'login_common_disabled_text' => 'Deshabilitar otros mecanismos de autenticación',
     'login_common_disabled_help' => 'Esta opción desactiva otros mecanismos de autenticación. Simplemente habilite esta opción si está seguro de que su inicio de sesión REMOTE_USER ya está funcionando',
     'login_remote_user_custom_logout_url_text' => 'URL de cierre de sesión personalizado',
-    'login_remote_user_custom_logout_url_help' => 'Si se proporciona una url aquí, los usuarios serán redirigidos a esta URL después de que el usuario cierre la sesión de Snipe-IT. Esto es útil para cerrar correctamente las sesiones de usuario de su proveedor de autenticación.',
-    'login_remote_user_header_name_text' => 'Encabezado de nombre de usuario personalizado',
+    'login_remote_user_custom_logout_url_help' => 'Si se proporciona una URL aquí, los usuarios serán redirigidos a esta URL después de que el usuario cierre la sesión de Snipe-IT. Esto es útil para cerrar correctamente las sesiones de usuario de su proveedor de autenticación.',
+    'login_remote_user_header_name_text' => 'Cabecera de nombre de usuario personalizado',
     'login_remote_user_header_name_help' => 'Usar la cabecera especificada en lugar de REMOTE_USER',
     'logo'                    	=> 'Logo',
-    'logo_print_assets'         => 'Utilizar en impresión',
-    'logo_print_assets_help'    => 'Utilice la marca en las listas de activos imprimibles ',
+    'logo_print_assets'         => 'Usar en la impresión',
+    'logo_print_assets_help'    => 'Utilice la marca de la empresa en las listas de activos imprimibles ',
     'full_multiple_companies_support_help_text' => 'Limitar los usuarios asignados a compañías (incluyendo administradores) solo a los activos de esa compañía.',
     'full_multiple_companies_support_text' => 'Soporte completo a múltiples compañías',
+    'scope_locations_fmcs_support_text'  => 'Scope Locations with Full Multiple Companies Support',
+    'scope_locations_fmcs_support_help_text'  => 'Restrict locations to their selected company.',
+    'scope_locations_fmcs_check_button' => 'Check Compatibility',
+    'scope_locations_fmcs_support_disabled_text'  => 'This option is disabled because you have conflicting locations set for :count or more items.',
     'show_in_model_list'   => 'Mostrar en menús desplegables de modelos',
     'optional'					=> 'opcional',
     'per_page'                  => 'Resultados por página',
     'php'                       => 'Versión de PHP',
-    'php_info'                  => 'Información PHP',
+    'php_info'                  => 'Información de PHP',
     'php_overview'              => 'PHP',
-    'php_overview_keywords'     => 'phpinfo, sistema, información',
-    'php_overview_help'         => 'PHP Información del sistema',
-    'php_gd_info'               => 'Debes instalar php-gd para mostrar Códigos QR, ver instrucciones de instalación en <a href="http://www.php.net/manual/en/image.installation.php"></a>.',
-    'php_gd_warning'            => 'PHP Image Processing y GD plugin NO instalados.',
+    'php_overview_help'         => 'Información del sistema PHP',
+    'php_gd_info'               => 'Debe instalar php-gd para mostrar códigos QR, consulte las instrucciones de instalación.',
+    'php_gd_warning'            => 'PHP Image Processing y GD plugin NO están instalados.',
     'pwd_secure_complexity'     => 'Complejidad de la contraseña',
     'pwd_secure_complexity_help' => 'Seleccione las reglas de complejidad de las contraseñas que desee aplicar.',
     'pwd_secure_complexity_disallow_same_pwd_as_user_fields' => 'La contraseña no puede ser la misma que el nombre, apellido, correo electrónico o nombre de usuario',
@@ -163,12 +172,12 @@ return [
     'pwd_secure_complexity_numbers' => 'Requiere al menos un número',
     'pwd_secure_complexity_symbols' => 'Requiere al menos un símbolo',
     'pwd_secure_complexity_case_diff' => 'Requiere al menos una mayúscula y una minúscula',
-    'pwd_secure_min'            => 'Caracteres mínimos de contraseña',
+    'pwd_secure_min'            => 'Caracteres mínimos de la contraseña',
     'pwd_secure_min_help'       => 'El valor mínimo permitido es 8',
     'pwd_secure_uncommon'       => 'Evitar contraseñas comunes',
-    'pwd_secure_uncommon_help'  => 'Esto impedirá que los usuarios usen contraseñas comunes de las 10,000 contraseñas principales que se notifican en las infracciones.',
-    'qr_help'                   => 'Activa Códigos QR antes para poder ver esto',
-    'qr_text'                   => 'Texto Código QR',
+    'pwd_secure_uncommon_help'  => 'Esto impedirá que los usuarios usen contraseñas comunes de las 10,000 contraseñas más usuales reportadas en fugas de datos.',
+    'qr_help'                   => 'Habilite primero los códigos QR para configurar esto',
+    'qr_text'                   => 'Texto del código QR',
     'saml'                      => 'SAML',
     'saml_title'                => 'Actualizar ajustes de SAML',
     'saml_help'                 => 'Configuración SAML',
@@ -181,101 +190,104 @@ return [
     'saml_sp_metadata_url'      => 'URL de los metadatos',
     'saml_idp_metadata'         => 'Metadatos SAML IdP',
     'saml_idp_metadata_help'    => 'Puede especificar los metadatos IdP usando un archivo URL o XML.',
-    'saml_attr_mapping_username' => 'Mapeo de Atributos - Nombre de Usuario',
-    'saml_attr_mapping_username_help' => 'NameID se utilizará si el mapeo de atributos no está especificado o no es válido.',
+    'saml_attr_mapping_username' => 'Asociar atributo - Nombre de usuario',
+    'saml_attr_mapping_username_help' => 'NameID se utilizará si la asociación de atributos no está especificada o no es válida.',
     'saml_forcelogin_label'     => 'Forzar inicio de sesión SAML',
-    'saml_forcelogin'           => 'Hacer SAML el método de inicio de sesión principal',
-    'saml_forcelogin_help'      => 'Puedes usar \'/login?nosaml\' para ir a la página de inicio de sesión normal.',
+    'saml_forcelogin'           => 'Hacer de SAML el método de inicio de sesión principal',
+    'saml_forcelogin_help'      => 'Puede usar \'/login?nosaml\' para ir a la página de inicio de sesión normal.',
     'saml_slo_label'            => 'Cerrar sesión única SAML',
     'saml_slo'                  => 'Enviar una solicitud de salida a IdP al cerrar sesión',
     'saml_slo_help'             => 'Esto causará que el usuario sea redirigido primero a la IdP al cerrar sesión. Dejar desmarcado si el IdP no soporta correctamente SP-initiated SAML SLO.',
     'saml_custom_settings'      => 'Ajustes personalizados de SAML',
-    'saml_custom_settings_help' => 'Puedes especificar ajustes adicionales a la biblioteca onelogin/php-saml. Úsalo bajo tu propio riesgo.',
+    'saml_custom_settings_help' => 'Puede especificar ajustes adicionales a la biblioteca onelogin/php-saml. Úselo bajo su propio riesgo.',
     'saml_download'             => 'Descargar metadatos',
-    'setting'                   => 'Parámetro',
-    'settings'                  => 'Configuración',
+    'setting'                   => 'Configuración',
+    'settings'                  => 'Configuraciones',
     'show_alerts_in_menu'       => 'Mostrar alertas en el menú superior',
     'show_archived_in_list'     => 'Activos archivados',
     'show_archived_in_list_text'     => 'Mostrar activos archivados en el listado de "todos los activos"',
     'show_assigned_assets'      => 'Mostrar activos asignados a activos',
     'show_assigned_assets_help' => 'Mostrar activos que fueron asignados a otros activos en Ver usuario -> Activos, Ver usuario -> Información -> Imprimir todos los asignados y en Cuenta -> Ver elementos asignados.',
-    'show_images_in_email'     => 'Mostrar imágenes en emails',
-    'show_images_in_email_help'   => 'Desmarca esta casilla si tu instalación de Snipe-IT está detrás de una red privada o VPN y los usuarios fuera de la red no pueden cargar las imágenes servidas desde este servidor en sus correos electrónicos.',
+    'show_images_in_email'     => 'Mostrar imágenes en correos electrónicos',
+    'show_images_in_email_help'   => 'Desmarque esta casilla si su instalación de Snipe-IT está detrás de una red privada o VPN y los usuarios fuera de la red no pueden cargar las imágenes publicadas desde este servidor de Snipe-IT en sus correos electrónicos.',
     'site_name'                 => 'Nombre del sitio',
     'integrations'               => 'Integraciones',
     'slack'                     => 'Slack',
     'general_webhook'           => 'Webhook general',
-    'ms_teams'                  => 'Equipos Microsoft',
+    'ms_teams'                  => 'Microsoft Teams',
     'webhook'                   => ':app',
     'webhook_presave'           => 'Probar para guardar',
     'webhook_title'               => 'Actualizar ajustes de Webhook',
     'webhook_help'                => 'Ajustes de integración',
-    'webhook_botname'             => 'Nombre de bot de :app',
+    'webhook_botname'             => 'Nombre de Bot de :app',
     'webhook_channel'             => 'Canal de :app',
     'webhook_endpoint'            => 'Endpoint de :app',
-    'webhook_integration'         => 'Ajustes de :app',
-    'webhook_test'                 =>'Probar integración de :app',
-    'webhook_integration_help'    => 'La integración con :app es opcional, sin embargo el endpoint y el canal son requeridos si desea usarlo. Para configurar la integración de :app, primero debe <a href=":webhook_link" target="_new" rel="noopener">crear un webhook entrante</a> en su cuenta de :app. Haga clic en el botón <strong>Probar Integración :app</strong> para confirmar que su configuración es correcta antes de guardar. ',
-    'webhook_integration_help_button'    => 'Una vez que hayas guardado la información de :app, aparecerá un botón de prueba.',
-    'webhook_test_help'           => 'Comprueba si tu integración con :app está configurada correctamente. PRIMERO DEBES GUARDAR TU CONFIGURACION ACTUALIZADA DE :app.',
-    'snipe_version'  			=> 'Version de Snipe-IT',
+    'webhook_integration'         => 'Configuración de :app',
+    'webhook_test'                 =>'Probar integración con :app',
+    'webhook_integration_help'    => 'La integración con :app es opcional, sin embargo, el punto final (endpoint) y el canal son necesarios si desea usarla. Para configurar la integración con :app, primero debe crear <a href=":webhook_link" target="_new" rel="noopener">un webhook entrante</a> en su cuenta :app. Haga clic en el botón <strong>Probar integración con :app</strong> para confirmar que su configuración es correcta antes de guardar. ',
+    'webhook_integration_help_button'    => 'Una vez que haya guardado la información de :app, aparecerá un botón de prueba.',
+    'webhook_test_help'           => 'Compruebe si su integración con :app está configurada correctamente. PRIMERO DEBE GUARDAR LA CONFIGURACION ACTUALIZADA DE :app.',
+    'shortcuts_enabled'         => 'Habilitar accesos directos',
+    'shortcuts_help_text'       => '<strong>Windows</strong>: Alt + Tecla de acceso, <strong>Mac</strong>: Control + Opción + Tecla de acceso',
+    'snipe_version'  			=> 'Versión de Snipe-IT',
     'support_footer'            => 'Enlace al soporte en el pie de página ',
-    'support_footer_help'       => 'Especifica quien ve los enlaces de información de Soporte y Manual de Usuarios de Snipe-IT',
+    'support_footer_help'       => 'Especifique quién puede ver los enlaces a la información de soporte de Snipe-IT y al manual de usuario',
     'version_footer'            => 'Versión en el pie de página ',
-    'version_footer_help'       => 'Especifica quién ve la versión y el número de compilación de Snipe-IT.',
-    'system'                    => 'Información del Sistema',
-    'update'                    => 'Actualizar Parámetros',
+    'version_footer_help'       => 'Especifique quién puede ver la versión de Snipe-IT y el número de compilación.',
+    'system'                    => 'Información del sistema',
+    'update'                    => 'Actualizar configuraciones',
     'value'                     => 'Valor',
     'brand'                     => 'Marca',
-    'brand_keywords'            => 'pie de página, logotipo, impresión, tema, piel, encabezado, colores, color, css',
     'brand_help'                => 'Logo, nombre del sitio',
-    'web_brand'                 => 'Tipo de marca web',
-    'about_settings_title'      => 'Acerca de Ajustes',
-    'about_settings_text'       => 'Estos ajustes te permiten personalizar ciertos aspectos de tu instalación.',
-    'labels_per_page'           => 'Etiquetas por pàgina',
-    'label_dimensions'          => 'Dimensiones de las etiquetas (pulgadas)',
+    'web_brand'                 => 'Tipo de marca en la web',
+    'about_settings_title'      => 'Acerca de las configuraciones',
+    'about_settings_text'       => 'Estas configuraciones le permiten personalizar ciertos aspectos de su instalación.',
+    'labels_per_page'           => 'Etiquetas por página',
+    'label_dimensions'          => 'Dimensiones de la etiqueta (pulgadas)',
     'next_auto_tag_base'        => 'Siguiente incremento automático',
-    'page_padding'              => 'Margenès de pàgina (pulgadas)',
-    'privacy_policy_link'       => 'Enlace a la Política de Privacidad',
+    'page_padding'              => 'Márgenes de página (pulgadas)',
+    'privacy_policy_link'       => 'Enlace a la política de privacidad',
     'privacy_policy'            => 'Política de Privacidad',
     'privacy_policy_link_help'  => 'Si se incluye una url aquí, un enlace a su política de privacidad se incluirá en el pie de página de la aplicación y en cualquier correo electrónico que el sistema envíe, de conformidad con el GDPR. ',
     'purge'                     => 'Purgar registros eliminados',
     'purge_deleted'             => 'Purgar eliminados ',
-    'labels_display_bgutter'    => 'Borde inferior de la Etiqueta',
-    'labels_display_sgutter'    => 'Borde lateral de la Etiqueta',
-    'labels_fontsize'           => 'Tamaño de fuente de la etiqueta',
+    'labels_display_bgutter'    => 'Borde inferior de la etiqueta',
+    'labels_display_sgutter'    => 'Borde lateral de la etiqueta',
+    'labels_fontsize'           => 'Tamaño de letra de la etiqueta',
     'labels_pagewidth'          => 'Ancho de la hoja de etiqueta',
     'labels_pageheight'         => 'Altura de la hoja de etiqueta',
-    'label_gutters'        => 'Espaciamiento de etiqueta (pulgadas)',
+    'label_gutters'        => 'Espacio entre etiquetas (pulgadas)',
     'page_dimensions'        => 'Dimensiones de la página (pulgadas)',
     'label_fields'          => 'Campos visibles de la etiqueta',
     'inches'        => 'pulgadas',
-    'width_w'        => 'an',
-    'height_h'        => 'al',
+    'width_w'        => 'ancho',
+    'height_h'        => 'alto',
     'show_url_in_emails'                => 'Enlace a Snipe-IT en correos electrónicos',
-    'show_url_in_emails_help_text'      => 'Desmarca esta casilla si no deseas volver a vincular tu instalación de Snipe-IT en tus pies de página de correo electrónico. Útil si la mayoría de sus usuarios nunca inician sesión.',
-    'text_pt'        => 'pt',
+    'show_url_in_emails_help_text'      => 'Desmarque esta casilla si no desea vincular su instalación de Snipe-IT en el pie de página de correo electrónico. Útil si la mayoría de sus usuarios nunca se conectan. ',
+    'text_pt'        => 'puntos',
     'thumbnail_max_h'   => 'Altura máxima de la miniatura',
-    'thumbnail_max_h_help'   => 'Altura máxima en píxeles que las miniaturas pueden mostrar en la vista de listado. Mín. 25, máximo 500.',
+    'thumbnail_max_h_help'   => 'Altura máxima en píxeles para mostrar las miniaturas en la vista de listado. Mín 25, máx 500.',
     'two_factor'        => 'Autenticación de dos factores',
     'two_factor_secret'        => 'Código de verificación de dos factores',
     'two_factor_enrollment'        => 'Inscripción en verificación de dos factores',
     'two_factor_enabled_text'        => 'Activar la verificación de dos factores',
     'two_factor_reset'        => 'Restablecer el secreto en verificación de dos factores',
-    'two_factor_reset_help'        => 'Esto obligará al usuario a volver a inscribir su dispositivo en su aplicación de autenticación. Esto puede ser útil si su dispositivo actualmente inscrito es perdido o robado. ',
-    'two_factor_reset_success'          => 'Verificación en dos pasos de dispositivo reiniciado exitosamente',
-    'two_factor_reset_error'          => 'Falló la Verificación en dos pasos del dispositivo',
+    'two_factor_reset_help'        => 'Esto obligará al usuario a inscribir de nuevo su dispositivo en su aplicación de autenticación. Esto puede ser útil en caso de pérdida o robo del dispositivo actualmente registrado. ',
+    'two_factor_reset_success'          => 'Dispositivo de verificación de dos factores restablecido correctamente',
+    'two_factor_reset_error'          => 'Error al restablecer el dispositivo de verificación de doble factor',
     'two_factor_enabled_warning'        => 'Al activar el doble factor si no está activado, se le obligará inmediatamente a autenticarse con un dispositivo registrado en Google Auth. Tendrá la posibilidad de inscribir su dispositivo si uno no está inscrito actualmente.',
-    'two_factor_enabled_help'        => 'Esto activará la autenticación de dos factores usando Google Authenticator.',
-    'two_factor_optional'        => 'Selectiva (los usuarios pueden activar o desactivar si está permitido)',
+    'two_factor_enabled_help'        => 'Esto activará la autenticación de dos factores mediante Google Authenticator.',
+    'two_factor_optional'        => 'Selectivo (los usuarios pueden activar o desactivar si está permitido)',
     'two_factor_required'        => 'Requerido para todos los usuarios',
     'two_factor_disabled'        => 'Desactivado',
     'two_factor_enter_code'	=> 'Ingrese el código de verificación de dos factores',
     'two_factor_config_complete'	=> 'Enviar código',
-    'two_factor_enabled_edit_not_allowed' => 'El administrador no permite modificar esta configuración.',
-    'two_factor_enrollment_text'	=> "Se requiere autenticación de dos factores, sin embargo su dispositivo aún no ha sido inscrito. Abra su aplicación Google Authenticator y escanee el código QR de abajo para inscribir su dispositivo. Una vez que lo haya inscrito, introduzca el código en la parte inferior",
+    'two_factor_enabled_edit_not_allowed' => 'El administrador no le permite modificar esta configuración.',
+    'two_factor_enrollment_text'	=> "Se requiere autenticación de dos factores, sin embargo su dispositivo aún no ha sido inscrito. Abra la aplicación Google Authenticator y escanee el código QR que aparece a continuación para registrar su dispositivo. Una vez que haya registrado su dispositivo, introduzca el código en la parte inferior",
     'require_accept_signature'      => 'Solicitar firma',
-    'require_accept_signature_help_text'      => 'Activar esta función requiere que los usuarios firmen físicamente aceptando un elemento.',
+    'require_accept_signature_help_text'      => 'Al activar esta función, los usuarios tendrán que firmar físicamente la aceptación de un activo.',
+    'require_checkinout_notes'  => 'Exigir notas en el ingreso/asignación',
+    'require_checkinout_notes_help_text'    => 'Al activar esta característica, los campos de notas deberán rellenarse al ingresar o asignar un activo.',
     'left'        => 'izquierda',
     'right'        => 'derecha',
     'top'        => 'arriba',
@@ -283,97 +295,195 @@ return [
     'vertical'        => 'vertical',
     'horizontal'        => 'horizontal',
     'unique_serial'                => 'Números de serie únicos',
-    'unique_serial_help_text'                => 'Al marcar esta casilla se forzarán números de serie únicos a los activos',
-    'zerofill_count'        => 'Longitud de etiquetas de activos, incluyendo relleno de ceros',
+    'unique_serial_help_text'                => 'Al marcar esta casilla, se aplicará una restricción a los activos para tener números de serie únicos',
+    'zerofill_count'        => 'Longitud de los números en las placas de los activos, incluyendo los ceros de relleno',
     'username_format_help'   => 'Esta configuración solo será utilizada por el proceso de importación si no se proporciona un nombre de usuario y tenemos que generar un nombre de usuario por usted.',
     'oauth_title' => 'Configuración de la API de OAuth',
-    'oauth_clients' => 'OAuth Clients',
+    'oauth_clients' => 'Clientes OAuth',
     'oauth' => 'OAuth',
-    'oauth_help' => 'Configuración de Endpoint Oauth',
-    'oauth_no_clients' => 'You have not created any OAuth clients yet.',
-    'oauth_secret' => 'Secret',
-    'oauth_authorized_apps' => 'Authorized Applications',
-    'oauth_redirect_url' => 'Redirect URL',
-    'oauth_name_help' => ' Something your users will recognize and trust.',
+    'oauth_help' => 'Configuración del punto final (endpoint) OAuth',
+    'oauth_no_clients' => 'Aún no ha creado ningún cliente OAuth.',
+    'oauth_secret' => 'Secreto',
+    'oauth_authorized_apps' => 'Aplicaciones autorizadas',
+    'oauth_redirect_url' => 'URL de redireccionamiento',
+    'oauth_name_help' => ' Algo que sus usuarios reconocerán y en lo que confiarán.',
     'oauth_scopes' => 'Scopes',
-    'oauth_callback_url' => 'Your application authorization callback URL.',
-    'create_client' => 'Create Client',
-    'no_scopes' => 'No scopes',
-    'asset_tag_title' => 'Actualizar configuración de etiquetas de activos',
-    'barcode_title' => 'Actualizar ajustes de código de barras',
+    'oauth_callback_url' => 'URL de devolución de llamada de autorización de su aplicación (callback URL).',
+    'create_client' => 'Crear cliente',
+    'no_scopes' => 'Sin scopes',
+    'asset_tag_title' => 'Actualizar la configuración de las placas de activos',
+    'barcode_title' => 'Actualizar la configuración de los códigos de barras',
     'barcodes' => 'Códigos de barras',
-    'barcodes_help_overview' => 'Ajustes de Código de barras &amp; QR',
+    'barcodes_help_overview' => 'Configuración de código de barras &amp; QR',
     'barcodes_help' => 'Esto intentará eliminar códigos de barras almacenados en caché. Normalmente solo se usa si la configuración del código de barras ha cambiado o si ha cambiado la URL de Snipe-IT. Los códigos de barras se volverán a generar la próxima vez que se acceda a ellos.',
     'barcodes_spinner' => 'Intentando eliminar archivos...',
     'barcode_delete_cache' => 'Borrar caché de código de barras',
-    'branding_title' => 'Actualizar ajustes de marca',
-    'general_title' => 'Actualizar ajustes generales',
+    'branding_title' => 'Actualizar la configuración de la marca',
+    'general_title' => 'Actualizar la configuración general',
     'mail_test' => 'Enviar prueba',
     'mail_test_help' => 'Esto intentará enviar un correo de prueba a :replyto.',
     'filter_by_keyword' => 'Filtrar por palabra clave',
     'security' => 'Seguridad',
-    'security_title' => 'Actualizar ajustes de seguridad',
-    'security_keywords' => 'contraseña, contraseñas, requisitos, dos factores, dos factores, contraseñas comunes, inicio de sesión remoto, autenticación',
-    'security_help' => 'Restricciones de contraseña, dos factores',
-    'groups_keywords' => 'permisos, grupos de permisos, autorización',
-    'groups_help' => 'Grupos de permisos de cuenta',
-    'localization' => 'Ubicación',
-    'localization_title' => 'Actualizar ajustes de Ubicación',
-    'localization_keywords' => 'ubicación, moneda, local, locale, zona horaria, zona horaria, internacional, internacionalización, idioma, idioma, traducción',
-    'localization_help' => 'Idioma, fecha mostrada',
+    'security_title' => 'Actualizar la configuración de seguridad',
+    'security_help' => 'Verificación de dos factores y restricciones de contraseña',
+    'groups_help' => 'Grupos de permisos',
+    'localization' => 'Localización',
+    'localization_title' => 'Actualizar la configuración de localización',
+    'localization_help' => 'Idioma, visualización de la fecha',
     'notifications' => 'Notificaciones',
-    'notifications_help' => 'Configuración de alertas por email y auditoría',
+    'notifications_help' => 'Configuración de alertas por correo electrónico y de auditoría',
     'asset_tags_help' => 'Incrementos y prefijos',
     'labels' => 'Etiquetas',
     'labels_title' => 'Actualizar configuración de etiquetas',
-    'labels_help' => 'Tamaños de etiqueta &amp; ajustes',
-    'purge_keywords' => 'eliminar permanentemente',
+    'labels_help' => 'Configuración de códigos de barras &amp; etiquetas',
     'purge_help' => 'Purgar registros eliminados',
     'ldap_extension_warning' => 'No parece que la extensión LDAP esté instalada o habilitada en este servidor. Todavía puede guardar su configuración, pero necesitará habilitar la extensión LDAP para PHP antes de que funcione la sincronización LDAP o el inicio de sesión.',
     'ldap_ad' => 'LDAP/AD',
+    'ldap_test_label' => 'Test LDAP Sync',
+    'ldap_test_login' => ' Test LDAP Login',
+    'ldap_username_placeholder' => 'LDAP Username',
+    'ldap_password_placeholder' => 'LDAP Password',
     'employee_number' => 'Número de empleado',
-    'create_admin_user' => 'Crear Usuario ::',
-    'create_admin_success' => '¡Éxito! ¡Tu usuario admin ha sido añadido!',
-    'create_admin_redirect' => '¡Haz clic aquí para acceder a tu aplicación!',
+    'create_admin_user' => 'Crear un usuario ::',
+    'create_admin_success' => '¡Éxito! ¡Su usuario admin ha sido añadido!',
+    'create_admin_redirect' => '¡Haga clic aquí para acceder a su aplicación!',
     'setup_migrations' => 'Migraciones de base de datos ::',
     'setup_no_migrations' => 'No hay nada que migrar. ¡Las tablas de la base de datos ya estaban configuradas!',
     'setup_successful_migrations' => 'Se han creado las tablas de la base de datos',
     'setup_migration_output' => 'Salida de Migración:',
     'setup_migration_create_user' => 'Siguiente: Crear usuario',
-    'ldap_settings_link' => 'Página de ajustes LDAP',
+    'ldap_settings_link' => 'Página de configuración de LDAP',
     'slack_test' => 'Prueba de integración de <i class="fab fa-slack"></i>',
-    'label2_enable'           => 'Nuevo motor de etiqueta',
+    'status_label_name' => 'Status Label Name',
+    'super_admin_only'  => 'Super Admin Only',
+    'label2_enable'           => 'Nuevo motor de etiquetas',
     'label2_enable_help'      => 'Cambiar al nuevo motor de etiquetas. <b>Nota: Deberá guardar esta configuración antes de configurar otros parámetros.</b>',
     'label2_template'         => 'Plantilla',
     'label2_template_help'    => 'Seleccione qué plantilla utilizar para la generación de etiquetas',
     'label2_title'            => 'Título',
     'label2_title_help'       => 'El título para mostrar en etiquetas que lo soportan',
     'label2_title_help_phold' => 'El marcador de posición <code>{COMPANY}</code> será reemplazado con el nombre de la compañía del activo',
-    'label2_asset_logo'       => 'Usar Logo de Activos',
+    'label2_asset_logo'       => 'Usar logo de activos',
     'label2_asset_logo_help'  => 'Utilice el logotipo de la compañía asignada, en lugar del valor en <code>:setting_name</code>',
     'label2_1d_type'          => 'Tipo de código de barras 1D',
     'label2_1d_type_help'     => 'Formato para códigos de barras 1D',
     'label2_2d_type'          => 'Tipo de códigos de barras 2D',
     'label2_2d_type_help'     => 'Formato para códigos de barras 2D',
     'label2_2d_target'        => 'Apuntamiento del código de barras 2D',
-    'label2_2d_target_help'   => 'La URL a la que apunta el código de barras 2D cuando se escanea',
-    'label2_fields'           => 'Definiciones de campo',
-    'label2_fields_help'      => 'Los campos pueden ser agregados, eliminados y reordenados en la columna izquierda. Para cada campo, múltiples opciones para Etiqueta y DataSource pueden ser agregadas, eliminadas y reordenadas en la columna derecha.',
+    'label2_2d_target_help'   => 'Los datos que incluirá el código de barra 2D',
+    'label2_fields'           => 'Definiciones del campo',
+    'label2_fields_help'      => 'Los campos se pueden añadir, eliminar y reordenar en la columna izquierda. Para cada campo, se pueden agregar, eliminar y reordenar múltiples opciones para etiquetas y para orígenes de datos en la columna derecha.',
+    'purge_barcodes' => 'Purge Barcodes',
     'help_asterisk_bold'    => 'Texto introducido como <code>**texto**</code> se mostrará como negrita',
     'help_blank_to_use'     => 'Deje en blanco para usar el valor de <code>:setting_name</code>',
-    'help_default_will_use' => '<code>:default</code> usará el valor de <code>:setting_name</code>. <br>Tenga en cuenta que el valor de los códigos de barra debe estar en cumplimiento con la especificación respectiva para que sean generados exitosamente. Por favor lea <a href="https://snipe-it.readme.io/docs/barcodes">la documentación <i class="fa fa-external-link"></i></a> para más detalles. ',
+    'help_default_will_use' => '<code>:default</code> usará el valor de <code>:setting_name</code>. <br>Tenga en cuenta que el valor de los códigos de barras debe cumplir la especificación respectiva para que sean generados exitosamente. Por favor lea <a href="https://snipe-it.readme.io/docs/barcodes">la documentación <i class="fa fa-external-link"></i></a> para más detalles. ',
+    'asset_id'              => 'ID del activo',
+    'data'               => 'Datos',
     'default'               => 'Por defecto',
     'none'                  => 'Ninguna',
     'google_callback_help' => 'Esto debe introducirse como URL de devolución de llamada (callback) en la configuración de su aplicación de Google OAuth en la <strong><a href="https://console.cloud.google.com/" target="_blank">consola de desarrollador de Google <i class="fa fa-external-link" aria-hidden="true"></i></a></strong> de su organización .',
     'google_login'      => 'Configuración de inicio de sesión de Google Workspace',
     'enable_google_login'  => 'Permitir a los usuarios iniciar sesión con Google Workspace',
-    'enable_google_login_help'  => 'Los usuarios no serán provistos automáticamente. Deben tener una cuenta existente aquí AND en Google Workspace, y su nombre de usuario debe coincidir con su dirección de correo electrónico de Google Workspace. ',
+    'enable_google_login_help'  => 'Los usuarios no serán creados automáticamente. Deben tener una cuenta existente aquí Y en Google Workspace, y su nombre de usuario aquí debe coincidir con su dirección de correo electrónico de Google Workspace. ',
     'mail_reply_to' => 'Dirección de respuesta de correo',
     'mail_from' => 'Correo desde la dirección',
     'database_driver' => 'Controlador de base de datos',
     'bs_table_storage' => 'Almacenamiento de tabla',
-    'timezone' => 'Timezone',
+    'timezone' => 'Zona horaria',
+    'test_mail' => 'Test Mail',
     'profile_edit'          => 'Editar perfil',
     'profile_edit_help'          => 'Permitir que los usuarios editen sus propios perfiles.',
+    'default_avatar' => 'Custom Default Avatar',
+    'default_avatar_help' => 'Esta imagen se mostrará como la imagen de perfil si el usuario no tiene foto de perfil.',
+    'restore_default_avatar' => 'Restaurar <a href=":default_avatar" data-toggle="lightbox" data-type="image">avatar original por defecto del sistema</a>',
+    'restore_default_avatar_help' => '',
+    'due_checkin_days' => 'Advertencia para próximos ingresos',
+    'due_checkin_days_help' => '¿Cuántos días antes de la fecha prevista de ingreso de un activo debe figurar en la página «Próximos a ingresar»?',
+    'no_groups' => 'Todavía no se han creado grupos. Para agregar uno, visite<code>Configuración de administración > Grupos de permisos</code>.',
+    'text' => 'Text',
+
+    'username_formats' => [
+        'username_format'		=> 'Formato del nombre de usuario',
+        'firstname_lastname_format'	=> 'First Name Last Name (jane.smith)',
+        'first_name_format'	        => 'First Name (jane)',
+        'last_name_format'		=> 'Last Name (doe)',
+        'filastname_format'			=> 'First Initial Last Name (jsmith)',
+        'lastnamefirstinitial_format' =>  'Last Name First Initial (smithj)',
+        'firstname_lastname_underscore_format' => 'First Name Last Name (jane_smith)',
+        'firstinitial.lastname' => 'First Initial Last Name (j.smith)',
+        'lastname_firstinitial' => 'Last Name First Initial (smith_j)',
+        'lastname_dot_firstinitial_format' => 'Last Name First Initial (smith.j)',
+        'firstnamelastname'     => 'First Name Last Name (janesmith)',
+        'firstnamelastinitial'  => 'First Name Last Initial (janes)',
+        'lastnamefirstname'      => 'Apellido.Nombre (smith.jane)',
+    ],
+
+    'email_formats' => [
+        'email_format'			=> 'Formato de correo electrónico',
+        'firstname_lastname_format'	=> 'Nombre y apellido (jane.smith@ejemplo.com)',
+        'first_name_format'		=> 'Nombre (jane@ejemplo.com)',
+        'last_name_format'		=> 'Last Name (doe@example.com)',
+        'filastname_format'			=> 'Inicial del nombre y apellido (jsmith@ejemplo.com)',
+        'lastnamefirstinitial_format' =>  'Apellido e inicial del nombre (smithj@example.com)',
+        'firstname_lastname_underscore_format' => 'Nombre y apellido (jane_smith@example.com)',
+        'firstinitial.lastname' => 'Inicial del nombre y apellido (j.smith@ejemplo.com)',
+        'lastname_firstinitial' => 'Apellido e inicial del nombre (smith_j@ejemplo.com)',
+        'lastname_dot_firstinitial_format' => 'Last Name First Initial (smith.j@example.com)',
+        'firstnamelastname'     => 'Nombre y apellido (janesmith@example.com)',
+        'firstnamelastinitial'  => 'Nombre e inicial del apellido(janes@example.com)',
+        'lastnamefirstname'      => 'Apellido.Nombre (smith.jane@example.com)',
+    ],
+
+
+
+    'logo_labels' => [
+        'acceptance_pdf_logo'       => 'PDF Logo',
+        'email_logo'                => 'Logo de correo electrónico',
+        'label_logo'                => 'Logo de etiqueta',
+        'logo'                      => 'Site Logo',
+        'favicon'                   => 'Favicon',
+    ],
+
+    'logo_help' => [
+        'email_logo_size'       => 'Los logotipos cuadrados en el correo electrónico se ven mejor. ',
+    ],
+
+    'logo_option_types' => [
+        'text' => 'Text',
+        'logo' => 'Logo',
+        'logo_and_text' => 'Logo and Text',
+    ],
+
+
+    'legends' => [
+        'scoping' => 'Scoping',
+        'formats' => 'Default Formats',
+        'profiles' => 'User Profiles',
+        'eula' => 'EULA & Acceptance Preferences',
+        'misc_display' => 'Miscellaneous Display Options',
+        'email' => 'Email Preferences',
+        'checkin' => 'Checkin Preferences',
+        'dashboard' => 'Login & Dashboard Preferences',
+        'misc' => 'Miscellaneous',
+        'logos' => 'Logos & Display',
+        'colors' => 'Colors & Skins',
+        'footer' => 'Footer Preferences',
+        'security' => 'Security Preferences',
+        'general' => 'General',
+        'intervals' => 'Intervals & Thresholds',
+    ],
+
+
+    /* Keywords for settings overview help */
+    'keywords' => [
+        'brand'             => 'pie de página, logotipo, impresión, tema, apariencia, encabezado, colores, color, css',
+        'general_settings'  => 'soporte de la compañía, firma, aceptación, formato de correo electrónico, formato de nombre de usuario, imágenes, por página, miniatura, acuerdo de uso, términos y condiciones, gravatar, términos de servicio, tablero de indicadores, privacidad',
+        'groups'            => 'permisos, grupos de permisos, autorización',
+        'labels'            => 'etiquetas, código de barras, código de barra, hojas, imprimir, upc, qr, 1d, 2d',
+        'localization'      => 'localización, moneda, local, ubicación, zona horaria, internacional, internacionalización, idioma, traducción',
+        'php_overview'      => 'phpinfo, sistema, información',
+        'purge'             => 'eliminar permanentemente',
+        'security'          => 'contraseña, contraseñas, requisitos, dos factores, contraseñas comunes, inicio de sesión remoto, autenticación',
+    ],
 
 ];
diff --git a/resources/lang/es-ES/admin/settings/message.php b/resources/lang/es-ES/admin/settings/message.php
index ab8bb87992..a50f047c2a 100644
--- a/resources/lang/es-ES/admin/settings/message.php
+++ b/resources/lang/es-ES/admin/settings/message.php
@@ -9,38 +9,51 @@ return [
     'backup' => [
         'delete_confirm'        => '¿Está seguro de que desea eliminar este archivo de respaldo? Esta acción no puede se puede deshacer. ',
         'file_deleted'          => 'El archivo de respaldo fue eliminado satisfactoriamente. ',
-        'generated'             => 'Un nuevo archivo de respaldo fue creado satisfactoriamente.',
-        'file_not_found'        => 'El archivo de respaldo no se ha encontrado en el servidor.',
+        'generated'             => 'Se ha creado correctamente un nuevo archivo de copia de seguridad.',
+        'file_not_found'        => 'Ese archivo de copia de seguridad no se pudo encontrar en el servidor.',
         'restore_warning'       => 'Sí, restaurarlo. Reconozco que esto sobrescribirá cualquier dato existente actualmente en la base de datos. Esto también cerrará la sesión de todos sus usuarios existentes (incluido usted).',
         'restore_confirm'       => '¿Está seguro que desea restaurar su base de datos desde :filename?'
     ],
+    'restore' => [
+        'success'               => 'Se ha restaurado la copia de seguridad de su sistema. Por favor, vuelva a iniciar sesión.'
+    ],
     'purge' => [
         'error'     => 'Ha ocurrido un error mientras se realizaba el purgado. ',
-        'validation_failed'     => 'Su confirmación de purga es incorrecta. Por favor, escriba la palabra "Borrar" en el cuadro de confirmación.',
+        'validation_failed'     => 'Su confirmación de purga es incorrecta. Por favor, escriba la palabra "DELETE" en el cuadro de confirmación.',
         'success'               => 'Registros eliminados correctamente purgados.',
     ],
     'mail' => [
-        'sending' => 'Enviando correo electrónico...',
+        'sending' => 'Enviando correo electrónico de prueba...',
         'success' => '¡Correo enviado!',
         'error' => 'El correo no pudo ser enviado.',
-        'additional' => 'Ningún mensaje de error adicional proporcionado. Comprueba la configuración de tu correo y el registro de tu aplicación.'
+        'additional' => 'No se proporciona ningún mensaje de error adicional. Compruebe la configuración de su correo y el registro de errores de la aplicación.'
     ],
     'ldap' => [
         'testing' => 'Probando conexión LDAP, Binding & Query ...',
-        '500' => 'Error 500 del servidor. Por favor, compruebe los registros de su servidor para más información.',
+        '500' => 'Error 500 del servidor. Por favor, compruebe los registros de error de su servidor para más información.',
         'error' => 'Algo salió mal :(',
         'sync_success' => 'Una muestra de 10 usuarios devueltos desde el servidor LDAP basado en su configuración:',
         'testing_authentication' => 'Probando autenticación LDAP...',
         'authentication_success' => 'Usuario autenticado contra LDAP con éxito!'
     ],
+    'labels' => [
+        'null_template' => 'Label template not found. Please select a template.',
+        ],
     'webhook' => [
         'sending' => 'Enviando mensaje de prueba de :app...',
-        'success' => '¡Su Integración :webhook_name funciona!',
-        'success_pt1' => '¡Éxito! Comprueba el ',
+        'success' => '¡Su integración :webhook_name funciona!',
+        'success_pt1' => '¡Éxito! Compruebe el ',
         'success_pt2' => ' para su mensaje de prueba, y asegúrese de hacer clic en GUARDAR abajo para guardar su configuración.',
         '500' => 'Error 500 del servidor.',
         'error' => 'Algo salió mal. :app respondió con: :error_message',
         'error_redirect' => 'ERROR: 301/302 :endpoint devuelve una redirección. Por razones de seguridad, no seguimos redirecciones. Por favor, utilice el punto final actual.',
         'error_misc' => 'Algo salió mal. :( ',
-    ]
+        'webhook_fail' => ' Notificación de webhook fallida: Compruebe que la URL sigue siendo válida.',
+        'webhook_channel_not_found' => ' webhook channel not found.',
+        'ms_teams_deprecation' => 'The selected Microsoft Teams webhook URL will be deprecated Dec 31st, 2025. Please use a workflow URL. Microsoft\'s documentation on creating a workflow can be found <a href="https://support.microsoft.com/en-us/office/create-incoming-webhooks-with-workflows-for-microsoft-teams-8ae491c7-0394-4861-ba59-055e33f75498" target="_blank"> here.</a>',
+    ],
+    'location_scoping' => [
+        'not_saved' => 'Your settings were not saved.',
+        'mismatch' => 'There is 1 item in the database that need your attention before you can enable location scoping.|There are :count items in the database that need your attention before you can enable location scoping.',
+    ],
 ];
diff --git a/resources/lang/es-ES/admin/statuslabels/message.php b/resources/lang/es-ES/admin/statuslabels/message.php
index 932c8225a0..d9cf943fcf 100644
--- a/resources/lang/es-ES/admin/statuslabels/message.php
+++ b/resources/lang/es-ES/admin/statuslabels/message.php
@@ -7,7 +7,7 @@ return [
     'assoc_assets'	 => 'Esta etiqueta de estado está actualmente asociada con al menos un activo y no se puede eliminar. Por favor actualice sus activos para que ya no hagan referencia a este estado e inténtelo de nuevo. ',
 
     'create' => [
-        'error'   => 'Etiqueta de estado no fue creada, por favor, inténtelo de nuevo.',
+        'error'   => 'La etiqueta de estado no pudo ser creada, por favor inténtelo de nuevo.',
         'success' => 'Etiqueta de estado fue creada exitosamente.',
     ],
 
@@ -23,9 +23,9 @@ return [
     ],
 
     'help' => [
-        'undeployable'   => 'Estos activos no pueden asignarse a nadie.',
+        'undeployable'   => 'Estos activos no pueden ser asignados.',
         'deployable'   => 'Estos activos pueden ser asignados. Una vez estén asignados, asumirán el meta estado de <i class="fas fa-circle text-blue"></i> <strong>Asignado</strong>.',
-        'archived'   => 'Estos equipos no pueden ser asignados y solo se mostrarán en la vista de Archivados. Esto es útil para mantener información de activos por razones de presupuesto o de revisión histórica y al mismo tiempo se excluyen de los activos que se pueden usar en el día a día.',
+        'archived'   => 'Estos activos no pueden ser asignados y solo se mostrarán en la vista de Archivados. Esto es útil para mantener información de activos por razones de presupuesto o de revisión histórica y al mismo tiempo se excluyen de los activos que se pueden usar en el día a día.',
         'pending'   => 'Estos activos aún no pueden asignarse, y suelen utilizarse para elementos que están en reparación, pero que se espera que regresen a circulación.',
     ],
 
diff --git a/resources/lang/es-ES/admin/statuslabels/table.php b/resources/lang/es-ES/admin/statuslabels/table.php
index f9f487f28d..05daeda180 100644
--- a/resources/lang/es-ES/admin/statuslabels/table.php
+++ b/resources/lang/es-ES/admin/statuslabels/table.php
@@ -1,19 +1,19 @@
 <?php
 
 return array(
-    'about'      	=> 'Acerca de las etiquetas de estado',
+    'about'      	=> 'About Status Types',
     'archived'      	=> 'Archivado',
     'create'      	=> 'Crear etiqueta de estado',
     'color'      	=> 'Color en el gráfico',
     'default_label' => 'Etiqueta predeterminada',
     'default_label_help' => 'Esto se usa para asegurar que sus etiquetas de estado que utiliza con más frecuencia aparezcan en la parte superior del cuadro de selección al crear / editar activos.',
     'deployable'      	=> 'Utilizable',
-    'info'      	=> 'Las etiquetas de estado se usan para describir los diferentes estados en que pueden estar sus equipos. Por ejemplo: en reparación, perdidos/robados, etc. Puede crear nuevas etiquetas de estado para equipos utilizables, pendientes o archivados.',
+    'info'      	=> 'Status label types are used to describe the various states your assets could be in. They may be out for repair, lost/stolen, etc. You can create new status labels for your deployable, pending and archived assets according to your own workflow. For more information, <a href="https://snipe-it.readme.io/docs/overview#status-labels" target="_blank">see the documentation <i class="fa fa-external-link"></i></a>.',
     'name'      	=> 'Nombre de estado',
     'pending'      	=> 'Pendiente',
     'status_type'   => 'Tipo de estado',
     'show_in_nav'   => 'Mostrar en la barra lateral',
     'title'      	=> 'Etiquetas de estado',
     'undeployable'  => 'No utilizable',
-    'update'      	=> 'Actualizar Etiqueta Estado',
+    'update'      	=> 'Actualizar la etiqueta de estado',
 );
diff --git a/resources/lang/es-ES/admin/suppliers/message.php b/resources/lang/es-ES/admin/suppliers/message.php
index d6f1924481..deaffc312f 100644
--- a/resources/lang/es-ES/admin/suppliers/message.php
+++ b/resources/lang/es-ES/admin/suppliers/message.php
@@ -3,26 +3,26 @@
 return array(
 
     'deleted' => 'Proveedor eliminado',
-    'does_not_exist' => 'Proveedor does not exist.',
+    'does_not_exist' => 'El proveedor no existe.',
 
 
     'create' => array(
-        'error'   => 'Proveedor no creado, Intentalo de nuevo.',
-        'success' => 'Proveedor creado.'
+        'error'   => 'El proveedor no fue creado, por favor inténtelo de nuevo.',
+        'success' => 'Proveedor creado con éxito.'
     ),
 
     'update' => array(
-        'error'   => 'Proveedor no actualizado, Intentalo de nuevo',
+        'error'   => 'El proveedor no fue actualizado, por favor inténtelo de nuevo',
         'success' => 'Proveedor actualizado.'
     ),
 
     'delete' => array(
         'confirm'   => '¿Está seguro de que desea eliminar este proveedor?',
-        'error'   => 'Ha habido un problema eliminando el Proveedor. Intentalo de nuevo.',
-        'success' => 'Proveedor eliminado.',
-        'assoc_assets'	 => 'Este proveedor esta asociado a uno o más modelos y no puede ser eliminado. ',
-        'assoc_licenses'	 => 'Este proveedor está actualmente asociado con :licenses_count licencia(s) y no puede ser eliminado. Por favor, actualiza tus licencias para no referenciar este proveedor e inténtalo de nuevo. ',
-        'assoc_maintenances'	 => 'Este proveedor está actualmente asociado con :asset_maintenances_count mantenedor(es) de activo y no puede ser eliminado. Por favor, actualiza tus mantenedores de activo para no referenciar este proveedor e inténtalo de nuevo. ',
+        'error'   => 'Hubo un problema al eliminar el proveedor, por favor inténtelo de nuevo.',
+        'success' => 'Proveedor eliminado correctamente.',
+        'assoc_assets'	 => 'Este proveedor está actualmente asociado con :asset_count activo(s) y no puede ser eliminado. Actualice sus activos para que ya no hagan referencia a este proveedor e inténtelo de nuevo. ',
+        'assoc_licenses'	 => 'Este proveedor está asociado actualmente con :licenses_count licences(s) y no puede ser eliminado. Actualice sus licencias para que ya no hagan referencia a este proveedor e inténtelo de nuevo. ',
+        'assoc_maintenances'	 => 'Este proveedor está actualmente asociado con :asset_maintainances_count mantenimiento(s) de activo(s) y no puede ser eliminado. Por favor, actualice el mantenimiento de sus activos para no hacer referencia a este proveedor y vuelva a intentarlo. ',
     )
 
 );
diff --git a/resources/lang/es-ES/admin/suppliers/table.php b/resources/lang/es-ES/admin/suppliers/table.php
index 02804f2fa8..b918b4f381 100644
--- a/resources/lang/es-ES/admin/suppliers/table.php
+++ b/resources/lang/es-ES/admin/suppliers/table.php
@@ -1,25 +1,25 @@
 <?php
 
 return array(
-    'about_suppliers_title' => 'Acerca de Proveedores',
-    'about_suppliers_text'  => 'Los Proveedores son utilizados para hacer seguimiento de la fuente de los items',
-    'address'               => 'Dirección del Proveedor',
-    'assets'                => 'Equipos',
+    'about_suppliers_title' => 'Acerca de los proveedores',
+    'about_suppliers_text'  => 'Los proveedores se utilizan para hacer seguimiento al origen de los elementos',
+    'address'               => 'Dirección del proveedor',
+    'assets'                => 'Activos',
     'city'                  => 'Ciudad',
-    'contact'               => 'Nombre Contacto',
+    'contact'               => 'Nombre de contacto',
     'country'               => 'País',
-    'create'                => 'Crear Proveedor',
+    'create'                => 'Crear un proveedor',
     'email'                 => 'Correo electrónico',
     'fax'                   => 'Fax',
     'id'                    => 'ID',
     'licenses'              => 'Licencias',
-    'name'                  => 'Nombre',
+    'name'                  => 'Nombre del proveedor',
     'notes'                 => 'Notas',
     'phone'                 => 'Teléfono',
     'state'                 => 'Provincia',
     'suppliers'             => 'Proveedores',
-    'update'                => 'Actualizar Proveedor',
-    'view'                  => 'Ver Proveedor',
+    'update'                => 'Actualizar proveedor',
+    'view'                  => 'Ver proveedor',
     'view_assets_for'       => 'Ver activos para',
     'zip'                   => 'Código postal',
 
diff --git a/resources/lang/es-ES/admin/users/general.php b/resources/lang/es-ES/admin/users/general.php
index 6581c8f5c1..7067a262fd 100644
--- a/resources/lang/es-ES/admin/users/general.php
+++ b/resources/lang/es-ES/admin/users/general.php
@@ -1,43 +1,45 @@
 <?php
 
 return [
-    'activated_help_text' => 'Este usuario puede ingresar',
-    'activated_disabled_help_text' => 'No puedes editar el estado de activación de tu propia cuenta.',
-    'assets_user'       => 'Equipos asignados a :name',
+    'activated_help_text' => 'Este usuario puede iniciar sesión',
+    'activated_disabled_help_text' => 'No puede editar el estado de activación de su propia cuenta.',
+    'assets_user'       => 'Activos asignados a :name',
     'bulk_update_warn'	=> 'Está a punto de modificar las propiedades de :user_count usuarios. Por favor, tenga en cuenta que no puede modificar las propiedades de su propio usuario con este formulario, y debe realizar las modificaciones a su propio usuario de forma individual.',
-    'bulk_update_help'	=> 'Este formulario permite actualizar múltiples usuarios simultáneamente. Rellena únicamente los campos que necesites cambiar. Cualquier campo que quede en blanco no se actualizará.',
-    'current_assets'    => 'Equipos checked out a este usuario',
-    'clone'             => 'Clonar Usuario',
-    'contact_user'      => 'Contacta con :name',
-    'edit'              => 'Editar Usuario',
+    'bulk_update_help'	=> 'Este formulario le permite actualizar varios usuarios a la vez. Solo diligencie los campos que necesita modificar. Los campos que queden en blanco no se modificarán.',
+    'current_assets'    => 'Activos actualmente asignados a este usuario',
+    'clone'             => 'Clonar usuario',
+    'contact_user'      => 'Contacto :name',
+    'edit'              => 'Editar usuario',
     'filetype_info'     => 'Tipos de archivos permitidos son png, gif, jpg, jpeg, doc, docx, pdf, txt, zip, y rar.',
     'history_user'      => 'Historial de :name',
     'info'				=> 'Información',
     'restore_user'		=> 'Haga clic aquí para restaurarlos.',
     'last_login'        => 'Último acceso',
-    'ldap_config_text'  => 'Las configuraciones de LDAP estàn en: Admin -> Settings. La ubicaciòn seleccionadada sera asignada a todos los usuarios importados.',
+    'ldap_config_text'  => 'Los ajustes de configuración para LDAP se pueden encontrar en Administrador> LDAP. La ubicación (opcional) seleccionada se establecerá para todos los usuarios importados.',
     'print_assigned'    => 'Imprimir todos los asignados',
     'email_assigned'    => 'Enviar correo con todos los asignados',
-    'user_notified'     => 'Se ha enviado un correo al usuario con sus artículos actualmente asignados.',
+    'user_notified'     => 'Se ha enviado al usuario un correo electrónico con lista de los elementos que tiene asignados actualmente.',
+    'users_notified'    => 'The user has been emailed a list of their currently assigned items.|:count users have been emailed a list of their currently assigned items.',
+    'users_notified_warning' => ':count user has been emailed a list of their currently assigned items, however :no_email users did not have an email address so could not be emailed.|:count users have been emailed a list of their currently assigned items, however :no_email user(s) did not have an email address so could not be emailed.',
     'auto_assign_label' => 'Incluir a este usuario al asignar automáticamente licencias elegibles',
     'auto_assign_help'  => 'Omitir este usuario en la asignación automática de licencias',
     'software_user'     => 'Software asignado a :name',
     'send_email_help'   => 'Debe proporcionar una dirección de correo electrónico para este usuario para poder enviarle las credenciales. Únicamente pueden enviarse las credenciales por correo eléctronico durante la creación del usuario. Las contraseñas se almacenan en un hash de un solo sentido y no se pueden recuperar una vez guardadas.',
-    'view_user'         => 'Ver Usuario :name',
+    'view_user'         => 'Ver usuario :name',
     'usercsv'           => 'Archivo CSV',
     'two_factor_admin_optin_help' => 'La configuración actual permite la aplicación selectiva de la autenticación de dos factores.  ',
-    'two_factor_enrolled' => 'Dispositivo 2FA inscrito ',
+    'two_factor_enrolled' => 'Dispositivo con 2FA inscrito ',
     'two_factor_active'   => '2FA activo ',
-    'user_deactivated'  => 'Usuario no puede iniciar sesión',
-    'user_activated'  => 'Usuario puede iniciar sesión',
+    'user_deactivated'  => 'El usuario no puede iniciar sesión',
+    'user_activated'  => 'El usuario puede iniciar sesión',
     'activation_status_warning' => 'No cambiar el estado de activación',
     'group_memberships_helpblock' => 'Sólo los superadministradores pueden editar pertenencias a grupo.',
     'superadmin_permission_warning' => 'Sólo los superadministradores pueden conceder acceso a un usuario superadministrador.',
     'admin_permission_warning' => 'Sólo los usuarios con derechos de administrador o mayores pueden conceder acceso de administrador a los usuarios.',
     'remove_group_memberships' => 'Eliminar pertenencias a grupo',
-    'warning_deletion_information' => 'Está a punto de devolver TODOS los elementos de :count usuario(s) listados a continuación. Los nombres de usuarios con permisos Super Administrador están resaltados en rojo.',
+    'warning_deletion_information' => 'Está a punto de ingresar TODOS los elementos de :count usuario(s) listados a continuación. Los nombres de usuarios con permisos Super Administrador están resaltados en rojo.',
     'update_user_assets_status' => 'Actualizar todos los activos para estos usuarios a este estado',
-    'checkin_user_properties' => 'Disponibilizar todas las propiedades asociadas a estos usuarios',
+    'checkin_user_properties' => 'Comprobar todas las propiedades asociadas a estos usuarios',
     'remote_label'   => 'Este es un usuario remoto',
     'remote'   => 'Remoto',
     'remote_help' => 'Esto puede ser útil si necesita filtrar por usuarios remotos que nunca o raramente asisten a sus ubicaciones físicas.',
@@ -46,9 +48,9 @@ return [
     'vip_help' => 'Esto puede ser útil como indicador de personas importantes en su organización si desea tratarlas de forma especial.',
     'create_user' => 'Crear un usuario',
     'create_user_page_explanation' => 'Esta es la información de la cuenta que usará para acceder al sitio por primera vez.',
-    'email_credentials' => 'Credenciales de email',
-    'email_credentials_text' => 'Enviar mis credenciales a la dirección de correo de arriba',
+    'email_credentials' => 'Credenciales de correo electrónico',
+    'email_credentials_text' => 'Enviar mis credenciales a la dirección de correo electrónico de arriba',
     'next_save_user' => 'Siguiente: Guardar usuario',
     'all_assigned_list_generation' => 'Generado el:',
-    'email_user_creds_on_create' => '¿Enviar a este usuario sus credenciales?',
+    'email_user_creds_on_create' => '¿Enviar las credenciales por correo electrónico a este usuario?',
 ];
diff --git a/resources/lang/es-ES/admin/users/message.php b/resources/lang/es-ES/admin/users/message.php
index 5097396266..c0d60c151f 100644
--- a/resources/lang/es-ES/admin/users/message.php
+++ b/resources/lang/es-ES/admin/users/message.php
@@ -3,10 +3,10 @@
 return array(
 
     'accepted'                  => 'Ha aceptado este artículo exitosamente.',
-    'declined'                  => 'Ha declinado con éxito este equipo.',
-    'bulk_manager_warn'	        => 'Sus usuarios han sido actualizados con éxito, sin embargo, la entrada de administrador no fue guardada porque el gerente seleccionado también estaba en la lista de usuarios a ser editada, y los usuarios no pueden ser sus propios gerentes. Vuelva a seleccionar los usuarios, excluyendo al gerente.',
-    'user_exists'               => 'El Usuario ya existe!',
-    'user_not_found'            => 'Usuario inexistente.',
+    'declined'                  => 'Ha rechazado correctamente este activo.',
+    'bulk_manager_warn'	        => 'Sus usuarios han sido actualizados con éxito, sin embargo, la entrada supervisor (manager) no fue guardada porque el supervisor seleccionado también estaba en la lista de usuarios a editar, y los usuarios no pueden ser su propio supervisor. Vuelva a seleccionar los usuarios, excluyendo al supervisor.',
+    'user_exists'               => '¡El usuario ya existe!',
+    'user_not_found'            => 'El usuario no existe o usted no tiene permisos para verlo.',
     'user_login_required'       => 'El campo usuario es obligatorio',
     'user_has_no_assets_assigned' => 'No hay activos asignados al usuario.',
     'user_password_required'    => 'La contraseña es obligatoria.',
@@ -16,7 +16,7 @@ return array(
     'password_resets_sent'      => 'A los usuarios seleccionados que están activados y tienen una dirección de correo electrónico válida se les ha enviado un enlace de restablecimiento de contraseña.',
     'password_reset_sent'       => '¡Se ha enviado un enlace de restablecimiento de contraseña a :email!',
     'user_has_no_email'         => 'Este usuario no tiene una dirección de correo electrónico en su perfil.',
-    'log_record_not_found'        => 'No se pudo encontrar un registro de registro coincidente para este usuario.',
+    'log_record_not_found'        => 'No se pudo encontrar un registro de eventos que coincida con este usuario.',
 
 
     'success' => array(
@@ -33,38 +33,39 @@ return array(
     ),
 
     'error' => array(
-        'create' => 'Ha habido un problema creando el Usuario. Intentalo de nuevo.',
-        'update' => 'Ha habido un problema actualizando el Usuario. Intentalo de nuevo.',
-        'delete' => 'Ha habido un problema eliminando el  Usuario. Intentalo de nuevo.',
-        'delete_has_assets' => 'Este usuario tiene elementos asignados y no se pueden eliminar.',
-        'delete_has_assets_var' => 'Este usuario todavía tienen un activo asignado. Por favor devuélvalo primero.| Este usuario todavía tienen :count activos asignados. Por favor devuélvalos primero.',
-        'delete_has_licenses_var' => 'Este usuario todavía tiene una licencia asignada. Por favor primero haga su devolución.|Este usuario todavía tiene :count licencias asignadas. Por favor primero haga su devolución.',
-        'delete_has_accessories_var' => 'Este usuario todavía tiene un accesorio asignado. Por favor primero haga su devolución.|Este usuario todavía tiene :count accesorios asignados. Por favor primero haga su devolución.',
-        'delete_has_locations_var' => 'Este usuario todavía supervisa una ubicación. Por favor seleccione otro supervisor primero.|Este usuario todavía supervisa :count ubicaciones. Por favor seleccione otro supervisor primero.',
+        'create' => 'Hubo un problema al crear el usuario. Por favor, inténtelo de nuevo.',
+        'update' => 'Hubo un problema al actualizar el usuario. Por favor, inténtelo de nuevo.',
+        'delete' => 'Hubo un problema al eliminar el usuario. Por favor, inténtelo de nuevo.',
+        'delete_has_assets' => 'Este usuario tiene elementos asignados y no se pudo eliminar.',
+        'delete_has_assets_var' => 'Este usuario todavía tiene un activo asignado. Por favor ingréselo primero.|Este usuario todavía tiene :count activos asignados. Por favor ingréselos primero.',
+        'delete_has_licenses_var' => 'Este usuario todavía tiene una licencia asignada. Por favor ingrésela primero.|Este usuario todavía tiene :count licencias asignadas. Por favor ingréselas primero.',
+        'delete_has_accessories_var' => 'Este usuario todavía tiene un accesorio asignado. Por favor ingréselo primero.|Este usuario todavía tiene :count accesorios asignados. Por favor ingréselos primero.',
+        'delete_has_locations_var' => 'Este usuario todavía supervisa una ubicación. Por favor primero seleccione otro supervisor.|Este usuario todavía supervisa :count ubicaciones. Por favor primero seleccione otro supervisor.',
         'delete_has_users_var' => 'Este usuario todavía supervisa a otro usuario. Por favor primero seleccione otro supervisor para ese usuario.|Este usuario todavía supervisa :count usuarios. Por favor primero seleccione otro supervisor para ellos.',
-        'unsuspend' => 'Ha habido un problema marcando como no suspendido el Usuario. Intentalo de nuevo.',
+        'unsuspend' => 'Hubo un problema marcando como no suspendido al usuario. Por favor, inténtelo de nuevo.',
         'import'    => 'Ha habido un problema importando los usuarios. Por favor intente nuevamente.',
         'asset_already_accepted' => 'Este equipo ya ha sido aceptado.',
         'accept_or_decline' => 'Debe aceptar o rechazar este equipo.',
         'cannot_delete_yourself' => 'Nos sentiríamos muy mal si usted se eliminara, por favor reconsidérelo.',
         'incorrect_user_accepted' => 'El elemento que ha intentado aceptar no fue asignado a usted.',
-        'ldap_could_not_connect' => 'No se ha podido conectar con el servidor LDAP. Por favor verifique la configuración de su servidor LDAP en su archivo de configuración.<br> Error del servidor LDAP:',
-        'ldap_could_not_bind' => 'No se ha podido vincular con el servidor LDAP. Por favor verifique la configuración de su servidor LDAP en su archivo de configuración.<br> Error del servidor LDAP: ',
-        'ldap_could_not_search' => 'No se ha podido buscar en el servidor LDAP. Por favor verifique la configuración de su servidor LDAP en su archivo de configuración.<br> Error del servidor LDAP:',
+        'ldap_could_not_connect' => 'No se pudo conectar al servidor LDAP. Por favor, compruebe la configuración del servidor LDAP en el archivo de configuración LDAP. <br>Error del servidor LDAP:',
+        'ldap_could_not_bind' => 'No se ha podido vincular al servidor LDAP. Por favor verifique la configuración de su servidor LDAP en su archivo de configuración.<br> Error del servidor LDAP: ',
+        'ldap_could_not_search' => 'No se pudo buscar en el servidor LDAP. Por favor, compruebe la configuración del servidor LDAP en el archivo de configuración LDAP. <br>Error del servidor LDAP:',
         'ldap_could_not_get_entries' => 'No se han podido obtener entradas del servidor LDAP. Por favor verifique la configuración de su servidor LDAP en su archivo de configuración.<br> Error del servidor LDAP:',
         'password_ldap' => 'La contraseña para esta cuenta es administrada por LDAP / Active Directory. Póngase en contacto con su departamento de TI para cambiar su contraseña.',
+        'multi_company_items_assigned' => 'Este usuario tiene elementos asignados que pertenecen a una empresa diferente. Por favor, ingréselos o edite su empresa.'
     ),
 
     'deletefile' => array(
-        'error'   => 'Archivo no eliminado. Por favor, vuelva a intentarlo.',
+        'error'   => 'El archivo no fue borrado. Por favor, inténtelo de nuevo.',
         'success' => 'Archivo eliminado correctamente.',
     ),
 
     'upload' => array(
         'error'   => 'Archivo(s) no cargado. Por favor, vuelva a intentarlo.',
         'success' => 'Archivo(s) cargado correctamente.',
-        'nofiles' => 'No ha seleccionado ningún archivo para subir',
-        'invalidfiles' => 'Uno o más sus archivos es demasiado grande o es de un tipo no permitido. Los tipos de archivo permitidos son png, gif, jpg, doc, docx, pdf y txt.',
+        'nofiles' => 'No seleccionó ningún archivo para cargar',
+        'invalidfiles' => 'Uno o más de sus archivos son demasiado grandes o son de un tipo de archivo que no está permitido. Los tipos de archivo permitidos son png, gif, jpg, doc, docx, pdf y txt.',
     ),
 
     'inventorynotification' => array(
diff --git a/resources/lang/es-ES/admin/users/table.php b/resources/lang/es-ES/admin/users/table.php
index d448f5d66e..a92ca81dcb 100644
--- a/resources/lang/es-ES/admin/users/table.php
+++ b/resources/lang/es-ES/admin/users/table.php
@@ -3,26 +3,26 @@
 return array(
     'activated'  			=> 'Activo',
     'allow'  				=> 'Permitir',
-    'checkedout'  			=> 'Equipos',
+    'checkedout'  			=> 'Activos',
     'created_at' 			=> 'Creado',
-    'createuser' 			=> 'Crear Usuario',
+    'createuser' 			=> 'Crear usuario',
     'deny'  				=> 'Denegar',
     'email'      			=> 'Correo electrónico',
     'employee_num'      	=> 'No. Empleado',
     'first_name' 			=> 'Nombre',
     'groupnotes'			=> 'Seleccione un grupo para asignar al usuario, recuerde que un usuario asume los permisos del grupo al que se le asigna. Use ctrl+click (o cmd+click en MacOS) para anular la selección de grupos.',
-    'id'         			=> 'ID',
+    'id'         			=> 'Id',
     'inherit'  				=> 'Hereda de',
     'job' 					=> 'Cargo',
-    'last_login'  			=> 'Ultimo Login',
+    'last_login'  			=> 'Último inicio de sesión',
     'last_name'  			=> 'Apellidos',
     'location'  			=> 'Ubicación',
-    'lock_passwords'		=> 'Los detalles de acceso no pueden ser cambiados en esta instalación.',
+    'lock_passwords'		=> 'Los detalles de inicio de sesión no pueden ser cambiados en esta instalación.',
     'manager' 				=> 'Supervisor',
     'managed_locations'     => 'Ubicaciones gestionadas',
     'managed_users'         => 'Usuarios gestionados',
-    'name' 					=> 'Usuario',
-    'nogroup'               => 'Aún no se han creado grupos. Para añadir uno, visite: ',
+    'name' 					=> 'Nombre',
+    'nogroup'               => 'Aún no se han creado grupos. Para añadir uno, visite:',
     'notes'                 => 'Notas',
     'password_confirm' 		=> 'Confirmar Password',
     'password' 				=> 'Contraseña',
@@ -31,11 +31,11 @@ return array(
     'show_deleted'          => 'Mostrar usuarios eliminados',
     'title' 				=> 'Cargo',
 	'to_restore_them'		=> 'para restaurarlos.',
-    'total_assets_cost'     => "Coste total de activos",
-    'updateuser' 			=> 'Actualizar Usuario',
-    'username' 				=> 'Usuario',
+    'total_assets_cost'     => "Costo total de activos",
+    'updateuser' 			=> 'Actualizar usuario',
+    'username' 				=> 'Nombre de usuario',
 	'user_deleted_text' 	=> 'Este usuario ha sido marcado como eliminado.',
     'username_note' 		=> '(Esto se usa solo para la conexión con Active Directory, no para el inicio de sesión.)',
-    'cloneuser'             => 'Clonar Usuario',
-    'viewusers' 			=> 'Ver Usuarios',
+    'cloneuser'             => 'Clonar usuario',
+    'viewusers' 			=> 'Ver usuarios',
 );
diff --git a/resources/lang/es-ES/auth.php b/resources/lang/es-ES/auth.php
index 387ea794b6..d4c25934f4 100644
--- a/resources/lang/es-ES/auth.php
+++ b/resources/lang/es-ES/auth.php
@@ -15,6 +15,6 @@ return array(
 
     'failed' => 'Estas credenciales no coinciden con nuestros registros.',
     'password' => 'La contraseña proporcionada es incorrecta.',
-    'throttle' => 'Demasiados intentos de inicio de sesión. Por favor, inténtalo de nuevo en :seconds segundos.',
+    'throttle' => 'Too many login attempts. Please try again in :minutes minute(s).',
 
 );
diff --git a/resources/lang/es-ES/auth/general.php b/resources/lang/es-ES/auth/general.php
index db35275e42..1f56aa644d 100644
--- a/resources/lang/es-ES/auth/general.php
+++ b/resources/lang/es-ES/auth/general.php
@@ -2,17 +2,17 @@
 
 return [
     'send_password_link'	        => 'Enviar enlace de restablecimiento de contraseña',
-    'email_reset_password'			=> 'Enviar correo',
-    'reset_password'			    => 'Restablecer Contraseña',
+    'email_reset_password'			=> 'Enviar correo electrónico para restablecer la contraseña',
+    'reset_password'			    => 'Restablecer contraseña',
     'saml_login'                    => 'Iniciar sesión a través de SAML',
-    'login'                         => 'Iniciar Sesión',
+    'login'                         => 'Iniciar sesión',
     'login_prompt'                  => 'Por favor inicie sesión',
-    'forgot_password'               => 'He olvidado mi contraseña',
+    'forgot_password'               => 'Olvidé mi contraseña',
     'ldap_reset_password'           => 'Haga clic aquí para restablecer su contraseña LDAP',
     'remember_me'                   => 'Recordarme',
     'username_help_top'                 => 'Ingrese su <strong>nombre de usuario</strong> para enviar un enlace de restablecimiento de contraseña.',
     'username_help_bottom'          => 'Su nombre de usuario y correo electrónico <em>pueden</em> ser el mismo, pero puede que no lo sean, dependiendo de su configuración. Si no recuerda su nombre de usuario, contacte al administrador. <br><br><strong>A los nombres de usuario que no tengan un correo electrónico asociado, no se les enviará el enlace de cambio de contraseña.</strong> ',
     'google_login'                  => 'Iniciar sesión con Google Workspace',
-    'google_login_failed'           => 'Error al iniciar sesión en Google. Vuelve a intentarlo.',
+    'google_login_failed'           => 'Error al iniciar sesión en Google, por favor, vuelva a intentarlo.',
 ];
 
diff --git a/resources/lang/es-ES/auth/message.php b/resources/lang/es-ES/auth/message.php
index c89da8182b..f2da9b689c 100644
--- a/resources/lang/es-ES/auth/message.php
+++ b/resources/lang/es-ES/auth/message.php
@@ -2,45 +2,43 @@
 
 return array(
 
-    'account_already_exists' => 'Ya existe un usuario con este e-mail.',
-    'account_not_found'      => 'El nombre de usuario o contraseña es incorrecta.',
-    'account_not_activated'  => 'Este usuario no está activado.',
-    'account_suspended'      => 'Este usuario está desactivado.',
-    'account_banned'         => 'Este usuario ha sido expulsado.',
-    'throttle'               => 'Demasiados intentos de inicio de sesión fallidos. Por favor, intente otra vez en alrededor de :minutes minuto/s.',
+    'account_already_exists' => 'Ya existe una cuenta con este correo electrónico.',
+    'account_not_found'      => 'El nombre de usuario o la contraseña son incorrectos.',
+    'account_not_activated'  => 'Esta cuenta de usuario no está activada.',
+    'account_suspended'      => 'Esta cuenta de usuario está suspendida.',
 
     'two_factor' => array(
         'already_enrolled'      => 'Su dispositivo ya está inscrito.',
-        'success'               => 'Usted inició sesión correctamente.',
-        'code_required'         => 'Se requiere el código de 2FA(Autenticación en dos pasos) .',
+        'success'               => 'Ha iniciado sesión exitosamente.',
+        'code_required'         => 'Se requiere el código de autenticación de doble factor (2FA).',
         'invalid_code'          => 'El código de doble factor es inválido.',
-        'enter_two_factor_code' => 'Please enter your two-factor authentication code.',
-        'please_enroll'         => 'Please enroll a device in two-factor authentication.',
+        'enter_two_factor_code' => 'Por favor ingrese su código de autenticación de doble factor.',
+        'please_enroll'         => 'Por favor inscriba un dispositivo en la autenticación de dos factores.',
     ),
 
     'signin' => array(
-        'error'   => 'Ha habido un problema al iniciar sesión. Por favor, vuelve a intentarlo.',
-        'success' => 'has iniciado sesión correctamente.',
+        'error'   => 'Ha habido un problema al iniciar sesión. Por favor, inténtelo de nuevo.',
+        'success' => 'Ha iniciado sesión exitosamente.',
     ),
 
     'logout' => array(
         'error'   => 'Hubo un problema al intentar cerrar la sesión, por favor inténtelo de nuevo.',
-        'success' => 'Has cerrado la sesión con éxito.',
+        'success' => 'Ha cerrado la sesión exitosamente.',
     ),
 
     'signup' => array(
-        'error'   => 'Ha habido un problema al crear la cuenta. Por favor, vuelve a intentarlo.',
+        'error'   => 'Hubo un problema al crear la cuenta. Por favor, inténtelo de nuevo.',
         'success' => 'Cuenta creada correctamente.',
     ),
 
     'forgot-password' => array(
-        'error'   => 'Ha habido un problema al intentar resetear el password. Por favor, vuelve a intentarlo.',
+        'error'   => 'Ha habido un problema al obtener un código de restablecimiento de la contraseña. Por favor, inténtelo de nuevo.',
         'success' => 'Si esa dirección de correo electrónico existe en nuestro sistema, recibirá un correo electrónico de recuperación de contraseña.',
     ),
 
     'forgot-password-confirm' => array(
-        'error'   => 'Ha habido un problema al intentar resetear el password. Por favor, vuelve a intentarlo.',
-        'success' => 'El password ha sido reseteado correctamente.',
+        'error'   => 'Hubo un problema al intentar restablecer su contraseña, por favor, inténtelo de nuevo.',
+        'success' => 'Su contraseña se ha restablecido correctamente.',
     ),
 
 
diff --git a/resources/lang/es-ES/button.php b/resources/lang/es-ES/button.php
index 5ae77fa7eb..6dd8c08cf3 100644
--- a/resources/lang/es-ES/button.php
+++ b/resources/lang/es-ES/button.php
@@ -4,21 +4,31 @@ return [
     'actions' 	                => 'Acciones',
     'add'    	                => 'Agregar nuevo',
     'cancel'                    => 'Cancelar',
-    'checkin_and_delete'  	    => 'Devolver todo / Eliminar usuario',
+    'checkin_and_delete'  	    => 'Ingresar todo / Eliminar usuario',
     'delete'  	                => 'Borrar',
     'edit'    	                => 'Editar',
+    'clone'    	                => 'Clonar',
     'restore' 	                => 'Restaurar',
     'remove'                    => 'Eliminar',
     'request'                   => 'Solicitud',
     'submit'  	                => 'Enviar',
     'upload'                    => 'Cargar',
-    'select_file'				=> 'Seleccione un archivo...',
+    'select_file'				=> 'Seleccionar un archivo...',
     'select_files'				=> 'Seleccionar archivos...',
-    'generate_labels'           => '{1} Generar Etiqueta|[2,*] Generar Etiquetas',
-    'send_password_link'        => 'Enviar enlace de restablecimiento de contraseña',
+    'generate_labels'           => '{1} Generar etiqueta|[2,*] Generar etiquetas',
+    'send_password_link'        => 'Enviar enlace para restablecer la contraseña',
     'go'                        => 'Ir',
-    'bulk_actions'              => 'Acciones en masa',
+    'bulk_actions'              => 'Acciones masivas',
     'add_maintenance'           => 'Añadir mantenimiento',
     'append'                    => 'Añadir',
     'new'                       => 'Nuevo',
+    'var' => [
+        'clone'     => 'Clonar :item_type',
+        'edit'      => 'Editar :item_type',
+        'delete'    => 'Eliminar :item_type',
+        'restore'   => 'Restaurar :item_type',
+        'create'    => 'Crear nuevo :item_type',
+        'checkout'  => 'Asignar :item_type',
+        'checkin'   => 'Ingresar :item_type',
+    ]
 ];
diff --git a/resources/lang/es-ES/general.php b/resources/lang/es-ES/general.php
index 0a115572dc..572511fb64 100644
--- a/resources/lang/es-ES/general.php
+++ b/resources/lang/es-ES/general.php
@@ -1,72 +1,78 @@
 <?php
 
 return [
-    '2FA_reset'             => '2FA reset',
+    '2FA_reset'             => 'Restablecer 2FA',
     'accessories'			=> 'Accesorios',
     'activated'			    => 'Activado',
-    'accepted_date'         => 'Fecha aceptada',
+    'accepted_date'         => 'Fecha de aceptación',
     'accessory'				=> 'Accesorio',
     'accessory_report'		=> 'Informe de accesorios',
     'action'                => 'Acción',
     'activity_report'		=> 'Informe de actividad',
     'address'				=> 'Dirección',
-    'admin'					=> 'Admin',
+    'admin'					=> 'Configuración de administración',
     'admin_tooltip'			=> 'Este usuario tiene privilegios de superadministrador',
     'superuser'				=> 'Superusuario',
     'superuser_tooltip'		=> 'Este usuario es superadministrador',
     'administrator'			=> 'Administrador',
-    'add_seats'             => 'Sitios añadidos',
+    'add_seats'             => 'Licencias añadidas',
     'age'                   => "Edad",
-    'all_assets'			=> 'Todos los Equipos',
+    'all_assets'			=> 'Todos los activos',
     'all'       			=> 'Todos los',
     'archived'              => 'Archivado',
-    'asset_models'			=> 'Modelos',
+    'asset_models'			=> 'Modelos de activos',
     'asset_model'			=> 'Modelo',
-    'asset'					=> 'Equipo',
-    'asset_report'          => 'Reporte de Equipos',
-    'asset_tag'				=> 'Etiqueta de activo',
-    'asset_tags'            => 'Etiquetas de activos',
-    'assets_available'		=> 'Equipos disponibles',
+    'asset'					=> 'Activo',
+    'asset_previous'        => 'Asset (Previously Assigned)',
+    'asset_report'          => 'Informe de activos',
+    'asset_tag'				=> 'Placa del activo',
+    'asset_tags'            => 'Placas de activos',
+    'assets_available'		=> 'Activos disponibles',
     'accept_assets'         => 'Aceptar activos :name',
     'accept_assets_menu'    => 'Aceptar activos',
-    'audit'				    => 'Auditoría',
+    'accept_item'           => 'Accept Item',
+    'audit'				    => 'Auditar',
+    'audits'				=> 'Audits',
     'audit_report'			=> 'Registro de auditoría',
-    'assets'				=> 'Equipos',
+    'assets'				=> 'Activos',
     'assets_audited'        => 'activos auditados',
-    'assets_checked_in_count'     => 'activos devueltos',
-    'assets_checked_out_count'     => 'activos devueltos',
-    'asset_deleted_warning'     => 'Este recurso ha sido eliminado. Debe restaurarlo antes de poder asignarlo a alguien.',
-    'assigned_date'         => 'Fecha asignada',
+    'assets_checked_in_count'     => 'activos ingresados',
+    'assets_checked_out_count'     => 'activos asignados',
+    'asset_deleted_warning'     => 'Este activo ha sido eliminado. Debe restaurarlo antes de poder asignarlo a alguien.',
+    'assigned_date'         => 'Fecha de asignación',
     'assigned_to'           => 'Asignado a :name',
     'assignee'              => 'Asignado a',
     'avatar_delete'         => 'Eliminar Avatar',
     'avatar_upload'         => 'Cargar Avatar',
-    'back'      			=> 'Atras',
-    'bad_data'      		=> 'Ningún resultado. ¿Quizá un dato incorrecto?',
+    'back'      			=> 'Atrás',
+    'bad_data'      		=> 'No se ha encontrado nada. ¿Tal vez datos erróneos?',
     'bulkaudit'             => 'Auditoría masiva',
-    'bulkaudit_status'      => 'Estado de auditoría',
+    'bulkaudit_status'      => 'Estado de la auditoría',
     'bulk_checkout'  		=> 'Asignación masiva',
     'bulk_edit'             => 'Edición masiva',
     'bulk_delete'           => 'Borrado masivo',
     'bulk_actions'          => 'Acciones masivas',
-    'bulk_checkin_delete'   => 'Checkin en masa / Eliminar usuarios',
+    'bulk_checkin_delete'   => 'Ingresar elementos / Borrar usuarios',
     'byod'                  => 'BYOD',
     'byod_help'             => 'Este dispositivo es propiedad del usuario',
-    'bystatus'              => 'por Estado',
+    'bystatus'              => 'por estado',
     'cancel'  				=> 'Cancelar',
     'categories'			=> 'Categorías',
     'category'				=> 'Categoría',
-    'change' 		        => 'Entrada / salida',
-    'changeemail'  			=> 'Cambiar Email',
-    'changepassword'  		=> 'Cambiar Password',
-    'checkin'  				=> 'Devolver',
-    'checkin_from'  		=> 'Devolución de',
+    'change' 		        => 'Entrada/Salida',
+    'changeemail'  			=> 'Cambiar dirección de correo electrónico',
+    'changepassword'  		=> 'Cambiar contraseña',
+    'checkin'  				=> 'Ingresar',
+    'checkin_from'  		=> 'Ingreso proveniente de',
+    'checkin_note'  		=> 'Checkin Note',
+    'checkout_note'  		=> 'Checkout Note',
     'checkout'  			=> 'Asignar',
     'checkouts_count'       => 'Asignaciones',
-    'checkins_count'        => 'Devoluciones',
+    'checkins_count'        => 'Ingresos',
+    'checkin_and_delete'  	=> 'Ingresar y borrar',
     'user_requests_count'   => 'Solicitudes',
     'city'  				=> 'Ciudad',
-    'click_here'			=> 'Pulsa aquí',
+    'click_here'			=> 'Haga clic aquí',
     'clear_selection'		=> 'Borrar selección',
     'companies'			    => 'Compañías',
     'company'				=> 'Compañía',
@@ -77,34 +83,36 @@ return [
     'consumables'			=> 'Consumibles',
     'country'  				=> 'País',
     'could_not_restore'     => 'Error al restaurar :item_type: :error',
-    'not_deleted'           => 'El :item_type no está borrado por lo que no puede ser restaurado',
+    'not_deleted'           => 'El tipo :item_type no se ha borrado y, por lo tanto, no se puede restaurar',
     'create'				=> 'Crear nuevo',
     'created'               => 'Artículo creado',
-    'created_asset'			=> 'equipo creado',
-    'created_at' 			=> 'Creado el',
+    'created_asset'			=> 'activo creado',
+    'created_at' 			=> 'Fecha de creación',
     'created_by'            => 'Creado por',
     'record_created' 		=> 'Registro Creado',
-    'updated_at' 			=> 'Actualizado en',
+    'updated_at' 			=> 'Actualizado el',
     'currency'  			=> '€', // this is deprecated
+    'currency_text'  		=> 'Moneda', //
     'current'  				=> 'Actual',
-    'current_password'      => 'Contraseña Actual',
+    'current_password'      => 'Contraseña actual',
     'customize_report'      => 'Personalizar informe',
     'custom_report'         => 'Informe personalizado de activos',
     'dashboard'				=> 'Tablero',
+    'data_source'           => 'Data Source',
     'days'      			=> 'días',
-    'days_to_next_audit'    => 'Días a la próxima auditoría',
-    'date'					=> 'Fecha Compra',
+    'days_to_next_audit'    => 'Días hasta la siguiente auditoría',
+    'date'					=> 'Fecha',
     'debug_warning'         => '¡Advertencia!',
-    'debug_warning_text'    => 'Esta aplicación esta corriendo en modo producción con debugging activado. Esto puede exponer datos sensibles si su aplicación es accesible desde el exterior. Desactive el modo debug cambiando el valor <code>APP_DEBUG</code> en su archivo <code>.env</code> a <code>false</code>.',
+    'debug_warning_text'    => 'Esta aplicación se está ejecutando en modo producción con depuración habilitada. Esto puede exponer datos sensibles si su aplicación es accedida desde el mundo exterior. Deshabilite el modo de depuración configurando el valor <code>APP_DEBUG</code> en su archivo <code>.env</code> a <code>false</code>.',
     'delete'  				=> 'Borrar',
     'delete_confirm'  		=> '¿Está seguro de que desea eliminar :item?',
     'delete_confirm_no_undo' => '¿Está seguro de que desea eliminar :item? Esto no se puede deshacer.',
     'deleted'  				=> 'Borrado',
-    'delete_seats'  		=> 'Asientos eliminados',
+    'delete_seats'  		=> 'Licencias eliminadas',
     'deletion_failed'       => 'Error al eliminar',
     'departments'           => 'Departamentos',
     'department'            => 'Departamento',
-    'deployed'				=> 'Asignados',
+    'deployed'				=> 'Asignados-',
     'depreciation'			=> 'Amortización',
     'depreciations'         => 'Depreciaciones',
     'depreciation_report'	=> 'Informe de amortización',
@@ -112,31 +120,15 @@ return [
     'download'				=> 'Descargar',
     'download_all'		    => 'Descargar todo',
     'editprofile'  			=> 'Editar perfil',
-    'eol'					=> 'EOL',
+    'eol'					=> 'Fin de soporte (EOL)',
     'email_domain'			=> 'Dominio de correo electrónico',
-    'email_format'			=> 'Formato de correo electrónico',
     'employee_number'       => 'Número de empleado',
-    'email_domain_help'		=> 'Esto se utiliza para generar direcciones de correo electrónico cuando se importan',
+    'email_domain_help'		=> 'Se utiliza para generar direcciones de correo electrónico al importar',
     'error'				    => 'Error',
     'exclude_archived'      => 'Excluir activos archivados',
     'exclude_deleted'       => 'Excluir activos eliminados',
     'example'				=> 'Ejemplo: ',
-    'filastname_format'			=> 'Inicial del nombre y apellido (jsmith@ejemplo.com)',
-    'firstname_lastname_format'	=> 'Nombre y apellido (jane.smith@ejemplo.com)',
-    'firstname_lastname_underscore_format' => 'Nombre y apellido (jane_smith@example.com)',
-    'lastnamefirstinitial_format' =>  'Apellido e inicial del nombre (smithj@example.com)',
-    'firstintial_dot_lastname_format' => 'Inicial del nombre y apellido (j.smith@ejemplo.com)',
-    'firstname_lastname_display'	=> 'Nombre y apellido (Jane Smith)',
-    'lastname_firstname_display'	=> 'Apellido y nombre (Smith Jane)',
-    'name_display_format'	=> 'Formato de visualización de nombre',
-    'first'					=> 'Primero',
-    'firstnamelastname'     => 'Nombre y apellido (janesmith@example.com)',
-    'lastname_firstinitial' => 'Apellido e inicial del nombre (smith_j@ejemplo.com)',
-    'firstinitial.lastname' => 'Inicial nombre y apellido (j.smith@ejemplo.com)',
-    'firstnamelastinitial'  => 'Nombre e inicial del apellido(janes@example.com)',
-    'lastnamefirstname'      => 'Apellido y nombre (smith.jane@example.com)',
-    'first_name'			=> 'Nombre',
-    'first_name_format'		=> 'Nombre (jane@ejemplo.com)',
+
     'files'                 => 'Archivos',
     'file_name'				=> 'Archivo',
     'file_type'             => 'Tipo de archivo',
@@ -147,61 +139,66 @@ return [
     'generate_labels'       => 'Generar etiquetas',
     'github_markdown'      => 'Este campo acepta el <a href="https://help.github.com/articles/github-flavored-markdown/">formateo flavored de GitHub</a>.',
     'groups'				=> 'Grupos',
-    'gravatar_email'        => 'Gravatar Email',
-    'gravatar_url'          => '<a href="http://gravatar.com"><small>Cambia tu avatar en Gravatar.com</small></a>.',
+    'gravatar_email'        => 'Dirección de correo electrónico de Gravatar',
+    'gravatar_url'          => '<a href="http://gravatar.com"><small>Cambie su avatar en Gravatar.com</small></a>.',
     'history'  			    => 'Historial',
-    'history_for'  			=> 'Historial de',
-    'id'  					=> 'Id',
+    'history_for'  			=> 'Historial para',
+    'id'  					=> 'ID',
     'image'                 => 'Imagen',
     'image_delete'         	=> 'Borrar imagen',
     'include_deleted'       => 'Incluir activos eliminados',
     'image_upload'         	=> 'Cargar imagen',
-    'filetypes_accepted_help'    => 'El tipo de archivo aceptado es :types. El tamaño máximo permitido es :size.|Los tipos de archivo aceptados son :types. El tamaño máximo permitido es :size.',
-    'filetypes_size_help'   => 'El tamaño máximo de carga permitido es :size.',
-    'image_filetypes_help'  => 'Accepted filetypes are jpg, webp, png, gif, svg, and avif. Max upload size allowed is :size.',
-    'unaccepted_image_type'  => 'No se pudo leer este archivo de imagen. Los tipos de archivo aceptados son jpg, webp, png, gif y svg. El tipo mimetype de este archivo es: :mimetype.',
+    'filetypes_accepted_help'    => 'El tipo de archivo aceptado es :types. El tamaño máximo permitido es :size.|Los tipos de archivo aceptados son :types. El tamaño máximo permitido para cargar es :size.',
+    'filetypes_size_help'   => 'El tamaño máximo permitido para cargar es :size.',
+    'image_filetypes_help'  => 'Los tipos de archivo aceptados son jpg, webp, png, gif, svg y avif. El tamaño máximo permitido es :size.',
+    'unaccepted_image_type'  => 'No se pudo leer este archivo de imagen. Los tipos de archivo aceptados son jpg, webp, png, gif y svg. El tipo MIME de este archivo es: :mimetype.',
     'import'         	    => 'Importar',
-    'import_this_file'      => 'Mapear campos y procesar este archivo',
-    'importing'         	=> 'Importando',
-    'importing_help'        => 'Puedes importar activos, accesorios, licencias, componentes, insumos y usuarios vía archivos CSV.<br> <br> El CSV debe estar delimitado por comas y formateado con encabezados que coincidan con aquellos definidos en los <a href="https://snipe-it.readme.io/docs/importing" target="_new"> CSVs de muestra en la documentación</a>.',
+    'import_this_file'      => 'Asociar campos y procesar este archivo',
+    'importing'         	=> 'Importar datos',
+    'importing_help'        => 'Puede importar activos, accesorios, licencias, componentes, consumibles y usuarios a través del archivo CSV. <br><br>El CSV debe estar delimitado por comas y formateado con encabezados que coincidan con los de los <a href="https://snipe-it.readme.io/docs/importing" target="_new">archivos CSV de muestra en la documentación</a>.',
     'import-history'        => 'Importar historial',
-    'asset_maintenance'        => 'Mantenimiento de Equipo',
+    'asset_maintenance'        => 'Mantenimiento de activos',
     'asset_maintenance_report' => 'Informe mantenimiento de activos',
     'asset_maintenances'       => 'Mantenimiento de activos',
-    'item'  				=> 'Item',
-    'item_name'             => 'Nombre del ítem',
+    'item'  				=> 'Elemento',
+    'item_name'             => 'Nombre del elemento',
     'import_file'  			=> 'importar archivo CSV',
     'import_type'  			=> 'Tipo de importación CSV',
     'insufficient_permissions' => '¡Permisos insuficientes!',
-    'kits'       			=> 'Equipamiento predefinido',
-    'language'				=> 'Lenguaje',
+    'kits'       			=> 'Kits predefinidos',
+    'language'				=> 'Idioma',
     'last'					=> 'Último',
-    'last_login'            => 'Último acceso',
+    'last_login'            => 'Último inicio de sesión',
     'last_name'             => 'Apellidos',
+    'firstname_lastname_display'	=> 'Nombre y apellido (Jane Smith)',
+    'lastname_firstname_display'	=> 'Apellido y nombre (Smith Jane)',
+    'name_display_format'	=> 'Formato para mostrar el nombre',
+    'first'					=> 'Primero',
+    'first_name'			=> 'Nombre',
     'license'				=> 'Licencia',
     'license_report'        => 'Informe de licencias',
     'licenses_available'	=> 'Licencias disponibles',
     'licenses'				=> 'Licencias',
     'list_all'				=> 'Mostrar todos',
-    'loading'				=> 'Cargando... por favor espere....',
-    'lock_passwords'        => 'El valor de este campo no será guardado en una instalación de demostración.',
-    'feature_disabled'      => 'Esta característica se ha desactivado para la versión de demostración.',
+    'loading'				=> 'Cargando... por favor espere...',
+    'lock_passwords'        => 'El valor de este campo no se guardará en una instalación de demostración.',
+    'feature_disabled'      => 'Esta característica se ha desactivado para la instalación de demostración.',
     'location'              => 'Ubicación',
     'location_plural'        => 'Ubicación|Ubicaciones',
-    'locations'				=> 'Localizaciones',
-    'logo_size'				=> 'Los logotipos cuadrados se ven mejor con Logo + Texto. El tamaño máximo del logo es 50px de altura x 500px de ancho.  ',
-    'logout'				=> 'Desconexión',
-    'lookup_by_tag'     => 'Buscar etiqueta de activo',
+    'locations'				=> 'Ubicaciones',
+    'logo_size'				=> 'Los logotipos cuadrados se ven mejor con Logo + Texto. El tamaño máximo del logo es 50px de alto x 500px de ancho.  ',
+    'logout'				=> 'Cerrar sesión',
+    'lookup_by_tag'     => 'Buscar placa del activo',
     'maintenances'          => 'Mantenimientos',
-    'manage_api_keys'       => 'Administrar API Keys',
+    'manage_api_keys'       => 'Administrar las claves del API',
     'manufacturer'			=> 'Fabricante',
     'manufacturers'			=> 'Fabricantes',
-    'markdown'				=> 'Este campo permite <a href="https://help.github.com/articles/github-flavored-markdown/">Github con sabor a markdown</a>.',
+    'markdown'				=> 'Este campo permite <a href="https://help.github.com/articles/github-flavored-markdown/">markdown estilo Github</a>.',
     'min_amt'				=> 'Cantidad mínima',
     'min_amt_help'          => 'Número mínimo de elementos que deben estar disponibles antes de que se active una alerta. Deje la cantidad mínima en blanco si no desea recibir alertas de inventario bajo.',
     'model_no'				=> 'Modelo No.',
-    'months'				=> 'Meses',
-    'moreinfo'				=> 'Más Info',
+    'months'				=> 'meses',
+    'moreinfo'				=> 'Más información',
     'name'					=> 'Nombre',
     'new_password'          => 'Nueva contraseña',
     'next'					=> 'Siguiente',
@@ -210,32 +207,40 @@ return [
     'audit_images_help'     => 'Puede encontrar imágenes de auditoría en la pestaña Historial del activo.',
     'no_email'              => 'No hay dirección de correo electrónico asociada a este usuario',
     'last_audit'		    => 'Última auditoría',
-    'new'					=> 'nuevo!',
+    'new'					=> '¡nuevo!',
     'no_depreciation'		=> 'No Amortizar',
-    'no_results'			=> 'Sin Resultados.',
+    'no_results'			=> 'No hay resultados.',
     'no'  					=> 'No',
     'notes'  				=> 'Notas',
+    'note_added'            => 'Nota agregada',
+    'options'				=> 'Options',
+    'preview'				=> 'Preview',
+    'add_note'              => 'Agregar nota',
+    'note_edited'            => 'Nota editada',
+    'edit_note'              => 'Editar nota',
+    'note_deleted'            => 'Nota eliminada',
+    'delete_note'              => 'Borrar nota',
     'order_number'          => 'Número de orden',
-    'only_deleted'          => 'Sólo activos eliminados',
+    'only_deleted'          => 'Solo activos eliminados',
     'page_menu'				=> 'Mostrando elementos de _MENU_',
-    'pagination_info'		=> 'Mostrando _START_ de _END_ de elementos _TOTAL_',
+    'pagination_info'		=> 'Mostrando _START_ a _END_ de _TOTAL_ elementos',
     'pending'				=> 'Pendientes',
-    'people'				=> 'Usuarios',
-    'per_page'				=> 'Resultados Por Pag',
+    'people'				=> 'Personas',
+    'per_page'				=> 'Resultados por página',
     'previous'				=> 'Previo',
     'processing'			=> 'Procesando',
     'profile'				=> 'Perfil',
-    'purchase_cost'                              => 'Precio Compra',
+    'purchase_cost'                              => 'Precio de compra',
     'purchase_date'         => 'Fecha de compra',
-    'qty'		            => 'Cant',
+    'qty'		            => 'Cantidad',
     'quantity'		        => 'Cantidad',
-    'quantity_minimum'      => 'Tiene :con elementos por debajo o casi por debajo de los niveles mínimos de cantidad',
-    'quickscan_checkin'  	=> 'Devolución rápida con escaneo',
-    'quickscan_checkin_status'  	=> 'Estado de devolución',
+    'quantity_minimum'      => 'Tiene un artículo por debajo o casi por debajo de los niveles de cantidad mínima|Tiene :count artículos por debajo o casi por debajo de los niveles de cantidad mínima',
+    'quickscan_checkin'  	=> 'Ingreso rápido con escaneo',
+    'quickscan_checkin_status'  	=> 'Resultado del ingreso',
     'ready_to_deploy'		=> 'Listo para asignar',
-    'recent_activity'		=> 'Actividad Reciente',
+    'recent_activity'		=> 'Actividad reciente',
     'remaining'             => 'Restante',
-    'remove_company'        => 'Eliminar asociación de la compañía',
+    'remove_company'        => 'Eliminar la asociación de la compañía',
     'reports'				=> 'Informes',
     'restored'				=> 'restaurado',
     'restore'				=> 'Restaurar',
@@ -243,9 +248,9 @@ return [
     'requestable_items'     => 'Artículos que se pueden solicitar',
     'requested'				=> 'Solicitado',
     'requested_date'        => 'Fecha de solicitud',
-    'requested_assets'      => 'Elementos solicitados',
-    'requested_assets_menu' => 'Elementos solicitados',
-    'request_canceled'      => 'Solicitud Cancelada',
+    'requested_assets'      => 'Activos solicitados',
+    'requested_assets_menu' => 'Activos solicitados',
+    'request_canceled'      => 'Solicitud cancelada',
     'request_item'          => 'Solicitar este elemento',
     'external_link_tooltip' => 'Enlace externo a',
     'save'  				=> 'Guardar',
@@ -253,117 +258,119 @@ return [
     'select'				=> 'Seleccionar',
     'select_all'            => 'Seleccionar todo',
     'search'				=> 'Buscar',
-    'select_category'       => 'Seleccione una categoría',
+    'select_category'       => 'Seleccionar una categoría',
     'select_datasource' => 'Seleccione un origen de datos',
-    'select_department'     => 'Seleccione un departamento',
+    'select_department'     => 'Seleccionar un departamento',
     'select_depreciation'	=> 'Seleccionar un tipo de amortización',
-    'select_location'		=> 'Seleccione una ubicación',
-    'select_manufacturer'	=> 'Seleccione un fabricante',
-    'select_model'			=> 'Seleccione un modelo',
-    'select_supplier'		=> 'Seleccione un proveedor',
-    'select_user'			=> 'Seleccione un usuario',
+    'select_location'		=> 'Seleccionar una ubicación',
+    'select_manufacturer'	=> 'Seleccionar un fabricante',
+    'select_model'			=> 'Seleccionar un modelo',
+    'select_supplier'		=> 'Seleccionar un proveedor',
+    'select_user'			=> 'Seleccionar un usuario',
     'select_date'			=> 'Seleccione fecha (AAAA-MM-DD)',
-    'select_statuslabel'	=> 'Seleccione un estado',
-    'select_company'    	=> 'Seleccione una compañía',
+    'select_statuslabel'	=> 'Seleccionar un estado',
+    'select_company'    	=> 'Seleccionar una compañía',
     'select_asset'    		=> 'Seleccionar activo',
-    'settings'				=> 'Opciones',
-    'show_deleted'  		=> 'Mostrar Eliminado',
+    'settings'				=> 'Configuraciones',
+    'show_deleted'  		=> 'Mostrar eliminados',
     'show_current'  		=> 'Mostrar actual',
-    'sign_in'				=> 'Entrar',
+    'sign_in'				=> 'Iniciar sesión',
     'signature'             => 'Firma',
     'signed_off_by'         => 'Firmado por',
-    'skin'       			=> 'Tema',
+    'skin'       			=> 'Apariencia',
     'webhook_msg_note'        => 'Una notificación se enviará a través de webhook',
-    'webhook_test_msg'        => '¡Parece que tu integración de :app con Snipe-IT está funcionando!',
-    'some_features_disabled' => 'MODO DE DEMOSTRACIÓN: Algunas funciones estan desactivadas para esta instalación.',
-    'site_name'				=> 'Sitio',
+    'webhook_test_msg'        => '¡Hola! ¡Parece que la integración de :app con Snipe-IT funciona!',
+    'some_features_disabled' => 'MODO DEMOSTRACIÓN: Algunas características están desactivadas para esta instalación.',
+    'site_name'				=> 'Nombre del sitio',
     'state'  				=> 'Provincia',
     'status_labels'			=> 'Etiquetas de estado',
-    'status'    			=> 'Estados',
+    'status_label'			=> 'Etiqueta de estado',
+    'status'    			=> 'Estado',
     'accept_eula'           => 'Acuerdo de aceptación',
+    'show_or_hide_eulas' => 'Mostrar/ocultar acuerdos de uso (EULAs)',
     'supplier'              => 'Proveedor',
     'suppliers'  			=> 'Proveedores',
-    'sure_to_delete'        => '¿Está seguro que desea eliminar',
+    'sure_to_delete'        => '¿Está seguro de que desea eliminar',
     'sure_to_delete_var'    => '¿Está seguro de que desea eliminar :item?',
     'delete_what'           => 'Eliminar :item',
     'submit'				=> 'Enviar',
-    'target'                => 'Objetivo',
-    'time_and_date_display' => 'Hora y fecha',
-    'total_assets'			=> 'Equipos',
+    'target'                => 'Destino',
+    'time_and_date_display' => 'Visualización de fecha y hora',
+    'total_assets'			=> 'activos',
     'total_licenses'		=> 'licencias totales',
-    'total_accessories'		=> 'total de accesorios',
-    'total_consumables'		=> 'total de consumibles',
+    'total_accessories'		=> 'accesorios totales',
+    'total_consumables'		=> 'consumibles totales',
     'type'  				=> 'Tipo',
     'undeployable'			=> 'No utilizable',
-    'unknown_admin'			=> 'Admin Desconocido',
-    'username_format'		=> 'Formato del nombre de usuario',
-    'username'              => 'Usuario',
+    'unknown_admin'			=> 'Administrador desconocido',
+    'username'              => 'Nombre de usuario',
     'update'                => 'Actualizar',
+    'updating_item' => 'Actualizando :item',
     'upload_filetypes_help'      => 'Los tipos de archivo permitidos son png, gif, jpg, jpeg, doc, docx, pdf, xls, xlsx, txt, lic, xml, zip, rtf y rar. El tamaño máximo permitido es :size.',
     'uploaded'              => 'Cargado',
     'user'					=> 'Usuario',
     'accepted'			    => 'aceptado',
-    'declined'			    => 'declinado',
+    'declined'			    => 'rechazado',
     'declined_note'         => 'Notas de rechazo',
     'unassigned'            => 'Sin asignar',
     'unaccepted_asset_report' => 'Activos no aceptados',
     'users'                 => 'Usuarios',
     'viewall'				=> 'Ver todos',
-    'viewassets'  			=> 'Ver elementos asignados',
+    'viewassets'  			=> 'Ver activos asignados',
     'viewassetsfor'         => 'Ver activos para :name',
     'website'               => 'Sitio web',
     'welcome'				=> 'Bienvenido, :name',
     'years'					=> 'años',
     'yes' 					=> 'Si',
     'zip'  					=> 'Código postal',
-    'noimage'				=> 'Imagen no subida o imagen no encontrada.',
+    'noimage'				=> 'No se cargó la imagen o no fue encontrada.',
     'file_does_not_exist'   => 'El archivo solicitado no existe en el servidor.',
     'file_upload_success'   => '¡Archivo cargado exitosamente!',
     'no_files_uploaded'     => '¡Archivo cargado exitosamente!',
     'token_expired'         => 'Su sesión ha caducado. Por favor, inténtelo de nuevo.',
-    'login_enabled'         => 'Inicio de sesión habilitado',
-    'audit_due'             => 'Vence la auditoría',
-    'audit_due_days'        => 'Activos pendientes para auditoría dentro de :days día|Activos pendientes para auditoría dentro de :days días',
-    'checkin_due'           => 'Pendiente por devolver',
-    'checkin_overdue'       => 'Atrasado por devolver',
-    'checkin_due_days'      => 'Activos que deben ser devueltos dentro de :days día|Activos que deben ser devueltos dentro de :days días',
-    'audit_overdue'         => 'Auditoría retrasada',
+    'login_enabled'         => 'Inicio de sesión activado',
+    'audit_due'             => 'Próximas auditorías',
+    'audit_due_days'        => '{}Assets Due or Overdue for Audit|[1]Assets Due or Overdue for Audit Within a Day|[2,*]Assets Due or Overdue for Audit Within :days Days',
+    'checkin_due'           => 'Próximos a ingresar',
+    'checkin_overdue'       => 'Devolución atrasada',
+    'checkin_due_days'      => '{}Due for Checkin|[1]Assets Due for Checkin Within :days Day|[2,*]Assets Due for Checkin Within :days Days',
+    'audit_overdue'         => 'Auditoría atrasada',
     'accept'                => 'Aceptar :asset',
     'i_accept'              => 'Acepto',
     'i_decline'             => 'Rechazo',
     'accept_decline'        => 'Aceptar/Rechazar',
-    'sign_tos'              => 'Firma abajo para indicar que estás de acuerdo con los términos de servicio:',
+    'sign_tos'              => 'Firme abajo para indicar que está de acuerdo con los términos de servicio:',
     'clear_signature'       => 'Borrar firma',
     'show_help'             => 'Mostrar ayuda',
     'hide_help'             => 'Ocultar ayuda',
-    'view_all'              => 'ver todo',
+    'view_all'              => 'ver todos',
     'hide_deleted'          => 'Ocultar eliminados',
     'email'                 => 'Correo electrónico',
     'do_not_change'         => 'No cambiar',
-    'bug_report'            => 'Reportar un fallo',
+    'bug_report'            => 'Reporte un error',
     'user_manual'           => 'Manual del usuario',
     'setup_step_1'          => 'Paso 1',
     'setup_step_2'          => 'Paso 2',
     'setup_step_3'          => 'Paso 3',
     'setup_step_4'          => 'Paso 4',
     'setup_config_check'    => 'Comprobar configuración',
-    'setup_create_database' => 'Crear Tablas de Base de Datos',
-    'setup_create_admin'    => 'Crear Usuario Admin',
+    'setup_create_database' => 'Crear tablas de la base de datos',
+    'setup_create_admin'    => 'Crear un usuario administrador',
     'setup_done'            => '¡Terminado!',
     'bulk_edit_about_to'    => 'Está a punto de editar lo siguiente: ',
     'checked_out'           => 'Asignado',
     'checked_out_to'        => 'Asignado a',
     'fields'                => 'Campos',
-    'last_checkout'         => 'Última Asignación',
-    'due_to_checkin'        => 'Se espera la entrada de los siguientes :count activos pronto:',
-    'expected_checkin'      => 'Fecha Esperada de Devolución',
+    'last_checkout'         => 'Última asignación',
+    'due_to_checkin'        => 'Los siguientes :count elementos están pendientes por ingresar pronto:',
+    'expected_checkin'      => 'Fecha esperada de devolución',
     'reminder_checked_out_items' => 'Este es un recordatorio de los elementos que se le han asignado actualmente. Si usted cree que esta lista es incorrecta (falta algo o aparece algo que usted cree que nunca ha recibido), por favor envíe un correo electrónico a :reply_to_name a :reply_to_address.',
     'changed'               => 'Cambiado',
     'to'                    => 'A',
-    'report_fields_info'    => '<p>Seleccione los campos que desea incluir en su informe personalizado y haga clic en Generar. El archivo (custom-asset-report-YYYY-mm-dd.csv) se descargará automáticamente y puede abrirlo en Excel.</p>
+    'report_fields_info'    => '<p>Seleccione los campos que desea incluir en su informe personalizado y haga clic en Generar. El archivo (custom-asset-report-YYYY-mm-dd.csv) se descargará automáticamente y podrá abrirlo en Excel.</p>
             <p>Si desea exportar sólo ciertos activos, utilice las siguientes opciones para afinar sus resultados.</p>',
     'range'                 => 'Rango',
-    'bom_remark'            => 'Añadir un BOM (signo de orden de byte) a este CSV',
+    'bom_remark'            => 'Añadir un BOM (marca de orden de bytes) a este CSV',
     'improvements'          => 'Mejoras',
     'information'           => 'Información',
     'permissions'           => 'Permisos',
@@ -373,9 +380,9 @@ return [
     'ldap_user_sync'        => 'Sincronización de usuario LDAP',
     'synchronize'           => 'Sincronizar',
     'sync_results'          => 'Resultados de sincronización',
-    'license_serial'        => 'Número de Serie/Clave de Producto',
-    'invalid_category'      => 'Categoría no válida o ausente',
-    'invalid_item_category_single' => 'Falta o no válida :type categoría. Por favor actualiza la categoría de este :type para incluir una categoría válida antes de salir.',
+    'license_serial'        => 'Número de serie/clave de producto',
+    'invalid_category'      => 'Categoría no válida o inexistente',
+    'invalid_item_category_single' => 'Falta o no es válida una categoría de tipo :type. Por favor, actualice la categoría de tipo :type para incluir una categoría válida antes de asignar.',
     'dashboard_info'        => 'Este es su panel de control. Hay muchos similares, pero este es suyo.',
     '60_percent_warning'    => '60% completo (advertencia)',
     'dashboard_empty'       => 'Parece que aún no ha añadido nada, así que no tenemos nada impresionante que mostrar. ¡Comience añadiendo algunos activos, accesorios, consumibles o licencias ahora!',
@@ -383,13 +390,15 @@ return [
     'new_license'           => 'Nueva licencia',
     'new_accessory'         => 'Nuevo accesorio',
     'new_consumable'        => 'Nuevo consumible',
+    'new_component'         => 'New Component',
+    'new_user'              => 'New User',
     'collapse'              => 'Contraer',
     'assigned'              => 'Asignado',
-    'asset_count'           => 'Recuento de activos',
-    'accessories_count'     => 'Recuento de accesorios',
-    'consumables_count'     => 'Recuento de consumibles',
-    'components_count'      => 'Recuento de componentes',
-    'licenses_count'        => 'Recuento de licencias',
+    'asset_count'           => 'Cantidad de activos',
+    'accessories_count'     => 'Cantidad de accesorios',
+    'consumables_count'     => 'Cantidad de consumibles',
+    'components_count'      => 'Cantidad de componentes',
+    'licenses_count'        => 'Cantidad de licencias',
     'notification_error'    => 'Error',
     'notification_error_hint' => 'Por favor revise si hay errores en el siguiente formulario',
     'notification_bulk_error_hint' => 'Los siguientes campos tenían errores de validación y no han sido editados:',
@@ -402,61 +411,62 @@ return [
     'consumable_information' => 'Información del consumible:',
     'consumable_name'       => 'Nombre del Consumible:',
     'accessory_information' => 'Información del accesorio:',
-    'accessory_name'       => 'Nombre de accesorio:',
+    'accessory_name'       => 'Nombre del accesorio:',
     'clone_item'            => 'Clonar objeto',
     'checkout_tooltip' => 'Asignar este elemento',
-    'checkin_tooltip' => 'Devuelva este elemento para que esté disponible para resignar, borrar, etc.',
+    'checkin_tooltip' => 'Ingrese este elemento para que esté disponible para reasignar, borrar, etc.',
     'checkout_user_tooltip' => 'Asignar este elemento a un usuario',
-    'checkin_to_diff_location' => 'Puede optar por asignar este activo a una ubicación distinta a la predeterminada :default_location, si es que existe una configurada',
-    'maintenance_mode'      => 'El servicio no está disponible temporalmente debido por actualizaciones del sistema. Por favor, vuelva más tarde.',
-    'maintenance_mode_title' => 'Sistema temporalmente no disponible',
+    'checkin_to_diff_location' => 'Puede elegir ingresar este activo a una ubicación distinta de la predeterminada :default_location, si es que se ha definido una',
+    'maintenance_mode'      => 'El servicio no está disponible temporalmente debido a actualizaciones del sistema. Por favor, verifique más tarde.',
+    'maintenance_mode_title' => 'El sistema no está disponible temporalmente',
     'ldap_import'           => 'La contraseña de usuario no debe ser administrada por LDAP. (Esto le permite enviar solicitudes de contraseña olvidada.)',
     'purge_not_allowed'     => 'La purga de datos eliminados ha sido deshabilitada en el archivo .env. Contacte con el soporte técnico o con el administrador de su sistema.',
     'backup_delete_not_allowed'     => 'La eliminación de copias de seguridad se ha desactivado en el archivo .env. Contacte con el soporte técnico o con el administrador de su sistema.',
     'additional_files'           => 'Archivos adicionales',
     'shitty_browser'        => 'No se ha detectado ninguna firma. Si está utilizando un navegador más antiguo, por favor utilice un navegador más moderno para completar la aceptación del elemento.',
     'bulk_soft_delete'      =>'También, elimine temporalmente a estos usuarios. Su historial de activos permanecerá intacto a menos que purgue los registros eliminados en la Configuración de administración.',
-    'bulk_checkin_delete_success' => 'Los usuarios seleccionados han sido eliminados y sus activos han sido registrados.',
-    'bulk_checkin_success' => 'Los elementos para los usuarios seleccionados han sido registrados.',
-    'set_to_null'           => 'Eliminar valores para este activo|Eliminar valores para todos los :asset_count activos ',
+    'bulk_checkin_delete_success' => 'Los usuarios seleccionados han sido eliminados y sus activos han sido ingresados.',
+    'bulk_checkin_success' => 'Los elementos para los usuarios seleccionados han sido ingresados.',
+    'set_to_null'           => 'Eliminar los valores del elemento seleccionado|Eliminar los valores de los :selection_count elementos seleccionados ',
     'set_users_field_to_null'  => 'Eliminar valores de :field para este usuario|Eliminar valores de :field para todos los :user_count usuarios ',
     'na_no_purchase_date'   => 'N/A - No se proporcionó fecha de compra',
     'assets_by_status'      => 'Activos por estado',
     'assets_by_status_type'      => 'Activos por tipo de estado',
     'pie_chart_type'        => 'Tipo de gráfico circular en el tablero',
     'hello_name'            => '¡Hola, :name!',
-    'unaccepted_profile_warning'   => 'Tienes :count elementos que requieren aceptación. Haz clic aquí para aceptarlos o rechazarlos',
+    'unaccepted_profile_warning'   => 'Tiene un elemento que requiere aceptación. Haga clic aquí para aceptarlo o rechazarlo | Tiene :count elementos que requieren aceptación. Haga clic aquí para aceptarlos o rechazarlos',
     'start_date'            => 'Fecha de inicio',
-    'end_date'            => 'Fecha de fin',
+    'end_date'            => 'Fecha final',
     'alt_uploaded_image_thumbnail' => 'Miniatura cargada',
     'placeholder_kit'       => 'Seleccione un kit',
-    'file_not_found'        => 'No se encontró el archivo',
+    'file_not_found'        => 'Archivo no encontrado',
+    'log_record_not_found'  => 'No se ha encontrado ninguna entrada en el registro de eventos.',
     'preview_not_available' => '(sin vista previa)',
     'setup'                 => 'Configuración',
     'pre_flight'            => 'Preparación',
-    'skip_to_main_content'  => 'Saltar al contenido principal',
+    'skip_to_main_content'  => 'Ir al contenido principal',
     'toggle_navigation'     => 'Alternar navegación',
     'alerts'                => 'Alertas',
     'tasks_view_all'        => 'Ver todas las tareas',
     'true'                  => 'Verdadero',
     'false'                 => 'Falso',
     'integration_option'    => 'Opción de integración',
-    'log_does_not_exist'    => 'No existe ningún registro de eventos coincidente.',
-    'merge_users'           => 'Fusionar usuarios',
-    'merge_information' =>  'Esto fusionará a los :count usuarios en un solo usuario. Seleccione el usuario que desee fusionar con los otros más abajo, y los activos asociados, licencias, etc se trasladarán al usuario seleccionado y los otros usuarios serán marcados como eliminados.',
-    'warning_merge_information' => 'Esta acción NO PUEDE deshacerse y sólo debe ser usada cuando necesite fusionar usuarios debido a una mala importación o sincronización. Asegúrese de ejecutar una copia de seguridad primero.',
+    'log_does_not_exist'    => 'No existe ningún registro de eventos que coincida.',
+    'merge_users'           => 'Combinar usuarios',
+    'merge_information' =>  'Esto combinará los :count usuarios en un único usuario. Seleccione a continuación el usuario en el que desea combinar los demás, y los activos, licencias, etc. asociados se moverán al usuario seleccionado y los demás usuarios se marcarán como eliminados.',
+    'warning_merge_information' => 'Esta acción NO PUEDE deshacerse y sólo debe ser usada cuando necesite combinar usuarios debido a una mala importación o sincronización. Asegúrese de ejecutar una copia de seguridad primero.',
     'no_users_selected'     => 'Ningún usuario seleccionado',
     'not_enough_users_selected'     => 'Al menos :count usuarios deben ser seleccionados',
-    'merge_success'         => ':count usuarios fusionados con éxito en :into_username!',
-    'merged'                => 'fusionados',
-    'merged_log_this_user_into' => 'Fusionado este usuario (ID :to_id - :to_username) con el ID de usuario :from_id (:from_username) ',
-    'merged_log_this_user_from' => 'Fusionado ID de usuario :from_id (:from_username) con este usuario (ID :to_id - :to_username)',
-    'clear_and_save'            => 'Limpiar y Guardar',
+    'merge_success'         => '!:count usuarios combinados con éxito en :into_username!',
+    'merged'                => 'combinados',
+    'merged_log_this_user_into' => 'Se combinó este usuario (ID :to_id - :to_username) en ID de usuario :from_id (:from_username) ',
+    'merged_log_this_user_from' => 'Se combinó usuario ID :from_id (:from_username) en este usuario (ID :to_id - :to_username)',
+    'clear_and_save'            => 'Limpiar y guardar',
     'update_existing_values'    => '¿Actualizar valores existentes?',
-    'auto_incrementing_asset_tags_disabled_so_tags_required' => 'Generar etiquetas de activos auto-incrementantes está desactivado, por lo que todas las filas necesitan tener la columna "Tag de activo" rellenada.',
-    'auto_incrementing_asset_tags_enabled_so_now_assets_will_be_created' => 'Nota: Generar etiquetas de activos que incrementan automáticamente está habilitado, por lo que se crearán recursos para registros que no tengan "Tag de activo" poblado. Las filas que tengan "Etiqueta de activos" pobladas serán actualizadas con la información proporcionada.',
+    'auto_incrementing_asset_tags_disabled_so_tags_required' => 'La generación autoincrementable de las placas de activos está desactivada, por lo que todas las filas deben tener la columna "Asset Tag" con información.',
+    'auto_incrementing_asset_tags_enabled_so_now_assets_will_be_created' => 'Nota: La generación autoincrementable de las placas de activos está activada, por lo que se crearán activos para las filas sin información en la columna "Asset Tag". Las filas que sí tengan información en la columna "Asset Tag" se actualizarán con la información proporcionada.',
     'send_welcome_email_to_users'   => ' ¿Enviar correo de bienvenida para nuevos usuarios?',
-    'send_email'                => 'Enviar Email',
+    'send_email'                => 'Enviar correo electrónico',
     'call'                      => 'Número de llamada',
     'back_before_importing'     => '¿Copia de seguridad antes de importar?',
     'csv_header_field'          => 'Campo de cabecera CSV',
@@ -469,66 +479,66 @@ return [
     'success_redirecting'       => '"Éxito... Redirigiendo.',
     'cancel_request'            => 'Cancelar esta solicitud de elemento',
     'setup_successful_migrations' => 'Se han creado las tablas de la base de datos',
-    'setup_migration_output' => 'Salida de Migración:',
+    'setup_migration_output' => 'Salida de migración:',
     'setup_migration_create_user' => 'Siguiente: Crear usuario',
-    'importer_generic_error'    => 'La importación de tu archivo está completa, pero recibimos un error. Esto normalmente es causado por la limitación de API de terceros desde un webhook de notificación (como Slack) y no habría interferido con la importación en sí. pero debería confirmarlo.',
+    'importer_generic_error'    => 'La importación del archivo se ha completado, pero recibimos un error. Esto suele deberse a la limitación de la API de terceros desde un webhook de notificación (como Slack) y no habría interferido con la importación en sí, pero debería confirmarlo.',
     'confirm' => 'Confirmar',
     'autoassign_licenses' => 'Auto-Asignar licencias',
-    'autoassign_licenses_help' => 'Permitir a este usuario tener licencias asignadas a través de la interfaz de usuario o herramientas de cli asignadas a granel.',
-    'autoassign_licenses_help_long' => 'Esto permite que un usuario tenga licencias asignadas a través de la interfaz de usuario o las herramientas de cli asignadas a granel. (Por ejemplo, puede que no desee que los contratistas sean asignados automáticamente a una licencia que proporcione sólo a los miembros del personal. Todavía puede asignar licencias individualmente a esos usuarios, pero no se incluirán en la licencia de pago a las funciones de todos los usuarios.)',
-    'no_autoassign_licenses_help' => 'No incluya al usuario para asignar a granel a través de la licencia UI o las herramientas de cli.',
+    'autoassign_licenses_help' => 'Permitir a este usuario tener licencias asignadas a través de la asignación masiva en la interfaz de usuario o de las herramientas de la línea de comandos (CLI).',
+    'autoassign_licenses_help_long' => 'Esto permite asignar licencias a un usuario a través de la asignación masiva en la interfaz de usuario o de las herramientas de línea de comandos (CLI). (Por ejemplo, es posible que no desee que a los contratistas se les asigne automáticamente una licencia que usted proporcionaría sólo a los miembros del personal. Puede seguir asignando licencias individualmente a esos usuarios, pero no se incluirán en las funciones de "Asignación de licencias a todos los usuarios").',
+    'no_autoassign_licenses_help' => 'No incluir al usuario en la asignación masiva de licencias en la interfaz de usuario o en las herramientas de línea de comandos (CLI).',
     'modal_confirm_generic'      => '¿Está seguro?',
-    'cannot_be_deleted'      => 'Este articulo no se puede eliminar',
+    'cannot_be_deleted'      => 'Este elemento no puede ser eliminado',
     'cannot_be_edited'      => 'Este elemento no puede ser editado.',
     'undeployable_tooltip'      => 'Este artículo no puede ser asignado. Compruebe la cantidad restante.',
     'serial_number'        => 'Número de serie',
     'item_notes' => ':item Notas',
-    'item_name_var' => ':nombre del ítem',
+    'item_name_var' => ':item Nombre',
     'error_user_company' => 'La compañía destino de la asignación y la compañía del activo no coinciden',
     'error_user_company_accept_view' => 'Un activo asignado a usted pertenece a una compañía diferente por lo que no puede aceptarlo ni rechazarlo, por favor verifique con su supervisor',
     'importer' => [
-        'checked_out_to_fullname' => 'Pagado a: Nombre Completo',
-        'checked_out_to_first_name' => 'Pagado a: Nombre',
-        'checked_out_to_last_name' => 'Pagado a: Apellido',
-        'checked_out_to_username' => 'Pagado a: Usuario',
-        'checked_out_to_email' => 'Checkout a: Email',
-        'checked_out_to_tag' => 'Checked Out a: Tag de Activos',
-        'manager_first_name' => 'Nombre del administrador',
-        'manager_last_name' => 'Apellido del administrador',
-        'manager_full_name' => 'Nombre completo del administrador',
-        'manager_username' => 'Apellido del administrador',
-        'checkout_type' => 'Tipo de pago',
-        'checkout_location' => 'Pagar a la ubicación',
-        'image_filename' => 'Nombre de imagen',
+        'checked_out_to_fullname' => 'Asignado a: Nombre completo',
+        'checked_out_to_first_name' => 'Asignado a: Nombre',
+        'checked_out_to_last_name' => 'Asignado a: Apellido',
+        'checked_out_to_username' => 'Asignado a: Nombre de usuario',
+        'checked_out_to_email' => 'Asignado a: Correo electrónico',
+        'checked_out_to_tag' => 'Asignado a: Placa de activo',
+        'manager_first_name' => 'Nombre del supervisor',
+        'manager_last_name' => 'Apellido del supervisor',
+        'manager_full_name' => 'Nombre completo del supervisor',
+        'manager_username' => 'Nombre de usuario del supervisor',
+        'checkout_type' => 'Tipo de asignación',
+        'checkout_location' => 'Asignar a la ubicación',
+        'image_filename' => 'Nombre del archivo de la imagen',
         'do_not_import'     => 'No importar',
         'vip' => 'VIP',
         'avatar'  => 'Avatar',
-        'gravatar' => 'Gravatar Email',
+        'gravatar' => 'Correo electrónico Gravatar',
         'currency' => 'Moneda',
-        'address2' => 'Dirección (línea 2)',
+        'address2' => 'Dirección línea 2',
         'import_note' => 'Importado usando el importador de csv',
     ],
     'remove_customfield_association' => 'Elimine este campo del grupo de campos. Esto no eliminará el campo personalizado, solo la asociación de este campo con este grupo de campos.',
-    'checked_out_to_fields' => 'Campos sobre quién tiene asignado el elemento',
+    'checked_out_to_fields' => 'Campos de la persona que tiene asignado el elemento',
     'percent_complete' => '% completo',
     'uploading' => 'Subiendo... ',
-    'upload_error' => 'Error al cargar el archivo. Por favor, compruebe que no hay filas vacías y que no hay nombres de columna duplicados.',
+    'upload_error' => 'Error uploading file. Please check that you have no empty rows or duplicated column names in your CSV, and that the server permissions allow uploads.',
     'copy_to_clipboard' => 'Copiar al portapapeles',
     'copied' => '¡Copiado!',
     'status_compatibility' => 'Si los activos ya están asignados, no se pueden cambiar a un tipo de estado no utilizable y este cambio de valor se omitirá.',
-    'rtd_location_help' => 'Esta es la ubicación del recurso cuando no está seleccionado',
+    'rtd_location_help' => 'Esta es la ubicación del activo cuando no está asignado',
     'item_not_found' => ':item_type ID :id no existe o ha sido eliminado',
     'action_permission_denied' => 'No tiene permiso para :action :item_type ID :id',
-    'action_permission_generic' => 'No tiene permiso para :action this :item_type',
+    'action_permission_generic' => 'No tiene permiso para :action este :item_type',
     'edit' => 'editar',
-    'action_source' => 'Fuente de acción',
+    'action_source' => 'Origen de la acción',
     'or' => 'o',
     'url'                   => 'URL',
     'edit_fieldset' => 'Editar campos y opciones de grupos de campos',
     'permission_denied_superuser_demo' => 'Permiso denegado. No puede actualizar la información de usuario para superadministradores en la demo.',
     'pwd_reset_not_sent' => 'El usuario no está activado, está sincronizado con LDAP o no tiene una dirección de correo electrónico',
-    'error_sending_email' => 'Error al enviar email',
-    'sad_panda' => 'Sad panda. You are not authorized to do the thing. Maybe <a href=":link">return to the dashboard</a>, or contact your administrator.',
+    'error_sending_email' => 'Error al enviar correo electrónico',
+    'sad_panda' => 'No está autorizado a realizar esta acción. Puede <a href=":link">regresar al tablero</a>, o ponerse en contacto con su administrador.',
     'bulk' => [
             'delete' =>
                 [
@@ -544,11 +554,76 @@ return [
 
     'countable' => [
         'accessories'  => ':count Accesorio|:count Accesorios',
-        'assets'  => ':count Activos|:count Activos',
-        'licenses'  => ':count Licencia|:count Licencias',
-        'license_seats'  => ':count Asiento de licencia|:count Asientos de licencia',
-        'consumables'  => ':count Consumible|:count Consumibles',
+        'assets'  => ':count activo|:count activos',
+        'licenses'  => ':count licencia|:count licencias',
+        'license_seats'  => ':count licencia|:count licencias',
+        'consumables'  => ':count consumible|:count consumibles',
         'components'  => ':count component|:count componentes',
-    ]
+    ],
+
+    'more_info' => 'Más información',
+    'quickscan_bulk_help' => 'Al marcar esta casilla se actualizará el activo para reflejar esta nueva ubicación. Dejarla sin marcar, simplemente almacenará la ubicación en el registro de auditoría. Tenga en cuenta que si este activo ya está asignado, no cambiará la ubicación de la persona, del activo o de la ubicación a la que esté asignado.',
+    'whoops' => '¡Uy!',
+    'something_went_wrong' => 'Algo falló en su solicitud.',
+    'close' => 'Cerrar',
+    'expires' => 'Vence',
+    'map_fields'=> 'Asociar los campos para :item_type',
+    'remaining_var' => ':count restantes',
+    'label' => 'Etiqueta',
+    'import_asset_tag_exists' => 'Ya existe un activo con la placa :asset_tag y no se ha solicitado una actualización. No se ha realizado ningún cambio.',
+    'countries_manually_entered_help' => 'Los valores con asterisco (*) fueron introducidos manualmente y no coinciden con los valores desplegables ISO 3166 existentes',
+    'accessories_assigned' => 'Accesorios asignados',
+    'user_managed_passwords' => 'Gestión de contraseña',
+    'user_managed_passwords_disallow' => 'Evitar que los usuarios gestionen sus propias contraseñas',
+    'user_managed_passwords_allow' => 'Permitir a los usuarios gestionar sus propias contraseñas',
+    'from' => 'From',
+    'by' => 'Por',
+
+// Add form placeholders here
+    'placeholders' => [
+        'notes'  => 'Add a note',
+    ],
+
+    'breadcrumb_button_actions' => [
+        'edit_item' => 'Edit :name',
+        'checkout_item' => 'Checkout :name',
+        'checkin_item' => 'Checkin :name',
+    ],
+
+    'skins' => [
+        'site_default' => 'Sitio por defecto',
+        'default_blue' => 'Default Blue',
+        'blue_dark' => 'Blue (Dark Mode)',
+        'green' => 'Green Dark',
+        'green_dark' => 'Green (Dark Mode)',
+        'red' => 'Red Dark',
+        'red_dark' => 'Red (Dark Mode)',
+        'orange' => 'Orange Dark',
+        'orange_dark' => 'Orange (Dark Mode)',
+        'black' => 'Black',
+        'black_dark' => 'Black (Dark Mode)',
+        'purple' => 'Purple',
+        'purple_dark' => 'Purple (Dark Mode)',
+        'yellow' => 'Yellow',
+        'yellow_dark' => 'Yellow (Dark Mode)',
+        'high_contrast' => 'High Contrast',
+
+    ],
+
+    'select_all_none' => 'Select/Unselect All',
+    'generic_model_not_found' => 'That :model was not found or you do not have permission to access it',
+    'deleted_models' => 'Deleted Asset Models',
+    'deleted_users' => 'Deleted Users',
+    'cost_each' => ':amount each',
+    'remove_current_image' => 'Remove current :type image',
+
+    'seeding' => [
+        'manufacturers' => [
+            'button' => 'Create Manufacturers',
+            'prompt' => 'You do not have any manufacturers yet. Would you like to seed a list of common manufacturers? (THIS WILL OVERWRITE EXISTING MANUFACTURERS, including those that have been soft-deleted.)',
+            'success' => 'Manufacturers seeded successfully',
+            'error' => 'Could not seed manufacturers. A manufacturer record already exists and seeding would overwrite it.|Could not seed manufacturers. :count manufacturer records already exist and seeding would overwrite them.',
+        ],
+    ],
 
 ];
diff --git a/resources/lang/es-ES/help.php b/resources/lang/es-ES/help.php
index 92cce3855f..13fb579b49 100644
--- a/resources/lang/es-ES/help.php
+++ b/resources/lang/es-ES/help.php
@@ -15,19 +15,19 @@ return [
 
     'more_info_title' => 'Más información',
 
-    'audit_help' => 'Al marcar esta casilla se editará el registro de activos para reflejar esta nueva ubicación. Dejarla desmarcada simplemente se notará la ubicación en el registro de auditoría.<br><br>Tenga en cuenta que si este activo está desprotegido, no cambiará la ubicación de la persona, el activo o la ubicación en la que está verificado.',
+    'audit_help' => 'Al marcar esta casilla se actualizará el activo para reflejar esta nueva ubicación. Dejarla sin marcar, simplemente almacenará la ubicación en el registro de auditoría.<br><br>Tenga en cuenta que si este activo ya está asignado, no cambiará la ubicación de la persona, del activo o de la ubicación a la que esté asignado.',
 
-    'assets' => 'Los activos son elementos con número de serie o etiqueta de activos.  Tienden a ser artículos de alto valor donde es importante identificar un elemento específico.',
+    'assets' => 'Los activos son artículos rastreados por número de serie o placa de activo.  Suelen ser artículos de alto valor en los que es importante identificar un elemento específico.',
 
-    'categories' => 'Las categorías te ayudan a organizar tus elementos. Unos ejemplos de categorías podrían ser: &quot;Pc Escritorios&quot;, &quot;Portátiles&quot;, &quot;Móviles&quot;, &quot;Tabletas&quot;, etc.',
+    'categories' => 'Las categorías le ayudan a organizar sus elementos. Unos ejemplos de categorías podrían ser: &quot;PC Escritorios&quot;, &quot;Portátiles&quot;, &quot;Móviles&quot;, &quot;Tabletas&quot;, etc.',
 
-    'accessories' => 'Los accesorios son cualquier cosa que se le asigne a los usuarios pero que no tenga numero de serie (o no importe realizarle el seguimiento en forma unica). Por ejemplo, mouse o teclados.',
+    'accessories' => 'Los accesorios son cualquier cosa que se le asigne a los usuarios pero que no tenga número de serie (o no importe realizarle el seguimiento en forma única). Por ejemplo, ratones o teclados.',
 
-    'companies'     => 'Las compañías se pueden utilizar como un simple campo identificador, o se pueden utilizar para limitar la visibilidad de los activos, usuarios, etc si la opción "Soporte completo a múltiples compañías" está habilitado en "Configuración de administrador".',
+    'companies'     => 'Las compañías se pueden utilizar como un simple campo identificador, o se pueden utilizar para limitar la visibilidad de los activos, usuarios, etc. si la opción "Soporte completo a múltiples compañías" está habilitada en "Configuración de administración".',
 
-    'components'    => 'Los componentes son elementos que son parte de un activo, por ejemplo HDD, RAM, etc.',
+    'components'    => 'Los componentes son elementos que son parte de un activo, por ejemplo, el disco duro, RAM, etc.',
 
-    'consumables'   => 'Los consumibles son cualquier cosa comprada que se usará con el tiempo. Por ejemplo, tinta de impresora o papel copiador.',
+    'consumables'   => 'Los consumibles son todo aquello que se compra y que se agota con el tiempo. Por ejemplo, tinta de impresora o papel de fotocopiadora.',
 
     'depreciations' => 'Puede configurar la depreciación de activos usando un método de línea recta.',
     
diff --git a/resources/lang/es-ES/localizations.php b/resources/lang/es-ES/localizations.php
index 7a9161e375..f8945d4c8e 100644
--- a/resources/lang/es-ES/localizations.php
+++ b/resources/lang/es-ES/localizations.php
@@ -40,17 +40,19 @@ return [
         'ms-MY'=> 'Malayo',
         'mi-NZ'=> 'Maorí',
         'mn-MN'=> 'Mongol',
-        'no-NO'=> 'Noruego',
+        'nb-NO'=> 'Noruego Bokmål',
+        'om-ET' => 'Oromo (Ethiopian)',
+        //'nn-NO'=> 'Norwegian Nynorsk',
         'fa-IR'=> 'Persa',
         'pl-PL'=> 'Polaco',
         'pt-PT'=> 'Portugués',
-        'pt-BR'=> 'Portugués, Brasileño',
+        'pt-BR'=> 'Portugués, Brasil',
         'ro-RO'=> 'Rumano',
         'ru-RU'=> 'Ruso',
         'sr-CS' => 'Serbio (Latino)',
         'sk-SK'=> 'Eslovaco',
         'sl-SI'=> 'Esloveno',
-        'so-SO'=> 'Somali',
+        'so-SO'=> 'Somalí',
         'es-ES'=> 'Español',
         'es-CO'=> 'Español, Colombia',
         'es-MX'=> 'Español, México',
@@ -85,7 +87,7 @@ return [
         'AT'=>'Austria',
         'AU'=>'Australia',
         'AW'=>'Aruba',
-        'AX'=>'Åland',
+        'AX'=>'Islas Aland',
         'AZ'=>'Azerbaiyán',
         'BA'=>'Bosnia y Herzegovina',
         'BB'=>'Barbados',
@@ -93,7 +95,7 @@ return [
         'BD'=>'Bangladesh',
         'BF'=>'Burkina Faso',
         'BG'=>'Bulgaria',
-        'BH'=>'Bahréin',
+        'BH'=>'Baréin',
         'BI'=>'Burundi',
         'BJ'=>'Benín',
         'BM'=>'Bermuda',
@@ -133,6 +135,7 @@ return [
         'EC'=>'Ecuador',
         'EE'=>'Estonia',
         'EG'=>'Egipto',
+        'GB-ENG'=>'Inglaterra',
         'ER'=>'Eritrea',
         'ES'=>'España',
         'ET'=>'Etiopía',
@@ -231,6 +234,7 @@ return [
         'NG'=>'Nigeria',
         'NI'=>'Nicaragua',
         'NL'=>'Países Bajos',
+        'GB-NIR' => 'Irlanda del Norte',
         'NO'=>'Noruega',
         'NP'=>'Nepal',
         'NR'=>'Nauru',
@@ -258,7 +262,7 @@ return [
         'RU'=>'Federación Rusa',
         'RW'=>'Ruanda',
         'SA'=>'Arabia Saudita',
-        'UK'=>'Escocia',
+        'GB-SCT'=>'Escocia',
         'SB'=>'Islas Salomón',
         'SC'=>'Seychelles',
         'SS'=>'Sudán del Sur',
@@ -287,8 +291,8 @@ return [
         'TJ'=>'Tajikistan',
         'TK'=>'Tokelau',
         'TI'=>'Timor Oriental',
-        'TM'=>'Turkmenistan',
-        'TN'=>'Tunisia',
+        'TM'=>'Turkmenistán',
+        'TN'=>'Túnez',
         'TO'=>'Tonga',
         'TP'=>'Timor Oriental (código antiguo)',
         'TR'=>'Turquía',
@@ -310,6 +314,7 @@ return [
         'VI'=>'Islas Vírgenes (EE. UU.)',
         'VN'=>'Vietnam',
         'VU'=>'Vanuatu',
+        'GB-WLS' =>'Gales',
         'WF'=>'Islas Wallis y Futuna',
         'WS'=>'Samoa',
         'YE'=>'Yemen',
diff --git a/resources/lang/es-ES/mail.php b/resources/lang/es-ES/mail.php
index d307a8e610..b020245410 100644
--- a/resources/lang/es-ES/mail.php
+++ b/resources/lang/es-ES/mail.php
@@ -2,92 +2,98 @@
 
 return [
 
-    'Accessory_Checkin_Notification' => 'Accesorio devuelto',
-    'Accessory_Checkout_Notification' => 'Accesorio reservado',
-    'Asset_Checkin_Notification' => 'Activo devuelto',
+    'Accessory_Checkin_Notification' => 'Accesorio ingresado',
+    'Accessory_Checkout_Notification' => 'Accesorio asignado',
+    'Asset_Checkin_Notification' => 'Activo ingresado',
     'Asset_Checkout_Notification' => 'Activo asignado',
-    'Confirm_Accessory_Checkin' => 'Confirmación de devolución de accesorio',
-    'Confirm_Asset_Checkin' => 'Confirmación de devolución de activo',
+    'Confirm_Accessory_Checkin' => 'Confirmación de ingreso de accesorio',
+    'Confirm_Asset_Checkin' => 'Confirmación de ingreso de activo',
     'Confirm_accessory_delivery' => 'Confirmación de entrega de accesorio',
     'Confirm_asset_delivery' => 'Confirmación de entrega de activo',
     'Confirm_consumable_delivery' => 'Confirmación de entrega de consumible',
     'Confirm_license_delivery' => 'Confirmación de entrega de licencia',
-    'Consumable_checkout_notification' => 'Consumible comprobado',
+    'Consumable_checkout_notification' => 'Consumible asignado',
     'Days' => 'Días',
-    'Expected_Checkin_Date' => 'Un activo asignado a Ud. debe ser devuelto en :date',
+    'Expected_Checkin_Date' => 'Un activo asignado a Ud. debe ser devuelto el :date',
     'Expected_Checkin_Notification' => 'Recordatorio: :name se acerca la fecha de devolución',
-    'Expected_Checkin_Report' => 'Informe de devolución de activo esperado',
-    'Expiring_Assets_Report' => 'Informe de activos que expiran.',
-    'Expiring_Licenses_Report' => 'Informe de licencias que expiran.',
-    'Item_Request_Canceled' => 'Solicitud de cancelación de requerimiento',
+    'Expected_Checkin_Report' => 'Informe de próximas devoluciones de activos',
+    'Expiring_Assets_Report' => 'Informe de activos con garantía próxima a vencer.',
+    'Expiring_Licenses_Report' => 'Informe de licencias próximas a vencer.',
+    'Item_Request_Canceled' => 'Solicitud de artículo cancelada',
     'Item_Requested' => 'Artículo solicitado',
     'License_Checkin_Notification' => 'Licencia devuelta',
-    'License_Checkout_Notification' => 'Licencia reservada',
-    'Low_Inventory_Report' => 'Reporte de inventario bajo',
-    'a_user_canceled' => 'El usuario ha cancelado el item solicitado en la pagina Web',
-    'a_user_requested' => 'Un usuario a solicitado un item en la pagina Web',
+    'License_Checkout_Notification' => 'Licencia asignada',
+    'license_for'   => 'Licenciado para',
+    'Low_Inventory_Report' => 'Informe sobre inventario bajo',
+    'a_user_canceled' => 'El usuario ha cancelado el elemento solicitado en la página web',
+    'a_user_requested' => 'Un usuario ha solicitado un elemento en la página web',
     'acceptance_asset_accepted' => 'Un usuario ha aceptado un elemento',
     'acceptance_asset_declined' => 'Un usuario ha rechazado un elemento',
-    'accessory_name' => 'Nombre de accesorio:',
-    'additional_notes' => 'Notas adicionales:',
-    'admin_has_created' => 'Un administrador ha creado una cuenta para ti en la web :web.',
-    'asset' => 'Activo:',
-    'asset_name' => 'Nombre del activo:',
+    'accessory_name' => 'Nombre de accesorio',
+    'additional_notes' => 'Notas adicionales',
+    'admin_has_created' => 'Un administrador ha creado una cuenta para usted en el sitio :web.',
+    'asset' => 'Activo',
+    'asset_name' => 'Nombre del activo',
     'asset_requested' => 'Activo solicitado',
-    'asset_tag' => 'Etiqueta de activo',
+    'asset_tag' => 'Placa del activo',
     'assets_warrantee_alert' => 'Hay :count activo con una garantía que expira en los próximos :threshold days.|Hay :count activos con garantías que expiran en los siguientes :threshold days.',
     'assigned_to' => 'Asignado a',
     'best_regards' => 'Cordialmente,',
-    'canceled' => 'Cancelado:',
-    'checkin_date' => 'Fecha de devolución:',
-    'checkout_date' => 'Fecha de asignación:',
-    'checkedout_from' => 'Salido de',
-    'checkedin_from'  => 'Registrado desde',
-    'checked_into' => 'Registrado en',
+    'canceled' => 'Cancelado',
+    'checkin_date' => 'Fecha de ingreso',
+    'checkout_date' => 'Fecha de asignación',
+    'checkedout_from' => 'Asignado desde',
+    'checkedin_from'  => 'Devuelto desde',
+    'checked_into' => 'Devuelto en',
     'click_on_the_link_accessory' => 'Haga clic en el enlace en la parte inferior para confirmar que ha recibido el accesorio.',
     'click_on_the_link_asset' => 'Haga clic en el enlace en la parte inferior para confirmar que ha recibido el activo.',
-    'click_to_confirm' => 'Por favor, pulsa en el siguiente enlace para verificar tu cuenta de :web:',
+    'click_to_confirm' => 'Por favor, haga clic en el siguiente enlace para confirmar su cuenta de :web:',
     'current_QTY' => 'Cantidad actual',
     'days' => 'Días',
-    'expecting_checkin_date' => 'Fecha esperada de devolución:',
-    'expires' => 'Expira',
+    'expecting_checkin_date' => 'Fecha esperada de devolución',
+    'expires' => 'Vence',
     'hello' => 'Hola',
     'hi' => 'Hola',
     'i_have_read' => 'He leído y aceptado los términos de uso, y he recibido este artículo.',
     'inventory_report' => 'Informe de inventario',
-    'item' => 'Articulo:',
+    'item' => 'Elemento',
+    'item_checked_reminder' => 'Este es un recordatorio de que actualmente tiene :count elemento(s) asignado(s) que no ha aceptado o rechazado. Haga clic en el siguiente enlace para confirmar su decisión.',
     'license_expiring_alert' => 'Hay :count licencia que expira en los próximos :threshold días. | Hay :count licencias que expiran en los próximos :threshold días.',
-    'link_to_update_password' => 'Haga clic en el siguiente enlace para actualizar su: contraseña de la web:',
-    'login' => 'Entrar:',
+    'link_to_update_password' => 'Por favor, haga clic en el siguiente enlace para actualizar su contraseña de :web :',
+    'login' => 'Iniciar sesión',
     'login_first_admin' => 'Inicie sesión en su nueva instalación de Snipe-IT usando las credenciales:',
-    'low_inventory_alert' => 'Hay :count elemento que está por debajo del inventario mínimo o que pronto estará debajo.|Hay :count elementos que están por debajo del inventario mínimo o que pronto serán bajos.',
+    'low_inventory_alert' => 'Hay :count elemento que está por debajo del inventario mínimo o que pronto lo estará.|Hay :count elementos que están por debajo del inventario mínimo o que pronto lo estarán.',
     'min_QTY' => 'Cantidad mínima',
     'name' => 'Nombre',
     'new_item_checked' => 'Un nuevo artículo ha sido asignado a su nombre, los detalles están a continuación.',
+    'new_item_checked_with_acceptance' => 'A new item has been checked out under your name that requires acceptance, details are below.',
+    'recent_item_checked' => 'An item was recently checked out under your name that requires acceptance, details are below.',
     'notes' => 'Notas',
-    'password' => 'Contraseña:',
+    'password' => 'Contraseña',
     'password_reset' => 'Reiniciar la contraseña',
     'read_the_terms' => 'Por favor lea los términos de uso a continuación.',
     'read_the_terms_and_click' => 'Por favor lea los términos de uso a continuación y haga clic en el enlace en la parte inferior para confirmar que usted leyó los términos de uso y los acepta, y que ha recibido el activo.',
-    'requested' => 'Solicitado:',
-    'reset_link' => 'Tu enlace de restablecimiento de contraseña',
-    'reset_password' => 'Haga Clic aquí para restablecer su contraseña:',
+    'requested' => 'Solicitado',
+    'reset_link' => 'Su enlace de restablecimiento de contraseña',
+    'reset_password' => 'Haaga clic aquí para restablecer tu contraseña:',
     'rights_reserved' => 'Todos los derechos reservados.',
     'serial' => 'Número de serie',
     'snipe_webhook_test' => 'Prueba de integración de Snipe-IT',
     'snipe_webhook_summary' => 'Resumen de la prueba de integración de Snipe-IT',
     'supplier' => 'Proveedor',
-    'tag' => 'Etiqueta',
+    'tag' => 'Placa',
     'test_email' => 'Email de prueba de Snipe-IT',
-    'test_mail_text' => 'Esto es una prueba desde el sistema de gestión de activos de Snipe-IT. Si tienes esto, correo está funcionando :)',
+    'test_mail_text' => 'Esto es una prueba desde el sistema de gestión de activos Snipe-IT. Si recibió este mensaje, el correo está funcionando :)',
     'the_following_item' => 'El siguiente artículo ha sido devuelto: ',
-    'to_reset' => 'Para restaurar tu contraseña de :web, rellena este formulario:',
+    'to_reset' => 'Para restaurar su contraseña de :web, diligencie este formulario:',
     'type' => 'Tipo',
-    'upcoming-audits' => 'Hay :count activo que se está preparando para auditoría dentro de :threshold days.|Hay :count activos que se están preparando para auditoría en :threshold days.',
+    'upcoming-audits' => 'Hay :count activo para ser auditado antes de :threshold días.|Hay :count activos para ser auditados antes de :threshold días.',
     'user' => 'Usuario',
     'username' => 'Nombre de usuario',
+    'unaccepted_asset_reminder' => 'Reminder: You have Unaccepted Assets.',
     'welcome' => 'Bienvenido, :name',
     'welcome_to' => '¡Bienvenido a: web!',
-    'your_assets' => 'Ver tus activos',
-    'your_credentials' => 'Tus credenciales de Snipe-IT',
+    'your_assets' => 'Ver sus activos',
+    'your_credentials' => 'Sus credenciales de Snipe-IT',
+    'mail_sent' => '¡Correo enviado exitosamente!.',
 ];
diff --git a/resources/lang/es-ES/passwords.php b/resources/lang/es-ES/passwords.php
index f337c2c967..75469d1121 100644
--- a/resources/lang/es-ES/passwords.php
+++ b/resources/lang/es-ES/passwords.php
@@ -3,7 +3,7 @@
 return [
     'sent'	        => 'Si existe un usuario con una dirección de correo electrónico válida en nuestro sistema, se ha enviado un correo electrónico de recuperación de contraseña.',
     'user'			=> 'Si existe un usuario con una dirección de correo electrónico válida en nuestro sistema, se ha enviado un correo electrónico de recuperación de contraseña.',
-    'token'         => 'Este token de restablecimiento de contraseña no es válido o ha caducado, o no coincide con el nombre de usuario proporcionado.',
-    'reset'         => '¡Tu contraseña ha sido restablecida!',
+    'token'         => 'Esta sesión de restablecimiento de contraseña es inválida o ha caducado, o no coincide con el nombre de usuario proporcionado.',
+    'reset'         => '¡Su contraseña ha sido restablecida!',
     'password_change'  => '¡Su contraseña ha sido actualizada!',
 ];
diff --git a/resources/lang/es-ES/reminders.php b/resources/lang/es-ES/reminders.php
index 4b781311da..98f2819567 100644
--- a/resources/lang/es-ES/reminders.php
+++ b/resources/lang/es-ES/reminders.php
@@ -13,9 +13,9 @@ return array(
     |
     */
 
-    "password" => "Los passwords deben tener mínimo 6 caracteres y coincidir.",
-    "user"     => "Usuario o E-Mail incorrectos",
-    "token"    => 'Este token de restablecimiento de contraseña es inválido o ha caducado, o no coincide con el nombre de usuario proporcionado.',
+    "password" => "Las contraseñas deben ser de seis caracteres y coincidir con la confirmación.",
+    "user"     => "El nombre de usuario o la dirección de correo electrónico son incorrectos",
+    "token"    => 'Esta sesión de restablecimiento de contraseña es inválida o ha caducado, o no coincide con el nombre de usuario proporcionado.',
     'sent'	   => 'Si existe un usuario con una dirección de correo electrónico válida en nuestro sistema, se ha enviado un correo electrónico de recuperación de contraseña.',
 
 );
diff --git a/resources/lang/es-ES/table.php b/resources/lang/es-ES/table.php
index 75bdd56a6b..dea24233f7 100644
--- a/resources/lang/es-ES/table.php
+++ b/resources/lang/es-ES/table.php
@@ -5,7 +5,7 @@ return array(
     'actions'	 	        => 'Acciones',
     'action' 		        => 'Acción',
     'by'      		        => 'Por',
-    'item' 			        => 'Item',
+    'item' 			        => 'Elemento',
     'no_matching_records'   => 'No se encontraron registros que coincidan',
 
 );
diff --git a/resources/lang/es-ES/validation.php b/resources/lang/es-ES/validation.php
index d90b07236f..99f22708c2 100644
--- a/resources/lang/es-ES/validation.php
+++ b/resources/lang/es-ES/validation.php
@@ -13,100 +13,166 @@ return [
     |
     */
 
-    'accepted'             => ':attribute debe ser aceptado.',
-    'active_url'           => ':attribute no es una URL correcta.',
-    'after'                => ':attribute debe ser posterior a :date.',
-    'after_or_equal'       => 'El atributo: debe ser una fecha posterior o igual a: fecha.',
-    'alpha'                => ':attribute solo acepta letras.',
-    'alpha_dash'           => ':attribute solo acepta letras, números y guiones.',
-    'alpha_num'            => ':attribute solo acepta letras y números.',
-    'array'                => 'El: atributo debe ser una matriz.',
-    'before'               => ':attribute debe ser anterior a :date.',
-    'before_or_equal'      => 'El atributo: debe ser una fecha anterior o igual a: fecha.',
-    'between'              => [
-        'numeric' => ':attribute debe estar entre :min - :max.',
-        'file'    => ':attribute debe estar entre :min - :max kilobytes.',
-        'string'  => ':attribute debe estar entre :min - :max caracteres.',
-        'array'   => 'El atributo: debe tener entre: min y: elementos máximos.',
+    'accepted' => 'El campo :attribute debe ser aceptado.',
+    'accepted_if' => 'El campo :attribute debe ser aceptado cuando :other es :value.',
+    'active_url' => 'El campo :attribute debe ser una dirección URL válida.',
+    'after' => 'El campo :attribute debe ser una fecha posterior a :date.',
+    'after_or_equal' => 'El campo :attribute debe ser una fecha posterior o igual a :date.',
+    'alpha' => 'El campo :attribute debe contener únicamente letras.',
+    'alpha_dash' => 'El campo :attribute debe contener únicamente letras, números, guiones y guiones bajos.',
+    'alpha_num' => 'El campo :attribute debe contener únicamente letras y números.',
+    'array' => 'El campo :attribute debe ser un arreglo.',
+    'ascii' => 'El campo :attribute debe contener únicamente caracteres y símbolos alfanuméricos de un byte.',
+    'before' => 'El campo :attribute debe ser una fecha anterior a :date.',
+    'before_or_equal' => 'El campo :attribute debe ser una fecha anterior o igual a :date.',
+    'between' => [
+        'array' => 'El campo :attribute debe tener elementos entre :min y :max.',
+        'file' => 'El campo :attribute debe tener entre :min y :max kilobytes.',
+        'numeric' => 'El campo :attribute debe estar entre :min y :max.',
+        'string' => 'El campo :attribute debe tener entre :min y :max caracteres.',
     ],
-    'boolean'              => ':attribute debe ser verdadero o falso.',
-    'confirmed'            => ':attribute la confirmación no coincide.',
-    'date'                 => ':attribute no es una fecha correcta.',
-    'date_format'          => ':attribute no cumple el formato :format.',
-    'different'            => ':attribute y :other deben ser diferentes.',
-    'digits'               => ':attribute debe tener :digits dígitos.',
-    'digits_between'       => ':attribute debe tener entre :min y :max dígitos.',
-    'dimensions'           => 'El atributo: tiene dimensiones de imagen no válidas.',
-    'distinct'             => 'El campo: atributo tiene un valor duplicado.',
-    'email'                => ':attribute formato incorrecto.',
-    'exists'               => 'El :attribute seleccionado no es correcto.',
-    'file'                 => 'El: atributo debe ser un archivo.',
-    'filled'               => 'El campo: atributo debe tener un valor.',
-    'image'                => ':attribute debe ser una imagen.',
+    'boolean' => 'El campo :attribute debe ser verdadero o falso.',
+    'can' => 'El campo :attribute contiene un valor no autorizado.',
+    'confirmed' => 'La confirmación del campo :attribute no coincide.',
+    'contains' => 'Falta un valor obligatorio en el campo :attribute.',
+    'current_password' => 'La contraseña es incorrecta.',
+    'date' => 'El campo :attribute debe contener una fecha válida.',
+    'date_equals' => 'El campo :attribute debe ser una fecha igual a :date.',
+    'date_format' => 'El campo :attribute debe coincidir con el formato :format.',
+    'decimal' => 'El campo :attribute debe tener :decimal lugares decimales.',
+    'declined' => 'El campo :attribute debe ser rechazado.',
+    'declined_if' => 'El campo :attribute debe ser rechazado cuando :other es :value.',
+    'different' => 'Los campos :attribute y :other deben ser diferentes.',
+    'digits' => 'El campo :attribute debe tener :digits dígitos.',
+    'digits_between' => 'El campo :attribute debe tener entre :min y :max dígitos.',
+    'dimensions' => 'El campo :attribute tiene dimensiones de imagen no válidas.',
+    'distinct' => 'El campo: atributo tiene un valor duplicado.',
+    'doesnt_end_with' => 'El campo :attribute no debe finalizar con uno de los siguientes :values.',
+    'doesnt_start_with' => 'El campo :attribute no debe iniciar con uno de los siguientes :values.',
+    'email' => 'El campo :attribute debe ser una dirección de correo válida.',
+    'ends_with' => 'El campo :attribute debe finalizar con uno de los siguientes :values.',
+    'enum' => 'El :attribute seleccionado no es correcto.',
+    'exists' => 'El :attribute seleccionado no es correcto.',
+    'extensions' => 'El campo :attribute debe tener una de las siguientes extensiones :values.',
+    'file' => 'El campo :attribute debe ser un archivo.',
+    'filled' => 'El campo: atributo debe tener un valor.',
+    'gt' => [
+        'array' => 'El campo :attribute debe tener más de :value elementos.',
+        'file' => 'El campo :attribute debe ser mayor que :value kilobytes.',
+        'numeric' => 'El campo :attribute debe ser mayor que :value.',
+        'string' => 'El campo :attribute debe ser mayor que :value caracteres.',
+    ],
+    'gte' => [
+        'array' => 'El campo :attribute debe tener :value elementos o más.',
+        'file' => 'El campo :attribute debe ser mayor que o igual a :value kilobytes.',
+        'numeric' => 'El campo :attribute debe ser mayor que o igual a :value.',
+        'string' => 'El campo :attribute debe ser mayor que o igual a :value caracteres.',
+    ],
+    'hex_color' => 'El campo :attribute debe ser un color hexadecimal válido.',
+    'image' => 'El campo :attribute debe ser una imagen.',
     'import_field_empty'    => 'El valor para :fieldname no puede ser nulo.',
-    'in'                   => 'El :attribute seleccionado no es correcto.',
-    'in_array'             => 'El campo: atributo no existe en: otro.',
-    'integer'              => ':attribute debe ser un número entero.',
-    'ip'                   => ':attribute debe ser una dirección IP correcta.',
-    'ipv4'                 => 'El atributo: debe ser una dirección IPv4 válida.',
-    'ipv6'                 => 'El atributo: debe ser una dirección IPv6 válida.',
-    'is_unique_department' => 'El atributo :attribute debe ser único para esta ubicación de la compañía',
-    'json'                 => 'El atributo: debe ser una cadena JSON válida.',
-    'max'                  => [
-        'numeric' => ':attribute no debe ser mayor que :max.',
-        'file'    => ':attribute no debe ser mayor que :max kilobytes.',
-        'string'  => ':attribute no debe tener como máximo :max caracteres.',
-        'array'   => 'El atributo: puede no tener más que: elementos máximos.',
+    'in' => 'El :attribute seleccionado no es correcto.',
+    'in_array' => 'El campo :attribute debe existir en :other.',
+    'integer' => 'El campo :attribute debe ser un valor entero.',
+    'ip' => 'El campo :attribute debe ser una dirección IP válida.',
+    'ipv4' => 'El campo :attribute debe ser una dirección IPv4 válida.',
+    'ipv6' => 'El campo :attribute debe ser una dirección IPv6 válida.',
+    'json' => 'El campo :attribute debe ser una cadena de texto JSON válida.',
+    'list' => 'The campo :attribute debe ser una lista.',
+    'lowercase' => 'El campo :attribute debe estar en minúsculas.',
+    'lt' => [
+        'array' => 'El campo :attribute debe tener menos que :value elementos.',
+        'file' => 'El campo :attribute debe ser menor que :value kilobytes.',
+        'numeric' => 'El campo :attribute debe ser menor que :value.',
+        'string' => 'El campo :attribute debe ser menor que :value caracteres.',
     ],
-    'mimes'                => ':attribute debe ser un archivo del tipo: :values.',
-    'mimetypes'            => 'El atributo: debe ser un archivo de tipo:: valores.',
-    'min'                  => [
-        'numeric' => ':attribute debe ser como mínimo :min.',
-        'file'    => ':attribute debe ser como mínimo de :min kilobytes.',
-        'string'  => ':attribute debe contener como mínimo :min caracteres.',
-        'array'   => 'El atributo: debe tener al menos: elementos min.',
+    'lte' => [
+        'array' => 'El campo :attribute no debe tener más de :value elementos.',
+        'file' => 'El campo :attribute debe ser menor que o igual a :value kylobytes.',
+        'numeric' => 'El campo :attribute debe ser menor que o igual a :value.',
+        'string' => 'El campo :attribute debe ser menor que o igual a :value caracteres.',
     ],
-    'starts_with'          => 'El :attribute debe comenzar con uno de los siguientes: :values.',
-    'ends_with'            => 'El campo :attribute debe terminar con uno de los siguientes: :values.',
+    'mac_address' => 'El campo :attribute debe ser una dirección MAC válida.',
+    'max' => [
+        'array' => 'El campo :attribute no debe tener más de :max elementos.',
+        'file' => 'El campo :attribute no debe ser mayor que :max kilobytes.',
+        'numeric' => 'El campo :attribute no debe ser mayor que :max.',
+        'string' => 'El campo :attribute no debe ser mayor que :max caracteres.',
+    ],
+    'max_digits' => 'El campo :attribute no debe tener más de :max dígitos.',
+    'mimes' => 'El campo :attribute debe un archivo de tipo: :values.',
+    'mimetypes' => 'El campo :attribute debe un archivo de tipo: :values.',
+    'min' => [
+        'array' => 'El campo :attribute debe tener al menos :min elementos.',
+        'file' => 'El campo :attribute debe ser de al menos :min kilobytes.',
+        'numeric' => 'El campo :attribute debe ser al menos :min.',
+        'string' => 'El campo :attribute debe contener como mínimo :min caracteres.',
+    ],
+    'min_digits' => 'El campo :attribute debe contener como mínimo :min dígitos.',
+    'missing' => 'El campo :attribute debe estar vacío.',
+    'missing_if' => 'El campo :attribute debe estar vacío cuando :other sea :value.',
+    'missing_unless' => 'El campo :attribute debe estar vacío a menos que :other sea :value.',
+    'missing_with' => 'El campo :attribute debe estar vacío cuando :values esté presente.',
+    'missing_with_all' => 'El campo :attribute debe estar vacío cuando :values estén presentes.',
+    'multiple_of' => 'El campo :attribute debe ser un múltiplo de :value.',
+    'not_in' => 'El :attribute seleccionado no es correcto.',
+    'not_regex' => 'El campo :attribute no es válido.',
+    'numeric' => 'El campo :attribute debe ser un número.',
+    'password' => [
+        'letters' => 'El cammpo :attribute debe contener al menos una letra.',
+        'mixed' => 'El campo :attribute debe contener al menos una letra minúscula y una mayúscula.',
+        'numbers' => 'El campo :attribute debe contener al menos un número.',
+        'symbols' => 'El campo :attribute debe contener al menos un símbolo.',
+        'uncompromised' => 'El valor de :attribute ha aparecido en una fuga de datos. Por favor, seleccione un valor diferente para :attribute.',
+    ],
+    'percent'       => 'El mínimo de amortización debe estar entre 0 y 100 cuando el tipo de amortización es porcentual.',
 
-    'not_in'               => 'El :attribute seleccionado no es correcto.',
-    'numeric'              => ':attribute debe ser un número.',
-    'present'              => 'El campo: atributo debe estar presente.',
-    'valid_regex'          => 'Este no es un regex válido. ',
-    'regex'                => ':attribute formato incorrecto.',
-    'required'             => 'El campo :attribute es obligatorio.',
-    'required_if'          => 'El campo :attribute es obligatorio cuando :other es :value.',
-    'required_unless'      => 'El campo :attribute es obligatorio a menos que :other esté en :values.',
-    'required_with'        => ':attribute es obligatrio cuando :values es present.',
-    'required_with_all'    => 'El campo: atributo se requiere cuando: los valores están presentes.',
-    'required_without'     => ':attribute es obligatrio cuando :values es not present.',
-    'required_without_all' => 'El campo: atributo es necesario cuando ninguno de: valores están presentes.',
-    'same'                 => ':attribute y :other deben coincidir.',
-    'size'                 => [
-        'numeric' => ':attribute debe tener :size.',
-        'file'    => ':attribute debe tener :size kilobytes.',
-        'string'  => ':attribute debe tener :size caracteres.',
-        'array'   => 'El atributo: debe contener: elementos de tamaño.',
+    'present' => 'El campo: atributo debe estar presente.',
+    'present_if' => 'El campo :attribute debe estar presente cuando :other sea :value.',
+    'present_unless' => 'El campo :attribute debe estar presente a menos que :other sea :value.',
+    'present_with' => 'El campo :attribute debe estar presente cuando :values esté presente.',
+    'present_with_all' => 'El campo :attribute debe estar presente cuando :values estén presentes.',
+    'prohibited' => 'El campo :attribute está prohibido.',
+    'prohibited_if' => 'El campo :attribute está prohibido cuando :other sea :value.',
+    'prohibited_unless' => 'El campo :attribute está prohibido a menos que :other esté en :values.',
+    'prohibits' => 'El campo :attribute prohíbe la presencia de :other.',
+    'regex' => 'El formato del campo :attribute no es válido.',
+    'required' => 'El campo :attribute es obligatorio.',
+    'required_array_keys' => 'El campo :attribute debe contener valores para: :values.',
+    'required_if' => 'El campo :attribute es obligatorio cuando :other es :value.',
+    'required_if_accepted' => 'El campo :attribute es obligatorio cuando se acepta :other.',
+    'required_if_declined' => 'El campo :attribute es requerido cuando :other es rechazado.',
+    'required_unless' => 'El campo :attribute es obligatorio a menos que :other esté en :values.',
+    'required_with' => 'El campo :attribute es obligatorio cuando :values está presente.',
+    'required_with_all' => 'El campo :attribute es requerido cuando :values están presentes.',
+    'required_without' => ':attribute es obligatrio cuando :values es not present.',
+    'required_without_all' => 'El campo :attribute es obligatorio cuando no está presente ninguno de los :values.',
+    'same' => 'El campo :attribute debe coincidir con :other.',
+    'size' => [
+        'array' => 'El campo :attribute debe contenter :size elementos.',
+        'file' => 'El campo :attribute debe ser de :size kilobytes.',
+        'numeric' => 'El campo :attribute debe ser :size.',
+        'string' => 'El campo :attribute debe ser de :size caracteres.',
     ],
+    'starts_with' => 'El campo :attribute debe iniciar con uno de los siguientes: :values.',
     'string'               => 'El atributo: debe ser una cadena.',
-    'timezone'             => 'El atributo: debe ser una zona válida.',
-    'two_column_unique_undeleted' => ':attribute debe ser único a través de :table1 y :table2. ',
-    'unique'               => ':attribute ya ha sido introducido.',
-    'uploaded'             => 'El atributo: no se pudo cargar.',
-    'url'                  => ':attribute formato incorrecto.',
-    'unique_undeleted'     => 'El :atrribute debe ser único.',
+    'two_column_unique_undeleted' => ':attribute debe ser único entre la :table1 y :table2. ',
+    'unique_undeleted'     => ':attribute debe ser único.',
     'non_circular'         => ':attribute no debe crear una referencia circular.',
     'not_array'            => ':attribute no puede ser una matriz.',
-    'disallow_same_pwd_as_user_fields' => 'La contraseña no puede ser la misma que el usuario.',
+    'disallow_same_pwd_as_user_fields' => 'La contraseña no puede ser la misma que el nombre de usuario.',
     'letters'              => 'La contraseña debe contener al menos una letra.',
     'numbers'              => 'La contraseña debe contener al menos un número.',
     'case_diff'            => 'La contraseña debe usar mayúsculas y minúsculas.',
     'symbols'              => 'La contraseña debe contener símbolos.',
-    'gte'                  => [
-        'numeric'          => 'El valor no puede ser negativo'
-    ],
-    'checkboxes'           => ':attribute contiene opciones no válidas.',
-    'radio_buttons'        => ':attribute no es válido.',
+    'timezone' => 'El campo :attribute debe ser una zona horaria válida.',
+    'unique' => ':attribute ya está en uso.',
+    'uploaded' => ':attribute no se pudo cargar.',
+    'uppercase' => 'El campo :attribute debe estar en mayúsculas.',
+    'url' => 'El campo :attribute debe ser una URL válida.',
+    'ulid' => 'El campo :attribute debe ser un ULID válido.',
+    'uuid' => 'El campo :attribute debe ser un UUID válido.',
+    'fmcs_location' => 'Full multiple company support and location scoping is enabled in the Admin Settings, and the selected location and selected company are not compatible.',
 
 
     /*
@@ -120,26 +186,38 @@ return [
     |
     */
 
+    'email_array'      => 'Una o más direcciones de correo electrónico no son válidas.',
+    'checkboxes'           => ':attribute contiene opciones no válidas.',
+    'radio_buttons'        => ':attribute no es válido.',
+    
     'custom' => [
-        'alpha_space' => 'El campo: atributo contiene un carácter que no está permitido.',
-        'email_array'      => 'Una o más direcciones de correo electrónico no es válida.',
-        'hashed_pass'      => 'Tu contraseña actual es incorrecta',
+        'alpha_space' => 'El campo :attribute contiene un carácter que no está permitido.',
+
+        'hashed_pass'      => 'Su contraseña actual es incorrecta',
         'dumbpwd'          => 'Esa contraseña es muy común.',
         'statuslabel_type' => 'Debe seleccionar un tipo de etiqueta de estado válido.',
+        'custom_field_not_found'          => 'Este campo parece que no existe, por favor, compruebe los nombres de sus campos personalizados.',
+        'custom_field_not_found_on_model' => 'Este campo parece existir, pero no está disponible en este conjunto de campos para el modelo de activo.',
 
         // date_format validation with slightly less stupid messages. It duplicates a lot, but it gets the job done :(
-        // We use this because the default error message for date_format is reflects php Y-m-d, which non-PHP
-        // people won't know how to format. 
-        'purchase_date.date_format'     => 'El :attribute debe ser una fecha válida en formato AAAA-MM-DD',
-        'last_audit_date.date_format'   =>  'El :attribute debe ser una fecha válida en formato AAAA-MM-DD hh:mm:ss',
-        'expiration_date.date_format'   =>  'El :attribute debe ser una fecha válida en formato AAAA-MM-DD',
-        'termination_date.date_format'  =>  'El :attribute debe ser una fecha válida en formato AAAA-MM-DD',
-        'expected_checkin.date_format'  =>  ':attribute debe ser una fecha válida en formato AAA-MM-DD',
-        'start_date.date_format'        =>  'El :attribute debe ser una fecha válida en formato AAAA-MM-DD',
-        'end_date.date_format'          =>  'El :attribute debe ser una fecha válida en formato AAAA-MM-DD',
+        // We use this because the default error message for date_format reflects php Y-m-d, which non-PHP
+        // people won't know how to format.
+        'purchase_date.date_format'     => ':attribute debe ser una fecha válida en formato AAAA-MM-DD',
+        'last_audit_date.date_format'   =>  'El campo :attribute debe ser una fecha válida en formato AAAA-MM-DD hh:mm:ss',
+        'expiration_date.date_format'   =>  ':attribute debe ser una fecha válida en formato AAAA-MM-DD',
+        'termination_date.date_format'  =>  ':attribute debe ser una fecha válida en formato AAAA-MM-DD',
+        'expected_checkin.date_format'  =>  ':attribute debe ser una fecha válida en formato AAAA-MM-DD',
+        'start_date.date_format'        =>  ':attribute debe ser una fecha válida en formato AAAA-MM-DD',
+        'end_date.date_format'          =>  ':attribute debe ser una fecha válida en formato AAAA-MM-DD',
+        'invalid_value_in_field' => 'Valor no válido incluido en este campo',
 
-    ],
+        'ldap_username_field' => [
+            'not_in' =>         '<code>sAMAccountName</code> (mezcla de mayúsculas y minúsculas) no funcionará. Debe utilizar <code>samaccountname</code> (minúsculas) en su lugar.'
+        ],
+        'ldap_auth_filter_query' => ['not_in' => '<code>uid=samaccountname</code> probablemente no es un filtro de autenticación válido Probablemente quiera <code>uid=</code> '],
+        'ldap_filter' => ['regex' => 'Este valor probablemente no debería ir entre paréntesis.'],
 
+        ],
     /*
     |--------------------------------------------------------------------------
     | Custom Validation Attributes
@@ -155,8 +233,16 @@ return [
 
     /*
     |--------------------------------------------------------------------------
-    | Generic Validation Messages
+    | Generic Validation Messages - we use these in the jquery validation where we don't have
+    | access to the :attribute
     |--------------------------------------------------------------------------
     */
-    'invalid_value_in_field' => 'Valor no válido incluido en este campo',
+
+    'generic' => [
+        'invalid_value_in_field' => 'Valor no válido incluido en este campo',
+        'required' => 'El campo es obligatorio',
+        'email' => 'Por favor, ingrese una dirección de correo electrónico válida.',
+    ],
+
+
 ];
diff --git a/resources/lang/es-MX/account/general.php b/resources/lang/es-MX/account/general.php
index 7e637a3bef..b727b63023 100644
--- a/resources/lang/es-MX/account/general.php
+++ b/resources/lang/es-MX/account/general.php
@@ -2,10 +2,16 @@
 
 return array(
     'personal_api_keys' => 'Claves API personales',
-    'api_key_warning' => 'When generating an API token, be sure to copy it down immediately as they will not be visible to you again.',
-    'api_base_url' => 'La url base de tu API se encuentra en:',
+    'personal_access_token' => 'Credencial de acceso personal',
+    'personal_api_keys_success' => 'Clave API personal :key creada correctamente',
+    'here_is_api_key' => 'Aquí tiene su nueva credencial de acceso personal. Esta es la única vez que se mostrará, así que no la pierda. Ahora puede utilizar esta credencial para realizar solicitudes a la API.',
+    'api_key_warning' => 'Al generar una credencial para la API, asegúrese de copiarla inmediatamente, ya que no podrá volver a verla.',
+    'api_base_url' => 'La url base de su API se encuentra en:',
     'api_base_url_endpoint' => '/&lt;endpoint&gt;',
-    'api_token_expiration_time' => 'Los tokens de la API están establecidos para expirar en:',
-    'api_reference' => 'Please check the <a href="https://snipe-it.readme.io/reference" target="_blank">API reference</a> to find specific API endpoints and additional API documentation.',
-    'profile_updated' => 'Cuenta actualizada exitosamente',
+    'api_token_expiration_time' => 'Las credenciales de la API están establecidas para expirar en:',
+    'api_reference' => 'Consulte <a href="https://snipe-it.readme.io/reference" target="_blank">API reference</a> para encontrar los puntos finales (endpoins) de la API y documentación adicional.',
+    'profile_updated' => 'La cuenta fue actualizada exitosamente',
+    'no_tokens' => 'No ha creado ninguna credencial de acceso personal.',
+    'enable_sounds' => 'Habilitar efectos de sonido',
+    'enable_confetti' => 'Activar los efectos confeti',
 );
diff --git a/resources/lang/es-MX/admin/accessories/general.php b/resources/lang/es-MX/admin/accessories/general.php
index 057dd76613..5357639447 100644
--- a/resources/lang/es-MX/admin/accessories/general.php
+++ b/resources/lang/es-MX/admin/accessories/general.php
@@ -3,20 +3,20 @@
 return array(
     'accessory_category' 				=> 'Categoría de accesorio',
     'accessory_name'  					=> 'Nombre de accesorio',
-    'checkout'  							=> 'Checkout Accesorio',
-    'checkin'  							=> 'Checkin Accesorio',
-    'create'  							=> 'Crear Accesorio',
-    'edit'  							=> 'Editar Accesorio',
+    'checkout'  							=> 'Asignar accesorio',
+    'checkin'  							=> 'Ingresar accesorio',
+    'create'  							=> 'Crear accesorio',
+    'edit'  							=> 'Editar accesorio',
     'eula_text'							=> 'Acuerdo de uso de la categoría',
-    'eula_text_help'					=> 'Este campo permite personalizar los acuerdos de uso para tipos específicos de activos. Si solo tiene un acuerdo de uso para todos sus activos, puede seleccionar la siguiente opción para usar el valor por predeterminado.',
-    'require_acceptance'				=> 'Pedir a los usuarios confirmación de aceptación de los elementos en esta categoría.',
+    'eula_text_help'					=> 'Este campo permite personalizar los acuerdos de uso para tipos específicos de activos. Si solo tiene un acuerdo de uso para todos sus activos, puede seleccionar la siguiente opción para usar el valor predeterminado.',
+    'require_acceptance'				=> 'Pedir a los usuarios confirmación de aceptación de los activos en esta categoría.',
     'no_default_eula'					=> 'No se encontró el acuerdo de uso predeterminado. Agregue unos en Configuración.',
     'total'  							=> 'Total ',
     'remaining'  						=> 'Disponibles',
-    'update'  							=> 'Actualizar Accesorio',
-    'use_default_eula'					=> 'En su lugar, el <a href="#" data-toggle="modal" data-target="#eulaModal">acuerdo de uso predeterminado</a>.',
-    'use_default_eula_disabled'			=> '<del>En su lugar, use el acuerdo de uso predeterminado.</del> No está configurado el acuerdo de uso predeterminado. Por favor agregue uno en Configuración.',
+    'update'  							=> 'Actualizar accesorio',
+    'use_default_eula'					=> 'En su lugar, utilice el <a href="#" data-toggle="modal" data-target="#eulaModal">acuerdo de uso predeterminado</a>.',
+    'use_default_eula_disabled'			=> '<del>En su lugar, utilice el acuerdo de uso predeterminado.</del> No está configurado el acuerdo de uso predeterminado. Por favor agregue uno en Configuración.',
     'clone'                             => 'Clonar accesorio',
-    'delete_disabled'                   => 'Este accesorio no se puede eliminar aún porque algunos artículos todavía están asignados.',
+    'delete_disabled'                   => 'Este accesorio no se puede eliminar aún porque algunos elementos todavía están asignados.',
 
 );
diff --git a/resources/lang/es-MX/admin/accessories/message.php b/resources/lang/es-MX/admin/accessories/message.php
index 3b120a643c..c2d52963e8 100644
--- a/resources/lang/es-MX/admin/accessories/message.php
+++ b/resources/lang/es-MX/admin/accessories/message.php
@@ -4,35 +4,39 @@ return array(
 
     'does_not_exist' => 'El accesorio [:id] no existe.',
     'not_found' => 'Ese accesorio no fue encontrado.',
-    'assoc_users'	 => 'Este accesorio actualmente tiene :count entregados a usuarios. Por favor ingrese los accesorios y vuelva a intentar. ',
+    'assoc_users'	 => 'Este accesorio actualmente tiene :count elemento(s) asignado(s) a usuarios. Por favor realice el ingreso de los accesorios y vuelva a intentar. ',
 
     'create' => array(
-        'error'   => 'El accesorio no fue creado, por favor, inténtalo de nuevo.',
+        'error'   => 'El accesorio no fue creado, por favor inténtelo de nuevo.',
         'success' => 'Accesorio creado correctamente.'
     ),
 
     'update' => array(
-        'error'   => 'El accesorio no fue actualizado, por favor, inténtalo de nuevo',
-        'success' => 'Accesorio actualizado correctamente.'
+        'error'   => 'El accesorio no fue actualizado, por favor, inténtelo de nuevo',
+        'success' => 'El accesorio fue actualizado con éxito.'
     ),
 
     'delete' => array(
         'confirm'   => '¿Está seguro de que desea eliminar este accesorio?',
-        'error'   => 'Ha habido un problema eliminando este accesorio. Intentalo de nuevo.',
+        'error'   => 'Hubo un problema eliminando el accesorio. Por favor, inténtelo de nuevo.',
         'success' => 'El accesorio fue borrado con éxito.'
     ),
 
      'checkout' => array(
-        'error'   		=> 'El accesorio no fue retirado, por favor vuelva a intentarlo',
-        'success' 		=> 'Accesorio retirado correctamente.',
-        'unavailable'   => 'El accesorio no está disponible para la asignación. Compruebe la cantidad disponible',
-        'user_does_not_exist' => 'Este usuario es inválido . Inténtalo de nuevo.'
+        'error'   		=> 'El accesorio no fue asignado, por favor vuelva a intentarlo',
+        'success' 		=> 'Accesorio asignado correctamente.',
+        'unavailable'   => 'El accesorio no está disponible para ser asignado. Compruebe la cantidad disponible',
+        'user_does_not_exist' => 'Este usuario no es válido. Por favor, inténtelo de nuevo.',
+         'checkout_qty' => array(
+            'lte'  => 'En este momento solo existe un accesorio disponible de este tipo y está tratando de asignar :checkout_qty. Por favor, ajuste la cantidad asignada o el total de existencias de este accesorio e intente nuevamente.|Existen en total :number_currently_remaining accesorios disponibles y está tratando de asignar :checkout_qty. Por favor, ajuste la cantidad asignada o el total de existencias de este accesorio e intente nuevamente.',
+            ),
+           
     ),
 
     'checkin' => array(
-        'error'   		=> 'El accesorio no fue agregado, favor vuelva a intentarlo',
-        'success' 		=> 'Accesorio devuelto correctamente.',
-        'user_does_not_exist' => 'Este usuario es inválido . Inténtalo de nuevo.'
+        'error'   		=> 'El accesorio no fue recibido, por favor vuelva a intentarlo',
+        'success' 		=> 'El accesorio ha sido ingresado correctamente.',
+        'user_does_not_exist' => 'Ese usuario no es válido. Por favor, inténtelo de nuevo.'
     )
 
 
diff --git a/resources/lang/es-MX/admin/accessories/table.php b/resources/lang/es-MX/admin/accessories/table.php
index 1a2d33e1eb..05184e79e3 100644
--- a/resources/lang/es-MX/admin/accessories/table.php
+++ b/resources/lang/es-MX/admin/accessories/table.php
@@ -5,7 +5,5 @@ return array(
 	'eula_text'      			=> 'Acuerdo de uso',
     'id'      					=> 'ID',
     'require_acceptance'      	=> 'Aceptación',
-    'title'      				=> 'Nombre accesorio',
-
-
+    'title'      				=> 'Nombre del accesorio',
 );
diff --git a/resources/lang/es-MX/admin/asset_maintenances/form.php b/resources/lang/es-MX/admin/asset_maintenances/form.php
index 32a148765c..dfda6be9c5 100644
--- a/resources/lang/es-MX/admin/asset_maintenances/form.php
+++ b/resources/lang/es-MX/admin/asset_maintenances/form.php
@@ -1,14 +1,14 @@
 <?php
 
     return [
-        'asset_maintenance_type' => 'Tipo de Mantenimiento de Activo',
+        'asset_maintenance_type' => 'Tipo de mantenimiento del activo',
         'title'                  => 'Título',
         'start_date'             => 'Fecha de inicio',
         'completion_date'        => 'Fecha de finalización',
         'cost'                   => 'Costo',
-        'is_warranty'            => 'Mejora de la Garantía',
-        'asset_maintenance_time' => 'Tiempo de Mantenimiento del Activo (en días)',
+        'is_warranty'            => 'Mejora de la garantía',
+        'asset_maintenance_time' => 'Duración del mantenimiento (en días)',
         'notes'                  => 'Notas',
-        'update'                 => 'Actualizar Mantenimiento de Activo',
-        'create'                 => 'Crear Mantenimiento de Activo'
+        'update'                 => 'Actualizar mantenimiento del activo',
+        'create'                 => 'Crear mantenimiento del activo'
     ];
diff --git a/resources/lang/es-MX/admin/asset_maintenances/general.php b/resources/lang/es-MX/admin/asset_maintenances/general.php
index 5a69545b6a..77c6a419f0 100644
--- a/resources/lang/es-MX/admin/asset_maintenances/general.php
+++ b/resources/lang/es-MX/admin/asset_maintenances/general.php
@@ -2,12 +2,12 @@
 
     return [
         'asset_maintenances' => 'Mantenimiento de activos',
-        'edit'               => 'Editar Mantenimiento de Equipo',
-        'delete'             => 'Eliminar Mantenimiento de Equipo',
-        'view'               => 'Ver Detalle de Mantenimiento de Equipo',
-        'repair'             => 'Reparación',
+        'edit'               => 'Editar mantenimiento del activo',
+        'delete'             => 'Eliminar mantenimiento del activo',
+        'view'               => 'Ver detalles del mantenimiento del activo',
+        'repair'             => 'Reparar',
         'maintenance'        => 'Mantenimiento',
-        'upgrade'            => 'Mejora',
+        'upgrade'            => 'Mejorar',
         'calibration'        => 'Calibración',
         'software_support'   => 'Soporte de software',
         'hardware_support'   => 'Soporte de hardware',
diff --git a/resources/lang/es-MX/admin/asset_maintenances/message.php b/resources/lang/es-MX/admin/asset_maintenances/message.php
index 2a7e98f38b..c7caffb3f4 100644
--- a/resources/lang/es-MX/admin/asset_maintenances/message.php
+++ b/resources/lang/es-MX/admin/asset_maintenances/message.php
@@ -4,18 +4,18 @@
         'not_found'                    => '¡El mantenimiento del activo que estaba buscando no se encontró!',
         'delete'                       => [
             'confirm' => '¿Está seguro de que desea eliminar el mantenimiento de este activo?',
-            'error'   => 'Hubo un problema al eliminar el mantenimiento de equipo. Por favor intente nuevamente.',
-            'success' => 'El mantenimiento de equipo fue eliminado de manera exitosa.',
+            'error'   => 'Hubo un problema al eliminar el mantenimiento del activo. Por favor inténtelo nuevamente.',
+            'success' => 'El mantenimiento del activo fue eliminado de manera exitosa.',
         ],
         'create'                       => [
             'error'   => 'El Mantenimiento de Equipo no fue creado, por favor intente nuevamente.',
-            'success' => 'El Mantenimiento de Equipo fue creado de manera exitosa.',
+            'success' => 'El mantenimiento del activo fue creado de manera exitosa.',
         ],
         'edit'                       => [
-            'error'   => 'El mantenimiento de activo no fue editado. Por favor, intenta de nuevo.',
-            'success' => 'Mantenimiento de activo editado con éxito.',
+            'error'   => 'El mantenimiento del activo no fue editado. Por favor, inténtelo de nuevo.',
+            'success' => 'Mantenimiento del activo editado con éxito.',
         ],
-        'asset_maintenance_incomplete' => 'Sin Completar',
+        'asset_maintenance_incomplete' => 'Aún no se ha completado',
         'warranty'                     => 'Garantía',
-        'not_warranty'                 => 'Sin Garantía',
+        'not_warranty'                 => 'Sin garantía',
     ];
diff --git a/resources/lang/es-MX/admin/asset_maintenances/table.php b/resources/lang/es-MX/admin/asset_maintenances/table.php
index adabb3ff69..6da43b1c77 100644
--- a/resources/lang/es-MX/admin/asset_maintenances/table.php
+++ b/resources/lang/es-MX/admin/asset_maintenances/table.php
@@ -1,7 +1,7 @@
 <?php
 
     return [
-        'title'         => 'Mantenimiento de Equipo',
+        'title'         => 'Mantenimiento del activo',
         'asset_name'    => 'Nombre del activo',
         'is_warranty'   => 'Garantía',
         'dl_csv'        => 'Descargar CSV',
diff --git a/resources/lang/es-MX/admin/categories/general.php b/resources/lang/es-MX/admin/categories/general.php
index 3ad20360b5..b862429686 100644
--- a/resources/lang/es-MX/admin/categories/general.php
+++ b/resources/lang/es-MX/admin/categories/general.php
@@ -3,8 +3,8 @@
 return array(
     'asset_categories' 					=> 'Categorías de activos',
     'category_name'  					=> 'Nombre de la categoría',
-    'checkin_email'                     => 'Enviar un correo al usuario al devolver/asignar.',
-    'checkin_email_notification'        => 'A este usuario se le enviará un correo electrónico al devolver/asignar.',
+    'checkin_email'                     => 'Enviar un correo electrónico al usuario al recibir/devolver.',
+    'checkin_email_notification'        => 'A este usuario se le enviará un correo electrónico al recibir/devolver.',
     'clone'                             => 'Clonar categoría',
     'create'  							=> 'Crear categoría',
     'edit'                              => 'Editar categoría',
@@ -14,7 +14,7 @@ return array(
     'eula_text_help'					=> 'Este campo permite personalizar el acuerdo de uso para tipos específicos de activos. Si solo tiene un acuerdo de uso para todos sus activos, puede seleccionar la siguiente opción para usar la definición predeterminada.',
     'name'                              => 'Nombre de la categoría',
     'require_acceptance'				=> 'Requerir a los usuarios que confirmen la aceptación de los elementos en esta categoría.',
-    'required_acceptance'				=> 'Este usuario recibirá un correo con un enlace para confirmar la aceptación de este elemento.',
+    'required_acceptance'				=> 'Este usuario recibirá un correo electrónico con un enlace para confirmar la aceptación de este elemento.',
     'required_eula'						=> 'Se enviará un correo electrónico a este usuario con una copia del acuerdo de uso',
     'no_default_eula'					=> 'No se encontró una definición del acuerdo de uso por defecto. Agregue uno en Configuración.',
     'update'  							=> 'Actualizar categoría',
diff --git a/resources/lang/es-MX/admin/categories/message.php b/resources/lang/es-MX/admin/categories/message.php
index 9875a01d88..997487469e 100644
--- a/resources/lang/es-MX/admin/categories/message.php
+++ b/resources/lang/es-MX/admin/categories/message.php
@@ -3,8 +3,8 @@
 return array(
 
     'does_not_exist' => 'La categoría no existe.',
-    'assoc_models'	 => 'Esta categoría está asociada actualmente con al menos un modelo y no se puede eliminar. Por favor actualice sus modelos para que no hagan referencia a esta categoría e inténtelo de nuevo. ',
-    'assoc_items'	 => 'Esta categoría está asociada actualmente con al menos un: asset_type y no se puede eliminar. Por favor actualice su: asset_type para que no haga referencia a esta categoría e inténtelo de nuevo. ',
+    'assoc_models'	 => 'Esta categoría está asociada actualmente con al menos un modelo y no puede ser eliminada. Actualice los modelos para que ya no hagan referencia a esta categoría e inténtelo de nuevo. ',
+    'assoc_items'	 => 'Esta categoría está asociada actualmente con al menos un: asset_type y no puede ser eliminada. Actualice su :asset_type para que ya no haga referencia a esta categoría e inténtelo de nuevo. ',
 
     'create' => array(
         'error'   => 'La categoría no fue creada, por favor inténtelo de nuevo.',
diff --git a/resources/lang/es-MX/admin/categories/table.php b/resources/lang/es-MX/admin/categories/table.php
index e3bb551e93..fc18e5ac6f 100644
--- a/resources/lang/es-MX/admin/categories/table.php
+++ b/resources/lang/es-MX/admin/categories/table.php
@@ -3,7 +3,7 @@
 return array(
 	'eula_text'      			=> 'Acuerdo de uso',
     'id'      					=> 'ID',
-    'parent'   					=> 'Padre',
+    'parent'   					=> 'Ubicación padre',
     'require_acceptance'      	=> 'Aceptación',
     'title'      				=> 'Nombre de la categoría del activo',
 
diff --git a/resources/lang/es-MX/admin/companies/general.php b/resources/lang/es-MX/admin/companies/general.php
index fd18d9f752..8fb72d5b94 100644
--- a/resources/lang/es-MX/admin/companies/general.php
+++ b/resources/lang/es-MX/admin/companies/general.php
@@ -1,7 +1,7 @@
 <?php
 
 return [
-    'select_company' => 'Seleccione una compañía',
+    'select_company' => 'Seleccionar una compañía',
     'about_companies' => 'Acerca de las compañías',
     'about_companies_description' => '        Puede utilizar las compañías como un simple campo informativo, o puede utilizarlas para restringir la visibilidad y la disponibilidad de los activos a los usuarios con una compañía específica habilitando la opción "Soporte completo a múltiples compañías" en "Configuración de administración"',
 ];
diff --git a/resources/lang/es-MX/admin/companies/message.php b/resources/lang/es-MX/admin/companies/message.php
index 5a3cbffa1d..8f2cb9323e 100644
--- a/resources/lang/es-MX/admin/companies/message.php
+++ b/resources/lang/es-MX/admin/companies/message.php
@@ -3,18 +3,18 @@
 return [
     'does_not_exist' => 'La compañía no existe.',
     'deleted'        => 'Compañía eliminada',
-    'assoc_users'    => 'Esta compañía ya está asociada con al menos un modelo y no puede eliminarse. Por favor, actualiza tus modelos para no referenciar esta compañía de nuevo y prueba otra vez. ',
+    'assoc_users'    => 'Esta compañía está actualmente asociada con al menos un modelo y no puede ser eliminada. Por favor actualice sus modelos para que no hagan referencia a esta compañía e inténtelo de nuevo. ',
     'create' => [
-        'error'   => 'Esta compañía no ha sido creada, por favor pruebe de nuevo.',
+        'error'   => 'La compañía no fue creada, por favor, inténtelo de nuevo.',
         'success' => 'Compañía creada satisfactoriamente.',
     ],
     'update' => [
-        'error'   => 'Compañía no actualizada, por favor inténtelo de nuevo',
+        'error'   => 'La compañía no fue actualizada, por favor, inténtelo de nuevo',
         'success' => 'Compañía actualizada correctamente.',
     ],
     'delete' => [
         'confirm' => '¿Está seguro de que quiere eliminar esta compañía?',
-        'error'   => 'Hubo un problema eliminando esta compañía. Inténtelo de nuevo.',
-        'success' => 'Esta compañía se eliminó satisfactoriamente.',
+        'error'   => 'Hubo un problema eliminando la compañía. Por favor, inténtelo de nuevo.',
+        'success' => 'La compañía fue eliminada correctamente.',
     ],
 ];
diff --git a/resources/lang/es-MX/admin/companies/table.php b/resources/lang/es-MX/admin/companies/table.php
index dc5d0c230f..1cc605dfd1 100644
--- a/resources/lang/es-MX/admin/companies/table.php
+++ b/resources/lang/es-MX/admin/companies/table.php
@@ -1,11 +1,11 @@
 <?php
 return array(
     'companies' => 'Compañías',
-    'create'    => 'Crear Compañía',
+    'create'    => 'Crear una compañía',
     'email'     => 'Correo electrónico de la compañía',
     'title'     => 'Compañía',
     'phone'     => 'Teléfono de la compañía',
-    'update'    => 'Actualizar Compañía',
-    'name'      => 'Nombre de Compañía',
+    'update'    => 'Actualizar compañía',
+    'name'      => 'Nombre de la compañía',
     'id'        => 'ID',
 );
diff --git a/resources/lang/es-MX/admin/components/general.php b/resources/lang/es-MX/admin/components/general.php
index d047e56c14..4f4a97e381 100644
--- a/resources/lang/es-MX/admin/components/general.php
+++ b/resources/lang/es-MX/admin/components/general.php
@@ -1,9 +1,9 @@
 <?php
 
 return array(
-    'component_name'                  => 'Nombre de Componente',
-    'checkin'                             => 'Checkin Componente',
-    'checkout'                             => 'Checkout Componente',
+    'component_name'                  => 'Nombre del componente',
+    'checkin'                             => 'Ingresar componente',
+    'checkout'                             => 'Asignar componente',
     'cost'				=> 'Costo de compra',
     'create'                             => 'Crear componente',
     'edit'                             => 'Editar componente',
@@ -11,6 +11,6 @@ return array(
     'order'					=> 'Número de orden',
     'remaining' 			             => 'Restante',
     'total' 			                 => 'Total',
-    'update'                            => 'Actualizar Componente',
-    'checkin_limit'            => 'La cantidad devuelta debe ser igual o menor que :assigned_qty'
+    'update'                            => 'Actualizar componente',
+    'checkin_limit'            => 'La cantidad ingresada debe ser igual o menor que :assigned_qty'
 );
diff --git a/resources/lang/es-MX/admin/components/message.php b/resources/lang/es-MX/admin/components/message.php
index 6b0911a9ed..c9e0b7c3a5 100644
--- a/resources/lang/es-MX/admin/components/message.php
+++ b/resources/lang/es-MX/admin/components/message.php
@@ -5,32 +5,33 @@ return array(
     'does_not_exist' => 'El componente no existe.',
 
     'create' => array(
-        'error'   => 'El componente no fuè creado, intentalo de nuevo.',
-        'success' => 'El componente se creò satisfactoriamente.'
+        'error'   => 'El componente no fue creado, por favor inténtelo de nuevo.',
+        'success' => 'El componente se creó satisfactoriamente.'
     ),
 
     'update' => array(
-        'error'   => 'El componente no se actualizò, intentalo de nuevo',
-        'success' => 'Componente actualizado satisfactoriamente.'
+        'error'   => 'El componente no se actualizó, por favor inténtelo de nuevo',
+        'success' => 'Componente actualizado correctamente.'
     ),
 
     'delete' => array(
         'confirm'   => '¿Está seguro de que desea eliminar este componente?',
-        'error'   => 'Hubo un problema al querer borrar el componente, intentalo de nuevo.',
-        'success' => 'El componente fue borrado satisfactoriamente.'
+        'error'   => 'Hubo un problema eliminando el componente. Por favor, inténtelo de nuevo.',
+        'success' => 'El componente fue borrado correctamente.',
+        'error_qty'   => 'Algunos componentes de este tipo todavía están desactivados. Por favor, compruébalos e inténtalo de nuevo.',
     ),
 
      'checkout' => array(
-        'error'   		=> 'El componente no hizo check out, intentalo de nuevo',
-        'success' 		=> 'Check out del componente satisfactorio.',
-        'user_does_not_exist' => 'El usuario es invalido, intentalo de nuevo.',
+        'error'   		=> 'El componente no fue asignado, por favor, inténtelo de nuevo',
+        'success' 		=> 'El componente se ha asignado correctamente.',
+        'user_does_not_exist' => 'Ese usuario no es válido. Por favor, inténtelo de nuevo.',
         'unavailable'      => 'No quedan suficientes componentes: :remaining disponibles, :requested solicitados ',
     ),
 
     'checkin' => array(
-        'error'   		=> 'El componente no fue checked in, intentalo de nuevo',
-        'success' 		=> 'Check in de componente satisfactorio.',
-        'user_does_not_exist' => 'Es usuario es invalido, intentalo de nuevo.'
+        'error'   		=> 'No se realizó el ingreso del componente, por favor inténtelo de nuevo',
+        'success' 		=> 'Componente ingresado con éxito.',
+        'user_does_not_exist' => 'Ese usuario no es válido. Por favor, inténtelo de nuevo.'
     )
 
 
diff --git a/resources/lang/es-MX/admin/components/table.php b/resources/lang/es-MX/admin/components/table.php
index 92a95311ab..8f4de5c93c 100644
--- a/resources/lang/es-MX/admin/components/table.php
+++ b/resources/lang/es-MX/admin/components/table.php
@@ -1,5 +1,5 @@
 <?php
 
 return array(
-    'title'      				=> 'Nombre de Componente',
+    'title'      				=> 'Nombre de componente',
 );
diff --git a/resources/lang/es-MX/admin/consumables/general.php b/resources/lang/es-MX/admin/consumables/general.php
index 3b2249f8af..579a705fb2 100644
--- a/resources/lang/es-MX/admin/consumables/general.php
+++ b/resources/lang/es-MX/admin/consumables/general.php
@@ -1,11 +1,12 @@
 <?php
 
 return array(
-    'checkout'                          => 'Checkout de consumible a usuario',
-    'consumable_name'                   => 'Nombre del Consumible',
-    'create'                            => 'Crear Consumible',
-    'item_no'                           => 'Artículo núm.',
+    'checkout'                          => 'Asignar consumible a usuario',
+    'consumable_name'                   => 'Nombre del consumible',
+    'create'                            => 'Crear consumible',
+    'item_no'                           => 'Artículo No.',
     'remaining' 			            => 'Restante',
     'total' 			                => 'Total',
-    'update'                            => 'Actualizar Consumible',
+    'update'                            => 'Actualizar consumible',
+    'inventory_warning'                 => 'El inventario de este consumible está por debajo de la cantidad mínima de :min_count',
 );
diff --git a/resources/lang/es-MX/admin/consumables/message.php b/resources/lang/es-MX/admin/consumables/message.php
index a37dbaf545..ca3da8895a 100644
--- a/resources/lang/es-MX/admin/consumables/message.php
+++ b/resources/lang/es-MX/admin/consumables/message.php
@@ -2,16 +2,17 @@
 
 return array(
 
+    'invalid_category_type' => 'La categoría debe ser una categoría para consumibles.',
     'does_not_exist' => 'El consumible no existe.',
 
     'create' => array(
-        'error'   => 'El consumible no fue creado, por favor intente nuevamente.',
+        'error'   => 'El consumible no fue creado, por favor inténtelo nuevamente.',
         'success' => 'Consumible creado con éxito.'
     ),
 
     'update' => array(
-        'error'   => 'El consumible no fue actualizado, por favor, inténtalo de nuevo',
-        'success' => 'El consumible fue subido con éxito.'
+        'error'   => 'El consumible no fue actualizado, por favor, inténtelo de nuevo',
+        'success' => 'Consumible actualizado correctamente.'
     ),
 
     'delete' => array(
@@ -22,15 +23,15 @@ return array(
 
      'checkout' => array(
         'error'   		=> 'El consumible no fue asignado, por favor inténtelo de nuevo',
-        'success' 		=> 'Consumible fue retirado satisfactoriamente.',
-        'user_does_not_exist' => 'Este usuario es inválido . Inténtalo de nuevo.',
-         'unavailable'      => 'No hay suficientes consumibles para esta asignación. Por favor, compruebe la cantidad restante. ',
+        'success' 		=> 'Consumible asignado correctamente.',
+        'user_does_not_exist' => 'Ese usuario no es válido. Por favor, inténtelo de nuevo.',
+         'unavailable'      => 'No hay suficientes consumibles para esta asignación. Por favor, compruebe la cantidad disponible. ',
     ),
 
     'checkin' => array(
-        'error'   		=> 'Consumible no fue devuelto, por favor inténtelo de nuevo',
-        'success' 		=> 'Consumible fue ingresado satisfactoriamente.',
-        'user_does_not_exist' => 'Este usuario es inválido . Inténtalo de nuevo.'
+        'error'   		=> 'El consumible no fue ingresado, por favor inténtelo de nuevo',
+        'success' 		=> 'El consumible fue ingresado correctamente.',
+        'user_does_not_exist' => 'Ese usuario no es válido. Por favor, inténtelo de nuevo.'
     )
 
 
diff --git a/resources/lang/es-MX/admin/consumables/table.php b/resources/lang/es-MX/admin/consumables/table.php
index befcfc511b..2e346e2962 100644
--- a/resources/lang/es-MX/admin/consumables/table.php
+++ b/resources/lang/es-MX/admin/consumables/table.php
@@ -1,5 +1,5 @@
 <?php
 
 return array(
-    'title'      				=> 'Nombre del Consumible',
+    'title'      				=> 'Nombre del consumible',
 );
diff --git a/resources/lang/es-MX/admin/custom_fields/general.php b/resources/lang/es-MX/admin/custom_fields/general.php
index 51d9f8e36e..fa18b7c902 100644
--- a/resources/lang/es-MX/admin/custom_fields/general.php
+++ b/resources/lang/es-MX/admin/custom_fields/general.php
@@ -2,60 +2,63 @@
 
 return [
     'custom_fields'		        => 'Campos personalizados',
-    'manage'                    => 'Administra',
+    'manage'                    => 'Administrar',
     'field'		                => 'Campo',
     'about_fieldsets_title'		=> 'Acerca de los grupos de campos',
     'about_fieldsets_text'		=> 'Los grupos de campos le permiten agrupar campos personalizados que se reutilizan frecuentemente para determinados modelos de activos.',
     'custom_format'             => 'Expresión regular personalizada...',
-    'encrypt_field'      	        => 'Encriptar el valor de este campo en la base de datos',
-    'encrypt_field_help'      => 'CUIDADO: Encriptar un campo hace que no se pueda buscar por él.',
-    'encrypted'      	        => 'Encriptado',
+    'encrypt_field'      	        => 'Cifrar el valor de este campo en la base de datos',
+    'encrypt_field_help'      => 'ADVERTENCIA: Cifrar un campo hace que no se pueda buscar.',
+    'encrypted'      	        => 'Cifrado',
     'fieldset'      	        => 'Grupo de campos',
     'qty_fields'      	      => 'Campos de cantidad',
-    'fieldsets'      	        => 'Grupo de campos',
+    'fieldsets'      	        => 'Grupos de campos',
     'fieldset_name'           => 'Nombre del grupo de campos',
     'field_name'              => 'Nombre del campo',
-    'field_values'            => 'Valores de los Campos',
-    'field_values_help'       => 'Agregar opciones seleccionables, una por linea. Lineas en blanco ademas de la primera, serán ignoradas.',
+    'field_values'            => 'Valores de los campos',
+    'field_values_help'       => 'Agregue opciones seleccionables, una por línea. Se ignorarán las líneas en blanco que no sean la primera.',
     'field_element'           => 'Elemento de formulario',
     'field_element_short'     => 'Elemento',
     'field_format'            => 'Formato',
-    'field_custom_format'     => 'Formato personalizado',
-    'field_custom_format_help'     => 'Este campo te permite usar una expresión regex para la validación. Debería empezar con "regex:" - por ejemplo, para validar que un valor de campo personalizado contiene un IMEI válido (15 dígitos numéricos), podrías usar <code>regex:/^[0-9]{15}$/</code>.',
+    'field_custom_format'     => 'Expresión regular personalizada',
+    'field_custom_format_help'     => 'Este campo le permite usar una expresión regular para la validación. Debería empezar con "regex:" - por ejemplo, para validar que un valor de campo personalizado contiene un IMEI válido (15 dígitos numéricos), podría usar <code>regex:/^[0-9]{15}$/</code>.',
     'required'   		          => 'Obligatorio',
     'req'   		              => 'Obl.',
-    'used_by_models'   		    => 'Usado Por Modelos',
+    'used_by_models'   		    => 'Usado por los modelos',
     'order'   		            => 'Orden',
     'create_fieldset'         => 'Nuevo grupo de campos',
     'update_fieldset'         => 'Actualizar grupo de campos',
     'fieldset_does_not_exist'   => 'El grupo de campos :id no existe',
-    'fieldset_updated'         => 'Se ha actualizado el Grupo de Campos',
-    'create_fieldset_title' => 'Crear un nuevo conjunto de campos',
+    'fieldset_updated'         => 'Se actualizó el grupo de campos',
+    'create_fieldset_title' => 'Crear un nuevo grupo de campos',
     'create_field'            => 'Nuevo campo personalizado',
     'create_field_title' => 'Crear un nuevo campo personalizado',
-    'value_encrypted'      	        => 'El valor de este campo está encriptado en la base de datos. Solo los administradores pueden ver el valor desencriptado',
-    'show_in_email'     => 'Include the value of this field in checkout emails sent to the user? Encrypted fields cannot be included in emails',
-    'show_in_email_short'     => 'Incluye en correos electrónicos.',
+    'value_encrypted'      	        => 'El valor de este campo está cifrado en la base de datos. Solo los administradores pueden ver el valor descifrado',
+    'show_in_email'     => '¿Incluir el valor de este campo en los correos de asignación enviados al usuario? Los campos cifrados no se pueden incluir en los correos electrónicos',
+    'show_in_email_short' => 'Incluir en los correos electrónicos',
     'help_text' => 'Texto de ayuda',
-    'help_text_description' => 'Esto es un texto opcional que se mostrará debajo de los elementos del formulario cuando se este editando un activo para proporcionar contexto adicional del campo.',
-    'about_custom_fields_title' => 'Acerca de los Campos Personalizados',
+    'help_text_description' => 'Este es un texto opcional que aparecerá debajo de los campos del formulario cuando se edite un activo para proporcionar contexto adicional.',
+    'about_custom_fields_title' => 'Acerca de los campos personalizados',
     'about_custom_fields_text' => 'Los campos personalizados te permiten agregar atributos arbritarios a los activos.',
-    'add_field_to_fieldset' => 'Añadir campo al conjunto de campos',
-    'make_optional' => 'Requerido - haz clic para hacerlo opcional',
-    'make_required' => 'Opcional - haz clic para hacerlo requerido',
+    'add_field_to_fieldset' => 'Añadir campo al grupo de campos',
+    'make_optional' => 'Obligatorio - haga clic para hacerlo opcional',
+    'make_required' => 'Opcional - haga clic para que sea obligatorio',
     'reorder' => 'Reordenar',
-    'db_field' => 'Campo de Base de Datos',
+    'db_field' => 'Campo en base de datos',
     'db_convert_warning' => 'ADVERTENCIA. Este campo está en la tabla de campos personalizados como <code>:db_column</code> pero debe ser <code>:expected</code>.',
-    'is_unique' => 'Este valor debe ser único a través de todos los activos',
+    'is_unique' => 'Este valor debe ser único para todos los activos',
     'unique' => 'Único',
-    'display_in_user_view' => 'Permitir al usuario asignado ver estos valores en su página Ver Recursos asignados',
-    'display_in_user_view_table' => 'Visible al Usuario',
-    'auto_add_to_fieldsets' => 'Añadir automáticamente a cada nuevo conjunto de campos',
-    'add_to_preexisting_fieldsets' => 'Añadir a cualquier conjunto de campos existente',
-    'show_in_listview' => 'Mostrar por defecto en las vistas de lista. Los usuarios autorizados aún podrán mostrar/ocultar a través del selector de columnas',
-    'show_in_listview_short' => 'Mostrar en listas',
+    'display_in_user_view' => 'Permitir al usuario ver estos valores en la página "Ver activos asignados"',
+    'display_in_user_view_table' => 'Visible para el usuario',
+    'auto_add_to_fieldsets' => 'Añadir automáticamente a cada nuevo grupo de campos',
+    'add_to_preexisting_fieldsets' => 'Añadir a cualquier grupo de campos existente',
+    'show_in_listview' => 'Mostrar por defecto en las consultas. Los usuarios autorizados podrán mostrar/ocultar a través del selector de columnas',
+    'show_in_listview_short' => 'Mostrar en las listas',
     'show_in_requestable_list_short' => 'Mostrar en la lista de activos que se pueden solicitar',
     'show_in_requestable_list' => 'Mostrar el valor en la lista de activos que se pueden solicitar. Los campos cifrados no se mostrarán',
     'encrypted_options' => 'Este campo está cifrado, por lo que algunas opciones de visualización no estarán disponibles.',
+    'display_checkin' => 'Display in checkin forms',
+    'display_checkout' => 'Display in checkout forms',
+    'display_audit' => 'Display in audit forms',
 
 ];
diff --git a/resources/lang/es-MX/admin/custom_fields/message.php b/resources/lang/es-MX/admin/custom_fields/message.php
index 3d9d33010c..11bb8ba285 100644
--- a/resources/lang/es-MX/admin/custom_fields/message.php
+++ b/resources/lang/es-MX/admin/custom_fields/message.php
@@ -5,30 +5,31 @@ return array(
     'field' => array(
         'invalid'   => 'El campo no existe.',
         'already_added'   => 'El campo ya fue añadido',
+        'none_selected'   => 'No se ha seleccionado ningún campo',
 
         'create' => array(
             'error'   => 'Campo no creado, por favor, inténtalo de nuevo.',
             'success' => 'Campo creado correctamente.',
-            'assoc_success' => 'Campo correctamente añadido al grupo.'
+            'assoc_success' => 'Campo correctamente añadido al grupo de campos.'
         ),
 
         'update' => array(
-            'error'   => 'Campo no actualizado, por favor inténtelo de nuevo',
+            'error'   => 'El campo no fue actualizado, por favor, inténtelo de nuevo',
             'success' => 'Campo actualizado correctamente.'
         ),
 
         'delete' => array(
             'confirm'   	=> '¿Está seguro de que quiere eliminar este campo?',
-            'error'   => 'Hubo un problema al eliminar el campo. Inténtelo de nuevo.',
+            'error'   => 'Hubo un problema al eliminar el campo. Por favor, inténtelo de nuevo.',
             'success' => 'El campo se eliminó correctamente.',
-            'in_use'   => 'El campo está aún en uso.',
+            'in_use'   => 'El campo aún está en uso.',
         )
 
     ),
 
     'fieldset' => array(
 
-        'does_not_exist' => 'El conjunto de campos no existe',
+        'does_not_exist' => 'El grupo de campos no existe',
 
         'create' => array(
             'error'   => 'El grupo de campos no ha sido creado, por favor inténtelo de nuevo.',
@@ -36,7 +37,7 @@ return array(
         ),
 
         'update' => array(
-            'error'   => 'El Grupo de campos no ha sido actualizado, por favor inténtelo de nuevo',
+            'error'   => 'El grupo de campos no ha sido actualizado, por favor inténtelo de nuevo',
             'success' => 'Grupo de campos actualizado correctamente.'
         ),
 
@@ -44,14 +45,14 @@ return array(
             'confirm'   	=> '¿Está seguro de que quiere eliminar este grupo de campos?',
             'error'   => 'Hubo un problema al eliminar el grupo de campos. Inténtelo de nuevo.',
             'success' => 'El grupo de campos se eliminó correctamente.',
-            'in_use'   => 'El grupo de campos está aún en uso.',
+            'in_use'   => 'El grupo de campos aún está en uso.',
         )
 
     ),
 
     'fieldset_default_value' => array(
 
-        'error' => 'Error al validar los valores predeterminados del conjunto de campos.',
+        'error' => 'Error al validar los valores predeterminados del grupo de campos.',
 
     ),
 
diff --git a/resources/lang/es-MX/admin/departments/message.php b/resources/lang/es-MX/admin/departments/message.php
index 6f10cf0eae..eabf4774d8 100644
--- a/resources/lang/es-MX/admin/departments/message.php
+++ b/resources/lang/es-MX/admin/departments/message.php
@@ -4,19 +4,19 @@ return array(
 
     'does_not_exist' => 'El departamento no existe.',
     'department_already_exists' => 'Ya existe un departamento con ese nombre en esta ubicación de la compañía. O elija un nombre más específico para este departamento. ',
-    'assoc_users'	 => 'Esta localización está actualmente asociada con al menos un usuario y no puede ser eliminada, Por favor verifique que ningún usuario haga referencia a esta localización e intente de nuevo. ',
+    'assoc_users'	 => 'Este departamento está actualmente asociado con al menos un usuario y no puede ser eliminado. Por favor, actualice sus usuarios para que no hagan referencia a este departamento e inténtelo de nuevo. ',
     'create' => array(
-        'error'   => 'El departamento no fue creado, por favor intente de nuevo.',
-        'success' => 'Departamento creado con éxito.'
+        'error'   => 'El departamento no fue creado, por favor, inténtelo de nuevo.',
+        'success' => 'Departamento creado correctamente.'
     ),
     'update' => array(
-        'error'   => 'El departamento no se actualizó, por favor intente de nuevo',
+        'error'   => 'El departamento no fue actualizado, por favor inténtelo de nuevo',
         'success' => 'Departamento actualizado con éxito.'
     ),
     'delete' => array(
         'confirm'   	=> '¿Está seguro de que desea eliminar este departamento?',
-        'error'   => 'Hubo un problema al eliminar el departamento. Inténtalo de nuevo.',
-        'success' => 'El departamento ha sido borrado exitosamente'
+        'error'   => 'Hubo un problema al borrar el departamento. Por favor, inténtelo de nuevo.',
+        'success' => 'El departamento fue eliminado correctamente.'
     )
 
 );
diff --git a/resources/lang/es-MX/admin/departments/table.php b/resources/lang/es-MX/admin/departments/table.php
index b24a16d3ae..da02f3e3a3 100644
--- a/resources/lang/es-MX/admin/departments/table.php
+++ b/resources/lang/es-MX/admin/departments/table.php
@@ -2,10 +2,10 @@
 
 return array(
 
-    'id'                        => 'CARNÉ DE IDENTIDAD',
-    'name'                      => 'Nombre de Departamento',
+    'id'                        => 'ID',
+    'name'                      => 'Nombre del departamento',
     'manager'                   => 'Supervisor',
     'location'                  => 'Ubicación',
     'create'                    => 'Crear departamento',
-    'update'                    => 'Departamento de actualización',
+    'update'                    => 'Actualizar departamento',
     );
diff --git a/resources/lang/es-MX/admin/depreciations/general.php b/resources/lang/es-MX/admin/depreciations/general.php
index 86e175aeb4..1ffc4363da 100644
--- a/resources/lang/es-MX/admin/depreciations/general.php
+++ b/resources/lang/es-MX/admin/depreciations/general.php
@@ -2,15 +2,19 @@
 
 return [
     'about_asset_depreciations'  			=> 'Sobre amortización de activos',
-    'about_depreciations'  					=> 'Puede configurar la amortización de activos usando un método de línea recta.',
-    'asset_depreciations'  					=> 'Amortizaciones',
+    'about_depreciations'  					=> 'Puede configurar la depreciación de activos usando un método de línea recta.',
+    'asset_depreciations'  					=> 'Depreciación de activos',
     'create'  					            => 'Crear amortización',
     'depreciation_name'  					=> 'Nombre amortización',
     'depreciation_min'                      => 'Valor mínimo de depreciación',
-    'number_of_months'  					=> 'Meses',
-    'update'  					            => 'Actualizar Amortización',
+    'number_of_months'  					=> 'Número de meses',
+    'update'  					            => 'Actualizar amortización',
     'depreciation_min'                      => 'Valor mínimo después de depreciado',
     'no_depreciations_warning'               => '<strong>Advertencia: </strong>
                       No tiene ninguna depreciación configurada.
                       Por favor, configure al menos una depreciación para ver el informe de depreciación.',
+    'depreciation_method'                   => 'Informe de amortización',
+    'linear_depreciation'                   => 'Lineal (por defecto)',
+    'half_1'                                => 'Convención de Half-year siempre aplicada',
+    'half_2'                                => 'Convención semestral, aplicada con condición',
 ];
diff --git a/resources/lang/es-MX/admin/depreciations/message.php b/resources/lang/es-MX/admin/depreciations/message.php
index 024b1ee6e3..b57b54c800 100644
--- a/resources/lang/es-MX/admin/depreciations/message.php
+++ b/resources/lang/es-MX/admin/depreciations/message.php
@@ -2,23 +2,23 @@
 
 return array(
 
-    'does_not_exist' => 'Clase de amortización inexistente.',
-    'assoc_users'	 => 'Esta amortización está asociada a uno o más modelos y no puede ser eliminada.',
+    'does_not_exist' => 'La clase de depreciación no existe.',
+    'assoc_users'	 => 'Esta depreciación está actualmente asociada con uno o más modelos y no puede ser eliminada. Por favor, elimine los modelos y luego intente borrarlas de nuevo. ',
 
 
     'create' => array(
-        'error'   => 'Amortización no creada, intentalo de nuevo. :(',
+        'error'   => 'El tipo de depreciación no fue creado, por favor, inténtelo de nuevo. :(',
         'success' => 'Amortización creada correctamente. :)'
     ),
 
     'update' => array(
-        'error'   => 'Amortización no actualizada, intentalo de nuevo.',
+        'error'   => 'El tipo de depreciación no fue actualizado, por favor, inténtelo de nuevo',
         'success' => 'Amortización actualizada correctamente.'
     ),
 
     'delete' => array(
         'confirm'   => '¿Está seguro de que desea eliminar esta clase de depreciación?',
-        'error'   => 'Amortización no eliminada, intentalo de nuevo.',
+        'error'   => 'Ha sucedido un error eliminando el tipo de depreciación, por favor intente de nuevo.',
         'success' => 'Amortización eliminada correctamente.'
     )
 
diff --git a/resources/lang/es-MX/admin/depreciations/table.php b/resources/lang/es-MX/admin/depreciations/table.php
index b303c8e502..ee803b42fd 100644
--- a/resources/lang/es-MX/admin/depreciations/table.php
+++ b/resources/lang/es-MX/admin/depreciations/table.php
@@ -6,7 +6,6 @@ return [
     'months'   => 'Meses',
     'term'   => 'Termina',
     'title'      => 'Nombre ',
-    'depreciation_min' => 'Key: array[\'depreciacion_min\']
-array[\'depreciacion_min\']',
+    'depreciation_min' => 'Valor mínimo',
 
 ];
diff --git a/resources/lang/es-MX/admin/groups/message.php b/resources/lang/es-MX/admin/groups/message.php
index d7cfbb1f18..529e14d4b3 100644
--- a/resources/lang/es-MX/admin/groups/message.php
+++ b/resources/lang/es-MX/admin/groups/message.php
@@ -2,21 +2,21 @@
 
 return array(
 
-    'group_exists'        => 'El grupo ya existe!',
+    'group_exists'        => '!El grupo ya existe!',
     'group_not_found'     => 'El ID de grupo :id no existe.',
     'group_name_required' => 'El campo nombre es obligatorio',
 
     'success' => array(
         'create' => 'Grupo creado.',
-        'update' => 'Grupo actualizado.',
-        'delete' => 'Grupo eliminado.',
+        'update' => 'El grupo fue actualizado exitosamente.',
+        'delete' => 'El grupo fue eliminado exitosamente.',
     ),
 
     'delete' => array(
-        'confirm'   => 'Seguroq que quieres Eliminar grupo?',
-        'create' => 'Ha habido un problema creando el grupo. Vuelve a intentarlo.',
-        'update' => 'Ha habido un problema actualizando el grupo. Vuelve a intentarlo.',
-        'delete' => 'Ha habido un problema eliminando el grupo. Vuelve a intentarlo.',
+        'confirm'   => '¿Está seguro de que desea eliminar este grupo?',
+        'create' => 'Hubo un problema creando el grupo. Por favor, intente nuevamente.',
+        'update' => 'Hubo un problema actualizando el grupo. Por favor, intente nuevamente.',
+        'delete' => 'Hubo un problema eliminando el grupo. Por favor, intente nuevamente.',
     ),
 
 );
diff --git a/resources/lang/es-MX/admin/groups/table.php b/resources/lang/es-MX/admin/groups/table.php
index c002d06ba8..1511815185 100644
--- a/resources/lang/es-MX/admin/groups/table.php
+++ b/resources/lang/es-MX/admin/groups/table.php
@@ -2,8 +2,8 @@
 
 return array(
 
-    'id'         => 'ID',
+    'id'         => 'Id',
     'name'       => 'Nombre',
-    'users'      => '# de Usuarios',
+    'users'      => '# de usuarios',
 
 );
diff --git a/resources/lang/es-MX/admin/groups/titles.php b/resources/lang/es-MX/admin/groups/titles.php
index 0b49feaa7a..d139ee66c7 100644
--- a/resources/lang/es-MX/admin/groups/titles.php
+++ b/resources/lang/es-MX/admin/groups/titles.php
@@ -2,12 +2,12 @@
 
 return [
     'about_groups_title'            => 'Acerca de los grupos',
-    'about_groups'                  => 'Los Grupos son usados para generar permisos de usuarios.',
-    'group_management' 	 	=> 'Gestión de Grupos',
+    'about_groups'                  => 'Los grupos se utilizan para generalizar los permisos de usuario.',
+    'group_management' 	 	=> 'Administración de grupos',
     'create' 	 	 	    => 'Crear un grupo nuevo',
-    'update' 	 		        => 'Editar Grupo',
+    'update' 	 		        => 'Editar grupo',
     'group_name' 	 		=> 'Nombre de Grupo',
-    'group_admin' 	 		=> 'Admin Grupo',
+    'group_admin' 	 		=> 'Grupo administrador',
     'allow' 	 			=> 'Permitir',
     'deny' 	 				=> 'Denegar',
     'permission'            => 'Permiso',
diff --git a/resources/lang/es-MX/admin/hardware/form.php b/resources/lang/es-MX/admin/hardware/form.php
index 94b3730d59..312ffaf267 100644
--- a/resources/lang/es-MX/admin/hardware/form.php
+++ b/resources/lang/es-MX/admin/hardware/form.php
@@ -1,36 +1,36 @@
 <?php
 
 return [
-    'bulk_delete'		=> 'Confirmar eliminación masiva de bienes',
+    'bulk_delete'		=> 'Confirmar eliminación masiva de activos',
     'bulk_restore'      => 'Confirmar recuperación masiva de activos', 
-  'bulk_delete_help'	=> 'Revisar los bienes para eliminación masiva. Una vez eliminados, esos bienes pueden ser restaurados, pero no volverán a estar asociados con ningún usuario a los que esté asignado.',
+  'bulk_delete_help'	=> 'Revise a continuación los activos para eliminación masiva. Una vez eliminados, estos activos se pueden restaurar, pero ya no estarán asociados a ningún usuario al que estén asignados actualmente.',
   'bulk_restore_help'	=> 'Revisar los activos para la restauración en masa a continuación. Una vez restaurados, estos activos no estarán asociados con los usuarios a los que fueron asignados anteriormente.',
   'bulk_delete_warn'	=> 'Va a eliminar :asset_count activos.',
   'bulk_restore_warn'	=> 'Está a punto de restaurar :asset_count activos.',
-    'bulk_update'		=> 'Actualización masiva de Equipos',
-    'bulk_update_help'	=> 'Este formulario le permite actualizar múltiples Equipos simultáneamente. Solo complete los campos que quiere modificar. Todo campo en blanco permanecerá sin cambios. ',
-    'bulk_update_warn'	=> 'Está a punto de editar las propiedades de un solo recurso.|Está a punto de editar las propiedades de :asset_count activos.',
-    'bulk_update_with_custom_field' => 'Tenga en cuenta que los activos son :asset_model_count diferentes tipos de modelos.',
+    'bulk_update'		=> 'Actualización masiva de activos',
+    'bulk_update_help'	=> 'Este formulario le permite actualizar varios activos a la vez. Complete solo los campos que necesite modificar. Los campos que se dejen en blanco no se modificarán. ',
+    'bulk_update_warn'	=> 'Está a punto de editar las propiedades de un solo activo.|Está a punto de editar las propiedades de :asset_count activos.',
+    'bulk_update_with_custom_field' => 'Tenga en cuenta que los activos corresponden a :asset_model_count tipos diferentes de modelos.',
     'bulk_update_model_prefix' => 'En modelos', 
-    'bulk_update_custom_field_unique' => 'Este es un campo único y no puede ser editado a granel.',
+    'bulk_update_custom_field_unique' => 'Este es un campo único y no puede ser editado de forma masiva.',
     'checkedout_to'		=> 'Asignado a',
     'checkout_date'		=> 'Fecha de asignación',
-    'checkin_date'		=> 'Fecha de devolución',
+    'checkin_date'		=> 'Fecha de ingreso',
     'checkout_to'		=> 'Asignar a',
-    'cost'				=> 'Precio Compra',
-    'create'			=> 'Crear Equipo',
+    'cost'				=> 'Precio de compra',
+    'create'			=> 'Crear activo',
     'date'				=> 'Fecha de compra',
     'depreciation'	    => 'Depreciación',
     'depreciates_on'	=> 'Se deprecia en',
     'default_location'	=> 'Ubicación predeterminada',
-    'default_location_phone' => 'Teléfono de ubicación por defecto',
+    'default_location_phone' => 'Teléfono de ubicación predeterminada',
     'eol_date'			=> 'Fecha fin de soporte (EOL)',
-    'eol_rate'			=> 'Tasa de EOL',
+    'eol_rate'			=> 'Tasa fin de soporte (EOL)',
     'expected_checkin'  => 'Fecha esperada de devolución',
-    'expires'			=> 'Expira',
+    'expires'			=> 'Vence',
     'fully_depreciated'	=> 'Totalmente amortizado',
-    'help_checkout'		=> 'Si desea asignar este equipo inmediatamente, seleccione "Listo para Asignar" de la lista de estados de arriba. ',
-    'mac_address'		=> 'MAC Dirección',
+    'help_checkout'		=> 'Si desea asignar este equipo inmediatamente, seleccione "Listo para asignar" de la lista de estados de arriba. ',
+    'mac_address'		=> 'Dirección MAC',
     'manufacturer'		=> 'Fabricante',
     'model'				=> 'Modelo',
     'months'			=> 'meses',
@@ -39,24 +39,27 @@ return [
     'order'				=> 'Número de orden',
     'qr'				=> 'Código QR',
     'requestable'		=> 'Los usuarios pueden solicitar este elemento',
-    'redirect_to_all'   => 'Return to all :type',
+    'redirect_to_all'   => 'Regresar a :type',
     'redirect_to_type'   => 'Ir a :type',
-    'redirect_to_checked_out_to'   => 'Go to Checked Out to',
+    'redirect_to_checked_out_to'   => 'Ir a elementos asignados',
     'select_statustype'	=> 'Seleccione un tipo de estado',
-    'serial'			=> 'N. Serie',
+    'serial'			=> 'Número de serie',
     'status'			=> 'Estado',
-    'tag'				=> 'Etiqueta del activo',
-    'update'			=> 'Actualizar Equipo',
+    'tag'				=> 'Placa del activo',
+    'update'			=> 'Actualizar activo',
     'warranty'			=> 'Garantía',
-        'warranty_expires'		=> 'Vencimiento de la Garantía',
+        'warranty_expires'		=> 'Vencimiento de la garantía',
     'years'				=> 'años',
-    'asset_location' => 'Actualizar ubicación del Activo',
+    'asset_location' => 'Actualizar ubicación del activo',
     'asset_location_update_default_current' => 'Actualizar ubicación predeterminada y ubicación actual',
     'asset_location_update_default' => 'Actualizar sólo la ubicación predeterminada',
     'asset_location_update_actual' => 'Actualizar sólo la ubicación actual',
     'asset_not_deployable' => 'Ese estado de activos es no utilizable. Este activo no puede ser asignado.',
-    'asset_deployable' => 'El estado indica que es utilizable. Este activo puede ser asignado.',
+    'asset_not_deployable_checkin' => 'Ese estado del activo no es utilizable. El uso de esta etiqueta de estado ingresará el activo.',
+    'asset_deployable' => 'Este activo puede ser revisado.',
     'processing_spinner' => 'Procesando... (Esto puede tomar un poco de tiempo en archivos grandes)',
+    'processing' => 'Procesando... ',
     'optional_infos'  => 'Información opcional',
-    'order_details'   => 'Información relacionada con el pedido'
+    'order_details'   => 'Información relacionada con el pedido',
+    'calc_eol'    => 'Si deja nula la fecha EOL, utilice el cálculo automático basado en la fecha de compra y la frecuencia de EOL.',
 ];
diff --git a/resources/lang/es-MX/admin/hardware/general.php b/resources/lang/es-MX/admin/hardware/general.php
index 0e77368048..12c016c609 100644
--- a/resources/lang/es-MX/admin/hardware/general.php
+++ b/resources/lang/es-MX/admin/hardware/general.php
@@ -1,42 +1,42 @@
 <?php
 
 return [
-    'about_assets_title'           => 'Acerca de Activos',
-    'about_assets_text'            => 'Los activos son elementos con número de serie o etiqueta de activos.  Tienden a ser artículos de alto valor donde es importante identificar un elemento específico.',
+    'about_assets_title'           => 'Acerca de los activos',
+    'about_assets_text'            => 'Los activos son artículos rastreados por número de serie o placa de activo.  Suelen ser artículos de alto valor en los que es importante identificar un elemento específico.',
     'archived'  				=> 'Archivado',
-    'asset'  					=> 'Equipo',
-    'bulk_checkout'             => 'Checkout Assets',
-    'bulk_checkin'              => 'Devolver activos',
-    'checkin'  					=> 'Devolver activo',
-    'checkout'  				=> 'Activo de pago',
+    'asset'  					=> 'Activo',
+    'bulk_checkout'             => 'Asignación masiva',
+    'bulk_checkin'              => 'Bulk Checkin',
+    'checkin'  					=> 'Ingresar activo',
+    'checkout'  				=> 'Asignar activo',
     'clone'  					=> 'Clonar activo',
     'deployable'  				=> 'Utilizable',
     'deleted'  					=> 'Este activo ha sido eliminado.',
-    'delete_confirm'            => '¿Está seguro de que desea eliminar este recurso?',
+    'delete_confirm'            => '¿Está seguro de que desea eliminar este activo?',
     'edit'  					=> 'Editar activo',
-    'model_deleted'  			=> 'Este modelo de equipo fue eliminado. Debes restaurar el moldelo antes de restaurar el activo.',
+    'model_deleted'  			=> 'Este modelo de activo ha sido eliminado. Debe restaurar este modelo antes de poder restaurar el activo.',
     'model_invalid'             => 'Este modelo para este activo es inválido.',
-    'model_invalid_fix'         => 'El activo debe ser actualizado, use un modelo de activo válido antes de intentar asignarlo, devolverlo o auditarlo.',
+    'model_invalid_fix'         => 'El activo debe ser actualizado, use un modelo de activo válido antes de intentar ingresarlo, asignarlo o auditarlo.',
     'requestable'               => 'Puede solicitarse',
     'requested'				    => 'Solicitado',
     'not_requestable'           => 'No puede solicitarse',
     'requestable_status_warning' => 'No cambiar el estado solicitable',
-    'restore'  					=> 'Restaurar equipo',
+    'restore'  					=> 'Restaurar activo',
     'pending'  					=> 'Pendiente',
     'undeployable'  			=> 'No utilizable',
     'undeployable_tooltip'  	=> 'Este activo tiene una etiqueta de estado que es no utilizable y no puede ser asignado en este momento.',
     'view'  					=> 'Ver activo',
     'csv_error' => 'Hay un error en su archivo CSV:',
-    'import_text' => '<p>Cargue un archivo CSV que contenga el historial de activos. Los activos y los usuarios DEBEN existir ya en el sistema, o serán omitidos. La importación del historial busca activos que coincidan con la etiqueta de activo.  Intentaremos encontrar un usuario usando el nombre del usuario que proporcione y los criterios que seleccione a continuación. Si no selecciona ningún criterio, el sistema simplemente intentará usar el formato de nombre de usuario configurado en <code>Admin &gt;  Opciones Generales</code>.</p><p>Los campos incluidos en el CSV deben coincidir con los encabezados: <strong>Asset Tag, Name, Checkout Date, Checkin Date</strong>. Cualquier campo adicional será ignorado.</p><p>Checkin Date(Fecha de Devolución): dejar en blanco o usar fechas futuras asignará los ítems al usuario asociado. Excluir la columna Checkin Date creará una fecha de devolución con la fecha de hoy.</p>    ',
-    'csv_import_match_f-l' => 'Intenta emparejar usuarios con formato <strong>nombre.lastname</strong> (<code>jane.smith</code>)',
-    'csv_import_match_initial_last' => 'Intentar emparejar a los usuarios con un formato <strong>primer apellido inicial</strong> (<code>jsmith</code>)',
-    'csv_import_match_first' => 'Intentar emparejar a los usuarios con formato <strong>primer nombre</strong> (<code>jane</code>)',
-    'csv_import_match_email' => 'Intenta emparejar a los usuarios por <strong>email</strong> como nombre de usuario',
-    'csv_import_match_username' => 'Intentar hacer coincidir los usuarios usando la propiedad <strong>Usuario</strong>',
+    'import_text' => '<p>Cargue un archivo CSV que contenga el historial de los activos. Los activos y los usuarios DEBEN existir ya en el sistema, o serán omitidos. La comparación de activos para importar el historial se realiza con la placa del activo. Intentaremos encontrar un usuario usando el nombre del usuario que proporcione y los criterios que seleccione a continuación. Si no selecciona ningún criterio, el sistema simplemente intentará usar el formato de nombre de usuario configurado en <code>Administrador &gt; Configuración General</code>.</p><p>Los campos incluidos en el CSV deben coincidir con los encabezados: <strong>Asset Tag, Name, Checkout Date, Checkin Date</strong>. Cualquier campo adicional será ignorado.</p><p>Checkin Date(Fecha de recepción): dejar en blanco o usar fechas futuras asignará los elementos al usuario asociado. Excluir la columna Checkin Date creará una fecha de recepción con la fecha de hoy.</p>    ',
+    'csv_import_match_f-l' => 'Intente asociar usuarios usando el formato <strong>nombre.apellido</strong> (<code>jane.smith</code>)',
+    'csv_import_match_initial_last' => 'Intente asociar los usuarios usando el formato <strong>inicial del nombre y apellido</strong> (<code>jsmith</code>)',
+    'csv_import_match_first' => 'Intentar asociar los usuarios usando el formato <strong>primer nombre</strong> (<code>jane</code>)',
+    'csv_import_match_email' => 'Intente asociar los usuarios usando <strong>correo electrónico</strong> como nombre de usuario',
+    'csv_import_match_username' => 'Intente asociar los usuarios usando <strong>nombre de usuario</strong>',
     'error_messages' => 'Mensajes de error:',
     'success_messages' => 'Mensajes de éxito:',
     'alert_details' => 'Por favor, vea abajo para más detalles.',
-    'custom_export' => 'Exportación personalizada',
-    'mfg_warranty_lookup' => 'Búsqueda del estado de Garantía para :manufacturer',
-    'user_department' => 'Departamento',
+    'custom_export' => 'Personalizar exportación',
+    'mfg_warranty_lookup' => 'Búsqueda del estado de garantía para :manufacturer',
+    'user_department' => 'Departamento del usuario',
 ];
diff --git a/resources/lang/es-MX/admin/hardware/message.php b/resources/lang/es-MX/admin/hardware/message.php
index 31f614cd8d..6ffcbe91c5 100644
--- a/resources/lang/es-MX/admin/hardware/message.php
+++ b/resources/lang/es-MX/admin/hardware/message.php
@@ -2,34 +2,38 @@
 
 return [
 
-    'undeployable' 		=> '<strong>Atención:</strong> Este elemento ha sido marcado como no utilizable.
-                        Si no es correcto, actualice el estado.',
-    'does_not_exist' 	=> 'Equipo inexistente.',
-    'does_not_exist_var'=> 'Activo con etiqueta :asset_tag no encontrado.',
-    'no_tag' 	        => 'No se ha proporcionado ninguna etiqueta de activo.',
+    'undeployable' 		 => '<strong>Advertencia:</strong> Este activo actualmente está marcado como no utilizable. Si este estado ha cambiado, por favor, actualice el estado del activo.',
+    'does_not_exist' 	 => 'Equipo inexistente.',
+    'does_not_exist_var' => 'Activo con placa :asset_tag no encontrado.',
+    'no_tag' 	         => 'No se ha proporcionado ninguna placa de activo.',
     'does_not_exist_or_not_requestable' => 'Ese activo no existe o no puede ser solicitado.',
-    'assoc_users'	 	=> 'Equipo asignado a un usuario, no se puede eliminar.',
+    'assoc_users'	 	 => 'Actualmente este activo está asignado a un usuario y no puede ser eliminado. Por favor, primero ingrese el activo y vuelva a intentarlo. ',
     'warning_audit_date_mismatch' 	=> 'La próxima fecha de auditoría de este activo (:next_audit_date) es anterior a la última fecha de auditoría (:last_audit_date). Por favor, actualice la próxima fecha de auditoría.',
+    'labels_generated'   => 'Las etiquetas fueron generadas exitosamente.',
+    'error_generating_labels' => 'Error en la generación de etiquetas.',
+    'no_assets_selected' => 'No se han seleccionado activos.',
 
     'create' => [
         'error'   		=> 'El activo no fue creado, por favor, inténtelo de nuevo. :(',
-        'success' 		=> 'Equipo creado. :)',
-        'success_linked' => 'Activo con etiqueta :tag creado con éxito. <strong><a href=":link" style="color: white;">Haga clic aquí para ver</a></strong>.',
+        'success' 		=> 'Activo creado con éxito. :)',
+        'success_linked' => 'Activo con placa :tag creado con éxito. <strong><a href=":link" style="color: white;">Haga clic aquí para ver</a></strong>.',
+        'multi_success_linked' => 'Activo con etiqueta :links fue creado exitosamente.|:count activos fueron creados correctamente. :links.',
+        'partial_failure' => 'No se ha podido crear un activo: Motivo: :failures|No se pudieron crear :count activos. Motivos: :failures',
     ],
 
     'update' => [
-        'error'   			=> 'Equipo no actualizado, intentalo de nuevo',
-        'success' 			=> 'Equipo actualizado.',
-        'encrypted_warning' => 'Activo actualizado con éxito, pero los campos personalizados cifrados no se actualizaron debido a permisos',
-        'nothing_updated'	=>  'Ningún campo fue seleccionado, por lo que nada ha sido actualizado.',
-        'no_assets_selected'  =>  'Ningún recurso fue seleccionado, por lo que no se actualizó nada.',
+        'error'   			=> 'El activo no pudo ser actualizado, por favor inténtelo de nuevo',
+        'success' 			=> 'Equipo actualizado correctamente.',
+        'encrypted_warning' => 'El activo se actualizó correctamente, pero los campos personalizados cifrados no lo hicieron debido a los permisos',
+        'nothing_updated'	=>  'Ningún campo fue seleccionado, por lo que no se actualizó nada.',
+        'no_assets_selected'  =>  'Ningún activo fue seleccionado, por lo que no se actualizó nada.',
         'assets_do_not_exist_or_are_invalid' => 'Los activos seleccionados no se pueden actualizar.',
     ],
 
     'restore' => [
-        'error'   		=> 'El equipo no fue restaurado, por favor intente nuevamente',
-        'success' 		=> 'Equipo restaurado correctamente.',
-        'bulk_success' 		=> 'Activo restaurado con éxito.',
+        'error'   		=> 'El activo no fue restaurado, por favor inténtelo nuevamente',
+        'success' 		=> 'Activo restaurado exitosamente.',
+        'bulk_success' 		=> 'Activo restaurado exitosamente.',
         'nothing_updated'   => 'No se seleccionaron activos, por lo que no se restauró nada.', 
     ],
 
@@ -40,7 +44,7 @@ return [
 
 
     'deletefile' => [
-        'error'   => 'Archivo no eliminado. Por favor, vuelva a intentarlo.',
+        'error'   => 'Archivo no eliminado. Por favor inténtelo nuevamente.',
         'success' => 'Archivo eliminado correctamente.',
     ],
 
@@ -48,48 +52,58 @@ return [
         'error'   => 'Archivo(s) no cargado(s). Por favor, inténtelo nuevamente.',
         'success' => 'Archivo(s) cargado(s) exitosamente.',
         'nofiles' => 'No seleccionó ningún archivo para ser cargado, o el archivo que está tratando de cargar es demasiado grande',
-        'invalidfiles' => 'Uno o más sus archivos es demasiado grande o es de un tipo no permitido. Los tipos de archivo permitidos son png, gif, jpg, doc, docx, pdf y txt.',
+        'invalidfiles' => 'Uno o más de sus archivos son demasiado grandes o son de un tipo de archivo que no está permitido. Los tipos de archivo permitidos son png, gif, jpg, doc, docx, pdf y txt.',
     ],
 
     'import' => [
+        'import_button'         => 'Importar',
         'error'                 => 'Algunos elementos no se pudieron importar correctamente.',
         'errorDetail'           => 'Estos elementos no pudieron importarse debido a errores.',
-        'success'               => 'Tu archivo ha sido importado',
-        'file_delete_success'   => 'Tu archivo ha sido eliminado con éxito',
-        'file_delete_error'      => 'No pudimos eliminar tu archivo',
+        'success'               => 'Su archivo ha sido importado',
+        'file_delete_success'   => 'Su archivo se ha eliminado correctamente',
+        'file_delete_error'      => 'El archivo no se pudo eliminar',
         'file_missing' => 'Falta el archivo seleccionado',
+        'file_already_deleted' => 'El archivo seleccionado ya fue eliminado',
         'header_row_has_malformed_characters' => 'Uno o más atributos de la fila de encabezado contiene caracteres UTF-8 mal formados',
-        'content_row_has_malformed_characters' => 'Uno o más atributos de la fila de encabezado contiene caracteres UTF-8 mal formados',
+        'content_row_has_malformed_characters' => 'Uno o más atributos en la primera fila contienen caracteres UTF-8 mal formados',
+        'transliterate_failure' => 'La transliteración de :encoding a UTF-8 falló debido a caracteres no válidos en la entrada'
     ],
 
 
     'delete' => [
         'confirm'   	=> '¿Está seguro de que desea eliminar este activo?',
-        'error'   		=> 'Equipo no eliminado, intentalo de nuevo.',
+        'error'   		=> 'Hubo un problema al eliminar el activo. Por favor, inténtelo de nuevo.',
+        'assigned_to_error' => '{1}Tag de activos: :asset_tag está actualmente desprotegido. Compruebe este dispositivo antes de eliminarlo. [2,*]Etiquetas de activos: :asset_tag están desactivadas. Revisa estos dispositivos antes de eliminarlos.',
         'nothing_updated'   => 'No se seleccionaron los activos, por lo que no se eliminó nada.',
-        'success' 		=> 'Equipo eliminado.',
+        'success' 		=> 'El activo se ha eliminado correctamente.',
     ],
 
     'checkout' => [
         'error'   		=> 'El activo no fue asignado, por favor inténtelo de nuevo',
-        'success' 		=> 'Equipo asignado.',
-        'user_does_not_exist' => 'Este usuario no es correcto. Intentalo de nuevo.',
-        'not_available' => '¡Ese artículo no está disponible para retirada!',
-        'no_assets_selected' => 'Debes seleccionar al menos un elemento de la lista',
+        'success' 		=> 'Equipo asignado correctamente.',
+        'user_does_not_exist' => 'Este usuario no es correcto. Por favor, inténtelo de nuevo.',
+        'not_available' => '¡Ese equipo no está disponible para ser asignado!',
+        'no_assets_selected' => 'Debe seleccionar al menos un activo de la lista',
+    ],
+
+    'multi-checkout' => [
+        'error'   => 'El activo no fue asignado, por favor, intente nuevamente|Los activos no fueron asignados, por favor, intente nuevamente',
+        'success' => 'El activo fue asignado correctamente|Los activos fueron asignados correctamente.',
     ],
 
     'checkin' => [
-        'error'   		=> 'El equipo no se pudo devolver, por favor inténtelo de nuevo',
-        'success' 		=> 'El activo fue devuelto exitosamente.',
-        'user_does_not_exist' => 'Es usuario no es correcto, por favor inténtelo de nuevo.',
-        'already_checked_in'  => 'El equipo ya ha sido devuelto.',
+        'error'   		=> 'El activo no se pudo ingresar, por favor inténtelo de nuevo',
+        'success' 		=> 'El activo fue ingresado exitosamente.',
+        'user_does_not_exist' => 'Este usuario no es correcto. Por favor, inténtelo de nuevo.',
+        'already_checked_in'  => 'El equipo ya ha sido recibido.',
 
     ],
 
     'requests' => [
-        'error'   		=> 'Bien no solicitado, por favor inténtelo de nuevo',
-        'success' 		=> 'Bien solicitado correctamente.',
-        'canceled'      => 'Solicitud de retirada cancelada con éxito',
+        'error'   		=> 'Solicitud no exitosa, por favor inténtelo de nuevo.',
+        'success' 		=> 'Solicitud enviada con éxito.',
+        'canceled'      => 'Solicitud cancelada con éxito.',
+        'cancel'        => 'Cancelar solicitud para este elemento',
     ],
 
 ];
diff --git a/resources/lang/es-MX/admin/hardware/table.php b/resources/lang/es-MX/admin/hardware/table.php
index 0881c20af7..a3bf6b6724 100644
--- a/resources/lang/es-MX/admin/hardware/table.php
+++ b/resources/lang/es-MX/admin/hardware/table.php
@@ -2,32 +2,31 @@
 
 return [
 
-    'asset_tag'   	=> 'Etiqueta',
+    'asset_tag'   	=> 'Placa del activo',
     'asset_model'       => 'Modelo',
     'assigned_to'   => 'Asignado a',
-    'book_value'  	=> 'Valor Actual',
+    'book_value'  	=> 'Valor actual',
     'change' 		=> 'Operación',
     'checkout_date' => 'Fecha de asignación',
-    'checkoutto' 	=> 'Asignado',
+    'checkoutto' 	=> 'Asignado a',
     'components_cost' => 'Coste total de componentes',
     'current_value' => 'Valor actual',
     'diff' 			=> 'Diferencia',
     'dl_csv' 		=> 'Descargar CSV',
-    'eol' 			=> 'EOL',
+    'eol' 			=> 'Fin de soporte (EOL)',
     'id'      		=> 'ID',
-    'last_checkin_date' => 'Last Checkin Date',
+    'last_checkin_date' => 'Última fecha de ingreso',
     'location' 		=> 'Ubicación',
     'purchase_cost'	=> 'Costo',
     'purchase_date'	=> 'Comprado',
-    'serial'   		=> 'N. Serie',
+    'serial'   		=> 'Número de serie',
     'status'   		=> 'Estado',
-    'title'      	=> 'Equipo ',
+    'title'      	=> 'Activo ',
     'image'		    => 'Imagen de dispositivo',
-    'days_without_acceptance' => 'Días Sin Aceptación',
-    'monthly_depreciation' => 'Depreciación Mensual',
-    'assigned_to'    => 'Asignado a',
-    'requesting_user' => 'Usuario Solicitante',
+    'days_without_acceptance' => 'Días sin aceptación',
+    'monthly_depreciation' => 'Depreciación mensual',
+    'requesting_user' => 'Usuario solicitante',
     'requested_date' => 'Fecha solicitada',
-    'changed'       => 'Cambiado',
+    'changed'       => 'Cambios',
     'icon' => 'Ícono',
 ];
diff --git a/resources/lang/es-MX/admin/kits/general.php b/resources/lang/es-MX/admin/kits/general.php
index c9d6a5e7b6..030d3d59d1 100644
--- a/resources/lang/es-MX/admin/kits/general.php
+++ b/resources/lang/es-MX/admin/kits/general.php
@@ -2,49 +2,50 @@
 
 return [
     'about_kits_title'                  => 'Acerca de kits predefinidos',
-    'about_kits_text'                   => 'Kits predefinidos le permiten revisar rápidamente un conjunto de elementos (activos, licencias, etc.) a un usuario. Esto puede ser útil cuando su proceso de incorporación es consistente entre muchos usuarios y todos los usuarios reciben los mismos artículos.',
+    'about_kits_text'                   => 'Los kits predefinidos le permiten rápidamente asignar un conjunto de elementos (activos, licencias, etc.) a un usuario. Esto puede ser útil cuando su proceso de incorporación de usuarios es similar para muchos usuarios y todos reciben los mismos elementos.',
     'checkout'                          => 'Asignar kit ',
     'create_success'                    => 'El kit se ha creado correctamente.',
     'create'                            => 'Crear kit predefinido',
     'update'                            => 'Actualizar kit predefinido',
     'delete_success'                    => 'Kit eliminado correctamente.',
     'update_success'                    => 'El kit se ha actualizado correctamente.',
-    'none_models'                       => 'No hay suficientes activos disponibles para :model para asignar. :qty son requeridos. ',
-    'none_licenses'                     => 'No hay suficientes licencias disponibles para :license para asignar. :qty son requeridos. ',
-    'none_consumables'                  => 'No hay suficientes unidades disponibles de :consumable para asignar. :qty son requeridas. ',
-    'none_accessory'                    => 'No hay suficientes unidades disponibles de :accesory para asignar. :qty son requeridas. ',
+    'none_models'                       => 'No hay suficientes activos disponibles de :model para asignar. Se requieren :qty. ',
+    'none_licenses'                     => 'No hay suficientes licencias disponibles de :license para asignar. Se requieren :qty. ',
+    'none_consumables'                  => 'No hay suficientes unidades disponibles de :consumable para asignar. Se requieren :qty. ',
+    'none_accessory'                    => 'No hay suficientes unidades disponibles de :accessory para asignar. Se requieren :qty. ',
     'append_accessory'                  => 'Añadir accesorio',
-    'update_appended_accessory'         => 'Actualizar accesorio adjunto',
+    'update_appended_accessory'         => 'Actualizar accesorio añadido',
     'append_consumable'                 => 'Añadir consumible',
-    'update_appended_consumable'        => 'Actualizar consumible adjunto',
+    'update_appended_consumable'        => 'Actualizar consumible añadido',
     'append_license'                    => 'Añadir licencia',
     'update_appended_license'           => 'Actualizar licencia añadida',
     'append_model'                      => 'Añadir modelo',
     'update_appended_model'             => 'Actualizar modelo añadido',
-    'license_error'                     => 'Licencia ya está vinculada al kit',
+    'license_error'                     => 'Licencia ya vinculada al kit',
     'license_added_success'             => 'Licencia añadida correctamente',
-    'license_updated'                   => 'La licencia se ha actualizado correctamente',
+    'license_updated'                   => 'La licencia fue actualizada correctamente',
     'license_none'                      => 'La licencia no existe',
     'license_detached'                  => 'Licencia desvinculada correctamente',
     'consumable_added_success'          => 'Consumible añadido correctamente',
-    'consumable_updated'                => 'Consumible actualizado correctamente',
+    'consumable_updated'                => 'El consumible fue actualizado correctamente',
     'consumable_error'                  => 'Consumible ya vinculado al kit',
     'consumable_deleted'                => 'El borrado fue exitoso',
-    'consumable_none'                   => 'El Consumible no existe',
+    'consumable_none'                   => 'El consumible no existe',
     'consumable_detached'               => 'Consumible desvinculado correctamente',
     'accessory_added_success'           => 'Accesorio añadido correctamente',
-    'accessory_updated'                 => 'Accesorio actualizado correctamente',
+    'accessory_updated'                 => 'El accesorio fue actualizado correctamente',
     'accessory_detached'                => 'Accesorio desvinculado correctamente',
     'accessory_error'                   => 'El accesorio ya está vinculado al kit',
     'accessory_deleted'                 => 'El borrado fue exitoso',
     'accessory_none'                    => 'El accesorio no existe',
     'checkout_success'                  => 'Asignación correcta',
     'checkout_error'                    => 'Error al asignar',
-    'kit_none'                          => 'El Kit no existe',
+    'kit_none'                          => 'El kit no existe',
     'kit_created'                       => 'Kit creado correctamente',
-    'kit_updated'                       => 'El kit se ha actualizado correctamente',
+    'kit_updated'                       => 'El kit fue actualizado correctamente',
     'kit_not_found'                     => 'Kit no encontrado',
-    'kit_deleted'                       => 'El kit ha sido eliminado correctamente',
-    'kit_model_updated'                 => 'Modelo actualizado correctamente',
-    'kit_model_detached'                => 'Modelo desvinculado correctamente',
+    'kit_deleted'                       => 'El kit fue eliminado correctamente',
+    'kit_model_updated'                 => 'El modelo fue actualizado correctamente',
+    'kit_model_detached'                => 'El modelo fue desvinculado correctamente',
+    'model_already_attached'            => 'Modelo ya vinculado al kit',
 ];
diff --git a/resources/lang/es-MX/admin/labels/message.php b/resources/lang/es-MX/admin/labels/message.php
index ef530d72c4..f97118deb2 100644
--- a/resources/lang/es-MX/admin/labels/message.php
+++ b/resources/lang/es-MX/admin/labels/message.php
@@ -2,9 +2,9 @@
 
 return [
 
-    'invalid_return_count' => 'No se obtuvo un recuento válido desde :name. Esperado :expected, se obtuvo :actual.',
-    'invalid_return_type'  => 'Tipo no válido devuelto desde :name. Esperado :expected, obtuvo :actual.',
-    'invalid_return_value' => 'Valor no válido devuelto de :name. Esperado :expected, obtuvo :actual.',
+    'invalid_return_count' => 'Cantidad incorrecta devuelta por :name. Se esperaba :expected, obtenido :actual.',
+    'invalid_return_type'  => 'Tipo no válido devuelto por :name. Esperado :expected, obtenido :actual.',
+    'invalid_return_value' => 'Valor no válido devuelto por :name. Esperado :expected, obtenido :actual.',
 
     'does_not_exist' => 'La etiqueta no existe',
     
diff --git a/resources/lang/es-MX/admin/labels/table.php b/resources/lang/es-MX/admin/labels/table.php
index af028753b2..fab4d8f9db 100644
--- a/resources/lang/es-MX/admin/labels/table.php
+++ b/resources/lang/es-MX/admin/labels/table.php
@@ -3,14 +3,14 @@
 return [
     'example_company'    => 'Compañía de prueba limitada',
     'example_defaultloc' => 'Construcción 1',
-    'example_category'   => 'Probar categoría',
+    'example_category'   => 'Categoría de prueba',
     'example_location'   => 'Edificio 2',
     'example_manufacturer'  => 'Test Manufacturing Inc.',
     'example_model'      => 'Modelo de prueba',
     'example_supplier'   => 'Compañía de prueba limitada',
     'labels_per_page'    => 'Etiquetas',
     'support_fields'     => 'Campos',
-    'support_asset_tag'  => 'Tag',
+    'support_asset_tag'  => 'Placa',
     'support_1d_barcode' => '1D',
     'support_2d_barcode' => '2D',
     'support_logo'       => 'Logo',
diff --git a/resources/lang/es-MX/admin/licenses/form.php b/resources/lang/es-MX/admin/licenses/form.php
index b1d1d180d9..576492224b 100644
--- a/resources/lang/es-MX/admin/licenses/form.php
+++ b/resources/lang/es-MX/admin/licenses/form.php
@@ -2,21 +2,21 @@
 
 return array(
 
-    'asset'             => 'Equipo',
-    'checkin'           => 'Devolver',
+    'asset'             => 'Activo',
+    'checkin'           => 'Ingresar',
     'create'            => 'Crear licencia',
     'expiration'        => 'Fecha de vencimiento',
-    'license_key'       => 'Clave de producto',
-    'maintained'        => 'Mantenido',
-    'name'              => 'Aplicación',
-    'no_depreciation'   => 'No Amortizar',
+    'license_key'       => 'Clave del producto',
+    'maintained'        => 'Tiene mantenimiento',
+    'name'              => 'Nombre del software',
+    'no_depreciation'   => 'No amortizar',
     'purchase_order'    => 'Número de orden de compra',
     'reassignable'      => 'Reasignable',
-    'remaining_seats'   => 'Posiciones Restantes',
-    'seats'             => 'Instalaciones',
-    'termination_date'  => 'Fecha de Fin',
-    'to_email'          => 'Registrado a Email',
-    'to_name'           => 'Registrado a Nombre',
-    'update'            => 'Actualizar Licencia',
+    'remaining_seats'   => 'Disponibles',
+    'seats'             => 'Total de licencias',
+    'termination_date'  => 'Fecha de finalización',
+    'to_email'          => 'Correo electrónico asociado a la licencia',
+    'to_name'           => 'Nombre de la persona asociada a la licencia',
+    'update'            => 'Actualizar licencia',
     'checkout_help'     => 'Debe asignar una licencia a un activo de hardware o a una persona. Puede seleccionar ambos, pero el propietario del activo debe coincidir con la persona a la que está asignado el activo.'
 );
diff --git a/resources/lang/es-MX/admin/licenses/general.php b/resources/lang/es-MX/admin/licenses/general.php
index 5ba9041b4a..5b474ef407 100644
--- a/resources/lang/es-MX/admin/licenses/general.php
+++ b/resources/lang/es-MX/admin/licenses/general.php
@@ -2,50 +2,51 @@
 
 return array(
     'about_licenses_title'      => 'Acerca de licencias',
-    'about_licenses'            => 'Las licencias son para identificar software. Tienen un número específico de asientos que pueden ser asignados a individuos',
-    'checkin'  					=> 'Quitar Instalación',
-    'checkout_history'  		=> 'Historial Asignaciones',
-    'checkout'  				=> 'Asignar Instalación',
-    'edit'  					=> 'Editar Usuario',
-    'filetype_info'				=> 'Tipos de archivos permitidos son png, gif, jpg, jpeg, doc, docx, pdf, txt, zip, y rar.',
-    'clone'  					=> 'Clonar Usuario',
+    'about_licenses'            => 'Las licencias se utilizan para hacer un seguimiento del software.  Tienen una cantidad determinada que puede ser asignada a individuos',
+    'checkin'  					=> 'Ingresar licencia',
+    'checkout_history'  		=> 'Historial de asignaciones',
+    'checkout'  				=> 'Asignar licencia',
+    'edit'  					=> 'Editar licencia',
+    'filetype_info'				=> 'Los tipos de archivo permitidos son png, gif, jpg, jpeg, doc, docx, pdf, txt, zip, y rar.',
+    'clone'  					=> 'Clonar licencia',
     'history_for'  				=> 'Historial para ',
     'in_out'  					=> 'Quita/Asigna',
-    'info'  					=> 'Info Licencia',
-    'license_seats'  			=> 'Num. Instalaciones',
-    'seat'  					=> 'Instalación',
-    'seats'  					=> 'Instalaciones',
-    'software_licenses'  		=> 'Licencias Software',
+    'info'  					=> 'Información de licencia',
+    'license_seats'  			=> 'Total de licencias',
+    'seat'  					=> 'Licencia',
+    'seat_count'  				=> 'Licencia :count',
+    'seats'  					=> 'Total de licencias',
+    'software_licenses'  		=> 'Licencias de software',
     'user'  					=> 'Usuario',
-    'view'  					=> 'Ver Licencias',
-    'delete_disabled'           => 'Esta licencia no se puede eliminar aún porque algunos asientos todavía están asignados.',
+    'view'  					=> 'Ver licencia',
+    'delete_disabled'           => 'Esta licencia no se puede eliminar porque todavía está asignada.',
     'bulk'                      =>
         [
             'checkin_all'           => [
-                'button'            => 'Desasignar todos los asientos',
-                'modal'             => 'Esto activará la desasignación de un asiento. | Esta acción desasignará todos los asientos :checkedout_seats_count para esta licencia.',
-                'enabled_tooltip'   => 'Desasignar TODOS los asientos para esta licencia tanto de usuarios como de activos',
-                'disabled_tooltip'  => 'Esto está deshabilitado porque no hay asientos asignados actualmente',
+                'button'            => 'Ingresar todas las licencias',
+                'modal'             => 'Esta acción ingresará una licencia. | Esta acción ingresará todas las :checkedout_seats_count licencias.',
+                'enabled_tooltip'   => 'Recibir TODAS las licencias tanto de usuarios como de activos',
+                'disabled_tooltip'  => 'Esto está deshabilitado porque no hay licencias asignadas actualmente',
                 'disabled_tooltip_reassignable'  => 'Esto está desactivado porque la licencia no es reasignable',
-                'success'           => '¡Licencia asignada con éxito! | ¡Todas las licencias fueron asignadas con éxito!',
-                'log_msg'           => 'Asignación a través de asignación masiva en la interfaz de licencia',
+                'success'           => '¡Licencia recibida correctamente! | ¡Todas las licencias fueron recibidas correctamente!',
+                'log_msg'           => 'Ingresada mediante ingreso masivo en página de licencias',
             ],
 
             'checkout_all'              => [
-                'button'                => 'Asignar todos los asientos',
-                'modal'                 => 'Esta acción asignará un asiento para el primer usuario disponible. | Esta acción asignará todos los asientos :available_seats_count para los primeros usuarios disponibles. Se considera que un usuario está disponible para este asiento si aún no tiene esta licencia asignada a ellos, y la propiedad Auto-Asignación de Licencia está habilitada en su cuenta de usuario.',
-                'enabled_tooltip'   => 'Asignar TODOS los asientos (o tantos como estén disponibles) para TODOS los usuarios',
-                'disabled_tooltip'  => 'Esto está deshabilitado porque no hay asientos disponibles actualmente',
-                'success'           => '¡Licencia asignada con éxito! | ¡:count Licencias fueron asignadas con éxito!',
-                'error_no_seats'    => 'No quedan asientos restantes para esta licencia.',
-                'warn_not_enough_seats'    => ':count usuarios fueron asignados a esta licencia, pero nos quedamos sin asientos de licencia disponibles.',
+                'button'                => 'Asignar todas las licencias',
+                'modal'                 => 'Esta acción asignará una licencia para el primer usuario disponible. | Esta acción asignará todas las :available_seats_count licencias a los primeros usuarios disponibles. Se considera que un usuario está disponible si aún no tiene esta licencia asignada y la propiedad "Autoasignación de licencia" está habilitada en su cuenta de usuario.',
+                'enabled_tooltip'   => 'Asignar TODAS las licencias (o tantas como estén disponibles) para TODOS los usuarios',
+                'disabled_tooltip'  => 'Esto está deshabilitado porque actualmente no hay licencias disponibles',
+                'success'           => '¡Licencia asignada exitosamente! | ¡Licencias :count asignadas exitosamente!',
+                'error_no_seats'    => 'No quedan licencias disponibles.',
+                'warn_not_enough_seats'    => 'Se asignaron :count usuarios a esta licencia, y se agotaron las licencias disponibles.',
                 'warn_no_avail_users'    => 'Nada que hacer. No hay usuarios que no tengan esta licencia asignada.',
-                'log_msg'           => 'Asignación mediante asignación masiva de licencias en la interfaz de licencias',
+                'log_msg'           => 'Asignada vía asignación masiva en página de licencias',
 
 
             ],
     ],
 
-    'below_threshold' => 'Solo quedan :remaining_count asientos para esta licencia con una cantidad mínima de :min_amt. Puede considerar comprar más asientos.',
+    'below_threshold' => 'Solo quedan :remaining_count licencias y su cantidad mínima es de :min_amt. Puede que desee considerar la compra de más licencias.',
     'below_threshold_short' => 'Este artículo está por debajo de la cantidad mínima requerida.',
 );
diff --git a/resources/lang/es-MX/admin/licenses/message.php b/resources/lang/es-MX/admin/licenses/message.php
index f8a5f2f385..b9effc3d70 100644
--- a/resources/lang/es-MX/admin/licenses/message.php
+++ b/resources/lang/es-MX/admin/licenses/message.php
@@ -4,16 +4,16 @@ return array(
 
     'does_not_exist' => 'La licencia no existe o usted no tiene permiso para verla.',
     'user_does_not_exist' => 'El usuario no existe o no tiene permiso para verlos.',
-    'asset_does_not_exist' 	=> 'El equipo que intentas asignar a esta licencia no existe.',
+    'asset_does_not_exist' 	=> 'El activo que intenta asociar con esta licencia no existe.',
     'owner_doesnt_match_asset' => 'El activo que está intentando asignar con esta licencia está asignado a un usuario diferente al de la persona seleccionada de la lista.',
-    'assoc_users'	 => 'Esta categoría está asignada al menos a un modelo y no puede ser eliminada.',
+    'assoc_users'	 => 'Esta licencia está actualmente asignada a un usuario y no puede ser eliminada. Por favor, reciba primero la licencia y vuelva a intentarlo. ',
     'select_asset_or_person' => 'Debe seleccionar un activo o un usuario, pero no ambos.',
     'not_found' => 'Licencia no encontrada',
-    'seats_available' => ':seat_count plazas disponibles',
+    'seats_available' => ':seat_count disponibles',
 
 
     'create' => array(
-        'error'   => 'La categoría no se ha creado, intentalo de nuevo.',
+        'error'   => 'La licencia no fue creada, por favor inténtelo de nuevo.',
         'success' => 'Categoría creada correctamente.'
     ),
 
@@ -23,32 +23,35 @@ return array(
     ),
 
     'upload' => array(
-        'error'   => 'Archivo(s) no cargado. Por favor, vuelva a intentarlo.',
+        'error'   => 'Archivo(s) no cargado(s). Por favor, inténtelo de nuevo.',
         'success' => 'Archivo(s) cargado correctamente.',
         'nofiles' => 'No seleccionó ningún archivo para ser cargado, o el archivo que seleccionó es demasiado grande',
-        'invalidfiles' => 'Uno o más de tus ficheros son demasiado grandes o de un tipo no permitido. Los tipos permitidos son png, gif, jpg, doc, docx, pdf, txt, zip, rar, rtf, xml y lic.',
+        'invalidfiles' => 'Uno o más de sus archivos es demasiado grande o es un tipo de archivo que no está permitido. Los tipos de archivo permitidos son png, gif, jpg, jpeg, doc, docx, pdf, txt, zip, rar, rtf, xml y lic.',
     ),
 
     'update' => array(
-        'error'   => 'La categoría no se ha actualizado, intentalo de nuevo.',
+        'error'   => 'La licencia no fue actualizada, por favor inténtelo de nuevo',
         'success' => 'Categoría actualizada correctamente.'
     ),
 
     'delete' => array(
         'confirm'   => '¿Está seguro de que desea eliminar esta licencia?',
-        'error'   => 'Ha habido un problema eliminando la categoría. Intentalo de nuevo.',
-        'success' => 'Categoría eliminada.'
+        'error'   => 'Hubo un problema al eliminar la licencia. Por favor, inténtelo de nuevo.',
+        'success' => 'La licencia se ha eliminado correctamente.'
     ),
 
     'checkout' => array(
-        'error'   => 'Equipo no asignado, intentalo de nuevo',
-        'success' => 'Equipo asignado.',
-        'not_enough_seats' => 'No hay suficientes asientos de licencia disponibles para la compra',
+        'error'   => 'Hubo un problema asignando la licencia. Por favor, inténtelo de nuevo.',
+        'success' => 'La licencia fue asignada con éxito',
+        'not_enough_seats' => 'No hay suficientes licencias disponibles para asignar',
+        'mismatch' => 'La licencia proporcionada no coincide con la licencia seleccionada',
+        'unavailable' => 'Esta licencia no está disponible para ser asignada.',
     ),
 
     'checkin' => array(
-        'error'   => 'Hubo un problema devolviendo la licencia. Por favor, inténtalo de nuevo.',
-        'success' => 'Equipo quitado correctamente.'
+        'error'   => 'Hubo un problema ingresando la licencia. Por favor, inténtelo de nuevo.',
+        'not_reassignable' => 'La licencia no se puede volver a asignar',
+        'success' => 'La licencia fue ingresada correctamente'
     ),
 
 );
diff --git a/resources/lang/es-MX/admin/licenses/table.php b/resources/lang/es-MX/admin/licenses/table.php
index 2d5286e577..c80976bec6 100644
--- a/resources/lang/es-MX/admin/licenses/table.php
+++ b/resources/lang/es-MX/admin/licenses/table.php
@@ -2,17 +2,17 @@
 
 return array(
 
-    'assigned_to'   	=> 'Asignada a',
-    'checkout'   		=> 'Quita/Asigna',
+    'assigned_to'   	=> 'Asignado a',
+    'checkout'   		=> 'Entrada/Salida',
     'deleted_at'        => 'Eliminado el',
     'id'      			=> 'ID',
-    'license_email'   	=> 'Email de licencia',
+    'license_email'   	=> 'Correo electrónico de la licencia',
     'license_name'   	=> 'Licenciado a',
     'purchase_date'   	=> 'Fecha de compra',
     'purchased'   		=> 'Comprada',
-    'seats'   			=> 'Instalaciones',
-    'hardware'   		=> 'Equipo',
-    'serial'   			=> 'N. Serie',
-    'title'      		=> 'Categoría de equipo',
+    'seats'   			=> 'Total de licencias',
+    'hardware'   		=> 'Hardware',
+    'serial'   			=> 'Número de serie',
+    'title'      		=> 'Licencia',
 
 );
diff --git a/resources/lang/es-MX/admin/locations/message.php b/resources/lang/es-MX/admin/locations/message.php
index b2a44e39a5..34e02a05a5 100644
--- a/resources/lang/es-MX/admin/locations/message.php
+++ b/resources/lang/es-MX/admin/locations/message.php
@@ -3,15 +3,16 @@
 return array(
 
     'does_not_exist' => 'La ubicación no existe.',
-    'assoc_users'    => 'This location is not currently deletable because it is the location of record for at least one asset or user, has assets assigned to it, or is the parent location of another location. Please update your models to no longer reference this company and try again. ',
+    'assoc_users'    => 'Esta ubicación no se puede eliminar actualmente porque es la ubicación de al menos un activo o usuario, tiene activos asignados o es la ubicación padre de otra ubicación. Por favor, actualice sus registros para que ya no hagan referencia a esta ubicación e inténtalo de nuevo ',
     'assoc_assets'	 => 'Esta ubicación está actualmente asociada con al menos un activo y no puede ser eliminada. Por favor actualice sus activos para que ya no hagan referencia a esta ubicación e inténtelo de nuevo. ',
     'assoc_child_loc'	 => 'Esta ubicación es actualmente el padre de al menos una ubicación hija y no puede ser eliminada.   Por favor actualice sus ubicaciones para que ya no hagan referencia a esta ubicación e inténtelo de nuevo. ',
-    'assigned_assets' => 'Recursos asignados',
+    'assigned_assets' => 'Activos asignados',
     'current_location' => 'Ubicación actual',
+    'open_map' => 'Abrir en mapas :map_provider_icon',
 
 
     'create' => array(
-        'error'   => 'Localización no creada, Intentalo de nuevo.',
+        'error'   => 'La ubicación no pudo ser creada, por favor, inténtelo de nuevo.',
         'success' => 'La ubicación fue creada exitosamente.'
     ),
 
@@ -20,6 +21,11 @@ return array(
         'success' => 'La ubicación fue actualizada exitosamente.'
     ),
 
+    'restore' => array(
+        'error'   => 'No se ha restaurado la ubicación, inténtelo de nuevo',
+        'success' => 'La ubicación fue restaurada exitosamente.'
+    ),
+
     'delete' => array(
         'confirm'   	=> '¿Está seguro de que desea eliminar esta ubicación?',
         'error'   => 'Hubo un problema eliminando la ubicación. Por favor, inténtelo de nuevo.',
diff --git a/resources/lang/es-MX/admin/locations/table.php b/resources/lang/es-MX/admin/locations/table.php
index a523cc9eb4..4fef627838 100644
--- a/resources/lang/es-MX/admin/locations/table.php
+++ b/resources/lang/es-MX/admin/locations/table.php
@@ -2,14 +2,14 @@
 
 return [
     'about_locations_title'     => 'Acerca de las ubicaciones',
-    'about_locations'           => 'Las ubicaciones son utilizadas para hacer seguimiento de la información sobre ubicación de usuarios, activos, y otros ítems',
+    'about_locations'           => 'Las ubicaciones se utilizan para hacer un seguimiento de la ubicación de usuarios, activos y otros elementos',
     'assets_rtd'                => 'Activos', // This has NEVER meant Assets Retired. I don't know how it keeps getting reverted.
     'assets_checkedout'         => 'Activos asignados',
     'id'                        => 'ID',
     'city'                      => 'Ciudad',
     'state'                     => 'Provincia',
     'country'                   => 'País',
-    'create'                    => 'Crear Ubicación',
+    'create'                    => 'Crear ubicación',
     'update'                    => 'Actualizar ubicación',
     'print_assigned'            => 'Imprimir los asignados',
     'print_all_assigned'        => 'Imprimir todos los asignados',
@@ -17,15 +17,15 @@ return [
     'address'                   => 'Dirección',
     'address2'                   => '2da linea de Dirección',
     'zip'                       => 'Código postal',
-    'locations'                 => 'Localizaciones',
+    'locations'                 => 'Ubicaciones',
     'parent'                    => 'Ubicación padre',
     'currency'                  => 'Divisa de la ubicación',
     'ldap_ou'                   => 'Búsqueda LDAP OU',
     'user_name'                 => 'Nombre de usuario',
     'department'                => 'Departamento',
     'location'                  => 'Ubicación',
-    'asset_tag'                 => 'Etiqueta de Activo',
-    'asset_name'                => 'Nombre de Activo',
+    'asset_tag'                 => 'Placa del activo',
+    'asset_name'                => 'Nombre',
     'asset_category'            => 'Categoría',
     'asset_manufacturer'        => 'Fabricante',
     'asset_model'               => 'Modelo',
@@ -37,6 +37,7 @@ return [
     'phone'                     => 'Teléfono ubicación',
     'signed_by_asset_auditor'   => 'Firmado por (Auditor de Activos):',
     'signed_by_finance_auditor' => 'Firmado por (Auditor de Finanzas):',
-    'signed_by_location_manager' => 'Firmado por (Administrador de área):',
+    'signed_by_location_manager' => 'Firmado por (Supervisor de la ubicación):',
     'signed_by'                 => 'Firmado por:',
+    'clone'  					=> 'Clonar ubicación',
 ];
diff --git a/resources/lang/es-MX/admin/manufacturers/message.php b/resources/lang/es-MX/admin/manufacturers/message.php
index 5632d048ea..4e25322f0c 100644
--- a/resources/lang/es-MX/admin/manufacturers/message.php
+++ b/resources/lang/es-MX/admin/manufacturers/message.php
@@ -2,29 +2,29 @@
 
 return array(
 
-    'support_url_help' => 'Variables <code>{LOCALE}</code>, <code>{SERIAL}</code>, <code>{MODEL_NUMBER}</code>, y <code>{MODEL_NAME}</code> se puede utilizar en tu URL para que esos valores se llenen automáticamente al ver los activos - por ejemplo https://checkcoverage. pple.com/{LOCALE}/{SERIAL}.',
-    'does_not_exist' => 'Fabricante inexistente.',
-    'assoc_users'	 => 'Este Fabricante está asociado al menos a un modelo y no puede ser eliminado',
+    'support_url_help' => 'Variables <code>{LOCALE}</code>, <code>{SERIAL}</code>, <code>{MODEL_NUMBER}</code>, y <code>{MODEL_NAME}</code> se pueden utilizar en su URL para que esos valores se llenen automáticamente al ver los activos - por ejemplo https://checkcoverage. pple.com/{LOCALE}/{SERIAL}.',
+    'does_not_exist' => 'El fabricante no existe.',
+    'assoc_users'	 => 'Este fabricante está actualmente asociado con al menos un modelo y no se puede eliminar. Por favor, actualice sus modelos para dejar de hacer referencia a este fabricante y vuelva a intentarlo. ',
 
     'create' => array(
-        'error'   => 'Fabricante no creado, Intentalo de nuevo.',
-        'success' => 'Fabricante creado.'
+        'error'   => 'El fabricante no fue creado, por favor inténtelo de nuevo.',
+        'success' => 'Fabricante creado exitosamente.'
     ),
 
     'update' => array(
-        'error'   => 'Fabricante no actualizado, Intentalo de nuevo',
-        'success' => 'Fabricante actualizado.'
+        'error'   => 'El fabricante no fue actualizado, por favor, inténtelo de nuevo',
+        'success' => 'El fabricante se ha actualizado exitosamente.'
     ),
 
     'restore' => array(
-        'error'   => 'El fabricante no fue restaurado, intente de nuevo',
-        'success' => 'Fabricante restaurado con éxito.'
+        'error'   => 'El fabricante no fue restaurado, por favor, inténtelo de nuevo',
+        'success' => 'El fabricante fue restaurado exitosamente.'
     ),
 
     'delete' => array(
         'confirm'   => '¿Está seguro de que desea eliminar este fabricante?',
-        'error'   => 'Hubo un problema eliminando el fabricante. Por favor, inténtalo de nuevo.',
-        'success' => 'Fabricante Eliminado.'
+        'error'   => 'Ocurrió un problema eliminando el fabricante. Por favor, intente nuevamente.',
+        'success' => 'El fabricante se ha eliminado correctamente.'
     )
 
 );
diff --git a/resources/lang/es-MX/admin/manufacturers/table.php b/resources/lang/es-MX/admin/manufacturers/table.php
index f06114aa48..e2c4bef88e 100644
--- a/resources/lang/es-MX/admin/manufacturers/table.php
+++ b/resources/lang/es-MX/admin/manufacturers/table.php
@@ -1,16 +1,16 @@
 <?php
 
 return array(
-    'about_manufacturers_title'    => 'Sobre fabricantes',
+    'about_manufacturers_title'    => 'Sobre los fabricantes',
     'about_manufacturers_text'  => 'Los fabricantes son las empresas que crean sus activos. Aquí puede almacenar importante información de contacto para soporte, la cual se mostrará en las páginas de detalle de sus activos.',
     'asset_manufacturers'	=> 'Fabricantes de activos',
-    'create'				=> 'Crear Fabricante',
+    'create'				=> 'Crear fabricante',
     'id'   					=> 'ID',
     'name'      			=> 'Nombre',
-    'support_email'   		=> 'Email de soporte',
+    'support_email'   		=> 'Correo electrónico de soporte',
     'support_phone'   		=> 'Teléfono de soporte',
     'support_url'   		=> 'URL de soporte',
     'warranty_lookup_url'   => 'URL de búsqueda de garantía',
-    'update'				=> 'Actualizar Fabricante',
+    'update'				=> 'Actualizar fabricante',
 
 );
diff --git a/resources/lang/es-MX/admin/models/general.php b/resources/lang/es-MX/admin/models/general.php
index 42cb55283f..bfacb43c27 100644
--- a/resources/lang/es-MX/admin/models/general.php
+++ b/resources/lang/es-MX/admin/models/general.php
@@ -1,18 +1,18 @@
 <?php
 
 return array(
-    'about_models_title'     => 'Acerca de modelos de activos',
-    'about_models_text'           => 'Los Modelos de activos son una forma de agrupar activos idénticos. "MBP 2013", "IPhone 6s", etc.',
-    'deleted'  					        => 'Este modelo ha sido eliminado.',
-    'bulk_delete'               => 'Borrar Grandes Modelos de Activos',
-    'bulk_delete_help'               => 'Usa las casillas de verificación para confirmar la eliminación de los modelos de activos. Los modelos de activos tienen activos asociados que no pueden ser eliminados hasta que los activos sean asociados con un modelo diferente.',
+    'about_models_title'     => 'Acerca de los modelos de activos',
+    'about_models_text'           => 'Los modelos de activos son una forma de agrupar activos idénticos. "MBP 2013", "IPhone 6s", etc.',
+    'deleted'  					=> 'Este modelo ha sido eliminado.',
+    'bulk_delete'               => 'Eliminación masiva de modelos de activos',
+    'bulk_delete_help'               => 'Utilice las casillas a continuación para confirmar la eliminación de los modelos de activos seleccionados. Los modelos de activos que tienen activos asociados a ellos no se pueden eliminar hasta que los activos estén asociados con un modelo diferente.',
     'bulk_delete_warn'          => 'Está a punto de eliminar un modelo de activo.|Está a punto de eliminar :model_count modelos de activos.',
-    'restore'                   => 'Restaurar Modelo',
+    'restore'                   => 'Restaurar modelo',
     'requestable'               => 'Los usuarios pueden solicitar este modelo',
-	'show_mac_address'			      => 'Mostrar el campo de la dirección MAC en los equipos de este modelo',
-    'view_deleted'              => 'Ver Borrados',
+	'show_mac_address'			      => 'Mostrar el campo de dirección MAC en los activos de este modelo',
+    'view_deleted'              => 'Ver borrados',
     'view_models'               => 'Ver modelos',
-    'fieldset'                  => 'Grupos de campo',
+    'fieldset'                  => 'Grupo de campos',
     'no_custom_field'           => 'No hay campos personalizados',
-    'add_default_values'        => 'Add default values',
+    'add_default_values'        => 'Agregar valores predeterminados',
 );
diff --git a/resources/lang/es-MX/admin/models/message.php b/resources/lang/es-MX/admin/models/message.php
index dd211fafb6..731d4c861f 100644
--- a/resources/lang/es-MX/admin/models/message.php
+++ b/resources/lang/es-MX/admin/models/message.php
@@ -2,37 +2,37 @@
 
 return array(
 
-    'deleted' => 'Modelo de recurso eliminado',
+    'deleted' => 'Se eliminó el modelo del activo',
     'does_not_exist' => 'Modelo inexistente.',
-    'no_association' => '¡ADVERTENCIA! ¡El modelo de activo para este artículo no es válido o no se encuentra!',
-    'no_association_fix' => 'Esto causará problemas raros y horribles. Edita este activo para asignarlo a un modelo.',
-    'assoc_users'	 => 'Este modelo está asignado a uno o más equipos y no puede ser eliminado',
-
+    'no_association' => '¡ADVERTENCIA! ¡El modelo de activo para este artículo no es válido o no existe!',
+    'no_association_fix' => 'Esto causará problemas raros y horribles. Edite este activo ahora para asignarle un modelo.',
+    'assoc_users'	 => 'Este modelo está asociado a uno o más activos y no puede ser eliminado. Por favor, elimine los activos y vuelva a intentarlo. ',
+    'invalid_category_type' => 'El tipo de esta categoría debe ser categoría de activos.',
 
     'create' => array(
-        'error'   => 'Modelo no creado, Intentalo de nuevo.',
-        'success' => 'Modelo creado.',
-        'duplicate_set' => 'Ya existe un modelo de equipo con el mismo nombre, fabricante y número de modelo.',
+        'error'   => 'El modelo no fue creado, por favor inténtelo de nuevo.',
+        'success' => 'El modelo fue creado exitosamente.',
+        'duplicate_set' => 'Ya existe un modelo de activo con el mismo nombre, fabricante y número de modelo.',
     ),
 
     'update' => array(
-        'error'   => 'Modelo no actualizado, Intentalo de nuevo',
-        'success' => 'Modelo actualizado.',
+        'error'   => 'El modelo no pudo ser actualizado, por favor inténtelo de nuevo',
+        'success' => 'El modelo fue actualizado exitosamente.',
     ),
 
     'delete' => array(
         'confirm'   => '¿Está seguro de que desea eliminar este modelo de activo?',
         'error'   => 'Hubo un problema eliminando el modelo. Por favor, inténtelo de nuevo.',
-        'success' => 'Modelo eliminado.'
+        'success' => 'El modelo fue eliminado exitosamente.'
     ),
 
     'restore' => array(
         'error'   		=> 'El modelo no fue restaurado, por favor intente nuevamente',
-        'success' 		=> 'Modelo restaurado exitosamente.'
+        'success' 		=> 'El modelo fue restaurado exitosamente.'
     ),
 
     'bulkedit' => array(
-        'error'   		=> 'Ningún campo fue seleccionado, por lo que nada ha sido actualizado.',
+        'error'   		=> 'Ningún cambio fue cambiado, así que nada se actualizó.',
         'success' 		=> 'Modelo actualizado correctamente. |:model_count modelos actualizados correctamente.',
         'warn'          => 'Está a punto de actualizar las propiedades del siguiente modelo:|Está a punto de editar las propiedades de los siguientes :model_count modelos:',
 
@@ -41,7 +41,7 @@ return array(
     'bulkdelete' => array(
         'error'   		    => 'Ningún modelo fue seleccionado, así que nada fue eliminado.',
         'success' 		    => 'Modelo eliminado!|:success_count modelos eliminados!',
-        'success_partial' 	=> ':success_count modelo(s) se han eliminado, sin embargo, :fail_count no se pudieron eliminar debido a que aún tienen activos asociados a ellos.'
+        'success_partial' 	=> ':success_count modelo(s) fueron eliminados, sin embargo, :fail_count no pudieron ser eliminados debido a que aún tienen activos asociados a ellos.'
     ),
 
 );
diff --git a/resources/lang/es-MX/admin/models/table.php b/resources/lang/es-MX/admin/models/table.php
index e3ef797e2f..312944b9cd 100644
--- a/resources/lang/es-MX/admin/models/table.php
+++ b/resources/lang/es-MX/admin/models/table.php
@@ -2,16 +2,16 @@
 
 return array(
 
-    'create'				=> 'Crear Modelo Equipo',
+    'create'				=> 'Crear modelo de activo',
     'created_at' 			=> 'Creado el',
-    'eol'	 				=> 'EOL',
+    'eol'	 				=> 'Fin de soporte (EOL)',
     'modelnumber'   		=> 'Modelo No.',
     'name'      			=> 'Nombre del modelo de activo',
-    'numassets' 			=> 'Equipos',
-    'title'					=> 'Modelos Equipos',
+    'numassets' 			=> 'Activos',
+    'title'					=> 'Modelos de activos',
     'update'				=> 'Actualizar modelo de activo',
-    'view'					=> 'Ver Modelo',
+    'view'					=> 'Ver modelo de activo',
     'update'				=> 'Actualizar modelo de activo',
-    'clone'				=> 'Clonar Modelo',
-    'edit'				=> 'Editar Modelo',
+    'clone'				=> 'Clonar modelo',
+    'edit'				=> 'Editar modelo',
 );
diff --git a/resources/lang/es-MX/admin/reports/general.php b/resources/lang/es-MX/admin/reports/general.php
index 90e07caee4..02dd77aada 100644
--- a/resources/lang/es-MX/admin/reports/general.php
+++ b/resources/lang/es-MX/admin/reports/general.php
@@ -1,17 +1,23 @@
 <?php
 
 return [
-    'info'   => 'Selecciona las opciones de tu informe de Equipos.',
+    'info'   => 'Seleccione las opciones que desee para su informe de activos.',
     'deleted_user' => 'Usuario eliminado',
     'send_reminder' => 'Enviar recordatorio',
+    'cannot_send_reminder' => 'El usuario ha sido eliminado o no tiene una dirección de correo electrónico, por lo que no puede recibir un recordatorio',
     'reminder_sent' => 'Recordatorio enviado',
     'acceptance_deleted' => 'Solicitud de aceptación eliminada',
     'acceptance_request' => 'Solicitud de aceptación',
     'custom_export' => [
         'user_address' => 'Dirección de usuario',
-        'user_city' => 'Ciudad del Usuario',
+        'user_city' => 'Ciudad del usuario',
         'user_state' => 'Estado del usuario',
-        'user_country' => 'País de usuario',
-        'user_zip' => 'Usuario Zip'
-    ]
-];
\ No newline at end of file
+        'user_country' => 'País del usuario',
+        'user_zip' => 'Código postal del usuario'
+    ],
+    'open_saved_template' => 'Abrir plantilla guardada',
+    'save_template' =>  'Guardar plantilla',
+    'select_a_template' => 'Seleccione una plantilla',
+    'template_name' => 'Nombre de la plantilla',
+    'update_template' => 'Actualizar plantilla',
+];
diff --git a/resources/lang/es-MX/admin/reports/message.php b/resources/lang/es-MX/admin/reports/message.php
index a8f61aa993..a1c4522eba 100644
--- a/resources/lang/es-MX/admin/reports/message.php
+++ b/resources/lang/es-MX/admin/reports/message.php
@@ -1,5 +1,16 @@
 <?php
 
-return array(
-    'error'   => 'Debes seleccionar al menos UNA opción.'
-);
+return [
+    'about_templates' => 'Acerca de las plantillas guardadas',
+    'saving_templates_description' => 'Seleccione sus opciones, luego ingrese el nombre de su plantilla en el campo de arriba y haga clic en el botón \'Guardar plantilla\'. Use la lista desplegable para seleccionar una plantilla guardada previamente.',
+    'create'  => [
+        'success' => 'Plantilla guardada exitosamente',
+    ],
+    'update' => [
+        'success' => 'Plantilla actualizada exitosamente',
+    ],
+    'delete' => [
+        'success' => 'Plantilla eliminada',
+        'no_delete_permission' => 'La plantilla no existe o no tiene permisos para eliminarla.',
+    ],
+];
diff --git a/resources/lang/es-MX/admin/settings/general.php b/resources/lang/es-MX/admin/settings/general.php
index 8da741e52a..41bbdec105 100644
--- a/resources/lang/es-MX/admin/settings/general.php
+++ b/resources/lang/es-MX/admin/settings/general.php
@@ -3,159 +3,168 @@
 return [
     'ad'				        => 'Directorio Activo',
     'ad_domain'				    => 'Dominio del Directorio Activo',
-    'ad_domain_help'			=> 'Esto es a veces el mismo que su correo electrónico de dominio, pero no siempre.',
+    'ad_domain_help'			=> 'Algunas veces coincide con el dominio de su correo electrónico, pero no siempre.',
     'ad_append_domain_label'    => 'Añadir nombre de dominio',
     'ad_append_domain'          => 'Asignar nombre de dominio al campo del nombre de usuario',
-    'ad_append_domain_help'     => 'El usuario no necesita escribir "username@domain.local", puede escribir únicamente "username".',
+    'ad_append_domain_help'     => 'El usuario no necesita escribir "usuario@dominio.local", puede escribir únicamente "usuario".',
     'admin_cc_email'            => 'Copiar en correo electrónico',
-    'admin_cc_email_help'       => 'Si desea enviar una copia de los correos electrónicos de devolución/asignación que se envían a los usuarios a una cuenta de correo electrónico adicional, escríbala aquí. De lo contrario, deje este campo en blanco.',
+    'admin_cc_email_help'       => 'Enviar una copia de los correos electrónicos de checkin/checkout a esta dirección.',
     'admin_settings'            => 'Configuración de administración',
     'is_ad'				        => 'Este es un servidor de Directorio Activo',
     'alerts'                	=> 'Alertas',
     'alert_title'               => 'Actualizar ajustes de notificación',
     'alert_email'				=> 'Enviar alertas a',
-    'alert_email_help'    => 'Direcciones de correo electrónico o listas de distribución a las que desea que se envíen alertas separadas por comas',
-    'alerts_enabled'			=> 'Alertas habilitadas',
-    'alert_interval'			=> 'Limite de alertas de expiración (en días)',
-    'alert_inv_threshold'		=> 'Umbral de alerta del inventario',
-    'allow_user_skin'           => 'Permitir Tema del usuario',
-    'allow_user_skin_help_text' => 'Al marcar esta casilla se permitirá al usuario sustituir el tema de la interfase con uno diferente.',
-    'asset_ids'					=> 'IDs de Recurso',
+    'alert_email_help'          => 'Direcciones de correo electrónico o listas de distribución a las que desea que se envíen alertas separadas por comas.',
+    'alerts_enabled'			=> 'Alertas de correo electrónico habilitadas',
+    'alert_interval'			=> 'Umbral para las alertas de caducidad (en días)',
+    'alert_inv_threshold'		=> 'Umbral para alerta de inventario',
+    'allow_user_skin'           => 'Permitir al usuario cambiar la apariencia',
+    'allow_user_skin_help_text' => 'Si se marca esta casilla, el usuario podrá reemplazar la apariencia de la interfaz con una diferente.',
+    'asset_ids'					=> 'Códigos de los activos',
     'audit_interval'            => 'Intervalo de auditoría',
     'audit_interval_help'       => 'Si está obligado a auditar físicamente sus activos con regularidad, introduzca el intervalo en meses que utilice. Si actualiza este valor, se actualizarán todas las "próximas fechas de auditoría" de los activos con una fecha de auditoría próxima.',
-    'audit_warning_days'        => 'Umbral de advertencia de auditoría',
+    'audit_warning_days'        => 'Umbral para aviso de auditoría',
     'audit_warning_days_help'   => '¿Con cuántos días de antelación es necesario avisar que se deben auditar los activos?',
-    'auto_increment_assets'		=> 'Generar etiquetas de activos que incrementan automáticamente',
+    'auto_increment_assets'		=> 'Generar incremento automático en las placas de activos',
     'auto_increment_prefix'		=> 'Prefijo (opcional)',
-    'auto_incrementing_help'    => 'Primero habilite etiquetas de activos auto-incrementantes para configurar esto',
+    'auto_incrementing_help'    => 'Habilite primero el incremento automático de las placas de activos antes de configurar esto',
     'backups'					=> 'Copias de seguridad',
     'backups_help'              => 'Crear, descargar y restaurar copias de seguridad ',
     'backups_restoring'         => 'Restaurando desde la copia de seguridad',
+    'backups_clean' => 'Depure la base de datos de la copia de seguridad antes de restaurarla',
+    'backups_clean_helptext' => "Esto puede ser útil si está cambiando entre versiones de bases de datos",
     'backups_upload'            => 'Cargar copia de seguridad',
     'backups_path'              => 'Las copias de seguridad en el servidor se almacenan en <code>:path</code>',
-    'backups_restore_warning'   => 'Utilice el botón de restauración <small><span class="btn btn-xs btn-warning"><i class="text-white fas fa-retweet" aria-hidden="true"></i></span></small> para restaurar desde una copia de seguridad anterior. (Actualmente esto no funciona con almacenamiento de archivos S3 o Docker.)<br><br>Su <strong>base de datos completa :app_name y cualquier archivo subido será completamente reemplazado</strong> por lo que hay en el archivo de copia de seguridad.  ',
+    'backups_restore_warning'   => 'Utilice el botón de restauración <small><span class="btn btn-xs btn-warning"><i class="text-white fas fa-retweet" aria-hidden="true"></i></span></small> para restaurar desde una copia de seguridad anterior. (Actualmente esto no funciona con almacenamiento de archivos S3 o Docker).<br><br>Su <strong>base de datos completa de :app_name y cualquier archivo cargado será completamente reemplazado</strong> por lo que hay en la copia de seguridad.  ',
     'backups_logged_out'         => 'A todos los usuarios existentes, incluido usted, se le cerrará la sesión una vez que la restauración haya finalizado.',
     'backups_large'             => 'Las copias de seguridad muy grandes pueden agotar el tiempo de espera en el intento de restauración y todavía pueden necesitar ser ejecutadas a través de la línea de comandos. ',
-    'barcode_settings'			=> 'Configuración de Código de Barras',
+    'barcode_settings'			=> 'Configuración del código de barras',
     'confirm_purge'			    => 'Confirmar la purga',
-    'confirm_purge_help'		=> 'Introduzca el texto "DELETE" en el cuadro de abajo para purgar sus registros borrados. Esta acción no se puede deshacer y borrará PERMANENTAMENTE todos los elementos y usuarios eliminados. (Se recomienda hacer una copia de seguridad previamente, para estar seguro.)',
+    'confirm_purge_help'		=> 'Introduzca el texto "DELETE" en la casilla de abajo para purgar sus registros borrados. Esta acción no se puede deshacer y borrará PERMANENTAMENTE todos los elementos y usuarios eliminados. Debería hacer primero una copia de seguridad, para estar seguro.',
     'custom_css'				=> 'CSS Personalizado',
-    'custom_css_help'			=> 'Ingrese cualquier CSS personalizado que desee utilizar. No incluya tags como: &lt;style&gt;&lt;/style&gt.',
-    'custom_forgot_pass_url'	=> 'Reestablecer URL de Contraseña Personalizada',
-    'custom_forgot_pass_url_help'	=> 'Esto remplaza la URL incorporada para las contraseñas olvidadas en la pantalla de inicio, útil para dirigir a las personas a una funcionalidad de restablecimiento de contraseña LDAP interna o alojada. Esto efectivamente desactivará la funcionalidad local de olvido de contraseña.',
+    'custom_css_placeholder'	=> 'Añade tu CSS personalizado',
+    'custom_css_help'			=> 'Introduzca cualquier CSS personalizado que desee utilizar. No incluya las etiquetas &lt;style&gt;&lt;/style&gt;.',
+    'custom_forgot_pass_url'	=> 'URL de restablecimiento de contraseña personalizada',
+    'custom_forgot_pass_url_help'	=> 'Esto reemplaza la URL de contraseña olvidada incorporada en la pantalla de inicio de sesión, es útil para dirigir a las personas a la funcionalidad de restablecimiento de contraseña LDAP interna o alojada. Deshabilitará efectivamente la funcionalidad de olvido de contraseña del usuario local.',
     'dashboard_message'			=> 'Mensaje en el tablero',
     'dashboard_message_help'	=> 'Este texto aparecerá en el panel para cualquiera que tenga permiso de ver el Panel.',
-    'default_currency'  		=> 'Moneda Predeterminada',
+    'default_currency'  		=> 'Divisa predeterminada',
     'default_eula_text'			=> 'Acuerdo de uso predeterminado',
+    'default_eula_text_placeholder' => 'Añade tu texto de EULA por defecto',
     'default_language'			=> 'Idioma predeterminado',
     'default_eula_help_text'	=> 'También puede asociar acuerdos de uso personalizados a categorías específicas.',
     'acceptance_note'           => 'Añada una nota para su decisión (opcional)',
     'display_asset_name'        => 'Mostrar nombre del activo',
     'display_checkout_date'     => 'Mostrar fecha de asignación',
-    'display_eol'               => 'Mostrar EOL',
-    'display_qr'                => 'Mostrar Códigos QR',
-    'display_alt_barcode'		=> 'Mostrar códigos de barras en 1D',
-    'email_logo'                => 'Logo de correo electrónico',
-    'barcode_type'				=> 'Tipo de códigos de barras 2D',
-    'alt_barcode_type'			=> 'Tipo de códigos de barras 1D',
-    'email_logo_size'       => 'Los logotipos cuadrados se ven mejor en correo electrónico. ',
+    'display_eol'               => 'Mostrar fin de soporte (EOL) en la vista de tabla',
+    'display_qr'                => 'Mostrar código de barras en 2D',
+    'display_alt_barcode'		=> 'Mostrar códigos de barras de 1D',
+    'barcode_type'				=> 'Tipo de código de barras de 2D',
+    'alt_barcode_type'			=> 'Tipo de código de barras de 1D',
     'enabled'                   => 'Habilitado',
     'eula_settings'				=> 'Configuración de los acuerdos de uso',
     'eula_markdown'				=> 'Estos acuerdos de uso permiten <a href="https://help.github.com/articles/github-flavored-markdown/">markdown estilo Github</a>.',
+    'empty_row_count'           => 'Desplazamiento de inicio de campo (filas vacías)',
+    'empty_row_count_help'      => 'Los campos comenzarán a rellenar después de que se omitan muchas filas vacías en la parte superior de la etiqueta.',
     'favicon'                   => 'Favicon',
-    'favicon_format'            => 'Los tipos de archivo aceptados son ico, png y gif. Otros formatos de imagen pueden no funcionar en todos los navegadores.',
-    'favicon_size'          => 'Los favicons deben ser imágenes cuadradas, de 16x16 píxeles.',
-    'footer_text'               => 'Texto Adicional de Pie de Página ',
-    'footer_text_help'          => 'Este texto aparecerá en el lado derecho del pie de página. Los enlaces son permitidos usando <a href="https://help.github.com/articles/github-flavored-markdown/">el formato flavored de GitHub</a>. Saltos de línea, cabeceras, imágenes, etc, pueden resultar impredecibles.',
-    'general_settings'			=> 'Configuración General',
-    'general_settings_keywords' => 'soporte de la compañía, firma, aceptación, formato de correo electrónico, formato de nombre de usuario, imágenes, por página, miniatura, acuerdo de uso, términos y condiciones, gravatar, términos de servicio, tablero de indicadores, privacidad',
+    'favicon_format'            => 'Los tipos de archivo aceptados son ico, png y gif. Es posible que otros formatos de imagen no funcionen en todos los navegadores.',
+    'favicon_size'          => 'Los Favicons deben ser imágenes cuadradas, de 16x16 píxeles.',
+    'footer_text'               => 'Texto adicional en el pie de página ',
+    'footer_text_help'          => 'Este texto aparecerá en el lado derecho del pie de página. Los enlaces son permitidos usando <a href="https://help.github.com/articles/github-flavored-markdown/">markdown estilo Github</a>. Los saltos de línea, encabezados, imágenes, etc. pueden dar lugar a resultados impredecibles.',
+    'footer_text_placeholder'   => 'Optional footer text',
+    'general_settings'			=> 'Configuración general',
     'general_settings_help'     => 'Acuerdo de uso predeterminado y más',
-    'generate_backup'			=> 'Generar Respaldo',
-    'google_workspaces'         => 'Espacios de trabajo de Google',
-    'header_color'              => 'Color de encabezado',
-    'info'                      => 'Estos parámetros permirten personalizar ciertos aspectos de la aplicación.',
-    'label_logo'                => 'Logo de etiqueta',
+    'generate_backup'			=> 'Generar copia de seguridad',
+    'google_workspaces'         => 'Google Workspace',
+    'header_color'              => 'Color del encabezado',
+    'info'                      => 'Estos ajustes le permiten personalizar ciertos aspectos de su instalación.',
     'label_logo_size'           => 'Los logos cuadrados se ven mejor - se mostrarán en la parte superior derecha de cada etiqueta de activo. ',
     'laravel'                   => 'Versión de Laravel',
     'ldap'                      => 'LDAP',
-    'ldap_default_group'        => 'Grupo de permisos por defecto',
+    'ldap_default_group'        => 'Grupo de permisos predeterminado',
     'ldap_default_group_info'   => 'Seleccione un grupo para asignar a los usuarios recién sincronizados. Recuerde que un usuario asume los permisos del grupo que le han asignado.',
     'no_default_group'          => 'Ningún grupo por defecto',
     'ldap_help'                 => 'LDAP/Directorio Activo',
     'ldap_client_tls_key'       => 'Llave TLS del cliente LDAP',
-    'ldap_client_tls_cert'      => 'LDAP Certificado TLS de cliente',
+    'ldap_client_tls_cert'      => 'LDAP Certificado TLS del lado del cliente',
     'ldap_enabled'              => 'LDAP activado',
     'ldap_integration'          => 'Integración LDAP',
-    'ldap_settings'             => 'Ajustes LDAP',
-    'ldap_client_tls_cert_help' => 'El certificado TLS de cliente y la clave para las conexiones LDAP normalmente sólo son útiles en las configuraciones de Google Workspace con "Secure LDAP". Ambas son requeridas.',
+    'ldap_settings'             => 'Configuración LDAP',
+    'ldap_client_tls_cert_help' => 'El certificado TLS del lado del cliente y la clave para las conexiones LDAP normalmente solo son útiles en las configuraciones de Google Workspace con "LDAP Seguro". Ambas son requeridas.',
     'ldap_location'             => 'Ubicación LDAP',
-'ldap_location_help'             => 'El campo Ubicación de Ldap debe utilizarse si <strong>una OU no está siendo utilizada en el DN del enlace base.</strong> Deja este espacio en blanco si se utiliza una búsqueda OU.',
-    'ldap_login_test_help'      => 'Introduce un nombre de usuario LDAP válido y una contraseña de la DN base que especificaste anteriormente para probar si tu inicio de sesión LDAP está configurado correctamente. DEBES GUARDAR TUS CONFIGURACIONES LDAP ACTUALIZADAS PRIMERO.',
-    'ldap_login_sync_help'      => 'Esto sólo prueba que LDAP puede sincronizarse correctamente. Si tu solicitud de Autenticación LDAP no es correcta, los usuarios aún no podrían iniciar sesión. DEBES GUARDAR TUS CONFIGURACIONES LDAP ACTUALIZADAS PRIMERO.',
+'ldap_location_help'             => 'El campo Location (ubicación) de Ldap debe utilizarse si <strong>una OU no está siendo utilizada en el Base Bind DN (DN del enlace base).</strong> Deje este espacio en blanco si se utiliza una búsqueda OU.',
+    'ldap_login_test_help'      => 'Introduzca un nombre de usuario y una contraseña LDAP válidos del DN base que especificó anteriormente para comprobar si el inicio de sesión LDAP está configurado correctamente. PRIMERO DEBE GUARDAR LA CONFIGURACIÓN LDAP ACTUALIZADA.',
+    'ldap_login_sync_help'      => 'Esto solo comprueba que el LDAP puede sincronizarse correctamente. Si su solicitud de autenticación LDAP no es correcta, los usuarios aún no podrían iniciar sesión. PRIMERO DEBE GUARDAR LA CONFIGURACIÓN LDAP ACTUALIZADA.',
     'ldap_manager'              => 'Gestor LDAP',
     'ldap_server'               => 'Servidor LDAP',
-    'ldap_server_help'          => 'Esto debería empezar con ldap:// (sin codificar o TLS) o ldaps:// (para SSL)',
-    'ldap_server_cert'			=> 'Certificado de validación SSL LDAP',
-    'ldap_server_cert_ignore'	=> 'Permitir certificados SSL inválidos',
+    'ldap_server_help'          => 'Esto debería comenzar con ldap:// (sin cifrado) o con ldaps:// (para TLS o SSL)',
+    'ldap_server_cert'			=> 'Validación del certificado LDAP SSL',
+    'ldap_server_cert_ignore'	=> 'Permitir certificado SSL inválido',
     'ldap_server_cert_help'		=> 'Seleccione esta casilla si está utilizando un certificado SSL autofirmado y desea aceptar un certificado SSL inválido.',
     'ldap_tls'                  => 'Usar TLS',
     'ldap_tls_help'             => 'Esto se debe seleccionar si se está ejecutando STARTTLS en el servidor LDAP. ',
-    'ldap_uname'                => 'Enlazar usuario LDAP',
-    'ldap_dept'                 => 'Departamento de Protocolo Ligero de Acceso a Directorio (LDAP)',
+    'ldap_uname'                => 'Nombre de usuario de enlace LDAP (LDAP Bind Username)',
+    'ldap_dept'                 => 'Departamento LDAP',
     'ldap_phone'                => 'Número Telefónico LDAP',
     'ldap_jobtitle'             => 'Cargo LDAP',
     'ldap_country'              => 'País LDAP',
-    'ldap_pword'                => 'Enlazar contraseña LDAP',
+    'ldap_pword'                => 'Contraseña de enlace LDAP',
     'ldap_basedn'               => 'Enlazar base DN',
     'ldap_filter'               => 'Filtro LDAP',
-    'ldap_pw_sync'              => 'Sincronización de Contraseña LDAP',
-    'ldap_pw_sync_help'         => 'Desmarca esta casilla si no quieres mantener las contraseñas LDAP sincronizadas con las contraseñas locales. Desactivar esto significa que tus usuarios no podrán acceder si tu servidor LDAP no está disponible por algún motivo.',
-    'ldap_username_field'       => 'Campo de usuario',
+    'ldap_pw_sync'              => 'Cachear contraseñas LDAP',
+    'ldap_pw_sync_help'         => 'Uncheck this box if you do not wish to keep LDAP passwords cached as local hashed passwords. Disabling this means that your users may not be able to login if your LDAP server is unreachable for some reason.',
+    'ldap_username_field'       => 'Campo nombre de usuario',
     'ldap_lname_field'          => 'Apellido',
     'ldap_fname_field'          => 'Nombre LDAP',
-    'ldap_auth_filter_query'    => 'Consulta de autentificación LDAP',
+    'ldap_auth_filter_query'    => 'Consulta de autenticación LDAP',
     'ldap_version'              => 'Versión LDAP',
     'ldap_active_flag'          => 'Flag activo LDAP',
-    'ldap_activated_flag_help'  => 'Este valor se utiliza para determinar si un usuario sincronizado puede iniciar sesión en Snipe-IT. <strong>No afecta a la capacidad de comprobar los elementos dentro o fuera de ellos</strong>, y debería ser el <strong>nombre de atributo</strong> dentro de su AD/LDAP, <strong>no el valor</strong>. <br><br>Si este campo está configurado a un nombre de campo que no existe en su AD/LDAP, o el valor en el campo AD/LDAP se establece en <code>0</code> o <code>falso</code>, <strong>el inicio de sesión de usuario será deshabilitado</strong>. Si el valor en el campo AD/LDAP está establecido en <code>1</code> o <code>true</code> o <em>cualquier otro texto</em> significa que el usuario puede iniciar sesión. Cuando el campo está en blanco en tu AD, respetamos el atributo <code>userAccountControl</code>, que generalmente permite a los usuarios no suspendidos iniciar sesión.',
+    'ldap_activated_flag_help'  => 'Este valor se utiliza para determinar si un usuario sincronizado puede iniciar sesión en Snipe-IT. <strong>No afecta a la capacidad de asignarles o retirarles elementos</strong>, y debería ser el <strong>nombre de atributo</strong> dentro de su AD/LDAP, <strong>no el valor</strong>. <br><br>Si este campo está configurado a un nombre de campo que no existe en su AD/LDAP, o el valor en el campo AD/LDAP se establece en <code>0</code> o <code>falso</code>, <strong>el inicio de sesión de usuario será deshabilitado</strong>. Si el valor en el campo AD/LDAP está establecido en <code>1</code> o <code>true</code> o <em>cualquier otro texto</em> significa que el usuario puede iniciar sesión. Cuando el campo está en blanco en su AD, respetamos el atributo <code>userAccountControl</code>, que generalmente permite a los usuarios no suspendidos iniciar sesión.',
+    'ldap_invert_active_flag'   => 'LDAP Invert Active Flag',
+    'ldap_invert_active_flag_help'     => 'If enabled: when the value returned by LDAP Active Flag is <code>0</code> or <code>false</code> the user account will be active.',
     'ldap_emp_num'              => 'Número de empleado LDAP',
-    'ldap_email'                => 'Email LDAP',
+    'ldap_email'                => 'Correo electrónico LDAP',
     'ldap_test'                 => 'Probar LDAP',
     'ldap_test_sync'            => 'Prueba de sincronización LDAP',
-    'license'                   => 'Licencia de Software',
-    'load_remote'               => 'Usar Gravatar',
-    'load_remote_help_text'		=> 'Desmarque esta casilla si su instalación no puede cargar scripts desde el Internet externo. Esto evitará que Snipe-IT intente cargar imágenes desde Gravatar.',
+    'license'                   => 'Licencia de software',
+    'load_remote'               => 'Cargar avatares remotos',
+    'load_remote_help_text'		=> 'Desmarque esta casilla si su instalación no puede cargar secuencias de comandos (scripts) desde Internet . Esto evitará que Snipe-IT intente cargar avatares de Gravatar u otras fuentes externas.',
     'login'                     => 'Intentos de inicio de sesión',
     'login_attempt'             => 'Intento de inicio de sesión',
     'login_ip'                  => 'Dirección IP',
-    'login_success'             => '¿Éxito?',
+    'login_success'             => '¿Exitoso?',
     'login_user_agent'          => 'Agente de usuario',
     'login_help'                => 'Lista de intentos de inicio de sesión',
-    'login_note'                => 'Nota de inicio de sesión',
-    'login_note_help'           => 'Opcionalmente incluya algunas oraciones en su pantalla de inicio de sesión, por ejemplo para ayudar a las personas que han encontrado un dispositivo perdido o robado. Este campo acepta <a href="https://help.github.com/articles/github-flavored-markdown/">Github con sabor markdown</a>',
+    'login_note'                => 'Nota en inicio de sesión',
+    'login_note_placeholder'            => "Si no tiene acceso o ha encontrado un dispositivo perteneciente a esta empresa, llame al soporte técnico al 888-555-1212. Gracias.",
+    'login_note_help'           => 'Opcionalmente incluya algunas frases en su pantalla de inicio de sesión, por ejemplo para ayudar a las personas que han encontrado un dispositivo perdido o robado. Este campo acepta <a href="https://help.github.com/articles/github-flavored-markdown/">markdown estilo Github</a>',
     'login_remote_user_text'    => 'Opciones de inicio de sesión de usuario remoto',
     'login_remote_user_enabled_text' => 'Habilitar inicio de sesión con encabezado de usuario remoto',
-    'login_remote_user_enabled_help' => 'Esta opción habilita la Autenticación mediante el encabezado REMOTE_USER de acuerdo con la "Interfaz de puerta de enlace común (rfc3875)"',
+    'login_remote_user_enabled_help' => 'Esta opción habilita la autenticación mediante el encabezado REMOTE_USER de acuerdo con la "Interfaz de puerta de enlace común (rfc3875)"',
     'login_common_disabled_text' => 'Deshabilitar otros mecanismos de autenticación',
     'login_common_disabled_help' => 'Esta opción desactiva otros mecanismos de autenticación. Simplemente habilite esta opción si está seguro de que su inicio de sesión REMOTE_USER ya está funcionando',
     'login_remote_user_custom_logout_url_text' => 'URL de cierre de sesión personalizado',
-    'login_remote_user_custom_logout_url_help' => 'Sí se especifica un URL, los usuarios serán redireccionados a este URL una vez que cierren sesión en Snipe-TI. Esto es útil para cerrar sesiones de usuario de su Authentication Provider de forma correcta.',
+    'login_remote_user_custom_logout_url_help' => 'Si se proporciona una URL aquí, los usuarios serán redirigidos a esta URL después de que el usuario cierre la sesión de Snipe-IT. Esto es útil para cerrar correctamente las sesiones de usuario de su proveedor de autenticación.',
     'login_remote_user_header_name_text' => 'Cabecera de nombre de usuario personalizado',
     'login_remote_user_header_name_help' => 'Usar la cabecera especificada en lugar de REMOTE_USER',
     'logo'                    	=> 'Logo',
-    'logo_print_assets'         => 'Usar en Impresión',
-    'logo_print_assets_help'    => 'Usar marca en la lista imprimible de equipos',
+    'logo_print_assets'         => 'Usar en la impresión',
+    'logo_print_assets_help'    => 'Utilice la marca de la empresa en las listas de activos imprimibles ',
     'full_multiple_companies_support_help_text' => 'Limitar los usuarios asignados a compañías (incluyendo administradores) solo a los activos de esa compañía.',
     'full_multiple_companies_support_text' => 'Soporte completo a múltiples compañías',
+    'scope_locations_fmcs_support_text'  => 'Lugares de Alcance con soporte completo para múltiples empresas',
+    'scope_locations_fmcs_support_help_text'  => 'Restringir las ubicaciones a su empresa seleccionada.',
+    'scope_locations_fmcs_check_button' => 'Comprobar compatibilidad',
+    'scope_locations_fmcs_support_disabled_text'  => 'Esta opción está deshabilitada porque tienes lugares en conflicto establecidos para :count o más elementos.',
     'show_in_model_list'   => 'Mostrar en menús desplegables de modelos',
     'optional'					=> 'opcional',
     'per_page'                  => 'Resultados por página',
     'php'                       => 'Versión de PHP',
-    'php_info'                  => 'PHP Info',
+    'php_info'                  => 'Información de PHP',
     'php_overview'              => 'PHP',
-    'php_overview_keywords'     => 'phpinfo, sistema, información',
-    'php_overview_help'         => 'PHP Información del sistema',
-    'php_gd_info'               => 'Debes instalar php-gd para mostrar Códigos QR, ver instrucciones de instalación en <a href="http://www.php.net/manual/en/image.installation.php"></a>.',
-    'php_gd_warning'            => 'PHP Image Processing y GD plugin NO instalados.',
+    'php_overview_help'         => 'Información del sistema PHP',
+    'php_gd_info'               => 'Debe instalar php-gd para mostrar códigos QR, consulte las instrucciones de instalación.',
+    'php_gd_warning'            => 'PHP Image Processing y GD plugin NO están instalados.',
     'pwd_secure_complexity'     => 'Complejidad de la contraseña',
     'pwd_secure_complexity_help' => 'Seleccione las reglas de complejidad de las contraseñas que desee aplicar.',
     'pwd_secure_complexity_disallow_same_pwd_as_user_fields' => 'La contraseña no puede ser la misma que el nombre, apellido, correo electrónico o nombre de usuario',
@@ -163,12 +172,12 @@ return [
     'pwd_secure_complexity_numbers' => 'Requiere al menos un número',
     'pwd_secure_complexity_symbols' => 'Requiere al menos un símbolo',
     'pwd_secure_complexity_case_diff' => 'Requiere al menos una mayúscula y una minúscula',
-    'pwd_secure_min'            => 'Caracteres mínimos de contraseña',
+    'pwd_secure_min'            => 'Caracteres mínimos de la contraseña',
     'pwd_secure_min_help'       => 'El valor mínimo permitido es 8',
     'pwd_secure_uncommon'       => 'Evitar contraseñas comunes',
-    'pwd_secure_uncommon_help'  => 'Esto impedirá que los usuarios usen contraseñas comunes de las 10,000 contraseñas principales que se notifican en las infracciones.',
-    'qr_help'                   => 'Activa Códigos QR antes para poder ver esto',
-    'qr_text'                   => 'Texto Código QR',
+    'pwd_secure_uncommon_help'  => 'Esto impedirá que los usuarios usen contraseñas comunes de las 10,000 contraseñas más usuales reportadas en fugas de datos.',
+    'qr_help'                   => 'Habilite primero los códigos QR para configurar esto',
+    'qr_text'                   => 'Texto del código QR',
     'saml'                      => 'SAML',
     'saml_title'                => 'Actualizar ajustes de SAML',
     'saml_help'                 => 'Configuración SAML',
@@ -181,31 +190,31 @@ return [
     'saml_sp_metadata_url'      => 'URL Metadatos',
     'saml_idp_metadata'         => 'Metadatos SAML IdP',
     'saml_idp_metadata_help'    => 'Puede especificar los metadatos IdP usando un archivo URL o XML.',
-    'saml_attr_mapping_username' => 'Mapeo de Atributos - Nombre de Usuario',
-    'saml_attr_mapping_username_help' => 'NameID se utilizará si el mapeo de atributos no está especificado o no es válido.',
+    'saml_attr_mapping_username' => 'Asociar atributo - Nombre de usuario',
+    'saml_attr_mapping_username_help' => 'NameID se utilizará si la asociación de atributos no está especificada o no es válida.',
     'saml_forcelogin_label'     => 'Forzar inicio de sesión SAML',
-    'saml_forcelogin'           => 'Hacer SAML el inicio de sesión principal',
-    'saml_forcelogin_help'      => 'Puedes usar \'/login?nosaml\' para llegar a la página de inicio de sesión normal.',
+    'saml_forcelogin'           => 'Hacer de SAML el método de inicio de sesión principal',
+    'saml_forcelogin_help'      => 'Puede usar \'/login?nosaml\' para ir a la página de inicio de sesión normal.',
     'saml_slo_label'            => 'Cerrar sesión única SAML',
     'saml_slo'                  => 'Enviar una solicitud de salida a IdP al cerrar sesión',
     'saml_slo_help'             => 'Esto causará que el usuario sea redirigido primero a la IdP al cerrar sesión. Dejar desmarcado si el IdP no soporta correctamente SAML SLO iniciado por SP.',
     'saml_custom_settings'      => 'Configuración personalizada SAML',
-    'saml_custom_settings_help' => 'Puedes especificar ajustes adicionales a la biblioteca onelogin/php-saml. Úsalo bajo tu propio riesgo.',
+    'saml_custom_settings_help' => 'Puede especificar ajustes adicionales a la biblioteca onelogin/php-saml. Úselo bajo su propio riesgo.',
     'saml_download'             => 'Descargar metadatos',
-    'setting'                   => 'Parámetro',
-    'settings'                  => 'Configuración',
+    'setting'                   => 'Configuración',
+    'settings'                  => 'Configuraciones',
     'show_alerts_in_menu'       => 'Mostrar alertas en el menú superior',
     'show_archived_in_list'     => 'Activos archivados',
     'show_archived_in_list_text'     => 'Mostrar activos archivados en el listado de "todos los activos"',
     'show_assigned_assets'      => 'Mostrar activos asignados a activos',
     'show_assigned_assets_help' => 'Mostrar activos que fueron asignados a otros activos en Ver usuario -> Activos, Ver usuario -> Información -> Imprimir todos los asignados y en Cuenta -> Ver elementos asignados.',
-    'show_images_in_email'     => 'Show images in emails',
-    'show_images_in_email_help'   => 'Uncheck this box if your Snipe-IT installation is behind a VPN or closed network and users outside the network will not be able to load images served from this installation in their emails.',
+    'show_images_in_email'     => 'Mostrar imágenes en correos electrónicos',
+    'show_images_in_email_help'   => 'Desmarque esta casilla si su instalación de Snipe-IT está detrás de una red privada o VPN y los usuarios fuera de la red no pueden cargar las imágenes publicadas desde este servidor de Snipe-IT en sus correos electrónicos.',
     'site_name'                 => 'Nombre del sitio',
     'integrations'               => 'Integraciones',
     'slack'                     => 'Slack',
     'general_webhook'           => 'Webhook general',
-    'ms_teams'                  => 'Equipos Microsoft',
+    'ms_teams'                  => 'Microsoft Teams',
     'webhook'                   => ':app',
     'webhook_presave'           => 'Probar para guardar',
     'webhook_title'               => 'Actualizar ajustes de Webhook',
@@ -214,68 +223,71 @@ return [
     'webhook_channel'             => 'Canal de :app',
     'webhook_endpoint'            => 'Endopint de :app',
     'webhook_integration'         => 'Configuración de :app',
-    'webhook_test'                 =>'Probar integración de :app',
-    'webhook_integration_help'    => 'La integración de :app es opcional, sin embargo el Endpoint y el canal son necesarios si desea usarlo. Para configurar la integración de :app, primero debe <a href=":webhook_link" target="_new" rel="noopener">crear un webhook entrante</a> en su cuenta de :app. Haga clic en el botón <strong>Probar integración de :app</strong> para confirmar que su configuración es correcta antes de guardar. ',
-    'webhook_integration_help_button'    => 'Una vez que hayas guardado la información de :app, aparecerá un botón de prueba.',
-    'webhook_test_help'           => 'Comprueba si tu integración con :app está configurada correctamente. PRIMERO DEBES GUARDAR TU CONFIGURACION ACTUALIZADA DE :app.',
-    'snipe_version'  			=> 'Version de Snipe-IT',
+    'webhook_test'                 =>'Probar integración con :app',
+    'webhook_integration_help'    => 'La integración con :app es opcional, sin embargo, el punto final (endpoint) y el canal son necesarios si desea usarla. Para configurar la integración con :app, primero debe crear <a href=":webhook_link" target="_new" rel="noopener">un webhook entrante</a> en su cuenta :app. Haga clic en el botón <strong>Probar integración con :app</strong> para confirmar que su configuración es correcta antes de guardar. ',
+    'webhook_integration_help_button'    => 'Una vez que haya guardado la información de :app, aparecerá un botón de prueba.',
+    'webhook_test_help'           => 'Compruebe si su integración con :app está configurada correctamente. PRIMERO DEBE GUARDAR LA CONFIGURACION ACTUALIZADA DE :app.',
+    'shortcuts_enabled'         => 'Habilitar accesos directos',
+    'shortcuts_help_text'       => '<strong>Windows</strong>: Alt + Tecla de acceso, <strong>Mac</strong>: Control + Opción + Tecla de acceso',
+    'snipe_version'  			=> 'Versión de Snipe-IT',
     'support_footer'            => 'Enlace al soporte en el pie de página ',
-    'support_footer_help'       => 'Especifica quien ve los enlaces de información de Soporte y Manual de Usuarios de Snipe-IT',
+    'support_footer_help'       => 'Especifique quién puede ver los enlaces a la información de soporte de Snipe-IT y al manual de usuario.',
     'version_footer'            => 'Versión en el pie de página ',
-    'version_footer_help'       => 'Especificar quién ve la versión Snipe-IT y el número de compilación.',
-    'system'                    => 'Información del Sistema',
-    'update'                    => 'Actualizar Parámetros',
+    'version_footer_help'       => 'Especifique quién puede ver la versión de Snipe-IT y el número de compilación.',
+    'system'                    => 'Información del sistema',
+    'update'                    => 'Actualizar configuraciones',
     'value'                     => 'Valor',
     'brand'                     => 'Marca',
-    'brand_keywords'            => 'pie de página, logotipo, impresión, tema, piel, encabezado, colores, color, css',
     'brand_help'                => 'Logo, nombre del sitio',
-    'web_brand'                 => 'Tipo de marca web',
-    'about_settings_title'      => 'Acerca de Ajustes',
-    'about_settings_text'       => 'Estos ajustes te permiten personalizar ciertos aspectos de tu instalación.',
-    'labels_per_page'           => 'Etiquetas por pàgina',
-    'label_dimensions'          => 'Dimensiones de las etiquetas (pulgadas)',
+    'web_brand'                 => 'Tipo de marca en la web',
+    'about_settings_title'      => 'Acerca de las configuraciones',
+    'about_settings_text'       => 'Estas configuraciones le permiten personalizar ciertos aspectos de su instalación.',
+    'labels_per_page'           => 'Etiquetas por página',
+    'label_dimensions'          => 'Dimensiones de la etiqueta (pulgadas)',
     'next_auto_tag_base'        => 'Siguiente incremento automático',
-    'page_padding'              => 'Margenès de pàgina (pulgadas)',
-    'privacy_policy_link'       => 'Enlace a la Política de Privacidad',
+    'page_padding'              => 'Márgenes de página (pulgadas)',
+    'privacy_policy_link'       => 'Enlace a la política de privacidad',
     'privacy_policy'            => 'Política de Privacidad',
     'privacy_policy_link_help'  => 'Si se incluye una url aquí, un enlace a su política de privacidad se incluirá en el pie de página de la aplicación y en cualquier correo electrónico que el sistema envíe, de conformidad con el GDPR. ',
     'purge'                     => 'Purgar registros eliminados',
     'purge_deleted'             => 'Purgar eliminados ',
-    'labels_display_bgutter'    => 'Borde inferior de la Etiqueta',
-    'labels_display_sgutter'    => 'Borde lateral de la Etiqueta',
-    'labels_fontsize'           => 'Tamaño de fuente de la etiqueta',
+    'labels_display_bgutter'    => 'Borde inferior de la etiqueta',
+    'labels_display_sgutter'    => 'Borde lateral de la etiqueta',
+    'labels_fontsize'           => 'Tamaño de letra de la etiqueta',
     'labels_pagewidth'          => 'Ancho de la hoja de etiqueta',
     'labels_pageheight'         => 'Altura de la hoja de etiqueta',
-    'label_gutters'        => 'Espaciamiento de etiqueta (pulgadas)',
+    'label_gutters'        => 'Espacio entre etiquetas (pulgadas)',
     'page_dimensions'        => 'Dimensiones de la página (pulgadas)',
     'label_fields'          => 'Campos visibles de la etiqueta',
     'inches'        => 'pulgadas',
-    'width_w'        => 'an',
-    'height_h'        => 'al',
+    'width_w'        => 'ancho',
+    'height_h'        => 'alto',
     'show_url_in_emails'                => 'Enlace a Snipe-IT en correos electrónicos',
-    'show_url_in_emails_help_text'      => 'Desmarca esta casilla si no deseas volver a vincular tu instalación de Snipe-IT en tus pies de página de correo electrónico. Útil si la mayoría de sus usuarios nunca inician sesión.',
-    'text_pt'        => 'pt',
+    'show_url_in_emails_help_text'      => 'Desmarque esta casilla si no desea vincular su instalación de Snipe-IT en el pie de página de correo electrónico. Útil si la mayoría de sus usuarios nunca se conectan. ',
+    'text_pt'        => 'puntos',
     'thumbnail_max_h'   => 'Altura máxima de la miniatura',
-    'thumbnail_max_h_help'   => 'Altura máxima en píxeles que las miniaturas pueden mostrar en la vista de listado. Mín. 25, máximo 500.',
+    'thumbnail_max_h_help'   => 'Altura máxima en píxeles para mostrar las miniaturas en la vista de listado. Mín 25, máx 500.',
     'two_factor'        => 'Autenticación de dos factores',
-    'two_factor_secret'        => 'Código de verificación en dos factores',
+    'two_factor_secret'        => 'Código de verificación de dos factores',
     'two_factor_enrollment'        => 'Inscripción en verificación de dos factores',
     'two_factor_enabled_text'        => 'Activar la verificación de dos factores',
     'two_factor_reset'        => 'Restablecer el secreto en verificación de dos factores',
-    'two_factor_reset_help'        => 'Esto obligará al usuario a volver a inscribir su dispositivo en su aplicación de autenticación. Esto puede ser útil si su dispositivo actualmente inscrito es perdido o robado. ',
-    'two_factor_reset_success'          => 'Verificación en dos pasos de dispositivo reiniciado exitosamente',
-    'two_factor_reset_error'          => 'Falló la Verificación en dos pasos del dispositivo',
+    'two_factor_reset_help'        => 'Esto obligará al usuario a inscribir de nuevo su dispositivo en su aplicación de autenticación. Esto puede ser útil en caso de pérdida o robo del dispositivo actualmente registrado. ',
+    'two_factor_reset_success'          => 'Dispositivo de verificación de dos factores restablecido correctamente',
+    'two_factor_reset_error'          => 'Error al restablecer el dispositivo de verificación de doble factor',
     'two_factor_enabled_warning'        => 'Al activar el doble factor si no está activado, se le obligará inmediatamente a autenticarse con un dispositivo registrado en Google Auth. Tendrá la posibilidad de inscribir su dispositivo si uno no está inscrito actualmente.',
-    'two_factor_enabled_help'        => 'Esto activará la autenticación de dos factores usando Google Authenticator.',
-    'two_factor_optional'        => 'Selectiva (los usuarios pueden activar o desactivar si está permitido)',
+    'two_factor_enabled_help'        => 'Esto activará la autenticación de dos factores mediante Google Authenticator.',
+    'two_factor_optional'        => 'Selectivo (los usuarios pueden activar o desactivar si está permitido)',
     'two_factor_required'        => 'Requerido para todos los usuarios',
     'two_factor_disabled'        => 'Desactivado',
     'two_factor_enter_code'	=> 'Ingrese el código de verificación de dos factores',
     'two_factor_config_complete'	=> 'Enviar código',
-    'two_factor_enabled_edit_not_allowed' => 'El administrador no permite modificar esta configuración.',
-    'two_factor_enrollment_text'	=> "Se requiere autenticación de dos factores, sin embargo su dispositivo aún no ha sido inscrito. Abra su aplicación Google Authenticator y escanee el código QR de abajo para inscribir su dispositivo. Una vez que lo haya inscrito, introduzca el código en la parte inferior",
+    'two_factor_enabled_edit_not_allowed' => 'El administrador no le permite modificar esta configuración.',
+    'two_factor_enrollment_text'	=> "Se requiere autenticación de dos factores, sin embargo su dispositivo aún no ha sido inscrito. Abra la aplicación Google Authenticator y escanee el código QR que aparece a continuación para registrar su dispositivo. Una vez que haya registrado su dispositivo, introduzca el código en la parte inferior",
     'require_accept_signature'      => 'Solicitar firma',
-    'require_accept_signature_help_text'      => 'Activar esta función requiere que los usuarios firmen físicamente aceptando un elemento.',
+    'require_accept_signature_help_text'      => 'Al activar esta función, los usuarios tendrán que firmar físicamente la aceptación de un activo.',
+    'require_checkinout_notes'  => 'Exigir notas en el ingreso/asignación',
+    'require_checkinout_notes_help_text'    => 'Al activar esta característica, los campos de notas deberán rellenarse al ingresar o asignar un activo.',
     'left'        => 'izquierda',
     'right'        => 'derecha',
     'top'        => 'arriba',
@@ -283,97 +295,195 @@ return [
     'vertical'        => 'vertical',
     'horizontal'        => 'horizontal',
     'unique_serial'                => 'Números de serie únicos',
-    'unique_serial_help_text'                => 'Al marcar esta casilla se aplicará una restricción única en los seriales de los equipos',
-    'zerofill_count'        => 'Longitud de etiquetas de activos, incluyendo relleno de ceros',
+    'unique_serial_help_text'                => 'Al marcar esta casilla, se aplicará una restricción a los activos para tener números de serie únicos',
+    'zerofill_count'        => 'Longitud de los números en las placas de los activos, incluyendo los ceros de relleno',
     'username_format_help'   => 'Esta configuración solo será utilizada por el proceso de importación si no se proporciona un nombre de usuario y tenemos que generar un nombre de usuario por usted.',
     'oauth_title' => 'Configuración de la API de OAuth',
-    'oauth_clients' => 'OAuth Clients',
+    'oauth_clients' => 'Clientes OAuth',
     'oauth' => 'OAuth',
-    'oauth_help' => 'Configuración de Endpoint para Oauth',
-    'oauth_no_clients' => 'You have not created any OAuth clients yet.',
-    'oauth_secret' => 'Secret',
-    'oauth_authorized_apps' => 'Authorized Applications',
-    'oauth_redirect_url' => 'Redirect URL',
-    'oauth_name_help' => ' Something your users will recognize and trust.',
+    'oauth_help' => 'Configuración del punto final (endpoint) OAuth',
+    'oauth_no_clients' => 'Aún no ha creado ningún cliente OAuth.',
+    'oauth_secret' => 'Secreto',
+    'oauth_authorized_apps' => 'Aplicaciones autorizadas',
+    'oauth_redirect_url' => 'URL de redireccionamiento',
+    'oauth_name_help' => ' Algo que sus usuarios reconocerán y en lo que confiarán.',
     'oauth_scopes' => 'Scopes',
-    'oauth_callback_url' => 'Your application authorization callback URL.',
-    'create_client' => 'Create Client',
-    'no_scopes' => 'No scopes',
-    'asset_tag_title' => 'Actualizar configuración de etiquetas de activos',
-    'barcode_title' => 'Actualizar ajustes de código de barras',
+    'oauth_callback_url' => 'URL de devolución de llamada de autorización de su aplicación (callback URL).',
+    'create_client' => 'Crear cliente',
+    'no_scopes' => 'Sin scopes',
+    'asset_tag_title' => 'Actualizar la configuración de las placas de activos',
+    'barcode_title' => 'Actualizar la configuración de los códigos de barras',
     'barcodes' => 'Códigos de barras',
     'barcodes_help_overview' => 'Configuración del código de barras &amp; QR',
     'barcodes_help' => 'Esto intentará eliminar códigos de barras almacenados en caché. Normalmente solo se usa si la configuración del código de barras ha cambiado o si ha cambiado la URL de Snipe-IT. Los códigos de barras se volverán a generar la próxima vez que se acceda a ellos.',
     'barcodes_spinner' => 'Intentando eliminar archivos...',
     'barcode_delete_cache' => 'Borrar caché de código de barras',
-    'branding_title' => 'Actualizar Configuración de Marca',
-    'general_title' => 'Actualizar ajustes generales',
+    'branding_title' => 'Actualizar la configuración de la marca',
+    'general_title' => 'Actualizar la configuración general',
     'mail_test' => 'Enviar prueba',
     'mail_test_help' => 'Esto intentará enviar un correo de prueba a :replyto.',
     'filter_by_keyword' => 'Filtrar por palabra clave',
     'security' => 'Seguridad',
-    'security_title' => 'Actualizar ajustes de seguridad',
-    'security_keywords' => 'contraseña, contraseñas, requisitos, dos factores, dos factores, contraseñas comunes, inicio de sesión remoto, autenticación',
-    'security_help' => 'Restricciones de contraseña de dos factores',
-    'groups_keywords' => 'permisos, grupos de permisos, autorización',
-    'groups_help' => 'Permisos de grupos para la cuenta',
-    'localization' => 'Ubicación',
-    'localization_title' => 'Actualizar ajustes de localización',
-    'localization_keywords' => 'localización, moneda, local, locale, zona horaria, zona horaria, internacional, internatinalización, idioma, idioma, traducción',
-    'localization_help' => 'Idioma, fecha',
+    'security_title' => 'Actualizar la configuración de seguridad',
+    'security_help' => 'Verificación de dos factores y restricciones de contraseña',
+    'groups_help' => 'Grupos de permisos',
+    'localization' => 'Localización',
+    'localization_title' => 'Actualizar la configuración de localización',
+    'localization_help' => 'Idioma, visualización de la fecha',
     'notifications' => 'Notificaciones',
-    'notifications_help' => 'Alertas de Correo y Configuración de Auditoría',
+    'notifications_help' => 'Configuración de alertas por correo electrónico y de auditoría',
     'asset_tags_help' => 'Incrementos y prefijos',
     'labels' => 'Etiquetas',
     'labels_title' => 'Actualizar configuración de etiquetas',
-    'labels_help' => 'Tamaños de etiqueta &amp; ajustes',
-    'purge_keywords' => 'eliminar permanentemente',
+    'labels_help' => 'Configuración de códigos de barras &amp; etiquetas',
     'purge_help' => 'Purgar registros eliminados',
     'ldap_extension_warning' => 'No parece que la extensión LDAP esté instalada o habilitada en este servidor. Todavía puede guardar su configuración, pero necesitará habilitar la extensión LDAP para PHP antes de que funcione la sincronización LDAP o el inicio de sesión.',
     'ldap_ad' => 'LDAP/AD',
+    'ldap_test_label' => 'Probar sincronización LDAP',
+    'ldap_test_login' => ' Probar Login LDAP',
+    'ldap_username_placeholder' => 'Usuario LDAP',
+    'ldap_password_placeholder' => 'Contraseña LDAP',
     'employee_number' => 'Número de empleado',
     'create_admin_user' => 'Crear un usuario ::',
-    'create_admin_success' => '¡Éxito! ¡Tu usuario admin ha sido añadido!',
-    'create_admin_redirect' => '¡Haz clic aquí para acceder a tu aplicación!',
+    'create_admin_success' => '¡Éxito! ¡Su usuario admin ha sido añadido!',
+    'create_admin_redirect' => '¡Haga clic aquí para acceder a su aplicación!',
     'setup_migrations' => 'Migraciones de base de datos ::',
     'setup_no_migrations' => 'No hay nada que migrar. ¡Las tablas de la base de datos ya estaban configuradas!',
     'setup_successful_migrations' => 'Se han creado las tablas de la base de datos',
     'setup_migration_output' => 'Salida de Migración:',
     'setup_migration_create_user' => 'Siguiente: Crear usuario',
-    'ldap_settings_link' => 'Página de ajustes LDAP',
-    'slack_test' => 'Prueba <i class="fab fa-slack"></i> Integración',
-    'label2_enable'           => 'Nuevo motor de etiqueta',
+    'ldap_settings_link' => 'Página de configuración de LDAP',
+    'slack_test' => 'Prueba de integración de <i class="fab fa-slack"></i>',
+    'status_label_name' => 'Etiqueta de estado',
+    'super_admin_only'  => 'Sólo Super Admin',
+    'label2_enable'           => 'Nuevo motor de etiquetas',
     'label2_enable_help'      => 'Cambiar al nuevo motor de etiquetas. <b>Nota: Deberá guardar esta configuración antes de configurar otros parámetros.</b>',
     'label2_template'         => 'Plantilla',
     'label2_template_help'    => 'Seleccione qué plantilla utilizar para la generación de etiquetas',
     'label2_title'            => 'Titulo',
     'label2_title_help'       => 'El título a mostrar en etiquetas que lo soporten',
     'label2_title_help_phold' => 'El marcador de posición <code>{COMPANY}</code> será reemplazado con el nombre de la compañía del activo',
-    'label2_asset_logo'       => 'Usar Logo de Activo',
+    'label2_asset_logo'       => 'Usar logo de activos',
     'label2_asset_logo_help'  => 'Utilice el logotipo de la compañía asignada, en lugar del valor en <code>:setting_name</code>',
     'label2_1d_type'          => 'Tipo de código de barras 1D',
     'label2_1d_type_help'     => 'Formato para códigos de barras 1D',
     'label2_2d_type'          => 'Tipo de código de barras 2D',
     'label2_2d_type_help'     => 'Formato para códigos de barras 2D',
     'label2_2d_target'        => 'Apuntamiento del código de barras 2D',
-    'label2_2d_target_help'   => 'La URL a la que apunta el código de barras 2D cuando se escanea',
+    'label2_2d_target_help'   => 'Los datos que incluirá el código de barra 2D',
     'label2_fields'           => 'Definiciones del campo',
-    'label2_fields_help'      => 'Los campos pueden ser agregados, eliminados y reordenados en la columna izquierda. Para cada campo, múltiples opciones para Etiqueta y DataSource pueden ser agregadas, eliminadas y reordenadas en la columna derecha.',
+    'label2_fields_help'      => 'Los campos se pueden añadir, eliminar y reordenar en la columna izquierda. Para cada campo, se pueden agregar, eliminar y reordenar múltiples opciones para etiquetas y para orígenes de datos en la columna derecha.',
+    'purge_barcodes' => 'Purge Barcodes',
     'help_asterisk_bold'    => 'El texto escrito como <code>**texto**</code> se mostrará como negrita',
     'help_blank_to_use'     => 'Deje en blanco para usar el valor de <code>:setting_name</code>',
-    'help_default_will_use' => '<code>:default</code> usará el valor de <code>:setting_name</code>. <br>Tenga en cuenta que el valor de los códigos de barra debe estar en cumplimiento con la especificación respectiva para que sean generados exitosamente. Por favor lea <a href="https://snipe-it.readme.io/docs/barcodes">la documentación <i class="fa fa-external-link"></i></a> para más detalles. ',
+    'help_default_will_use' => '<code>:default</code> usará el valor de <code>:setting_name</code>. <br>Tenga en cuenta que el valor de los códigos de barras debe cumplir la especificación respectiva para que sean generados exitosamente. Por favor lea <a href="https://snipe-it.readme.io/docs/barcodes">la documentación <i class="fa fa-external-link"></i></a> para más detalles. ',
+    'asset_id'              => 'ID del activo',
+    'data'               => 'Datos',
     'default'               => 'Predeterminado',
     'none'                  => 'Ninguno',
     'google_callback_help' => 'Esto debe introducirse como URL de devolución de llamada (callback) en la configuración de su aplicación de Google OAuth en la <strong><a href="https://console.cloud.google.com/" target="_blank">consola de desarrollador de Google <i class="fa fa-external-link" aria-hidden="true"></i></a></strong> de su organización .',
     'google_login'      => 'Configuración de inicio de sesión de Google Workspace',
     'enable_google_login'  => 'Permitir a los usuarios iniciar sesión con Google Workspace',
-    'enable_google_login_help'  => 'Los usuarios no serán provistos automáticamente. Deben tener una cuenta existente aquí Y en Google Workspace, y su nombre de usuario debe coincidir con su dirección de correo electrónico de Google Workspace. ',
+    'enable_google_login_help'  => 'Los usuarios no serán creados automáticamente. Deben tener una cuenta existente aquí Y en Google Workspace, y su nombre de usuario aquí debe coincidir con su dirección de correo electrónico de Google Workspace. ',
     'mail_reply_to' => 'Dirección de respuesta de correo',
     'mail_from' => 'Correo desde la dirección',
     'database_driver' => 'Controlador de base de datos',
     'bs_table_storage' => 'Almacenamiento de tabla',
-    'timezone' => 'Timezone',
+    'timezone' => 'Zona horaria',
+    'test_mail' => 'Probar Correo',
     'profile_edit'          => 'Editar perfil',
     'profile_edit_help'          => 'Permitir que los usuarios editen sus propios perfiles.',
+    'default_avatar' => 'Avatar personalizado por defecto',
+    'default_avatar_help' => 'Esta imagen se mostrará como la imagen de perfil si el usuario no tiene foto de perfil.',
+    'restore_default_avatar' => 'Restaurar <a href=":default_avatar" data-toggle="lightbox" data-type="image">avatar original por defecto del sistema</a>',
+    'restore_default_avatar_help' => '',
+    'due_checkin_days' => 'Advertencia para próximos ingresos',
+    'due_checkin_days_help' => '¿Cuántos días antes de la fecha prevista de ingreso de un activo debe figurar en la página «Próximos a ingresar»?',
+    'no_groups' => 'Todavía no se han creado grupos. Para agregar uno, visite<code>Configuración de administración > Grupos de permisos</code>.',
+    'text' => 'Texto',
+
+    'username_formats' => [
+        'username_format'		=> 'Formato del nombre de usuario',
+        'firstname_lastname_format'	=> 'Nombre y Apellido (jane.smith)',
+        'first_name_format'	        => 'Nombre',
+        'last_name_format'		=> 'Apellido',
+        'filastname_format'			=> 'Inicial del nombre y apellido (jsmith)',
+        'lastnamefirstinitial_format' =>  'Apellido e inicial del nombre (smithj)',
+        'firstname_lastname_underscore_format' => 'First Name Last Name (jane_smith)',
+        'firstinitial.lastname' => 'Inicial del nombre y apellido (j.smith)',
+        'lastname_firstinitial' => 'Apellido e inicial del nombre (smith_j)',
+        'lastname_dot_firstinitial_format' => 'Apellido e inicial del nombre (smithj.)',
+        'firstnamelastname'     => 'Nombre y apellido (janesmith)',
+        'firstnamelastinitial'  => 'Nombre e inicial del apellido(janes)',
+        'lastnamefirstname'      => 'Apellido.Nombre (smith.jane)',
+    ],
+
+    'email_formats' => [
+        'email_format'			=> 'Formato de correo electrónico',
+        'firstname_lastname_format'	=> 'Nombre y apellido (jane.smith@ejemplo.com)',
+        'first_name_format'		=> 'Nombre (jane@ejemplo.com)',
+        'last_name_format'		=> 'Apellido (castillo@ejemplo.com)',
+        'filastname_format'			=> 'Inicial del nombre y apellido (jsmith@ejemplo.com)',
+        'lastnamefirstinitial_format' =>  'Apellido e inicial del nombre (smithj@example.com)',
+        'firstname_lastname_underscore_format' => 'Nombre y apellido (jane_smith@example.com)',
+        'firstinitial.lastname' => 'Inicial del nombre y apellido (j.smith@ejemplo.com)',
+        'lastname_firstinitial' => 'Apellido e inicial del nombre (smith_j@ejemplo.com)',
+        'lastname_dot_firstinitial_format' => 'Apellido e inicial del nombre (smithj@example.com)',
+        'firstnamelastname'     => 'Nombre y apellido (janesmith@example.com)',
+        'firstnamelastinitial'  => 'Nombre e inicial del apellido(janes@example.com)',
+        'lastnamefirstname'      => 'Apellido.Nombre (smith.jane@example.com)',
+    ],
+
+
+
+    'logo_labels' => [
+        'acceptance_pdf_logo'       => 'Logo PDF',
+        'email_logo'                => 'Logo de correo electrónico',
+        'label_logo'                => 'Logo de etiqueta',
+        'logo'                      => 'Logotipo del sitio',
+        'favicon'                   => 'Favicon',
+    ],
+
+    'logo_help' => [
+        'email_logo_size'       => 'Los logotipos cuadrados se ven mejor en correo electrónico. ',
+    ],
+
+    'logo_option_types' => [
+        'text' => 'Texto',
+        'logo' => 'Logo',
+        'logo_and_text' => 'Logo y texto',
+    ],
+
+
+    'legends' => [
+        'scoping' => 'Alcance',
+        'formats' => 'Formatos por defecto',
+        'profiles' => 'Perfiles de Usuario',
+        'eula' => 'Preferencias de aceptación y EULA',
+        'misc_display' => 'Miscellaneous Display Options',
+        'email' => 'Preferencias de correo electrónico',
+        'checkin' => 'Checkin Preferences',
+        'dashboard' => 'Preferencias de Inicio de Sesión e Interfaz',
+        'misc' => 'Varios',
+        'logos' => 'Logos y pantalla',
+        'colors' => 'Colores y aspectos',
+        'footer' => 'Preferencias del pie de página',
+        'security' => 'Preferencias de seguridad',
+        'general' => 'General',
+        'intervals' => 'Intervals & Thresholds',
+    ],
+
+
+    /* Keywords for settings overview help */
+    'keywords' => [
+        'brand'             => 'pie de página, logotipo, impresión, tema, apariencia, encabezado, colores, color, css',
+        'general_settings'  => 'soporte de la compañía, firma, aceptación, formato de correo electrónico, formato de nombre de usuario, imágenes, por página, miniatura, acuerdo de uso, términos y condiciones, gravatar, términos de servicio, tablero de indicadores, privacidad',
+        'groups'            => 'permisos, grupos de permisos, autorización',
+        'labels'            => 'etiquetas, código de barras, código de barra, hojas, imprimir, upc, qr, 1d, 2d',
+        'localization'      => 'localización, moneda, local, ubicación, zona horaria, internacional, internacionalización, idioma, traducción',
+        'php_overview'      => 'phpinfo, sistema, información',
+        'purge'             => 'eliminar permanentemente',
+        'security'          => 'contraseña, contraseñas, requisitos, dos factores, contraseñas comunes, inicio de sesión remoto, autenticación',
+    ],
 
 ];
diff --git a/resources/lang/es-MX/admin/settings/message.php b/resources/lang/es-MX/admin/settings/message.php
index 4db6a5a1f8..3981f002c8 100644
--- a/resources/lang/es-MX/admin/settings/message.php
+++ b/resources/lang/es-MX/admin/settings/message.php
@@ -9,38 +9,51 @@ return [
     'backup' => [
         'delete_confirm'        => '¿Está seguro de que desea eliminar este archivo de respaldo? Esta acción no puede se puede deshacer. ',
         'file_deleted'          => 'El archivo de respaldo fue eliminado satisfactoriamente. ',
-        'generated'             => 'Un nuevo archivo de respaldo fue creado satisfactoriamente.',
-        'file_not_found'        => 'El archivo de respaldo no se ha encontrado en el servidor.',
+        'generated'             => 'Se ha creado correctamente un nuevo archivo de copia de seguridad.',
+        'file_not_found'        => 'Ese archivo de copia de seguridad no se pudo encontrar en el servidor.',
         'restore_warning'       => 'Sí, restaurarlo. Entiendo que esto sobrescribirá cualquier dato existente actualmente en la base de datos. Esto también cerrará la sesión de todos sus usuarios existentes (incluido usted).',
         'restore_confirm'       => '¿Está seguro que desea restaurar su base de datos desde :filename?'
     ],
+    'restore' => [
+        'success'               => 'Se ha restaurado la copia de seguridad de su sistema. Por favor, vuelva a iniciar sesión.'
+    ],
     'purge' => [
         'error'     => 'Ha ocurrido un error mientras se realizaba el purgado. ',
-        'validation_failed'     => 'Su confirmación de purga es incorrecta. Por favor, escriba la palabra "Borrar" en el cuadro de confirmación.',
+        'validation_failed'     => 'Su confirmación de purga es incorrecta. Por favor, escriba la palabra "DELETE" en el cuadro de confirmación.',
         'success'               => 'Registros eliminados correctamente purgados.',
     ],
     'mail' => [
         'sending' => 'Enviando correo electrónico de prueba...',
         'success' => 'Correo enviado!',
         'error' => 'El correo no puede ser enviado.',
-        'additional' => 'Ningún mensaje de error adicional proporcionado. Comprueba la configuración de tu correo y el registro de mensajes de tu aplicación.'
+        'additional' => 'No se proporciona ningún mensaje de error adicional. Compruebe la configuración de su correo y el registro de errores de la aplicación.'
     ],
     'ldap' => [
         'testing' => 'Probando conexión LDAP, Enlace & Consulta ...',
-        '500' => 'Error 500 del servidor. Por favor, compruebe los registros de mensaje de su servidor para más información.',
+        '500' => 'Error 500 del servidor. Por favor, compruebe los registros de error de su servidor para más información.',
         'error' => 'Algo salió mal :(',
         'sync_success' => 'Una muestra de 10 usuarios devueltos desde el servidor LDAP basado en su configuración:',
         'testing_authentication' => 'Probando autenticación LDAP...',
         'authentication_success' => 'Usuario autenticado contra LDAP con éxito!'
     ],
+    'labels' => [
+        'null_template' => 'Plantilla de etiqueta no encontrada. Por favor, seleccione una plantilla.',
+        ],
     'webhook' => [
         'sending' => 'Enviando mensaje de prueba a :app...',
-        'success' => '¡Su Integración :webhook_name funciona!',
-        'success_pt1' => '¡Éxito! Comprueba el ',
+        'success' => '¡Su integración :webhook_name funciona!',
+        'success_pt1' => '¡Éxito! Compruebe el ',
         'success_pt2' => ' canal para su mensaje de prueba, y asegúrese de hacer clic en GUARDAR abajo para guardar su configuración.',
         '500' => 'Error 500 del servidor.',
         'error' => 'Algo salió mal. :app respondió con: :error_message',
         'error_redirect' => 'ERROR: 301/302 :endpoint devuelve una redirección. Por razones de seguridad, no seguimos redirecciones. Por favor, utilice el punto final actual.',
         'error_misc' => 'Algo salió mal. :( ',
-    ]
+        'webhook_fail' => ' Notificación de webhook fallida: Compruebe que la URL sigue siendo válida.',
+        'webhook_channel_not_found' => ' canal webhook no encontrado.',
+        'ms_teams_deprecation' => 'La URL de webhook de Microsoft Teams seleccionada será obsoleta 31 de diciembre de 2025. Por favor, utilice una URL de flujo de trabajo. La documentación de Microsoft sobre la creación de un flujo de trabajo puede encontrarse <a href="https://support.microsoft.com/en-us/office/create-incoming-webhooks-with-workflows-for-microsoft-teams-8ae491c7-0394-4861-ba59-055e33f75498" target="_blank"> aquí.</a>',
+    ],
+    'location_scoping' => [
+        'not_saved' => 'Tu configuración no ha sido guardada.',
+        'mismatch' => 'Hay 1 elemento en la base de datos que necesita su atención antes de poder habilitar el alcance de la ubicación. Hay :count elementos en la base de datos que necesitan tu atención antes de poder habilitar el alcance de ubicación.',
+    ],
 ];
diff --git a/resources/lang/es-MX/admin/statuslabels/message.php b/resources/lang/es-MX/admin/statuslabels/message.php
index 932c8225a0..d9cf943fcf 100644
--- a/resources/lang/es-MX/admin/statuslabels/message.php
+++ b/resources/lang/es-MX/admin/statuslabels/message.php
@@ -7,7 +7,7 @@ return [
     'assoc_assets'	 => 'Esta etiqueta de estado está actualmente asociada con al menos un activo y no se puede eliminar. Por favor actualice sus activos para que ya no hagan referencia a este estado e inténtelo de nuevo. ',
 
     'create' => [
-        'error'   => 'Etiqueta de estado no fue creada, por favor, inténtelo de nuevo.',
+        'error'   => 'La etiqueta de estado no pudo ser creada, por favor inténtelo de nuevo.',
         'success' => 'Etiqueta de estado fue creada exitosamente.',
     ],
 
@@ -23,9 +23,9 @@ return [
     ],
 
     'help' => [
-        'undeployable'   => 'Estos activos no pueden asignarse a nadie.',
+        'undeployable'   => 'Estos activos no pueden ser asignados.',
         'deployable'   => 'Estos activos pueden ser asignados. Una vez estén asignados, asumirán el meta estado de <i class="fas fa-circle text-blue"></i> <strong>Asignado</strong>.',
-        'archived'   => 'Estos equipos no pueden ser asignados y solo se mostrarán en la vista de Archivados. Esto es útil para mantener información de activos por razones de presupuesto o de revisión histórica y al mismo tiempo se excluyen de los activos que se pueden usar en el día a día.',
+        'archived'   => 'Estos activos no pueden ser asignados y solo se mostrarán en la vista de Archivados. Esto es útil para mantener información de activos por razones de presupuesto o de revisión histórica y al mismo tiempo se excluyen de los activos que se pueden usar en el día a día.',
         'pending'   => 'Estos activos aún no pueden asignarse, y suelen utilizarse para elementos que están en reparación, pero que se espera que regresen a circulación.',
     ],
 
diff --git a/resources/lang/es-MX/admin/statuslabels/table.php b/resources/lang/es-MX/admin/statuslabels/table.php
index f9f487f28d..05daeda180 100644
--- a/resources/lang/es-MX/admin/statuslabels/table.php
+++ b/resources/lang/es-MX/admin/statuslabels/table.php
@@ -1,19 +1,19 @@
 <?php
 
 return array(
-    'about'      	=> 'Acerca de las etiquetas de estado',
+    'about'      	=> 'About Status Types',
     'archived'      	=> 'Archivado',
     'create'      	=> 'Crear etiqueta de estado',
     'color'      	=> 'Color en el gráfico',
     'default_label' => 'Etiqueta predeterminada',
     'default_label_help' => 'Esto se usa para asegurar que sus etiquetas de estado que utiliza con más frecuencia aparezcan en la parte superior del cuadro de selección al crear / editar activos.',
     'deployable'      	=> 'Utilizable',
-    'info'      	=> 'Las etiquetas de estado se usan para describir los diferentes estados en que pueden estar sus equipos. Por ejemplo: en reparación, perdidos/robados, etc. Puede crear nuevas etiquetas de estado para equipos utilizables, pendientes o archivados.',
+    'info'      	=> 'Status label types are used to describe the various states your assets could be in. They may be out for repair, lost/stolen, etc. You can create new status labels for your deployable, pending and archived assets according to your own workflow. For more information, <a href="https://snipe-it.readme.io/docs/overview#status-labels" target="_blank">see the documentation <i class="fa fa-external-link"></i></a>.',
     'name'      	=> 'Nombre de estado',
     'pending'      	=> 'Pendiente',
     'status_type'   => 'Tipo de estado',
     'show_in_nav'   => 'Mostrar en la barra lateral',
     'title'      	=> 'Etiquetas de estado',
     'undeployable'  => 'No utilizable',
-    'update'      	=> 'Actualizar Etiqueta Estado',
+    'update'      	=> 'Actualizar la etiqueta de estado',
 );
diff --git a/resources/lang/es-MX/admin/suppliers/message.php b/resources/lang/es-MX/admin/suppliers/message.php
index d6f1924481..f7f243f442 100644
--- a/resources/lang/es-MX/admin/suppliers/message.php
+++ b/resources/lang/es-MX/admin/suppliers/message.php
@@ -3,26 +3,26 @@
 return array(
 
     'deleted' => 'Proveedor eliminado',
-    'does_not_exist' => 'Proveedor does not exist.',
+    'does_not_exist' => 'El proveedor no existe.',
 
 
     'create' => array(
-        'error'   => 'Proveedor no creado, Intentalo de nuevo.',
-        'success' => 'Proveedor creado.'
+        'error'   => 'El proveedor no fue creado, por favor inténtelo de nuevo.',
+        'success' => 'Proveedor creado con éxito.'
     ),
 
     'update' => array(
-        'error'   => 'Proveedor no actualizado, Intentalo de nuevo',
+        'error'   => 'El proveedor no fue actualizado, por favor inténtelo de nuevo',
         'success' => 'Proveedor actualizado.'
     ),
 
     'delete' => array(
         'confirm'   => '¿Está seguro de que desea eliminar este proveedor?',
-        'error'   => 'Ha habido un problema eliminando el Proveedor. Intentalo de nuevo.',
-        'success' => 'Proveedor eliminado.',
-        'assoc_assets'	 => 'Este proveedor esta asociado a uno o más modelos y no puede ser eliminado. ',
-        'assoc_licenses'	 => 'Este proveedor está actualmente asociado con :licenses_count licencia(s) y no puede ser eliminado. Por favor, actualiza tus licencias para no referenciar este proveedor e inténtalo de nuevo. ',
-        'assoc_maintenances'	 => 'Este proveedor está actualmente asociado con :asset_maintenances_count mantenedor(es) de activo y no puede ser eliminado. Por favor, actualiza tus mantenedores de activo para no referenciar este proveedor e inténtalo de nuevo. ',
+        'error'   => 'Hubo un problema al eliminar el proveedor, por favor inténtelo de nuevo.',
+        'success' => 'Proveedor eliminado correctamente.',
+        'assoc_assets'	 => 'Este proveedor está actualmente asociado con :asset_count activo(s) y no puede ser eliminado. Actualice sus activos para que ya no hagan referencia a este proveedor e inténtelo de nuevo. ',
+        'assoc_licenses'	 => 'Este proveedor está asociado actualmente con :licenses_count licences(s) y no puede ser eliminado. Por favor, actualice sus licencias para dejar de hacer referencia a este proveedor e inténtelo de nuevo. ',
+        'assoc_maintenances'	 => 'Este proveedor está actualmente asociado con :asset_maintainances_count mantenimiento(s) de activo(s) y no puede ser eliminado. Por favor, actualice el mantenimiento de sus activos para no hacer referencia a este proveedor y vuelva a intentarlo. ',
     )
 
 );
diff --git a/resources/lang/es-MX/admin/suppliers/table.php b/resources/lang/es-MX/admin/suppliers/table.php
index 02804f2fa8..b918b4f381 100644
--- a/resources/lang/es-MX/admin/suppliers/table.php
+++ b/resources/lang/es-MX/admin/suppliers/table.php
@@ -1,25 +1,25 @@
 <?php
 
 return array(
-    'about_suppliers_title' => 'Acerca de Proveedores',
-    'about_suppliers_text'  => 'Los Proveedores son utilizados para hacer seguimiento de la fuente de los items',
-    'address'               => 'Dirección del Proveedor',
-    'assets'                => 'Equipos',
+    'about_suppliers_title' => 'Acerca de los proveedores',
+    'about_suppliers_text'  => 'Los proveedores se utilizan para hacer seguimiento al origen de los elementos',
+    'address'               => 'Dirección del proveedor',
+    'assets'                => 'Activos',
     'city'                  => 'Ciudad',
-    'contact'               => 'Nombre Contacto',
+    'contact'               => 'Nombre de contacto',
     'country'               => 'País',
-    'create'                => 'Crear Proveedor',
+    'create'                => 'Crear un proveedor',
     'email'                 => 'Correo electrónico',
     'fax'                   => 'Fax',
     'id'                    => 'ID',
     'licenses'              => 'Licencias',
-    'name'                  => 'Nombre',
+    'name'                  => 'Nombre del proveedor',
     'notes'                 => 'Notas',
     'phone'                 => 'Teléfono',
     'state'                 => 'Provincia',
     'suppliers'             => 'Proveedores',
-    'update'                => 'Actualizar Proveedor',
-    'view'                  => 'Ver Proveedor',
+    'update'                => 'Actualizar proveedor',
+    'view'                  => 'Ver proveedor',
     'view_assets_for'       => 'Ver activos para',
     'zip'                   => 'Código postal',
 
diff --git a/resources/lang/es-MX/admin/users/general.php b/resources/lang/es-MX/admin/users/general.php
index a55161c6b5..db0c4cf95e 100644
--- a/resources/lang/es-MX/admin/users/general.php
+++ b/resources/lang/es-MX/admin/users/general.php
@@ -2,28 +2,30 @@
 
 return [
     'activated_help_text' => 'Este usuario puede iniciar sesión',
-    'activated_disabled_help_text' => 'No puedes editar el estado de activación para tu propia cuenta.',
-    'assets_user'       => 'Equipos asignados a :name',
+    'activated_disabled_help_text' => 'No puede editar el estado de activación de su propia cuenta.',
+    'assets_user'       => 'Activos asignados a :name',
     'bulk_update_warn'	=> 'Está a punto de modificar las propiedades de :user_count usuarios. Por favor, tenga en cuenta que no puede modificar las propiedades de su propio usuario con este formulario, y debe realizar las modificaciones a su propio usuario de forma individual.',
-    'bulk_update_help'	=> 'Este formulario permite actualizar múltiples usuarios simultáneamente. Rellena únicamente los campos que necesites cambiar. Cualquier campo que quede en blanco no se actualizará.',
-    'current_assets'    => 'Equipos checked out a este usuario',
-    'clone'             => 'Clonar Usuario',
-    'contact_user'      => 'Contacta con :name',
-    'edit'              => 'Editar Usuario',
+    'bulk_update_help'	=> 'Este formulario le permite actualizar varios usuarios a la vez. Solo diligencie los campos que necesita modificar. Los campos que queden en blanco no se modificarán.',
+    'current_assets'    => 'Activos actualmente asignados a este usuario',
+    'clone'             => 'Clonar usuario',
+    'contact_user'      => 'Contacto :name',
+    'edit'              => 'Editar usuario',
     'filetype_info'     => 'Tipos de archivos permitidos son png, gif, jpg, jpeg, doc, docx, pdf, txt, zip, y rar.',
     'history_user'      => 'Historial de :name',
     'info'				=> 'Información',
     'restore_user'		=> 'Haga clic aquí para restaurarlos.',
     'last_login'        => 'Último acceso',
-    'ldap_config_text'  => 'Las configuraciones de LDAP estàn en: Admin -> Settings. La ubicaciòn seleccionadada sera asignada a todos los usuarios importados.',
+    'ldap_config_text'  => 'Los ajustes de configuración para LDAP se pueden encontrar en Administrador> LDAP. La ubicación (opcional) seleccionada se establecerá para todos los usuarios importados.',
     'print_assigned'    => 'Imprimir todos los asignados',
     'email_assigned'    => 'Enviar correo con todos los asignados',
-    'user_notified'     => 'Se ha enviado al usuario un correo con la lista de sus articulos asignados.',
+    'user_notified'     => 'Se ha enviado al usuario un correo electrónico con lista de los elementos que tiene asignados actualmente.',
+    'users_notified'    => 'El usuario ha recibido un correo electrónico con una lista de sus artículos asignados actualmente.|:count usuarios han recibido una lista de los artículos asignados actualmente.',
+    'users_notified_warning' => ':count usuario ha sido enviado por correo electrónico una lista de sus elementos asignados actualmente, Sin embargo, los usuarios de :no_email no tenían una dirección de correo electrónico, por lo que no se pudo enviar por correo electrónico. :count usuarios han sido enviados por correo electrónico a una lista de sus elementos actualmente asignados, Sin embargo, el usuario de :no_email no tenía una dirección de correo electrónico, por lo que no se pudo enviar por correo electrónico.',
     'auto_assign_label' => 'Incluye a este usuario al asignar automáticamente licencias elegibles',
     'auto_assign_help'  => 'Omitir este usuario en la asignación automática de licencias',
     'software_user'     => 'Software asignado a :name',
     'send_email_help'   => 'Debe proporcionar una dirección de correo electrónico para este usuario para poder enviarle las credenciales. Únicamente pueden enviarse las credenciales por correo eléctronico durante la creación del usuario. Las contraseñas se almacenan en un hash de un solo sentido y no se pueden recuperar una vez guardadas.',
-    'view_user'         => 'Ver Usuario :name',
+    'view_user'         => 'Ver usuario :name',
     'usercsv'           => 'Archivo CSV',
     'two_factor_admin_optin_help' => 'La configuración actual permite la aplicación selectiva de la autenticación de dos factores.  ',
     'two_factor_enrolled' => 'Dispositivo con 2FA inscrito ',
@@ -35,9 +37,9 @@ return [
     'superadmin_permission_warning' => 'Solo los superadmins pueden conceder acceso de superadmin a un usuario.',
     'admin_permission_warning' => 'Solo los usuarios con derechos administrativos o superiores pueden conceder acceso administrativo a un usuario.',
     'remove_group_memberships' => 'Remover membresías de grupo',
-    'warning_deletion_information' => 'Está a punto de devolver TODOS los elementos de :count usuario(s) listados a continuación. Los nombres de usuarios con permisos Super Administrador están resaltados en rojo.',
-    'update_user_assets_status' => 'Actualizar todos los recursos para estos usuarios a este estado',
-    'checkin_user_properties' => 'Recibir todas las propiedades asociadas con estos usuarios',
+    'warning_deletion_information' => 'Está a punto de ingresar TODOS los elementos de :count usuario(s) listados a continuación. Los nombres de usuarios con permisos Super Administrador están resaltados en rojo.',
+    'update_user_assets_status' => 'Actualizar todos los activos para estos usuarios a este estado',
+    'checkin_user_properties' => 'Comprobar todas las propiedades asociadas a estos usuarios',
     'remote_label'   => 'Este es un usuario remoto',
     'remote'   => 'Remoto',
     'remote_help' => 'Esto puede ser útil si necesita filtrar por usuarios remotos que nunca o raramente asisten a sus ubicaciones físicas.',
@@ -46,9 +48,9 @@ return [
     'vip_help' => 'Esto puede ser útil como indicador de personas importantes en su organización si desea tratarlas de forma especial.',
     'create_user' => 'Crear Usuario',
     'create_user_page_explanation' => 'Esta es la información de la cuenta que usará para acceder al sitio por primera vez.',
-    'email_credentials' => 'Credenciales de email',
-    'email_credentials_text' => 'Enviar mis credenciales a la dirección de correo de arriba',
+    'email_credentials' => 'Credenciales de correo electrónico',
+    'email_credentials_text' => 'Enviar mis credenciales a la dirección de correo electrónico de arriba',
     'next_save_user' => 'Siguiente: Guardar usuario',
     'all_assigned_list_generation' => 'Generado el:',
-    'email_user_creds_on_create' => '¿Enviar a este usuario sus credenciales?',
+    'email_user_creds_on_create' => '¿Enviar las credenciales por correo electrónico a este usuario?',
 ];
diff --git a/resources/lang/es-MX/admin/users/message.php b/resources/lang/es-MX/admin/users/message.php
index f4e188423e..0da2872e55 100644
--- a/resources/lang/es-MX/admin/users/message.php
+++ b/resources/lang/es-MX/admin/users/message.php
@@ -3,10 +3,10 @@
 return array(
 
     'accepted'                  => 'Ha aceptado este artículo exitosamente.',
-    'declined'                  => 'Ha declinado con éxito este equipo.',
-    'bulk_manager_warn'	        => 'Sus usuarios han sido actualizados con éxito, sin embargo, la entrada de administrador no fue guardada porque el gerente seleccionado también estaba en la lista de usuarios a ser editada, y los usuarios no pueden ser sus propios gerentes. Vuelva a seleccionar los usuarios, excluyendo al gerente.',
-    'user_exists'               => 'El Usuario ya existe!',
-    'user_not_found'            => 'El usuario no existe.',
+    'declined'                  => 'Ha rechazado correctamente este activo.',
+    'bulk_manager_warn'	        => 'Sus usuarios han sido actualizados con éxito, sin embargo, la entrada supervisor (manager) no fue guardada porque el supervisor seleccionado también estaba en la lista de usuarios a editar, y los usuarios no pueden ser su propio supervisor. Vuelva a seleccionar los usuarios, excluyendo al supervisor.',
+    'user_exists'               => '¡El usuario ya existe!',
+    'user_not_found'            => 'El usuario no existe o usted no tiene permisos para verlo.',
     'user_login_required'       => 'El campo usuario es obligatorio',
     'user_has_no_assets_assigned' => 'No hay activos asignados al usuario.',
     'user_password_required'    => 'La contraseña es obligatoria.',
@@ -16,7 +16,7 @@ return array(
     'password_resets_sent'      => 'Los usuarios seleccionados que están activados y tienen una dirección de correo electrónico válida han sido enviados un enlace de restablecimiento de contraseña.',
     'password_reset_sent'       => '¡Se ha enviado un enlace de restablecimiento de contraseña a :email!',
     'user_has_no_email'         => 'Este usuario no tiene una dirección de correo electrónico en su perfil.',
-    'log_record_not_found'        => 'No se pudo encontrar un registro de registro coincidente para este usuario.',
+    'log_record_not_found'        => 'No se pudo encontrar un registro de eventos que coincida con este usuario.',
 
 
     'success' => array(
@@ -33,14 +33,14 @@ return array(
     ),
 
     'error' => array(
-        'create' => 'Ha habido un problema creando el Usuario. Intentalo de nuevo.',
-        'update' => 'Ha habido un problema actualizando el Usuario. Intentalo de nuevo.',
-        'delete' => 'Ha habido un problema eliminando el  Usuario. Intentalo de nuevo.',
-        'delete_has_assets' => 'Este usuario tiene elementos asignados y no se pueden eliminar.',
-        'delete_has_assets_var' => 'Este usuario todavía tienen un activo asignado. Por favor devuélvalo primero.| Este usuario todavía tienen :count activos asignados. Por favor devuélvalos primero.',
-        'delete_has_licenses_var' => 'Este usuario todavía tiene una licencia asignada. Por favor primero haga su devolución.|Este usuario todavía tiene :count licencias asignadas. Por favor primero haga su devolución.',
-        'delete_has_accessories_var' => 'Este usuario todavía tiene un accesorio asignado. Por favor primero haga su devolución.|Este usuario todavía tiene :count accesorios asignados. Por favor primero haga su devolución.',
-        'delete_has_locations_var' => 'Este usuario todavía supervisa una ubicación. Por favor seleccione otro supervisor primero.|Este usuario todavía supervisa :count ubicaciones. Por favor seleccione otro supervisor primero.',
+        'create' => 'Hubo un problema al crear el usuario. Por favor, inténtelo de nuevo.',
+        'update' => 'Hubo un problema al actualizar el usuario. Por favor, inténtelo de nuevo.',
+        'delete' => 'Hubo un problema al eliminar el usuario. Por favor, inténtelo de nuevo.',
+        'delete_has_assets' => 'Este usuario tiene elementos asignados y no se pudo eliminar.',
+        'delete_has_assets_var' => 'Este usuario todavía tiene un activo asignado. Por favor ingréselo primero.|Este usuario todavía tiene :count activos asignados. Por favor ingréselos primero.',
+        'delete_has_licenses_var' => 'Este usuario todavía tiene una licencia asignada. Por favor ingrésela primero.|Este usuario todavía tiene :count licencias asignadas. Por favor ingréselas primero.',
+        'delete_has_accessories_var' => 'Este usuario todavía tiene un accesorio asignado. Por favor ingréselo primero.|Este usuario todavía tiene :count accesorios asignados. Por favor ingréselos primero.',
+        'delete_has_locations_var' => 'Este usuario todavía supervisa una ubicación. Por favor primero seleccione otro supervisor.|Este usuario todavía supervisa :count ubicaciones. Por favor primero seleccione otro supervisor.',
         'delete_has_users_var' => 'Este usuario todavía supervisa a otro usuario. Por favor primero seleccione otro supervisor para ese usuario.|Este usuario todavía supervisa :count usuarios. Por favor primero seleccione otro supervisor para ellos.',
         'unsuspend' => 'Ha habido un problema marcando como no suspendido el Usuario. Intentalo de nuevo.',
         'import'    => 'Ha habido un problema importando los usuarios. Por favor intente nuevamente.',
@@ -48,23 +48,24 @@ return array(
         'accept_or_decline' => 'Debe aceptar o rechazar este equipo.',
         'cannot_delete_yourself' => 'Nos sentiríamos muy mal si usted se eliminara, por favor reconsidérelo.',
         'incorrect_user_accepted' => 'El elemento que ha intentado aceptar no fue asignado a usted.',
-        'ldap_could_not_connect' => 'No se ha podido conectar con el servidor LDAP. Por favor verifique la configuración de su servidor LDAP en su archivo de configuración.<br> Error del servidor LDAP:',
-        'ldap_could_not_bind' => 'No se ha podido vincular con el servidor LDAP. Por favor verifique la configuración de su servidor LDAP en su archivo de configuración.<br> Error del servidor LDAP: ',
-        'ldap_could_not_search' => 'No se ha podido buscar en el servidor LDAP. Por favor verifique la configuración de su servidor LDAP en su archivo de configuración.<br> Error del servidor LDAP:',
+        'ldap_could_not_connect' => 'No se pudo conectar al servidor LDAP. Por favor, compruebe la configuración del servidor LDAP en el archivo de configuración LDAP. <br>Error del servidor LDAP:',
+        'ldap_could_not_bind' => 'No se ha podido vincular al servidor LDAP. Por favor verifique la configuración de su servidor LDAP en su archivo de configuración.<br> Error del servidor LDAP: ',
+        'ldap_could_not_search' => 'No se pudo buscar en el servidor LDAP. Por favor, compruebe la configuración del servidor LDAP en el archivo de configuración LDAP. <br>Error del servidor LDAP:',
         'ldap_could_not_get_entries' => 'No se han podido obtener entradas del servidor LDAP. Por favor verifique la configuración de su servidor LDAP en su archivo de configuración.<br> Error del servidor LDAP:',
         'password_ldap' => 'La contraseña para esta cuenta es administrada por LDAP / Active Directory. Póngase en contacto con su departamento de TI para cambiar su contraseña.',
+        'multi_company_items_assigned' => 'Este usuario tiene elementos asignados que pertenecen a una empresa diferente. Por favor, ingréselos o edite su empresa.'
     ),
 
     'deletefile' => array(
-        'error'   => 'Archivo no eliminado. Por favor, vuelva a intentarlo.',
+        'error'   => 'El archivo no fue borrado. Por favor, inténtelo de nuevo.',
         'success' => 'Archivo eliminado correctamente.',
     ),
 
     'upload' => array(
         'error'   => 'Archivo(s) no cargado. Por favor, vuelva a intentarlo.',
         'success' => 'Archivo(s) cargado correctamente.',
-        'nofiles' => 'No ha seleccionado ningún archivo para subir',
-        'invalidfiles' => 'Uno o más sus archivos es demasiado grande o es de un tipo no permitido. Los tipos de archivo permitidos son png, gif, jpg, doc, docx, pdf y txt.',
+        'nofiles' => 'No seleccionó ningún archivo para cargar',
+        'invalidfiles' => 'Uno o más de sus archivos son demasiado grandes o son de un tipo de archivo que no está permitido. Los tipos de archivo permitidos son png, gif, jpg, doc, docx, pdf y txt.',
     ),
 
     'inventorynotification' => array(
diff --git a/resources/lang/es-MX/admin/users/table.php b/resources/lang/es-MX/admin/users/table.php
index 689a978867..a92ca81dcb 100644
--- a/resources/lang/es-MX/admin/users/table.php
+++ b/resources/lang/es-MX/admin/users/table.php
@@ -3,26 +3,26 @@
 return array(
     'activated'  			=> 'Activo',
     'allow'  				=> 'Permitir',
-    'checkedout'  			=> 'Equipos',
+    'checkedout'  			=> 'Activos',
     'created_at' 			=> 'Creado',
-    'createuser' 			=> 'Crear Usuario',
+    'createuser' 			=> 'Crear usuario',
     'deny'  				=> 'Denegar',
     'email'      			=> 'Correo electrónico',
     'employee_num'      	=> 'No. Empleado',
     'first_name' 			=> 'Nombre',
-    'groupnotes'			=> 'Selecciona un grupo para asignar al usuario, recuerda que un usuario toma los permisos del grupo al que están asignados. Usa ctrl+clic (o cmd+clic en MacOS) para deseleccionar grupos.',
-    'id'         			=> 'ID',
+    'groupnotes'			=> 'Seleccione un grupo para asignar al usuario, recuerde que un usuario asume los permisos del grupo al que se le asigna. Use ctrl+click (o cmd+click en MacOS) para anular la selección de grupos.',
+    'id'         			=> 'Id',
     'inherit'  				=> 'Hereda de',
     'job' 					=> 'Cargo',
-    'last_login'  			=> 'Ultimo Login',
+    'last_login'  			=> 'Último inicio de sesión',
     'last_name'  			=> 'Apellidos',
     'location'  			=> 'Ubicación',
-    'lock_passwords'		=> 'Los detalles de acceso no pueden ser cambiados en esta instalación.',
+    'lock_passwords'		=> 'Los detalles de inicio de sesión no pueden ser cambiados en esta instalación.',
     'manager' 				=> 'Supervisor',
     'managed_locations'     => 'Ubicaciones gestionadas',
     'managed_users'         => 'Usuarios gestionados',
-    'name' 					=> 'Usuario',
-    'nogroup'               => 'Aún no se han creado grupos. Para añadir uno, visite: ',
+    'name' 					=> 'Nombre',
+    'nogroup'               => 'Aún no se han creado grupos. Para añadir uno, visite:',
     'notes'                 => 'Notas',
     'password_confirm' 		=> 'Confirmar Password',
     'password' 				=> 'Contraseña',
@@ -31,11 +31,11 @@ return array(
     'show_deleted'          => 'Mostrar usuarios eliminados',
     'title' 				=> 'Cargo',
 	'to_restore_them'		=> 'para restaurarlos.',
-    'total_assets_cost'     => "Coste total de activos",
-    'updateuser' 			=> 'Actualizar Usuario',
-    'username' 				=> 'Usuario',
+    'total_assets_cost'     => "Costo total de activos",
+    'updateuser' 			=> 'Actualizar usuario',
+    'username' 				=> 'Nombre de usuario',
 	'user_deleted_text' 	=> 'Este usuario ha sido marcado como eliminado.',
     'username_note' 		=> '(Esto se usa solo para la conexión con Active Directory, no para el inicio de sesión.)',
-    'cloneuser'             => 'Clonar Usuario',
-    'viewusers' 			=> 'Ver Usuarios',
+    'cloneuser'             => 'Clonar usuario',
+    'viewusers' 			=> 'Ver usuarios',
 );
diff --git a/resources/lang/es-MX/auth.php b/resources/lang/es-MX/auth.php
index 6b155e9cb1..1531735a0e 100644
--- a/resources/lang/es-MX/auth.php
+++ b/resources/lang/es-MX/auth.php
@@ -14,7 +14,7 @@ return array(
     */
 
     'failed' => 'Estas credenciales no coinciden con nuestros registros.',
-    'password' => 'El nombre de usuario o contraseña es incorrecta.',
-    'throttle' => 'Demasiados intentos de inicio de sesión. Por favor, inténtalo de nuevo en :seconds segundos.',
+    'password' => 'La contraseña proporcionada es incorrecta.',
+    'throttle' => 'Demasiados intentos de inicio de sesión fallidos. Por favor, intente otra vez en :minutes minuto(s).',
 
 );
diff --git a/resources/lang/es-MX/auth/general.php b/resources/lang/es-MX/auth/general.php
index db35275e42..1f56aa644d 100644
--- a/resources/lang/es-MX/auth/general.php
+++ b/resources/lang/es-MX/auth/general.php
@@ -2,17 +2,17 @@
 
 return [
     'send_password_link'	        => 'Enviar enlace de restablecimiento de contraseña',
-    'email_reset_password'			=> 'Enviar correo',
-    'reset_password'			    => 'Restablecer Contraseña',
+    'email_reset_password'			=> 'Enviar correo electrónico para restablecer la contraseña',
+    'reset_password'			    => 'Restablecer contraseña',
     'saml_login'                    => 'Iniciar sesión a través de SAML',
-    'login'                         => 'Iniciar Sesión',
+    'login'                         => 'Iniciar sesión',
     'login_prompt'                  => 'Por favor inicie sesión',
-    'forgot_password'               => 'He olvidado mi contraseña',
+    'forgot_password'               => 'Olvidé mi contraseña',
     'ldap_reset_password'           => 'Haga clic aquí para restablecer su contraseña LDAP',
     'remember_me'                   => 'Recordarme',
     'username_help_top'                 => 'Ingrese su <strong>nombre de usuario</strong> para enviar un enlace de restablecimiento de contraseña.',
     'username_help_bottom'          => 'Su nombre de usuario y correo electrónico <em>pueden</em> ser el mismo, pero puede que no lo sean, dependiendo de su configuración. Si no recuerda su nombre de usuario, contacte al administrador. <br><br><strong>A los nombres de usuario que no tengan un correo electrónico asociado, no se les enviará el enlace de cambio de contraseña.</strong> ',
     'google_login'                  => 'Iniciar sesión con Google Workspace',
-    'google_login_failed'           => 'Error al iniciar sesión en Google. Vuelve a intentarlo.',
+    'google_login_failed'           => 'Error al iniciar sesión en Google, por favor, vuelva a intentarlo.',
 ];
 
diff --git a/resources/lang/es-MX/auth/message.php b/resources/lang/es-MX/auth/message.php
index 2d48b87fa1..80370f0f78 100644
--- a/resources/lang/es-MX/auth/message.php
+++ b/resources/lang/es-MX/auth/message.php
@@ -2,45 +2,43 @@
 
 return array(
 
-    'account_already_exists' => 'Ya existe un usuario con este e-mail.',
-    'account_not_found'      => 'El nombre de usuario o contraseña es incorrecta.',
-    'account_not_activated'  => 'Este usuario no está activado.',
-    'account_suspended'      => 'Este usuario está desactivado.',
-    'account_banned'         => 'Este usuario ha sido expulsado.',
-    'throttle'               => 'Demasiados intentos fallidos de inicio de sesión. Por favor, inténtalo de nuevo en :minutes minutos.',
+    'account_already_exists' => 'Ya existe una cuenta con este correo electrónico.',
+    'account_not_found'      => 'El nombre de usuario o la contraseña son incorrectos.',
+    'account_not_activated'  => 'Esta cuenta de usuario no está activada.',
+    'account_suspended'      => 'Esta cuenta de usuario está suspendida.',
 
     'two_factor' => array(
         'already_enrolled'      => 'Su dispositivo ya está inscrito.',
-        'success'               => '¡Hola! Haz iniciado sesión correctamente.',
-        'code_required'         => 'El código de dos factores es necesario.',
+        'success'               => 'Ha iniciado sesión exitosamente.',
+        'code_required'         => 'Se requiere el código de autenticación de doble factor (2FA).',
         'invalid_code'          => 'El código de dos factores no es válido.',
-        'enter_two_factor_code' => 'Please enter your two-factor authentication code.',
-        'please_enroll'         => 'Please enroll a device in two-factor authentication.',
+        'enter_two_factor_code' => 'Por favor ingrese su código de autenticación de doble factor.',
+        'please_enroll'         => 'Por favor inscriba un dispositivo en la autenticación de dos factores.',
     ),
 
     'signin' => array(
-        'error'   => 'Ha habido un problema al iniciar sesión. Por favor, vuelve a intentarlo.',
-        'success' => 'has iniciado sesión correctamente.',
+        'error'   => 'Ha habido un problema al iniciar sesión. Por favor, inténtelo de nuevo.',
+        'success' => 'Ha iniciado sesión exitosamente.',
     ),
 
     'logout' => array(
         'error'   => 'Hubo un problema al intentar cerrar la sesión, por favor inténtelo de nuevo.',
-        'success' => 'Se ha cerrado sesión correctamente.',
+        'success' => 'Ha cerrado la sesión exitosamente.',
     ),
 
     'signup' => array(
-        'error'   => 'Ha habido un problema al crear la cuenta. Por favor, vuelve a intentarlo.',
+        'error'   => 'Hubo un problema al crear la cuenta. Por favor, inténtelo de nuevo.',
         'success' => 'Cuenta creada correctamente.',
     ),
 
     'forgot-password' => array(
-        'error'   => 'Ha habido un problema al intentar resetear el password. Por favor, vuelve a intentarlo.',
+        'error'   => 'Ha habido un problema al obtener un código de restablecimiento de la contraseña. Por favor, inténtelo de nuevo.',
         'success' => 'Si esa dirección de correo electrónico existe en nuestro sistema, se ha enviado un correo electrónico de recuperación de contraseña.',
     ),
 
     'forgot-password-confirm' => array(
-        'error'   => 'Ha habido un problema al intentar resetear el password. Por favor, vuelve a intentarlo.',
-        'success' => 'El password ha sido reseteado correctamente.',
+        'error'   => 'Hubo un problema al intentar restablecer su contraseña, por favor, inténtelo de nuevo.',
+        'success' => 'Su contraseña se ha restablecido correctamente.',
     ),
 
 
diff --git a/resources/lang/es-MX/button.php b/resources/lang/es-MX/button.php
index f2b9102492..0390df8217 100644
--- a/resources/lang/es-MX/button.php
+++ b/resources/lang/es-MX/button.php
@@ -4,21 +4,31 @@ return [
     'actions' 	                => 'Acciones',
     'add'    	                => 'Agregar nuevo',
     'cancel'                    => 'Cancelar',
-    'checkin_and_delete'  	    => 'Devolver todo / Eliminar usuario',
+    'checkin_and_delete'  	    => 'Ingresar todo / Eliminar usuario',
     'delete'  	                => 'Borrar',
     'edit'    	                => 'Editar',
+    'clone'    	                => 'Clonar',
     'restore' 	                => 'Restaurar',
     'remove'                    => 'Eliminar',
     'request'                   => 'Solicitud',
     'submit'  	                => 'Enviar',
     'upload'                    => 'Cargar',
-    'select_file'				=> 'Seleccione un archivo...',
+    'select_file'				=> 'Seleccionar Archivo...',
     'select_files'				=> 'Seleccionar archivos...',
-    'generate_labels'           => '{1} Generar Etiqueta|[2,*] Generar Etiquetas',
-    'send_password_link'        => 'Enviar enlace de restablecimiento de contraseña',
+    'generate_labels'           => '{1} Generar etiqueta|[2,*] Generar etiquetas',
+    'send_password_link'        => 'Enviar enlace para restablecer la contraseña',
     'go'                        => 'Ir',
     'bulk_actions'              => 'Acciones masivas',
     'add_maintenance'           => 'Añadir mantenimiento',
     'append'                    => 'Añadir',
     'new'                       => 'Nuevo',
+    'var' => [
+        'clone'     => 'Clonar :item_type',
+        'edit'      => 'Editar :item_type',
+        'delete'    => 'Eliminar :item_type',
+        'restore'   => 'Restaurar :item_type',
+        'create'    => 'Crear nuevo :item_type',
+        'checkout'  => 'Asignar :item_type',
+        'checkin'   => 'Ingresar :item_type',
+    ]
 ];
diff --git a/resources/lang/es-MX/general.php b/resources/lang/es-MX/general.php
index 01a53d4bcd..9a2351fbbd 100644
--- a/resources/lang/es-MX/general.php
+++ b/resources/lang/es-MX/general.php
@@ -1,7 +1,7 @@
 <?php
 
 return [
-    '2FA_reset'             => '2FA reset',
+    '2FA_reset'             => 'Restablecer 2FA',
     'accessories'			=> 'Accesorios',
     'activated'			    => 'Activado',
     'accepted_date'         => 'Fecha de aceptación',
@@ -10,63 +10,69 @@ return [
     'action'                => 'Acción',
     'activity_report'		=> 'Informe de actividad',
     'address'				=> 'Dirección',
-    'admin'					=> 'Admin',
+    'admin'					=> 'Configuración de administración',
     'admin_tooltip'			=> 'Este usuario tiene privilegios de superadministrador',
     'superuser'				=> 'Superusuario',
     'superuser_tooltip'		=> 'Este usuario es superadministrador',
     'administrator'			=> 'Administrator',
-    'add_seats'             => 'Sitios añadidos',
+    'add_seats'             => 'Licencias añadidas',
     'age'                   => "Edad",
-    'all_assets'			=> 'Todos los Equipos',
+    'all_assets'			=> 'Todos los activos',
     'all'       			=> 'Todos los',
     'archived'              => 'Archivado',
-    'asset_models'			=> 'Modelos',
+    'asset_models'			=> 'Modelos de activos',
     'asset_model'			=> 'Modelo',
-    'asset'					=> 'Equipo',
-    'asset_report'          => 'Reporte de Equipos',
-    'asset_tag'				=> 'Etiqueta de activo',
-    'asset_tags'            => 'Nombre Activo',
-    'assets_available'		=> 'Equipos disponibles',
+    'asset'					=> 'Activo',
+    'asset_previous'        => 'Activo (Asignado anteriormente)',
+    'asset_report'          => 'Informe de activos',
+    'asset_tag'				=> 'Placa del activo',
+    'asset_tags'            => 'Placas de activos',
+    'assets_available'		=> 'Activos disponibles',
     'accept_assets'         => 'Aceptar activos :name',
     'accept_assets_menu'    => 'Aceptar activos',
-    'audit'				    => 'Auditoría',
+    'accept_item'           => 'Aceptar ítem',
+    'audit'				    => 'Auditar',
+    'audits'				=> 'Auditar',
     'audit_report'			=> 'Registro de auditoría',
-    'assets'				=> 'Equipos',
+    'assets'				=> 'Activos',
     'assets_audited'        => 'activos auditados',
-    'assets_checked_in_count'     => 'activos registrados',
-    'assets_checked_out_count'     => 'activos entregados',
+    'assets_checked_in_count'     => 'activos ingresados',
+    'assets_checked_out_count'     => 'activos asignados',
     'asset_deleted_warning'     => 'Este activo ha sido eliminado. Debe restaurarlo antes de poder asignarlo a alguien.',
-    'assigned_date'         => 'Fecha asignada',
+    'assigned_date'         => 'Fecha de asignación',
     'assigned_to'           => 'Asignado a :name',
     'assignee'              => 'Asignado a',
     'avatar_delete'         => 'Eliminar Avatar',
     'avatar_upload'         => 'Cargar Avatar',
-    'back'      			=> 'Atras',
-    'bad_data'      		=> 'Ningún resultado. ¿Quizá un dato incorrecto?',
+    'back'      			=> 'Atrás',
+    'bad_data'      		=> 'No se ha encontrado nada. ¿Tal vez datos erróneos?',
     'bulkaudit'             => 'Auditoría masiva',
-    'bulkaudit_status'      => 'Estado de auditoría',
+    'bulkaudit_status'      => 'Estado de la auditoría',
     'bulk_checkout'  		=> 'Asignación masiva',
-    'bulk_edit'             => 'Editar en grupo',
-    'bulk_delete'           => 'Eliminar en grupo',
+    'bulk_edit'             => 'Edición masiva',
+    'bulk_delete'           => 'Borrado masivo',
     'bulk_actions'          => 'Acciones masivas',
-    'bulk_checkin_delete'   => 'Hacer Checkin / Eliminar usuarios en masa',
+    'bulk_checkin_delete'   => 'Ingresar elementos / Borrar usuarios',
     'byod'                  => 'BYOD',
     'byod_help'             => 'Este dispositivo es propiedad del usuario',
-    'bystatus'              => 'por Estado',
+    'bystatus'              => 'por estado',
     'cancel'  				=> 'Cancelar',
     'categories'			=> 'Categorías',
     'category'				=> 'Categoría',
-    'change' 		        => 'Entrada / salida',
-    'changeemail'  			=> 'Cambiar Email',
-    'changepassword'  		=> 'Cambiar Password',
-    'checkin'  				=> 'Devolver',
-    'checkin_from'  		=> 'Devolución de',
+    'change' 		        => 'Entrada/Salida',
+    'changeemail'  			=> 'Cambiar dirección de correo electrónico',
+    'changepassword'  		=> 'Cambiar contraseña',
+    'checkin'  				=> 'Ingresar',
+    'checkin_from'  		=> 'Ingreso proveniente de',
+    'checkin_note'  		=> 'Nota sobre el ingreso',
+    'checkout_note'  		=> 'Checkout Note',
     'checkout'  			=> 'Asignar',
     'checkouts_count'       => 'Asignaciones',
-    'checkins_count'        => 'Devoluciones',
-    'user_requests_count'   => 'Requests',
+    'checkins_count'        => 'Ingresos',
+    'checkin_and_delete'  	=> 'Ingresar y borrar',
+    'user_requests_count'   => 'Solicitudes',
     'city'  				=> 'Ciudad',
-    'click_here'			=> 'Pulsa aquí',
+    'click_here'			=> 'Haga clic aquí',
     'clear_selection'		=> 'Borrar selección',
     'companies'			    => 'Compañías',
     'company'				=> 'Compañía',
@@ -77,30 +83,32 @@ return [
     'consumables'			=> 'Consumibles',
     'country'  				=> 'País',
     'could_not_restore'     => 'Error al restaurar :item_type: :error',
-    'not_deleted'           => 'El :item_type no está borrado por lo que no puede ser restaurado',
+    'not_deleted'           => 'El tipo :item_type no se ha borrado y, por lo tanto, no se puede restaurar',
     'create'				=> 'Crear nuevo',
     'created'               => 'Artículo creado',
-    'created_asset'			=> 'equipo creado',
+    'created_asset'			=> 'activo creado',
     'created_at' 			=> 'Fecha de creación',
     'created_by'            => 'Creado por',
     'record_created' 		=> 'Registro Creado',
-    'updated_at' 			=> 'Actualizado en',
-    'currency'  			=> '€', // this is deprecated
+    'updated_at' 			=> 'Actualizado el',
+    'currency'  			=> '$', // this is deprecated
+    'currency_text'  		=> 'Moneda', //
     'current'  				=> 'Actual',
     'current_password'      => 'Contraseña actual',
     'customize_report'      => 'Personalizar informe',
     'custom_report'         => 'Informe personalizado de activos',
     'dashboard'				=> 'Tablero',
+    'data_source'           => 'Fuente de los datos',
     'days'      			=> 'días',
-    'days_to_next_audit'    => 'Días a la próxima auditoría',
-    'date'					=> 'Fecha Compra',
+    'days_to_next_audit'    => 'Días hasta la siguiente auditoría',
+    'date'					=> 'Fecha',
     'debug_warning'         => '¡Advertencia!',
-    'debug_warning_text'    => 'Esta aplicación esta corriendo en modo producción con debugging activado. Esto puede exponer datos sensibles si su aplicación es accesible desde el exterior. Desactive el modo debug cambiando el valor <code>APP_DEBUG</code> en su archivo <code>.env</code> a <code>false</code>.',
+    'debug_warning_text'    => 'Esta aplicación se está ejecutando en modo producción con depuración habilitada. Esto puede exponer datos sensibles si su aplicación es accedida desde el mundo exterior. Deshabilite el modo de depuración configurando el valor <code>APP_DEBUG</code> en su archivo <code>.env</code> a <code>false</code>.',
     'delete'  				=> 'Borrar',
     'delete_confirm'  		=> '¿Está seguro de que desea eliminar :item?',
     'delete_confirm_no_undo' => '¿Está seguro de que desea eliminar :item? Esto no se puede deshacer.',
     'deleted'  				=> 'Borrado',
-    'delete_seats'  		=> 'Asientos eliminados',
+    'delete_seats'  		=> 'Licencias eliminadas',
     'deletion_failed'       => 'Error al eliminar',
     'departments'           => 'Departamentos',
     'department'            => 'Departamento',
@@ -112,34 +120,18 @@ return [
     'download'				=> 'Descargar',
     'download_all'		    => 'Descargar todo',
     'editprofile'  			=> 'Editar perfil',
-    'eol'					=> 'EOL',
+    'eol'					=> 'Fin de soporte (EOL)',
     'email_domain'			=> 'Dominio de correo electrónico',
-    'email_format'			=> 'Formato de correo electrónico',
     'employee_number'       => 'Número de empleado',
-    'email_domain_help'		=> 'Esto se utiliza para generar direcciones de correo electrónico cuando se importan',
+    'email_domain_help'		=> 'Se utiliza para generar direcciones de correo electrónico al importar',
     'error'				    => 'Error',
     'exclude_archived'      => 'Excluir activos archivados',
     'exclude_deleted'       => 'Excluir activos eliminados',
     'example'				=> 'Ejemplo: ',
-    'filastname_format'			=> 'Inicial del nombre y apellido (jsmith@ejemplo.com)',
-    'firstname_lastname_format'	=> 'Nombre y apellido (jane.smith@ejemplo.com)',
-    'firstname_lastname_underscore_format' => 'Nombre y apellido (jane_smith@example.com)',
-    'lastnamefirstinitial_format' =>  'Apellido e inicial del nombre (smithj@example.com)',
-    'firstintial_dot_lastname_format' => 'Inicial del nombre y apellido (j.smith@ejemplo.com)',
-    'firstname_lastname_display'	=> 'Nombre y apellido (Jane Smith)',
-    'lastname_firstname_display'	=> 'Apellido y nombre (Smith Jane)',
-    'name_display_format'	=> 'Formato para mostrar nombres',
-    'first'					=> 'Primero',
-    'firstnamelastname'     => 'Nombre y apellido (janesmith@example.com)',
-    'lastname_firstinitial' => 'Apellido e inicial del nombre (smith_j@ejemplo.com)',
-    'firstinitial.lastname' => 'Inicial nombre y apellido (j.smith@ejemplo.com)',
-    'firstnamelastinitial'  => 'Nombre e inicial del apellido(janes@example.com)',
-    'lastnamefirstname'      => 'Apellido y nombre (smith.jane@example.com)',
-    'first_name'			=> 'Nombre',
-    'first_name_format'		=> 'Nombre (jane@ejemplo.com)',
+
     'files'                 => 'Archivos',
     'file_name'				=> 'Archivo',
-    'file_type'             => 'Tipo de Archivo',
+    'file_type'             => 'Tipo de archivo',
     'filesize'              => 'Tamaño del archivo',
     'file_uploads'			=> 'Carga de Archivos',
     'file_upload'           => 'Cargar archivo',
@@ -147,60 +139,65 @@ return [
     'generate_labels'       => 'Generar etiquetas',
     'github_markdown'      => 'Este campo acepta el <a href="https://help.github.com/articles/github-flavored-markdown/">formateo flavored de GitHub</a>.',
     'groups'				=> 'Grupos',
-    'gravatar_email'        => 'Gravatar Email',
-    'gravatar_url'          => '<a href="http://gravatar.com"><small>Cambia tu avatar en Gravatar.com</small></a>.',
+    'gravatar_email'        => 'Dirección de correo electrónico de Gravatar',
+    'gravatar_url'          => '<a href="http://gravatar.com"><small>Cambie su avatar en Gravatar.com</small></a>.',
     'history'  			    => 'Historial',
-    'history_for'  			=> 'Historial de',
-    'id'  					=> 'Id',
+    'history_for'  			=> 'Historial para',
+    'id'  					=> 'ID',
     'image'                 => 'Imagen',
     'image_delete'         	=> 'Borrar imagen',
     'include_deleted'       => 'Incluir activos eliminados',
     'image_upload'         	=> 'Cargar imagen',
-    'filetypes_accepted_help'    => 'El tipo de archivo aceptado es :types. El tamaño máximo permitido es :size.|Los tipos de archivo aceptados son :types. El tamaño máximo permitido es :size.',
-    'filetypes_size_help'   => 'El tamaño máximo de carga permitido es :size.',
-    'image_filetypes_help'  => 'Accepted filetypes are jpg, webp, png, gif, svg, and avif. Max upload size allowed is :size.',
+    'filetypes_accepted_help'    => 'El tipo de archivo aceptado es :types. El tamaño máximo permitido es :size.|Los tipos de archivo aceptados son :types. El tamaño máximo permitido para cargar es :size.',
+    'filetypes_size_help'   => 'El tamaño máximo permitido para cargar es :size.',
+    'image_filetypes_help'  => 'Los tipos de archivo aceptados son jpg, webp, png, gif, svg y avif. El tamaño máximo permitido es :size.',
     'unaccepted_image_type'  => 'No fue posible leer este archivo de imagen. Tipos de archivo aceptados son jpg, webp, png, gif y svg. El mimetype de este archivo es: :mimetype.',
     'import'         	    => 'Importar',
-    'import_this_file'      => 'Mapear campos y procesar este archivo',
-    'importing'         	=> 'Importando',
-    'importing_help'        => 'Puede importar activos, accesorios, licencias, componentes, consumibles y usuarios a través de un archivo CSV. <br><br>El CSV debe estar delimitado por comas y con formato de encabezados que coincidan con el archivo <a href="https://snipe-it.readme.io/docs/importing" target="_new">CSV de muestra en la documentación</a>.',
+    'import_this_file'      => 'Asociar campos y procesar este archivo',
+    'importing'         	=> 'Importar datos',
+    'importing_help'        => 'Puede importar activos, accesorios, licencias, componentes, consumibles y usuarios a través del archivo CSV. <br><br>El CSV debe estar delimitado por comas y formateado con encabezados que coincidan con los de los <a href="https://snipe-it.readme.io/docs/importing" target="_new">archivos CSV de muestra en la documentación</a>.',
     'import-history'        => 'Importar historial',
-    'asset_maintenance'        => 'Mantenimiento de Equipo',
+    'asset_maintenance'        => 'Mantenimiento de activos',
     'asset_maintenance_report' => 'Informe mantenimiento de activos',
     'asset_maintenances'       => 'Mantenimiento de activos',
-    'item'  				=> 'Item',
+    'item'  				=> 'Elemento',
     'item_name'             => 'Nombre del elemento',
     'import_file'  			=> 'importar archivo CSV',
     'import_type'  			=> 'Tipo de importación CSV',
     'insufficient_permissions' => '¡Permisos insuficientes!',
     'kits'       			=> 'Kits predefinidos',
-    'language'				=> 'Lenguaje',
+    'language'				=> 'Idioma',
     'last'					=> 'Último',
-    'last_login'            => 'Último acceso',
+    'last_login'            => 'Último inicio de sesión',
     'last_name'             => 'Apellidos',
+    'firstname_lastname_display'	=> 'Nombre y apellido (Jane Smith)',
+    'lastname_firstname_display'	=> 'Apellido y nombre (Smith Jane)',
+    'name_display_format'	=> 'Formato para mostrar el nombre',
+    'first'					=> 'Primero',
+    'first_name'			=> 'Nombre',
     'license'				=> 'Licencia',
     'license_report'        => 'Informe de licencias',
     'licenses_available'	=> 'Licencias disponibles',
     'licenses'				=> 'Licencias',
     'list_all'				=> 'Mostrar todos',
-    'loading'				=> 'Cargando... por favor espere....',
-    'lock_passwords'        => 'Este valor de campo no se guardará en una instalación de demostración.',
-    'feature_disabled'      => 'Esta característica se ha desactivado para la versión de demostración.',
+    'loading'				=> 'Cargando... por favor espere...',
+    'lock_passwords'        => 'El valor de este campo no se guardará en una instalación de demostración.',
+    'feature_disabled'      => 'Esta característica se ha desactivado para la instalación de demostración.',
     'location'              => 'Ubicación',
     'location_plural'        => 'Ubicación|Ubicaciones',
-    'locations'				=> 'Localizaciones',
-    'logo_size'				=> 'Los logotipos cuadrados se ven mejor con Logo + Texto. El tamaño máximo del Logo es 50px de alto x 500px de ancho.  ',
-    'logout'				=> 'Desconexión',
-    'lookup_by_tag'     => 'Buscar etiqueta de activo',
+    'locations'				=> 'Ubicaciones',
+    'logo_size'				=> 'Los logotipos cuadrados se ven mejor con Logo + Texto. El tamaño máximo del logo es 50px de alto x 500px de ancho.  ',
+    'logout'				=> 'Cerrar sesión',
+    'lookup_by_tag'     => 'Buscar placa del activo',
     'maintenances'          => 'Mantenimientos',
-    'manage_api_keys'       => 'Administrar claves API',
+    'manage_api_keys'       => 'Administrar las claves del API',
     'manufacturer'			=> 'Fabricante',
     'manufacturers'			=> 'Fabricantes',
-    'markdown'				=> 'Este campo permite <a href="https://help.github.com/articles/github-flavored-markdown/">Github con sabor a markdown</a>.',
+    'markdown'				=> 'Este campo permite <a href="https://help.github.com/articles/github-flavored-markdown/">markdown estilo Github</a>.',
     'min_amt'				=> 'Cantidad mínima',
     'min_amt_help'          => 'Número mínimo de elementos que deben estar disponibles antes de que se active una alerta. Deje la cantidad mínima en blanco si no desea recibir alertas de inventario bajo.',
     'model_no'				=> 'Modelo No.',
-    'months'				=> 'Meses',
+    'months'				=> 'meses',
     'moreinfo'				=> 'Más información',
     'name'					=> 'Nombre',
     'new_password'          => 'Nueva contraseña',
@@ -210,42 +207,50 @@ return [
     'audit_images_help'     => 'Puede encontrar imágenes de auditoría en la pestaña Historial del activo.',
     'no_email'              => 'No hay dirección de correo electrónico asociada a este usuario',
     'last_audit'		    => 'Última auditoría',
-    'new'					=> 'nuevo!',
+    'new'					=> '¡nuevo!',
     'no_depreciation'		=> 'No Amortizar',
-    'no_results'			=> 'Sin Resultados.',
+    'no_results'			=> 'No hay resultados.',
     'no'  					=> 'No',
     'notes'  				=> 'Notas',
+    'note_added'            => 'Nota agregada',
+    'options'				=> 'Opciones',
+    'preview'				=> 'Vista previa',
+    'add_note'              => 'Agregar nota',
+    'note_edited'            => 'Nota editada',
+    'edit_note'              => 'Editar nota',
+    'note_deleted'            => 'Nota eliminada',
+    'delete_note'              => 'Borrar nota',
     'order_number'          => 'Número de orden',
     'only_deleted'          => 'Solo activos eliminados',
     'page_menu'				=> 'Mostrando elementos de _MENU_',
-    'pagination_info'		=> 'Mostrando _START_ de _END_ de elementos _TOTAL_',
+    'pagination_info'		=> 'Mostrando _START_ a _END_ de _TOTAL_ elementos',
     'pending'				=> 'Pendientes',
-    'people'				=> 'Usuarios',
-    'per_page'				=> 'Resultados Por Pag',
+    'people'				=> 'Personas',
+    'per_page'				=> 'Resultados por página',
     'previous'				=> 'Previo',
     'processing'			=> 'Procesando',
     'profile'				=> 'Perfil',
-    'purchase_cost'                              => 'Precio Compra',
+    'purchase_cost'                              => 'Precio de compra',
     'purchase_date'         => 'Fecha de compra',
-    'qty'		            => 'Cant',
+    'qty'		            => 'Cantidad',
     'quantity'		        => 'Cantidad',
-    'quantity_minimum'      => 'Tiene :count artículos por debajo o casi por debajo de los niveles mínimos de cantidad',
-    'quickscan_checkin'  	=> 'Devolución rápida con escaneo',
-    'quickscan_checkin_status'  	=> 'Estado de devolución',
+    'quantity_minimum'      => 'Tiene un artículo por debajo o casi por debajo de los niveles de cantidad mínima|Tiene :count artículos por debajo o casi por debajo de los niveles de cantidad mínima',
+    'quickscan_checkin'  	=> 'Ingreso rápido con escaneo',
+    'quickscan_checkin_status'  	=> 'Resultado del ingreso',
     'ready_to_deploy'		=> 'Listo para asignar',
-    'recent_activity'		=> 'Actividad Reciente',
+    'recent_activity'		=> 'Actividad reciente',
     'remaining'             => 'Restante',
-    'remove_company'        => 'Eliminar asociación de la compañía',
+    'remove_company'        => 'Eliminar la asociación de la compañía',
     'reports'				=> 'Informes',
     'restored'				=> 'restaurado',
     'restore'				=> 'Restaurar',
     'requestable_models'    => 'Modelos disponibles para solicitar',
     'requestable_items'     => 'Artículos que se pueden solicitar',
     'requested'				=> 'Solicitado',
-    'requested_date'        => 'Fecha solicitada',
-    'requested_assets'      => 'Elementos solicitados',
-    'requested_assets_menu' => 'Elementos solicitados',
-    'request_canceled'      => 'Solicitud Cancelada',
+    'requested_date'        => 'Fecha de solicitud',
+    'requested_assets'      => 'Activos solicitados',
+    'requested_assets_menu' => 'Activos solicitados',
+    'request_canceled'      => 'Solicitud cancelada',
     'request_item'          => 'Solicitar este elemento',
     'external_link_tooltip' => 'Enlace externo a',
     'save'  				=> 'Guardar',
@@ -253,117 +258,119 @@ return [
     'select'				=> 'Seleccionar',
     'select_all'            => 'Seleccionar todo',
     'search'				=> 'Buscar',
-    'select_category'       => 'Seleccione una categoría',
-    'select_datasource' => 'Seleccione un datoscópico',
-    'select_department'     => 'Seleccione un departamento',
+    'select_category'       => 'Seleccionar una categoría',
+    'select_datasource' => 'Seleccione un origen de datos',
+    'select_department'     => 'Seleccionar un departamento',
     'select_depreciation'	=> 'Seleccionar un tipo de amortización',
-    'select_location'		=> 'Seleccione una ubicación',
-    'select_manufacturer'	=> 'Seleccione un fabricante',
-    'select_model'			=> 'Seleccione un modelo',
-    'select_supplier'		=> 'Seleccione un proveedor',
-    'select_user'			=> 'Seleccione un usuario',
+    'select_location'		=> 'Seleccionar una ubicación',
+    'select_manufacturer'	=> 'Seleccionar un fabricante',
+    'select_model'			=> 'Seleccionar un modelo',
+    'select_supplier'		=> 'Seleccionar un proveedor',
+    'select_user'			=> 'Seleccionar un usuario',
     'select_date'			=> 'Seleccione fecha (AAAA-MM-DD)',
-    'select_statuslabel'	=> 'Seleccione un estado',
-    'select_company'    	=> 'Seleccione una compañía',
+    'select_statuslabel'	=> 'Seleccionar un estado',
+    'select_company'    	=> 'Seleccionar una compañía',
     'select_asset'    		=> 'Seleccionar activo',
-    'settings'				=> 'Opciones',
-    'show_deleted'  		=> 'Mostrar Eliminado',
+    'settings'				=> 'Configuraciones',
+    'show_deleted'  		=> 'Mostrar eliminados',
     'show_current'  		=> 'Mostrar actual',
-    'sign_in'				=> 'Entrar',
+    'sign_in'				=> 'Iniciar sesión',
     'signature'             => 'Firma',
     'signed_off_by'         => 'Firmado por',
-    'skin'       			=> 'Tema',
+    'skin'       			=> 'Apariencia',
     'webhook_msg_note'        => 'Una notificación se enviará a través de webhook',
-    'webhook_test_msg'        => '¡Oh mira! ¡Parece que tu integración de :app con Snipe-IT está funcionando!',
-    'some_features_disabled' => 'MODO DE DEMOSTRACIÓN: Algunas funciones estan desactivadas para esta instalación.',
-    'site_name'				=> 'Sitio',
+    'webhook_test_msg'        => '¡Hola! ¡Parece que la integración de :app con Snipe-IT funciona!',
+    'some_features_disabled' => 'MODO DEMOSTRACIÓN: Algunas características están desactivadas para esta instalación.',
+    'site_name'				=> 'Nombre del sitio',
     'state'  				=> 'Provincia',
     'status_labels'			=> 'Etiquetas de estado',
-    'status'    			=> 'Estados',
+    'status_label'			=> 'Etiqueta de estado',
+    'status'    			=> 'Estado',
     'accept_eula'           => 'Acuerdo de aceptación',
+    'show_or_hide_eulas' => 'Mostrar/ocultar acuerdos de uso (EULAs)',
     'supplier'              => 'Proveedor',
     'suppliers'  			=> 'Proveedores',
-    'sure_to_delete'        => '¿Está seguro que desea eliminar',
+    'sure_to_delete'        => '¿Está seguro de que desea eliminar',
     'sure_to_delete_var'    => '¿Está seguro de que desea eliminar :item?',
     'delete_what'           => 'Eliminar :item',
     'submit'				=> 'Enviar',
-    'target'                => 'Objetivo',
-    'time_and_date_display' => 'Hora y fecha',
-    'total_assets'			=> 'Equipos',
+    'target'                => 'Destino',
+    'time_and_date_display' => 'Visualización de fecha y hora',
+    'total_assets'			=> 'activos',
     'total_licenses'		=> 'licencias totales',
-    'total_accessories'		=> 'total de accesorios',
-    'total_consumables'		=> 'total de consumibles',
+    'total_accessories'		=> 'accesorios totales',
+    'total_consumables'		=> 'consumibles totales',
     'type'  				=> 'Tipo',
     'undeployable'			=> 'No utilizable',
-    'unknown_admin'			=> 'Admin Desconocido',
-    'username_format'		=> 'Formato del nombre de usuario',
-    'username'              => 'Usuario',
+    'unknown_admin'			=> 'Administrador desconocido',
+    'username'              => 'Nombre de usuario',
     'update'                => 'Actualizar',
+    'updating_item' => 'Actualizando :item',
     'upload_filetypes_help'      => 'Los tipos de archivo permitidos son png, gif, jpg, jpeg, doc, docx, pdf, xls, xlsx, txt, lic, xml, zip, rtf y rar. El tamaño máximo permitido es :size.',
     'uploaded'              => 'Cargado',
     'user'					=> 'Usuario',
     'accepted'			    => 'aceptado',
-    'declined'			    => 'declinado',
+    'declined'			    => 'rechazado',
     'declined_note'         => 'Notas de rechazo',
     'unassigned'            => 'Sin asignar',
     'unaccepted_asset_report' => 'Activos no aceptados',
     'users'                 => 'Usuarios',
     'viewall'				=> 'Ver todos',
-    'viewassets'  			=> 'Ver elementos asignados',
+    'viewassets'  			=> 'Ver activos asignados',
     'viewassetsfor'         => 'Ver activos para :name',
     'website'               => 'Sitio web',
     'welcome'				=> 'Bienvenido, :name',
     'years'					=> 'años',
     'yes' 					=> 'Si',
     'zip'  					=> 'Código postal',
-    'noimage'				=> 'Imagen no subida o imagen no encontrada.',
+    'noimage'				=> 'No se cargó la imagen o no fue encontrada.',
     'file_does_not_exist'   => 'El archivo solicitado no existe en el servidor.',
     'file_upload_success'   => '¡Archivo cargado exitosamente!',
     'no_files_uploaded'     => '¡Archivo cargado exitosamente!',
     'token_expired'         => 'Su sesión ha caducado. Por favor, inténtelo de nuevo.',
     'login_enabled'         => 'Inicio de sesión activado',
-    'audit_due'             => 'Vence la auditoría',
-    'audit_due_days'        => 'Activos pendientes para auditoría dentro de :days día|Activos pendientes para auditoría dentro de :days días',
-    'checkin_due'           => 'Pendiente por devolver',
-    'checkin_overdue'       => 'Atrasado por devolver',
-    'checkin_due_days'      => 'Activos que deben ser devueltos dentro de :days día|Activos que deben ser devueltos dentro de :days días',
-    'audit_overdue'         => 'Atrasado para la auditoría',
+    'audit_due'             => 'Próximas auditorías',
+    'audit_due_days'        => '{}Assets Due or Overdue for Audit|[1]Assets Due or Overdue for Audit Within a Day|[2,*]Assets Due or Overdue for Audit Within :days Days',
+    'checkin_due'           => 'Próximos a ingresar',
+    'checkin_overdue'       => 'Devolución atrasada',
+    'checkin_due_days'      => '{}Due for Checkin|[1]Assets Due for Checkin Within :days Day|[2,*]Assets Due for Checkin Within :days Days',
+    'audit_overdue'         => 'Auditoría atrasada',
     'accept'                => 'Aceptar :asset',
     'i_accept'              => 'Acepto',
     'i_decline'             => 'Rechazo',
     'accept_decline'        => 'Aceptar/Rechazar',
-    'sign_tos'              => 'Firma abajo para indicar que estás de acuerdo con los términos de servicio:',
+    'sign_tos'              => 'Firme abajo para indicar que está de acuerdo con los términos de servicio:',
     'clear_signature'       => 'Borrar firma',
     'show_help'             => 'Mostrar ayuda',
     'hide_help'             => 'Ocultar ayuda',
-    'view_all'              => 'ver todo',
+    'view_all'              => 'ver todos',
     'hide_deleted'          => 'Ocultar eliminados',
     'email'                 => 'Correo electrónico',
     'do_not_change'         => 'No cambiar',
-    'bug_report'            => 'Reportar un error',
+    'bug_report'            => 'Reporte un error',
     'user_manual'           => 'Manual del usuario',
     'setup_step_1'          => 'Paso 1',
     'setup_step_2'          => 'Paso 2',
     'setup_step_3'          => 'Paso 3',
     'setup_step_4'          => 'Paso 4',
     'setup_config_check'    => 'Comprobar configuración',
-    'setup_create_database' => 'Crear Tablas de Base de Datos',
-    'setup_create_admin'    => 'Crear Usuario Admin',
-    'setup_done'            => '¡Finalizada!',
+    'setup_create_database' => 'Crear tablas de la base de datos',
+    'setup_create_admin'    => 'Crear un usuario administrador',
+    'setup_done'            => '¡Terminado!',
     'bulk_edit_about_to'    => 'Está a punto de editar lo siguiente: ',
     'checked_out'           => 'Asignado',
     'checked_out_to'        => 'Asignado a',
     'fields'                => 'Campos',
-    'last_checkout'         => 'Última Asignación',
-    'due_to_checkin'        => 'Los :count articulos a continuación están a la espera de ser ingresados pronto:',
-    'expected_checkin'      => 'Fecha esperada de ingreso',
-    'reminder_checked_out_items' => 'Este es un recordatorio de los artículos actualmente asignados a usted. Si cree que esta lista es incorrecta, (falta algo o algo que está aqui nunca fue recibido), por favor envie un email a :reply_to_name en :reply_to_address.',
+    'last_checkout'         => 'Última asignación',
+    'due_to_checkin'        => 'Los siguientes :count elementos están pendientes por ingresar pronto:',
+    'expected_checkin'      => 'Fecha esperada de devolución',
+    'reminder_checked_out_items' => 'Este es un recordatorio de los elementos que se le han asignado actualmente. Si usted cree que esta lista es incorrecta (falta algo o aparece algo que usted cree que nunca ha recibido), por favor envíe un correo electrónico a :reply_to_name a :reply_to_address.',
     'changed'               => 'Cambiado',
-    'to'                    => 'Para',
-    'report_fields_info'    => '<p>Seleccione los campos que desea incluir en su informe personalizado y haga clic en Generar. El archivo (custom-asset-report-YYYY-mm-dd.csv) se descargará automáticamente y puede abrirlo en Excel.</p>
+    'to'                    => 'A',
+    'report_fields_info'    => '<p>Seleccione los campos que desea incluir en su informe personalizado y haga clic en Generar. El archivo (custom-asset-report-YYYY-mm-dd.csv) se descargará automáticamente y podrá abrirlo en Excel.</p>
             <p>Si desea exportar sólo ciertos activos, utilice las siguientes opciones para afinar sus resultados.</p>',
     'range'                 => 'Rango',
-    'bom_remark'            => 'Añadir un BOM (signo de orden de byte) a este CSV',
+    'bom_remark'            => 'Añadir un BOM (marca de orden de bytes) a este CSV',
     'improvements'          => 'Mejoras',
     'information'           => 'Información',
     'permissions'           => 'Permisos',
@@ -373,9 +380,9 @@ return [
     'ldap_user_sync'        => 'Sincronización de usuario LDAP',
     'synchronize'           => 'Sincronizar',
     'sync_results'          => 'Resultados de sincronización',
-    'license_serial'        => 'Número de Serie/Clave de Producto',
-    'invalid_category'      => 'Categoría no válida o ausente',
-    'invalid_item_category_single' => 'Falta o no válida :type categoría. Por favor actualiza la categoría de este :type para incluir una categoría válida antes de salir.',
+    'license_serial'        => 'Número de serie/clave de producto',
+    'invalid_category'      => 'Categoría no válida o inexistente',
+    'invalid_item_category_single' => 'Falta o no es válida una categoría de tipo :type. Por favor, actualice la categoría de tipo :type para incluir una categoría válida antes de asignar.',
     'dashboard_info'        => 'Este es su panel de control. Hay muchos similares, pero este es suyo.',
     '60_percent_warning'    => '60% completo (advertencia)',
     'dashboard_empty'       => 'Parece que aún no ha añadido nada, así que no tenemos nada impresionante que mostrar. ¡Comience añadiendo algunos activos, accesorios, consumibles o licencias ahora!',
@@ -383,6 +390,8 @@ return [
     'new_license'           => 'Nueva licencia',
     'new_accessory'         => 'Nuevo accesorio',
     'new_consumable'        => 'Nuevo consumible',
+    'new_component'         => 'New Component',
+    'new_user'              => 'Nuevo usuario',
     'collapse'              => 'Contraer',
     'assigned'              => 'Asignado',
     'asset_count'           => 'Cantidad de activos',
@@ -402,61 +411,62 @@ return [
     'consumable_information' => 'Información del consumible:',
     'consumable_name'       => 'Nombre del Consumible:',
     'accessory_information' => 'Información del accesorio:',
-    'accessory_name'       => 'Nombre de accesorio:',
+    'accessory_name'       => 'Nombre del accesorio:',
     'clone_item'            => 'Clonar objeto',
     'checkout_tooltip' => 'Asignar este elemento',
-    'checkin_tooltip' => 'Devuelva este elemento para que esté disponible para resignar, borrar, etc.',
+    'checkin_tooltip' => 'Ingrese este elemento para que esté disponible para reasignar, borrar, etc.',
     'checkout_user_tooltip' => 'Asignar este elemento a un usuario',
-    'checkin_to_diff_location' => 'Puede optar por registrar este activo en una ubicación distinta a la predeterminada :default_location, si es que existe una configurada',
-    'maintenance_mode'      => 'El servicio no está disponible temporalmente debido a actualizaciones del sistema. Por favor, vuelva más tarde.',
-    'maintenance_mode_title' => 'Sistema temporalmente no disponible',
+    'checkin_to_diff_location' => 'Puede elegir ingresar este activo a una ubicación distinta de la predeterminada :default_location, si es que se ha definido una',
+    'maintenance_mode'      => 'El servicio no está disponible temporalmente debido a actualizaciones del sistema. Por favor, verifique más tarde.',
+    'maintenance_mode_title' => 'El sistema no está disponible temporalmente',
     'ldap_import'           => 'La contraseña de usuario no debe ser administrada por LDAP. (Esto le permite enviar solicitudes de contraseña olvidada.)',
     'purge_not_allowed'     => 'La purga de datos eliminados ha sido deshabilitada en el archivo .env. Contacte con el soporte técnico o con el administrador de su sistema.',
     'backup_delete_not_allowed'     => 'La eliminación de copias de seguridad se ha desactivado en el archivo .env. Contacte con el soporte técnico o con el administrador de su sistema.',
     'additional_files'           => 'Archivos adicionales',
     'shitty_browser'        => 'No se ha detectado ninguna firma. Si está utilizando un navegador más antiguo, por favor utilice un navegador más moderno para completar la aceptación del elemento.',
     'bulk_soft_delete'      =>'También eliminar parcialmente estos usuarios. Su historial de activos permanecerá intacto a menos/hasta que purgue los registros borrados en los Configuración de administración.',
-    'bulk_checkin_delete_success' => 'Los usuarios seleccionados han sido eliminados y su artículos han sido reingresados.',
-    'bulk_checkin_success' => 'Los artículos para los usuarios seleccionados han sido reingresados.',
-    'set_to_null'           => 'Eliminar valores para este activo|Eliminar valores para los :asset_count activos ',
+    'bulk_checkin_delete_success' => 'Los usuarios seleccionados han sido eliminados y sus activos han sido ingresados.',
+    'bulk_checkin_success' => 'Los elementos para los usuarios seleccionados han sido ingresados.',
+    'set_to_null'           => 'Eliminar los valores del elemento seleccionado|Eliminar los valores de los :selection_count elementos seleccionados ',
     'set_users_field_to_null'  => 'Eliminar valores de :field para este usuario|Eliminar valores de :field para todos los :user_count usuarios ',
     'na_no_purchase_date'   => 'N/A - No se proporcionó fecha de compra',
     'assets_by_status'      => 'Activos por estado',
     'assets_by_status_type'      => 'Activos por tipo de estado',
     'pie_chart_type'        => 'Tipo de gráfico circular en el tablero',
     'hello_name'            => '¡Hola, :name!',
-    'unaccepted_profile_warning'   => 'Tienes :count elementos que requieren aceptación. Haz clic aquí para aceptarlos o rechazarlos',
+    'unaccepted_profile_warning'   => 'Tiene un elemento que requiere aceptación. Haga clic aquí para aceptarlo o rechazarlo | Tiene :count elementos que requieren aceptación. Haga clic aquí para aceptarlos o rechazarlos',
     'start_date'            => 'Fecha de inicio',
-    'end_date'            => 'Fecha de fin',
+    'end_date'            => 'Fecha final',
     'alt_uploaded_image_thumbnail' => 'Miniatura cargada',
     'placeholder_kit'       => 'Seleccione un kit',
     'file_not_found'        => 'Archivo no encontrado',
+    'log_record_not_found'  => 'No se ha encontrado ninguna entrada en el registro de eventos.',
     'preview_not_available' => '(sin vista previa)',
     'setup'                 => 'Configuración',
-    'pre_flight'            => 'Pre-vuelo',
-    'skip_to_main_content'  => 'Saltar al contenido principal',
-    'toggle_navigation'     => 'Cambiar navegación',
+    'pre_flight'            => 'Preparación',
+    'skip_to_main_content'  => 'Ir al contenido principal',
+    'toggle_navigation'     => 'Alternar navegación',
     'alerts'                => 'Alertas',
-    'tasks_view_all'        => 'Mostrar todas las tareas',
+    'tasks_view_all'        => 'Ver todas las tareas',
     'true'                  => 'Verdadero',
     'false'                 => 'Falso',
     'integration_option'    => 'Opción de integración',
-    'log_does_not_exist'    => 'No existe ningún registro de actividad que coincida.',
-    'merge_users'           => 'Fusionar usuarios',
-    'merge_information' =>  'Esto fusionará a los :count usuarios en un solo usuario. Seleccione el usuario en el que desea fusionar a los demás a continuación, y los activos asociados, licencias, etc se moverán al usuario seleccionado. Los otros usuarios serán marcados como eliminados.',
-    'warning_merge_information' => 'Esta acción NO PUEDE deshacerse y sólo debe ser usada cuando necesite fusionar usuarios debido a una mala importación o sincronización. Asegúrese de ejecutar una copia de seguridad primero.',
+    'log_does_not_exist'    => 'No existe ningún registro de eventos que coincida.',
+    'merge_users'           => 'Combinar usuarios',
+    'merge_information' =>  'Esto combinará los :count usuarios en un único usuario. Seleccione a continuación el usuario en el que desea combinar los demás, y los activos, licencias, etc. asociados se moverán al usuario seleccionado y los demás usuarios se marcarán como eliminados.',
+    'warning_merge_information' => 'Esta acción NO PUEDE deshacerse y sólo debe ser usada cuando necesite combinar usuarios debido a una mala importación o sincronización. Asegúrese de ejecutar una copia de seguridad primero.',
     'no_users_selected'     => 'Ningún usuario seleccionado',
     'not_enough_users_selected'     => 'Al menos :count usuarios deben ser seleccionados',
-    'merge_success'         => ':count usuarios fusionados con éxito en :into_username!',
-    'merged'                => 'fusionado',
-    'merged_log_this_user_into' => 'Usuario fusionado (ID :to_id - :to_username) con el ID de usuario :from_id (:from_username) ',
-    'merged_log_this_user_from' => 'ID de usuario fusionado :from_id (:from_username) con este usuario (ID :to_id - :to_username)',
-    'clear_and_save'            => 'Limpiar y Guardar',
+    'merge_success'         => '!:count usuarios combinados con éxito en :into_username!',
+    'merged'                => 'combinados',
+    'merged_log_this_user_into' => 'Se combinó este usuario (ID :to_id - :to_username) en ID de usuario :from_id (:from_username) ',
+    'merged_log_this_user_from' => 'Se combinó usuario ID :from_id (:from_username) en este usuario (ID :to_id - :to_username)',
+    'clear_and_save'            => 'Limpiar y guardar',
     'update_existing_values'    => '¿Actualizar valores existentes?',
-    'auto_incrementing_asset_tags_disabled_so_tags_required' => 'Generar etiquetas de activos auto-incrementantes está desactivado, por lo que todas las filas necesitan tener la columna "Tag de activo" rellenada.',
-    'auto_incrementing_asset_tags_enabled_so_now_assets_will_be_created' => 'Nota: Generar etiquetas de activos que incrementan automáticamente está habilitado, por lo que se crearán activos para registros que no tengan "Tag de activo" poblado. Las filas que tengan "Etiqueta de activos" pobladas serán actualizadas con la información proporcionada.',
+    'auto_incrementing_asset_tags_disabled_so_tags_required' => 'La generación autoincrementable de las placas de activos está desactivada, por lo que todas las filas deben tener la columna "Asset Tag" con información.',
+    'auto_incrementing_asset_tags_enabled_so_now_assets_will_be_created' => 'Nota: La generación autoincrementable de las placas de activos está activada, por lo que se crearán activos para las filas sin información en la columna "Asset Tag". Las filas que sí tengan información en la columna "Asset Tag" se actualizarán con la información proporcionada.',
     'send_welcome_email_to_users'   => ' ¿Enviar correo de bienvenida para nuevos usuarios?',
-    'send_email'                => 'Enviar Email',
+    'send_email'                => 'Enviar correo electrónico',
     'call'                      => 'Número de llamada',
     'back_before_importing'     => '¿Copia de seguridad antes de importar?',
     'csv_header_field'          => 'Campo de cabecera CSV',
@@ -467,72 +477,72 @@ return [
     'errors_importing'          => 'Se han producido algunos errores al importar: ',
     'warning'                   => 'ADVERTENCIA: :warning',
     'success_redirecting'       => '"Éxito... Redirigiendo.',
-    'cancel_request'            => 'Cancelar esta solicitud para este elemento',
+    'cancel_request'            => 'Cancelar solicitud para este elemento',
     'setup_successful_migrations' => 'Se han creado las tablas de la base de datos',
-    'setup_migration_output' => 'Salida de Migración:',
+    'setup_migration_output' => 'Salida de migración:',
     'setup_migration_create_user' => 'Siguiente: Crear usuario',
-    'importer_generic_error'    => 'La importación de tu archivo está completa, pero recibimos un error. Esto normalmente es causado por la limitación de API de terceros desde un webhook de notificación (como Slack) y no habría interferido con la importación en sí. pero deberá confirmarlo.',
+    'importer_generic_error'    => 'La importación del archivo se ha completado, pero recibimos un error. Esto suele deberse a la limitación de la API de terceros desde un webhook de notificación (como Slack) y no habría interferido con la importación en sí, pero debería confirmarlo.',
     'confirm' => 'Confirmar',
     'autoassign_licenses' => 'Auto-Asignar licencias',
-    'autoassign_licenses_help' => 'Permitir a este usuario tener licencias asignadas a través de la interfaz de usuario o herramientas de cli de asignación masiva.',
-    'autoassign_licenses_help_long' => 'Esto permite que un usuario tenga licencias asignadas a través de la interfaz de usuario o las herramientas de cli de asignación masiva. (Por ejemplo, puede que no desee que los contratistas sean asignados automáticamente a una licencia que proporcione sólo a los miembros del personal. Todavía puede asignar licencias individualmente a esos usuarios, pero no se incluirán en las funciones de devolución de licencias de todos los usuarios.)',
-    'no_autoassign_licenses_help' => 'No incluya al usuario para asignaciones masivas a través de la licencia UI o las herramientas de cli.',
+    'autoassign_licenses_help' => 'Permitir a este usuario tener licencias asignadas a través de la asignación masiva en la interfaz de usuario o de las herramientas de la línea de comandos (CLI).',
+    'autoassign_licenses_help_long' => 'Esto permite asignar licencias a un usuario a través de la asignación masiva en la interfaz de usuario o de las herramientas de línea de comandos (CLI). (Por ejemplo, es posible que no desee que a los contratistas se les asigne automáticamente una licencia que usted proporcionaría sólo a los miembros del personal. Puede seguir asignando licencias individualmente a esos usuarios, pero no se incluirán en las funciones de "Asignación de licencias a todos los usuarios").',
+    'no_autoassign_licenses_help' => 'No incluir al usuario en la asignación masiva de licencias en la interfaz de usuario o en las herramientas de línea de comandos (CLI).',
     'modal_confirm_generic'      => '¿Está seguro?',
     'cannot_be_deleted'      => 'Este elemento no puede ser eliminado',
     'cannot_be_edited'      => 'Este elemento no puede ser editado.',
-    'undeployable_tooltip'      => 'Este elemento no puede ser asignado. Compruebe la cantidad restante.',
-    'serial_number'        => 'Número serie',
+    'undeployable_tooltip'      => 'Este artículo no puede ser asignado. Compruebe la cantidad restante.',
+    'serial_number'        => 'Número de serie',
     'item_notes' => ':item Notas',
     'item_name_var' => ':item Nombre',
     'error_user_company' => 'La compañía destino de la asignación y la compañía del activo no coinciden',
     'error_user_company_accept_view' => 'Un activo asignado a usted pertenece a una compañía diferente por lo que no puede aceptarlo ni rechazarlo, por favor verifique con su supervisor',
     'importer' => [
-        'checked_out_to_fullname' => 'Entregado a: Nombre Completo',
-        'checked_out_to_first_name' => 'Entregado a: Nombre',
-        'checked_out_to_last_name' => 'Entregado a: Apellido',
-        'checked_out_to_username' => 'Entregado a: Usuario',
-        'checked_out_to_email' => 'Entregado a: Email',
-        'checked_out_to_tag' => 'Entregado a: Etiqueta de Activo',
-        'manager_first_name' => 'Supervisor: Nombre',
-        'manager_last_name' => 'Supervisor: Apellido',
-        'manager_full_name' => 'Supervisor: Nombre Completo',
-        'manager_username' => 'Supervisor: Usuario',
-        'checkout_type' => 'Tipo de entrega',
-        'checkout_location' => 'Ubicación de la entrega',
-        'image_filename' => 'Nombre de archivo de la Imagen',
+        'checked_out_to_fullname' => 'Asignado a: Nombre completo',
+        'checked_out_to_first_name' => 'Asignado a: Nombre',
+        'checked_out_to_last_name' => 'Asignado a: Apellido',
+        'checked_out_to_username' => 'Asignado a: Nombre de usuario',
+        'checked_out_to_email' => 'Asignado a: Correo electrónico',
+        'checked_out_to_tag' => 'Asignado a: Placa de activo',
+        'manager_first_name' => 'Nombre del supervisor',
+        'manager_last_name' => 'Apellido del supervisor',
+        'manager_full_name' => 'Nombre completo del supervisor',
+        'manager_username' => 'Nombre de usuario del supervisor',
+        'checkout_type' => 'Tipo de asignación',
+        'checkout_location' => 'Asignar a la ubicación',
+        'image_filename' => 'Nombre del archivo de la imagen',
         'do_not_import'     => 'No importar',
         'vip' => 'VIP',
         'avatar'  => 'Avatar',
-        'gravatar' => 'Correo Gravatar',
+        'gravatar' => 'Correo electrónico Gravatar',
         'currency' => 'Moneda',
-        'address2' => '2da linea de Dirección',
+        'address2' => 'Dirección línea 2',
         'import_note' => 'Importado usando el importador de csv',
     ],
     'remove_customfield_association' => 'Elimine este campo del grupo de campos. Esto no eliminará el campo personalizado, solo la asociación de este campo con este grupo de campos.',
-    'checked_out_to_fields' => 'Campos sobre quién tiene asignado el elemento',
+    'checked_out_to_fields' => 'Campos de la persona que tiene asignado el elemento',
     'percent_complete' => '% completo',
     'uploading' => 'Subiendo... ',
-    'upload_error' => 'Error al cargar el archivo. Por favor, compruebe que no hay filas vacías y que no hay nombres de columna duplicados.',
+    'upload_error' => 'Error al cargar el archivo. Por favor, compruebe que no tiene filas vacías o nombres de columnas duplicados en su CSV, y que los permisos del servidor permiten la subida.',
     'copy_to_clipboard' => 'Copiar al portapapeles',
     'copied' => '¡Copiado!',
     'status_compatibility' => 'Si los activos ya están asignados, no se pueden cambiar a un tipo de estado no utilizable y este cambio de valor se omitirá.',
-    'rtd_location_help' => 'Esta es la ubicación del recurso cuando no está seleccionado',
+    'rtd_location_help' => 'Esta es la ubicación del activo cuando no está asignado',
     'item_not_found' => ':item_type ID :id no existe o ha sido eliminado',
     'action_permission_denied' => 'No tiene permiso para :action :item_type ID :id',
-    'action_permission_generic' => 'No tiene permiso para :action this :item_type',
+    'action_permission_generic' => 'No tiene permiso para :action este :item_type',
     'edit' => 'editar',
-    'action_source' => 'Fuente de acción',
+    'action_source' => 'Origen de la acción',
     'or' => 'o',
     'url'                   => 'URL',
     'edit_fieldset' => 'Editar campos y opciones de grupos de campos',
     'permission_denied_superuser_demo' => 'Permiso denegado. No puede actualizar la información de usuario para superadministradores en la demo.',
     'pwd_reset_not_sent' => 'El usuario no está activado, está sincronizado con LDAP o no tiene una dirección de correo electrónico',
-    'error_sending_email' => 'Error al enviar email',
-    'sad_panda' => 'Sad panda. You are not authorized to do the thing. Maybe <a href=":link">return to the dashboard</a>, or contact your administrator.',
+    'error_sending_email' => 'Error al enviar correo electrónico',
+    'sad_panda' => 'No está autorizado a realizar esta acción. Puede <a href=":link">regresar al tablero</a>, o ponerse en contacto con su administrador.',
     'bulk' => [
             'delete' =>
                 [
-                'header' => 'Eliminar en masa :object_type',
+                'header' => 'Eliminar masivamente :object_type',
                 'warn'   =>  'Está a punto de eliminar un :object_type|Está a punto de eliminar :count :object_type',
                 'success'   =>  'Se ha eliminado correctamente :count :object_type',
                 'error'   =>  'No se pudo eliminar :object_type',
@@ -544,11 +554,76 @@ return [
 
     'countable' => [
         'accessories'  => ':count Accesorio|:count Accesorios',
-        'assets'  => ':count Activos|:count Activos',
-        'licenses'  => ':count Licencia|:count Licencias',
-        'license_seats'  => ':count Asiento de licencia|:count Asientos de licencia',
-        'consumables'  => ':count Consumible|:count Consumibles',
+        'assets'  => ':count activo|:count activos',
+        'licenses'  => ':count licencia|:count licencias',
+        'license_seats'  => ':count licencia|:count licencias',
+        'consumables'  => ':count consumible|:count consumibles',
         'components'  => ':count component|:count componentes',
-    ]
+    ],
+
+    'more_info' => 'Más información',
+    'quickscan_bulk_help' => 'Al marcar esta casilla se actualizará el activo para reflejar esta nueva ubicación. Dejarla sin marcar, simplemente almacenará la ubicación en el registro de auditoría. Tenga en cuenta que si este activo ya está asignado, no cambiará la ubicación de la persona, del activo o de la ubicación a la que esté asignado.',
+    'whoops' => '¡Uy!',
+    'something_went_wrong' => 'Algo falló en su solicitud.',
+    'close' => 'Cerrar',
+    'expires' => 'Vence',
+    'map_fields'=> 'Asociar los campos para :item_type',
+    'remaining_var' => ':count restantes',
+    'label' => 'Etiqueta',
+    'import_asset_tag_exists' => 'Ya existe un activo con la placa :asset_tag y no se ha solicitado una actualización. No se ha realizado ningún cambio.',
+    'countries_manually_entered_help' => 'Los valores con asterisco (*) fueron introducidos manualmente y no coinciden con los valores desplegables ISO 3166 existentes',
+    'accessories_assigned' => 'Accesorios asignados',
+    'user_managed_passwords' => 'Gestión de contraseña',
+    'user_managed_passwords_disallow' => 'Evitar que los usuarios gestionen sus propias contraseñas',
+    'user_managed_passwords_allow' => 'Permitir a los usuarios gestionar sus propias contraseñas',
+    'from' => 'Origen',
+    'by' => 'Por',
+
+// Add form placeholders here
+    'placeholders' => [
+        'notes'  => 'Agregar una nota',
+    ],
+
+    'breadcrumb_button_actions' => [
+        'edit_item' => 'Editar nombre',
+        'checkout_item' => 'Checkout :name',
+        'checkin_item' => 'Checkin :name',
+    ],
+
+    'skins' => [
+        'site_default' => 'Sitio por defecto',
+        'default_blue' => 'Azul por defecto',
+        'blue_dark' => 'Azul (modo oscuro)',
+        'green' => 'Oscuro Verde',
+        'green_dark' => 'Verde (modo oscuro)',
+        'red' => 'Rojo Oscuro',
+        'red_dark' => 'Rojo (Modo Oscuro)',
+        'orange' => 'Oscuro Naranja',
+        'orange_dark' => 'Naranja (Modo oscuro)',
+        'black' => 'Negro',
+        'black_dark' => 'Negro (Modo Oscuro)',
+        'purple' => 'Morado',
+        'purple_dark' => 'Morado (Modo Oscuro)',
+        'yellow' => 'Amarillo',
+        'yellow_dark' => 'Amarillo (Modo oscuro)',
+        'high_contrast' => 'High Contrast',
+
+    ],
+
+    'select_all_none' => 'Select/Unselect All',
+    'generic_model_not_found' => 'That :model was not found or you do not have permission to access it',
+    'deleted_models' => 'Deleted Asset Models',
+    'deleted_users' => 'Usuarios eliminados',
+    'cost_each' => ':amount each',
+    'remove_current_image' => 'Remove current :type image',
+
+    'seeding' => [
+        'manufacturers' => [
+            'button' => 'Create Manufacturers',
+            'prompt' => 'You do not have any manufacturers yet. Would you like to seed a list of common manufacturers? (THIS WILL OVERWRITE EXISTING MANUFACTURERS, including those that have been soft-deleted.)',
+            'success' => 'Manufacturers seeded successfully',
+            'error' => 'Could not seed manufacturers. A manufacturer record already exists and seeding would overwrite it.|Could not seed manufacturers. :count manufacturer records already exist and seeding would overwrite them.',
+        ],
+    ],
 
 ];
diff --git a/resources/lang/es-MX/help.php b/resources/lang/es-MX/help.php
index d7daa3a5cb..13fb579b49 100644
--- a/resources/lang/es-MX/help.php
+++ b/resources/lang/es-MX/help.php
@@ -15,19 +15,19 @@ return [
 
     'more_info_title' => 'Más información',
 
-    'audit_help' => 'Al marcar esta casilla se editará el registro de activos para reflejar esta nueva ubicación. Dejarla desmarcada simplemente se notará la ubicación en el registro de auditoría.<br><br>Tenga en cuenta que si este activo está desprotegido, no cambiará la ubicación de la persona, el activo o la ubicación en la que está verificado.',
+    'audit_help' => 'Al marcar esta casilla se actualizará el activo para reflejar esta nueva ubicación. Dejarla sin marcar, simplemente almacenará la ubicación en el registro de auditoría.<br><br>Tenga en cuenta que si este activo ya está asignado, no cambiará la ubicación de la persona, del activo o de la ubicación a la que esté asignado.',
 
-    'assets' => 'Los activos son elementos rastreados por número de serie o etiqueta de activos. Suelen ser artículos de alto valor donde la identificación del activo importa.',
+    'assets' => 'Los activos son artículos rastreados por número de serie o placa de activo.  Suelen ser artículos de alto valor en los que es importante identificar un elemento específico.',
 
-    'categories' => 'Las categorías te ayudan a organizar los activos. Ejemplos de categorías: &quot;Pcs&quot;, &quot;Portátiles&quot;, &quot;Móviles&quot;, &quot;Tabletas&quot;, etc.',
+    'categories' => 'Las categorías le ayudan a organizar sus elementos. Unos ejemplos de categorías podrían ser: &quot;PC Escritorios&quot;, &quot;Portátiles&quot;, &quot;Móviles&quot;, &quot;Tabletas&quot;, etc.',
 
-    'accessories' => 'Accesorios son cualquier cosa que entregues a los usuarios pero que no tenga numero de serie (o no te interese seguirlos en forma única). Por ejemplo, ratones o teclados.',
+    'accessories' => 'Los accesorios son cualquier cosa que se le asigne a los usuarios pero que no tenga número de serie (o no importe realizarle el seguimiento en forma única). Por ejemplo, ratones o teclados.',
 
-    'companies'     => 'Las compañías se pueden utilizar como un simple campo identificador, o se pueden utilizar para limitar la visibilidad de los activos, usuarios, etc si la opción "Soporte completo a múltiples compañías" está habilitado en "Configuración de administrador".',
+    'companies'     => 'Las compañías se pueden utilizar como un simple campo identificador, o se pueden utilizar para limitar la visibilidad de los activos, usuarios, etc. si la opción "Soporte completo a múltiples compañías" está habilitada en "Configuración de administración".',
 
-    'components'    => 'Los componentes son elementos que son parte de un activo, por ejemplo HDD, RAM, etc.',
+    'components'    => 'Los componentes son elementos que son parte de un activo, por ejemplo, el disco duro, RAM, etc.',
 
-    'consumables'   => 'Los consumibles son cualquier cosa comprada que se usará con el tiempo. Por ejemplo, tinta de impresora o papel copiador.',
+    'consumables'   => 'Los consumibles son todo aquello que se compra y que se agota con el tiempo. Por ejemplo, tinta de impresora o papel de fotocopiadora.',
 
     'depreciations' => 'Puede configurar la depreciación de activos usando un método de línea recta.',
     
diff --git a/resources/lang/es-MX/localizations.php b/resources/lang/es-MX/localizations.php
index 35c44db06d..de3086b6bf 100644
--- a/resources/lang/es-MX/localizations.php
+++ b/resources/lang/es-MX/localizations.php
@@ -40,17 +40,19 @@ return [
         'ms-MY'=> 'Malayo',
         'mi-NZ'=> 'Maori',
         'mn-MN'=> 'Mongol',
-        'no-NO'=> 'Noruego',
+        'nb-NO'=> 'Noruego Bokmål',
+        'om-ET' => 'Oromo (Ethiopian)',
+        //'nn-NO'=> 'Norwegian Nynorsk',
         'fa-IR'=> 'Persa',
         'pl-PL'=> 'Polaco',
         'pt-PT'=> 'Portugués',
-        'pt-BR'=> 'Portugués, Brasileño',
+        'pt-BR'=> 'Portugués, Brasil',
         'ro-RO'=> 'Rumano',
         'ru-RU'=> 'Ruso',
-        'sr-CS' => 'Serbian (Latin)',
+        'sr-CS' => 'Serbio (Latino)',
         'sk-SK'=> 'Eslovaco',
-        'sl-SI'=> 'Slovenian',
-        'so-SO'=> 'Somali',
+        'sl-SI'=> 'Esloveno',
+        'so-SO'=> 'Somalí',
         'es-ES'=> 'Español',
         'es-CO'=> 'Español, Colombia',
         'es-MX'=> 'Español, México',
@@ -85,7 +87,7 @@ return [
         'AT'=>'Austria',
         'AU'=>'Australia',
         'AW'=>'Aruba',
-        'AX'=>'Islas Åland',
+        'AX'=>'Islas Aland',
         'AZ'=>'Azerbaiyán',
         'BA'=>'Bosnia y Herzegovina',
         'BB'=>'Barbados',
@@ -133,6 +135,7 @@ return [
         'EC'=>'Ecuador',
         'EE'=>'Estonia',
         'EG'=>'Egipto',
+        'GB-ENG'=>'Inglaterra',
         'ER'=>'Eritrea',
         'ES'=>'España',
         'ET'=>'Etiopía',
@@ -231,6 +234,7 @@ return [
         'NG'=>'Nigeria',
         'NI'=>'Nicaragua',
         'NL'=>'Países Bajos',
+        'GB-NIR' => 'Irlanda del Norte',
         'NO'=>'Noruega',
         'NP'=>'Nepal',
         'NR'=>'Nauru',
@@ -258,7 +262,7 @@ return [
         'RU'=>'Federación Rusa',
         'RW'=>'Ruanda',
         'SA'=>'Arabia Saudita',
-        'UK'=>'Escocia',
+        'GB-SCT'=>'Escocia',
         'SB'=>'Islas Salomón',
         'SC'=>'Seychelles',
         'SS'=>'Sudán del Sur',
@@ -310,6 +314,7 @@ return [
         'VI'=>'Islas Vírgenes de los Estados Unidos',
         'VN'=>'Viet Nam',
         'VU'=>'Vanuatu',
+        'GB-WLS' =>'Gales',
         'WF'=>'Islas Wallis y Futuna',
         'WS'=>'Samoa',
         'YE'=>'Yemen',
diff --git a/resources/lang/es-MX/mail.php b/resources/lang/es-MX/mail.php
index e7d47be38a..0a2f9d0994 100644
--- a/resources/lang/es-MX/mail.php
+++ b/resources/lang/es-MX/mail.php
@@ -2,92 +2,98 @@
 
 return [
 
-    'Accessory_Checkin_Notification' => 'Accesorio devuelto',
-    'Accessory_Checkout_Notification' => 'Accesorio reservado',
-    'Asset_Checkin_Notification' => 'Activo devuelto',
+    'Accessory_Checkin_Notification' => 'Accesorio ingresado',
+    'Accessory_Checkout_Notification' => 'Accesorio asignado',
+    'Asset_Checkin_Notification' => 'Activo ingresado',
     'Asset_Checkout_Notification' => 'Activo asignado',
-    'Confirm_Accessory_Checkin' => 'Confirmar devolución del accesorio',
-    'Confirm_Asset_Checkin' => 'Confirmar devolución del activo',
+    'Confirm_Accessory_Checkin' => 'Confirmación de ingreso de accesorio',
+    'Confirm_Asset_Checkin' => 'Confirmación de ingreso de activo',
     'Confirm_accessory_delivery' => 'Confirmación de entrega de accesorio',
     'Confirm_asset_delivery' => 'Confirmación de entrega de activo',
     'Confirm_consumable_delivery' => 'Confirmación de entrega de consumible',
     'Confirm_license_delivery' => 'Confirmación de entrega de licencia',
-    'Consumable_checkout_notification' => 'Consumible comprobado',
+    'Consumable_checkout_notification' => 'Consumible asignado',
     'Days' => 'Días',
-    'Expected_Checkin_Date' => 'Un activo asignado a Ud. debe ser devuelto en :date',
+    'Expected_Checkin_Date' => 'Un activo asignado a Ud. debe ser devuelto el :date',
     'Expected_Checkin_Notification' => 'Recordatorio: :name se acerca la fecha de devolución',
-    'Expected_Checkin_Report' => 'Informe de devolución de activo esperado',
-    'Expiring_Assets_Report' => 'Informe de activos que expiran.',
-    'Expiring_Licenses_Report' => 'Informe de licencias que expiran.',
-    'Item_Request_Canceled' => 'Solicitud de cancelación de requerimiento',
+    'Expected_Checkin_Report' => 'Informe de próximas devoluciones de activos',
+    'Expiring_Assets_Report' => 'Informe de activos con garantía próxima a vencer.',
+    'Expiring_Licenses_Report' => 'Informe de licencias próximas a vencer.',
+    'Item_Request_Canceled' => 'Solicitud de artículo cancelada',
     'Item_Requested' => 'Artículo solicitado',
     'License_Checkin_Notification' => 'Licencia devuelta',
-    'License_Checkout_Notification' => 'Licencia reservada',
-    'Low_Inventory_Report' => 'Reporte de inventario bajo',
-    'a_user_canceled' => 'El usuario ha cancelado el item solicitado en la pagina Web',
-    'a_user_requested' => 'Un usuario a solicitado un item en la pagina Web',
+    'License_Checkout_Notification' => 'Licencia asignada',
+    'license_for'   => 'Licenciado para',
+    'Low_Inventory_Report' => 'Informe sobre inventario bajo',
+    'a_user_canceled' => 'El usuario ha cancelado el elemento solicitado en la página web',
+    'a_user_requested' => 'Un usuario ha solicitado un elemento en la página web',
     'acceptance_asset_accepted' => 'Un usuario ha aceptado un elemento',
     'acceptance_asset_declined' => 'Un usuario ha rechazado un elemento',
-    'accessory_name' => 'Nombre de accesorio:',
-    'additional_notes' => 'Notas adicionales:',
-    'admin_has_created' => 'Un administrador ha creado una cuenta para ti en la web :web.',
-    'asset' => 'Activo:',
-    'asset_name' => 'Nombre del activo:',
+    'accessory_name' => 'Nombre de accesorio',
+    'additional_notes' => 'Notas adicionales',
+    'admin_has_created' => 'Un administrador ha creado una cuenta para usted en el sitio :web.',
+    'asset' => 'Activo',
+    'asset_name' => 'Nombre del activo',
     'asset_requested' => 'Activo solicitado',
-    'asset_tag' => 'Etiqueta de activo',
+    'asset_tag' => 'Placa del activo',
     'assets_warrantee_alert' => 'Hay :count activo con su garantía que expira en los próximos :threshold days.|Hay :count activos con garantías que expiran en los siguientes :threshold days.',
     'assigned_to' => 'Asignado a',
     'best_regards' => 'Cordialmente,',
-    'canceled' => 'Cancelado:',
-    'checkin_date' => 'Fecha de devolución:',
-    'checkout_date' => 'Fecha de asignación:',
-    'checkedout_from' => 'Salido de',
-    'checkedin_from'  => 'Registrado desde',
-    'checked_into' => 'Registrado en',
+    'canceled' => 'Cancelado',
+    'checkin_date' => 'Fecha de ingreso',
+    'checkout_date' => 'Fecha de asignación',
+    'checkedout_from' => 'Asignado desde',
+    'checkedin_from'  => 'Devuelto desde',
+    'checked_into' => 'Devuelto en',
     'click_on_the_link_accessory' => 'Haga clic en el enlace en la parte inferior para confirmar que ha recibido el accesorio.',
     'click_on_the_link_asset' => 'Haga clic en el enlace en la parte inferior para confirmar que ha recibido el activo.',
-    'click_to_confirm' => 'Por favor, pulsa en el siguiente enlace para verificar tu cuenta de :web:',
+    'click_to_confirm' => 'Por favor, haga clic en el siguiente enlace para confirmar su cuenta de :web:',
     'current_QTY' => 'Cantidad actual',
     'days' => 'Días',
-    'expecting_checkin_date' => 'Fecha esperada de devolución:',
-    'expires' => 'Expira',
+    'expecting_checkin_date' => 'Fecha esperada de devolución',
+    'expires' => 'Vence',
     'hello' => 'Hola',
     'hi' => 'Hola',
     'i_have_read' => 'He leído y aceptado los términos de uso, y he recibido este artículo.',
-    'inventory_report' => 'Reporte de Inventario',
-    'item' => 'Articulo:',
+    'inventory_report' => 'Reporte de inventario',
+    'item' => 'Elemento',
+    'item_checked_reminder' => 'Este es un recordatorio de que actualmente tiene :count elemento(s) asignado(s) que no ha aceptado o rechazado. Haga clic en el siguiente enlace para confirmar su decisión.',
     'license_expiring_alert' => 'Hay :count licencia que expira en los próximos :threshold días. | Hay :count licencias que expiran en los próximos :threshold días.',
-    'link_to_update_password' => 'Haga clic en el siguiente enlace para actualizar su: contraseña de la web:',
-    'login' => 'Entrar:',
+    'link_to_update_password' => 'Por favor, haga clic en el siguiente enlace para actualizar su contraseña de :web :',
+    'login' => 'Iniciar sesión',
     'login_first_admin' => 'Inicie sesión en su nueva instalación de Snipe-IT usando las credenciales:',
-    'low_inventory_alert' => 'Hay :count item por debajo del inventario mínimo o próximo a bajar.|Hay are :count elementos por debajo del inventario mínimo o próximos a bajar.',
+    'low_inventory_alert' => 'Hay :count elemento que está por debajo del inventario mínimo o que pronto lo estará.|Hay :count elementos que están por debajo del inventario mínimo o que pronto lo estarán.',
     'min_QTY' => 'Cantidad mínima',
     'name' => 'Nombre',
     'new_item_checked' => 'Un nuevo artículo ha sido asignado a su nombre, los detalles están a continuación.',
+    'new_item_checked_with_acceptance' => 'Un nuevo artículo ha sido asignado a su nombre, los detalles están a continuación.',
+    'recent_item_checked' => 'An item was recently checked out under your name that requires acceptance, details are below.',
     'notes' => 'Notas',
-    'password' => 'Contraseña:',
+    'password' => 'Contraseña',
     'password_reset' => 'Reiniciar la contraseña',
     'read_the_terms' => 'Por favor lea los términos de uso a continuación.',
-    'read_the_terms_and_click' => 'Por favor, lea los términos de uso a continuación, y haga clic en el enlace en la parte inferior para confirmar que usted lee y acepta las condiciones de uso, y han recibido el activo.',
-    'requested' => 'Solicitado:',
-    'reset_link' => 'Tu enlace de restablecimiento de contraseña',
-    'reset_password' => 'Haga Clic aquí para restablecer su contraseña:',
+    'read_the_terms_and_click' => 'Por favor lea los términos de uso a continuación y haga clic en el enlace en la parte inferior para confirmar que usted leyó los términos de uso y los acepta, y que ha recibido el activo.',
+    'requested' => 'Solicitado',
+    'reset_link' => 'Su enlace de restablecimiento de contraseña',
+    'reset_password' => 'Haaga clic aquí para restablecer tu contraseña:',
     'rights_reserved' => 'Todos los derechos reservados.',
     'serial' => 'Serial',
     'snipe_webhook_test' => 'Prueba de integración de Snipe-IT',
     'snipe_webhook_summary' => 'Resumen de la prueba de integración de Snipe-IT',
     'supplier' => 'Proveedor',
-    'tag' => 'Etiqueta',
+    'tag' => 'Placa',
     'test_email' => 'Email de prueba de Snipe-IT',
-    'test_mail_text' => 'Esto es una prueba desde el sistema de gestión de activos de Snipe-IT. Si tienes esto, correo está funcionando :)',
+    'test_mail_text' => 'Esto es una prueba desde el sistema de gestión de activos Snipe-IT. Si recibió este mensaje, el correo está funcionando :)',
     'the_following_item' => 'El siguiente artículo ha sido devuelto: ',
-    'to_reset' => 'Para restaurar tu contraseña de :web, rellena este formulario:',
+    'to_reset' => 'Para restaurar su contraseña de :web, diligencie este formulario:',
     'type' => 'Tipo',
-    'upcoming-audits' => 'Hay :count activo que se está preparando para auditoría dentro de :threshold days.|Hay :count activos que se están preparando para auditoría en :threshold days.',
-    'user' => 'User',
-    'username' => 'Username',
+    'upcoming-audits' => 'Hay :count activo para ser auditado antes de :threshold días.|Hay :count activos para ser auditados antes de :threshold días.',
+    'user' => 'Usuario',
+    'username' => 'Nombre de usuario',
+    'unaccepted_asset_reminder' => 'Tiene activos pendientes por aceptar.',
     'welcome' => 'Bienvenido, :name',
     'welcome_to' => '¡Bienvenido a: web!',
-    'your_assets' => 'Ver tus activos',
-    'your_credentials' => 'Tus credenciales de Snipe-IT',
+    'your_assets' => 'Ver sus activos',
+    'your_credentials' => 'Sus credenciales de Snipe-IT',
+    'mail_sent' => '¡Correo enviado exitosamente!.',
 ];
diff --git a/resources/lang/es-MX/passwords.php b/resources/lang/es-MX/passwords.php
index f337c2c967..75469d1121 100644
--- a/resources/lang/es-MX/passwords.php
+++ b/resources/lang/es-MX/passwords.php
@@ -3,7 +3,7 @@
 return [
     'sent'	        => 'Si existe un usuario con una dirección de correo electrónico válida en nuestro sistema, se ha enviado un correo electrónico de recuperación de contraseña.',
     'user'			=> 'Si existe un usuario con una dirección de correo electrónico válida en nuestro sistema, se ha enviado un correo electrónico de recuperación de contraseña.',
-    'token'         => 'Este token de restablecimiento de contraseña no es válido o ha caducado, o no coincide con el nombre de usuario proporcionado.',
-    'reset'         => '¡Tu contraseña ha sido restablecida!',
+    'token'         => 'Esta sesión de restablecimiento de contraseña es inválida o ha caducado, o no coincide con el nombre de usuario proporcionado.',
+    'reset'         => '¡Su contraseña ha sido restablecida!',
     'password_change'  => '¡Su contraseña ha sido actualizada!',
 ];
diff --git a/resources/lang/es-MX/reminders.php b/resources/lang/es-MX/reminders.php
index 4b781311da..98f2819567 100644
--- a/resources/lang/es-MX/reminders.php
+++ b/resources/lang/es-MX/reminders.php
@@ -13,9 +13,9 @@ return array(
     |
     */
 
-    "password" => "Los passwords deben tener mínimo 6 caracteres y coincidir.",
-    "user"     => "Usuario o E-Mail incorrectos",
-    "token"    => 'Este token de restablecimiento de contraseña es inválido o ha caducado, o no coincide con el nombre de usuario proporcionado.',
+    "password" => "Las contraseñas deben ser de seis caracteres y coincidir con la confirmación.",
+    "user"     => "El nombre de usuario o la dirección de correo electrónico son incorrectos",
+    "token"    => 'Esta sesión de restablecimiento de contraseña es inválida o ha caducado, o no coincide con el nombre de usuario proporcionado.',
     'sent'	   => 'Si existe un usuario con una dirección de correo electrónico válida en nuestro sistema, se ha enviado un correo electrónico de recuperación de contraseña.',
 
 );
diff --git a/resources/lang/es-MX/table.php b/resources/lang/es-MX/table.php
index 75bdd56a6b..dea24233f7 100644
--- a/resources/lang/es-MX/table.php
+++ b/resources/lang/es-MX/table.php
@@ -5,7 +5,7 @@ return array(
     'actions'	 	        => 'Acciones',
     'action' 		        => 'Acción',
     'by'      		        => 'Por',
-    'item' 			        => 'Item',
+    'item' 			        => 'Elemento',
     'no_matching_records'   => 'No se encontraron registros que coincidan',
 
 );
diff --git a/resources/lang/es-MX/validation.php b/resources/lang/es-MX/validation.php
index 5bb204eb88..1683b26364 100644
--- a/resources/lang/es-MX/validation.php
+++ b/resources/lang/es-MX/validation.php
@@ -13,88 +13,151 @@ return [
     |
     */
 
-    'accepted'             => ':attribute debe ser aceptado.',
-    'active_url'           => ':attribute no es una URL correcta.',
-    'after'                => ':attribute debe ser posterior a :date.',
-    'after_or_equal'       => 'El atributo: debe ser una fecha posterior o igual a: fecha.',
-    'alpha'                => ':attribute solo acepta letras.',
-    'alpha_dash'           => ':attribute solo acepta letras, números y guiones.',
-    'alpha_num'            => ':attribute solo acepta letras y números.',
-    'array'                => 'El: atributo debe ser una matriz.',
-    'before'               => ':attribute debe ser anterior a :date.',
-    'before_or_equal'      => 'El atributo: debe ser una fecha anterior o igual a: fecha.',
-    'between'              => [
-        'numeric' => ':attribute debe estar entre :min - :max.',
-        'file'    => ':attribute debe estar entre :min - :max kilobytes.',
-        'string'  => ':attribute debe estar entre :min - :max caracteres.',
-        'array'   => 'El atributo: debe tener entre: min y: elementos máximos.',
+    'accepted' => 'El campo :attribute debe ser aceptado.',
+    'accepted_if' => 'El campo :attribute debe ser aceptado cuando :other es :value.',
+    'active_url' => 'El campo :attribute debe ser una dirección URL válida.',
+    'after' => 'El campo :attribute debe ser una fecha posterior a :date.',
+    'after_or_equal' => 'El campo :attribute debe ser una fecha posterior o igual a :date.',
+    'alpha' => 'El campo :attribute debe contener únicamente letras.',
+    'alpha_dash' => 'El campo :attribute debe contener únicamente letras, números, guiones y guiones bajos.',
+    'alpha_num' => 'El campo :attribute debe contener únicamente letras y números.',
+    'array' => 'El campo :attribute debe ser un arreglo.',
+    'ascii' => 'El campo :attribute debe contener únicamente caracteres y símbolos alfanuméricos de un byte.',
+    'before' => 'El campo :attribute debe ser una fecha anterior a :date.',
+    'before_or_equal' => 'El campo :attribute debe ser una fecha anterior o igual a :date.',
+    'between' => [
+        'array' => 'El campo :attribute debe tener elementos entre :min y :max.',
+        'file' => 'El campo :attribute debe tener entre :min y :max kilobytes.',
+        'numeric' => 'El campo :attribute debe estar entre :min y :max.',
+        'string' => 'El campo :attribute debe tener entre :min y :max caracteres.',
     ],
-    'boolean'              => ':attribute debe ser verdadero o falso.',
-    'confirmed'            => ':attribute la confirmación no coincide.',
-    'date'                 => ':attribute no es una fecha correcta.',
-    'date_format'          => ':attribute no cumple el formato :format.',
-    'different'            => ':attribute y :other deben ser diferentes.',
-    'digits'               => ':attribute debe tener :digits dígitos.',
-    'digits_between'       => ':attribute debe tener entre :min y :max dígitos.',
-    'dimensions'           => 'El atributo: tiene dimensiones de imagen no válidas.',
-    'distinct'             => 'El campo: atributo tiene un valor duplicado.',
-    'email'                => ':attribute formato incorrecto.',
-    'exists'               => 'El :attribute seleccionado no es correcto.',
-    'file'                 => 'El: atributo debe ser un archivo.',
-    'filled'               => 'El campo: atributo debe tener un valor.',
-    'image'                => ':attribute debe ser una imagen.',
+    'boolean' => 'El campo :attribute debe ser verdadero o falso.',
+    'can' => 'El campo :attribute contiene un valor no autorizado.',
+    'confirmed' => 'La confirmación del campo :attribute no coincide.',
+    'contains' => 'Falta un valor obligatorio en el campo :attribute.',
+    'current_password' => 'La contraseña es incorrecta.',
+    'date' => 'El campo :attribute debe contener una fecha válida.',
+    'date_equals' => 'El campo :attribute debe ser una fecha igual a :date.',
+    'date_format' => 'El campo :attribute debe coincidir con el formato :format.',
+    'decimal' => 'El campo :attribute debe tener :decimal lugares decimales.',
+    'declined' => 'El campo :attribute debe ser rechazado.',
+    'declined_if' => 'El campo :attribute debe ser rechazado cuando :other es :value.',
+    'different' => 'Los campos :attribute y :other deben ser diferentes.',
+    'digits' => 'El campo :attribute debe tener :digits dígitos.',
+    'digits_between' => 'El campo :attribute debe tener entre :min y :max dígitos.',
+    'dimensions' => 'El campo :attribute tiene dimensiones de imagen no válidas.',
+    'distinct' => 'El campo: atributo tiene un valor duplicado.',
+    'doesnt_end_with' => 'El campo :attribute no debe finalizar con uno de los siguientes :values.',
+    'doesnt_start_with' => 'El campo :attribute no debe iniciar con uno de los siguientes :values.',
+    'email' => 'El campo :attribute debe ser una dirección de correo válida.',
+    'ends_with' => 'El campo :attribute debe finalizar con uno de los siguientes :values.',
+    'enum' => 'El :attribute seleccionado no es correcto.',
+    'exists' => 'El :attribute seleccionado no es correcto.',
+    'extensions' => 'El campo :attribute debe tener una de las siguientes extensiones :values.',
+    'file' => 'El campo :attribute debe ser un archivo.',
+    'filled' => 'El campo: atributo debe tener un valor.',
+    'gt' => [
+        'array' => 'El campo :attribute debe tener más de :value elementos.',
+        'file' => 'El campo :attribute debe ser mayor que :value kilobytes.',
+        'numeric' => 'El campo :attribute debe ser mayor que :value.',
+        'string' => 'El campo :attribute debe ser mayor que :value caracteres.',
+    ],
+    'gte' => [
+        'array' => 'El campo :attribute debe tener :value elementos o más.',
+        'file' => 'El campo :attribute debe ser mayor que o igual a :value kilobytes.',
+        'numeric' => 'El campo :attribute debe ser mayor que o igual a :value.',
+        'string' => 'El campo :attribute debe ser mayor que o igual a :value caracteres.',
+    ],
+    'hex_color' => 'El campo :attribute debe ser un color hexadecimal válido.',
+    'image' => 'El campo :attribute debe ser una imagen.',
     'import_field_empty'    => 'El valor para :fieldname no puede ser nulo.',
-    'in'                   => 'El :attribute seleccionado no es correcto.',
-    'in_array'             => 'El campo: atributo no existe en: otro.',
-    'integer'              => ':attribute debe ser un número entero.',
-    'ip'                   => ':attribute debe ser una dirección IP correcta.',
-    'ipv4'                 => 'El atributo: debe ser una dirección IPv4 válida.',
-    'ipv6'                 => 'El atributo: debe ser una dirección IPv6 válida.',
-    'is_unique_department' => 'El atributo :attribute debe ser único para esta ubicación de la compañía',
-    'json'                 => 'El atributo: debe ser una cadena JSON válida.',
-    'max'                  => [
-        'numeric' => ':attribute no debe ser mayor que :max.',
-        'file'    => ':attribute no debe ser mayor que :max kilobytes.',
-        'string'  => ':attribute no debe tener como máximo :max caracteres.',
-        'array'   => 'El atributo: puede no tener más que: elementos máximos.',
+    'in' => 'El :attribute seleccionado no es correcto.',
+    'in_array' => 'El campo :attribute debe existir en :other.',
+    'integer' => 'El campo :attribute debe ser un valor entero.',
+    'ip' => 'El campo :attribute debe ser una dirección IP válida.',
+    'ipv4' => 'El campo :attribute debe ser una dirección IPv4 válida.',
+    'ipv6' => 'El campo :attribute debe ser una dirección IPv6 válida.',
+    'json' => 'El campo :attribute debe ser una cadena de texto JSON válida.',
+    'list' => 'The campo :attribute debe ser una lista.',
+    'lowercase' => 'El campo :attribute debe estar en minúsculas.',
+    'lt' => [
+        'array' => 'El campo :attribute debe tener menos que :value elementos.',
+        'file' => 'El campo :attribute debe ser menor que :value kilobytes.',
+        'numeric' => 'El campo :attribute debe ser menor que :value.',
+        'string' => 'El campo :attribute debe ser menor que :value caracteres.',
     ],
-    'mimes'                => ':attribute debe ser un archivo del tipo: :values.',
-    'mimetypes'            => 'El atributo: debe ser un archivo de tipo:: valores.',
-    'min'                  => [
-        'numeric' => ':attribute debe ser como mínimo :min.',
-        'file'    => ':attribute debe ser como mínimo de :min kilobytes.',
-        'string'  => ':attribute debe contener como mínimo :min caracteres.',
-        'array'   => 'El atributo: debe tener al menos: elementos min.',
+    'lte' => [
+        'array' => 'El campo :attribute no debe tener más de :value elementos.',
+        'file' => 'El campo :attribute debe ser menor que o igual a :value kylobytes.',
+        'numeric' => 'El campo :attribute debe ser menor que o igual a :value.',
+        'string' => 'El campo :attribute debe ser menor que o igual a :value caracteres.',
     ],
-    'starts_with'          => 'El campo :attribute debe comenzar con uno de los siguientes: :values.',
-    'ends_with'            => 'El campo :attribute debe terminar con uno de los siguientes: :values.',
+    'mac_address' => 'El campo :attribute debe ser una dirección MAC válida.',
+    'max' => [
+        'array' => 'El campo :attribute no debe tener más de :max elementos.',
+        'file' => 'El campo :attribute no debe ser mayor que :max kilobytes.',
+        'numeric' => 'El campo :attribute no debe ser mayor que :max.',
+        'string' => 'El campo :attribute no debe ser mayor que :max caracteres.',
+    ],
+    'max_digits' => 'El campo :attribute no debe tener más de :max dígitos.',
+    'mimes' => 'El campo :attribute debe un archivo de tipo: :values.',
+    'mimetypes' => 'El campo :attribute debe un archivo de tipo: :values.',
+    'min' => [
+        'array' => 'El campo :attribute debe tener al menos :min elementos.',
+        'file' => 'El campo :attribute debe ser de al menos :min kilobytes.',
+        'numeric' => 'El campo :attribute debe ser al menos :min.',
+        'string' => 'El campo :attribute debe contener como mínimo :min caracteres.',
+    ],
+    'min_digits' => 'El campo :attribute debe contener como mínimo :min dígitos.',
+    'missing' => 'El campo :attribute debe estar vacío.',
+    'missing_if' => 'El campo :attribute debe estar vacío cuando :other sea :value.',
+    'missing_unless' => 'El campo :attribute debe estar vacío a menos que :other sea :value.',
+    'missing_with' => 'El campo :attribute debe estar vacío cuando :values esté presente.',
+    'missing_with_all' => 'El campo :attribute debe estar vacío cuando :values estén presentes.',
+    'multiple_of' => 'El campo :attribute debe ser un múltiplo de :value.',
+    'not_in' => 'El :attribute seleccionado no es correcto.',
+    'not_regex' => 'El campo :attribute no es válido.',
+    'numeric' => 'El campo :attribute debe ser un número.',
+    'password' => [
+        'letters' => 'El cammpo :attribute debe contener al menos una letra.',
+        'mixed' => 'El campo :attribute debe contener al menos una letra minúscula y una mayúscula.',
+        'numbers' => 'El campo :attribute debe contener al menos un número.',
+        'symbols' => 'El campo :attribute debe contener al menos un símbolo.',
+        'uncompromised' => 'El valor de :attribute ha aparecido en una fuga de datos. Por favor, seleccione un valor diferente para :attribute.',
+    ],
+    'percent'       => 'El mínimo de amortización debe estar entre 0 y 100 cuando el tipo de amortización es porcentual.',
 
-    'not_in'               => 'El :attribute seleccionado no es correcto.',
-    'numeric'              => ':attribute debe ser un número.',
-    'present'              => 'El campo: atributo debe estar presente.',
-    'valid_regex'          => 'Este no es un regex válido. ',
-    'regex'                => ':attribute formato incorrecto.',
-    'required'             => 'El campo :attribute es obligatorio.',
-    'required_if'          => 'El campo :attribute es obligatorio cuando :other es :value.',
-    'required_unless'      => 'El campo :attribute es obligatorio a menos que :other esté en :values.',
-    'required_with'        => ':attribute es obligatrio cuando :values es present.',
-    'required_with_all'    => 'El campo: atributo se requiere cuando: los valores están presentes.',
-    'required_without'     => ':attribute es obligatrio cuando :values es not present.',
-    'required_without_all' => 'El campo: atributo es necesario cuando ninguno de: valores están presentes.',
-    'same'                 => ':attribute y :other deben coincidir.',
-    'size'                 => [
-        'numeric' => ':attribute debe tener :size.',
-        'file'    => ':attribute debe tener :size kilobytes.',
-        'string'  => ':attribute debe tener :size caracteres.',
-        'array'   => 'El atributo: debe contener: elementos de tamaño.',
+    'present' => 'El campo: atributo debe estar presente.',
+    'present_if' => 'El campo :attribute debe estar presente cuando :other sea :value.',
+    'present_unless' => 'El campo :attribute debe estar presente a menos que :other sea :value.',
+    'present_with' => 'El campo :attribute debe estar presente cuando :values esté presente.',
+    'present_with_all' => 'El campo :attribute debe estar presente cuando :values estén presentes.',
+    'prohibited' => 'El campo :attribute está prohibido.',
+    'prohibited_if' => 'El campo :attribute está prohibido cuando :other sea :value.',
+    'prohibited_unless' => 'El campo :attribute está prohibido a menos que :other esté en :values.',
+    'prohibits' => 'El campo :attribute prohíbe la presencia de :other.',
+    'regex' => 'El formato del campo :attribute no es válido.',
+    'required' => 'El campo :attribute es obligatorio.',
+    'required_array_keys' => 'El campo :attribute debe contener valores para: :values.',
+    'required_if' => 'El campo :attribute es obligatorio cuando :other es :value.',
+    'required_if_accepted' => 'El campo :attribute es obligatorio cuando se acepta :other.',
+    'required_if_declined' => 'El campo :attribute es requerido cuando :other es rechazado.',
+    'required_unless' => 'El campo :attribute es obligatorio a menos que :other esté en :values.',
+    'required_with' => 'El campo :attribute es obligatorio cuando :values está presente.',
+    'required_with_all' => 'El campo :attribute es requerido cuando :values están presentes.',
+    'required_without' => ':attribute es obligatrio cuando :values es not present.',
+    'required_without_all' => 'El campo :attribute es obligatorio cuando no está presente ninguno de los :values.',
+    'same' => 'El campo :attribute debe coincidir con :other.',
+    'size' => [
+        'array' => 'El campo :attribute debe contenter :size elementos.',
+        'file' => 'El campo :attribute debe ser de :size kilobytes.',
+        'numeric' => 'El campo :attribute debe ser :size.',
+        'string' => 'El campo :attribute debe ser de :size caracteres.',
     ],
+    'starts_with' => 'El campo :attribute debe iniciar con uno de los siguientes: :values.',
     'string'               => 'El atributo: debe ser una cadena.',
-    'timezone'             => 'El atributo: debe ser una zona válida.',
-    'two_column_unique_undeleted' => ':attribute debe ser único a través de :table1 y :table2. ',
-    'unique'               => ':attribute ya ha sido introducido.',
-    'uploaded'             => 'El atributo: no se pudo cargar.',
-    'url'                  => ':attribute formato incorrecto.',
-    'unique_undeleted'     => 'El :atrribute debe ser único.',
+    'two_column_unique_undeleted' => ':attribute debe ser único entre la :table1 y :table2. ',
+    'unique_undeleted'     => ':attribute debe ser único.',
     'non_circular'         => ':attribute no debe crear una referencia circular.',
     'not_array'            => ':attribute no puede ser una matriz.',
     'disallow_same_pwd_as_user_fields' => 'La contraseña no puede ser la misma que el nombre de usuario.',
@@ -102,11 +165,14 @@ return [
     'numbers'              => 'La contraseña debe contener al menos un número.',
     'case_diff'            => 'La contraseña debe usar mayúsculas y minúsculas.',
     'symbols'              => 'La contraseña debe contener símbolos.',
-    'gte'                  => [
-        'numeric'          => 'El valor no puede ser negativo'
-    ],
-    'checkboxes'           => ':attribute contiene opciones no válidas.',
-    'radio_buttons'        => ':attribute no es válido.',
+    'timezone' => 'El campo :attribute debe ser una zona horaria válida.',
+    'unique' => ':attribute ya está en uso.',
+    'uploaded' => ':attribute no se pudo cargar.',
+    'uppercase' => 'El campo :attribute debe estar en mayúsculas.',
+    'url' => 'El campo :attribute debe ser una URL válida.',
+    'ulid' => 'El campo :attribute debe ser un ULID válido.',
+    'uuid' => 'El campo :attribute debe ser un UUID válido.',
+    'fmcs_location' => 'El soporte completo de múltiples empresas y el alcance de la ubicación están habilitados en la Configuración de Administración, y la ubicación seleccionada y la empresa seleccionada no son compatibles.',
 
 
     /*
@@ -120,26 +186,38 @@ return [
     |
     */
 
+    'email_array'      => 'Una o más direcciones de correo electrónico no son válidas.',
+    'checkboxes'           => ':attribute contiene opciones no válidas.',
+    'radio_buttons'        => ':attribute no es válido.',
+    
     'custom' => [
-        'alpha_space' => 'El campo: atributo contiene un carácter que no está permitido.',
-        'email_array'      => 'Una o más direcciones de correo electrónico no es válida.',
-        'hashed_pass'      => 'Tu contraseña actual es incorrecta',
+        'alpha_space' => 'El campo :attribute contiene un carácter que no está permitido.',
+
+        'hashed_pass'      => 'Su contraseña actual es incorrecta',
         'dumbpwd'          => 'Esa contraseña es muy común.',
         'statuslabel_type' => 'Debe seleccionar un tipo de etiqueta de estado válido.',
+        'custom_field_not_found'          => 'Este campo parece que no existe, por favor, compruebe los nombres de sus campos personalizados.',
+        'custom_field_not_found_on_model' => 'Este campo parece existir, pero no está disponible en este conjunto de campos para el modelo de activo.',
 
         // date_format validation with slightly less stupid messages. It duplicates a lot, but it gets the job done :(
-        // We use this because the default error message for date_format is reflects php Y-m-d, which non-PHP
-        // people won't know how to format. 
-        'purchase_date.date_format'     => ':attribute debe ser una fecha válida con formato AAA-MM-DD',
-        'last_audit_date.date_format'   =>  ':attribute debe ser una fecha válida con formato AAA-MM-DD hh:mm:ss',
-        'expiration_date.date_format'   =>  ':attribute debe ser una fecha válida con formato AAA-MM-DD',
-        'termination_date.date_format'  =>  ':attribute debe ser una fecha válida con formato AAA-MM-DD',
-        'expected_checkin.date_format'  =>  ':attribute debe ser una fecha válida con formato AAA-MM-DD',
-        'start_date.date_format'        =>  ':attribute debe ser una fecha válida con formato AAA-MM-DD',
-        'end_date.date_format'          =>  ':attribute debe ser una fecha válida con formato AAA-MM-DD',
+        // We use this because the default error message for date_format reflects php Y-m-d, which non-PHP
+        // people won't know how to format.
+        'purchase_date.date_format'     => ':attribute debe ser una fecha válida con formato AAAA-MM-DD',
+        'last_audit_date.date_format'   =>  'El campo :attribute debe ser una fecha válida en formato AAAA-MM-DD hh:mm:ss',
+        'expiration_date.date_format'   =>  ':attribute debe ser una fecha válida en formato AAAA-MM-DD',
+        'termination_date.date_format'  =>  ':attribute debe ser una fecha válida en formato AAAA-MM-DD',
+        'expected_checkin.date_format'  =>  ':attribute debe ser una fecha válida en formato AAAA-MM-DD',
+        'start_date.date_format'        =>  ':attribute debe ser una fecha válida en formato AAAA-MM-DD',
+        'end_date.date_format'          =>  ':attribute debe ser una fecha válida en formato AAAA-MM-DD',
+        'invalid_value_in_field' => 'Valor no válido incluido en este campo',
 
-    ],
+        'ldap_username_field' => [
+            'not_in' =>         '<code>sAMAccountName</code> (mezcla de mayúsculas y minúsculas) no funcionará. Debe utilizar <code>samaccountname</code> (minúsculas) en su lugar.'
+        ],
+        'ldap_auth_filter_query' => ['not_in' => '<code>uid=samaccountname</code> probablemente no es un filtro de autenticación válido Probablemente quiera <code>uid=</code> '],
+        'ldap_filter' => ['regex' => 'Este valor probablemente no debería ir entre paréntesis.'],
 
+        ],
     /*
     |--------------------------------------------------------------------------
     | Custom Validation Attributes
@@ -155,8 +233,16 @@ return [
 
     /*
     |--------------------------------------------------------------------------
-    | Generic Validation Messages
+    | Generic Validation Messages - we use these in the jquery validation where we don't have
+    | access to the :attribute
     |--------------------------------------------------------------------------
     */
-    'invalid_value_in_field' => 'Valor no válido incluido en este campo',
+
+    'generic' => [
+        'invalid_value_in_field' => 'Valor no válido incluido en este campo',
+        'required' => 'El campo es obligatorio',
+        'email' => 'Por favor, ingrese una dirección de correo electrónico válida.',
+    ],
+
+
 ];
diff --git a/resources/lang/es-VE/account/general.php b/resources/lang/es-VE/account/general.php
index 7e637a3bef..b727b63023 100644
--- a/resources/lang/es-VE/account/general.php
+++ b/resources/lang/es-VE/account/general.php
@@ -2,10 +2,16 @@
 
 return array(
     'personal_api_keys' => 'Claves API personales',
-    'api_key_warning' => 'When generating an API token, be sure to copy it down immediately as they will not be visible to you again.',
-    'api_base_url' => 'La url base de tu API se encuentra en:',
+    'personal_access_token' => 'Credencial de acceso personal',
+    'personal_api_keys_success' => 'Clave API personal :key creada correctamente',
+    'here_is_api_key' => 'Aquí tiene su nueva credencial de acceso personal. Esta es la única vez que se mostrará, así que no la pierda. Ahora puede utilizar esta credencial para realizar solicitudes a la API.',
+    'api_key_warning' => 'Al generar una credencial para la API, asegúrese de copiarla inmediatamente, ya que no podrá volver a verla.',
+    'api_base_url' => 'La url base de su API se encuentra en:',
     'api_base_url_endpoint' => '/&lt;endpoint&gt;',
-    'api_token_expiration_time' => 'Los tokens de la API están establecidos para expirar en:',
-    'api_reference' => 'Please check the <a href="https://snipe-it.readme.io/reference" target="_blank">API reference</a> to find specific API endpoints and additional API documentation.',
-    'profile_updated' => 'Cuenta actualizada exitosamente',
+    'api_token_expiration_time' => 'Las credenciales de la API están establecidas para expirar en:',
+    'api_reference' => 'Consulte <a href="https://snipe-it.readme.io/reference" target="_blank">API reference</a> para encontrar los puntos finales (endpoins) de la API y documentación adicional.',
+    'profile_updated' => 'La cuenta fue actualizada exitosamente',
+    'no_tokens' => 'No ha creado ninguna credencial de acceso personal.',
+    'enable_sounds' => 'Habilitar efectos de sonido',
+    'enable_confetti' => 'Activar los efectos confeti',
 );
diff --git a/resources/lang/es-VE/admin/accessories/general.php b/resources/lang/es-VE/admin/accessories/general.php
index df37432f66..0b73924499 100644
--- a/resources/lang/es-VE/admin/accessories/general.php
+++ b/resources/lang/es-VE/admin/accessories/general.php
@@ -3,20 +3,20 @@
 return array(
     'accessory_category' 				=> 'Categoría de accesorio',
     'accessory_name'  					=> 'Nombre de Accesorio',
-    'checkout'  							=> 'Accesorio de Salida',
-    'checkin'  							=> 'Accesorio de Entrada',
-    'create'  							=> 'Crear Accesorio',
-    'edit'  							=> 'Editar Accesorio',
+    'checkout'  							=> 'Asignar accesorio',
+    'checkin'  							=> 'Ingresar accesorio',
+    'create'  							=> 'Crear accesorio',
+    'edit'  							=> 'Editar accesorio',
     'eula_text'							=> 'Acuerdo de uso de la categoría',
-    'eula_text_help'					=> 'Este campo permite personalizar los términos y condiciones para tipos específicos de activos. Si solo tiene unos términos y condiciones para todos sus activos, puede seleccionar la siguiente opción para usar el valor por defecto.',
-    'require_acceptance'				=> 'Pedir a los usuarios confirmación de aceptación de los elementos en esta categoría.',
+    'eula_text_help'					=> 'Este campo permite personalizar los acuerdos de uso para tipos específicos de activos. Si solo tiene un acuerdo de uso para todos sus activos, puede seleccionar la siguiente opción para usar el valor predeterminado.',
+    'require_acceptance'				=> 'Pedir a los usuarios confirmación de aceptación de los activos en esta categoría.',
     'no_default_eula'					=> 'No se encontraron términos y condiciones por defecto. Agregue unos en Configuración.',
     'total'  							=> 'Total',
     'remaining'  						=> 'Disponibles',
-    'update'  							=> 'Actualizar Accesorio',
-    'use_default_eula'					=> 'En su lugar, el <a href="#" data-toggle="modal" data-target="#eulaModal">acuerdo de uso predeterminado</a>.',
-    'use_default_eula_disabled'			=> '<del>En su lugar, use el acuerdo de uso predeterminado.</del> No está configurado el acuerdo de uso predeterminado. Por favor agregue uno en Configuración.',
+    'update'  							=> 'Actualizar accesorio',
+    'use_default_eula'					=> 'En su lugar, utilice el <a href="#" data-toggle="modal" data-target="#eulaModal">acuerdo de uso predeterminado</a>.',
+    'use_default_eula_disabled'			=> '<del>En su lugar, utilice el acuerdo de uso predeterminado.</del> No está configurado el acuerdo de uso predeterminado. Por favor agregue uno en Configuración.',
     'clone'                             => 'Clonar accesorio',
-    'delete_disabled'                   => 'Este accesorio no se puede eliminar aún porque algunos artículos todavía están retirados.',
+    'delete_disabled'                   => 'Este accesorio no se puede eliminar aún porque algunos elementos todavía están asignados.',
 
 );
diff --git a/resources/lang/es-VE/admin/accessories/message.php b/resources/lang/es-VE/admin/accessories/message.php
index 2c8a15defc..bc5bdfaea8 100644
--- a/resources/lang/es-VE/admin/accessories/message.php
+++ b/resources/lang/es-VE/admin/accessories/message.php
@@ -4,35 +4,39 @@ return array(
 
     'does_not_exist' => 'El accesorio [:id] no existe.',
     'not_found' => 'Ese accesorio no fue encontrado.',
-    'assoc_users'	 => 'El accesorio actual tiene :count elementos entregados a usuarios. Por favor ingresa los accesorios e intenta de nuevo. ',
+    'assoc_users'	 => 'Este accesorio actualmente tiene :count elemento(s) asignado(s) a usuarios. Por favor realice el ingreso de los accesorios y vuelva a intentar. ',
 
     'create' => array(
-        'error'   => 'El accesorio no se creó, inténtalo de nuevo.',
-        'success' => 'El accesorio se ha creado con éxito.'
+        'error'   => 'El accesorio no fue creado, por favor inténtelo de nuevo.',
+        'success' => 'Accesorio creado correctamente.'
     ),
 
     'update' => array(
-        'error'   => 'El accesorio no se actualizó, inténtalo de nuevo',
-        'success' => 'El accesorio se ha actualizado con éxito.'
+        'error'   => 'El accesorio no fue actualizado, por favor, inténtelo de nuevo',
+        'success' => 'El accesorio fue actualizado con éxito.'
     ),
 
     'delete' => array(
         'confirm'   => '¿Está seguro de que desea eliminar este accesorio?',
-        'error'   => 'Hubo un problema borrando este accesorio. Por favor inténtalo nuevamente.',
+        'error'   => 'Hubo un problema eliminando el accesorio. Por favor, inténtelo de nuevo.',
         'success' => 'El accesorio se ha borrado con éxito.'
     ),
 
      'checkout' => array(
-        'error'   		=> 'Equipo no ha sido retirado, inténtalo de nuevo',
-        'success' 		=> 'El accesorio se ha retirado exitosamente.',
-        'unavailable'   => 'El accesorio no está disponible para la compra. Compruebe la cantidad disponible',
-        'user_does_not_exist' => 'Este usuario es inválido. Por favor, inténtalo de nuevo.'
+        'error'   		=> 'El accesorio no fue asignado, por favor vuelva a intentarlo',
+        'success' 		=> 'Accesorio asignado correctamente.',
+        'unavailable'   => 'El accesorio no está disponible para ser asignado. Compruebe la cantidad disponible',
+        'user_does_not_exist' => 'Este usuario no es válido. Por favor, inténtelo de nuevo.',
+         'checkout_qty' => array(
+            'lte'  => 'En este momento solo existe un accesorio disponible de este tipo y está tratando de asignar :checkout_qty. Por favor, ajuste la cantidad asignada o el total de existencias de este accesorio e intente nuevamente.|Existen en total :number_currently_remaining accesorios disponibles y está tratando de asignar :checkout_qty. Por favor, ajuste la cantidad asignada o el total de existencias de este accesorio e intente nuevamente.',
+            ),
+           
     ),
 
     'checkin' => array(
-        'error'   		=> 'El accesorio no fue ingresado, por favor inténtalo de nuevo',
-        'success' 		=> 'El accesorio se ha ingresado con éxito.',
-        'user_does_not_exist' => 'Este usuario es inválido. Por favor, inténtalo de nuevo.'
+        'error'   		=> 'El accesorio no fue recibido, por favor vuelva a intentarlo',
+        'success' 		=> 'El accesorio ha sido ingresado correctamente.',
+        'user_does_not_exist' => 'Ese usuario no es válido. Por favor, inténtelo de nuevo.'
     )
 
 
diff --git a/resources/lang/es-VE/admin/accessories/table.php b/resources/lang/es-VE/admin/accessories/table.php
index c14fd29c89..8f7686ed97 100644
--- a/resources/lang/es-VE/admin/accessories/table.php
+++ b/resources/lang/es-VE/admin/accessories/table.php
@@ -5,7 +5,5 @@ return array(
 	'eula_text'      			=> 'Acuerdo de uso',
     'id'      					=> 'Identificación',
     'require_acceptance'      	=> 'Aceptación',
-    'title'      				=> 'Nombre del Accesorio',
-
-
+    'title'      				=> 'Nombre del accesorio',
 );
diff --git a/resources/lang/es-VE/admin/asset_maintenances/form.php b/resources/lang/es-VE/admin/asset_maintenances/form.php
index fd61ba8cd0..dfda6be9c5 100644
--- a/resources/lang/es-VE/admin/asset_maintenances/form.php
+++ b/resources/lang/es-VE/admin/asset_maintenances/form.php
@@ -1,14 +1,14 @@
 <?php
 
     return [
-        'asset_maintenance_type' => 'Tipo de Mantenimiento de Equipo',
+        'asset_maintenance_type' => 'Tipo de mantenimiento del activo',
         'title'                  => 'Título',
         'start_date'             => 'Fecha de inicio',
         'completion_date'        => 'Fecha de finalización',
         'cost'                   => 'Costo',
-        'is_warranty'            => 'Mejora de la Garantía',
-        'asset_maintenance_time' => 'Tiempo de mantenimiento de activos (en días)',
+        'is_warranty'            => 'Mejora de la garantía',
+        'asset_maintenance_time' => 'Duración del mantenimiento (en días)',
         'notes'                  => 'Notas',
-        'update'                 => 'Actualizar Mantenimiento de Equipo',
-        'create'                 => 'Crear Mantenimiento de Equipo'
+        'update'                 => 'Actualizar mantenimiento del activo',
+        'create'                 => 'Crear mantenimiento del activo'
     ];
diff --git a/resources/lang/es-VE/admin/asset_maintenances/general.php b/resources/lang/es-VE/admin/asset_maintenances/general.php
index 3eef8459e4..bdd340fc97 100644
--- a/resources/lang/es-VE/admin/asset_maintenances/general.php
+++ b/resources/lang/es-VE/admin/asset_maintenances/general.php
@@ -2,9 +2,9 @@
 
     return [
         'asset_maintenances' => 'Mantenimiento de activos',
-        'edit'               => 'Editar Mantenimiento de Activos',
-        'delete'             => 'Borrar Mantenimiento de Activos',
-        'view'               => 'Ver Detalles de Mantenimiento de Activo',
+        'edit'               => 'Editar mantenimiento del activo',
+        'delete'             => 'Eliminar mantenimiento del activo',
+        'view'               => 'Ver detalles del mantenimiento del activo',
         'repair'             => 'Reparar',
         'maintenance'        => 'Mantenimiento',
         'upgrade'            => 'Mejorar',
diff --git a/resources/lang/es-VE/admin/asset_maintenances/message.php b/resources/lang/es-VE/admin/asset_maintenances/message.php
index d8886beac2..97ac17af2f 100644
--- a/resources/lang/es-VE/admin/asset_maintenances/message.php
+++ b/resources/lang/es-VE/admin/asset_maintenances/message.php
@@ -4,18 +4,18 @@
         'not_found'                    => '¡El mantenimiento del activo que estaba buscando no se encontró!',
         'delete'                       => [
             'confirm' => '¿Está seguro de que desea eliminar el mantenimiento de este activo?',
-            'error'   => 'Hubo un problema borrando el mantenimiento del activo. Por favor, inténtalo de nuevo.',
-            'success' => 'El mantenimiento de activo fue eliminado con éxito.',
+            'error'   => 'Hubo un problema al eliminar el mantenimiento del activo. Por favor inténtelo nuevamente.',
+            'success' => 'El mantenimiento del activo fue eliminado de manera exitosa.',
         ],
         'create'                       => [
             'error'   => 'El Mantenimiento de Activo no se ha creado, por favor inténtalo de nuevo.',
-            'success' => 'Mantenimiento de Activo creado con éxito.',
+            'success' => 'El mantenimiento del activo fue creado de manera exitosa.',
         ],
         'edit'                       => [
-            'error'   => 'El Mantenimiento de Activo no se ha editado, por favor inténtalo de nuevo.',
-            'success' => 'Mantenimiento de Activo editado con éxito.',
+            'error'   => 'El mantenimiento del activo no fue editado. Por favor, inténtelo de nuevo.',
+            'success' => 'Mantenimiento del activo editado con éxito.',
         ],
-        'asset_maintenance_incomplete' => 'No se ha completado aún',
+        'asset_maintenance_incomplete' => 'Aún no se ha completado',
         'warranty'                     => 'Garantía',
-        'not_warranty'                 => 'Sin Garantía',
+        'not_warranty'                 => 'Sin garantía',
     ];
diff --git a/resources/lang/es-VE/admin/asset_maintenances/table.php b/resources/lang/es-VE/admin/asset_maintenances/table.php
index c0cf62380d..6da43b1c77 100644
--- a/resources/lang/es-VE/admin/asset_maintenances/table.php
+++ b/resources/lang/es-VE/admin/asset_maintenances/table.php
@@ -1,7 +1,7 @@
 <?php
 
     return [
-        'title'         => 'Mantenimiento de Activo',
+        'title'         => 'Mantenimiento del activo',
         'asset_name'    => 'Nombre del activo',
         'is_warranty'   => 'Garantía',
         'dl_csv'        => 'Descargar CSV',
diff --git a/resources/lang/es-VE/admin/categories/general.php b/resources/lang/es-VE/admin/categories/general.php
index 3e0ddf7eaf..b862429686 100644
--- a/resources/lang/es-VE/admin/categories/general.php
+++ b/resources/lang/es-VE/admin/categories/general.php
@@ -3,8 +3,8 @@
 return array(
     'asset_categories' 					=> 'Categorías de activos',
     'category_name'  					=> 'Nombre de la categoría',
-    'checkin_email'                     => 'Enviar un correo al usuario al devolver/asignar.',
-    'checkin_email_notification'        => 'A este usuario se le enviará un correo electrónico al devolver/asignar.',
+    'checkin_email'                     => 'Enviar un correo electrónico al usuario al recibir/devolver.',
+    'checkin_email_notification'        => 'A este usuario se le enviará un correo electrónico al recibir/devolver.',
     'clone'                             => 'Clonar categoría',
     'create'  							=> 'Crear categoría',
     'edit'                              => 'Editar categoría',
diff --git a/resources/lang/es-VE/admin/categories/message.php b/resources/lang/es-VE/admin/categories/message.php
index 9875a01d88..997487469e 100644
--- a/resources/lang/es-VE/admin/categories/message.php
+++ b/resources/lang/es-VE/admin/categories/message.php
@@ -3,8 +3,8 @@
 return array(
 
     'does_not_exist' => 'La categoría no existe.',
-    'assoc_models'	 => 'Esta categoría está asociada actualmente con al menos un modelo y no se puede eliminar. Por favor actualice sus modelos para que no hagan referencia a esta categoría e inténtelo de nuevo. ',
-    'assoc_items'	 => 'Esta categoría está asociada actualmente con al menos un: asset_type y no se puede eliminar. Por favor actualice su: asset_type para que no haga referencia a esta categoría e inténtelo de nuevo. ',
+    'assoc_models'	 => 'Esta categoría está asociada actualmente con al menos un modelo y no puede ser eliminada. Actualice los modelos para que ya no hagan referencia a esta categoría e inténtelo de nuevo. ',
+    'assoc_items'	 => 'Esta categoría está asociada actualmente con al menos un: asset_type y no puede ser eliminada. Actualice su :asset_type para que ya no haga referencia a esta categoría e inténtelo de nuevo. ',
 
     'create' => array(
         'error'   => 'La categoría no fue creada, por favor inténtelo de nuevo.',
diff --git a/resources/lang/es-VE/admin/categories/table.php b/resources/lang/es-VE/admin/categories/table.php
index b99c0f335c..fc18e5ac6f 100644
--- a/resources/lang/es-VE/admin/categories/table.php
+++ b/resources/lang/es-VE/admin/categories/table.php
@@ -2,8 +2,8 @@
 
 return array(
 	'eula_text'      			=> 'Acuerdo de uso',
-    'id'      					=> 'Identificación',
-    'parent'   					=> 'Padre',
+    'id'      					=> 'ID',
+    'parent'   					=> 'Ubicación padre',
     'require_acceptance'      	=> 'Aceptación',
     'title'      				=> 'Nombre de la categoría del activo',
 
diff --git a/resources/lang/es-VE/admin/companies/general.php b/resources/lang/es-VE/admin/companies/general.php
index fd18d9f752..8fb72d5b94 100644
--- a/resources/lang/es-VE/admin/companies/general.php
+++ b/resources/lang/es-VE/admin/companies/general.php
@@ -1,7 +1,7 @@
 <?php
 
 return [
-    'select_company' => 'Seleccione una compañía',
+    'select_company' => 'Seleccionar una compañía',
     'about_companies' => 'Acerca de las compañías',
     'about_companies_description' => '        Puede utilizar las compañías como un simple campo informativo, o puede utilizarlas para restringir la visibilidad y la disponibilidad de los activos a los usuarios con una compañía específica habilitando la opción "Soporte completo a múltiples compañías" en "Configuración de administración"',
 ];
diff --git a/resources/lang/es-VE/admin/companies/message.php b/resources/lang/es-VE/admin/companies/message.php
index 4ac0e1ed2b..155c40aa0b 100644
--- a/resources/lang/es-VE/admin/companies/message.php
+++ b/resources/lang/es-VE/admin/companies/message.php
@@ -3,10 +3,10 @@
 return [
     'does_not_exist' => 'La compañía no existe.',
     'deleted'        => 'Compañía eliminada',
-    'assoc_users'    => 'Esta compañía está actualmente asociada con al menos un modelo y no puede ser eliminada. Por favor, actualiza tus modelos para no referenciar más esta compañía e inténtalo de nuevo. ',
+    'assoc_users'    => 'Esta compañía está actualmente asociada con al menos un modelo y no puede ser eliminada. Por favor actualice sus modelos para que no hagan referencia a esta compañía e inténtelo de nuevo. ',
     'create' => [
-        'error'   => 'La compañía no ha sido creada, por favor intente de nuevo.',
-        'success' => 'Compañía creada con éxito.',
+        'error'   => 'La compañía no fue creada, por favor, inténtelo de nuevo.',
+        'success' => 'Compañía creada satisfactoriamente.',
     ],
     'update' => [
         'error'   => 'La compañía no se ha actualizado, por favor inténtelo de nuevo',
@@ -14,7 +14,7 @@ return [
     ],
     'delete' => [
         'confirm' => '¿Está seguro de que quiere eliminar esta compañía?',
-        'error'   => 'Hubo un problema borrando la compañía. Por favor inténtelo de nuevo.',
-        'success' => 'La compañía se ha borrado con éxito.',
+        'error'   => 'Hubo un problema eliminando la compañía. Por favor, inténtelo de nuevo.',
+        'success' => 'La compañía fue eliminada correctamente.',
     ],
 ];
diff --git a/resources/lang/es-VE/admin/companies/table.php b/resources/lang/es-VE/admin/companies/table.php
index f67382c9fa..1cc605dfd1 100644
--- a/resources/lang/es-VE/admin/companies/table.php
+++ b/resources/lang/es-VE/admin/companies/table.php
@@ -1,11 +1,11 @@
 <?php
 return array(
     'companies' => 'Compañías',
-    'create'    => 'Crear Compañía',
+    'create'    => 'Crear una compañía',
     'email'     => 'Correo electrónico de la compañía',
     'title'     => 'Compañía',
     'phone'     => 'Teléfono de la compañía',
-    'update'    => 'Actualizar Compañía',
-    'name'      => 'Nombre de Compañía',
-    'id'        => 'Identificación',
+    'update'    => 'Actualizar compañía',
+    'name'      => 'Nombre de la compañía',
+    'id'        => 'ID',
 );
diff --git a/resources/lang/es-VE/admin/components/general.php b/resources/lang/es-VE/admin/components/general.php
index 0e2ae09c36..4f4a97e381 100644
--- a/resources/lang/es-VE/admin/components/general.php
+++ b/resources/lang/es-VE/admin/components/general.php
@@ -1,16 +1,16 @@
 <?php
 
 return array(
-    'component_name'                  => 'Nombre de Componente',
-    'checkin'                             => 'Ingreso de Componente',
-    'checkout'                             => 'Salida de Componente',
-    'cost'				=> 'Costo de Compra',
-    'create'                             => 'Crear Componente',
-    'edit'                             => 'Editar Componente',
+    'component_name'                  => 'Nombre del componente',
+    'checkin'                             => 'Ingresar componente',
+    'checkout'                             => 'Asignar componente',
+    'cost'				=> 'Costo de compra',
+    'create'                             => 'Crear componente',
+    'edit'                             => 'Editar componente',
     'date'					=> 'Fecha de compra',
     'order'					=> 'Número de orden',
     'remaining' 			             => 'Restante',
     'total' 			                 => 'Total',
-    'update'                            => 'Actualizar Componente',
-    'checkin_limit'            => 'La cantidad devuelta debe ser igual o menor que :assigned_qty'
+    'update'                            => 'Actualizar componente',
+    'checkin_limit'            => 'La cantidad ingresada debe ser igual o menor que :assigned_qty'
 );
diff --git a/resources/lang/es-VE/admin/components/message.php b/resources/lang/es-VE/admin/components/message.php
index 30872a9bed..e38968a588 100644
--- a/resources/lang/es-VE/admin/components/message.php
+++ b/resources/lang/es-VE/admin/components/message.php
@@ -5,32 +5,33 @@ return array(
     'does_not_exist' => 'El componente no existe.',
 
     'create' => array(
-        'error'   => 'El componente no se ha creado, por favor inténtalo de nuevo.',
-        'success' => 'Componente creado con éxito.'
+        'error'   => 'El componente no fue creado, por favor inténtelo de nuevo.',
+        'success' => 'El componente se creó satisfactoriamente.'
     ),
 
     'update' => array(
-        'error'   => 'El componente no se ha actualizado, por favor inténtalo de nuevo',
-        'success' => 'Componente actualizado con éxito.'
+        'error'   => 'El componente no se actualizó, por favor inténtelo de nuevo',
+        'success' => 'Componente actualizado correctamente.'
     ),
 
     'delete' => array(
         'confirm'   => '¿Está seguro de que desea eliminar este componente?',
-        'error'   => 'Hubo un problema al borrar el componente. Por favor inténtalo de nuevo.',
-        'success' => 'El componente se ha borrado con éxito.'
+        'error'   => 'Hubo un problema eliminando el componente. Por favor, inténtelo de nuevo.',
+        'success' => 'El componente fue borrado correctamente.',
+        'error_qty'   => 'Some components of this type are still checked out. Please check them in and try again.',
     ),
 
      'checkout' => array(
-        'error'   		=> 'El componente no se ha retirado, inténtelo de nuevo',
-        'success' 		=> 'El componente se ha retirado con éxito.',
-        'user_does_not_exist' => 'El usuario es inválido. Por favor, inténtelo de nuevo.',
-        'unavailable'      => 'No quedan suficientes componentes: :remaining resting, :requested ',
+        'error'   		=> 'El componente no fue asignado, por favor, inténtelo de nuevo',
+        'success' 		=> 'El componente se ha asignado correctamente.',
+        'user_does_not_exist' => 'Ese usuario no es válido. Por favor, inténtelo de nuevo.',
+        'unavailable'      => 'No quedan suficientes componentes: :remaining disponibles, :requested solicitados ',
     ),
 
     'checkin' => array(
-        'error'   		=> 'El componente no se ha ingresado, por favor inténtalo de nuevo',
+        'error'   		=> 'No se realizó el ingreso del componente, por favor inténtelo de nuevo',
         'success' 		=> 'Componente ingresado con éxito.',
-        'user_does_not_exist' => 'El usuario es inválido. Por favor inténtelo de nuevo.'
+        'user_does_not_exist' => 'Ese usuario no es válido. Por favor, inténtelo de nuevo.'
     )
 
 
diff --git a/resources/lang/es-VE/admin/components/table.php b/resources/lang/es-VE/admin/components/table.php
index 72f0b866d2..8f4de5c93c 100644
--- a/resources/lang/es-VE/admin/components/table.php
+++ b/resources/lang/es-VE/admin/components/table.php
@@ -1,5 +1,5 @@
 <?php
 
 return array(
-    'title'      				=> 'Nombre del Componente',
+    'title'      				=> 'Nombre de componente',
 );
diff --git a/resources/lang/es-VE/admin/consumables/general.php b/resources/lang/es-VE/admin/consumables/general.php
index 0f50c6194d..d93d595597 100644
--- a/resources/lang/es-VE/admin/consumables/general.php
+++ b/resources/lang/es-VE/admin/consumables/general.php
@@ -1,11 +1,12 @@
 <?php
 
 return array(
-    'checkout'                          => 'Salida de Consumible al Usuario',
-    'consumable_name'                   => 'Nombre del Consumible',
-    'create'                            => 'Crear Consumible',
+    'checkout'                          => 'Asignar consumible a usuario',
+    'consumable_name'                   => 'Nombre del consumible',
+    'create'                            => 'Crear consumible',
     'item_no'                           => 'Artículo No.',
     'remaining' 			            => 'Restante',
     'total' 			                => 'Total',
     'update'                            => 'Actualizar Consumible',
+    'inventory_warning'                 => 'El inventario de este consumible está por debajo de la cantidad mínima de :min_count',
 );
diff --git a/resources/lang/es-VE/admin/consumables/message.php b/resources/lang/es-VE/admin/consumables/message.php
index 2541e392fc..ca3da8895a 100644
--- a/resources/lang/es-VE/admin/consumables/message.php
+++ b/resources/lang/es-VE/admin/consumables/message.php
@@ -2,35 +2,36 @@
 
 return array(
 
+    'invalid_category_type' => 'La categoría debe ser una categoría para consumibles.',
     'does_not_exist' => 'El consumible no existe.',
 
     'create' => array(
-        'error'   => 'El consumible no fue creado, por favor inténtalo de nuevo.',
+        'error'   => 'El consumible no fue creado, por favor inténtelo nuevamente.',
         'success' => 'Consumible creado con éxito.'
     ),
 
     'update' => array(
-        'error'   => 'El consumible no fue actualizado, por favor inténtalo de nuevo',
-        'success' => 'Consumible actualizado con éxito.'
+        'error'   => 'El consumible no fue actualizado, por favor, inténtelo de nuevo',
+        'success' => 'Consumible actualizado correctamente.'
     ),
 
     'delete' => array(
         'confirm'   => '¿Está seguro de que desea eliminar este consumible?',
         'error'   => 'Hubo un problema al eliminar el consumible. Por favor inténtelo de nuevo.',
-        'success' => 'El consumible fue borrado con éxito.'
+        'success' => 'El consumible ha sido eliminado correctamente.'
     ),
 
      'checkout' => array(
         'error'   		=> 'El consumible no fue asignado, por favor inténtelo de nuevo',
-        'success' 		=> 'El consumible fue retirado con éxito.',
-        'user_does_not_exist' => 'El usuario es inválido. Por favor, inténtelo de nuevo.',
-         'unavailable'      => 'No hay suficientes consumibles para este pago. Por favor, compruebe la cantidad restante. ',
+        'success' 		=> 'Consumible asignado correctamente.',
+        'user_does_not_exist' => 'Ese usuario no es válido. Por favor, inténtelo de nuevo.',
+         'unavailable'      => 'No hay suficientes consumibles para esta asignación. Por favor, compruebe la cantidad disponible. ',
     ),
 
     'checkin' => array(
-        'error'   		=> 'Consumible no fue devuelto, por favor inténtelo de nuevo',
-        'success' 		=> 'El consumible fue ingresado con éxito.',
-        'user_does_not_exist' => 'El usuario es inválido. Por favor inténtelo de nuevo.'
+        'error'   		=> 'El consumible no fue ingresado, por favor inténtelo de nuevo',
+        'success' 		=> 'El consumible fue ingresado correctamente.',
+        'user_does_not_exist' => 'Ese usuario no es válido. Por favor, inténtelo de nuevo.'
     )
 
 
diff --git a/resources/lang/es-VE/admin/consumables/table.php b/resources/lang/es-VE/admin/consumables/table.php
index befcfc511b..2e346e2962 100644
--- a/resources/lang/es-VE/admin/consumables/table.php
+++ b/resources/lang/es-VE/admin/consumables/table.php
@@ -1,5 +1,5 @@
 <?php
 
 return array(
-    'title'      				=> 'Nombre del Consumible',
+    'title'      				=> 'Nombre del consumible',
 );
diff --git a/resources/lang/es-VE/admin/custom_fields/general.php b/resources/lang/es-VE/admin/custom_fields/general.php
index 096e87bdd0..c28100f708 100644
--- a/resources/lang/es-VE/admin/custom_fields/general.php
+++ b/resources/lang/es-VE/admin/custom_fields/general.php
@@ -2,60 +2,63 @@
 
 return [
     'custom_fields'		        => 'Campos personalizados',
-    'manage'                    => 'Gestionar',
+    'manage'                    => 'Administrar',
     'field'		                => 'Campo',
     'about_fieldsets_title'		=> 'Acerca de los grupos de campos',
     'about_fieldsets_text'		=> 'Los grupos de campos le permiten agrupar campos personalizados que se reutilizan frecuentemente para determinados modelos de activos.',
-    'custom_format'             => 'Formato de expresion regular personalizada...',
-    'encrypt_field'      	        => 'Encriptar el valor de este campo en la base de datos',
-    'encrypt_field_help'      => 'ADVERTENCIA: Encriptar un campo hace que no pueda ser buscado.',
-    'encrypted'      	        => 'Encriptado',
+    'custom_format'             => 'Expresión regular personalizada...',
+    'encrypt_field'      	        => 'Cifrar el valor de este campo en la base de datos',
+    'encrypt_field_help'      => 'ADVERTENCIA: Cifrar un campo hace que no se pueda buscar.',
+    'encrypted'      	        => 'Cifrado',
     'fieldset'      	        => 'Grupo de campos',
     'qty_fields'      	      => 'Campos de cantidad',
-    'fieldsets'      	        => 'Grupo de campos',
+    'fieldsets'      	        => 'Grupos de campos',
     'fieldset_name'           => 'Nombre del grupo de campos',
-    'field_name'              => 'Nombre del Campo',
-    'field_values'            => 'Valores del Campo',
-    'field_values_help'       => 'Añadir opciones seleccionables, una por línea. Líneas en blanco además de la primera serán ignoradas.',
-    'field_element'           => 'Elemento de Formulario',
+    'field_name'              => 'Nombre del campo',
+    'field_values'            => 'Valores de los campos',
+    'field_values_help'       => 'Agregue opciones seleccionables, una por línea. Se ignorarán las líneas en blanco que no sean la primera.',
+    'field_element'           => 'Elemento de formulario',
     'field_element_short'     => 'Elemento',
     'field_format'            => 'Formato',
-    'field_custom_format'     => 'Formato Personalizado de Regex',
-    'field_custom_format_help'     => 'Este campo te permite usar una expresión regex para la validación. Debería empezar como "regex:" - por ejemplo, para validar que un campo personalizado contiene un IMEI válido (15 dígitos numéricos), tú usarías <code>regex:/^[0-9]{15}$/</code>.',
+    'field_custom_format'     => 'Expresión regular personalizada',
+    'field_custom_format_help'     => 'Este campo le permite usar una expresión regular para la validación. Debería empezar con "regex:" - por ejemplo, para validar que un valor de campo personalizado contiene un IMEI válido (15 dígitos numéricos), podría usar <code>regex:/^[0-9]{15}$/</code>.',
     'required'   		          => 'Obligatorio',
     'req'   		              => 'Obl.',
-    'used_by_models'   		    => 'Usado por Modelos',
+    'used_by_models'   		    => 'Usado por los modelos',
     'order'   		            => 'Orden',
     'create_fieldset'         => 'Nuevo grupo de campos',
     'update_fieldset'         => 'Actualizar grupo de campos',
     'fieldset_does_not_exist'   => 'El grupo de campos :id no existe',
-    'fieldset_updated'         => 'Conjunto de campos actualizado',
-    'create_fieldset_title' => 'Crear un nuevo conjunto de campos',
-    'create_field'            => 'Nuevo Campo Personalizado',
-    'create_field_title' => 'Crear un campo personalizado',
-    'value_encrypted'      	        => 'El valor de este campo está encriptado en la base de datos. Sólo los administradores podrán ver el valor desencriptado',
-    'show_in_email'     => '¿Incluye el valor de este campo en los correos de pago enviados al usuario? Los campos cifrados no se pueden incluir en los correos electrónicos',
-    'show_in_email_short'     => 'Incluye en correos electrónicos.',
-    'help_text' => 'Texto de Ayuda',
-    'help_text_description' => 'Este es un texto opcional que aparecerá debajo de los elementos del formulario al editar un activo para proporcionar contexto en el campo.',
-    'about_custom_fields_title' => 'Acerca de campos personalizados',
+    'fieldset_updated'         => 'Se actualizó el grupo de campos',
+    'create_fieldset_title' => 'Crear un nuevo grupo de campos',
+    'create_field'            => 'Nuevo campo personalizado',
+    'create_field_title' => 'Crear un nuevo campo personalizado',
+    'value_encrypted'      	        => 'El valor de este campo está cifrado en la base de datos. Solo los administradores pueden ver el valor descifrado',
+    'show_in_email'     => '¿Incluir el valor de este campo en los correos de asignación enviados al usuario? Los campos cifrados no se pueden incluir en los correos electrónicos',
+    'show_in_email_short' => 'Incluir en los correos electrónicos',
+    'help_text' => 'Texto de ayuda',
+    'help_text_description' => 'Este es un texto opcional que aparecerá debajo de los campos del formulario cuando se edite un activo para proporcionar contexto adicional.',
+    'about_custom_fields_title' => 'Acerca de los campos personalizados',
     'about_custom_fields_text' => 'Los campos personalizados le permiten agregar atributos arbitrarios a los activos.',
-    'add_field_to_fieldset' => 'Agregar campo a un conjunto de campos',
-    'make_optional' => 'Requerido - haga click para hacerlo opcional',
-    'make_required' => 'Opcional - haga click para hacerlo opcional',
+    'add_field_to_fieldset' => 'Añadir campo al grupo de campos',
+    'make_optional' => 'Obligatorio - haga clic para hacerlo opcional',
+    'make_required' => 'Opcional - haga clic para que sea obligatorio',
     'reorder' => 'Reordenar',
-    'db_field' => 'Campo de DB',
+    'db_field' => 'Campo en base de datos',
     'db_convert_warning' => 'ADVERTENCIA. Este campo está en la tabla de campos personalizados como <code>:db_column</code> pero debe ser <code>:expected</code>.',
-    'is_unique' => 'Este valor debe ser unico en todos los activos',
+    'is_unique' => 'Este valor debe ser único para todos los activos',
     'unique' => 'Único',
-    'display_in_user_view' => 'Permitir al usuario retirado ver estos valores en su página Ver Recursos asignados',
+    'display_in_user_view' => 'Permitir al usuario ver estos valores en la página "Ver activos asignados"',
     'display_in_user_view_table' => 'Visible para el usuario',
-    'auto_add_to_fieldsets' => 'Añadir automáticamente a cada nuevo conjunto de campos',
-    'add_to_preexisting_fieldsets' => 'Añadir a cualquier conjunto de campos existente',
-    'show_in_listview' => 'Mostrar por defecto en las vistas de la lista. Los usuarios autorizados podrán mostrar/ocultar a través del selector de columnas',
-    'show_in_listview_short' => 'Mostrar en listas',
+    'auto_add_to_fieldsets' => 'Añadir automáticamente a cada nuevo grupo de campos',
+    'add_to_preexisting_fieldsets' => 'Añadir a cualquier grupo de campos existente',
+    'show_in_listview' => 'Mostrar por defecto en las consultas. Los usuarios autorizados podrán mostrar/ocultar a través del selector de columnas',
+    'show_in_listview_short' => 'Mostrar en las listas',
     'show_in_requestable_list_short' => 'Mostrar en la lista de activos que se pueden solicitar',
     'show_in_requestable_list' => 'Mostrar el valor en la lista de activos que se pueden solicitar. Los campos cifrados no se mostrarán',
     'encrypted_options' => 'Este campo está cifrado, por lo que algunas opciones de visualización no estarán disponibles.',
+    'display_checkin' => 'Display in checkin forms',
+    'display_checkout' => 'Display in checkout forms',
+    'display_audit' => 'Display in audit forms',
 
 ];
diff --git a/resources/lang/es-VE/admin/custom_fields/message.php b/resources/lang/es-VE/admin/custom_fields/message.php
index 3d4ce6d205..c922f8b9ac 100644
--- a/resources/lang/es-VE/admin/custom_fields/message.php
+++ b/resources/lang/es-VE/admin/custom_fields/message.php
@@ -5,53 +5,54 @@ return array(
     'field' => array(
         'invalid'   => 'El campo no existe.',
         'already_added'   => 'El campo ya fue agregado',
+        'none_selected'   => 'No se ha seleccionado ningún campo',
 
         'create' => array(
             'error'   => 'El campo no fue creado, por favor inténtalo de nuevo.',
-            'success' => 'Campo creado con éxito.',
-            'assoc_success' => 'Campo añadido al Fieldset con éxito.'
+            'success' => 'Campo creado correctamente.',
+            'assoc_success' => 'Campo correctamente añadido al grupo de campos.'
         ),
 
         'update' => array(
-            'error'   => 'El campo no se ha actualizado, por favor, inténtelo de nuevo',
-            'success' => 'Campo actualizado con éxito.'
+            'error'   => 'El campo no fue actualizado, por favor, inténtelo de nuevo',
+            'success' => 'Campo actualizado correctamente.'
         ),
 
         'delete' => array(
             'confirm'   	=> '¿Está seguro de que quiere eliminar este campo?',
-            'error'   => 'Hubo un problema al borrar el campo. Por favor, inténtelo de nuevo.',
-            'success' => 'El campo fue borrado con éxito.',
-            'in_use'   => 'Campo aún en uso.',
+            'error'   => 'Hubo un problema al eliminar el campo. Por favor, inténtelo de nuevo.',
+            'success' => 'El campo se eliminó correctamente.',
+            'in_use'   => 'El campo aún está en uso.',
         )
 
     ),
 
     'fieldset' => array(
 
-        'does_not_exist' => 'No existe el Fieldset',
+        'does_not_exist' => 'El grupo de campos no existe',
 
         'create' => array(
-            'error'   => 'No se ha creado el Fieldset, por favor, inténtelo de nuevo.',
-            'success' => 'Fieldset creado con éxito.'
+            'error'   => 'El grupo de campos no ha sido creado, por favor inténtelo de nuevo.',
+            'success' => 'Grupo de campos creado satisfactoriamente.'
         ),
 
         'update' => array(
-            'error'   => 'El Fieldset no ha sido actualizado, por favor, inténtelo de nuevo',
-            'success' => 'Fieldset actualizado con éxito.'
+            'error'   => 'El grupo de campos no ha sido actualizado, por favor inténtelo de nuevo',
+            'success' => 'Grupo de campos actualizado correctamente.'
         ),
 
         'delete' => array(
             'confirm'   	=> '¿Está seguro de que quiere eliminar este grupo de campos?',
-            'error'   => 'Hubo un problema al eliminar el Fieldset. Por favor, inténtelo de nuevo.',
-            'success' => 'El Fieldset ha sido borrado con éxito.',
-            'in_use'   => 'Este Fieldset aún está en uso.',
+            'error'   => 'Hubo un problema al eliminar el grupo de campos. Inténtelo de nuevo.',
+            'success' => 'El grupo de campos se eliminó correctamente.',
+            'in_use'   => 'El grupo de campos aún está en uso.',
         )
 
     ),
 
     'fieldset_default_value' => array(
 
-        'error' => 'Error al validar los valores por defecto del conjunto de campos.',
+        'error' => 'Error al validar los valores predeterminados del grupo de campos.',
 
     ),
 
diff --git a/resources/lang/es-VE/admin/departments/message.php b/resources/lang/es-VE/admin/departments/message.php
index a108a5a625..eabf4774d8 100644
--- a/resources/lang/es-VE/admin/departments/message.php
+++ b/resources/lang/es-VE/admin/departments/message.php
@@ -4,19 +4,19 @@ return array(
 
     'does_not_exist' => 'El departamento no existe.',
     'department_already_exists' => 'Ya existe un departamento con ese nombre en esta ubicación de la compañía. O elija un nombre más específico para este departamento. ',
-    'assoc_users'	 => 'Este departamento está actualmente asociado con al menos un usuario y no puede ser borrado. Por favor actualiza tus usuarios para no referenciar este departamento e inténtelo de nuevo. ',
+    'assoc_users'	 => 'Este departamento está actualmente asociado con al menos un usuario y no puede ser eliminado. Por favor, actualice sus usuarios para que no hagan referencia a este departamento e inténtelo de nuevo. ',
     'create' => array(
         'error'   => 'El departamento no fue creado, por favor, inténtelo de nuevo.',
-        'success' => 'Departamento creado con éxito.'
+        'success' => 'Departamento creado correctamente.'
     ),
     'update' => array(
-        'error'   => 'El departamento no se ha actualizado, por favor, inténtelo de nuevo',
-        'success' => 'El departamento fue actualizado con éxito.'
+        'error'   => 'El departamento no fue actualizado, por favor inténtelo de nuevo',
+        'success' => 'Departamento actualizado con éxito.'
     ),
     'delete' => array(
         'confirm'   	=> '¿Está seguro de que desea eliminar este departamento?',
         'error'   => 'Hubo un problema al borrar el departamento. Por favor, inténtelo de nuevo.',
-        'success' => 'El departamento ha sido borrado con éxito.'
+        'success' => 'El departamento fue eliminado correctamente.'
     )
 
 );
diff --git a/resources/lang/es-VE/admin/departments/table.php b/resources/lang/es-VE/admin/departments/table.php
index 8d97ccac19..422bd9b82c 100644
--- a/resources/lang/es-VE/admin/departments/table.php
+++ b/resources/lang/es-VE/admin/departments/table.php
@@ -3,9 +3,9 @@
 return array(
 
     'id'                        => 'Identificación',
-    'name'                      => 'Nombre de Departamento',
+    'name'                      => 'Nombre del departamento',
     'manager'                   => 'Supervisor',
     'location'                  => 'Ubicación',
     'create'                    => 'Crear departamento',
-    'update'                    => 'Actualizar Departamento',
+    'update'                    => 'Actualizar departamento',
     );
diff --git a/resources/lang/es-VE/admin/depreciations/general.php b/resources/lang/es-VE/admin/depreciations/general.php
index af587e734c..4ab7af8afa 100644
--- a/resources/lang/es-VE/admin/depreciations/general.php
+++ b/resources/lang/es-VE/admin/depreciations/general.php
@@ -6,11 +6,15 @@ return [
     'asset_depreciations'  					=> 'Depreciación de activos',
     'create'  					            => 'Crear depreciación',
     'depreciation_name'  					=> 'Nombre de depreciación',
-    'depreciation_min'                      => 'Valor del piso de la depreciación',
-    'number_of_months'  					=> 'Número de Meses',
-    'update'  					            => 'Actualizar Depreciación',
+    'depreciation_min'                      => 'Valor mínimo de depreciación',
+    'number_of_months'  					=> 'Número de meses',
+    'update'  					            => 'Actualizar depreciación',
     'depreciation_min'                      => 'Valor mínimo después de la depreciación',
     'no_depreciations_warning'               => '<strong>Advertencia: </strong>
                       No tiene ninguna depreciación configurada.
                       Por favor, configure al menos una depreciación para ver el informe de depreciación.',
+    'depreciation_method'                   => 'Reporte de Depreciación',
+    'linear_depreciation'                   => 'Linear (Default)',
+    'half_1'                                => 'Half-year convention, always applied',
+    'half_2'                                => 'Convención semestral, aplicada con condición',
 ];
diff --git a/resources/lang/es-VE/admin/depreciations/message.php b/resources/lang/es-VE/admin/depreciations/message.php
index b6f8f3fc6f..43984fc2f6 100644
--- a/resources/lang/es-VE/admin/depreciations/message.php
+++ b/resources/lang/es-VE/admin/depreciations/message.php
@@ -3,22 +3,22 @@
 return array(
 
     'does_not_exist' => 'La clase de depreciación no existe.',
-    'assoc_users'	 => 'La depreciación está actualmente asociada a uno o más modelos y no puede ser borrada. Por favor, borra los modelos y luego inténtalo nuevamente. ',
+    'assoc_users'	 => 'Esta depreciación está actualmente asociada con uno o más modelos y no puede ser eliminada. Por favor, elimine los modelos y luego intente borrarlas de nuevo. ',
 
 
     'create' => array(
-        'error'   => 'La clase de depreciación no ha sido creada, por favor, inténtalo de nuevo. :(',
+        'error'   => 'El tipo de depreciación no fue creado, por favor, inténtelo de nuevo. :(',
         'success' => 'La clase de depreciación creada con éxito. :)'
     ),
 
     'update' => array(
-        'error'   => 'La clase de depreciación no fue actualizada, por favor, inténtalo de nuevo',
+        'error'   => 'El tipo de depreciación no fue actualizado, por favor, inténtelo de nuevo',
         'success' => 'La clase de depreciación ha sido actualizada con éxito.'
     ),
 
     'delete' => array(
         'confirm'   => '¿Está seguro de que desea eliminar esta clase de depreciación?',
-        'error'   => 'Hubo un problema borrando la clase de depreciación. Por favor inténtalo de nuevo.',
+        'error'   => 'Ha sucedido un error eliminando el tipo de depreciación, por favor intente de nuevo.',
         'success' => 'La clase de depreciación ha sido actualizada con éxito.'
     )
 
diff --git a/resources/lang/es-VE/admin/depreciations/table.php b/resources/lang/es-VE/admin/depreciations/table.php
index dccade4a9b..e057c715db 100644
--- a/resources/lang/es-VE/admin/depreciations/table.php
+++ b/resources/lang/es-VE/admin/depreciations/table.php
@@ -2,10 +2,10 @@
 
 return [
 
-    'id'      => 'Identificación',
+    'id'      => 'ID',
     'months'   => 'Meses',
     'term'   => 'Duración',
     'title'      => 'Nombre ',
-    'depreciation_min' => 'Valor del piso',
+    'depreciation_min' => 'Valor mínimo',
 
 ];
diff --git a/resources/lang/es-VE/admin/groups/message.php b/resources/lang/es-VE/admin/groups/message.php
index 362f78726f..ee2c4a7b56 100644
--- a/resources/lang/es-VE/admin/groups/message.php
+++ b/resources/lang/es-VE/admin/groups/message.php
@@ -4,19 +4,19 @@ return array(
 
     'group_exists'        => '¡El grupo ya existe!',
     'group_not_found'     => 'El ID del grupo :id no existe.',
-    'group_name_required' => 'El nombre del campo es necesario',
+    'group_name_required' => 'El campo nombre es obligatorio',
 
     'success' => array(
         'create' => 'Grupo creado con éxito.',
-        'update' => 'Grupo actualizado con éxito.',
-        'delete' => 'Grupo borrado con éxito.',
+        'update' => 'El grupo fue actualizado exitosamente.',
+        'delete' => 'El grupo fue eliminado exitosamente.',
     ),
 
     'delete' => array(
         'confirm'   => '¿Está seguro de que desea eliminar este grupo?',
-        'create' => 'Hubo un problema al crear el grupo, por favor, inténtalo de nuevo.',
-        'update' => 'Hubo un problema al actualizar el grupo, por favor, inténtalo de nuevo.',
-        'delete' => 'Hubo un problema al borrar el grupo, por favor, inténtalo de nuevo.',
+        'create' => 'Hubo un problema creando el grupo. Por favor, intente nuevamente.',
+        'update' => 'Hubo un problema actualizando el grupo. Por favor, intente nuevamente.',
+        'delete' => 'Hubo un problema eliminando el grupo. Por favor, intente nuevamente.',
     ),
 
 );
diff --git a/resources/lang/es-VE/admin/groups/table.php b/resources/lang/es-VE/admin/groups/table.php
index 88c182b7bd..1511815185 100644
--- a/resources/lang/es-VE/admin/groups/table.php
+++ b/resources/lang/es-VE/admin/groups/table.php
@@ -2,8 +2,8 @@
 
 return array(
 
-    'id'         => 'Identificación',
+    'id'         => 'Id',
     'name'       => 'Nombre',
-    'users'      => '# de Usuarios',
+    'users'      => '# de usuarios',
 
 );
diff --git a/resources/lang/es-VE/admin/groups/titles.php b/resources/lang/es-VE/admin/groups/titles.php
index fc81697681..bdd09e3b62 100644
--- a/resources/lang/es-VE/admin/groups/titles.php
+++ b/resources/lang/es-VE/admin/groups/titles.php
@@ -1,13 +1,13 @@
 <?php
 
 return [
-    'about_groups_title'            => 'Acerca de los Grupos',
+    'about_groups_title'            => 'Acerca de los grupos',
     'about_groups'                  => 'Los grupos son usados para generalizar permisos de usuario.',
-    'group_management' 	 	=> 'Administración de Grupo',
-    'create' 	 	 	    => 'Crear Nuevo Grupo',
-    'update' 	 		        => 'Editar Grupo',
+    'group_management' 	 	=> 'Administración de grupos',
+    'create' 	 	 	    => 'Crear un grupo nuevo',
+    'update' 	 		        => 'Editar grupo',
     'group_name' 	 		=> 'Nombre de Grupo',
-    'group_admin' 	 		=> 'Administración de Grupo',
+    'group_admin' 	 		=> 'Grupo administrador',
     'allow' 	 			=> 'Permitir',
     'deny' 	 				=> 'Denegar',
     'permission'            => 'Permiso',
diff --git a/resources/lang/es-VE/admin/hardware/form.php b/resources/lang/es-VE/admin/hardware/form.php
index c0904a711c..da7270f635 100644
--- a/resources/lang/es-VE/admin/hardware/form.php
+++ b/resources/lang/es-VE/admin/hardware/form.php
@@ -1,35 +1,35 @@
 <?php
 
 return [
-    'bulk_delete'		=> 'Confirmar Eliminación Masiva de Activos',
+    'bulk_delete'		=> 'Confirmar eliminación masiva de activos',
     'bulk_restore'      => 'Confirmar recuperación masiva de activos', 
-  'bulk_delete_help'	=> 'Revisa los activos para eliminación masiva abajo. Una vez borrados, estos activos pueden ser restaurados, pero no estarán asociados con ningún usuario al que estén asignados actualmente.',
+  'bulk_delete_help'	=> 'Revise a continuación los activos para eliminación masiva. Una vez eliminados, estos activos se pueden restaurar, pero ya no estarán asociados a ningún usuario al que estén asignados actualmente.',
   'bulk_restore_help'	=> 'Revisar los activos para la restauración en masa a continuación. Una vez restaurados, estos activos no estarán asociados con los usuarios a los que fueron asignados anteriormente.',
   'bulk_delete_warn'	=> 'Va a eliminar :asset_count activos.',
   'bulk_restore_warn'	=> 'Está a punto de restaurar :asset_count activos.',
-    'bulk_update'		=> 'Actualización Masiva de Activos',
-    'bulk_update_help'	=> 'Este formulario te permite actualizar múltiples activos de una vez. Sólo llena los campos que necesites cambiar. Cualquier campo dejado en blanco permanecerá sin cambios. ',
-    'bulk_update_warn'	=> 'Está a punto de editar las propiedades de un solo recurso.|Está a punto de editar las propiedades de :asset_count activos.',
-    'bulk_update_with_custom_field' => 'Tenga en cuenta que los activos son :asset_model_count diferentes tipos de modelos.',
+    'bulk_update'		=> 'Actualización masiva de activos',
+    'bulk_update_help'	=> 'Este formulario le permite actualizar varios activos a la vez. Complete solo los campos que necesite modificar. Los campos que se dejen en blanco no se modificarán. ',
+    'bulk_update_warn'	=> 'Está a punto de editar las propiedades de un solo activo.|Está a punto de editar las propiedades de :asset_count activos.',
+    'bulk_update_with_custom_field' => 'Tenga en cuenta que los activos corresponden a :asset_model_count tipos diferentes de modelos.',
     'bulk_update_model_prefix' => 'En modelos', 
-    'bulk_update_custom_field_unique' => 'Este es un campo único y no puede ser editado a granel.',
-    'checkedout_to'		=> 'Asignado A',
+    'bulk_update_custom_field_unique' => 'Este es un campo único y no puede ser editado de forma masiva.',
+    'checkedout_to'		=> 'Asignado a',
     'checkout_date'		=> 'Fecha de asignación',
-    'checkin_date'		=> 'Fecha de devolución',
-    'checkout_to'		=> 'Asignar A',
-    'cost'				=> 'Costo de Compra',
-    'create'			=> 'Crear Activo',
+    'checkin_date'		=> 'Fecha de ingreso',
+    'checkout_to'		=> 'Asignar a',
+    'cost'				=> 'Precio de compra',
+    'create'			=> 'Crear activo',
     'date'				=> 'Fecha de compra',
     'depreciation'	    => 'Depreciación',
-    'depreciates_on'	=> 'Se Deprecia En',
+    'depreciates_on'	=> 'Se deprecia en',
     'default_location'	=> 'Ubicación predeterminada',
-    'default_location_phone' => 'Teléfono de ubicación por defecto',
+    'default_location_phone' => 'Teléfono de ubicación predeterminada',
     'eol_date'			=> 'Fecha fin de soporte (EOL)',
-    'eol_rate'			=> 'Tasa de Fin de Vida',
+    'eol_rate'			=> 'Tasa fin de soporte (EOL)',
     'expected_checkin'  => 'Fecha esperada de devolución',
     'expires'			=> 'Vence',
-    'fully_depreciated'	=> 'Completamente Depreciado',
-    'help_checkout'		=> 'Si deseas asignar este activo inmediatamente, selecciona "Listo para Asignar" de la lista de estados arriba. ',
+    'fully_depreciated'	=> 'Completamente depreciado',
+    'help_checkout'		=> 'Si desea asignar este equipo inmediatamente, seleccione "Listo para asignar" de la lista de estados de arriba. ',
     'mac_address'		=> 'Dirección MAC',
     'manufacturer'		=> 'Fabricante',
     'model'				=> 'Modelo',
@@ -39,24 +39,27 @@ return [
     'order'				=> 'Número de orden',
     'qr'				=> 'Código QR',
     'requestable'		=> 'Los usuarios pueden solicitar este elemento',
-    'redirect_to_all'   => 'Return to all :type',
+    'redirect_to_all'   => 'Regresar a :type',
     'redirect_to_type'   => 'Ir a :type',
-    'redirect_to_checked_out_to'   => 'Go to Checked Out to',
-    'select_statustype'	=> 'Seleccione un tipo de estado',
-    'serial'			=> 'Serial',
+    'redirect_to_checked_out_to'   => 'Ir a elementos asignados',
+    'select_statustype'	=> 'Seleccionar un tipo de estado',
+    'serial'			=> 'Número de serie',
     'status'			=> 'Estado',
-    'tag'				=> 'Etiqueta del activo',
-    'update'			=> 'Actualizar Activo',
+    'tag'				=> 'Placa del activo',
+    'update'			=> 'Actualizar activo',
     'warranty'			=> 'Garantía',
-        'warranty_expires'		=> 'La garantía vence',
+        'warranty_expires'		=> 'Vencimiento de la garantía',
     'years'				=> 'años',
     'asset_location' => 'Actualizar ubicación del activo',
     'asset_location_update_default_current' => 'Actualizar ubicación predeterminada y ubicación actual',
     'asset_location_update_default' => 'Actualizar sólo la ubicación predeterminada',
     'asset_location_update_actual' => 'Actualizar sólo la ubicación actual',
     'asset_not_deployable' => 'Ese estado de activos es no utilizable. Este activo no puede ser asignado.',
-    'asset_deployable' => 'El estado indica que es utilizable. Este activo puede ser asignado.',
+    'asset_not_deployable_checkin' => 'Ese estado del activo no es utilizable. El uso de esta etiqueta de estado ingresará el activo.',
+    'asset_deployable' => 'This asset can be checked out.',
     'processing_spinner' => 'Procesando... (Esto puede tomar un poco de tiempo en archivos grandes)',
+    'processing' => 'Procesando... ',
     'optional_infos'  => 'Información opcional',
-    'order_details'   => 'Información relacionada con el pedido'
+    'order_details'   => 'Información relacionada con el pedido',
+    'calc_eol'    => 'Si deja nula la fecha EOL, utilice el cálculo automático basado en la fecha de compra y la frecuencia de EOL.',
 ];
diff --git a/resources/lang/es-VE/admin/hardware/general.php b/resources/lang/es-VE/admin/hardware/general.php
index 8a136485b9..5b47f14ff6 100644
--- a/resources/lang/es-VE/admin/hardware/general.php
+++ b/resources/lang/es-VE/admin/hardware/general.php
@@ -1,42 +1,42 @@
 <?php
 
 return [
-    'about_assets_title'           => 'Acerca de Activos',
-    'about_assets_text'            => 'Los activos son seguidos mediante el número del serial o la etiqueta del activo. Tienden a ser objetos de mayor valor en los que identificar un objeto específico importa.',
+    'about_assets_title'           => 'Acerca de los activos',
+    'about_assets_text'            => 'Los activos son artículos rastreados por número de serie o placa de activo.  Suelen ser artículos de alto valor en los que es importante identificar un elemento específico.',
     'archived'  				=> 'Archivado',
     'asset'  					=> 'Activo',
-    'bulk_checkout'             => 'Activos de pago',
-    'bulk_checkin'              => 'Devolver activos',
-    'checkin'  					=> 'Devolver activo',
-    'checkout'  				=> 'Retirar Activo',
+    'bulk_checkout'             => 'Asignación masiva',
+    'bulk_checkin'              => 'Bulk Checkin',
+    'checkin'  					=> 'Ingresar activo',
+    'checkout'  				=> 'Asignar activo',
     'clone'  					=> 'Clonar activo',
     'deployable'  				=> 'Utilizable',
     'deleted'  					=> 'Este activo fue eliminado.',
-    'delete_confirm'            => '¿Está seguro de que desea eliminar este recurso?',
+    'delete_confirm'            => '¿Está seguro de que desea eliminar este activo?',
     'edit'  					=> 'Editar activo',
-    'model_deleted'  			=> 'Este modelo de activos ha sido eliminado. Debe restaurar el modelo antes de poder restaurar el activo.',
+    'model_deleted'  			=> 'Este modelo de activo ha sido eliminado. Debe restaurar este modelo antes de poder restaurar el activo.',
     'model_invalid'             => 'Este modelo para este activo es inválido.',
-    'model_invalid_fix'         => 'El activo debe ser actualizado, use un modelo de activo válido antes de intentar asignarlo, devolverlo o auditarlo.',
+    'model_invalid_fix'         => 'El activo debe ser actualizado, use un modelo de activo válido antes de intentar ingresarlo, asignarlo o auditarlo.',
     'requestable'               => 'Puede solicitarse',
     'requested'				    => 'Solicitado',
     'not_requestable'           => 'No puede solicitarse',
     'requestable_status_warning' => 'No cambiar el estado solicitable',
-    'restore'  					=> 'Restaurar Activo',
+    'restore'  					=> 'Restaurar activo',
     'pending'  					=> 'Pendiente',
     'undeployable'  			=> 'No utilizable',
     'undeployable_tooltip'  	=> 'Este activo tiene una etiqueta de estado que es no utilizable y no puede ser asignado en este momento.',
     'view'  					=> 'Ver activo',
     'csv_error' => 'Tiene un error en su archivo CSV:',
-    'import_text' => '<p>Cargue un archivo CSV que contenga el historial de activos. Los activos y los usuarios DEBEN existir ya en el sistema, o serán omitidos. La importación del historial busca activos que coincidan con la etiqueta de activo.  Intentaremos encontrar un usuario usando el nombre del usuario que proporcione y los criterios que seleccione a continuación. Si no selecciona ningún criterio, el sistema simplemente intentará usar el formato de nombre de usuario configurado en <code>Admin &gt;  Opciones Generales</code>.</p><p>Los campos incluidos en el CSV deben coincidir con los encabezados: <strong>Asset Tag, Name, Checkout Date, Checkin Date</strong>. Cualquier campo adicional será ignorado.</p><p>Checkin Date(Fecha de Devolución): dejar en blanco o usar fechas futuras asignará los ítems al usuario asociado. Excluir la columna Checkin Date creará una fecha de devolución con la fecha de hoy.</p>    ',
-    'csv_import_match_f-l' => 'Intenta emparejar usuarios con formato <strong>nombre.lastname</strong> (<code>jane.smith</code>)',
-    'csv_import_match_initial_last' => 'Intentar emparejar a los usuarios con un formato <strong>primer apellido inicial</strong> (<code>jsmith</code>)',
-    'csv_import_match_first' => 'Intentar emparejar a los usuarios con formato <strong>primer nombre</strong> (<code>jane</code>)',
-    'csv_import_match_email' => 'Intenta emparejar a los usuarios por <strong>email</strong> como nombre de usuario',
-    'csv_import_match_username' => 'Intentar hacer coincidir los usuarios usando la propiedad <strong>Usuario</strong>',
+    'import_text' => '<p>Upload a CSV that contains asset history. The assets and users MUST already exist in the system, or they will be skipped. Matching assets for history import happens against the asset tag. We will try to find a matching user based on the user\'s name you provide, and the criteria you select below. If you do not select any criteria below, it will simply try to match on the username format you configured in the <code>Admin &gt; General Settings</code>.</p><p>Fields included in the CSV must match the headers: <strong>Asset Tag, Name, Checkout Date, Checkin Date</strong>. Any additional fields will be ignored. </p><p>Checkin Date: blank or future checkin dates will checkout items to associated user.  Excluding the Checkin Date column will create a checkin date with todays date.</p>    ',
+    'csv_import_match_f-l' => 'Intente asociar usuarios usando el formato <strong>nombre.apellido</strong> (<code>jane.smith</code>)',
+    'csv_import_match_initial_last' => 'Intente asociar los usuarios usando el formato <strong>inicial del nombre y apellido</strong> (<code>jsmith</code>)',
+    'csv_import_match_first' => 'Intentar asociar los usuarios usando el formato <strong>primer nombre</strong> (<code>jane</code>)',
+    'csv_import_match_email' => 'Intente asociar los usuarios usando <strong>correo electrónico</strong> como nombre de usuario',
+    'csv_import_match_username' => 'Intente asociar los usuarios usando <strong>nombre de usuario</strong>',
     'error_messages' => 'Mensajes de error:',
     'success_messages' => 'Mensajes de éxito:',
     'alert_details' => 'Por favor vea abajo para más detalles.',
     'custom_export' => 'Personalizar exportación',
-    'mfg_warranty_lookup' => ':fabricante Garantía Estado Búsqueda',
-    'user_department' => 'Departamento de Usuario',
+    'mfg_warranty_lookup' => 'Búsqueda del estado de garantía para :manufacturer',
+    'user_department' => 'Departamento del usuario',
 ];
diff --git a/resources/lang/es-VE/admin/hardware/message.php b/resources/lang/es-VE/admin/hardware/message.php
index 5e8c81af45..0e1fedff99 100644
--- a/resources/lang/es-VE/admin/hardware/message.php
+++ b/resources/lang/es-VE/admin/hardware/message.php
@@ -2,94 +2,108 @@
 
 return [
 
-    'undeployable' 		=> '<strong>Atención:</strong> Este elemento ha sido marcado como no utilizable.
-                        Si no es correcto, actualice el estado.',
-    'does_not_exist' 	=> 'El activo no existe.',
-    'does_not_exist_var'=> 'Activo con etiqueta :asset_tag no encontrado.',
-    'no_tag' 	        => 'No se ha proporcionado ninguna etiqueta de activo.',
-    'does_not_exist_or_not_requestable' => 'Ese activo no existe o no es solicitable.',
-    'assoc_users'	 	=> 'Este activo está actualmente asignado a un usuario y no puede ser borrado. Por favor, revisa el activo primero y luego intenta borrarlo. ',
+    'undeployable' 		 => '<strong>Advertencia:</strong> Este activo actualmente está marcado como no utilizable. Si este estado ha cambiado, por favor, actualice el estado del activo.',
+    'does_not_exist' 	 => 'El activo no existe.',
+    'does_not_exist_var' => 'Activo con placa :asset_tag no encontrado.',
+    'no_tag' 	         => 'No se ha proporcionado ninguna placa de activo.',
+    'does_not_exist_or_not_requestable' => 'Ese activo no existe o no puede ser solicitado.',
+    'assoc_users'	 	 => 'Actualmente este activo está asignado a un usuario y no puede ser eliminado. Por favor, primero ingrese el activo y vuelva a intentarlo. ',
     'warning_audit_date_mismatch' 	=> 'La próxima fecha de auditoría de este activo (:next_audit_date) es anterior a la última fecha de auditoría (:last_audit_date). Por favor, actualice la próxima fecha de auditoría.',
+    'labels_generated'   => 'Las etiquetas fueron generadas exitosamente.',
+    'error_generating_labels' => 'Error en la generación de etiquetas.',
+    'no_assets_selected' => 'No se han seleccionado activos.',
 
     'create' => [
         'error'   		=> 'El activo no fue creado, por favor, inténtelo de nuevo. :(',
         'success' 		=> 'Activo creado con éxito. :)',
-        'success_linked' => 'Activo con etiqueta :tag creado con éxito. <strong><a href=":link" style="color: white;">Haga clic aquí para ver</a></strong>.',
+        'success_linked' => 'Activo con placa :tag creado con éxito. <strong><a href=":link" style="color: white;">Haga clic aquí para ver</a></strong>.',
+        'multi_success_linked' => 'Activo con etiqueta :links fue creado exitosamente.|:count activos fueron creados correctamente. :links.',
+        'partial_failure' => 'No se ha podido crear un activo: Motivo: :failures|No se pudieron crear :count activos. Motivos: :failures',
     ],
 
     'update' => [
-        'error'   			=> 'Activo no ha sido actualizado, por favor, inténtelo de nuevo',
-        'success' 			=> 'Activo actualizado con éxito.',
-        'encrypted_warning' => 'Activo actualizado con éxito, pero los campos personalizados cifrados no se debieron a permisos',
-        'nothing_updated'	=>  'Ningún campo fue seleccionado, así que nada se actualizó.',
-        'no_assets_selected'  =>  'Ningún recurso fue seleccionado, por lo que no se actualizó nada.',
+        'error'   			=> 'El activo no pudo ser actualizado, por favor inténtelo de nuevo',
+        'success' 			=> 'Equipo actualizado correctamente.',
+        'encrypted_warning' => 'El activo se actualizó correctamente, pero los campos personalizados cifrados no lo hicieron debido a los permisos',
+        'nothing_updated'	=>  'Ningún campo fue seleccionado, por lo que no se actualizó nada.',
+        'no_assets_selected'  =>  'Ningún activo fue seleccionado, por lo que no se actualizó nada.',
         'assets_do_not_exist_or_are_invalid' => 'Los activos seleccionados no se pueden actualizar.',
     ],
 
     'restore' => [
-        'error'   		=> 'El activo no fue restaurado, por favor, inténtalo de nuevo',
-        'success' 		=> 'Activo restaurado correctamente.',
-        'bulk_success' 		=> 'Activo restaurado correctamente.',
+        'error'   		=> 'El activo no fue restaurado, por favor inténtelo nuevamente',
+        'success' 		=> 'Activo restaurado exitosamente.',
+        'bulk_success' 		=> 'Activo restaurado exitosamente.',
         'nothing_updated'   => 'No se seleccionaron activos, por lo que no se restauró nada.', 
     ],
 
     'audit' => [
         'error'   		=> 'Auditoría de activos fallida: :error ',
-        'success' 		=> 'Audoría de activo registrada con éxito.',
+        'success' 		=> 'Auditoría de activos registrada correctamente.',
     ],
 
 
     'deletefile' => [
-        'error'   => 'El archivo no fue borrado. Por favor, inténtalo de nuevo.',
-        'success' => 'Archivo borrado con éxito.',
+        'error'   => 'Archivo no eliminado. Por favor inténtelo nuevamente.',
+        'success' => 'Archivo eliminado correctamente.',
     ],
 
     'upload' => [
         'error'   => 'Archivo(s) no cargado(s). Por favor, inténtelo nuevamente.',
         'success' => 'Archivo(s) cargado(s) exitosamente.',
         'nofiles' => 'No seleccionó ningún archivo para ser cargado, o el archivo que está tratando de cargar es demasiado grande',
-        'invalidfiles' => 'Uno o más de tus archivos es demasiado grande o es de un tipo que no está permitido. Los tipos de archivo permitidos son png, gif, jpg, doc, docx, pdf, y txt.',
+        'invalidfiles' => 'Uno o más de sus archivos son demasiado grandes o son de un tipo de archivo que no está permitido. Los tipos de archivo permitidos son png, gif, jpg, doc, docx, pdf y txt.',
     ],
 
     'import' => [
+        'import_button'         => 'Importar',
         'error'                 => 'Algunos de los elementos no se importaron correctamente.',
         'errorDetail'           => 'Lo siguientes elementos no se importaron debido a errores.',
-        'success'               => 'Tu archivo ha sido importado',
-        'file_delete_success'   => 'Tu archivo ha sido eliminado con éxito',
+        'success'               => 'Su archivo ha sido importado',
+        'file_delete_success'   => 'Su archivo se ha eliminado correctamente',
         'file_delete_error'      => 'El archivo no se pudo eliminar',
         'file_missing' => 'Falta el archivo seleccionado',
+        'file_already_deleted' => 'El archivo seleccionado ya fue eliminado',
         'header_row_has_malformed_characters' => 'Uno o más atributos en la fila del encabezado contienen caracteres UTF-8 mal formados',
-        'content_row_has_malformed_characters' => 'Uno o más atributos en la primera fila de contenido contienen caracteres UTF-8 mal formados',
+        'content_row_has_malformed_characters' => 'Uno o más atributos en la primera fila contienen caracteres UTF-8 mal formados',
+        'transliterate_failure' => 'Transliteration from :encoding to UTF-8 failed due to invalid characters in input'
     ],
 
 
     'delete' => [
         'confirm'   	=> '¿Está seguro de que desea eliminar este activo?',
-        'error'   		=> 'Ha habido un problema eliminando el activo. Por favor, inténtelo de nuevo.',
+        'error'   		=> 'Hubo un problema al eliminar el activo. Por favor, inténtelo de nuevo.',
+        'assigned_to_error' => '{1}Asset Tag: :asset_tag is currently checked out. Check in this device before deletion.|[2,*]Asset Tags: :asset_tag are currently checked out. Check in these devices before deletion.',
         'nothing_updated'   => 'Ningún activo se seleccionó, así que nada fue borrado.',
-        'success' 		=> 'El activo fue borrado con éxito.',
+        'success' 		=> 'El activo se ha eliminado correctamente.',
     ],
 
     'checkout' => [
         'error'   		=> 'El activo no fue asignado, por favor inténtelo de nuevo',
-        'success' 		=> 'Activo asignado con éxito.',
-        'user_does_not_exist' => 'El usuario es inválido. Por favor, inténtelo de nuevo.',
-        'not_available' => '¡Ese activo no está disponible para retirar!',
-        'no_assets_selected' => 'Debes seleccionar al menos un activo de la lista',
+        'success' 		=> 'Equipo asignado correctamente.',
+        'user_does_not_exist' => 'Este usuario no es correcto. Por favor, inténtelo de nuevo.',
+        'not_available' => '¡Ese equipo no está disponible para ser asignado!',
+        'no_assets_selected' => 'Debe seleccionar al menos un activo de la lista',
+    ],
+
+    'multi-checkout' => [
+        'error'   => 'El activo no fue asignado, por favor, intente nuevamente|Los activos no fueron asignados, por favor, intente nuevamente',
+        'success' => 'El activo fue asignado correctamente|Los activos fueron asignados correctamente.',
     ],
 
     'checkin' => [
-        'error'   		=> 'El equipo no se pudo devolver, por favor inténtelo de nuevo',
-        'success' 		=> 'El activo fue devuelto exitosamente.',
-        'user_does_not_exist' => 'Es usuario no es correcto, por favor inténtelo de nuevo.',
-        'already_checked_in'  => 'El equipo ya ha sido devuelto.',
+        'error'   		=> 'El activo no se pudo ingresar, por favor inténtelo de nuevo',
+        'success' 		=> 'El activo fue ingresado exitosamente.',
+        'user_does_not_exist' => 'Este usuario no es correcto. Por favor, inténtelo de nuevo.',
+        'already_checked_in'  => 'El equipo ya ha sido recibido.',
 
     ],
 
     'requests' => [
-        'error'   		=> 'El activo no fue solicitado, por favor, inténtalo de nuevo',
-        'success' 		=> 'Activo solicitado correctamente.',
-        'canceled'      => 'Solicitud de asignación cancelada con éxito',
+        'error'   		=> 'Request was not successful, please try again.',
+        'success' 		=> 'Request successfully submitted.',
+        'canceled'      => 'Request successfully canceled.',
+        'cancel'        => 'Cancelar solicitud para este elemento',
     ],
 
 ];
diff --git a/resources/lang/es-VE/admin/hardware/table.php b/resources/lang/es-VE/admin/hardware/table.php
index f60897abe2..d2175a77b6 100644
--- a/resources/lang/es-VE/admin/hardware/table.php
+++ b/resources/lang/es-VE/admin/hardware/table.php
@@ -2,32 +2,31 @@
 
 return [
 
-    'asset_tag'   	=> 'Etiqueta de Activo',
+    'asset_tag'   	=> 'Placa del activo',
     'asset_model'       => 'Modelo',
     'assigned_to'   => 'Asignado a',
     'book_value'  	=> 'Valor actual',
-    'change' 		=> 'Registrado / Asignado',
-    'checkout_date' => 'Fecha de Asignación',
-    'checkoutto' 	=> 'Asignado',
+    'change' 		=> 'Operación',
+    'checkout_date' => 'Fecha de asignación',
+    'checkoutto' 	=> 'Asignado a',
     'components_cost' => 'Coste total de componentes',
     'current_value' => 'Valor actual',
     'diff' 			=> 'Diferencia',
     'dl_csv' 		=> 'Descargar CSV',
-    'eol' 			=> 'Fin de Vida',
-    'id'      		=> 'Identificación',
-    'last_checkin_date' => 'Última fecha de devolución',
+    'eol' 			=> 'Fin de soporte (EOL)',
+    'id'      		=> 'ID',
+    'last_checkin_date' => 'Última fecha de ingreso',
     'location' 		=> 'Ubicación',
     'purchase_cost'	=> 'Costo',
     'purchase_date'	=> 'Comprado',
-    'serial'   		=> 'Serial',
+    'serial'   		=> 'Número de serie',
     'status'   		=> 'Estado',
     'title'      	=> 'Activo ',
     'image'		    => 'Imagen de dispositivo',
     'days_without_acceptance' => 'Días sin aceptación',
     'monthly_depreciation' => 'Depreciación mensual',
-    'assigned_to'    => 'Asignado a',
-    'requesting_user' => 'Solicitando usuario',
+    'requesting_user' => 'Usuario solicitante',
     'requested_date' => 'Fecha solicitada',
-    'changed'       => 'Cambiado',
+    'changed'       => 'Cambios',
     'icon' => 'Icono',
 ];
diff --git a/resources/lang/es-VE/admin/kits/general.php b/resources/lang/es-VE/admin/kits/general.php
index ccd1deae3b..030d3d59d1 100644
--- a/resources/lang/es-VE/admin/kits/general.php
+++ b/resources/lang/es-VE/admin/kits/general.php
@@ -1,50 +1,51 @@
 <?php
 
 return [
-    'about_kits_title'                  => 'Acerca de Kits predefinidos',
-    'about_kits_text'                   => 'Kits predefinidos le permiten revisar rápidamente una colección de elementos (activos, licencias, etc.) a un usuario. Esto puede ser útil cuando su proceso de incorporación es consistente entre muchos usuarios y todos los usuarios reciben los mismos artículos.',
-    'checkout'                          => 'Kit de pago ',
+    'about_kits_title'                  => 'Acerca de kits predefinidos',
+    'about_kits_text'                   => 'Los kits predefinidos le permiten rápidamente asignar un conjunto de elementos (activos, licencias, etc.) a un usuario. Esto puede ser útil cuando su proceso de incorporación de usuarios es similar para muchos usuarios y todos reciben los mismos elementos.',
+    'checkout'                          => 'Asignar kit ',
     'create_success'                    => 'El kit se ha creado correctamente.',
     'create'                            => 'Crear kit predefinido',
     'update'                            => 'Actualizar kit predefinido',
     'delete_success'                    => 'Kit eliminado correctamente.',
     'update_success'                    => 'El kit se ha actualizado correctamente.',
-    'none_models'                       => 'No hay suficientes recursos disponibles para :model para pagar. :qty son requeridos. ',
-    'none_licenses'                     => 'No hay suficientes asientos disponibles para :license para pagar. :qty son requeridos. ',
-    'none_consumables'                  => 'No hay suficientes unidades disponibles de :consumible para pagar. :qty son requeridas. ',
-    'none_accessory'                    => 'No hay suficientes unidades disponibles de :accesory para pagar. :qty son requeridas. ',
+    'none_models'                       => 'No hay suficientes activos disponibles de :model para asignar. Se requieren :qty. ',
+    'none_licenses'                     => 'No hay suficientes licencias disponibles de :license para asignar. Se requieren :qty. ',
+    'none_consumables'                  => 'No hay suficientes unidades disponibles de :consumable para asignar. Se requieren :qty. ',
+    'none_accessory'                    => 'No hay suficientes unidades disponibles de :accessory para asignar. Se requieren :qty. ',
     'append_accessory'                  => 'Añadir accesorio',
-    'update_appended_accessory'         => 'Actualizar accesorio adjunto',
+    'update_appended_accessory'         => 'Actualizar accesorio añadido',
     'append_consumable'                 => 'Añadir consumible',
-    'update_appended_consumable'        => 'Actualizar consumible adjunto',
+    'update_appended_consumable'        => 'Actualizar consumible añadido',
     'append_license'                    => 'Añadir licencia',
     'update_appended_license'           => 'Actualizar licencia añadida',
     'append_model'                      => 'Añadir modelo',
     'update_appended_model'             => 'Actualizar modelo añadido',
-    'license_error'                     => 'Licencia ya adjunta al kit',
-    'license_added_success'             => 'Licencia creada con éxito',
-    'license_updated'                   => 'La licencia se ha actualizado correctamente',
+    'license_error'                     => 'Licencia ya vinculada al kit',
+    'license_added_success'             => 'Licencia añadida correctamente',
+    'license_updated'                   => 'La licencia fue actualizada correctamente',
     'license_none'                      => 'La licencia no existe',
-    'license_detached'                  => 'Licencia fue separada con éxito',
-    'consumable_added_success'          => 'Consumible creado con éxito',
-    'consumable_updated'                => 'Consumible se ha actualizado correctamente',
-    'consumable_error'                  => 'Consumible ya conectado al kit',
+    'license_detached'                  => 'Licencia desvinculada correctamente',
+    'consumable_added_success'          => 'Consumible añadido correctamente',
+    'consumable_updated'                => 'El consumible fue actualizado correctamente',
+    'consumable_error'                  => 'Consumible ya vinculado al kit',
     'consumable_deleted'                => 'El borrado fue exitoso',
     'consumable_none'                   => 'El consumible no existe',
-    'consumable_detached'               => 'Consumible fue separado con éxito',
+    'consumable_detached'               => 'Consumible desvinculado correctamente',
     'accessory_added_success'           => 'Accesorio añadido correctamente',
-    'accessory_updated'                 => 'El accesorio se ha actualizado correctamente',
-    'accessory_detached'                => 'Accesorio fue separado con éxito',
-    'accessory_error'                   => 'El accesorio ya está conectado al kit',
+    'accessory_updated'                 => 'El accesorio fue actualizado correctamente',
+    'accessory_detached'                => 'Accesorio desvinculado correctamente',
+    'accessory_error'                   => 'El accesorio ya está vinculado al kit',
     'accessory_deleted'                 => 'El borrado fue exitoso',
     'accessory_none'                    => 'El accesorio no existe',
-    'checkout_success'                  => 'El pago fue exitoso',
-    'checkout_error'                    => 'Error de pago',
+    'checkout_success'                  => 'Asignación correcta',
+    'checkout_error'                    => 'Error al asignar',
     'kit_none'                          => 'El kit no existe',
-    'kit_created'                       => 'El kit se creó con éxito',
-    'kit_updated'                       => 'El kit se actualizó con éxito',
+    'kit_created'                       => 'Kit creado correctamente',
+    'kit_updated'                       => 'El kit fue actualizado correctamente',
     'kit_not_found'                     => 'Kit no encontrado',
-    'kit_deleted'                       => 'Kit eliminado correctamente',
-    'kit_model_updated'                 => 'El modelo se ha actualizado correctamente',
-    'kit_model_detached'                => 'Modelo fue separado con éxito',
+    'kit_deleted'                       => 'El kit fue eliminado correctamente',
+    'kit_model_updated'                 => 'El modelo fue actualizado correctamente',
+    'kit_model_detached'                => 'El modelo fue desvinculado correctamente',
+    'model_already_attached'            => 'Modelo ya vinculado al kit',
 ];
diff --git a/resources/lang/es-VE/admin/labels/message.php b/resources/lang/es-VE/admin/labels/message.php
index 6f03c94699..f97118deb2 100644
--- a/resources/lang/es-VE/admin/labels/message.php
+++ b/resources/lang/es-VE/admin/labels/message.php
@@ -2,9 +2,9 @@
 
 return [
 
-    'invalid_return_count' => 'El recuento no es válido desde :name. Esperado :expected, tiene :actual.',
-    'invalid_return_type'  => 'Tipo no válido devuelto desde :name. Esperado :expected, obtuvo :actual.',
-    'invalid_return_value' => 'Valor no válido devuelto de :name. Esperado :expected, obtuvo :actual.',
+    'invalid_return_count' => 'Cantidad incorrecta devuelta por :name. Se esperaba :expected, obtenido :actual.',
+    'invalid_return_type'  => 'Tipo no válido devuelto por :name. Esperado :expected, obtenido :actual.',
+    'invalid_return_value' => 'Valor no válido devuelto por :name. Esperado :expected, obtenido :actual.',
 
     'does_not_exist' => 'La etiqueta no existe',
     
diff --git a/resources/lang/es-VE/admin/labels/table.php b/resources/lang/es-VE/admin/labels/table.php
index 9831a9551d..fab4d8f9db 100644
--- a/resources/lang/es-VE/admin/labels/table.php
+++ b/resources/lang/es-VE/admin/labels/table.php
@@ -3,14 +3,14 @@
 return [
     'example_company'    => 'Compañía de prueba limitada',
     'example_defaultloc' => 'Construcción 1',
-    'example_category'   => 'Probar categoría',
+    'example_category'   => 'Categoría de prueba',
     'example_location'   => 'Edificio 2',
     'example_manufacturer'  => 'Test Manufacturing Inc.',
     'example_model'      => 'Modelo de prueba',
     'example_supplier'   => 'Compañía de prueba limitada',
     'labels_per_page'    => 'Etiquetas',
     'support_fields'     => 'Campos',
-    'support_asset_tag'  => 'Etiqueta',
+    'support_asset_tag'  => 'Placa',
     'support_1d_barcode' => '1D',
     'support_2d_barcode' => '2D',
     'support_logo'       => 'Logo',
diff --git a/resources/lang/es-VE/admin/licenses/form.php b/resources/lang/es-VE/admin/licenses/form.php
index 5653d27129..fcb84c54b8 100644
--- a/resources/lang/es-VE/admin/licenses/form.php
+++ b/resources/lang/es-VE/admin/licenses/form.php
@@ -3,20 +3,20 @@
 return array(
 
     'asset'             => 'Activo',
-    'checkin'           => 'Devolver',
+    'checkin'           => 'Ingresar',
     'create'            => 'Crear licencia',
     'expiration'        => 'Fecha de vencimiento',
-    'license_key'       => 'Clave del Producto',
-    'maintained'        => 'Mantenido',
+    'license_key'       => 'Clave del producto',
+    'maintained'        => 'Tiene mantenimiento',
     'name'              => 'Nombre del software',
     'no_depreciation'   => 'No depreciar',
     'purchase_order'    => 'Número de orden de compra',
     'reassignable'      => 'Reasignable',
-    'remaining_seats'   => 'Intalaciones Restantes',
-    'seats'             => 'Instalaciones',
-    'termination_date'  => 'Fecha de Finalización',
-    'to_email'          => 'Licenciado al Correo Electrónico',
-    'to_name'           => 'Licenciado a Nombre',
-    'update'            => 'Actualizar Licencia',
+    'remaining_seats'   => 'Disponibles',
+    'seats'             => 'Total de licencias',
+    'termination_date'  => 'Fecha de finalización',
+    'to_email'          => 'Correo electrónico asociado a la licencia',
+    'to_name'           => 'Nombre de la persona asociada a la licencia',
+    'update'            => 'Actualizar licencia',
     'checkout_help'     => 'Debe asignar una licencia a un activo de hardware o a una persona. Puede seleccionar ambos, pero el propietario del activo debe coincidir con la persona a la que está asignado el activo.'
 );
diff --git a/resources/lang/es-VE/admin/licenses/general.php b/resources/lang/es-VE/admin/licenses/general.php
index 6a3a2ecd8e..050cb553a0 100644
--- a/resources/lang/es-VE/admin/licenses/general.php
+++ b/resources/lang/es-VE/admin/licenses/general.php
@@ -2,50 +2,51 @@
 
 return array(
     'about_licenses_title'      => 'Acerca de las Licencias',
-    'about_licenses'            => 'Las licencias son usadas para rastrear el software. Tienen un número específico de puestos que pueden ser asignados a individuos',
-    'checkin'  					=> 'Registrar Puestos de Licencia',
-    'checkout_history'  		=> 'Historial de Asignaciones',
-    'checkout'  				=> 'Registrar Puesto de Licencia',
-    'edit'  					=> 'Editar Licencia',
+    'about_licenses'            => 'Las licencias se utilizan para hacer un seguimiento del software.  Tienen una cantidad determinada que puede ser asignada a individuos',
+    'checkin'  					=> 'Ingresar licencia',
+    'checkout_history'  		=> 'Historial de asignaciones',
+    'checkout'  				=> 'Asignar licencia',
+    'edit'  					=> 'Editar licencia',
     'filetype_info'				=> 'Los tipos de archivo permitidos son png, gif, jpg, jpeg, doc, docx, pdf, txt, zip, y rar.',
-    'clone'  					=> 'Clonar Licencia',
+    'clone'  					=> 'Clonar licencia',
     'history_for'  				=> 'Historial de ',
     'in_out'  					=> 'Registrado / Asignado',
     'info'  					=> 'Información de licencia',
-    'license_seats'  			=> 'Puestos de Licencia',
-    'seat'  					=> 'Puesto',
-    'seats'  					=> 'Puestos',
-    'software_licenses'  		=> 'Licencias de Software',
+    'license_seats'  			=> 'Total de licencias',
+    'seat'  					=> 'Licencia',
+    'seat_count'  				=> 'Licencia :count',
+    'seats'  					=> 'Total de licencias',
+    'software_licenses'  		=> 'Licencias de software',
     'user'  					=> 'Usuario',
-    'view'  					=> 'Ver Licencia',
-    'delete_disabled'           => 'Esta licencia no se puede eliminar aún porque algunos asientos todavía están retirados.',
+    'view'  					=> 'Ver licencia',
+    'delete_disabled'           => 'Esta licencia no se puede eliminar porque todavía está asignada.',
     'bulk'                      =>
         [
             'checkin_all'           => [
-                'button'            => 'Comprobar todos los asientos',
-                'modal'             => 'Esto activará el checkin de un asiento. | Esta acción registrará todos los asientos :checkedout_seats_count para esta licencia.',
-                'enabled_tooltip'   => 'Checkin TODOS los asientos para esta licencia tanto de usuarios como de activos',
-                'disabled_tooltip'  => 'Esto está deshabilitado porque no hay asientos seleccionados actualmente',
+                'button'            => 'Ingresar todas las licencias',
+                'modal'             => 'Esta acción ingresará una licencia. | Esta acción ingresará todas las :checkedout_seats_count licencias.',
+                'enabled_tooltip'   => 'Recibir TODAS las licencias tanto de usuarios como de activos',
+                'disabled_tooltip'  => 'Esto está deshabilitado porque no hay licencias asignadas actualmente',
                 'disabled_tooltip_reassignable'  => 'Esto está desactivado porque la licencia no es reasignable',
-                'success'           => '¡Licencia registrada con éxito! | ¡Todas las licencias fueron registradas con éxito!',
-                'log_msg'           => 'Check-in a través de pago de licencia en licencia GUI',
+                'success'           => '¡Licencia recibida correctamente! | ¡Todas las licencias fueron recibidas correctamente!',
+                'log_msg'           => 'Ingresada mediante ingreso masivo en página de licencias',
             ],
 
             'checkout_all'              => [
-                'button'                => 'Salir todos los asientos',
-                'modal'                 => 'Esta acción comprobará un asiento para el primer usuario disponible. | Esta acción verificará todos los asientos :available_seats_count para los primeros usuarios disponibles. Se considera que un usuario está disponible para este asiento si aún no tiene esta licencia revisada para ellos, y la propiedad Auto-Asignación de Licencia está habilitada en su cuenta de usuario.',
-                'enabled_tooltip'   => 'Checkout TODOS los asientos (o tantos como estén disponibles) para TODOS los usuarios',
-                'disabled_tooltip'  => 'Esto está deshabilitado porque no hay asientos disponibles actualmente',
-                'success'           => '¡Licencia retirada con éxito! | ¡Licencias :count fueron retiradas con éxito!',
-                'error_no_seats'    => 'No quedan plazas restantes para esta licencia.',
-                'warn_not_enough_seats'    => ':count usuarios fueron asignados a esta licencia, pero nos quedamos sin plazas de licencia disponibles.',
+                'button'                => 'Asignar todas las licencias',
+                'modal'                 => 'Esta acción asignará una licencia para el primer usuario disponible. | Esta acción asignará todas las :available_seats_count licencias a los primeros usuarios disponibles. Se considera que un usuario está disponible si aún no tiene esta licencia asignada y la propiedad "Autoasignación de licencia" está habilitada en su cuenta de usuario.',
+                'enabled_tooltip'   => 'Asignar TODAS las licencias (o tantas como estén disponibles) para TODOS los usuarios',
+                'disabled_tooltip'  => 'Esto está deshabilitado porque actualmente no hay licencias disponibles',
+                'success'           => '¡Licencia asignada exitosamente! | ¡Licencias :count asignadas exitosamente!',
+                'error_no_seats'    => 'No quedan licencias disponibles.',
+                'warn_not_enough_seats'    => 'Se asignaron :count usuarios a esta licencia, y se agotaron las licencias disponibles.',
                 'warn_no_avail_users'    => 'Nada que hacer. No hay usuarios que no tengan esta licencia asignada.',
-                'log_msg'           => 'Checado mediante pago masivo de licencia en GUI licencia',
+                'log_msg'           => 'Asignada vía asignación masiva en página de licencias',
 
 
             ],
     ],
 
-    'below_threshold' => 'Solo quedan :remaining_count asientos para esta licencia con una cantidad mínima de :min_amt. Puede considerar comprar más asientos.',
+    'below_threshold' => 'Solo quedan :remaining_count licencias y su cantidad mínima es de :min_amt. Puede que desee considerar la compra de más licencias.',
     'below_threshold_short' => 'Este artículo está por debajo de la cantidad mínima requerida.',
 );
diff --git a/resources/lang/es-VE/admin/licenses/message.php b/resources/lang/es-VE/admin/licenses/message.php
index 303af92f2e..44140c8ca8 100644
--- a/resources/lang/es-VE/admin/licenses/message.php
+++ b/resources/lang/es-VE/admin/licenses/message.php
@@ -4,51 +4,54 @@ return array(
 
     'does_not_exist' => 'La licencia no existe o no tiene permiso para verla.',
     'user_does_not_exist' => 'El usuario no existe o no tiene permiso para verlos.',
-    'asset_does_not_exist' 	=> 'El activo que intentas asociar con esta licencia no existe.',
+    'asset_does_not_exist' 	=> 'El activo que intenta asociar con esta licencia no existe.',
     'owner_doesnt_match_asset' => 'El activo que está intentando asignar con esta licencia está asignado a un usuario diferente al de la persona seleccionada de la lista.',
-    'assoc_users'	 => 'Esta licencia está actualmente asignada a un usuario y no puede ser borrada. Por favor, revisa la licencia primero y luego intenta borrarla. ',
-    'select_asset_or_person' => 'Debes seleccionar un activo o un usuario, pero no ambos.',
+    'assoc_users'	 => 'Esta licencia está actualmente asignada a un usuario y no puede ser eliminada. Por favor, reciba primero la licencia y vuelva a intentarlo. ',
+    'select_asset_or_person' => 'Debe seleccionar un activo o un usuario, pero no ambos.',
     'not_found' => 'Licencia no encontrada',
-    'seats_available' => ':seat_count plazas disponibles',
+    'seats_available' => ':seat_count disponibles',
 
 
     'create' => array(
-        'error'   => 'La licencia no se ha creado, inténtelo de nuevo.',
-        'success' => 'Licencia creada con éxito.'
+        'error'   => 'La licencia no fue creada, por favor inténtelo de nuevo.',
+        'success' => 'Categoría creada correctamente.'
     ),
 
     'deletefile' => array(
-        'error'   => 'El archivo no fue borrado. Por favor, inténtalo de nuevo.',
-        'success' => 'Archivo borrado con éxito.',
+        'error'   => 'Archivo no eliminado. Por favor, vuelva a intentarlo.',
+        'success' => 'Archivo eliminado correctamente.',
     ),
 
     'upload' => array(
-        'error'   => 'Archivo(s) no cargado(s). Por favor, inténtelo nuevamente.',
-        'success' => 'Archivo(s) cargado(s) con éxito.',
+        'error'   => 'Archivo(s) no cargado(s). Por favor, inténtelo de nuevo.',
+        'success' => 'Archivo(s) cargado correctamente.',
         'nofiles' => 'No seleccionó ningún archivo para ser cargado, o el archivo que seleccionó es demasiado grande',
-        'invalidfiles' => 'Uno o más de tus archivos son demasiado grandes o de un tipo no permitido. Los tipos permitidos son png, gif, jpg, doc, docx, pdf, txt, zip, rar, rtf, xml y lic.',
+        'invalidfiles' => 'Uno o más de sus archivos es demasiado grande o es un tipo de archivo que no está permitido. Los tipos de archivo permitidos son png, gif, jpg, jpeg, doc, docx, pdf, txt, zip, rar, rtf, xml y lic.',
     ),
 
     'update' => array(
-        'error'   => 'La licencia no se ha actualizado, inténtalo de nuevo',
-        'success' => 'Licencia actualizada con éxito.'
+        'error'   => 'La licencia no fue actualizada, por favor inténtelo de nuevo',
+        'success' => 'Categoría actualizada correctamente.'
     ),
 
     'delete' => array(
         'confirm'   => '¿Está seguro de que desea eliminar esta licencia?',
-        'error'   => 'Hubo un problema al borrar la licencia. Por favor, inténtalo de nuevo.',
-        'success' => 'La licencia fue eliminada con éxito.'
+        'error'   => 'Hubo un problema al eliminar la licencia. Por favor, inténtelo de nuevo.',
+        'success' => 'La licencia se ha eliminado correctamente.'
     ),
 
     'checkout' => array(
         'error'   => 'Hubo un problema asignando la licencia. Por favor, inténtelo de nuevo.',
         'success' => 'La licencia fue asignada con éxito',
-        'not_enough_seats' => 'No hay suficientes asientos de licencia disponibles para la compra',
+        'not_enough_seats' => 'No hay suficientes licencias disponibles para asignar',
+        'mismatch' => 'La licencia proporcionada no coincide con la licencia seleccionada',
+        'unavailable' => 'Esta licencia no está disponible para ser asignada.',
     ),
 
     'checkin' => array(
-        'error'   => 'Hubo un problema devolviendo la licencia. Por favor, inténtalo de nuevo.',
-        'success' => 'La licencia fue registrada con éxito'
+        'error'   => 'Hubo un problema ingresando la licencia. Por favor, inténtelo de nuevo.',
+        'not_reassignable' => 'La licencia no se puede volver a asignar',
+        'success' => 'La licencia fue ingresada correctamente'
     ),
 
 );
diff --git a/resources/lang/es-VE/admin/licenses/table.php b/resources/lang/es-VE/admin/licenses/table.php
index dd1a1159ab..6413ef9e71 100644
--- a/resources/lang/es-VE/admin/licenses/table.php
+++ b/resources/lang/es-VE/admin/licenses/table.php
@@ -2,17 +2,17 @@
 
 return array(
 
-    'assigned_to'   	=> 'Asignado A',
-    'checkout'   		=> 'Registrado / Asignado',
+    'assigned_to'   	=> 'Asignado a',
+    'checkout'   		=> 'Entrada/Salida',
     'deleted_at'        => 'Eliminado el',
     'id'      			=> 'ID',
-    'license_email'   	=> 'Email de licencia',
-    'license_name'   	=> 'Licenciado A',
+    'license_email'   	=> 'Correo electrónico de la licencia',
+    'license_name'   	=> 'Licenciado a',
     'purchase_date'   	=> 'Fecha de compra',
     'purchased'   		=> 'Comprado',
-    'seats'   			=> 'Puestos',
+    'seats'   			=> 'Total de licencias',
     'hardware'   		=> 'Hardware',
-    'serial'   			=> 'Serial',
+    'serial'   			=> 'Número de serie',
     'title'      		=> 'Licencia',
 
 );
diff --git a/resources/lang/es-VE/admin/locations/message.php b/resources/lang/es-VE/admin/locations/message.php
index 3795c07b4a..f8510ec87a 100644
--- a/resources/lang/es-VE/admin/locations/message.php
+++ b/resources/lang/es-VE/admin/locations/message.php
@@ -3,15 +3,16 @@
 return array(
 
     'does_not_exist' => 'La localización no existe.',
-    'assoc_users'    => 'This location is not currently deletable because it is the location of record for at least one asset or user, has assets assigned to it, or is the parent location of another location. Please update your models to no longer reference this company and try again. ',
+    'assoc_users'    => 'Esta ubicación no se puede eliminar actualmente porque es la ubicación de al menos un activo o usuario, tiene activos asignados o es la ubicación padre de otra ubicación. Por favor, actualice sus registros para que ya no hagan referencia a esta ubicación e inténtalo de nuevo ',
     'assoc_assets'	 => 'Esta ubicación está actualmente asociada con al menos un activo y no puede ser eliminada. Por favor actualice sus activos para que ya no hagan referencia a esta ubicación e inténtelo de nuevo. ',
     'assoc_child_loc'	 => 'Esta ubicación es actualmente el padre de al menos una ubicación hija y no puede ser eliminada.   Por favor actualice sus ubicaciones para que ya no hagan referencia a esta ubicación e inténtelo de nuevo. ',
-    'assigned_assets' => 'Recursos asignados',
+    'assigned_assets' => 'Activos asignados',
     'current_location' => 'Ubicación actual',
+    'open_map' => 'Abrir en mapas :map_provider_icon',
 
 
     'create' => array(
-        'error'   => 'La ubicación no fue creada, por favor, inténtelo de nuevo.',
+        'error'   => 'La ubicación no pudo ser creada, por favor, inténtelo de nuevo.',
         'success' => 'La ubicación fue creada exitosamente.'
     ),
 
@@ -20,6 +21,11 @@ return array(
         'success' => 'La ubicación fue actualizada exitosamente.'
     ),
 
+    'restore' => array(
+        'error'   => 'No se ha restaurado la ubicación, inténtelo de nuevo',
+        'success' => 'La ubicación fue restaurada exitosamente.'
+    ),
+
     'delete' => array(
         'confirm'   	=> '¿Está seguro de que desea eliminar esta ubicación?',
         'error'   => 'Hubo un problema borrando la ubicación. Por favor, Inténtelo de nuevo.',
diff --git a/resources/lang/es-VE/admin/locations/table.php b/resources/lang/es-VE/admin/locations/table.php
index 7bcca7cb94..eb2c3e8aec 100644
--- a/resources/lang/es-VE/admin/locations/table.php
+++ b/resources/lang/es-VE/admin/locations/table.php
@@ -2,10 +2,10 @@
 
 return [
     'about_locations_title'     => 'Acerca de las ubicaciones',
-    'about_locations'           => 'Las ubicaciones son utilizadas para hacer seguimiento de la información sobre ubicación de usuarios, activos, y otros ítems',
+    'about_locations'           => 'Las ubicaciones se utilizan para hacer un seguimiento de la ubicación de usuarios, activos y otros elementos',
     'assets_rtd'                => 'Activos', // This has NEVER meant Assets Retired. I don't know how it keeps getting reverted.
     'assets_checkedout'         => 'Activos asignados',
-    'id'                        => 'Identificación',
+    'id'                        => 'ID',
     'city'                      => 'Ciudad',
     'state'                     => 'Estado',
     'country'                   => 'País',
@@ -24,19 +24,20 @@ return [
     'user_name'                 => 'Usuario',
     'department'                => 'Departamento',
     'location'                  => 'Ubicación',
-    'asset_tag'                 => 'Etiqueta de recursos',
+    'asset_tag'                 => 'Placa del activo',
     'asset_name'                => 'Nombre',
     'asset_category'            => 'Categoría',
     'asset_manufacturer'        => 'Fabricante',
     'asset_model'               => 'Modelo',
     'asset_serial'              => 'Número de serie',
     'asset_location'            => 'Ubicación',
-    'asset_checked_out'         => 'Asignado',
+    'asset_checked_out'         => 'Asignado a',
     'asset_expected_checkin'    => 'Fecha esperada de devolución',
     'date'                      => 'Fecha:',
     'phone'                     => 'Teléfono ubicación',
-    'signed_by_asset_auditor'   => 'Firmado por (Juego de Acciones):',
-    'signed_by_finance_auditor' => 'Firmado por (Monitor de Finanzas):',
-    'signed_by_location_manager' => 'Firmado por (Administrador de ubicación):',
+    'signed_by_asset_auditor'   => 'Firmado por (Auditor de Activos):',
+    'signed_by_finance_auditor' => 'Firmado por (Auditor de Finanzas):',
+    'signed_by_location_manager' => 'Firmado por (Supervisor de la ubicación):',
     'signed_by'                 => 'Firmado por:',
+    'clone'  					=> 'Clone Location',
 ];
diff --git a/resources/lang/es-VE/admin/manufacturers/message.php b/resources/lang/es-VE/admin/manufacturers/message.php
index a6c033e03c..4e25322f0c 100644
--- a/resources/lang/es-VE/admin/manufacturers/message.php
+++ b/resources/lang/es-VE/admin/manufacturers/message.php
@@ -2,29 +2,29 @@
 
 return array(
 
-    'support_url_help' => 'Variables <code>{LOCALE}</code>, <code>{SERIAL}</code>, <code>{MODEL_NUMBER}</code>, y <code>{MODEL_NAME}</code> se puede utilizar en tu URL para que esos valores se llenen automáticamente al ver los activos - por ejemplo https://checkcoverage. pple.com/{LOCALE}/{SERIAL}.',
+    'support_url_help' => 'Variables <code>{LOCALE}</code>, <code>{SERIAL}</code>, <code>{MODEL_NUMBER}</code>, y <code>{MODEL_NAME}</code> se pueden utilizar en su URL para que esos valores se llenen automáticamente al ver los activos - por ejemplo https://checkcoverage. pple.com/{LOCALE}/{SERIAL}.',
     'does_not_exist' => 'El fabricante no existe.',
-    'assoc_users'	 => 'Este fabricante está actualmente asociado con al menos un modelo y no puede ser borrado. Por favor, actualiza tus modelos para no referenciar este fabricante e inténtelo de nuevo. ',
+    'assoc_users'	 => 'Este fabricante está actualmente asociado con al menos un modelo y no se puede eliminar. Por favor, actualice sus modelos para dejar de hacer referencia a este fabricante y vuelva a intentarlo. ',
 
     'create' => array(
-        'error'   => 'El fabricante no ha sido creado, por favor, inténtalo de nuevo.',
-        'success' => 'Fabricante creado con éxito.'
+        'error'   => 'El fabricante no fue creado, por favor inténtelo de nuevo.',
+        'success' => 'Fabricante creado exitosamente.'
     ),
 
     'update' => array(
-        'error'   => 'El fabricante no ha sido actualizado, por favor, inténtelo de nuevo',
-        'success' => 'Fabricante actualizado con éxito.'
+        'error'   => 'El fabricante no fue actualizado, por favor, inténtelo de nuevo',
+        'success' => 'El fabricante se ha actualizado exitosamente.'
     ),
 
     'restore' => array(
-        'error'   => 'El fabricante no ha sido restaurado, por favor inténtalo de nuevo',
-        'success' => 'Fabricante restaurado con éxito.'
+        'error'   => 'El fabricante no fue restaurado, por favor, inténtelo de nuevo',
+        'success' => 'El fabricante fue restaurado exitosamente.'
     ),
 
     'delete' => array(
         'confirm'   => '¿Está seguro de que desea eliminar este fabricante?',
-        'error'   => 'Hubo un problema borrando el fabricante. Por favor, inténtalo de nuevo.',
-        'success' => 'Fabricante borrado con éxito.'
+        'error'   => 'Ocurrió un problema eliminando el fabricante. Por favor, intente nuevamente.',
+        'success' => 'El fabricante se ha eliminado correctamente.'
     )
 
 );
diff --git a/resources/lang/es-VE/admin/manufacturers/table.php b/resources/lang/es-VE/admin/manufacturers/table.php
index 7416b7f351..28cb06bd21 100644
--- a/resources/lang/es-VE/admin/manufacturers/table.php
+++ b/resources/lang/es-VE/admin/manufacturers/table.php
@@ -1,16 +1,16 @@
 <?php
 
 return array(
-    'about_manufacturers_title'    => 'Sobre Fabricantes',
+    'about_manufacturers_title'    => 'Sobre los fabricantes',
     'about_manufacturers_text'  => 'Los fabricantes son las empresas que crean sus activos. Aquí puede almacenar importante información de contacto para soporte, la cual se mostrará en las páginas de detalle de sus activos.',
     'asset_manufacturers'	=> 'Fabricantes de activos',
-    'create'				=> 'Crear Fabricante',
+    'create'				=> 'Crear fabricante',
     'id'   					=> 'ID',
     'name'      			=> 'Nombre',
-    'support_email'   		=> 'Correo de soporte',
+    'support_email'   		=> 'Correo electrónico de soporte',
     'support_phone'   		=> 'Teléfono de Soporte',
     'support_url'   		=> 'URL de Soporte',
     'warranty_lookup_url'   => 'URL de búsqueda de garantía',
-    'update'				=> 'Actualizar Fabricante',
+    'update'				=> 'Actualizar fabricante',
 
 );
diff --git a/resources/lang/es-VE/admin/models/general.php b/resources/lang/es-VE/admin/models/general.php
index 7b575e0c7b..a90444b674 100644
--- a/resources/lang/es-VE/admin/models/general.php
+++ b/resources/lang/es-VE/admin/models/general.php
@@ -1,18 +1,18 @@
 <?php
 
 return array(
-    'about_models_title'     => 'Acerca de los Modelos de Activos',
-    'about_models_text'           => 'Los Modelos de Activos son un grupo de activos idénticos. "MBP 2013", "iPhone 6S", etc.',
-    'deleted'  					        => 'Este modelo ha sido eliminado.',
-    'bulk_delete'               => 'Eliminación Masiva de Modelos de Activos',
-    'bulk_delete_help'               => 'Usa las casillas abajo para confirmar la eliminación de los modelos de activos seleccionados. Los modelos de activo que tienen distintos activos asociados con ellos no pueden ser borrados hasta que los activos sean asociados a un modelo diferente.',
+    'about_models_title'     => 'Acerca de los modelos de activos',
+    'about_models_text'           => 'Los modelos de activos son una forma de agrupar activos idénticos. "MBP 2013", "IPhone 6s", etc.',
+    'deleted'  					=> 'Este modelo ha sido eliminado.',
+    'bulk_delete'               => 'Eliminación masiva de modelos de activos',
+    'bulk_delete_help'               => 'Utilice las casillas a continuación para confirmar la eliminación de los modelos de activos seleccionados. Los modelos de activos que tienen activos asociados a ellos no se pueden eliminar hasta que los activos estén asociados con un modelo diferente.',
     'bulk_delete_warn'          => 'Está a punto de eliminar un modelo de activo.|Está a punto de eliminar :model_count modelos de activos.',
-    'restore'                   => 'Restaurar Modelo',
+    'restore'                   => 'Restaurar modelo',
     'requestable'               => 'Los usuarios pueden solicitar este modelo',
-	'show_mac_address'			      => 'Mostrar campo de dirección MAC en activos en este modelo',
+	'show_mac_address'			      => 'Mostrar el campo de dirección MAC en los activos de este modelo',
     'view_deleted'              => 'Ver Borrados',
     'view_models'               => 'Ver modelos',
-    'fieldset'                  => 'Grupos de campo',
-    'no_custom_field'           => 'Sin campos personalizados',
-    'add_default_values'        => 'Añadir valores por defecto',
+    'fieldset'                  => 'Grupo de campos',
+    'no_custom_field'           => 'No hay campos personalizados',
+    'add_default_values'        => 'Agregar valores predeterminados',
 );
diff --git a/resources/lang/es-VE/admin/models/message.php b/resources/lang/es-VE/admin/models/message.php
index 5c0af1bab3..b1ef0f25ee 100644
--- a/resources/lang/es-VE/admin/models/message.php
+++ b/resources/lang/es-VE/admin/models/message.php
@@ -2,33 +2,33 @@
 
 return array(
 
-    'deleted' => 'Modelo de recurso eliminado',
+    'deleted' => 'Se eliminó el modelo del activo',
     'does_not_exist' => 'El modelo no existe.',
-    'no_association' => '¡ATENCIÓN! ¡El modelo de activo para este artículo no es válido o falta!',
-    'no_association_fix' => 'Esto romperá cosas de formas extrañas y horribles. Edite este activo ahora para asignarle un modelo.',
-    'assoc_users'	 => 'Este modelo está asignado a uno o más activos y no puede ser eliminado. Por favor, borra los activos y luego intenta borrarlo nuevamente. ',
-
+    'no_association' => '¡ADVERTENCIA! ¡El modelo de activo para este artículo no es válido o no existe!',
+    'no_association_fix' => 'Esto causará problemas raros y horribles. Edite este activo ahora para asignarle un modelo.',
+    'assoc_users'	 => 'Este modelo está asociado a uno o más activos y no puede ser eliminado. Por favor, elimine los activos y vuelva a intentarlo. ',
+    'invalid_category_type' => 'El tipo de esta categoría debe ser categoría de activos.',
 
     'create' => array(
-        'error'   => 'El modelo no fue creado, por favor inténtalo de nuevo.',
-        'success' => 'Modelo creado con éxito.',
-        'duplicate_set' => 'Ya existe un modelo de equipo con el mismo nombre, fabricante y número de modelo.',
+        'error'   => 'El modelo no fue creado, por favor inténtelo de nuevo.',
+        'success' => 'El modelo fue creado exitosamente.',
+        'duplicate_set' => 'Ya existe un modelo de activo con el mismo nombre, fabricante y número de modelo.',
     ),
 
     'update' => array(
-        'error'   => 'El modelo no fue actualizado, por favor, inténtalo de nuevo',
-        'success' => 'Modelo actualizado con éxito.',
+        'error'   => 'El modelo no pudo ser actualizado, por favor inténtelo de nuevo',
+        'success' => 'El modelo fue actualizado exitosamente.',
     ),
 
     'delete' => array(
         'confirm'   => '¿Está seguro de que desea eliminar este modelo de activo?',
         'error'   => 'Hubo un problema eliminando el modelo. Por favor, inténtelo de nuevo.',
-        'success' => 'El modelo fue borrado con éxito.'
+        'success' => 'El modelo fue eliminado exitosamente.'
     ),
 
     'restore' => array(
-        'error'   		=> 'El modelo no fue restaurado, por favor inténtalo de nuevo',
-        'success' 		=> 'Modelo restaurado con éxito.'
+        'error'   		=> 'El modelo no fue restaurado, por favor intente nuevamente',
+        'success' 		=> 'El modelo fue restaurado exitosamente.'
     ),
 
     'bulkedit' => array(
diff --git a/resources/lang/es-VE/admin/models/table.php b/resources/lang/es-VE/admin/models/table.php
index d9dfd1a9fe..312944b9cd 100644
--- a/resources/lang/es-VE/admin/models/table.php
+++ b/resources/lang/es-VE/admin/models/table.php
@@ -2,16 +2,16 @@
 
 return array(
 
-    'create'				=> 'Crear Modelo de Activo',
+    'create'				=> 'Crear modelo de activo',
     'created_at' 			=> 'Creado el',
-    'eol'	 				=> 'Fin de Vida',
+    'eol'	 				=> 'Fin de soporte (EOL)',
     'modelnumber'   		=> 'Modelo No.',
     'name'      			=> 'Nombre del modelo de activo',
     'numassets' 			=> 'Activos',
-    'title'					=> 'Modelos de Activo',
+    'title'					=> 'Modelos de activos',
     'update'				=> 'Actualizar modelo de activo',
-    'view'					=> 'Ver Modelos de Activo',
+    'view'					=> 'Ver modelo de activo',
     'update'				=> 'Actualizar modelo de activo',
-    'clone'				=> 'Clonar Modelo',
-    'edit'				=> 'Editar Modelo',
+    'clone'				=> 'Clonar modelo',
+    'edit'				=> 'Editar modelo',
 );
diff --git a/resources/lang/es-VE/admin/reports/general.php b/resources/lang/es-VE/admin/reports/general.php
index 770957a1c8..510fbbe4e2 100644
--- a/resources/lang/es-VE/admin/reports/general.php
+++ b/resources/lang/es-VE/admin/reports/general.php
@@ -1,17 +1,23 @@
 <?php
 
 return [
-    'info'   => 'Selecciona que opciones quieres para tu informe de activos.',
+    'info'   => 'Seleccione las opciones que desee para su informe de activos.',
     'deleted_user' => 'Usuario eliminado',
     'send_reminder' => 'Enviar recordatorio',
+    'cannot_send_reminder' => 'User has been deleted or does not have an email address so cannot receive a reminder',
     'reminder_sent' => 'Recordatorio enviado',
     'acceptance_deleted' => 'Solicitud de aceptación eliminada',
     'acceptance_request' => 'Solicitud de aceptación',
     'custom_export' => [
         'user_address' => 'Dirección de usuario',
-        'user_city' => 'Ciudad del Usuario',
+        'user_city' => 'Ciudad del usuario',
         'user_state' => 'Estado del usuario',
-        'user_country' => 'País de usuario',
-        'user_zip' => 'Usuario Zip'
-    ]
-];
\ No newline at end of file
+        'user_country' => 'País del usuario',
+        'user_zip' => 'Código postal del usuario'
+    ],
+    'open_saved_template' => 'Abrir plantilla guardada',
+    'save_template' =>  'Guardar plantilla',
+    'select_a_template' => 'Seleccione una plantilla',
+    'template_name' => 'Nombre de la plantilla',
+    'update_template' => 'Actualizar plantilla',
+];
diff --git a/resources/lang/es-VE/admin/reports/message.php b/resources/lang/es-VE/admin/reports/message.php
index a8f61aa993..a1c4522eba 100644
--- a/resources/lang/es-VE/admin/reports/message.php
+++ b/resources/lang/es-VE/admin/reports/message.php
@@ -1,5 +1,16 @@
 <?php
 
-return array(
-    'error'   => 'Debes seleccionar al menos UNA opción.'
-);
+return [
+    'about_templates' => 'Acerca de las plantillas guardadas',
+    'saving_templates_description' => 'Seleccione sus opciones, luego ingrese el nombre de su plantilla en el campo de arriba y haga clic en el botón \'Guardar plantilla\'. Use la lista desplegable para seleccionar una plantilla guardada previamente.',
+    'create'  => [
+        'success' => 'Plantilla guardada exitosamente',
+    ],
+    'update' => [
+        'success' => 'Plantilla actualizada exitosamente',
+    ],
+    'delete' => [
+        'success' => 'Plantilla eliminada',
+        'no_delete_permission' => 'La plantilla no existe o no tiene permisos para eliminarla.',
+    ],
+];
diff --git a/resources/lang/es-VE/admin/settings/general.php b/resources/lang/es-VE/admin/settings/general.php
index 42f66489c2..7106868468 100644
--- a/resources/lang/es-VE/admin/settings/general.php
+++ b/resources/lang/es-VE/admin/settings/general.php
@@ -3,159 +3,168 @@
 return [
     'ad'				        => 'Directorio Activo',
     'ad_domain'				    => 'Dominio del Directorio Activo',
-    'ad_domain_help'			=> 'Este es a veces el mismo que el correo electrónico de dominio, pero no siempre.',
+    'ad_domain_help'			=> 'Algunas veces coincide con el dominio de su correo electrónico, pero no siempre.',
     'ad_append_domain_label'    => 'Añadir nombre de dominio',
     'ad_append_domain'          => 'Añadir nombre de dominio al campo de nombre de usuario',
-    'ad_append_domain_help'     => 'El usuario no necesita escribir "username@domain.local", puede escribir únicamente "username".',
+    'ad_append_domain_help'     => 'El usuario no necesita escribir "usuario@dominio.local", puede escribir únicamente "usuario".',
     'admin_cc_email'            => 'Copiar en correo electrónico',
-    'admin_cc_email_help'       => 'Si desea enviar una copia de los correos electrónicos de devolución/asignación que se envían a los usuarios a una cuenta de correo electrónico adicional, escríbala aquí. De lo contrario, deje este campo en blanco.',
+    'admin_cc_email_help'       => 'Send a copy of checkin/checkout emails to this address.',
     'admin_settings'            => 'Configuración de administración',
     'is_ad'				        => 'Este es un servidor de Directorio Activo',
     'alerts'                	=> 'Alertas',
     'alert_title'               => 'Actualizar ajustes de notificación',
     'alert_email'				=> 'Enviar alertas a',
-    'alert_email_help'    => 'Direcciones de correo electrónico o listas de distribución a las que desea que se envíen alertas separadas por comas',
+    'alert_email_help'          => 'Direcciones de correo electrónico o listas de distribución a las que desea que se envíen alertas separadas por comas.',
     'alerts_enabled'			=> 'Alertas de correo electrónico habilitadas',
-    'alert_interval'			=> 'Limite de alertas de expiración (en días)',
-    'alert_inv_threshold'		=> 'Umbral de alerta del inventario',
-    'allow_user_skin'           => 'Permitir Skin de usuario',
-    'allow_user_skin_help_text' => 'Marcar esta casilla permitirá a un usuario reemplazar la apariencia de la interfaz de usuario con una diferente.',
-    'asset_ids'					=> 'IDs de activos',
+    'alert_interval'			=> 'Umbral para las alertas de caducidad (en días)',
+    'alert_inv_threshold'		=> 'Umbral para alerta de inventario',
+    'allow_user_skin'           => 'Permitir al usuario cambiar la apariencia',
+    'allow_user_skin_help_text' => 'Si se marca esta casilla, el usuario podrá reemplazar la apariencia de la interfaz con una diferente.',
+    'asset_ids'					=> 'Códigos de los activos',
     'audit_interval'            => 'Intervalo de Auditoría',
     'audit_interval_help'       => 'Si está obligado a auditar físicamente sus activos con regularidad, introduzca el intervalo en meses que utilice. Si actualiza este valor, se actualizarán todas las "próximas fechas de auditoría" de los activos con una fecha de auditoría próxima.',
-    'audit_warning_days'        => 'Umbral de Aviso de Auditoría',
+    'audit_warning_days'        => 'Umbral para aviso de auditoría',
     'audit_warning_days_help'   => '¿Con cuántos días de antelación es necesario avisar que se deben auditar los activos?',
-    'auto_increment_assets'		=> 'Generar etiquetas de activos que incrementan automáticamente',
+    'auto_increment_assets'		=> 'Generar incremento automático en las placas de activos',
     'auto_increment_prefix'		=> 'Prefijo (opcional)',
-    'auto_incrementing_help'    => 'Habilitar etiquetas de activos auto-incrementantes primero para establecer esto',
+    'auto_incrementing_help'    => 'Habilite primero el incremento automático de las placas de activos antes de configurar esto',
     'backups'					=> 'Copias de Seguridad',
     'backups_help'              => 'Crear, descargar y restaurar copias de seguridad ',
     'backups_restoring'         => 'Restaurando desde la copia de seguridad',
+    'backups_clean' => 'Depure la base de datos de la copia de seguridad antes de restaurarla',
+    'backups_clean_helptext' => "Esto puede ser útil si está cambiando entre versiones de bases de datos",
     'backups_upload'            => 'Cargar copia de seguridad',
     'backups_path'              => 'Las copias de seguridad en el servidor se almacenan en <code>:path</code>',
-    'backups_restore_warning'   => 'Utilice el botón de restauración <small><span class="btn btn-xs btn-warning"><i class="text-white fas fa-retweet" aria-hidden="true"></i></span></small> para restaurar desde una copia de seguridad anterior. (Actualmente esto no funciona con almacenamiento de archivos S3 o Docker.)<br><br>Su <strong>base de datos completa :app_name y cualquier archivo subido será completamente reemplazado</strong> por lo que hay en el archivo de copia de seguridad.  ',
+    'backups_restore_warning'   => 'Use the restore button <small><span class="btn btn-xs btn-warning"><i class="text-white fas fa-retweet" aria-hidden="true"></i></span></small> to restore from a previous backup. (This does not currently work with S3 file storage or Docker.)<br><br>Your <strong>entire :app_name database and any uploaded files will be completely replaced</strong> by what\'s in the backup file  ',
     'backups_logged_out'         => 'A todos los usuarios existentes, incluido usted, se le cerrará la sesión una vez que la restauración haya finalizado.',
     'backups_large'             => 'Las copias de seguridad muy grandes pueden agotar el tiempo de espera en el intento de restauración y todavía pueden necesitar ser ejecutadas a través de la línea de comandos. ',
-    'barcode_settings'			=> 'Configuración del Código de Barras',
+    'barcode_settings'			=> 'Configuración del código de barras',
     'confirm_purge'			    => 'Confirmar Purga',
-    'confirm_purge_help'		=> 'Introduzca el texto "DELETE" en el cuadro de abajo para purgar sus registros borrados. Esta acción no se puede deshacer y borrará PERMANENTAMENTE todos los elementos y usuarios eliminados de forma soft. (Primero debes hacer una copia de seguridad, solo para estar seguro).',
+    'confirm_purge_help'		=> 'Introduzca el texto "DELETE" en la casilla de abajo para purgar sus registros borrados. Esta acción no se puede deshacer y borrará PERMANENTAMENTE todos los elementos y usuarios eliminados. Debería hacer primero una copia de seguridad, para estar seguro.',
     'custom_css'				=> 'CSS Personalizado',
-    'custom_css_help'			=> 'Introduce cualquier CSS personalizado que quieras utilizar. No incluyas las etiquetas &lt;style&gt;&lt;/style&gt; .',
-    'custom_forgot_pass_url'	=> 'Personalizar URL de Restablecimiento de Contraseña',
-    'custom_forgot_pass_url_help'	=> 'Esto remplaza la URL incorporada para contraseña olvidada en la pantalla de inicio, útil para dirigir a las personas a una funcionalidad de restablecimiento de interna o alojada en LDPA. Esto deshabilitará la funcionalidad local de contraseña olvidada.',
+    'custom_css_placeholder'	=> 'Add your custom CSS',
+    'custom_css_help'			=> 'Introduzca cualquier CSS personalizado que desee utilizar. No incluya las etiquetas &lt;style&gt;&lt;/style&gt;.',
+    'custom_forgot_pass_url'	=> 'URL de restablecimiento de contraseña personalizada',
+    'custom_forgot_pass_url_help'	=> 'Esto reemplaza la URL de contraseña olvidada incorporada en la pantalla de inicio de sesión, es útil para dirigir a las personas a la funcionalidad de restablecimiento de contraseña LDAP interna o alojada. Deshabilitará efectivamente la funcionalidad de olvido de contraseña del usuario local.',
     'dashboard_message'			=> 'Mensaje en el tablero',
     'dashboard_message_help'	=> 'Este texto aparecerá en el panel para cualquiera que tenga permiso de ver el panel.',
     'default_currency'  		=> 'Divisa predeterminada',
     'default_eula_text'			=> 'Acuerdo de uso predeterminado',
-    'default_language'			=> 'Lenguaje Predeterminado',
+    'default_eula_text_placeholder' => 'Add your default EULA text',
+    'default_language'			=> 'Idioma predeterminado',
     'default_eula_help_text'	=> 'También puede asociar acuerdos de uso personalizados a categorías específicas.',
     'acceptance_note'           => 'Añada una nota para su decisión (opcional)',
     'display_asset_name'        => 'Mostrar nombre del activo',
     'display_checkout_date'     => 'Mostrar fecha de asignación',
-    'display_eol'               => 'Mostrar Fin de Vida en la vista de tabla',
-    'display_qr'                => 'Mostrar Códigos QR',
-    'display_alt_barcode'		=> 'Mostrar código de barras 1D',
-    'email_logo'                => 'Logo de correo electrónico',
-    'barcode_type'				=> 'Tipo de código de barras 2D',
-    'alt_barcode_type'			=> 'Tipo de código de barras 1D',
-    'email_logo_size'       => 'Los logotipos cuadrados en el correo electrónico se ven mejor. ',
+    'display_eol'               => 'Mostrar fin de soporte (EOL) en la vista de tabla',
+    'display_qr'                => 'Mostrar código de barras en 2D',
+    'display_alt_barcode'		=> 'Mostrar códigos de barras de 1D',
+    'barcode_type'				=> 'Tipo de código de barras de 2D',
+    'alt_barcode_type'			=> 'Tipo de código de barras de 1D',
     'enabled'                   => 'Activado',
     'eula_settings'				=> 'Configuración de los acuerdos de uso',
     'eula_markdown'				=> 'Estos acuerdos de uso permiten <a href="https://help.github.com/articles/github-flavored-markdown/">markdown estilo Github</a>.',
+    'empty_row_count'           => 'Field Start Offset (Empty Rows)',
+    'empty_row_count_help'      => 'Fields will begin populating after this many empty rows are skipped at the top of the label.',
     'favicon'                   => 'Favicon',
-    'favicon_format'            => 'Los tipos de archivo aceptados son ico, png y gif. Otros formatos de imagen pueden no funcionar en todos los navegadores.',
-    'favicon_size'          => 'Favicons deben ser imágenes cuadradas, 16x16 píxeles.',
-    'footer_text'               => 'Texto adicional de pie de página ',
-    'footer_text_help'          => 'Este texto aparecerá en el lado derecho del pie de página. Los enlaces están permitidos usando <a href="https://help.github.com/articles/github-flavored-markdown/">el markdown estilo Github</a>. Saltos de línea, cabeceras, imágenes, etc., pueden dar resultados impredecibles.',
-    'general_settings'			=> 'Configuración General',
-    'general_settings_keywords' => 'soporte de la compañía, firma, aceptación, formato de correo electrónico, formato de nombre de usuario, imágenes, por página, miniatura, acuerdo de uso, términos y condiciones, gravatar, términos de servicio, tablero de indicadores, privacidad',
+    'favicon_format'            => 'Los tipos de archivo aceptados son ico, png y gif. Es posible que otros formatos de imagen no funcionen en todos los navegadores.',
+    'favicon_size'          => 'Los Favicons deben ser imágenes cuadradas, de 16x16 píxeles.',
+    'footer_text'               => 'Texto adicional en el pie de página ',
+    'footer_text_help'          => 'Este texto aparecerá en el lado derecho del pie de página. Los enlaces son permitidos usando <a href="https://help.github.com/articles/github-flavored-markdown/">markdown estilo Github</a>. Los saltos de línea, encabezados, imágenes, etc. pueden dar lugar a resultados impredecibles.',
+    'footer_text_placeholder'   => 'Optional footer text',
+    'general_settings'			=> 'Configuración general',
     'general_settings_help'     => 'Acuerdo de uso predeterminado y más',
-    'generate_backup'			=> 'Generar Respaldo',
-    'google_workspaces'         => 'Espacios de trabajo de Google',
-    'header_color'              => 'Color de Encabezado',
-    'info'                      => 'Estos ajustes te dejan personalizar ciertos aspectos de tu instalación.',
-    'label_logo'                => 'Logo de etiqueta',
+    'generate_backup'			=> 'Generar copia de seguridad',
+    'google_workspaces'         => 'Google Workspace',
+    'header_color'              => 'Color del encabezado',
+    'info'                      => 'Estos ajustes le permiten personalizar ciertos aspectos de su instalación.',
     'label_logo_size'           => 'Los logos cuadrados se ven mejor - se mostrarán en la parte superior derecha de cada etiqueta de activo. ',
     'laravel'                   => 'Versión de Lavarel',
     'ldap'                      => 'LDAP',
-    'ldap_default_group'        => 'Grupo de permisos por defecto',
+    'ldap_default_group'        => 'Grupo de permisos predeterminado',
     'ldap_default_group_info'   => 'Seleccione un grupo para asignar a los usuarios recién sincronizados. Recuerde que un usuario asume los permisos del grupo que le han asignado.',
     'no_default_group'          => 'Ningún grupo por defecto',
     'ldap_help'                 => 'LDAP/Directorio Activo',
     'ldap_client_tls_key'       => 'Llave TLS del cliente LDAP',
-    'ldap_client_tls_cert'      => 'Certificado LDAP cliente-lado TLS',
+    'ldap_client_tls_cert'      => 'LDAP Certificado TLS del lado del cliente',
     'ldap_enabled'              => 'LDAP activado',
     'ldap_integration'          => 'Integración LDAP',
     'ldap_settings'             => 'Configuración LDAP',
-    'ldap_client_tls_cert_help' => 'El certificado TLS lateral del cliente y la clave para las conexiones LDAP normalmente sólo son útiles en las configuraciones del espacio de trabajo de Google con "Secure LDAP". Ambas son requeridas.',
+    'ldap_client_tls_cert_help' => 'El certificado TLS del lado del cliente y la clave para las conexiones LDAP normalmente solo son útiles en las configuraciones de Google Workspace con "LDAP Seguro". Ambas son requeridas.',
     'ldap_location'             => 'Ubicación LDAP',
 'ldap_location_help'             => 'El campo Location (ubicación) de Ldap debe utilizarse si <strong>una OU no está siendo utilizada en el Base Bind DN (DN del enlace base).</strong> Deje este espacio en blanco si se utiliza una búsqueda OU.',
-    'ldap_login_test_help'      => 'Introduce un usuario y contraseña LDAP válidos desde la base DN que especificaste antes para probar si tu inicio de sesión LDAP está configurado correctamente. DEBES GUARDAR TUS CONFIGURACIONES LDAP ACTUALIZADAS PRIMERO.',
-    'ldap_login_sync_help'      => 'Esto solo prueba que LDAP puede sincronizarse correctamente. Si tu solicitud de Autenticación LDAP no es correcta, los usuarios no podrían iniciar sesión. DEBES GUARDAR TUS CONFIGURACIONES LDAP ACTUALIZADAS PRIMERO.',
+    'ldap_login_test_help'      => 'Introduzca un nombre de usuario y una contraseña LDAP válidos del DN base que especificó anteriormente para comprobar si el inicio de sesión LDAP está configurado correctamente. PRIMERO DEBE GUARDAR LA CONFIGURACIÓN LDAP ACTUALIZADA.',
+    'ldap_login_sync_help'      => 'Esto solo comprueba que el LDAP puede sincronizarse correctamente. Si su solicitud de autenticación LDAP no es correcta, los usuarios aún no podrían iniciar sesión. PRIMERO DEBE GUARDAR LA CONFIGURACIÓN LDAP ACTUALIZADA.',
     'ldap_manager'              => 'Gestor LDAP',
     'ldap_server'               => 'Servidor LDAP',
-    'ldap_server_help'          => 'Esto debería empezar con ldap:// (para no-encriptados o TLS) o ldaps:// (para SSL)',
+    'ldap_server_help'          => 'Esto debería comenzar con ldap:// (sin cifrado) o con ldaps:// (para TLS o SSL)',
     'ldap_server_cert'			=> 'Validación de certificado LDAP SSL',
-    'ldap_server_cert_ignore'	=> 'Permitir Certificado SSL inválido',
+    'ldap_server_cert_ignore'	=> 'Permitir certificado SSL inválido',
     'ldap_server_cert_help'		=> 'Seleccione esta casilla si está utilizando un certificado SSL autofirmado y desea aceptar un certificado SSL inválido.',
     'ldap_tls'                  => 'Usar TLS',
     'ldap_tls_help'             => 'Esto se debe seleccionar si se está ejecutando STARTTLS en el servidor LDAP. ',
-    'ldap_uname'                => 'Enlazar Nombre de Usuario LDAP',
+    'ldap_uname'                => 'Nombre de usuario de enlace LDAP (LDAP Bind Username)',
     'ldap_dept'                 => 'Departamento LDAP',
     'ldap_phone'                => 'Número de teléfono LDAP',
     'ldap_jobtitle'             => 'Cargo LDAP',
     'ldap_country'              => 'País LDAP',
-    'ldap_pword'                => 'Enlazar Contraseña LDAP',
-    'ldap_basedn'               => 'Enlazar Base DN',
+    'ldap_pword'                => 'Contraseña de enlace LDAP',
+    'ldap_basedn'               => 'DN del enlace base (Base Bind DN)',
     'ldap_filter'               => 'Filtro LDAP',
-    'ldap_pw_sync'              => 'Sincronización de Contraseña LDAP',
-    'ldap_pw_sync_help'         => 'Desmarca esta casilla si no deseas mantener las contraseñas LDAP sincronizadas con las contraseñas locales. Desactivar esto significa que tus usuarios no podrían acceder al inicio de sesión si tu servidor LDAP no está disponible por alguno razón.',
-    'ldap_username_field'       => 'Campo de Nombre de Usuario',
+    'ldap_pw_sync'              => 'Cache LDAP Passwords',
+    'ldap_pw_sync_help'         => 'Uncheck this box if you do not wish to keep LDAP passwords cached as local hashed passwords. Disabling this means that your users may not be able to login if your LDAP server is unreachable for some reason.',
+    'ldap_username_field'       => 'Campo nombre de usuario',
     'ldap_lname_field'          => 'Apellido',
-    'ldap_fname_field'          => 'Primer Nombre LDAP',
-    'ldap_auth_filter_query'    => 'Solicitud de Autenticación LDAP',
+    'ldap_fname_field'          => 'Nombre LDAP',
+    'ldap_auth_filter_query'    => 'Consulta de autentificación LDAP',
     'ldap_version'              => 'Versión LDAP',
     'ldap_active_flag'          => 'Flag activo LDAP',
-    'ldap_activated_flag_help'  => 'Este valor se utiliza para determinar si un usuario sincronizado puede iniciar sesión en Snipe-IT. <strong>No afecta a la capacidad de asignarles o retirarles items</strong>, y debería ser el <strong>nombre de atributo</strong> dentro de su AD/LDAP, <strong>no el valor</strong>. <br><br>Si este campo está configurado a un nombre de campo que no existe en su AD/LDAP, o el valor en el campo AD/LDAP se establece en <code>0</code> o <code>falso</code>, <strong>el inicio de sesión de usuario será deshabilitado</strong>. Si el valor en el campo AD/LDAP está establecido en <code>1</code> o <code>true</code> o <em>cualquier otro texto</em> significa que el usuario puede iniciar sesión. Cuando el campo está en blanco en su AD, respetamos el atributo <code>userAccountControl</code>, que generalmente permite a los usuarios no suspendidos iniciar sesión.',
+    'ldap_activated_flag_help'  => 'Este valor se utiliza para determinar si un usuario sincronizado puede iniciar sesión en Snipe-IT. <strong>No afecta a la capacidad de asignarles o retirarles elementos</strong>, y debería ser el <strong>nombre de atributo</strong> dentro de su AD/LDAP, <strong>no el valor</strong>. <br><br>Si este campo está configurado a un nombre de campo que no existe en su AD/LDAP, o el valor en el campo AD/LDAP se establece en <code>0</code> o <code>falso</code>, <strong>el inicio de sesión de usuario será deshabilitado</strong>. Si el valor en el campo AD/LDAP está establecido en <code>1</code> o <code>true</code> o <em>cualquier otro texto</em> significa que el usuario puede iniciar sesión. Cuando el campo está en blanco en su AD, respetamos el atributo <code>userAccountControl</code>, que generalmente permite a los usuarios no suspendidos iniciar sesión.',
+    'ldap_invert_active_flag'   => 'LDAP Invert Active Flag',
+    'ldap_invert_active_flag_help'     => 'If enabled: when the value returned by LDAP Active Flag is <code>0</code> or <code>false</code> the user account will be active.',
     'ldap_emp_num'              => 'Número de Empleado LDAP',
     'ldap_email'                => 'Correo electrónico LDAP',
     'ldap_test'                 => 'Probar LDAP',
     'ldap_test_sync'            => 'Prueba de sincronización LDAP',
-    'license'                   => 'Licencia de Software',
-    'load_remote'               => 'Usar Gravatar',
-    'load_remote_help_text'		=> 'Desmarque esta casilla si su instalación no puede cargar scripts desde el Internet externo. Esto evitará que Snipe-IT intente cargar imágenes desde Gravatar.',
+    'license'                   => 'Licencia de software',
+    'load_remote'               => 'Cargar avatares remotos',
+    'load_remote_help_text'		=> 'Desmarque esta casilla si su instalación no puede cargar secuencias de comandos (scripts) desde Internet . Esto evitará que Snipe-IT intente cargar avatares de Gravatar u otras fuentes externas.',
     'login'                     => 'Intentos de inicio de sesión',
     'login_attempt'             => 'Intento de inicio de sesión',
     'login_ip'                  => 'Dirección IP',
-    'login_success'             => '¿Éxito?',
+    'login_success'             => '¿Exitoso?',
     'login_user_agent'          => 'Agente de usuario',
     'login_help'                => 'Lista de intentos de inicio de sesión',
-    'login_note'                => 'Nota de Inicio de Sesión',
-    'login_note_help'           => 'Opcionalmente incluye unas pocas oraciones, por ejemplo para asistir a personas que han encontrado o perdido un dispositivo. Este campo acepta el <a href="https://help.github.com/articles/github-flavored-markdown/">markdown estilo Github</a>',
-    'login_remote_user_text'    => 'Opciones de usuario remoto',
+    'login_note'                => 'Nota en inicio de sesión',
+    'login_note_placeholder'            => "If you do not have a login or have found a device belonging to this company, please call technical support at 888-555-1212. Thank you.",
+    'login_note_help'           => 'Opcionalmente incluya algunas frases en su pantalla de inicio de sesión, por ejemplo para ayudar a las personas que han encontrado un dispositivo perdido o robado. Este campo acepta <a href="https://help.github.com/articles/github-flavored-markdown/">markdown estilo Github</a>',
+    'login_remote_user_text'    => 'Opciones de inicio de sesión de usuario remoto',
     'login_remote_user_enabled_text' => 'Activar inicio de sesión con la cabecera de usuario remota',
-    'login_remote_user_enabled_help' => 'Esta opción permite la autenticación a través del encabezado REMOTE_USER de acuerdo a la "Interfaz común de puerta de enlace (rfc3875)"',
+    'login_remote_user_enabled_help' => 'Esta opción habilita la autenticación mediante el encabezado REMOTE_USER de acuerdo con la "Interfaz de puerta de enlace común (rfc3875)"',
     'login_common_disabled_text' => 'Desactivar otros mecanismos de autenticación',
     'login_common_disabled_help' => 'Esta opción desactiva otros mecanismos de autenticación. Sólo habilite esta opción si está seguro de que su inicio de sesión REMOTE_USER ya está funcionando',
-    'login_remote_user_custom_logout_url_text' => 'URL de salida personalizada',
-    'login_remote_user_custom_logout_url_help' => 'Si se proporciona una url aquí, los usuarios serán redireccionados a esta URL después de que el usuario se desconecte de Snipe-IT. Esto es útil para cerrar correctamente las sesiones de usuario de su proveedor de autenticación.',
+    'login_remote_user_custom_logout_url_text' => 'URL de cierre de sesión personalizado',
+    'login_remote_user_custom_logout_url_help' => 'Si se proporciona una URL aquí, los usuarios serán redirigidos a esta URL después de que el usuario cierre la sesión de Snipe-IT. Esto es útil para cerrar correctamente las sesiones de usuario de su proveedor de autenticación.',
     'login_remote_user_header_name_text' => 'Cabecera de nombre de usuario personalizado',
     'login_remote_user_header_name_help' => 'Usar la cabecera especificada en lugar de REMOTE_USER',
     'logo'                    	=> 'Logo',
     'logo_print_assets'         => 'Usar en la impresión',
-    'logo_print_assets_help'    => 'Usar marca en listas de activos imprimibles ',
+    'logo_print_assets_help'    => 'Utilice la marca de la empresa en las listas de activos imprimibles ',
     'full_multiple_companies_support_help_text' => 'Limitar los usuarios asignados a compañías (incluyendo administradores) solo a los activos de esa compañía.',
     'full_multiple_companies_support_text' => 'Soporte completo a múltiples compañías',
+    'scope_locations_fmcs_support_text'  => 'Scope Locations with Full Multiple Companies Support',
+    'scope_locations_fmcs_support_help_text'  => 'Restrict locations to their selected company.',
+    'scope_locations_fmcs_check_button' => 'Check Compatibility',
+    'scope_locations_fmcs_support_disabled_text'  => 'This option is disabled because you have conflicting locations set for :count or more items.',
     'show_in_model_list'   => 'Mostrar en menús desplegables de modelos',
     'optional'					=> 'opcional',
-    'per_page'                  => 'Resultados por Página',
+    'per_page'                  => 'Resultados por página',
     'php'                       => 'Versión de PHP',
-    'php_info'                  => 'PHP Info',
+    'php_info'                  => 'Información de PHP',
     'php_overview'              => 'PHP',
-    'php_overview_keywords'     => 'phpinfo, sistema, información',
     'php_overview_help'         => 'Información del sistema PHP',
-    'php_gd_info'               => 'Debes instalar php-gd para mostrar códigos QR, ve las instrucciones de instalación.',
-    'php_gd_warning'            => 'PHP Image Processing y GD plugin NO ESTÁN instalados.',
+    'php_gd_info'               => 'Debe instalar php-gd para mostrar códigos QR, consulte las instrucciones de instalación.',
+    'php_gd_warning'            => 'PHP Image Processing y GD plugin NO están instalados.',
     'pwd_secure_complexity'     => 'Complejidad de la contraseña',
     'pwd_secure_complexity_help' => 'Seleccione las reglas de complejidad de las contraseñas que desee aplicar.',
     'pwd_secure_complexity_disallow_same_pwd_as_user_fields' => 'La contraseña no puede ser la misma que el nombre, apellido, correo electrónico o nombre de usuario',
@@ -163,34 +172,34 @@ return [
     'pwd_secure_complexity_numbers' => 'Requiere al menos un número',
     'pwd_secure_complexity_symbols' => 'Requiere al menos un símbolo',
     'pwd_secure_complexity_case_diff' => 'Requiere al menos una mayúscula y una minúscula',
-    'pwd_secure_min'            => 'Caracteres mínimos de contraseña',
+    'pwd_secure_min'            => 'Caracteres mínimos de la contraseña',
     'pwd_secure_min_help'       => 'El valor mínimo permitido es 8',
     'pwd_secure_uncommon'       => 'Evitar contraseñas comunes',
-    'pwd_secure_uncommon_help'  => 'Esto impedirá a los usuarios de usar contraseñas comunes de el top 10.000 de contraseñas que se notifiquen en las infracciones.',
-    'qr_help'                   => 'Activa Códigos QR primero para establecer esto',
-    'qr_text'                   => 'Texto del Código QR',
+    'pwd_secure_uncommon_help'  => 'Esto impedirá que los usuarios usen contraseñas comunes de las 10,000 contraseñas más usuales reportadas en fugas de datos.',
+    'qr_help'                   => 'Habilite primero los códigos QR para configurar esto',
+    'qr_text'                   => 'Texto del código QR',
     'saml'                      => 'SAML',
     'saml_title'                => 'Actualizar ajustes de SAML',
     'saml_help'                 => 'Configuración SAML',
     'saml_enabled'              => 'SAML activado',
     'saml_integration'          => 'Integración SAML',
-    'saml_sp_entityid'          => 'ID de entidad',
+    'saml_sp_entityid'          => 'ID de la entidad',
     'saml_sp_acs_url'           => 'URL del Servicio al Consumidor de Aserción (ACS)',
     'saml_sp_sls_url'           => 'URL del Servicio de cierre de sesión único (SLS)',
     'saml_sp_x509cert'          => 'Certificado público',
     'saml_sp_metadata_url'      => 'URL de metadatos',
     'saml_idp_metadata'         => 'Metadatos SAML IdP',
     'saml_idp_metadata_help'    => 'Puede especificar los metadatos IdP usando un archivo URL o XML.',
-    'saml_attr_mapping_username' => 'Mapeo de Atributos - Nombre de Usuario',
-    'saml_attr_mapping_username_help' => 'NameID se utilizará si el mapeo de atributos no está especificado o no es válido.',
+    'saml_attr_mapping_username' => 'Asociar atributo - Nombre de usuario',
+    'saml_attr_mapping_username_help' => 'NameID se utilizará si la asociación de atributos no está especificada o no es válida.',
     'saml_forcelogin_label'     => 'Forzar inicio de sesión SAML',
-    'saml_forcelogin'           => 'Hacer SAML el inicio de sesión principal',
-    'saml_forcelogin_help'      => 'Puedes usar \'/login?nosaml\' para llegar a la página de inicio de sesión normal.',
+    'saml_forcelogin'           => 'Hacer de SAML el método de inicio de sesión principal',
+    'saml_forcelogin_help'      => 'Puede usar \'/login?nosaml\' para ir a la página de inicio de sesión normal.',
     'saml_slo_label'            => 'Cerrar sesión única SAML',
     'saml_slo'                  => 'Enviar una solicitud de salida a IdP al cerrar sesión',
     'saml_slo_help'             => 'Esto causará que el usuario sea redirigido primero a la IdP al cerrar sesión. Dejar desmarcado si el IdP no soporta correctamente SAML SLO iniciado por SL.',
     'saml_custom_settings'      => 'Configuración personalizada SAML',
-    'saml_custom_settings_help' => 'Puedes especificar ajustes adicionales a la biblioteca onelogin/php-saml. Úsalo bajo tu propio riesgo.',
+    'saml_custom_settings_help' => 'Puede especificar ajustes adicionales a la biblioteca onelogin/php-saml. Úselo bajo su propio riesgo.',
     'saml_download'             => 'Descargar metadatos',
     'setting'                   => 'Configuración',
     'settings'                  => 'Configuraciones',
@@ -199,181 +208,282 @@ return [
     'show_archived_in_list_text'     => 'Mostrar activos archivados en la lista de "todos los activos"',
     'show_assigned_assets'      => 'Mostrar activos asignados a activos',
     'show_assigned_assets_help' => 'Mostrar activos que fueron asignados a otros activos en Ver usuario -> Activos, Ver usuario -> Información -> Imprimir todos los asignados y en Cuenta -> Ver elementos asignados.',
-    'show_images_in_email'     => 'Mostrar imágenes en emails',
-    'show_images_in_email_help'   => 'Desmarque esta casilla si su instalación de Snipe-IT está detrás de una VPN o red cerrada y los usuarios fuera de la red no podrán cargar imágenes servidas desde esta instalación en sus correos electrónicos.',
+    'show_images_in_email'     => 'Mostrar imágenes en correos electrónicos',
+    'show_images_in_email_help'   => 'Desmarque esta casilla si su instalación de Snipe-IT está detrás de una red privada o VPN y los usuarios fuera de la red no pueden cargar las imágenes publicadas desde este servidor de Snipe-IT en sus correos electrónicos.',
     'site_name'                 => 'Nombre del Sitio',
     'integrations'               => 'Integraciones',
     'slack'                     => 'Slack',
     'general_webhook'           => 'Webhook general',
-    'ms_teams'                  => 'Equipos Microsoft',
+    'ms_teams'                  => 'Microsoft Teams',
     'webhook'                   => ':app',
     'webhook_presave'           => 'Probar para guardar',
     'webhook_title'               => 'Actualizar ajustes de Webhook',
     'webhook_help'                => 'Ajustes de integración',
-    'webhook_botname'             => ':app Nombre',
-    'webhook_channel'             => ':app Canal',
-    'webhook_endpoint'            => ':app Endpoint',
-    'webhook_integration'         => ':app Ajustes',
-    'webhook_test'                 =>'Probar :app integración',
-    'webhook_integration_help'    => 'La integración de :app es opcional, sin embargo el extremo y el canal son necesarios si desea usarlo. Para configurar la integración de :app, primero debes crear <a href=":webhook_link" target="_new" rel="noopener">un webhook entrante</a> en tu cuenta :app. Haga clic en el botón <strong>Test :app Integración</strong> para confirmar que su configuración es correcta antes de guardar. ',
-    'webhook_integration_help_button'    => 'Una vez que hayas guardado la información de :app, aparecerá un botón de prueba.',
-    'webhook_test_help'           => 'Comprueba si tu integración con :app está configurada correctamente. DEBES GUARDAR TU ACTUALIZADO :app SETTINGS FIRST.',
-    'snipe_version'  			=> 'Version de Snipe-IT',
+    'webhook_botname'             => 'Nombre de Bot de :app',
+    'webhook_channel'             => 'Canal de :app',
+    'webhook_endpoint'            => 'Endpoint de :app',
+    'webhook_integration'         => 'Configuración de :app',
+    'webhook_test'                 =>'Probar integración con :app',
+    'webhook_integration_help'    => 'La integración con :app es opcional, sin embargo, el punto final (endpoint) y el canal son necesarios si desea usarla. Para configurar la integración con :app, primero debe crear <a href=":webhook_link" target="_new" rel="noopener">un webhook entrante</a> en su cuenta :app. Haga clic en el botón <strong>Probar integración con :app</strong> para confirmar que su configuración es correcta antes de guardar. ',
+    'webhook_integration_help_button'    => 'Una vez que haya guardado la información de :app, aparecerá un botón de prueba.',
+    'webhook_test_help'           => 'Compruebe si su integración con :app está configurada correctamente. PRIMERO DEBE GUARDAR LA CONFIGURACION ACTUALIZADA DE :app.',
+    'shortcuts_enabled'         => 'Habilitar accesos directos',
+    'shortcuts_help_text'       => '<strong>Windows</strong>: Alt + Tecla de acceso, <strong>Mac</strong>: Control + Opción + Tecla de acceso',
+    'snipe_version'  			=> 'Versión de Snipe-IT',
     'support_footer'            => 'Enlace al soporte en el pie de página ',
-    'support_footer_help'       => 'Especifica quién ve los links a la información de Soporte Snipe-IT y el Manual de Usuario',
+    'support_footer_help'       => 'Especifique quién puede ver los enlaces a la información de soporte de Snipe-IT y al manual de usuario',
     'version_footer'            => 'Versión en el pie de página ',
-    'version_footer_help'       => 'Especifique quién ve la versión de Snipe-IT y el número de compilación.',
-    'system'                    => 'Información de Sistema',
+    'version_footer_help'       => 'Especifique quién puede ver la versión de Snipe-IT y el número de compilación.',
+    'system'                    => 'Información del sistema',
     'update'                    => 'Actualizar Configuraciones',
     'value'                     => 'Valor',
     'brand'                     => 'Marca',
-    'brand_keywords'            => 'pie de página, logotipo, impresión, tema, piel, cabeza, colores, color, c(debate)',
     'brand_help'                => 'Logo, nombre del sitio',
-    'web_brand'                 => 'Tipo de marca web',
-    'about_settings_title'      => 'Acerca de las Configuraciones',
-    'about_settings_text'       => 'Estas configuraciones te dejan personalizar ciertos aspectos de tu instalación.',
+    'web_brand'                 => 'Tipo de marca en la web',
+    'about_settings_title'      => 'Acerca de las configuraciones',
+    'about_settings_text'       => 'Estas configuraciones le permiten personalizar ciertos aspectos de su instalación.',
     'labels_per_page'           => 'Etiquetas por página',
-    'label_dimensions'          => 'Dimensiones de las etiquetas (pulgadas)',
-    'next_auto_tag_base'        => 'Próximo auto-incremento',
+    'label_dimensions'          => 'Dimensiones de la etiqueta (pulgadas)',
+    'next_auto_tag_base'        => 'Siguiente incremento automático',
     'page_padding'              => 'Márgenes de página (pulgadas)',
     'privacy_policy_link'       => 'Enlace a la política de privacidad',
     'privacy_policy'            => 'Política de privacidad',
     'privacy_policy_link_help'  => 'Si se incluye una url aquí, un enlace a su política de privacidad se incluirá en el pie de página de la aplicación y en cualquier correo electrónico que el sistema envíe, de conformidad con el GDPR. ',
-    'purge'                     => 'Purgar Registros Eliminados',
+    'purge'                     => 'Purgar registros eliminados',
     'purge_deleted'             => 'Purgar eliminados ',
     'labels_display_bgutter'    => 'Borde inferior de la etiqueta',
     'labels_display_sgutter'    => 'Borde lateral de la etiqueta',
-    'labels_fontsize'           => 'Tamaño de fuente de la etiqueta',
+    'labels_fontsize'           => 'Tamaño de letra de la etiqueta',
     'labels_pagewidth'          => 'Ancho de la hoja de etiqueta',
     'labels_pageheight'         => 'Altura de la hoja de etiqueta',
-    'label_gutters'        => 'Espaciado de etiquetas (pulgadas)',
+    'label_gutters'        => 'Espacio entre etiquetas (pulgadas)',
     'page_dimensions'        => 'Dimensiones de la página (pulgadas)',
     'label_fields'          => 'Campos visibles de la etiqueta',
     'inches'        => 'pulgadas',
-    'width_w'        => 'an',
-    'height_h'        => 'al',
+    'width_w'        => 'ancho',
+    'height_h'        => 'alto',
     'show_url_in_emails'                => 'Enlace a Snipe-IT en correos electrónicos',
-    'show_url_in_emails_help_text'      => 'Desmarca esta casilla si no deseas volver a enlazar a tu instalación Snipe-IT en los pie de página de tu correo electrónico. Útil si la mayoría de tus usuarios nunca inicia sesión. ',
-    'text_pt'        => 'pt',
+    'show_url_in_emails_help_text'      => 'Desmarque esta casilla si no desea vincular su instalación de Snipe-IT en el pie de página de correo electrónico. Útil si la mayoría de sus usuarios nunca se conectan. ',
+    'text_pt'        => 'puntos',
     'thumbnail_max_h'   => 'Altura máxima de la miniatura',
-    'thumbnail_max_h_help'   => 'Altura máxima en píxeles que las miniaturas pueden mostrar en la vista de lista. Mín 25, max 500.',
+    'thumbnail_max_h_help'   => 'Altura máxima en píxeles para mostrar las miniaturas en la vista de listado. Mín 25, máx 500.',
     'two_factor'        => 'Autenticación de dos factores',
     'two_factor_secret'        => 'Código de verificación de dos factores',
     'two_factor_enrollment'        => 'Inscripción en verificación de dos factores',
     'two_factor_enabled_text'        => 'Activar la verificación de dos factores',
     'two_factor_reset'        => 'Restablecer el secreto en verificación de dos factores',
-    'two_factor_reset_help'        => 'Esto obligará al usuario a volver a inscribir su dispositivo en su aplicación de autenticación. Esto puede ser útil si su dispositivo actualmente inscrito es perdido o robado. ',
-    'two_factor_reset_success'          => 'Verificación de dos pasos del dispositivo reiniciado exitosamente',
-    'two_factor_reset_error'          => 'La verificación de dos pasos del dispositivo ha fallado',
+    'two_factor_reset_help'        => 'Esto obligará al usuario a inscribir de nuevo su dispositivo en su aplicación de autenticación. Esto puede ser útil en caso de pérdida o robo del dispositivo actualmente registrado. ',
+    'two_factor_reset_success'          => 'Dispositivo de verificación de dos factores restablecido correctamente',
+    'two_factor_reset_error'          => 'Error al restablecer el dispositivo de verificación de doble factor',
     'two_factor_enabled_warning'        => 'Al activar el doble factor si no está activado, se le obligará inmediatamente a autenticarse con un dispositivo registrado en Google Auth. Tendrá la posibilidad de inscribir su dispositivo si uno no está inscrito actualmente.',
-    'two_factor_enabled_help'        => 'Esto activará la autenticación de dos factores usando Google Authenticator.',
-    'two_factor_optional'        => 'Selectivo (Usuarios pueden habilitar o deshabilitar si está permitido)',
+    'two_factor_enabled_help'        => 'Esto activará la autenticación de dos factores mediante Google Authenticator.',
+    'two_factor_optional'        => 'Selectivo (los usuarios pueden activar o desactivar si está permitido)',
     'two_factor_required'        => 'Requerido para todos los usuarios',
     'two_factor_disabled'        => 'Desactivado',
     'two_factor_enter_code'	=> 'Ingrese el código de verificación de dos factores',
     'two_factor_config_complete'	=> 'Enviar código',
-    'two_factor_enabled_edit_not_allowed' => 'Tu administrador no te permite editar esta configuración.',
-    'two_factor_enrollment_text'	=> "Se requiere autenticación de dos factores, sin embargo su dispositivo aún no ha sido inscrito. Abra su aplicación Google Authenticator y escanee el código QR de abajo para inscribir su dispositivo. Una vez que lo haya inscrito, introduzca el código en la parte inferior",
+    'two_factor_enabled_edit_not_allowed' => 'El administrador no le permite modificar esta configuración.',
+    'two_factor_enrollment_text'	=> "Se requiere autenticación de dos factores, sin embargo su dispositivo aún no ha sido inscrito. Abra la aplicación Google Authenticator y escanee el código QR que aparece a continuación para registrar su dispositivo. Una vez que haya registrado su dispositivo, introduzca el código en la parte inferior",
     'require_accept_signature'      => 'Solicitar firma',
-    'require_accept_signature_help_text'      => 'Activar esta función requiere que los usuarios firmen físicamente aceptando un elemento.',
+    'require_accept_signature_help_text'      => 'Al activar esta función, los usuarios tendrán que firmar físicamente la aceptación de un activo.',
+    'require_checkinout_notes'  => 'Exigir notas en el ingreso/asignación',
+    'require_checkinout_notes_help_text'    => 'Al activar esta característica, los campos de notas deberán rellenarse al ingresar o asignar un activo.',
     'left'        => 'izquierda',
     'right'        => 'derecha',
     'top'        => 'arriba',
     'bottom'        => 'abajo',
     'vertical'        => 'vertical',
     'horizontal'        => 'horizontal',
-    'unique_serial'                => 'Numero de Serial Único',
-    'unique_serial_help_text'                => 'Marcando esta casilla se aplicará una restricción de singularidad en las publicaciones seriadas de activos',
-    'zerofill_count'        => 'Longitud de las etiquetas de activos, incluyendo relleno de ceros',
+    'unique_serial'                => 'Números de serie únicos',
+    'unique_serial_help_text'                => 'Al marcar esta casilla, se aplicará una restricción a los activos para tener números de serie únicos',
+    'zerofill_count'        => 'Longitud de los números en las placas de los activos, incluyendo los ceros de relleno',
     'username_format_help'   => 'Esta configuración solo será utilizada por el proceso de importación si no se proporciona un nombre de usuario y tenemos que generar un nombre de usuario por usted.',
     'oauth_title' => 'Configuración de la API de OAuth',
-    'oauth_clients' => 'OAuth Clients',
+    'oauth_clients' => 'Clientes OAuth',
     'oauth' => 'OAuth',
-    'oauth_help' => 'Configuración de Oauth Endpoint',
-    'oauth_no_clients' => 'You have not created any OAuth clients yet.',
-    'oauth_secret' => 'Secret',
-    'oauth_authorized_apps' => 'Authorized Applications',
-    'oauth_redirect_url' => 'Redirect URL',
-    'oauth_name_help' => ' Something your users will recognize and trust.',
+    'oauth_help' => 'Configuración del punto final (endpoint) OAuth',
+    'oauth_no_clients' => 'Aún no ha creado ningún cliente OAuth.',
+    'oauth_secret' => 'Secreto',
+    'oauth_authorized_apps' => 'Aplicaciones autorizadas',
+    'oauth_redirect_url' => 'URL de redireccionamiento',
+    'oauth_name_help' => ' Algo que sus usuarios reconocerán y en lo que confiarán.',
     'oauth_scopes' => 'Scopes',
-    'oauth_callback_url' => 'Your application authorization callback URL.',
-    'create_client' => 'Create Client',
-    'no_scopes' => 'No scopes',
-    'asset_tag_title' => 'Actualizar configuración de etiquetas de activos',
-    'barcode_title' => 'Actualizar ajustes de código de barras',
+    'oauth_callback_url' => 'URL de devolución de llamada de autorización de su aplicación (callback URL).',
+    'create_client' => 'Crear cliente',
+    'no_scopes' => 'Sin scopes',
+    'asset_tag_title' => 'Actualizar la configuración de las placas de activos',
+    'barcode_title' => 'Actualizar la configuración de los códigos de barras',
     'barcodes' => 'Códigos de barras',
     'barcodes_help_overview' => 'Configuración de código de barras &amp; QR',
     'barcodes_help' => 'Esto intentará eliminar códigos de barras almacenados en caché. Normalmente solo se usa si la configuración del código de barras ha cambiado o si ha cambiado la URL de Snipe-IT. Los códigos de barras se volverán a generar la próxima vez que se acceda a ellos.',
     'barcodes_spinner' => 'Intentando eliminar archivos...',
     'barcode_delete_cache' => 'Borrar caché de código de barras',
-    'branding_title' => 'Actualizar ajustes de marca',
-    'general_title' => 'Actualizar ajustes generales',
+    'branding_title' => 'Actualizar la configuración de la marca',
+    'general_title' => 'Actualizar la configuración general',
     'mail_test' => 'Enviar prueba',
     'mail_test_help' => 'Esto intentará enviar un correo de prueba a :replyto.',
     'filter_by_keyword' => 'Filtrar por palabra clave',
     'security' => 'Seguridad',
-    'security_title' => 'Actualizar ajustes de seguridad',
-    'security_keywords' => 'contraseña, contraseñas, requisitos, dos factores, dos factores, contraseñas comunes, inicio de sesión remoto, autenticación',
-    'security_help' => 'Restricciones de contraseña de dos factores',
-    'groups_keywords' => 'permisos, grupos de permisos, autorización',
-    'groups_help' => 'Grupos de permisos de cuenta',
-    'localization' => 'Ubicación',
-    'localization_title' => 'Actualizar ajustes de localización',
-    'localization_keywords' => 'localización, moneda, local, locale, zona horaria, zona horaria, internacional, internatinalización, idioma, idioma, traducción',
-    'localization_help' => 'Idioma, fecha',
+    'security_title' => 'Actualizar la configuración de seguridad',
+    'security_help' => 'Verificación de dos factores y restricciones de contraseña',
+    'groups_help' => 'Grupos de permisos',
+    'localization' => 'Localización',
+    'localization_title' => 'Actualizar la configuración de localización',
+    'localization_help' => 'Idioma, visualización de la fecha',
     'notifications' => 'Notificaciones',
-    'notifications_help' => 'Configuración de alertas por email y auditoría',
+    'notifications_help' => 'Configuración de alertas por correo electrónico y de auditoría',
     'asset_tags_help' => 'Incrementos y prefijos',
     'labels' => 'Etiquetas',
     'labels_title' => 'Actualizar configuración de etiquetas',
-    'labels_help' => 'Tamaños de etiqueta &amp; ajustes',
-    'purge_keywords' => 'eliminar permanentemente',
+    'labels_help' => 'Configuración de códigos de barras &amp; etiquetas',
     'purge_help' => 'Purgar registros eliminados',
     'ldap_extension_warning' => 'No parece que la extensión LDAP esté instalada o habilitada en este servidor. Todavía puede guardar su configuración, pero necesitará habilitar la extensión LDAP para PHP antes de que funcione la sincronización LDAP o el inicio de sesión.',
     'ldap_ad' => 'LDAP/AD',
+    'ldap_test_label' => 'Test LDAP Sync',
+    'ldap_test_login' => ' Test LDAP Login',
+    'ldap_username_placeholder' => 'LDAP Username',
+    'ldap_password_placeholder' => 'LDAP Password',
     'employee_number' => 'Número de empleado',
     'create_admin_user' => 'Crear un usuario ::',
-    'create_admin_success' => '¡Éxito! ¡Tu usuario admin ha sido añadido!',
-    'create_admin_redirect' => '¡Haz clic aquí para acceder a tu aplicación!',
+    'create_admin_success' => '¡Éxito! ¡Su usuario admin ha sido añadido!',
+    'create_admin_redirect' => '¡Haga clic aquí para acceder a su aplicación!',
     'setup_migrations' => 'Migraciones de Base de Datos ::',
     'setup_no_migrations' => 'No hay nada que migrar. ¡Las tablas de la base de datos ya estaban configuradas!',
     'setup_successful_migrations' => 'Se han creado las tablas de la base de datos',
     'setup_migration_output' => 'Salida de Migración:',
     'setup_migration_create_user' => 'Siguiente: Crear usuario',
-    'ldap_settings_link' => 'Página de ajustes LDAP',
-    'slack_test' => 'Prueba <i class="fab fa-slack"></i> Integración',
-    'label2_enable'           => 'Nuevo motor de etiqueta',
+    'ldap_settings_link' => 'Página de configuración de LDAP',
+    'slack_test' => 'Prueba de integración de <i class="fab fa-slack"></i>',
+    'status_label_name' => 'Status Label Name',
+    'super_admin_only'  => 'Super Admin Only',
+    'label2_enable'           => 'Nuevo motor de etiquetas',
     'label2_enable_help'      => 'Cambiar al nuevo motor de etiquetas. <b>Nota: Deberá guardar esta configuración antes de configurar otros parámetros.</b>',
     'label2_template'         => 'Plantilla',
     'label2_template_help'    => 'Seleccione qué plantilla utilizar para la generación de etiquetas',
     'label2_title'            => 'Título',
     'label2_title_help'       => 'El título para mostrar en etiquetas que lo soportan',
     'label2_title_help_phold' => 'El marcador de posición <code>{COMPANY}</code> será reemplazado con el nombre de la compañía del activo',
-    'label2_asset_logo'       => 'Usar Logo de Activos',
+    'label2_asset_logo'       => 'Usar logo de activos',
     'label2_asset_logo_help'  => 'Utilice el logotipo de la compañía asignada, en lugar del valor en <code>:setting_name</code>',
     'label2_1d_type'          => 'Tipo de código de barras 1D',
     'label2_1d_type_help'     => 'Formato para códigos de barras 1D',
     'label2_2d_type'          => 'Tipo de código de barras 2D',
     'label2_2d_type_help'     => 'Formato para códigos de barras 2D',
     'label2_2d_target'        => 'Apuntamiento del código de barras 2D',
-    'label2_2d_target_help'   => 'La URL a la que apunta el código de barras 2D cuando se escanea',
-    'label2_fields'           => 'Definiciones de campo',
-    'label2_fields_help'      => 'Los campos pueden ser agregados, eliminados y reordenados en la columna izquierda. Para cada campo, múltiples opciones para Etiqueta y DataSource pueden ser agregadas, eliminadas y reordenadas en la columna derecha.',
+    'label2_2d_target_help'   => 'Los datos que incluirá el código de barra 2D',
+    'label2_fields'           => 'Definiciones del campo',
+    'label2_fields_help'      => 'Los campos se pueden añadir, eliminar y reordenar en la columna izquierda. Para cada campo, se pueden agregar, eliminar y reordenar múltiples opciones para etiquetas y para orígenes de datos en la columna derecha.',
+    'purge_barcodes' => 'Purge Barcodes',
     'help_asterisk_bold'    => 'Texto introducido como <code>**texto**</code> se mostrará como negrita',
     'help_blank_to_use'     => 'Deje en blanco para usar el valor de <code>:setting_name</code>',
-    'help_default_will_use' => '<code>:default</code> usará el valor de <code>:setting_name</code>. <br>Tenga en cuenta que el valor de los códigos de barra debe estar en cumplimiento con la especificación respectiva para que sean generados exitosamente. Por favor lea <a href="https://snipe-it.readme.io/docs/barcodes">la documentación <i class="fa fa-external-link"></i></a> para más detalles. ',
+    'help_default_will_use' => '<code>:default</code> usará el valor de <code>:setting_name</code>. <br>Tenga en cuenta que el valor de los códigos de barras debe cumplir la especificación respectiva para que sean generados exitosamente. Por favor lea <a href="https://snipe-it.readme.io/docs/barcodes">la documentación <i class="fa fa-external-link"></i></a> para más detalles. ',
+    'asset_id'              => 'ID del activo',
+    'data'               => 'Datos',
     'default'               => 'Por defecto',
     'none'                  => 'Ninguna',
     'google_callback_help' => 'Esto debe introducirse como URL de devolución de llamada (callback) en la configuración de su aplicación de Google OAuth en la <strong><a href="https://console.cloud.google.com/" target="_blank">consola de desarrollador de Google <i class="fa fa-external-link" aria-hidden="true"></i></a></strong> de su organización .',
     'google_login'      => 'Configuración de inicio de sesión de Google Workspace',
     'enable_google_login'  => 'Permitir a los usuarios iniciar sesión con Google Workspace',
-    'enable_google_login_help'  => 'Los usuarios no serán provistos automáticamente. Deben tener una cuenta existente aquí AND en Google Workspace, y su nombre de usuario debe coincidir con su dirección de correo electrónico de Google Workspace. ',
+    'enable_google_login_help'  => 'Los usuarios no serán creados automáticamente. Deben tener una cuenta existente aquí Y en Google Workspace, y su nombre de usuario aquí debe coincidir con su dirección de correo electrónico de Google Workspace. ',
     'mail_reply_to' => 'Dirección de respuesta de correo',
     'mail_from' => 'Correo desde la dirección',
     'database_driver' => 'Controlador de base de datos',
     'bs_table_storage' => 'Almacenamiento de tabla',
-    'timezone' => 'Timezone',
+    'timezone' => 'Zona horaria',
+    'test_mail' => 'Test Mail',
     'profile_edit'          => 'Editar perfil',
     'profile_edit_help'          => 'Permitir que los usuarios editen sus propios perfiles.',
+    'default_avatar' => 'Custom Default Avatar',
+    'default_avatar_help' => 'Esta imagen se mostrará como la imagen de perfil si el usuario no tiene foto de perfil.',
+    'restore_default_avatar' => 'Restaurar <a href=":default_avatar" data-toggle="lightbox" data-type="image">avatar original por defecto del sistema</a>',
+    'restore_default_avatar_help' => '',
+    'due_checkin_days' => 'Advertencia para próximos ingresos',
+    'due_checkin_days_help' => '¿Cuántos días antes de la fecha prevista de ingreso de un activo debe figurar en la página «Próximos a ingresar»?',
+    'no_groups' => 'Todavía no se han creado grupos. Para agregar uno, visite<code>Configuración de administración > Grupos de permisos</code>.',
+    'text' => 'Text',
+
+    'username_formats' => [
+        'username_format'		=> 'Formato de Nombre de Usuario',
+        'firstname_lastname_format'	=> 'First Name Last Name (jane.smith)',
+        'first_name_format'	        => 'First Name (jane)',
+        'last_name_format'		=> 'Last Name (doe)',
+        'filastname_format'			=> 'First Initial Last Name (jsmith)',
+        'lastnamefirstinitial_format' =>  'Last Name First Initial (smithj)',
+        'firstname_lastname_underscore_format' => 'First Name Last Name (jane_smith)',
+        'firstinitial.lastname' => 'First Initial Last Name (j.smith)',
+        'lastname_firstinitial' => 'Last Name First Initial (smith_j)',
+        'lastname_dot_firstinitial_format' => 'Last Name First Initial (smith.j)',
+        'firstnamelastname'     => 'First Name Last Name (janesmith)',
+        'firstnamelastinitial'  => 'First Name Last Initial (janes)',
+        'lastnamefirstname'      => 'Apellido.Nombre (smith.jane)',
+    ],
+
+    'email_formats' => [
+        'email_format'			=> 'Formato de correo electrónico',
+        'firstname_lastname_format'	=> 'Nombre y apellido (jane.smith@ejemplo.com)',
+        'first_name_format'		=> 'Nombre (jane@ejemplo.com)',
+        'last_name_format'		=> 'Last Name (doe@example.com)',
+        'filastname_format'			=> 'Inicial del nombre y apellido (jsmith@ejemplo.com)',
+        'lastnamefirstinitial_format' =>  'Apellido e inicial del nombre (smithj@example.com)',
+        'firstname_lastname_underscore_format' => 'Nombre y apellido (jane_smith@example.com)',
+        'firstinitial.lastname' => 'Inicial del nombre y apellido (j.smith@ejemplo.com)',
+        'lastname_firstinitial' => 'Apellido e inicial del nombre (smith_j@ejemplo.com)',
+        'lastname_dot_firstinitial_format' => 'Last Name First Initial (smith.j@example.com)',
+        'firstnamelastname'     => 'Nombre y apellido (janesmith@example.com)',
+        'firstnamelastinitial'  => 'Nombre e inicial del apellido(janes@example.com)',
+        'lastnamefirstname'      => 'Apellido.Nombre (smith.jane@example.com)',
+    ],
+
+
+
+    'logo_labels' => [
+        'acceptance_pdf_logo'       => 'PDF Logo',
+        'email_logo'                => 'Logo de correo electrónico',
+        'label_logo'                => 'Logo de etiqueta',
+        'logo'                      => 'Site Logo',
+        'favicon'                   => 'Favicon',
+    ],
+
+    'logo_help' => [
+        'email_logo_size'       => 'Los logotipos cuadrados en el correo electrónico se ven mejor. ',
+    ],
+
+    'logo_option_types' => [
+        'text' => 'Text',
+        'logo' => 'Logo',
+        'logo_and_text' => 'Logo and Text',
+    ],
+
+
+    'legends' => [
+        'scoping' => 'Scoping',
+        'formats' => 'Default Formats',
+        'profiles' => 'User Profiles',
+        'eula' => 'EULA & Acceptance Preferences',
+        'misc_display' => 'Miscellaneous Display Options',
+        'email' => 'Email Preferences',
+        'checkin' => 'Checkin Preferences',
+        'dashboard' => 'Login & Dashboard Preferences',
+        'misc' => 'Miscellaneous',
+        'logos' => 'Logos & Display',
+        'colors' => 'Colors & Skins',
+        'footer' => 'Footer Preferences',
+        'security' => 'Security Preferences',
+        'general' => 'General',
+        'intervals' => 'Intervals & Thresholds',
+    ],
+
+
+    /* Keywords for settings overview help */
+    'keywords' => [
+        'brand'             => 'pie de página, logotipo, impresión, tema, apariencia, encabezado, colores, color, css',
+        'general_settings'  => 'soporte de la compañía, firma, aceptación, formato de correo electrónico, formato de nombre de usuario, imágenes, por página, miniatura, acuerdo de uso, términos y condiciones, gravatar, términos de servicio, tablero de indicadores, privacidad',
+        'groups'            => 'permisos, grupos de permisos, autorización',
+        'labels'            => 'etiquetas, código de barras, código de barra, hojas, imprimir, upc, qr, 1d, 2d',
+        'localization'      => 'localización, moneda, local, ubicación, zona horaria, internacional, internacionalización, idioma, traducción',
+        'php_overview'      => 'phpinfo, sistema, información',
+        'purge'             => 'eliminar permanentemente',
+        'security'          => 'contraseña, contraseñas, requisitos, dos factores, contraseñas comunes, inicio de sesión remoto, autenticación',
+    ],
 
 ];
diff --git a/resources/lang/es-VE/admin/settings/message.php b/resources/lang/es-VE/admin/settings/message.php
index 87b97745f1..6cf0adcf77 100644
--- a/resources/lang/es-VE/admin/settings/message.php
+++ b/resources/lang/es-VE/admin/settings/message.php
@@ -9,11 +9,14 @@ return [
     'backup' => [
         'delete_confirm'        => '¿Está seguro de que desea eliminar este archivo de respaldo? Esta acción no puede se puede deshacer. ',
         'file_deleted'          => 'El archivo de respaldo fue eliminado satisfactoriamente. ',
-        'generated'             => 'Un nuevo archivo de respaldo ha sido creado con éxito.',
-        'file_not_found'        => 'El archivo de respaldo no puede ser encontrado en el servidor.',
+        'generated'             => 'Se ha creado correctamente un nuevo archivo de copia de seguridad.',
+        'file_not_found'        => 'Ese archivo de copia de seguridad no se pudo encontrar en el servidor.',
         'restore_warning'       => 'Sí, restaurarlo. Reconozco que esto sobrescribirá cualquier dato existente actualmente en la base de datos. Esto también cerrará la sesión de todos sus usuarios existentes (incluido usted).',
         'restore_confirm'       => '¿Está seguro que desea restaurar su base de datos desde :filename?'
     ],
+    'restore' => [
+        'success'               => 'Se ha restaurado la copia de seguridad de su sistema. Por favor, vuelva a iniciar sesión.'
+    ],
     'purge' => [
         'error'     => 'Ha ocurrido un error mientras se realizaba el purgado. ',
         'validation_failed'     => 'Su confirmación de purga es incorrecta. Por favor, escriba la palabra "DELETE" en el cuadro de confirmación.',
@@ -23,24 +26,34 @@ return [
         'sending' => 'Enviando correo electrónico de prueba...',
         'success' => '¡Correo enviado!',
         'error' => 'El correo no pudo ser enviado.',
-        'additional' => 'Ningún mensaje de error adicional proporcionado. Comprueba la configuración de tu correo y el registro de tu aplicación.'
+        'additional' => 'No se proporciona ningún mensaje de error adicional. Compruebe la configuración de su correo y el registro de errores de la aplicación.'
     ],
     'ldap' => [
         'testing' => 'Probando conexión LDAP, Binding & Query ...',
-        '500' => 'Error 500 del servidor. Por favor, compruebe los registros de su servidor para más información.',
+        '500' => 'Error 500 del servidor. Por favor, compruebe los registros de error de su servidor para más información.',
         'error' => 'Algo salió mal :(',
         'sync_success' => 'Una muestra de 10 usuarios devueltos desde el servidor LDAP basado en su configuración:',
         'testing_authentication' => 'Probando autenticación LDAP...',
         'authentication_success' => 'Usuario autenticado contra LDAP con éxito!'
     ],
+    'labels' => [
+        'null_template' => 'Label template not found. Please select a template.',
+        ],
     'webhook' => [
         'sending' => 'Enviando mensaje de prueba :app...',
-        'success' => '¡Su Integración :webhook_name funciona!',
-        'success_pt1' => '¡Éxito! Comprueba el ',
+        'success' => '¡Su integración :webhook_name funciona!',
+        'success_pt1' => '¡Éxito! Compruebe el ',
         'success_pt2' => ' para su mensaje de prueba, y asegúrese de hacer clic en GUARDAR abajo para guardar su configuración.',
         '500' => 'Error 500 del servidor.',
         'error' => 'Algo salió mal. :app respondió con: :error_message',
         'error_redirect' => 'ERROR: 301/302 :endpoint devuelve una redirección. Por razones de seguridad, no seguimos redirecciones. Por favor, utilice el punto final actual.',
         'error_misc' => 'Algo salió mal. :( ',
-    ]
+        'webhook_fail' => ' Notificación de webhook fallida: Compruebe que la URL sigue siendo válida.',
+        'webhook_channel_not_found' => ' webhook channel not found.',
+        'ms_teams_deprecation' => 'The selected Microsoft Teams webhook URL will be deprecated Dec 31st, 2025. Please use a workflow URL. Microsoft\'s documentation on creating a workflow can be found <a href="https://support.microsoft.com/en-us/office/create-incoming-webhooks-with-workflows-for-microsoft-teams-8ae491c7-0394-4861-ba59-055e33f75498" target="_blank"> here.</a>',
+    ],
+    'location_scoping' => [
+        'not_saved' => 'Your settings were not saved.',
+        'mismatch' => 'There is 1 item in the database that need your attention before you can enable location scoping.|There are :count items in the database that need your attention before you can enable location scoping.',
+    ],
 ];
diff --git a/resources/lang/es-VE/admin/statuslabels/message.php b/resources/lang/es-VE/admin/statuslabels/message.php
index 9d370d4f40..594bcc5f63 100644
--- a/resources/lang/es-VE/admin/statuslabels/message.php
+++ b/resources/lang/es-VE/admin/statuslabels/message.php
@@ -7,7 +7,7 @@ return [
     'assoc_assets'	 => 'Esta etiqueta de estado está actualmente asociada con al menos un activo y no se puede eliminar. Por favor actualice sus activos para que ya no hagan referencia a este estado e inténtelo de nuevo. ',
 
     'create' => [
-        'error'   => 'La etiqueta de estado no fue creada, por favor, inténtalo de nuevo.',
+        'error'   => 'La etiqueta de estado no pudo ser creada, por favor inténtelo de nuevo.',
         'success' => 'La etiqueta de estado fue creada con éxito.',
     ],
 
@@ -18,14 +18,14 @@ return [
 
     'delete' => [
         'confirm'   => '¿Está seguro de que desea eliminar esta etiqueta de estado?',
-        'error'   => 'Huno un problema borrando la etiqueta de estado. Por favor, inténtalo de nuevo.',
+        'error'   => 'Hubo un problema borrando la etiqueta de estado. Por favor, inténtelo de nuevo.',
         'success' => 'La etiqueta de estado se ha eliminado con éxito.',
     ],
 
     'help' => [
-        'undeployable'   => 'Estos activos no pueden asignarse a nadie.',
+        'undeployable'   => 'Estos activos no pueden ser asignados.',
         'deployable'   => 'Estos activos pueden ser asignados. Una vez estén asignados, asumirán el meta estado de <i class="fas fa-circle text-blue"></i> <strong>Asignado</strong>.',
-        'archived'   => 'Estos equipos no pueden ser asignados, y solo se mostrarán en la vista de Archivados. Esto es útil para retener información sobre activos por razones de presupuesto/revisión histórica, mientras están fuera de la lista de equipos del día a día.',
+        'archived'   => 'Estos activos no pueden ser asignados y solo se mostrarán en la vista de Archivados. Esto es útil para mantener información de activos por razones de presupuesto o de revisión histórica y al mismo tiempo se excluyen de los activos que se pueden usar en el día a día.',
         'pending'   => 'Estos activos aún no pueden asignarse, y suelen utilizarse para elementos que están en reparación, pero que se espera que regresen a circulación.',
     ],
 
diff --git a/resources/lang/es-VE/admin/statuslabels/table.php b/resources/lang/es-VE/admin/statuslabels/table.php
index 32d9f76366..05daeda180 100644
--- a/resources/lang/es-VE/admin/statuslabels/table.php
+++ b/resources/lang/es-VE/admin/statuslabels/table.php
@@ -1,19 +1,19 @@
 <?php
 
 return array(
-    'about'      	=> 'Acerca de las etiquetas de estado',
+    'about'      	=> 'About Status Types',
     'archived'      	=> 'Archivado',
     'create'      	=> 'Crear etiqueta de estado',
     'color'      	=> 'Color en el gráfico',
     'default_label' => 'Etiqueta predeterminada',
     'default_label_help' => 'Esto se usa para asegurar que sus etiquetas de estado que utiliza con más frecuencia aparezcan en la parte superior del cuadro de selección al crear / editar activos.',
     'deployable'      	=> 'Utilizable',
-    'info'      	=> 'Las etiquetas de estado se usan para describir los diferentes estados en que pueden estar sus equipos. Por ejemplo: en reparación, perdidos/robados, etc. Puede crear nuevas etiquetas de estado para equipos utilizables, pendientes o archivados.',
+    'info'      	=> 'Status label types are used to describe the various states your assets could be in. They may be out for repair, lost/stolen, etc. You can create new status labels for your deployable, pending and archived assets according to your own workflow. For more information, <a href="https://snipe-it.readme.io/docs/overview#status-labels" target="_blank">see the documentation <i class="fa fa-external-link"></i></a>.',
     'name'      	=> 'Nombre de estado',
     'pending'      	=> 'Pendiente',
     'status_type'   => 'Tipo de estado',
     'show_in_nav'   => 'Mostrar en la barra lateral',
     'title'      	=> 'Etiquetas de estado',
     'undeployable'  => 'No utilizable',
-    'update'      	=> 'Actualizar Etiqueta de Estado',
+    'update'      	=> 'Actualizar la etiqueta de estado',
 );
diff --git a/resources/lang/es-VE/admin/suppliers/message.php b/resources/lang/es-VE/admin/suppliers/message.php
index 9d95666069..b5be1b8133 100644
--- a/resources/lang/es-VE/admin/suppliers/message.php
+++ b/resources/lang/es-VE/admin/suppliers/message.php
@@ -7,22 +7,22 @@ return array(
 
 
     'create' => array(
-        'error'   => 'El proveedor no ha sido creado, inténtalo de nuevo.',
+        'error'   => 'El proveedor no fue creado, por favor inténtelo de nuevo.',
         'success' => 'Proveedor creado con éxito.'
     ),
 
     'update' => array(
-        'error'   => 'El proveedor no ha sido actualizado, por favor, inténtalo de nuevo',
+        'error'   => 'El proveedor no fue actualizado, por favor inténtelo de nuevo',
         'success' => 'Proveedor actualizado con éxito.'
     ),
 
     'delete' => array(
         'confirm'   => '¿Está seguro de que desea eliminar este proveedor?',
-        'error'   => 'Hubo un problema borrando el proveedor. Por favor, inténtalo de nuevo.',
-        'success' => 'El proveedor fue eliminado con éxito.',
-        'assoc_assets'	 => 'Este proveedor está actualmente asociado con :asset_count activo(s) y no puede ser borrado. Por favor, actualiza tus activos para no referenciar más este proveedor e inténtalo de nuevo. ',
-        'assoc_licenses'	 => 'Este proveedor está actualmente asociado con :licenses_count licencia(s) y no puede ser borrado. Por favor, actualiza tus licencias para no referenciar más este proveedor e inténtalo de nuevo. ',
-        'assoc_maintenances'	 => 'Este proveedor está actualmente asociado con :asset_maintenances_count mantenedor(es) de activo y no puede ser eliminado. Por favor, actualiza tus mantenedores de activo para no referenciar este proveedor e inténtalo de nuevo. ',
+        'error'   => 'Hubo un problema al eliminar el proveedor, por favor inténtelo de nuevo.',
+        'success' => 'Proveedor eliminado correctamente.',
+        'assoc_assets'	 => 'Este proveedor está actualmente asociado con :asset_count activo(s) y no puede ser eliminado. Actualice sus activos para que ya no hagan referencia a este proveedor e inténtelo de nuevo. ',
+        'assoc_licenses'	 => 'Este proveedor está asociado actualmente con :licenses_count licences(s) y no puede ser eliminado. Por favor, actualice sus licencias para dejar de hacer referencia a este proveedor e inténtelo de nuevo. ',
+        'assoc_maintenances'	 => 'Este proveedor está actualmente asociado con :asset_maintainances_count mantenimiento(s) de activo(s) y no puede ser eliminado. Por favor, actualice el mantenimiento de sus activos para no hacer referencia a este proveedor y vuelva a intentarlo. ',
     )
 
 );
diff --git a/resources/lang/es-VE/admin/suppliers/table.php b/resources/lang/es-VE/admin/suppliers/table.php
index 541da852b2..92b21afa94 100644
--- a/resources/lang/es-VE/admin/suppliers/table.php
+++ b/resources/lang/es-VE/admin/suppliers/table.php
@@ -1,25 +1,25 @@
 <?php
 
 return array(
-    'about_suppliers_title' => 'Acerca de los Proveedores',
-    'about_suppliers_text'  => 'Los proveedores son utilizados para seguir la fuente de los artículos',
-    'address'               => 'Dirección del Proveedor',
+    'about_suppliers_title' => 'Acerca de los proveedores',
+    'about_suppliers_text'  => 'Los proveedores se utilizan para hacer seguimiento al origen de los elementos',
+    'address'               => 'Dirección del proveedor',
     'assets'                => 'Activos',
     'city'                  => 'Ciudad',
-    'contact'               => 'Nombre de Contacto',
+    'contact'               => 'Nombre de contacto',
     'country'               => 'País',
-    'create'                => 'Crear Proveedor',
+    'create'                => 'Crear un proveedor',
     'email'                 => 'Correo electrónico',
     'fax'                   => 'Fax',
     'id'                    => 'ID',
     'licenses'              => 'Licencias',
-    'name'                  => 'Nombre del Proveedor',
+    'name'                  => 'Nombre del proveedor',
     'notes'                 => 'Notas',
     'phone'                 => 'Teléfono',
     'state'                 => 'Estado',
     'suppliers'             => 'Proveedores',
-    'update'                => 'Actualizar Proveedor',
-    'view'                  => 'Ver Proveedor',
+    'update'                => 'Actualizar proveedor',
+    'view'                  => 'Ver proveedor',
     'view_assets_for'       => 'Ver activos para',
     'zip'                   => 'Código postal',
 
diff --git a/resources/lang/es-VE/admin/users/general.php b/resources/lang/es-VE/admin/users/general.php
index cf6fc7d086..cf34458925 100644
--- a/resources/lang/es-VE/admin/users/general.php
+++ b/resources/lang/es-VE/admin/users/general.php
@@ -2,53 +2,55 @@
 
 return [
     'activated_help_text' => 'Este usuario puede iniciar sesión',
-    'activated_disabled_help_text' => 'No puedes editar el estado de activación de tu propia cuenta.',
+    'activated_disabled_help_text' => 'No puede editar el estado de activación de su propia cuenta.',
     'assets_user'       => 'Activos asignados a :name',
     'bulk_update_warn'	=> 'Está a punto de modificar las propiedades de :user_count usuarios. Por favor, tenga en cuenta que no puede modificar las propiedades de su propio usuario con este formulario, y debe realizar las modificaciones a su propio usuario de forma individual.',
-    'bulk_update_help'	=> 'Este formulario te permite actualizar múltiples usuarios a la vez. Sólo llena los campos que necesites cambiar. Cualquier campo dejado en blanco permanecerá sin cambios.',
+    'bulk_update_help'	=> 'Este formulario le permite actualizar varios usuarios a la vez. Solo diligencie los campos que necesita modificar. Los campos que queden en blanco no se modificarán.',
     'current_assets'    => 'Activos actualmente asignados a este usuario',
     'clone'             => 'Clonar usuario',
-    'contact_user'      => 'Contactar a :name',
-    'edit'              => 'Editar Usuario',
+    'contact_user'      => 'Contacto :name',
+    'edit'              => 'Editar usuario',
     'filetype_info'     => 'Los tipos de archivos permitidos son png, gif, jpg, jpeg, doc, docx, pdf, txt, zip, y rar.',
     'history_user'      => 'Historial para :name',
-    'info'				=> 'Info',
+    'info'				=> 'Información',
     'restore_user'		=> 'Haga clic aquí para restaurarlos.',
     'last_login'        => 'Último Inicio de Sesión',
-    'ldap_config_text'  => 'Los parámetros de configuración LDAP pueden ser encontrados en Admin > Settings. La ubicación (opcional) seleccionada será establecida para todos los usuarios importados.',
+    'ldap_config_text'  => 'Los ajustes de configuración para LDAP se pueden encontrar en Administrador> LDAP. La ubicación (opcional) seleccionada se establecerá para todos los usuarios importados.',
     'print_assigned'    => 'Imprimir todos los asignados',
     'email_assigned'    => 'Enviar correo con todos los asignados',
-    'user_notified'     => 'El usuario ha sido enviado por correo electrónico a una lista de sus elementos asignados actualmente.',
+    'user_notified'     => 'Se ha enviado al usuario un correo electrónico con lista de los elementos que tiene asignados actualmente.',
+    'users_notified'    => 'The user has been emailed a list of their currently assigned items.|:count users have been emailed a list of their currently assigned items.',
+    'users_notified_warning' => ':count user has been emailed a list of their currently assigned items, however :no_email users did not have an email address so could not be emailed.|:count users have been emailed a list of their currently assigned items, however :no_email user(s) did not have an email address so could not be emailed.',
     'auto_assign_label' => 'Incluye a este usuario al asignar automáticamente licencias elegibles',
     'auto_assign_help'  => 'Omitir este usuario en la asignación automática de licencias',
-    'software_user'     => 'Software Asignado a :name',
+    'software_user'     => 'Software asignado a :name',
     'send_email_help'   => 'Debe proporcionar una dirección de correo electrónico para este usuario para poder enviarle las credenciales. Únicamente pueden enviarse las credenciales por correo eléctronico durante la creación del usuario. Las contraseñas se almacenan en un hash de un solo sentido y no se pueden recuperar una vez guardadas.',
-    'view_user'         => 'Ver Usuario :name',
+    'view_user'         => 'Ver usuario :name',
     'usercsv'           => 'Archivo CSV',
     'two_factor_admin_optin_help' => 'La configuración actual permite la aplicación selectiva de la autenticación de dos factores.  ',
-    'two_factor_enrolled' => 'Dispositivo 2FA inscrito ',
+    'two_factor_enrolled' => 'Dispositivo con 2FA inscrito ',
     'two_factor_active'   => '2FA activo ',
-    'user_deactivated'  => 'Usuario no puede iniciar sesión',
-    'user_activated'  => 'Usuario puede iniciar sesión',
+    'user_deactivated'  => 'El usuario no puede iniciar sesión',
+    'user_activated'  => 'El usuario puede iniciar sesión',
     'activation_status_warning' => 'No cambiar el estado de activación',
     'group_memberships_helpblock' => 'Sólo los superadministradores pueden editar membresías de grupo.',
     'superadmin_permission_warning' => 'Sólo los superadministradores pueden conceder acceso a un usuario superadministrador.',
     'admin_permission_warning' => 'Sólo los usuarios con derechos de administrador o mayores pueden conceder acceso de administrador a los usuarios.',
     'remove_group_memberships' => 'Eliminar membresías de grupo',
-    'warning_deletion_information' => 'Está a punto de devolver TODOS los elementos de :count usuario(s) listados a continuación. Los nombres de usuarios con permisos Super Administrador están resaltados en rojo.',
-    'update_user_assets_status' => 'Actualizar todos los recursos para estos usuarios a este estado',
+    'warning_deletion_information' => 'Está a punto de ingresar TODOS los elementos de :count usuario(s) listados a continuación. Los nombres de usuarios con permisos Super Administrador están resaltados en rojo.',
+    'update_user_assets_status' => 'Actualizar todos los activos para estos usuarios a este estado',
     'checkin_user_properties' => 'Comprobar todas las propiedades asociadas a estos usuarios',
     'remote_label'   => 'Este es un usuario remoto',
     'remote'   => 'Remoto',
-    'remote_help' => 'Esto puede ser útil si necesita filtrar por usuarios remotos que nunca o raramente entran en sus ubicaciones físicas.',
+    'remote_help' => 'Esto puede ser útil si necesita filtrar por usuarios remotos que nunca o raramente asisten a sus ubicaciones físicas.',
     'not_remote_label' => 'Este no es un usuario remoto',
     'vip_label' => 'Usuario VIP',
     'vip_help' => 'Esto puede ser útil como indicador de personas importantes en su organización si desea tratarlas de forma especial.',
     'create_user' => 'Crear un usuario',
     'create_user_page_explanation' => 'Esta es la información de la cuenta que usará para acceder al sitio por primera vez.',
-    'email_credentials' => 'Credenciales de email',
-    'email_credentials_text' => 'Enviar mis credenciales a la dirección de correo de arriba',
+    'email_credentials' => 'Credenciales de correo electrónico',
+    'email_credentials_text' => 'Enviar mis credenciales a la dirección de correo electrónico de arriba',
     'next_save_user' => 'Siguiente: Guardar usuario',
     'all_assigned_list_generation' => 'Generado el:',
-    'email_user_creds_on_create' => '¿Enviar a este usuario sus credenciales?',
+    'email_user_creds_on_create' => '¿Enviar las credenciales por correo electrónico a este usuario?',
 ];
diff --git a/resources/lang/es-VE/admin/users/message.php b/resources/lang/es-VE/admin/users/message.php
index 6b33c45957..c1d3cf9e6d 100644
--- a/resources/lang/es-VE/admin/users/message.php
+++ b/resources/lang/es-VE/admin/users/message.php
@@ -3,20 +3,20 @@
 return array(
 
     'accepted'                  => 'Ha aceptado este artículo exitosamente.',
-    'declined'                  => 'Has rechazado este activo con éxito.',
-    'bulk_manager_warn'	        => 'Sus usuarios han sido actualizados con éxito, sin embargo, la entrada de administrador no fue guardada porque el gerente seleccionado también estaba en la lista de usuarios a ser editada, y los usuarios no pueden ser sus propios gerentes. Vuelva a seleccionar los usuarios, excluyendo al gerente.',
+    'declined'                  => 'Ha rechazado correctamente este activo.',
+    'bulk_manager_warn'	        => 'Sus usuarios han sido actualizados con éxito, sin embargo, la entrada supervisor (manager) no fue guardada porque el supervisor seleccionado también estaba en la lista de usuarios a editar, y los usuarios no pueden ser su propio supervisor. Vuelva a seleccionar los usuarios, excluyendo al supervisor.',
     'user_exists'               => '¡El usuario ya existe!',
-    'user_not_found'            => 'El usuario no existe.',
+    'user_not_found'            => 'El usuario no existe o usted no tiene permisos para verlo.',
     'user_login_required'       => 'El campo usuario es obligatorio',
     'user_has_no_assets_assigned' => 'No hay activos asignados al usuario.',
     'user_password_required'    => 'La contraseña es obligatoria.',
     'insufficient_permissions'  => 'Permisos insuficientes.',
     'user_deleted_warning'      => 'Este usuario ha sido eliminado. Tendrá que restaurar este usuario para editarlo o para asignarle nuevos activos.',
-    'ldap_not_configured'        => 'La integración LDAP no ha sido configurada para esta instalación.',
+    'ldap_not_configured'        => 'La integración con LDAP no ha sido configurada para esta instalación.',
     'password_resets_sent'      => 'Los usuarios seleccionados que están activados y tienen una dirección de correo electrónico válida han sido enviados un enlace de restablecimiento de contraseña.',
     'password_reset_sent'       => 'Un enlace para restablecer la contraseña ha sido enviado a :email!',
     'user_has_no_email'         => 'Este usuario no tiene una dirección de correo electrónico en su perfil.',
-    'log_record_not_found'        => 'No se pudo encontrar un registro de registro coincidente para este usuario.',
+    'log_record_not_found'        => 'No se pudo encontrar un registro de eventos que coincida con este usuario.',
 
 
     'success' => array(
@@ -33,38 +33,39 @@ return array(
     ),
 
     'error' => array(
-        'create' => 'Hubo un problema creando el usuario. Por favor, inténtalo de nuevo.',
-        'update' => 'Hubo un problema actualizando al usuario. Por favor, inténtalo de nuevo.',
-        'delete' => 'Hubo un problema borrando el usuario. Por favor, inténtalo de nuevo.',
-        'delete_has_assets' => 'Este usuario tiene elementos asignados y no pudo ser borrado.',
-        'delete_has_assets_var' => 'Este usuario todavía tienen un activo asignado. Por favor devuélvalo primero.| Este usuario todavía tienen :count activos asignados. Por favor devuélvalos primero.',
-        'delete_has_licenses_var' => 'Este usuario todavía tiene una licencia asignada. Por favor primero haga su devolución.|Este usuario todavía tiene :count licencias asignadas. Por favor primero haga su devolución.',
-        'delete_has_accessories_var' => 'Este usuario todavía tiene un accesorio asignado. Por favor primero haga su devolución.|Este usuario todavía tiene :count accesorios asignados. Por favor primero haga su devolución.',
-        'delete_has_locations_var' => 'Este usuario todavía supervisa una ubicación. Por favor seleccione otro supervisor primero.|Este usuario todavía supervisa :count ubicaciones. Por favor seleccione otro supervisor primero.',
+        'create' => 'Hubo un problema al crear el usuario. Por favor, inténtelo de nuevo.',
+        'update' => 'Hubo un problema al actualizar el usuario. Por favor, inténtelo de nuevo.',
+        'delete' => 'Hubo un problema al eliminar el usuario. Por favor, inténtelo de nuevo.',
+        'delete_has_assets' => 'Este usuario tiene elementos asignados y no se pudo eliminar.',
+        'delete_has_assets_var' => 'Este usuario todavía tiene un activo asignado. Por favor ingréselo primero.|Este usuario todavía tiene :count activos asignados. Por favor ingréselos primero.',
+        'delete_has_licenses_var' => 'Este usuario todavía tiene una licencia asignada. Por favor ingrésela primero.|Este usuario todavía tiene :count licencias asignadas. Por favor ingréselas primero.',
+        'delete_has_accessories_var' => 'Este usuario todavía tiene un accesorio asignado. Por favor ingréselo primero.|Este usuario todavía tiene :count accesorios asignados. Por favor ingréselos primero.',
+        'delete_has_locations_var' => 'Este usuario todavía supervisa una ubicación. Por favor primero seleccione otro supervisor.|Este usuario todavía supervisa :count ubicaciones. Por favor primero seleccione otro supervisor.',
         'delete_has_users_var' => 'Este usuario todavía supervisa a otro usuario. Por favor primero seleccione otro supervisor para ese usuario.|Este usuario todavía supervisa :count usuarios. Por favor primero seleccione otro supervisor para ellos.',
-        'unsuspend' => 'Hubo un problema des-suspendiendo al usuario. Por favor inténtelo de nuevo.',
+        'unsuspend' => 'Hubo un problema marcando como no suspendido al usuario. Por favor, inténtelo de nuevo.',
         'import'    => 'Hubo un problema importando usuarios. Por favor inténtelo de nuevo.',
         'asset_already_accepted' => 'Este activo ya ha sido aceptado.',
-        'accept_or_decline' => 'Debes aceptar o rechazar este activo.',
+        'accept_or_decline' => 'Debe aceptar o rechazar este equipo.',
         'cannot_delete_yourself' => 'Nos sentiríamos muy mal si usted se eliminara, por favor reconsidérelo.',
         'incorrect_user_accepted' => 'El elemento que ha intentado aceptar no fue asignado a usted.',
-        'ldap_could_not_connect' => 'No se pudo conectar al servidor LDAP. Por favor verifica la configuración LDAP de tu servidor en el archivo de configuración LDAP. <br>Error del servidor LDAP:',
-        'ldap_could_not_bind' => 'No se pudo enlazar al servidor LDAP. Por favor verifica la configuración LDAP de tu servidor en el archivo de configuración LDAP. <br>Error del servidor LDAP: ',
-        'ldap_could_not_search' => 'No se pudo buscar el servidor LDAP. Por favor verifica la configuración LDAP de tu servidor en el archivo de configuración LDAP. <br>Error del servidor LDAP:',
-        'ldap_could_not_get_entries' => 'No se pudieron obtener las entradas del servidor LDAP. Por favor verifica la configuración LDAP de tu servidor en el archivo de configuración LDAP. <br>Error del servidor LDAP:',
-        'password_ldap' => 'La contraseña para esta cuenta es manejada por LDAP/Active Directory. Por favor contacta a tu departamento de IT para cambiar tu contraseña. ',
+        'ldap_could_not_connect' => 'No se pudo conectar al servidor LDAP. Por favor, compruebe la configuración del servidor LDAP en el archivo de configuración LDAP. <br>Error del servidor LDAP:',
+        'ldap_could_not_bind' => 'No se ha podido vincular al servidor LDAP. Por favor verifique la configuración de su servidor LDAP en su archivo de configuración.<br> Error del servidor LDAP: ',
+        'ldap_could_not_search' => 'No se pudo buscar en el servidor LDAP. Por favor, compruebe la configuración del servidor LDAP en el archivo de configuración LDAP. <br>Error del servidor LDAP:',
+        'ldap_could_not_get_entries' => 'No se han podido obtener entradas del servidor LDAP. Por favor verifique la configuración de su servidor LDAP en su archivo de configuración.<br> Error del servidor LDAP:',
+        'password_ldap' => 'La contraseña para esta cuenta es administrada por LDAP / Active Directory. Póngase en contacto con su departamento de TI para cambiar su contraseña. ',
+        'multi_company_items_assigned' => 'Este usuario tiene elementos asignados que pertenecen a una empresa diferente. Por favor, ingréselos o edite su empresa.'
     ),
 
     'deletefile' => array(
-        'error'   => 'El archivo no fue borrado. Por favor, inténtalo de nuevo.',
+        'error'   => 'El archivo no fue borrado. Por favor, inténtelo de nuevo.',
         'success' => 'Archivo borrado con éxito.',
     ),
 
     'upload' => array(
         'error'   => 'Archivo(s) no cargado(s). Por favor, inténtelo nuevamente.',
         'success' => 'Archivo(s) cargado(s) con éxito.',
-        'nofiles' => 'No ha seleccionado ningún archivo para subir',
-        'invalidfiles' => 'Uno o más de tus archivos es demasiado grande o es de un tipo que no está permitido. Los tipos de archivo permitidos son png, gif, jpg, doc, docx, pdf, y txt.',
+        'nofiles' => 'No seleccionó ningún archivo para cargar',
+        'invalidfiles' => 'Uno o más de sus archivos son demasiado grandes o son de un tipo de archivo que no está permitido. Los tipos de archivo permitidos son png, gif, jpg, doc, docx, pdf y txt.',
     ),
 
     'inventorynotification' => array(
diff --git a/resources/lang/es-VE/admin/users/table.php b/resources/lang/es-VE/admin/users/table.php
index 3e0ea57439..6f3713b159 100644
--- a/resources/lang/es-VE/admin/users/table.php
+++ b/resources/lang/es-VE/admin/users/table.php
@@ -5,37 +5,37 @@ return array(
     'allow'  				=> 'Permitir',
     'checkedout'  			=> 'Activos',
     'created_at' 			=> 'Creado',
-    'createuser' 			=> 'Crear Usuario',
+    'createuser' 			=> 'Crear usuario',
     'deny'  				=> 'Denegar',
     'email'      			=> 'Correo electrónico',
-    'employee_num'      	=> 'No. Empleado.',
+    'employee_num'      	=> 'No. Empleado',
     'first_name' 			=> 'Nombre',
     'groupnotes'			=> 'Seleccione un grupo para asignar al usuario, recuerde que un usuario asume los permisos del grupo al que se le asigna. Use ctrl+click (o cmd+click en MacOS) para anular la selección de grupos.',
     'id'         			=> 'Id',
     'inherit'  				=> 'Hereda de',
     'job' 					=> 'Cargo',
-    'last_login'  			=> 'Último Inicio de Sesión',
+    'last_login'  			=> 'Último inicio de sesión',
     'last_name'  			=> 'Apellido',
     'location'  			=> 'Ubicación',
-    'lock_passwords'		=> 'Los detalles de acceso no pueden ser cambiados en esta instalación.',
+    'lock_passwords'		=> 'Los detalles de inicio de sesión no pueden ser cambiados en esta instalación.',
     'manager' 				=> 'Supervisor',
-    'managed_locations'     => 'Ubicaciones adminsitradas',
+    'managed_locations'     => 'Ubicaciones gestionadas',
     'managed_users'         => 'Usuarios gestionados',
     'name' 					=> 'Nombre',
-    'nogroup'               => 'Aún no se han creado grupos. Para añadir uno, visite: ',
+    'nogroup'               => 'Aún no se han creado grupos. Para añadir uno, visite:',
     'notes'                 => 'Notas',
     'password_confirm' 		=> 'Confirmar Contraseña',
     'password' 				=> 'Contraseña',
     'phone'  				=> 'Teléfono',
-    'show_current'          => 'Mostrar Usuarios Actuales',
-    'show_deleted'          => 'Mostrar Usuarios Eliminados',
+    'show_current'          => 'Mostrar usuarios actuales',
+    'show_deleted'          => 'Mostrar usuarios eliminados',
     'title' 				=> 'Cargo',
 	'to_restore_them'		=> 'para restaurarlos.',
-    'total_assets_cost'     => "Coste total de activos",
-    'updateuser' 			=> 'Actualizar Usuario',
+    'total_assets_cost'     => "Costo total de activos",
+    'updateuser' 			=> 'Actualizar usuario',
     'username' 				=> 'Nombre de usuario',
 	'user_deleted_text' 	=> 'Este usuario ha sido marcado como borrado.',
     'username_note' 		=> '(Esto es usado sólo para el enlace de Active Directory, no para iniciar sesión.)',
-    'cloneuser'             => 'Clonar Usuario',
-    'viewusers' 			=> 'Ver Usuarios',
+    'cloneuser'             => 'Clonar usuario',
+    'viewusers' 			=> 'Ver usuarios',
 );
diff --git a/resources/lang/es-VE/auth.php b/resources/lang/es-VE/auth.php
index 387ea794b6..d4c25934f4 100644
--- a/resources/lang/es-VE/auth.php
+++ b/resources/lang/es-VE/auth.php
@@ -15,6 +15,6 @@ return array(
 
     'failed' => 'Estas credenciales no coinciden con nuestros registros.',
     'password' => 'La contraseña proporcionada es incorrecta.',
-    'throttle' => 'Demasiados intentos de inicio de sesión. Por favor, inténtalo de nuevo en :seconds segundos.',
+    'throttle' => 'Too many login attempts. Please try again in :minutes minute(s).',
 
 );
diff --git a/resources/lang/es-VE/auth/general.php b/resources/lang/es-VE/auth/general.php
index 53daedb5ad..f760142719 100644
--- a/resources/lang/es-VE/auth/general.php
+++ b/resources/lang/es-VE/auth/general.php
@@ -2,17 +2,17 @@
 
 return [
     'send_password_link'	        => 'Enviar enlace de restablecimiento de contraseña',
-    'email_reset_password'			=> 'Enviar correo',
-    'reset_password'			    => 'Restablecer Contraseña',
+    'email_reset_password'			=> 'Enviar correo electrónico para restablecer la contraseña',
+    'reset_password'			    => 'Restablecer contraseña',
     'saml_login'                    => 'Iniciar sesión a través de SAML',
-    'login'                         => 'Iniciar Sesión',
+    'login'                         => 'Iniciar sesión',
     'login_prompt'                  => 'Por favor inicie sesión',
     'forgot_password'               => 'Olvidé mi contraseña',
     'ldap_reset_password'           => 'Haga clic aquí para restablecer su contraseña LDAP',
     'remember_me'                   => 'Recuérdame',
     'username_help_top'                 => 'Ingrese su <strong>nombre de usuario</strong> para enviar un enlace de restablecimiento de contraseña.',
-    'username_help_bottom'          => 'Tu nombre de usuario y dirección de correo electrónico <em>puede</em> ser el mismo, pero puede que no lo sea, dependiendo de tu configuración. Si no puede recordar su nombre de usuario, póngase en contacto con su administrador. <br><br><strong>Los nombres de usuario sin una dirección de correo electrónico asociada no se enviarán por correo electrónico un enlace de restablecimiento de contraseña.</strong> ',
+    'username_help_bottom'          => 'Su nombre de usuario y correo electrónico <em>pueden</em> ser el mismo, pero puede que no lo sean, dependiendo de su configuración. Si no recuerda su nombre de usuario, contacte al administrador. <br><br><strong>A los nombres de usuario que no tengan un correo electrónico asociado, no se les enviará el enlace de cambio de contraseña.</strong> ',
     'google_login'                  => 'Iniciar sesión con Google Workspace',
-    'google_login_failed'           => 'Error al iniciar sesión en Google. Vuelve a intentarlo.',
+    'google_login_failed'           => 'Error al iniciar sesión en Google, por favor, vuelva a intentarlo.',
 ];
 
diff --git a/resources/lang/es-VE/auth/message.php b/resources/lang/es-VE/auth/message.php
index f3d03ae79c..b3d159792d 100644
--- a/resources/lang/es-VE/auth/message.php
+++ b/resources/lang/es-VE/auth/message.php
@@ -2,45 +2,43 @@
 
 return array(
 
-    'account_already_exists' => 'Una cuenta con este correo ya existe.',
+    'account_already_exists' => 'Ya existe una cuenta con este correo electrónico.',
     'account_not_found'      => 'El nombre de usuario o la contraseña son incorrectos.',
-    'account_not_activated'  => 'La cuenta de este usuario no está activada.',
-    'account_suspended'      => 'La cuenta de este usuario está suspendida.',
-    'account_banned'         => 'La cuenta de este usuario está bloqueada.',
-    'throttle'               => 'Demasiados intentos fallidos de inicio de sesión. Por favor, inténtalo de nuevo en :minutes minutos.',
+    'account_not_activated'  => 'Esta cuenta de usuario no está activada.',
+    'account_suspended'      => 'Esta cuenta de usuario está suspendida.',
 
     'two_factor' => array(
         'already_enrolled'      => 'Su dispositivo ya está inscrito.',
-        'success'               => 'Has iniciado sesión con éxito.',
-        'code_required'         => 'El código de doble factor es necesario.',
+        'success'               => 'Ha iniciado sesión exitosamente.',
+        'code_required'         => 'Se requiere el código de autenticación de doble factor (2FA).',
         'invalid_code'          => 'El código de doble factor no es válido.',
-        'enter_two_factor_code' => 'Please enter your two-factor authentication code.',
-        'please_enroll'         => 'Please enroll a device in two-factor authentication.',
+        'enter_two_factor_code' => 'Por favor ingrese su código de autenticación de doble factor.',
+        'please_enroll'         => 'Por favor inscriba un dispositivo en la autenticación de dos factores.',
     ),
 
     'signin' => array(
-        'error'   => 'Hubo un problema mientras se intentaba iniciar su sesión, por favor inténtelo de nuevo.',
-        'success' => 'Has iniciado sesión con éxito.',
+        'error'   => 'Ha habido un problema al iniciar sesión. Por favor, inténtelo de nuevo.',
+        'success' => 'Ha iniciado sesión exitosamente.',
     ),
 
     'logout' => array(
         'error'   => 'Hubo un problema al intentar cerrar la sesión, por favor inténtelo de nuevo.',
-        'success' => 'Has cerrado la sesión con éxito.',
+        'success' => 'Ha cerrado la sesión exitosamente.',
     ),
 
     'signup' => array(
-        'error'   => 'Hubo un problema mientras se creaba la cuenta, por favor inténtalo de nuevo.',
+        'error'   => 'Hubo un problema al crear la cuenta. Por favor, inténtelo de nuevo.',
         'success' => 'Cuenta creada con éxito.',
     ),
 
     'forgot-password' => array(
-        'error'   => 'Hubo un problema al intentar obtener un código para restablecer la contraseña, inténtalo de nuevo.',
+        'error'   => 'Ha habido un problema al obtener un código de restablecimiento de la contraseña. Por favor, inténtelo de nuevo.',
         'success' => 'Si esa dirección de correo electrónico existe en nuestro sistema, se ha enviado un correo electrónico de recuperación de contraseña.',
     ),
 
     'forgot-password-confirm' => array(
-        'error'   => 'Ha habido un problema mientras se intentaba restablecer tu contraseña, por favor, inténtalo de nuevo.',
-        'success' => 'Tu contraseña ha sido reiniciada con éxito.',
+        'error'   => 'Hubo un problema al intentar restablecer su contraseña, por favor, inténtelo de nuevo.',
+        'success' => 'Su contraseña se ha restablecido correctamente.',
     ),
 
 
diff --git a/resources/lang/es-VE/button.php b/resources/lang/es-VE/button.php
index fe11c06a5d..ad0a6db970 100644
--- a/resources/lang/es-VE/button.php
+++ b/resources/lang/es-VE/button.php
@@ -2,23 +2,33 @@
 
 return [
     'actions' 	                => 'Acciones',
-    'add'    	                => 'Añadir Nuevo',
+    'add'    	                => 'Añadir nuevo',
     'cancel'                    => 'Cancelar',
-    'checkin_and_delete'  	    => 'Devolver todo / Eliminar usuario',
+    'checkin_and_delete'  	    => 'Ingresar todo / Eliminar usuario',
     'delete'  	                => 'Borrar',
     'edit'    	                => 'Editar',
+    'clone'    	                => 'Clonar',
     'restore' 	                => 'Restaurar',
     'remove'                    => 'Eliminar',
     'request'                   => 'Solicitar',
     'submit'  	                => 'Enviar',
     'upload'                    => 'Cargar',
-    'select_file'				=> 'Seleccione un archivo...',
+    'select_file'				=> 'Seleccionar un archivo...',
     'select_files'				=> 'Seleccionar archivos...',
-    'generate_labels'           => '{1} Generar Etiqueta|[2,*] Generar Etiquetas',
-    'send_password_link'        => 'Enviar enlace de restablecimiento de contraseña',
+    'generate_labels'           => '{1} Generar etiqueta|[2,*] Generar etiquetas',
+    'send_password_link'        => 'Enviar enlace para restablecer la contraseña',
     'go'                        => 'Ir',
-    'bulk_actions'              => 'Acciones en masa',
+    'bulk_actions'              => 'Acciones masivas',
     'add_maintenance'           => 'Añadir mantenimiento',
     'append'                    => 'Añadir',
     'new'                       => 'Nuevo',
+    'var' => [
+        'clone'     => 'Clonar :item_type',
+        'edit'      => 'Editar :item_type',
+        'delete'    => 'Eliminar :item_type',
+        'restore'   => 'Restaurar :item_type',
+        'create'    => 'Crear nuevo :item_type',
+        'checkout'  => 'Asignar :item_type',
+        'checkin'   => 'Ingresar :item_type',
+    ]
 ];
diff --git a/resources/lang/es-VE/general.php b/resources/lang/es-VE/general.php
index 0141639e96..e9c31cf228 100644
--- a/resources/lang/es-VE/general.php
+++ b/resources/lang/es-VE/general.php
@@ -1,72 +1,78 @@
 <?php
 
 return [
-    '2FA_reset'             => '2FA reset',
+    '2FA_reset'             => 'Restablecer 2FA',
     'accessories'			=> 'Accesorios',
     'activated'			    => 'Activado',
-    'accepted_date'         => 'Fecha aceptada',
+    'accepted_date'         => 'Fecha de aceptación',
     'accessory'				=> 'Accesorio',
     'accessory_report'		=> 'Informe de accesorios',
     'action'                => 'Acción',
     'activity_report'		=> 'Informe de actividad',
     'address'				=> 'Dirección',
-    'admin'					=> 'Admin',
+    'admin'					=> 'Configuración de administración',
     'admin_tooltip'			=> 'Este usuario tiene privilegios de superadministrador',
     'superuser'				=> 'Superusuario',
     'superuser_tooltip'		=> 'Este usuario es superadministrador',
     'administrator'			=> 'Administrador',
-    'add_seats'             => 'Puestos añadidos',
+    'add_seats'             => 'Licencias añadidas',
     'age'                   => "Edad",
-    'all_assets'			=> 'Todos los Activos',
+    'all_assets'			=> 'Todos los activos',
     'all'       			=> 'Todo',
     'archived'              => 'Archivado',
-    'asset_models'			=> 'Modelos de Activos',
+    'asset_models'			=> 'Modelos de activos',
     'asset_model'			=> 'Modelo',
     'asset'					=> 'Activo',
-    'asset_report'          => 'Reporte de Activo',
-    'asset_tag'				=> 'Etiqueta de activo',
-    'asset_tags'            => 'Etiquetas de Activos',
-    'assets_available'		=> 'Recursos disponibles',
+    'asset_previous'        => 'Asset (Previously Assigned)',
+    'asset_report'          => 'Informe de activos',
+    'asset_tag'				=> 'Placa del activo',
+    'asset_tags'            => 'Placas de activos',
+    'assets_available'		=> 'Activos disponibles',
     'accept_assets'         => 'Aceptar activos :name',
     'accept_assets_menu'    => 'Aceptar activos',
+    'accept_item'           => 'Accept Item',
     'audit'				    => 'Auditar',
+    'audits'				=> 'Audits',
     'audit_report'			=> 'Registro de Auditoría',
     'assets'				=> 'Activos',
     'assets_audited'        => 'activos auditados',
-    'assets_checked_in_count'     => 'activos facturados',
-    'assets_checked_out_count'     => 'activos reservados',
-    'asset_deleted_warning'     => 'Este recurso ha sido eliminado. Debe restaurarlo antes de poder asignarlo a alguien.',
-    'assigned_date'         => 'Fecha asignada',
+    'assets_checked_in_count'     => 'activos ingresados',
+    'assets_checked_out_count'     => 'activos asignados',
+    'asset_deleted_warning'     => 'Este activo ha sido eliminado. Debe restaurarlo antes de poder asignarlo a alguien.',
+    'assigned_date'         => 'Fecha de asignación',
     'assigned_to'           => 'Asignado a :name',
     'assignee'              => 'Asignado a',
     'avatar_delete'         => 'Borrar Avatar',
     'avatar_upload'         => 'Cargar Avatar',
     'back'      			=> 'Atrás',
-    'bad_data'      		=> 'No se ha encontrado nada. ¿Quizás datos incorrectos?',
-    'bulkaudit'             => 'Auditoría Masiva',
-    'bulkaudit_status'      => 'Auditar Estado',
+    'bad_data'      		=> 'No se ha encontrado nada. ¿Tal vez datos erróneos?',
+    'bulkaudit'             => 'Auditoría masiva',
+    'bulkaudit_status'      => 'Estado de la auditoría',
     'bulk_checkout'  		=> 'Asignación masiva',
     'bulk_edit'             => 'Edición masiva',
-    'bulk_delete'           => 'Eliminar en masa',
-    'bulk_actions'          => 'Acciones en masa',
-    'bulk_checkin_delete'   => 'Checkin en masa / Eliminar usuarios',
+    'bulk_delete'           => 'Borrado masivo',
+    'bulk_actions'          => 'Acciones masivas',
+    'bulk_checkin_delete'   => 'Ingresar elementos / Borrar usuarios',
     'byod'                  => 'BYOD',
     'byod_help'             => 'Este dispositivo es propiedad del usuario',
-    'bystatus'              => 'por Estado',
+    'bystatus'              => 'por estado',
     'cancel'  				=> 'Cancelar',
     'categories'			=> 'Categorías',
     'category'				=> 'Categoría',
     'change' 		        => 'Entrada/Salida',
-    'changeemail'  			=> 'Cambiar Dirección de Correo Electrónico',
-    'changepassword'  		=> 'Cambiar Contraseña',
-    'checkin'  				=> 'Devolver',
-    'checkin_from'  		=> 'Registrar desde',
+    'changeemail'  			=> 'Cambiar dirección de correo electrónico',
+    'changepassword'  		=> 'Cambiar contraseña',
+    'checkin'  				=> 'Ingresar',
+    'checkin_from'  		=> 'Ingreso proveniente de',
+    'checkin_note'  		=> 'Checkin Note',
+    'checkout_note'  		=> 'Checkout Note',
     'checkout'  			=> 'Asignar',
     'checkouts_count'       => 'Asignaciones',
-    'checkins_count'        => 'Devoluciones',
+    'checkins_count'        => 'Ingresos',
+    'checkin_and_delete'  	=> 'Ingresar y borrar',
     'user_requests_count'   => 'Solicitudes',
     'city'  				=> 'Ciudad',
-    'click_here'			=> 'Click aquí',
+    'click_here'			=> 'Haga clic aquí',
     'clear_selection'		=> 'Borrar selección',
     'companies'			    => 'Compañías',
     'company'				=> 'Compañía',
@@ -77,30 +83,32 @@ return [
     'consumables'			=> 'Consumibles',
     'country'  				=> 'País',
     'could_not_restore'     => 'Error al restaurar :item_type: :error',
-    'not_deleted'           => 'El :item_type no está borrado por lo que no puede ser restaurado',
+    'not_deleted'           => 'El tipo :item_type no se ha borrado y, por lo tanto, no se puede restaurar',
     'create'				=> 'Crear nuevo',
-    'created'               => 'Elemento Creado',
+    'created'               => 'Artículo creado',
     'created_asset'			=> 'activo creado',
-    'created_at' 			=> 'Creado el',
+    'created_at' 			=> 'Fecha de creación',
     'created_by'            => 'Creado por',
     'record_created' 		=> 'Registro Creado',
-    'updated_at' 			=> 'Actualizado El',
+    'updated_at' 			=> 'Actualizado el',
     'currency'  			=> '$', // this is deprecated
+    'currency_text'  		=> 'Moneda', //
     'current'  				=> 'Actual',
     'current_password'      => 'Contraseña actual',
     'customize_report'      => 'Personalizar informe',
     'custom_report'         => 'Informe personalizado de activos',
     'dashboard'				=> 'Tablero',
+    'data_source'           => 'Data Source',
     'days'      			=> 'días',
-    'days_to_next_audit'    => 'Días para la Próxima Auditoría',
+    'days_to_next_audit'    => 'Días hasta la siguiente auditoría',
     'date'					=> 'Fecha',
     'debug_warning'         => '¡Advertencia!',
-    'debug_warning_text'    => 'Esta aplicación se está ejecutando en modo producción con el depurador activado. Esto puede exponer datos sensibles si tu aplicación es accesible al exterior. Desactiva el modo de depuración mediante la configuración del valor <code>APP_DEBUG</code> en tu archivo <code>.env</code> a <code>false</code>.',
+    'debug_warning_text'    => 'Esta aplicación se está ejecutando en modo producción con depuración habilitada. Esto puede exponer datos sensibles si su aplicación es accedida desde el mundo exterior. Deshabilite el modo de depuración configurando el valor <code>APP_DEBUG</code> en su archivo <code>.env</code> a <code>false</code>.',
     'delete'  				=> 'Borrar',
     'delete_confirm'  		=> '¿Está seguro de que desea eliminar :item?',
     'delete_confirm_no_undo' => '¿Está seguro de que desea eliminar :item? Esto no se puede deshacer.',
     'deleted'  				=> 'Borrado',
-    'delete_seats'  		=> 'Puestos Borrados',
+    'delete_seats'  		=> 'Licencias eliminadas',
     'deletion_failed'       => 'Error al eliminar',
     'departments'           => 'Departamentos',
     'department'            => 'Departamento',
@@ -112,43 +120,27 @@ return [
     'download'				=> 'Descarga',
     'download_all'		    => 'Descargar todo',
     'editprofile'  			=> 'Editar perfil',
-    'eol'					=> 'Fin de Vida',
-    'email_domain'			=> 'Dominio de Correo Electrónico',
-    'email_format'			=> 'Formato de correo electrónico',
+    'eol'					=> 'Fin de soporte (EOL)',
+    'email_domain'			=> 'Dominio de correo electrónico',
     'employee_number'       => 'Número de empleado',
-    'email_domain_help'		=> 'Este se utiliza para generar direcciones de correo al importar',
+    'email_domain_help'		=> 'Se utiliza para generar direcciones de correo electrónico al importar',
     'error'				    => 'Error',
     'exclude_archived'      => 'Excluir activos archivados',
     'exclude_deleted'       => 'Excluir activos eliminados',
     'example'				=> 'Ejemplo: ',
-    'filastname_format'			=> 'Inicial del nombre y apellido (jsmith@ejemplo.com)',
-    'firstname_lastname_format'	=> 'Nombre y apellido (jane.smith@ejemplo.com)',
-    'firstname_lastname_underscore_format' => 'Nombre y apellido (jane_smith@example.com)',
-    'lastnamefirstinitial_format' =>  'Apellido e inicial del nombre (smithj@example.com)',
-    'firstintial_dot_lastname_format' => 'Inicial del nombre y apellido (j.smith@ejemplo.com)',
-    'firstname_lastname_display'	=> 'Nombre y apellido (Jane Smith)',
-    'lastname_firstname_display'	=> 'Apellido y nombre (Smith Jane)',
-    'name_display_format'	=> 'Formato para mostrar nombres',
-    'first'					=> 'Primer',
-    'firstnamelastname'     => 'Nombre y apellido (janesmith@example.com)',
-    'lastname_firstinitial' => 'Apellido e inicial del nombre (smith_j@ejemplo.com)',
-    'firstinitial.lastname' => 'Inicial nombre y apellido (j.smith@ejemplo.com)',
-    'firstnamelastinitial'  => 'Nombre e inicial del apellido(janes@example.com)',
-    'lastnamefirstname'      => 'Apellido y nombre (smith.jane@example.com)',
-    'first_name'			=> 'Nombre',
-    'first_name_format'		=> 'Nombre (jane@ejemplo.com)',
+
     'files'                 => 'Archivos',
     'file_name'				=> 'Archivo',
     'file_type'             => 'Tipo de archivo',
     'filesize'              => 'Tamaño del archivo',
     'file_uploads'			=> 'Carga de Archivos',
-    'file_upload'           => 'Subir archivo',
+    'file_upload'           => 'Cargar archivo',
     'generate'				=> 'Generar',
     'generate_labels'       => 'Generar etiquetas',
-    'github_markdown'      => 'Este campo acepta el <a href="https://help.github.com/articles/github-flavored-markdown/">formateo estilo GitHub</a>.',
+    'github_markdown'      => 'Este campo acepta <a href="https://help.github.com/articles/github-flavored-markdown/">markdown estilo Github</a>.',
     'groups'				=> 'Grupos',
-    'gravatar_email'        => 'Dirección de Correo Gravatar',
-    'gravatar_url'          => '<a href="http://gravatar.com"><small>Cambia tu avatar en Gravatar.com</small></a>.',
+    'gravatar_email'        => 'Dirección de correo electrónico de Gravatar',
+    'gravatar_url'          => '<a href="http://gravatar.com"><small>Cambie su avatar en Gravatar.com</small></a>.',
     'history'  			    => 'Historial',
     'history_for'  			=> 'Historial para',
     'id'  					=> 'ID',
@@ -156,52 +148,57 @@ return [
     'image_delete'         	=> 'Borrar Imagen',
     'include_deleted'       => 'Incluir activos eliminados',
     'image_upload'         	=> 'Cargar imagen',
-    'filetypes_accepted_help'    => 'El tipo de archivo aceptado es :types. El tamaño máximo permitido para subir es :size.|Los tipos de archivo aceptados son :types. El tamaño máximo permitido es :size.',
-    'filetypes_size_help'   => 'El tamaño máximo permitido para subir es :size.',
-    'image_filetypes_help'  => 'Accepted filetypes are jpg, webp, png, gif, svg, and avif. Max upload size allowed is :size.',
-    'unaccepted_image_type'  => 'Este archivo de imagen no fue legible. Los tipos de archivo aceptados son jpg, webp, png, gif y svg. El tipo mimetype de este archivo es: :mimetype.',
+    'filetypes_accepted_help'    => 'El tipo de archivo aceptado es :types. El tamaño máximo permitido es :size.|Los tipos de archivo aceptados son :types. El tamaño máximo permitido para cargar es :size.',
+    'filetypes_size_help'   => 'El tamaño máximo permitido para cargar es :size.',
+    'image_filetypes_help'  => 'Los tipos de archivo aceptados son jpg, webp, png, gif, svg y avif. El tamaño máximo permitido es :size.',
+    'unaccepted_image_type'  => 'No se pudo leer este archivo de imagen. Los tipos de archivo aceptados son jpg, webp, png, gif y svg. El tipo MIME de este archivo es: :mimetype.',
     'import'         	    => 'Importar',
-    'import_this_file'      => 'Mapear campos y procesar este archivo',
-    'importing'         	=> 'Importando',
-    'importing_help'        => 'Puede importar activos, accesorios, licencias, componentes, consumibles y usuarios a través del archivo CSV. <br><br>El CSV debe estar delimitado por comas y formateado con encabezados que coincidan con los del CSVs <a href="https://snipe-it.readme.io/docs/importing" target="_new">de muestra en la documentación</a>.',
+    'import_this_file'      => 'Asociar campos y procesar este archivo',
+    'importing'         	=> 'Importar datos',
+    'importing_help'        => 'Puede importar activos, accesorios, licencias, componentes, consumibles y usuarios a través del archivo CSV. <br><br>El CSV debe estar delimitado por comas y formateado con encabezados que coincidan con los de los <a href="https://snipe-it.readme.io/docs/importing" target="_new">archivos CSV de muestra en la documentación</a>.',
     'import-history'        => 'Importar historial',
-    'asset_maintenance'        => 'Mantenimiento de Activos',
+    'asset_maintenance'        => 'Mantenimiento de activos',
     'asset_maintenance_report' => 'Informe mantenimiento de activos',
     'asset_maintenances'       => 'Mantenimiento de activos',
     'item'  				=> 'Elemento',
-    'item_name'             => 'Nombre del artículo',
+    'item_name'             => 'Nombre del elemento',
     'import_file'  			=> 'importar archivo CSV',
     'import_type'  			=> 'Tipo de importación CSV',
     'insufficient_permissions' => '¡Permisos insuficientes!',
     'kits'       			=> 'Kits predefinidos',
-    'language'				=> 'Lenguaje',
+    'language'				=> 'Idioma',
     'last'					=> 'Último',
-    'last_login'            => 'Último Inicio de Sesión',
+    'last_login'            => 'Último inicio de sesión',
     'last_name'             => 'Apellido',
+    'firstname_lastname_display'	=> 'Nombre y apellido (Jane Smith)',
+    'lastname_firstname_display'	=> 'Apellido y nombre (Smith Jane)',
+    'name_display_format'	=> 'Formato para mostrar el nombre',
+    'first'					=> 'Primero',
+    'first_name'			=> 'Nombre',
     'license'				=> 'Licencia',
     'license_report'        => 'Informe de licencias',
     'licenses_available'	=> 'Licencias disponibles',
     'licenses'				=> 'Licencias',
     'list_all'				=> 'Mostrar todos',
-    'loading'				=> 'Cargando... espere por favor....',
-    'lock_passwords'        => 'Este valor de campo no se guardará en una instalación de demostración.',
-    'feature_disabled'      => 'Esta característica ha sido deshabilitada para la instalación demo.',
+    'loading'				=> 'Cargando... por favor espere...',
+    'lock_passwords'        => 'El valor de este campo no se guardará en una instalación de demostración.',
+    'feature_disabled'      => 'Esta característica se ha desactivado para la instalación de demostración.',
     'location'              => 'Ubicación',
     'location_plural'        => 'Ubicación|Ubicaciones',
     'locations'				=> 'Ubicaciones',
-    'logo_size'				=> 'Los logotipos cuadrados se ven mejor con Logo + Texto. El tamaño máximo del Logo es 50px de alta x 500px.  ',
+    'logo_size'				=> 'Los logotipos cuadrados se ven mejor con Logo + Texto. El tamaño máximo del logo es 50px de alto x 500px de ancho.  ',
     'logout'				=> 'Cerrar sesión',
-    'lookup_by_tag'     => 'Buscar etiqueta de activo',
+    'lookup_by_tag'     => 'Buscar placa del activo',
     'maintenances'          => 'Mantenimientos',
-    'manage_api_keys'       => 'Administrar claves API',
+    'manage_api_keys'       => 'Administrar las claves del API',
     'manufacturer'			=> 'Fabricante',
     'manufacturers'			=> 'Fabricantes',
-    'markdown'				=> 'Este campo permite <a href="https://help.github.com/articles/github-flavored-markdown/">formateo estilo Github</a>.',
+    'markdown'				=> 'Este campo permite <a href="https://help.github.com/articles/github-flavored-markdown/">markdown estilo Github</a>.',
     'min_amt'				=> 'Cantidad mínima',
-    'min_amt_help'          => 'Número mínimo de elementos que deberían estar disponibles antes de que se active una alerta. Deja la cantidad mínima en blanco si no quieres recibir alertas para un inventario bajo.',
-    'model_no'				=> 'Modelo nú.',
+    'min_amt_help'          => 'Número mínimo de elementos que deben estar disponibles antes de que se active una alerta. Deje la cantidad mínima en blanco si no desea recibir alertas de inventario bajo.',
+    'model_no'				=> 'Modelo No.',
     'months'				=> 'meses',
-    'moreinfo'				=> 'Más Información',
+    'moreinfo'				=> 'Más información',
     'name'					=> 'Nombre',
     'new_password'          => 'Nueva contraseña',
     'next'					=> 'Siguiente',
@@ -212,40 +209,48 @@ return [
     'last_audit'		    => 'Última auditoría',
     'new'					=> '¡nuevo!',
     'no_depreciation'		=> 'Sin Depreciación',
-    'no_results'			=> 'Sin Resultados.',
+    'no_results'			=> 'No hay resultados.',
     'no'  					=> 'No',
     'notes'  				=> 'Notas',
+    'note_added'            => 'Nota agregada',
+    'options'				=> 'Options',
+    'preview'				=> 'Preview',
+    'add_note'              => 'Agregar nota',
+    'note_edited'            => 'Nota editada',
+    'edit_note'              => 'Editar nota',
+    'note_deleted'            => 'Nota eliminada',
+    'delete_note'              => 'Borrar nota',
     'order_number'          => 'Número de orden',
-    'only_deleted'          => 'Sólo activos eliminados',
+    'only_deleted'          => 'Solo activos eliminados',
     'page_menu'				=> 'Mostrando elementos de _MENU_',
-    'pagination_info'		=> 'Mostrando _START_ de _END_ de elementos _TOTAL_',
+    'pagination_info'		=> 'Mostrando _START_ a _END_ de _TOTAL_ elementos',
     'pending'				=> 'Pendientes',
-    'people'				=> 'Usuarios',
-    'per_page'				=> 'Resultados Por Página',
+    'people'				=> 'Personas',
+    'per_page'				=> 'Resultados por página',
     'previous'				=> 'Anterior',
     'processing'			=> 'Procesando',
-    'profile'				=> 'Tu Perfil',
-    'purchase_cost'                              => 'Costo de Compra',
+    'profile'				=> 'Perfil',
+    'purchase_cost'                              => 'Precio de compra',
     'purchase_date'         => 'Fecha de compra',
     'qty'		            => 'Cantidad',
     'quantity'		        => 'Cantidad',
-    'quantity_minimum'      => 'Tiene :count artículos por debajo o casi por debajo de los niveles mínimos de cantidad',
-    'quickscan_checkin'  	=> 'Devolución rápida con escaneo',
-    'quickscan_checkin_status'  	=> 'Estado de devolución',
+    'quantity_minimum'      => 'Tiene un artículo por debajo o casi por debajo de los niveles de cantidad mínima|Tiene :count artículos por debajo o casi por debajo de los niveles de cantidad mínima',
+    'quickscan_checkin'  	=> 'Ingreso rápido con escaneo',
+    'quickscan_checkin_status'  	=> 'Resultado del ingreso',
     'ready_to_deploy'		=> 'Listo para asignar',
     'recent_activity'		=> 'Actividad Reciente',
     'remaining'             => 'Restante',
-    'remove_company'        => 'Eliminar asociación de la compañía',
+    'remove_company'        => 'Eliminar la asociación de la compañía',
     'reports'				=> 'Reportes',
     'restored'				=> 'restaurado',
     'restore'				=> 'Restaurar',
     'requestable_models'    => 'Modelos disponibles para solicitar',
     'requestable_items'     => 'Artículos que se pueden solicitar',
     'requested'				=> 'Solicitado',
-    'requested_date'        => 'Fecha solicitada',
+    'requested_date'        => 'Fecha de solicitud',
     'requested_assets'      => 'Activos solicitados',
-    'requested_assets_menu' => 'Elementos solicitados',
-    'request_canceled'      => 'Solicitud Cancelada',
+    'requested_assets_menu' => 'Activos solicitados',
+    'request_canceled'      => 'Solicitud cancelada',
     'request_item'          => 'Solicitar este elemento',
     'external_link_tooltip' => 'Enlace externo a',
     'save'  				=> 'Guardar',
@@ -253,52 +258,54 @@ return [
     'select'				=> 'Seleccionar',
     'select_all'            => 'Seleccionar todo',
     'search'				=> 'Buscar',
-    'select_category'       => 'Seleccione una categoría',
+    'select_category'       => 'Seleccionar una categoría',
     'select_datasource' => 'Seleccione un origen de datos',
-    'select_department'     => 'Seleccione un departamento',
+    'select_department'     => 'Seleccionar un departamento',
     'select_depreciation'	=> 'Seleccionar un tipo de depreciación',
-    'select_location'		=> 'Seleccione una ubicación',
-    'select_manufacturer'	=> 'Seleccione un fabricante',
-    'select_model'			=> 'Seleccione un modelo',
-    'select_supplier'		=> 'Seleccione un proveedor',
-    'select_user'			=> 'Seleccione un usuario',
+    'select_location'		=> 'Seleccionar una ubicación',
+    'select_manufacturer'	=> 'Seleccionar un fabricante',
+    'select_model'			=> 'Seleccionar un modelo',
+    'select_supplier'		=> 'Seleccionar un proveedor',
+    'select_user'			=> 'Seleccionar un usuario',
     'select_date'			=> 'Seleccione fecha (AAAA-MM-DD)',
-    'select_statuslabel'	=> 'Seleccione un estado',
-    'select_company'    	=> 'Seleccione una compañía',
+    'select_statuslabel'	=> 'Seleccionar un estado',
+    'select_company'    	=> 'Seleccionar una compañía',
     'select_asset'    		=> 'Seleccionar activo',
     'settings'				=> 'Configuraciones',
     'show_deleted'  		=> 'Mostrar eliminados',
-    'show_current'  		=> 'Mostrar Actual',
-    'sign_in'				=> 'Entrar',
+    'show_current'  		=> 'Mostrar actual',
+    'sign_in'				=> 'Iniciar sesión',
     'signature'             => 'Firma',
     'signed_off_by'         => 'Firmado por',
-    'skin'       			=> 'Piel',
+    'skin'       			=> 'Apariencia',
     'webhook_msg_note'        => 'Una notificación se enviará a través de webhook',
-    'webhook_test_msg'        => '¡Oh hai! ¡Parece que tu integración :app con Snipe-IT está funcionando!',
-    'some_features_disabled' => 'MODO DEMO: Algunas funciones están desactivadas para esta instalación.',
+    'webhook_test_msg'        => '¡Hola! ¡Parece que la integración de :app con Snipe-IT funciona!',
+    'some_features_disabled' => 'MODO DEMOSTRACIÓN: Algunas características están desactivadas para esta instalación.',
     'site_name'				=> 'Nombre del Sitio',
     'state'  				=> 'Estado',
     'status_labels'			=> 'Etiquetas de estado',
+    'status_label'			=> 'Etiqueta de estado',
     'status'    			=> 'Estado',
     'accept_eula'           => 'Acuerdo de aceptación',
+    'show_or_hide_eulas' => 'Mostrar/ocultar acuerdos de uso (EULAs)',
     'supplier'              => 'Proveedor',
     'suppliers'  			=> 'Proveedores',
-    'sure_to_delete'        => '¿Está seguro que quieres borrar',
+    'sure_to_delete'        => '¿Está seguro de que desea eliminar',
     'sure_to_delete_var'    => '¿Está seguro de que desea eliminar :item?',
     'delete_what'           => 'Eliminar :item',
     'submit'				=> 'Enviar',
-    'target'                => 'Objetivo',
-    'time_and_date_display' => 'Visualización de Hora y Fecha',
-    'total_assets'			=> 'total de activos',
+    'target'                => 'Destino',
+    'time_and_date_display' => 'Visualización de fecha y hora',
+    'total_assets'			=> 'activos',
     'total_licenses'		=> 'licencias totales',
     'total_accessories'		=> 'accesorios totales',
-    'total_consumables'		=> 'total de consumibles',
+    'total_consumables'		=> 'consumibles totales',
     'type'  				=> 'Tipo',
     'undeployable'			=> 'No utilizable',
-    'unknown_admin'			=> 'Administrador Desconocido',
-    'username_format'		=> 'Formato de Nombre de Usuario',
+    'unknown_admin'			=> 'Administrador desconocido',
     'username'              => 'Nombre de usuario',
     'update'                => 'Actualizar',
+    'updating_item' => 'Actualizando :item',
     'upload_filetypes_help'      => 'Los tipos de archivo permitidos son png, gif, jpg, jpeg, doc, docx, pdf, xls, xlsx, txt, lic, xml, zip, rtf y rar. El tamaño máximo permitido es :size.',
     'uploaded'              => 'Cargado',
     'user'					=> 'Usuario',
@@ -308,31 +315,31 @@ return [
     'unassigned'            => 'Sin asignar',
     'unaccepted_asset_report' => 'Activos no aceptados',
     'users'                 => 'Usuarios',
-    'viewall'				=> 'Ver todo',
-    'viewassets'  			=> 'Ver elementos asignados',
+    'viewall'				=> 'Ver todos',
+    'viewassets'  			=> 'Ver activos asignados',
     'viewassetsfor'         => 'Ver activos para :name',
     'website'               => 'Sitio Web',
     'welcome'				=> 'Bienvenido, :name',
     'years'					=> 'años',
     'yes' 					=> 'Si',
     'zip'  					=> 'Código postal',
-    'noimage'				=> 'No se subió la imagen o no fue encontrada.',
+    'noimage'				=> 'No se cargó la imagen o no fue encontrada.',
     'file_does_not_exist'   => 'El archivo solicitado no existe en el servidor.',
     'file_upload_success'   => '¡Archivo cargado exitosamente!',
     'no_files_uploaded'     => '¡Archivo cargado exitosamente!',
     'token_expired'         => 'Su sesión ha caducado. Por favor, inténtelo de nuevo.',
     'login_enabled'         => 'Inicio de sesión activado',
-    'audit_due'             => 'Vence la auditoría',
-    'audit_due_days'        => 'Activos pendientes para auditoría dentro de :days día|Activos pendientes para auditoría dentro de :days días',
-    'checkin_due'           => 'Pendiente por devolver',
-    'checkin_overdue'       => 'Atrasado por devolver',
-    'checkin_due_days'      => 'Activos que deben ser devueltos dentro de :days día|Activos que deben ser devueltos dentro de :days días',
-    'audit_overdue'         => 'Atrasado para la auditoría',
+    'audit_due'             => 'Próximas auditorías',
+    'audit_due_days'        => '{}Assets Due or Overdue for Audit|[1]Assets Due or Overdue for Audit Within a Day|[2,*]Assets Due or Overdue for Audit Within :days Days',
+    'checkin_due'           => 'Próximos a ingresar',
+    'checkin_overdue'       => 'Devolución atrasada',
+    'checkin_due_days'      => '{}Due for Checkin|[1]Assets Due for Checkin Within :days Day|[2,*]Assets Due for Checkin Within :days Days',
+    'audit_overdue'         => 'Auditoría atrasada',
     'accept'                => 'Aceptar :asset',
     'i_accept'              => 'Acepto',
     'i_decline'             => 'Rechazo',
     'accept_decline'        => 'Aceptar/Rechazar',
-    'sign_tos'              => 'Regístrate a continuación para indicar que estás de acuerdo con los términos del servicio:',
+    'sign_tos'              => 'Firme abajo para indicar que está de acuerdo con los términos de servicio:',
     'clear_signature'       => 'Borrar firma',
     'show_help'             => 'Mostrar ayuda',
     'hide_help'             => 'Ocultar ayuda',
@@ -340,30 +347,30 @@ return [
     'hide_deleted'          => 'Ocultar eliminados',
     'email'                 => 'Correo electrónico',
     'do_not_change'         => 'No cambiar',
-    'bug_report'            => 'Reportar un error',
+    'bug_report'            => 'Reporte un error',
     'user_manual'           => 'Manual del usuario',
     'setup_step_1'          => 'Paso 1',
     'setup_step_2'          => 'Paso 2',
     'setup_step_3'          => 'Paso 3',
     'setup_step_4'          => 'Paso 4',
     'setup_config_check'    => 'Comprobar configuración',
-    'setup_create_database' => 'Crear Tablas de Base de Datos',
-    'setup_create_admin'    => 'Crear Usuario Admin',
+    'setup_create_database' => 'Crear tablas de la base de datos',
+    'setup_create_admin'    => 'Crear un usuario administrador',
     'setup_done'            => '¡Terminado!',
     'bulk_edit_about_to'    => 'Está a punto de editar lo siguiente: ',
     'checked_out'           => 'Asignado',
-    'checked_out_to'        => 'Comprobado a',
+    'checked_out_to'        => 'Asignado a',
     'fields'                => 'Campos',
-    'last_checkout'         => 'Último pedido',
-    'due_to_checkin'        => 'Los siguientes :count artículos deben ser chequeados pronto:',
-    'expected_checkin'      => 'Checkin Esperado',
+    'last_checkout'         => 'Última asignación',
+    'due_to_checkin'        => 'Los siguientes :count elementos están pendientes por ingresar pronto:',
+    'expected_checkin'      => 'Fecha esperada de devolución',
     'reminder_checked_out_items' => 'Este es un recordatorio de los elementos que se te han comprobado actualmente. Si usted siente que esta lista es incorrecta (falta algo o algo que usted cree que nunca ha recibido), por favor envíe un correo electrónico a :reply_to_name a :reply_to_address.',
     'changed'               => 'Cambiado',
     'to'                    => 'A',
-    'report_fields_info'    => '<p>Elija los campos que desa incluir en su informe personalizado, y haga click en Generar. El archivo (custom-asset-report-YYYY-mm-dd,csv) se descargará automáticamente y puede abrirlo en Excel.</p>
-<p>Si desea exportar solo ciertos activos, use las siguientes opciones para afinar los resultados.</p>',
+    'report_fields_info'    => '<p>Seleccione los campos que desea incluir en su informe personalizado y haga clic en Generar. El archivo (custom-asset-report-YYYY-mm-dd.csv) se descargará automáticamente y podrá abrirlo en Excel.</p>
+            <p>Si desea exportar sólo ciertos activos, utilice las siguientes opciones para afinar sus resultados.</p>',
     'range'                 => 'Rango',
-    'bom_remark'            => 'Añadir un BOM (signo de orden de byte) a este CSV',
+    'bom_remark'            => 'Añadir un BOM (marca de orden de bytes) a este CSV',
     'improvements'          => 'Mejoras',
     'information'           => 'Información',
     'permissions'           => 'Permisos',
@@ -373,9 +380,9 @@ return [
     'ldap_user_sync'        => 'Sincronización de usuario LDAP',
     'synchronize'           => 'Synchronize',
     'sync_results'          => 'Resultados de sincronización',
-    'license_serial'        => 'Clave de Serial/Producto',
-    'invalid_category'      => 'Categoría no válida o ausente',
-    'invalid_item_category_single' => 'Falta o no válida :type categoría. Por favor actualiza la categoría de este :type para incluir una categoría válida antes de salir.',
+    'license_serial'        => 'Número de serie/clave de producto',
+    'invalid_category'      => 'Categoría no válida o inexistente',
+    'invalid_item_category_single' => 'Falta o no es válida una categoría de tipo :type. Por favor, actualice la categoría de tipo :type para incluir una categoría válida antes de asignar.',
     'dashboard_info'        => 'Este es su panel de control. Hay muchos similares, pero este es suyo.',
     '60_percent_warning'    => '60% completo (advertencia)',
     'dashboard_empty'       => 'Parece que aún no ha añadido nada, así que no tenemos nada impresionante que mostrar. ¡Comience añadiendo algunos activos, accesorios, consumibles o licencias ahora!',
@@ -383,80 +390,83 @@ return [
     'new_license'           => 'Nueva licencia',
     'new_accessory'         => 'Nuevo accesorio',
     'new_consumable'        => 'Nuevo consumible',
-    'collapse'              => 'Colapso',
+    'new_component'         => 'New Component',
+    'new_user'              => 'New User',
+    'collapse'              => 'Contraer',
     'assigned'              => 'Asignado',
     'asset_count'           => 'Cantidad de activos',
-    'accessories_count'     => 'Número de accesorios',
-    'consumables_count'     => 'Número de consumibles',
-    'components_count'      => 'Número de componentes',
-    'licenses_count'        => 'Número de licencias',
+    'accessories_count'     => 'Cantidad de accesorios',
+    'consumables_count'     => 'Cantidad de consumibles',
+    'components_count'      => 'Cantidad de componentes',
+    'licenses_count'        => 'Cantidad de licencias',
     'notification_error'    => 'Error',
     'notification_error_hint' => 'Por favor revise si hay errores en el siguiente formulario',
     'notification_bulk_error_hint' => 'Los siguientes campos tenían errores de validación y no fueron editados:',
     'notification_success'  => 'Éxito',
     'notification_warning'   => 'Advertencia',
-    'notification_info'      => 'Info',
-    'asset_information'     => 'Información del recurso',
+    'notification_info'      => 'Información',
+    'asset_information'     => 'Información del activo',
     'model_name'            => 'Nombre del modelo',
     'asset_name'            => 'Nombre del activo',
-    'consumable_information' => 'Información Consumible:',
+    'consumable_information' => 'Información del consumible:',
     'consumable_name'       => 'Nombre del Consumible:',
     'accessory_information' => 'Información del accesorio:',
-    'accessory_name'       => 'Nombre del Accesorio:',
+    'accessory_name'       => 'Nombre del accesorio:',
     'clone_item'            => 'Clonar objeto',
     'checkout_tooltip' => 'Asignar este elemento',
-    'checkin_tooltip' => 'Devuelva este elemento para que esté disponible para resignar, borrar, etc.',
+    'checkin_tooltip' => 'Ingrese este elemento para que esté disponible para reasignar, borrar, etc.',
     'checkout_user_tooltip' => 'Asignar este elemento a un usuario',
-    'checkin_to_diff_location' => 'Puede optar por registrar este activo en una ubicación distinta a la ubicación predeterminada :default_location, si existe una configurada',
-    'maintenance_mode'      => 'El servicio no está disponible temporalmente para actualizaciones del sistema. Por favor, vuelva más tarde.',
-    'maintenance_mode_title' => 'Sistema temporalmente no disponible',
+    'checkin_to_diff_location' => 'Puede elegir ingresar este activo a una ubicación distinta de la predeterminada :default_location, si es que se ha definido una',
+    'maintenance_mode'      => 'El servicio no está disponible temporalmente debido a actualizaciones del sistema. Por favor, verifique más tarde.',
+    'maintenance_mode_title' => 'El sistema no está disponible temporalmente',
     'ldap_import'           => 'La contraseña del usuario no debe ser administrada por LDAP. (Esto le permite enviar solicitudes de contraseña olvidadas.)',
     'purge_not_allowed'     => 'La purga de datos eliminados ha sido deshabilitada en el archivo .env. Contacte con el soporte técnico o con el administrador de su sistema.',
     'backup_delete_not_allowed'     => 'La eliminación de copias de seguridad se ha desactivado en el archivo .env. Contacte con el soporte técnico o con el administrador de su sistema.',
     'additional_files'           => 'Archivos adicionales',
     'shitty_browser'        => 'No se ha detectado ninguna firma. Si está utilizando un navegador más antiguo, por favor utilice un navegador más moderno para completar la aceptación del elemento.',
     'bulk_soft_delete'      =>'También borra suavemente estos usuarios. Su historial de activos permanecerá intacto a menos/hasta que purgue los registros borrados en la Configuración de administración.',
-    'bulk_checkin_delete_success' => 'Los usuarios seleccionados han sido eliminados y sus elementos han sido registrados.',
-    'bulk_checkin_success' => 'Los elementos para los usuarios seleccionados han sido registrados.',
-    'set_to_null'           => 'Eliminar valores para este activo|Borrar valores para todos los activos :asset_count ',
-    'set_users_field_to_null'  => 'Eliminar :field values for this user|Eliminar :field values for all :user_count users ',
+    'bulk_checkin_delete_success' => 'Los usuarios seleccionados han sido eliminados y sus activos han sido ingresados.',
+    'bulk_checkin_success' => 'Los elementos para los usuarios seleccionados han sido ingresados.',
+    'set_to_null'           => 'Eliminar los valores del elemento seleccionado|Eliminar los valores de los :selection_count elementos seleccionados ',
+    'set_users_field_to_null'  => 'Eliminar valores de :field para este usuario|Eliminar valores de :field para todos los :user_count usuarios ',
     'na_no_purchase_date'   => 'N/A - No se proporcionó fecha de compra',
     'assets_by_status'      => 'Activos por estado',
     'assets_by_status_type'      => 'Activos por tipo de estado',
     'pie_chart_type'        => 'Tipo de gráfico circular en el tablero',
     'hello_name'            => '¡Hola, :name!',
-    'unaccepted_profile_warning'   => 'Tienes :count elementos que requieren aceptación. Haz clic aquí para aceptarlos o rechazarlos',
+    'unaccepted_profile_warning'   => 'Tiene un elemento que requiere aceptación. Haga clic aquí para aceptarlo o rechazarlo | Tiene :count elementos que requieren aceptación. Haga clic aquí para aceptarlos o rechazarlos',
     'start_date'            => 'Fecha de inicio',
-    'end_date'            => 'Fecha de fin',
+    'end_date'            => 'Fecha final',
     'alt_uploaded_image_thumbnail' => 'Miniatura cargada',
     'placeholder_kit'       => 'Seleccione un kit',
     'file_not_found'        => 'Archivo no encontrado',
+    'log_record_not_found'  => 'No se ha encontrado ninguna entrada en el registro de eventos.',
     'preview_not_available' => '(sin vista previa)',
-    'setup'                 => 'Configurar',
-    'pre_flight'            => 'Pre-vuelo',
+    'setup'                 => 'Configuración',
+    'pre_flight'            => 'Preparación',
     'skip_to_main_content'  => 'Ir al contenido principal',
-    'toggle_navigation'     => 'Cambiar navegación',
+    'toggle_navigation'     => 'Alternar navegación',
     'alerts'                => 'Alertas',
     'tasks_view_all'        => 'Ver todas las tareas',
     'true'                  => 'Verdadero',
-    'false'                 => 'False',
+    'false'                 => 'Falso',
     'integration_option'    => 'Opción de integración',
-    'log_does_not_exist'    => 'No existe ningún registro de registro coincidente.',
+    'log_does_not_exist'    => 'No existe ningún registro de eventos que coincida.',
     'merge_users'           => 'Combinar usuarios',
-    'merge_information' =>  'Esto fusionará a los usuarios :count en un solo usuario. Seleccione el usuario en el que desea fusionar a los demás a continuación, y los activos asociados, licencias, etc se moverá al usuario seleccionado y los otros usuarios serán marcados como eliminados.',
-    'warning_merge_information' => 'Esta acción NO PUEDE deshacerse y sólo debe ser usada cuando necesite fusionar usuarios debido a una mala importación o sincronización. Asegúrese de ejecutar una copia de seguridad primero.',
+    'merge_information' =>  'Esto combinará los :count usuarios en un único usuario. Seleccione a continuación el usuario en el que desea combinar los demás, y los activos, licencias, etc. asociados se moverán al usuario seleccionado y los demás usuarios se marcarán como eliminados.',
+    'warning_merge_information' => 'Esta acción NO PUEDE deshacerse y sólo debe ser usada cuando necesite combinar usuarios debido a una mala importación o sincronización. Asegúrese de ejecutar una copia de seguridad primero.',
     'no_users_selected'     => 'Ningún usuario seleccionado',
     'not_enough_users_selected'     => 'Al menos :count usuarios deben ser seleccionados',
-    'merge_success'         => ':count usuarios fusionados con éxito en :into_username!',
-    'merged'                => 'fusionado',
-    'merged_log_this_user_into' => 'Fusionado este usuario (ID :to_id - :to_username) con ID de usuario :from_id (:from_username) ',
-    'merged_log_this_user_from' => 'Fusionado ID de usuario :from_id (:from_username) con este usuario (ID :to_id - :to_username)',
+    'merge_success'         => '!:count usuarios combinados con éxito en :into_username!',
+    'merged'                => 'combinados',
+    'merged_log_this_user_into' => 'Se combinó este usuario (ID :to_id - :to_username) en ID de usuario :from_id (:from_username) ',
+    'merged_log_this_user_from' => 'Se combinó usuario ID :from_id (:from_username) en este usuario (ID :to_id - :to_username)',
     'clear_and_save'            => 'Limpiar y guardar',
     'update_existing_values'    => '¿Actualizar valores existentes?',
-    'auto_incrementing_asset_tags_disabled_so_tags_required' => 'Generar etiquetas de activos auto-incrementantes está desactivado, por lo que todas las filas necesitan tener la columna "Tag de activo" rellenada.',
-    'auto_incrementing_asset_tags_enabled_so_now_assets_will_be_created' => 'Nota: Generar etiquetas de activos que incrementan automáticamente está habilitado, por lo que se crearán recursos para registros que no tengan "Tag de activo" poblado. Las filas que tengan "Etiqueta de activos" pobladas serán actualizadas con la información proporcionada.',
+    'auto_incrementing_asset_tags_disabled_so_tags_required' => 'La generación autoincrementable de las placas de activos está desactivada, por lo que todas las filas deben tener la columna "Asset Tag" con información.',
+    'auto_incrementing_asset_tags_enabled_so_now_assets_will_be_created' => 'Nota: La generación autoincrementable de las placas de activos está activada, por lo que se crearán activos para las filas sin información en la columna "Asset Tag". Las filas que sí tengan información en la columna "Asset Tag" se actualizarán con la información proporcionada.',
     'send_welcome_email_to_users'   => ' ¿Enviar correo de bienvenida para nuevos usuarios?',
-    'send_email'                => 'Enviar Email',
+    'send_email'                => 'Enviar correo electrónico',
     'call'                      => 'Número de llamada',
     'back_before_importing'     => '¿Copia de seguridad antes de importar?',
     'csv_header_field'          => 'Campo de cabecera CSV',
@@ -467,72 +477,72 @@ return [
     'errors_importing'          => 'Se han producido algunos errores al importar: ',
     'warning'                   => 'ADVERTENCIA: :warning',
     'success_redirecting'       => '"Éxito... Redirigiendo.',
-    'cancel_request'            => 'Cancelar esta solicitud de elemento',
+    'cancel_request'            => 'Cancelar solicitud para este elemento',
     'setup_successful_migrations' => 'Se han creado las tablas de la base de datos',
-    'setup_migration_output' => 'Salida de Migración:',
+    'setup_migration_output' => 'Salida de migración:',
     'setup_migration_create_user' => 'Siguiente: Crear usuario',
-    'importer_generic_error'    => 'La importación de tu archivo está completa, pero recibimos un error. Esto normalmente es causado por la limitación de API de terceros desde un webhook de notificación (como Slack) y no habría interferido con la importación en sí. pero debería confirmarlo.',
+    'importer_generic_error'    => 'La importación del archivo se ha completado, pero recibimos un error. Esto suele deberse a la limitación de la API de terceros desde un webhook de notificación (como Slack) y no habría interferido con la importación en sí, pero debería confirmarlo.',
     'confirm' => 'Confirmar',
     'autoassign_licenses' => 'Auto-Asignar licencias',
-    'autoassign_licenses_help' => 'Permitir a este usuario tener licencias asignadas a través de la interfaz de usuario o herramientas de cli asignadas a granel.',
-    'autoassign_licenses_help_long' => 'Esto permite que un usuario tenga licencias asignadas a través de la interfaz de usuario o las herramientas de cli asignadas a granel. (Por ejemplo, puede que no desee que los contratistas sean asignados automáticamente a una licencia que proporcione sólo a los miembros del personal. Todavía puede asignar licencias individualmente a esos usuarios, pero no se incluirán en la licencia de pago a las funciones de todos los usuarios.)',
-    'no_autoassign_licenses_help' => 'No incluya al usuario para asignar a granel a través de la licencia UI o las herramientas de cli.',
+    'autoassign_licenses_help' => 'Permitir a este usuario tener licencias asignadas a través de la asignación masiva en la interfaz de usuario o de las herramientas de la línea de comandos (CLI).',
+    'autoassign_licenses_help_long' => 'Esto permite asignar licencias a un usuario a través de la asignación masiva en la interfaz de usuario o de las herramientas de línea de comandos (CLI). (Por ejemplo, es posible que no desee que a los contratistas se les asigne automáticamente una licencia que usted proporcionaría sólo a los miembros del personal. Puede seguir asignando licencias individualmente a esos usuarios, pero no se incluirán en las funciones de "Asignación de licencias a todos los usuarios").',
+    'no_autoassign_licenses_help' => 'No incluir al usuario en la asignación masiva de licencias en la interfaz de usuario o en las herramientas de línea de comandos (CLI).',
     'modal_confirm_generic'      => '¿Está seguro?',
     'cannot_be_deleted'      => 'Este elemento no puede ser eliminado',
     'cannot_be_edited'      => 'Este elemento no puede ser editado.',
     'undeployable_tooltip'      => 'Este artículo no puede ser asignado. Compruebe la cantidad restante.',
-    'serial_number'        => 'Número Serial',
+    'serial_number'        => 'Número de serie',
     'item_notes' => ':item Notas',
     'item_name_var' => ':item Nombre',
     'error_user_company' => 'La compañía destino de la asignación y la compañía del activo no coinciden',
     'error_user_company_accept_view' => 'Un activo asignado a usted pertenece a una compañía diferente por lo que no puede aceptarlo ni rechazarlo, por favor verifique con su supervisor',
     'importer' => [
-        'checked_out_to_fullname' => 'Pagado a: Nombre Completo',
-        'checked_out_to_first_name' => 'Pagado a: Nombre',
-        'checked_out_to_last_name' => 'Pagado a: Apellido',
-        'checked_out_to_username' => 'Pagado a: Usuario',
-        'checked_out_to_email' => 'Checkout a: Email',
-        'checked_out_to_tag' => 'Checked Out a: Tag de Activos',
-        'manager_first_name' => 'Nombre del administrador',
-        'manager_last_name' => 'Apellido del administrador',
-        'manager_full_name' => 'Nombre completo del administrador',
-        'manager_username' => 'Usuario Administrador',
-        'checkout_type' => 'Tipo de pago',
-        'checkout_location' => 'Pagar a la ubicación',
-        'image_filename' => 'Nombre de imagen',
+        'checked_out_to_fullname' => 'Asignado a: Nombre completo',
+        'checked_out_to_first_name' => 'Asignado a: Nombre',
+        'checked_out_to_last_name' => 'Asignado a: Apellido',
+        'checked_out_to_username' => 'Asignado a: Nombre de usuario',
+        'checked_out_to_email' => 'Asignado a: Correo electrónico',
+        'checked_out_to_tag' => 'Asignado a: Placa de activo',
+        'manager_first_name' => 'Nombre del supervisor',
+        'manager_last_name' => 'Apellido del supervisor',
+        'manager_full_name' => 'Nombre completo del supervisor',
+        'manager_username' => 'Nombre de usuario del supervisor',
+        'checkout_type' => 'Tipo de asignación',
+        'checkout_location' => 'Asignar a la ubicación',
+        'image_filename' => 'Nombre del archivo de la imagen',
         'do_not_import'     => 'No importar',
         'vip' => 'VIP',
         'avatar'  => 'Avatar',
-        'gravatar' => 'Gravatar Email',
+        'gravatar' => 'Correo electrónico Gravatar',
         'currency' => 'Moneda',
         'address2' => 'Dirección línea 2',
         'import_note' => 'Importado usando el importador de csv',
     ],
     'remove_customfield_association' => 'Elimine este campo del grupo de campos. Esto no eliminará el campo personalizado, solo la asociación de este campo con este grupo de campos.',
-    'checked_out_to_fields' => 'Campos sobre quién tiene asignado el elemento',
+    'checked_out_to_fields' => 'Campos de la persona que tiene asignado el elemento',
     'percent_complete' => '% completo',
     'uploading' => 'Subiendo... ',
-    'upload_error' => 'Error al cargar el archivo. Por favor, compruebe que no hay filas vacías y que no hay nombres de columna duplicados.',
+    'upload_error' => 'Error uploading file. Please check that you have no empty rows or duplicated column names in your CSV, and that the server permissions allow uploads.',
     'copy_to_clipboard' => 'Copiar al portapapeles',
     'copied' => '¡Copiado!',
     'status_compatibility' => 'Si los activos ya están asignados, no se pueden cambiar a un tipo de estado no utilizable y este cambio de valor se omitirá.',
-    'rtd_location_help' => 'Esta es la ubicación del recurso cuando no está seleccionado',
+    'rtd_location_help' => 'Esta es la ubicación del activo cuando no está asignado',
     'item_not_found' => ':item_type ID :id no existe o ha sido eliminado',
     'action_permission_denied' => 'No tiene permiso para :action :item_type ID :id',
-    'action_permission_generic' => 'No tiene permiso para :action this :item_type',
+    'action_permission_generic' => 'No tiene permiso para :action este :item_type',
     'edit' => 'editar',
-    'action_source' => 'Fuente de acción',
+    'action_source' => 'Origen de la acción',
     'or' => 'o',
     'url'                   => 'URL',
     'edit_fieldset' => 'Editar campos y opciones de grupos de campos',
     'permission_denied_superuser_demo' => 'Permiso denegado. No puede actualizar la información de usuario para superadministradores en la demo.',
     'pwd_reset_not_sent' => 'El usuario no está activado, está sincronizado con LDAP o no tiene una dirección de correo electrónico',
-    'error_sending_email' => 'Error al enviar email',
-    'sad_panda' => 'Sad panda. You are not authorized to do the thing. Maybe <a href=":link">return to the dashboard</a>, or contact your administrator.',
+    'error_sending_email' => 'Error al enviar correo electrónico',
+    'sad_panda' => 'No está autorizado a realizar esta acción. Puede <a href=":link">regresar al tablero</a>, o ponerse en contacto con su administrador.',
     'bulk' => [
             'delete' =>
                 [
-                'header' => 'Eliminar en masa :object_type',
+                'header' => 'Eliminar masivamente :object_type',
                 'warn'   =>  'Está a punto de eliminar un :object_type|Está a punto de eliminar :count :object_type',
                 'success'   =>  'Se ha eliminado correctamente :count :object_type',
                 'error'   =>  'No se pudo eliminar :object_type',
@@ -544,11 +554,76 @@ return [
 
     'countable' => [
         'accessories'  => ':count Accesorio|:count Accesorios',
-        'assets'  => ':count Activos|:count Activos',
-        'licenses'  => ':count Licencia|:count Licencias',
-        'license_seats'  => ':count Asiento de licencia|:count Asientos de licencia',
-        'consumables'  => ':count Consumible|:count Consumibles',
+        'assets'  => ':count activo|:count activos',
+        'licenses'  => ':count licencia|:count licencias',
+        'license_seats'  => ':count licencia|:count licencias',
+        'consumables'  => ':count consumible|:count consumibles',
         'components'  => ':count component|:count componentes',
-    ]
+    ],
+
+    'more_info' => 'Más información',
+    'quickscan_bulk_help' => 'Al marcar esta casilla se actualizará el activo para reflejar esta nueva ubicación. Dejarla sin marcar, simplemente almacenará la ubicación en el registro de auditoría. Tenga en cuenta que si este activo ya está asignado, no cambiará la ubicación de la persona, del activo o de la ubicación a la que esté asignado.',
+    'whoops' => '¡Uy!',
+    'something_went_wrong' => 'Algo falló en su solicitud.',
+    'close' => 'Cerrar',
+    'expires' => 'Vence',
+    'map_fields'=> 'Asociar los campos para :item_type',
+    'remaining_var' => ':count restantes',
+    'label' => 'Etiqueta',
+    'import_asset_tag_exists' => 'Ya existe un activo con la placa :asset_tag y no se ha solicitado una actualización. No se ha realizado ningún cambio.',
+    'countries_manually_entered_help' => 'Los valores con asterisco (*) fueron introducidos manualmente y no coinciden con los valores desplegables ISO 3166 existentes',
+    'accessories_assigned' => 'Accesorios asignados',
+    'user_managed_passwords' => 'Gestión de contraseña',
+    'user_managed_passwords_disallow' => 'Evitar que los usuarios gestionen sus propias contraseñas',
+    'user_managed_passwords_allow' => 'Permitir a los usuarios gestionar sus propias contraseñas',
+    'from' => 'From',
+    'by' => 'Por',
+
+// Add form placeholders here
+    'placeholders' => [
+        'notes'  => 'Add a note',
+    ],
+
+    'breadcrumb_button_actions' => [
+        'edit_item' => 'Edit :name',
+        'checkout_item' => 'Checkout :name',
+        'checkin_item' => 'Checkin :name',
+    ],
+
+    'skins' => [
+        'site_default' => 'Sitio por defecto',
+        'default_blue' => 'Default Blue',
+        'blue_dark' => 'Blue (Dark Mode)',
+        'green' => 'Green Dark',
+        'green_dark' => 'Green (Dark Mode)',
+        'red' => 'Red Dark',
+        'red_dark' => 'Red (Dark Mode)',
+        'orange' => 'Orange Dark',
+        'orange_dark' => 'Orange (Dark Mode)',
+        'black' => 'Black',
+        'black_dark' => 'Black (Dark Mode)',
+        'purple' => 'Purple',
+        'purple_dark' => 'Purple (Dark Mode)',
+        'yellow' => 'Yellow',
+        'yellow_dark' => 'Yellow (Dark Mode)',
+        'high_contrast' => 'High Contrast',
+
+    ],
+
+    'select_all_none' => 'Select/Unselect All',
+    'generic_model_not_found' => 'That :model was not found or you do not have permission to access it',
+    'deleted_models' => 'Deleted Asset Models',
+    'deleted_users' => 'Deleted Users',
+    'cost_each' => ':amount each',
+    'remove_current_image' => 'Remove current :type image',
+
+    'seeding' => [
+        'manufacturers' => [
+            'button' => 'Create Manufacturers',
+            'prompt' => 'You do not have any manufacturers yet. Would you like to seed a list of common manufacturers? (THIS WILL OVERWRITE EXISTING MANUFACTURERS, including those that have been soft-deleted.)',
+            'success' => 'Manufacturers seeded successfully',
+            'error' => 'Could not seed manufacturers. A manufacturer record already exists and seeding would overwrite it.|Could not seed manufacturers. :count manufacturer records already exist and seeding would overwrite them.',
+        ],
+    ],
 
 ];
diff --git a/resources/lang/es-VE/help.php b/resources/lang/es-VE/help.php
index 92cce3855f..13fb579b49 100644
--- a/resources/lang/es-VE/help.php
+++ b/resources/lang/es-VE/help.php
@@ -15,19 +15,19 @@ return [
 
     'more_info_title' => 'Más información',
 
-    'audit_help' => 'Al marcar esta casilla se editará el registro de activos para reflejar esta nueva ubicación. Dejarla desmarcada simplemente se notará la ubicación en el registro de auditoría.<br><br>Tenga en cuenta que si este activo está desprotegido, no cambiará la ubicación de la persona, el activo o la ubicación en la que está verificado.',
+    'audit_help' => 'Al marcar esta casilla se actualizará el activo para reflejar esta nueva ubicación. Dejarla sin marcar, simplemente almacenará la ubicación en el registro de auditoría.<br><br>Tenga en cuenta que si este activo ya está asignado, no cambiará la ubicación de la persona, del activo o de la ubicación a la que esté asignado.',
 
-    'assets' => 'Los activos son elementos con número de serie o etiqueta de activos.  Tienden a ser artículos de alto valor donde es importante identificar un elemento específico.',
+    'assets' => 'Los activos son artículos rastreados por número de serie o placa de activo.  Suelen ser artículos de alto valor en los que es importante identificar un elemento específico.',
 
-    'categories' => 'Las categorías te ayudan a organizar tus elementos. Unos ejemplos de categorías podrían ser: &quot;Pc Escritorios&quot;, &quot;Portátiles&quot;, &quot;Móviles&quot;, &quot;Tabletas&quot;, etc.',
+    'categories' => 'Las categorías le ayudan a organizar sus elementos. Unos ejemplos de categorías podrían ser: &quot;PC Escritorios&quot;, &quot;Portátiles&quot;, &quot;Móviles&quot;, &quot;Tabletas&quot;, etc.',
 
-    'accessories' => 'Los accesorios son cualquier cosa que se le asigne a los usuarios pero que no tenga numero de serie (o no importe realizarle el seguimiento en forma unica). Por ejemplo, mouse o teclados.',
+    'accessories' => 'Los accesorios son cualquier cosa que se le asigne a los usuarios pero que no tenga número de serie (o no importe realizarle el seguimiento en forma única). Por ejemplo, ratones o teclados.',
 
-    'companies'     => 'Las compañías se pueden utilizar como un simple campo identificador, o se pueden utilizar para limitar la visibilidad de los activos, usuarios, etc si la opción "Soporte completo a múltiples compañías" está habilitado en "Configuración de administrador".',
+    'companies'     => 'Las compañías se pueden utilizar como un simple campo identificador, o se pueden utilizar para limitar la visibilidad de los activos, usuarios, etc. si la opción "Soporte completo a múltiples compañías" está habilitada en "Configuración de administración".',
 
-    'components'    => 'Los componentes son elementos que son parte de un activo, por ejemplo HDD, RAM, etc.',
+    'components'    => 'Los componentes son elementos que son parte de un activo, por ejemplo, el disco duro, RAM, etc.',
 
-    'consumables'   => 'Los consumibles son cualquier cosa comprada que se usará con el tiempo. Por ejemplo, tinta de impresora o papel copiador.',
+    'consumables'   => 'Los consumibles son todo aquello que se compra y que se agota con el tiempo. Por ejemplo, tinta de impresora o papel de fotocopiadora.',
 
     'depreciations' => 'Puede configurar la depreciación de activos usando un método de línea recta.',
     
diff --git a/resources/lang/es-VE/localizations.php b/resources/lang/es-VE/localizations.php
index be0ac5f74d..13d614e27c 100644
--- a/resources/lang/es-VE/localizations.php
+++ b/resources/lang/es-VE/localizations.php
@@ -40,16 +40,18 @@ return [
         'ms-MY'=> 'Malayo',
         'mi-NZ'=> 'Maori',
         'mn-MN'=> 'Mongol',
-        'no-NO'=> 'Noruego',
+        'nb-NO'=> 'Noruego Bokmål',
+        'om-ET' => 'Oromo (Ethiopian)',
+        //'nn-NO'=> 'Norwegian Nynorsk',
         'fa-IR'=> 'Persa',
         'pl-PL'=> 'Polaco',
         'pt-PT'=> 'Portugués',
-        'pt-BR'=> 'Brasileño',
+        'pt-BR'=> 'Portugués, Brasil',
         'ro-RO'=> 'Rumano',
         'ru-RU'=> 'Ruso',
-        'sr-CS' => 'Serbian (Latin)',
+        'sr-CS' => 'Serbio (Latino)',
         'sk-SK'=> 'Eslovaco',
-        'sl-SI'=> 'Slovenian',
+        'sl-SI'=> 'Esloveno',
         'so-SO'=> 'Somali',
         'es-ES'=> 'Español',
         'es-CO'=> 'Español, Colombia',
@@ -71,7 +73,7 @@ return [
     'countries' => [
         'AC'=>'Isla de Ascensión',
         'AD'=>'Andorra',
-        'AE'=>'Emiraos árabes Unidos',
+        'AE'=>'Emiratos Árabes Unidos',
         'AF'=>'Afganistán',
         'AG'=>'Antigua y Barbuda',
         'AI'=>'Anguilla',
@@ -85,15 +87,15 @@ return [
         'AT'=>'Austria',
         'AU'=>'Australia',
         'AW'=>'Aruba',
-        'AX'=>'Superficie de €€',
-        'AZ'=>'Martín',
+        'AX'=>'Islas Aland',
+        'AZ'=>'Azerbaiyán',
         'BA'=>'Bosnia y Herzegovina',
         'BB'=>'Barbados',
         'BE'=>'Bélgica',
         'BD'=>'Bangladesh',
         'BF'=>'Burkina Faso',
         'BG'=>'Bulgaria',
-        'BH'=>'Bahrain',
+        'BH'=>'Baréin',
         'BI'=>'Burundi',
         'BJ'=>'Benin',
         'BM'=>'Bermuda',
@@ -133,6 +135,7 @@ return [
         'EC'=>'Ecuador',
         'EE'=>'Estonia',
         'EG'=>'Egipto',
+        'GB-ENG'=>'Inglaterra',
         'ER'=>'Eritrea',
         'ES'=>'España',
         'ET'=>'Ethiopia',
@@ -231,6 +234,7 @@ return [
         'NG'=>'Nigeria',
         'NI'=>'Nicaragua',
         'NL'=>'Holanda',
+        'GB-NIR' => 'Irlanda del Norte',
         'NO'=>'Noruega',
         'NP'=>'Nepal',
         'NR'=>'Nauru',
@@ -258,7 +262,7 @@ return [
         'RU'=>'Federación Rusa',
         'RW'=>'Rwanda',
         'SA'=>'Arabia Saudita',
-        'UK'=>'Escocia',
+        'GB-SCT'=>'Escocia',
         'SB'=>'Islas Salomón',
         'SC'=>'Seychelles',
         'SS'=>'Sudán del Sur',
@@ -287,11 +291,11 @@ return [
         'TJ'=>'Tajikistan',
         'TK'=>'Tokelau',
         'TI'=>'Timor Oriental',
-        'TM'=>'Turkmenistan',
-        'TN'=>'Tunisia',
+        'TM'=>'Turkmenistán',
+        'TN'=>'Túnez',
         'TO'=>'Tonga',
         'TP'=>'Timor Oriental (código antiguo)',
-        'TR'=>'Pavo',
+        'TR'=>'Turquía',
         'TT'=>'Trinidad y Tobago',
         'TV'=>'Tuvalu',
         'TW'=>'Taiwán',
@@ -310,6 +314,7 @@ return [
         'VI'=>'Islas Virginas (EE.UU.)',
         'VN'=>'Viet Nam',
         'VU'=>'Vanuatu',
+        'GB-WLS' =>'Gales',
         'WF'=>'Islas Wallis y Futuna',
         'WS'=>'Samoa',
         'YE'=>'Yemen',
diff --git a/resources/lang/es-VE/mail.php b/resources/lang/es-VE/mail.php
index a1b4e92a77..367f432d2a 100644
--- a/resources/lang/es-VE/mail.php
+++ b/resources/lang/es-VE/mail.php
@@ -2,92 +2,98 @@
 
 return [
 
-    'Accessory_Checkin_Notification' => 'Accesorio devuelto',
-    'Accessory_Checkout_Notification' => 'Accesorio reservado',
-    'Asset_Checkin_Notification' => 'Activo devuelto',
-    'Asset_Checkout_Notification' => 'Recurso reservado',
-    'Confirm_Accessory_Checkin' => 'Confirmación de devolución de accesorio',
-    'Confirm_Asset_Checkin' => 'Confirmación de devolución de activo',
+    'Accessory_Checkin_Notification' => 'Accesorio ingresado',
+    'Accessory_Checkout_Notification' => 'Accesorio asignado',
+    'Asset_Checkin_Notification' => 'Activo ingresado',
+    'Asset_Checkout_Notification' => 'Activo asignado',
+    'Confirm_Accessory_Checkin' => 'Confirmación de ingreso de accesorio',
+    'Confirm_Asset_Checkin' => 'Confirmación de ingreso de activo',
     'Confirm_accessory_delivery' => 'Confirmación de entrega de accesorio',
     'Confirm_asset_delivery' => 'Confirmación de entrega de activo',
     'Confirm_consumable_delivery' => 'Confirmación de entrega de consumible',
     'Confirm_license_delivery' => 'Confirmación de entrega de licencia',
-    'Consumable_checkout_notification' => 'Consumible comprobado',
+    'Consumable_checkout_notification' => 'Consumible asignado',
     'Days' => 'Días',
-    'Expected_Checkin_Date' => 'Un activo asignado a Ud. debe ser devuelto en :date',
+    'Expected_Checkin_Date' => 'Un activo asignado a Ud. debe ser devuelto el :date',
     'Expected_Checkin_Notification' => 'Recordatorio: :name se acerca la fecha de devolución',
-    'Expected_Checkin_Report' => 'Informe de devolución de activo esperado',
-    'Expiring_Assets_Report' => 'Reportes de Activos que Vencen.',
-    'Expiring_Licenses_Report' => 'Reportes de Licencias que Vencen.',
-    'Item_Request_Canceled' => 'Solicitud de Artículo Cancelada',
-    'Item_Requested' => 'Artículo Solicitado',
+    'Expected_Checkin_Report' => 'Informe de próximas devoluciones de activos',
+    'Expiring_Assets_Report' => 'Informe de activos con garantía próxima a vencer.',
+    'Expiring_Licenses_Report' => 'Informe de licencias próximas a vencer.',
+    'Item_Request_Canceled' => 'Solicitud de artículo cancelada',
+    'Item_Requested' => 'Artículo solicitado',
     'License_Checkin_Notification' => 'Licencia devuelta',
-    'License_Checkout_Notification' => 'Licencia reservada',
-    'Low_Inventory_Report' => 'Reporte de inventario bajo',
-    'a_user_canceled' => 'Un usuario ha cancelado una solicitud de articulo en el sitio web',
-    'a_user_requested' => 'Un usuario ha solicitado un artículo en el sitio web',
+    'License_Checkout_Notification' => 'Licencia asignada',
+    'license_for'   => 'Licenciado para',
+    'Low_Inventory_Report' => 'Informe sobre inventario bajo',
+    'a_user_canceled' => 'El usuario ha cancelado el elemento solicitado en la página web',
+    'a_user_requested' => 'Un usuario ha solicitado un elemento en la página web',
     'acceptance_asset_accepted' => 'Un usuario ha aceptado un elemento',
     'acceptance_asset_declined' => 'Un usuario ha rechazado un elemento',
-    'accessory_name' => 'Nombre del Accesorio:',
-    'additional_notes' => 'Notas Adicionales:',
-    'admin_has_created' => 'Un administrador ha creado una cuenta para ti en el sitio web de :web.',
-    'asset' => 'Activo:',
-    'asset_name' => 'Nombre del activo:',
+    'accessory_name' => 'Nombre de accesorio',
+    'additional_notes' => 'Notas adicionales',
+    'admin_has_created' => 'Un administrador ha creado una cuenta para usted en el sitio :web.',
+    'asset' => 'Activo',
+    'asset_name' => 'Nombre del activo',
     'asset_requested' => 'Activo solicitado',
-    'asset_tag' => 'Etiqueta de activo',
+    'asset_tag' => 'Placa del activo',
     'assets_warrantee_alert' => 'Hay :count activo con una garantía que expira en los próximos :threshold days.|Hay :count activos con garantías que expiran en los siguientes :threshold days.',
-    'assigned_to' => 'Asignado A',
-    'best_regards' => 'Atentamente,',
-    'canceled' => 'Cancelado:',
-    'checkin_date' => 'Fecha de devolución:',
-    'checkout_date' => 'Fecha de asignación:',
-    'checkedout_from' => 'Salido de',
-    'checkedin_from'  => 'Registrado desde',
-    'checked_into' => 'Registrado en',
+    'assigned_to' => 'Asignado a',
+    'best_regards' => 'Cordialmente,',
+    'canceled' => 'Cancelado',
+    'checkin_date' => 'Fecha de ingreso',
+    'checkout_date' => 'Fecha de asignación',
+    'checkedout_from' => 'Asignado desde',
+    'checkedin_from'  => 'Devuelto desde',
+    'checked_into' => 'Devuelto en',
     'click_on_the_link_accessory' => 'Haga clic en el enlace en la parte inferior para confirmar que ha recibido el accesorio.',
     'click_on_the_link_asset' => 'Haga clic en el enlace en la parte inferior para confirmar que ha recibido el activo.',
-    'click_to_confirm' => 'Por favor, pulsa en el siguiente enlace para verificar tu cuenta de :web:',
+    'click_to_confirm' => 'Por favor, haga clic en el siguiente enlace para confirmar su cuenta de :web:',
     'current_QTY' => 'Cantidad actual',
     'days' => 'Días',
-    'expecting_checkin_date' => 'Fecha esperada de devolución:',
+    'expecting_checkin_date' => 'Fecha esperada de devolución',
     'expires' => 'Vence',
     'hello' => 'Hola',
     'hi' => 'Hola',
     'i_have_read' => 'He leído y aceptado los términos de uso, y he recibido este artículo.',
     'inventory_report' => 'Informe de inventario',
-    'item' => 'Artículo:',
+    'item' => 'Elemento',
+    'item_checked_reminder' => 'Este es un recordatorio de que actualmente tiene :count elemento(s) asignado(s) que no ha aceptado o rechazado. Haga clic en el siguiente enlace para confirmar su decisión.',
     'license_expiring_alert' => 'Hay :count licencia que expira en los próximos :threshold días. | Hay :count licencias que expiran en los próximos :threshold días.',
-    'link_to_update_password' => 'Haz click en el siguiente link para actualizar la contraseña de tu :web:',
-    'login' => 'Iniciar Sesión:',
+    'link_to_update_password' => 'Por favor, haga clic en el siguiente enlace para actualizar su contraseña de :web :',
+    'login' => 'Iniciar sesión',
     'login_first_admin' => 'Inicie sesión en su nueva instalación de Snipe-IT usando las credenciales:',
-    'low_inventory_alert' => 'Hay :count elemento que está por debajo del inventario mínimo o que pronto estará debajo.|Hay :count elementos que están por debajo del inventario mínimo o que pronto serán bajos.',
+    'low_inventory_alert' => 'Hay :count elemento que está por debajo del inventario mínimo o que pronto lo estará.|Hay :count elementos que están por debajo del inventario mínimo o que pronto lo estarán.',
     'min_QTY' => 'Cantidad mínima',
     'name' => 'Nombre',
     'new_item_checked' => 'Un nuevo artículo ha sido asignado a su nombre, los detalles están a continuación.',
+    'new_item_checked_with_acceptance' => 'A new item has been checked out under your name that requires acceptance, details are below.',
+    'recent_item_checked' => 'An item was recently checked out under your name that requires acceptance, details are below.',
     'notes' => 'Notas',
-    'password' => 'Contraseña:',
+    'password' => 'Contraseña',
     'password_reset' => 'Restablecer Contraseña',
     'read_the_terms' => 'Por favor lea los términos de uso a continuación.',
     'read_the_terms_and_click' => 'Por favor lea los términos de uso a continuación y haga clic en el enlace en la parte inferior para confirmar que usted leyó los términos de uso y los acepta, y que ha recibido el activo.',
-    'requested' => 'Solicitado:',
-    'reset_link' => 'Tu Enlace de Reestablecimiento de Contraseña',
-    'reset_password' => 'Haz click aquí para reestablecer tu contraseña:',
+    'requested' => 'Solicitado',
+    'reset_link' => 'Su enlace de restablecimiento de contraseña',
+    'reset_password' => 'Haaga clic aquí para restablecer tu contraseña:',
     'rights_reserved' => 'Todos los derechos reservados.',
     'serial' => 'Número de serie',
     'snipe_webhook_test' => 'Prueba de integración de Snipe-IT',
     'snipe_webhook_summary' => 'Resumen de la prueba de integración de Snipe-IT',
     'supplier' => 'Proveedor',
-    'tag' => 'Etiqueta',
+    'tag' => 'Placa',
     'test_email' => 'Email de prueba de Snipe-IT',
-    'test_mail_text' => 'Esto es una prueba desde el sistema de gestión de activos de Snipe-IT. Si tienes esto, correo está funcionando :)',
+    'test_mail_text' => 'Esto es una prueba desde el sistema de gestión de activos Snipe-IT. Si recibió este mensaje, el correo está funcionando :)',
     'the_following_item' => 'El siguiente artículo ha sido devuelto: ',
-    'to_reset' => 'Para restaurar tu contraseña de :web, rellena este formulario:',
+    'to_reset' => 'Para restaurar su contraseña de :web, diligencie este formulario:',
     'type' => 'Tipo',
-    'upcoming-audits' => 'Hay :count activo que se está preparando para auditoría dentro de :threshold days.|Hay :count activos que se están preparando para auditoría en :threshold days.',
+    'upcoming-audits' => 'Hay :count activo para ser auditado antes de :threshold días.|Hay :count activos para ser auditados antes de :threshold días.',
     'user' => 'Usuario',
     'username' => 'Nombre de usuario',
+    'unaccepted_asset_reminder' => 'Reminder: You have Unaccepted Assets.',
     'welcome' => 'Bienvenido :name',
     'welcome_to' => '¡Bienvenido a :web!',
-    'your_assets' => 'Ver tus activos',
-    'your_credentials' => 'Tus credenciales de Snipe-IT',
+    'your_assets' => 'Ver sus activos',
+    'your_credentials' => 'Sus credenciales de Snipe-IT',
+    'mail_sent' => '¡Correo enviado exitosamente!.',
 ];
diff --git a/resources/lang/es-VE/passwords.php b/resources/lang/es-VE/passwords.php
index f337c2c967..75469d1121 100644
--- a/resources/lang/es-VE/passwords.php
+++ b/resources/lang/es-VE/passwords.php
@@ -3,7 +3,7 @@
 return [
     'sent'	        => 'Si existe un usuario con una dirección de correo electrónico válida en nuestro sistema, se ha enviado un correo electrónico de recuperación de contraseña.',
     'user'			=> 'Si existe un usuario con una dirección de correo electrónico válida en nuestro sistema, se ha enviado un correo electrónico de recuperación de contraseña.',
-    'token'         => 'Este token de restablecimiento de contraseña no es válido o ha caducado, o no coincide con el nombre de usuario proporcionado.',
-    'reset'         => '¡Tu contraseña ha sido restablecida!',
+    'token'         => 'Esta sesión de restablecimiento de contraseña es inválida o ha caducado, o no coincide con el nombre de usuario proporcionado.',
+    'reset'         => '¡Su contraseña ha sido restablecida!',
     'password_change'  => '¡Su contraseña ha sido actualizada!',
 ];
diff --git a/resources/lang/es-VE/reminders.php b/resources/lang/es-VE/reminders.php
index 3f68668a04..98f2819567 100644
--- a/resources/lang/es-VE/reminders.php
+++ b/resources/lang/es-VE/reminders.php
@@ -14,8 +14,8 @@ return array(
     */
 
     "password" => "Las contraseñas deben ser de seis caracteres y coincidir con la confirmación.",
-    "user"     => "El nombre de usuario o la dirección de correo son incorrectos",
-    "token"    => 'Este token de restablecimiento de contraseña no es válido o ha caducado, o no coincide con el nombre de usuario proporcionado.',
+    "user"     => "El nombre de usuario o la dirección de correo electrónico son incorrectos",
+    "token"    => 'Esta sesión de restablecimiento de contraseña es inválida o ha caducado, o no coincide con el nombre de usuario proporcionado.',
     'sent'	   => 'Si existe un usuario con una dirección de correo electrónico válida en nuestro sistema, se ha enviado un correo electrónico de recuperación de contraseña.',
 
 );
diff --git a/resources/lang/es-VE/table.php b/resources/lang/es-VE/table.php
index f827af5873..dea24233f7 100644
--- a/resources/lang/es-VE/table.php
+++ b/resources/lang/es-VE/table.php
@@ -5,7 +5,7 @@ return array(
     'actions'	 	        => 'Acciones',
     'action' 		        => 'Acción',
     'by'      		        => 'Por',
-    'item' 			        => 'Artículo',
+    'item' 			        => 'Elemento',
     'no_matching_records'   => 'No se encontraron registros que coincidan',
 
 );
diff --git a/resources/lang/es-VE/validation.php b/resources/lang/es-VE/validation.php
index b89fa03e2d..750ba096a2 100644
--- a/resources/lang/es-VE/validation.php
+++ b/resources/lang/es-VE/validation.php
@@ -13,88 +13,151 @@ return [
     |
     */
 
-    'accepted'             => 'El: atributo debe ser aceptado.',
-    'active_url'           => 'El :atributo no es una URL correcta.',
-    'after'                => 'El :attribute debe ser posterior a :date.',
-    'after_or_equal'       => 'El :attribute debe ser una fecha posterior o igual a :date.',
-    'alpha'                => 'El :attribute sólo debe contener letras.',
-    'alpha_dash'           => 'El :attribute debe sólo aceptar letras, números y guiones.',
-    'alpha_num'            => 'El :attribute debe sólo acepta letras y números.',
-    'array'                => 'El :attribute debe ser una matriz.',
-    'before'               => 'El :attribute sólo debe ser anterior a :date.',
-    'before_or_equal'      => 'El :attribute debe ser una fecha anterior o igual a :date.',
-    'between'              => [
-        'numeric' => 'El :attribute debe estar entre :min - :max.',
-        'file'    => 'El :attribute debe estar entre :min - :max kilobytes.',
-        'string'  => 'El :attribute debe estar entre :min - :max caracteres.',
-        'array'   => 'El atributo: debe tener entre :min y :max elementos.',
+    'accepted' => 'El campo :attribute debe ser aceptado.',
+    'accepted_if' => 'El campo :attribute debe ser aceptado cuando :other es :value.',
+    'active_url' => 'El campo :attribute debe ser una dirección URL válida.',
+    'after' => 'El campo :attribute debe ser una fecha posterior a :date.',
+    'after_or_equal' => 'El campo :attribute debe ser una fecha posterior o igual a :date.',
+    'alpha' => 'El campo :attribute debe contener únicamente letras.',
+    'alpha_dash' => 'El campo :attribute debe contener únicamente letras, números, guiones y guiones bajos.',
+    'alpha_num' => 'El campo :attribute debe contener únicamente letras y números.',
+    'array' => 'El campo :attribute debe ser un arreglo.',
+    'ascii' => 'El campo :attribute debe contener únicamente caracteres y símbolos alfanuméricos de un byte.',
+    'before' => 'El campo :attribute debe ser una fecha anterior a :date.',
+    'before_or_equal' => 'El campo :attribute debe ser una fecha anterior o igual a :date.',
+    'between' => [
+        'array' => 'El campo :attribute debe tener elementos entre :min y :max.',
+        'file' => 'El campo :attribute debe tener entre :min y :max kilobytes.',
+        'numeric' => 'El campo :attribute debe estar entre :min y :max.',
+        'string' => 'El campo :attribute debe tener entre :min y :max caracteres.',
     ],
-    'boolean'              => 'El :attribute debe ser verdadero o falso.',
-    'confirmed'            => 'La :attribute confirmación no coincide.',
-    'date'                 => 'El :attribute no es una fecha correcta.',
-    'date_format'          => 'El :attribute no cumple el formato :format.',
-    'different'            => 'Los :attribute y :other deben ser diferentes.',
-    'digits'               => 'El :attribute debe tener :digits digitos.',
-    'digits_between'       => 'El :attribute debe tener entre :min y :max dígitos.',
-    'dimensions'           => 'El :attribute tiene dimensiones de imagen no válidas.',
-    'distinct'             => 'El campo :attribute tiene un valor duplicado.',
-    'email'                => 'El formato :attribute es inválido.',
-    'exists'               => 'El :attribute seleccionado es inválido.',
-    'file'                 => 'Estte :attribute debe ser un archivo.',
-    'filled'               => 'El campo :attribute debe tener un valor.',
-    'image'                => 'El :attribute debe ser una imagen.',
+    'boolean' => 'El campo :attribute debe ser verdadero o falso.',
+    'can' => 'El campo :attribute contiene un valor no autorizado.',
+    'confirmed' => 'La confirmación del campo :attribute no coincide.',
+    'contains' => 'Falta un valor obligatorio en el campo :attribute.',
+    'current_password' => 'La contraseña es incorrecta.',
+    'date' => 'El campo :attribute debe contener una fecha válida.',
+    'date_equals' => 'El campo :attribute debe ser una fecha igual a :date.',
+    'date_format' => 'El campo :attribute debe coincidir con el formato :format.',
+    'decimal' => 'El campo :attribute debe tener :decimal lugares decimales.',
+    'declined' => 'El campo :attribute debe ser rechazado.',
+    'declined_if' => 'El campo :attribute debe ser rechazado cuando :other es :value.',
+    'different' => 'Los campos :attribute y :other deben ser diferentes.',
+    'digits' => 'El campo :attribute debe tener :digits dígitos.',
+    'digits_between' => 'El campo :attribute debe tener entre :min y :max dígitos.',
+    'dimensions' => 'El campo :attribute tiene dimensiones de imagen no válidas.',
+    'distinct' => 'El campo :attribute tiene un valor duplicado.',
+    'doesnt_end_with' => 'El campo :attribute no debe finalizar con uno de los siguientes :values.',
+    'doesnt_start_with' => 'El campo :attribute no debe iniciar con uno de los siguientes :values.',
+    'email' => 'El campo :attribute debe ser una dirección de correo válida.',
+    'ends_with' => 'El campo :attribute debe finalizar con uno de los siguientes :values.',
+    'enum' => 'El :attribute seleccionado no es correcto.',
+    'exists' => 'El :attribute seleccionado no es correcto.',
+    'extensions' => 'El campo :attribute debe tener una de las siguientes extensiones :values.',
+    'file' => 'El campo :attribute debe ser un archivo.',
+    'filled' => 'El campo :attribute debe tener un valor.',
+    'gt' => [
+        'array' => 'El campo :attribute debe tener más de :value elementos.',
+        'file' => 'El campo :attribute debe ser mayor que :value kilobytes.',
+        'numeric' => 'El campo :attribute debe ser mayor que :value.',
+        'string' => 'El campo :attribute debe ser mayor que :value caracteres.',
+    ],
+    'gte' => [
+        'array' => 'El campo :attribute debe tener :value elementos o más.',
+        'file' => 'El campo :attribute debe ser mayor que o igual a :value kilobytes.',
+        'numeric' => 'El campo :attribute debe ser mayor que o igual a :value.',
+        'string' => 'El campo :attribute debe ser mayor que o igual a :value caracteres.',
+    ],
+    'hex_color' => 'El campo :attribute debe ser un color hexadecimal válido.',
+    'image' => 'El campo :attribute debe ser una imagen.',
     'import_field_empty'    => 'El valor para :fieldname no puede ser nulo.',
-    'in'                   => 'El :attribute seleccionado es inválido.',
-    'in_array'             => 'El :attribute no existe en :other.',
-    'integer'              => 'El :attribute debe ser un número entero.',
-    'ip'                   => 'El :attribute debe ser una dirección IP correcta.',
-    'ipv4'                 => 'El :atrribute debe ser una dirección IPv4 válida.',
-    'ipv6'                 => 'El :atrribute debe ser una dirección IPv6 válida.',
-    'is_unique_department' => 'El atributo :attribute debe ser único para esta ubicación de la compañía',
-    'json'                 => 'El :atrribute debe ser una dirección IPv4 válida.',
-    'max'                  => [
-        'numeric' => 'El :attribute no debe ser mayor que :max kilobytes.',
-        'file'    => 'El :attribute no debe tener como máximo :max caracteres.',
-        'string'  => 'El :attribute no debe tener más de :max caracteres.',
-        'array'   => 'El :attribute no debe tener más de :max caracteres.',
+    'in' => 'El :attribute seleccionado es inválido.',
+    'in_array' => 'El campo :attribute debe existir en :other.',
+    'integer' => 'El campo :attribute debe ser un valor entero.',
+    'ip' => 'El campo :attribute debe ser una dirección IP válida.',
+    'ipv4' => 'El campo :attribute debe ser una dirección IPv4 válida.',
+    'ipv6' => 'El campo :attribute debe ser una dirección IPv6 válida.',
+    'json' => 'El campo :attribute debe ser una cadena de texto JSON válida.',
+    'list' => 'The campo :attribute debe ser una lista.',
+    'lowercase' => 'El campo :attribute debe estar en minúsculas.',
+    'lt' => [
+        'array' => 'El campo :attribute debe tener menos que :value elementos.',
+        'file' => 'El campo :attribute debe ser menor que :value kilobytes.',
+        'numeric' => 'El campo :attribute debe ser menor que :value.',
+        'string' => 'El campo :attribute debe ser menor que :value caracteres.',
     ],
-    'mimes'                => 'El :attribute debe ser un archivo del tipo: :values.',
-    'mimetypes'            => 'El :attribute debe ser un archivo del tipo: :values.',
-    'min'                  => [
-        'numeric' => 'El :attribute debe ser como mínimo :min.',
-        'file'    => 'El :attribute debe ser como mínimo de :min kilobytes.',
-        'string'  => 'El :attribute debe ser como mínimo de :min kilobytes.',
-        'array'   => 'El :attribute debe ser como mínimo de :min kilobytes.',
+    'lte' => [
+        'array' => 'El campo :attribute no debe tener más de :value elementos.',
+        'file' => 'El campo :attribute debe ser menor que o igual a :value kylobytes.',
+        'numeric' => 'El campo :attribute debe ser menor que o igual a :value.',
+        'string' => 'El campo :attribute debe ser menor que o igual a :value caracteres.',
     ],
-    'starts_with'          => 'El :attribute debe comenzar con uno de los siguientes: :values.',
-    'ends_with'            => 'El campo :attribute debe terminar con uno de los siguientes: :values.',
+    'mac_address' => 'El campo :attribute debe ser una dirección MAC válida.',
+    'max' => [
+        'array' => 'El campo :attribute no debe tener más de :max elementos.',
+        'file' => 'El campo :attribute no debe ser mayor que :max kilobytes.',
+        'numeric' => 'El campo :attribute no debe ser mayor que :max.',
+        'string' => 'El campo :attribute no debe ser mayor que :max caracteres.',
+    ],
+    'max_digits' => 'El campo :attribute no debe tener más de :max dígitos.',
+    'mimes' => 'El campo :attribute debe un archivo de tipo: :values.',
+    'mimetypes' => 'El campo :attribute debe un archivo de tipo: :values.',
+    'min' => [
+        'array' => 'El campo :attribute debe tener al menos :min elementos.',
+        'file' => 'El campo :attribute debe ser de al menos :min kilobytes.',
+        'numeric' => 'El campo :attribute debe ser al menos :min.',
+        'string' => 'El campo :attribute debe contener como mínimo :min caracteres.',
+    ],
+    'min_digits' => 'El campo :attribute debe contener como mínimo :min dígitos.',
+    'missing' => 'El campo :attribute debe estar vacío.',
+    'missing_if' => 'El campo :attribute debe estar vacío cuando :other sea :value.',
+    'missing_unless' => 'El campo :attribute debe estar vacío a menos que :other sea :value.',
+    'missing_with' => 'El campo :attribute debe estar vacío cuando :values esté presente.',
+    'missing_with_all' => 'El campo :attribute debe estar vacío cuando :values estén presentes.',
+    'multiple_of' => 'El campo :attribute debe ser un múltiplo de :value.',
+    'not_in' => 'El :attribute seleccionado es inválido.',
+    'not_regex' => 'El campo :attribute no es válido.',
+    'numeric' => 'El campo :attribute debe ser un número.',
+    'password' => [
+        'letters' => 'El cammpo :attribute debe contener al menos una letra.',
+        'mixed' => 'El campo :attribute debe contener al menos una letra minúscula y una mayúscula.',
+        'numbers' => 'El campo :attribute debe contener al menos un número.',
+        'symbols' => 'El campo :attribute debe contener al menos un símbolo.',
+        'uncompromised' => 'El valor de :attribute ha aparecido en una fuga de datos. Por favor, seleccione un valor diferente para :attribute.',
+    ],
+    'percent'       => 'El mínimo de amortización debe estar entre 0 y 100 cuando el tipo de amortización es porcentual.',
 
-    'not_in'               => 'El :attribute seleccionado es inválido.',
-    'numeric'              => 'El :attribute debe ser un número entero.',
-    'present'              => 'El campo :attribute debe tener un valor.',
-    'valid_regex'          => 'Este no es un regex válido. ',
-    'regex'                => 'El formato :attribute es inválido.',
-    'required'             => 'El campo :attribute es obligatorio.',
-    'required_if'          => 'El campo :attribute es obligatorio cuando :other es :value.',
-    'required_unless'      => 'El campo :attribute es obligatorio a menos que :other esté en :values.',
-    'required_with'        => 'El :attribute es obligatrio cuando :values está presente.',
-    'required_with_all'    => 'El campo :attribute es obligatrio cuando :values está presente.',
-    'required_without'     => 'El :attribute es obligatrio cuando :values está presente.',
-    'required_without_all' => 'El campo :attribute es obligatrio cuando :values es present.',
-    'same'                 => 'Los :attribute y :other deben ser diferentes.',
-    'size'                 => [
-        'numeric' => 'Estte :attribute debe ser :size.',
-        'file'    => 'El :attribute debe tener :size kilobytes.',
-        'string'  => 'El :attribute debe tener :size kilobytes.',
-        'array'   => 'El :attribute debe contener :size elementos.',
+    'present' => 'El campo :attribute debe tener un valor.',
+    'present_if' => 'El campo :attribute debe estar presente cuando :other sea :value.',
+    'present_unless' => 'El campo :attribute debe estar presente a menos que :other sea :value.',
+    'present_with' => 'El campo :attribute debe estar presente cuando :values esté presente.',
+    'present_with_all' => 'El campo :attribute debe estar presente cuando :values estén presentes.',
+    'prohibited' => 'El campo :attribute está prohibido.',
+    'prohibited_if' => 'El campo :attribute está prohibido cuando :other sea :value.',
+    'prohibited_unless' => 'El campo :attribute está prohibido a menos que :other esté en :values.',
+    'prohibits' => 'El campo :attribute prohíbe la presencia de :other.',
+    'regex' => 'El formato del campo :attribute no es válido.',
+    'required' => 'El campo :attribute es obligatorio.',
+    'required_array_keys' => 'El campo :attribute debe contener valores para: :values.',
+    'required_if' => 'El campo :attribute es obligatorio cuando :other es :value.',
+    'required_if_accepted' => 'El campo :attribute es obligatorio cuando se acepta :other.',
+    'required_if_declined' => 'El campo :attribute es requerido cuando :other es rechazado.',
+    'required_unless' => 'El campo :attribute es obligatorio a menos que :other esté en :values.',
+    'required_with' => 'El campo :attribute es obligatorio cuando :values está presente.',
+    'required_with_all' => 'El campo :attribute es requerido cuando :values están presentes.',
+    'required_without' => 'El :attribute es obligatrio cuando :values está presente.',
+    'required_without_all' => 'El campo :attribute es obligatorio cuando no está presente ninguno de los :values.',
+    'same' => 'El campo :attribute debe coincidir con :other.',
+    'size' => [
+        'array' => 'El campo :attribute debe contenter :size elementos.',
+        'file' => 'El campo :attribute debe ser de :size kilobytes.',
+        'numeric' => 'El campo :attribute debe ser :size.',
+        'string' => 'El campo :attribute debe ser de :size caracteres.',
     ],
+    'starts_with' => 'El campo :attribute debe iniciar con uno de los siguientes: :values.',
     'string'               => 'Este :attribute debe ser una cadena.',
-    'timezone'             => 'El :attribute debe ser una zona válida.',
-    'two_column_unique_undeleted' => ':attribute debe ser único a través de :table1 y :table2. ',
-    'unique'               => 'El :attribute ya está en uso.',
-    'uploaded'             => 'El :attribute fallo al cargar.',
-    'url'                  => 'El formato :attribute es inválido.',
-    'unique_undeleted'     => 'El :atrribute debe ser único.',
+    'two_column_unique_undeleted' => ':attribute debe ser único entre la :table1 y :table2. ',
+    'unique_undeleted'     => ':attribute debe ser único.',
     'non_circular'         => ':attribute no debe crear una referencia circular.',
     'not_array'            => ':attribute no puede ser una matriz.',
     'disallow_same_pwd_as_user_fields' => 'La contraseña no puede ser la misma que el nombre de usuario.',
@@ -102,11 +165,14 @@ return [
     'numbers'              => 'La contraseña debe contener al menos un número.',
     'case_diff'            => 'La contraseña debe usar mayúsculas y minúsculas.',
     'symbols'              => 'La contraseña debe contener símbolos.',
-    'gte'                  => [
-        'numeric'          => 'El valor no puede ser negativo'
-    ],
-    'checkboxes'           => ':attribute contiene opciones no válidas.',
-    'radio_buttons'        => ':attribute no es válido.',
+    'timezone' => 'El campo :attribute debe ser una zona horaria válida.',
+    'unique' => ':attribute ya está en uso.',
+    'uploaded' => ':attribute no se pudo cargar.',
+    'uppercase' => 'El campo :attribute debe estar en mayúsculas.',
+    'url' => 'El campo :attribute debe ser una URL válida.',
+    'ulid' => 'El campo :attribute debe ser un ULID válido.',
+    'uuid' => 'El campo :attribute debe ser un UUID válido.',
+    'fmcs_location' => 'Full multiple company support and location scoping is enabled in the Admin Settings, and the selected location and selected company are not compatible.',
 
 
     /*
@@ -120,26 +186,38 @@ return [
     |
     */
 
+    'email_array'      => 'Una o más direcciones de correo electrónico no son válidas.',
+    'checkboxes'           => ':attribute contiene opciones no válidas.',
+    'radio_buttons'        => ':attribute no es válido.',
+    
     'custom' => [
-        'alpha_space' => 'El campo :attribute contiene un caracter que no está permitido.',
-        'email_array'      => 'Una o más direcciones de correo electrónico no son válidas.',
-        'hashed_pass'      => 'Tu contraseña actual es incorrecta',
+        'alpha_space' => 'El campo :attribute contiene un carácter que no está permitido.',
+
+        'hashed_pass'      => 'Su contraseña actual es incorrecta',
         'dumbpwd'          => 'Esa contraseña es muy común.',
         'statuslabel_type' => 'Debe seleccionar un tipo de etiqueta de estado válido',
+        'custom_field_not_found'          => 'Este campo parece que no existe, por favor, compruebe los nombres de sus campos personalizados.',
+        'custom_field_not_found_on_model' => 'Este campo parece existir, pero no está disponible en este conjunto de campos para el modelo de activo.',
 
         // date_format validation with slightly less stupid messages. It duplicates a lot, but it gets the job done :(
-        // We use this because the default error message for date_format is reflects php Y-m-d, which non-PHP
-        // people won't know how to format. 
-        'purchase_date.date_format'     => ':attribute debe ser una fecha válida en formato AAA-MM-DD',
-        'last_audit_date.date_format'   =>  'El campo :attribute debe ser una fecha válida en formato AAA-MM-DD hh:mm:ss',
-        'expiration_date.date_format'   =>  ':attribute debe ser una fecha válida en formato AAA-MM-DD',
-        'termination_date.date_format'  =>  ':attribute debe ser una fecha válida en formato AAA-MM-DD',
-        'expected_checkin.date_format'  =>  ':attribute debe ser una fecha válida en formato AAA-MM-DD',
-        'start_date.date_format'        =>  ':attribute debe ser una fecha válida en formato AAA-MM-DD',
-        'end_date.date_format'          =>  ':attribute debe ser una fecha válida en formato AAA-MM-DD',
+        // We use this because the default error message for date_format reflects php Y-m-d, which non-PHP
+        // people won't know how to format.
+        'purchase_date.date_format'     => ':attribute debe ser una fecha válida en formato AAAA-MM-DD',
+        'last_audit_date.date_format'   =>  'El campo :attribute debe ser una fecha válida en formato AAAA-MM-DD hh:mm:ss',
+        'expiration_date.date_format'   =>  ':attribute debe ser una fecha válida en formato AAAA-MM-DD',
+        'termination_date.date_format'  =>  ':attribute debe ser una fecha válida en formato AAAA-MM-DD',
+        'expected_checkin.date_format'  =>  ':attribute debe ser una fecha válida en formato AAAA-MM-DD',
+        'start_date.date_format'        =>  ':attribute debe ser una fecha válida en formato AAAA-MM-DD',
+        'end_date.date_format'          =>  ':attribute debe ser una fecha válida en formato AAAA-MM-DD',
+        'invalid_value_in_field' => 'Valor no válido incluido en este campo',
 
-    ],
+        'ldap_username_field' => [
+            'not_in' =>         '<code>sAMAccountName</code> (mezcla de mayúsculas y minúsculas) no funcionará. Debe utilizar <code>samaccountname</code> (minúsculas) en su lugar.'
+        ],
+        'ldap_auth_filter_query' => ['not_in' => '<code>uid=samaccountname</code> probablemente no es un filtro de autenticación válido Probablemente quiera <code>uid=</code> '],
+        'ldap_filter' => ['regex' => 'Este valor probablemente no debería ir entre paréntesis.'],
 
+        ],
     /*
     |--------------------------------------------------------------------------
     | Custom Validation Attributes
@@ -155,8 +233,16 @@ return [
 
     /*
     |--------------------------------------------------------------------------
-    | Generic Validation Messages
+    | Generic Validation Messages - we use these in the jquery validation where we don't have
+    | access to the :attribute
     |--------------------------------------------------------------------------
     */
-    'invalid_value_in_field' => 'Valor no válido incluido en este campo',
+
+    'generic' => [
+        'invalid_value_in_field' => 'Valor no válido incluido en este campo',
+        'required' => 'El campo es obligatorio',
+        'email' => 'Por favor, ingrese una dirección de correo electrónico válida.',
+    ],
+
+
 ];
diff --git a/resources/lang/et-EE/account/general.php b/resources/lang/et-EE/account/general.php
index 1a9e2c03b8..711e40d0bf 100644
--- a/resources/lang/et-EE/account/general.php
+++ b/resources/lang/et-EE/account/general.php
@@ -2,10 +2,16 @@
 
 return array(
     'personal_api_keys' => 'Personal API Keys',
-    'api_key_warning' => 'When generating an API token, be sure to copy it down immediately as they will not be visible to you again.',
+    'personal_access_token' => 'Personal Access Token',
+    'personal_api_keys_success' => 'Personal API Key :key created sucessfully',
+    'here_is_api_key' => 'Siin on teie uus isiklik juurdepääsutoken. See on ainus kord, kui see kuvatakse, nii et ärge kaotage seda! Nüüd saate seda tokenit kasutada API päringute tegemiseks.',
+    'api_key_warning' => 'API tokenit genereerides veenduge, et kopeerite selle kohe, kuna see ei ole teile enam pärast nähtav.',
     'api_base_url' => 'Your API base url is located at:',
     'api_base_url_endpoint' => '/&lt;endpoint&gt;',
     'api_token_expiration_time' => 'API tokens are set to expire in:',
     'api_reference' => 'Please check the <a href="https://snipe-it.readme.io/reference" target="_blank">API reference</a> to find specific API endpoints and additional API documentation.',
     'profile_updated' => 'Account successfully updated',
+    'no_tokens' => 'You have not created any personal access tokens.',
+    'enable_sounds' => 'Enable sound effects',
+    'enable_confetti' => 'Enable confetti effects',
 );
diff --git a/resources/lang/et-EE/admin/accessories/message.php b/resources/lang/et-EE/admin/accessories/message.php
index 9c9f5283ef..27bbbba9e6 100644
--- a/resources/lang/et-EE/admin/accessories/message.php
+++ b/resources/lang/et-EE/admin/accessories/message.php
@@ -26,7 +26,11 @@ return array(
         'error'   		=> 'Lisatarvikut ei kontrollitud, palun proovige uuesti',
         'success' 		=> 'Lisaseade edukalt kontrollitud.',
         'unavailable'   => 'Tarvik ei ole väljastamiseks saadaval. Kontrolli laoseisu',
-        'user_does_not_exist' => 'See kasutaja on kehtetu. Palun proovi uuesti.'
+        'user_does_not_exist' => 'See kasutaja on kehtetu. Palun proovi uuesti.',
+         'checkout_qty' => array(
+            'lte'  => 'Praegu on saadaval ainult üks seda tüüpi lisaseade ja te üritate väljastada :checkout_qty. Palun kohandage väljastatavate lisaseadmete kogust või selle lisaseadme koguarvu ja proovige uuesti.Saadaval on :number_currently_remaining lisaseadet ja te üritate väljastada :checkout_qty. Palun kohandage väljastavate lisaseadmete kogust või selle lisaseadme koguarvu ja proovige uuesti.',
+            ),
+           
     ),
 
     'checkin' => array(
diff --git a/resources/lang/et-EE/admin/accessories/table.php b/resources/lang/et-EE/admin/accessories/table.php
index 7b64c8f2cb..c7f9f8553c 100644
--- a/resources/lang/et-EE/admin/accessories/table.php
+++ b/resources/lang/et-EE/admin/accessories/table.php
@@ -6,6 +6,4 @@ return array(
     'id'      					=> 'ID',
     'require_acceptance'      	=> 'Vastuvõtmine',
     'title'      				=> 'Lisaseade Nimi',
-
-
 );
diff --git a/resources/lang/et-EE/admin/components/message.php b/resources/lang/et-EE/admin/components/message.php
index bd5d9c316a..70df894995 100644
--- a/resources/lang/et-EE/admin/components/message.php
+++ b/resources/lang/et-EE/admin/components/message.php
@@ -17,7 +17,8 @@ return array(
     'delete' => array(
         'confirm'   => 'Kas oled kindel, et soovid selle komponendi kustutada?',
         'error'   => 'Komponendi kustutamisel tekkis probleem. Palun proovi uuesti.',
-        'success' => 'Komponendi kustutamine õnnestus.'
+        'success' => 'Komponendi kustutamine õnnestus.',
+        'error_qty'   => 'Some components of this type are still checked out. Please check them in and try again.',
     ),
 
      'checkout' => array(
diff --git a/resources/lang/et-EE/admin/consumables/general.php b/resources/lang/et-EE/admin/consumables/general.php
index b6009300bd..0662b347b1 100644
--- a/resources/lang/et-EE/admin/consumables/general.php
+++ b/resources/lang/et-EE/admin/consumables/general.php
@@ -8,4 +8,5 @@ return array(
     'remaining' 			            => 'Alles',
     'total' 			                => 'Kokku',
     'update'                            => 'Muuda kuluvahendit',
+    'inventory_warning'                 => 'The inventory of this consumable is below the minimum amount of :min_count',
 );
diff --git a/resources/lang/et-EE/admin/consumables/message.php b/resources/lang/et-EE/admin/consumables/message.php
index 811629f99b..6e669ddc97 100644
--- a/resources/lang/et-EE/admin/consumables/message.php
+++ b/resources/lang/et-EE/admin/consumables/message.php
@@ -2,6 +2,7 @@
 
 return array(
 
+    'invalid_category_type' => 'The category must be a consumable category.',
     'does_not_exist' => 'Kuluvahendit pole olemas.',
 
     'create' => array(
diff --git a/resources/lang/et-EE/admin/custom_fields/general.php b/resources/lang/et-EE/admin/custom_fields/general.php
index 1055aef191..ca8782ec73 100644
--- a/resources/lang/et-EE/admin/custom_fields/general.php
+++ b/resources/lang/et-EE/admin/custom_fields/general.php
@@ -35,7 +35,7 @@ return [
     'create_field_title' => 'Create a new custom field',
     'value_encrypted'      	        => 'Selle välja väärtust krüpteeritakse andmebaasis. Dežrooveeritud väärtust saab vaadata ainult administraatoritel',
     'show_in_email'     => 'Kas lisame selle välja väärtuse kasutajale väljastatud emailile? Krüpteerituid välju emailis pole näha',
-    'show_in_email_short'     => 'Include in emails.',
+    'show_in_email_short' => 'Include in emails',
     'help_text' => 'Help Text',
     'help_text_description' => 'This is optional text that will appear below the form elements while editing an asset to provide context on the field.',
     'about_custom_fields_title' => 'About Custom Fields',
@@ -57,5 +57,8 @@ return [
     'show_in_requestable_list_short' => 'Show in requestable assets list',
     'show_in_requestable_list' => 'Show value in requestable assets list. Encrypted fields will not be shown',
     'encrypted_options' => 'This field is encrypted, so some display options will not be available.',
+    'display_checkin' => 'Display in checkin forms',
+    'display_checkout' => 'Display in checkout forms',
+    'display_audit' => 'Display in audit forms',
 
 ];
diff --git a/resources/lang/et-EE/admin/custom_fields/message.php b/resources/lang/et-EE/admin/custom_fields/message.php
index 642610422b..ad9626f3c5 100644
--- a/resources/lang/et-EE/admin/custom_fields/message.php
+++ b/resources/lang/et-EE/admin/custom_fields/message.php
@@ -5,6 +5,7 @@ return array(
     'field' => array(
         'invalid'   => 'Seda välja ei eksisteeri.',
         'already_added'   => 'Väli on juba lisatud',
+        'none_selected'   => 'No field selected',
 
         'create' => array(
             'error'   => 'Väli ei loodud, proovige uuesti.',
diff --git a/resources/lang/et-EE/admin/depreciations/general.php b/resources/lang/et-EE/admin/depreciations/general.php
index 965667a23d..a6506f733b 100644
--- a/resources/lang/et-EE/admin/depreciations/general.php
+++ b/resources/lang/et-EE/admin/depreciations/general.php
@@ -13,4 +13,8 @@ return [
     'no_depreciations_warning'               => '<strong>Warning: </strong>
                       You do not currently have any depreciations set up.
                       Please set up at least one depreciation to view the depreciation report.',
+    'depreciation_method'                   => 'Amortisatsiooniaruanne',
+    'linear_depreciation'                   => 'Linear (Default)',
+    'half_1'                                => 'Half-year convention, always applied',
+    'half_2'                                => 'Half-year convention, applied with condition',
 ];
diff --git a/resources/lang/et-EE/admin/hardware/form.php b/resources/lang/et-EE/admin/hardware/form.php
index e3c9053f6e..7c4debc235 100644
--- a/resources/lang/et-EE/admin/hardware/form.php
+++ b/resources/lang/et-EE/admin/hardware/form.php
@@ -55,8 +55,11 @@ return [
     'asset_location_update_default' => 'Uuenda ainult vaikimisi asukohta',
     'asset_location_update_actual' => 'Update only actual location',
     'asset_not_deployable' => 'Selle vahendi olek ei luba seda väljastada.',
-    'asset_deployable' => 'Selle vahendi olek lubab seda väljastada.',
+    'asset_not_deployable_checkin' => 'That asset status is not deployable. Using this status label will checkin the asset.',
+    'asset_deployable' => 'This asset can be checked out.',
     'processing_spinner' => 'Processing... (This might take a bit of time on large files)',
+    'processing' => 'Töötlemine... ',
     'optional_infos'  => 'Valikuline teave',
-    'order_details'   => 'Tellimusega seonduv teave'
+    'order_details'   => 'Tellimusega seonduv teave',
+    'calc_eol'    => 'If nulling the EOL date, use automatic EOL calculation based on the purchase date and EOL rate.',
 ];
diff --git a/resources/lang/et-EE/admin/hardware/general.php b/resources/lang/et-EE/admin/hardware/general.php
index 48611ce6b1..177604e68d 100644
--- a/resources/lang/et-EE/admin/hardware/general.php
+++ b/resources/lang/et-EE/admin/hardware/general.php
@@ -5,8 +5,8 @@ return [
     'about_assets_text'            => 'Varad on üksused, mida jälgitakse seerianumbri või vara tag. Need kipuvad olema kõrgema väärtusega esemed, kus konkreetse üksuse kindlakstegemine on oluline.',
     'archived'  				=> 'Arhiveeritud',
     'asset'  					=> 'Vahend',
-    'bulk_checkout'             => 'Vara kasutusele võtt',
-    'bulk_checkin'              => 'Vahendite tagastus',
+    'bulk_checkout'             => 'Bulk Checkout',
+    'bulk_checkin'              => 'Bulk Checkin',
     'checkin'  					=> 'Checkin Asset',
     'checkout'  				=> 'Checkout Asset',
     'clone'  					=> 'Klooni vahend',
@@ -27,8 +27,7 @@ return [
     'undeployable_tooltip'  	=> 'This asset has a status label that is undeployable and cannot be checked out at this time.',
     'view'  					=> 'Vaata vahendit',
     'csv_error' => 'Sul on viga CSV failis:',
-    'import_text' => '<p>Upload a CSV that contains asset history. The assets and users MUST already exist in the system, or they will be skipped. Matching assets for history import happens against the asset tag. We will try to find a matching user based on the user\'s name you provide, and the criteria you select below. If you do not select any criteria below, it will simply try to match on the username format you configured in the <code>Admin &gt; General Settings</code>.</p><p>Fields included in the CSV must match the headers: <strong>Asset Tag, Name, Checkout Date, Checkin Date</strong>. Any additional fields will be ignored. </p><p>Checkin Date: blank or future checkin dates will checkout items to associated user.  Excluding the Checkin Date column will create a checkin date with todays date.</p>
-    ',
+    'import_text' => '<p>Upload a CSV that contains asset history. The assets and users MUST already exist in the system, or they will be skipped. Matching assets for history import happens against the asset tag. We will try to find a matching user based on the user\'s name you provide, and the criteria you select below. If you do not select any criteria below, it will simply try to match on the username format you configured in the <code>Admin &gt; General Settings</code>.</p><p>Fields included in the CSV must match the headers: <strong>Asset Tag, Name, Checkout Date, Checkin Date</strong>. Any additional fields will be ignored. </p><p>Checkin Date: blank or future checkin dates will checkout items to associated user.  Excluding the Checkin Date column will create a checkin date with todays date.</p>    ',
     'csv_import_match_f-l' => 'Try to match users by <strong>firstname.lastname</strong> (<code>jane.smith</code>) format',
     'csv_import_match_initial_last' => 'Try to match users by <strong>first initial last name</strong> (<code>jsmith</code>) format',
     'csv_import_match_first' => 'Try to match users by <strong>first name</strong> (<code>jane</code>) format',
diff --git a/resources/lang/et-EE/admin/hardware/message.php b/resources/lang/et-EE/admin/hardware/message.php
index bb87c17b29..6e556c7a8b 100644
--- a/resources/lang/et-EE/admin/hardware/message.php
+++ b/resources/lang/et-EE/admin/hardware/message.php
@@ -2,18 +2,23 @@
 
 return [
 
-    'undeployable' 		=> '<strong>Hoiatus: </strong> See vahend on märgitud kui kasutuselevõtmatu. Kui see olek on muutunud, palun värskendage vahendi olekut.',
-    'does_not_exist' 	=> 'Vahend puudub.',
-    'does_not_exist_var'=> 'Asset with tag :asset_tag not found.',
-    'no_tag' 	        => 'No asset tag provided.',
+    'undeployable' 		 => '<strong>Warning: </strong> This asset has been marked as currently undeployable. If this status has changed, please update the asset status.',
+    'does_not_exist' 	 => 'Vahend puudub.',
+    'does_not_exist_var' => 'Asset with tag :asset_tag not found.',
+    'no_tag' 	         => 'No asset tag provided.',
     'does_not_exist_or_not_requestable' => 'Seda vahendit ei eksisteeri või see ei ole taotletav.',
-    'assoc_users'	 	=> 'Seda vara kontrollitakse kasutajale praegu ja seda ei saa kustutada. Esmalt kontrollige varast ja proovige seejärel uuesti kustutada.',
+    'assoc_users'	 	 => 'Seda vara kontrollitakse kasutajale praegu ja seda ei saa kustutada. Esmalt kontrollige varast ja proovige seejärel uuesti kustutada.',
     'warning_audit_date_mismatch' 	=> 'This asset\'s next audit date (:next_audit_date) is before the last audit date (:last_audit_date). Please update the next audit date.',
+    'labels_generated'   => 'Labels were successfully generated.',
+    'error_generating_labels' => 'Error while generating labels.',
+    'no_assets_selected' => 'No assets selected.',
 
     'create' => [
         'error'   		=> 'Vahendit ei loodud, palun proovi uuesti. :(',
         'success' 		=> 'Vahendi loomine õnnestus. :)',
         'success_linked' => 'Asset with tag :tag was created successfully. <strong><a href=":link" style="color: white;">Click here to view</a></strong>.',
+        'multi_success_linked' => 'Asset with tag :links was created successfully.|:count assets were created succesfully. :links.',
+        'partial_failure' => 'An asset was unable to be created. Reason: :failures|:count assets were unable to be created. Reasons: :failures',
     ],
 
     'update' => [
@@ -51,20 +56,24 @@ return [
     ],
 
     'import' => [
+        'import_button'         => 'Process Import',
         'error'                 => 'Mõned üksused ei impordinud õigesti.',
         'errorDetail'           => 'Järgmisi punkte ei imporditud vigade tõttu.',
         'success'               => 'Teie fail on imporditud',
         'file_delete_success'   => 'Teie fail on edukalt kustutatud',
         'file_delete_error'      => 'Faili ei saanud kustutada',
         'file_missing' => 'The file selected is missing',
+        'file_already_deleted' => 'The file selected was already deleted',
         'header_row_has_malformed_characters' => 'One or more attributes in the header row contain malformed UTF-8 characters',
         'content_row_has_malformed_characters' => 'One or more attributes in the first row of content contain malformed UTF-8 characters',
+        'transliterate_failure' => 'Transliteration from :encoding to UTF-8 failed due to invalid characters in input'
     ],
 
 
     'delete' => [
         'confirm'   	=> 'Kas olete kindel, et soovite selle vara kustutada?',
         'error'   		=> 'Viga kustutas. Palun proovi uuesti.',
+        'assigned_to_error' => '{1}Asset Tag: :asset_tag is currently checked out. Check in this device before deletion.|[2,*]Asset Tags: :asset_tag are currently checked out. Check in these devices before deletion.',
         'nothing_updated'   => 'Varasid ei valitud, nii et midagi ei kustutatud.',
         'success' 		=> 'Varasus kustutati edukalt.',
     ],
@@ -77,6 +86,11 @@ return [
         'no_assets_selected' => 'Sa pead valima vähemalt ühe kirje nimekirjast',
     ],
 
+    'multi-checkout' => [
+        'error'   => 'Asset was not checked out, please try again|Assets were not checked out, please try again',
+        'success' => 'Asset checked out successfully.|Assets checked out successfully.',
+    ],
+
     'checkin' => [
         'error'   		=> 'Vara ei olnud märgitud, palun proovi uuesti',
         'success' 		=> 'Vara on edukalt kontrollitud',
@@ -86,9 +100,10 @@ return [
     ],
 
     'requests' => [
-        'error'   		=> 'Vara ei taotletud, proovige uuesti',
-        'success' 		=> 'Vara taotletud edukalt.',
-        'canceled'      => 'Checkout taotlus on edukalt tühistatud',
+        'error'   		=> 'Request was not successful, please try again.',
+        'success' 		=> 'Request successfully submitted.',
+        'canceled'      => 'Request successfully canceled.',
+        'cancel'        => 'Cancel this item request',
     ],
 
 ];
diff --git a/resources/lang/et-EE/admin/hardware/table.php b/resources/lang/et-EE/admin/hardware/table.php
index 264b3f6253..5e75910bb6 100644
--- a/resources/lang/et-EE/admin/hardware/table.php
+++ b/resources/lang/et-EE/admin/hardware/table.php
@@ -25,7 +25,6 @@ return [
     'image'		    => 'Seadme pilt',
     'days_without_acceptance' => 'Päeva ilma vastuvõtmiseta',
     'monthly_depreciation' => 'Igakuine amortatsioon',
-    'assigned_to'    => 'Väljastatud kasutajale',
     'requesting_user' => 'Taotlev kasutaja',
     'requested_date' => 'Taotletav kuupäev',
     'changed'       => 'Muudetud',
diff --git a/resources/lang/et-EE/admin/kits/general.php b/resources/lang/et-EE/admin/kits/general.php
index 51a0c92db7..c1ad6ac921 100644
--- a/resources/lang/et-EE/admin/kits/general.php
+++ b/resources/lang/et-EE/admin/kits/general.php
@@ -47,4 +47,5 @@ return [
     'kit_deleted'                       => 'Komplekt edukalt kustutatud',
     'kit_model_updated'                 => 'Mudel on edukalt uuendatud',
     'kit_model_detached'                => 'Mudel on edukalt eemaldatud',
+    'model_already_attached'            => 'Model already attached to kit',
 ];
diff --git a/resources/lang/et-EE/admin/licenses/general.php b/resources/lang/et-EE/admin/licenses/general.php
index 2d9e45395d..6ffe5eff7f 100644
--- a/resources/lang/et-EE/admin/licenses/general.php
+++ b/resources/lang/et-EE/admin/licenses/general.php
@@ -14,6 +14,7 @@ return array(
     'info'  					=> 'Litsentsi info',
     'license_seats'  			=> 'Litsentse',
     'seat'  					=> 'Istekoht',
+    'seat_count'  				=> 'Seat :count',
     'seats'  					=> 'Istekohad',
     'software_licenses'  		=> 'Tarkvara litsentsid',
     'user'  					=> 'Kasutaja',
@@ -23,12 +24,12 @@ return array(
         [
             'checkin_all'           => [
                 'button'            => 'Checkin All Seats',
-                'modal'             => 'This will action checkin one seat. | This action will checkin all :checkedout_seats_count seats for this license.',
+                'modal'             => 'This action will checkin one seat. | This action will checkin all :checkedout_seats_count seats for this license.',
                 'enabled_tooltip'   => 'Checkin ALL seats for this license from both users and assets',
                 'disabled_tooltip'  => 'This is disabled because there are no seats currently checked out',
                 'disabled_tooltip_reassignable'  => 'This is disabled because the License is not reassignable',
                 'success'           => 'License successfully checked in! | All licenses were successfully checked in!',
-                'log_msg'           => 'Checked in via bulk license checkout in license GUI',
+                'log_msg'           => 'Checked in via bulk license checkin in license GUI',
             ],
 
             'checkout_all'              => [
diff --git a/resources/lang/et-EE/admin/licenses/message.php b/resources/lang/et-EE/admin/licenses/message.php
index 507a6e4596..7c53f15680 100644
--- a/resources/lang/et-EE/admin/licenses/message.php
+++ b/resources/lang/et-EE/admin/licenses/message.php
@@ -44,10 +44,13 @@ return array(
         'error'   => 'Litsentsi kontrollides oli küsimus. Palun proovi uuesti.',
         'success' => 'Litsents oli edukalt välja võetud',
         'not_enough_seats' => 'Not enough license seats available for checkout',
+        'mismatch' => 'The license seat provided does not match the license',
+        'unavailable' => 'This seat is not available for checkout.',
     ),
 
     'checkin' => array(
         'error'   => 'Litsentsis kontrolliti probleemi. Palun proovi uuesti.',
+        'not_reassignable' => 'License not reassignable',
         'success' => 'Litsents märgiti edukalt'
     ),
 
diff --git a/resources/lang/et-EE/admin/locations/message.php b/resources/lang/et-EE/admin/locations/message.php
index 57349a4eba..b352c4a517 100644
--- a/resources/lang/et-EE/admin/locations/message.php
+++ b/resources/lang/et-EE/admin/locations/message.php
@@ -3,11 +3,12 @@
 return array(
 
     'does_not_exist' => 'Asukohta ei eksisteeri.',
-    'assoc_users'    => 'This location is not currently deletable because it is the location of record for at least one asset or user, has assets assigned to it, or is the parent location of another location. Please update your models to no longer reference this company and try again. ',
+    'assoc_users'    => 'This location is not currently deletable because it is the location of record for at least one asset or user, has assets assigned to it, or is the parent location of another location. Please update your records to no longer reference this location and try again ',
     'assoc_assets'	 => 'Selle asukohaga on seotud vähemalt üks vahend ja seda ei saa kustutada. Palun uuenda oma vahendeid, et need ei kasutaks seda asukohta ning seejärel proovi uuesti. ',
     'assoc_child_loc'	 => 'Sel asukohal on hetkel all-asukohti ja seda ei saa kustutada. Palun uuenda oma asukohti nii, et need ei kasutaks seda asukohta ning seejärel proovi uuesti. ',
     'assigned_assets' => 'Määratud Varad',
     'current_location' => 'Praegune asukoht',
+    'open_map' => 'Open in :map_provider_icon Maps',
 
 
     'create' => array(
@@ -20,6 +21,11 @@ return array(
         'success' => 'Asukoha uuendamine õnnestus.'
     ),
 
+    'restore' => array(
+        'error'   => 'Location was not restored, please try again',
+        'success' => 'Location restored successfully.'
+    ),
+
     'delete' => array(
         'confirm'   	=> 'Oled sa kindel, et soovid selle asukoha kustutada?',
         'error'   => 'Asukoha kustutamisel tekkis probleem. Palun proovi uuesti.',
diff --git a/resources/lang/et-EE/admin/locations/table.php b/resources/lang/et-EE/admin/locations/table.php
index 0f0362fc37..eb0beb8ea5 100644
--- a/resources/lang/et-EE/admin/locations/table.php
+++ b/resources/lang/et-EE/admin/locations/table.php
@@ -39,4 +39,5 @@ return [
     'signed_by_finance_auditor' => 'Allkiri (finantsaudiitor):',
     'signed_by_location_manager' => 'Allkiri (asukohahaldur):',
     'signed_by'                 => 'Allkiri:',
+    'clone'  					=> 'Clone Location',
 ];
diff --git a/resources/lang/et-EE/admin/models/general.php b/resources/lang/et-EE/admin/models/general.php
index b775f00f6a..bfe9c446bf 100644
--- a/resources/lang/et-EE/admin/models/general.php
+++ b/resources/lang/et-EE/admin/models/general.php
@@ -3,7 +3,7 @@
 return array(
     'about_models_title'     => 'Mudelitest',
     'about_models_text'           => 'Mudelid on selleks, et vahendeid grupeerida. "MBP 2013", "IPhone 6d", jne.',
-    'deleted'  					        => 'See mudel on kustatud.',
+    'deleted'  					=> 'See mudel on kustatud.',
     'bulk_delete'               => 'Kustuta hulgi vara mudeleid',
     'bulk_delete_help'               => 'Use the checkboxes below to confirm the deletion of the selected asset models. Asset models that have assets associated with them cannot be deleted until the assets are associated with a different model.',
     'bulk_delete_warn'          => 'You are about to delete one asset model.|You are about to delete :model_count asset models.',
diff --git a/resources/lang/et-EE/admin/models/message.php b/resources/lang/et-EE/admin/models/message.php
index 31843d6eb8..e47c002a1b 100644
--- a/resources/lang/et-EE/admin/models/message.php
+++ b/resources/lang/et-EE/admin/models/message.php
@@ -7,7 +7,7 @@ return array(
     'no_association' => 'WARNING! The asset model for this item is invalid or missing!',
     'no_association_fix' => 'This will break things in weird and horrible ways. Edit this asset now to assign it a model.',
     'assoc_users'	 => 'See mudel on seostus ühe või mitme vahendiga ja seda ei saa kustutada. Palun kustuta vahendid ja seejärel proovi uuesti kustutada. ',
-
+    'invalid_category_type' => 'This category must be an asset category.',
 
     'create' => array(
         'error'   => 'Mudelit ei loodud, proovi uuesti.',
diff --git a/resources/lang/et-EE/admin/reports/general.php b/resources/lang/et-EE/admin/reports/general.php
index 3f12d5dbb5..8af3de59c5 100644
--- a/resources/lang/et-EE/admin/reports/general.php
+++ b/resources/lang/et-EE/admin/reports/general.php
@@ -4,6 +4,7 @@ return [
     'info'   => 'Valige oma varade aruandele vajalikud valikud.',
     'deleted_user' => 'Deleted user',
     'send_reminder' => 'Send reminder',
+    'cannot_send_reminder' => 'User has been deleted or does not have an email address so cannot receive a reminder',
     'reminder_sent' => 'Reminder sent',
     'acceptance_deleted' => 'Acceptance request deleted',
     'acceptance_request' => 'Acceptance request',
@@ -13,5 +14,10 @@ return [
         'user_state' => 'User State',
         'user_country' => 'User Country',
         'user_zip' => 'User Zip'
-    ]
-];
\ No newline at end of file
+    ],
+    'open_saved_template' => 'Open Saved Template',
+    'save_template' =>  'Save Template',
+    'select_a_template' => 'Select a Template',
+    'template_name' => 'Template Name',
+    'update_template' => 'Update Template',
+];
diff --git a/resources/lang/et-EE/admin/reports/message.php b/resources/lang/et-EE/admin/reports/message.php
index 2b38dab4f1..2800bbdf0b 100644
--- a/resources/lang/et-EE/admin/reports/message.php
+++ b/resources/lang/et-EE/admin/reports/message.php
@@ -1,5 +1,16 @@
 <?php
 
-return array(
-    'error'   => 'Peate valima vähemalt ühe variandi.'
-);
+return [
+    'about_templates' => 'About Saved Templates',
+    'saving_templates_description' => 'Select your options, then enter the name of your template in the box above and click the \'Save Template\' button. Use the dropdown to select a previously saved template.',
+    'create'  => [
+        'success' => 'Template saved successfully',
+    ],
+    'update' => [
+        'success' => 'Template updated successfully',
+    ],
+    'delete' => [
+        'success' => 'Template deleted',
+        'no_delete_permission' => 'Template does not exist or you do not have permission to delete it.',
+    ],
+];
diff --git a/resources/lang/et-EE/admin/settings/general.php b/resources/lang/et-EE/admin/settings/general.php
index 9850ba8b53..3825bcccf2 100644
--- a/resources/lang/et-EE/admin/settings/general.php
+++ b/resources/lang/et-EE/admin/settings/general.php
@@ -8,13 +8,13 @@ return [
     'ad_append_domain'          => 'Lisa domeeninimi kasutaja lahtrisse',
     'ad_append_domain_help'     => 'Kasutaja ei pea kirjutama "username@domain.local", nad võivad lihtsalt kirjutada "username".',
     'admin_cc_email'            => 'CC e-mail',
-    'admin_cc_email_help'       => 'If you would like to send a copy of checkin/checkout emails that are sent to users to an additional email account, enter it here. Otherwise leave this field blank.',
+    'admin_cc_email_help'       => 'Send a copy of checkin/checkout emails to this address.',
     'admin_settings'            => 'Admin Settings',
     'is_ad'				        => 'See on Active Directory server',
     'alerts'                	=> 'Märguanded',
     'alert_title'               => 'Update Notification Settings',
     'alert_email'				=> 'Saada hoiatusi',
-    'alert_email_help'    => 'Email addresses or distribution lists you want alerts to be sent to, comma separated',
+    'alert_email_help'          => 'Email addresses or distribution lists you want alerts to be sent to, comma separated.',
     'alerts_enabled'			=> 'Hoiatused on lubatud',
     'alert_interval'			=> 'Aegumatu häiretaseme künnis (päevades)',
     'alert_inv_threshold'		=> 'Inventari hoiatuslävi',
@@ -31,15 +31,18 @@ return [
     'backups'					=> 'Varukoopiad',
     'backups_help'              => 'Create, download, and restore backups ',
     'backups_restoring'         => 'Restoring from Backup',
+    'backups_clean' => 'Clean the backed-up database before restore',
+    'backups_clean_helptext' => "This can be useful if you're changing between database versions",
     'backups_upload'            => 'Upload Backup',
     'backups_path'              => 'Backups on the server are stored in <code>:path</code>',
-    'backups_restore_warning'   => 'Use the restore button <small><span class="btn btn-xs btn-warning"><i class="text-white fas fa-retweet" aria-hidden="true"></i></span></small> to restore from a previous backup. (This does not currently work with S3 file storage or Docker.)<br><br>Your <strong>entire :app_name database and any uploaded files will be completely replaced</strong> by what\'s in the backup file.  ',
+    'backups_restore_warning'   => 'Use the restore button <small><span class="btn btn-xs btn-warning"><i class="text-white fas fa-retweet" aria-hidden="true"></i></span></small> to restore from a previous backup. (This does not currently work with S3 file storage or Docker.)<br><br>Your <strong>entire :app_name database and any uploaded files will be completely replaced</strong> by what\'s in the backup file  ',
     'backups_logged_out'         => 'All existing users, including you, will be logged out once your restore is complete.',
     'backups_large'             => 'Very large backups may time out on the restore attempt and may still need to be run via command line. ',
     'barcode_settings'			=> 'Triipkoodide seadistused',
     'confirm_purge'			    => 'Kinnitage puhastamine',
     'confirm_purge_help'		=> 'Enter the text "DELETE" in the box below to purge your deleted records. This action cannot be undone and will PERMANENTLY delete all soft-deleted items and users. (You should make a backup first, just to be safe.)',
     'custom_css'				=> 'Kohandatud CSS',
+    'custom_css_placeholder'	=> 'Add your custom CSS',
     'custom_css_help'			=> 'Sisestage kõik kohandatud CSS-i muudatused, mida soovite kasutada. Ärge lisage silte &lt;style&gt;&lt;/style&gt;.',
     'custom_forgot_pass_url'	=> 'Custom Password Reset URL',
     'custom_forgot_pass_url_help'	=> 'This replaces the built-in forgotten password URL on the login screen, useful to direct people to internal or hosted LDAP password reset functionality. It will effectively disable local user forgotten password functionality.',
@@ -47,34 +50,34 @@ return [
     'dashboard_message_help'	=> 'See tekst ilmub avalehele igaühele kellel on õigused vaadata avalehte.',
     'default_currency'  		=> 'Valuuta vaikimisi',
     'default_eula_text'			=> 'EULA vaikimisi',
+    'default_eula_text_placeholder' => 'Add your default EULA text',
     'default_language'			=> 'Vaikimisi keel',
     'default_eula_help_text'	=> 'Võite ka kohandatud EULA-sid siduda kindlate varakategooriatega.',
     'acceptance_note'           => 'Lisa märkus oma otsusele (Valikuline)',
     'display_asset_name'        => 'Kuvatava vara nimi',
     'display_checkout_date'     => 'Display Checkout Kuupäev',
     'display_eol'               => 'Kuva EOL tabeli vaates',
-    'display_qr'                => 'Kuva ruudukoodid',
+    'display_qr'                => 'Display 2D barcode',
     'display_alt_barcode'		=> 'Kuvage 1D vöötkood',
-    'email_logo'                => 'Emaili logo',
     'barcode_type'				=> '2D-triipkoodi tüüp',
     'alt_barcode_type'			=> '1D-vöötkoodi tüüp',
-    'email_logo_size'       => 'Kandilised logod paistavad emailis paremini välja. ',
     'enabled'                   => 'Lubatud',
     'eula_settings'				=> 'EULA seaded',
     'eula_markdown'				=> 'EULA võimaldab <a href="https://help.github.com/articles/github-flavored-markdown/">Githubi maitsestatud hinnalisa</a>.',
+    'empty_row_count'           => 'Field Start Offset (Empty Rows)',
+    'empty_row_count_help'      => 'Fields will begin populating after this many empty rows are skipped at the top of the label.',
     'favicon'                   => 'Favicon',
     'favicon_format'            => 'Lubatud failitüübid on ico, png ja gif. Teised failitüübid ei pruugi kõigis lehitsejates töödata.',
     'favicon_size'          => 'Favicons should be square images, 16x16 pixels.',
     'footer_text'               => 'Additional Footer Text ',
     'footer_text_help'          => 'This text will appear in the right-side footer. Links are allowed using <a href="https://help.github.com/articles/github-flavored-markdown/">Github flavored markdown</a>. Line breaks, headers, images, etc may result in unpredictable results.',
+    'footer_text_placeholder'   => 'Optional footer text',
     'general_settings'			=> 'üldised seaded',
-    'general_settings_keywords' => 'company support, signature, acceptance, email format, username format, images, per page, thumbnail, eula, gravatar, tos, dashboard, privacy',
     'general_settings_help'     => 'Default EULA and more',
     'generate_backup'			=> 'Loo varundamine',
     'google_workspaces'         => 'Google Workspaces',
     'header_color'              => 'Päise värv',
     'info'                      => 'Need sätted võimaldavad teil kohandada oma installi teatud aspekte.',
-    'label_logo'                => 'Sildi logo',
     'label_logo_size'           => 'Square logos look best - will be displayed in the top right of each asset label. ',
     'laravel'                   => 'Laraveli versioon',
     'ldap'                      => 'LDAP',
@@ -94,7 +97,7 @@ return [
     'ldap_login_sync_help'      => 'This only tests that LDAP can sync correctly. If your LDAP Authentication query is not correct, users may still not be able to login. YOU MUST SAVE YOUR UPDATED LDAP SETTINGS FIRST.',
     'ldap_manager'              => 'LDAP Manager',
     'ldap_server'               => 'LDAP server',
-    'ldap_server_help'          => 'See peaks algama ldap: // (krüpteerimata või TLS-i puhul) või ldaps: // (SSL-i puhul)',
+    'ldap_server_help'          => 'This should start with ldap:// (for unencrypted) or ldaps:// (for TLS or SSL)',
     'ldap_server_cert'			=> 'LDAP SSL-sertifikaadi valideerimine',
     'ldap_server_cert_ignore'	=> 'Lubage kehtetu SSL-sertifikaat',
     'ldap_server_cert_help'		=> 'Märkige see ruut, kui kasutate ennastkasutatud SSL-i sertifikaati ja soovite nõustuda sobiva SSL-sertifikaadiga.',
@@ -108,8 +111,8 @@ return [
     'ldap_pword'                => 'LDAP bind parool',
     'ldap_basedn'               => 'Base Bind DN',
     'ldap_filter'               => 'LDAP-filter',
-    'ldap_pw_sync'              => 'LDAP paroolide sünkroonimine',
-    'ldap_pw_sync_help'         => 'Tühjendage see ruut, kui te ei soovi LDAP paroole sünkroonida kohalike paroolidega. Selle keelamine tähendab, et teie kasutajad ei pruugi siseneda, kui teie LDAP-server mingil põhjusel pole saavutatav.',
+    'ldap_pw_sync'              => 'Cache LDAP Passwords',
+    'ldap_pw_sync_help'         => 'Uncheck this box if you do not wish to keep LDAP passwords cached as local hashed passwords. Disabling this means that your users may not be able to login if your LDAP server is unreachable for some reason.',
     'ldap_username_field'       => 'Kasutajanimi väli',
     'ldap_lname_field'          => 'Perekonnanimi',
     'ldap_fname_field'          => 'LDAP eesnimi',
@@ -117,13 +120,15 @@ return [
     'ldap_version'              => 'LDAP versioon',
     'ldap_active_flag'          => 'LDAP aktiivne lipp',
     'ldap_activated_flag_help'  => 'This value is used to determine whether a synced user can login to Snipe-IT. <strong>It does not affect the ability to check items in or out to them</strong>, and should be the <strong>attribute name</strong> within your AD/LDAP, <strong>not the value</strong>. <br><br>If this field is set to a field name that does not exist in your AD/LDAP, or the value in the AD/LDAP field is set to <code>0</code> or <code>false</code>, <strong>user login will be disabled</strong>. If the value in the AD/LDAP field is set to <code>1</code> or <code>true</code> or <em>any other text</em> means the user can log in. When the field is blank in your AD, we respect the <code>userAccountControl</code> attribute, which usually allows non-suspended users to log in.',
+    'ldap_invert_active_flag'   => 'LDAP Invert Active Flag',
+    'ldap_invert_active_flag_help'     => 'If enabled: when the value returned by LDAP Active Flag is <code>0</code> or <code>false</code> the user account will be active.',
     'ldap_emp_num'              => 'LDAPi töötaja number',
     'ldap_email'                => 'LDAP-e-post',
     'ldap_test'                 => 'Test LDAP',
     'ldap_test_sync'            => 'Test LDAP Synchronization',
     'license'                   => 'Software License',
-    'load_remote'               => 'Use Gravatar',
-    'load_remote_help_text'		=> 'Uncheck this box if your install cannot load scripts from the outside internet. This will prevent Snipe-IT from trying load images from Gravatar.',
+    'load_remote'               => 'Load Remote Avatars',
+    'load_remote_help_text'		=> 'Uncheck this box if your install cannot load scripts from the outside internet. This will prevent Snipe-IT from trying load avatars from Gravatar or other outside sources.',
     'login'                     => 'Login Attempts',
     'login_attempt'             => 'Login Attempt',
     'login_ip'                  => 'IP Address',
@@ -131,6 +136,7 @@ return [
     'login_user_agent'          => 'User Agent',
     'login_help'                => 'List of attempted logins',
     'login_note'                => 'Logi sisse Märkus',
+    'login_note_placeholder'            => "If you do not have a login or have found a device belonging to this company, please call technical support at 888-555-1212. Thank you.",
     'login_note_help'           => 'Soovi korral lisage oma sisselogimisekraanile mõni lause, näiteks selleks, et aidata inimesi, kes on leidnud kadunud või varastatud seadme. See väli võtab vastu <a href="https://help.github.com/articles/github-flavored-markdown/">Github maitsestatud markdown</a>',
     'login_remote_user_text'    => 'Remote User login options',
     'login_remote_user_enabled_text' => 'Enable Login with Remote User Header',
@@ -146,13 +152,16 @@ return [
     'logo_print_assets_help'    => 'Use branding on printable asset lists ',
     'full_multiple_companies_support_help_text' => 'Kasutajate (sh administraatorite) piiramine, mis on määratud firmadele ettevõtte varadele.',
     'full_multiple_companies_support_text' => 'Terve mitu ettevõtete toetust',
+    'scope_locations_fmcs_support_text'  => 'Scope Locations with Full Multiple Companies Support',
+    'scope_locations_fmcs_support_help_text'  => 'Restrict locations to their selected company.',
+    'scope_locations_fmcs_check_button' => 'Check Compatibility',
+    'scope_locations_fmcs_support_disabled_text'  => 'This option is disabled because you have conflicting locations set for :count or more items.',
     'show_in_model_list'   => 'Show in Model Dropdowns',
     'optional'					=> 'vabatahtlik',
     'per_page'                  => 'Tulemused lehel',
     'php'                       => 'PHP versioon',
-    'php_info'                  => 'PHP Info',
+    'php_info'                  => 'PHP info',
     'php_overview'              => 'PHP',
-    'php_overview_keywords'     => 'phpinfo, system, info',
     'php_overview_help'         => 'PHP System info',
     'php_gd_info'               => 'Peate installima php-gd, et kuvada QR-koode, vt installijuhiseid.',
     'php_gd_warning'            => 'PHP pilditöötlust ja GD pluginat ei ole installitud.',
@@ -218,6 +227,8 @@ return [
     'webhook_integration_help'    => ':app integration is optional, however the endpoint and channel are required if you wish to use it. To configure :app integration, you must first <a href=":webhook_link" target="_new" rel="noopener">create an incoming webhook</a> on your :app account. Click on the <strong>Test :app Integration</strong> button to confirm your settings are correct before saving. ',
     'webhook_integration_help_button'    => 'Once you have saved your :app information, a test button will appear.',
     'webhook_test_help'           => 'Test whether your :app integration is configured correctly. YOU MUST SAVE YOUR UPDATED :app SETTINGS FIRST.',
+    'shortcuts_enabled'         => 'Enable Shortcuts',
+    'shortcuts_help_text'       => '<strong>Windows</strong>: Alt + Access key, <strong>Mac</strong>: Control + Option + Access key',
     'snipe_version'  			=> 'Snipe-IT versioon',
     'support_footer'            => 'Support Footer Links ',
     'support_footer_help'       => 'Specify who sees the links to the Snipe-IT Support info and Users Manual',
@@ -227,7 +238,6 @@ return [
     'update'                    => 'Värskenda seaded',
     'value'                     => 'Väärtus',
     'brand'                     => 'Branding',
-    'brand_keywords'            => 'footer, logo, print, theme, skin, header, colors, color, css',
     'brand_help'                => 'Logo, Site Name',
     'web_brand'                 => 'Web Branding Type',
     'about_settings_title'      => 'Seadistuste kohta',
@@ -276,6 +286,8 @@ return [
     'two_factor_enrollment_text'	=> "Vaja on kahte tegurit, kuid teie seadet ei ole veel registreeritud. Avage oma Google Authenticatori rakendus ja skannige oma seadme registreerimiseks allolevat QR-koodi. Kui olete oma seadme sisestanud, sisestage allolev kood",
     'require_accept_signature'      => 'Nõuda allkirja',
     'require_accept_signature_help_text'      => 'Selle funktsiooni lubamine nõuab, et kasutajad võtaksid vara füüsiliselt alla.',
+    'require_checkinout_notes'  => 'Require Notes on Checkin/Checkout',
+    'require_checkinout_notes_help_text'    => 'Enabling this feature will require the note fields to be populated when checking in or checking out an asset.',
     'left'        => 'lahkus',
     'right'        => 'õige',
     'top'        => 'üleval',
@@ -313,24 +325,24 @@ return [
     'filter_by_keyword' => 'Filter by setting keyword',
     'security' => 'Security',
     'security_title' => 'Update Security Settings',
-    'security_keywords' => 'password, passwords, requirements, two factor, two-factor, common passwords, remote login, logout, authentication',
     'security_help' => 'Two-factor, Password Restrictions',
-    'groups_keywords' => 'permissions, permission groups, authorization',
     'groups_help' => 'Account permission groups',
     'localization' => 'Localization',
     'localization_title' => 'Update Localization Settings',
-    'localization_keywords' => 'localization, currency, local, locale, time zone, timezone, international, internatinalization, language, languages, translation',
     'localization_help' => 'Language, date display',
     'notifications' => 'Notifications',
     'notifications_help' => 'Email Alerts & Audit Settings',
     'asset_tags_help' => 'Incrementing and prefixes',
     'labels' => 'Labels',
     'labels_title' => 'Update Label Settings',
-    'labels_help' => 'Label sizes &amp; settings',
-    'purge_keywords' => 'permanently delete',
+    'labels_help' => 'Barcodes &amp; label settings',
     'purge_help' => 'Puhasta kustutatud dokumendid',
     'ldap_extension_warning' => 'It does not look like the LDAP extension is installed or enabled on this server. You can still save your settings, but you will need to enable the LDAP extension for PHP before LDAP syncing or login will work.',
     'ldap_ad' => 'LDAP/AD',
+    'ldap_test_label' => 'Test LDAP Sync',
+    'ldap_test_login' => ' Test LDAP Login',
+    'ldap_username_placeholder' => 'LDAP Username',
+    'ldap_password_placeholder' => 'LDAP Password',
     'employee_number' => 'Töötaja number',
     'create_admin_user' => 'Create a User ::',
     'create_admin_success' => 'Success! Your admin user has been added!',
@@ -342,6 +354,8 @@ return [
     'setup_migration_create_user' => 'Next: Create User',
     'ldap_settings_link' => 'LDAP Settings Page',
     'slack_test' => 'Test <i class="fab fa-slack"></i> Integration',
+    'status_label_name' => 'Status Label Name',
+    'super_admin_only'  => 'Super Admin Only',
     'label2_enable'           => 'New Label Engine',
     'label2_enable_help'      => 'Switch to the new label engine. <b>Note: You will need to save this setting before setting others.</b>',
     'label2_template'         => 'Template',
@@ -356,12 +370,15 @@ return [
     'label2_2d_type'          => '2D-triipkoodi tüüp',
     'label2_2d_type_help'     => 'Format for 2D barcodes',
     'label2_2d_target'        => '2D Barcode Target',
-    'label2_2d_target_help'   => 'The URL the 2D barcode points to when scanned',
+    'label2_2d_target_help'   => 'The data that will be contained in the 2D barcode',
     'label2_fields'           => 'Field Definitions',
     'label2_fields_help'      => 'Fields can be added, removed, and reordered in the left column. For each field, multiple options for Label and DataSource can be added, removed, and reordered in the right column.',
+    'purge_barcodes' => 'Purge Barcodes',
     'help_asterisk_bold'    => 'Text entered as <code>**text**</code> will be displayed as bold',
     'help_blank_to_use'     => 'Leave blank to use the value from <code>:setting_name</code>',
     'help_default_will_use' => '<code>:default</code> will use the value from <code>:setting_name</code>. <br>Note that the value of the barcodes must comply with the respective barcode spec in order to be successfully generated. Please see <a href="https://snipe-it.readme.io/docs/barcodes">the documentation <i class="fa fa-external-link"></i></a> for more details. ',
+    'asset_id'              => 'Asset ID',
+    'data'               => 'Data',
     'default'               => 'Default',
     'none'                  => 'None',
     'google_callback_help' => 'This should be entered as the callback URL in your Google OAuth app settings in your organization&apos;s <strong><a href="https://console.cloud.google.com/" target="_blank">Google developer console <i class="fa fa-external-link" aria-hidden="true"></i></a></strong>.',
@@ -373,7 +390,100 @@ return [
     'database_driver' => 'Database Driver',
     'bs_table_storage' => 'Table Storage',
     'timezone' => 'Timezone',
+    'test_mail' => 'Test Mail',
     'profile_edit'          => 'Edit Profile',
     'profile_edit_help'          => 'Allow users to edit their own profiles.',
+    'default_avatar' => 'Custom Default Avatar',
+    'default_avatar_help' => 'This image will be displayed as a profile if a user does not have a profile photo.',
+    'restore_default_avatar' => 'Restore <a href=":default_avatar" data-toggle="lightbox" data-type="image">original system default avatar</a>',
+    'restore_default_avatar_help' => '',
+    'due_checkin_days' => 'Due For Checkin Warning',
+    'due_checkin_days_help' => 'How many days before the expected checkin of an asset should it be listed in the "Due for checkin" page?',
+    'no_groups' => 'No groups have been created yet. Visit <code>Admin Settings > Permission Groups</code> to add one.',
+    'text' => 'Text',
+
+    'username_formats' => [
+        'username_format'		=> 'Kasutajanime formaat',
+        'firstname_lastname_format'	=> 'Eesnimi eesnimi (jane.smith)',
+        'first_name_format'	        => 'First Name (jane)',
+        'last_name_format'		=> 'Last Name (doe)',
+        'filastname_format'			=> 'First Initial Last Name (jsmith)',
+        'lastnamefirstinitial_format' =>  'Last Name First Initial (smithj)',
+        'firstname_lastname_underscore_format' => 'First Name Last Name (jane_smith)',
+        'firstinitial.lastname' => 'First Initial Last Name (j.smith)',
+        'lastname_firstinitial' => 'Last Name First Initial (smith_j)',
+        'lastname_dot_firstinitial_format' => 'Last Name First Initial (smith.j)',
+        'firstnamelastname'     => 'First Name Last Name (janesmith)',
+        'firstnamelastinitial'  => 'First Name Last Initial (janes)',
+        'lastnamefirstname'      => 'Last Name.First Name (smith.jane)',
+    ],
+
+    'email_formats' => [
+        'email_format'			=> 'E-maili formaat',
+        'firstname_lastname_format'	=> 'Eesnimi eesnimi (jane.smith@example.com)',
+        'first_name_format'		=> 'Eesnimi (jane@example.com)',
+        'last_name_format'		=> 'Last Name (doe@example.com)',
+        'filastname_format'			=> 'Esimene esmane perekonnanimi (jsmith@example.com)',
+        'lastnamefirstinitial_format' =>  'Perenimi Eesnime lühend (perenimie@poleolemas.ee)',
+        'firstname_lastname_underscore_format' => 'Eesnimi Perenimi (eesnimi.perenimi@poleolemas.ee)',
+        'firstinitial.lastname' => 'Eesnime algustäht Perekonnanimi (j.smith@example.com)',
+        'lastname_firstinitial' => 'Perenimi Eesnimi algustäht (smith_j@example.com)',
+        'lastname_dot_firstinitial_format' => 'Last Name First Initial (smith.j@example.com)',
+        'firstnamelastname'     => 'Eesnimi Perenimi (janesmith@example.com)',
+        'firstnamelastinitial'  => 'Eesnimi Perekonnanime algustäht (janes@example.com)',
+        'lastnamefirstname'      => 'Last Name.First Name (smith.jane@example.com)',
+    ],
+
+
+
+    'logo_labels' => [
+        'acceptance_pdf_logo'       => 'PDF Logo',
+        'email_logo'                => 'Emaili logo',
+        'label_logo'                => 'Sildi logo',
+        'logo'                      => 'Site Logo',
+        'favicon'                   => 'Favicon',
+    ],
+
+    'logo_help' => [
+        'email_logo_size'       => 'Kandilised logod paistavad emailis paremini välja. ',
+    ],
+
+    'logo_option_types' => [
+        'text' => 'Text',
+        'logo' => 'Logo',
+        'logo_and_text' => 'Logo and Text',
+    ],
+
+
+    'legends' => [
+        'scoping' => 'Scoping',
+        'formats' => 'Default Formats',
+        'profiles' => 'User Profiles',
+        'eula' => 'EULA & Acceptance Preferences',
+        'misc_display' => 'Miscellaneous Display Options',
+        'email' => 'Email Preferences',
+        'checkin' => 'Checkin Preferences',
+        'dashboard' => 'Login & Dashboard Preferences',
+        'misc' => 'Miscellaneous',
+        'logos' => 'Logos & Display',
+        'colors' => 'Colors & Skins',
+        'footer' => 'Footer Preferences',
+        'security' => 'Security Preferences',
+        'general' => 'General',
+        'intervals' => 'Intervals & Thresholds',
+    ],
+
+
+    /* Keywords for settings overview help */
+    'keywords' => [
+        'brand'             => 'footer, logo, print, theme, skin, header, colors, color, css',
+        'general_settings'  => 'company support, signature, acceptance, email format, username format, images, per page, thumbnail, eula, gravatar, tos, dashboard, privacy',
+        'groups'            => 'permissions, permission groups, authorization',
+        'labels'            => 'labels, barcodes, barcode, sheets, print, upc, qr, 1d, 2d',
+        'localization'      => 'localization, currency, local, locale, time zone, timezone, international, internatinalization, language, languages, translation',
+        'php_overview'      => 'phpinfo, system, info',
+        'purge'             => 'permanently delete',
+        'security'          => 'password, passwords, requirements, two factor, two-factor, common passwords, remote login, logout, authentication',
+    ],
 
 ];
diff --git a/resources/lang/et-EE/admin/settings/message.php b/resources/lang/et-EE/admin/settings/message.php
index 30b3f6b194..bed0bad957 100644
--- a/resources/lang/et-EE/admin/settings/message.php
+++ b/resources/lang/et-EE/admin/settings/message.php
@@ -14,6 +14,9 @@ return [
         'restore_warning'       => 'Yes, restore it. I acknowledge that this will overwrite any existing data currently in the database. This will also log out all of your existing users (including you).',
         'restore_confirm'       => 'Are you sure you wish to restore your database from :filename?'
     ],
+    'restore' => [
+        'success'               => 'Your system backup has been restored. Please log in again.'
+    ],
     'purge' => [
         'error'     => 'Puhastamise ajal on tekkinud viga.',
         'validation_failed'     => 'Teie puhta kinnitus on vale. Palun sisestage kinnituskastes sõna "DELETE".',
@@ -33,6 +36,9 @@ return [
         'testing_authentication' => 'Testing LDAP Authentication...',
         'authentication_success' => 'User authenticated against LDAP successfully!'
     ],
+    'labels' => [
+        'null_template' => 'Label template not found. Please select a template.',
+        ],
     'webhook' => [
         'sending' => 'Sending :app test message...',
         'success' => 'Your :webhook_name Integration works!',
@@ -42,5 +48,12 @@ return [
         'error' => 'Something went wrong. :app responded with: :error_message',
         'error_redirect' => 'ERROR: 301/302 :endpoint returns a redirect. For security reasons, we don’t follow redirects. Please use the actual endpoint.',
         'error_misc' => 'Something went wrong. :( ',
-    ]
+        'webhook_fail' => ' webhook notification failed: Check to make sure the URL is still valid.',
+        'webhook_channel_not_found' => ' webhook channel not found.',
+        'ms_teams_deprecation' => 'The selected Microsoft Teams webhook URL will be deprecated Dec 31st, 2025. Please use a workflow URL. Microsoft\'s documentation on creating a workflow can be found <a href="https://support.microsoft.com/en-us/office/create-incoming-webhooks-with-workflows-for-microsoft-teams-8ae491c7-0394-4861-ba59-055e33f75498" target="_blank"> here.</a>',
+    ],
+    'location_scoping' => [
+        'not_saved' => 'Your settings were not saved.',
+        'mismatch' => 'There is 1 item in the database that need your attention before you can enable location scoping.|There are :count items in the database that need your attention before you can enable location scoping.',
+    ],
 ];
diff --git a/resources/lang/et-EE/admin/statuslabels/table.php b/resources/lang/et-EE/admin/statuslabels/table.php
index 0f88a5f325..b850b49480 100644
--- a/resources/lang/et-EE/admin/statuslabels/table.php
+++ b/resources/lang/et-EE/admin/statuslabels/table.php
@@ -1,14 +1,14 @@
 <?php
 
 return array(
-    'about'      	=> 'Staatuse siltidest',
+    'about'      	=> 'About Status Types',
     'archived'      	=> 'Arhiveeritud',
     'create'      	=> 'Uus staatuse silt',
     'color'      	=> 'Joonise värv',
     'default_label' => 'Vaikimisi silt',
     'default_label_help' => 'Seda kasutatakse tagamaks, et seadmete loomisel või redigeerimisel on ülaosas valida kõige sagedamini kasutatavad olekusildid.',
     'deployable'      	=> 'Käivitatav',
-    'info'      	=> 'Olekuteemeid kasutatakse erinevate seisundite kirjeldamiseks, millised on teie varad. Need võivad olla remondi-, kaotatud / varastatud jne jaoks. Saate luua uusi olekuteid, mida saab kasutada käimasolevatel, ootel ja arhiveeritud varadel.',
+    'info'      	=> 'Status label types are used to describe the various states your assets could be in. They may be out for repair, lost/stolen, etc. You can create new status labels for your deployable, pending and archived assets according to your own workflow. For more information, <a href="https://snipe-it.readme.io/docs/overview#status-labels" target="_blank">see the documentation <i class="fa fa-external-link"></i></a>.',
     'name'      	=> 'Saatuse nimi',
     'pending'      	=> 'Ootel',
     'status_type'   => 'Saatuse tüüp',
diff --git a/resources/lang/et-EE/admin/users/general.php b/resources/lang/et-EE/admin/users/general.php
index a837d5af88..dd40b76aba 100644
--- a/resources/lang/et-EE/admin/users/general.php
+++ b/resources/lang/et-EE/admin/users/general.php
@@ -19,6 +19,8 @@ return [
     'print_assigned'    => 'Prindi kõik varad',
     'email_assigned'    => 'Emaili Nimekiri Väljastatud Varadest',
     'user_notified'     => 'User has been emailed a list of their currently assigned items.',
+    'users_notified'    => 'The user has been emailed a list of their currently assigned items.|:count users have been emailed a list of their currently assigned items.',
+    'users_notified_warning' => ':count user has been emailed a list of their currently assigned items, however :no_email users did not have an email address so could not be emailed.|:count users have been emailed a list of their currently assigned items, however :no_email user(s) did not have an email address so could not be emailed.',
     'auto_assign_label' => 'Include this user when auto-assigning eligible licenses',
     'auto_assign_help'  => 'Skip this user in auto assignment of licenses',
     'software_user'     => 'Kasutaja :name valdusesse antud tarkvara',
diff --git a/resources/lang/et-EE/admin/users/message.php b/resources/lang/et-EE/admin/users/message.php
index bd33914137..21ce3dc233 100644
--- a/resources/lang/et-EE/admin/users/message.php
+++ b/resources/lang/et-EE/admin/users/message.php
@@ -6,7 +6,7 @@ return array(
     'declined'                  => 'Oled selle vahendi tagasi lükanud.',
     'bulk_manager_warn'	        => 'Sinu kasutajad on edukalt muudetud, kuid sinu juhi-kirjet ei salvestatud sest juht, kelle valisid oli ka muudatavate kasutajate hulgas ning kasutaja ei või olla ise-enda juht. Palun vali oma kasutajad uuesti, jättes juhi kõrvale.',
     'user_exists'               => 'Kasutaja on juba olemas!',
-    'user_not_found'            => 'Kasutajat ei eksisteeri.',
+    'user_not_found'            => 'User does not exist or you do not have permission view them.',
     'user_login_required'       => 'Login väli on kohustuslik',
     'user_has_no_assets_assigned' => 'No assets currently assigned to user.',
     'user_password_required'    => 'Parooli väli on kohustuslik.',
@@ -53,6 +53,7 @@ return array(
         'ldap_could_not_search' => 'LDAP-serverit ei õnnestunud otsida. Palun kontrollige oma LDAP-i serveri konfiguratsiooni LDAP-i konfiguratsioonifailis. <br>Viga LDAP serverist:',
         'ldap_could_not_get_entries' => 'LDAP-serverisse tehtud sissekandeid ei saanud. Palun kontrollige oma LDAP-i serveri konfiguratsiooni LDAP-i konfiguratsioonifailis. <br>Viga LDAP serverist:',
         'password_ldap' => 'Selle konto parooli haldab LDAP / Active Directory. Parooli muutmiseks võtke ühendust oma IT-osakonnaga.',
+        'multi_company_items_assigned' => 'This user has items assigned that belong to a different company. Please check them in or edit their company.'
     ),
 
     'deletefile' => array(
diff --git a/resources/lang/et-EE/admin/users/table.php b/resources/lang/et-EE/admin/users/table.php
index e8755ae6dc..940f818cc6 100644
--- a/resources/lang/et-EE/admin/users/table.php
+++ b/resources/lang/et-EE/admin/users/table.php
@@ -22,7 +22,7 @@ return array(
     'managed_locations'     => 'Hallatavad asukohad',
     'managed_users'         => 'Managed Users',
     'name' 					=> 'Nimi',
-    'nogroup'               => 'No groups have been created yet. To add one, visit: ',
+    'nogroup'               => 'No groups have been created yet. To add one, visit:',
     'notes'                 => 'Märkmed',
     'password_confirm' 		=> 'Kinnita parool',
     'password' 				=> 'Parool',
diff --git a/resources/lang/et-EE/auth.php b/resources/lang/et-EE/auth.php
index baee3c4d4a..ce5be3f61e 100644
--- a/resources/lang/et-EE/auth.php
+++ b/resources/lang/et-EE/auth.php
@@ -15,6 +15,6 @@ return array(
 
     'failed' => 'Sisestatud mandaadid ei ühti meie andmetega.',
     'password' => 'Sisestatud parool on vale.',
-    'throttle' => 'Liiga palju ebaõnnestunud sisselogimiskatseid. Palun proovi uuesti :seconds sekundi pärast.',
+    'throttle' => 'Too many login attempts. Please try again in :minutes minute(s).',
 
 );
diff --git a/resources/lang/et-EE/auth/message.php b/resources/lang/et-EE/auth/message.php
index b9a65ab65d..d95e36f9d7 100644
--- a/resources/lang/et-EE/auth/message.php
+++ b/resources/lang/et-EE/auth/message.php
@@ -6,8 +6,6 @@ return array(
     'account_not_found'      => 'Kasutajanimi või parool on vale.',
     'account_not_activated'  => 'See kasutajakonto pole aktiveeritud.',
     'account_suspended'      => 'See kasutajakonto on peatatud.',
-    'account_banned'         => 'See kasutajakonto on keelatud.',
-    'throttle'               => 'Liiga palju ebaõnnestunud sisselogimiskatseid. Palun proovi uuesti :minutes minuti pärast.',
 
     'two_factor' => array(
         'already_enrolled'      => 'Sinu seade on juba registreeritud.',
diff --git a/resources/lang/et-EE/button.php b/resources/lang/et-EE/button.php
index 253b48c0b2..71b8334f26 100644
--- a/resources/lang/et-EE/button.php
+++ b/resources/lang/et-EE/button.php
@@ -7,6 +7,7 @@ return [
     'checkin_and_delete'  	    => 'Checkin All / Delete User',
     'delete'  	                => 'Kustuta',
     'edit'    	                => 'Muuda',
+    'clone'    	                => 'Clone',
     'restore' 	                => 'Taasta',
     'remove'                    => 'Remove',
     'request'                   => 'Päring',
@@ -21,4 +22,13 @@ return [
     'add_maintenance'           => 'Add Maintenance',
     'append'                    => 'Append',
     'new'                       => 'Uus',
+    'var' => [
+        'clone'     => 'Clone :item_type',
+        'edit'      => 'Edit :item_type',
+        'delete'    => 'Delete :item_type',
+        'restore'   => 'Restore :item_type',
+        'create'    => 'Create New :item_type',
+        'checkout'  => 'Checkout :item_type',
+        'checkin'   => 'Checkin :item_type',
+    ]
 ];
diff --git a/resources/lang/et-EE/general.php b/resources/lang/et-EE/general.php
index 5411fee99a..edd51d79a7 100644
--- a/resources/lang/et-EE/general.php
+++ b/resources/lang/et-EE/general.php
@@ -10,7 +10,7 @@ return [
     'action'                => 'Tegevus',
     'activity_report'		=> 'Tegevuste aruanne',
     'address'				=> 'Aadress',
-    'admin'					=> 'Admin',
+    'admin'					=> 'Admin Settings',
     'admin_tooltip'			=> 'Sellel kasutajal on administraatori õigused',
     'superuser'				=> 'Superkasutaja',
     'superuser_tooltip'		=> 'Sellel kasutajal on superkasutaja õigused',
@@ -23,13 +23,16 @@ return [
     'asset_models'			=> 'Mudelid',
     'asset_model'			=> 'Mudel',
     'asset'					=> 'Vahend',
+    'asset_previous'        => 'Asset (Previously Assigned)',
     'asset_report'          => 'Vahendite aruanne',
     'asset_tag'				=> 'Varade silt',
     'asset_tags'            => 'Vahendi sildid',
     'assets_available'		=> 'Saadaolevad vahendid',
     'accept_assets'         => 'Aktsepteeri vahendid :name nimel',
     'accept_assets_menu'    => 'Aktsepteeri vahendeid',
+    'accept_item'           => 'Accept Item',
     'audit'				    => 'Auditeerimine',
+    'audits'				=> 'Audits',
     'audit_report'			=> 'Auditilogi',
     'assets'				=> 'Vahendid',
     'assets_audited'        => 'varad auditeeritud',
@@ -61,9 +64,12 @@ return [
     'changepassword'  		=> 'Muuda parool',
     'checkin'  				=> 'Checkin',
     'checkin_from'  		=> 'Checkin alates',
+    'checkin_note'  		=> 'Checkin Note',
+    'checkout_note'  		=> 'Checkout Note',
     'checkout'  			=> 'Checkout',
     'checkouts_count'       => 'Väljastatud',
     'checkins_count'        => 'Sisse võetud',
+    'checkin_and_delete'  	=> 'Checkin and Delete',
     'user_requests_count'   => 'Taotlused',
     'city'  				=> 'Linn',
     'click_here'			=> 'Kliki siia',
@@ -77,7 +83,7 @@ return [
     'consumables'			=> 'Kulumaterjalid',
     'country'  				=> 'Riik',
     'could_not_restore'     => 'Error restoring :item_type: :error',
-    'not_deleted'           => 'The :item_type is not deleted so it cannot be restored',
+    'not_deleted'           => 'The :item_type was not deleted and therefore cannot be restored',
     'create'				=> 'Loo uus',
     'created'               => 'Üksus on loodud',
     'created_asset'			=> 'loodud vara',
@@ -86,11 +92,13 @@ return [
     'record_created' 		=> 'Väärtus loodud',
     'updated_at' 			=> 'Viimati muudetud',
     'currency'  			=> '$', // this is deprecated
+    'currency_text'  		=> 'Currency', //
     'current'  				=> 'Praegune',
     'current_password'      => 'Praegune parool',
     'customize_report'      => 'Kohanda aruannet',
     'custom_report'         => 'Kohandatud varade aruanne',
     'dashboard'				=> 'Töölaud',
+    'data_source'           => 'Data Source',
     'days'      			=> 'päeva',
     'days_to_next_audit'    => 'Päevad järgmise auditi juurde',
     'date'					=> 'Kuupäev',
@@ -98,7 +106,7 @@ return [
     'debug_warning_text'    => 'See rakendus töötab tootmisrežiimis, kus silumisvõimalused on lubatud. See võib avaldada tundlikke andmeid, kui teie rakendus on välismaailmale juurdepääsetav. Keela debugrežiim, määrates <code>APP_DEBUG</code> väärtuse oma <code>.env</code> failis <code>false</code>.',
     'delete'  				=> 'Kustuta',
     'delete_confirm'  		=> 'Kas olete kindel, et soovite kustutada :item?',
-    'delete_confirm_no_undo' => 'Are you sure you wish to delete :item? This can not be undone.',
+    'delete_confirm_no_undo' => 'Kas olete kindel, et soovite kustutada :item? Seda toimingut ei saa tagasi võtta.',
     'deleted'  				=> 'Kustutatud',
     'delete_seats'  		=> 'Kustutatud istmed',
     'deletion_failed'       => 'Kustutamine ebaõnnestus',
@@ -114,29 +122,13 @@ return [
     'editprofile'  			=> 'Muuda oma profiili',
     'eol'					=> 'EOL',
     'email_domain'			=> 'E-posti domeen',
-    'email_format'			=> 'E-maili formaat',
     'employee_number'       => 'Töötaja number',
     'email_domain_help'		=> 'Seda kasutatakse importimisel e-posti aadresside loomiseks',
     'error'				    => 'Tõrge',
     'exclude_archived'      => 'Välista Arhiveeritud Varad',
     'exclude_deleted'       => 'Välista Kustutatud Varad',
     'example'				=> 'Näide: ',
-    'filastname_format'			=> 'Esimene esmane perekonnanimi (jsmith@example.com)',
-    'firstname_lastname_format'	=> 'Eesnimi eesnimi (jane.smith@example.com)',
-    'firstname_lastname_underscore_format' => 'Eesnimi Perenimi (eesnimi.perenimi@poleolemas.ee)',
-    'lastnamefirstinitial_format' =>  'Perenimi Eesnime lühend (perenimie@poleolemas.ee)',
-    'firstintial_dot_lastname_format' => 'Eesnime algustäht Perenimi (j.smith@example.com)',
-    'firstname_lastname_display'	=> 'Eesnimi Perekonnanimi (Minu Nimi)',
-    'lastname_firstname_display'	=> 'Last Name First Name (Smith Jane)',
-    'name_display_format'	=> 'Nime Kuvamise Formaat',
-    'first'					=> 'Esimene',
-    'firstnamelastname'     => 'Eesnimi Perenimi (janesmith@example.com)',
-    'lastname_firstinitial' => 'Perenimi Eesnimi algustäht (smith_j@example.com)',
-    'firstinitial.lastname' => 'Eesnime algustäht Perekonnanimi (j.smith@example.com)',
-    'firstnamelastinitial'  => 'Eesnimi Perekonnanime algustäht (janes@example.com)',
-    'lastnamefirstname'      => 'Last Name First Name (smith.jane@example.com)',
-    'first_name'			=> 'Eesnimi',
-    'first_name_format'		=> 'Eesnimi (jane@example.com)',
+
     'files'                 => 'Failid',
     'file_name'				=> 'Fail',
     'file_type'             => 'Faili tüüp',
@@ -154,21 +146,21 @@ return [
     'id'  					=> 'ID',
     'image'                 => 'Pilt',
     'image_delete'         	=> 'Kustuta pilt',
-    'include_deleted'       => 'Include Deleted Assets',
+    'include_deleted'       => 'Kaasa Kustutatud Varad',
     'image_upload'         	=> 'Laadi pilt üles',
-    'filetypes_accepted_help'    => 'Aktsepteeritud failitüüp on :types. Maksimaalne lubatud üleslaaditav suurus on :size.|Aktsepteeritud failitüübid on :types. Maksimaalne lubatud üleslaadimise suurus on :size.',
-    'filetypes_size_help'   => 'Maksimaalne lubatud üleslaadimise suurus on :size.',
-    'image_filetypes_help'  => 'Accepted filetypes are jpg, webp, png, gif, svg, and avif. Max upload size allowed is :size.',
-    'unaccepted_image_type'  => 'This image file was not readable. Accepted filetypes are jpg, webp, png, gif, and svg. The mimetype of this file is: :mimetype.',
+    'filetypes_accepted_help'    => 'Aktsepteeritud failitüüp on: :types. Maksimaalne lubatud suurus on: :size." "Aktsepteeritud failitüübid on: :types. Maksimaalne lubatud üleslaadimise suurus on: :size.',
+    'filetypes_size_help'   => 'Maksimaalne lubatud üleslaadimise suurus on: :size.',
+    'image_filetypes_help'  => 'Aktsepteeritud failitüübid on jpg, webp, png, gif, svg ja avif. Maksimaalne lubatud üleslaadimise suurus on: :size.',
+    'unaccepted_image_type'  => 'Seda pildifaili ei olnud võimalik lugeda. Aktsepteeritud failitüübid on jpg, webp, png, gif ja svg. Selle faili Mime-tüüp on: :mimetype.',
     'import'         	    => 'Impordi',
-    'import_this_file'      => 'Map fields and process this file',
+    'import_this_file'      => 'Kaardista väljad ja töötle see fail',
     'importing'         	=> 'Importimine',
     'importing_help'        => 'CSV-faili kaudu saate importida vahendeid, tarvikuid, litsentse, komponente, kulumaterjale ja kasutajaid. <br><br>CSV peaks olema komadega eraldatud ja vormindatud päistega, mis ühtivad <a href="https://snipe-it.readme.io/docs/importing" target="_new">CSV-de näidistega dokumentatsioonis</a>.',
     'import-history'        => 'Impordi ajalugu',
     'asset_maintenance'        => 'Varade hooldus',
     'asset_maintenance_report' => 'Varade hooldusaruanne',
     'asset_maintenances'       => 'Vara säilimine',
-    'item'  				=> 'Kirje',
+    'item'  				=> 'Vara',
     'item_name'             => 'Üksuse nimi',
     'import_file'  			=> 'impordi CSV fail',
     'import_type'  			=> 'CSV impordi tüüp',
@@ -178,16 +170,21 @@ return [
     'last'					=> 'Viimane',
     'last_login'            => 'Viimane sisselogimine',
     'last_name'             => 'Perekonnanimi',
+    'firstname_lastname_display'	=> 'Eesnimi Perekonnanimi (Minu Nimi)',
+    'lastname_firstname_display'	=> 'Last Name First Name (Smith Jane)',
+    'name_display_format'	=> 'Nime Kuvamise Formaat',
+    'first'					=> 'Esimene',
+    'first_name'			=> 'Eesnimi',
     'license'				=> 'Litsents',
     'license_report'        => 'Litsentside aruanne',
     'licenses_available'	=> 'Vabad litsentsid',
     'licenses'				=> 'Litsentsid',
     'list_all'				=> 'Kuva kõik',
-    'loading'				=> 'Laadimine, palun oota...',
+    'loading'				=> 'Laadimine... palun oota...',
     'lock_passwords'        => 'Selle välja väärtust demoinstallatsioonis ei salvestata.',
     'feature_disabled'      => 'See funktsioon on demo installimisel keelatud.',
     'location'              => 'Asukoht',
-    'location_plural'        => 'Location|Locations',
+    'location_plural'        => 'Asukoht|Asukohad',
     'locations'				=> 'Asukohad',
     'logo_size'				=> 'Ruudukujulised logod näevad parimad välja logo + tekstiga. Logo maksimaalne kuvatav suurus on 50 pikslit kõrge x 500 pikslit lai.  ',
     'logout'				=> 'Logi välja',
@@ -206,8 +203,8 @@ return [
     'new_password'          => 'Uus parool',
     'next'					=> 'Järgmine',
     'next_audit_date'		=> 'Järgmine auditi kuupäev',
-    'next_audit_date_help'  => 'If you use auditing in your organization, this is usually automatically calculated based on the asset&apos;s last audit date and audit frequency (in <code>Admin Settings &gt; Alerts</code>) and you can leave this blank. You can manually set this date here if you need to, but it must be later than the last audit date. ',
-    'audit_images_help'     => 'You can find audit images in the asset\'s history tab.',
+    'next_audit_date_help'  => 'Kui kasutate oma organisatsioonis auditeerimist, arvutatakse see tavaliselt automaatselt vara&apos; viimase auditi kuupäeva ja auditi sageduse (<code>Administraatori seaded &gt;> Teavitused</code>) alusel ning võite selle tühjaks jätta. Kui teil on vaja, saate selle kuupäeva siin käsitsi määrata, kuid see peab olema hilisem kui viimane auditi kuupäev. ',
+    'audit_images_help'     => 'Auditipildid leiate vara ajaloo vahekaardilt.',
     'no_email'              => 'Selle kasutajaga ei ole seotud e-posti aadressi',
     'last_audit'		    => 'Viimane audit',
     'new'					=> 'uus!',
@@ -215,6 +212,14 @@ return [
     'no_results'			=> 'Tulemused puuduvad.',
     'no'  					=> 'Ei',
     'notes'  				=> 'Märkmed',
+    'note_added'            => 'Note Added',
+    'options'				=> 'Options',
+    'preview'				=> 'Preview',
+    'add_note'              => 'Add Note',
+    'note_edited'            => 'Note Edited',
+    'edit_note'              => 'Edit Note',
+    'note_deleted'            => 'Note Deleted',
+    'delete_note'              => 'Delete Note',
     'order_number'          => 'Tellimuse number',
     'only_deleted'          => 'Ainult kustutatud varad',
     'page_menu'				=> 'Näitab _MENU_ üksusi',
@@ -229,7 +234,7 @@ return [
     'purchase_date'         => 'Ostu kuupäev',
     'qty'		            => 'Hulk',
     'quantity'		        => 'Hulk',
-    'quantity_minimum'      => 'Sul on :count üksust alla või peaaegu alla minimaalse koguse taset',
+    'quantity_minimum'      => 'Teil on üks vara allpool või peaaegu allpool minimaalset kogustaset.Teil on :count eset allpool või peaaegu allpool minimaalset kogustaset',
     'quickscan_checkin'  	=> 'Kiire check-in (Quick scan)',
     'quickscan_checkin_status'  	=> 'Tagastamise olek',
     'ready_to_deploy'		=> 'Kasutamine valmis',
@@ -240,13 +245,13 @@ return [
     'restored'				=> 'taastatud',
     'restore'				=> 'Taasta',
     'requestable_models'    => 'Taotletavad mudelid',
-    'requestable_items'     => 'Requestable Items',
+    'requestable_items'     => 'Taotletavad mudelid',
     'requested'				=> 'Taotletud',
     'requested_date'        => 'Taotletav kuupäev',
     'requested_assets'      => 'Taotletavad vahendid',
     'requested_assets_menu' => 'Vaadake taotletud vahendeid',
     'request_canceled'      => 'Taotlus tühistati',
-    'request_item'          => 'Request this item',
+    'request_item'          => 'Taotle seda vara',
     'external_link_tooltip' => 'External link to',
     'save'  				=> 'Salvesta',
     'select_var'            => 'Select :thing... ', // this will eventually replace all of our other selects
@@ -274,18 +279,20 @@ return [
     'signed_off_by'         => 'Allkiri',
     'skin'       			=> 'Väljanägemine',
     'webhook_msg_note'        => 'A notification will be sent via webhook',
-    'webhook_test_msg'        => 'Oh hai! Looks like your :app integration with Snipe-IT is working!',
+    'webhook_test_msg'        => 'Juhhuu! Näib, et teie :app integratsioon Snipe-IT-ga töötab!',
     'some_features_disabled' => 'DEMOVERSIOON: Selles installatsioonis mõned funktsioonid ei tööta.',
     'site_name'				=> 'Saidi nimi',
     'state'  				=> 'Maakond',
     'status_labels'			=> 'Oleku sildid',
+    'status_label'			=> 'Oleku silt',
     'status'    			=> 'Staatus',
     'accept_eula'           => 'Lõppkasutaja litsentsilepinguga nõustumine',
+    'show_or_hide_eulas' => 'Kuva/Peida kasutustingimused',
     'supplier'              => 'Tarnija',
     'suppliers'  			=> 'Tarnijad',
     'sure_to_delete'        => 'Kas olete kindel, et soovite kustutada',
     'sure_to_delete_var'    => 'Kas olete kindel, et soovite kustutada :item?',
-    'delete_what'           => 'Delete :item',
+    'delete_what'           => 'Kustuta :item',
     'submit'				=> 'Kinnita',
     'target'                => 'Sihtimine',
     'time_and_date_display' => 'Kellaaja ja kuupäeva kuvamine',
@@ -296,15 +303,15 @@ return [
     'type'  				=> 'Tüüp',
     'undeployable'			=> 'Kasutuselevõtmatud',
     'unknown_admin'			=> 'Tundmatu Admin',
-    'username_format'		=> 'Kasutajanime formaat',
     'username'              => 'Kasutajanimi',
     'update'                => 'Uuenda',
+    'updating_item' => 'Updating :item',
     'upload_filetypes_help'      => 'Lubatud failileiendid on png, gif, jpg, jpeg, doc, docx, pdf, xls, txt, lic, zip ja rar. Suurim lubatud üleslaadimise maht on :size.',
     'uploaded'              => 'Üles laetud',
     'user'					=> 'Kasutaja',
     'accepted'			    => 'aktsepteeritud',
     'declined'			    => 'tagasi lükatud',
-    'declined_note'         => 'Declined Notes',
+    'declined_note'         => 'Tagasilükatud märkmed',
     'unassigned'            => 'Määramata',
     'unaccepted_asset_report' => 'Mitteaktsepteeritud varad',
     'users'                 => 'Kasutajad',
@@ -317,30 +324,30 @@ return [
     'yes' 					=> 'Jah',
     'zip'  					=> 'Postiindeks',
     'noimage'				=> 'Pilti pole üles laaditud või pilti ei leitud.',
-    'file_does_not_exist'   => 'The requested file does not exist on the server.',
+    'file_does_not_exist'   => 'Nõutud faili ei eksisteeri serveris.',
     'file_upload_success'   => 'Faili üleslaadimine õnnestus!',
     'no_files_uploaded'     => 'Faili üleslaadimine õnnestus!',
     'token_expired'         => 'Teie vormi seanss on aegunud. Palun proovi uuesti.',
     'login_enabled'         => 'Sisselogimine lubatud',
     'audit_due'             => 'Audit',
-    'audit_due_days'        => 'Assets Due for Audit Within :days Day|Assets Due for Audit Within :days Days',
-    'checkin_due'           => 'Due for Checkin',
-    'checkin_overdue'       => 'Overdue for Checkin',
-    'checkin_due_days'      => 'Assets Due for Checkin Within :days Day|Assets Due for Checkin Within :days Days',
+    'audit_due_days'        => '{}Assets Due or Overdue for Audit|[1]Assets Due or Overdue for Audit Within a Day|[2,*]Assets Due or Overdue for Audit Within :days Days',
+    'checkin_due'           => 'Tagastamiseks vajalik',
+    'checkin_overdue'       => 'Tagastamise tähtaeg ületatud',
+    'checkin_due_days'      => '{}Due for Checkin|[1]Assets Due for Checkin Within :days Day|[2,*]Assets Due for Checkin Within :days Days',
     'audit_overdue'         => 'Hilinenud audit',
     'accept'                => 'Kinnita :asset',
     'i_accept'              => 'Ma kinnitan',
     'i_decline'             => 'Ma keeldun',
     'accept_decline'        => 'Aktsepteeri/Keeldu',
-    'sign_tos'              => 'Sign below to indicate that you agree to the terms of service:',
-    'clear_signature'       => 'Clear Signature',
+    'sign_tos'              => 'Allkirjasta allpool, et kinnitada oma nõusolekut teenusetingimustega:',
+    'clear_signature'       => 'Puhasta allkirja väli',
     'show_help'             => 'Näita abi',
     'hide_help'             => 'Peida abi',
     'view_all'              => 'kuva kõik',
     'hide_deleted'          => 'Peida kustutatud',
     'email'                 => 'E-mail',
-    'do_not_change'         => 'Do Not Change',
-    'bug_report'            => 'Report a Bug',
+    'do_not_change'         => 'Do not change',
+    'bug_report'            => 'Teata veast',
     'user_manual'           => 'Kasutusjuhend',
     'setup_step_1'          => 'Step 1',
     'setup_step_2'          => 'Step 2',
@@ -348,7 +355,7 @@ return [
     'setup_step_4'          => 'Step 4',
     'setup_config_check'    => 'Configuration Check',
     'setup_create_database' => 'Loo andmebaasi tabelid',
-    'setup_create_admin'    => 'Create Admin User',
+    'setup_create_admin'    => 'Loo admin kasutaja',
     'setup_done'            => 'Lõpetatud!',
     'bulk_edit_about_to'    => 'Oled muutmas järgnevat: ',
     'checked_out'           => 'Väljastatud',
@@ -357,14 +364,14 @@ return [
     'last_checkout'         => 'Viimati väljastatud',
     'due_to_checkin'        => 'Järgnevad :count üksust tuleb peagi tagastada:',
     'expected_checkin'      => 'Eeldatav tagastus',
-    'reminder_checked_out_items' => 'This is a reminder of the items currently checked out to you. If you feel this list is inaccurate (something is missing, or something appears here that you believe you never received), please email :reply_to_name at :reply_to_address.',
+    'reminder_checked_out_items' => 'See on meeldetuletus teile väljastatud varadest. Kui tunnete, et see nimekiri on ebatäpne (midagi on puudu või midagi on siin, mida te usute, et te pole kunagi saanud), siis palun saatke e-kiri aadressile :reply_to_name aadressil :reply_to_address.',
     'changed'               => 'Muudetud',
     'to'                    => 'To',
     'report_fields_info'    => '<p>Select the fields you would like to include in your custom report, and click Generate. The file (custom-asset-report-YYYY-mm-dd.csv) will download automatically, and you can open it in Excel.</p>
             <p>If you would like to export only certain assets, use the options below to fine-tune your results.</p>',
     'range'                 => 'Vahemik',
-    'bom_remark'            => 'Add a BOM (byte-order mark) to this CSV',
-    'improvements'          => 'Improvements',
+    'bom_remark'            => 'Lisa sellele CSV-le BOM (baiti järjekorra mark)',
+    'improvements'          => 'Täiendused',
     'information'           => 'Informatsioon',
     'permissions'           => 'Õigused',
     'managed_ldap'          => '(Managed via LDAP)',
@@ -383,6 +390,8 @@ return [
     'new_license'           => 'New License',
     'new_accessory'         => 'New Accessory',
     'new_consumable'        => 'Uus kulumaterjal',
+    'new_component'         => 'New Component',
+    'new_user'              => 'New User',
     'collapse'              => 'Ahenda',
     'assigned'              => 'Määratud',
     'asset_count'           => 'Vahendi kogus',
@@ -418,19 +427,20 @@ return [
     'bulk_soft_delete'      =>'Also soft-delete these users. Their asset history will remain intact unless/until you purge deleted records in the Admin Settings.',
     'bulk_checkin_delete_success' => 'Your selected users have been deleted and their items have been checked in.',
     'bulk_checkin_success' => 'The items for the selected users have been checked in.',
-    'set_to_null'           => 'Delete values for this asset|Delete values for all :asset_count assets ',
+    'set_to_null'           => 'Delete values for this selection|Delete values for all :selection_count selections ',
     'set_users_field_to_null'  => 'Delete :field values for this user|Delete :field values for all :user_count users ',
     'na_no_purchase_date'   => 'N/A - No purchase date provided',
     'assets_by_status'      => 'Assets by Status',
     'assets_by_status_type'      => 'Assets by Status Type',
     'pie_chart_type'        => 'Dashboard Pie Chart Type',
     'hello_name'            => 'Hello, :name!',
-    'unaccepted_profile_warning'   => 'You have :count items requiring acceptance. Click here to accept or decline them',
+    'unaccepted_profile_warning'   => 'You have one item requiring acceptance. Click here to accept or decline it | You have :count items requiring acceptance. Click here to accept or decline them',
     'start_date'            => 'Alguskuupäev',
     'end_date'            => 'End Date',
     'alt_uploaded_image_thumbnail' => 'Uploaded thumbnail',
     'placeholder_kit'       => 'Select a kit',
     'file_not_found'        => 'File not found',
+    'log_record_not_found'  => 'No record for that log entry was found.',
     'preview_not_available' => '(no preview)',
     'setup'                 => 'Setup',
     'pre_flight'            => 'Pre-Flight',
@@ -512,7 +522,7 @@ return [
     'checked_out_to_fields' => 'Checked Out To Fields',
     'percent_complete' => '% tehtud',
     'uploading' => 'Uploading... ',
-    'upload_error' => 'Error uploading file. Please check that there are no empty rows and that no column names are duplicated.',
+    'upload_error' => 'Error uploading file. Please check that you have no empty rows or duplicated column names in your CSV, and that the server permissions allow uploads.',
     'copy_to_clipboard' => 'Copy to Clipboard',
     'copied' => 'Copied!',
     'status_compatibility' => 'If assets are already assigned, they cannot be changed to a non-deployable status type and this value change will be skipped.',
@@ -549,6 +559,71 @@ return [
         'license_seats'  => ':count License Seat|:count License Seats',
         'consumables'  => ':count Consumable|:count Consumables',
         'components'  => ':count Component|:count Components',
-    ]
+    ],
+
+    'more_info' => 'Rohkem infot',
+    'quickscan_bulk_help' => 'Checking this box will edit the asset record to reflect this new location. Leaving it unchecked will simply note the location in the audit log. Note that if this asset is checked out, it will not change the location of the person, asset or location it is checked out to.',
+    'whoops' => 'Whoops!',
+    'something_went_wrong' => 'Something went wrong with your request.',
+    'close' => 'Close',
+    'expires' => 'Aegub',
+    'map_fields'=> 'Map :item_type Fields',
+    'remaining_var' => ':count Remaining',
+    'label' => 'Label',
+    'import_asset_tag_exists' => 'An asset with the asset tag :asset_tag already exists and an update was not requested. No change was made.',
+    'countries_manually_entered_help' => 'Values with an asterisk (*) were manually entered and do not match existing ISO 3166 dropdown values',
+    'accessories_assigned' => 'Assigned Accessories',
+    'user_managed_passwords' => 'Password Management',
+    'user_managed_passwords_disallow' => 'Disallow users from managing their own passwords',
+    'user_managed_passwords_allow' => 'Allow users to manage their own passwords',
+    'from' => 'From',
+    'by' => 'Kes',
+
+// Add form placeholders here
+    'placeholders' => [
+        'notes'  => 'Add a note',
+    ],
+
+    'breadcrumb_button_actions' => [
+        'edit_item' => 'Edit :name',
+        'checkout_item' => 'Checkout :name',
+        'checkin_item' => 'Checkin :name',
+    ],
+
+    'skins' => [
+        'site_default' => 'Site Default',
+        'default_blue' => 'Default Blue',
+        'blue_dark' => 'Blue (Dark Mode)',
+        'green' => 'Green Dark',
+        'green_dark' => 'Green (Dark Mode)',
+        'red' => 'Red Dark',
+        'red_dark' => 'Red (Dark Mode)',
+        'orange' => 'Orange Dark',
+        'orange_dark' => 'Orange (Dark Mode)',
+        'black' => 'Black',
+        'black_dark' => 'Black (Dark Mode)',
+        'purple' => 'Purple',
+        'purple_dark' => 'Purple (Dark Mode)',
+        'yellow' => 'Yellow',
+        'yellow_dark' => 'Yellow (Dark Mode)',
+        'high_contrast' => 'High Contrast',
+
+    ],
+
+    'select_all_none' => 'Select/Unselect All',
+    'generic_model_not_found' => 'That :model was not found or you do not have permission to access it',
+    'deleted_models' => 'Deleted Asset Models',
+    'deleted_users' => 'Deleted Users',
+    'cost_each' => ':amount each',
+    'remove_current_image' => 'Remove current :type image',
+
+    'seeding' => [
+        'manufacturers' => [
+            'button' => 'Create Manufacturers',
+            'prompt' => 'You do not have any manufacturers yet. Would you like to seed a list of common manufacturers? (THIS WILL OVERWRITE EXISTING MANUFACTURERS, including those that have been soft-deleted.)',
+            'success' => 'Manufacturers seeded successfully',
+            'error' => 'Could not seed manufacturers. A manufacturer record already exists and seeding would overwrite it.|Could not seed manufacturers. :count manufacturer records already exist and seeding would overwrite them.',
+        ],
+    ],
 
 ];
diff --git a/resources/lang/et-EE/localizations.php b/resources/lang/et-EE/localizations.php
index f1232dd138..827ed4fca1 100644
--- a/resources/lang/et-EE/localizations.php
+++ b/resources/lang/et-EE/localizations.php
@@ -2,7 +2,7 @@
 
 return [
 
-    'select_language' => 'Select a language',
+    'select_language' => 'Select a Language',
     'languages' => [
         'en-US'=> 'English, US',
         'en-GB'=> 'English, UK',
@@ -40,7 +40,9 @@ return [
         'ms-MY'=> 'Malay',
         'mi-NZ'=> 'Maori',
         'mn-MN'=> 'Mongolian',
-        'no-NO'=> 'Norwegian',
+        'nb-NO'=> 'Norwegian Bokmål',
+        'om-ET' => 'Oromo (Ethiopian)',
+        //'nn-NO'=> 'Norwegian Nynorsk',
         'fa-IR'=> 'Persian',
         'pl-PL'=> 'Polish',
         'pt-PT'=> 'Portuguese',
@@ -66,7 +68,7 @@ return [
         'zu-ZA'=> 'Zulu',
     ],
 
-    'select_country' => 'Select a country',
+    'select_country' => 'Select a Country',
     
     'countries' => [
         'AC'=>'Ascension Island',
@@ -133,6 +135,7 @@ return [
         'EC'=>'Ecuador',
         'EE'=>'Estonia',
         'EG'=>'Egypt',
+        'GB-ENG'=>'England',
         'ER'=>'Eritrea',
         'ES'=>'Spain',
         'ET'=>'Ethiopia',
@@ -231,6 +234,7 @@ return [
         'NG'=>'Nigeria',
         'NI'=>'Nicaragua',
         'NL'=>'Netherlands',
+        'GB-NIR' => 'Northern Ireland',
         'NO'=>'Norway',
         'NP'=>'Nepal',
         'NR'=>'Nauru',
@@ -258,7 +262,7 @@ return [
         'RU'=>'Russian Federation',
         'RW'=>'Rwanda',
         'SA'=>'Saudi Arabia',
-        'UK'=>'Scotland',
+        'GB-SCT'=>'Scotland',
         'SB'=>'Solomon Islands',
         'SC'=>'Seychelles',
         'SS'=>'South Sudan',
@@ -310,6 +314,7 @@ return [
         'VI'=>'Virgin Islands (U.S.)',
         'VN'=>'Viet Nam',
         'VU'=>'Vanuatu',
+        'GB-WLS' =>'Wales',
         'WF'=>'Wallis And Futuna Islands',
         'WS'=>'Samoa',
         'YE'=>'Yemen',
diff --git a/resources/lang/et-EE/mail.php b/resources/lang/et-EE/mail.php
index 99ceaa021d..3de2010194 100644
--- a/resources/lang/et-EE/mail.php
+++ b/resources/lang/et-EE/mail.php
@@ -23,24 +23,25 @@ return [
     'Item_Requested' => 'Taotletud üksus',
     'License_Checkin_Notification' => 'Litsents sisse võetud',
     'License_Checkout_Notification' => 'Litsents väljastatud',
+    'license_for'   => 'License for',
     'Low_Inventory_Report' => 'Madal inventuuriaruanne',
     'a_user_canceled' => 'Kasutaja on tühistanud üksuse taotluse veebis',
     'a_user_requested' => 'Kasutaja on taotlenud üksuse veebis',
     'acceptance_asset_accepted' => 'Kasutaja aktsepteeris seadme',
     'acceptance_asset_declined' => 'Kasutaja keeldus seadmest',
-    'accessory_name' => 'Lisaseade Nimi:',
-    'additional_notes' => 'Lisamärkmed:',
+    'accessory_name' => 'Tarviku Nimi',
+    'additional_notes' => 'Lisamärkmed',
     'admin_has_created' => 'Administraator on loonud konto teile: veebisaidil.',
-    'asset' => 'Vahend:',
-    'asset_name' => 'Vahendi nimi:',
+    'asset' => 'Vahend',
+    'asset_name' => 'Ressursi nimi',
     'asset_requested' => 'Taotletud vahend',
     'asset_tag' => 'Varade silt',
     'assets_warrantee_alert' => 'Sul on :count vahend, mille garantii aegub järgmise :threshold päeva jooksul.|Sul on :count vahendit, mille garantii aegub järgmise :threshold päeva jooksul.',
     'assigned_to' => 'Määratud',
     'best_regards' => 'Parimate soovidega,',
-    'canceled' => 'Tühistatud:',
-    'checkin_date' => 'Checkin Date:',
-    'checkout_date' => 'Checkout Date:',
+    'canceled' => 'Tühistatud',
+    'checkin_date' => 'Tagastamise kuupäev',
+    'checkout_date' => 'Väljastamise kuupäev',
     'checkedout_from' => 'Väljastatud',
     'checkedin_from'  => 'Vastu võetud',
     'checked_into' => 'Väljastatud',
@@ -49,27 +50,30 @@ return [
     'click_to_confirm' => 'Kinnitamiseks klõpsake järgmisel lingil: veebikonto:',
     'current_QTY' => 'Praegune QTY',
     'days' => 'päeva',
-    'expecting_checkin_date' => 'Ootel Checkin Kuupäev:',
+    'expecting_checkin_date' => 'Eeldatav tagastamise kuupäev',
     'expires' => 'Aegub',
     'hello' => 'Tere',
     'hi' => 'Tere',
-    'i_have_read' => 'Olen lugenud ja nõustun kasutustingimustega ja saanud selle kirje.',
+    'i_have_read' => 'Olen lugenud ja nõustun kasutustingimustega ja saanud selle vara.',
     'inventory_report' => 'Inventari aruanne',
-    'item' => 'Kirje:',
+    'item' => 'Vara',
+    'item_checked_reminder' => 'This is a reminder that you currently have :count items checked out to you that you have not accepted or declined. Please click the link below to confirm your decision.',
     'license_expiring_alert' => ':count litsents aegub järgmise :threshold päeva jooksul.|:count litsentsi aegub järgmise :threshold päeva jooksul.',
     'link_to_update_password' => 'Klienditeenuse uuendamiseks klõpsake järgmisel lingil:',
-    'login' => 'Logi sisse:',
+    'login' => 'Logi sisse',
     'login_first_admin' => 'Logige oma uude Snipe-IT-seadmesse sisse, kasutades allpool toodud mandaate.',
     'low_inventory_alert' => ':count üksus on laos alla miinimummäära või saab varsti otsa.|:count üksust on laos alla miinimummäära või saab varsti otsa.',
     'min_QTY' => 'Min QTY',
     'name' => 'Nimi',
     'new_item_checked' => 'Uus vara on Teie nimele väljastatud, üksikasjad on allpool.',
+    'new_item_checked_with_acceptance' => 'A new item has been checked out under your name that requires acceptance, details are below.',
+    'recent_item_checked' => 'An item was recently checked out under your name that requires acceptance, details are below.',
     'notes' => 'Märkused',
-    'password' => 'Parool:',
+    'password' => 'Parool',
     'password_reset' => 'Parooli taastamine',
     'read_the_terms' => 'Palun lugege allpool toodud kasutustingimusi.',
     'read_the_terms_and_click' => 'Palun lugege läbi allpool toodud kasutustingimused ja klõpsake alloleval lingil kinnitamiseks, et lugesite läbi ja nõustute kasutustingimustega, ning olete vara kätte saanud.',
-    'requested' => 'Taotletud:',
+    'requested' => 'Taotletud',
     'reset_link' => 'Teie salasõna lähtestamise link',
     'reset_password' => 'Parooli lähtestamiseks klõpsake siin:',
     'rights_reserved' => 'Kõik õigused kaitstud.',
@@ -86,8 +90,10 @@ return [
     'upcoming-audits' => 'Sul on :count vahend, mida tuleb auditeerida :threshold päeva jooksul.|Sul on :count vahendit, mida tuleb auditeerida :threshold päeva jooksul.',
     'user' => 'Kasutaja',
     'username' => 'Kasutajanimi',
+    'unaccepted_asset_reminder' => 'Reminder: You have Unaccepted Assets.',
     'welcome' => 'Tere tulemast, :name',
     'welcome_to' => 'Teretulemast lehele :web!',
     'your_assets' => 'Vaata oma varasi',
     'your_credentials' => 'Sinu Snipe-IT rekvisiidid',
+    'mail_sent' => 'Mail sent successfully!',
 ];
diff --git a/resources/lang/et-EE/table.php b/resources/lang/et-EE/table.php
index dc36c3bdca..1615d15a0d 100644
--- a/resources/lang/et-EE/table.php
+++ b/resources/lang/et-EE/table.php
@@ -5,7 +5,7 @@ return array(
     'actions'	 	        => 'Tegevused',
     'action' 		        => 'Tegevus',
     'by'      		        => 'Kes',
-    'item' 			        => 'Kirje',
+    'item' 			        => 'Vara',
     'no_matching_records'   => 'No matching records found',
 
 );
diff --git a/resources/lang/et-EE/validation.php b/resources/lang/et-EE/validation.php
index 37f292a3ce..1346302b9c 100644
--- a/resources/lang/et-EE/validation.php
+++ b/resources/lang/et-EE/validation.php
@@ -13,87 +13,150 @@ return [
     |
     */
 
-    'accepted'             => 'Atribuut peab olema aktsepteeritav.',
-    'active_url'           => 'Atribuut: ei ole kehtiv URL.',
-    'after'                => 'Atribuut peab olema kuupäev pärast: kuupäev.',
-    'after_or_equal'       => 'Atribuut peab olema kuupäev või kuupäev: kuupäev.',
-    'alpha'                => 'Atribuut: võib sisaldada ainult tähti.',
-    'alpha_dash'           => 'Atribuut: võib sisaldada ainult tähte, numbreid ja kriipsu.',
-    'alpha_num'            => 'Atribuut: võib sisaldada ainult tähti ja numbreid.',
-    'array'                => 'Atribuut peab olema massiiv.',
-    'before'               => 'Atribuut peab olema kuupäev: kuupäev.',
-    'before_or_equal'      => 'Atribuut peab olema kuupäev või kuupäev: kuupäev.',
-    'between'              => [
-        'numeric' => 'Atribuut peab olema vahemikus min ja max max.',
-        'file'    => 'Atribuut peab olema vahemikus min ja max kilobaitides.',
-        'string'  => 'Atribuut peab olema vahemikus min: max tähemärki.',
-        'array'   => 'Atribuut peab olema vahemikus: min ja max max.',
+    'accepted' => ':attribute väli peab olema aktsepteeritud.',
+    'accepted_if' => 'The :attribute field must be accepted when :other is :value.',
+    'active_url' => 'The :attribute field must be a valid URL.',
+    'after' => 'The :attribute field must be a date after :date.',
+    'after_or_equal' => 'The :attribute field must be a date after or equal to :date.',
+    'alpha' => 'The :attribute field must only contain letters.',
+    'alpha_dash' => 'The :attribute field must only contain letters, numbers, dashes, and underscores.',
+    'alpha_num' => 'The :attribute field must only contain letters and numbers.',
+    'array' => 'The :attribute field must be an array.',
+    'ascii' => 'The :attribute field must only contain single-byte alphanumeric characters and symbols.',
+    'before' => 'The :attribute field must be a date before :date.',
+    'before_or_equal' => 'The :attribute field must be a date before or equal to :date.',
+    'between' => [
+        'array' => 'The :attribute field must have between :min and :max items.',
+        'file' => 'The :attribute field must be between :min and :max kilobytes.',
+        'numeric' => 'The :attribute field must be between :min and :max.',
+        'string' => 'The :attribute field must be between :min and :max characters.',
     ],
-    'boolean'              => 'Atribuudiväljadele peab olema tõene või vale.',
-    'confirmed'            => 'Atribuudi kinnitus ei sobi.',
-    'date'                 => 'Atribuut: ei ole kehtiv kuupäev.',
-    'date_format'          => 'Atribuut: ei vasta vormingule: vorming.',
-    'different'            => 'Atribuut: and: teine ​​peab olema erinev.',
-    'digits'               => 'Atribuut peab olema: numbrite numbrid.',
-    'digits_between'       => 'Atribuut peab olema vahemikus min ja max max.',
-    'dimensions'           => 'Atribuudil on vale kujutise mõõtmed.',
-    'distinct'             => 'Atribuudiväljal on duplikaadi väärtus.',
-    'email'                => 'Atribuut peab olema kehtiv e-posti aadress.',
-    'exists'               => 'Valitud atribuut on kehtetu.',
-    'file'                 => 'Atribuut peab olema fail.',
-    'filled'               => 'Atribuudiväljal peab olema väärtus.',
-    'image'                => 'Atribuut peab olema pilt.',
+    'boolean' => 'Atribuudiväljadele :attribute peab olema tõene või vale.',
+    'can' => 'The :attribute field contains an unauthorized value.',
+    'confirmed' => 'The :attribute field confirmation does not match.',
+    'contains' => 'The :attribute field is missing a required value.',
+    'current_password' => 'The password is incorrect.',
+    'date' => 'The :attribute field must be a valid date.',
+    'date_equals' => 'The :attribute field must be a date equal to :date.',
+    'date_format' => 'The :attribute field must match the format :format.',
+    'decimal' => 'The :attribute field must have :decimal decimal places.',
+    'declined' => 'The :attribute field must be declined.',
+    'declined_if' => 'The :attribute field must be declined when :other is :value.',
+    'different' => 'The :attribute field and :other must be different.',
+    'digits' => 'The :attribute field must be :digits digits.',
+    'digits_between' => 'The :attribute field must be between :min and :max digits.',
+    'dimensions' => 'The :attribute field has invalid image dimensions.',
+    'distinct' => 'Atribuudiväljal on duplikaadi väärtus.',
+    'doesnt_end_with' => 'The :attribute field must not end with one of the following: :values.',
+    'doesnt_start_with' => 'The :attribute field must not start with one of the following: :values.',
+    'email' => 'The :attribute field must be a valid email address.',
+    'ends_with' => 'The :attribute field must end with one of the following: :values.',
+    'enum' => 'Valitud :attrubute on kehtetu.',
+    'exists' => 'Valitud atribuut on kehtetu.',
+    'extensions' => 'The :attribute field must have one of the following extensions: :values.',
+    'file' => 'The :attribute field must be a file.',
+    'filled' => 'Atribuudiväljal peab olema väärtus.',
+    'gt' => [
+        'array' => 'The :attribute field must have more than :value items.',
+        'file' => 'The :attribute field must be greater than :value kilobytes.',
+        'numeric' => 'The :attribute field must be greater than :value.',
+        'string' => 'The :attribute field must be greater than :value characters.',
+    ],
+    'gte' => [
+        'array' => 'The :attribute field must have :value items or more.',
+        'file' => 'The :attribute field must be greater than or equal to :value kilobytes.',
+        'numeric' => 'The :attribute field must be greater than or equal to :value.',
+        'string' => 'The :attribute field must be greater than or equal to :value characters.',
+    ],
+    'hex_color' => 'The :attribute field must be a valid hexadecimal color.',
+    'image' => 'The :attribute field must be an image.',
     'import_field_empty'    => 'The value for :fieldname cannot be null.',
-    'in'                   => 'Valitud atribuut on kehtetu.',
-    'in_array'             => 'Atribuudiväljal pole olemas: muud.',
-    'integer'              => 'Atribuut peab olema täisarv.',
-    'ip'                   => 'Atribuut peab olema kehtiv IP-aadress.',
-    'ipv4'                 => 'Atribuut peab olema kehtiv IPv4 aadress.',
-    'ipv6'                 => 'Atribuut peab olema kehtiv IPv6 aadress.',
-    'is_unique_department' => 'The :attribute must be unique to this Company Location',
-    'json'                 => 'Atribuut peab olema kehtiv JSON-string.',
-    'max'                  => [
-        'numeric' => 'Atribuut: ei tohi olla suurem kui: maks.',
-        'file'    => 'Atribuut: ei tohi olla suurem kui: max kilobaiti.',
-        'string'  => 'Atribuut: ei tohi olla suurem kui: max tähemärki.',
-        'array'   => 'Atribuut: ei tohi sisaldada rohkem kui: max elemente.',
+    'in' => 'Valitud atribuut on kehtetu.',
+    'in_array' => 'The :attribute field must exist in :other.',
+    'integer' => 'The :attribute field must be an integer.',
+    'ip' => 'The :attribute field must be a valid IP address.',
+    'ipv4' => 'The :attribute field must be a valid IPv4 address.',
+    'ipv6' => 'The :attribute field must be a valid IPv6 address.',
+    'json' => 'The :attribute field must be a valid JSON string.',
+    'list' => 'The :attribute field must be a list.',
+    'lowercase' => 'The :attribute field must be lowercase.',
+    'lt' => [
+        'array' => 'The :attribute field must have less than :value items.',
+        'file' => 'The :attribute field must be less than :value kilobytes.',
+        'numeric' => 'The :attribute field must be less than :value.',
+        'string' => 'The :attribute field must be less than :value characters.',
     ],
-    'mimes'                => 'Atribuut peab olema faili tüüp:: values.',
-    'mimetypes'            => 'Atribuut peab olema faili tüüp:: values.',
-    'min'                  => [
-        'numeric' => 'Atribuut peab olema vähemalt: min.',
-        'file'    => 'Atribuut peab olema vähemalt: min kilobaiti.',
-        'string'  => 'Atribuut peab olema vähemalt: min tähemärki.',
-        'array'   => 'Atribuudil peab olema vähemalt: min kirjeid.',
+    'lte' => [
+        'array' => 'The :attribute field must not have more than :value items.',
+        'file' => 'The :attribute field must be less than or equal to :value kilobytes.',
+        'numeric' => 'The :attribute field must be less than or equal to :value.',
+        'string' => 'The :attribute field must be less than or equal to :value characters.',
     ],
-    'starts_with'          => 'The :attribute must start with one of the following: :values.',
-    'ends_with'            => 'The :attribute must end with one of the following: :values.',
+    'mac_address' => 'The :attribute field must be a valid MAC address.',
+    'max' => [
+        'array' => 'The :attribute field must not have more than :max items.',
+        'file' => 'The :attribute field must not be greater than :max kilobytes.',
+        'numeric' => 'The :attribute field must not be greater than :max.',
+        'string' => 'The :attribute field must not be greater than :max characters.',
+    ],
+    'max_digits' => 'The :attribute field must not have more than :max digits.',
+    'mimes' => 'The :attribute field must be a file of type: :values.',
+    'mimetypes' => 'The :attribute field must be a file of type: :values.',
+    'min' => [
+        'array' => 'The :attribute field must have at least :min items.',
+        'file' => 'The :attribute field must be at least :min kilobytes.',
+        'numeric' => 'The :attribute field must be at least :min.',
+        'string' => 'The :attribute field must be at least :min characters.',
+    ],
+    'min_digits' => 'The :attribute field must have at least :min digits.',
+    'missing' => 'The :attribute field must be missing.',
+    'missing_if' => 'The :attribute field must be missing when :other is :value.',
+    'missing_unless' => 'The :attribute field must be missing unless :other is :value.',
+    'missing_with' => 'The :attribute field must be missing when :values is present.',
+    'missing_with_all' => 'The :attribute field must be missing when :values are present.',
+    'multiple_of' => 'The :attribute field must be a multiple of :value.',
+    'not_in' => 'Valitud atribuut on kehtetu.',
+    'not_regex' => 'The :attribute field format is invalid.',
+    'numeric' => 'The :attribute field must be a number.',
+    'password' => [
+        'letters' => 'The :attribute field must contain at least one letter.',
+        'mixed' => 'The :attribute field must contain at least one uppercase and one lowercase letter.',
+        'numbers' => 'The :attribute field must contain at least one number.',
+        'symbols' => 'The :attribute field must contain at least one symbol.',
+        'uncompromised' => 'The given :attribute has appeared in a data leak. Please choose a different :attribute.',
+    ],
+    'percent'       => 'The depreciation minimum must be between 0 and 100 when depreciation type is percentage.',
 
-    'not_in'               => 'Valitud atribuut on kehtetu.',
-    'numeric'              => 'Atribuut peab olema number.',
-    'present'              => 'Atribuudiväli peab olema kohal.',
-    'valid_regex'          => 'See ei ole õige regex süntaks. ',
-    'regex'                => 'Atribuudivorming on vale.',
-    'required'             => 'Atribuudiväljandus on kohustuslik.',
-    'required_if'          => 'Atribuudiväljastus on vajalik, kui: muu on: väärtus.',
-    'required_unless'      => 'Atribuudiväljandus on vajalik, välja arvatud juhul, kui: muu on: väärtused.',
-    'required_with'        => 'Atribuudiväljund on vajalik, kui: väärtused on olemas.',
-    'required_with_all'    => 'Atribuudiväljund on vajalik, kui: väärtused on olemas.',
-    'required_without'     => 'Atribuudiväljund on vajalik, kui: väärtusi ei leidu.',
+    'present' => 'Atribuudiväli peab olema kohal.',
+    'present_if' => 'The :attribute field must be present when :other is :value.',
+    'present_unless' => 'The :attribute field must be present unless :other is :value.',
+    'present_with' => 'The :attribute field must be present when :values is present.',
+    'present_with_all' => 'The :attribute field must be present when :values are present.',
+    'prohibited' => 'The :attribute field is prohibited.',
+    'prohibited_if' => 'The :attribute field is prohibited when :other is :value.',
+    'prohibited_unless' => 'The :attribute field is prohibited unless :other is in :values.',
+    'prohibits' => 'The :attribute field prohibits :other from being present.',
+    'regex' => 'The :attribute field format is invalid.',
+    'required' => 'Atribuudiväljandus on kohustuslik.',
+    'required_array_keys' => 'The :attribute field must contain entries for: :values.',
+    'required_if' => 'Atribuudiväljastus on vajalik, kui: muu on: väärtus.',
+    'required_if_accepted' => 'The :attribute field is required when :other is accepted.',
+    'required_if_declined' => 'The :attribute field is required when :other is declined.',
+    'required_unless' => 'Atribuudiväljandus on vajalik, välja arvatud juhul, kui: muu on: väärtused.',
+    'required_with' => 'Atribuudiväljund on vajalik, kui: väärtused on olemas.',
+    'required_with_all' => 'The :attribute field is required when :values are present.',
+    'required_without' => 'Atribuudiväljund on vajalik, kui: väärtusi ei leidu.',
     'required_without_all' => 'Atribuudiväljund on vajalik, kui ükski: väärtusest pole olemas.',
-    'same'                 => 'Atribuut:: ja teine ​​peab vastama.',
-    'size'                 => [
-        'numeric' => 'Atribuut peab olema: suurus.',
-        'file'    => 'Atribuut peab olema: suurus kilobaitides.',
-        'string'  => 'Atribuut peab olema: suuruse tähtedega.',
-        'array'   => 'Atribuut peab sisaldama: suuruse elemente.',
+    'same' => 'The :attribute field must match :other.',
+    'size' => [
+        'array' => 'The :attribute field must contain :size items.',
+        'file' => 'The :attribute field must be :size kilobytes.',
+        'numeric' => 'The :attribute field must be :size.',
+        'string' => 'The :attribute field must be :size characters.',
     ],
+    'starts_with' => 'The :attribute field must start with one of the following: :values.',
     'string'               => 'Atribuut peab olema string.',
-    'timezone'             => 'Atribuut peab olema kehtiv tsoon.',
     'two_column_unique_undeleted' => 'The :attribute must be unique across :table1 and :table2. ',
-    'unique'               => 'Atribuut: on juba võetud.',
-    'uploaded'             => 'Atribuut ei õnnestunud üles laadida.',
-    'url'                  => 'Atribuudivorming on vale.',
     'unique_undeleted'     => ':attribute peab olema ainulaadne.',
     'non_circular'         => 'The :attribute must not create a circular reference.',
     'not_array'            => ':attribute cannot be an array.',
@@ -102,11 +165,14 @@ return [
     'numbers'              => 'Parool peab sisaldama vähemalt ühte numbrit.',
     'case_diff'            => 'Parool peab sisaldama väike- ja suurtähti.',
     'symbols'              => 'Parool peab sisaldama sümboleid.',
-    'gte'                  => [
-        'numeric'          => 'Value cannot be negative'
-    ],
-    'checkboxes'           => ':attribute contains invalid options.',
-    'radio_buttons'        => ':attribute is invalid.',
+    'timezone' => 'The :attribute field must be a valid timezone.',
+    'unique' => 'Atribuut: on juba võetud.',
+    'uploaded' => 'Atribuut ei õnnestunud üles laadida.',
+    'uppercase' => 'The :attribute field must be uppercase.',
+    'url' => 'The :attribute field must be a valid URL.',
+    'ulid' => 'The :attribute field must be a valid ULID.',
+    'uuid' => 'The :attribute field must be a valid UUID.',
+    'fmcs_location' => 'Full multiple company support and location scoping is enabled in the Admin Settings, and the selected location and selected company are not compatible.',
 
 
     /*
@@ -120,16 +186,22 @@ return [
     |
     */
 
+    'email_array'      => 'Üks või mitu e-posti aadressi on kehtetu.',
+    'checkboxes'           => ':attribute contains invalid options.',
+    'radio_buttons'        => ':attribute is invalid.',
+    
     'custom' => [
         'alpha_space' => 'Atribuudi väli sisaldab märk, mis pole lubatud.',
-        'email_array'      => 'Üks või mitu e-posti aadressi on kehtetu.',
+
         'hashed_pass'      => 'Teie praegune parool on vale',
         'dumbpwd'          => 'See parool on liiga levinud.',
         'statuslabel_type' => 'Peate valima kehtiva olekutüübi tüübi',
+        'custom_field_not_found'          => 'This field does not seem to exist, please double check your custom field names.',
+        'custom_field_not_found_on_model' => 'This field seems to exist, but is not available on this Asset Model\'s fieldset.',
 
         // date_format validation with slightly less stupid messages. It duplicates a lot, but it gets the job done :(
-        // We use this because the default error message for date_format is reflects php Y-m-d, which non-PHP
-        // people won't know how to format. 
+        // We use this because the default error message for date_format reflects php Y-m-d, which non-PHP
+        // people won't know how to format.
         'purchase_date.date_format'     => 'The :attribute must be a valid date in YYYY-MM-DD format',
         'last_audit_date.date_format'   =>  'The :attribute must be a valid date in YYYY-MM-DD hh:mm:ss format',
         'expiration_date.date_format'   =>  'The :attribute must be a valid date in YYYY-MM-DD format',
@@ -137,9 +209,15 @@ return [
         'expected_checkin.date_format'  =>  'The :attribute must be a valid date in YYYY-MM-DD format',
         'start_date.date_format'        =>  'The :attribute must be a valid date in YYYY-MM-DD format',
         'end_date.date_format'          =>  'The :attribute must be a valid date in YYYY-MM-DD format',
+        'invalid_value_in_field' => 'Invalid value included in this field',
 
-    ],
+        'ldap_username_field' => [
+            'not_in' =>         '<code>sAMAccountName</code> (mixed case) will likely not work. You should use <code>samaccountname</code> (lowercase) instead.'
+        ],
+        'ldap_auth_filter_query' => ['not_in' => '<code>uid=samaccountname</code> is probably not a valid auth filter. You probably want <code>uid=</code> '],
+        'ldap_filter' => ['regex' => 'This value should probably not be wrapped in parentheses.'],
 
+        ],
     /*
     |--------------------------------------------------------------------------
     | Custom Validation Attributes
@@ -155,8 +233,16 @@ return [
 
     /*
     |--------------------------------------------------------------------------
-    | Generic Validation Messages
+    | Generic Validation Messages - we use these in the jquery validation where we don't have
+    | access to the :attribute
     |--------------------------------------------------------------------------
     */
-    'invalid_value_in_field' => 'Invalid value included in this field',
+
+    'generic' => [
+        'invalid_value_in_field' => 'Invalid value included in this field',
+        'required' => 'This field is required',
+        'email' => 'Please enter a valid email address',
+    ],
+
+
 ];
diff --git a/resources/lang/fa-IR/account/general.php b/resources/lang/fa-IR/account/general.php
index 2578229301..4a0ae07ce7 100644
--- a/resources/lang/fa-IR/account/general.php
+++ b/resources/lang/fa-IR/account/general.php
@@ -2,6 +2,9 @@
 
 return array(
     'personal_api_keys' => 'کلیدهای API شخصی',
+    'personal_access_token' => 'Personal Access Token',
+    'personal_api_keys_success' => 'Personal API Key :key created sucessfully',
+    'here_is_api_key' => 'Here is your new personal access token. This is the only time it will be shown so do not lose it! You may now use this token to make API requests.',
     'api_key_warning' => 'When generating an API token, be sure to copy it down immediately as they will not be visible to you again.',
     'api_base_url' => 'url پایه API شما در این آدرس قرار دارد:',
     'api_base_url_endpoint' => '/&lt;endpoint&gt;
@@ -10,4 +13,7 @@ return array(
     'api_token_expiration_time' => 'توکن‌های API در موارد زیر منقضی می‌شوند:',
     'api_reference' => 'Please check the <a href="https://snipe-it.readme.io/reference" target="_blank">API reference</a> to find specific API endpoints and additional API documentation.',
     'profile_updated' => 'Account successfully updated',
+    'no_tokens' => 'You have not created any personal access tokens.',
+    'enable_sounds' => 'Enable sound effects',
+    'enable_confetti' => 'Enable confetti effects',
 );
diff --git a/resources/lang/fa-IR/admin/accessories/general.php b/resources/lang/fa-IR/admin/accessories/general.php
index 2735702a1c..bde40034fd 100644
--- a/resources/lang/fa-IR/admin/accessories/general.php
+++ b/resources/lang/fa-IR/admin/accessories/general.php
@@ -18,7 +18,7 @@ return array(
  استفاده کنید',
     'use_default_eula_disabled'			=> 'از پیشفرض اولیه EULA استفاده کنید.<del>هیچ پیشفرضی اولیه ای تنظیم نشده است</del>
 در تنظیمات اضافه کنید',
-    'clone'                             => 'Clone Accessory',
-    'delete_disabled'                   => 'This accessory cannot be deleted yet because some items are still checked out.',
+    'clone'                             => 'کپی کردن وسیله',
+    'delete_disabled'                   => 'امکان حذف وسیله وجود ندارد چون هنوز تعدادی از آیتم ها تحویل شده اند.',
 
 );
diff --git a/resources/lang/fa-IR/admin/accessories/message.php b/resources/lang/fa-IR/admin/accessories/message.php
index b30f84d75d..9810bc8548 100644
--- a/resources/lang/fa-IR/admin/accessories/message.php
+++ b/resources/lang/fa-IR/admin/accessories/message.php
@@ -3,7 +3,7 @@
 return array(
 
     'does_not_exist' => 'ابزار/وسیله [:id] وجود ندارد.',
-    'not_found' => 'That accessory was not found.',
+    'not_found' => 'وسیله پیدا نشد.',
     'assoc_users'	 => 'این وسیله هم اکنون:آیتم های چک شده به کاربران را حساب کنید.لطفا در لوازم جانبی چک کنید و دوباره امتحان کنید',
 
     'create' => array(
@@ -25,8 +25,12 @@ return array(
      'checkout' => array(
         'error'   		=> 'وسیله چک نشده بود. لطفا دوباره امتحان کنید',
         'success' 		=> 'وسیله با موفقیت چک شد.',
-        'unavailable'   => 'Accessory is not available for checkout. Check quantity available',
-        'user_does_not_exist' => 'کاربر نامعتبر است. لطفا دوباره امتحان کنید.'
+        'unavailable'   => 'امکان تحویل وسیله وجود ندارد. تعداد موجودی را چک کنید',
+        'user_does_not_exist' => 'کاربر نامعتبر است. لطفا دوباره امتحان کنید.',
+         'checkout_qty' => array(
+            'lte'  => 'فقط یک عدد از این وسیله وجود دارد و شما می‌خواهید :checkout_qty تا از آن را تحویل دهید. لطفا تعداد تحویل یا موجودی وسیله را چک کنید و مجدد تلاش کنید.|فقط :number_currently_remaining عدد از این وسیله وجود دارد و شما می‌خواهید :checkout_qty تا از آن را تحویل دهید. لطفا تعداد تحویل یا موجودی وسیله را چک کنید و مجدد تلاش کنید.',
+            ),
+           
     ),
 
     'checkin' => array(
diff --git a/resources/lang/fa-IR/admin/accessories/table.php b/resources/lang/fa-IR/admin/accessories/table.php
index 7a668abed3..73de2b5450 100644
--- a/resources/lang/fa-IR/admin/accessories/table.php
+++ b/resources/lang/fa-IR/admin/accessories/table.php
@@ -6,6 +6,4 @@ return array(
     'id'      					=> 'شناسه',
     'require_acceptance'      	=> 'پذیرش',
     'title'      				=> 'نام وسیله',
-
-
 );
diff --git a/resources/lang/fa-IR/admin/asset_maintenances/form.php b/resources/lang/fa-IR/admin/asset_maintenances/form.php
index 9d209d6ca5..40811654c9 100644
--- a/resources/lang/fa-IR/admin/asset_maintenances/form.php
+++ b/resources/lang/fa-IR/admin/asset_maintenances/form.php
@@ -1,14 +1,14 @@
 <?php
 
     return [
-        'asset_maintenance_type' => 'Asset Maintenance Type',
+        'asset_maintenance_type' => 'نوع نگهداری دارایی',
         'title'                  => 'عنوان',
-        'start_date'             => 'Start Date',
-        'completion_date'        => 'Completion Date',
+        'start_date'             => 'تاریخ شروع',
+        'completion_date'        => 'تاریخ پایان',
         'cost'                   => 'هزینه',
         'is_warranty'            => 'بهبود ضمانت',
-        'asset_maintenance_time' => 'Asset Maintenance Time (in days)',
+        'asset_maintenance_time' => 'زمان نگهداری دارایی (به روز)',
         'notes'                  => 'یادداشت ها',
-        'update'                 => 'Update Asset Maintenance',
-        'create'                 => 'Create Asset Maintenance'
+        'update'                 => 'بروزرسانی نگهداشت دارایی',
+        'create'                 => 'ایجاد نگهداشت دارایی'
     ];
diff --git a/resources/lang/fa-IR/admin/categories/general.php b/resources/lang/fa-IR/admin/categories/general.php
index f21b800467..92c2e0d245 100644
--- a/resources/lang/fa-IR/admin/categories/general.php
+++ b/resources/lang/fa-IR/admin/categories/general.php
@@ -8,8 +8,8 @@ return array(
     'clone'                             => 'دسته بندی کلون',
     'create'  							=> 'ایجاد دسته جدید',
     'edit'                              => 'ویرایش دسته‌ بندی',
-    'email_will_be_sent_due_to_global_eula' => 'An email will be sent to the user because the global EULA is being used.',
-    'email_will_be_sent_due_to_category_eula' => 'An email will be sent to the user because a EULA is set for this category.',
+    'email_will_be_sent_due_to_global_eula' => 'به خاطر استفاده از موافقتنامه عمومی یک ایمیل به کاربر ارسال می‌گردد.',
+    'email_will_be_sent_due_to_category_eula' => 'به خاطر تنطیم یک موافقتنامه برای این دسته بنده یک ایمیل به کاربر ارسال می‌گردد.',
     'eula_text'							=> 'دسته بندی EULA',
     'eula_text_help'					=> 'این فید به امکان این را میدهد که EULA های خود را با توجه به دارایی سفارشی سازی کنید. اگر شما فقط یک EULA برای تمام دارایی خود دارید،میتوانید گزینه زیر را فعال کنید تا از پیشفرض اولیه استفاده کنید.',
     'name'                              => 'نام دسته',
diff --git a/resources/lang/fa-IR/admin/categories/message.php b/resources/lang/fa-IR/admin/categories/message.php
index 56f071e549..532d93e645 100644
--- a/resources/lang/fa-IR/admin/categories/message.php
+++ b/resources/lang/fa-IR/admin/categories/message.php
@@ -14,7 +14,7 @@ return array(
     'update' => array(
         'error'   => 'دسته بندی به روزرسانی نشد.لطفا دوباره تلاش کنید.',
         'success' => 'دسته بندی با موفقیت به روزرسانی شد.',
-        'cannot_change_category_type'   => 'You cannot change the category type once it has been created',
+        'cannot_change_category_type'   => 'شما نمیتوانید نوع دسته بندی را بعد از ایجاد آن تغییر دهید',
     ),
 
     'delete' => array(
diff --git a/resources/lang/fa-IR/admin/companies/message.php b/resources/lang/fa-IR/admin/companies/message.php
index ae3a5094c4..9b410abd97 100644
--- a/resources/lang/fa-IR/admin/companies/message.php
+++ b/resources/lang/fa-IR/admin/companies/message.php
@@ -2,7 +2,7 @@
 
 return [
     'does_not_exist' => 'شرکت وجود ندارد.',
-    'deleted'        => 'Deleted company',
+    'deleted'        => 'شرکت حذف شده',
     'assoc_users'    => 'این دسته بندی هم اکنون حداقل با یک مدل شریک است و نمیتوان حذف کرد.لطفا مدل های خود را به روزرسانی کنید تا این دسته بندی را ارجاع ندهند و دوباره امتحان کنید. ',
     'create' => [
         'error'   => 'شرکت ایجاد نشد،دوباره سعی کنید.',
diff --git a/resources/lang/fa-IR/admin/companies/table.php b/resources/lang/fa-IR/admin/companies/table.php
index c79835e293..03828cdf2c 100644
--- a/resources/lang/fa-IR/admin/companies/table.php
+++ b/resources/lang/fa-IR/admin/companies/table.php
@@ -2,9 +2,9 @@
 return array(
     'companies' => 'شرکت ها',
     'create'    => 'ایجاد شرکت',
-    'email'     => 'Company Email',
+    'email'     => 'ایمیل شرکت',
     'title'     => 'شرکت',
-    'phone'     => 'Company Phone',
+    'phone'     => 'تلفن شرکت',
     'update'    => 'بروزرسانی شرکت',
     'name'      => 'نام شرکت',
     'id'        => 'شناسه',
diff --git a/resources/lang/fa-IR/admin/components/general.php b/resources/lang/fa-IR/admin/components/general.php
index dd2ffe7407..93918043ba 100644
--- a/resources/lang/fa-IR/admin/components/general.php
+++ b/resources/lang/fa-IR/admin/components/general.php
@@ -12,5 +12,5 @@ return array(
     'remaining' 			             => 'یاقیمانده',
     'total' 			                 => 'مجموع',
     'update'                            => 'بروزرسانی کامپیوننت',
-    'checkin_limit'            => 'Amount checked in must be equal to or less than :assigned_qty'
+    'checkin_limit'            => 'مقدار دریافت باید کمتر یا مساوی :assigned_qty باشد'
 );
diff --git a/resources/lang/fa-IR/admin/components/message.php b/resources/lang/fa-IR/admin/components/message.php
index 48acad948f..30cd4e445e 100644
--- a/resources/lang/fa-IR/admin/components/message.php
+++ b/resources/lang/fa-IR/admin/components/message.php
@@ -17,14 +17,15 @@ return array(
     'delete' => array(
         'confirm'   => 'آیا مطمعن هستید میخواهید این کامپیوننت را پاک کنید؟?',
         'error'   => 'موضوع کامپوننت حذف شد. لطفا دوباره سعی کنید.',
-        'success' => 'کامپیوننت حذف شد.'
+        'success' => 'کامپیوننت حذف شد.',
+        'error_qty'   => 'Some components of this type are still checked out. Please check them in and try again.',
     ),
 
      'checkout' => array(
         'error'   		=> 'کامپیوننت پرداخت نشد ، دوباره سعی کنید.',
         'success' 		=> 'کامپیوننت پرداخت شد.',
         'user_does_not_exist' => 'کاربر نامعتبر است لطفا دوباره امتحان کنید.',
-        'unavailable'      => 'Not enough components remaining: :remaining remaining, :requested requested ',
+        'unavailable'      => 'کامپوننت کافی وجود ندارد: :remaining تا وجو دارد :requested درخواست شده است ',
     ),
 
     'checkin' => array(
diff --git a/resources/lang/fa-IR/admin/consumables/general.php b/resources/lang/fa-IR/admin/consumables/general.php
index c7e25f26b1..65486b6b7d 100644
--- a/resources/lang/fa-IR/admin/consumables/general.php
+++ b/resources/lang/fa-IR/admin/consumables/general.php
@@ -8,4 +8,5 @@ return array(
     'remaining' 			            => 'یاقیمانده',
     'total' 			                => 'مجموع',
     'update'                            => 'به روز رسانی لوازم مصرفي',
+    'inventory_warning'                 => 'The inventory of this consumable is below the minimum amount of :min_count',
 );
diff --git a/resources/lang/fa-IR/admin/consumables/message.php b/resources/lang/fa-IR/admin/consumables/message.php
index dfdb68a17d..fe9796bbea 100644
--- a/resources/lang/fa-IR/admin/consumables/message.php
+++ b/resources/lang/fa-IR/admin/consumables/message.php
@@ -2,6 +2,7 @@
 
 return array(
 
+    'invalid_category_type' => 'The category must be a consumable category.',
     'does_not_exist' => 'مواد مصرفی یافت نشد.',
 
     'create' => array(
diff --git a/resources/lang/fa-IR/admin/custom_fields/general.php b/resources/lang/fa-IR/admin/custom_fields/general.php
index 68ce3fb8d0..0cf07eae25 100644
--- a/resources/lang/fa-IR/admin/custom_fields/general.php
+++ b/resources/lang/fa-IR/admin/custom_fields/general.php
@@ -38,7 +38,7 @@ return [
 ',
     'value_encrypted'      	        => 'ارزش این فیلد در پایگاه داده رمزگذاری شده است. فقط کاربران مدیریت قادر به مشاهده مقدار رمزگشایی خواهند شد',
     'show_in_email'     => 'Include the value of this field in checkout emails sent to the user? Encrypted fields cannot be included in emails',
-    'show_in_email_short'     => 'Include in emails.',
+    'show_in_email_short' => 'Include in emails',
     'help_text' => 'متن راهنما',
     'help_text_description' => 'این متن اختیاری است که هنگام ویرایش یک دارایی برای ارائه زمینه در فیلد در زیر عناصر فرم ظاهر می شود.
 ',
@@ -70,5 +70,8 @@ return [
     'show_in_requestable_list_short' => 'Show in requestable assets list',
     'show_in_requestable_list' => 'Show value in requestable assets list. Encrypted fields will not be shown',
     'encrypted_options' => 'This field is encrypted, so some display options will not be available.',
+    'display_checkin' => 'Display in checkin forms',
+    'display_checkout' => 'Display in checkout forms',
+    'display_audit' => 'Display in audit forms',
 
 ];
diff --git a/resources/lang/fa-IR/admin/custom_fields/message.php b/resources/lang/fa-IR/admin/custom_fields/message.php
index 2eb06f7fd3..0e46eeb239 100644
--- a/resources/lang/fa-IR/admin/custom_fields/message.php
+++ b/resources/lang/fa-IR/admin/custom_fields/message.php
@@ -5,6 +5,7 @@ return array(
     'field' => array(
         'invalid'   => 'این زمینه وجود ندارد.',
         'already_added'   => 'زمینه اضافه شده است',
+        'none_selected'   => 'No field selected',
 
         'create' => array(
             'error'   => 'فیلد ایجاد نشده است، لطفا دوباره تلاش کنید.',
diff --git a/resources/lang/fa-IR/admin/depreciations/general.php b/resources/lang/fa-IR/admin/depreciations/general.php
index 94ff13ab9b..ee2323f8b5 100644
--- a/resources/lang/fa-IR/admin/depreciations/general.php
+++ b/resources/lang/fa-IR/admin/depreciations/general.php
@@ -15,4 +15,8 @@ return [
     'no_depreciations_warning'               => '<strong>هشدار: </strong>
                       شما در حال حاضر هیچ استهلاکی تنظیم نکرده اید.
                       لطفاً حداقل یک استهلاک برای مشاهده گزارش استهلاک تنظیم کنید.',
+    'depreciation_method'                   => 'استهلاک گزارش',
+    'linear_depreciation'                   => 'Linear (Default)',
+    'half_1'                                => 'Half-year convention, always applied',
+    'half_2'                                => 'Half-year convention, applied with condition',
 ];
diff --git a/resources/lang/fa-IR/admin/hardware/form.php b/resources/lang/fa-IR/admin/hardware/form.php
index a85204fd55..09787d84f8 100644
--- a/resources/lang/fa-IR/admin/hardware/form.php
+++ b/resources/lang/fa-IR/admin/hardware/form.php
@@ -69,10 +69,13 @@ return [
     'asset_location_update_default' => 'فقط بروزرسانی مکان پیش‌فرض',
     'asset_location_update_actual' => 'Update only actual location',
     'asset_not_deployable' => 'این وضعیت دارایی قابل استقرار نیست. این دارایی قابل پذیرش نیست.',
-    'asset_deployable' => 'این وضعیت دارایی قابل استقرار است. این دارایی قابل پذیرش است.',
+    'asset_not_deployable_checkin' => 'That asset status is not deployable. Using this status label will checkin the asset.',
+    'asset_deployable' => 'This asset can be checked out.',
     'processing_spinner' => 'Processing... (This might take a bit of time on large files)',
+    'processing' => 'در حال پردازش... ',
     'optional_infos'  => 'اطلاعات دلخواه
 ',
     'order_details'   => 'اطلاعات مربوط به سفارش
-'
+',
+    'calc_eol'    => 'If nulling the EOL date, use automatic EOL calculation based on the purchase date and EOL rate.',
 ];
diff --git a/resources/lang/fa-IR/admin/hardware/general.php b/resources/lang/fa-IR/admin/hardware/general.php
index 39c33ef8a0..2356fe21ce 100644
--- a/resources/lang/fa-IR/admin/hardware/general.php
+++ b/resources/lang/fa-IR/admin/hardware/general.php
@@ -5,9 +5,8 @@ return [
     'about_assets_text'            => 'دارایی ها مواردی هستند که توسط شماره سریال یا برچسب دارایی دنبال می شوند. آنها تمایل دارند که مقادیر ارزش بیشتری داشته باشند که در آن شناسایی یک مورد خاص موردنیاز باشد.',
     'archived'  				=> 'بایگانی شد',
     'asset'  					=> 'دارایی',
-    'bulk_checkout'             => 'خروج دارایی ها',
-    'bulk_checkin'              => 'دارایی های ثبت نام
-',
+    'bulk_checkout'             => 'پرداخت بزرگ',
+    'bulk_checkin'              => 'Bulk Checkin',
     'checkin'  					=> 'دارایی checkin',
     'checkout'  				=> 'دارایی پرداخت',
     'clone'  					=> 'دارایی شگرف',
@@ -33,8 +32,7 @@ return [
 ',
     'csv_error' => 'شما یک خطا در فایل CSV خود دارید:
 ',
-    'import_text' => '<p>Upload a CSV that contains asset history. The assets and users MUST already exist in the system, or they will be skipped. Matching assets for history import happens against the asset tag. We will try to find a matching user based on the user\'s name you provide, and the criteria you select below. If you do not select any criteria below, it will simply try to match on the username format you configured in the <code>Admin &gt; General Settings</code>.</p><p>Fields included in the CSV must match the headers: <strong>Asset Tag, Name, Checkout Date, Checkin Date</strong>. Any additional fields will be ignored. </p><p>Checkin Date: blank or future checkin dates will checkout items to associated user.  Excluding the Checkin Date column will create a checkin date with todays date.</p>
-    ',
+    'import_text' => '<p>Upload a CSV that contains asset history. The assets and users MUST already exist in the system, or they will be skipped. Matching assets for history import happens against the asset tag. We will try to find a matching user based on the user\'s name you provide, and the criteria you select below. If you do not select any criteria below, it will simply try to match on the username format you configured in the <code>Admin &gt; General Settings</code>.</p><p>Fields included in the CSV must match the headers: <strong>Asset Tag, Name, Checkout Date, Checkin Date</strong>. Any additional fields will be ignored. </p><p>Checkin Date: blank or future checkin dates will checkout items to associated user.  Excluding the Checkin Date column will create a checkin date with todays date.</p>    ',
     'csv_import_match_f-l' => 'Try to match users by <strong>firstname.lastname</strong> (<code>jane.smith</code>) format',
     'csv_import_match_initial_last' => 'Try to match users by <strong>first initial last name</strong> (<code>jsmith</code>) format',
     'csv_import_match_first' => 'Try to match users by <strong>first name</strong> (<code>jane</code>) format',
diff --git a/resources/lang/fa-IR/admin/hardware/message.php b/resources/lang/fa-IR/admin/hardware/message.php
index 23218c1a57..02f4f49cc6 100644
--- a/resources/lang/fa-IR/admin/hardware/message.php
+++ b/resources/lang/fa-IR/admin/hardware/message.php
@@ -2,19 +2,24 @@
 
 return [
 
-    'undeployable' 		=> '<strong> اخطار: </ strong> این دارایی به برانگیز گزارش شده است که در حال حاضر undeployable. اگر این وضعیت تغییر کرده است، لطفا به روز رسانی وضعیت دارایی.',
-    'does_not_exist' 	=> 'دارایی وجود ندارد.',
-    'does_not_exist_var'=> 'Asset with tag :asset_tag not found.',
-    'no_tag' 	        => 'No asset tag provided.',
+    'undeployable' 		 => '<strong>Warning: </strong> This asset has been marked as currently undeployable. If this status has changed, please update the asset status.',
+    'does_not_exist' 	 => 'دارایی وجود ندارد.',
+    'does_not_exist_var' => 'Asset with tag :asset_tag not found.',
+    'no_tag' 	         => 'No asset tag provided.',
     'does_not_exist_or_not_requestable' => 'آن دارایی وجود ندارد یا قابل درخواست نیست.
 ',
-    'assoc_users'	 	=> 'این دارایی در حال حاضر به یک کاربر چک کردن و پاک نمی شود. لطفا دارایی در اولین بار چک کنید، و سپس سعی کنید دوباره حذف کنید.',
+    'assoc_users'	 	 => 'این دارایی در حال حاضر به یک کاربر چک کردن و پاک نمی شود. لطفا دارایی در اولین بار چک کنید، و سپس سعی کنید دوباره حذف کنید.',
     'warning_audit_date_mismatch' 	=> 'This asset\'s next audit date (:next_audit_date) is before the last audit date (:last_audit_date). Please update the next audit date.',
+    'labels_generated'   => 'Labels were successfully generated.',
+    'error_generating_labels' => 'Error while generating labels.',
+    'no_assets_selected' => 'No assets selected.',
 
     'create' => [
         'error'   		=> 'دارایی ساخته نشده است، لطفا دوباره تلاش کنید.',
         'success' 		=> 'دارایی موفقیت ایجاد شده است. :)',
         'success_linked' => 'Asset with tag :tag was created successfully. <strong><a href=":link" style="color: white;">Click here to view</a></strong>.',
+        'multi_success_linked' => 'Asset with tag :links was created successfully.|:count assets were created succesfully. :links.',
+        'partial_failure' => 'An asset was unable to be created. Reason: :failures|:count assets were unable to be created. Reasons: :failures',
     ],
 
     'update' => [
@@ -53,20 +58,24 @@ return [
     ],
 
     'import' => [
+        'import_button'         => 'Process Import',
         'error'                 => 'بعضی از موارد به درستی وارد نشدند.',
         'errorDetail'           => 'موارد زیر به علت خطا وارد نشده است.',
         'success'               => 'فایل شما وارد شده است',
         'file_delete_success'   => 'فایل شما با موفقیت حذف شده است',
         'file_delete_error'      => 'فایل قابل حذف نشد',
         'file_missing' => 'The file selected is missing',
+        'file_already_deleted' => 'The file selected was already deleted',
         'header_row_has_malformed_characters' => 'One or more attributes in the header row contain malformed UTF-8 characters',
         'content_row_has_malformed_characters' => 'One or more attributes in the first row of content contain malformed UTF-8 characters',
+        'transliterate_failure' => 'Transliteration from :encoding to UTF-8 failed due to invalid characters in input'
     ],
 
 
     'delete' => [
         'confirm'   	=> 'آیا شما مطمئن هستید که می خواهید این تنظیمات دارایی را حذف کنید؟',
         'error'   		=> 'اشکال در حذف دارایی.لطفا دوباره تلاش کنید.',
+        'assigned_to_error' => '{1}Asset Tag: :asset_tag is currently checked out. Check in this device before deletion.|[2,*]Asset Tags: :asset_tag are currently checked out. Check in these devices before deletion.',
         'nothing_updated'   => 'هیچ دارایی انتخاب نشده بود، بنابراین هیچ چیز حذف نشد.',
         'success' 		=> 'دارایی با موفقیت حذف شد.',
     ],
@@ -79,6 +88,11 @@ return [
         'no_assets_selected' => 'شما حداقل باید یک دارایی از لیست انتخاب کنید',
     ],
 
+    'multi-checkout' => [
+        'error'   => 'Asset was not checked out, please try again|Assets were not checked out, please try again',
+        'success' => 'Asset checked out successfully.|Assets checked out successfully.',
+    ],
+
     'checkin' => [
         'error'   		=> 'دارایی در بررسی نیست، لطفا دوباره امتحان کنید',
         'success' 		=> 'دارایی ها با موفقیت در بررسی.',
@@ -88,9 +102,10 @@ return [
     ],
 
     'requests' => [
-        'error'   		=> 'دارایی شد درخواست نمی کند، لطفا دوباره امتحان کنید',
-        'success' 		=> 'دارایی موفقیت درخواست شده است.',
-        'canceled'      => 'درخواست پرداخت با موفقیت لغو شد',
+        'error'   		=> 'Request was not successful, please try again.',
+        'success' 		=> 'Request successfully submitted.',
+        'canceled'      => 'Request successfully canceled.',
+        'cancel'        => 'Cancel this item request',
     ],
 
 ];
diff --git a/resources/lang/fa-IR/admin/hardware/table.php b/resources/lang/fa-IR/admin/hardware/table.php
index 4ea5fcba57..2e689e4766 100644
--- a/resources/lang/fa-IR/admin/hardware/table.php
+++ b/resources/lang/fa-IR/admin/hardware/table.php
@@ -29,8 +29,6 @@ return [
 ',
     'days_without_acceptance' => 'روز بدون پذیرش',
     'monthly_depreciation' => 'استهلاک ماهانه
-',
-    'assigned_to'    => 'اختصاص یافته به
 ',
     'requesting_user' => 'کاربر درخواست کننده
 ',
diff --git a/resources/lang/fa-IR/admin/kits/general.php b/resources/lang/fa-IR/admin/kits/general.php
index 9732815ae3..83e5c662b3 100644
--- a/resources/lang/fa-IR/admin/kits/general.php
+++ b/resources/lang/fa-IR/admin/kits/general.php
@@ -85,4 +85,5 @@ return [
 ',
     'kit_model_updated'                 => 'کاربر با موفقیت به روز شد',
     'kit_model_detached'                => 'کاربر با موفقیت حذف شد',
+    'model_already_attached'            => 'Model already attached to kit',
 ];
diff --git a/resources/lang/fa-IR/admin/licenses/general.php b/resources/lang/fa-IR/admin/licenses/general.php
index 25a1cf0eba..acbe0edb8a 100644
--- a/resources/lang/fa-IR/admin/licenses/general.php
+++ b/resources/lang/fa-IR/admin/licenses/general.php
@@ -15,6 +15,7 @@ return array(
     'info'  					=> 'اطلاعات پروانه',
     'license_seats'  			=> 'صندلی مجوز',
     'seat'  					=> 'صندلی',
+    'seat_count'  				=> 'Seat :count',
     'seats'  					=> 'صندلی ها',
     'software_licenses'  		=> 'گواهی نامه های نرم افزاری',
     'user'  					=> 'کاربر',
@@ -24,12 +25,12 @@ return array(
         [
             'checkin_all'           => [
                 'button'            => 'Checkin All Seats',
-                'modal'             => 'This will action checkin one seat. | This action will checkin all :checkedout_seats_count seats for this license.',
+                'modal'             => 'This action will checkin one seat. | This action will checkin all :checkedout_seats_count seats for this license.',
                 'enabled_tooltip'   => 'Checkin ALL seats for this license from both users and assets',
                 'disabled_tooltip'  => 'This is disabled because there are no seats currently checked out',
                 'disabled_tooltip_reassignable'  => 'This is disabled because the License is not reassignable',
                 'success'           => 'License successfully checked in! | All licenses were successfully checked in!',
-                'log_msg'           => 'Checked in via bulk license checkout in license GUI',
+                'log_msg'           => 'Checked in via bulk license checkin in license GUI',
             ],
 
             'checkout_all'              => [
diff --git a/resources/lang/fa-IR/admin/licenses/message.php b/resources/lang/fa-IR/admin/licenses/message.php
index ed862d3925..23f0cb35a3 100644
--- a/resources/lang/fa-IR/admin/licenses/message.php
+++ b/resources/lang/fa-IR/admin/licenses/message.php
@@ -45,10 +45,13 @@ return array(
         'error'   => 'بود یک موضوع چک کردن مجوز وجود دارد. لطفا دوباره تلاش کنید.',
         'success' => 'مجوز خارج بررسی شد موفقیت',
         'not_enough_seats' => 'Not enough license seats available for checkout',
+        'mismatch' => 'The license seat provided does not match the license',
+        'unavailable' => 'This seat is not available for checkout.',
     ),
 
     'checkin' => array(
         'error'   => 'بود یک موضوع چک کردن در مجوز وجود دارد. لطفا دوباره تلاش کنید.',
+        'not_reassignable' => 'License not reassignable',
         'success' => 'مجوز بررسی شده با موفقیت'
     ),
 
diff --git a/resources/lang/fa-IR/admin/locations/message.php b/resources/lang/fa-IR/admin/locations/message.php
index f24c8ade41..8bf94326aa 100644
--- a/resources/lang/fa-IR/admin/locations/message.php
+++ b/resources/lang/fa-IR/admin/locations/message.php
@@ -3,11 +3,12 @@
 return array(
 
     'does_not_exist' => 'مکان وجود ندارد.',
-    'assoc_users'    => 'This location is not currently deletable because it is the location of record for at least one asset or user, has assets assigned to it, or is the parent location of another location. Please update your models to no longer reference this company and try again. ',
+    'assoc_users'    => 'This location is not currently deletable because it is the location of record for at least one asset or user, has assets assigned to it, or is the parent location of another location. Please update your records to no longer reference this location and try again ',
     'assoc_assets'	 => 'این مکان در حال حاضر همراه با حداقل یک دارایی است و قادر به حذف نمی شود. لطفا بروز دارایی های خود را به دیگر این مکان مرجع و دوباره امتحان کنید. ',
     'assoc_child_loc'	 => 'این مکان در حال حاضر پدر و مادر کودک حداقل یک مکان است و قادر به حذف نمی شود. لطفا به روز رسانی مکان خود را به دیگر این مکان مرجع و دوباره امتحان کنید. ',
     'assigned_assets' => 'Assigned Assets',
     'current_location' => 'Current Location',
+    'open_map' => 'Open in :map_provider_icon Maps',
 
 
     'create' => array(
@@ -20,6 +21,11 @@ return array(
         'success' => 'مکان با موفقیت به روز رسانی شد.'
     ),
 
+    'restore' => array(
+        'error'   => 'Location was not restored, please try again',
+        'success' => 'Location restored successfully.'
+    ),
+
     'delete' => array(
         'confirm'   	=> 'آیا مطمئن هستید که می خواهید این مکان را حذف کنید؟',
         'error'   => 'یک مشکل در حذف مکان وجود دارد،دوباره سعی کنید.',
diff --git a/resources/lang/fa-IR/admin/locations/table.php b/resources/lang/fa-IR/admin/locations/table.php
index 80fcdfc0bf..24e14db8b1 100644
--- a/resources/lang/fa-IR/admin/locations/table.php
+++ b/resources/lang/fa-IR/admin/locations/table.php
@@ -40,4 +40,5 @@ return [
     'signed_by_finance_auditor' => 'امضاء توسط (ممیز مالی):',
     'signed_by_location_manager' => 'امضاء توسط (ممیز مکانی):',
     'signed_by'                 => 'امضاء اختتام توسط:',
+    'clone'  					=> 'Clone Location',
 ];
diff --git a/resources/lang/fa-IR/admin/models/general.php b/resources/lang/fa-IR/admin/models/general.php
index 0b70f9253f..91ad700946 100644
--- a/resources/lang/fa-IR/admin/models/general.php
+++ b/resources/lang/fa-IR/admin/models/general.php
@@ -3,7 +3,7 @@
 return array(
     'about_models_title'     => 'درباره مدل های دارایی',
     'about_models_text'           => 'مدل های دارایی یک راه برای گروه بندی دارایی های یکسان هستند. "MBP 2013"، "IPhone 6s" و غیره',
-    'deleted'  					        => 'این نمودار حذف شده است.',
+    'deleted'  					=> 'این نمودار حذف شده است.',
     'bulk_delete'               => 'حذف دسته جمعی مدل های دارایی',
     'bulk_delete_help'               => 'برای تأیید حذف مدل‌های دارایی انتخاب شده از کادرهای تأیید زیر استفاده کنید. مدل‌های دارایی‌هایی که دارایی‌های مرتبط با آن‌ها هستند، تا زمانی که دارایی‌ها با مدل دیگری مرتبط نشوند، قابل حذف نیستند.
 ',
diff --git a/resources/lang/fa-IR/admin/models/message.php b/resources/lang/fa-IR/admin/models/message.php
index 965b632071..3fd7f148ab 100644
--- a/resources/lang/fa-IR/admin/models/message.php
+++ b/resources/lang/fa-IR/admin/models/message.php
@@ -7,7 +7,7 @@ return array(
     'no_association' => 'WARNING! The asset model for this item is invalid or missing!',
     'no_association_fix' => 'This will break things in weird and horrible ways. Edit this asset now to assign it a model.',
     'assoc_users'	 => 'این مدل در حال حاضر همراه یک یا بیشتر از یک دارایی است و نمی تواند حذف شود. لطفا دارایی ها را حذف کنید و سپس برای حذف کردن مجددا تلاش کنید. ',
-
+    'invalid_category_type' => 'This category must be an asset category.',
 
     'create' => array(
         'error'   => 'مدل ساخته نشده است، لطفا دوباره تلاش کنید.',
diff --git a/resources/lang/fa-IR/admin/reports/general.php b/resources/lang/fa-IR/admin/reports/general.php
index 1696f3bbef..e125f59dbd 100644
--- a/resources/lang/fa-IR/admin/reports/general.php
+++ b/resources/lang/fa-IR/admin/reports/general.php
@@ -4,16 +4,22 @@ return [
     'info'   => 'گزینه ای را که برای گزارش دارایی خود میخواهید انتخاب کنید .',
     'deleted_user' => 'حذف کاربر',
     'send_reminder' => 'ارسال يادآوری',
+    'cannot_send_reminder' => 'User has been deleted or does not have an email address so cannot receive a reminder',
     'reminder_sent' => 'یادآوری ارسال شد
 ',
     'acceptance_deleted' => 'درخواست پذیرش حذف شد
 ',
     'acceptance_request' => 'قبول درخواست',
     'custom_export' => [
-        'user_address' => 'User Address',
-        'user_city' => 'User City',
-        'user_state' => 'User State',
-        'user_country' => 'User Country',
-        'user_zip' => 'User Zip'
-    ]
-];
\ No newline at end of file
+        'user_address' => 'آدرس کاربر',
+        'user_city' => 'شهر کاربر',
+        'user_state' => 'وضعیت کاربر',
+        'user_country' => 'کشوور کاربر',
+        'user_zip' => 'کد پستی کاربر'
+    ],
+    'open_saved_template' => 'باز کردن قالب ذخیره شده',
+    'save_template' =>  'ذخیره‌ قالب',
+    'select_a_template' => 'انتخاب قالب',
+    'template_name' => 'نام قالب',
+    'update_template' => 'به روز رسانی قالب',
+];
diff --git a/resources/lang/fa-IR/admin/reports/message.php b/resources/lang/fa-IR/admin/reports/message.php
index aaa007263c..9eb0baf1c5 100644
--- a/resources/lang/fa-IR/admin/reports/message.php
+++ b/resources/lang/fa-IR/admin/reports/message.php
@@ -1,5 +1,16 @@
 <?php
 
-return array(
-    'error'   => 'شما باید حداقل یک گزینه را انتخاب کنید.'
-);
+return [
+    'about_templates' => 'درباره قالب های ذخیره شده',
+    'saving_templates_description' => 'گزینه ها را انتخاب کرده و سپس نام قالب خود را در باکس بالا وارد کرده و روی دکمه \'ذخیره قالب\' کلیک کنید. از منوی کشویی قالب های از قبل ذخیره شده را انتخاب کنید.',
+    'create'  => [
+        'success' => 'قالب با موفقیت ذخیره شد',
+    ],
+    'update' => [
+        'success' => 'قالب با موفقیت بروز شد',
+    ],
+    'delete' => [
+        'success' => 'قالب حذف شد',
+        'no_delete_permission' => 'قالب وجود ندارد یا شما مجوز حذف آن را ندارید.',
+    ],
+];
diff --git a/resources/lang/fa-IR/admin/settings/general.php b/resources/lang/fa-IR/admin/settings/general.php
index bba5afc63b..76e0b04b20 100644
--- a/resources/lang/fa-IR/admin/settings/general.php
+++ b/resources/lang/fa-IR/admin/settings/general.php
@@ -12,14 +12,13 @@ return [
 ',
     'admin_cc_email'            => 'ایمیل CC
 ',
-    'admin_cc_email_help'       => 'اگر می‌خواهید یک کپی از ایمیل‌های ورود/تسویه حساب که برای کاربران ارسال می‌شود را به یک حساب ایمیل اضافی ارسال کنید، آن را در اینجا وارد کنید. در غیر این صورت، این قسمت را خالی بگذارید.
-',
+    'admin_cc_email_help'       => 'Send a copy of checkin/checkout emails to this address.',
     'admin_settings'            => 'Admin Settings',
     'is_ad'				        => 'این سرور Active Directory است',
     'alerts'                	=> 'هشدار',
     'alert_title'               => 'Update Notification Settings',
     'alert_email'				=> 'ارسال هشدار به',
-    'alert_email_help'    => 'آدرس‌های ایمیل یا لیست‌های توزیعی که می‌خواهید هشدارها به آنها ارسال شود، با کاما از هم جدا شده‌اند
+    'alert_email_help'          => 'آدرس‌های ایمیل یا لیست‌های توزیعی که می‌خواهید هشدارها به آنها ارسال شود، با کاما از هم جدا شده‌اند.
 ',
     'alerts_enabled'			=> 'هشدارها فعال شد',
     'alert_interval'			=> 'آستانه ی انقضای هشدارها( به روز)',
@@ -42,10 +41,12 @@ return [
 ',
     'backups_restoring'         => 'بازیابی از پشتیبان گیری
 ',
+    'backups_clean' => 'Clean the backed-up database before restore',
+    'backups_clean_helptext' => "This can be useful if you're changing between database versions",
     'backups_upload'            => 'نسخه پشتیبان را دانلود کنید',
     'backups_path'              => 'نسخه‌های پشتیبان روی سرور در <code>:path</code> ذخیره می‌شوند
 ',
-    'backups_restore_warning'   => 'Use the restore button <small><span class="btn btn-xs btn-warning"><i class="text-white fas fa-retweet" aria-hidden="true"></i></span></small> to restore from a previous backup. (This does not currently work with S3 file storage or Docker.)<br><br>Your <strong>entire :app_name database and any uploaded files will be completely replaced</strong> by what\'s in the backup file.  ',
+    'backups_restore_warning'   => 'Use the restore button <small><span class="btn btn-xs btn-warning"><i class="text-white fas fa-retweet" aria-hidden="true"></i></span></small> to restore from a previous backup. (This does not currently work with S3 file storage or Docker.)<br><br>Your <strong>entire :app_name database and any uploaded files will be completely replaced</strong> by what\'s in the backup file  ',
     'backups_logged_out'         => 'همه کاربران موجود، از جمله شما، پس از تکمیل بازیابی شما از سیستم خارج می شوند.
 ',
     'backups_large'             => 'پشتیبان‌گیری‌های بسیار بزرگ ممکن است در تلاش بازیابی به پایان برسد و ممکن است همچنان نیاز باشد از طریق خط فرمان اجرا شوند.
@@ -55,6 +56,7 @@ return [
     'confirm_purge_help'		=> 'متن "DELETE" را در کادر زیر وارد کنید تا رکوردهای حذف شده خود را پاک کنید. این عمل قابل واگرد نیست و همه موارد و کاربران حذف شده را برای همیشه حذف می کند. (برای حفظ امنیت، ابتدا باید یک نسخه پشتیبان تهیه کنید.)
 ',
     'custom_css'				=> 'سفارشی CSS',
+    'custom_css_placeholder'	=> 'Add your custom CSS',
     'custom_css_help'			=> 'هر ابطال CSS سفارشی می خواهید استفاده کنید را وارد کنید.از  برچسب های &lt;style&gt;&lt;/style&gt; استفاده نکنید.',
     'custom_forgot_pass_url'	=> 'URL تنظیم مجدد رمز عبور سفارشی
 ',
@@ -66,24 +68,23 @@ return [
 ',
     'default_currency'  		=> 'ارز پیش فرض',
     'default_eula_text'			=> 'EULA پیش فرض',
+    'default_eula_text_placeholder' => 'Add your default EULA text',
     'default_language'			=> 'زبان پیش فرض',
     'default_eula_help_text'	=> 'همچنین می توانید  EULA های سفارشی به دسته های خاص دارایی مرتبط کنید.',
     'acceptance_note'           => 'Add a note for your decision (Optional)',
     'display_asset_name'        => 'نمایش نام حساب',
     'display_checkout_date'     => 'نمایش تاریخ پرداخت',
     'display_eol'               => 'نمایش EOL در جدول',
-    'display_qr'                => 'نمایش کدهای مربعی',
+    'display_qr'                => 'نمایش بارکد دو بعدی',
     'display_alt_barcode'		=> 'نمایش بارکد 1D',
-    'email_logo'                => 'آرم ایمیل
-',
     'barcode_type'				=> 'نوع بارکد 2D',
     'alt_barcode_type'			=> 'نوع بارکد 1D',
-    'email_logo_size'       => 'لوگوهای مربعی شکل در ایمیل بهترین به نظر می رسند.
-',
     'enabled'                   => 'فعال شد
 ',
     'eula_settings'				=> 'EULA تنظیمات',
     'eula_markdown'				=> 'این EULA اجازه می دهد تا <a href="https://help.github.com/articles/github-flavored-markdown/">Github با طعم markdown</a>.',
+    'empty_row_count'           => 'Field Start Offset (Empty Rows)',
+    'empty_row_count_help'      => 'Fields will begin populating after this many empty rows are skipped at the top of the label.',
     'favicon'                   => 'فاویکون',
     'favicon_format'            => 'انواع فایل های پذیرفته شده عبارتند از ico، png و gif. سایر فرمت های تصویر ممکن است در همه مرورگرها کار نکنند.
 ',
@@ -93,16 +94,14 @@ return [
 ',
     'footer_text_help'          => 'این متن در فوتر سمت راست ظاهر می شود. پیوندها با استفاده از <a href="https://help.github.com/articles/github-flavored-markdown/">نشان‌گذاری طعم‌دار Github</a> مجاز هستند. شکستگی خطوط، هدرها، تصاویر و غیره ممکن است منجر به نتایج غیر قابل پیش بینی شود.
 ',
+    'footer_text_placeholder'   => 'Optional footer text',
     'general_settings'			=> 'تنظیمات عمومی',
-    'general_settings_keywords' => 'company support, signature, acceptance, email format, username format, images, per page, thumbnail, eula, gravatar, tos, dashboard, privacy',
     'general_settings_help'     => 'EULA پیش فرض و موارد دیگر
 ',
     'generate_backup'			=> 'تولید پشتیبان گیری',
     'google_workspaces'         => 'Google Workspaces',
     'header_color'              => 'رنگ هدر',
     'info'                      => 'این تنظیمات به شما اجازه سفارشی کردن جنبه های خاصی از نصب و راه اندازی خود را می دهد.',
-    'label_logo'                => 'لوگوی برچسب
-',
     'label_logo_size'           => 'آرم های مربعی بهترین ظاهر را دارند - در سمت راست بالای هر برچسب دارایی نمایش داده می شوند.
 ',
     'laravel'                   => 'نسخه Laravel',
@@ -129,7 +128,7 @@ return [
     'ldap_manager'              => 'مدیر LDAP
 ',
     'ldap_server'               => 'سرویس دهنده LDAP',
-    'ldap_server_help'          => 'این باید با ldap: // (برای رمزگذاری نشده یا TLS) یا ldaps: ((برای SSL)',
+    'ldap_server_help'          => 'This should start with ldap:// (for unencrypted) or ldaps:// (for TLS or SSL)',
     'ldap_server_cert'			=> 'اعتبار گواهی نامه LDAP SSL',
     'ldap_server_cert_ignore'	=> 'اجازه می دهد به گواهی های بی اعتبار SSL',
     'ldap_server_cert_help'		=> 'اگر از یک امضای SSL شخصی معتبر استفاده می کنید این گزینه را فعال کنید.',
@@ -147,8 +146,8 @@ return [
     'ldap_pword'                => 'LDAP اتصال رمز عبور',
     'ldap_basedn'               => 'اتصال پایگاه DN',
     'ldap_filter'               => 'LDAP فیلتر',
-    'ldap_pw_sync'              => 'همگام سازی رمز عبور LDAP',
-    'ldap_pw_sync_help'         => 'اگر نمیخواهید گذرواژههای LDAP را با گذرواژههای محلی همگامسازی کنید، این کادر را بردارید. غیرفعال کردن این به این معنی است که کاربران شما ممکن است قادر به ورود به سیستم اگر سرور LDAP شما به دلایلی غیر قابل دسترس است.',
+    'ldap_pw_sync'              => 'Cache LDAP Passwords',
+    'ldap_pw_sync_help'         => 'Uncheck this box if you do not wish to keep LDAP passwords cached as local hashed passwords. Disabling this means that your users may not be able to login if your LDAP server is unreachable for some reason.',
     'ldap_username_field'       => 'فیلد نام کاربری',
     'ldap_lname_field'          => 'نام خانوادگی',
     'ldap_fname_field'          => 'LDAP نام',
@@ -156,6 +155,8 @@ return [
     'ldap_version'              => 'نسخهٔ LDAP',
     'ldap_active_flag'          => ' پرچم فعالLDAP',
     'ldap_activated_flag_help'  => 'This value is used to determine whether a synced user can login to Snipe-IT. <strong>It does not affect the ability to check items in or out to them</strong>, and should be the <strong>attribute name</strong> within your AD/LDAP, <strong>not the value</strong>. <br><br>If this field is set to a field name that does not exist in your AD/LDAP, or the value in the AD/LDAP field is set to <code>0</code> or <code>false</code>, <strong>user login will be disabled</strong>. If the value in the AD/LDAP field is set to <code>1</code> or <code>true</code> or <em>any other text</em> means the user can log in. When the field is blank in your AD, we respect the <code>userAccountControl</code> attribute, which usually allows non-suspended users to log in.',
+    'ldap_invert_active_flag'   => 'LDAP Invert Active Flag',
+    'ldap_invert_active_flag_help'     => 'If enabled: when the value returned by LDAP Active Flag is <code>0</code> or <code>false</code> the user account will be active.',
     'ldap_emp_num'              => 'LDAP تعداد کارکنان',
     'ldap_email'                => 'ایمیل LDAP',
     'ldap_test'                 => 'تست LDAP
@@ -164,8 +165,8 @@ return [
 ',
     'license'                   => 'مجوز نرم افزار
 ',
-    'load_remote'               => 'Use Gravatar',
-    'load_remote_help_text'		=> 'Uncheck this box if your install cannot load scripts from the outside internet. This will prevent Snipe-IT from trying load images from Gravatar.',
+    'load_remote'               => 'Load Remote Avatars',
+    'load_remote_help_text'		=> 'Uncheck this box if your install cannot load scripts from the outside internet. This will prevent Snipe-IT from trying load avatars from Gravatar or other outside sources.',
     'login'                     => 'تلاش برای ورود
 ',
     'login_attempt'             => 'تلاش برای ورود
@@ -177,6 +178,7 @@ return [
     'login_help'                => 'لیست تلاش برای ورود به سیستم
 ',
     'login_note'                => 'توجه داشته باشید ورود',
+    'login_note_placeholder'            => "If you do not have a login or have found a device belonging to this company, please call technical support at 888-555-1212. Thank you.",
     'login_note_help'           => 'به صورت دلخواه شامل چند جمله در صفحه ورود به سیستم خود، به عنوان مثال برای کمک به افرادی که یک دستگاه گم شده یا دزدیده شده را پیدا کرده اند. این فیلد <a href="https://help.github.com/articles/github-flavored-markdown/"> مارجین طعم Github</a> را می پذیرد',
     'login_remote_user_text'    => 'گزینه های ورود کاربر از راه دور
 ',
@@ -203,16 +205,18 @@ return [
 ',
     'full_multiple_companies_support_help_text' => 'محدود کردن کاربران (از جمله مدیران) اختصاص داده شده به شرکت ها برای دارایی های شرکت خود را.',
     'full_multiple_companies_support_text' => 'شرکت های متعدد پشتیبانی کامل',
+    'scope_locations_fmcs_support_text'  => 'Scope Locations with Full Multiple Companies Support',
+    'scope_locations_fmcs_support_help_text'  => 'Restrict locations to their selected company.',
+    'scope_locations_fmcs_check_button' => 'Check Compatibility',
+    'scope_locations_fmcs_support_disabled_text'  => 'This option is disabled because you have conflicting locations set for :count or more items.',
     'show_in_model_list'   => 'نمایش در مدل کشویی 
 ',
     'optional'					=> 'اختیاری',
     'per_page'                  => 'نتایج در هر صفحه',
     'php'                       => 'نسخه php',
-    'php_info'                  => 'اطلاعات پی اچ پی
-',
+    'php_info'                  => 'PHP info',
     'php_overview'              => 'PHP
 ',
-    'php_overview_keywords'     => 'phpinfo, system, info',
     'php_overview_help'         => 'PHP System info
 ',
     'php_gd_info'               => 'شما باید  php-gd را نصب کنید تا QR کد ها را ببنید، به دستورالعمل های نصب نگاه کنید.',
@@ -311,6 +315,8 @@ return [
     'webhook_integration_help'    => ':app integration is optional, however the endpoint and channel are required if you wish to use it. To configure :app integration, you must first <a href=":webhook_link" target="_new" rel="noopener">create an incoming webhook</a> on your :app account. Click on the <strong>Test :app Integration</strong> button to confirm your settings are correct before saving. ',
     'webhook_integration_help_button'    => 'Once you have saved your :app information, a test button will appear.',
     'webhook_test_help'           => 'Test whether your :app integration is configured correctly. YOU MUST SAVE YOUR UPDATED :app SETTINGS FIRST.',
+    'shortcuts_enabled'         => 'Enable Shortcuts',
+    'shortcuts_help_text'       => '<strong>Windows</strong>: Alt + Access key, <strong>Mac</strong>: Control + Option + Access key',
     'snipe_version'  			=> 'نسخه Snipe_IT',
     'support_footer'            => 'پشتیبانی از پیوندهای پاورقی
 ',
@@ -324,8 +330,6 @@ return [
     'update'                    => 'به‌ روزرسانی تنظیمات',
     'value'                     => 'عنوان آیتم',
     'brand'                     => 'نام تجاری',
-    'brand_keywords'            => 'پاورقی، لوگو، چاپ، تم، پوسته، هدر، رنگ ها، رنگ، css
-',
     'brand_help'                => 'لوگو، نام سایت
 ',
     'web_brand'                 => 'نوع برندینگ وب
@@ -378,6 +382,8 @@ return [
     'two_factor_enrollment_text'	=> "احراز هویت دو عامل لازم است، اما دستگاه شما هنوز ثبت نشده است. برنامه Google Authenticator خود را باز کنید و کد QR زیر را برای ثبت نام دستگاه خود اسکن کنید. هنگامی که دستگاه خود را ثبت نام کردید، کد زیر را وارد کنید",
     'require_accept_signature'      => 'امضا لازم است',
     'require_accept_signature_help_text'      => 'فعال کردن این ویژگی، کاربران را مجبور به فیزیکی در پذیرش یک دارایی می کند.',
+    'require_checkinout_notes'  => 'Require Notes on Checkin/Checkout',
+    'require_checkinout_notes_help_text'    => 'Enabling this feature will require the note fields to be populated when checking in or checking out an asset.',
     'left'        => 'چپ',
     'right'        => 'راست',
     'top'        => 'بالا',
@@ -433,20 +439,14 @@ return [
 ',
     'security' => 'امنیت',
     'security_title' => 'تنظیمات امنیتی را به روز کنید
-',
-    'security_keywords' => 'رمز عبور، رمزهای عبور، الزامات، دو عاملی، دو عاملی، رمزهای عبور رایج، ورود از راه دور، خروج از سیستم، احراز هویت
 ',
     'security_help' => 'دو عامل، محدودیت رمز عبور
-',
-    'groups_keywords' => 'مجوزها، گروه‌های مجوز، مجوزها
 ',
     'groups_help' => 'گروه های مجوز حساب
 ',
     'localization' => 'بومی سازی
 ',
     'localization_title' => 'تنظیمات محلی سازی را به روز کنید
-',
-    'localization_keywords' => 'محلی سازی، واحد پول، محلی، منطقه، منطقه زمانی، منطقه زمانی، بین المللی، بین المللی، زبان، زبان ها، ترجمه
 ',
     'localization_help' => 'زبان، نمایش تاریخ
 ',
@@ -457,16 +457,17 @@ return [
     'labels' => 'برچسب ها',
     'labels_title' => 'تنظیمات برچسب را به روز کنید
 ',
-    'labels_help' => 'اندازه برچسب &amp; تنظیمات
-',
-    'purge_keywords' => 'برای همیشه حذف کنید
-',
+    'labels_help' => 'Barcodes &amp; label settings',
     'purge_help' => 'پاک کردن رکوردهای حذف شده
 ',
     'ldap_extension_warning' => 'به نظر نمی رسد که برنامه افزودنی LDAP روی این سرور نصب یا فعال باشد. همچنان می‌توانید تنظیمات خود را ذخیره کنید، اما قبل از اینکه همگام‌سازی یا ورود به سیستم LDAP کار کند، باید افزونه LDAP را برای PHP فعال کنید.
 ',
     'ldap_ad' => 'LDAP/AD
 ',
+    'ldap_test_label' => 'Test LDAP Sync',
+    'ldap_test_login' => ' Test LDAP Login',
+    'ldap_username_placeholder' => 'LDAP Username',
+    'ldap_password_placeholder' => 'LDAP Password',
     'employee_number' => 'تعداد کارکنان
 ',
     'create_admin_user' => 'ایجاد کاربر جدید ::',
@@ -488,6 +489,8 @@ return [
 ',
     'slack_test' => 'تست <i class="fab fa-slack"></i> یکپارچه سازی
 ',
+    'status_label_name' => 'Status Label Name',
+    'super_admin_only'  => 'Super Admin Only',
     'label2_enable'           => 'New Label Engine',
     'label2_enable_help'      => 'Switch to the new label engine. <b>Note: You will need to save this setting before setting others.</b>',
     'label2_template'         => 'Template',
@@ -502,12 +505,15 @@ return [
     'label2_2d_type'          => 'نوع بارکد 2D',
     'label2_2d_type_help'     => 'Format for 2D barcodes',
     'label2_2d_target'        => '2D Barcode Target',
-    'label2_2d_target_help'   => 'The URL the 2D barcode points to when scanned',
+    'label2_2d_target_help'   => 'The data that will be contained in the 2D barcode',
     'label2_fields'           => 'Field Definitions',
     'label2_fields_help'      => 'Fields can be added, removed, and reordered in the left column. For each field, multiple options for Label and DataSource can be added, removed, and reordered in the right column.',
+    'purge_barcodes' => 'Purge Barcodes',
     'help_asterisk_bold'    => 'Text entered as <code>**text**</code> will be displayed as bold',
     'help_blank_to_use'     => 'Leave blank to use the value from <code>:setting_name</code>',
     'help_default_will_use' => '<code>:default</code> will use the value from <code>:setting_name</code>. <br>Note that the value of the barcodes must comply with the respective barcode spec in order to be successfully generated. Please see <a href="https://snipe-it.readme.io/docs/barcodes">the documentation <i class="fa fa-external-link"></i></a> for more details. ',
+    'asset_id'              => 'Asset ID',
+    'data'               => 'Data',
     'default'               => 'Default',
     'none'                  => 'None',
     'google_callback_help' => 'This should be entered as the callback URL in your Google OAuth app settings in your organization&apos;s <strong><a href="https://console.cloud.google.com/" target="_blank">Google developer console <i class="fa fa-external-link" aria-hidden="true"></i></a></strong>.',
@@ -519,7 +525,108 @@ return [
     'database_driver' => 'Database Driver',
     'bs_table_storage' => 'Table Storage',
     'timezone' => 'Timezone',
+    'test_mail' => 'Test Mail',
     'profile_edit'          => 'Edit Profile',
     'profile_edit_help'          => 'Allow users to edit their own profiles.',
+    'default_avatar' => 'Custom Default Avatar',
+    'default_avatar_help' => 'This image will be displayed as a profile if a user does not have a profile photo.',
+    'restore_default_avatar' => 'Restore <a href=":default_avatar" data-toggle="lightbox" data-type="image">original system default avatar</a>',
+    'restore_default_avatar_help' => '',
+    'due_checkin_days' => 'Due For Checkin Warning',
+    'due_checkin_days_help' => 'How many days before the expected checkin of an asset should it be listed in the "Due for checkin" page?',
+    'no_groups' => 'No groups have been created yet. Visit <code>Admin Settings > Permission Groups</code> to add one.',
+    'text' => 'Text',
+
+    'username_formats' => [
+        'username_format'		=> 'فرمت نام کاربری',
+        'firstname_lastname_format'	=> 'نام خانوادگی (jane.smith)',
+        'first_name_format'	        => 'First Name (jane)',
+        'last_name_format'		=> 'Last Name (doe)',
+        'filastname_format'			=> 'First Initial Last Name (jsmith)',
+        'lastnamefirstinitial_format' =>  'Last Name First Initial (smithj)',
+        'firstname_lastname_underscore_format' => 'First Name Last Name (jane_smith)',
+        'firstinitial.lastname' => 'First Initial Last Name (j.smith)',
+        'lastname_firstinitial' => 'Last Name First Initial (smith_j)',
+        'lastname_dot_firstinitial_format' => 'Last Name First Initial (smith.j)',
+        'firstnamelastname'     => 'First Name Last Name (janesmith)',
+        'firstnamelastinitial'  => 'First Name Last Initial (janes)',
+        'lastnamefirstname'      => 'فامیل نام کوچک (smith.jane)',
+    ],
+
+    'email_formats' => [
+        'email_format'			=> 'فرمت ایمیل',
+        'firstname_lastname_format'	=> 'نام خانوادگی (jane.smith@example.com)',
+        'first_name_format'		=> 'نام (jane@example.com)',
+        'last_name_format'		=> 'Last Name (doe@example.com)',
+        'filastname_format'			=> 'اولین نام خانوادگی (jsmith@example.com)',
+        'lastnamefirstinitial_format' =>  'فامیل نام میانه (smithj@example.com)',
+        'firstname_lastname_underscore_format' => 'نام خانوادگی (jane.smith@example.com)',
+        'firstinitial.lastname' => 'نام میانه فامیل (j.smith@example.com)',
+        'lastname_firstinitial' => 'فامیل نام میانه (smith_j@example.com)',
+        'lastname_dot_firstinitial_format' => 'فامیل نام میانه (smith.j@example.com)',
+        'firstnamelastname'     => 'نام فامیل (janesmith@example.com)',
+        'firstnamelastinitial'  => 'نام فامیل میانه (janes@example.com)',
+        'lastnamefirstname'      => 'فامیل نام کوچک (smith.jane@example.com)',
+    ],
+
+
+
+    'logo_labels' => [
+        'acceptance_pdf_logo'       => 'PDF Logo',
+        'email_logo'                => 'آرم ایمیل
+',
+        'label_logo'                => 'لوگوی برچسب
+',
+        'logo'                      => 'Site Logo',
+        'favicon'                   => 'فاویکون',
+    ],
+
+    'logo_help' => [
+        'email_logo_size'       => 'لوگوهای مربعی شکل در ایمیل بهترین به نظر می رسند.
+',
+    ],
+
+    'logo_option_types' => [
+        'text' => 'Text',
+        'logo' => 'لوگو',
+        'logo_and_text' => 'Logo and Text',
+    ],
+
+
+    'legends' => [
+        'scoping' => 'Scoping',
+        'formats' => 'Default Formats',
+        'profiles' => 'User Profiles',
+        'eula' => 'EULA & Acceptance Preferences',
+        'misc_display' => 'Miscellaneous Display Options',
+        'email' => 'Email Preferences',
+        'checkin' => 'Checkin Preferences',
+        'dashboard' => 'Login & Dashboard Preferences',
+        'misc' => 'Miscellaneous',
+        'logos' => 'Logos & Display',
+        'colors' => 'Colors & Skins',
+        'footer' => 'Footer Preferences',
+        'security' => 'Security Preferences',
+        'general' => 'General',
+        'intervals' => 'Intervals & Thresholds',
+    ],
+
+
+    /* Keywords for settings overview help */
+    'keywords' => [
+        'brand'             => 'پاورقی، لوگو، چاپ، تم، پوسته، هدر، رنگ ها، رنگ، css
+',
+        'general_settings'  => 'company support, signature, acceptance, email format, username format, images, per page, thumbnail, eula, gravatar, tos, dashboard, privacy',
+        'groups'            => 'مجوزها، گروه‌های مجوز، مجوزها
+',
+        'labels'            => 'labels, barcodes, barcode, sheets, print, upc, qr, 1d, 2d',
+        'localization'      => 'محلی سازی، واحد پول، محلی، منطقه، منطقه زمانی، منطقه زمانی، بین المللی، بین المللی، زبان، زبان ها، ترجمه
+',
+        'php_overview'      => 'phpinfo, system, info',
+        'purge'             => 'برای همیشه حذف کنید
+',
+        'security'          => 'رمز عبور، رمزهای عبور، الزامات، دو عاملی، دو عاملی، رمزهای عبور رایج، ورود از راه دور، خروج از سیستم، احراز هویت
+',
+    ],
 
 ];
diff --git a/resources/lang/fa-IR/admin/settings/message.php b/resources/lang/fa-IR/admin/settings/message.php
index 516ad0d4fa..2e32349c01 100644
--- a/resources/lang/fa-IR/admin/settings/message.php
+++ b/resources/lang/fa-IR/admin/settings/message.php
@@ -16,6 +16,9 @@ return [
         'restore_confirm'       => 'آیا مطمئن هستید که می خواهید پایگاه داده خود را از :filename بازیابی کنید؟
 '
     ],
+    'restore' => [
+        'success'               => 'Your system backup has been restored. Please log in again.'
+    ],
     'purge' => [
         'error'     => 'در حین پاکسازی خطایی رخ داد. ',
         'validation_failed'     => 'تایید پاکسازی ناصحیح است. لطفا کلمه ی "حذف" را در جعبه ی تاییدیه تایپ کنید.',
@@ -42,6 +45,9 @@ return [
         'authentication_success' => 'کاربر در برابر LDAP با موفقیت احراز هویت شد!
 '
     ],
+    'labels' => [
+        'null_template' => 'Label template not found. Please select a template.',
+        ],
     'webhook' => [
         'sending' => 'Sending :app test message...',
         'success' => 'Your :webhook_name Integration works!',
@@ -53,5 +59,12 @@ return [
         'error' => 'Something went wrong. :app responded with: :error_message',
         'error_redirect' => 'ERROR: 301/302 :endpoint returns a redirect. For security reasons, we don’t follow redirects. Please use the actual endpoint.',
         'error_misc' => 'مشکلی پیش آمده. :( ',
-    ]
+        'webhook_fail' => ' webhook notification failed: Check to make sure the URL is still valid.',
+        'webhook_channel_not_found' => ' webhook channel not found.',
+        'ms_teams_deprecation' => 'The selected Microsoft Teams webhook URL will be deprecated Dec 31st, 2025. Please use a workflow URL. Microsoft\'s documentation on creating a workflow can be found <a href="https://support.microsoft.com/en-us/office/create-incoming-webhooks-with-workflows-for-microsoft-teams-8ae491c7-0394-4861-ba59-055e33f75498" target="_blank"> here.</a>',
+    ],
+    'location_scoping' => [
+        'not_saved' => 'Your settings were not saved.',
+        'mismatch' => 'There is 1 item in the database that need your attention before you can enable location scoping.|There are :count items in the database that need your attention before you can enable location scoping.',
+    ],
 ];
diff --git a/resources/lang/fa-IR/admin/statuslabels/table.php b/resources/lang/fa-IR/admin/statuslabels/table.php
index 81e7a969ae..106856e8d0 100644
--- a/resources/lang/fa-IR/admin/statuslabels/table.php
+++ b/resources/lang/fa-IR/admin/statuslabels/table.php
@@ -1,14 +1,14 @@
 <?php
 
 return array(
-    'about'      	=> 'درباره ی برچسب های وضعیت',
+    'about'      	=> 'About Status Types',
     'archived'      	=> 'آرشیو',
     'create'      	=> 'ساخت برچسب وضعیت',
     'color'      	=> 'رنگ نمودار',
     'default_label' => 'برچسب پیش‌فرض',
     'default_label_help' => 'این برای اطمینان از اینکه پرکاربردترین برچسب‌های وضعیت شما هنگام ایجاد/ویرایش دارایی‌ها در بالای کادر انتخاب ظاهر شوند استفاده می‌شود.',
     'deployable'      	=> 'گسترش',
-    'info'      	=> 'برچسب های وضعیت، برای توصیف وضعیت های مختلفی که دارایی های شما می توانند داشته باشند، استفاده می شود. آن ها می توانند برای تعمیر، گمشده/دزدیده شده و غیره باشند. شما می توانید برچسب های وضعیت جدیدی برای گسترش کار، انتظار و آرشیو دارایی ها بسازید.',
+    'info'      	=> 'Status label types are used to describe the various states your assets could be in. They may be out for repair, lost/stolen, etc. You can create new status labels for your deployable, pending and archived assets according to your own workflow. For more information, <a href="https://snipe-it.readme.io/docs/overview#status-labels" target="_blank">see the documentation <i class="fa fa-external-link"></i></a>.',
     'name'      	=> 'نام وضعیت',
     'pending'      	=> 'در حالت انتظار',
     'status_type'   => 'نوع وضعیت',
diff --git a/resources/lang/fa-IR/admin/users/general.php b/resources/lang/fa-IR/admin/users/general.php
index abac35cc86..d2f4fb035c 100644
--- a/resources/lang/fa-IR/admin/users/general.php
+++ b/resources/lang/fa-IR/admin/users/general.php
@@ -23,6 +23,8 @@ return [
 ',
     'user_notified'     => 'لیستی از موارد اختصاص داده شده فعلی به کاربر ایمیل شده است.
 ',
+    'users_notified'    => 'The user has been emailed a list of their currently assigned items.|:count users have been emailed a list of their currently assigned items.',
+    'users_notified_warning' => ':count user has been emailed a list of their currently assigned items, however :no_email users did not have an email address so could not be emailed.|:count users have been emailed a list of their currently assigned items, however :no_email user(s) did not have an email address so could not be emailed.',
     'auto_assign_label' => 'Include this user when auto-assigning eligible licenses',
     'auto_assign_help'  => 'Skip this user in auto assignment of licenses',
     'software_user'     => 'برنامه چک شد برای:',
diff --git a/resources/lang/fa-IR/admin/users/message.php b/resources/lang/fa-IR/admin/users/message.php
index 3e319acc79..adcded7ad3 100644
--- a/resources/lang/fa-IR/admin/users/message.php
+++ b/resources/lang/fa-IR/admin/users/message.php
@@ -6,7 +6,7 @@ return array(
     'declined'                  => 'شما با موفقیت این دارایی را به کاهش دادید.',
     'bulk_manager_warn'	        => 'کاربران شما با موفقیت به روز شده اند، با این حال مدیر ورود شما ذخیره نشد زیرا مدیر شما انتخاب شده بود نیز در لیست کاربر برای ویرایش، و کاربران ممکن است مدیر خود نیست. لطفا کاربران خود را دوباره انتخاب کنید، به غیر از مدیر.',
     'user_exists'               => 'کاربر "{0}" در حال حاضر وجود دارد.',
-    'user_not_found'            => 'کاربر وجود ندارد.',
+    'user_not_found'            => 'User does not exist or you do not have permission view them.',
     'user_login_required'       => 'فیلد ورود الزامی است.',
     'user_has_no_assets_assigned' => 'No assets currently assigned to user.',
     'user_password_required'    => 'کلمه عبور ضروری است.',
@@ -56,6 +56,7 @@ return array(
         'ldap_could_not_search' => 'جستجو در سرور LDPA انجام نشد.لطفا پیکربندی LDPA سرور را در فایل LDPA config بررسی کنید.<br>اشکال از سرور LDPA:',
         'ldap_could_not_get_entries' => 'مجوز از سرور LDPA گرفته نشد.لطفا پیکربندی LDPA سرور را در فایل LDPA config بررسی کنید.<br>اشکال از سرور LDPA:',
         'password_ldap' => 'رمز عبور این حساب توسط LDAP / Active Directory مدیریت می شود. برای تغییر رمز عبور خود، لطفا با بخش IT خود تماس بگیرید.',
+        'multi_company_items_assigned' => 'This user has items assigned that belong to a different company. Please check them in or edit their company.'
     ),
 
     'deletefile' => array(
diff --git a/resources/lang/fa-IR/admin/users/table.php b/resources/lang/fa-IR/admin/users/table.php
index 7da8daf3ad..9b24c7fc02 100644
--- a/resources/lang/fa-IR/admin/users/table.php
+++ b/resources/lang/fa-IR/admin/users/table.php
@@ -23,7 +23,7 @@ return array(
     'managed_locations'     => 'مکان های مدیریت شده',
     'managed_users'         => 'Managed Users',
     'name' 					=> 'نام',
-    'nogroup'               => 'No groups have been created yet. To add one, visit: ',
+    'nogroup'               => 'No groups have been created yet. To add one, visit:',
     'notes'                 => 'یادداشت ها',
     'password_confirm' 		=> 'تایید رمز عبور',
     'password' 				=> 'رمز عبور',
diff --git a/resources/lang/fa-IR/auth.php b/resources/lang/fa-IR/auth.php
index c78dff9f31..c9544d62e0 100644
--- a/resources/lang/fa-IR/auth.php
+++ b/resources/lang/fa-IR/auth.php
@@ -15,6 +15,6 @@ return array(
 
     'failed' => 'این مدارک با سوابق ما مطابقت ندارد.',
     'password' => 'رمز ورود ارائه شده نادرست است.',
-    'throttle' => 'دفعات تلاش شما برای ورود بیش از حد مجاز است. لطفا پس از :seconds ثانیه مجددا تلاش فرمایید.',
+    'throttle' => 'Too many login attempts. Please try again in :minutes minute(s).',
 
 );
diff --git a/resources/lang/fa-IR/auth/message.php b/resources/lang/fa-IR/auth/message.php
index 65e438c5cc..dec0f390f4 100644
--- a/resources/lang/fa-IR/auth/message.php
+++ b/resources/lang/fa-IR/auth/message.php
@@ -6,8 +6,6 @@ return array(
     'account_not_found'      => 'نام کاربری یا رمز عبور اشتباه است.',
     'account_not_activated'  => 'این حساب کاربری فعال نشده است.',
     'account_suspended'      => 'این حساب کاربری بسته است.',
-    'account_banned'         => 'این حساب کاربری ممنوع است.',
-    'throttle'               => 'دفعات تلاش شما برای ورود بیش از حد مجاز است. لطفا پس از :seconds ثانیه مجددا تلاش فرمایید.',
 
     'two_factor' => array(
         'already_enrolled'      => 'دستگاه شما قبلاً ثبت نام کرده است.
diff --git a/resources/lang/fa-IR/button.php b/resources/lang/fa-IR/button.php
index 79f9a283fe..c88af65221 100644
--- a/resources/lang/fa-IR/button.php
+++ b/resources/lang/fa-IR/button.php
@@ -7,6 +7,7 @@ return [
     'checkin_and_delete'  	    => 'بررسی همه و حذف کاربر',
     'delete'  	                => 'حذف',
     'edit'    	                => 'ويرايش',
+    'clone'    	                => 'Clone',
     'restore' 	                => 'بازیابی',
     'remove'                    => 'پاک کردن',
     'request'                   => 'درخواست',
@@ -22,4 +23,13 @@ return [
 ',
     'append'                    => 'افزودن',
     'new'                       => 'جدید',
+    'var' => [
+        'clone'     => 'Clone :item_type',
+        'edit'      => 'Edit :item_type',
+        'delete'    => 'Delete :item_type',
+        'restore'   => 'Restore :item_type',
+        'create'    => 'Create New :item_type',
+        'checkout'  => 'Checkout :item_type',
+        'checkin'   => 'Checkin :item_type',
+    ]
 ];
diff --git a/resources/lang/fa-IR/general.php b/resources/lang/fa-IR/general.php
index 8cb568cdc8..7736b2d118 100644
--- a/resources/lang/fa-IR/general.php
+++ b/resources/lang/fa-IR/general.php
@@ -1,19 +1,19 @@
 <?php
 
 return [
-    '2FA_reset'             => '2FA reset',
+    '2FA_reset'             => 'ریست ورود دو مرحله‌ای',
     'accessories'			=> 'تجهیزات جانبی',
     'activated'			    => 'فعال شد',
-    'accepted_date'         => 'Date Accepted',
+    'accepted_date'         => 'تاریخ قبول شد',
     'accessory'				=> 'لوازم جانبی',
     'accessory_report'		=> 'گزارش لوازم جانبی',
     'action'                => 'اقدام',
     'activity_report'		=> 'گزارش فعالیت',
     'address'				=> 'آدرس',
-    'admin'					=> 'مدیر',
-    'admin_tooltip'			=> 'This user has admin privileges',
-    'superuser'				=> 'Superuser',
-    'superuser_tooltip'		=> 'This user has superuser privileges',
+    'admin'					=> 'تنظیمات مدیر',
+    'admin_tooltip'			=> 'این کاربر دسترسی مدیر دارد',
+    'superuser'				=> 'کاربر ارشد',
+    'superuser_tooltip'		=> 'این کاربر دسترسی کاربر ارشد دارد',
     'administrator'			=> 'مدیر',
     'add_seats'             => 'اضافه شدن صندلی',
     'age'                   => "سن",
@@ -23,22 +23,25 @@ return [
     'asset_models'			=> 'مدل دارایی',
     'asset_model'			=> 'مدل',
     'asset'					=> 'دارایی',
+    'asset_previous'        => 'Asset (Previously Assigned)',
     'asset_report'          => 'گزارش دارایی',
     'asset_tag'				=> 'برچسب دارایی',
     'asset_tags'            => 'نام دارایی',
     'assets_available'		=> 'دارایی های موجود',
     'accept_assets'         => 'پذیرش دارایی ها :name',
     'accept_assets_menu'    => 'دارایی های پذیرفته',
+    'accept_item'           => 'تایید آیتم',
     'audit'				    => 'حسابرسی',
+    'audits'				=> 'Audits',
     'audit_report'			=> 'حسابرسی حسابرسی',
     'assets'				=> 'دارایی ها',
-    'assets_audited'        => 'assets audited',
-    'assets_checked_in_count'     => 'assets checked in',
-    'assets_checked_out_count'     => 'assets checked out',
-    'asset_deleted_warning'     => 'This asset has been deleted. You must restore it before you can assign it to someone.',
-    'assigned_date'         => 'Date Assigned',
+    'assets_audited'        => 'دارایی حسابرسی شد',
+    'assets_checked_in_count'     => 'دارایی ثبت شد',
+    'assets_checked_out_count'     => 'دارایی چک شد',
+    'asset_deleted_warning'     => 'دارایی حذف شده است. برای انتصاب آن به یک نفر باید دارایی را بازیابی کنید.',
+    'assigned_date'         => 'تاریخ انتصاب',
     'assigned_to'           => 'اختصاص داده شده به :name',
-    'assignee'              => 'Assigned to',
+    'assignee'              => 'انتصاب شده به',
     'avatar_delete'         => 'حذف آواتار',
     'avatar_upload'         => 'بارگذاری آواتار',
     'back'      			=> 'بازگشت',
@@ -52,9 +55,9 @@ return [
 
 ',
     'bulk_actions'          => 'اقدام دسته جمعی',
-    'bulk_checkin_delete'   => 'Bulk Checkin / Delete Users',
-    'byod'                  => 'BYOD',
-    'byod_help'             => 'This device is owned by the user',
+    'bulk_checkin_delete'   => 'بررسی و حذف جمعی کاربران',
+    'byod'                  => 'وسیله شخصی خود پرسنل',
+    'byod_help'             => 'این دستگاه به مالکیت کاربر درآمده است',
     'bystatus'              => 'به ترتیب وضعیت',
     'cancel'  				=> 'انصراف',
     'categories'			=> 'دسته‌بندی‌ها',
@@ -64,9 +67,12 @@ return [
     'changepassword'  		=> 'تغییر کلمه عبور',
     'checkin'  				=> 'بررسی',
     'checkin_from'  		=> 'فرم بررسی',
+    'checkin_note'  		=> 'Checkin Note',
+    'checkout_note'  		=> 'Checkout Note',
     'checkout'  			=> 'پرداخت',
     'checkouts_count'       => 'پرداخت',
     'checkins_count'        => 'پذیرش',
+    'checkin_and_delete'  	=> 'بررسی و حذف',
     'user_requests_count'   => 'درخواست ها',
     'city'  				=> 'شهر',
     'click_here'			=> 'اینجا کلیک کنید',
@@ -79,8 +85,8 @@ return [
     'consumable'			=> 'قابل مصرف',
     'consumables'			=> 'اقلام قابل مصرف',
     'country'  				=> 'كشور',
-    'could_not_restore'     => 'Error restoring :item_type: :error',
-    'not_deleted'           => 'The :item_type is not deleted so it cannot be restored',
+    'could_not_restore'     => 'خطا بازیابی :item_type: :error',
+    'not_deleted'           => ':item_type حذف نشده است بنابراین نمیتواند بازیابی شود',
     'create'				=> 'ایجاد مورد جدید',
     'created'               => 'مورد ایجاد شده',
     'created_asset'			=> 'دارایی ایجاد شده',
@@ -89,6 +95,7 @@ return [
     'record_created' 		=> 'رکورد ایجاد شد',
     'updated_at' 			=> 'به روز شده در',
     'currency'  			=> '$', // this is deprecated
+    'currency_text'  		=> 'Currency', //
     'current'  				=> 'کنونی',
     'current_password'      => 'رمز عبور فعلی',
     'customize_report'      => 'سفارشی کردن گزارش
@@ -97,6 +104,7 @@ return [
     'custom_report'         => 'گزارش های سفارشی دارایی
 ',
     'dashboard'				=> 'میز کار',
+    'data_source'           => 'منبع داده',
     'days'      			=> 'روزها',
     'days_to_next_audit'    => 'روز به حسابرسی بعدی',
     'date'					=> 'تاریخ',
@@ -104,7 +112,7 @@ return [
     'debug_warning_text'    => 'این برنامه در حالت تولید با استفاده از اشکال زدایی فعال است. این می تواند اطلاعات حساس را در صورت درخواست شما برای جهان خارج در دسترس قرار دهد. با تنظیم مقداری <code>APP_DEBUG</code> در <code>.env</code> فایل خود را به <code>false</code> غیرفعال کنید.',
     'delete'  				=> 'حذف',
     'delete_confirm'  		=> 'آیا اطمینان دارید که می خواهید این را حذف نمایید؟',
-    'delete_confirm_no_undo' => 'Are you sure you wish to delete :item? This can not be undone.',
+    'delete_confirm_no_undo' => 'آیا مطمپنید که می‌خواهید :item را حذف کنید؟ این کار غیرقابل بازگشت است.',
     'deleted'  				=> 'حذف شد',
     'delete_seats'  		=> 'صندلی ها حذف شده
 ',
@@ -122,7 +130,6 @@ return [
     'editprofile'  			=> 'ویرایش پروفایل شما',
     'eol'					=> 'EOL',
     'email_domain'			=> 'دامنه ایمیل',
-    'email_format'			=> 'فرمت ایمیل',
     'employee_number'       => 'تعداد کارکنان
 ',
     'email_domain_help'		=> 'این برای تولید آدرس های ایمیل هنگام وارد کردن استفاده می شود',
@@ -132,22 +139,7 @@ return [
     'exclude_deleted'       => 'دارایی های بایگانی شده را حذف کنید
 ',
     'example'				=> ' مثال: ',
-    'filastname_format'			=> 'اولین نام خانوادگی (jsmith@example.com)',
-    'firstname_lastname_format'	=> 'نام خانوادگی (jane.smith@example.com)',
-    'firstname_lastname_underscore_format' => 'نام خانوادگی (jane.smith@example.com)',
-    'lastnamefirstinitial_format' =>  'فامیل نام میانه (smithj@example.com)',
-    'firstintial_dot_lastname_format' => 'نام میانه فامیل (j.smith@example.com)',
-    'firstname_lastname_display'	=> 'First Name Last Name (Jane Smith)',
-    'lastname_firstname_display'	=> 'Last Name First Name (Smith Jane)',
-    'name_display_format'	=> 'Name Display Format',
-    'first'					=> 'اولین',
-    'firstnamelastname'     => 'نام فامیل (janesmith@example.com)',
-    'lastname_firstinitial' => 'فامیل نام میانه (smith_j@example.com)',
-    'firstinitial.lastname' => 'نام میانه فامیل (j.smith@example.com)',
-    'firstnamelastinitial'  => 'نام فامیل میانه (janes@example.com)',
-    'lastnamefirstname'      => 'Last Name First Name (smith.jane@example.com)',
-    'first_name'			=> 'نام',
-    'first_name_format'		=> 'نام (jane@example.com)',
+
     'files'                 => 'فایل ها',
     'file_name'				=> 'فایل',
     'file_type'             => 'نوع فايل',
@@ -168,14 +160,12 @@ return [
     'include_deleted'       => 'دارایی های بایگانی شده را حذف کنید
 ',
     'image_upload'         	=> 'آپلود تصویر',
-    'filetypes_accepted_help'    => 'نوع فایل پذیرفته شده :types است. حداکثر اندازه مجاز آپلود :size است.|نوع فایل های پذیرفته شده عبارتند از :types. حداکثر اندازه مجاز بارگذاری: اندازه است.
-',
-    'filetypes_size_help'   => 'حداکثر اندازه مجاز بارگذاری: اندازه است.
-',
-    'image_filetypes_help'  => 'Accepted filetypes are jpg, webp, png, gif, svg, and avif. Max upload size allowed is :size.',
-    'unaccepted_image_type'  => 'This image file was not readable. Accepted filetypes are jpg, webp, png, gif, and svg. The mimetype of this file is: :mimetype.',
+    'filetypes_accepted_help'    => 'نوع فایل پذیرفته شده :types است. حداکثر اندازه مجاز آپلود :size است.|نوع فایل های پذیرفته شده عبارتند از :types. حداکثر اندازه مجاز بارگذاری: اندازه است.',
+    'filetypes_size_help'   => 'حداکثر سایز مجاز آپلود: سایز.',
+    'image_filetypes_help'  => 'نوع فایل های قابل قبول: jpg, webp, png, gif, و svg. حداکثر سایز فایل :size است.',
+    'unaccepted_image_type'  => 'امکان خواندن تصویر وجود ندارد. نوع فایل های قابل قبول: jpg, webp, png, gif, و svg است. mimetype این فایل :mimetype است.',
     'import'         	    => 'واردات',
-    'import_this_file'      => 'Map fields and process this file',
+    'import_this_file'      => 'انتخاب نظیر به نظیر فیلدها و پردازش فایل',
     'importing'         	=> 'در حال وارد کردن',
     'importing_help'        => 'می‌توانید دارایی‌ها، لوازم جانبی، مجوزها، اجزا، مواد مصرفی و کاربران را از طریق فایل CSV وارد کنید. <br><br>CSV باید با کاما محدود شود و با سرصفحه‌هایی که در <a href="https://snipe-it.readme.io/docs/importing" target="_new"> مطابقت دارند قالب‌بندی شود. نمونه CSV در مستندات</a>.
 ',
@@ -185,33 +175,38 @@ return [
     'asset_maintenances'       => 'نگهداشت دارایی',
     'item'  				=> 'مورد',
     'item_name'             => 'نام کالا',
-    'import_file'  			=> 'import CSV file',
-    'import_type'  			=> 'CSV import type',
+    'import_file'  			=> 'وارد کردن فایل CSV',
+    'import_type'  			=> 'نوع ورود فایل CSV',
     'insufficient_permissions' => 'دسترسی محدود!',
     'kits'       			=> 'مقادیر از پیش تعریف شده',
     'language'				=> 'زبان',
     'last'					=> 'آخرين',
     'last_login'            => 'آخرین ورود',
     'last_name'             => 'نام خانوادگی',
+    'firstname_lastname_display'	=> 'نام فامیل (Jane Smith)',
+    'lastname_firstname_display'	=> 'فامیل نام (Smith Jane)',
+    'name_display_format'	=> 'فرمت نمایش نام',
+    'first'					=> 'اولین',
+    'first_name'			=> 'نام',
     'license'				=> 'توافق‌نامه',
     'license_report'        => 'مجوز گزارش',
-    'licenses_available'	=> 'Licenses available',
+    'licenses_available'	=> 'مجوز موجود است',
     'licenses'				=> 'گواهی نامه ها',
     'list_all'				=> 'فهرست همه
 ',
-    'loading'				=> 'در حال بارگذاری لطفا صبر کنید..',
+    'loading'				=> 'در حال بارگذاری... لطفا صبر کنید...',
     'lock_passwords'        => 'این مقدار فیلد در یک نصب آزمایشی ذخیره نخواهد شد.
 ',
     'feature_disabled'      => 'این ویژگی برای نصب نسخه ی نمایشی غیر فعال شده است.',
     'location'              => 'مکان',
-    'location_plural'        => 'Location|Locations',
+    'location_plural'        => 'مکان|مکان ها',
     'locations'				=> 'مکانها',
     'logo_size'				=> 'لوگوهای مربعی با لوگو + متن بهترین ظاهر را دارند. حداکثر اندازه نمایش لوگو 50px ارتفاع x 500px عرض است.',
     'logout'				=> 'خروج',
     'lookup_by_tag'     => 'نگاهی به Asset Tag',
     'maintenances'          => 'تعمیر و نگهداری
 ',
-    'manage_api_keys'       => 'کلیدهای API را مدیریت کنید',
+    'manage_api_keys'       => 'مدیریت کلیدهای API',
     'manufacturer'			=> 'سازنده',
     'manufacturers'			=> 'تولیدکننده‌ها',
     'markdown'				=> 'این فیلد اجازه می دهد تا <a href="https://help.github.com/articles/github-flavored-markdown/">گیت هاب به سلیقه خود نشانه گذاری کند . markdown</a>.',
@@ -226,14 +221,22 @@ return [
     'next'					=> 'بعدی',
     'next_audit_date'		=> 'تاریخ تفتیش بعدی',
     'next_audit_date_help'  => 'If you use auditing in your organization, this is usually automatically calculated based on the asset&apos;s last audit date and audit frequency (in <code>Admin Settings &gt; Alerts</code>) and you can leave this blank. You can manually set this date here if you need to, but it must be later than the last audit date. ',
-    'audit_images_help'     => 'You can find audit images in the asset\'s history tab.',
-    'no_email'              => 'No email address associated with this user',
+    'audit_images_help'     => 'شما میتوانید تصاویر حسابرسی را در تب تاریخچه دارایی پیدا کنید.',
+    'no_email'              => 'هیچ آدرس ایمیلی برای این کاربر انتخاب نشده است',
     'last_audit'		    => 'آخرین حسابرسی',
     'new'					=> 'جدید!',
     'no_depreciation'		=> 'بدون استهلاک',
     'no_results'			=> 'بدون نتیجه.',
     'no'  					=> 'خیر',
     'notes'  				=> 'یادداشت ها',
+    'note_added'            => 'یادداشت اضافه شد',
+    'options'				=> 'گزینه ها',
+    'preview'				=> 'پیش نمایش',
+    'add_note'              => 'افزودن یادداشت',
+    'note_edited'            => 'یادداشت ویرایش شد',
+    'edit_note'              => 'ویرایش یادداشت',
+    'note_deleted'            => 'یادداشت پاک شد',
+    'delete_note'              => 'حذف یادداشت',
     'order_number'          => 'شماره سفارش',
     'only_deleted'          => 'فقط دارایی های حذف شده',
     'page_menu'				=> 'نمایش_موارد_منو',
@@ -248,8 +251,7 @@ return [
     'purchase_date'         => 'تاریخ خرید',
     'qty'		            => 'QTY',
     'quantity'		        => 'مقدار',
-    'quantity_minimum'      => 'شما باید : موارد را زیر یا تقریباً کمتر از سطح حداقل مقدار بشمارید
-',
+    'quantity_minimum'      => 'شما یک آیتم پایین‌تر یا نزدیک به حداقل مقدار موجودی دارید.|شما :count آیتم پایین‌تر یا نزدیک به حداقل مقادیر موجودی دارید',
     'quickscan_checkin'  	=> 'اسکن سریع اعلام حضور
 ',
     'quickscan_checkin_status'  	=> 'وضعیت  ورود
@@ -263,7 +265,7 @@ return [
     'restore'				=> 'بازیابی',
     'requestable_models'    => 'مدل های درخواستی
 ',
-    'requestable_items'     => 'Requestable Items',
+    'requestable_items'     => 'آیتم های قابل درخواست',
     'requested'				=> 'در خواست شده',
     'requested_date'        => 'تاریخ درخواست',
     'requested_assets'      => 'دارایی های درخواستی
@@ -271,15 +273,15 @@ return [
     'requested_assets_menu' => 'دارایی های درخواستی
 ',
     'request_canceled'      => 'درخواست لغو شد',
-    'request_item'          => 'Request this item',
-    'external_link_tooltip' => 'External link to',
+    'request_item'          => 'درخواست این آیتم',
+    'external_link_tooltip' => 'لینک خارجی به',
     'save'  				=> 'ذخیره کردن',
-    'select_var'            => 'Select :thing... ', // this will eventually replace all of our other selects
+    'select_var'            => 'انتخاب :thing... ', // this will eventually replace all of our other selects
     'select'				=> 'انتخاب',
     'select_all'            => 'انتخاب همه',
     'search'				=> 'جستوجو',
     'select_category'       => 'یک دسته را انتخاب کنید',
-    'select_datasource' => 'Select a Datasource',
+    'select_datasource' => 'یک منبع داده انتخاب کنید',
     'select_department'     => 'یک گروه را انتخاب کنید',
     'select_depreciation'	=> 'انتخاب یک نوع استهلاک',
     'select_location'		=> 'انتخاب یک مکان',
@@ -300,20 +302,22 @@ return [
     'signed_off_by'         => 'امضا شده توسط
 ',
     'skin'       			=> 'پوسته',
-    'webhook_msg_note'        => 'A notification will be sent via webhook',
-    'webhook_test_msg'        => 'Oh hai! Looks like your :app integration with Snipe-IT is working!',
+    'webhook_msg_note'        => 'یک اعلان توسط وب هوک ارسال می‌گردد',
+    'webhook_test_msg'        => 'اوه هی! به نظر می رسد ادغام :app شما با Snipe-IT کار می کند!',
     'some_features_disabled' => 'MODE DEMO: برخی از ویژگی ها برای این نصب غیر فعال هستند.',
     'site_name'				=> 'نام سایت',
     'state'  				=> 'وضعیت',
     'status_labels'			=> 'برچسب های وضعیت',
+    'status_label'			=> 'برچسب وضعیت',
     'status'    			=> 'وضعیت',
     'accept_eula'           => 'توافق نامه پذیرش
 ',
+    'show_or_hide_eulas' => 'نمایش/مخفی کردن موافقت نامه',
     'supplier'              => 'تامین کننده',
     'suppliers'  			=> 'تامین کننده',
     'sure_to_delete'        => 'مطمئنید که میخواهید حذف شود',
     'sure_to_delete_var'    => 'آیا اطمینان دارید که می خواهید این را حذف نمایید؟',
-    'delete_what'           => 'Delete :item',
+    'delete_what'           => 'حذف :item',
     'submit'				=> 'ارسال',
     'target'                => 'هدف',
     'time_and_date_display' => 'نمایش زمان و تاریخ',
@@ -324,17 +328,17 @@ return [
     'type'  				=> 'نوع',
     'undeployable'			=> 'غیر قابل استقرار',
     'unknown_admin'			=> 'نامشخص مدیریت',
-    'username_format'		=> 'فرمت نام کاربری',
     'username'              => 'نام کاربری',
     'update'                => 'بروزرسانی',
+    'updating_item' => 'بروزرسانی :item',
     'upload_filetypes_help'      => 'انواع فایل های مجاز عبارتند از png، gif، jpg، jpeg، doc، docx، pdf، xls، xlsx، txt، lic، xml، zip، rtf و rar. حداکثر اندازه مجاز بارگذاری: اندازه است.
 ',
     'uploaded'              => 'بارگزاری شد',
     'user'					=> 'کاربر',
     'accepted'			    => 'تأیید شد',
     'declined'			    => 'خودداری شد',
-    'declined_note'         => 'Declined Notes',
-    'unassigned'            => 'Unassigned',
+    'declined_note'         => 'یادداشت های رد شده',
+    'unassigned'            => 'محول نشده',
     'unaccepted_asset_report' => 'دارایی های پذیرفته',
     'users'                 => 'کاربران',
     'viewall'				=> 'مشاهده همه',
@@ -347,18 +351,18 @@ return [
     'yes' 					=> 'بله',
     'zip'  					=> 'زیپ',
     'noimage'				=> 'هیچ تصویری بارگزاری نشد یا تصویری یافت نشد.',
-    'file_does_not_exist'   => 'The requested file does not exist on the server.',
-    'file_upload_success'   => 'File upload success!',
-    'no_files_uploaded'     => 'File upload success!',
+    'file_does_not_exist'   => 'فایل درخواستی روی سرور وجود ندارد.',
+    'file_upload_success'   => 'فایل با موفقیت بارگذاری شد!',
+    'no_files_uploaded'     => 'فایل با موفقیت بارگذاری شد!',
     'token_expired'         => 'اعتبار فرم شما تمام شده است. لطفا دوباره تلاش کنید.',
     'login_enabled'         => 'ورود فعال شد
 ',
     'audit_due'             => 'موعد حسابرسی
 ',
-    'audit_due_days'        => 'Assets Due for Audit Within :days Day|Assets Due for Audit Within :days Days',
+    'audit_due_days'        => '{}Assets Due or Overdue for Audit|[1]Assets Due or Overdue for Audit Within a Day|[2,*]Assets Due or Overdue for Audit Within :days Days',
     'checkin_due'           => 'Due for Checkin',
     'checkin_overdue'       => 'Overdue for Checkin',
-    'checkin_due_days'      => 'Assets Due for Checkin Within :days Day|Assets Due for Checkin Within :days Days',
+    'checkin_due_days'      => '{}Due for Checkin|[1]Assets Due for Checkin Within :days Day|[2,*]Assets Due for Checkin Within :days Days',
     'audit_overdue'         => 'موعد حسابرسی عقب افتاده
 ',
     'accept'                => 'دارایی های پذیرفته',
@@ -376,9 +380,8 @@ return [
     'hide_deleted'          => 'پنهان کردن حذف شده
 ',
     'email'                 => 'ایمیل',
-    'do_not_change'         => 'تغییر ندهید
-',
-    'bug_report'            => 'گزارش یک اشکال',
+    'do_not_change'         => 'تغییر ندهید',
+    'bug_report'            => 'Report a bug',
     'user_manual'           => 'دفترچه راهنمای کاربر
 ',
     'setup_step_1'          => 'مرحله 1',
@@ -387,9 +390,8 @@ return [
     'setup_step_4'          => 'مرحله 4',
     'setup_config_check'    => 'بررسی پیکربندی
 ',
-    'setup_create_database' => 'ایجاد جدول های پایگاه داده',
-    'setup_create_admin'    => 'ایجاد کاربر ادمین
-',
+    'setup_create_database' => 'Create database tables',
+    'setup_create_admin'    => 'Create an admin user',
     'setup_done'            => 'تمام شده!
 ',
     'bulk_edit_about_to'    => 'شما در حال ویرایش موارد زیر هستید:
@@ -447,6 +449,8 @@ return [
 ',
     'new_consumable'        => 'قابل مصرف نو
 ',
+    'new_component'         => 'New Component',
+    'new_user'              => 'New User',
     'collapse'              => 'فروپاشی',
     'assigned'              => 'اختصاص داده
 ',
@@ -505,19 +509,20 @@ return [
 ',
     'bulk_checkin_success' => 'موارد برای کاربران انتخاب شده بررسی شده است.
 ',
-    'set_to_null'           => 'Delete values for this asset|Delete values for all :asset_count assets ',
+    'set_to_null'           => 'Delete values for this selection|Delete values for all :selection_count selections ',
     'set_users_field_to_null'  => 'Delete :field values for this user|Delete :field values for all :user_count users ',
     'na_no_purchase_date'   => 'N/A - No purchase date provided',
     'assets_by_status'      => 'Assets by Status',
     'assets_by_status_type'      => 'Assets by Status Type',
     'pie_chart_type'        => 'Dashboard Pie Chart Type',
     'hello_name'            => 'سلام , :name!',
-    'unaccepted_profile_warning'   => 'You have :count items requiring acceptance. Click here to accept or decline them',
+    'unaccepted_profile_warning'   => 'You have one item requiring acceptance. Click here to accept or decline it | You have :count items requiring acceptance. Click here to accept or decline them',
     'start_date'            => 'Start Date',
     'end_date'            => 'End Date',
     'alt_uploaded_image_thumbnail' => 'Uploaded thumbnail',
     'placeholder_kit'       => 'Select a kit',
     'file_not_found'        => 'فایل پیدا نشد',
+    'log_record_not_found'  => 'No record for that log entry was found.',
     'preview_not_available' => '(no preview)',
     'setup'                 => 'Setup',
     'pre_flight'            => 'Pre-Flight',
@@ -571,8 +576,8 @@ return [
     'cannot_be_deleted'      => 'This item cannot be deleted',
     'cannot_be_edited'      => 'This item cannot be edited.',
     'undeployable_tooltip'      => 'This item cannot be checked out. Check the quantity remaining.',
-    'serial_number'        => 'Serial Number',
-    'item_notes' => ':item Notes',
+    'serial_number'        => 'شماره سریال',
+    'item_notes' => 'یادداشت های:item',
     'item_name_var' => ':نام کالا',
     'error_user_company' => 'Checkout target company and asset company do not match',
     'error_user_company_accept_view' => 'An Asset assigned to you belongs to a different company so you can\'t accept nor deny it, please check with your manager',
@@ -602,7 +607,7 @@ return [
     'checked_out_to_fields' => 'Checked Out To Fields',
     'percent_complete' => '% تکمیل',
     'uploading' => 'Uploading... ',
-    'upload_error' => 'Error uploading file. Please check that there are no empty rows and that no column names are duplicated.',
+    'upload_error' => 'Error uploading file. Please check that you have no empty rows or duplicated column names in your CSV, and that the server permissions allow uploads.',
     'copy_to_clipboard' => 'Copy to Clipboard',
     'copied' => 'Copied!',
     'status_compatibility' => 'If assets are already assigned, they cannot be changed to a non-deployable status type and this value change will be skipped.',
@@ -639,6 +644,71 @@ return [
         'license_seats'  => ':count License Seat|:count License Seats',
         'consumables'  => ':count Consumable|:count Consumables',
         'components'  => ':count Component|:count Components',
-    ]
+    ],
+
+    'more_info' => 'اطلاعات بیشتر',
+    'quickscan_bulk_help' => 'Checking this box will edit the asset record to reflect this new location. Leaving it unchecked will simply note the location in the audit log. Note that if this asset is checked out, it will not change the location of the person, asset or location it is checked out to.',
+    'whoops' => 'Whoops!',
+    'something_went_wrong' => 'Something went wrong with your request.',
+    'close' => 'Close',
+    'expires' => 'منقضی می شود',
+    'map_fields'=> 'Map :item_type Fields',
+    'remaining_var' => ':count Remaining',
+    'label' => 'Label',
+    'import_asset_tag_exists' => 'An asset with the asset tag :asset_tag already exists and an update was not requested. No change was made.',
+    'countries_manually_entered_help' => 'Values with an asterisk (*) were manually entered and do not match existing ISO 3166 dropdown values',
+    'accessories_assigned' => 'Assigned Accessories',
+    'user_managed_passwords' => 'Password Management',
+    'user_managed_passwords_disallow' => 'Disallow users from managing their own passwords',
+    'user_managed_passwords_allow' => 'Allow users to manage their own passwords',
+    'from' => 'From',
+    'by' => 'توسط',
+
+// Add form placeholders here
+    'placeholders' => [
+        'notes'  => 'Add a note',
+    ],
+
+    'breadcrumb_button_actions' => [
+        'edit_item' => 'Edit :name',
+        'checkout_item' => 'Checkout :name',
+        'checkin_item' => 'Checkin :name',
+    ],
+
+    'skins' => [
+        'site_default' => 'Site Default',
+        'default_blue' => 'Default Blue',
+        'blue_dark' => 'Blue (Dark Mode)',
+        'green' => 'Green Dark',
+        'green_dark' => 'Green (Dark Mode)',
+        'red' => 'Red Dark',
+        'red_dark' => 'Red (Dark Mode)',
+        'orange' => 'Orange Dark',
+        'orange_dark' => 'Orange (Dark Mode)',
+        'black' => 'Black',
+        'black_dark' => 'Black (Dark Mode)',
+        'purple' => 'Purple',
+        'purple_dark' => 'Purple (Dark Mode)',
+        'yellow' => 'Yellow',
+        'yellow_dark' => 'Yellow (Dark Mode)',
+        'high_contrast' => 'High Contrast',
+
+    ],
+
+    'select_all_none' => 'Select/Unselect All',
+    'generic_model_not_found' => 'That :model was not found or you do not have permission to access it',
+    'deleted_models' => 'Deleted Asset Models',
+    'deleted_users' => 'Deleted Users',
+    'cost_each' => ':amount each',
+    'remove_current_image' => 'Remove current :type image',
+
+    'seeding' => [
+        'manufacturers' => [
+            'button' => 'Create Manufacturers',
+            'prompt' => 'You do not have any manufacturers yet. Would you like to seed a list of common manufacturers? (THIS WILL OVERWRITE EXISTING MANUFACTURERS, including those that have been soft-deleted.)',
+            'success' => 'Manufacturers seeded successfully',
+            'error' => 'Could not seed manufacturers. A manufacturer record already exists and seeding would overwrite it.|Could not seed manufacturers. :count manufacturer records already exist and seeding would overwrite them.',
+        ],
+    ],
 
 ];
diff --git a/resources/lang/fa-IR/localizations.php b/resources/lang/fa-IR/localizations.php
index f1232dd138..827ed4fca1 100644
--- a/resources/lang/fa-IR/localizations.php
+++ b/resources/lang/fa-IR/localizations.php
@@ -2,7 +2,7 @@
 
 return [
 
-    'select_language' => 'Select a language',
+    'select_language' => 'Select a Language',
     'languages' => [
         'en-US'=> 'English, US',
         'en-GB'=> 'English, UK',
@@ -40,7 +40,9 @@ return [
         'ms-MY'=> 'Malay',
         'mi-NZ'=> 'Maori',
         'mn-MN'=> 'Mongolian',
-        'no-NO'=> 'Norwegian',
+        'nb-NO'=> 'Norwegian Bokmål',
+        'om-ET' => 'Oromo (Ethiopian)',
+        //'nn-NO'=> 'Norwegian Nynorsk',
         'fa-IR'=> 'Persian',
         'pl-PL'=> 'Polish',
         'pt-PT'=> 'Portuguese',
@@ -66,7 +68,7 @@ return [
         'zu-ZA'=> 'Zulu',
     ],
 
-    'select_country' => 'Select a country',
+    'select_country' => 'Select a Country',
     
     'countries' => [
         'AC'=>'Ascension Island',
@@ -133,6 +135,7 @@ return [
         'EC'=>'Ecuador',
         'EE'=>'Estonia',
         'EG'=>'Egypt',
+        'GB-ENG'=>'England',
         'ER'=>'Eritrea',
         'ES'=>'Spain',
         'ET'=>'Ethiopia',
@@ -231,6 +234,7 @@ return [
         'NG'=>'Nigeria',
         'NI'=>'Nicaragua',
         'NL'=>'Netherlands',
+        'GB-NIR' => 'Northern Ireland',
         'NO'=>'Norway',
         'NP'=>'Nepal',
         'NR'=>'Nauru',
@@ -258,7 +262,7 @@ return [
         'RU'=>'Russian Federation',
         'RW'=>'Rwanda',
         'SA'=>'Saudi Arabia',
-        'UK'=>'Scotland',
+        'GB-SCT'=>'Scotland',
         'SB'=>'Solomon Islands',
         'SC'=>'Seychelles',
         'SS'=>'South Sudan',
@@ -310,6 +314,7 @@ return [
         'VI'=>'Virgin Islands (U.S.)',
         'VN'=>'Viet Nam',
         'VU'=>'Vanuatu',
+        'GB-WLS' =>'Wales',
         'WF'=>'Wallis And Futuna Islands',
         'WS'=>'Samoa',
         'YE'=>'Yemen',
diff --git a/resources/lang/fa-IR/mail.php b/resources/lang/fa-IR/mail.php
index f5d55fe2ca..93abb7706e 100644
--- a/resources/lang/fa-IR/mail.php
+++ b/resources/lang/fa-IR/mail.php
@@ -31,24 +31,26 @@ return [
     'License_Checkin_Notification' => 'مجوز بررسی شد
 ',
     'License_Checkout_Notification' => 'License checked out',
+    'license_for'   => 'License for',
     'Low_Inventory_Report' => 'گزارش موجودی کم',
     'a_user_canceled' => 'یک کاربر یک درخواست اقساط در وب سایت را لغو کرده است',
     'a_user_requested' => 'یک کاربر یک مورد را در وبسایت درخواست کرده است',
     'acceptance_asset_accepted' => 'A user has accepted an item',
     'acceptance_asset_declined' => 'A user has declined an item',
-    'accessory_name' => 'نام لوازم جانبی:',
-    'additional_notes' => 'یادداشت های اضافی:',
+    'accessory_name' => 'نام وسیله',
+    'additional_notes' => 'یادداشت های اضافی',
     'admin_has_created' => 'یک مدیر یک حساب کاربری برای شما در وب سایت وب ایجاد کرده است.',
-    'asset' => 'دارایی:',
+    'asset' => 'دارایی',
     'asset_name' => 'نام دارایی',
     'asset_requested' => 'دارایی درخواست شد',
     'asset_tag' => 'نام دارایی',
     'assets_warrantee_alert' => 'دارایی :count با گارانتی منقضی در روزهای بعدی: آستانه وجود دارد.',
     'assigned_to' => 'اختصاص یافته به',
     'best_regards' => 'با احترام،',
-    'canceled' => 'لغو شد:',
-    'checkin_date' => 'تاریخ ورود:',
-    'checkout_date' => 'چک کردن تاریخ:',
+    'canceled' => 'لغو شد',
+    'checkin_date' => 'تاریخ ورود
+',
+    'checkout_date' => 'چک کردن تاریخ',
     'checkedout_from' => 'Checked out from',
     'checkedin_from'  => 'Checked in from',
     'checked_into' => 'Checked into',
@@ -57,27 +59,30 @@ return [
     'click_to_confirm' => 'لطفا برای پیوستن به این لینک کلیک کنید تا حساب خود را تایید کنید:',
     'current_QTY' => 'QTY فعلی',
     'days' => 'روزها',
-    'expecting_checkin_date' => 'تاریخ انتظار انتظار:',
+    'expecting_checkin_date' => ' چک در تاریخ را پر کنید',
     'expires' => 'منقضی می شود',
     'hello' => 'سلام',
     'hi' => 'سلام',
     'i_have_read' => 'من شرایط استفاده را خوانده ام و موافقم و این مورد را دریافت کرده ام.',
     'inventory_report' => 'Inventory Report',
-    'item' => 'مورد:',
+    'item' => 'مورد',
+    'item_checked_reminder' => 'This is a reminder that you currently have :count items checked out to you that you have not accepted or declined. Please click the link below to confirm your decision.',
     'license_expiring_alert' => 'مجوز :count در روزهای بعدی :threshold منقضی می شود.|مجوزهای :count در روزهای بعدی :threshold منقضی می شوند.',
     'link_to_update_password' => 'برای به روزرسانی لطفا بر روی لینک زیر کلیک کنید: web password:',
-    'login' => 'ورود:',
+    'login' => 'ورود',
     'login_first_admin' => 'با نصب مجدد Snipe-IT جدید خود به سیستم وارد شوید',
     'low_inventory_alert' => 'آیتم :count وجود دارد که زیر حداقل موجودی است یا به زودی کم می شود.',
     'min_QTY' => 'حداقل QTY',
     'name' => 'نام',
     'new_item_checked' => 'یک آیتم جدید تحت نام شما چک شده است، جزئیات زیر است.',
+    'new_item_checked_with_acceptance' => 'A new item has been checked out under your name that requires acceptance, details are below.',
+    'recent_item_checked' => 'An item was recently checked out under your name that requires acceptance, details are below.',
     'notes' => 'نت ها',
-    'password' => 'کلمه عبور:',
+    'password' => 'رمز عبور',
     'password_reset' => 'تنظیم مجدد رمز عبور',
     'read_the_terms' => 'لطفا شرایط استفاده زیر را بخوانید.',
     'read_the_terms_and_click' => 'Please read the terms of use below, and click on the link at the bottom to confirm that you read and agree to the terms of use, and have received the asset.',
-    'requested' => 'درخواست شده:',
+    'requested' => 'در خواست شده',
     'reset_link' => 'رمز عبور خود را بازنشانی کنید',
     'reset_password' => 'برای تغییر رمز عبور اینجا کلیک کنید:',
     'rights_reserved' => 'All rights reserved.',
@@ -94,9 +99,11 @@ return [
     'upcoming-audits' => 'دارایی :count وجود دارد که در روزهای :threshold برای حسابرسی ارائه می شود.',
     'user' => 'کاربر',
     'username' => 'نام کاربری',
+    'unaccepted_asset_reminder' => 'Reminder: You have Unaccepted Assets.',
     'welcome' => 'خوش آمدید نام',
     'welcome_to' => 'به وب سایت خوش آمدید',
     'your_assets' => 'دارایی های خود را مشاهده کنید
 ',
     'your_credentials' => 'مدارک Snipe-IT شما',
+    'mail_sent' => 'Mail sent successfully!',
 ];
diff --git a/resources/lang/fa-IR/validation.php b/resources/lang/fa-IR/validation.php
index 3c5b9bf6fd..badf9e2896 100644
--- a/resources/lang/fa-IR/validation.php
+++ b/resources/lang/fa-IR/validation.php
@@ -13,87 +13,150 @@ return [
     |
     */
 
-    'accepted'             => 'ویژگی باید تایید شود.',
-    'active_url'           => 'ویژگی یک URL معتبر نیست.',
-    'after'                => 'ویژگی باید در تاریخی بعد از تاریخ باشد.',
-    'after_or_equal'       => 'attribute باید یک تاریخ بعد باشد یا برابر باشد: date.',
-    'alpha'                => 'ویژگی ممکن است فقط شامل حروف باشد.',
-    'alpha_dash'           => 'ویژگی ممکن است فقط شامل حروف، اعداد و خط های فاصله باشد.',
-    'alpha_num'            => 'ویژگی ممکن است فقط شامل حروف و اعداد باشد.',
-    'array'                => 'attribute باید یک آرایه باشد.',
-    'before'               => 'ویژگی باید در تاریخی قبل از تاریخ باشد.',
-    'before_or_equal'      => 'attribute باید تاریخ قبل یا برابر باشد: date.',
-    'between'              => [
-        'numeric' => 'ویژگی باید بین حداقل حداکثر باشد.',
-        'file'    => 'ویژگی باید بین حداقل حداکثر کیلوبایت باشد.',
-        'string'  => 'ویژگی باید بین حداقل حداکثر کاراکتر باشد.',
-        'array'   => 'خصیصه باید بین: min و: max items باشد.',
+    'accepted' => 'The :attribute field must be accepted.',
+    'accepted_if' => 'The :attribute field must be accepted when :other is :value.',
+    'active_url' => 'The :attribute field must be a valid URL.',
+    'after' => 'The :attribute field must be a date after :date.',
+    'after_or_equal' => 'The :attribute field must be a date after or equal to :date.',
+    'alpha' => 'The :attribute field must only contain letters.',
+    'alpha_dash' => 'The :attribute field must only contain letters, numbers, dashes, and underscores.',
+    'alpha_num' => 'The :attribute field must only contain letters and numbers.',
+    'array' => 'The :attribute field must be an array.',
+    'ascii' => 'The :attribute field must only contain single-byte alphanumeric characters and symbols.',
+    'before' => 'The :attribute field must be a date before :date.',
+    'before_or_equal' => 'The :attribute field must be a date before or equal to :date.',
+    'between' => [
+        'array' => 'The :attribute field must have between :min and :max items.',
+        'file' => 'The :attribute field must be between :min and :max kilobytes.',
+        'numeric' => 'The :attribute field must be between :min and :max.',
+        'string' => 'The :attribute field must be between :min and :max characters.',
     ],
-    'boolean'              => 'فیلد attribute باید درست یا غلط باشد.',
-    'confirmed'            => 'تایید ویژگی منطبق نیست.',
-    'date'                 => 'تاریخ ویژگی معتبر نیست.',
-    'date_format'          => 'ویژگی منطبق بر شکل شکل نیست.',
-    'different'            => 'ویژگی و دیگر باید متفاوت باشد.',
-    'digits'               => 'ویژگی باید رقم رقم باشد.',
-    'digits_between'       => 'ویژگی باید بین حداقل و حداکثر رقم باشد.',
-    'dimensions'           => 'attribute: ابعاد تصویر نامعتبر است.',
-    'distinct'             => 'فیلد attribute دارای مقدار تکراری است.',
-    'email'                => 'شکل ویژگی نامعتبر است.',
-    'exists'               => 'ویژگی انتخاب شده نامعتبر است.',
-    'file'                 => 'attribute باید یک فایل باشد.',
-    'filled'               => 'فیلد attribute باید مقدار داشته باشد.',
-    'image'                => 'ویژگی باید یک عکس باشد.',
+    'boolean' => 'فیلد attribute باید درست یا غلط باشد.',
+    'can' => 'The :attribute field contains an unauthorized value.',
+    'confirmed' => 'The :attribute field confirmation does not match.',
+    'contains' => 'The :attribute field is missing a required value.',
+    'current_password' => 'The password is incorrect.',
+    'date' => 'The :attribute field must be a valid date.',
+    'date_equals' => 'The :attribute field must be a date equal to :date.',
+    'date_format' => 'The :attribute field must match the format :format.',
+    'decimal' => 'The :attribute field must have :decimal decimal places.',
+    'declined' => 'The :attribute field must be declined.',
+    'declined_if' => 'The :attribute field must be declined when :other is :value.',
+    'different' => 'The :attribute field and :other must be different.',
+    'digits' => 'The :attribute field must be :digits digits.',
+    'digits_between' => 'The :attribute field must be between :min and :max digits.',
+    'dimensions' => 'The :attribute field has invalid image dimensions.',
+    'distinct' => 'فیلد attribute دارای مقدار تکراری است.',
+    'doesnt_end_with' => 'The :attribute field must not end with one of the following: :values.',
+    'doesnt_start_with' => 'The :attribute field must not start with one of the following: :values.',
+    'email' => 'The :attribute field must be a valid email address.',
+    'ends_with' => 'The :attribute field must end with one of the following: :values.',
+    'enum' => 'ویژگی انتخاب شده نامعتبر است.',
+    'exists' => 'ویژگی انتخاب شده نامعتبر است.',
+    'extensions' => 'The :attribute field must have one of the following extensions: :values.',
+    'file' => 'The :attribute field must be a file.',
+    'filled' => 'فیلد attribute باید مقدار داشته باشد.',
+    'gt' => [
+        'array' => 'The :attribute field must have more than :value items.',
+        'file' => 'The :attribute field must be greater than :value kilobytes.',
+        'numeric' => 'The :attribute field must be greater than :value.',
+        'string' => 'The :attribute field must be greater than :value characters.',
+    ],
+    'gte' => [
+        'array' => 'The :attribute field must have :value items or more.',
+        'file' => 'The :attribute field must be greater than or equal to :value kilobytes.',
+        'numeric' => 'The :attribute field must be greater than or equal to :value.',
+        'string' => 'The :attribute field must be greater than or equal to :value characters.',
+    ],
+    'hex_color' => 'The :attribute field must be a valid hexadecimal color.',
+    'image' => 'The :attribute field must be an image.',
     'import_field_empty'    => 'The value for :fieldname cannot be null.',
-    'in'                   => 'ویژگی انتخاب شده نامعتبر است.',
-    'in_array'             => 'فیلد attribute در هیچ موجودی وجود ندارد: دیگر.',
-    'integer'              => 'ویژگی باید یک عدد باشد.',
-    'ip'                   => 'ویژگی باید یک آدرس IP معتبر باشد.',
-    'ipv4'                 => 'attribute باید یک آدرس IPv4 معتبر باشد.',
-    'ipv6'                 => 'attribute باید یک آدرس IPv6 معتبر باشد.',
-    'is_unique_department' => 'The :attribute must be unique to this Company Location',
-    'json'                 => 'attribute باید یک رشته معتبر JSON باشد.',
-    'max'                  => [
-        'numeric' => 'ویژگی نباید بزرگتر از حداکثر باشد.',
-        'file'    => 'ویژگی نباید بزرگتر از حداکثر کیلوبایت باشد.',
-        'string'  => 'ویژگی نباید بزرگتر از حداکثر کاراکتر باشد.',
-        'array'   => 'ویژگی: ممکن است بیش از موارد حداکثر داشته باشد.',
+    'in' => 'ویژگی انتخاب شده نامعتبر است.',
+    'in_array' => 'The :attribute field must exist in :other.',
+    'integer' => 'The :attribute field must be an integer.',
+    'ip' => 'The :attribute field must be a valid IP address.',
+    'ipv4' => 'The :attribute field must be a valid IPv4 address.',
+    'ipv6' => 'The :attribute field must be a valid IPv6 address.',
+    'json' => 'The :attribute field must be a valid JSON string.',
+    'list' => 'The :attribute field must be a list.',
+    'lowercase' => 'The :attribute field must be lowercase.',
+    'lt' => [
+        'array' => 'The :attribute field must have less than :value items.',
+        'file' => 'The :attribute field must be less than :value kilobytes.',
+        'numeric' => 'The :attribute field must be less than :value.',
+        'string' => 'The :attribute field must be less than :value characters.',
     ],
-    'mimes'                => 'ویژگی باید فایلی از نوع ارزش ها باشد.',
-    'mimetypes'            => 'attribute باید یک فایل از نوع:: values ​​باشد.',
-    'min'                  => [
-        'numeric' => 'ویژگی باید حداقل: حداقل باشد.',
-        'file'    => 'ویژگی باید حداقل: حداقل کیلوبایت باشد.',
-        'string'  => 'ویژگی باید حداقل: حداقل کاراکتر باشد.',
-        'array'   => 'ویژگی: باید دارای حداقل موارد: min باشد.',
+    'lte' => [
+        'array' => 'The :attribute field must not have more than :value items.',
+        'file' => 'The :attribute field must be less than or equal to :value kilobytes.',
+        'numeric' => 'The :attribute field must be less than or equal to :value.',
+        'string' => 'The :attribute field must be less than or equal to :value characters.',
     ],
-    'starts_with'          => 'ویژگی : باید با یکی از موارد زیر شروع شود: :values.',
-    'ends_with'            => 'The :attribute must end with one of the following: :values.',
+    'mac_address' => 'The :attribute field must be a valid MAC address.',
+    'max' => [
+        'array' => 'The :attribute field must not have more than :max items.',
+        'file' => 'The :attribute field must not be greater than :max kilobytes.',
+        'numeric' => 'The :attribute field must not be greater than :max.',
+        'string' => 'The :attribute field must not be greater than :max characters.',
+    ],
+    'max_digits' => 'The :attribute field must not have more than :max digits.',
+    'mimes' => 'The :attribute field must be a file of type: :values.',
+    'mimetypes' => 'The :attribute field must be a file of type: :values.',
+    'min' => [
+        'array' => 'The :attribute field must have at least :min items.',
+        'file' => 'The :attribute field must be at least :min kilobytes.',
+        'numeric' => 'The :attribute field must be at least :min.',
+        'string' => 'The :attribute field must be at least :min characters.',
+    ],
+    'min_digits' => 'The :attribute field must have at least :min digits.',
+    'missing' => 'The :attribute field must be missing.',
+    'missing_if' => 'The :attribute field must be missing when :other is :value.',
+    'missing_unless' => 'The :attribute field must be missing unless :other is :value.',
+    'missing_with' => 'The :attribute field must be missing when :values is present.',
+    'missing_with_all' => 'The :attribute field must be missing when :values are present.',
+    'multiple_of' => 'The :attribute field must be a multiple of :value.',
+    'not_in' => 'ویژگی انتخاب شده نامعتبر است.',
+    'not_regex' => 'The :attribute field format is invalid.',
+    'numeric' => 'The :attribute field must be a number.',
+    'password' => [
+        'letters' => 'The :attribute field must contain at least one letter.',
+        'mixed' => 'The :attribute field must contain at least one uppercase and one lowercase letter.',
+        'numbers' => 'The :attribute field must contain at least one number.',
+        'symbols' => 'The :attribute field must contain at least one symbol.',
+        'uncompromised' => 'The given :attribute has appeared in a data leak. Please choose a different :attribute.',
+    ],
+    'percent'       => 'The depreciation minimum must be between 0 and 100 when depreciation type is percentage.',
 
-    'not_in'               => 'ویژگی انتخاب شده نامعتبر است.',
-    'numeric'              => 'ویژگی باید عدد باشد.',
-    'present'              => 'فیلد attribute باید باشد.',
-    'valid_regex'          => 'این یک سفارش معتبر نیست.',
-    'regex'                => 'شکل ویژگی نامعتبر است.',
-    'required'             => 'فیلد ویژگی ضروری است.',
-    'required_if'          => 'فیلد ویژگی ضروری است، وقتی که دیگری ارزش است.',
-    'required_unless'      => 'فیلد attribute: مورد نیاز است مگر اینکه: دیگر در: مقادیر باشد.',
-    'required_with'        => 'فیلد ویژگی ضروری است، وقتی که ارزش موجود باشد.',
-    'required_with_all'    => 'فیلد attribute: زمانی که: مقادیر وجود دارد.',
-    'required_without'     => 'فیلد ویژگی ضروری است، وقتی که ارزش ها حاضر نباشند.',
+    'present' => 'فیلد attribute باید باشد.',
+    'present_if' => 'The :attribute field must be present when :other is :value.',
+    'present_unless' => 'The :attribute field must be present unless :other is :value.',
+    'present_with' => 'The :attribute field must be present when :values is present.',
+    'present_with_all' => 'The :attribute field must be present when :values are present.',
+    'prohibited' => 'The :attribute field is prohibited.',
+    'prohibited_if' => 'The :attribute field is prohibited when :other is :value.',
+    'prohibited_unless' => 'The :attribute field is prohibited unless :other is in :values.',
+    'prohibits' => 'The :attribute field prohibits :other from being present.',
+    'regex' => 'The :attribute field format is invalid.',
+    'required' => 'فیلد ویژگی ضروری است.',
+    'required_array_keys' => 'The :attribute field must contain entries for: :values.',
+    'required_if' => 'فیلد ویژگی ضروری است، وقتی که دیگری ارزش است.',
+    'required_if_accepted' => 'The :attribute field is required when :other is accepted.',
+    'required_if_declined' => 'The :attribute field is required when :other is declined.',
+    'required_unless' => 'فیلد attribute: مورد نیاز است مگر اینکه: دیگر در: مقادیر باشد.',
+    'required_with' => 'فیلد ویژگی ضروری است، وقتی که ارزش موجود باشد.',
+    'required_with_all' => 'The :attribute field is required when :values are present.',
+    'required_without' => 'فیلد ویژگی ضروری است، وقتی که ارزش ها حاضر نباشند.',
     'required_without_all' => 'فیلد attribute: وقتی که هیچ یک از: مقادیر وجود ندارد، مورد نیاز است.',
-    'same'                 => 'ویژگی و دیگری باید بر هم منطبق باشند.',
-    'size'                 => [
-        'numeric' => 'ویژگی باید به اندازه ی : سایز باشد.',
-        'file'    => 'ویژگی باید به اندازه ی: سایز کیلوبایت باشد.',
-        'string'  => 'ویژگی باید به اندازه ی : سایز کاراکتر باشد.',
-        'array'   => 'attribute باید شامل موارد زیر باشد:',
+    'same' => 'The :attribute field must match :other.',
+    'size' => [
+        'array' => 'The :attribute field must contain :size items.',
+        'file' => 'The :attribute field must be :size kilobytes.',
+        'numeric' => 'The :attribute field must be :size.',
+        'string' => 'The :attribute field must be :size characters.',
     ],
+    'starts_with' => 'The :attribute field must start with one of the following: :values.',
     'string'               => 'attribute باید یک رشته باشد.',
-    'timezone'             => ': attribute باید یک منطقه معتبر باشد.',
     'two_column_unique_undeleted' => 'The :attribute must be unique across :table1 and :table2. ',
-    'unique'               => 'ویژگی در حال حاضر گرفته شده است.',
-    'uploaded'             => 'ویژگی: attribute failed to upload.',
-    'url'                  => 'شکل ویژگی نامعتبر است.',
     'unique_undeleted'     => ': attribute باید منحصر به فرد باشد.',
     'non_circular'         => 'ویژگی : نباید یک مرجع دایره ای ایجاد کند',
     'not_array'            => ':attribute cannot be an array.',
@@ -102,11 +165,14 @@ return [
     'numbers'              => 'گذرواژه باید دارای حداقل یک رقم باشد.',
     'case_diff'            => 'رمز عبور باید از حروف مختلط استفاده کند.',
     'symbols'              => 'رمز عبور نباید حاوی فضای خالی باشد.',
-    'gte'                  => [
-        'numeric'          => 'مقدار نباید منفی باشد.'
-    ],
-    'checkboxes'           => ':attribute contains invalid options.',
-    'radio_buttons'        => ':attribute is invalid.',
+    'timezone' => 'The :attribute field must be a valid timezone.',
+    'unique' => 'ویژگی در حال حاضر گرفته شده است.',
+    'uploaded' => 'ویژگی: attribute failed to upload.',
+    'uppercase' => 'The :attribute field must be uppercase.',
+    'url' => 'The :attribute field must be a valid URL.',
+    'ulid' => 'The :attribute field must be a valid ULID.',
+    'uuid' => 'The :attribute field must be a valid UUID.',
+    'fmcs_location' => 'Full multiple company support and location scoping is enabled in the Admin Settings, and the selected location and selected company are not compatible.',
 
 
     /*
@@ -120,16 +186,22 @@ return [
     |
     */
 
+    'email_array'      => 'یک یا بیش از یک آدرس ایمیل نامعتبر است.',
+    'checkboxes'           => ':attribute contains invalid options.',
+    'radio_buttons'        => ':attribute is invalid.',
+    
     'custom' => [
         'alpha_space' => 'فیلد attribute شامل یک شخصیت است که مجاز نیست.',
-        'email_array'      => 'یک یا چند آدرس ایمیل نامعتبر است',
+
         'hashed_pass'      => 'رمز عبور فعلی شما اشتباه است',
         'dumbpwd'          => 'این رمز عبور خیلی رایج است',
         'statuslabel_type' => 'شما باید نوع برچسب معتبر را انتخاب کنید',
+        'custom_field_not_found'          => 'This field does not seem to exist, please double check your custom field names.',
+        'custom_field_not_found_on_model' => 'This field seems to exist, but is not available on this Asset Model\'s fieldset.',
 
         // date_format validation with slightly less stupid messages. It duplicates a lot, but it gets the job done :(
-        // We use this because the default error message for date_format is reflects php Y-m-d, which non-PHP
-        // people won't know how to format. 
+        // We use this because the default error message for date_format reflects php Y-m-d, which non-PHP
+        // people won't know how to format.
         'purchase_date.date_format'     => 'The :attribute must be a valid date in YYYY-MM-DD format',
         'last_audit_date.date_format'   =>  'The :attribute must be a valid date in YYYY-MM-DD hh:mm:ss format',
         'expiration_date.date_format'   =>  'The :attribute must be a valid date in YYYY-MM-DD format',
@@ -137,9 +209,15 @@ return [
         'expected_checkin.date_format'  =>  'The :attribute must be a valid date in YYYY-MM-DD format',
         'start_date.date_format'        =>  'The :attribute must be a valid date in YYYY-MM-DD format',
         'end_date.date_format'          =>  'The :attribute must be a valid date in YYYY-MM-DD format',
+        'invalid_value_in_field' => 'Invalid value included in this field',
 
-    ],
+        'ldap_username_field' => [
+            'not_in' =>         '<code>sAMAccountName</code> (mixed case) will likely not work. You should use <code>samaccountname</code> (lowercase) instead.'
+        ],
+        'ldap_auth_filter_query' => ['not_in' => '<code>uid=samaccountname</code> is probably not a valid auth filter. You probably want <code>uid=</code> '],
+        'ldap_filter' => ['regex' => 'This value should probably not be wrapped in parentheses.'],
 
+        ],
     /*
     |--------------------------------------------------------------------------
     | Custom Validation Attributes
@@ -155,8 +233,16 @@ return [
 
     /*
     |--------------------------------------------------------------------------
-    | Generic Validation Messages
+    | Generic Validation Messages - we use these in the jquery validation where we don't have
+    | access to the :attribute
     |--------------------------------------------------------------------------
     */
-    'invalid_value_in_field' => 'Invalid value included in this field',
+
+    'generic' => [
+        'invalid_value_in_field' => 'Invalid value included in this field',
+        'required' => 'This field is required',
+        'email' => 'Please enter a valid email address',
+    ],
+
+
 ];
diff --git a/resources/lang/fi-FI/account/general.php b/resources/lang/fi-FI/account/general.php
index 9236530ad6..e7f7f4cbc3 100644
--- a/resources/lang/fi-FI/account/general.php
+++ b/resources/lang/fi-FI/account/general.php
@@ -2,10 +2,16 @@
 
 return array(
     'personal_api_keys' => 'Henkilökohtaiset API-avaimet',
+    'personal_access_token' => 'Personal Access Token',
+    'personal_api_keys_success' => 'Personal API Key :key created sucessfully',
+    'here_is_api_key' => 'Here is your new personal access token. This is the only time it will be shown so do not lose it! You may now use this token to make API requests.',
     'api_key_warning' => 'When generating an API token, be sure to copy it down immediately as they will not be visible to you again.',
     'api_base_url' => 'Sinun API base url sijaitsee osoitteessa:',
     'api_base_url_endpoint' => '/&lt;endpoint&gt;',
     'api_token_expiration_time' => 'API-tunnisteet vanhenevat:',
     'api_reference' => 'Please check the <a href="https://snipe-it.readme.io/reference" target="_blank">API reference</a> to find specific API endpoints and additional API documentation.',
     'profile_updated' => 'Account successfully updated',
+    'no_tokens' => 'You have not created any personal access tokens.',
+    'enable_sounds' => 'Enable sound effects',
+    'enable_confetti' => 'Enable confetti effects',
 );
diff --git a/resources/lang/fi-FI/admin/accessories/message.php b/resources/lang/fi-FI/admin/accessories/message.php
index 78ddb94861..ebf300d81c 100644
--- a/resources/lang/fi-FI/admin/accessories/message.php
+++ b/resources/lang/fi-FI/admin/accessories/message.php
@@ -26,7 +26,11 @@ return array(
         'error'   		=> 'Oheistarviketta ei luovutettu, yritä uudelleen',
         'success' 		=> 'Oheistarvike luovutettiin onnistuneesti.',
         'unavailable'   => 'Oheistarvike ei ole lainattavissa. Tarkista saatavilla oleva määrä',
-        'user_does_not_exist' => 'Käyttäjä on virheellinen. Yritä uudelleen.'
+        'user_does_not_exist' => 'Käyttäjä on virheellinen. Yritä uudelleen.',
+         'checkout_qty' => array(
+            'lte'  => 'There is currently only one available accessory of this type, and you are trying to check out :checkout_qty. Please adjust the checkout quantity or the total stock of this accessory and try again.|There are :number_currently_remaining total available accessories, and you are trying to check out :checkout_qty. Please adjust the checkout quantity or the total stock of this accessory and try again.',
+            ),
+           
     ),
 
     'checkin' => array(
diff --git a/resources/lang/fi-FI/admin/accessories/table.php b/resources/lang/fi-FI/admin/accessories/table.php
index 5498f668b4..9581c3b648 100644
--- a/resources/lang/fi-FI/admin/accessories/table.php
+++ b/resources/lang/fi-FI/admin/accessories/table.php
@@ -6,6 +6,4 @@ return array(
     'id'      					=> 'Tunnus',
     'require_acceptance'      	=> 'Hyväksyminen',
     'title'      				=> 'Oheistarvikkeen nimi',
-
-
 );
diff --git a/resources/lang/fi-FI/admin/components/message.php b/resources/lang/fi-FI/admin/components/message.php
index 3a66a4163b..499d2bafe7 100644
--- a/resources/lang/fi-FI/admin/components/message.php
+++ b/resources/lang/fi-FI/admin/components/message.php
@@ -17,7 +17,8 @@ return array(
     'delete' => array(
         'confirm'   => 'Haluatko varmasti poistaa tämän komponentin?',
         'error'   => 'Komponentti poisto ei onnistunut. Yritä uudelleen.',
-        'success' => 'Komponentti poistettiin.'
+        'success' => 'Komponentti poistettiin.',
+        'error_qty'   => 'Some components of this type are still checked out. Please check them in and try again.',
     ),
 
      'checkout' => array(
diff --git a/resources/lang/fi-FI/admin/consumables/general.php b/resources/lang/fi-FI/admin/consumables/general.php
index 978e14f08a..5843ad2f17 100644
--- a/resources/lang/fi-FI/admin/consumables/general.php
+++ b/resources/lang/fi-FI/admin/consumables/general.php
@@ -8,4 +8,5 @@ return array(
     'remaining' 			            => 'Jäljellä',
     'total' 			                => 'Yhteensä',
     'update'                            => 'Päivitä kulutustarvike',
+    'inventory_warning'                 => 'The inventory of this consumable is below the minimum amount of :min_count',
 );
diff --git a/resources/lang/fi-FI/admin/consumables/message.php b/resources/lang/fi-FI/admin/consumables/message.php
index 8b76b02102..63c582cbef 100644
--- a/resources/lang/fi-FI/admin/consumables/message.php
+++ b/resources/lang/fi-FI/admin/consumables/message.php
@@ -2,6 +2,7 @@
 
 return array(
 
+    'invalid_category_type' => 'The category must be a consumable category.',
     'does_not_exist' => 'Kulutustarviketta ei ole.',
 
     'create' => array(
diff --git a/resources/lang/fi-FI/admin/custom_fields/general.php b/resources/lang/fi-FI/admin/custom_fields/general.php
index 71234f9ca0..7e61d638a1 100644
--- a/resources/lang/fi-FI/admin/custom_fields/general.php
+++ b/resources/lang/fi-FI/admin/custom_fields/general.php
@@ -35,7 +35,7 @@ return [
     'create_field_title' => 'Luo uusi mukautettu kenttä',
     'value_encrypted'      	        => 'Kentän arvo salataan tietokannassa. Vain järjestelmänvalvojat voivat tarkastella purettua arvoa',
     'show_in_email'     => 'Käytetäänkö kentän arvoa käyttäjälle lähetettävissä luovutus-sähköposteissa? Salattuja kenttiä ei voi lisätä sähköposteihin',
-    'show_in_email_short'     => 'Sisällytä sähköposteihin.',
+    'show_in_email_short' => 'Sisällytä sähköposteihin',
     'help_text' => 'Aputeksti',
     'help_text_description' => 'Tämä on valinnainen teksti joka ilmestyy lomakekentän alapuolelle laitetta muokatessa tarjotakseen kontekstia kentälle.',
     'about_custom_fields_title' => 'Mukautetuista kentistä',
@@ -57,5 +57,8 @@ return [
     'show_in_requestable_list_short' => 'Näytä pyydettävien assettien luettelossa',
     'show_in_requestable_list' => 'Näytä arvo pyydettävissä olevien assettien luettelossa. Salattuja kenttiä ei näytetä',
     'encrypted_options' => 'Tämä kenttä on salattu, joten jotkin näyttöasetukset eivät ole käytettävissä.',
+    'display_checkin' => 'Display in checkin forms',
+    'display_checkout' => 'Display in checkout forms',
+    'display_audit' => 'Display in audit forms',
 
 ];
diff --git a/resources/lang/fi-FI/admin/custom_fields/message.php b/resources/lang/fi-FI/admin/custom_fields/message.php
index 6ea493cb00..68571dd2ca 100644
--- a/resources/lang/fi-FI/admin/custom_fields/message.php
+++ b/resources/lang/fi-FI/admin/custom_fields/message.php
@@ -5,6 +5,7 @@ return array(
     'field' => array(
         'invalid'   => 'Tätä kenttää ei ole.',
         'already_added'   => 'Kentässä jo lisätty',
+        'none_selected'   => 'No field selected',
 
         'create' => array(
             'error'   => 'Kenttää ei luotu, yritä uudelleen.',
diff --git a/resources/lang/fi-FI/admin/depreciations/general.php b/resources/lang/fi-FI/admin/depreciations/general.php
index 6fb2705801..1d8ff5945d 100644
--- a/resources/lang/fi-FI/admin/depreciations/general.php
+++ b/resources/lang/fi-FI/admin/depreciations/general.php
@@ -13,4 +13,8 @@ return [
     'no_depreciations_warning'               => '<strong>Varoitus: </strong>
                       Sinulla ei ole tällä hetkellä yhtään poistoa.
                       Määritä vähintään yksi poisto, jotta voit tarkastella poistoraporttia.',
+    'depreciation_method'                   => 'Poistoraportti',
+    'linear_depreciation'                   => 'Linear (Default)',
+    'half_1'                                => 'Half-year convention, always applied',
+    'half_2'                                => 'Half-year convention, applied with condition',
 ];
diff --git a/resources/lang/fi-FI/admin/hardware/form.php b/resources/lang/fi-FI/admin/hardware/form.php
index 0aaf5a37b7..d3397ddf04 100644
--- a/resources/lang/fi-FI/admin/hardware/form.php
+++ b/resources/lang/fi-FI/admin/hardware/form.php
@@ -55,8 +55,11 @@ return [
     'asset_location_update_default' => 'Päivitä vain oletussijainti',
     'asset_location_update_actual' => 'Päivitä vain todellinen sijainti',
     'asset_not_deployable' => 'Laite ei ole käyttöönotettavissa. Laitetta ei voida luovuttaa.',
-    'asset_deployable' => 'Laite on käyttöönotettavissa. Laite voidaan luovuttaa.',
+    'asset_not_deployable_checkin' => 'That asset status is not deployable. Using this status label will checkin the asset.',
+    'asset_deployable' => 'This asset can be checked out.',
     'processing_spinner' => 'Käsitellään... (Tämä saattaa kestää jonkin aikaa suurien tiedostojen kanssa)',
+    'processing' => 'Käsitellään... ',
     'optional_infos'  => 'Valinnaiset tiedot',
-    'order_details'   => 'Tilaukseen liityvät tiedot'
+    'order_details'   => 'Tilaukseen liityvät tiedot',
+    'calc_eol'    => 'If nulling the EOL date, use automatic EOL calculation based on the purchase date and EOL rate.',
 ];
diff --git a/resources/lang/fi-FI/admin/hardware/general.php b/resources/lang/fi-FI/admin/hardware/general.php
index 1fef856259..c6c08ab58e 100644
--- a/resources/lang/fi-FI/admin/hardware/general.php
+++ b/resources/lang/fi-FI/admin/hardware/general.php
@@ -5,8 +5,8 @@ return [
     'about_assets_text'            => 'Laitteita ovat nimikeitä joita seurataan sarjanumeron tai laitetunnisteen avulla. Laitteiksi määritellään yleensä arvokkaampaa omaisuutta, joiden tunnistaminen yksilöllisesti on tärkeää. Pienemmät laitteet voi määrittää lisävarusteiksi.',
     'archived'  				=> 'Arkistoitu',
     'asset'  					=> 'Laite',
-    'bulk_checkout'             => 'Laitteiden luovutus',
-    'bulk_checkin'              => 'Palauta laitteita',
+    'bulk_checkout'             => 'Luovuta useita',
+    'bulk_checkin'              => 'Bulk Checkin',
     'checkin'  					=> 'Palauta laite',
     'checkout'  				=> 'Luovuta laite',
     'clone'  					=> 'Monista laite',
@@ -27,8 +27,7 @@ return [
     'undeployable_tooltip'  	=> 'Tällä laitteella on tilamerkintä joka ei mahdollista käyttöä, jonka takia laitetta ei voi lainata tällä hetkellä.',
     'view'  					=> 'Näytä laite',
     'csv_error' => 'Sinulla on virhe CSV tiedostossasi:',
-    'import_text' => '<p>Lataa CSV, joka sisältää sisältöhistorian. Sisältöjen ja käyttäjien TÄYTYY olla jo järjestelmässä, tai ne ohitetaan. Historiatiedostojen yhdistäminen tapahtuu omaisuuserien tunnistetta vasten. Yritämme löytää vastaavan käyttäjän, joka perustuu käyttäjän nimeen, jonka annat, ja kriteerit, jotka valitset alla. Jos et valitse mitään kriteerejä alla, se yksinkertaisesti yrittää vastata käyttäjänimen muodossa olet määrittänyt <code>Admin &gt; Yleiset asetukset</code>.</p><p>CSV:ssä olevien kenttien on vastattava otsikoita: <strong>Asset Tag, Name, Checkout Date, Checkin Date</strong>. Kaikki muut kentät jätetään huomiotta. </p><p>Tarkistuspäivämäärä: tyhjä tai tulevat tarkistuspäivämäärät tulevat kassalle kohteita liitetylle käyttäjälle. Jos tarkistuspäivämäärää ei oteta huomioon, tarkistuspäiväys luodaan päivinä.</p>
-    ',
+    'import_text' => '<p>Upload a CSV that contains asset history. The assets and users MUST already exist in the system, or they will be skipped. Matching assets for history import happens against the asset tag. We will try to find a matching user based on the user\'s name you provide, and the criteria you select below. If you do not select any criteria below, it will simply try to match on the username format you configured in the <code>Admin &gt; General Settings</code>.</p><p>Fields included in the CSV must match the headers: <strong>Asset Tag, Name, Checkout Date, Checkin Date</strong>. Any additional fields will be ignored. </p><p>Checkin Date: blank or future checkin dates will checkout items to associated user.  Excluding the Checkin Date column will create a checkin date with todays date.</p>    ',
     'csv_import_match_f-l' => 'Yritä sovittaa käyttäjät <strong>etunimi.sukunimi</strong> (<code>jane.smith</code>) muodossa',
     'csv_import_match_initial_last' => 'Yritä vastata käyttäjiä <strong>ensimmäisellä sukunimellä</strong> (<code>jsmith</code>)',
     'csv_import_match_first' => 'Yritä sovittaa käyttäjät <strong>etunimi</strong> (<code>jane</code>) muodossa',
diff --git a/resources/lang/fi-FI/admin/hardware/message.php b/resources/lang/fi-FI/admin/hardware/message.php
index 2537aff586..e3100f090c 100644
--- a/resources/lang/fi-FI/admin/hardware/message.php
+++ b/resources/lang/fi-FI/admin/hardware/message.php
@@ -2,19 +2,23 @@
 
 return [
 
-    'undeployable' 		=> '<strong>Varoitus: </strong> Tämä laite  ei ole käytettävävissä.
-                        Jos laitteen tila on muuttunut, päivitä laitteen tila sen asetuksista.',
-    'does_not_exist' 	=> 'Laitetta ei löydy.',
-    'does_not_exist_var'=> 'Asset with tag :asset_tag not found.',
-    'no_tag' 	        => 'No asset tag provided.',
+    'undeployable' 		 => '<strong>Warning: </strong> This asset has been marked as currently undeployable. If this status has changed, please update the asset status.',
+    'does_not_exist' 	 => 'Laitetta ei löydy.',
+    'does_not_exist_var' => 'Asset with tag :asset_tag not found.',
+    'no_tag' 	         => 'No asset tag provided.',
     'does_not_exist_or_not_requestable' => 'Tätä laitetta ei ole tai se ei ole pyydettävissä.',
-    'assoc_users'	 	=> 'Tämä laite on luovutettu käyttäjälle joten sitä ei voida poistaa. Palauta laite ensin käyttäjältä ja yritä uudelleen. ',
+    'assoc_users'	 	 => 'Tämä laite on luovutettu käyttäjälle joten sitä ei voida poistaa. Palauta laite ensin käyttäjältä ja yritä uudelleen. ',
     'warning_audit_date_mismatch' 	=> 'This asset\'s next audit date (:next_audit_date) is before the last audit date (:last_audit_date). Please update the next audit date.',
+    'labels_generated'   => 'Labels were successfully generated.',
+    'error_generating_labels' => 'Error while generating labels.',
+    'no_assets_selected' => 'No assets selected.',
 
     'create' => [
         'error'   		=> 'Laitetta ei luotu, yritä uudelleen. :(',
         'success' 		=> 'Laite luotiin onnistuneesti. :)',
         'success_linked' => 'Laite tunnisteella :tag luotiin onnistuneesti. <strong><a href=":link" style="color: white;">Klikkaa tästä nähdäksesi</a></strong>.',
+        'multi_success_linked' => 'Asset with tag :links was created successfully.|:count assets were created succesfully. :links.',
+        'partial_failure' => 'An asset was unable to be created. Reason: :failures|:count assets were unable to be created. Reasons: :failures',
     ],
 
     'update' => [
@@ -52,20 +56,24 @@ return [
     ],
 
     'import' => [
+        'import_button'         => 'Process Import',
         'error'                 => 'Joitakin nimikkeitä ei tuotu oikein.',
         'errorDetail'           => 'Seuraavia nimikkeitä ei tuotu virheiden vuoksi.',
         'success'               => 'Tiedostosi on tuotu',
         'file_delete_success'   => 'Tiedosto on poistettu onnistuneesti',
         'file_delete_error'      => 'Tiedostoa ei voitu poistaa',
         'file_missing' => 'Valittu tiedosto puuttuu',
+        'file_already_deleted' => 'The file selected was already deleted',
         'header_row_has_malformed_characters' => 'Yksi tai useampi otsikkorivin attribuutti sisältää epämuodostuneita UTF-8 merkkejä',
         'content_row_has_malformed_characters' => 'Yksi tai useampi ensimmäisen sisältörivin attribuutti sisältää epämuodostuneita UTF-8 merkkejä',
+        'transliterate_failure' => 'Transliteration from :encoding to UTF-8 failed due to invalid characters in input'
     ],
 
 
     'delete' => [
         'confirm'   	=> 'Oletko varma että haluat poistaa tämän laitteen?',
         'error'   		=> 'Laitteen poistamisessa tapahtui virhe. Yritä uudelleen.',
+        'assigned_to_error' => '{1}Asset Tag: :asset_tag is currently checked out. Check in this device before deletion.|[2,*]Asset Tags: :asset_tag are currently checked out. Check in these devices before deletion.',
         'nothing_updated'   => 'Laitetta ei ollut valittuna, joten mitään ei poistettu.',
         'success' 		=> 'Laite poistettu onnistuneesti.',
     ],
@@ -78,6 +86,11 @@ return [
         'no_assets_selected' => 'Valitse ainakin yksi laite listasta',
     ],
 
+    'multi-checkout' => [
+        'error'   => 'Asset was not checked out, please try again|Assets were not checked out, please try again',
+        'success' => 'Asset checked out successfully.|Assets checked out successfully.',
+    ],
+
     'checkin' => [
         'error'   		=> 'Laitteen palautus epäonnistui, yritä uudelleen',
         'success' 		=> 'Laite palautettu onnistuneesti.',
@@ -87,9 +100,10 @@ return [
     ],
 
     'requests' => [
-        'error'   		=> 'Laitetta ei pyydetty, yritä uudelleen',
-        'success' 		=> 'Laitteen pyytäminen onnistui.',
-        'canceled'      => 'Luovutus-pyyntö peruutettiin onnistuneesti',
+        'error'   		=> 'Request was not successful, please try again.',
+        'success' 		=> 'Request successfully submitted.',
+        'canceled'      => 'Request successfully canceled.',
+        'cancel'        => 'Peruuta tämä pyyntö',
     ],
 
 ];
diff --git a/resources/lang/fi-FI/admin/hardware/table.php b/resources/lang/fi-FI/admin/hardware/table.php
index 7cf42ada7c..4fbaf93465 100644
--- a/resources/lang/fi-FI/admin/hardware/table.php
+++ b/resources/lang/fi-FI/admin/hardware/table.php
@@ -25,7 +25,6 @@ return [
     'image'		    => 'Laitteen kuva',
     'days_without_acceptance' => 'Päiviä ilman hyväksymistä',
     'monthly_depreciation' => 'Kuukautinen poisto',
-    'assigned_to'    => 'Osoitettu',
     'requesting_user' => 'Pyytävä käyttäjä',
     'requested_date' => 'Pyynnön päivämäärä',
     'changed'       => 'Muutettu',
diff --git a/resources/lang/fi-FI/admin/kits/general.php b/resources/lang/fi-FI/admin/kits/general.php
index de2bf37b02..3f3363d90c 100644
--- a/resources/lang/fi-FI/admin/kits/general.php
+++ b/resources/lang/fi-FI/admin/kits/general.php
@@ -47,4 +47,5 @@ return [
     'kit_deleted'                       => 'Sarja poistettu',
     'kit_model_updated'                 => 'Malli päivitettiin onnistuneesti',
     'kit_model_detached'                => 'Malli poistettu',
+    'model_already_attached'            => 'Model already attached to kit',
 ];
diff --git a/resources/lang/fi-FI/admin/licenses/general.php b/resources/lang/fi-FI/admin/licenses/general.php
index 689e0f86f8..c24f61cf6b 100644
--- a/resources/lang/fi-FI/admin/licenses/general.php
+++ b/resources/lang/fi-FI/admin/licenses/general.php
@@ -14,6 +14,7 @@ return array(
     'info'  					=> 'Lisenssin lisätiedot',
     'license_seats'  			=> 'Lisenssien määrä',
     'seat'  					=> 'Määrä',
+    'seat_count'  				=> 'Seat :count',
     'seats'  					=> 'Määrät',
     'software_licenses'  		=> 'Ohjelmistolisenssit',
     'user'  					=> 'Käyttäjä',
@@ -23,12 +24,12 @@ return array(
         [
             'checkin_all'           => [
                 'button'            => 'Palauta kaikki paikat',
-                'modal'             => 'Tämä toiminto palauttaa yhden paikan. - Tämä toiminto palauttaa :checkedout_seats_count paikkaa tälle lisenssille.',
+                'modal'             => 'This action will checkin one seat. | This action will checkin all :checkedout_seats_count seats for this license.',
                 'enabled_tooltip'   => 'Palauttaa KAIKKI paikat tälle lisenssille sekä käyttäjiltä että laitteilta',
                 'disabled_tooltip'  => 'Tämä ei ole käytössä, koska paikkoja ei ole tällä hetkellä luovutettuina',
                 'disabled_tooltip_reassignable'  => 'Tämä ei ole käytössä, koska lisenssi ei ole uudelleenosoitettavissa',
                 'success'           => 'Lisenssi onnistuneesti palautettu! - Kaikki lisenssit palautettiin onnistuneesti!',
-                'log_msg'           => 'Palautettu lisenssien massalainauskäyttöliittymän kautta',
+                'log_msg'           => 'Checked in via bulk license checkin in license GUI',
             ],
 
             'checkout_all'              => [
diff --git a/resources/lang/fi-FI/admin/licenses/message.php b/resources/lang/fi-FI/admin/licenses/message.php
index e46fbdb0af..a05eaa4e65 100644
--- a/resources/lang/fi-FI/admin/licenses/message.php
+++ b/resources/lang/fi-FI/admin/licenses/message.php
@@ -44,10 +44,13 @@ return array(
         'error'   => 'Lisenssin luovutuksessa tapahtui virhe. Yritä uudelleen.',
         'success' => 'Lisenssi luovutettiin onnistuneesti',
         'not_enough_seats' => 'Lisenssipaikkoja ei ole riittävästi saatavilla kassalle',
+        'mismatch' => 'The license seat provided does not match the license',
+        'unavailable' => 'This seat is not available for checkout.',
     ),
 
     'checkin' => array(
         'error'   => 'Lisenssin palautuksessa tapahtui virhe. Yritä uudelleen.',
+        'not_reassignable' => 'License not reassignable',
         'success' => 'Lisenssi palautettiin onnistuneesti'
     ),
 
diff --git a/resources/lang/fi-FI/admin/locations/message.php b/resources/lang/fi-FI/admin/locations/message.php
index 0f1c4fa5e6..25c0e36a83 100644
--- a/resources/lang/fi-FI/admin/locations/message.php
+++ b/resources/lang/fi-FI/admin/locations/message.php
@@ -3,11 +3,12 @@
 return array(
 
     'does_not_exist' => 'Sijaintia ei löydy.',
-    'assoc_users'    => 'This location is not currently deletable because it is the location of record for at least one asset or user, has assets assigned to it, or is the parent location of another location. Please update your models to no longer reference this company and try again. ',
+    'assoc_users'    => 'This location is not currently deletable because it is the location of record for at least one asset or user, has assets assigned to it, or is the parent location of another location. Please update your records to no longer reference this location and try again ',
     'assoc_assets'	 => 'Sijaintiin on tällä hetkellä liitettynä vähintään yksi laite, eikä sitä voi poistaa. Poista viittaus sijantiin ja yritä uudelleen. ',
     'assoc_child_loc'	 => 'Tämä sijainti on ylempi toiselle sijainnille eikä sitä voi poistaa. Päivitä sijainnit, jotta et enää viitata tähän sijaintiin ja yritä uudelleen. ',
     'assigned_assets' => 'Luovutetut laitteet',
     'current_location' => 'Nykyinen sijainti',
+    'open_map' => 'Open in :map_provider_icon Maps',
 
 
     'create' => array(
@@ -20,6 +21,11 @@ return array(
         'success' => 'Sijainti päivitettiin onnistuneesti.'
     ),
 
+    'restore' => array(
+        'error'   => 'Location was not restored, please try again',
+        'success' => 'Location restored successfully.'
+    ),
+
     'delete' => array(
         'confirm'   	=> 'Oletko varma että haluat poistaa tämän sijainnin?',
         'error'   => 'Sijainnin poistossa tapahtui virhe. Yritä uudelleen.',
diff --git a/resources/lang/fi-FI/admin/locations/table.php b/resources/lang/fi-FI/admin/locations/table.php
index 9c289d5727..b0cee8b884 100644
--- a/resources/lang/fi-FI/admin/locations/table.php
+++ b/resources/lang/fi-FI/admin/locations/table.php
@@ -39,4 +39,5 @@ return [
     'signed_by_finance_auditor' => 'Allekirjoittaja (rahoitustarkastaja):',
     'signed_by_location_manager' => 'Allekirjoittanut (Sijaintipäällikkö):',
     'signed_by'                 => 'Luovuttanut:',
+    'clone'  					=> 'Clone Location',
 ];
diff --git a/resources/lang/fi-FI/admin/models/general.php b/resources/lang/fi-FI/admin/models/general.php
index 1cb4cd3179..9950ef794a 100644
--- a/resources/lang/fi-FI/admin/models/general.php
+++ b/resources/lang/fi-FI/admin/models/general.php
@@ -3,7 +3,7 @@
 return array(
     'about_models_title'     => 'Tietoja laitemalleista',
     'about_models_text'           => 'Laitemalleilla ryhmitellään samankaltaiset laitteet. "Elitebook 820 G3", "IPhone 6s" jne.',
-    'deleted'  					        => 'Tämä malli on poistettu.',
+    'deleted'  					=> 'Tämä malli on poistettu.',
     'bulk_delete'               => 'Massapoista laitemalleja',
     'bulk_delete_help'               => 'Käytä alla olevia valintaruutuja vahvistaaksesi laitemallien poistaminen. Laitemalleja, joissa on niihin liittyviä laitteita, ei voida poistaa ennen kuin laitteet on liitetty toiseen malliin.',
     'bulk_delete_warn'          => 'Olet poistamassa yhden laitemallin.|Olet poistamassa :model_count laitemallia.',
diff --git a/resources/lang/fi-FI/admin/models/message.php b/resources/lang/fi-FI/admin/models/message.php
index 6dd87b7213..403759d9e3 100644
--- a/resources/lang/fi-FI/admin/models/message.php
+++ b/resources/lang/fi-FI/admin/models/message.php
@@ -7,7 +7,7 @@ return array(
     'no_association' => 'VAROITUS! Omaisuusmalli tälle tuotteelle on virheellinen tai puuttuu!',
     'no_association_fix' => 'Tämä tulee rikkomaam asioita oudoilla ja kauhistuttavilla tavoilla. Muokkaa tätä laitetta nyt määrittääksesi sille mallin.',
     'assoc_users'	 => 'Tämä malli on käytössä yhdellä tai useammalla laitteella joten sitä ei voida poistaa. Poista malli käytöstä kaikilta laitteilta ja yritä uudelleen. ',
-
+    'invalid_category_type' => 'This category must be an asset category.',
 
     'create' => array(
         'error'   => 'Mallia ei luotu, yritä uudelleen.',
diff --git a/resources/lang/fi-FI/admin/reports/general.php b/resources/lang/fi-FI/admin/reports/general.php
index 7cbb29789b..ac3a3e69e8 100644
--- a/resources/lang/fi-FI/admin/reports/general.php
+++ b/resources/lang/fi-FI/admin/reports/general.php
@@ -4,6 +4,7 @@ return [
     'info'   => 'Valitse vaihtoehdot jotka haluat laiteraportillesi.',
     'deleted_user' => 'Poistettu käyttäjä',
     'send_reminder' => 'Lähetä muistutus',
+    'cannot_send_reminder' => 'User has been deleted or does not have an email address so cannot receive a reminder',
     'reminder_sent' => 'Muistutus lähetetty',
     'acceptance_deleted' => 'Käyttöoikeuspyyntö poistettu',
     'acceptance_request' => 'Käyttöoikeuspyyntö',
@@ -13,5 +14,10 @@ return [
         'user_state' => 'Käyttäjän Tila',
         'user_country' => 'Käyttäjän Maa',
         'user_zip' => 'Käyttäjän Zip'
-    ]
-];
\ No newline at end of file
+    ],
+    'open_saved_template' => 'Open Saved Template',
+    'save_template' =>  'Save Template',
+    'select_a_template' => 'Select a Template',
+    'template_name' => 'Template Name',
+    'update_template' => 'Update Template',
+];
diff --git a/resources/lang/fi-FI/admin/reports/message.php b/resources/lang/fi-FI/admin/reports/message.php
index 3fcab0d17d..2800bbdf0b 100644
--- a/resources/lang/fi-FI/admin/reports/message.php
+++ b/resources/lang/fi-FI/admin/reports/message.php
@@ -1,5 +1,16 @@
 <?php
 
-return array(
-    'error'   => 'Sinun tulee valita ainakin YKSI vaihtoehto.'
-);
+return [
+    'about_templates' => 'About Saved Templates',
+    'saving_templates_description' => 'Select your options, then enter the name of your template in the box above and click the \'Save Template\' button. Use the dropdown to select a previously saved template.',
+    'create'  => [
+        'success' => 'Template saved successfully',
+    ],
+    'update' => [
+        'success' => 'Template updated successfully',
+    ],
+    'delete' => [
+        'success' => 'Template deleted',
+        'no_delete_permission' => 'Template does not exist or you do not have permission to delete it.',
+    ],
+];
diff --git a/resources/lang/fi-FI/admin/settings/general.php b/resources/lang/fi-FI/admin/settings/general.php
index ce54170955..0c045716a0 100644
--- a/resources/lang/fi-FI/admin/settings/general.php
+++ b/resources/lang/fi-FI/admin/settings/general.php
@@ -8,13 +8,13 @@ return [
     'ad_append_domain'          => 'Lisää toimialueen nimi käyttäjänimikentän loppuun',
     'ad_append_domain_help'     => 'Käyttäjätunnusta ei tarvitse kirjoittaa muodossa "käyttätunnus@domain.local", pelkkä "käyttäjätunnus" riittää.',
     'admin_cc_email'            => 'Kopio sähköpostiosoite',
-    'admin_cc_email_help'       => 'Mikäli haluat lähettää erilliseen sähköpostiosoitteeseen kopion käyttäjälle lähetettävästä sähköposti-ilmoituksesta palautuksiin/luovutuksiin liittyen, syötä se tähän. Muussa tapauksessa jätä kenttä tyhjäksi.',
+    'admin_cc_email_help'       => 'Send a copy of checkin/checkout emails to this address.',
     'admin_settings'            => 'Ylläpitäjän Asetukset',
     'is_ad'				        => 'Käytössä on Active Directory -palvelin',
     'alerts'                	=> 'Hälytykset',
     'alert_title'               => 'Päivitä ilmoitusasetukset',
     'alert_email'				=> 'Lähetä ilmoitukset',
-    'alert_email_help'    => 'Sähköpostiosoitteet tai jakelulistat, joille haluat hälytysten tulla lähetetyiksi, pilkulla erotettuina',
+    'alert_email_help'          => 'Sähköpostiosoitteet tai jakelulistat, joille haluat hälytysten tulla lähetetyiksi, pilkulla erotettuina.',
     'alerts_enabled'			=> 'Sähköposti hälytykset käytössä',
     'alert_interval'			=> 'Kynnys ilmoituksille vanhentuvista (päivinä)',
     'alert_inv_threshold'		=> 'Varaston hälytysraja',
@@ -31,15 +31,18 @@ return [
     'backups'					=> 'Varmuuskopiot',
     'backups_help'              => 'Luo, lataa ja palauta varmuuskopiota ',
     'backups_restoring'         => 'Palauta varmuuskopiosta',
+    'backups_clean' => 'Clean the backed-up database before restore',
+    'backups_clean_helptext' => "This can be useful if you're changing between database versions",
     'backups_upload'            => 'Lataa varmuuskopio',
     'backups_path'              => 'Varmuuskopiot ovat tallennettuna palvelimelle polulla <code>:path</code>',
-    'backups_restore_warning'   => 'Käytä palautuspainiketta <small><span class="btn btn-xs btn-warning"><i class="text-white fas fa-retweet" aria-hidden="true"></i></span></small> palauttaaksesi aiemman varmuuskopion. (Tämä ei tällä hetkellä toimi S3 tallennustilan tai Dockerin kanssa.)<br><br><strong>Koko :app_name tietokantasi ja kaikki ladatut tiedostot korvataan kokonaan</strong> sillä, mitä on varmuuskopiotiedostossa.  ',
+    'backups_restore_warning'   => 'Use the restore button <small><span class="btn btn-xs btn-warning"><i class="text-white fas fa-retweet" aria-hidden="true"></i></span></small> to restore from a previous backup. (This does not currently work with S3 file storage or Docker.)<br><br>Your <strong>entire :app_name database and any uploaded files will be completely replaced</strong> by what\'s in the backup file  ',
     'backups_logged_out'         => 'Kaikki käyttäjät, mukaan lukien sinut, kirjataan ulos, kun palautus on valmis.',
     'backups_large'             => 'Hyvin suuret varmuuskopiot saattavat aiheuttaa aikakatkaisun palautusyrityksessä, ja ne saattaa täytyä vielä ajaa komentorivin kautta. ',
     'barcode_settings'			=> 'Viivakoodi asetukset',
     'confirm_purge'			    => 'Vahvista puhdistus',
     'confirm_purge_help'		=> 'Kirjoita alla olevaan kenttään teksti "DELETE" puhdistaaksesi poistetut tietueet. Tätä toimintoa ei voi kumota ja se poistaa kaikki "soft-deleted" poistetut kohteet ja käyttäjät. (Varmuuskopioi tiedot ensin, varmuuden vuoksi)',
     'custom_css'				=> 'Mukautettu CSS',
+    'custom_css_placeholder'	=> 'Add your custom CSS',
     'custom_css_help'			=> 'Anna haluamasi mukautettu CSS. Älä lisää &lt;style&gt;&lt;/style&gt; tunnisteita.',
     'custom_forgot_pass_url'	=> 'Mukautettu salasanan nollaus URL-osoite',
     'custom_forgot_pass_url_help'	=> 'Tämä korvaa sisäänrakennetun salasanan palautuspalvelun URL-osoitteen. Sen avulla voit ohjata käyttäjät organisaation sisäiseen tai isännöityyn LDAP-salasanan vaihtotoimintoon.',
@@ -47,34 +50,34 @@ return [
     'dashboard_message_help'	=> 'Tämä teksti esiintyy työpöydällä kaikille, joilla on oikeus tarkastella työpöytää.',
     'default_currency'  		=> 'Oletusvaluutta',
     'default_eula_text'			=> 'Yleiset käyttöehdot',
+    'default_eula_text_placeholder' => 'Add your default EULA text',
     'default_language'			=> 'Oletuskieli',
     'default_eula_help_text'	=> 'Voit myös liittää mukautettuja käyttöehtoja tiettyihin laitekategorioihin.',
     'acceptance_note'           => 'Add a note for your decision (Optional)',
     'display_asset_name'        => 'Näytä laitteen nimi',
     'display_checkout_date'     => 'Näytä luovutuspäivämäärä listauksessa',
     'display_eol'               => 'Näytä elinaika listauksessa',
-    'display_qr'                => 'Näytä neliökoodit',
+    'display_qr'                => 'Display 2D barcode',
     'display_alt_barcode'		=> 'Näytä 1D viivakoodi',
-    'email_logo'                => 'Sähköpostin logo',
     'barcode_type'				=> '2D viivakoodityyppi',
     'alt_barcode_type'			=> '1D viivakoodityyppi',
-    'email_logo_size'       => 'Neliönmuotoiset logot näyttävät sähköpostissa parhailta. ',
     'enabled'                   => 'Käytössä',
     'eula_settings'				=> 'Käyttöehtojen asetukset',
     'eula_markdown'				=> 'Käyttäehdossa voi käyttää<a href="https://help.github.com/articles/github-flavored-markdown/">Github-merkintöjä</a>.',
+    'empty_row_count'           => 'Field Start Offset (Empty Rows)',
+    'empty_row_count_help'      => 'Fields will begin populating after this many empty rows are skipped at the top of the label.',
     'favicon'                   => 'Favicon',
     'favicon_format'            => 'Hyväksytyt tiedostotyypit ovat ico, png ja gif. Muut kuvamuodot eivät välttämättä toimi kaikissa selaimissa.',
     'favicon_size'          => 'Faviconien tulee olla neliömuotoisia, 16x16 pikseliä.',
     'footer_text'               => 'Lisäys alatunnisteen tekstiin ',
     'footer_text_help'          => 'Tämä teksti esiintyy oikeanpuoleisessa alatunnisteessa. Linkkejä voi lisätä käyttämällä <a href="https://help.github.com/articles/github-flavored-markdown/">Github merkintätapaa</a>. Rivinvaihdot, otsikot, kuvat, jne. voivat johtaa epätoivottuihin tuloksiin.',
+    'footer_text_placeholder'   => 'Optional footer text',
     'general_settings'			=> 'Yleiset asetukset',
-    'general_settings_keywords' => 'yrityksen tuki, allekirjoitus, hyväksyminen, sähköpostimuoto, käyttäjänimi muodossa, kuvia, sivua, pikkukuvat, eula, gravatar, tos, kojelauta, yksityisyys',
     'general_settings_help'     => 'Oletuskäyttöehdot ja muuta',
     'generate_backup'			=> 'Luo varmuuskopio',
     'google_workspaces'         => 'Googlen Työtilat',
     'header_color'              => 'Yläosion logo',
     'info'                      => 'Näiden asetusten avulla voit mukauttaa tiettyjä toimintoja.',
-    'label_logo'                => 'Tunnisteen logo',
     'label_logo_size'           => 'Neliönmuotoiset logot näyttävät parhailta - näytetään oikeassa yläkulmassa jokaisen laitetunnisteen kohdalla. ',
     'laravel'                   => 'Laravel-versio',
     'ldap'                      => 'LDAP',
@@ -94,7 +97,7 @@ return [
     'ldap_login_sync_help'      => 'Tämä testaa vain LDAP-synkronoinnin toimivuutta. Mikäli LDAP autentikointikysely on virheellinen, käyttäjät eivät voi kirjautua sisään. SINUN TULEE TALLENTAA UUDET ASETUKSET ENSIN.',
     'ldap_manager'              => 'LDAP Hallinta',
     'ldap_server'               => 'LDAP Palvelin',
-    'ldap_server_help'          => 'Tämän pitäisi alkaa ldap: // (salaamaton tai TLS) tai ldaps: // (SSL)',
+    'ldap_server_help'          => 'This should start with ldap:// (for unencrypted) or ldaps:// (for TLS or SSL)',
     'ldap_server_cert'			=> 'LDAP SSL varmenteen varmennus',
     'ldap_server_cert_ignore'	=> 'Salli virheelliset SSL Varmenteet',
     'ldap_server_cert_help'		=> 'Valitse tämä, jos käytät itse allekirjoitettua SSL-varmennetta ja haluat hyväksyä virheellisen SSL-varmenteen.',
@@ -108,8 +111,8 @@ return [
     'ldap_pword'                => 'LDAP-sidonta salasana',
     'ldap_basedn'               => 'Kohdehaaran DN',
     'ldap_filter'               => 'LDAP suodatin',
-    'ldap_pw_sync'              => 'LDAP salasanan synkronointi',
-    'ldap_pw_sync_help'         => 'Poista valinta, jos et halua säilyttää LDAP-salasanoja synkronoituna paikallisiin salasanoihin. Tällöin käyttäjät eivät voi kirjautua sisään, jos LDAP-palvelin ei jostain syystä ole tavoitettavissa.',
+    'ldap_pw_sync'              => 'Cache LDAP Passwords',
+    'ldap_pw_sync_help'         => 'Uncheck this box if you do not wish to keep LDAP passwords cached as local hashed passwords. Disabling this means that your users may not be able to login if your LDAP server is unreachable for some reason.',
     'ldap_username_field'       => 'Käyttäjätunnus kenttä',
     'ldap_lname_field'          => 'Sukunimi',
     'ldap_fname_field'          => 'LDAP etunimi',
@@ -117,13 +120,15 @@ return [
     'ldap_version'              => 'LDAP versio',
     'ldap_active_flag'          => 'LDAP-aktiivinen lippu',
     'ldap_activated_flag_help'  => 'Tätä arvoa käytetään määrittämään, voiko synkronoitu käyttäjä kirjautua Snipe-IT:lle. <strong>Se ei vaikuta kykyyn tarkistaa kohteita sisällä tai ulos niistä A, format@@1 , ja pitäisi olla <strong>attribuutin nimi</strong> AD/LDAP, <strong>ei arvo</strong>. <br><br>Jos tämä kenttä on asetettu kentän nimeksi, jota ei ole AD/LDAP:ssäsi, tai arvo AD/LDAP -kentässä on asetettu <code>0</code> tai <code>false</code>, <strong>käyttäjän kirjautuminen poistetaan käytöstä</strong>. Jos AD/LDAP -kentän arvo on määritetty <code>1</code> tai <code>true</code> tai <em>millä tahansa muulla tekstillä</em> tarkoittaa, että käyttäjä voi kirjautua sisään. Kun kenttä on tyhjä AD:ssäsi, kunnioitamme <code>userAccountControl</code> -attribuuttia, joka antaa yleensä keskeytymättömille käyttäjille mahdollisuuden kirjautua sisään.',
+    'ldap_invert_active_flag'   => 'LDAP Invert Active Flag',
+    'ldap_invert_active_flag_help'     => 'If enabled: when the value returned by LDAP Active Flag is <code>0</code> or <code>false</code> the user account will be active.',
     'ldap_emp_num'              => 'LDAP henkilönumero',
     'ldap_email'                => 'LDAP sähköposti',
     'ldap_test'                 => 'Testaa LDAP',
     'ldap_test_sync'            => 'Testaa Ldap Synkronointi',
     'license'                   => 'Ohjelmistolisenssi',
-    'load_remote'               => 'Käytä Gravataria',
-    'load_remote_help_text'		=> 'Poista tämä valintaruutu, jos asennuksesi ei voi ladata skriptejä ulkoisesta internetistä. Tämä estää Snipe-IT käyttämästä Gravatarista ladattavia kuvia.',
+    'load_remote'               => 'Load Remote Avatars',
+    'load_remote_help_text'		=> 'Uncheck this box if your install cannot load scripts from the outside internet. This will prevent Snipe-IT from trying load avatars from Gravatar or other outside sources.',
     'login'                     => 'Kirjautumisyritykset',
     'login_attempt'             => 'Kirjautuminen Yritti',
     'login_ip'                  => 'Ip Osoite',
@@ -131,6 +136,7 @@ return [
     'login_user_agent'          => 'Käyttäjän Agentti',
     'login_help'                => 'Luettelo yrityksestä kirjautua',
     'login_note'                => 'Kirjautumisviesti',
+    'login_note_placeholder'            => "If you do not have a login or have found a device belonging to this company, please call technical support at 888-555-1212. Thank you.",
     'login_note_help'           => 'Voit lisätä muutamia lauseita kirjautumisruudulle, esimerkiksi neuvoaksesi heitä jotka ovat löytäneet kadonneen tai varastetun laitteen. Tässä kentässä voi käyttää <a href="https://help.github.com/articles/github-flavored-markdown/">Github-muotoiluja</a>',
     'login_remote_user_text'    => 'Etäkäyttäjän kirjautumisvaihtoehdot',
     'login_remote_user_enabled_text' => 'Salli kirjautuminen etäkäyttäjäkäyttäjän otsikolla',
@@ -146,13 +152,16 @@ return [
     'logo_print_assets_help'    => 'Käytä brändäystä tulostettavissa nimikelistoissa ',
     'full_multiple_companies_support_help_text' => 'Käyttäjien (myös ylläpitäjien) rajoittaminen vain yritykselle kirjattuihin laitteisiin.',
     'full_multiple_companies_support_text' => 'Täysi monien yritysten tuki',
+    'scope_locations_fmcs_support_text'  => 'Scope Locations with Full Multiple Companies Support',
+    'scope_locations_fmcs_support_help_text'  => 'Restrict locations to their selected company.',
+    'scope_locations_fmcs_check_button' => 'Check Compatibility',
+    'scope_locations_fmcs_support_disabled_text'  => 'This option is disabled because you have conflicting locations set for :count or more items.',
     'show_in_model_list'   => 'Näytä mallinvalinta-listoissa',
     'optional'					=> 'valinnainen',
     'per_page'                  => 'Tuloksia per sivu',
     'php'                       => 'PHP versio',
-    'php_info'                  => 'PHP Info',
+    'php_info'                  => 'PHP info',
     'php_overview'              => 'PHP',
-    'php_overview_keywords'     => 'phpinfo, järjestelmä, tiedot',
     'php_overview_help'         => 'PHP järjestelmän tiedot',
     'php_gd_info'               => 'Sinun tulee asentaa php-gd paketti näyttääksesi QR-koodit, katso lisätietoja asennusohjeista.',
     'php_gd_warning'            => 'PHP Image Prosessing ja GD-lisäosia EI ole asennettuna.',
@@ -218,6 +227,8 @@ return [
     'webhook_integration_help'    => ':app integraatio on valinnainen, mutta päätepiste ja kanava vaaditaan, jos haluat käyttää sitä. Määrittääksesi :app integraation, sinun täytyy ensin <a href=":webhook_link" target="_new" rel="noopener">luoda saapuva webhook</a> :app tilillesi. Klikkaa <strong>Testaa :app Integration</strong> -painiketta varmistaaksesi, että asetuksesi ovat oikein ennen tallentamista. ',
     'webhook_integration_help_button'    => 'Kun olet tallentanut :app tietosi, ilmestyy testipainike.',
     'webhook_test_help'           => 'Testaa, onko sovelluksen :app integraatio määritetty oikein. SINUN TULEE TALLENTAA PÄIVÄNÄ :app ASETTINGS FIRST.',
+    'shortcuts_enabled'         => 'Enable Shortcuts',
+    'shortcuts_help_text'       => '<strong>Windows</strong>: Alt + Access key, <strong>Mac</strong>: Control + Option + Access key',
     'snipe_version'  			=> 'Snipe-IT versio',
     'support_footer'            => 'Tuki-alatunnisteen linkit ',
     'support_footer_help'       => 'Määrittele, kuka voi nähdä linkit Snipe-IT tukipalvelun tietoihin ja käyttöohjeeseen',
@@ -227,7 +238,6 @@ return [
     'update'                    => 'Päivitä asetukset',
     'value'                     => 'Arvo',
     'brand'                     => 'Brändäys',
-    'brand_keywords'            => 'footer, logo, tulostus, teema, iho, otsikko, värit, css',
     'brand_help'                => 'Logo, Sivuston Nimi',
     'web_brand'                 => 'Web-brändäyksen tyyppi',
     'about_settings_title'      => 'Tietoa asetuksista',
@@ -276,6 +286,8 @@ return [
     'two_factor_enrollment_text'	=> "Kaksivaiheinen tunnistautuminen vaaditaan, mutta et ole rekisteröinyt itsellesi laitetta. Avaa Google Authenticator -sovellus ja skannaa alla oleva QR-koodi rekisteröidäksesi laitteesi. Kun olet rekisteröinyt laitteesi, kirjoita koodi",
     'require_accept_signature'      => 'Vaadi allekirjoitus',
     'require_accept_signature_help_text'      => 'Tämän ominaisuuden ottaminen käyttöön edellyttää käyttäjiltä allekirjoitusta hyväksymisen yhteydessä.',
+    'require_checkinout_notes'  => 'Require Notes on Checkin/Checkout',
+    'require_checkinout_notes_help_text'    => 'Enabling this feature will require the note fields to be populated when checking in or checking out an asset.',
     'left'        => 'vasen',
     'right'        => 'oikea',
     'top'        => 'ylä',
@@ -313,24 +325,24 @@ return [
     'filter_by_keyword' => 'Suodata asettamalla avainsana',
     'security' => 'Turvallisuus',
     'security_title' => 'Päivitä Turvallisuusasetukset',
-    'security_keywords' => 'salasana, salasanat, vaatimukset, kaksi tekijää, kaksiosainen tekijä, yhteiset salasanat, etäkirjautuminen, kirjaudu, todennus',
     'security_help' => 'Kaksikerroin, Salasanan Rajoitukset',
-    'groups_keywords' => 'käyttöoikeudet, käyttöoikeusryhmät, valtuutus',
     'groups_help' => 'Tilin käyttöoikeusryhmät',
     'localization' => 'Lokalisointi',
     'localization_title' => 'Päivitä Lokalisoinnin Asetukset',
-    'localization_keywords' => 'lokalisointi, valuutta, paikallinen, paikallinen, paikallinen, aikavyöhyke, kansainväliset, internatinalization, kieli, kielet, käännös',
     'localization_help' => 'Kieli, päivämäärän näyttö',
     'notifications' => 'Ilmoitukset',
     'notifications_help' => 'Sähköpostihälytykset Ja Tarkastusasetukset',
     'asset_tags_help' => 'Korotukset ja etuliitteet',
     'labels' => 'Tunnisteet',
     'labels_title' => 'Päivitä Tunnisteasetukset',
-    'labels_help' => 'Tunnistekoot &amp; asetukset',
-    'purge_keywords' => 'poista pysyvästi',
+    'labels_help' => 'Barcodes &amp; label settings',
     'purge_help' => 'Puhdista poistetut tietueet',
     'ldap_extension_warning' => 'Se ei näytä LDAP laajennus on asennettu tai otettu käyttöön tällä palvelimella. Voit silti tallentaa asetuksesi, mutta sinun täytyy ottaa käyttöön LDAP laajennus PHP ennen LDAP synkronointia tai kirjautuminen toimii.',
     'ldap_ad' => 'LDAP/AD',
+    'ldap_test_label' => 'Test LDAP Sync',
+    'ldap_test_login' => ' Test LDAP Login',
+    'ldap_username_placeholder' => 'LDAP Username',
+    'ldap_password_placeholder' => 'LDAP Password',
     'employee_number' => 'Työntekijän Numero',
     'create_admin_user' => 'Luo käyttäjä ::',
     'create_admin_success' => 'Onnistui! Ylläpitäjäsi on lisätty!',
@@ -342,6 +354,8 @@ return [
     'setup_migration_create_user' => 'Seuraavaksi: Luo Käyttäjä',
     'ldap_settings_link' => 'Ldap Asetukset Sivu',
     'slack_test' => 'Testaa <i class="fab fa-slack"></i> Integraatio',
+    'status_label_name' => 'Status Label Name',
+    'super_admin_only'  => 'Super Admin Only',
     'label2_enable'           => 'Uusi Tunniste Moottori',
     'label2_enable_help'      => 'Vaihda uuteen tarramoottoriin. <b>Huomautus: Sinun täytyy tallentaa tämä asetus ennen kuin asetat muita.</b>',
     'label2_template'         => 'Malli',
@@ -356,12 +370,15 @@ return [
     'label2_2d_type'          => '2D viivakoodityyppi',
     'label2_2d_type_help'     => 'Muoto 2D-viivakoodeja varten',
     'label2_2d_target'        => '2d-Viivakoodin Kohde',
-    'label2_2d_target_help'   => 'URL-osoite, joka on 2D viivakoodipisteitä, kun skannattu',
+    'label2_2d_target_help'   => 'The data that will be contained in the 2D barcode',
     'label2_fields'           => 'Kentän Määritelmät',
     'label2_fields_help'      => 'Kentät voidaan lisätä, poistaa ja järjestää uudelleen vasemmassa sarakkeessa. Kussakin kentässä voidaan lisätä, poistaa ja järjestää uudelleen oikeaan sarakkeeseen useita vaihtoehtoja.',
+    'purge_barcodes' => 'Purge Barcodes',
     'help_asterisk_bold'    => 'Teksti, joka syötetään muodossa <code>**text**</code> näytetään lihavoituina',
     'help_blank_to_use'     => 'Jätä tyhjäksi käyttääksesi arvoa <code>:setting_name</code>',
     'help_default_will_use' => '<code>:default</code> will use the value from <code>:setting_name</code>. <br>Note that the value of the barcodes must comply with the respective barcode spec in order to be successfully generated. Please see <a href="https://snipe-it.readme.io/docs/barcodes">the documentation <i class="fa fa-external-link"></i></a> for more details. ',
+    'asset_id'              => 'Asset ID',
+    'data'               => 'Data',
     'default'               => 'Oletus',
     'none'                  => 'Ei Mitään',
     'google_callback_help' => 'Tämä tulisi syöttää takaisinsoittoosoitteeksi Google OAuth -sovellusasetuksissa organisaatiosi&apos;s <strong><a href="https://console.cloud.google.com/" target="_blank">Googlen kehittäjäkonsoli <i class="fa fa-external-link" aria-hidden="true"></i></a></strong>.',
@@ -373,7 +390,100 @@ return [
     'database_driver' => 'Tietokannan Ajuri',
     'bs_table_storage' => 'Taulukko Tallennustila',
     'timezone' => 'Timezone',
+    'test_mail' => 'Test Mail',
     'profile_edit'          => 'Edit Profile',
     'profile_edit_help'          => 'Allow users to edit their own profiles.',
+    'default_avatar' => 'Custom Default Avatar',
+    'default_avatar_help' => 'This image will be displayed as a profile if a user does not have a profile photo.',
+    'restore_default_avatar' => 'Restore <a href=":default_avatar" data-toggle="lightbox" data-type="image">original system default avatar</a>',
+    'restore_default_avatar_help' => '',
+    'due_checkin_days' => 'Due For Checkin Warning',
+    'due_checkin_days_help' => 'How many days before the expected checkin of an asset should it be listed in the "Due for checkin" page?',
+    'no_groups' => 'No groups have been created yet. Visit <code>Admin Settings > Permission Groups</code> to add one.',
+    'text' => 'Text',
+
+    'username_formats' => [
+        'username_format'		=> 'Käyttäjätunnuksen muoto',
+        'firstname_lastname_format'	=> 'Etunimi .Sukunimi (jane.smith)',
+        'first_name_format'	        => 'First Name (jane)',
+        'last_name_format'		=> 'Last Name (doe)',
+        'filastname_format'			=> 'First Initial Last Name (jsmith)',
+        'lastnamefirstinitial_format' =>  'Last Name First Initial (smithj)',
+        'firstname_lastname_underscore_format' => 'First Name Last Name (jane_smith)',
+        'firstinitial.lastname' => 'First Initial Last Name (j.smith)',
+        'lastname_firstinitial' => 'Last Name First Initial (smith_j)',
+        'lastname_dot_firstinitial_format' => 'Last Name First Initial (smith.j)',
+        'firstnamelastname'     => 'First Name Last Name (janesmith)',
+        'firstnamelastinitial'  => 'First Name Last Initial (janes)',
+        'lastnamefirstname'      => 'Last Name.First Name (smith.jane)',
+    ],
+
+    'email_formats' => [
+        'email_format'			=> 'Sähköpostiosoitteen muotoilu',
+        'firstname_lastname_format'	=> 'Etunimi .Sukunimi (jane.smith@example.com)',
+        'first_name_format'		=> 'Etunimi (jane@example.com)',
+        'last_name_format'		=> 'Last Name (doe@example.com)',
+        'filastname_format'			=> 'Ensimmäinen nimikirjain sukunimi (pvirtanen@example.com)',
+        'lastnamefirstinitial_format' =>  'Sukunimi Etunimen ensimmäinen (smithj@example.com)',
+        'firstname_lastname_underscore_format' => 'Etunimi Sukunimi (paivi_virtanen@example.com)',
+        'firstinitial.lastname' => 'Ensimmäinen nimikirjain . sukunimi (p.virtanen@example.com)',
+        'lastname_firstinitial' => 'Sukunimi _ etunimen ensimmäinen kirjain (virtanen_p@example.com)',
+        'lastname_dot_firstinitial_format' => 'Last Name First Initial (smith.j@example.com)',
+        'firstnamelastname'     => 'Etunimi . sukunimi (pekka.virtanen@example.com)',
+        'firstnamelastinitial'  => 'Etunimi Sukunimen ensimmäinen kirjain (paiviv@example.com)',
+        'lastnamefirstname'      => 'Last Name.First Name (smith.jane@example.com)',
+    ],
+
+
+
+    'logo_labels' => [
+        'acceptance_pdf_logo'       => 'PDF Logo',
+        'email_logo'                => 'Sähköpostin logo',
+        'label_logo'                => 'Tunnisteen logo',
+        'logo'                      => 'Site Logo',
+        'favicon'                   => 'Favicon',
+    ],
+
+    'logo_help' => [
+        'email_logo_size'       => 'Neliönmuotoiset logot näyttävät sähköpostissa parhailta. ',
+    ],
+
+    'logo_option_types' => [
+        'text' => 'Text',
+        'logo' => 'Logo',
+        'logo_and_text' => 'Logo and Text',
+    ],
+
+
+    'legends' => [
+        'scoping' => 'Scoping',
+        'formats' => 'Default Formats',
+        'profiles' => 'User Profiles',
+        'eula' => 'EULA & Acceptance Preferences',
+        'misc_display' => 'Miscellaneous Display Options',
+        'email' => 'Email Preferences',
+        'checkin' => 'Checkin Preferences',
+        'dashboard' => 'Login & Dashboard Preferences',
+        'misc' => 'Miscellaneous',
+        'logos' => 'Logos & Display',
+        'colors' => 'Colors & Skins',
+        'footer' => 'Footer Preferences',
+        'security' => 'Security Preferences',
+        'general' => 'General',
+        'intervals' => 'Intervals & Thresholds',
+    ],
+
+
+    /* Keywords for settings overview help */
+    'keywords' => [
+        'brand'             => 'footer, logo, tulostus, teema, iho, otsikko, värit, css',
+        'general_settings'  => 'yrityksen tuki, allekirjoitus, hyväksyminen, sähköpostimuoto, käyttäjänimi muodossa, kuvia, sivua, pikkukuvat, eula, gravatar, tos, kojelauta, yksityisyys',
+        'groups'            => 'käyttöoikeudet, käyttöoikeusryhmät, valtuutus',
+        'labels'            => 'labels, barcodes, barcode, sheets, print, upc, qr, 1d, 2d',
+        'localization'      => 'lokalisointi, valuutta, paikallinen, paikallinen, paikallinen, aikavyöhyke, kansainväliset, internatinalization, kieli, kielet, käännös',
+        'php_overview'      => 'phpinfo, järjestelmä, tiedot',
+        'purge'             => 'poista pysyvästi',
+        'security'          => 'salasana, salasanat, vaatimukset, kaksi tekijää, kaksiosainen tekijä, yhteiset salasanat, etäkirjautuminen, kirjaudu, todennus',
+    ],
 
 ];
diff --git a/resources/lang/fi-FI/admin/settings/message.php b/resources/lang/fi-FI/admin/settings/message.php
index fc1b14fbf0..3030a5b1cd 100644
--- a/resources/lang/fi-FI/admin/settings/message.php
+++ b/resources/lang/fi-FI/admin/settings/message.php
@@ -14,6 +14,9 @@ return [
         'restore_warning'       => 'Kyllä, palauttaa sen. Ymmärrän, että tämä korvaa kaikki olemassa olevat tiedot tietokannassa. Tämä myös kirjautuu ulos kaikista nykyisistä käyttäjistä (mukaan lukien sinä).',
         'restore_confirm'       => 'Oletko varma, että haluat palauttaa tietokannan :filename?'
     ],
+    'restore' => [
+        'success'               => 'Your system backup has been restored. Please log in again.'
+    ],
     'purge' => [
         'error'     => 'Virhe on ilmennyt puhdistuksen aikana.',
         'validation_failed'     => 'Puhdistusvahvistus on virheellinen. Kirjoita vahvistusruutuun sana "DELETE".',
@@ -33,6 +36,9 @@ return [
         'testing_authentication' => 'Testataan Ldap Todennusta...',
         'authentication_success' => 'Käyttäjä tunnistettu LDAP vastaan!'
     ],
+    'labels' => [
+        'null_template' => 'Label template not found. Please select a template.',
+        ],
     'webhook' => [
         'sending' => 'Lähetetään :app testiviestiä...',
         'success' => 'Sinun :webhook_name Integraatio toimii!',
@@ -42,5 +48,12 @@ return [
         'error' => 'Jokin meni pieleen. :app vastasi: :error_message',
         'error_redirect' => 'VIRHE: 301/302 :endpoint palauttaa uudelleenohjauksen. Turvallisuussyistä emme seuraa uudelleenohjauksia. Käytä todellista päätepistettä.',
         'error_misc' => 'Jokin meni pieleen. :( ',
-    ]
+        'webhook_fail' => ' webhook notification failed: Check to make sure the URL is still valid.',
+        'webhook_channel_not_found' => ' webhook channel not found.',
+        'ms_teams_deprecation' => 'The selected Microsoft Teams webhook URL will be deprecated Dec 31st, 2025. Please use a workflow URL. Microsoft\'s documentation on creating a workflow can be found <a href="https://support.microsoft.com/en-us/office/create-incoming-webhooks-with-workflows-for-microsoft-teams-8ae491c7-0394-4861-ba59-055e33f75498" target="_blank"> here.</a>',
+    ],
+    'location_scoping' => [
+        'not_saved' => 'Your settings were not saved.',
+        'mismatch' => 'There is 1 item in the database that need your attention before you can enable location scoping.|There are :count items in the database that need your attention before you can enable location scoping.',
+    ],
 ];
diff --git a/resources/lang/fi-FI/admin/statuslabels/table.php b/resources/lang/fi-FI/admin/statuslabels/table.php
index 07c3a9802d..ff102286a5 100644
--- a/resources/lang/fi-FI/admin/statuslabels/table.php
+++ b/resources/lang/fi-FI/admin/statuslabels/table.php
@@ -1,14 +1,14 @@
 <?php
 
 return array(
-    'about'      	=> 'Tietoja tilamerkinnöistä',
+    'about'      	=> 'About Status Types',
     'archived'      	=> 'Arkistoitu',
     'create'      	=> 'Uusi tilamerkintä',
     'color'      	=> 'Kaavion väri',
     'default_label' => 'Oletustunniste',
     'default_label_help' => 'Tätä käytetään varmistamaan, että yleisimmin käytetyt tilamerkinnät ovat valittavissa ylimpänä, kun luodaan tai muokataan laitteita.',
     'deployable'      	=> 'Käyttöönotettavissa',
-    'info'      	=> 'Tilamerkintöjä käytetään kuvailemaan laitteidesi eri tiloja. Ne voivat olla korjauksessa, hävinneitä/varastettuja jne. Voit luoa uusia tilamerkintöjä käyttöönotettaville, odottaville sekä arkistoiduille laitteille.',
+    'info'      	=> 'Status label types are used to describe the various states your assets could be in. They may be out for repair, lost/stolen, etc. You can create new status labels for your deployable, pending and archived assets according to your own workflow. For more information, <a href="https://snipe-it.readme.io/docs/overview#status-labels" target="_blank">see the documentation <i class="fa fa-external-link"></i></a>.',
     'name'      	=> 'Tilan nimi',
     'pending'      	=> 'Odottaa',
     'status_type'   => 'Tilatyyppi',
diff --git a/resources/lang/fi-FI/admin/users/general.php b/resources/lang/fi-FI/admin/users/general.php
index 0a25fa609c..a523a5f457 100644
--- a/resources/lang/fi-FI/admin/users/general.php
+++ b/resources/lang/fi-FI/admin/users/general.php
@@ -19,6 +19,8 @@ return [
     'print_assigned'    => 'Tulosta kaikki luovutetut',
     'email_assigned'    => 'Kaikkien määritettyjen sähköpostien luettelo',
     'user_notified'     => 'Käyttäjä on lähetetty sähköpostilla luettelo heidän tällä hetkellä määritetyistä kohteista.',
+    'users_notified'    => 'The user has been emailed a list of their currently assigned items.|:count users have been emailed a list of their currently assigned items.',
+    'users_notified_warning' => ':count user has been emailed a list of their currently assigned items, however :no_email users did not have an email address so could not be emailed.|:count users have been emailed a list of their currently assigned items, however :no_email user(s) did not have an email address so could not be emailed.',
     'auto_assign_label' => 'Sisällytä tämä käyttäjä automaattisesti määritettäessä hyväksyttäviä lisenssejä',
     'auto_assign_help'  => 'Ohita tämä käyttäjä automaattiseen lisenssien osoittamiseen',
     'software_user'     => 'Käyttäjälle :name luovutetut ohjelmistot',
diff --git a/resources/lang/fi-FI/admin/users/message.php b/resources/lang/fi-FI/admin/users/message.php
index 2f2001e545..e31c0f90f9 100644
--- a/resources/lang/fi-FI/admin/users/message.php
+++ b/resources/lang/fi-FI/admin/users/message.php
@@ -6,7 +6,7 @@ return array(
     'declined'                  => 'Olet onnistuneesti hylännyt tämän laitteen.',
     'bulk_manager_warn'	        => 'Käyttäjät on onnistuneesti päivitetty, mutta esimies-merkintää ei tallennettu, koska valitsemasi esimies oli mukana käyttäjäluettelossa, eikä käyttäjä voi olla itsensä esimies. Valitse käyttäjät uudelleen, poislukien esimies.',
     'user_exists'               => 'Käyttäjä on jo luotu!',
-    'user_not_found'            => 'Käyttäjää ei löydy.',
+    'user_not_found'            => 'User does not exist or you do not have permission view them.',
     'user_login_required'       => 'Käyttäjätunnus vaaditaan',
     'user_has_no_assets_assigned' => 'Käyttäjälle ei tällä hetkellä ole määritetty omaisuutta.',
     'user_password_required'    => 'Salasana vaaditaan.',
@@ -53,6 +53,7 @@ return array(
         'ldap_could_not_search' => 'Haku LDAP-palvelimelta ei onnistunut ei voitu hakea. Tarkista LDAP-palvelimen määritys. <br>LDAP-palvelimen virhe:',
         'ldap_could_not_get_entries' => 'LDAP-palvelimelta ei palautunut kohteita. Tarkista LDAP-palvelimen määritys. <br>LDAP-palvelimen virhe:',
         'password_ldap' => 'Tätä salasanaa hallinnoi LDAP / Active Directory. Vaihda salasanasi IT-osastolla.',
+        'multi_company_items_assigned' => 'This user has items assigned that belong to a different company. Please check them in or edit their company.'
     ),
 
     'deletefile' => array(
diff --git a/resources/lang/fi-FI/admin/users/table.php b/resources/lang/fi-FI/admin/users/table.php
index 042d22474b..1299433c1e 100644
--- a/resources/lang/fi-FI/admin/users/table.php
+++ b/resources/lang/fi-FI/admin/users/table.php
@@ -22,7 +22,7 @@ return array(
     'managed_locations'     => 'Esimiehenä sijainneissa',
     'managed_users'         => 'Hallinnoidut Käyttäjät',
     'name' 					=> 'Nimi',
-    'nogroup'               => 'Yhtään ryhmää ei ole vielä luotu. Lisätäksesi yhden, käy: ',
+    'nogroup'               => 'Yhtään ryhmää ei ole vielä luotu. Lisätäksesi yhden, käy:',
     'notes'                 => 'Muistiinpanot',
     'password_confirm' 		=> 'Vahvista salasana',
     'password' 				=> 'Salasana',
diff --git a/resources/lang/fi-FI/auth.php b/resources/lang/fi-FI/auth.php
index 29a6a1a6bb..0d25d1bef0 100644
--- a/resources/lang/fi-FI/auth.php
+++ b/resources/lang/fi-FI/auth.php
@@ -15,6 +15,6 @@ return array(
 
     'failed' => 'Nämä tiedot eivät vastaa tietueitamme.',
     'password' => 'Annettu salasana on virheellinen.',
-    'throttle' => 'Liian monta kirjautumisyritystä. Yritä uudelleen :seconds sekunnin kuluttua.',
+    'throttle' => 'Too many login attempts. Please try again in :minutes minute(s).',
 
 );
diff --git a/resources/lang/fi-FI/auth/message.php b/resources/lang/fi-FI/auth/message.php
index 4bd525c387..2a7569d899 100644
--- a/resources/lang/fi-FI/auth/message.php
+++ b/resources/lang/fi-FI/auth/message.php
@@ -6,8 +6,6 @@ return array(
     'account_not_found'      => 'Käyttäjänimi tai salasana on virheellinen.',
     'account_not_activated'  => 'Käyttäjätiliä ei ole aktivoitu.',
     'account_suspended'      => 'Käyttäjätili on jäädytetty.',
-    'account_banned'         => 'Käyttäjätili on estetty.',
-    'throttle'               => 'Liian monta kirjautumisyritystä. Yritä uudelleen :minutes minuutin kuluttua.',
 
     'two_factor' => array(
         'already_enrolled'      => 'Laitteesi on jo käytössä.',
diff --git a/resources/lang/fi-FI/button.php b/resources/lang/fi-FI/button.php
index 1d7ed82c05..84c6037d4e 100644
--- a/resources/lang/fi-FI/button.php
+++ b/resources/lang/fi-FI/button.php
@@ -7,6 +7,7 @@ return [
     'checkin_and_delete'  	    => 'Palauta Kaikki / Poista Käyttäjä',
     'delete'  	                => 'Poista',
     'edit'    	                => 'Muokkaa',
+    'clone'    	                => 'Clone',
     'restore' 	                => 'Palauta',
     'remove'                    => 'Poista',
     'request'                   => 'Pyydä',
@@ -21,4 +22,13 @@ return [
     'add_maintenance'           => 'Lisää Huolto',
     'append'                    => 'Lisää',
     'new'                       => 'Uusi',
+    'var' => [
+        'clone'     => 'Clone :item_type',
+        'edit'      => 'Edit :item_type',
+        'delete'    => 'Delete :item_type',
+        'restore'   => 'Restore :item_type',
+        'create'    => 'Create New :item_type',
+        'checkout'  => 'Checkout :item_type',
+        'checkin'   => 'Checkin :item_type',
+    ]
 ];
diff --git a/resources/lang/fi-FI/general.php b/resources/lang/fi-FI/general.php
index 8cf889ed15..ec237a65d6 100644
--- a/resources/lang/fi-FI/general.php
+++ b/resources/lang/fi-FI/general.php
@@ -10,7 +10,7 @@ return [
     'action'                => 'Toiminto',
     'activity_report'		=> 'Toimintaraportti',
     'address'				=> 'Osoite',
-    'admin'					=> 'Ylläpitäjä',
+    'admin'					=> 'Ylläpitäjän Asetukset',
     'admin_tooltip'			=> 'This user has admin privileges',
     'superuser'				=> 'Superuser',
     'superuser_tooltip'		=> 'This user has superuser privileges',
@@ -23,13 +23,16 @@ return [
     'asset_models'			=> 'Laitemallit',
     'asset_model'			=> 'Malli',
     'asset'					=> 'Laite',
+    'asset_previous'        => 'Asset (Previously Assigned)',
     'asset_report'          => 'Laiteraportti',
     'asset_tag'				=> 'Laitetunniste',
     'asset_tags'            => 'Laitetunnisteet',
     'assets_available'		=> 'Laitetta vapaana',
     'accept_assets'         => 'Hyväksy Laitteet :name',
     'accept_assets_menu'    => 'Hyväksy Laitteet',
+    'accept_item'           => 'Accept Item',
     'audit'				    => 'Tarkasta',
+    'audits'				=> 'Audits',
     'audit_report'			=> 'Tarkastusloki',
     'assets'				=> 'Laitteet',
     'assets_audited'        => 'tarkastettu omaisuus',
@@ -61,9 +64,12 @@ return [
     'changepassword'  		=> 'Vaihda salasana',
     'checkin'  				=> 'Palauta',
     'checkin_from'  		=> 'Palautus',
+    'checkin_note'  		=> 'Checkin Note',
+    'checkout_note'  		=> 'Checkout Note',
     'checkout'  			=> 'Luovuta',
     'checkouts_count'       => 'Luovutukset',
     'checkins_count'        => 'Palautukset',
+    'checkin_and_delete'  	=> 'Checkin and Delete',
     'user_requests_count'   => 'Pyynnöt',
     'city'  				=> 'Kaupunki',
     'click_here'			=> 'Klikkaa tästä',
@@ -77,7 +83,7 @@ return [
     'consumables'			=> 'Kulutustarvikkeet',
     'country'  				=> 'Maa',
     'could_not_restore'     => 'Virhe palautettaessa :item_type: :error',
-    'not_deleted'           => 'Tyyppiä :item_type ei poisteta, joten sitä ei voi palauttaa',
+    'not_deleted'           => 'The :item_type was not deleted and therefore cannot be restored',
     'create'				=> 'Luo uusi',
     'created'               => 'Nimike luotiin',
     'created_asset'			=> 'laite luotu',
@@ -86,11 +92,13 @@ return [
     'record_created' 		=> 'Tietue luotu',
     'updated_at' 			=> 'Päivitetty klo',
     'currency'  			=> '€', // this is deprecated
+    'currency_text'  		=> 'Valuutta', //
     'current'  				=> 'Nykyiset',
     'current_password'      => 'Nykyinen Salasana',
     'customize_report'      => 'Mukautettu raportti',
     'custom_report'         => 'Mukautettu laiteraportti',
     'dashboard'				=> 'Hallintasivu',
+    'data_source'           => 'Data Source',
     'days'      			=> 'päivää',
     'days_to_next_audit'    => 'Päivää seuraavaan tarkastukseen',
     'date'					=> 'Päivä',
@@ -98,7 +106,7 @@ return [
     'debug_warning_text'    => 'Sovellus on käynnissä tuotantotilassa, jossa virheenkorjaus on käytössä. Tämä voi paljastaa arkaluonteisia tietoja, jos sovellus avoinna internettiin. Poista virheenkorjaus käytöstä asettamalla <code>APP_DEBUG</code> -arvoksi <code>false</code> <code>.env</code> -tiedostoosi.',
     'delete'  				=> 'Poista',
     'delete_confirm'  		=> 'Oletko varma että haluat poistaa :item?',
-    'delete_confirm_no_undo' => 'Oletko varma, että haluat poistaa :item? Toimintoa ei voi perua.',
+    'delete_confirm_no_undo' => 'Are you sure, you wish to delete :item? This cannot be undone.',
     'deleted'  				=> 'Poistettu',
     'delete_seats'  		=> 'Poistettu käytöstä',
     'deletion_failed'       => 'Poisto epäonnistui',
@@ -114,29 +122,13 @@ return [
     'editprofile'  			=> 'Muokkaa profiilia',
     'eol'					=> 'Elinikä',
     'email_domain'			=> 'Sähköpostin verkkotunnus',
-    'email_format'			=> 'Sähköpostiosoitteen muotoilu',
     'employee_number'       => 'Työntekijän Numero',
     'email_domain_help'		=> 'Käytetään sähköpostiosoitteiden luontiin tietoja tuotaessa',
     'error'				    => 'Virhe',
     'exclude_archived'      => 'Älä sisällytä arkistoituja laitteita',
     'exclude_deleted'       => 'Älä sisällytä poistettuja laitteita',
     'example'				=> 'Esimerkki: ',
-    'filastname_format'			=> 'Ensimmäinen nimikirjain sukunimi (pvirtanen@example.com)',
-    'firstname_lastname_format'	=> 'Etunimi . Sukunimi (jane.smith@example.com)',
-    'firstname_lastname_underscore_format' => 'Etunimi Sukunimi (paivi_virtanen@example.com)',
-    'lastnamefirstinitial_format' =>  'Sukunimi Etunimen ensimmäinen (smithj@example.com)',
-    'firstintial_dot_lastname_format' => 'Ensimmäinen nimikirjain . sukunimi (p.virtanen@example.com)',
-    'firstname_lastname_display'	=> 'Etunimi Sukunimi (Jane Smith)',
-    'lastname_firstname_display'	=> 'Sukunimi Etunimi (Smith Jane)',
-    'name_display_format'	=> 'Nimen Näytön Muoto',
-    'first'					=> 'Ensimmäinen',
-    'firstnamelastname'     => 'Etunimi . sukunimi (pekka.virtanen@example.com)',
-    'lastname_firstinitial' => 'Sukunimi _ etunimen ensimmäinen kirjain (virtanen_p@example.com)',
-    'firstinitial.lastname' => 'Etunimen ensimmäinen kirjain . sukunimi (p.virtanen@example.com)',
-    'firstnamelastinitial'  => 'Etunimi Sukunimen ensimmäinen kirjain (paiviv@example.com)',
-    'lastnamefirstname'      => 'Last Name First Name (smith.jane@example.com)',
-    'first_name'			=> 'Etunimi',
-    'first_name_format'		=> 'Etunimi (jane@example.com)',
+
     'files'                 => 'Tiedostot',
     'file_name'				=> 'Tiedosto',
     'file_type'             => 'Tiedostotyyppi',
@@ -156,9 +148,9 @@ return [
     'image_delete'         	=> 'Poista kuva',
     'include_deleted'       => 'Sisällytä poistetut laitteet',
     'image_upload'         	=> 'Lähetä kuva',
-    'filetypes_accepted_help'    => 'Hyväksytty tiedostotyyppi on :types. Suurin sallittu tiedostokoko on :size. Hyväksytyt tiedostotyypit ovat :types. Suurin sallittu tiedostokoko on :size.',
-    'filetypes_size_help'   => 'Suurin sallittu tiedostokoko on :size.',
-    'image_filetypes_help'  => 'Accepted filetypes are jpg, webp, png, gif, svg, and avif. Max upload size allowed is :size.',
+    'filetypes_accepted_help'    => 'Accepted filetype is :types. The maximum size allowed is :size.|Accepted filetypes are :types. The maximum upload size allowed is :size.',
+    'filetypes_size_help'   => 'The maximum upload size allowed is :size.',
+    'image_filetypes_help'  => 'Accepted Filetypes are jpg, webp, png, gif, svg, and avif. The maximum upload size allowed is :size.',
     'unaccepted_image_type'  => 'Kuvatiedostoa ei voitu lukea. Hyväksytyt tiedostotyypit ovat jpg, webp, png, gif ja svg. Tämän tiedoston mimetype on: :mimetype.',
     'import'         	    => 'Tuo tiedot',
     'import_this_file'      => 'Kartta kentät ja käsitellä tätä tiedostoa',
@@ -178,12 +170,17 @@ return [
     'last'					=> 'Viimeinen',
     'last_login'            => 'Viimeisin kirjautuminen',
     'last_name'             => 'Sukunimi',
+    'firstname_lastname_display'	=> 'Etunimi Sukunimi (Jane Smith)',
+    'lastname_firstname_display'	=> 'Sukunimi Etunimi (Smith Jane)',
+    'name_display_format'	=> 'Nimen Näytön Muoto',
+    'first'					=> 'Ensimmäinen',
+    'first_name'			=> 'Etunimi',
     'license'				=> 'Lisenssi',
     'license_report'        => 'Lisenssiraportti',
     'licenses_available'	=> 'Lisenssit saatavilla',
     'licenses'				=> 'Lisenssit',
     'list_all'				=> 'Listaa kaikki',
-    'loading'				=> 'Ladataan... ole hyvä ja odota....',
+    'loading'				=> 'Ladataan... ole hyvä ja odota...',
     'lock_passwords'        => 'Tätä kentän arvoa ei tallenneta demo-asennuksessa.',
     'feature_disabled'      => 'Tämä ominaisuus on poistettu käytöstä demo-asennusta varten.',
     'location'              => 'Sijainti',
@@ -193,7 +190,7 @@ return [
     'logout'				=> 'Kirjaudu Ulos',
     'lookup_by_tag'     => 'Hae laitetunnisteella',
     'maintenances'          => 'Huollot',
-    'manage_api_keys'       => 'Hallitse API-avaimia',
+    'manage_api_keys'       => 'Manage API keys',
     'manufacturer'			=> 'Valmistaja',
     'manufacturers'			=> 'Valmistajat',
     'markdown'				=> 'Tässä kentässä voi käyttää <a href="https://help.github.com/articles/github-flavored-markdown/">Github-merkintöjä</a>.',
@@ -215,6 +212,14 @@ return [
     'no_results'			=> 'Ei tuloksia.',
     'no'  					=> 'Ei',
     'notes'  				=> 'Muistiinpanot',
+    'note_added'            => 'Note Added',
+    'options'				=> 'Options',
+    'preview'				=> 'Preview',
+    'add_note'              => 'Add Note',
+    'note_edited'            => 'Note Edited',
+    'edit_note'              => 'Edit Note',
+    'note_deleted'            => 'Note Deleted',
+    'delete_note'              => 'Delete Note',
     'order_number'          => 'Tilausnumero',
     'only_deleted'          => 'Vain poistetut laitteet',
     'page_menu'				=> 'Näytetään _MENU_ kohteita',
@@ -229,7 +234,7 @@ return [
     'purchase_date'         => 'Ostopäivä',
     'qty'		            => 'KPL',
     'quantity'		        => 'Määrä',
-    'quantity_minimum'      => 'Sinulla on :count kohteita pienimmän määrän alapuolella tai lähes alapuolella',
+    'quantity_minimum'      => 'You have one item below or almost below minimum quantity levels|You have :count items below or almost below minimum quantity levels',
     'quickscan_checkin'  	=> 'Nopea Palautus Skannaamalla',
     'quickscan_checkin_status'  	=> 'Palautuksen Tila',
     'ready_to_deploy'		=> 'Valmis käyttöönottoon',
@@ -254,7 +259,7 @@ return [
     'select_all'            => 'Valitse kaikki',
     'search'				=> 'Etsi',
     'select_category'       => 'Valitse kategoria',
-    'select_datasource' => 'Valitse tietotausta',
+    'select_datasource' => 'Select a data source',
     'select_department'     => 'Valitse osasto',
     'select_depreciation'	=> 'Valitse poistoluokka',
     'select_location'		=> 'Valitse sijainti',
@@ -274,13 +279,15 @@ return [
     'signed_off_by'         => 'Luovuttanut',
     'skin'       			=> 'Ulkoasu',
     'webhook_msg_note'        => 'Ilmoitus lähetetään webhookin kautta',
-    'webhook_test_msg'        => 'Jestas! Näyttää siltä, että :app integraatio Snipe-ITn kanssa toimii!',
+    'webhook_test_msg'        => 'Oh hai! It looks like your :app integration with Snipe-IT is working!',
     'some_features_disabled' => 'DEMO-TILA: Jotkin ominaisuudet eivät ole käytössä tässä asennuksessa.',
     'site_name'				=> 'Sivuston nimi',
     'state'  				=> 'Maakunta',
     'status_labels'			=> 'Tilamerkinnät',
+    'status_label'			=> 'Status Label',
     'status'    			=> 'Tila',
     'accept_eula'           => 'Käyttöoikeussopimus',
+    'show_or_hide_eulas' => 'Show/Hide EULAs',
     'supplier'              => 'Toimittaja',
     'suppliers'  			=> 'Toimittajat',
     'sure_to_delete'        => 'Haluatko varmasti poistaa',
@@ -296,9 +303,9 @@ return [
     'type'  				=> 'Tyyppi',
     'undeployable'			=> 'Ei käyttöönotettavissa',
     'unknown_admin'			=> 'Tuntematon ylläpitäjä',
-    'username_format'		=> 'Käyttäjätunnuksen muoto',
     'username'              => 'Käyttäjätunnus',
     'update'                => 'Päivitä',
+    'updating_item' => 'Updating :item',
     'upload_filetypes_help'      => 'Sallitut tiedostotyypit ovat png, gif, jpg, jpeg, doc, docx, pdf, xls, xlsx, txt, lic, xml, zip, rtf ja rar. Suurin sallittu lähetyskoko on :size.',
     'uploaded'              => 'Lähetetty',
     'user'					=> 'Käyttäjä',
@@ -323,10 +330,10 @@ return [
     'token_expired'         => 'Istuntosi on vanhentunut. Ole hyvä ja kirjaudu uudelleen.',
     'login_enabled'         => 'Kirjautuminen käytössä',
     'audit_due'             => 'Tarkastettava',
-    'audit_due_days'        => 'Varat Tilintarkastuksesta erääntyvät :days Päivän n n aikana Varat Erääntyvät tilintarkastuksesta :days Päivää',
+    'audit_due_days'        => '{}Assets Due or Overdue for Audit|[1]Assets Due or Overdue for Audit Within a Day|[2,*]Assets Due or Overdue for Audit Within :days Days',
     'checkin_due'           => 'Tarkistuksen eräpäivä',
     'checkin_overdue'       => 'Erääntynyt kassalle',
-    'checkin_due_days'      => 'Checkinin omaisuus :days Päivän n kuluessa|Checkinin omaisuus :days Päivän kuluessa',
+    'checkin_due_days'      => '{}Due for Checkin|[1]Assets Due for Checkin Within :days Day|[2,*]Assets Due for Checkin Within :days Days',
     'audit_overdue'         => 'Erääntynyt tarkastettava',
     'accept'                => 'Hyväksy :asset',
     'i_accept'              => 'Hyväksyn',
@@ -339,16 +346,16 @@ return [
     'view_all'              => 'näytä kaikki',
     'hide_deleted'          => 'Piilota Poistetut',
     'email'                 => 'Sähköposti',
-    'do_not_change'         => 'Älä Muuta',
-    'bug_report'            => 'Ilmoita bugista',
+    'do_not_change'         => 'Do not change',
+    'bug_report'            => 'Report a bug',
     'user_manual'           => 'Käyttöohje',
     'setup_step_1'          => 'Vaihe 1',
     'setup_step_2'          => 'Vaihe 2',
     'setup_step_3'          => 'Vaihe 3',
     'setup_step_4'          => 'Vaihe 4',
     'setup_config_check'    => 'Konfiguraation Tarkistus',
-    'setup_create_database' => 'Luo Tietokantatauluja',
-    'setup_create_admin'    => 'Luo Ylläpitäjä',
+    'setup_create_database' => 'Create database tables',
+    'setup_create_admin'    => 'Create an admin user',
     'setup_done'            => 'Valmis!',
     'bulk_edit_about_to'    => 'Olet muokkaamassa seuraavaa: ',
     'checked_out'           => 'Luovutettu',
@@ -383,6 +390,8 @@ return [
     'new_license'           => 'Uusi Lisenssi',
     'new_accessory'         => 'Uusi Oheistarvike',
     'new_consumable'        => 'Uusi kulutustarvike',
+    'new_component'         => 'New Component',
+    'new_user'              => 'New User',
     'collapse'              => 'Kutista',
     'assigned'              => 'Määritetty',
     'asset_count'           => 'Laite määrä',
@@ -418,19 +427,20 @@ return [
     'bulk_soft_delete'      =>'Piilota myös nämä käyttäjät. Heidän laitehistoria säilyy ennallaan ellet/kunnes puhdistat poistetut tietueet Admin Asetuksista.',
     'bulk_checkin_delete_success' => 'Valitut käyttäjät on poistettu ja heidän kohteet on palautettu.',
     'bulk_checkin_success' => 'Valittujen käyttäjien laitteet on palautettu.',
-    'set_to_null'           => 'Poista tämän laitteen arvot|Poista arvot kaikille :asset_count laitteille ',
+    'set_to_null'           => 'Delete values for this selection|Delete values for all :selection_count selections ',
     'set_users_field_to_null'  => 'Poista tämän käyttäjän :field -arvot|Poista :field -arvot kaikilta : user_count käyttäjältä ',
     'na_no_purchase_date'   => 'N/A - ostopäivää ei annettu',
     'assets_by_status'      => 'Laitteet tilan mukaan',
     'assets_by_status_type'      => 'Laitteet tilan tyypin mukaan',
     'pie_chart_type'        => 'Hallintapaneelin Ympyrädiagrammin tyyppi',
     'hello_name'            => 'Hei, :name!',
-    'unaccepted_profile_warning'   => 'Sinulla on :count kohteita, jotka vaativat hyväksyntää. Klikkaa tästä hyväksyäksesi tai hylätäksesi ne',
+    'unaccepted_profile_warning'   => 'You have one item requiring acceptance. Click here to accept or decline it | You have :count items requiring acceptance. Click here to accept or decline them',
     'start_date'            => 'Aloituspäivä',
     'end_date'            => 'Päättymispäivä',
     'alt_uploaded_image_thumbnail' => 'Ladattu pikkukuva',
     'placeholder_kit'       => 'Valitse sarja',
     'file_not_found'        => 'Tiedostoa ei löytynyt',
+    'log_record_not_found'  => 'No record for that log entry was found.',
     'preview_not_available' => '(ei esikatselua)',
     'setup'                 => 'Alkutoimet',
     'pre_flight'            => 'Ennen käynnistämistä',
@@ -512,7 +522,7 @@ return [
     'checked_out_to_fields' => 'Checked Out To Fields',
     'percent_complete' => '% valmis',
     'uploading' => 'Lähetetään... ',
-    'upload_error' => 'Virhe tiedostoa lähetettäessä. Tarkista, että tyhjiä rivejä ei ole ja että sarakkeiden nimiä ei ole kopioitu.',
+    'upload_error' => 'Error uploading file. Please check that you have no empty rows or duplicated column names in your CSV, and that the server permissions allow uploads.',
     'copy_to_clipboard' => 'Kopioi leikepöydälle',
     'copied' => 'Kopioitu!',
     'status_compatibility' => 'Jos varat on jo määritetty, niitä ei voi muuttaa käyttökelvottomaksi tilatyypiksi, ja tämä arvon muutos ohitetaan.',
@@ -549,6 +559,71 @@ return [
         'license_seats'  => ':count Lisenssipaikka:count Lisenssi Istuimet',
         'consumables'  => ':count Kulutustavara :count Kulutustavarat',
         'components'  => ':count Komponentti :count Komponentit',
-    ]
+    ],
+
+    'more_info' => 'Lisätiedot',
+    'quickscan_bulk_help' => 'Checking this box will edit the asset record to reflect this new location. Leaving it unchecked will simply note the location in the audit log. Note that if this asset is checked out, it will not change the location of the person, asset or location it is checked out to.',
+    'whoops' => 'Whoops!',
+    'something_went_wrong' => 'Something went wrong with your request.',
+    'close' => 'Close',
+    'expires' => 'vanhenee',
+    'map_fields'=> 'Map :item_type Fields',
+    'remaining_var' => ':count Remaining',
+    'label' => 'Label',
+    'import_asset_tag_exists' => 'An asset with the asset tag :asset_tag already exists and an update was not requested. No change was made.',
+    'countries_manually_entered_help' => 'Values with an asterisk (*) were manually entered and do not match existing ISO 3166 dropdown values',
+    'accessories_assigned' => 'Assigned Accessories',
+    'user_managed_passwords' => 'Password Management',
+    'user_managed_passwords_disallow' => 'Disallow users from managing their own passwords',
+    'user_managed_passwords_allow' => 'Allow users to manage their own passwords',
+    'from' => 'From',
+    'by' => 'Suorittaja',
+
+// Add form placeholders here
+    'placeholders' => [
+        'notes'  => 'Add a note',
+    ],
+
+    'breadcrumb_button_actions' => [
+        'edit_item' => 'Edit :name',
+        'checkout_item' => 'Checkout :name',
+        'checkin_item' => 'Checkin :name',
+    ],
+
+    'skins' => [
+        'site_default' => 'Site Default',
+        'default_blue' => 'Default Blue',
+        'blue_dark' => 'Blue (Dark Mode)',
+        'green' => 'Green Dark',
+        'green_dark' => 'Green (Dark Mode)',
+        'red' => 'Red Dark',
+        'red_dark' => 'Red (Dark Mode)',
+        'orange' => 'Orange Dark',
+        'orange_dark' => 'Orange (Dark Mode)',
+        'black' => 'Black',
+        'black_dark' => 'Black (Dark Mode)',
+        'purple' => 'Purple',
+        'purple_dark' => 'Purple (Dark Mode)',
+        'yellow' => 'Yellow',
+        'yellow_dark' => 'Yellow (Dark Mode)',
+        'high_contrast' => 'High Contrast',
+
+    ],
+
+    'select_all_none' => 'Select/Unselect All',
+    'generic_model_not_found' => 'That :model was not found or you do not have permission to access it',
+    'deleted_models' => 'Deleted Asset Models',
+    'deleted_users' => 'Deleted Users',
+    'cost_each' => ':amount each',
+    'remove_current_image' => 'Remove current :type image',
+
+    'seeding' => [
+        'manufacturers' => [
+            'button' => 'Create Manufacturers',
+            'prompt' => 'You do not have any manufacturers yet. Would you like to seed a list of common manufacturers? (THIS WILL OVERWRITE EXISTING MANUFACTURERS, including those that have been soft-deleted.)',
+            'success' => 'Manufacturers seeded successfully',
+            'error' => 'Could not seed manufacturers. A manufacturer record already exists and seeding would overwrite it.|Could not seed manufacturers. :count manufacturer records already exist and seeding would overwrite them.',
+        ],
+    ],
 
 ];
diff --git a/resources/lang/fi-FI/localizations.php b/resources/lang/fi-FI/localizations.php
index 0e79f02ef1..36cf826153 100644
--- a/resources/lang/fi-FI/localizations.php
+++ b/resources/lang/fi-FI/localizations.php
@@ -2,7 +2,7 @@
 
 return [
 
-    'select_language' => 'Valitse kieli',
+    'select_language' => 'Select a Language',
     'languages' => [
         'en-US'=> 'Englanti, Yhdysvallat',
         'en-GB'=> 'Englanti, UK',
@@ -40,7 +40,9 @@ return [
         'ms-MY'=> 'Malaiji',
         'mi-NZ'=> 'Maori',
         'mn-MN'=> 'Mongolia',
-        'no-NO'=> 'Norja',
+        'nb-NO'=> 'Norwegian Bokmål',
+        'om-ET' => 'Oromo (Ethiopian)',
+        //'nn-NO'=> 'Norwegian Nynorsk',
         'fa-IR'=> 'Persia',
         'pl-PL'=> 'Puola',
         'pt-PT'=> 'Portugali',
@@ -66,7 +68,7 @@ return [
         'zu-ZA'=> 'Zulu',
     ],
 
-    'select_country' => 'Valitse maa',
+    'select_country' => 'Select a Country',
     
     'countries' => [
         'AC'=>'Ascension saari',
@@ -133,6 +135,7 @@ return [
         'EC'=>'Ecuador',
         'EE'=>'Eesti',
         'EG'=>'Egypti',
+        'GB-ENG'=>'England',
         'ER'=>'Eritrea',
         'ES'=>'Espanja',
         'ET'=>'Etiopia',
@@ -231,6 +234,7 @@ return [
         'NG'=>'Nigeria',
         'NI'=>'Nicaragua',
         'NL'=>'Alankomaat',
+        'GB-NIR' => 'Northern Ireland',
         'NO'=>'Norja',
         'NP'=>'Nepal',
         'NR'=>'Nauru',
@@ -258,7 +262,7 @@ return [
         'RU'=>'Venäjä',
         'RW'=>'Ruanda',
         'SA'=>'Saudi-Arabia',
-        'UK'=>'Skotlanti',
+        'GB-SCT'=>'Skotlanti',
         'SB'=>'Salomonsaaret',
         'SC'=>'Seychellit',
         'SS'=>'Etelä-Sudan',
@@ -310,6 +314,7 @@ return [
         'VI'=>'Yhdysvaltain Neitsytsaaret',
         'VN'=>'Vietnam',
         'VU'=>'Vanuatu',
+        'GB-WLS' =>'Wales',
         'WF'=>'Wallis-ja Futunasaaret',
         'WS'=>'Samoa',
         'YE'=>'Jemen',
diff --git a/resources/lang/fi-FI/mail.php b/resources/lang/fi-FI/mail.php
index aedad673f1..589a317062 100644
--- a/resources/lang/fi-FI/mail.php
+++ b/resources/lang/fi-FI/mail.php
@@ -23,24 +23,25 @@ return [
     'Item_Requested' => 'Pyydetty nimike',
     'License_Checkin_Notification' => 'Lisenssi palautettu',
     'License_Checkout_Notification' => 'Lisenssi tarkistettu',
+    'license_for'   => 'License for',
     'Low_Inventory_Report' => 'Alhainen määrä raportti',
     'a_user_canceled' => 'Käyttäjä on peruuttanut nimikkeen pyynnön sivustolla',
     'a_user_requested' => 'Käyttäjä on pyytänyt nimikettä sivustolla',
     'acceptance_asset_accepted' => 'Käyttäjä on hyväksynyt kohteen',
     'acceptance_asset_declined' => 'Käyttäjä on hylännyt kohteen',
-    'accessory_name' => 'Oheistarvikkeen nimi:',
-    'additional_notes' => 'Muistiinpanot:',
+    'accessory_name' => 'Oheistarvikkeen nimi',
+    'additional_notes' => 'Muistiinpanot',
     'admin_has_created' => 'Järjestelmänvalvoja on luonut tilin sinulle :web verkkosivustolle.',
-    'asset' => 'Laite:',
-    'asset_name' => 'Laitteen nimi:',
+    'asset' => 'Laite',
+    'asset_name' => 'Laitteen nimi',
     'asset_requested' => 'Pyydetty laite',
     'asset_tag' => 'Laitetunniste',
     'assets_warrantee_alert' => 'There is :count asset with a guarantee expiring in the next :threshold days .- There are :count assets with warranties expiring in the next :threshold days.',
     'assigned_to' => 'Osoitettu',
     'best_regards' => 'Parhain terveisin,',
-    'canceled' => 'Peruutettu:',
-    'checkin_date' => 'Palautuspäivä:',
-    'checkout_date' => 'Luovutuspäivä:',
+    'canceled' => 'Peruutettu',
+    'checkin_date' => 'Palautuspäivä',
+    'checkout_date' => 'Luovutuspäivä',
     'checkedout_from' => 'Luovutettu lähteestä',
     'checkedin_from'  => 'Tarkistettu alkaen',
     'checked_into' => 'Tarkastettu sisään',
@@ -49,27 +50,30 @@ return [
     'click_to_confirm' => 'Vahvista tilisi klikkaamalla seuraavaa linkkiä :web:',
     'current_QTY' => 'Nykyinen määrä',
     'days' => 'Päiviä',
-    'expecting_checkin_date' => 'Odotettu palautuspäivä:',
+    'expecting_checkin_date' => 'Odotettu palautuspäivä',
     'expires' => 'Vanhenee',
     'hello' => 'Hei',
     'hi' => 'Moi',
     'i_have_read' => 'Olen lukenut ja hyväksynyt käyttöehdot ja olen saanut tämän kohteen.',
     'inventory_report' => 'Varaston Raportti',
-    'item' => 'Nimike:',
+    'item' => 'Nimike',
+    'item_checked_reminder' => 'This is a reminder that you currently have :count items checked out to you that you have not accepted or declined. Please click the link below to confirm your decision.',
     'license_expiring_alert' => ':count lisenssiä vanhenee :threshold päivän sisällä.|:count lisenssiä vanhenee :threshold päivän sisällä.',
     'link_to_update_password' => 'Napsauta seuraavaa linkkiä päivittääksesi :web salasanasi:',
-    'login' => 'Kirjaudu sisään:',
+    'login' => 'Kirjaudu',
     'login_first_admin' => 'Kirjaudu sisään uuteen Snipe-IT asennukseen käyttäen alla olevia tunnistetietoja:',
     'low_inventory_alert' => ':count nimikkeen saldomäärä on alle minimirajan tai kohta alhainen.|:count nimikkeen saldomäärä on alle minimirajan tai kohta alhainen.',
     'min_QTY' => 'Minimi määrä',
     'name' => 'Nimi',
     'new_item_checked' => 'Uusi nimike on luovutettu sinulle, yksityiskohdat ovat alla.',
+    'new_item_checked_with_acceptance' => 'A new item has been checked out under your name that requires acceptance, details are below.',
+    'recent_item_checked' => 'An item was recently checked out under your name that requires acceptance, details are below.',
     'notes' => 'Muistiinpanot',
-    'password' => 'Salasana:',
+    'password' => 'Salasana',
     'password_reset' => 'Salasanan nollaus',
     'read_the_terms' => 'Lue alla olevat käyttöehdot.',
     'read_the_terms_and_click' => 'Ole hyvä ja lue alla olevat käyttöehdot. ja klikkaa alareunassa olevaa linkkiä vahvistaaksesi, että olet lukenut ja hyväksynyt käyttöehdot, ja olet vastaanottanut käyttöomaisuuden.',
-    'requested' => 'Pyydetty:',
+    'requested' => 'Pyydetty',
     'reset_link' => 'Salasanasi resetointi-linkki',
     'reset_password' => 'Palauta salasanasi napsauttamalla tätä:',
     'rights_reserved' => 'Kaikki oikeudet pidätetään.',
@@ -86,8 +90,10 @@ return [
     'upcoming-audits' => 'Seuraavien :count laitteiden tarkistus on tulossa :threshold päivän aikana .|Seuraavien :count laitteiden tarkistus on tulossa :threshold päivän aikana.',
     'user' => 'Käyttäjä',
     'username' => 'Käyttäjätunnus',
+    'unaccepted_asset_reminder' => 'Reminder: You have Unaccepted Assets.',
     'welcome' => 'Tervetuloa :name',
     'welcome_to' => 'Tervetuloa :web!',
     'your_assets' => 'Omat laitteesi',
     'your_credentials' => 'Snipe-IT - kirjautumistietosi',
+    'mail_sent' => 'Mail sent successfully!',
 ];
diff --git a/resources/lang/fi-FI/validation.php b/resources/lang/fi-FI/validation.php
index 488a37c911..53a4962c2d 100644
--- a/resources/lang/fi-FI/validation.php
+++ b/resources/lang/fi-FI/validation.php
@@ -13,87 +13,150 @@ return [
     |
     */
 
-    'accepted'             => ':attribute tulee hyväksyä.',
-    'active_url'           => ':attribute ei ole oikea URL-osoite.',
-    'after'                => ':attribute tulee olla päivämäärä päivän :date jälkeen.',
-    'after_or_equal'       => ':attribute on oltava päivän jälkeen tai yhtä suuri kuin: date.',
-    'alpha'                => ':attribute saa sisältää ainoastaan kirjaimia.',
-    'alpha_dash'           => ':attribute voi sisältää vain kirjaimia, numeroita ja viivoja.',
-    'alpha_num'            => ':attribute voi sisältää ainoastaan kirjaimia ja numeroita.',
-    'array'                => ':attribute on oltava taulukko.',
-    'before'               => ':attribute tulee olla päivämäärä ennen päivää :date.',
-    'before_or_equal'      => ':attribute on oltava päivää ennen tai yhtä kuin :date.',
-    'between'              => [
-        'numeric' => ':attribute tulee olla välillä :min - :max.',
-        'file'    => ':attribute tulee olla välillä :min - :max kilotavua.',
-        'string'  => ':attribute tulee olla :min - :max merkkiä.',
-        'array'   => ':attribute on oltava :min ja :max välillä.',
+    'accepted' => 'The :attribute field must be accepted.',
+    'accepted_if' => 'The :attribute field must be accepted when :other is :value.',
+    'active_url' => 'The :attribute field must be a valid URL.',
+    'after' => 'The :attribute field must be a date after :date.',
+    'after_or_equal' => 'The :attribute field must be a date after or equal to :date.',
+    'alpha' => 'The :attribute field must only contain letters.',
+    'alpha_dash' => 'The :attribute field must only contain letters, numbers, dashes, and underscores.',
+    'alpha_num' => 'The :attribute field must only contain letters and numbers.',
+    'array' => 'The :attribute field must be an array.',
+    'ascii' => 'The :attribute field must only contain single-byte alphanumeric characters and symbols.',
+    'before' => 'The :attribute field must be a date before :date.',
+    'before_or_equal' => 'The :attribute field must be a date before or equal to :date.',
+    'between' => [
+        'array' => 'The :attribute field must have between :min and :max items.',
+        'file' => 'The :attribute field must be between :min and :max kilobytes.',
+        'numeric' => 'The :attribute field must be between :min and :max.',
+        'string' => 'The :attribute field must be between :min and :max characters.',
     ],
-    'boolean'              => ':attribute on oltava tosi tai epätosi.',
-    'confirmed'            => ':attribute vahvistus ei täsmää.',
-    'date'                 => ':attribute ei ole oikea päivämäärä.',
-    'date_format'          => ':attribute ei täsmää muotoiluun :format.',
-    'different'            => ':attribute ja :other tulee olla erilaisia.',
-    'digits'               => ':attribute tulee olla :digits numeroa pitkä.',
-    'digits_between'       => ':attribute tulee olla numero väliltä :min ja :max.',
-    'dimensions'           => ':attribute on virheelliset kuvamitat.',
-    'distinct'             => ':attribute kentässä on duplikaatti arvo.',
-    'email'                => ':attribute muotoilu on virheellinen.',
-    'exists'               => 'Valittu :attribute on virheellinen.',
-    'file'                 => ':attribute on oltava tiedosto.',
-    'filled'               => ':attribute kentässä on oltava arvo.',
-    'image'                => ':attribute tulee olla kuva.',
+    'boolean' => 'Attribuutti-kentän on oltava tosi tai epätosi.',
+    'can' => 'The :attribute field contains an unauthorized value.',
+    'confirmed' => 'The :attribute field confirmation does not match.',
+    'contains' => 'The :attribute field is missing a required value.',
+    'current_password' => 'The password is incorrect.',
+    'date' => 'The :attribute field must be a valid date.',
+    'date_equals' => 'The :attribute field must be a date equal to :date.',
+    'date_format' => 'The :attribute field must match the format :format.',
+    'decimal' => 'The :attribute field must have :decimal decimal places.',
+    'declined' => 'The :attribute field must be declined.',
+    'declined_if' => 'The :attribute field must be declined when :other is :value.',
+    'different' => 'The :attribute field and :other must be different.',
+    'digits' => 'The :attribute field must be :digits digits.',
+    'digits_between' => 'The :attribute field must be between :min and :max digits.',
+    'dimensions' => 'The :attribute field has invalid image dimensions.',
+    'distinct' => ':attribute kentässä on duplikaatti arvo.',
+    'doesnt_end_with' => 'The :attribute field must not end with one of the following: :values.',
+    'doesnt_start_with' => 'The :attribute field must not start with one of the following: :values.',
+    'email' => 'The :attribute field must be a valid email address.',
+    'ends_with' => 'The :attribute field must end with one of the following: :values.',
+    'enum' => 'Valittu :attribute on virheellinen.',
+    'exists' => 'Valittu :attribute on virheellinen.',
+    'extensions' => 'The :attribute field must have one of the following extensions: :values.',
+    'file' => 'The :attribute field must be a file.',
+    'filled' => ':attribute kentässä on oltava arvo.',
+    'gt' => [
+        'array' => 'The :attribute field must have more than :value items.',
+        'file' => 'The :attribute field must be greater than :value kilobytes.',
+        'numeric' => 'The :attribute field must be greater than :value.',
+        'string' => 'The :attribute field must be greater than :value characters.',
+    ],
+    'gte' => [
+        'array' => 'The :attribute field must have :value items or more.',
+        'file' => 'The :attribute field must be greater than or equal to :value kilobytes.',
+        'numeric' => 'The :attribute field must be greater than or equal to :value.',
+        'string' => 'The :attribute field must be greater than or equal to :value characters.',
+    ],
+    'hex_color' => 'The :attribute field must be a valid hexadecimal color.',
+    'image' => 'The :attribute field must be an image.',
     'import_field_empty'    => 'Arvo :fieldname ei voi olla nolla.',
-    'in'                   => 'Valittu :attribute on virheellinen.',
-    'in_array'             => ':attribute ei ole olemassa : other.',
-    'integer'              => ':attribute tulee olla kokonaisluku.',
-    'ip'                   => ':attribute tulee olla oikea IP-osoite.',
-    'ipv4'                 => ':attribute on oltava kelvollinen IPv4-osoite.',
-    'ipv6'                 => ':attribute on oltava kelvollinen IPv6-osoite.',
-    'is_unique_department' => 'Kentän :attribute tulee olla yksilöllinen tälle yrityksen sijainnille',
-    'json'                 => ':attribute on oltava kelvollinen JSON-merkkijono.',
-    'max'                  => [
-        'numeric' => ':attribute ei saa olla suurempi kuin :max.',
-        'file'    => ':attribute ei saa olla suurempi kuin :max kilotavua.',
-        'string'  => ':attribute ei saa olla suurempi kuin :max merkkiä.',
-        'array'   => ':attribute ei saa olla enempää kuin :max nimikettä.',
+    'in' => 'Valittu :attribute on virheellinen.',
+    'in_array' => 'The :attribute field must exist in :other.',
+    'integer' => 'The :attribute field must be an integer.',
+    'ip' => 'The :attribute field must be a valid IP address.',
+    'ipv4' => 'The :attribute field must be a valid IPv4 address.',
+    'ipv6' => 'The :attribute field must be a valid IPv6 address.',
+    'json' => 'The :attribute field must be a valid JSON string.',
+    'list' => 'The :attribute field must be a list.',
+    'lowercase' => 'The :attribute field must be lowercase.',
+    'lt' => [
+        'array' => 'The :attribute field must have less than :value items.',
+        'file' => 'The :attribute field must be less than :value kilobytes.',
+        'numeric' => 'The :attribute field must be less than :value.',
+        'string' => 'The :attribute field must be less than :value characters.',
     ],
-    'mimes'                => ':attribute tulee olla tiedosto jonka tyyppi on: :values.',
-    'mimetypes'            => ':attribute on oltava tyyppiä tyyppi: :values.',
-    'min'                  => [
-        'numeric' => ':attribute tulee olla vähintään :min.',
-        'file'    => ':attribute tulee olla vähintään :min kilotavua.',
-        'string'  => ':attribute tulee olla vähintään :min merkkiä.',
-        'array'   => ':attribute on oltava vähintään :min nimikettä.',
+    'lte' => [
+        'array' => 'The :attribute field must not have more than :value items.',
+        'file' => 'The :attribute field must be less than or equal to :value kilobytes.',
+        'numeric' => 'The :attribute field must be less than or equal to :value.',
+        'string' => 'The :attribute field must be less than or equal to :value characters.',
     ],
-    'starts_with'          => 'Kentän :attribute tulee alkaa jollakin seuraavista: :values.',
-    'ends_with'            => 'Kentän :attribute arvon tulee päättyä johonkin seuraavista: :values.',
+    'mac_address' => 'The :attribute field must be a valid MAC address.',
+    'max' => [
+        'array' => 'The :attribute field must not have more than :max items.',
+        'file' => 'The :attribute field must not be greater than :max kilobytes.',
+        'numeric' => 'The :attribute field must not be greater than :max.',
+        'string' => 'The :attribute field must not be greater than :max characters.',
+    ],
+    'max_digits' => 'The :attribute field must not have more than :max digits.',
+    'mimes' => 'The :attribute field must be a file of type: :values.',
+    'mimetypes' => 'The :attribute field must be a file of type: :values.',
+    'min' => [
+        'array' => 'The :attribute field must have at least :min items.',
+        'file' => 'The :attribute field must be at least :min kilobytes.',
+        'numeric' => 'The :attribute field must be at least :min.',
+        'string' => 'The :attribute field must be at least :min characters.',
+    ],
+    'min_digits' => 'The :attribute field must have at least :min digits.',
+    'missing' => 'The :attribute field must be missing.',
+    'missing_if' => 'The :attribute field must be missing when :other is :value.',
+    'missing_unless' => 'The :attribute field must be missing unless :other is :value.',
+    'missing_with' => 'The :attribute field must be missing when :values is present.',
+    'missing_with_all' => 'The :attribute field must be missing when :values are present.',
+    'multiple_of' => 'The :attribute field must be a multiple of :value.',
+    'not_in' => 'Valittu :attribute on virheellinen.',
+    'not_regex' => 'The :attribute field format is invalid.',
+    'numeric' => 'The :attribute field must be a number.',
+    'password' => [
+        'letters' => 'The :attribute field must contain at least one letter.',
+        'mixed' => 'The :attribute field must contain at least one uppercase and one lowercase letter.',
+        'numbers' => 'The :attribute field must contain at least one number.',
+        'symbols' => 'The :attribute field must contain at least one symbol.',
+        'uncompromised' => 'The given :attribute has appeared in a data leak. Please choose a different :attribute.',
+    ],
+    'percent'       => 'The depreciation minimum must be between 0 and 100 when depreciation type is percentage.',
 
-    'not_in'               => 'Valittu :attribute on virheellinen.',
-    'numeric'              => ':attribute tulee olla numero.',
-    'present'              => ':attribute kentän on oltava määritettynä.',
-    'valid_regex'          => 'Tuo ei ole kelvollinen regex. ',
-    'regex'                => ':attribute muotoilu on virheellinen.',
-    'required'             => ':attribute on vaadittu.',
-    'required_if'          => ':attribute on vaadittu kun :other on :value.',
-    'required_unless'      => ':attribute -kenttä on pakollinen, paitsi jos :other on :values.',
-    'required_with'        => ':attribute on vaadittu kun :values on määritettynä.',
-    'required_with_all'    => ':attribute -kenttä tarvitaan, kun :values on määritetty.',
-    'required_without'     => ':attribute on vaadittu kun :values ei ole määritettynä.',
+    'present' => ':attribute kentän on oltava määritettynä.',
+    'present_if' => 'The :attribute field must be present when :other is :value.',
+    'present_unless' => 'The :attribute field must be present unless :other is :value.',
+    'present_with' => 'The :attribute field must be present when :values is present.',
+    'present_with_all' => 'The :attribute field must be present when :values are present.',
+    'prohibited' => 'The :attribute field is prohibited.',
+    'prohibited_if' => 'The :attribute field is prohibited when :other is :value.',
+    'prohibited_unless' => 'The :attribute field is prohibited unless :other is in :values.',
+    'prohibits' => 'The :attribute field prohibits :other from being present.',
+    'regex' => 'The :attribute field format is invalid.',
+    'required' => ':attribute on vaadittu.',
+    'required_array_keys' => 'The :attribute field must contain entries for: :values.',
+    'required_if' => ':attribute on vaadittu kun :other on :value.',
+    'required_if_accepted' => 'The :attribute field is required when :other is accepted.',
+    'required_if_declined' => 'The :attribute field is required when :other is declined.',
+    'required_unless' => ':attribute -kenttä on pakollinen, paitsi jos :other on :values.',
+    'required_with' => ':attribute on vaadittu kun :values on määritettynä.',
+    'required_with_all' => 'The :attribute field is required when :values are present.',
+    'required_without' => ':attribute on vaadittu kun :values ei ole määritettynä.',
     'required_without_all' => ':attribute -kenttä on pakollinen, kun mitään :values ei ole määritetty.',
-    'same'                 => ':attribute ja :other tulee olla samat.',
-    'size'                 => [
-        'numeric' => ':attribute tulee olla :size.',
-        'file'    => ':attribute tulee olla :size kilotavua.',
-        'string'  => ':attribute tulee olla :size merkkiä.',
-        'array'   => ':attribute -kentän pitää sisältää :size nimikettä.',
+    'same' => 'The :attribute field must match :other.',
+    'size' => [
+        'array' => 'The :attribute field must contain :size items.',
+        'file' => 'The :attribute field must be :size kilobytes.',
+        'numeric' => 'The :attribute field must be :size.',
+        'string' => 'The :attribute field must be :size characters.',
     ],
+    'starts_with' => 'The :attribute field must start with one of the following: :values.',
     'string'               => ':attribute on oltava merkkijono.',
-    'timezone'             => ':attribute tulee olla kelvollinen verkkoalue.',
     'two_column_unique_undeleted' => 'Kentän :attribute arvon on oltava yksilöllinen :table1 ja :table2. ',
-    'unique'               => ':attribute on jo käytössä.',
-    'uploaded'             => ':attribute -kenttää ei onnistuttu lähettämään.',
-    'url'                  => ':attribute muotoilu on virheellinen.',
     'unique_undeleted'     => ':attribute on oltava ainutlaatuinen.',
     'non_circular'         => ':attribute ei saa luoda kehäviittausta.',
     'not_array'            => ':attribute ei voi olla taulukko.',
@@ -102,11 +165,14 @@ return [
     'numbers'              => 'Salasanan tulee sisältää vähintään yksi numero.',
     'case_diff'            => 'Salasanassa on käytettävä sekamuotoista kirjainta.',
     'symbols'              => 'Salasanan tulee sisältää symboleja.',
-    'gte'                  => [
-        'numeric'          => 'Arvo ei voi olla negatiivinen'
-    ],
-    'checkboxes'           => ':attribute sisältää virheellisiä vaihtoehtoja.',
-    'radio_buttons'        => ':attribute on virheellinen.',
+    'timezone' => 'The :attribute field must be a valid timezone.',
+    'unique' => ':attribute on jo käytössä.',
+    'uploaded' => ':attribute -kenttää ei onnistuttu lähettämään.',
+    'uppercase' => 'The :attribute field must be uppercase.',
+    'url' => 'The :attribute field must be a valid URL.',
+    'ulid' => 'The :attribute field must be a valid ULID.',
+    'uuid' => 'The :attribute field must be a valid UUID.',
+    'fmcs_location' => 'Full multiple company support and location scoping is enabled in the Admin Settings, and the selected location and selected company are not compatible.',
 
 
     /*
@@ -120,16 +186,22 @@ return [
     |
     */
 
+    'email_array'      => 'Yksi tai useampi sähköpostiosoite on virheellinen.',
+    'checkboxes'           => ':attribute sisältää virheellisiä vaihtoehtoja.',
+    'radio_buttons'        => ':attribute on virheellinen.',
+    
     'custom' => [
         'alpha_space' => ':attribute -kenttä sisältää merkin, jota ei sallita.',
-        'email_array'      => 'Yksi tai useampi sähköpostiosoite on virheellinen.',
+
         'hashed_pass'      => 'Nykyinen salasanasi on virheellinen',
         'dumbpwd'          => 'Salasana on liian yleinen.',
         'statuslabel_type' => 'Sinun on valittava kelvollinen tilamerkintätyyppi',
+        'custom_field_not_found'          => 'This field does not seem to exist, please double check your custom field names.',
+        'custom_field_not_found_on_model' => 'This field seems to exist, but is not available on this Asset Model\'s fieldset.',
 
         // date_format validation with slightly less stupid messages. It duplicates a lot, but it gets the job done :(
-        // We use this because the default error message for date_format is reflects php Y-m-d, which non-PHP
-        // people won't know how to format. 
+        // We use this because the default error message for date_format reflects php Y-m-d, which non-PHP
+        // people won't know how to format.
         'purchase_date.date_format'     => 'Attribuutin on oltava kelvollinen päivämäärä muodossa VVVV-KK-PP',
         'last_audit_date.date_format'   =>  'Kentän :attribute arvon on oltava kelvollinen päivämäärä muodossa VVVV-KK-PP hh:mm:ss',
         'expiration_date.date_format'   =>  'Attribuutin on oltava kelvollinen päivämäärä muodossa VVVV-KK-PP',
@@ -137,9 +209,15 @@ return [
         'expected_checkin.date_format'  =>  'Attribuutin on oltava kelvollinen päivämäärä muodossa VVVV-KK-PP',
         'start_date.date_format'        =>  'Attribuutin on oltava kelvollinen päivämäärä muodossa VVVV-KK-PP',
         'end_date.date_format'          =>  'Attribuutin on oltava kelvollinen päivämäärä muodossa VVVV-KK-PP',
+        'invalid_value_in_field' => 'Virheellinen arvo sisältyy tähän kenttään',
 
-    ],
+        'ldap_username_field' => [
+            'not_in' =>         '<code>sAMAccountName</code> (mixed case) will likely not work. You should use <code>samaccountname</code> (lowercase) instead.'
+        ],
+        'ldap_auth_filter_query' => ['not_in' => '<code>uid=samaccountname</code> is probably not a valid auth filter. You probably want <code>uid=</code> '],
+        'ldap_filter' => ['regex' => 'This value should probably not be wrapped in parentheses.'],
 
+        ],
     /*
     |--------------------------------------------------------------------------
     | Custom Validation Attributes
@@ -155,8 +233,16 @@ return [
 
     /*
     |--------------------------------------------------------------------------
-    | Generic Validation Messages
+    | Generic Validation Messages - we use these in the jquery validation where we don't have
+    | access to the :attribute
     |--------------------------------------------------------------------------
     */
-    'invalid_value_in_field' => 'Virheellinen arvo sisältyy tähän kenttään',
+
+    'generic' => [
+        'invalid_value_in_field' => 'Virheellinen arvo sisältyy tähän kenttään',
+        'required' => 'This field is required',
+        'email' => 'Please enter a valid email address',
+    ],
+
+
 ];
diff --git a/resources/lang/fil-PH/account/general.php b/resources/lang/fil-PH/account/general.php
index 1a9e2c03b8..7f9e2f848e 100644
--- a/resources/lang/fil-PH/account/general.php
+++ b/resources/lang/fil-PH/account/general.php
@@ -2,10 +2,16 @@
 
 return array(
     'personal_api_keys' => 'Personal API Keys',
+    'personal_access_token' => 'Personal Access Token',
+    'personal_api_keys_success' => 'Personal API Key :key created sucessfully',
+    'here_is_api_key' => 'Here is your new personal access token. This is the only time it will be shown so do not lose it! You may now use this token to make API requests.',
     'api_key_warning' => 'When generating an API token, be sure to copy it down immediately as they will not be visible to you again.',
     'api_base_url' => 'Your API base url is located at:',
     'api_base_url_endpoint' => '/&lt;endpoint&gt;',
     'api_token_expiration_time' => 'API tokens are set to expire in:',
     'api_reference' => 'Please check the <a href="https://snipe-it.readme.io/reference" target="_blank">API reference</a> to find specific API endpoints and additional API documentation.',
     'profile_updated' => 'Account successfully updated',
+    'no_tokens' => 'You have not created any personal access tokens.',
+    'enable_sounds' => 'Enable sound effects',
+    'enable_confetti' => 'Enable confetti effects',
 );
diff --git a/resources/lang/fil-PH/admin/accessories/message.php b/resources/lang/fil-PH/admin/accessories/message.php
index 57b18b23bf..2d88299e9e 100644
--- a/resources/lang/fil-PH/admin/accessories/message.php
+++ b/resources/lang/fil-PH/admin/accessories/message.php
@@ -2,7 +2,7 @@
 
 return array(
 
-    'does_not_exist' => 'The accessory [:id] does not exist.',
+    'does_not_exist' => 'Ang aksesoryang [:id] ay hindi umiiral.',
     'not_found' => 'That accessory was not found.',
     'assoc_users'	 => 'Ang aksesoryang ito ay kasalukuyang mayroong :pag-check out sa pag-kwenta ng mga aytem sa mga gumagamit o user. Paki-tingnan sa mga aksesorya at subukang muli. ',
 
@@ -25,8 +25,12 @@ return array(
      'checkout' => array(
         'error'   		=> 'Ang aksesorya ay hindi na-check out, mangyaring subukang muli',
         'success' 		=> 'Ang aksesorya ay matagumoay na nai-check out.',
-        'unavailable'   => 'Accessory is not available for checkout. Check quantity available',
-        'user_does_not_exist' => 'Ang user na iyon ay hindi tama. Mangyaring subukang muli.'
+        'unavailable'   => 'Ang aksesorya ay hindi maaaring i-check out. Suriing mabuti ang natitirang bilang',
+        'user_does_not_exist' => 'Ang user na iyon ay hindi tama. Mangyaring subukang muli.',
+         'checkout_qty' => array(
+            'lte'  => 'There is currently only one available accessory of this type, and you are trying to check out :checkout_qty. Please adjust the checkout quantity or the total stock of this accessory and try again.|There are :number_currently_remaining total available accessories, and you are trying to check out :checkout_qty. Please adjust the checkout quantity or the total stock of this accessory and try again.',
+            ),
+           
     ),
 
     'checkin' => array(
diff --git a/resources/lang/fil-PH/admin/accessories/table.php b/resources/lang/fil-PH/admin/accessories/table.php
index 6a11d59383..c9026867eb 100644
--- a/resources/lang/fil-PH/admin/accessories/table.php
+++ b/resources/lang/fil-PH/admin/accessories/table.php
@@ -6,6 +6,4 @@ return array(
     'id'      					=> 'Ang ID',
     'require_acceptance'      	=> 'Ang Pagtanggap',
     'title'      				=> 'Ang Pangalan ng Aksesorya',
-
-
 );
diff --git a/resources/lang/fil-PH/admin/components/general.php b/resources/lang/fil-PH/admin/components/general.php
index 528316539c..9c44c7667c 100644
--- a/resources/lang/fil-PH/admin/components/general.php
+++ b/resources/lang/fil-PH/admin/components/general.php
@@ -12,5 +12,5 @@ return array(
     'remaining' 			             => 'Ang Natitira',
     'total' 			                 => 'Ang Kabuuan',
     'update'                            => 'I-update ang Komponent',
-    'checkin_limit'            => 'Amount checked in must be equal to or less than :assigned_qty'
+    'checkin_limit'            => 'Ang bilang ng nai-check in ay dapat pareho o mas mababa sa :assigned_qty'
 );
diff --git a/resources/lang/fil-PH/admin/components/message.php b/resources/lang/fil-PH/admin/components/message.php
index 73549b80e7..747857e911 100644
--- a/resources/lang/fil-PH/admin/components/message.php
+++ b/resources/lang/fil-PH/admin/components/message.php
@@ -17,14 +17,15 @@ return array(
     'delete' => array(
         'confirm'   => 'Sigurado kaba na gusto mong i-delete ang komponent na ito?',
         'error'   => 'Mayroong isyu sa pag-delete ng komponent. Mangayring subukang muli.',
-        'success' => 'Ang komponent ay matagumpay na naisagawa.'
+        'success' => 'Ang komponent ay matagumpay na naisagawa.',
+        'error_qty'   => 'Some components of this type are still checked out. Please check them in and try again.',
     ),
 
      'checkout' => array(
         'error'   		=> 'Ang komponent ay hindi nai-check out, mangyaring subukang muli',
         'success' 		=> 'Ang komponent ay matagukpay nang nai-check out.',
         'user_does_not_exist' => 'Ang user na iyon ay hindi balido. Mangyaring subukang muli.',
-        'unavailable'      => 'Not enough components remaining: :remaining remaining, :requested requested ',
+        'unavailable'      => 'Kulang ang bilang ng natitirang komponent: :remaining ang natitira, :requested ang kinukuha ',
     ),
 
     'checkin' => array(
diff --git a/resources/lang/fil-PH/admin/consumables/general.php b/resources/lang/fil-PH/admin/consumables/general.php
index 4686f8888b..7103098244 100644
--- a/resources/lang/fil-PH/admin/consumables/general.php
+++ b/resources/lang/fil-PH/admin/consumables/general.php
@@ -8,4 +8,5 @@ return array(
     'remaining' 			            => 'Ang natitira',
     'total' 			                => 'Ang Kabuuan',
     'update'                            => 'I-update ang Consumable',
+    'inventory_warning'                 => 'Ang imbentaryo ng consumable na ito ay nasa mababang bilang na :min_count',
 );
diff --git a/resources/lang/fil-PH/admin/consumables/message.php b/resources/lang/fil-PH/admin/consumables/message.php
index 21c2ff52ef..23a11dbf0a 100644
--- a/resources/lang/fil-PH/admin/consumables/message.php
+++ b/resources/lang/fil-PH/admin/consumables/message.php
@@ -2,6 +2,7 @@
 
 return array(
 
+    'invalid_category_type' => 'Ang kategorya ay dapat nasa kategorya ng consumable.',
     'does_not_exist' => 'Ang consumable ay hindi umiiral.',
 
     'create' => array(
diff --git a/resources/lang/fil-PH/admin/custom_fields/general.php b/resources/lang/fil-PH/admin/custom_fields/general.php
index 903b44fb5e..a8ecb0f0ed 100644
--- a/resources/lang/fil-PH/admin/custom_fields/general.php
+++ b/resources/lang/fil-PH/admin/custom_fields/general.php
@@ -35,7 +35,7 @@ return [
     'create_field_title' => 'Create a new custom field',
     'value_encrypted'      	        => 'Ang balyu ng field na ito ay naka-encrypt sa database. Ang admin na mga gumagamit lamang ang maaaring maka-tanaw sa na-decrypt na balyu',
     'show_in_email'     => 'Include the value of this field in checkout emails sent to the user? Encrypted fields cannot be included in emails',
-    'show_in_email_short'     => 'Include in emails.',
+    'show_in_email_short' => 'Include in emails',
     'help_text' => 'Help Text',
     'help_text_description' => 'This is optional text that will appear below the form elements while editing an asset to provide context on the field.',
     'about_custom_fields_title' => 'About Custom Fields',
@@ -57,5 +57,8 @@ return [
     'show_in_requestable_list_short' => 'Show in requestable assets list',
     'show_in_requestable_list' => 'Show value in requestable assets list. Encrypted fields will not be shown',
     'encrypted_options' => 'This field is encrypted, so some display options will not be available.',
+    'display_checkin' => 'Display in checkin forms',
+    'display_checkout' => 'Display in checkout forms',
+    'display_audit' => 'Display in audit forms',
 
 ];
diff --git a/resources/lang/fil-PH/admin/custom_fields/message.php b/resources/lang/fil-PH/admin/custom_fields/message.php
index 4acd606a5d..2db0721412 100644
--- a/resources/lang/fil-PH/admin/custom_fields/message.php
+++ b/resources/lang/fil-PH/admin/custom_fields/message.php
@@ -5,6 +5,7 @@ return array(
     'field' => array(
         'invalid'   => 'Ang field ay hindi umiiral.',
         'already_added'   => 'Ang field ay naidagdag na',
+        'none_selected'   => 'No field selected',
 
         'create' => array(
             'error'   => 'Ang field ay hindi naisagawa, mangyaring subukang muli.',
diff --git a/resources/lang/fil-PH/admin/depreciations/general.php b/resources/lang/fil-PH/admin/depreciations/general.php
index e078c99050..de1882f675 100644
--- a/resources/lang/fil-PH/admin/depreciations/general.php
+++ b/resources/lang/fil-PH/admin/depreciations/general.php
@@ -13,4 +13,8 @@ return [
     'no_depreciations_warning'               => '<strong>Warning: </strong>
                       You do not currently have any depreciations set up.
                       Please set up at least one depreciation to view the depreciation report.',
+    'depreciation_method'                   => 'Ang Report ng Derpresasyon',
+    'linear_depreciation'                   => 'Linear (Default)',
+    'half_1'                                => 'Half-year convention, always applied',
+    'half_2'                                => 'Half-year convention, applied with condition',
 ];
diff --git a/resources/lang/fil-PH/admin/hardware/form.php b/resources/lang/fil-PH/admin/hardware/form.php
index 853ff073a9..c5446fd036 100644
--- a/resources/lang/fil-PH/admin/hardware/form.php
+++ b/resources/lang/fil-PH/admin/hardware/form.php
@@ -55,8 +55,11 @@ return [
     'asset_location_update_default' => 'Update only default location',
     'asset_location_update_actual' => 'Update only actual location',
     'asset_not_deployable' => 'That asset status is not deployable. This asset cannot be checked out.',
-    'asset_deployable' => 'That status is deployable. This asset can be checked out.',
+    'asset_not_deployable_checkin' => 'That asset status is not deployable. Using this status label will checkin the asset.',
+    'asset_deployable' => 'This asset can be checked out.',
     'processing_spinner' => 'Processing... (This might take a bit of time on large files)',
+    'processing' => 'Processing... ',
     'optional_infos'  => 'Optional Information',
-    'order_details'   => 'Order Related Information'
+    'order_details'   => 'Order Related Information',
+    'calc_eol'    => 'If nulling the EOL date, use automatic EOL calculation based on the purchase date and EOL rate.',
 ];
diff --git a/resources/lang/fil-PH/admin/hardware/general.php b/resources/lang/fil-PH/admin/hardware/general.php
index 4114a66619..190c4010df 100644
--- a/resources/lang/fil-PH/admin/hardware/general.php
+++ b/resources/lang/fil-PH/admin/hardware/general.php
@@ -5,8 +5,8 @@ return [
     'about_assets_text'            => 'Ang mga asset ay mga aytem na sinubaybayan ng serial number o tag ng asset. May mga posiilidad na ito ay mataas na balyu ng mga aytem kung saan tinitingna ang partikular na mga aytem.',
     'archived'  				=> 'Ang Archive',
     'asset'  					=> 'Ang Asset',
-    'bulk_checkout'             => 'Checkout Assets',
-    'bulk_checkin'              => 'Checkin Assets',
+    'bulk_checkout'             => 'Ang Bulk Checkout',
+    'bulk_checkin'              => 'Bulk Checkin',
     'checkin'  					=> 'I-checkin ang Asset',
     'checkout'  				=> 'I-checkout ang Asset',
     'clone'  					=> 'I-clone ang Asset',
@@ -27,8 +27,7 @@ return [
     'undeployable_tooltip'  	=> 'This asset has a status label that is undeployable and cannot be checked out at this time.',
     'view'  					=> 'Tingnan ang Asset',
     'csv_error' => 'You have an error in your CSV file:',
-    'import_text' => '<p>Upload a CSV that contains asset history. The assets and users MUST already exist in the system, or they will be skipped. Matching assets for history import happens against the asset tag. We will try to find a matching user based on the user\'s name you provide, and the criteria you select below. If you do not select any criteria below, it will simply try to match on the username format you configured in the <code>Admin &gt; General Settings</code>.</p><p>Fields included in the CSV must match the headers: <strong>Asset Tag, Name, Checkout Date, Checkin Date</strong>. Any additional fields will be ignored. </p><p>Checkin Date: blank or future checkin dates will checkout items to associated user.  Excluding the Checkin Date column will create a checkin date with todays date.</p>
-    ',
+    'import_text' => '<p>Upload a CSV that contains asset history. The assets and users MUST already exist in the system, or they will be skipped. Matching assets for history import happens against the asset tag. We will try to find a matching user based on the user\'s name you provide, and the criteria you select below. If you do not select any criteria below, it will simply try to match on the username format you configured in the <code>Admin &gt; General Settings</code>.</p><p>Fields included in the CSV must match the headers: <strong>Asset Tag, Name, Checkout Date, Checkin Date</strong>. Any additional fields will be ignored. </p><p>Checkin Date: blank or future checkin dates will checkout items to associated user.  Excluding the Checkin Date column will create a checkin date with todays date.</p>    ',
     'csv_import_match_f-l' => 'Try to match users by <strong>firstname.lastname</strong> (<code>jane.smith</code>) format',
     'csv_import_match_initial_last' => 'Try to match users by <strong>first initial last name</strong> (<code>jsmith</code>) format',
     'csv_import_match_first' => 'Try to match users by <strong>first name</strong> (<code>jane</code>) format',
diff --git a/resources/lang/fil-PH/admin/hardware/message.php b/resources/lang/fil-PH/admin/hardware/message.php
index 22a5b42b8b..7e866d217c 100644
--- a/resources/lang/fil-PH/admin/hardware/message.php
+++ b/resources/lang/fil-PH/admin/hardware/message.php
@@ -2,19 +2,23 @@
 
 return [
 
-    'undeployable' 		=> '<strong>Babala: </strong> Ang asset na ito ay kasalukuyang namarkahan bilang hindi pwedeng mai-deploy..
-                        Kung nabago na ang katayuang ito, paki-update ng katayuan ng asset.',
-    'does_not_exist' 	=> 'Hindi umiiral ang asset.',
-    'does_not_exist_var'=> 'Asset with tag :asset_tag not found.',
-    'no_tag' 	        => 'No asset tag provided.',
+    'undeployable' 		 => '<strong>Warning: </strong> This asset has been marked as currently undeployable. If this status has changed, please update the asset status.',
+    'does_not_exist' 	 => 'Hindi umiiral ang asset.',
+    'does_not_exist_var' => 'Asset with tag :asset_tag not found.',
+    'no_tag' 	         => 'No asset tag provided.',
     'does_not_exist_or_not_requestable' => 'That asset does not exist or is not requestable.',
-    'assoc_users'	 	=> 'Ang asset na ito ay kasalukuyang nai-check out sa isang user at hindi na maaaring mai-delete. Mangyaring suriin muna ang asset, at pagkatapos subukang i-delete muli. ',
+    'assoc_users'	 	 => 'Ang asset na ito ay kasalukuyang nai-check out sa isang user at hindi na maaaring mai-delete. Mangyaring suriin muna ang asset, at pagkatapos subukang i-delete muli. ',
     'warning_audit_date_mismatch' 	=> 'This asset\'s next audit date (:next_audit_date) is before the last audit date (:last_audit_date). Please update the next audit date.',
+    'labels_generated'   => 'Labels were successfully generated.',
+    'error_generating_labels' => 'Error while generating labels.',
+    'no_assets_selected' => 'No assets selected.',
 
     'create' => [
         'error'   		=> 'Ang asset ay hindi naisagawa, mangyaring subukang muli. :(',
         'success' 		=> 'Ang asset ay matagumpay na naisagawa. :)',
         'success_linked' => 'Asset with tag :tag was created successfully. <strong><a href=":link" style="color: white;">Click here to view</a></strong>.',
+        'multi_success_linked' => 'Asset with tag :links was created successfully.|:count assets were created succesfully. :links.',
+        'partial_failure' => 'An asset was unable to be created. Reason: :failures|:count assets were unable to be created. Reasons: :failures',
     ],
 
     'update' => [
@@ -52,20 +56,24 @@ return [
     ],
 
     'import' => [
+        'import_button'         => 'Process Import',
         'error'                 => 'Ang iilang mga aytem ay hindi nai-import ng tama.',
         'errorDetail'           => 'Ang mga sumusunod na mga Aytem ay hindi na-import dahil sa mga error.',
         'success'               => 'Ang iyong file ay na-import na',
         'file_delete_success'   => 'Ang iyong file ay matagumpay nang nai-upload',
         'file_delete_error'      => 'Ang file ay hindi mai-delete',
         'file_missing' => 'The file selected is missing',
+        'file_already_deleted' => 'The file selected was already deleted',
         'header_row_has_malformed_characters' => 'One or more attributes in the header row contain malformed UTF-8 characters',
         'content_row_has_malformed_characters' => 'One or more attributes in the first row of content contain malformed UTF-8 characters',
+        'transliterate_failure' => 'Transliteration from :encoding to UTF-8 failed due to invalid characters in input'
     ],
 
 
     'delete' => [
         'confirm'   	=> 'Sigurado kaba na gusto mong i-delete ang asset na ito?',
         'error'   		=> 'Mayroong isyu sa pag-delete ng asset. Mangyaring subukang muli.',
+        'assigned_to_error' => '{1}Asset Tag: :asset_tag is currently checked out. Check in this device before deletion.|[2,*]Asset Tags: :asset_tag are currently checked out. Check in these devices before deletion.',
         'nothing_updated'   => 'Walang napiling mga asset, kaya walang nai-delete.',
         'success' 		=> 'Matagumpay na nai-delete ang asset.',
     ],
@@ -78,6 +86,11 @@ return [
         'no_assets_selected' => 'Dapat kang pumili ng kahit isang asset mula sa listahan',
     ],
 
+    'multi-checkout' => [
+        'error'   => 'Asset was not checked out, please try again|Assets were not checked out, please try again',
+        'success' => 'Asset checked out successfully.|Assets checked out successfully.',
+    ],
+
     'checkin' => [
         'error'   		=> 'Ang asset ay hindi nai-check in, mangyaring subukang muli',
         'success' 		=> 'Ang asset ay matagumpay na nai-check in.',
@@ -87,9 +100,10 @@ return [
     ],
 
     'requests' => [
-        'error'   		=> 'Ang asset ay hindi nai-rekwest, mangyaring subukang muli',
-        'success' 		=> 'Matagumpay na nai-rekwest ang asset.',
-        'canceled'      => 'Ang rekwest sa pag-checkout ay matagumpay na nakansela',
+        'error'   		=> 'Request was not successful, please try again.',
+        'success' 		=> 'Request successfully submitted.',
+        'canceled'      => 'Request successfully canceled.',
+        'cancel'        => 'Cancel this item request',
     ],
 
 ];
diff --git a/resources/lang/fil-PH/admin/hardware/table.php b/resources/lang/fil-PH/admin/hardware/table.php
index 64c31d0419..a74f1dbfbc 100644
--- a/resources/lang/fil-PH/admin/hardware/table.php
+++ b/resources/lang/fil-PH/admin/hardware/table.php
@@ -25,7 +25,6 @@ return [
     'image'		    => 'Ang Imahe ng Device',
     'days_without_acceptance' => 'Ang mga Araw na Walang Pagtanggap',
     'monthly_depreciation' => 'Monthly Depreciation',
-    'assigned_to'    => 'Nakatalaga Sa',
     'requesting_user' => 'Requesting User',
     'requested_date' => 'Requested Date',
     'changed'       => 'Changed',
diff --git a/resources/lang/fil-PH/admin/kits/general.php b/resources/lang/fil-PH/admin/kits/general.php
index 9316eb95f2..3a6eb687cb 100644
--- a/resources/lang/fil-PH/admin/kits/general.php
+++ b/resources/lang/fil-PH/admin/kits/general.php
@@ -47,4 +47,5 @@ return [
     'kit_deleted'                       => 'Kit was successfully deleted',
     'kit_model_updated'                 => 'Model was successfully updated',
     'kit_model_detached'                => 'Model was successfully detached',
+    'model_already_attached'            => 'Model already attached to kit',
 ];
diff --git a/resources/lang/fil-PH/admin/licenses/general.php b/resources/lang/fil-PH/admin/licenses/general.php
index 8c50674d10..887764ca6e 100644
--- a/resources/lang/fil-PH/admin/licenses/general.php
+++ b/resources/lang/fil-PH/admin/licenses/general.php
@@ -14,6 +14,7 @@ return array(
     'info'  					=> 'Ang Impormasyon sa Lisensya',
     'license_seats'  			=> 'Ang Lisensya ng mga Seat',
     'seat'  					=> 'Ang Seat',
+    'seat_count'  				=> 'Seat :count',
     'seats'  					=> 'Ang mga seat',
     'software_licenses'  		=> 'Ang mga Lisenysa ng Software',
     'user'  					=> 'Ang gumagamit',
@@ -23,12 +24,12 @@ return array(
         [
             'checkin_all'           => [
                 'button'            => 'Checkin All Seats',
-                'modal'             => 'This will action checkin one seat. | This action will checkin all :checkedout_seats_count seats for this license.',
+                'modal'             => 'This action will checkin one seat. | This action will checkin all :checkedout_seats_count seats for this license.',
                 'enabled_tooltip'   => 'Checkin ALL seats for this license from both users and assets',
                 'disabled_tooltip'  => 'This is disabled because there are no seats currently checked out',
                 'disabled_tooltip_reassignable'  => 'This is disabled because the License is not reassignable',
                 'success'           => 'License successfully checked in! | All licenses were successfully checked in!',
-                'log_msg'           => 'Checked in via bulk license checkout in license GUI',
+                'log_msg'           => 'Checked in via bulk license checkin in license GUI',
             ],
 
             'checkout_all'              => [
diff --git a/resources/lang/fil-PH/admin/licenses/message.php b/resources/lang/fil-PH/admin/licenses/message.php
index 4108519494..e43b8fd7ba 100644
--- a/resources/lang/fil-PH/admin/licenses/message.php
+++ b/resources/lang/fil-PH/admin/licenses/message.php
@@ -44,10 +44,13 @@ return array(
         'error'   => 'Mayroong isyu sa pag-check out ng lisensya. Mangyaring subukang muli.',
         'success' => 'Matagumpay na nai-check out ang lisensya',
         'not_enough_seats' => 'Not enough license seats available for checkout',
+        'mismatch' => 'The license seat provided does not match the license',
+        'unavailable' => 'This seat is not available for checkout.',
     ),
 
     'checkin' => array(
         'error'   => 'Mayroong isyu sa pag-check in ng lisensya. Mangyaring subukang muli.',
+        'not_reassignable' => 'License not reassignable',
         'success' => 'Matagumpay na nai-check in ang lisensya'
     ),
 
diff --git a/resources/lang/fil-PH/admin/locations/message.php b/resources/lang/fil-PH/admin/locations/message.php
index 0613d40896..a5e77eb4fc 100644
--- a/resources/lang/fil-PH/admin/locations/message.php
+++ b/resources/lang/fil-PH/admin/locations/message.php
@@ -3,11 +3,12 @@
 return array(
 
     'does_not_exist' => 'Ang lokasyon ay hindi umiiral.',
-    'assoc_users'    => 'This location is not currently deletable because it is the location of record for at least one asset or user, has assets assigned to it, or is the parent location of another location. Please update your models to no longer reference this company and try again. ',
+    'assoc_users'    => 'This location is not currently deletable because it is the location of record for at least one asset or user, has assets assigned to it, or is the parent location of another location. Please update your records to no longer reference this location and try again ',
     'assoc_assets'	 => 'Ang lokasyong ito ay kasalukuyang naiugnay sa hindi bumaba sa isang asset at hindi maaaring mai-delete. Mangyaring i-update ang iyong mga asset upang hindi na magreperens sa lokasyong ito at paki-subok muli. ',
     'assoc_child_loc'	 => 'Ang lokasyong ito ay kasalukuyang pinagmumulan sa hindi bumaba sa lokasyon isang bata at hindi maaaring mai-delete. Mangyaring i-update ang iyong mga lokasyon upang hindi na magreperens sa lokasyong ito at paki-subok muli. ',
     'assigned_assets' => 'Assigned Assets',
     'current_location' => 'Current Location',
+    'open_map' => 'Buksan sa :map_provider_icon Maps',
 
 
     'create' => array(
@@ -20,6 +21,11 @@ return array(
         'success' => 'Ang lokasyon ay matagumpay na nai-update.'
     ),
 
+    'restore' => array(
+        'error'   => 'Location was not restored, please try again',
+        'success' => 'Location restored successfully.'
+    ),
+
     'delete' => array(
         'confirm'   	=> 'Sigurado kaba na gusto mong i-delete ang lokasyong ito?',
         'error'   => 'Mayroong isyu sa pag-delete ng lokasyon. Mangyaring subukang muli.',
diff --git a/resources/lang/fil-PH/admin/locations/table.php b/resources/lang/fil-PH/admin/locations/table.php
index 4e975b2fc3..01b7ddc312 100644
--- a/resources/lang/fil-PH/admin/locations/table.php
+++ b/resources/lang/fil-PH/admin/locations/table.php
@@ -39,4 +39,5 @@ return [
     'signed_by_finance_auditor' => 'Signed By (Finance Auditor):',
     'signed_by_location_manager' => 'Signed By (Location Manager):',
     'signed_by'                 => 'Signed Off By:',
+    'clone'  					=> 'Clone Location',
 ];
diff --git a/resources/lang/fil-PH/admin/models/general.php b/resources/lang/fil-PH/admin/models/general.php
index ee943e0d60..bbad023fcf 100644
--- a/resources/lang/fil-PH/admin/models/general.php
+++ b/resources/lang/fil-PH/admin/models/general.php
@@ -3,7 +3,7 @@
 return array(
     'about_models_title'     => 'Ang Tungkol sa mga Modelo ng Asset',
     'about_models_text'           => 'Ang mga Modelo ng Asset ay isang paraan para i-grupo ang magkakaparehong mga asset. "MBP 2013", "IPhone 6s", atbp.',
-    'deleted'  					        => 'This model has been deleted.',
+    'deleted'  					=> 'Ang modelong ito ay nabura na.',
     'bulk_delete'               => 'Ang Maramihang Pag-delete sa mga Modelo ng Asset',
     'bulk_delete_help'               => 'Gamitin ang mga checkboxes sa ibaba para i-komperma ang pag-delete sa mga napiling mga modelo ng asset. Ang mga modelo ng asset na mayroong mga asset na nai-ugnay sa mga ito ay hindi pwedeng i-delete hanggang sa ang lahat ng mga asset ay nai-ugnay sa ibat-ibang modelo.',
     'bulk_delete_warn'          => 'You are about to delete one asset model.|You are about to delete :model_count asset models.',
diff --git a/resources/lang/fil-PH/admin/models/message.php b/resources/lang/fil-PH/admin/models/message.php
index 29c6304fc1..33c60303fd 100644
--- a/resources/lang/fil-PH/admin/models/message.php
+++ b/resources/lang/fil-PH/admin/models/message.php
@@ -7,7 +7,7 @@ return array(
     'no_association' => 'WARNING! The asset model for this item is invalid or missing!',
     'no_association_fix' => 'This will break things in weird and horrible ways. Edit this asset now to assign it a model.',
     'assoc_users'	 => 'Ang modelong ito ay kasalukuyang nai-ugnay sa isa o higit pang mga asset at hindi maaaring mai-delete. Paki-delete ng mga model na ito, at pagkatapos subukang i-delete muli. ',
-
+    'invalid_category_type' => 'This category must be an asset category.',
 
     'create' => array(
         'error'   => 'Ang modelo ay hindi naisagawa, mangyaring subukang muli.',
diff --git a/resources/lang/fil-PH/admin/reports/general.php b/resources/lang/fil-PH/admin/reports/general.php
index 70097f8954..4062192919 100644
--- a/resources/lang/fil-PH/admin/reports/general.php
+++ b/resources/lang/fil-PH/admin/reports/general.php
@@ -4,7 +4,8 @@ return [
     'info'   => 'Pumili ng opsyon na gusto mo para sa iyong report sa asset.',
     'deleted_user' => 'Deleted user',
     'send_reminder' => 'Send reminder',
-    'reminder_sent' => 'Reminder sent',
+    'cannot_send_reminder' => 'User has been deleted or does not have an email address so cannot receive a reminder',
+    'reminder_sent' => 'Naipadala ang paalala',
     'acceptance_deleted' => 'Acceptance request deleted',
     'acceptance_request' => 'Acceptance request',
     'custom_export' => [
@@ -13,5 +14,10 @@ return [
         'user_state' => 'User State',
         'user_country' => 'User Country',
         'user_zip' => 'User Zip'
-    ]
-];
\ No newline at end of file
+    ],
+    'open_saved_template' => 'Open Saved Template',
+    'save_template' =>  'Save Template',
+    'select_a_template' => 'Select a Template',
+    'template_name' => 'Template Name',
+    'update_template' => 'Update Template',
+];
diff --git a/resources/lang/fil-PH/admin/reports/message.php b/resources/lang/fil-PH/admin/reports/message.php
index da2b5e1978..2800bbdf0b 100644
--- a/resources/lang/fil-PH/admin/reports/message.php
+++ b/resources/lang/fil-PH/admin/reports/message.php
@@ -1,5 +1,16 @@
 <?php
 
-return array(
-    'error'   => 'Kinakailangan mong pumili ng kahit ISANG opsyon.'
-);
+return [
+    'about_templates' => 'About Saved Templates',
+    'saving_templates_description' => 'Select your options, then enter the name of your template in the box above and click the \'Save Template\' button. Use the dropdown to select a previously saved template.',
+    'create'  => [
+        'success' => 'Template saved successfully',
+    ],
+    'update' => [
+        'success' => 'Template updated successfully',
+    ],
+    'delete' => [
+        'success' => 'Template deleted',
+        'no_delete_permission' => 'Template does not exist or you do not have permission to delete it.',
+    ],
+];
diff --git a/resources/lang/fil-PH/admin/settings/general.php b/resources/lang/fil-PH/admin/settings/general.php
index 7d024f3f72..123b6eef28 100644
--- a/resources/lang/fil-PH/admin/settings/general.php
+++ b/resources/lang/fil-PH/admin/settings/general.php
@@ -8,13 +8,13 @@ return [
     'ad_append_domain'          => 'Append domain name to username field',
     'ad_append_domain_help'     => 'User isn\'t required to write "username@domain.local", they can just type "username".',
     'admin_cc_email'            => 'CC Email',
-    'admin_cc_email_help'       => 'If you would like to send a copy of checkin/checkout emails that are sent to users to an additional email account, enter it here. Otherwise leave this field blank.',
+    'admin_cc_email_help'       => 'Send a copy of checkin/checkout emails to this address.',
     'admin_settings'            => 'Admin Settings',
     'is_ad'				        => 'Ito ay isang server ng Aktibong Direktorya',
     'alerts'                	=> 'Alerts',
     'alert_title'               => 'Update Notification Settings',
     'alert_email'				=> 'Magpadala ng mga alert sa',
-    'alert_email_help'    => 'Email addresses or distribution lists you want alerts to be sent to, comma separated',
+    'alert_email_help'          => 'Email addresses or distribution lists you want alerts to be sent to, comma separated.',
     'alerts_enabled'			=> 'Ang Email Alerts ay Pinagana',
     'alert_interval'			=> 'Ang Alerts Threshold ay Mag-expire (sa iilang araw)',
     'alert_inv_threshold'		=> 'Ang Threshold ng Inventory Alert',
@@ -31,15 +31,18 @@ return [
     'backups'					=> 'Mga backup',
     'backups_help'              => 'Create, download, and restore backups ',
     'backups_restoring'         => 'Restoring from Backup',
+    'backups_clean' => 'Clean the backed-up database before restore',
+    'backups_clean_helptext' => "This can be useful if you're changing between database versions",
     'backups_upload'            => 'Upload Backup',
     'backups_path'              => 'Backups on the server are stored in <code>:path</code>',
-    'backups_restore_warning'   => 'Use the restore button <small><span class="btn btn-xs btn-warning"><i class="text-white fas fa-retweet" aria-hidden="true"></i></span></small> to restore from a previous backup. (This does not currently work with S3 file storage or Docker.)<br><br>Your <strong>entire :app_name database and any uploaded files will be completely replaced</strong> by what\'s in the backup file.  ',
+    'backups_restore_warning'   => 'Use the restore button <small><span class="btn btn-xs btn-warning"><i class="text-white fas fa-retweet" aria-hidden="true"></i></span></small> to restore from a previous backup. (This does not currently work with S3 file storage or Docker.)<br><br>Your <strong>entire :app_name database and any uploaded files will be completely replaced</strong> by what\'s in the backup file  ',
     'backups_logged_out'         => 'All existing users, including you, will be logged out once your restore is complete.',
     'backups_large'             => 'Very large backups may time out on the restore attempt and may still need to be run via command line. ',
     'barcode_settings'			=> 'Ang mga Setting sa Barcode',
     'confirm_purge'			    => 'I-kumperma ang Pag-purge',
     'confirm_purge_help'		=> 'Enter the text "DELETE" in the box below to purge your deleted records. This action cannot be undone and will PERMANENTLY delete all soft-deleted items and users. (You should make a backup first, just to be safe.)',
     'custom_css'				=> 'I-custom ang CSS',
+    'custom_css_placeholder'	=> 'Add your custom CSS',
     'custom_css_help'			=> 'Mag-enter ng kahit anung kustom na mag-override ng CSS na nais mong gamitin. Wag isali ang &lt;style&gt;&lt;/style&gt; mga tag.',
     'custom_forgot_pass_url'	=> 'I-custom ang URL ng Pag-reset sa Password',
     'custom_forgot_pass_url_help'	=> 'Papalitan nito ang built-in ng nakalimutang URL ng password sa skreen ng log-in, kapaki-pakinabang upang magdirekta sa panloob o ang password reset functionality ng LDAP. Ito ay epektibong hindi magpagana ng lokal na gumagamit para sa punsyonalidad sa nakalimutang password.',
@@ -47,34 +50,34 @@ return [
     'dashboard_message_help'	=> 'Ang tekstong ito ay lilitaw sa dashboard para sa sinuman na mayroong permiso na tumingin sa dashboard.',
     'default_currency'  		=> 'Ang Default na Currency',
     'default_eula_text'			=> 'Ang Default na EULA',
+    'default_eula_text_placeholder' => 'Add your default EULA text',
     'default_language'			=> 'Ang Default na Linggwahe',
     'default_eula_help_text'	=> 'Maaari kang mag-ugnay ng kustom na EULAS sa partikular na mga katergorya ng asset.',
-    'acceptance_note'           => 'Add a note for your decision (Optional)',
+    'acceptance_note'           => 'Magdagdag ng paalala para sa iyong desisyon (Opsiyonal)',
     'display_asset_name'        => 'Ipakita ang Pangalan ng Asset',
     'display_checkout_date'     => 'Ang Petsa ng Pag-checkout ay Ipakita',
     'display_eol'               => 'Ipakita sa table view ang EOL',
-    'display_qr'                => 'Ang mga Square Codes ay Ipakita',
+    'display_qr'                => 'Ipakita ang 2D barcode',
     'display_alt_barcode'		=> 'Ipakita ang 1D barcode',
-    'email_logo'                => 'Email Logo',
     'barcode_type'				=> 'Ang Uri ng 2D Barcode',
     'alt_barcode_type'			=> 'Ang uri ng 1D barcode',
-    'email_logo_size'       => 'Square logos in email look best. ',
     'enabled'                   => 'Enabled',
     'eula_settings'				=> 'Ang mga Setting ng EULA',
     'eula_markdown'				=> 'Ang EULA na ito ay nagpahintulot ng <a href="https://help.github.com/articles/github-flavored-markdown/">Github flavored na markdown</a>.',
+    'empty_row_count'           => 'Field Start Offset (Empty Rows)',
+    'empty_row_count_help'      => 'Fields will begin populating after this many empty rows are skipped at the top of the label.',
     'favicon'                   => 'Favicon',
     'favicon_format'            => 'Accepted filetypes are ico, png, and gif. Other image formats may not work in all browsers.',
     'favicon_size'          => 'Favicons should be square images, 16x16 pixels.',
     'footer_text'               => 'Ang Karagdagang Teksto ng Footer ',
     'footer_text_help'          => 'Ang tekstong ito ay lilitaw sa kanang bahagsi ng footer. Ang mga links ay pinapayagan gamit ang <a href="https://help.github.com/articles/github-flavored-markdown/">Github flavored na markdown</a>. Ang biak na mga Linya, mga header, mga imahi, atbp ay maaaring magsaad ng hindi inaasahang mga resulta.',
+    'footer_text_placeholder'   => 'Optional footer text',
     'general_settings'			=> 'Ang Pangakalahatang mga Setting',
-    'general_settings_keywords' => 'company support, signature, acceptance, email format, username format, images, per page, thumbnail, eula, gravatar, tos, dashboard, privacy',
     'general_settings_help'     => 'Default EULA and more',
     'generate_backup'			=> 'Magsagawa ng Backup',
     'google_workspaces'         => 'Google Workspaces',
     'header_color'              => 'Ang Kulay ng Header',
     'info'                      => 'Ang mga settings na ito ay pwedeng magbigay paalam sa sa iyo na i-customise ng iilang mga speto ng iyong pag-iinstall.',
-    'label_logo'                => 'Label Logo',
     'label_logo_size'           => 'Square logos look best - will be displayed in the top right of each asset label. ',
     'laravel'                   => 'Ang Laravel na Bersyon',
     'ldap'                      => 'LDAP',
@@ -94,7 +97,7 @@ return [
     'ldap_login_sync_help'      => 'Ito ay susubok lamang sa LDAP na mag-sync nang maayos. Kapag ang iyong LDAP Authentication query ay hindi tama, ang mga gumagamit ay hindi parin makapag-login. DAPAT MO MUNANG I-SAVE ANG IYONG UPDATED NA MGA SETTING NG LDAP.',
     'ldap_manager'              => 'LDAP Manager',
     'ldap_server'               => 'Ang Serber ng LDAP',
-    'ldap_server_help'          => 'Ito ay dapat na magsimula sa ldap:// (para sa hindi naka-encrypt or TLS) o ldaps:// (para sa SSL)',
+    'ldap_server_help'          => 'This should start with ldap:// (for unencrypted) or ldaps:// (for TLS or SSL)',
     'ldap_server_cert'			=> 'Ang pagpapatibay sa sertipikasyon ng LDAP SSL',
     'ldap_server_cert_ignore'	=> 'Payagan ang hindi balidong Sertipiko ng SSL',
     'ldap_server_cert_help'		=> 'Piliin ang checkbox na ito kapag ikay ay gumagamit ng self signed na SSL cert at gutong tumanggap ng hindi balidong sertipiko ng SSL.',
@@ -108,8 +111,8 @@ return [
     'ldap_pword'                => 'Ang Bind Password ng LDAP',
     'ldap_basedn'               => 'Ang Bind DN ng Base',
     'ldap_filter'               => 'Ang Filter ng LDAP',
-    'ldap_pw_sync'              => 'Ang Password Sync ng LDAP',
-    'ldap_pw_sync_help'         => 'Alisan ng tsek ang kahon kapag hindi mo gustong magpanatili ng mga password sync ng LDAP sa lokal na mga password. Ang hindi pagpapagana nito ay nangangahulugang na ang iyong gumagamit ay maaaring hindi makapag-login kapag ang iyong serber ng LDAP ay hindi maabot sa iilang mga kadahilanan.',
+    'ldap_pw_sync'              => 'Cache LDAP Passwords',
+    'ldap_pw_sync_help'         => 'Uncheck this box if you do not wish to keep LDAP passwords cached as local hashed passwords. Disabling this means that your users may not be able to login if your LDAP server is unreachable for some reason.',
     'ldap_username_field'       => 'Ang Field ng Username',
     'ldap_lname_field'          => 'Ang Huling Pangalan',
     'ldap_fname_field'          => 'Unang Pangalan ng LDAP',
@@ -117,13 +120,15 @@ return [
     'ldap_version'              => 'Ang Bersyon ng LDAP',
     'ldap_active_flag'          => 'Ang Aktibong Flag ng LDAP',
     'ldap_activated_flag_help'  => 'This value is used to determine whether a synced user can login to Snipe-IT. <strong>It does not affect the ability to check items in or out to them</strong>, and should be the <strong>attribute name</strong> within your AD/LDAP, <strong>not the value</strong>. <br><br>If this field is set to a field name that does not exist in your AD/LDAP, or the value in the AD/LDAP field is set to <code>0</code> or <code>false</code>, <strong>user login will be disabled</strong>. If the value in the AD/LDAP field is set to <code>1</code> or <code>true</code> or <em>any other text</em> means the user can log in. When the field is blank in your AD, we respect the <code>userAccountControl</code> attribute, which usually allows non-suspended users to log in.',
+    'ldap_invert_active_flag'   => 'LDAP Invert Active Flag',
+    'ldap_invert_active_flag_help'     => 'If enabled: when the value returned by LDAP Active Flag is <code>0</code> or <code>false</code> the user account will be active.',
     'ldap_emp_num'              => 'Ang Numero ng Empleyado ng LDAP',
     'ldap_email'                => 'Ang Email ng LDAP',
     'ldap_test'                 => 'Test LDAP',
     'ldap_test_sync'            => 'Test LDAP Synchronization',
     'license'                   => 'Ang Lisensya ng Software',
-    'load_remote'               => 'Use Gravatar',
-    'load_remote_help_text'		=> 'Uncheck this box if your install cannot load scripts from the outside internet. This will prevent Snipe-IT from trying load images from Gravatar.',
+    'load_remote'               => 'Load Remote Avatars',
+    'load_remote_help_text'		=> 'Uncheck this box if your install cannot load scripts from the outside internet. This will prevent Snipe-IT from trying load avatars from Gravatar or other outside sources.',
     'login'                     => 'Login Attempts',
     'login_attempt'             => 'Login Attempt',
     'login_ip'                  => 'IP Address',
@@ -131,6 +136,7 @@ return [
     'login_user_agent'          => 'User Agent',
     'login_help'                => 'List of attempted logins',
     'login_note'                => 'Ang Note sa Pag-login',
+    'login_note_placeholder'            => "If you do not have a login or have found a device belonging to this company, please call technical support at 888-555-1212. Thank you.",
     'login_note_help'           => 'Opsyonal na maglakip ng iilang mga pangungusap sa iyong skreen, halimbawa upang makapaghatid ng tulong sa mga taong nakakita ng nawawala o ninakaw na device. Ang field na ito ay tumatanggap ng <a href="https://help.github.com/articles/github-flavored-markdown/">Github flavored na markdown</a>',
     'login_remote_user_text'    => 'Remote User login options',
     'login_remote_user_enabled_text' => 'Enable Login with Remote User Header',
@@ -146,13 +152,16 @@ return [
     'logo_print_assets_help'    => 'Use branding on printable asset lists ',
     'full_multiple_companies_support_help_text' => 'Pagbabawal sa mga gumagamit (kasama ang mga admin) na nakatalaga sa mga asset ng kanilang kompanya.',
     'full_multiple_companies_support_text' => 'Ang Buong Suporta sa Maramihang Kompanya',
+    'scope_locations_fmcs_support_text'  => 'Scope Locations with Full Multiple Companies Support',
+    'scope_locations_fmcs_support_help_text'  => 'Restrict locations to their selected company.',
+    'scope_locations_fmcs_check_button' => 'Check Compatibility',
+    'scope_locations_fmcs_support_disabled_text'  => 'This option is disabled because you have conflicting locations set for :count or more items.',
     'show_in_model_list'   => 'Ipakita sa Modelo ng mga Dropdowns',
     'optional'					=> 'opsyonal',
     'per_page'                  => 'Ang mga Resulta Bawat Pahina',
     'php'                       => 'Ang Bersyon ng PHP',
-    'php_info'                  => 'PHP Info',
+    'php_info'                  => 'PHP info',
     'php_overview'              => 'PHP',
-    'php_overview_keywords'     => 'phpinfo, system, info',
     'php_overview_help'         => 'PHP System info',
     'php_gd_info'               => 'Dapat kang mag-install ng php-gd para makapag-pakita ng mga code ng QR, tingnan ang mga batayan sa pag-install.',
     'php_gd_warning'            => 'Hindi na-install ang Pagpoproseso ng Imahe ng PHP at plugin ng GD.',
@@ -218,6 +227,8 @@ return [
     'webhook_integration_help'    => ':app integration is optional, however the endpoint and channel are required if you wish to use it. To configure :app integration, you must first <a href=":webhook_link" target="_new" rel="noopener">create an incoming webhook</a> on your :app account. Click on the <strong>Test :app Integration</strong> button to confirm your settings are correct before saving. ',
     'webhook_integration_help_button'    => 'Once you have saved your :app information, a test button will appear.',
     'webhook_test_help'           => 'Test whether your :app integration is configured correctly. YOU MUST SAVE YOUR UPDATED :app SETTINGS FIRST.',
+    'shortcuts_enabled'         => 'Enable Shortcuts',
+    'shortcuts_help_text'       => '<strong>Windows</strong>: Alt + Access key, <strong>Mac</strong>: Control + Option + Access key',
     'snipe_version'  			=> 'Ang bersyon ng Snipe-IT',
     'support_footer'            => 'Sumusuporta ng mga Link ng Footer ',
     'support_footer_help'       => 'I-specify kung sino ang nakakakita ng mga link sa impormasyon ng Snipe-IT Support at ang mga User Manual',
@@ -227,7 +238,6 @@ return [
     'update'                    => 'Ang mga Setting ay I-update',
     'value'                     => 'Balyu',
     'brand'                     => 'Ang Pagkakaroon ng Brand',
-    'brand_keywords'            => 'footer, logo, print, theme, skin, header, colors, color, css',
     'brand_help'                => 'Logo, Site Name',
     'web_brand'                 => 'Web Branding Type',
     'about_settings_title'      => 'Ang Tungkol sa mga Setting',
@@ -276,6 +286,8 @@ return [
     'two_factor_enrollment_text'	=> "Ang Two factor authentication ay kinakailangan, gayunpaman ang iyong device ay hindi ma na-enroll. Buksan mo ang itong Google Authenticator app at i-scan ang QR code sa ibaba para ma-enroll ang iyong device. Kapag na-enroll na ang device. i-enter ang code sa ibaba",
     'require_accept_signature'      => 'Nangangailangan ng Pag-lagda',
     'require_accept_signature_help_text'      => 'Sa pagpapagana ng katangian nito ay nangangailangan sa mga gumagamit na pisikal na mag-sign off sa pagtanggap ng isang asset.',
+    'require_checkinout_notes'  => 'Require Notes on Checkin/Checkout',
+    'require_checkinout_notes_help_text'    => 'Enabling this feature will require the note fields to be populated when checking in or checking out an asset.',
     'left'        => 'kaliwa',
     'right'        => 'kanan',
     'top'        => 'itaas',
@@ -313,24 +325,24 @@ return [
     'filter_by_keyword' => 'Filter by setting keyword',
     'security' => 'Security',
     'security_title' => 'Update Security Settings',
-    'security_keywords' => 'password, passwords, requirements, two factor, two-factor, common passwords, remote login, logout, authentication',
     'security_help' => 'Two-factor, Password Restrictions',
-    'groups_keywords' => 'permissions, permission groups, authorization',
     'groups_help' => 'Account permission groups',
     'localization' => 'Localization',
     'localization_title' => 'Update Localization Settings',
-    'localization_keywords' => 'localization, currency, local, locale, time zone, timezone, international, internatinalization, language, languages, translation',
     'localization_help' => 'Language, date display',
     'notifications' => 'Notifications',
     'notifications_help' => 'Email Alerts & Audit Settings',
     'asset_tags_help' => 'Incrementing and prefixes',
     'labels' => 'Labels',
     'labels_title' => 'Update Label Settings',
-    'labels_help' => 'Label sizes &amp; settings',
-    'purge_keywords' => 'permanently delete',
+    'labels_help' => 'Barcodes &amp; label settings',
     'purge_help' => 'Ang mga Rekords na Nai-delete sa Pag-purge',
     'ldap_extension_warning' => 'It does not look like the LDAP extension is installed or enabled on this server. You can still save your settings, but you will need to enable the LDAP extension for PHP before LDAP syncing or login will work.',
     'ldap_ad' => 'LDAP/AD',
+    'ldap_test_label' => 'Test LDAP Sync',
+    'ldap_test_login' => ' Test LDAP Login',
+    'ldap_username_placeholder' => 'LDAP Username',
+    'ldap_password_placeholder' => 'LDAP Password',
     'employee_number' => 'Employee Number',
     'create_admin_user' => 'Create a User ::',
     'create_admin_success' => 'Success! Your admin user has been added!',
@@ -342,6 +354,8 @@ return [
     'setup_migration_create_user' => 'Next: Create User',
     'ldap_settings_link' => 'LDAP Settings Page',
     'slack_test' => 'Test <i class="fab fa-slack"></i> Integration',
+    'status_label_name' => 'Status Label Name',
+    'super_admin_only'  => 'Super Admin Only',
     'label2_enable'           => 'New Label Engine',
     'label2_enable_help'      => 'Switch to the new label engine. <b>Note: You will need to save this setting before setting others.</b>',
     'label2_template'         => 'Template',
@@ -356,12 +370,15 @@ return [
     'label2_2d_type'          => 'Ang Uri ng 2D Barcode',
     'label2_2d_type_help'     => 'Format for 2D barcodes',
     'label2_2d_target'        => '2D Barcode Target',
-    'label2_2d_target_help'   => 'The URL the 2D barcode points to when scanned',
+    'label2_2d_target_help'   => 'The data that will be contained in the 2D barcode',
     'label2_fields'           => 'Field Definitions',
     'label2_fields_help'      => 'Fields can be added, removed, and reordered in the left column. For each field, multiple options for Label and DataSource can be added, removed, and reordered in the right column.',
+    'purge_barcodes' => 'Purge Barcodes',
     'help_asterisk_bold'    => 'Text entered as <code>**text**</code> will be displayed as bold',
     'help_blank_to_use'     => 'Leave blank to use the value from <code>:setting_name</code>',
     'help_default_will_use' => '<code>:default</code> will use the value from <code>:setting_name</code>. <br>Note that the value of the barcodes must comply with the respective barcode spec in order to be successfully generated. Please see <a href="https://snipe-it.readme.io/docs/barcodes">the documentation <i class="fa fa-external-link"></i></a> for more details. ',
+    'asset_id'              => 'Asset ID',
+    'data'               => 'Data',
     'default'               => 'Default',
     'none'                  => 'None',
     'google_callback_help' => 'This should be entered as the callback URL in your Google OAuth app settings in your organization&apos;s <strong><a href="https://console.cloud.google.com/" target="_blank">Google developer console <i class="fa fa-external-link" aria-hidden="true"></i></a></strong>.',
@@ -373,7 +390,100 @@ return [
     'database_driver' => 'Database Driver',
     'bs_table_storage' => 'Table Storage',
     'timezone' => 'Timezone',
+    'test_mail' => 'Test Mail',
     'profile_edit'          => 'Edit Profile',
     'profile_edit_help'          => 'Allow users to edit their own profiles.',
+    'default_avatar' => 'Custom Default Avatar',
+    'default_avatar_help' => 'This image will be displayed as a profile if a user does not have a profile photo.',
+    'restore_default_avatar' => 'Restore <a href=":default_avatar" data-toggle="lightbox" data-type="image">original system default avatar</a>',
+    'restore_default_avatar_help' => '',
+    'due_checkin_days' => 'Due For Checkin Warning',
+    'due_checkin_days_help' => 'How many days before the expected checkin of an asset should it be listed in the "Due for checkin" page?',
+    'no_groups' => 'No groups have been created yet. Visit <code>Admin Settings > Permission Groups</code> to add one.',
+    'text' => 'Text',
+
+    'username_formats' => [
+        'username_format'		=> 'Ang Pormat sa Pangalan ng Gumagamit',
+        'firstname_lastname_format'	=> 'Unang Pangalan Huling Pangalan (jane.smith)',
+        'first_name_format'	        => 'First Name (jane)',
+        'last_name_format'		=> 'Last Name (doe)',
+        'filastname_format'			=> 'First Initial Last Name (jsmith)',
+        'lastnamefirstinitial_format' =>  'Last Name First Initial (smithj)',
+        'firstname_lastname_underscore_format' => 'First Name Last Name (jane_smith)',
+        'firstinitial.lastname' => 'First Initial Last Name (j.smith)',
+        'lastname_firstinitial' => 'Last Name First Initial (smith_j)',
+        'lastname_dot_firstinitial_format' => 'Last Name First Initial (smith.j)',
+        'firstnamelastname'     => 'First Name Last Name (janesmith)',
+        'firstnamelastinitial'  => 'First Name Last Initial (janes)',
+        'lastnamefirstname'      => 'Last Name.First Name (smith.jane)',
+    ],
+
+    'email_formats' => [
+        'email_format'			=> 'Ang Pormat ng Email',
+        'firstname_lastname_format'	=> 'Unang Pangalan Huling Pangalan (jane.smith@example.com)',
+        'first_name_format'		=> 'Ang Unang Pangalan (jane@example.com)',
+        'last_name_format'		=> 'Last Name (doe@example.com)',
+        'filastname_format'			=> 'Ang Unang Inisyal Huling Pangalan (jsmith@example.com)',
+        'lastnamefirstinitial_format' =>  'Last Name First Initial (smithj@example.com)',
+        'firstname_lastname_underscore_format' => 'Unang Pangalan Huling Pangalan (jane.smith@example.com)',
+        'firstinitial.lastname' => 'First Initial Last Name (j.smith@example.com)',
+        'lastname_firstinitial' => 'Last Name First Initial (smith_j@example.com)',
+        'lastname_dot_firstinitial_format' => 'Last Name First Initial (smith.j@example.com)',
+        'firstnamelastname'     => 'First Name Last Name (janesmith@example.com)',
+        'firstnamelastinitial'  => 'First Name Last Initial (janes@example.com)',
+        'lastnamefirstname'      => 'Last Name.First Name (smith.jane@example.com)',
+    ],
+
+
+
+    'logo_labels' => [
+        'acceptance_pdf_logo'       => 'PDF Logo',
+        'email_logo'                => 'Email Logo',
+        'label_logo'                => 'Label Logo',
+        'logo'                      => 'Site Logo',
+        'favicon'                   => 'Favicon',
+    ],
+
+    'logo_help' => [
+        'email_logo_size'       => 'Square logos in email look best. ',
+    ],
+
+    'logo_option_types' => [
+        'text' => 'Text',
+        'logo' => 'Ang Logo',
+        'logo_and_text' => 'Logo and Text',
+    ],
+
+
+    'legends' => [
+        'scoping' => 'Scoping',
+        'formats' => 'Default Formats',
+        'profiles' => 'User Profiles',
+        'eula' => 'EULA & Acceptance Preferences',
+        'misc_display' => 'Miscellaneous Display Options',
+        'email' => 'Email Preferences',
+        'checkin' => 'Checkin Preferences',
+        'dashboard' => 'Login & Dashboard Preferences',
+        'misc' => 'Miscellaneous',
+        'logos' => 'Logos & Display',
+        'colors' => 'Colors & Skins',
+        'footer' => 'Footer Preferences',
+        'security' => 'Security Preferences',
+        'general' => 'General',
+        'intervals' => 'Intervals & Thresholds',
+    ],
+
+
+    /* Keywords for settings overview help */
+    'keywords' => [
+        'brand'             => 'footer, logo, print, theme, skin, header, colors, color, css',
+        'general_settings'  => 'company support, signature, acceptance, email format, username format, images, per page, thumbnail, eula, gravatar, tos, dashboard, privacy',
+        'groups'            => 'permissions, permission groups, authorization',
+        'labels'            => 'labels, barcodes, barcode, sheets, print, upc, qr, 1d, 2d',
+        'localization'      => 'localization, currency, local, locale, time zone, timezone, international, internatinalization, language, languages, translation',
+        'php_overview'      => 'phpinfo, system, info',
+        'purge'             => 'permanently delete',
+        'security'          => 'password, passwords, requirements, two factor, two-factor, common passwords, remote login, logout, authentication',
+    ],
 
 ];
diff --git a/resources/lang/fil-PH/admin/settings/message.php b/resources/lang/fil-PH/admin/settings/message.php
index 8e7fb2afa1..215c4dbff9 100644
--- a/resources/lang/fil-PH/admin/settings/message.php
+++ b/resources/lang/fil-PH/admin/settings/message.php
@@ -14,6 +14,9 @@ return [
         'restore_warning'       => 'Yes, restore it. I acknowledge that this will overwrite any existing data currently in the database. This will also log out all of your existing users (including you).',
         'restore_confirm'       => 'Are you sure you wish to restore your database from :filename?'
     ],
+    'restore' => [
+        'success'               => 'Your system backup has been restored. Please log in again.'
+    ],
     'purge' => [
         'error'     => 'Ang error ay nagyari habang nag-purge. ',
         'validation_failed'     => 'Ang iyong kompermasyon sa purge ay hindi tama. Mangyaring i-type ang salitang "DELETE" sa confirmation box.',
@@ -33,6 +36,9 @@ return [
         'testing_authentication' => 'Testing LDAP Authentication...',
         'authentication_success' => 'User authenticated against LDAP successfully!'
     ],
+    'labels' => [
+        'null_template' => 'Label template not found. Please select a template.',
+        ],
     'webhook' => [
         'sending' => 'Sending :app test message...',
         'success' => 'Your :webhook_name Integration works!',
@@ -42,5 +48,12 @@ return [
         'error' => 'Something went wrong. :app responded with: :error_message',
         'error_redirect' => 'ERROR: 301/302 :endpoint returns a redirect. For security reasons, we don’t follow redirects. Please use the actual endpoint.',
         'error_misc' => 'Something went wrong. :( ',
-    ]
+        'webhook_fail' => ' webhook notification failed: Check to make sure the URL is still valid.',
+        'webhook_channel_not_found' => ' webhook channel not found.',
+        'ms_teams_deprecation' => 'The selected Microsoft Teams webhook URL will be deprecated Dec 31st, 2025. Please use a workflow URL. Microsoft\'s documentation on creating a workflow can be found <a href="https://support.microsoft.com/en-us/office/create-incoming-webhooks-with-workflows-for-microsoft-teams-8ae491c7-0394-4861-ba59-055e33f75498" target="_blank"> here.</a>',
+    ],
+    'location_scoping' => [
+        'not_saved' => 'Your settings were not saved.',
+        'mismatch' => 'There is 1 item in the database that need your attention before you can enable location scoping.|There are :count items in the database that need your attention before you can enable location scoping.',
+    ],
 ];
diff --git a/resources/lang/fil-PH/admin/statuslabels/table.php b/resources/lang/fil-PH/admin/statuslabels/table.php
index 16f1ec6b14..5400b7e9c9 100644
--- a/resources/lang/fil-PH/admin/statuslabels/table.php
+++ b/resources/lang/fil-PH/admin/statuslabels/table.php
@@ -1,14 +1,14 @@
 <?php
 
 return array(
-    'about'      	=> 'Tungkol sa Label ng Katayuan',
+    'about'      	=> 'About Status Types',
     'archived'      	=> 'Nailagay na sa Archive',
     'create'      	=> 'Magsagawa ng Label ng Katayuan',
     'color'      	=> 'Ang Kulay ng Chart',
     'default_label' => 'Default Label',
     'default_label_help' => 'This is used to ensure your most commonly used status labels appear at the top of the select box when creating/editing assets.',
     'deployable'      	=> 'Pwedeng Mai-deploy',
-    'info'      	=> 'Ang mga label ng estado o katayuan ay ginagamit sa paglalarawan sa ibat-ibang estado ng iyong mga asset. Ito ay maaaring mailabas para sa pagsasaayos, nawala/ninakaw, atbp. Pwede kang gumawa ng ibang mga label ng estado para ss madaling mai-deploy, hindi natapos at mga na-archive na asset.',
+    'info'      	=> 'Status label types are used to describe the various states your assets could be in. They may be out for repair, lost/stolen, etc. You can create new status labels for your deployable, pending and archived assets according to your own workflow. For more information, <a href="https://snipe-it.readme.io/docs/overview#status-labels" target="_blank">see the documentation <i class="fa fa-external-link"></i></a>.',
     'name'      	=> 'Ang Pangalan ng Estado',
     'pending'      	=> 'Hindi pa natapos',
     'status_type'   => 'Ang Uri ng Katayuan',
diff --git a/resources/lang/fil-PH/admin/users/general.php b/resources/lang/fil-PH/admin/users/general.php
index 434a510eee..30ab0885a2 100644
--- a/resources/lang/fil-PH/admin/users/general.php
+++ b/resources/lang/fil-PH/admin/users/general.php
@@ -19,6 +19,8 @@ return [
     'print_assigned'    => 'I-print ang Lahat ng Nakatalaga',
     'email_assigned'    => 'Email List of All Assigned',
     'user_notified'     => 'User has been emailed a list of their currently assigned items.',
+    'users_notified'    => 'The user has been emailed a list of their currently assigned items.|:count users have been emailed a list of their currently assigned items.',
+    'users_notified_warning' => ':count user has been emailed a list of their currently assigned items, however :no_email users did not have an email address so could not be emailed.|:count users have been emailed a list of their currently assigned items, however :no_email user(s) did not have an email address so could not be emailed.',
     'auto_assign_label' => 'Include this user when auto-assigning eligible licenses',
     'auto_assign_help'  => 'Skip this user in auto assignment of licenses',
     'software_user'     => 'Ang Software ay Nai-check out sa :name',
diff --git a/resources/lang/fil-PH/admin/users/message.php b/resources/lang/fil-PH/admin/users/message.php
index 2432c53e4a..05dcd9b40b 100644
--- a/resources/lang/fil-PH/admin/users/message.php
+++ b/resources/lang/fil-PH/admin/users/message.php
@@ -6,7 +6,7 @@ return array(
     'declined'                  => 'Matagumpay mong hindi tinaggap ang asset na ito.',
     'bulk_manager_warn'	        => 'Ang iyong mga user ay matagumpay nang nai-update, subalit ang iyong manager entry ay hindi nai-save dahil ang manager na iyong pinili ay kabilang sa listahan ng user na kailangang i-edit, at ang mga user ay maaaring wala sa sarili nilang pamamahala. Mangyaring pumiling muli ng iyong user, hindi kasama ang manager.',
     'user_exists'               => 'Ang user ay umiiral na!',
-    'user_not_found'            => 'Ang gumagamit ay hindi umiiral.',
+    'user_not_found'            => 'User does not exist or you do not have permission view them.',
     'user_login_required'       => 'Ang field ng login ay kinakailangan',
     'user_has_no_assets_assigned' => 'No assets currently assigned to user.',
     'user_password_required'    => 'Ang password ay kinakailangan.',
@@ -54,6 +54,7 @@ return array(
         'ldap_could_not_search' => 'Hindi makapaghanap ng serber ng LDAP. Mangyaring suriin ang iyong konpigurasyon ng serber ng LDAP sa LDAP config file. <br>may error mula sa Serber ng LDAP:',
         'ldap_could_not_get_entries' => 'Hindi makakuha ng entry mula sa serber ng LDAP. Mangyaring surrin ang iyong konpigurasyon ng serber ng LDAP sa LDAP config file. <br>May-error mula sa Serber ng LDAP:',
         'password_ldap' => 'Ang password sa account na ito ay pinamahalaan ng LDAP/Actibong Direktorya. Mangyaring komontak sa iyong IT department para baguhin ang iyong password. ',
+        'multi_company_items_assigned' => 'This user has items assigned that belong to a different company. Please check them in or edit their company.'
     ),
 
     'deletefile' => array(
diff --git a/resources/lang/fil-PH/admin/users/table.php b/resources/lang/fil-PH/admin/users/table.php
index 19f4ac1d99..cbbe9f2bde 100644
--- a/resources/lang/fil-PH/admin/users/table.php
+++ b/resources/lang/fil-PH/admin/users/table.php
@@ -22,7 +22,7 @@ return array(
     'managed_locations'     => 'Ang Pinamahalaang mga Lokasyon',
     'managed_users'         => 'Managed Users',
     'name' 					=> 'Pangalan',
-    'nogroup'               => 'No groups have been created yet. To add one, visit: ',
+    'nogroup'               => 'No groups have been created yet. To add one, visit:',
     'notes'                 => 'Ang mga Paalala',
     'password_confirm' 		=> 'I-komperma ang Password',
     'password' 				=> 'Ang Password',
diff --git a/resources/lang/fil-PH/auth.php b/resources/lang/fil-PH/auth.php
index db310aa1bb..14d8acfce0 100644
--- a/resources/lang/fil-PH/auth.php
+++ b/resources/lang/fil-PH/auth.php
@@ -15,6 +15,6 @@ return array(
 
     'failed' => 'These credentials do not match our records.',
     'password' => 'The provided password is incorrect.',
-    'throttle' => 'Too many login attempts. Please try again in :seconds seconds.',
+    'throttle' => 'Too many login attempts. Please try again in :minutes minute(s).',
 
 );
diff --git a/resources/lang/fil-PH/auth/general.php b/resources/lang/fil-PH/auth/general.php
index bce96a2346..31d1e992c8 100644
--- a/resources/lang/fil-PH/auth/general.php
+++ b/resources/lang/fil-PH/auth/general.php
@@ -11,8 +11,8 @@ return [
     'ldap_reset_password'           => 'Please click here to reset your LDAP password',
     'remember_me'                   => 'Tandaan ako',
     'username_help_top'                 => 'Enter your <strong>username</strong> to be emailed a password reset link.',
-    'username_help_bottom'          => 'Your username and email address <em>may</em> be the same, but may not be, depending on your configuration. If you cannot remember your username, contact your administrator. <br><br><strong>Usernames without an associated email address will not be emailed a password reset link.</strong> ',
-    'google_login'                  => 'Login with Google Workspace',
+    'username_help_bottom'          => 'Ang iyong username at email address <em>ay maaaring</em> pareho, ngunit maaaring hindi, depende sa iyong configuration. Kung hindi mo maalala ang iyong username, kontakin ang iyong administrator. <br><br><strong>Ang mga Username na walang kaugnay na email address ay hindi makakatanggap ng email ng password reset link.</strong> ',
+    'google_login'                  => 'Mag-login gamit ang Google Workspace',
     'google_login_failed'           => 'Google Login failed, please try again.',
 ];
 
diff --git a/resources/lang/fil-PH/auth/message.php b/resources/lang/fil-PH/auth/message.php
index dec973c539..b7f1ccde9a 100644
--- a/resources/lang/fil-PH/auth/message.php
+++ b/resources/lang/fil-PH/auth/message.php
@@ -6,11 +6,9 @@ return array(
     'account_not_found'      => 'Ang pangalan ng gumagamit o password ay hindi wasto.',
     'account_not_activated'  => 'Hindi napagana ang account ng user na ito.',
     'account_suspended'      => 'Ang account ng user na ito ay suspendido.',
-    'account_banned'         => 'Ang account ng user na ito ay nai-ban.',
-    'throttle'               => 'Too many failed login attempts. Please try again in :minutes minutes.',
 
     'two_factor' => array(
-        'already_enrolled'      => 'Your device is already enrolled.',
+        'already_enrolled'      => 'Ang iyong device ay nakarehistro na.',
         'success'               => 'Ikaw ay matagumay na naka-log in.',
         'code_required'         => 'Two-factor code is required.',
         'invalid_code'          => 'Two-factor code is invalid.',
diff --git a/resources/lang/fil-PH/button.php b/resources/lang/fil-PH/button.php
index 645261a740..c8a7c814e4 100644
--- a/resources/lang/fil-PH/button.php
+++ b/resources/lang/fil-PH/button.php
@@ -7,6 +7,7 @@ return [
     'checkin_and_delete'  	    => 'Checkin All / Delete User',
     'delete'  	                => 'I-delete',
     'edit'    	                => 'I-edit',
+    'clone'    	                => 'Clone',
     'restore' 	                => 'Ibalik sa dati',
     'remove'                    => 'Remove',
     'request'                   => 'Mga Rekwest',
@@ -21,4 +22,13 @@ return [
     'add_maintenance'           => 'Add Maintenance',
     'append'                    => 'Append',
     'new'                       => 'Bago',
+    'var' => [
+        'clone'     => 'Clone :item_type',
+        'edit'      => 'Edit :item_type',
+        'delete'    => 'Delete :item_type',
+        'restore'   => 'Restore :item_type',
+        'create'    => 'Create New :item_type',
+        'checkout'  => 'Checkout :item_type',
+        'checkin'   => 'Checkin :item_type',
+    ]
 ];
diff --git a/resources/lang/fil-PH/general.php b/resources/lang/fil-PH/general.php
index 3804fe3847..46c9d051ab 100644
--- a/resources/lang/fil-PH/general.php
+++ b/resources/lang/fil-PH/general.php
@@ -10,7 +10,7 @@ return [
     'action'                => 'Aksyon',
     'activity_report'		=> 'Ang Ulat sa Aktibidad',
     'address'				=> 'Ang Address',
-    'admin'					=> 'Ang admin',
+    'admin'					=> 'Admin Settings',
     'admin_tooltip'			=> 'This user has admin privileges',
     'superuser'				=> 'Superuser',
     'superuser_tooltip'		=> 'This user has superuser privileges',
@@ -23,13 +23,16 @@ return [
     'asset_models'			=> 'Ang mga Model ng Asset',
     'asset_model'			=> 'Ang modelo',
     'asset'					=> 'Ang Asset',
+    'asset_previous'        => 'Asset (Previously Assigned)',
     'asset_report'          => 'Ang Report ng Asset',
     'asset_tag'				=> 'Ang Tag ng Asset',
     'asset_tags'            => 'Asset Tags',
     'assets_available'		=> 'Assets available',
     'accept_assets'         => 'Accept Assets :name',
     'accept_assets_menu'    => 'Accept Assets',
+    'accept_item'           => 'Accept Item',
     'audit'				    => 'Ang Audit',
+    'audits'				=> 'Audits',
     'audit_report'			=> 'Ang Log ng Audit',
     'assets'				=> 'Ang mga Assets',
     'assets_audited'        => 'assets audited',
@@ -61,9 +64,12 @@ return [
     'changepassword'  		=> 'Baguhin ang Password',
     'checkin'  				=> 'I-checkin',
     'checkin_from'  		=> 'Nag-checkin mula sa',
+    'checkin_note'  		=> 'Checkin Note',
+    'checkout_note'  		=> 'Checkout Note',
     'checkout'  			=> 'Nag-checkout',
     'checkouts_count'       => 'Checkouts',
     'checkins_count'        => 'Checkins',
+    'checkin_and_delete'  	=> 'Checkin and Delete',
     'user_requests_count'   => 'Requests',
     'city'  				=> 'Siyudad',
     'click_here'			=> 'Mag-klik dito',
@@ -77,7 +83,7 @@ return [
     'consumables'			=> 'Mga pwedeng ikonsumo',
     'country'  				=> 'Ang Bansa',
     'could_not_restore'     => 'Error restoring :item_type: :error',
-    'not_deleted'           => 'The :item_type is not deleted so it cannot be restored',
+    'not_deleted'           => 'The :item_type was not deleted and therefore cannot be restored',
     'create'				=> 'Magsagawa ng Bago',
     'created'               => 'Ang Naisagawang Aytem',
     'created_asset'			=> 'ang naisagawang asset',
@@ -86,11 +92,13 @@ return [
     'record_created' 		=> 'Record Created',
     'updated_at' 			=> 'Na-update sa',
     'currency'  			=> '$', // this is deprecated
+    'currency_text'  		=> 'Currency', //
     'current'  				=> 'Ang kasalukuyan',
-    'current_password'      => 'Current Password',
+    'current_password'      => 'Kasalukuyang Password',
     'customize_report'      => 'Customize Report',
     'custom_report'         => 'I-kustom ang Report ng Asset',
     'dashboard'				=> 'Ang Dashboard',
+    'data_source'           => 'Data Source',
     'days'      			=> 'mga araw',
     'days_to_next_audit'    => 'Mga Araw para sa Sumusunod na Audit',
     'date'					=> 'Ang Petsa',
@@ -98,7 +106,7 @@ return [
     'debug_warning_text'    => 'Ang applilasyon na ito ay tumatakbo sa produksyon na may pagpapagana sa pag-debug. ito ay ma-expose sa sensitibong datus kapag ang iyong aplikasyon ay madaling ma-akses sa labas ng mundo. Huwag paganahin ang debug mode sa pamamagitan pag-set sa <code>APP_DEBUG</code> balyu ng iyong <code>.env</code> file sa <code>false</code>.',
     'delete'  				=> 'I-delete',
     'delete_confirm'  		=> 'Are you sure you wish to delete :item?',
-    'delete_confirm_no_undo' => 'Are you sure you wish to delete :item? This can not be undone.',
+    'delete_confirm_no_undo' => 'Are you sure, you wish to delete :item? This cannot be undone.',
     'deleted'  				=> 'Nai-delete na',
     'delete_seats'  		=> 'Ang Nai-delete na mga Seats',
     'deletion_failed'       => 'Deletion failed',
@@ -114,29 +122,13 @@ return [
     'editprofile'  			=> 'I-edit ang Iyong Propayl',
     'eol'					=> 'Ang EOL',
     'email_domain'			=> 'Ang Dominyo ng Email',
-    'email_format'			=> 'Ang Pormat ng Email',
     'employee_number'       => 'Employee Number',
     'email_domain_help'		=> 'Ito ay ginagamit para makapagsagawa ng email address kapag mag-import',
     'error'				    => 'Error',
     'exclude_archived'      => 'Exclude Archived Assets',
     'exclude_deleted'       => 'Exclude Deleted Assets',
-    'example'				=> 'Example: ',
-    'filastname_format'			=> 'Ang Unang Inisyal Huling Pangalan (jsmith@example.com)',
-    'firstname_lastname_format'	=> 'Unang Pangalan Huling Pangalan (jane.smith@example.com)',
-    'firstname_lastname_underscore_format' => 'Unang Pangalan Huling Pangalan (jane.smith@example.com)',
-    'lastnamefirstinitial_format' =>  'Last Name First Initial (smithj@example.com)',
-    'firstintial_dot_lastname_format' => 'First Initial Last Name (j.smith@example.com)',
-    'firstname_lastname_display'	=> 'First Name Last Name (Jane Smith)',
-    'lastname_firstname_display'	=> 'Last Name First Name (Smith Jane)',
-    'name_display_format'	=> 'Name Display Format',
-    'first'					=> 'Una',
-    'firstnamelastname'     => 'First Name Last Name (janesmith@example.com)',
-    'lastname_firstinitial' => 'Last Name First Initial (smith_j@example.com)',
-    'firstinitial.lastname' => 'First Initial Last Name (j.smith@example.com)',
-    'firstnamelastinitial'  => 'First Name Last Initial (janes@example.com)',
-    'lastnamefirstname'      => 'Last Name First Name (smith.jane@example.com)',
-    'first_name'			=> 'Ang Unang Pangalan',
-    'first_name_format'		=> 'Ang Unang Pangalan (jane@example.com)',
+    'example'				=> 'Halimbawa: ',
+
     'files'                 => 'Ang mga file',
     'file_name'				=> 'Ang File',
     'file_type'             => 'File Type',
@@ -156,9 +148,9 @@ return [
     'image_delete'         	=> 'I-delete ang Imahe',
     'include_deleted'       => 'Include Deleted Assets',
     'image_upload'         	=> 'I-upload ang Imahe',
-    'filetypes_accepted_help'    => 'Accepted filetype is :types. Max upload size allowed is :size.|Accepted filetypes are :types. Max upload size allowed is :size.',
-    'filetypes_size_help'   => 'Max upload size allowed is :size.',
-    'image_filetypes_help'  => 'Accepted filetypes are jpg, webp, png, gif, svg, and avif. Max upload size allowed is :size.',
+    'filetypes_accepted_help'    => 'Accepted filetype is :types. The maximum size allowed is :size.|Accepted filetypes are :types. The maximum upload size allowed is :size.',
+    'filetypes_size_help'   => 'The maximum upload size allowed is :size.',
+    'image_filetypes_help'  => 'Accepted Filetypes are jpg, webp, png, gif, svg, and avif. The maximum upload size allowed is :size.',
     'unaccepted_image_type'  => 'This image file was not readable. Accepted filetypes are jpg, webp, png, gif, and svg. The mimetype of this file is: :mimetype.',
     'import'         	    => 'I-import',
     'import_this_file'      => 'Map fields and process this file',
@@ -178,12 +170,17 @@ return [
     'last'					=> 'Huli',
     'last_login'            => 'Ang Huling Pag-login',
     'last_name'             => 'Ang Huling Pangalan',
+    'firstname_lastname_display'	=> 'First Name Last Name (Jane Smith)',
+    'lastname_firstname_display'	=> 'Last Name First Name (Smith Jane)',
+    'name_display_format'	=> 'Name Display Format',
+    'first'					=> 'Una',
+    'first_name'			=> 'Ang Unang Pangalan',
     'license'				=> 'Ang Lisensya',
     'license_report'        => 'Ang Report ng Lisensya',
     'licenses_available'	=> 'Licenses available',
     'licenses'				=> 'Ang mga lisensya',
     'list_all'				=> 'Ilista ang Lahat',
-    'loading'				=> 'Loading... please wait....',
+    'loading'				=> 'Loading... please wait...',
     'lock_passwords'        => 'This field value will not be saved in a demo installation.',
     'feature_disabled'      => 'Ang katangiang ito ay hindi na pinagana sa demo ng pag-install.',
     'location'              => 'Ang Lokasyon',
@@ -193,7 +190,7 @@ return [
     'logout'				=> 'Mag-logout',
     'lookup_by_tag'     => 'Maghanap sa pamamagitan ng Asset Tag',
     'maintenances'          => 'Ang mga Pagpapanatili',
-    'manage_api_keys'       => 'Manage API Keys',
+    'manage_api_keys'       => 'Manage API keys',
     'manufacturer'			=> 'Ang Tagapagsagawa',
     'manufacturers'			=> 'Ang mga Tagapagsagawa',
     'markdown'				=> 'Ang field na ito ay nagpapahintulot sa iyo na <a href="https://help.github.com/articles/github-flavored-markdown/">Github flavored na markdown</a>.',
@@ -215,6 +212,14 @@ return [
     'no_results'			=> 'Walang mga Resulta.',
     'no'  					=> 'Hindi',
     'notes'  				=> 'Ang mga Paalala',
+    'note_added'            => 'Note Added',
+    'options'				=> 'Options',
+    'preview'				=> 'Preview',
+    'add_note'              => 'Add Note',
+    'note_edited'            => 'Note Edited',
+    'edit_note'              => 'Edit Note',
+    'note_deleted'            => 'Note Deleted',
+    'delete_note'              => 'Delete Note',
     'order_number'          => 'Ang Numero ng Pagkakasunod-sunod',
     'only_deleted'          => 'Only Deleted Assets',
     'page_menu'				=> 'Ipinapakita_MENU_mga aytem',
@@ -229,7 +234,7 @@ return [
     'purchase_date'         => 'Ang Petsa ng Pagbili',
     'qty'		            => 'Ang QTY',
     'quantity'		        => 'Ang Dami',
-    'quantity_minimum'      => 'You have :count items below or almost below minimum quantity levels',
+    'quantity_minimum'      => 'You have one item below or almost below minimum quantity levels|You have :count items below or almost below minimum quantity levels',
     'quickscan_checkin'  	=> 'Quick Scan Checkin',
     'quickscan_checkin_status'  	=> 'Checkin Status',
     'ready_to_deploy'		=> 'Handa nang I-deploy',
@@ -254,7 +259,7 @@ return [
     'select_all'            => 'Select All',
     'search'				=> 'Maghanap',
     'select_category'       => 'Pumili ng Kategorya',
-    'select_datasource' => 'Select a Datasource',
+    'select_datasource' => 'Select a data source',
     'select_department'     => 'Pumili ng Departamento',
     'select_depreciation'	=> 'Pumili ng Tipo ng Depresasyon',
     'select_location'		=> 'Pumili ng Lokasyon',
@@ -274,13 +279,15 @@ return [
     'signed_off_by'         => 'Signed Off By',
     'skin'       			=> 'Skin',
     'webhook_msg_note'        => 'A notification will be sent via webhook',
-    'webhook_test_msg'        => 'Oh hai! Looks like your :app integration with Snipe-IT is working!',
+    'webhook_test_msg'        => 'Oh hai! It looks like your :app integration with Snipe-IT is working!',
     'some_features_disabled' => 'DEMO MODE: Ang iilang mga katangian ay na-disable para sa pag-install na ito.',
     'site_name'				=> 'Ang Pangalan ng Site',
     'state'  				=> 'Ang Estado',
     'status_labels'			=> 'Ang mga Label ng Katayuan',
+    'status_label'			=> 'Status Label',
     'status'    			=> 'Ang Katayuan',
     'accept_eula'           => 'Acceptance Agreement',
+    'show_or_hide_eulas' => 'Show/Hide EULAs',
     'supplier'              => 'Ang Tagapagsuplay',
     'suppliers'  			=> 'Ang mga Tagapagsuplay',
     'sure_to_delete'        => 'Sigurado kaba na gusto mong i-delete',
@@ -296,9 +303,9 @@ return [
     'type'  				=> 'Ang Tipo',
     'undeployable'			=> 'Hindi pwedeng i-depoy',
     'unknown_admin'			=> 'Hindi matukoy na Admin',
-    'username_format'		=> 'Ang Pormat sa Pangalan ng Gumagamit',
     'username'              => 'Ang pangalan ng gumagamit',
     'update'                => 'I-update',
+    'updating_item' => 'Updating :item',
     'upload_filetypes_help'      => 'Allowed filetypes are png, gif, jpg, jpeg, doc, docx, pdf, xls, xlsx, txt, lic, xml, zip, rtf and rar. Max upload size allowed is :size.',
     'uploaded'              => 'Nai-upload',
     'user'					=> 'Ang gumagamit',
@@ -323,10 +330,10 @@ return [
     'token_expired'         => 'Ang iyong sesyon ng form ay na-expire na. Mangyaring subukang muli.',
     'login_enabled'         => 'Login Enabled',
     'audit_due'             => 'Due for Audit',
-    'audit_due_days'        => 'Assets Due for Audit Within :days Day|Assets Due for Audit Within :days Days',
+    'audit_due_days'        => '{}Assets Due or Overdue for Audit|[1]Assets Due or Overdue for Audit Within a Day|[2,*]Assets Due or Overdue for Audit Within :days Days',
     'checkin_due'           => 'Due for Checkin',
     'checkin_overdue'       => 'Overdue for Checkin',
-    'checkin_due_days'      => 'Assets Due for Checkin Within :days Day|Assets Due for Checkin Within :days Days',
+    'checkin_due_days'      => '{}Due for Checkin|[1]Assets Due for Checkin Within :days Day|[2,*]Assets Due for Checkin Within :days Days',
     'audit_overdue'         => 'Overdue for Audit',
     'accept'                => 'Accept :asset',
     'i_accept'              => 'I accept',
@@ -339,16 +346,16 @@ return [
     'view_all'              => 'view all',
     'hide_deleted'          => 'Hide Deleted',
     'email'                 => 'Ang Email',
-    'do_not_change'         => 'Do Not Change',
-    'bug_report'            => 'Report a Bug',
+    'do_not_change'         => 'Do not change',
+    'bug_report'            => 'Report a bug',
     'user_manual'           => 'User\'s Manual',
     'setup_step_1'          => 'Step 1',
     'setup_step_2'          => 'Step 2',
     'setup_step_3'          => 'Step 3',
     'setup_step_4'          => 'Step 4',
     'setup_config_check'    => 'Configuration Check',
-    'setup_create_database' => 'Create Database Tables',
-    'setup_create_admin'    => 'Create Admin User',
+    'setup_create_database' => 'Create database tables',
+    'setup_create_admin'    => 'Create an admin user',
     'setup_done'            => 'Finished!',
     'bulk_edit_about_to'    => 'You are about to edit the following: ',
     'checked_out'           => 'Nai-check Out',
@@ -383,6 +390,8 @@ return [
     'new_license'           => 'New License',
     'new_accessory'         => 'New Accessory',
     'new_consumable'        => 'New Consumable',
+    'new_component'         => 'New Component',
+    'new_user'              => 'New User',
     'collapse'              => 'Collapse',
     'assigned'              => 'Assigned',
     'asset_count'           => 'Asset Count',
@@ -418,19 +427,20 @@ return [
     'bulk_soft_delete'      =>'Also soft-delete these users. Their asset history will remain intact unless/until you purge deleted records in the Admin Settings.',
     'bulk_checkin_delete_success' => 'Your selected users have been deleted and their items have been checked in.',
     'bulk_checkin_success' => 'The items for the selected users have been checked in.',
-    'set_to_null'           => 'Delete values for this asset|Delete values for all :asset_count assets ',
+    'set_to_null'           => 'Delete values for this selection|Delete values for all :selection_count selections ',
     'set_users_field_to_null'  => 'Delete :field values for this user|Delete :field values for all :user_count users ',
     'na_no_purchase_date'   => 'N/A - No purchase date provided',
     'assets_by_status'      => 'Assets by Status',
     'assets_by_status_type'      => 'Assets by Status Type',
     'pie_chart_type'        => 'Dashboard Pie Chart Type',
     'hello_name'            => 'Hello, :name!',
-    'unaccepted_profile_warning'   => 'You have :count items requiring acceptance. Click here to accept or decline them',
+    'unaccepted_profile_warning'   => 'You have one item requiring acceptance. Click here to accept or decline it | You have :count items requiring acceptance. Click here to accept or decline them',
     'start_date'            => 'Start Date',
     'end_date'            => 'End Date',
     'alt_uploaded_image_thumbnail' => 'Uploaded thumbnail',
     'placeholder_kit'       => 'Select a kit',
     'file_not_found'        => 'File not found',
+    'log_record_not_found'  => 'No record for that log entry was found.',
     'preview_not_available' => '(no preview)',
     'setup'                 => 'Setup',
     'pre_flight'            => 'Pre-Flight',
@@ -512,7 +522,7 @@ return [
     'checked_out_to_fields' => 'Checked Out To Fields',
     'percent_complete' => '% nakompleto na',
     'uploading' => 'Uploading... ',
-    'upload_error' => 'Error uploading file. Please check that there are no empty rows and that no column names are duplicated.',
+    'upload_error' => 'Error uploading file. Please check that you have no empty rows or duplicated column names in your CSV, and that the server permissions allow uploads.',
     'copy_to_clipboard' => 'Copy to Clipboard',
     'copied' => 'Copied!',
     'status_compatibility' => 'If assets are already assigned, they cannot be changed to a non-deployable status type and this value change will be skipped.',
@@ -549,6 +559,71 @@ return [
         'license_seats'  => ':count License Seat|:count License Seats',
         'consumables'  => ':count Consumable|:count Consumables',
         'components'  => ':count Component|:count Components',
-    ]
+    ],
+
+    'more_info' => 'Karagdagang Impormasyon',
+    'quickscan_bulk_help' => 'Checking this box will edit the asset record to reflect this new location. Leaving it unchecked will simply note the location in the audit log. Note that if this asset is checked out, it will not change the location of the person, asset or location it is checked out to.',
+    'whoops' => 'Whoops!',
+    'something_went_wrong' => 'Something went wrong with your request.',
+    'close' => 'Close',
+    'expires' => 'Mawalan ng Bisa',
+    'map_fields'=> 'Map :item_type Fields',
+    'remaining_var' => ':count Remaining',
+    'label' => 'Label',
+    'import_asset_tag_exists' => 'An asset with the asset tag :asset_tag already exists and an update was not requested. No change was made.',
+    'countries_manually_entered_help' => 'Values with an asterisk (*) were manually entered and do not match existing ISO 3166 dropdown values',
+    'accessories_assigned' => 'Assigned Accessories',
+    'user_managed_passwords' => 'Password Management',
+    'user_managed_passwords_disallow' => 'Disallow users from managing their own passwords',
+    'user_managed_passwords_allow' => 'Allow users to manage their own passwords',
+    'from' => 'From',
+    'by' => 'Batay sa',
+
+// Add form placeholders here
+    'placeholders' => [
+        'notes'  => 'Add a note',
+    ],
+
+    'breadcrumb_button_actions' => [
+        'edit_item' => 'Edit :name',
+        'checkout_item' => 'Checkout :name',
+        'checkin_item' => 'Checkin :name',
+    ],
+
+    'skins' => [
+        'site_default' => 'Site Default',
+        'default_blue' => 'Default Blue',
+        'blue_dark' => 'Blue (Dark Mode)',
+        'green' => 'Green Dark',
+        'green_dark' => 'Green (Dark Mode)',
+        'red' => 'Red Dark',
+        'red_dark' => 'Red (Dark Mode)',
+        'orange' => 'Orange Dark',
+        'orange_dark' => 'Orange (Dark Mode)',
+        'black' => 'Black',
+        'black_dark' => 'Black (Dark Mode)',
+        'purple' => 'Purple',
+        'purple_dark' => 'Purple (Dark Mode)',
+        'yellow' => 'Yellow',
+        'yellow_dark' => 'Yellow (Dark Mode)',
+        'high_contrast' => 'High Contrast',
+
+    ],
+
+    'select_all_none' => 'Select/Unselect All',
+    'generic_model_not_found' => 'That :model was not found or you do not have permission to access it',
+    'deleted_models' => 'Deleted Asset Models',
+    'deleted_users' => 'Deleted Users',
+    'cost_each' => ':amount each',
+    'remove_current_image' => 'Remove current :type image',
+
+    'seeding' => [
+        'manufacturers' => [
+            'button' => 'Create Manufacturers',
+            'prompt' => 'You do not have any manufacturers yet. Would you like to seed a list of common manufacturers? (THIS WILL OVERWRITE EXISTING MANUFACTURERS, including those that have been soft-deleted.)',
+            'success' => 'Manufacturers seeded successfully',
+            'error' => 'Could not seed manufacturers. A manufacturer record already exists and seeding would overwrite it.|Could not seed manufacturers. :count manufacturer records already exist and seeding would overwrite them.',
+        ],
+    ],
 
 ];
diff --git a/resources/lang/fil-PH/localizations.php b/resources/lang/fil-PH/localizations.php
index f1232dd138..827ed4fca1 100644
--- a/resources/lang/fil-PH/localizations.php
+++ b/resources/lang/fil-PH/localizations.php
@@ -2,7 +2,7 @@
 
 return [
 
-    'select_language' => 'Select a language',
+    'select_language' => 'Select a Language',
     'languages' => [
         'en-US'=> 'English, US',
         'en-GB'=> 'English, UK',
@@ -40,7 +40,9 @@ return [
         'ms-MY'=> 'Malay',
         'mi-NZ'=> 'Maori',
         'mn-MN'=> 'Mongolian',
-        'no-NO'=> 'Norwegian',
+        'nb-NO'=> 'Norwegian Bokmål',
+        'om-ET' => 'Oromo (Ethiopian)',
+        //'nn-NO'=> 'Norwegian Nynorsk',
         'fa-IR'=> 'Persian',
         'pl-PL'=> 'Polish',
         'pt-PT'=> 'Portuguese',
@@ -66,7 +68,7 @@ return [
         'zu-ZA'=> 'Zulu',
     ],
 
-    'select_country' => 'Select a country',
+    'select_country' => 'Select a Country',
     
     'countries' => [
         'AC'=>'Ascension Island',
@@ -133,6 +135,7 @@ return [
         'EC'=>'Ecuador',
         'EE'=>'Estonia',
         'EG'=>'Egypt',
+        'GB-ENG'=>'England',
         'ER'=>'Eritrea',
         'ES'=>'Spain',
         'ET'=>'Ethiopia',
@@ -231,6 +234,7 @@ return [
         'NG'=>'Nigeria',
         'NI'=>'Nicaragua',
         'NL'=>'Netherlands',
+        'GB-NIR' => 'Northern Ireland',
         'NO'=>'Norway',
         'NP'=>'Nepal',
         'NR'=>'Nauru',
@@ -258,7 +262,7 @@ return [
         'RU'=>'Russian Federation',
         'RW'=>'Rwanda',
         'SA'=>'Saudi Arabia',
-        'UK'=>'Scotland',
+        'GB-SCT'=>'Scotland',
         'SB'=>'Solomon Islands',
         'SC'=>'Seychelles',
         'SS'=>'South Sudan',
@@ -310,6 +314,7 @@ return [
         'VI'=>'Virgin Islands (U.S.)',
         'VN'=>'Viet Nam',
         'VU'=>'Vanuatu',
+        'GB-WLS' =>'Wales',
         'WF'=>'Wallis And Futuna Islands',
         'WS'=>'Samoa',
         'YE'=>'Yemen',
diff --git a/resources/lang/fil-PH/mail.php b/resources/lang/fil-PH/mail.php
index c192c9c3a0..e18de01943 100644
--- a/resources/lang/fil-PH/mail.php
+++ b/resources/lang/fil-PH/mail.php
@@ -23,24 +23,25 @@ return [
     'Item_Requested' => 'Ang Nirekwest na Aytem',
     'License_Checkin_Notification' => 'License checked in',
     'License_Checkout_Notification' => 'License checked out',
+    'license_for'   => 'License for',
     'Low_Inventory_Report' => 'Ang Mababang Report ng Imbentaryo',
     'a_user_canceled' => 'Ang gumagamit o user ay nag-kansela ng rekwest na aytem sa website',
     'a_user_requested' => 'Ang gumagamit ay nag-rekwest ng aytem sa website',
     'acceptance_asset_accepted' => 'A user has accepted an item',
     'acceptance_asset_declined' => 'A user has declined an item',
-    'accessory_name' => 'Ang Pangalan ng Aksesorya:',
-    'additional_notes' => 'Ang mga Karagdagang mga Lista:',
+    'accessory_name' => 'Ang Pangalan ng Aksesorya',
+    'additional_notes' => 'Ang mga Karagdagang mga Lista',
     'admin_has_created' => 'Ang tagapangasiwa ay nakapagsagawa ng isang account para sa iyo sa :web website.',
-    'asset' => 'Ang Asset:',
-    'asset_name' => 'Ang Pangalan ng Asset:',
+    'asset' => 'Ang Asset',
+    'asset_name' => 'Ang Pangalan ng Asset',
     'asset_requested' => 'Ang nirekwest na asset',
     'asset_tag' => 'Ang Tag ng Asset',
     'assets_warrantee_alert' => 'There is :count asset with a warranty expiring in the next :threshold days.|There are :count assets with warranties expiring in the next :threshold days.',
     'assigned_to' => 'Nakatalaga Sa',
     'best_regards' => 'Lubos na bumabati,',
-    'canceled' => 'Nakansela:',
-    'checkin_date' => 'Ang Petsa ng Pag-checkin:',
-    'checkout_date' => 'Ang Petsa ng Pag-checkout:',
+    'canceled' => 'Nakansela',
+    'checkin_date' => 'Ang Petsa ng Pag-checkin',
+    'checkout_date' => 'Ang Petsa ng Pagcheck-out',
     'checkedout_from' => 'Checked out from',
     'checkedin_from'  => 'Checked in from',
     'checked_into' => 'Checked into',
@@ -49,27 +50,30 @@ return [
     'click_to_confirm' => 'Paki-klik sa mga sumusunod na link para i-komperma ang iyong :web account:',
     'current_QTY' => 'Ang kasalukuyang QTY',
     'days' => 'Mga araw',
-    'expecting_checkin_date' => 'Ang Inaasahang Petsa ng Pag-checkin:',
+    'expecting_checkin_date' => 'Ang Inaasahang Petsa ng Pag-checkin',
     'expires' => 'Mawalang bisa',
     'hello' => 'Kumusta',
     'hi' => 'Kumusta',
     'i_have_read' => 'Ako ay nakabasa ay sumasang-ayon sa mga tuntunin ng paggamit, at ang aytem na ito ay aking tinatanggap.',
     'inventory_report' => 'Inventory Report',
-    'item' => 'Aytem:',
+    'item' => 'Ang Aytem',
+    'item_checked_reminder' => 'This is a reminder that you currently have :count items checked out to you that you have not accepted or declined. Please click the link below to confirm your decision.',
     'license_expiring_alert' => 'There is :count license expiring in the next :threshold days.|There are :count licenses expiring in the next :threshold days.',
     'link_to_update_password' => 'Paki-klik sa mga sumusunod na link para makapag-update sa iyong :web password:',
-    'login' => 'Mag-login:',
+    'login' => 'Mag-login',
     'login_first_admin' => 'Mag-login sa iyong bagong pag-install ng Snipe-IT gamit ang mga kredensyal sa ibaba:',
     'low_inventory_alert' => 'There is :count item that is below minimum inventory or will soon be low.|There are :count items that are below minimum inventory or will soon be low.',
     'min_QTY' => 'Ang Min QTY',
     'name' => 'Ang Pangalan',
     'new_item_checked' => 'Ang bagong aytem na nai-check out sa ilalim ng iyong pangalan, ang mga detalye ay nasa ibaba.',
+    'new_item_checked_with_acceptance' => 'A new item has been checked out under your name that requires acceptance, details are below.',
+    'recent_item_checked' => 'An item was recently checked out under your name that requires acceptance, details are below.',
     'notes' => 'Ang mga Palatandaan',
-    'password' => 'Ang Password:',
+    'password' => 'Ang Password',
     'password_reset' => 'Ang Pagbago ng Password',
     'read_the_terms' => 'Paki-basa sa mga tuntunin ng paggamit sa ibaba.',
     'read_the_terms_and_click' => 'Please read the terms of use below, and click on the link at the bottom to confirm that you read and agree to the terms of use, and have received the asset.',
-    'requested' => 'Mga Nai-rekwest:',
+    'requested' => 'Ang Nirekwest',
     'reset_link' => 'Ang Link para sa Pag-reset ng Password',
     'reset_password' => 'I-klik ito para ma-reset ang iyong password:',
     'rights_reserved' => 'All rights reserved.',
@@ -86,8 +90,10 @@ return [
     'upcoming-audits' => 'There is :count asset that is coming up for audit within :threshold days.|There are :count assets that are coming up for audit within :threshold days.',
     'user' => 'Ang gumagamit',
     'username' => 'Ang pangalan ng gumagamit',
+    'unaccepted_asset_reminder' => 'Reminder: You have Unaccepted Assets.',
     'welcome' => 'Maligayang pagdating :ang pangalan',
     'welcome_to' => 'Maligayang pagdating sa: web!',
     'your_assets' => 'View Your Assets',
     'your_credentials' => 'Ang iyong mga Kredensyal sa Snipe-IT',
+    'mail_sent' => 'Mail sent successfully!',
 ];
diff --git a/resources/lang/fil-PH/validation.php b/resources/lang/fil-PH/validation.php
index a47cb26d6f..838f6177cc 100644
--- a/resources/lang/fil-PH/validation.php
+++ b/resources/lang/fil-PH/validation.php
@@ -13,87 +13,150 @@ return [
     |
     */
 
-    'accepted'             => 'Ang: katangian na kailangan tanggapin.',
-    'active_url'           => 'Ang: katangian ay hindi isang balidong URL.',
-    'after'                => 'Ang :katangian ay dapat na gawin ang petsa pagkatapos ng :petsa.',
-    'after_or_equal'       => 'Ang :katangian ay dapat na gawin ang petsa pagkatapos ng o katumbas sa:petsa.',
-    'alpha'                => 'Ang :katangian ay maaaring naglalaman lang ng mga letra.',
-    'alpha_dash'           => 'Ang :katangian ay maaaring naglalaman lamang ng mga letra, mga numero, at mga dashes.',
-    'alpha_num'            => 'Ang :katangian ay maaaring naglalaman lamang ng mga letra at mga numero.',
-    'array'                => 'Ang :katangian ay dapat isang hanay.',
-    'before'               => 'Ang :katangian ay dapat na gawing petsa bago ang :petsa.',
-    'before_or_equal'      => 'Ang :katangian ay dapat na gawin ang petsa pagkatapos ng o katumbas sa:petsa.',
-    'between'              => [
-        'numeric' => 'Ang: katangian dapat na nasa pagitan ng: min -: max.',
-        'file'    => 'Ang: katangian dapat nasa pagitan ng: min -: max na kilobytes.',
-        'string'  => 'Ang: katangiang dapat na nasa pagitan ng: min -: ni max na mga karakter.',
-        'array'   => 'Ang :katangian na dapat magkaroon ng pagitan sa :min and :max na mga aytem.',
+    'accepted' => 'The :attribute field must be accepted.',
+    'accepted_if' => 'The :attribute field must be accepted when :other is :value.',
+    'active_url' => 'The :attribute field must be a valid URL.',
+    'after' => 'The :attribute field must be a date after :date.',
+    'after_or_equal' => 'The :attribute field must be a date after or equal to :date.',
+    'alpha' => 'The :attribute field must only contain letters.',
+    'alpha_dash' => 'The :attribute field must only contain letters, numbers, dashes, and underscores.',
+    'alpha_num' => 'The :attribute field must only contain letters and numbers.',
+    'array' => 'The :attribute field must be an array.',
+    'ascii' => 'The :attribute field must only contain single-byte alphanumeric characters and symbols.',
+    'before' => 'The :attribute field must be a date before :date.',
+    'before_or_equal' => 'The :attribute field must be a date before or equal to :date.',
+    'between' => [
+        'array' => 'The :attribute field must have between :min and :max items.',
+        'file' => 'The :attribute field must be between :min and :max kilobytes.',
+        'numeric' => 'The :attribute field must be between :min and :max.',
+        'string' => 'The :attribute field must be between :min and :max characters.',
     ],
-    'boolean'              => 'Ang :katangian na dapat maging tama o mali.',
-    'confirmed'            => 'Ang :kompermasyong sa katangian ay hindi nagtugma.',
-    'date'                 => 'Ang :hindi balidong petsa ng katangian.',
-    'date_format'          => 'Ang :hindi nagtugma sa katangian nag pormat:pormat.',
-    'different'            => 'Ang :katangian at ang :iba pa dapat na hindi magkapareho.',
-    'digits'               => 'Ang :katangian ay dapat na :mga digit digit.',
-    'digits_between'       => 'Ang :katangian ay dapat nasa pagitan ng :min at :max na mga digit.',
-    'dimensions'           => 'Ang :katangian ay mayroong hindi balidong dimensyon ng mga imahe.',
-    'distinct'             => 'Ang :field na katangian ay mayroong dobleng balyu.',
-    'email'                => 'Ang :pormat ng katangian ay hindi balido o wasto.',
-    'exists'               => 'Ang napili na :katangian ay hindi balido.',
-    'file'                 => 'Ang :katangian ay dapat na isang file.',
-    'filled'               => 'Ang :field na katangian ay dapat na mayroong balyu.',
-    'image'                => 'Ang :katangian at dapat na isang imahe.',
+    'boolean' => 'The :attribute field must be true or false.',
+    'can' => 'The :attribute field contains an unauthorized value.',
+    'confirmed' => 'The :attribute field confirmation does not match.',
+    'contains' => 'The :attribute field is missing a required value.',
+    'current_password' => 'The password is incorrect.',
+    'date' => 'The :attribute field must be a valid date.',
+    'date_equals' => 'The :attribute field must be a date equal to :date.',
+    'date_format' => 'The :attribute field must match the format :format.',
+    'decimal' => 'The :attribute field must have :decimal decimal places.',
+    'declined' => 'The :attribute field must be declined.',
+    'declined_if' => 'The :attribute field must be declined when :other is :value.',
+    'different' => 'The :attribute field and :other must be different.',
+    'digits' => 'The :attribute field must be :digits digits.',
+    'digits_between' => 'The :attribute field must be between :min and :max digits.',
+    'dimensions' => 'The :attribute field has invalid image dimensions.',
+    'distinct' => 'Ang :field na katangian ay mayroong dobleng balyu.',
+    'doesnt_end_with' => 'The :attribute field must not end with one of the following: :values.',
+    'doesnt_start_with' => 'The :attribute field must not start with one of the following: :values.',
+    'email' => 'The :attribute field must be a valid email address.',
+    'ends_with' => 'The :attribute field must end with one of the following: :values.',
+    'enum' => 'Ang napili na :katangian ay hindi balido.',
+    'exists' => 'Ang napili na :katangian ay hindi balido.',
+    'extensions' => 'The :attribute field must have one of the following extensions: :values.',
+    'file' => 'The :attribute field must be a file.',
+    'filled' => 'Ang :field na katangian ay dapat na mayroong balyu.',
+    'gt' => [
+        'array' => 'The :attribute field must have more than :value items.',
+        'file' => 'The :attribute field must be greater than :value kilobytes.',
+        'numeric' => 'The :attribute field must be greater than :value.',
+        'string' => 'The :attribute field must be greater than :value characters.',
+    ],
+    'gte' => [
+        'array' => 'The :attribute field must have :value items or more.',
+        'file' => 'The :attribute field must be greater than or equal to :value kilobytes.',
+        'numeric' => 'The :attribute field must be greater than or equal to :value.',
+        'string' => 'The :attribute field must be greater than or equal to :value characters.',
+    ],
+    'hex_color' => 'The :attribute field must be a valid hexadecimal color.',
+    'image' => 'The :attribute field must be an image.',
     'import_field_empty'    => 'The value for :fieldname cannot be null.',
-    'in'                   => 'Ang napili na :katangian ay hindi balido.',
-    'in_array'             => 'Ang :field na katangian ay hindi umiiral sa :iba pa.',
-    'integer'              => 'Ang :katangian ay dapat ns isang integer.',
-    'ip'                   => 'Ang :katangian ay dapat na isang balidong mga IP address.',
-    'ipv4'                 => 'Ang :katangian ay dapat na isang balidong IPv4 address.',
-    'ipv6'                 => 'Ang :katangian ay dapat na isang balidong IPv6 address.',
-    'is_unique_department' => 'The :attribute must be unique to this Company Location',
-    'json'                 => 'Ang :katangian ay dapa na isang balidong JSON na string.',
-    'max'                  => [
-        'numeric' => 'Ang :katangian ay maaaring hindi lalagpas sa :max.',
-        'file'    => 'Ang :katangian ay maaaring hindi lalagpas sa :max na kilobytes.',
-        'string'  => 'Ang :katangian ay maaaring hindi lalagpas sa :max na mga karakter.',
-        'array'   => 'Ang :katangian ay maaaring hindi magkaroon ng higit sa :max na mga aytem.',
+    'in' => 'Ang napili na :katangian ay hindi balido.',
+    'in_array' => 'The :attribute field must exist in :other.',
+    'integer' => 'The :attribute field must be an integer.',
+    'ip' => 'The :attribute field must be a valid IP address.',
+    'ipv4' => 'The :attribute field must be a valid IPv4 address.',
+    'ipv6' => 'The :attribute field must be a valid IPv6 address.',
+    'json' => 'The :attribute field must be a valid JSON string.',
+    'list' => 'The :attribute field must be a list.',
+    'lowercase' => 'The :attribute field must be lowercase.',
+    'lt' => [
+        'array' => 'The :attribute field must have less than :value items.',
+        'file' => 'The :attribute field must be less than :value kilobytes.',
+        'numeric' => 'The :attribute field must be less than :value.',
+        'string' => 'The :attribute field must be less than :value characters.',
     ],
-    'mimes'                => 'Ang :katangian ay dapat na isang uri ng file :mga balyu.',
-    'mimetypes'            => 'Ang :katangian ay dapat na isang uri ng file :mga balyu.',
-    'min'                  => [
-        'numeric' => 'Ang :katangian ay dapat na hindi bumaba sa :min.',
-        'file'    => 'Ang :katangian ay dapat na hindi bumaba sa :min na kilobytes.',
-        'string'  => 'Ang :katangian ay dapat na hindi bumaba sa :min na mga karakter.',
-        'array'   => 'Ang :katangian ay dapat na magkaroon ng hindi bumaba sa :min na mga aytem.',
+    'lte' => [
+        'array' => 'The :attribute field must not have more than :value items.',
+        'file' => 'The :attribute field must be less than or equal to :value kilobytes.',
+        'numeric' => 'The :attribute field must be less than or equal to :value.',
+        'string' => 'The :attribute field must be less than or equal to :value characters.',
     ],
-    'starts_with'          => 'The :attribute must start with one of the following: :values.',
-    'ends_with'            => 'The :attribute must end with one of the following: :values.',
+    'mac_address' => 'The :attribute field must be a valid MAC address.',
+    'max' => [
+        'array' => 'The :attribute field must not have more than :max items.',
+        'file' => 'The :attribute field must not be greater than :max kilobytes.',
+        'numeric' => 'The :attribute field must not be greater than :max.',
+        'string' => 'The :attribute field must not be greater than :max characters.',
+    ],
+    'max_digits' => 'The :attribute field must not have more than :max digits.',
+    'mimes' => 'The :attribute field must be a file of type: :values.',
+    'mimetypes' => 'The :attribute field must be a file of type: :values.',
+    'min' => [
+        'array' => 'The :attribute field must have at least :min items.',
+        'file' => 'The :attribute field must be at least :min kilobytes.',
+        'numeric' => 'The :attribute field must be at least :min.',
+        'string' => 'The :attribute field must be at least :min characters.',
+    ],
+    'min_digits' => 'The :attribute field must have at least :min digits.',
+    'missing' => 'The :attribute field must be missing.',
+    'missing_if' => 'The :attribute field must be missing when :other is :value.',
+    'missing_unless' => 'The :attribute field must be missing unless :other is :value.',
+    'missing_with' => 'The :attribute field must be missing when :values is present.',
+    'missing_with_all' => 'The :attribute field must be missing when :values are present.',
+    'multiple_of' => 'The :attribute field must be a multiple of :value.',
+    'not_in' => 'Ang napili na :katangian ay hindi balido.',
+    'not_regex' => 'The :attribute field format is invalid.',
+    'numeric' => 'The :attribute field must be a number.',
+    'password' => [
+        'letters' => 'The :attribute field must contain at least one letter.',
+        'mixed' => 'The :attribute field must contain at least one uppercase and one lowercase letter.',
+        'numbers' => 'The :attribute field must contain at least one number.',
+        'symbols' => 'The :attribute field must contain at least one symbol.',
+        'uncompromised' => 'The given :attribute has appeared in a data leak. Please choose a different :attribute.',
+    ],
+    'percent'       => 'The depreciation minimum must be between 0 and 100 when depreciation type is percentage.',
 
-    'not_in'               => 'Ang napili na :katangian ay hindi balido.',
-    'numeric'              => 'Ang :katangian ay dapat na isang numero.',
-    'present'              => 'Ang :field ng katangian ay dapat na naroroon.',
-    'valid_regex'          => 'Hindi ito balidong regex. ',
-    'regex'                => 'Ang :promat ng katangian ay hindi balido.',
-    'required'             => 'Ang :field ng katangian ay kinakailangan.',
-    'required_if'          => 'Ang :field ng katangian ay kinakailangan kapag :ang iba ay :balyu.',
-    'required_unless'      => 'Ang :field ng katangian ay kinakailangan maliban kung :ang iba ay nasa :mga balyu.',
-    'required_with'        => 'Ang :field.ng katangian ay kinakailangan kapag :ang mga balyu ay naroroon.',
-    'required_with_all'    => 'Ang :field ng katangian ay kinakailangan kapag :ang mga balyu ay naroroon.',
-    'required_without'     => 'Ang :field ng katangian ay kinakailangan kapag :ang mga balyu ay naroroon.',
+    'present' => 'Ang :field ng katangian ay dapat na naroroon.',
+    'present_if' => 'The :attribute field must be present when :other is :value.',
+    'present_unless' => 'The :attribute field must be present unless :other is :value.',
+    'present_with' => 'The :attribute field must be present when :values is present.',
+    'present_with_all' => 'The :attribute field must be present when :values are present.',
+    'prohibited' => 'The :attribute field is prohibited.',
+    'prohibited_if' => 'The :attribute field is prohibited when :other is :value.',
+    'prohibited_unless' => 'The :attribute field is prohibited unless :other is in :values.',
+    'prohibits' => 'The :attribute field prohibits :other from being present.',
+    'regex' => 'The :attribute field format is invalid.',
+    'required' => 'Ang :field ng katangian ay kinakailangan.',
+    'required_array_keys' => 'The :attribute field must contain entries for: :values.',
+    'required_if' => 'Ang :field ng katangian ay kinakailangan kapag :ang iba ay :balyu.',
+    'required_if_accepted' => 'The :attribute field is required when :other is accepted.',
+    'required_if_declined' => 'The :attribute field is required when :other is declined.',
+    'required_unless' => 'Ang :field ng katangian ay kinakailangan maliban kung :ang iba ay nasa :mga balyu.',
+    'required_with' => 'Ang :field.ng katangian ay kinakailangan kapag :ang mga balyu ay naroroon.',
+    'required_with_all' => 'The :attribute field is required when :values are present.',
+    'required_without' => 'Ang :field ng katangian ay kinakailangan kapag :ang mga balyu ay naroroon.',
     'required_without_all' => 'Ang :field ng katangian ay kinakailangan kapag wala sa :mga balyu ay naroroon.',
-    'same'                 => 'Ang :katangian at :ang iba ay dapat magkatugma.',
-    'size'                 => [
-        'numeric' => 'Ang :katangian ay dapat na :sukat.',
-        'file'    => 'Ang :katangian ay dapat na :sukat na kilobytes.',
-        'string'  => 'Ang :katangian ay dapat na maging :sukat ng mga karakter.',
-        'array'   => 'Ang :katangian ay dapat na magkaroon ng :sukat ng mga aytem.',
+    'same' => 'The :attribute field must match :other.',
+    'size' => [
+        'array' => 'The :attribute field must contain :size items.',
+        'file' => 'The :attribute field must be :size kilobytes.',
+        'numeric' => 'The :attribute field must be :size.',
+        'string' => 'The :attribute field must be :size characters.',
     ],
+    'starts_with' => 'The :attribute field must start with one of the following: :values.',
     'string'               => 'Ang :katangian ay dapat na isang string.',
-    'timezone'             => 'Ang :katangian ay dapat na isang balidong zone.',
     'two_column_unique_undeleted' => 'The :attribute must be unique across :table1 and :table2. ',
-    'unique'               => 'Ang :katangian ay nakuha na.',
-    'uploaded'             => 'Ang :katangian ay hindi nagtagumpay sa pag-upload.',
-    'url'                  => 'Ang :pormat ng katangian ng pormat ay hindi balido.',
     'unique_undeleted'     => 'Ang :katangian ay dapat na natatangi.',
     'non_circular'         => 'The :attribute must not create a circular reference.',
     'not_array'            => ':attribute cannot be an array.',
@@ -102,11 +165,14 @@ return [
     'numbers'              => 'Password must contain at least one number.',
     'case_diff'            => 'Password must use mixed case.',
     'symbols'              => 'Password must contain symbols.',
-    'gte'                  => [
-        'numeric'          => 'Value cannot be negative'
-    ],
-    'checkboxes'           => ':attribute contains invalid options.',
-    'radio_buttons'        => ':attribute is invalid.',
+    'timezone' => 'The :attribute field must be a valid timezone.',
+    'unique' => 'Ang :katangian ay nakuha na.',
+    'uploaded' => 'Ang :katangian ay hindi nagtagumpay sa pag-upload.',
+    'uppercase' => 'The :attribute field must be uppercase.',
+    'url' => 'The :attribute field must be a valid URL.',
+    'ulid' => 'The :attribute field must be a valid ULID.',
+    'uuid' => 'The :attribute field must be a valid UUID.',
+    'fmcs_location' => 'Full multiple company support and location scoping is enabled in the Admin Settings, and the selected location and selected company are not compatible.',
 
 
     /*
@@ -120,16 +186,22 @@ return [
     |
     */
 
+    'email_array'      => 'Imbalido ang isa o higit pang mga email address.',
+    'checkboxes'           => ':attribute contains invalid options.',
+    'radio_buttons'        => ':attribute is invalid.',
+    
     'custom' => [
         'alpha_space' => 'Ang :field ng katangian ay naglalaman ng karakter na hindi pinapayagan.',
-        'email_array'      => 'Imbalido ang isa o higit pang mga email address.',
+
         'hashed_pass'      => 'Ang iyong kasalukuyang password ay hindi wasto',
         'dumbpwd'          => 'Ang password ay sobrang pangkaraniwan.',
         'statuslabel_type' => 'Kinakailangang pumili ng balidong uri ng label ng estado',
+        'custom_field_not_found'          => 'This field does not seem to exist, please double check your custom field names.',
+        'custom_field_not_found_on_model' => 'This field seems to exist, but is not available on this Asset Model\'s fieldset.',
 
         // date_format validation with slightly less stupid messages. It duplicates a lot, but it gets the job done :(
-        // We use this because the default error message for date_format is reflects php Y-m-d, which non-PHP
-        // people won't know how to format. 
+        // We use this because the default error message for date_format reflects php Y-m-d, which non-PHP
+        // people won't know how to format.
         'purchase_date.date_format'     => 'The :attribute must be a valid date in YYYY-MM-DD format',
         'last_audit_date.date_format'   =>  'The :attribute must be a valid date in YYYY-MM-DD hh:mm:ss format',
         'expiration_date.date_format'   =>  'The :attribute must be a valid date in YYYY-MM-DD format',
@@ -137,9 +209,15 @@ return [
         'expected_checkin.date_format'  =>  'The :attribute must be a valid date in YYYY-MM-DD format',
         'start_date.date_format'        =>  'The :attribute must be a valid date in YYYY-MM-DD format',
         'end_date.date_format'          =>  'The :attribute must be a valid date in YYYY-MM-DD format',
+        'invalid_value_in_field' => 'Invalid value included in this field',
 
-    ],
+        'ldap_username_field' => [
+            'not_in' =>         '<code>sAMAccountName</code> (mixed case) will likely not work. You should use <code>samaccountname</code> (lowercase) instead.'
+        ],
+        'ldap_auth_filter_query' => ['not_in' => '<code>uid=samaccountname</code> is probably not a valid auth filter. You probably want <code>uid=</code> '],
+        'ldap_filter' => ['regex' => 'This value should probably not be wrapped in parentheses.'],
 
+        ],
     /*
     |--------------------------------------------------------------------------
     | Custom Validation Attributes
@@ -155,8 +233,16 @@ return [
 
     /*
     |--------------------------------------------------------------------------
-    | Generic Validation Messages
+    | Generic Validation Messages - we use these in the jquery validation where we don't have
+    | access to the :attribute
     |--------------------------------------------------------------------------
     */
-    'invalid_value_in_field' => 'Invalid value included in this field',
+
+    'generic' => [
+        'invalid_value_in_field' => 'Invalid value included in this field',
+        'required' => 'This field is required',
+        'email' => 'Please enter a valid email address',
+    ],
+
+
 ];
diff --git a/resources/lang/fr-FR/account/general.php b/resources/lang/fr-FR/account/general.php
index 743839afd5..627e388c19 100644
--- a/resources/lang/fr-FR/account/general.php
+++ b/resources/lang/fr-FR/account/general.php
@@ -2,10 +2,16 @@
 
 return array(
     'personal_api_keys' => 'Clés personnelles d\'API',
-    'api_key_warning' => 'When generating an API token, be sure to copy it down immediately as they will not be visible to you again.',
+    'personal_access_token' => 'Jeton d\'accès personnel',
+    'personal_api_keys_success' => 'Clé d\'API personnelle :key créée avec succès',
+    'here_is_api_key' => 'Voici votre nouveau jeton d\'accès personnel. C\'est la seule fois qu\'il sera affiché, ne le perdez donc pas ! Vous pouvez maintenant utiliser ce jeton pour faire des requêtes d\'API.',
+    'api_key_warning' => 'Lorsque vous générez un jeton d\'API, veillez à le copier immédiatement, car vous ne pourrez plus le voir à nouveau.',
     'api_base_url' => 'L\'URL de base de l\'API est situé à:',
     'api_base_url_endpoint' => '/&lt;endpoint&gt;',
     'api_token_expiration_time' => 'Les jetons d\'API sont configurés pour expirer après:',
-    'api_reference' => 'Please check the <a href="https://snipe-it.readme.io/reference" target="_blank">API reference</a> to find specific API endpoints and additional API documentation.',
-    'profile_updated' => 'Account successfully updated',
+    'api_reference' => 'Veuillez consulter la <a href="https://snipe-it.readme.io/reference" target="_blank">documentation de référence des API</a> pour trouver des endpoints spécifiques et de la documentation d\'API supplémentaires.',
+    'profile_updated' => 'Compte mis à jour avec succès',
+    'no_tokens' => 'Vous n\'avez pas encore créé de jeton d\'accès personnel.',
+    'enable_sounds' => 'Activer les effets sonores',
+    'enable_confetti' => 'Effets confettis !',
 );
diff --git a/resources/lang/fr-FR/admin/accessories/message.php b/resources/lang/fr-FR/admin/accessories/message.php
index 3b9f7cc458..b5cc40bc2c 100644
--- a/resources/lang/fr-FR/admin/accessories/message.php
+++ b/resources/lang/fr-FR/admin/accessories/message.php
@@ -26,7 +26,11 @@ return array(
         'error'   		=> 'Cet accessoire n\'est pas attribué. Veuillez réessayer',
         'success' 		=> 'Accessoire attribué correctement.',
         'unavailable'   => 'L\'accessoire n\'est pas disponible à l\'affectation. Vérifiez la quantité disponible',
-        'user_does_not_exist' => 'Cet utilisateur est inexistant. Veuillez réessayer.'
+        'user_does_not_exist' => 'Cet utilisateur est inexistant. Veuillez réessayer.',
+         'checkout_qty' => array(
+            'lte'  => 'Il n\'y a actuellement qu\'un seul accessoire de ce type disponible, et vous essayez d\'en attribuer :checkout_qty. Veuillez ajuster la quantité attribuée ou le stock total de cet accessoire et réessayer.|Il n\'y a actuellement que :number_currently_remaining accessoire(s) disponible(s) de ce type, et vous essayez d\'en attribuer :checkout_qty. Veuillez ajuster la quantité attribuée ou le stock total de cet accessoire et réessayer.',
+            ),
+           
     ),
 
     'checkin' => array(
diff --git a/resources/lang/fr-FR/admin/accessories/table.php b/resources/lang/fr-FR/admin/accessories/table.php
index 2aa514a079..939e9cefd9 100644
--- a/resources/lang/fr-FR/admin/accessories/table.php
+++ b/resources/lang/fr-FR/admin/accessories/table.php
@@ -6,6 +6,4 @@ return array(
     'id'      					=> 'ID',
     'require_acceptance'      	=> 'Acceptation',
     'title'      				=> 'Nom de l\'accessoire',
-
-
 );
diff --git a/resources/lang/fr-FR/admin/components/message.php b/resources/lang/fr-FR/admin/components/message.php
index 973fbdcda6..53ca595c17 100644
--- a/resources/lang/fr-FR/admin/components/message.php
+++ b/resources/lang/fr-FR/admin/components/message.php
@@ -17,7 +17,9 @@ return array(
     'delete' => array(
         'confirm'   => 'Etes-vous sûr de vouloir supprimer ce composant?',
         'error'   => 'Un problème est survenu durant la suppression de ce composant. Merci d\'essayer à nouveau.',
-        'success' => 'Le composant a bien été supprimé.'
+        'success' => 'Le composant a bien été supprimé.',
+        'error_qty'   => 'Certains composants sont toujours dans l\'état retiré \'checked out\'.
+Veuillez vérifier et recommencer',
     ),
 
      'checkout' => array(
diff --git a/resources/lang/fr-FR/admin/consumables/general.php b/resources/lang/fr-FR/admin/consumables/general.php
index a088799a9e..bb909f9d65 100644
--- a/resources/lang/fr-FR/admin/consumables/general.php
+++ b/resources/lang/fr-FR/admin/consumables/general.php
@@ -8,4 +8,5 @@ return array(
     'remaining' 			            => 'Restant',
     'total' 			                => 'Total',
     'update'                            => 'Mettre à jour le consommable',
+    'inventory_warning'                 => 'La quantité de ce consommable est inférieure à la quantité minimum de :min_count',
 );
diff --git a/resources/lang/fr-FR/admin/consumables/message.php b/resources/lang/fr-FR/admin/consumables/message.php
index 2de8d5df22..7e39d72e77 100644
--- a/resources/lang/fr-FR/admin/consumables/message.php
+++ b/resources/lang/fr-FR/admin/consumables/message.php
@@ -2,6 +2,7 @@
 
 return array(
 
+    'invalid_category_type' => 'La catégorie doit être une catégorie de consommables.',
     'does_not_exist' => 'Ce consommable n\'existe pas.',
 
     'create' => array(
diff --git a/resources/lang/fr-FR/admin/custom_fields/general.php b/resources/lang/fr-FR/admin/custom_fields/general.php
index b042a6d161..edd49883cd 100644
--- a/resources/lang/fr-FR/admin/custom_fields/general.php
+++ b/resources/lang/fr-FR/admin/custom_fields/general.php
@@ -35,7 +35,7 @@ return [
     'create_field_title' => 'Créer un champ personnalisé',
     'value_encrypted'      	        => 'La valeur de ce champ est chiffrée dans la base de donnée. Seuls les administrateurs seront capable de voir les données déchiffrées',
     'show_in_email'     => 'Inclure la valeur de ce champ dans les e-mails envoyés à l\'utilisateur·trice ? Les champs chiffrés ne peuvent pas être inclus dans les e-mails',
-    'show_in_email_short'     => 'Inclure dans les emails.',
+    'show_in_email_short' => 'Inclure dans les emails',
     'help_text' => 'Texte d\'aide',
     'help_text_description' => 'Ceci est un texte optionnel qui apparaîtra sous les éléments de formulaire lors de l\'édition d\'un actif pour fournir un contexte pour le champ.',
     'about_custom_fields_title' => 'À propos des champs personnalisés',
@@ -57,5 +57,8 @@ return [
     'show_in_requestable_list_short' => 'Afficher dans la liste des actifs demandables',
     'show_in_requestable_list' => 'Afficher la valeur dans la liste des actifs demandables. Les champs chiffrés ne seront pas affichés',
     'encrypted_options' => 'Ce champ est chiffré, donc certaines options d\'affichage ne seront pas disponibles.',
+    'display_checkin' => 'Display in checkin forms',
+    'display_checkout' => 'Afficher dans les formulaires de retrait (check-out)',
+    'display_audit' => 'Display in audit forms',
 
 ];
diff --git a/resources/lang/fr-FR/admin/custom_fields/message.php b/resources/lang/fr-FR/admin/custom_fields/message.php
index ca79c9033c..05752bad45 100644
--- a/resources/lang/fr-FR/admin/custom_fields/message.php
+++ b/resources/lang/fr-FR/admin/custom_fields/message.php
@@ -5,6 +5,7 @@ return array(
     'field' => array(
         'invalid'   => 'Ce champ n\'existe pas.',
         'already_added'   => 'Le champ a déjà été ajouté',
+        'none_selected'   => 'Aucun champ sélectionné',
 
         'create' => array(
             'error'   => 'Le champ n\'a pas été créé, veuillez réessayer.',
diff --git a/resources/lang/fr-FR/admin/depreciations/general.php b/resources/lang/fr-FR/admin/depreciations/general.php
index 330accd5dd..d7af00c67e 100644
--- a/resources/lang/fr-FR/admin/depreciations/general.php
+++ b/resources/lang/fr-FR/admin/depreciations/general.php
@@ -13,4 +13,8 @@ return [
     'no_depreciations_warning'               => '<strong>Avertissement : </strong>
                       Vous n\'avez actuellement aucun amortissement.
                       Veuillez mettre en place au moins un amortissement pour consulter le rapport d\'amortissement.',
+    'depreciation_method'                   => 'Rapport d’amortissement',
+    'linear_depreciation'                   => 'Linear (Default)',
+    'half_1'                                => 'Half-year convention, always applied',
+    'half_2'                                => 'Half-year convention, applied with condition',
 ];
diff --git a/resources/lang/fr-FR/admin/hardware/form.php b/resources/lang/fr-FR/admin/hardware/form.php
index 2217ebd670..a31e03d231 100644
--- a/resources/lang/fr-FR/admin/hardware/form.php
+++ b/resources/lang/fr-FR/admin/hardware/form.php
@@ -39,9 +39,9 @@ return [
     'order'				=> 'Numéro de Commande',
     'qr'				=> 'Code QR',
     'requestable'		=> 'Les utilisateurs·trices peuvent demander cet actif',
-    'redirect_to_all'   => 'Return to all :type',
-    'redirect_to_type'   => 'Go to :type',
-    'redirect_to_checked_out_to'   => 'Go to Checked Out to',
+    'redirect_to_all'   => 'Retourner à tous les :type',
+    'redirect_to_type'   => 'Aller à :type',
+    'redirect_to_checked_out_to'   => 'Aller aux attributions',
     'select_statustype'	=> 'Choisissez le type de statut',
     'serial'			=> 'Série ',
     'status'			=> 'Statut',
@@ -55,8 +55,11 @@ return [
     'asset_location_update_default' => 'Mettre à jour uniquement l\'emplacement par défaut',
     'asset_location_update_actual' => 'Mettre à jour uniquement l\'emplacement actuel',
     'asset_not_deployable' => 'L\'actif n\'est pas déployable. L\'actif ne peut pas être affecté.',
-    'asset_deployable' => 'L\'actif est déployable. L\'actif peut être affecté.',
+    'asset_not_deployable_checkin' => 'That asset status is not deployable. Using this status label will checkin the asset.',
+    'asset_deployable' => 'This asset can be checked out.',
     'processing_spinner' => 'Traitement... (Cela peut prendre un peu de temps sur les fichiers volumineux)',
+    'processing' => 'Traitement en cours... ',
     'optional_infos'  => 'Information facultative',
-    'order_details'   => 'Information liée à l\'achat'
+    'order_details'   => 'Information liée à l\'achat',
+    'calc_eol'    => 'If nulling the EOL date, use automatic EOL calculation based on the purchase date and EOL rate.',
 ];
diff --git a/resources/lang/fr-FR/admin/hardware/general.php b/resources/lang/fr-FR/admin/hardware/general.php
index b5050b4ddb..aa1fc7ee72 100644
--- a/resources/lang/fr-FR/admin/hardware/general.php
+++ b/resources/lang/fr-FR/admin/hardware/general.php
@@ -5,8 +5,8 @@ return [
     'about_assets_text'            => 'Les actifs sont des éléments suivis par le numéro de série ou l\'étiquette de l\'actif. Ils ont tendance à être des éléments de valeur supérieure où l\'identification d\'un élément spécifique importe.',
     'archived'  				=> 'Retiré',
     'asset'  					=> 'Biens',
-    'bulk_checkout'             => 'Attribuer les actifs',
-    'bulk_checkin'              => 'Restitution d\'actifs',
+    'bulk_checkout'             => 'Attribution par lot',
+    'bulk_checkin'              => 'Bulk Checkin',
     'checkin'  					=> 'Retour des Biens',
     'checkout'  				=> 'Associer l\'actif',
     'clone'  					=> 'Cloner le Bien',
@@ -15,8 +15,8 @@ return [
     'delete_confirm'            => 'Êtes-vous sûr·e de vouloir supprimer cet actif ?',
     'edit'  					=> 'Editer le Bien',
     'model_deleted'  			=> 'Ce modèle d\'actifs a été supprimé. Vous devez restaurer le modèle avant de pouvoir restaurer l\'actif.',
-    'model_invalid'             => 'This model for this asset is invalid.',
-    'model_invalid_fix'         => 'The asset must be updated use a valid asset model before attempting to check it in or out, or to audit it.',
+    'model_invalid'             => 'Le modèle de cet actif n\'est pas valide.',
+    'model_invalid_fix'         => 'L\'actif doit être mis à jour et utiliser un modèle de bien valide avant de tenter de l\'enregistrer, de le sortir ou de l\'auditer.',
     'requestable'               => 'Demandable',
     'requested'				    => 'Demandé',
     'not_requestable'           => 'Non demandable',
@@ -27,13 +27,12 @@ return [
     'undeployable_tooltip'  	=> 'Cet actif est dans un état non déployable et ne peut donc pas être attribué pour le moment.',
     'view'  					=> 'Voir le Bien',
     'csv_error' => 'Vous avez une erreur dans votre fichier CSV :',
-    'import_text' => '<p>Télécharger un CSV qui contient l\'historique des actifs. Les actifs et les utilisateurs DOIVENT déjà exister dans le système, ou ils seront ignorés. La correspondance entre les assets pour l’importation de l’historique se fait par rapport au tag de l’actif. Nous allons essayer de trouver un utilisateur correspondant en fonction du nom d\'utilisateur que vous fournissez, et des critères que vous sélectionnez ci-dessous. Si vous ne sélectionnez aucun critère ci-dessous, il essaiera simplement de correspondre au format d\'utilisateur que vous avez configuré dans <code>Admin &gt; Réglages généraux</code>.</p><p>Les champs inclus dans le CSV doivent correspondre aux en-têtes : <strong>Étiquette d\'actif, Nom, Date de vérification,</strong>. Tous les champs supplémentaires seront ignorés. </p><p>Date de check-in : les dates de check-in vides ou futures vont extraire des éléments à l\'utilisateur associé. En excluant la colonne Date d\'enregistrement, vous créerez une date de check-in avec la date d\'aujourd\'hui.</p>
-    ',
+    'import_text' => '<p>Upload a CSV that contains asset history. The assets and users MUST already exist in the system, or they will be skipped. Matching assets for history import happens against the asset tag. We will try to find a matching user based on the user\'s name you provide, and the criteria you select below. If you do not select any criteria below, it will simply try to match on the username format you configured in the <code>Admin &gt; General Settings</code>.</p><p>Fields included in the CSV must match the headers: <strong>Asset Tag, Name, Checkout Date, Checkin Date</strong>. Any additional fields will be ignored. </p><p>Checkin Date: blank or future checkin dates will checkout items to associated user.  Excluding the Checkin Date column will create a checkin date with todays date.</p>    ',
     'csv_import_match_f-l' => 'Essaie de faire correspondre les utilisateurs au format <strong>firstname.lastname</strong> (<code>jane.smith</code>)',
     'csv_import_match_initial_last' => 'Essayez de faire correspondre les utilisateurs au format <strong>premier nom de famille</strong> (<code>jsmith</code>)',
     'csv_import_match_first' => 'Essayez de faire correspondre les utilisateurs au format <strong>prénom</strong> (<code>jane</code>)',
-    'csv_import_match_email' => 'Try to match users by <strong>email</strong> as username',
-    'csv_import_match_username' => 'Try to match users by <strong>username</strong>',
+    'csv_import_match_email' => 'Essayer de faire correspondre les utilisateurs par <strong>email</strong> comme nom d\'utilisateur',
+    'csv_import_match_username' => 'Essayer de faire correspondre les utilisateurs par <strong>username</strong>',
     'error_messages' => 'Messages d\'erreur:',
     'success_messages' => 'Messages de succès:',
     'alert_details' => 'Voir ci-dessous pour plus de détails.',
diff --git a/resources/lang/fr-FR/admin/hardware/message.php b/resources/lang/fr-FR/admin/hardware/message.php
index 3a80ff6293..df1b02ee8d 100644
--- a/resources/lang/fr-FR/admin/hardware/message.php
+++ b/resources/lang/fr-FR/admin/hardware/message.php
@@ -2,19 +2,23 @@
 
 return [
 
-    'undeployable' 		=> '<strong>Attention: </strong> Ce bien a été marqué non déployable.
-                        Si ce statut a changé, veuillez l\'actualiser.',
-    'does_not_exist' 	=> 'Ce bien n\'existe pas.',
-    'does_not_exist_var'=> 'Asset with tag :asset_tag not found.',
-    'no_tag' 	        => 'No asset tag provided.',
+    'undeployable' 		 => '<strong>Attention : </strong> Cet actif est marqué comme indéployable. Si ce statut a changé, merci de mettre à jour le statut d\'actif.',
+    'does_not_exist' 	 => 'Ce bien n\'existe pas.',
+    'does_not_exist_var' => 'Actif avec le tag :asset_tag introuvable.',
+    'no_tag' 	         => 'Aucune étiquette d\'actif fournie.',
     'does_not_exist_or_not_requestable' => 'Cet actif n\'existe pas ou ne peut pas être demandé.',
-    'assoc_users'	 	=> 'Ce bien est marqué sorti par un utilisateur et ne peut être supprimé. Veuillez d\'abord cliquer sur Retour de Biens, et réessayer.',
-    'warning_audit_date_mismatch' 	=> 'This asset\'s next audit date (:next_audit_date) is before the last audit date (:last_audit_date). Please update the next audit date.',
+    'assoc_users'	 	 => 'Ce bien est marqué sorti par un utilisateur et ne peut être supprimé. Veuillez d\'abord cliquer sur Retour de Biens, et réessayer.',
+    'warning_audit_date_mismatch' 	=> 'La prochaine date d\'audit de cet actif (:next_audit_date) est antérieure à la dernière date d\'audit (:last_audit_date). Veuillez mettre à jour la prochaine date d\'audit.',
+    'labels_generated'   => 'Labels were successfully generated.',
+    'error_generating_labels' => 'Error while generating labels.',
+    'no_assets_selected' => 'No assets selected.',
 
     'create' => [
         'error'   		=> 'Ce bien n\'a pas été créé, veuillez réessayer. :(',
         'success' 		=> 'Bien créé correctement. :)',
         'success_linked' => 'L\'actif avec le tag :tag a été créé avec succès. <strong><a href=":link" style="color: white;">Cliquez ici pour voir</a></strong>.',
+        'multi_success_linked' => 'Asset with tag :links was created successfully.|:count assets were created succesfully. :links.',
+        'partial_failure' => 'An asset was unable to be created. Reason: :failures|:count assets were unable to be created. Reasons: :failures',
     ],
 
     'update' => [
@@ -34,7 +38,7 @@ return [
     ],
 
     'audit' => [
-        'error'   		=> 'Asset audit unsuccessful: :error ',
+        'error'   		=> 'Échec de l\'audit d\'actif : :error ',
         'success' 		=> 'Audit des actifs consigné avec succès.',
     ],
 
@@ -52,20 +56,24 @@ return [
     ],
 
     'import' => [
+        'import_button'         => 'Effectuer l\'importation',
         'error'                 => 'Certains éléments n\'ont pas été correctement importés.',
         'errorDetail'           => 'Les éléments suivants n\'ont pas été importés à cause d\'erreurs.',
         'success'               => 'Votre fichier a bien été importé',
         'file_delete_success'   => 'Votre fichier a été correctement supprimé',
         'file_delete_error'      => 'Le fichier n’a pas pu être supprimé',
         'file_missing' => 'Le fichier sélectionné est manquant',
+        'file_already_deleted' => 'The file selected was already deleted',
         'header_row_has_malformed_characters' => 'Un ou plusieurs attributs dans la ligne d\'en-tête contiennent des caractères UTF-8 invalides',
         'content_row_has_malformed_characters' => 'Un ou plusieurs attributs dans la première ligne de contenu contiennent des caractères UTF-8 invalides',
+        'transliterate_failure' => 'Transliteration from :encoding to UTF-8 failed due to invalid characters in input'
     ],
 
 
     'delete' => [
         'confirm'   	=> 'Etes-vous sûr de vouloir supprimer ce bien?',
         'error'   		=> 'Il y a eu un problème en supprimant ce bien. Veuillez réessayer.',
+        'assigned_to_error' => '{1}Asset Tag: :asset_tag is currently checked out. Check in this device before deletion.|[2,*]Asset Tags: :asset_tag are currently checked out. Check in these devices before deletion.',
         'nothing_updated'   => 'Aucun actif n\'a été sélectionné, donc rien n\'a été supprimé.',
         'success' 		=> 'Ce bien a été supprimé correctement.',
     ],
@@ -78,6 +86,11 @@ return [
         'no_assets_selected' => 'Vous devez sélectionner au moins un élément de la liste',
     ],
 
+    'multi-checkout' => [
+        'error'   => 'Asset was not checked out, please try again|Assets were not checked out, please try again',
+        'success' => 'Asset checked out successfully.|Assets checked out successfully.',
+    ],
+
     'checkin' => [
         'error'   		=> 'Ce bien n\'a pas été retourné, veuillez réessayer',
         'success' 		=> 'Ce bien a été retourné correctement.',
@@ -87,9 +100,10 @@ return [
     ],
 
     'requests' => [
-        'error'   		=> 'L\'actif n\'a pas été demandé, merci d\'essayer à nouveau',
-        'success' 		=> 'L\'actif a été demandé avec succès.',
-        'canceled'      => 'La demande d\'association a été annulée avec succès',
+        'error'   		=> 'Request was not successful, please try again.',
+        'success' 		=> 'Request successfully submitted.',
+        'canceled'      => 'Request successfully canceled.',
+        'cancel'        => 'Annuler cette demande',
     ],
 
 ];
diff --git a/resources/lang/fr-FR/admin/hardware/table.php b/resources/lang/fr-FR/admin/hardware/table.php
index f7d7c38834..7e4d0c1b4c 100644
--- a/resources/lang/fr-FR/admin/hardware/table.php
+++ b/resources/lang/fr-FR/admin/hardware/table.php
@@ -25,7 +25,6 @@ return [
     'image'		    => 'Image',
     'days_without_acceptance' => 'Jours sans acceptation',
     'monthly_depreciation' => 'Dépréciation mensuelle',
-    'assigned_to'    => 'Affecté à',
     'requesting_user' => 'Demandeur·euse',
     'requested_date' => 'Date de la demande',
     'changed'       => 'Modifié',
diff --git a/resources/lang/fr-FR/admin/kits/general.php b/resources/lang/fr-FR/admin/kits/general.php
index b9ce517768..694ec3f16e 100644
--- a/resources/lang/fr-FR/admin/kits/general.php
+++ b/resources/lang/fr-FR/admin/kits/general.php
@@ -47,4 +47,5 @@ return [
     'kit_deleted'                       => 'Le kit a bien été supprimé',
     'kit_model_updated'                 => 'Le modèle a bien été mis à jour',
     'kit_model_detached'                => 'Le modèle a bien été désaffecté',
+    'model_already_attached'            => 'Model already attached to kit',
 ];
diff --git a/resources/lang/fr-FR/admin/licenses/general.php b/resources/lang/fr-FR/admin/licenses/general.php
index 485c059a65..7330f25f49 100644
--- a/resources/lang/fr-FR/admin/licenses/general.php
+++ b/resources/lang/fr-FR/admin/licenses/general.php
@@ -14,6 +14,7 @@ return array(
     'info'  					=> 'Informations de licence',
     'license_seats'  			=> 'Licence multipostes',
     'seat'  					=> 'Poste',
+    'seat_count'  				=> 'Poste :count',
     'seats'  					=> 'Postes',
     'software_licenses'  		=> 'Licences de logiciel',
     'user'  					=> 'Utilisateur',
@@ -23,12 +24,12 @@ return array(
         [
             'checkin_all'           => [
                 'button'            => 'Désattribuer tous les sièges',
-                'modal'             => 'Cette action désassociera un siège. | Cette action désassociera :checkedout_seats_count sièges pour cette licence.',
+                'modal'             => 'Cette action désattribuera un poste. | Cette action désattribuera les :checkedout_seats_count postes pour cette licence.',
                 'enabled_tooltip'   => 'Désassocier TOUS les sièges de cette licence, à la fois des utilisateurs·trices et des actifs',
                 'disabled_tooltip'  => 'Ceci est désactivé car il n\'y a pas de siège actuellement associé',
                 'disabled_tooltip_reassignable'  => 'Ceci est désactivé car la licence n\'est pas réassignable',
                 'success'           => 'Licence désassociée avec succès ! | Toutes les licences ont été désassociées avec succès !',
-                'log_msg'           => 'Désassociée via l\'outil de gestion des licences en volume',
+                'log_msg'           => 'Associée via l\'interface d\'attribution de licence en volumes',
             ],
 
             'checkout_all'              => [
diff --git a/resources/lang/fr-FR/admin/licenses/message.php b/resources/lang/fr-FR/admin/licenses/message.php
index 135dcdfaf1..59d2be4d80 100644
--- a/resources/lang/fr-FR/admin/licenses/message.php
+++ b/resources/lang/fr-FR/admin/licenses/message.php
@@ -44,10 +44,13 @@ return array(
         'error'   => 'Un problème a eu lieu pendant l\'association de la licence. Veuillez essayer à nouveau.',
         'success' => 'La licence a été associée avec succès',
         'not_enough_seats' => 'Pas assez de sièges de licence disponibles pour le paiement',
+        'mismatch' => 'Le poste de licence fourni ne correspond pas à la licence',
+        'unavailable' => 'Ce poste n\'est pas disponible pour attribution.',
     ),
 
     'checkin' => array(
         'error'   => 'Un problème a eu lieu pendant la dissociation de la licence. Veuillez essayer à nouveau.',
+        'not_reassignable' => 'License not reassignable',
         'success' => 'La licence a été dissociée avec succès'
     ),
 
diff --git a/resources/lang/fr-FR/admin/locations/message.php b/resources/lang/fr-FR/admin/locations/message.php
index a7d671c94b..41b9f9398e 100644
--- a/resources/lang/fr-FR/admin/locations/message.php
+++ b/resources/lang/fr-FR/admin/locations/message.php
@@ -3,11 +3,12 @@
 return array(
 
     'does_not_exist' => 'Le lieu n\'existe pas.',
-    'assoc_users'    => 'This location is not currently deletable because it is the location of record for at least one asset or user, has assets assigned to it, or is the parent location of another location. Please update your models to no longer reference this company and try again. ',
+    'assoc_users'    => 'This location is not currently deletable because it is the location of record for at least one asset or user, has assets assigned to it, or is the parent location of another location. Please update your records to no longer reference this location and try again ',
     'assoc_assets'	 => 'Cet emplacement est actuellement associé à au moins un actif et ne peut pas être supprimé. Veuillez mettre à jour vos actifs pour ne plus faire référence à cet emplacement et réessayez. ',
     'assoc_child_loc'	 => 'Cet emplacement est actuellement le parent d\'au moins un sous emplacement et ne peut pas être supprimé . S\'il vous plaît mettre à jour vos emplacement pour ne plus le référencer et réessayez. ',
     'assigned_assets' => 'Actifs assignés',
     'current_location' => 'Emplacement actuel',
+    'open_map' => 'Open in :map_provider_icon Maps',
 
 
     'create' => array(
@@ -20,6 +21,11 @@ return array(
         'success' => 'Le lieu a été mis à jour avec succès.'
     ),
 
+    'restore' => array(
+        'error'   => 'Location was not restored, please try again',
+        'success' => 'Location restored successfully.'
+    ),
+
     'delete' => array(
         'confirm'   	=> 'Êtes-vous sûr de vouloir supprimer ce lieu ?',
         'error'   => 'Un problème a eu lieu pendant la suppression du lieu. Veuillez essayer à nouveau.',
diff --git a/resources/lang/fr-FR/admin/locations/table.php b/resources/lang/fr-FR/admin/locations/table.php
index 0e3a66e3a4..401b8101e9 100644
--- a/resources/lang/fr-FR/admin/locations/table.php
+++ b/resources/lang/fr-FR/admin/locations/table.php
@@ -39,4 +39,5 @@ return [
     'signed_by_finance_auditor' => 'Signé par (auditeur financier):',
     'signed_by_location_manager' => 'Signé par (Gestionnaire d\'emplacements):',
     'signed_by'                 => 'Signé par :',
+    'clone'  					=> 'Clone Location',
 ];
diff --git a/resources/lang/fr-FR/admin/models/general.php b/resources/lang/fr-FR/admin/models/general.php
index 59e01c50fe..2210c2bd1a 100644
--- a/resources/lang/fr-FR/admin/models/general.php
+++ b/resources/lang/fr-FR/admin/models/general.php
@@ -3,7 +3,7 @@
 return array(
     'about_models_title'     => 'A propos des modèles actifs',
     'about_models_text'           => 'Les modèles actifs sont une façon de regrouper les actifs identiques. « MBP 2013", « IPhone 6 s », etc.',
-    'deleted'  					        => 'Ce modèle a été supprimé.',
+    'deleted'  					=> 'Ce modèle a été supprimé.',
     'bulk_delete'               => 'Suppression en masse des modèles d\'actifs',
     'bulk_delete_help'               => 'Cochez la case ci-dessous pour confirmer la suppression des modèles d\'actifs sélectionnés. Les modèles d\'actifs associés à des actifs ne peuvent pas être supprimés tant que les actifs ne sont pas associés à un modèle différent.',
     'bulk_delete_warn'          => 'Vous êtes sur le point de supprimer un modèle d\'actif.|Vous êtes sur le point de supprimer :model_count modèles d\'actif.',
diff --git a/resources/lang/fr-FR/admin/models/message.php b/resources/lang/fr-FR/admin/models/message.php
index daceabf8f9..af4e6a0b84 100644
--- a/resources/lang/fr-FR/admin/models/message.php
+++ b/resources/lang/fr-FR/admin/models/message.php
@@ -7,7 +7,7 @@ return array(
     'no_association' => 'ATTENTION ! Le modèle d\'actif pour cet objet est invalide ou manquant !',
     'no_association_fix' => 'Cela va casser les choses de manière bizarre et horrible. Modifiez cette ressource maintenant pour lui assigner un modèle.',
     'assoc_users'	 => 'Ce modèle est actuellement associé à au moins un actif et ne peut pas être supprimé. Veuillez supprimer les actifs associés et essayer à nouveau. ',
-
+    'invalid_category_type' => 'This category must be an asset category.',
 
     'create' => array(
         'error'   => 'Le modèle n\'a pas été créé, veuillez essayer à nouveau.',
diff --git a/resources/lang/fr-FR/admin/reports/general.php b/resources/lang/fr-FR/admin/reports/general.php
index 489bee47ac..5183041f68 100644
--- a/resources/lang/fr-FR/admin/reports/general.php
+++ b/resources/lang/fr-FR/admin/reports/general.php
@@ -4,6 +4,7 @@ return [
     'info'   => 'Sélectionnez les options que vous souhaitez pour votre rapport d\'actifs.',
     'deleted_user' => 'Utilisateur supprimé',
     'send_reminder' => 'Envoyer un rappel',
+    'cannot_send_reminder' => 'User has been deleted or does not have an email address so cannot receive a reminder',
     'reminder_sent' => 'Rappel envoyé',
     'acceptance_deleted' => 'Demande d\'acceptation supprimée',
     'acceptance_request' => 'Demande d\'acceptation',
@@ -13,5 +14,10 @@ return [
         'user_state' => 'État Utilisateur',
         'user_country' => 'Pays Utilisateur',
         'user_zip' => 'Code Postal Utilisateur'
-    ]
-];
\ No newline at end of file
+    ],
+    'open_saved_template' => 'Open Saved Template',
+    'save_template' =>  'Save Template',
+    'select_a_template' => 'Select a Template',
+    'template_name' => 'Template Name',
+    'update_template' => 'Update Template',
+];
diff --git a/resources/lang/fr-FR/admin/reports/message.php b/resources/lang/fr-FR/admin/reports/message.php
index cdfedcc5bc..c478399cc5 100644
--- a/resources/lang/fr-FR/admin/reports/message.php
+++ b/resources/lang/fr-FR/admin/reports/message.php
@@ -1,5 +1,16 @@
 <?php
 
-return array(
-    'error'   => 'Vous devez sélectionner au moins UNE option.'
-);
+return [
+    'about_templates' => 'About Saved Templates',
+    'saving_templates_description' => 'Sélectionnez vos options, puis entrez le nom de votre modèle dans la case ci-dessus et cliquez sur le bouton \'Enregistrer le modèle\'. Utilisez le menu déroulant pour sélectionner un modèle précédemment enregistré.',
+    'create'  => [
+        'success' => 'Modèle sauvegardé avec succès',
+    ],
+    'update' => [
+        'success' => 'Template updated successfully',
+    ],
+    'delete' => [
+        'success' => 'Template deleted',
+        'no_delete_permission' => 'Template does not exist or you do not have permission to delete it.',
+    ],
+];
diff --git a/resources/lang/fr-FR/admin/settings/general.php b/resources/lang/fr-FR/admin/settings/general.php
index 2a04d7b6d4..0f087d5725 100644
--- a/resources/lang/fr-FR/admin/settings/general.php
+++ b/resources/lang/fr-FR/admin/settings/general.php
@@ -8,13 +8,13 @@ return [
     'ad_append_domain'          => 'Ajouter le nom de domaine au champ nom d\'utilisateur',
     'ad_append_domain_help'     => 'L\'utilisateur n\'est pas obligé d\'écrire "username@domain.local", il peut juste taper "username".',
     'admin_cc_email'            => 'CC Email',
-    'admin_cc_email_help'       => 'Si vous souhaitez envoyer une copie des courriels d\'association/dissociation qui sont envoyés aux utilisateurs à un compte de messagerie supplémentaire, entrez-le ici. Sinon, laissez ce champ vide.',
+    'admin_cc_email_help'       => 'Send a copy of checkin/checkout emails to this address.',
     'admin_settings'            => 'Paramètres de l\'administrateur',
     'is_ad'				        => 'C\'est un serveur Active Directory',
     'alerts'                	=> 'Alertes',
     'alert_title'               => 'Mettre à jour les paramètres de notification',
     'alert_email'				=> 'Envoyer les alertes à',
-    'alert_email_help'    => 'Adresses de courriel ou listes de distribution auxquelles vous souhaitez envoyer des alertes, séparées par des virgules',
+    'alert_email_help'          => 'Adresses de courriel ou listes de distribution auxquelles vous souhaitez envoyer des alertes, séparées par des virgules.',
     'alerts_enabled'			=> 'Alertes activées',
     'alert_interval'			=> 'Seuil d\'expiration des alertes (en jours)',
     'alert_inv_threshold'		=> 'Seuil d\'alerte d\'inventaire',
@@ -31,15 +31,18 @@ return [
     'backups'					=> 'Sauvegardes',
     'backups_help'              => 'Créer, télécharger et restaurer des sauvegardes ',
     'backups_restoring'         => 'Restaurer à partir d\'une sauvegarde',
+    'backups_clean' => 'Clean the backed-up database before restore',
+    'backups_clean_helptext' => "This can be useful if you're changing between database versions",
     'backups_upload'            => 'Téléverser la sauvegarde',
     'backups_path'              => 'Les sauvegardes sont stockées dans <code>:path</code> sur le serveur',
-    'backups_restore_warning'   => 'Utilisez le bouton de restauration <small><span class="btn btn-xs btn-warning"><i class="text-white fas fa-retweet" aria-hidden="true"></i></span></small> pour restaurer à partir d\'une sauvegarde (cela ne fonctionne pas actuellement avec le stockage de fichiers S3 ou Docker).<br><br>Votre <strong>base de données :app_name tout entière et tous les fichiers téléchargés seront intégralement remplacés</strong> par ce qui se trouve dans le fichier de sauvegarde.  ',
+    'backups_restore_warning'   => 'Use the restore button <small><span class="btn btn-xs btn-warning"><i class="text-white fas fa-retweet" aria-hidden="true"></i></span></small> to restore from a previous backup. (This does not currently work with S3 file storage or Docker.)<br><br>Your <strong>entire :app_name database and any uploaded files will be completely replaced</strong> by what\'s in the backup file  ',
     'backups_logged_out'         => 'Tous les utilisateurs existants, y compris vous, seront déconnectés une fois la restauration achevée.',
     'backups_large'             => 'La restauration de fichiers de sauvegardes volumineux peut provoquer une erreur de délai d\'attente (time-out error) et nécessiter d\'être effectuée à l\'aide de la ligne de commande. ',
     'barcode_settings'			=> 'Configuration des codes à barres',
     'confirm_purge'			    => 'Confirmer la purge',
     'confirm_purge_help'		=> 'Entrez le texte « SUPPRIMER » dans la case ci-dessous pour purger vos enregistrements supprimés. Cette action ne peut pas être annulée et supprimera DEFINITIVEMENT tous les éléments et utilisateurs supprimés par le logiciel. (Avant de débuter, faites une sauvegarde juste au cas où.)',
     'custom_css'				=> 'CSS personnalisé',
+    'custom_css_placeholder'	=> 'Add your custom CSS',
     'custom_css_help'			=> 'Entrez les codes CSS personnalisé que vous souhaitez utiliser . Ne pas inclure les balises &lt;style&gt;&lt;/style&gt;.',
     'custom_forgot_pass_url'	=> 'URL personnalisé de réinitialisation du mot de passe',
     'custom_forgot_pass_url_help'	=> 'Ceci remplace l\'URL de mot de passe intégré oublié sur la page d\'accueil, utile pour rediriger les utilisateurs vers la fonctionnalité de réinitialisation de mot de passe interne ou de serveur LDAP. Cela va désactiver la fonctionnalité du mot de passe oublié au niveau local.',
@@ -47,34 +50,34 @@ return [
     'dashboard_message_help'	=> 'Ce texte apparaît sur le tableau de bord pour toute personne ayant le droit de le voir.',
     'default_currency'  		=> 'Devise par défaut',
     'default_eula_text'			=> 'Licence d\'utilisation par défaut',
+    'default_eula_text_placeholder' => 'Add your default EULA text',
     'default_language'			=> 'Langue par défaut',
     'default_eula_help_text'	=> 'Vous pouvez également associer les licences d\'utilisations personnalisés à des catégories spécifiques d\'actifs .',
-    'acceptance_note'           => 'Add a note for your decision (Optional)',
+    'acceptance_note'           => 'Ajouter une note pour votre décision (facultatif)',
     'display_asset_name'        => 'Afficher le nom des actifs',
     'display_checkout_date'     => 'Afficher la date d\'association',
     'display_eol'               => 'Afficher la fin de vie dans les tables',
-    'display_qr'                => 'Affiche les QR codes',
+    'display_qr'                => 'Display 2D barcode',
     'display_alt_barcode'		=> 'Affiche le code-barres 1D',
-    'email_logo'                => 'Logo de l\'e-mail',
     'barcode_type'				=> 'Type du code-barres 2D',
     'alt_barcode_type'			=> 'Type du code-barres 1D',
-    'email_logo_size'       => 'Les logos carrés dans l\'e-mail rendent mieux. ',
     'enabled'                   => 'Activé',
     'eula_settings'				=> 'Configuration pour les licences d\'utilisation',
     'eula_markdown'				=> 'Cette licence d\'utilisation permet l\'utilisation des <a href="https://help.github.com/articles/github-flavored-markdown/">"Github flavored markdown"</a>.',
+    'empty_row_count'           => 'Field Start Offset (Empty Rows)',
+    'empty_row_count_help'      => 'Fields will begin populating after this many empty rows are skipped at the top of the label.',
     'favicon'                   => 'Favicon',
     'favicon_format'            => 'Les types de fichiers acceptés sont ico, png et gif. Les autres formats d\'image peuvent ne pas fonctionner dans tous les navigateurs.',
     'favicon_size'          => 'Les Favicons doivent être des images carrées de 16x16 pixels.',
     'footer_text'               => 'Texte supplémentaire en pied de page ',
     'footer_text_help'          => 'Ce texte apparaîtra dans le pied de page de droitre. Les liens sont autorisés en utilisant <a href="https://help.github.com/articles/github-flavored-markdown/">Github flavored markdown</a>. Les sauts de ligne, les en-têtes, les images, etc. peuvent entraîner des résultats imprévisibles.',
+    'footer_text_placeholder'   => 'Optional footer text',
     'general_settings'			=> 'Configuration générale',
-    'general_settings_keywords' => 'support de l\'entreprise, signature, acceptation, format de courriel, format de nom d\'utilisateur, images, par page, miniature, eula, gravatar, tos, tableau de bord, confidentialité',
     'general_settings_help'     => 'CLUF par défaut et plus encore',
     'generate_backup'			=> 'Générer une sauvegarde',
     'google_workspaces'         => 'Espaces de travail Google',
     'header_color'              => 'Couleur de l\'en-tête',
     'info'                      => 'Ces paramètres vous permettent de personnaliser certains aspects de votre installation.',
-    'label_logo'                => 'Logo du label',
     'label_logo_size'           => 'Les logos, de préférence carrés, sont affichés en haut à droite de chaque étiquette. ',
     'laravel'                   => 'Version de Laravel',
     'ldap'                      => 'LDAP',
@@ -94,7 +97,7 @@ return [
     'ldap_login_sync_help'      => 'Ceci vérifie uniquement que LDAP se synchronise correctement. Si votre requête d\'authentification LDAP est incorrecte, les utilisateurs peuvent ne pas pouvoir se connecter. VOUS DEVEZ D\'ABORD ENREGISTRER VOS PARAMÈTRES LDAP MIS À JOUR.',
     'ldap_manager'              => 'Gestionnaire LDAP',
     'ldap_server'               => 'Serveur LDAP',
-    'ldap_server_help'          => 'Ca devrait commencer par ldap:// (non crypté ou TLS) ou ldaps:// (SSL)',
+    'ldap_server_help'          => 'Devrait commencer par ldap:// (non-chiffré) ou ldaps:// (pour SSL/TLS)',
     'ldap_server_cert'			=> 'Validation du certificat SSL LDAP',
     'ldap_server_cert_ignore'	=> 'Autorise un certificat SSL invalide',
     'ldap_server_cert_help'		=> 'Sélectionnez cette case à cocher si vous utilisez un certificat SSL auto-signé et voudriez accepter un certificat SSL invalide.',
@@ -108,8 +111,8 @@ return [
     'ldap_pword'                => 'Mot de passe bind LDAP',
     'ldap_basedn'               => 'Bind de base DN',
     'ldap_filter'               => 'Filtre LDAP',
-    'ldap_pw_sync'              => 'Synchronisation du mot de passe LDAP',
-    'ldap_pw_sync_help'         => 'Décochez cette case si vous ne souhaitez pas conserver les mots de passe LDAP synchronisés avec les mots de passe locaux. Cette désactivation signifie que vos utilisateurs ne pourront plus se connecter si votre serveur LDAP est injoignable pour une raison quelconque.',
+    'ldap_pw_sync'              => 'Cache LDAP Passwords',
+    'ldap_pw_sync_help'         => 'Uncheck this box if you do not wish to keep LDAP passwords cached as local hashed passwords. Disabling this means that your users may not be able to login if your LDAP server is unreachable for some reason.',
     'ldap_username_field'       => 'Champ nom d\'utilisateur',
     'ldap_lname_field'          => 'Nom de famille',
     'ldap_fname_field'          => 'Prénom LDAP',
@@ -117,13 +120,15 @@ return [
     'ldap_version'              => 'Version LDAP',
     'ldap_active_flag'          => 'Signal d\'activation LDAP',
     'ldap_activated_flag_help'  => 'Cette valeur est utilisée pour déterminer si un utilisateur synchronisé peut se connecter à Snipe-IT. <strong>Cela n\'affecte pas la possibilité de leur affecter ou retirer des ressources</strong>, et devrait être le <strong>nom d\'attribut</strong> dans votre AD/LDAP, <strong>pas la valeur</strong>. <br><br>Si ce champ est défini à un nom de champ qui n\'existe pas dans votre AD/LDAP, ou la valeur dans le champ AD/LDAP est définie à <code>0</code> ou <code>false</code>, <strong>la connexion de l\'utilisateur sera désactivée</strong>. Si la valeur du champ AD/LDAP est définie à <code>1</code> ou <code>vrai</code> ou <em>tout autre valeur</em> signifie que l\'utilisateur peut se connecter. Lorsque le champ est vide dans votre AD, nous respectons l\'attribut <code>userAccountControl</code> , qui permet généralement aux utilisateurs non desactivés de se connecter.',
+    'ldap_invert_active_flag'   => 'LDAP Invert Active Flag',
+    'ldap_invert_active_flag_help'     => 'If enabled: when the value returned by LDAP Active Flag is <code>0</code> or <code>false</code> the user account will be active.',
     'ldap_emp_num'              => 'Numéro d\'employé LDAP',
     'ldap_email'                => 'E-mail LDAP',
     'ldap_test'                 => 'Tester LDAP',
     'ldap_test_sync'            => 'Tester la synchronisation LDAP',
     'license'                   => 'Licence de logiciel',
-    'load_remote'               => 'Utiliser Gravatar',
-    'load_remote_help_text'		=> 'Décochez cette case si votre installation ne peut pas charger des scripts de l\'extérieur. Cela empêchera Snipe-IT d\'essayer de charger des images depuis Gravatar.',
+    'load_remote'               => 'Charger les avatars distants',
+    'load_remote_help_text'		=> 'Décochez cette case si votre installation ne peut pas charger de scripts depuis internet. Cela empêchera Snipe-IT de tenter de charger les avatars depuis Gravatar ou toute autre source externe.',
     'login'                     => 'Tentatives de connexion',
     'login_attempt'             => 'Tentative de connexion',
     'login_ip'                  => 'Adresse IP',
@@ -131,6 +136,7 @@ return [
     'login_user_agent'          => 'User-Agent',
     'login_help'                => 'Liste des tentatives de connexion',
     'login_note'                => 'Note de connexion',
+    'login_note_placeholder'            => "If you do not have a login or have found a device belonging to this company, please call technical support at 888-555-1212. Thank you.",
     'login_note_help'           => 'Ajoutez éventuellement quelques phrases sur votre écran de connexion, par exemple pour aider les personnes ayant trouvé un appareil perdu ou volé. Ce champ accepte <a href="https://help.github.com/articles/github-flavored-markdown/">Github aromatisé markdown</a>',
     'login_remote_user_text'    => 'Options de connexion de l\'utilisateur à distance',
     'login_remote_user_enabled_text' => 'Activer la connexion avec l\'en-tête utilisateur distant',
@@ -146,13 +152,16 @@ return [
     'logo_print_assets_help'    => 'Utiliser la marque dans les listes imprimables des actifs ',
     'full_multiple_companies_support_help_text' => 'Restreindre les utilisateurs (admins compris) assignés à des organisations aux biens de leur propre organisation.',
     'full_multiple_companies_support_text' => 'Support complet des organisations multiples',
+    'scope_locations_fmcs_support_text'  => 'Scope Locations with Full Multiple Companies Support',
+    'scope_locations_fmcs_support_help_text'  => 'Restrict locations to their selected company.',
+    'scope_locations_fmcs_check_button' => 'Check Compatibility',
+    'scope_locations_fmcs_support_disabled_text'  => 'This option is disabled because you have conflicting locations set for :count or more items.',
     'show_in_model_list'   => 'Afficher dans la liste déroulante des modèles',
     'optional'					=> 'facultatif',
     'per_page'                  => 'Résultats par page',
     'php'                       => 'Version de PHP',
     'php_info'                  => 'PHP info',
     'php_overview'              => 'PHP',
-    'php_overview_keywords'     => 'phpinfo, système, infos',
     'php_overview_help'         => 'Infos système PHP',
     'php_gd_info'               => 'Vous devez installer php-gd afin d\'afficher les QR codes (voir les instructions d\'installation).',
     'php_gd_warning'            => 'Le PHP Image Processing et GD plugin n\'est PAS installé.',
@@ -218,6 +227,8 @@ return [
     'webhook_integration_help'    => ':L\'intégration de :app est optionnelle, cependant le point de terminaison et le canal sont requis si vous souhaitez l\'utiliser. Pour configurer l\'intégration de :app, vous devez d\'abord <a href=":webhook_link" target="_new" rel="noopener">créer un webhook entrant</a> sur votre compte :app. Cliquez sur le bouton <strong>Tester l\'intégration :app</strong> pour confirmer que vos paramètres sont corrects avant d\'enregistrer. ',
     'webhook_integration_help_button'    => 'Une fois que vous aurez enregistré vos informations :app, un bouton de test apparaîtra.',
     'webhook_test_help'           => 'Testez si votre intégration :app est correctement configurée. VOUS DEVEZ D\'ABORD ENREGISTRER LES PARAMÈTRES MIS À JOUR DE :app.',
+    'shortcuts_enabled'         => 'Activer les raccourcis',
+    'shortcuts_help_text'       => '<strong>Windows</strong>: Alt + Access key, <strong>Mac</strong>: Control + Option + Access key',
     'snipe_version'  			=> 'Version de Snipe-IT',
     'support_footer'            => 'Support des liens de pied de page ',
     'support_footer_help'       => 'Spécifiez qui voit les liens vers les manuels de support utilisateur Snipe-IT',
@@ -227,7 +238,6 @@ return [
     'update'                    => 'Mettre à jour les paramètres',
     'value'                     => 'Valeur',
     'brand'                     => 'Marque',
-    'brand_keywords'            => 'pied de page, logo, impression, thème, habillage, en-tête, couleurs, couleur, css',
     'brand_help'                => 'Logo, nom du site',
     'web_brand'                 => 'Type de Web Branding',
     'about_settings_title'      => 'A propos des réglages',
@@ -276,6 +286,8 @@ return [
     'two_factor_enrollment_text'	=> "L’authentification à deux facteurs est nécessaire, mais votre appareil n’a pas encore été inscrit. Ouvrez votre application Google Authenticator et scanner le code QR ci-dessous pour inscrire votre appareil. Une fois que vous avez inscrit votre appareil, saisissez le code ci-dessous",
     'require_accept_signature'      => 'Exiger la signature',
     'require_accept_signature_help_text'      => 'L\'activation de cette fonctionnalité nécessite que les utilisateurs signent physiquement l\'acceptation de cet actif.',
+    'require_checkinout_notes'  => 'Require Notes on Checkin/Checkout',
+    'require_checkinout_notes_help_text'    => 'Enabling this feature will require the note fields to be populated when checking in or checking out an asset.',
     'left'        => 'gauche',
     'right'        => 'droite',
     'top'        => 'haut',
@@ -287,18 +299,18 @@ return [
     'zerofill_count'        => 'Longueur des étiquettes de bien, incluant le remplissage de zéros',
     'username_format_help'   => 'Ce paramètre ne sera utilisé par le processus d\'importation que si un nom d\'utilisateur n\'est pas fourni et que nous devons générer un nom d\'utilisateur pour vous.',
     'oauth_title' => 'Paramètres de l\'API OAuth',
-    'oauth_clients' => 'OAuth Clients',
+    'oauth_clients' => 'Clients OAuth',
     'oauth' => 'OAuth',
     'oauth_help' => 'Paramètres du point de terminaison Oauth',
-    'oauth_no_clients' => 'You have not created any OAuth clients yet.',
+    'oauth_no_clients' => 'Vous n\'avez pas encore créé de client OAuth.',
     'oauth_secret' => 'Secret',
-    'oauth_authorized_apps' => 'Authorized Applications',
-    'oauth_redirect_url' => 'Redirect URL',
-    'oauth_name_help' => ' Something your users will recognize and trust.',
+    'oauth_authorized_apps' => 'Applications autorisées',
+    'oauth_redirect_url' => 'URL de redirection',
+    'oauth_name_help' => ' Quelque chose que vos utilisateurs reconnaîtront et en quoi ils auront confiance.',
     'oauth_scopes' => 'Scopes',
-    'oauth_callback_url' => 'Your application authorization callback URL.',
-    'create_client' => 'Create Client',
-    'no_scopes' => 'No scopes',
+    'oauth_callback_url' => 'URL de retour d\'autorisation de votre application.',
+    'create_client' => 'Créer un client',
+    'no_scopes' => 'Aucun scope',
     'asset_tag_title' => 'Mettre à jour les paramètres de numéro d\'inventaire',
     'barcode_title' => 'Gérer les paramètres des codes-barres',
     'barcodes' => 'Codes-barres',
@@ -313,24 +325,24 @@ return [
     'filter_by_keyword' => 'Filtrer par mot clé',
     'security' => 'Sécurité',
     'security_title' => 'Gérer les paramètres de sécurité',
-    'security_keywords' => 'mot de passe, mots de passe, exigences, deux facteurs, deux-facteurs, mots de passe communs, connexion distante, déconnexion, authentification',
     'security_help' => 'Authentification à deux facteurs (2FA), Restrictions de mot de passe',
-    'groups_keywords' => 'permissions, permissions de groupe, autorisation',
     'groups_help' => 'Permissions de groupe du compte',
     'localization' => 'Traduction',
     'localization_title' => 'Gérer les paramètres de localisation',
-    'localization_keywords' => 'localisation, devise, locale, locale, fuseau horaire, fuseau horaire, international, internationalisation, langue, traduction, traduction',
     'localization_help' => 'Langue, affichage de la date',
     'notifications' => 'Notifications',
     'notifications_help' => 'Paramètres d\'alerte et d\'audit par e-mail',
     'asset_tags_help' => 'Incrémentation et préfixes',
     'labels' => 'Étiquettes',
     'labels_title' => 'Mettre à jour les paramètres d\'étiquetage',
-    'labels_help' => 'Taille &amp; paramètres des étiquettes',
-    'purge_keywords' => 'supprimer définitivement',
+    'labels_help' => 'Barcodes &amp; label settings',
     'purge_help' => 'Purger les enregistrements supprimés',
     'ldap_extension_warning' => 'Il semble que l\'extension LDAP ne soit pas installée ou activée sur ce serveur. Vous pouvez toujours enregistrer vos paramètres, mais vous devrez activer l\'extension LDAP pour PHP avant que la synchronisation LDAP ne fonctionne.',
     'ldap_ad' => 'LDAP/AD',
+    'ldap_test_label' => 'Test LDAP Sync',
+    'ldap_test_login' => ' Test LDAP Login',
+    'ldap_username_placeholder' => 'LDAP Username',
+    'ldap_password_placeholder' => 'LDAP Password',
     'employee_number' => 'Numéro d’employé',
     'create_admin_user' => 'Créer un utilisateur ::',
     'create_admin_success' => 'Bravo ! Votre utilisateur administrateur a été ajouté !',
@@ -342,6 +354,8 @@ return [
     'setup_migration_create_user' => 'Étape suivante : créer un utilisateur',
     'ldap_settings_link' => 'Page des paramètres LDAP',
     'slack_test' => 'Tester l\'intégration de <i class="fab fa-slack"></i>',
+    'status_label_name' => 'Status Label Name',
+    'super_admin_only'  => 'Super Admin Only',
     'label2_enable'           => 'Nouveau moteur d\'étiquetage',
     'label2_enable_help'      => 'Basculer vers le nouveau moteur d\'étiquetage. <b>Note : Vous devrez enregistrer ce paramètre avant d\'en modifier d\'autres.</b>',
     'label2_template'         => 'Modèle',
@@ -356,12 +370,15 @@ return [
     'label2_2d_type'          => 'Type du code-barres 2D',
     'label2_2d_type_help'     => 'Format pour les codes-barres 2D',
     'label2_2d_target'        => 'Cible du code-barres 2D',
-    'label2_2d_target_help'   => 'L\'URL vers laquelle le code-barres 2D pointe lorsqu\'il est scanné',
+    'label2_2d_target_help'   => 'The data that will be contained in the 2D barcode',
     'label2_fields'           => 'Définitions de champ',
     'label2_fields_help'      => 'Les champs peuvent être ajoutés, supprimés et réordonnés dans la colonne de gauche. Pour chaque champ, plusieurs options pour Étiquette et Source de données peuvent être ajoutées, supprimées et réordonnées dans la colonne de droite.',
+    'purge_barcodes' => 'Purge Barcodes',
     'help_asterisk_bold'    => 'Le texte entré sous la forme <code>**texte**</code> sera affiché en gras',
     'help_blank_to_use'     => 'Laisser vide pour utiliser la valeur de <code>:setting_name</code>',
-    'help_default_will_use' => '<code>:default</code> utilisera la valeur de <code>:setting_name</code>. <br>Notez que la valeur des codes-barres doit être conforme à la spécification pour être générée avec succès. Veuillez consulter <a href="https://snipe-it.readme.io/docs/barcodes">la documentation <i class="fa fa-external-link"></i></a> pour plus de détails. ',
+    'help_default_will_use' => '<code>:default</code> will use the value from <code>:setting_name</code>. <br>Note that the value of the barcodes must comply with the respective barcode spec in order to be successfully generated. Please see <a href="https://snipe-it.readme.io/docs/barcodes">the documentation <i class="fa fa-external-link"></i></a> for more details. ',
+    'asset_id'              => 'Asset ID',
+    'data'               => 'Data',
     'default'               => 'Par défaut',
     'none'                  => 'Aucun·e',
     'google_callback_help' => 'Ceci doit être entré comme URL de rappel dans les paramètres de votre application Google OAuth dans la <strong><a href="https://console.cloud.google.com/" target="_blank">console de développement Google <i class="fa fa-external-link" aria-hidden="true"></i></a></strong> de votre organisation.',
@@ -373,7 +390,100 @@ return [
     'database_driver' => 'Pilote de base de données',
     'bs_table_storage' => 'Stockage de la table',
     'timezone' => 'Fuseau horaire',
-    'profile_edit'          => 'Edit Profile',
-    'profile_edit_help'          => 'Allow users to edit their own profiles.',
+    'test_mail' => 'Test Mail',
+    'profile_edit'          => 'Modifier le profil',
+    'profile_edit_help'          => 'Permettre aux utilisateurs de modifier leur propre profil.',
+    'default_avatar' => 'Custom Default Avatar',
+    'default_avatar_help' => 'Cette image sera utilisée pour le profil des utilisateurs·trices qui n\'ont pas de photo de profil.',
+    'restore_default_avatar' => 'Rétablir <a href=":default_avatar" data-toggle="lightbox" data-type="image">l\'avatar par défaut d\'origine</a>',
+    'restore_default_avatar_help' => '',
+    'due_checkin_days' => 'Due For Checkin Warning',
+    'due_checkin_days_help' => 'How many days before the expected checkin of an asset should it be listed in the "Due for checkin" page?',
+    'no_groups' => 'No groups have been created yet. Visit <code>Admin Settings > Permission Groups</code> to add one.',
+    'text' => 'Text',
+
+    'username_formats' => [
+        'username_format'		=> 'Format du nom d\'utilisateur',
+        'firstname_lastname_format'	=> 'Prénom Nom de famille (jane.smith)',
+        'first_name_format'	        => 'First Name (jane)',
+        'last_name_format'		=> 'Last Name (doe)',
+        'filastname_format'			=> 'First Initial Last Name (jsmith)',
+        'lastnamefirstinitial_format' =>  'Last Name First Initial (smithj)',
+        'firstname_lastname_underscore_format' => 'First Name Last Name (jane_smith)',
+        'firstinitial.lastname' => 'First Initial Last Name (j.smith)',
+        'lastname_firstinitial' => 'Last Name First Initial (smith_j)',
+        'lastname_dot_firstinitial_format' => 'Last Name First Initial (smith.j)',
+        'firstnamelastname'     => 'First Name Last Name (janesmith)',
+        'firstnamelastinitial'  => 'First Name Last Initial (janes)',
+        'lastnamefirstname'      => 'Nom.Prénom (smith.jane)',
+    ],
+
+    'email_formats' => [
+        'email_format'			=> 'Format de l\'e-mail',
+        'firstname_lastname_format'	=> 'Prénom Nom de famille (jane.smith@example.com)',
+        'first_name_format'		=> 'Prénom (jane@example.com)',
+        'last_name_format'		=> 'Last Name (doe@example.com)',
+        'filastname_format'			=> 'Première lettre du prénom Nom de famille (jsmith@example.com)',
+        'lastnamefirstinitial_format' =>  'Nom de famille Première lettre du prénom (smithj@example.com)',
+        'firstname_lastname_underscore_format' => 'Prénom Nom (jane_smith@example.com)',
+        'firstinitial.lastname' => 'Première lettre du prénom et nom de famille (j.smith@example.com)',
+        'lastname_firstinitial' => 'Nom de famille et première lettre du prénom (smith_j@example.com)',
+        'lastname_dot_firstinitial_format' => 'Last Name First Initial (smith.j@example.com)',
+        'firstnamelastname'     => 'Prénom et nom de famille (janesmith@example.com)',
+        'firstnamelastinitial'  => 'Prénom (janes@example.com)',
+        'lastnamefirstname'      => 'Nom.Prénom (smith.jane@example.com)',
+    ],
+
+
+
+    'logo_labels' => [
+        'acceptance_pdf_logo'       => 'PDF Logo',
+        'email_logo'                => 'Logo de l\'e-mail',
+        'label_logo'                => 'Logo du label',
+        'logo'                      => 'Site Logo',
+        'favicon'                   => 'Favicon',
+    ],
+
+    'logo_help' => [
+        'email_logo_size'       => 'Les logos carrés dans l\'e-mail rendent mieux. ',
+    ],
+
+    'logo_option_types' => [
+        'text' => 'Text',
+        'logo' => 'Logo',
+        'logo_and_text' => 'Logo and Text',
+    ],
+
+
+    'legends' => [
+        'scoping' => 'Scoping',
+        'formats' => 'Default Formats',
+        'profiles' => 'User Profiles',
+        'eula' => 'EULA & Acceptance Preferences',
+        'misc_display' => 'Miscellaneous Display Options',
+        'email' => 'Email Preferences',
+        'checkin' => 'Checkin Preferences',
+        'dashboard' => 'Login & Dashboard Preferences',
+        'misc' => 'Miscellaneous',
+        'logos' => 'Logos & Display',
+        'colors' => 'Colors & Skins',
+        'footer' => 'Footer Preferences',
+        'security' => 'Security Preferences',
+        'general' => 'General',
+        'intervals' => 'Intervals & Thresholds',
+    ],
+
+
+    /* Keywords for settings overview help */
+    'keywords' => [
+        'brand'             => 'pied de page, logo, impression, thème, habillage, en-tête, couleurs, couleur, css',
+        'general_settings'  => 'support de l\'entreprise, signature, acceptation, format de courriel, format de nom d\'utilisateur, images, par page, miniature, eula, gravatar, tos, tableau de bord, confidentialité',
+        'groups'            => 'permissions, permissions de groupe, autorisation',
+        'labels'            => 'labels, barcodes, barcode, sheets, print, upc, qr, 1d, 2d',
+        'localization'      => 'localisation, devise, locale, locale, fuseau horaire, fuseau horaire, international, internationalisation, langue, traduction, traduction',
+        'php_overview'      => 'phpinfo, système, infos',
+        'purge'             => 'supprimer définitivement',
+        'security'          => 'mot de passe, mots de passe, exigences, deux facteurs, deux-facteurs, mots de passe communs, connexion distante, déconnexion, authentification',
+    ],
 
 ];
diff --git a/resources/lang/fr-FR/admin/settings/message.php b/resources/lang/fr-FR/admin/settings/message.php
index 84f4d88348..56ccdb9f68 100644
--- a/resources/lang/fr-FR/admin/settings/message.php
+++ b/resources/lang/fr-FR/admin/settings/message.php
@@ -14,6 +14,9 @@ return [
         'restore_warning'       => 'Oui, restaurez-le. Je reconnais que cela écrasera toutes les données existantes actuellement dans la base de données. Cela déconnectera également tous vos utilisateurs existants (vous y compris).',
         'restore_confirm'       => 'Êtes-vous sûr de vouloir restaurer votre base de données à partir de :filename ?'
     ],
+    'restore' => [
+        'success'               => 'Your system backup has been restored. Please log in again.'
+    ],
     'purge' => [
         'error'     => 'Une erreur est survenue durant la purge. ',
         'validation_failed'     => 'Votre confirmation de purge est incorrecte. Merci d\'écrire le mot "DELETE" dans la fenêtre de confirmation.',
@@ -33,6 +36,9 @@ return [
         'testing_authentication' => 'Test de l\'authentification LDAP...',
         'authentication_success' => 'Utilisateur authentifié contre LDAP avec succès !'
     ],
+    'labels' => [
+        'null_template' => 'Label template not found. Please select a template.',
+        ],
     'webhook' => [
         'sending' => 'Envoi du message de test :app...',
         'success' => 'Votre intégration :webhook_name fonctionne !',
@@ -42,5 +48,12 @@ return [
         'error' => 'Quelque chose s\'est mal passé. :app a répondu avec: :error_message',
         'error_redirect' => 'ERREUR : 301/302 :endpoint renvoie une redirection. Pour des raisons de sécurité, nous ne suivons pas les redirections. Veuillez utiliser le point de terminaison réel.',
         'error_misc' => 'Une erreur est survenue. :( ',
-    ]
+        'webhook_fail' => ' webhook notification failed: Check to make sure the URL is still valid.',
+        'webhook_channel_not_found' => ' webhook channel not found.',
+        'ms_teams_deprecation' => 'The selected Microsoft Teams webhook URL will be deprecated Dec 31st, 2025. Please use a workflow URL. Microsoft\'s documentation on creating a workflow can be found <a href="https://support.microsoft.com/en-us/office/create-incoming-webhooks-with-workflows-for-microsoft-teams-8ae491c7-0394-4861-ba59-055e33f75498" target="_blank"> here.</a>',
+    ],
+    'location_scoping' => [
+        'not_saved' => 'Your settings were not saved.',
+        'mismatch' => 'There is 1 item in the database that need your attention before you can enable location scoping.|There are :count items in the database that need your attention before you can enable location scoping.',
+    ],
 ];
diff --git a/resources/lang/fr-FR/admin/statuslabels/table.php b/resources/lang/fr-FR/admin/statuslabels/table.php
index 0ef604e3b5..ac92e2bda3 100644
--- a/resources/lang/fr-FR/admin/statuslabels/table.php
+++ b/resources/lang/fr-FR/admin/statuslabels/table.php
@@ -1,14 +1,14 @@
 <?php
 
 return array(
-    'about'      	=> 'À propos des étiquettes de statut',
+    'about'      	=> 'About Status Types',
     'archived'      	=> 'Retiré',
     'create'      	=> 'Créé une étiquette de statut',
     'color'      	=> 'Couleur du graphique',
     'default_label' => 'Libellé par défaut',
     'default_label_help' => 'Ceci est utilisé pour s\'assurer que vos étiquettes de statut les plus couramment utilisées apparaissent en haut de la case de sélection lors de la création/l\'édition des actifs.',
     'deployable'      	=> 'Déployable',
-    'info'      	=> 'Les étiquettes d\'état sont utilisés pour décrire les différents états de vos actifs. Ils peuvent être pour réparation , perdu / volé , etc. Vous pouvez créer de nouvelles étiquettes d\'état pour déployable , en attente et actifs retirés.',
+    'info'      	=> 'Status label types are used to describe the various states your assets could be in. They may be out for repair, lost/stolen, etc. You can create new status labels for your deployable, pending and archived assets according to your own workflow. For more information, <a href="https://snipe-it.readme.io/docs/overview#status-labels" target="_blank">see the documentation <i class="fa fa-external-link"></i></a>.',
     'name'      	=> 'Nom du statut',
     'pending'      	=> 'En attente',
     'status_type'   => 'Type d\'état',
diff --git a/resources/lang/fr-FR/admin/users/general.php b/resources/lang/fr-FR/admin/users/general.php
index 38059c4997..d183da9949 100644
--- a/resources/lang/fr-FR/admin/users/general.php
+++ b/resources/lang/fr-FR/admin/users/general.php
@@ -19,6 +19,8 @@ return [
     'print_assigned'    => 'Imprimer tout ceux assignés',
     'email_assigned'    => 'Envoyer la liste des matériels assignés par email',
     'user_notified'     => 'Un mail récapitulatif de tous les articles associés à cet utilisateur lui a été envoyé.',
+    'users_notified'    => 'The user has been emailed a list of their currently assigned items.|:count users have been emailed a list of their currently assigned items.',
+    'users_notified_warning' => ':count user has been emailed a list of their currently assigned items, however :no_email users did not have an email address so could not be emailed.|:count users have been emailed a list of their currently assigned items, however :no_email user(s) did not have an email address so could not be emailed.',
     'auto_assign_label' => 'Inclure cet utilisateur lors de l\'affectation automatique des licences éligibles',
     'auto_assign_help'  => 'Ignorer cet utilisateur dans l\'affectation automatique des licences',
     'software_user'     => 'Logiciels associés avec :name',
diff --git a/resources/lang/fr-FR/admin/users/message.php b/resources/lang/fr-FR/admin/users/message.php
index 5bb58a8a61..02389dc79f 100644
--- a/resources/lang/fr-FR/admin/users/message.php
+++ b/resources/lang/fr-FR/admin/users/message.php
@@ -6,7 +6,7 @@ return array(
     'declined'                  => 'Vous avez refusé cet actif.',
     'bulk_manager_warn'	        => 'Vos utilisateurs ont été mis à jour avec succès, mais votre entrée de gestionnaire n\'a pas été enregistrée, car le gestionnaire que vous avez sélectionné était également dans la liste d\'utilisateurs à éditer, et les utilisateurs peuvent ne pas être leur propre gestionnaire. Sélectionnez à nouveau vos utilisateurs, à l\'exclusion du gestionnaire.',
     'user_exists'               => 'L\'utilisateur existe déjà !',
-    'user_not_found'            => 'L\'utilisateur·trice n\'existe pas.',
+    'user_not_found'            => 'User does not exist or you do not have permission view them.',
     'user_login_required'       => 'Le champ identifiant est obligatoire',
     'user_has_no_assets_assigned' => 'Aucun actif actuellement assigné à l\'utilisateur·trice.',
     'user_password_required'    => 'Le mot de passe est obligatoire.',
@@ -37,22 +37,23 @@ return array(
         'update' => 'Un problème a eu lieu pendant la mise à jour de l\'utilisateur. Veuillez essayer à nouveau.',
         'delete' => 'Un problème a eu lieu pendant la suppression de l\'utilisateur. Veuillez essayer à nouveau.',
         'delete_has_assets' => 'Cet utilisateur a des éléments assignés et n\'a pas pu être supprimé.',
-        'delete_has_assets_var' => 'This user still has an asset assigned. Please check it in first.|This user still has :count assets assigned. Please check their assets in first.',
-        'delete_has_licenses_var' => 'This user still has a license seats assigned. Please check it in first.|This user still has :count license seats assigned. Please check them in first.',
-        'delete_has_accessories_var' => 'This user still has an accessory assigned. Please check it in first.|This user still has :count accessories assigned. Please check their assets in first.',
-        'delete_has_locations_var' => 'This user still manages a location. Please select another manager first.|This user still manages :count locations. Please select another manager first.',
-        'delete_has_users_var' => 'This user still manages another user. Please select another manager for that user first.|This user still manages :count users. Please select another manager for them first.',
+        'delete_has_assets_var' => 'Cet utilisateur a encore un actif attribué. Cet utilisateur a encore :count actifs assignés. Veuillez vérifier ses actifs en premier.',
+        'delete_has_licenses_var' => 'Cet utilisateur a encore des sièges de licence attribués. Cet utilisateur a encore des sièges de licence :count attribués. Veuillez d\'abord les vérifier.',
+        'delete_has_accessories_var' => 'Cet utilisateur a encore un accessoire attribué. Cet utilisateur a encore :count accessoires assignés. Veuillez vérifier leurs actifs en premier.',
+        'delete_has_locations_var' => 'Cet utilisateur gère toujours un emplacement. Veuillez d\'abord sélectionner un autre gestionnaire.|Cet utilisateur gère toujours :count emplacements. Veuillez d\'abord sélectionner un autre gestionnaire.',
+        'delete_has_users_var' => 'Cet utilisateur gère toujours un autre utilisateur. Veuillez d\'abord sélectionner un autre gestionnaire pour cet utilisateur. Cet utilisateur gère toujours :count utilisateurs. Veuillez d\'abord sélectionner un autre gestionnaire.',
         'unsuspend' => 'Un problème a eu lieu pendant la réhabilitation de l\'utilisateur. Veuillez essayer à nouveau.',
         'import'    => 'Il y a eu un problème lors de l\'importation des utilisateurs. Veuillez réessayer.',
         'asset_already_accepted' => 'Cet actif a déjà été accepté.',
         'accept_or_decline' => 'Vous devez accepter ou refuser cet actif.',
-        'cannot_delete_yourself' => 'We would feel really bad if you deleted yourself, please reconsider.',
+        'cannot_delete_yourself' => 'Nous nous sentirions vraiment mal si vous vous supprimiez vous-même, s\'il vous plaît reconsidérer.',
         'incorrect_user_accepted' => 'Le bien que vous avez tenté d\'accepter ne vous avait pas été attribué.',
         'ldap_could_not_connect' => 'Impossible de se connecter au serveur LDAP . S\'il vous plaît vérifier la configuration de votre serveur LDAP dans le fichier de configuration LDAP . <br> Erreur du serveur LDAP :',
         'ldap_could_not_bind' => 'Impossible de se connecter au serveur LDAP . S\'il vous plaît vérifier la configuration de votre serveur LDAP dans le fichier de configuration LDAP . <br> Erreur de serveur LDAP : ',
         'ldap_could_not_search' => 'Impossible de rechercher le serveur LDAP . S\'il vous plaît vérifier la configuration de votre serveur LDAP dans le fichier de configuration LDAP . <br> Erreur de serveur LDAP :',
         'ldap_could_not_get_entries' => 'Impossible d\'obtenir les entrées du serveur LDAP . S\'il vous plaît vérifier la configuration de votre serveur LDAP dans le fichier de configuration LDAP . <br> Erreur de serveur LDAP :',
         'password_ldap' => 'Le mot de passe de ce compte est géré par LDAP / Active Directory. Veuillez contacter votre service informatique pour changer votre mot de passe.',
+        'multi_company_items_assigned' => 'This user has items assigned that belong to a different company. Please check them in or edit their company.'
     ),
 
     'deletefile' => array(
diff --git a/resources/lang/fr-FR/admin/users/table.php b/resources/lang/fr-FR/admin/users/table.php
index 67c992c1fd..51192ff67b 100644
--- a/resources/lang/fr-FR/admin/users/table.php
+++ b/resources/lang/fr-FR/admin/users/table.php
@@ -22,7 +22,7 @@ return array(
     'managed_locations'     => 'Emplacements gérés',
     'managed_users'         => 'Utilisateurs gérés',
     'name' 					=> 'Nom',
-    'nogroup'               => 'Aucun groupe n\'a encore été créé. Pour en ajouter un, visitez : ',
+    'nogroup'               => 'No groups have been created yet. To add one, visit:',
     'notes'                 => 'Notes',
     'password_confirm' 		=> 'Confirmer le mot de passe',
     'password' 				=> 'Mot de passe',
diff --git a/resources/lang/fr-FR/auth.php b/resources/lang/fr-FR/auth.php
index 5bde3c3ffc..5ebd745df9 100644
--- a/resources/lang/fr-FR/auth.php
+++ b/resources/lang/fr-FR/auth.php
@@ -15,6 +15,6 @@ return array(
 
     'failed' => 'Ces identifiants ne correspondent à aucun enregistrement.',
     'password' => 'Le mot de passe fourni est incorrect.',
-    'throttle' => 'Trop de tentatives de connexion. Veuillez réessayer à nouveau dans :seconds secondes.',
+    'throttle' => 'Too many login attempts. Please try again in :minutes minute(s).',
 
 );
diff --git a/resources/lang/fr-FR/auth/message.php b/resources/lang/fr-FR/auth/message.php
index 3a80008497..f22b2871b7 100644
--- a/resources/lang/fr-FR/auth/message.php
+++ b/resources/lang/fr-FR/auth/message.php
@@ -6,16 +6,14 @@ return array(
     'account_not_found'      => 'Nom d\'usager ou mot de passe incorrect.',
     'account_not_activated'  => 'Ce compte n\'est pas activé.',
     'account_suspended'      => 'Ce compte est suspendu.',
-    'account_banned'         => 'Ce compte est banni.',
-    'throttle'               => 'Trop de tentatives de connexion échouées. Veuillez réessayer dans :minutes minutes.',
 
     'two_factor' => array(
         'already_enrolled'      => 'Votre appareil est déjà inscrit.',
         'success'               => 'Vous êtes bien connecté.',
         'code_required'         => 'Le code à deux facteurs est requis.',
         'invalid_code'          => 'Le code à deux facteurs est invalide.',
-        'enter_two_factor_code' => 'Please enter your two-factor authentication code.',
-        'please_enroll'         => 'Please enroll a device in two-factor authentication.',
+        'enter_two_factor_code' => 'Veuillez saisir votre code d\'authentification à deux facteurs.',
+        'please_enroll'         => 'Veuillez inscrire un appareil dans l\'authentification à deux facteurs.',
     ),
 
     'signin' => array(
diff --git a/resources/lang/fr-FR/button.php b/resources/lang/fr-FR/button.php
index eff38f20de..5baf040984 100644
--- a/resources/lang/fr-FR/button.php
+++ b/resources/lang/fr-FR/button.php
@@ -7,6 +7,7 @@ return [
     'checkin_and_delete'  	    => 'Tout dissocier / Supprimer l\'utilisateur',
     'delete'  	                => 'Supprimer',
     'edit'    	                => 'Éditer',
+    'clone'    	                => 'Dupliquer',
     'restore' 	                => 'Restaurer',
     'remove'                    => 'Supprimer',
     'request'                   => 'Demander',
@@ -21,4 +22,13 @@ return [
     'add_maintenance'           => 'Ajouter une maintenance',
     'append'                    => 'Ajouter',
     'new'                       => 'Nouveau',
+    'var' => [
+        'clone'     => 'Dupliquer :item_type',
+        'edit'      => 'Éditer :item_type',
+        'delete'    => 'Supprimer :item_type',
+        'restore'   => 'Restaurer :item_type',
+        'create'    => 'Créer nouveau :item_type',
+        'checkout'  => 'Attribuer :item_type',
+        'checkin'   => 'Désattribuer :item_type',
+    ]
 ];
diff --git a/resources/lang/fr-FR/general.php b/resources/lang/fr-FR/general.php
index 51142c8e4f..0a96f20909 100644
--- a/resources/lang/fr-FR/general.php
+++ b/resources/lang/fr-FR/general.php
@@ -10,10 +10,10 @@ return [
     'action'                => 'Action',
     'activity_report'		=> 'Rapport d\'activité',
     'address'				=> 'Adresse',
-    'admin'					=> 'Admin',
-    'admin_tooltip'			=> 'This user has admin privileges',
-    'superuser'				=> 'Superuser',
-    'superuser_tooltip'		=> 'This user has superuser privileges',
+    'admin'					=> 'Paramètres de l\'administrateur',
+    'admin_tooltip'			=> 'Cet utilisateur a des privilèges d\'administrateur',
+    'superuser'				=> 'Super-utilisateur',
+    'superuser_tooltip'		=> 'Cet utilisateur a des privilèges de super-utilisateur',
     'administrator'			=> 'Administrateur·trice',
     'add_seats'             => 'Places ajoutées',
     'age'                   => "Âge",
@@ -23,13 +23,16 @@ return [
     'asset_models'			=> 'Modèles d\'actif',
     'asset_model'			=> 'Modèle',
     'asset'					=> 'Actif',
+    'asset_previous'        => 'Asset (Previously Assigned)',
     'asset_report'          => 'Rapport d\'actif',
     'asset_tag'				=> 'Numéro d\'inventaire',
     'asset_tags'            => 'Numéros d\'inventaire',
     'assets_available'		=> 'Actifs disponibles',
     'accept_assets'         => 'Accepter les actifs :name',
     'accept_assets_menu'    => 'Accepter les actifs',
+    'accept_item'           => 'Accept Item',
     'audit'				    => 'Audit',
+    'audits'				=> 'Audits',
     'audit_report'			=> 'Journal d\'audit',
     'assets'				=> 'Actifs',
     'assets_audited'        => 'actifs audités',
@@ -61,9 +64,12 @@ return [
     'changepassword'  		=> 'Changer le mot de passe',
     'checkin'  				=> 'Dissocier',
     'checkin_from'  		=> 'Dissocier de',
+    'checkin_note'  		=> 'Checkin Note',
+    'checkout_note'  		=> 'Checkout Note',
     'checkout'  			=> 'Associer',
     'checkouts_count'       => 'Associations',
     'checkins_count'        => 'Dissociations',
+    'checkin_and_delete'  	=> 'Enregistrement et suppression',
     'user_requests_count'   => 'Demandes',
     'city'  				=> 'Ville',
     'click_here'			=> 'Cliquez ici',
@@ -77,7 +83,7 @@ return [
     'consumables'			=> 'Consommables',
     'country'  				=> 'Pays',
     'could_not_restore'     => 'Erreur lors de la restauration de :item_type: :error',
-    'not_deleted'           => 'Le :item_type n\'est pas supprimé et ne peut donc pas être restauré',
+    'not_deleted'           => 'Le :item_type n\'a pas été supprimé et ne peut donc pas être restauré',
     'create'				=> 'Créer',
     'created'               => 'Élément créé',
     'created_asset'			=> 'Actif créé',
@@ -86,11 +92,13 @@ return [
     'record_created' 		=> 'Enregistrement créé',
     'updated_at' 			=> 'Mise à jour à',
     'currency'  			=> '€', // this is deprecated
+    'currency_text'  		=> 'Devise', //
     'current'  				=> 'Actuels',
     'current_password'      => 'Mot de passe actuel',
     'customize_report'      => 'Personnaliser le rapport',
     'custom_report'         => 'Rapport d\'actif personnalisé',
     'dashboard'				=> 'Tableau de bord',
+    'data_source'           => 'Data Source',
     'days'      			=> 'journées',
     'days_to_next_audit'    => 'Jours avant la prochaine vérification',
     'date'					=> 'Date',
@@ -98,7 +106,7 @@ return [
     'debug_warning_text'    => 'Cette application fonctionne en mode de production avec le débogage activé. Cela peut exposer des données sensibles si votre application est accessible au monde extérieur. Désactivez le mode de débogage en définissant la valeur <code> APP_DEBUG </ code> dans votre fichier <code> .env </ code> sur <code> false </ code>.',
     'delete'  				=> 'Supprimer',
     'delete_confirm'  		=> 'Êtes-vous certain de vouloir supprimer :item?',
-    'delete_confirm_no_undo' => 'Êtes-vous sûr·e de vouloir supprimer :item ? Cette action est irréversible.',
+    'delete_confirm_no_undo' => 'Êtes-vous sûr de vouloir supprimer :item ? Cette action est irréversible.',
     'deleted'  				=> 'Supprimé',
     'delete_seats'  		=> 'Places supprimées',
     'deletion_failed'       => 'Échec de la suppression',
@@ -114,29 +122,13 @@ return [
     'editprofile'  			=> 'Éditer votre profile',
     'eol'					=> 'Fin de vie',
     'email_domain'			=> 'Domaine de l\'e-mail',
-    'email_format'			=> 'Format de l\'e-mail',
     'employee_number'       => 'Numéro d’employé',
     'email_domain_help'		=> 'C\'est utilisé pour générer des adresses e-mail lors de l\'importation',
     'error'				    => 'Erreur',
     'exclude_archived'      => 'Exclure les matériels archivés',
     'exclude_deleted'       => 'Exclure les actifs supprimés',
     'example'				=> 'Exemple : ',
-    'filastname_format'			=> 'Première lettre du prénom Nom de famille (jsmith@example.com)',
-    'firstname_lastname_format'	=> 'Prénom Nom de famille (jane.smith@example.com)',
-    'firstname_lastname_underscore_format' => 'Prénom Nom (jane_smith@example.com)',
-    'lastnamefirstinitial_format' =>  'Nom de famille Première lettre du prénom (smithj@example.com)',
-    'firstintial_dot_lastname_format' => 'Première lettre du prénom et nom de famille (j.smith@example.com)',
-    'firstname_lastname_display'	=> 'Prénom Nom (Jane Smith)',
-    'lastname_firstname_display'	=> 'Nom Prénom (Smith Jane)',
-    'name_display_format'	=> 'Format d\'affichage du nom',
-    'first'					=> 'Premier',
-    'firstnamelastname'     => 'Prénom et nom de famille (jane.smith@example.com)',
-    'lastname_firstinitial' => 'Nom de famille et première lettre du prénom (smith_j@example.com)',
-    'firstinitial.lastname' => 'Première lettre du prénom et nom de famille (j.smith@example.com)',
-    'firstnamelastinitial'  => 'Prénom (janes@example.com)',
-    'lastnamefirstname'      => 'Last Name First Name (smith.jane@example.com)',
-    'first_name'			=> 'Prénom',
-    'first_name_format'		=> 'Prénom (jane@example.com)',
+
     'files'                 => 'Fichiers',
     'file_name'				=> 'Fichier',
     'file_type'             => 'Type de fichier',
@@ -157,8 +149,8 @@ return [
     'include_deleted'       => 'Inclure les matériels supprimés',
     'image_upload'         	=> 'Charger une image',
     'filetypes_accepted_help'    => 'Le type de fichier accepté est :types. La taille maximale autorisée est :size.|Les types de fichiers acceptés sont :types. La taille maximale autorisée est :size.',
-    'filetypes_size_help'   => 'La taille maximale autorisée des téléversements est :size.',
-    'image_filetypes_help'  => 'Accepted filetypes are jpg, webp, png, gif, svg, and avif. Max upload size allowed is :size.',
+    'filetypes_size_help'   => 'La taille maximale de téléversement autorisée est :size.',
+    'image_filetypes_help'  => 'Les types de fichiers acceptés sont jpg, webp, png, gif, svg et avif. La taille maximale du fichier autorisée est :size.',
     'unaccepted_image_type'  => 'Ce fichier image n\'est pas lisible. Les types de fichiers acceptés sont jpg, webp, png, gif et svg. Le type mimetype de ce fichier est : :mimetype.',
     'import'         	    => 'Importer',
     'import_this_file'      => 'Champs de la carte et traiter ce fichier',
@@ -178,12 +170,17 @@ return [
     'last'					=> 'Dernier',
     'last_login'            => 'Dernière connexion',
     'last_name'             => 'Nom',
+    'firstname_lastname_display'	=> 'Prénom Nom (Jane Smith)',
+    'lastname_firstname_display'	=> 'Nom Prénom (Smith Jane)',
+    'name_display_format'	=> 'Format d\'affichage du nom',
+    'first'					=> 'Premier',
+    'first_name'			=> 'Prénom',
     'license'				=> 'Licence',
     'license_report'        => 'Rapport de licence',
     'licenses_available'	=> 'Licences disponibles',
     'licenses'				=> 'Licences',
     'list_all'				=> 'Lister tout',
-    'loading'				=> 'Chargement en cours... Veuillez patienter...',
+    'loading'				=> 'Chargement en cours... Merci de patienter...',
     'lock_passwords'        => 'Ce champ ne sera pas sauvegardé dans une installation de démonstration.',
     'feature_disabled'      => 'Cette fonctionnalité a été désactivée pour l\'installation de démonstration.',
     'location'              => 'Lieu',
@@ -206,8 +203,8 @@ return [
     'new_password'          => 'Nouveau mot de passe',
     'next'					=> 'Prochain',
     'next_audit_date'		=> 'Prochaine date de vérification',
-    'next_audit_date_help'  => 'If you use auditing in your organization, this is usually automatically calculated based on the asset&apos;s last audit date and audit frequency (in <code>Admin Settings &gt; Alerts</code>) and you can leave this blank. You can manually set this date here if you need to, but it must be later than the last audit date. ',
-    'audit_images_help'     => 'You can find audit images in the asset\'s history tab.',
+    'next_audit_date_help'  => 'Si vous utilisez l\'audit dans votre organisation, ceci est généralement calculé automatiquement en fonction de la dernière date d\'audit et de la dernière fréquence d\'audit de l\'actif (dans <code>Paramètres &gt; Alertes</code>) et vous pouvez laisser ce champ vide. Vous pouvez définir manuellement cette date ici si vous en avez besoin, mais elle doit être postérieure à la dernière date d\'audit. ',
+    'audit_images_help'     => 'Vous pouvez trouver des images d\'audit dans l\'onglet historique de l\'actif.',
     'no_email'              => 'Aucune adresse e-mail associée à cet utilisateur',
     'last_audit'		    => 'Dernier audit',
     'new'					=> 'nouveau!',
@@ -215,6 +212,14 @@ return [
     'no_results'			=> 'Pas de résultat.',
     'no'  					=> 'Non',
     'notes'  				=> 'Notes',
+    'note_added'            => 'Note ajoutée',
+    'options'				=> 'Options',
+    'preview'				=> 'Preview',
+    'add_note'              => 'Ajouter une note',
+    'note_edited'            => 'Note modifiée',
+    'edit_note'              => 'Modifier la note',
+    'note_deleted'            => 'Note supprimée',
+    'delete_note'              => 'Supprimer la note',
     'order_number'          => 'Numéro de commande',
     'only_deleted'          => 'Seulement les matériels supprimés',
     'page_menu'				=> 'Afficher_MENU_items',
@@ -229,7 +234,7 @@ return [
     'purchase_date'         => 'Date d\'achat',
     'qty'		            => 'QTÉ',
     'quantity'		        => 'Quantité',
-    'quantity_minimum'      => 'Vous avez :count articles en dessous ou presque en dessous des niveaux de quantité minimum',
+    'quantity_minimum'      => 'Vous avez un élément en dessous ou presque en dessous des niveaux de quantité minimum|Vous avez :count éléments en dessous ou presque en dessous des niveaux de quantité minimum',
     'quickscan_checkin'  	=> 'Retour rapide',
     'quickscan_checkin_status'  	=> 'Statut du retour',
     'ready_to_deploy'		=> 'Prêt à être déployé',
@@ -240,21 +245,21 @@ return [
     'restored'				=> 'restauré',
     'restore'				=> 'Restaurer',
     'requestable_models'    => 'Modèles demandables',
-    'requestable_items'     => 'Requestable Items',
+    'requestable_items'     => 'Éléments demandés',
     'requested'				=> 'Demandé',
     'requested_date'        => 'Date de la demande',
     'requested_assets'      => 'Actifs demandés',
     'requested_assets_menu' => 'Actifs demandés',
     'request_canceled'      => 'Demande annulée',
-    'request_item'          => 'Request this item',
-    'external_link_tooltip' => 'External link to',
+    'request_item'          => 'Demander cet article',
+    'external_link_tooltip' => 'Lien externe vers',
     'save'  				=> 'Sauvegarder',
     'select_var'            => 'Sélectionner :thing... ', // this will eventually replace all of our other selects
     'select'				=> 'Sélectionner',
     'select_all'            => 'Tout sélectionner',
     'search'				=> 'Rechercher',
     'select_category'       => 'Choisir une catégorie',
-    'select_datasource' => 'Sélectionnez une source de données',
+    'select_datasource' => 'Sélectionner une source de données',
     'select_department'     => 'Sélectionnez un département',
     'select_depreciation'	=> 'Choisissez un type d\'amortissement',
     'select_location'		=> 'Choisissez un emplacement',
@@ -274,13 +279,15 @@ return [
     'signed_off_by'         => 'Déconnecté par',
     'skin'       			=> 'Habillage',
     'webhook_msg_note'        => 'Une notification sera envoyée via le webhook',
-    'webhook_test_msg'        => 'Woohoo ! Il semble que votre intégration :app vers Snipe-IT fonctionne !',
+    'webhook_test_msg'        => 'Woohoo ! Il semble que votre intégration de :app vers Snipe-IT fonctionne !',
     'some_features_disabled' => 'MODE DEMO: Certaines fonctionnalités sont désactivées pour cette installation.',
     'site_name'				=> 'Nom du Site',
     'state'  				=> 'État',
     'status_labels'			=> 'Étiquette de statut',
+    'status_label'			=> 'Libellé du statut',
     'status'    			=> 'Statut',
     'accept_eula'           => 'Contrat de licence',
+    'show_or_hide_eulas' => 'Afficher/Masquer les EULAs',
     'supplier'              => 'Fournisseur',
     'suppliers'  			=> 'Fournisseurs',
     'sure_to_delete'        => 'Êtes-vous sûr de vouloir supprimer ?',
@@ -296,15 +303,15 @@ return [
     'type'  				=> 'Type ',
     'undeployable'			=> 'Non déployable',
     'unknown_admin'			=> 'Admin inconnu',
-    'username_format'		=> 'Format du nom d\'utilisateur',
     'username'              => 'Nom d\'utilisateur',
     'update'                => 'Actualiser',
+    'updating_item' => 'Mise à jour de :item',
     'upload_filetypes_help'      => 'Les types de fichiers autorisés sont png, gif, jpg, jpeg, doc, docx, pdf, xls, xlsx, txt, lic, xml, zip, rtf et rar. La taille maximale autorisée est :size.',
     'uploaded'              => 'Téléversement réussi',
     'user'					=> 'Utilisateur',
     'accepted'			    => 'validé',
     'declined'			    => 'refusé',
-    'declined_note'         => 'Declined Notes',
+    'declined_note'         => 'Notes refusées',
     'unassigned'            => 'Non assigné',
     'unaccepted_asset_report' => 'Actifs refusés',
     'users'                 => 'Utilisateurs',
@@ -323,10 +330,10 @@ return [
     'token_expired'         => 'La session de votre formulaire a expiré. Merci d\'essayer à nouveau.',
     'login_enabled'         => 'Connexion activée',
     'audit_due'             => 'Dû pour l\'audit',
-    'audit_due_days'        => 'Actifs dus pour vérification dans :days jour|Actifs dus pour audit dans :days jours',
+    'audit_due_days'        => '{}Assets Due or Overdue for Audit|[1]Assets Due or Overdue for Audit Within a Day|[2,*]Assets Due or Overdue for Audit Within :days Days',
     'checkin_due'           => 'Echéance du check-in',
     'checkin_overdue'       => 'En retard pour le check-kin',
-    'checkin_due_days'      => 'Échéance des actifs en cours de check-in dans :days jour|Les actifs dus pour l\'enregistrement dans :days Jours',
+    'checkin_due_days'      => '{}Due for Checkin|[1]Assets Due for Checkin Within :days Day|[2,*]Assets Due for Checkin Within :days Days',
     'audit_overdue'         => 'En retard pour l\'audit',
     'accept'                => 'Accepter :asset',
     'i_accept'              => 'J\'accepte',
@@ -348,7 +355,7 @@ return [
     'setup_step_4'          => 'Étape 4',
     'setup_config_check'    => 'Vérification de la configuration',
     'setup_create_database' => 'Créer les tables de la base de données',
-    'setup_create_admin'    => 'Créer un utilisateur administrateur',
+    'setup_create_admin'    => 'Créer un administrateur',
     'setup_done'            => 'Terminé !',
     'bulk_edit_about_to'    => 'Vous êtes sur le point de modifier les éléments suivants : ',
     'checked_out'           => 'Affecté',
@@ -383,6 +390,8 @@ return [
     'new_license'           => 'Nouvelle licence',
     'new_accessory'         => 'Nouvel accessoire',
     'new_consumable'        => 'Nouveau consommable',
+    'new_component'         => 'New Component',
+    'new_user'              => 'New User',
     'collapse'              => 'Replier',
     'assigned'              => 'Affecté',
     'asset_count'           => 'Nombre d\'actifs',
@@ -405,9 +414,9 @@ return [
     'accessory_name'       => 'Nom de l’accessoire :',
     'clone_item'            => 'Cloner l\'élément',
     'checkout_tooltip' => 'Affecter cet élément',
-    'checkin_tooltip' => 'Check this item in so that it is available for re-issue, re-imaging, etc',
+    'checkin_tooltip' => 'Enregistrez cet élément afin qu\'il soit disponible pour une réédition, une réimpression, etc',
     'checkout_user_tooltip' => 'Affecter cet élément à un utilisateur',
-    'checkin_to_diff_location' => 'You can choose to check this asset in to a location other than this asset\'s default location of :default_location if one is set',
+    'checkin_to_diff_location' => 'Vous pouvez choisir de vérifier cette ressource à un emplacement autre que l\'emplacement par défaut de cette ressource :default_location si elle est définie',
     'maintenance_mode'      => 'Le service est temporairement indisponible en raison d\'une mise à jour du système. Veuillez revenir plus tard.',
     'maintenance_mode_title' => 'Le système est temporairement indisponible',
     'ldap_import'           => 'Le mot de passe de l\'utilisateur ne devrait pas être géré par LDAP. (Cela vous permet d\'envoyer des demandes de mot de passe oublié.)',
@@ -418,19 +427,20 @@ return [
     'bulk_soft_delete'      =>'Supprimer ces utilisateurs également. Leur historique de matériel restera intact jusqu\'à ce que vous les supprimiez définitivement depuis le panneau de configuration de l\'administrateur.',
     'bulk_checkin_delete_success' => 'Les utilisateurs sélectionnés ont été supprimés et leurs matériels ont été dissociés.',
     'bulk_checkin_success' => 'Les articles des utilisateurs sélectionnés ont été dissociés.',
-    'set_to_null'           => 'Supprimer des valeurs pour ce matériel|Supprimer des valeurs pour :asset_count matériels ',
+    'set_to_null'           => 'Supprimer les valeurs pour cette sélection|Supprimer les valeurs pour toutes les sélections :selection_count ',
     'set_users_field_to_null'  => 'Supprimer les valeurs du champ :field pour cet·te utilisateur·trice|Supprimer les valeurs du champ :field pour les :user_count utilisateurs·trices ',
     'na_no_purchase_date'   => 'NC - Pas de date d\'achat renseignée',
     'assets_by_status'      => 'Matériels par statut',
     'assets_by_status_type'      => 'Matériels par type de status',
     'pie_chart_type'        => 'Type de diagramme circulaire',
     'hello_name'            => 'Bonjour, :name!',
-    'unaccepted_profile_warning'   => 'Vous avez :count article(s) en cours d\'acceptation. Merci de cliquer ici pour valider ou refuser leur emprunt',
+    'unaccepted_profile_warning'   => 'Vous avez un élément à valider. Cliquez ici pour accepter ou refuser | Vous avez :count éléments nécessitant une validation. Cliquez ici pour les accepter ou les refuser',
     'start_date'            => 'Date de début',
     'end_date'            => 'Date de fin',
     'alt_uploaded_image_thumbnail' => 'Miniature téléchargée',
     'placeholder_kit'       => 'Sélectionnez un kit',
     'file_not_found'        => 'Fichier non trouvé',
+    'log_record_not_found'  => 'No record for that log entry was found.',
     'preview_not_available' => '(aucun aperçu)',
     'setup'                 => 'Configuration',
     'pre_flight'            => 'Pre-Flight',
@@ -508,11 +518,11 @@ return [
         'address2' => 'Adresse Ligne 2',
         'import_note' => 'Importé à l\'aide de l\'importateur CSV',
     ],
-    'remove_customfield_association' => 'Remove this field from the fieldset. This will not delete the custom field, only this field\'s association with this fieldset.',
+    'remove_customfield_association' => 'Supprimer ce champ de l\'ensemble de champs. Cette opération ne supprime pas le champ personnalisé, mais uniquement l\'association de ce champ à cet ensemble de champs.',
     'checked_out_to_fields' => 'Checked Out To Fields',
     'percent_complete' => '% terminé',
     'uploading' => 'Téléversement... ',
-    'upload_error' => 'Erreur lors du téléversement du fichier. Veuillez vérifier qu\'il n\'y a pas de lignes vides et qu\'aucun nom de colonne n\'est dupliqué.',
+    'upload_error' => 'Error uploading file. Please check that you have no empty rows or duplicated column names in your CSV, and that the server permissions allow uploads.',
     'copy_to_clipboard' => 'Copier dans le presse-papier',
     'copied' => 'Copié !',
     'status_compatibility' => 'Si les actifs sont déjà assignés, ils ne peuvent pas être changés en un type d\'état non déployable et ce changement de valeur sera ignoré.',
@@ -528,7 +538,7 @@ return [
     'permission_denied_superuser_demo' => 'Autorisation refusée. Vous ne pouvez pas mettre à jour les informations de l\'utilisateur pour les super-admins sur la démo.',
     'pwd_reset_not_sent' => 'L\'utilisateur n\'est pas activé, est synchronisé avec LDAP ou n\'a pas d\'adresse e-mail',
     'error_sending_email' => 'Erreur lors de l\'envoi de l\'e-mail',
-    'sad_panda' => 'Sad panda. You are not authorized to do the thing. Maybe <a href=":link">return to the dashboard</a>, or contact your administrator.',
+    'sad_panda' => 'Panda triste. Vous n\'êtes pas autorisé à faire ceci. Vous pouvez <a href=":link">retourner au tableau de bord</a> ou contacter votre administrateur.',
     'bulk' => [
             'delete' =>
                 [
@@ -549,6 +559,71 @@ return [
         'license_seats'  => ':count Siège de licence|:count sièges de licence',
         'consumables'  => ':count Consommable|:count Consommables',
         'components'  => ':count Composant|:count Composants',
-    ]
+    ],
+
+    'more_info' => 'Plus d\'info',
+    'quickscan_bulk_help' => 'Si vous cochez cette case, l\'enregistrement de l\'actif sera modifié pour refléter ce nouvel emplacement. Si elle n\'est pas cochée, l\'emplacement sera simplement noté dans le journal d\'audit. Notez que si ce bien est sorti, il ne changera pas l\'emplacement de la personne, du bien ou de l\'emplacement auquel il est sorti.',
+    'whoops' => 'Oups !',
+    'something_went_wrong' => 'Un problème est survenu lors du traitement de votre requête.',
+    'close' => 'Fermer',
+    'expires' => 'Expire le',
+    'map_fields'=> 'Map :item_type Fields',
+    'remaining_var' => ':count restant',
+    'label' => 'Étiquette',
+    'import_asset_tag_exists' => 'Un actif avec la balise d\'actif :asset_tag existe déjà et une mise à jour n\'a pas été demandée. Aucune modification n\'a été apportée.',
+    'countries_manually_entered_help' => 'Les valeurs avec un astérisque (*) ont été saisies manuellement et ne correspondent pas aux valeurs du menu déroulant ISO 3166 existantes',
+    'accessories_assigned' => 'Accessoires assignés',
+    'user_managed_passwords' => 'Gestion des mots de passe',
+    'user_managed_passwords_disallow' => 'Interdire aux utilisateurs de gérer leurs propres mots de passe',
+    'user_managed_passwords_allow' => 'Permettre aux utilisateurs de gérer leurs propres mots de passe',
+    'from' => 'From',
+    'by' => 'Par',
+
+// Add form placeholders here
+    'placeholders' => [
+        'notes'  => 'Ajouter une note',
+    ],
+
+    'breadcrumb_button_actions' => [
+        'edit_item' => 'Edit :name',
+        'checkout_item' => 'Checkout :name',
+        'checkin_item' => 'Checkin :name',
+    ],
+
+    'skins' => [
+        'site_default' => 'Site Default',
+        'default_blue' => 'Default Blue',
+        'blue_dark' => 'Blue (Dark Mode)',
+        'green' => 'Green Dark',
+        'green_dark' => 'Green (Dark Mode)',
+        'red' => 'Red Dark',
+        'red_dark' => 'Red (Dark Mode)',
+        'orange' => 'Orange Dark',
+        'orange_dark' => 'Orange (Dark Mode)',
+        'black' => 'Black',
+        'black_dark' => 'Black (Dark Mode)',
+        'purple' => 'Purple',
+        'purple_dark' => 'Purple (Dark Mode)',
+        'yellow' => 'Yellow',
+        'yellow_dark' => 'Yellow (Dark Mode)',
+        'high_contrast' => 'High Contrast',
+
+    ],
+
+    'select_all_none' => 'Select/Unselect All',
+    'generic_model_not_found' => 'That :model was not found or you do not have permission to access it',
+    'deleted_models' => 'Deleted Asset Models',
+    'deleted_users' => 'Deleted Users',
+    'cost_each' => ':amount each',
+    'remove_current_image' => 'Remove current :type image',
+
+    'seeding' => [
+        'manufacturers' => [
+            'button' => 'Create Manufacturers',
+            'prompt' => 'You do not have any manufacturers yet. Would you like to seed a list of common manufacturers? (THIS WILL OVERWRITE EXISTING MANUFACTURERS, including those that have been soft-deleted.)',
+            'success' => 'Manufacturers seeded successfully',
+            'error' => 'Could not seed manufacturers. A manufacturer record already exists and seeding would overwrite it.|Could not seed manufacturers. :count manufacturer records already exist and seeding would overwrite them.',
+        ],
+    ],
 
 ];
diff --git a/resources/lang/fr-FR/localizations.php b/resources/lang/fr-FR/localizations.php
index 03f030a6e3..8801e4c45b 100644
--- a/resources/lang/fr-FR/localizations.php
+++ b/resources/lang/fr-FR/localizations.php
@@ -2,7 +2,7 @@
 
 return [
 
-    'select_language' => 'Sélectionnez une langue',
+    'select_language' => 'Select a Language',
     'languages' => [
         'en-US'=> 'Anglais, États-Unis',
         'en-GB'=> 'Anglais, Royaume-Uni',
@@ -40,7 +40,9 @@ return [
         'ms-MY'=> 'Malais',
         'mi-NZ'=> 'Maori',
         'mn-MN'=> 'Mongol',
-        'no-NO'=> 'Norvégien',
+        'nb-NO'=> 'Norvégien (Bokmål)',
+        'om-ET' => 'Oromo (Ethiopian)',
+        //'nn-NO'=> 'Norwegian Nynorsk',
         'fa-IR'=> 'Perse',
         'pl-PL'=> 'Polonais',
         'pt-PT'=> 'Portugais',
@@ -66,7 +68,7 @@ return [
         'zu-ZA'=> 'Zoulou',
     ],
 
-    'select_country' => 'Sélectionnez un pays',
+    'select_country' => 'Select a Country',
     
     'countries' => [
         'AC'=>'Île de l\'Ascension',
@@ -133,6 +135,7 @@ return [
         'EC'=>'Équateur',
         'EE'=>'Estonie',
         'EG'=>'Égypte',
+        'GB-ENG'=>'England',
         'ER'=>'Érythrée',
         'ES'=>'Espagne',
         'ET'=>'Éthiopie',
@@ -231,6 +234,7 @@ return [
         'NG'=>'Nigéria',
         'NI'=>'Nicaragua',
         'NL'=>'Pays-Bas',
+        'GB-NIR' => 'Northern Ireland',
         'NO'=>'Norvège',
         'NP'=>'Népal',
         'NR'=>'Nauru',
@@ -258,7 +262,7 @@ return [
         'RU'=>'Fédération de Russie',
         'RW'=>'Rwanda',
         'SA'=>'Arabie Saoudite',
-        'UK'=>'Écosse',
+        'GB-SCT'=>'Écosse',
         'SB'=>'Îles Salomon',
         'SC'=>'Seychelles',
         'SS'=>'Soudan du Sud',
@@ -310,6 +314,7 @@ return [
         'VI'=>'Îles Vierges Américaines',
         'VN'=>'Vietnam',
         'VU'=>'Vanuatu',
+        'GB-WLS' =>'Wales',
         'WF'=>'Wallis-et-Futuna',
         'WS'=>'Samoa',
         'YE'=>'Yémen',
diff --git a/resources/lang/fr-FR/mail.php b/resources/lang/fr-FR/mail.php
index 4f9d751bbb..a6cf7dca9a 100644
--- a/resources/lang/fr-FR/mail.php
+++ b/resources/lang/fr-FR/mail.php
@@ -23,24 +23,25 @@ return [
     'Item_Requested' => 'Article demandé',
     'License_Checkin_Notification' => 'Licence enregistrée',
     'License_Checkout_Notification' => 'Licence verrouillée',
+    'license_for'   => 'Licence pour',
     'Low_Inventory_Report' => 'Rapport d’inventaire bas',
     'a_user_canceled' => 'Un·e utilisateur·trice a annulé une demande d’article sur le site Web',
     'a_user_requested' => 'Un·e utilisateur·trice a demandé un article sur le site Web',
     'acceptance_asset_accepted' => 'Un utilisateur a accepté un article',
     'acceptance_asset_declined' => 'Un utilisateur a refusé un article',
-    'accessory_name' => 'Nom de l’accessoire :',
-    'additional_notes' => 'Notes complémentaires :',
+    'accessory_name' => 'Nom de l\'accessoire',
+    'additional_notes' => 'Notes complémentaires ',
     'admin_has_created' => 'Un administrateur a créé un compte pour vous sur le site :web.',
-    'asset' => 'Produit:',
-    'asset_name' => 'Nom du produit:',
+    'asset' => 'Biens',
+    'asset_name' => 'Nom de l\'actif',
     'asset_requested' => 'Produit demandé',
     'asset_tag' => 'Numéro d\'inventaire',
     'assets_warrantee_alert' => 'Il y a :count actif(s) avec une garantie expirant dans les prochains :threshold jours.|Il y a :count actif(s) avec des garanties expirant dans les prochains :threshold jours.',
     'assigned_to' => 'Affecté à',
     'best_regards' => 'Cordialement,',
-    'canceled' => 'Annulé:',
-    'checkin_date' => 'Date d\'association :',
-    'checkout_date' => 'Date de dissociation :',
+    'canceled' => 'Annulé',
+    'checkin_date' => 'Date de dissociation',
+    'checkout_date' => 'Date d\'association',
     'checkedout_from' => 'Verrouillé depuis',
     'checkedin_from'  => 'Enregistré depuis',
     'checked_into' => 'Vérifié dans',
@@ -49,27 +50,30 @@ return [
     'click_to_confirm' => 'Veuillez cliquer sur le lien suivant pour confirmer votre :web account:',
     'current_QTY' => 'Quantité actuelle',
     'days' => 'jours',
-    'expecting_checkin_date' => 'Date d\'association prévue :',
+    'expecting_checkin_date' => 'Date de dissociation prévue',
     'expires' => 'Expire le',
     'hello' => 'Bonjour',
     'hi' => 'Salut',
     'i_have_read' => 'J\'ai bien lu et approuvé les conditions d\'utilisation, et reçu cet objet.',
     'inventory_report' => 'Rapport d\'inventaire',
-    'item' => 'Article :',
+    'item' => 'Item',
+    'item_checked_reminder' => 'Ceci est un rappel que vous avez actuellement :count articles que vous n\'avez pas acceptés ou refusés. Veuillez cliquer sur le lien ci-dessous pour confirmer votre décision.',
     'license_expiring_alert' => 'Il y a :count licence expirant dans les prochains :threshold jours.|Il y a :count licences expirant dans les prochains :threshold jours.',
     'link_to_update_password' => 'Veuillez cliquer sur le lien suivant pour confirmer votre :web account:',
-    'login' => 'Nom d\'utilisateur:',
+    'login' => 'Connexion',
     'login_first_admin' => 'Connectez-vous à votre nouvelle installation Snipe-IT en utilisant les informations d\'identification ci-dessous :',
     'low_inventory_alert' => 'Il y a :count item qui est en dessous du minimum d\'inventaire ou qui sera bas sous peu.|Il y a :count articles qui sont en dessous du minimum d\'inventaire ou qui seront bas sous peu.',
     'min_QTY' => 'Quantité minimum',
     'name' => 'Nom',
     'new_item_checked' => 'Un nouvel élément a été vérifié sous votre nom, les détails sont ci-dessous.',
+    'new_item_checked_with_acceptance' => 'Un nouvel matériel a été emprunté sous votre nom et doit être accepté. Vous trouverez ci-dessous les détails correspondants.',
+    'recent_item_checked' => 'Un matériel a récemment été emprunté sous votre nom et doit être accepté. Vous trouverez ci-dessous les détails correspondants.',
     'notes' => 'Notes',
-    'password' => 'Mot de passe:',
+    'password' => 'Mot de passe',
     'password_reset' => 'Réinitialisation du mot de passe',
     'read_the_terms' => 'Merci de lire les conditions d\'utilisation ci-dessous.',
     'read_the_terms_and_click' => 'Veuillez lire les conditions d\'utilisation ci-dessous, et cliquez sur le lien en bas pour confirmer que vous avez lu et accepté les conditions d\'utilisation, et que vous avez reçu l\'actif.',
-    'requested' => 'Demandé :',
+    'requested' => 'Demandé',
     'reset_link' => 'Votre lien pour réinitialiser le mot de passe',
     'reset_password' => 'Cliquez ici pour réinitialiser votre mot de passe:',
     'rights_reserved' => 'Tous droits réservés.',
@@ -86,8 +90,10 @@ return [
     'upcoming-audits' => 'Il y a :count matériel à venir pour un audit dans les :threshold jours.|Il y a :count matériels à venir pour un audit dans les :threshold jours.',
     'user' => 'Utilisateur',
     'username' => 'Nom d\'utilisateur',
+    'unaccepted_asset_reminder' => 'Rappel : vous avez des actifs non acceptés.',
     'welcome' => 'Bienvenue, :name',
     'welcome_to' => 'Bienvenue sur :web!',
     'your_assets' => 'Voir vos matériels',
     'your_credentials' => 'Vos identifiants Snipe-IT',
+    'mail_sent' => 'Email envoyé avec succès !',
 ];
diff --git a/resources/lang/fr-FR/table.php b/resources/lang/fr-FR/table.php
index e097a0f17a..2652b99bee 100644
--- a/resources/lang/fr-FR/table.php
+++ b/resources/lang/fr-FR/table.php
@@ -6,6 +6,6 @@ return array(
     'action' 		        => 'Action',
     'by'      		        => 'Par',
     'item' 			        => 'Item',
-    'no_matching_records'   => 'No matching records found',
+    'no_matching_records'   => 'Aucun enregistrement correspondant n\'a été trouvé',
 
 );
diff --git a/resources/lang/fr-FR/validation.php b/resources/lang/fr-FR/validation.php
index 20bc87f255..59a17bd3ab 100644
--- a/resources/lang/fr-FR/validation.php
+++ b/resources/lang/fr-FR/validation.php
@@ -13,87 +13,150 @@ return [
     |
     */
 
-    'accepted'             => 'L\'attribut ":attribute" doit être accepté.',
-    'active_url'           => 'L\'attribut ":attribute" n\'est pas une URL valide.',
-    'after'                => 'L\'attribut ":attribute" doit être une date après :date.',
-    'after_or_equal'       => 'L\'attribut: doit être une date après ou égale à: date.',
-    'alpha'                => 'L\'attribut ":attribute" ne peut contenir que des lettres.',
-    'alpha_dash'           => 'L\'attribut ":attribute" ne peut contenir que des lettres, des nombres, et des tirets.',
-    'alpha_num'            => 'L\'attribut ":attribute" ne peut contenir que des caractères alphanumériques.',
-    'array'                => 'L\'attribut: doit être un tableau.',
-    'before'               => 'L\'attribut ":attribute" doit être une date avant :date.',
-    'before_or_equal'      => 'L\'attribut: doit être une date antérieure ou égale à: date.',
-    'between'              => [
-        'numeric' => 'L\'attribut ":attribute" doit être entre :min et :max.',
-        'file'    => 'L\'attribut ":attribute" doit être entre :min et :max kilo-octets.',
-        'string'  => 'L\'attribut ":attribute" doit contenir entre :min et :max caractères.',
-        'array'   => 'L\'attribut: doit avoir entre: min et: max items.',
+    'accepted' => 'Le champ :attribute doit être accepté.',
+    'accepted_if' => 'Le champ :attribute doit être accepté quand :other vaut :value.',
+    'active_url' => 'Le champ :attribute doit être une URL valide.',
+    'after' => 'Le champ :attribute doit être une date postérieure au :date.',
+    'after_or_equal' => 'Le champ :attribute doit être une date postérieure ou égale au :date.',
+    'alpha' => 'Le champ :attribute doit contenir uniquement des lettres.',
+    'alpha_dash' => 'Le champ :attribute doit contenir uniquement des lettres, chiffres, tirets haut et bas.',
+    'alpha_num' => 'Le champ :attribute doit contenir uniquement des lettres et des chiffres.',
+    'array' => 'Le champ :attribute doit être un tableau.',
+    'ascii' => 'Le champ :attribute doit contenir uniquement des caractères ASCII.',
+    'before' => 'Le champ :attribute doit être une date antérieure au :date.',
+    'before_or_equal' => 'Le champ :attribute doit être une date antérieure ou égale au :date.',
+    'between' => [
+        'array' => 'Le champ :attribute doit contenir entre :min et :max objets.',
+        'file' => 'Le champ :attribute doit avoir une taille comprise entre :min et :max kilooctets.',
+        'numeric' => 'Le champ :attribute doit être compris entre :min et :max.',
+        'string' => 'Le champ :attribute doit contenir entre :min et :max caractères.',
     ],
-    'boolean'              => 'L\'attribut : doit être vrai ou faux.',
-    'confirmed'            => 'La confirmation et l\'attribut ":attribute" ne concordent pas.',
-    'date'                 => 'L\'attribut ":attribute" n\'est pas une date valide.',
-    'date_format'          => 'L\'attribut ":attribute" ne respecte pas le format ":format".',
-    'different'            => 'L\'attribut ":attribute" et l\'attribut ":other" doivent être différents.',
-    'digits'               => 'L\'attribut ":attribute" doit contenir :digits chiffres.',
-    'digits_between'       => 'L\'attribut ":attribute" doit contenir entre :min et :max chiffres.',
-    'dimensions'           => 'L\'attribut: a des dimensions d\'image invalides.',
-    'distinct'             => 'Le champ d\'attribut: a une valeur en double.',
-    'email'                => 'Le format de l\'attribut ":attribute" est invalide.',
-    'exists'               => 'L\'attribut ":attribute" est invalide.',
-    'file'                 => 'L\'attribut: doit être un fichier.',
-    'filled'               => 'Le champ d\'attribut: doit avoir une valeur.',
-    'image'                => 'L\'attribut ":attribute" doit être une image.',
+    'boolean' => 'Le champ :attribute doit être vrai ou faux.',
+    'can' => 'Le champ :attribute contient une valeur non autorisée.',
+    'confirmed' => 'La confirmation du champ :attribute ne correspond pas.',
+    'contains' => 'Le champ :attribute manque d\'une valeur obligatoire.',
+    'current_password' => 'Le mot de passe est incorrect.',
+    'date' => 'Le champ :attribute doit être une date valide.',
+    'date_equals' => 'Le champ :attribute doit être une date égale au :date.',
+    'date_format' => 'Le champ :attribute doit correspondre au format :format.',
+    'decimal' => 'The :attribute field must have :decimal decimal places.',
+    'declined' => 'The :attribute field must be declined.',
+    'declined_if' => 'The :attribute field must be declined when :other is :value.',
+    'different' => 'The :attribute field and :other must be different.',
+    'digits' => 'The :attribute field must be :digits digits.',
+    'digits_between' => 'The :attribute field must be between :min and :max digits.',
+    'dimensions' => 'The :attribute field has invalid image dimensions.',
+    'distinct' => 'Le champ d\'attribut: a une valeur en double.',
+    'doesnt_end_with' => 'The :attribute field must not end with one of the following: :values.',
+    'doesnt_start_with' => 'The :attribute field must not start with one of the following: :values.',
+    'email' => 'The :attribute field must be a valid email address.',
+    'ends_with' => 'The :attribute field must end with one of the following: :values.',
+    'enum' => 'L\'attribut ":attribute" est invalide.',
+    'exists' => 'L\'attribut ":attribute" est invalide.',
+    'extensions' => 'The :attribute field must have one of the following extensions: :values.',
+    'file' => 'The :attribute field must be a file.',
+    'filled' => 'Le champ d\'attribut: doit avoir une valeur.',
+    'gt' => [
+        'array' => 'The :attribute field must have more than :value items.',
+        'file' => 'The :attribute field must be greater than :value kilobytes.',
+        'numeric' => 'The :attribute field must be greater than :value.',
+        'string' => 'The :attribute field must be greater than :value characters.',
+    ],
+    'gte' => [
+        'array' => 'The :attribute field must have :value items or more.',
+        'file' => 'The :attribute field must be greater than or equal to :value kilobytes.',
+        'numeric' => 'The :attribute field must be greater than or equal to :value.',
+        'string' => 'The :attribute field must be greater than or equal to :value characters.',
+    ],
+    'hex_color' => 'The :attribute field must be a valid hexadecimal color.',
+    'image' => 'The :attribute field must be an image.',
     'import_field_empty'    => 'La valeur de :fieldname ne peut pas être vide.',
-    'in'                   => 'Le :attribute selectionné est invalide.',
-    'in_array'             => 'Le champ d\'attribut: n\'existe pas dans autre.',
-    'integer'              => 'L\'attribut ":attribute" doit être un nombre entier.',
-    'ip'                   => 'L\'attribut ":attribute" doit être une adresse IP valide.',
-    'ipv4'                 => 'L\'attribut: doit être une adresse IPv4 valide.',
-    'ipv6'                 => 'L\'attribut: doit être une adresse IPv6 valide.',
-    'is_unique_department' => 'L\'attribut :attribute doit être unique à cet emplacement de la société',
-    'json'                 => 'L\'attribut: doit être une chaîne JSON valide.',
-    'max'                  => [
-        'numeric' => 'L\'attribut ":attribute" ne peut pas être plus grand que :max.',
-        'file'    => 'L\'attribut ":attribute" ne doit pas dépasser :max kilo-octets.',
-        'string'  => 'L\'attribut ":attribute" ne doit pas faire plus de :max caractères.',
-        'array'   => 'L\'attribut: peut ne pas avoir plus de: max items.',
+    'in' => 'Le :attribute selectionné est invalide.',
+    'in_array' => 'The :attribute field must exist in :other.',
+    'integer' => 'The :attribute field must be an integer.',
+    'ip' => 'The :attribute field must be a valid IP address.',
+    'ipv4' => 'The :attribute field must be a valid IPv4 address.',
+    'ipv6' => 'The :attribute field must be a valid IPv6 address.',
+    'json' => 'The :attribute field must be a valid JSON string.',
+    'list' => 'The :attribute field must be a list.',
+    'lowercase' => 'The :attribute field must be lowercase.',
+    'lt' => [
+        'array' => 'The :attribute field must have less than :value items.',
+        'file' => 'The :attribute field must be less than :value kilobytes.',
+        'numeric' => 'The :attribute field must be less than :value.',
+        'string' => 'The :attribute field must be less than :value characters.',
     ],
-    'mimes'                => 'Le fichier :attribute doit être de type :values.',
-    'mimetypes'            => 'L\'attribut: doit être un fichier de type:: valeurs.',
-    'min'                  => [
-        'numeric' => 'L\'attribut ":attribute" doit être au moins :min.',
-        'file'    => 'L\'attribut ":attribute" doit faire au moins :min kilo-octets.',
-        'string'  => 'L\'attribut ":attribute" doit faire au moins :min caractères.',
-        'array'   => 'L\'attribut: doit avoir au moins: éléments min.',
+    'lte' => [
+        'array' => 'The :attribute field must not have more than :value items.',
+        'file' => 'The :attribute field must be less than or equal to :value kilobytes.',
+        'numeric' => 'The :attribute field must be less than or equal to :value.',
+        'string' => 'The :attribute field must be less than or equal to :value characters.',
     ],
-    'starts_with'          => 'L\'attribut :attribute doit commencer par l\'une des valeurs suivantes : :values.',
-    'ends_with'            => 'Le champ :attribute doit se terminer par une des valeurs suivantes : :values.',
+    'mac_address' => 'The :attribute field must be a valid MAC address.',
+    'max' => [
+        'array' => 'The :attribute field must not have more than :max items.',
+        'file' => 'The :attribute field must not be greater than :max kilobytes.',
+        'numeric' => 'The :attribute field must not be greater than :max.',
+        'string' => 'The :attribute field must not be greater than :max characters.',
+    ],
+    'max_digits' => 'The :attribute field must not have more than :max digits.',
+    'mimes' => 'The :attribute field must be a file of type: :values.',
+    'mimetypes' => 'The :attribute field must be a file of type: :values.',
+    'min' => [
+        'array' => 'The :attribute field must have at least :min items.',
+        'file' => 'The :attribute field must be at least :min kilobytes.',
+        'numeric' => 'The :attribute field must be at least :min.',
+        'string' => 'The :attribute field must be at least :min characters.',
+    ],
+    'min_digits' => 'The :attribute field must have at least :min digits.',
+    'missing' => 'The :attribute field must be missing.',
+    'missing_if' => 'The :attribute field must be missing when :other is :value.',
+    'missing_unless' => 'The :attribute field must be missing unless :other is :value.',
+    'missing_with' => 'The :attribute field must be missing when :values is present.',
+    'missing_with_all' => 'The :attribute field must be missing when :values are present.',
+    'multiple_of' => 'The :attribute field must be a multiple of :value.',
+    'not_in' => 'L\'attribut ":attribute" est invalide.',
+    'not_regex' => 'The :attribute field format is invalid.',
+    'numeric' => 'Le champ :attribute doit être un nombre.',
+    'password' => [
+        'letters' => 'Le champ :attribute doit contenir au moins une lettre.',
+        'mixed' => 'The :attribute field must contain at least one uppercase and one lowercase letter.',
+        'numbers' => 'The :attribute field must contain at least one number.',
+        'symbols' => 'The :attribute field must contain at least one symbol.',
+        'uncompromised' => 'The given :attribute has appeared in a data leak. Please choose a different :attribute.',
+    ],
+    'percent'       => 'The depreciation minimum must be between 0 and 100 when depreciation type is percentage.',
 
-    'not_in'               => 'L\'attribut ":attribute" est invalide.',
-    'numeric'              => 'L\'attribut ":attribute" doit être un nombre.',
-    'present'              => 'Le champ d\'attribut: doit être présent.',
-    'valid_regex'          => 'Ce n\'est pas une règle Regex valide. ',
-    'regex'                => 'Le format de l\'attribut ":attribute" est invalide.',
-    'required'             => 'Le champs :attribute est nécessaire.',
-    'required_if'          => 'Le champ :attribute est nécessaire quand :other vaut :value.',
-    'required_unless'      => 'Le champ d\'attribut: est obligatoire sauf si: autre est dans: valeurs.',
-    'required_with'        => 'Le champ :attribute est nécessaire quand :values est présent.',
-    'required_with_all'    => 'Le champ d\'attribut: est requis lorsque: les valeurs sont présentes.',
-    'required_without'     => 'Le champ :attribute est nécessaire quand :values n\'est pas présent.',
+    'present' => 'Le champ d\'attribut: doit être présent.',
+    'present_if' => 'The :attribute field must be present when :other is :value.',
+    'present_unless' => 'The :attribute field must be present unless :other is :value.',
+    'present_with' => 'The :attribute field must be present when :values is present.',
+    'present_with_all' => 'The :attribute field must be present when :values are present.',
+    'prohibited' => 'The :attribute field is prohibited.',
+    'prohibited_if' => 'The :attribute field is prohibited when :other is :value.',
+    'prohibited_unless' => 'The :attribute field is prohibited unless :other is in :values.',
+    'prohibits' => 'The :attribute field prohibits :other from being present.',
+    'regex' => 'The :attribute field format is invalid.',
+    'required' => 'Le champs :attribute est nécessaire.',
+    'required_array_keys' => 'The :attribute field must contain entries for: :values.',
+    'required_if' => 'Le champ :attribute est nécessaire quand :other vaut :value.',
+    'required_if_accepted' => 'The :attribute field is required when :other is accepted.',
+    'required_if_declined' => 'The :attribute field is required when :other is declined.',
+    'required_unless' => 'Le champ d\'attribut: est obligatoire sauf si: autre est dans: valeurs.',
+    'required_with' => 'Le champ :attribute est nécessaire quand :values est présent.',
+    'required_with_all' => 'The :attribute field is required when :values are present.',
+    'required_without' => 'Le champ :attribute est nécessaire quand :values n\'est pas présent.',
     'required_without_all' => 'Le champ d\'attribut: est requis lorsque aucune des valeurs suivantes n\'est présente.',
-    'same'                 => 'L\'attribut ":attribute" et :other doivent correspondre.',
-    'size'                 => [
-        'numeric' => 'L\'attribut ":attribute" doit faire :size.',
-        'file'    => 'L\'attribut ":attribute" doit faire :size kilo-octets.',
-        'string'  => 'L\'attribut ":attribute" doit faire :size caractères.',
-        'array'   => 'L\'attribut: doit contenir: des éléments de taille.',
+    'same' => 'The :attribute field must match :other.',
+    'size' => [
+        'array' => 'The :attribute field must contain :size items.',
+        'file' => 'The :attribute field must be :size kilobytes.',
+        'numeric' => 'The :attribute field must be :size.',
+        'string' => 'The :attribute field must be :size characters.',
     ],
+    'starts_with' => 'The :attribute field must start with one of the following: :values.',
     'string'               => 'L\'attribut: doit être une chaîne.',
-    'timezone'             => 'L\'attribut: doit être une zone valide.',
     'two_column_unique_undeleted' => ':attribute doit être unique entre :table1 et :table2. ',
-    'unique'               => 'Cet-te :attribute a déjà été pris-e.',
-    'uploaded'             => 'L\'attribut: n\'a pas pu télécharger.',
-    'url'                  => 'Le format de cet-te :attribute est invalide.',
     'unique_undeleted'     => ':attribute doit être unique.',
     'non_circular'         => 'Le champ :attribute ne doit pas créer de référence circulaire.',
     'not_array'            => ':attribute ne peut pas être un tableau.',
@@ -102,11 +165,14 @@ return [
     'numbers'              => 'Le mot de passe doit contenir au moins un chiffre.',
     'case_diff'            => 'Le mot de passe doit contenir au moins une minuscule et une majuscule.',
     'symbols'              => 'Le mot de passe doit contenir au moins un caractère spécial.',
-    'gte'                  => [
-        'numeric'          => 'La valeur ne peut pas être négative'
-    ],
-    'checkboxes'           => ':attribute contient des options non valides.',
-    'radio_buttons'        => ':attribute est invalide.',
+    'timezone' => 'The :attribute field must be a valid timezone.',
+    'unique' => 'Cet-te :attribute a déjà été pris-e.',
+    'uploaded' => 'L\'attribut: n\'a pas pu télécharger.',
+    'uppercase' => 'The :attribute field must be uppercase.',
+    'url' => 'Le champ :attribute doit être une URL valide.',
+    'ulid' => 'The :attribute field must be a valid ULID.',
+    'uuid' => 'The :attribute field must be a valid UUID.',
+    'fmcs_location' => 'Full multiple company support and location scoping is enabled in the Admin Settings, and the selected location and selected company are not compatible.',
 
 
     /*
@@ -120,16 +186,22 @@ return [
     |
     */
 
+    'email_array'      => 'Une ou plusieurs adresses e-mail sont invalides.',
+    'checkboxes'           => ':attribute contient des options non valides.',
+    'radio_buttons'        => ':attribute est invalide.',
+    
     'custom' => [
         'alpha_space' => 'Le champ d\'attribut: contient un caractère qui n\'est pas autorisé.',
-        'email_array'      => 'Une ou plusieurs adresses électroniques sont invalides.',
+
         'hashed_pass'      => 'Votre mot de passe actuel est incorrect',
         'dumbpwd'          => 'Ce mot de passe est trop commun.',
         'statuslabel_type' => 'Vous devez sélectionner un type d\'étiquette de statut valide',
+        'custom_field_not_found'          => 'This field does not seem to exist, please double check your custom field names.',
+        'custom_field_not_found_on_model' => 'This field seems to exist, but is not available on this Asset Model\'s fieldset.',
 
         // date_format validation with slightly less stupid messages. It duplicates a lot, but it gets the job done :(
-        // We use this because the default error message for date_format is reflects php Y-m-d, which non-PHP
-        // people won't know how to format. 
+        // We use this because the default error message for date_format reflects php Y-m-d, which non-PHP
+        // people won't know how to format.
         'purchase_date.date_format'     => ':attribute doit être une date valide au format AAAA-MM-JJ',
         'last_audit_date.date_format'   =>  ':attribute doit être une date valide au format AAAA-MM-JJ hh:mm:ss',
         'expiration_date.date_format'   =>  ':attribute doit être une date valide au format AAAA-MM-JJ',
@@ -137,9 +209,15 @@ return [
         'expected_checkin.date_format'  =>  ':attribute doit être une date valide au format AAAA-MM-JJ',
         'start_date.date_format'        =>  ':attribute doit être une date valide au format AAAA-MM-JJ',
         'end_date.date_format'          =>  ':attribute doit être une date valide au format AAAA-MM-JJ',
+        'invalid_value_in_field' => 'Valeur non valide incluse dans ce champ',
 
-    ],
+        'ldap_username_field' => [
+            'not_in' =>         '<code>sAMAccountName</code> (mixed case) will likely not work. You should use <code>samaccountname</code> (lowercase) instead.'
+        ],
+        'ldap_auth_filter_query' => ['not_in' => '<code>uid=samaccountname</code> is probably not a valid auth filter. You probably want <code>uid=</code> '],
+        'ldap_filter' => ['regex' => 'This value should probably not be wrapped in parentheses.'],
 
+        ],
     /*
     |--------------------------------------------------------------------------
     | Custom Validation Attributes
@@ -155,8 +233,16 @@ return [
 
     /*
     |--------------------------------------------------------------------------
-    | Generic Validation Messages
+    | Generic Validation Messages - we use these in the jquery validation where we don't have
+    | access to the :attribute
     |--------------------------------------------------------------------------
     */
-    'invalid_value_in_field' => 'Valeur non valide incluse dans ce champ',
+
+    'generic' => [
+        'invalid_value_in_field' => 'Valeur non valide incluse dans ce champ',
+        'required' => 'Ce champ est obligatoire',
+        'email' => 'Veuillez entrer une adresse e-mail valide',
+    ],
+
+
 ];
diff --git a/resources/lang/ga-IE/account/general.php b/resources/lang/ga-IE/account/general.php
index 1a9e2c03b8..7f9e2f848e 100644
--- a/resources/lang/ga-IE/account/general.php
+++ b/resources/lang/ga-IE/account/general.php
@@ -2,10 +2,16 @@
 
 return array(
     'personal_api_keys' => 'Personal API Keys',
+    'personal_access_token' => 'Personal Access Token',
+    'personal_api_keys_success' => 'Personal API Key :key created sucessfully',
+    'here_is_api_key' => 'Here is your new personal access token. This is the only time it will be shown so do not lose it! You may now use this token to make API requests.',
     'api_key_warning' => 'When generating an API token, be sure to copy it down immediately as they will not be visible to you again.',
     'api_base_url' => 'Your API base url is located at:',
     'api_base_url_endpoint' => '/&lt;endpoint&gt;',
     'api_token_expiration_time' => 'API tokens are set to expire in:',
     'api_reference' => 'Please check the <a href="https://snipe-it.readme.io/reference" target="_blank">API reference</a> to find specific API endpoints and additional API documentation.',
     'profile_updated' => 'Account successfully updated',
+    'no_tokens' => 'You have not created any personal access tokens.',
+    'enable_sounds' => 'Enable sound effects',
+    'enable_confetti' => 'Enable confetti effects',
 );
diff --git a/resources/lang/ga-IE/admin/accessories/message.php b/resources/lang/ga-IE/admin/accessories/message.php
index fa741b5669..1cce029cdc 100644
--- a/resources/lang/ga-IE/admin/accessories/message.php
+++ b/resources/lang/ga-IE/admin/accessories/message.php
@@ -26,7 +26,11 @@ return array(
         'error'   		=> 'Níor seiceáladh an Cúntóir amach, déan iarracht arís',
         'success' 		=> 'Rinne an cúntóir a sheiceáil go rathúil.',
         'unavailable'   => 'Accessory is not available for checkout. Check quantity available',
-        'user_does_not_exist' => 'Tá an úsáideoir neamhbhailí. Arís, le d\'thoil.'
+        'user_does_not_exist' => 'Tá an úsáideoir neamhbhailí. Arís, le d\'thoil.',
+         'checkout_qty' => array(
+            'lte'  => 'There is currently only one available accessory of this type, and you are trying to check out :checkout_qty. Please adjust the checkout quantity or the total stock of this accessory and try again.|There are :number_currently_remaining total available accessories, and you are trying to check out :checkout_qty. Please adjust the checkout quantity or the total stock of this accessory and try again.',
+            ),
+           
     ),
 
     'checkin' => array(
diff --git a/resources/lang/ga-IE/admin/accessories/table.php b/resources/lang/ga-IE/admin/accessories/table.php
index fa1701724f..da1b8bde9c 100644
--- a/resources/lang/ga-IE/admin/accessories/table.php
+++ b/resources/lang/ga-IE/admin/accessories/table.php
@@ -6,6 +6,4 @@ return array(
     'id'      					=> 'ID',
     'require_acceptance'      	=> 'Glacadh',
     'title'      				=> 'Ainm Cúlpháirtí',
-
-
 );
diff --git a/resources/lang/ga-IE/admin/components/message.php b/resources/lang/ga-IE/admin/components/message.php
index 644075c5a7..1ba1e073b5 100644
--- a/resources/lang/ga-IE/admin/components/message.php
+++ b/resources/lang/ga-IE/admin/components/message.php
@@ -17,7 +17,8 @@ return array(
     'delete' => array(
         'confirm'   => 'An bhfuil tú cinnte gur mian leat an comhábhar seo a scriosadh?',
         'error'   => 'Bhí ceist ann a scriosadh an chomhpháirt. Arís, le d\'thoil.',
-        'success' => 'Scriosadh an comhpháirt go rathúil.'
+        'success' => 'Scriosadh an comhpháirt go rathúil.',
+        'error_qty'   => 'Some components of this type are still checked out. Please check them in and try again.',
     ),
 
      'checkout' => array(
diff --git a/resources/lang/ga-IE/admin/consumables/general.php b/resources/lang/ga-IE/admin/consumables/general.php
index 01c8a60dfa..9b3dcc80ff 100644
--- a/resources/lang/ga-IE/admin/consumables/general.php
+++ b/resources/lang/ga-IE/admin/consumables/general.php
@@ -8,4 +8,5 @@ return array(
     'remaining' 			            => 'Ag fágáil',
     'total' 			                => 'Iomlán',
     'update'                            => 'Nuashonrú Inchaite',
+    'inventory_warning'                 => 'The inventory of this consumable is below the minimum amount of :min_count',
 );
diff --git a/resources/lang/ga-IE/admin/consumables/message.php b/resources/lang/ga-IE/admin/consumables/message.php
index 785258fb7b..a7da5440d6 100644
--- a/resources/lang/ga-IE/admin/consumables/message.php
+++ b/resources/lang/ga-IE/admin/consumables/message.php
@@ -2,6 +2,7 @@
 
 return array(
 
+    'invalid_category_type' => 'The category must be a consumable category.',
     'does_not_exist' => 'Níl inbhuanaithe ann.',
 
     'create' => array(
diff --git a/resources/lang/ga-IE/admin/custom_fields/general.php b/resources/lang/ga-IE/admin/custom_fields/general.php
index 9901479403..74779df3b4 100644
--- a/resources/lang/ga-IE/admin/custom_fields/general.php
+++ b/resources/lang/ga-IE/admin/custom_fields/general.php
@@ -35,7 +35,7 @@ return [
     'create_field_title' => 'Create a new custom field',
     'value_encrypted'      	        => 'Tá luach an réimse seo criptithe sa bhunachar sonraí. Ní bheidh ach úsáideoirí riaracháin in ann an luach díchriptithe a fheiceáil',
     'show_in_email'     => 'Include the value of this field in checkout emails sent to the user? Encrypted fields cannot be included in emails',
-    'show_in_email_short'     => 'Include in emails.',
+    'show_in_email_short' => 'Include in emails',
     'help_text' => 'Help Text',
     'help_text_description' => 'This is optional text that will appear below the form elements while editing an asset to provide context on the field.',
     'about_custom_fields_title' => 'About Custom Fields',
@@ -57,5 +57,8 @@ return [
     'show_in_requestable_list_short' => 'Show in requestable assets list',
     'show_in_requestable_list' => 'Show value in requestable assets list. Encrypted fields will not be shown',
     'encrypted_options' => 'This field is encrypted, so some display options will not be available.',
+    'display_checkin' => 'Display in checkin forms',
+    'display_checkout' => 'Display in checkout forms',
+    'display_audit' => 'Display in audit forms',
 
 ];
diff --git a/resources/lang/ga-IE/admin/custom_fields/message.php b/resources/lang/ga-IE/admin/custom_fields/message.php
index 850d664ee9..384012c430 100644
--- a/resources/lang/ga-IE/admin/custom_fields/message.php
+++ b/resources/lang/ga-IE/admin/custom_fields/message.php
@@ -5,6 +5,7 @@ return array(
     'field' => array(
         'invalid'   => 'Níl an réimse sin ann.',
         'already_added'   => 'Réimse curtha cheana féin',
+        'none_selected'   => 'No field selected',
 
         'create' => array(
             'error'   => 'Níor cruthaíodh réimse, déan iarracht arís.',
diff --git a/resources/lang/ga-IE/admin/depreciations/general.php b/resources/lang/ga-IE/admin/depreciations/general.php
index 55ddafa674..6df4bbb6f9 100644
--- a/resources/lang/ga-IE/admin/depreciations/general.php
+++ b/resources/lang/ga-IE/admin/depreciations/general.php
@@ -13,4 +13,8 @@ return [
     'no_depreciations_warning'               => '<strong>Warning: </strong>
                       You do not currently have any depreciations set up.
                       Please set up at least one depreciation to view the depreciation report.',
+    'depreciation_method'                   => 'Tuarascáil Dímheas',
+    'linear_depreciation'                   => 'Linear (Default)',
+    'half_1'                                => 'Half-year convention, always applied',
+    'half_2'                                => 'Half-year convention, applied with condition',
 ];
diff --git a/resources/lang/ga-IE/admin/hardware/form.php b/resources/lang/ga-IE/admin/hardware/form.php
index 273960a8e7..3fa8ddcdda 100644
--- a/resources/lang/ga-IE/admin/hardware/form.php
+++ b/resources/lang/ga-IE/admin/hardware/form.php
@@ -55,8 +55,11 @@ return [
     'asset_location_update_default' => 'Update only default location',
     'asset_location_update_actual' => 'Update only actual location',
     'asset_not_deployable' => 'That asset status is not deployable. This asset cannot be checked out.',
-    'asset_deployable' => 'That status is deployable. This asset can be checked out.',
+    'asset_not_deployable_checkin' => 'That asset status is not deployable. Using this status label will checkin the asset.',
+    'asset_deployable' => 'This asset can be checked out.',
     'processing_spinner' => 'Processing... (This might take a bit of time on large files)',
+    'processing' => 'Processing... ',
     'optional_infos'  => 'Optional Information',
-    'order_details'   => 'Order Related Information'
+    'order_details'   => 'Order Related Information',
+    'calc_eol'    => 'If nulling the EOL date, use automatic EOL calculation based on the purchase date and EOL rate.',
 ];
diff --git a/resources/lang/ga-IE/admin/hardware/general.php b/resources/lang/ga-IE/admin/hardware/general.php
index 75b79d3f1f..60e219c604 100644
--- a/resources/lang/ga-IE/admin/hardware/general.php
+++ b/resources/lang/ga-IE/admin/hardware/general.php
@@ -5,8 +5,8 @@ return [
     'about_assets_text'            => 'Déantar míreanna a rianú trí shraithuimhir nó ar chlib sócmhainne. Is iondúil go n-éireoidh siad le hítimí ar luach níos airde a bhaineann le hábhair shonracha a aithint.',
     'archived'  				=> 'Archived',
     'asset'  					=> 'Sócmhainn',
-    'bulk_checkout'             => 'Checkout Assets',
-    'bulk_checkin'              => 'Checkin Assets',
+    'bulk_checkout'             => 'Seiceáil Bulc',
+    'bulk_checkin'              => 'Bulk Checkin',
     'checkin'  					=> 'Sócmhainn Checkin',
     'checkout'  				=> 'Seiceáil Seiceáil',
     'clone'  					=> 'Sócmhainn Clón',
@@ -27,8 +27,7 @@ return [
     'undeployable_tooltip'  	=> 'This asset has a status label that is undeployable and cannot be checked out at this time.',
     'view'  					=> 'Féach Sócmhainn',
     'csv_error' => 'You have an error in your CSV file:',
-    'import_text' => '<p>Upload a CSV that contains asset history. The assets and users MUST already exist in the system, or they will be skipped. Matching assets for history import happens against the asset tag. We will try to find a matching user based on the user\'s name you provide, and the criteria you select below. If you do not select any criteria below, it will simply try to match on the username format you configured in the <code>Admin &gt; General Settings</code>.</p><p>Fields included in the CSV must match the headers: <strong>Asset Tag, Name, Checkout Date, Checkin Date</strong>. Any additional fields will be ignored. </p><p>Checkin Date: blank or future checkin dates will checkout items to associated user.  Excluding the Checkin Date column will create a checkin date with todays date.</p>
-    ',
+    'import_text' => '<p>Upload a CSV that contains asset history. The assets and users MUST already exist in the system, or they will be skipped. Matching assets for history import happens against the asset tag. We will try to find a matching user based on the user\'s name you provide, and the criteria you select below. If you do not select any criteria below, it will simply try to match on the username format you configured in the <code>Admin &gt; General Settings</code>.</p><p>Fields included in the CSV must match the headers: <strong>Asset Tag, Name, Checkout Date, Checkin Date</strong>. Any additional fields will be ignored. </p><p>Checkin Date: blank or future checkin dates will checkout items to associated user.  Excluding the Checkin Date column will create a checkin date with todays date.</p>    ',
     'csv_import_match_f-l' => 'Try to match users by <strong>firstname.lastname</strong> (<code>jane.smith</code>) format',
     'csv_import_match_initial_last' => 'Try to match users by <strong>first initial last name</strong> (<code>jsmith</code>) format',
     'csv_import_match_first' => 'Try to match users by <strong>first name</strong> (<code>jane</code>) format',
diff --git a/resources/lang/ga-IE/admin/hardware/message.php b/resources/lang/ga-IE/admin/hardware/message.php
index d00e6cba10..f7bd318aa6 100644
--- a/resources/lang/ga-IE/admin/hardware/message.php
+++ b/resources/lang/ga-IE/admin/hardware/message.php
@@ -2,18 +2,23 @@
 
 return [
 
-    'undeployable' 		=> '<strong>Marradh: </strong> Tá an tsócmhainn seo marcáilte mar atá inghníomhaithe faoi láthair. Má d\'athraigh an stádas seo, déan an stádas sócmhainne a nuashonrú.',
-    'does_not_exist' 	=> 'Níl sócmhainn ann.',
-    'does_not_exist_var'=> 'Asset with tag :asset_tag not found.',
-    'no_tag' 	        => 'No asset tag provided.',
+    'undeployable' 		 => '<strong>Warning: </strong> This asset has been marked as currently undeployable. If this status has changed, please update the asset status.',
+    'does_not_exist' 	 => 'Níl sócmhainn ann.',
+    'does_not_exist_var' => 'Asset with tag :asset_tag not found.',
+    'no_tag' 	         => 'No asset tag provided.',
     'does_not_exist_or_not_requestable' => 'That asset does not exist or is not requestable.',
-    'assoc_users'	 	=> 'Faoi láthair déanfar an tsócmhainn seo a sheiceáil chuig úsáideoir agus ní féidir é a scriosadh. Déan seiceáil ar an tsócmhainn sa chéad uair, agus déan iarracht ansin scriosadh arís.',
+    'assoc_users'	 	 => 'Faoi láthair déanfar an tsócmhainn seo a sheiceáil chuig úsáideoir agus ní féidir é a scriosadh. Déan seiceáil ar an tsócmhainn sa chéad uair, agus déan iarracht ansin scriosadh arís.',
     'warning_audit_date_mismatch' 	=> 'This asset\'s next audit date (:next_audit_date) is before the last audit date (:last_audit_date). Please update the next audit date.',
+    'labels_generated'   => 'Labels were successfully generated.',
+    'error_generating_labels' => 'Error while generating labels.',
+    'no_assets_selected' => 'No assets selected.',
 
     'create' => [
         'error'   		=> 'Níor cruthaíodh sócmhainn, déan iarracht arís. :(',
         'success' 		=> 'Cruthaíodh sócmhainn go rathúil. :)',
         'success_linked' => 'Asset with tag :tag was created successfully. <strong><a href=":link" style="color: white;">Click here to view</a></strong>.',
+        'multi_success_linked' => 'Asset with tag :links was created successfully.|:count assets were created succesfully. :links.',
+        'partial_failure' => 'An asset was unable to be created. Reason: :failures|:count assets were unable to be created. Reasons: :failures',
     ],
 
     'update' => [
@@ -51,20 +56,24 @@ return [
     ],
 
     'import' => [
+        'import_button'         => 'Process Import',
         'error'                 => 'Níor iompórtáil roinnt míreanna i gceart.',
         'errorDetail'           => 'Níor allmhairíodh na Míreanna seo a leanas mar gheall ar earráidí.',
         'success'               => 'Tá do chomhad iompórtáilte',
         'file_delete_success'   => 'Tá do chomhad scriosta go rathúil',
         'file_delete_error'      => 'Níorbh fhéidir an comhad a scriosadh',
         'file_missing' => 'The file selected is missing',
+        'file_already_deleted' => 'The file selected was already deleted',
         'header_row_has_malformed_characters' => 'One or more attributes in the header row contain malformed UTF-8 characters',
         'content_row_has_malformed_characters' => 'One or more attributes in the first row of content contain malformed UTF-8 characters',
+        'transliterate_failure' => 'Transliteration from :encoding to UTF-8 failed due to invalid characters in input'
     ],
 
 
     'delete' => [
         'confirm'   	=> 'An bhfuil tú cinnte gur mian leat an tsócmhainn seo a scriosadh?',
         'error'   		=> 'Bhí ceist ann a scriosadh an tsócmhainn. Arís, le d\'thoil.',
+        'assigned_to_error' => '{1}Asset Tag: :asset_tag is currently checked out. Check in this device before deletion.|[2,*]Asset Tags: :asset_tag are currently checked out. Check in these devices before deletion.',
         'nothing_updated'   => 'Níor roghnaíodh aon sócmhainní, mar sin níor scriosadh aon rud.',
         'success' 		=> 'Scriosadh an tsócmhainn go rathúil.',
     ],
@@ -77,6 +86,11 @@ return [
         'no_assets_selected' => 'You must select at least one asset from the list',
     ],
 
+    'multi-checkout' => [
+        'error'   => 'Asset was not checked out, please try again|Assets were not checked out, please try again',
+        'success' => 'Asset checked out successfully.|Assets checked out successfully.',
+    ],
+
     'checkin' => [
         'error'   		=> 'Níor seiceáladh an tsócmhainn, déan iarracht arís',
         'success' 		=> 'Seiceáil seiceáil go rathúil.',
@@ -86,9 +100,10 @@ return [
     ],
 
     'requests' => [
-        'error'   		=> 'Níor iarradh sócmhainn, déan iarracht arís',
-        'success' 		=> 'D\'iarr sócmhainn go rathúil.',
-        'canceled'      => 'Iarrtar ar iarraidh seiceáil go rathúil',
+        'error'   		=> 'Request was not successful, please try again.',
+        'success' 		=> 'Request successfully submitted.',
+        'canceled'      => 'Request successfully canceled.',
+        'cancel'        => 'Cancel this item request',
     ],
 
 ];
diff --git a/resources/lang/ga-IE/admin/hardware/table.php b/resources/lang/ga-IE/admin/hardware/table.php
index ce0f54b059..358cfbca8a 100644
--- a/resources/lang/ga-IE/admin/hardware/table.php
+++ b/resources/lang/ga-IE/admin/hardware/table.php
@@ -25,7 +25,6 @@ return [
     'image'		    => 'Íomhá Gléas',
     'days_without_acceptance' => 'Laethanta Gan Glactha',
     'monthly_depreciation' => 'Monthly Depreciation',
-    'assigned_to'    => 'Sannadh Chun',
     'requesting_user' => 'Requesting User',
     'requested_date' => 'Requested Date',
     'changed'       => 'Changed',
diff --git a/resources/lang/ga-IE/admin/kits/general.php b/resources/lang/ga-IE/admin/kits/general.php
index 095ddfecf1..469e7bc6d6 100644
--- a/resources/lang/ga-IE/admin/kits/general.php
+++ b/resources/lang/ga-IE/admin/kits/general.php
@@ -47,4 +47,5 @@ return [
     'kit_deleted'                       => 'Kit was successfully deleted',
     'kit_model_updated'                 => 'Model was successfully updated',
     'kit_model_detached'                => 'Model was successfully detached',
+    'model_already_attached'            => 'Model already attached to kit',
 ];
diff --git a/resources/lang/ga-IE/admin/licenses/general.php b/resources/lang/ga-IE/admin/licenses/general.php
index df4beb2a71..3cee950276 100644
--- a/resources/lang/ga-IE/admin/licenses/general.php
+++ b/resources/lang/ga-IE/admin/licenses/general.php
@@ -14,6 +14,7 @@ return array(
     'info'  					=> 'Eolas Ceadúnais',
     'license_seats'  			=> 'Suíocháin Cheadúnais',
     'seat'  					=> 'Suíochán',
+    'seat_count'  				=> 'Seat :count',
     'seats'  					=> 'Suíocháin',
     'software_licenses'  		=> 'Ceadúnais Bogearraí',
     'user'  					=> 'Úsáideoir',
@@ -23,12 +24,12 @@ return array(
         [
             'checkin_all'           => [
                 'button'            => 'Checkin All Seats',
-                'modal'             => 'This will action checkin one seat. | This action will checkin all :checkedout_seats_count seats for this license.',
+                'modal'             => 'This action will checkin one seat. | This action will checkin all :checkedout_seats_count seats for this license.',
                 'enabled_tooltip'   => 'Checkin ALL seats for this license from both users and assets',
                 'disabled_tooltip'  => 'This is disabled because there are no seats currently checked out',
                 'disabled_tooltip_reassignable'  => 'This is disabled because the License is not reassignable',
                 'success'           => 'License successfully checked in! | All licenses were successfully checked in!',
-                'log_msg'           => 'Checked in via bulk license checkout in license GUI',
+                'log_msg'           => 'Checked in via bulk license checkin in license GUI',
             ],
 
             'checkout_all'              => [
diff --git a/resources/lang/ga-IE/admin/licenses/message.php b/resources/lang/ga-IE/admin/licenses/message.php
index 513b70e36f..145d04a8d8 100644
--- a/resources/lang/ga-IE/admin/licenses/message.php
+++ b/resources/lang/ga-IE/admin/licenses/message.php
@@ -44,10 +44,13 @@ return array(
         'error'   => 'Bhí ceist ann a sheiceáil amach an ceadúnas. Arís, le d\'thoil.',
         'success' => 'Rinneadh an ceadúnas a sheiceáil go rathúil',
         'not_enough_seats' => 'Not enough license seats available for checkout',
+        'mismatch' => 'The license seat provided does not match the license',
+        'unavailable' => 'This seat is not available for checkout.',
     ),
 
     'checkin' => array(
         'error'   => 'Bhí ceist ann a sheiceáil sa cheadúnas. Arís, le d\'thoil.',
+        'not_reassignable' => 'License not reassignable',
         'success' => 'Rinneadh an ceadúnas a sheiceáil go rathúil'
     ),
 
diff --git a/resources/lang/ga-IE/admin/locations/message.php b/resources/lang/ga-IE/admin/locations/message.php
index 8aeaec86c6..e87dbaa9e6 100644
--- a/resources/lang/ga-IE/admin/locations/message.php
+++ b/resources/lang/ga-IE/admin/locations/message.php
@@ -3,11 +3,12 @@
 return array(
 
     'does_not_exist' => 'Níl an suíomh ann.',
-    'assoc_users'    => 'This location is not currently deletable because it is the location of record for at least one asset or user, has assets assigned to it, or is the parent location of another location. Please update your models to no longer reference this company and try again. ',
+    'assoc_users'    => 'This location is not currently deletable because it is the location of record for at least one asset or user, has assets assigned to it, or is the parent location of another location. Please update your records to no longer reference this location and try again ',
     'assoc_assets'	 => 'Tá an suíomh seo bainteach le sócmhainn amháin ar a laghad agus ní féidir é a scriosadh. Déan do sócmhainní a thabhairt cothrom le dáta gan tagairt a dhéanamh don áit seo agus déan iarracht arís.',
     'assoc_child_loc'	 => 'Faoi láthair tá an suíomh seo ina tuismitheoir ar a laghad ar shuíomh leanbh amháin ar a laghad agus ní féidir é a scriosadh. Nuashonraigh do láithreacha le do thoil gan tagairt a dhéanamh don suíomh seo agus déan iarracht arís.',
     'assigned_assets' => 'Assigned Assets',
     'current_location' => 'Current Location',
+    'open_map' => 'Open in :map_provider_icon Maps',
 
 
     'create' => array(
@@ -20,6 +21,11 @@ return array(
         'success' => 'Suíomh curtha chun dáta go rathúil.'
     ),
 
+    'restore' => array(
+        'error'   => 'Location was not restored, please try again',
+        'success' => 'Location restored successfully.'
+    ),
+
     'delete' => array(
         'confirm'   	=> 'An bhfuil tú cinnte gur mian leat an suíomh seo a scriosadh?',
         'error'   => 'Bhí ceist ann a scriosadh an suíomh. Arís, le d\'thoil.',
diff --git a/resources/lang/ga-IE/admin/locations/table.php b/resources/lang/ga-IE/admin/locations/table.php
index 57811f0e28..bdf42aa2ed 100644
--- a/resources/lang/ga-IE/admin/locations/table.php
+++ b/resources/lang/ga-IE/admin/locations/table.php
@@ -39,4 +39,5 @@ return [
     'signed_by_finance_auditor' => 'Signed By (Finance Auditor):',
     'signed_by_location_manager' => 'Signed By (Location Manager):',
     'signed_by'                 => 'Signed Off By:',
+    'clone'  					=> 'Clone Location',
 ];
diff --git a/resources/lang/ga-IE/admin/models/general.php b/resources/lang/ga-IE/admin/models/general.php
index 7e677eccb2..852ea007dd 100644
--- a/resources/lang/ga-IE/admin/models/general.php
+++ b/resources/lang/ga-IE/admin/models/general.php
@@ -3,7 +3,7 @@
 return array(
     'about_models_title'     => 'Maidir le Múnlaí Sócmhainne',
     'about_models_text'           => 'Tá modhanna sócmhainne ina bhealach chun sócmhainní comhionanna a ghrúpáil. "MBP 2013", "iPhone 6s", etc.',
-    'deleted'  					        => 'This model has been deleted.',
+    'deleted'  					=> 'This model has been deleted.',
     'bulk_delete'               => 'Bulk Delete Asset Models',
     'bulk_delete_help'               => 'Use the checkboxes below to confirm the deletion of the selected asset models. Asset models that have assets associated with them cannot be deleted until the assets are associated with a different model.',
     'bulk_delete_warn'          => 'You are about to delete one asset model.|You are about to delete :model_count asset models.',
diff --git a/resources/lang/ga-IE/admin/models/message.php b/resources/lang/ga-IE/admin/models/message.php
index 9c13b704b5..10d5e6751e 100644
--- a/resources/lang/ga-IE/admin/models/message.php
+++ b/resources/lang/ga-IE/admin/models/message.php
@@ -7,7 +7,7 @@ return array(
     'no_association' => 'WARNING! The asset model for this item is invalid or missing!',
     'no_association_fix' => 'This will break things in weird and horrible ways. Edit this asset now to assign it a model.',
     'assoc_users'	 => 'Tá an tsamhail seo bainteach le sócmhainní amháin nó níos mó faoi láthair agus ní féidir é a scriosadh. Scrios na sócmhainní, agus ansin déan iarracht a scriosadh arís.',
-
+    'invalid_category_type' => 'This category must be an asset category.',
 
     'create' => array(
         'error'   => 'Níor cruthaíodh an tsamhail, déan iarracht arís.',
diff --git a/resources/lang/ga-IE/admin/reports/general.php b/resources/lang/ga-IE/admin/reports/general.php
index 07fd03fbed..3871c27185 100644
--- a/resources/lang/ga-IE/admin/reports/general.php
+++ b/resources/lang/ga-IE/admin/reports/general.php
@@ -4,6 +4,7 @@ return [
     'info'   => 'Roghnaigh na roghanna atá uait as do thuairisc sócmhainne.',
     'deleted_user' => 'Deleted user',
     'send_reminder' => 'Send reminder',
+    'cannot_send_reminder' => 'User has been deleted or does not have an email address so cannot receive a reminder',
     'reminder_sent' => 'Reminder sent',
     'acceptance_deleted' => 'Acceptance request deleted',
     'acceptance_request' => 'Acceptance request',
@@ -13,5 +14,10 @@ return [
         'user_state' => 'User State',
         'user_country' => 'User Country',
         'user_zip' => 'User Zip'
-    ]
-];
\ No newline at end of file
+    ],
+    'open_saved_template' => 'Open Saved Template',
+    'save_template' =>  'Save Template',
+    'select_a_template' => 'Select a Template',
+    'template_name' => 'Template Name',
+    'update_template' => 'Update Template',
+];
diff --git a/resources/lang/ga-IE/admin/reports/message.php b/resources/lang/ga-IE/admin/reports/message.php
index 3e9771f629..2800bbdf0b 100644
--- a/resources/lang/ga-IE/admin/reports/message.php
+++ b/resources/lang/ga-IE/admin/reports/message.php
@@ -1,5 +1,16 @@
 <?php
 
-return array(
-    'error'   => 'Ní mór duit rogha AMHÁIN ar a laghad a roghnú.'
-);
+return [
+    'about_templates' => 'About Saved Templates',
+    'saving_templates_description' => 'Select your options, then enter the name of your template in the box above and click the \'Save Template\' button. Use the dropdown to select a previously saved template.',
+    'create'  => [
+        'success' => 'Template saved successfully',
+    ],
+    'update' => [
+        'success' => 'Template updated successfully',
+    ],
+    'delete' => [
+        'success' => 'Template deleted',
+        'no_delete_permission' => 'Template does not exist or you do not have permission to delete it.',
+    ],
+];
diff --git a/resources/lang/ga-IE/admin/settings/general.php b/resources/lang/ga-IE/admin/settings/general.php
index 154055999a..267a067c4e 100644
--- a/resources/lang/ga-IE/admin/settings/general.php
+++ b/resources/lang/ga-IE/admin/settings/general.php
@@ -8,13 +8,13 @@ return [
     'ad_append_domain'          => 'Append domain name to username field',
     'ad_append_domain_help'     => 'User isn\'t required to write "username@domain.local", they can just type "username".',
     'admin_cc_email'            => 'CC Email',
-    'admin_cc_email_help'       => 'If you would like to send a copy of checkin/checkout emails that are sent to users to an additional email account, enter it here. Otherwise leave this field blank.',
+    'admin_cc_email_help'       => 'Send a copy of checkin/checkout emails to this address.',
     'admin_settings'            => 'Admin Settings',
     'is_ad'				        => 'Is freastalaí Gníomhach Eolaire é seo',
     'alerts'                	=> 'Alerts',
     'alert_title'               => 'Update Notification Settings',
     'alert_email'				=> 'Seol foláirimh chuig',
-    'alert_email_help'    => 'Email addresses or distribution lists you want alerts to be sent to, comma separated',
+    'alert_email_help'          => 'Email addresses or distribution lists you want alerts to be sent to, comma separated.',
     'alerts_enabled'			=> 'Cumarsáid Cumarsáide',
     'alert_interval'			=> 'Tairseach Alerts ag dul in éag (i laethanta)',
     'alert_inv_threshold'		=> 'Tairseach Alert Fardail',
@@ -31,15 +31,18 @@ return [
     'backups'					=> 'Cúltacaí',
     'backups_help'              => 'Create, download, and restore backups ',
     'backups_restoring'         => 'Restoring from Backup',
+    'backups_clean' => 'Clean the backed-up database before restore',
+    'backups_clean_helptext' => "This can be useful if you're changing between database versions",
     'backups_upload'            => 'Upload Backup',
     'backups_path'              => 'Backups on the server are stored in <code>:path</code>',
-    'backups_restore_warning'   => 'Use the restore button <small><span class="btn btn-xs btn-warning"><i class="text-white fas fa-retweet" aria-hidden="true"></i></span></small> to restore from a previous backup. (This does not currently work with S3 file storage or Docker.)<br><br>Your <strong>entire :app_name database and any uploaded files will be completely replaced</strong> by what\'s in the backup file.  ',
+    'backups_restore_warning'   => 'Use the restore button <small><span class="btn btn-xs btn-warning"><i class="text-white fas fa-retweet" aria-hidden="true"></i></span></small> to restore from a previous backup. (This does not currently work with S3 file storage or Docker.)<br><br>Your <strong>entire :app_name database and any uploaded files will be completely replaced</strong> by what\'s in the backup file  ',
     'backups_logged_out'         => 'All existing users, including you, will be logged out once your restore is complete.',
     'backups_large'             => 'Very large backups may time out on the restore attempt and may still need to be run via command line. ',
     'barcode_settings'			=> 'Socruithe Barcode',
     'confirm_purge'			    => 'Dearbhaigh Purge',
     'confirm_purge_help'		=> 'Enter the text "DELETE" in the box below to purge your deleted records. This action cannot be undone and will PERMANENTLY delete all soft-deleted items and users. (You should make a backup first, just to be safe.)',
     'custom_css'				=> 'CSS saincheaptha',
+    'custom_css_placeholder'	=> 'Add your custom CSS',
     'custom_css_help'			=> 'Cuir isteach aon scriosadh CSS saincheaptha ar mhaith leat a úsáid. Ná cuir na clibeanna &lt;style&gt;&lt;/style&gt; san áireamh.',
     'custom_forgot_pass_url'	=> 'Custom Password Reset URL',
     'custom_forgot_pass_url_help'	=> 'This replaces the built-in forgotten password URL on the login screen, useful to direct people to internal or hosted LDAP password reset functionality. It will effectively disable local user forgotten password functionality.',
@@ -47,34 +50,34 @@ return [
     'dashboard_message_help'	=> 'This text will appear on the dashboard for anyone with permission to view the dashboard.',
     'default_currency'  		=> 'Réamhshocrú Airgeadra',
     'default_eula_text'			=> 'Réamhshocrú EULA',
+    'default_eula_text_placeholder' => 'Add your default EULA text',
     'default_language'			=> 'Teanga Réamhshocraithe',
     'default_eula_help_text'	=> 'Is féidir leat freisin EULAs saincheaptha a chomhcheangal le catagóirí sonracha sócmhainne.',
     'acceptance_note'           => 'Add a note for your decision (Optional)',
     'display_asset_name'        => 'Taispeáin Ainm na Sócmhainne',
     'display_checkout_date'     => 'Taispeáin Dáta Seiceáil',
     'display_eol'               => 'Taispeáin EOL in amharc an tábla',
-    'display_qr'                => 'Taispeáin Cóid Cearnóg',
+    'display_qr'                => 'Display 2D barcode',
     'display_alt_barcode'		=> 'Taispeáin barcode 1D',
-    'email_logo'                => 'Email Logo',
     'barcode_type'				=> 'Cineál Barcode 2D',
     'alt_barcode_type'			=> 'Cineál barrach 1D',
-    'email_logo_size'       => 'Square logos in email look best. ',
     'enabled'                   => 'Enabled',
     'eula_settings'				=> 'Socruithe EULA',
     'eula_markdown'				=> 'Ceadaíonn an EULA seo <a href="https://help.github.com/articles/github-flavored-markdown/">Github flavored markdown</a>.',
+    'empty_row_count'           => 'Field Start Offset (Empty Rows)',
+    'empty_row_count_help'      => 'Fields will begin populating after this many empty rows are skipped at the top of the label.',
     'favicon'                   => 'Favicon',
     'favicon_format'            => 'Accepted filetypes are ico, png, and gif. Other image formats may not work in all browsers.',
     'favicon_size'          => 'Favicons should be square images, 16x16 pixels.',
     'footer_text'               => 'Additional Footer Text ',
     'footer_text_help'          => 'This text will appear in the right-side footer. Links are allowed using <a href="https://help.github.com/articles/github-flavored-markdown/">Github flavored markdown</a>. Line breaks, headers, images, etc may result in unpredictable results.',
+    'footer_text_placeholder'   => 'Optional footer text',
     'general_settings'			=> 'Socruithe Ginearálta',
-    'general_settings_keywords' => 'company support, signature, acceptance, email format, username format, images, per page, thumbnail, eula, gravatar, tos, dashboard, privacy',
     'general_settings_help'     => 'Default EULA and more',
     'generate_backup'			=> 'Gin Cúltaca',
     'google_workspaces'         => 'Google Workspaces',
     'header_color'              => 'Dath Ceannteideal',
     'info'                      => 'Ligeann na socruithe seo gnéithe áirithe de do shuiteáil a shaincheapadh.',
-    'label_logo'                => 'Label Logo',
     'label_logo_size'           => 'Square logos look best - will be displayed in the top right of each asset label. ',
     'laravel'                   => 'Leagan Laravel',
     'ldap'                      => 'LDAP',
@@ -94,7 +97,7 @@ return [
     'ldap_login_sync_help'      => 'This only tests that LDAP can sync correctly. If your LDAP Authentication query is not correct, users may still not be able to login. YOU MUST SAVE YOUR UPDATED LDAP SETTINGS FIRST.',
     'ldap_manager'              => 'LDAP Manager',
     'ldap_server'               => 'Freastalaí LDAP',
-    'ldap_server_help'          => 'Ba chóir go dtosódh sé seo le ldap: // (le haghaidh neamhchriptithe nó TLS) nó ldaps: // (do SSL)',
+    'ldap_server_help'          => 'This should start with ldap:// (for unencrypted) or ldaps:// (for TLS or SSL)',
     'ldap_server_cert'			=> 'Bailíochtú deimhnithe SSL LDAP',
     'ldap_server_cert_ignore'	=> 'Ceadaigh Teastas SSL neamhbhailí',
     'ldap_server_cert_help'		=> 'Roghnaigh an bosca seo má tá tú ag úsáid deimhnithe SSL féinmhínithe agus gur mhaith leat glacadh le deimhniú SSL neamhbhailí.',
@@ -108,8 +111,8 @@ return [
     'ldap_pword'                => 'Pasfhocal Bind LDAP',
     'ldap_basedn'               => 'Base Bind DN',
     'ldap_filter'               => 'Scagaire LDAP',
-    'ldap_pw_sync'              => 'Sync Pasfhocal LDAP',
-    'ldap_pw_sync_help'         => 'Déan an bosca seo a dhíscriosadh mura mian leat pasfhocail LDAP a choinneáil ar a dtugtar le pasfhocail áitiúla. Ciallaíonn sé seo go bhféadfadh do úsáideoirí logáil isteach má tá do fhreastalaí LDAP neamhshuim ar chúis éigin.',
+    'ldap_pw_sync'              => 'Cache LDAP Passwords',
+    'ldap_pw_sync_help'         => 'Uncheck this box if you do not wish to keep LDAP passwords cached as local hashed passwords. Disabling this means that your users may not be able to login if your LDAP server is unreachable for some reason.',
     'ldap_username_field'       => 'Réimse Ainm Úsáideora',
     'ldap_lname_field'          => 'Ainm deiridh',
     'ldap_fname_field'          => 'Céadainm LDAP',
@@ -117,13 +120,15 @@ return [
     'ldap_version'              => 'Leagan LDAP',
     'ldap_active_flag'          => 'Bratach Gníomhach LDAP',
     'ldap_activated_flag_help'  => 'This value is used to determine whether a synced user can login to Snipe-IT. <strong>It does not affect the ability to check items in or out to them</strong>, and should be the <strong>attribute name</strong> within your AD/LDAP, <strong>not the value</strong>. <br><br>If this field is set to a field name that does not exist in your AD/LDAP, or the value in the AD/LDAP field is set to <code>0</code> or <code>false</code>, <strong>user login will be disabled</strong>. If the value in the AD/LDAP field is set to <code>1</code> or <code>true</code> or <em>any other text</em> means the user can log in. When the field is blank in your AD, we respect the <code>userAccountControl</code> attribute, which usually allows non-suspended users to log in.',
+    'ldap_invert_active_flag'   => 'LDAP Invert Active Flag',
+    'ldap_invert_active_flag_help'     => 'If enabled: when the value returned by LDAP Active Flag is <code>0</code> or <code>false</code> the user account will be active.',
     'ldap_emp_num'              => 'Uimhir Fostaí LDAP',
     'ldap_email'                => 'Ríomhphost LDAP',
     'ldap_test'                 => 'Test LDAP',
     'ldap_test_sync'            => 'Test LDAP Synchronization',
     'license'                   => 'Software License',
-    'load_remote'               => 'Use Gravatar',
-    'load_remote_help_text'		=> 'Uncheck this box if your install cannot load scripts from the outside internet. This will prevent Snipe-IT from trying load images from Gravatar.',
+    'load_remote'               => 'Load Remote Avatars',
+    'load_remote_help_text'		=> 'Uncheck this box if your install cannot load scripts from the outside internet. This will prevent Snipe-IT from trying load avatars from Gravatar or other outside sources.',
     'login'                     => 'Login Attempts',
     'login_attempt'             => 'Login Attempt',
     'login_ip'                  => 'IP Address',
@@ -131,6 +136,7 @@ return [
     'login_user_agent'          => 'User Agent',
     'login_help'                => 'List of attempted logins',
     'login_note'                => 'Logáil isteach Nóta',
+    'login_note_placeholder'            => "If you do not have a login or have found a device belonging to this company, please call technical support at 888-555-1212. Thank you.",
     'login_note_help'           => 'Áirítear go roghnúil cúpla abairt ar do scáileán logála isteach, mar shampla chun cabhrú le daoine a bhfuair gléas caillte nó goidte. Glacann an réimse seo le <a href="https://help.github.com/articles/github-flavored-markdown/">Github blastáilte markdown</a>',
     'login_remote_user_text'    => 'Remote User login options',
     'login_remote_user_enabled_text' => 'Enable Login with Remote User Header',
@@ -146,13 +152,16 @@ return [
     'logo_print_assets_help'    => 'Use branding on printable asset lists ',
     'full_multiple_companies_support_help_text' => 'Úsáideoirí srianta (lena n-áirítear admins) a shanntar do chuideachtaí le sócmhainní na cuideachta.',
     'full_multiple_companies_support_text' => 'Tacaíocht Iomlána Iompórtálacha Iomlán',
+    'scope_locations_fmcs_support_text'  => 'Scope Locations with Full Multiple Companies Support',
+    'scope_locations_fmcs_support_help_text'  => 'Restrict locations to their selected company.',
+    'scope_locations_fmcs_check_button' => 'Check Compatibility',
+    'scope_locations_fmcs_support_disabled_text'  => 'This option is disabled because you have conflicting locations set for :count or more items.',
     'show_in_model_list'   => 'Show in Model Dropdowns',
     'optional'					=> 'roghnach',
     'per_page'                  => 'Torthaí ar an Leathanach',
     'php'                       => 'Leagan PHP',
-    'php_info'                  => 'PHP Info',
+    'php_info'                  => 'PHP info',
     'php_overview'              => 'PHP',
-    'php_overview_keywords'     => 'phpinfo, system, info',
     'php_overview_help'         => 'PHP System info',
     'php_gd_info'               => 'Ní mór duit php-gd a shuiteáil chun cóid QR a thaispeáint, féach treoracha a shuiteáil.',
     'php_gd_warning'            => 'NÍ bhfuil an próiseáil Íomhá PHP agus an breiseán GD suiteáilte.',
@@ -218,6 +227,8 @@ return [
     'webhook_integration_help'    => ':app integration is optional, however the endpoint and channel are required if you wish to use it. To configure :app integration, you must first <a href=":webhook_link" target="_new" rel="noopener">create an incoming webhook</a> on your :app account. Click on the <strong>Test :app Integration</strong> button to confirm your settings are correct before saving. ',
     'webhook_integration_help_button'    => 'Once you have saved your :app information, a test button will appear.',
     'webhook_test_help'           => 'Test whether your :app integration is configured correctly. YOU MUST SAVE YOUR UPDATED :app SETTINGS FIRST.',
+    'shortcuts_enabled'         => 'Enable Shortcuts',
+    'shortcuts_help_text'       => '<strong>Windows</strong>: Alt + Access key, <strong>Mac</strong>: Control + Option + Access key',
     'snipe_version'  			=> 'Snipe-IT leagan',
     'support_footer'            => 'Support Footer Links ',
     'support_footer_help'       => 'Specify who sees the links to the Snipe-IT Support info and Users Manual',
@@ -227,7 +238,6 @@ return [
     'update'                    => 'Socruithe Nuashonraithe',
     'value'                     => 'Luach',
     'brand'                     => 'Brandáil',
-    'brand_keywords'            => 'footer, logo, print, theme, skin, header, colors, color, css',
     'brand_help'                => 'Logo, Site Name',
     'web_brand'                 => 'Web Branding Type',
     'about_settings_title'      => 'Socruithe Maidir',
@@ -276,6 +286,8 @@ return [
     'two_factor_enrollment_text'	=> "Tá dhá fhíordheimhniú fachtóir ag teastáil, áfach, nach bhfuil do ghléas cláraithe fós. Oscail d'iarratas Google Authenticator agus scrúdaigh an cód QR thíos chun do ghléas a chlárú. Nuair atá tú ag clárú do gléas, cuir isteach an cód thíos",
     'require_accept_signature'      => 'A cheangal Síniú',
     'require_accept_signature_help_text'      => 'Éileoidh an chumas seo a chumasú d\'úsáideoirí comhartha a dhéanamh go fisiciúil ar ghlacadh sócmhainne.',
+    'require_checkinout_notes'  => 'Require Notes on Checkin/Checkout',
+    'require_checkinout_notes_help_text'    => 'Enabling this feature will require the note fields to be populated when checking in or checking out an asset.',
     'left'        => 'ar chlé',
     'right'        => 'ceart',
     'top'        => 'barr',
@@ -313,24 +325,24 @@ return [
     'filter_by_keyword' => 'Filter by setting keyword',
     'security' => 'Security',
     'security_title' => 'Update Security Settings',
-    'security_keywords' => 'password, passwords, requirements, two factor, two-factor, common passwords, remote login, logout, authentication',
     'security_help' => 'Two-factor, Password Restrictions',
-    'groups_keywords' => 'permissions, permission groups, authorization',
     'groups_help' => 'Account permission groups',
     'localization' => 'Localization',
     'localization_title' => 'Update Localization Settings',
-    'localization_keywords' => 'localization, currency, local, locale, time zone, timezone, international, internatinalization, language, languages, translation',
     'localization_help' => 'Language, date display',
     'notifications' => 'Notifications',
     'notifications_help' => 'Email Alerts & Audit Settings',
     'asset_tags_help' => 'Incrementing and prefixes',
     'labels' => 'Labels',
     'labels_title' => 'Update Label Settings',
-    'labels_help' => 'Label sizes &amp; settings',
-    'purge_keywords' => 'permanently delete',
+    'labels_help' => 'Barcodes &amp; label settings',
     'purge_help' => 'Taifid Scriosta Purge',
     'ldap_extension_warning' => 'It does not look like the LDAP extension is installed or enabled on this server. You can still save your settings, but you will need to enable the LDAP extension for PHP before LDAP syncing or login will work.',
     'ldap_ad' => 'LDAP/AD',
+    'ldap_test_label' => 'Test LDAP Sync',
+    'ldap_test_login' => ' Test LDAP Login',
+    'ldap_username_placeholder' => 'LDAP Username',
+    'ldap_password_placeholder' => 'LDAP Password',
     'employee_number' => 'Employee Number',
     'create_admin_user' => 'Create a User ::',
     'create_admin_success' => 'Success! Your admin user has been added!',
@@ -342,6 +354,8 @@ return [
     'setup_migration_create_user' => 'Next: Create User',
     'ldap_settings_link' => 'LDAP Settings Page',
     'slack_test' => 'Test <i class="fab fa-slack"></i> Integration',
+    'status_label_name' => 'Status Label Name',
+    'super_admin_only'  => 'Super Admin Only',
     'label2_enable'           => 'New Label Engine',
     'label2_enable_help'      => 'Switch to the new label engine. <b>Note: You will need to save this setting before setting others.</b>',
     'label2_template'         => 'Template',
@@ -356,12 +370,15 @@ return [
     'label2_2d_type'          => 'Cineál Barcode 2D',
     'label2_2d_type_help'     => 'Format for 2D barcodes',
     'label2_2d_target'        => '2D Barcode Target',
-    'label2_2d_target_help'   => 'The URL the 2D barcode points to when scanned',
+    'label2_2d_target_help'   => 'The data that will be contained in the 2D barcode',
     'label2_fields'           => 'Field Definitions',
     'label2_fields_help'      => 'Fields can be added, removed, and reordered in the left column. For each field, multiple options for Label and DataSource can be added, removed, and reordered in the right column.',
+    'purge_barcodes' => 'Purge Barcodes',
     'help_asterisk_bold'    => 'Text entered as <code>**text**</code> will be displayed as bold',
     'help_blank_to_use'     => 'Leave blank to use the value from <code>:setting_name</code>',
     'help_default_will_use' => '<code>:default</code> will use the value from <code>:setting_name</code>. <br>Note that the value of the barcodes must comply with the respective barcode spec in order to be successfully generated. Please see <a href="https://snipe-it.readme.io/docs/barcodes">the documentation <i class="fa fa-external-link"></i></a> for more details. ',
+    'asset_id'              => 'Asset ID',
+    'data'               => 'Data',
     'default'               => 'Default',
     'none'                  => 'None',
     'google_callback_help' => 'This should be entered as the callback URL in your Google OAuth app settings in your organization&apos;s <strong><a href="https://console.cloud.google.com/" target="_blank">Google developer console <i class="fa fa-external-link" aria-hidden="true"></i></a></strong>.',
@@ -373,7 +390,100 @@ return [
     'database_driver' => 'Database Driver',
     'bs_table_storage' => 'Table Storage',
     'timezone' => 'Timezone',
+    'test_mail' => 'Test Mail',
     'profile_edit'          => 'Edit Profile',
     'profile_edit_help'          => 'Allow users to edit their own profiles.',
+    'default_avatar' => 'Custom Default Avatar',
+    'default_avatar_help' => 'This image will be displayed as a profile if a user does not have a profile photo.',
+    'restore_default_avatar' => 'Restore <a href=":default_avatar" data-toggle="lightbox" data-type="image">original system default avatar</a>',
+    'restore_default_avatar_help' => '',
+    'due_checkin_days' => 'Due For Checkin Warning',
+    'due_checkin_days_help' => 'How many days before the expected checkin of an asset should it be listed in the "Due for checkin" page?',
+    'no_groups' => 'No groups have been created yet. Visit <code>Admin Settings > Permission Groups</code> to add one.',
+    'text' => 'Text',
+
+    'username_formats' => [
+        'username_format'		=> 'Ainm Úsáideora Formáid',
+        'firstname_lastname_format'	=> 'Ainm Ainm Chéad Ainm (jane.smith)',
+        'first_name_format'	        => 'First Name (jane)',
+        'last_name_format'		=> 'Last Name (doe)',
+        'filastname_format'			=> 'First Initial Last Name (jsmith)',
+        'lastnamefirstinitial_format' =>  'Last Name First Initial (smithj)',
+        'firstname_lastname_underscore_format' => 'First Name Last Name (jane_smith)',
+        'firstinitial.lastname' => 'First Initial Last Name (j.smith)',
+        'lastname_firstinitial' => 'Last Name First Initial (smith_j)',
+        'lastname_dot_firstinitial_format' => 'Last Name First Initial (smith.j)',
+        'firstnamelastname'     => 'First Name Last Name (janesmith)',
+        'firstnamelastinitial'  => 'First Name Last Initial (janes)',
+        'lastnamefirstname'      => 'Last Name.First Name (smith.jane)',
+    ],
+
+    'email_formats' => [
+        'email_format'			=> 'Foirm Ríomhphoist',
+        'firstname_lastname_format'	=> 'Ainm Ainm Chéad Ainm (jane.smith@example.com)',
+        'first_name_format'		=> 'Céadainm (jane@example.com)',
+        'last_name_format'		=> 'Last Name (doe@example.com)',
+        'filastname_format'			=> 'An Chéad Ainm Deiridh Tosaigh (jsmith@example.com)',
+        'lastnamefirstinitial_format' =>  'Last Name First Initial (smithj@example.com)',
+        'firstname_lastname_underscore_format' => 'First Name Last Name (jane_smith@example.com)',
+        'firstinitial.lastname' => 'First Initial Last Name (j.smith@example.com)',
+        'lastname_firstinitial' => 'Last Name First Initial (smith_j@example.com)',
+        'lastname_dot_firstinitial_format' => 'Last Name First Initial (smith.j@example.com)',
+        'firstnamelastname'     => 'First Name Last Name (janesmith@example.com)',
+        'firstnamelastinitial'  => 'First Name Last Initial (janes@example.com)',
+        'lastnamefirstname'      => 'Last Name.First Name (smith.jane@example.com)',
+    ],
+
+
+
+    'logo_labels' => [
+        'acceptance_pdf_logo'       => 'PDF Logo',
+        'email_logo'                => 'Email Logo',
+        'label_logo'                => 'Label Logo',
+        'logo'                      => 'Site Logo',
+        'favicon'                   => 'Favicon',
+    ],
+
+    'logo_help' => [
+        'email_logo_size'       => 'Square logos in email look best. ',
+    ],
+
+    'logo_option_types' => [
+        'text' => 'Text',
+        'logo' => 'Logo',
+        'logo_and_text' => 'Logo and Text',
+    ],
+
+
+    'legends' => [
+        'scoping' => 'Scoping',
+        'formats' => 'Default Formats',
+        'profiles' => 'User Profiles',
+        'eula' => 'EULA & Acceptance Preferences',
+        'misc_display' => 'Miscellaneous Display Options',
+        'email' => 'Email Preferences',
+        'checkin' => 'Checkin Preferences',
+        'dashboard' => 'Login & Dashboard Preferences',
+        'misc' => 'Miscellaneous',
+        'logos' => 'Logos & Display',
+        'colors' => 'Colors & Skins',
+        'footer' => 'Footer Preferences',
+        'security' => 'Security Preferences',
+        'general' => 'General',
+        'intervals' => 'Intervals & Thresholds',
+    ],
+
+
+    /* Keywords for settings overview help */
+    'keywords' => [
+        'brand'             => 'footer, logo, print, theme, skin, header, colors, color, css',
+        'general_settings'  => 'company support, signature, acceptance, email format, username format, images, per page, thumbnail, eula, gravatar, tos, dashboard, privacy',
+        'groups'            => 'permissions, permission groups, authorization',
+        'labels'            => 'labels, barcodes, barcode, sheets, print, upc, qr, 1d, 2d',
+        'localization'      => 'localization, currency, local, locale, time zone, timezone, international, internatinalization, language, languages, translation',
+        'php_overview'      => 'phpinfo, system, info',
+        'purge'             => 'permanently delete',
+        'security'          => 'password, passwords, requirements, two factor, two-factor, common passwords, remote login, logout, authentication',
+    ],
 
 ];
diff --git a/resources/lang/ga-IE/admin/settings/message.php b/resources/lang/ga-IE/admin/settings/message.php
index b610938e24..43e50068d6 100644
--- a/resources/lang/ga-IE/admin/settings/message.php
+++ b/resources/lang/ga-IE/admin/settings/message.php
@@ -14,6 +14,9 @@ return [
         'restore_warning'       => 'Yes, restore it. I acknowledge that this will overwrite any existing data currently in the database. This will also log out all of your existing users (including you).',
         'restore_confirm'       => 'Are you sure you wish to restore your database from :filename?'
     ],
+    'restore' => [
+        'success'               => 'Your system backup has been restored. Please log in again.'
+    ],
     'purge' => [
         'error'     => 'Tharla earráid agus í ag puráil.',
         'validation_failed'     => 'Tá do dheimhniú purge mícheart. Scríobh an focal "DELETE" sa bhosca daingnithe.',
@@ -33,6 +36,9 @@ return [
         'testing_authentication' => 'Testing LDAP Authentication...',
         'authentication_success' => 'User authenticated against LDAP successfully!'
     ],
+    'labels' => [
+        'null_template' => 'Label template not found. Please select a template.',
+        ],
     'webhook' => [
         'sending' => 'Sending :app test message...',
         'success' => 'Your :webhook_name Integration works!',
@@ -42,5 +48,12 @@ return [
         'error' => 'Something went wrong. :app responded with: :error_message',
         'error_redirect' => 'ERROR: 301/302 :endpoint returns a redirect. For security reasons, we don’t follow redirects. Please use the actual endpoint.',
         'error_misc' => 'Something went wrong. :( ',
-    ]
+        'webhook_fail' => ' webhook notification failed: Check to make sure the URL is still valid.',
+        'webhook_channel_not_found' => ' webhook channel not found.',
+        'ms_teams_deprecation' => 'The selected Microsoft Teams webhook URL will be deprecated Dec 31st, 2025. Please use a workflow URL. Microsoft\'s documentation on creating a workflow can be found <a href="https://support.microsoft.com/en-us/office/create-incoming-webhooks-with-workflows-for-microsoft-teams-8ae491c7-0394-4861-ba59-055e33f75498" target="_blank"> here.</a>',
+    ],
+    'location_scoping' => [
+        'not_saved' => 'Your settings were not saved.',
+        'mismatch' => 'There is 1 item in the database that need your attention before you can enable location scoping.|There are :count items in the database that need your attention before you can enable location scoping.',
+    ],
 ];
diff --git a/resources/lang/ga-IE/admin/statuslabels/table.php b/resources/lang/ga-IE/admin/statuslabels/table.php
index 78565d2893..0954c30b71 100644
--- a/resources/lang/ga-IE/admin/statuslabels/table.php
+++ b/resources/lang/ga-IE/admin/statuslabels/table.php
@@ -1,14 +1,14 @@
 <?php
 
 return array(
-    'about'      	=> 'Maidir Lipéid Stádas',
+    'about'      	=> 'About Status Types',
     'archived'      	=> 'Archived',
     'create'      	=> 'Lipéad Stádas a Chruthaigh',
     'color'      	=> 'Cairt Dath',
     'default_label' => 'Default Label',
     'default_label_help' => 'This is used to ensure your most commonly used status labels appear at the top of the select box when creating/editing assets.',
     'deployable'      	=> 'Infheidhmithe',
-    'info'      	=> 'Úsáidtear lipéid stádas chun cur síos a dhéanamh ar na stáit éagsúla a d\'fhéadfadh do shócmhainní a bheith ann. Féadfaidh siad a bheith amach le haghaidh a dheisiú, a chailltear / a goideadh, etc. Is féidir leat lipéid stádais nua a chruthú le haghaidh sócmhainní in-imscartha, ar feitheamh agus i gcartlann.',
+    'info'      	=> 'Status label types are used to describe the various states your assets could be in. They may be out for repair, lost/stolen, etc. You can create new status labels for your deployable, pending and archived assets according to your own workflow. For more information, <a href="https://snipe-it.readme.io/docs/overview#status-labels" target="_blank">see the documentation <i class="fa fa-external-link"></i></a>.',
     'name'      	=> 'Ainm Stádas',
     'pending'      	=> 'Ar feitheamh',
     'status_type'   => 'Cineál Stádas',
diff --git a/resources/lang/ga-IE/admin/users/general.php b/resources/lang/ga-IE/admin/users/general.php
index a3ef262e62..534f344fc0 100644
--- a/resources/lang/ga-IE/admin/users/general.php
+++ b/resources/lang/ga-IE/admin/users/general.php
@@ -19,6 +19,8 @@ return [
     'print_assigned'    => 'Print All Assigned',
     'email_assigned'    => 'Email List of All Assigned',
     'user_notified'     => 'User has been emailed a list of their currently assigned items.',
+    'users_notified'    => 'The user has been emailed a list of their currently assigned items.|:count users have been emailed a list of their currently assigned items.',
+    'users_notified_warning' => ':count user has been emailed a list of their currently assigned items, however :no_email users did not have an email address so could not be emailed.|:count users have been emailed a list of their currently assigned items, however :no_email user(s) did not have an email address so could not be emailed.',
     'auto_assign_label' => 'Include this user when auto-assigning eligible licenses',
     'auto_assign_help'  => 'Skip this user in auto assignment of licenses',
     'software_user'     => 'Bogearraí Seiceáil amach chuig: ainm',
diff --git a/resources/lang/ga-IE/admin/users/message.php b/resources/lang/ga-IE/admin/users/message.php
index 9d26d415f4..02ac6df940 100644
--- a/resources/lang/ga-IE/admin/users/message.php
+++ b/resources/lang/ga-IE/admin/users/message.php
@@ -6,7 +6,7 @@ return array(
     'declined'                  => 'Dhiúltaigh tú an tsócmhainn seo go rathúil.',
     'bulk_manager_warn'	        => 'Rinneadh do chuid úsáideoirí a nuashonrú go rathúil, áfach, níor shábháil do iontráil bainisteora toisc go raibh an bainisteoir a roghnaigh tú chomh maith sa liosta úsáideora le bheith in eagar, agus b\'fhéidir nach mbainfeadh úsáideoirí a mbainisteoir féin. Roghnaigh d\'úsáideoirí arís, gan an bainisteoir a áireamh.',
     'user_exists'               => 'Úsáideoir ann cheana!',
-    'user_not_found'            => 'Níl an t-úsáideoir ann.',
+    'user_not_found'            => 'User does not exist or you do not have permission view them.',
     'user_login_required'       => 'Is gá an réimse logála isteach',
     'user_has_no_assets_assigned' => 'No assets currently assigned to user.',
     'user_password_required'    => 'Tá an focal faire ag teastáil.',
@@ -53,6 +53,7 @@ return array(
         'ldap_could_not_search' => 'Níorbh fhéidir an freastalaí LDAP a chuardach. Seiceáil do chumraíocht an fhreastalaí LDAP sa chomhad cumraíochta LDAP. <br>Error ó Freastalaí LDAP:',
         'ldap_could_not_get_entries' => 'Níorbh fhéidir iontrálacha a fháil ón fhreastalaí LDAP. Seiceáil do chumraíocht an fhreastalaí LDAP sa chomhad cumraíochta LDAP. <br>Error ó Freastalaí LDAP:',
         'password_ldap' => 'Bainistíonn LDAP / Active Directory an focal faire don chuntas seo. Téigh i dteagmháil le do roinn TF chun do phasfhocal a athrú.',
+        'multi_company_items_assigned' => 'This user has items assigned that belong to a different company. Please check them in or edit their company.'
     ),
 
     'deletefile' => array(
diff --git a/resources/lang/ga-IE/admin/users/table.php b/resources/lang/ga-IE/admin/users/table.php
index fe9edfde28..578fda4b83 100644
--- a/resources/lang/ga-IE/admin/users/table.php
+++ b/resources/lang/ga-IE/admin/users/table.php
@@ -22,7 +22,7 @@ return array(
     'managed_locations'     => 'Láithreáin bhainistithe',
     'managed_users'         => 'Managed Users',
     'name' 					=> 'Ainm',
-    'nogroup'               => 'No groups have been created yet. To add one, visit: ',
+    'nogroup'               => 'No groups have been created yet. To add one, visit:',
     'notes'                 => 'Nótaí',
     'password_confirm' 		=> 'Deimhnigh Pasfhocal',
     'password' 				=> 'Pasfhocal',
diff --git a/resources/lang/ga-IE/auth.php b/resources/lang/ga-IE/auth.php
index db310aa1bb..14d8acfce0 100644
--- a/resources/lang/ga-IE/auth.php
+++ b/resources/lang/ga-IE/auth.php
@@ -15,6 +15,6 @@ return array(
 
     'failed' => 'These credentials do not match our records.',
     'password' => 'The provided password is incorrect.',
-    'throttle' => 'Too many login attempts. Please try again in :seconds seconds.',
+    'throttle' => 'Too many login attempts. Please try again in :minutes minute(s).',
 
 );
diff --git a/resources/lang/ga-IE/auth/message.php b/resources/lang/ga-IE/auth/message.php
index e959da4bc2..714482115c 100644
--- a/resources/lang/ga-IE/auth/message.php
+++ b/resources/lang/ga-IE/auth/message.php
@@ -6,8 +6,6 @@ return array(
     'account_not_found'      => 'Tá an t-ainm úsáideora nó an focal faire mícheart.',
     'account_not_activated'  => 'Níl an cuntas úsáideora seo curtha i ngníomh.',
     'account_suspended'      => 'Tá an cuntas úsáideora seo ar fionraí.',
-    'account_banned'         => 'Tá toirmeasc ar an gcuntas úsáideora seo.',
-    'throttle'               => 'Too many failed login attempts. Please try again in :minutes minutes.',
 
     'two_factor' => array(
         'already_enrolled'      => 'Your device is already enrolled.',
diff --git a/resources/lang/ga-IE/button.php b/resources/lang/ga-IE/button.php
index aff88fbae8..b8c4d81d77 100644
--- a/resources/lang/ga-IE/button.php
+++ b/resources/lang/ga-IE/button.php
@@ -7,6 +7,7 @@ return [
     'checkin_and_delete'  	    => 'Checkin All / Delete User',
     'delete'  	                => 'Scrios',
     'edit'    	                => 'Athraigh',
+    'clone'    	                => 'Clone',
     'restore' 	                => 'Athchóirigh',
     'remove'                    => 'Remove',
     'request'                   => 'Iarratas',
@@ -21,4 +22,13 @@ return [
     'add_maintenance'           => 'Add Maintenance',
     'append'                    => 'Append',
     'new'                       => 'Nua',
+    'var' => [
+        'clone'     => 'Clone :item_type',
+        'edit'      => 'Edit :item_type',
+        'delete'    => 'Delete :item_type',
+        'restore'   => 'Restore :item_type',
+        'create'    => 'Create New :item_type',
+        'checkout'  => 'Checkout :item_type',
+        'checkin'   => 'Checkin :item_type',
+    ]
 ];
diff --git a/resources/lang/ga-IE/general.php b/resources/lang/ga-IE/general.php
index 55d6fbeb36..d32ef54b07 100644
--- a/resources/lang/ga-IE/general.php
+++ b/resources/lang/ga-IE/general.php
@@ -10,7 +10,7 @@ return [
     'action'                => 'Gníomh',
     'activity_report'		=> 'Tuarascáil Ghníomhaíochta',
     'address'				=> 'Seoladh',
-    'admin'					=> 'Riarachán',
+    'admin'					=> 'Admin Settings',
     'admin_tooltip'			=> 'This user has admin privileges',
     'superuser'				=> 'Superuser',
     'superuser_tooltip'		=> 'This user has superuser privileges',
@@ -23,13 +23,16 @@ return [
     'asset_models'			=> 'Múnlaí Sócmhainne',
     'asset_model'			=> 'Mionsamhail',
     'asset'					=> 'Sócmhainn',
+    'asset_previous'        => 'Asset (Previously Assigned)',
     'asset_report'          => 'Tuarascáil Sócmhainní',
     'asset_tag'				=> 'Clib Sócmhainní',
     'asset_tags'            => 'Asset Tags',
     'assets_available'		=> 'Assets available',
     'accept_assets'         => 'Accept Assets :name',
     'accept_assets_menu'    => 'Accept Assets',
+    'accept_item'           => 'Accept Item',
     'audit'				    => 'Iniúchadh',
+    'audits'				=> 'Audits',
     'audit_report'			=> 'Logáil Iniúchta',
     'assets'				=> 'Sócmhainní',
     'assets_audited'        => 'assets audited',
@@ -61,9 +64,12 @@ return [
     'changepassword'  		=> 'Athraigh do phasfhocal',
     'checkin'  				=> 'Checkin',
     'checkin_from'  		=> 'Seiceáil ó',
+    'checkin_note'  		=> 'Checkin Note',
+    'checkout_note'  		=> 'Checkout Note',
     'checkout'  			=> 'Seiceáil',
     'checkouts_count'       => 'Checkouts',
     'checkins_count'        => 'Checkins',
+    'checkin_and_delete'  	=> 'Checkin and Delete',
     'user_requests_count'   => 'Requests',
     'city'  				=> 'Cathair',
     'click_here'			=> 'Cliceáil anseo',
@@ -77,7 +83,7 @@ return [
     'consumables'			=> 'Tomhaltáin',
     'country'  				=> 'Tír',
     'could_not_restore'     => 'Error restoring :item_type: :error',
-    'not_deleted'           => 'The :item_type is not deleted so it cannot be restored',
+    'not_deleted'           => 'The :item_type was not deleted and therefore cannot be restored',
     'create'				=> 'Cruthaigh Nua',
     'created'               => 'Mír Cruthaithe',
     'created_asset'			=> 'cruthaíodh sócmhainn',
@@ -86,11 +92,13 @@ return [
     'record_created' 		=> 'Record Created',
     'updated_at' 			=> 'Nuashonraithe ag',
     'currency'  			=> '$', // this is deprecated
+    'currency_text'  		=> 'Currency', //
     'current'  				=> 'Reatha',
     'current_password'      => 'Current Password',
     'customize_report'      => 'Customize Report',
     'custom_report'         => 'Tuarascáil Sócmhainní Custaim',
     'dashboard'				=> 'Painéal',
+    'data_source'           => 'Data Source',
     'days'      			=> 'lá',
     'days_to_next_audit'    => 'Laethanta go dtí an chéad Iniúchadh',
     'date'					=> 'Dáta',
@@ -98,7 +106,7 @@ return [
     'debug_warning_text'    => 'Tá an t-iarratas seo á reáchtáil i mód táirgthe le cumas dífhabhtaithe. Féadfaidh sé seo sonraí íogaire a nochtadh má tá do iarratas inrochtana don domhan lasmuigh. Díchumasaigh an modh dífhabhtaithe trí luachanna <code>APP_DEBUG</code> a leagan amach i do chomhad <code>.env</code> chuig <code>false</code>.',
     'delete'  				=> 'Scrios',
     'delete_confirm'  		=> 'Are you sure you wish to delete :item?',
-    'delete_confirm_no_undo' => 'Are you sure you wish to delete :item? This can not be undone.',
+    'delete_confirm_no_undo' => 'Are you sure, you wish to delete :item? This cannot be undone.',
     'deleted'  				=> 'Scriosta',
     'delete_seats'  		=> 'Suíocháin Scriosta',
     'deletion_failed'       => 'Deletion failed',
@@ -114,29 +122,13 @@ return [
     'editprofile'  			=> 'Cuir do phróifíl in eagar',
     'eol'					=> 'EOL',
     'email_domain'			=> 'Fearann ​​Ríomhphoist',
-    'email_format'			=> 'Foirm Ríomhphoist',
     'employee_number'       => 'Employee Number',
     'email_domain_help'		=> 'Úsáidtear é seo chun seoltaí ríomhphoist a ghiniúint nuair a allmhairítear iad',
     'error'				    => 'Error',
     'exclude_archived'      => 'Exclude Archived Assets',
     'exclude_deleted'       => 'Exclude Deleted Assets',
     'example'				=> 'Example: ',
-    'filastname_format'			=> 'An Chéad Ainm Deiridh Tosaigh (jsmith@example.com)',
-    'firstname_lastname_format'	=> 'Ainm Ainm Chéad Ainm (jane.smith@example.com)',
-    'firstname_lastname_underscore_format' => 'First Name Last Name (jane_smith@example.com)',
-    'lastnamefirstinitial_format' =>  'Last Name First Initial (smithj@example.com)',
-    'firstintial_dot_lastname_format' => 'First Initial Last Name (j.smith@example.com)',
-    'firstname_lastname_display'	=> 'First Name Last Name (Jane Smith)',
-    'lastname_firstname_display'	=> 'Last Name First Name (Smith Jane)',
-    'name_display_format'	=> 'Name Display Format',
-    'first'					=> 'An Chéad',
-    'firstnamelastname'     => 'First Name Last Name (janesmith@example.com)',
-    'lastname_firstinitial' => 'Last Name First Initial (smith_j@example.com)',
-    'firstinitial.lastname' => 'First Initial Last Name (j.smith@example.com)',
-    'firstnamelastinitial'  => 'First Name Last Initial (janes@example.com)',
-    'lastnamefirstname'      => 'Last Name First Name (smith.jane@example.com)',
-    'first_name'			=> 'Ainm',
-    'first_name_format'		=> 'Céadainm (jane@example.com)',
+
     'files'                 => 'Files',
     'file_name'				=> 'Comhad',
     'file_type'             => 'File Type',
@@ -156,9 +148,9 @@ return [
     'image_delete'         	=> 'Scrios Íomhá',
     'include_deleted'       => 'Include Deleted Assets',
     'image_upload'         	=> 'Íomhá Uaslódáil',
-    'filetypes_accepted_help'    => 'Accepted filetype is :types. Max upload size allowed is :size.|Accepted filetypes are :types. Max upload size allowed is :size.',
-    'filetypes_size_help'   => 'Max upload size allowed is :size.',
-    'image_filetypes_help'  => 'Accepted filetypes are jpg, webp, png, gif, svg, and avif. Max upload size allowed is :size.',
+    'filetypes_accepted_help'    => 'Accepted filetype is :types. The maximum size allowed is :size.|Accepted filetypes are :types. The maximum upload size allowed is :size.',
+    'filetypes_size_help'   => 'The maximum upload size allowed is :size.',
+    'image_filetypes_help'  => 'Accepted Filetypes are jpg, webp, png, gif, svg, and avif. The maximum upload size allowed is :size.',
     'unaccepted_image_type'  => 'This image file was not readable. Accepted filetypes are jpg, webp, png, gif, and svg. The mimetype of this file is: :mimetype.',
     'import'         	    => 'Iompórtáil',
     'import_this_file'      => 'Map fields and process this file',
@@ -178,12 +170,17 @@ return [
     'last'					=> 'Last',
     'last_login'            => 'Logáil isteach deireanach',
     'last_name'             => 'Ainm deiridh',
+    'firstname_lastname_display'	=> 'First Name Last Name (Jane Smith)',
+    'lastname_firstname_display'	=> 'Last Name First Name (Smith Jane)',
+    'name_display_format'	=> 'Name Display Format',
+    'first'					=> 'An Chéad',
+    'first_name'			=> 'Ainm',
     'license'				=> 'Ceadúnas',
     'license_report'        => 'Tuarascáil Cheadúnais',
     'licenses_available'	=> 'Licenses available',
     'licenses'				=> 'Ceadúnais',
     'list_all'				=> 'Liosta Gach',
-    'loading'				=> 'Loading... please wait....',
+    'loading'				=> 'Loading... please wait...',
     'lock_passwords'        => 'This field value will not be saved in a demo installation.',
     'feature_disabled'      => 'Tá an ghné seo faoi mhíchumas chun an suiteáil taispeántais.',
     'location'              => 'Suíomh',
@@ -193,7 +190,7 @@ return [
     'logout'				=> 'Logáil Amach',
     'lookup_by_tag'     => 'Féach ar Chlib Sócmhainní',
     'maintenances'          => 'Maintenances',
-    'manage_api_keys'       => 'Manage API Keys',
+    'manage_api_keys'       => 'Manage API keys',
     'manufacturer'			=> 'Déantóir',
     'manufacturers'			=> 'Déantóirí',
     'markdown'				=> 'Ceadaíonn an réimse seo <a href="https://help.github.com/articles/github-flavored-markdown/">Github flavored markdown</a>.',
@@ -215,6 +212,14 @@ return [
     'no_results'			=> 'Gan Torthaí.',
     'no'  					=> 'Uimh',
     'notes'  				=> 'Nótaí',
+    'note_added'            => 'Note Added',
+    'options'				=> 'Options',
+    'preview'				=> 'Preview',
+    'add_note'              => 'Add Note',
+    'note_edited'            => 'Note Edited',
+    'edit_note'              => 'Edit Note',
+    'note_deleted'            => 'Note Deleted',
+    'delete_note'              => 'Delete Note',
     'order_number'          => 'Uimhir ordú',
     'only_deleted'          => 'Only Deleted Assets',
     'page_menu'				=> 'Míreanna _MENU_ a thaispeáint',
@@ -229,7 +234,7 @@ return [
     'purchase_date'         => 'Dáta Ceannacháin',
     'qty'		            => 'QTY',
     'quantity'		        => 'Cainníocht',
-    'quantity_minimum'      => 'You have :count items below or almost below minimum quantity levels',
+    'quantity_minimum'      => 'You have one item below or almost below minimum quantity levels|You have :count items below or almost below minimum quantity levels',
     'quickscan_checkin'  	=> 'Quick Scan Checkin',
     'quickscan_checkin_status'  	=> 'Checkin Status',
     'ready_to_deploy'		=> 'Réidh le Imscaradh',
@@ -254,7 +259,7 @@ return [
     'select_all'            => 'Select All',
     'search'				=> 'Cuardaigh',
     'select_category'       => 'Roghnaigh Catagóir',
-    'select_datasource' => 'Select a Datasource',
+    'select_datasource' => 'Select a data source',
     'select_department'     => 'Roghnaigh Roinn',
     'select_depreciation'	=> 'Roghnaigh Cineál Dímheasa',
     'select_location'		=> 'Roghnaigh Suíomh',
@@ -274,13 +279,15 @@ return [
     'signed_off_by'         => 'Signed Off By',
     'skin'       			=> 'Skin',
     'webhook_msg_note'        => 'A notification will be sent via webhook',
-    'webhook_test_msg'        => 'Oh hai! Looks like your :app integration with Snipe-IT is working!',
+    'webhook_test_msg'        => 'Oh hai! It looks like your :app integration with Snipe-IT is working!',
     'some_features_disabled' => 'MODH DEMO: Tá gnéithe áirithe faoi mhíchumas don shuiteáil seo agus athshocróidh na sonraí sa chóras seo go laethúil.',
     'site_name'				=> 'Ainm an tSuímh',
     'state'  				=> 'Stáit',
     'status_labels'			=> 'Lipéid Stádas',
+    'status_label'			=> 'Status Label',
     'status'    			=> 'Stádas',
     'accept_eula'           => 'Acceptance Agreement',
+    'show_or_hide_eulas' => 'Show/Hide EULAs',
     'supplier'              => 'Soláthraí',
     'suppliers'  			=> 'Soláthraithe',
     'sure_to_delete'        => 'An bhfuil tú cinnte gur mian leat a scriosadh',
@@ -296,9 +303,9 @@ return [
     'type'  				=> 'Cineál',
     'undeployable'			=> 'Neamh-imscartha',
     'unknown_admin'			=> 'Riarachán Anaithnid',
-    'username_format'		=> 'Ainm Úsáideora Formáid',
     'username'              => 'Ainm Úsáideora',
     'update'                => 'Nuashonrú',
+    'updating_item' => 'Updating :item',
     'upload_filetypes_help'      => 'Allowed filetypes are png, gif, jpg, jpeg, doc, docx, pdf, xls, xlsx, txt, lic, xml, zip, rtf and rar. Max upload size allowed is :size.',
     'uploaded'              => 'Uasluchtaithe',
     'user'					=> 'Úsáideoir',
@@ -323,10 +330,10 @@ return [
     'token_expired'         => 'Tá do sheisiún foirm in éag. Arís, le d\'thoil.',
     'login_enabled'         => 'Login Enabled',
     'audit_due'             => 'Due for Audit',
-    'audit_due_days'        => 'Assets Due for Audit Within :days Day|Assets Due for Audit Within :days Days',
+    'audit_due_days'        => '{}Assets Due or Overdue for Audit|[1]Assets Due or Overdue for Audit Within a Day|[2,*]Assets Due or Overdue for Audit Within :days Days',
     'checkin_due'           => 'Due for Checkin',
     'checkin_overdue'       => 'Overdue for Checkin',
-    'checkin_due_days'      => 'Assets Due for Checkin Within :days Day|Assets Due for Checkin Within :days Days',
+    'checkin_due_days'      => '{}Due for Checkin|[1]Assets Due for Checkin Within :days Day|[2,*]Assets Due for Checkin Within :days Days',
     'audit_overdue'         => 'Overdue for Audit',
     'accept'                => 'Accept :asset',
     'i_accept'              => 'I accept',
@@ -339,16 +346,16 @@ return [
     'view_all'              => 'view all',
     'hide_deleted'          => 'Hide Deleted',
     'email'                 => 'Ríomhphost',
-    'do_not_change'         => 'Do Not Change',
-    'bug_report'            => 'Report a Bug',
+    'do_not_change'         => 'Do not change',
+    'bug_report'            => 'Report a bug',
     'user_manual'           => 'User\'s Manual',
     'setup_step_1'          => 'Step 1',
     'setup_step_2'          => 'Step 2',
     'setup_step_3'          => 'Step 3',
     'setup_step_4'          => 'Step 4',
     'setup_config_check'    => 'Configuration Check',
-    'setup_create_database' => 'Create Database Tables',
-    'setup_create_admin'    => 'Create Admin User',
+    'setup_create_database' => 'Create database tables',
+    'setup_create_admin'    => 'Create an admin user',
     'setup_done'            => 'Finished!',
     'bulk_edit_about_to'    => 'You are about to edit the following: ',
     'checked_out'           => 'Seiceáil Amach',
@@ -383,6 +390,8 @@ return [
     'new_license'           => 'New License',
     'new_accessory'         => 'New Accessory',
     'new_consumable'        => 'New Consumable',
+    'new_component'         => 'New Component',
+    'new_user'              => 'New User',
     'collapse'              => 'Collapse',
     'assigned'              => 'Assigned',
     'asset_count'           => 'Asset Count',
@@ -418,19 +427,20 @@ return [
     'bulk_soft_delete'      =>'Also soft-delete these users. Their asset history will remain intact unless/until you purge deleted records in the Admin Settings.',
     'bulk_checkin_delete_success' => 'Your selected users have been deleted and their items have been checked in.',
     'bulk_checkin_success' => 'The items for the selected users have been checked in.',
-    'set_to_null'           => 'Delete values for this asset|Delete values for all :asset_count assets ',
+    'set_to_null'           => 'Delete values for this selection|Delete values for all :selection_count selections ',
     'set_users_field_to_null'  => 'Delete :field values for this user|Delete :field values for all :user_count users ',
     'na_no_purchase_date'   => 'N/A - No purchase date provided',
     'assets_by_status'      => 'Assets by Status',
     'assets_by_status_type'      => 'Assets by Status Type',
     'pie_chart_type'        => 'Dashboard Pie Chart Type',
     'hello_name'            => 'Hello, :name!',
-    'unaccepted_profile_warning'   => 'You have :count items requiring acceptance. Click here to accept or decline them',
+    'unaccepted_profile_warning'   => 'You have one item requiring acceptance. Click here to accept or decline it | You have :count items requiring acceptance. Click here to accept or decline them',
     'start_date'            => 'Start Date',
     'end_date'            => 'End Date',
     'alt_uploaded_image_thumbnail' => 'Uploaded thumbnail',
     'placeholder_kit'       => 'Select a kit',
     'file_not_found'        => 'File not found',
+    'log_record_not_found'  => 'No record for that log entry was found.',
     'preview_not_available' => '(no preview)',
     'setup'                 => 'Setup',
     'pre_flight'            => 'Pre-Flight',
@@ -512,7 +522,7 @@ return [
     'checked_out_to_fields' => 'Checked Out To Fields',
     'percent_complete' => '% comhlánaigh',
     'uploading' => 'Uploading... ',
-    'upload_error' => 'Error uploading file. Please check that there are no empty rows and that no column names are duplicated.',
+    'upload_error' => 'Error uploading file. Please check that you have no empty rows or duplicated column names in your CSV, and that the server permissions allow uploads.',
     'copy_to_clipboard' => 'Copy to Clipboard',
     'copied' => 'Copied!',
     'status_compatibility' => 'If assets are already assigned, they cannot be changed to a non-deployable status type and this value change will be skipped.',
@@ -549,6 +559,71 @@ return [
         'license_seats'  => ':count License Seat|:count License Seats',
         'consumables'  => ':count Consumable|:count Consumables',
         'components'  => ':count Component|:count Components',
-    ]
+    ],
+
+    'more_info' => 'Tuilleadh eolais',
+    'quickscan_bulk_help' => 'Checking this box will edit the asset record to reflect this new location. Leaving it unchecked will simply note the location in the audit log. Note that if this asset is checked out, it will not change the location of the person, asset or location it is checked out to.',
+    'whoops' => 'Whoops!',
+    'something_went_wrong' => 'Something went wrong with your request.',
+    'close' => 'Close',
+    'expires' => 'Deireadh',
+    'map_fields'=> 'Map :item_type Fields',
+    'remaining_var' => ':count Remaining',
+    'label' => 'Label',
+    'import_asset_tag_exists' => 'An asset with the asset tag :asset_tag already exists and an update was not requested. No change was made.',
+    'countries_manually_entered_help' => 'Values with an asterisk (*) were manually entered and do not match existing ISO 3166 dropdown values',
+    'accessories_assigned' => 'Assigned Accessories',
+    'user_managed_passwords' => 'Password Management',
+    'user_managed_passwords_disallow' => 'Disallow users from managing their own passwords',
+    'user_managed_passwords_allow' => 'Allow users to manage their own passwords',
+    'from' => 'From',
+    'by' => 'De réir',
+
+// Add form placeholders here
+    'placeholders' => [
+        'notes'  => 'Add a note',
+    ],
+
+    'breadcrumb_button_actions' => [
+        'edit_item' => 'Edit :name',
+        'checkout_item' => 'Checkout :name',
+        'checkin_item' => 'Checkin :name',
+    ],
+
+    'skins' => [
+        'site_default' => 'Site Default',
+        'default_blue' => 'Default Blue',
+        'blue_dark' => 'Blue (Dark Mode)',
+        'green' => 'Green Dark',
+        'green_dark' => 'Green (Dark Mode)',
+        'red' => 'Red Dark',
+        'red_dark' => 'Red (Dark Mode)',
+        'orange' => 'Orange Dark',
+        'orange_dark' => 'Orange (Dark Mode)',
+        'black' => 'Black',
+        'black_dark' => 'Black (Dark Mode)',
+        'purple' => 'Purple',
+        'purple_dark' => 'Purple (Dark Mode)',
+        'yellow' => 'Yellow',
+        'yellow_dark' => 'Yellow (Dark Mode)',
+        'high_contrast' => 'High Contrast',
+
+    ],
+
+    'select_all_none' => 'Select/Unselect All',
+    'generic_model_not_found' => 'That :model was not found or you do not have permission to access it',
+    'deleted_models' => 'Deleted Asset Models',
+    'deleted_users' => 'Deleted Users',
+    'cost_each' => ':amount each',
+    'remove_current_image' => 'Remove current :type image',
+
+    'seeding' => [
+        'manufacturers' => [
+            'button' => 'Create Manufacturers',
+            'prompt' => 'You do not have any manufacturers yet. Would you like to seed a list of common manufacturers? (THIS WILL OVERWRITE EXISTING MANUFACTURERS, including those that have been soft-deleted.)',
+            'success' => 'Manufacturers seeded successfully',
+            'error' => 'Could not seed manufacturers. A manufacturer record already exists and seeding would overwrite it.|Could not seed manufacturers. :count manufacturer records already exist and seeding would overwrite them.',
+        ],
+    ],
 
 ];
diff --git a/resources/lang/ga-IE/localizations.php b/resources/lang/ga-IE/localizations.php
index f1232dd138..827ed4fca1 100644
--- a/resources/lang/ga-IE/localizations.php
+++ b/resources/lang/ga-IE/localizations.php
@@ -2,7 +2,7 @@
 
 return [
 
-    'select_language' => 'Select a language',
+    'select_language' => 'Select a Language',
     'languages' => [
         'en-US'=> 'English, US',
         'en-GB'=> 'English, UK',
@@ -40,7 +40,9 @@ return [
         'ms-MY'=> 'Malay',
         'mi-NZ'=> 'Maori',
         'mn-MN'=> 'Mongolian',
-        'no-NO'=> 'Norwegian',
+        'nb-NO'=> 'Norwegian Bokmål',
+        'om-ET' => 'Oromo (Ethiopian)',
+        //'nn-NO'=> 'Norwegian Nynorsk',
         'fa-IR'=> 'Persian',
         'pl-PL'=> 'Polish',
         'pt-PT'=> 'Portuguese',
@@ -66,7 +68,7 @@ return [
         'zu-ZA'=> 'Zulu',
     ],
 
-    'select_country' => 'Select a country',
+    'select_country' => 'Select a Country',
     
     'countries' => [
         'AC'=>'Ascension Island',
@@ -133,6 +135,7 @@ return [
         'EC'=>'Ecuador',
         'EE'=>'Estonia',
         'EG'=>'Egypt',
+        'GB-ENG'=>'England',
         'ER'=>'Eritrea',
         'ES'=>'Spain',
         'ET'=>'Ethiopia',
@@ -231,6 +234,7 @@ return [
         'NG'=>'Nigeria',
         'NI'=>'Nicaragua',
         'NL'=>'Netherlands',
+        'GB-NIR' => 'Northern Ireland',
         'NO'=>'Norway',
         'NP'=>'Nepal',
         'NR'=>'Nauru',
@@ -258,7 +262,7 @@ return [
         'RU'=>'Russian Federation',
         'RW'=>'Rwanda',
         'SA'=>'Saudi Arabia',
-        'UK'=>'Scotland',
+        'GB-SCT'=>'Scotland',
         'SB'=>'Solomon Islands',
         'SC'=>'Seychelles',
         'SS'=>'South Sudan',
@@ -310,6 +314,7 @@ return [
         'VI'=>'Virgin Islands (U.S.)',
         'VN'=>'Viet Nam',
         'VU'=>'Vanuatu',
+        'GB-WLS' =>'Wales',
         'WF'=>'Wallis And Futuna Islands',
         'WS'=>'Samoa',
         'YE'=>'Yemen',
diff --git a/resources/lang/ga-IE/mail.php b/resources/lang/ga-IE/mail.php
index 535b13470f..ac8109ce59 100644
--- a/resources/lang/ga-IE/mail.php
+++ b/resources/lang/ga-IE/mail.php
@@ -23,24 +23,25 @@ return [
     'Item_Requested' => 'Mír Iarraidh',
     'License_Checkin_Notification' => 'License checked in',
     'License_Checkout_Notification' => 'License checked out',
+    'license_for'   => 'License for',
     'Low_Inventory_Report' => 'Tuarascáil Fardal Íseal',
     'a_user_canceled' => 'Tá úsáideoir tar éis iarratas ar mhír a chealú ar an láithreán gréasáin',
     'a_user_requested' => 'D\'iarr úsáideoir mír ar an láithreán gréasáin',
     'acceptance_asset_accepted' => 'A user has accepted an item',
     'acceptance_asset_declined' => 'A user has declined an item',
-    'accessory_name' => 'Ainm Cúlpháirtí:',
-    'additional_notes' => 'Nótaí Breise:',
+    'accessory_name' => 'Ainm Cúlpháirtí',
+    'additional_notes' => 'Nótaí Breise',
     'admin_has_created' => 'Tá riarthóir tar éis cuntas a chruthú duit ar: láithreán gréasáin gréasáin.',
-    'asset' => 'Sócmhainn:',
-    'asset_name' => 'Ainm Sócmhainne:',
+    'asset' => 'Sócmhainn',
+    'asset_name' => 'Ainm Sócmhainne',
     'asset_requested' => 'Iarrtar sócmhainn',
     'asset_tag' => 'Clib Sócmhainní',
     'assets_warrantee_alert' => 'There is :count asset with a warranty expiring in the next :threshold days.|There are :count assets with warranties expiring in the next :threshold days.',
     'assigned_to' => 'Sannadh Chun',
     'best_regards' => 'Dea-mhéin,',
-    'canceled' => 'Ar ceal:',
-    'checkin_date' => 'Dáta Checkin:',
-    'checkout_date' => 'Dáta Seiceáil:',
+    'canceled' => 'Ar ceal',
+    'checkin_date' => 'Dáta Checkin',
+    'checkout_date' => 'Dáta Seiceáil',
     'checkedout_from' => 'Checked out from',
     'checkedin_from'  => 'Checked in from',
     'checked_into' => 'Checked into',
@@ -49,27 +50,30 @@ return [
     'click_to_confirm' => 'Cliceáil ar an nasc seo a leanas le do thoil a dheimhniú: cuntas gréasáin:',
     'current_QTY' => 'QTY Reatha',
     'days' => 'Laethanta',
-    'expecting_checkin_date' => 'Dáta Checkin Ionchais:',
+    'expecting_checkin_date' => 'An Dáta Seiceála Ionchais',
     'expires' => 'Deireadh',
     'hello' => 'Dia dhuit',
     'hi' => 'Haigh',
     'i_have_read' => 'Léigh na téarmaí úsáide agus léigh mé na téarmaí úsáide agus fuair mé an t-ítim seo.',
     'inventory_report' => 'Inventory Report',
-    'item' => 'Mír:',
+    'item' => 'Mír',
+    'item_checked_reminder' => 'This is a reminder that you currently have :count items checked out to you that you have not accepted or declined. Please click the link below to confirm your decision.',
     'license_expiring_alert' => 'There is :count license expiring in the next :threshold days.|There are :count licenses expiring in the next :threshold days.',
     'link_to_update_password' => 'Cliceáil ar an nasc seo a leanas chun do chuid focal faire:',
-    'login' => 'Logáil isteach:',
+    'login' => 'Logáil isteach',
     'login_first_admin' => 'Logáil isteach i do shuiteáil Snipe-IT nua ag baint úsáide as na dintiúir thíos:',
     'low_inventory_alert' => 'There is :count item that is below minimum inventory or will soon be low.|There are :count items that are below minimum inventory or will soon be low.',
     'min_QTY' => 'Min QTY',
     'name' => 'Ainm',
     'new_item_checked' => 'Rinneadh mír nua a sheiceáil faoi d\'ainm, tá na sonraí thíos.',
+    'new_item_checked_with_acceptance' => 'A new item has been checked out under your name that requires acceptance, details are below.',
+    'recent_item_checked' => 'An item was recently checked out under your name that requires acceptance, details are below.',
     'notes' => 'Nótaí',
-    'password' => 'Pasfhocal:',
+    'password' => 'Pasfhocal',
     'password_reset' => 'Athshocraigh Pasfhocal',
     'read_the_terms' => 'Léigh na téarmaí úsáide thíos.',
     'read_the_terms_and_click' => 'Please read the terms of use below, and click on the link at the bottom to confirm that you read and agree to the terms of use, and have received the asset.',
-    'requested' => 'Iarrtar:',
+    'requested' => 'Iarrtar',
     'reset_link' => 'Do Nasc Athshocraigh Pasfhocal',
     'reset_password' => 'Cliceáil anseo chun do phasfhocal a athshocrú:',
     'rights_reserved' => 'All rights reserved.',
@@ -86,8 +90,10 @@ return [
     'upcoming-audits' => 'There is :count asset that is coming up for audit within :threshold days.|There are :count assets that are coming up for audit within :threshold days.',
     'user' => 'Úsáideoir',
     'username' => 'Ainm Úsáideora',
+    'unaccepted_asset_reminder' => 'Reminder: You have Unaccepted Assets.',
     'welcome' => 'Fáilte: ainm',
     'welcome_to' => 'Fáilte go dtí: gréasáin!',
     'your_assets' => 'View Your Assets',
     'your_credentials' => 'Do dhintiúir Snipe-IT',
+    'mail_sent' => 'Mail sent successfully!',
 ];
diff --git a/resources/lang/ga-IE/validation.php b/resources/lang/ga-IE/validation.php
index 81bdf6af44..9b440e73f3 100644
--- a/resources/lang/ga-IE/validation.php
+++ b/resources/lang/ga-IE/validation.php
@@ -13,87 +13,150 @@ return [
     |
     */
 
-    'accepted'             => 'Ní mór glacadh leis an tréith.',
-    'active_url'           => 'Níl an tréith: URL bailí.',
-    'after'                => 'An: Ní mór tréith a bheith ina dháta tar éis: dáta.',
-    'after_or_equal'       => 'An: Ní mór tréith a bheith ina dáta tar éis nó cothrom leis: dáta.',
-    'alpha'                => 'Ní fhéadfar ach litreacha a bheith i dtréith.',
-    'alpha_dash'           => 'Ní féidir leis an tréith: litreacha, uimhreacha, agus taiscí a bheith ann.',
-    'alpha_num'            => 'Ní fhéadfar ach litreacha agus uimhreacha a bheith i dtréith.',
-    'array'                => 'An: Ní mór tréith a bheith ina sraith.',
-    'before'               => 'An: Ní mór tréith a bheith ina dháta roimh: dáta.',
-    'before_or_equal'      => 'An: Ní mór tréith a bheith ina dháta roimh nó cothrom le: dáta.',
-    'between'              => [
-        'numeric' => 'An: Ní mór tréith a bheith idir: min agus: max.',
-        'file'    => 'An: Ní mór tréith a bheith idir: min agus: max kilobytes.',
-        'string'  => 'An: Ní mór tréith a bheith idir: min agus: carachtair uasta.',
-        'array'   => 'An: Ní mór go mbeadh idir tréith: min agus: míreanna is mó.',
+    'accepted' => 'The :attribute field must be accepted.',
+    'accepted_if' => 'The :attribute field must be accepted when :other is :value.',
+    'active_url' => 'The :attribute field must be a valid URL.',
+    'after' => 'The :attribute field must be a date after :date.',
+    'after_or_equal' => 'The :attribute field must be a date after or equal to :date.',
+    'alpha' => 'The :attribute field must only contain letters.',
+    'alpha_dash' => 'The :attribute field must only contain letters, numbers, dashes, and underscores.',
+    'alpha_num' => 'The :attribute field must only contain letters and numbers.',
+    'array' => 'The :attribute field must be an array.',
+    'ascii' => 'The :attribute field must only contain single-byte alphanumeric characters and symbols.',
+    'before' => 'The :attribute field must be a date before :date.',
+    'before_or_equal' => 'The :attribute field must be a date before or equal to :date.',
+    'between' => [
+        'array' => 'The :attribute field must have between :min and :max items.',
+        'file' => 'The :attribute field must be between :min and :max kilobytes.',
+        'numeric' => 'The :attribute field must be between :min and :max.',
+        'string' => 'The :attribute field must be between :min and :max characters.',
     ],
-    'boolean'              => 'Ní mór an réimse tréith a bheith fíor nó bréagach.',
-    'confirmed'            => 'Ní dhéanann an daingniú tréith comhoiriúnach leis.',
-    'date'                 => 'Níl an tréith: dáta bailí.',
-    'date_format'          => 'An: ní bhaineann an tréith leis an bhformáid: formáid.',
-    'different'            => 'An: tréith agus: ní mór eile a bheith difriúil.',
-    'digits'               => 'An: Ní mór tréith a bheith: dhigit dhigit.',
-    'digits_between'       => 'An: Ní mór tréith a bheith idir: min agus: uimhreacha móra.',
-    'dimensions'           => 'Tá: toisí íomhá neamhbhailí ag tréith.',
-    'distinct'             => 'Tá: luach dúblach ag an réimse tréith.',
-    'email'                => 'An: Ní mór don tréith a bheith ina seoladh ríomhphoist bailí.',
-    'exists'               => 'An roghnaithe: tá tréith neamhbhailí.',
-    'file'                 => 'An: Ní mór tréith a bheith ina chomhad.',
-    'filled'               => 'Ní mór go mbeadh luach ag an réimse tréith.',
-    'image'                => 'An: Ní mór tréith a bheith ina íomhá.',
+    'boolean' => 'Ní mór an réimse tréith a bheith fíor nó bréagach.',
+    'can' => 'The :attribute field contains an unauthorized value.',
+    'confirmed' => 'The :attribute field confirmation does not match.',
+    'contains' => 'The :attribute field is missing a required value.',
+    'current_password' => 'The password is incorrect.',
+    'date' => 'The :attribute field must be a valid date.',
+    'date_equals' => 'The :attribute field must be a date equal to :date.',
+    'date_format' => 'The :attribute field must match the format :format.',
+    'decimal' => 'The :attribute field must have :decimal decimal places.',
+    'declined' => 'The :attribute field must be declined.',
+    'declined_if' => 'The :attribute field must be declined when :other is :value.',
+    'different' => 'The :attribute field and :other must be different.',
+    'digits' => 'The :attribute field must be :digits digits.',
+    'digits_between' => 'The :attribute field must be between :min and :max digits.',
+    'dimensions' => 'The :attribute field has invalid image dimensions.',
+    'distinct' => 'Tá: luach dúblach ag an réimse tréith.',
+    'doesnt_end_with' => 'The :attribute field must not end with one of the following: :values.',
+    'doesnt_start_with' => 'The :attribute field must not start with one of the following: :values.',
+    'email' => 'The :attribute field must be a valid email address.',
+    'ends_with' => 'The :attribute field must end with one of the following: :values.',
+    'enum' => 'An roghnaithe: tá tréith neamhbhailí.',
+    'exists' => 'An roghnaithe: tá tréith neamhbhailí.',
+    'extensions' => 'The :attribute field must have one of the following extensions: :values.',
+    'file' => 'The :attribute field must be a file.',
+    'filled' => 'Ní mór go mbeadh luach ag an réimse tréith.',
+    'gt' => [
+        'array' => 'The :attribute field must have more than :value items.',
+        'file' => 'The :attribute field must be greater than :value kilobytes.',
+        'numeric' => 'The :attribute field must be greater than :value.',
+        'string' => 'The :attribute field must be greater than :value characters.',
+    ],
+    'gte' => [
+        'array' => 'The :attribute field must have :value items or more.',
+        'file' => 'The :attribute field must be greater than or equal to :value kilobytes.',
+        'numeric' => 'The :attribute field must be greater than or equal to :value.',
+        'string' => 'The :attribute field must be greater than or equal to :value characters.',
+    ],
+    'hex_color' => 'The :attribute field must be a valid hexadecimal color.',
+    'image' => 'The :attribute field must be an image.',
     'import_field_empty'    => 'The value for :fieldname cannot be null.',
-    'in'                   => 'An roghnaithe: tá tréith neamhbhailí.',
-    'in_array'             => 'Níl an: réimse tréith i: eile.',
-    'integer'              => 'An: Ní mór tréith a bheith ina slánuimhir.',
-    'ip'                   => 'Ní mór an tréith: seoladh IP bailí a bheith ann.',
-    'ipv4'                 => 'Ní mór don ghné seo: seoladh IPv4 bailí.',
-    'ipv6'                 => 'Ní mór don ghné seo: seoladh IPv6 bailí.',
-    'is_unique_department' => 'The :attribute must be unique to this Company Location',
-    'json'                 => 'An: ní mór gur tréith JSON bailí í an tréith.',
-    'max'                  => [
-        'numeric' => 'An: ní fhéadfar tréith a bheith níos mó ná: max.',
-        'file'    => 'An: Ní fhéadfadh tréith níos mó ná: max kilobytes.',
-        'string'  => 'An: Ní fhéadfar tréith a bheith níos mó ná: carachtair uasta.',
-        'array'   => 'An: Ní fhéadfadh go mbeadh níos mó ná tréith: míreanna is mó.',
+    'in' => 'An roghnaithe: tá tréith neamhbhailí.',
+    'in_array' => 'The :attribute field must exist in :other.',
+    'integer' => 'The :attribute field must be an integer.',
+    'ip' => 'The :attribute field must be a valid IP address.',
+    'ipv4' => 'The :attribute field must be a valid IPv4 address.',
+    'ipv6' => 'The :attribute field must be a valid IPv6 address.',
+    'json' => 'The :attribute field must be a valid JSON string.',
+    'list' => 'The :attribute field must be a list.',
+    'lowercase' => 'The :attribute field must be lowercase.',
+    'lt' => [
+        'array' => 'The :attribute field must have less than :value items.',
+        'file' => 'The :attribute field must be less than :value kilobytes.',
+        'numeric' => 'The :attribute field must be less than :value.',
+        'string' => 'The :attribute field must be less than :value characters.',
     ],
-    'mimes'                => 'An: Ní mór tréith a bheith ina chomhad den chineál:: luachanna.',
-    'mimetypes'            => 'An: Ní mór tréith a bheith ina chomhad den chineál:: luachanna.',
-    'min'                  => [
-        'numeric' => 'Ní mór: tréith a bheith ar a laghad: min.',
-        'file'    => 'Ní mór: tréith a bheith ar a laghad: kilobyte min.',
-        'string'  => 'Ní mór: tréith a bheith ar a laghad: carachtair min.',
-        'array'   => 'Ní mór go mbeadh míreanna min ar a laghad ag an tréith.',
+    'lte' => [
+        'array' => 'The :attribute field must not have more than :value items.',
+        'file' => 'The :attribute field must be less than or equal to :value kilobytes.',
+        'numeric' => 'The :attribute field must be less than or equal to :value.',
+        'string' => 'The :attribute field must be less than or equal to :value characters.',
     ],
-    'starts_with'          => 'The :attribute must start with one of the following: :values.',
-    'ends_with'            => 'The :attribute must end with one of the following: :values.',
+    'mac_address' => 'The :attribute field must be a valid MAC address.',
+    'max' => [
+        'array' => 'The :attribute field must not have more than :max items.',
+        'file' => 'The :attribute field must not be greater than :max kilobytes.',
+        'numeric' => 'The :attribute field must not be greater than :max.',
+        'string' => 'The :attribute field must not be greater than :max characters.',
+    ],
+    'max_digits' => 'The :attribute field must not have more than :max digits.',
+    'mimes' => 'The :attribute field must be a file of type: :values.',
+    'mimetypes' => 'The :attribute field must be a file of type: :values.',
+    'min' => [
+        'array' => 'The :attribute field must have at least :min items.',
+        'file' => 'The :attribute field must be at least :min kilobytes.',
+        'numeric' => 'The :attribute field must be at least :min.',
+        'string' => 'The :attribute field must be at least :min characters.',
+    ],
+    'min_digits' => 'The :attribute field must have at least :min digits.',
+    'missing' => 'The :attribute field must be missing.',
+    'missing_if' => 'The :attribute field must be missing when :other is :value.',
+    'missing_unless' => 'The :attribute field must be missing unless :other is :value.',
+    'missing_with' => 'The :attribute field must be missing when :values is present.',
+    'missing_with_all' => 'The :attribute field must be missing when :values are present.',
+    'multiple_of' => 'The :attribute field must be a multiple of :value.',
+    'not_in' => 'An roghnaithe: tá tréith neamhbhailí.',
+    'not_regex' => 'The :attribute field format is invalid.',
+    'numeric' => 'The :attribute field must be a number.',
+    'password' => [
+        'letters' => 'The :attribute field must contain at least one letter.',
+        'mixed' => 'The :attribute field must contain at least one uppercase and one lowercase letter.',
+        'numbers' => 'The :attribute field must contain at least one number.',
+        'symbols' => 'The :attribute field must contain at least one symbol.',
+        'uncompromised' => 'The given :attribute has appeared in a data leak. Please choose a different :attribute.',
+    ],
+    'percent'       => 'The depreciation minimum must be between 0 and 100 when depreciation type is percentage.',
 
-    'not_in'               => 'An roghnaithe: tá tréith neamhbhailí.',
-    'numeric'              => 'An: Ní mór tréith a bheith ina líon.',
-    'present'              => 'Ní mór an réimse tréith a bheith i láthair.',
-    'valid_regex'          => 'That is not a valid regex. ',
-    'regex'                => 'Tá an fhormáid tréithbhail neamhbhailí.',
-    'required'             => 'An: Tá réimse tréith ag teastáil.',
-    'required_if'          => 'An: Tá réimse tréith ag teastáil nuair: eile é: luach.',
-    'required_unless'      => 'An: Tá réimse tréith de dhíth mura bhfuil: eile i: luachanna.',
-    'required_with'        => 'An: Tá réimse tréith ag teastáil nuair a bhíonn: luachanna i láthair.',
-    'required_with_all'    => 'An: Tá réimse tréith ag teastáil nuair a bhíonn: luachanna i láthair.',
-    'required_without'     => 'An: Tá réimse tréith ag teastáil nuair nach bhfuil luachanna i láthair.',
+    'present' => 'Ní mór an réimse tréith a bheith i láthair.',
+    'present_if' => 'The :attribute field must be present when :other is :value.',
+    'present_unless' => 'The :attribute field must be present unless :other is :value.',
+    'present_with' => 'The :attribute field must be present when :values is present.',
+    'present_with_all' => 'The :attribute field must be present when :values are present.',
+    'prohibited' => 'The :attribute field is prohibited.',
+    'prohibited_if' => 'The :attribute field is prohibited when :other is :value.',
+    'prohibited_unless' => 'The :attribute field is prohibited unless :other is in :values.',
+    'prohibits' => 'The :attribute field prohibits :other from being present.',
+    'regex' => 'The :attribute field format is invalid.',
+    'required' => 'An: Tá réimse tréith ag teastáil.',
+    'required_array_keys' => 'The :attribute field must contain entries for: :values.',
+    'required_if' => 'An: Tá réimse tréith ag teastáil nuair: eile é: luach.',
+    'required_if_accepted' => 'The :attribute field is required when :other is accepted.',
+    'required_if_declined' => 'The :attribute field is required when :other is declined.',
+    'required_unless' => 'An: Tá réimse tréith de dhíth mura bhfuil: eile i: luachanna.',
+    'required_with' => 'An: Tá réimse tréith ag teastáil nuair a bhíonn: luachanna i láthair.',
+    'required_with_all' => 'The :attribute field is required when :values are present.',
+    'required_without' => 'An: Tá réimse tréith ag teastáil nuair nach bhfuil luachanna i láthair.',
     'required_without_all' => 'An: Tá réimse tréith ag teastáil nuair nach bhfuil aon cheann de na luachanna i láthair.',
-    'same'                 => 'An: tréith agus: ní mór eile a mheaitseáil.',
-    'size'                 => [
-        'numeric' => 'An: Ní mór tréith a bheith: méid.',
-        'file'    => 'An: Ní mór tréith a bheith: kilobytes méid.',
-        'string'  => 'An: Ní mór tréith a bheith: carachtair mhéid.',
-        'array'   => 'Ní mór go mbeadh na nithe seo a leanas i dtréith: míreanna méide.',
+    'same' => 'The :attribute field must match :other.',
+    'size' => [
+        'array' => 'The :attribute field must contain :size items.',
+        'file' => 'The :attribute field must be :size kilobytes.',
+        'numeric' => 'The :attribute field must be :size.',
+        'string' => 'The :attribute field must be :size characters.',
     ],
+    'starts_with' => 'The :attribute field must start with one of the following: :values.',
     'string'               => 'An: Ní mór tréith a bheith ina teaghrán.',
-    'timezone'             => 'An: Ní mór go mbeadh tréith ina chrios bailí.',
     'two_column_unique_undeleted' => 'The :attribute must be unique across :table1 and :table2. ',
-    'unique'               => 'An: tá tréith déanta cheana féin.',
-    'uploaded'             => 'The: theip ar an tréith a uaslódáil.',
-    'url'                  => 'Tá an fhormáid tréithbhail neamhbhailí.',
     'unique_undeleted'     => 'An: Ní mór tréith a bheith uathúil.',
     'non_circular'         => 'The :attribute must not create a circular reference.',
     'not_array'            => ':attribute cannot be an array.',
@@ -102,11 +165,14 @@ return [
     'numbers'              => 'Password must contain at least one number.',
     'case_diff'            => 'Password must use mixed case.',
     'symbols'              => 'Password must contain symbols.',
-    'gte'                  => [
-        'numeric'          => 'Value cannot be negative'
-    ],
-    'checkboxes'           => ':attribute contains invalid options.',
-    'radio_buttons'        => ':attribute is invalid.',
+    'timezone' => 'The :attribute field must be a valid timezone.',
+    'unique' => 'An: tá tréith déanta cheana féin.',
+    'uploaded' => 'The: theip ar an tréith a uaslódáil.',
+    'uppercase' => 'The :attribute field must be uppercase.',
+    'url' => 'The :attribute field must be a valid URL.',
+    'ulid' => 'The :attribute field must be a valid ULID.',
+    'uuid' => 'The :attribute field must be a valid UUID.',
+    'fmcs_location' => 'Full multiple company support and location scoping is enabled in the Admin Settings, and the selected location and selected company are not compatible.',
 
 
     /*
@@ -120,16 +186,22 @@ return [
     |
     */
 
+    'email_array'      => 'Tá seoltaí ríomhphoist amháin nó níos mó neamhbhailí.',
+    'checkboxes'           => ':attribute contains invalid options.',
+    'radio_buttons'        => ':attribute is invalid.',
+    
     'custom' => [
         'alpha_space' => 'An: sa réimse tréith tá carachtar nach bhfuil ceadaithe.',
-        'email_array'      => 'Tá seoltaí ríomhphoist amháin nó níos mó neamhbhailí.',
+
         'hashed_pass'      => 'Tá do phasfhocal reatha mícheart',
         'dumbpwd'          => 'Tá an focal faire sin ró-choitianta.',
         'statuslabel_type' => 'Ní mór duit cineál lipéad stádas bailí a roghnú',
+        'custom_field_not_found'          => 'This field does not seem to exist, please double check your custom field names.',
+        'custom_field_not_found_on_model' => 'This field seems to exist, but is not available on this Asset Model\'s fieldset.',
 
         // date_format validation with slightly less stupid messages. It duplicates a lot, but it gets the job done :(
-        // We use this because the default error message for date_format is reflects php Y-m-d, which non-PHP
-        // people won't know how to format. 
+        // We use this because the default error message for date_format reflects php Y-m-d, which non-PHP
+        // people won't know how to format.
         'purchase_date.date_format'     => 'The :attribute must be a valid date in YYYY-MM-DD format',
         'last_audit_date.date_format'   =>  'The :attribute must be a valid date in YYYY-MM-DD hh:mm:ss format',
         'expiration_date.date_format'   =>  'The :attribute must be a valid date in YYYY-MM-DD format',
@@ -137,9 +209,15 @@ return [
         'expected_checkin.date_format'  =>  'The :attribute must be a valid date in YYYY-MM-DD format',
         'start_date.date_format'        =>  'The :attribute must be a valid date in YYYY-MM-DD format',
         'end_date.date_format'          =>  'The :attribute must be a valid date in YYYY-MM-DD format',
+        'invalid_value_in_field' => 'Invalid value included in this field',
 
-    ],
+        'ldap_username_field' => [
+            'not_in' =>         '<code>sAMAccountName</code> (mixed case) will likely not work. You should use <code>samaccountname</code> (lowercase) instead.'
+        ],
+        'ldap_auth_filter_query' => ['not_in' => '<code>uid=samaccountname</code> is probably not a valid auth filter. You probably want <code>uid=</code> '],
+        'ldap_filter' => ['regex' => 'This value should probably not be wrapped in parentheses.'],
 
+        ],
     /*
     |--------------------------------------------------------------------------
     | Custom Validation Attributes
@@ -155,8 +233,16 @@ return [
 
     /*
     |--------------------------------------------------------------------------
-    | Generic Validation Messages
+    | Generic Validation Messages - we use these in the jquery validation where we don't have
+    | access to the :attribute
     |--------------------------------------------------------------------------
     */
-    'invalid_value_in_field' => 'Invalid value included in this field',
+
+    'generic' => [
+        'invalid_value_in_field' => 'Invalid value included in this field',
+        'required' => 'This field is required',
+        'email' => 'Please enter a valid email address',
+    ],
+
+
 ];
diff --git a/resources/lang/he-IL/account/general.php b/resources/lang/he-IL/account/general.php
index b4de2bb370..a8078fa0f6 100644
--- a/resources/lang/he-IL/account/general.php
+++ b/resources/lang/he-IL/account/general.php
@@ -2,10 +2,16 @@
 
 return array(
     'personal_api_keys' => 'מפתחות API אישיים',
+    'personal_access_token' => 'Personal Access Token',
+    'personal_api_keys_success' => 'Personal API Key :key created sucessfully',
+    'here_is_api_key' => 'Here is your new personal access token. This is the only time it will be shown so do not lose it! You may now use this token to make API requests.',
     'api_key_warning' => 'When generating an API token, be sure to copy it down immediately as they will not be visible to you again.',
     'api_base_url' => 'Your API base url is located at:',
     'api_base_url_endpoint' => '/&lt;endpoint&gt;',
     'api_token_expiration_time' => 'API tokens are set to expire in:',
     'api_reference' => 'Please check the <a href="https://snipe-it.readme.io/reference" target="_blank">API reference</a> to find specific API endpoints and additional API documentation.',
     'profile_updated' => 'Account successfully updated',
+    'no_tokens' => 'You have not created any personal access tokens.',
+    'enable_sounds' => 'Enable sound effects',
+    'enable_confetti' => 'Enable confetti effects',
 );
diff --git a/resources/lang/he-IL/admin/accessories/message.php b/resources/lang/he-IL/admin/accessories/message.php
index f119e26ede..4c5e9753cd 100644
--- a/resources/lang/he-IL/admin/accessories/message.php
+++ b/resources/lang/he-IL/admin/accessories/message.php
@@ -27,7 +27,11 @@ return array(
         'error'   		=> 'האבזר לא הונפק, אנא נסה שנית',
         'success' 		=> 'האבזר הונפק בהצלחה.',
         'unavailable'   => 'Accessory is not available for checkout. Check quantity available',
-        'user_does_not_exist' => 'משתמש אינו קיים. אנא נסה/י שנית.'
+        'user_does_not_exist' => 'משתמש אינו קיים. אנא נסה/י שנית.',
+         'checkout_qty' => array(
+            'lte'  => 'There is currently only one available accessory of this type, and you are trying to check out :checkout_qty. Please adjust the checkout quantity or the total stock of this accessory and try again.|There are :number_currently_remaining total available accessories, and you are trying to check out :checkout_qty. Please adjust the checkout quantity or the total stock of this accessory and try again.',
+            ),
+           
     ),
 
     'checkin' => array(
diff --git a/resources/lang/he-IL/admin/accessories/table.php b/resources/lang/he-IL/admin/accessories/table.php
index 3f593720ef..8a1b381afe 100644
--- a/resources/lang/he-IL/admin/accessories/table.php
+++ b/resources/lang/he-IL/admin/accessories/table.php
@@ -6,6 +6,4 @@ return array(
     'id'      					=> 'מזהה',
     'require_acceptance'      	=> 'קבלה',
     'title'      				=> 'שם אבזר',
-
-
 );
diff --git a/resources/lang/he-IL/admin/components/message.php b/resources/lang/he-IL/admin/components/message.php
index 60f4805c1e..f731e4e21e 100644
--- a/resources/lang/he-IL/admin/components/message.php
+++ b/resources/lang/he-IL/admin/components/message.php
@@ -17,7 +17,8 @@ return array(
     'delete' => array(
         'confirm'   => 'האם אתה בטוח שברצונך למחוק רכיב זה?',
         'error'   => 'הייתה בעיה במחיקת הרכיב. בבקשה נסה שוב.',
-        'success' => 'הרכיב נמחק בהצלחה.'
+        'success' => 'הרכיב נמחק בהצלחה.',
+        'error_qty'   => 'Some components of this type are still checked out. Please check them in and try again.',
     ),
 
      'checkout' => array(
diff --git a/resources/lang/he-IL/admin/consumables/general.php b/resources/lang/he-IL/admin/consumables/general.php
index 85ab42b327..441b3342c2 100644
--- a/resources/lang/he-IL/admin/consumables/general.php
+++ b/resources/lang/he-IL/admin/consumables/general.php
@@ -8,4 +8,5 @@ return array(
     'remaining' 			            => 'נוֹתָר',
     'total' 			                => 'סה"כ',
     'update'                            => 'עדכון מתכלה',
+    'inventory_warning'                 => 'The inventory of this consumable is below the minimum amount of :min_count',
 );
diff --git a/resources/lang/he-IL/admin/consumables/message.php b/resources/lang/he-IL/admin/consumables/message.php
index ccc2d23884..e3ca5181f4 100644
--- a/resources/lang/he-IL/admin/consumables/message.php
+++ b/resources/lang/he-IL/admin/consumables/message.php
@@ -2,6 +2,7 @@
 
 return array(
 
+    'invalid_category_type' => 'The category must be a consumable category.',
     'does_not_exist' => 'הצריכה אינה קיימת.',
 
     'create' => array(
diff --git a/resources/lang/he-IL/admin/custom_fields/general.php b/resources/lang/he-IL/admin/custom_fields/general.php
index 3694f9a1d1..bb3d72a5b3 100644
--- a/resources/lang/he-IL/admin/custom_fields/general.php
+++ b/resources/lang/he-IL/admin/custom_fields/general.php
@@ -35,7 +35,7 @@ return [
     'create_field_title' => 'Create a new custom field',
     'value_encrypted'      	        => 'הערך של שדה זה מוצפן במסד הנתונים. רק משתמשי מנהל יוכלו להציג את הערך המפוענח',
     'show_in_email'     => 'Include the value of this field in checkout emails sent to the user? Encrypted fields cannot be included in emails',
-    'show_in_email_short'     => 'Include in emails.',
+    'show_in_email_short' => 'Include in emails',
     'help_text' => 'Help Text',
     'help_text_description' => 'This is optional text that will appear below the form elements while editing an asset to provide context on the field.',
     'about_custom_fields_title' => 'About Custom Fields',
@@ -57,5 +57,8 @@ return [
     'show_in_requestable_list_short' => 'Show in requestable assets list',
     'show_in_requestable_list' => 'Show value in requestable assets list. Encrypted fields will not be shown',
     'encrypted_options' => 'This field is encrypted, so some display options will not be available.',
+    'display_checkin' => 'Display in checkin forms',
+    'display_checkout' => 'Display in checkout forms',
+    'display_audit' => 'Display in audit forms',
 
 ];
diff --git a/resources/lang/he-IL/admin/custom_fields/message.php b/resources/lang/he-IL/admin/custom_fields/message.php
index db747048eb..caa0d57da7 100644
--- a/resources/lang/he-IL/admin/custom_fields/message.php
+++ b/resources/lang/he-IL/admin/custom_fields/message.php
@@ -5,6 +5,7 @@ return array(
     'field' => array(
         'invalid'   => 'שדה זה אינו קיים.',
         'already_added'   => 'השדה כבר נוסף',
+        'none_selected'   => 'No field selected',
 
         'create' => array(
             'error'   => 'שדה לא נוצר, נסה שוב.',
diff --git a/resources/lang/he-IL/admin/depreciations/general.php b/resources/lang/he-IL/admin/depreciations/general.php
index 97c5252b19..d7d76409b0 100644
--- a/resources/lang/he-IL/admin/depreciations/general.php
+++ b/resources/lang/he-IL/admin/depreciations/general.php
@@ -13,4 +13,8 @@ return [
     'no_depreciations_warning'               => '<strong>Warning: </strong>
                       You do not currently have any depreciations set up.
                       Please set up at least one depreciation to view the depreciation report.',
+    'depreciation_method'                   => 'דוח פחת',
+    'linear_depreciation'                   => 'Linear (Default)',
+    'half_1'                                => 'Half-year convention, always applied',
+    'half_2'                                => 'Half-year convention, applied with condition',
 ];
diff --git a/resources/lang/he-IL/admin/hardware/form.php b/resources/lang/he-IL/admin/hardware/form.php
index 7fbb699fdd..6b16eb0d16 100644
--- a/resources/lang/he-IL/admin/hardware/form.php
+++ b/resources/lang/he-IL/admin/hardware/form.php
@@ -55,8 +55,11 @@ return [
     'asset_location_update_default' => 'עדכן מיקום ברירת מחדל',
     'asset_location_update_actual' => 'Update only actual location',
     'asset_not_deployable' => 'הנכס הזה לא זמין. לא ניתן לספק ללקוח.',
-    'asset_deployable' => 'הנכס זמין. ניתן לשייך למיקום.',
+    'asset_not_deployable_checkin' => 'That asset status is not deployable. Using this status label will checkin the asset.',
+    'asset_deployable' => 'This asset can be checked out.',
     'processing_spinner' => 'Processing... (This might take a bit of time on large files)',
+    'processing' => 'מעבד... ',
     'optional_infos'  => 'Optional Information',
-    'order_details'   => 'Order Related Information'
+    'order_details'   => 'Order Related Information',
+    'calc_eol'    => 'If nulling the EOL date, use automatic EOL calculation based on the purchase date and EOL rate.',
 ];
diff --git a/resources/lang/he-IL/admin/hardware/general.php b/resources/lang/he-IL/admin/hardware/general.php
index e291f50a96..eb97e736ca 100644
--- a/resources/lang/he-IL/admin/hardware/general.php
+++ b/resources/lang/he-IL/admin/hardware/general.php
@@ -5,8 +5,8 @@ return [
     'about_assets_text'            => 'נכסים הם פריטים במעקב לפי מספר סידורי או תג נכס. הם נוטים להיות פריטים בעלי ערך גבוה יותר, כאשר מזהים פריטים ספציפיים.',
     'archived'  				=> 'בארכיון',
     'asset'  					=> 'נכס',
-    'bulk_checkout'             => 'שייך נכס',
-    'bulk_checkin'              => 'החזר נכסים לזמינות',
+    'bulk_checkout'             => 'יציאה גורפת',
+    'bulk_checkin'              => 'Bulk Checkin',
     'checkin'  					=> 'רכוש',
     'checkout'  				=> 'רכוש Checkout',
     'clone'  					=> 'נכס משוכפל',
@@ -27,8 +27,7 @@ return [
     'undeployable_tooltip'  	=> 'This asset has a status label that is undeployable and cannot be checked out at this time.',
     'view'  					=> 'הצג נכס',
     'csv_error' => 'קיימת שגיאה בקובץ ה-CSV שלך:',
-    'import_text' => '<p>Upload a CSV that contains asset history. The assets and users MUST already exist in the system, or they will be skipped. Matching assets for history import happens against the asset tag. We will try to find a matching user based on the user\'s name you provide, and the criteria you select below. If you do not select any criteria below, it will simply try to match on the username format you configured in the <code>Admin &gt; General Settings</code>.</p><p>Fields included in the CSV must match the headers: <strong>Asset Tag, Name, Checkout Date, Checkin Date</strong>. Any additional fields will be ignored. </p><p>Checkin Date: blank or future checkin dates will checkout items to associated user.  Excluding the Checkin Date column will create a checkin date with todays date.</p>
-    ',
+    'import_text' => '<p>Upload a CSV that contains asset history. The assets and users MUST already exist in the system, or they will be skipped. Matching assets for history import happens against the asset tag. We will try to find a matching user based on the user\'s name you provide, and the criteria you select below. If you do not select any criteria below, it will simply try to match on the username format you configured in the <code>Admin &gt; General Settings</code>.</p><p>Fields included in the CSV must match the headers: <strong>Asset Tag, Name, Checkout Date, Checkin Date</strong>. Any additional fields will be ignored. </p><p>Checkin Date: blank or future checkin dates will checkout items to associated user.  Excluding the Checkin Date column will create a checkin date with todays date.</p>    ',
     'csv_import_match_f-l' => 'Try to match users by <strong>firstname.lastname</strong> (<code>jane.smith</code>) format',
     'csv_import_match_initial_last' => 'Try to match users by <strong>first initial last name</strong> (<code>jsmith</code>) format',
     'csv_import_match_first' => 'Try to match users by <strong>first name</strong> (<code>jane</code>) format',
diff --git a/resources/lang/he-IL/admin/hardware/message.php b/resources/lang/he-IL/admin/hardware/message.php
index 12a74e52b6..3ce995e861 100644
--- a/resources/lang/he-IL/admin/hardware/message.php
+++ b/resources/lang/he-IL/admin/hardware/message.php
@@ -2,24 +2,29 @@
 
 return [
 
-    'undeployable' 		=> '<strong> אזהרה: </strong> הנכס הזה סומן כבלתי ניתן לפריסה כעת. אם סטטוס זה השתנה, עדכן את סטטוס הנכס.',
-    'does_not_exist' 	=> 'הנכס אינו קיים.',
-    'does_not_exist_var'=> 'Asset with tag :asset_tag not found.',
-    'no_tag' 	        => 'No asset tag provided.',
+    'undeployable' 		 => '<strong>Warning: </strong> This asset has been marked as currently undeployable. If this status has changed, please update the asset status.',
+    'does_not_exist' 	 => 'הנכס אינו קיים.',
+    'does_not_exist_var' => 'Asset with tag :asset_tag not found.',
+    'no_tag' 	         => 'לא סופק תג נכס.',
     'does_not_exist_or_not_requestable' => 'הנכס אינו קיים או לא זמין.',
-    'assoc_users'	 	=> 'הנכס הזה מסומן כרגע למשתמש ולא ניתן למחוק אותו. בדוק תחילה את הנכס ולאחר מכן נסה למחוק שוב.',
+    'assoc_users'	 	 => 'הנכס הזה מסומן כרגע למשתמש ולא ניתן למחוק אותו. בדוק תחילה את הנכס ולאחר מכן נסה למחוק שוב.',
     'warning_audit_date_mismatch' 	=> 'This asset\'s next audit date (:next_audit_date) is before the last audit date (:last_audit_date). Please update the next audit date.',
+    'labels_generated'   => 'תוויות נוצרו בהצלחה.',
+    'error_generating_labels' => 'שגיאה ביצירת תוויות.',
+    'no_assets_selected' => 'לא נבחרו נכסים.',
 
     'create' => [
         'error'   		=> 'הנכס לא נוצר, נסה שוב. You',
         'success' 		=> 'הנכס נוצר בהצלחה. :)',
-        'success_linked' => 'Asset with tag :tag was created successfully. <strong><a href=":link" style="color: white;">Click here to view</a></strong>.',
+        'success_linked' => 'נכס עם תג :tag נוצר בהצלחה. <strong><a href=":link" style="color: white;">לחץ כאן לצפייה</a></strong>.',
+        'multi_success_linked' => 'Asset with tag :links was created successfully.|:count assets were created succesfully. :links.',
+        'partial_failure' => 'An asset was unable to be created. Reason: :failures|:count assets were unable to be created. Reasons: :failures',
     ],
 
     'update' => [
         'error'   			=> 'הנכס לא עודכן, נסה שוב',
         'success' 			=> 'הנכס עודכן בהצלחה.',
-        'encrypted_warning' => 'Asset updated successfully, but encrypted custom fields were not due to permissions',
+        'encrypted_warning' => 'הנכס עודכן בהצלחה, אבל השדות המותאמים-אישית שמוצפנים לא עודכנו בגלל מחסור בהרשאות',
         'nothing_updated'	=>  'לא נבחרו שדות, ולכן דבר לא עודכן.',
         'no_assets_selected'  =>  'No assets were selected, so nothing was updated.',
         'assets_do_not_exist_or_are_invalid' => 'Selected assets cannot be updated.',
@@ -51,20 +56,24 @@ return [
     ],
 
     'import' => [
+        'import_button'         => 'Process Import',
         'error'                 => 'פריטים מסוימים לא ייבאו כראוי.',
         'errorDetail'           => 'הפריטים הבאים לא יובאו בגלל שגיאות.',
         'success'               => 'הקובץ שלך יובא',
         'file_delete_success'   => 'הקובץ שלך נמחק בהצלחה',
         'file_delete_error'      => 'לא ניתן היה למחוק את הקובץ',
         'file_missing' => 'The file selected is missing',
+        'file_already_deleted' => 'The file selected was already deleted',
         'header_row_has_malformed_characters' => 'One or more attributes in the header row contain malformed UTF-8 characters',
         'content_row_has_malformed_characters' => 'One or more attributes in the first row of content contain malformed UTF-8 characters',
+        'transliterate_failure' => 'Transliteration from :encoding to UTF-8 failed due to invalid characters in input'
     ],
 
 
     'delete' => [
         'confirm'   	=> 'האם אתה בטוח שברצונך למחוק את הנכס הזה?',
         'error'   		=> 'היתה בעיה במחיקת הנכס. בבקשה נסה שוב.',
+        'assigned_to_error' => '{1}Asset Tag: :asset_tag is currently checked out. Check in this device before deletion.|[2,*]Asset Tags: :asset_tag are currently checked out. Check in these devices before deletion.',
         'nothing_updated'   => 'לא נבחרו נכסים ולכן לא נמחק דבר.',
         'success' 		=> 'הנכס נמחק בהצלחה.',
     ],
@@ -77,6 +86,11 @@ return [
         'no_assets_selected' => 'עליך לבחור לפחות בנכס אחד מהרשימה',
     ],
 
+    'multi-checkout' => [
+        'error'   => 'Asset was not checked out, please try again|Assets were not checked out, please try again',
+        'success' => 'Asset checked out successfully.|Assets checked out successfully.',
+    ],
+
     'checkin' => [
         'error'   		=> 'הנכס לא נבדק, נסה שוב',
         'success' 		=> 'הנכס נבדק בהצלחה.',
@@ -86,9 +100,10 @@ return [
     ],
 
     'requests' => [
-        'error'   		=> 'הנכס לא התבקש, נסה שוב',
-        'success' 		=> 'הנכס המבוקש בהצלחה.',
-        'canceled'      => 'בקשת התשלום בוטלה בהצלחה',
+        'error'   		=> 'הבקשה לא הצליחה, נא לנסות שוב.',
+        'success' 		=> 'Request successfully submitted.',
+        'canceled'      => 'הבקשה בוטלה בהצלחה.',
+        'cancel'        => 'Cancel this item request',
     ],
 
 ];
diff --git a/resources/lang/he-IL/admin/hardware/table.php b/resources/lang/he-IL/admin/hardware/table.php
index 64b91e5241..07120515d5 100644
--- a/resources/lang/he-IL/admin/hardware/table.php
+++ b/resources/lang/he-IL/admin/hardware/table.php
@@ -25,7 +25,6 @@ return [
     'image'		    => 'תמונה של מכשיר',
     'days_without_acceptance' => 'ימים ללא קבלה',
     'monthly_depreciation' => 'פחות חודשי',
-    'assigned_to'    => 'שוייך ל',
     'requesting_user' => 'דרישה של',
     'requested_date' => 'תאריך דרישה',
     'changed'       => 'שונה',
diff --git a/resources/lang/he-IL/admin/kits/general.php b/resources/lang/he-IL/admin/kits/general.php
index 354bb2360a..87801258ff 100644
--- a/resources/lang/he-IL/admin/kits/general.php
+++ b/resources/lang/he-IL/admin/kits/general.php
@@ -47,4 +47,5 @@ return [
     'kit_deleted'                       => 'Kit was successfully deleted',
     'kit_model_updated'                 => 'Model was successfully updated',
     'kit_model_detached'                => 'Model was successfully detached',
+    'model_already_attached'            => 'Model already attached to kit',
 ];
diff --git a/resources/lang/he-IL/admin/licenses/general.php b/resources/lang/he-IL/admin/licenses/general.php
index 5a4f5397ba..0231c31e60 100644
--- a/resources/lang/he-IL/admin/licenses/general.php
+++ b/resources/lang/he-IL/admin/licenses/general.php
@@ -14,6 +14,7 @@ return array(
     'info'  					=> 'פרטי רישיון',
     'license_seats'  			=> 'מושבי רשיון',
     'seat'  					=> 'מושב',
+    'seat_count'  				=> 'Seat :count',
     'seats'  					=> 'מקומות ישיבה',
     'software_licenses'  		=> 'רשיונות תוכנה',
     'user'  					=> 'מִשׁתַמֵשׁ',
@@ -23,12 +24,12 @@ return array(
         [
             'checkin_all'           => [
                 'button'            => 'Checkin All Seats',
-                'modal'             => 'This will action checkin one seat. | This action will checkin all :checkedout_seats_count seats for this license.',
+                'modal'             => 'This action will checkin one seat. | This action will checkin all :checkedout_seats_count seats for this license.',
                 'enabled_tooltip'   => 'Checkin ALL seats for this license from both users and assets',
                 'disabled_tooltip'  => 'This is disabled because there are no seats currently checked out',
                 'disabled_tooltip_reassignable'  => 'This is disabled because the License is not reassignable',
                 'success'           => 'License successfully checked in! | All licenses were successfully checked in!',
-                'log_msg'           => 'Checked in via bulk license checkout in license GUI',
+                'log_msg'           => 'Checked in via bulk license checkin in license GUI',
             ],
 
             'checkout_all'              => [
diff --git a/resources/lang/he-IL/admin/licenses/message.php b/resources/lang/he-IL/admin/licenses/message.php
index 8d1a92e9de..dd5dc197e6 100644
--- a/resources/lang/he-IL/admin/licenses/message.php
+++ b/resources/lang/he-IL/admin/licenses/message.php
@@ -44,10 +44,13 @@ return array(
         'error'   => 'היתה בעיה לבדוק את הרישיון. בבקשה נסה שוב.',
         'success' => 'הרשיון נבדק בהצלחה',
         'not_enough_seats' => 'Not enough license seats available for checkout',
+        'mismatch' => 'The license seat provided does not match the license',
+        'unavailable' => 'This seat is not available for checkout.',
     ),
 
     'checkin' => array(
         'error'   => 'היתה בעיה בבדיקת הרישיון. בבקשה נסה שוב.',
+        'not_reassignable' => 'License not reassignable',
         'success' => 'הרישיון נבדק בהצלחה'
     ),
 
diff --git a/resources/lang/he-IL/admin/locations/message.php b/resources/lang/he-IL/admin/locations/message.php
index 8b5f4a8a1f..138441ee32 100644
--- a/resources/lang/he-IL/admin/locations/message.php
+++ b/resources/lang/he-IL/admin/locations/message.php
@@ -3,11 +3,12 @@
 return array(
 
     'does_not_exist' => 'המיקום אינו קיים.',
-    'assoc_users'    => 'This location is not currently deletable because it is the location of record for at least one asset or user, has assets assigned to it, or is the parent location of another location. Please update your models to no longer reference this company and try again. ',
+    'assoc_users'    => 'This location is not currently deletable because it is the location of record for at least one asset or user, has assets assigned to it, or is the parent location of another location. Please update your records to no longer reference this location and try again ',
     'assoc_assets'	 => 'המיקום משויך לפחות לפריט אחד ולכן לא ניתן למחוק אותו. אנא עדכן את הפריטים כך שלא יהיה אף פריט משויך למיקום זה ונסה שנית. ',
     'assoc_child_loc'	 => 'למיקום זה מוגדרים תתי-מיקומים ולכן לא ניתן למחוק אותו. אנא עדכן את המיקומים כך שלא שמיקום זה לא יכיל תתי מיקומים ונסה שנית. ',
     'assigned_assets' => 'פריטים מוקצים',
     'current_location' => 'מיקום נוכחי',
+    'open_map' => 'פתיחה במפות :map_provider_icon',
 
 
     'create' => array(
@@ -20,6 +21,11 @@ return array(
         'success' => 'המיקום עודכן בהצלחה.'
     ),
 
+    'restore' => array(
+        'error'   => 'Location was not restored, please try again',
+        'success' => 'המקום שוחזר בהצלחה.'
+    ),
+
     'delete' => array(
         'confirm'   	=> 'האם אתה בטוח שברצונך למחוק את המיקום?',
         'error'   => 'אירעה תקלה במחיקת המיקום. אנא נסה שנית.',
diff --git a/resources/lang/he-IL/admin/locations/table.php b/resources/lang/he-IL/admin/locations/table.php
index 6230f7978c..b1d4211916 100644
--- a/resources/lang/he-IL/admin/locations/table.php
+++ b/resources/lang/he-IL/admin/locations/table.php
@@ -39,4 +39,5 @@ return [
     'signed_by_finance_auditor' => 'אושר על ידי (מפקח הכספים):',
     'signed_by_location_manager' => 'אושר על ידי (מנהל המיקום):',
     'signed_by'                 => 'אושר על ידי:',
+    'clone'  					=> 'Clone Location',
 ];
diff --git a/resources/lang/he-IL/admin/models/general.php b/resources/lang/he-IL/admin/models/general.php
index 4b710b7799..a54441c3d5 100644
--- a/resources/lang/he-IL/admin/models/general.php
+++ b/resources/lang/he-IL/admin/models/general.php
@@ -3,7 +3,7 @@
 return array(
     'about_models_title'     => 'על מודלים הנכסים',
     'about_models_text'           => 'מודלים של נכסים הם דרך לקבץ נכסים זהים. "MBP 2013", "iPhone 6s", וכו \'',
-    'deleted'  					        => 'This model has been deleted.',
+    'deleted'  					=> 'This model has been deleted.',
     'bulk_delete'               => 'Bulk Delete Asset Models',
     'bulk_delete_help'               => 'Use the checkboxes below to confirm the deletion of the selected asset models. Asset models that have assets associated with them cannot be deleted until the assets are associated with a different model.',
     'bulk_delete_warn'          => 'You are about to delete one asset model.|You are about to delete :model_count asset models.',
diff --git a/resources/lang/he-IL/admin/models/message.php b/resources/lang/he-IL/admin/models/message.php
index da334c0891..7009741f67 100644
--- a/resources/lang/he-IL/admin/models/message.php
+++ b/resources/lang/he-IL/admin/models/message.php
@@ -7,7 +7,7 @@ return array(
     'no_association' => 'אזהרה! דגם הפריט אינו תקין או חסר!',
     'no_association_fix' => 'זה ישבור דברים בדרכים שונות ומשונות. ערוך פריט זה עכשיו וקבע לו דגם.',
     'assoc_users'	 => 'מודל זה משויך כרגע לנכס אחד או יותר ולא ניתן למחוק אותו. מחק את הנכסים ולאחר מכן נסה למחוק שוב.',
-
+    'invalid_category_type' => 'הקטגוריה הזאת חייב להיות קטגוריית משאבים.',
 
     'create' => array(
         'error'   => 'המודל לא נוצר, נסה שוב.',
diff --git a/resources/lang/he-IL/admin/reports/general.php b/resources/lang/he-IL/admin/reports/general.php
index e3ebf55145..91cfd11e72 100644
--- a/resources/lang/he-IL/admin/reports/general.php
+++ b/resources/lang/he-IL/admin/reports/general.php
@@ -4,6 +4,7 @@ return [
     'info'   => 'בחר את האפשרויות הרצויות עבור דוח הנכס שלך.',
     'deleted_user' => 'Deleted user',
     'send_reminder' => 'Send reminder',
+    'cannot_send_reminder' => 'User has been deleted or does not have an email address so cannot receive a reminder',
     'reminder_sent' => 'Reminder sent',
     'acceptance_deleted' => 'Acceptance request deleted',
     'acceptance_request' => 'Acceptance request',
@@ -13,5 +14,10 @@ return [
         'user_state' => 'User State',
         'user_country' => 'User Country',
         'user_zip' => 'User Zip'
-    ]
-];
\ No newline at end of file
+    ],
+    'open_saved_template' => 'Open Saved Template',
+    'save_template' =>  'Save Template',
+    'select_a_template' => 'Select a Template',
+    'template_name' => 'Template Name',
+    'update_template' => 'Update Template',
+];
diff --git a/resources/lang/he-IL/admin/reports/message.php b/resources/lang/he-IL/admin/reports/message.php
index be69bd1c03..2800bbdf0b 100644
--- a/resources/lang/he-IL/admin/reports/message.php
+++ b/resources/lang/he-IL/admin/reports/message.php
@@ -1,5 +1,16 @@
 <?php
 
-return array(
-    'error'   => 'עליך לבחור לפחות אפשרות אחת.'
-);
+return [
+    'about_templates' => 'About Saved Templates',
+    'saving_templates_description' => 'Select your options, then enter the name of your template in the box above and click the \'Save Template\' button. Use the dropdown to select a previously saved template.',
+    'create'  => [
+        'success' => 'Template saved successfully',
+    ],
+    'update' => [
+        'success' => 'Template updated successfully',
+    ],
+    'delete' => [
+        'success' => 'Template deleted',
+        'no_delete_permission' => 'Template does not exist or you do not have permission to delete it.',
+    ],
+];
diff --git a/resources/lang/he-IL/admin/settings/general.php b/resources/lang/he-IL/admin/settings/general.php
index a03158fe71..a4713de391 100644
--- a/resources/lang/he-IL/admin/settings/general.php
+++ b/resources/lang/he-IL/admin/settings/general.php
@@ -8,13 +8,13 @@ return [
     'ad_append_domain'          => 'הוסף שם מתחם לשדה שם משתמש',
     'ad_append_domain_help'     => 'המשתמש לא מחוייב לרשום כתובת דוא"ל מלאה, מספיק רק שם משתמש.',
     'admin_cc_email'            => 'שלח עותק ל',
-    'admin_cc_email_help'       => 'If you would like to send a copy of checkin/checkout emails that are sent to users to an additional email account, enter it here. Otherwise leave this field blank.',
+    'admin_cc_email_help'       => 'Send a copy of checkin/checkout emails to this address.',
     'admin_settings'            => 'Admin Settings',
     'is_ad'				        => 'זהו שרת Active Directory',
     'alerts'                	=> 'התראות',
     'alert_title'               => 'Update Notification Settings',
     'alert_email'				=> 'שלח התראות אל',
-    'alert_email_help'    => 'Email addresses or distribution lists you want alerts to be sent to, comma separated',
+    'alert_email_help'          => 'Email addresses or distribution lists you want alerts to be sent to, comma separated.',
     'alerts_enabled'			=> 'התראות מופעלות',
     'alert_interval'			=> 'התראות שפג תוקפן (בימים)',
     'alert_inv_threshold'		=> 'סף התראה על מלאי',
@@ -25,21 +25,24 @@ return [
     'audit_interval_help'       => 'If you are required to regularly physically audit your assets, enter the interval in months that you use. If you update this value, all of the "next audit dates" for assets with an upcoming audit date will be updated.',
     'audit_warning_days'        => 'סף אזהרות ביקורת',
     'audit_warning_days_help'   => 'כמה ימים מראש עלינו להזהיר אותך כאשר הנכסים צפויים לביקורת?',
-    'auto_increment_assets'		=> 'Generate auto-incrementing asset tags',
+    'auto_increment_assets'		=> 'צור תגי נכס בסדר עולה',
     'auto_increment_prefix'		=> 'קידומת (אופציונלי)',
     'auto_incrementing_help'    => 'Enable auto-incrementing asset tags first to set this',
     'backups'					=> 'גיבויים',
     'backups_help'              => 'Create, download, and restore backups ',
     'backups_restoring'         => 'משחזר מגיבוי',
+    'backups_clean' => 'Clean the backed-up database before restore',
+    'backups_clean_helptext' => "This can be useful if you're changing between database versions",
     'backups_upload'            => 'העלה גיבוי',
     'backups_path'              => 'Backups on the server are stored in <code>:path</code>',
-    'backups_restore_warning'   => 'Use the restore button <small><span class="btn btn-xs btn-warning"><i class="text-white fas fa-retweet" aria-hidden="true"></i></span></small> to restore from a previous backup. (This does not currently work with S3 file storage or Docker.)<br><br>Your <strong>entire :app_name database and any uploaded files will be completely replaced</strong> by what\'s in the backup file.  ',
+    'backups_restore_warning'   => 'Use the restore button <small><span class="btn btn-xs btn-warning"><i class="text-white fas fa-retweet" aria-hidden="true"></i></span></small> to restore from a previous backup. (This does not currently work with S3 file storage or Docker.)<br><br>Your <strong>entire :app_name database and any uploaded files will be completely replaced</strong> by what\'s in the backup file  ',
     'backups_logged_out'         => 'All existing users, including you, will be logged out once your restore is complete.',
     'backups_large'             => 'Very large backups may time out on the restore attempt and may still need to be run via command line. ',
     'barcode_settings'			=> 'הגדרות ברקוד',
     'confirm_purge'			    => 'אשר את הטיהור',
     'confirm_purge_help'		=> 'Enter the text "DELETE" in the box below to purge your deleted records. This action cannot be undone and will PERMANENTLY delete all soft-deleted items and users. (You should make a backup first, just to be safe.)',
     'custom_css'				=> 'CSS מותאם אישית',
+    'custom_css_placeholder'	=> 'Add your custom CSS',
     'custom_css_help'			=> 'הזן כל דריסת CSS מותאמת אישית שבה תרצה להשתמש. אל תכלול את התגים &lt;style&gt;&lt;/style&gt;.',
     'custom_forgot_pass_url'	=> 'כתובת איפוס ססמה בהתאמה אישית',
     'custom_forgot_pass_url_help'	=> 'This replaces the built-in forgotten password URL on the login screen, useful to direct people to internal or hosted LDAP password reset functionality. It will effectively disable local user forgotten password functionality.',
@@ -47,34 +50,34 @@ return [
     'dashboard_message_help'	=> 'This text will appear on the dashboard for anyone with permission to view the dashboard.',
     'default_currency'  		=> 'מטבע ברירת מחדל',
     'default_eula_text'			=> 'ברירת מחדל ל- EULA',
+    'default_eula_text_placeholder' => 'Add your default EULA text',
     'default_language'			=> 'שפת ברירת מחדל',
     'default_eula_help_text'	=> 'ניתן גם לשייך ערכי רשיון קצה מותאמים אישית לקטגוריות ספציפיות של נכסים.',
     'acceptance_note'           => 'Add a note for your decision (Optional)',
     'display_asset_name'        => 'שם נכס לתצוגה',
     'display_checkout_date'     => 'הצג תאריך יציאה',
     'display_eol'               => 'הצג EOL בתצוגת טבלה',
-    'display_qr'                => 'הצג קודי מרובע',
+    'display_qr'                => 'Display 2D barcode',
     'display_alt_barcode'		=> 'הצגת ברקוד 1D',
-    'email_logo'                => 'לוגו לדוא״ל',
     'barcode_type'				=> 'סוג ברקוד דו-ממדי',
     'alt_barcode_type'			=> 'סוג 1D ברקוד',
-    'email_logo_size'       => 'לוגואים מרובעים נראים הכי טוב בהודעות דוא״ל. ',
     'enabled'                   => 'אפשר',
     'eula_settings'				=> 'הגדרות EULA',
     'eula_markdown'				=> 'הסכם רשיון משתמש זה מאפשר <a href="https://help.github.com/articles/github-flavored-markdown/">Github בטעם מרקדון </a>.',
+    'empty_row_count'           => 'Field Start Offset (Empty Rows)',
+    'empty_row_count_help'      => 'Fields will begin populating after this many empty rows are skipped at the top of the label.',
     'favicon'                   => 'סמל מועדפים (Favicon)',
     'favicon_format'            => 'Accepted filetypes are ico, png, and gif. Other image formats may not work in all browsers.',
     'favicon_size'          => 'Favicons should be square images, 16x16 pixels.',
     'footer_text'               => 'Additional Footer Text ',
     'footer_text_help'          => 'This text will appear in the right-side footer. Links are allowed using <a href="https://help.github.com/articles/github-flavored-markdown/">Github flavored markdown</a>. Line breaks, headers, images, etc may result in unpredictable results.',
+    'footer_text_placeholder'   => 'Optional footer text',
     'general_settings'			=> 'הגדרות כלליות',
-    'general_settings_keywords' => 'company support, signature, acceptance, email format, username format, images, per page, thumbnail, eula, gravatar, tos, dashboard, privacy',
     'general_settings_help'     => 'Default EULA and more',
     'generate_backup'			=> 'צור גיבוי',
     'google_workspaces'         => 'Google Workspaces',
     'header_color'              => 'צבע כותרת',
     'info'                      => 'הגדרות אלה מאפשרות לך להתאים אישית היבטים מסוימים של ההתקנה.',
-    'label_logo'                => 'Label Logo',
     'label_logo_size'           => 'Square logos look best - will be displayed in the top right of each asset label. ',
     'laravel'                   => 'גירסת Laravel',
     'ldap'                      => 'LDAP',
@@ -94,7 +97,7 @@ return [
     'ldap_login_sync_help'      => 'This only tests that LDAP can sync correctly. If your LDAP Authentication query is not correct, users may still not be able to login. YOU MUST SAVE YOUR UPDATED LDAP SETTINGS FIRST.',
     'ldap_manager'              => 'LDAP Manager',
     'ldap_server'               => 'שרת LDAP',
-    'ldap_server_help'          => 'זה צריך להתחיל עם ldap: // (עבור לא מוצפן או TLS) או ldaps: // (עבור SSL)',
+    'ldap_server_help'          => 'This should start with ldap:// (for unencrypted) or ldaps:// (for TLS or SSL)',
     'ldap_server_cert'			=> 'אימות תעודת SSL של LDAP',
     'ldap_server_cert_ignore'	=> 'אפשר אישור SSL לא חוקי',
     'ldap_server_cert_help'		=> 'בחר בתיבת סימון זו אם אתה משתמש ב- SSL עם חתימה עצמית וברצונך לקבל אישור SSL לא חוקי.',
@@ -108,8 +111,8 @@ return [
     'ldap_pword'                => 'קישור סיסמה LDAP',
     'ldap_basedn'               => 'בסיס Bind DN',
     'ldap_filter'               => 'מסנן LDAP',
-    'ldap_pw_sync'              => 'סינכרון סיסמת LDAP',
-    'ldap_pw_sync_help'         => 'בטל את הסימון בתיבה זו אם אינך רוצה לשמור את סיסמאות LDAP המסונכרנות עם סיסמאות מקומיות. השבתה זו פירושה שהמשתמשים שלך לא יוכלו להתחבר אם שרת ה- LDAP שלך אינו ניתן להשגה מסיבה כלשהי.',
+    'ldap_pw_sync'              => 'Cache LDAP Passwords',
+    'ldap_pw_sync_help'         => 'Uncheck this box if you do not wish to keep LDAP passwords cached as local hashed passwords. Disabling this means that your users may not be able to login if your LDAP server is unreachable for some reason.',
     'ldap_username_field'       => 'שם משתמש',
     'ldap_lname_field'          => 'שם משפחה',
     'ldap_fname_field'          => 'שם פרטי של LDAP',
@@ -117,13 +120,15 @@ return [
     'ldap_version'              => 'גרסת LDAP',
     'ldap_active_flag'          => 'LDAP סמל פעיל',
     'ldap_activated_flag_help'  => 'This value is used to determine whether a synced user can login to Snipe-IT. <strong>It does not affect the ability to check items in or out to them</strong>, and should be the <strong>attribute name</strong> within your AD/LDAP, <strong>not the value</strong>. <br><br>If this field is set to a field name that does not exist in your AD/LDAP, or the value in the AD/LDAP field is set to <code>0</code> or <code>false</code>, <strong>user login will be disabled</strong>. If the value in the AD/LDAP field is set to <code>1</code> or <code>true</code> or <em>any other text</em> means the user can log in. When the field is blank in your AD, we respect the <code>userAccountControl</code> attribute, which usually allows non-suspended users to log in.',
+    'ldap_invert_active_flag'   => 'LDAP Invert Active Flag',
+    'ldap_invert_active_flag_help'     => 'If enabled: when the value returned by LDAP Active Flag is <code>0</code> or <code>false</code> the user account will be active.',
     'ldap_emp_num'              => 'מספר עובד LDAP',
     'ldap_email'                => 'דוא"ל LDAP',
     'ldap_test'                 => 'Test LDAP',
     'ldap_test_sync'            => 'Test LDAP Synchronization',
     'license'                   => 'רישיון תוכנה',
-    'load_remote'               => 'Use Gravatar',
-    'load_remote_help_text'		=> 'Uncheck this box if your install cannot load scripts from the outside internet. This will prevent Snipe-IT from trying load images from Gravatar.',
+    'load_remote'               => 'Load Remote Avatars',
+    'load_remote_help_text'		=> 'Uncheck this box if your install cannot load scripts from the outside internet. This will prevent Snipe-IT from trying load avatars from Gravatar or other outside sources.',
     'login'                     => 'Login Attempts',
     'login_attempt'             => 'Login Attempt',
     'login_ip'                  => 'IP Address',
@@ -131,6 +136,7 @@ return [
     'login_user_agent'          => 'User Agent',
     'login_help'                => 'רשימת נסיונות כניסה למערכת',
     'login_note'                => 'הערה התחברות',
+    'login_note_placeholder'            => "If you do not have a login or have found a device belonging to this company, please call technical support at 888-555-1212. Thank you.",
     'login_note_help'           => 'אופציונלי לכלול כמה משפטים במסך הכניסה שלך, למשל כדי לעזור לאנשים שמצאו מכשיר אבוד או נגנב. השדה הזה מקבל <a href="https://help.github.com/articles/github-flavored-markdown/">Github בטעם מרקדון </a>',
     'login_remote_user_text'    => 'אפשרויות כניסת משתמש מרוחק',
     'login_remote_user_enabled_text' => 'הפעלת כניסה עם כותרת משתמש מרוחק',
@@ -146,13 +152,16 @@ return [
     'logo_print_assets_help'    => 'Use branding on printable asset lists ',
     'full_multiple_companies_support_help_text' => 'הגבלת משתמשים (כולל מנהלי מערכת) שהוקצו לחברות לנכסי החברה שלהם.',
     'full_multiple_companies_support_text' => 'תמיכה מלאה חברות מרובות',
+    'scope_locations_fmcs_support_text'  => 'Scope Locations with Full Multiple Companies Support',
+    'scope_locations_fmcs_support_help_text'  => 'Restrict locations to their selected company.',
+    'scope_locations_fmcs_check_button' => 'Check Compatibility',
+    'scope_locations_fmcs_support_disabled_text'  => 'This option is disabled because you have conflicting locations set for :count or more items.',
     'show_in_model_list'   => 'Show in Model Dropdowns',
     'optional'					=> 'אופציונאלי',
     'per_page'                  => 'תוצאות לעמוד',
     'php'                       => 'גרסת PHP',
-    'php_info'                  => 'PHP Info',
+    'php_info'                  => 'PHP info',
     'php_overview'              => 'PHP',
-    'php_overview_keywords'     => 'phpinfo, system, info',
     'php_overview_help'         => 'PHP System info',
     'php_gd_info'               => 'עליך להתקין את PHP-gd כדי להציג קודי QR, ראה הוראות התקנה.',
     'php_gd_warning'            => 'עיבוד תמונה PHP ותוסף GD אינו מותקן.',
@@ -218,6 +227,8 @@ return [
     'webhook_integration_help'    => ':app integration is optional, however the endpoint and channel are required if you wish to use it. To configure :app integration, you must first <a href=":webhook_link" target="_new" rel="noopener">create an incoming webhook</a> on your :app account. Click on the <strong>Test :app Integration</strong> button to confirm your settings are correct before saving. ',
     'webhook_integration_help_button'    => 'Once you have saved your :app information, a test button will appear.',
     'webhook_test_help'           => 'Test whether your :app integration is configured correctly. YOU MUST SAVE YOUR UPDATED :app SETTINGS FIRST.',
+    'shortcuts_enabled'         => 'Enable Shortcuts',
+    'shortcuts_help_text'       => '<strong>Windows</strong>: Alt + Access key, <strong>Mac</strong>: Control + Option + Access key',
     'snipe_version'  			=> 'Snipe-IT גירסה',
     'support_footer'            => 'Support Footer Links ',
     'support_footer_help'       => 'Specify who sees the links to the Snipe-IT Support info and Users Manual',
@@ -227,7 +238,6 @@ return [
     'update'                    => 'עדכן הגדרות',
     'value'                     => 'ערך',
     'brand'                     => 'מיתוג',
-    'brand_keywords'            => 'footer, logo, print, theme, skin, header, colors, color, css',
     'brand_help'                => 'Logo, Site Name',
     'web_brand'                 => 'Web Branding Type',
     'about_settings_title'      => 'על הגדרות',
@@ -276,6 +286,8 @@ return [
     'two_factor_enrollment_text'	=> "יש צורך באימות שני גורמים, אך המכשיר עדיין לא נרשם. פתח את אפליקציית המאמת של Google וסרוק את קוד QR שלהלן כדי לרשום את המכשיר שלך. לאחר שתירשם את המכשיר, הזן את הקוד הבא",
     'require_accept_signature'      => 'דרוש חתימה',
     'require_accept_signature_help_text'      => 'הפעלת תכונה זו תדרוש ממשתמשים להיכנס פיזית בעת קבלת נכס.',
+    'require_checkinout_notes'  => 'Require Notes on Checkin/Checkout',
+    'require_checkinout_notes_help_text'    => 'Enabling this feature will require the note fields to be populated when checking in or checking out an asset.',
     'left'        => 'שמאלה',
     'right'        => 'ימין',
     'top'        => 'חלק עליון',
@@ -299,7 +311,7 @@ return [
     'oauth_callback_url' => 'Your application authorization callback URL.',
     'create_client' => 'Create Client',
     'no_scopes' => 'No scopes',
-    'asset_tag_title' => 'Update Asset Tag Settings',
+    'asset_tag_title' => 'עדכן הגדרות תג נכס',
     'barcode_title' => 'Update Barcode Settings',
     'barcodes' => 'ברקודים',
     'barcodes_help_overview' => 'Barcode &amp; QR settings',
@@ -313,24 +325,24 @@ return [
     'filter_by_keyword' => 'Filter by setting keyword',
     'security' => 'אבטחה',
     'security_title' => 'Update Security Settings',
-    'security_keywords' => 'password, passwords, requirements, two factor, two-factor, common passwords, remote login, logout, authentication',
     'security_help' => 'Two-factor, Password Restrictions',
-    'groups_keywords' => 'permissions, permission groups, authorization',
     'groups_help' => 'Account permission groups',
     'localization' => 'Localization',
     'localization_title' => 'Update Localization Settings',
-    'localization_keywords' => 'localization, currency, local, locale, time zone, timezone, international, internatinalization, language, languages, translation',
     'localization_help' => 'Language, date display',
     'notifications' => 'Notifications',
     'notifications_help' => 'Email Alerts & Audit Settings',
     'asset_tags_help' => 'Incrementing and prefixes',
     'labels' => 'Labels',
     'labels_title' => 'Update Label Settings',
-    'labels_help' => 'Label sizes &amp; settings',
-    'purge_keywords' => 'permanently delete',
+    'labels_help' => 'Barcodes &amp; label settings',
     'purge_help' => 'טיהור רשומות שנמחקו',
     'ldap_extension_warning' => 'It does not look like the LDAP extension is installed or enabled on this server. You can still save your settings, but you will need to enable the LDAP extension for PHP before LDAP syncing or login will work.',
     'ldap_ad' => 'LDAP/AD',
+    'ldap_test_label' => 'Test LDAP Sync',
+    'ldap_test_login' => ' Test LDAP Login',
+    'ldap_username_placeholder' => 'LDAP Username',
+    'ldap_password_placeholder' => 'LDAP Password',
     'employee_number' => 'מספר עובד',
     'create_admin_user' => 'צור משתמש ::',
     'create_admin_success' => 'Success! Your admin user has been added!',
@@ -342,6 +354,8 @@ return [
     'setup_migration_create_user' => 'הבא: יצירת משתמש',
     'ldap_settings_link' => 'LDAP Settings Page',
     'slack_test' => 'Test <i class="fab fa-slack"></i> Integration',
+    'status_label_name' => 'Status Label Name',
+    'super_admin_only'  => 'Super Admin Only',
     'label2_enable'           => 'New Label Engine',
     'label2_enable_help'      => 'Switch to the new label engine. <b>Note: You will need to save this setting before setting others.</b>',
     'label2_template'         => 'Template',
@@ -356,12 +370,15 @@ return [
     'label2_2d_type'          => 'סוג ברקוד דו-ממדי',
     'label2_2d_type_help'     => 'Format for 2D barcodes',
     'label2_2d_target'        => '2D Barcode Target',
-    'label2_2d_target_help'   => 'The URL the 2D barcode points to when scanned',
+    'label2_2d_target_help'   => 'The data that will be contained in the 2D barcode',
     'label2_fields'           => 'Field Definitions',
     'label2_fields_help'      => 'Fields can be added, removed, and reordered in the left column. For each field, multiple options for Label and DataSource can be added, removed, and reordered in the right column.',
+    'purge_barcodes' => 'Purge Barcodes',
     'help_asterisk_bold'    => 'Text entered as <code>**text**</code> will be displayed as bold',
     'help_blank_to_use'     => 'Leave blank to use the value from <code>:setting_name</code>',
     'help_default_will_use' => '<code>:default</code> will use the value from <code>:setting_name</code>. <br>Note that the value of the barcodes must comply with the respective barcode spec in order to be successfully generated. Please see <a href="https://snipe-it.readme.io/docs/barcodes">the documentation <i class="fa fa-external-link"></i></a> for more details. ',
+    'asset_id'              => 'Asset ID',
+    'data'               => 'Data',
     'default'               => 'Default',
     'none'                  => 'None',
     'google_callback_help' => 'This should be entered as the callback URL in your Google OAuth app settings in your organization&apos;s <strong><a href="https://console.cloud.google.com/" target="_blank">Google developer console <i class="fa fa-external-link" aria-hidden="true"></i></a></strong>.',
@@ -373,7 +390,100 @@ return [
     'database_driver' => 'Database Driver',
     'bs_table_storage' => 'Table Storage',
     'timezone' => 'Timezone',
+    'test_mail' => 'Test Mail',
     'profile_edit'          => 'Edit Profile',
     'profile_edit_help'          => 'Allow users to edit their own profiles.',
+    'default_avatar' => 'Custom Default Avatar',
+    'default_avatar_help' => 'This image will be displayed as a profile if a user does not have a profile photo.',
+    'restore_default_avatar' => 'Restore <a href=":default_avatar" data-toggle="lightbox" data-type="image">original system default avatar</a>',
+    'restore_default_avatar_help' => '',
+    'due_checkin_days' => 'Due For Checkin Warning',
+    'due_checkin_days_help' => 'How many days before the expected checkin of an asset should it be listed in the "Due for checkin" page?',
+    'no_groups' => 'No groups have been created yet. Visit <code>Admin Settings > Permission Groups</code> to add one.',
+    'text' => 'Text',
+
+    'username_formats' => [
+        'username_format'		=> 'פורמט שם משתמש',
+        'firstname_lastname_format'	=> 'שם משפחה של שם פרטי (jane.smith)',
+        'first_name_format'	        => 'First Name (jane)',
+        'last_name_format'		=> 'Last Name (doe)',
+        'filastname_format'			=> 'First Initial Last Name (jsmith)',
+        'lastnamefirstinitial_format' =>  'Last Name First Initial (smithj)',
+        'firstname_lastname_underscore_format' => 'First Name Last Name (jane_smith)',
+        'firstinitial.lastname' => 'First Initial Last Name (j.smith)',
+        'lastname_firstinitial' => 'Last Name First Initial (smith_j)',
+        'lastname_dot_firstinitial_format' => 'Last Name First Initial (smith.j)',
+        'firstnamelastname'     => 'First Name Last Name (janesmith)',
+        'firstnamelastinitial'  => 'First Name Last Initial (janes)',
+        'lastnamefirstname'      => 'Last Name.First Name (smith.jane)',
+    ],
+
+    'email_formats' => [
+        'email_format'			=> 'תבנית אימייל',
+        'firstname_lastname_format'	=> 'שם משפחה של שם פרטי (jane.smith@example.com)',
+        'first_name_format'		=> 'שם פרטי (jane@example.com)',
+        'last_name_format'		=> 'Last Name (doe@example.com)',
+        'filastname_format'			=> 'שם משפחה ראשוני ראשון (jsmith@example.com)',
+        'lastnamefirstinitial_format' =>  'שם משפחה ראשי תיבות שם פרטי (smithj@example.com)',
+        'firstname_lastname_underscore_format' => 'שם פרטי שם משפחה (jane_smith@example.com)',
+        'firstinitial.lastname' => 'ראשי תיבות שם פרטי שם משפחה (j.smith@example)',
+        'lastname_firstinitial' => 'שם משפחה ראשי תיבות שם פרטי (smith_j@example.com)',
+        'lastname_dot_firstinitial_format' => 'Last Name First Initial (smith.j@example.com)',
+        'firstnamelastname'     => 'שם פרטי שם משפחה (janesmith@example.com)',
+        'firstnamelastinitial'  => 'שם פרטי ראשי תיבות שם משפחה (janes@example.com)',
+        'lastnamefirstname'      => 'Last Name.First Name (smith.jane@example.com)',
+    ],
+
+
+
+    'logo_labels' => [
+        'acceptance_pdf_logo'       => 'PDF Logo',
+        'email_logo'                => 'לוגו לדוא״ל',
+        'label_logo'                => 'Label Logo',
+        'logo'                      => 'Site Logo',
+        'favicon'                   => 'סמל מועדפים (Favicon)',
+    ],
+
+    'logo_help' => [
+        'email_logo_size'       => 'לוגואים מרובעים נראים הכי טוב בהודעות דוא״ל. ',
+    ],
+
+    'logo_option_types' => [
+        'text' => 'Text',
+        'logo' => 'סֵמֶל',
+        'logo_and_text' => 'Logo and Text',
+    ],
+
+
+    'legends' => [
+        'scoping' => 'Scoping',
+        'formats' => 'Default Formats',
+        'profiles' => 'User Profiles',
+        'eula' => 'EULA & Acceptance Preferences',
+        'misc_display' => 'Miscellaneous Display Options',
+        'email' => 'Email Preferences',
+        'checkin' => 'Checkin Preferences',
+        'dashboard' => 'Login & Dashboard Preferences',
+        'misc' => 'Miscellaneous',
+        'logos' => 'Logos & Display',
+        'colors' => 'Colors & Skins',
+        'footer' => 'Footer Preferences',
+        'security' => 'Security Preferences',
+        'general' => 'General',
+        'intervals' => 'Intervals & Thresholds',
+    ],
+
+
+    /* Keywords for settings overview help */
+    'keywords' => [
+        'brand'             => 'footer, logo, print, theme, skin, header, colors, color, css',
+        'general_settings'  => 'company support, signature, acceptance, email format, username format, images, per page, thumbnail, eula, gravatar, tos, dashboard, privacy',
+        'groups'            => 'permissions, permission groups, authorization',
+        'labels'            => 'labels, barcodes, barcode, sheets, print, upc, qr, 1d, 2d',
+        'localization'      => 'localization, currency, local, locale, time zone, timezone, international, internatinalization, language, languages, translation',
+        'php_overview'      => 'phpinfo, system, info',
+        'purge'             => 'permanently delete',
+        'security'          => 'password, passwords, requirements, two factor, two-factor, common passwords, remote login, logout, authentication',
+    ],
 
 ];
diff --git a/resources/lang/he-IL/admin/settings/message.php b/resources/lang/he-IL/admin/settings/message.php
index acc67164ac..f97e8714b8 100644
--- a/resources/lang/he-IL/admin/settings/message.php
+++ b/resources/lang/he-IL/admin/settings/message.php
@@ -14,6 +14,9 @@ return [
         'restore_warning'       => 'Yes, restore it. I acknowledge that this will overwrite any existing data currently in the database. This will also log out all of your existing users (including you).',
         'restore_confirm'       => 'האם ברצונך לשחזר את המסד נתונים מ: קובץ?'
     ],
+    'restore' => [
+        'success'               => 'Your system backup has been restored. Please log in again.'
+    ],
     'purge' => [
         'error'     => 'אירעה שגיאה בעת הטיהור.',
         'validation_failed'     => 'אישור הטיהור שלך שגוי. הקלד את המילה "DELETE" בתיבת האישור.',
@@ -33,6 +36,9 @@ return [
         'testing_authentication' => 'בודק אימות מול שרת LDAP...',
         'authentication_success' => 'התחברות לשרת LDAפ עברה בהצלחה!'
     ],
+    'labels' => [
+        'null_template' => 'Label template not found. Please select a template.',
+        ],
     'webhook' => [
         'sending' => 'Sending :app test message...',
         'success' => 'Your :webhook_name Integration works!',
@@ -42,5 +48,12 @@ return [
         'error' => 'Something went wrong. :app responded with: :error_message',
         'error_redirect' => 'ERROR: 301/302 :endpoint returns a redirect. For security reasons, we don’t follow redirects. Please use the actual endpoint.',
         'error_misc' => 'משהו השתבש אופסי פופסי. :( ',
-    ]
+        'webhook_fail' => ' webhook notification failed: Check to make sure the URL is still valid.',
+        'webhook_channel_not_found' => ' ערוץ ההתליות לא נמצא.',
+        'ms_teams_deprecation' => 'The selected Microsoft Teams webhook URL will be deprecated Dec 31st, 2025. Please use a workflow URL. Microsoft\'s documentation on creating a workflow can be found <a href="https://support.microsoft.com/en-us/office/create-incoming-webhooks-with-workflows-for-microsoft-teams-8ae491c7-0394-4861-ba59-055e33f75498" target="_blank"> here.</a>',
+    ],
+    'location_scoping' => [
+        'not_saved' => 'Your settings were not saved.',
+        'mismatch' => 'There is 1 item in the database that need your attention before you can enable location scoping.|There are :count items in the database that need your attention before you can enable location scoping.',
+    ],
 ];
diff --git a/resources/lang/he-IL/admin/statuslabels/table.php b/resources/lang/he-IL/admin/statuslabels/table.php
index 9a198c69ef..7c06e32953 100644
--- a/resources/lang/he-IL/admin/statuslabels/table.php
+++ b/resources/lang/he-IL/admin/statuslabels/table.php
@@ -1,14 +1,14 @@
 <?php
 
 return array(
-    'about'      	=> 'על תוויות סטטוס',
+    'about'      	=> 'About Status Types',
     'archived'      	=> 'בארכיון',
     'create'      	=> 'צור תווית סטטוס',
     'color'      	=> 'צבע תרשים',
     'default_label' => 'תווית ברירת מחדל',
     'default_label_help' => 'This is used to ensure your most commonly used status labels appear at the top of the select box when creating/editing assets.',
     'deployable'      	=> 'ניתן לפריסה',
-    'info'      	=> 'תוויות סטטוס משמשות לתיאור המצבים השונים שהנכסים שלך יכולים להיות בהם. הם עשויים להיות מחוץ לתיקונים, לאיבוד / לגניבה וכו \'. ניתן ליצור תוויות סטטוס חדשות עבור נכסים הניתנים לפריסה, ממתינים ועומדים בארכיון.',
+    'info'      	=> 'Status label types are used to describe the various states your assets could be in. They may be out for repair, lost/stolen, etc. You can create new status labels for your deployable, pending and archived assets according to your own workflow. For more information, <a href="https://snipe-it.readme.io/docs/overview#status-labels" target="_blank">see the documentation <i class="fa fa-external-link"></i></a>.',
     'name'      	=> 'שם סטטוס',
     'pending'      	=> 'ממתין ל',
     'status_type'   => 'סוג סטטוס',
diff --git a/resources/lang/he-IL/admin/users/general.php b/resources/lang/he-IL/admin/users/general.php
index cc49449414..b1802dbe11 100644
--- a/resources/lang/he-IL/admin/users/general.php
+++ b/resources/lang/he-IL/admin/users/general.php
@@ -19,6 +19,8 @@ return [
     'print_assigned'    => 'להדפיס את כל ההקצאות',
     'email_assigned'    => 'Email List of All Assigned',
     'user_notified'     => 'User has been emailed a list of their currently assigned items.',
+    'users_notified'    => 'The user has been emailed a list of their currently assigned items.|:count users have been emailed a list of their currently assigned items.',
+    'users_notified_warning' => ':count user has been emailed a list of their currently assigned items, however :no_email users did not have an email address so could not be emailed.|:count users have been emailed a list of their currently assigned items, however :no_email user(s) did not have an email address so could not be emailed.',
     'auto_assign_label' => 'Include this user when auto-assigning eligible licenses',
     'auto_assign_help'  => 'Skip this user in auto assignment of licenses',
     'software_user'     => 'התוכנה נבדקה אל: שם',
diff --git a/resources/lang/he-IL/admin/users/message.php b/resources/lang/he-IL/admin/users/message.php
index 5fe817ac78..1e7e724b43 100644
--- a/resources/lang/he-IL/admin/users/message.php
+++ b/resources/lang/he-IL/admin/users/message.php
@@ -6,7 +6,7 @@ return array(
     'declined'                  => 'דחיית את הנכס הזה בהצלחה.',
     'bulk_manager_warn'	        => 'המשתמשים שלך עודכנו בהצלחה, אך רשומת המנהל שלך לא נשמרה מפני שהמנהל שבחרת נבחר גם ברשימת המשתמשים כדי לערוך, והמשתמשים לא יכולים להיות המנהל שלהם. בחר שוב את המשתמשים שלך, למעט המנהל.',
     'user_exists'               => 'משתמש כבר קיים!',
-    'user_not_found'            => 'משתמש לא קיים.',
+    'user_not_found'            => 'User does not exist or you do not have permission view them.',
     'user_login_required'       => 'יש להזין את שדה הכניסה',
     'user_has_no_assets_assigned' => 'No assets currently assigned to user.',
     'user_password_required'    => 'נדרשת הסיסמה.',
@@ -53,6 +53,7 @@ return array(
         'ldap_could_not_search' => 'לא ניתן לחפש בשרת LDAP. בדוק את תצורת שרת LDAP בקובץ תצורת LDAP. <br> שגיאה משרת LDAP:',
         'ldap_could_not_get_entries' => 'לא ניתן לקבל רשומות משרת LDAP. בדוק את תצורת שרת LDAP בקובץ תצורת LDAP. <br> שגיאה משרת LDAP:',
         'password_ldap' => 'הסיסמה עבור חשבון זה מנוהלת על ידי LDAP / Active Directory. צור קשר עם מחלקת ה- IT כדי לשנות את הסיסמה שלך.',
+        'multi_company_items_assigned' => 'This user has items assigned that belong to a different company. Please check them in or edit their company.'
     ),
 
     'deletefile' => array(
diff --git a/resources/lang/he-IL/admin/users/table.php b/resources/lang/he-IL/admin/users/table.php
index b76833fdff..a71f015a92 100644
--- a/resources/lang/he-IL/admin/users/table.php
+++ b/resources/lang/he-IL/admin/users/table.php
@@ -22,7 +22,7 @@ return array(
     'managed_locations'     => 'מיקומים מנוהלים',
     'managed_users'         => 'Managed Users',
     'name' 					=> 'שֵׁם',
-    'nogroup'               => 'No groups have been created yet. To add one, visit: ',
+    'nogroup'               => 'No groups have been created yet. To add one, visit:',
     'notes'                 => 'הערות',
     'password_confirm' 		=> 'אשר סיסמה',
     'password' 				=> 'סיסמה',
diff --git a/resources/lang/he-IL/auth.php b/resources/lang/he-IL/auth.php
index db310aa1bb..14d8acfce0 100644
--- a/resources/lang/he-IL/auth.php
+++ b/resources/lang/he-IL/auth.php
@@ -15,6 +15,6 @@ return array(
 
     'failed' => 'These credentials do not match our records.',
     'password' => 'The provided password is incorrect.',
-    'throttle' => 'Too many login attempts. Please try again in :seconds seconds.',
+    'throttle' => 'Too many login attempts. Please try again in :minutes minute(s).',
 
 );
diff --git a/resources/lang/he-IL/auth/message.php b/resources/lang/he-IL/auth/message.php
index 214c3c0163..d5b7361570 100644
--- a/resources/lang/he-IL/auth/message.php
+++ b/resources/lang/he-IL/auth/message.php
@@ -6,8 +6,6 @@ return array(
     'account_not_found'      => 'שם המשתמש או הסיסמה שגויים.',
     'account_not_activated'  => 'חשבון משתמש זה אינו מופעל.',
     'account_suspended'      => 'חשבון המשתמש הזה מושעה.',
-    'account_banned'         => 'חשבון משתמש זה מוחרם.',
-    'throttle'               => 'Too many failed login attempts. Please try again in :minutes minutes.',
 
     'two_factor' => array(
         'already_enrolled'      => 'Your device is already enrolled.',
diff --git a/resources/lang/he-IL/button.php b/resources/lang/he-IL/button.php
index b8e8425c26..b009416953 100644
--- a/resources/lang/he-IL/button.php
+++ b/resources/lang/he-IL/button.php
@@ -7,6 +7,7 @@ return [
     'checkin_and_delete'  	    => 'Checkin All / Delete User',
     'delete'  	                => 'לִמְחוֹק',
     'edit'    	                => 'לַעֲרוֹך',
+    'clone'    	                => 'Clone',
     'restore' 	                => 'לשחזר',
     'remove'                    => 'הסר',
     'request'                   => 'בַּקָשָׁה',
@@ -21,4 +22,13 @@ return [
     'add_maintenance'           => 'הוסף לתחזוקה',
     'append'                    => 'הוסף',
     'new'                       => 'חדש',
+    'var' => [
+        'clone'     => 'Clone :item_type',
+        'edit'      => 'Edit :item_type',
+        'delete'    => 'Delete :item_type',
+        'restore'   => 'Restore :item_type',
+        'create'    => 'Create New :item_type',
+        'checkout'  => 'Checkout :item_type',
+        'checkin'   => 'Checkin :item_type',
+    ]
 ];
diff --git a/resources/lang/he-IL/general.php b/resources/lang/he-IL/general.php
index a23ff53929..e48056ebee 100644
--- a/resources/lang/he-IL/general.php
+++ b/resources/lang/he-IL/general.php
@@ -10,26 +10,29 @@ return [
     'action'                => 'פעולה',
     'activity_report'		=> 'דוח פעילות',
     'address'				=> 'כתובת',
-    'admin'					=> 'מנהל מערכת',
+    'admin'					=> 'Admin Settings',
     'admin_tooltip'			=> 'This user has admin privileges',
     'superuser'				=> 'Superuser',
     'superuser_tooltip'		=> 'This user has superuser privileges',
     'administrator'			=> 'אדמיניסטרטור',
     'add_seats'             => 'מושבים נוספים',
-    'age'                   => "Age",
+    'age'                   => "גיל",
     'all_assets'			=> 'כל הנכסים',
     'all'       			=> 'את כל',
     'archived'              => 'בארכיון',
     'asset_models'			=> 'מודלים של נכסים',
     'asset_model'			=> 'דֶגֶם',
     'asset'					=> 'נכס',
+    'asset_previous'        => 'Asset (Previously Assigned)',
     'asset_report'          => 'דוח נכסים',
     'asset_tag'				=> 'תג נכס',
     'asset_tags'            => 'תגיות נכס',
     'assets_available'		=> 'נכסים זמינים',
     'accept_assets'         => 'אשר נכס :name',
     'accept_assets_menu'    => 'אשר הנכסים',
+    'accept_item'           => 'Accept Item',
     'audit'				    => 'בְּדִיקָה',
+    'audits'				=> 'Audits',
     'audit_report'			=> 'יומן ביקורת',
     'assets'				=> 'נכסים',
     'assets_audited'        => 'assets audited',
@@ -61,9 +64,12 @@ return [
     'changepassword'  		=> 'שנה סיסמא',
     'checkin'  				=> 'קבלה',
     'checkin_from'  		=> 'Checkin מ',
+    'checkin_note'  		=> 'Checkin Note',
+    'checkout_note'  		=> 'Checkout Note',
     'checkout'  			=> 'לבדוק',
     'checkouts_count'       => 'הסרת נכס',
     'checkins_count'        => 'העברות נכסים',
+    'checkin_and_delete'  	=> 'Checkin and Delete',
     'user_requests_count'   => 'בקשות',
     'city'  				=> 'עִיר',
     'click_here'			=> 'לחץ כאן',
@@ -77,7 +83,7 @@ return [
     'consumables'			=> 'מתכלים',
     'country'  				=> 'מדינה',
     'could_not_restore'     => 'שגיאה בשחזור :item_type: :error',
-    'not_deleted'           => 'ה:item_type לא נמחק ולכן לא ניתן לשחזרו',
+    'not_deleted'           => 'The :item_type was not deleted and therefore cannot be restored',
     'create'				=> 'צור חדש',
     'created'               => 'פריט נוצר',
     'created_asset'			=> 'הנכס שנוצר',
@@ -86,11 +92,13 @@ return [
     'record_created' 		=> 'רשומה נוצרה',
     'updated_at' 			=> 'עודכן ב',
     'currency'  			=> '$', // this is deprecated
+    'currency_text'  		=> 'Currency', //
     'current'  				=> 'נוֹכְחִי',
     'current_password'      => 'סיסמא נוכחית',
     'customize_report'      => 'דוח מותאם אישית',
     'custom_report'         => 'דוח נכס מותאם אישית',
     'dashboard'				=> 'לוּחַ מַחווָנִים',
+    'data_source'           => 'Data Source',
     'days'      			=> 'ימים',
     'days_to_next_audit'    => 'ימים לביקורת',
     'date'					=> 'תַאֲרִיך',
@@ -98,7 +106,7 @@ return [
     'debug_warning_text'    => 'יישום זה פועל במצב ייצור עם איתור באגים. זה יכול לחשוף נתונים רגישים אם היישום שלך נגיש לעולם החיצון. השבת את מצב איתור הבאגים על ידי הגדרת הערך <code>APP_DEBUG</code> בקובץ <code>.env</code> ל <code>false</code>.',
     'delete'  				=> 'לִמְחוֹק',
     'delete_confirm'  		=> 'האם אתה בטוח שברצונך למחוק?',
-    'delete_confirm_no_undo' => 'Are you sure you wish to delete :item? This can not be undone.',
+    'delete_confirm_no_undo' => 'Are you sure, you wish to delete :item? This cannot be undone.',
     'deleted'  				=> 'נמחק',
     'delete_seats'  		=> 'מושבים שנמחקו',
     'deletion_failed'       => 'המחיקה נכשלה',
@@ -114,29 +122,13 @@ return [
     'editprofile'  			=> 'ערוך את הפרופיל שלך',
     'eol'					=> 'EOL',
     'email_domain'			=> 'דומיין דוא"ל',
-    'email_format'			=> 'תבנית אימייל',
     'employee_number'       => 'מספר עובד',
     'email_domain_help'		=> 'זה משמש ליצירת כתובות דוא"ל בעת ייבוא',
     'error'				    => 'שגיאה',
     'exclude_archived'      => 'Exclude Archived Assets',
     'exclude_deleted'       => 'Exclude Deleted Assets',
     'example'				=> 'Example: ',
-    'filastname_format'			=> 'שם משפחה ראשוני ראשון (jsmith@example.com)',
-    'firstname_lastname_format'	=> 'שם משפחה של שם פרטי (jane.smith@example.com)',
-    'firstname_lastname_underscore_format' => 'שם פרטי שם משפחה (jane_smith@example.com)',
-    'lastnamefirstinitial_format' =>  'שם משפחה ראשי תיבות שם פרטי (smithj@example.com)',
-    'firstintial_dot_lastname_format' => 'ראשי תיבות שם פרטי שם משפחה (j.smith@example.com)',
-    'firstname_lastname_display'	=> 'First Name Last Name (Jane Smith)',
-    'lastname_firstname_display'	=> 'Last Name First Name (Smith Jane)',
-    'name_display_format'	=> 'Name Display Format',
-    'first'					=> 'ראשון',
-    'firstnamelastname'     => 'שם פרטי שם משפחה (janesmith@example.com)',
-    'lastname_firstinitial' => 'שם משפחה ראשי תיבות שם פרטי (smith_j@example.com)',
-    'firstinitial.lastname' => 'ראשי תיבות שם פרטי שם משפחה (j.smith@example)',
-    'firstnamelastinitial'  => 'שם פרטי ראשי תיבות שם משפחה (janes@example.com)',
-    'lastnamefirstname'      => 'שם משפחה שם פרטי (smith.jane@example.com)',
-    'first_name'			=> 'שם פרטי',
-    'first_name_format'		=> 'שם פרטי (jane@example.com)',
+
     'files'                 => 'קבצים',
     'file_name'				=> 'קוֹבֶץ',
     'file_type'             => 'סוג קובץ',
@@ -156,9 +148,9 @@ return [
     'image_delete'         	=> 'מחק תמונה',
     'include_deleted'       => 'Include Deleted Assets',
     'image_upload'         	=> 'העלאת תמונה',
-    'filetypes_accepted_help'    => 'סוגי קובץ אפשריים הם :types. גודל קובץ אפשרי מקסימלי:size.',
-    'filetypes_size_help'   => 'גודל קובץ מותר הוא :size.',
-    'image_filetypes_help'  => 'Accepted filetypes are jpg, webp, png, gif, svg, and avif. Max upload size allowed is :size.',
+    'filetypes_accepted_help'    => 'Accepted filetype is :types. The maximum size allowed is :size.|Accepted filetypes are :types. The maximum upload size allowed is :size.',
+    'filetypes_size_help'   => 'The maximum upload size allowed is :size.',
+    'image_filetypes_help'  => 'Accepted Filetypes are jpg, webp, png, gif, svg, and avif. The maximum upload size allowed is :size.',
     'unaccepted_image_type'  => 'This image file was not readable. Accepted filetypes are jpg, webp, png, gif, and svg. The mimetype of this file is: :mimetype.',
     'import'         	    => 'יְבוּא',
     'import_this_file'      => 'Map fields and process this file',
@@ -178,12 +170,17 @@ return [
     'last'					=> 'אחרון',
     'last_login'            => 'כניסה אחרונה',
     'last_name'             => 'שם משפחה',
+    'firstname_lastname_display'	=> 'First Name Last Name (Jane Smith)',
+    'lastname_firstname_display'	=> 'Last Name First Name (Smith Jane)',
+    'name_display_format'	=> 'Name Display Format',
+    'first'					=> 'ראשון',
+    'first_name'			=> 'שם פרטי',
     'license'				=> 'רישיון',
     'license_report'        => 'דוח רישיון',
     'licenses_available'	=> 'Licenses available',
     'licenses'				=> 'רישיונות',
     'list_all'				=> 'רשימת הכל',
-    'loading'				=> 'טעינה... אנא המתן....',
+    'loading'				=> 'טעינה... אנא המתן...',
     'lock_passwords'        => 'השדה הזה לא ישמר במצב הדגמה.',
     'feature_disabled'      => 'תכונה זו הושבתה עבור התקנת ההדגמה.',
     'location'              => 'מקום',
@@ -193,7 +190,7 @@ return [
     'logout'				=> 'להתנתק',
     'lookup_by_tag'     => 'בדיקה על ידי תג הנכס',
     'maintenances'          => 'אירועי תחזוקה',
-    'manage_api_keys'       => 'נהל מפתחות API',
+    'manage_api_keys'       => 'Manage API keys',
     'manufacturer'			=> 'יַצרָן',
     'manufacturers'			=> 'היצרנים',
     'markdown'				=> 'שדה זה מאפשר <a href="https://help.github.com/articles/github-flavored-markdown/">Github בטעם מרקדון </a>.',
@@ -215,6 +212,14 @@ return [
     'no_results'			=> 'אין תוצאות.',
     'no'  					=> 'לא',
     'notes'  				=> 'הערות',
+    'note_added'            => 'Note Added',
+    'options'				=> 'Options',
+    'preview'				=> 'Preview',
+    'add_note'              => 'Add Note',
+    'note_edited'            => 'Note Edited',
+    'edit_note'              => 'Edit Note',
+    'note_deleted'            => 'Note Deleted',
+    'delete_note'              => 'Delete Note',
     'order_number'          => 'מספר הזמנה',
     'only_deleted'          => 'Only Deleted Assets',
     'page_menu'				=> 'מציג _MENU_ פריטים',
@@ -229,7 +234,7 @@ return [
     'purchase_date'         => 'תאריך רכישה',
     'qty'		            => 'QTY',
     'quantity'		        => 'כַּמוּת',
-    'quantity_minimum'      => 'You have :count items below or almost below minimum quantity levels',
+    'quantity_minimum'      => 'You have one item below or almost below minimum quantity levels|You have :count items below or almost below minimum quantity levels',
     'quickscan_checkin'  	=> 'Quick Scan Checkin',
     'quickscan_checkin_status'  	=> 'בדוק סטטוס',
     'ready_to_deploy'		=> 'מוכן לפריסה',
@@ -254,7 +259,7 @@ return [
     'select_all'            => 'בחר הכל',
     'search'				=> 'חפש',
     'select_category'       => 'בחר קטגוריה',
-    'select_datasource' => 'Select a Datasource',
+    'select_datasource' => 'Select a data source',
     'select_department'     => 'בחר מחלקה',
     'select_depreciation'	=> 'בחר סוג פחת',
     'select_location'		=> 'בחר מיקום',
@@ -274,13 +279,15 @@ return [
     'signed_off_by'         => 'אושר על ידי',
     'skin'       			=> 'ערכת עיצוב',
     'webhook_msg_note'        => 'תישלח התראה דרך התליית רשת',
-    'webhook_test_msg'        => 'Oh hai! Looks like your :app integration with Snipe-IT is working!',
+    'webhook_test_msg'        => 'Oh hai! It looks like your :app integration with Snipe-IT is working!',
     'some_features_disabled' => 'DEMO MODE: תכונות מסוימות מושבתות עבור התקנה זו.',
     'site_name'				=> 'שם אתר',
     'state'  				=> 'מדינה',
     'status_labels'			=> 'תוויות סטטוס',
+    'status_label'			=> 'Status Label',
     'status'    			=> 'סטָטוּס',
     'accept_eula'           => 'Acceptance Agreement',
+    'show_or_hide_eulas' => 'Show/Hide EULAs',
     'supplier'              => 'ספק',
     'suppliers'  			=> 'ספקים',
     'sure_to_delete'        => 'האם אתה בטוח שברצונך למחוק',
@@ -296,9 +303,9 @@ return [
     'type'  				=> 'סוּג',
     'undeployable'			=> 'לא ניתן לפריסה',
     'unknown_admin'			=> 'מנהל לא ידוע',
-    'username_format'		=> 'פורמט שם משתמש',
     'username'              => 'שם משתמש',
     'update'                => 'עדכון',
+    'updating_item' => 'Updating :item',
     'upload_filetypes_help'      => 'Allowed filetypes are png, gif, jpg, jpeg, doc, docx, pdf, xls, xlsx, txt, lic, xml, zip, rtf and rar. Max upload size allowed is :size.',
     'uploaded'              => 'הועלה',
     'user'					=> 'מִשׁתַמֵשׁ',
@@ -323,10 +330,10 @@ return [
     'token_expired'         => 'פג תוקף הטופס שלך. בבקשה נסה שוב.',
     'login_enabled'         => 'Login Enabled',
     'audit_due'             => 'Due for Audit',
-    'audit_due_days'        => 'Assets Due for Audit Within :days Day|Assets Due for Audit Within :days Days',
+    'audit_due_days'        => '{}Assets Due or Overdue for Audit|[1]Assets Due or Overdue for Audit Within a Day|[2,*]Assets Due or Overdue for Audit Within :days Days',
     'checkin_due'           => 'Due for Checkin',
     'checkin_overdue'       => 'Overdue for Checkin',
-    'checkin_due_days'      => 'Assets Due for Checkin Within :days Day|Assets Due for Checkin Within :days Days',
+    'checkin_due_days'      => '{}Due for Checkin|[1]Assets Due for Checkin Within :days Day|[2,*]Assets Due for Checkin Within :days Days',
     'audit_overdue'         => 'Overdue for Audit',
     'accept'                => 'אשר :asset',
     'i_accept'              => 'קיבלתי',
@@ -339,16 +346,16 @@ return [
     'view_all'              => 'הצג הכל',
     'hide_deleted'          => 'הסתר מחוקים',
     'email'                 => 'דוא"ל',
-    'do_not_change'         => 'לא לשינוי',
-    'bug_report'            => 'דווח על באג',
+    'do_not_change'         => 'Do not change',
+    'bug_report'            => 'Report a bug',
     'user_manual'           => 'חוברת משתמש',
     'setup_step_1'          => 'שלב 1',
     'setup_step_2'          => 'שלב 2',
     'setup_step_3'          => 'שלב 3',
     'setup_step_4'          => 'שלב 4',
     'setup_config_check'    => 'Configuration Check',
-    'setup_create_database' => 'Create Database Tables',
-    'setup_create_admin'    => 'Create Admin User',
+    'setup_create_database' => 'Create database tables',
+    'setup_create_admin'    => 'Create an admin user',
     'setup_done'            => 'הסתיים!',
     'bulk_edit_about_to'    => 'You are about to edit the following: ',
     'checked_out'           => 'הנכס שוייך',
@@ -383,6 +390,8 @@ return [
     'new_license'           => 'New License',
     'new_accessory'         => 'New Accessory',
     'new_consumable'        => 'New Consumable',
+    'new_component'         => 'New Component',
+    'new_user'              => 'New User',
     'collapse'              => 'מזער',
     'assigned'              => 'משוייך',
     'asset_count'           => 'ספירת נכסים',
@@ -418,19 +427,20 @@ return [
     'bulk_soft_delete'      =>'Also soft-delete these users. Their asset history will remain intact unless/until you purge deleted records in the Admin Settings.',
     'bulk_checkin_delete_success' => 'Your selected users have been deleted and their items have been checked in.',
     'bulk_checkin_success' => 'The items for the selected users have been checked in.',
-    'set_to_null'           => 'Delete values for this asset|Delete values for all :asset_count assets ',
+    'set_to_null'           => 'Delete values for this selection|Delete values for all :selection_count selections ',
     'set_users_field_to_null'  => 'Delete :field values for this user|Delete :field values for all :user_count users ',
     'na_no_purchase_date'   => 'N/A - No purchase date provided',
     'assets_by_status'      => 'Assets by Status',
     'assets_by_status_type'      => 'Assets by Status Type',
     'pie_chart_type'        => 'Dashboard Pie Chart Type',
     'hello_name'            => 'Hello, :name!',
-    'unaccepted_profile_warning'   => 'You have :count items requiring acceptance. Click here to accept or decline them',
+    'unaccepted_profile_warning'   => 'You have one item requiring acceptance. Click here to accept or decline it | You have :count items requiring acceptance. Click here to accept or decline them',
     'start_date'            => 'Start Date',
     'end_date'            => 'End Date',
     'alt_uploaded_image_thumbnail' => 'Uploaded thumbnail',
     'placeholder_kit'       => 'Select a kit',
     'file_not_found'        => 'File not found',
+    'log_record_not_found'  => 'No record for that log entry was found.',
     'preview_not_available' => '(no preview)',
     'setup'                 => 'Setup',
     'pre_flight'            => 'Pre-Flight',
@@ -512,7 +522,7 @@ return [
     'checked_out_to_fields' => 'Checked Out To Fields',
     'percent_complete' => '% לְהַשְׁלִים',
     'uploading' => 'Uploading... ',
-    'upload_error' => 'Error uploading file. Please check that there are no empty rows and that no column names are duplicated.',
+    'upload_error' => 'Error uploading file. Please check that you have no empty rows or duplicated column names in your CSV, and that the server permissions allow uploads.',
     'copy_to_clipboard' => 'Copy to Clipboard',
     'copied' => 'Copied!',
     'status_compatibility' => 'If assets are already assigned, they cannot be changed to a non-deployable status type and this value change will be skipped.',
@@ -549,6 +559,71 @@ return [
         'license_seats'  => ':count License Seat|:count License Seats',
         'consumables'  => ':count Consumable|:count Consumables',
         'components'  => ':count Component|:count Components',
-    ]
+    ],
+
+    'more_info' => 'עוד מידע',
+    'quickscan_bulk_help' => 'Checking this box will edit the asset record to reflect this new location. Leaving it unchecked will simply note the location in the audit log. Note that if this asset is checked out, it will not change the location of the person, asset or location it is checked out to.',
+    'whoops' => 'Whoops!',
+    'something_went_wrong' => 'Something went wrong with your request.',
+    'close' => 'Close',
+    'expires' => 'יפוג',
+    'map_fields'=> 'Map :item_type Fields',
+    'remaining_var' => ':count Remaining',
+    'label' => 'Label',
+    'import_asset_tag_exists' => 'An asset with the asset tag :asset_tag already exists and an update was not requested. No change was made.',
+    'countries_manually_entered_help' => 'Values with an asterisk (*) were manually entered and do not match existing ISO 3166 dropdown values',
+    'accessories_assigned' => 'Assigned Accessories',
+    'user_managed_passwords' => 'ניהול סיסמאות',
+    'user_managed_passwords_disallow' => 'מנע ממשתמשים לנהל את הסיסמאות של עצמם',
+    'user_managed_passwords_allow' => 'אפשר למשתמשים לנהל את הסיסמאות של עצמם',
+    'from' => 'From',
+    'by' => 'על ידי',
+
+// Add form placeholders here
+    'placeholders' => [
+        'notes'  => 'Add a note',
+    ],
+
+    'breadcrumb_button_actions' => [
+        'edit_item' => 'Edit :name',
+        'checkout_item' => 'Checkout :name',
+        'checkin_item' => 'Checkin :name',
+    ],
+
+    'skins' => [
+        'site_default' => 'Site Default',
+        'default_blue' => 'Default Blue',
+        'blue_dark' => 'Blue (Dark Mode)',
+        'green' => 'Green Dark',
+        'green_dark' => 'Green (Dark Mode)',
+        'red' => 'Red Dark',
+        'red_dark' => 'Red (Dark Mode)',
+        'orange' => 'Orange Dark',
+        'orange_dark' => 'Orange (Dark Mode)',
+        'black' => 'Black',
+        'black_dark' => 'Black (Dark Mode)',
+        'purple' => 'Purple',
+        'purple_dark' => 'Purple (Dark Mode)',
+        'yellow' => 'Yellow',
+        'yellow_dark' => 'Yellow (Dark Mode)',
+        'high_contrast' => 'High Contrast',
+
+    ],
+
+    'select_all_none' => 'Select/Unselect All',
+    'generic_model_not_found' => 'That :model was not found or you do not have permission to access it',
+    'deleted_models' => 'Deleted Asset Models',
+    'deleted_users' => 'Deleted Users',
+    'cost_each' => ':amount each',
+    'remove_current_image' => 'Remove current :type image',
+
+    'seeding' => [
+        'manufacturers' => [
+            'button' => 'Create Manufacturers',
+            'prompt' => 'You do not have any manufacturers yet. Would you like to seed a list of common manufacturers? (THIS WILL OVERWRITE EXISTING MANUFACTURERS, including those that have been soft-deleted.)',
+            'success' => 'Manufacturers seeded successfully',
+            'error' => 'Could not seed manufacturers. A manufacturer record already exists and seeding would overwrite it.|Could not seed manufacturers. :count manufacturer records already exist and seeding would overwrite them.',
+        ],
+    ],
 
 ];
diff --git a/resources/lang/he-IL/localizations.php b/resources/lang/he-IL/localizations.php
index f1232dd138..827ed4fca1 100644
--- a/resources/lang/he-IL/localizations.php
+++ b/resources/lang/he-IL/localizations.php
@@ -2,7 +2,7 @@
 
 return [
 
-    'select_language' => 'Select a language',
+    'select_language' => 'Select a Language',
     'languages' => [
         'en-US'=> 'English, US',
         'en-GB'=> 'English, UK',
@@ -40,7 +40,9 @@ return [
         'ms-MY'=> 'Malay',
         'mi-NZ'=> 'Maori',
         'mn-MN'=> 'Mongolian',
-        'no-NO'=> 'Norwegian',
+        'nb-NO'=> 'Norwegian Bokmål',
+        'om-ET' => 'Oromo (Ethiopian)',
+        //'nn-NO'=> 'Norwegian Nynorsk',
         'fa-IR'=> 'Persian',
         'pl-PL'=> 'Polish',
         'pt-PT'=> 'Portuguese',
@@ -66,7 +68,7 @@ return [
         'zu-ZA'=> 'Zulu',
     ],
 
-    'select_country' => 'Select a country',
+    'select_country' => 'Select a Country',
     
     'countries' => [
         'AC'=>'Ascension Island',
@@ -133,6 +135,7 @@ return [
         'EC'=>'Ecuador',
         'EE'=>'Estonia',
         'EG'=>'Egypt',
+        'GB-ENG'=>'England',
         'ER'=>'Eritrea',
         'ES'=>'Spain',
         'ET'=>'Ethiopia',
@@ -231,6 +234,7 @@ return [
         'NG'=>'Nigeria',
         'NI'=>'Nicaragua',
         'NL'=>'Netherlands',
+        'GB-NIR' => 'Northern Ireland',
         'NO'=>'Norway',
         'NP'=>'Nepal',
         'NR'=>'Nauru',
@@ -258,7 +262,7 @@ return [
         'RU'=>'Russian Federation',
         'RW'=>'Rwanda',
         'SA'=>'Saudi Arabia',
-        'UK'=>'Scotland',
+        'GB-SCT'=>'Scotland',
         'SB'=>'Solomon Islands',
         'SC'=>'Seychelles',
         'SS'=>'South Sudan',
@@ -310,6 +314,7 @@ return [
         'VI'=>'Virgin Islands (U.S.)',
         'VN'=>'Viet Nam',
         'VU'=>'Vanuatu',
+        'GB-WLS' =>'Wales',
         'WF'=>'Wallis And Futuna Islands',
         'WS'=>'Samoa',
         'YE'=>'Yemen',
diff --git a/resources/lang/he-IL/mail.php b/resources/lang/he-IL/mail.php
index 785603aaa4..6a809006ff 100644
--- a/resources/lang/he-IL/mail.php
+++ b/resources/lang/he-IL/mail.php
@@ -23,24 +23,25 @@ return [
     'Item_Requested' => 'פריט מבוקש',
     'License_Checkin_Notification' => 'License checked in',
     'License_Checkout_Notification' => 'License checked out',
+    'license_for'   => 'License for',
     'Low_Inventory_Report' => 'דו"ח מלאי נמוך',
     'a_user_canceled' => 'משתמש ביטל בקשת פריט באתר',
     'a_user_requested' => 'משתמש ביקש פריט באתר',
     'acceptance_asset_accepted' => 'A user has accepted an item',
     'acceptance_asset_declined' => 'A user has declined an item',
-    'accessory_name' => 'שם אביזר:',
-    'additional_notes' => 'הערות נוספות:',
+    'accessory_name' => 'שם אביזר',
+    'additional_notes' => 'הערות נוספות',
     'admin_has_created' => 'מנהל מערכת יצר עבורך חשבון באתר האינטרנט:.',
-    'asset' => 'נכס:',
-    'asset_name' => 'שם הנכס:',
+    'asset' => 'נכס',
+    'asset_name' => 'שם הנכס',
     'asset_requested' => 'הנכס המבוקש',
     'asset_tag' => 'תג נכס',
     'assets_warrantee_alert' => 'There is :count asset with a warranty expiring in the next :threshold days.|There are :count assets with warranties expiring in the next :threshold days.',
     'assigned_to' => 'שהוקצה ל',
     'best_regards' => 'כל טוב,',
-    'canceled' => 'בּוּטלָה:',
-    'checkin_date' => 'תאריך הגעה:',
-    'checkout_date' => 'תבדוק את התאריך:',
+    'canceled' => 'בּוּטלָה',
+    'checkin_date' => 'תאריך הגעה',
+    'checkout_date' => 'תבדוק את התאריך',
     'checkedout_from' => 'Checked out from',
     'checkedin_from'  => 'Checked in from',
     'checked_into' => 'Checked into',
@@ -49,27 +50,30 @@ return [
     'click_to_confirm' => 'לחץ על הקישור הבא כדי לאשר את: חשבון האינטרנט שלך:',
     'current_QTY' => 'QTY הנוכחי',
     'days' => 'ימים',
-    'expecting_checkin_date' => 'תאריך הצפוי:',
+    'expecting_checkin_date' => 'תאריך הצ\'קין הצפוי',
     'expires' => 'יפוג',
     'hello' => 'שלום',
     'hi' => 'היי',
     'i_have_read' => 'קראתי והסכמתי לתנאי השימוש וקיבלתי פריט זה.',
     'inventory_report' => 'Inventory Report',
-    'item' => 'פריט:',
+    'item' => 'פריט',
+    'item_checked_reminder' => 'This is a reminder that you currently have :count items checked out to you that you have not accepted or declined. Please click the link below to confirm your decision.',
     'license_expiring_alert' => 'There is :count license expiring in the next :threshold days.|There are :count licenses expiring in the next :threshold days.',
     'link_to_update_password' => 'לחץ על הקישור הבא כדי לעדכן את: סיסמת האינטרנט:',
-    'login' => 'התחברות:',
+    'login' => 'התחברות',
     'login_first_admin' => 'היכנס למערכת ההתקנה החדשה של Snipe-IT באמצעות פרטי הכניסה הבאים:',
     'low_inventory_alert' => 'There is :count item that is below minimum inventory or will soon be low.|There are :count items that are below minimum inventory or will soon be low.',
     'min_QTY' => 'מינימום QTY',
     'name' => 'שֵׁם',
     'new_item_checked' => 'פריט חדש נבדק תחת שמך, הפרטים להלן.',
+    'new_item_checked_with_acceptance' => 'A new item has been checked out under your name that requires acceptance, details are below.',
+    'recent_item_checked' => 'An item was recently checked out under your name that requires acceptance, details are below.',
     'notes' => 'הערות',
-    'password' => 'סיסמה:',
+    'password' => 'סיסמה',
     'password_reset' => 'איפוס סיסמא',
     'read_the_terms' => 'אנא קרא את תנאי השימוש שלהלן.',
     'read_the_terms_and_click' => 'Please read the terms of use below, and click on the link at the bottom to confirm that you read and agree to the terms of use, and have received the asset.',
-    'requested' => 'התקבלה:',
+    'requested' => 'מבוקש',
     'reset_link' => 'איפוס הסיסמה שלך קישור',
     'reset_password' => 'לחץ כאן כדי לאפס את הסיסמה שלך:',
     'rights_reserved' => 'All rights reserved.',
@@ -86,8 +90,10 @@ return [
     'upcoming-audits' => 'There is :count asset that is coming up for audit within :threshold days.|There are :count assets that are coming up for audit within :threshold days.',
     'user' => 'משתמש',
     'username' => 'שם משתמש',
+    'unaccepted_asset_reminder' => 'Reminder: You have Unaccepted Assets.',
     'welcome' => 'ברוכים הבאים: שם',
     'welcome_to' => 'ברוכים הבאים ל: אינטרנט!',
     'your_assets' => 'View Your Assets',
     'your_credentials' => 'שלך Snipe- IT אישורים',
+    'mail_sent' => 'Mail sent successfully!',
 ];
diff --git a/resources/lang/he-IL/validation.php b/resources/lang/he-IL/validation.php
index 9cca43938d..c6cb68d833 100644
--- a/resources/lang/he-IL/validation.php
+++ b/resources/lang/he-IL/validation.php
@@ -13,87 +13,150 @@ return [
     |
     */
 
-    'accepted'             => 'התכונה: חייבת להתקבל.',
-    'active_url'           => 'התכונה: אינה כתובת אתר חוקית.',
-    'after'                => 'התכונה: חייבת להיות תאריך לאחר: תאריך.',
-    'after_or_equal'       => 'התכונה: חייבת להיות תאריך אחרי או שווה ל: תאריך.',
-    'alpha'                => 'התכונה: יכולה להכיל רק אותיות.',
-    'alpha_dash'           => 'התכונה: עשויה להכיל רק אותיות, מספרים וקווים.',
-    'alpha_num'            => 'התכונה: עשויה להכיל רק אותיות ומספרים.',
-    'array'                => 'התכונה: חייבת להיות מערך.',
-    'before'               => 'התכונה: חייבת להיות תאריך לפני: תאריך.',
-    'before_or_equal'      => 'התכונה: חייבת להיות תאריך לפני או שווה ל: תאריך.',
-    'between'              => [
-        'numeric' => 'התכונה: חייבת להיות בין: min ו-: max.',
-        'file'    => 'התכונה: חייבת להיות בין: min ו-: max kilobytes.',
-        'string'  => 'התכונה: חייבת להיות בין: דקות ו-: תווים מקסימליים.',
-        'array'   => 'התכונה: חייבת להיות בין: min ו-: max items.',
+    'accepted' => 'The :attribute field must be accepted.',
+    'accepted_if' => 'The :attribute field must be accepted when :other is :value.',
+    'active_url' => 'The :attribute field must be a valid URL.',
+    'after' => 'The :attribute field must be a date after :date.',
+    'after_or_equal' => 'The :attribute field must be a date after or equal to :date.',
+    'alpha' => 'The :attribute field must only contain letters.',
+    'alpha_dash' => 'The :attribute field must only contain letters, numbers, dashes, and underscores.',
+    'alpha_num' => 'The :attribute field must only contain letters and numbers.',
+    'array' => 'The :attribute field must be an array.',
+    'ascii' => 'The :attribute field must only contain single-byte alphanumeric characters and symbols.',
+    'before' => 'The :attribute field must be a date before :date.',
+    'before_or_equal' => 'The :attribute field must be a date before or equal to :date.',
+    'between' => [
+        'array' => 'The :attribute field must have between :min and :max items.',
+        'file' => 'The :attribute field must be between :min and :max kilobytes.',
+        'numeric' => 'The :attribute field must be between :min and :max.',
+        'string' => 'The :attribute field must be between :min and :max characters.',
     ],
-    'boolean'              => 'שדה התכונה: חייב להיות אמיתי או שגוי.',
-    'confirmed'            => 'אישור התכונה אינו תואם.',
-    'date'                 => 'התכונה: אינה תאריך חוקי.',
-    'date_format'          => 'התכונה: אינה תואמת את הפורמט: format.',
-    'different'            => 'התכונה: ו-: אחרים חייבים להיות שונים.',
-    'digits'               => 'התכונה: חייבת להיות: ספרות ספרות.',
-    'digits_between'       => 'התכונה: חייבת להיות בין: דקות ו-: ספרות מקסימליות.',
-    'dimensions'           => 'לתכונה: יש ממדי תמונה לא חוקיים.',
-    'distinct'             => 'שדה התכונה: יש ערך כפול.',
-    'email'                => 'התכונה: חייבת להיות כתובת דוא"ל חוקית.',
-    'exists'               => 'התכונה שנבחרה: אינה חוקית.',
-    'file'                 => 'התכונה: חייבת להיות קובץ.',
-    'filled'               => 'שדה המאפיין חייב להיות בעל ערך.',
-    'image'                => 'התכונה: חייבת להיות תמונה.',
+    'boolean' => 'שדה :attribute חייב להיות אמת או שקר.',
+    'can' => 'The :attribute field contains an unauthorized value.',
+    'confirmed' => 'The :attribute field confirmation does not match.',
+    'contains' => 'The :attribute field is missing a required value.',
+    'current_password' => 'The password is incorrect.',
+    'date' => 'The :attribute field must be a valid date.',
+    'date_equals' => 'The :attribute field must be a date equal to :date.',
+    'date_format' => 'The :attribute field must match the format :format.',
+    'decimal' => 'The :attribute field must have :decimal decimal places.',
+    'declined' => 'The :attribute field must be declined.',
+    'declined_if' => 'The :attribute field must be declined when :other is :value.',
+    'different' => 'The :attribute field and :other must be different.',
+    'digits' => 'The :attribute field must be :digits digits.',
+    'digits_between' => 'The :attribute field must be between :min and :max digits.',
+    'dimensions' => 'The :attribute field has invalid image dimensions.',
+    'distinct' => 'שדה התכונה: יש ערך כפול.',
+    'doesnt_end_with' => 'The :attribute field must not end with one of the following: :values.',
+    'doesnt_start_with' => 'The :attribute field must not start with one of the following: :values.',
+    'email' => 'The :attribute field must be a valid email address.',
+    'ends_with' => 'The :attribute field must end with one of the following: :values.',
+    'enum' => 'התכונה שנבחרה: אינה חוקית.',
+    'exists' => 'התכונה שנבחרה: אינה חוקית.',
+    'extensions' => 'The :attribute field must have one of the following extensions: :values.',
+    'file' => 'The :attribute field must be a file.',
+    'filled' => 'שדה המאפיין חייב להיות בעל ערך.',
+    'gt' => [
+        'array' => 'The :attribute field must have more than :value items.',
+        'file' => 'The :attribute field must be greater than :value kilobytes.',
+        'numeric' => 'The :attribute field must be greater than :value.',
+        'string' => 'The :attribute field must be greater than :value characters.',
+    ],
+    'gte' => [
+        'array' => 'The :attribute field must have :value items or more.',
+        'file' => 'The :attribute field must be greater than or equal to :value kilobytes.',
+        'numeric' => 'The :attribute field must be greater than or equal to :value.',
+        'string' => 'The :attribute field must be greater than or equal to :value characters.',
+    ],
+    'hex_color' => 'The :attribute field must be a valid hexadecimal color.',
+    'image' => 'The :attribute field must be an image.',
     'import_field_empty'    => 'The value for :fieldname cannot be null.',
-    'in'                   => 'התכונה שנבחרה: אינה חוקית.',
-    'in_array'             => 'שדה התכונה: אינו קיים ב-: other.',
-    'integer'              => 'התכונה: חייבת להיות מספר שלם.',
-    'ip'                   => 'התכונה: חייבת להיות כתובת IP חוקית.',
-    'ipv4'                 => 'התכונה: חייבת להיות כתובת IPv4 חוקית.',
-    'ipv6'                 => 'התכונה: חייבת להיות כתובת IPv6 חוקית.',
-    'is_unique_department' => 'The :attribute must be unique to this Company Location',
-    'json'                 => 'התכונה: חייבת להיות מחרוזת JSON חוקית.',
-    'max'                  => [
-        'numeric' => 'התכונה: לא יכולה להיות גדולה מ: מקסימום.',
-        'file'    => 'התכונה: לא יכולה להיות גדולה מ: קילו-בתים מקסימליים.',
-        'string'  => 'התכונה: לא יכולה להיות גדולה מ: תווים מקסימליים.',
-        'array'   => 'לתכונה: אין יותר מ: פריטים מקסימליים.',
+    'in' => 'התכונה שנבחרה: אינה חוקית.',
+    'in_array' => 'The :attribute field must exist in :other.',
+    'integer' => 'The :attribute field must be an integer.',
+    'ip' => 'The :attribute field must be a valid IP address.',
+    'ipv4' => 'The :attribute field must be a valid IPv4 address.',
+    'ipv6' => 'The :attribute field must be a valid IPv6 address.',
+    'json' => 'The :attribute field must be a valid JSON string.',
+    'list' => 'The :attribute field must be a list.',
+    'lowercase' => 'The :attribute field must be lowercase.',
+    'lt' => [
+        'array' => 'The :attribute field must have less than :value items.',
+        'file' => 'The :attribute field must be less than :value kilobytes.',
+        'numeric' => 'The :attribute field must be less than :value.',
+        'string' => 'The :attribute field must be less than :value characters.',
     ],
-    'mimes'                => 'התכונה: חייבת להיות קובץ מסוג:: ערכים.',
-    'mimetypes'            => 'התכונה: חייבת להיות קובץ מסוג:: ערכים.',
-    'min'                  => [
-        'numeric' => 'התכונה: חייבת להיות לפחות: דקות.',
-        'file'    => 'התכונה: חייבת להיות לפחות: קילובייט מינימלי.',
-        'string'  => 'התכונה: חייבת להיות לפחות: דקות תווים.',
-        'array'   => 'התכונה: חייבת לכלול לפחות פריטים מינימליים.',
+    'lte' => [
+        'array' => 'The :attribute field must not have more than :value items.',
+        'file' => 'The :attribute field must be less than or equal to :value kilobytes.',
+        'numeric' => 'The :attribute field must be less than or equal to :value.',
+        'string' => 'The :attribute field must be less than or equal to :value characters.',
     ],
-    'starts_with'          => 'השדה חייב להכיל לפחות אחד מהערכים הבאים.',
-    'ends_with'            => 'The :attribute must end with one of the following: :values.',
+    'mac_address' => 'The :attribute field must be a valid MAC address.',
+    'max' => [
+        'array' => 'The :attribute field must not have more than :max items.',
+        'file' => 'The :attribute field must not be greater than :max kilobytes.',
+        'numeric' => 'The :attribute field must not be greater than :max.',
+        'string' => 'The :attribute field must not be greater than :max characters.',
+    ],
+    'max_digits' => 'The :attribute field must not have more than :max digits.',
+    'mimes' => 'The :attribute field must be a file of type: :values.',
+    'mimetypes' => 'The :attribute field must be a file of type: :values.',
+    'min' => [
+        'array' => 'The :attribute field must have at least :min items.',
+        'file' => 'The :attribute field must be at least :min kilobytes.',
+        'numeric' => 'The :attribute field must be at least :min.',
+        'string' => 'The :attribute field must be at least :min characters.',
+    ],
+    'min_digits' => 'The :attribute field must have at least :min digits.',
+    'missing' => 'The :attribute field must be missing.',
+    'missing_if' => 'The :attribute field must be missing when :other is :value.',
+    'missing_unless' => 'The :attribute field must be missing unless :other is :value.',
+    'missing_with' => 'The :attribute field must be missing when :values is present.',
+    'missing_with_all' => 'The :attribute field must be missing when :values are present.',
+    'multiple_of' => 'The :attribute field must be a multiple of :value.',
+    'not_in' => 'התכונה שנבחרה: אינה חוקית.',
+    'not_regex' => 'The :attribute field format is invalid.',
+    'numeric' => 'The :attribute field must be a number.',
+    'password' => [
+        'letters' => 'The :attribute field must contain at least one letter.',
+        'mixed' => 'The :attribute field must contain at least one uppercase and one lowercase letter.',
+        'numbers' => 'The :attribute field must contain at least one number.',
+        'symbols' => 'The :attribute field must contain at least one symbol.',
+        'uncompromised' => 'The given :attribute has appeared in a data leak. Please choose a different :attribute.',
+    ],
+    'percent'       => 'The depreciation minimum must be between 0 and 100 when depreciation type is percentage.',
 
-    'not_in'               => 'התכונה שנבחרה: אינה חוקית.',
-    'numeric'              => 'התכונה: חייבת להיות מספר.',
-    'present'              => 'שדה התכונה: חייב להיות נוכח.',
-    'valid_regex'          => 'הקלט לא חוקי. ',
-    'regex'                => 'תבנית התכונה: אינה חוקית.',
-    'required'             => 'שדה התכונה: נדרש.',
-    'required_if'          => 'שדה התכונה: נדרש כאשר: other is: value.',
-    'required_unless'      => 'שדה התכונה: נדרש, אלא אם: אחרים נמצאים ב: ערכים.',
-    'required_with'        => 'שדה התכונה: נדרש כאשר: ערכים קיימים.',
-    'required_with_all'    => 'שדה התכונה: נדרש כאשר: ערכים קיימים.',
-    'required_without'     => 'שדה התכונה: נדרש כאשר: ערכים לא קיימים.',
+    'present' => 'שדה התכונה: חייב להיות נוכח.',
+    'present_if' => 'The :attribute field must be present when :other is :value.',
+    'present_unless' => 'The :attribute field must be present unless :other is :value.',
+    'present_with' => 'The :attribute field must be present when :values is present.',
+    'present_with_all' => 'The :attribute field must be present when :values are present.',
+    'prohibited' => 'The :attribute field is prohibited.',
+    'prohibited_if' => 'The :attribute field is prohibited when :other is :value.',
+    'prohibited_unless' => 'The :attribute field is prohibited unless :other is in :values.',
+    'prohibits' => 'The :attribute field prohibits :other from being present.',
+    'regex' => 'The :attribute field format is invalid.',
+    'required' => 'שדה התכונה: נדרש.',
+    'required_array_keys' => 'The :attribute field must contain entries for: :values.',
+    'required_if' => 'שדה התכונה: נדרש כאשר: other is: value.',
+    'required_if_accepted' => 'The :attribute field is required when :other is accepted.',
+    'required_if_declined' => 'The :attribute field is required when :other is declined.',
+    'required_unless' => 'שדה התכונה: נדרש, אלא אם: אחרים נמצאים ב: ערכים.',
+    'required_with' => 'שדה התכונה: נדרש כאשר: ערכים קיימים.',
+    'required_with_all' => 'The :attribute field is required when :values are present.',
+    'required_without' => 'שדה התכונה: נדרש כאשר: ערכים לא קיימים.',
     'required_without_all' => 'שדה התכונה: נדרש כאשר אף אחד מערכים אלה אינו קיים.',
-    'same'                 => 'התכונה: ו-: אחרים חייבים להתאים.',
-    'size'                 => [
-        'numeric' => 'התכונה: חייבת להיות: גודל.',
-        'file'    => 'התכונה: חייבת להיות: גודל קילובייט.',
-        'string'  => 'התכונה: חייבת להיות: גודל תווים.',
-        'array'   => 'התכונה: חייבת להכיל: פריטי גודל.',
+    'same' => 'The :attribute field must match :other.',
+    'size' => [
+        'array' => 'The :attribute field must contain :size items.',
+        'file' => 'The :attribute field must be :size kilobytes.',
+        'numeric' => 'The :attribute field must be :size.',
+        'string' => 'The :attribute field must be :size characters.',
     ],
+    'starts_with' => 'The :attribute field must start with one of the following: :values.',
     'string'               => 'התכונה: חייבת להיות מחרוזת.',
-    'timezone'             => 'התכונה: חייבת להיות אזור חוקי.',
     'two_column_unique_undeleted' => 'The :attribute must be unique across :table1 and :table2. ',
-    'unique'               => 'התכונה: כבר נלקחה.',
-    'uploaded'             => 'התכונה: נכשלה.',
-    'url'                  => 'תבנית התכונה: אינה חוקית.',
     'unique_undeleted'     => 'השדה חייב מזהה יחודי.',
     'non_circular'         => 'The :attribute must not create a circular reference.',
     'not_array'            => ':attribute cannot be an array.',
@@ -102,11 +165,14 @@ return [
     'numbers'              => 'Password must contain at least one number.',
     'case_diff'            => 'Password must use mixed case.',
     'symbols'              => 'Password must contain symbols.',
-    'gte'                  => [
-        'numeric'          => 'הערך לא יכול להיות שלילי'
-    ],
-    'checkboxes'           => ':attribute contains invalid options.',
-    'radio_buttons'        => ':attribute is invalid.',
+    'timezone' => 'The :attribute field must be a valid timezone.',
+    'unique' => 'התכונה: כבר נלקחה.',
+    'uploaded' => 'התכונה: נכשלה.',
+    'uppercase' => 'The :attribute field must be uppercase.',
+    'url' => 'The :attribute field must be a valid URL.',
+    'ulid' => 'The :attribute field must be a valid ULID.',
+    'uuid' => 'The :attribute field must be a valid UUID.',
+    'fmcs_location' => 'Full multiple company support and location scoping is enabled in the Admin Settings, and the selected location and selected company are not compatible.',
 
 
     /*
@@ -120,16 +186,22 @@ return [
     |
     */
 
+    'email_array'      => 'כתובת אימייל אחת או יותר אינה חוקית.',
+    'checkboxes'           => ':attribute contains invalid options.',
+    'radio_buttons'        => ':attribute is invalid.',
+    
     'custom' => [
         'alpha_space' => 'השדה: מאפיין מכיל תו שאינו מותר.',
-        'email_array'      => 'כתובת אימייל אחת או יותר אינה חוקית.',
+
         'hashed_pass'      => 'הסיסמה הנוכחית שלך שגויה',
         'dumbpwd'          => 'סיסמה זו נפוצה מדי.',
         'statuslabel_type' => 'עליך לבחור סוג תווית סטטוס חוקי',
+        'custom_field_not_found'          => 'This field does not seem to exist, please double check your custom field names.',
+        'custom_field_not_found_on_model' => 'This field seems to exist, but is not available on this Asset Model\'s fieldset.',
 
         // date_format validation with slightly less stupid messages. It duplicates a lot, but it gets the job done :(
-        // We use this because the default error message for date_format is reflects php Y-m-d, which non-PHP
-        // people won't know how to format. 
+        // We use this because the default error message for date_format reflects php Y-m-d, which non-PHP
+        // people won't know how to format.
         'purchase_date.date_format'     => 'The :attribute must be a valid date in YYYY-MM-DD format',
         'last_audit_date.date_format'   =>  'The :attribute must be a valid date in YYYY-MM-DD hh:mm:ss format',
         'expiration_date.date_format'   =>  'The :attribute must be a valid date in YYYY-MM-DD format',
@@ -137,9 +209,15 @@ return [
         'expected_checkin.date_format'  =>  'The :attribute must be a valid date in YYYY-MM-DD format',
         'start_date.date_format'        =>  'The :attribute must be a valid date in YYYY-MM-DD format',
         'end_date.date_format'          =>  'The :attribute must be a valid date in YYYY-MM-DD format',
+        'invalid_value_in_field' => 'Invalid value included in this field',
 
-    ],
+        'ldap_username_field' => [
+            'not_in' =>         '<code>sAMAccountName</code> (mixed case) will likely not work. You should use <code>samaccountname</code> (lowercase) instead.'
+        ],
+        'ldap_auth_filter_query' => ['not_in' => '<code>uid=samaccountname</code> is probably not a valid auth filter. You probably want <code>uid=</code> '],
+        'ldap_filter' => ['regex' => 'This value should probably not be wrapped in parentheses.'],
 
+        ],
     /*
     |--------------------------------------------------------------------------
     | Custom Validation Attributes
@@ -155,8 +233,16 @@ return [
 
     /*
     |--------------------------------------------------------------------------
-    | Generic Validation Messages
+    | Generic Validation Messages - we use these in the jquery validation where we don't have
+    | access to the :attribute
     |--------------------------------------------------------------------------
     */
-    'invalid_value_in_field' => 'Invalid value included in this field',
+
+    'generic' => [
+        'invalid_value_in_field' => 'Invalid value included in this field',
+        'required' => 'This field is required',
+        'email' => 'Please enter a valid email address',
+    ],
+
+
 ];
diff --git a/resources/lang/hi-IN/account/general.php b/resources/lang/hi-IN/account/general.php
new file mode 100644
index 0000000000..7f9e2f848e
--- /dev/null
+++ b/resources/lang/hi-IN/account/general.php
@@ -0,0 +1,17 @@
+<?php
+
+return array(
+    'personal_api_keys' => 'Personal API Keys',
+    'personal_access_token' => 'Personal Access Token',
+    'personal_api_keys_success' => 'Personal API Key :key created sucessfully',
+    'here_is_api_key' => 'Here is your new personal access token. This is the only time it will be shown so do not lose it! You may now use this token to make API requests.',
+    'api_key_warning' => 'When generating an API token, be sure to copy it down immediately as they will not be visible to you again.',
+    'api_base_url' => 'Your API base url is located at:',
+    'api_base_url_endpoint' => '/&lt;endpoint&gt;',
+    'api_token_expiration_time' => 'API tokens are set to expire in:',
+    'api_reference' => 'Please check the <a href="https://snipe-it.readme.io/reference" target="_blank">API reference</a> to find specific API endpoints and additional API documentation.',
+    'profile_updated' => 'Account successfully updated',
+    'no_tokens' => 'You have not created any personal access tokens.',
+    'enable_sounds' => 'Enable sound effects',
+    'enable_confetti' => 'Enable confetti effects',
+);
diff --git a/resources/lang/hi-IN/admin/accessories/general.php b/resources/lang/hi-IN/admin/accessories/general.php
new file mode 100644
index 0000000000..bed7f38fab
--- /dev/null
+++ b/resources/lang/hi-IN/admin/accessories/general.php
@@ -0,0 +1,22 @@
+<?php
+
+return array(
+    'accessory_category' 				=> 'Accessory Category',
+    'accessory_name'  					=> 'Accessory Name',
+    'checkout'  							=> 'Checkout Accessory',
+    'checkin'  							=> 'Checkin Accessory',
+    'create'  							=> 'Create Accessory',
+    'edit'  							=> 'Edit Accessory',
+    'eula_text'							=> 'Category EULA',
+    'eula_text_help'					=> 'This field allows you to customize your EULAs for specific types of assets. If you only have one EULA for all of your assets, you can check the box below to use the primary default.',
+    'require_acceptance'				=> 'Require users to confirm acceptance of assets in this category.',
+    'no_default_eula'					=> 'No primary default EULA found. Add one in Settings.',
+    'total'  							=> 'Total',
+    'remaining'  						=> 'Avail',
+    'update'  							=> 'Update Accessory',
+    'use_default_eula'					=> 'Use the <a href="#" data-toggle="modal" data-target="#eulaModal">primary default EULA</a> instead.',
+    'use_default_eula_disabled'			=> '<del>Use the primary default EULA instead.</del> No primary default EULA is set. Please add one in Settings.',
+    'clone'                             => 'Clone Accessory',
+    'delete_disabled'                   => 'This accessory cannot be deleted yet because some items are still checked out.',
+
+);
diff --git a/resources/lang/hi-IN/admin/accessories/message.php b/resources/lang/hi-IN/admin/accessories/message.php
new file mode 100644
index 0000000000..f60d41957b
--- /dev/null
+++ b/resources/lang/hi-IN/admin/accessories/message.php
@@ -0,0 +1,43 @@
+<?php
+
+return array(
+
+    'does_not_exist' => 'The accessory [:id] does not exist.',
+    'not_found' => 'That accessory was not found.',
+    'assoc_users'	 => 'This accessory currently has :count items checked out to users. Please check in the accessories and and try again. ',
+
+    'create' => array(
+        'error'   => 'The accessory was not created, please try again.',
+        'success' => 'The accessory was successfully created.'
+    ),
+
+    'update' => array(
+        'error'   => 'The accessory was not updated, please try again',
+        'success' => 'The accessory was updated successfully.'
+    ),
+
+    'delete' => array(
+        'confirm'   => 'Are you sure you wish to delete this accessory?',
+        'error'   => 'There was an issue deleting the accessory. Please try again.',
+        'success' => 'The accessory was deleted successfully.'
+    ),
+
+     'checkout' => array(
+        'error'   		=> 'Accessory was not checked out, please try again',
+        'success' 		=> 'Accessory checked out successfully.',
+        'unavailable'   => 'Accessory is not available for checkout. Check quantity available',
+        'user_does_not_exist' => 'That user is invalid. Please try again.',
+         'checkout_qty' => array(
+            'lte'  => 'There is currently only one available accessory of this type, and you are trying to check out :checkout_qty. Please adjust the checkout quantity or the total stock of this accessory and try again.|There are :number_currently_remaining total available accessories, and you are trying to check out :checkout_qty. Please adjust the checkout quantity or the total stock of this accessory and try again.',
+            ),
+           
+    ),
+
+    'checkin' => array(
+        'error'   		=> 'Accessory was not checked in, please try again',
+        'success' 		=> 'Accessory checked in successfully.',
+        'user_does_not_exist' => 'That user is invalid. Please try again.'
+    )
+
+
+);
diff --git a/resources/lang/hi-IN/admin/accessories/table.php b/resources/lang/hi-IN/admin/accessories/table.php
new file mode 100644
index 0000000000..80df687161
--- /dev/null
+++ b/resources/lang/hi-IN/admin/accessories/table.php
@@ -0,0 +1,9 @@
+<?php
+
+return array(
+	'dl_csv'      				=> 'Download CSV',
+	'eula_text'      			=> 'EULA',
+    'id'      					=> 'ID',
+    'require_acceptance'      	=> 'Acceptance',
+    'title'      				=> 'Accessory Name',
+);
diff --git a/resources/lang/hi-IN/admin/asset_maintenances/form.php b/resources/lang/hi-IN/admin/asset_maintenances/form.php
new file mode 100644
index 0000000000..785d06b08f
--- /dev/null
+++ b/resources/lang/hi-IN/admin/asset_maintenances/form.php
@@ -0,0 +1,14 @@
+<?php
+
+    return [
+        'asset_maintenance_type' => 'Asset Maintenance Type',
+        'title'                  => 'Title',
+        'start_date'             => 'Start Date',
+        'completion_date'        => 'Completion Date',
+        'cost'                   => 'Cost',
+        'is_warranty'            => 'Warranty Improvement',
+        'asset_maintenance_time' => 'Asset Maintenance Time (in days)',
+        'notes'                  => 'Notes',
+        'update'                 => 'Update Asset Maintenance',
+        'create'                 => 'Create Asset Maintenance'
+    ];
diff --git a/resources/lang/hi-IN/admin/asset_maintenances/general.php b/resources/lang/hi-IN/admin/asset_maintenances/general.php
new file mode 100644
index 0000000000..0f9a4547a2
--- /dev/null
+++ b/resources/lang/hi-IN/admin/asset_maintenances/general.php
@@ -0,0 +1,16 @@
+<?php
+
+    return [
+        'asset_maintenances' => 'Asset Maintenances',
+        'edit'               => 'Edit Asset Maintenance',
+        'delete'             => 'Delete Asset Maintenance',
+        'view'               => 'View Asset Maintenance Details',
+        'repair'             => 'Repair',
+        'maintenance'        => 'Maintenance',
+        'upgrade'            => 'Upgrade',
+        'calibration'        => 'Calibration',
+        'software_support'   => 'Software Support',
+        'hardware_support'   => 'Hardware Support',
+        'configuration_change'   => 'Configuration Change',
+        'pat_test'           => 'PAT Test',
+    ];
diff --git a/resources/lang/hi-IN/admin/asset_maintenances/message.php b/resources/lang/hi-IN/admin/asset_maintenances/message.php
new file mode 100644
index 0000000000..b44f618207
--- /dev/null
+++ b/resources/lang/hi-IN/admin/asset_maintenances/message.php
@@ -0,0 +1,21 @@
+<?php
+
+    return [
+        'not_found'                    => 'Asset Maintenance you were looking for was not found!',
+        'delete'                       => [
+            'confirm' => 'Are you sure you wish to delete this asset maintenance?',
+            'error'   => 'There was an issue deleting the asset maintenance. Please try again.',
+            'success' => 'The asset maintenance was deleted successfully.',
+        ],
+        'create'                       => [
+            'error'   => 'Asset Maintenance was not created, please try again.',
+            'success' => 'Asset Maintenance created successfully.',
+        ],
+        'edit'                       => [
+            'error'   => 'Asset Maintenance was not edited, please try again.',
+            'success' => 'Asset Maintenance edited successfully.',
+        ],
+        'asset_maintenance_incomplete' => 'Not Completed Yet',
+        'warranty'                     => 'Warranty',
+        'not_warranty'                 => 'Not Warranty',
+    ];
diff --git a/resources/lang/hi-IN/admin/asset_maintenances/table.php b/resources/lang/hi-IN/admin/asset_maintenances/table.php
new file mode 100644
index 0000000000..3ba895038d
--- /dev/null
+++ b/resources/lang/hi-IN/admin/asset_maintenances/table.php
@@ -0,0 +1,8 @@
+<?php
+
+    return [
+        'title'         => 'Asset Maintenance',
+        'asset_name'    => 'Asset Name',
+        'is_warranty'   => 'Warranty',
+        'dl_csv'        => 'Download CSV',
+    ];
diff --git a/resources/lang/hi-IN/admin/categories/general.php b/resources/lang/hi-IN/admin/categories/general.php
new file mode 100644
index 0000000000..2fe448b44e
--- /dev/null
+++ b/resources/lang/hi-IN/admin/categories/general.php
@@ -0,0 +1,25 @@
+<?php
+
+return array(
+    'asset_categories' 					=> 'Asset Categories',
+    'category_name'  					=> 'Category Name',
+    'checkin_email'                     => 'Send email to user on checkin/checkout.',
+    'checkin_email_notification'        => 'This user will be sent an email on checkin/checkout.',
+    'clone'                             => 'Clone Category',
+    'create'  							=> 'Create Category',
+    'edit'                              => 'Edit Category',
+    'email_will_be_sent_due_to_global_eula' => 'An email will be sent to the user because the global EULA is being used.',
+    'email_will_be_sent_due_to_category_eula' => 'An email will be sent to the user because a EULA is set for this category.',
+    'eula_text'							=> 'Category EULA',
+    'eula_text_help'					=> 'This field allows you to customize your EULAs for specific types of assets. If you only have one EULA for all of your assets, you can check the box below to use the primary default.',
+    'name'                              => 'Category Name',
+    'require_acceptance'				=> 'Require users to confirm acceptance of assets in this category.',
+    'required_acceptance'				=> 'This user will be emailed with a link to confirm acceptance of this item.',
+    'required_eula'						=> 'This user will be emailed a copy of the EULA',
+    'no_default_eula'					=> 'No primary default EULA found. Add one in Settings.',
+    'update'  							=> 'Update Category',
+    'use_default_eula'					=> 'Use the <a href="#" data-toggle="modal" data-target="#eulaModal">primary default EULA</a> instead.',
+    'use_default_eula_disabled'			=> '<del>Use the primary default EULA instead.</del> No primary default EULA is set. Please add one in Settings.',
+    'use_default_eula_column'			=> 'Use default EULA',
+
+);
diff --git a/resources/lang/hi-IN/admin/categories/message.php b/resources/lang/hi-IN/admin/categories/message.php
new file mode 100644
index 0000000000..4e493f68b6
--- /dev/null
+++ b/resources/lang/hi-IN/admin/categories/message.php
@@ -0,0 +1,26 @@
+<?php
+
+return array(
+
+    'does_not_exist' => 'Category does not exist.',
+    'assoc_models'	 => 'This category is currently associated with at least one model and cannot be deleted. Please update your models to no longer reference this category and try again. ',
+    'assoc_items'	 => 'This category is currently associated with at least one :asset_type and cannot be deleted. Please update your :asset_type  to no longer reference this category and try again. ',
+
+    'create' => array(
+        'error'   => 'Category was not created, please try again.',
+        'success' => 'Category created successfully.'
+    ),
+
+    'update' => array(
+        'error'   => 'Category was not updated, please try again',
+        'success' => 'Category updated successfully.',
+        'cannot_change_category_type'   => 'You cannot change the category type once it has been created',
+    ),
+
+    'delete' => array(
+        'confirm'   => 'Are you sure you wish to delete this category?',
+        'error'   => 'There was an issue deleting the category. Please try again.',
+        'success' => 'The category was deleted successfully.'
+    )
+
+);
diff --git a/resources/lang/hi-IN/admin/categories/table.php b/resources/lang/hi-IN/admin/categories/table.php
new file mode 100644
index 0000000000..a3ee96ae7f
--- /dev/null
+++ b/resources/lang/hi-IN/admin/categories/table.php
@@ -0,0 +1,10 @@
+<?php
+
+return array(
+	'eula_text'      			=> 'EULA',
+    'id'      					=> 'ID',
+    'parent'   					=> 'Parent',
+    'require_acceptance'      	=> 'Acceptance',
+    'title'      				=> 'Asset Category Name',
+
+);
diff --git a/resources/lang/hi-IN/admin/companies/general.php b/resources/lang/hi-IN/admin/companies/general.php
new file mode 100644
index 0000000000..37781012ba
--- /dev/null
+++ b/resources/lang/hi-IN/admin/companies/general.php
@@ -0,0 +1,7 @@
+<?php
+
+return [
+    'select_company' => 'Select Company',
+    'about_companies' => 'About Companies',
+    'about_companies_description' => '        You can use companies as a simple informative field, or you can use them to restrict asset visibility and availability to users with a specific company by enabling Full Company Support in your Admin Settings.',
+];
diff --git a/resources/lang/hi-IN/admin/companies/message.php b/resources/lang/hi-IN/admin/companies/message.php
new file mode 100644
index 0000000000..e440b7ac5f
--- /dev/null
+++ b/resources/lang/hi-IN/admin/companies/message.php
@@ -0,0 +1,20 @@
+<?php
+
+return [
+    'does_not_exist' => 'Company does not exist.',
+    'deleted'        => 'Deleted company',
+    'assoc_users'    => 'This company is currently associated with at least one model and cannot be deleted. Please update your models to no longer reference this company and try again. ',
+    'create' => [
+        'error'   => 'Company was not created, please try again.',
+        'success' => 'Company created successfully.',
+    ],
+    'update' => [
+        'error'   => 'Company was not updated, please try again',
+        'success' => 'Company updated successfully.',
+    ],
+    'delete' => [
+        'confirm' => 'Are you sure you wish to delete this company?',
+        'error'   => 'There was an issue deleting the company. Please try again.',
+        'success' => 'The Company was deleted successfully.',
+    ],
+];
diff --git a/resources/lang/hi-IN/admin/companies/table.php b/resources/lang/hi-IN/admin/companies/table.php
new file mode 100644
index 0000000000..100b258240
--- /dev/null
+++ b/resources/lang/hi-IN/admin/companies/table.php
@@ -0,0 +1,11 @@
+<?php
+return array(
+    'companies' => 'Companies',
+    'create'    => 'Create Company',
+    'email'     => 'Company Email',
+    'title'     => 'Company',
+    'phone'     => 'Company Phone',
+    'update'    => 'Update Company',
+    'name'      => 'Company Name',
+    'id'        => 'ID',
+);
diff --git a/resources/lang/hi-IN/admin/components/general.php b/resources/lang/hi-IN/admin/components/general.php
new file mode 100644
index 0000000000..5b788a51ec
--- /dev/null
+++ b/resources/lang/hi-IN/admin/components/general.php
@@ -0,0 +1,16 @@
+<?php
+
+return array(
+    'component_name'                  => 'Component Name',
+    'checkin'                             => 'Checkin Component',
+    'checkout'                             => 'Checkout Component',
+    'cost'				=> 'Purchase Cost',
+    'create'                             => 'Create Component',
+    'edit'                             => 'Edit Component',
+    'date'					=> 'Purchase Date',
+    'order'					=> 'Order Number',
+    'remaining' 			             => 'Remaining',
+    'total' 			                 => 'Total',
+    'update'                            => 'Update Component',
+    'checkin_limit'            => 'Amount checked in must be equal to or less than :assigned_qty'
+);
diff --git a/resources/lang/hi-IN/admin/components/message.php b/resources/lang/hi-IN/admin/components/message.php
new file mode 100644
index 0000000000..ec39dc4178
--- /dev/null
+++ b/resources/lang/hi-IN/admin/components/message.php
@@ -0,0 +1,38 @@
+<?php
+
+return array(
+
+    'does_not_exist' => 'Component does not exist.',
+
+    'create' => array(
+        'error'   => 'Component was not created, please try again.',
+        'success' => 'Component created successfully.'
+    ),
+
+    'update' => array(
+        'error'   => 'Component was not updated, please try again',
+        'success' => 'Component updated successfully.'
+    ),
+
+    'delete' => array(
+        'confirm'   => 'Are you sure you wish to delete this component?',
+        'error'   => 'There was an issue deleting the component. Please try again.',
+        'success' => 'The component was deleted successfully.',
+        'error_qty'   => 'Some components of this type are still checked out. Please check them in and try again.',
+    ),
+
+     'checkout' => array(
+        'error'   		=> 'Component was not checked out, please try again',
+        'success' 		=> 'Component checked out successfully.',
+        'user_does_not_exist' => 'That user is invalid. Please try again.',
+        'unavailable'      => 'Not enough components remaining: :remaining remaining, :requested requested ',
+    ),
+
+    'checkin' => array(
+        'error'   		=> 'Component was not checked in, please try again',
+        'success' 		=> 'Component checked in successfully.',
+        'user_does_not_exist' => 'That user is invalid. Please try again.'
+    )
+
+
+);
diff --git a/resources/lang/hi-IN/admin/components/table.php b/resources/lang/hi-IN/admin/components/table.php
new file mode 100644
index 0000000000..3d4fed6a7f
--- /dev/null
+++ b/resources/lang/hi-IN/admin/components/table.php
@@ -0,0 +1,5 @@
+<?php
+
+return array(
+    'title'      				=> 'Component Name',
+);
diff --git a/resources/lang/hi-IN/admin/consumables/general.php b/resources/lang/hi-IN/admin/consumables/general.php
new file mode 100644
index 0000000000..29acfedc1b
--- /dev/null
+++ b/resources/lang/hi-IN/admin/consumables/general.php
@@ -0,0 +1,12 @@
+<?php
+
+return array(
+    'checkout'                          => 'Checkout Consumable to User',
+    'consumable_name'                   => 'Consumable Name',
+    'create'                            => 'Create Consumable',
+    'item_no'                           => 'Item No.',
+    'remaining' 			            => 'Remaining',
+    'total' 			                => 'Total',
+    'update'                            => 'Update Consumable',
+    'inventory_warning'                 => 'The inventory of this consumable is below the minimum amount of :min_count',
+);
diff --git a/resources/lang/hi-IN/admin/consumables/message.php b/resources/lang/hi-IN/admin/consumables/message.php
new file mode 100644
index 0000000000..e2591503bf
--- /dev/null
+++ b/resources/lang/hi-IN/admin/consumables/message.php
@@ -0,0 +1,38 @@
+<?php
+
+return array(
+
+    'invalid_category_type' => 'The category must be a consumable category.',
+    'does_not_exist' => 'Consumable does not exist.',
+
+    'create' => array(
+        'error'   => 'Consumable was not created, please try again.',
+        'success' => 'Consumable created successfully.'
+    ),
+
+    'update' => array(
+        'error'   => 'Consumable was not updated, please try again',
+        'success' => 'Consumable updated successfully.'
+    ),
+
+    'delete' => array(
+        'confirm'   => 'Are you sure you wish to delete this consumable?',
+        'error'   => 'There was an issue deleting the consumable. Please try again.',
+        'success' => 'The consumable was deleted successfully.'
+    ),
+
+     'checkout' => array(
+        'error'   		=> 'Consumable was not checked out, please try again',
+        'success' 		=> 'Consumable checked out successfully.',
+        'user_does_not_exist' => 'That user is invalid. Please try again.',
+         'unavailable'      => 'There are not enough consumables for this checkout. Please check the quantity left. ',
+    ),
+
+    'checkin' => array(
+        'error'   		=> 'Consumable was not checked in, please try again',
+        'success' 		=> 'Consumable checked in successfully.',
+        'user_does_not_exist' => 'That user is invalid. Please try again.'
+    )
+
+
+);
diff --git a/resources/lang/hi-IN/admin/consumables/table.php b/resources/lang/hi-IN/admin/consumables/table.php
new file mode 100644
index 0000000000..bb76721f17
--- /dev/null
+++ b/resources/lang/hi-IN/admin/consumables/table.php
@@ -0,0 +1,5 @@
+<?php
+
+return array(
+    'title'      				=> 'Consumable Name',
+);
diff --git a/resources/lang/hi-IN/admin/custom_fields/general.php b/resources/lang/hi-IN/admin/custom_fields/general.php
new file mode 100644
index 0000000000..c9ae61c963
--- /dev/null
+++ b/resources/lang/hi-IN/admin/custom_fields/general.php
@@ -0,0 +1,64 @@
+<?php
+
+return [
+    'custom_fields'		        => 'Custom Fields',
+    'manage'                    => 'Manage',
+    'field'		                => 'Field',
+    'about_fieldsets_title'		=> 'About Fieldsets',
+    'about_fieldsets_text'		=> 'Fieldsets allow you to create groups of custom fields that are frequently re-used for specific asset model types.',
+    'custom_format'             => 'Custom Regex format...',
+    'encrypt_field'      	        => 'Encrypt the value of this field in the database',
+    'encrypt_field_help'      => 'WARNING: Encrypting a field makes it unsearchable.',
+    'encrypted'      	        => 'Encrypted',
+    'fieldset'      	        => 'Fieldset',
+    'qty_fields'      	      => 'Qty Fields',
+    'fieldsets'      	        => 'Fieldsets',
+    'fieldset_name'           => 'Fieldset Name',
+    'field_name'              => 'Field Name',
+    'field_values'            => 'Field Values',
+    'field_values_help'       => 'Add selectable options, one per line. Blank lines other than the first line will be ignored.',
+    'field_element'           => 'Form Element',
+    'field_element_short'     => 'Element',
+    'field_format'            => 'Format',
+    'field_custom_format'     => 'Custom Regex Format',
+    'field_custom_format_help'     => 'This field allows you to use a regex expression for validation. It should start with "regex:" - for example, to validate that a custom field value contains a valid IMEI (15 numeric digits), you would use <code>regex:/^[0-9]{15}$/</code>.',
+    'required'   		          => 'Required',
+    'req'   		              => 'Req.',
+    'used_by_models'   		    => 'Used By Models',
+    'order'   		            => 'Order',
+    'create_fieldset'         => 'New Fieldset',
+    'update_fieldset'         => 'Update Fieldset',
+    'fieldset_does_not_exist'   => 'Fieldset :id does not exist',
+    'fieldset_updated'         => 'Fieldset updated',
+    'create_fieldset_title' => 'Create a new fieldset',
+    'create_field'            => 'New Custom Field',
+    'create_field_title' => 'Create a new custom field',
+    'value_encrypted'      	        => 'The value of this field is encrypted in the database. Only admin users will be able to view the decrypted value',
+    'show_in_email'     => 'Include the value of this field in checkout emails sent to the user? Encrypted fields cannot be included in emails',
+    'show_in_email_short' => 'Include in emails',
+    'help_text' => 'Help Text',
+    'help_text_description' => 'This is optional text that will appear below the form elements while editing an asset to provide context on the field.',
+    'about_custom_fields_title' => 'About Custom Fields',
+    'about_custom_fields_text' => 'Custom fields allow you to add arbitrary attributes to assets.',
+    'add_field_to_fieldset' => 'Add Field to Fieldset',
+    'make_optional' => 'Required - click to make optional',
+    'make_required' => 'Optional - click to make required',
+    'reorder' => 'Reorder',
+    'db_field' => 'DB Field',
+    'db_convert_warning' => 'WARNING. This field is in the custom fields table as <code>:db_column</code> but should be <code>:expected</code>.',
+    'is_unique' => 'This value must be unique across all assets',
+    'unique' => 'Unique',
+    'display_in_user_view' => 'Allow the checked out user to view these values in their View Assigned Assets page',
+    'display_in_user_view_table' => 'Visible to User',
+    'auto_add_to_fieldsets' => 'Automatically add this to every new fieldset',
+    'add_to_preexisting_fieldsets' => 'Add to any existing fieldsets',
+    'show_in_listview' => 'Show in list views by default. Authorized users will still be able to show/hide via the column selector',
+    'show_in_listview_short' => 'Show in lists',
+    'show_in_requestable_list_short' => 'Show in requestable assets list',
+    'show_in_requestable_list' => 'Show value in requestable assets list. Encrypted fields will not be shown',
+    'encrypted_options' => 'This field is encrypted, so some display options will not be available.',
+    'display_checkin' => 'Display in checkin forms',
+    'display_checkout' => 'Display in checkout forms',
+    'display_audit' => 'Display in audit forms',
+
+];
diff --git a/resources/lang/hi-IN/admin/custom_fields/message.php b/resources/lang/hi-IN/admin/custom_fields/message.php
new file mode 100644
index 0000000000..6442359b7f
--- /dev/null
+++ b/resources/lang/hi-IN/admin/custom_fields/message.php
@@ -0,0 +1,64 @@
+<?php
+
+return array(
+
+    'field' => array(
+        'invalid'   => 'That field does not exist.',
+        'already_added'   => 'Field already added',
+        'none_selected'   => 'No field selected',
+
+        'create' => array(
+            'error'   => 'Field was not created, please try again.',
+            'success' => 'Field created successfully.',
+            'assoc_success' => 'Field successfully added to fieldset.'
+        ),
+
+        'update' => array(
+            'error'   => 'Field was not updated, please try again',
+            'success' => 'Field updated successfully.'
+        ),
+
+        'delete' => array(
+            'confirm'   	=> 'Are you sure you wish to delete this field?',
+            'error'   => 'There was an issue deleting the field. Please try again.',
+            'success' => 'The field was deleted successfully.',
+            'in_use'   => 'Field is still in use.',
+        )
+
+    ),
+
+    'fieldset' => array(
+
+        'does_not_exist' => 'Fieldset does not exist',
+
+        'create' => array(
+            'error'   => 'Fieldset was not created, please try again.',
+            'success' => 'Fieldset created successfully.'
+        ),
+
+        'update' => array(
+            'error'   => 'Fieldset was not updated, please try again',
+            'success' => 'Fieldset updated successfully.'
+        ),
+
+        'delete' => array(
+            'confirm'   	=> 'Are you sure you wish to delete this fieldset?',
+            'error'   => 'There was an issue deleting the fieldset. Please try again.',
+            'success' => 'The fieldset was deleted successfully.',
+            'in_use'   => 'Fieldset is still in use.',
+        )
+
+    ),
+
+    'fieldset_default_value' => array(
+
+        'error' => 'Error validating default fieldset values.',
+
+    ),
+
+
+
+
+
+
+);
diff --git a/resources/lang/hi-IN/admin/departments/message.php b/resources/lang/hi-IN/admin/departments/message.php
new file mode 100644
index 0000000000..2e371348b9
--- /dev/null
+++ b/resources/lang/hi-IN/admin/departments/message.php
@@ -0,0 +1,22 @@
+<?php
+
+return array(
+
+    'does_not_exist' => 'Department does not exist.',
+    'department_already_exists' => 'A department already exists with that name at this company location. Or choose a more specific name for this department. ',
+    'assoc_users'	 => 'This department is currently associated with at least one user and cannot be deleted. Please update your users to no longer reference this department and try again. ',
+    'create' => array(
+        'error'   => 'Department was not created, please try again.',
+        'success' => 'Department created successfully.'
+    ),
+    'update' => array(
+        'error'   => 'Department was not updated, please try again',
+        'success' => 'Department updated successfully.'
+    ),
+    'delete' => array(
+        'confirm'   	=> 'Are you sure you wish to delete this department?',
+        'error'   => 'There was an issue deleting the department. Please try again.',
+        'success' => 'The department was deleted successfully.'
+    )
+
+);
diff --git a/resources/lang/hi-IN/admin/departments/table.php b/resources/lang/hi-IN/admin/departments/table.php
new file mode 100644
index 0000000000..76494247be
--- /dev/null
+++ b/resources/lang/hi-IN/admin/departments/table.php
@@ -0,0 +1,11 @@
+<?php
+
+return array(
+
+    'id'                        => 'ID',
+    'name'                      => 'Department Name',
+    'manager'                   => 'Manager',
+    'location'                  => 'Location',
+    'create'                    => 'Create Department',
+    'update'                    => 'Update Department',
+    );
diff --git a/resources/lang/hi-IN/admin/depreciations/general.php b/resources/lang/hi-IN/admin/depreciations/general.php
new file mode 100644
index 0000000000..90246e9cd8
--- /dev/null
+++ b/resources/lang/hi-IN/admin/depreciations/general.php
@@ -0,0 +1,20 @@
+<?php
+
+return [
+    'about_asset_depreciations'  			=> 'About Asset Depreciations',
+    'about_depreciations'  					=> 'You can set up asset depreciations to depreciate assets based on straight-line depreciation.',
+    'asset_depreciations'  					=> 'Asset Depreciations',
+    'create'  					            => 'Create Depreciation',
+    'depreciation_name'  					=> 'Depreciation Name',
+    'depreciation_min'                      => 'Floor Value of Depreciation',
+    'number_of_months'  					=> 'Number of Months',
+    'update'  					            => 'Update Depreciation',
+    'depreciation_min'                      => 'Minimum Value after Depreciation',
+    'no_depreciations_warning'               => '<strong>Warning: </strong>
+                      You do not currently have any depreciations set up.
+                      Please set up at least one depreciation to view the depreciation report.',
+    'depreciation_method'                   => 'Depreciation Report',
+    'linear_depreciation'                   => 'Linear (Default)',
+    'half_1'                                => 'Half-year convention, always applied',
+    'half_2'                                => 'Half-year convention, applied with condition',
+];
diff --git a/resources/lang/hi-IN/admin/depreciations/message.php b/resources/lang/hi-IN/admin/depreciations/message.php
new file mode 100644
index 0000000000..c20e52c13c
--- /dev/null
+++ b/resources/lang/hi-IN/admin/depreciations/message.php
@@ -0,0 +1,25 @@
+<?php
+
+return array(
+
+    'does_not_exist' => 'Depreciation class does not exist.',
+    'assoc_users'	 => 'This depreciation is currently associated with one or more models and cannot be deleted. Please delete the models, and then try deleting again. ',
+
+
+    'create' => array(
+        'error'   => 'Depreciation class was not created, please try again. :(',
+        'success' => 'Depreciation class created successfully. :)'
+    ),
+
+    'update' => array(
+        'error'   => 'Depreciation class was not updated, please try again',
+        'success' => 'Depreciation class updated successfully.'
+    ),
+
+    'delete' => array(
+        'confirm'   => 'Are you sure you wish to delete this depreciation class?',
+        'error'   => 'There was an issue deleting the depreciation class. Please try again.',
+        'success' => 'The depreciation class was deleted successfully.'
+    )
+
+);
diff --git a/resources/lang/hi-IN/admin/depreciations/table.php b/resources/lang/hi-IN/admin/depreciations/table.php
new file mode 100644
index 0000000000..256b10b92a
--- /dev/null
+++ b/resources/lang/hi-IN/admin/depreciations/table.php
@@ -0,0 +1,11 @@
+<?php
+
+return [
+
+    'id'      => 'ID',
+    'months'   => 'Months',
+    'term'   => 'Term',
+    'title'      => 'Name ',
+    'depreciation_min' => 'Floor Value',
+
+];
diff --git a/resources/lang/hi-IN/admin/groups/message.php b/resources/lang/hi-IN/admin/groups/message.php
new file mode 100644
index 0000000000..495acaf36b
--- /dev/null
+++ b/resources/lang/hi-IN/admin/groups/message.php
@@ -0,0 +1,22 @@
+<?php
+
+return array(
+
+    'group_exists'        => 'Group already exists!',
+    'group_not_found'     => 'Group ID :id does not exist.',
+    'group_name_required' => 'The name field is required',
+
+    'success' => array(
+        'create' => 'Group was successfully created.',
+        'update' => 'Group was successfully updated.',
+        'delete' => 'Group was successfully deleted.',
+    ),
+
+    'delete' => array(
+        'confirm'   => 'Are you sure you wish to delete this group?',
+        'create' => 'There was an issue creating the group. Please try again.',
+        'update' => 'There was an issue updating the group. Please try again.',
+        'delete' => 'There was an issue deleting the group. Please try again.',
+    ),
+
+);
diff --git a/resources/lang/hi-IN/admin/groups/table.php b/resources/lang/hi-IN/admin/groups/table.php
new file mode 100644
index 0000000000..61f060a116
--- /dev/null
+++ b/resources/lang/hi-IN/admin/groups/table.php
@@ -0,0 +1,9 @@
+<?php
+
+return array(
+
+    'id'         => 'Id',
+    'name'       => 'Name',
+    'users'      => '# of Users',
+
+);
diff --git a/resources/lang/hi-IN/admin/groups/titles.php b/resources/lang/hi-IN/admin/groups/titles.php
new file mode 100644
index 0000000000..d875f190d7
--- /dev/null
+++ b/resources/lang/hi-IN/admin/groups/titles.php
@@ -0,0 +1,16 @@
+<?php
+
+return [
+    'about_groups_title'            => 'About Groups',
+    'about_groups'                  => 'Groups are used to generalize user permissions.',
+    'group_management' 	 	=> 'Group Management',
+    'create' 	 	 	    => 'Create New Group',
+    'update' 	 		        => 'Edit Group',
+    'group_name' 	 		=> 'Group Name',
+    'group_admin' 	 		=> 'Group Admin',
+    'allow' 	 			=> 'Allow',
+    'deny' 	 				=> 'Deny',
+    'permission'            => 'Permission',
+    'grant'                 => 'Grant',
+    'no_permissions'        => 'This group has no permissions.'
+];
diff --git a/resources/lang/hi-IN/admin/hardware/form.php b/resources/lang/hi-IN/admin/hardware/form.php
new file mode 100644
index 0000000000..8fbd0b4e87
--- /dev/null
+++ b/resources/lang/hi-IN/admin/hardware/form.php
@@ -0,0 +1,65 @@
+<?php
+
+return [
+    'bulk_delete'		=> 'Confirm Bulk Delete Assets',
+    'bulk_restore'      => 'Confirm Bulk Restore Assets', 
+  'bulk_delete_help'	=> 'Review the assets for bulk deletion below. Once deleted, these assets can be restored, but they will no longer be associated with any users they are currently assigned to.',
+  'bulk_restore_help'	=> 'Review the assets for bulk restoration below. Once restored, these assets will not be associated with any users they were previously assigned to.',
+  'bulk_delete_warn'	=> 'You are about to delete :asset_count assets.',
+  'bulk_restore_warn'	=> 'You are about to restore :asset_count assets.',
+    'bulk_update'		=> 'Bulk Update Assets',
+    'bulk_update_help'	=> 'This form allows you to update multiple assets at once. Only fill in the fields you need to change. Any fields left blank will remain unchanged. ',
+    'bulk_update_warn'	=> 'You are about to edit the properties of a single asset.|You are about to edit the properties of :asset_count assets.',
+    'bulk_update_with_custom_field' => 'Note the assets are :asset_model_count different types of models.',
+    'bulk_update_model_prefix' => 'On Models', 
+    'bulk_update_custom_field_unique' => 'This is a unique field and can not be bulk edited.',
+    'checkedout_to'		=> 'Checked Out To',
+    'checkout_date'		=> 'Checkout Date',
+    'checkin_date'		=> 'Checkin Date',
+    'checkout_to'		=> 'Checkout to',
+    'cost'				=> 'Purchase Cost',
+    'create'			=> 'Create Asset',
+    'date'				=> 'Purchase Date',
+    'depreciation'	    => 'Depreciation',
+    'depreciates_on'	=> 'Depreciates On',
+    'default_location'	=> 'Default Location',
+    'default_location_phone' => 'Default Location Phone',
+    'eol_date'			=> 'EOL Date',
+    'eol_rate'			=> 'EOL Rate',
+    'expected_checkin'  => 'Expected Checkin Date',
+    'expires'			=> 'Expires',
+    'fully_depreciated'	=> 'Fully Depreciated',
+    'help_checkout'		=> 'If you wish to assign this asset immediately, select "Ready to Deploy" from the status list above. ',
+    'mac_address'		=> 'MAC Address',
+    'manufacturer'		=> 'Manufacturer',
+    'model'				=> 'Model',
+    'months'			=> 'months',
+    'name'				=> 'Asset Name',
+    'notes'				=> 'Notes',
+    'order'				=> 'Order Number',
+    'qr'				=> 'QR Code',
+    'requestable'		=> 'Users may request this asset',
+    'redirect_to_all'   => 'Return to all :type',
+    'redirect_to_type'   => 'Go to :type',
+    'redirect_to_checked_out_to'   => 'Go to Checked Out to',
+    'select_statustype'	=> 'Select Status Type',
+    'serial'			=> 'Serial',
+    'status'			=> 'Status',
+    'tag'				=> 'Asset Tag',
+    'update'			=> 'Asset Update',
+    'warranty'			=> 'Warranty',
+        'warranty_expires'		=> 'Warranty Expires',
+    'years'				=> 'years',
+    'asset_location' => 'Update Asset Location',
+    'asset_location_update_default_current' => 'Update default location AND actual location',
+    'asset_location_update_default' => 'Update only default location',
+    'asset_location_update_actual' => 'Update only actual location',
+    'asset_not_deployable' => 'That asset status is not deployable. This asset cannot be checked out.',
+    'asset_not_deployable_checkin' => 'That asset status is not deployable. Using this status label will checkin the asset.',
+    'asset_deployable' => 'This asset can be checked out.',
+    'processing_spinner' => 'Processing... (This might take a bit of time on large files)',
+    'processing' => 'Processing... ',
+    'optional_infos'  => 'Optional Information',
+    'order_details'   => 'Order Related Information',
+    'calc_eol'    => 'If nulling the EOL date, use automatic EOL calculation based on the purchase date and EOL rate.',
+];
diff --git a/resources/lang/hi-IN/admin/hardware/general.php b/resources/lang/hi-IN/admin/hardware/general.php
new file mode 100644
index 0000000000..6740476574
--- /dev/null
+++ b/resources/lang/hi-IN/admin/hardware/general.php
@@ -0,0 +1,42 @@
+<?php
+
+return [
+    'about_assets_title'           => 'About Assets',
+    'about_assets_text'            => 'Assets are items tracked by serial number or asset tag.  They tend to be higher value items where identifying a specific item matters.',
+    'archived'  				=> 'Archived',
+    'asset'  					=> 'Asset',
+    'bulk_checkout'             => 'Bulk Checkout',
+    'bulk_checkin'              => 'Bulk Checkin',
+    'checkin'  					=> 'Checkin Asset',
+    'checkout'  				=> 'Checkout Asset',
+    'clone'  					=> 'Clone Asset',
+    'deployable'  				=> 'Deployable',
+    'deleted'  					=> 'This asset has been deleted.',
+    'delete_confirm'            => 'Are you sure you want to delete this asset?',
+    'edit'  					=> 'Edit Asset',
+    'model_deleted'  			=> 'This Assets model has been deleted. You must restore the model before you can restore the Asset.',
+    'model_invalid'             => 'This model for this asset is invalid.',
+    'model_invalid_fix'         => 'The asset must be updated use a valid asset model before attempting to check it in or out, or to audit it.',
+    'requestable'               => 'Requestable',
+    'requested'				    => 'Requested',
+    'not_requestable'           => 'Not Requestable',
+    'requestable_status_warning' => 'Do not change requestable status',
+    'restore'  					=> 'Restore Asset',
+    'pending'  					=> 'Pending',
+    'undeployable'  			=> 'Undeployable',
+    'undeployable_tooltip'  	=> 'This asset has a status label that is undeployable and cannot be checked out at this time.',
+    'view'  					=> 'View Asset',
+    'csv_error' => 'You have an error in your CSV file:',
+    'import_text' => '<p>Upload a CSV that contains asset history. The assets and users MUST already exist in the system, or they will be skipped. Matching assets for history import happens against the asset tag. We will try to find a matching user based on the user\'s name you provide, and the criteria you select below. If you do not select any criteria below, it will simply try to match on the username format you configured in the <code>Admin &gt; General Settings</code>.</p><p>Fields included in the CSV must match the headers: <strong>Asset Tag, Name, Checkout Date, Checkin Date</strong>. Any additional fields will be ignored. </p><p>Checkin Date: blank or future checkin dates will checkout items to associated user.  Excluding the Checkin Date column will create a checkin date with todays date.</p>    ',
+    'csv_import_match_f-l' => 'Try to match users by <strong>firstname.lastname</strong> (<code>jane.smith</code>) format',
+    'csv_import_match_initial_last' => 'Try to match users by <strong>first initial last name</strong> (<code>jsmith</code>) format',
+    'csv_import_match_first' => 'Try to match users by <strong>first name</strong> (<code>jane</code>) format',
+    'csv_import_match_email' => 'Try to match users by <strong>email</strong> as username',
+    'csv_import_match_username' => 'Try to match users by <strong>username</strong>',
+    'error_messages' => 'Error messages:',
+    'success_messages' => 'Success messages:',
+    'alert_details' => 'Please see below for details.',
+    'custom_export' => 'Custom Export',
+    'mfg_warranty_lookup' => ':manufacturer Warranty Status Lookup',
+    'user_department' => 'User Department',
+];
diff --git a/resources/lang/hi-IN/admin/hardware/message.php b/resources/lang/hi-IN/admin/hardware/message.php
new file mode 100644
index 0000000000..c19bc63647
--- /dev/null
+++ b/resources/lang/hi-IN/admin/hardware/message.php
@@ -0,0 +1,109 @@
+<?php
+
+return [
+
+    'undeployable' 		 => '<strong>Warning: </strong> This asset has been marked as currently undeployable. If this status has changed, please update the asset status.',
+    'does_not_exist' 	 => 'Asset does not exist.',
+    'does_not_exist_var' => 'Asset with tag :asset_tag not found.',
+    'no_tag' 	         => 'No asset tag provided.',
+    'does_not_exist_or_not_requestable' => 'That asset does not exist or is not requestable.',
+    'assoc_users'	 	 => 'This asset is currently checked out to a user and cannot be deleted. Please check the asset in first, and then try deleting again. ',
+    'warning_audit_date_mismatch' 	=> 'This asset\'s next audit date (:next_audit_date) is before the last audit date (:last_audit_date). Please update the next audit date.',
+    'labels_generated'   => 'Labels were successfully generated.',
+    'error_generating_labels' => 'Error while generating labels.',
+    'no_assets_selected' => 'No assets selected.',
+
+    'create' => [
+        'error'   		=> 'Asset was not created, please try again. :(',
+        'success' 		=> 'Asset created successfully. :)',
+        'success_linked' => 'Asset with tag :tag was created successfully. <strong><a href=":link" style="color: white;">Click here to view</a></strong>.',
+        'multi_success_linked' => 'Asset with tag :links was created successfully.|:count assets were created succesfully. :links.',
+        'partial_failure' => 'An asset was unable to be created. Reason: :failures|:count assets were unable to be created. Reasons: :failures',
+    ],
+
+    'update' => [
+        'error'   			=> 'Asset was not updated, please try again',
+        'success' 			=> 'Asset updated successfully.',
+        'encrypted_warning' => 'Asset updated successfully, but encrypted custom fields were not due to permissions',
+        'nothing_updated'	=>  'No fields were selected, so nothing was updated.',
+        'no_assets_selected'  =>  'No assets were selected, so nothing was updated.',
+        'assets_do_not_exist_or_are_invalid' => 'Selected assets cannot be updated.',
+    ],
+
+    'restore' => [
+        'error'   		=> 'Asset was not restored, please try again',
+        'success' 		=> 'Asset restored successfully.',
+        'bulk_success' 		=> 'Asset restored successfully.',
+        'nothing_updated'   => 'No assets were selected, so nothing was restored.', 
+    ],
+
+    'audit' => [
+        'error'   		=> 'Asset audit unsuccessful: :error ',
+        'success' 		=> 'Asset audit successfully logged.',
+    ],
+
+
+    'deletefile' => [
+        'error'   => 'File not deleted. Please try again.',
+        'success' => 'File successfully deleted.',
+    ],
+
+    'upload' => [
+        'error'   => 'File(s) not uploaded. Please try again.',
+        'success' => 'File(s) successfully uploaded.',
+        'nofiles' => 'You did not select any files for upload, or the file you are trying to upload is too large',
+        'invalidfiles' => 'One or more of your files is too large or is a filetype that is not allowed. Allowed filetypes are png, gif, jpg, doc, docx, pdf, and txt.',
+    ],
+
+    'import' => [
+        'import_button'         => 'Process Import',
+        'error'                 => 'Some items did not import correctly.',
+        'errorDetail'           => 'The following Items were not imported because of errors.',
+        'success'               => 'Your file has been imported',
+        'file_delete_success'   => 'Your file has been been successfully deleted',
+        'file_delete_error'      => 'The file was unable to be deleted',
+        'file_missing' => 'The file selected is missing',
+        'file_already_deleted' => 'The file selected was already deleted',
+        'header_row_has_malformed_characters' => 'One or more attributes in the header row contain malformed UTF-8 characters',
+        'content_row_has_malformed_characters' => 'One or more attributes in the first row of content contain malformed UTF-8 characters',
+        'transliterate_failure' => 'Transliteration from :encoding to UTF-8 failed due to invalid characters in input'
+    ],
+
+
+    'delete' => [
+        'confirm'   	=> 'Are you sure you wish to delete this asset?',
+        'error'   		=> 'There was an issue deleting the asset. Please try again.',
+        'assigned_to_error' => '{1}Asset Tag: :asset_tag is currently checked out. Check in this device before deletion.|[2,*]Asset Tags: :asset_tag are currently checked out. Check in these devices before deletion.',
+        'nothing_updated'   => 'No assets were selected, so nothing was deleted.',
+        'success' 		=> 'The asset was deleted successfully.',
+    ],
+
+    'checkout' => [
+        'error'   		=> 'Asset was not checked out, please try again',
+        'success' 		=> 'Asset checked out successfully.',
+        'user_does_not_exist' => 'That user is invalid. Please try again.',
+        'not_available' => 'That asset is not available for checkout!',
+        'no_assets_selected' => 'You must select at least one asset from the list',
+    ],
+
+    'multi-checkout' => [
+        'error'   => 'Asset was not checked out, please try again|Assets were not checked out, please try again',
+        'success' => 'Asset checked out successfully.|Assets checked out successfully.',
+    ],
+
+    'checkin' => [
+        'error'   		=> 'Asset was not checked in, please try again',
+        'success' 		=> 'Asset checked in successfully.',
+        'user_does_not_exist' => 'That user is invalid. Please try again.',
+        'already_checked_in'  => 'That asset is already checked in.',
+
+    ],
+
+    'requests' => [
+        'error'   		=> 'Request was not successful, please try again.',
+        'success' 		=> 'Request successfully submitted.',
+        'canceled'      => 'Request successfully canceled.',
+        'cancel'        => 'Cancel this item request',
+    ],
+
+];
diff --git a/resources/lang/hi-IN/admin/hardware/table.php b/resources/lang/hi-IN/admin/hardware/table.php
new file mode 100644
index 0000000000..2d88c6c131
--- /dev/null
+++ b/resources/lang/hi-IN/admin/hardware/table.php
@@ -0,0 +1,32 @@
+<?php
+
+return [
+
+    'asset_tag'   	=> 'Asset Tag',
+    'asset_model'       => 'Model',
+    'assigned_to'   => 'Assigned To',
+    'book_value'  	=> 'Current Value',
+    'change' 		=> 'In/Out',
+    'checkout_date' => 'Checkout Date',
+    'checkoutto' 	=> 'Checked Out',
+    'components_cost' => 'Total Components Cost',
+    'current_value' => 'Current Value',
+    'diff' 			=> 'Diff',
+    'dl_csv' 		=> 'Download CSV',
+    'eol' 			=> 'EOL',
+    'id'      		=> 'ID',
+    'last_checkin_date' => 'Last Checkin Date',
+    'location' 		=> 'Location',
+    'purchase_cost'	=> 'Cost',
+    'purchase_date'	=> 'Purchased',
+    'serial'   		=> 'Serial',
+    'status'   		=> 'Status',
+    'title'      	=> 'Asset ',
+    'image'		    => 'Device Image',
+    'days_without_acceptance' => 'Days Without Acceptance',
+    'monthly_depreciation' => 'Monthly Depreciation',
+    'requesting_user' => 'Requesting User',
+    'requested_date' => 'Requested Date',
+    'changed'       => 'Changed',
+    'icon' => 'Icon',
+];
diff --git a/resources/lang/hi-IN/admin/kits/general.php b/resources/lang/hi-IN/admin/kits/general.php
new file mode 100644
index 0000000000..2b5c2d9cd0
--- /dev/null
+++ b/resources/lang/hi-IN/admin/kits/general.php
@@ -0,0 +1,51 @@
+<?php
+
+return [
+    'about_kits_title'                  => 'About Predefined Kits',
+    'about_kits_text'                   => 'Predefined Kits let you quickly check out a collection of items (assets, licenses, etc) to a user. This can be helpful when your onboarding process is consistent across many users and all users receive the same items.',
+    'checkout'                          => 'Checkout Kit ',
+    'create_success'                    => 'Kit was successfully created.',
+    'create'                            => 'Create Predefined Kit',
+    'update'                            => 'Update Predefined Kit',
+    'delete_success'                    => 'Kit was successfully deleted.',
+    'update_success'                    => 'Kit was successfully updated.',
+    'none_models'                       => 'There are not enough available assets for :model to checkout. :qty are required. ',
+    'none_licenses'                     => 'There are not enough available seats for :license to checkout. :qty are required. ',
+    'none_consumables'                  => 'There are not enough available units of :consumable to checkout. :qty are required. ',
+    'none_accessory'                    => 'There are not enough available units of :accessory to checkout. :qty are required. ',
+    'append_accessory'                  => 'Append Accessory',
+    'update_appended_accessory'         => 'Update appended Accessory',
+    'append_consumable'                 => 'Append Consumable',
+    'update_appended_consumable'        => 'Update appended Consumable',
+    'append_license'                    => 'Append license',
+    'update_appended_license'           => 'Update appended license',
+    'append_model'                      => 'Append model',
+    'update_appended_model'             => 'Update appended model',
+    'license_error'                     => 'License already attached to kit',
+    'license_added_success'             => 'License added successfully',
+    'license_updated'                   => 'License was successfully updated',
+    'license_none'                      => 'License does not exist',
+    'license_detached'                  => 'License was successfully detached',
+    'consumable_added_success'          => 'Consumable added successfully',
+    'consumable_updated'                => 'Consumable was successfully updated',
+    'consumable_error'                  => 'Consumable already attached to kit',
+    'consumable_deleted'                => 'Delete was successful',
+    'consumable_none'                   => 'Consumable does not exist',
+    'consumable_detached'               => 'Consumable was successfully detached',
+    'accessory_added_success'           => 'Accessory added successfully',
+    'accessory_updated'                 => 'Accessory was successfully updated',
+    'accessory_detached'                => 'Accessory was successfully detached',
+    'accessory_error'                   => 'Accessory already attached to kit',
+    'accessory_deleted'                 => 'Delete was successful',
+    'accessory_none'                    => 'The accessory does not exist',
+    'checkout_success'                  => 'Checkout was successful',
+    'checkout_error'                    => 'Checkout error',
+    'kit_none'                          => 'Kit does not exist',
+    'kit_created'                       => 'Kit was successfully created',
+    'kit_updated'                       => 'Kit was successfully updated',
+    'kit_not_found'                     => 'Kit not found',
+    'kit_deleted'                       => 'Kit was successfully deleted',
+    'kit_model_updated'                 => 'Model was successfully updated',
+    'kit_model_detached'                => 'Model was successfully detached',
+    'model_already_attached'            => 'Model already attached to kit',
+];
diff --git a/resources/lang/hi-IN/admin/labels/message.php b/resources/lang/hi-IN/admin/labels/message.php
new file mode 100644
index 0000000000..96785f0754
--- /dev/null
+++ b/resources/lang/hi-IN/admin/labels/message.php
@@ -0,0 +1,11 @@
+<?php
+
+return [
+
+    'invalid_return_count' => 'Invalid count returned from :name. Expected :expected, got :actual.',
+    'invalid_return_type'  => 'Invalid type returned from :name. Expected :expected, got :actual.',
+    'invalid_return_value' => 'Invalid value returned from :name. Expected :expected, got :actual.',
+
+    'does_not_exist' => 'Label does not exist',
+    
+];
diff --git a/resources/lang/hi-IN/admin/labels/table.php b/resources/lang/hi-IN/admin/labels/table.php
new file mode 100644
index 0000000000..bef4ba170e
--- /dev/null
+++ b/resources/lang/hi-IN/admin/labels/table.php
@@ -0,0 +1,19 @@
+<?php
+
+return [
+    'example_company'    => 'Test Company Limited',
+    'example_defaultloc' => 'Building 1',
+    'example_category'   => 'Test Category',
+    'example_location'   => 'Building 2',
+    'example_manufacturer'  => 'Test Manufacturing Inc.',
+    'example_model'      => 'Test Model',
+    'example_supplier'   => 'Test Company Limited',
+    'labels_per_page'    => 'Labels',
+    'support_fields'     => 'Fields',
+    'support_asset_tag'  => 'Tag',
+    'support_1d_barcode' => '1D',
+    'support_2d_barcode' => '2D',
+    'support_logo'       => 'Logo',
+    'support_title'      => 'Title',
+
+];
\ No newline at end of file
diff --git a/resources/lang/hi-IN/admin/licenses/form.php b/resources/lang/hi-IN/admin/licenses/form.php
new file mode 100644
index 0000000000..ce29167874
--- /dev/null
+++ b/resources/lang/hi-IN/admin/licenses/form.php
@@ -0,0 +1,22 @@
+<?php
+
+return array(
+
+    'asset'             => 'Asset',
+    'checkin'           => 'Checkin',
+    'create'            => 'Create License',
+    'expiration'        => 'Expiration Date',
+    'license_key'       => 'Product Key',
+    'maintained'        => 'Maintained',
+    'name'              => 'Software Name',
+    'no_depreciation'   => 'Do Not Depreciate',
+    'purchase_order'    => 'Purchase Order Number',
+    'reassignable'      => 'Reassignable',
+    'remaining_seats'   => 'Remaining Seats',
+    'seats'             => 'Seats',
+    'termination_date'  => 'Termination Date',
+    'to_email'          => 'Licensed to Email',
+    'to_name'           => 'Licensed to Name',
+    'update'            => 'Update License',
+    'checkout_help'     => 'You must check a license out to a hardware asset or a person. You can select both, but the owner of the asset must match the person you\'re checking the asset out to.'
+);
diff --git a/resources/lang/hi-IN/admin/licenses/general.php b/resources/lang/hi-IN/admin/licenses/general.php
new file mode 100644
index 0000000000..b39030afd4
--- /dev/null
+++ b/resources/lang/hi-IN/admin/licenses/general.php
@@ -0,0 +1,52 @@
+<?php
+
+return array(
+    'about_licenses_title'      => 'About Licenses',
+    'about_licenses'            => 'Licenses are used to track software.  They have a specified number of seats that can be checked out to individuals',
+    'checkin'  					=> 'Checkin License Seat',
+    'checkout_history'  		=> 'Checkout History',
+    'checkout'  				=> 'Checkout License Seat',
+    'edit'  					=> 'Edit License',
+    'filetype_info'				=> 'Allowed filetypes are png, gif, jpg, jpeg, doc, docx, pdf, txt, zip, and rar.',
+    'clone'  					=> 'Clone License',
+    'history_for'  				=> 'History for ',
+    'in_out'  					=> 'In/Out',
+    'info'  					=> 'License Info',
+    'license_seats'  			=> 'License Seats',
+    'seat'  					=> 'Seat',
+    'seat_count'  				=> 'Seat :count',
+    'seats'  					=> 'Seats',
+    'software_licenses'  		=> 'Software Licenses',
+    'user'  					=> 'User',
+    'view'  					=> 'View License',
+    'delete_disabled'           => 'This license cannot be deleted yet because some seats are still checked out.',
+    'bulk'                      =>
+        [
+            'checkin_all'           => [
+                'button'            => 'Checkin All Seats',
+                'modal'             => 'This action will checkin one seat. | This action will checkin all :checkedout_seats_count seats for this license.',
+                'enabled_tooltip'   => 'Checkin ALL seats for this license from both users and assets',
+                'disabled_tooltip'  => 'This is disabled because there are no seats currently checked out',
+                'disabled_tooltip_reassignable'  => 'This is disabled because the License is not reassignable',
+                'success'           => 'License successfully checked in! | All licenses were successfully checked in!',
+                'log_msg'           => 'Checked in via bulk license checkin in license GUI',
+            ],
+
+            'checkout_all'              => [
+                'button'                => 'Checkout All Seats',
+                'modal'                 => 'This action will checkout one seat to the first available user. | This action will checkout all :available_seats_count seats to the first available users. A user is considered available for this seat if they do not already have this license checked out to them, and the Auto-Assign License property is enabled on their user account.',
+                'enabled_tooltip'   => 'Checkout ALL seats (or as many as are available) to ALL users',
+                'disabled_tooltip'  => 'This is disabled because there are no seats currently available',
+                'success'           => 'License successfully checked out! | :count licenses were successfully checked out!',
+                'error_no_seats'    => 'There are no remaining seats left for this license.',
+                'warn_not_enough_seats'    => ':count users were assigned this license, but we ran out of available license seats.',
+                'warn_no_avail_users'    => 'Nothing to do. There are no users who do not already have this license assigned to them.',
+                'log_msg'           => 'Checked out via bulk license checkout in license GUI',
+
+
+            ],
+    ],
+
+    'below_threshold' => 'There are only :remaining_count seats left for this license with a minimum quantity of :min_amt. You may want to consider purchasing more seats.',
+    'below_threshold_short' => 'This item is below the minimum required quantity.',
+);
diff --git a/resources/lang/hi-IN/admin/licenses/message.php b/resources/lang/hi-IN/admin/licenses/message.php
new file mode 100644
index 0000000000..74e1d7af5a
--- /dev/null
+++ b/resources/lang/hi-IN/admin/licenses/message.php
@@ -0,0 +1,57 @@
+<?php
+
+return array(
+
+    'does_not_exist' => 'License does not exist or you do not have permission to view it.',
+    'user_does_not_exist' => 'User does not exist or you do not have permission to view them.',
+    'asset_does_not_exist' 	=> 'The asset you are trying to associate with this license does not exist.',
+    'owner_doesnt_match_asset' => 'The asset you are trying to associate with this license is owned by somene other than the person selected in the assigned to dropdown.',
+    'assoc_users'	 => 'This license is currently checked out to a user and cannot be deleted. Please check the license in first, and then try deleting again. ',
+    'select_asset_or_person' => 'You must select an asset or a user, but not both.',
+    'not_found' => 'License not found',
+    'seats_available' => ':seat_count seats available',
+
+
+    'create' => array(
+        'error'   => 'License was not created, please try again.',
+        'success' => 'License created successfully.'
+    ),
+
+    'deletefile' => array(
+        'error'   => 'File not deleted. Please try again.',
+        'success' => 'File successfully deleted.',
+    ),
+
+    'upload' => array(
+        'error'   => 'File(s) not uploaded. Please try again.',
+        'success' => 'File(s) successfully uploaded.',
+        'nofiles' => 'You did not select any files for upload, or the file you are trying to upload is too large',
+        'invalidfiles' => 'One or more of your files is too large or is a filetype that is not allowed. Allowed filetypes are png, gif, jpg, jpeg, doc, docx, pdf, txt, zip, rar, rtf, xml, and lic.',
+    ),
+
+    'update' => array(
+        'error'   => 'License was not updated, please try again',
+        'success' => 'License updated successfully.'
+    ),
+
+    'delete' => array(
+        'confirm'   => 'Are you sure you wish to delete this license?',
+        'error'   => 'There was an issue deleting the license. Please try again.',
+        'success' => 'The license was deleted successfully.'
+    ),
+
+    'checkout' => array(
+        'error'   => 'There was an issue checking out the license. Please try again.',
+        'success' => 'The license was checked out successfully',
+        'not_enough_seats' => 'Not enough license seats available for checkout',
+        'mismatch' => 'The license seat provided does not match the license',
+        'unavailable' => 'This seat is not available for checkout.',
+    ),
+
+    'checkin' => array(
+        'error'   => 'There was an issue checking in the license. Please try again.',
+        'not_reassignable' => 'License not reassignable',
+        'success' => 'The license was checked in successfully'
+    ),
+
+);
diff --git a/resources/lang/hi-IN/admin/licenses/table.php b/resources/lang/hi-IN/admin/licenses/table.php
new file mode 100644
index 0000000000..9cabf9c883
--- /dev/null
+++ b/resources/lang/hi-IN/admin/licenses/table.php
@@ -0,0 +1,18 @@
+<?php
+
+return array(
+
+    'assigned_to'   	=> 'Assigned To',
+    'checkout'   		=> 'In/Out',
+    'deleted_at'        => 'Deleted at',
+    'id'      			=> 'ID',
+    'license_email'   	=> 'License Email',
+    'license_name'   	=> 'Licensed To',
+    'purchase_date'   	=> 'Purchase Date',
+    'purchased'   		=> 'Purchased',
+    'seats'   			=> 'Seats',
+    'hardware'   		=> 'Hardware',
+    'serial'   			=> 'Serial',
+    'title'      		=> 'License',
+
+);
diff --git a/resources/lang/hi-IN/admin/locations/message.php b/resources/lang/hi-IN/admin/locations/message.php
new file mode 100644
index 0000000000..b21c70ad89
--- /dev/null
+++ b/resources/lang/hi-IN/admin/locations/message.php
@@ -0,0 +1,35 @@
+<?php
+
+return array(
+
+    'does_not_exist' => 'Location does not exist.',
+    'assoc_users'    => 'This location is not currently deletable because it is the location of record for at least one asset or user, has assets assigned to it, or is the parent location of another location. Please update your records to no longer reference this location and try again ',
+    'assoc_assets'	 => 'This location is currently associated with at least one asset and cannot be deleted. Please update your assets to no longer reference this location and try again. ',
+    'assoc_child_loc'	 => 'This location is currently the parent of at least one child location and cannot be deleted. Please update your locations to no longer reference this location and try again. ',
+    'assigned_assets' => 'Assigned Assets',
+    'current_location' => 'Current Location',
+    'open_map' => 'Open in :map_provider_icon Maps',
+
+
+    'create' => array(
+        'error'   => 'Location was not created, please try again.',
+        'success' => 'Location created successfully.'
+    ),
+
+    'update' => array(
+        'error'   => 'Location was not updated, please try again',
+        'success' => 'Location updated successfully.'
+    ),
+
+    'restore' => array(
+        'error'   => 'Location was not restored, please try again',
+        'success' => 'Location restored successfully.'
+    ),
+
+    'delete' => array(
+        'confirm'   	=> 'Are you sure you wish to delete this location?',
+        'error'   => 'There was an issue deleting the location. Please try again.',
+        'success' => 'The location was deleted successfully.'
+    )
+
+);
diff --git a/resources/lang/hi-IN/admin/locations/table.php b/resources/lang/hi-IN/admin/locations/table.php
new file mode 100644
index 0000000000..53176d8a4e
--- /dev/null
+++ b/resources/lang/hi-IN/admin/locations/table.php
@@ -0,0 +1,43 @@
+<?php
+
+return [
+    'about_locations_title'     => 'About Locations',
+    'about_locations'           => 'Locations are used to track location information for users, assets, and other items',
+    'assets_rtd'                => 'Assets', // This has NEVER meant Assets Retired. I don't know how it keeps getting reverted.
+    'assets_checkedout'         => 'Assets Assigned',
+    'id'                        => 'ID',
+    'city'                      => 'City',
+    'state'                     => 'State',
+    'country'                   => 'Country',
+    'create'                    => 'Create Location',
+    'update'                    => 'Update Location',
+    'print_assigned'            => 'Print Assigned',
+    'print_all_assigned'        => 'Print All Assigned',
+    'name'                      => 'Location Name',
+    'address'                   => 'Address',
+    'address2'                   => 'Address Line 2',
+    'zip'                       => 'Postal Code',
+    'locations'                 => 'Locations',
+    'parent'                    => 'Parent',
+    'currency'                  => 'Location Currency',
+    'ldap_ou'                   => 'LDAP Search OU',
+    'user_name'                 => 'User Name',
+    'department'                => 'Department',
+    'location'                  => 'Location',
+    'asset_tag'                 => 'Assets Tag',
+    'asset_name'                => 'Name',
+    'asset_category'            => 'Category',
+    'asset_manufacturer'        => 'Manufacturer',
+    'asset_model'               => 'Model',
+    'asset_serial'              => 'Serial',
+    'asset_location'            => 'Location',
+    'asset_checked_out'         => 'Checked Out',
+    'asset_expected_checkin'    => 'Expected Checkin',
+    'date'                      => 'Date:',
+    'phone'                     => 'Location Phone',
+    'signed_by_asset_auditor'   => 'Signed By (Asset Auditor):',
+    'signed_by_finance_auditor' => 'Signed By (Finance Auditor):',
+    'signed_by_location_manager' => 'Signed By (Location Manager):',
+    'signed_by'                 => 'Signed Off By:',
+    'clone'  					=> 'Clone Location',
+];
diff --git a/resources/lang/hi-IN/admin/manufacturers/message.php b/resources/lang/hi-IN/admin/manufacturers/message.php
new file mode 100644
index 0000000000..61416e0230
--- /dev/null
+++ b/resources/lang/hi-IN/admin/manufacturers/message.php
@@ -0,0 +1,30 @@
+<?php
+
+return array(
+
+    'support_url_help' => 'Variables <code>{LOCALE}</code>, <code>{SERIAL}</code>, <code>{MODEL_NUMBER}</code>, and <code>{MODEL_NAME}</code> may be used in your URL to have those values auto-populate when viewing assets - for example https://checkcoverage.apple.com/{LOCALE}/{SERIAL}.',
+    'does_not_exist' => 'Manufacturer does not exist.',
+    'assoc_users'	 => 'This manufacturer is currently associated with at least one model and cannot be deleted. Please update your models to no longer reference this manufacturer and try again. ',
+
+    'create' => array(
+        'error'   => 'Manufacturer was not created, please try again.',
+        'success' => 'Manufacturer created successfully.'
+    ),
+
+    'update' => array(
+        'error'   => 'Manufacturer was not updated, please try again',
+        'success' => 'Manufacturer updated successfully.'
+    ),
+
+    'restore' => array(
+        'error'   => 'Manufacturer was not restored, please try again',
+        'success' => 'Manufacturer restored successfully.'
+    ),
+
+    'delete' => array(
+        'confirm'   => 'Are you sure you wish to delete this manufacturer?',
+        'error'   => 'There was an issue deleting the manufacturer. Please try again.',
+        'success' => 'The Manufacturer was deleted successfully.'
+    )
+
+);
diff --git a/resources/lang/hi-IN/admin/manufacturers/table.php b/resources/lang/hi-IN/admin/manufacturers/table.php
new file mode 100644
index 0000000000..6a0aaa8865
--- /dev/null
+++ b/resources/lang/hi-IN/admin/manufacturers/table.php
@@ -0,0 +1,16 @@
+<?php
+
+return array(
+    'about_manufacturers_title'    => 'About manufacturers',
+    'about_manufacturers_text'  => 'Manufacturers are the companies that create your assets. You can store important support contact information about them here, which will be displayed on your asset detail pages.',
+    'asset_manufacturers'	=> 'Asset Manufacturers',
+    'create'				=> 'Create Manufacturer',
+    'id'   					=> 'ID',
+    'name'      			=> 'Name',
+    'support_email'   		=> 'Support Email',
+    'support_phone'   		=> 'Support Phone',
+    'support_url'   		=> 'Support URL',
+    'warranty_lookup_url'   => 'Warranty Lookup URL',
+    'update'				=> 'Update Manufacturer',
+
+);
diff --git a/resources/lang/hi-IN/admin/models/general.php b/resources/lang/hi-IN/admin/models/general.php
new file mode 100644
index 0000000000..9a61b53fd0
--- /dev/null
+++ b/resources/lang/hi-IN/admin/models/general.php
@@ -0,0 +1,18 @@
+<?php
+
+return array(
+    'about_models_title'     => 'About Asset Models',
+    'about_models_text'           => 'Asset Models are a way to group identical assets. "MBP 2013", "IPhone 6s", etc.',
+    'deleted'  					=> 'This model has been deleted.',
+    'bulk_delete'               => 'Bulk Delete Asset Models',
+    'bulk_delete_help'               => 'Use the checkboxes below to confirm the deletion of the selected asset models. Asset models that have assets associated with them cannot be deleted until the assets are associated with a different model.',
+    'bulk_delete_warn'          => 'You are about to delete one asset model.|You are about to delete :model_count asset models.',
+    'restore'                   => 'Restore Model',
+    'requestable'               => 'Users may request this model',
+	'show_mac_address'			      => 'Show MAC address field in assets in this model',
+    'view_deleted'              => 'View Deleted',
+    'view_models'               => 'View Models',
+    'fieldset'                  => 'Fieldset',
+    'no_custom_field'           => 'No custom fields',
+    'add_default_values'        => 'Add default values',
+);
diff --git a/resources/lang/hi-IN/admin/models/message.php b/resources/lang/hi-IN/admin/models/message.php
new file mode 100644
index 0000000000..ae3bc34eed
--- /dev/null
+++ b/resources/lang/hi-IN/admin/models/message.php
@@ -0,0 +1,47 @@
+<?php
+
+return array(
+
+    'deleted' => 'Deleted asset model',
+    'does_not_exist' => 'Model does not exist.',
+    'no_association' => 'WARNING! The asset model for this item is invalid or missing!',
+    'no_association_fix' => 'This will break things in weird and horrible ways. Edit this asset now to assign it a model.',
+    'assoc_users'	 => 'This model is currently associated with one or more assets and cannot be deleted. Please delete the assets, and then try deleting again. ',
+    'invalid_category_type' => 'This category must be an asset category.',
+
+    'create' => array(
+        'error'   => 'Model was not created, please try again.',
+        'success' => 'Model created successfully.',
+        'duplicate_set' => 'An asset model with that name, manufacturer and model number already exists.',
+    ),
+
+    'update' => array(
+        'error'   => 'Model was not updated, please try again',
+        'success' => 'Model updated successfully.',
+    ),
+
+    'delete' => array(
+        'confirm'   => 'Are you sure you wish to delete this asset model?',
+        'error'   => 'There was an issue deleting the model. Please try again.',
+        'success' => 'The model was deleted successfully.'
+    ),
+
+    'restore' => array(
+        'error'   		=> 'Model was not restored, please try again',
+        'success' 		=> 'Model restored successfully.'
+    ),
+
+    'bulkedit' => array(
+        'error'   		=> 'No fields were changed, so nothing was updated.',
+        'success' 		=> 'Model successfully updated. |:model_count models successfully updated.',
+        'warn'          => 'You are about to update the properties of the following model:|You are about to edit the properties of the following :model_count models:',
+
+    ),
+
+    'bulkdelete' => array(
+        'error'   		    => 'No models were selected, so nothing was deleted.',
+        'success' 		    => 'Model deleted!|:success_count models deleted!',
+        'success_partial' 	=> ':success_count model(s) were deleted, however :fail_count were unable to be deleted because they still have assets associated with them.'
+    ),
+
+);
diff --git a/resources/lang/hi-IN/admin/models/table.php b/resources/lang/hi-IN/admin/models/table.php
new file mode 100644
index 0000000000..11a512b3d3
--- /dev/null
+++ b/resources/lang/hi-IN/admin/models/table.php
@@ -0,0 +1,17 @@
+<?php
+
+return array(
+
+    'create'				=> 'Create Asset Model',
+    'created_at' 			=> 'Created at',
+    'eol'	 				=> 'EOL',
+    'modelnumber'   		=> 'Model No.',
+    'name'      			=> 'Asset Model Name',
+    'numassets' 			=> 'Assets',
+    'title'					=> 'Asset Models',
+    'update'				=> 'Update Asset Model',
+    'view'					=> 'View Asset Model',
+    'update'				=> 'Update Asset Model',
+    'clone'				=> 'Clone Model',
+    'edit'				=> 'Edit Model',
+);
diff --git a/resources/lang/hi-IN/admin/reports/general.php b/resources/lang/hi-IN/admin/reports/general.php
new file mode 100644
index 0000000000..ed8bf1a156
--- /dev/null
+++ b/resources/lang/hi-IN/admin/reports/general.php
@@ -0,0 +1,23 @@
+<?php
+
+return [
+    'info'   => 'Select the options you want for your asset report.',
+    'deleted_user' => 'Deleted user',
+    'send_reminder' => 'Send reminder',
+    'cannot_send_reminder' => 'User has been deleted or does not have an email address so cannot receive a reminder',
+    'reminder_sent' => 'Reminder sent',
+    'acceptance_deleted' => 'Acceptance request deleted',
+    'acceptance_request' => 'Acceptance request',
+    'custom_export' => [
+        'user_address' => 'User Address',
+        'user_city' => 'User City',
+        'user_state' => 'User State',
+        'user_country' => 'User Country',
+        'user_zip' => 'User Zip'
+    ],
+    'open_saved_template' => 'Open Saved Template',
+    'save_template' =>  'Save Template',
+    'select_a_template' => 'Select a Template',
+    'template_name' => 'Template Name',
+    'update_template' => 'Update Template',
+];
diff --git a/resources/lang/hi-IN/admin/reports/message.php b/resources/lang/hi-IN/admin/reports/message.php
new file mode 100644
index 0000000000..2800bbdf0b
--- /dev/null
+++ b/resources/lang/hi-IN/admin/reports/message.php
@@ -0,0 +1,16 @@
+<?php
+
+return [
+    'about_templates' => 'About Saved Templates',
+    'saving_templates_description' => 'Select your options, then enter the name of your template in the box above and click the \'Save Template\' button. Use the dropdown to select a previously saved template.',
+    'create'  => [
+        'success' => 'Template saved successfully',
+    ],
+    'update' => [
+        'success' => 'Template updated successfully',
+    ],
+    'delete' => [
+        'success' => 'Template deleted',
+        'no_delete_permission' => 'Template does not exist or you do not have permission to delete it.',
+    ],
+];
diff --git a/resources/lang/hi-IN/admin/settings/general.php b/resources/lang/hi-IN/admin/settings/general.php
new file mode 100644
index 0000000000..37cfb0de94
--- /dev/null
+++ b/resources/lang/hi-IN/admin/settings/general.php
@@ -0,0 +1,489 @@
+<?php
+
+return [
+    'ad'				        => 'Active Directory',
+    'ad_domain'				    => 'Active Directory domain',
+    'ad_domain_help'			=> 'This is sometimes the same as your email domain, but not always.',
+    'ad_append_domain_label'    => 'Append domain name',
+    'ad_append_domain'          => 'Append domain name to username field',
+    'ad_append_domain_help'     => 'User isn\'t required to write "username@domain.local", they can just type "username".',
+    'admin_cc_email'            => 'CC Email',
+    'admin_cc_email_help'       => 'Send a copy of checkin/checkout emails to this address.',
+    'admin_settings'            => 'Admin Settings',
+    'is_ad'				        => 'This is an Active Directory server',
+    'alerts'                	=> 'Alerts',
+    'alert_title'               => 'Update Notification Settings',
+    'alert_email'				=> 'Send alerts to',
+    'alert_email_help'          => 'Email addresses or distribution lists you want alerts to be sent to, comma separated.',
+    'alerts_enabled'			=> 'Email Alerts Enabled',
+    'alert_interval'			=> 'Expiring Alerts Threshold (in days)',
+    'alert_inv_threshold'		=> 'Inventory Alert Threshold',
+    'allow_user_skin'           => 'Allow User Skin',
+    'allow_user_skin_help_text' => 'Checking this box will allow a user to override the UI skin with a different one.',
+    'asset_ids'					=> 'Asset IDs',
+    'audit_interval'            => 'Audit Interval',
+    'audit_interval_help'       => 'If you are required to regularly physically audit your assets, enter the interval in months that you use. If you update this value, all of the "next audit dates" for assets with an upcoming audit date will be updated.',
+    'audit_warning_days'        => 'Audit Warning Threshold',
+    'audit_warning_days_help'   => 'How many days in advance should we warn you when assets are due for auditing?',
+    'auto_increment_assets'		=> 'Generate auto-incrementing asset tags',
+    'auto_increment_prefix'		=> 'Prefix (optional)',
+    'auto_incrementing_help'    => 'Enable auto-incrementing asset tags first to set this',
+    'backups'					=> 'Backups',
+    'backups_help'              => 'Create, download, and restore backups ',
+    'backups_restoring'         => 'Restoring from Backup',
+    'backups_clean' => 'Clean the backed-up database before restore',
+    'backups_clean_helptext' => "This can be useful if you're changing between database versions",
+    'backups_upload'            => 'Upload Backup',
+    'backups_path'              => 'Backups on the server are stored in <code>:path</code>',
+    'backups_restore_warning'   => 'Use the restore button <small><span class="btn btn-xs btn-warning"><i class="text-white fas fa-retweet" aria-hidden="true"></i></span></small> to restore from a previous backup. (This does not currently work with S3 file storage or Docker.)<br><br>Your <strong>entire :app_name database and any uploaded files will be completely replaced</strong> by what\'s in the backup file  ',
+    'backups_logged_out'         => 'All existing users, including you, will be logged out once your restore is complete.',
+    'backups_large'             => 'Very large backups may time out on the restore attempt and may still need to be run via command line. ',
+    'barcode_settings'			=> 'Barcode Settings',
+    'confirm_purge'			    => 'Confirm Purge',
+    'confirm_purge_help'		=> 'Enter the text "DELETE" in the box below to purge your deleted records. This action cannot be undone and will PERMANENTLY delete all soft-deleted items and users. (You should make a backup first, just to be safe.)',
+    'custom_css'				=> 'Custom CSS',
+    'custom_css_placeholder'	=> 'Add your custom CSS',
+    'custom_css_help'			=> 'Enter any custom CSS overrides you would like to use. Do not include the &lt;style&gt;&lt;/style&gt; tags.',
+    'custom_forgot_pass_url'	=> 'Custom Password Reset URL',
+    'custom_forgot_pass_url_help'	=> 'This replaces the built-in forgotten password URL on the login screen, useful to direct people to internal or hosted LDAP password reset functionality. It will effectively disable local user forgotten password functionality.',
+    'dashboard_message'			=> 'Dashboard Message',
+    'dashboard_message_help'	=> 'This text will appear on the dashboard for anyone with permission to view the dashboard.',
+    'default_currency'  		=> 'Default Currency',
+    'default_eula_text'			=> 'Default EULA',
+    'default_eula_text_placeholder' => 'Add your default EULA text',
+    'default_language'			=> 'Default Language',
+    'default_eula_help_text'	=> 'You can also associate custom EULAs to specific asset categories.',
+    'acceptance_note'           => 'Add a note for your decision (Optional)',
+    'display_asset_name'        => 'Display Asset Name',
+    'display_checkout_date'     => 'Display Checkout Date',
+    'display_eol'               => 'Display EOL in table view',
+    'display_qr'                => 'Display 2D barcode',
+    'display_alt_barcode'		=> 'Display 1D barcode',
+    'barcode_type'				=> '2D Barcode Type',
+    'alt_barcode_type'			=> '1D barcode type',
+    'enabled'                   => 'Enabled',
+    'eula_settings'				=> 'EULA Settings',
+    'eula_markdown'				=> 'This EULA allows <a href="https://help.github.com/articles/github-flavored-markdown/">Github flavored markdown</a>.',
+    'empty_row_count'           => 'Field Start Offset (Empty Rows)',
+    'empty_row_count_help'      => 'Fields will begin populating after this many empty rows are skipped at the top of the label.',
+    'favicon'                   => 'Favicon',
+    'favicon_format'            => 'Accepted filetypes are ico, png, and gif. Other image formats may not work in all browsers.',
+    'favicon_size'          => 'Favicons should be square images, 16x16 pixels.',
+    'footer_text'               => 'Additional Footer Text ',
+    'footer_text_help'          => 'This text will appear in the right-side footer. Links are allowed using <a href="https://help.github.com/articles/github-flavored-markdown/">Github flavored markdown</a>. Line breaks, headers, images, etc may result in unpredictable results.',
+    'footer_text_placeholder'   => 'Optional footer text',
+    'general_settings'			=> 'General Settings',
+    'general_settings_help'     => 'Default EULA and more',
+    'generate_backup'			=> 'Generate Backup',
+    'google_workspaces'         => 'Google Workspaces',
+    'header_color'              => 'Header Color',
+    'info'                      => 'These settings let you customize certain aspects of your installation.',
+    'label_logo_size'           => 'Square logos look best - will be displayed in the top right of each asset label. ',
+    'laravel'                   => 'Laravel Version',
+    'ldap'                      => 'LDAP',
+    'ldap_default_group'        => 'Default Permissions Group',
+    'ldap_default_group_info'   => 'Select a group to assign to newly synced users. Remember that a user takes on the permissions of the group they are assigned.',
+    'no_default_group'          => 'No Default Group',
+    'ldap_help'                 => 'LDAP/Active Directory',
+    'ldap_client_tls_key'       => 'LDAP Client TLS Key',
+    'ldap_client_tls_cert'      => 'LDAP Client-Side TLS Certificate',
+    'ldap_enabled'              => 'LDAP enabled',
+    'ldap_integration'          => 'LDAP Integration',
+    'ldap_settings'             => 'LDAP Settings',
+    'ldap_client_tls_cert_help' => 'Client-Side TLS Certificate and Key for LDAP connections are usually only useful in Google Workspace configurations with "Secure LDAP." Both are required.',
+    'ldap_location'             => 'LDAP Location',
+'ldap_location_help'             => 'The Ldap Location field should be used if <strong>an OU is not being used in the Base Bind DN.</strong> Leave this blank if an OU search is being used.',
+    'ldap_login_test_help'      => 'Enter a valid LDAP username and password from the base DN you specified above to test whether your LDAP login is configured correctly. YOU MUST SAVE YOUR UPDATED LDAP SETTINGS FIRST.',
+    'ldap_login_sync_help'      => 'This only tests that LDAP can sync correctly. If your LDAP Authentication query is not correct, users may still not be able to login. YOU MUST SAVE YOUR UPDATED LDAP SETTINGS FIRST.',
+    'ldap_manager'              => 'LDAP Manager',
+    'ldap_server'               => 'LDAP Server',
+    'ldap_server_help'          => 'This should start with ldap:// (for unencrypted) or ldaps:// (for TLS or SSL)',
+    'ldap_server_cert'			=> 'LDAP SSL certificate validation',
+    'ldap_server_cert_ignore'	=> 'Allow invalid SSL Certificate',
+    'ldap_server_cert_help'		=> 'Select this checkbox if you are using a self signed SSL cert and would like to accept an invalid SSL certificate.',
+    'ldap_tls'                  => 'Use TLS',
+    'ldap_tls_help'             => 'This should be checked only if you are running STARTTLS on your LDAP server. ',
+    'ldap_uname'                => 'LDAP Bind Username',
+    'ldap_dept'                 => 'LDAP Department',
+    'ldap_phone'                => 'LDAP Telephone Number',
+    'ldap_jobtitle'             => 'LDAP Job Title',
+    'ldap_country'              => 'LDAP Country',
+    'ldap_pword'                => 'LDAP Bind Password',
+    'ldap_basedn'               => 'Base Bind DN',
+    'ldap_filter'               => 'LDAP Filter',
+    'ldap_pw_sync'              => 'Cache LDAP Passwords',
+    'ldap_pw_sync_help'         => 'Uncheck this box if you do not wish to keep LDAP passwords cached as local hashed passwords. Disabling this means that your users may not be able to login if your LDAP server is unreachable for some reason.',
+    'ldap_username_field'       => 'Username Field',
+    'ldap_lname_field'          => 'Last Name',
+    'ldap_fname_field'          => 'LDAP First Name',
+    'ldap_auth_filter_query'    => 'LDAP Authentication query',
+    'ldap_version'              => 'LDAP Version',
+    'ldap_active_flag'          => 'LDAP Active Flag',
+    'ldap_activated_flag_help'  => 'This value is used to determine whether a synced user can login to Snipe-IT. <strong>It does not affect the ability to check items in or out to them</strong>, and should be the <strong>attribute name</strong> within your AD/LDAP, <strong>not the value</strong>. <br><br>If this field is set to a field name that does not exist in your AD/LDAP, or the value in the AD/LDAP field is set to <code>0</code> or <code>false</code>, <strong>user login will be disabled</strong>. If the value in the AD/LDAP field is set to <code>1</code> or <code>true</code> or <em>any other text</em> means the user can log in. When the field is blank in your AD, we respect the <code>userAccountControl</code> attribute, which usually allows non-suspended users to log in.',
+    'ldap_invert_active_flag'   => 'LDAP Invert Active Flag',
+    'ldap_invert_active_flag_help'     => 'If enabled: when the value returned by LDAP Active Flag is <code>0</code> or <code>false</code> the user account will be active.',
+    'ldap_emp_num'              => 'LDAP Employee Number',
+    'ldap_email'                => 'LDAP Email',
+    'ldap_test'                 => 'Test LDAP',
+    'ldap_test_sync'            => 'Test LDAP Synchronization',
+    'license'                   => 'Software License',
+    'load_remote'               => 'Load Remote Avatars',
+    'load_remote_help_text'		=> 'Uncheck this box if your install cannot load scripts from the outside internet. This will prevent Snipe-IT from trying load avatars from Gravatar or other outside sources.',
+    'login'                     => 'Login Attempts',
+    'login_attempt'             => 'Login Attempt',
+    'login_ip'                  => 'IP Address',
+    'login_success'             => 'Success?',
+    'login_user_agent'          => 'User Agent',
+    'login_help'                => 'List of attempted logins',
+    'login_note'                => 'Login Note',
+    'login_note_placeholder'            => "If you do not have a login or have found a device belonging to this company, please call technical support at 888-555-1212. Thank you.",
+    'login_note_help'           => 'Optionally include a few sentences on your login screen, for example to assist people who have found a lost or stolen device. This field accepts <a href="https://help.github.com/articles/github-flavored-markdown/">Github flavored markdown</a>',
+    'login_remote_user_text'    => 'Remote User login options',
+    'login_remote_user_enabled_text' => 'Enable Login with Remote User Header',
+    'login_remote_user_enabled_help' => 'This option enables Authentication via the REMOTE_USER header according to the "Common Gateway Interface (rfc3875)"',
+    'login_common_disabled_text' => 'Disable other authentication mechanisms',
+    'login_common_disabled_help' => 'This option disables other authentication mechanisms. Just enable this option if you are sure that your REMOTE_USER login is already working',
+    'login_remote_user_custom_logout_url_text' => 'Custom logout URL',
+    'login_remote_user_custom_logout_url_help' => 'If a url is provided here, users will get redirected to this URL after the user logs out of Snipe-IT. This is useful to close the user sessions of your Authentication provider correctly.',
+    'login_remote_user_header_name_text' => 'Custom user name header',
+    'login_remote_user_header_name_help' => 'Use the specified header instead of REMOTE_USER',
+    'logo'                    	=> 'Logo',
+    'logo_print_assets'         => 'Use in Print',
+    'logo_print_assets_help'    => 'Use branding on printable asset lists ',
+    'full_multiple_companies_support_help_text' => 'Restricting users (including admins) assigned to companies to their company\'s assets.',
+    'full_multiple_companies_support_text' => 'Full Multiple Companies Support',
+    'scope_locations_fmcs_support_text'  => 'Scope Locations with Full Multiple Companies Support',
+    'scope_locations_fmcs_support_help_text'  => 'Restrict locations to their selected company.',
+    'scope_locations_fmcs_check_button' => 'Check Compatibility',
+    'scope_locations_fmcs_support_disabled_text'  => 'This option is disabled because you have conflicting locations set for :count or more items.',
+    'show_in_model_list'   => 'Show in Model Dropdowns',
+    'optional'					=> 'optional',
+    'per_page'                  => 'Results Per Page',
+    'php'                       => 'PHP Version',
+    'php_info'                  => 'PHP info',
+    'php_overview'              => 'PHP',
+    'php_overview_help'         => 'PHP System info',
+    'php_gd_info'               => 'You must install php-gd to display QR codes, see install instructions.',
+    'php_gd_warning'            => 'PHP Image Processing and GD plugin is NOT installed.',
+    'pwd_secure_complexity'     => 'Password Complexity',
+    'pwd_secure_complexity_help' => 'Select whichever password complexity rules you wish to enforce.',
+    'pwd_secure_complexity_disallow_same_pwd_as_user_fields' => 'Password cannot be the same as first name, last name, email, or username',
+    'pwd_secure_complexity_letters' => 'Require at least one letter',
+    'pwd_secure_complexity_numbers' => 'Require at least one number',
+    'pwd_secure_complexity_symbols' => 'Require at least one symbol',
+    'pwd_secure_complexity_case_diff' => 'Require at least one uppercase and one lowercase',
+    'pwd_secure_min'            => 'Password minimum characters',
+    'pwd_secure_min_help'       => 'Minimum permitted value is 8',
+    'pwd_secure_uncommon'       => 'Prevent common passwords',
+    'pwd_secure_uncommon_help'  => 'This will disallow users from using common passwords from the top 10,000 passwords reported in breaches.',
+    'qr_help'                   => 'Enable QR Codes first to set this',
+    'qr_text'                   => 'QR Code Text',
+    'saml'                      => 'SAML',
+    'saml_title'                => 'Update SAML settings',
+    'saml_help'                 => 'SAML settings',
+    'saml_enabled'              => 'SAML enabled',
+    'saml_integration'          => 'SAML Integration',
+    'saml_sp_entityid'          => 'Entity ID',
+    'saml_sp_acs_url'           => 'Assertion Consumer Service (ACS) URL',
+    'saml_sp_sls_url'           => 'Single Logout Service (SLS) URL',
+    'saml_sp_x509cert'          => 'Public Certificate',
+    'saml_sp_metadata_url'      => 'Metadata URL',
+    'saml_idp_metadata'         => 'SAML IdP Metadata',
+    'saml_idp_metadata_help'    => 'You can specify the IdP metadata using a URL or XML file.',
+    'saml_attr_mapping_username' => 'Attribute Mapping - Username',
+    'saml_attr_mapping_username_help' => 'NameID will be used if attribute mapping is unspecified or invalid.',
+    'saml_forcelogin_label'     => 'SAML Force Login',
+    'saml_forcelogin'           => 'Make SAML the primary login',
+    'saml_forcelogin_help'      => 'You can use \'/login?nosaml\' to get to the normal login page.',
+    'saml_slo_label'            => 'SAML Single Log Out',
+    'saml_slo'                  => 'Send a LogoutRequest to IdP on Logout',
+    'saml_slo_help'             => 'This will cause the user to be first redirected to the IdP on logout. Leave unchecked if the IdP doesn\'t correctly support SP-initiated SAML SLO.',
+    'saml_custom_settings'      => 'SAML Custom Settings',
+    'saml_custom_settings_help' => 'You can specify additional settings to the onelogin/php-saml library. Use at your own risk.',
+    'saml_download'             => 'Download Metadata',
+    'setting'                   => 'Setting',
+    'settings'                  => 'Settings',
+    'show_alerts_in_menu'       => 'Show alerts in top menu',
+    'show_archived_in_list'     => 'Archived Assets',
+    'show_archived_in_list_text'     => 'Show archived assets in the "all assets" listing',
+    'show_assigned_assets'      => 'Show assets assigned to assets',
+    'show_assigned_assets_help' => 'Display assets which were assigned to the other assets in View User -> Assets, View User -> Info -> Print All Assigned and in Account -> View Assigned Assets.',
+    'show_images_in_email'     => 'Show images in emails',
+    'show_images_in_email_help'   => 'Uncheck this box if your Snipe-IT installation is behind a VPN or closed network and users outside the network will not be able to load images served from this installation in their emails.',
+    'site_name'                 => 'Site Name',
+    'integrations'               => 'Integrations',
+    'slack'                     => 'Slack',
+    'general_webhook'           => 'General Webhook',
+    'ms_teams'                  => 'Microsoft Teams',
+    'webhook'                   => ':app',
+    'webhook_presave'           => 'Test to Save',
+    'webhook_title'               => 'Update Webhook Settings',
+    'webhook_help'                => 'Integration settings',
+    'webhook_botname'             => ':app Botname',
+    'webhook_channel'             => ':app Channel',
+    'webhook_endpoint'            => ':app Endpoint',
+    'webhook_integration'         => ':app Settings',
+    'webhook_test'                 =>'Test :app integration',
+    'webhook_integration_help'    => ':app integration is optional, however the endpoint and channel are required if you wish to use it. To configure :app integration, you must first <a href=":webhook_link" target="_new" rel="noopener">create an incoming webhook</a> on your :app account. Click on the <strong>Test :app Integration</strong> button to confirm your settings are correct before saving. ',
+    'webhook_integration_help_button'    => 'Once you have saved your :app information, a test button will appear.',
+    'webhook_test_help'           => 'Test whether your :app integration is configured correctly. YOU MUST SAVE YOUR UPDATED :app SETTINGS FIRST.',
+    'shortcuts_enabled'         => 'Enable Shortcuts',
+    'shortcuts_help_text'       => '<strong>Windows</strong>: Alt + Access key, <strong>Mac</strong>: Control + Option + Access key',
+    'snipe_version'  			=> 'Snipe-IT version',
+    'support_footer'            => 'Support Footer Links ',
+    'support_footer_help'       => 'Specify who sees the links to the Snipe-IT Support info and Users Manual',
+    'version_footer'            => 'Version in Footer ',
+    'version_footer_help'       => 'Specify who sees the Snipe-IT version and build number.',
+    'system'                    => 'System Information',
+    'update'                    => 'Update Settings',
+    'value'                     => 'Value',
+    'brand'                     => 'Branding',
+    'brand_help'                => 'Logo, Site Name',
+    'web_brand'                 => 'Web Branding Type',
+    'about_settings_title'      => 'About Settings',
+    'about_settings_text'       => 'These settings let you customize certain aspects of your installation.',
+    'labels_per_page'           => 'Labels per page',
+    'label_dimensions'          => 'Label dimensions (inches)',
+    'next_auto_tag_base'        => 'Next auto-increment',
+    'page_padding'              => 'Page margins (inches)',
+    'privacy_policy_link'       => 'Link to Privacy Policy',
+    'privacy_policy'            => 'Privacy Policy',
+    'privacy_policy_link_help'  => 'If a url is included here, a link to your privacy policy will be included in the app footer and in any emails that the system sends out, in compliance with GDPR. ',
+    'purge'                     => 'Purge Deleted Records',
+    'purge_deleted'             => 'Purge Deleted ',
+    'labels_display_bgutter'    => 'Label bottom gutter',
+    'labels_display_sgutter'    => 'Label side gutter',
+    'labels_fontsize'           => 'Label font size',
+    'labels_pagewidth'          => 'Label sheet width',
+    'labels_pageheight'         => 'Label sheet height',
+    'label_gutters'        => 'Label spacing (inches)',
+    'page_dimensions'        => 'Page dimensions (inches)',
+    'label_fields'          => 'Label visible fields',
+    'inches'        => 'inches',
+    'width_w'        => 'w',
+    'height_h'        => 'h',
+    'show_url_in_emails'                => 'Link to Snipe-IT in Emails',
+    'show_url_in_emails_help_text'      => 'Uncheck this box if you do not wish to link back to your Snipe-IT installation in your email footers. Useful if most of your users never login. ',
+    'text_pt'        => 'pt',
+    'thumbnail_max_h'   => 'Max thumbnail height',
+    'thumbnail_max_h_help'   => 'Maximum height in pixels that thumbnails may display in the listing view. Min 25, max 500.',
+    'two_factor'        => 'Two Factor Authentication',
+    'two_factor_secret'        => 'Two-Factor Code',
+    'two_factor_enrollment'        => 'Two-Factor Enrollment',
+    'two_factor_enabled_text'        => 'Enable Two Factor',
+    'two_factor_reset'        => 'Reset Two-Factor Secret',
+    'two_factor_reset_help'        => 'This will force the user to enroll their device with their authenticator app again. This can be useful if their currently enrolled device is lost or stolen. ',
+    'two_factor_reset_success'          => 'Two factor device successfully reset',
+    'two_factor_reset_error'          => 'Two factor device reset failed',
+    'two_factor_enabled_warning'        => 'Enabling two-factor if it is not currently enabled will immediately force you to authenticate with a Google Auth enrolled device. You will have the ability to enroll your device if one is not currently enrolled.',
+    'two_factor_enabled_help'        => 'This will turn on two-factor authentication using Google Authenticator.',
+    'two_factor_optional'        => 'Selective (Users can enable or disable if permitted)',
+    'two_factor_required'        => 'Required for all users',
+    'two_factor_disabled'        => 'Disabled',
+    'two_factor_enter_code'	=> 'Enter Two-Factor Code',
+    'two_factor_config_complete'	=> 'Submit Code',
+    'two_factor_enabled_edit_not_allowed' => 'Your administrator does not permit you to edit this setting.',
+    'two_factor_enrollment_text'	=> "Two factor authentication is required, however your device has not been enrolled yet. Open your Google Authenticator app and scan the QR code below to enroll your device. Once you've enrolled your device, enter the code below",
+    'require_accept_signature'      => 'Require Signature',
+    'require_accept_signature_help_text'      => 'Enabling this feature will require users to physically sign off on accepting an asset.',
+    'require_checkinout_notes'  => 'Require Notes on Checkin/Checkout',
+    'require_checkinout_notes_help_text'    => 'Enabling this feature will require the note fields to be populated when checking in or checking out an asset.',
+    'left'        => 'left',
+    'right'        => 'right',
+    'top'        => 'top',
+    'bottom'        => 'bottom',
+    'vertical'        => 'vertical',
+    'horizontal'        => 'horizontal',
+    'unique_serial'                => 'Unique serial numbers',
+    'unique_serial_help_text'                => 'Checking this box will enforce a uniqueness constraint on asset serials',
+    'zerofill_count'        => 'Length of asset tags, including zerofill',
+    'username_format_help'   => 'This setting will only be used by the import process if a username is not provided and we have to generate a username for you.',
+    'oauth_title' => 'OAuth API Settings',
+    'oauth_clients' => 'OAuth Clients',
+    'oauth' => 'OAuth',
+    'oauth_help' => 'Oauth Endpoint Settings',
+    'oauth_no_clients' => 'You have not created any OAuth clients yet.',
+    'oauth_secret' => 'Secret',
+    'oauth_authorized_apps' => 'Authorized Applications',
+    'oauth_redirect_url' => 'Redirect URL',
+    'oauth_name_help' => ' Something your users will recognize and trust.',
+    'oauth_scopes' => 'Scopes',
+    'oauth_callback_url' => 'Your application authorization callback URL.',
+    'create_client' => 'Create Client',
+    'no_scopes' => 'No scopes',
+    'asset_tag_title' => 'Update Asset Tag Settings',
+    'barcode_title' => 'Update Barcode Settings',
+    'barcodes' => 'Barcodes',
+    'barcodes_help_overview' => 'Barcode &amp; QR settings',
+    'barcodes_help' => 'This will attempt to delete cached barcodes. This would typically only be used if your barcode settings have changed, or if your Snipe-IT URL has changed. Barcodes will be re-generated when accessed next.',
+    'barcodes_spinner' => 'Attempting to delete files...',
+    'barcode_delete_cache' => 'Delete Barcode Cache',
+    'branding_title' => 'Update Branding Settings',
+    'general_title' => 'Update General Settings',
+    'mail_test' => 'Send Test',
+    'mail_test_help' => 'This will attempt to send a test mail to :replyto.',
+    'filter_by_keyword' => 'Filter by setting keyword',
+    'security' => 'Security',
+    'security_title' => 'Update Security Settings',
+    'security_help' => 'Two-factor, Password Restrictions',
+    'groups_help' => 'Account permission groups',
+    'localization' => 'Localization',
+    'localization_title' => 'Update Localization Settings',
+    'localization_help' => 'Language, date display',
+    'notifications' => 'Notifications',
+    'notifications_help' => 'Email Alerts & Audit Settings',
+    'asset_tags_help' => 'Incrementing and prefixes',
+    'labels' => 'Labels',
+    'labels_title' => 'Update Label Settings',
+    'labels_help' => 'Barcodes &amp; label settings',
+    'purge_help' => 'Purge Deleted Records',
+    'ldap_extension_warning' => 'It does not look like the LDAP extension is installed or enabled on this server. You can still save your settings, but you will need to enable the LDAP extension for PHP before LDAP syncing or login will work.',
+    'ldap_ad' => 'LDAP/AD',
+    'ldap_test_label' => 'Test LDAP Sync',
+    'ldap_test_login' => ' Test LDAP Login',
+    'ldap_username_placeholder' => 'LDAP Username',
+    'ldap_password_placeholder' => 'LDAP Password',
+    'employee_number' => 'Employee Number',
+    'create_admin_user' => 'Create a User ::',
+    'create_admin_success' => 'Success! Your admin user has been added!',
+    'create_admin_redirect' => 'Click here to go to your app login!',
+    'setup_migrations' => 'Database Migrations ::',
+    'setup_no_migrations' => 'There was nothing to migrate. Your database tables were already set up!',
+    'setup_successful_migrations' => 'Your database tables have been created',
+    'setup_migration_output' => 'Migration output:',
+    'setup_migration_create_user' => 'Next: Create User',
+    'ldap_settings_link' => 'LDAP Settings Page',
+    'slack_test' => 'Test <i class="fab fa-slack"></i> Integration',
+    'status_label_name' => 'Status Label Name',
+    'super_admin_only'  => 'Super Admin Only',
+    'label2_enable'           => 'New Label Engine',
+    'label2_enable_help'      => 'Switch to the new label engine. <b>Note: You will need to save this setting before setting others.</b>',
+    'label2_template'         => 'Template',
+    'label2_template_help'    => 'Select which template to use for label generation',
+    'label2_title'            => 'Title',
+    'label2_title_help'       => 'The title to show on labels that support it',
+    'label2_title_help_phold' => 'The placeholder <code>{COMPANY}</code> will be replaced with the asset&apos;s company name',
+    'label2_asset_logo'       => 'Use Asset Logo',
+    'label2_asset_logo_help'  => 'Use the logo of the asset&apos;s assigned company, rather than the value at <code>:setting_name</code>',
+    'label2_1d_type'          => '1D Barcode Type',
+    'label2_1d_type_help'     => 'Format for 1D barcodes',
+    'label2_2d_type'          => '2D Barcode Type',
+    'label2_2d_type_help'     => 'Format for 2D barcodes',
+    'label2_2d_target'        => '2D Barcode Target',
+    'label2_2d_target_help'   => 'The data that will be contained in the 2D barcode',
+    'label2_fields'           => 'Field Definitions',
+    'label2_fields_help'      => 'Fields can be added, removed, and reordered in the left column. For each field, multiple options for Label and DataSource can be added, removed, and reordered in the right column.',
+    'purge_barcodes' => 'Purge Barcodes',
+    'help_asterisk_bold'    => 'Text entered as <code>**text**</code> will be displayed as bold',
+    'help_blank_to_use'     => 'Leave blank to use the value from <code>:setting_name</code>',
+    'help_default_will_use' => '<code>:default</code> will use the value from <code>:setting_name</code>. <br>Note that the value of the barcodes must comply with the respective barcode spec in order to be successfully generated. Please see <a href="https://snipe-it.readme.io/docs/barcodes">the documentation <i class="fa fa-external-link"></i></a> for more details. ',
+    'asset_id'              => 'Asset ID',
+    'data'               => 'Data',
+    'default'               => 'Default',
+    'none'                  => 'None',
+    'google_callback_help' => 'This should be entered as the callback URL in your Google OAuth app settings in your organization&apos;s <strong><a href="https://console.cloud.google.com/" target="_blank">Google developer console <i class="fa fa-external-link" aria-hidden="true"></i></a></strong>.',
+    'google_login'      => 'Google Workspace Login Settings',
+    'enable_google_login'  => 'Enable users to login with Google Workspace',
+    'enable_google_login_help'  => 'Users will not be automatically provisioned. They must have an existing account here AND in Google Workspace, and their username here must match their Google Workspace email address. ',
+    'mail_reply_to' => 'Mail Reply-To Address',
+    'mail_from' => 'Mail From Address',
+    'database_driver' => 'Database Driver',
+    'bs_table_storage' => 'Table Storage',
+    'timezone' => 'Timezone',
+    'test_mail' => 'Test Mail',
+    'profile_edit'          => 'Edit Profile',
+    'profile_edit_help'          => 'Allow users to edit their own profiles.',
+    'default_avatar' => 'Custom Default Avatar',
+    'default_avatar_help' => 'This image will be displayed as a profile if a user does not have a profile photo.',
+    'restore_default_avatar' => 'Restore <a href=":default_avatar" data-toggle="lightbox" data-type="image">original system default avatar</a>',
+    'restore_default_avatar_help' => '',
+    'due_checkin_days' => 'Due For Checkin Warning',
+    'due_checkin_days_help' => 'How many days before the expected checkin of an asset should it be listed in the "Due for checkin" page?',
+    'no_groups' => 'No groups have been created yet. Visit <code>Admin Settings > Permission Groups</code> to add one.',
+    'text' => 'Text',
+
+    'username_formats' => [
+        'username_format'		=> 'Username Format',
+        'firstname_lastname_format'	=> 'First Name Last Name (jane.smith)',
+        'first_name_format'	        => 'First Name (jane)',
+        'last_name_format'		=> 'Last Name (doe)',
+        'filastname_format'			=> 'First Initial Last Name (jsmith)',
+        'lastnamefirstinitial_format' =>  'Last Name First Initial (smithj)',
+        'firstname_lastname_underscore_format' => 'First Name Last Name (jane_smith)',
+        'firstinitial.lastname' => 'First Initial Last Name (j.smith)',
+        'lastname_firstinitial' => 'Last Name First Initial (smith_j)',
+        'lastname_dot_firstinitial_format' => 'Last Name First Initial (smith.j)',
+        'firstnamelastname'     => 'First Name Last Name (janesmith)',
+        'firstnamelastinitial'  => 'First Name Last Initial (janes)',
+        'lastnamefirstname'      => 'Last Name.First Name (smith.jane)',
+    ],
+
+    'email_formats' => [
+        'email_format'			=> 'Email Format',
+        'firstname_lastname_format'	=> 'First Name Last Name (jane.smith@example.com)',
+        'first_name_format'		=> 'First Name (jane@example.com)',
+        'last_name_format'		=> 'Last Name (doe@example.com)',
+        'filastname_format'			=> 'First Initial Last Name (jsmith@example.com)',
+        'lastnamefirstinitial_format' =>  'Last Name First Initial (smithj@example.com)',
+        'firstname_lastname_underscore_format' => 'First Name Last Name (jane_smith@example.com)',
+        'firstinitial.lastname' => 'First Initial Last Name (j.smith@example.com)',
+        'lastname_firstinitial' => 'Last Name First Initial (smith_j@example.com)',
+        'lastname_dot_firstinitial_format' => 'Last Name First Initial (smith.j@example.com)',
+        'firstnamelastname'     => 'First Name Last Name (janesmith@example.com)',
+        'firstnamelastinitial'  => 'First Name Last Initial (janes@example.com)',
+        'lastnamefirstname'      => 'Last Name.First Name (smith.jane@example.com)',
+    ],
+
+
+
+    'logo_labels' => [
+        'acceptance_pdf_logo'       => 'PDF Logo',
+        'email_logo'                => 'Email Logo',
+        'label_logo'                => 'Label Logo',
+        'logo'                      => 'Site Logo',
+        'favicon'                   => 'Favicon',
+    ],
+
+    'logo_help' => [
+        'email_logo_size'       => 'Square logos in email look best. ',
+    ],
+
+    'logo_option_types' => [
+        'text' => 'Text',
+        'logo' => 'Logo',
+        'logo_and_text' => 'Logo and Text',
+    ],
+
+
+    'legends' => [
+        'scoping' => 'Scoping',
+        'formats' => 'Default Formats',
+        'profiles' => 'User Profiles',
+        'eula' => 'EULA & Acceptance Preferences',
+        'misc_display' => 'Miscellaneous Display Options',
+        'email' => 'Email Preferences',
+        'checkin' => 'Checkin Preferences',
+        'dashboard' => 'Login & Dashboard Preferences',
+        'misc' => 'Miscellaneous',
+        'logos' => 'Logos & Display',
+        'colors' => 'Colors & Skins',
+        'footer' => 'Footer Preferences',
+        'security' => 'Security Preferences',
+        'general' => 'General',
+        'intervals' => 'Intervals & Thresholds',
+    ],
+
+
+    /* Keywords for settings overview help */
+    'keywords' => [
+        'brand'             => 'footer, logo, print, theme, skin, header, colors, color, css',
+        'general_settings'  => 'company support, signature, acceptance, email format, username format, images, per page, thumbnail, eula, gravatar, tos, dashboard, privacy',
+        'groups'            => 'permissions, permission groups, authorization',
+        'labels'            => 'labels, barcodes, barcode, sheets, print, upc, qr, 1d, 2d',
+        'localization'      => 'localization, currency, local, locale, time zone, timezone, international, internatinalization, language, languages, translation',
+        'php_overview'      => 'phpinfo, system, info',
+        'purge'             => 'permanently delete',
+        'security'          => 'password, passwords, requirements, two factor, two-factor, common passwords, remote login, logout, authentication',
+    ],
+
+];
diff --git a/resources/lang/hi-IN/admin/settings/message.php b/resources/lang/hi-IN/admin/settings/message.php
new file mode 100644
index 0000000000..58abf14c5c
--- /dev/null
+++ b/resources/lang/hi-IN/admin/settings/message.php
@@ -0,0 +1,59 @@
+<?php
+
+return [
+
+    'update' => [
+        'error'                 => 'An error has occurred while updating. ',
+        'success'               => 'Settings updated successfully.',
+    ],
+    'backup' => [
+        'delete_confirm'        => 'Are you sure you would like to delete this backup file? This action cannot be undone. ',
+        'file_deleted'          => 'The backup file was successfully deleted. ',
+        'generated'             => 'A new backup file was successfully created.',
+        'file_not_found'        => 'That backup file could not be found on the server.',
+        'restore_warning'       => 'Yes, restore it. I acknowledge that this will overwrite any existing data currently in the database. This will also log out all of your existing users (including you).',
+        'restore_confirm'       => 'Are you sure you wish to restore your database from :filename?'
+    ],
+    'restore' => [
+        'success'               => 'Your system backup has been restored. Please log in again.'
+    ],
+    'purge' => [
+        'error'     => 'An error has occurred while purging. ',
+        'validation_failed'     => 'Your purge confirmation is incorrect. Please type the word "DELETE" in the confirmation box.',
+        'success'               => 'Deleted records successfully purged.',
+    ],
+    'mail' => [
+        'sending' => 'Sending Test Email...',
+        'success' => 'Mail sent!',
+        'error' => 'Mail could not be sent.',
+        'additional' => 'No additional error message provided. Check your mail settings and your app log.'
+    ],
+    'ldap' => [
+        'testing' => 'Testing LDAP Connection, Binding & Query ...',
+        '500' => '500 Server Error. Please check your server logs for more information.',
+        'error' => 'Something went wrong :(',
+        'sync_success' => 'A sample of 10 users returned from the LDAP server based on your settings:',
+        'testing_authentication' => 'Testing LDAP Authentication...',
+        'authentication_success' => 'User authenticated against LDAP successfully!'
+    ],
+    'labels' => [
+        'null_template' => 'Label template not found. Please select a template.',
+        ],
+    'webhook' => [
+        'sending' => 'Sending :app test message...',
+        'success' => 'Your :webhook_name Integration works!',
+        'success_pt1' => 'Success! Check the ',
+        'success_pt2' => ' channel for your test message, and be sure to click SAVE below to store your settings.',
+        '500' => '500 Server Error.',
+        'error' => 'Something went wrong. :app responded with: :error_message',
+        'error_redirect' => 'ERROR: 301/302 :endpoint returns a redirect. For security reasons, we don’t follow redirects. Please use the actual endpoint.',
+        'error_misc' => 'Something went wrong. :( ',
+        'webhook_fail' => ' webhook notification failed: Check to make sure the URL is still valid.',
+        'webhook_channel_not_found' => ' webhook channel not found.',
+        'ms_teams_deprecation' => 'The selected Microsoft Teams webhook URL will be deprecated Dec 31st, 2025. Please use a workflow URL. Microsoft\'s documentation on creating a workflow can be found <a href="https://support.microsoft.com/en-us/office/create-incoming-webhooks-with-workflows-for-microsoft-teams-8ae491c7-0394-4861-ba59-055e33f75498" target="_blank"> here.</a>',
+    ],
+    'location_scoping' => [
+        'not_saved' => 'Your settings were not saved.',
+        'mismatch' => 'There is 1 item in the database that need your attention before you can enable location scoping.|There are :count items in the database that need your attention before you can enable location scoping.',
+    ],
+];
diff --git a/resources/lang/hi-IN/admin/settings/table.php b/resources/lang/hi-IN/admin/settings/table.php
new file mode 100644
index 0000000000..22db5c84ed
--- /dev/null
+++ b/resources/lang/hi-IN/admin/settings/table.php
@@ -0,0 +1,6 @@
+<?php
+
+return array(
+    'created'   => 'Created',
+    'size' => 'Size',
+);
diff --git a/resources/lang/hi-IN/admin/statuslabels/message.php b/resources/lang/hi-IN/admin/statuslabels/message.php
new file mode 100644
index 0000000000..b1b4034d0d
--- /dev/null
+++ b/resources/lang/hi-IN/admin/statuslabels/message.php
@@ -0,0 +1,32 @@
+<?php
+
+return [
+
+    'does_not_exist' => 'Status Label does not exist.',
+    'deleted_label' => 'Deleted Status Label',
+    'assoc_assets'	 => 'This Status Label is currently associated with at least one Asset and cannot be deleted. Please update your assets to no longer reference this status and try again. ',
+
+    'create' => [
+        'error'   => 'Status Label was not created, please try again.',
+        'success' => 'Status Label created successfully.',
+    ],
+
+    'update' => [
+        'error'   => 'Status Label was not updated, please try again',
+        'success' => 'Status Label updated successfully.',
+    ],
+
+    'delete' => [
+        'confirm'   => 'Are you sure you wish to delete this Status Label?',
+        'error'   => 'There was an issue deleting the Status Label. Please try again.',
+        'success' => 'The Status Label was deleted successfully.',
+    ],
+
+    'help' => [
+        'undeployable'   => 'These assets cannot be assigned to anyone.',
+        'deployable'   => 'These assets can be checked out. Once they are assigned, they will assume a meta status of <i class="fas fa-circle text-blue"></i> <strong>Deployed</strong>.',
+        'archived'   => 'These assets cannot be checked out, and will only show up in the Archived view. This is useful for retaining information about assets for budgeting/historic purposes but keeping them out of the day-to-day asset list.',
+        'pending'   => 'These assets can not yet be assigned to anyone, often used for items that are out for repair, but are expected to return to circulation.',
+    ],
+
+];
diff --git a/resources/lang/hi-IN/admin/statuslabels/table.php b/resources/lang/hi-IN/admin/statuslabels/table.php
new file mode 100644
index 0000000000..1a0fab891e
--- /dev/null
+++ b/resources/lang/hi-IN/admin/statuslabels/table.php
@@ -0,0 +1,19 @@
+<?php
+
+return array(
+    'about'      	=> 'About Status Types',
+    'archived'      	=> 'Archived',
+    'create'      	=> 'Create Status Label',
+    'color'      	=> 'Chart Color',
+    'default_label' => 'Default Label',
+    'default_label_help' => 'This is used to ensure your most commonly used status labels appear at the top of the select box when creating/editing assets.',
+    'deployable'      	=> 'Deployable',
+    'info'      	=> 'Status label types are used to describe the various states your assets could be in. They may be out for repair, lost/stolen, etc. You can create new status labels for your deployable, pending and archived assets according to your own workflow. For more information, <a href="https://snipe-it.readme.io/docs/overview#status-labels" target="_blank">see the documentation <i class="fa fa-external-link"></i></a>.',
+    'name'      	=> 'Status Name',
+    'pending'      	=> 'Pending',
+    'status_type'   => 'Status Type',
+    'show_in_nav'   => 'Show in side nav',
+    'title'      	=> 'Status Labels',
+    'undeployable'  => 'Undeployable',
+    'update'      	=> 'Update Status Label',
+);
diff --git a/resources/lang/hi-IN/admin/suppliers/message.php b/resources/lang/hi-IN/admin/suppliers/message.php
new file mode 100644
index 0000000000..a693669c7e
--- /dev/null
+++ b/resources/lang/hi-IN/admin/suppliers/message.php
@@ -0,0 +1,28 @@
+<?php
+
+return array(
+
+    'deleted' => 'Deleted supplier',
+    'does_not_exist' => 'Supplier does not exist.',
+
+
+    'create' => array(
+        'error'   => 'Supplier was not created, please try again.',
+        'success' => 'Supplier created successfully.'
+    ),
+
+    'update' => array(
+        'error'   => 'Supplier was not updated, please try again',
+        'success' => 'Supplier updated successfully.'
+    ),
+
+    'delete' => array(
+        'confirm'   => 'Are you sure you wish to delete this supplier?',
+        'error'   => 'There was an issue deleting the supplier. Please try again.',
+        'success' => 'Supplier was deleted successfully.',
+        'assoc_assets'	 => 'This supplier is currently associated with :asset_count asset(s) and cannot be deleted. Please update your assets to no longer reference this supplier and try again. ',
+        'assoc_licenses'	 => 'This supplier is currently associated with :licenses_count licences(s) and cannot be deleted. Please update your licenses to no longer reference this supplier and try again. ',
+        'assoc_maintenances'	 => 'This supplier is currently associated with :asset_maintenances_count asset maintenances(s) and cannot be deleted. Please update your asset maintenances to no longer reference this supplier and try again. ',
+    )
+
+);
diff --git a/resources/lang/hi-IN/admin/suppliers/table.php b/resources/lang/hi-IN/admin/suppliers/table.php
new file mode 100644
index 0000000000..fe7ce55021
--- /dev/null
+++ b/resources/lang/hi-IN/admin/suppliers/table.php
@@ -0,0 +1,26 @@
+<?php
+
+return array(
+    'about_suppliers_title' => 'About Suppliers',
+    'about_suppliers_text'  => 'Suppliers are used to track the source of items',
+    'address'               => 'Supplier Address',
+    'assets'                => 'Assets',
+    'city'                  => 'City',
+    'contact'               => 'Contact Name',
+    'country'               => 'Country',
+    'create'                => 'Create Supplier',
+    'email'                 => 'Email',
+    'fax'                   => 'Fax',
+    'id'                    => 'ID',
+    'licenses'              => 'Licenses',
+    'name'                  => 'Supplier Name',
+    'notes'                 => 'Notes',
+    'phone'                 => 'Phone',
+    'state'                 => 'State',
+    'suppliers'             => 'Suppliers',
+    'update'                => 'Update Supplier',
+    'view'                  => 'View Supplier',
+    'view_assets_for'       => 'View Assets for',
+    'zip'                   => 'Postal Code',
+
+);
diff --git a/resources/lang/hi-IN/admin/users/general.php b/resources/lang/hi-IN/admin/users/general.php
new file mode 100644
index 0000000000..14f36cf151
--- /dev/null
+++ b/resources/lang/hi-IN/admin/users/general.php
@@ -0,0 +1,56 @@
+<?php
+
+return [
+    'activated_help_text' => 'This user can login',
+    'activated_disabled_help_text' => 'You cannot edit activation status for your own account.',
+    'assets_user'       => 'Assets assigned to :name',
+    'bulk_update_warn'	=> 'You are about to edit the properties of :user_count users. Please note that you cannot change your own user attributes using this form, and must make edits to your own user individually.',
+    'bulk_update_help'	=> 'This form allows you to update multiple users at once. Only fill in the fields you need to change. Any fields left blank will remain unchanged.',
+    'current_assets'    => 'Assets currently checked out to this user',
+    'clone'             => 'Clone User',
+    'contact_user'      => 'Contact :name',
+    'edit'              => 'Edit User',
+    'filetype_info'     => 'Allowed filetypes are png, gif, jpg, jpeg, doc, docx, pdf, txt, zip, and rar.',
+    'history_user'      => 'History for :name',
+    'info'				=> 'Info',
+    'restore_user'		=> 'Click here to restore them.',
+    'last_login'        => 'Last Login',
+    'ldap_config_text'  => 'LDAP configuration settings can be found Admin > Settings. The (optional) selected location will be set for all imported users.',
+    'print_assigned'    => 'Print All Assigned',
+    'email_assigned'    => 'Email List of All Assigned',
+    'user_notified'     => 'User has been emailed a list of their currently assigned items.',
+    'users_notified'    => 'The user has been emailed a list of their currently assigned items.|:count users have been emailed a list of their currently assigned items.',
+    'users_notified_warning' => ':count user has been emailed a list of their currently assigned items, however :no_email users did not have an email address so could not be emailed.|:count users have been emailed a list of their currently assigned items, however :no_email user(s) did not have an email address so could not be emailed.',
+    'auto_assign_label' => 'Include this user when auto-assigning eligible licenses',
+    'auto_assign_help'  => 'Skip this user in auto assignment of licenses',
+    'software_user'     => 'Software Checked out to :name',
+    'send_email_help'   => 'You must provide an email address for this user to send them credentials. Emailing credentials can only be done on user creation. Passwords are stored in a one-way hash and cannot be retrieved once saved.',
+    'view_user'         => 'View User :name',
+    'usercsv'           => 'CSV file',
+    'two_factor_admin_optin_help' => 'Your current admin settings allow selective enforcement of two-factor authentication.  ',
+    'two_factor_enrolled' => '2FA Device Enrolled ',
+    'two_factor_active'   => '2FA Active ',
+    'user_deactivated'  => 'User cannot login',
+    'user_activated'  => 'User can login',
+    'activation_status_warning' => 'Do not change activation status',
+    'group_memberships_helpblock' => 'Only superadmins may edit group memberships.',
+    'superadmin_permission_warning' => 'Only superadmins may grant a user superadmin access.',
+    'admin_permission_warning' => 'Only users with admins rights or greater may grant a user admin access.',
+    'remove_group_memberships' => 'Remove Group Memberships',
+    'warning_deletion_information' => 'You are about to checkin ALL items from the :count user(s) listed below. Super admin names are highlighted in red.',
+    'update_user_assets_status' => 'Update all assets for these users to this status',
+    'checkin_user_properties' => 'Check in all properties associated with these users',
+    'remote_label'   => 'This is a remote user',
+    'remote'   => 'Remote',
+    'remote_help' => 'This can be useful if you need to filter by remote users who never or rarely come into your physical locations.',
+    'not_remote_label' => 'This is not a remote user',
+    'vip_label' => 'VIP user',
+    'vip_help' => 'This can be helpful to mark important people in your org if you would like to handle them in special ways.',
+    'create_user' => 'Create a user',
+    'create_user_page_explanation' => 'This is the account information you will use to access the site for the first time.',
+    'email_credentials' => 'Email credentials',
+    'email_credentials_text' => 'Email my credentials to the email address above',
+    'next_save_user' => 'Next: Save User',
+    'all_assigned_list_generation' => 'Generated on:',
+    'email_user_creds_on_create' => 'Email this user their credentials?',
+];
diff --git a/resources/lang/hi-IN/admin/users/message.php b/resources/lang/hi-IN/admin/users/message.php
new file mode 100644
index 0000000000..b6ddad3aac
--- /dev/null
+++ b/resources/lang/hi-IN/admin/users/message.php
@@ -0,0 +1,75 @@
+<?php
+
+return array(
+
+    'accepted'                  => 'You have successfully accepted this asset.',
+    'declined'                  => 'You have successfully declined this asset.',
+    'bulk_manager_warn'	        => 'Your users have been successfully updated, however your manager entry was not saved because the manager you selected was also in the user list to be edited, and users may not be their own manager. Please select your users again, excluding the manager.',
+    'user_exists'               => 'User already exists!',
+    'user_not_found'            => 'User does not exist or you do not have permission view them.',
+    'user_login_required'       => 'The login field is required',
+    'user_has_no_assets_assigned' => 'No assets currently assigned to user.',
+    'user_password_required'    => 'The password is required.',
+    'insufficient_permissions'  => 'Insufficient Permissions.',
+    'user_deleted_warning'      => 'This user has been deleted. You will have to restore this user to edit them or assign them new assets.',
+    'ldap_not_configured'        => 'LDAP integration has not been configured for this installation.',
+    'password_resets_sent'      => 'The selected users who are activated and have a valid email addresses have been sent a password reset link.',
+    'password_reset_sent'       => 'A password reset link has been sent to :email!',
+    'user_has_no_email'         => 'This user does not have an email address in their profile.',
+    'log_record_not_found'        => 'A matching log record for this user could not be found.',
+
+
+    'success' => array(
+        'create'    => 'User was successfully created.',
+        'update'    => 'User was successfully updated.',
+        'update_bulk'    => 'Users were successfully updated!',
+        'delete'    => 'User was successfully deleted.',
+        'ban'       => 'User was successfully banned.',
+        'unban'     => 'User was successfully unbanned.',
+        'suspend'   => 'User was successfully suspended.',
+        'unsuspend' => 'User was successfully unsuspended.',
+        'restored'  => 'User was successfully restored.',
+        'import'    => 'Users imported successfully.',
+    ),
+
+    'error' => array(
+        'create' => 'There was an issue creating the user. Please try again.',
+        'update' => 'There was an issue updating the user. Please try again.',
+        'delete' => 'There was an issue deleting the user. Please try again.',
+        'delete_has_assets' => 'This user has items assigned and could not be deleted.',
+        'delete_has_assets_var' => 'This user still has an asset assigned. Please check it in first.|This user still has :count assets assigned. Please check their assets in first.',
+        'delete_has_licenses_var' => 'This user still has a license seats assigned. Please check it in first.|This user still has :count license seats assigned. Please check them in first.',
+        'delete_has_accessories_var' => 'This user still has an accessory assigned. Please check it in first.|This user still has :count accessories assigned. Please check their assets in first.',
+        'delete_has_locations_var' => 'This user still manages a location. Please select another manager first.|This user still manages :count locations. Please select another manager first.',
+        'delete_has_users_var' => 'This user still manages another user. Please select another manager for that user first.|This user still manages :count users. Please select another manager for them first.',
+        'unsuspend' => 'There was an issue unsuspending the user. Please try again.',
+        'import'    => 'There was an issue importing users. Please try again.',
+        'asset_already_accepted' => 'This asset has already been accepted.',
+        'accept_or_decline' => 'You must either accept or decline this asset.',
+        'cannot_delete_yourself' => 'We would feel really bad if you deleted yourself, please reconsider.',
+        'incorrect_user_accepted' => 'The asset you have attempted to accept was not checked out to you.',
+        'ldap_could_not_connect' => 'Could not connect to the LDAP server. Please check your LDAP server configuration in the LDAP config file. <br>Error from LDAP Server:',
+        'ldap_could_not_bind' => 'Could not bind to the LDAP server. Please check your LDAP server configuration in the LDAP config file. <br>Error from LDAP Server: ',
+        'ldap_could_not_search' => 'Could not search the LDAP server. Please check your LDAP server configuration in the LDAP config file. <br>Error from LDAP Server:',
+        'ldap_could_not_get_entries' => 'Could not get entries from the LDAP server. Please check your LDAP server configuration in the LDAP config file. <br>Error from LDAP Server:',
+        'password_ldap' => 'The password for this account is managed by LDAP/Active Directory. Please contact your IT department to change your password. ',
+        'multi_company_items_assigned' => 'This user has items assigned that belong to a different company. Please check them in or edit their company.'
+    ),
+
+    'deletefile' => array(
+        'error'   => 'File not deleted. Please try again.',
+        'success' => 'File successfully deleted.',
+    ),
+
+    'upload' => array(
+        'error'   => 'File(s) not uploaded. Please try again.',
+        'success' => 'File(s) successfully uploaded.',
+        'nofiles' => 'You did not select any files for upload',
+        'invalidfiles' => 'One or more of your files is too large or is a filetype that is not allowed. Allowed filetypes are png, gif, jpg, doc, docx, pdf, and txt.',
+    ),
+
+    'inventorynotification' => array(
+        'error'   => 'This user has no email set.',
+        'success' => 'The user has been notified about their current inventory.'
+    )
+);
\ No newline at end of file
diff --git a/resources/lang/hi-IN/admin/users/table.php b/resources/lang/hi-IN/admin/users/table.php
new file mode 100644
index 0000000000..094cdbc412
--- /dev/null
+++ b/resources/lang/hi-IN/admin/users/table.php
@@ -0,0 +1,41 @@
+<?php
+
+return array(
+    'activated'  			=> 'Active',
+    'allow'  				=> 'Allow',
+    'checkedout'  			=> 'Assets',
+    'created_at' 			=> 'Created',
+    'createuser' 			=> 'Create User',
+    'deny'  				=> 'Deny',
+    'email'      			=> 'Email',
+    'employee_num'      	=> 'Employee No.',
+    'first_name' 			=> 'First Name',
+    'groupnotes'			=> 'Select a group to assign to the user, remember that a user takes on the permissions of the group they are assigned. Use ctrl+click (or cmd+click on MacOS) to deselect groups.',
+    'id'         			=> 'Id',
+    'inherit'  				=> 'Inherit',
+    'job' 					=> 'Job Title',
+    'last_login'  			=> 'Last Login',
+    'last_name'  			=> 'Last Name',
+    'location'  			=> 'Location',
+    'lock_passwords'		=> 'Login details cannot be changed on this installation.',
+    'manager' 				=> 'Manager',
+    'managed_locations'     => 'Managed Locations',
+    'managed_users'         => 'Managed Users',
+    'name' 					=> 'Name',
+    'nogroup'               => 'No groups have been created yet. To add one, visit:',
+    'notes'                 => 'Notes',
+    'password_confirm' 		=> 'Confirm Password',
+    'password' 				=> 'Password',
+    'phone'  				=> 'Phone',
+    'show_current'          => 'Show Current Users',
+    'show_deleted'          => 'Show Deleted Users',
+    'title' 				=> 'Title',
+	'to_restore_them'		=> 'to restore them.',
+    'total_assets_cost'     => "Total Assets Cost",
+    'updateuser' 			=> 'Update User',
+    'username' 				=> 'Username',
+	'user_deleted_text' 	=> 'This user has been marked as deleted.',
+    'username_note' 		=> '(This is used for Active Directory binding only, not for login.)',
+    'cloneuser'             => 'Clone User',
+    'viewusers' 			=> 'View Users',
+);
diff --git a/resources/lang/hi-IN/auth.php b/resources/lang/hi-IN/auth.php
new file mode 100644
index 0000000000..14d8acfce0
--- /dev/null
+++ b/resources/lang/hi-IN/auth.php
@@ -0,0 +1,20 @@
+<?php
+
+return array(
+
+    /*
+    |--------------------------------------------------------------------------
+    | Authentication Language Lines
+    |--------------------------------------------------------------------------
+    |
+    | The following language lines are used during authentication for various
+    | messages that we need to display to the user. You are free to modify
+    | these language lines according to your application's requirements.
+    |
+    */
+
+    'failed' => 'These credentials do not match our records.',
+    'password' => 'The provided password is incorrect.',
+    'throttle' => 'Too many login attempts. Please try again in :minutes minute(s).',
+
+);
diff --git a/resources/lang/hi-IN/auth/general.php b/resources/lang/hi-IN/auth/general.php
new file mode 100644
index 0000000000..2bbd112788
--- /dev/null
+++ b/resources/lang/hi-IN/auth/general.php
@@ -0,0 +1,18 @@
+<?php
+
+return [
+    'send_password_link'	        => 'Send Password Reset Link',
+    'email_reset_password'			=> 'Email Password Reset',
+    'reset_password'			    => 'Reset Password',
+    'saml_login'                    => 'Login via SAML',
+    'login'                         => 'Login',
+    'login_prompt'                  => 'Please Login',
+    'forgot_password'               => 'I forgot my password',
+    'ldap_reset_password'           => 'Please click here to reset your LDAP password',
+    'remember_me'                   => 'Remember Me',
+    'username_help_top'                 => 'Enter your <strong>username</strong> to be emailed a password reset link.',
+    'username_help_bottom'          => 'Your username and email address <em>may</em> be the same, but may not be, depending on your configuration. If you cannot remember your username, contact your administrator. <br><br><strong>Usernames without an associated email address will not be emailed a password reset link.</strong> ',
+    'google_login'                  => 'Login with Google Workspace',
+    'google_login_failed'           => 'Google Login failed, please try again.',
+];
+
diff --git a/resources/lang/hi-IN/auth/message.php b/resources/lang/hi-IN/auth/message.php
new file mode 100644
index 0000000000..08f638d058
--- /dev/null
+++ b/resources/lang/hi-IN/auth/message.php
@@ -0,0 +1,45 @@
+<?php
+
+return array(
+
+    'account_already_exists' => 'An account with the this email already exists.',
+    'account_not_found'      => 'The username or password is incorrect.',
+    'account_not_activated'  => 'This user account is not activated.',
+    'account_suspended'      => 'This user account is suspended.',
+
+    'two_factor' => array(
+        'already_enrolled'      => 'Your device is already enrolled.',
+        'success'               => 'You have successfully logged in.',
+        'code_required'         => 'Two-factor code is required.',
+        'invalid_code'          => 'Two-factor code is invalid.',
+        'enter_two_factor_code' => 'Please enter your two-factor authentication code.',
+        'please_enroll'         => 'Please enroll a device in two-factor authentication.',
+    ),
+
+    'signin' => array(
+        'error'   => 'There was a problem while trying to log you in, please try again.',
+        'success' => 'You have successfully logged in.',
+    ),
+
+    'logout' => array(
+        'error'   => 'There was a problem while trying to log you out, please try again.',
+        'success' => 'You have successfully logged out.',
+    ),
+
+    'signup' => array(
+        'error'   => 'There was a problem while trying to create your account, please try again.',
+        'success' => 'Account sucessfully created.',
+    ),
+
+    'forgot-password' => array(
+        'error'   => 'There was a problem while trying to get a reset password code, please try again.',
+        'success' => 'If that email address exists in our system, a password recovery email has been sent.',
+    ),
+
+    'forgot-password-confirm' => array(
+        'error'   => 'There was a problem while trying to reset your password, please try again.',
+        'success' => 'Your password has been successfully reset.',
+    ),
+
+
+);
diff --git a/resources/lang/hi-IN/button.php b/resources/lang/hi-IN/button.php
new file mode 100644
index 0000000000..8a838e8faf
--- /dev/null
+++ b/resources/lang/hi-IN/button.php
@@ -0,0 +1,34 @@
+<?php
+
+return [
+    'actions' 	                => 'Actions',
+    'add'    	                => 'Add New',
+    'cancel'                    => 'Cancel',
+    'checkin_and_delete'  	    => 'Checkin All / Delete User',
+    'delete'  	                => 'Delete',
+    'edit'    	                => 'Edit',
+    'clone'    	                => 'Clone',
+    'restore' 	                => 'Restore',
+    'remove'                    => 'Remove',
+    'request'                   => 'Request',
+    'submit'  	                => 'Submit',
+    'upload'                    => 'Upload',
+    'select_file'				=> 'Select File...',
+    'select_files'				=> 'Select Files...',
+    'generate_labels'           => '{1} Generate Label|[2,*] Generate Labels',
+    'send_password_link'        => 'Send Password Reset Link',
+    'go'                        => 'Go',
+    'bulk_actions'              => 'Bulk Actions',
+    'add_maintenance'           => 'Add Maintenance',
+    'append'                    => 'Append',
+    'new'                       => 'New',
+    'var' => [
+        'clone'     => 'Clone :item_type',
+        'edit'      => 'Edit :item_type',
+        'delete'    => 'Delete :item_type',
+        'restore'   => 'Restore :item_type',
+        'create'    => 'Create New :item_type',
+        'checkout'  => 'Checkout :item_type',
+        'checkin'   => 'Checkin :item_type',
+    ]
+];
diff --git a/resources/lang/hi-IN/general.php b/resources/lang/hi-IN/general.php
new file mode 100644
index 0000000000..d2e16aafbb
--- /dev/null
+++ b/resources/lang/hi-IN/general.php
@@ -0,0 +1,629 @@
+<?php
+
+return [
+    '2FA_reset'             => '2FA reset',
+    'accessories'			=> 'Accessories',
+    'activated'			    => 'Activated',
+    'accepted_date'         => 'Date Accepted',
+    'accessory'				=> 'Accessory',
+    'accessory_report'		=> 'Accessory Report',
+    'action'                => 'Action',
+    'activity_report'		=> 'Activity Report',
+    'address'				=> 'Address',
+    'admin'					=> 'Admin Settings',
+    'admin_tooltip'			=> 'This user has admin privileges',
+    'superuser'				=> 'Superuser',
+    'superuser_tooltip'		=> 'This user has superuser privileges',
+    'administrator'			=> 'Administrator',
+    'add_seats'             => 'Added seats',
+    'age'                   => "Age",
+    'all_assets'			=> 'All Assets',
+    'all'       			=> 'All',
+    'archived'              => 'Archived',
+    'asset_models'			=> 'Asset Models',
+    'asset_model'			=> 'Model',
+    'asset'					=> 'Asset',
+    'asset_previous'        => 'Asset (Previously Assigned)',
+    'asset_report'          => 'Asset Report',
+    'asset_tag'				=> 'Asset Tag',
+    'asset_tags'            => 'Asset Tags',
+    'assets_available'		=> 'Assets available',
+    'accept_assets'         => 'Accept Assets :name',
+    'accept_assets_menu'    => 'Accept Assets',
+    'accept_item'           => 'Accept Item',
+    'audit'				    => 'Audit',
+    'audits'				=> 'Audits',
+    'audit_report'			=> 'Audit Log',
+    'assets'				=> 'Assets',
+    'assets_audited'        => 'assets audited',
+    'assets_checked_in_count'     => 'assets checked in',
+    'assets_checked_out_count'     => 'assets checked out',
+    'asset_deleted_warning'     => 'This asset has been deleted. You must restore it before you can assign it to someone.',
+    'assigned_date'         => 'Date Assigned',
+    'assigned_to'           => 'Assigned to :name',
+    'assignee'              => 'Assigned to',
+    'avatar_delete'         => 'Delete Avatar',
+    'avatar_upload'         => 'Upload Avatar',
+    'back'      			=> 'Back',
+    'bad_data'      		=> 'Nothing found. Maybe bad data?',
+    'bulkaudit'             => 'Bulk Audit',
+    'bulkaudit_status'      => 'Audit Status',
+    'bulk_checkout'  		=> 'Bulk Checkout',
+    'bulk_edit'             => 'Bulk Edit',
+    'bulk_delete'           => 'Bulk Delete',
+    'bulk_actions'          => 'Bulk Actions',
+    'bulk_checkin_delete'   => 'Bulk Checkin / Delete Users',
+    'byod'                  => 'BYOD',
+    'byod_help'             => 'This device is owned by the user',
+    'bystatus'              => 'by Status',
+    'cancel'  				=> 'Cancel',
+    'categories'			=> 'Categories',
+    'category'				=> 'Category',
+    'change' 		        => 'In/Out',
+    'changeemail'  			=> 'Change Email Address',
+    'changepassword'  		=> 'Change Password',
+    'checkin'  				=> 'Checkin',
+    'checkin_from'  		=> 'Checkin from',
+    'checkin_note'  		=> 'Checkin Note',
+    'checkout_note'  		=> 'Checkout Note',
+    'checkout'  			=> 'Checkout',
+    'checkouts_count'       => 'Checkouts',
+    'checkins_count'        => 'Checkins',
+    'checkin_and_delete'  	=> 'Checkin and Delete',
+    'user_requests_count'   => 'Requests',
+    'city'  				=> 'City',
+    'click_here'			=> 'Click here',
+    'clear_selection'		=> 'Clear Selection',
+    'companies'			    => 'Companies',
+    'company'				=> 'Company',
+    'component'			    => 'Component',
+    'components'			=> 'Components',
+    'complete'				=> 'Complete',
+    'consumable'			=> 'Consumable',
+    'consumables'			=> 'Consumables',
+    'country'  				=> 'Country',
+    'could_not_restore'     => 'Error restoring :item_type: :error',
+    'not_deleted'           => 'The :item_type was not deleted and therefore cannot be restored',
+    'create'				=> 'Create New',
+    'created'               => 'Item Created',
+    'created_asset'			=> 'created asset',
+    'created_at' 			=> 'Created At',
+    'created_by'            => 'Created By',
+    'record_created' 		=> 'Record Created',
+    'updated_at' 			=> 'Updated at',
+    'currency'  			=> '$', // this is deprecated
+    'currency_text'  		=> 'Currency', //
+    'current'  				=> 'Current',
+    'current_password'      => 'Current Password',
+    'customize_report'      => 'Customize Report',
+    'custom_report'         => 'Custom Asset Report',
+    'dashboard'				=> 'Dashboard',
+    'data_source'           => 'Data Source',
+    'days'      			=> 'days',
+    'days_to_next_audit'    => 'Days to Next Audit',
+    'date'					=> 'Date',
+    'debug_warning'         => 'Warning!',
+    'debug_warning_text'    => 'This application is running in production mode with debugging enabled. This can expose sensitive data if your application is accessible to the outside world. Disable debug mode by setting the <code>APP_DEBUG</code> value in your <code>.env</code> file to <code>false</code>.',
+    'delete'  				=> 'Delete',
+    'delete_confirm'  		=> 'Are you sure you wish to delete :item?',
+    'delete_confirm_no_undo' => 'Are you sure, you wish to delete :item? This cannot be undone.',
+    'deleted'  				=> 'Deleted',
+    'delete_seats'  		=> 'Deleted Seats',
+    'deletion_failed'       => 'Deletion failed',
+    'departments'           => 'Departments',
+    'department'            => 'Department',
+    'deployed'				=> 'Deployed',
+    'depreciation'			=> 'Depreciation',
+    'depreciations'         => 'Depreciations',
+    'depreciation_report'	=> 'Depreciation Report',
+    'details'               => 'Details',
+    'download'				=> 'Download',
+    'download_all'		    => 'Download All',
+    'editprofile'  			=> 'Edit Your Profile',
+    'eol'					=> 'EOL',
+    'email_domain'			=> 'Email Domain',
+    'employee_number'       => 'Employee Number',
+    'email_domain_help'		=> 'This is used to generate email addresses when importing',
+    'error'				    => 'Error',
+    'exclude_archived'      => 'Exclude Archived Assets',
+    'exclude_deleted'       => 'Exclude Deleted Assets',
+    'example'				=> 'Example: ',
+
+    'files'                 => 'Files',
+    'file_name'				=> 'File',
+    'file_type'             => 'File Type',
+    'filesize'              => 'File Size',
+    'file_uploads'			=> 'File Uploads',
+    'file_upload'           => 'File Upload',
+    'generate'				=> 'Generate',
+    'generate_labels'       => 'Generate Labels',
+    'github_markdown'      => 'This field accepts <a href="https://help.github.com/articles/github-flavored-markdown/">Github flavored markdown</a>.',
+    'groups'				=> 'Groups',
+    'gravatar_email'        => 'Gravatar Email Address',
+    'gravatar_url'          => '<a href="http://gravatar.com"><small>Change your avatar at Gravatar.com</small></a>.',
+    'history'  			    => 'History',
+    'history_for'  			=> 'History for',
+    'id'  					=> 'ID',
+    'image'                 => 'Image',
+    'image_delete'         	=> 'Delete Image',
+    'include_deleted'       => 'Include Deleted Assets',
+    'image_upload'         	=> 'Upload Image',
+    'filetypes_accepted_help'    => 'Accepted filetype is :types. The maximum size allowed is :size.|Accepted filetypes are :types. The maximum upload size allowed is :size.',
+    'filetypes_size_help'   => 'The maximum upload size allowed is :size.',
+    'image_filetypes_help'  => 'Accepted Filetypes are jpg, webp, png, gif, svg, and avif. The maximum upload size allowed is :size.',
+    'unaccepted_image_type'  => 'This image file was not readable. Accepted filetypes are jpg, webp, png, gif, and svg. The mimetype of this file is: :mimetype.',
+    'import'         	    => 'Import',
+    'import_this_file'      => 'Map fields and process this file',
+    'importing'         	=> 'Importing',
+    'importing_help'        => 'You can import assets, accessories, licenses, components, consumables, and users via CSV file. <br><br>The CSV should be comma-delimited and formatted with headers that match the ones in the <a href="https://snipe-it.readme.io/docs/importing" target="_new">sample CSVs in the documentation</a>.',
+    'import-history'        => 'Import History',
+    'asset_maintenance'        => 'Asset Maintenance',
+    'asset_maintenance_report' => 'Asset Maintenance Report',
+    'asset_maintenances'       => 'Asset Maintenances',
+    'item'  				=> 'Item',
+    'item_name'             => 'Item Name',
+    'import_file'  			=> 'import CSV file',
+    'import_type'  			=> 'CSV import type',
+    'insufficient_permissions' => 'Insufficient permissions!',
+    'kits'       			=> 'Predefined Kits',
+    'language'				=> 'Language',
+    'last'					=> 'Last',
+    'last_login'            => 'Last Login',
+    'last_name'             => 'Last Name',
+    'firstname_lastname_display'	=> 'First Name Last Name (Jane Smith)',
+    'lastname_firstname_display'	=> 'Last Name First Name (Smith Jane)',
+    'name_display_format'	=> 'Name Display Format',
+    'first'					=> 'First',
+    'first_name'			=> 'First Name',
+    'license'				=> 'License',
+    'license_report'        => 'License Report',
+    'licenses_available'	=> 'Licenses available',
+    'licenses'				=> 'Licenses',
+    'list_all'				=> 'List All',
+    'loading'				=> 'Loading... please wait...',
+    'lock_passwords'        => 'This field value will not be saved in a demo installation.',
+    'feature_disabled'      => 'This feature has been disabled for the demo installation.',
+    'location'              => 'Location',
+    'location_plural'        => 'Location|Locations',
+    'locations'				=> 'Locations',
+    'logo_size'				=> 'Square logos look best with Logo + Text. Logo maximum display size is 50px high x 500px wide.  ',
+    'logout'				=> 'Logout',
+    'lookup_by_tag'     => 'Lookup by Asset Tag',
+    'maintenances'          => 'Maintenances',
+    'manage_api_keys'       => 'Manage API keys',
+    'manufacturer'			=> 'Manufacturer',
+    'manufacturers'			=> 'Manufacturers',
+    'markdown'				=> 'This field allows <a href="https://help.github.com/articles/github-flavored-markdown/">Github flavored markdown</a>.',
+    'min_amt'				=> 'Min. QTY',
+    'min_amt_help'          => 'Minimum number of items that should be available before an alert gets triggered. Leave Min. QTY blank if you do not want to receive alerts for low inventory.',
+    'model_no'				=> 'Model No.',
+    'months'				=> 'months',
+    'moreinfo'				=> 'More Info',
+    'name'					=> 'Name',
+    'new_password'          => 'New Password',
+    'next'					=> 'Next',
+    'next_audit_date'		=> 'Next Audit Date',
+    'next_audit_date_help'  => 'If you use auditing in your organization, this is usually automatically calculated based on the asset&apos;s last audit date and audit frequency (in <code>Admin Settings &gt; Alerts</code>) and you can leave this blank. You can manually set this date here if you need to, but it must be later than the last audit date. ',
+    'audit_images_help'     => 'You can find audit images in the asset\'s history tab.',
+    'no_email'              => 'No email address associated with this user',
+    'last_audit'		    => 'Last Audit',
+    'new'					=> 'new!',
+    'no_depreciation'		=> 'No Depreciation',
+    'no_results'			=> 'No Results.',
+    'no'  					=> 'No',
+    'notes'  				=> 'Notes',
+    'note_added'            => 'Note Added',
+    'options'				=> 'Options',
+    'preview'				=> 'Preview',
+    'add_note'              => 'Add Note',
+    'note_edited'            => 'Note Edited',
+    'edit_note'              => 'Edit Note',
+    'note_deleted'            => 'Note Deleted',
+    'delete_note'              => 'Delete Note',
+    'order_number'          => 'Order Number',
+    'only_deleted'          => 'Only Deleted Assets',
+    'page_menu'				=> 'Showing _MENU_ items',
+    'pagination_info'		=> 'Showing _START_ to _END_ of _TOTAL_ items',
+    'pending'				=> 'Pending',
+    'people'				=> 'People',
+    'per_page'				=> 'Results Per Page',
+    'previous'				=> 'Previous',
+    'processing'			=> 'Processing',
+    'profile'				=> 'Your profile',
+    'purchase_cost'                              => 'Purchase Cost',
+    'purchase_date'         => 'Purchase Date',
+    'qty'		            => 'QTY',
+    'quantity'		        => 'Quantity',
+    'quantity_minimum'      => 'You have one item below or almost below minimum quantity levels|You have :count items below or almost below minimum quantity levels',
+    'quickscan_checkin'  	=> 'Quick Scan Checkin',
+    'quickscan_checkin_status'  	=> 'Checkin Status',
+    'ready_to_deploy'		=> 'Ready to Deploy',
+    'recent_activity'		=> 'Recent Activity',
+    'remaining'             => 'Remaining',
+    'remove_company'        => 'Remove Company Association',
+    'reports'				=> 'Reports',
+    'restored'				=> 'restored',
+    'restore'				=> 'Restore',
+    'requestable_models'    => 'Requestable Models',
+    'requestable_items'     => 'Requestable Items',
+    'requested'				=> 'Requested',
+    'requested_date'        => 'Requested Date',
+    'requested_assets'      => 'Requested Assets',
+    'requested_assets_menu' => 'Requested Assets',
+    'request_canceled'      => 'Request Canceled',
+    'request_item'          => 'Request this item',
+    'external_link_tooltip' => 'External link to',
+    'save'  				=> 'Save',
+    'select_var'            => 'Select :thing... ', // this will eventually replace all of our other selects
+    'select'				=> 'Select',
+    'select_all'            => 'Select All',
+    'search'				=> 'Search',
+    'select_category'       => 'Select a Category',
+    'select_datasource' => 'Select a data source',
+    'select_department'     => 'Select a Department',
+    'select_depreciation'	=> 'Select a Depreciation Type',
+    'select_location'		=> 'Select a Location',
+    'select_manufacturer'	=> 'Select a Manufacturer',
+    'select_model'			=> 'Select a Model',
+    'select_supplier'		=> 'Select a Supplier',
+    'select_user'			=> 'Select a User',
+    'select_date'			=> 'Select Date (YYYY-MM-DD)',
+    'select_statuslabel'	=> 'Select Status',
+    'select_company'    	=> 'Select Company',
+    'select_asset'    		=> 'Select Asset',
+    'settings'				=> 'Settings',
+    'show_deleted'  		=> 'Show Deleted',
+    'show_current'  		=> 'Show Current',
+    'sign_in'				=> 'Sign in',
+    'signature'             => 'Signature',
+    'signed_off_by'         => 'Signed Off By',
+    'skin'       			=> 'Skin',
+    'webhook_msg_note'        => 'A notification will be sent via webhook',
+    'webhook_test_msg'        => 'Oh hai! It looks like your :app integration with Snipe-IT is working!',
+    'some_features_disabled' => 'DEMO MODE: Some features are disabled for this installation.',
+    'site_name'				=> 'Site Name',
+    'state'  				=> 'State',
+    'status_labels'			=> 'Status Labels',
+    'status_label'			=> 'Status Label',
+    'status'    			=> 'Status',
+    'accept_eula'           => 'Acceptance Agreement',
+    'show_or_hide_eulas' => 'Show/Hide EULAs',
+    'supplier'              => 'Supplier',
+    'suppliers'  			=> 'Suppliers',
+    'sure_to_delete'        => 'Are you sure you wish to delete',
+    'sure_to_delete_var'    => 'Are you sure you wish to delete :item?',
+    'delete_what'           => 'Delete :item',
+    'submit'				=> 'Submit',
+    'target'                => 'Target',
+    'time_and_date_display' => 'Time and Date Display',
+    'total_assets'			=> 'total assets',
+    'total_licenses'		=> 'total licenses',
+    'total_accessories'		=> 'total accessories',
+    'total_consumables'		=> 'total consumables',
+    'type'  				=> 'Type',
+    'undeployable'			=> 'Un-deployable',
+    'unknown_admin'			=> 'Unknown Admin',
+    'username'              => 'Username',
+    'update'                => 'Update',
+    'updating_item' => 'Updating :item',
+    'upload_filetypes_help'      => 'Allowed filetypes are png, gif, jpg, jpeg, doc, docx, pdf, xls, xlsx, txt, lic, xml, zip, rtf and rar. Max upload size allowed is :size.',
+    'uploaded'              => 'Uploaded',
+    'user'					=> 'User',
+    'accepted'			    => 'accepted',
+    'declined'			    => 'declined',
+    'declined_note'         => 'Declined Notes',
+    'unassigned'            => 'Unassigned',
+    'unaccepted_asset_report' => 'Unaccepted Assets',
+    'users'                 => 'Users',
+    'viewall'				=> 'View All',
+    'viewassets'  			=> 'View Assigned Assets',
+    'viewassetsfor'         => 'View Assets for :name',
+    'website'               => 'Website',
+    'welcome'				=> 'Welcome, :name',
+    'years'					=> 'years',
+    'yes' 					=> 'Yes',
+    'zip'  					=> 'Zip',
+    'noimage'				=> 'No image uploaded or image not found.',
+    'file_does_not_exist'   => 'The requested file does not exist on the server.',
+    'file_upload_success'   => 'File upload success!',
+    'no_files_uploaded'     => 'File upload success!',
+    'token_expired'         => 'Your form session has expired. Please try again.',
+    'login_enabled'         => 'Login Enabled',
+    'audit_due'             => 'Due for Audit',
+    'audit_due_days'        => '{}Assets Due or Overdue for Audit|[1]Assets Due or Overdue for Audit Within a Day|[2,*]Assets Due or Overdue for Audit Within :days Days',
+    'checkin_due'           => 'Due for Checkin',
+    'checkin_overdue'       => 'Overdue for Checkin',
+    'checkin_due_days'      => '{}Due for Checkin|[1]Assets Due for Checkin Within :days Day|[2,*]Assets Due for Checkin Within :days Days',
+    'audit_overdue'         => 'Overdue for Audit',
+    'accept'                => 'Accept :asset',
+    'i_accept'              => 'I accept',
+    'i_decline'             => 'I decline',
+    'accept_decline'        => 'Accept/Decline',
+    'sign_tos'              => 'Sign below to indicate that you agree to the terms of service:',
+    'clear_signature'       => 'Clear Signature',
+    'show_help'             => 'Show help',
+    'hide_help'             => 'Hide help',
+    'view_all'              => 'view all',
+    'hide_deleted'          => 'Hide Deleted',
+    'email'                 => 'Email',
+    'do_not_change'         => 'Do not change',
+    'bug_report'            => 'Report a bug',
+    'user_manual'           => 'User\'s Manual',
+    'setup_step_1'          => 'Step 1',
+    'setup_step_2'          => 'Step 2',
+    'setup_step_3'          => 'Step 3',
+    'setup_step_4'          => 'Step 4',
+    'setup_config_check'    => 'Configuration Check',
+    'setup_create_database' => 'Create database tables',
+    'setup_create_admin'    => 'Create an admin user',
+    'setup_done'            => 'Finished!',
+    'bulk_edit_about_to'    => 'You are about to edit the following: ',
+    'checked_out'           => 'Checked Out',
+    'checked_out_to'        => 'Checked out to',
+    'fields'                => 'Fields',
+    'last_checkout'         => 'Last Checkout',
+    'due_to_checkin'        => 'The following :count items are due to be checked in soon:',
+    'expected_checkin'      => 'Expected Checkin',
+    'reminder_checked_out_items' => 'This is a reminder of the items currently checked out to you. If you feel this list is inaccurate (something is missing, or something appears here that you believe you never received), please email :reply_to_name at :reply_to_address.',
+    'changed'               => 'Changed',
+    'to'                    => 'To',
+    'report_fields_info'    => '<p>Select the fields you would like to include in your custom report, and click Generate. The file (custom-asset-report-YYYY-mm-dd.csv) will download automatically, and you can open it in Excel.</p>
+            <p>If you would like to export only certain assets, use the options below to fine-tune your results.</p>',
+    'range'                 => 'Range',
+    'bom_remark'            => 'Add a BOM (byte-order mark) to this CSV',
+    'improvements'          => 'Improvements',
+    'information'           => 'Information',
+    'permissions'           => 'Permissions',
+    'managed_ldap'          => '(Managed via LDAP)',
+    'export'                => 'Export',
+    'ldap_sync'             => 'LDAP Sync',
+    'ldap_user_sync'        => 'LDAP User Sync',
+    'synchronize'           => 'Synchronize',
+    'sync_results'          => 'Synchronization Results',
+    'license_serial'        => 'Serial/Product Key',
+    'invalid_category'      => 'Invalid or missing category',
+    'invalid_item_category_single' => 'Invalid or missing :type category. Please update the category of this :type to include a valid category before checking out.',
+    'dashboard_info'        => 'This is your dashboard. There are many like it, but this one is yours.',
+    '60_percent_warning'    => '60% Complete (warning)',
+    'dashboard_empty'       => 'It looks like you have not added anything yet, so we do not have anything awesome to display. Get started by adding some assets, accessories, consumables, or licenses now!',
+    'new_asset'             => 'New Asset',
+    'new_license'           => 'New License',
+    'new_accessory'         => 'New Accessory',
+    'new_consumable'        => 'New Consumable',
+    'new_component'         => 'New Component',
+    'new_user'              => 'New User',
+    'collapse'              => 'Collapse',
+    'assigned'              => 'Assigned',
+    'asset_count'           => 'Asset Count',
+    'accessories_count'     => 'Accessories Count',
+    'consumables_count'     => 'Consumables Count',
+    'components_count'      => 'Components Count',
+    'licenses_count'        => 'Licenses Count',
+    'notification_error'    => 'Error',
+    'notification_error_hint' => 'Please check the form below for errors',
+    'notification_bulk_error_hint' => 'The following fields had validation errors and were not edited:',
+    'notification_success'  => 'Success',
+    'notification_warning'   => 'Warning',
+    'notification_info'      => 'Info',
+    'asset_information'     => 'Asset Information',
+    'model_name'            => 'Model Name',
+    'asset_name'            => 'Asset Name',
+    'consumable_information' => 'Consumable Information:',
+    'consumable_name'       => 'Consumable Name:',
+    'accessory_information' => 'Accessory Information:',
+    'accessory_name'       => 'Accessory Name:',
+    'clone_item'            => 'Clone Item',
+    'checkout_tooltip' => 'Check this item out',
+    'checkin_tooltip' => 'Check this item in so that it is available for re-issue, re-imaging, etc',
+    'checkout_user_tooltip' => 'Check this item out to a user',
+    'checkin_to_diff_location' => 'You can choose to check this asset in to a location other than this asset\'s default location of :default_location if one is set',
+    'maintenance_mode'      => 'The service is temporarily unavailable for system updates. Please check back later.',
+    'maintenance_mode_title' => 'System Temporarily Unavailable',
+    'ldap_import'           => 'User password should not be managed by LDAP. (This allows you to send forgotten password requests.)',
+    'purge_not_allowed'     => 'Purging deleted data has been disabled in the .env file. Contact support or your systems administrator.',
+    'backup_delete_not_allowed'     => 'Deleting backups has been disabled in the .env file. Contact support or your systems administrator.',
+    'additional_files'           => 'Additional Files',
+    'shitty_browser'        => 'No signature detected. If you are using an older browser, please use a more modern browser to complete your asset acceptance.',
+    'bulk_soft_delete'      =>'Also soft-delete these users. Their asset history will remain intact unless/until you purge deleted records in the Admin Settings.',
+    'bulk_checkin_delete_success' => 'Your selected users have been deleted and their items have been checked in.',
+    'bulk_checkin_success' => 'The items for the selected users have been checked in.',
+    'set_to_null'           => 'Delete values for this selection|Delete values for all :selection_count selections ',
+    'set_users_field_to_null'  => 'Delete :field values for this user|Delete :field values for all :user_count users ',
+    'na_no_purchase_date'   => 'N/A - No purchase date provided',
+    'assets_by_status'      => 'Assets by Status',
+    'assets_by_status_type'      => 'Assets by Status Type',
+    'pie_chart_type'        => 'Dashboard Pie Chart Type',
+    'hello_name'            => 'Hello, :name!',
+    'unaccepted_profile_warning'   => 'You have one item requiring acceptance. Click here to accept or decline it | You have :count items requiring acceptance. Click here to accept or decline them',
+    'start_date'            => 'Start Date',
+    'end_date'            => 'End Date',
+    'alt_uploaded_image_thumbnail' => 'Uploaded thumbnail',
+    'placeholder_kit'       => 'Select a kit',
+    'file_not_found'        => 'File not found',
+    'log_record_not_found'  => 'No record for that log entry was found.',
+    'preview_not_available' => '(no preview)',
+    'setup'                 => 'Setup',
+    'pre_flight'            => 'Pre-Flight',
+    'skip_to_main_content'  => 'Skip to main content',
+    'toggle_navigation'     => 'Toggle navigation',
+    'alerts'                => 'Alerts',
+    'tasks_view_all'        => 'View all tasks',
+    'true'                  => 'True',
+    'false'                 => 'False',
+    'integration_option'    => 'Integration Option',
+    'log_does_not_exist'    => 'No matching log record exists.',
+    'merge_users'           => 'Merge Users',
+    'merge_information' =>  'This will merge the :count users into a single user. Select the user you wish to merge the others into below, and the associated assets, licenses, etc will be moved over to the selected user and the other users will be marked as deleted.',
+    'warning_merge_information' => 'This action CANNOT be undone and should ONLY be used when you need to merge users because of a bad import or sync. Be sure to run a backup first.',
+    'no_users_selected'     => 'No users selected',
+    'not_enough_users_selected'     => 'At least :count users must be selected',
+    'merge_success'         => ':count users merged successfully into :into_username!',
+    'merged'                => 'merged',
+    'merged_log_this_user_into' => 'Merged this user (ID :to_id - :to_username) into user ID :from_id (:from_username) ',
+    'merged_log_this_user_from' => 'Merged user ID :from_id (:from_username) into this user (ID :to_id - :to_username)',
+    'clear_and_save'            => 'Clear & Save',
+    'update_existing_values'    => 'Update Existing Values?',
+    'auto_incrementing_asset_tags_disabled_so_tags_required' => 'Generating auto-incrementing asset tags is disabled so all rows need to have the "Asset Tag" column populated.',
+    'auto_incrementing_asset_tags_enabled_so_now_assets_will_be_created' => 'Note: Generating auto-incrementing asset tags is enabled so assets will be created for rows that do not have "Asset Tag" populated. Rows that do have "Asset Tag" populated will be updated with the provided information.',
+    'send_welcome_email_to_users'   => ' Send Welcome Email for new Users?',
+    'send_email'                => 'Send Email',
+    'call'                      => 'Call number',
+    'back_before_importing'     => 'Backup before importing?',
+    'csv_header_field'          => 'CSV Header Field',
+    'import_field'              => 'Import Field',
+    'sample_value'              => 'Sample Value',
+    'no_headers'                => 'No Columns Found',
+    'error_in_import_file'      => 'There was an error reading the CSV file: :error',
+    'errors_importing'          => 'Some Errors occurred while importing: ',
+    'warning'                   => 'WARNING: :warning',
+    'success_redirecting'       => '"Success... Redirecting.',
+    'cancel_request'            => 'Cancel this item request',
+    'setup_successful_migrations' => 'Your database tables have been created',
+    'setup_migration_output' => 'Migration output:',
+    'setup_migration_create_user' => 'Next: Create User',
+    'importer_generic_error'    => 'Your file import is complete, but we did receive an error. This is usually caused by third-party API throttling from a notification webhook (such as Slack) and would not have interfered with the import itself, but you should confirm this.',
+    'confirm' => 'Confirm',
+    'autoassign_licenses' => 'Auto-Assign Licenses',
+    'autoassign_licenses_help' => 'Allow this user to have licenses assigned via the bulk-assign license UI or cli tools.',
+    'autoassign_licenses_help_long' => 'This allows a user to be have licenses assigned via the bulk-assign license UI or cli tools. (For example, you might not want contractors to be auto-assigned a license you would provide to only staff members. You can still individually assign licenses to those users, but they will not be included in the Checkout License to All Users functions.)',
+    'no_autoassign_licenses_help' => 'Do not include user for bulk-assigning through the license UI or cli tools.',
+    'modal_confirm_generic'      => 'Are you sure?',
+    'cannot_be_deleted'      => 'This item cannot be deleted',
+    'cannot_be_edited'      => 'This item cannot be edited.',
+    'undeployable_tooltip'      => 'This item cannot be checked out. Check the quantity remaining.',
+    'serial_number'        => 'Serial Number',
+    'item_notes' => ':item Notes',
+    'item_name_var' => ':item Name',
+    'error_user_company' => 'Checkout target company and asset company do not match',
+    'error_user_company_accept_view' => 'An Asset assigned to you belongs to a different company so you can\'t accept nor deny it, please check with your manager',
+    'importer' => [
+        'checked_out_to_fullname' => 'Checked Out to: Full Name',
+        'checked_out_to_first_name' => 'Checked Out to: First Name',
+        'checked_out_to_last_name' => 'Checked Out to: Last Name',
+        'checked_out_to_username' => 'Checked Out to: Username',
+        'checked_out_to_email' => 'Checked Out to: Email',
+        'checked_out_to_tag' => 'Checked Out to: Asset Tag',
+        'manager_first_name' => 'Manager First Name',
+        'manager_last_name' => 'Manager Last Name',
+        'manager_full_name' => 'Manager Full Name',
+        'manager_username' => 'Manager Username',
+        'checkout_type' => 'Checkout Type',
+        'checkout_location' => 'Checkout to Location',
+        'image_filename' => 'Image Filename',
+        'do_not_import'     => 'Do Not Import',
+        'vip' => 'VIP',
+        'avatar'  => 'Avatar',
+        'gravatar' => 'Gravatar Email',
+        'currency' => 'Currency',
+        'address2' => 'Address Line 2',
+        'import_note' => 'Imported using csv importer',
+    ],
+    'remove_customfield_association' => 'Remove this field from the fieldset. This will not delete the custom field, only this field\'s association with this fieldset.',
+    'checked_out_to_fields' => 'Checked Out To Fields',
+    'percent_complete' => '% complete',
+    'uploading' => 'Uploading... ',
+    'upload_error' => 'Error uploading file. Please check that you have no empty rows or duplicated column names in your CSV, and that the server permissions allow uploads.',
+    'copy_to_clipboard' => 'Copy to Clipboard',
+    'copied' => 'Copied!',
+    'status_compatibility' => 'If assets are already assigned, they cannot be changed to a non-deployable status type and this value change will be skipped.',
+    'rtd_location_help' => 'This is the location of the asset when it is not checked out',
+    'item_not_found' => ':item_type ID :id does not exist or has been deleted',
+    'action_permission_denied' => 'You do not have permission to :action :item_type ID :id',
+    'action_permission_generic' => 'You do not have permission to :action this :item_type',
+    'edit' => 'edit',
+    'action_source' => 'Action Source',
+    'or' => 'or',
+    'url'                   => 'URL',
+    'edit_fieldset' => 'Edit fieldset fields and options',
+    'permission_denied_superuser_demo' => 'Permission denied. You cannot update user information for superadmins on the demo.',
+    'pwd_reset_not_sent' => 'User is not activated, is LDAP synced, or does not have an email address',
+    'error_sending_email' => 'Error sending email',
+    'sad_panda' => 'Sad panda. You are not authorized to do the thing. Maybe <a href=":link">return to the dashboard</a>, or contact your administrator.',
+    'bulk' => [
+            'delete' =>
+                [
+                'header' => 'Bulk Delete :object_type',
+                'warn'   =>  'You are about to delete one :object_type|You are about to delete :count :object_type',
+                'success'   =>  ':object_type successfully deleted|Successfully deleted :count :object_type',
+                'error'   =>  'Could not delete :object_type',
+                'nothing_selected'   =>  'No :object_type selected - nothing to do',
+                'partial'   =>  'Deleted :success_count :object_type, but :error_count :object_type could not be deleted',
+             ],
+    ],
+    'no_requestable' => 'There are no requestable assets or asset models.',
+
+    'countable' => [
+        'accessories'  => ':count Accessory|:count Accessories',
+        'assets'  => ':count Asset|:count Assets',
+        'licenses'  => ':count License|:count Licenses',
+        'license_seats'  => ':count License Seat|:count License Seats',
+        'consumables'  => ':count Consumable|:count Consumables',
+        'components'  => ':count Component|:count Components',
+    ],
+
+    'more_info' => 'More Info',
+    'quickscan_bulk_help' => 'Checking this box will edit the asset record to reflect this new location. Leaving it unchecked will simply note the location in the audit log. Note that if this asset is checked out, it will not change the location of the person, asset or location it is checked out to.',
+    'whoops' => 'Whoops!',
+    'something_went_wrong' => 'Something went wrong with your request.',
+    'close' => 'Close',
+    'expires' => 'Expires',
+    'map_fields'=> 'Map :item_type Fields',
+    'remaining_var' => ':count Remaining',
+    'label' => 'Label',
+    'import_asset_tag_exists' => 'An asset with the asset tag :asset_tag already exists and an update was not requested. No change was made.',
+    'countries_manually_entered_help' => 'Values with an asterisk (*) were manually entered and do not match existing ISO 3166 dropdown values',
+    'accessories_assigned' => 'Assigned Accessories',
+    'user_managed_passwords' => 'Password Management',
+    'user_managed_passwords_disallow' => 'Disallow users from managing their own passwords',
+    'user_managed_passwords_allow' => 'Allow users to manage their own passwords',
+    'from' => 'From',
+    'by' => 'By',
+
+// Add form placeholders here
+    'placeholders' => [
+        'notes'  => 'Add a note',
+    ],
+
+    'breadcrumb_button_actions' => [
+        'edit_item' => 'Edit :name',
+        'checkout_item' => 'Checkout :name',
+        'checkin_item' => 'Checkin :name',
+    ],
+
+    'skins' => [
+        'site_default' => 'Site Default',
+        'default_blue' => 'Default Blue',
+        'blue_dark' => 'Blue (Dark Mode)',
+        'green' => 'Green Dark',
+        'green_dark' => 'Green (Dark Mode)',
+        'red' => 'Red Dark',
+        'red_dark' => 'Red (Dark Mode)',
+        'orange' => 'Orange Dark',
+        'orange_dark' => 'Orange (Dark Mode)',
+        'black' => 'Black',
+        'black_dark' => 'Black (Dark Mode)',
+        'purple' => 'Purple',
+        'purple_dark' => 'Purple (Dark Mode)',
+        'yellow' => 'Yellow',
+        'yellow_dark' => 'Yellow (Dark Mode)',
+        'high_contrast' => 'High Contrast',
+
+    ],
+
+    'select_all_none' => 'Select/Unselect All',
+    'generic_model_not_found' => 'That :model was not found or you do not have permission to access it',
+    'deleted_models' => 'Deleted Asset Models',
+    'deleted_users' => 'Deleted Users',
+    'cost_each' => ':amount each',
+    'remove_current_image' => 'Remove current :type image',
+
+    'seeding' => [
+        'manufacturers' => [
+            'button' => 'Create Manufacturers',
+            'prompt' => 'You do not have any manufacturers yet. Would you like to seed a list of common manufacturers? (THIS WILL OVERWRITE EXISTING MANUFACTURERS, including those that have been soft-deleted.)',
+            'success' => 'Manufacturers seeded successfully',
+            'error' => 'Could not seed manufacturers. A manufacturer record already exists and seeding would overwrite it.|Could not seed manufacturers. :count manufacturer records already exist and seeding would overwrite them.',
+        ],
+    ],
+
+];
diff --git a/resources/lang/hi-IN/help.php b/resources/lang/hi-IN/help.php
new file mode 100644
index 0000000000..a59e0056be
--- /dev/null
+++ b/resources/lang/hi-IN/help.php
@@ -0,0 +1,35 @@
+<?php
+
+return [
+
+    /*
+    |--------------------------------------------------------------------------
+    | Password Reminder Language Lines
+    |--------------------------------------------------------------------------
+    |
+    | The following language lines are the default lines which match reasons
+    | that are given by the password broker for a password update attempt
+    | has failed, such as for an invalid token or invalid new password.
+    |
+    */
+
+    'more_info_title' => 'More Info',
+
+    'audit_help' => 'Checking this box will edit the asset record to reflect this new location. Leaving it unchecked will simply note the location in the audit log.<br><br>Note that if this asset is checked out, it will not change the location of the person, asset or location it is checked out to.',
+
+    'assets' => 'Assets are items tracked by serial number or asset tag.  They tend to be higher value items where identifying a specific item matters.',
+
+    'categories' => 'Categories help you organize your items. Some example categories might be &quot;Desktops&quot;, &quot;Laptops&quot;, &quot;Mobile Phones&quot;, &quot;Tablets&quot;, and so on, but you can use categories any way that makes sense for you.',
+
+    'accessories' => 'Accessories are anything you issue to users but that do not have a serial number (or you do not care about tracking them uniquely). For example, computer mice or keyboards.',
+
+    'companies'     => 'Companies can be used as a simple identifier field, or can be used to limit visibility of assets, users, etc if full company support is enabled in your Admin settings.',
+
+    'components'    => 'Components are items that are part of an asset, for example HDD, RAM, etc.',
+
+    'consumables'   => 'Consumables are anything purchased that will be used up over time. For example, printer ink or copier paper.',
+
+    'depreciations' => 'You can set up asset depreciations to depreciate assets based on straight-line depreciation.',
+    
+    'empty_file'    => 'The importer detects that this file is empty.'
+];
diff --git a/resources/lang/hi-IN/localizations.php b/resources/lang/hi-IN/localizations.php
new file mode 100644
index 0000000000..827ed4fca1
--- /dev/null
+++ b/resources/lang/hi-IN/localizations.php
@@ -0,0 +1,326 @@
+<?php
+
+return [
+
+    'select_language' => 'Select a Language',
+    'languages' => [
+        'en-US'=> 'English, US',
+        'en-GB'=> 'English, UK',
+        'am-ET' => 'Amharic',
+        'af-ZA'=> 'Afrikaans',
+        'ar-SA'=> 'Arabic',
+        'bg-BG'=> 'Bulgarian',
+        'zh-CN'=> 'Chinese Simplified',
+        'zh-TW'=> 'Chinese Traditional',
+        'ca-ES' => 'Catalan',
+        'hr-HR'=> 'Croatian',
+        'cs-CZ'=> 'Czech',
+        'da-DK'=> 'Danish',
+        'nl-NL'=> 'Dutch',
+        'en-ID'=> 'English, Indonesia',
+        'et-EE'=> 'Estonian',
+        'fil-PH'=> 'Filipino',
+        'fi-FI'=> 'Finnish',
+        'fr-FR'=> 'French',
+        'de-DE'=> 'German',
+        'de-if'=> 'German (Informal)',
+        'el-GR'=> 'Greek',
+        'he-IL'=> 'Hebrew',
+        'hu-HU'=> 'Hungarian',
+        'is-IS' => 'Icelandic',
+        'id-ID'=> 'Indonesian',
+        'ga-IE'=> 'Irish',
+        'it-IT'=> 'Italian',
+        'ja-JP'=> 'Japanese',
+        'km-KH'=>'Khmer',
+        'ko-KR'=> 'Korean',
+        'lt-LT'=>'Lithuanian',
+        'lv-LV'=> 'Latvian',
+        'mk-MK'=> 'Macedonian',
+        'ms-MY'=> 'Malay',
+        'mi-NZ'=> 'Maori',
+        'mn-MN'=> 'Mongolian',
+        'nb-NO'=> 'Norwegian Bokmål',
+        'om-ET' => 'Oromo (Ethiopian)',
+        //'nn-NO'=> 'Norwegian Nynorsk',
+        'fa-IR'=> 'Persian',
+        'pl-PL'=> 'Polish',
+        'pt-PT'=> 'Portuguese',
+        'pt-BR'=> 'Portuguese, Brazilian',
+        'ro-RO'=> 'Romanian',
+        'ru-RU'=> 'Russian',
+        'sr-CS' => 'Serbian (Latin)',
+        'sk-SK'=> 'Slovak',
+        'sl-SI'=> 'Slovenian',
+        'so-SO'=> 'Somali',
+        'es-ES'=> 'Spanish',
+        'es-CO'=> 'Spanish, Colombia',
+        'es-MX'=> 'Spanish, Mexico',
+        'es-VE'=> 'Spanish, Venezuela',
+        'sv-SE'=> 'Swedish',
+        'tl-PH'=> 'Tagalog',
+        'ta-IN'=> 'Tamil',
+        'th-TH'=> 'Thai',
+        'tr-TR'=> 'Turkish',
+        'uk-UA'=> 'Ukranian',
+        'vi-VN'=> 'Vietnamese',
+        'cy-GB'=> 'Welsh',
+        'zu-ZA'=> 'Zulu',
+    ],
+
+    'select_country' => 'Select a Country',
+    
+    'countries' => [
+        'AC'=>'Ascension Island',
+        'AD'=>'Andorra',
+        'AE'=>'United Arab Emirates',
+        'AF'=>'Afghanistan',
+        'AG'=>'Antigua And Barbuda',
+        'AI'=>'Anguilla',
+        'AL'=>'Albania',
+        'AM'=>'Armenia',
+        'AN'=>'Netherlands Antilles',
+        'AO'=>'Angola',
+        'AQ'=>'Antarctica',
+        'AR'=>'Argentina',
+        'AS'=>'American Samoa',
+        'AT'=>'Austria',
+        'AU'=>'Australia',
+        'AW'=>'Aruba',
+        'AX'=>'Ã…land',
+        'AZ'=>'Azerbaijan',
+        'BA'=>'Bosnia And Herzegovina',
+        'BB'=>'Barbados',
+        'BE'=>'Belgium',
+        'BD'=>'Bangladesh',
+        'BF'=>'Burkina Faso',
+        'BG'=>'Bulgaria',
+        'BH'=>'Bahrain',
+        'BI'=>'Burundi',
+        'BJ'=>'Benin',
+        'BM'=>'Bermuda',
+        'BN'=>'Brunei Darussalam',
+        'BO'=>'Bolivia',
+        'BR'=>'Brazil',
+        'BS'=>'Bahamas',
+        'BT'=>'Bhutan',
+        'BV'=>'Bouvet Island',
+        'BW'=>'Botswana',
+        'BY'=>'Belarus',
+        'BZ'=>'Belize',
+        'CA'=>'Canada',
+        'CC'=>'Cocos (Keeling) Islands',
+        'CD'=>'Congo (Democratic Republic)',
+        'CF'=>'Central African Republic',
+        'CG'=>'Congo (Republic)',
+        'CH'=>'Switzerland',
+        'CI'=>'Côte d\'Ivoire',
+        'CK'=>'Cook Islands',
+        'CL'=>'Chile',
+        'CM'=>'Cameroon',
+        'CN'=>'People\'s Republic of China',
+        'CO'=>'Colombia',
+        'CR'=>'Costa Rica',
+        'CU'=>'Cuba',
+        'CV'=>'Cape Verde',
+        'CX'=>'Christmas Island',
+        'CY'=>'Cyprus',
+        'CZ'=>'Czech Republic',
+        'DE'=>'Germany',
+        'DJ'=>'Djibouti',
+        'DK'=>'Denmark',
+        'DM'=>'Dominica',
+        'DO'=>'Dominican Republic',
+        'DZ'=>'Algeria',
+        'EC'=>'Ecuador',
+        'EE'=>'Estonia',
+        'EG'=>'Egypt',
+        'GB-ENG'=>'England',
+        'ER'=>'Eritrea',
+        'ES'=>'Spain',
+        'ET'=>'Ethiopia',
+        'EU'=>'European Union',
+        'FI'=>'Finland',
+        'FJ'=>'Fiji',
+        'FK'=>'Falkland Islands (Malvinas)',
+        'FM'=>'Micronesia, Federated States Of',
+        'FO'=>'Faroe Islands',
+        'FR'=>'France',
+        'GA'=>'Gabon',
+        'GD'=>'Grenada',
+        'GE'=>'Georgia',
+        'GF'=>'French Guiana',
+        'GG'=>'Guernsey',
+        'GH'=>'Ghana',
+        'GI'=>'Gibraltar',
+        'GL'=>'Greenland',
+        'GM'=>'Gambia',
+        'GN'=>'Guinea',
+        'GP'=>'Guadeloupe',
+        'GQ'=>'Equatorial Guinea',
+        'GR'=>'Greece',
+        'GS'=>'South Georgia And The South Sandwich Islands',
+        'GT'=>'Guatemala',
+        'GU'=>'Guam',
+        'GW'=>'Guinea-Bissau',
+        'GY'=>'Guyana',
+        'HK'=>'Hong Kong',
+        'HM'=>'Heard And Mc Donald Islands',
+        'HN'=>'Honduras',
+        'HR'=>'Croatia (local name: Hrvatska)',
+        'HT'=>'Haiti',
+        'HU'=>'Hungary',
+        'ID'=>'Indonesia',
+        'IE'=>'Ireland',
+        'IL'=>'Israel',
+        'IM'=>'Isle of Man',
+        'IN'=>'India',
+        'IO'=>'British Indian Ocean Territory',
+        'IQ'=>'Iraq',
+        'IR'=>'Iran, Islamic Republic Of',
+        'IS'=>'Iceland',
+        'IT'=>'Italy',
+        'JE'=>'Jersey',
+        'JM'=>'Jamaica',
+        'JO'=>'Jordan',
+        'JP'=>'Japan',
+        'KE'=>'Kenya',
+        'KG'=>'Kyrgyzstan',
+        'KH'=>'Cambodia',
+        'KI'=>'Kiribati',
+        'KM'=>'Comoros',
+        'KN'=>'Saint Kitts And Nevis',
+        'KR'=>'Korea, Republic Of',
+        'KW'=>'Kuwait',
+        'KY'=>'Cayman Islands',
+        'KZ'=>'Kazakhstan',
+        'LA'=>'Lao People\'s Democratic Republic',
+        'LB'=>'Lebanon',
+        'LC'=>'Saint Lucia',
+        'LI'=>'Liechtenstein',
+        'LK'=>'Sri Lanka',
+        'LR'=>'Liberia',
+        'LS'=>'Lesotho',
+        'LT'=>'Lithuania',
+        'LU'=>'Luxembourg',
+        'LV'=>'Latvia',
+        'LY'=>'Libyan Arab Jamahiriya',
+        'MA'=>'Morocco',
+        'MC'=>'Monaco',
+        'MD'=>'Moldova, Republic Of',
+        'ME'=>'Montenegro',
+        'MG'=>'Madagascar',
+        'MH'=>'Marshall Islands',
+        'MK'=>'Macedonia, The Former Yugoslav Republic Of',
+        'ML'=>'Mali',
+        'MM'=>'Myanmar',
+        'MN'=>'Mongolia',
+        'MO'=>'Macau',
+        'MP'=>'Northern Mariana Islands',
+        'MQ'=>'Martinique',
+        'MR'=>'Mauritania',
+        'MS'=>'Montserrat',
+        'MT'=>'Malta',
+        'MU'=>'Mauritius',
+        'MV'=>'Maldives',
+        'MW'=>'Malawi',
+        'MX'=>'Mexico',
+        'MY'=>'Malaysia',
+        'MZ'=>'Mozambique',
+        'NA'=>'Namibia',
+        'NC'=>'New Caledonia',
+        'NE'=>'Niger',
+        'NF'=>'Norfolk Island',
+        'NG'=>'Nigeria',
+        'NI'=>'Nicaragua',
+        'NL'=>'Netherlands',
+        'GB-NIR' => 'Northern Ireland',
+        'NO'=>'Norway',
+        'NP'=>'Nepal',
+        'NR'=>'Nauru',
+        'NU'=>'Niue',
+        'NZ'=>'New Zealand',
+        'OM'=>'Oman',
+        'PA'=>'Panama',
+        'PE'=>'Peru',
+        'PF'=>'French Polynesia',
+        'PG'=>'Papua New Guinea',
+        'PH'=>'Philippines, Republic of the',
+        'PK'=>'Pakistan',
+        'PL'=>'Poland',
+        'PM'=>'St. Pierre And Miquelon',
+        'PN'=>'Pitcairn',
+        'PR'=>'Puerto Rico',
+        'PS'=>'Palestine',
+        'PT'=>'Portugal',
+        'PW'=>'Palau',
+        'PY'=>'Paraguay',
+        'QA'=>'Qatar',
+        'RE'=>'Reunion',
+        'RO'=>'Romania',
+        'RS'=>'Serbia',
+        'RU'=>'Russian Federation',
+        'RW'=>'Rwanda',
+        'SA'=>'Saudi Arabia',
+        'GB-SCT'=>'Scotland',
+        'SB'=>'Solomon Islands',
+        'SC'=>'Seychelles',
+        'SS'=>'South Sudan',
+        'SD'=>'Sudan',
+        'SE'=>'Sweden',
+        'SG'=>'Singapore',
+        'SH'=>'St. Helena',
+        'SI'=>'Slovenia',
+        'SJ'=>'Svalbard And Jan Mayen Islands',
+        'SK'=>'Slovakia (Slovak Republic)',
+        'SL'=>'Sierra Leone',
+        'SM'=>'San Marino',
+        'SN'=>'Senegal',
+        'SO'=>'Somalia',
+        'SR'=>'Suriname',
+        'ST'=>'Sao Tome And Principe',
+        'SU'=>'Soviet Union',
+        'SV'=>'El Salvador',
+        'SY'=>'Syrian Arab Republic',
+        'SZ'=>'Swaziland',
+        'TC'=>'Turks And Caicos Islands',
+        'TD'=>'Chad',
+        'TF'=>'French Southern Territories',
+        'TG'=>'Togo',
+        'TH'=>'Thailand',
+        'TJ'=>'Tajikistan',
+        'TK'=>'Tokelau',
+        'TI'=>'East Timor',
+        'TM'=>'Turkmenistan',
+        'TN'=>'Tunisia',
+        'TO'=>'Tonga',
+        'TP'=>'East Timor (old code)',
+        'TR'=>'Turkey',
+        'TT'=>'Trinidad And Tobago',
+        'TV'=>'Tuvalu',
+        'TW'=>'Taiwan',
+        'TZ'=>'Tanzania, United Republic Of',
+        'UA'=>'Ukraine',
+        'UG'=>'Uganda',
+        'UK'=>'United Kingdom',
+        'US'=>'United States',
+        'UM'=>'United States Minor Outlying Islands',
+        'UY'=>'Uruguay',
+        'UZ'=>'Uzbekistan',
+        'VA'=>'Vatican City State (Holy See)',
+        'VC'=>'Saint Vincent And The Grenadines',
+        'VE'=>'Venezuela',
+        'VG'=>'Virgin Islands (British)',
+        'VI'=>'Virgin Islands (U.S.)',
+        'VN'=>'Viet Nam',
+        'VU'=>'Vanuatu',
+        'GB-WLS' =>'Wales',
+        'WF'=>'Wallis And Futuna Islands',
+        'WS'=>'Samoa',
+        'YE'=>'Yemen',
+        'YT'=>'Mayotte',
+        'ZA'=>'South Africa',
+        'ZM'=>'Zambia',
+        'ZW'=>'Zimbabwe',
+    ],
+];
\ No newline at end of file
diff --git a/resources/lang/hi-IN/mail.php b/resources/lang/hi-IN/mail.php
new file mode 100644
index 0000000000..797f735a2b
--- /dev/null
+++ b/resources/lang/hi-IN/mail.php
@@ -0,0 +1,99 @@
+<?php
+
+return [
+
+    'Accessory_Checkin_Notification' => 'Accessory checked in',
+    'Accessory_Checkout_Notification' => 'Accessory checked out',
+    'Asset_Checkin_Notification' => 'Asset checked in',
+    'Asset_Checkout_Notification' => 'Asset checked out',
+    'Confirm_Accessory_Checkin' => 'Accessory checkin confirmation',
+    'Confirm_Asset_Checkin' => 'Asset checkin confirmation',
+    'Confirm_accessory_delivery' => 'Accessory delivery confirmation',
+    'Confirm_asset_delivery' => 'Asset delivery confirmation',
+    'Confirm_consumable_delivery' => 'Consumable delivery confirmation',
+    'Confirm_license_delivery' => 'License delivery confirmation',
+    'Consumable_checkout_notification' => 'Consumable checked out',
+    'Days' => 'Days',
+    'Expected_Checkin_Date' => 'An asset checked out to you is due to be checked back in on :date',
+    'Expected_Checkin_Notification' => 'Reminder: :name checkin deadline approaching',
+    'Expected_Checkin_Report' => 'Expected asset checkin report',
+    'Expiring_Assets_Report' => 'Expiring Assets Report.',
+    'Expiring_Licenses_Report' => 'Expiring Licenses Report.',
+    'Item_Request_Canceled' => 'Item Request Canceled',
+    'Item_Requested' => 'Item Requested',
+    'License_Checkin_Notification' => 'License checked in',
+    'License_Checkout_Notification' => 'License checked out',
+    'license_for'   => 'License for',
+    'Low_Inventory_Report' => 'Low Inventory Report',
+    'a_user_canceled' => 'A user has canceled an item request on the website',
+    'a_user_requested' => 'A user has requested an item on the website',
+    'acceptance_asset_accepted' => 'A user has accepted an item',
+    'acceptance_asset_declined' => 'A user has declined an item',
+    'accessory_name' => 'Accessory Name',
+    'additional_notes' => 'Additional Notes',
+    'admin_has_created' => 'An administrator has created an account for you on the :web website.',
+    'asset' => 'Asset',
+    'asset_name' => 'Asset Name',
+    'asset_requested' => 'Asset requested',
+    'asset_tag' => 'Asset Tag',
+    'assets_warrantee_alert' => 'There is :count asset with a warranty expiring in the next :threshold days.|There are :count assets with warranties expiring in the next :threshold days.',
+    'assigned_to' => 'Assigned To',
+    'best_regards' => 'Best regards,',
+    'canceled' => 'Canceled',
+    'checkin_date' => 'Checkin Date',
+    'checkout_date' => 'Checkout Date',
+    'checkedout_from' => 'Checked out from',
+    'checkedin_from'  => 'Checked in from',
+    'checked_into' => 'Checked into',
+    'click_on_the_link_accessory' => 'Please click on the link at the bottom to confirm that you have received the accessory.',
+    'click_on_the_link_asset' => 'Please click on the link at the bottom to confirm that you have received the asset.',
+    'click_to_confirm' => 'Please click on the following link to confirm your :web account:',
+    'current_QTY' => 'Current QTY',
+    'days' => 'Days',
+    'expecting_checkin_date' => 'Expected Checkin Date',
+    'expires' => 'Expires',
+    'hello' => 'Hello',
+    'hi' => 'Hi',
+    'i_have_read' => 'I have read and agree to the terms of use, and have received this item.',
+    'inventory_report' => 'Inventory Report',
+    'item' => 'Item',
+    'item_checked_reminder' => 'This is a reminder that you currently have :count items checked out to you that you have not accepted or declined. Please click the link below to confirm your decision.',
+    'license_expiring_alert' => 'There is :count license expiring in the next :threshold days.|There are :count licenses expiring in the next :threshold days.',
+    'link_to_update_password' => 'Please click on the following link to update your :web password:',
+    'login' => 'Login',
+    'login_first_admin' => 'Login to your new Snipe-IT installation using the credentials below:',
+    'low_inventory_alert' => 'There is :count item that is below minimum inventory or will soon be low.|There are :count items that are below minimum inventory or will soon be low.',
+    'min_QTY' => 'Min QTY',
+    'name' => 'Name',
+    'new_item_checked' => 'A new item has been checked out under your name, details are below.',
+    'new_item_checked_with_acceptance' => 'A new item has been checked out under your name that requires acceptance, details are below.',
+    'recent_item_checked' => 'An item was recently checked out under your name that requires acceptance, details are below.',
+    'notes' => 'Notes',
+    'password' => 'Password',
+    'password_reset' => 'Password Reset',
+    'read_the_terms' => 'Please read the terms of use below.',
+    'read_the_terms_and_click' => 'Please read the terms of use below, and click on the link at the bottom to confirm that you read and agree to the terms of use, and have received the asset.',
+    'requested' => 'Requested',
+    'reset_link' => 'Your Password Reset Link',
+    'reset_password' => 'Click here to reset your password:',
+    'rights_reserved' => 'All rights reserved.',
+    'serial' => 'Serial',
+    'snipe_webhook_test' => 'Snipe-IT Integration Test',
+    'snipe_webhook_summary' => 'Snipe-IT Integration Test Summary',
+    'supplier' => 'Supplier',
+    'tag' => 'Tag',
+    'test_email' => 'Test Email from Snipe-IT',
+    'test_mail_text' => 'This is a test from the Snipe-IT Asset Management System. If you got this, mail is working :)',
+    'the_following_item' => 'The following item has been checked in: ',
+    'to_reset' => 'To reset your :web password, complete this form:',
+    'type' => 'Type',
+    'upcoming-audits' => 'There is :count asset that is coming up for audit within :threshold days.|There are :count assets that are coming up for audit within :threshold days.',
+    'user' => 'User',
+    'username' => 'Username',
+    'unaccepted_asset_reminder' => 'Reminder: You have Unaccepted Assets.',
+    'welcome' => 'Welcome :name',
+    'welcome_to' => 'Welcome to :web!',
+    'your_assets' => 'View Your Assets',
+    'your_credentials' => 'Your Snipe-IT credentials',
+    'mail_sent' => 'Mail sent successfully!',
+];
diff --git a/resources/lang/hi-IN/pagination.php b/resources/lang/hi-IN/pagination.php
new file mode 100644
index 0000000000..b573b51e91
--- /dev/null
+++ b/resources/lang/hi-IN/pagination.php
@@ -0,0 +1,20 @@
+<?php
+
+return array(
+
+    /*
+    |--------------------------------------------------------------------------
+    | Pagination Language Lines
+    |--------------------------------------------------------------------------
+    |
+    | The following language lines are used by the paginator library to build
+    | the simple pagination links. You are free to change them to anything
+    | you want to customize your views to better match your application.
+    |
+    */
+
+    'previous' => '&laquo; Previous',
+
+    'next'     => 'Next &raquo;',
+
+);
diff --git a/resources/lang/hi-IN/passwords.php b/resources/lang/hi-IN/passwords.php
new file mode 100644
index 0000000000..41a87f98ed
--- /dev/null
+++ b/resources/lang/hi-IN/passwords.php
@@ -0,0 +1,9 @@
+<?php
+
+return [
+    'sent'	        => 'If a matching user with a valid email address exists in our system, a password recovery email has been sent.',
+    'user'			=> 'If a matching user with a valid email address exists in our system, a password recovery email has been sent.',
+    'token'         => 'This password reset token is invalid or expired, or does not match the username provided.',
+    'reset'         => 'Your password has been reset!',
+    'password_change'  => 'Your password has been updated!',
+];
diff --git a/resources/lang/hi-IN/reminders.php b/resources/lang/hi-IN/reminders.php
new file mode 100644
index 0000000000..8a197467df
--- /dev/null
+++ b/resources/lang/hi-IN/reminders.php
@@ -0,0 +1,21 @@
+<?php
+
+return array(
+
+    /*
+    |--------------------------------------------------------------------------
+    | Password Reminder Language Lines
+    |--------------------------------------------------------------------------
+    |
+    | The following language lines are the default lines which match reasons
+    | that are given by the password broker for a password update attempt
+    | has failed, such as for an invalid token or invalid new password.
+    |
+    */
+
+    "password" => "Passwords must be six characters and match the confirmation.",
+    "user"     => "Username or email address is incorrect",
+    "token"    => 'This password reset token is invalid or expired, or does not match the username provided.',
+    'sent'	   => 'If a matching user with a valid email address exists in our system, a password recovery email has been sent.',
+
+);
diff --git a/resources/lang/hi-IN/table.php b/resources/lang/hi-IN/table.php
new file mode 100644
index 0000000000..16e32b148f
--- /dev/null
+++ b/resources/lang/hi-IN/table.php
@@ -0,0 +1,11 @@
+<?php
+
+return array(
+
+    'actions'	 	        => 'Actions',
+    'action' 		        => 'Action',
+    'by'      		        => 'By',
+    'item' 			        => 'Item',
+    'no_matching_records'   => 'No matching records found',
+
+);
diff --git a/resources/lang/hi-IN/validation.php b/resources/lang/hi-IN/validation.php
new file mode 100644
index 0000000000..99c847f589
--- /dev/null
+++ b/resources/lang/hi-IN/validation.php
@@ -0,0 +1,248 @@
+<?php
+
+return [
+
+    /*
+    |--------------------------------------------------------------------------
+    | Validation Language Lines
+    |--------------------------------------------------------------------------
+    |
+    | The following language lines contain the default error messages used by
+    | the validator class. Some of these rules have multiple versions such
+    | such as the size rules. Feel free to tweak each of these messages.
+    |
+    */
+
+    'accepted' => 'The :attribute field must be accepted.',
+    'accepted_if' => 'The :attribute field must be accepted when :other is :value.',
+    'active_url' => 'The :attribute field must be a valid URL.',
+    'after' => 'The :attribute field must be a date after :date.',
+    'after_or_equal' => 'The :attribute field must be a date after or equal to :date.',
+    'alpha' => 'The :attribute field must only contain letters.',
+    'alpha_dash' => 'The :attribute field must only contain letters, numbers, dashes, and underscores.',
+    'alpha_num' => 'The :attribute field must only contain letters and numbers.',
+    'array' => 'The :attribute field must be an array.',
+    'ascii' => 'The :attribute field must only contain single-byte alphanumeric characters and symbols.',
+    'before' => 'The :attribute field must be a date before :date.',
+    'before_or_equal' => 'The :attribute field must be a date before or equal to :date.',
+    'between' => [
+        'array' => 'The :attribute field must have between :min and :max items.',
+        'file' => 'The :attribute field must be between :min and :max kilobytes.',
+        'numeric' => 'The :attribute field must be between :min and :max.',
+        'string' => 'The :attribute field must be between :min and :max characters.',
+    ],
+    'boolean' => 'The :attribute field must be true or false.',
+    'can' => 'The :attribute field contains an unauthorized value.',
+    'confirmed' => 'The :attribute field confirmation does not match.',
+    'contains' => 'The :attribute field is missing a required value.',
+    'current_password' => 'The password is incorrect.',
+    'date' => 'The :attribute field must be a valid date.',
+    'date_equals' => 'The :attribute field must be a date equal to :date.',
+    'date_format' => 'The :attribute field must match the format :format.',
+    'decimal' => 'The :attribute field must have :decimal decimal places.',
+    'declined' => 'The :attribute field must be declined.',
+    'declined_if' => 'The :attribute field must be declined when :other is :value.',
+    'different' => 'The :attribute field and :other must be different.',
+    'digits' => 'The :attribute field must be :digits digits.',
+    'digits_between' => 'The :attribute field must be between :min and :max digits.',
+    'dimensions' => 'The :attribute field has invalid image dimensions.',
+    'distinct' => 'The :attribute field has a duplicate value.',
+    'doesnt_end_with' => 'The :attribute field must not end with one of the following: :values.',
+    'doesnt_start_with' => 'The :attribute field must not start with one of the following: :values.',
+    'email' => 'The :attribute field must be a valid email address.',
+    'ends_with' => 'The :attribute field must end with one of the following: :values.',
+    'enum' => 'The selected :attribute is invalid.',
+    'exists' => 'The selected :attribute is invalid.',
+    'extensions' => 'The :attribute field must have one of the following extensions: :values.',
+    'file' => 'The :attribute field must be a file.',
+    'filled' => 'The :attribute field must have a value.',
+    'gt' => [
+        'array' => 'The :attribute field must have more than :value items.',
+        'file' => 'The :attribute field must be greater than :value kilobytes.',
+        'numeric' => 'The :attribute field must be greater than :value.',
+        'string' => 'The :attribute field must be greater than :value characters.',
+    ],
+    'gte' => [
+        'array' => 'The :attribute field must have :value items or more.',
+        'file' => 'The :attribute field must be greater than or equal to :value kilobytes.',
+        'numeric' => 'The :attribute field must be greater than or equal to :value.',
+        'string' => 'The :attribute field must be greater than or equal to :value characters.',
+    ],
+    'hex_color' => 'The :attribute field must be a valid hexadecimal color.',
+    'image' => 'The :attribute field must be an image.',
+    'import_field_empty'    => 'The value for :fieldname cannot be null.',
+    'in' => 'The selected :attribute is invalid.',
+    'in_array' => 'The :attribute field must exist in :other.',
+    'integer' => 'The :attribute field must be an integer.',
+    'ip' => 'The :attribute field must be a valid IP address.',
+    'ipv4' => 'The :attribute field must be a valid IPv4 address.',
+    'ipv6' => 'The :attribute field must be a valid IPv6 address.',
+    'json' => 'The :attribute field must be a valid JSON string.',
+    'list' => 'The :attribute field must be a list.',
+    'lowercase' => 'The :attribute field must be lowercase.',
+    'lt' => [
+        'array' => 'The :attribute field must have less than :value items.',
+        'file' => 'The :attribute field must be less than :value kilobytes.',
+        'numeric' => 'The :attribute field must be less than :value.',
+        'string' => 'The :attribute field must be less than :value characters.',
+    ],
+    'lte' => [
+        'array' => 'The :attribute field must not have more than :value items.',
+        'file' => 'The :attribute field must be less than or equal to :value kilobytes.',
+        'numeric' => 'The :attribute field must be less than or equal to :value.',
+        'string' => 'The :attribute field must be less than or equal to :value characters.',
+    ],
+    'mac_address' => 'The :attribute field must be a valid MAC address.',
+    'max' => [
+        'array' => 'The :attribute field must not have more than :max items.',
+        'file' => 'The :attribute field must not be greater than :max kilobytes.',
+        'numeric' => 'The :attribute field must not be greater than :max.',
+        'string' => 'The :attribute field must not be greater than :max characters.',
+    ],
+    'max_digits' => 'The :attribute field must not have more than :max digits.',
+    'mimes' => 'The :attribute field must be a file of type: :values.',
+    'mimetypes' => 'The :attribute field must be a file of type: :values.',
+    'min' => [
+        'array' => 'The :attribute field must have at least :min items.',
+        'file' => 'The :attribute field must be at least :min kilobytes.',
+        'numeric' => 'The :attribute field must be at least :min.',
+        'string' => 'The :attribute field must be at least :min characters.',
+    ],
+    'min_digits' => 'The :attribute field must have at least :min digits.',
+    'missing' => 'The :attribute field must be missing.',
+    'missing_if' => 'The :attribute field must be missing when :other is :value.',
+    'missing_unless' => 'The :attribute field must be missing unless :other is :value.',
+    'missing_with' => 'The :attribute field must be missing when :values is present.',
+    'missing_with_all' => 'The :attribute field must be missing when :values are present.',
+    'multiple_of' => 'The :attribute field must be a multiple of :value.',
+    'not_in' => 'The selected :attribute is invalid.',
+    'not_regex' => 'The :attribute field format is invalid.',
+    'numeric' => 'The :attribute field must be a number.',
+    'password' => [
+        'letters' => 'The :attribute field must contain at least one letter.',
+        'mixed' => 'The :attribute field must contain at least one uppercase and one lowercase letter.',
+        'numbers' => 'The :attribute field must contain at least one number.',
+        'symbols' => 'The :attribute field must contain at least one symbol.',
+        'uncompromised' => 'The given :attribute has appeared in a data leak. Please choose a different :attribute.',
+    ],
+    'percent'       => 'The depreciation minimum must be between 0 and 100 when depreciation type is percentage.',
+
+    'present' => 'The :attribute field must be present.',
+    'present_if' => 'The :attribute field must be present when :other is :value.',
+    'present_unless' => 'The :attribute field must be present unless :other is :value.',
+    'present_with' => 'The :attribute field must be present when :values is present.',
+    'present_with_all' => 'The :attribute field must be present when :values are present.',
+    'prohibited' => 'The :attribute field is prohibited.',
+    'prohibited_if' => 'The :attribute field is prohibited when :other is :value.',
+    'prohibited_unless' => 'The :attribute field is prohibited unless :other is in :values.',
+    'prohibits' => 'The :attribute field prohibits :other from being present.',
+    'regex' => 'The :attribute field format is invalid.',
+    'required' => 'The :attribute field is required.',
+    'required_array_keys' => 'The :attribute field must contain entries for: :values.',
+    'required_if' => 'The :attribute field is required when :other is :value.',
+    'required_if_accepted' => 'The :attribute field is required when :other is accepted.',
+    'required_if_declined' => 'The :attribute field is required when :other is declined.',
+    'required_unless' => 'The :attribute field is required unless :other is in :values.',
+    'required_with' => 'The :attribute field is required when :values is present.',
+    'required_with_all' => 'The :attribute field is required when :values are present.',
+    'required_without' => 'The :attribute field is required when :values is not present.',
+    'required_without_all' => 'The :attribute field is required when none of :values are present.',
+    'same' => 'The :attribute field must match :other.',
+    'size' => [
+        'array' => 'The :attribute field must contain :size items.',
+        'file' => 'The :attribute field must be :size kilobytes.',
+        'numeric' => 'The :attribute field must be :size.',
+        'string' => 'The :attribute field must be :size characters.',
+    ],
+    'starts_with' => 'The :attribute field must start with one of the following: :values.',
+    'string'               => 'The :attribute must be a string.',
+    'two_column_unique_undeleted' => 'The :attribute must be unique across :table1 and :table2. ',
+    'unique_undeleted'     => 'The :attribute must be unique.',
+    'non_circular'         => 'The :attribute must not create a circular reference.',
+    'not_array'            => ':attribute cannot be an array.',
+    'disallow_same_pwd_as_user_fields' => 'Password cannot be the same as the username.',
+    'letters'              => 'Password must contain at least one letter.',
+    'numbers'              => 'Password must contain at least one number.',
+    'case_diff'            => 'Password must use mixed case.',
+    'symbols'              => 'Password must contain symbols.',
+    'timezone' => 'The :attribute field must be a valid timezone.',
+    'unique' => 'The :attribute has already been taken.',
+    'uploaded' => 'The :attribute failed to upload.',
+    'uppercase' => 'The :attribute field must be uppercase.',
+    'url' => 'The :attribute field must be a valid URL.',
+    'ulid' => 'The :attribute field must be a valid ULID.',
+    'uuid' => 'The :attribute field must be a valid UUID.',
+    'fmcs_location' => 'Full multiple company support and location scoping is enabled in the Admin Settings, and the selected location and selected company are not compatible.',
+
+
+    /*
+    |--------------------------------------------------------------------------
+    | Custom Validation Language Lines
+    |--------------------------------------------------------------------------
+    |
+    | Here you may specify custom validation messages for attributes using the
+    | convention "attribute.rule" to name the lines. This makes it quick to
+    | specify a specific custom language line for a given attribute rule.
+    |
+    */
+
+    'email_array'      => 'One or more email addresses is invalid.',
+    'checkboxes'           => ':attribute contains invalid options.',
+    'radio_buttons'        => ':attribute is invalid.',
+    
+    'custom' => [
+        'alpha_space' => 'The :attribute field contains a character that is not allowed.',
+
+        'hashed_pass'      => 'Your current password is incorrect',
+        'dumbpwd'          => 'That password is too common.',
+        'statuslabel_type' => 'You must select a valid status label type',
+        'custom_field_not_found'          => 'This field does not seem to exist, please double check your custom field names.',
+        'custom_field_not_found_on_model' => 'This field seems to exist, but is not available on this Asset Model\'s fieldset.',
+
+        // date_format validation with slightly less stupid messages. It duplicates a lot, but it gets the job done :(
+        // We use this because the default error message for date_format reflects php Y-m-d, which non-PHP
+        // people won't know how to format.
+        'purchase_date.date_format'     => 'The :attribute must be a valid date in YYYY-MM-DD format',
+        'last_audit_date.date_format'   =>  'The :attribute must be a valid date in YYYY-MM-DD hh:mm:ss format',
+        'expiration_date.date_format'   =>  'The :attribute must be a valid date in YYYY-MM-DD format',
+        'termination_date.date_format'  =>  'The :attribute must be a valid date in YYYY-MM-DD format',
+        'expected_checkin.date_format'  =>  'The :attribute must be a valid date in YYYY-MM-DD format',
+        'start_date.date_format'        =>  'The :attribute must be a valid date in YYYY-MM-DD format',
+        'end_date.date_format'          =>  'The :attribute must be a valid date in YYYY-MM-DD format',
+        'invalid_value_in_field' => 'Invalid value included in this field',
+
+        'ldap_username_field' => [
+            'not_in' =>         '<code>sAMAccountName</code> (mixed case) will likely not work. You should use <code>samaccountname</code> (lowercase) instead.'
+        ],
+        'ldap_auth_filter_query' => ['not_in' => '<code>uid=samaccountname</code> is probably not a valid auth filter. You probably want <code>uid=</code> '],
+        'ldap_filter' => ['regex' => 'This value should probably not be wrapped in parentheses.'],
+
+        ],
+    /*
+    |--------------------------------------------------------------------------
+    | Custom Validation Attributes
+    |--------------------------------------------------------------------------
+    |
+    | The following language lines are used to swap attribute place-holders
+    | with something more reader friendly such as E-Mail Address instead
+    | of "email". This simply helps us make messages a little cleaner.
+    |
+    */
+
+    'attributes' => [],
+
+    /*
+    |--------------------------------------------------------------------------
+    | Generic Validation Messages - we use these in the jquery validation where we don't have
+    | access to the :attribute
+    |--------------------------------------------------------------------------
+    */
+
+    'generic' => [
+        'invalid_value_in_field' => 'Invalid value included in this field',
+        'required' => 'This field is required',
+        'email' => 'Please enter a valid email address',
+    ],
+
+
+];
diff --git a/resources/lang/hr-HR/account/general.php b/resources/lang/hr-HR/account/general.php
index 1a9e2c03b8..7f9e2f848e 100644
--- a/resources/lang/hr-HR/account/general.php
+++ b/resources/lang/hr-HR/account/general.php
@@ -2,10 +2,16 @@
 
 return array(
     'personal_api_keys' => 'Personal API Keys',
+    'personal_access_token' => 'Personal Access Token',
+    'personal_api_keys_success' => 'Personal API Key :key created sucessfully',
+    'here_is_api_key' => 'Here is your new personal access token. This is the only time it will be shown so do not lose it! You may now use this token to make API requests.',
     'api_key_warning' => 'When generating an API token, be sure to copy it down immediately as they will not be visible to you again.',
     'api_base_url' => 'Your API base url is located at:',
     'api_base_url_endpoint' => '/&lt;endpoint&gt;',
     'api_token_expiration_time' => 'API tokens are set to expire in:',
     'api_reference' => 'Please check the <a href="https://snipe-it.readme.io/reference" target="_blank">API reference</a> to find specific API endpoints and additional API documentation.',
     'profile_updated' => 'Account successfully updated',
+    'no_tokens' => 'You have not created any personal access tokens.',
+    'enable_sounds' => 'Enable sound effects',
+    'enable_confetti' => 'Enable confetti effects',
 );
diff --git a/resources/lang/hr-HR/admin/accessories/message.php b/resources/lang/hr-HR/admin/accessories/message.php
index 343ca5dd17..ec4f78f24c 100644
--- a/resources/lang/hr-HR/admin/accessories/message.php
+++ b/resources/lang/hr-HR/admin/accessories/message.php
@@ -26,7 +26,11 @@ return array(
         'error'   		=> 'Dodatak nije provjeren, pokušajte ponovo',
         'success' 		=> 'Usluga je uspješno provjerena.',
         'unavailable'   => 'Accessory is not available for checkout. Check quantity available',
-        'user_does_not_exist' => 'Taj je korisnik nevažeći. Molim te pokušaj ponovno.'
+        'user_does_not_exist' => 'Taj je korisnik nevažeći. Molim te pokušaj ponovno.',
+         'checkout_qty' => array(
+            'lte'  => 'There is currently only one available accessory of this type, and you are trying to check out :checkout_qty. Please adjust the checkout quantity or the total stock of this accessory and try again.|There are :number_currently_remaining total available accessories, and you are trying to check out :checkout_qty. Please adjust the checkout quantity or the total stock of this accessory and try again.',
+            ),
+           
     ),
 
     'checkin' => array(
diff --git a/resources/lang/hr-HR/admin/accessories/table.php b/resources/lang/hr-HR/admin/accessories/table.php
index 49d9574cf5..6b4a03e64e 100644
--- a/resources/lang/hr-HR/admin/accessories/table.php
+++ b/resources/lang/hr-HR/admin/accessories/table.php
@@ -6,6 +6,4 @@ return array(
     'id'      					=> 'iskaznica',
     'require_acceptance'      	=> 'Prihvaćanje',
     'title'      				=> 'Naziv dodatne opreme',
-
-
 );
diff --git a/resources/lang/hr-HR/admin/components/message.php b/resources/lang/hr-HR/admin/components/message.php
index 61dea43341..48ea6c7fd3 100644
--- a/resources/lang/hr-HR/admin/components/message.php
+++ b/resources/lang/hr-HR/admin/components/message.php
@@ -17,7 +17,8 @@ return array(
     'delete' => array(
         'confirm'   => 'Jeste li sigurni da želite izbrisati ovu komponentu?',
         'error'   => 'Došlo je do problema s brisanjem komponente. Molim te pokušaj ponovno.',
-        'success' => 'Komponenta je uspješno izbrisana.'
+        'success' => 'Komponenta je uspješno izbrisana.',
+        'error_qty'   => 'Some components of this type are still checked out. Please check them in and try again.',
     ),
 
      'checkout' => array(
diff --git a/resources/lang/hr-HR/admin/consumables/general.php b/resources/lang/hr-HR/admin/consumables/general.php
index d69d9c3cba..cd9627d8ac 100644
--- a/resources/lang/hr-HR/admin/consumables/general.php
+++ b/resources/lang/hr-HR/admin/consumables/general.php
@@ -8,4 +8,5 @@ return array(
     'remaining' 			            => 'ostali',
     'total' 			                => 'ukupno',
     'update'                            => 'Ažuriraj potrošnju',
+    'inventory_warning'                 => 'The inventory of this consumable is below the minimum amount of :min_count',
 );
diff --git a/resources/lang/hr-HR/admin/consumables/message.php b/resources/lang/hr-HR/admin/consumables/message.php
index 85ac9b6a63..52e51f5f4a 100644
--- a/resources/lang/hr-HR/admin/consumables/message.php
+++ b/resources/lang/hr-HR/admin/consumables/message.php
@@ -2,6 +2,7 @@
 
 return array(
 
+    'invalid_category_type' => 'The category must be a consumable category.',
     'does_not_exist' => 'Potrošnja ne postoji.',
 
     'create' => array(
diff --git a/resources/lang/hr-HR/admin/custom_fields/general.php b/resources/lang/hr-HR/admin/custom_fields/general.php
index 4aa6ff97ce..abb6735775 100644
--- a/resources/lang/hr-HR/admin/custom_fields/general.php
+++ b/resources/lang/hr-HR/admin/custom_fields/general.php
@@ -35,7 +35,7 @@ return [
     'create_field_title' => 'Create a new custom field',
     'value_encrypted'      	        => 'Vrijednost ovog polja je šifrirana u bazi podataka. Samo administratori administratora moći će vidjeti dešifriranu vrijednost',
     'show_in_email'     => 'Prikazati vrijednost ovog polja u checkout e-mailovima koji se šalju korisnicima? Enkriptirana polja se ne mogu prikazati u e-mailovima',
-    'show_in_email_short'     => 'Include in emails.',
+    'show_in_email_short' => 'Include in emails',
     'help_text' => 'Help Text',
     'help_text_description' => 'This is optional text that will appear below the form elements while editing an asset to provide context on the field.',
     'about_custom_fields_title' => 'About Custom Fields',
@@ -57,5 +57,8 @@ return [
     'show_in_requestable_list_short' => 'Show in requestable assets list',
     'show_in_requestable_list' => 'Show value in requestable assets list. Encrypted fields will not be shown',
     'encrypted_options' => 'This field is encrypted, so some display options will not be available.',
+    'display_checkin' => 'Display in checkin forms',
+    'display_checkout' => 'Display in checkout forms',
+    'display_audit' => 'Display in audit forms',
 
 ];
diff --git a/resources/lang/hr-HR/admin/custom_fields/message.php b/resources/lang/hr-HR/admin/custom_fields/message.php
index 55560eac0f..5b9b8712d8 100644
--- a/resources/lang/hr-HR/admin/custom_fields/message.php
+++ b/resources/lang/hr-HR/admin/custom_fields/message.php
@@ -5,6 +5,7 @@ return array(
     'field' => array(
         'invalid'   => 'To polje ne postoji.',
         'already_added'   => 'Polje je već dodano',
+        'none_selected'   => 'No field selected',
 
         'create' => array(
             'error'   => 'Polje nije izrađeno, pokušajte ponovo.',
diff --git a/resources/lang/hr-HR/admin/depreciations/general.php b/resources/lang/hr-HR/admin/depreciations/general.php
index 4cdd86baf4..1d265fa208 100644
--- a/resources/lang/hr-HR/admin/depreciations/general.php
+++ b/resources/lang/hr-HR/admin/depreciations/general.php
@@ -13,4 +13,8 @@ return [
     'no_depreciations_warning'               => '<strong>Upozorenje</strong>
                       Trenutno nemate postavljene stope amortizacije za svoju imovinu.
                       Molimo vas da postavite barem jednu stopu amortizacije kako bi mogli vidjeti izvještaj o amortizaciji.',
+    'depreciation_method'                   => 'Izvješće o amortizaciji',
+    'linear_depreciation'                   => 'Linear (Default)',
+    'half_1'                                => 'Half-year convention, always applied',
+    'half_2'                                => 'Half-year convention, applied with condition',
 ];
diff --git a/resources/lang/hr-HR/admin/hardware/form.php b/resources/lang/hr-HR/admin/hardware/form.php
index cc1645d358..47ec2f4e10 100644
--- a/resources/lang/hr-HR/admin/hardware/form.php
+++ b/resources/lang/hr-HR/admin/hardware/form.php
@@ -55,8 +55,11 @@ return [
     'asset_location_update_default' => 'Update only default location',
     'asset_location_update_actual' => 'Update only actual location',
     'asset_not_deployable' => 'That asset status is not deployable. This asset cannot be checked out.',
-    'asset_deployable' => 'That status is deployable. This asset can be checked out.',
+    'asset_not_deployable_checkin' => 'That asset status is not deployable. Using this status label will checkin the asset.',
+    'asset_deployable' => 'This asset can be checked out.',
     'processing_spinner' => 'Processing... (This might take a bit of time on large files)',
+    'processing' => 'Processing... ',
     'optional_infos'  => 'Optional Information',
-    'order_details'   => 'Order Related Information'
+    'order_details'   => 'Order Related Information',
+    'calc_eol'    => 'If nulling the EOL date, use automatic EOL calculation based on the purchase date and EOL rate.',
 ];
diff --git a/resources/lang/hr-HR/admin/hardware/general.php b/resources/lang/hr-HR/admin/hardware/general.php
index 73cb0dd22e..c3f9f8e9f1 100644
--- a/resources/lang/hr-HR/admin/hardware/general.php
+++ b/resources/lang/hr-HR/admin/hardware/general.php
@@ -5,8 +5,8 @@ return [
     'about_assets_text'            => 'Imovina je stavka koja se prati serijskim brojem ili oznakom imovine. Oni imaju tendenciju da se stavke više vrijednosti gdje je identificiranje određenog predmeta pitanjima.',
     'archived'  				=> 'Arhivirano',
     'asset'  					=> 'Imovina',
-    'bulk_checkout'             => 'Provjera imovine',
-    'bulk_checkin'              => 'Checkin Assets',
+    'bulk_checkout'             => 'Bulk Checkout',
+    'bulk_checkin'              => 'Bulk Checkin',
     'checkin'  					=> 'Provjera imovine',
     'checkout'  				=> 'Asset Checkout',
     'clone'  					=> 'Klonska imovina',
@@ -27,8 +27,7 @@ return [
     'undeployable_tooltip'  	=> 'This asset has a status label that is undeployable and cannot be checked out at this time.',
     'view'  					=> 'Prikaz opcije Asset',
     'csv_error' => 'Vaša CSV datoteka sadrži grešku:',
-    'import_text' => '<p>Upload a CSV that contains asset history. The assets and users MUST already exist in the system, or they will be skipped. Matching assets for history import happens against the asset tag. We will try to find a matching user based on the user\'s name you provide, and the criteria you select below. If you do not select any criteria below, it will simply try to match on the username format you configured in the <code>Admin &gt; General Settings</code>.</p><p>Fields included in the CSV must match the headers: <strong>Asset Tag, Name, Checkout Date, Checkin Date</strong>. Any additional fields will be ignored. </p><p>Checkin Date: blank or future checkin dates will checkout items to associated user.  Excluding the Checkin Date column will create a checkin date with todays date.</p>
-    ',
+    'import_text' => '<p>Upload a CSV that contains asset history. The assets and users MUST already exist in the system, or they will be skipped. Matching assets for history import happens against the asset tag. We will try to find a matching user based on the user\'s name you provide, and the criteria you select below. If you do not select any criteria below, it will simply try to match on the username format you configured in the <code>Admin &gt; General Settings</code>.</p><p>Fields included in the CSV must match the headers: <strong>Asset Tag, Name, Checkout Date, Checkin Date</strong>. Any additional fields will be ignored. </p><p>Checkin Date: blank or future checkin dates will checkout items to associated user.  Excluding the Checkin Date column will create a checkin date with todays date.</p>    ',
     'csv_import_match_f-l' => 'Try to match users by <strong>firstname.lastname</strong> (<code>jane.smith</code>) format',
     'csv_import_match_initial_last' => 'Try to match users by <strong>first initial last name</strong> (<code>jsmith</code>) format',
     'csv_import_match_first' => 'Try to match users by <strong>first name</strong> (<code>jane</code>) format',
diff --git a/resources/lang/hr-HR/admin/hardware/message.php b/resources/lang/hr-HR/admin/hardware/message.php
index 5d251377ac..d24ce4f8ff 100644
--- a/resources/lang/hr-HR/admin/hardware/message.php
+++ b/resources/lang/hr-HR/admin/hardware/message.php
@@ -2,18 +2,23 @@
 
 return [
 
-    'undeployable' 		=> '<strong>Upozorenje: </strong> Ova je snimka označena kao trenutno nedjeljiva. Ako se ovaj status promijenio, ažurirajte status aktive.',
-    'does_not_exist' 	=> 'Imovina ne postoji.',
-    'does_not_exist_var'=> 'Asset with tag :asset_tag not found.',
-    'no_tag' 	        => 'No asset tag provided.',
+    'undeployable' 		 => '<strong>Warning: </strong> This asset has been marked as currently undeployable. If this status has changed, please update the asset status.',
+    'does_not_exist' 	 => 'Imovina ne postoji.',
+    'does_not_exist_var' => 'Asset with tag :asset_tag not found.',
+    'no_tag' 	         => 'No asset tag provided.',
     'does_not_exist_or_not_requestable' => 'That asset does not exist or is not requestable.',
-    'assoc_users'	 	=> 'Ovaj je entitet trenutno provjeren korisniku i ne može se izbrisati. Najprije provjerite snimljeni materijal, a zatim pokušajte ponovo ukloniti.',
+    'assoc_users'	 	 => 'Ovaj je entitet trenutno provjeren korisniku i ne može se izbrisati. Najprije provjerite snimljeni materijal, a zatim pokušajte ponovo ukloniti.',
     'warning_audit_date_mismatch' 	=> 'This asset\'s next audit date (:next_audit_date) is before the last audit date (:last_audit_date). Please update the next audit date.',
+    'labels_generated'   => 'Labels were successfully generated.',
+    'error_generating_labels' => 'Error while generating labels.',
+    'no_assets_selected' => 'No assets selected.',
 
     'create' => [
         'error'   		=> 'Imovina nije izrađena, pokušajte ponovo. :(',
         'success' 		=> 'Imovina je uspješno izrađena. :)',
         'success_linked' => 'Asset with tag :tag was created successfully. <strong><a href=":link" style="color: white;">Click here to view</a></strong>.',
+        'multi_success_linked' => 'Asset with tag :links was created successfully.|:count assets were created succesfully. :links.',
+        'partial_failure' => 'An asset was unable to be created. Reason: :failures|:count assets were unable to be created. Reasons: :failures',
     ],
 
     'update' => [
@@ -51,20 +56,24 @@ return [
     ],
 
     'import' => [
+        'import_button'         => 'Process Import',
         'error'                 => 'Neke stavke nisu pravilno uvezene.',
         'errorDetail'           => 'Sljedeće stavke nisu uvezene zbog pogrešaka.',
         'success'               => 'Vaša je datoteka uvezena',
         'file_delete_success'   => 'Vaša je datoteka uspješno izbrisana',
         'file_delete_error'      => 'Datoteka nije mogla biti izbrisana',
         'file_missing' => 'The file selected is missing',
+        'file_already_deleted' => 'The file selected was already deleted',
         'header_row_has_malformed_characters' => 'One or more attributes in the header row contain malformed UTF-8 characters',
         'content_row_has_malformed_characters' => 'One or more attributes in the first row of content contain malformed UTF-8 characters',
+        'transliterate_failure' => 'Transliteration from :encoding to UTF-8 failed due to invalid characters in input'
     ],
 
 
     'delete' => [
         'confirm'   	=> 'Jeste li sigurni da želite izbrisati ovaj materijal?',
         'error'   		=> 'Došlo je do problema s brisanjem imovine. Molim te pokušaj ponovno.',
+        'assigned_to_error' => '{1}Asset Tag: :asset_tag is currently checked out. Check in this device before deletion.|[2,*]Asset Tags: :asset_tag are currently checked out. Check in these devices before deletion.',
         'nothing_updated'   => 'Nijedna imovina nije odabrana, tako da ništa nije izbrisano.',
         'success' 		=> 'Imovina je uspješno obrisana.',
     ],
@@ -77,6 +86,11 @@ return [
         'no_assets_selected' => 'Morate odabrati barem jednu imovinu s popisa',
     ],
 
+    'multi-checkout' => [
+        'error'   => 'Asset was not checked out, please try again|Assets were not checked out, please try again',
+        'success' => 'Asset checked out successfully.|Assets checked out successfully.',
+    ],
+
     'checkin' => [
         'error'   		=> 'Prijava nije provjerena. Pokušajte ponovo',
         'success' 		=> 'Asset je uspješno prijavio.',
@@ -86,9 +100,10 @@ return [
     ],
 
     'requests' => [
-        'error'   		=> 'Imovina nije zatražena, pokušajte ponovo',
-        'success' 		=> 'Imovina je uspješno zatražena.',
-        'canceled'      => 'Zahtjev za uplatu uspješno je otkazan',
+        'error'   		=> 'Request was not successful, please try again.',
+        'success' 		=> 'Request successfully submitted.',
+        'canceled'      => 'Request successfully canceled.',
+        'cancel'        => 'Cancel this item request',
     ],
 
 ];
diff --git a/resources/lang/hr-HR/admin/hardware/table.php b/resources/lang/hr-HR/admin/hardware/table.php
index b269bf45c7..57643b3ed1 100644
--- a/resources/lang/hr-HR/admin/hardware/table.php
+++ b/resources/lang/hr-HR/admin/hardware/table.php
@@ -25,7 +25,6 @@ return [
     'image'		    => 'Slika uređaja',
     'days_without_acceptance' => 'Dani bez prihvaćanja',
     'monthly_depreciation' => 'Mjesečna amortizacija',
-    'assigned_to'    => 'Dodijeljena',
     'requesting_user' => 'Requesting User',
     'requested_date' => 'Requested Date',
     'changed'       => 'Promijenjeno',
diff --git a/resources/lang/hr-HR/admin/kits/general.php b/resources/lang/hr-HR/admin/kits/general.php
index 0fdbc29f9e..1d71a8bbea 100644
--- a/resources/lang/hr-HR/admin/kits/general.php
+++ b/resources/lang/hr-HR/admin/kits/general.php
@@ -47,4 +47,5 @@ return [
     'kit_deleted'                       => 'Kit was successfully deleted',
     'kit_model_updated'                 => 'Model was successfully updated',
     'kit_model_detached'                => 'Model was successfully detached',
+    'model_already_attached'            => 'Model already attached to kit',
 ];
diff --git a/resources/lang/hr-HR/admin/licenses/general.php b/resources/lang/hr-HR/admin/licenses/general.php
index 88092dc297..7ec6e49338 100644
--- a/resources/lang/hr-HR/admin/licenses/general.php
+++ b/resources/lang/hr-HR/admin/licenses/general.php
@@ -14,6 +14,7 @@ return array(
     'info'  					=> 'Podaci o licenci',
     'license_seats'  			=> 'Sjedišta licenci',
     'seat'  					=> 'Sjedalo',
+    'seat_count'  				=> 'Seat :count',
     'seats'  					=> 'sjedala',
     'software_licenses'  		=> 'Licence za softver',
     'user'  					=> 'Korisnik',
@@ -23,12 +24,12 @@ return array(
         [
             'checkin_all'           => [
                 'button'            => 'Checkin All Seats',
-                'modal'             => 'This will action checkin one seat. | This action will checkin all :checkedout_seats_count seats for this license.',
+                'modal'             => 'This action will checkin one seat. | This action will checkin all :checkedout_seats_count seats for this license.',
                 'enabled_tooltip'   => 'Checkin ALL seats for this license from both users and assets',
                 'disabled_tooltip'  => 'This is disabled because there are no seats currently checked out',
                 'disabled_tooltip_reassignable'  => 'This is disabled because the License is not reassignable',
                 'success'           => 'License successfully checked in! | All licenses were successfully checked in!',
-                'log_msg'           => 'Checked in via bulk license checkout in license GUI',
+                'log_msg'           => 'Checked in via bulk license checkin in license GUI',
             ],
 
             'checkout_all'              => [
diff --git a/resources/lang/hr-HR/admin/licenses/message.php b/resources/lang/hr-HR/admin/licenses/message.php
index 1b4e5f53c4..851ba4beaa 100644
--- a/resources/lang/hr-HR/admin/licenses/message.php
+++ b/resources/lang/hr-HR/admin/licenses/message.php
@@ -44,10 +44,13 @@ return array(
         'error'   => 'Došlo je do problema prilikom provjere licence. Molim te pokušaj ponovno.',
         'success' => 'Licenca je uspješno provjerena',
         'not_enough_seats' => 'Not enough license seats available for checkout',
+        'mismatch' => 'The license seat provided does not match the license',
+        'unavailable' => 'This seat is not available for checkout.',
     ),
 
     'checkin' => array(
         'error'   => 'U licenci se provjeravala problem. Molim te pokušaj ponovno.',
+        'not_reassignable' => 'License not reassignable',
         'success' => 'Licenca je uspješno provjerena'
     ),
 
diff --git a/resources/lang/hr-HR/admin/locations/message.php b/resources/lang/hr-HR/admin/locations/message.php
index bf856a0fc0..0eabb315bd 100644
--- a/resources/lang/hr-HR/admin/locations/message.php
+++ b/resources/lang/hr-HR/admin/locations/message.php
@@ -3,11 +3,12 @@
 return array(
 
     'does_not_exist' => 'Lokacija ne postoji.',
-    'assoc_users'    => 'This location is not currently deletable because it is the location of record for at least one asset or user, has assets assigned to it, or is the parent location of another location. Please update your models to no longer reference this company and try again. ',
+    'assoc_users'    => 'This location is not currently deletable because it is the location of record for at least one asset or user, has assets assigned to it, or is the parent location of another location. Please update your records to no longer reference this location and try again ',
     'assoc_assets'	 => 'Ta je lokacija trenutačno povezana s barem jednim resursom i ne može se izbrisati. Ažurirajte svoju imovinu da više ne referira na tu lokaciju i pokušajte ponovno.',
     'assoc_child_loc'	 => 'Ta je lokacija trenutačno roditelj najmanje jedne lokacije za djecu i ne može se izbrisati. Ažurirajte svoje lokacije da više ne referiraju ovu lokaciju i pokušajte ponovo.',
     'assigned_assets' => 'Assigned Assets',
     'current_location' => 'Current Location',
+    'open_map' => 'Open in :map_provider_icon Maps',
 
 
     'create' => array(
@@ -20,6 +21,11 @@ return array(
         'success' => 'Lokacija je uspješno ažurirana.'
     ),
 
+    'restore' => array(
+        'error'   => 'Location was not restored, please try again',
+        'success' => 'Location restored successfully.'
+    ),
+
     'delete' => array(
         'confirm'   	=> 'Jeste li sigurni da želite izbrisati tu lokaciju?',
         'error'   => 'Došlo je do problema s brisanjem lokacije. Molim te pokušaj ponovno.',
diff --git a/resources/lang/hr-HR/admin/locations/table.php b/resources/lang/hr-HR/admin/locations/table.php
index 0b19f02332..c5e09e1062 100644
--- a/resources/lang/hr-HR/admin/locations/table.php
+++ b/resources/lang/hr-HR/admin/locations/table.php
@@ -39,4 +39,5 @@ return [
     'signed_by_finance_auditor' => 'Signed By (Finance Auditor):',
     'signed_by_location_manager' => 'Signed By (Location Manager):',
     'signed_by'                 => 'Signed Off By:',
+    'clone'  					=> 'Clone Location',
 ];
diff --git a/resources/lang/hr-HR/admin/models/general.php b/resources/lang/hr-HR/admin/models/general.php
index 1a78e9bd9b..4c8a5f36e7 100644
--- a/resources/lang/hr-HR/admin/models/general.php
+++ b/resources/lang/hr-HR/admin/models/general.php
@@ -3,7 +3,7 @@
 return array(
     'about_models_title'     => 'O modelu imovine',
     'about_models_text'           => 'Modeli imovine su način grupiranja identične imovine. "MBP 2013", "IPhone 6s" itd.',
-    'deleted'  					        => 'This model has been deleted.',
+    'deleted'  					=> 'This model has been deleted.',
     'bulk_delete'               => 'Skupno brisanje modela imovine',
     'bulk_delete_help'               => 'Koristeći checkbox-ove niže potvrdite brisanje odabranih modela imovine. Modeli imovine koji na sebi imaju povezanu imovinu se ne mogu brisati dok se imovina ne poveže sa drugim modelom.',
     'bulk_delete_warn'          => 'You are about to delete one asset model.|You are about to delete :model_count asset models.',
diff --git a/resources/lang/hr-HR/admin/models/message.php b/resources/lang/hr-HR/admin/models/message.php
index 93a66bca33..998cb886ea 100644
--- a/resources/lang/hr-HR/admin/models/message.php
+++ b/resources/lang/hr-HR/admin/models/message.php
@@ -7,7 +7,7 @@ return array(
     'no_association' => 'WARNING! The asset model for this item is invalid or missing!',
     'no_association_fix' => 'This will break things in weird and horrible ways. Edit this asset now to assign it a model.',
     'assoc_users'	 => 'Ovaj je model trenutno povezan s jednom ili više imovine i ne može se izbrisati. Izbrišite imovinu pa pokušajte ponovo ukloniti.',
-
+    'invalid_category_type' => 'This category must be an asset category.',
 
     'create' => array(
         'error'   => 'Model nije izrađen, pokušajte ponovo.',
diff --git a/resources/lang/hr-HR/admin/reports/general.php b/resources/lang/hr-HR/admin/reports/general.php
index 06e45e6323..c04da2a664 100644
--- a/resources/lang/hr-HR/admin/reports/general.php
+++ b/resources/lang/hr-HR/admin/reports/general.php
@@ -4,6 +4,7 @@ return [
     'info'   => 'Odaberite željene opcije za izvješće o imovini.',
     'deleted_user' => 'Deleted user',
     'send_reminder' => 'Send reminder',
+    'cannot_send_reminder' => 'User has been deleted or does not have an email address so cannot receive a reminder',
     'reminder_sent' => 'Reminder sent',
     'acceptance_deleted' => 'Acceptance request deleted',
     'acceptance_request' => 'Acceptance request',
@@ -13,5 +14,10 @@ return [
         'user_state' => 'User State',
         'user_country' => 'User Country',
         'user_zip' => 'User Zip'
-    ]
-];
\ No newline at end of file
+    ],
+    'open_saved_template' => 'Open Saved Template',
+    'save_template' =>  'Save Template',
+    'select_a_template' => 'Select a Template',
+    'template_name' => 'Template Name',
+    'update_template' => 'Update Template',
+];
diff --git a/resources/lang/hr-HR/admin/reports/message.php b/resources/lang/hr-HR/admin/reports/message.php
index 827fb0f52e..2800bbdf0b 100644
--- a/resources/lang/hr-HR/admin/reports/message.php
+++ b/resources/lang/hr-HR/admin/reports/message.php
@@ -1,5 +1,16 @@
 <?php
 
-return array(
-    'error'   => 'Morate odabrati barem jednu opciju.'
-);
+return [
+    'about_templates' => 'About Saved Templates',
+    'saving_templates_description' => 'Select your options, then enter the name of your template in the box above and click the \'Save Template\' button. Use the dropdown to select a previously saved template.',
+    'create'  => [
+        'success' => 'Template saved successfully',
+    ],
+    'update' => [
+        'success' => 'Template updated successfully',
+    ],
+    'delete' => [
+        'success' => 'Template deleted',
+        'no_delete_permission' => 'Template does not exist or you do not have permission to delete it.',
+    ],
+];
diff --git a/resources/lang/hr-HR/admin/settings/general.php b/resources/lang/hr-HR/admin/settings/general.php
index e0e498b967..7a16564986 100644
--- a/resources/lang/hr-HR/admin/settings/general.php
+++ b/resources/lang/hr-HR/admin/settings/general.php
@@ -8,13 +8,13 @@ return [
     'ad_append_domain'          => 'Append domain name to username field',
     'ad_append_domain_help'     => 'User isn\'t required to write "username@domain.local", they can just type "username".',
     'admin_cc_email'            => 'Kopija e-pošte (CC)',
-    'admin_cc_email_help'       => 'Ako želite poslati kopiju checkin/checkout poruka e-pošte koje se šalju korisnicima na dodatni račun e-pošte, unesite ga ovdje. U suprotnom ostavite ovo polje prazno.',
+    'admin_cc_email_help'       => 'Send a copy of checkin/checkout emails to this address.',
     'admin_settings'            => 'Admin Settings',
     'is_ad'				        => 'Ovo je poslužitelj Active Directory',
     'alerts'                	=> 'Alerts',
     'alert_title'               => 'Update Notification Settings',
     'alert_email'				=> 'Pošaljite upozorenja za',
-    'alert_email_help'    => 'Email addresses or distribution lists you want alerts to be sent to, comma separated',
+    'alert_email_help'          => 'Email addresses or distribution lists you want alerts to be sent to, comma separated.',
     'alerts_enabled'			=> 'Upozorenja su omogućena',
     'alert_interval'			=> 'Prag prekoračenja upozorenja (u danima)',
     'alert_inv_threshold'		=> 'Prag upozorenja inventara',
@@ -31,15 +31,18 @@ return [
     'backups'					=> 'Sigurnosne kopije',
     'backups_help'              => 'Create, download, and restore backups ',
     'backups_restoring'         => 'Restoring from Backup',
+    'backups_clean' => 'Clean the backed-up database before restore',
+    'backups_clean_helptext' => "This can be useful if you're changing between database versions",
     'backups_upload'            => 'Upload Backup',
     'backups_path'              => 'Backups on the server are stored in <code>:path</code>',
-    'backups_restore_warning'   => 'Use the restore button <small><span class="btn btn-xs btn-warning"><i class="text-white fas fa-retweet" aria-hidden="true"></i></span></small> to restore from a previous backup. (This does not currently work with S3 file storage or Docker.)<br><br>Your <strong>entire :app_name database and any uploaded files will be completely replaced</strong> by what\'s in the backup file.  ',
+    'backups_restore_warning'   => 'Use the restore button <small><span class="btn btn-xs btn-warning"><i class="text-white fas fa-retweet" aria-hidden="true"></i></span></small> to restore from a previous backup. (This does not currently work with S3 file storage or Docker.)<br><br>Your <strong>entire :app_name database and any uploaded files will be completely replaced</strong> by what\'s in the backup file  ',
     'backups_logged_out'         => 'All existing users, including you, will be logged out once your restore is complete.',
     'backups_large'             => 'Very large backups may time out on the restore attempt and may still need to be run via command line. ',
     'barcode_settings'			=> 'Postavke crtičnog koda',
     'confirm_purge'			    => 'Potvrdite čišćenje',
     'confirm_purge_help'		=> 'Enter the text "DELETE" in the box below to purge your deleted records. This action cannot be undone and will PERMANENTLY delete all soft-deleted items and users. (You should make a backup first, just to be safe.)',
     'custom_css'				=> 'Prilagođeni CSS',
+    'custom_css_placeholder'	=> 'Add your custom CSS',
     'custom_css_help'			=> 'Unesite bilo koji prilagođeni CSS nadjačaj koji biste željeli koristiti. Ne uključujte oznake &lt;style&gt;&lt;/style&gt;.',
     'custom_forgot_pass_url'	=> 'Prilagođeni URL za resetiranje zaporke',
     'custom_forgot_pass_url_help'	=> 'Ovo zamjenjuje ugrađeni URL za zaboravljenu zaporku na zaslonu za prijavu, korisno za usmjeravanje korisnika na internu ili hostanu LDAP uslugu resetiranja zaporke. To će zapravo isključiti lokalnu funkciju za zaboravljene korisničke zaporke.',
@@ -47,34 +50,34 @@ return [
     'dashboard_message_help'	=> 'Taj će se tekst prikazati na nadzornoj ploči za sve osobe s dozvolom za pregled nadzorne ploče.',
     'default_currency'  		=> 'Zadana valuta',
     'default_eula_text'			=> 'Zadana EULA',
+    'default_eula_text_placeholder' => 'Add your default EULA text',
     'default_language'			=> 'Zadani jezik',
     'default_eula_help_text'	=> 'Također možete povezati prilagođene EULA-e s određenim kategorijama imovine.',
     'acceptance_note'           => 'Add a note for your decision (Optional)',
     'display_asset_name'        => 'Prikaz naziva imovine',
     'display_checkout_date'     => 'Prikaz datuma narudžbe',
     'display_eol'               => 'Prikaži EOL u prikazu tablice',
-    'display_qr'                => 'Prikaz kvadratnih kodova',
+    'display_qr'                => 'Display 2D barcode',
     'display_alt_barcode'		=> 'Prikaz 1D crtičnog koda',
-    'email_logo'                => 'Email Logo',
     'barcode_type'				=> 'Vrsta 2D barkod',
     'alt_barcode_type'			=> '1D tip crtičnog koda',
-    'email_logo_size'       => 'Square logos in email look best. ',
     'enabled'                   => 'Enabled',
     'eula_settings'				=> 'EULA postavke',
     'eula_markdown'				=> 'Ovo EULA dopušta <a href="https://help.github.com/articles/github-flavored-markdown/">Gordan markdown</a>.',
+    'empty_row_count'           => 'Field Start Offset (Empty Rows)',
+    'empty_row_count_help'      => 'Fields will begin populating after this many empty rows are skipped at the top of the label.',
     'favicon'                   => 'Favicon',
     'favicon_format'            => 'Accepted filetypes are ico, png, and gif. Other image formats may not work in all browsers.',
     'favicon_size'          => 'Favicons should be square images, 16x16 pixels.',
     'footer_text'               => 'Dodatni tekst u podnožju ',
     'footer_text_help'          => 'Ovaj će se tekst pojaviti u podnožju desno. Poveznice su dopuštene uporabom <a href="https://help.github.com/articles/github-flavored-markdown/">Github flavored markdown</a>. Prijelazi u novi red, naslovi, slike itd., mogu imati nepredvidive rezultate.',
+    'footer_text_placeholder'   => 'Optional footer text',
     'general_settings'			=> 'Opće postavke',
-    'general_settings_keywords' => 'company support, signature, acceptance, email format, username format, images, per page, thumbnail, eula, gravatar, tos, dashboard, privacy',
     'general_settings_help'     => 'Default EULA and more',
     'generate_backup'			=> 'Izradi sigurnosnu kopiju',
     'google_workspaces'         => 'Google Workspaces',
     'header_color'              => 'Boja zaglavlja',
     'info'                      => 'Te postavke omogućuju prilagodbu određenih aspekata vaše instalacije.',
-    'label_logo'                => 'Label Logo',
     'label_logo_size'           => 'Square logos look best - will be displayed in the top right of each asset label. ',
     'laravel'                   => 'Inačica Laravela',
     'ldap'                      => 'LDAP',
@@ -94,7 +97,7 @@ return [
     'ldap_login_sync_help'      => 'Ovo samo testira da se LDAP može ispravno sinkronizirati. Ako vaš upit za LDAP autentikaciju nije ispravan, korisnici se i dalje možda neće moći prijaviti. MORATE NAJPRIJE SPREMITI SVOJE AŽURIRANE LDAP POSTAVKE.',
     'ldap_manager'              => 'LDAP Manager',
     'ldap_server'               => 'LDAP poslužitelj',
-    'ldap_server_help'          => 'To bi trebalo započeti s ldap: // (za neispisane ili TLS) ili ldaps: // (za SSL)',
+    'ldap_server_help'          => 'This should start with ldap:// (for unencrypted) or ldaps:// (for TLS or SSL)',
     'ldap_server_cert'			=> 'Provjera LDAP SSL certifikata',
     'ldap_server_cert_ignore'	=> 'Dopusti nevažeću SSL certifikat',
     'ldap_server_cert_help'		=> 'Odaberite ovaj potvrdni okvir ako upotrebljavate autentičnu SSL certifikat i želite prihvatiti nevažeći SSL certifikat.',
@@ -108,8 +111,8 @@ return [
     'ldap_pword'                => 'Lozinka vezivanja LDAP-a',
     'ldap_basedn'               => 'Baza se povezuje s DN',
     'ldap_filter'               => 'LDAP filtar',
-    'ldap_pw_sync'              => 'LDAP lozinka sinkronizacija',
-    'ldap_pw_sync_help'         => 'Poništite ovaj okvir ako ne želite zadržati LDAP zaporke sinkronizirane lokalnim zaporkama. Onemogućavanje ovog znači da se vaši korisnici možda neće moći prijaviti ako vaš LDAP poslužitelj zbog nekog razloga nije dostupan.',
+    'ldap_pw_sync'              => 'Cache LDAP Passwords',
+    'ldap_pw_sync_help'         => 'Uncheck this box if you do not wish to keep LDAP passwords cached as local hashed passwords. Disabling this means that your users may not be able to login if your LDAP server is unreachable for some reason.',
     'ldap_username_field'       => 'Polje za korisničko ime',
     'ldap_lname_field'          => 'Prezime',
     'ldap_fname_field'          => 'Ime LDAP-a',
@@ -117,13 +120,15 @@ return [
     'ldap_version'              => 'LDAP inačica',
     'ldap_active_flag'          => 'LDAP aktivna zastava',
     'ldap_activated_flag_help'  => 'This value is used to determine whether a synced user can login to Snipe-IT. <strong>It does not affect the ability to check items in or out to them</strong>, and should be the <strong>attribute name</strong> within your AD/LDAP, <strong>not the value</strong>. <br><br>If this field is set to a field name that does not exist in your AD/LDAP, or the value in the AD/LDAP field is set to <code>0</code> or <code>false</code>, <strong>user login will be disabled</strong>. If the value in the AD/LDAP field is set to <code>1</code> or <code>true</code> or <em>any other text</em> means the user can log in. When the field is blank in your AD, we respect the <code>userAccountControl</code> attribute, which usually allows non-suspended users to log in.',
+    'ldap_invert_active_flag'   => 'LDAP Invert Active Flag',
+    'ldap_invert_active_flag_help'     => 'If enabled: when the value returned by LDAP Active Flag is <code>0</code> or <code>false</code> the user account will be active.',
     'ldap_emp_num'              => 'Broj zaposlenika LDAP-a',
     'ldap_email'                => 'LDAP e-pošta',
     'ldap_test'                 => 'Test LDAP',
     'ldap_test_sync'            => 'Test LDAP Synchronization',
     'license'                   => 'Licenca za softver',
-    'load_remote'               => 'Use Gravatar',
-    'load_remote_help_text'		=> 'Uncheck this box if your install cannot load scripts from the outside internet. This will prevent Snipe-IT from trying load images from Gravatar.',
+    'load_remote'               => 'Load Remote Avatars',
+    'load_remote_help_text'		=> 'Uncheck this box if your install cannot load scripts from the outside internet. This will prevent Snipe-IT from trying load avatars from Gravatar or other outside sources.',
     'login'                     => 'Login Attempts',
     'login_attempt'             => 'Login Attempt',
     'login_ip'                  => 'IP Address',
@@ -131,6 +136,7 @@ return [
     'login_user_agent'          => 'User Agent',
     'login_help'                => 'List of attempted logins',
     'login_note'                => 'Prijava bilješke',
+    'login_note_placeholder'            => "If you do not have a login or have found a device belonging to this company, please call technical support at 888-555-1212. Thank you.",
     'login_note_help'           => 'Po želji možete uključiti nekoliko rečenica na zaslonu za prijavu, na primjer, kako biste pomogli osobama koje su pronašle izgubljeni ili ukradeni uređaj. Ovo polje prihvaća <a href="https://help.github.com/articles/github-flavored-markdown/">Gordinu s okusom s okusom</a>',
     'login_remote_user_text'    => 'Mogućnosti udaljene prijave korisnika',
     'login_remote_user_enabled_text' => 'Omogući prijavu sa zaglavljem daljinskog korisnika',
@@ -146,13 +152,16 @@ return [
     'logo_print_assets_help'    => 'Prikaži elemente brandiranja na ispisima liste imovine ',
     'full_multiple_companies_support_help_text' => 'Ograničavanje korisnika (uključujući administratore) koje tvrtke dodjeljuju imovini tvrtke.',
     'full_multiple_companies_support_text' => 'Potpuna podrška za više tvrtki',
+    'scope_locations_fmcs_support_text'  => 'Scope Locations with Full Multiple Companies Support',
+    'scope_locations_fmcs_support_help_text'  => 'Restrict locations to their selected company.',
+    'scope_locations_fmcs_check_button' => 'Check Compatibility',
+    'scope_locations_fmcs_support_disabled_text'  => 'This option is disabled because you have conflicting locations set for :count or more items.',
     'show_in_model_list'   => 'Prikaži u padajućim modelima',
     'optional'					=> 'neobavezan',
     'per_page'                  => 'Rezultati po stranici',
     'php'                       => 'PHP verzija',
-    'php_info'                  => 'PHP Info',
+    'php_info'                  => 'PHP info',
     'php_overview'              => 'PHP',
-    'php_overview_keywords'     => 'phpinfo, system, info',
     'php_overview_help'         => 'PHP System info',
     'php_gd_info'               => 'Morate instalirati php-gd da biste prikazali QR kodove, pogledajte instalacijske upute.',
     'php_gd_warning'            => 'PHP Image Processing i GD dodatak NIJE instalirani.',
@@ -218,6 +227,8 @@ return [
     'webhook_integration_help'    => ':app integration is optional, however the endpoint and channel are required if you wish to use it. To configure :app integration, you must first <a href=":webhook_link" target="_new" rel="noopener">create an incoming webhook</a> on your :app account. Click on the <strong>Test :app Integration</strong> button to confirm your settings are correct before saving. ',
     'webhook_integration_help_button'    => 'Once you have saved your :app information, a test button will appear.',
     'webhook_test_help'           => 'Test whether your :app integration is configured correctly. YOU MUST SAVE YOUR UPDATED :app SETTINGS FIRST.',
+    'shortcuts_enabled'         => 'Enable Shortcuts',
+    'shortcuts_help_text'       => '<strong>Windows</strong>: Alt + Access key, <strong>Mac</strong>: Control + Option + Access key',
     'snipe_version'  			=> 'Snipe-IT verzija',
     'support_footer'            => 'Podrška poveznica u podnožju ',
     'support_footer_help'       => 'Navedite tko vidi poveznice na informacije o Snipe-IT podršci i korisničkom priručniku',
@@ -227,7 +238,6 @@ return [
     'update'                    => 'Ažuriraj postavke',
     'value'                     => 'Vrijednost',
     'brand'                     => 'branding',
-    'brand_keywords'            => 'footer, logo, print, theme, skin, header, colors, color, css',
     'brand_help'                => 'Logo, Site Name',
     'web_brand'                 => 'Web Branding Type',
     'about_settings_title'      => 'O postavkama',
@@ -276,6 +286,8 @@ return [
     'two_factor_enrollment_text'	=> "Potrebna je autentikacija dva faktora, međutim vaš uređaj još nije upisan. Otvorite aplikaciju Google autentifikator i skenirajte QR kôd u nastavku da biste registrirali svoj uređaj. Nakon što upišete uređaj, unesite kôd u nastavku",
     'require_accept_signature'      => 'Potražite potpis',
     'require_accept_signature_help_text'      => 'Ako omogućite tu značajku, korisnici će se morati fizički odjaviti pri prihvaćanju imovine.',
+    'require_checkinout_notes'  => 'Require Notes on Checkin/Checkout',
+    'require_checkinout_notes_help_text'    => 'Enabling this feature will require the note fields to be populated when checking in or checking out an asset.',
     'left'        => 'lijevo',
     'right'        => 'pravo',
     'top'        => 'vrh',
@@ -313,24 +325,24 @@ return [
     'filter_by_keyword' => 'Filter by setting keyword',
     'security' => 'Security',
     'security_title' => 'Update Security Settings',
-    'security_keywords' => 'password, passwords, requirements, two factor, two-factor, common passwords, remote login, logout, authentication',
     'security_help' => 'Two-factor, Password Restrictions',
-    'groups_keywords' => 'permissions, permission groups, authorization',
     'groups_help' => 'Account permission groups',
     'localization' => 'Localization',
     'localization_title' => 'Update Localization Settings',
-    'localization_keywords' => 'localization, currency, local, locale, time zone, timezone, international, internatinalization, language, languages, translation',
     'localization_help' => 'Language, date display',
     'notifications' => 'Notifications',
     'notifications_help' => 'Email Alerts & Audit Settings',
     'asset_tags_help' => 'Incrementing and prefixes',
     'labels' => 'Labels',
     'labels_title' => 'Update Label Settings',
-    'labels_help' => 'Label sizes &amp; settings',
-    'purge_keywords' => 'permanently delete',
+    'labels_help' => 'Barcodes &amp; label settings',
     'purge_help' => 'Obrišite izbrisane zapise',
     'ldap_extension_warning' => 'It does not look like the LDAP extension is installed or enabled on this server. You can still save your settings, but you will need to enable the LDAP extension for PHP before LDAP syncing or login will work.',
     'ldap_ad' => 'LDAP/AD',
+    'ldap_test_label' => 'Test LDAP Sync',
+    'ldap_test_login' => ' Test LDAP Login',
+    'ldap_username_placeholder' => 'LDAP Username',
+    'ldap_password_placeholder' => 'LDAP Password',
     'employee_number' => 'Broj djelatnika',
     'create_admin_user' => 'Create a User ::',
     'create_admin_success' => 'Success! Your admin user has been added!',
@@ -342,6 +354,8 @@ return [
     'setup_migration_create_user' => 'Next: Create User',
     'ldap_settings_link' => 'LDAP Settings Page',
     'slack_test' => 'Test <i class="fab fa-slack"></i> Integration',
+    'status_label_name' => 'Status Label Name',
+    'super_admin_only'  => 'Super Admin Only',
     'label2_enable'           => 'New Label Engine',
     'label2_enable_help'      => 'Switch to the new label engine. <b>Note: You will need to save this setting before setting others.</b>',
     'label2_template'         => 'Template',
@@ -356,12 +370,15 @@ return [
     'label2_2d_type'          => 'Vrsta 2D barkod',
     'label2_2d_type_help'     => 'Format for 2D barcodes',
     'label2_2d_target'        => '2D Barcode Target',
-    'label2_2d_target_help'   => 'The URL the 2D barcode points to when scanned',
+    'label2_2d_target_help'   => 'The data that will be contained in the 2D barcode',
     'label2_fields'           => 'Field Definitions',
     'label2_fields_help'      => 'Fields can be added, removed, and reordered in the left column. For each field, multiple options for Label and DataSource can be added, removed, and reordered in the right column.',
+    'purge_barcodes' => 'Purge Barcodes',
     'help_asterisk_bold'    => 'Text entered as <code>**text**</code> will be displayed as bold',
     'help_blank_to_use'     => 'Leave blank to use the value from <code>:setting_name</code>',
     'help_default_will_use' => '<code>:default</code> will use the value from <code>:setting_name</code>. <br>Note that the value of the barcodes must comply with the respective barcode spec in order to be successfully generated. Please see <a href="https://snipe-it.readme.io/docs/barcodes">the documentation <i class="fa fa-external-link"></i></a> for more details. ',
+    'asset_id'              => 'Asset ID',
+    'data'               => 'Data',
     'default'               => 'Default',
     'none'                  => 'None',
     'google_callback_help' => 'This should be entered as the callback URL in your Google OAuth app settings in your organization&apos;s <strong><a href="https://console.cloud.google.com/" target="_blank">Google developer console <i class="fa fa-external-link" aria-hidden="true"></i></a></strong>.',
@@ -373,7 +390,100 @@ return [
     'database_driver' => 'Database Driver',
     'bs_table_storage' => 'Table Storage',
     'timezone' => 'Timezone',
+    'test_mail' => 'Test Mail',
     'profile_edit'          => 'Edit Profile',
     'profile_edit_help'          => 'Allow users to edit their own profiles.',
+    'default_avatar' => 'Custom Default Avatar',
+    'default_avatar_help' => 'This image will be displayed as a profile if a user does not have a profile photo.',
+    'restore_default_avatar' => 'Restore <a href=":default_avatar" data-toggle="lightbox" data-type="image">original system default avatar</a>',
+    'restore_default_avatar_help' => '',
+    'due_checkin_days' => 'Due For Checkin Warning',
+    'due_checkin_days_help' => 'How many days before the expected checkin of an asset should it be listed in the "Due for checkin" page?',
+    'no_groups' => 'No groups have been created yet. Visit <code>Admin Settings > Permission Groups</code> to add one.',
+    'text' => 'Text',
+
+    'username_formats' => [
+        'username_format'		=> 'Format korisničkog imena',
+        'firstname_lastname_format'	=> 'Prezime prezime (jane.smith)',
+        'first_name_format'	        => 'First Name (jane)',
+        'last_name_format'		=> 'Last Name (doe)',
+        'filastname_format'			=> 'First Initial Last Name (jsmith)',
+        'lastnamefirstinitial_format' =>  'Last Name First Initial (smithj)',
+        'firstname_lastname_underscore_format' => 'First Name Last Name (jane_smith)',
+        'firstinitial.lastname' => 'First Initial Last Name (j.smith)',
+        'lastname_firstinitial' => 'Last Name First Initial (smith_j)',
+        'lastname_dot_firstinitial_format' => 'Last Name First Initial (smith.j)',
+        'firstnamelastname'     => 'First Name Last Name (janesmith)',
+        'firstnamelastinitial'  => 'First Name Last Initial (janes)',
+        'lastnamefirstname'      => 'Last Name.First Name (smith.jane)',
+    ],
+
+    'email_formats' => [
+        'email_format'			=> 'Format e-pošte',
+        'firstname_lastname_format'	=> 'Prezime prezime (jane.smith@example.com)',
+        'first_name_format'		=> 'Ime (jane@example.com)',
+        'last_name_format'		=> 'Last Name (doe@example.com)',
+        'filastname_format'			=> 'Prvo početno prezime (jsmith@example.com)',
+        'lastnamefirstinitial_format' =>  'Prezime Prvo slovo imena (smithj@example.com)',
+        'firstname_lastname_underscore_format' => 'Ime Prezime (jane_smith@example.com)',
+        'firstinitial.lastname' => 'Inicijal imena i prezime (i.ivic)',
+        'lastname_firstinitial' => 'Last Name First Initial (smith_j@example.com)',
+        'lastname_dot_firstinitial_format' => 'Last Name First Initial (smith.j@example.com)',
+        'firstnamelastname'     => 'First Name Last Name (janesmith@example.com)',
+        'firstnamelastinitial'  => 'First Name Last Initial (janes@example.com)',
+        'lastnamefirstname'      => 'Last Name.First Name (smith.jane@example.com)',
+    ],
+
+
+
+    'logo_labels' => [
+        'acceptance_pdf_logo'       => 'PDF Logo',
+        'email_logo'                => 'Email Logo',
+        'label_logo'                => 'Label Logo',
+        'logo'                      => 'Site Logo',
+        'favicon'                   => 'Favicon',
+    ],
+
+    'logo_help' => [
+        'email_logo_size'       => 'Square logos in email look best. ',
+    ],
+
+    'logo_option_types' => [
+        'text' => 'Text',
+        'logo' => 'Logo',
+        'logo_and_text' => 'Logo and Text',
+    ],
+
+
+    'legends' => [
+        'scoping' => 'Scoping',
+        'formats' => 'Default Formats',
+        'profiles' => 'User Profiles',
+        'eula' => 'EULA & Acceptance Preferences',
+        'misc_display' => 'Miscellaneous Display Options',
+        'email' => 'Email Preferences',
+        'checkin' => 'Checkin Preferences',
+        'dashboard' => 'Login & Dashboard Preferences',
+        'misc' => 'Miscellaneous',
+        'logos' => 'Logos & Display',
+        'colors' => 'Colors & Skins',
+        'footer' => 'Footer Preferences',
+        'security' => 'Security Preferences',
+        'general' => 'General',
+        'intervals' => 'Intervals & Thresholds',
+    ],
+
+
+    /* Keywords for settings overview help */
+    'keywords' => [
+        'brand'             => 'footer, logo, print, theme, skin, header, colors, color, css',
+        'general_settings'  => 'company support, signature, acceptance, email format, username format, images, per page, thumbnail, eula, gravatar, tos, dashboard, privacy',
+        'groups'            => 'permissions, permission groups, authorization',
+        'labels'            => 'labels, barcodes, barcode, sheets, print, upc, qr, 1d, 2d',
+        'localization'      => 'localization, currency, local, locale, time zone, timezone, international, internatinalization, language, languages, translation',
+        'php_overview'      => 'phpinfo, system, info',
+        'purge'             => 'permanently delete',
+        'security'          => 'password, passwords, requirements, two factor, two-factor, common passwords, remote login, logout, authentication',
+    ],
 
 ];
diff --git a/resources/lang/hr-HR/admin/settings/message.php b/resources/lang/hr-HR/admin/settings/message.php
index 1ed0dba213..493c633426 100644
--- a/resources/lang/hr-HR/admin/settings/message.php
+++ b/resources/lang/hr-HR/admin/settings/message.php
@@ -14,6 +14,9 @@ return [
         'restore_warning'       => 'Yes, restore it. I acknowledge that this will overwrite any existing data currently in the database. This will also log out all of your existing users (including you).',
         'restore_confirm'       => 'Are you sure you wish to restore your database from :filename?'
     ],
+    'restore' => [
+        'success'               => 'Your system backup has been restored. Please log in again.'
+    ],
     'purge' => [
         'error'     => 'Došlo je do pogreške prilikom čišćenja.',
         'validation_failed'     => 'Vaša potvrda o čišćenju nije točna. Upišite riječ "DELETE" u okvir potvrde.',
@@ -21,7 +24,7 @@ return [
     ],
     'mail' => [
         'sending' => 'Sending Test Email...',
-        'success' => 'Mail sent!',
+        'success' => 'E-mail poslan!',
         'error' => 'Mail could not be sent.',
         'additional' => 'No additional error message provided. Check your mail settings and your app log.'
     ],
@@ -33,6 +36,9 @@ return [
         'testing_authentication' => 'Testing LDAP Authentication...',
         'authentication_success' => 'User authenticated against LDAP successfully!'
     ],
+    'labels' => [
+        'null_template' => 'Label template not found. Please select a template.',
+        ],
     'webhook' => [
         'sending' => 'Sending :app test message...',
         'success' => 'Your :webhook_name Integration works!',
@@ -42,5 +48,12 @@ return [
         'error' => 'Something went wrong. :app responded with: :error_message',
         'error_redirect' => 'ERROR: 301/302 :endpoint returns a redirect. For security reasons, we don’t follow redirects. Please use the actual endpoint.',
         'error_misc' => 'Something went wrong. :( ',
-    ]
+        'webhook_fail' => ' webhook notification failed: Check to make sure the URL is still valid.',
+        'webhook_channel_not_found' => ' webhook channel not found.',
+        'ms_teams_deprecation' => 'The selected Microsoft Teams webhook URL will be deprecated Dec 31st, 2025. Please use a workflow URL. Microsoft\'s documentation on creating a workflow can be found <a href="https://support.microsoft.com/en-us/office/create-incoming-webhooks-with-workflows-for-microsoft-teams-8ae491c7-0394-4861-ba59-055e33f75498" target="_blank"> here.</a>',
+    ],
+    'location_scoping' => [
+        'not_saved' => 'Your settings were not saved.',
+        'mismatch' => 'There is 1 item in the database that need your attention before you can enable location scoping.|There are :count items in the database that need your attention before you can enable location scoping.',
+    ],
 ];
diff --git a/resources/lang/hr-HR/admin/statuslabels/table.php b/resources/lang/hr-HR/admin/statuslabels/table.php
index 57d2f34fd8..597cccebe2 100644
--- a/resources/lang/hr-HR/admin/statuslabels/table.php
+++ b/resources/lang/hr-HR/admin/statuslabels/table.php
@@ -1,14 +1,14 @@
 <?php
 
 return array(
-    'about'      	=> 'O oznakama statusa',
+    'about'      	=> 'About Status Types',
     'archived'      	=> 'Arhivirano',
     'create'      	=> 'Stvaranje oznake statusa',
     'color'      	=> 'Boja grafikona',
     'default_label' => 'Zadana oznaka',
     'default_label_help' => 'Ovo se koristi za osiguravanje da se najčešće korištene oznake statusa pojavljuju pri vrhu okvira za odabir prilikom stvaranja/uređivanja imovine.',
     'deployable'      	=> 'razmjestiti',
-    'info'      	=> 'Oznake statusa upotrebljavaju se za opisivanje različitih država koje vaša imovina može biti. Oni mogu biti izvan za popravak, izgubljen / ukraden, itd. Možete stvoriti nove oznake statusa za raspoložive, čekajuće i arhivirane imovine.',
+    'info'      	=> 'Status label types are used to describe the various states your assets could be in. They may be out for repair, lost/stolen, etc. You can create new status labels for your deployable, pending and archived assets according to your own workflow. For more information, <a href="https://snipe-it.readme.io/docs/overview#status-labels" target="_blank">see the documentation <i class="fa fa-external-link"></i></a>.',
     'name'      	=> 'Naziv statusa',
     'pending'      	=> 'U tijeku',
     'status_type'   => 'Vrsta statusa',
diff --git a/resources/lang/hr-HR/admin/users/general.php b/resources/lang/hr-HR/admin/users/general.php
index 768af7ea09..3f69ccf1cb 100644
--- a/resources/lang/hr-HR/admin/users/general.php
+++ b/resources/lang/hr-HR/admin/users/general.php
@@ -19,6 +19,8 @@ return [
     'print_assigned'    => 'Ispiši sve dodijeljeno',
     'email_assigned'    => 'Email List of All Assigned',
     'user_notified'     => 'User has been emailed a list of their currently assigned items.',
+    'users_notified'    => 'The user has been emailed a list of their currently assigned items.|:count users have been emailed a list of their currently assigned items.',
+    'users_notified_warning' => ':count user has been emailed a list of their currently assigned items, however :no_email users did not have an email address so could not be emailed.|:count users have been emailed a list of their currently assigned items, however :no_email user(s) did not have an email address so could not be emailed.',
     'auto_assign_label' => 'Include this user when auto-assigning eligible licenses',
     'auto_assign_help'  => 'Skip this user in auto assignment of licenses',
     'software_user'     => 'Softver je provjeren na: ime',
@@ -42,9 +44,9 @@ return [
     'remote'   => 'Remote',
     'remote_help' => 'This can be useful if you need to filter by remote users who never or rarely come into your physical locations.',
     'not_remote_label' => 'This is not a remote user',
-    'vip_label' => 'VIP user',
+    'vip_label' => 'VIP korisnik',
     'vip_help' => 'This can be helpful to mark important people in your org if you would like to handle them in special ways.',
-    'create_user' => 'Create a user',
+    'create_user' => 'Kreiraj korisnika',
     'create_user_page_explanation' => 'This is the account information you will use to access the site for the first time.',
     'email_credentials' => 'Email credentials',
     'email_credentials_text' => 'Email my credentials to the email address above',
diff --git a/resources/lang/hr-HR/admin/users/message.php b/resources/lang/hr-HR/admin/users/message.php
index c4d33a4a07..33cc363e55 100644
--- a/resources/lang/hr-HR/admin/users/message.php
+++ b/resources/lang/hr-HR/admin/users/message.php
@@ -6,7 +6,7 @@ return array(
     'declined'                  => 'Uspješno ste odbili ovaj materijal.',
     'bulk_manager_warn'	        => 'Vaši su korisnici uspješno ažurirani, ali vaš unos upravitelja nije spremljen jer je upravitelj koji ste odabrali također bio na popisu korisnika koji se uređuje, a korisnici možda nisu vlastiti upravitelj. Ponovno odaberite svoje korisnike, isključujući upravitelja.',
     'user_exists'               => 'Korisnik već postoji!',
-    'user_not_found'            => 'Korisnik ne postoji.',
+    'user_not_found'            => 'User does not exist or you do not have permission view them.',
     'user_login_required'       => 'Potrebno je polje za prijavu',
     'user_has_no_assets_assigned' => 'Niti jedno sredstvo trenutno nije dodjeljeno korisniku.',
     'user_password_required'    => 'Zaporka je potrebna.',
@@ -53,6 +53,7 @@ return array(
         'ldap_could_not_search' => 'Nije moguće pretražiti LDAP poslužitelj. Provjerite konfiguraciju LDAP poslužitelja u LDAP konfiguracijskoj datoteci. <br>Preku s LDAP poslužitelja:',
         'ldap_could_not_get_entries' => 'Nije bilo moguće dobiti unose s LDAP poslužitelja. Provjerite konfiguraciju LDAP poslužitelja u LDAP konfiguracijskoj datoteci. <br>Preku s LDAP poslužitelja:',
         'password_ldap' => 'Lozinku za ovaj račun upravlja LDAP / Active Directory. Obratite se IT odjelu za promjenu zaporke.',
+        'multi_company_items_assigned' => 'This user has items assigned that belong to a different company. Please check them in or edit their company.'
     ),
 
     'deletefile' => array(
diff --git a/resources/lang/hr-HR/admin/users/table.php b/resources/lang/hr-HR/admin/users/table.php
index 227bdafb45..730a117fcb 100644
--- a/resources/lang/hr-HR/admin/users/table.php
+++ b/resources/lang/hr-HR/admin/users/table.php
@@ -22,7 +22,7 @@ return array(
     'managed_locations'     => 'Upravljane lokacije',
     'managed_users'         => 'Managed Users',
     'name' 					=> 'Ime',
-    'nogroup'               => 'Niti jedna grupa još nije kreirana. Da biste dodali grupu, posjetite: ',
+    'nogroup'               => 'Niti jedna grupa još nije kreirana. Da biste dodali grupu, posjetite:',
     'notes'                 => 'Bilješke',
     'password_confirm' 		=> 'Potvrdi lozinku',
     'password' 				=> 'Lozinka',
diff --git a/resources/lang/hr-HR/auth.php b/resources/lang/hr-HR/auth.php
index 9a6752e139..a3be423bee 100644
--- a/resources/lang/hr-HR/auth.php
+++ b/resources/lang/hr-HR/auth.php
@@ -15,6 +15,6 @@ return array(
 
     'failed' => 'Vjerodajnice ne odgovaraju.',
     'password' => 'Upisana lozinka je pogrešna.',
-    'throttle' => 'Previše neuspješnih pokušaja prijave. Pokušajte ponovno za :sekunda sekunda.',
+    'throttle' => 'Too many login attempts. Please try again in :minutes minute(s).',
 
 );
diff --git a/resources/lang/hr-HR/auth/message.php b/resources/lang/hr-HR/auth/message.php
index 0844ce1bdd..77f8186a6c 100644
--- a/resources/lang/hr-HR/auth/message.php
+++ b/resources/lang/hr-HR/auth/message.php
@@ -6,8 +6,6 @@ return array(
     'account_not_found'      => 'Korisničko ime ili zaporka nisu točni.',
     'account_not_activated'  => 'Ovaj korisnički račun nije aktiviran.',
     'account_suspended'      => 'Ovaj je korisnički račun obustavljen.',
-    'account_banned'         => 'Ovaj je korisnički račun zabranjen.',
-    'throttle'               => 'Too many failed login attempts. Please try again in :minutes minutes.',
 
     'two_factor' => array(
         'already_enrolled'      => 'Your device is already enrolled.',
diff --git a/resources/lang/hr-HR/button.php b/resources/lang/hr-HR/button.php
index cc44b0fb9f..521bedbaac 100644
--- a/resources/lang/hr-HR/button.php
+++ b/resources/lang/hr-HR/button.php
@@ -7,6 +7,7 @@ return [
     'checkin_and_delete'  	    => 'Dodijeli sve / Izbriši korisnika',
     'delete'  	                => 'Izbrisati',
     'edit'    	                => 'Uredi',
+    'clone'    	                => 'Clone',
     'restore' 	                => 'Vratiti',
     'remove'                    => 'Izbriši',
     'request'                   => 'Zahtjev',
@@ -21,4 +22,13 @@ return [
     'add_maintenance'           => 'Dodati održavanje',
     'append'                    => 'Prikačiti',
     'new'                       => 'Novi',
+    'var' => [
+        'clone'     => 'Clone :item_type',
+        'edit'      => 'Edit :item_type',
+        'delete'    => 'Delete :item_type',
+        'restore'   => 'Restore :item_type',
+        'create'    => 'Create New :item_type',
+        'checkout'  => 'Checkout :item_type',
+        'checkin'   => 'Checkin :item_type',
+    ]
 ];
diff --git a/resources/lang/hr-HR/general.php b/resources/lang/hr-HR/general.php
index 4a38f557ca..f5ec22c3a1 100644
--- a/resources/lang/hr-HR/general.php
+++ b/resources/lang/hr-HR/general.php
@@ -10,7 +10,7 @@ return [
     'action'                => 'Akcijski',
     'activity_report'		=> 'Izvješće o aktivnostima',
     'address'				=> 'Adresa',
-    'admin'					=> 'Admin',
+    'admin'					=> 'Admin Settings',
     'admin_tooltip'			=> 'This user has admin privileges',
     'superuser'				=> 'Superuser',
     'superuser_tooltip'		=> 'This user has superuser privileges',
@@ -23,13 +23,16 @@ return [
     'asset_models'			=> 'Modeli imovine',
     'asset_model'			=> 'Model',
     'asset'					=> 'Imovina',
+    'asset_previous'        => 'Asset (Previously Assigned)',
     'asset_report'          => 'Izvješće o aktivi',
     'asset_tag'				=> 'Oznaka imovine',
     'asset_tags'            => 'Oznaka imovine',
     'assets_available'		=> 'Dostupna imovina',
     'accept_assets'         => 'Accept Assets :name',
     'accept_assets_menu'    => 'Accept Assets',
+    'accept_item'           => 'Accept Item',
     'audit'				    => 'Revizija',
+    'audits'				=> 'Audits',
     'audit_report'			=> 'Zapisnik revizije',
     'assets'				=> 'Imovina',
     'assets_audited'        => 'assets audited',
@@ -61,9 +64,12 @@ return [
     'changepassword'  		=> 'Promijeni zaporku',
     'checkin'  				=> 'Checkin',
     'checkin_from'  		=> 'Prijavite se od tvrtke',
+    'checkin_note'  		=> 'Checkin Note',
+    'checkout_note'  		=> 'Checkout Note',
     'checkout'  			=> 'Provjeri',
     'checkouts_count'       => 'Odjave',
     'checkins_count'        => 'Prijave',
+    'checkin_and_delete'  	=> 'Checkin and Delete',
     'user_requests_count'   => 'Zahtjevi',
     'city'  				=> 'Grad',
     'click_here'			=> 'Kliknite ovdje',
@@ -77,7 +83,7 @@ return [
     'consumables'			=> 'Potrošni',
     'country'  				=> 'Zemlja',
     'could_not_restore'     => 'Greška u obnavljanju :item_type: :error',
-    'not_deleted'           => ':item_type nije brisan pa ne može biti ni vraćen',
+    'not_deleted'           => 'The :item_type was not deleted and therefore cannot be restored',
     'create'				=> 'Izradi novu',
     'created'               => 'Stavka je stvorena',
     'created_asset'			=> 'stvorio imovinu',
@@ -86,11 +92,13 @@ return [
     'record_created' 		=> 'Zapis izrađen',
     'updated_at' 			=> 'Ažurirano u',
     'currency'  			=> '$', // this is deprecated
+    'currency_text'  		=> 'Currency', //
     'current'  				=> 'struja',
     'current_password'      => 'Postojeća lozinka',
     'customize_report'      => 'Prilagodi izvještaj',
     'custom_report'         => 'Prilagođeno izvješće o aktivi',
     'dashboard'				=> 'kontrolna ploča',
+    'data_source'           => 'Data Source',
     'days'      			=> 'dana',
     'days_to_next_audit'    => 'Dani za sljedeću reviziju',
     'date'					=> 'Datum',
@@ -98,7 +106,7 @@ return [
     'debug_warning_text'    => 'Ova se aplikacija izvodi u načinu rada s omogućenim uklanjanjem pogrešaka. To može otkriti osjetljive podatke ako je aplikacija dostupna vanjskom svijetu. Onemogućite način otklanjanja pogrešaka postavljanjem vrijednosti <code>APP_DEBUG</code> u <code>.env</code> datoteci na <code>false</code>.',
     'delete'  				=> 'Izbrisati',
     'delete_confirm'  		=> 'Jeste li sigurni da želite izbrisati :item?',
-    'delete_confirm_no_undo' => 'Are you sure you wish to delete :item? This can not be undone.',
+    'delete_confirm_no_undo' => 'Are you sure, you wish to delete :item? This cannot be undone.',
     'deleted'  				=> 'izbrisana',
     'delete_seats'  		=> 'Izbrisana mjesta',
     'deletion_failed'       => 'Deletion failed',
@@ -114,29 +122,13 @@ return [
     'editprofile'  			=> 'Uredi svoj profil',
     'eol'					=> 'EOL',
     'email_domain'			=> 'Domena e-pošte',
-    'email_format'			=> 'Format e-pošte',
     'employee_number'       => 'Broj djelatnika',
     'email_domain_help'		=> 'Ovo se koristi za generiranje e-adresa prilikom uvoza',
     'error'				    => 'Greška',
     'exclude_archived'      => 'Isključi arhiviranu imovinu',
     'exclude_deleted'       => 'Isključi izbrisanu imovinu',
     'example'				=> 'Primjer: ',
-    'filastname_format'			=> 'Prvo početno prezime (jsmith@example.com)',
-    'firstname_lastname_format'	=> 'Prezime prezime (jane.smith@example.com)',
-    'firstname_lastname_underscore_format' => 'Ime Prezime (jane_smith@example.com)',
-    'lastnamefirstinitial_format' =>  'Prezime Prvo slovo imena (smithj@example.com)',
-    'firstintial_dot_lastname_format' => 'Inicijal imena i prezime (i.ivic)',
-    'firstname_lastname_display'	=> 'Ime prezime (Ivana Ivić)',
-    'lastname_firstname_display'	=> 'Prezime ime (Ivić Ivana)',
-    'name_display_format'	=> 'Name Display Format',
-    'first'					=> 'Prvi',
-    'firstnamelastname'     => 'First Name Last Name (janesmith@example.com)',
-    'lastname_firstinitial' => 'Last Name First Initial (smith_j@example.com)',
-    'firstinitial.lastname' => 'Inicijal imena i prezime (i.ivic)',
-    'firstnamelastinitial'  => 'First Name Last Initial (janes@example.com)',
-    'lastnamefirstname'      => 'Last Name First Name (smith.jane@example.com)',
-    'first_name'			=> 'Ime',
-    'first_name_format'		=> 'Ime (jane@example.com)',
+
     'files'                 => 'Datoteke',
     'file_name'				=> 'Datoteka',
     'file_type'             => 'Tip datoteke',
@@ -156,9 +148,9 @@ return [
     'image_delete'         	=> 'Izbriši sliku',
     'include_deleted'       => 'Include Deleted Assets',
     'image_upload'         	=> 'Prenesite sliku',
-    'filetypes_accepted_help'    => 'Accepted filetype is :types. Max upload size allowed is :size.|Accepted filetypes are :types. Max upload size allowed is :size.',
-    'filetypes_size_help'   => 'Max upload size allowed is :size.',
-    'image_filetypes_help'  => 'Accepted filetypes are jpg, webp, png, gif, svg, and avif. Max upload size allowed is :size.',
+    'filetypes_accepted_help'    => 'Accepted filetype is :types. The maximum size allowed is :size.|Accepted filetypes are :types. The maximum upload size allowed is :size.',
+    'filetypes_size_help'   => 'The maximum upload size allowed is :size.',
+    'image_filetypes_help'  => 'Accepted Filetypes are jpg, webp, png, gif, svg, and avif. The maximum upload size allowed is :size.',
     'unaccepted_image_type'  => 'This image file was not readable. Accepted filetypes are jpg, webp, png, gif, and svg. The mimetype of this file is: :mimetype.',
     'import'         	    => 'Uvoz',
     'import_this_file'      => 'Map fields and process this file',
@@ -178,12 +170,17 @@ return [
     'last'					=> 'Posljednji',
     'last_login'            => 'Zadnja prijava',
     'last_name'             => 'Prezime',
+    'firstname_lastname_display'	=> 'Ime prezime (Ivana Ivić)',
+    'lastname_firstname_display'	=> 'Prezime ime (Ivić Ivana)',
+    'name_display_format'	=> 'Name Display Format',
+    'first'					=> 'Prvi',
+    'first_name'			=> 'Ime',
     'license'				=> 'licenca',
     'license_report'        => 'Izvješće o licenci',
     'licenses_available'	=> 'Licenses available',
     'licenses'				=> 'licence',
     'list_all'				=> 'Popis svih',
-    'loading'				=> 'Loading... please wait....',
+    'loading'				=> 'Loading... please wait...',
     'lock_passwords'        => 'This field value will not be saved in a demo installation.',
     'feature_disabled'      => 'Ova je značajka onemogućena za demo instalaciju.',
     'location'              => 'Mjesto',
@@ -193,7 +190,7 @@ return [
     'logout'				=> 'Odjaviti se',
     'lookup_by_tag'     => 'Pretraživanje pomoću oznake imovine',
     'maintenances'          => 'Održavanje',
-    'manage_api_keys'       => 'Manage API Keys',
+    'manage_api_keys'       => 'Manage API keys',
     'manufacturer'			=> 'Proizvođač',
     'manufacturers'			=> 'Proizvođači',
     'markdown'				=> 'Ovo polje dopušta <a href="https://help.github.com/articles/github-flavored-markdown/">gordi s okusom "Github "</a>.',
@@ -215,6 +212,14 @@ return [
     'no_results'			=> 'Nema rezultata.',
     'no'  					=> 'Ne',
     'notes'  				=> 'Bilješke',
+    'note_added'            => 'Note Added',
+    'options'				=> 'Options',
+    'preview'				=> 'Preview',
+    'add_note'              => 'Add Note',
+    'note_edited'            => 'Note Edited',
+    'edit_note'              => 'Edit Note',
+    'note_deleted'            => 'Note Deleted',
+    'delete_note'              => 'Delete Note',
     'order_number'          => 'Broj narudžbe',
     'only_deleted'          => 'Only Deleted Assets',
     'page_menu'				=> 'Prikazuje se _MENU_ stavki',
@@ -229,7 +234,7 @@ return [
     'purchase_date'         => 'Datum kupnje',
     'qty'		            => 'Kol',
     'quantity'		        => 'Količina',
-    'quantity_minimum'      => 'You have :count items below or almost below minimum quantity levels',
+    'quantity_minimum'      => 'You have one item below or almost below minimum quantity levels|You have :count items below or almost below minimum quantity levels',
     'quickscan_checkin'  	=> 'Quick Scan Checkin',
     'quickscan_checkin_status'  	=> 'Checkin Status',
     'ready_to_deploy'		=> 'Spremni za implementaciju',
@@ -254,7 +259,7 @@ return [
     'select_all'            => 'Select All',
     'search'				=> 'traži',
     'select_category'       => 'Izaberi kategoriju',
-    'select_datasource' => 'Select a Datasource',
+    'select_datasource' => 'Select a data source',
     'select_department'     => 'Odaberite Odjel',
     'select_depreciation'	=> 'Odaberite vrstu amortizacije',
     'select_location'		=> 'Odaberite lokaciju',
@@ -274,13 +279,15 @@ return [
     'signed_off_by'         => 'Signed Off By',
     'skin'       			=> 'Skin',
     'webhook_msg_note'        => 'A notification will be sent via webhook',
-    'webhook_test_msg'        => 'Oh hai! Looks like your :app integration with Snipe-IT is working!',
+    'webhook_test_msg'        => 'Oh hai! It looks like your :app integration with Snipe-IT is working!',
     'some_features_disabled' => 'DEMO MODE: Neke su značajke onemogućene za ovu instalaciju.',
     'site_name'				=> 'Ime stranice',
     'state'  				=> 'država',
     'status_labels'			=> 'Oznake statusa',
+    'status_label'			=> 'Status Label',
     'status'    			=> 'Status',
     'accept_eula'           => 'Acceptance Agreement',
+    'show_or_hide_eulas' => 'Show/Hide EULAs',
     'supplier'              => 'Dobavljač',
     'suppliers'  			=> 'Dobavljači',
     'sure_to_delete'        => 'Jeste li sigurni da želite izbrisati',
@@ -296,9 +303,9 @@ return [
     'type'  				=> 'Tip',
     'undeployable'			=> 'Un-razmjestiti',
     'unknown_admin'			=> 'Nepoznati administrator',
-    'username_format'		=> 'Format korisničkog imena',
     'username'              => 'Korisničko ime',
     'update'                => 'Ažuriraj',
+    'updating_item' => 'Updating :item',
     'upload_filetypes_help'      => 'Allowed filetypes are png, gif, jpg, jpeg, doc, docx, pdf, xls, xlsx, txt, lic, xml, zip, rtf and rar. Max upload size allowed is :size.',
     'uploaded'              => 'Uploaded',
     'user'					=> 'Korisnik',
@@ -323,10 +330,10 @@ return [
     'token_expired'         => 'Sesija za obrazac istekla je. Molim te pokušaj ponovno.',
     'login_enabled'         => 'Login Enabled',
     'audit_due'             => 'Due for Audit',
-    'audit_due_days'        => 'Assets Due for Audit Within :days Day|Assets Due for Audit Within :days Days',
+    'audit_due_days'        => '{}Assets Due or Overdue for Audit|[1]Assets Due or Overdue for Audit Within a Day|[2,*]Assets Due or Overdue for Audit Within :days Days',
     'checkin_due'           => 'Due for Checkin',
     'checkin_overdue'       => 'Overdue for Checkin',
-    'checkin_due_days'      => 'Assets Due for Checkin Within :days Day|Assets Due for Checkin Within :days Days',
+    'checkin_due_days'      => '{}Due for Checkin|[1]Assets Due for Checkin Within :days Day|[2,*]Assets Due for Checkin Within :days Days',
     'audit_overdue'         => 'Overdue for Audit',
     'accept'                => 'Accept :asset',
     'i_accept'              => 'Prihvaćam',
@@ -339,16 +346,16 @@ return [
     'view_all'              => 'view all',
     'hide_deleted'          => 'Hide Deleted',
     'email'                 => 'E-mail',
-    'do_not_change'         => 'Do Not Change',
-    'bug_report'            => 'Report a Bug',
+    'do_not_change'         => 'Do not change',
+    'bug_report'            => 'Report a bug',
     'user_manual'           => 'User\'s Manual',
     'setup_step_1'          => 'Step 1',
     'setup_step_2'          => 'Step 2',
     'setup_step_3'          => 'Step 3',
     'setup_step_4'          => 'Step 4',
     'setup_config_check'    => 'Configuration Check',
-    'setup_create_database' => 'Create Database Tables',
-    'setup_create_admin'    => 'Create Admin User',
+    'setup_create_database' => 'Create database tables',
+    'setup_create_admin'    => 'Create an admin user',
     'setup_done'            => 'Finished!',
     'bulk_edit_about_to'    => 'You are about to edit the following: ',
     'checked_out'           => 'Odjavio',
@@ -383,6 +390,8 @@ return [
     'new_license'           => 'New License',
     'new_accessory'         => 'New Accessory',
     'new_consumable'        => 'New Consumable',
+    'new_component'         => 'New Component',
+    'new_user'              => 'New User',
     'collapse'              => 'Collapse',
     'assigned'              => 'Assigned',
     'asset_count'           => 'Asset Count',
@@ -418,19 +427,20 @@ return [
     'bulk_soft_delete'      =>'Also soft-delete these users. Their asset history will remain intact unless/until you purge deleted records in the Admin Settings.',
     'bulk_checkin_delete_success' => 'Your selected users have been deleted and their items have been checked in.',
     'bulk_checkin_success' => 'The items for the selected users have been checked in.',
-    'set_to_null'           => 'Delete values for this asset|Delete values for all :asset_count assets ',
+    'set_to_null'           => 'Delete values for this selection|Delete values for all :selection_count selections ',
     'set_users_field_to_null'  => 'Delete :field values for this user|Delete :field values for all :user_count users ',
     'na_no_purchase_date'   => 'N/A - No purchase date provided',
     'assets_by_status'      => 'Assets by Status',
     'assets_by_status_type'      => 'Assets by Status Type',
     'pie_chart_type'        => 'Dashboard Pie Chart Type',
     'hello_name'            => 'Hello, :name!',
-    'unaccepted_profile_warning'   => 'You have :count items requiring acceptance. Click here to accept or decline them',
+    'unaccepted_profile_warning'   => 'You have one item requiring acceptance. Click here to accept or decline it | You have :count items requiring acceptance. Click here to accept or decline them',
     'start_date'            => 'Start Date',
     'end_date'            => 'End Date',
     'alt_uploaded_image_thumbnail' => 'Uploaded thumbnail',
     'placeholder_kit'       => 'Select a kit',
     'file_not_found'        => 'File not found',
+    'log_record_not_found'  => 'No record for that log entry was found.',
     'preview_not_available' => '(no preview)',
     'setup'                 => 'Setup',
     'pre_flight'            => 'Pre-Flight',
@@ -512,7 +522,7 @@ return [
     'checked_out_to_fields' => 'Checked Out To Fields',
     'percent_complete' => '% potpun',
     'uploading' => 'Uploading... ',
-    'upload_error' => 'Error uploading file. Please check that there are no empty rows and that no column names are duplicated.',
+    'upload_error' => 'Error uploading file. Please check that you have no empty rows or duplicated column names in your CSV, and that the server permissions allow uploads.',
     'copy_to_clipboard' => 'Copy to Clipboard',
     'copied' => 'Copied!',
     'status_compatibility' => 'If assets are already assigned, they cannot be changed to a non-deployable status type and this value change will be skipped.',
@@ -549,6 +559,71 @@ return [
         'license_seats'  => ':count License Seat|:count License Seats',
         'consumables'  => ':count Consumable|:count Consumables',
         'components'  => ':count Component|:count Components',
-    ]
+    ],
+
+    'more_info' => 'Više informacija',
+    'quickscan_bulk_help' => 'Checking this box will edit the asset record to reflect this new location. Leaving it unchecked will simply note the location in the audit log. Note that if this asset is checked out, it will not change the location of the person, asset or location it is checked out to.',
+    'whoops' => 'Whoops!',
+    'something_went_wrong' => 'Something went wrong with your request.',
+    'close' => 'Close',
+    'expires' => 'istječe',
+    'map_fields'=> 'Map :item_type Fields',
+    'remaining_var' => ':count Remaining',
+    'label' => 'Label',
+    'import_asset_tag_exists' => 'An asset with the asset tag :asset_tag already exists and an update was not requested. No change was made.',
+    'countries_manually_entered_help' => 'Values with an asterisk (*) were manually entered and do not match existing ISO 3166 dropdown values',
+    'accessories_assigned' => 'Assigned Accessories',
+    'user_managed_passwords' => 'Password Management',
+    'user_managed_passwords_disallow' => 'Disallow users from managing their own passwords',
+    'user_managed_passwords_allow' => 'Allow users to manage their own passwords',
+    'from' => 'From',
+    'by' => 'Po',
+
+// Add form placeholders here
+    'placeholders' => [
+        'notes'  => 'Add a note',
+    ],
+
+    'breadcrumb_button_actions' => [
+        'edit_item' => 'Edit :name',
+        'checkout_item' => 'Checkout :name',
+        'checkin_item' => 'Checkin :name',
+    ],
+
+    'skins' => [
+        'site_default' => 'Site Default',
+        'default_blue' => 'Default Blue',
+        'blue_dark' => 'Blue (Dark Mode)',
+        'green' => 'Green Dark',
+        'green_dark' => 'Green (Dark Mode)',
+        'red' => 'Red Dark',
+        'red_dark' => 'Red (Dark Mode)',
+        'orange' => 'Orange Dark',
+        'orange_dark' => 'Orange (Dark Mode)',
+        'black' => 'Black',
+        'black_dark' => 'Black (Dark Mode)',
+        'purple' => 'Purple',
+        'purple_dark' => 'Purple (Dark Mode)',
+        'yellow' => 'Yellow',
+        'yellow_dark' => 'Yellow (Dark Mode)',
+        'high_contrast' => 'High Contrast',
+
+    ],
+
+    'select_all_none' => 'Select/Unselect All',
+    'generic_model_not_found' => 'That :model was not found or you do not have permission to access it',
+    'deleted_models' => 'Deleted Asset Models',
+    'deleted_users' => 'Deleted Users',
+    'cost_each' => ':amount each',
+    'remove_current_image' => 'Remove current :type image',
+
+    'seeding' => [
+        'manufacturers' => [
+            'button' => 'Create Manufacturers',
+            'prompt' => 'You do not have any manufacturers yet. Would you like to seed a list of common manufacturers? (THIS WILL OVERWRITE EXISTING MANUFACTURERS, including those that have been soft-deleted.)',
+            'success' => 'Manufacturers seeded successfully',
+            'error' => 'Could not seed manufacturers. A manufacturer record already exists and seeding would overwrite it.|Could not seed manufacturers. :count manufacturer records already exist and seeding would overwrite them.',
+        ],
+    ],
 
 ];
diff --git a/resources/lang/hr-HR/localizations.php b/resources/lang/hr-HR/localizations.php
index f1232dd138..827ed4fca1 100644
--- a/resources/lang/hr-HR/localizations.php
+++ b/resources/lang/hr-HR/localizations.php
@@ -2,7 +2,7 @@
 
 return [
 
-    'select_language' => 'Select a language',
+    'select_language' => 'Select a Language',
     'languages' => [
         'en-US'=> 'English, US',
         'en-GB'=> 'English, UK',
@@ -40,7 +40,9 @@ return [
         'ms-MY'=> 'Malay',
         'mi-NZ'=> 'Maori',
         'mn-MN'=> 'Mongolian',
-        'no-NO'=> 'Norwegian',
+        'nb-NO'=> 'Norwegian Bokmål',
+        'om-ET' => 'Oromo (Ethiopian)',
+        //'nn-NO'=> 'Norwegian Nynorsk',
         'fa-IR'=> 'Persian',
         'pl-PL'=> 'Polish',
         'pt-PT'=> 'Portuguese',
@@ -66,7 +68,7 @@ return [
         'zu-ZA'=> 'Zulu',
     ],
 
-    'select_country' => 'Select a country',
+    'select_country' => 'Select a Country',
     
     'countries' => [
         'AC'=>'Ascension Island',
@@ -133,6 +135,7 @@ return [
         'EC'=>'Ecuador',
         'EE'=>'Estonia',
         'EG'=>'Egypt',
+        'GB-ENG'=>'England',
         'ER'=>'Eritrea',
         'ES'=>'Spain',
         'ET'=>'Ethiopia',
@@ -231,6 +234,7 @@ return [
         'NG'=>'Nigeria',
         'NI'=>'Nicaragua',
         'NL'=>'Netherlands',
+        'GB-NIR' => 'Northern Ireland',
         'NO'=>'Norway',
         'NP'=>'Nepal',
         'NR'=>'Nauru',
@@ -258,7 +262,7 @@ return [
         'RU'=>'Russian Federation',
         'RW'=>'Rwanda',
         'SA'=>'Saudi Arabia',
-        'UK'=>'Scotland',
+        'GB-SCT'=>'Scotland',
         'SB'=>'Solomon Islands',
         'SC'=>'Seychelles',
         'SS'=>'South Sudan',
@@ -310,6 +314,7 @@ return [
         'VI'=>'Virgin Islands (U.S.)',
         'VN'=>'Viet Nam',
         'VU'=>'Vanuatu',
+        'GB-WLS' =>'Wales',
         'WF'=>'Wallis And Futuna Islands',
         'WS'=>'Samoa',
         'YE'=>'Yemen',
diff --git a/resources/lang/hr-HR/mail.php b/resources/lang/hr-HR/mail.php
index c4907eadb4..604d793000 100644
--- a/resources/lang/hr-HR/mail.php
+++ b/resources/lang/hr-HR/mail.php
@@ -23,24 +23,25 @@ return [
     'Item_Requested' => 'Potrebna stavka',
     'License_Checkin_Notification' => 'License checked in',
     'License_Checkout_Notification' => 'License checked out',
+    'license_for'   => 'License for',
     'Low_Inventory_Report' => 'Izvješće o niskom oglasnom prostoru',
     'a_user_canceled' => 'Korisnik je otkazao zahtjev za stavkom na web mjestu',
     'a_user_requested' => 'Korisnik je zatražio stavku na web mjestu',
     'acceptance_asset_accepted' => 'A user has accepted an item',
     'acceptance_asset_declined' => 'A user has declined an item',
-    'accessory_name' => 'Naziv dodatne opreme:',
-    'additional_notes' => 'Dodatne napomene:',
+    'accessory_name' => 'Naziv dodatne opreme',
+    'additional_notes' => 'Dodatne napomene',
     'admin_has_created' => 'Administrator vam je stvorio račun na: web stranici.',
-    'asset' => 'Imovina:',
-    'asset_name' => 'Naziv imovine:',
+    'asset' => 'Imovina',
+    'asset_name' => 'Naziv imovine',
     'asset_requested' => 'Traženo sredstvo',
     'asset_tag' => 'Oznaka imovine',
     'assets_warrantee_alert' => 'There is :count asset with a warranty expiring in the next :threshold days.|There are :count assets with warranties expiring in the next :threshold days.',
     'assigned_to' => 'Dodijeljena',
     'best_regards' => 'Lijepi Pozdrav,',
-    'canceled' => 'otkazano:',
-    'checkin_date' => 'Datum prijave:',
-    'checkout_date' => 'Datum kupnje:',
+    'canceled' => 'otkazano',
+    'checkin_date' => 'Datum čekanja',
+    'checkout_date' => 'Datum kupnje',
     'checkedout_from' => 'Checked out from',
     'checkedin_from'  => 'Checked in from',
     'checked_into' => 'Checked into',
@@ -49,27 +50,30 @@ return [
     'click_to_confirm' => 'Kliknite na sljedeću vezu kako biste potvrdili svoj: web račun:',
     'current_QTY' => 'Trenutna QTY',
     'days' => 'dana',
-    'expecting_checkin_date' => 'Datum predviđenog provjere:',
+    'expecting_checkin_date' => 'Očekivani datum provjere',
     'expires' => 'istječe',
     'hello' => 'zdravo',
     'hi' => 'bok',
     'i_have_read' => 'Pročitao sam i prihvaćam uvjete korištenja i primio sam ovu stavku.',
     'inventory_report' => 'Inventory Report',
-    'item' => 'Artikal:',
+    'item' => 'Artikal',
+    'item_checked_reminder' => 'This is a reminder that you currently have :count items checked out to you that you have not accepted or declined. Please click the link below to confirm your decision.',
     'license_expiring_alert' => 'Postoji :count licenca koja istječe u naredna :threshold dana.|Postoje :count licence koje istječu u naredna :threshold dana.',
     'link_to_update_password' => 'Kliknite sljedeću vezu da biste ažurirali svoju: web lozinku:',
-    'login' => 'Prijaviti se:',
+    'login' => 'Prijaviti se',
     'login_first_admin' => 'Prijavite se na svoju novu Snipe-IT instalaciju pomoću vjerodajnica u nastavku:',
     'low_inventory_alert' => 'Postoji :count stavka koja je ispod minimalnog iznosa zaliha ili će uskoro biti.|Postoje :count stavke koje su ispod minimalnog iznosa zaliha ili će uskoro biti.',
     'min_QTY' => 'Min QTY',
     'name' => 'Ime',
     'new_item_checked' => 'Nova stavka je provjerena pod vašim imenom, detalji su u nastavku.',
+    'new_item_checked_with_acceptance' => 'A new item has been checked out under your name that requires acceptance, details are below.',
+    'recent_item_checked' => 'An item was recently checked out under your name that requires acceptance, details are below.',
     'notes' => 'Bilješke',
-    'password' => 'Lozinka:',
+    'password' => 'Lozinka',
     'password_reset' => 'Ponovno postavljanje zaporke',
     'read_the_terms' => 'Pročitajte uvjete upotrebe u nastavku.',
     'read_the_terms_and_click' => 'Molimo pročitajte uvjete korištenja u nastavku i kliknite na poveznicu na dnu kako biste potvrdili da ste pročitali i da se slažete s uvjetima korištenja te da ste primili imovinu.',
-    'requested' => 'Traženi:',
+    'requested' => 'Traženi',
     'reset_link' => 'Vaša lozinka resetiraj vezu',
     'reset_password' => 'Kliknite ovdje da biste poništili zaporku:',
     'rights_reserved' => 'All rights reserved.',
@@ -86,8 +90,10 @@ return [
     'upcoming-audits' => 'There is :count asset that is coming up for audit within :threshold days.|There are :count assets that are coming up for audit within :threshold days.',
     'user' => 'Korisnik',
     'username' => 'Korisničko ime',
+    'unaccepted_asset_reminder' => 'Reminder: You have Unaccepted Assets.',
     'welcome' => 'Dobrodošli: ime',
     'welcome_to' => 'Dobrodošli na: web!',
     'your_assets' => 'View Your Assets',
     'your_credentials' => 'Vaše vjerodajnice za Snipe-IT',
+    'mail_sent' => 'Mail sent successfully!',
 ];
diff --git a/resources/lang/hr-HR/validation.php b/resources/lang/hr-HR/validation.php
index d9db981195..0834bbd5e0 100644
--- a/resources/lang/hr-HR/validation.php
+++ b/resources/lang/hr-HR/validation.php
@@ -13,87 +13,150 @@ return [
     |
     */
 
-    'accepted'             => ':attribute mora biti prihvaćen.',
-    'active_url'           => 'The: atribut nije važeći URL.',
-    'after'                => 'Atribut mora biti datum nakon: datum.',
-    'after_or_equal'       => 'Atribut mora biti datum nakon ili jednak: datumu.',
-    'alpha'                => 'Atribut može sadržavati samo slova.',
-    'alpha_dash'           => 'Atribut može sadržavati samo slova, brojeve i crtice.',
-    'alpha_num'            => 'Atribut može sadržavati samo slova i brojeve.',
-    'array'                => 'Atribut mora biti niz.',
-    'before'               => 'Atribut mora biti datum prije: datum.',
-    'before_or_equal'      => 'Atribut mora biti datum prije ili jednak: datumu.',
-    'between'              => [
-        'numeric' => 'Atribut mora biti između: min i: max.',
-        'file'    => 'Atribut mora biti između: min i: max kilobajta.',
-        'string'  => 'Atribut mora biti između: min i: max znakova.',
-        'array'   => 'Atribut mora imati između: min i: max stavki.',
+    'accepted' => 'The :attribute field must be accepted.',
+    'accepted_if' => 'The :attribute field must be accepted when :other is :value.',
+    'active_url' => 'The :attribute field must be a valid URL.',
+    'after' => 'The :attribute field must be a date after :date.',
+    'after_or_equal' => 'The :attribute field must be a date after or equal to :date.',
+    'alpha' => 'The :attribute field must only contain letters.',
+    'alpha_dash' => 'The :attribute field must only contain letters, numbers, dashes, and underscores.',
+    'alpha_num' => 'The :attribute field must only contain letters and numbers.',
+    'array' => 'The :attribute field must be an array.',
+    'ascii' => 'The :attribute field must only contain single-byte alphanumeric characters and symbols.',
+    'before' => 'The :attribute field must be a date before :date.',
+    'before_or_equal' => 'The :attribute field must be a date before or equal to :date.',
+    'between' => [
+        'array' => 'The :attribute field must have between :min and :max items.',
+        'file' => 'The :attribute field must be between :min and :max kilobytes.',
+        'numeric' => 'The :attribute field must be between :min and :max.',
+        'string' => 'The :attribute field must be between :min and :max characters.',
     ],
-    'boolean'              => 'Polje atributa mora biti točno ili netočno.',
-    'confirmed'            => 'Potvrda atributa ne odgovara.',
-    'date'                 => 'Atribut nije važeći datum.',
-    'date_format'          => 'The: atribut ne odgovara formatu: format.',
-    'different'            => 'Atribut: i drugi moraju biti različiti.',
-    'digits'               => 'Atribut mora biti: znamenke znamenki.',
-    'digits_between'       => 'Atribut mora biti između: min i: max znamenki.',
-    'dimensions'           => 'The: atribut ima nevažeće dimenzije slike.',
-    'distinct'             => 'Polje atributa ima duplikatu vrijednost.',
-    'email'                => 'Atribut mora biti važeća adresa e-pošte.',
-    'exists'               => 'Odabrani: atribut nije važeći.',
-    'file'                 => 'The: atribut mora biti datoteka.',
-    'filled'               => 'Polje atributa mora imati vrijednost.',
-    'image'                => 'The: atribut mora biti slika.',
+    'boolean' => 'Polje atributa mora biti točno ili netočno.',
+    'can' => 'The :attribute field contains an unauthorized value.',
+    'confirmed' => 'The :attribute field confirmation does not match.',
+    'contains' => 'The :attribute field is missing a required value.',
+    'current_password' => 'The password is incorrect.',
+    'date' => 'The :attribute field must be a valid date.',
+    'date_equals' => 'The :attribute field must be a date equal to :date.',
+    'date_format' => 'The :attribute field must match the format :format.',
+    'decimal' => 'The :attribute field must have :decimal decimal places.',
+    'declined' => 'The :attribute field must be declined.',
+    'declined_if' => 'The :attribute field must be declined when :other is :value.',
+    'different' => 'The :attribute field and :other must be different.',
+    'digits' => 'The :attribute field must be :digits digits.',
+    'digits_between' => 'The :attribute field must be between :min and :max digits.',
+    'dimensions' => 'The :attribute field has invalid image dimensions.',
+    'distinct' => 'Polje atributa ima duplikatu vrijednost.',
+    'doesnt_end_with' => 'The :attribute field must not end with one of the following: :values.',
+    'doesnt_start_with' => 'The :attribute field must not start with one of the following: :values.',
+    'email' => 'The :attribute field must be a valid email address.',
+    'ends_with' => 'The :attribute field must end with one of the following: :values.',
+    'enum' => 'Odabrani: atribut nije važeći.',
+    'exists' => 'Odabrani: atribut nije važeći.',
+    'extensions' => 'The :attribute field must have one of the following extensions: :values.',
+    'file' => 'The :attribute field must be a file.',
+    'filled' => 'Polje atributa mora imati vrijednost.',
+    'gt' => [
+        'array' => 'The :attribute field must have more than :value items.',
+        'file' => 'The :attribute field must be greater than :value kilobytes.',
+        'numeric' => 'The :attribute field must be greater than :value.',
+        'string' => 'The :attribute field must be greater than :value characters.',
+    ],
+    'gte' => [
+        'array' => 'The :attribute field must have :value items or more.',
+        'file' => 'The :attribute field must be greater than or equal to :value kilobytes.',
+        'numeric' => 'The :attribute field must be greater than or equal to :value.',
+        'string' => 'The :attribute field must be greater than or equal to :value characters.',
+    ],
+    'hex_color' => 'The :attribute field must be a valid hexadecimal color.',
+    'image' => 'The :attribute field must be an image.',
     'import_field_empty'    => 'The value for :fieldname cannot be null.',
-    'in'                   => 'Odabrani: atribut nije važeći.',
-    'in_array'             => 'Polje atributa ne postoji u: drugom.',
-    'integer'              => 'Atribut mora biti cijeli broj.',
-    'ip'                   => 'The: atribut mora biti važeća IP adresa.',
-    'ipv4'                 => 'The: atribut mora biti važeća IPv4 adresa.',
-    'ipv6'                 => 'The: atribut mora biti važeća IPv6 adresa.',
-    'is_unique_department' => 'The :attribute must be unique to this Company Location',
-    'json'                 => 'The: atribut mora biti valjan JSON niz.',
-    'max'                  => [
-        'numeric' => 'Atribut ne smije biti veći od: max.',
-        'file'    => 'Atribut ne smije biti veći od: maks. Kilobajta.',
-        'string'  => 'Atribut ne smije biti veći od: max znakova.',
-        'array'   => 'The: atribut ne smije imati više od: max stavki.',
+    'in' => 'Odabrani: atribut nije važeći.',
+    'in_array' => 'The :attribute field must exist in :other.',
+    'integer' => 'The :attribute field must be an integer.',
+    'ip' => 'The :attribute field must be a valid IP address.',
+    'ipv4' => 'The :attribute field must be a valid IPv4 address.',
+    'ipv6' => 'The :attribute field must be a valid IPv6 address.',
+    'json' => 'The :attribute field must be a valid JSON string.',
+    'list' => 'The :attribute field must be a list.',
+    'lowercase' => 'The :attribute field must be lowercase.',
+    'lt' => [
+        'array' => 'The :attribute field must have less than :value items.',
+        'file' => 'The :attribute field must be less than :value kilobytes.',
+        'numeric' => 'The :attribute field must be less than :value.',
+        'string' => 'The :attribute field must be less than :value characters.',
     ],
-    'mimes'                => 'Atribut mora biti datoteka tipa:: vrijednosti.',
-    'mimetypes'            => 'Atribut mora biti datoteka tipa:: vrijednosti.',
-    'min'                  => [
-        'numeric' => 'Atribut mora biti najmanje: min.',
-        'file'    => 'Atribut mora biti najmanje: min kilobajta.',
-        'string'  => 'Atribut mora biti najmanje: min znakova.',
-        'array'   => 'Atribut mora imati barem: min stavke.',
+    'lte' => [
+        'array' => 'The :attribute field must not have more than :value items.',
+        'file' => 'The :attribute field must be less than or equal to :value kilobytes.',
+        'numeric' => 'The :attribute field must be less than or equal to :value.',
+        'string' => 'The :attribute field must be less than or equal to :value characters.',
     ],
-    'starts_with'          => 'The :attribute must start with one of the following: :values.',
-    'ends_with'            => 'The :attribute must end with one of the following: :values.',
+    'mac_address' => 'The :attribute field must be a valid MAC address.',
+    'max' => [
+        'array' => 'The :attribute field must not have more than :max items.',
+        'file' => 'The :attribute field must not be greater than :max kilobytes.',
+        'numeric' => 'The :attribute field must not be greater than :max.',
+        'string' => 'The :attribute field must not be greater than :max characters.',
+    ],
+    'max_digits' => 'The :attribute field must not have more than :max digits.',
+    'mimes' => 'The :attribute field must be a file of type: :values.',
+    'mimetypes' => 'The :attribute field must be a file of type: :values.',
+    'min' => [
+        'array' => 'The :attribute field must have at least :min items.',
+        'file' => 'The :attribute field must be at least :min kilobytes.',
+        'numeric' => 'The :attribute field must be at least :min.',
+        'string' => 'The :attribute field must be at least :min characters.',
+    ],
+    'min_digits' => 'The :attribute field must have at least :min digits.',
+    'missing' => 'The :attribute field must be missing.',
+    'missing_if' => 'The :attribute field must be missing when :other is :value.',
+    'missing_unless' => 'The :attribute field must be missing unless :other is :value.',
+    'missing_with' => 'The :attribute field must be missing when :values is present.',
+    'missing_with_all' => 'The :attribute field must be missing when :values are present.',
+    'multiple_of' => 'The :attribute field must be a multiple of :value.',
+    'not_in' => 'Odabrani: atribut nije važeći.',
+    'not_regex' => 'The :attribute field format is invalid.',
+    'numeric' => 'The :attribute field must be a number.',
+    'password' => [
+        'letters' => 'The :attribute field must contain at least one letter.',
+        'mixed' => 'The :attribute field must contain at least one uppercase and one lowercase letter.',
+        'numbers' => 'The :attribute field must contain at least one number.',
+        'symbols' => 'The :attribute field must contain at least one symbol.',
+        'uncompromised' => 'The given :attribute has appeared in a data leak. Please choose a different :attribute.',
+    ],
+    'percent'       => 'The depreciation minimum must be between 0 and 100 when depreciation type is percentage.',
 
-    'not_in'               => 'Odabrani: atribut nije važeći.',
-    'numeric'              => 'Atribut mora biti broj.',
-    'present'              => 'Polje atributa mora biti prisutno.',
-    'valid_regex'          => 'To nije valjani regex. ',
-    'regex'                => 'Format atributa nije važeći.',
-    'required'             => 'Potrebno je: polje atributa.',
-    'required_if'          => 'Polje atributa je obavezno kada: druga vrijednost: vrijednost.',
-    'required_unless'      => 'Polje atributa je obavezno, osim ako: druga nije u: vrijednostima.',
-    'required_with'        => 'Polje atributa je obavezno kada: postoji vrijednost.',
-    'required_with_all'    => 'Polje atributa je obavezno kada: postoji vrijednost.',
-    'required_without'     => 'Polje atributa je potrebno kada: vrijednosti nisu prisutne.',
+    'present' => 'Polje atributa mora biti prisutno.',
+    'present_if' => 'The :attribute field must be present when :other is :value.',
+    'present_unless' => 'The :attribute field must be present unless :other is :value.',
+    'present_with' => 'The :attribute field must be present when :values is present.',
+    'present_with_all' => 'The :attribute field must be present when :values are present.',
+    'prohibited' => 'The :attribute field is prohibited.',
+    'prohibited_if' => 'The :attribute field is prohibited when :other is :value.',
+    'prohibited_unless' => 'The :attribute field is prohibited unless :other is in :values.',
+    'prohibits' => 'The :attribute field prohibits :other from being present.',
+    'regex' => 'The :attribute field format is invalid.',
+    'required' => 'Potrebno je: polje atributa.',
+    'required_array_keys' => 'The :attribute field must contain entries for: :values.',
+    'required_if' => 'Polje atributa je obavezno kada: druga vrijednost: vrijednost.',
+    'required_if_accepted' => 'The :attribute field is required when :other is accepted.',
+    'required_if_declined' => 'The :attribute field is required when :other is declined.',
+    'required_unless' => 'Polje atributa je obavezno, osim ako: druga nije u: vrijednostima.',
+    'required_with' => 'Polje atributa je obavezno kada: postoji vrijednost.',
+    'required_with_all' => 'The :attribute field is required when :values are present.',
+    'required_without' => 'Polje atributa je potrebno kada: vrijednosti nisu prisutne.',
     'required_without_all' => 'Polje atributa je obavezno ako nijedna od: vrijednosti nije prisutna.',
-    'same'                 => 'Atribut: i drugi moraju odgovarati.',
-    'size'                 => [
-        'numeric' => 'Atribut mora biti: veličina.',
-        'file'    => 'Atribut mora biti: veličina kilobajta.',
-        'string'  => 'The: atribut mora biti: veličina znakova.',
-        'array'   => 'Atribut mora sadržavati: stavke veličine.',
+    'same' => 'The :attribute field must match :other.',
+    'size' => [
+        'array' => 'The :attribute field must contain :size items.',
+        'file' => 'The :attribute field must be :size kilobytes.',
+        'numeric' => 'The :attribute field must be :size.',
+        'string' => 'The :attribute field must be :size characters.',
     ],
+    'starts_with' => 'The :attribute field must start with one of the following: :values.',
     'string'               => 'The: atribut mora biti niz.',
-    'timezone'             => 'Atribut mora biti važeća zona.',
     'two_column_unique_undeleted' => 'The :attribute must be unique across :table1 and :table2. ',
-    'unique'               => 'The: atribut je već snimljen.',
-    'uploaded'             => 'Atribut nije prenesen.',
-    'url'                  => 'Format atributa nije važeći.',
     'unique_undeleted'     => ':attribute mora biti jedinstven.',
     'non_circular'         => 'The :attribute must not create a circular reference.',
     'not_array'            => ':attribute ne smije biti niz.',
@@ -102,11 +165,14 @@ return [
     'numbers'              => 'Zaporka treba sadržavati barem jedan broj.',
     'case_diff'            => 'Password must use mixed case.',
     'symbols'              => 'Password must contain symbols.',
-    'gte'                  => [
-        'numeric'          => 'Value cannot be negative'
-    ],
-    'checkboxes'           => ':attribute contains invalid options.',
-    'radio_buttons'        => ':attribute is invalid.',
+    'timezone' => 'The :attribute field must be a valid timezone.',
+    'unique' => 'The: atribut je već snimljen.',
+    'uploaded' => 'Atribut nije prenesen.',
+    'uppercase' => 'The :attribute field must be uppercase.',
+    'url' => 'The :attribute field must be a valid URL.',
+    'ulid' => 'The :attribute field must be a valid ULID.',
+    'uuid' => 'The :attribute field must be a valid UUID.',
+    'fmcs_location' => 'Full multiple company support and location scoping is enabled in the Admin Settings, and the selected location and selected company are not compatible.',
 
 
     /*
@@ -120,16 +186,22 @@ return [
     |
     */
 
+    'email_array'      => 'Jedna ili više adresa e-pošte nije važeća.',
+    'checkboxes'           => ':attribute contains invalid options.',
+    'radio_buttons'        => ':attribute is invalid.',
+    
     'custom' => [
         'alpha_space' => 'Polje atributa sadrži znak koji nije dopušten.',
-        'email_array'      => 'Jedna ili više adresa e-pošte nije važeća.',
+
         'hashed_pass'      => 'Vaša trenutačna zaporka nije točna',
         'dumbpwd'          => 'Ta je lozinka prečestna.',
         'statuslabel_type' => 'Morate odabrati valjanu vrstu oznake statusa',
+        'custom_field_not_found'          => 'This field does not seem to exist, please double check your custom field names.',
+        'custom_field_not_found_on_model' => 'This field seems to exist, but is not available on this Asset Model\'s fieldset.',
 
         // date_format validation with slightly less stupid messages. It duplicates a lot, but it gets the job done :(
-        // We use this because the default error message for date_format is reflects php Y-m-d, which non-PHP
-        // people won't know how to format. 
+        // We use this because the default error message for date_format reflects php Y-m-d, which non-PHP
+        // people won't know how to format.
         'purchase_date.date_format'     => 'The :attribute must be a valid date in YYYY-MM-DD format',
         'last_audit_date.date_format'   =>  'The :attribute must be a valid date in YYYY-MM-DD hh:mm:ss format',
         'expiration_date.date_format'   =>  'The :attribute must be a valid date in YYYY-MM-DD format',
@@ -137,9 +209,15 @@ return [
         'expected_checkin.date_format'  =>  'The :attribute must be a valid date in YYYY-MM-DD format',
         'start_date.date_format'        =>  'The :attribute must be a valid date in YYYY-MM-DD format',
         'end_date.date_format'          =>  'The :attribute must be a valid date in YYYY-MM-DD format',
+        'invalid_value_in_field' => 'Invalid value included in this field',
 
-    ],
+        'ldap_username_field' => [
+            'not_in' =>         '<code>sAMAccountName</code> (mixed case) will likely not work. You should use <code>samaccountname</code> (lowercase) instead.'
+        ],
+        'ldap_auth_filter_query' => ['not_in' => '<code>uid=samaccountname</code> is probably not a valid auth filter. You probably want <code>uid=</code> '],
+        'ldap_filter' => ['regex' => 'This value should probably not be wrapped in parentheses.'],
 
+        ],
     /*
     |--------------------------------------------------------------------------
     | Custom Validation Attributes
@@ -155,8 +233,16 @@ return [
 
     /*
     |--------------------------------------------------------------------------
-    | Generic Validation Messages
+    | Generic Validation Messages - we use these in the jquery validation where we don't have
+    | access to the :attribute
     |--------------------------------------------------------------------------
     */
-    'invalid_value_in_field' => 'Invalid value included in this field',
+
+    'generic' => [
+        'invalid_value_in_field' => 'Invalid value included in this field',
+        'required' => 'This field is required',
+        'email' => 'Please enter a valid email address',
+    ],
+
+
 ];
diff --git a/resources/lang/hu-HU/account/general.php b/resources/lang/hu-HU/account/general.php
index dce4449d14..0eefc5651c 100644
--- a/resources/lang/hu-HU/account/general.php
+++ b/resources/lang/hu-HU/account/general.php
@@ -2,10 +2,16 @@
 
 return array(
     'personal_api_keys' => 'Személyes API kulcsok',
+    'personal_access_token' => 'Personal Access Token',
+    'personal_api_keys_success' => 'Personal API Key :key created sucessfully',
+    'here_is_api_key' => 'Here is your new personal access token. This is the only time it will be shown so do not lose it! You may now use this token to make API requests.',
     'api_key_warning' => 'When generating an API token, be sure to copy it down immediately as they will not be visible to you again.',
     'api_base_url' => 'Az API alap url címe a következő:',
     'api_base_url_endpoint' => '/&lt;endpoint&gt;',
     'api_token_expiration_time' => 'Az API tokenek lejárati ideje:',
     'api_reference' => 'Please check the <a href="https://snipe-it.readme.io/reference" target="_blank">API reference</a> to find specific API endpoints and additional API documentation.',
     'profile_updated' => 'A fiók frissítése sikeres',
+    'no_tokens' => 'You have not created any personal access tokens.',
+    'enable_sounds' => 'Enable sound effects',
+    'enable_confetti' => 'Enable confetti effects',
 );
diff --git a/resources/lang/hu-HU/admin/accessories/message.php b/resources/lang/hu-HU/admin/accessories/message.php
index f9385a75ba..5413cd3d4a 100644
--- a/resources/lang/hu-HU/admin/accessories/message.php
+++ b/resources/lang/hu-HU/admin/accessories/message.php
@@ -26,7 +26,11 @@ return array(
         'error'   		=> 'A tartozékot nem sikerült kiadni, kérem, próbálja újra!',
         'success' 		=> 'A tartozék sikeresen kiadva.',
         'unavailable'   => 'A tartozékot nem lehet kiadni. Ellenőrizd a kiadható mennyiséget',
-        'user_does_not_exist' => 'Érvénytelen felhasználó. Kérem, próbálja újra!'
+        'user_does_not_exist' => 'Érvénytelen felhasználó. Kérem, próbálja újra!',
+         'checkout_qty' => array(
+            'lte'  => 'There is currently only one available accessory of this type, and you are trying to check out :checkout_qty. Please adjust the checkout quantity or the total stock of this accessory and try again.|There are :number_currently_remaining total available accessories, and you are trying to check out :checkout_qty. Please adjust the checkout quantity or the total stock of this accessory and try again.',
+            ),
+           
     ),
 
     'checkin' => array(
diff --git a/resources/lang/hu-HU/admin/accessories/table.php b/resources/lang/hu-HU/admin/accessories/table.php
index 687a0d3b7d..d2fc59afb3 100644
--- a/resources/lang/hu-HU/admin/accessories/table.php
+++ b/resources/lang/hu-HU/admin/accessories/table.php
@@ -6,6 +6,4 @@ return array(
     'id'      					=> 'ID',
     'require_acceptance'      	=> 'Elfogad',
     'title'      				=> 'Tartozék neve',
-
-
 );
diff --git a/resources/lang/hu-HU/admin/companies/table.php b/resources/lang/hu-HU/admin/companies/table.php
index 8f590cad1a..3d1416f660 100644
--- a/resources/lang/hu-HU/admin/companies/table.php
+++ b/resources/lang/hu-HU/admin/companies/table.php
@@ -2,7 +2,7 @@
 return array(
     'companies' => 'Cégek',
     'create'    => 'Vállalat létrehozása',
-    'email'     => 'Company Email',
+    'email'     => 'A cég email címe',
     'title'     => 'Társág',
     'phone'     => 'Company Phone',
     'update'    => 'Társaság frissítése',
diff --git a/resources/lang/hu-HU/admin/components/message.php b/resources/lang/hu-HU/admin/components/message.php
index ae11d468a4..921db5ca43 100644
--- a/resources/lang/hu-HU/admin/components/message.php
+++ b/resources/lang/hu-HU/admin/components/message.php
@@ -17,7 +17,8 @@ return array(
     'delete' => array(
         'confirm'   => 'Biztosan törölni szeretnéd az alkatrészt?',
         'error'   => 'Probléma támadt a vállalat törlésével. Próbálkozz újra.',
-        'success' => 'Az alkatrész sikeresen törlődött.'
+        'success' => 'Az alkatrész sikeresen törlődött.',
+        'error_qty'   => 'Some components of this type are still checked out. Please check them in and try again.',
     ),
 
      'checkout' => array(
diff --git a/resources/lang/hu-HU/admin/consumables/general.php b/resources/lang/hu-HU/admin/consumables/general.php
index db4dced03c..960f78cdd4 100644
--- a/resources/lang/hu-HU/admin/consumables/general.php
+++ b/resources/lang/hu-HU/admin/consumables/general.php
@@ -8,4 +8,5 @@ return array(
     'remaining' 			            => 'Fennmaradó',
     'total' 			                => 'Összesen',
     'update'                            => 'Kellék frissítése',
+    'inventory_warning'                 => 'The inventory of this consumable is below the minimum amount of :min_count',
 );
diff --git a/resources/lang/hu-HU/admin/consumables/message.php b/resources/lang/hu-HU/admin/consumables/message.php
index 1677ee6f50..b9478aba3d 100644
--- a/resources/lang/hu-HU/admin/consumables/message.php
+++ b/resources/lang/hu-HU/admin/consumables/message.php
@@ -2,6 +2,7 @@
 
 return array(
 
+    'invalid_category_type' => 'The category must be a consumable category.',
     'does_not_exist' => 'A fogyóeszköz nem létezik.',
 
     'create' => array(
diff --git a/resources/lang/hu-HU/admin/custom_fields/general.php b/resources/lang/hu-HU/admin/custom_fields/general.php
index 0a36a767d7..7976f1b292 100644
--- a/resources/lang/hu-HU/admin/custom_fields/general.php
+++ b/resources/lang/hu-HU/admin/custom_fields/general.php
@@ -35,7 +35,7 @@ return [
     'create_field_title' => 'Új egyéni mező létrehozása',
     'value_encrypted'      	        => 'A mező értéke titkosítva van az adatbázisban. Csak az adminisztrátor felhasználók láthatják a dekódolt értéket',
     'show_in_email'     => 'Szerepeljen ez a mező az eszköz kiadásakor a felhasználónak küldött emailben? A titkosított mezők nem szerepelhetnek az emailekben',
-    'show_in_email_short'     => 'Szerepeljen az emailekben.',
+    'show_in_email_short' => 'Szerepeljen az emailekben',
     'help_text' => 'Súgó szöveg',
     'help_text_description' => 'Ez egy opcionális szöveg, amely az űrlapelemek alatt jelenik meg az eszköz szerkesztése közben, hogy kontextust adjon a mezőhöz.',
     'about_custom_fields_title' => 'Az egyéni mezőkről',
@@ -57,5 +57,8 @@ return [
     'show_in_requestable_list_short' => 'Show in requestable assets list',
     'show_in_requestable_list' => 'Show value in requestable assets list. Encrypted fields will not be shown',
     'encrypted_options' => 'This field is encrypted, so some display options will not be available.',
+    'display_checkin' => 'Display in checkin forms',
+    'display_checkout' => 'Display in checkout forms',
+    'display_audit' => 'Display in audit forms',
 
 ];
diff --git a/resources/lang/hu-HU/admin/custom_fields/message.php b/resources/lang/hu-HU/admin/custom_fields/message.php
index 9bfd0cf731..b714cecda3 100644
--- a/resources/lang/hu-HU/admin/custom_fields/message.php
+++ b/resources/lang/hu-HU/admin/custom_fields/message.php
@@ -5,6 +5,7 @@ return array(
     'field' => array(
         'invalid'   => 'A rekordmező nem létezik.',
         'already_added'   => 'Mező már hozzáadva',
+        'none_selected'   => 'No field selected',
 
         'create' => array(
             'error'   => 'A mező nem lett létrehozva, próbálkozz újra.',
diff --git a/resources/lang/hu-HU/admin/depreciations/general.php b/resources/lang/hu-HU/admin/depreciations/general.php
index 2ef73c1836..7bb3b2b74b 100644
--- a/resources/lang/hu-HU/admin/depreciations/general.php
+++ b/resources/lang/hu-HU/admin/depreciations/general.php
@@ -13,4 +13,8 @@ return [
     'no_depreciations_warning'               => '<strong>Figyelmeztetés: </strong>
                       Jelenleg nincsenek értékcsökkenési leírások beállítva.
                       Kérjük, legalább egy értékcsökkenést állítson be az értékcsökkenési jelentés megtekintéséhez.',
+    'depreciation_method'                   => 'Értékcsökkenés riport',
+    'linear_depreciation'                   => 'Linear (Default)',
+    'half_1'                                => 'Half-year convention, always applied',
+    'half_2'                                => 'Half-year convention, applied with condition',
 ];
diff --git a/resources/lang/hu-HU/admin/hardware/form.php b/resources/lang/hu-HU/admin/hardware/form.php
index 8364872739..a0b8de0f93 100644
--- a/resources/lang/hu-HU/admin/hardware/form.php
+++ b/resources/lang/hu-HU/admin/hardware/form.php
@@ -55,8 +55,11 @@ return [
     'asset_location_update_default' => 'Csak az alapértelmezett helyszín frissítése',
     'asset_location_update_actual' => 'Csak az aktuális helyszín frissítése',
     'asset_not_deployable' => 'Az eszköz még nem kiadásra kész, még nem kiadható.',
-    'asset_deployable' => 'Az eszköz kiadásra kész, kiadható.',
+    'asset_not_deployable_checkin' => 'That asset status is not deployable. Using this status label will checkin the asset.',
+    'asset_deployable' => 'This asset can be checked out.',
     'processing_spinner' => 'Feldolgozás folyamatban... (Nagyméretű fájlok esetében ez eltarthat egy darabig)',
+    'processing' => 'Feldolgozás... ',
     'optional_infos'  => 'Nem kötelező információk',
-    'order_details'   => 'Megrendeléssel kapcsolatos információk'
+    'order_details'   => 'Megrendeléssel kapcsolatos információk',
+    'calc_eol'    => 'If nulling the EOL date, use automatic EOL calculation based on the purchase date and EOL rate.',
 ];
diff --git a/resources/lang/hu-HU/admin/hardware/general.php b/resources/lang/hu-HU/admin/hardware/general.php
index ec5e9f031d..5b1f62195f 100644
--- a/resources/lang/hu-HU/admin/hardware/general.php
+++ b/resources/lang/hu-HU/admin/hardware/general.php
@@ -5,8 +5,8 @@ return [
     'about_assets_text'            => 'Az eszközök a sorszám vagy az eszközcímke által követett elemek. Ezek általában magasabb értékű termékek, amelyekben egy adott elem azonosítása fontos.',
     'archived'  				=> 'Arhivált',
     'asset'  					=> 'Eszköz',
-    'bulk_checkout'             => 'Eszközök kiadása',
-    'bulk_checkin'              => 'Eszköz visszavétele',
+    'bulk_checkout'             => 'Bulk Checkout',
+    'bulk_checkin'              => 'Bulk Checkin',
     'checkin'  					=> 'Eszköz visszavétele',
     'checkout'  				=> 'Checkout Asset',
     'clone'  					=> 'Eszköz klónozása',
@@ -27,8 +27,7 @@ return [
     'undeployable_tooltip'  	=> 'Az eszköz jelenleg az állapotcímkéje szerint nem helyezhezhető üzembe és nem adható ki.',
     'view'  					=> 'Eszköz megtekintése',
     'csv_error' => 'Hiba van a CSV fájlban:',
-    'import_text' => '<p>Upload a CSV that contains asset history. The assets and users MUST already exist in the system, or they will be skipped. Matching assets for history import happens against the asset tag. We will try to find a matching user based on the user\'s name you provide, and the criteria you select below. If you do not select any criteria below, it will simply try to match on the username format you configured in the <code>Admin &gt; General Settings</code>.</p><p>Fields included in the CSV must match the headers: <strong>Asset Tag, Name, Checkout Date, Checkin Date</strong>. Any additional fields will be ignored. </p><p>Checkin Date: blank or future checkin dates will checkout items to associated user.  Excluding the Checkin Date column will create a checkin date with todays date.</p>
-    ',
+    'import_text' => '<p>Upload a CSV that contains asset history. The assets and users MUST already exist in the system, or they will be skipped. Matching assets for history import happens against the asset tag. We will try to find a matching user based on the user\'s name you provide, and the criteria you select below. If you do not select any criteria below, it will simply try to match on the username format you configured in the <code>Admin &gt; General Settings</code>.</p><p>Fields included in the CSV must match the headers: <strong>Asset Tag, Name, Checkout Date, Checkin Date</strong>. Any additional fields will be ignored. </p><p>Checkin Date: blank or future checkin dates will checkout items to associated user.  Excluding the Checkin Date column will create a checkin date with todays date.</p>    ',
     'csv_import_match_f-l' => 'Try to match users by <strong>firstname.lastname</strong> (<code>jane.smith</code>) format',
     'csv_import_match_initial_last' => 'Try to match users by <strong>first initial last name</strong> (<code>jsmith</code>) format',
     'csv_import_match_first' => 'Try to match users by <strong>first name</strong> (<code>jane</code>) format',
diff --git a/resources/lang/hu-HU/admin/hardware/message.php b/resources/lang/hu-HU/admin/hardware/message.php
index 8bf0a4685d..fb07288c91 100644
--- a/resources/lang/hu-HU/admin/hardware/message.php
+++ b/resources/lang/hu-HU/admin/hardware/message.php
@@ -2,18 +2,23 @@
 
 return [
 
-    'undeployable' 		=> '<strong>Figyelem: </strong> Ez az eszköz pillanatnyilag  nem kiadható. Ha ez a helyzet változott, kérjük, frissítse az eszköz állapotát.',
-    'does_not_exist' 	=> 'Eszköz nem létezik.',
-    'does_not_exist_var'=> 'Asset with tag :asset_tag not found.',
-    'no_tag' 	        => 'No asset tag provided.',
+    'undeployable' 		 => '<strong>Warning: </strong> This asset has been marked as currently undeployable. If this status has changed, please update the asset status.',
+    'does_not_exist' 	 => 'Eszköz nem létezik.',
+    'does_not_exist_var' => 'Asset with tag :asset_tag not found.',
+    'no_tag' 	         => 'No asset tag provided.',
     'does_not_exist_or_not_requestable' => 'Az eszköz nem létezik vagy nem igényelhető.',
-    'assoc_users'	 	=> 'Ez az eszköz jelenleg ki van jelölve egy felhasználónak, és nem törölhető. Kérjük, először ellenőrizze az eszközt, majd próbálja meg újra törölni.',
+    'assoc_users'	 	 => 'Ez az eszköz jelenleg ki van jelölve egy felhasználónak, és nem törölhető. Kérjük, először ellenőrizze az eszközt, majd próbálja meg újra törölni.',
     'warning_audit_date_mismatch' 	=> 'This asset\'s next audit date (:next_audit_date) is before the last audit date (:last_audit_date). Please update the next audit date.',
+    'labels_generated'   => 'Labels were successfully generated.',
+    'error_generating_labels' => 'Error while generating labels.',
+    'no_assets_selected' => 'No assets selected.',
 
     'create' => [
         'error'   		=> 'Az eszköz nem jött létre, próbálkozzon újra. :(',
         'success' 		=> 'Az eszköz sikeresen létrehozva. :)',
         'success_linked' => 'Eszköz a :tag azonosítóval sikeresen létrehozva. <strong><a href=":link" style="color: white;">Kattintson ide a megtekintéshez</a></strong>.',
+        'multi_success_linked' => 'Asset with tag :links was created successfully.|:count assets were created succesfully. :links.',
+        'partial_failure' => 'An asset was unable to be created. Reason: :failures|:count assets were unable to be created. Reasons: :failures',
     ],
 
     'update' => [
@@ -51,20 +56,24 @@ return [
     ],
 
     'import' => [
+        'import_button'         => 'Process Import',
         'error'                 => 'Egyes elemek nem importáltak helyesen.',
         'errorDetail'           => 'Az alábbi elemeket nem importálták hiba miatt.',
         'success'               => 'A fájlt importálta',
         'file_delete_success'   => 'A fájlt sikeresen törölték',
         'file_delete_error'      => 'A fájlt nem sikerült törölni',
         'file_missing' => 'A kijelölt fájl nem található',
+        'file_already_deleted' => 'The file selected was already deleted',
         'header_row_has_malformed_characters' => 'A fejlécsorban egy vagy több attribútum hibás formájú UTF-8 karaktereket tartalmaz',
         'content_row_has_malformed_characters' => 'A tartalom első sorában egy vagy több attribútum hibás formájú UTF-8 karaktereket tartalmaz',
+        'transliterate_failure' => 'Transliteration from :encoding to UTF-8 failed due to invalid characters in input'
     ],
 
 
     'delete' => [
         'confirm'   	=> 'Biztos benne, hogy törli ezt az elemet?',
         'error'   		=> 'Hiba történt az eszköz törlése közben. Kérlek próbáld újra.',
+        'assigned_to_error' => '{1}Asset Tag: :asset_tag is currently checked out. Check in this device before deletion.|[2,*]Asset Tags: :asset_tag are currently checked out. Check in these devices before deletion.',
         'nothing_updated'   => 'Nincsenek eszközök kijelölve, így semmit sem töröltek.',
         'success' 		=> 'Az eszköz sikeresen törölve lett.',
     ],
@@ -77,6 +86,11 @@ return [
         'no_assets_selected' => 'Ki kell választania legalább egy elemet a listából',
     ],
 
+    'multi-checkout' => [
+        'error'   => 'Asset was not checked out, please try again|Assets were not checked out, please try again',
+        'success' => 'Asset checked out successfully.|Assets checked out successfully.',
+    ],
+
     'checkin' => [
         'error'   		=> 'Az eszköz nem lett bejelölve, próbálkozzon újra',
         'success' 		=> 'Az Asset sikeresen ellenőrzött.',
@@ -86,9 +100,10 @@ return [
     ],
 
     'requests' => [
-        'error'   		=> 'Asset nem kért, kérjük, próbálkozzon újra',
-        'success' 		=> 'Az eszköz sikeresen kért.',
-        'canceled'      => 'A fizetési kérelem sikeresen törölve',
+        'error'   		=> 'Request was not successful, please try again.',
+        'success' 		=> 'Request successfully submitted.',
+        'canceled'      => 'Request successfully canceled.',
+        'cancel'        => 'Eszközigénylés visszavonása',
     ],
 
 ];
diff --git a/resources/lang/hu-HU/admin/hardware/table.php b/resources/lang/hu-HU/admin/hardware/table.php
index e8c46924d8..380857b024 100644
--- a/resources/lang/hu-HU/admin/hardware/table.php
+++ b/resources/lang/hu-HU/admin/hardware/table.php
@@ -25,7 +25,6 @@ return [
     'image'		    => 'Készülék kép',
     'days_without_acceptance' => 'Nem elfogadás óta eltelt napok száma',
     'monthly_depreciation' => 'Havi értékcsökkenés',
-    'assigned_to'    => 'Felelős',
     'requesting_user' => 'Igénylő felhasználó',
     'requested_date' => 'Kért időpont',
     'changed'       => 'Módosítva',
diff --git a/resources/lang/hu-HU/admin/kits/general.php b/resources/lang/hu-HU/admin/kits/general.php
index 49180405a7..40bb80391d 100644
--- a/resources/lang/hu-HU/admin/kits/general.php
+++ b/resources/lang/hu-HU/admin/kits/general.php
@@ -47,4 +47,5 @@ return [
     'kit_deleted'                       => 'A készlet sikeresen törlődött',
     'kit_model_updated'                 => 'A modell sikeresen frissült',
     'kit_model_detached'                => 'A modell sikeresen levált',
+    'model_already_attached'            => 'Model already attached to kit',
 ];
diff --git a/resources/lang/hu-HU/admin/licenses/general.php b/resources/lang/hu-HU/admin/licenses/general.php
index 3f75b119a0..778e5236ff 100644
--- a/resources/lang/hu-HU/admin/licenses/general.php
+++ b/resources/lang/hu-HU/admin/licenses/general.php
@@ -14,6 +14,7 @@ return array(
     'info'  					=> 'Licensz információ',
     'license_seats'  			=> 'Licenc ülések',
     'seat'  					=> 'Ülés',
+    'seat_count'  				=> 'Seat :count',
     'seats'  					=> 'ülések',
     'software_licenses'  		=> 'Szoftverlicencek',
     'user'  					=> 'használó',
@@ -23,12 +24,12 @@ return array(
         [
             'checkin_all'           => [
                 'button'            => 'Checkin All Seats',
-                'modal'             => 'This will action checkin one seat. | This action will checkin all :checkedout_seats_count seats for this license.',
+                'modal'             => 'This action will checkin one seat. | This action will checkin all :checkedout_seats_count seats for this license.',
                 'enabled_tooltip'   => 'Checkin ALL seats for this license from both users and assets',
                 'disabled_tooltip'  => 'This is disabled because there are no seats currently checked out',
                 'disabled_tooltip_reassignable'  => 'This is disabled because the License is not reassignable',
                 'success'           => 'Licenc visszavétel sikeres! | Minden licenc sikeresen visszavéve!',
-                'log_msg'           => 'Checked in via bulk license checkout in license GUI',
+                'log_msg'           => 'Checked in via bulk license checkin in license GUI',
             ],
 
             'checkout_all'              => [
diff --git a/resources/lang/hu-HU/admin/licenses/message.php b/resources/lang/hu-HU/admin/licenses/message.php
index e8b8636246..5aad5a1252 100644
--- a/resources/lang/hu-HU/admin/licenses/message.php
+++ b/resources/lang/hu-HU/admin/licenses/message.php
@@ -44,10 +44,13 @@ return array(
         'error'   => 'Hiba történt az engedély megvizsgálásakor. Kérlek próbáld újra.',
         'success' => 'Az engedélyt sikeresen kiállították',
         'not_enough_seats' => 'Not enough license seats available for checkout',
+        'mismatch' => 'The license seat provided does not match the license',
+        'unavailable' => 'This seat is not available for checkout.',
     ),
 
     'checkin' => array(
         'error'   => 'Hiba történt az engedélyben. Kérlek próbáld újra.',
+        'not_reassignable' => 'License not reassignable',
         'success' => 'Az engedélyt sikeresen ellenőrizték'
     ),
 
diff --git a/resources/lang/hu-HU/admin/locations/message.php b/resources/lang/hu-HU/admin/locations/message.php
index 7f8c251755..981a07a9a2 100644
--- a/resources/lang/hu-HU/admin/locations/message.php
+++ b/resources/lang/hu-HU/admin/locations/message.php
@@ -3,11 +3,12 @@
 return array(
 
     'does_not_exist' => 'Hely nem létezik.',
-    'assoc_users'    => 'This location is not currently deletable because it is the location of record for at least one asset or user, has assets assigned to it, or is the parent location of another location. Please update your models to no longer reference this company and try again. ',
+    'assoc_users'    => 'This location is not currently deletable because it is the location of record for at least one asset or user, has assets assigned to it, or is the parent location of another location. Please update your records to no longer reference this location and try again ',
     'assoc_assets'	 => 'Ez a hely jelenleg legalább egy eszközhöz társítva, és nem törölhető. Frissítse eszközeit, hogy ne hivatkozzon erre a helyre, és próbálja újra.',
     'assoc_child_loc'	 => 'Ez a hely jelenleg legalább egy gyermek helye szülője, és nem törölhető. Frissítse tartózkodási helyeit, hogy ne hivatkozzon erre a helyre, és próbálja újra.',
     'assigned_assets' => 'Hozzárendelt eszközök',
     'current_location' => 'Jelenlegi hely',
+    'open_map' => 'Open in :map_provider_icon Maps',
 
 
     'create' => array(
@@ -20,6 +21,11 @@ return array(
         'success' => 'A helyszín sikeresen frissült.'
     ),
 
+    'restore' => array(
+        'error'   => 'Location was not restored, please try again',
+        'success' => 'Location restored successfully.'
+    ),
+
     'delete' => array(
         'confirm'   	=> 'Biztosan törölni szeretné ezt a helyet?',
         'error'   => 'Hiba történt a helyszín törlése közben. Kérlek próbáld újra.',
diff --git a/resources/lang/hu-HU/admin/locations/table.php b/resources/lang/hu-HU/admin/locations/table.php
index dcf5d42b65..fc8b0d3b34 100644
--- a/resources/lang/hu-HU/admin/locations/table.php
+++ b/resources/lang/hu-HU/admin/locations/table.php
@@ -39,4 +39,5 @@ return [
     'signed_by_finance_auditor' => 'Aláírta (Pénzügyi könyvvizsgáló):',
     'signed_by_location_manager' => 'Aláírva (Helykezelő):',
     'signed_by'                 => 'Aláírta:',
+    'clone'  					=> 'Clone Location',
 ];
diff --git a/resources/lang/hu-HU/admin/models/general.php b/resources/lang/hu-HU/admin/models/general.php
index d77212773c..06dfa5fdf2 100644
--- a/resources/lang/hu-HU/admin/models/general.php
+++ b/resources/lang/hu-HU/admin/models/general.php
@@ -3,7 +3,7 @@
 return array(
     'about_models_title'     => 'Az Asset Models-ról',
     'about_models_text'           => 'Az eszköz-modellek lehetővé teszik az azonos eszközök csoportosítását. "MBP 2013", "IPhone 6s" stb.',
-    'deleted'  					        => 'Ez a modell törölve lett.',
+    'deleted'  					=> 'Ez a modell törölve lett.',
     'bulk_delete'               => 'Eszköz modellek csoportos törlése',
     'bulk_delete_help'               => 'Az alábbi jelölőnégyzetek segítségével, kérem, erősítse meg, hogy valóban törölni szeretné a kiválasztott eszköz modelleket! Azok az eszköz modellek, melyeknek vannak hozzárendelt eszközei, egészen addig nem törölhetőek, amíg ezeket az eszközöket egy másik modellhez nem rendeli.',
     'bulk_delete_warn'          => 'You are about to delete one asset model.|You are about to delete :model_count asset models.',
diff --git a/resources/lang/hu-HU/admin/models/message.php b/resources/lang/hu-HU/admin/models/message.php
index aca217097b..e474fd6d94 100644
--- a/resources/lang/hu-HU/admin/models/message.php
+++ b/resources/lang/hu-HU/admin/models/message.php
@@ -7,7 +7,7 @@ return array(
     'no_association' => 'FIGYELEM! Az eszköz modell hiányzik, vagy nem érvényes!',
     'no_association_fix' => 'Ez furcsa és szörnyű módokon fogja szétzúzni a dolgokat. Szerkeszd ezt az eszközt most, és rendeld hozzá egy modellhez.',
     'assoc_users'	 => 'Ez a modell jelenleg társított egy vagy több eszközhöz, és nem törölhető. Legyen szíves törölje az eszközt, és próbálja meg ismét a modell törlését. ',
-
+    'invalid_category_type' => 'This category must be an asset category.',
 
     'create' => array(
         'error'   => 'A model nem lett létrehozva. Próbálkozz újra.',
diff --git a/resources/lang/hu-HU/admin/reports/general.php b/resources/lang/hu-HU/admin/reports/general.php
index 359f7c6c84..8b8a7a383b 100644
--- a/resources/lang/hu-HU/admin/reports/general.php
+++ b/resources/lang/hu-HU/admin/reports/general.php
@@ -4,6 +4,7 @@ return [
     'info'   => 'Válaszon a lehetőségekből az eszköz riporthoz.',
     'deleted_user' => 'Törölt felhasználó',
     'send_reminder' => 'Emlékeztető küldése',
+    'cannot_send_reminder' => 'User has been deleted or does not have an email address so cannot receive a reminder',
     'reminder_sent' => 'Emlékeztető elküldve',
     'acceptance_deleted' => 'Törölt elfogadási kérelem',
     'acceptance_request' => 'Elfogadási kérelem',
@@ -13,5 +14,10 @@ return [
         'user_state' => 'User State',
         'user_country' => 'User Country',
         'user_zip' => 'User Zip'
-    ]
-];
\ No newline at end of file
+    ],
+    'open_saved_template' => 'Open Saved Template',
+    'save_template' =>  'Save Template',
+    'select_a_template' => 'Select a Template',
+    'template_name' => 'Template Name',
+    'update_template' => 'Update Template',
+];
diff --git a/resources/lang/hu-HU/admin/reports/message.php b/resources/lang/hu-HU/admin/reports/message.php
index 1cf848fbd7..2800bbdf0b 100644
--- a/resources/lang/hu-HU/admin/reports/message.php
+++ b/resources/lang/hu-HU/admin/reports/message.php
@@ -1,5 +1,16 @@
 <?php
 
-return array(
-    'error'   => 'Legalább egy lehetőséget kell választania.'
-);
+return [
+    'about_templates' => 'About Saved Templates',
+    'saving_templates_description' => 'Select your options, then enter the name of your template in the box above and click the \'Save Template\' button. Use the dropdown to select a previously saved template.',
+    'create'  => [
+        'success' => 'Template saved successfully',
+    ],
+    'update' => [
+        'success' => 'Template updated successfully',
+    ],
+    'delete' => [
+        'success' => 'Template deleted',
+        'no_delete_permission' => 'Template does not exist or you do not have permission to delete it.',
+    ],
+];
diff --git a/resources/lang/hu-HU/admin/settings/general.php b/resources/lang/hu-HU/admin/settings/general.php
index 4f8f778cca..7c836eae69 100644
--- a/resources/lang/hu-HU/admin/settings/general.php
+++ b/resources/lang/hu-HU/admin/settings/general.php
@@ -8,13 +8,13 @@ return [
     'ad_append_domain'          => 'Domain név hozzáadása a felhasználónév mezőhöz',
     'ad_append_domain_help'     => 'A felhasználóknak nem szükséges beírni az egész címet "username@domain.local", elég csak a felhasználónevüket "username".',
     'admin_cc_email'            => 'Email másolat',
-    'admin_cc_email_help'       => 'Ha azt szeretné, hogy a kiadáskor/visszavételkor a felhasználóknak küldött levél másolata egy másik címre is elmenjen, akkor írja be a címet ide. Ellenkező esetben hagyja szabadon a mezőt.',
+    'admin_cc_email_help'       => 'Send a copy of checkin/checkout emails to this address.',
     'admin_settings'            => 'Rendszergazdai Beállítások',
     'is_ad'				        => 'Ez egy Active Directory szerver',
     'alerts'                	=> 'Riasztások',
     'alert_title'               => 'Értesítési beállítások módosítása',
     'alert_email'				=> 'Riasztás címzettje',
-    'alert_email_help'    => 'E-mail címek vagy terjesztési listák, amelyekre figyelmeztetéseket szeretne küldeni, vesszővel elválasztva',
+    'alert_email_help'          => 'E-mail címek vagy terjesztési listák, amelyekre figyelmeztetéseket szeretne küldeni, vesszővel elválasztva.',
     'alerts_enabled'			=> 'Riasztás engedélyezve',
     'alert_interval'			=> 'A figyelmeztetések lejárata küszöbérték (napokban)',
     'alert_inv_threshold'		=> 'Leltár riasztási küszöb',
@@ -31,15 +31,18 @@ return [
     'backups'					=> 'Biztonsági mentések',
     'backups_help'              => 'Biztonsági mentések létrehozása, letöltése és visszaállítása ',
     'backups_restoring'         => 'Visszaállítás biztonsági másolatból',
+    'backups_clean' => 'Clean the backed-up database before restore',
+    'backups_clean_helptext' => "This can be useful if you're changing between database versions",
     'backups_upload'            => 'Biztonsági másolat feltöltése',
     'backups_path'              => 'A tárolt biztonsági másolatok a szerveren elérhetőek a <code>:path</code>',
-    'backups_restore_warning'   => 'Use the restore button <small><span class="btn btn-xs btn-warning"><i class="text-white fas fa-retweet" aria-hidden="true"></i></span></small> to restore from a previous backup. (This does not currently work with S3 file storage or Docker.)<br><br>Your <strong>entire :app_name database and any uploaded files will be completely replaced</strong> by what\'s in the backup file.  ',
+    'backups_restore_warning'   => 'Use the restore button <small><span class="btn btn-xs btn-warning"><i class="text-white fas fa-retweet" aria-hidden="true"></i></span></small> to restore from a previous backup. (This does not currently work with S3 file storage or Docker.)<br><br>Your <strong>entire :app_name database and any uploaded files will be completely replaced</strong> by what\'s in the backup file  ',
     'backups_logged_out'         => 'A visszaállítás befejeztével minden meglévő felhasználó, beleértve Önt is, kijelentkezik a rendszerből.',
     'backups_large'             => 'A nagyon nagyméretű biztonsági mentések a visszaállítási kísérlet során megszakadhatnak, és előfordulhat, hogy továbbra is a parancssoron keresztül kell futtatni őket. ',
     'barcode_settings'			=> 'Vonalkód beállítások',
     'confirm_purge'			    => 'Nyugtázza a tisztítást',
     'confirm_purge_help'		=> 'Írd be a "DELETE" szót a lenti dobozba ha azt szeretnéd, hogy minden adat kitörlödjön. Ez a művelet nem visszaállítható és VÉGLEGESEN töröl minden eszközt és felhasználót. (Csinálj elötte egy biztonsági mentést, biztos ami biztos.)',
     'custom_css'				=> 'Egyéni CSS',
+    'custom_css_placeholder'	=> 'Add your custom CSS',
     'custom_css_help'			=> 'Adjon meg olyan egyedi CSS felülírást, amelyet használni szeretne. Ne tüntesse fel a &lt;style&gt;&lt;/style&gt; címkéket.',
     'custom_forgot_pass_url'	=> 'Egyéni jelszó visszaállítási URL',
     'custom_forgot_pass_url_help'	=> 'Ez felváltja a beépített elfelejtett jelszó URL-jét a bejelentkezési képernyőn, amely hasznos lehet arra, hogy az embereket belső vagy hosztolt LDAP jelszó-visszaállítási funkciókra irányítsa. Hatékonyan kikapcsolja a helyi felhasználók elfelejtett jelszavát.',
@@ -47,34 +50,34 @@ return [
     'dashboard_message_help'	=> 'Ez a szöveg megjelenik a műszerfalon bárki számára, aki engedélyt kapott a vezérlőpult megtekintésére.',
     'default_currency'  		=> 'Alapértelmezett pénznem',
     'default_eula_text'			=> 'Alapértelmezett EULA',
+    'default_eula_text_placeholder' => 'Add your default EULA text',
     'default_language'			=> 'Alapértelmezett nyelv',
     'default_eula_help_text'	=> 'Egyéni EULA-kat is társíthat bizonyos eszközkategóriákhoz.',
     'acceptance_note'           => 'Add a note for your decision (Optional)',
     'display_asset_name'        => 'Eszköznév megjelenítése',
     'display_checkout_date'     => 'Megjelenik a Checkout dátum',
     'display_eol'               => 'Táblázat nézetben az EOL megjelenítése',
-    'display_qr'                => 'Kijelző négyzetek',
+    'display_qr'                => 'Display 2D barcode',
     'display_alt_barcode'		=> '1D vonalkód megjelenítése',
-    'email_logo'                => 'Email-ben szereplő logo',
     'barcode_type'				=> '2D vonalkód típusa',
     'alt_barcode_type'			=> '1D vonalkód típusa',
-    'email_logo_size'       => 'Négyzet alakú logok jobban néznek ki. ',
     'enabled'                   => 'Bekapcsolva',
     'eula_settings'				=> 'EULA beállítások',
     'eula_markdown'				=> 'Ez az EULA lehetővé teszi <a href="https://help.github.com/articles/github-flavored-markdown/">Github ízesített markdown</a>-et.',
+    'empty_row_count'           => 'Field Start Offset (Empty Rows)',
+    'empty_row_count_help'      => 'Fields will begin populating after this many empty rows are skipped at the top of the label.',
     'favicon'                   => 'Favicon',
     'favicon_format'            => 'Az elfogadott fájltípusok: ico, png és gif. A többi képformátum lehet, hogy nem működik minden böngészőben.',
     'favicon_size'          => 'A favicon egy 16x16 pixeles kép kell legyen.',
     'footer_text'               => 'További lábjegyzet szöveg ',
     'footer_text_help'          => 'Ez a szöveg a lábléc jobb oldalán fog megjelenni. Linkek használata engedélyezett <a href="https://help.github.com/articles/github-flavored-markdown/">Github flavored markdown</a> formátumban. Sortörések, fejlécek, képek, stb. okozhatnak problémákat a megjelenítés során.',
+    'footer_text_placeholder'   => 'Optional footer text',
     'general_settings'			=> 'Általános beállítások',
-    'general_settings_keywords' => 'company support, signature, acceptance, email format, username format, images, per page, thumbnail, eula, gravatar, tos, dashboard, privacy',
     'general_settings_help'     => 'Alapértelmezett EULA és egyéb',
     'generate_backup'			=> 'Háttér létrehozása',
     'google_workspaces'         => 'Google Workspaces',
     'header_color'              => 'Fejléc színe',
     'info'                      => 'Ezek a beállítások lehetővé teszik a telepítés egyes szempontjainak testreszabását.',
-    'label_logo'                => 'Címkéken szereplő logo',
     'label_logo_size'           => 'Négyzet alakú logok jobban néznek ki - ez a logo fog megjelenni minden címke jobb felső sarkában. ',
     'laravel'                   => 'Laravel verzió',
     'ldap'                      => 'LDAP',
@@ -94,7 +97,7 @@ return [
     'ldap_login_sync_help'      => 'Ez csak azt teszteli, hogy az LDAP helyesen szinkronizálható. Ha az LDAP hitelesítési lekérdezése nem megfelelő, a felhasználók még mindig nem tudnak bejelentkezni. EL KELL MENTENIE A MÓDOSÍTOTT LDAP BEÁLLÍTÁSOKAT ELŐBB.',
     'ldap_manager'              => 'LDAP-kezelő',
     'ldap_server'               => 'LDAP szerver',
-    'ldap_server_help'          => 'Ezt az ldap: // (titkosítatlan vagy TLS) vagy az ldaps:',
+    'ldap_server_help'          => 'This should start with ldap:// (for unencrypted) or ldaps:// (for TLS or SSL)',
     'ldap_server_cert'			=> 'LDAP SSL tanúsítvány érvényesítés',
     'ldap_server_cert_ignore'	=> 'Érvénytelen SSL-tanúsítvány engedélyezése',
     'ldap_server_cert_help'		=> 'Jelölje be ezt a jelölőnégyzetet, ha önállóan aláírt SSL-tanúsítványt használ, és szeretne elfogadni egy érvénytelen SSL-tanúsítványt.',
@@ -108,8 +111,8 @@ return [
     'ldap_pword'                => 'LDAP összekötő jelszó',
     'ldap_basedn'               => 'Base Bind DN',
     'ldap_filter'               => 'LDAP szűrő',
-    'ldap_pw_sync'              => 'LDAP jelszószinkronizálás',
-    'ldap_pw_sync_help'         => 'Törölje a jelölőnégyzetet, ha nem szeretné megőrizni az LDAP jelszavakat szinkronizált helyi jelszavakkal. A letiltás azt jelenti, hogy a felhasználók esetleg nem tudnak bejelentkezni, ha az LDAP-kiszolgáló valamilyen okból elérhetetlenné válik.',
+    'ldap_pw_sync'              => 'Cache LDAP Passwords',
+    'ldap_pw_sync_help'         => 'Uncheck this box if you do not wish to keep LDAP passwords cached as local hashed passwords. Disabling this means that your users may not be able to login if your LDAP server is unreachable for some reason.',
     'ldap_username_field'       => 'Felhasználónév mező',
     'ldap_lname_field'          => 'Vezetéknév',
     'ldap_fname_field'          => 'LDAP keresztnév',
@@ -117,13 +120,15 @@ return [
     'ldap_version'              => 'LDAP verzió',
     'ldap_active_flag'          => 'LDAP aktív zászló',
     'ldap_activated_flag_help'  => 'Ez az érték határozza meg, hogy a szinkronizált felhasználó be tud-e jelentkezni a Snipe-IT-be. <strong>Ez nem befolyásolja az elemek be- és kijelentését</strong>, és az AD/LDAP-ban az <strong>attribútum nevének</strong> kell lennie, <strong>nem pedig az értékének</strong>. <br><br>Ha ez a mező olyan mezőnévre van beállítva, amely nem létezik az AD/LDAP-ban, vagy az AD/LDAP-mező értéke <code>0</code> vagy <code>hamis</code>, a <strong>felhasználói bejelentkezés letiltásra kerül</strong>. Ha az AD/LDAP mező értéke <code>1</code> vagy <code>true</code>, vagy <em>bármely más szöveg</em> azt jelenti, hogy a felhasználó bejelentkezhet. Ha a mező üres az AD-ban, tiszteletben tartjuk a <code>userAccountControl</code> attribútumot, amely általában lehetővé teszi a nem felfüggesztett felhasználók számára a bejelentkezést.',
+    'ldap_invert_active_flag'   => 'LDAP Invert Active Flag',
+    'ldap_invert_active_flag_help'     => 'If enabled: when the value returned by LDAP Active Flag is <code>0</code> or <code>false</code> the user account will be active.',
     'ldap_emp_num'              => 'LDAP alkalmazott száma',
     'ldap_email'                => 'LDAP e-mail',
     'ldap_test'                 => 'LDAP tesztelése',
     'ldap_test_sync'            => 'LDAP szinkronizáció tesztelése',
     'license'                   => 'Szoftverlicenc',
-    'load_remote'               => 'Use Gravatar',
-    'load_remote_help_text'		=> 'Uncheck this box if your install cannot load scripts from the outside internet. This will prevent Snipe-IT from trying load images from Gravatar.',
+    'load_remote'               => 'Load Remote Avatars',
+    'load_remote_help_text'		=> 'Uncheck this box if your install cannot load scripts from the outside internet. This will prevent Snipe-IT from trying load avatars from Gravatar or other outside sources.',
     'login'                     => 'Bejelentkezés próbálkozások',
     'login_attempt'             => 'Bejelentkezés próbálkozás',
     'login_ip'                  => 'IP címek',
@@ -131,6 +136,7 @@ return [
     'login_user_agent'          => 'Felhasználó ügynök',
     'login_help'                => 'Bejelentkezés próbálkozások listája',
     'login_note'                => 'Bejelentkezési megjegyzés',
+    'login_note_placeholder'            => "If you do not have a login or have found a device belonging to this company, please call technical support at 888-555-1212. Thank you.",
     'login_note_help'           => 'Opcionálisan tartalmazhat néhány mondatot a bejelentkezési képernyőn, például, hogy segítse az embereket, akik elvesztett vagy ellopott eszközt találtak. Ez a mező elfogad <a href="https://help.github.com/articles/github-flavored-markdown/">Github ízesített markdown</a>-et',
     'login_remote_user_text'    => 'Távoli felhasználói bejelentkezési beállítások',
     'login_remote_user_enabled_text' => 'Bejelentkezés engedélyezése Remote User Header segítségével',
@@ -146,13 +152,16 @@ return [
     'logo_print_assets_help'    => 'Arculati elemek használata a nyomtatott eszköz listáknál ',
     'full_multiple_companies_support_help_text' => 'A vállalatoknak a vállalat eszközeihez rendelt felhasználók (köztük az adminisztrátorok) korlátozása.',
     'full_multiple_companies_support_text' => 'Teljes több vállalat támogatása',
+    'scope_locations_fmcs_support_text'  => 'Scope Locations with Full Multiple Companies Support',
+    'scope_locations_fmcs_support_help_text'  => 'Restrict locations to their selected company.',
+    'scope_locations_fmcs_check_button' => 'Check Compatibility',
+    'scope_locations_fmcs_support_disabled_text'  => 'This option is disabled because you have conflicting locations set for :count or more items.',
     'show_in_model_list'   => 'Mutassa a modellek lenyíló listájában',
     'optional'					=> 'választható',
     'per_page'                  => 'Eredmények oldalanként',
     'php'                       => 'PHP verzió',
-    'php_info'                  => 'PHP Infó',
+    'php_info'                  => 'PHP info',
     'php_overview'              => 'PHP',
-    'php_overview_keywords'     => 'phpinfo, rendszer, információ',
     'php_overview_help'         => 'PHP Rendszer információk',
     'php_gd_info'               => 'A QR-kódok megjelenítéséhez telepíteni kell a php-gd-t, lásd a telepítési utasításokat.',
     'php_gd_warning'            => 'A PHP Image Processing és a GD plugin NEM van telepítve.',
@@ -218,6 +227,8 @@ return [
     'webhook_integration_help'    => ':app integration is optional, however the endpoint and channel are required if you wish to use it. To configure :app integration, you must first <a href=":webhook_link" target="_new" rel="noopener">create an incoming webhook</a> on your :app account. Click on the <strong>Test :app Integration</strong> button to confirm your settings are correct before saving. ',
     'webhook_integration_help_button'    => 'Once you have saved your :app information, a test button will appear.',
     'webhook_test_help'           => 'Test whether your :app integration is configured correctly. YOU MUST SAVE YOUR UPDATED :app SETTINGS FIRST.',
+    'shortcuts_enabled'         => 'Enable Shortcuts',
+    'shortcuts_help_text'       => '<strong>Windows</strong>: Alt + Access key, <strong>Mac</strong>: Control + Option + Access key',
     'snipe_version'  			=> 'Snipe-IT változat',
     'support_footer'            => 'Lábjegyzet linkek támogatása ',
     'support_footer_help'       => 'Adja meg, hogy ki láthassa a Snipe-IT támogatási információ és a felhasználói kézikönyv linkjeit',
@@ -227,7 +238,6 @@ return [
     'update'                    => 'Frissítési beállítások',
     'value'                     => 'Érték',
     'brand'                     => 'Branding',
-    'brand_keywords'            => 'lábléc, logó, nyomtatás, téma, megjelenés, fejléc, színek, szín, css',
     'brand_help'                => 'Logó, oldal neve',
     'web_brand'                 => 'Weboldalon megjelenő branding típusa',
     'about_settings_title'      => 'A Beállítások részről',
@@ -276,6 +286,8 @@ return [
     'two_factor_enrollment_text'	=> "Két tényező hitelesítésre van szükség, de a készülék még nem került bejegyzésre. Nyissa meg a Google Hitelesítő alkalmazást, és szkennelje be az alábbi QR-kódot a készülék regisztrálásához. Miután beírta a készüléket, adja meg az alábbi kódot",
     'require_accept_signature'      => 'Aláírásra van szükség',
     'require_accept_signature_help_text'      => 'Ha engedélyezni szeretné ezt a funkciót, akkor a felhasználóknak fizikailag ki kell jelentkezniük egy eszköz elfogadásáról.',
+    'require_checkinout_notes'  => 'Require Notes on Checkin/Checkout',
+    'require_checkinout_notes_help_text'    => 'Enabling this feature will require the note fields to be populated when checking in or checking out an asset.',
     'left'        => 'balra',
     'right'        => 'jobb',
     'top'        => 'felső',
@@ -295,7 +307,7 @@ return [
     'oauth_authorized_apps' => 'Authorized Applications',
     'oauth_redirect_url' => 'Redirect URL',
     'oauth_name_help' => ' Something your users will recognize and trust.',
-    'oauth_scopes' => 'Scopes',
+    'oauth_scopes' => 'Hatókörök',
     'oauth_callback_url' => 'Your application authorization callback URL.',
     'create_client' => 'Create Client',
     'no_scopes' => 'No scopes',
@@ -313,24 +325,24 @@ return [
     'filter_by_keyword' => 'Szűrés beállítási kulcsszó alapján',
     'security' => 'Biztonság',
     'security_title' => 'Biztonsági beállítások frissítése',
-    'security_keywords' => 'jelszó, jelszavak, követelmények, kétfaktoros, két-faktoros, közös jelszavak, távoli bejelentkezés, kijelentkezés, hitelesítés',
     'security_help' => 'Kétfaktoros, jelszavas korlátozások',
-    'groups_keywords' => 'jogosultságok, jogosultsági csoportok, engedélyezés',
     'groups_help' => 'Fiókjogosultsági csoportok',
     'localization' => 'Lokalizáció',
     'localization_title' => 'Lokalizációs beállítások frissítése',
-    'localization_keywords' => 'lokalizáció, pénznem, helyi, lokalitás, időzóna, időzóna, nemzetközi, internatinalizáció, nyelv, nyelvek, fordítás',
     'localization_help' => 'Nyelv, dátum kijelzés',
     'notifications' => 'Értesítések',
     'notifications_help' => 'E-mail riasztások, audit beállítások',
     'asset_tags_help' => 'Inkrementálás és előtagok',
     'labels' => 'Címkék',
     'labels_title' => 'Címke beállítások frissítése',
-    'labels_help' => 'Címke méretek &amp; beállításai',
-    'purge_keywords' => 'véglegesen törölni',
+    'labels_help' => 'Barcodes &amp; label settings',
     'purge_help' => 'Törölt rekordok kitisztítása',
     'ldap_extension_warning' => 'Úgy tűnik, hogy az LDAP-bővítmény nincs telepítve vagy engedélyezve ezen a kiszolgálón. A beállításokat továbbra is elmentheti, de az LDAP-szinkronizálás vagy a bejelentkezés előtt engedélyeznie kell az LDAP-bővítményt a PHP számára.',
     'ldap_ad' => 'LDAP/AD',
+    'ldap_test_label' => 'Test LDAP Sync',
+    'ldap_test_login' => ' Test LDAP Login',
+    'ldap_username_placeholder' => 'LDAP Username',
+    'ldap_password_placeholder' => 'LDAP Password',
     'employee_number' => 'Alkalmazottak száma',
     'create_admin_user' => 'Felhasználó létrehozása ::',
     'create_admin_success' => 'Siker! Az Ön admin felhasználója hozzá lett adva!',
@@ -342,6 +354,8 @@ return [
     'setup_migration_create_user' => 'Következő: Felhasználó létrehozása',
     'ldap_settings_link' => 'LDAP beállítások oldal',
     'slack_test' => 'Teszt <i class="fab fa-slack"></i> Integráció',
+    'status_label_name' => 'Status Label Name',
+    'super_admin_only'  => 'Super Admin Only',
     'label2_enable'           => 'New Label Engine',
     'label2_enable_help'      => 'Switch to the new label engine. <b>Note: You will need to save this setting before setting others.</b>',
     'label2_template'         => 'Sablon',
@@ -356,12 +370,15 @@ return [
     'label2_2d_type'          => '2D vonalkód típus',
     'label2_2d_type_help'     => '2D vonalkód formátuma',
     'label2_2d_target'        => '2D Barcode Target',
-    'label2_2d_target_help'   => 'The URL the 2D barcode points to when scanned',
+    'label2_2d_target_help'   => 'The data that will be contained in the 2D barcode',
     'label2_fields'           => 'Mező definíciók',
     'label2_fields_help'      => 'Fields can be added, removed, and reordered in the left column. For each field, multiple options for Label and DataSource can be added, removed, and reordered in the right column.',
+    'purge_barcodes' => 'Purge Barcodes',
     'help_asterisk_bold'    => 'Text entered as <code>**text**</code> will be displayed as bold',
     'help_blank_to_use'     => 'Leave blank to use the value from <code>:setting_name</code>',
     'help_default_will_use' => '<code>:default</code> will use the value from <code>:setting_name</code>. <br>Note that the value of the barcodes must comply with the respective barcode spec in order to be successfully generated. Please see <a href="https://snipe-it.readme.io/docs/barcodes">the documentation <i class="fa fa-external-link"></i></a> for more details. ',
+    'asset_id'              => 'Asset ID',
+    'data'               => 'Data',
     'default'               => 'Alapértelmezés',
     'none'                  => 'Egyik sem',
     'google_callback_help' => 'This should be entered as the callback URL in your Google OAuth app settings in your organization&apos;s <strong><a href="https://console.cloud.google.com/" target="_blank">Google developer console <i class="fa fa-external-link" aria-hidden="true"></i></a></strong>.',
@@ -373,7 +390,100 @@ return [
     'database_driver' => 'Adatbázis Illesztő',
     'bs_table_storage' => 'Table Storage',
     'timezone' => 'Időzóna',
-    'profile_edit'          => 'Edit Profile',
+    'test_mail' => 'Test Mail',
+    'profile_edit'          => 'Profil szerkesztése',
     'profile_edit_help'          => 'Allow users to edit their own profiles.',
+    'default_avatar' => 'Custom Default Avatar',
+    'default_avatar_help' => 'This image will be displayed as a profile if a user does not have a profile photo.',
+    'restore_default_avatar' => 'Restore <a href=":default_avatar" data-toggle="lightbox" data-type="image">original system default avatar</a>',
+    'restore_default_avatar_help' => '',
+    'due_checkin_days' => 'Due For Checkin Warning',
+    'due_checkin_days_help' => 'How many days before the expected checkin of an asset should it be listed in the "Due for checkin" page?',
+    'no_groups' => 'No groups have been created yet. Visit <code>Admin Settings > Permission Groups</code> to add one.',
+    'text' => 'Text',
+
+    'username_formats' => [
+        'username_format'		=> 'Felhasználónév formátum',
+        'firstname_lastname_format'	=> 'Utónév (jane.smith)',
+        'first_name_format'	        => 'First Name (jane)',
+        'last_name_format'		=> 'Last Name (doe)',
+        'filastname_format'			=> 'First Initial Last Name (jsmith)',
+        'lastnamefirstinitial_format' =>  'Last Name First Initial (smithj)',
+        'firstname_lastname_underscore_format' => 'First Name Last Name (jane_smith)',
+        'firstinitial.lastname' => 'First Initial Last Name (j.smith)',
+        'lastname_firstinitial' => 'Last Name First Initial (smith_j)',
+        'lastname_dot_firstinitial_format' => 'Last Name First Initial (smith.j)',
+        'firstnamelastname'     => 'First Name Last Name (janesmith)',
+        'firstnamelastinitial'  => 'First Name Last Initial (janes)',
+        'lastnamefirstname'      => 'Last Name.First Name (smith.jane)',
+    ],
+
+    'email_formats' => [
+        'email_format'			=> 'E-mail formátum',
+        'firstname_lastname_format'	=> 'Utónév (jane.smith@example.com)',
+        'first_name_format'		=> 'Keresztnév (jane@example.com)',
+        'last_name_format'		=> 'Last Name (doe@example.com)',
+        'filastname_format'			=> 'Első kezdeti keresztnév (jsmith@example.com)',
+        'lastnamefirstinitial_format' =>  'Utónév Keresztnév kezdőbetű (kovacsb@example.com)',
+        'firstname_lastname_underscore_format' => 'Keresztnév Vezetéknév (jakab_gipsz@example.com)',
+        'firstinitial.lastname' => 'Keresztnév kezdőbetűje majd vezetéknév (j.smith@example.com)',
+        'lastname_firstinitial' => 'Vezetéknév majd keresztnév kezdőbetűje (smith_j@example.com)',
+        'lastname_dot_firstinitial_format' => 'Last Name First Initial (smith.j@example.com)',
+        'firstnamelastname'     => 'Keresztnév majd vezetéknév (janesmith@example.com)',
+        'firstnamelastinitial'  => 'Keresztnév majd vezetéknév kezdőbetűje (janes@example.com)',
+        'lastnamefirstname'      => 'Last Name.First Name (smith.jane@example.com)',
+    ],
+
+
+
+    'logo_labels' => [
+        'acceptance_pdf_logo'       => 'PDF Logo',
+        'email_logo'                => 'Email-ben szereplő logo',
+        'label_logo'                => 'Címkéken szereplő logo',
+        'logo'                      => 'Site Logo',
+        'favicon'                   => 'Favicon',
+    ],
+
+    'logo_help' => [
+        'email_logo_size'       => 'Négyzet alakú logok jobban néznek ki. ',
+    ],
+
+    'logo_option_types' => [
+        'text' => 'Text',
+        'logo' => 'logo',
+        'logo_and_text' => 'Logo and Text',
+    ],
+
+
+    'legends' => [
+        'scoping' => 'Scoping',
+        'formats' => 'Default Formats',
+        'profiles' => 'User Profiles',
+        'eula' => 'EULA & Acceptance Preferences',
+        'misc_display' => 'Miscellaneous Display Options',
+        'email' => 'Email Preferences',
+        'checkin' => 'Checkin Preferences',
+        'dashboard' => 'Login & Dashboard Preferences',
+        'misc' => 'Miscellaneous',
+        'logos' => 'Logos & Display',
+        'colors' => 'Colors & Skins',
+        'footer' => 'Footer Preferences',
+        'security' => 'Security Preferences',
+        'general' => 'General',
+        'intervals' => 'Intervals & Thresholds',
+    ],
+
+
+    /* Keywords for settings overview help */
+    'keywords' => [
+        'brand'             => 'lábléc, logó, nyomtatás, téma, megjelenés, fejléc, színek, szín, css',
+        'general_settings'  => 'company support, signature, acceptance, email format, username format, images, per page, thumbnail, eula, gravatar, tos, dashboard, privacy',
+        'groups'            => 'jogosultságok, jogosultsági csoportok, engedélyezés',
+        'labels'            => 'labels, barcodes, barcode, sheets, print, upc, qr, 1d, 2d',
+        'localization'      => 'lokalizáció, pénznem, helyi, lokalitás, időzóna, időzóna, nemzetközi, internatinalizáció, nyelv, nyelvek, fordítás',
+        'php_overview'      => 'phpinfo, rendszer, információ',
+        'purge'             => 'véglegesen törölni',
+        'security'          => 'jelszó, jelszavak, követelmények, kétfaktoros, két-faktoros, közös jelszavak, távoli bejelentkezés, kijelentkezés, hitelesítés',
+    ],
 
 ];
diff --git a/resources/lang/hu-HU/admin/settings/message.php b/resources/lang/hu-HU/admin/settings/message.php
index c60ffa65b6..ae50efc8d9 100644
--- a/resources/lang/hu-HU/admin/settings/message.php
+++ b/resources/lang/hu-HU/admin/settings/message.php
@@ -14,6 +14,9 @@ return [
         'restore_warning'       => 'Igen, állítsa vissza. Tudomásul veszem, hogy ez felülírja az adatbázisban jelenleg meglévő adatokat. Ez egyben az összes meglévő felhasználó (beleértve Önt is) kijelentkezik.',
         'restore_confirm'       => 'Biztos, hogy vissza szeretné állítani az adatbázisát a :filename -ből?'
     ],
+    'restore' => [
+        'success'               => 'Your system backup has been restored. Please log in again.'
+    ],
     'purge' => [
         'error'     => 'Hiba történt a tisztítás során.',
         'validation_failed'     => 'A tisztítás megerősítése helytelen. Kérjük, írja be a "DELETE" szót a megerősítő mezőbe.',
@@ -33,6 +36,9 @@ return [
         'testing_authentication' => 'LDAP-hitelesítés tesztelése...',
         'authentication_success' => 'A felhasználó sikeresen hitelesített az LDAP-nál!'
     ],
+    'labels' => [
+        'null_template' => 'Label template not found. Please select a template.',
+        ],
     'webhook' => [
         'sending' => ':app tesztüzenet küldése...',
         'success' => 'A :webhook_name integráció működik!',
@@ -42,5 +48,12 @@ return [
         'error' => 'Valami hiba történt. A Slack a következő üzenettel válaszolt: :error_message',
         'error_redirect' => 'ERROR: 301/302 :endpoint returns a redirect. For security reasons, we don’t follow redirects. Please use the actual endpoint.',
         'error_misc' => 'Valami hiba történt :( ',
-    ]
+        'webhook_fail' => ' webhook notification failed: Check to make sure the URL is still valid.',
+        'webhook_channel_not_found' => ' webhook channel not found.',
+        'ms_teams_deprecation' => 'The selected Microsoft Teams webhook URL will be deprecated Dec 31st, 2025. Please use a workflow URL. Microsoft\'s documentation on creating a workflow can be found <a href="https://support.microsoft.com/en-us/office/create-incoming-webhooks-with-workflows-for-microsoft-teams-8ae491c7-0394-4861-ba59-055e33f75498" target="_blank"> here.</a>',
+    ],
+    'location_scoping' => [
+        'not_saved' => 'Your settings were not saved.',
+        'mismatch' => 'There is 1 item in the database that need your attention before you can enable location scoping.|There are :count items in the database that need your attention before you can enable location scoping.',
+    ],
 ];
diff --git a/resources/lang/hu-HU/admin/statuslabels/table.php b/resources/lang/hu-HU/admin/statuslabels/table.php
index 7f5bc3709b..ba5730f410 100644
--- a/resources/lang/hu-HU/admin/statuslabels/table.php
+++ b/resources/lang/hu-HU/admin/statuslabels/table.php
@@ -1,14 +1,14 @@
 <?php
 
 return array(
-    'about'      	=> 'A státusz címkékről',
+    'about'      	=> 'About Status Types',
     'archived'      	=> 'Archivált',
     'create'      	=> 'Státusz címke létrehozása',
     'color'      	=> 'Grafikon színe',
     'default_label' => 'Alapértelmezett címke',
     'default_label_help' => 'Ez annak biztosítására szolgál, hogy a leggyakrabban használt állapotcímkék a kiválasztott mező tetején jelenjenek meg az eszközök létrehozásakor / szerkesztésekor.',
     'deployable'      	=> 'Telepíthető',
-    'info'      	=> 'A státusz címkék arra szolgálnak, hogy az eszközök különböző állapotát leírják. Például javítás alatt, eltűnt/ellopott, stb. Új címkéket is létre lehet hozni telepíthető, függőben levő és archivált eszközökhöz.',
+    'info'      	=> 'Status label types are used to describe the various states your assets could be in. They may be out for repair, lost/stolen, etc. You can create new status labels for your deployable, pending and archived assets according to your own workflow. For more information, <a href="https://snipe-it.readme.io/docs/overview#status-labels" target="_blank">see the documentation <i class="fa fa-external-link"></i></a>.',
     'name'      	=> 'Státusz elnevezése',
     'pending'      	=> 'Függőben',
     'status_type'   => 'Státusz típusa',
diff --git a/resources/lang/hu-HU/admin/users/general.php b/resources/lang/hu-HU/admin/users/general.php
index 6076d5ec69..79ccd9b262 100644
--- a/resources/lang/hu-HU/admin/users/general.php
+++ b/resources/lang/hu-HU/admin/users/general.php
@@ -19,6 +19,8 @@ return [
     'print_assigned'    => 'Az összes hozzárendelt nyomtatása',
     'email_assigned'    => 'A hozzárendeltek e-mail listája',
     'user_notified'     => 'A felhasználó e-mailben megkapta az aktuálisan hozzárendelt elemek listáját.',
+    'users_notified'    => 'The user has been emailed a list of their currently assigned items.|:count users have been emailed a list of their currently assigned items.',
+    'users_notified_warning' => ':count user has been emailed a list of their currently assigned items, however :no_email users did not have an email address so could not be emailed.|:count users have been emailed a list of their currently assigned items, however :no_email user(s) did not have an email address so could not be emailed.',
     'auto_assign_label' => 'Include this user when auto-assigning eligible licenses',
     'auto_assign_help'  => 'Felhasználó kihagyása a licencek automatikus hozzárendelésénél',
     'software_user'     => 'Szoftver ellenőrzése: név',
diff --git a/resources/lang/hu-HU/admin/users/message.php b/resources/lang/hu-HU/admin/users/message.php
index f11845df05..40cca5371d 100644
--- a/resources/lang/hu-HU/admin/users/message.php
+++ b/resources/lang/hu-HU/admin/users/message.php
@@ -6,7 +6,7 @@ return array(
     'declined'                  => 'Az eszközt sikeresen csökkentetted.',
     'bulk_manager_warn'	        => 'A felhasználók sikeresen frissültek, azonban a kezelői bejegyzést nem mentette el, mert a kiválasztott kezelő a szerkesztőben is szerepel a felhasználók listájában, és a felhasználók nem lehetnek saját kezelőik. Kérjük, ismét válassza ki a felhasználókat, kivéve a kezelőt.',
     'user_exists'               => 'Felhasználó már létezik!',
-    'user_not_found'            => 'Felhasználó nem létezik.',
+    'user_not_found'            => 'User does not exist or you do not have permission view them.',
     'user_login_required'       => 'A bejelentkezési mező kötelező',
     'user_has_no_assets_assigned' => 'A felhasználóhoz jelenleg nincs hozzárendelve eszköz.',
     'user_password_required'    => 'A jelszó szükséges.',
@@ -53,6 +53,7 @@ return array(
         'ldap_could_not_search' => 'Nem sikerült keresni az LDAP kiszolgálót. Ellenőrizze az LDAP kiszolgáló konfigurációját az LDAP konfigurációs fájlban. <br>Az LDAP kiszolgáló hibája:',
         'ldap_could_not_get_entries' => 'Nem sikerült bejegyzéseket szerezni az LDAP kiszolgálóról. Ellenőrizze az LDAP kiszolgáló konfigurációját az LDAP konfigurációs fájlban. <br>Az LDAP kiszolgáló hibája:',
         'password_ldap' => 'A fiókhoz tartozó jelszót az LDAP / Active Directory kezeli. Kérjük, lépjen kapcsolatba informatikai részlegével a jelszó megváltoztatásához.',
+        'multi_company_items_assigned' => 'This user has items assigned that belong to a different company. Please check them in or edit their company.'
     ),
 
     'deletefile' => array(
diff --git a/resources/lang/hu-HU/admin/users/table.php b/resources/lang/hu-HU/admin/users/table.php
index 63ebd85943..c923c6f6a5 100644
--- a/resources/lang/hu-HU/admin/users/table.php
+++ b/resources/lang/hu-HU/admin/users/table.php
@@ -22,7 +22,7 @@ return array(
     'managed_locations'     => 'Kezelt helyek',
     'managed_users'         => 'Kezelt Felhasználók',
     'name' 					=> 'Név',
-    'nogroup'               => 'No groups have been created yet. To add one, visit: ',
+    'nogroup'               => 'No groups have been created yet. To add one, visit:',
     'notes'                 => 'Megjegyzések',
     'password_confirm' 		=> 'Jelszó megerősítése',
     'password' 				=> 'Jelszó',
diff --git a/resources/lang/hu-HU/auth.php b/resources/lang/hu-HU/auth.php
index e62bea6fa5..e3702ef788 100644
--- a/resources/lang/hu-HU/auth.php
+++ b/resources/lang/hu-HU/auth.php
@@ -15,6 +15,6 @@ return array(
 
     'failed' => 'Ezek a hitelesítő adatok nem egyeznek a nyilvántartásunkkal.',
     'password' => 'A megadott jelszó helytelen.',
-    'throttle' => 'Túl sok bejelentkezési kísérlet. Kérjük, próbálkozzon újra :seconds másodperc múlva.',
+    'throttle' => 'Too many login attempts. Please try again in :minutes minute(s).',
 
 );
diff --git a/resources/lang/hu-HU/auth/message.php b/resources/lang/hu-HU/auth/message.php
index 3c72b48ecb..722130d92d 100644
--- a/resources/lang/hu-HU/auth/message.php
+++ b/resources/lang/hu-HU/auth/message.php
@@ -6,8 +6,6 @@ return array(
     'account_not_found'      => 'A felhasználónév vagy a jelszó érvénytelen.',
     'account_not_activated'  => 'Ez a felhasználó nincs aktiválva.',
     'account_suspended'      => 'Ez a felhasználói fiók fel van függesztve.',
-    'account_banned'         => 'Ez a felhasználó ki van tiltva.',
-    'throttle'               => 'Túl sok sikertelen bejelentkezési próbálkozás. Próbáld újra :minutes perc múlva.',
 
     'two_factor' => array(
         'already_enrolled'      => 'Az eszközöd már regisztrálva van.',
diff --git a/resources/lang/hu-HU/button.php b/resources/lang/hu-HU/button.php
index 2ca9a5b642..9aa355e56a 100644
--- a/resources/lang/hu-HU/button.php
+++ b/resources/lang/hu-HU/button.php
@@ -7,6 +7,7 @@ return [
     'checkin_and_delete'  	    => 'Összes visszavétele és a felhasználó törlése',
     'delete'  	                => 'Törlés',
     'edit'    	                => 'Szerkesztés',
+    'clone'    	                => 'Clone',
     'restore' 	                => 'Visszaállítás',
     'remove'                    => 'Törlés',
     'request'                   => 'Kérelem',
@@ -21,4 +22,13 @@ return [
     'add_maintenance'           => 'Karbantartás hozzáadása',
     'append'                    => 'Hozzáillesztés',
     'new'                       => 'Új',
+    'var' => [
+        'clone'     => 'Clone :item_type',
+        'edit'      => 'Edit :item_type',
+        'delete'    => 'Delete :item_type',
+        'restore'   => 'Restore :item_type',
+        'create'    => 'Create New :item_type',
+        'checkout'  => 'Checkout :item_type',
+        'checkin'   => 'Checkin :item_type',
+    ]
 ];
diff --git a/resources/lang/hu-HU/general.php b/resources/lang/hu-HU/general.php
index 83105cd7a7..89f2db4264 100644
--- a/resources/lang/hu-HU/general.php
+++ b/resources/lang/hu-HU/general.php
@@ -10,7 +10,7 @@ return [
     'action'                => 'Művelet',
     'activity_report'		=> 'Tevékenység riport',
     'address'				=> 'Cím',
-    'admin'					=> 'Admin',
+    'admin'					=> 'Rendszergazdai Beállítások',
     'admin_tooltip'			=> 'Ez a felhasználó adminisztrátor jogosultsággal rendelkezik',
     'superuser'				=> 'Superuser',
     'superuser_tooltip'		=> 'Ez a felhasználó superuser jogosultsággal rendelkezik',
@@ -23,13 +23,16 @@ return [
     'asset_models'			=> 'Eszköz modell',
     'asset_model'			=> 'Modell',
     'asset'					=> 'Eszköz',
+    'asset_previous'        => 'Asset (Previously Assigned)',
     'asset_report'          => 'Eszköz riport',
     'asset_tag'				=> 'Eszköz azonosító',
     'asset_tags'            => 'Eszköz címkék',
     'assets_available'		=> 'Elérhető eszközök',
     'accept_assets'         => 'Eszközök elfogadása :name',
     'accept_assets_menu'    => 'Eszközök elfogadása',
+    'accept_item'           => 'Accept Item',
     'audit'				    => 'Könyvvizsgálat',
+    'audits'				=> 'Audits',
     'audit_report'			=> 'Audit napló',
     'assets'				=> 'Eszközök',
     'assets_audited'        => 'eszközök auditálva',
@@ -61,9 +64,12 @@ return [
     'changepassword'  		=> 'Jelszó módosítása',
     'checkin'  				=> 'Kiadás',
     'checkin_from'  		=> 'Kiadás innen',
+    'checkin_note'  		=> 'Checkin Note',
+    'checkout_note'  		=> 'Checkout Note',
     'checkout'  			=> 'Kiadás',
     'checkouts_count'       => 'Kiadások',
     'checkins_count'        => 'Visszavétek',
+    'checkin_and_delete'  	=> 'Checkin and Delete',
     'user_requests_count'   => 'Kérelmek',
     'city'  				=> 'Város',
     'click_here'			=> 'Kattints ide',
@@ -77,7 +83,7 @@ return [
     'consumables'			=> 'Fogyóeszközök',
     'country'  				=> 'Ország',
     'could_not_restore'     => 'Error restoring :item_type: :error',
-    'not_deleted'           => 'The :item_type is not deleted so it cannot be restored',
+    'not_deleted'           => 'The :item_type was not deleted and therefore cannot be restored',
     'create'				=> 'Új létrehozása',
     'created'               => 'Elem létrehozva',
     'created_asset'			=> 'létrehozott eszköz',
@@ -86,11 +92,13 @@ return [
     'record_created' 		=> 'Rekord létrehozva',
     'updated_at' 			=> 'Frissítve:',
     'currency'  			=> 'HUF', // this is deprecated
+    'currency_text'  		=> 'Pénznem', //
     'current'  				=> 'Aktuális',
     'current_password'      => 'Jelenlegi jelszó',
     'customize_report'      => 'Jelentés testreszabása',
     'custom_report'         => 'Egyedi eszköz riport',
     'dashboard'				=> 'Irányítópult',
+    'data_source'           => 'Data Source',
     'days'      			=> 'napok',
     'days_to_next_audit'    => 'Napok a következő ellenőrzéshez',
     'date'					=> 'Dátum',
@@ -98,7 +106,7 @@ return [
     'debug_warning_text'    => 'Ez az alkalmazás gyártási módban fut, a hibakeresés engedélyezve. Ez érzékeny adatokat tárhat fel, ha az alkalmazás elérhető a külvilág számára. A hibakeresési mód letiltása a <code>APP_DEBUG</code> érték <code>.env</code> fájlban történő <code>false</code> fájlban történő beállításával.',
     'delete'  				=> 'Törlés',
     'delete_confirm'  		=> 'Biztos benne, hogy törölni akarja: :item?',
-    'delete_confirm_no_undo' => 'Biztosan törli ezt : :item? Ez a művelet nem vonható vissza.',
+    'delete_confirm_no_undo' => 'Are you sure, you wish to delete :item? This cannot be undone.',
     'deleted'  				=> 'Törölve',
     'delete_seats'  		=> 'Törölt elemek',
     'deletion_failed'       => 'A törlés nem sikerült',
@@ -114,29 +122,13 @@ return [
     'editprofile'  			=> 'Profil szerkeztése',
     'eol'					=> 'EOL',
     'email_domain'			=> 'E-mail domain',
-    'email_format'			=> 'E-mail formátum',
     'employee_number'       => 'Alkalmazott száma',
     'email_domain_help'		=> 'Ezt az e-mail címek létrehozásához használják az importálás során',
     'error'				    => 'Hiba',
     'exclude_archived'      => 'Archivált eszközök kizárása',
     'exclude_deleted'       => 'Törölt eszközök kizárása',
     'example'				=> 'Példa: ',
-    'filastname_format'			=> 'Első kezdeti keresztnév (jsmith@example.com)',
-    'firstname_lastname_format'	=> 'Utónév (jane.smith@example.com)',
-    'firstname_lastname_underscore_format' => 'Keresztnév Vezetéknév (jakab_gipsz@example.com)',
-    'lastnamefirstinitial_format' =>  'Utónév Keresztnév kezdőbetű (kovacsb@example.com)',
-    'firstintial_dot_lastname_format' => 'Keresztnév első betűje majd vezetéknév (j.smith@example.com)',
-    'firstname_lastname_display'	=> 'Keresztnév Vezetéknév (Jakab Gipsz)',
-    'lastname_firstname_display'	=> 'Vezetéknév Keresztnév (Gipsz Jakab)',
-    'name_display_format'	=> 'Megelenítendő név',
-    'first'					=> 'Első',
-    'firstnamelastname'     => 'Keresztnév majd vezetéknév (janesmith@example.com)',
-    'lastname_firstinitial' => 'Vezetéknév majd keresztnév kezdőbetűje (smith_j@example.com)',
-    'firstinitial.lastname' => 'Keresztnév kezdőbetűje majd vezetéknév (j.smith@example.com)',
-    'firstnamelastinitial'  => 'Keresztnév majd vezetéknév kezdőbetűje (janes@example.com)',
-    'lastnamefirstname'      => 'Last Name First Name (smith.jane@example.com)',
-    'first_name'			=> 'Keresztnév',
-    'first_name_format'		=> 'Keresztnév (jane@example.com)',
+
     'files'                 => 'Fájlok',
     'file_name'				=> 'Fájl',
     'file_type'             => 'Fájl típus',
@@ -156,9 +148,9 @@ return [
     'image_delete'         	=> 'Kép törlése',
     'include_deleted'       => 'Törölt eszközök bevonása',
     'image_upload'         	=> 'Kép feltöltése',
-    'filetypes_accepted_help'    => 'Az elfogadott fájltípus :types. A megengedett maximális feltöltési méret :size.|Az elfogadott fájltípusok :types. A megengedett maximális feltöltési méret :size.',
-    'filetypes_size_help'   => 'A feltölthető méret maximum :size.',
-    'image_filetypes_help'  => 'Accepted filetypes are jpg, webp, png, gif, svg, and avif. Max upload size allowed is :size.',
+    'filetypes_accepted_help'    => 'Accepted filetype is :types. The maximum size allowed is :size.|Accepted filetypes are :types. The maximum upload size allowed is :size.',
+    'filetypes_size_help'   => 'The maximum upload size allowed is :size.',
+    'image_filetypes_help'  => 'Accepted Filetypes are jpg, webp, png, gif, svg, and avif. The maximum upload size allowed is :size.',
     'unaccepted_image_type'  => 'Ez a képfájl nem beolvasható. Az elfogadott fájltípusok: jpg, webp, png, gif és svg. A fájl kódolása: :mimetype.',
     'import'         	    => 'Importálás',
     'import_this_file'      => 'Map fields and process this file',
@@ -178,12 +170,17 @@ return [
     'last'					=> 'Legutóbbi',
     'last_login'            => 'Utolsó bejelentkezés',
     'last_name'             => 'Vezetéknév',
+    'firstname_lastname_display'	=> 'Keresztnév Vezetéknév (Jakab Gipsz)',
+    'lastname_firstname_display'	=> 'Vezetéknév Keresztnév (Gipsz Jakab)',
+    'name_display_format'	=> 'Megelenítendő név',
+    'first'					=> 'Első',
+    'first_name'			=> 'Keresztnév',
     'license'				=> 'Licensz',
     'license_report'        => 'Licensz riport',
     'licenses_available'	=> 'Elérhető licenszek',
     'licenses'				=> 'Licencek',
     'list_all'				=> 'Listázd mind',
-    'loading'				=> 'Betöltés, kis türelmet....',
+    'loading'				=> 'Betöltés, kis türelmet...',
     'lock_passwords'        => 'Ez az érték nem fog elmentődni a demo telepítésekor.',
     'feature_disabled'      => 'Ez a funkció le van tiltva a demo telepítéshez.',
     'location'              => 'Helyszín',
@@ -193,7 +190,7 @@ return [
     'logout'				=> 'Kijelentkezés',
     'lookup_by_tag'     => 'Keresés az Asset Tag segítségével',
     'maintenances'          => 'Karbantartások',
-    'manage_api_keys'       => 'API kulcsok kezelése',
+    'manage_api_keys'       => 'Manage API keys',
     'manufacturer'			=> 'Gyártó',
     'manufacturers'			=> 'Gyártók',
     'markdown'				=> 'Ez a mező enged a <a href="https://help.github.com/articles/github-flavored-markdown/">Github flavored markdown-hoz</a>.',
@@ -215,6 +212,14 @@ return [
     'no_results'			=> 'Nincs találat.',
     'no'  					=> 'Nem ',
     'notes'  				=> 'Megjegyzések',
+    'note_added'            => 'Note Added',
+    'options'				=> 'Options',
+    'preview'				=> 'Preview',
+    'add_note'              => 'Add Note',
+    'note_edited'            => 'Note Edited',
+    'edit_note'              => 'Edit Note',
+    'note_deleted'            => 'Note Deleted',
+    'delete_note'              => 'Delete Note',
     'order_number'          => 'Rendelésszám',
     'only_deleted'          => 'Csak törölt eszközök',
     'page_menu'				=> '_MENU_ elemet megjelenítve',
@@ -229,7 +234,7 @@ return [
     'purchase_date'         => 'Vásárlás időpontja',
     'qty'		            => 'Mennyiség',
     'quantity'		        => 'Mennyiség',
-    'quantity_minimum'      => ':count eszközöd van a megadott minimum mennyiség közelében vagy az alatt',
+    'quantity_minimum'      => 'You have one item below or almost below minimum quantity levels|You have :count items below or almost below minimum quantity levels',
     'quickscan_checkin'  	=> 'Gyors szkennelős visszavétel',
     'quickscan_checkin_status'  	=> 'Visszavétel státusza',
     'ready_to_deploy'		=> 'Kiadásra kész',
@@ -254,7 +259,7 @@ return [
     'select_all'            => 'Összes kijelölése',
     'search'				=> 'Keresés',
     'select_category'       => 'Válasszon egy kategóriát',
-    'select_datasource' => 'Válasszon egy adatforrást',
+    'select_datasource' => 'Select a data source',
     'select_department'     => 'Válasszon osztályt',
     'select_depreciation'	=> 'Válasszon ki egy értékcsökkenési típust',
     'select_location'		=> 'Válasszon egy helyet',
@@ -274,13 +279,15 @@ return [
     'signed_off_by'         => 'Aláírta',
     'skin'       			=> 'Kinézet',
     'webhook_msg_note'        => 'Az értesítések webhookokon keresztül lesznek elküldve',
-    'webhook_test_msg'        => 'Oh szia! Úgy látszik a te :app integrálásod a Snipe-IT-val sikeres volt!',
+    'webhook_test_msg'        => 'Oh hai! It looks like your :app integration with Snipe-IT is working!',
     'some_features_disabled' => 'DEMO MODE: Néhány funkció le van tiltva a telepítéshez.',
     'site_name'				=> 'Hely neve',
     'state'  				=> 'Megye',
     'status_labels'			=> 'Státusz címkék',
+    'status_label'			=> 'Status Label',
     'status'    			=> 'Állapot',
     'accept_eula'           => 'Elfogadási megállapodás',
+    'show_or_hide_eulas' => 'Show/Hide EULAs',
     'supplier'              => 'Támogató',
     'suppliers'  			=> 'Beszállítók',
     'sure_to_delete'        => 'Biztosan törölni kíván',
@@ -296,9 +303,9 @@ return [
     'type'  				=> 'Típus',
     'undeployable'			=> 'Nem kiadható',
     'unknown_admin'			=> 'Ismeretlen Admin',
-    'username_format'		=> 'Felhasználónév formátum',
     'username'              => 'Felhasználónév',
     'update'                => 'Frissités',
+    'updating_item' => 'Updating :item',
     'upload_filetypes_help'      => 'Az engedélyezett fájltípusok: png, gif, jpg, jpeg, doc, docx, pdf, xls, xlsx, txt, lic, xml, zip, rtf és rar. A feltöltés maximum mérete :size.',
     'uploaded'              => 'Feltöltve',
     'user'					=> 'Felhasználó',
@@ -323,10 +330,10 @@ return [
     'token_expired'         => 'Az ürlap session lejárt. próbálkozz újra.',
     'login_enabled'         => 'Belépés engedélyezése',
     'audit_due'             => 'Esedékes ellenőrzés',
-    'audit_due_days'        => 'Assets Due for Audit Within :days Day|Assets Due for Audit Within :days Days',
+    'audit_due_days'        => '{}Assets Due or Overdue for Audit|[1]Assets Due or Overdue for Audit Within a Day|[2,*]Assets Due or Overdue for Audit Within :days Days',
     'checkin_due'           => 'Due for Checkin',
     'checkin_overdue'       => 'Overdue for Checkin',
-    'checkin_due_days'      => 'Assets Due for Checkin Within :days Day|Assets Due for Checkin Within :days Days',
+    'checkin_due_days'      => '{}Due for Checkin|[1]Assets Due for Checkin Within :days Day|[2,*]Assets Due for Checkin Within :days Days',
     'audit_overdue'         => 'Elévült az ellenőrzés',
     'accept'                => ':asset elfogadva',
     'i_accept'              => 'Elfogadom',
@@ -339,16 +346,16 @@ return [
     'view_all'              => 'összes megtekintése',
     'hide_deleted'          => 'Töröltek elrejtése',
     'email'                 => 'E-mail cím',
-    'do_not_change'         => 'Ne változtasd meg',
-    'bug_report'            => 'Hiba bejelentése',
+    'do_not_change'         => 'Do not change',
+    'bug_report'            => 'Report a bug',
     'user_manual'           => 'Felhasználói kézikönyv',
     'setup_step_1'          => 'Első lépés',
     'setup_step_2'          => 'Második lépés',
     'setup_step_3'          => 'Harmadik lépés',
     'setup_step_4'          => 'Negyedik lépés',
     'setup_config_check'    => 'Konfiguráció ellenőrzése',
-    'setup_create_database' => 'Adatbázistáblák létrehozása',
-    'setup_create_admin'    => 'Admin felhasználó elkészítése',
+    'setup_create_database' => 'Create database tables',
+    'setup_create_admin'    => 'Create an admin user',
     'setup_done'            => 'Kész!',
     'bulk_edit_about_to'    => 'A következőket fogja szerkeszteni: ',
     'checked_out'           => 'Kiosztva',
@@ -383,6 +390,8 @@ return [
     'new_license'           => 'Új szoftverlicenc',
     'new_accessory'         => 'Új tartozék',
     'new_consumable'        => 'Új fogyóeszköz',
+    'new_component'         => 'New Component',
+    'new_user'              => 'New User',
     'collapse'              => 'Összecsukás',
     'assigned'              => 'Hozzárendelve',
     'asset_count'           => 'Eszközök száma',
@@ -418,19 +427,20 @@ return [
     'bulk_soft_delete'      =>'Gyengéden törölje ezeket a felhasználókat is. Az eszköztörténetük érintetlen marad, kivéve, ha/amíg nem törli a törölt rekordokat a Rendszergazdai beállításokban.',
     'bulk_checkin_delete_success' => 'A kiválasztott felhasználók törlésre, és a náluk levő eszközök visszavételre kerültek.',
     'bulk_checkin_success' => 'A kiválasztott felhasználókhoz tartozó eszközök visszavételre kerültek.',
-    'set_to_null'           => 'Az eszköz értékeinek törlése|Az összes :asset_count eszköz értékeinek törlése ',
+    'set_to_null'           => 'Delete values for this selection|Delete values for all :selection_count selections ',
     'set_users_field_to_null'  => 'A felhasználó :field értékeinek törlése|Az összes :user_count felhasználó :field értékeinek törlése ',
     'na_no_purchase_date'   => 'N/A - Nincs megadva a vásárlás dátuma',
     'assets_by_status'      => 'Eszközök státusz szerint',
     'assets_by_status_type'      => 'Eszközök státustípus szerint',
     'pie_chart_type'        => 'Műszerfal tortadiagram típusa',
     'hello_name'            => 'Üdvözöllek, :name!',
-    'unaccepted_profile_warning'   => ':count darab tételed van, amelyek elfogadást igényelnek. Kattints ide az elfogadáshoz vagy az elutasításhoz',
+    'unaccepted_profile_warning'   => 'You have one item requiring acceptance. Click here to accept or decline it | You have :count items requiring acceptance. Click here to accept or decline them',
     'start_date'            => 'Kezdés dátuma',
     'end_date'            => 'Befejezés dátuma',
     'alt_uploaded_image_thumbnail' => 'Feltöltött indexkép',
     'placeholder_kit'       => 'Készlet kiválasztása',
     'file_not_found'        => 'A fájl nem található',
+    'log_record_not_found'  => 'No record for that log entry was found.',
     'preview_not_available' => '(nincs előnézet)',
     'setup'                 => 'Beállítás',
     'pre_flight'            => 'Pre-Flight',
@@ -512,7 +522,7 @@ return [
     'checked_out_to_fields' => 'Checked Out To Fields',
     'percent_complete' => '% elkészült',
     'uploading' => 'Feltöltés...',
-    'upload_error' => 'Hiba a fájl feltöltése során. Kérem, ellenőrizze, hogy nincsenek üres sorok és nincsenek oszlop fejléc nevek duplikálva.',
+    'upload_error' => 'Error uploading file. Please check that you have no empty rows or duplicated column names in your CSV, and that the server permissions allow uploads.',
     'copy_to_clipboard' => 'Másolás a vágólapra',
     'copied' => 'Másolva!',
     'status_compatibility' => 'If assets are already assigned, they cannot be changed to a non-deployable status type and this value change will be skipped.',
@@ -549,6 +559,71 @@ return [
         'license_seats'  => ':count License Seat|:count License Seats',
         'consumables'  => ':count Consumable|:count Consumables',
         'components'  => ':count Component|:count Components',
-    ]
+    ],
+
+    'more_info' => 'További információ',
+    'quickscan_bulk_help' => 'Checking this box will edit the asset record to reflect this new location. Leaving it unchecked will simply note the location in the audit log. Note that if this asset is checked out, it will not change the location of the person, asset or location it is checked out to.',
+    'whoops' => 'Whoops!',
+    'something_went_wrong' => 'Something went wrong with your request.',
+    'close' => 'Close',
+    'expires' => 'Lejárat',
+    'map_fields'=> 'Map :item_type Fields',
+    'remaining_var' => ':count Remaining',
+    'label' => 'Label',
+    'import_asset_tag_exists' => 'An asset with the asset tag :asset_tag already exists and an update was not requested. No change was made.',
+    'countries_manually_entered_help' => 'Values with an asterisk (*) were manually entered and do not match existing ISO 3166 dropdown values',
+    'accessories_assigned' => 'Assigned Accessories',
+    'user_managed_passwords' => 'Password Management',
+    'user_managed_passwords_disallow' => 'Disallow users from managing their own passwords',
+    'user_managed_passwords_allow' => 'Allow users to manage their own passwords',
+    'from' => 'From',
+    'by' => 'Által',
+
+// Add form placeholders here
+    'placeholders' => [
+        'notes'  => 'Add a note',
+    ],
+
+    'breadcrumb_button_actions' => [
+        'edit_item' => 'Edit :name',
+        'checkout_item' => 'Checkout :name',
+        'checkin_item' => 'Checkin :name',
+    ],
+
+    'skins' => [
+        'site_default' => 'Site Default',
+        'default_blue' => 'Default Blue',
+        'blue_dark' => 'Blue (Dark Mode)',
+        'green' => 'Green Dark',
+        'green_dark' => 'Green (Dark Mode)',
+        'red' => 'Red Dark',
+        'red_dark' => 'Red (Dark Mode)',
+        'orange' => 'Orange Dark',
+        'orange_dark' => 'Orange (Dark Mode)',
+        'black' => 'Black',
+        'black_dark' => 'Black (Dark Mode)',
+        'purple' => 'Purple',
+        'purple_dark' => 'Purple (Dark Mode)',
+        'yellow' => 'Yellow',
+        'yellow_dark' => 'Yellow (Dark Mode)',
+        'high_contrast' => 'High Contrast',
+
+    ],
+
+    'select_all_none' => 'Select/Unselect All',
+    'generic_model_not_found' => 'That :model was not found or you do not have permission to access it',
+    'deleted_models' => 'Deleted Asset Models',
+    'deleted_users' => 'Deleted Users',
+    'cost_each' => ':amount each',
+    'remove_current_image' => 'Remove current :type image',
+
+    'seeding' => [
+        'manufacturers' => [
+            'button' => 'Create Manufacturers',
+            'prompt' => 'You do not have any manufacturers yet. Would you like to seed a list of common manufacturers? (THIS WILL OVERWRITE EXISTING MANUFACTURERS, including those that have been soft-deleted.)',
+            'success' => 'Manufacturers seeded successfully',
+            'error' => 'Could not seed manufacturers. A manufacturer record already exists and seeding would overwrite it.|Could not seed manufacturers. :count manufacturer records already exist and seeding would overwrite them.',
+        ],
+    ],
 
 ];
diff --git a/resources/lang/hu-HU/localizations.php b/resources/lang/hu-HU/localizations.php
index e70829c9c6..a94e62deba 100644
--- a/resources/lang/hu-HU/localizations.php
+++ b/resources/lang/hu-HU/localizations.php
@@ -2,7 +2,7 @@
 
 return [
 
-    'select_language' => 'Válasszon ki egy nyelvet',
+    'select_language' => 'Select a Language',
     'languages' => [
         'en-US'=> 'Angol, Amerikai Egyesült Államok',
         'en-GB'=> 'Angol, Egyesült Királyság',
@@ -40,7 +40,9 @@ return [
         'ms-MY'=> 'Maláj',
         'mi-NZ'=> 'Maori',
         'mn-MN'=> 'Mongol',
-        'no-NO'=> 'Norvég',
+        'nb-NO'=> 'Norwegian Bokmål',
+        'om-ET' => 'Oromo (Ethiopian)',
+        //'nn-NO'=> 'Norwegian Nynorsk',
         'fa-IR'=> 'Perzsa',
         'pl-PL'=> 'Lengyel',
         'pt-PT'=> 'Portugál',
@@ -66,7 +68,7 @@ return [
         'zu-ZA'=> 'Zulu',
     ],
 
-    'select_country' => 'Válasszon ki egy országot',
+    'select_country' => 'Select a Country',
     
     'countries' => [
         'AC'=>'Ascension-sziget',
@@ -133,6 +135,7 @@ return [
         'EC'=>'Ecuadori Köztársaság',
         'EE'=>'Észtország',
         'EG'=>'Egyiptom',
+        'GB-ENG'=>'England',
         'ER'=>'Eritrea',
         'ES'=>'Spanyolország',
         'ET'=>'Etiópia',
@@ -231,6 +234,7 @@ return [
         'NG'=>'Nigéria',
         'NI'=>'Nicaraguai Köztársaság',
         'NL'=>'Hollandia',
+        'GB-NIR' => 'Northern Ireland',
         'NO'=>'Norvégia',
         'NP'=>'Nepál',
         'NR'=>'Naurui Köztársaság',
@@ -258,7 +262,7 @@ return [
         'RU'=>'Oroszország',
         'RW'=>'Ruandai Köztársaság',
         'SA'=>'Szaúd-Arábia',
-        'UK'=>'Skócia',
+        'GB-SCT'=>'Skócia',
         'SB'=>'Salamon-szigetek',
         'SC'=>'Seychelle Köztársaság',
         'SS'=>'Dél-Szudán',
@@ -310,6 +314,7 @@ return [
         'VI'=>'Amerikai Virgin-szigetek',
         'VN'=>'Vietnám',
         'VU'=>'Vanuatu',
+        'GB-WLS' =>'Wales',
         'WF'=>'Wallis-és Futuna-szigetek',
         'WS'=>'Szamoa',
         'YE'=>'Jemeni Köztársaság',
diff --git a/resources/lang/hu-HU/mail.php b/resources/lang/hu-HU/mail.php
index c93ae6688a..d08cc2f046 100644
--- a/resources/lang/hu-HU/mail.php
+++ b/resources/lang/hu-HU/mail.php
@@ -3,7 +3,7 @@
 return [
 
     'Accessory_Checkin_Notification' => 'Tartozék kiadva',
-    'Accessory_Checkout_Notification' => 'Accessory checked out',
+    'Accessory_Checkout_Notification' => 'Tartozék kiadva',
     'Asset_Checkin_Notification' => 'Eszköz kiadva',
     'Asset_Checkout_Notification' => 'Eszköz kiadva',
     'Confirm_Accessory_Checkin' => 'Tartozék visszavételének megerősítése',
@@ -23,53 +23,57 @@ return [
     'Item_Requested' => 'Kért elem',
     'License_Checkin_Notification' => 'Licensz kiadva',
     'License_Checkout_Notification' => 'License checked out',
+    'license_for'   => 'License for',
     'Low_Inventory_Report' => 'Alacsony készletjelentés',
     'a_user_canceled' => 'A felhasználó törölte az elemkérést a webhelyen',
     'a_user_requested' => 'A felhasználó egy elemet kért a webhelyen',
     'acceptance_asset_accepted' => 'A felhasználó elfogadott egy tételt',
     'acceptance_asset_declined' => 'A felhasználó visszautasított egy tételt',
-    'accessory_name' => 'Tartozéknév:',
-    'additional_notes' => 'További megjegyzések:',
+    'accessory_name' => 'Tartozék neve',
+    'additional_notes' => 'További megjegyzések',
     'admin_has_created' => 'A rendszergazda létrehozott egy fiókot az alábbi weboldalon:',
-    'asset' => 'Eszköz:',
-    'asset_name' => 'Eszköz neve:',
+    'asset' => 'Eszköz',
+    'asset_name' => 'Eszköz neve',
     'asset_requested' => 'Asset requested',
     'asset_tag' => 'Eszköz azonosító',
     'assets_warrantee_alert' => ':count darab eszköznél a jótállás :threshold napon belül lejár.|:count darab eszköznél a jótállások :threshold napon belül lejárnak.',
     'assigned_to' => 'Hozzárendelve',
     'best_regards' => 'Üdvözlettel,',
-    'canceled' => 'Megszakítva:',
-    'checkin_date' => 'Visszavétel dátuma:',
-    'checkout_date' => 'Kiadási dátum:',
-    'checkedout_from' => 'Checked out from',
-    'checkedin_from'  => 'Checked in from',
+    'canceled' => 'Megszakítva',
+    'checkin_date' => 'Visszavétel dátuma',
+    'checkout_date' => 'Kiadási dátum',
+    'checkedout_from' => 'Kiadva innen',
+    'checkedin_from'  => 'Visszavéve innen',
     'checked_into' => 'Checked into',
     'click_on_the_link_accessory' => 'Az alján lévő linkre kattintva ellenőrizheti, hogy megkapta-e a tartozékot.',
     'click_on_the_link_asset' => 'Kérjük, kattintson az alul lévő linkre annak megerősítéséhez, hogy megkapták az eszközt.',
     'click_to_confirm' => 'Kérjük, kattintson az alábbi linkre a weboldal megerősítéséhez: web account:',
     'current_QTY' => 'Jelenlegi QTY',
     'days' => 'Nap',
-    'expecting_checkin_date' => 'Várható visszaadás dátuma:',
+    'expecting_checkin_date' => 'Várható visszaadás dátuma',
     'expires' => 'Lejárat',
     'hello' => 'Helló',
     'hi' => 'Üdv',
     'i_have_read' => 'Elolvastam és elfogadom a felhasználási feltételeket, és megkaptuk ezt az elemet.',
     'inventory_report' => 'Készlet Jelentés',
-    'item' => 'Tétel:',
+    'item' => 'Tétel',
+    'item_checked_reminder' => 'Ez egy emlékeztető arról, hogy jelenleg :count számú jóváhagyásra váró eszköze van. Kérem, az alábbi linken döntsön ezek elfogadásáról, vagy elutasításáról.',
     'license_expiring_alert' => ':count licensz lejár :thershold nap múlva.|:count licensz lejár :thershold nap múlva.',
     'link_to_update_password' => 'Kérjük, kattintson a következő linkre a frissítéshez: webes jelszó:',
-    'login' => 'Belépés:',
+    'login' => 'Belépés',
     'login_first_admin' => 'Jelentkezzen be az új Snipe-IT telepítésébe az alábbi hitelesítő adatok alapján:',
     'low_inventory_alert' => ':count darab tétel érhető el, ami kevesebb mint a minimum készlet vagy hamarosan kevesebb lesz.',
     'min_QTY' => 'Min QTY',
     'name' => 'Név',
     'new_item_checked' => 'Egy új elemet az Ön neve alatt ellenőriztek, a részletek lent találhatók.',
+    'new_item_checked_with_acceptance' => 'A new item has been checked out under your name that requires acceptance, details are below.',
+    'recent_item_checked' => 'An item was recently checked out under your name that requires acceptance, details are below.',
     'notes' => 'Jegyzetek',
-    'password' => 'Jelszó:',
+    'password' => 'Jelszó',
     'password_reset' => 'Jelszó visszaállítása',
     'read_the_terms' => 'Kérjük, olvassa el az alábbi használati feltételeket.',
-    'read_the_terms_and_click' => 'Please read the terms of use below, and click on the link at the bottom to confirm that you read and agree to the terms of use, and have received the asset.',
-    'requested' => 'Kérve:',
+    'read_the_terms_and_click' => 'Kérjük, a használati feltételek elolvasása után az alábbi linken erősítse meg annak elfogadását, és az eszköz átvételét.',
+    'requested' => 'Kérve',
     'reset_link' => 'Jelszó visszaállítása linkre',
     'reset_password' => 'Kattintson ide a jelszó visszaállításához:',
     'rights_reserved' => 'Minden jog fenntartva.',
@@ -86,8 +90,10 @@ return [
     'upcoming-audits' => 'Várhatóan :count eszközt kell ellenőrízni a következő :threshold napon belül.|Várhatóan :count eszközt kell ellenőrízni a következő :threshold napon belül.',
     'user' => 'Felhasználó',
     'username' => 'Felhasználónév',
+    'unaccepted_asset_reminder' => 'Reminder: You have Unaccepted Assets.',
     'welcome' => 'Üdvözöljük: név',
     'welcome_to' => 'Üdvözöljük a weboldalon!',
     'your_assets' => 'Eszközeidnek megtekíntése',
     'your_credentials' => 'A Snipe-IT hitelesítő adatai',
+    'mail_sent' => 'E-mail sikeresen elküldve!',
 ];
diff --git a/resources/lang/hu-HU/validation.php b/resources/lang/hu-HU/validation.php
index 72fe9af32c..3244a47bad 100644
--- a/resources/lang/hu-HU/validation.php
+++ b/resources/lang/hu-HU/validation.php
@@ -13,87 +13,150 @@ return [
     |
     */
 
-    'accepted'             => 'A :attribute el kell fogadni.',
-    'active_url'           => 'A :attribute nem valós URL.',
-    'after'                => 'Az :attribute ezután a dátum után kell, hogy legyen :date.',
-    'after_or_equal'       => 'A: attribútumnak dátumnak kell lennie, vagy egyenlőnek kell lennie: dátummal.',
-    'alpha'                => 'A :attribute csak betűket tartalmazhat.',
-    'alpha_dash'           => 'A :attribute csak betűket, számokat és perjelet tartalmazhat.',
-    'alpha_num'            => 'A :attribute csak betűket, számokat tartalmazhat.',
-    'array'                => 'A: attribútumnak tömbnek kell lennie.',
-    'before'               => 'A :attribute csak :date elötti dátum lehet.',
-    'before_or_equal'      => 'A: attribútumnak dátumnak kell lennie, vagy egyenlőnek kell lennie: dátummal.',
-    'between'              => [
-        'numeric' => 'A :attribute az érték között kell lennie :min -:max.',
-        'file'    => 'A :attribute :min - :max kilobájt között kell lenni.',
-        'string'  => 'A :attribute :min - :max karakter között kell lenni.',
-        'array'   => 'A: attribútumnak rendelkeznie kell: min és max elem között.',
+    'accepted' => 'The :attribute field must be accepted.',
+    'accepted_if' => 'The :attribute field must be accepted when :other is :value.',
+    'active_url' => 'The :attribute field must be a valid URL.',
+    'after' => 'The :attribute field must be a date after :date.',
+    'after_or_equal' => 'The :attribute field must be a date after or equal to :date.',
+    'alpha' => 'The :attribute field must only contain letters.',
+    'alpha_dash' => 'The :attribute field must only contain letters, numbers, dashes, and underscores.',
+    'alpha_num' => 'The :attribute field must only contain letters and numbers.',
+    'array' => 'The :attribute field must be an array.',
+    'ascii' => 'The :attribute field must only contain single-byte alphanumeric characters and symbols.',
+    'before' => 'The :attribute field must be a date before :date.',
+    'before_or_equal' => 'The :attribute field must be a date before or equal to :date.',
+    'between' => [
+        'array' => 'The :attribute field must have between :min and :max items.',
+        'file' => 'The :attribute field must be between :min and :max kilobytes.',
+        'numeric' => 'The :attribute field must be between :min and :max.',
+        'string' => 'The :attribute field must be between :min and :max characters.',
     ],
-    'boolean'              => 'Az attribútumnak igaznak, vagy hamisnak kell lennie (true/false).',
-    'confirmed'            => 'A :attribute ellenörzés nem egyezik.',
-    'date'                 => 'A :attribute nem egy valós dátum.',
-    'date_format'          => 'A :attribute nem egyezik a formátummal :format.',
-    'different'            => 'A :attribute és :other különböznie kell.',
-    'digits'               => 'A :attribute :digits számjegynek kell lenni.',
-    'digits_between'       => 'A :attribute :min - :max számjegy között kell lenni.',
-    'dimensions'           => 'A: attribútum érvénytelen képmérettel rendelkezik.',
-    'distinct'             => 'A: attribútum mező duplikált értéket tartalmaz.',
-    'email'                => 'Az :attribute formátuma érvénytelen.',
-    'exists'               => 'A kiválasztott :attribute étvénytelen.',
-    'file'                 => 'A: attribútumnak fájlnak kell lennie.',
-    'filled'               => 'A: attribútum mezőnek értéket kell tartalmaznia.',
-    'image'                => 'A :attribute képnek kell lenni.',
+    'boolean' => 'The :attribute field must be true or false.',
+    'can' => 'The :attribute field contains an unauthorized value.',
+    'confirmed' => 'The :attribute field confirmation does not match.',
+    'contains' => 'The :attribute field is missing a required value.',
+    'current_password' => 'The password is incorrect.',
+    'date' => 'The :attribute field must be a valid date.',
+    'date_equals' => 'The :attribute field must be a date equal to :date.',
+    'date_format' => 'The :attribute field must match the format :format.',
+    'decimal' => 'The :attribute field must have :decimal decimal places.',
+    'declined' => 'The :attribute field must be declined.',
+    'declined_if' => 'The :attribute field must be declined when :other is :value.',
+    'different' => 'The :attribute field and :other must be different.',
+    'digits' => 'The :attribute field must be :digits digits.',
+    'digits_between' => 'The :attribute field must be between :min and :max digits.',
+    'dimensions' => 'The :attribute field has invalid image dimensions.',
+    'distinct' => 'A: attribútum mező duplikált értéket tartalmaz.',
+    'doesnt_end_with' => 'The :attribute field must not end with one of the following: :values.',
+    'doesnt_start_with' => 'The :attribute field must not start with one of the following: :values.',
+    'email' => 'The :attribute field must be a valid email address.',
+    'ends_with' => 'The :attribute field must end with one of the following: :values.',
+    'enum' => 'A kiválasztott :attribute étvénytelen.',
+    'exists' => 'A kiválasztott :attribute étvénytelen.',
+    'extensions' => 'The :attribute field must have one of the following extensions: :values.',
+    'file' => 'The :attribute field must be a file.',
+    'filled' => 'A: attribútum mezőnek értéket kell tartalmaznia.',
+    'gt' => [
+        'array' => 'The :attribute field must have more than :value items.',
+        'file' => 'The :attribute field must be greater than :value kilobytes.',
+        'numeric' => 'The :attribute field must be greater than :value.',
+        'string' => 'The :attribute field must be greater than :value characters.',
+    ],
+    'gte' => [
+        'array' => 'The :attribute field must have :value items or more.',
+        'file' => 'The :attribute field must be greater than or equal to :value kilobytes.',
+        'numeric' => 'The :attribute field must be greater than or equal to :value.',
+        'string' => 'The :attribute field must be greater than or equal to :value characters.',
+    ],
+    'hex_color' => 'The :attribute field must be a valid hexadecimal color.',
+    'image' => 'The :attribute field must be an image.',
     'import_field_empty'    => 'A :fieldname mező értéke nem lehet üres.',
-    'in'                   => 'A kiválasztott :attribute étvénytelen.',
-    'in_array'             => 'A: attribútum mező nem létezik: más.',
-    'integer'              => 'A :attribute számnak kell lennie.',
-    'ip'                   => 'A :attribute érvényes IP címnek kell lenni.',
-    'ipv4'                 => 'A: attribútumnak érvényes IPv4-címnek kell lennie.',
-    'ipv6'                 => 'A: attribútumnak érvényes IPv6-címnek kell lennie.',
-    'is_unique_department' => ':attribute egyedi kell, hogy legyen ehhez a helyhez',
-    'json'                 => 'A: attribútumnak érvényes JSON-karakterláncnak kell lennie.',
-    'max'                  => [
-        'numeric' => 'A :attribute nem lehet nagyobb, mint :max.',
-        'file'    => 'A :attribute nem lehet nagyobb, mint :max kilobájt.',
-        'string'  => 'A :attribute nem lehet nagyobb, mint :max karakter.',
-        'array'   => 'A: attribútumnak nem lehet több: max eleme.',
+    'in' => 'A kiválasztott :attribute étvénytelen.',
+    'in_array' => 'The :attribute field must exist in :other.',
+    'integer' => 'The :attribute field must be an integer.',
+    'ip' => 'The :attribute field must be a valid IP address.',
+    'ipv4' => 'The :attribute field must be a valid IPv4 address.',
+    'ipv6' => 'The :attribute field must be a valid IPv6 address.',
+    'json' => 'The :attribute field must be a valid JSON string.',
+    'list' => 'The :attribute field must be a list.',
+    'lowercase' => 'The :attribute field must be lowercase.',
+    'lt' => [
+        'array' => 'The :attribute field must have less than :value items.',
+        'file' => 'The :attribute field must be less than :value kilobytes.',
+        'numeric' => 'The :attribute field must be less than :value.',
+        'string' => 'The :attribute field must be less than :value characters.',
     ],
-    'mimes'                => 'A :attribute ilyen fájl típusnak kell lennie: :values.',
-    'mimetypes'            => 'A: attribútumnak a következő típusú fájlnak kell lennie:: values.',
-    'min'                  => [
-        'numeric' => 'A :attribute legalább :min kell lenni.',
-        'file'    => 'A :attribute legalább :min kilobájt kell lenni.',
-        'string'  => 'A :attribute legalább :min karakter kell lenni.',
-        'array'   => 'A: attribútumnak rendelkeznie kell legalább: min elemekkel.',
+    'lte' => [
+        'array' => 'The :attribute field must not have more than :value items.',
+        'file' => 'The :attribute field must be less than or equal to :value kilobytes.',
+        'numeric' => 'The :attribute field must be less than or equal to :value.',
+        'string' => 'The :attribute field must be less than or equal to :value characters.',
     ],
-    'starts_with'          => 'A(z) :attribute a következővel kell kezdődnie: :values.',
-    'ends_with'            => 'A(z) :attribute a következővel kell végződjön: :values.',
+    'mac_address' => 'The :attribute field must be a valid MAC address.',
+    'max' => [
+        'array' => 'The :attribute field must not have more than :max items.',
+        'file' => 'The :attribute field must not be greater than :max kilobytes.',
+        'numeric' => 'The :attribute field must not be greater than :max.',
+        'string' => 'The :attribute field must not be greater than :max characters.',
+    ],
+    'max_digits' => 'The :attribute field must not have more than :max digits.',
+    'mimes' => 'The :attribute field must be a file of type: :values.',
+    'mimetypes' => 'The :attribute field must be a file of type: :values.',
+    'min' => [
+        'array' => 'The :attribute field must have at least :min items.',
+        'file' => 'The :attribute field must be at least :min kilobytes.',
+        'numeric' => 'The :attribute field must be at least :min.',
+        'string' => 'The :attribute field must be at least :min characters.',
+    ],
+    'min_digits' => 'The :attribute field must have at least :min digits.',
+    'missing' => 'The :attribute field must be missing.',
+    'missing_if' => 'The :attribute field must be missing when :other is :value.',
+    'missing_unless' => 'The :attribute field must be missing unless :other is :value.',
+    'missing_with' => 'The :attribute field must be missing when :values is present.',
+    'missing_with_all' => 'The :attribute field must be missing when :values are present.',
+    'multiple_of' => 'The :attribute field must be a multiple of :value.',
+    'not_in' => 'A kiválasztott :attribute étvénytelen.',
+    'not_regex' => 'The :attribute field format is invalid.',
+    'numeric' => 'The :attribute field must be a number.',
+    'password' => [
+        'letters' => 'The :attribute field must contain at least one letter.',
+        'mixed' => 'The :attribute field must contain at least one uppercase and one lowercase letter.',
+        'numbers' => 'The :attribute field must contain at least one number.',
+        'symbols' => 'The :attribute field must contain at least one symbol.',
+        'uncompromised' => 'The given :attribute has appeared in a data leak. Please choose a different :attribute.',
+    ],
+    'percent'       => 'The depreciation minimum must be between 0 and 100 when depreciation type is percentage.',
 
-    'not_in'               => 'A kiválasztott :attribute étvénytelen.',
-    'numeric'              => 'A :attribute csak szám lehet.',
-    'present'              => 'A: attribútum mezőnek jelen kell lennie.',
-    'valid_regex'          => 'Ez nem érvényes regex kifejezés. ',
-    'regex'                => 'Az :attribute formátuma érvénytelen.',
-    'required'             => 'A :attribute mező kötelező.',
-    'required_if'          => 'A :attribute mező kötelező ha :other egy :value.',
-    'required_unless'      => 'A: attribútummezőt csak akkor kell megadni, ha: az egyéb értéke: értéke.',
-    'required_with'        => 'A :attribute mező kötelező ha :value jelen van.',
-    'required_with_all'    => 'A: attribútum mező akkor szükséges, ha: értékek vannak jelen.',
-    'required_without'     => 'A :attribute mező kötelező ha :value nincs jelen.',
+    'present' => 'A: attribútum mezőnek jelen kell lennie.',
+    'present_if' => 'The :attribute field must be present when :other is :value.',
+    'present_unless' => 'The :attribute field must be present unless :other is :value.',
+    'present_with' => 'The :attribute field must be present when :values is present.',
+    'present_with_all' => 'The :attribute field must be present when :values are present.',
+    'prohibited' => 'The :attribute field is prohibited.',
+    'prohibited_if' => 'The :attribute field is prohibited when :other is :value.',
+    'prohibited_unless' => 'The :attribute field is prohibited unless :other is in :values.',
+    'prohibits' => 'The :attribute field prohibits :other from being present.',
+    'regex' => 'The :attribute field format is invalid.',
+    'required' => 'A :attribute mező kötelező.',
+    'required_array_keys' => 'The :attribute field must contain entries for: :values.',
+    'required_if' => 'A :attribute mező kötelező ha :other egy :value.',
+    'required_if_accepted' => 'The :attribute field is required when :other is accepted.',
+    'required_if_declined' => 'The :attribute field is required when :other is declined.',
+    'required_unless' => 'A: attribútummezőt csak akkor kell megadni, ha: az egyéb értéke: értéke.',
+    'required_with' => 'A :attribute mező kötelező ha :value jelen van.',
+    'required_with_all' => 'The :attribute field is required when :values are present.',
+    'required_without' => 'A :attribute mező kötelező ha :value nincs jelen.',
     'required_without_all' => 'A: attribútummező akkor szükséges, ha egyik sem: értéke nincs.',
-    'same'                 => 'A :attribute és :other egyeznie kell.',
-    'size'                 => [
-        'numeric' => 'A :attribute kötelező mérete :size.',
-        'file'    => 'A :attribute kötelező mérete :size kilobájt.',
-        'string'  => 'A :attribute kötelező mérete :size karakter.',
-        'array'   => 'A: attribútumnak tartalmaznia kell: méretű elemeket.',
+    'same' => 'The :attribute field must match :other.',
+    'size' => [
+        'array' => 'The :attribute field must contain :size items.',
+        'file' => 'The :attribute field must be :size kilobytes.',
+        'numeric' => 'The :attribute field must be :size.',
+        'string' => 'The :attribute field must be :size characters.',
     ],
+    'starts_with' => 'The :attribute field must start with one of the following: :values.',
     'string'               => 'A: attribútumnak stringnek kell lennie.',
-    'timezone'             => 'A: attribútumnak érvényes zónának kell lennie.',
     'two_column_unique_undeleted' => 'The :attribute must be unique across :table1 and :table2. ',
-    'unique'               => 'A :attribute már foglalt.',
-    'uploaded'             => 'A: attribútum nem sikerült feltölteni.',
-    'url'                  => 'Az :attribute formátuma érvénytelen.',
     'unique_undeleted'     => 'A(z) :attribute egyedinek kell lennie.',
     'non_circular'         => 'A(z) :attribute nem hozhat létre körkörös hivatkozást.',
     'not_array'            => ':attribute cannot be an array.',
@@ -102,11 +165,14 @@ return [
     'numbers'              => 'A jelszónak tartalmaznia kell legalább egy számot.',
     'case_diff'            => 'A jelszónak tartalmaznia kell kis- és nagybetűket.',
     'symbols'              => 'A jelszónak tartalmaznia kell legalább egy szimbólumot.',
-    'gte'                  => [
-        'numeric'          => 'Az érték nem lehet negatív'
-    ],
-    'checkboxes'           => ':attribute contains invalid options.',
-    'radio_buttons'        => ':attribute is invalid.',
+    'timezone' => 'The :attribute field must be a valid timezone.',
+    'unique' => 'A :attribute már foglalt.',
+    'uploaded' => 'A: attribútum nem sikerült feltölteni.',
+    'uppercase' => 'The :attribute field must be uppercase.',
+    'url' => 'The :attribute field must be a valid URL.',
+    'ulid' => 'The :attribute field must be a valid ULID.',
+    'uuid' => 'The :attribute field must be a valid UUID.',
+    'fmcs_location' => 'Full multiple company support and location scoping is enabled in the Admin Settings, and the selected location and selected company are not compatible.',
 
 
     /*
@@ -120,16 +186,22 @@ return [
     |
     */
 
+    'email_array'      => 'Egy vagy több email cím érvénytelen.',
+    'checkboxes'           => ':attribute contains invalid options.',
+    'radio_buttons'        => ':attribute is invalid.',
+    
     'custom' => [
         'alpha_space' => 'A: attribútum mező olyan karaktert tartalmaz, amely nem megengedett.',
-        'email_array'      => 'Egy vagy több e-mail cím érvénytelen.',
+
         'hashed_pass'      => 'A jelenlegi jelszava helytelen',
         'dumbpwd'          => 'Ez a jelszó túl gyakori.',
         'statuslabel_type' => 'Meg kell határoznia egy érvényes állapotcímke típust',
+        'custom_field_not_found'          => 'This field does not seem to exist, please double check your custom field names.',
+        'custom_field_not_found_on_model' => 'This field seems to exist, but is not available on this Asset Model\'s fieldset.',
 
         // date_format validation with slightly less stupid messages. It duplicates a lot, but it gets the job done :(
-        // We use this because the default error message for date_format is reflects php Y-m-d, which non-PHP
-        // people won't know how to format. 
+        // We use this because the default error message for date_format reflects php Y-m-d, which non-PHP
+        // people won't know how to format.
         'purchase_date.date_format'     => ':attribute mező értékének érvényes dátumnak kell lennie YYYY-MM-DD formátumban',
         'last_audit_date.date_format'   =>  ':attribute mező értékének érvényes dátumnak kell lennie YYYY-MM-DD hh:mm:ss formátumban',
         'expiration_date.date_format'   =>  ':attribute mező értékének érvényes dátumnak kell lennie YYYY-MM-DD formátumban',
@@ -137,9 +209,15 @@ return [
         'expected_checkin.date_format'  =>  ':attribute mező értékének érvényes dátumnak kell lennie YYYY-MM-DD formátumban',
         'start_date.date_format'        =>  ':attribute mező értékének érvényes dátumnak kell lennie YYYY-MM-DD formátumban',
         'end_date.date_format'          =>  ':attribute mező értékének érvényes dátumnak kell lennie YYYY-MM-DD formátumban',
+        'invalid_value_in_field' => 'Invalid value included in this field',
 
-    ],
+        'ldap_username_field' => [
+            'not_in' =>         '<code>sAMAccountName</code> (mixed case) will likely not work. You should use <code>samaccountname</code> (lowercase) instead.'
+        ],
+        'ldap_auth_filter_query' => ['not_in' => '<code>uid=samaccountname</code> is probably not a valid auth filter. You probably want <code>uid=</code> '],
+        'ldap_filter' => ['regex' => 'This value should probably not be wrapped in parentheses.'],
 
+        ],
     /*
     |--------------------------------------------------------------------------
     | Custom Validation Attributes
@@ -155,8 +233,16 @@ return [
 
     /*
     |--------------------------------------------------------------------------
-    | Generic Validation Messages
+    | Generic Validation Messages - we use these in the jquery validation where we don't have
+    | access to the :attribute
     |--------------------------------------------------------------------------
     */
-    'invalid_value_in_field' => 'Invalid value included in this field',
+
+    'generic' => [
+        'invalid_value_in_field' => 'Invalid value included in this field',
+        'required' => 'This field is required',
+        'email' => 'Please enter a valid email address',
+    ],
+
+
 ];
diff --git a/resources/lang/id-ID/account/general.php b/resources/lang/id-ID/account/general.php
index 671dd7f29d..6dee46eeee 100644
--- a/resources/lang/id-ID/account/general.php
+++ b/resources/lang/id-ID/account/general.php
@@ -2,10 +2,16 @@
 
 return array(
     'personal_api_keys' => 'Kunci API Pribadi',
-    'api_key_warning' => 'When generating an API token, be sure to copy it down immediately as they will not be visible to you again.',
+    'personal_access_token' => 'Token Akses Pribadi',
+    'personal_api_keys_success' => 'API Key Pribadi :key berhasil dibuat',
+    'here_is_api_key' => 'Berikut adalah token akses pribadi baru Anda. Ini adalah satu-satunya waktu token ini akan ditampilkan, jadi jangan sampai hilang! Anda sekarang dapat menggunakan token ini untuk membuat permintaan API.',
+    'api_key_warning' => 'Saat membuat token API, pastikan untuk segera menyalinnya karena token ini tidak akan terlihat lagi.',
     'api_base_url' => 'URL basis API Anda terletak di:',
     'api_base_url_endpoint' => '/&lt;endpoint&gt;',
     'api_token_expiration_time' => 'Token API disetel kedaluwarsa dalam:',
-    'api_reference' => 'Please check the <a href="https://snipe-it.readme.io/reference" target="_blank">API reference</a> to find specific API endpoints and additional API documentation.',
-    'profile_updated' => 'Account successfully updated',
+    'api_reference' => 'Silakan periksa <a href="https://snipe-it.readme.io/reference" target="_blank">referensi API</a> untuk menemukan titik akhir API spesifik dan dokumentasi API tambahan.',
+    'profile_updated' => 'Akun berhasil diperbarui',
+    'no_tokens' => 'Anda belum membuat token akses pribadi.',
+    'enable_sounds' => 'Aktifkan efek suara',
+    'enable_confetti' => 'Aktifkan efek confetti',
 );
diff --git a/resources/lang/id-ID/admin/accessories/general.php b/resources/lang/id-ID/admin/accessories/general.php
index 15aee538a4..45aa235730 100644
--- a/resources/lang/id-ID/admin/accessories/general.php
+++ b/resources/lang/id-ID/admin/accessories/general.php
@@ -16,7 +16,7 @@ return array(
     'update'  							=> 'Perbarui Aksesori',
     'use_default_eula'					=> 'Gunakan <a href="#" data-toggle="modal" data-target="#eulaModal"> primary default </a>  sebagai gantinya.',
     'use_default_eula_disabled'			=> '<del>Gunakan primary default EULA sebagai gantinya.</del> Tidak ada primary default yang diatur. Silahkan tambahkan di Pengaturan.',
-    'clone'                             => 'Clone Accessory',
-    'delete_disabled'                   => 'This accessory cannot be deleted yet because some items are still checked out.',
+    'clone'                             => 'Duplikat Aksesori',
+    'delete_disabled'                   => 'Aksesori ini belum dapat dihapus karena beberapa item masih dipinjam/diambil.',
 
 );
diff --git a/resources/lang/id-ID/admin/accessories/message.php b/resources/lang/id-ID/admin/accessories/message.php
index 46fb0232a5..08bb1dbbf5 100644
--- a/resources/lang/id-ID/admin/accessories/message.php
+++ b/resources/lang/id-ID/admin/accessories/message.php
@@ -3,7 +3,7 @@
 return array(
 
     'does_not_exist' => 'Aksesori [:id] tidak ada.',
-    'not_found' => 'That accessory was not found.',
+    'not_found' => 'Aksesori tersebut tidak ditemukan.',
     'assoc_users'	 => 'Aksesori ini saat ini memiliki: count item yang dikeluarkan ke pengguna. Silakan periksa di aksesoris dan dan coba lagi. . Silakan periksa di aksesoris dan dan coba lagi. ',
 
     'create' => array(
@@ -25,8 +25,12 @@ return array(
      'checkout' => array(
         'error'   		=> 'Aksesori ini belum dikeluarkan, silahkan coba kembali',
         'success' 		=> 'Aksesori telah berhasil dikeluarkan.',
-        'unavailable'   => 'Accessory is not available for checkout. Check quantity available',
-        'user_does_not_exist' => 'Terdapat kesalahan pada user ini. Silahkan coba kembali.'
+        'unavailable'   => 'Aksesori tidak tersedia untuk dipinjam atau diambil. Periksa jumlah yang tersedia',
+        'user_does_not_exist' => 'Terdapat kesalahan pada user ini. Silahkan coba kembali.',
+         'checkout_qty' => array(
+            'lte'  => 'Saat ini hanya ada satu aksesori jenis ini yang tersedia, dan Anda mencoba meminjam atau mengambil :checkout_qty. Harap sesuaikan jumlah pinjaman-pengambilan atau total stok aksesori ini dan coba lagi.|Terdapat :number_currently_remaining total aksesori yang tersedia, dan Anda mencoba meminjam atau mengambil :checkout_qty. Harap sesuaikan jumlah pinjaman-pengambilan atau total stok aksesori ini dan coba lagi.',
+            ),
+           
     ),
 
     'checkin' => array(
diff --git a/resources/lang/id-ID/admin/accessories/table.php b/resources/lang/id-ID/admin/accessories/table.php
index 6b16894692..8737c12973 100644
--- a/resources/lang/id-ID/admin/accessories/table.php
+++ b/resources/lang/id-ID/admin/accessories/table.php
@@ -6,6 +6,4 @@ return array(
     'id'      					=> 'ID',
     'require_acceptance'      	=> 'Diterima',
     'title'      				=> 'Nama Aksesori',
-
-
 );
diff --git a/resources/lang/id-ID/admin/categories/general.php b/resources/lang/id-ID/admin/categories/general.php
index c321a92e1a..6c1607d5e2 100644
--- a/resources/lang/id-ID/admin/categories/general.php
+++ b/resources/lang/id-ID/admin/categories/general.php
@@ -8,8 +8,8 @@ return array(
     'clone'                             => 'Kategori duplikat',
     'create'  							=> 'Buat kategori',
     'edit'                              => 'Ubah Kategori',
-    'email_will_be_sent_due_to_global_eula' => 'An email will be sent to the user because the global EULA is being used.',
-    'email_will_be_sent_due_to_category_eula' => 'An email will be sent to the user because a EULA is set for this category.',
+    'email_will_be_sent_due_to_global_eula' => 'Sebuah email akan dikirimkan kepada pengguna karena EULA global sedang digunakan.',
+    'email_will_be_sent_due_to_category_eula' => 'Sebuah email akan dikirimkan kepada pengguna karena EULA telah diatur untuk kategori ini.',
     'eula_text'							=> 'Kategori EULA',
     'eula_text_help'					=> 'Kolom ini memperbolehkan Anda untuk menyesuaikan EULA Anda untuk jenis dari aset. Jika Anda hanya memiliki satu EULA untuk semua aset Anda, Anda dapat memeriksa kotak di bawah untuk menggunakan pilihan utama.',
     'name'                              => 'Nama Kategori',
diff --git a/resources/lang/id-ID/admin/companies/message.php b/resources/lang/id-ID/admin/companies/message.php
index d3ee8ce264..d34b925867 100644
--- a/resources/lang/id-ID/admin/companies/message.php
+++ b/resources/lang/id-ID/admin/companies/message.php
@@ -2,7 +2,7 @@
 
 return [
     'does_not_exist' => 'Perusahaan tidak ada.',
-    'deleted'        => 'Deleted company',
+    'deleted'        => 'Company dihapus',
     'assoc_users'    => 'Perusahaan saat ini dikaitkan dengan setidaknya satu model dan tidak dapat dihapus. Perbarui model anda yang tidak ada referensi dari perusahaan ini dan coba lagi. ',
     'create' => [
         'error'   => 'Perusahaan belum terbuat, silahkan coba kembali.',
diff --git a/resources/lang/id-ID/admin/companies/table.php b/resources/lang/id-ID/admin/companies/table.php
index d1d1a056b6..ea3face23c 100644
--- a/resources/lang/id-ID/admin/companies/table.php
+++ b/resources/lang/id-ID/admin/companies/table.php
@@ -2,9 +2,9 @@
 return array(
     'companies' => 'Perusahaan',
     'create'    => 'Membuat perusahaan',
-    'email'     => 'Company Email',
+    'email'     => 'Email Company',
     'title'     => 'Perusahaan',
-    'phone'     => 'Company Phone',
+    'phone'     => 'Nomor Telepon Company',
     'update'    => 'Perbarui Perusahaan',
     'name'      => 'Nama Perusahaan',
     'id'        => 'ID',
diff --git a/resources/lang/id-ID/admin/components/general.php b/resources/lang/id-ID/admin/components/general.php
index 5944273436..ff59c4fff0 100644
--- a/resources/lang/id-ID/admin/components/general.php
+++ b/resources/lang/id-ID/admin/components/general.php
@@ -12,5 +12,5 @@ return array(
     'remaining' 			             => 'Sisa',
     'total' 			                 => 'Total',
     'update'                            => 'Perbarui Komponen',
-    'checkin_limit'            => 'Amount checked in must be equal to or less than :assigned_qty'
+    'checkin_limit'            => 'Jumlah yang dikembalikan harus sama dengan atau kurang dari :assigned_qty'
 );
diff --git a/resources/lang/id-ID/admin/components/message.php b/resources/lang/id-ID/admin/components/message.php
index 250b5032ff..9f33bb4374 100644
--- a/resources/lang/id-ID/admin/components/message.php
+++ b/resources/lang/id-ID/admin/components/message.php
@@ -17,7 +17,8 @@ return array(
     'delete' => array(
         'confirm'   => 'Apakah Anda yakin untuk menghapus komponen ini?',
         'error'   => 'Terdapat kesalahan pada saat penghapusan komponen ini. Silahkan coba kembali.',
-        'success' => 'Komponen telah berhasil dihapus.'
+        'success' => 'Komponen telah berhasil dihapus.',
+        'error_qty'   => 'Some components of this type are still checked out. Please check them in and try again.',
     ),
 
      'checkout' => array(
diff --git a/resources/lang/id-ID/admin/consumables/general.php b/resources/lang/id-ID/admin/consumables/general.php
index 19a26351ef..7e0ff6ecfe 100644
--- a/resources/lang/id-ID/admin/consumables/general.php
+++ b/resources/lang/id-ID/admin/consumables/general.php
@@ -8,4 +8,5 @@ return array(
     'remaining' 			            => 'Sisa',
     'total' 			                => 'Total',
     'update'                            => 'Memperbarui Barang Habis Pakai',
+    'inventory_warning'                 => 'Stok barang habis pakai ini di bawah jumlah minimum :min_count',
 );
diff --git a/resources/lang/id-ID/admin/consumables/message.php b/resources/lang/id-ID/admin/consumables/message.php
index 87117018ca..daad0716a3 100644
--- a/resources/lang/id-ID/admin/consumables/message.php
+++ b/resources/lang/id-ID/admin/consumables/message.php
@@ -2,6 +2,7 @@
 
 return array(
 
+    'invalid_category_type' => 'Kategori harus merupakan kategori barang habis pakai.',
     'does_not_exist' => 'Barang Habis Pakai tidak terdaftar.',
 
     'create' => array(
@@ -24,7 +25,7 @@ return array(
         'error'   		=> 'Barang Habis Pakai belum tertanda keluar, silahkan mencoba lagi',
         'success' 		=> 'Barang Habis Pakai telah sukses tertanda keluar.',
         'user_does_not_exist' => 'Pengguna tidak terdaftar. Silahkan coba kembali.',
-         'unavailable'      => 'There are not enough consumables for this checkout. Please check the quantity left. ',
+         'unavailable'      => 'Tidak cukup barang habis pakai untuk checkout ini. Harap periksa jumlah yang tersisa. ',
     ),
 
     'checkin' => array(
diff --git a/resources/lang/id-ID/admin/custom_fields/general.php b/resources/lang/id-ID/admin/custom_fields/general.php
index ec825db306..afba532546 100644
--- a/resources/lang/id-ID/admin/custom_fields/general.php
+++ b/resources/lang/id-ID/admin/custom_fields/general.php
@@ -27,15 +27,15 @@ return [
     'used_by_models'   		    => 'Digunakan oleh Model',
     'order'   		            => 'Urutan',
     'create_fieldset'         => 'Set Kolom Baru',
-    'update_fieldset'         => 'Update Fieldset',
-    'fieldset_does_not_exist'   => 'Fieldset :id does not exist',
-    'fieldset_updated'         => 'Fieldset updated',
+    'update_fieldset'         => 'Perbarui Kelompok Kolom',
+    'fieldset_does_not_exist'   => 'Kelompok Kolom :id tidak ada',
+    'fieldset_updated'         => 'Kelompok Kolom telah diperbarui',
     'create_fieldset_title' => 'Buat fieldset baru',
     'create_field'            => 'Tambah Kolom Ubahan',
     'create_field_title' => 'Buat field kustom',
     'value_encrypted'      	        => 'Nilai dari kolom ini di database dienkripsi. hanya pengguna admin yang bisa melihat nilai deskripsinya',
     'show_in_email'     => 'Sertakan nilai bidang ini dalam email checkout yang dikirim kepada pengguna? Bidang terenkripsi tidak dapat dimasukkan dalam email',
-    'show_in_email_short'     => 'Include in emails.',
+    'show_in_email_short' => 'Sertakan dalam email',
     'help_text' => 'Teks bantuan',
     'help_text_description' => 'Ini adalah teks opsional yang akan muncul di bawah elemen formulir saat mengedit aset untuk memberikan konteks pada field.',
     'about_custom_fields_title' => 'Lihat field kustom',
@@ -45,17 +45,20 @@ return [
     'make_required' => 'Opsional - klik untuk ubah menjadi Diperlukan',
     'reorder' => 'Susun ulang',
     'db_field' => 'Field Database',
-    'db_convert_warning' => 'WARNING. This field is in the custom fields table as <code>:db_column</code> but should be <code>:expected</code>.',
+    'db_convert_warning' => 'PERINGATAN. Kolom ini ada di tabel custom fields sebagai <code>:db_column</code> tetapi seharusnya <code>:expected</code>.',
     'is_unique' => 'Nilai ini harus unik di semua aset',
     'unique' => 'Unik',
-    'display_in_user_view' => 'Allow the checked out user to view these values in their View Assigned Assets page',
-    'display_in_user_view_table' => 'Visible to User',
-    'auto_add_to_fieldsets' => 'Automatically add this to every new fieldset',
-    'add_to_preexisting_fieldsets' => 'Add to any existing fieldsets',
-    'show_in_listview' => 'Show in list views by default. Authorized users will still be able to show/hide via the column selector',
-    'show_in_listview_short' => 'Show in lists',
-    'show_in_requestable_list_short' => 'Show in requestable assets list',
-    'show_in_requestable_list' => 'Show value in requestable assets list. Encrypted fields will not be shown',
-    'encrypted_options' => 'This field is encrypted, so some display options will not be available.',
+    'display_in_user_view' => 'Izinkan pengguna yang meminjam untuk melihat nilai ini di halaman Lihat Aset yang Terkait atau Sedang Diberikan',
+    'display_in_user_view_table' => 'Dapat dilihat oleh Pengguna',
+    'auto_add_to_fieldsets' => 'Tambahkan ini secara otomatis ke setiap kelompok kolom baru',
+    'add_to_preexisting_fieldsets' => 'Tambahkan ke semua kelompok kolom yang ada',
+    'show_in_listview' => 'Tampilkan di tampilan daftar secara default. Pengguna yang berwenang tetap dapat menampilkan/menyembunyikan melalui pemilih kolom',
+    'show_in_listview_short' => 'Tampilkan dalam daftar',
+    'show_in_requestable_list_short' => 'Tampilkan di daftar aset yang dapat diminta',
+    'show_in_requestable_list' => 'Tampilkan nilai di daftar aset yang dapat diminta. Kolom yang dienkripsi tidak akan ditampilkan',
+    'encrypted_options' => 'Kolom ini dienkripsi, sehingga beberapa opsi tampilan tidak akan tersedia.',
+    'display_checkin' => 'Display in checkin forms',
+    'display_checkout' => 'Display in checkout forms',
+    'display_audit' => 'Display in audit forms',
 
 ];
diff --git a/resources/lang/id-ID/admin/custom_fields/message.php b/resources/lang/id-ID/admin/custom_fields/message.php
index 5a01e08c57..b7386d5962 100644
--- a/resources/lang/id-ID/admin/custom_fields/message.php
+++ b/resources/lang/id-ID/admin/custom_fields/message.php
@@ -5,6 +5,7 @@ return array(
     'field' => array(
         'invalid'   => 'Field tersebut tidak ada.',
         'already_added'   => 'Field sudah di tambahkan',
+        'none_selected'   => 'Tidak ada kolom yang dipilih',
 
         'create' => array(
             'error'   => 'Field gagal di buat, silahkan coba kembali.',
@@ -51,7 +52,7 @@ return array(
 
     'fieldset_default_value' => array(
 
-        'error' => 'Error validating default fieldset values.',
+        'error' => 'Terjadi kesalahan saat memvalidasi nilai default kelompok kolom.',
 
     ),
 
diff --git a/resources/lang/id-ID/admin/departments/message.php b/resources/lang/id-ID/admin/departments/message.php
index 58a775c6c8..867d934b38 100644
--- a/resources/lang/id-ID/admin/departments/message.php
+++ b/resources/lang/id-ID/admin/departments/message.php
@@ -3,7 +3,7 @@
 return array(
 
     'does_not_exist' => 'Departemen tidak ada.',
-    'department_already_exists' => 'A department already exists with that name at this company location. Or choose a more specific name for this department. ',
+    'department_already_exists' => 'Departemen dengan nama tersebut sudah ada di lokasi Company ini. Atau pilih nama yang lebih spesifik untuk departemen ini. ',
     'assoc_users'	 => 'Departemen ini saat ini terkait dengan setidaknya satu pengguna dan tidak dapat dihapus. Perbarui pengguna Anda untuk tidak lagi merujuk departemen ini dan coba lagi.',
     'create' => array(
         'error'   => 'Departemen tidak tercipta, silahkan dicoba lagi.',
diff --git a/resources/lang/id-ID/admin/depreciations/general.php b/resources/lang/id-ID/admin/depreciations/general.php
index 0178797a13..2aa7b2741f 100644
--- a/resources/lang/id-ID/admin/depreciations/general.php
+++ b/resources/lang/id-ID/admin/depreciations/general.php
@@ -13,4 +13,8 @@ return [
     'no_depreciations_warning'               => '<strong>Peringatan: </strong>
                       Saat ini Anda belum menyiapkan laporan penyusutan.
                       Harap atur setidaknya satu penyusutan untuk melihat laporan penyusutan.',
+    'depreciation_method'                   => 'Laporan penyusutan',
+    'linear_depreciation'                   => 'Linear (Default)',
+    'half_1'                                => 'Half-year convention, always applied',
+    'half_2'                                => 'Half-year convention, applied with condition',
 ];
diff --git a/resources/lang/id-ID/admin/groups/message.php b/resources/lang/id-ID/admin/groups/message.php
index e812bde5eb..12810c0603 100644
--- a/resources/lang/id-ID/admin/groups/message.php
+++ b/resources/lang/id-ID/admin/groups/message.php
@@ -3,7 +3,7 @@
 return array(
 
     'group_exists'        => 'Kelompok sudah ada!',
-    'group_not_found'     => 'Group ID :id does not exist.',
+    'group_not_found'     => 'ID Grup :id tidak ada.',
     'group_name_required' => 'Field nama di perlukan',
 
     'success' => array(
diff --git a/resources/lang/id-ID/admin/hardware/form.php b/resources/lang/id-ID/admin/hardware/form.php
index c6f76f0527..ca009b55a3 100644
--- a/resources/lang/id-ID/admin/hardware/form.php
+++ b/resources/lang/id-ID/admin/hardware/form.php
@@ -10,9 +10,9 @@ return [
     'bulk_update'		=> 'Perbarui aset jumlah besar',
     'bulk_update_help'	=> 'Formulir ini mengizinkan anda untuk memperbarui kelipatan aset dalam sekali proses. Cukup isi di field yang hendak di rubah. Jika ada yang kosong tidak akan dirubah. ',
     'bulk_update_warn'	=> 'Anda akan mengedit properti dari satu aset.|Anda akan mengedit properti dari :asset_count aset.',
-    'bulk_update_with_custom_field' => 'Note the assets are :asset_model_count different types of models.',
-    'bulk_update_model_prefix' => 'On Models', 
-    'bulk_update_custom_field_unique' => 'This is a unique field and can not be bulk edited.',
+    'bulk_update_with_custom_field' => 'Perhatikan bahwa aset tersebut terdiri dari :asset_model_count tipe model yang berbeda.',
+    'bulk_update_model_prefix' => 'Pada Model', 
+    'bulk_update_custom_field_unique' => 'Kolom ini bersifat unik dan tidak dapat diedit secara massal.',
     'checkedout_to'		=> 'Diberikan kepada',
     'checkout_date'		=> 'Tanggal Pemberian',
     'checkin_date'		=> 'Tanggal Pengembalian',
@@ -23,7 +23,7 @@ return [
     'depreciation'	    => 'Penyusutan',
     'depreciates_on'	=> 'Penyusutan aktif',
     'default_location'	=> 'Lokasi awal',
-    'default_location_phone' => 'Default Location Phone',
+    'default_location_phone' => 'Telepon Lokasi Default',
     'eol_date'			=> 'Tanggal EOL',
     'eol_rate'			=> 'Tingkat EOL',
     'expected_checkin'  => 'Tanggal pengembalian diharapkan diterima',
@@ -39,9 +39,9 @@ return [
     'order'				=> 'Nomor Pemesanan',
     'qr'				=> 'Kode QR',
     'requestable'		=> 'Pengguna dapat meminta aset ini',
-    'redirect_to_all'   => 'Return to all :type',
-    'redirect_to_type'   => 'Go to :type',
-    'redirect_to_checked_out_to'   => 'Go to Checked Out to',
+    'redirect_to_all'   => 'Kembali ke semua :type',
+    'redirect_to_type'   => 'Pergi ke :type',
+    'redirect_to_checked_out_to'   => 'Pergi ke yang Dipinjamkan ke',
     'select_statustype'	=> 'Memilih Tipe Status',
     'serial'			=> 'Serial',
     'status'			=> 'Status',
@@ -53,10 +53,13 @@ return [
     'asset_location' => 'Perbarui Lokasi Aset',
     'asset_location_update_default_current' => 'Perbarui lokasi default DAN lokasi sebenarnya',
     'asset_location_update_default' => 'Perbarui hanya lokasi default',
-    'asset_location_update_actual' => 'Update only actual location',
+    'asset_location_update_actual' => 'Perbarui hanya lokasi yang sebenarnya',
     'asset_not_deployable' => 'Status aset tersebut tidak dapat ditetapkan. Aset ini tidak dapat digunakan.',
-    'asset_deployable' => 'Status aset dapat ditetapkan. Aset ini dapat digunakan.',
+    'asset_not_deployable_checkin' => 'Status aset tersebut tidak dapat diterapkan. Menggunakan label status ini akan memeriksa kembali aset tersebut.',
+    'asset_deployable' => 'This asset can be checked out.',
     'processing_spinner' => 'Memproses... (Mungkin memerlukan sedikit waktu untuk file besar)',
+    'processing' => 'Processing... ',
     'optional_infos'  => 'Informasi Tambahan',
-    'order_details'   => 'Informasi Pesanan'
+    'order_details'   => 'Informasi Pesanan',
+    'calc_eol'    => 'Jika mengosongkan tanggal EOL, gunakan perhitungan EOL otomatis berdasarkan tanggal pembelian dan tarif EOL.',
 ];
diff --git a/resources/lang/id-ID/admin/hardware/general.php b/resources/lang/id-ID/admin/hardware/general.php
index 57d8b706db..bf066ae66f 100644
--- a/resources/lang/id-ID/admin/hardware/general.php
+++ b/resources/lang/id-ID/admin/hardware/general.php
@@ -5,39 +5,38 @@ return [
     'about_assets_text'            => 'Aset adalah barang yang dilacak dengan nomor seri atau tanda aset. Cenderung menjadi barang dengan nilai lebih tinggi dimana identifikasi barang secara spesifik berpengaruh.',
     'archived'  				=> 'Diarsipkan',
     'asset'  					=> 'Aset',
-    'bulk_checkout'             => 'Pengeluaran Aset',
-    'bulk_checkin'              => 'Checkin Assets',
+    'bulk_checkout'             => 'check-out masal',
+    'bulk_checkin'              => 'Bulk Checkin',
     'checkin'  					=> 'Pengembalian aset',
     'checkout'  				=> 'Aset Checkout',
     'clone'  					=> 'Klon Aset',
     'deployable'  				=> 'Dapat digunakan',
     'deleted'  					=> 'Aset ini telah dihapus.',
-    'delete_confirm'            => 'Are you sure you want to delete this asset?',
+    'delete_confirm'            => 'Apakah Anda yakin ingin menghapus aset ini?',
     'edit'  					=> 'Sunting Aset',
     'model_deleted'  			=> 'Model Aset ini telah dihapus. Anda harus memulihkan model aset tersebut sebelum Anda dapat memulihkan Aset.',
-    'model_invalid'             => 'This model for this asset is invalid.',
-    'model_invalid_fix'         => 'The asset must be updated use a valid asset model before attempting to check it in or out, or to audit it.',
+    'model_invalid'             => 'Model untuk aset ini tidak valid.',
+    'model_invalid_fix'         => 'Aset harus diperbarui menggunakan model aset yang valid sebelum dicoba untuk dikembalikan atau dipinjam, atau diaudit.',
     'requestable'               => 'Dapat diminta',
     'requested'				    => 'Telah diminta',
-    'not_requestable'           => 'Not Requestable',
-    'requestable_status_warning' => 'Do not change requestable status',
+    'not_requestable'           => 'Tidak Dapat Diminta',
+    'requestable_status_warning' => ' Jangan ubah status permintaan.',
     'restore'  					=> 'Mengembalikan aset',
     'pending'  					=> 'Tunda',
     'undeployable'  			=> 'Tidak dapat digunakan',
-    'undeployable_tooltip'  	=> 'This asset has a status label that is undeployable and cannot be checked out at this time.',
+    'undeployable_tooltip'  	=> 'Aset ini memiliki label status yang tidak dapat digunakan dan tidak dapat dipinjam/diambil saat ini.',
     'view'  					=> 'Tampilkan aset',
-    'csv_error' => 'You have an error in your CSV file:',
-    'import_text' => '<p>Upload a CSV that contains asset history. The assets and users MUST already exist in the system, or they will be skipped. Matching assets for history import happens against the asset tag. We will try to find a matching user based on the user\'s name you provide, and the criteria you select below. If you do not select any criteria below, it will simply try to match on the username format you configured in the <code>Admin &gt; General Settings</code>.</p><p>Fields included in the CSV must match the headers: <strong>Asset Tag, Name, Checkout Date, Checkin Date</strong>. Any additional fields will be ignored. </p><p>Checkin Date: blank or future checkin dates will checkout items to associated user.  Excluding the Checkin Date column will create a checkin date with todays date.</p>
-    ',
-    'csv_import_match_f-l' => 'Try to match users by <strong>firstname.lastname</strong> (<code>jane.smith</code>) format',
-    'csv_import_match_initial_last' => 'Try to match users by <strong>first initial last name</strong> (<code>jsmith</code>) format',
-    'csv_import_match_first' => 'Try to match users by <strong>first name</strong> (<code>jane</code>) format',
-    'csv_import_match_email' => 'Try to match users by <strong>email</strong> as username',
-    'csv_import_match_username' => 'Try to match users by <strong>username</strong>',
-    'error_messages' => 'Error messages:',
-    'success_messages' => 'Success messages:',
-    'alert_details' => 'Please see below for details.',
-    'custom_export' => 'Custom Export',
-    'mfg_warranty_lookup' => ':manufacturer Warranty Status Lookup',
-    'user_department' => 'User Department',
+    'csv_error' => 'Anda memiliki kesalahan dalam file: CSV Anda',
+    'import_text' => '<p>Upload a CSV that contains asset history. The assets and users MUST already exist in the system, or they will be skipped. Matching assets for history import happens against the asset tag. We will try to find a matching user based on the user\'s name you provide, and the criteria you select below. If you do not select any criteria below, it will simply try to match on the username format you configured in the <code>Admin &gt; General Settings</code>.</p><p>Fields included in the CSV must match the headers: <strong>Asset Tag, Name, Checkout Date, Checkin Date</strong>. Any additional fields will be ignored. </p><p>Checkin Date: blank or future checkin dates will checkout items to associated user.  Excluding the Checkin Date column will create a checkin date with todays date.</p>    ',
+    'csv_import_match_f-l' => 'Coba cocokkan pengguna berdasarkan format <strong>nama_depan.nama_belakang</strong> (<code>jane.smith</code>)',
+    'csv_import_match_initial_last' => 'Coba cocokkan pengguna berdasarkan format <strong>inisial nama depan nama belakang</strong> (<code>jsmith</code>)',
+    'csv_import_match_first' => 'Coba cocokkan pengguna berdasarkan format <strong>nama depan</strong> (<code>jane</code>)',
+    'csv_import_match_email' => 'Coba cocokkan pengguna berdasarkan <strong>email</strong> sebagai nama pengguna',
+    'csv_import_match_username' => 'Coba cocokkan pengguna berdasarkan <strong>nama pengguna</strong>',
+    'error_messages' => 'Pesan kesalahan:',
+    'success_messages' => 'Pesan keberhasilan:',
+    'alert_details' => 'Silakan lihat di bawah untuk detailnya.',
+    'custom_export' => 'Ekspor Kustom',
+    'mfg_warranty_lookup' => 'Pencarian Status Garansi :manufacturer',
+    'user_department' => 'Departemen Pengguna',
 ];
diff --git a/resources/lang/id-ID/admin/hardware/message.php b/resources/lang/id-ID/admin/hardware/message.php
index bd7863c075..a8114d679e 100644
--- a/resources/lang/id-ID/admin/hardware/message.php
+++ b/resources/lang/id-ID/admin/hardware/message.php
@@ -2,28 +2,32 @@
 
 return [
 
-    'undeployable' 		=> '<strong>Peringatan: </strong> Aset ini telah di tandai sebagai aset yang tak dapat digunakan.
-                        Jika status ini telah berubah, silahkan perbarui status aset.',
-    'does_not_exist' 	=> 'Aset tidak ada.',
-    'does_not_exist_var'=> 'Asset with tag :asset_tag not found.',
-    'no_tag' 	        => 'No asset tag provided.',
+    'undeployable' 		 => '<strong>Peringatan:<strong> Aset ini telah ditandai sebagai tidak dapat digunakan saat ini. Jika status ini telah berubah, harap perbarui status aset.',
+    'does_not_exist' 	 => 'Aset tidak ada.',
+    'does_not_exist_var' => 'Aset dengan tag :asset_tag tidak ditemukan.',
+    'no_tag' 	         => 'Tidak ada tag aset yang diberikan.',
     'does_not_exist_or_not_requestable' => 'Aset tersebut tidak ada atau tidak dapat di minta.',
-    'assoc_users'	 	=> 'Aset ini sudah diberikan kepada pengguna dan tidak dapat di hapus. Silahkan cek aset terlebih dahulu kemudian coba hapus kembali. ',
-    'warning_audit_date_mismatch' 	=> 'This asset\'s next audit date (:next_audit_date) is before the last audit date (:last_audit_date). Please update the next audit date.',
+    'assoc_users'	 	 => 'Aset ini sudah diberikan kepada pengguna dan tidak dapat di hapus. Silahkan cek aset terlebih dahulu kemudian coba hapus kembali. ',
+    'warning_audit_date_mismatch' 	=> 'Tanggal audit berikutnya (:next_audit_date) untuk aset ini adalah sebelum tanggal audit terakhir (:last_audit_date). Harap perbarui tanggal audit berikutnya.',
+    'labels_generated'   => 'Label berhasil dibuat.',
+    'error_generating_labels' => 'Terjadi kesalahan saat membuat label.',
+    'no_assets_selected' => 'Tidak ada aset yang dipilih.',
 
     'create' => [
         'error'   		=> 'Aset gagal di buat, silahkan coba kembali',
         'success' 		=> 'Sukses membuat aset',
-        'success_linked' => 'Asset with tag :tag was created successfully. <strong><a href=":link" style="color: white;">Click here to view</a></strong>.',
+        'success_linked' => 'Aset dengan tag :tag berhasil dibuat. <strong><a href=":link" style="color: white;">Klik di sini untuk melihat</a></strong>.',
+        'multi_success_linked' => 'Aset dengan tag :links berhasil dibuat.|:count aset berhasil dibuat :links.',
+        'partial_failure' => 'Aset gagal dibuat. Alasan: :failures|:count aset gagal dibuat. Alasan: :failures.',
     ],
 
     'update' => [
         'error'   			=> 'Gagal perbarui aset, silahkan coba kembali',
         'success' 			=> 'Sukses perbarui aset.',
-        'encrypted_warning' => 'Asset updated successfully, but encrypted custom fields were not due to permissions',
+        'encrypted_warning' => 'Aset berhasil diperbarui, tetapi kolom khusus yang terenkripsi tidak diperbarui karena izin',
         'nothing_updated'	=>  'Tidak ada kolom yang dipilih, jadi tidak ada yang diperbaharui.',
         'no_assets_selected'  =>  'Tidak ada aset yang dipilih, jadi tidak ada yang diperbarui.',
-        'assets_do_not_exist_or_are_invalid' => 'Selected assets cannot be updated.',
+        'assets_do_not_exist_or_are_invalid' => 'Aset yang dipilih tidak dapat diperbarui.',
     ],
 
     'restore' => [
@@ -34,7 +38,7 @@ return [
     ],
 
     'audit' => [
-        'error'   		=> 'Asset audit unsuccessful: :error ',
+        'error'   		=> 'Audit aset tidak berhasil: :error.',
         'success' 		=> 'Audit aset berhasil login.',
     ],
 
@@ -52,20 +56,24 @@ return [
     ],
 
     'import' => [
+        'import_button'         => 'Proses Impor',
         'error'                 => 'Beberapa item tidak terimpor dengan benar.',
         'errorDetail'           => 'Item berikut tidak terimpor karena ada kesalahan.',
         'success'               => 'Berkas Anda berhasil terimpor',
         'file_delete_success'   => 'File anda telah berhasil dihapus',
         'file_delete_error'      => 'File tidak bisa dihapus',
-        'file_missing' => 'The file selected is missing',
-        'header_row_has_malformed_characters' => 'One or more attributes in the header row contain malformed UTF-8 characters',
-        'content_row_has_malformed_characters' => 'One or more attributes in the first row of content contain malformed UTF-8 characters',
+        'file_missing' => 'File yang dipilih hilang',
+        'file_already_deleted' => 'File yang dipilih telah dihapus',
+        'header_row_has_malformed_characters' => 'Salah satu atau lebih atribut di baris header mengandung karakter UTF-8 yang tidak sah',
+        'content_row_has_malformed_characters' => 'Salah satu atau lebih atribut di baris pertama konten mengandung karakter UTF-8 yang tidak sah',
+        'transliterate_failure' => 'Transliteration from :encoding to UTF-8 failed due to invalid characters in input'
     ],
 
 
     'delete' => [
         'confirm'   	=> 'Apakah Anda yakin untuk menghapus aset ini?',
         'error'   		=> 'Terdapat kesalahan pada saat penghapusan aset. Silahkan coba kembali.',
+        'assigned_to_error' => '{1}Asset Tag: :asset_tag is currently checked out. Check in this device before deletion.|[2,*]Asset Tags: :asset_tag are currently checked out. Check in these devices before deletion.',
         'nothing_updated'   => 'Tidak ada aset yang dipilih, jadi tidak ada yang dihapus.',
         'success' 		=> 'Aset sukses terhapus.',
     ],
@@ -78,6 +86,11 @@ return [
         'no_assets_selected' => 'Anda harus memilih setidaknya satu aset dari daftar',
     ],
 
+    'multi-checkout' => [
+        'error'   => 'Aset tidak dapat dipinjamkan, harap coba lagi.|Aset tidak dapat dipinjamkan, harap coba lagi',
+        'success' => 'Aset berhasil dipinjamkan.|Aset berhasil dipinjamkan.',
+    ],
+
     'checkin' => [
         'error'   		=> 'Aset gagal di terima, silahkan coba kembali',
         'success' 		=> 'Sukses menerima aset.',
@@ -87,9 +100,10 @@ return [
     ],
 
     'requests' => [
-        'error'   		=> 'Aset gagal di minta, silahkan coba kembali',
-        'success' 		=> 'Sukses meminta aset.',
-        'canceled'      => 'Permintaan pemeriksaan berhasil dibatalkan',
+        'error'   		=> 'Request was not successful, please try again.',
+        'success' 		=> 'Request successfully submitted.',
+        'canceled'      => 'Request successfully canceled.',
+        'cancel'        => 'Batalkan permintaan barang ini',
     ],
 
 ];
diff --git a/resources/lang/id-ID/admin/hardware/table.php b/resources/lang/id-ID/admin/hardware/table.php
index 9b6503c98f..19bdc84177 100644
--- a/resources/lang/id-ID/admin/hardware/table.php
+++ b/resources/lang/id-ID/admin/hardware/table.php
@@ -15,7 +15,7 @@ return [
     'dl_csv' 		=> 'Unduh CSV',
     'eol' 			=> 'MHP',
     'id'      		=> 'ID',
-    'last_checkin_date' => 'Last Checkin Date',
+    'last_checkin_date' => 'Tanggal MasukTerakhir',
     'location' 		=> 'Lokasi',
     'purchase_cost'	=> 'Biaya',
     'purchase_date'	=> 'Dibeli',
@@ -25,7 +25,6 @@ return [
     'image'		    => 'Gambar Perangkat',
     'days_without_acceptance' => 'Tanda Terima',
     'monthly_depreciation' => 'Penyusutan Bulanan',
-    'assigned_to'    => 'Ditugaskan untuk',
     'requesting_user' => 'Meminta Pengguna',
     'requested_date' => 'Tanggal yang diminta',
     'changed'       => 'Diubah',
diff --git a/resources/lang/id-ID/admin/kits/general.php b/resources/lang/id-ID/admin/kits/general.php
index a3ad75d1af..7865c12fe9 100644
--- a/resources/lang/id-ID/admin/kits/general.php
+++ b/resources/lang/id-ID/admin/kits/general.php
@@ -13,38 +13,39 @@ return [
     'none_licenses'                     => 'Unit :license yang tersedia tidak cukup untuk checkout. :qty diperlukan. ',
     'none_consumables'                  => 'Unit :consumable yang tersedia tidak cukup untuk checkout. :qty diperlukan. ',
     'none_accessory'                    => 'Unit :accessory yang tersedia tidak cukup untuk checkout. :qty diperlukan. ',
-    'append_accessory'                  => 'Append Accessory',
-    'update_appended_accessory'         => 'Update appended Accessory',
-    'append_consumable'                 => 'Append Consumable',
-    'update_appended_consumable'        => 'Update appended Consumable',
-    'append_license'                    => 'Append license',
-    'update_appended_license'           => 'Update appended license',
-    'append_model'                      => 'Append model',
-    'update_appended_model'             => 'Update appended model',
-    'license_error'                     => 'License already attached to kit',
-    'license_added_success'             => 'License added successfully',
-    'license_updated'                   => 'License was successfully updated',
+    'append_accessory'                  => 'Tambahkan Aksesori',
+    'update_appended_accessory'         => 'Perbarui Aksesori yang Ditambahkan',
+    'append_consumable'                 => 'Tambahkan Barang Habis Pakai',
+    'update_appended_consumable'        => 'Perbarui Barang Habis Pakai yang Ditambahkan',
+    'append_license'                    => 'Tambahkan Lisensi ',
+    'update_appended_license'           => 'Perbarui Lisensi yang Ditambahkan',
+    'append_model'                      => 'Tambahkan Model',
+    'update_appended_model'             => 'Perbarui Model yang Ditambahkan',
+    'license_error'                     => ' Lisensi sudah terpasang pada kit',
+    'license_added_success'             => 'Lisensi berhasil ditambahkan',
+    'license_updated'                   => 'Lisensi berhasil diperbarui',
     'license_none'                      => 'Lisensi tidak ada',
-    'license_detached'                  => 'License was successfully detached',
-    'consumable_added_success'          => 'Consumable added successfully',
-    'consumable_updated'                => 'Consumable was successfully updated',
-    'consumable_error'                  => 'Consumable already attached to kit',
-    'consumable_deleted'                => 'Delete was successful',
+    'license_detached'                  => 'Lisensi berhasil dilepas  atau dihapus dari kit',
+    'consumable_added_success'          => 'Barang Habis Pakai berhasil ditambahkan',
+    'consumable_updated'                => 'Barang Habis Pakai berhasil diperbarui',
+    'consumable_error'                  => 'Barang Habis Pakai sudah terpasang pada kit',
+    'consumable_deleted'                => 'Penghapusan berhasil',
     'consumable_none'                   => 'Barang Habis Pakai tidak terdaftar',
-    'consumable_detached'               => 'Consumable was successfully detached',
-    'accessory_added_success'           => 'Accessory added successfully',
-    'accessory_updated'                 => 'Accessory was successfully updated',
-    'accessory_detached'                => 'Accessory was successfully detached',
-    'accessory_error'                   => 'Accessory already attached to kit',
-    'accessory_deleted'                 => 'Delete was successful',
+    'consumable_detached'               => 'Barang Habis Pakai berhasil dilepas atau dihapus dari kit',
+    'accessory_added_success'           => 'Aksesori berhasil ditambahkan',
+    'accessory_updated'                 => 'Aksesori berhasil diperbarui',
+    'accessory_detached'                => 'Aksesori berhasil dilepas/dihapus dari kit',
+    'accessory_error'                   => 'Aksesori sudah terpasang pada kit',
+    'accessory_deleted'                 => 'Penghapusan berhasil',
     'accessory_none'                    => 'Aksesori tidak di ada',
-    'checkout_success'                  => 'Checkout was successful',
-    'checkout_error'                    => 'Checkout error',
-    'kit_none'                          => 'Kit does not exist',
+    'checkout_success'                  => 'Peminjaman atau pengambilan berhasil',
+    'checkout_error'                    => 'Terjadi kesalahan saat peminjaman atau pengambilan',
+    'kit_none'                          => 'Kit tidak ada',
     'kit_created'                       => 'Kit berhasil dibuat',
     'kit_updated'                       => 'Kit berhasil dihapus',
-    'kit_not_found'                     => 'Kit not found',
+    'kit_not_found'                     => 'Kit tidak ditemukan',
     'kit_deleted'                       => 'Kit berhasil dihapus',
-    'kit_model_updated'                 => 'Model was successfully updated',
-    'kit_model_detached'                => 'Model was successfully detached',
+    'kit_model_updated'                 => 'Model berhasil diperbarui',
+    'kit_model_detached'                => 'Model berhasil dilepas atau dihapus dari kit',
+    'model_already_attached'            => 'Model sudah terpasang pada kit',
 ];
diff --git a/resources/lang/id-ID/admin/labels/message.php b/resources/lang/id-ID/admin/labels/message.php
index 96785f0754..e1ec067c85 100644
--- a/resources/lang/id-ID/admin/labels/message.php
+++ b/resources/lang/id-ID/admin/labels/message.php
@@ -2,10 +2,10 @@
 
 return [
 
-    'invalid_return_count' => 'Invalid count returned from :name. Expected :expected, got :actual.',
-    'invalid_return_type'  => 'Invalid type returned from :name. Expected :expected, got :actual.',
-    'invalid_return_value' => 'Invalid value returned from :name. Expected :expected, got :actual.',
+    'invalid_return_count' => 'Jumlah tidak valid dikembalikan dari :name. Seharusnya :expected, didapat :actual.',
+    'invalid_return_type'  => 'Tipe tidak valid dikembalikan dari :name. Seharusnya :expected, didapat :actual.',
+    'invalid_return_value' => 'Nilai tidak valid dikembalikan dari :name. Seharusnya :expected, didapat :actual.',
 
-    'does_not_exist' => 'Label does not exist',
+    'does_not_exist' => 'Label tidak ada',
     
 ];
diff --git a/resources/lang/id-ID/admin/labels/table.php b/resources/lang/id-ID/admin/labels/table.php
index cb09824d00..e31785b339 100644
--- a/resources/lang/id-ID/admin/labels/table.php
+++ b/resources/lang/id-ID/admin/labels/table.php
@@ -2,13 +2,13 @@
 
 return [
     'example_company'    => 'Test Company Limited',
-    'example_defaultloc' => 'Building 1',
+    'example_defaultloc' => 'Gedung 1',
     'example_category'   => 'Test Category',
-    'example_location'   => 'Building 2',
+    'example_location'   => 'Gedung 2',
     'example_manufacturer'  => 'Test Manufacturing Inc.',
     'example_model'      => 'Test Model',
     'example_supplier'   => 'Test Company Limited',
-    'labels_per_page'    => 'Labels',
+    'labels_per_page'    => 'Label',
     'support_fields'     => 'Kolom',
     'support_asset_tag'  => 'Menandai',
     'support_1d_barcode' => '1D',
diff --git a/resources/lang/id-ID/admin/licenses/general.php b/resources/lang/id-ID/admin/licenses/general.php
index c070536e7a..c744775810 100644
--- a/resources/lang/id-ID/admin/licenses/general.php
+++ b/resources/lang/id-ID/admin/licenses/general.php
@@ -14,38 +14,39 @@ return array(
     'info'  					=> 'Info Lisensi',
     'license_seats'  			=> 'Kapasitas Lisensi',
     'seat'  					=> 'Kapasitas',
+    'seat_count'  				=> 'Slot :count',
     'seats'  					=> 'Kapasitas',
     'software_licenses'  		=> 'Lisensi Perangkat Lunak',
     'user'  					=> 'Pengguna',
     'view'  					=> 'Tampilkan Lisensi',
-    'delete_disabled'           => 'This license cannot be deleted yet because some seats are still checked out.',
+    'delete_disabled'           => 'Lisensi ini belum dapat dihapus karena beberapa slot lisensi masih dipinjam atau diambil.',
     'bulk'                      =>
         [
             'checkin_all'           => [
-                'button'            => 'Checkin All Seats',
-                'modal'             => 'This will action checkin one seat. | This action will checkin all :checkedout_seats_count seats for this license.',
-                'enabled_tooltip'   => 'Checkin ALL seats for this license from both users and assets',
-                'disabled_tooltip'  => 'This is disabled because there are no seats currently checked out',
-                'disabled_tooltip_reassignable'  => 'This is disabled because the License is not reassignable',
-                'success'           => 'License successfully checked in! | All licenses were successfully checked in!',
-                'log_msg'           => 'Checked in via bulk license checkout in license GUI',
+                'button'            => 'Tandai Masuk Semua Slot Lisensi',
+                'modal'             => 'Tindakan ini akan mengembalikan satu slot lisensi. | Tindakan ini akan mengembalikan semua :checkedout_seats_count slot lisensi untuk lisensi ini.',
+                'enabled_tooltip'   => 'Kembalikan SEMUA slot lisensi untuk lisensi ini dari pengguna dan aset',
+                'disabled_tooltip'  => 'Fitur ini dinonaktifkan karena tidak ada slot lisensi yang sedang dipinjam atau diambil',
+                'disabled_tooltip_reassignable'  => 'Fitur ini dinonaktifkan karena Lisensi tidak dapat dialihkan atau diberikan ulang',
+                'success'           => 'Lisensi berhasil dikembalikan! | Semua lisensi berhasil dikembalikan!',
+                'log_msg'           => 'Dikembalikan melalui pengembalian lisensi massal di GUI lisensi',
             ],
 
             'checkout_all'              => [
-                'button'                => 'Checkout All Seats',
-                'modal'                 => 'This action will checkout one seat to the first available user. | This action will checkout all :available_seats_count seats to the first available users. A user is considered available for this seat if they do not already have this license checked out to them, and the Auto-Assign License property is enabled on their user account.',
-                'enabled_tooltip'   => 'Checkout ALL seats (or as many as are available) to ALL users',
-                'disabled_tooltip'  => 'This is disabled because there are no seats currently available',
-                'success'           => 'License successfully checked out! | :count licenses were successfully checked out!',
-                'error_no_seats'    => 'There are no remaining seats left for this license.',
-                'warn_not_enough_seats'    => ':count users were assigned this license, but we ran out of available license seats.',
-                'warn_no_avail_users'    => 'Nothing to do. There are no users who do not already have this license assigned to them.',
-                'log_msg'           => 'Checked out via bulk license checkout in license GUI',
+                'button'                => 'Berikan Semua Slot Lisensi',
+                'modal'                 => 'Tindakan ini akan meminjamkan atau memberikan satu slot lisensi kepada pengguna pertama yang tersedia. | Tindakan ini akan meminjamkan atau memberikan semua :available_seats_count slot lisensi kepada pengguna pertama yang tersedia. Seorang pengguna dianggap tersedia untuk slot lisensi ini jika mereka belum meminjam atau menerima lisensi ini, dan properti Otomatiskan Penugasan Lisensi diaktifkan pada akun pengguna mereka.',
+                'enabled_tooltip'   => 'Pinjam atau Berikan SEMUA slot lisensi (atau sebanyak yang tersedia) kepada SEMUA pengguna',
+                'disabled_tooltip'  => 'Fitur ini dinonaktifkan karena tidak ada slot lisensi yang tersedia saat ini',
+                'success'           => 'Lisensi berhasil dipinjamkan atau diberikan! | :count lisensi berhasil dipinjamkan atau diberikan!',
+                'error_no_seats'    => 'Tidak ada slot tersisa untuk lisensi ini.',
+                'warn_not_enough_seats'    => ':count pengguna telah ditetapkan pada lisensi ini, tetapi kami kehabisan slot yang tersedia.',
+                'warn_no_avail_users'    => 'Tidak ada yang perlu dilakukan. Tidak ada pengguna yang belum ditetapkan pada lisensi ini.',
+                'log_msg'           => 'Dipinjamkan atau Diberikan melalui peminjaman atau pemberian lisensi massal di GUI lisensi',
 
 
             ],
     ],
 
-    'below_threshold' => 'There are only :remaining_count seats left for this license with a minimum quantity of :min_amt. You may want to consider purchasing more seats.',
-    'below_threshold_short' => 'This item is below the minimum required quantity.',
+    'below_threshold' => 'Hanya ada :remaining_count slot lisensi tersisa untuk lisensi ini dengan jumlah minimum :min_amt. Anda mungkin perlu mempertimbangkan untuk membeli lebih banyak slot lisensi.',
+    'below_threshold_short' => 'Jumlah item ini di bawah kuantitas minimum yang dibutuhkan.',
 );
diff --git a/resources/lang/id-ID/admin/licenses/message.php b/resources/lang/id-ID/admin/licenses/message.php
index 78bbc72869..88a6aa886d 100644
--- a/resources/lang/id-ID/admin/licenses/message.php
+++ b/resources/lang/id-ID/admin/licenses/message.php
@@ -2,14 +2,14 @@
 
 return array(
 
-    'does_not_exist' => 'License does not exist or you do not have permission to view it.',
-    'user_does_not_exist' => 'User does not exist or you do not have permission to view them.',
+    'does_not_exist' => 'Lisensi tidak ada atau Anda tidak memiliki izin untuk melihatnya.',
+    'user_does_not_exist' => 'Pengguna tidak ada atau Anda tidak memiliki izin untuk melihatnya.',
     'asset_does_not_exist' 	=> 'Aset yang hendak di asosiasikan dengan lisensi ini tidak ada.',
     'owner_doesnt_match_asset' => 'Aset yang hendak di asosiasikan dengan lisensi ini di miliki oleh seseorang yang tidak masuk dalam daftar.',
     'assoc_users'	 => 'Lisensi ini sudah diberikan kepada pengguna dan tidak dapat di hapus. Silahkan cek lisensi terlebih dahulu kemudian coba hapus kembali. ',
     'select_asset_or_person' => 'Anda harus memilih aset atau pengguna, namun tidak keduanya.',
     'not_found' => 'Berkas Lisensi tidak ditemukan',
-    'seats_available' => ':seat_count seats available',
+    'seats_available' => ':seat_count slot lisensi tersedia',
 
 
     'create' => array(
@@ -43,11 +43,14 @@ return array(
     'checkout' => array(
         'error'   => 'Terdapat kesalahan pada saat pemberian lisensi ini. Silahkan coba kembali.',
         'success' => 'Lisensi telah berhasil diberikan',
-        'not_enough_seats' => 'Not enough license seats available for checkout',
+        'not_enough_seats' => 'Jumlah slot lisensi yang tersedia tidak mencukupi untuk dipinjam atau diambil',
+        'mismatch' => 'Slot lisensi yang diberikan tidak cocok dengan lisensi',
+        'unavailable' => 'Slot lisensi ini tidak tersedia untuk dipinjam atau diambil.',
     ),
 
     'checkin' => array(
         'error'   => 'Terdapat kesalahan pada saat penerimaan lisensi ini. Silahkan coba kembali.',
+        'not_reassignable' => 'Lisensi tidak dapat dialihkan atau ditetapkan ulang',
         'success' => 'Lisensi telah berhasil diterima'
     ),
 
diff --git a/resources/lang/id-ID/admin/licenses/table.php b/resources/lang/id-ID/admin/licenses/table.php
index 3760e50c72..df935c5f99 100644
--- a/resources/lang/id-ID/admin/licenses/table.php
+++ b/resources/lang/id-ID/admin/licenses/table.php
@@ -4,7 +4,7 @@ return array(
 
     'assigned_to'   	=> 'Diberikan kepada',
     'checkout'   		=> 'Masuk/Keluar',
-    'deleted_at'        => 'Deleted at',
+    'deleted_at'        => 'Dihapus pada',
     'id'      			=> 'ID',
     'license_email'   	=> 'Email Lisensi',
     'license_name'   	=> 'Dilisensikan kepada',
diff --git a/resources/lang/id-ID/admin/locations/message.php b/resources/lang/id-ID/admin/locations/message.php
index b9c13093c6..1655a4f376 100644
--- a/resources/lang/id-ID/admin/locations/message.php
+++ b/resources/lang/id-ID/admin/locations/message.php
@@ -3,11 +3,12 @@
 return array(
 
     'does_not_exist' => 'Lokasi tidak ada.',
-    'assoc_users'    => 'This location is not currently deletable because it is the location of record for at least one asset or user, has assets assigned to it, or is the parent location of another location. Please update your models to no longer reference this company and try again. ',
+    'assoc_users'    => 'Lokasi ini saat ini tidak dapat dihapus karena merupakan lokasi catatan untuk minimal satu aset atau pengguna, memiliki aset yang ditetapkan pada lokasi tersebut, atau merupakan lokasi induk dari lokasi lain. Harap perbarui catatan Anda agar tidak lagi mereferensikan lokasi ini dan coba lagi ',
     'assoc_assets'	 => 'Lokasi saat ini dikaitkan dengan setidaknya oleh satu aset dan tidak dapat dihapus. Perbarui aset Anda yang tidak ada referensi dari lokasi ini dan coba lagi. ',
     'assoc_child_loc'	 => 'Lokasi saat ini digunakan oleh induk salah satu dari turunan lokasi dan tidak dapat di hapus. Mohon perbarui lokasi Anda ke yang tidak ada referensi dengan lokasi ini dan coba kembali. ',
     'assigned_assets' => 'Aset yang Ditetapkan',
     'current_location' => 'Lokasi Saat Ini',
+    'open_map' => 'Buka di Peta :map_provider_icon',
 
 
     'create' => array(
@@ -20,6 +21,11 @@ return array(
         'success' => 'Lokasi sukses di perbarui.'
     ),
 
+    'restore' => array(
+        'error'   => 'Lokasi gagal dipulihkan, harap coba lagi',
+        'success' => 'Lokasi berhasil dipulihkan.'
+    ),
+
     'delete' => array(
         'confirm'   	=> 'Apakah Anda yakin untuk menghapus lokasi ini?',
         'error'   => 'Terdapat kesalahan pada saat penghapusan lokasi ini. Silahkan coba kembali.',
diff --git a/resources/lang/id-ID/admin/locations/table.php b/resources/lang/id-ID/admin/locations/table.php
index 73d44ac4e1..2d543d29b9 100644
--- a/resources/lang/id-ID/admin/locations/table.php
+++ b/resources/lang/id-ID/admin/locations/table.php
@@ -34,9 +34,10 @@ return [
     'asset_checked_out'         => 'Dipakai',
     'asset_expected_checkin'    => 'Tanggal Pengembalian',
     'date'                      => 'Tanggal:',
-    'phone'                     => 'Location Phone',
+    'phone'                     => 'Nomor Telepon Lokasi',
     'signed_by_asset_auditor'   => 'Ditandatangani Oleh (Aset Auditor):',
     'signed_by_finance_auditor' => 'Ditandatangani Oleh (Auditor Keuangan):',
     'signed_by_location_manager' => 'Ditandatangani Oleh (Penanggung Jawab):',
     'signed_by'                 => 'Ditandatangani Oleh:',
+    'clone'  					=> 'Clone Location',
 ];
diff --git a/resources/lang/id-ID/admin/manufacturers/message.php b/resources/lang/id-ID/admin/manufacturers/message.php
index bc2b18fab2..804f2b9605 100644
--- a/resources/lang/id-ID/admin/manufacturers/message.php
+++ b/resources/lang/id-ID/admin/manufacturers/message.php
@@ -2,7 +2,7 @@
 
 return array(
 
-    'support_url_help' => 'Variables <code>{LOCALE}</code>, <code>{SERIAL}</code>, <code>{MODEL_NUMBER}</code>, and <code>{MODEL_NAME}</code> may be used in your URL to have those values auto-populate when viewing assets - for example https://checkcoverage.apple.com/{LOCALE}/{SERIAL}.',
+    'support_url_help' => 'Variabel <code>{LOCALE}</code>, <code>{SERIAL}</code>, <code>{MODEL_NUMBER}</code>, dan <code>{MODEL_NAME}</code> dapat digunakan dalam URL Anda untuk secara otomatis mengisi nilai-nilai tersebut saat melihat aset - contohnya https://checkcoverage.apple.com/{LOCALE}/{SERIAL}.',
     'does_not_exist' => 'Produsen tidak ada.',
     'assoc_users'	 => 'Produsen ini saat ini dikaitkan dengan setidaknya satu model dan tidak dapat dihapus. Perbarui model Anda yang tidak ada referensi dari produsen ini dan coba lagi. ',
 
diff --git a/resources/lang/id-ID/admin/manufacturers/table.php b/resources/lang/id-ID/admin/manufacturers/table.php
index 2382c48885..4b505e021b 100644
--- a/resources/lang/id-ID/admin/manufacturers/table.php
+++ b/resources/lang/id-ID/admin/manufacturers/table.php
@@ -10,7 +10,7 @@ return array(
     'support_email'   		=> 'Dukungan Email',
     'support_phone'   		=> 'Dukungan Telp',
     'support_url'   		=> 'URL Dukungan',
-    'warranty_lookup_url'   => 'Warranty Lookup URL',
+    'warranty_lookup_url'   => 'URL Pencarian Garansi',
     'update'				=> 'Perbarui Merek',
 
 );
diff --git a/resources/lang/id-ID/admin/models/general.php b/resources/lang/id-ID/admin/models/general.php
index 9f27718302..dcb3eb3e77 100644
--- a/resources/lang/id-ID/admin/models/general.php
+++ b/resources/lang/id-ID/admin/models/general.php
@@ -3,10 +3,10 @@
 return array(
     'about_models_title'     => 'Tentang Model Aset',
     'about_models_text'           => 'Model Aset adalah cara untuk mengelompokkan aset identik. "MBP 2013", "IPhone 6s", dll.',
-    'deleted'  					        => 'Aset ini telah dihapus.',
+    'deleted'  					=> 'Aset ini telah dihapus.',
     'bulk_delete'               => 'Menghapus massal aset model',
     'bulk_delete_help'               => 'Centang kotak di bawah untuk mengkonfirmasi penghapusan model aset yang dipilih. Model aset yang memiliki aset yang terkait dengannya tidak dapat dihapus sampai aset dikaitkan dengan model yang berbeda.',
-    'bulk_delete_warn'          => 'You are about to delete one asset model.|You are about to delete :model_count asset models.',
+    'bulk_delete_warn'          => 'Anda akan menghapus satu model aset.|Anda akan menghapus :model_count model aset.',
     'restore'                   => 'Mengembalikan Model',
     'requestable'               => 'Pengguna dapat meminta model ini',
 	'show_mac_address'			      => 'Tampilkan alamat MAC di aset untuk model ini',
diff --git a/resources/lang/id-ID/admin/models/message.php b/resources/lang/id-ID/admin/models/message.php
index faac80d94e..b0cf3bdd8b 100644
--- a/resources/lang/id-ID/admin/models/message.php
+++ b/resources/lang/id-ID/admin/models/message.php
@@ -2,12 +2,12 @@
 
 return array(
 
-    'deleted' => 'Deleted asset model',
+    'deleted' => 'Model aset yang dihapus',
     'does_not_exist' => 'Model tidak ada.',
-    'no_association' => 'WARNING! The asset model for this item is invalid or missing!',
+    'no_association' => 'PERINGATAN! Model aset untuk item ini tidak valid atau hilang!',
     'no_association_fix' => 'Ini akan merusak banyak hal dengan cara yang aneh dan mengerikan. Edit aset ini sekarang untuk menetapkannya sebagai model.',
     'assoc_users'	 => 'Saat ini model tersebut terhubung dengan 1 atau lebih dengan aset dan tidak dapat di hapus. Silahkan hapus aset terlebih dahulu, kemudian coba hapus kembali. ',
-
+    'invalid_category_type' => 'Kategori ini harus berupa kategori aset.',
 
     'create' => array(
         'error'   => 'Model gagal di buat, silahkan coba kembali.',
@@ -34,7 +34,7 @@ return array(
     'bulkedit' => array(
         'error'   		=> 'Tidak ada bidang yang berubah, jadi tidak ada yang diperbarui.',
         'success' 		=> 'Model berhasil diperbarui. |:model_count model berhasil diperbarui.',
-        'warn'          => 'You are about to update the properties of the following model:|You are about to edit the properties of the following :model_count models:',
+        'warn'          => 'Anda akan memperbarui properti model berikut:|Anda akan mengedit properti dari :model_count model berikut:',
 
     ),
 
diff --git a/resources/lang/id-ID/admin/reports/general.php b/resources/lang/id-ID/admin/reports/general.php
index a5bee42432..496a5262a8 100644
--- a/resources/lang/id-ID/admin/reports/general.php
+++ b/resources/lang/id-ID/admin/reports/general.php
@@ -2,16 +2,22 @@
 
 return [
     'info'   => 'Pilih opsi yang Anda inginkan untuk laporan aset Anda.',
-    'deleted_user' => 'Deleted user',
-    'send_reminder' => 'Send reminder',
-    'reminder_sent' => 'Reminder sent',
-    'acceptance_deleted' => 'Acceptance request deleted',
-    'acceptance_request' => 'Acceptance request',
+    'deleted_user' => 'Pengguna yang dihapus',
+    'send_reminder' => 'Kirim pengingat',
+    'cannot_send_reminder' => 'User has been deleted or does not have an email address so cannot receive a reminder',
+    'reminder_sent' => 'Pengingat terkirim',
+    'acceptance_deleted' => 'Permintaan penerimaan dihapus',
+    'acceptance_request' => 'Permintaan penerimaan',
     'custom_export' => [
-        'user_address' => 'User Address',
-        'user_city' => 'User City',
-        'user_state' => 'User State',
-        'user_country' => 'User Country',
-        'user_zip' => 'User Zip'
-    ]
-];
\ No newline at end of file
+        'user_address' => 'Alamat Pengguna',
+        'user_city' => 'Kota Pengguna',
+        'user_state' => 'Provinsi Pengguna',
+        'user_country' => 'Negara Pengguna',
+        'user_zip' => 'Kode Pos Pengguna'
+    ],
+    'open_saved_template' => 'Buka Templat yang Tersimpan',
+    'save_template' =>  'Simpan Templat',
+    'select_a_template' => 'Pilih Templat',
+    'template_name' => 'Nama Templat',
+    'update_template' => 'Perbarui Templat',
+];
diff --git a/resources/lang/id-ID/admin/reports/message.php b/resources/lang/id-ID/admin/reports/message.php
index 32b5924ce8..c3e6fe2754 100644
--- a/resources/lang/id-ID/admin/reports/message.php
+++ b/resources/lang/id-ID/admin/reports/message.php
@@ -1,5 +1,16 @@
 <?php
 
-return array(
-    'error'   => 'Anda harus memilik minimal SATU.'
-);
+return [
+    'about_templates' => 'Tentang Templat Tersimpan',
+    'saving_templates_description' => 'Pilih opsi Anda, lalu masukkan nama templat Anda di kotak di atas dan klik tombol \'Simpan Templat\'. Gunakan dropdown untuk memilih templat yang sebelumnya telah disimpan.',
+    'create'  => [
+        'success' => 'Templat berhasil disimpan',
+    ],
+    'update' => [
+        'success' => 'Templat berhasil diperbarui',
+    ],
+    'delete' => [
+        'success' => 'Templat dihapus',
+        'no_delete_permission' => 'Templat tidak ada atau Anda tidak memiliki izin untuk menghapusnya.',
+    ],
+];
diff --git a/resources/lang/id-ID/admin/settings/general.php b/resources/lang/id-ID/admin/settings/general.php
index 15f8e3e74f..9259ddbe0d 100644
--- a/resources/lang/id-ID/admin/settings/general.php
+++ b/resources/lang/id-ID/admin/settings/general.php
@@ -8,13 +8,13 @@ return [
     'ad_append_domain'          => 'Tambahkan nama domain ke bagian nama pengguna (username)',
     'ad_append_domain_help'     => 'Pengguna tidak diharuskan untuk menulis "nama_pengguna@domain.local", mereka cukup mengetikkan "nama_pengguna".',
     'admin_cc_email'            => 'Tembusan Email',
-    'admin_cc_email_help'       => 'Jika Anda ingin mengirim salinan email checkin / checkout yang dikirimkan ke pengguna akun email tambahan, masukkan di sini. Jika tidak, biarkan bidang ini kosong.',
-    'admin_settings'            => 'Admin Settings',
+    'admin_cc_email_help'       => 'Send a copy of checkin/checkout emails to this address.',
+    'admin_settings'            => 'Pengaturan Admin',
     'is_ad'				        => 'Ini adalah server Active Directory',
     'alerts'                	=> 'Pemberitahuan',
-    'alert_title'               => 'Update Notification Settings',
+    'alert_title'               => 'Perbarui Pengaturan Notifikasi',
     'alert_email'				=> 'Kirim pemberitahuan kepada',
-    'alert_email_help'    => 'Email addresses or distribution lists you want alerts to be sent to, comma separated',
+    'alert_email_help'          => 'Alamat email atau daftar distribusi yang ingin Anda kirimi peringatan, dipisahkan dengan koma.',
     'alerts_enabled'			=> 'Aktifkan pemberitahuan',
     'alert_interval'			=> 'Ambang batas pemberitahuan kadaluarsa (dalam hari)',
     'alert_inv_threshold'		=> 'Ambang pemberitahuan persediaan',
@@ -22,24 +22,27 @@ return [
     'allow_user_skin_help_text' => 'Mencentang kotak ini akan memungkinkan pengguna untuk mengganti skin UI yang berbeda.',
     'asset_ids'					=> 'Aset id',
     'audit_interval'            => 'Interval Audit',
-    'audit_interval_help'       => 'If you are required to regularly physically audit your assets, enter the interval in months that you use. If you update this value, all of the "next audit dates" for assets with an upcoming audit date will be updated.',
+    'audit_interval_help'       => 'Jika Anda diharuskan untuk mengaudit fisik aset Anda secara berkala, masukkan interval dalam bulan yang Anda gunakan. Jika Anda memperbarui nilai ini, semua "tanggal audit berikutnya" untuk aset dengan tanggal audit mendatang akan diperbarui.',
     'audit_warning_days'        => 'Ambang Peringatan Audit',
     'audit_warning_days_help'   => 'Berapa hari sebelumnya yang harus kami peringatkan saat aset akan dilelang?',
-    'auto_increment_assets'		=> 'Generate auto-incrementing asset tags',
+    'auto_increment_assets'		=> 'Buat tag aset yang bertambah otomatis',
     'auto_increment_prefix'		=> 'Awalan (pilihan)',
-    'auto_incrementing_help'    => 'Enable auto-incrementing asset tags first to set this',
+    'auto_incrementing_help'    => 'Aktifkan tag aset yang bertambah otomatis terlebih dahulu untuk mengatur ini',
     'backups'					=> 'Cadangan',
-    'backups_help'              => 'Create, download, and restore backups ',
-    'backups_restoring'         => 'Restoring from Backup',
-    'backups_upload'            => 'Upload Backup',
-    'backups_path'              => 'Backups on the server are stored in <code>:path</code>',
-    'backups_restore_warning'   => 'Use the restore button <small><span class="btn btn-xs btn-warning"><i class="text-white fas fa-retweet" aria-hidden="true"></i></span></small> to restore from a previous backup. (This does not currently work with S3 file storage or Docker.)<br><br>Your <strong>entire :app_name database and any uploaded files will be completely replaced</strong> by what\'s in the backup file.  ',
-    'backups_logged_out'         => 'All existing users, including you, will be logged out once your restore is complete.',
-    'backups_large'             => 'Very large backups may time out on the restore attempt and may still need to be run via command line. ',
+    'backups_help'              => 'Buat, unduh, dan pulihkan cadangan ',
+    'backups_restoring'         => 'Memulihkan dari Cadangan',
+    'backups_clean' => 'Bersihkan database yang dicadangkan sebelum pemulihan',
+    'backups_clean_helptext' => "Ini dapat berguna jika Anda beralih antar versi database",
+    'backups_upload'            => 'Unggah Cadangan',
+    'backups_path'              => 'Cadangan di server disimpan di <code>:path</code>',
+    'backups_restore_warning'   => 'Use the restore button <small><span class="btn btn-xs btn-warning"><i class="text-white fas fa-retweet" aria-hidden="true"></i></span></small> to restore from a previous backup. (This does not currently work with S3 file storage or Docker.)<br><br>Your <strong>entire :app_name database and any uploaded files will be completely replaced</strong> by what\'s in the backup file  ',
+    'backups_logged_out'         => 'Semua pengguna yang ada, termasuk Anda, akan keluar setelah pemulihan selesai.',
+    'backups_large'             => 'Cadangan yang sangat besar mungkin mengalami timeout pada percobaan pemulihan dan mungkin masih perlu dijalankan melalui baris perintah. ',
     'barcode_settings'			=> 'Pengaturan barcode',
     'confirm_purge'			    => 'Konfirmasi pembersihan',
     'confirm_purge_help'		=> 'Ketikkan teks "HAPUS" pada kotak di bawah ini untuk menghapus catatan yang dipilih. Tindakan ini tidak dapat diurungkan dan secara PERMANEN akan menghapus semua item dan pengguna yang dihapus sementara. (Anda harus membuat cadangan terlebih dahulu, demi keamanan data anda.)',
     'custom_css'				=> 'Custom CSS',
+    'custom_css_placeholder'	=> 'Add your custom CSS',
     'custom_css_help'			=> 'Masukan modifikasi CSS yang hendak anda gunakan. Jangan sertakan &lt;style&gt;&lt;/style&gt; tags.',
     'custom_forgot_pass_url'	=> 'URL Reset Kata Sandi Kustom',
     'custom_forgot_pass_url_help'	=> 'Ini menggantikan URL lupa kata sandi bawaan pada layar login, berguna untuk mengarahkan orang ke fungsi reset kata sandi LDAP internal atau yang dihosting. Ini secara efektif akan menonaktifkan fungsionalitas lupa kata sandi lokal.',
@@ -47,40 +50,40 @@ return [
     'dashboard_message_help'	=> 'Teks ini akan muncul di dasbor bagi siapa pun yang memiliki izin untuk melihat dasbor.',
     'default_currency'  		=> 'Mata uang utama',
     'default_eula_text'			=> 'EULA utama',
+    'default_eula_text_placeholder' => 'Add your default EULA text',
     'default_language'			=> 'Bahasa utama',
     'default_eula_help_text'	=> 'Anda juga dapat mengaitkan kustom EULAs untuk kategori aset tertentu.',
-    'acceptance_note'           => 'Add a note for your decision (Optional)',
+    'acceptance_note'           => 'Tambahkan catatan untuk keputusan Anda (Opsional)',
     'display_asset_name'        => 'Tampilan Nama Aset',
     'display_checkout_date'     => 'Tampilan Tanggal Keluar',
     'display_eol'               => 'Tampilan EOL dalam bentuk tabel',
-    'display_qr'                => 'Tampilan kode kotak',
+    'display_qr'                => 'Tampilkan barcode 2D',
     'display_alt_barcode'		=> 'Tampilan barcode 1D',
-    'email_logo'                => 'Logo Email',
     'barcode_type'				=> 'Tipe Barcode 2D',
     'alt_barcode_type'			=> 'Tipe Barcode 1D',
-    'email_logo_size'       => 'Logo persegi/kotak di email terlihat paling sesuai. ',
-    'enabled'                   => 'Enabled',
+    'enabled'                   => 'Diaktifkan',
     'eula_settings'				=> 'Konfigurasi EULA',
     'eula_markdown'				=> 'EULA mengijinkan <a href="https://help.github.com/articles/github-flavored-markdown/">Github flavored markdown</a>.',
+    'empty_row_count'           => 'Field Start Offset (Empty Rows)',
+    'empty_row_count_help'      => 'Fields will begin populating after this many empty rows are skipped at the top of the label.',
     'favicon'                   => 'Favicon',
     'favicon_format'            => 'Jenis file yang diterima adalah ico, png, dan gif. Format gambar lain mungkin tidak berfungsi di semua browser.',
     'favicon_size'          => 'Favicons harus berupa gambar persegi/kotak, ukuran 16x16 piksel.',
     'footer_text'               => 'Teks Footer Tambahan ',
     'footer_text_help'          => 'Teks ini akan muncul di footer sebelah kanan. Tautan diizinkan menggunakan <a href="https://help.github.com/articles/github-flavored-markdown/">marka bergaya Github</a>. Baris baru, header, gambar, dll mungkin akan mengakibatkan hasil yang tidak sesuai.',
+    'footer_text_placeholder'   => 'Optional footer text',
     'general_settings'			=> 'Konfigurasi umum',
-    'general_settings_keywords' => 'company support, signature, acceptance, email format, username format, images, per page, thumbnail, eula, gravatar, tos, dashboard, privacy',
-    'general_settings_help'     => 'Default EULA and more',
+    'general_settings_help'     => 'EULA Default dan lainnya',
     'generate_backup'			=> 'Membuat cadangan',
-    'google_workspaces'         => 'Google Workspaces',
+    'google_workspaces'         => 'Google Workspace',
     'header_color'              => 'Warna Header',
     'info'                      => 'Dengan pengaturan ini anda dapat merubah aspek tertentu pada instalasi.',
-    'label_logo'                => 'Label Logo',
     'label_logo_size'           => 'Logo persegi/kotak terlihat sesuai - akan ditampilkan di kanan atas setiap label aset. ',
     'laravel'                   => 'Versi Laravel',
     'ldap'                      => 'LDAP',
-    'ldap_default_group'        => 'Default Permissions Group',
-    'ldap_default_group_info'   => 'Select a group to assign to newly synced users. Remember that a user takes on the permissions of the group they are assigned.',
-    'no_default_group'          => 'No Default Group',
+    'ldap_default_group'        => 'Grup Izin Default',
+    'ldap_default_group_info'   => 'Pilih grup untuk ditetapkan kepada pengguna yang baru disinkronkan. Ingatlah bahwa pengguna mengambil izin dari grup tempat mereka ditetapkan.',
+    'no_default_group'          => 'Tidak Ada Grup Default',
     'ldap_help'                 => 'LDAP/Active Directory',
     'ldap_client_tls_key'       => 'Kunci TLS Client-Side LDAP',
     'ldap_client_tls_cert'      => 'Sertifikat TLS Client-Side LDAP',
@@ -88,13 +91,13 @@ return [
     'ldap_integration'          => 'Integrasi LDAP',
     'ldap_settings'             => 'Konfigurasi LDAP',
     'ldap_client_tls_cert_help' => 'Sertifikat Client-Side TLS dan Kunci untuk koneksi LDAP biasanya hanya berguna di konfigurasi Google Workspace dengan "Secure LDAP". Keduanya diperlukan.',
-    'ldap_location'             => 'LDAP Location',
-'ldap_location_help'             => 'The Ldap Location field should be used if <strong>an OU is not being used in the Base Bind DN.</strong> Leave this blank if an OU search is being used.',
+    'ldap_location'             => 'Lokasi LDAP',
+'ldap_location_help'             => 'Isian kolom Lokasi LDAP harus digunakan jika <strong>OU tidak digunakan dalam Base Bind DN.</strong> Kosongkan ini jika pencarian OU sedang digunakan.',
     'ldap_login_test_help'      => 'Masukkan nama pengguna dan kata sandi LDAP yang valid dari DN dasar yang Anda tentukan di atas untuk menguji apakah pengaturan login LDAP Anda telah dikonfigurasi dengan benar. PERTAMA-TAMA ANDA HARUS MENYIMPAN PENGATURAN LDAP ANDA.',
     'ldap_login_sync_help'      => 'Ini hanya menguji bahwa LDAP dapat tersinkronisasi dengan benar. Jika kueri Otentikasi LDAP Anda tidak benar, pengguna mungkin masih belum dapat masuk. PERTAMA-TAMA ANDA HARUS MENYIMPAN PENGATURAN LDAP ANDA.',
-    'ldap_manager'              => 'LDAP Manager',
+    'ldap_manager'              => 'Pengelola LDAP',
     'ldap_server'               => 'LDAP Server',
-    'ldap_server_help'          => 'Ini harus dimulai dengan ldap: / / (untuk tidak terenkripsi atau TLS) atau ldaps: / / (untuk SSL)',
+    'ldap_server_help'          => 'Ini harus dimulai dengan ldap:// (untuk yang tidak terenkripsi) atau ldaps:// (untuk TLS atau SSL)',
     'ldap_server_cert'			=> 'Validasi sertifikat LDAP SSL',
     'ldap_server_cert_ignore'	=> 'Izinkan sertifikat SSL tak terdaftar',
     'ldap_server_cert_help'		=> 'Pilih kotak ini jika anda menggunakan sertifikat SSL self sign dan menerima sertifikat SSL yang tak terdaftar.',
@@ -108,29 +111,32 @@ return [
     'ldap_pword'                => 'Katakunci LDAP',
     'ldap_basedn'               => 'Base Bind DN',
     'ldap_filter'               => 'Saring LDAP',
-    'ldap_pw_sync'              => 'Sinkronisasi Password LDAP',
-    'ldap_pw_sync_help'         => 'Hapus tanda centang kotak ini jika Anda tidak ingin menyimpan password LDAP disinkronkan dengan password lokal. Menonaktifkan ini berarti bahwa pengguna Anda mungkin tidak bisa login jika server LDAP Anda tidak bisa diakses untuk beberapa alasan.',
+    'ldap_pw_sync'              => 'Cache LDAP Passwords',
+    'ldap_pw_sync_help'         => 'Uncheck this box if you do not wish to keep LDAP passwords cached as local hashed passwords. Disabling this means that your users may not be able to login if your LDAP server is unreachable for some reason.',
     'ldap_username_field'       => 'Kolom nama pengguna',
     'ldap_lname_field'          => 'Nama Belakang',
     'ldap_fname_field'          => 'LDAP Nama Depan',
     'ldap_auth_filter_query'    => 'Permintaan Otentikasi LDAP',
     'ldap_version'              => 'Versi LDAP',
     'ldap_active_flag'          => 'LDAP Active Flag',
-    'ldap_activated_flag_help'  => 'This value is used to determine whether a synced user can login to Snipe-IT. <strong>It does not affect the ability to check items in or out to them</strong>, and should be the <strong>attribute name</strong> within your AD/LDAP, <strong>not the value</strong>. <br><br>If this field is set to a field name that does not exist in your AD/LDAP, or the value in the AD/LDAP field is set to <code>0</code> or <code>false</code>, <strong>user login will be disabled</strong>. If the value in the AD/LDAP field is set to <code>1</code> or <code>true</code> or <em>any other text</em> means the user can log in. When the field is blank in your AD, we respect the <code>userAccountControl</code> attribute, which usually allows non-suspended users to log in.',
+    'ldap_activated_flag_help'  => 'Nilai ini digunakan untuk menentukan apakah pengguna yang disinkronkan dapat masuk ke Snipe-IT. <strong>Ini tidak memengaruhi kemampuan untuk memeriksa barang yang dipinjamkan atau dikembalikan kepada mereka</strong>, dan harus berupa <strong>nama atribut</strong> dalam AD/LDAP Anda, <strong>bukan nilainya</strong>. <br><br>Jika kolom ini diatur ke nama kolom yang tidak ada di AD/LDAP Anda, atau nilai di kolom AD/LDAP diatur ke <code>0</code> atau <code>false</code>, <strong>login pengguna akan dinonaktifkan</strong>. Jika nilai di kolom AD/LDAP diatur ke <code>1</code> atau <code>true</code> atau <em>teks lainnya</em>, maka pengguna dapat login. Ketika kolom tersebut kosong di AD Anda, kami menghormati atribut <code>userAccountControl</code>, yang biasanya memungkinkan pengguna yang tidak ditangguhkan untuk masuk.',
+    'ldap_invert_active_flag'   => 'LDAP Invert Active Flag',
+    'ldap_invert_active_flag_help'     => 'If enabled: when the value returned by LDAP Active Flag is <code>0</code> or <code>false</code> the user account will be active.',
     'ldap_emp_num'              => 'Nomor karyawan LDAP',
     'ldap_email'                => 'LDAP Email',
-    'ldap_test'                 => 'Test LDAP',
-    'ldap_test_sync'            => 'Test LDAP Synchronization',
+    'ldap_test'                 => 'Uji LDAP',
+    'ldap_test_sync'            => 'Uji Sinkronisasi LDAP',
     'license'                   => 'Lisensi Perangkat Lunak',
-    'load_remote'               => 'Use Gravatar',
-    'load_remote_help_text'		=> 'Uncheck this box if your install cannot load scripts from the outside internet. This will prevent Snipe-IT from trying load images from Gravatar.',
-    'login'                     => 'Login Attempts',
-    'login_attempt'             => 'Login Attempt',
-    'login_ip'                  => 'IP Address',
+    'load_remote'               => 'Muat Avatar Jarak Jauh',
+    'load_remote_help_text'		=> 'Hapus centang kotak ini jika instalasi Anda tidak dapat memuat skrip dari internet eksternal. Ini akan mencegah Snipe-IT mencoba memuat avatar dari Gravatar atau sumber eksternal lainnya.',
+    'login'                     => 'Percobaan Login',
+    'login_attempt'             => 'Percobaan Login',
+    'login_ip'                  => 'Alamat IP',
     'login_success'             => 'Sukses?',
     'login_user_agent'          => 'User Agent',
-    'login_help'                => 'List of attempted logins',
+    'login_help'                => 'Daftar percobaan login',
     'login_note'                => 'Login Catatan',
+    'login_note_placeholder'            => "If you do not have a login or have found a device belonging to this company, please call technical support at 888-555-1212. Thank you.",
     'login_note_help'           => 'Opsional memasukkan beberapa kalimat di layar masuk Anda, misalnya untuk membantu orang-orang yang telah menemukan perangkat yang hilang atau dicuri. Bidang ini menerima <a href="https://help.github.com/articles/github-flavored-markdown/">posur rasa Github</a>',
     'login_remote_user_text'    => 'Opsi masuk Pengguna Jarak Jauh',
     'login_remote_user_enabled_text' => 'Aktifkan Login dengan Remote User Header',
@@ -146,23 +152,26 @@ return [
     'logo_print_assets_help'    => 'Menggunakan branding Anda pada semua hasil cetak daftar aset ',
     'full_multiple_companies_support_help_text' => 'Membatasi pengguna (termasuk admin) diberikan kepada perusahaan untuk aset perusahaan mereka.',
     'full_multiple_companies_support_text' => 'Dukungan penuh beberapa perusahaan',
+    'scope_locations_fmcs_support_text'  => 'Scope Locations with Full Multiple Companies Support',
+    'scope_locations_fmcs_support_help_text'  => 'Restrict locations to their selected company.',
+    'scope_locations_fmcs_check_button' => 'Check Compatibility',
+    'scope_locations_fmcs_support_disabled_text'  => 'This option is disabled because you have conflicting locations set for :count or more items.',
     'show_in_model_list'   => 'Tampilkan dalam Model Dropdown',
     'optional'					=> 'pilihan',
     'per_page'                  => 'Hasil per halaman',
     'php'                       => 'Versi PHP',
-    'php_info'                  => 'PHP Info',
+    'php_info'                  => 'PHP info',
     'php_overview'              => 'PHP',
-    'php_overview_keywords'     => 'phpinfo, system, info',
     'php_overview_help'         => 'PHP System info',
     'php_gd_info'               => 'Anda harus memasang php-gd untuk menampilkan kode QR, baca petunjuk pemasangan.',
     'php_gd_warning'            => 'Plugin PHP pengolahan citra dan GD tidak diinstal.',
     'pwd_secure_complexity'     => 'Kompleksitas Password',
     'pwd_secure_complexity_help' => 'Pilih aturan kerumitan kompleksitas yang ingin Anda tegakkan.',
-    'pwd_secure_complexity_disallow_same_pwd_as_user_fields' => 'Password cannot be the same as first name, last name, email, or username',
-    'pwd_secure_complexity_letters' => 'Require at least one letter',
-    'pwd_secure_complexity_numbers' => 'Require at least one number',
-    'pwd_secure_complexity_symbols' => 'Require at least one symbol',
-    'pwd_secure_complexity_case_diff' => 'Require at least one uppercase and one lowercase',
+    'pwd_secure_complexity_disallow_same_pwd_as_user_fields' => 'Kata sandi tidak boleh sama dengan nama depan, nama belakang, email, atau nama pengguna',
+    'pwd_secure_complexity_letters' => 'Mengharuskan setidaknya satu huruf',
+    'pwd_secure_complexity_numbers' => 'Mengharuskan setidaknya satu angka',
+    'pwd_secure_complexity_symbols' => 'Mengharuskan setidaknya satu simbol',
+    'pwd_secure_complexity_case_diff' => 'Mengharuskan setidaknya satu huruf besar dan satu huruf kecil',
     'pwd_secure_min'            => 'Karakter minimum kata sandi',
     'pwd_secure_min_help'       => 'Nilai minimum yang diizinkan adalah 8',
     'pwd_secure_uncommon'       => 'Mencegah password umum',
@@ -170,8 +179,8 @@ return [
     'qr_help'                   => 'Hidupkan kode QR sebelumnya',
     'qr_text'                   => 'Teks kode QR',
     'saml'                      => 'SAML',
-    'saml_title'                => 'Update SAML settings',
-    'saml_help'                 => 'SAML settings',
+    'saml_title'                => 'Perbarui pengaturan SAML',
+    'saml_help'                 => 'Pengaturan SAML',
     'saml_enabled'              => 'SAML diaktifkan',
     'saml_integration'          => 'Integrasi SAML',
     'saml_sp_entityid'          => 'ID Entitas',
@@ -191,7 +200,7 @@ return [
     'saml_slo_help'             => 'Ini akan menyebabkan pengguna pertama kali diarahkan ke IdP saat logout. Biarkan tidak dicentang jika IdP tidak mendukung SLO SAML yang dimulai SP dengan benar.',
     'saml_custom_settings'      => 'Pengaturan Kustom SAML',
     'saml_custom_settings_help' => 'Anda dapat menentukan pengaturan tambahan ke perpustakaan onelogin/php-saml. Gunakan dengan risiko Anda sendiri.',
-    'saml_download'             => 'Download Metadata',
+    'saml_download'             => 'Unduh Metadata',
     'setting'                   => 'Pengaturan',
     'settings'                  => 'Pengaturan',
     'show_alerts_in_menu'       => 'Tampilkan pemberitahuan di menu atas',
@@ -202,22 +211,24 @@ return [
     'show_images_in_email'     => 'Tampilkan gambar dalam email',
     'show_images_in_email_help'   => 'Hapus centang kotak ini jika instalasi Snipe-IT Anda berada di belakang VPN atau jaringan tertutup dan pengguna di luar jaringan tidak akan dapat memuat gambar yang disajikan dari instalasi ini di email mereka.',
     'site_name'                 => 'Nama Situs',
-    'integrations'               => 'Integrations',
+    'integrations'               => 'Integrasi',
     'slack'                     => 'Slack',
-    'general_webhook'           => 'General Webhook',
+    'general_webhook'           => 'Webhook General',
     'ms_teams'                  => 'Microsoft Teams',
     'webhook'                   => ':app',
-    'webhook_presave'           => 'Test to Save',
-    'webhook_title'               => 'Update Webhook Settings',
-    'webhook_help'                => 'Integration settings',
+    'webhook_presave'           => 'Uji Menyimpan',
+    'webhook_title'               => 'Perbarui Pengaturan Webhook',
+    'webhook_help'                => 'Pengaturan Integrasi',
     'webhook_botname'             => ':app Botname',
     'webhook_channel'             => ':app Channel',
     'webhook_endpoint'            => ':app Endpoint',
     'webhook_integration'         => ':app Settings',
-    'webhook_test'                 =>'Test :app integration',
-    'webhook_integration_help'    => ':app integration is optional, however the endpoint and channel are required if you wish to use it. To configure :app integration, you must first <a href=":webhook_link" target="_new" rel="noopener">create an incoming webhook</a> on your :app account. Click on the <strong>Test :app Integration</strong> button to confirm your settings are correct before saving. ',
-    'webhook_integration_help_button'    => 'Once you have saved your :app information, a test button will appear.',
-    'webhook_test_help'           => 'Test whether your :app integration is configured correctly. YOU MUST SAVE YOUR UPDATED :app SETTINGS FIRST.',
+    'webhook_test'                 =>'Uji integrasi :app',
+    'webhook_integration_help'    => 'Integrasi :app bersifat opsional, namun endpoint dan channel diperlukan jika Anda ingin menggunakannya. Untuk mengonfigurasi integrasi :app, Anda harus terlebih dahulu <a href=":webhook_link" target="_new" rel="noopener">membuat webhook masuk</a> di akun :app Anda. Klik tombol <strong>Uji Integrasi :app</strong> untuk memastikan pengaturan Anda benar sebelum menyimpan. ',
+    'webhook_integration_help_button'    => 'Setelah Anda menyimpan informasi :app Anda, tombol uji akan muncul.',
+    'webhook_test_help'           => 'Uji apakah integrasi :app Anda dikonfigurasi dengan benar. ANDA HARUS MENYIMPAN PENGATURAN :app YANG TELAH DIPERBARUI TERLEBIH DAHULU.',
+    'shortcuts_enabled'         => 'Aktifkan Shortcut',
+    'shortcuts_help_text'       => '<strong>Windows</strong>: Alt + Access key, <strong>Mac</strong>: Control + Option + Access key',
     'snipe_version'  			=> 'Versi Snipe-IT',
     'support_footer'            => 'Mendukung Footer Links ',
     'support_footer_help'       => 'Tentukan siapa yang melihat tautan ke info Dukungan Snipe-IT dan Panduan Pengguna',
@@ -227,8 +238,7 @@ return [
     'update'                    => 'Pengaturan perbaruan',
     'value'                     => 'Harga',
     'brand'                     => 'Merek',
-    'brand_keywords'            => 'footer, logo, print, theme, skin, header, colors, color, css',
-    'brand_help'                => 'Logo, Site Name',
+    'brand_help'                => 'Logo, Nama Website',
     'web_brand'                 => 'Jenis Web Branding',
     'about_settings_title'      => 'Tentang pengaturan',
     'about_settings_text'       => 'Dengan pengaturan ini anda dapat merubah aspek tertentu pada instalasi.',
@@ -240,7 +250,7 @@ return [
     'privacy_policy'            => 'Kebijakan privasi',
     'privacy_policy_link_help'  => 'Jika url disertakan di sini, tautan ke kebijakan privasi Anda akan dimasukkan dalam footer aplikasi dan di email apa pun yang dikirimkan sistem, sesuai dengan GDPR. ',
     'purge'                     => 'Pembersihan catatan yang telah terhapus',
-    'purge_deleted'             => 'Purge Deleted ',
+    'purge_deleted'             => 'Hapus Permanen Data Terhapus ',
     'labels_display_bgutter'    => 'Ukuran bawah label',
     'labels_display_sgutter'    => 'Ukuran samping label',
     'labels_fontsize'           => 'Ukuran huruf label',
@@ -262,7 +272,7 @@ return [
     'two_factor_enrollment'        => 'Pendaftaran Dua Faktor',
     'two_factor_enabled_text'        => 'Aktifkan Dua Faktor',
     'two_factor_reset'        => 'Reset Dua Faktor Rahasia',
-    'two_factor_reset_help'        => 'This will force the user to enroll their device with their authenticator app again. This can be useful if their currently enrolled device is lost or stolen. ',
+    'two_factor_reset_help'        => 'Ini akan memaksa pengguna untuk mendaftarkan perangkat mereka dengan aplikasi autentikator mereka lagi. Ini dapat berguna jika perangkat mereka yang terdaftar saat ini hilang atau dicuri. ',
     'two_factor_reset_success'          => 'Dua perangkat faktor berhasil di-reset',
     'two_factor_reset_error'          => 'Dua faktor perangkat reset gagal',
     'two_factor_enabled_warning'        => 'Mengaktifkan dua faktor jika saat ini tidak diaktifkan akan segera memaksa Anda untuk melakukan otentikasi dengan perangkat yang terdaftar di Google Auth. Anda akan memiliki kemampuan untuk mendaftarkan perangkat Anda jika seseorang tidak terdaftar saat ini.',
@@ -276,6 +286,8 @@ return [
     'two_factor_enrollment_text'	=> "Diperlukan dua faktor otentikasi, namun perangkat Anda belum terdaftar. Buka aplikasi Google Authenticator Anda dan pindai kode QR di bawah ini untuk mendaftarkan perangkat Anda. Setelah mendaftarkan perangkat Anda, masukkan kode di bawah ini",
     'require_accept_signature'      => 'Membutuhkan tanda tangan',
     'require_accept_signature_help_text'      => 'Mengaktifkan fitur ini akan mengharuskan pengguna untuk secara fisik menandatangani untuk menerima aset.',
+    'require_checkinout_notes'  => 'Wajibkan Catatan pada Saat Pengembalian/Peminjaman',
+    'require_checkinout_notes_help_text'    => 'Mengaktifkan fitur ini akan mewajibkan pengisian kolom catatan saat mengembalikan atau meminjam-mengambil aset.',
     'left'        => 'kiri',
     'right'        => 'kanan',
     'top'        => 'atas',
@@ -286,94 +298,193 @@ return [
     'unique_serial_help_text'                => 'Menandai boks ini akan membuat adanya batasan keunikan pada tiap nomor seri aset',
     'zerofill_count'        => 'Jarak tag aset, termasuk angka nol',
     'username_format_help'   => 'Pengaturan ini hanya akan digunakan oleh proses impor jika nama pengguna tidak diberikan dan kami harus membuatkan nama pengguna untuk Anda.',
-    'oauth_title' => 'OAuth API Settings',
-    'oauth_clients' => 'OAuth Clients',
+    'oauth_title' => 'Pengaturan API OAuth',
+    'oauth_clients' => 'Klien OAuth',
     'oauth' => 'OAuth',
-    'oauth_help' => 'Oauth Endpoint Settings',
-    'oauth_no_clients' => 'You have not created any OAuth clients yet.',
-    'oauth_secret' => 'Secret',
-    'oauth_authorized_apps' => 'Authorized Applications',
-    'oauth_redirect_url' => 'Redirect URL',
-    'oauth_name_help' => ' Something your users will recognize and trust.',
-    'oauth_scopes' => 'Scopes',
-    'oauth_callback_url' => 'Your application authorization callback URL.',
-    'create_client' => 'Create Client',
-    'no_scopes' => 'No scopes',
-    'asset_tag_title' => 'Update Asset Tag Settings',
-    'barcode_title' => 'Update Barcode Settings',
-    'barcodes' => 'Barcodes',
-    'barcodes_help_overview' => 'Barcode &amp; QR settings',
-    'barcodes_help' => 'This will attempt to delete cached barcodes. This would typically only be used if your barcode settings have changed, or if your Snipe-IT URL has changed. Barcodes will be re-generated when accessed next.',
-    'barcodes_spinner' => 'Attempting to delete files...',
-    'barcode_delete_cache' => 'Delete Barcode Cache',
-    'branding_title' => 'Update Branding Settings',
-    'general_title' => 'Update General Settings',
-    'mail_test' => 'Send Test',
-    'mail_test_help' => 'This will attempt to send a test mail to :replyto.',
-    'filter_by_keyword' => 'Filter by setting keyword',
-    'security' => 'Security',
-    'security_title' => 'Update Security Settings',
-    'security_keywords' => 'password, passwords, requirements, two factor, two-factor, common passwords, remote login, logout, authentication',
-    'security_help' => 'Two-factor, Password Restrictions',
-    'groups_keywords' => 'permissions, permission groups, authorization',
-    'groups_help' => 'Account permission groups',
-    'localization' => 'Localization',
-    'localization_title' => 'Update Localization Settings',
-    'localization_keywords' => 'localization, currency, local, locale, time zone, timezone, international, internatinalization, language, languages, translation',
-    'localization_help' => 'Language, date display',
-    'notifications' => 'Notifications',
-    'notifications_help' => 'Email Alerts & Audit Settings',
-    'asset_tags_help' => 'Incrementing and prefixes',
-    'labels' => 'Labels',
-    'labels_title' => 'Update Label Settings',
-    'labels_help' => 'Label sizes &amp; settings',
-    'purge_keywords' => 'permanently delete',
+    'oauth_help' => 'Pengaturan Oauth Endpoint',
+    'oauth_no_clients' => 'Anda belum membuat klien OAuth.',
+    'oauth_secret' => 'Rahasia',
+    'oauth_authorized_apps' => 'Aplikasi yang Diotorisasi',
+    'oauth_redirect_url' => 'URL Pengalihan',
+    'oauth_name_help' => ' Sesuatu yang akan dikenali dan dipercaya oleh pengguna Anda.',
+    'oauth_scopes' => 'Cakupan',
+    'oauth_callback_url' => 'URL callback otorisasi aplikasi Anda',
+    'create_client' => 'Buat Klien',
+    'no_scopes' => 'Tidak adan cakupan',
+    'asset_tag_title' => 'Perbarui Pengaturan Tag Aset',
+    'barcode_title' => 'Perbarui Pengaturan Barcode',
+    'barcodes' => 'Barcode',
+    'barcodes_help_overview' => 'Pengaturan Barkode &amp; QR',
+    'barcodes_help' => 'Ini akan mencoba menghapus barcode yang di-cache. Ini biasanya hanya digunakan jika pengaturan barcode Anda telah berubah, atau jika URL Snipe-IT Anda telah berubah. Barcode akan dibuat ulang saat diakses berikutnya.',
+    'barcodes_spinner' => 'Mencoba menghapus file...',
+    'barcode_delete_cache' => 'Hapus Cache Barcode',
+    'branding_title' => 'Perbarui Pengaturan Branding atau Merk',
+    'general_title' => 'Perbarui Pengaturan Umum',
+    'mail_test' => 'Kirim Percobaan',
+    'mail_test_help' => 'Ini akan mencoba mengirim email percobaan ke :replyto.',
+    'filter_by_keyword' => 'Filter dengan mengatur kata kunci',
+    'security' => 'Keamanan',
+    'security_title' => 'Perbarui Pengaturan Keamanan',
+    'security_help' => 'Dua Faktor, Batasan Kata Sandi',
+    'groups_help' => 'Grup izin akun',
+    'localization' => 'Lokalisasi',
+    'localization_title' => 'Perbarui Pengaturan Lokalisasi',
+    'localization_help' => 'Bahasa, tampilan tanggal',
+    'notifications' => 'Notifikasi',
+    'notifications_help' => 'Peringatan Email & Pengaturan Audit',
+    'asset_tags_help' => 'Penambahan dan awalan',
+    'labels' => 'Label',
+    'labels_title' => 'Perbarui Pengaturan Label',
+    'labels_help' => 'Pengaturan Barcode &amp; label',
     'purge_help' => 'Pembersihan catatan yang telah terhapus',
-    'ldap_extension_warning' => 'It does not look like the LDAP extension is installed or enabled on this server. You can still save your settings, but you will need to enable the LDAP extension for PHP before LDAP syncing or login will work.',
+    'ldap_extension_warning' => 'Sepertinya ekstensi LDAP tidak terinstal atau diaktifkan di server ini. Anda masih dapat menyimpan pengaturan, tetapi Anda perlu mengaktifkan ekstensi LDAP untuk PHP sebelum sinkronisasi atau login LDAP berfungsi.',
     'ldap_ad' => 'LDAP/AD',
+    'ldap_test_label' => 'Test LDAP Sync',
+    'ldap_test_login' => ' Test LDAP Login',
+    'ldap_username_placeholder' => 'LDAP Username',
+    'ldap_password_placeholder' => 'LDAP Password',
     'employee_number' => 'Nomor Karyawan',
-    'create_admin_user' => 'Create a User ::',
-    'create_admin_success' => 'Success! Your admin user has been added!',
-    'create_admin_redirect' => 'Click here to go to your app login!',
-    'setup_migrations' => 'Database Migrations ::',
-    'setup_no_migrations' => 'There was nothing to migrate. Your database tables were already set up!',
+    'create_admin_user' => 'Buat Pengguna',
+    'create_admin_success' => 'Berhasil! Pengguna admin Anda telah ditambahkan!',
+    'create_admin_redirect' => 'Klik di sini untuk menuju login aplikasi Anda!',
+    'setup_migrations' => 'Migrasi Database ::',
+    'setup_no_migrations' => 'Tidak ada yang perlu dimigrasikan. Tabel database Anda sudah diatur!',
     'setup_successful_migrations' => 'Tabel database Anda telah dibuat',
     'setup_migration_output' => 'Keluaran migrasi:',
     'setup_migration_create_user' => 'Selanjutnya: Buat Pengguna',
-    'ldap_settings_link' => 'LDAP Settings Page',
-    'slack_test' => 'Test <i class="fab fa-slack"></i> Integration',
-    'label2_enable'           => 'New Label Engine',
-    'label2_enable_help'      => 'Switch to the new label engine. <b>Note: You will need to save this setting before setting others.</b>',
-    'label2_template'         => 'Template',
-    'label2_template_help'    => 'Select which template to use for label generation',
+    'ldap_settings_link' => 'Halaman Pengaturan LDAP',
+    'slack_test' => 'Uji <i class="fab fa-slack"></i> Integrasi',
+    'status_label_name' => 'Status Label Name',
+    'super_admin_only'  => 'Super Admin Only',
+    'label2_enable'           => 'Mesin Label Baru',
+    'label2_enable_help'      => 'Beralih ke mesin label baru. <b> Catatan: Anda perlu menyimpan pengaturan ini sebelum mengatur yang lain.<b>',
+    'label2_template'         => 'Templat',
+    'label2_template_help'    => 'Pilih templat yang digunakan untuk membuat label',
     'label2_title'            => 'Judul',
-    'label2_title_help'       => 'The title to show on labels that support it',
-    'label2_title_help_phold' => 'The placeholder <code>{COMPANY}</code> will be replaced with the asset&apos;s company name',
-    'label2_asset_logo'       => 'Use Asset Logo',
-    'label2_asset_logo_help'  => 'Use the logo of the asset&apos;s assigned company, rather than the value at <code>:setting_name</code>',
-    'label2_1d_type'          => '1D Barcode Type',
-    'label2_1d_type_help'     => 'Format for 1D barcodes',
+    'label2_title_help'       => 'Judul yang akan ditampilkan pada label yang mendukungnya',
+    'label2_title_help_phold' => 'Placeholder <code>{COMPANY}</code> akan digantikan dengan nama entitas aset',
+    'label2_asset_logo'       => 'Gunakan Logo Asset',
+    'label2_asset_logo_help'  => 'Gunakan logo dari company yang ditetapkan pada aset, bukan nilai pada <code>:setting_name</code>',
+    'label2_1d_type'          => 'Tipe Barcode 1D',
+    'label2_1d_type_help'     => 'Format untuk barcode 2D',
     'label2_2d_type'          => 'Tipe Barcode 2D',
-    'label2_2d_type_help'     => 'Format for 2D barcodes',
-    'label2_2d_target'        => '2D Barcode Target',
-    'label2_2d_target_help'   => 'The URL the 2D barcode points to when scanned',
-    'label2_fields'           => 'Field Definitions',
-    'label2_fields_help'      => 'Fields can be added, removed, and reordered in the left column. For each field, multiple options for Label and DataSource can be added, removed, and reordered in the right column.',
-    'help_asterisk_bold'    => 'Text entered as <code>**text**</code> will be displayed as bold',
-    'help_blank_to_use'     => 'Leave blank to use the value from <code>:setting_name</code>',
-    'help_default_will_use' => '<code>:default</code> will use the value from <code>:setting_name</code>. <br>Note that the value of the barcodes must comply with the respective barcode spec in order to be successfully generated. Please see <a href="https://snipe-it.readme.io/docs/barcodes">the documentation <i class="fa fa-external-link"></i></a> for more details. ',
+    'label2_2d_type_help'     => 'Format untuk barcode 2D',
+    'label2_2d_target'        => 'Targer Barcode 2D',
+    'label2_2d_target_help'   => 'Data yang akan dimuat dalam barcode 2D',
+    'label2_fields'           => 'Definisi Kolom',
+    'label2_fields_help'      => 'Kolom dapat ditambahkan, dihapus, dan diurutkan ulang di bagian kiri. Untuk setiap kolom, beberapa opsi untuk Label dan Sumber Data dapat ditambahkan, dihapus, dan diurutkan ulang di bagian kanan.',
+    'purge_barcodes' => 'Purge Barcodes',
+    'help_asterisk_bold'    => 'Teks yang dimasukkan sebagai <code>**text**</code>  akan ditampilkan dengan huruf tebal',
+    'help_blank_to_use'     => 'Biarkan kosong untuk menggunakan nilai dari <code>:setting_name</code>',
+    'help_default_will_use' => '<code>:default</code> akan menggunakan nilai dari <code>:setting_name</code>.
+<br>Perhatikan bahwa nilai barcode harus mematuhi spesifikasi barcode terkait agar berhasil diger. Silakan lihat <a href="https://snipe-it.readme.io/docs/barcodes">dokumentasi <i class="fa fa-external-link"></i></a> untuk detail lebih lanjut. ',
+    'asset_id'              => 'ID Aset',
+    'data'               => 'Data',
     'default'               => 'Default',
-    'none'                  => 'None',
-    'google_callback_help' => 'This should be entered as the callback URL in your Google OAuth app settings in your organization&apos;s <strong><a href="https://console.cloud.google.com/" target="_blank">Google developer console <i class="fa fa-external-link" aria-hidden="true"></i></a></strong>.',
-    'google_login'      => 'Google Workspace Login Settings',
-    'enable_google_login'  => 'Enable users to login with Google Workspace',
-    'enable_google_login_help'  => 'Users will not be automatically provisioned. They must have an existing account here AND in Google Workspace, and their username here must match their Google Workspace email address. ',
-    'mail_reply_to' => 'Mail Reply-To Address',
-    'mail_from' => 'Mail From Address',
-    'database_driver' => 'Database Driver',
-    'bs_table_storage' => 'Table Storage',
-    'timezone' => 'Timezone',
-    'profile_edit'          => 'Edit Profile',
-    'profile_edit_help'          => 'Allow users to edit their own profiles.',
+    'none'                  => 'Kosong',
+    'google_callback_help' => 'Ini harus dimasukkan sebagai URL panggilan balik atau callback URL di pengaturan aplikasi Google OAuth Anda di <strong><a href="https://console.cloud.google.com/" target="_blank">Google Developer Console organisasi Anda <i class="fa fa-external-link" aria-hidden="true"></i></a></strong>.',
+    'google_login'      => 'Pengaturan Login Google Workspace',
+    'enable_google_login'  => 'Aktifkan pengguna untuk login menggunakan Google Workspace',
+    'enable_google_login_help'  => 'Pengguna tidak akan diprovisikan secara otomatis. Mereka harus memiliki akun yang sudah ada di sini DAN di Google Workspace, dan nama pengguna di sini harus cocok dengan alamat email Google Workspace mereka.',
+    'mail_reply_to' => 'Alamat Balasan Email',
+    'mail_from' => 'Alamat Pengirim Email',
+    'database_driver' => 'Driver Database',
+    'bs_table_storage' => 'Penyimpanan Tabel',
+    'timezone' => 'Zona Waktu',
+    'test_mail' => 'Test Mail',
+    'profile_edit'          => 'Edit Profil',
+    'profile_edit_help'          => 'Izinkan pengguna untuk mengedit profil mereka sendiri.',
+    'default_avatar' => 'Custom Default Avatar',
+    'default_avatar_help' => 'Gambar ini akan ditampilkan sebagai profil jika pengguna tidak memiliki foto profil.',
+    'restore_default_avatar' => 'Pulihkan <a href=":default_avatar" data-toggle="lightbox" data-type="image">avatar default sistem asli</a>',
+    'restore_default_avatar_help' => '',
+    'due_checkin_days' => 'Peringatan Jatuh Tempo Check-in',
+    'due_checkin_days_help' => 'Berapa hari sebelum perkiraan check-in dari aset yang harus terdaftar di halaman "Due for checkin"?',
+    'no_groups' => 'Belum ada grup yang dibuat. Kunjungi <code>Pengaturan Admin > Grup Izin</code> untuk menambahkannya.',
+    'text' => 'Text',
+
+    'username_formats' => [
+        'username_format'		=> 'Format pengguna',
+        'firstname_lastname_format'	=> 'Nama depan - Nama belakang (jane.smith)',
+        'first_name_format'	        => 'First Name (jane)',
+        'last_name_format'		=> 'Last Name (doe)',
+        'filastname_format'			=> 'First Initial Last Name (jsmith)',
+        'lastnamefirstinitial_format' =>  'Last Name First Initial (smithj)',
+        'firstname_lastname_underscore_format' => 'First Name Last Name (jane_smith)',
+        'firstinitial.lastname' => 'First Initial Last Name (j.smith)',
+        'lastname_firstinitial' => 'Last Name First Initial (smith_j)',
+        'lastname_dot_firstinitial_format' => 'Last Name First Initial (smith.j)',
+        'firstnamelastname'     => 'First Name Last Name (janesmith)',
+        'firstnamelastinitial'  => 'First Name Last Initial (janes)',
+        'lastnamefirstname'      => 'Nama Belakang.Nama Depan (smith.jane)',
+    ],
+
+    'email_formats' => [
+        'email_format'			=> 'Format email',
+        'firstname_lastname_format'	=> 'Nama depan - Nama belakang (jane.smith@example.com)',
+        'first_name_format'		=> 'Nama Depan (jane@example.com)',
+        'last_name_format'		=> 'Last Name (doe@example.com)',
+        'filastname_format'			=> 'Inisial pertama - Nama belakang (jsmith@example.com)',
+        'lastnamefirstinitial_format' =>  'Nama Depan First Initial (smithj@example.com)',
+        'firstname_lastname_underscore_format' => 'Nama Depan Nama Belakang (jane_smith@example.com)',
+        'firstinitial.lastname' => 'Nama Belakang Inisial Pertama (j.smith@example.com)',
+        'lastname_firstinitial' => 'Nama Belakang Inisial Depan (smith_j@example.com)',
+        'lastname_dot_firstinitial_format' => 'Last Name First Initial (smith.j@example.com)',
+        'firstnamelastname'     => 'Nama Depan Nama Belakang (janesmith@example.com)',
+        'firstnamelastinitial'  => 'Nama Depan Inisial Belakang (janes@example.com)',
+        'lastnamefirstname'      => 'Nama Belakang.Nama Depan (smith.jane@example.com)',
+    ],
+
+
+
+    'logo_labels' => [
+        'acceptance_pdf_logo'       => 'PDF Logo',
+        'email_logo'                => 'Logo Email',
+        'label_logo'                => 'Label Logo',
+        'logo'                      => 'Site Logo',
+        'favicon'                   => 'Favicon',
+    ],
+
+    'logo_help' => [
+        'email_logo_size'       => 'Logo persegi/kotak di email terlihat paling sesuai. ',
+    ],
+
+    'logo_option_types' => [
+        'text' => 'Text',
+        'logo' => 'Logo',
+        'logo_and_text' => 'Logo and Text',
+    ],
+
+
+    'legends' => [
+        'scoping' => 'Scoping',
+        'formats' => 'Default Formats',
+        'profiles' => 'User Profiles',
+        'eula' => 'EULA & Acceptance Preferences',
+        'misc_display' => 'Miscellaneous Display Options',
+        'email' => 'Email Preferences',
+        'checkin' => 'Checkin Preferences',
+        'dashboard' => 'Login & Dashboard Preferences',
+        'misc' => 'Miscellaneous',
+        'logos' => 'Logos & Display',
+        'colors' => 'Colors & Skins',
+        'footer' => 'Footer Preferences',
+        'security' => 'Security Preferences',
+        'general' => 'General',
+        'intervals' => 'Intervals & Thresholds',
+    ],
+
+
+    /* Keywords for settings overview help */
+    'keywords' => [
+        'brand'             => 'footer, logo, print, theme, skin, header, colors, color, css',
+        'general_settings'  => 'dukungan company, tanda tangan, penerimaan, format email, format nama pengguna, gambar, per halaman, thumbnail, Eula, gravatar, tos, dasbor, privasi',
+        'groups'            => 'izin, grup izin, otorisasi',
+        'labels'            => 'labels, barcodes, barcode, sheets, print, upc, qr, 1d, 2d',
+        'localization'      => 'lokalisasi, mata uang, lokal, zona waktu, internasionalisasi, bahasa, terjemahan',
+        'php_overview'      => 'phpinfo, system, info',
+        'purge'             => 'hapus permanen',
+        'security'          => 'sandi, persyaratan, dua faktor, kata sandi umum, login jarak jauh, keluar, autentikasi',
+    ],
 
 ];
diff --git a/resources/lang/id-ID/admin/settings/message.php b/resources/lang/id-ID/admin/settings/message.php
index 535cde71cb..aea23ab792 100644
--- a/resources/lang/id-ID/admin/settings/message.php
+++ b/resources/lang/id-ID/admin/settings/message.php
@@ -11,8 +11,11 @@ return [
         'file_deleted'          => 'Sukses menghapus Berkas cadangan. ',
         'generated'             => 'Sukses membuat cadangan baru.',
         'file_not_found'        => 'Berkas cadangan tidak ditemukan di server.',
-        'restore_warning'       => 'Yes, restore it. I acknowledge that this will overwrite any existing data currently in the database. This will also log out all of your existing users (including you).',
-        'restore_confirm'       => 'Are you sure you wish to restore your database from :filename?'
+        'restore_warning'       => 'Ya, pulihkan. Saya mengerti bahwa ini akan menimpa data yang ada saat ini di database. Ini juga akan mengeluarkan semua pengguna yang ada (termasuk Anda).',
+        'restore_confirm'       => 'Apakah Anda yakin ingin memulihkan database Anda dari :filename?'
+    ],
+    'restore' => [
+        'success'               => 'Cadangan sistem Anda telah dipulihkan. Silakan masuk kembali.'
     ],
     'purge' => [
         'error'     => 'Terdapat kesalahan ketika proses pembersihan. ',
@@ -20,27 +23,37 @@ return [
         'success'               => 'Sukses melakukan pembersihan data yang terhapus.',
     ],
     'mail' => [
-        'sending' => 'Sending Test Email...',
-        'success' => 'Mail sent!',
-        'error' => 'Mail could not be sent.',
-        'additional' => 'No additional error message provided. Check your mail settings and your app log.'
+        'sending' => 'Mengirim Email Uji...',
+        'success' => 'Email terkirim!',
+        'error' => 'Email gagal dikirim.',
+        'additional' => 'Tidak ada pesan kesalahan tambahan yang diberikan. Periksa pengaturan email dan log aplikasi Anda.'
     ],
     'ldap' => [
-        'testing' => 'Testing LDAP Connection, Binding & Query ...',
-        '500' => '500 Server Error. Please check your server logs for more information.',
-        'error' => 'Something went wrong :(',
-        'sync_success' => 'A sample of 10 users returned from the LDAP server based on your settings:',
-        'testing_authentication' => 'Testing LDAP Authentication...',
-        'authentication_success' => 'User authenticated against LDAP successfully!'
+        'testing' => 'Menguji Koneksi, Pengikatan & Kueri LDAP...',
+        '500' => 'Kesalahan Server 500. Silakan periksa log server Anda untuk informasi lebih lanjut.',
+        'error' => 'Terjadi kesalahan :(',
+        'sync_success' => 'Contoh 10 pengguna yang dikembalikan dari server LDAP berdasarkan pengaturan Anda:',
+        'testing_authentication' => 'Menguji Autentikasi LDAP...',
+        'authentication_success' => 'Pengguna berhasil diautentikasi terhadap LDAP!'
     ],
+    'labels' => [
+        'null_template' => 'Label template not found. Please select a template.',
+        ],
     'webhook' => [
-        'sending' => 'Sending :app test message...',
-        'success' => 'Your :webhook_name Integration works!',
-        'success_pt1' => 'Success! Check the ',
-        'success_pt2' => ' channel for your test message, and be sure to click SAVE below to store your settings.',
-        '500' => '500 Server Error.',
-        'error' => 'Something went wrong. :app responded with: :error_message',
-        'error_redirect' => 'ERROR: 301/302 :endpoint returns a redirect. For security reasons, we don’t follow redirects. Please use the actual endpoint.',
-        'error_misc' => 'Something went wrong. :( ',
-    ]
+        'sending' => 'Mengirim pesan uji :app...',
+        'success' => 'Integrasi :webhook_name Anda berfungsi!',
+        'success_pt1' => 'Berhasil! Periksa ',
+        'success_pt2' => ' saluran untuk pesan uji Anda, dan pastikan untuk mengklik SIMPAN di bawah untuk menyimpan pengaturan Anda.',
+        '500' => 'Kesalahan Server 500.',
+        'error' => 'Terjadi kesalahan. :app merespons dengan: :error_message',
+        'error_redirect' => 'KESALAHAN: 301/302 :endpoint mengembalikan pengalihan. Untuk alasan keamanan, kami tidak mengikuti pengalihan. Harap gunakan endpoint yang sebenarnya.',
+        'error_misc' => 'Terjadi kesalahan. :( ',
+        'webhook_fail' => ' notifikasi webhook gagal: Pastikan URL masih valid.',
+        'webhook_channel_not_found' => ' webhook channel not found.',
+        'ms_teams_deprecation' => 'The selected Microsoft Teams webhook URL will be deprecated Dec 31st, 2025. Please use a workflow URL. Microsoft\'s documentation on creating a workflow can be found <a href="https://support.microsoft.com/en-us/office/create-incoming-webhooks-with-workflows-for-microsoft-teams-8ae491c7-0394-4861-ba59-055e33f75498" target="_blank"> here.</a>',
+    ],
+    'location_scoping' => [
+        'not_saved' => 'Your settings were not saved.',
+        'mismatch' => 'There is 1 item in the database that need your attention before you can enable location scoping.|There are :count items in the database that need your attention before you can enable location scoping.',
+    ],
 ];
diff --git a/resources/lang/id-ID/admin/settings/table.php b/resources/lang/id-ID/admin/settings/table.php
index 2ff8f0a6da..e583469590 100644
--- a/resources/lang/id-ID/admin/settings/table.php
+++ b/resources/lang/id-ID/admin/settings/table.php
@@ -2,5 +2,5 @@
 
 return array(
     'created'   => 'Dibuat',
-    'size' => 'Size',
+    'size' => 'Ukuran',
 );
diff --git a/resources/lang/id-ID/admin/statuslabels/message.php b/resources/lang/id-ID/admin/statuslabels/message.php
index 54c0612907..77599800c6 100644
--- a/resources/lang/id-ID/admin/statuslabels/message.php
+++ b/resources/lang/id-ID/admin/statuslabels/message.php
@@ -3,7 +3,7 @@
 return [
 
     'does_not_exist' => 'Label status tidak ada.',
-    'deleted_label' => 'Deleted Status Label',
+    'deleted_label' => 'Label Status yang dihapus',
     'assoc_assets'	 => 'Saat ini label status tersebut terhubung dengan 1 aset dan tidak dapat di hapus. Silahkan perbarui aset anda sehingga tidak terhubung dan kemudian coba kembali. ',
 
     'create' => [
diff --git a/resources/lang/id-ID/admin/statuslabels/table.php b/resources/lang/id-ID/admin/statuslabels/table.php
index 091b852583..84d261b6a1 100644
--- a/resources/lang/id-ID/admin/statuslabels/table.php
+++ b/resources/lang/id-ID/admin/statuslabels/table.php
@@ -1,14 +1,14 @@
 <?php
 
 return array(
-    'about'      	=> 'Tentang label status',
+    'about'      	=> 'About Status Types',
     'archived'      	=> 'Diarsipkan',
     'create'      	=> 'Membuat label status',
     'color'      	=> 'Warna Bagan',
     'default_label' => 'Label standar',
     'default_label_help' => 'Ini digunakan untuk memastikan label status yang paling sering digunakan muncul di bagian atas kotak pilih saat membuat / mengedit aset.',
     'deployable'      	=> 'Dapat digunakan',
-    'info'      	=> 'Label status digunakan untuk menjelaskan berbagai macam status aset. Sebagai contoh, rusak/hilang, dalam perbaikan dan sebagainya. Anda dapat membuat status label baru untuk penundaan aset, aset yang dapat digunakan dan aset yang diarsipkan.',
+    'info'      	=> 'Status label types are used to describe the various states your assets could be in. They may be out for repair, lost/stolen, etc. You can create new status labels for your deployable, pending and archived assets according to your own workflow. For more information, <a href="https://snipe-it.readme.io/docs/overview#status-labels" target="_blank">see the documentation <i class="fa fa-external-link"></i></a>.',
     'name'      	=> 'Nama Status',
     'pending'      	=> 'Tunda',
     'status_type'   => 'Tipe Status',
diff --git a/resources/lang/id-ID/admin/suppliers/message.php b/resources/lang/id-ID/admin/suppliers/message.php
index 4c96d752fd..f7089d51dc 100644
--- a/resources/lang/id-ID/admin/suppliers/message.php
+++ b/resources/lang/id-ID/admin/suppliers/message.php
@@ -2,7 +2,7 @@
 
 return array(
 
-    'deleted' => 'Deleted supplier',
+    'deleted' => 'Pemasok yang dihapus',
     'does_not_exist' => 'Pemasok tidak ada.',
 
 
diff --git a/resources/lang/id-ID/admin/users/general.php b/resources/lang/id-ID/admin/users/general.php
index c2eaa92944..1f3bdbbc46 100644
--- a/resources/lang/id-ID/admin/users/general.php
+++ b/resources/lang/id-ID/admin/users/general.php
@@ -17,10 +17,12 @@ return [
     'last_login'        => 'Terakhir masuk',
     'ldap_config_text'  => 'Konfigurasi LDAP terdapat di Admin > Pengaturan. Jika lokasi di pilih, maka akan di impor untuk semua pengguna.',
     'print_assigned'    => 'Cetak Semua Ditugaskan',
-    'email_assigned'    => 'Email List of All Assigned',
-    'user_notified'     => 'User has been emailed a list of their currently assigned items.',
-    'auto_assign_label' => 'Include this user when auto-assigning eligible licenses',
-    'auto_assign_help'  => 'Skip this user in auto assignment of licenses',
+    'email_assigned'    => 'Daftar Email Semua yang Ditetapkan',
+    'user_notified'     => 'Pengguna telah dikirimi email berisi daftar item yang saat ini ditetapkan kepada mereka.',
+    'users_notified'    => 'The user has been emailed a list of their currently assigned items.|:count users have been emailed a list of their currently assigned items.',
+    'users_notified_warning' => ':count user has been emailed a list of their currently assigned items, however :no_email users did not have an email address so could not be emailed.|:count users have been emailed a list of their currently assigned items, however :no_email user(s) did not have an email address so could not be emailed.',
+    'auto_assign_label' => 'Sertakan pengguna ini saat penugasan otomatis lisensi yang memenuhi syarat',
+    'auto_assign_help'  => 'Lewati pengguna ini dalam penetapan otomatis lisensi',
     'software_user'     => 'Perangkat lunak pada :name',
     'send_email_help'   => 'Anda harus memberikan alamat email pengguna ini untuk mengirimkan kredensial kepada mereka. Pengiriman email kredensial hanya dapat dilakukan pada pembuatan user. Kata sandi disimpan dalam hash satu arah dan tidak dapat diambil setelah disimpan.',
     'view_user'         => 'Lihat pengguna: name',
@@ -28,27 +30,27 @@ return [
     'two_factor_admin_optin_help' => 'Pengaturan admin Anda saat ini memungkinkan penegakan dua faktor otentikasi selektif.',
     'two_factor_enrolled' => 'Perangkat 2FA Terdaftar',
     'two_factor_active'   => '2FA Aktif',
-    'user_deactivated'  => 'User cannot login',
-    'user_activated'  => 'User can login',
-    'activation_status_warning' => 'Do not change activation status',
-    'group_memberships_helpblock' => 'Only superadmins may edit group memberships.',
-    'superadmin_permission_warning' => 'Only superadmins may grant a user superadmin access.',
-    'admin_permission_warning' => 'Only users with admins rights or greater may grant a user admin access.',
-    'remove_group_memberships' => 'Remove Group Memberships',
-    'warning_deletion_information' => 'You are about to checkin ALL items from the :count user(s) listed below. Super admin names are highlighted in red.',
-    'update_user_assets_status' => 'Update all assets for these users to this status',
-    'checkin_user_properties' => 'Check in all properties associated with these users',
-    'remote_label'   => 'This is a remote user',
-    'remote'   => 'Remote',
-    'remote_help' => 'This can be useful if you need to filter by remote users who never or rarely come into your physical locations.',
-    'not_remote_label' => 'This is not a remote user',
-    'vip_label' => 'VIP user',
-    'vip_help' => 'This can be helpful to mark important people in your org if you would like to handle them in special ways.',
-    'create_user' => 'Create a user',
-    'create_user_page_explanation' => 'This is the account information you will use to access the site for the first time.',
-    'email_credentials' => 'Email credentials',
-    'email_credentials_text' => 'Email my credentials to the email address above',
-    'next_save_user' => 'Next: Save User',
+    'user_deactivated'  => 'Pengguna tidak dapat masuk',
+    'user_activated'  => 'Pengguna dapat masuk',
+    'activation_status_warning' => 'Jangan ubah status aktivasi',
+    'group_memberships_helpblock' => 'Hanya superadmin yang dapat mengedit keanggotaan grup.',
+    'superadmin_permission_warning' => 'Hanya superadmin yang dapat memberikan akses superadmin kepada pengguna.',
+    'admin_permission_warning' => 'Hanya pengguna dengan hak admin atau lebih tinggi yang dapat memberikan akses admin kepada pengguna.',
+    'remove_group_memberships' => 'Hapus Keanggotaan Grup',
+    'warning_deletion_information' => 'Anda akan mengembalikan SEMUA item dari :count pengguna (-pengguna) yang terdaftar di bawah ini. Nama superadmin disorot dengan warna merah.',
+    'update_user_assets_status' => 'Perbarui semua aset untuk pengguna ini ke status ini',
+    'checkin_user_properties' => 'Kembalikan semua properti yang terkait dengan pengguna ini',
+    'remote_label'   => 'Ini adalah pengguna jarak jauh',
+    'remote'   => 'Jarak Jauh',
+    'remote_help' => 'Ini dapat berguna jika Anda perlu memfilter berdasarkan pengguna jarak jauh yang tidak pernah atau jarang datang ke lokasi fisik Anda.',
+    'not_remote_label' => 'Ini bukan pengguna jarak jauh',
+    'vip_label' => 'Pengguna VIP',
+    'vip_help' => 'Ini dapat bermanfaat untuk menandai orang-orang penting di organisasi Anda jika Anda ingin menangani mereka dengan cara khusus.',
+    'create_user' => 'Buat pengguna',
+    'create_user_page_explanation' => 'Ini adalah informasi akun yang akan Anda gunakan untuk mengakses situs untuk pertama kalinya.',
+    'email_credentials' => 'Kirim kredensial melalui email',
+    'email_credentials_text' => 'Kirim kredensial saya ke alamat email di atas',
+    'next_save_user' => 'Selanjutnya: Simpan Pengguna',
     'all_assigned_list_generation' => 'Dihasilkan pada:',
-    'email_user_creds_on_create' => 'Email this user their credentials?',
+    'email_user_creds_on_create' => 'Kirim kredensial pengguna ini melalui email?',
 ];
diff --git a/resources/lang/id-ID/admin/users/message.php b/resources/lang/id-ID/admin/users/message.php
index fa87a83c3e..9f8080cc63 100644
--- a/resources/lang/id-ID/admin/users/message.php
+++ b/resources/lang/id-ID/admin/users/message.php
@@ -6,17 +6,17 @@ return array(
     'declined'                  => 'Anda sukses menolak aset ini.',
     'bulk_manager_warn'	        => 'Pengguna Anda telah berhasil diperbarui, namun entri pengelola Anda tidak disimpan karena manajer yang Anda pilih juga ada dalam daftar pengguna untuk diedit, dan pengguna mungkin bukan manajer mereka sendiri. Silakan pilih pengguna Anda lagi, tidak termasuk manajernya.',
     'user_exists'               => 'Pengguna sudah ada!',
-    'user_not_found'            => 'Pengguna tidak ada.',
+    'user_not_found'            => 'Pengguna tidak ada atau Anda tidak memiliki izin untuk melihatnya.',
     'user_login_required'       => 'Kolom login wajib di-isi',
-    'user_has_no_assets_assigned' => 'No assets currently assigned to user.',
+    'user_has_no_assets_assigned' => 'Tidak ada aset yang saat ini ditetapkan kepada pengguna.',
     'user_password_required'    => 'Kata sandi wajib di-isi.',
     'insufficient_permissions'  => 'Tidak ada hak akses.',
     'user_deleted_warning'      => 'Pengguna ini telah di hapus. Anda harus kembalikan dahulu pengguna ini jika ingin menyunting atau di berikan hak kelola aset.',
     'ldap_not_configured'        => 'Integrasi LDAP belum dikonfigurasi untuk instalasi ini.',
     'password_resets_sent'      => 'Pengguna terpilih yang diaktifkan dan memiliki alamat email yang valid telah dikirimi tautan pengaturan ulang kata sandi.',
     'password_reset_sent'       => 'Tautan reset kata sandi telah dikirim ke :email!',
-    'user_has_no_email'         => 'This user does not have an email address in their profile.',
-    'log_record_not_found'        => 'A matching log record for this user could not be found.',
+    'user_has_no_email'         => 'Pengguna ini tidak memiliki alamat email di profil mereka.',
+    'log_record_not_found'        => 'Catatan log yang cocok untuk pengguna ini tidak dapat ditemukan.',
 
 
     'success' => array(
@@ -37,22 +37,23 @@ return array(
         'update' => 'Terdapat masalah ketika memperbarui pengguna. Silahkan coba kembali.',
         'delete' => 'Terdapat masalah ketika menghapus pengguna. Silahkan coba kembali.',
         'delete_has_assets' => 'Pengguna ini memiliki item yang ditugaskan dan tidak dapat dihapus.',
-        'delete_has_assets_var' => 'This user still has an asset assigned. Please check it in first.|This user still has :count assets assigned. Please check their assets in first.',
-        'delete_has_licenses_var' => 'This user still has a license seats assigned. Please check it in first.|This user still has :count license seats assigned. Please check them in first.',
-        'delete_has_accessories_var' => 'This user still has an accessory assigned. Please check it in first.|This user still has :count accessories assigned. Please check their assets in first.',
-        'delete_has_locations_var' => 'This user still manages a location. Please select another manager first.|This user still manages :count locations. Please select another manager first.',
-        'delete_has_users_var' => 'This user still manages another user. Please select another manager for that user first.|This user still manages :count users. Please select another manager for them first.',
+        'delete_has_assets_var' => 'Pengguna ini masih memiliki satu aset yang ditetapkan. Harap kembalikan aset tersebut terlebih dahulu.|Pengguna ini masih memiliki :count aset yang ditugaskan. Harap kembalikan aset-aset tersebut terlebih dahulu.',
+        'delete_has_licenses_var' => 'Pengguna ini masih memiliki satu lisensi yang ditetapkan. Harap kembalikan lisensi tersebut terlebih dahulu.|Pengguna ini masih memiliki :count lisensi yang ditugaskan. Harap kembalikan lisensi-lisensi tersebut terlebih dahulu.',
+        'delete_has_accessories_var' => 'Pengguna ini masih memiliki satu aksesori yang ditugaskan. Harap kembalikan aksesori tersebut terlebih dahulu.| Pengguna ini masih memiliki :count aksesori yang ditugaskan. Harap kembalikan aksesori-aksesori tersebut terlebih dahulu.',
+        'delete_has_locations_var' => 'Pengguna ini masih mengelola satu lokasi. Harap pilih pengelola lain terlebih dahulu.|Pengguna ini masih mengelola :count lokasi. Harap pilih pengelola lain terlebih dahulu.',
+        'delete_has_users_var' => 'Pengguna ini masih mengelola pengguna lain. Harap pilih pengelola lain untuk pengguna tersebut terlebih dahulu.| Pengguna ini masih mengelola :count pengguna. Harap pilih pengelola lain untuk mereka terlebih dahulu.',
         'unsuspend' => 'Terdapat masalah ketika menangguhkan pengguna. Silahkan coba kembali.',
         'import'    => 'Terdapat masalah ketika mengimpor pengguna. Silahkan coba kembali.',
         'asset_already_accepted' => 'Aset ini telah di terima.',
         'accept_or_decline' => 'Anda harus menolak atau menerima aset ini.',
-        'cannot_delete_yourself' => 'We would feel really bad if you deleted yourself, please reconsider.',
+        'cannot_delete_yourself' => 'Kami akan sangat kecewa jika Anda menghapus diri Anda sendiri, harap pertimbangkan kembali. ',
         'incorrect_user_accepted' => 'Aset yang akan di berikan ke anda, belum di setujui.',
         'ldap_could_not_connect' => 'Gagal koneksi ke server LDAP. Silahkan periksa konfigurasi server LDAP di berkas config. <br>Eror dari server LDAP:',
         'ldap_could_not_bind' => 'Server LDAP gagal mengikat. Silahkan cek kembali konfigurasi server LDAP di berkas config. <br>Eror dari server LDAP: ',
         'ldap_could_not_search' => 'Gagal mencari server LDAP. Silahkan cek konfigurasi server LDAP di berkas config LDAP. <br>Eror dari server LDAP:',
         'ldap_could_not_get_entries' => 'Gagal menerima catatan dari server LDAP. Silahkan cek konfigurasi server LDAP di berkas config LDAP. <br>Eror dari server LDAP:',
         'password_ldap' => 'Kata sandi untuk akun ini dikelola oleh LDAP / Active Directory. Silakan menghubungi departemen TI Anda untuk mengganti kata sandi Anda.',
+        'multi_company_items_assigned' => 'Pengguna ini memiliki item yang ditetapkan yang dimiliki oleh company lain. Harap kembalikan item tersebut atau edit entitas mereka.'
     ),
 
     'deletefile' => array(
@@ -68,7 +69,7 @@ return array(
     ),
 
     'inventorynotification' => array(
-        'error'   => 'This user has no email set.',
-        'success' => 'The user has been notified about their current inventory.'
+        'error'   => 'Pengguna ini belum mengatur email.',
+        'success' => 'Pengguna telah diberi tahu tentang inventaris mereka saat ini.'
     )
 );
\ No newline at end of file
diff --git a/resources/lang/id-ID/admin/users/table.php b/resources/lang/id-ID/admin/users/table.php
index 30b61cd5e4..f3b69862d5 100644
--- a/resources/lang/id-ID/admin/users/table.php
+++ b/resources/lang/id-ID/admin/users/table.php
@@ -10,7 +10,7 @@ return array(
     'email'      			=> 'Email',
     'employee_num'      	=> 'No. Karyawan.',
     'first_name' 			=> 'Nama Depan',
-    'groupnotes'			=> 'Select a group to assign to the user, remember that a user takes on the permissions of the group they are assigned. Use ctrl+click (or cmd+click on MacOS) to deselect groups.',
+    'groupnotes'			=> 'Pilih grup untuk ditetapkan kepada pengguna, ingat bahwa pengguna akan memiliki izin dari grup yang ditugaskan kepada mereka. Gunakan ctrl+klik (atau cmd+klik di MacOS) untuk membatalkan pemilihan grup.',
     'id'         			=> 'Id',
     'inherit'  				=> 'Turunan',
     'job' 					=> 'Pekerjaan',
@@ -20,9 +20,9 @@ return array(
     'lock_passwords'		=> 'Detail masuk tidak dapat di ubah ketika instalasi.',
     'manager' 				=> 'Manajer',
     'managed_locations'     => 'Lokasi yang Dikelola',
-    'managed_users'         => 'Managed Users',
+    'managed_users'         => 'Pengguna yang Dikelola',
     'name' 					=> 'Nama',
-    'nogroup'               => 'No groups have been created yet. To add one, visit: ',
+    'nogroup'               => 'No groups have been created yet. To add one, visit:',
     'notes'                 => 'Catatan',
     'password_confirm' 		=> 'Konfirmasikan Kata Sandi',
     'password' 				=> 'Kata sandi',
@@ -31,7 +31,7 @@ return array(
     'show_deleted'          => 'Tampilkan pengguna yang di hapus',
     'title' 				=> 'Judul',
 	'to_restore_them'		=> 'untuk mengembalikannya',
-    'total_assets_cost'     => "Total Assets Cost",
+    'total_assets_cost'     => "Total Biaya Aset",
     'updateuser' 			=> 'Perbarui Pengguna',
     'username' 				=> 'Nama Pengguna',
 	'user_deleted_text' 	=> 'Pengguna ini telah ditandai sebagai telah dihapus.',
diff --git a/resources/lang/id-ID/auth.php b/resources/lang/id-ID/auth.php
index db310aa1bb..d51ab5fd44 100644
--- a/resources/lang/id-ID/auth.php
+++ b/resources/lang/id-ID/auth.php
@@ -13,8 +13,8 @@ return array(
     |
     */
 
-    'failed' => 'These credentials do not match our records.',
-    'password' => 'The provided password is incorrect.',
-    'throttle' => 'Too many login attempts. Please try again in :seconds seconds.',
+    'failed' => 'Kredensial atau data login ini tidak cocok dengan catatan kami.',
+    'password' => 'Kata sandi yang diberikan salah.',
+    'throttle' => 'Too many login attempts. Please try again in :minutes minute(s).',
 
 );
diff --git a/resources/lang/id-ID/auth/general.php b/resources/lang/id-ID/auth/general.php
index 0c103b1b5f..9724f4fd3f 100644
--- a/resources/lang/id-ID/auth/general.php
+++ b/resources/lang/id-ID/auth/general.php
@@ -12,7 +12,7 @@ return [
     'remember_me'                   => 'Ingat saya',
     'username_help_top'                 => 'Masukkan <strong>nama pengguna</strong> Anda untuk dikirimi email tautan setel ulang sandi.',
     'username_help_bottom'          => 'Nama pengguna dan alamat email Anda <em>mungkin</em> sama, tetapi mungkin tidak, tergantung pada konfigurasi Anda. Jika Anda tidak dapat mengingat nama pengguna Anda, hubungi administrator Anda. <br><br><strong>Nama pengguna tanpa alamat email terkait tidak akan dikirimi email berupa tautan setel ulang sandi.</strong> ',
-    'google_login'                  => 'Login with Google Workspace',
-    'google_login_failed'           => 'Google Login failed, please try again.',
+    'google_login'                  => 'Masuk dengan Google Workspace',
+    'google_login_failed'           => 'Masuk dengan Google telah gagal, harap coba lagi.',
 ];
 
diff --git a/resources/lang/id-ID/auth/message.php b/resources/lang/id-ID/auth/message.php
index d1ab78ae86..a9b028eb62 100644
--- a/resources/lang/id-ID/auth/message.php
+++ b/resources/lang/id-ID/auth/message.php
@@ -6,16 +6,14 @@ return array(
     'account_not_found'      => 'Nama pengguna atau sandi tidak benar.',
     'account_not_activated'  => 'Akun pengguna ini belum ter-aktivasi.',
     'account_suspended'      => 'Akun pengguna ini di tangguhkan.',
-    'account_banned'         => 'Akun pengguna ini dilarang.',
-    'throttle'               => 'Terlalu banyak upaya login yang gagal. Silakan coba lagi dalam :minutes menit.',
 
     'two_factor' => array(
         'already_enrolled'      => 'Perangkat Anda sudah terdaftar.',
         'success'               => 'Anda telah berhasil login.',
         'code_required'         => 'Kode Two-factor diperlukan.',
         'invalid_code'          => 'Kode Two-factor tidak valid.',
-        'enter_two_factor_code' => 'Please enter your two-factor authentication code.',
-        'please_enroll'         => 'Please enroll a device in two-factor authentication.',
+        'enter_two_factor_code' => 'Harap masukkan kode autentikasi dua-faktor Anda.',
+        'please_enroll'         => 'Harap daftarkan perangkat pada autentikasi dua-faktor.',
     ),
 
     'signin' => array(
diff --git a/resources/lang/id-ID/button.php b/resources/lang/id-ID/button.php
index d9850e41a2..a810669da0 100644
--- a/resources/lang/id-ID/button.php
+++ b/resources/lang/id-ID/button.php
@@ -4,11 +4,12 @@ return [
     'actions' 	                => 'Tindakan',
     'add'    	                => 'Tambah Baru',
     'cancel'                    => 'Batalkan',
-    'checkin_and_delete'  	    => 'Checkin All / Delete User',
+    'checkin_and_delete'  	    => 'Tandai Semua Masuk / Hapus Pengguna',
     'delete'  	                => 'Hapus',
     'edit'    	                => 'Ubah',
+    'clone'    	                => 'Duplikat',
     'restore' 	                => 'Kembalikan',
-    'remove'                    => 'Remove',
+    'remove'                    => 'Hapus',
     'request'                   => 'Permintaan',
     'submit'  	                => 'Kirim',
     'upload'                    => 'Unggah',
@@ -16,9 +17,18 @@ return [
     'select_files'				=> 'Pilih File...',
     'generate_labels'           => '{1} Generate Label|[2,*] Generate Labels',
     'send_password_link'        => 'Kirim Tautan Atur Ulang Kata Sandi',
-    'go'                        => 'Go',
+    'go'                        => 'Jalankan',
     'bulk_actions'              => 'Aksi Massal',
-    'add_maintenance'           => 'Add Maintenance',
-    'append'                    => 'Append',
+    'add_maintenance'           => 'Tambah Pemeliharaan',
+    'append'                    => 'Tambahkan',
     'new'                       => 'Baru',
+    'var' => [
+        'clone'     => 'Duplikat :item_type',
+        'edit'      => 'Edit :item_type',
+        'delete'    => 'Hapus :item_type',
+        'restore'   => 'Pulihkan :item_type',
+        'create'    => 'Buat :item_type Baru',
+        'checkout'  => 'Tandai Keluar:item_type',
+        'checkin'   => 'Tandai Masuk :item_type',
+    ]
 ];
diff --git a/resources/lang/id-ID/general.php b/resources/lang/id-ID/general.php
index 97b838949a..88423b3228 100644
--- a/resources/lang/id-ID/general.php
+++ b/resources/lang/id-ID/general.php
@@ -1,7 +1,7 @@
 <?php
 
 return [
-    '2FA_reset'             => '2FA reset',
+    '2FA_reset'             => 'reset 2FA',
     'accessories'			=> 'Aksesoris',
     'activated'			    => 'Diaktifkan',
     'accepted_date'         => 'Tanggal Diterima',
@@ -10,10 +10,10 @@ return [
     'action'                => 'Tindakan',
     'activity_report'		=> 'Laporan kegiatan',
     'address'				=> 'Alamat',
-    'admin'					=> 'Admin',
-    'admin_tooltip'			=> 'This user has admin privileges',
+    'admin'					=> 'Pengaturan Admin',
+    'admin_tooltip'			=> 'Pengguna ini memilik hak admin',
     'superuser'				=> 'Superuser',
-    'superuser_tooltip'		=> 'This user has superuser privileges',
+    'superuser_tooltip'		=> 'Pengguna ini memiliki hak superuser',
     'administrator'			=> 'Administrator',
     'add_seats'             => 'Tambahan hak',
     'age'                   => "Usia",
@@ -23,13 +23,16 @@ return [
     'asset_models'			=> 'Model aset',
     'asset_model'			=> 'Model',
     'asset'					=> 'Aset',
+    'asset_previous'        => 'Asset (Previously Assigned)',
     'asset_report'          => 'Laporan aset',
     'asset_tag'				=> 'Tag Aset',
     'asset_tags'            => 'Tag Aset',
     'assets_available'		=> 'Aset yang tersedia',
     'accept_assets'         => 'Terima aset :nama',
     'accept_assets_menu'    => 'Terima Aset',
+    'accept_item'           => 'Accept Item',
     'audit'				    => 'Audit',
+    'audits'				=> 'Audits',
     'audit_report'			=> 'Log Audit',
     'assets'				=> 'Aset',
     'assets_audited'        => 'aset yang diaudit',
@@ -61,9 +64,12 @@ return [
     'changepassword'  		=> 'Rubah Kata sandi',
     'checkin'  				=> 'Check-in',
     'checkin_from'  		=> 'Check-in dari',
+    'checkin_note'  		=> 'Checkin Note',
+    'checkout_note'  		=> 'Checkout Note',
     'checkout'  			=> 'Check-out',
     'checkouts_count'       => 'Keluar',
     'checkins_count'        => 'Masuk',
+    'checkin_and_delete'  	=> 'Cek masuk dan hapus',
     'user_requests_count'   => 'Permintaan',
     'city'  				=> 'Kota',
     'click_here'			=> 'Klik disini',
@@ -76,8 +82,8 @@ return [
     'consumable'			=> 'Barang Habis Pakai',
     'consumables'			=> 'Barang Habis Pakai',
     'country'  				=> 'Negara',
-    'could_not_restore'     => 'Error restoring :item_type: :error',
-    'not_deleted'           => 'The :item_type is not deleted so it cannot be restored',
+    'could_not_restore'     => 'Galat memulihkan :item_type: :error',
+    'not_deleted'           => ':item_type tidak dihapus, tidak dapat dipulihkan',
     'create'				=> 'Buat baru',
     'created'               => 'Item dibuat',
     'created_asset'			=> 'Buat aset',
@@ -86,11 +92,13 @@ return [
     'record_created' 		=> 'Rekam Dibuat',
     'updated_at' 			=> 'Diperbarui pada',
     'currency'  			=> '$', // this is deprecated
+    'currency_text'  		=> 'Mata uang', //
     'current'  				=> 'Saat ini',
     'current_password'      => 'Kata Sandi Saat Ini',
     'customize_report'      => 'Sesuaikan Laporan',
     'custom_report'         => 'Laporan kustom aset',
     'dashboard'				=> 'Dashboard',
+    'data_source'           => 'Data Source',
     'days'      			=> 'hari',
     'days_to_next_audit'    => 'Hari ke Audit Berikutnya',
     'date'					=> 'Tanggal',
@@ -98,7 +106,7 @@ return [
     'debug_warning_text'    => 'Aplikasi ini berjalan dalam mode produksi dengan debugging diaktifkan. Hal ini dapat mengekspos data sensitif jika aplikasi Anda dapat diakses oleh dunia luar. Nonaktifkan mode debug dengan menetapkan nilai <code>APP_DEBUG</code> di file <code>.env</code> Anda ke <code>false</code>.',
     'delete'  				=> 'Hapus',
     'delete_confirm'  		=> 'Apakah Anda yakin untuk menghapus kategori ini?',
-    'delete_confirm_no_undo' => 'Anda yakin ingin menghapus :item ini? Penghapusan tidak bisa dibatalkan.',
+    'delete_confirm_no_undo' => 'Anda yakin ingin menghapus :item? Tindakan ini tidak dapat dibatalkan.',
     'deleted'  				=> 'Dihapus',
     'delete_seats'  		=> 'Lisensi di hapus',
     'deletion_failed'       => 'Penghapusan gagal',
@@ -114,29 +122,13 @@ return [
     'editprofile'  			=> 'Sunting profil anda',
     'eol'					=> 'MHP',
     'email_domain'			=> 'Domain email',
-    'email_format'			=> 'Format email',
     'employee_number'       => 'Nomor Karyawan',
     'email_domain_help'		=> 'Ini digunakan untuk untuk membuat email ketika melakukan proses import',
     'error'				    => 'Kesalahan',
     'exclude_archived'      => 'Kecualikan Aset Terarsipkan',
     'exclude_deleted'       => 'Kecualikan Aset yang Dihapus',
     'example'				=> 'Contoh: ',
-    'filastname_format'			=> 'Inisial pertama - Nama belakang (jsmith@example.com)',
-    'firstname_lastname_format'	=> 'Nama depan - Nama belakang (jane.smith@example.com)',
-    'firstname_lastname_underscore_format' => 'Nama Depan Nama Belakang (jane_smith@example.com)',
-    'lastnamefirstinitial_format' =>  'Nama Depan First Initial (smithj@example.com)',
-    'firstintial_dot_lastname_format' => 'Nama Belakang Inisial Pertama (j.smith@example.com)',
-    'firstname_lastname_display'	=> 'Nama Depan Nama Belakang (Jane Smith)',
-    'lastname_firstname_display'	=> 'Nama Belakang Nama Depan (Smith Jane)',
-    'name_display_format'	=> 'Format tampilan nama',
-    'first'					=> 'Pertama',
-    'firstnamelastname'     => 'Nama Depan Nama Belakang (janesmith@example.com)',
-    'lastname_firstinitial' => 'Nama Belakang Inisial Depan (smith_j@example.com)',
-    'firstinitial.lastname' => 'Nama Belakang Inisial Pertama (j.smith@example.com)',
-    'firstnamelastinitial'  => 'Nama Depan Inisial Belakang (janes@example.com)',
-    'lastnamefirstname'      => 'Last Name First Name (smith.jane@example.com)',
-    'first_name'			=> 'Nama Depan',
-    'first_name_format'		=> 'Nama Depan (jane@example.com)',
+
     'files'                 => 'File',
     'file_name'				=> 'Berkas',
     'file_type'             => 'Tipe Berkas',
@@ -156,12 +148,12 @@ return [
     'image_delete'         	=> 'Menghapus gambar',
     'include_deleted'       => 'Sertakan Aset yang Dihapus',
     'image_upload'         	=> 'Unggah gambar',
-    'filetypes_accepted_help'    => 'Jenis file yang diterima adalah :types. Ukuran unggahan maksimum yang diizinkan adalah :size.',
-    'filetypes_size_help'   => 'Ukuran unggahan maksimum yang diizinkan adalah :size.',
-    'image_filetypes_help'  => 'Accepted filetypes are jpg, webp, png, gif, svg, and avif. Max upload size allowed is :size.',
+    'filetypes_accepted_help'    => 'Jenis berkas yang diterima adalah :types. Ukuran maksimum yang diizinkan adalah :size.|Jenis berkas yang diterima adalah :types. Ukuran maksimum yang diizinkan untuk diunggah adalah :size.',
+    'filetypes_size_help'   => 'Ukuran unggah maksimum yang diizinkan adalah :size.',
+    'image_filetypes_help'  => 'Jenis berkas yang diterima adalah jpg, webp, png, gif, svg, dan avif. Ukuran unggah maksimum yang diizinkan adalah :size.',
     'unaccepted_image_type'  => 'Pilihan file gambar ini tidak dapat dibaca. Jenis file yang diterima adalah jpg, webp, png, gif, dan svg. Tipe file ini adalah :mimetype.',
     'import'         	    => 'Impor',
-    'import_this_file'      => 'Map fields and process this file',
+    'import_this_file'      => 'Petakan kolom dan proses berkas ini',
     'importing'         	=> 'Pengimporan',
     'importing_help'        => 'Anda dapat mengimpor aset, aksesori, lisensi, komponen, bahan habis pakai, dan pengguna melalui file CSV. <br><br> CSV harus dibatasi koma dan diformat dengan header yang cocok dengan header di <a href="https://snipe-it.readme.io/docs/importing" target="_new"> contoh CSV dalam dokumentasi</a>.',
     'import-history'        => 'Sejarah Impor',
@@ -178,16 +170,21 @@ return [
     'last'					=> 'Terakhir',
     'last_login'            => 'Login terakhir',
     'last_name'             => 'Nama Belakang',
+    'firstname_lastname_display'	=> 'Nama Depan Nama Belakang (Jane Smith)',
+    'lastname_firstname_display'	=> 'Nama Belakang Nama Depan (Smith Jane)',
+    'name_display_format'	=> 'Format tampilan nama',
+    'first'					=> 'Pertama',
+    'first_name'			=> 'Nama Depan',
     'license'				=> 'Lisensi',
     'license_report'        => 'Laporan Lisensi',
-    'licenses_available'	=> 'Licenses available',
+    'licenses_available'	=> 'Lisensi tersedia',
     'licenses'				=> 'Lisensi',
     'list_all'				=> 'Tampilkan semua',
-    'loading'				=> 'Memuat, harap tunggu....',
+    'loading'				=> 'Memuat, harap tunggu...',
     'lock_passwords'        => 'Nilai bidang ini tidak akan disimpan dalam instalasi demo.',
     'feature_disabled'      => 'Fitur ini telah dinonaktifkan untuk instalasi demo.',
     'location'              => 'Lokasi',
-    'location_plural'        => 'Location|Locations',
+    'location_plural'        => 'Lokasi|Lokasi',
     'locations'				=> 'Lokasi',
     'logo_size'				=> 'Logo persegi terlihat paling sesuai dengan Logo + Teks. Ukuran tampilan maksimum logo adalah; tinggi 50 piksel x lebar 500 piksel.  ',
     'logout'				=> 'Keluar',
@@ -207,14 +204,22 @@ return [
     'next'					=> 'Berikutnya',
     'next_audit_date'		=> 'Tanggal Audit berikutnya',
     'next_audit_date_help'  => 'If you use auditing in your organization, this is usually automatically calculated based on the asset&apos;s last audit date and audit frequency (in <code>Admin Settings &gt; Alerts</code>) and you can leave this blank. You can manually set this date here if you need to, but it must be later than the last audit date. ',
-    'audit_images_help'     => 'You can find audit images in the asset\'s history tab.',
-    'no_email'              => 'No email address associated with this user',
+    'audit_images_help'     => 'Anda dapat menemukan gambar audit pada tab riwayat aset.',
+    'no_email'              => 'Tidak ada alamat email yang terkait dengan pengguna ini',
     'last_audit'		    => 'Audit terakhir',
     'new'					=> 'baru!',
     'no_depreciation'		=> 'Tidak ada penyusutan',
     'no_results'			=> 'Tidak ada hasil.',
     'no'  					=> 'Tidak',
     'notes'  				=> 'Catatan',
+    'note_added'            => 'Catatan Ditambahkan',
+    'options'				=> 'Options',
+    'preview'				=> 'Preview',
+    'add_note'              => 'Tambah Catatan',
+    'note_edited'            => 'Catatan Diedit',
+    'edit_note'              => 'Edit Catatan',
+    'note_deleted'            => 'Catatan Dihapus',
+    'delete_note'              => 'Hapus Catatan',
     'order_number'          => 'Jumlah order',
     'only_deleted'          => 'Hanya Aset yang Dihapus',
     'page_menu'				=> 'Menampilkan item _MENU_',
@@ -229,7 +234,7 @@ return [
     'purchase_date'         => 'Tanggal Pembelian',
     'qty'		            => 'JML',
     'quantity'		        => 'Jumlah',
-    'quantity_minimum'      => 'Anda memiliki :count item di bawah atau hampir mencapai jumlah minimum yang diizinkan',
+    'quantity_minimum'      => 'Anda memiliki satu item yang berada di bawah atau hampir di bawah tingkat kuantitas minimum|Anda memiliki :count item di bawah atau hampir di bawah tingkat kuantitas minimum',
     'quickscan_checkin'  	=> 'Pengecekan Masuk Cepat dengan Pemindaian Barcode',
     'quickscan_checkin_status'  	=> 'Status Checkin',
     'ready_to_deploy'		=> 'Siap digunakan',
@@ -240,21 +245,21 @@ return [
     'restored'				=> 'kembalikan',
     'restore'				=> 'Pulihkan',
     'requestable_models'    => 'Model yang Dapat Diminta',
-    'requestable_items'     => 'Requestable Items',
+    'requestable_items'     => 'Barang Dapat Diminta',
     'requested'				=> 'Diminta',
     'requested_date'        => 'Tanggal Permintaan',
     'requested_assets'      => 'Aset yang Diminta',
     'requested_assets_menu' => 'Aset yang Diminta',
     'request_canceled'      => 'Permintaan Dibatalkan',
-    'request_item'          => 'Request this item',
-    'external_link_tooltip' => 'External link to',
+    'request_item'          => 'Perminta barang ini',
+    'external_link_tooltip' => 'Tautan eksternal ke',
     'save'  				=> 'Simpan',
     'select_var'            => 'Pilih :thing... ', // this will eventually replace all of our other selects
     'select'				=> 'Pilih',
     'select_all'            => 'Pilih Semua',
     'search'				=> 'Cari',
     'select_category'       => 'Memilih Kategori',
-    'select_datasource' => 'Select a Datasource',
+    'select_datasource' => 'Pilih sumber data',
     'select_department'     => 'Pilih Departemen',
     'select_depreciation'	=> 'Memilih tipe penyusutan',
     'select_location'		=> 'Memilih lokasi',
@@ -274,18 +279,20 @@ return [
     'signed_off_by'         => 'Ditandatangani Oleh',
     'skin'       			=> 'Tema',
     'webhook_msg_note'        => 'Pemberitahuan akan dikirim melalui webhook',
-    'webhook_test_msg'        => 'Oh hai! Sepertinya integrasi :app Anda dengan Snipe-IT berfungsi dengan baik!',
+    'webhook_test_msg'        => 'Oh hai! Sepertinya integrasi :app Anda dengan Snipe-IT berhasil!',
     'some_features_disabled' => 'DEMO: Beberapa fitur tidak aktif.',
     'site_name'				=> 'Nama Situs',
     'state'  				=> 'Provinsi',
     'status_labels'			=> 'Status label',
+    'status_label'			=> 'Label Status',
     'status'    			=> 'Status',
     'accept_eula'           => 'Perjanjian Penerimaan',
+    'show_or_hide_eulas' => 'Tampilkan/Sembunyikan EULA',
     'supplier'              => 'Pemasok',
     'suppliers'  			=> 'Pemasok',
     'sure_to_delete'        => 'Yakin ingin menghapusnya',
     'sure_to_delete_var'    => 'Apakah Anda yakin untuk menghapus kategori ini?',
-    'delete_what'           => 'Delete :item',
+    'delete_what'           => 'Hapus :item',
     'submit'				=> 'Menyerahkan',
     'target'                => 'Target',
     'time_and_date_display' => 'Tampilan Waktu dan Tanggal',
@@ -296,15 +303,15 @@ return [
     'type'  				=> 'Tipe',
     'undeployable'			=> 'Belum siap digunakan',
     'unknown_admin'			=> 'Admin tidak diketahui',
-    'username_format'		=> 'Format pengguna',
     'username'              => 'Nama Pengguna',
     'update'                => 'Memperbarui',
+    'updating_item' => 'Memperbarui :item',
     'upload_filetypes_help'      => 'Jenis file yang diizinkan adalah png, gif, jpg, jpeg, doc, docx, pdf, xls, xlsx, txt, lic, xml, zip, rtf, dan rar. Ukuran unggahan maksimum yang diizinkan adalah :size.',
     'uploaded'              => 'Terunggah',
     'user'					=> 'Pengguna',
     'accepted'			    => 'diterima',
     'declined'			    => 'menolak',
-    'declined_note'         => 'Declined Notes',
+    'declined_note'         => 'Catatan yang Ditolak',
     'unassigned'            => 'Belum ditetapkan',
     'unaccepted_asset_report' => 'Aset tidak diterima',
     'users'                 => 'Pengguna',
@@ -323,10 +330,10 @@ return [
     'token_expired'         => 'Sesi login Anda telah kadaluarsa. Silakan login lagi.',
     'login_enabled'         => 'Login Diaktifkan',
     'audit_due'             => 'Jatuh Tempo untuk Audit',
-    'audit_due_days'        => 'Assets Due for Audit Within :days Day|Assets Due for Audit Within :days Days',
-    'checkin_due'           => 'Due for Checkin',
-    'checkin_overdue'       => 'Overdue for Checkin',
-    'checkin_due_days'      => 'Assets Due for Checkin Within :days Day|Assets Due for Checkin Within :days Days',
+    'audit_due_days'        => '{}Assets Due or Overdue for Audit|[1]Assets Due or Overdue for Audit Within a Day|[2,*]Assets Due or Overdue for Audit Within :days Days',
+    'checkin_due'           => 'Jatuh Tempo untuk Cek masuk',
+    'checkin_overdue'       => 'Jatuh Tempo untuk Cek masuk',
+    'checkin_due_days'      => '{}Due for Checkin|[1]Assets Due for Checkin Within :days Day|[2,*]Assets Due for Checkin Within :days Days',
     'audit_overdue'         => 'Terlambat untuk Audit',
     'accept'                => 'Terima :asset',
     'i_accept'              => 'Saya Setuju',
@@ -339,16 +346,16 @@ return [
     'view_all'              => 'lihat semua',
     'hide_deleted'          => 'Sembunyikan yang Dihapus',
     'email'                 => 'Email',
-    'do_not_change'         => 'Jangan Ubah',
-    'bug_report'            => 'Laporkan Bug',
+    'do_not_change'         => 'Jangan diubah',
+    'bug_report'            => 'Laporkan bug',
     'user_manual'           => 'Panduan Pengguna',
     'setup_step_1'          => 'Langkah 1',
     'setup_step_2'          => 'Langkah 2',
     'setup_step_3'          => 'Langkah 3',
     'setup_step_4'          => 'Langkah 4',
     'setup_config_check'    => 'Peninjauan Konfigurasi',
-    'setup_create_database' => 'Membuat Tabel Database',
-    'setup_create_admin'    => 'Buat Pengguna Admin',
+    'setup_create_database' => 'Buat tabel basis data',
+    'setup_create_admin'    => 'Membuat pengguna admin',
     'setup_done'            => 'Selesai!',
     'bulk_edit_about_to'    => 'Anda akan mengubah hal berikut ini: ',
     'checked_out'           => 'Diberikan',
@@ -374,8 +381,8 @@ return [
     'synchronize'           => 'Sinkronisasi',
     'sync_results'          => 'Hasil Sinkronisasi',
     'license_serial'        => 'Serial/Product Key',
-    'invalid_category'      => 'Invalid or missing category',
-    'invalid_item_category_single' => 'Invalid or missing :type category. Please update the category of this :type to include a valid category before checking out.',
+    'invalid_category'      => 'Kategori tidak valid atau belum diatur',
+    'invalid_item_category_single' => 'Kategori :type tidak valid atau belum diatur. Harap perbarui kategori :type ini dengan kategori yang valid sebelum cek keluar.',
     'dashboard_info'        => 'Ini dasbor Anda. Ada banyak yang seperti itu, tapi yang ini milikmu.',
     '60_percent_warning'    => '60% Selesai (peringatan)',
     'dashboard_empty'       => 'Sepertinya Anda belum menambahkan apa pun, jadi kami tidak memiliki sesuatu yang keren untuk ditampilkan. Mulailah dengan menambahkan beberapa aset, aksesori, bahan habis pakai, atau lisensi sekarang!',
@@ -383,6 +390,8 @@ return [
     'new_license'           => 'Lisensi Baru',
     'new_accessory'         => 'Aksesori Baru',
     'new_consumable'        => 'Barang Habis Pakai Baru',
+    'new_component'         => 'New Component',
+    'new_user'              => 'New User',
     'collapse'              => 'Ciutkan',
     'assigned'              => 'Diberikan',
     'asset_count'           => 'Total Aset',
@@ -405,9 +414,9 @@ return [
     'accessory_name'       => 'Nama Aksesoris:',
     'clone_item'            => 'Duplikasi',
     'checkout_tooltip' => 'Keluar-kan barang ini',
-    'checkin_tooltip' => 'Check this item in so that it is available for re-issue, re-imaging, etc',
+    'checkin_tooltip' => 'Simpan barang ini agar tersedia untuk terbit ulang, citra ulang, dll',
     'checkout_user_tooltip' => 'Keluar-kan barang ini untuk pengguna',
-    'checkin_to_diff_location' => 'You can choose to check this asset in to a location other than this asset\'s default location of :default_location if one is set',
+    'checkin_to_diff_location' => 'Anda dapat memilih untuk mengembalikan aset ini ke lokasi selain lokasi defaultnya, yaitu :default_location, jika ada',
     'maintenance_mode'      => 'Layanan sedang dalam proses pembaharuan. Mohon kunjungi di lain waktu.',
     'maintenance_mode_title' => 'Sistem tidak dapat diakses untuk sementara waktu',
     'ldap_import'           => 'Sandi pengguna tidak seharusnya di kelola oleh LDAP. (Hal tersebut agar dapat mengirimkan permintaan perubahan sandi.)',
@@ -415,22 +424,23 @@ return [
     'backup_delete_not_allowed'     => 'Penghapusan berkas pencadangan telah di non-aktifkan pada berkas .env. Hubungi bagian layanan dukungan anda atau sistem admin anda.',
     'additional_files'           => 'Berkas Tambahan',
     'shitty_browser'        => 'Tanda tangan tidak terdeteksi. Jika anda menggunakan peramban seri lama, mohon gunakan peramban yang terbaru untuk dapat menyelesaikan serah terima aset.',
-    'bulk_soft_delete'      =>'Also soft-delete these users. Their asset history will remain intact unless/until you purge deleted records in the Admin Settings.',
-    'bulk_checkin_delete_success' => 'Your selected users have been deleted and their items have been checked in.',
-    'bulk_checkin_success' => 'The items for the selected users have been checked in.',
-    'set_to_null'           => 'Delete values for this asset|Delete values for all :asset_count assets ',
-    'set_users_field_to_null'  => 'Delete :field values for this user|Delete :field values for all :user_count users ',
+    'bulk_soft_delete'      =>'Juga hapus sementara pengguna ini. Riwayat aset mereka akan tetap utuh kecuali/hingga Anda membersihkan catatan yang dihapus di Pengaturan Admin.',
+    'bulk_checkin_delete_success' => 'Pengguna yang Anda pilih telah dihapus dan barang-barang mereka telah dikembalikan.',
+    'bulk_checkin_success' => 'Barang-barang untuk pengguna yang dipilih telah dikembalikan.',
+    'set_to_null'           => 'Hapus nilai untuk pilihan ini | Hapus nilai untuk semua :selection_count selections ',
+    'set_users_field_to_null'  => 'Hapus nilai :field untuk pengguna ini | Hapus nilai :field untuk semua :user_count users ',
     'na_no_purchase_date'   => 'Tidak tersedia - Tanggal pembelian tidak di informasikan',
     'assets_by_status'      => 'Aset berdasarkan status',
     'assets_by_status_type'      => 'Aset berdasarkan tipe status',
-    'pie_chart_type'        => 'Dashboard Pie Chart Type',
+    'pie_chart_type'        => 'Jenis Diagram Pai Dasbor',
     'hello_name'            => 'Selamat datang, :name!',
-    'unaccepted_profile_warning'   => 'You have :count items requiring acceptance. Click here to accept or decline them',
+    'unaccepted_profile_warning'   => 'Anda memiliki satu item yang menunggu persetujuan. Klik di sini untuk menerima atau menolaknya. | Anda memiliki :count item yang menunggu persetujuan. Klik di sini untuk menerima atau menolaknya',
     'start_date'            => 'Tanggal Mulai',
     'end_date'            => 'Tanggal berakhir',
     'alt_uploaded_image_thumbnail' => 'Unggah gambar-kecil',
     'placeholder_kit'       => 'Pilih sebuah paket',
     'file_not_found'        => 'Berkas tidak ditemukan',
+    'log_record_not_found'  => 'Tidak ditemukan catatan untuk entri log tersebut.',
     'preview_not_available' => '(tidak ada preview)',
     'setup'                 => 'Pengaturan',
     'pre_flight'            => 'Sebelum di mulai',
@@ -443,7 +453,7 @@ return [
     'integration_option'    => 'Opsi integrasi',
     'log_does_not_exist'    => 'Tidak ada catatan log yang cocok.',
     'merge_users'           => 'Gabungkan Pengguna',
-    'merge_information' =>  'This will merge the :count users into a single user. Select the user you wish to merge the others into below, and the associated assets, licenses, etc will be moved over to the selected user and the other users will be marked as deleted.',
+    'merge_information' =>  'Ini akan menggabungkan :count pengguna menjadi satu pengguna. Pilih pengguna yang ingin Anda gunakan sebagai tujuan penggabungan di bawah ini, dan aset, lisensi, dll. yang terkait akan dipindahkan ke pengguna yang dipilih, dan pengguna lainnya akan ditandai sebagai dihapus.',
     'warning_merge_information' => 'Tindakan ini TIDAK DAPAT dibatalkan dan HANYA boleh digunakan saat Anda perlu menggabungkan pengguna karena impor atau sinkronisasi yang buruk. Pastikan untuk menjalankan pencadangan terlebih dahulu.',
     'no_users_selected'     => 'Tidak ada Pengguna yang dipilih',
     'not_enough_users_selected'     => 'Setidaknya :count pengguna harus dipilih',
@@ -456,8 +466,8 @@ return [
     'auto_incrementing_asset_tags_disabled_so_tags_required' => 'Pembuatan tag aset penambahan otomatis dinonaktifkan sehingga semua baris harus diisi kolom "Tag Aset".',
     'auto_incrementing_asset_tags_enabled_so_now_assets_will_be_created' => 'Catatan: Membuat tag aset penambahan otomatis diaktifkan sehingga aset akan dibuat untuk baris yang tidak berisi "Tag Aset". Baris yang berisi "Tag Aset" akan diperbarui dengan informasi yang diberikan.',
     'send_welcome_email_to_users'   => ' Kirim Email Selamat Datang untuk Pengguna baru?',
-    'send_email'                => 'Send Email',
-    'call'                      => 'Call number',
+    'send_email'                => 'Kirim Email',
+    'call'                      => 'No. Panggilan',
     'back_before_importing'     => 'Cadangkan sebelum mengimpor?',
     'csv_header_field'          => 'Kolom Tajuk CSV',
     'import_field'              => 'Impor Kolom',
@@ -467,7 +477,7 @@ return [
     'errors_importing'          => 'Beberapa Kesalahan terjadi saat mengimpor: ',
     'warning'                   => 'PERINGATAN: :warning',
     'success_redirecting'       => '"Berhasil... Mengalihkan.',
-    'cancel_request'            => 'Cancel this item request',
+    'cancel_request'            => 'Batalkan permintaan barang ini',
     'setup_successful_migrations' => 'Tabel database Anda telah dibuat',
     'setup_migration_output' => 'Keluaran migrasi:',
     'setup_migration_create_user' => 'Selanjutnya: Buat Pengguna',
@@ -479,24 +489,24 @@ return [
     'no_autoassign_licenses_help' => 'Jangan sertakan pengguna untuk penetapan massal melalui tampilan antarmuka lisensi atau alat cli.',
     'modal_confirm_generic'      => 'Apakah anda yakin?',
     'cannot_be_deleted'      => 'Barang ini tidak dapat dihapus',
-    'cannot_be_edited'      => 'This item cannot be edited.',
+    'cannot_be_edited'      => 'Barang ini tak dapat disunting.',
     'undeployable_tooltip'      => 'Item ini tidak dapat diperiksa. Periksa kuantitas yang tersisa.',
     'serial_number'        => 'Nomor Seri',
     'item_notes' => ':Catatan benda',
     'item_name_var' => ':nama Item',
-    'error_user_company' => 'Checkout target company and asset company do not match',
-    'error_user_company_accept_view' => 'An Asset assigned to you belongs to a different company so you can\'t accept nor deny it, please check with your manager',
+    'error_user_company' => 'Company tujuan peminjaman dan company pemilik aset tidak cocok',
+    'error_user_company_accept_view' => 'Aset yang ditetapkan kepada Anda dimiliki oleh company lain sehingga Anda tidak dapat menerima maupun menolaknya, harap hubungi manajer Anda',
     'importer' => [
-        'checked_out_to_fullname' => 'Checked Out to: Full Name',
-        'checked_out_to_first_name' => 'Checked Out to: First Name',
-        'checked_out_to_last_name' => 'Checked Out to: Last Name',
-        'checked_out_to_username' => 'Checked Out to: Username',
-        'checked_out_to_email' => 'Checked Out to: Email',
-        'checked_out_to_tag' => 'Checked Out to: Asset Tag',
-        'manager_first_name' => 'Manager First Name',
-        'manager_last_name' => 'Manager Last Name',
-        'manager_full_name' => 'Manager Full Name',
-        'manager_username' => 'Manager Username',
+        'checked_out_to_fullname' => 'Dipinjam oleh: Nama Lengkap',
+        'checked_out_to_first_name' => 'Dipinjam oleh: Nama Depan',
+        'checked_out_to_last_name' => 'Dipinjam oleh: Nama Belakang',
+        'checked_out_to_username' => 'Dipinjam oleh: Nama Pengguna',
+        'checked_out_to_email' => 'Dipinjam oleh: Email',
+        'checked_out_to_tag' => 'Dipinjam oleh: Tag Aset',
+        'manager_first_name' => 'Nama Depan Manajer',
+        'manager_last_name' => 'Nama Belakang Manajer',
+        'manager_full_name' => 'Nama Lengkap Manajer',
+        'manager_username' => 'Nama Pengguna Manajer',
         'checkout_type' => 'Tipe Keluar',
         'checkout_location' => 'Keluar-kan untuk lokasi di',
         'image_filename' => 'Nama berkas gambar',
@@ -508,47 +518,112 @@ return [
         'address2' => 'Baris Alamat 2',
         'import_note' => 'Telah di impor menggunakan csv importer',
     ],
-    'remove_customfield_association' => 'Remove this field from the fieldset. This will not delete the custom field, only this field\'s association with this fieldset.',
-    'checked_out_to_fields' => 'Checked Out To Fields',
+    'remove_customfield_association' => 'Hapus kolom ini dari kelompok kolom. Ini tidak akan menghapus kolom kustom, hanya hubungan kolom ini dengan kelompok kolom ini.',
+    'checked_out_to_fields' => 'Kolom Informasi Peminjam',
     'percent_complete' => '% lengkap',
-    'uploading' => 'Uploading... ',
-    'upload_error' => 'Error uploading file. Please check that there are no empty rows and that no column names are duplicated.',
-    'copy_to_clipboard' => 'Copy to Clipboard',
-    'copied' => 'Copied!',
-    'status_compatibility' => 'If assets are already assigned, they cannot be changed to a non-deployable status type and this value change will be skipped.',
-    'rtd_location_help' => 'This is the location of the asset when it is not checked out',
-    'item_not_found' => ':item_type ID :id does not exist or has been deleted',
-    'action_permission_denied' => 'You do not have permission to :action :item_type ID :id',
-    'action_permission_generic' => 'You do not have permission to :action this :item_type',
+    'uploading' => 'Sedang mengunggah... ',
+    'upload_error' => 'Error uploading file. Please check that you have no empty rows or duplicated column names in your CSV, and that the server permissions allow uploads.',
+    'copy_to_clipboard' => 'Salin ke Papan Klip',
+    'copied' => 'Disalin!',
+    'status_compatibility' => 'Jika aset telah dialokasikan, statusnya tidak dapat diubah menjadi tidak dapat digunakan, dan perubahan ini akan diabaikan.',
+    'rtd_location_help' => 'Ini adalah lokasi aset ketika tidak sedang dipinjam',
+    'item_not_found' => ':item_type ID :id tidak ada atau sudah dihapus',
+    'action_permission_denied' => 'Anda tidak memiliki izin untuk :action :item_type dengan ID :id',
+    'action_permission_generic' => 'Anda tidak memiliki izin untuk :action :item_type ini',
     'edit' => 'ubah',
-    'action_source' => 'Action Source',
-    'or' => 'or',
+    'action_source' => 'Sumber Tindakan',
+    'or' => 'atau',
     'url'                   => 'URL',
-    'edit_fieldset' => 'Edit fieldset fields and options',
-    'permission_denied_superuser_demo' => 'Permission denied. You cannot update user information for superadmins on the demo.',
-    'pwd_reset_not_sent' => 'User is not activated, is LDAP synced, or does not have an email address',
-    'error_sending_email' => 'Error sending email',
-    'sad_panda' => 'Sad panda. You are not authorized to do the thing. Maybe <a href=":link">return to the dashboard</a>, or contact your administrator.',
+    'edit_fieldset' => 'Edit kolom dan opsi kelompok kolom',
+    'permission_denied_superuser_demo' => 'Akses ditolak. Anda tidak dapat memperbarui informasi pengguna untuk superadmin pada demo ini.',
+    'pwd_reset_not_sent' => 'Pengguna belum diaktifkan, disinkronkan dengan LDAP, atau tidak memiliki alamat email',
+    'error_sending_email' => 'Gagal mengirim email',
+    'sad_panda' => 'Kasihan deh Loo. Tampaknya anda tidak memiliki izin untuk melakukan hal ini. Mungkin <a href=":link">kembali ke dasbor</a>, atau kontak administrator anda.',
     'bulk' => [
             'delete' =>
                 [
-                'header' => 'Bulk Delete :object_type',
-                'warn'   =>  'You are about to delete one :object_type|You are about to delete :count :object_type',
-                'success'   =>  ':object_type successfully deleted|Successfully deleted :count :object_type',
-                'error'   =>  'Could not delete :object_type',
-                'nothing_selected'   =>  'No :object_type selected - nothing to do',
-                'partial'   =>  'Deleted :success_count :object_type, but :error_count :object_type could not be deleted',
+                'header' => 'Hapus Masal :object_type',
+                'warn'   =>  'Anda akan menghapus satu :object_type|Anda akan menghapus :count :object_type',
+                'success'   =>  ':object_type berhasil dihapus|Berhasil menghapus :count :object_type',
+                'error'   =>  'Tidak dapat menghapus :object_type',
+                'nothing_selected'   =>  'Tidak ada :object_type yang dipilih - tidak ada tindakan yang dilakukan',
+                'partial'   =>  'Menghapus :success_count :object_type, tetapi :error_count :object_type tidak dapat dihapus',
              ],
     ],
-    'no_requestable' => 'There are no requestable assets or asset models.',
+    'no_requestable' => 'Tidak ada aset atau model aset yang dapat diminta.',
 
     'countable' => [
-        'accessories'  => ':count Accessory|:count Accessories',
-        'assets'  => ':count Asset|:count Assets',
-        'licenses'  => ':count License|:count Licenses',
-        'license_seats'  => ':count License Seat|:count License Seats',
-        'consumables'  => ':count Consumable|:count Consumables',
-        'components'  => ':count Component|:count Components',
-    ]
+        'accessories'  => ':count Aksesori|:count Aksesori',
+        'assets'  => ':count Aset|:count Aset',
+        'licenses'  => ':count Lisensi|:count Lisensi',
+        'license_seats'  => ':count Hak Akses Lisensi |:count Hak Akses Lisensi',
+        'consumables'  => ':count Barang Habis Pakai|:count Barang Habis Pakai',
+        'components'  => ':count Komponen|:count Komponen',
+    ],
+
+    'more_info' => 'Lebih Lanjut',
+    'quickscan_bulk_help' => 'Menandai kotak ini akan mengedit catatan aset untuk mencerminkan lokasi baru ini. Jika dibiarkan tidak dicentang, hanya lokasi tersebut yang akan dicatat dalam log audit. Perhatikan bahwa jika aset ini sedang dipinjam, lokasi orang, aset, atau lokasi tempat aset dipinjam tidak akan berubah.',
+    'whoops' => 'Waduh!',
+    'something_went_wrong' => 'Terjadi kesalahan pada permintaan Anda.',
+    'close' => 'Tutup',
+    'expires' => 'Kadaluarsa',
+    'map_fields'=> 'Peta Kolom :item_type',
+    'remaining_var' => ':count Yang Tersisa',
+    'label' => 'Label',
+    'import_asset_tag_exists' => 'Aset dengan tag aset :asset_tag sudah ada dan tidak ada permintaan pembaruan. Tidak ada perubahan yang dibuat.',
+    'countries_manually_entered_help' => 'Nilai yang ditandai dengan tanda bintang (*) dimasukkan secara manual dan tidak cocok dengan nilai dropdown ISO 3166 yang ada',
+    'accessories_assigned' => 'Aksesoris yang Dipasangkan',
+    'user_managed_passwords' => 'Manajemen Kata Sandi',
+    'user_managed_passwords_disallow' => 'Jangan izinkan pengelolaan kata sandi oleh pengguna',
+    'user_managed_passwords_allow' => 'Izinkan pengguna mengelola kata sandi mereka sendiri',
+    'from' => 'From',
+    'by' => 'Oleh',
+
+// Add form placeholders here
+    'placeholders' => [
+        'notes'  => 'Add a note',
+    ],
+
+    'breadcrumb_button_actions' => [
+        'edit_item' => 'Edit :name',
+        'checkout_item' => 'Checkout :name',
+        'checkin_item' => 'Checkin :name',
+    ],
+
+    'skins' => [
+        'site_default' => 'Site Default',
+        'default_blue' => 'Default Blue',
+        'blue_dark' => 'Blue (Dark Mode)',
+        'green' => 'Green Dark',
+        'green_dark' => 'Green (Dark Mode)',
+        'red' => 'Red Dark',
+        'red_dark' => 'Red (Dark Mode)',
+        'orange' => 'Orange Dark',
+        'orange_dark' => 'Orange (Dark Mode)',
+        'black' => 'Black',
+        'black_dark' => 'Black (Dark Mode)',
+        'purple' => 'Purple',
+        'purple_dark' => 'Purple (Dark Mode)',
+        'yellow' => 'Yellow',
+        'yellow_dark' => 'Yellow (Dark Mode)',
+        'high_contrast' => 'High Contrast',
+
+    ],
+
+    'select_all_none' => 'Select/Unselect All',
+    'generic_model_not_found' => 'That :model was not found or you do not have permission to access it',
+    'deleted_models' => 'Deleted Asset Models',
+    'deleted_users' => 'Deleted Users',
+    'cost_each' => ':amount each',
+    'remove_current_image' => 'Remove current :type image',
+
+    'seeding' => [
+        'manufacturers' => [
+            'button' => 'Create Manufacturers',
+            'prompt' => 'You do not have any manufacturers yet. Would you like to seed a list of common manufacturers? (THIS WILL OVERWRITE EXISTING MANUFACTURERS, including those that have been soft-deleted.)',
+            'success' => 'Manufacturers seeded successfully',
+            'error' => 'Could not seed manufacturers. A manufacturer record already exists and seeding would overwrite it.|Could not seed manufacturers. :count manufacturer records already exist and seeding would overwrite them.',
+        ],
+    ],
 
 ];
diff --git a/resources/lang/id-ID/help.php b/resources/lang/id-ID/help.php
index f9ccde6c0b..274dd8228a 100644
--- a/resources/lang/id-ID/help.php
+++ b/resources/lang/id-ID/help.php
@@ -15,7 +15,7 @@ return [
 
     'more_info_title' => 'Lebih Lanjut',
 
-    'audit_help' => 'Checking this box will edit the asset record to reflect this new location. Leaving it unchecked will simply note the location in the audit log.<br><br>Note that if this asset is checked out, it will not change the location of the person, asset or location it is checked out to.',
+    'audit_help' => 'Mencentang kotak ini akan mengubah catatan aset untuk mencerminkan lokasi baru ini. Membiarkannya tidak dicentang hanya akan mencatat lokasi di log audit.<br><br>Perhatikan bahwa jika aset ini sedang dipinjam, ini tidak akan mengubah lokasi orang, aset, atau lokasi tempat aset tersebut dipinjam.',
 
     'assets' => 'Aset adalah barang yang dilacak dengan nomor seri atau tanda aset. Cenderung menjadi barang dengan nilai lebih tinggi dimana identifikasi barang secara spesifik berpengaruh.',
 
@@ -31,5 +31,5 @@ return [
 
     'depreciations' => 'Anda dapat mengatur penyusutan aset dengan perhitungan penyusutan garis lurus.',
     
-    'empty_file'    => 'The importer detects that this file is empty.'
+    'empty_file'    => 'Pengimpor mendeteksi bahwa berkas ini kosong.'
 ];
diff --git a/resources/lang/id-ID/localizations.php b/resources/lang/id-ID/localizations.php
index f1232dd138..88b96c0be6 100644
--- a/resources/lang/id-ID/localizations.php
+++ b/resources/lang/id-ID/localizations.php
@@ -2,95 +2,97 @@
 
 return [
 
-    'select_language' => 'Select a language',
+    'select_language' => 'Pilh Bahasa',
     'languages' => [
-        'en-US'=> 'English, US',
-        'en-GB'=> 'English, UK',
-        'am-ET' => 'Amharic',
-        'af-ZA'=> 'Afrikaans',
-        'ar-SA'=> 'Arabic',
-        'bg-BG'=> 'Bulgarian',
-        'zh-CN'=> 'Chinese Simplified',
-        'zh-TW'=> 'Chinese Traditional',
-        'ca-ES' => 'Catalan',
-        'hr-HR'=> 'Croatian',
-        'cs-CZ'=> 'Czech',
-        'da-DK'=> 'Danish',
-        'nl-NL'=> 'Dutch',
-        'en-ID'=> 'English, Indonesia',
-        'et-EE'=> 'Estonian',
-        'fil-PH'=> 'Filipino',
-        'fi-FI'=> 'Finnish',
-        'fr-FR'=> 'French',
-        'de-DE'=> 'German',
-        'de-if'=> 'German (Informal)',
-        'el-GR'=> 'Greek',
-        'he-IL'=> 'Hebrew',
-        'hu-HU'=> 'Hungarian',
-        'is-IS' => 'Icelandic',
-        'id-ID'=> 'Indonesian',
-        'ga-IE'=> 'Irish',
-        'it-IT'=> 'Italian',
-        'ja-JP'=> 'Japanese',
-        'km-KH'=>'Khmer',
-        'ko-KR'=> 'Korean',
-        'lt-LT'=>'Lithuanian',
-        'lv-LV'=> 'Latvian',
-        'mk-MK'=> 'Macedonian',
-        'ms-MY'=> 'Malay',
-        'mi-NZ'=> 'Maori',
-        'mn-MN'=> 'Mongolian',
-        'no-NO'=> 'Norwegian',
-        'fa-IR'=> 'Persian',
-        'pl-PL'=> 'Polish',
-        'pt-PT'=> 'Portuguese',
-        'pt-BR'=> 'Portuguese, Brazilian',
-        'ro-RO'=> 'Romanian',
-        'ru-RU'=> 'Russian',
-        'sr-CS' => 'Serbian (Latin)',
-        'sk-SK'=> 'Slovak',
-        'sl-SI'=> 'Slovenian',
-        'so-SO'=> 'Somali',
-        'es-ES'=> 'Spanish',
-        'es-CO'=> 'Spanish, Colombia',
-        'es-MX'=> 'Spanish, Mexico',
-        'es-VE'=> 'Spanish, Venezuela',
-        'sv-SE'=> 'Swedish',
-        'tl-PH'=> 'Tagalog',
-        'ta-IN'=> 'Tamil',
-        'th-TH'=> 'Thai',
-        'tr-TR'=> 'Turkish',
-        'uk-UA'=> 'Ukranian',
-        'vi-VN'=> 'Vietnamese',
-        'cy-GB'=> 'Welsh',
-        'zu-ZA'=> 'Zulu',
+        'en-US'=> 'Bahasa Inggris, US',
+        'en-GB'=> 'Bahasa Inggris, UK',
+        'am-ET' => 'Bahasa Amharic',
+        'af-ZA'=> 'Bahasa Afrikanas',
+        'ar-SA'=> 'Bahasa Arab',
+        'bg-BG'=> 'Bahasa Bulgaria',
+        'zh-CN'=> 'Bahasa Mandarin Sederhana',
+        'zh-TW'=> 'Bahasa Mandarin Tradisional',
+        'ca-ES' => 'Bahasa Katalan',
+        'hr-HR'=> 'Bahasa Kroasia',
+        'cs-CZ'=> 'Bahasa Ceko',
+        'da-DK'=> 'Bahasa Denmark',
+        'nl-NL'=> 'Bahasa Belanda',
+        'en-ID'=> 'Bahasa Inggris, Indonesia',
+        'et-EE'=> 'Bahasa Estonia',
+        'fil-PH'=> 'Bahasa Filipina',
+        'fi-FI'=> 'Bahasa Finlandia',
+        'fr-FR'=> 'Bahasa Perancis',
+        'de-DE'=> 'Bahasa Jerman',
+        'de-if'=> 'Bahasa Jerman (Informal)',
+        'el-GR'=> 'Bahasa Yunani',
+        'he-IL'=> 'Bahasa Ibrani',
+        'hu-HU'=> 'Bahasa Hongaria',
+        'is-IS' => 'Bahasa Islandia',
+        'id-ID'=> 'Bahasa Indonesia',
+        'ga-IE'=> 'Bahasa Irlandia',
+        'it-IT'=> 'Bahasa Italia',
+        'ja-JP'=> 'Bahasa Jepang',
+        'km-KH'=>'Bahasa Khmer',
+        'ko-KR'=> 'Bahasa Korea',
+        'lt-LT'=>'Bahasa Lithuania',
+        'lv-LV'=> 'Bahasa Latvia',
+        'mk-MK'=> 'Bahasa Makedonia',
+        'ms-MY'=> 'Bahasa Melayu',
+        'mi-NZ'=> 'Bahasa Maori',
+        'mn-MN'=> 'Bahasa Mongolia',
+        'nb-NO'=> 'Bahasa Bokmål Norwegia',
+        'om-ET' => 'Oromo (Ethiopian)',
+        //'nn-NO'=> 'Norwegian Nynorsk',
+        'fa-IR'=> 'Bahasa Persia',
+        'pl-PL'=> 'Bahasa Polandia',
+        'pt-PT'=> 'Bahasa Portugis',
+        'pt-BR'=> 'Bahasa Portugis, Brazil',
+        'ro-RO'=> 'Bahasa Rumania',
+        'ru-RU'=> 'Bahasa Rusia',
+        'sr-CS' => 'Bahasa Serbia (Latin)',
+        'sk-SK'=> 'Bahasa Slowakia',
+        'sl-SI'=> 'Bahasa Slovenia',
+        'so-SO'=> 'Bahasa Somalia',
+        'es-ES'=> 'Bahasa Spanyol',
+        'es-CO'=> 'Bahasa Spanyol, Kolombia',
+        'es-MX'=> 'Bahasa Spanyol, Meksiko',
+        'es-VE'=> 'Bahasa Spanyol, Venezuela',
+        'sv-SE'=> 'Bahasa Swedia',
+        'tl-PH'=> 'Bahasa Tagalog',
+        'ta-IN'=> 'Bahasa Tamil',
+        'th-TH'=> 'Bahasa Thai',
+        'tr-TR'=> 'Bahasa Turki',
+        'uk-UA'=> 'Bahasa Ukraina',
+        'vi-VN'=> 'Bahasa Vietnam',
+        'cy-GB'=> 'Bahasa Wales',
+        'zu-ZA'=> 'Bahasa Zulu-Sulul',
     ],
 
-    'select_country' => 'Select a country',
+    'select_country' => 'Pilih Negara',
     
     'countries' => [
-        'AC'=>'Ascension Island',
-        'AD'=>'Andorra',
-        'AE'=>'United Arab Emirates',
-        'AF'=>'Afghanistan',
-        'AG'=>'Antigua And Barbuda',
-        'AI'=>'Anguilla',
+        'AC'=>'Pulau Ascension',
+        'AD'=>'Andora',
+        'AE'=>'Uni Emirat Arab',
+        'AF'=>'Afganistan',
+        'AG'=>'Antigua dan Barbuda',
+        'AI'=>'Anguila',
         'AL'=>'Albania',
-        'AM'=>'Armenia',
-        'AN'=>'Netherlands Antilles',
+        'AM'=>'Armedia',
+        'AN'=>'Antillen Belanda',
         'AO'=>'Angola',
-        'AQ'=>'Antarctica',
+        'AQ'=>'Antartika',
         'AR'=>'Argentina',
-        'AS'=>'American Samoa',
+        'AS'=>'Samoa Amerika',
         'AT'=>'Austria',
         'AU'=>'Australia',
         'AW'=>'Aruba',
-        'AX'=>'Ã…land',
+        'AX'=>'Aland',
         'AZ'=>'Azerbaijan',
-        'BA'=>'Bosnia And Herzegovina',
+        'BA'=>'Bosnia Herzegovina',
         'BB'=>'Barbados',
-        'BE'=>'Belgium',
-        'BD'=>'Bangladesh',
+        'BE'=>'Belgia',
+        'BD'=>'banglades',
         'BF'=>'Burkina Faso',
         'BG'=>'Bulgaria',
         'BH'=>'Bahrain',
@@ -102,51 +104,52 @@ return [
         'BR'=>'Brazil',
         'BS'=>'Bahamas',
         'BT'=>'Bhutan',
-        'BV'=>'Bouvet Island',
-        'BW'=>'Botswana',
-        'BY'=>'Belarus',
+        'BV'=>'Pulau Bouvet',
+        'BW'=>'Republik Demokratik Rakyat Botswana',
+        'BY'=>'Belarusia',
         'BZ'=>'Belize',
-        'CA'=>'Canada',
-        'CC'=>'Cocos (Keeling) Islands',
-        'CD'=>'Congo (Democratic Republic)',
-        'CF'=>'Central African Republic',
-        'CG'=>'Congo (Republic)',
-        'CH'=>'Switzerland',
-        'CI'=>'Côte d\'Ivoire',
-        'CK'=>'Cook Islands',
-        'CL'=>'Chile',
-        'CM'=>'Cameroon',
-        'CN'=>'People\'s Republic of China',
-        'CO'=>'Colombia',
-        'CR'=>'Costa Rica',
-        'CU'=>'Cuba',
-        'CV'=>'Cape Verde',
-        'CX'=>'Christmas Island',
-        'CY'=>'Cyprus',
-        'CZ'=>'Czech Republic',
-        'DE'=>'Germany',
-        'DJ'=>'Djibouti',
+        'CA'=>'Kanada',
+        'CC'=>'Kepulauan Cocos (Keeling)',
+        'CD'=>'Kongo (Republik Demokratik)',
+        'CF'=>'Republik Afrika Tengah',
+        'CG'=>'Kongo (Republik)',
+        'CH'=>'Swiss',
+        'CI'=>'Pantai Gading',
+        'CK'=>'Kepulauan Cook',
+        'CL'=>'Chili',
+        'CM'=>'Kamerun',
+        'CN'=>'Republik Rakyat Tiongkok',
+        'CO'=>'Kolombia',
+        'CR'=>'Kosta Rika',
+        'CU'=>'Kuba',
+        'CV'=>'Tanjung Verde',
+        'CX'=>'Pulau Natal',
+        'CY'=>'Siprus',
+        'CZ'=>'Republik Ceko',
+        'DE'=>'Jerman',
+        'DJ'=>'Jibuti',
         'DK'=>'Denmark',
-        'DM'=>'Dominica',
-        'DO'=>'Dominican Republic',
-        'DZ'=>'Algeria',
-        'EC'=>'Ecuador',
+        'DM'=>'Dominika',
+        'DO'=>'Republik Dominika',
+        'DZ'=>'Aljazair',
+        'EC'=>'Ekuador',
         'EE'=>'Estonia',
-        'EG'=>'Egypt',
+        'EG'=>'Mesir',
+        'GB-ENG'=>'Inggris',
         'ER'=>'Eritrea',
-        'ES'=>'Spain',
-        'ET'=>'Ethiopia',
-        'EU'=>'European Union',
-        'FI'=>'Finland',
+        'ES'=>'Spanyol',
+        'ET'=>'Etiopia',
+        'EU'=>'Uni Eropa',
+        'FI'=>'Finlandia',
         'FJ'=>'Fiji',
-        'FK'=>'Falkland Islands (Malvinas)',
-        'FM'=>'Micronesia, Federated States Of',
-        'FO'=>'Faroe Islands',
-        'FR'=>'France',
+        'FK'=>'Kepulauan Falkland (Malvinas)',
+        'FM'=>'Mikronesia, Negara Federasi',
+        'FO'=>'Kepulauan Faroe',
+        'FR'=>'Perancis',
         'GA'=>'Gabon',
         'GD'=>'Grenada',
         'GE'=>'Georgia',
-        'GF'=>'French Guiana',
+        'GF'=>'Guyana Perancis',
         'GG'=>'Guernsey',
         'GH'=>'Ghana',
         'GI'=>'Gibraltar',
@@ -154,167 +157,169 @@ return [
         'GM'=>'Gambia',
         'GN'=>'Guinea',
         'GP'=>'Guadeloupe',
-        'GQ'=>'Equatorial Guinea',
-        'GR'=>'Greece',
-        'GS'=>'South Georgia And The South Sandwich Islands',
+        'GQ'=>'Guinea Khatulistiwa',
+        'GR'=>'Yunani',
+        'GS'=>'Georgia Selatan dan Kepulauan Sandwich Selatan',
         'GT'=>'Guatemala',
         'GU'=>'Guam',
-        'GW'=>'Guinea-Bissau',
+        'GW'=>'Guinea Bissau',
         'GY'=>'Guyana',
-        'HK'=>'Hong Kong',
-        'HM'=>'Heard And Mc Donald Islands',
+        'HK'=>'Hongkong',
+        'HM'=>'Kepulauan Heard dan McDonald',
         'HN'=>'Honduras',
-        'HR'=>'Croatia (local name: Hrvatska)',
+        'HR'=>'Kroasia (nama lokal: Hrvatska)',
         'HT'=>'Haiti',
-        'HU'=>'Hungary',
+        'HU'=>'Hongaria',
         'ID'=>'Indonesia',
-        'IE'=>'Ireland',
+        'IE'=>'Irlandia',
         'IL'=>'Israel',
-        'IM'=>'Isle of Man',
+        'IM'=>'Pulau Man',
         'IN'=>'India',
-        'IO'=>'British Indian Ocean Territory',
-        'IQ'=>'Iraq',
-        'IR'=>'Iran, Islamic Republic Of',
-        'IS'=>'Iceland',
-        'IT'=>'Italy',
+        'IO'=>'Wilayah Samudra Hindia Britania',
+        'IQ'=>'Irak',
+        'IR'=>'Iran, Republik Islam',
+        'IS'=>'Islandia',
+        'IT'=>'Italia',
         'JE'=>'Jersey',
-        'JM'=>'Jamaica',
-        'JO'=>'Jordan',
-        'JP'=>'Japan',
+        'JM'=>'Jamaika',
+        'JO'=>'Yordania',
+        'JP'=>'Jepang',
         'KE'=>'Kenya',
-        'KG'=>'Kyrgyzstan',
-        'KH'=>'Cambodia',
+        'KG'=>'Kirgistan',
+        'KH'=>'Kamboka',
         'KI'=>'Kiribati',
-        'KM'=>'Comoros',
-        'KN'=>'Saint Kitts And Nevis',
-        'KR'=>'Korea, Republic Of',
+        'KM'=>'Komoro',
+        'KN'=>'Saint Kitts dan Nevis',
+        'KR'=>'Korea, Republik',
         'KW'=>'Kuwait',
-        'KY'=>'Cayman Islands',
-        'KZ'=>'Kazakhstan',
-        'LA'=>'Lao People\'s Democratic Republic',
-        'LB'=>'Lebanon',
+        'KY'=>'Kepulauan Cayman',
+        'KZ'=>'Kazakstan',
+        'LA'=>'Republik Demokratik Rakyat Laos',
+        'LB'=>'Libanon',
         'LC'=>'Saint Lucia',
         'LI'=>'Liechtenstein',
-        'LK'=>'Sri Lanka',
+        'LK'=>'Srilanka',
         'LR'=>'Liberia',
         'LS'=>'Lesotho',
         'LT'=>'Lithuania',
-        'LU'=>'Luxembourg',
+        'LU'=>'Luksemburg',
         'LV'=>'Latvia',
-        'LY'=>'Libyan Arab Jamahiriya',
-        'MA'=>'Morocco',
-        'MC'=>'Monaco',
-        'MD'=>'Moldova, Republic Of',
+        'LY'=>'Jamahiriyah Arab Libya',
+        'MA'=>'Moroko',
+        'MC'=>'Monako',
+        'MD'=>'Moldova, Republik',
         'ME'=>'Montenegro',
-        'MG'=>'Madagascar',
-        'MH'=>'Marshall Islands',
-        'MK'=>'Macedonia, The Former Yugoslav Republic Of',
+        'MG'=>'Madagaskar',
+        'MH'=>'Kepulauan Marshall',
+        'MK'=>'Makedonia, Bekas Republik Yugoslavia',
         'ML'=>'Mali',
         'MM'=>'Myanmar',
         'MN'=>'Mongolia',
-        'MO'=>'Macau',
-        'MP'=>'Northern Mariana Islands',
-        'MQ'=>'Martinique',
+        'MO'=>'Makau',
+        'MP'=>'Kepulauan Mariana Utara',
+        'MQ'=>'Martinik',
         'MR'=>'Mauritania',
         'MS'=>'Montserrat',
         'MT'=>'Malta',
         'MU'=>'Mauritius',
-        'MV'=>'Maldives',
+        'MV'=>'Maladewa',
         'MW'=>'Malawi',
-        'MX'=>'Mexico',
+        'MX'=>'Meksiko',
         'MY'=>'Malaysia',
-        'MZ'=>'Mozambique',
+        'MZ'=>'Mozambik',
         'NA'=>'Namibia',
-        'NC'=>'New Caledonia',
-        'NE'=>'Niger',
-        'NF'=>'Norfolk Island',
+        'NC'=>'Kaledonia Baru',
+        'NE'=>'Nigeria',
+        'NF'=>'Pulau Norfolk',
         'NG'=>'Nigeria',
-        'NI'=>'Nicaragua',
-        'NL'=>'Netherlands',
-        'NO'=>'Norway',
+        'NI'=>'Nikaragua',
+        'NL'=>'Belanda',
+        'GB-NIR' => 'Irlandia Utara',
+        'NO'=>'Norwegia',
         'NP'=>'Nepal',
         'NR'=>'Nauru',
         'NU'=>'Niue',
-        'NZ'=>'New Zealand',
+        'NZ'=>'Selandia Baru',
         'OM'=>'Oman',
         'PA'=>'Panama',
         'PE'=>'Peru',
-        'PF'=>'French Polynesia',
-        'PG'=>'Papua New Guinea',
-        'PH'=>'Philippines, Republic of the',
+        'PF'=>'Polinesia Prancis',
+        'PG'=>'Papua Nugini',
+        'PH'=>'Filipina, Republik',
         'PK'=>'Pakistan',
-        'PL'=>'Poland',
-        'PM'=>'St. Pierre And Miquelon',
-        'PN'=>'Pitcairn',
-        'PR'=>'Puerto Rico',
-        'PS'=>'Palestine',
+        'PL'=>'Polandia',
+        'PM'=>'St. Pierre dan Miquelon',
+        'PN'=>'Pulau Pitcairn',
+        'PR'=>'Puerto Riko',
+        'PS'=>'Palestina',
         'PT'=>'Portugal',
         'PW'=>'Palau',
         'PY'=>'Paraguay',
         'QA'=>'Qatar',
         'RE'=>'Reunion',
-        'RO'=>'Romania',
+        'RO'=>'Rumania',
         'RS'=>'Serbia',
-        'RU'=>'Russian Federation',
+        'RU'=>'Federasi Rusia',
         'RW'=>'Rwanda',
-        'SA'=>'Saudi Arabia',
-        'UK'=>'Scotland',
-        'SB'=>'Solomon Islands',
-        'SC'=>'Seychelles',
-        'SS'=>'South Sudan',
+        'SA'=>'Arab Saudi',
+        'GB-SCT'=>'Skotlandia',
+        'SB'=>'Kepulauan Solomon',
+        'SC'=>'Kepulauan Seychelles',
+        'SS'=>'Sudan Selatan',
         'SD'=>'Sudan',
-        'SE'=>'Sweden',
-        'SG'=>'Singapore',
+        'SE'=>'Swedia',
+        'SG'=>'Singapura',
         'SH'=>'St. Helena',
-        'SI'=>'Slovenia',
-        'SJ'=>'Svalbard And Jan Mayen Islands',
-        'SK'=>'Slovakia (Slovak Republic)',
+        'SI'=>'St. Helena',
+        'SJ'=>'Kepulauan Svalbard dan Jan Mayen',
+        'SK'=>'Slowakia (Republik Slowakia)',
         'SL'=>'Sierra Leone',
         'SM'=>'San Marino',
         'SN'=>'Senegal',
         'SO'=>'Somalia',
         'SR'=>'Suriname',
-        'ST'=>'Sao Tome And Principe',
-        'SU'=>'Soviet Union',
+        'ST'=>'Sao Tome dan Principe',
+        'SU'=>'Uni Soviet',
         'SV'=>'El Salvador',
-        'SY'=>'Syrian Arab Republic',
+        'SY'=>'Republik Arab Suriah',
         'SZ'=>'Swaziland',
-        'TC'=>'Turks And Caicos Islands',
+        'TC'=>'Kepulauan Turks dan Caicos',
         'TD'=>'Chad',
-        'TF'=>'French Southern Territories',
+        'TF'=>'Wilayah Selatan Prancis',
         'TG'=>'Togo',
         'TH'=>'Thailand',
         'TJ'=>'Tajikistan',
         'TK'=>'Tokelau',
-        'TI'=>'East Timor',
+        'TI'=>'Timor Timur',
         'TM'=>'Turkmenistan',
         'TN'=>'Tunisia',
         'TO'=>'Tonga',
-        'TP'=>'East Timor (old code)',
-        'TR'=>'Turkey',
-        'TT'=>'Trinidad And Tobago',
+        'TP'=>'Timor Timur (kode lama)',
+        'TR'=>'Turki',
+        'TT'=>'Trinidad dan Tobago',
         'TV'=>'Tuvalu',
         'TW'=>'Taiwan',
-        'TZ'=>'Tanzania, United Republic Of',
-        'UA'=>'Ukraine',
+        'TZ'=>'Tanzania, Republik Bersatu',
+        'UA'=>'Ukraina',
         'UG'=>'Uganda',
-        'UK'=>'United Kingdom',
-        'US'=>'United States',
-        'UM'=>'United States Minor Outlying Islands',
+        'UK'=>'Inggris Raya',
+        'US'=>'Amerika Serikat',
+        'UM'=>'Kepulauan Kecil Terluar Amerika Serikat',
         'UY'=>'Uruguay',
         'UZ'=>'Uzbekistan',
-        'VA'=>'Vatican City State (Holy See)',
-        'VC'=>'Saint Vincent And The Grenadines',
+        'VA'=>'Negara Kota Vatikan (Tahta Suci)',
+        'VC'=>'Saint Vincent dan Grenadines',
         'VE'=>'Venezuela',
-        'VG'=>'Virgin Islands (British)',
-        'VI'=>'Virgin Islands (U.S.)',
-        'VN'=>'Viet Nam',
+        'VG'=>'Kepulauan Virgin (Inggris)',
+        'VI'=>'Kepulauan Virgin (A.S.)',
+        'VN'=>'Vietnam',
         'VU'=>'Vanuatu',
-        'WF'=>'Wallis And Futuna Islands',
+        'GB-WLS' =>'Wales',
+        'WF'=>'Kepulauan Wallis dan Futuna',
         'WS'=>'Samoa',
-        'YE'=>'Yemen',
+        'YE'=>'Yaman',
         'YT'=>'Mayotte',
-        'ZA'=>'South Africa',
+        'ZA'=>'Afrika Selatan',
         'ZM'=>'Zambia',
         'ZW'=>'Zimbabwe',
     ],
diff --git a/resources/lang/id-ID/mail.php b/resources/lang/id-ID/mail.php
index afff161462..446d108456 100644
--- a/resources/lang/id-ID/mail.php
+++ b/resources/lang/id-ID/mail.php
@@ -3,7 +3,7 @@
 return [
 
     'Accessory_Checkin_Notification' => 'Aksesoris Kembali',
-    'Accessory_Checkout_Notification' => 'Accessory checked out',
+    'Accessory_Checkout_Notification' => 'Aksesoris telah dialokasikan',
     'Asset_Checkin_Notification' => 'Aset Kembali',
     'Asset_Checkout_Notification' => 'Kembali-kan aset',
     'Confirm_Accessory_Checkin' => 'Konfirmasi check-in Aksesoris',
@@ -12,7 +12,7 @@ return [
     'Confirm_asset_delivery' => 'Konfirmasi pengiriman Aset',
     'Confirm_consumable_delivery' => 'Konfirmasi pengiriman Habis Pakai',
     'Confirm_license_delivery' => 'Konfirmasi pengiriman Lisensi',
-    'Consumable_checkout_notification' => 'Consumable checked out',
+    'Consumable_checkout_notification' => 'Barang habis pakai telah dikeluarkan',
     'Days' => 'Hari',
     'Expected_Checkin_Date' => 'Aset yang check out untuk Anda akan check in kembali pada :date',
     'Expected_Checkin_Notification' => 'Pengingat: :name mendekati batas waktu check-in [Dikembalikan]',
@@ -22,60 +22,64 @@ return [
     'Item_Request_Canceled' => 'Permintaan Barang Dibatalkan',
     'Item_Requested' => 'Barang yang diminta',
     'License_Checkin_Notification' => 'Lisensi Kembali',
-    'License_Checkout_Notification' => 'License checked out',
+    'License_Checkout_Notification' => 'Lisensi telah digunakan',
+    'license_for'   => 'Lisensi untuk',
     'Low_Inventory_Report' => 'Laporan Inventaris Rendah',
     'a_user_canceled' => 'Pengguna telah membatalkan permintaan item di situs web',
     'a_user_requested' => 'Pengguna telah meminta item di situs web',
     'acceptance_asset_accepted' => 'Pengguna telah menerima',
     'acceptance_asset_declined' => 'Pengguna telah menolak',
-    'accessory_name' => 'Nama Aksesori:',
-    'additional_notes' => 'Catatan Tambahan:',
+    'accessory_name' => 'Nama Aksesori',
+    'additional_notes' => 'Catatan Tambahan',
     'admin_has_created' => 'Administrator telah membuat akun untuk Anda di: situs web web.',
-    'asset' => 'Aset:',
-    'asset_name' => 'Nama Aset:',
+    'asset' => 'Aset',
+    'asset_name' => 'Nama Aset',
     'asset_requested' => 'Permintaan aset',
     'asset_tag' => 'Tag Aset',
-    'assets_warrantee_alert' => 'There is :count asset with a warranty expiring in the next :threshold days.|There are :count assets with warranties expiring in the next :threshold days.',
+    'assets_warrantee_alert' => 'Ada :count aset dengan garansi yang akan berakhir dalam :threshold hari mendatang.|Ada :count aset dengan garansi yang akan berakhir dalam :threshold hari mendatang.',
     'assigned_to' => 'Ditugaskan untuk',
     'best_regards' => 'Salam Hormat,',
-    'canceled' => 'Dibatalkan:',
-    'checkin_date' => 'Tanggal Checkin:',
-    'checkout_date' => 'Tanggal keluar:',
-    'checkedout_from' => 'Checked out from',
-    'checkedin_from'  => 'Checked in from',
-    'checked_into' => 'Checked into',
+    'canceled' => 'Dibatalkan',
+    'checkin_date' => 'Tanggal Cek Masuk',
+    'checkout_date' => 'Tanggal Cek Keluar',
+    'checkedout_from' => 'Dikeluarkan dari',
+    'checkedin_from'  => 'Dikembalikan dari',
+    'checked_into' => 'Telah masuk ke',
     'click_on_the_link_accessory' => 'Silahkan klik pada link di bagian bawah untuk mengkonfirmasi bahwa Anda telah menerima aksesori.',
     'click_on_the_link_asset' => 'Silahkan klik pada link di bagian bawah untuk mengkonfirmasi bahwa Anda telah menerima aset tersebut.',
     'click_to_confirm' => 'Silahkan klik pada link berikut untuk mengkonfirmasi: akun web Anda:',
     'current_QTY' => 'QTY saat ini',
     'days' => 'Hari',
-    'expecting_checkin_date' => 'Tanggal Checkin yang Diharapkan:',
+    'expecting_checkin_date' => 'Tanggal pengembalian diharapkan diterima',
     'expires' => 'Kadaluarsa',
     'hello' => 'Halo',
     'hi' => 'Hai',
     'i_have_read' => 'Saya telah membaca dan menyetujui persyaratan penggunaan, dan telah menerima barang ini.',
     'inventory_report' => 'Laporan Inventori',
-    'item' => 'Barang:',
+    'item' => 'Item',
+    'item_checked_reminder' => 'Ini adalah pengingat bahwa Anda saat ini memiliki :count item yang dipinjamkan kepada Anda yang belum Anda terima atau tolak. Silakan klik tautan di bawah untuk mengonfirmasi keputusan Anda.',
     'license_expiring_alert' => 'Ada :count lisensi yang masa berlakunya akan habis dalam :threshold hari.|Ada :count lisensi yang masa berlakunya akan habis dalam :threshold hari.',
     'link_to_update_password' => 'Silahkan klik pada link berikut untuk mengupdate: password web anda:',
-    'login' => 'Login:',
+    'login' => 'Masuk',
     'login_first_admin' => 'Login ke instalasi Snipe-IT baru Anda dengan menggunakan kredensial di bawah ini:',
     'low_inventory_alert' => 'Ada :count item yang di bawah minimum persediaan atau akan segera habis.|Ada :count item yang di bawah minimum persediaan atau akan segera habis.',
     'min_QTY' => 'Min QTY',
     'name' => 'Nama',
     'new_item_checked' => 'Item baru telah diperiksa berdasarkan nama Anda, rinciannya ada di bawah.',
+    'new_item_checked_with_acceptance' => 'A new item has been checked out under your name that requires acceptance, details are below.',
+    'recent_item_checked' => 'An item was recently checked out under your name that requires acceptance, details are below.',
     'notes' => 'Catatan',
-    'password' => 'Password:',
+    'password' => 'Kata sandi',
     'password_reset' => 'Reset Password',
     'read_the_terms' => 'Silahkan baca syarat penggunaan di bawah ini.',
-    'read_the_terms_and_click' => 'Please read the terms of use below, and click on the link at the bottom to confirm that you read and agree to the terms of use, and have received the asset.',
-    'requested' => 'Diminta:',
+    'read_the_terms_and_click' => 'Harap baca ketentuan penggunaan di bawah ini, dan klik tautan di bagian bawah untuk mengonfirmasi bahwa Anda telah membaca dan menyetujui ketentuan penggunaan, serta telah menerima aset tersebut.',
+    'requested' => 'Diminta',
     'reset_link' => 'Tautan Reset Sandi Anda',
     'reset_password' => 'Klik di sini untuk mengatur ulang kata sandi Anda:',
     'rights_reserved' => 'Hak cipta di lindungi undang-undang.',
     'serial' => 'Serial',
-    'snipe_webhook_test' => 'Snipe-IT Integration Test',
-    'snipe_webhook_summary' => 'Snipe-IT Integration Test Summary',
+    'snipe_webhook_test' => 'Pengujian Integrasi Snipe-IT',
+    'snipe_webhook_summary' => 'Rangkuman Uji Integrasi Snipe-IT',
     'supplier' => 'Pemasok',
     'tag' => 'Menandai',
     'test_email' => 'Uji Email dari Snipe-IT',
@@ -86,8 +90,10 @@ return [
     'upcoming-audits' => 'Ada :count aset yang akan diaudit dalam :threshold hari.|Ada :count aset yang akan diaudit dalam :threshold hari.',
     'user' => 'Pengguna',
     'username' => 'Nama Pengguna',
+    'unaccepted_asset_reminder' => 'Reminder: You have Unaccepted Assets.',
     'welcome' => 'Selamat datang: nama',
     'welcome_to' => 'Selamat Datang di: web!',
     'your_assets' => 'Lihat Aset Anda',
     'your_credentials' => 'Kredensial Snipe-IT Anda',
+    'mail_sent' => 'Surel berhasil dikirim!',
 ];
diff --git a/resources/lang/id-ID/passwords.php b/resources/lang/id-ID/passwords.php
index d4b215efe9..fb97f3d4a0 100644
--- a/resources/lang/id-ID/passwords.php
+++ b/resources/lang/id-ID/passwords.php
@@ -3,7 +3,7 @@
 return [
     'sent'	        => 'Jika alamat email anda ada di sistem kami, email pemulihan kata sandi telah dikirim.',
     'user'			=> 'Jika alamat email anda ada di sistem kami, email pemulihan kata sandi telah dikirim.',
-    'token'         => 'This password reset token is invalid or expired, or does not match the username provided.',
-    'reset'         => 'Your password has been reset!',
-    'password_change'  => 'Your password has been updated!',
+    'token'         => 'Token reset kata sandi ini tidak valid atau telah kedaluwarsa, atau tidak cocok dengan nama pengguna yang diberikan.',
+    'reset'         => 'Kata sandi Anda telah direset!',
+    'password_change'  => 'Kata sandi Anda telah diperbarui!',
 ];
diff --git a/resources/lang/id-ID/reminders.php b/resources/lang/id-ID/reminders.php
index c97b39963d..91d131e66c 100644
--- a/resources/lang/id-ID/reminders.php
+++ b/resources/lang/id-ID/reminders.php
@@ -15,7 +15,7 @@ return array(
 
     "password" => "Kata sandi harus 6 karakter dan sama.",
     "user"     => "Nama pengguna atau alamat email salah",
-    "token"    => 'This password reset token is invalid or expired, or does not match the username provided.',
+    "token"    => 'Token reset kata sandi ini tidak valid atau telah kedaluwarsa, atau tidak cocok dengan nama pengguna yang diberikan.',
     'sent'	   => 'Jika alamat email anda ada di sistem kami, email pemulihan kata sandi telah dikirim.',
 
 );
diff --git a/resources/lang/id-ID/table.php b/resources/lang/id-ID/table.php
index c37a396506..4f9fa7dd39 100644
--- a/resources/lang/id-ID/table.php
+++ b/resources/lang/id-ID/table.php
@@ -6,6 +6,6 @@ return array(
     'action' 		        => 'Tindakan',
     'by'      		        => 'Oleh',
     'item' 			        => 'Item',
-    'no_matching_records'   => 'No matching records found',
+    'no_matching_records'   => 'Tidak ditemukan data yang cocok',
 
 );
diff --git a/resources/lang/id-ID/validation.php b/resources/lang/id-ID/validation.php
index 3d20f64887..9a4f52f5a5 100644
--- a/resources/lang/id-ID/validation.php
+++ b/resources/lang/id-ID/validation.php
@@ -13,100 +13,166 @@ return [
     |
     */
 
-    'accepted'             => ': Atribut harus diterima.',
-    'active_url'           => ': Atribut ini URL-nya tidak valid.',
-    'after'                => ': Atribut harus tanggal setelah: tanggal.',
-    'after_or_equal'       => 'The: atribut harus tanggal setelah atau sama dengan: tanggal.',
-    'alpha'                => ': Atribut hanya boleh berisi huruf.',
-    'alpha_dash'           => ': Atribut hanya boleh berisi angka, huruf dan garis.',
-    'alpha_num'            => ': Atribut hanya boleh berisi huruf dan angka.',
-    'array'                => 'The: atribut harus berupa array.',
-    'before'               => ': Atribut harus tanggal sebelum: tanggal.',
-    'before_or_equal'      => 'The: atribut harus tanggal sebelum atau sama dengan: tanggal.',
-    'between'              => [
-        'numeric' => ': Atribut harus di antara: min -: maks.',
-        'file'    => ': Atribut harus di antara: min -: maks kilobytes.',
-        'string'  => ': Atribut harus di antara: min -: maks jumlah karakter.',
-        'array'   => 'The: atribut harus antara: min dan: max item.',
+    'accepted' => 'Isian kolom :attribute harus diterima.',
+    'accepted_if' => 'Isian kolom :attribute harus diterima jika :other adalah :value.',
+    'active_url' => 'Isian kolom :attribute harus berupa URL yang valid.',
+    'after' => 'Isian kolom :attribute harus berupa tanggal setelah :date.',
+    'after_or_equal' => 'Isian kolom :attribute harus berupa tanggal setelah atau sama dengan :date.',
+    'alpha' => 'Isian kolom :attribute hanya boleh berisi huruf.',
+    'alpha_dash' => 'Isian kolom :attribute hanya boleh berisi huruf, angka, tanda hubung, dan garis bawah.',
+    'alpha_num' => 'Isian kolom :attribute hanya boleh berisi huruf dan angka.',
+    'array' => 'Kolom :attribute harus berupa array.',
+    'ascii' => 'Kolom :attribute hanya boleh berisi karakter alfanumerik dan simbol satu byte.',
+    'before' => 'Kolom :attribute harus berupa tanggal sebelum :date.',
+    'before_or_equal' => 'Kolom :attribute harus berupa tanggal sebelum atau sama dengan :date.',
+    'between' => [
+        'array' => 'Isian kolom :attribute harus memiliki antara :min dan :max item.',
+        'file' => 'Isian kolom :attribute harus antara :min dan :max kilobyte.',
+        'numeric' => 'Isian kolom :attribute harus antara :min dan :max.',
+        'string' => 'Panjang isian kolom :attribute harus antara :min dan :max karakter.',
     ],
-    'boolean'              => 'Bidang atribut: harus benar atau salah.',
-    'confirmed'            => 'Konfirmasi :attribute tidak cocok.',
-    'date'                 => 'Tanggal :attribute tidak valid.',
-    'date_format'          => ':attribute tidak cocok dengan format :format.',
-    'different'            => ':attribute dan :other harus berbeda.',
-    'digits'               => ':attribute harus dengan :digits digit.',
-    'digits_between'       => 'Digit :attribute harus di antara :min dan :max.',
-    'dimensions'           => 'Atribut: atribut memiliki dimensi gambar yang tidak benar.',
-    'distinct'             => 'Bidang atribut: memiliki nilai duplikat.',
-    'email'                => 'Format :attribute tidak benar.',
-    'exists'               => ':attribute yang di pilih tidak benar.',
-    'file'                 => 'The: atribut harus berupa file.',
-    'filled'               => 'Bidang atribut: harus memiliki nilai.',
-    'image'                => ':attribute harus dalam bentuk gambar.',
-    'import_field_empty'    => 'The value for :fieldname cannot be null.',
-    'in'                   => ':attribute yang di pilih tidak benar.',
-    'in_array'             => 'Bidang atribut: tidak ada di: other.',
-    'integer'              => ':attribute harus dalam bentuk integer.',
-    'ip'                   => ':attribute harus memilik alamat IP yang benar.',
-    'ipv4'                 => 'Atribut: harus alamat IPv4 yang valid.',
-    'ipv6'                 => 'Atribut: harus alamat IPv6 yang valid.',
-    'is_unique_department' => 'The :attribute must be unique to this Company Location',
-    'json'                 => 'Atribut: harus string JSON yang valid.',
-    'max'                  => [
-        'numeric' => ':attribute tidak boleh lebih dari :max.',
-        'file'    => ':attribute tidak boleh lebih dari :max kilobyte.',
-        'string'  => ':attribute tidak boleh lebih dari :max karakter.',
-        'array'   => 'Atribut: mungkin tidak lebih dari: item maks.',
+    'boolean' => 'Bidang atribut: harus benar atau salah.',
+    'can' => 'Kolom :attribute berisi nilai yang tidak sah.',
+    'confirmed' => 'Konfirmasi kolom :attribute tidak sesuai.',
+    'contains' => 'Kolom :attribute belum diisi.',
+    'current_password' => 'Kata sandi salah',
+    'date' => 'Kolom :attribute harus berupa tanggal yang valid.',
+    'date_equals' => 'Kolom :attribute harus berupa tanggal yang sama dengan :date.',
+    'date_format' => 'Kolom :attribute harus sesuai dengan format :format.',
+    'decimal' => 'Kolom :attribute harus memiliki :decimal angka di belakang koma.',
+    'declined' => 'Isian kolom :attribute harus ditolak.',
+    'declined_if' => 'Isian kolom :attribute harus ditolak jika :other adalah :value.',
+    'different' => 'Isian kolom :attribute dan :other harus berbeda.',
+    'digits' => 'Isian kolom :attribute harus terdiri dari :digits digit.',
+    'digits_between' => 'Isian kolom :attribute harus terdiri dari antara :min dan :max digit.',
+    'dimensions' => 'Dimensi gambar pada kolom :attribute tidak valid.',
+    'distinct' => 'Bidang atribut: memiliki nilai duplikat.',
+    'doesnt_end_with' => 'Isian kolom :attribute tidak boleh diakhiri dengan salah satu dari berikut ini: :value.',
+    'doesnt_start_with' => 'Isian kolom :attribute tidak boleh dimulai dengan salah satu dari berikut ini: :values.',
+    'email' => 'Isian kolom :attribute harus alamat email yang valid.',
+    'ends_with' => 'Isian kolom :attribute harus diakhiri dengan salah satu dari berikut: :values.',
+    'enum' => ':attribute yang di pilih tidak benar.',
+    'exists' => ':attribute yang di pilih tidak benar.',
+    'extensions' => 'Isian kolom :attribute harus memiliki salah satu ekstensi berikut: :values.',
+    'file' => 'Kolom :attribute harus berupa sebuah file.',
+    'filled' => 'Bidang atribut: harus memiliki nilai.',
+    'gt' => [
+        'array' => 'Isian kolom :attribute harus berjumlah lebih dari :value item.',
+        'file' => 'Ukuran isian kolom :attribute harus lebih besar dari :value kilobyte.',
+        'numeric' => 'Isian kolom :attribute harus lebih besar dari :value.',
+        'string' => 'Panjang isian kolom :attribute harus lebih dari :value karakter.',
     ],
-    'mimes'                => ':attribute harus memiliki tipe data :values.',
-    'mimetypes'            => 'The: atribut harus berupa file tipe:: values.',
-    'min'                  => [
-        'numeric' => ':attribute seharusnya :min.',
-        'file'    => ':attribute harus memiliki :min kilobyte.',
-        'string'  => ':attribute harus memiliki :min jumlah karakter.',
-        'array'   => 'Atribut: setidaknya harus memiliki: item min.',
+    'gte' => [
+        'array' => 'Isian kolom :attribute harus memiliki :value item atau lebih.',
+        'file' => 'Ukuran isian kolom :attribute harus lebih besar dari atau sama dengan :value kilobyte.',
+        'numeric' => 'Isian kolom :attribute harus lebih besar dari atau sama dengan :value.',
+        'string' => 'Panjang isian kolom :attribute harus minimal :value karakter.',
     ],
-    'starts_with'          => ':attribute harus dimulai dengan salah satu dari berikut ini: :values.',
-    'ends_with'            => 'The :attribute must end with one of the following: :values.',
+    'hex_color' => 'Isian kolom :attribute harus berupa kode warna heksadesimal yang valid.',
+    'image' => 'Isian kolom :attribute harus berupa gambar.',
+    'import_field_empty'    => 'Nilai untuk :fieldname tidak boleh kosong.',
+    'in' => ':attribute yang di pilih tidak benar.',
+    'in_array' => 'Isian kolom :attribute harus ada di :other.',
+    'integer' => 'Isian kolom :attribute harus berupa bilangan bulat.',
+    'ip' => 'Isian kolom :attribute harus berupa alamat IP yang valid.',
+    'ipv4' => 'Isian kolom :attribute harus berupa alamat IPv4 yang valid.',
+    'ipv6' => 'Isian kolom :attribute harus berupa alamat IPv6 yang valid.',
+    'json' => 'Isian kolom :attribute harus berupa string JSON yang valid.',
+    'list' => 'Isian kolom :attribute harus berupa daftar.',
+    'lowercase' => 'Isian kolom :attribute harus huruf kecil.',
+    'lt' => [
+        'array' => 'Isian kolom :attribute harus berjumlah kurang dari :value item.',
+        'file' => 'Isian kolom :attribute harus kurang dari :value kilobyte.',
+        'numeric' => 'Isian kolom :attribute harus kurang dari :value.',
+        'string' => 'Panjang isian kolom :attribute harus kurang dari :value karakter.',
+    ],
+    'lte' => [
+        'array' => 'Isian kolom :attribute tidak boleh lebih dari :value.',
+        'file' => 'Ukuran isian kolom :attribute harus kurang dari atau sama dengan :value kilobyte.',
+        'numeric' => 'Isian kolom :attribute harus kurang dari atau sama dengan :value.',
+        'string' => 'Panjang isian kolom :attribute harus kurang dari atau sama dengan :value karakter.',
+    ],
+    'mac_address' => 'Isian kolom :attribute harus berupa alamat MAC yang valid.',
+    'max' => [
+        'array' => 'Isian kolom :attribute tidak boleh lebih dari :max.',
+        'file' => 'Ukuran isian kolom :attribute tidak boleh lebih besar dari :max kilobyte.',
+        'numeric' => 'Panjang isian kolom :attribute tidak boleh lebih dari :max karakter.',
+        'string' => 'Panjang isian kolom :attribute tidak boleh lebih dari :max karakter.',
+    ],
+    'max_digits' => 'Isian kolom :attribute tidak boleh memiliki lebih dari :max digit.',
+    'mimes' => 'Isian kolom :attribute harus berupa file dengan tipe: :values.',
+    'mimetypes' => 'Isian kolom :attribute harus berupa file dengan tipe: :values.',
+    'min' => [
+        'array' => 'Isian kolom :attribute harus memiliki setidaknya :min item.',
+        'file' => 'Ukuran isian kolom :attribute harus setidaknya :min kilobyte.',
+        'numeric' => 'Isian kolom :attribute harus minimal :min.',
+        'string' => 'Panjang isian kolom :attribute harus minimal :min karakter.',
+    ],
+    'min_digits' => 'Isian kolom :attribute harus minimal :min digit.',
+    'missing' => 'Isian kolom :attribute harus kosong.',
+    'missing_if' => 'Isian kolom :attribute harus kosong ketika :other adalah :value.',
+    'missing_unless' => 'Isian kolom :attribute harus kosong kecuali :other adalah :value.',
+    'missing_with' => 'Isian kolom :attribute harus kosong ketika :values ada.',
+    'missing_with_all' => 'Isian kolom :attribute harus kosong ketika :values ada.',
+    'multiple_of' => 'Isian kolom :attribute harus kelipatan dari :value.',
+    'not_in' => ':attribute yang di pilih tidak benar.',
+    'not_regex' => 'Format isian kolom :attribute tidak valid.',
+    'numeric' => 'Isian kolom :attribute harus berupa angka.',
+    'password' => [
+        'letters' => 'Isian kolom :attribute harus berisi minimal satu huruf.',
+        'mixed' => 'Isian kolom :attribute harus berisi minimal satu huruf besar dan satu huruf kecil.',
+        'numbers' => 'Isian kolom :attribute harus berisi minimal satu angka.',
+        'symbols' => 'Isian kolom :attribute harus berisi minimal satu simbol.',
+        'uncompromised' => ' :attribute yang diberikan telah muncul dalam daftar kebocoran data. Silakan pilih :attribute yang berbeda',
+    ],
+    'percent'       => 'Nilai minimum depresiasi harus antara 0 dan 100 ketika tipe depresiasi adalah persentase.',
 
-    'not_in'               => ':attribute yang di pilih tidak benar.',
-    'numeric'              => ':attribute harus dalam angka.',
-    'present'              => 'Bidang atribut: harus ada.',
-    'valid_regex'          => 'Itu bukan regex yang valid. ',
-    'regex'                => 'Format :attribute tidak benar.',
-    'required'             => 'Kolom :attribute wajib di-isi.',
-    'required_if'          => 'Kolom :attribute wajib di-isi ketika :other nya :value.',
-    'required_unless'      => 'Bidang atribut: diperlukan kecuali: lainnya ada dalam: nilai.',
-    'required_with'        => 'Kolom :attribute wajib di-isi ketika terdapat :values.',
-    'required_with_all'    => 'Bidang atribut: diperlukan saat: nilai ada.',
-    'required_without'     => 'Kolom :attribute wajib di-isi ketika :values tidak ada.',
+    'present' => 'Bidang atribut: harus ada.',
+    'present_if' => 'Isian kolom :attribute harus ada ketika :other adalah :value.',
+    'present_unless' => 'Isian kolom :attribute harus ada kecuali :other adalah :value.',
+    'present_with' => 'Isian kolom :attribute harus ada ketika :values ada.',
+    'present_with_all' => 'Isian kolom :attribute harus ada ketika :values ada.',
+    'prohibited' => 'Isian kolom :attribute dilarang.',
+    'prohibited_if' => 'Isian kolom :attribute dilarang ketika :other adalah :value.',
+    'prohibited_unless' => 'Isian kolom :attribute dilarang kecuali :other ada di dalam :values.',
+    'prohibits' => 'Isian kolom :attribute melarang :other untuk ada.',
+    'regex' => 'Format isian kolom :attribute tidak valid.',
+    'required' => 'Kolom :attribute wajib di-isi.',
+    'required_array_keys' => 'Isian kolom :attribute harus berisi entri untuk: :values.',
+    'required_if' => 'Kolom :attribute wajib di-isi ketika :other nya :value.',
+    'required_if_accepted' => 'Isian kolom :attribute wajib diisi ketika :other diterima.',
+    'required_if_declined' => 'Isian kolom :attribute wajib diisi ketika :other ditolak.',
+    'required_unless' => 'Bidang atribut: diperlukan kecuali: lainnya ada dalam: nilai.',
+    'required_with' => 'Kolom :attribute wajib di-isi ketika terdapat :values.',
+    'required_with_all' => 'Isian kolom :attribute wajib diisi ketika :values ada.',
+    'required_without' => 'Kolom :attribute wajib di-isi ketika :values tidak ada.',
     'required_without_all' => 'Bidang atribut: diperlukan bila tidak ada: nilai yang ada.',
-    'same'                 => ':attribute dan :other harus cocok.',
-    'size'                 => [
-        'numeric' => 'Ukuran :attribute harus :size.',
-        'file'    => ':attribute harus memiliki :size kilobyte.',
-        'string'  => ':attribute harus memiliki :size karakter.',
-        'array'   => 'Atribut: harus berisi: item ukuran.',
+    'same' => 'Isian kolom :attribute harus cocok dengan :other.',
+    'size' => [
+        'array' => 'Isian kolom :attribute harus berisi :size item.',
+        'file' => 'Ukuran isian kolom :attribute harus :size kilobyte.',
+        'numeric' => 'Isian kolom :attribute harus :size.',
+        'string' => 'Panjang isian kolom :attribute harus :size karakter.',
     ],
+    'starts_with' => 'Isian kolom :attribute harus dimulai dengan salah satu dari berikut ini: :values.',
     'string'               => 'The: atribut harus berupa string.',
-    'timezone'             => 'Atribut: harus merupakan zona yang valid.',
-    'two_column_unique_undeleted' => 'The :attribute must be unique across :table1 and :table2. ',
-    'unique'               => ':attribute sudah digunakan.',
-    'uploaded'             => 'Atribut: gagal diupload.',
-    'url'                  => 'Format :attribute tidak benar.',
+    'two_column_unique_undeleted' => ':attribute harus unik di antara :table1 dan :table2.',
     'unique_undeleted'     => ':attribute harus unik.',
     'non_circular'         => ':attribute tidak boleh membuat referensi melingkar.',
-    'not_array'            => ':attribute cannot be an array.',
-    'disallow_same_pwd_as_user_fields' => 'Password cannot be the same as the username.',
-    'letters'              => 'Password must contain at least one letter.',
-    'numbers'              => 'Password must contain at least one number.',
-    'case_diff'            => 'Password must use mixed case.',
-    'symbols'              => 'Password must contain symbols.',
-    'gte'                  => [
-        'numeric'          => 'Value cannot be negative'
-    ],
-    'checkboxes'           => ':attribute contains invalid options.',
-    'radio_buttons'        => ':attribute is invalid.',
+    'not_array'            => ':attribute tidak boleh berupa array.',
+    'disallow_same_pwd_as_user_fields' => 'Kata sandi tidak boleh sama dengan nama pengguna.',
+    'letters'              => 'Kata sandi harus terdiri dari minimal satu huruf.',
+    'numbers'              => 'Kata sandi harus terdiri dari minimal satu angka.',
+    'case_diff'            => 'Kata sandi harus menggunakan kombinasi huruf besar dan kecil.',
+    'symbols'              => 'Kata sandi harus berisi simbol.',
+    'timezone' => 'Isian kolom :attribute harus berupa zona waktu yang valid.',
+    'unique' => ':attribute sudah digunakan.',
+    'uploaded' => 'Atribut: gagal diupload.',
+    'uppercase' => 'Isian kolom :attribute harus huruf besar.',
+    'url' => 'Isian kolom :attribute harus berupa URL yang valid.',
+    'ulid' => 'Isian kolom :attribute harus berupa ULID yang valid.',
+    'uuid' => 'Isian kolom :attribute harus berupa UUID yang valid.',
+    'fmcs_location' => 'Full multiple company support and location scoping is enabled in the Admin Settings, and the selected location and selected company are not compatible.',
 
 
     /*
@@ -120,26 +186,38 @@ return [
     |
     */
 
+    'email_array'      => 'Satu atau lebih alamat email tidak benar.',
+    'checkboxes'           => ':attribute berisi opsi yang tidak valid.',
+    'radio_buttons'        => ':attribute tidak valid.',
+    
     'custom' => [
         'alpha_space' => 'Bidang atribut: berisi karakter yang tidak diizinkan.',
-        'email_array'      => 'Satu atau lebih alamat email tidak valid.',
+
         'hashed_pass'      => 'Kata sandi Anda saat ini salah',
         'dumbpwd'          => 'Password itu terlalu umum',
         'statuslabel_type' => 'Anda harus memilih jenis label status yang valid',
+        'custom_field_not_found'          => 'Kolom ini tampaknya tidak ada, harap periksa kembali nama kolom kustom Anda.',
+        'custom_field_not_found_on_model' => 'Kolom ini tampaknya ada, tetapi tidak tersedia pada set kolom Model Aset ini.',
 
         // date_format validation with slightly less stupid messages. It duplicates a lot, but it gets the job done :(
-        // We use this because the default error message for date_format is reflects php Y-m-d, which non-PHP
-        // people won't know how to format. 
-        'purchase_date.date_format'     => 'The :attribute must be a valid date in YYYY-MM-DD format',
-        'last_audit_date.date_format'   =>  'The :attribute must be a valid date in YYYY-MM-DD hh:mm:ss format',
-        'expiration_date.date_format'   =>  'The :attribute must be a valid date in YYYY-MM-DD format',
-        'termination_date.date_format'  =>  'The :attribute must be a valid date in YYYY-MM-DD format',
-        'expected_checkin.date_format'  =>  'The :attribute must be a valid date in YYYY-MM-DD format',
-        'start_date.date_format'        =>  'The :attribute must be a valid date in YYYY-MM-DD format',
-        'end_date.date_format'          =>  'The :attribute must be a valid date in YYYY-MM-DD format',
+        // We use this because the default error message for date_format reflects php Y-m-d, which non-PHP
+        // people won't know how to format.
+        'purchase_date.date_format'     => ' :attribute harus berupa tanggal yang valid dalam format YYYY-MM-DD',
+        'last_audit_date.date_format'   =>  ':attribute harus berupa tanggal yang valid dalam format YYYY-MM-DD hh:mm:ss',
+        'expiration_date.date_format'   =>  ':attribute harus berupa tanggal yang valid dalam format YYYY-MM-DD',
+        'termination_date.date_format'  =>  ' :attribute harus berupa tanggal yang valid dalam format YYYY-MM-DD',
+        'expected_checkin.date_format'  =>  ':attribute harus berupa tanggal yang valid dalam format YYYY-MM-DD',
+        'start_date.date_format'        =>  ':attribute harus berupa tanggal yang valid dalam format YYYY-MM-DD',
+        'end_date.date_format'          =>  ':attribute harus berupa tanggal yang valid dalam format YYYY-MM-DD',
+        'invalid_value_in_field' => 'Nilai tidak valid disertakan dalam isian kolom ini',
 
-    ],
+        'ldap_username_field' => [
+            'not_in' =>         '<code>sAMAccountName</code> (kombinasi huruf besar dan kecil) kemungkinan tidak akan berfungsi. Anda sebaiknya menggunakan <code>samaccountname</code> (huruf kecil) sebagai gantinya.'
+        ],
+        'ldap_auth_filter_query' => ['not_in' => '<code>uid=samaccountname</code> mungkin bukan filter autentikasi yang valid. Anda mungkin menginginkan <code>uid=<code>'],
+        'ldap_filter' => ['regex' => 'Nilai ini sebaiknya tidak berada dalam tanda kurung.'],
 
+        ],
     /*
     |--------------------------------------------------------------------------
     | Custom Validation Attributes
@@ -155,8 +233,16 @@ return [
 
     /*
     |--------------------------------------------------------------------------
-    | Generic Validation Messages
+    | Generic Validation Messages - we use these in the jquery validation where we don't have
+    | access to the :attribute
     |--------------------------------------------------------------------------
     */
-    'invalid_value_in_field' => 'Invalid value included in this field',
+
+    'generic' => [
+        'invalid_value_in_field' => 'Nilai tidak valid disertakan dalam isian kolom ini',
+        'required' => 'Kolom ini wajib diisi',
+        'email' => 'Silakan masukkan alamat email yang valid',
+    ],
+
+
 ];
diff --git a/resources/lang/is-IS/account/general.php b/resources/lang/is-IS/account/general.php
index 1a9e2c03b8..7f9e2f848e 100644
--- a/resources/lang/is-IS/account/general.php
+++ b/resources/lang/is-IS/account/general.php
@@ -2,10 +2,16 @@
 
 return array(
     'personal_api_keys' => 'Personal API Keys',
+    'personal_access_token' => 'Personal Access Token',
+    'personal_api_keys_success' => 'Personal API Key :key created sucessfully',
+    'here_is_api_key' => 'Here is your new personal access token. This is the only time it will be shown so do not lose it! You may now use this token to make API requests.',
     'api_key_warning' => 'When generating an API token, be sure to copy it down immediately as they will not be visible to you again.',
     'api_base_url' => 'Your API base url is located at:',
     'api_base_url_endpoint' => '/&lt;endpoint&gt;',
     'api_token_expiration_time' => 'API tokens are set to expire in:',
     'api_reference' => 'Please check the <a href="https://snipe-it.readme.io/reference" target="_blank">API reference</a> to find specific API endpoints and additional API documentation.',
     'profile_updated' => 'Account successfully updated',
+    'no_tokens' => 'You have not created any personal access tokens.',
+    'enable_sounds' => 'Enable sound effects',
+    'enable_confetti' => 'Enable confetti effects',
 );
diff --git a/resources/lang/is-IS/admin/accessories/message.php b/resources/lang/is-IS/admin/accessories/message.php
index 0d29fab9b1..c97c909f4a 100644
--- a/resources/lang/is-IS/admin/accessories/message.php
+++ b/resources/lang/is-IS/admin/accessories/message.php
@@ -26,7 +26,11 @@ return array(
         'error'   		=> 'Aukabúnaður fór ekki í úttekt, vinsamlegast reyndu aftur!',
         'success' 		=> 'Aukabúnaður fór í úttekt.',
         'unavailable'   => 'Accessory is not available for checkout. Check quantity available',
-        'user_does_not_exist' => 'Notandinn er ónothæfur. Vinsamlegast reyndu aftur.'
+        'user_does_not_exist' => 'Notandinn er ónothæfur. Vinsamlegast reyndu aftur.',
+         'checkout_qty' => array(
+            'lte'  => 'There is currently only one available accessory of this type, and you are trying to check out :checkout_qty. Please adjust the checkout quantity or the total stock of this accessory and try again.|There are :number_currently_remaining total available accessories, and you are trying to check out :checkout_qty. Please adjust the checkout quantity or the total stock of this accessory and try again.',
+            ),
+           
     ),
 
     'checkin' => array(
diff --git a/resources/lang/is-IS/admin/accessories/table.php b/resources/lang/is-IS/admin/accessories/table.php
index 651fe6e95c..3b9dd6aa8e 100644
--- a/resources/lang/is-IS/admin/accessories/table.php
+++ b/resources/lang/is-IS/admin/accessories/table.php
@@ -6,6 +6,4 @@ return array(
     'id'      					=> 'Auðkenni',
     'require_acceptance'      	=> 'Samþykki',
     'title'      				=> 'Nafn aukabúnaðar',
-
-
 );
diff --git a/resources/lang/is-IS/admin/components/message.php b/resources/lang/is-IS/admin/components/message.php
index 5048622b70..5931e5219c 100644
--- a/resources/lang/is-IS/admin/components/message.php
+++ b/resources/lang/is-IS/admin/components/message.php
@@ -17,7 +17,8 @@ return array(
     'delete' => array(
         'confirm'   => 'Are you sure you wish to delete this component?',
         'error'   => 'There was an issue deleting the component. Please try again.',
-        'success' => 'The component was deleted successfully.'
+        'success' => 'The component was deleted successfully.',
+        'error_qty'   => 'Some components of this type are still checked out. Please check them in and try again.',
     ),
 
      'checkout' => array(
diff --git a/resources/lang/is-IS/admin/consumables/general.php b/resources/lang/is-IS/admin/consumables/general.php
index c9544dd8dd..51b77e9068 100644
--- a/resources/lang/is-IS/admin/consumables/general.php
+++ b/resources/lang/is-IS/admin/consumables/general.php
@@ -8,4 +8,5 @@ return array(
     'remaining' 			            => 'Eftir',
     'total' 			                => 'Samtals',
     'update'                            => 'Update Consumable',
+    'inventory_warning'                 => 'The inventory of this consumable is below the minimum amount of :min_count',
 );
diff --git a/resources/lang/is-IS/admin/consumables/message.php b/resources/lang/is-IS/admin/consumables/message.php
index ada4f4b348..1270cebac4 100644
--- a/resources/lang/is-IS/admin/consumables/message.php
+++ b/resources/lang/is-IS/admin/consumables/message.php
@@ -2,6 +2,7 @@
 
 return array(
 
+    'invalid_category_type' => 'The category must be a consumable category.',
     'does_not_exist' => 'Consumable does not exist.',
 
     'create' => array(
diff --git a/resources/lang/is-IS/admin/custom_fields/general.php b/resources/lang/is-IS/admin/custom_fields/general.php
index a5236b9b55..98d73edc48 100644
--- a/resources/lang/is-IS/admin/custom_fields/general.php
+++ b/resources/lang/is-IS/admin/custom_fields/general.php
@@ -35,7 +35,7 @@ return [
     'create_field_title' => 'Útbúa nýtt sérsniðinn reit',
     'value_encrypted'      	        => 'The value of this field is encrypted in the database. Only admin users will be able to view the decrypted value',
     'show_in_email'     => 'Include the value of this field in checkout emails sent to the user? Encrypted fields cannot be included in emails',
-    'show_in_email_short'     => 'Include in emails.',
+    'show_in_email_short' => 'Include in emails',
     'help_text' => 'Hjápartexti',
     'help_text_description' => 'This is optional text that will appear below the form elements while editing an asset to provide context on the field.',
     'about_custom_fields_title' => 'About Custom Fields',
@@ -57,5 +57,8 @@ return [
     'show_in_requestable_list_short' => 'Show in requestable assets list',
     'show_in_requestable_list' => 'Show value in requestable assets list. Encrypted fields will not be shown',
     'encrypted_options' => 'This field is encrypted, so some display options will not be available.',
+    'display_checkin' => 'Display in checkin forms',
+    'display_checkout' => 'Display in checkout forms',
+    'display_audit' => 'Display in audit forms',
 
 ];
diff --git a/resources/lang/is-IS/admin/custom_fields/message.php b/resources/lang/is-IS/admin/custom_fields/message.php
index 43ba821821..6442359b7f 100644
--- a/resources/lang/is-IS/admin/custom_fields/message.php
+++ b/resources/lang/is-IS/admin/custom_fields/message.php
@@ -5,6 +5,7 @@ return array(
     'field' => array(
         'invalid'   => 'That field does not exist.',
         'already_added'   => 'Field already added',
+        'none_selected'   => 'No field selected',
 
         'create' => array(
             'error'   => 'Field was not created, please try again.',
diff --git a/resources/lang/is-IS/admin/depreciations/general.php b/resources/lang/is-IS/admin/depreciations/general.php
index 33d2792aa6..224d8d6845 100644
--- a/resources/lang/is-IS/admin/depreciations/general.php
+++ b/resources/lang/is-IS/admin/depreciations/general.php
@@ -13,4 +13,8 @@ return [
     'no_depreciations_warning'               => '<strong>Warning: </strong>
                       You do not currently have any depreciations set up.
                       Please set up at least one depreciation to view the depreciation report.',
+    'depreciation_method'                   => 'Afskrifta skýrsla',
+    'linear_depreciation'                   => 'Linear (Default)',
+    'half_1'                                => 'Half-year convention, always applied',
+    'half_2'                                => 'Half-year convention, applied with condition',
 ];
diff --git a/resources/lang/is-IS/admin/hardware/form.php b/resources/lang/is-IS/admin/hardware/form.php
index bb1efa32e1..4e5c09647c 100644
--- a/resources/lang/is-IS/admin/hardware/form.php
+++ b/resources/lang/is-IS/admin/hardware/form.php
@@ -55,8 +55,11 @@ return [
     'asset_location_update_default' => 'Update only default location',
     'asset_location_update_actual' => 'Uppfæra aðeins núverandi staðsetningu',
     'asset_not_deployable' => 'That asset status is not deployable. This asset cannot be checked out.',
-    'asset_deployable' => 'That status is deployable. This asset can be checked out.',
+    'asset_not_deployable_checkin' => 'That asset status is not deployable. Using this status label will checkin the asset.',
+    'asset_deployable' => 'This asset can be checked out.',
     'processing_spinner' => 'Processing... (This might take a bit of time on large files)',
+    'processing' => 'Vinnsla... ',
     'optional_infos'  => 'Viðbótarupplýsingar',
-    'order_details'   => 'Innkaupaupplýsingar'
+    'order_details'   => 'Innkaupaupplýsingar',
+    'calc_eol'    => 'If nulling the EOL date, use automatic EOL calculation based on the purchase date and EOL rate.',
 ];
diff --git a/resources/lang/is-IS/admin/hardware/general.php b/resources/lang/is-IS/admin/hardware/general.php
index 9e0fec3ce2..ed1ba49d49 100644
--- a/resources/lang/is-IS/admin/hardware/general.php
+++ b/resources/lang/is-IS/admin/hardware/general.php
@@ -5,8 +5,8 @@ return [
     'about_assets_text'            => 'Eignir eru hlutir sem hægt er að rekja með raðnúmeri eða öðrum merkingum. Þær eru alla jafna verðmætir hlutir sem mikilvægt er að geta aðgreint og borið kennsl á.',
     'archived'  				=> 'Safnvistað',
     'asset'  					=> 'Eign',
-    'bulk_checkout'             => 'Ráðstafa eignum',
-    'bulk_checkin'              => 'Skrá inn eignir',
+    'bulk_checkout'             => 'Bulk Checkout',
+    'bulk_checkin'              => 'Bulk Checkin',
     'checkin'  					=> 'Skila eign',
     'checkout'  				=> 'Ráðstafa eign',
     'clone'  					=> 'Klóna eign',
@@ -27,8 +27,7 @@ return [
     'undeployable_tooltip'  	=> 'This asset has a status label that is undeployable and cannot be checked out at this time.',
     'view'  					=> 'Skoða eign',
     'csv_error' => 'Það er villa í CSV skránni þinni:',
-    'import_text' => '<p>Upload a CSV that contains asset history. The assets and users MUST already exist in the system, or they will be skipped. Matching assets for history import happens against the asset tag. We will try to find a matching user based on the user\'s name you provide, and the criteria you select below. If you do not select any criteria below, it will simply try to match on the username format you configured in the <code>Admin &gt; General Settings</code>.</p><p>Fields included in the CSV must match the headers: <strong>Asset Tag, Name, Checkout Date, Checkin Date</strong>. Any additional fields will be ignored. </p><p>Checkin Date: blank or future checkin dates will checkout items to associated user.  Excluding the Checkin Date column will create a checkin date with todays date.</p>
-    ',
+    'import_text' => '<p>Upload a CSV that contains asset history. The assets and users MUST already exist in the system, or they will be skipped. Matching assets for history import happens against the asset tag. We will try to find a matching user based on the user\'s name you provide, and the criteria you select below. If you do not select any criteria below, it will simply try to match on the username format you configured in the <code>Admin &gt; General Settings</code>.</p><p>Fields included in the CSV must match the headers: <strong>Asset Tag, Name, Checkout Date, Checkin Date</strong>. Any additional fields will be ignored. </p><p>Checkin Date: blank or future checkin dates will checkout items to associated user.  Excluding the Checkin Date column will create a checkin date with todays date.</p>    ',
     'csv_import_match_f-l' => 'Try to match users by <strong>firstname.lastname</strong> (<code>jane.smith</code>) format',
     'csv_import_match_initial_last' => 'Try to match users by <strong>first initial last name</strong> (<code>jsmith</code>) format',
     'csv_import_match_first' => 'Try to match users by <strong>first name</strong> (<code>jane</code>) format',
diff --git a/resources/lang/is-IS/admin/hardware/message.php b/resources/lang/is-IS/admin/hardware/message.php
index 4091f932e2..100699c440 100644
--- a/resources/lang/is-IS/admin/hardware/message.php
+++ b/resources/lang/is-IS/admin/hardware/message.php
@@ -2,19 +2,23 @@
 
 return [
 
-    'undeployable' 		=> '<strong>Varúð: </strong> Þessi eign hefur verið merkt sem ónothæf að svo stöddu.
-                        Ef ástand hennar hefur breyst skaltu uppfæra stöðu eignarinnar.',
-    'does_not_exist' 	=> 'Þessi eign finnst ekki.',
-    'does_not_exist_var'=> 'Asset with tag :asset_tag not found.',
-    'no_tag' 	        => 'No asset tag provided.',
+    'undeployable' 		 => '<strong>Warning: </strong> This asset has been marked as currently undeployable. If this status has changed, please update the asset status.',
+    'does_not_exist' 	 => 'Þessi eign finnst ekki.',
+    'does_not_exist_var' => 'Asset with tag :asset_tag not found.',
+    'no_tag' 	         => 'No asset tag provided.',
     'does_not_exist_or_not_requestable' => 'That asset does not exist or is not requestable.',
-    'assoc_users'	 	=> 'Þessari eign hefur þegar verið ráðstafað til notanda og er því ekki hægt að afskrá. Vinsamlegast skilaðu eigninni fyrst og reyndu síðan að afskrá hana. ',
+    'assoc_users'	 	 => 'Þessari eign hefur þegar verið ráðstafað til notanda og er því ekki hægt að afskrá. Vinsamlegast skilaðu eigninni fyrst og reyndu síðan að afskrá hana. ',
     'warning_audit_date_mismatch' 	=> 'This asset\'s next audit date (:next_audit_date) is before the last audit date (:last_audit_date). Please update the next audit date.',
+    'labels_generated'   => 'Labels were successfully generated.',
+    'error_generating_labels' => 'Error while generating labels.',
+    'no_assets_selected' => 'No assets selected.',
 
     'create' => [
         'error'   		=> 'Asset was not created, please try again. :(',
         'success' 		=> 'Það tókst að skrá þessa eign :)',
         'success_linked' => 'Asset with tag :tag was created successfully. <strong><a href=":link" style="color: white;">Click here to view</a></strong>.',
+        'multi_success_linked' => 'Asset with tag :links was created successfully.|:count assets were created succesfully. :links.',
+        'partial_failure' => 'An asset was unable to be created. Reason: :failures|:count assets were unable to be created. Reasons: :failures',
     ],
 
     'update' => [
@@ -52,20 +56,24 @@ return [
     ],
 
     'import' => [
+        'import_button'         => 'Process Import',
         'error'                 => 'Some items did not import correctly.',
         'errorDetail'           => 'The following Items were not imported because of errors.',
         'success'               => 'Your file has been imported',
         'file_delete_success'   => 'Your file has been been successfully deleted',
         'file_delete_error'      => 'The file was unable to be deleted',
         'file_missing' => 'The file selected is missing',
+        'file_already_deleted' => 'The file selected was already deleted',
         'header_row_has_malformed_characters' => 'One or more attributes in the header row contain malformed UTF-8 characters',
         'content_row_has_malformed_characters' => 'One or more attributes in the first row of content contain malformed UTF-8 characters',
+        'transliterate_failure' => 'Transliteration from :encoding to UTF-8 failed due to invalid characters in input'
     ],
 
 
     'delete' => [
         'confirm'   	=> 'Ertu viss um að þú viljir afskrá þessa eign?',
         'error'   		=> 'There was an issue deleting the asset. Please try again.',
+        'assigned_to_error' => '{1}Asset Tag: :asset_tag is currently checked out. Check in this device before deletion.|[2,*]Asset Tags: :asset_tag are currently checked out. Check in these devices before deletion.',
         'nothing_updated'   => 'No assets were selected, so nothing was deleted.',
         'success' 		=> 'The asset was deleted successfully.',
     ],
@@ -78,6 +86,11 @@ return [
         'no_assets_selected' => 'Þú verður að velja að lágmarki eina eign úr listanum',
     ],
 
+    'multi-checkout' => [
+        'error'   => 'Asset was not checked out, please try again|Assets were not checked out, please try again',
+        'success' => 'Asset checked out successfully.|Assets checked out successfully.',
+    ],
+
     'checkin' => [
         'error'   		=> 'Eigninni var ekki skilað, vinsamlegast reyndu aftur',
         'success' 		=> 'Eigninni var skilað.',
@@ -87,9 +100,10 @@ return [
     ],
 
     'requests' => [
-        'error'   		=> 'Asset was not requested, please try again',
-        'success' 		=> 'Asset requested successfully.',
-        'canceled'      => 'Beiðni um ráðstöfun var afturkölluð',
+        'error'   		=> 'Request was not successful, please try again.',
+        'success' 		=> 'Request successfully submitted.',
+        'canceled'      => 'Request successfully canceled.',
+        'cancel'        => 'Hætta við beiðni á hlut',
     ],
 
 ];
diff --git a/resources/lang/is-IS/admin/hardware/table.php b/resources/lang/is-IS/admin/hardware/table.php
index 71ca3d3eaa..2e82f825e4 100644
--- a/resources/lang/is-IS/admin/hardware/table.php
+++ b/resources/lang/is-IS/admin/hardware/table.php
@@ -25,7 +25,6 @@ return [
     'image'		    => 'Búnaðar mynd',
     'days_without_acceptance' => 'Days Without Acceptance',
     'monthly_depreciation' => 'Mánaðarlegar afskriftir',
-    'assigned_to'    => 'Skráð á',
     'requesting_user' => 'Requesting User',
     'requested_date' => 'Requested Date',
     'changed'       => 'Breytt',
diff --git a/resources/lang/is-IS/admin/kits/general.php b/resources/lang/is-IS/admin/kits/general.php
index f35dae6363..4f7b538863 100644
--- a/resources/lang/is-IS/admin/kits/general.php
+++ b/resources/lang/is-IS/admin/kits/general.php
@@ -47,4 +47,5 @@ return [
     'kit_deleted'                       => 'Útbúnaðarlistanum var eytt',
     'kit_model_updated'                 => 'Model was successfully updated',
     'kit_model_detached'                => 'Model was successfully detached',
+    'model_already_attached'            => 'Model already attached to kit',
 ];
diff --git a/resources/lang/is-IS/admin/licenses/general.php b/resources/lang/is-IS/admin/licenses/general.php
index 883fa14329..6fd5ea6c78 100644
--- a/resources/lang/is-IS/admin/licenses/general.php
+++ b/resources/lang/is-IS/admin/licenses/general.php
@@ -14,6 +14,7 @@ return array(
     'info'  					=> 'License Info',
     'license_seats'  			=> 'License Seats',
     'seat'  					=> 'Seat',
+    'seat_count'  				=> 'Seat :count',
     'seats'  					=> 'Seats',
     'software_licenses'  		=> 'Hugbúnaðarleyfi',
     'user'  					=> 'Notandi',
@@ -23,12 +24,12 @@ return array(
         [
             'checkin_all'           => [
                 'button'            => 'Checkin All Seats',
-                'modal'             => 'This will action checkin one seat. | This action will checkin all :checkedout_seats_count seats for this license.',
+                'modal'             => 'This action will checkin one seat. | This action will checkin all :checkedout_seats_count seats for this license.',
                 'enabled_tooltip'   => 'Checkin ALL seats for this license from both users and assets',
                 'disabled_tooltip'  => 'This is disabled because there are no seats currently checked out',
                 'disabled_tooltip_reassignable'  => 'This is disabled because the License is not reassignable',
                 'success'           => 'License successfully checked in! | All licenses were successfully checked in!',
-                'log_msg'           => 'Checked in via bulk license checkout in license GUI',
+                'log_msg'           => 'Checked in via bulk license checkin in license GUI',
             ],
 
             'checkout_all'              => [
diff --git a/resources/lang/is-IS/admin/licenses/message.php b/resources/lang/is-IS/admin/licenses/message.php
index 27fbfe38a9..74e1d7af5a 100644
--- a/resources/lang/is-IS/admin/licenses/message.php
+++ b/resources/lang/is-IS/admin/licenses/message.php
@@ -44,10 +44,13 @@ return array(
         'error'   => 'There was an issue checking out the license. Please try again.',
         'success' => 'The license was checked out successfully',
         'not_enough_seats' => 'Not enough license seats available for checkout',
+        'mismatch' => 'The license seat provided does not match the license',
+        'unavailable' => 'This seat is not available for checkout.',
     ),
 
     'checkin' => array(
         'error'   => 'There was an issue checking in the license. Please try again.',
+        'not_reassignable' => 'License not reassignable',
         'success' => 'The license was checked in successfully'
     ),
 
diff --git a/resources/lang/is-IS/admin/locations/message.php b/resources/lang/is-IS/admin/locations/message.php
index 20c375904a..e1dc71b6e6 100644
--- a/resources/lang/is-IS/admin/locations/message.php
+++ b/resources/lang/is-IS/admin/locations/message.php
@@ -3,11 +3,12 @@
 return array(
 
     'does_not_exist' => 'Staðsetningin er ekki til.',
-    'assoc_users'    => 'This location is not currently deletable because it is the location of record for at least one asset or user, has assets assigned to it, or is the parent location of another location. Please update your models to no longer reference this company and try again. ',
+    'assoc_users'    => 'This location is not currently deletable because it is the location of record for at least one asset or user, has assets assigned to it, or is the parent location of another location. Please update your records to no longer reference this location and try again ',
     'assoc_assets'	 => 'This location is currently associated with at least one asset and cannot be deleted. Please update your assets to no longer reference this location and try again. ',
     'assoc_child_loc'	 => 'This location is currently the parent of at least one child location and cannot be deleted. Please update your locations to no longer reference this location and try again. ',
     'assigned_assets' => 'Skráðar eignir',
     'current_location' => 'Núverandi staðsetning',
+    'open_map' => 'Open in :map_provider_icon Maps',
 
 
     'create' => array(
@@ -20,6 +21,11 @@ return array(
         'success' => 'Stofnun staðsetningar gekk.'
     ),
 
+    'restore' => array(
+        'error'   => 'Location was not restored, please try again',
+        'success' => 'Location restored successfully.'
+    ),
+
     'delete' => array(
         'confirm'   	=> 'Ertu viss um að þú vilkjir eyða þessari staðsetningu?',
         'error'   => 'Það er vandamál við að eyða þessari staðsetningu. Vinsamlega reyndu aftur.',
diff --git a/resources/lang/is-IS/admin/locations/table.php b/resources/lang/is-IS/admin/locations/table.php
index 68a16d7e05..6161815fde 100644
--- a/resources/lang/is-IS/admin/locations/table.php
+++ b/resources/lang/is-IS/admin/locations/table.php
@@ -39,4 +39,5 @@ return [
     'signed_by_finance_auditor' => 'Undirritað af (fulltrúa fjármáladeildar):',
     'signed_by_location_manager' => 'Undirritað af (fulltrúa forstöðumanns):',
     'signed_by'                 => 'Undirritað af By:',
+    'clone'  					=> 'Clone Location',
 ];
diff --git a/resources/lang/is-IS/admin/models/general.php b/resources/lang/is-IS/admin/models/general.php
index 53b3e72569..0c20fca156 100644
--- a/resources/lang/is-IS/admin/models/general.php
+++ b/resources/lang/is-IS/admin/models/general.php
@@ -3,7 +3,7 @@
 return array(
     'about_models_title'     => 'Um Eignategundir',
     'about_models_text'           => 'Eignategundir eru leið til að flokka eins eignir. "MBP 2013", "IPhone 6s" osfrv.',
-    'deleted'  					        => 'Þessari tegund hefur verið eytt.',
+    'deleted'  					=> 'Þessari tegund hefur verið eytt.',
     'bulk_delete'               => 'Fjöldaeyða eignategundum',
     'bulk_delete_help'               => 'Notaðu boxin hér að neðan til að staðfesta eyðingu á völdum eignategundum. Eignategundir sem hafa eignir tengdar við sig er ekki hægt að eyða fyrr en eignirnar eru tengdar öðru tegund.',
     'bulk_delete_warn'          => 'Þú ert að fara að eyða einni eignategund.|Þú ert að fara að eyða :model_count eignategund.',
diff --git a/resources/lang/is-IS/admin/models/message.php b/resources/lang/is-IS/admin/models/message.php
index 351ed87979..6c14979b65 100644
--- a/resources/lang/is-IS/admin/models/message.php
+++ b/resources/lang/is-IS/admin/models/message.php
@@ -7,7 +7,7 @@ return array(
     'no_association' => 'VIÐVÖRUN! Eignategund fyrir þennan hlut er ógilt eða vantar!',
     'no_association_fix' => 'Þetta mun brjóta hlutina á undarlegan og hræðilegan hátt. Breyttu þessari eign núna til að úthluta henni fyrirmynd.',
     'assoc_users'	 => 'Þessi tegund er sem stendur tengt einni eða fleiri eignum og ekki er hægt að eyða því. Vinsamlegast eyddu eignunum og reyndu síðan að eyða aftur. ',
-
+    'invalid_category_type' => 'This category must be an asset category.',
 
     'create' => array(
         'error'   => 'Tegundin var ekki búið til, vinsamlegast reyndu aftur.',
diff --git a/resources/lang/is-IS/admin/reports/general.php b/resources/lang/is-IS/admin/reports/general.php
index 73f8d3e48e..a514c09017 100644
--- a/resources/lang/is-IS/admin/reports/general.php
+++ b/resources/lang/is-IS/admin/reports/general.php
@@ -4,6 +4,7 @@ return [
     'info'   => 'Select the options you want for your asset report.',
     'deleted_user' => 'Deleted user',
     'send_reminder' => 'Senda áminningu',
+    'cannot_send_reminder' => 'User has been deleted or does not have an email address so cannot receive a reminder',
     'reminder_sent' => 'Áminning send',
     'acceptance_deleted' => 'Acceptance request deleted',
     'acceptance_request' => 'Acceptance request',
@@ -13,5 +14,10 @@ return [
         'user_state' => 'User State',
         'user_country' => 'User Country',
         'user_zip' => 'User Zip'
-    ]
-];
\ No newline at end of file
+    ],
+    'open_saved_template' => 'Open Saved Template',
+    'save_template' =>  'Save Template',
+    'select_a_template' => 'Select a Template',
+    'template_name' => 'Template Name',
+    'update_template' => 'Update Template',
+];
diff --git a/resources/lang/is-IS/admin/reports/message.php b/resources/lang/is-IS/admin/reports/message.php
index f7516c5038..2800bbdf0b 100644
--- a/resources/lang/is-IS/admin/reports/message.php
+++ b/resources/lang/is-IS/admin/reports/message.php
@@ -1,5 +1,16 @@
 <?php
 
-return array(
-    'error'   => 'Þú verður að velja að minnsta kosti EINN valkost.'
-);
+return [
+    'about_templates' => 'About Saved Templates',
+    'saving_templates_description' => 'Select your options, then enter the name of your template in the box above and click the \'Save Template\' button. Use the dropdown to select a previously saved template.',
+    'create'  => [
+        'success' => 'Template saved successfully',
+    ],
+    'update' => [
+        'success' => 'Template updated successfully',
+    ],
+    'delete' => [
+        'success' => 'Template deleted',
+        'no_delete_permission' => 'Template does not exist or you do not have permission to delete it.',
+    ],
+];
diff --git a/resources/lang/is-IS/admin/settings/general.php b/resources/lang/is-IS/admin/settings/general.php
index 7270151d76..b87fe971a9 100644
--- a/resources/lang/is-IS/admin/settings/general.php
+++ b/resources/lang/is-IS/admin/settings/general.php
@@ -8,13 +8,13 @@ return [
     'ad_append_domain'          => 'Append domain name to username field',
     'ad_append_domain_help'     => 'User isn\'t required to write "username@domain.local", they can just type "username".',
     'admin_cc_email'            => 'Senda afrit á',
-    'admin_cc_email_help'       => 'If you would like to send a copy of checkin/checkout emails that are sent to users to an additional email account, enter it here. Otherwise leave this field blank.',
+    'admin_cc_email_help'       => 'Send a copy of checkin/checkout emails to this address.',
     'admin_settings'            => 'Admin Settings',
     'is_ad'				        => 'Þetta er Active Directory þjónn',
     'alerts'                	=> 'Alerts',
     'alert_title'               => 'Update Notification Settings',
     'alert_email'				=> 'Senda viðvaranir á',
-    'alert_email_help'    => 'Email addresses or distribution lists you want alerts to be sent to, comma separated',
+    'alert_email_help'          => 'Email addresses or distribution lists you want alerts to be sent to, comma separated.',
     'alerts_enabled'			=> 'Email Alerts Enabled',
     'alert_interval'			=> 'Expiring Alerts Threshold (in days)',
     'alert_inv_threshold'		=> 'Inventory Alert Threshold',
@@ -31,15 +31,18 @@ return [
     'backups'					=> 'Öryggisafrit',
     'backups_help'              => 'Create, download, and restore backups ',
     'backups_restoring'         => 'Restoring from Backup',
+    'backups_clean' => 'Clean the backed-up database before restore',
+    'backups_clean_helptext' => "This can be useful if you're changing between database versions",
     'backups_upload'            => 'Upload Backup',
     'backups_path'              => 'Backups on the server are stored in <code>:path</code>',
-    'backups_restore_warning'   => 'Use the restore button <small><span class="btn btn-xs btn-warning"><i class="text-white fas fa-retweet" aria-hidden="true"></i></span></small> to restore from a previous backup. (This does not currently work with S3 file storage or Docker.)<br><br>Your <strong>entire :app_name database and any uploaded files will be completely replaced</strong> by what\'s in the backup file.  ',
+    'backups_restore_warning'   => 'Use the restore button <small><span class="btn btn-xs btn-warning"><i class="text-white fas fa-retweet" aria-hidden="true"></i></span></small> to restore from a previous backup. (This does not currently work with S3 file storage or Docker.)<br><br>Your <strong>entire :app_name database and any uploaded files will be completely replaced</strong> by what\'s in the backup file  ',
     'backups_logged_out'         => 'All existing users, including you, will be logged out once your restore is complete.',
     'backups_large'             => 'Very large backups may time out on the restore attempt and may still need to be run via command line. ',
     'barcode_settings'			=> 'Strikamerkja stillingar',
     'confirm_purge'			    => 'Confirm Purge',
     'confirm_purge_help'		=> 'Enter the text "DELETE" in the box below to purge your deleted records. This action cannot be undone and will PERMANENTLY delete all soft-deleted items and users. (You should make a backup first, just to be safe.)',
     'custom_css'				=> 'Custom CSS',
+    'custom_css_placeholder'	=> 'Add your custom CSS',
     'custom_css_help'			=> 'Enter any custom CSS overrides you would like to use. Do not include the &lt;style&gt;&lt;/style&gt; tags.',
     'custom_forgot_pass_url'	=> 'Custom Password Reset URL',
     'custom_forgot_pass_url_help'	=> 'This replaces the built-in forgotten password URL on the login screen, useful to direct people to internal or hosted LDAP password reset functionality. It will effectively disable local user forgotten password functionality.',
@@ -47,34 +50,34 @@ return [
     'dashboard_message_help'	=> 'Þessi texti mun birtast á stjórnborðinu hjá hverjum þeim sem hefur heimildir til að sjá stjórnborðið.',
     'default_currency'  		=> 'Sjálfgefin mynt',
     'default_eula_text'			=> 'Sjálfgefinn samningur um noandaleyfi',
+    'default_eula_text_placeholder' => 'Add your default EULA text',
     'default_language'			=> 'Sjálfgefið tungumál',
     'default_eula_help_text'	=> 'You can also associate custom EULAs to specific asset categories.',
     'acceptance_note'           => 'Add a note for your decision (Optional)',
     'display_asset_name'        => 'Display Asset Name',
     'display_checkout_date'     => 'Sýna ráðstöfunardagsetningu',
     'display_eol'               => 'Display EOL in table view',
-    'display_qr'                => 'Display Square Codes',
+    'display_qr'                => 'Display 2D barcode',
     'display_alt_barcode'		=> 'Display 1D barcode',
-    'email_logo'                => 'Email Logo',
     'barcode_type'				=> '2D Barcode Type',
     'alt_barcode_type'			=> '1D barcode type',
-    'email_logo_size'       => 'Square logos in email look best. ',
     'enabled'                   => 'Enabled',
     'eula_settings'				=> 'EULA Settings',
     'eula_markdown'				=> 'This EULA allows <a href="https://help.github.com/articles/github-flavored-markdown/">Github flavored markdown</a>.',
+    'empty_row_count'           => 'Field Start Offset (Empty Rows)',
+    'empty_row_count_help'      => 'Fields will begin populating after this many empty rows are skipped at the top of the label.',
     'favicon'                   => 'Favicon',
     'favicon_format'            => 'Accepted filetypes are ico, png, and gif. Other image formats may not work in all browsers.',
     'favicon_size'          => 'Favicons should be square images, 16x16 pixels.',
     'footer_text'               => 'Additional Footer Text ',
     'footer_text_help'          => 'This text will appear in the right-side footer. Links are allowed using <a href="https://help.github.com/articles/github-flavored-markdown/">Github flavored markdown</a>. Line breaks, headers, images, etc may result in unpredictable results.',
+    'footer_text_placeholder'   => 'Optional footer text',
     'general_settings'			=> 'General Settings',
-    'general_settings_keywords' => 'company support, signature, acceptance, email format, username format, images, per page, thumbnail, eula, gravatar, tos, dashboard, privacy',
     'general_settings_help'     => 'Default EULA and more',
     'generate_backup'			=> 'Búa til öryggisafrit',
     'google_workspaces'         => 'Google Workspaces',
     'header_color'              => 'Header Color',
     'info'                      => 'These settings let you customize certain aspects of your installation.',
-    'label_logo'                => 'Label Logo',
     'label_logo_size'           => 'Square logos look best - will be displayed in the top right of each asset label. ',
     'laravel'                   => 'Laravel Version',
     'ldap'                      => 'LDAP',
@@ -94,7 +97,7 @@ return [
     'ldap_login_sync_help'      => 'This only tests that LDAP can sync correctly. If your LDAP Authentication query is not correct, users may still not be able to login. YOU MUST SAVE YOUR UPDATED LDAP SETTINGS FIRST.',
     'ldap_manager'              => 'LDAP Manager',
     'ldap_server'               => 'LDAP Server',
-    'ldap_server_help'          => 'This should start with ldap:// (for unencrypted or TLS) or ldaps:// (for SSL)',
+    'ldap_server_help'          => 'This should start with ldap:// (for unencrypted) or ldaps:// (for TLS or SSL)',
     'ldap_server_cert'			=> 'LDAP SSL certificate validation',
     'ldap_server_cert_ignore'	=> 'Leyfa ógild SSL skírteini',
     'ldap_server_cert_help'		=> 'Select this checkbox if you are using a self signed SSL cert and would like to accept an invalid SSL certificate.',
@@ -108,8 +111,8 @@ return [
     'ldap_pword'                => 'LDAP Bind Password',
     'ldap_basedn'               => 'Base Bind DN',
     'ldap_filter'               => 'LDAP Filter',
-    'ldap_pw_sync'              => 'LDAP Password Sync',
-    'ldap_pw_sync_help'         => 'Uncheck this box if you do not wish to keep LDAP passwords synced with local passwords. Disabling this means that your users may not be able to login if your LDAP server is unreachable for some reason.',
+    'ldap_pw_sync'              => 'Cache LDAP Passwords',
+    'ldap_pw_sync_help'         => 'Uncheck this box if you do not wish to keep LDAP passwords cached as local hashed passwords. Disabling this means that your users may not be able to login if your LDAP server is unreachable for some reason.',
     'ldap_username_field'       => 'Username Field',
     'ldap_lname_field'          => 'Eftirnafn',
     'ldap_fname_field'          => 'LDAP First Name',
@@ -117,13 +120,15 @@ return [
     'ldap_version'              => 'LDAP Version',
     'ldap_active_flag'          => 'LDAP Active Flag',
     'ldap_activated_flag_help'  => 'This value is used to determine whether a synced user can login to Snipe-IT. <strong>It does not affect the ability to check items in or out to them</strong>, and should be the <strong>attribute name</strong> within your AD/LDAP, <strong>not the value</strong>. <br><br>If this field is set to a field name that does not exist in your AD/LDAP, or the value in the AD/LDAP field is set to <code>0</code> or <code>false</code>, <strong>user login will be disabled</strong>. If the value in the AD/LDAP field is set to <code>1</code> or <code>true</code> or <em>any other text</em> means the user can log in. When the field is blank in your AD, we respect the <code>userAccountControl</code> attribute, which usually allows non-suspended users to log in.',
+    'ldap_invert_active_flag'   => 'LDAP Invert Active Flag',
+    'ldap_invert_active_flag_help'     => 'If enabled: when the value returned by LDAP Active Flag is <code>0</code> or <code>false</code> the user account will be active.',
     'ldap_emp_num'              => 'LDAP Employee Number',
     'ldap_email'                => 'LDAP Email',
     'ldap_test'                 => 'Test LDAP',
     'ldap_test_sync'            => 'Test LDAP Synchronization',
     'license'                   => 'Software License',
-    'load_remote'               => 'Use Gravatar',
-    'load_remote_help_text'		=> 'Uncheck this box if your install cannot load scripts from the outside internet. This will prevent Snipe-IT from trying load images from Gravatar.',
+    'load_remote'               => 'Load Remote Avatars',
+    'load_remote_help_text'		=> 'Uncheck this box if your install cannot load scripts from the outside internet. This will prevent Snipe-IT from trying load avatars from Gravatar or other outside sources.',
     'login'                     => 'Login Attempts',
     'login_attempt'             => 'Login Attempt',
     'login_ip'                  => 'IP Address',
@@ -131,6 +136,7 @@ return [
     'login_user_agent'          => 'User Agent',
     'login_help'                => 'List of attempted logins',
     'login_note'                => 'Login Note',
+    'login_note_placeholder'            => "If you do not have a login or have found a device belonging to this company, please call technical support at 888-555-1212. Thank you.",
     'login_note_help'           => 'Optionally include a few sentences on your login screen, for example to assist people who have found a lost or stolen device. This field accepts <a href="https://help.github.com/articles/github-flavored-markdown/">Github flavored markdown</a>',
     'login_remote_user_text'    => 'Remote User login options',
     'login_remote_user_enabled_text' => 'Enable Login with Remote User Header',
@@ -146,13 +152,16 @@ return [
     'logo_print_assets_help'    => 'Use branding on printable asset lists ',
     'full_multiple_companies_support_help_text' => 'Restricting users (including admins) assigned to companies to their company\'s assets.',
     'full_multiple_companies_support_text' => 'Full Multiple Companies Support',
+    'scope_locations_fmcs_support_text'  => 'Scope Locations with Full Multiple Companies Support',
+    'scope_locations_fmcs_support_help_text'  => 'Restrict locations to their selected company.',
+    'scope_locations_fmcs_check_button' => 'Check Compatibility',
+    'scope_locations_fmcs_support_disabled_text'  => 'This option is disabled because you have conflicting locations set for :count or more items.',
     'show_in_model_list'   => 'Show in Model Dropdowns',
     'optional'					=> 'optional',
     'per_page'                  => 'Niðurstöður á síðu',
     'php'                       => 'PHP útgáfa',
-    'php_info'                  => 'PHP Info',
+    'php_info'                  => 'PHP info',
     'php_overview'              => 'PHP',
-    'php_overview_keywords'     => 'phpinfo, system, info',
     'php_overview_help'         => 'PHP System info',
     'php_gd_info'               => 'You must install php-gd to display QR codes, see install instructions.',
     'php_gd_warning'            => 'PHP Image Processing and GD plugin is NOT installed.',
@@ -218,6 +227,8 @@ return [
     'webhook_integration_help'    => ':app integration is optional, however the endpoint and channel are required if you wish to use it. To configure :app integration, you must first <a href=":webhook_link" target="_new" rel="noopener">create an incoming webhook</a> on your :app account. Click on the <strong>Test :app Integration</strong> button to confirm your settings are correct before saving. ',
     'webhook_integration_help_button'    => 'Once you have saved your :app information, a test button will appear.',
     'webhook_test_help'           => 'Test whether your :app integration is configured correctly. YOU MUST SAVE YOUR UPDATED :app SETTINGS FIRST.',
+    'shortcuts_enabled'         => 'Enable Shortcuts',
+    'shortcuts_help_text'       => '<strong>Windows</strong>: Alt + Access key, <strong>Mac</strong>: Control + Option + Access key',
     'snipe_version'  			=> 'Snipe-IT version',
     'support_footer'            => 'Support Footer Links ',
     'support_footer_help'       => 'Specify who sees the links to the Snipe-IT Support info and Users Manual',
@@ -227,7 +238,6 @@ return [
     'update'                    => 'Update Settings',
     'value'                     => 'Núvirði',
     'brand'                     => 'Branding',
-    'brand_keywords'            => 'footer, logo, print, theme, skin, header, colors, color, css',
     'brand_help'                => 'Logo, Site Name',
     'web_brand'                 => 'Web Branding Type',
     'about_settings_title'      => 'About Settings',
@@ -276,6 +286,8 @@ return [
     'two_factor_enrollment_text'	=> "Two factor authentication is required, however your device has not been enrolled yet. Open your Google Authenticator app and scan the QR code below to enroll your device. Once you've enrolled your device, enter the code below",
     'require_accept_signature'      => 'Krefjast undirskriftar',
     'require_accept_signature_help_text'      => 'Enabling this feature will require users to physically sign off on accepting an asset.',
+    'require_checkinout_notes'  => 'Require Notes on Checkin/Checkout',
+    'require_checkinout_notes_help_text'    => 'Enabling this feature will require the note fields to be populated when checking in or checking out an asset.',
     'left'        => 'vinstri',
     'right'        => 'hægri',
     'top'        => 'top',
@@ -313,24 +325,24 @@ return [
     'filter_by_keyword' => 'Filter by setting keyword',
     'security' => 'Security',
     'security_title' => 'Update Security Settings',
-    'security_keywords' => 'password, passwords, requirements, two factor, two-factor, common passwords, remote login, logout, authentication',
     'security_help' => 'Two-factor, Password Restrictions',
-    'groups_keywords' => 'permissions, permission groups, authorization',
     'groups_help' => 'Account permission groups',
     'localization' => 'Localization',
     'localization_title' => 'Update Localization Settings',
-    'localization_keywords' => 'localization, currency, local, locale, time zone, timezone, international, internatinalization, language, languages, translation',
     'localization_help' => 'Language, date display',
     'notifications' => 'Notifications',
     'notifications_help' => 'Email Alerts & Audit Settings',
     'asset_tags_help' => 'Incrementing and prefixes',
     'labels' => 'Labels',
     'labels_title' => 'Update Label Settings',
-    'labels_help' => 'Label sizes &amp; settings',
-    'purge_keywords' => 'permanently delete',
+    'labels_help' => 'Barcodes &amp; label settings',
     'purge_help' => 'Purge Deleted Records',
     'ldap_extension_warning' => 'It does not look like the LDAP extension is installed or enabled on this server. You can still save your settings, but you will need to enable the LDAP extension for PHP before LDAP syncing or login will work.',
     'ldap_ad' => 'LDAP/AD',
+    'ldap_test_label' => 'Test LDAP Sync',
+    'ldap_test_login' => ' Test LDAP Login',
+    'ldap_username_placeholder' => 'LDAP Username',
+    'ldap_password_placeholder' => 'LDAP Password',
     'employee_number' => 'Starfsmanna númer',
     'create_admin_user' => 'Create a User ::',
     'create_admin_success' => 'Success! Your admin user has been added!',
@@ -342,6 +354,8 @@ return [
     'setup_migration_create_user' => 'Next: Create User',
     'ldap_settings_link' => 'LDAP Settings Page',
     'slack_test' => 'Test <i class="fab fa-slack"></i> Integration',
+    'status_label_name' => 'Status Label Name',
+    'super_admin_only'  => 'Super Admin Only',
     'label2_enable'           => 'New Label Engine',
     'label2_enable_help'      => 'Switch to the new label engine. <b>Note: You will need to save this setting before setting others.</b>',
     'label2_template'         => 'Template',
@@ -356,12 +370,15 @@ return [
     'label2_2d_type'          => '2D Barcode Type',
     'label2_2d_type_help'     => 'Format for 2D barcodes',
     'label2_2d_target'        => '2D Barcode Target',
-    'label2_2d_target_help'   => 'The URL the 2D barcode points to when scanned',
+    'label2_2d_target_help'   => 'The data that will be contained in the 2D barcode',
     'label2_fields'           => 'Field Definitions',
     'label2_fields_help'      => 'Fields can be added, removed, and reordered in the left column. For each field, multiple options for Label and DataSource can be added, removed, and reordered in the right column.',
+    'purge_barcodes' => 'Purge Barcodes',
     'help_asterisk_bold'    => 'Text entered as <code>**text**</code> will be displayed as bold',
     'help_blank_to_use'     => 'Leave blank to use the value from <code>:setting_name</code>',
     'help_default_will_use' => '<code>:default</code> will use the value from <code>:setting_name</code>. <br>Note that the value of the barcodes must comply with the respective barcode spec in order to be successfully generated. Please see <a href="https://snipe-it.readme.io/docs/barcodes">the documentation <i class="fa fa-external-link"></i></a> for more details. ',
+    'asset_id'              => 'Asset ID',
+    'data'               => 'Data',
     'default'               => 'Default',
     'none'                  => 'None',
     'google_callback_help' => 'This should be entered as the callback URL in your Google OAuth app settings in your organization&apos;s <strong><a href="https://console.cloud.google.com/" target="_blank">Google developer console <i class="fa fa-external-link" aria-hidden="true"></i></a></strong>.',
@@ -373,7 +390,100 @@ return [
     'database_driver' => 'Database Driver',
     'bs_table_storage' => 'Table Storage',
     'timezone' => 'Timezone',
+    'test_mail' => 'Test Mail',
     'profile_edit'          => 'Edit Profile',
     'profile_edit_help'          => 'Allow users to edit their own profiles.',
+    'default_avatar' => 'Custom Default Avatar',
+    'default_avatar_help' => 'This image will be displayed as a profile if a user does not have a profile photo.',
+    'restore_default_avatar' => 'Restore <a href=":default_avatar" data-toggle="lightbox" data-type="image">original system default avatar</a>',
+    'restore_default_avatar_help' => '',
+    'due_checkin_days' => 'Due For Checkin Warning',
+    'due_checkin_days_help' => 'How many days before the expected checkin of an asset should it be listed in the "Due for checkin" page?',
+    'no_groups' => 'No groups have been created yet. Visit <code>Admin Settings > Permission Groups</code> to add one.',
+    'text' => 'Text',
+
+    'username_formats' => [
+        'username_format'		=> 'Username Format',
+        'firstname_lastname_format'	=> 'First Name Last Name (jane.smith)',
+        'first_name_format'	        => 'First Name (jane)',
+        'last_name_format'		=> 'Last Name (doe)',
+        'filastname_format'			=> 'First Initial Last Name (jsmith)',
+        'lastnamefirstinitial_format' =>  'Last Name First Initial (smithj)',
+        'firstname_lastname_underscore_format' => 'First Name Last Name (jane_smith)',
+        'firstinitial.lastname' => 'First Initial Last Name (j.smith)',
+        'lastname_firstinitial' => 'Last Name First Initial (smith_j)',
+        'lastname_dot_firstinitial_format' => 'Last Name First Initial (smith.j)',
+        'firstnamelastname'     => 'First Name Last Name (janesmith)',
+        'firstnamelastinitial'  => 'First Name Last Initial (janes)',
+        'lastnamefirstname'      => 'Last Name.First Name (smith.jane)',
+    ],
+
+    'email_formats' => [
+        'email_format'			=> 'Email Format',
+        'firstname_lastname_format'	=> 'First Name Last Name (jane.smith@example.com)',
+        'first_name_format'		=> 'Fornafn (jane@example.com)',
+        'last_name_format'		=> 'Last Name (doe@example.com)',
+        'filastname_format'			=> 'First Initial Last Name (jsmith@example.com)',
+        'lastnamefirstinitial_format' =>  'Last Name First Initial (smithj@example.com)',
+        'firstname_lastname_underscore_format' => 'First Name Last Name (jane_smith@example.com)',
+        'firstinitial.lastname' => 'First Initial Last Name (j.smith@example.com)',
+        'lastname_firstinitial' => 'Last Name First Initial (smith_j@example.com)',
+        'lastname_dot_firstinitial_format' => 'Last Name First Initial (smith.j@example.com)',
+        'firstnamelastname'     => 'First Name Last Name (janesmith@example.com)',
+        'firstnamelastinitial'  => 'First Name Last Initial (janes@example.com)',
+        'lastnamefirstname'      => 'Last Name.First Name (smith.jane@example.com)',
+    ],
+
+
+
+    'logo_labels' => [
+        'acceptance_pdf_logo'       => 'PDF Logo',
+        'email_logo'                => 'Email Logo',
+        'label_logo'                => 'Label Logo',
+        'logo'                      => 'Site Logo',
+        'favicon'                   => 'Favicon',
+    ],
+
+    'logo_help' => [
+        'email_logo_size'       => 'Square logos in email look best. ',
+    ],
+
+    'logo_option_types' => [
+        'text' => 'Text',
+        'logo' => 'Logo',
+        'logo_and_text' => 'Logo and Text',
+    ],
+
+
+    'legends' => [
+        'scoping' => 'Scoping',
+        'formats' => 'Default Formats',
+        'profiles' => 'User Profiles',
+        'eula' => 'EULA & Acceptance Preferences',
+        'misc_display' => 'Miscellaneous Display Options',
+        'email' => 'Email Preferences',
+        'checkin' => 'Checkin Preferences',
+        'dashboard' => 'Login & Dashboard Preferences',
+        'misc' => 'Miscellaneous',
+        'logos' => 'Logos & Display',
+        'colors' => 'Colors & Skins',
+        'footer' => 'Footer Preferences',
+        'security' => 'Security Preferences',
+        'general' => 'General',
+        'intervals' => 'Intervals & Thresholds',
+    ],
+
+
+    /* Keywords for settings overview help */
+    'keywords' => [
+        'brand'             => 'footer, logo, print, theme, skin, header, colors, color, css',
+        'general_settings'  => 'company support, signature, acceptance, email format, username format, images, per page, thumbnail, eula, gravatar, tos, dashboard, privacy',
+        'groups'            => 'permissions, permission groups, authorization',
+        'labels'            => 'labels, barcodes, barcode, sheets, print, upc, qr, 1d, 2d',
+        'localization'      => 'localization, currency, local, locale, time zone, timezone, international, internatinalization, language, languages, translation',
+        'php_overview'      => 'phpinfo, system, info',
+        'purge'             => 'permanently delete',
+        'security'          => 'password, passwords, requirements, two factor, two-factor, common passwords, remote login, logout, authentication',
+    ],
 
 ];
diff --git a/resources/lang/is-IS/admin/settings/message.php b/resources/lang/is-IS/admin/settings/message.php
index 931b343710..e1b849b6f2 100644
--- a/resources/lang/is-IS/admin/settings/message.php
+++ b/resources/lang/is-IS/admin/settings/message.php
@@ -14,6 +14,9 @@ return [
         'restore_warning'       => 'Yes, restore it. I acknowledge that this will overwrite any existing data currently in the database. This will also log out all of your existing users (including you).',
         'restore_confirm'       => 'Are you sure you wish to restore your database from :filename?'
     ],
+    'restore' => [
+        'success'               => 'Your system backup has been restored. Please log in again.'
+    ],
     'purge' => [
         'error'     => 'An error has occurred while purging. ',
         'validation_failed'     => 'Your purge confirmation is incorrect. Please type the word "DELETE" in the confirmation box.',
@@ -33,6 +36,9 @@ return [
         'testing_authentication' => 'Prófa LDAP auðkenningu...',
         'authentication_success' => 'User authenticated against LDAP successfully!'
     ],
+    'labels' => [
+        'null_template' => 'Label template not found. Please select a template.',
+        ],
     'webhook' => [
         'sending' => 'Sending :app test message...',
         'success' => 'Your :webhook_name Integration works!',
@@ -42,5 +48,12 @@ return [
         'error' => 'Something went wrong. :app responded with: :error_message',
         'error_redirect' => 'ERROR: 301/302 :endpoint returns a redirect. For security reasons, we don’t follow redirects. Please use the actual endpoint.',
         'error_misc' => 'Eitthvað fór úrskeiðis. :( ',
-    ]
+        'webhook_fail' => ' webhook notification failed: Check to make sure the URL is still valid.',
+        'webhook_channel_not_found' => ' webhook channel not found.',
+        'ms_teams_deprecation' => 'The selected Microsoft Teams webhook URL will be deprecated Dec 31st, 2025. Please use a workflow URL. Microsoft\'s documentation on creating a workflow can be found <a href="https://support.microsoft.com/en-us/office/create-incoming-webhooks-with-workflows-for-microsoft-teams-8ae491c7-0394-4861-ba59-055e33f75498" target="_blank"> here.</a>',
+    ],
+    'location_scoping' => [
+        'not_saved' => 'Your settings were not saved.',
+        'mismatch' => 'There is 1 item in the database that need your attention before you can enable location scoping.|There are :count items in the database that need your attention before you can enable location scoping.',
+    ],
 ];
diff --git a/resources/lang/is-IS/admin/statuslabels/table.php b/resources/lang/is-IS/admin/statuslabels/table.php
index 44d2a5b365..1b548332e6 100644
--- a/resources/lang/is-IS/admin/statuslabels/table.php
+++ b/resources/lang/is-IS/admin/statuslabels/table.php
@@ -1,14 +1,14 @@
 <?php
 
 return array(
-    'about'      	=> 'About Status Labels',
+    'about'      	=> 'About Status Types',
     'archived'      	=> 'Safnvistað',
     'create'      	=> 'Create Status Label',
     'color'      	=> 'Chart Color',
     'default_label' => 'Default Label',
     'default_label_help' => 'This is used to ensure your most commonly used status labels appear at the top of the select box when creating/editing assets.',
     'deployable'      	=> 'Nothæfar',
-    'info'      	=> 'Stöðumerkingar eru notaðar til að lýsa því ástandi sem eignir geta verið í. Þær geta verið í viðgerð, týndar/stolnar o. s. frv. Þú getur búið til nýjar stöðumerkingar fyrir eignir sem eru tilbúnar til ráðstöfunar, eru á bið eða hafa verið safnvistaðar.',
+    'info'      	=> 'Status label types are used to describe the various states your assets could be in. They may be out for repair, lost/stolen, etc. You can create new status labels for your deployable, pending and archived assets according to your own workflow. For more information, <a href="https://snipe-it.readme.io/docs/overview#status-labels" target="_blank">see the documentation <i class="fa fa-external-link"></i></a>.',
     'name'      	=> 'Status Name',
     'pending'      	=> 'Á bið',
     'status_type'   => 'Tegund stöðu',
diff --git a/resources/lang/is-IS/admin/users/general.php b/resources/lang/is-IS/admin/users/general.php
index e699e9bf31..0a03c57bed 100644
--- a/resources/lang/is-IS/admin/users/general.php
+++ b/resources/lang/is-IS/admin/users/general.php
@@ -19,6 +19,8 @@ return [
     'print_assigned'    => 'Prenta allt skráð',
     'email_assigned'    => 'Senda t-póst með öllum skráðum búnaði (Email List of All Assigned)',
     'user_notified'     => 'User has been emailed a list of their currently assigned items.',
+    'users_notified'    => 'The user has been emailed a list of their currently assigned items.|:count users have been emailed a list of their currently assigned items.',
+    'users_notified_warning' => ':count user has been emailed a list of their currently assigned items, however :no_email users did not have an email address so could not be emailed.|:count users have been emailed a list of their currently assigned items, however :no_email user(s) did not have an email address so could not be emailed.',
     'auto_assign_label' => 'Include this user when auto-assigning eligible licenses',
     'auto_assign_help'  => 'Skip this user in auto assignment of licenses',
     'software_user'     => 'Software Checked out to :name',
diff --git a/resources/lang/is-IS/admin/users/message.php b/resources/lang/is-IS/admin/users/message.php
index fa2ffd8f0e..4708b0750d 100644
--- a/resources/lang/is-IS/admin/users/message.php
+++ b/resources/lang/is-IS/admin/users/message.php
@@ -6,7 +6,7 @@ return array(
     'declined'                  => 'You have successfully declined this asset.',
     'bulk_manager_warn'	        => 'Your users have been successfully updated, however your manager entry was not saved because the manager you selected was also in the user list to be edited, and users may not be their own manager. Please select your users again, excluding the manager.',
     'user_exists'               => 'User already exists!',
-    'user_not_found'            => 'User does not exist.',
+    'user_not_found'            => 'User does not exist or you do not have permission view them.',
     'user_login_required'       => 'The login field is required',
     'user_has_no_assets_assigned' => 'No assets currently assigned to user.',
     'user_password_required'    => 'The password is required.',
@@ -53,6 +53,7 @@ return array(
         'ldap_could_not_search' => 'Could not search the LDAP server. Please check your LDAP server configuration in the LDAP config file. <br>Error from LDAP Server:',
         'ldap_could_not_get_entries' => 'Could not get entries from the LDAP server. Please check your LDAP server configuration in the LDAP config file. <br>Error from LDAP Server:',
         'password_ldap' => 'The password for this account is managed by LDAP/Active Directory. Please contact your IT department to change your password. ',
+        'multi_company_items_assigned' => 'This user has items assigned that belong to a different company. Please check them in or edit their company.'
     ),
 
     'deletefile' => array(
diff --git a/resources/lang/is-IS/admin/users/table.php b/resources/lang/is-IS/admin/users/table.php
index 9db275877f..3102f8f5b4 100644
--- a/resources/lang/is-IS/admin/users/table.php
+++ b/resources/lang/is-IS/admin/users/table.php
@@ -22,7 +22,7 @@ return array(
     'managed_locations'     => 'Managed Locations',
     'managed_users'         => 'Managed Users',
     'name' 					=> 'Nafn',
-    'nogroup'               => 'No groups have been created yet. To add one, visit: ',
+    'nogroup'               => 'No groups have been created yet. To add one, visit:',
     'notes'                 => 'Athugasemdir',
     'password_confirm' 		=> 'Staðfesta lykilorð',
     'password' 				=> 'Lykilorð',
diff --git a/resources/lang/is-IS/auth.php b/resources/lang/is-IS/auth.php
index d5298e17a9..7f2066ce80 100644
--- a/resources/lang/is-IS/auth.php
+++ b/resources/lang/is-IS/auth.php
@@ -15,6 +15,6 @@ return array(
 
     'failed' => 'Þessar auðkenningar passa ekki við okkar skráningar.',
     'password' => 'Uppgefið lykilorð er rangt.',
-    'throttle' => 'Of margar innskráningartilraunir. Vinsamlegast reyndu aftur eftir :seconds sekúndur.',
+    'throttle' => 'Too many login attempts. Please try again in :minutes minute(s).',
 
 );
diff --git a/resources/lang/is-IS/auth/message.php b/resources/lang/is-IS/auth/message.php
index e5f50606ba..d8cf78aaa8 100644
--- a/resources/lang/is-IS/auth/message.php
+++ b/resources/lang/is-IS/auth/message.php
@@ -6,8 +6,6 @@ return array(
     'account_not_found'      => 'Notandanafnið eða lykilorðið er rangt.',
     'account_not_activated'  => 'Þessi notendareikningur er ekki virkur.',
     'account_suspended'      => 'Þessum notandareikningi er lokað.',
-    'account_banned'         => 'Þessi notendareikningur er bannaður.',
-    'throttle'               => 'Of margar misheppnaðar innskráningartilraunir. Vinsamlegast reyndu aftur eftir :minutes mínútur.',
 
     'two_factor' => array(
         'already_enrolled'      => 'Tækið þitt er þegar skráð.',
diff --git a/resources/lang/is-IS/button.php b/resources/lang/is-IS/button.php
index 2418057aad..468e94bf08 100644
--- a/resources/lang/is-IS/button.php
+++ b/resources/lang/is-IS/button.php
@@ -7,6 +7,7 @@ return [
     'checkin_and_delete'  	    => 'Skrá inn allt / Eyða notenda',
     'delete'  	                => 'Eyða',
     'edit'    	                => 'Breyta',
+    'clone'    	                => 'Klóna',
     'restore' 	                => 'Endurheimta',
     'remove'                    => 'Fjarlægja',
     'request'                   => 'Óska eftir',
@@ -21,4 +22,13 @@ return [
     'add_maintenance'           => 'Bæta við viðhaldi',
     'append'                    => 'Bæta við',
     'new'                       => 'Nýtt',
+    'var' => [
+        'clone'     => 'Clone :item_type',
+        'edit'      => 'Edit :item_type',
+        'delete'    => 'Delete :item_type',
+        'restore'   => 'Restore :item_type',
+        'create'    => 'Create New :item_type',
+        'checkout'  => 'Checkout :item_type',
+        'checkin'   => 'Checkin :item_type',
+    ]
 ];
diff --git a/resources/lang/is-IS/general.php b/resources/lang/is-IS/general.php
index f9294b2c56..5926e335bd 100644
--- a/resources/lang/is-IS/general.php
+++ b/resources/lang/is-IS/general.php
@@ -10,7 +10,7 @@ return [
     'action'                => 'Aðgerð',
     'activity_report'		=> 'Aðgerðaskýrsla',
     'address'				=> 'Heimilisfang',
-    'admin'					=> 'Kerfisstjóri',
+    'admin'					=> 'Admin Settings',
     'admin_tooltip'			=> 'This user has admin privileges',
     'superuser'				=> 'Superuser',
     'superuser_tooltip'		=> 'This user has superuser privileges',
@@ -23,13 +23,16 @@ return [
     'asset_models'			=> 'Tegundir',
     'asset_model'			=> 'Tegund',
     'asset'					=> 'Eign',
+    'asset_previous'        => 'Asset (Previously Assigned)',
     'asset_report'          => 'Eignaskýrsla',
     'asset_tag'				=> 'Eignar merki',
     'asset_tags'            => 'Búnaðarmmiðar',
     'assets_available'		=> 'tiltækar eignir',
     'accept_assets'         => 'Samþykkja Eign :name',
     'accept_assets_menu'    => 'Samþykkja eign',
+    'accept_item'           => 'Accept Item',
     'audit'				    => 'Úttekt',
+    'audits'				=> 'Audits',
     'audit_report'			=> 'Úttektarsaga',
     'assets'				=> 'Eignir',
     'assets_audited'        => 'assets audited',
@@ -61,9 +64,12 @@ return [
     'changepassword'  		=> 'Breyta lykilorði',
     'checkin'  				=> 'Skrá inn',
     'checkin_from'  		=> 'Skráningarform',
+    'checkin_note'  		=> 'Checkin Note',
+    'checkout_note'  		=> 'Checkout Note',
     'checkout'  			=> 'Skrá út',
     'checkouts_count'       => 'Ráðstafanir',
     'checkins_count'        => 'Skil',
+    'checkin_and_delete'  	=> 'Checkin and Delete',
     'user_requests_count'   => 'Beiðnir',
     'city'  				=> 'Borg',
     'click_here'			=> 'Smelltu hér',
@@ -77,7 +83,7 @@ return [
     'consumables'			=> 'Rekstrarvörur',
     'country'  				=> 'Land',
     'could_not_restore'     => 'Error restoring :item_type: :error',
-    'not_deleted'           => 'The :item_type is not deleted so it cannot be restored',
+    'not_deleted'           => 'The :item_type was not deleted and therefore cannot be restored',
     'create'				=> 'Stofna nýtt',
     'created'               => 'Hlutur stofnaður',
     'created_asset'			=> 'skráði eign',
@@ -86,11 +92,13 @@ return [
     'record_created' 		=> 'Færsla stofnuð',
     'updated_at' 			=> 'Uppfært',
     'currency'  			=> '$', // this is deprecated
+    'currency_text'  		=> 'Currency', //
     'current'  				=> 'Núverandi',
     'current_password'      => 'Núverandi Lykilorð',
     'customize_report'      => 'Sérsníðin skýrsla',
     'custom_report'         => 'Sérsníðin eigna skýrsla',
     'dashboard'				=> 'Stjórnborð',
+    'data_source'           => 'Data Source',
     'days'      			=> 'dagar',
     'days_to_next_audit'    => 'Dagar fram að næstu úttekt',
     'date'					=> 'Dagsetning',
@@ -98,7 +106,7 @@ return [
     'debug_warning_text'    => 'This application is running in production mode with debugging enabled. This can expose sensitive data if your application is accessible to the outside world. Disable debug mode by setting the <code>APP_DEBUG</code> value in your <code>.env</code> file to <code>false</code>.',
     'delete'  				=> 'Eyða',
     'delete_confirm'  		=> 'Ertu viss um að þú viljir eyða þessum :item?',
-    'delete_confirm_no_undo' => 'Ertu viss um að þú viljir eyða þessum :item? Þessi aðgerð er óafturkræf.',
+    'delete_confirm_no_undo' => 'Are you sure, you wish to delete :item? This cannot be undone.',
     'deleted'  				=> 'Eytt',
     'delete_seats'  		=> 'Eydd leyfi',
     'deletion_failed'       => 'Eyðing mistókst',
@@ -114,29 +122,13 @@ return [
     'editprofile'  			=> 'Edit Your Profile',
     'eol'					=> 'Lok línu',
     'email_domain'			=> 'Lén tölvupósts',
-    'email_format'			=> 'Email Format',
     'employee_number'       => 'Starfsmanna númer',
     'email_domain_help'		=> 'This is used to generate email addresses when importing',
     'error'				    => 'Villa',
     'exclude_archived'      => 'Sleppa geymdum eignum',
     'exclude_deleted'       => 'Sleppa eyddum eignum',
     'example'				=> 'Dæmi: ',
-    'filastname_format'			=> 'First Initial Last Name (jsmith@example.com)',
-    'firstname_lastname_format'	=> 'First Name Last Name (jane.smith@example.com)',
-    'firstname_lastname_underscore_format' => 'First Name Last Name (jane_smith@example.com)',
-    'lastnamefirstinitial_format' =>  'Last Name First Initial (smithj@example.com)',
-    'firstintial_dot_lastname_format' => 'First Initial Last Name (j.smith@example.com)',
-    'firstname_lastname_display'	=> 'Fornafn Eftirnafn (Jane Smith)',
-    'lastname_firstname_display'	=> 'Eftirnafn Fornafn (Smith Jane)',
-    'name_display_format'	=> 'Nafn á birtingaforsniði',
-    'first'					=> 'Fyrsta',
-    'firstnamelastname'     => 'First Name Last Name (janesmith@example.com)',
-    'lastname_firstinitial' => 'Last Name First Initial (smith_j@example.com)',
-    'firstinitial.lastname' => 'First Initial Last Name (j.smith@example.com)',
-    'firstnamelastinitial'  => 'First Name Last Initial (janes@example.com)',
-    'lastnamefirstname'      => 'Last Name First Name (smith.jane@example.com)',
-    'first_name'			=> 'Fornafn',
-    'first_name_format'		=> 'Fornafn (jane@example.com)',
+
     'files'                 => 'Skrár',
     'file_name'				=> 'Skrá',
     'file_type'             => 'Skráartegund',
@@ -156,9 +148,9 @@ return [
     'image_delete'         	=> 'Eyða mynd',
     'include_deleted'       => 'Inniheldur eyddar eignir',
     'image_upload'         	=> 'Hlaða upp mynd',
-    'filetypes_accepted_help'    => 'Accepted filetype is :types. Max upload size allowed is :size.|Accepted filetypes are :types. Max upload size allowed is :size.',
-    'filetypes_size_help'   => 'Max upload size allowed is :size.',
-    'image_filetypes_help'  => 'Accepted filetypes are jpg, webp, png, gif, svg, and avif. Max upload size allowed is :size.',
+    'filetypes_accepted_help'    => 'Accepted filetype is :types. The maximum size allowed is :size.|Accepted filetypes are :types. The maximum upload size allowed is :size.',
+    'filetypes_size_help'   => 'The maximum upload size allowed is :size.',
+    'image_filetypes_help'  => 'Accepted Filetypes are jpg, webp, png, gif, svg, and avif. The maximum upload size allowed is :size.',
     'unaccepted_image_type'  => 'This image file was not readable. Accepted filetypes are jpg, webp, png, gif, and svg. The mimetype of this file is: :mimetype.',
     'import'         	    => 'Flytja inn',
     'import_this_file'      => 'Map fields and process this file',
@@ -178,12 +170,17 @@ return [
     'last'					=> 'Síðasta',
     'last_login'            => 'Siðasta innskráning',
     'last_name'             => 'Eftirnafn',
+    'firstname_lastname_display'	=> 'Fornafn Eftirnafn (Jane Smith)',
+    'lastname_firstname_display'	=> 'Eftirnafn Fornafn (Smith Jane)',
+    'name_display_format'	=> 'Nafn á birtingaforsniði',
+    'first'					=> 'Fyrsta',
+    'first_name'			=> 'Fornafn',
     'license'				=> 'Leyfi',
     'license_report'        => 'Leyfisskýrsla',
     'licenses_available'	=> 'Hugbúnaðarleyfi í boði',
     'licenses'				=> 'Leyfi',
     'list_all'				=> 'Sýna allt',
-    'loading'				=> 'Hleð... vinsamlega bíðið....',
+    'loading'				=> 'Hleð... vinsamlega bíðið...',
     'lock_passwords'        => 'This field value will not be saved in a demo installation.',
     'feature_disabled'      => 'This feature has been disabled for the demo installation.',
     'location'              => 'Staðsetning',
@@ -193,7 +190,7 @@ return [
     'logout'				=> 'Útskráning',
     'lookup_by_tag'     => 'Leita eftir merki eignar',
     'maintenances'          => 'Viðhald',
-    'manage_api_keys'       => 'Manage API Keys',
+    'manage_api_keys'       => 'Manage API keys',
     'manufacturer'			=> 'Framleiðandi',
     'manufacturers'			=> 'Framleiðendur',
     'markdown'				=> 'This field allows <a href="https://help.github.com/articles/github-flavored-markdown/">Github flavored markdown</a>.',
@@ -215,6 +212,14 @@ return [
     'no_results'			=> 'Engar niðurstöður.',
     'no'  					=> 'Nei',
     'notes'  				=> 'Athugasemdir',
+    'note_added'            => 'Note Added',
+    'options'				=> 'Options',
+    'preview'				=> 'Preview',
+    'add_note'              => 'Add Note',
+    'note_edited'            => 'Note Edited',
+    'edit_note'              => 'Edit Note',
+    'note_deleted'            => 'Note Deleted',
+    'delete_note'              => 'Delete Note',
     'order_number'          => 'Reikningsnúmer',
     'only_deleted'          => 'Aðeins eyddar eignir',
     'page_menu'				=> 'Sýni _MENU_ atriði',
@@ -229,7 +234,7 @@ return [
     'purchase_date'         => 'Innkaups dagsetning',
     'qty'		            => 'Fj',
     'quantity'		        => 'Fjöldi',
-    'quantity_minimum'      => 'You have :count items below or almost below minimum quantity levels',
+    'quantity_minimum'      => 'You have one item below or almost below minimum quantity levels|You have :count items below or almost below minimum quantity levels',
     'quickscan_checkin'  	=> 'Quick Scan Checkin',
     'quickscan_checkin_status'  	=> 'Checkin Status',
     'ready_to_deploy'		=> 'Tilbúin til notkunar',
@@ -254,7 +259,7 @@ return [
     'select_all'            => 'Veldu alla',
     'search'				=> 'Leita',
     'select_category'       => 'Veldu flokk',
-    'select_datasource' => 'Select a Datasource',
+    'select_datasource' => 'Select a data source',
     'select_department'     => 'Veldu deild',
     'select_depreciation'	=> 'Veldu afskriftir',
     'select_location'		=> 'Veldu Staðsetningu',
@@ -274,13 +279,15 @@ return [
     'signed_off_by'         => 'Undirritað af',
     'skin'       			=> 'Útlit',
     'webhook_msg_note'        => 'A notification will be sent via webhook',
-    'webhook_test_msg'        => 'Oh hai! Looks like your :app integration with Snipe-IT is working!',
+    'webhook_test_msg'        => 'Oh hai! It looks like your :app integration with Snipe-IT is working!',
     'some_features_disabled' => 'DEMO MODE: Some features are disabled for this installation.',
     'site_name'				=> 'Nafn vefsins',
     'state'  				=> 'Ríki',
     'status_labels'			=> 'Stöðu merkingar',
+    'status_label'			=> 'Status Label',
     'status'    			=> 'Staða',
     'accept_eula'           => 'Samþykkja skilyrði',
+    'show_or_hide_eulas' => 'Show/Hide EULAs',
     'supplier'              => 'Framleiðandi',
     'suppliers'  			=> 'Framleiðendur',
     'sure_to_delete'        => 'Ertu viss um að þú viljir eyða',
@@ -296,9 +303,9 @@ return [
     'type'  				=> 'Týpa',
     'undeployable'			=> 'Ónothæfar',
     'unknown_admin'			=> 'Unknown Admin',
-    'username_format'		=> 'Username Format',
     'username'              => 'Notendanafn',
     'update'                => 'Uppfæra',
+    'updating_item' => 'Updating :item',
     'upload_filetypes_help'      => 'Allowed filetypes are png, gif, jpg, jpeg, doc, docx, pdf, xls, xlsx, txt, lic, xml, zip, rtf and rar. Max upload size allowed is :size.',
     'uploaded'              => 'Uploaded',
     'user'					=> 'Notandi',
@@ -323,10 +330,10 @@ return [
     'token_expired'         => 'Your form session has expired. Please try again.',
     'login_enabled'         => 'Innskráning virkjuð',
     'audit_due'             => 'Komið að úttekt',
-    'audit_due_days'        => 'Assets Due for Audit Within :days Day|Assets Due for Audit Within :days Days',
+    'audit_due_days'        => '{}Assets Due or Overdue for Audit|[1]Assets Due or Overdue for Audit Within a Day|[2,*]Assets Due or Overdue for Audit Within :days Days',
     'checkin_due'           => 'Due for Checkin',
     'checkin_overdue'       => 'Overdue for Checkin',
-    'checkin_due_days'      => 'Assets Due for Checkin Within :days Day|Assets Due for Checkin Within :days Days',
+    'checkin_due_days'      => '{}Due for Checkin|[1]Assets Due for Checkin Within :days Day|[2,*]Assets Due for Checkin Within :days Days',
     'audit_overdue'         => 'Úttekt á eftir áætlun',
     'accept'                => 'Samþykkja :asset',
     'i_accept'              => 'Ég samþykki',
@@ -339,16 +346,16 @@ return [
     'view_all'              => 'Skoða allt',
     'hide_deleted'          => 'Hide Deleted',
     'email'                 => 'Tölvupóstur',
-    'do_not_change'         => 'EKKI BREYTA',
-    'bug_report'            => 'Report a Bug',
+    'do_not_change'         => 'Do not change',
+    'bug_report'            => 'Report a bug',
     'user_manual'           => 'User\'s Manual',
     'setup_step_1'          => 'Step 1',
     'setup_step_2'          => 'Step 2',
     'setup_step_3'          => 'Step 3',
     'setup_step_4'          => 'Step 4',
     'setup_config_check'    => 'Configuration Check',
-    'setup_create_database' => 'Create Database Tables',
-    'setup_create_admin'    => 'Create Admin User',
+    'setup_create_database' => 'Create database tables',
+    'setup_create_admin'    => 'Create an admin user',
     'setup_done'            => 'Finished!',
     'bulk_edit_about_to'    => 'You are about to edit the following: ',
     'checked_out'           => 'Skráð út',
@@ -383,6 +390,8 @@ return [
     'new_license'           => 'Ný hugbúnaðarleyfi',
     'new_accessory'         => 'Nýir aukahlutir',
     'new_consumable'        => 'Nýjar rekstrarvörur',
+    'new_component'         => 'New Component',
+    'new_user'              => 'New User',
     'collapse'              => 'Collapse',
     'assigned'              => 'Úthluta',
     'asset_count'           => 'Asset Count',
@@ -418,19 +427,20 @@ return [
     'bulk_soft_delete'      =>'Einnig merkja eydda "soft-delete" þessa notendur. Hreyfingarsaga eigna mun haldast óbreytt eða þangað til að þú velur að eyða varanlega "purge deleted" færslum í stjórnarenda stillingum.',
     'bulk_checkin_delete_success' => 'Valdir notendur hefur verið eytt og hlutir þeirra hafa verið skráðir inn.',
     'bulk_checkin_success' => 'Hlutir fyrir valin notenda hafa verið skrá inn.',
-    'set_to_null'           => 'Delete values for this asset|Delete values for all :asset_count assets ',
+    'set_to_null'           => 'Delete values for this selection|Delete values for all :selection_count selections ',
     'set_users_field_to_null'  => 'Delete :field values for this user|Delete :field values for all :user_count users ',
     'na_no_purchase_date'   => 'N/A - Vantar kaupdagssetningu',
     'assets_by_status'      => 'Eignir(búnaður) eftir stöðu',
     'assets_by_status_type'      => 'Eignir(búnaður) eftir Tegund',
     'pie_chart_type'        => 'Dashboard Pie Chart Type',
     'hello_name'            => 'Halló, :name!',
-    'unaccepted_profile_warning'   => 'You have :count items requiring acceptance. Click here to accept or decline them',
+    'unaccepted_profile_warning'   => 'You have one item requiring acceptance. Click here to accept or decline it | You have :count items requiring acceptance. Click here to accept or decline them',
     'start_date'            => 'Upphafsdagsetning',
     'end_date'            => 'Lokadagsetning',
     'alt_uploaded_image_thumbnail' => 'Hlaða upp smámynd',
     'placeholder_kit'       => 'Velja sett',
     'file_not_found'        => 'File not found',
+    'log_record_not_found'  => 'No record for that log entry was found.',
     'preview_not_available' => '(no preview)',
     'setup'                 => 'Setup',
     'pre_flight'            => 'Pre-Flight',
@@ -512,7 +522,7 @@ return [
     'checked_out_to_fields' => 'Checked Out To Fields',
     'percent_complete' => '% lokið',
     'uploading' => 'Uploading... ',
-    'upload_error' => 'Error uploading file. Please check that there are no empty rows and that no column names are duplicated.',
+    'upload_error' => 'Error uploading file. Please check that you have no empty rows or duplicated column names in your CSV, and that the server permissions allow uploads.',
     'copy_to_clipboard' => 'Copy to Clipboard',
     'copied' => 'Copied!',
     'status_compatibility' => 'If assets are already assigned, they cannot be changed to a non-deployable status type and this value change will be skipped.',
@@ -549,6 +559,71 @@ return [
         'license_seats'  => ':count License Seat|:count License Seats',
         'consumables'  => ':count Consumable|:count Consumables',
         'components'  => ':count Component|:count Components',
-    ]
+    ],
+
+    'more_info' => 'Nánar',
+    'quickscan_bulk_help' => 'Checking this box will edit the asset record to reflect this new location. Leaving it unchecked will simply note the location in the audit log. Note that if this asset is checked out, it will not change the location of the person, asset or location it is checked out to.',
+    'whoops' => 'Whoops!',
+    'something_went_wrong' => 'Something went wrong with your request.',
+    'close' => 'Close',
+    'expires' => 'Expires (útrunnið)',
+    'map_fields'=> 'Map :item_type Fields',
+    'remaining_var' => ':count Remaining',
+    'label' => 'Label',
+    'import_asset_tag_exists' => 'An asset with the asset tag :asset_tag already exists and an update was not requested. No change was made.',
+    'countries_manually_entered_help' => 'Values with an asterisk (*) were manually entered and do not match existing ISO 3166 dropdown values',
+    'accessories_assigned' => 'Assigned Accessories',
+    'user_managed_passwords' => 'Password Management',
+    'user_managed_passwords_disallow' => 'Disallow users from managing their own passwords',
+    'user_managed_passwords_allow' => 'Allow users to manage their own passwords',
+    'from' => 'From',
+    'by' => 'Eftir',
+
+// Add form placeholders here
+    'placeholders' => [
+        'notes'  => 'Add a note',
+    ],
+
+    'breadcrumb_button_actions' => [
+        'edit_item' => 'Edit :name',
+        'checkout_item' => 'Checkout :name',
+        'checkin_item' => 'Checkin :name',
+    ],
+
+    'skins' => [
+        'site_default' => 'Site Default',
+        'default_blue' => 'Default Blue',
+        'blue_dark' => 'Blue (Dark Mode)',
+        'green' => 'Green Dark',
+        'green_dark' => 'Green (Dark Mode)',
+        'red' => 'Red Dark',
+        'red_dark' => 'Red (Dark Mode)',
+        'orange' => 'Orange Dark',
+        'orange_dark' => 'Orange (Dark Mode)',
+        'black' => 'Black',
+        'black_dark' => 'Black (Dark Mode)',
+        'purple' => 'Purple',
+        'purple_dark' => 'Purple (Dark Mode)',
+        'yellow' => 'Yellow',
+        'yellow_dark' => 'Yellow (Dark Mode)',
+        'high_contrast' => 'High Contrast',
+
+    ],
+
+    'select_all_none' => 'Select/Unselect All',
+    'generic_model_not_found' => 'That :model was not found or you do not have permission to access it',
+    'deleted_models' => 'Deleted Asset Models',
+    'deleted_users' => 'Deleted Users',
+    'cost_each' => ':amount each',
+    'remove_current_image' => 'Remove current :type image',
+
+    'seeding' => [
+        'manufacturers' => [
+            'button' => 'Create Manufacturers',
+            'prompt' => 'You do not have any manufacturers yet. Would you like to seed a list of common manufacturers? (THIS WILL OVERWRITE EXISTING MANUFACTURERS, including those that have been soft-deleted.)',
+            'success' => 'Manufacturers seeded successfully',
+            'error' => 'Could not seed manufacturers. A manufacturer record already exists and seeding would overwrite it.|Could not seed manufacturers. :count manufacturer records already exist and seeding would overwrite them.',
+        ],
+    ],
 
 ];
diff --git a/resources/lang/is-IS/localizations.php b/resources/lang/is-IS/localizations.php
index aa6176add1..6656b430f6 100644
--- a/resources/lang/is-IS/localizations.php
+++ b/resources/lang/is-IS/localizations.php
@@ -2,7 +2,7 @@
 
 return [
 
-    'select_language' => 'Veldu tungumál',
+    'select_language' => 'Select a Language',
     'languages' => [
         'en-US'=> 'English, US',
         'en-GB'=> 'English, UK',
@@ -40,7 +40,9 @@ return [
         'ms-MY'=> 'Malay',
         'mi-NZ'=> 'Maori',
         'mn-MN'=> 'Mongolian',
-        'no-NO'=> 'Norwegian',
+        'nb-NO'=> 'Norwegian Bokmål',
+        'om-ET' => 'Oromo (Ethiopian)',
+        //'nn-NO'=> 'Norwegian Nynorsk',
         'fa-IR'=> 'Persian',
         'pl-PL'=> 'Polish',
         'pt-PT'=> 'Portuguese',
@@ -51,7 +53,7 @@ return [
         'sk-SK'=> 'Slovak',
         'sl-SI'=> 'Slovenian',
         'so-SO'=> 'Somali',
-        'es-ES'=> 'Spanish',
+        'es-ES'=> 'Spænska',
         'es-CO'=> 'Spanish, Colombia',
         'es-MX'=> 'Spanish, Mexico',
         'es-VE'=> 'Spanish, Venezuela',
@@ -66,7 +68,7 @@ return [
         'zu-ZA'=> 'Zulu',
     ],
 
-    'select_country' => 'Select a country',
+    'select_country' => 'Select a Country',
     
     'countries' => [
         'AC'=>'Ascension Island',
@@ -133,6 +135,7 @@ return [
         'EC'=>'Ecuador',
         'EE'=>'Estonia',
         'EG'=>'Egypt',
+        'GB-ENG'=>'England',
         'ER'=>'Eritrea',
         'ES'=>'Spain',
         'ET'=>'Ethiopia',
@@ -231,6 +234,7 @@ return [
         'NG'=>'Nigeria',
         'NI'=>'Nicaragua',
         'NL'=>'Netherlands',
+        'GB-NIR' => 'Northern Ireland',
         'NO'=>'Norway',
         'NP'=>'Nepal',
         'NR'=>'Nauru',
@@ -258,7 +262,7 @@ return [
         'RU'=>'Russian Federation',
         'RW'=>'Rwanda',
         'SA'=>'Saudi Arabia',
-        'UK'=>'United Kingdom',
+        'GB-SCT'=>'United Kingdom',
         'SB'=>'Solomon Islands',
         'SC'=>'Seychelles',
         'SS'=>'South Sudan',
@@ -310,6 +314,7 @@ return [
         'VI'=>'Virgin Islands (U.S.)',
         'VN'=>'Viet Nam',
         'VU'=>'Vanuatu',
+        'GB-WLS' =>'Wales',
         'WF'=>'Wallis And Futuna Islands',
         'WS'=>'Samoa',
         'YE'=>'Yemen',
diff --git a/resources/lang/is-IS/mail.php b/resources/lang/is-IS/mail.php
index 9163a1702f..950e4403b8 100644
--- a/resources/lang/is-IS/mail.php
+++ b/resources/lang/is-IS/mail.php
@@ -23,24 +23,25 @@ return [
     'Item_Requested' => 'Item Requested',
     'License_Checkin_Notification' => 'License checked in',
     'License_Checkout_Notification' => 'Hugbúnaðarleyfi skráð út',
+    'license_for'   => 'License for',
     'Low_Inventory_Report' => 'Skýrsla um lága birgðastöðu',
     'a_user_canceled' => 'A user has canceled an item request on the website',
     'a_user_requested' => 'A user has requested an item on the website',
     'acceptance_asset_accepted' => 'A user has accepted an item',
     'acceptance_asset_declined' => 'A user has declined an item',
-    'accessory_name' => 'Accessory Name:',
-    'additional_notes' => 'Viðbótar upplýsingar:',
+    'accessory_name' => 'Nafn aukabúnaðs',
+    'additional_notes' => 'Viðbótar upplýsingar',
     'admin_has_created' => 'An administrator has created an account for you on the :web website.',
-    'asset' => 'Eign:',
-    'asset_name' => 'Heiti eignar:',
+    'asset' => 'Eign',
+    'asset_name' => 'Heiti eignar',
     'asset_requested' => 'Asset requested',
     'asset_tag' => 'Búnaðar númer',
     'assets_warrantee_alert' => 'There is :count asset with a warranty expiring in the next :threshold days.|There are :count assets with warranties expiring in the next :threshold days.',
     'assigned_to' => 'Skráð á',
     'best_regards' => 'Með kveðju,',
-    'canceled' => 'Canceled:',
-    'checkin_date' => 'Checkin Date:',
-    'checkout_date' => 'Checkout Date:',
+    'canceled' => 'Canceled',
+    'checkin_date' => 'Skiladagsetning',
+    'checkout_date' => 'Ráðstöfunardagsetning',
     'checkedout_from' => 'Skráð út frá',
     'checkedin_from'  => 'Skráð inn frá',
     'checked_into' => 'Skráð inní',
@@ -49,27 +50,30 @@ return [
     'click_to_confirm' => 'Please click on the following link to confirm your :web account:',
     'current_QTY' => 'Current QTY',
     'days' => 'Dagar',
-    'expecting_checkin_date' => 'Expected Checkin Date:',
+    'expecting_checkin_date' => 'Áætluð skiladagsetning',
     'expires' => 'Rennur út',
     'hello' => 'Halló',
     'hi' => 'Hæ',
     'i_have_read' => 'I have read and agree to the terms of use, and have received this item.',
     'inventory_report' => 'Inventory Report',
-    'item' => 'Item:',
+    'item' => 'Atriði',
+    'item_checked_reminder' => 'This is a reminder that you currently have :count items checked out to you that you have not accepted or declined. Please click the link below to confirm your decision.',
     'license_expiring_alert' => 'There is :count license expiring in the next :threshold days.|There are :count licenses expiring in the next :threshold days.',
     'link_to_update_password' => 'Please click on the following link to update your :web password:',
-    'login' => 'Login:',
+    'login' => 'Login',
     'login_first_admin' => 'Login to your new Snipe-IT installation using the credentials below:',
     'low_inventory_alert' => 'There is :count item that is below minimum inventory or will soon be low.|There are :count items that are below minimum inventory or will soon be low.',
     'min_QTY' => 'Min QTY',
     'name' => 'Nafn búnaðar',
     'new_item_checked' => 'A new item has been checked out under your name, details are below.',
+    'new_item_checked_with_acceptance' => 'A new item has been checked out under your name that requires acceptance, details are below.',
+    'recent_item_checked' => 'An item was recently checked out under your name that requires acceptance, details are below.',
     'notes' => 'Athugasemdir',
-    'password' => 'Password:',
+    'password' => 'Lykilorð',
     'password_reset' => 'Password Reset',
     'read_the_terms' => 'Please read the terms of use below.',
     'read_the_terms_and_click' => 'Please read the terms of use below, and click on the link at the bottom to confirm that you read and agree to the terms of use, and have received the asset.',
-    'requested' => 'Requested:',
+    'requested' => 'Óskað eftir',
     'reset_link' => 'Your Password Reset Link',
     'reset_password' => 'Click here to reset your password:',
     'rights_reserved' => 'All rights reserved.',
@@ -86,8 +90,10 @@ return [
     'upcoming-audits' => 'There is :count asset that is coming up for audit within :threshold days.|There are :count assets that are coming up for audit within :threshold days.',
     'user' => 'Notandi',
     'username' => 'Notendanafn',
+    'unaccepted_asset_reminder' => 'Reminder: You have Unaccepted Assets.',
     'welcome' => 'Velkomin/inn :name',
     'welcome_to' => 'Welcome to :web!',
     'your_assets' => 'Skoða þínar eignir',
     'your_credentials' => 'Your Snipe-IT credentials',
+    'mail_sent' => 'Mail sent successfully!',
 ];
diff --git a/resources/lang/is-IS/validation.php b/resources/lang/is-IS/validation.php
index 34dffb25c7..0f591dd6aa 100644
--- a/resources/lang/is-IS/validation.php
+++ b/resources/lang/is-IS/validation.php
@@ -13,87 +13,150 @@ return [
     |
     */
 
-    'accepted'             => 'The :attribute must be accepted.',
-    'active_url'           => 'The :attribute is not a valid URL.',
-    'after'                => 'The :attribute must be a date after :date.',
-    'after_or_equal'       => 'The :attribute must be a date after or equal to :date.',
-    'alpha'                => 'The :attribute may only contain letters.',
-    'alpha_dash'           => 'The :attribute may only contain letters, numbers, and dashes.',
-    'alpha_num'            => 'The :attribute may only contain letters and numbers.',
-    'array'                => 'The :attribute must be an array.',
-    'before'               => 'The :attribute must be a date before :date.',
-    'before_or_equal'      => 'The :attribute must be a date before or equal to :date.',
-    'between'              => [
-        'numeric' => 'The :attribute must be between :min - :max.',
-        'file'    => 'The :attribute must be between :min - :max kilobytes.',
-        'string'  => 'The :attribute must be between :min - :max characters.',
-        'array'   => 'The :attribute must have between :min and :max items.',
+    'accepted' => 'The :attribute field must be accepted.',
+    'accepted_if' => 'The :attribute field must be accepted when :other is :value.',
+    'active_url' => 'The :attribute field must be a valid URL.',
+    'after' => 'The :attribute field must be a date after :date.',
+    'after_or_equal' => 'The :attribute field must be a date after or equal to :date.',
+    'alpha' => 'The :attribute field must only contain letters.',
+    'alpha_dash' => 'The :attribute field must only contain letters, numbers, dashes, and underscores.',
+    'alpha_num' => 'The :attribute field must only contain letters and numbers.',
+    'array' => 'The :attribute field must be an array.',
+    'ascii' => 'The :attribute field must only contain single-byte alphanumeric characters and symbols.',
+    'before' => 'The :attribute field must be a date before :date.',
+    'before_or_equal' => 'The :attribute field must be a date before or equal to :date.',
+    'between' => [
+        'array' => 'The :attribute field must have between :min and :max items.',
+        'file' => 'The :attribute field must be between :min and :max kilobytes.',
+        'numeric' => 'The :attribute field must be between :min and :max.',
+        'string' => 'The :attribute field must be between :min and :max characters.',
     ],
-    'boolean'              => 'The :attribute must be true or false.',
-    'confirmed'            => 'The :attribute confirmation does not match.',
-    'date'                 => 'The :attribute is not a valid date.',
-    'date_format'          => 'The :attribute does not match the format :format.',
-    'different'            => 'The :attribute and :other must be different.',
-    'digits'               => 'The :attribute must be :digits digits.',
-    'digits_between'       => 'The :attribute must be between :min and :max digits.',
-    'dimensions'           => 'The :attribute has invalid image dimensions.',
-    'distinct'             => 'The :attribute field has a duplicate value.',
-    'email'                => 'The :attribute format is invalid.',
-    'exists'               => 'The selected :attribute is invalid.',
-    'file'                 => ':attribute verður að vera skrá.',
-    'filled'               => 'The :attribute field must have a value.',
-    'image'                => ':attribute verður að vera mynd.',
+    'boolean' => 'The :attribute field must be true or false.',
+    'can' => 'The :attribute field contains an unauthorized value.',
+    'confirmed' => 'The :attribute field confirmation does not match.',
+    'contains' => 'The :attribute field is missing a required value.',
+    'current_password' => 'The password is incorrect.',
+    'date' => 'The :attribute field must be a valid date.',
+    'date_equals' => 'The :attribute field must be a date equal to :date.',
+    'date_format' => 'The :attribute field must match the format :format.',
+    'decimal' => 'The :attribute field must have :decimal decimal places.',
+    'declined' => 'The :attribute field must be declined.',
+    'declined_if' => 'The :attribute field must be declined when :other is :value.',
+    'different' => 'The :attribute field and :other must be different.',
+    'digits' => 'The :attribute field must be :digits digits.',
+    'digits_between' => 'The :attribute field must be between :min and :max digits.',
+    'dimensions' => 'The :attribute field has invalid image dimensions.',
+    'distinct' => 'The :attribute field has a duplicate value.',
+    'doesnt_end_with' => 'The :attribute field must not end with one of the following: :values.',
+    'doesnt_start_with' => 'The :attribute field must not start with one of the following: :values.',
+    'email' => 'The :attribute field must be a valid email address.',
+    'ends_with' => 'The :attribute field must end with one of the following: :values.',
+    'enum' => 'The selected :attribute is invalid.',
+    'exists' => 'The selected :attribute is invalid.',
+    'extensions' => 'The :attribute field must have one of the following extensions: :values.',
+    'file' => 'The :attribute field must be a file.',
+    'filled' => 'The :attribute field must have a value.',
+    'gt' => [
+        'array' => 'The :attribute field must have more than :value items.',
+        'file' => 'The :attribute field must be greater than :value kilobytes.',
+        'numeric' => 'The :attribute field must be greater than :value.',
+        'string' => 'The :attribute field must be greater than :value characters.',
+    ],
+    'gte' => [
+        'array' => 'The :attribute field must have :value items or more.',
+        'file' => 'The :attribute field must be greater than or equal to :value kilobytes.',
+        'numeric' => 'The :attribute field must be greater than or equal to :value.',
+        'string' => 'The :attribute field must be greater than or equal to :value characters.',
+    ],
+    'hex_color' => 'The :attribute field must be a valid hexadecimal color.',
+    'image' => 'The :attribute field must be an image.',
     'import_field_empty'    => 'Gildi fyrir :fieldname getur ekki verið núll.',
-    'in'                   => 'The selected :attribute is invalid.',
-    'in_array'             => 'The :attribute field does not exist in :other.',
-    'integer'              => ':attribute verður að vera heiltala.',
-    'ip'                   => ':attribute verður að vera gild IP-tala.',
-    'ipv4'                 => ':attribute verður að vera gild IPv4-tala.',
-    'ipv6'                 => ':attribute verður að vera gild IPv6-tala.',
-    'is_unique_department' => ':attribute verður að vera einkvæmt fyrir þessa staðsetningu fyrirtækis',
-    'json'                 => 'The :attribute must be a valid JSON string.',
-    'max'                  => [
-        'numeric' => 'The :attribute may not be greater than :max.',
-        'file'    => 'The :attribute may not be greater than :max kilobytes.',
-        'string'  => 'The :attribute may not be greater than :max characters.',
-        'array'   => 'The :attribute may not have more than :max items.',
+    'in' => 'The selected :attribute is invalid.',
+    'in_array' => 'The :attribute field must exist in :other.',
+    'integer' => 'The :attribute field must be an integer.',
+    'ip' => 'The :attribute field must be a valid IP address.',
+    'ipv4' => 'The :attribute field must be a valid IPv4 address.',
+    'ipv6' => 'The :attribute field must be a valid IPv6 address.',
+    'json' => 'The :attribute field must be a valid JSON string.',
+    'list' => 'The :attribute field must be a list.',
+    'lowercase' => 'The :attribute field must be lowercase.',
+    'lt' => [
+        'array' => 'The :attribute field must have less than :value items.',
+        'file' => 'The :attribute field must be less than :value kilobytes.',
+        'numeric' => 'The :attribute field must be less than :value.',
+        'string' => 'The :attribute field must be less than :value characters.',
     ],
-    'mimes'                => 'The :attribute must be a file of type: :values.',
-    'mimetypes'            => 'The :attribute must be a file of type: :values.',
-    'min'                  => [
-        'numeric' => 'The :attribute must be at least :min.',
-        'file'    => 'The :attribute must be at least :min kilobytes.',
-        'string'  => 'The :attribute must be at least :min characters.',
-        'array'   => 'The :attribute must have at least :min items.',
+    'lte' => [
+        'array' => 'The :attribute field must not have more than :value items.',
+        'file' => 'The :attribute field must be less than or equal to :value kilobytes.',
+        'numeric' => 'The :attribute field must be less than or equal to :value.',
+        'string' => 'The :attribute field must be less than or equal to :value characters.',
     ],
-    'starts_with'          => 'The :attribute must start with one of the following: :values.',
-    'ends_with'            => 'The :attribute must end with one of the following: :values.',
+    'mac_address' => 'The :attribute field must be a valid MAC address.',
+    'max' => [
+        'array' => 'The :attribute field must not have more than :max items.',
+        'file' => 'The :attribute field must not be greater than :max kilobytes.',
+        'numeric' => 'The :attribute field must not be greater than :max.',
+        'string' => 'The :attribute field must not be greater than :max characters.',
+    ],
+    'max_digits' => 'The :attribute field must not have more than :max digits.',
+    'mimes' => 'The :attribute field must be a file of type: :values.',
+    'mimetypes' => 'The :attribute field must be a file of type: :values.',
+    'min' => [
+        'array' => 'The :attribute field must have at least :min items.',
+        'file' => 'The :attribute field must be at least :min kilobytes.',
+        'numeric' => 'The :attribute field must be at least :min.',
+        'string' => 'The :attribute field must be at least :min characters.',
+    ],
+    'min_digits' => 'The :attribute field must have at least :min digits.',
+    'missing' => 'The :attribute field must be missing.',
+    'missing_if' => 'The :attribute field must be missing when :other is :value.',
+    'missing_unless' => 'The :attribute field must be missing unless :other is :value.',
+    'missing_with' => 'The :attribute field must be missing when :values is present.',
+    'missing_with_all' => 'The :attribute field must be missing when :values are present.',
+    'multiple_of' => 'The :attribute field must be a multiple of :value.',
+    'not_in' => 'The selected :attribute is invalid.',
+    'not_regex' => 'The :attribute field format is invalid.',
+    'numeric' => 'The :attribute field must be a number.',
+    'password' => [
+        'letters' => 'The :attribute field must contain at least one letter.',
+        'mixed' => 'The :attribute field must contain at least one uppercase and one lowercase letter.',
+        'numbers' => 'The :attribute field must contain at least one number.',
+        'symbols' => 'The :attribute field must contain at least one symbol.',
+        'uncompromised' => 'The given :attribute has appeared in a data leak. Please choose a different :attribute.',
+    ],
+    'percent'       => 'The depreciation minimum must be between 0 and 100 when depreciation type is percentage.',
 
-    'not_in'               => 'The selected :attribute is invalid.',
-    'numeric'              => ':attribute verður að vera tala.',
-    'present'              => 'The :attribute field must be present.',
-    'valid_regex'          => 'That is not a valid regex. ',
-    'regex'                => 'The :attribute format is invalid.',
-    'required'             => 'The :attribute field is required.',
-    'required_if'          => 'The :attribute field is required when :other is :value.',
-    'required_unless'      => 'The :attribute field is required unless :other is in :values.',
-    'required_with'        => 'The :attribute field is required when :values is present.',
-    'required_with_all'    => 'The :attribute field is required when :values is present.',
-    'required_without'     => 'The :attribute field is required when :values is not present.',
+    'present' => 'The :attribute field must be present.',
+    'present_if' => 'The :attribute field must be present when :other is :value.',
+    'present_unless' => 'The :attribute field must be present unless :other is :value.',
+    'present_with' => 'The :attribute field must be present when :values is present.',
+    'present_with_all' => 'The :attribute field must be present when :values are present.',
+    'prohibited' => 'The :attribute field is prohibited.',
+    'prohibited_if' => 'The :attribute field is prohibited when :other is :value.',
+    'prohibited_unless' => 'The :attribute field is prohibited unless :other is in :values.',
+    'prohibits' => 'The :attribute field prohibits :other from being present.',
+    'regex' => 'The :attribute field format is invalid.',
+    'required' => 'The :attribute field is required.',
+    'required_array_keys' => 'The :attribute field must contain entries for: :values.',
+    'required_if' => 'The :attribute field is required when :other is :value.',
+    'required_if_accepted' => 'The :attribute field is required when :other is accepted.',
+    'required_if_declined' => 'The :attribute field is required when :other is declined.',
+    'required_unless' => 'The :attribute field is required unless :other is in :values.',
+    'required_with' => 'The :attribute field is required when :values is present.',
+    'required_with_all' => 'The :attribute field is required when :values are present.',
+    'required_without' => 'The :attribute field is required when :values is not present.',
     'required_without_all' => 'The :attribute field is required when none of :values are present.',
-    'same'                 => 'The :attribute and :other must match.',
-    'size'                 => [
-        'numeric' => 'The :attribute must be :size.',
-        'file'    => 'The :attribute must be :size kilobytes.',
-        'string'  => 'The :attribute must be :size characters.',
-        'array'   => 'The :attribute must contain :size items.',
+    'same' => 'The :attribute field must match :other.',
+    'size' => [
+        'array' => 'The :attribute field must contain :size items.',
+        'file' => 'The :attribute field must be :size kilobytes.',
+        'numeric' => 'The :attribute field must be :size.',
+        'string' => 'The :attribute field must be :size characters.',
     ],
+    'starts_with' => 'The :attribute field must start with one of the following: :values.',
     'string'               => 'The :attribute must be a string.',
-    'timezone'             => 'The :attribute must be a valid zone.',
     'two_column_unique_undeleted' => 'The :attribute must be unique across :table1 and :table2. ',
-    'unique'               => 'The :attribute has already been taken.',
-    'uploaded'             => 'The :attribute failed to upload.',
-    'url'                  => 'The :attribute format is invalid.',
     'unique_undeleted'     => 'The :attribute must be unique.',
     'non_circular'         => 'The :attribute must not create a circular reference.',
     'not_array'            => ':attribute cannot be an array.',
@@ -102,11 +165,14 @@ return [
     'numbers'              => 'Password must contain at least one number.',
     'case_diff'            => 'Password must use mixed case.',
     'symbols'              => 'Password must contain symbols.',
-    'gte'                  => [
-        'numeric'          => 'Value cannot be negative'
-    ],
-    'checkboxes'           => ':attribute contains invalid options.',
-    'radio_buttons'        => ':attribute is invalid.',
+    'timezone' => 'The :attribute field must be a valid timezone.',
+    'unique' => 'The :attribute has already been taken.',
+    'uploaded' => 'The :attribute failed to upload.',
+    'uppercase' => 'The :attribute field must be uppercase.',
+    'url' => 'The :attribute field must be a valid URL.',
+    'ulid' => 'The :attribute field must be a valid ULID.',
+    'uuid' => 'The :attribute field must be a valid UUID.',
+    'fmcs_location' => 'Full multiple company support and location scoping is enabled in the Admin Settings, and the selected location and selected company are not compatible.',
 
 
     /*
@@ -120,16 +186,22 @@ return [
     |
     */
 
+    'email_array'      => 'One or more email addresses is invalid.',
+    'checkboxes'           => ':attribute contains invalid options.',
+    'radio_buttons'        => ':attribute is invalid.',
+    
     'custom' => [
         'alpha_space' => 'The :attribute field contains a character that is not allowed.',
-        'email_array'      => 'One or more email addresses is invalid.',
+
         'hashed_pass'      => 'Your current password is incorrect',
         'dumbpwd'          => 'Þetta lykilorð er of algengt.',
         'statuslabel_type' => 'You must select a valid status label type',
+        'custom_field_not_found'          => 'This field does not seem to exist, please double check your custom field names.',
+        'custom_field_not_found_on_model' => 'This field seems to exist, but is not available on this Asset Model\'s fieldset.',
 
         // date_format validation with slightly less stupid messages. It duplicates a lot, but it gets the job done :(
-        // We use this because the default error message for date_format is reflects php Y-m-d, which non-PHP
-        // people won't know how to format. 
+        // We use this because the default error message for date_format reflects php Y-m-d, which non-PHP
+        // people won't know how to format.
         'purchase_date.date_format'     => 'The :attribute must be a valid date in YYYY-MM-DD format',
         'last_audit_date.date_format'   =>  'The :attribute must be a valid date in YYYY-MM-DD hh:mm:ss format',
         'expiration_date.date_format'   =>  'The :attribute must be a valid date in YYYY-MM-DD format',
@@ -137,9 +209,15 @@ return [
         'expected_checkin.date_format'  =>  'The :attribute must be a valid date in YYYY-MM-DD format',
         'start_date.date_format'        =>  'The :attribute must be a valid date in YYYY-MM-DD format',
         'end_date.date_format'          =>  'The :attribute must be a valid date in YYYY-MM-DD format',
+        'invalid_value_in_field' => 'Invalid value included in this field',
 
-    ],
+        'ldap_username_field' => [
+            'not_in' =>         '<code>sAMAccountName</code> (mixed case) will likely not work. You should use <code>samaccountname</code> (lowercase) instead.'
+        ],
+        'ldap_auth_filter_query' => ['not_in' => '<code>uid=samaccountname</code> is probably not a valid auth filter. You probably want <code>uid=</code> '],
+        'ldap_filter' => ['regex' => 'This value should probably not be wrapped in parentheses.'],
 
+        ],
     /*
     |--------------------------------------------------------------------------
     | Custom Validation Attributes
@@ -155,8 +233,16 @@ return [
 
     /*
     |--------------------------------------------------------------------------
-    | Generic Validation Messages
+    | Generic Validation Messages - we use these in the jquery validation where we don't have
+    | access to the :attribute
     |--------------------------------------------------------------------------
     */
-    'invalid_value_in_field' => 'Invalid value included in this field',
+
+    'generic' => [
+        'invalid_value_in_field' => 'Invalid value included in this field',
+        'required' => 'This field is required',
+        'email' => 'Please enter a valid email address',
+    ],
+
+
 ];
diff --git a/resources/lang/it-IT/account/general.php b/resources/lang/it-IT/account/general.php
index 1260a5b7c4..042f73baf3 100644
--- a/resources/lang/it-IT/account/general.php
+++ b/resources/lang/it-IT/account/general.php
@@ -2,10 +2,16 @@
 
 return array(
     'personal_api_keys' => 'Chiavi API Personali',
+    'personal_access_token' => 'Token Di Accesso Personale',
+    'personal_api_keys_success' => 'Chiave API personale :key creata con successo',
+    'here_is_api_key' => 'Ecco il tuo nuovo token di accesso personale. Questa è l\'unica volta che ti verrà mostrato, quindi non perderlo! Ora puoi usare il token per fare richieste API.',
     'api_key_warning' => 'Quando si genera un token API, copialo immediatamente perché dopo non sarà più visibile.',
     'api_base_url' => 'Il tuo URL di base API è:',
     'api_base_url_endpoint' => '/&lt;endpoint&gt;',
     'api_token_expiration_time' => 'I token API scadranno fra:',
     'api_reference' => 'Controlla la <a href="https://snipe-it.readme.io/reference" target="_blank">Guida di Riferimento delle API</a> per trovare specifici endpoint API e documentazione aggiuntiva.',
     'profile_updated' => 'Account aggiornato con successo',
+    'no_tokens' => 'Non hai creato nessun token di accesso personale.',
+    'enable_sounds' => 'Attiva gli effetti sonori',
+    'enable_confetti' => 'Abilita effetti confetti',
 );
diff --git a/resources/lang/it-IT/admin/accessories/message.php b/resources/lang/it-IT/admin/accessories/message.php
index 9adb529708..a894b0f652 100644
--- a/resources/lang/it-IT/admin/accessories/message.php
+++ b/resources/lang/it-IT/admin/accessories/message.php
@@ -26,12 +26,16 @@ return array(
         'error'   		=> 'L\'accessorio non è stato assegnato, si prega di riprovare',
         'success' 		=> 'Accessorio assegnato correttamente.',
         'unavailable'   => 'Accessorio non disponibile per l\'assegnazione. Controlla la quantità disponibile',
-        'user_does_not_exist' => 'Questo utente non è valido. Riprova.'
+        'user_does_not_exist' => 'Questo utente non è valido. Riprova.',
+         'checkout_qty' => array(
+            'lte'  => 'Al momento c\'è solo un accessorio disponibile di questo tipo, ma si sta cercando di assegnarne :checkout_qty. Si prega di modificare la quantità da assegnare oppure la quantità totale in magazzino di questo accessorio e poi riprovare.|Ci sono :number_currently_remaining accessori disponibili in magazzino, ma si sta cercando di assegnarne :checkout_qty. Si prega di regolare la quantità da assegnare oppure la quantità totale in magazzino di questo accessorio e poi riprovare.',
+            ),
+           
     ),
 
     'checkin' => array(
-        'error'   		=> 'L\'accessorio non è stato riconsegnato corretamente, si prega di riprovare',
-        'success' 		=> 'Accessorio riconsegnato con successo.',
+        'error'   		=> 'L\'accessorio non è stato restituito correttamente, riprova',
+        'success' 		=> 'Accessorio restituito con successo.',
         'user_does_not_exist' => 'Questo utente non è valido. Riprova.'
     )
 
diff --git a/resources/lang/it-IT/admin/accessories/table.php b/resources/lang/it-IT/admin/accessories/table.php
index fb99733a1b..e198f7b5a8 100644
--- a/resources/lang/it-IT/admin/accessories/table.php
+++ b/resources/lang/it-IT/admin/accessories/table.php
@@ -6,6 +6,4 @@ return array(
     'id'      					=> 'ID',
     'require_acceptance'      	=> 'Accettazione',
     'title'      				=> 'Nome Accessorio',
-
-
 );
diff --git a/resources/lang/it-IT/admin/categories/general.php b/resources/lang/it-IT/admin/categories/general.php
index a564fe9970..53b0dca418 100644
--- a/resources/lang/it-IT/admin/categories/general.php
+++ b/resources/lang/it-IT/admin/categories/general.php
@@ -1,26 +1,25 @@
 <?php
 
 return array(
-    'asset_categories' 					=> 'Categorie dei Beni',
-    'category_name'  					=> 'Nome categoria',
-    'checkin_email'                     => 'Invia email all\'utente al ritiro / consegna.',
-    'checkin_email_notification'        => 'A questo utente verrà inviata un\'email al ritiro / consegna.',
+    'asset_categories' 					=> 'Categorie Beni',
+    'category_name'  					=> 'Nome Categoria',
+    'checkin_email'                     => 'Invia email all\'utente per la Restituzione o Assegnazione.',
+    'checkin_email_notification'        => 'A questo utente verrà inviata un\'email alla Restituzione o Assegnazione.',
     'clone'                             => 'Clona Categoria',
     'create'  							=> 'Crea Categoria',
     'edit'                              => 'Modifica Categoria',
-    'email_will_be_sent_due_to_global_eula' => 'Dato che la EULA globale è attivata, verrà inviata una mail all\'utente.',
+    'email_will_be_sent_due_to_global_eula' => 'Dato che viene usata la EULA globale, verrà inviata una email all\'utente.',
     'email_will_be_sent_due_to_category_eula' => 'Siccome è stata impostata una EULA per questa categoria, verrà inviata una mail all\'utente.',
-    'eula_text'							=> 'Categoria EULA',
-    'eula_text_help'					=> 'Questo campo consente di personalizzare le EULA per specifici tipi di beni. Se avete solo un EULA per tutti i vostri beni, è possibile selezionare la casella di seguito per utilizzare il valore predefinito.',
-    'name'                              => 'Nome della categoria',
-    'require_acceptance'				=> 'Richiedere agli utenti di confermare l\'accettazione di attività in questa categoria.',
-    'required_acceptance'				=> 'Verrà inviata un email  all\'utente con un link per confermare l\'accettazione di questo oggetto.',
-    'required_eula'						=> 'Verrà inviato all\'utente via email copia di questa EULA',
-    'no_default_eula'					=> 'Non è stata trovata EULA predefinita. Aggiungine un altra nei settaggi.',
+    'eula_text'							=> 'EULA della categoria',
+    'eula_text_help'					=> 'Questo campo consente di personalizzare gli EULA per specifici tipi di Beni. Se c\'è solo un EULA per tutti i vostri Beni, puoi spuntare la casella seguente per usarlo come predefinito.',
+    'name'                              => 'Nome Categoria',
+    'require_acceptance'				=> 'Richiedi che gli utenti confermino l\'accettazione di Beni di questa Categoria.',
+    'required_acceptance'				=> 'Verrà inviata un\'email all\'utente con un link per confermare l\'accettazione dell\'oggetto.',
+    'required_eula'						=> 'Verrà inviata all\'utente una copia di questa EULA via email',
+    'no_default_eula'					=> 'Non è stata trovata un\'EULA predefinita. Aggiungine una nelle impostazioni.',
     'update'  							=> 'Aggiorna Categoria',
-    'use_default_eula'					=> '
-Usa <a href="#" data-toggle="modal" data-target="#eulaModal">L\'EULA predefinita</a> invece.',
-    'use_default_eula_disabled'			=> '<del>Usa L\'EULA predefinita.</del> Nessuna EULA predefinita è in uso. Per favore aggiungine una nei Settaggi.',
-    'use_default_eula_column'			=> 'Utilizza EULA predefinita',
+    'use_default_eula'					=> 'Usa <a href="#" data-toggle="modal" data-target="#eulaModal">l\'EULA predefinita</a> invece.',
+    'use_default_eula_disabled'			=> '<del>Usa l\'EULA predefinita.</del> Nessuna EULA predefinita in uso. Per favore aggiungine una nelle Impostazioni.',
+    'use_default_eula_column'			=> 'Usa l\'EULA predefinita',
 
 );
diff --git a/resources/lang/it-IT/admin/categories/message.php b/resources/lang/it-IT/admin/categories/message.php
index e999e3297a..b487e51854 100644
--- a/resources/lang/it-IT/admin/categories/message.php
+++ b/resources/lang/it-IT/admin/categories/message.php
@@ -3,8 +3,8 @@
 return array(
 
     'does_not_exist' => 'La categoria non esiste.',
-    'assoc_models'	 => 'Questa categoria è attualmente associata ad almeno un modello pertanto non può essere eliminata. Aggiorna i tuoi modelli e riprova. ',
-    'assoc_items'	 => 'Questa categoria è attualmente associata ad almeno un :asset_type pertanto non può essere eliminata. Aggiorna il tuo :asset_type e riprova. ',
+    'assoc_models'	 => 'La categoria è già associata ad almeno un modello, pertanto non può essere eliminata. Aggiorna i modelli in modo che non si riferiscano alla categoria e riprova. ',
+    'assoc_items'	 => 'Questa Categoria al momento è associata ad almeno un :asset_type perciò non può essere eliminata. Aggiorna il tuo :asset_type in modo che non si riferisca più alla Categoria e riprova. ',
 
     'create' => array(
         'error'   => 'La categoria non è stata creata, si prega di riprovare.',
@@ -14,12 +14,12 @@ return array(
     'update' => array(
         'error'   => 'La categoria non è stata aggiornata, si prega di riprovare',
         'success' => 'Categoria aggiornata con successo.',
-        'cannot_change_category_type'   => 'Non puoi cambiare il tipo di categoria una volta creata',
+        'cannot_change_category_type'   => 'Una volta creata una Categoria non puoi cambiarne il Tipo',
     ),
 
     'delete' => array(
-        'confirm'   => 'Sei sicuro di voler cancellare questa categoria?',
-        'error'   => 'Si è verificato un problema cercando di eliminare la categoria. Riprova.',
+        'confirm'   => 'Sicuro di voler eliminare questa Categoria?',
+        'error'   => 'C\'è stato un problema eliminando la Categoria. Riprova.',
         'success' => 'La categoria è stata eliminata con successo.'
     )
 
diff --git a/resources/lang/it-IT/admin/categories/table.php b/resources/lang/it-IT/admin/categories/table.php
index 632694e6be..44c07c7522 100644
--- a/resources/lang/it-IT/admin/categories/table.php
+++ b/resources/lang/it-IT/admin/categories/table.php
@@ -3,7 +3,7 @@
 return array(
 	'eula_text'      			=> 'EULA',
     'id'      					=> 'ID',
-    'parent'   					=> 'Padre',
+    'parent'   					=> 'Parte di',
     'require_acceptance'      	=> 'Accettazione',
     'title'      				=> 'Nome Categoria Bene',
 
diff --git a/resources/lang/it-IT/admin/components/general.php b/resources/lang/it-IT/admin/components/general.php
index d484343515..816e6c62dd 100644
--- a/resources/lang/it-IT/admin/components/general.php
+++ b/resources/lang/it-IT/admin/components/general.php
@@ -2,8 +2,8 @@
 
 return array(
     'component_name'                  => 'Nome Componente',
-    'checkin'                             => 'Checkin Componente',
-    'checkout'                             => 'Checkout Componente',
+    'checkin'                             => 'Restituzione Componente',
+    'checkout'                             => 'Assegna Componente',
     'cost'				=> 'Prezzo d\'acquisto',
     'create'                             => 'Crea Componente',
     'edit'                             => 'Modifica Componente',
@@ -12,5 +12,5 @@ return array(
     'remaining' 			             => 'Rimanenti',
     'total' 			                 => 'Totale',
     'update'                            => 'Aggiorna Componente',
-    'checkin_limit'            => 'La quantità in ingresso deve essere uguale o inferiore di :assigned_qty'
+    'checkin_limit'            => 'La quantità restituita deve essere uguale o inferiore a :assigned_qty'
 );
diff --git a/resources/lang/it-IT/admin/components/message.php b/resources/lang/it-IT/admin/components/message.php
index 03b9fabd29..d96f7e7caf 100644
--- a/resources/lang/it-IT/admin/components/message.php
+++ b/resources/lang/it-IT/admin/components/message.php
@@ -17,19 +17,20 @@ return array(
     'delete' => array(
         'confirm'   => 'Sei sicuro di voler eliminare questo Componente?',
         'error'   => 'Si è verificato un problema durante l\'eliminazione del componente. Riprova.',
-        'success' => 'Il componente è stato eliminato correttamente.'
+        'success' => 'Il componente è stato eliminato correttamente.',
+        'error_qty'   => 'Alcuni componenti di questo tipo sono ancora assegnati. Effettuane la Restituzione e riprova.',
     ),
 
      'checkout' => array(
-        'error'   		=> 'Il Componente non è stato controllato, si prega di riprovare',
-        'success' 		=> 'Componente controllato con successo.',
+        'error'   		=> 'Il Componente non è stato assegnato, si prega di riprovare',
+        'success' 		=> 'Componente assegnato con successo.',
         'user_does_not_exist' => 'Questo utente non è valido. Riprova.',
-        'unavailable'      => 'Non ci sono abbastanza componenti: rimangono :remaining , servono :requested ',
+        'unavailable'      => 'Non ci sono abbastanza componenti: ne rimangono :remaining , ne servono :requested ',
     ),
 
     'checkin' => array(
-        'error'   		=> 'Il Componente non è stato controllato, si prega di riprovare',
-        'success' 		=> 'Componente controllato con successo.',
+        'error'   		=> 'Componente non restituito, riprova',
+        'success' 		=> 'Componente restituito con successo.',
         'user_does_not_exist' => 'Questo utente non è valido. Riprova.'
     )
 
diff --git a/resources/lang/it-IT/admin/consumables/general.php b/resources/lang/it-IT/admin/consumables/general.php
index 3f3a766459..643ff0be84 100644
--- a/resources/lang/it-IT/admin/consumables/general.php
+++ b/resources/lang/it-IT/admin/consumables/general.php
@@ -1,11 +1,12 @@
 <?php
 
 return array(
-    'checkout'                          => 'Checkout Consumabile all\'utente',
+    'checkout'                          => 'Assegna Consumabile all\'utente',
     'consumable_name'                   => 'Nome Consumabile',
     'create'                            => 'Crea Consumabile',
     'item_no'                           => 'Oggetto numero.',
     'remaining' 			            => 'Rimanenti',
     'total' 			                => 'Totale',
     'update'                            => 'Aggiorna Consumabile',
+    'inventory_warning'                 => 'L\'inventario di questo consumabile è inferiore alla quantità minima di :min_count',
 );
diff --git a/resources/lang/it-IT/admin/consumables/message.php b/resources/lang/it-IT/admin/consumables/message.php
index 4421da54a0..67fa085a6a 100644
--- a/resources/lang/it-IT/admin/consumables/message.php
+++ b/resources/lang/it-IT/admin/consumables/message.php
@@ -2,6 +2,7 @@
 
 return array(
 
+    'invalid_category_type' => 'La categoria deve essere consumabile.',
     'does_not_exist' => 'Il consumabile non esiste.',
 
     'create' => array(
@@ -21,15 +22,15 @@ return array(
     ),
 
      'checkout' => array(
-        'error'   		=> 'Il consumabile non è stato controllato, prova di nuovo',
-        'success' 		=> 'Il consumabile è stato controllato con successo.',
+        'error'   		=> 'Il Consumabile non è stato assegnato, prova di nuovo',
+        'success' 		=> 'Il Consumabile è stato assegnato con successo.',
         'user_does_not_exist' => 'Questo utente non è valido. Riprova.',
-         'unavailable'      => 'Non ci sono abbastanza consumabili per questo check-out. Controlla la quantità rimasta. ',
+         'unavailable'      => 'Non ci sono abbastanza consumabili per questa assegnazione. Controlla la quantità rimasta. ',
     ),
 
     'checkin' => array(
-        'error'   		=> 'Il consumabile non è stato controllato, prova di nuovo',
-        'success' 		=> 'Il consumabile è stato controllato con successo.',
+        'error'   		=> 'Il consumabile non è stato restituito, riprova',
+        'success' 		=> 'Consumabile restituito con successo.',
         'user_does_not_exist' => 'Questo utente non è valido. Riprova.'
     )
 
diff --git a/resources/lang/it-IT/admin/custom_fields/general.php b/resources/lang/it-IT/admin/custom_fields/general.php
index 598f0ae6ff..cc3503d51b 100644
--- a/resources/lang/it-IT/admin/custom_fields/general.php
+++ b/resources/lang/it-IT/admin/custom_fields/general.php
@@ -5,7 +5,7 @@ return [
     'manage'                    => 'Gestire',
     'field'		                => 'Campo',
     'about_fieldsets_title'		=> 'Fileldsets',
-    'about_fieldsets_text'		=> 'I set di campi consentono di creare gruppi di campi personalizzati che vengono spesso riutilizzati per tipi di modelli di asset specifici.',
+    'about_fieldsets_text'		=> 'I set di campi consentono di creare gruppi di campi personalizzati che vengono spesso riutilizzati per modelli di beni specifici.',
     'custom_format'             => 'Formato Regex personalizzato...',
     'encrypt_field'      	        => 'Crittografare il valore di questo campo nel database',
     'encrypt_field_help'      => 'ATTENZIONE: Se il campo viene crittografato non sarà possibile cercarlo.',
@@ -35,7 +35,7 @@ return [
     'create_field_title' => 'Crea un nuovo campo personalizzato',
     'value_encrypted'      	        => 'Il valore di questo campo viene crittografato nel database. Solo gli utenti amministratori saranno in grado di visualizzare il valore decrittografato',
     'show_in_email'     => 'Includere il valore di questo campo nelle e-mail di assegnazione inviate all\'utente? I campi crittografati non possono essere inclusi nelle e-mail',
-    'show_in_email_short'     => 'Includi nelle email.',
+    'show_in_email_short' => 'Includi nelle email',
     'help_text' => 'Testo guida',
     'help_text_description' => 'Questo è un testo facoltativo che apparirà sotto gli elementi del modulo durante la modifica di una risorsa per fornire il contesto sul campo.',
     'about_custom_fields_title' => 'Informazioni sui campi personalizzati',
@@ -57,5 +57,8 @@ return [
     'show_in_requestable_list_short' => 'Mostra nella lista beni richiedibili',
     'show_in_requestable_list' => 'Mostra nella lista dei beni richiedibili. I valori criptati non verranno mostrati',
     'encrypted_options' => 'Questo campo è criptato, quindi alcune opzioni di visualizzazione non saranno disponibili.',
+    'display_checkin' => 'Mostra nei moduli di check-in',
+    'display_checkout' => 'Mostra nei moduli di assegnazione',
+    'display_audit' => 'Mostra nei moduli di revisione',
 
 ];
diff --git a/resources/lang/it-IT/admin/custom_fields/message.php b/resources/lang/it-IT/admin/custom_fields/message.php
index 0c0ccc2808..3b36100943 100644
--- a/resources/lang/it-IT/admin/custom_fields/message.php
+++ b/resources/lang/it-IT/admin/custom_fields/message.php
@@ -5,6 +5,7 @@ return array(
     'field' => array(
         'invalid'   => 'Il campo non esiste.',
         'already_added'   => 'Campo già aggiunto',
+        'none_selected'   => 'Nessun campo selezionato',
 
         'create' => array(
             'error'   => 'Campo non creato, riprova.',
diff --git a/resources/lang/it-IT/admin/departments/message.php b/resources/lang/it-IT/admin/departments/message.php
index 81d1a84b45..414bba9e05 100644
--- a/resources/lang/it-IT/admin/departments/message.php
+++ b/resources/lang/it-IT/admin/departments/message.php
@@ -3,7 +3,7 @@
 return array(
 
     'does_not_exist' => 'Il dipartimento non esiste.',
-    'department_already_exists' => 'Esiste già un dipartimento con quel nome in questa sede aziendale. Oppure, scegli un nome più specifico per questo reparto. ',
+    'department_already_exists' => 'C\'è già un reparto con quel nome in questa Sede aziendale. Al limite scegli un nome più specifico per questo reparto. ',
     'assoc_users'	 => 'Questo reparto è attualmente associato a almeno un utente e non può essere eliminato. Aggiorna i tuoi utenti per non fare più riferimento a questo reparto e riprovare.',
     'create' => array(
         'error'   => 'Il reparto non è stato creato, riprova.',
diff --git a/resources/lang/it-IT/admin/departments/table.php b/resources/lang/it-IT/admin/departments/table.php
index 49deac78fc..675ecf0d49 100644
--- a/resources/lang/it-IT/admin/departments/table.php
+++ b/resources/lang/it-IT/admin/departments/table.php
@@ -5,7 +5,7 @@ return array(
     'id'                        => 'ID',
     'name'                      => 'Nome Dipartimento',
     'manager'                   => 'Manager',
-    'location'                  => 'luogo',
+    'location'                  => 'Sede',
     'create'                    => 'Crea reparto',
     'update'                    => 'Reparto aggiornamento',
     );
diff --git a/resources/lang/it-IT/admin/depreciations/general.php b/resources/lang/it-IT/admin/depreciations/general.php
index b1e9e9ef81..8dfb1fb42e 100644
--- a/resources/lang/it-IT/admin/depreciations/general.php
+++ b/resources/lang/it-IT/admin/depreciations/general.php
@@ -13,4 +13,8 @@ return [
     'no_depreciations_warning'               => '<strong>Attenzione: </strong>
                       Nessun deprezzamento impostato.
                       Si prega di impostare almeno un deprezzamento per visualizzarne il report.',
+    'depreciation_method'                   => 'Report Deprezzamento',
+    'linear_depreciation'                   => 'Lineare (default)',
+    'half_1'                                => 'Convenzione semestrale, sempre applicata',
+    'half_2'                                => 'Convenzione semestrale, applicata con condizione',
 ];
diff --git a/resources/lang/it-IT/admin/depreciations/message.php b/resources/lang/it-IT/admin/depreciations/message.php
index 9fcaaf69b8..10207cadf7 100644
--- a/resources/lang/it-IT/admin/depreciations/message.php
+++ b/resources/lang/it-IT/admin/depreciations/message.php
@@ -3,23 +3,23 @@
 return array(
 
     'does_not_exist' => 'La classe di deprezzamento non esiste.',
-    'assoc_users'	 => 'Questo deprezzamento è associato con una o più modelli e non può essere cancellato. Prima toglilo dai modelli correlati e poi riprova a cancellarlo. ',
+    'assoc_users'	 => 'Questo deprezzamento è associato con uno o più modelli e non può essere cancellato. Prima toglilo dai modelli e poi riprova a cancellarlo. ',
 
 
     'create' => array(
-        'error'   => 'La classe di deprezzamento non è stata creata, riprova per favore. :(',
-        'success' => 'Il deprezzamento è stato creato correttamente. :)'
+        'error'   => 'La classe di deprezzamento non è stata creata, riprova. :(',
+        'success' => 'Classe si deprezzamento creata correttamente. :)'
     ),
 
     'update' => array(
-        'error'   => 'La classe di deprezzamento non è stata aggiornata, per favore riprova',
-        'success' => 'La classe di deprezzamento è stata aggiornata correttamente.'
+        'error'   => 'La classe di deprezzamento non è stata aggiornata, riprova',
+        'success' => 'Classe di deprezzamento aggiornata correttamente.'
     ),
 
     'delete' => array(
         'confirm'   => 'Sei sicuro di voler cancellare la classe di deprezzamento?',
-        'error'   => 'C\'è stato un problema durante la cancellazione della classe. Per favore riprova.',
-        'success' => 'La classe di deprezzamento è stata cancellata con successo.'
+        'error'   => 'C\'è stato un problema nel cancellare la classe di deprezzamento. Riprova.',
+        'success' => 'La classe di deprezzamento è stata cancellata.'
     )
 
 );
diff --git a/resources/lang/it-IT/admin/hardware/form.php b/resources/lang/it-IT/admin/hardware/form.php
index 4a8b774a0c..ffd66f8dea 100644
--- a/resources/lang/it-IT/admin/hardware/form.php
+++ b/resources/lang/it-IT/admin/hardware/form.php
@@ -1,40 +1,40 @@
 <?php
 
 return [
-    'bulk_delete'		=> 'Confermi elementi di eliminazione di massa',
-    'bulk_restore'      => 'Conferma ripristino beni massivo', 
-  'bulk_delete_help'	=> 'Rivedi gli assets sottostanti per la cancellazione massiva. Una volta cancellati, questi assets potranno essere ripristinati, ma non saranno più associati ad alcun utente cui siano attualmente assegnati.',
+    'bulk_delete'		=> 'Conferma Eliminazione Massiva di Beni',
+    'bulk_restore'      => 'Conferma Ripristino Massivo di Beni', 
+  'bulk_delete_help'	=> 'Controlla i Beni scelti per l\'eliminazione massiva. Una volta eliminati, i Beni potranno essere ripristinati, ma non saranno più associati agli utenti a cui sono assegnati ora.',
   'bulk_restore_help'	=> 'Esamina i beni da ripristinare qui sotto. Una volta recuperati, i beni non verranno riassegnati agli utenti a cui erano precedentemente assegnati.',
   'bulk_delete_warn'	=> 'Stai per cancellare :asset_count assets.',
   'bulk_restore_warn'	=> 'Stai per ripristinare :asset_count beni.',
-    'bulk_update'		=> 'Aggiornamento quantità beni',
-    'bulk_update_help'	=> 'Questo modulo consente di aggiornare più risorse in una sola volta. Riempire solo i campi che è necessario cambiare. Tutti i campi lasciati vuoti rimarranno invariati. ',
-    'bulk_update_warn'	=> 'Stai per modificare le proprietà di un singolo asset.<unk> Stai per modificare le proprietà di :asset_count asset.',
+    'bulk_update'		=> 'Aggiornamento Massivo Beni',
+    'bulk_update_help'	=> 'Questo modulo consente di aggiornare più beni alla volta. Riempi solo i campi da cambiare. Tutti i campi lasciati vuoti rimarranno invariati. ',
+    'bulk_update_warn'	=> 'Stai per modificare le proprietà di un bene.|Stai per modificare le proprietà di :asset_count beni.',
     'bulk_update_with_custom_field' => 'Nota che i beni sono di :asset_model_count modelli differenti.',
     'bulk_update_model_prefix' => 'Sui Modelli', 
     'bulk_update_custom_field_unique' => 'Questo è un campo unico e non può essere modificato massivamente.',
     'checkedout_to'		=> 'Assegnato a',
-    'checkout_date'		=> 'Data del check-out',
-    'checkin_date'		=> 'Data di entrata',
+    'checkout_date'		=> 'Data di Assegnazione',
+    'checkin_date'		=> 'Data Restituzione',
     'checkout_to'		=> 'Assegnare a',
-    'cost'				=> 'Costo acquisto',
-    'create'			=> 'Creare bene',
-    'date'				=> 'Data di acquisto',
-    'depreciation'	    => 'Ammortamento',
+    'cost'				=> 'Costo Acquisto',
+    'create'			=> 'Crea Bene',
+    'date'				=> 'Data Acquisto',
+    'depreciation'	    => 'Deprezzamento',
     'depreciates_on'	=> 'Deprezza Si',
-    'default_location'	=> 'Posizione predefinita',
-    'default_location_phone' => 'Telefono Posizione Predefinita',
+    'default_location'	=> 'Sede predefinita',
+    'default_location_phone' => 'Telefono Sede Predefinita',
     'eol_date'			=> 'Data EOL',
-    'eol_rate'			=> 'Tasso EOL',
-    'expected_checkin'  => 'Richiesta Data di entrata',
+    'eol_rate'			=> 'EOL tra:',
+    'expected_checkin'  => 'Restituzione Prevista il',
     'expires'			=> 'Scade',
-    'fully_depreciated'	=> 'Completamente ammortizzato',
-    'help_checkout'		=> 'Se vuoi assegnare questo prodotto immediatamente, seleziona "Pronto alla spedizione" dalla barra di stato qui sopra. ',
+    'fully_depreciated'	=> 'Pienamente Deprezzato',
+    'help_checkout'		=> 'Se vuoi assegnare questo Bene subito, scegli "Pronto per Assegnazione" dall\'elenco stati qui sopra. ',
     'mac_address'		=> 'MAC Address',
     'manufacturer'		=> 'Produttore',
     'model'				=> 'Modello',
     'months'			=> 'mesi',
-    'name'				=> 'Nome bene',
+    'name'				=> 'Nome Bene',
     'notes'				=> 'Note',
     'order'				=> 'Numero Ordine',
     'qr'				=> 'QR Code',
@@ -45,18 +45,21 @@ return [
     'select_statustype'	=> 'Selezionare il tipo di stato',
     'serial'			=> 'Seriale',
     'status'			=> 'Stato',
-    'tag'				=> 'Etichetta bene',
-    'update'			=> 'Aggiornamento bene',
+    'tag'				=> 'Etichetta Bene',
+    'update'			=> 'Aggiorna Bene',
     'warranty'			=> 'Garanzia',
-        'warranty_expires'		=> 'Scadenza della garanzia',
+        'warranty_expires'		=> 'Scadenza Garanzia',
     'years'				=> 'anni',
-    'asset_location' => 'Aggiorna Posizione Bene',
-    'asset_location_update_default_current' => 'Aggiorna sia la posizione predefinita che quella attuale',
-    'asset_location_update_default' => 'Aggiorna solo la posizione predefinita',
-    'asset_location_update_actual' => 'Aggiorna solo la posizione effettiva',
-    'asset_not_deployable' => 'Lo stato del bene è "Non Assegnabile". Non puoi fare il check-out di questo bene.',
-    'asset_deployable' => 'Lo stato del bene è "Assegnabile". Puoi fare il check-out di questo bene.',
+    'asset_location' => 'Aggiorna Sede del Bene',
+    'asset_location_update_default_current' => 'Aggiorna la Sede predefinita E quella attuale',
+    'asset_location_update_default' => 'Aggiorna solo la Sede predefinita',
+    'asset_location_update_actual' => 'Aggiorna solo la Sede effettiva',
+    'asset_not_deployable' => 'Lo stato del bene è "Non Assegnabile". Non puoi fare l\'assegnazione di questo Bene.',
+    'asset_not_deployable_checkin' => 'Questo stato è "Non Assegnabile". Usando questo stato, verrà effettuata la restituzione del Bene.',
+    'asset_deployable' => 'Questo bene può essere assegnato.',
     'processing_spinner' => 'Elaborazione... (Può volerci un po\' su file di grandi dimensioni)',
+    'processing' => 'Elaborazione... ',
     'optional_infos'  => 'Informazioni Opzionali',
-    'order_details'   => 'Informazioni relative all\'ordine'
+    'order_details'   => 'Informazioni relative all\'ordine',
+    'calc_eol'    => 'Se viene annullata la data di EOL, usa il calcolo automatico in base alla data d\'acquisto e al tasso di EOL.',
 ];
diff --git a/resources/lang/it-IT/admin/hardware/general.php b/resources/lang/it-IT/admin/hardware/general.php
index e0f5220953..98cab3d796 100644
--- a/resources/lang/it-IT/admin/hardware/general.php
+++ b/resources/lang/it-IT/admin/hardware/general.php
@@ -4,12 +4,12 @@ return [
     'about_assets_title'           => 'Informazioni sugli asset',
     'about_assets_text'            => 'Gli asset sono elementi tracciati con il numero di serie o il tag di asset. Tendono ad essere oggetti di valore più elevato dove identificare un elemento specifico.',
     'archived'  				=> 'Archiviato',
-    'asset'  					=> 'Asset',
-    'bulk_checkout'             => 'Ritiro Asset',
-    'bulk_checkin'              => 'Check-in Bene',
-    'checkin'  					=> 'Ingresso Asset',
-    'checkout'  				=> 'Asset Checkout',
-    'clone'  					=> 'Copia Asset',
+    'asset'  					=> 'Bene',
+    'bulk_checkout'             => 'Assegnazione Massiva',
+    'bulk_checkin'              => 'Check-in massivo',
+    'checkin'  					=> 'Restituzione Bene',
+    'checkout'  				=> 'Assegnazione Bene',
+    'clone'  					=> 'Copia Bene',
     'deployable'  				=> 'Assegnabile',
     'deleted'  					=> 'Questo bene è stato eliminato.',
     'delete_confirm'            => 'Sei sicuro di voler eliminare questo bene?',
@@ -27,8 +27,8 @@ return [
     'undeployable_tooltip'  	=> 'Questo bene ha una etichetta che lo rende non distribuibile, il check-out non può avvenire.',
     'view'  					=> 'Vedi Asset',
     'csv_error' => 'C\'è un errore nel file CSV:',
-    'import_text' => '<p>Carica un CSV che contiene la cronologia degli asset. Gli asset e gli utenti DEVONO già esistere nel sistema, o saranno saltati. Le risorse corrispondenti per l\'importazione della cronologia si verificano con il tag dell\'asset. Cercheremo di trovare un utente corrispondente in base al nome dell\'utente che fornisci e ai criteri selezionati qui sotto. Se non si seleziona alcun criterio qui sotto, proverà semplicemente a corrispondere al formato del nome utente che hai configurato in <code>Admin &gt; Impostazioni Generali</code>.</p><p>I campi inclusi nel CSV devono corrispondere alle intestazioni: <strong>Asset Tag, Nome, Data di Checkout, Data di Checkin</strong>. Eventuali campi aggiuntivi verranno ignorati. </p><p>Data di Checkin: le date di check in vuote o future assegneranno gli elementi all\'utente associato. Esclusa la colonna Data di controllo creerà una data di check-in con la data di oggi.</p>
-    ',
+    'import_text' => '<p>Carica un CSV con la cronologia dei beni. I beni e gli utenti DEVONO già esistere nel sistema, o saranno saltati. L\'importazione della cronologia avviene cercando la corrispondenza con il tag (etichetta) del bene. Proveremo a trovare un utente corrispondente in base al nome utente che fornisci e ai criteri selezionati qui sotto. Se non si seleziona alcun criterio qui sotto, verrà cercata la corrispondenza al formato del nome utente configurato in <code>Admin &gt; Impostazioni Generali</code>.</p><p>I campi inclusi nel CSV devono avere intestazioni: <strong>Asset Tag, Name, Checkout Date, Checkin Date</strong>. Eventuali campi aggiuntivi verranno ignorati. </p><p>Checkin Date: le date di restituzione vuote o future assegneranno gli elementi all\'utente associato. Escludendo la colonna Checkin Date verrà creata una data di restituzione ad oggi.</p>
+    </p>    ',
     'csv_import_match_f-l' => 'Prova ad abbinare gli utenti con il formato <strong>firstname.lastname</strong> (<code>jane.smith</code>)',
     'csv_import_match_initial_last' => 'Prova ad abbinare gli utenti con il formato <strong>primo cognome</strong> (<code>jsmith</code>)',
     'csv_import_match_first' => 'Prova ad abbinare gli utenti con il formato <strong>nome</strong> (<code>jane</code>)',
diff --git a/resources/lang/it-IT/admin/hardware/message.php b/resources/lang/it-IT/admin/hardware/message.php
index 2c22d66c1b..42c84feb21 100644
--- a/resources/lang/it-IT/admin/hardware/message.php
+++ b/resources/lang/it-IT/admin/hardware/message.php
@@ -2,19 +2,23 @@
 
 return [
 
-    'undeployable' 		=> '<strong>Attenzione: </strong> Questo asset è stato marcato come non distribuibile.
-                       Se lo stato è cambiato,aggiorna lo stato dell\'asset.',
-    'does_not_exist' 	=> 'Questo Asset non esiste.',
-    'does_not_exist_var'=> 'Bene con tag :asset_tag non trovato.',
-    'no_tag' 	        => 'Nessun tag del Bene è stato fornito.',
+    'undeployable' 		 => '<strong>Attenzione: </strong> Questo Bene è stato marcato come non distribuibile. Se lo stato del Bene è cambiato si prega di aggiornarlo.',
+    'does_not_exist' 	 => 'Questo Asset non esiste.',
+    'does_not_exist_var' => 'Bene con tag :asset_tag non trovato.',
+    'no_tag' 	         => 'Nessun tag del Bene è stato fornito.',
     'does_not_exist_or_not_requestable' => 'Questo bene non esiste o non è disponibile.',
-    'assoc_users'	 	=> 'Questo asset è stato assegnato ad un Utente e non può essere cancellato. Per favore Riassegnalo in magazzino,e dopo riprova a cancellarlo.',
+    'assoc_users'	 	 => 'Questo asset è stato assegnato ad un Utente e non può essere cancellato. Per favore Riassegnalo in magazzino,e dopo riprova a cancellarlo.',
     'warning_audit_date_mismatch' 	=> 'La prossima data d\'inventario di questo Bene (:next_audit_date) precede l\'ultima data d\'inventario (:last_audit_date). Si prega di aggiornare la prossima data d\'inventario.',
+    'labels_generated'   => 'Etichette generate con successo.',
+    'error_generating_labels' => 'Errore durante la generazione delle etichette.',
+    'no_assets_selected' => 'Nessun Bene selezionato.',
 
     'create' => [
         'error'   		=> 'L\'asset non è stato creato, riprova per favore. :(',
         'success' 		=> 'L\'asset è stato creato con successo. :)',
         'success_linked' => 'Bene creato con tag :tag . <strong><a href=":link" style="color: white;">Clicca per vedere</a></strong>.',
+        'multi_success_linked' => 'Il bene con tag :links è stato creato con successo.|:count beni sono stati creati con successo. :links.',
+        'partial_failure' => 'Non è stato possibile creare un bene. Motivo: :failures|Non è stato possibile creare :count beni. Motivi: :failures',
     ],
 
     'update' => [
@@ -52,44 +56,54 @@ return [
     ],
 
     'import' => [
+        'import_button'         => 'Importa Processo',
         'error'                 => 'Alcuni elementi non sono stati importati correttamente.',
         'errorDetail'           => 'Gli articoli seguenti non sono stati importati correttamente a causa di errori.',
         'success'               => 'Il file è stato importato con successo',
         'file_delete_success'   => 'Il file è stato cancellato con successo',
         'file_delete_error'      => 'Impossibile eliminare il file',
         'file_missing' => 'File selezionato mancante',
+        'file_already_deleted' => 'Il file selezionato è già stato eliminato',
         'header_row_has_malformed_characters' => 'Uno o più attributi nella riga d\'intestazione contengono caratteri UTF-8 malformati',
         'content_row_has_malformed_characters' => 'Uno o più attributi nella prima riga del contenuto contengono caratteri UTF-8 malformati',
+        'transliterate_failure' => 'Traslitterazione da :encoding a UTF-8 non riuscita a causa di caratteri non validi nell\'input'
     ],
 
 
     'delete' => [
         'confirm'   	=> 'Sei sicuro di voler eliminare questo bene?',
         'error'   		=> 'C\'è stato un problema durante la cancellazione del bene. Riprova per favore.',
+        'assigned_to_error' => '{1}Il tag: :asset_tag è assegnato. Effettua il check in del dispositivo prima di cancellarlo.|[2,*] :asset_tag sono assegnati. Effettua il check-in dei dispositivi prima di cancellarli.',
         'nothing_updated'   => 'Nessun patrimonio è stato selezionato, quindi niente è stato eliminato.',
         'success' 		=> 'Il bene è stato eliminato con successo.',
     ],
 
     'checkout' => [
-        'error'   		=> 'Il bene non è stato estratto, per favore riprova',
-        'success' 		=> 'Il bene è stato estratto con successo.',
+        'error'   		=> 'Il bene non è stato assegnato, per favore riprova',
+        'success' 		=> 'Il bene è stato assegnato con successo.',
         'user_does_not_exist' => 'Questo utente non è valido. Riprova.',
-        'not_available' => 'Questo prodotto non è disponibile per il checkout!',
-        'no_assets_selected' => 'È necessario selezionare almeno una risorsa dall\'elenco',
+        'not_available' => 'Questo Bene non è disponibile per l\'assegnazione!',
+        'no_assets_selected' => 'Devi selezionare almeno un Bene dall\'elenco',
+    ],
+
+    'multi-checkout' => [
+        'error'   => 'L\'assegnazione non è andata a buon fine, riprova|Le assegnazioni non sono andate a buon fine, riprova',
+        'success' => 'Bene assegnato correttamente.|Beni assegnati correttamente.',
     ],
 
     'checkin' => [
-        'error'   		=> 'Il bene non è stato registrato, per favore riprova',
-        'success' 		=> 'Il bene è stato registrato con successo.',
+        'error'   		=> 'Il Bene non è stato restituito, riprova',
+        'success' 		=> 'Bene restituito con successo.',
         'user_does_not_exist' => 'Questo utente non è valido. Riprova.',
         'already_checked_in'  => 'Il prodotto è già rientrato.',
 
     ],
 
     'requests' => [
-        'error'   		=> 'L\'asset non è stato richiesto, si prega di riprovare',
-        'success' 		=> 'Asset richiesto con successo.',
-        'canceled'      => 'Richiesta di checkout cancellata con successo',
+        'error'   		=> 'Richiesta non riuscita, riprova.',
+        'success' 		=> 'Richiesta inviata con successo.',
+        'canceled'      => 'Richiesta annullata con successo.',
+        'cancel'        => 'Annulla questa richiesta',
     ],
 
 ];
diff --git a/resources/lang/it-IT/admin/hardware/table.php b/resources/lang/it-IT/admin/hardware/table.php
index c0d0401e67..d598fa480f 100644
--- a/resources/lang/it-IT/admin/hardware/table.php
+++ b/resources/lang/it-IT/admin/hardware/table.php
@@ -2,30 +2,29 @@
 
 return [
 
-    'asset_tag'   	=> 'Etichetta bene',
+    'asset_tag'   	=> 'Etichetta Bene',
     'asset_model'       => 'Modello',
     'assigned_to'   => 'Assegnato a',
     'book_value'  	=> 'Valore Attuale',
     'change' 		=> 'Dentro/Fuori',
-    'checkout_date' => 'Data di estrazione',
-    'checkoutto' 	=> 'Estratto',
+    'checkout_date' => 'Data di Assegnazione',
+    'checkoutto' 	=> 'Assegnato',
     'components_cost' => 'Costo Totale Componenti',
     'current_value' => 'Valore Attuale',
     'diff' 			=> 'Differenza',
     'dl_csv' 		=> 'Scarica CSV',
     'eol' 			=> 'EOL',
     'id'      		=> 'ID',
-    'last_checkin_date' => 'Ultima data check-in',
-    'location' 		=> 'Posizione',
+    'last_checkin_date' => 'Ultima Restituzione',
+    'location' 		=> 'Sede',
     'purchase_cost'	=> 'Costo',
-    'purchase_date'	=> 'Acquistati',
+    'purchase_date'	=> 'Acquistato il',
     'serial'   		=> 'Seriale',
     'status'   		=> 'Stato',
     'title'      	=> 'Bene ',
-    'image'		    => 'Immagine dispositivo',
-    'days_without_acceptance' => 'Giorni senza accettazione',
-    'monthly_depreciation' => 'Ammortamento Mensile',
-    'assigned_to'    => 'Assegnato a',
+    'image'		    => 'Immagine',
+    'days_without_acceptance' => 'Giorni Senza Accettazione',
+    'monthly_depreciation' => 'Deprezzamento Mensile',
     'requesting_user' => 'Richiesto Da',
     'requested_date' => 'Data richiesta',
     'changed'       => 'Cambiato',
diff --git a/resources/lang/it-IT/admin/kits/general.php b/resources/lang/it-IT/admin/kits/general.php
index 63b0eb9369..858cb14f52 100644
--- a/resources/lang/it-IT/admin/kits/general.php
+++ b/resources/lang/it-IT/admin/kits/general.php
@@ -9,10 +9,10 @@ return [
     'update'                            => 'Aggiorna Kit Predefinito',
     'delete_success'                    => 'Il kit è stati eliminato correttamente.',
     'update_success'                    => 'Il kit è stato aggiornato correttamente.',
-    'none_models'                       => 'Non ci sono abbastanza assets disponibili da assegnare per :model. Ulteriori :qty sono richiesti. ',
-    'none_licenses'                     => 'Non ci sono abbastanza licenze disponibili da assegnare per :license. Ulteriori :qty sono richieste. ',
-    'none_consumables'                  => 'Non ci sono abbastanza consumabili disponibili da assegnare per :consumable. Ulteriori :qty sono richiesti. ',
-    'none_accessory'                    => 'Non ci sono abbastanza accessori disponibili da assegnare per :accessory. Ulteriori :qty sono richiesti. ',
+    'none_models'                       => 'Per l\'assegnazione non ci sono abbastanza Beni :model disponibili. Ne sono richiesti :qty . ',
+    'none_licenses'                     => 'Non ci sono abbastanza licenze :license disponibili. Ne sono richieste :qty . ',
+    'none_consumables'                  => 'Per l\'assegnazione non ci sono abbastanza consumabili :consumable disponibili. Ne sono richiesti :qty . ',
+    'none_accessory'                    => 'Per l\'assegnazione non ci sono abbastanza accessori :accessory disponibili. Ne sono richiesti :qty . ',
     'append_accessory'                  => 'Aggiungi accessorio',
     'update_appended_accessory'         => 'Aggiorna accessorio aggiunto',
     'append_consumable'                 => 'Aggiungi consumabile',
@@ -38,7 +38,7 @@ return [
     'accessory_error'                   => 'Accessorio già allegato al kit',
     'accessory_deleted'                 => 'Eliminazione riuscita',
     'accessory_none'                    => 'L\'accessorio non esiste',
-    'checkout_success'                  => 'L\'assegnazione è andata a buon fine',
+    'checkout_success'                  => 'Assegnazione andata a buon fine',
     'checkout_error'                    => 'Errore nell\'assegnazione',
     'kit_none'                          => 'Il kit non esiste',
     'kit_created'                       => 'Il kit è stato creato con successo',
@@ -47,4 +47,5 @@ return [
     'kit_deleted'                       => 'Il kit è stato eliminato con successo',
     'kit_model_updated'                 => 'Il modello è stato aggiornato correttamente',
     'kit_model_detached'                => 'Model was successfully detached',
+    'model_already_attached'            => 'Modello già collegato al kit',
 ];
diff --git a/resources/lang/it-IT/admin/licenses/form.php b/resources/lang/it-IT/admin/licenses/form.php
index 7667a7b784..4f7e7e3167 100644
--- a/resources/lang/it-IT/admin/licenses/form.php
+++ b/resources/lang/it-IT/admin/licenses/form.php
@@ -3,13 +3,13 @@
 return array(
 
     'asset'             => 'Bene',
-    'checkin'           => 'Riassegna',
+    'checkin'           => 'Restituzione',
     'create'            => 'Crea Licenza',
     'expiration'        => 'Data di scadenza',
     'license_key'       => 'Chiave licenza',
     'maintained'        => 'Mantenuto',
     'name'              => 'Nome Software',
-    'no_depreciation'   => 'Non svaluta',
+    'no_depreciation'   => 'Non soggetto a deprezzamento',
     'purchase_order'    => 'Acquisto numero d\'ordine',
     'reassignable'      => 'Reassegnabile',
     'remaining_seats'   => 'Licenze disponibili',
@@ -18,5 +18,5 @@ return array(
     'to_email'          => 'Licenza Email',
     'to_name'           => 'Licenza Nome',
     'update'            => 'Aggiornamento Licenze',
-    'checkout_help'     => 'È necessario verificare una licenza ad una bene hardware o una persona. È possibile selezionare, ma il proprietario del bene deve corrispondere alla persona che ha il bene fuori.'
+    'checkout_help'     => 'Devi assegnare una Licenza a un Bene o a una persona. Puoi selezionarli entrambi, ma in tal caso l\'assegnatario del Bene deve corrispondere alla persona a cui stai assegnando la licenza.'
 );
diff --git a/resources/lang/it-IT/admin/licenses/general.php b/resources/lang/it-IT/admin/licenses/general.php
index ad3b34d98d..2d63783504 100644
--- a/resources/lang/it-IT/admin/licenses/general.php
+++ b/resources/lang/it-IT/admin/licenses/general.php
@@ -3,9 +3,9 @@
 return array(
     'about_licenses_title'      => 'Informazioni sulle licenze',
     'about_licenses'            => 'Le licenze vengono utilizzate per monitorare il software. Hanno un numero specifico di posti che possono essere verificati agli individui',
-    'checkin'  					=> 'Registrare Licenza Sede',
-    'checkout_history'  		=> 'Storico Estrazioni',
-    'checkout'  				=> 'Estrazione Licenza Sede',
+    'checkin'  					=> 'Restituire slot Licenza',
+    'checkout_history'  		=> 'Storico Assegnazioni',
+    'checkout'  				=> 'Assegna slot Licenza',
     'edit'  					=> 'Modifica Licenza',
     'filetype_info'				=> 'I formati di file permessi sono png, gif, jpg, jpeg, doc, docx, pdf, txt, zip, e rar.',
     'clone'  					=> 'Clona Licenza',
@@ -14,6 +14,7 @@ return array(
     'info'  					=> 'Informazioni Licenza',
     'license_seats'  			=> 'Licenza Sede',
     'seat'  					=> 'Sede',
+    'seat_count'  				=> 'Slot :count',
     'seats'  					=> 'Sedi',
     'software_licenses'  		=> 'Licenze Software',
     'user'  					=> 'Utente',
@@ -22,25 +23,25 @@ return array(
     'bulk'                      =>
         [
             'checkin_all'           => [
-                'button'            => 'Check-in di tutte le postazioni',
-                'modal'             => 'Ciò effettuerà il check-in di una postazione. | Ciò effettuerà il check-in di :checkedout_seats_count postazioni per questa licenza.',
-                'enabled_tooltip'   => 'Check-in di TUTTE le postazioni di questa licenza, sia di utenti che di beni',
-                'disabled_tooltip'  => 'Disattivato perché non ci sono postazioni assegnate',
+                'button'            => 'Restituzione di tutti gli slot Licenza',
+                'modal'             => 'Questa azione restituirà uno slot. | Questa azione restituirà tutti i :checkedout_seats_count slot di questa licenza.',
+                'enabled_tooltip'   => 'Restituzione di TUTTI gli slot di questa licenza, sia di utenti che di beni',
+                'disabled_tooltip'  => 'Disattivato perché non ci sono slot Licenza assegnati',
                 'disabled_tooltip_reassignable'  => 'Disattivato a causa della licenza non reassegnabile',
-                'success'           => 'Check-in della licenza effettuato! | Check-in di tutte le licenze effettuato!',
-                'log_msg'           => 'Check-in effettuato tramite GUI di assegnazione massiva di licenze',
+                'success'           => 'Restituzione della licenza effettuata! | Restituzione di tutte le licenze effettuata!',
+                'log_msg'           => 'Restituzione effettuata tramite la restituzione massiva nell\'interfaccia delle Licenze',
             ],
 
             'checkout_all'              => [
-                'button'                => 'Check-out di tutte le postazioni',
-                'modal'                 => 'Ciò effettuerà il check-out di una postazione al primo utente disponibile. | Questa azione effettuerà il checkout di :available_seats_count postazioni ai primi utenti disponibili. Un utente viene considerato disponibile se non hanno già questa licenza e la proprietà Auto-Assegna Licenza è attivata nel loro account utente.',
-                'enabled_tooltip'   => 'Assegna TUTTE le postazioni (o tutte quelle disponibili) a TUTTI gli utenti',
-                'disabled_tooltip'  => 'Disattivato perché non ci sono postazioni disponibili',
-                'success'           => 'Check-out della licenza effettuato ! | Check-out di :count licenze effettuato!',
-                'error_no_seats'    => 'Nessuna postazione rimasta per questa licenza.',
-                'warn_not_enough_seats'    => ':count utenti assegnati a questa licenza, ma le postazioni sono finite.',
-                'warn_no_avail_users'    => 'Non ho fatto nulla: Non ci sono utenti che non abbiano già questa licenza.',
-                'log_msg'           => 'Check-out effettuato tramite GUI di assegnazione massiva di licenze',
+                'button'                => 'Assegna tutti gli slot',
+                'modal'                 => 'Questa azione assegnerà uno slot al primo utente disponibile. | Questa azione assegnerà :available_seats_count slot ai primi utenti disponibili. Un utente è considerato disponibile per questo slot se non ha già questa Licenza assegnata e se l\'Auto Assegnazione Licenza è attiva sul suo account utente.',
+                'enabled_tooltip'   => 'Assegna TUTTI gli slot licenza (o tutti quelli disponibili) a TUTTI gli utenti',
+                'disabled_tooltip'  => 'Disattivato perché non ci sono licenze disponibili',
+                'success'           => 'Assegnazione Licenza effettuata! | Assegnazione di :count Licenze effettuata!',
+                'error_no_seats'    => 'Nessuno slot rimanente per questa Licenza.',
+                'warn_not_enough_seats'    => ':count utenti sono stati assegnati a questa licenza, ma gli slot disponibili sono esauriti.',
+                'warn_no_avail_users'    => 'Non ho fatto nulla: Non ci sono utenti senza questa licenza.',
+                'log_msg'           => 'Assegnazione effettuato tramite GUI di assegnazione massiva di licenze',
 
 
             ],
diff --git a/resources/lang/it-IT/admin/licenses/message.php b/resources/lang/it-IT/admin/licenses/message.php
index 74122fea60..7d9d8f589a 100644
--- a/resources/lang/it-IT/admin/licenses/message.php
+++ b/resources/lang/it-IT/admin/licenses/message.php
@@ -41,14 +41,17 @@ return array(
     ),
 
     'checkout' => array(
-        'error'   => 'C\'è stato un problema nell\'estrazione della licenza. Riprova.',
-        'success' => 'La licenza è stata estratta con successo',
+        'error'   => 'Problema durante l\'assegnazione della Licenza. Riprova.',
+        'success' => 'La licenza è stata assegnata con successo',
         'not_enough_seats' => 'Non ci sono abbastanza copie della licenza disponibili per l\'assegnazione',
+        'mismatch' => 'Lo slot di licenza fornito non corrisponde alla licenza',
+        'unavailable' => 'Questo slot non è disponibile per l\'Assegnazione.',
     ),
 
     'checkin' => array(
-        'error'   => 'C\'è stato un problema nella registrazione della licenza. Riprova.',
-        'success' => 'La licenza è stata registrata con successo'
+        'error'   => 'C\'è stato un problema nella restituzione della licenza. Riprova.',
+        'not_reassignable' => 'Licenza non riassegnabile',
+        'success' => 'La licenza è stata restituita con successo'
     ),
 
 );
diff --git a/resources/lang/it-IT/admin/locations/message.php b/resources/lang/it-IT/admin/locations/message.php
index 1ddfc0381a..2956ca1afe 100644
--- a/resources/lang/it-IT/admin/locations/message.php
+++ b/resources/lang/it-IT/admin/locations/message.php
@@ -2,28 +2,34 @@
 
 return array(
 
-    'does_not_exist' => 'La posizione non esiste.',
-    'assoc_users'    => 'Non puoi cancellare questa posizione perché è la posizione di almeno un bene o un utente, ha dei beni assegnati, o è la posizione principale di un\'altra posizione. Aggiornare i modelli per non fare più riferimento a questa azienda e riprovare. ',
-    'assoc_assets'	 => 'Questa posizione è associata ad almeno un prodotto e non può essere cancellata. Si prega di aggiornare i vostri prodotti di riferimento e riprovare. ',
-    'assoc_child_loc'	 => 'Questa posizione è parente di almeno un\'altra posizione e non può essere cancellata. Si prega di aggiornare le vostre posizioni di riferimento e riprovare. ',
+    'does_not_exist' => 'La Sede non esiste.',
+    'assoc_users'    => 'Non puoi eliminare questa Sede perché è associata ad almeno un Bene o un Utente, o ha Beni assegnati, o è la Sede sotto la quale sono registrate altre Sedi. Aggiorna le altre voci in modo che non facciano più riferimento a questa Sede e poi riprova ',
+    'assoc_assets'	 => 'Questa Sede è associata ad almeno un prodotto e non può essere cancellata. Si prega di aggiornare i vostri prodotti di riferimento e riprovare. ',
+    'assoc_child_loc'	 => 'La Sede contiene almeno un\'altra Sede, pertanto non può essere eliminata. Aggiorna le Sedi in modo che non siano parte di questa Sede e riprova. ',
     'assigned_assets' => 'Beni Assegnati',
-    'current_location' => 'Posizione attuale',
+    'current_location' => 'Sede attuale',
+    'open_map' => 'Apri con :map_provider_icon Maps',
 
 
     'create' => array(
-        'error'   => 'La posizione non è stata creata, si prega di riprovare.',
-        'success' => 'Posizione creata con successo.'
+        'error'   => 'La Sede non è stata creata, si prega di riprovare.',
+        'success' => 'Sede creata con successo.'
     ),
 
     'update' => array(
-        'error'   => 'La posizione non è stata aggiornata, si prega di riprovare',
-        'success' => 'Posizione aggiornata con successo.'
+        'error'   => 'La Sede non è stata aggiornata, si prega di riprovare',
+        'success' => 'Sede aggiornata con successo.'
+    ),
+
+    'restore' => array(
+        'error'   => 'La Sede non è stata ripristinata, si prega di riprovare',
+        'success' => 'La Sede è stata ripristinata con successo.'
     ),
 
     'delete' => array(
-        'confirm'   	=> 'Sei sicuro di voler cancellare questa posizione?',
-        'error'   => 'C\'è stato un problema nell\'eliminare la posizione. Riprova.',
-        'success' => 'Posizione eliminata con successo.'
+        'confirm'   	=> 'Sei sicuro di voler cancellare questa Sede?',
+        'error'   => 'C\'è stato un problema nell\'eliminare la Sede. Riprova.',
+        'success' => 'Sede eliminata con successo.'
     )
 
 );
diff --git a/resources/lang/it-IT/admin/locations/table.php b/resources/lang/it-IT/admin/locations/table.php
index f5b571c690..bf1a05513b 100644
--- a/resources/lang/it-IT/admin/locations/table.php
+++ b/resources/lang/it-IT/admin/locations/table.php
@@ -1,42 +1,43 @@
 <?php
 
 return [
-    'about_locations_title'     => 'Informazioni sulle posizioni',
-    'about_locations'           => 'Le posizioni sono usate per tracciare la posizione degli utenti, dei beni e di altri oggetti',
+    'about_locations_title'     => 'Info sulle Sedi',
+    'about_locations'           => 'Le Sedi sono usate per tracciare la collocazione degli utenti, dei beni e di altri oggetti',
     'assets_rtd'                => 'Beni', // This has NEVER meant Assets Retired. I don't know how it keeps getting reverted.
     'assets_checkedout'         => 'Beni Assegnati',
     'id'                        => 'ID',
     'city'                      => 'Città',
-    'state'                     => 'Stato',
+    'state'                     => 'Provincia',
     'country'                   => 'Paese',
-    'create'                    => 'Crea Posizione',
-    'update'                    => 'Aggiorna Posizione',
+    'create'                    => 'Crea Sede',
+    'update'                    => 'Aggiorna Sede',
     'print_assigned'            => 'Stampa assegnazione',
     'print_all_assigned'        => 'Stampa tutte le assegnazioni',
-    'name'                      => 'Nome Posizione',
+    'name'                      => 'Nome Sede',
     'address'                   => 'Indirizzo',
     'address2'                   => 'Indirizzo, riga 2',
-    'zip'                       => 'Codice Postale',
-    'locations'                 => 'Posizioni',
-    'parent'                    => 'Genitore',
-    'currency'                  => 'Valuta della Posizione',
+    'zip'                       => 'CAP',
+    'locations'                 => 'Sedi',
+    'parent'                    => 'Parte di...',
+    'currency'                  => 'Valuta della Sede',
     'ldap_ou'                   => 'LDAP Search OU',
     'user_name'                 => 'Nome Utente',
     'department'                => 'Dipartimento',
-    'location'                  => 'Posizione',
+    'location'                  => 'Sede',
     'asset_tag'                 => 'Tag dei Beni',
     'asset_name'                => 'Nome',
     'asset_category'            => 'Categoria',
     'asset_manufacturer'        => 'Produttore',
     'asset_model'               => 'Modello',
     'asset_serial'              => 'Seriale',
-    'asset_location'            => 'Posizione',
-    'asset_checked_out'         => 'Checked-Out il',
-    'asset_expected_checkin'    => 'Check-In Previsto',
+    'asset_location'            => 'Sede',
+    'asset_checked_out'         => 'Assegnato',
+    'asset_expected_checkin'    => 'Restituzione prevista',
     'date'                      => 'Data:',
-    'phone'                     => 'Telefono Posizione',
+    'phone'                     => 'Telefono Sede',
     'signed_by_asset_auditor'   => 'Firmato Da (Revisore dei Beni):',
     'signed_by_finance_auditor' => 'Firmato Da (Revisore Finanziario):',
-    'signed_by_location_manager' => 'Firmato Da (Manager della Posizione):',
+    'signed_by_location_manager' => 'Firmato Da (Responsabile della Sede):',
     'signed_by'                 => 'Firmato Da:',
+    'clone'  					=> 'Clone Location',
 ];
diff --git a/resources/lang/it-IT/admin/models/general.php b/resources/lang/it-IT/admin/models/general.php
index 7763bd1863..3df02bfa5a 100644
--- a/resources/lang/it-IT/admin/models/general.php
+++ b/resources/lang/it-IT/admin/models/general.php
@@ -3,7 +3,7 @@
 return array(
     'about_models_title'     => 'Informazioni sui modelli di Asset',
     'about_models_text'           => 'I modelli sono un modo per raggruppare Asset identici. "MBP 2016", "IPhone 6s", etc.',
-    'deleted'  					        => 'Questo modello è stato eliminato.',
+    'deleted'  					=> 'Questo modello è stato eliminato.',
     'bulk_delete'               => 'Eliminazione di massa di modelli Asset',
     'bulk_delete_help'               => 'Utilizza le caselle di controllo in basso per confermare la cancellazione dei modelli di asset selezionati. I modelli di asset con asset ad essi associati non possono essere eliminati finché le risorse non sono associate a un modello diverso.',
     'bulk_delete_warn'          => 'Stai per cancellare un modello di bene.|Stai per cancellare :model_count modelli di bene.',
diff --git a/resources/lang/it-IT/admin/models/message.php b/resources/lang/it-IT/admin/models/message.php
index 5a4b000030..0a85f2dd79 100644
--- a/resources/lang/it-IT/admin/models/message.php
+++ b/resources/lang/it-IT/admin/models/message.php
@@ -7,7 +7,7 @@ return array(
     'no_association' => 'ATTENZIONE! Il modello di bene per questo oggetto non è valido o è mancante!',
     'no_association_fix' => 'Ciò romperà cose in modi strani e brutti. Modifica questo bene per assegnargli un modello.',
     'assoc_users'	 => 'Questo modello è attualmente associato ad uno o più beni e non può essere eliminato. Eliminare i beni e poi provare a eliminare nuovamente. ',
-
+    'invalid_category_type' => 'La categoria deve essere quella di un Bene.',
 
     'create' => array(
         'error'   => 'Il modello non è stato creato, si prega di riprovare.',
diff --git a/resources/lang/it-IT/admin/reports/general.php b/resources/lang/it-IT/admin/reports/general.php
index 902d183e9d..53f0d7bd98 100644
--- a/resources/lang/it-IT/admin/reports/general.php
+++ b/resources/lang/it-IT/admin/reports/general.php
@@ -4,6 +4,7 @@ return [
     'info'   => 'Selezionare le opzioni desiderate per il vostro report di beni.',
     'deleted_user' => 'Utente eliminato',
     'send_reminder' => 'Invia promemoria',
+    'cannot_send_reminder' => 'L\'utente è stato cancellato o non ha un indirizzo email, quindi non può ricevere un promemoria',
     'reminder_sent' => 'Promemoria spedito',
     'acceptance_deleted' => 'Richiesta di accettazione eliminata',
     'acceptance_request' => 'Richiesta di accettazione',
@@ -13,5 +14,10 @@ return [
         'user_state' => 'Provincia Utente',
         'user_country' => 'Nazione Utente',
         'user_zip' => 'CAP Utente'
-    ]
-];
\ No newline at end of file
+    ],
+    'open_saved_template' => 'Apri il Modello Salvato',
+    'save_template' =>  'Salva modello',
+    'select_a_template' => 'Seleziona un modello',
+    'template_name' => 'Nome Del Modello',
+    'update_template' => 'Aggiorna Modello',
+];
diff --git a/resources/lang/it-IT/admin/reports/message.php b/resources/lang/it-IT/admin/reports/message.php
index d9fd5dfc9f..322db5500d 100644
--- a/resources/lang/it-IT/admin/reports/message.php
+++ b/resources/lang/it-IT/admin/reports/message.php
@@ -1,5 +1,16 @@
 <?php
 
-return array(
-    'error'   => 'È necessario selezionare almeno un\'opzione.'
-);
+return [
+    'about_templates' => 'Info sui Modelli Salvati',
+    'saving_templates_description' => 'Selezionare le opzioni, poi inserire il nome del modello nel riquadro sopra e fare clic sul pulsante \'Salva Modello\'. Usare il menu a tendina per selezionare un modello salvato in precedenza.',
+    'create'  => [
+        'success' => 'Modello salvato correttamente',
+    ],
+    'update' => [
+        'success' => 'Modello aggiornato correttamente',
+    ],
+    'delete' => [
+        'success' => 'Modello eliminato',
+        'no_delete_permission' => 'Il modello non esiste o non hai il permesso di eliminarlo.',
+    ],
+];
diff --git a/resources/lang/it-IT/admin/settings/general.php b/resources/lang/it-IT/admin/settings/general.php
index d0a499c663..c79dc957e1 100644
--- a/resources/lang/it-IT/admin/settings/general.php
+++ b/resources/lang/it-IT/admin/settings/general.php
@@ -3,80 +3,83 @@
 return [
     'ad'				        => 'Active Directory',
     'ad_domain'				    => 'Dominio Active Directory',
-    'ad_domain_help'			=> 'Questo a volte è lo stesso del dominio email, ma non sempre.',
-    'ad_append_domain_label'    => 'Aggiungi il dominio',
+    'ad_domain_help'			=> 'A volte è uguale al dominio dell\'indirizzo email, ma non sempre.',
+    'ad_append_domain_label'    => 'Aggiungi il nome dominio',
     'ad_append_domain'          => 'Aggiungi il dominio al campo username',
     'ad_append_domain_help'     => 'L\'utente non è tenuto a scrivere "username@domain.local", può semplicemente digitare "username".',
     'admin_cc_email'            => 'Email CC',
-    'admin_cc_email_help'       => 'Se desideri inviare una copia delle e-mail di consegna / ritiro che vengono inviate agli utenti a un altro account e-mail, inseriscile qui. Altrimenti, lascia questo campo vuoto.',
+    'admin_cc_email_help'       => 'Invia una copia delle email di check-in/checkout a questo indirizzo.',
     'admin_settings'            => 'Impostazioni Admin',
     'is_ad'				        => 'Si tratta di un server Active Directory',
     'alerts'                	=> 'Avvisi',
     'alert_title'               => 'Aggiorna impostazioni di notifica',
     'alert_email'				=> 'Invia avvisi a',
-    'alert_email_help'    => 'Indirizzi email o liste di distribuzione a cui si desidera inviare gli avvisi, separati da una virgola',
-    'alerts_enabled'			=> 'Attiva Avvisi',
-    'alert_interval'			=> 'Soglia di avviso di scadenza (in giorni)',
+    'alert_email_help'          => 'Indirizzi email o liste di distribuzione a cui si desidera inviare gli avvisi, separati da virgola.',
+    'alerts_enabled'			=> 'Attiva Email di Avviso',
+    'alert_interval'			=> 'Soglia Avvisi di Scadenza (giorni)',
     'alert_inv_threshold'		=> 'Soglia di avviso di inventario',
     'allow_user_skin'           => 'Consenti tema utente',
-    'allow_user_skin_help_text' => 'Selezionando questa casella, l\'utente potrà sovrascrivere il tema dell\'interfaccia utente con uno diverso.',
+    'allow_user_skin_help_text' => 'Selezionando questa casella, l\'utente potrà sovrascrivere il tema dell\'interfaccia con uno diverso.',
     'asset_ids'					=> 'ID Bene',
-    'audit_interval'            => 'Intervallo di controllo',
-    'audit_interval_help'       => 'Se controllate fisicamente e periodicamente i vostri beni, inserite l\'intervallo in mesi utilizzato. Se si aggiorna questo valore, tutte le "prossime date di revisione" per i beni con una data di revisione saranno aggiornate.',
-    'audit_warning_days'        => 'Soglia di allarme di controllo',
-    'audit_warning_days_help'   => 'Quanti giorni in anticipo dovremmo avvisare quando i beni sono dovuti per il controllo?',
+    'audit_interval'            => 'Intervallo Inventari',
+    'audit_interval_help'       => 'Se dovete inventariare fisicamente e regolarmente i vostri beni, inserite l\'intervallo in mesi. Se si aggiorna questo valore, tutte le "prossime date" per i beni con una prossima data d\'inventario saranno aggiornate.',
+    'audit_warning_days'        => 'Soglia Avviso di Inventario',
+    'audit_warning_days_help'   => 'Quanti giorni in anticipo dovremmo avvisare che i beni devono essere inventariati?',
     'auto_increment_assets'		=> 'Genera tag beni ad incremento automatico',
     'auto_increment_prefix'		=> 'Prefisso (Opzionale)',
     'auto_incrementing_help'    => 'Attiva i tag beni ad incremento automatico per impostarlo',
-    'backups'					=> 'Backups',
+    'backups'					=> 'Backup',
     'backups_help'              => 'Crea, scarica e ripristina i backup ',
     'backups_restoring'         => 'Ripristino da backup',
+    'backups_clean' => 'Pulire il database di backup prima di ripristinare',
+    'backups_clean_helptext' => "Questo può essere utile se stai cambiando tra le versioni del database",
     'backups_upload'            => 'Carica Backup',
     'backups_path'              => 'I backup sul server sono memorizzati in <code>:path</code>',
     'backups_restore_warning'   => 'Usa il pulsante di ripristino <small><span class="btn btn-xs btn-warning"><i class="text-white fas fa-retweet" aria-hidden="true"></i></span></small> per ripristinare un backup precedente. (Al momento non funziona con l\'archivio file S3 o Docker.)<br><br><strong>L\'intero database di :app_name e i file caricati saranno completamente sostituiti</strong> dal contenuto nel file di backup.  ',
     'backups_logged_out'         => 'Tutti gli utenti esistenti, te incluso, saranno disconnessi a ripristino completato.',
     'backups_large'             => 'I backup molto grandi potrebbero andare in time out durante il ripristino e potrebbero dover essere eseguiti tramite riga di comando. ',
     'barcode_settings'			=> 'Impostazioni codice a barre',
-    'confirm_purge'			    => 'Conferma Cancellazione',
-    'confirm_purge_help'		=> 'Inserisci il testo "DELETE" nella casella sottostante per eliminare i tuoi record eliminati. Questa azione non può essere annullata e cancellerà PERMANENTEMENTE tutti gli elementi e gli utenti. (Effettuare un backup, per essere sicuri.)',
+    'confirm_purge'			    => 'Conferma Eliminazione',
+    'confirm_purge_help'		=> 'Inserisci "DELETE" nella casella sottostante per eliminare i record cancellati. Questa azione non può essere annullata e eliminerà PERMANENTEMENTE tutti gli elementi e gli utenti cancellati. (Effettuare un backup, per essere sicuri.)',
     'custom_css'				=> 'CSS Personalizzato',
-    'custom_css_help'			=> 'Inserisci qualsiasi CSS personalizzato che vuoi utilizzare. Do not include the &lt;style&gt;&lt;/style&gt; tags.',
-    'custom_forgot_pass_url'	=> 'URL di Reset Password personalizzata',
-    'custom_forgot_pass_url_help'	=> 'Sostituisce l\'URL della password dimenticata incorporata nella schermata di accesso, utile per indirizzare le persone alla funzionalità di ripristino della password LDAP interna o ospitata. Disabiliterà completamente la funzionalità della password dimenticata dell\'utente locale.',
-    'dashboard_message'			=> 'Messaggio di dashboard',
-    'dashboard_message_help'	=> 'Questo testo verrà visualizzato nella dashboard per chiunque abbia il permesso di visualizzare il dashboard.',
+    'custom_css_placeholder'	=> 'Aggiungi il tuo CSS personalizzato',
+    'custom_css_help'			=> 'Inserisci qualsiasi CSS personalizzato che vuoi utilizzare. Non includere i tag &lt;style&gt;&lt;/style&gt; .',
+    'custom_forgot_pass_url'	=> 'URL Reset Password personalizzato',
+    'custom_forgot_pass_url_help'	=> 'Sostituisce l\'URL per il reset della password incorporato nella schermata di accesso, utile per indirizzare gli utenti alla pagina di ripristino password LDAP interna o ospitata. Ciò disabiliterà completamente la funzionalità locale di ripristino password.',
+    'dashboard_message'			=> 'Messaggio Dashboard',
+    'dashboard_message_help'	=> 'Chiunque abbia il permesso di visualizzare la dashboard potrà leggere questo messaggio.',
     'default_currency'  		=> 'Valuta predefinita',
     'default_eula_text'			=> 'EULA Predefinita',
+    'default_eula_text_placeholder' => 'Aggiungi il testo EULA predefinito',
     'default_language'			=> 'Lingua predefinita',
-    'default_eula_help_text'	=> 'È possibile associare EULAs personalizzati a categorie di beni specifici.',
+    'default_eula_help_text'	=> 'Puoi associare EULA personalizzati a categorie di beni specifici.',
     'acceptance_note'           => 'Aggiungi una nota alla tua decisione (facoltativo)',
     'display_asset_name'        => 'Mostra Nome Bene',
-    'display_checkout_date'     => 'Mostra Data Estrazione',
-    'display_eol'               => 'Visualizzare EOL in vista tabella',
-    'display_qr'                => 'Visualizza codici quadrati',
+    'display_checkout_date'     => 'Mostra Data Assegnazione',
+    'display_eol'               => 'Visualizza EOL nella vista tabella',
+    'display_qr'                => 'Mostra codice a barre 2D',
     'display_alt_barcode'		=> 'Visualizza codici a barre',
-    'email_logo'                => 'Logo Email',
     'barcode_type'				=> 'Tipo di codice a barre 2D',
     'alt_barcode_type'			=> 'Tipo di codice a barre 1D',
-    'email_logo_size'       => 'I loghi quadrati nelle email hanno un aspetto migliore. ',
     'enabled'                   => 'Abilitato',
     'eula_settings'				=> 'Impostazioni EULA',
-    'eula_markdown'				=> 'Questa EULA consente <a href="https://help.github.com/articles/github aromatizzato-markdown/">Github flavored markdown</a>.',
+    'eula_markdown'				=> 'Questa EULA consente l\'uso del <a href="https://help.github.com/articles/github-flavored-markdown/">Markdown in stile Github flavored</a>.',
+    'empty_row_count'           => 'Field Start Offset (Empty Rows)',
+    'empty_row_count_help'      => 'Fields will begin populating after this many empty rows are skipped at the top of the label.',
     'favicon'                   => 'Favicon',
     'favicon_format'            => 'I tipi di file accettati sono ico, png e gif. Altri formati potrebbero non funzionare in tutti i browser.',
-    'favicon_size'          => 'Le Favicons dovrebbero essere preferibilmente quadrate, di dimensione 16x16 pixel.',
+    'favicon_size'          => 'Le Favicon dovrebbero essere quadrate, 16x16 pixel.',
     'footer_text'               => 'Ulteriori testo di piè di pagina ',
-    'footer_text_help'          => 'Questo testo verrà visualizzato nel piè di pagina destro. I collegamenti sono consentiti utilizzando <a href="https://help.github.com/articles/github-flavored-markdown/">markdown Github</a>. Le interruzioni di linea, le intestazioni, le immagini, ecc. Possono dare risultati imprevedibili.',
+    'footer_text_help'          => 'Questo testo verrà visualizzato nel piè di pagina a destra. I collegamenti sono consentiti usando <a href="https://help.github.com/articles/github-flavored-markdown/">Markdown in stile Github</a>. Interruzioni di linea, intestazioni, immagini, ecc. possono dare risultati imprevedibili.',
+    'footer_text_placeholder'   => 'Testo opzionale a piè di pagina',
     'general_settings'			=> 'Impostazioni Generali',
-    'general_settings_keywords' => 'supporto aziendale, firma, accettazione, formato email, formato username, immagini, per pagina, miniature, eula, gravatar, tos, cruscotto, privacy',
     'general_settings_help'     => 'EULA predefinita e altro',
     'generate_backup'			=> 'Crea Backup',
     'google_workspaces'         => 'Google Workspace',
     'header_color'              => 'Colore intestazione',
     'info'                      => 'Queste impostazioni consentono di personalizzare alcuni aspetti della vostra installazione.',
-    'label_logo'                => 'Logo Etichetta',
-    'label_logo_size'           => 'I loghi quadrati hanno un aspetto migliore - verranno visualizzati in alto a destra di ogni etichetta dell\'asset. ',
-    'laravel'                   => 'Laravel Version',
+    'label_logo_size'           => 'I loghi quadrati hanno un aspetto migliore - verranno visualizzati in alto a destra su ogni etichetta dei Beni. ',
+    'laravel'                   => 'Versione Laravel',
     'ldap'                      => 'LDAP',
     'ldap_default_group'        => 'Gruppo Di Permessi Predefinito',
     'ldap_default_group_info'   => 'Seleziona un gruppo a cui assegnare i nuovi utenti. Ricorda che un utente ottiene le autorizzazioni del gruppo a cui appartiene.',
@@ -94,7 +97,7 @@ return [
     'ldap_login_sync_help'      => 'Questo verifica solamente che LDAP possa sincronizzare correttamente. Se la tua query di autenticazione LDAP non è corretta, gli utenti potrebbero non essere ancora in grado di accedere. DEVI SALVARE LE IMPOSTAZIONI LDAP PRIMA DI EFFETTUARE QUESTO TEST.',
     'ldap_manager'              => 'Manager LDAP',
     'ldap_server'               => 'Server LDAP',
-    'ldap_server_help'          => 'Questo dovrebbe iniziare con ldap: // (per unencrypted o TLS) o ldaps: // (per SSL)',
+    'ldap_server_help'          => 'Dovrebbe iniziare con ldap:// (se non crittografato) o ldaps:// (se TLS o SSL)',
     'ldap_server_cert'			=> 'Validazione certificato SSL di LDAP',
     'ldap_server_cert_ignore'	=> 'Consenti Certificato SSL non valido',
     'ldap_server_cert_help'		=> 'Seleziona questa casella se stai utilizzando un certificato SSL autofirmato e vuoi accettare un certificato SSL non valido.',
@@ -108,8 +111,8 @@ return [
     'ldap_pword'                => 'Password LDAP',
     'ldap_basedn'               => 'DN Base',
     'ldap_filter'               => 'Filtro LDAP',
-    'ldap_pw_sync'              => 'Sincronizzazione password LDAP',
-    'ldap_pw_sync_help'         => 'Deseleziona questa casella se non desideri mantenere le password LDAP sincronizzate con le password locali. Disattivare questo significa che i tuoi utenti potrebbero non essere in grado di accedere se il server LDAP non è raggiungibile per qualche motivo.',
+    'ldap_pw_sync'              => 'Tieni password LDAP in cache',
+    'ldap_pw_sync_help'         => 'Deseleziona se non desideri mantenere le password LDAP in cache locale hashate. Se la disattivi, i tuoi utenti potrebbero non essere in grado di accedere se il server LDAP non è raggiungibile per qualche motivo.',
     'ldap_username_field'       => 'Campo nome utente',
     'ldap_lname_field'          => 'Cognome',
     'ldap_fname_field'          => 'Nome LDAP',
@@ -117,13 +120,15 @@ return [
     'ldap_version'              => 'Versione LDAP',
     'ldap_active_flag'          => 'LDAP Active Flag',
     'ldap_activated_flag_help'  => 'Questo valore viene utilizzato per determinare se un utente sincronizzato può accedere a Snipe-IT. <strong>Non influisce sulla capacità di effettuare il check in o il checkout dei beni</strong>, e dovrebbe essere il <strong>nome dell\'attributo</strong> all\'interno del tuo AD/LDAP, <strong>non il valore</strong>. <br><br>Se questo campo è impostato su un nome di campo che non esiste nel tuo AD/LDAP, oppure il valore nel campo AD/LDAP è impostato su <code>0</code> o <code>false</code>, <strong>il login sarà disabilitato</strong>. Se il valore nel campo AD/LDAP è impostato a <code>1</code> o <code>true</code> o <em>qualsiasi altro testo</em> l\'utente può accedere. Quando il campo è vuoto nel tuo AD, rispettiamo l\'attributo <code>userAccountControl</code> , che di solito consente agli utenti non sospesi di accedere.',
+    'ldap_invert_active_flag'   => 'Inverti flag "Attivo" di LDAP',
+    'ldap_invert_active_flag_help'     => 'Se attivato: quando il valore restituito da LDAP Active Flag è <code>0</code> o <code>false</code>, l\'account utente sarà attivo.',
     'ldap_emp_num'              => 'ID impiegato LDAP',
     'ldap_email'                => 'Email LDAP',
     'ldap_test'                 => 'Test LDAP',
     'ldap_test_sync'            => 'Test Sincronizzazione Ldap',
     'license'                   => 'Licenza software',
-    'load_remote'               => 'Usa Gravatar',
-    'load_remote_help_text'		=> 'Deseleziona questa casella se la tua installazione non può caricare script da internet esterna. Ciò impedirà a Snipe-IT di provare a caricare le immagini da Gravatar.',
+    'load_remote'               => 'Carica Avatar Remoti',
+    'load_remote_help_text'		=> 'Deseleziona questa casella se la tua installazione non può caricare gli script dall\'esterno. Questo impedirà a Snipe-IT di provare il caricamento degli avatar da Gravatar o da altre fonti esterne.',
     'login'                     => 'Tentativi di Accesso',
     'login_attempt'             => 'Tentativo di Accesso',
     'login_ip'                  => 'Indirizzo IP',
@@ -131,6 +136,7 @@ return [
     'login_user_agent'          => 'User Agent',
     'login_help'                => 'Elenco tentativi di login',
     'login_note'                => 'Nota di accesso',
+    'login_note_placeholder'            => "Se non hai un login o hai trovato un dispositivo appartenente a questa azienda, sei pregato di chiamare il supporto tecnico al 888-555-1212. Grazie.",
     'login_note_help'           => 'Facoltativamente includere alcune frasi nella schermata di login, ad esempio per aiutare le persone che hanno trovato un dispositivo perso o rubato. Questo campo accetta <a href="https://help.github.com/articles/github-flavored-markdown/">Goodotto flavored markdown</a>',
     'login_remote_user_text'    => 'Opzioni di accesso utente remoto',
     'login_remote_user_enabled_text' => 'Abilita accesso con intestazione utente remota',
@@ -146,13 +152,16 @@ return [
     'logo_print_assets_help'    => 'Usa il brand sulla lista dei beni stampabili ',
     'full_multiple_companies_support_help_text' => 'Restringere gli utenti (amministratori inclusi) assegnati ad una azienda agli asset della propria azienda.',
     'full_multiple_companies_support_text' => 'Supporto completo ad aziende multiple',
+    'scope_locations_fmcs_support_text'  => 'Posizioni precise con supporto completo alle aziende multiple',
+    'scope_locations_fmcs_support_help_text'  => 'Restrict locations to their selected company.',
+    'scope_locations_fmcs_check_button' => 'Check Compatibility',
+    'scope_locations_fmcs_support_disabled_text'  => 'This option is disabled because you have conflicting locations set for :count or more items.',
     'show_in_model_list'   => 'Mostra in menu a discesa del modello',
     'optional'					=> 'facoltativo',
     'per_page'                  => 'Risultati per Pagina',
     'php'                       => 'PHP Version',
     'php_info'                  => 'Info PHP',
     'php_overview'              => 'PHP',
-    'php_overview_keywords'     => 'phpinfo, sistema, informazioni',
     'php_overview_help'         => 'Informazioni di sistema PHP',
     'php_gd_info'               => 'È necessario installare php-gd per visualizzare i codici QR, consultare le istruzioni di installazione.',
     'php_gd_warning'            => 'Il plugin PHP Image Processing and GD non è installato.',
@@ -218,6 +227,8 @@ return [
     'webhook_integration_help'    => 'L\'integrazione con :app è facoltativa, ma se si desidera utilizzarla bisogna specificare l\'endpoint e il canale. Per configurare l\'integrazione devi <a href=":webhook_link" target="_new" rel="noopener">creare un webhook in arrivo</a> sul tuo account :app . Clicca su <strong>Prova integrazione :app</strong> per confermare che le impostazioni siano corrette prima di salvare. ',
     'webhook_integration_help_button'    => 'Una volta salvate le informazioni di :app, apparirà un pulsante di prova.',
     'webhook_test_help'           => 'Verifica se l\'integrazione :app è configurata correttamente. DEVI PRIMA SALVARE LE IMPOSTAZIONI :app AGGIORNATE.',
+    'shortcuts_enabled'         => 'Abilita Scorciatoie',
+    'shortcuts_help_text'       => '<strong>Windows</strong>: Alt + Tasto accesso, <strong>Mac</strong>: Control + Option + Tasto accesso',
     'snipe_version'  			=> 'Snipe-IT version',
     'support_footer'            => 'Supporto per i collegamenti a piè di pagina ',
     'support_footer_help'       => 'Specificare chi vede i collegamenti alle informazioni sul supporto IT e su Snipe-IT',
@@ -227,7 +238,6 @@ return [
     'update'                    => 'Aggiorna impostazioni',
     'value'                     => 'Valore',
     'brand'                     => 'Personalizzazione',
-    'brand_keywords'            => 'piè di pagina, logo, stampa, tema, skin, intestazione, colori, colore, css',
     'brand_help'                => 'Logo, Nome Sito',
     'web_brand'                 => 'Tipologia di Web Branding',
     'about_settings_title'      => 'Impostazioni',
@@ -276,6 +286,8 @@ return [
     'two_factor_enrollment_text'	=> "È necessaria l'autenticazione di due fattori, tuttavia il tuo dispositivo non è ancora stato iscritto. Apri l'applicazione Google Authenticator e analizza il codice QR qui sotto per iscriverti al tuo dispositivo. Una volta che hai iscritto il tuo dispositivo, inserisci il codice qui sotto",
     'require_accept_signature'      => 'Richiedi la firma',
     'require_accept_signature_help_text'      => 'L\'attivazione di questa funzionalità richiede che gli utenti si connettano fisicamente all\'accettazione di un\'attività.',
+    'require_checkinout_notes'  => 'Richiedi note per Assegnazione/Restituzione',
+    'require_checkinout_notes_help_text'    => 'Abilitando questa funzione, sarà obbligo compilare i campi note durante l\'Assegnazione o la Restituzione di un Bene.',
     'left'        => 'sinistra',
     'right'        => 'destra',
     'top'        => 'superiore',
@@ -313,24 +325,24 @@ return [
     'filter_by_keyword' => 'Filtra per parola chiave impostazioni',
     'security' => 'Sicurezza',
     'security_title' => 'Aggiorna Impostazioni Di Sicurezza',
-    'security_keywords' => 'password, passwords, requisiti, due fattori, two-factor, password comuni, login remoto, logout, autenticazione',
     'security_help' => 'Due Fattori, Restrizioni Password',
-    'groups_keywords' => 'permessi, gruppi di autorizzazioni, autorizzazione',
     'groups_help' => 'Gruppi di autorizzazioni account',
     'localization' => 'Lingua',
     'localization_title' => 'Aggiorna Impostazioni Lingua',
-    'localization_keywords' => 'localizzazione, valuta, locale, locali fuso orario, orario, internazionale, internazionalizzazione, lingua, lingue, traduzione',
     'localization_help' => 'Lingua, formato data',
     'notifications' => 'Notifiche',
     'notifications_help' => 'Impostazioni Avvisi E Email Controlli',
     'asset_tags_help' => 'Incrementi e prefissi',
     'labels' => 'Etichette',
     'labels_title' => 'Aggiorna Impostazioni Etichette',
-    'labels_help' => 'Dimensioni etichette &amp; impostazioni',
-    'purge_keywords' => 'elimina definitivamente',
+    'labels_help' => 'Codici a barre &amp; impostazioni etichette',
     'purge_help' => 'Elimina Record Cancellati',
     'ldap_extension_warning' => 'L\'estensione LDAP non è installata o abilitata su questo server. Puoi ancora salvare le impostazioni, ma è necessario abilitare l\'estensione LDAP per PHP prima che il login o la sincronizzazione LDAP funzioni.',
     'ldap_ad' => 'LDAP/AD',
+    'ldap_test_label' => 'Prova Sincronizzazione LDAP',
+    'ldap_test_login' => ' Prova Login LDAP',
+    'ldap_username_placeholder' => 'Nome utente LDAP',
+    'ldap_password_placeholder' => 'Password LDAP',
     'employee_number' => 'Numero Dipendente',
     'create_admin_user' => 'Crea Utente ::',
     'create_admin_success' => 'Successo! L\'utente admin è stato aggiunto!',
@@ -342,6 +354,8 @@ return [
     'setup_migration_create_user' => 'Successivo: Crea Utente',
     'ldap_settings_link' => 'Impostazioni LDAP',
     'slack_test' => 'Test <i class="fab fa-slack"></i> Integrazione',
+    'status_label_name' => 'Etichette di Stato',
+    'super_admin_only'  => 'Solo Super Amministratore',
     'label2_enable'           => 'Nuovo motore etichette',
     'label2_enable_help'      => 'Usa il nuovo motore etichette. <b>Nota: Devi salvare questa impostazione prima di cambiare le altre.</b>',
     'label2_template'         => 'Template',
@@ -356,12 +370,15 @@ return [
     'label2_2d_type'          => 'Tipo Barcode 2D',
     'label2_2d_type_help'     => 'Formato barcode 2D',
     'label2_2d_target'        => 'Target Barcode 2D',
-    'label2_2d_target_help'   => 'L\'URL a cui il codice a barre 2D punterà quando scansionato',
+    'label2_2d_target_help'   => 'I dati che saranno contenuti nel codice a barre 2D',
     'label2_fields'           => 'Definizioni Campi',
     'label2_fields_help'      => 'I campi possono essere aggiunti, rimossi e riordinati nella colonna di sinistra. Per ogni campo, possono essere aggionte, rimosse e riordinate più opzioni per Label e DataSource nella colonna di destra.',
+    'purge_barcodes' => 'Cancella codici a barre',
     'help_asterisk_bold'    => 'Il testo inserito <code>**così**</code> verrà visualizzato in grassetto',
     'help_blank_to_use'     => 'Lascia vuoto per usare il valore in <code>:setting_name</code>',
     'help_default_will_use' => '<code>:default</code> userà il valore di <code>:setting_name</code>. <br>Nota che il valore dei codici a barre deve essere conforme alla rispettiva specifica per essere generati correttamente. Per maggiori dettagli consultare <a href="https://snipe-it.readme.io/docs/barcodes">la documentazione <i class="fa fa-external-link"></i></a>. ',
+    'asset_id'              => 'ID Bene',
+    'data'               => 'Dati',
     'default'               => 'Predefinito',
     'none'                  => 'Niente',
     'google_callback_help' => 'Inserisci qeusto URL come URL di callback nelle impostazioni della tua app Google OAuth nella <strong><a href="https://console.cloud.google.com/" target="_blank">Google Cloud Console<i class="fa fa-external-link" aria-hidden="true"></i></a></strong> della tua organizzazione.',
@@ -373,7 +390,100 @@ return [
     'database_driver' => 'Driver del database',
     'bs_table_storage' => 'Archiviazione Tabella',
     'timezone' => 'Fuso orario',
+    'test_mail' => 'Email di prova',
     'profile_edit'          => 'Modifica Profilo',
     'profile_edit_help'          => 'Consenti agli utenti di modificare i propri profili.',
+    'default_avatar' => 'Avatar Personalizzato Predefinito',
+    'default_avatar_help' => 'Questa immagine verrà visualizzata come profilo se un utente non ha una foto di profilo.',
+    'restore_default_avatar' => 'Ripristina <a href=":default_avatar" data-toggle="lightbox" data-type="image">avatar predefinito di sistema</a>',
+    'restore_default_avatar_help' => '',
+    'due_checkin_days' => 'Avviso di prevista Restituzione',
+    'due_checkin_days_help' => 'Quanti giorni prima della restituzione prevista di un Bene dovrebbe essere elencato nella pagina della "Restituzioni Previste"?',
+    'no_groups' => 'Ancora non è stato creato alcun gruppo. Per aggiungerne uno vai a <code>Impostazioni Admin > Gruppi</code>.',
+    'text' => 'Testo',
+
+    'username_formats' => [
+        'username_format'		=> 'Formato nome utente',
+        'firstname_lastname_format'	=> 'Nome.Cognome (jane.smith)',
+        'first_name_format'	        => 'Nome (jane)',
+        'last_name_format'		=> 'Cognome (doe)',
+        'filastname_format'			=> 'Iniziale Nome, Cognome (jsmith)',
+        'lastnamefirstinitial_format' =>  'Cognome, Iniziale Nome (smithj)',
+        'firstname_lastname_underscore_format' => 'Nome_Cognome (jane_smith)',
+        'firstinitial.lastname' => 'Iniziale Nome . Cognome (j.smith)',
+        'lastname_firstinitial' => 'Cognome_ Iniziale Nome (smith_j)',
+        'lastname_dot_firstinitial_format' => 'Cognome . Iniziale Nome (smith.j)',
+        'firstnamelastname'     => 'Nome Cognome (janesmith)',
+        'firstnamelastinitial'  => 'Nome, Iniziale Cognome (janes)',
+        'lastnamefirstname'      => 'Cognome . Nome (smith.jane)',
+    ],
+
+    'email_formats' => [
+        'email_format'			=> 'Formato Email',
+        'firstname_lastname_format'	=> 'Nome.Cognome (jane.smith@example.com)',
+        'first_name_format'		=> 'Nome (jane@example.com)',
+        'last_name_format'		=> 'Cognome (doe@example.com)',
+        'filastname_format'			=> 'Iniziale Nome + Cognome (jsmith@example.com)',
+        'lastnamefirstinitial_format' =>  'Cognome + Iniziale Nome (smithj@esempio.it)',
+        'firstname_lastname_underscore_format' => 'Nome_Cognome (jane_smith@example.com)',
+        'firstinitial.lastname' => 'Iniziale Nome . Cognome (j.smith@example.com)',
+        'lastname_firstinitial' => 'Cognome_ Iniziale Nome (smith_j@example.com)',
+        'lastname_dot_firstinitial_format' => 'Cognome . Iniziale del Nome (smith.j@esempio.it)',
+        'firstnamelastname'     => 'Nome Cognome (janesmith@example.com)',
+        'firstnamelastinitial'  => 'Nome + Iniziale Cognome (janes@example.com)',
+        'lastnamefirstname'      => 'Cognome.Nome (rossi.mario@example.com)',
+    ],
+
+
+
+    'logo_labels' => [
+        'acceptance_pdf_logo'       => 'Logo PDF',
+        'email_logo'                => 'Logo Email',
+        'label_logo'                => 'Logo Etichetta',
+        'logo'                      => 'Logo Sito',
+        'favicon'                   => 'Favicon',
+    ],
+
+    'logo_help' => [
+        'email_logo_size'       => 'I loghi quadrati nelle email hanno un aspetto migliore. ',
+    ],
+
+    'logo_option_types' => [
+        'text' => 'Testo',
+        'logo' => 'Logo',
+        'logo_and_text' => 'Logo e Testo',
+    ],
+
+
+    'legends' => [
+        'scoping' => 'Scoping',
+        'formats' => 'Default Formats',
+        'profiles' => 'User Profiles',
+        'eula' => 'EULA & Acceptance Preferences',
+        'misc_display' => 'Miscellaneous Display Options',
+        'email' => 'Email Preferences',
+        'checkin' => 'Checkin Preferences',
+        'dashboard' => 'Login & Dashboard Preferences',
+        'misc' => 'Miscellaneous',
+        'logos' => 'Loghi E Schermo',
+        'colors' => 'Colori E Skin',
+        'footer' => 'Preferenze piè di pagina',
+        'security' => 'Security Preferences',
+        'general' => 'General',
+        'intervals' => 'Intervals & Thresholds',
+    ],
+
+
+    /* Keywords for settings overview help */
+    'keywords' => [
+        'brand'             => 'piè di pagina, logo, stampa, tema, skin, intestazione, colori, colore, css',
+        'general_settings'  => 'supporto aziendale, firma, accettazione, formato email, formato username, immagini, per pagina, miniature, eula, gravatar, tos, cruscotto, privacy',
+        'groups'            => 'permessi, gruppi di autorizzazioni, autorizzazione',
+        'labels'            => 'etichette, codici a barre, codice a barre, fogli, stampa, upc, qr, 1d, 2d',
+        'localization'      => 'localizzazione, valuta, locale, locali fuso orario, orario, internazionale, internazionalizzazione, lingua, lingue, traduzione',
+        'php_overview'      => 'phpinfo, sistema, informazioni',
+        'purge'             => 'elimina definitivamente',
+        'security'          => 'password, passwords, requisiti, due fattori, two-factor, password comuni, login remoto, logout, autenticazione',
+    ],
 
 ];
diff --git a/resources/lang/it-IT/admin/settings/message.php b/resources/lang/it-IT/admin/settings/message.php
index 49dffc56f1..9ae87c9308 100644
--- a/resources/lang/it-IT/admin/settings/message.php
+++ b/resources/lang/it-IT/admin/settings/message.php
@@ -14,6 +14,9 @@ return [
         'restore_warning'       => 'Si, ripristina. Riconosco che il ripristino sovrascriverà tutti i dati al momento presenti nel database. Inoltre, tutti gli utenti verranno disconnessi (incluso te).',
         'restore_confirm'       => 'Sei sicuro di voler ripristinare il tuo database da :filename?'
     ],
+    'restore' => [
+        'success'               => 'Il backup del sistema è stato ripristinato. Effettua nuovamente il login.'
+    ],
     'purge' => [
         'error'     => 'Si è verificato un errore durante la pulizia. ',
         'validation_failed'     => 'La conferma dell\'eliminazione non è corretta. Digita "DELETE" nel box di conferma.',
@@ -33,6 +36,9 @@ return [
         'testing_authentication' => 'Testo l\'Autenticazione LDAP...',
         'authentication_success' => 'Utente autenticato correttamente con LDAP!'
     ],
+    'labels' => [
+        'null_template' => 'Modello di etichetta non trovato. Si prega di selezionare un modello.',
+        ],
     'webhook' => [
         'sending' => 'Invio a :app un messaggio di prova...',
         'success' => 'La tua integrazione :webhook_name funziona!',
@@ -42,5 +48,12 @@ return [
         'error' => 'Qualcosa è andato storto. :app ha risposto con: :error_message',
         'error_redirect' => 'ERROR: 301/302 :endpoint restituisce un reindirizzamento. Per motivi di sicurezza, non seguiamo reindirizzamenti. Si prega di utilizzare l\'endpoint attuale.',
         'error_misc' => 'Qualcosa è andato storto. :( ',
-    ]
+        'webhook_fail' => ' notifica webhook fallita: Controlla che l\'URL sia ancora valido.',
+        'webhook_channel_not_found' => ' canale webhook non trovato.',
+        'ms_teams_deprecation' => 'The selected Microsoft Teams webhook URL will be deprecated Dec 31st, 2025. Please use a workflow URL. Microsoft\'s documentation on creating a workflow can be found <a href="https://support.microsoft.com/en-us/office/create-incoming-webhooks-with-workflows-for-microsoft-teams-8ae491c7-0394-4861-ba59-055e33f75498" target="_blank"> here.</a>',
+    ],
+    'location_scoping' => [
+        'not_saved' => 'Le tue impostazioni non sono state salvate.',
+        'mismatch' => 'C\'è 1 elemento nel database che ha bisogno della vostra attenzione prima di abilitare i filtri per posizione.|Ci sono :count elementi nel database che hanno bisogno della vostra attenzione prima di abilitare i filtri per posizione.',
+    ],
 ];
diff --git a/resources/lang/it-IT/admin/statuslabels/table.php b/resources/lang/it-IT/admin/statuslabels/table.php
index 1bd019b58f..4ef5f09291 100644
--- a/resources/lang/it-IT/admin/statuslabels/table.php
+++ b/resources/lang/it-IT/admin/statuslabels/table.php
@@ -1,14 +1,14 @@
 <?php
 
 return array(
-    'about'      	=> 'Informazioni sulle etichette di stato',
+    'about'      	=> 'About Status Types',
     'archived'      	=> 'Archiviato',
     'create'      	=> 'Crea Etichetta di Stato',
     'color'      	=> 'Colore del grafico',
     'default_label' => 'Etichetta predefinita',
     'default_label_help' => 'Viene utilizzato per garantire che le etichette di stato più comuni vengano visualizzate nella parte superiore della casella di selezione durante la creazione / modifica delle risorse.',
     'deployable'      	=> 'Assegnabile',
-    'info'      	=> 'Le etichette di stato sono usate per descrivere i vari stati dei beni. Essi possono essere fuori per la riparazione, perso o rubato, etc. È possibile creare nuove etichette di stato per schierabili, in attesa e dei beni archiviati.',
+    'info'      	=> 'Status label types are used to describe the various states your assets could be in. They may be out for repair, lost/stolen, etc. You can create new status labels for your deployable, pending and archived assets according to your own workflow. For more information, <a href="https://snipe-it.readme.io/docs/overview#status-labels" target="_blank">see the documentation <i class="fa fa-external-link"></i></a>.',
     'name'      	=> 'Nome Stato',
     'pending'      	=> 'In attesa',
     'status_type'   => 'Tipo di stato',
diff --git a/resources/lang/it-IT/admin/users/general.php b/resources/lang/it-IT/admin/users/general.php
index c97a4eb4e0..3ffff34900 100644
--- a/resources/lang/it-IT/admin/users/general.php
+++ b/resources/lang/it-IT/admin/users/general.php
@@ -15,17 +15,19 @@ return [
     'info'				=> 'Informazioni',
     'restore_user'		=> 'Clicca qui per ripristinarli.',
     'last_login'        => 'Ultimo accesso',
-    'ldap_config_text'  => 'Le impostazioni di configurazione di LDAP possono essere trovate su Admin > Impostazioni. La posizione selezionata (facoltativa) verrà impostata per tutti gli utenti importati.',
+    'ldap_config_text'  => 'Le impostazioni di configurazione di LDAP possono essere trovate su Admin > Impostazioni. La Sede selezionata (facoltativa) verrà impostata per tutti gli utenti importati.',
     'print_assigned'    => 'Stampa tutti assegnati',
     'email_assigned'    => 'Elenco e-mail di tutti assegnati',
     'user_notified'     => 'All\'utente è stato inviato tramite e-mail un elenco degli elementi attualmente assegnati.',
+    'users_notified'    => 'All\'utente è stata inviata una mail con la lista dei suoi beni.|A :count utenti è stata inviata una mail con la lista dei loro beni.',
+    'users_notified_warning' => 'A :count utente è stata inviata una mail con la lista dei suoi beni, ma a :no_email utenti non è stato mandato nulla perché non hanno un indirizzo mail impostato|A :count utenti è stata inviata una mail con la lista dei loro beni, ma a :no_email utente/i non è stato mandato nulla perché non hanno un indirizzo mail impostato.',
     'auto_assign_label' => 'Includi l\'utente nella assegnazione automatica delle licenze',
     'auto_assign_help'  => 'Salta l\'utente nell\'assegnazione automatica delle licenze',
     'software_user'     => 'Software estratto a :name',
     'send_email_help'   => 'Devi fornire un indirizzo email all\'utente per inviare loro le credenziali. L\'inoltro delle credenziali via email avviene solo durante la creazione dell\'utente. La password è memorizzata in un hash unidirezionale e non può essere recuperata, una volta salvata.',
     'view_user'         => 'Visualizza Utente :name',
     'usercsv'           => 'CSV file',
-    'two_factor_admin_optin_help' => 'Le impostazioni correnti di amministratore consentono l\'esecuzione selettiva dell\'autenticazione a due fattori.',
+    'two_factor_admin_optin_help' => 'Le impostazioni correnti consentono l\'attivazione selettiva dell\'autenticazione a due fattori.  ',
     'two_factor_enrolled' => 'Dispositivo 2FA Iscritto ',
     'two_factor_active'   => '2FA attivo ',
     'user_deactivated'  => 'L\'utente non può loggarsi',
@@ -35,12 +37,12 @@ return [
     'superadmin_permission_warning' => 'Solo i superamministratori possono concedere il permesso di superamministratore a un altro utente.',
     'admin_permission_warning' => 'Solo gli utenti con diritti di amministratore o superiore possono nominare altri utenti come amministratore.',
     'remove_group_memberships' => 'Rimuove Membri del Gruppo',
-    'warning_deletion_information' => 'Stai per effettuare il Checkin di TUTTI gli elementi degli utenti :count elencati di seguito. I nomi dei super amministratori sono evidenziati in rosso.',
+    'warning_deletion_information' => 'Stai per effettuare la restituzione di TUTTI gli articoli da :count utente/i elencati di seguito. I nomi dei super amministratori sono evidenziati in rosso.',
     'update_user_assets_status' => 'Aggiorna tutti i beni per questi utenti a questo stato',
-    'checkin_user_properties' => 'Esegui il check-in di tutte le proprietà associate a questi utenti',
+    'checkin_user_properties' => 'Esegui la restituzione di tutte le assegnazioni associate a questi utenti',
     'remote_label'   => 'Questo è un utente remoto',
     'remote'   => 'Remoto',
-    'remote_help' => 'Questo può esserti utile se devi filtrare gli utenti remoti che non entrano mai o solo raramente nelle tue posizioni fisiche.',
+    'remote_help' => 'Questo può esserti utile devi filtrare gli utenti remoti che non entrano mai o solo raramente nelle tue Sedi fisiche.',
     'not_remote_label' => 'Questo non è un utente remoto',
     'vip_label' => 'Utente VIP',
     'vip_help' => 'Puoi contrassegnare le persone importanti nella tua organizzazione, se vuoi trattarle in maniera speciale.',
diff --git a/resources/lang/it-IT/admin/users/message.php b/resources/lang/it-IT/admin/users/message.php
index 654d82fdf0..89b08a8e06 100644
--- a/resources/lang/it-IT/admin/users/message.php
+++ b/resources/lang/it-IT/admin/users/message.php
@@ -6,7 +6,7 @@ return array(
     'declined'                  => 'Hai rifiutato con successo questo prodotto.',
     'bulk_manager_warn'	        => 'I tuoi utenti sono stati aggiornati con successo, tuttavia la voce del gestore non è stata salvata perché il gestore selezionato è stato anche nell\'elenco utenti da modificare e gli utenti potrebbero non essere il proprio gestore. Seleziona nuovamente i tuoi utenti, esclusi il gestore.',
     'user_exists'               => 'Utente già esistente!',
-    'user_not_found'            => 'L\'utente non esiste.',
+    'user_not_found'            => 'L\'Utente non esiste, oppure non hai i permessi per visualizzarlo.',
     'user_login_required'       => 'È necessario il campo login',
     'user_has_no_assets_assigned' => 'Nessun bene assegnato all\'utente.',
     'user_password_required'    => 'È richiesta la password.',
@@ -40,7 +40,7 @@ return array(
         'delete_has_assets_var' => 'Questo utente ha ancora un Bene assegnato. Prima di procedere, si prega di farlo restituire.|Questo utente ha ancora :count Beni assegnati. Prima di procedere si prega di farglieli restituire.',
         'delete_has_licenses_var' => 'Questo utente ha ancora una licenza assegnata. Prima di procedere si prega di fargliela restituire|Questo utente ha ancora :count licenze assegnate. Prima di procedere si prega di fargliele restituire.',
         'delete_has_accessories_var' => 'Questo utente ha ancora un accessorio assegnato. Prima di procedere si prega di farglielo restituire|Questo utente ha ancora :count accessori assegnati. Prima di procedere si prega di farglieli restituire.',
-        'delete_has_locations_var' => 'Questo utente è ancora responsabile di una sede. Si prega di scegliere un altro responsabile prima di procedere.|Questo utente è ancora responsabile di :count sedi. Si prega di scegliere un altro responsabile prima di procedere.',
+        'delete_has_locations_var' => 'Questo utente è ancora responsabile di una Sede. Si prega di scegliere un altro responsabile prima di procedere.|Questo utente è ancora responsabile di :count Sedi. Si prega di scegliere un altro responsabile prima di procedere.',
         'delete_has_users_var' => 'Questo utente è ancora responsabile di un altro utente. Si prega di scegliere un altro responsabile prima di procedere.|Questo utente è ancora responsabile di :count utenti. Si prega di scegliere un altro responsabile prima di procedere.',
         'unsuspend' => 'C\'è stato un problema durante la riabilitazione dell\'utente. Riprova per favore.',
         'import'    => 'C\'è stato un problema durante l\'importazione degli utenti. Riprova per favore.',
@@ -53,6 +53,7 @@ return array(
         'ldap_could_not_search' => 'Impossibile trovare il server LDAP. Controlla la configurazione del tuo server LDAP nel file di configurazione LDAP.<br>Errori dal server LDAP:',
         'ldap_could_not_get_entries' => 'Impossibile ottenere voci dal server LDAP. Controlla la configurazione del tuo server LDAP nel file di configurazione LDAP.<br>Errori dal server LDAP:',
         'password_ldap' => 'La password per questo account è gestita da LDAP / Active Directory. Per cambiare la tua password, contatta il tuo reparto IT.',
+        'multi_company_items_assigned' => 'A questo utente sono assegnati oggetti appartenenti a un\'altra azienda. Si prega di farli restituire o modificarne l\'azienda.'
     ),
 
     'deletefile' => array(
diff --git a/resources/lang/it-IT/admin/users/table.php b/resources/lang/it-IT/admin/users/table.php
index c96680be7c..55699c964c 100644
--- a/resources/lang/it-IT/admin/users/table.php
+++ b/resources/lang/it-IT/admin/users/table.php
@@ -16,13 +16,13 @@ return array(
     'job' 					=> 'Professione',
     'last_login'  			=> 'Ultimo accesso',
     'last_name'  			=> 'Cognome',
-    'location'  			=> 'Posizione',
+    'location'  			=> 'Sede',
     'lock_passwords'		=> 'Dettagli di login non possono essere cambiati in questa installazione.',
     'manager' 				=> 'Manager',
-    'managed_locations'     => 'Località gestite',
+    'managed_locations'     => 'Sedi gestite',
     'managed_users'         => 'Utenti Gestiti',
     'name' 					=> 'Nome',
-    'nogroup'               => 'Non è stato ancora creato nessun gruppo. Per aggiungerne uno, vai al link: ',
+    'nogroup'               => 'Non è stato ancora creato nessun gruppo. Per aggiungerne uno, vai al link:',
     'notes'                 => 'Note',
     'password_confirm' 		=> 'Conferma password',
     'password' 				=> 'Password',
diff --git a/resources/lang/it-IT/auth.php b/resources/lang/it-IT/auth.php
index 15bca5fe03..a6fe30fc06 100644
--- a/resources/lang/it-IT/auth.php
+++ b/resources/lang/it-IT/auth.php
@@ -15,6 +15,6 @@ return array(
 
     'failed' => 'Credenziali non corrispondenti ai dati registrati.',
     'password' => 'La password fornita non è corretta.',
-    'throttle' => 'Troppi tentativi di accesso. Riprova tra :seconds secondi.',
+    'throttle' => 'Troppi tentativi di login. Per favore riprova tra :minutes minuti.',
 
 );
diff --git a/resources/lang/it-IT/auth/message.php b/resources/lang/it-IT/auth/message.php
index b0f9130efa..7664ba9fb3 100644
--- a/resources/lang/it-IT/auth/message.php
+++ b/resources/lang/it-IT/auth/message.php
@@ -6,8 +6,6 @@ return array(
     'account_not_found'      => 'Nome utente o password non corretto.',
     'account_not_activated'  => 'Questo account non è attivo.',
     'account_suspended'      => 'Questo account è sospeso.',
-    'account_banned'         => 'Questo account è bannato.',
-    'throttle'               => 'Troppi tentativi di login falliti. Per favore riprova entro :minutes minuti.',
 
     'two_factor' => array(
         'already_enrolled'      => 'Il tuo dispositivo è già registrato.',
diff --git a/resources/lang/it-IT/button.php b/resources/lang/it-IT/button.php
index e317cd51ad..767da37440 100644
--- a/resources/lang/it-IT/button.php
+++ b/resources/lang/it-IT/button.php
@@ -7,6 +7,7 @@ return [
     'checkin_and_delete'  	    => 'Restituisci tutto / Elimina utente',
     'delete'  	                => 'Cancella',
     'edit'    	                => 'Modifica',
+    'clone'    	                => 'Clona',
     'restore' 	                => 'Ripristina',
     'remove'                    => 'Rimuovi',
     'request'                   => 'Richiedi',
@@ -21,4 +22,13 @@ return [
     'add_maintenance'           => 'Aggiungi Manutenzione',
     'append'                    => 'Aggiungi',
     'new'                       => 'Nuovo',
+    'var' => [
+        'clone'     => 'Clona :item_type',
+        'edit'      => 'Modifica :item_type',
+        'delete'    => 'Elimina :item_type',
+        'restore'   => 'Ripristina :item_type',
+        'create'    => 'Crea Nuovo :item_type',
+        'checkout'  => 'Assegna :item_type',
+        'checkin'   => 'Restituisci :item_type',
+    ]
 ];
diff --git a/resources/lang/it-IT/general.php b/resources/lang/it-IT/general.php
index bef6213960..90defb3cbc 100644
--- a/resources/lang/it-IT/general.php
+++ b/resources/lang/it-IT/general.php
@@ -10,7 +10,7 @@ return [
     'action'                => 'Azione',
     'activity_report'		=> 'Report delle attività',
     'address'				=> 'Indirizzo',
-    'admin'					=> 'Amministratore',
+    'admin'					=> 'Impostazioni Admin',
     'admin_tooltip'			=> 'L\'utente è un amministratore',
     'superuser'				=> 'Superuser',
     'superuser_tooltip'		=> 'L\'utente è un superuser',
@@ -23,13 +23,16 @@ return [
     'asset_models'			=> 'Modelli Bene',
     'asset_model'			=> 'Modello',
     'asset'					=> 'Bene',
+    'asset_previous'        => 'Bene (Precedentemente Assegnato)',
     'asset_report'          => 'Report Beni',
     'asset_tag'				=> 'Etichetta del Bene',
     'asset_tags'            => 'Etichette dei Beni',
     'assets_available'		=> 'Beni disponibili',
     'accept_assets'         => 'Accetta Beni :name',
     'accept_assets_menu'    => 'Accetta Beni',
+    'accept_item'           => 'Accetta Oggetto',
     'audit'				    => 'Revisione Inventario',
+    'audits'				=> 'Revisioni',
     'audit_report'			=> 'Registro Revisione Inventario',
     'assets'				=> 'Beni',
     'assets_audited'        => 'beni inventariati',
@@ -49,7 +52,7 @@ return [
     'bulk_edit'             => 'Modifica Massiva',
     'bulk_delete'           => 'Cancellazione Massiva',
     'bulk_actions'          => 'Azioni Massive',
-    'bulk_checkin_delete'   => 'Registrazione / Cancellazione Massiva di Utenti',
+    'bulk_checkin_delete'   => 'Restituzione Massiva / Cancellazione Utenti',
     'byod'                  => 'BYOD',
     'byod_help'             => 'Questo dispositivo appartiene all\'utente',
     'bystatus'              => 'per Stato',
@@ -60,10 +63,13 @@ return [
     'changeemail'  			=> 'Modifica indirizzo email',
     'changepassword'  		=> 'Modifica password',
     'checkin'  				=> 'Restituzione',
-    'checkin_from'  		=> 'Restituito da',
+    'checkin_from'  		=> 'Restituzione da',
+    'checkin_note'  		=> 'Nota di Restituzione',
+    'checkout_note'  		=> 'Nota di Assegnazione',
     'checkout'  			=> 'Assegna',
     'checkouts_count'       => 'Assegnazioni',
     'checkins_count'        => 'Restituzioni',
+    'checkin_and_delete'  	=> 'Restituisci ed Elimina',
     'user_requests_count'   => 'Richieste',
     'city'  				=> 'Città',
     'click_here'			=> 'Clicca qui',
@@ -77,7 +83,7 @@ return [
     'consumables'			=> 'Consumabili',
     'country'  				=> 'Paese',
     'could_not_restore'     => 'Errore nel ripristino di :item_type: :error',
-    'not_deleted'           => 'Il :item_type non può essere ripristinato perché non è stato cancellato',
+    'not_deleted'           => ':item_type non può essere ripristinato perché non è stato cancellato',
     'create'				=> 'Crea',
     'created'               => 'Articolo creato',
     'created_asset'			=> 'bene creato',
@@ -86,11 +92,13 @@ return [
     'record_created' 		=> 'Record creato',
     'updated_at' 			=> 'Aggiornato a',
     'currency'  			=> '$', // this is deprecated
+    'currency_text'  		=> 'Valuta', //
     'current'  				=> 'Attuale',
     'current_password'      => 'Password attuale',
     'customize_report'      => 'Personalizza Report',
     'custom_report'         => 'Report personalizzato Beni',
     'dashboard'				=> 'Cruscotto',
+    'data_source'           => 'Fonte dei Dati',
     'days'      			=> 'giorni',
     'days_to_next_audit'    => 'Giorni al prossimo controllo inventario',
     'date'					=> 'Data',
@@ -105,38 +113,22 @@ return [
     'departments'           => 'Reparti',
     'department'            => 'Reparto',
     'deployed'				=> 'Assegnati',
-    'depreciation'			=> 'Svalutazione',
-    'depreciations'         => 'Svalutazioni',
-    'depreciation_report'	=> 'Report Svalutazione',
+    'depreciation'			=> 'Deprezzamento',
+    'depreciations'         => 'Deprezzamenti',
+    'depreciation_report'	=> 'Report Deprezzamento',
     'details'               => 'Dettagli',
     'download'				=> 'Scarica',
     'download_all'		    => 'Scarica tutto',
     'editprofile'  			=> 'Modifica il tuo profilo',
     'eol'					=> 'EOL',
     'email_domain'			=> 'Dominio di posta elettronica',
-    'email_format'			=> 'Formato di posta elettronica',
     'employee_number'       => 'Numero Dipendente',
     'email_domain_help'		=> 'Questo viene utilizzato per generare indirizzi e-mail durante l\'importazione',
     'error'				    => 'Errore',
     'exclude_archived'      => 'Escludi i Beni Archiviati',
     'exclude_deleted'       => 'Escludi i Beni Eliminati',
     'example'				=> 'Esempio: ',
-    'filastname_format'			=> 'Iniziale Nome + Cognome (jsmith@example.com)',
-    'firstname_lastname_format'	=> 'Nome.Cognome (jane.smith@example.com)',
-    'firstname_lastname_underscore_format' => 'Nome_Cognome (jane_smith@example.com)',
-    'lastnamefirstinitial_format' =>  'Cognome + Iniziale Nome (smithj@esempio.it)',
-    'firstintial_dot_lastname_format' => 'Iniziale Nome . Cognome (j.smith@example.com)',
-    'firstname_lastname_display'	=> 'Nome Cognome (Jane Smith)',
-    'lastname_firstname_display'	=> 'Cognome Nome (Smith Jane)',
-    'name_display_format'	=> 'Formato Nome',
-    'first'					=> 'Primo',
-    'firstnamelastname'     => 'Nome Cognome (janesmith@example.com)',
-    'lastname_firstinitial' => 'Cognome_ Iniziale Nome (smith_j@example.com)',
-    'firstinitial.lastname' => 'Iniziale Nome . Cognome (j.smith@example.com)',
-    'firstnamelastinitial'  => 'Nome + Iniziale Cognome (janes@example.com)',
-    'lastnamefirstname'      => 'Cognome Nome (smith.jane@esempio.it)',
-    'first_name'			=> 'Nome',
-    'first_name_format'		=> 'Nome (jane@example.com)',
+
     'files'                 => 'Files',
     'file_name'				=> 'File',
     'file_type'             => 'Tipo di file',
@@ -156,9 +148,9 @@ return [
     'image_delete'         	=> 'Cancella l\'Immagine',
     'include_deleted'       => 'Includi i Beni Eliminati',
     'image_upload'         	=> 'Carica immagine',
-    'filetypes_accepted_help'    => 'Tipo di file accettato :types. Dimensione massima di caricamento :size.|Tipi di file accettati :types. Dimensione massima di caricamento :size.',
-    'filetypes_size_help'   => 'Dimensione massima di caricamento :size.',
-    'image_filetypes_help'  => 'Accepted filetypes are jpg, webp, png, gif, svg, and avif. Max upload size allowed is :size.',
+    'filetypes_accepted_help'    => 'Il tipo di file accettato è :types. La dimensione massima è :size.|I tipi di file accettati sono :types. La dimensione massima di caricamento è :size.',
+    'filetypes_size_help'   => 'La dimensione massima di caricamento è :size.',
+    'image_filetypes_help'  => 'I tipi di file accettati sono jpg, webp, png, gif, svg e avif. La dimensione massima consentita è :size.',
     'unaccepted_image_type'  => 'Questo immagine non è leggibile. I tipi di file accettati sono jpg, webp, png, gif e svg. Il tipo di questo file è :mimetype.',
     'import'         	    => 'Importa',
     'import_this_file'      => 'Mappa i campi ed elabora questo file',
@@ -178,17 +170,22 @@ return [
     'last'					=> 'Ultimo',
     'last_login'            => 'Ultimo accesso',
     'last_name'             => 'Cognome',
+    'firstname_lastname_display'	=> 'Nome Cognome (Jane Smith)',
+    'lastname_firstname_display'	=> 'Cognome Nome (Smith Jane)',
+    'name_display_format'	=> 'Formato Nome',
+    'first'					=> 'Primo',
+    'first_name'			=> 'Nome',
     'license'				=> 'Licenza',
     'license_report'        => 'Report Licenze',
     'licenses_available'	=> 'Licenze disponibili',
     'licenses'				=> 'Licenze',
     'list_all'				=> 'Visualizza Tutti',
-    'loading'				=> 'Caricamento... attendere prego....',
+    'loading'				=> 'Caricamento... attendere prego...',
     'lock_passwords'        => 'Questo valore non verrà salvato in un\'installazione demo.',
     'feature_disabled'      => 'Questa funzionalità è stata disabilitata per l\'installazione demo.',
-    'location'              => 'Luogo',
-    'location_plural'        => 'Posizione<unk> Posizioni',
-    'locations'				=> 'Luoghi',
+    'location'              => 'Sede',
+    'location_plural'        => 'Sede|Sedi',
+    'locations'				=> 'Sedi',
     'logo_size'				=> 'I loghi quadrati appaiono meglio con Logo + Testo. La dimensione massima in pixel è di 50px in altezza e 500px in larghezza.  ',
     'logout'				=> 'Logout',
     'lookup_by_tag'     => 'Ricerca per Etichetta Bene',
@@ -211,10 +208,18 @@ return [
     'no_email'              => 'Nessun indirizzo email associato a questo utente',
     'last_audit'		    => 'Ultimo Controllo Inventario',
     'new'					=> 'nuovo!',
-    'no_depreciation'		=> 'Nessuna Svalutazione',
+    'no_depreciation'		=> 'Nessun Deprezzamento',
     'no_results'			=> 'Nessun risultato.',
     'no'  					=> 'No',
     'notes'  				=> 'Note',
+    'note_added'            => 'Nota Aggiunta',
+    'options'				=> 'Opzioni',
+    'preview'				=> 'Anteprima',
+    'add_note'              => 'Aggiungi nota',
+    'note_edited'            => 'Nota Modificata',
+    'edit_note'              => 'Modifica Nota',
+    'note_deleted'            => 'Nota cancellata',
+    'delete_note'              => 'Cancella nota',
     'order_number'          => 'Numero d\'ordine',
     'only_deleted'          => 'Solo Beni Eliminati',
     'page_menu'				=> 'Visualizza _MENU_ articoli',
@@ -229,10 +234,10 @@ return [
     'purchase_date'         => 'Data di acquisto',
     'qty'		            => 'Qtà',
     'quantity'		        => 'Quantità',
-    'quantity_minimum'      => 'Hai :count articoli sotto o quasi sotto alla soglia minima',
+    'quantity_minimum'      => 'Hai un oggetto sotto o quasi sotto la quantità minima richiesta|Hai :count oggetti sotto o quasi sotto la quantità minima richiesta',
     'quickscan_checkin'  	=> 'Restituzione a Scansione Rapida',
     'quickscan_checkin_status'  	=> 'Stato restituzione',
-    'ready_to_deploy'		=> 'Pronto per l\'assegnazione',
+    'ready_to_deploy'		=> 'Pronti per l\'assegnazione',
     'recent_activity'		=> 'Attività Recenti',
     'remaining'             => 'Rimanente',
     'remove_company'        => 'Rimuovi associazione azienda',
@@ -256,8 +261,8 @@ return [
     'select_category'       => 'Seleziona una categoria',
     'select_datasource' => 'Seleziona una Origine Dati',
     'select_department'     => 'Seleziona un Reparto',
-    'select_depreciation'	=> 'Seleziona un tipo di Svalutazione',
-    'select_location'		=> 'Seleziona un Luogo',
+    'select_depreciation'	=> 'Seleziona un tipo di Deprezzamento',
+    'select_location'		=> 'Scegli una Sede',
     'select_manufacturer'	=> 'Seleziona un Produttore',
     'select_model'			=> 'Seleziona un Modello',
     'select_supplier'		=> 'Seleziona un Fornitore',
@@ -279,8 +284,10 @@ return [
     'site_name'				=> 'Nome sito',
     'state'  				=> 'Provincia',
     'status_labels'			=> 'Etichette di Stato',
+    'status_label'			=> 'Etichetta stato',
     'status'    			=> 'Stato',
     'accept_eula'           => 'Accettazione Accordo',
+    'show_or_hide_eulas' => 'Mostra/Nascondi EULA',
     'supplier'              => 'Fornitore',
     'suppliers'  			=> 'Fornitori',
     'sure_to_delete'        => 'Sei sicuro di voler eliminare',
@@ -296,9 +303,9 @@ return [
     'type'  				=> 'Tipo',
     'undeployable'			=> 'Non consegnabile',
     'unknown_admin'			=> 'Amministratore sconosciuto',
-    'username_format'		=> 'Formato nome utente',
     'username'              => 'Nome utente',
     'update'                => 'Aggiorna',
+    'updating_item' => 'Aggiornamento :item',
     'upload_filetypes_help'      => 'I tipi di file permessi sono png, gif, jpg, jpeg, doc, docx, pdf, xls, xlsx, txt, lic, xml, zip, rtf e rar. La dimensione massima di upload è di :size.',
     'uploaded'              => 'Caricato',
     'user'					=> 'Utente',
@@ -323,10 +330,10 @@ return [
     'token_expired'         => 'La sessione del modulo è scaduta. Riprova.',
     'login_enabled'         => 'Login Abilitato',
     'audit_due'             => 'In scadenza per Controllo Inventario',
-    'audit_due_days'        => 'Bene da inventariare entro :days giorni|Beni da inventariare entro :days giorni',
+    'audit_due_days'        => '{}Ci sono dei beni da controllare subito|[1]Ci sono dei beni da controllare tra massimo un giorno|[2,*]Ci sono dei beni da controllare al massimo tra :days giorni',
     'checkin_due'           => 'Scadenza per la restituzione',
     'checkin_overdue'       => 'Oltre la scadenza per restituzione',
-    'checkin_due_days'      => 'Check-in del bene da effettuare entro :days giorno|Check-in del bene da effettuare entro :days giorni',
+    'checkin_due_days'      => '{}Check-in da fare|[1]Check-in dei beni da fare entro :days giorno|[2,*]Check-in dei beni da fare entro :days giorni',
     'audit_overdue'         => 'Scaduto per Controllo Inventario',
     'accept'                => 'Accetta :asset',
     'i_accept'              => 'Accetto',
@@ -339,8 +346,8 @@ return [
     'view_all'              => 'visualizza tutti',
     'hide_deleted'          => 'Nascondi Eliminati',
     'email'                 => 'Email',
-    'do_not_change'         => 'Non Cambiare',
-    'bug_report'            => 'Segnala un Bug',
+    'do_not_change'         => 'Non cambiare',
+    'bug_report'            => 'Segnala un bug',
     'user_manual'           => 'Manuale Utente',
     'setup_step_1'          => 'Passo 1',
     'setup_step_2'          => 'Passo 2',
@@ -348,7 +355,7 @@ return [
     'setup_step_4'          => 'Passo 4',
     'setup_config_check'    => 'Controllo Configurazione',
     'setup_create_database' => 'Crea tabelle database',
-    'setup_create_admin'    => 'Crea utente Amministratore',
+    'setup_create_admin'    => 'Crea un utente amministratore',
     'setup_done'            => 'Finito!',
     'bulk_edit_about_to'    => 'Stai per modificare quanto segue: ',
     'checked_out'           => 'Assegnato',
@@ -375,7 +382,7 @@ return [
     'sync_results'          => 'Risultati Sincronizzazione',
     'license_serial'        => 'Codice Seriale/Prodotto',
     'invalid_category'      => 'Categoria non valida o mancante',
-    'invalid_item_category_single' => 'Categoria :type non valida o mancante. Aggiorna la categoria di :type per includere una categoria valida prima del check-out.',
+    'invalid_item_category_single' => 'Categoria :type non valida o mancante. Aggiorna la categoria di :type per includere una categoria valida prima dell\'assegnazione.',
     'dashboard_info'        => 'Questa è la tua dashboard. Ce ne sono tante, ma questa è solo tua.',
     '60_percent_warning'    => 'Completo al 60% (Avvertimento)',
     'dashboard_empty'       => 'Sembra che tu non abbia aggiunto ancora niente, per cui non abbiamo niente di eclatante da mostrarti. Inizia aggiungendo adesso qualche Bene, Accessorio, Consumabili o Licenze!',
@@ -383,6 +390,8 @@ return [
     'new_license'           => 'Nuova Licenza',
     'new_accessory'         => 'Nuovo Accessorio',
     'new_consumable'        => 'Nuovo Consumabile',
+    'new_component'         => 'New Component',
+    'new_user'              => 'New User',
     'collapse'              => 'Riduci',
     'assigned'              => 'Assegnato',
     'asset_count'           => 'Quantità Beni',
@@ -407,7 +416,7 @@ return [
     'checkout_tooltip' => 'Assegna questo articolo',
     'checkin_tooltip' => 'Restituisci questo oggetto in modo che sia disponibile per una riassegnazione, ripristino, ecc...',
     'checkout_user_tooltip' => 'Assegna questo articolo a un utente',
-    'checkin_to_diff_location' => 'Puoi scegliere di restituire questo Bene a una sede diversa da quella predefinita di :default_location , se è stata impostata',
+    'checkin_to_diff_location' => 'Puoi scegliere di restituire questo Bene a una Sede diversa da quella predefinita di :default_location, se è stata impostata',
     'maintenance_mode'      => 'Servizio temporaneamente non disponibile per aggiornamenti. Si prega di riprovare più tardi.',
     'maintenance_mode_title' => 'Sistema Temporaneamente Non Disponibile',
     'ldap_import'           => 'La password dell\'utente non deve essere gestita da LDAP. (Consente di inviare le richieste di password dimenticate.)',
@@ -418,19 +427,20 @@ return [
     'bulk_soft_delete'      =>'Includi soft-delete di questi utenti. La cronologia dei loro Beni rimarrà intatta finché non elimini i record nelle Impostazioni di Amministrazione.',
     'bulk_checkin_delete_success' => 'Gli utenti che hai selezionato sono stati eliminati e i loro articoli sono stati restituiti.',
     'bulk_checkin_success' => 'Gli articoli degli utenti selezionati sono stati restituiti.',
-    'set_to_null'           => 'Elimina i valori per questo Bene|Elimina i valori per :asset_count Beni ',
+    'set_to_null'           => 'Elimina i valori per questa selezione|Elimina i valori per tutte le :selection_count selezioni ',
     'set_users_field_to_null'  => 'Cancella i valori :field per questo utente|Cancella i valori :field per tutti i :user_count utenti ',
     'na_no_purchase_date'   => 'N/D - data acquisto non dichiarata',
     'assets_by_status'      => 'Beni per Stato',
     'assets_by_status_type'      => 'Beni per Tipo di Stato',
     'pie_chart_type'        => 'Tipo di Grafico a Torta nel Cruscotto',
     'hello_name'            => 'Ciao, :name!',
-    'unaccepted_profile_warning'   => 'Hai :count articoli da accettare. Clicca qui per accettarli o rifiutarli',
+    'unaccepted_profile_warning'   => 'Hai un oggetto che richiede l\'accettazione. Clicca qui per accettarlo o rifiutarlo|Hai :count elementi che richiedono l\'accettazione. Clicca qui per accettarli o rifiutarli',
     'start_date'            => 'Data Inizio',
     'end_date'            => 'Data Fine',
     'alt_uploaded_image_thumbnail' => 'Miniatura caricata',
     'placeholder_kit'       => 'Seleziona un kit',
     'file_not_found'        => 'File non trovato',
+    'log_record_not_found'  => 'Nessun record trovato per quella voce di registro.',
     'preview_not_available' => '(nessuna anteprima)',
     'setup'                 => 'Setup',
     'pre_flight'            => 'Prova',
@@ -498,7 +508,7 @@ return [
         'manager_full_name' => 'Nome Cognome Manager',
         'manager_username' => 'Username del Manager',
         'checkout_type' => 'Tipo di Assegnazione',
-        'checkout_location' => 'Assegnazione a Luogo',
+        'checkout_location' => 'Assegnazione a Sede',
         'image_filename' => 'Nome File Immagine',
         'do_not_import'     => 'Non Importare',
         'vip' => 'VIP',
@@ -512,11 +522,11 @@ return [
     'checked_out_to_fields' => 'Campi degli assegnati',
     'percent_complete' => '% completato',
     'uploading' => 'Caricamento... ',
-    'upload_error' => 'Errore nel caricamento del file. Controlla che non ci siano righe vuote e che nessun nome di colonna sia duplicato.',
+    'upload_error' => 'Errore nel caricamento del file. Si prega di controllare che non ci siano righe vuote o nomi di colonne duplicati nel CSV e che le autorizzazioni del server consentano i caricamenti.',
     'copy_to_clipboard' => 'Copia negli Appunti',
     'copied' => 'Copiato!',
     'status_compatibility' => 'Se i Beni sono già assegnati, il loro stato non può essere cambiato in "Non consegnabile" e la modifica di questo valore verrà ignorata.',
-    'rtd_location_help' => 'Questo è il luogo dove si trova il Bene quando non è assegnato',
+    'rtd_location_help' => 'Questo è la Sede dove si trova il Bene quando non è assegnato',
     'item_not_found' => ':item_type ID :id non esiste o è stato cancellato',
     'action_permission_denied' => 'Non hai i permessi per :action :item_type ID :id',
     'action_permission_generic' => 'Non hai i permessi per :action questo :item_type',
@@ -528,7 +538,7 @@ return [
     'permission_denied_superuser_demo' => 'Permesso negato. Impossibile aggiornare le informazioni utente per i superadmin sulla demo.',
     'pwd_reset_not_sent' => 'L\'utente non è attivato, è sincronizzato con LDAP o non ha un indirizzo email',
     'error_sending_email' => 'Errore nell\'invio dell\'email',
-    'sad_panda' => 'Sad panda. You are not authorized to do the thing. Maybe <a href=":link">return to the dashboard</a>, or contact your administrator.',
+    'sad_panda' => 'Triste panda. Non sei autorizzato a fare questa cosa. Forse <a href=":link">vuoi tornare al cruscotto iniziale</a>, oppure contattare il tuo amministratore.',
     'bulk' => [
             'delete' =>
                 [
@@ -549,6 +559,71 @@ return [
         'license_seats'  => ':count Disponibilità Licenza|:count Disponibilità Licenza',
         'consumables'  => ':count Consumabile|:count Consumabili',
         'components'  => ':count Componente|:count Componenti',
-    ]
+    ],
+
+    'more_info' => 'Altre informazioni',
+    'quickscan_bulk_help' => 'Spuntare questa casella modificherà la Sede di questo Bene. Non spuntandola, la Sede verrà solo annotata nel registro del controllo inventario. Nota che se questo bene è già assegnato, non verrà modificata la Sede della persona, del Bene o della Sede a cui è assegnato.',
+    'whoops' => 'Ops!',
+    'something_went_wrong' => 'Qualcosa è andato storto con la tua richiesta.',
+    'close' => 'Chiudi',
+    'expires' => 'Scade',
+    'map_fields'=> 'Mappa i Campi :item_type',
+    'remaining_var' => ':count Rimanenti',
+    'label' => 'Etichetta',
+    'import_asset_tag_exists' => 'Esiste già un Bene con tag :asset_tag e non è stato richiesto un aggiornamento. Nessuna modifica effettuata.',
+    'countries_manually_entered_help' => 'I valori con un asterisco (*) sono stati inseriti manualmente e non corrispondono a valori esistenti ISO 3166 nell\'elenco a discesa',
+    'accessories_assigned' => 'Accessori Assegnati',
+    'user_managed_passwords' => 'Gestione password',
+    'user_managed_passwords_disallow' => 'Non consentire agli utenti di gestire le proprie password',
+    'user_managed_passwords_allow' => 'Consenti agli utenti di gestire le proprie password',
+    'from' => 'Da',
+    'by' => 'per',
+
+// Add form placeholders here
+    'placeholders' => [
+        'notes'  => 'Aggiungere una nota',
+    ],
+
+    'breadcrumb_button_actions' => [
+        'edit_item' => 'Modifica :name',
+        'checkout_item' => 'Check-out di :name',
+        'checkin_item' => 'Check-in di :name',
+    ],
+
+    'skins' => [
+        'site_default' => 'Predefinito',
+        'default_blue' => 'Blu Predefinito',
+        'blue_dark' => 'Blu (Tema Scuro)',
+        'green' => 'Verde Scuro',
+        'green_dark' => 'Verde (Tema Scuro)',
+        'red' => 'Rosso Scuro',
+        'red_dark' => 'Rosso (Tema Scuro)',
+        'orange' => 'Arancione Scuro',
+        'orange_dark' => 'Arancione (Tema Scuro)',
+        'black' => 'Nero',
+        'black_dark' => 'Nero (Tema Scuro)',
+        'purple' => 'Viola',
+        'purple_dark' => 'Viola (Tema Scuro)',
+        'yellow' => 'Giallo',
+        'yellow_dark' => 'Giallo (Tema Scuro)',
+        'high_contrast' => 'Alto Contrasto',
+
+    ],
+
+    'select_all_none' => 'Seleziona/Deseleziona Tutto',
+    'generic_model_not_found' => 'Il :model non è stato trovato o non hai il permesso di accederci',
+    'deleted_models' => 'Modelli di bene cancellati',
+    'deleted_users' => 'Utenti cancellati',
+    'cost_each' => ':amount ciascuno',
+    'remove_current_image' => 'Rimuovi l\'immagine :type',
+
+    'seeding' => [
+        'manufacturers' => [
+            'button' => 'Crea Produttori',
+            'prompt' => 'You do not have any manufacturers yet. Would you like to seed a list of common manufacturers? (THIS WILL OVERWRITE EXISTING MANUFACTURERS, including those that have been soft-deleted.)',
+            'success' => 'Manufacturers seeded successfully',
+            'error' => 'Could not seed manufacturers. A manufacturer record already exists and seeding would overwrite it.|Could not seed manufacturers. :count manufacturer records already exist and seeding would overwrite them.',
+        ],
+    ],
 
 ];
diff --git a/resources/lang/it-IT/help.php b/resources/lang/it-IT/help.php
index 3dc12795f9..f509ddc3e0 100644
--- a/resources/lang/it-IT/help.php
+++ b/resources/lang/it-IT/help.php
@@ -15,7 +15,7 @@ return [
 
     'more_info_title' => 'Ulteriori Informazioni',
 
-    'audit_help' => 'Selezionando questa casella verranno modificati le posizioni dei beni. Non selezionandola, il luogo verrà semplicemente annotato nel log di controllo inventario.<br><br>Nota che se questo bene è assegnato, non modificherà la posizione della persona, bene o posizione a cui è assegnato.',
+    'audit_help' => 'Spuntando questa casella verrà modificata la Sede del Bene. Non spuntandola, la Sede verrà solo annotata nel registro di controllo inventario.<br><br>Nota bene: se questo Bene è già assegnato, non sarà modificata la Sede della persona, Bene o Sede a cui è assegnato.',
 
     'assets' => 'I Beni sono articolo tracciati da un numero di serie o da un\'etichetta. Sono oggetti di valore più elevato che è importante identificare in maniera specifica.',
 
@@ -29,7 +29,7 @@ return [
 
     'consumables'   => 'I Consumabili sono qualsiasi cosa acquistata che si esaurisce col passare del tempo. Per esempio l\'inchiostro per stampanti o la carta per fotocopiatrici.',
 
-    'depreciations' => 'Puoi impostare la svalutazione dei Beni, per svalutare un Bene con criterio di calcolo lineare.',
+    'depreciations' => 'Puoi impostare i deprezzamenti dei Beni, per deprezzarli con criterio di calcolo lineare.',
     
     'empty_file'    => 'Il processo di Import rileva che questo file è vuoto.'
 ];
diff --git a/resources/lang/it-IT/localizations.php b/resources/lang/it-IT/localizations.php
index cc7ff23b16..d0db46066b 100644
--- a/resources/lang/it-IT/localizations.php
+++ b/resources/lang/it-IT/localizations.php
@@ -2,7 +2,7 @@
 
 return [
 
-    'select_language' => 'Seleziona la lingua',
+    'select_language' => 'Seleziona una lingua',
     'languages' => [
         'en-US'=> 'Inglese, Stati Uniti',
         'en-GB'=> 'Inglese, Regno Unito',
@@ -40,7 +40,9 @@ return [
         'ms-MY'=> 'Malese',
         'mi-NZ'=> 'Maori',
         'mn-MN'=> 'Mongolo',
-        'no-NO'=> 'Norvegese',
+        'nb-NO'=> 'Norvegese Bokmål',
+        'om-ET' => 'Oromo (Etiope)',
+        //'nn-NO'=> 'Norwegian Nynorsk',
         'fa-IR'=> 'Persiano',
         'pl-PL'=> 'Polacco',
         'pt-PT'=> 'Portoghese',
@@ -66,7 +68,7 @@ return [
         'zu-ZA'=> 'Zulu',
     ],
 
-    'select_country' => 'Seleziona un paese',
+    'select_country' => 'Seleziona un Paese',
     
     'countries' => [
         'AC'=>'Isola di Ascensione',
@@ -133,6 +135,7 @@ return [
         'EC'=>'Ecuador',
         'EE'=>'Estonia',
         'EG'=>'Egitto',
+        'GB-ENG'=>'Inghilterra',
         'ER'=>'Eritrea',
         'ES'=>'Spagna',
         'ET'=>'Etiopia',
@@ -231,6 +234,7 @@ return [
         'NG'=>'Nigeria',
         'NI'=>'Nicaragua',
         'NL'=>'Paesi Bassi',
+        'GB-NIR' => 'Irlanda del Nord',
         'NO'=>'Norvegia',
         'NP'=>'Nepal',
         'NR'=>'Nauru',
@@ -258,7 +262,7 @@ return [
         'RU'=>'Federazione Russa',
         'RW'=>'Rwanda',
         'SA'=>'Arabia Saudita',
-        'UK'=>'Scozia',
+        'GB-SCT'=>'Scozia',
         'SB'=>'Isole Salomone',
         'SC'=>'Seychelles',
         'SS'=>'Sudan Sud',
@@ -310,6 +314,7 @@ return [
         'VI'=>'Isole Vergini (British.)',
         'VN'=>'Vietnam',
         'VU'=>'Vanuatu',
+        'GB-WLS' =>'Galles',
         'WF'=>'Isole di Wallis e Futuna',
         'WS'=>'Samoa',
         'YE'=>'Yemen',
diff --git a/resources/lang/it-IT/mail.php b/resources/lang/it-IT/mail.php
index e9f67d59e3..60c4f3c159 100644
--- a/resources/lang/it-IT/mail.php
+++ b/resources/lang/it-IT/mail.php
@@ -23,53 +23,57 @@ return [
     'Item_Requested' => 'Articolo richiesto',
     'License_Checkin_Notification' => 'Licenza restituita',
     'License_Checkout_Notification' => 'Licenza assegnata',
+    'license_for'   => 'Licenza per',
     'Low_Inventory_Report' => 'Rapporto di inventario basso',
-    'a_user_canceled' => 'Un utente ha annullato una richiesta di articolo sul sito web',
+    'a_user_canceled' => 'Un utente ha annullato una richiesta di articolo tramite sito web',
     'a_user_requested' => 'Un utente ha richiesto un elemento tramite il sito web',
     'acceptance_asset_accepted' => 'Un utente ha accettato un elemento',
     'acceptance_asset_declined' => 'Un utente ha rifiutato un elemento',
-    'accessory_name' => 'Nome accessorio:',
-    'additional_notes' => 'Note aggiuntive:',
-    'admin_has_created' => 'Un amministratore ha creato un account per il tuo sito web: web.',
-    'asset' => 'Bene:',
-    'asset_name' => 'Nome del bene:',
+    'accessory_name' => 'Nome Accessorio',
+    'additional_notes' => 'Note aggiuntive',
+    'admin_has_created' => 'Un amministratore ha creato un account per te sul sito :web.',
+    'asset' => 'Bene',
+    'asset_name' => 'Nome Bene',
     'asset_requested' => 'Bene richiesto',
-    'asset_tag' => 'Etichetta del bene',
+    'asset_tag' => 'Etichetta Bene',
     'assets_warrantee_alert' => 'C\'è :count bene con garanzia in scadenza nei prossimi :threshold giorni.|Ci sono :count beni con garanzia in scadenza nei prossimi :threshold giorni.',
     'assigned_to' => 'Assegnato a',
     'best_regards' => 'Cordiali saluti,',
-    'canceled' => 'Annullato:',
-    'checkin_date' => 'Data di restituzione:',
-    'checkout_date' => 'Data di assegnazione:',
+    'canceled' => 'Annullato',
+    'checkin_date' => 'Data Restituzione',
+    'checkout_date' => 'Data di Assegnazione',
     'checkedout_from' => 'Assegnato a',
-    'checkedin_from'  => 'Accesso effettuato da',
+    'checkedin_from'  => 'Restituito da',
     'checked_into' => 'Assegnato nel',
     'click_on_the_link_accessory' => 'Fare clic sul collegamento in basso per confermare di aver ricevuto l\'accessorio.',
-    'click_on_the_link_asset' => 'Per favore clicca sul link in basso per confermare di aver ricevuto il bene.',
+    'click_on_the_link_asset' => 'Per favore clicca sul link in basso per confermare di aver ricevuto il Bene.',
     'click_to_confirm' => 'Per favore, clicca sul seguente link per confermare il tuo account su :web :',
     'current_QTY' => 'Quantità attuale',
     'days' => 'Giorni',
-    'expecting_checkin_date' => 'Data di riconsegna prevista:',
+    'expecting_checkin_date' => 'Data Restituzione Prevista',
     'expires' => 'Scade',
-    'hello' => 'Ciao',
+    'hello' => 'Salve',
     'hi' => 'Ciao',
     'i_have_read' => 'Ho letto e accetto i termini di utilizzo e ho ricevuto questo elemento.',
     'inventory_report' => 'Rapporto Inventario',
-    'item' => 'Articolo:',
+    'item' => 'Articolo',
+    'item_checked_reminder' => 'Promemoria: attualmente hai :count elementi assegnati che non hai né accettato né rifiutato. Clicca sul link qui sotto per confermare la tua decisione.',
     'license_expiring_alert' => 'Tra :threshold giorni sta per scadere :count licenza. |Tra :threshold giorni stanno per scadere :count licenze.',
-    'link_to_update_password' => 'Per favore clicca sul seguente collegamento per aggiornare la tua password per :web :',
-    'login' => 'Accesso:',
+    'link_to_update_password' => 'Clicca sul seguente collegamento per aggiornare la tua password per :web :',
+    'login' => 'Accedi',
     'login_first_admin' => 'Accedi alla nuova installazione di Snipe-IT utilizzando le seguenti credenziali:',
     'low_inventory_alert' => 'C\'è :count elemento che è al di sotto del livello di scorta minima o lo sarà a breve. |Ci sono :count elementi che sono al di sotto del livello di scorta minima o lo saranno a breve.',
     'min_QTY' => 'Quantità minima',
     'name' => 'Nome',
     'new_item_checked' => 'Ti è stato assegnato un nuovo Bene, di seguito i dettagli.',
+    'new_item_checked_with_acceptance' => 'Ti è stato assegnato un nuovo Bene per cui è richiesta la tua accettazione, seguono i dettagli.',
+    'recent_item_checked' => 'Recentemente ti è stato assegnato un Bene per cui è richiesta la tua accettazione, seguono i dettagli.',
     'notes' => 'Note',
-    'password' => 'Password:',
+    'password' => 'Password',
     'password_reset' => 'Reimposta la password',
     'read_the_terms' => 'Leggi i termini di utilizzo qui sotto.',
     'read_the_terms_and_click' => 'Leggi qui sotto i termini di utilizzo e fai clic sul link in basso per confermare di averli letti ed accettati e di aver quindi ricevuto il bene.',
-    'requested' => 'Richiesto:',
+    'requested' => 'Richiesto',
     'reset_link' => 'Il tuo link per reimpostare la password',
     'reset_password' => 'Clicca qui per reimpostare la tua password:',
     'rights_reserved' => 'Tutti i diritti riservati.',
@@ -86,8 +90,10 @@ return [
     'upcoming-audits' => 'C\'è :count Bene da inventariare entro :threshold giorni.|Ci sono :count beni da inventariare entro :threshold giorni.',
     'user' => 'Utente',
     'username' => 'Nome utente',
+    'unaccepted_asset_reminder' => 'Promemoria: hai dei Beni ancora non accettati.',
     'welcome' => 'Benvenuto :name',
     'welcome_to' => 'Benvenuti in :web!',
     'your_assets' => 'Visualizza i tuoi Beni',
     'your_credentials' => 'Le tue credenziali Snipe-IT',
+    'mail_sent' => 'Email inviata correttamente!',
 ];
diff --git a/resources/lang/it-IT/validation.php b/resources/lang/it-IT/validation.php
index bfe552ec6c..4ac201036d 100644
--- a/resources/lang/it-IT/validation.php
+++ b/resources/lang/it-IT/validation.php
@@ -13,87 +13,150 @@ return [
     |
     */
 
-    'accepted'             => ':attribute deve essere accettato.',
-    'active_url'           => ':attribute non è un URL valido.',
-    'after'                => ':attribute deve essere una data oltre il  :date.',
-    'after_or_equal'       => ':attribute deve essere una data successiva o uguale a :date .',
-    'alpha'                => ':attribute può contenere solo lettere.',
-    'alpha_dash'           => ':attribute può contenere solo lettere numeri e trattini.',
-    'alpha_num'            => ':attribute può contenere solo lettere e numeri.',
-    'array'                => ':attribute deve essere un array.',
-    'before'               => ':attribute deve essere una data precedente il :date .',
-    'before_or_equal'      => ':attribute deve essere una data precedente o uguale al :date .',
-    'between'              => [
-        'numeric' => ':attribute deve essere tra :min - :max .',
-        'file'    => 'il :attribute deve essere tra  :min - :max kilobytes.',
-        'string'  => 'il :attribute deve essere tra :min - :max caratteri.',
-        'array'   => ':attribute deve avere tra: min e: max elementi.',
+    'accepted' => 'Il campo :attribute deve essere accettato.',
+    'accepted_if' => 'Il campo :attribute deve essere accettato quando :other è :value.',
+    'active_url' => 'Il campo :attribute deve essere un URL valido.',
+    'after' => 'Il campo :attribute deve essere una data successiva a :date.',
+    'after_or_equal' => 'Il campo :attribute deve essere una data successiva o uguale a :date.',
+    'alpha' => 'Il campo :attribute deve contenere solo lettere.',
+    'alpha_dash' => 'Il campo :attribute deve contenere solo lettere, numeri, trattini o trattini bassi.',
+    'alpha_num' => 'Il campo :attribute deve contenere solo lettere e numeri.',
+    'array' => 'Il campo :attribute deve essere un array.',
+    'ascii' => 'Il campo :attribute deve contenere solo caratteri alfanumerici e simboli a byte singolo.',
+    'before' => 'Il campo :attribute deve essere una data precedente il :date.',
+    'before_or_equal' => 'Il campo :attribute deve essere una data precedente o uguale al :date.',
+    'between' => [
+        'array' => 'Il campo :attribute deve avere tra :min e :max elementi.',
+        'file' => 'Il campo :attribute deve essere tra :min e :max kilobyte.',
+        'numeric' => 'Il campo :attribute deve essere tra :min e :max.',
+        'string' => 'Il campo :attribute deve essere lungo tra :min e :max caratteri.',
     ],
-    'boolean'              => ':attribute deve essere o vero o falso.',
-    'confirmed'            => 'La conferma di :attribute non corrisponde.',
-    'date'                 => ':attribute non è una data valida.',
-    'date_format'          => 'il :attribute non corrisponde al :format.',
-    'different'            => ':attribute e :other devono essere differenti.',
-    'digits'               => ':attribute deve essere :digits cifre.',
-    'digits_between'       => ':attribute deve essere tra :min e :max cifre.',
-    'dimensions'           => ':attribute ha dimensioni di immagine non valide.',
-    'distinct'             => 'Il campo :attribute ha un valore duplicato.',
-    'email'                => 'Il formato di :attribute non è valido.',
-    'exists'               => ':attribute selezionato non è valido.',
-    'file'                 => ':attribute deve essere un file.',
-    'filled'               => 'Il campo :attribute deve avere un valore.',
-    'image'                => ':attribute deve essere un\'immagine.',
+    'boolean' => 'Il campo: attributo deve essere vero o falso.',
+    'can' => 'Il campo :attribute contiene un valore non autorizzato.',
+    'confirmed' => 'La conferma del campo :attribute non corrisponde.',
+    'contains' => 'Al campo :attribute manca un valore richiesto.',
+    'current_password' => 'La password non è corretta.',
+    'date' => 'Il campo :attribute deve essere una data valida.',
+    'date_equals' => 'Il campo :attribute deve essere una data uguale a :date.',
+    'date_format' => 'Il campo :attribute deve corrispondere al formato :format.',
+    'decimal' => 'Il campo :attribute deve avere :decimal decimali.',
+    'declined' => 'Il campo :attribute deve essere rifiutato.',
+    'declined_if' => 'Il campo :attribute deve essere rifiutato quando :other è :value.',
+    'different' => 'Il campo :attribute e :other devono essere diversi.',
+    'digits' => 'Il campo :attribute deve essere :digits cifre.',
+    'digits_between' => 'Il campo :attribute deve essere compreso tra :min e :max cifre.',
+    'dimensions' => 'Il campo :attribute ha una dimensione dell\'immagine non valida.',
+    'distinct' => 'Il campo :attribute ha un valore duplicato.',
+    'doesnt_end_with' => 'Il campo :attribute non deve terminare con uno dei seguenti: :values.',
+    'doesnt_start_with' => 'Il campo :attribute non deve iniziare con uno dei seguenti: :values.',
+    'email' => 'Il campo :attribute deve essere un indirizzo email valido.',
+    'ends_with' => 'Il campo :attribute deve terminare con uno dei seguenti: :values.',
+    'enum' => 'L\' :attribute selezionato è invalido.',
+    'exists' => ':attribute selezionato non è valido.',
+    'extensions' => 'Il campo :attribute deve avere una delle seguenti estensioni: :values.',
+    'file' => 'Il campo :attribute deve essere un file.',
+    'filled' => 'Il campo :attribute deve avere un valore.',
+    'gt' => [
+        'array' => 'Il campo :attribute deve avere più di :value elementi.',
+        'file' => 'Il campo :attribute deve essere maggiore di :value kilobytes.',
+        'numeric' => 'Il campo :attribute deve essere maggiore di :value.',
+        'string' => 'Il campo :attribute deve essere maggiore di :value caratteri.',
+    ],
+    'gte' => [
+        'array' => 'Il campo :attribute deve avere :value o più elementi.',
+        'file' => 'Il campo :attribute deve essere maggiore o uguale a :value kilobytes.',
+        'numeric' => 'Il campo :attribute deve essere maggiore o uguale a :value.',
+        'string' => 'Il campo :attribute deve essere maggiore o uguale a :value caratteri.',
+    ],
+    'hex_color' => 'Il campo :attribute deve essere un colore esadecimale valido.',
+    'image' => 'Il campo :attribute deve essere un\'immagine.',
     'import_field_empty'    => ':fieldname non può essere vuoto.',
-    'in'                   => ':attribute selezionato non è valido.',
-    'in_array'             => 'Il campo :attribute non esiste in :other.',
-    'integer'              => ':attribute deve essere un numero intero.',
-    'ip'                   => ':attribute deve essere un indirizzo IP valido.',
-    'ipv4'                 => ':attribute deve essere un indirizzo IPv4 valido.',
-    'ipv6'                 => ':attribute deve essere un indirizzo IPv6 valido.',
-    'is_unique_department' => ':attribute deve essere unico per questa sede aziendale',
-    'json'                 => ':attribute deve essere una stringa JSON valida.',
-    'max'                  => [
-        'numeric' => ':attribute non può essere maggiore di :max.',
-        'file'    => ':attribute non può essere maggiore di :max kilobytes.',
-        'string'  => ':attribute non può essere maggiore di :max caratteri.',
-        'array'   => ':attribute non può avere più di :max elementi.',
+    'in' => ':attribute selezionato non è valido.',
+    'in_array' => 'Il campo :attribute deve esistere in :other.',
+    'integer' => 'Il campo :attribute deve essere un numero intero.',
+    'ip' => 'Il campo :attribute deve essere un indirizzo IP valido.',
+    'ipv4' => 'Il campo :attribute deve essere un indirizzo IPv4 valido.',
+    'ipv6' => 'Il campo :attribute deve essere un indirizzo IPv6 valido.',
+    'json' => 'Il campo :attribute deve essere una stringa JSON valida.',
+    'list' => 'Il campo :attribute deve essere una lista.',
+    'lowercase' => 'Il campo :attribute deve essere minuscolo.',
+    'lt' => [
+        'array' => 'Il campo :attribute deve avere meno di :value elementi.',
+        'file' => 'Il campo :attribute deve essere inferiore a :value kilobytes.',
+        'numeric' => 'Il campo :attribute deve essere inferiore a :value.',
+        'string' => 'Il campo :attribute deve essere inferiore a :value caratteri.',
     ],
-    'mimes'                => ':attribute deve essere un file di formato: :values.',
-    'mimetypes'            => ':attribute deve essere un file di formato: :values.',
-    'min'                  => [
-        'numeric' => ':attribute deve essere almeno :min.',
-        'file'    => ':attribute deve essere almeno :min kilobytes.',
-        'string'  => ':attribute deve essere di almeno :min caratteri.',
-        'array'   => ':attribute deve avere almeno :min elementi.',
+    'lte' => [
+        'array' => 'Il campo :attribute non deve avere più di :value elementi.',
+        'file' => 'Il campo :attribute deve essere inferiore o uguale a :value kilobytes.',
+        'numeric' => 'Il campo :attribute deve essere minore o uguale a :value.',
+        'string' => 'Il campo :attribute deve essere inferiore o uguale a :value caratteri.',
     ],
-    'starts_with'          => ':attribute deve iniziare con uno dei seguenti: :values.',
-    'ends_with'            => ':attribute deve finire con uno dei seguenti: :values.',
+    'mac_address' => 'Il campo :attribute deve essere un indirizzo MAC valido.',
+    'max' => [
+        'array' => 'Il campo :attribute non deve avere più di :max elementi.',
+        'file' => 'Il campo :attribute non deve essere maggiore di :max kilobytes.',
+        'numeric' => 'Il campo :attribute non deve essere maggiore di :max.',
+        'string' => 'Il campo :attribute non deve avere più di :max caratteri.',
+    ],
+    'max_digits' => 'Il campo :attribute non deve avere più di :max cifre.',
+    'mimes' => 'Il campo :attribute deve essere un file di tipo: :values.',
+    'mimetypes' => 'Il campo :attribute deve essere un file di tipo: :values.',
+    'min' => [
+        'array' => 'Il campo :attribute deve avere almeno :min elementi.',
+        'file' => 'Il campo :attribute deve essere almeno :min kilobytes.',
+        'numeric' => 'Il campo :attribute deve essere almeno :min.',
+        'string' => 'Il campo :attribute deve avere almeno :min caratteri.',
+    ],
+    'min_digits' => 'Il campo :attribute deve avere almeno :min cifre.',
+    'missing' => 'Il campo :attribute deve mancare.',
+    'missing_if' => 'Il campo :attribute deve mancare quando :other è :value.',
+    'missing_unless' => 'Il campo :attribute deve essere mancante a meno che :other non sia :value.',
+    'missing_with' => 'Il campo :attribute deve mancare quando :values è presente.',
+    'missing_with_all' => 'Il campo :attribute deve mancare quando :values sono presenti.',
+    'multiple_of' => 'Il campo :attribute deve essere multiplo di :value.',
+    'not_in' => ':attribute selezionato non è valido.',
+    'not_regex' => 'Il formato del campo :attribute non è valido.',
+    'numeric' => 'Il campo :attribute deve essere un numero.',
+    'password' => [
+        'letters' => 'Il campo :attribute deve contenere almeno una lettera.',
+        'mixed' => 'Il campo :attribute deve contenere almeno una lettera maiuscola e una lettera minuscola.',
+        'numbers' => 'Il campo :attribute deve contenere almeno un numero.',
+        'symbols' => 'Il campo :attribute deve contenere almeno un simbolo.',
+        'uncompromised' => 'Il valore :attribute fornito è comparso in un data leak. Si prega di scegliere un :attribute differente.',
+    ],
+    'percent'       => 'Il deprezzamento minimo deve essere tra 0 e 100 quando il tipo di deprezzamento è Percentuale.',
 
-    'not_in'               => ':attribute selezionato non è valido.',
-    'numeric'              => ':attribute dev\'essere un numero.',
-    'present'              => 'Il campo :attribute deve essere presente.',
-    'valid_regex'          => 'Questa non è una espressione regolare valida. ',
-    'regex'                => 'Il formato di :attribute non è valido.',
-    'required'             => 'Il campo :attribute è obbligatorio.',
-    'required_if'          => 'Il campo :attribute è obbligatorio quando :other è :value.',
-    'required_unless'      => 'Il campo :attribute è obbligatorio a meno che :other sia in :values.',
-    'required_with'        => 'Il campo :attribute è obbligatorio quando :values è presente.',
-    'required_with_all'    => 'Il campo :attribute è obbligatorio quando :values è presente.',
-    'required_without'     => 'Il campo :attribute è obbligatorio quando :values non è presente.',
+    'present' => 'Il campo :attribute deve essere presente.',
+    'present_if' => 'Il campo :attribute deve essere presente quando :other è :value.',
+    'present_unless' => 'Il campo :attribute deve essere presente a meno che :other non sia :value.',
+    'present_with' => 'Il campo :attribute deve essere presente quando :values è presente.',
+    'present_with_all' => 'Il campo :attribute deve essere presente quando :values sono presenti.',
+    'prohibited' => 'Il campo :attribute è vietato.',
+    'prohibited_if' => 'Il campo :attribute è vietato quando :other è :value.',
+    'prohibited_unless' => 'Il campo :attribute è vietato a meno che :other non sia in :values.',
+    'prohibits' => 'Il campo :attribute inibisce la presenza di :other.',
+    'regex' => 'Il formato del campo :attribute non è valido.',
+    'required' => 'Il campo :attribute è obbligatorio.',
+    'required_array_keys' => 'Il campo :attribute deve contenere voci per: :values.',
+    'required_if' => 'Il campo :attribute è obbligatorio quando :other è :value.',
+    'required_if_accepted' => 'Il campo :attribute è obbligatorio quando :other è accettato.',
+    'required_if_declined' => 'Il campo :attribute è obbligatorio quando :other è rifiutato.',
+    'required_unless' => 'Il campo :attribute è obbligatorio a meno che :other sia in :values.',
+    'required_with' => 'Il campo :attribute è obbligatorio quando :values è presente.',
+    'required_with_all' => 'Il campo :attribute è obbligatorio quando :values sono presenti.',
+    'required_without' => 'Il campo :attribute è obbligatorio quando :values non è presente.',
     'required_without_all' => 'Il campo :attribute è obbligatorio quando nessuno dei valori :values è presente.',
-    'same'                 => ':attribute e :other devono corrispondere.',
-    'size'                 => [
-        'numeric' => ':attribute deve essere :size.',
-        'file'    => ':attribute deve essere :size kilobytes.',
-        'string'  => ':attribute deve essere :size caratteri.',
-        'array'   => ':attribute deve contenere :size elementi.',
+    'same' => 'Il campo :attribute deve corrispondere a :other.',
+    'size' => [
+        'array' => 'Il campo :attribute deve contenere :size elementi.',
+        'file' => 'Il campo :attribute deve essere :size kilobytes.',
+        'numeric' => 'Il campo :attribute deve essere :size.',
+        'string' => 'Il campo :attribute deve avere :size caratteri.',
     ],
+    'starts_with' => 'Il campo :attribute deve iniziare con uno dei seguenti: :values.',
     'string'               => ':attribute deve essere una stringa.',
-    'timezone'             => ':attribute deve essere una zona valida.',
     'two_column_unique_undeleted' => ':attribute deve essere univoco tra :table1 e :table2 . ',
-    'unique'               => ':attribute è già stato preso.',
-    'uploaded'             => 'Non è stato possibile caricare :attribute.',
-    'url'                  => 'Il formato di :attribute non è valido.',
     'unique_undeleted'     => ':attribute deve essere unico.',
     'non_circular'         => ':attribute non deve creare un riferimento circolare.',
     'not_array'            => ':attribute non può essere un array.',
@@ -102,11 +165,14 @@ return [
     'numbers'              => 'La password deve contenere almeno un numero.',
     'case_diff'            => 'La password deve utilizzare maiuscole e minuscole.',
     'symbols'              => 'La password deve contenere simboli.',
-    'gte'                  => [
-        'numeric'          => 'Il valore non può essere negativo'
-    ],
-    'checkboxes'           => ':attribute contiene opzioni non valide.',
-    'radio_buttons'        => ':attribute non è valido.',
+    'timezone' => 'Il campo :attribute deve essere un fuso orario valido.',
+    'unique' => ':attribute è già stato preso.',
+    'uploaded' => 'Non è stato possibile caricare :attribute.',
+    'uppercase' => 'Il campo :attribute deve essere maiuscolo.',
+    'url' => 'Il campo :attribute deve essere un URL valido.',
+    'ulid' => 'Il campo :attribute deve essere un ULID valido.',
+    'uuid' => 'Il campo :attribute deve essere un UUID valido.',
+    'fmcs_location' => 'Full multiple company support and location scoping is enabled in the Admin Settings, and the selected location and selected company are not compatible.',
 
 
     /*
@@ -120,16 +186,22 @@ return [
     |
     */
 
+    'email_array'      => 'Una o più email sono invalidi.',
+    'checkboxes'           => ':attribute contiene opzioni non valide.',
+    'radio_buttons'        => ':attribute non è valido.',
+    
     'custom' => [
         'alpha_space' => 'Il campo :attribute contiene un carattere non consentito.',
-        'email_array'      => 'Uno o più indirizzi email non sono validi.',
+
         'hashed_pass'      => 'La tua attuale password non è corretta',
         'dumbpwd'          => 'Questa password è troppo comune.',
         'statuslabel_type' => 'È necessario selezionare un tipo di etichetta di stato valido',
+        'custom_field_not_found'          => 'Questo campo non sembra esistere, si prega di ricontrollare i nomi dei campi personalizzati.',
+        'custom_field_not_found_on_model' => 'Sembra che questo campo esista, ma non è disponibile tra i campi di questo Modello di Bene.',
 
         // date_format validation with slightly less stupid messages. It duplicates a lot, but it gets the job done :(
-        // We use this because the default error message for date_format is reflects php Y-m-d, which non-PHP
-        // people won't know how to format. 
+        // We use this because the default error message for date_format reflects php Y-m-d, which non-PHP
+        // people won't know how to format.
         'purchase_date.date_format'     => ':attribute deve essere in formato AAAA-MM-GG',
         'last_audit_date.date_format'   =>  ':attribute deve essere in formato AAAA-MM-GG hh:mm:ss',
         'expiration_date.date_format'   =>  ':attribute deve essere in formato AAAA-MM-GG',
@@ -137,9 +209,15 @@ return [
         'expected_checkin.date_format'  =>  ':attribute deve essere in formato AAAA-MM-GG',
         'start_date.date_format'        =>  ':attribute deve essere in formato AAAA-MM-GG',
         'end_date.date_format'          =>  ':attribute deve essere in formato AAAA-MM-GG',
+        'invalid_value_in_field' => 'Valore non valido incluso in questo campo',
 
-    ],
+        'ldap_username_field' => [
+            'not_in' =>         '<code>sAMAccountName</code> (grafìa mista) non va bene. Dovresti piuttosto usare <code>samaccountname</code> (minuscolo).'
+        ],
+        'ldap_auth_filter_query' => ['not_in' => 'Probabilmente <code>uid=samaccountname</code> non è un filtro di l\'autenticazione valido. Forse è meglio <code>uid=</code> '],
+        'ldap_filter' => ['regex' => 'Questo valore probabilmente non dovrebbe stare tra parentesi.'],
 
+        ],
     /*
     |--------------------------------------------------------------------------
     | Custom Validation Attributes
@@ -155,8 +233,16 @@ return [
 
     /*
     |--------------------------------------------------------------------------
-    | Generic Validation Messages
+    | Generic Validation Messages - we use these in the jquery validation where we don't have
+    | access to the :attribute
     |--------------------------------------------------------------------------
     */
-    'invalid_value_in_field' => 'Valore non valido incluso in questo campo',
+
+    'generic' => [
+        'invalid_value_in_field' => 'Valore non valido incluso in questo campo',
+        'required' => 'Questo campo è obbligatorio',
+        'email' => 'Inserire un indirizzo e-mail valido',
+    ],
+
+
 ];
diff --git a/resources/lang/iu-NU/account/general.php b/resources/lang/iu-NU/account/general.php
index 1a9e2c03b8..7f9e2f848e 100644
--- a/resources/lang/iu-NU/account/general.php
+++ b/resources/lang/iu-NU/account/general.php
@@ -2,10 +2,16 @@
 
 return array(
     'personal_api_keys' => 'Personal API Keys',
+    'personal_access_token' => 'Personal Access Token',
+    'personal_api_keys_success' => 'Personal API Key :key created sucessfully',
+    'here_is_api_key' => 'Here is your new personal access token. This is the only time it will be shown so do not lose it! You may now use this token to make API requests.',
     'api_key_warning' => 'When generating an API token, be sure to copy it down immediately as they will not be visible to you again.',
     'api_base_url' => 'Your API base url is located at:',
     'api_base_url_endpoint' => '/&lt;endpoint&gt;',
     'api_token_expiration_time' => 'API tokens are set to expire in:',
     'api_reference' => 'Please check the <a href="https://snipe-it.readme.io/reference" target="_blank">API reference</a> to find specific API endpoints and additional API documentation.',
     'profile_updated' => 'Account successfully updated',
+    'no_tokens' => 'You have not created any personal access tokens.',
+    'enable_sounds' => 'Enable sound effects',
+    'enable_confetti' => 'Enable confetti effects',
 );
diff --git a/resources/lang/iu-NU/admin/accessories/message.php b/resources/lang/iu-NU/admin/accessories/message.php
index c688d5e03d..f60d41957b 100644
--- a/resources/lang/iu-NU/admin/accessories/message.php
+++ b/resources/lang/iu-NU/admin/accessories/message.php
@@ -26,7 +26,11 @@ return array(
         'error'   		=> 'Accessory was not checked out, please try again',
         'success' 		=> 'Accessory checked out successfully.',
         'unavailable'   => 'Accessory is not available for checkout. Check quantity available',
-        'user_does_not_exist' => 'That user is invalid. Please try again.'
+        'user_does_not_exist' => 'That user is invalid. Please try again.',
+         'checkout_qty' => array(
+            'lte'  => 'There is currently only one available accessory of this type, and you are trying to check out :checkout_qty. Please adjust the checkout quantity or the total stock of this accessory and try again.|There are :number_currently_remaining total available accessories, and you are trying to check out :checkout_qty. Please adjust the checkout quantity or the total stock of this accessory and try again.',
+            ),
+           
     ),
 
     'checkin' => array(
diff --git a/resources/lang/iu-NU/admin/accessories/table.php b/resources/lang/iu-NU/admin/accessories/table.php
index e02d9f22e4..80df687161 100644
--- a/resources/lang/iu-NU/admin/accessories/table.php
+++ b/resources/lang/iu-NU/admin/accessories/table.php
@@ -6,6 +6,4 @@ return array(
     'id'      					=> 'ID',
     'require_acceptance'      	=> 'Acceptance',
     'title'      				=> 'Accessory Name',
-
-
 );
diff --git a/resources/lang/iu-NU/admin/components/message.php b/resources/lang/iu-NU/admin/components/message.php
index 0a7dd8d954..ec39dc4178 100644
--- a/resources/lang/iu-NU/admin/components/message.php
+++ b/resources/lang/iu-NU/admin/components/message.php
@@ -17,7 +17,8 @@ return array(
     'delete' => array(
         'confirm'   => 'Are you sure you wish to delete this component?',
         'error'   => 'There was an issue deleting the component. Please try again.',
-        'success' => 'The component was deleted successfully.'
+        'success' => 'The component was deleted successfully.',
+        'error_qty'   => 'Some components of this type are still checked out. Please check them in and try again.',
     ),
 
      'checkout' => array(
diff --git a/resources/lang/iu-NU/admin/consumables/general.php b/resources/lang/iu-NU/admin/consumables/general.php
index 7c6bb32968..29acfedc1b 100644
--- a/resources/lang/iu-NU/admin/consumables/general.php
+++ b/resources/lang/iu-NU/admin/consumables/general.php
@@ -8,4 +8,5 @@ return array(
     'remaining' 			            => 'Remaining',
     'total' 			                => 'Total',
     'update'                            => 'Update Consumable',
+    'inventory_warning'                 => 'The inventory of this consumable is below the minimum amount of :min_count',
 );
diff --git a/resources/lang/iu-NU/admin/consumables/message.php b/resources/lang/iu-NU/admin/consumables/message.php
index c0d0aa7f68..e2591503bf 100644
--- a/resources/lang/iu-NU/admin/consumables/message.php
+++ b/resources/lang/iu-NU/admin/consumables/message.php
@@ -2,6 +2,7 @@
 
 return array(
 
+    'invalid_category_type' => 'The category must be a consumable category.',
     'does_not_exist' => 'Consumable does not exist.',
 
     'create' => array(
diff --git a/resources/lang/iu-NU/admin/custom_fields/general.php b/resources/lang/iu-NU/admin/custom_fields/general.php
index e3c21d1f0c..c9ae61c963 100644
--- a/resources/lang/iu-NU/admin/custom_fields/general.php
+++ b/resources/lang/iu-NU/admin/custom_fields/general.php
@@ -35,7 +35,7 @@ return [
     'create_field_title' => 'Create a new custom field',
     'value_encrypted'      	        => 'The value of this field is encrypted in the database. Only admin users will be able to view the decrypted value',
     'show_in_email'     => 'Include the value of this field in checkout emails sent to the user? Encrypted fields cannot be included in emails',
-    'show_in_email_short'     => 'Include in emails.',
+    'show_in_email_short' => 'Include in emails',
     'help_text' => 'Help Text',
     'help_text_description' => 'This is optional text that will appear below the form elements while editing an asset to provide context on the field.',
     'about_custom_fields_title' => 'About Custom Fields',
@@ -57,5 +57,8 @@ return [
     'show_in_requestable_list_short' => 'Show in requestable assets list',
     'show_in_requestable_list' => 'Show value in requestable assets list. Encrypted fields will not be shown',
     'encrypted_options' => 'This field is encrypted, so some display options will not be available.',
+    'display_checkin' => 'Display in checkin forms',
+    'display_checkout' => 'Display in checkout forms',
+    'display_audit' => 'Display in audit forms',
 
 ];
diff --git a/resources/lang/iu-NU/admin/custom_fields/message.php b/resources/lang/iu-NU/admin/custom_fields/message.php
index 43ba821821..6442359b7f 100644
--- a/resources/lang/iu-NU/admin/custom_fields/message.php
+++ b/resources/lang/iu-NU/admin/custom_fields/message.php
@@ -5,6 +5,7 @@ return array(
     'field' => array(
         'invalid'   => 'That field does not exist.',
         'already_added'   => 'Field already added',
+        'none_selected'   => 'No field selected',
 
         'create' => array(
             'error'   => 'Field was not created, please try again.',
diff --git a/resources/lang/iu-NU/admin/depreciations/general.php b/resources/lang/iu-NU/admin/depreciations/general.php
index 1a5666f9dc..90246e9cd8 100644
--- a/resources/lang/iu-NU/admin/depreciations/general.php
+++ b/resources/lang/iu-NU/admin/depreciations/general.php
@@ -13,4 +13,8 @@ return [
     'no_depreciations_warning'               => '<strong>Warning: </strong>
                       You do not currently have any depreciations set up.
                       Please set up at least one depreciation to view the depreciation report.',
+    'depreciation_method'                   => 'Depreciation Report',
+    'linear_depreciation'                   => 'Linear (Default)',
+    'half_1'                                => 'Half-year convention, always applied',
+    'half_2'                                => 'Half-year convention, applied with condition',
 ];
diff --git a/resources/lang/iu-NU/admin/hardware/form.php b/resources/lang/iu-NU/admin/hardware/form.php
index edec543637..8fbd0b4e87 100644
--- a/resources/lang/iu-NU/admin/hardware/form.php
+++ b/resources/lang/iu-NU/admin/hardware/form.php
@@ -55,8 +55,11 @@ return [
     'asset_location_update_default' => 'Update only default location',
     'asset_location_update_actual' => 'Update only actual location',
     'asset_not_deployable' => 'That asset status is not deployable. This asset cannot be checked out.',
-    'asset_deployable' => 'That status is deployable. This asset can be checked out.',
+    'asset_not_deployable_checkin' => 'That asset status is not deployable. Using this status label will checkin the asset.',
+    'asset_deployable' => 'This asset can be checked out.',
     'processing_spinner' => 'Processing... (This might take a bit of time on large files)',
+    'processing' => 'Processing... ',
     'optional_infos'  => 'Optional Information',
-    'order_details'   => 'Order Related Information'
+    'order_details'   => 'Order Related Information',
+    'calc_eol'    => 'If nulling the EOL date, use automatic EOL calculation based on the purchase date and EOL rate.',
 ];
diff --git a/resources/lang/iu-NU/admin/hardware/general.php b/resources/lang/iu-NU/admin/hardware/general.php
index 34ac4e63ee..6740476574 100644
--- a/resources/lang/iu-NU/admin/hardware/general.php
+++ b/resources/lang/iu-NU/admin/hardware/general.php
@@ -5,8 +5,8 @@ return [
     'about_assets_text'            => 'Assets are items tracked by serial number or asset tag.  They tend to be higher value items where identifying a specific item matters.',
     'archived'  				=> 'Archived',
     'asset'  					=> 'Asset',
-    'bulk_checkout'             => 'Checkout Assets',
-    'bulk_checkin'              => 'Checkin Assets',
+    'bulk_checkout'             => 'Bulk Checkout',
+    'bulk_checkin'              => 'Bulk Checkin',
     'checkin'  					=> 'Checkin Asset',
     'checkout'  				=> 'Checkout Asset',
     'clone'  					=> 'Clone Asset',
@@ -27,8 +27,7 @@ return [
     'undeployable_tooltip'  	=> 'This asset has a status label that is undeployable and cannot be checked out at this time.',
     'view'  					=> 'View Asset',
     'csv_error' => 'You have an error in your CSV file:',
-    'import_text' => '<p>Upload a CSV that contains asset history. The assets and users MUST already exist in the system, or they will be skipped. Matching assets for history import happens against the asset tag. We will try to find a matching user based on the user\'s name you provide, and the criteria you select below. If you do not select any criteria below, it will simply try to match on the username format you configured in the <code>Admin &gt; General Settings</code>.</p><p>Fields included in the CSV must match the headers: <strong>Asset Tag, Name, Checkout Date, Checkin Date</strong>. Any additional fields will be ignored. </p><p>Checkin Date: blank or future checkin dates will checkout items to associated user.  Excluding the Checkin Date column will create a checkin date with todays date.</p>
-    ',
+    'import_text' => '<p>Upload a CSV that contains asset history. The assets and users MUST already exist in the system, or they will be skipped. Matching assets for history import happens against the asset tag. We will try to find a matching user based on the user\'s name you provide, and the criteria you select below. If you do not select any criteria below, it will simply try to match on the username format you configured in the <code>Admin &gt; General Settings</code>.</p><p>Fields included in the CSV must match the headers: <strong>Asset Tag, Name, Checkout Date, Checkin Date</strong>. Any additional fields will be ignored. </p><p>Checkin Date: blank or future checkin dates will checkout items to associated user.  Excluding the Checkin Date column will create a checkin date with todays date.</p>    ',
     'csv_import_match_f-l' => 'Try to match users by <strong>firstname.lastname</strong> (<code>jane.smith</code>) format',
     'csv_import_match_initial_last' => 'Try to match users by <strong>first initial last name</strong> (<code>jsmith</code>) format',
     'csv_import_match_first' => 'Try to match users by <strong>first name</strong> (<code>jane</code>) format',
diff --git a/resources/lang/iu-NU/admin/hardware/message.php b/resources/lang/iu-NU/admin/hardware/message.php
index 32698b1c07..c19bc63647 100644
--- a/resources/lang/iu-NU/admin/hardware/message.php
+++ b/resources/lang/iu-NU/admin/hardware/message.php
@@ -2,19 +2,23 @@
 
 return [
 
-    'undeployable' 		=> '<strong>Warning: </strong> This asset has been marked as currently undeployable.
-                        If this status has changed, please update the asset status.',
-    'does_not_exist' 	=> 'Asset does not exist.',
-    'does_not_exist_var'=> 'Asset with tag :asset_tag not found.',
-    'no_tag' 	        => 'No asset tag provided.',
+    'undeployable' 		 => '<strong>Warning: </strong> This asset has been marked as currently undeployable. If this status has changed, please update the asset status.',
+    'does_not_exist' 	 => 'Asset does not exist.',
+    'does_not_exist_var' => 'Asset with tag :asset_tag not found.',
+    'no_tag' 	         => 'No asset tag provided.',
     'does_not_exist_or_not_requestable' => 'That asset does not exist or is not requestable.',
-    'assoc_users'	 	=> 'This asset is currently checked out to a user and cannot be deleted. Please check the asset in first, and then try deleting again. ',
+    'assoc_users'	 	 => 'This asset is currently checked out to a user and cannot be deleted. Please check the asset in first, and then try deleting again. ',
     'warning_audit_date_mismatch' 	=> 'This asset\'s next audit date (:next_audit_date) is before the last audit date (:last_audit_date). Please update the next audit date.',
+    'labels_generated'   => 'Labels were successfully generated.',
+    'error_generating_labels' => 'Error while generating labels.',
+    'no_assets_selected' => 'No assets selected.',
 
     'create' => [
         'error'   		=> 'Asset was not created, please try again. :(',
         'success' 		=> 'Asset created successfully. :)',
         'success_linked' => 'Asset with tag :tag was created successfully. <strong><a href=":link" style="color: white;">Click here to view</a></strong>.',
+        'multi_success_linked' => 'Asset with tag :links was created successfully.|:count assets were created succesfully. :links.',
+        'partial_failure' => 'An asset was unable to be created. Reason: :failures|:count assets were unable to be created. Reasons: :failures',
     ],
 
     'update' => [
@@ -52,20 +56,24 @@ return [
     ],
 
     'import' => [
+        'import_button'         => 'Process Import',
         'error'                 => 'Some items did not import correctly.',
         'errorDetail'           => 'The following Items were not imported because of errors.',
         'success'               => 'Your file has been imported',
         'file_delete_success'   => 'Your file has been been successfully deleted',
         'file_delete_error'      => 'The file was unable to be deleted',
         'file_missing' => 'The file selected is missing',
+        'file_already_deleted' => 'The file selected was already deleted',
         'header_row_has_malformed_characters' => 'One or more attributes in the header row contain malformed UTF-8 characters',
         'content_row_has_malformed_characters' => 'One or more attributes in the first row of content contain malformed UTF-8 characters',
+        'transliterate_failure' => 'Transliteration from :encoding to UTF-8 failed due to invalid characters in input'
     ],
 
 
     'delete' => [
         'confirm'   	=> 'Are you sure you wish to delete this asset?',
         'error'   		=> 'There was an issue deleting the asset. Please try again.',
+        'assigned_to_error' => '{1}Asset Tag: :asset_tag is currently checked out. Check in this device before deletion.|[2,*]Asset Tags: :asset_tag are currently checked out. Check in these devices before deletion.',
         'nothing_updated'   => 'No assets were selected, so nothing was deleted.',
         'success' 		=> 'The asset was deleted successfully.',
     ],
@@ -78,6 +86,11 @@ return [
         'no_assets_selected' => 'You must select at least one asset from the list',
     ],
 
+    'multi-checkout' => [
+        'error'   => 'Asset was not checked out, please try again|Assets were not checked out, please try again',
+        'success' => 'Asset checked out successfully.|Assets checked out successfully.',
+    ],
+
     'checkin' => [
         'error'   		=> 'Asset was not checked in, please try again',
         'success' 		=> 'Asset checked in successfully.',
@@ -87,9 +100,10 @@ return [
     ],
 
     'requests' => [
-        'error'   		=> 'Asset was not requested, please try again',
-        'success' 		=> 'Asset requested successfully.',
-        'canceled'      => 'Checkout request successfully canceled',
+        'error'   		=> 'Request was not successful, please try again.',
+        'success' 		=> 'Request successfully submitted.',
+        'canceled'      => 'Request successfully canceled.',
+        'cancel'        => 'Cancel this item request',
     ],
 
 ];
diff --git a/resources/lang/iu-NU/admin/hardware/table.php b/resources/lang/iu-NU/admin/hardware/table.php
index 92b228dccd..2d88c6c131 100644
--- a/resources/lang/iu-NU/admin/hardware/table.php
+++ b/resources/lang/iu-NU/admin/hardware/table.php
@@ -25,7 +25,6 @@ return [
     'image'		    => 'Device Image',
     'days_without_acceptance' => 'Days Without Acceptance',
     'monthly_depreciation' => 'Monthly Depreciation',
-    'assigned_to'    => 'Assigned To',
     'requesting_user' => 'Requesting User',
     'requested_date' => 'Requested Date',
     'changed'       => 'Changed',
diff --git a/resources/lang/iu-NU/admin/kits/general.php b/resources/lang/iu-NU/admin/kits/general.php
index f57fb645c4..2b5c2d9cd0 100644
--- a/resources/lang/iu-NU/admin/kits/general.php
+++ b/resources/lang/iu-NU/admin/kits/general.php
@@ -47,4 +47,5 @@ return [
     'kit_deleted'                       => 'Kit was successfully deleted',
     'kit_model_updated'                 => 'Model was successfully updated',
     'kit_model_detached'                => 'Model was successfully detached',
+    'model_already_attached'            => 'Model already attached to kit',
 ];
diff --git a/resources/lang/iu-NU/admin/licenses/general.php b/resources/lang/iu-NU/admin/licenses/general.php
index 79b69a3d94..b39030afd4 100644
--- a/resources/lang/iu-NU/admin/licenses/general.php
+++ b/resources/lang/iu-NU/admin/licenses/general.php
@@ -14,6 +14,7 @@ return array(
     'info'  					=> 'License Info',
     'license_seats'  			=> 'License Seats',
     'seat'  					=> 'Seat',
+    'seat_count'  				=> 'Seat :count',
     'seats'  					=> 'Seats',
     'software_licenses'  		=> 'Software Licenses',
     'user'  					=> 'User',
@@ -23,12 +24,12 @@ return array(
         [
             'checkin_all'           => [
                 'button'            => 'Checkin All Seats',
-                'modal'             => 'This will action checkin one seat. | This action will checkin all :checkedout_seats_count seats for this license.',
+                'modal'             => 'This action will checkin one seat. | This action will checkin all :checkedout_seats_count seats for this license.',
                 'enabled_tooltip'   => 'Checkin ALL seats for this license from both users and assets',
                 'disabled_tooltip'  => 'This is disabled because there are no seats currently checked out',
                 'disabled_tooltip_reassignable'  => 'This is disabled because the License is not reassignable',
                 'success'           => 'License successfully checked in! | All licenses were successfully checked in!',
-                'log_msg'           => 'Checked in via bulk license checkout in license GUI',
+                'log_msg'           => 'Checked in via bulk license checkin in license GUI',
             ],
 
             'checkout_all'              => [
diff --git a/resources/lang/iu-NU/admin/licenses/message.php b/resources/lang/iu-NU/admin/licenses/message.php
index 27fbfe38a9..74e1d7af5a 100644
--- a/resources/lang/iu-NU/admin/licenses/message.php
+++ b/resources/lang/iu-NU/admin/licenses/message.php
@@ -44,10 +44,13 @@ return array(
         'error'   => 'There was an issue checking out the license. Please try again.',
         'success' => 'The license was checked out successfully',
         'not_enough_seats' => 'Not enough license seats available for checkout',
+        'mismatch' => 'The license seat provided does not match the license',
+        'unavailable' => 'This seat is not available for checkout.',
     ),
 
     'checkin' => array(
         'error'   => 'There was an issue checking in the license. Please try again.',
+        'not_reassignable' => 'License not reassignable',
         'success' => 'The license was checked in successfully'
     ),
 
diff --git a/resources/lang/iu-NU/admin/locations/message.php b/resources/lang/iu-NU/admin/locations/message.php
index 8121b80687..b21c70ad89 100644
--- a/resources/lang/iu-NU/admin/locations/message.php
+++ b/resources/lang/iu-NU/admin/locations/message.php
@@ -3,11 +3,12 @@
 return array(
 
     'does_not_exist' => 'Location does not exist.',
-    'assoc_users'    => 'This location is not currently deletable because it is the location of record for at least one asset or user, has assets assigned to it, or is the parent location of another location. Please update your models to no longer reference this company and try again. ',
+    'assoc_users'    => 'This location is not currently deletable because it is the location of record for at least one asset or user, has assets assigned to it, or is the parent location of another location. Please update your records to no longer reference this location and try again ',
     'assoc_assets'	 => 'This location is currently associated with at least one asset and cannot be deleted. Please update your assets to no longer reference this location and try again. ',
     'assoc_child_loc'	 => 'This location is currently the parent of at least one child location and cannot be deleted. Please update your locations to no longer reference this location and try again. ',
     'assigned_assets' => 'Assigned Assets',
     'current_location' => 'Current Location',
+    'open_map' => 'Open in :map_provider_icon Maps',
 
 
     'create' => array(
@@ -20,6 +21,11 @@ return array(
         'success' => 'Location updated successfully.'
     ),
 
+    'restore' => array(
+        'error'   => 'Location was not restored, please try again',
+        'success' => 'Location restored successfully.'
+    ),
+
     'delete' => array(
         'confirm'   	=> 'Are you sure you wish to delete this location?',
         'error'   => 'There was an issue deleting the location. Please try again.',
diff --git a/resources/lang/iu-NU/admin/locations/table.php b/resources/lang/iu-NU/admin/locations/table.php
index ed3f96f6b4..53176d8a4e 100644
--- a/resources/lang/iu-NU/admin/locations/table.php
+++ b/resources/lang/iu-NU/admin/locations/table.php
@@ -39,4 +39,5 @@ return [
     'signed_by_finance_auditor' => 'Signed By (Finance Auditor):',
     'signed_by_location_manager' => 'Signed By (Location Manager):',
     'signed_by'                 => 'Signed Off By:',
+    'clone'  					=> 'Clone Location',
 ];
diff --git a/resources/lang/iu-NU/admin/models/general.php b/resources/lang/iu-NU/admin/models/general.php
index 7e4a77adbc..9a61b53fd0 100644
--- a/resources/lang/iu-NU/admin/models/general.php
+++ b/resources/lang/iu-NU/admin/models/general.php
@@ -3,7 +3,7 @@
 return array(
     'about_models_title'     => 'About Asset Models',
     'about_models_text'           => 'Asset Models are a way to group identical assets. "MBP 2013", "IPhone 6s", etc.',
-    'deleted'  					        => 'This model has been deleted.',
+    'deleted'  					=> 'This model has been deleted.',
     'bulk_delete'               => 'Bulk Delete Asset Models',
     'bulk_delete_help'               => 'Use the checkboxes below to confirm the deletion of the selected asset models. Asset models that have assets associated with them cannot be deleted until the assets are associated with a different model.',
     'bulk_delete_warn'          => 'You are about to delete one asset model.|You are about to delete :model_count asset models.',
diff --git a/resources/lang/iu-NU/admin/models/message.php b/resources/lang/iu-NU/admin/models/message.php
index cc38c54530..ae3bc34eed 100644
--- a/resources/lang/iu-NU/admin/models/message.php
+++ b/resources/lang/iu-NU/admin/models/message.php
@@ -7,7 +7,7 @@ return array(
     'no_association' => 'WARNING! The asset model for this item is invalid or missing!',
     'no_association_fix' => 'This will break things in weird and horrible ways. Edit this asset now to assign it a model.',
     'assoc_users'	 => 'This model is currently associated with one or more assets and cannot be deleted. Please delete the assets, and then try deleting again. ',
-
+    'invalid_category_type' => 'This category must be an asset category.',
 
     'create' => array(
         'error'   => 'Model was not created, please try again.',
diff --git a/resources/lang/iu-NU/admin/reports/general.php b/resources/lang/iu-NU/admin/reports/general.php
index 9b682f8ecd..ed8bf1a156 100644
--- a/resources/lang/iu-NU/admin/reports/general.php
+++ b/resources/lang/iu-NU/admin/reports/general.php
@@ -4,6 +4,7 @@ return [
     'info'   => 'Select the options you want for your asset report.',
     'deleted_user' => 'Deleted user',
     'send_reminder' => 'Send reminder',
+    'cannot_send_reminder' => 'User has been deleted or does not have an email address so cannot receive a reminder',
     'reminder_sent' => 'Reminder sent',
     'acceptance_deleted' => 'Acceptance request deleted',
     'acceptance_request' => 'Acceptance request',
@@ -13,5 +14,10 @@ return [
         'user_state' => 'User State',
         'user_country' => 'User Country',
         'user_zip' => 'User Zip'
-    ]
-];
\ No newline at end of file
+    ],
+    'open_saved_template' => 'Open Saved Template',
+    'save_template' =>  'Save Template',
+    'select_a_template' => 'Select a Template',
+    'template_name' => 'Template Name',
+    'update_template' => 'Update Template',
+];
diff --git a/resources/lang/iu-NU/admin/reports/message.php b/resources/lang/iu-NU/admin/reports/message.php
index d4c8f8198f..2800bbdf0b 100644
--- a/resources/lang/iu-NU/admin/reports/message.php
+++ b/resources/lang/iu-NU/admin/reports/message.php
@@ -1,5 +1,16 @@
 <?php
 
-return array(
-    'error'   => 'You must select at least ONE option.'
-);
+return [
+    'about_templates' => 'About Saved Templates',
+    'saving_templates_description' => 'Select your options, then enter the name of your template in the box above and click the \'Save Template\' button. Use the dropdown to select a previously saved template.',
+    'create'  => [
+        'success' => 'Template saved successfully',
+    ],
+    'update' => [
+        'success' => 'Template updated successfully',
+    ],
+    'delete' => [
+        'success' => 'Template deleted',
+        'no_delete_permission' => 'Template does not exist or you do not have permission to delete it.',
+    ],
+];
diff --git a/resources/lang/iu-NU/admin/settings/general.php b/resources/lang/iu-NU/admin/settings/general.php
index 8074f5082e..37cfb0de94 100644
--- a/resources/lang/iu-NU/admin/settings/general.php
+++ b/resources/lang/iu-NU/admin/settings/general.php
@@ -8,13 +8,13 @@ return [
     'ad_append_domain'          => 'Append domain name to username field',
     'ad_append_domain_help'     => 'User isn\'t required to write "username@domain.local", they can just type "username".',
     'admin_cc_email'            => 'CC Email',
-    'admin_cc_email_help'       => 'If you would like to send a copy of checkin/checkout emails that are sent to users to an additional email account, enter it here. Otherwise leave this field blank.',
+    'admin_cc_email_help'       => 'Send a copy of checkin/checkout emails to this address.',
     'admin_settings'            => 'Admin Settings',
     'is_ad'				        => 'This is an Active Directory server',
     'alerts'                	=> 'Alerts',
     'alert_title'               => 'Update Notification Settings',
     'alert_email'				=> 'Send alerts to',
-    'alert_email_help'    => 'Email addresses or distribution lists you want alerts to be sent to, comma separated',
+    'alert_email_help'          => 'Email addresses or distribution lists you want alerts to be sent to, comma separated.',
     'alerts_enabled'			=> 'Email Alerts Enabled',
     'alert_interval'			=> 'Expiring Alerts Threshold (in days)',
     'alert_inv_threshold'		=> 'Inventory Alert Threshold',
@@ -31,15 +31,18 @@ return [
     'backups'					=> 'Backups',
     'backups_help'              => 'Create, download, and restore backups ',
     'backups_restoring'         => 'Restoring from Backup',
+    'backups_clean' => 'Clean the backed-up database before restore',
+    'backups_clean_helptext' => "This can be useful if you're changing between database versions",
     'backups_upload'            => 'Upload Backup',
     'backups_path'              => 'Backups on the server are stored in <code>:path</code>',
-    'backups_restore_warning'   => 'Use the restore button <small><span class="btn btn-xs btn-warning"><i class="text-white fas fa-retweet" aria-hidden="true"></i></span></small> to restore from a previous backup. (This does not currently work with S3 file storage or Docker.)<br><br>Your <strong>entire :app_name database and any uploaded files will be completely replaced</strong> by what\'s in the backup file.  ',
+    'backups_restore_warning'   => 'Use the restore button <small><span class="btn btn-xs btn-warning"><i class="text-white fas fa-retweet" aria-hidden="true"></i></span></small> to restore from a previous backup. (This does not currently work with S3 file storage or Docker.)<br><br>Your <strong>entire :app_name database and any uploaded files will be completely replaced</strong> by what\'s in the backup file  ',
     'backups_logged_out'         => 'All existing users, including you, will be logged out once your restore is complete.',
     'backups_large'             => 'Very large backups may time out on the restore attempt and may still need to be run via command line. ',
     'barcode_settings'			=> 'Barcode Settings',
     'confirm_purge'			    => 'Confirm Purge',
     'confirm_purge_help'		=> 'Enter the text "DELETE" in the box below to purge your deleted records. This action cannot be undone and will PERMANENTLY delete all soft-deleted items and users. (You should make a backup first, just to be safe.)',
     'custom_css'				=> 'Custom CSS',
+    'custom_css_placeholder'	=> 'Add your custom CSS',
     'custom_css_help'			=> 'Enter any custom CSS overrides you would like to use. Do not include the &lt;style&gt;&lt;/style&gt; tags.',
     'custom_forgot_pass_url'	=> 'Custom Password Reset URL',
     'custom_forgot_pass_url_help'	=> 'This replaces the built-in forgotten password URL on the login screen, useful to direct people to internal or hosted LDAP password reset functionality. It will effectively disable local user forgotten password functionality.',
@@ -47,34 +50,34 @@ return [
     'dashboard_message_help'	=> 'This text will appear on the dashboard for anyone with permission to view the dashboard.',
     'default_currency'  		=> 'Default Currency',
     'default_eula_text'			=> 'Default EULA',
+    'default_eula_text_placeholder' => 'Add your default EULA text',
     'default_language'			=> 'Default Language',
     'default_eula_help_text'	=> 'You can also associate custom EULAs to specific asset categories.',
     'acceptance_note'           => 'Add a note for your decision (Optional)',
     'display_asset_name'        => 'Display Asset Name',
     'display_checkout_date'     => 'Display Checkout Date',
     'display_eol'               => 'Display EOL in table view',
-    'display_qr'                => 'Display Square Codes',
+    'display_qr'                => 'Display 2D barcode',
     'display_alt_barcode'		=> 'Display 1D barcode',
-    'email_logo'                => 'Email Logo',
     'barcode_type'				=> '2D Barcode Type',
     'alt_barcode_type'			=> '1D barcode type',
-    'email_logo_size'       => 'Square logos in email look best. ',
     'enabled'                   => 'Enabled',
     'eula_settings'				=> 'EULA Settings',
     'eula_markdown'				=> 'This EULA allows <a href="https://help.github.com/articles/github-flavored-markdown/">Github flavored markdown</a>.',
+    'empty_row_count'           => 'Field Start Offset (Empty Rows)',
+    'empty_row_count_help'      => 'Fields will begin populating after this many empty rows are skipped at the top of the label.',
     'favicon'                   => 'Favicon',
     'favicon_format'            => 'Accepted filetypes are ico, png, and gif. Other image formats may not work in all browsers.',
     'favicon_size'          => 'Favicons should be square images, 16x16 pixels.',
     'footer_text'               => 'Additional Footer Text ',
     'footer_text_help'          => 'This text will appear in the right-side footer. Links are allowed using <a href="https://help.github.com/articles/github-flavored-markdown/">Github flavored markdown</a>. Line breaks, headers, images, etc may result in unpredictable results.',
+    'footer_text_placeholder'   => 'Optional footer text',
     'general_settings'			=> 'General Settings',
-    'general_settings_keywords' => 'company support, signature, acceptance, email format, username format, images, per page, thumbnail, eula, gravatar, tos, dashboard, privacy',
     'general_settings_help'     => 'Default EULA and more',
     'generate_backup'			=> 'Generate Backup',
     'google_workspaces'         => 'Google Workspaces',
     'header_color'              => 'Header Color',
     'info'                      => 'These settings let you customize certain aspects of your installation.',
-    'label_logo'                => 'Label Logo',
     'label_logo_size'           => 'Square logos look best - will be displayed in the top right of each asset label. ',
     'laravel'                   => 'Laravel Version',
     'ldap'                      => 'LDAP',
@@ -94,7 +97,7 @@ return [
     'ldap_login_sync_help'      => 'This only tests that LDAP can sync correctly. If your LDAP Authentication query is not correct, users may still not be able to login. YOU MUST SAVE YOUR UPDATED LDAP SETTINGS FIRST.',
     'ldap_manager'              => 'LDAP Manager',
     'ldap_server'               => 'LDAP Server',
-    'ldap_server_help'          => 'This should start with ldap:// (for unencrypted or TLS) or ldaps:// (for SSL)',
+    'ldap_server_help'          => 'This should start with ldap:// (for unencrypted) or ldaps:// (for TLS or SSL)',
     'ldap_server_cert'			=> 'LDAP SSL certificate validation',
     'ldap_server_cert_ignore'	=> 'Allow invalid SSL Certificate',
     'ldap_server_cert_help'		=> 'Select this checkbox if you are using a self signed SSL cert and would like to accept an invalid SSL certificate.',
@@ -108,8 +111,8 @@ return [
     'ldap_pword'                => 'LDAP Bind Password',
     'ldap_basedn'               => 'Base Bind DN',
     'ldap_filter'               => 'LDAP Filter',
-    'ldap_pw_sync'              => 'LDAP Password Sync',
-    'ldap_pw_sync_help'         => 'Uncheck this box if you do not wish to keep LDAP passwords synced with local passwords. Disabling this means that your users may not be able to login if your LDAP server is unreachable for some reason.',
+    'ldap_pw_sync'              => 'Cache LDAP Passwords',
+    'ldap_pw_sync_help'         => 'Uncheck this box if you do not wish to keep LDAP passwords cached as local hashed passwords. Disabling this means that your users may not be able to login if your LDAP server is unreachable for some reason.',
     'ldap_username_field'       => 'Username Field',
     'ldap_lname_field'          => 'Last Name',
     'ldap_fname_field'          => 'LDAP First Name',
@@ -117,13 +120,15 @@ return [
     'ldap_version'              => 'LDAP Version',
     'ldap_active_flag'          => 'LDAP Active Flag',
     'ldap_activated_flag_help'  => 'This value is used to determine whether a synced user can login to Snipe-IT. <strong>It does not affect the ability to check items in or out to them</strong>, and should be the <strong>attribute name</strong> within your AD/LDAP, <strong>not the value</strong>. <br><br>If this field is set to a field name that does not exist in your AD/LDAP, or the value in the AD/LDAP field is set to <code>0</code> or <code>false</code>, <strong>user login will be disabled</strong>. If the value in the AD/LDAP field is set to <code>1</code> or <code>true</code> or <em>any other text</em> means the user can log in. When the field is blank in your AD, we respect the <code>userAccountControl</code> attribute, which usually allows non-suspended users to log in.',
+    'ldap_invert_active_flag'   => 'LDAP Invert Active Flag',
+    'ldap_invert_active_flag_help'     => 'If enabled: when the value returned by LDAP Active Flag is <code>0</code> or <code>false</code> the user account will be active.',
     'ldap_emp_num'              => 'LDAP Employee Number',
     'ldap_email'                => 'LDAP Email',
     'ldap_test'                 => 'Test LDAP',
     'ldap_test_sync'            => 'Test LDAP Synchronization',
     'license'                   => 'Software License',
-    'load_remote'               => 'Use Gravatar',
-    'load_remote_help_text'		=> 'Uncheck this box if your install cannot load scripts from the outside internet. This will prevent Snipe-IT from trying load images from Gravatar.',
+    'load_remote'               => 'Load Remote Avatars',
+    'load_remote_help_text'		=> 'Uncheck this box if your install cannot load scripts from the outside internet. This will prevent Snipe-IT from trying load avatars from Gravatar or other outside sources.',
     'login'                     => 'Login Attempts',
     'login_attempt'             => 'Login Attempt',
     'login_ip'                  => 'IP Address',
@@ -131,6 +136,7 @@ return [
     'login_user_agent'          => 'User Agent',
     'login_help'                => 'List of attempted logins',
     'login_note'                => 'Login Note',
+    'login_note_placeholder'            => "If you do not have a login or have found a device belonging to this company, please call technical support at 888-555-1212. Thank you.",
     'login_note_help'           => 'Optionally include a few sentences on your login screen, for example to assist people who have found a lost or stolen device. This field accepts <a href="https://help.github.com/articles/github-flavored-markdown/">Github flavored markdown</a>',
     'login_remote_user_text'    => 'Remote User login options',
     'login_remote_user_enabled_text' => 'Enable Login with Remote User Header',
@@ -146,13 +152,16 @@ return [
     'logo_print_assets_help'    => 'Use branding on printable asset lists ',
     'full_multiple_companies_support_help_text' => 'Restricting users (including admins) assigned to companies to their company\'s assets.',
     'full_multiple_companies_support_text' => 'Full Multiple Companies Support',
+    'scope_locations_fmcs_support_text'  => 'Scope Locations with Full Multiple Companies Support',
+    'scope_locations_fmcs_support_help_text'  => 'Restrict locations to their selected company.',
+    'scope_locations_fmcs_check_button' => 'Check Compatibility',
+    'scope_locations_fmcs_support_disabled_text'  => 'This option is disabled because you have conflicting locations set for :count or more items.',
     'show_in_model_list'   => 'Show in Model Dropdowns',
     'optional'					=> 'optional',
     'per_page'                  => 'Results Per Page',
     'php'                       => 'PHP Version',
-    'php_info'                  => 'PHP Info',
+    'php_info'                  => 'PHP info',
     'php_overview'              => 'PHP',
-    'php_overview_keywords'     => 'phpinfo, system, info',
     'php_overview_help'         => 'PHP System info',
     'php_gd_info'               => 'You must install php-gd to display QR codes, see install instructions.',
     'php_gd_warning'            => 'PHP Image Processing and GD plugin is NOT installed.',
@@ -218,6 +227,8 @@ return [
     'webhook_integration_help'    => ':app integration is optional, however the endpoint and channel are required if you wish to use it. To configure :app integration, you must first <a href=":webhook_link" target="_new" rel="noopener">create an incoming webhook</a> on your :app account. Click on the <strong>Test :app Integration</strong> button to confirm your settings are correct before saving. ',
     'webhook_integration_help_button'    => 'Once you have saved your :app information, a test button will appear.',
     'webhook_test_help'           => 'Test whether your :app integration is configured correctly. YOU MUST SAVE YOUR UPDATED :app SETTINGS FIRST.',
+    'shortcuts_enabled'         => 'Enable Shortcuts',
+    'shortcuts_help_text'       => '<strong>Windows</strong>: Alt + Access key, <strong>Mac</strong>: Control + Option + Access key',
     'snipe_version'  			=> 'Snipe-IT version',
     'support_footer'            => 'Support Footer Links ',
     'support_footer_help'       => 'Specify who sees the links to the Snipe-IT Support info and Users Manual',
@@ -227,7 +238,6 @@ return [
     'update'                    => 'Update Settings',
     'value'                     => 'Value',
     'brand'                     => 'Branding',
-    'brand_keywords'            => 'footer, logo, print, theme, skin, header, colors, color, css',
     'brand_help'                => 'Logo, Site Name',
     'web_brand'                 => 'Web Branding Type',
     'about_settings_title'      => 'About Settings',
@@ -276,6 +286,8 @@ return [
     'two_factor_enrollment_text'	=> "Two factor authentication is required, however your device has not been enrolled yet. Open your Google Authenticator app and scan the QR code below to enroll your device. Once you've enrolled your device, enter the code below",
     'require_accept_signature'      => 'Require Signature',
     'require_accept_signature_help_text'      => 'Enabling this feature will require users to physically sign off on accepting an asset.',
+    'require_checkinout_notes'  => 'Require Notes on Checkin/Checkout',
+    'require_checkinout_notes_help_text'    => 'Enabling this feature will require the note fields to be populated when checking in or checking out an asset.',
     'left'        => 'left',
     'right'        => 'right',
     'top'        => 'top',
@@ -313,24 +325,24 @@ return [
     'filter_by_keyword' => 'Filter by setting keyword',
     'security' => 'Security',
     'security_title' => 'Update Security Settings',
-    'security_keywords' => 'password, passwords, requirements, two factor, two-factor, common passwords, remote login, logout, authentication',
     'security_help' => 'Two-factor, Password Restrictions',
-    'groups_keywords' => 'permissions, permission groups, authorization',
     'groups_help' => 'Account permission groups',
     'localization' => 'Localization',
     'localization_title' => 'Update Localization Settings',
-    'localization_keywords' => 'localization, currency, local, locale, time zone, timezone, international, internatinalization, language, languages, translation',
     'localization_help' => 'Language, date display',
     'notifications' => 'Notifications',
     'notifications_help' => 'Email Alerts & Audit Settings',
     'asset_tags_help' => 'Incrementing and prefixes',
     'labels' => 'Labels',
     'labels_title' => 'Update Label Settings',
-    'labels_help' => 'Label sizes &amp; settings',
-    'purge_keywords' => 'permanently delete',
+    'labels_help' => 'Barcodes &amp; label settings',
     'purge_help' => 'Purge Deleted Records',
     'ldap_extension_warning' => 'It does not look like the LDAP extension is installed or enabled on this server. You can still save your settings, but you will need to enable the LDAP extension for PHP before LDAP syncing or login will work.',
     'ldap_ad' => 'LDAP/AD',
+    'ldap_test_label' => 'Test LDAP Sync',
+    'ldap_test_login' => ' Test LDAP Login',
+    'ldap_username_placeholder' => 'LDAP Username',
+    'ldap_password_placeholder' => 'LDAP Password',
     'employee_number' => 'Employee Number',
     'create_admin_user' => 'Create a User ::',
     'create_admin_success' => 'Success! Your admin user has been added!',
@@ -342,6 +354,8 @@ return [
     'setup_migration_create_user' => 'Next: Create User',
     'ldap_settings_link' => 'LDAP Settings Page',
     'slack_test' => 'Test <i class="fab fa-slack"></i> Integration',
+    'status_label_name' => 'Status Label Name',
+    'super_admin_only'  => 'Super Admin Only',
     'label2_enable'           => 'New Label Engine',
     'label2_enable_help'      => 'Switch to the new label engine. <b>Note: You will need to save this setting before setting others.</b>',
     'label2_template'         => 'Template',
@@ -356,12 +370,15 @@ return [
     'label2_2d_type'          => '2D Barcode Type',
     'label2_2d_type_help'     => 'Format for 2D barcodes',
     'label2_2d_target'        => '2D Barcode Target',
-    'label2_2d_target_help'   => 'The URL the 2D barcode points to when scanned',
+    'label2_2d_target_help'   => 'The data that will be contained in the 2D barcode',
     'label2_fields'           => 'Field Definitions',
     'label2_fields_help'      => 'Fields can be added, removed, and reordered in the left column. For each field, multiple options for Label and DataSource can be added, removed, and reordered in the right column.',
+    'purge_barcodes' => 'Purge Barcodes',
     'help_asterisk_bold'    => 'Text entered as <code>**text**</code> will be displayed as bold',
     'help_blank_to_use'     => 'Leave blank to use the value from <code>:setting_name</code>',
     'help_default_will_use' => '<code>:default</code> will use the value from <code>:setting_name</code>. <br>Note that the value of the barcodes must comply with the respective barcode spec in order to be successfully generated. Please see <a href="https://snipe-it.readme.io/docs/barcodes">the documentation <i class="fa fa-external-link"></i></a> for more details. ',
+    'asset_id'              => 'Asset ID',
+    'data'               => 'Data',
     'default'               => 'Default',
     'none'                  => 'None',
     'google_callback_help' => 'This should be entered as the callback URL in your Google OAuth app settings in your organization&apos;s <strong><a href="https://console.cloud.google.com/" target="_blank">Google developer console <i class="fa fa-external-link" aria-hidden="true"></i></a></strong>.',
@@ -373,7 +390,100 @@ return [
     'database_driver' => 'Database Driver',
     'bs_table_storage' => 'Table Storage',
     'timezone' => 'Timezone',
+    'test_mail' => 'Test Mail',
     'profile_edit'          => 'Edit Profile',
     'profile_edit_help'          => 'Allow users to edit their own profiles.',
+    'default_avatar' => 'Custom Default Avatar',
+    'default_avatar_help' => 'This image will be displayed as a profile if a user does not have a profile photo.',
+    'restore_default_avatar' => 'Restore <a href=":default_avatar" data-toggle="lightbox" data-type="image">original system default avatar</a>',
+    'restore_default_avatar_help' => '',
+    'due_checkin_days' => 'Due For Checkin Warning',
+    'due_checkin_days_help' => 'How many days before the expected checkin of an asset should it be listed in the "Due for checkin" page?',
+    'no_groups' => 'No groups have been created yet. Visit <code>Admin Settings > Permission Groups</code> to add one.',
+    'text' => 'Text',
+
+    'username_formats' => [
+        'username_format'		=> 'Username Format',
+        'firstname_lastname_format'	=> 'First Name Last Name (jane.smith)',
+        'first_name_format'	        => 'First Name (jane)',
+        'last_name_format'		=> 'Last Name (doe)',
+        'filastname_format'			=> 'First Initial Last Name (jsmith)',
+        'lastnamefirstinitial_format' =>  'Last Name First Initial (smithj)',
+        'firstname_lastname_underscore_format' => 'First Name Last Name (jane_smith)',
+        'firstinitial.lastname' => 'First Initial Last Name (j.smith)',
+        'lastname_firstinitial' => 'Last Name First Initial (smith_j)',
+        'lastname_dot_firstinitial_format' => 'Last Name First Initial (smith.j)',
+        'firstnamelastname'     => 'First Name Last Name (janesmith)',
+        'firstnamelastinitial'  => 'First Name Last Initial (janes)',
+        'lastnamefirstname'      => 'Last Name.First Name (smith.jane)',
+    ],
+
+    'email_formats' => [
+        'email_format'			=> 'Email Format',
+        'firstname_lastname_format'	=> 'First Name Last Name (jane.smith@example.com)',
+        'first_name_format'		=> 'First Name (jane@example.com)',
+        'last_name_format'		=> 'Last Name (doe@example.com)',
+        'filastname_format'			=> 'First Initial Last Name (jsmith@example.com)',
+        'lastnamefirstinitial_format' =>  'Last Name First Initial (smithj@example.com)',
+        'firstname_lastname_underscore_format' => 'First Name Last Name (jane_smith@example.com)',
+        'firstinitial.lastname' => 'First Initial Last Name (j.smith@example.com)',
+        'lastname_firstinitial' => 'Last Name First Initial (smith_j@example.com)',
+        'lastname_dot_firstinitial_format' => 'Last Name First Initial (smith.j@example.com)',
+        'firstnamelastname'     => 'First Name Last Name (janesmith@example.com)',
+        'firstnamelastinitial'  => 'First Name Last Initial (janes@example.com)',
+        'lastnamefirstname'      => 'Last Name.First Name (smith.jane@example.com)',
+    ],
+
+
+
+    'logo_labels' => [
+        'acceptance_pdf_logo'       => 'PDF Logo',
+        'email_logo'                => 'Email Logo',
+        'label_logo'                => 'Label Logo',
+        'logo'                      => 'Site Logo',
+        'favicon'                   => 'Favicon',
+    ],
+
+    'logo_help' => [
+        'email_logo_size'       => 'Square logos in email look best. ',
+    ],
+
+    'logo_option_types' => [
+        'text' => 'Text',
+        'logo' => 'Logo',
+        'logo_and_text' => 'Logo and Text',
+    ],
+
+
+    'legends' => [
+        'scoping' => 'Scoping',
+        'formats' => 'Default Formats',
+        'profiles' => 'User Profiles',
+        'eula' => 'EULA & Acceptance Preferences',
+        'misc_display' => 'Miscellaneous Display Options',
+        'email' => 'Email Preferences',
+        'checkin' => 'Checkin Preferences',
+        'dashboard' => 'Login & Dashboard Preferences',
+        'misc' => 'Miscellaneous',
+        'logos' => 'Logos & Display',
+        'colors' => 'Colors & Skins',
+        'footer' => 'Footer Preferences',
+        'security' => 'Security Preferences',
+        'general' => 'General',
+        'intervals' => 'Intervals & Thresholds',
+    ],
+
+
+    /* Keywords for settings overview help */
+    'keywords' => [
+        'brand'             => 'footer, logo, print, theme, skin, header, colors, color, css',
+        'general_settings'  => 'company support, signature, acceptance, email format, username format, images, per page, thumbnail, eula, gravatar, tos, dashboard, privacy',
+        'groups'            => 'permissions, permission groups, authorization',
+        'labels'            => 'labels, barcodes, barcode, sheets, print, upc, qr, 1d, 2d',
+        'localization'      => 'localization, currency, local, locale, time zone, timezone, international, internatinalization, language, languages, translation',
+        'php_overview'      => 'phpinfo, system, info',
+        'purge'             => 'permanently delete',
+        'security'          => 'password, passwords, requirements, two factor, two-factor, common passwords, remote login, logout, authentication',
+    ],
 
 ];
diff --git a/resources/lang/iu-NU/admin/settings/message.php b/resources/lang/iu-NU/admin/settings/message.php
index c9b0f34217..58abf14c5c 100644
--- a/resources/lang/iu-NU/admin/settings/message.php
+++ b/resources/lang/iu-NU/admin/settings/message.php
@@ -14,6 +14,9 @@ return [
         'restore_warning'       => 'Yes, restore it. I acknowledge that this will overwrite any existing data currently in the database. This will also log out all of your existing users (including you).',
         'restore_confirm'       => 'Are you sure you wish to restore your database from :filename?'
     ],
+    'restore' => [
+        'success'               => 'Your system backup has been restored. Please log in again.'
+    ],
     'purge' => [
         'error'     => 'An error has occurred while purging. ',
         'validation_failed'     => 'Your purge confirmation is incorrect. Please type the word "DELETE" in the confirmation box.',
@@ -33,6 +36,9 @@ return [
         'testing_authentication' => 'Testing LDAP Authentication...',
         'authentication_success' => 'User authenticated against LDAP successfully!'
     ],
+    'labels' => [
+        'null_template' => 'Label template not found. Please select a template.',
+        ],
     'webhook' => [
         'sending' => 'Sending :app test message...',
         'success' => 'Your :webhook_name Integration works!',
@@ -42,5 +48,12 @@ return [
         'error' => 'Something went wrong. :app responded with: :error_message',
         'error_redirect' => 'ERROR: 301/302 :endpoint returns a redirect. For security reasons, we don’t follow redirects. Please use the actual endpoint.',
         'error_misc' => 'Something went wrong. :( ',
-    ]
+        'webhook_fail' => ' webhook notification failed: Check to make sure the URL is still valid.',
+        'webhook_channel_not_found' => ' webhook channel not found.',
+        'ms_teams_deprecation' => 'The selected Microsoft Teams webhook URL will be deprecated Dec 31st, 2025. Please use a workflow URL. Microsoft\'s documentation on creating a workflow can be found <a href="https://support.microsoft.com/en-us/office/create-incoming-webhooks-with-workflows-for-microsoft-teams-8ae491c7-0394-4861-ba59-055e33f75498" target="_blank"> here.</a>',
+    ],
+    'location_scoping' => [
+        'not_saved' => 'Your settings were not saved.',
+        'mismatch' => 'There is 1 item in the database that need your attention before you can enable location scoping.|There are :count items in the database that need your attention before you can enable location scoping.',
+    ],
 ];
diff --git a/resources/lang/iu-NU/admin/statuslabels/table.php b/resources/lang/iu-NU/admin/statuslabels/table.php
index 27befb5ef7..1a0fab891e 100644
--- a/resources/lang/iu-NU/admin/statuslabels/table.php
+++ b/resources/lang/iu-NU/admin/statuslabels/table.php
@@ -1,14 +1,14 @@
 <?php
 
 return array(
-    'about'      	=> 'About Status Labels',
+    'about'      	=> 'About Status Types',
     'archived'      	=> 'Archived',
     'create'      	=> 'Create Status Label',
     'color'      	=> 'Chart Color',
     'default_label' => 'Default Label',
     'default_label_help' => 'This is used to ensure your most commonly used status labels appear at the top of the select box when creating/editing assets.',
     'deployable'      	=> 'Deployable',
-    'info'      	=> 'Status labels are used to describe the various states your assets could be in. They may be out for repair, lost/stolen, etc. You can create new status labels for deployable, pending and archived assets.',
+    'info'      	=> 'Status label types are used to describe the various states your assets could be in. They may be out for repair, lost/stolen, etc. You can create new status labels for your deployable, pending and archived assets according to your own workflow. For more information, <a href="https://snipe-it.readme.io/docs/overview#status-labels" target="_blank">see the documentation <i class="fa fa-external-link"></i></a>.',
     'name'      	=> 'Status Name',
     'pending'      	=> 'Pending',
     'status_type'   => 'Status Type',
diff --git a/resources/lang/iu-NU/admin/users/general.php b/resources/lang/iu-NU/admin/users/general.php
index b097ccec69..14f36cf151 100644
--- a/resources/lang/iu-NU/admin/users/general.php
+++ b/resources/lang/iu-NU/admin/users/general.php
@@ -19,6 +19,8 @@ return [
     'print_assigned'    => 'Print All Assigned',
     'email_assigned'    => 'Email List of All Assigned',
     'user_notified'     => 'User has been emailed a list of their currently assigned items.',
+    'users_notified'    => 'The user has been emailed a list of their currently assigned items.|:count users have been emailed a list of their currently assigned items.',
+    'users_notified_warning' => ':count user has been emailed a list of their currently assigned items, however :no_email users did not have an email address so could not be emailed.|:count users have been emailed a list of their currently assigned items, however :no_email user(s) did not have an email address so could not be emailed.',
     'auto_assign_label' => 'Include this user when auto-assigning eligible licenses',
     'auto_assign_help'  => 'Skip this user in auto assignment of licenses',
     'software_user'     => 'Software Checked out to :name',
diff --git a/resources/lang/iu-NU/admin/users/message.php b/resources/lang/iu-NU/admin/users/message.php
index 4d014775bd..b6ddad3aac 100644
--- a/resources/lang/iu-NU/admin/users/message.php
+++ b/resources/lang/iu-NU/admin/users/message.php
@@ -6,7 +6,7 @@ return array(
     'declined'                  => 'You have successfully declined this asset.',
     'bulk_manager_warn'	        => 'Your users have been successfully updated, however your manager entry was not saved because the manager you selected was also in the user list to be edited, and users may not be their own manager. Please select your users again, excluding the manager.',
     'user_exists'               => 'User already exists!',
-    'user_not_found'            => 'User does not exist.',
+    'user_not_found'            => 'User does not exist or you do not have permission view them.',
     'user_login_required'       => 'The login field is required',
     'user_has_no_assets_assigned' => 'No assets currently assigned to user.',
     'user_password_required'    => 'The password is required.',
@@ -53,6 +53,7 @@ return array(
         'ldap_could_not_search' => 'Could not search the LDAP server. Please check your LDAP server configuration in the LDAP config file. <br>Error from LDAP Server:',
         'ldap_could_not_get_entries' => 'Could not get entries from the LDAP server. Please check your LDAP server configuration in the LDAP config file. <br>Error from LDAP Server:',
         'password_ldap' => 'The password for this account is managed by LDAP/Active Directory. Please contact your IT department to change your password. ',
+        'multi_company_items_assigned' => 'This user has items assigned that belong to a different company. Please check them in or edit their company.'
     ),
 
     'deletefile' => array(
diff --git a/resources/lang/iu-NU/admin/users/table.php b/resources/lang/iu-NU/admin/users/table.php
index 7c5fb2cad5..094cdbc412 100644
--- a/resources/lang/iu-NU/admin/users/table.php
+++ b/resources/lang/iu-NU/admin/users/table.php
@@ -22,7 +22,7 @@ return array(
     'managed_locations'     => 'Managed Locations',
     'managed_users'         => 'Managed Users',
     'name' 					=> 'Name',
-    'nogroup'               => 'No groups have been created yet. To add one, visit: ',
+    'nogroup'               => 'No groups have been created yet. To add one, visit:',
     'notes'                 => 'Notes',
     'password_confirm' 		=> 'Confirm Password',
     'password' 				=> 'Password',
diff --git a/resources/lang/iu-NU/auth.php b/resources/lang/iu-NU/auth.php
index db310aa1bb..14d8acfce0 100644
--- a/resources/lang/iu-NU/auth.php
+++ b/resources/lang/iu-NU/auth.php
@@ -15,6 +15,6 @@ return array(
 
     'failed' => 'These credentials do not match our records.',
     'password' => 'The provided password is incorrect.',
-    'throttle' => 'Too many login attempts. Please try again in :seconds seconds.',
+    'throttle' => 'Too many login attempts. Please try again in :minutes minute(s).',
 
 );
diff --git a/resources/lang/iu-NU/auth/message.php b/resources/lang/iu-NU/auth/message.php
index 588c9069ca..08f638d058 100644
--- a/resources/lang/iu-NU/auth/message.php
+++ b/resources/lang/iu-NU/auth/message.php
@@ -6,8 +6,6 @@ return array(
     'account_not_found'      => 'The username or password is incorrect.',
     'account_not_activated'  => 'This user account is not activated.',
     'account_suspended'      => 'This user account is suspended.',
-    'account_banned'         => 'This user account is banned.',
-    'throttle'               => 'Too many failed login attempts. Please try again in :minutes minutes.',
 
     'two_factor' => array(
         'already_enrolled'      => 'Your device is already enrolled.',
diff --git a/resources/lang/iu-NU/button.php b/resources/lang/iu-NU/button.php
index 22821b8157..8a838e8faf 100644
--- a/resources/lang/iu-NU/button.php
+++ b/resources/lang/iu-NU/button.php
@@ -7,6 +7,7 @@ return [
     'checkin_and_delete'  	    => 'Checkin All / Delete User',
     'delete'  	                => 'Delete',
     'edit'    	                => 'Edit',
+    'clone'    	                => 'Clone',
     'restore' 	                => 'Restore',
     'remove'                    => 'Remove',
     'request'                   => 'Request',
@@ -21,4 +22,13 @@ return [
     'add_maintenance'           => 'Add Maintenance',
     'append'                    => 'Append',
     'new'                       => 'New',
+    'var' => [
+        'clone'     => 'Clone :item_type',
+        'edit'      => 'Edit :item_type',
+        'delete'    => 'Delete :item_type',
+        'restore'   => 'Restore :item_type',
+        'create'    => 'Create New :item_type',
+        'checkout'  => 'Checkout :item_type',
+        'checkin'   => 'Checkin :item_type',
+    ]
 ];
diff --git a/resources/lang/iu-NU/general.php b/resources/lang/iu-NU/general.php
index 5b1d0e9b3c..d2e16aafbb 100644
--- a/resources/lang/iu-NU/general.php
+++ b/resources/lang/iu-NU/general.php
@@ -10,7 +10,7 @@ return [
     'action'                => 'Action',
     'activity_report'		=> 'Activity Report',
     'address'				=> 'Address',
-    'admin'					=> 'Admin',
+    'admin'					=> 'Admin Settings',
     'admin_tooltip'			=> 'This user has admin privileges',
     'superuser'				=> 'Superuser',
     'superuser_tooltip'		=> 'This user has superuser privileges',
@@ -23,13 +23,16 @@ return [
     'asset_models'			=> 'Asset Models',
     'asset_model'			=> 'Model',
     'asset'					=> 'Asset',
+    'asset_previous'        => 'Asset (Previously Assigned)',
     'asset_report'          => 'Asset Report',
     'asset_tag'				=> 'Asset Tag',
     'asset_tags'            => 'Asset Tags',
     'assets_available'		=> 'Assets available',
     'accept_assets'         => 'Accept Assets :name',
     'accept_assets_menu'    => 'Accept Assets',
+    'accept_item'           => 'Accept Item',
     'audit'				    => 'Audit',
+    'audits'				=> 'Audits',
     'audit_report'			=> 'Audit Log',
     'assets'				=> 'Assets',
     'assets_audited'        => 'assets audited',
@@ -61,9 +64,12 @@ return [
     'changepassword'  		=> 'Change Password',
     'checkin'  				=> 'Checkin',
     'checkin_from'  		=> 'Checkin from',
+    'checkin_note'  		=> 'Checkin Note',
+    'checkout_note'  		=> 'Checkout Note',
     'checkout'  			=> 'Checkout',
     'checkouts_count'       => 'Checkouts',
     'checkins_count'        => 'Checkins',
+    'checkin_and_delete'  	=> 'Checkin and Delete',
     'user_requests_count'   => 'Requests',
     'city'  				=> 'City',
     'click_here'			=> 'Click here',
@@ -77,7 +83,7 @@ return [
     'consumables'			=> 'Consumables',
     'country'  				=> 'Country',
     'could_not_restore'     => 'Error restoring :item_type: :error',
-    'not_deleted'           => 'The :item_type is not deleted so it cannot be restored',
+    'not_deleted'           => 'The :item_type was not deleted and therefore cannot be restored',
     'create'				=> 'Create New',
     'created'               => 'Item Created',
     'created_asset'			=> 'created asset',
@@ -86,11 +92,13 @@ return [
     'record_created' 		=> 'Record Created',
     'updated_at' 			=> 'Updated at',
     'currency'  			=> '$', // this is deprecated
+    'currency_text'  		=> 'Currency', //
     'current'  				=> 'Current',
     'current_password'      => 'Current Password',
     'customize_report'      => 'Customize Report',
     'custom_report'         => 'Custom Asset Report',
     'dashboard'				=> 'Dashboard',
+    'data_source'           => 'Data Source',
     'days'      			=> 'days',
     'days_to_next_audit'    => 'Days to Next Audit',
     'date'					=> 'Date',
@@ -98,7 +106,7 @@ return [
     'debug_warning_text'    => 'This application is running in production mode with debugging enabled. This can expose sensitive data if your application is accessible to the outside world. Disable debug mode by setting the <code>APP_DEBUG</code> value in your <code>.env</code> file to <code>false</code>.',
     'delete'  				=> 'Delete',
     'delete_confirm'  		=> 'Are you sure you wish to delete :item?',
-    'delete_confirm_no_undo' => 'Are you sure you wish to delete :item? This can not be undone.',
+    'delete_confirm_no_undo' => 'Are you sure, you wish to delete :item? This cannot be undone.',
     'deleted'  				=> 'Deleted',
     'delete_seats'  		=> 'Deleted Seats',
     'deletion_failed'       => 'Deletion failed',
@@ -114,29 +122,13 @@ return [
     'editprofile'  			=> 'Edit Your Profile',
     'eol'					=> 'EOL',
     'email_domain'			=> 'Email Domain',
-    'email_format'			=> 'Email Format',
     'employee_number'       => 'Employee Number',
     'email_domain_help'		=> 'This is used to generate email addresses when importing',
     'error'				    => 'Error',
     'exclude_archived'      => 'Exclude Archived Assets',
     'exclude_deleted'       => 'Exclude Deleted Assets',
     'example'				=> 'Example: ',
-    'filastname_format'			=> 'First Initial Last Name (jsmith@example.com)',
-    'firstname_lastname_format'	=> 'First Name Last Name (jane.smith@example.com)',
-    'firstname_lastname_underscore_format' => 'First Name Last Name (jane_smith@example.com)',
-    'lastnamefirstinitial_format' =>  'Last Name First Initial (smithj@example.com)',
-    'firstintial_dot_lastname_format' => 'First Initial Last Name (j.smith@example.com)',
-    'firstname_lastname_display'	=> 'First Name Last Name (Jane Smith)',
-    'lastname_firstname_display'	=> 'Last Name First Name (Smith Jane)',
-    'name_display_format'	=> 'Name Display Format',
-    'first'					=> 'First',
-    'firstnamelastname'     => 'First Name Last Name (janesmith@example.com)',
-    'lastname_firstinitial' => 'Last Name First Initial (smith_j@example.com)',
-    'firstinitial.lastname' => 'First Initial Last Name (j.smith@example.com)',
-    'firstnamelastinitial'  => 'First Name Last Initial (janes@example.com)',
-    'lastnamefirstname'      => 'Last Name First Name (smith.jane@example.com)',
-    'first_name'			=> 'First Name',
-    'first_name_format'		=> 'First Name (jane@example.com)',
+
     'files'                 => 'Files',
     'file_name'				=> 'File',
     'file_type'             => 'File Type',
@@ -156,9 +148,9 @@ return [
     'image_delete'         	=> 'Delete Image',
     'include_deleted'       => 'Include Deleted Assets',
     'image_upload'         	=> 'Upload Image',
-    'filetypes_accepted_help'    => 'Accepted filetype is :types. Max upload size allowed is :size.|Accepted filetypes are :types. Max upload size allowed is :size.',
-    'filetypes_size_help'   => 'Max upload size allowed is :size.',
-    'image_filetypes_help'  => 'Accepted filetypes are jpg, webp, png, gif, svg, and avif. Max upload size allowed is :size.',
+    'filetypes_accepted_help'    => 'Accepted filetype is :types. The maximum size allowed is :size.|Accepted filetypes are :types. The maximum upload size allowed is :size.',
+    'filetypes_size_help'   => 'The maximum upload size allowed is :size.',
+    'image_filetypes_help'  => 'Accepted Filetypes are jpg, webp, png, gif, svg, and avif. The maximum upload size allowed is :size.',
     'unaccepted_image_type'  => 'This image file was not readable. Accepted filetypes are jpg, webp, png, gif, and svg. The mimetype of this file is: :mimetype.',
     'import'         	    => 'Import',
     'import_this_file'      => 'Map fields and process this file',
@@ -178,12 +170,17 @@ return [
     'last'					=> 'Last',
     'last_login'            => 'Last Login',
     'last_name'             => 'Last Name',
+    'firstname_lastname_display'	=> 'First Name Last Name (Jane Smith)',
+    'lastname_firstname_display'	=> 'Last Name First Name (Smith Jane)',
+    'name_display_format'	=> 'Name Display Format',
+    'first'					=> 'First',
+    'first_name'			=> 'First Name',
     'license'				=> 'License',
     'license_report'        => 'License Report',
     'licenses_available'	=> 'Licenses available',
     'licenses'				=> 'Licenses',
     'list_all'				=> 'List All',
-    'loading'				=> 'Loading... please wait....',
+    'loading'				=> 'Loading... please wait...',
     'lock_passwords'        => 'This field value will not be saved in a demo installation.',
     'feature_disabled'      => 'This feature has been disabled for the demo installation.',
     'location'              => 'Location',
@@ -193,7 +190,7 @@ return [
     'logout'				=> 'Logout',
     'lookup_by_tag'     => 'Lookup by Asset Tag',
     'maintenances'          => 'Maintenances',
-    'manage_api_keys'       => 'Manage API Keys',
+    'manage_api_keys'       => 'Manage API keys',
     'manufacturer'			=> 'Manufacturer',
     'manufacturers'			=> 'Manufacturers',
     'markdown'				=> 'This field allows <a href="https://help.github.com/articles/github-flavored-markdown/">Github flavored markdown</a>.',
@@ -215,6 +212,14 @@ return [
     'no_results'			=> 'No Results.',
     'no'  					=> 'No',
     'notes'  				=> 'Notes',
+    'note_added'            => 'Note Added',
+    'options'				=> 'Options',
+    'preview'				=> 'Preview',
+    'add_note'              => 'Add Note',
+    'note_edited'            => 'Note Edited',
+    'edit_note'              => 'Edit Note',
+    'note_deleted'            => 'Note Deleted',
+    'delete_note'              => 'Delete Note',
     'order_number'          => 'Order Number',
     'only_deleted'          => 'Only Deleted Assets',
     'page_menu'				=> 'Showing _MENU_ items',
@@ -229,7 +234,7 @@ return [
     'purchase_date'         => 'Purchase Date',
     'qty'		            => 'QTY',
     'quantity'		        => 'Quantity',
-    'quantity_minimum'      => 'You have :count items below or almost below minimum quantity levels',
+    'quantity_minimum'      => 'You have one item below or almost below minimum quantity levels|You have :count items below or almost below minimum quantity levels',
     'quickscan_checkin'  	=> 'Quick Scan Checkin',
     'quickscan_checkin_status'  	=> 'Checkin Status',
     'ready_to_deploy'		=> 'Ready to Deploy',
@@ -254,7 +259,7 @@ return [
     'select_all'            => 'Select All',
     'search'				=> 'Search',
     'select_category'       => 'Select a Category',
-    'select_datasource' => 'Select a Datasource',
+    'select_datasource' => 'Select a data source',
     'select_department'     => 'Select a Department',
     'select_depreciation'	=> 'Select a Depreciation Type',
     'select_location'		=> 'Select a Location',
@@ -274,13 +279,15 @@ return [
     'signed_off_by'         => 'Signed Off By',
     'skin'       			=> 'Skin',
     'webhook_msg_note'        => 'A notification will be sent via webhook',
-    'webhook_test_msg'        => 'Oh hai! Looks like your :app integration with Snipe-IT is working!',
+    'webhook_test_msg'        => 'Oh hai! It looks like your :app integration with Snipe-IT is working!',
     'some_features_disabled' => 'DEMO MODE: Some features are disabled for this installation.',
     'site_name'				=> 'Site Name',
     'state'  				=> 'State',
     'status_labels'			=> 'Status Labels',
+    'status_label'			=> 'Status Label',
     'status'    			=> 'Status',
     'accept_eula'           => 'Acceptance Agreement',
+    'show_or_hide_eulas' => 'Show/Hide EULAs',
     'supplier'              => 'Supplier',
     'suppliers'  			=> 'Suppliers',
     'sure_to_delete'        => 'Are you sure you wish to delete',
@@ -296,9 +303,9 @@ return [
     'type'  				=> 'Type',
     'undeployable'			=> 'Un-deployable',
     'unknown_admin'			=> 'Unknown Admin',
-    'username_format'		=> 'Username Format',
     'username'              => 'Username',
     'update'                => 'Update',
+    'updating_item' => 'Updating :item',
     'upload_filetypes_help'      => 'Allowed filetypes are png, gif, jpg, jpeg, doc, docx, pdf, xls, xlsx, txt, lic, xml, zip, rtf and rar. Max upload size allowed is :size.',
     'uploaded'              => 'Uploaded',
     'user'					=> 'User',
@@ -323,10 +330,10 @@ return [
     'token_expired'         => 'Your form session has expired. Please try again.',
     'login_enabled'         => 'Login Enabled',
     'audit_due'             => 'Due for Audit',
-    'audit_due_days'        => 'Assets Due for Audit Within :days Day|Assets Due for Audit Within :days Days',
+    'audit_due_days'        => '{}Assets Due or Overdue for Audit|[1]Assets Due or Overdue for Audit Within a Day|[2,*]Assets Due or Overdue for Audit Within :days Days',
     'checkin_due'           => 'Due for Checkin',
     'checkin_overdue'       => 'Overdue for Checkin',
-    'checkin_due_days'      => 'Assets Due for Checkin Within :days Day|Assets Due for Checkin Within :days Days',
+    'checkin_due_days'      => '{}Due for Checkin|[1]Assets Due for Checkin Within :days Day|[2,*]Assets Due for Checkin Within :days Days',
     'audit_overdue'         => 'Overdue for Audit',
     'accept'                => 'Accept :asset',
     'i_accept'              => 'I accept',
@@ -339,16 +346,16 @@ return [
     'view_all'              => 'view all',
     'hide_deleted'          => 'Hide Deleted',
     'email'                 => 'Email',
-    'do_not_change'         => 'Do Not Change',
-    'bug_report'            => 'Report a Bug',
+    'do_not_change'         => 'Do not change',
+    'bug_report'            => 'Report a bug',
     'user_manual'           => 'User\'s Manual',
     'setup_step_1'          => 'Step 1',
     'setup_step_2'          => 'Step 2',
     'setup_step_3'          => 'Step 3',
     'setup_step_4'          => 'Step 4',
     'setup_config_check'    => 'Configuration Check',
-    'setup_create_database' => 'Create Database Tables',
-    'setup_create_admin'    => 'Create Admin User',
+    'setup_create_database' => 'Create database tables',
+    'setup_create_admin'    => 'Create an admin user',
     'setup_done'            => 'Finished!',
     'bulk_edit_about_to'    => 'You are about to edit the following: ',
     'checked_out'           => 'Checked Out',
@@ -383,6 +390,8 @@ return [
     'new_license'           => 'New License',
     'new_accessory'         => 'New Accessory',
     'new_consumable'        => 'New Consumable',
+    'new_component'         => 'New Component',
+    'new_user'              => 'New User',
     'collapse'              => 'Collapse',
     'assigned'              => 'Assigned',
     'asset_count'           => 'Asset Count',
@@ -418,19 +427,20 @@ return [
     'bulk_soft_delete'      =>'Also soft-delete these users. Their asset history will remain intact unless/until you purge deleted records in the Admin Settings.',
     'bulk_checkin_delete_success' => 'Your selected users have been deleted and their items have been checked in.',
     'bulk_checkin_success' => 'The items for the selected users have been checked in.',
-    'set_to_null'           => 'Delete values for this asset|Delete values for all :asset_count assets ',
+    'set_to_null'           => 'Delete values for this selection|Delete values for all :selection_count selections ',
     'set_users_field_to_null'  => 'Delete :field values for this user|Delete :field values for all :user_count users ',
     'na_no_purchase_date'   => 'N/A - No purchase date provided',
     'assets_by_status'      => 'Assets by Status',
     'assets_by_status_type'      => 'Assets by Status Type',
     'pie_chart_type'        => 'Dashboard Pie Chart Type',
     'hello_name'            => 'Hello, :name!',
-    'unaccepted_profile_warning'   => 'You have :count items requiring acceptance. Click here to accept or decline them',
+    'unaccepted_profile_warning'   => 'You have one item requiring acceptance. Click here to accept or decline it | You have :count items requiring acceptance. Click here to accept or decline them',
     'start_date'            => 'Start Date',
     'end_date'            => 'End Date',
     'alt_uploaded_image_thumbnail' => 'Uploaded thumbnail',
     'placeholder_kit'       => 'Select a kit',
     'file_not_found'        => 'File not found',
+    'log_record_not_found'  => 'No record for that log entry was found.',
     'preview_not_available' => '(no preview)',
     'setup'                 => 'Setup',
     'pre_flight'            => 'Pre-Flight',
@@ -512,7 +522,7 @@ return [
     'checked_out_to_fields' => 'Checked Out To Fields',
     'percent_complete' => '% complete',
     'uploading' => 'Uploading... ',
-    'upload_error' => 'Error uploading file. Please check that there are no empty rows and that no column names are duplicated.',
+    'upload_error' => 'Error uploading file. Please check that you have no empty rows or duplicated column names in your CSV, and that the server permissions allow uploads.',
     'copy_to_clipboard' => 'Copy to Clipboard',
     'copied' => 'Copied!',
     'status_compatibility' => 'If assets are already assigned, they cannot be changed to a non-deployable status type and this value change will be skipped.',
@@ -549,6 +559,71 @@ return [
         'license_seats'  => ':count License Seat|:count License Seats',
         'consumables'  => ':count Consumable|:count Consumables',
         'components'  => ':count Component|:count Components',
-    ]
+    ],
+
+    'more_info' => 'More Info',
+    'quickscan_bulk_help' => 'Checking this box will edit the asset record to reflect this new location. Leaving it unchecked will simply note the location in the audit log. Note that if this asset is checked out, it will not change the location of the person, asset or location it is checked out to.',
+    'whoops' => 'Whoops!',
+    'something_went_wrong' => 'Something went wrong with your request.',
+    'close' => 'Close',
+    'expires' => 'Expires',
+    'map_fields'=> 'Map :item_type Fields',
+    'remaining_var' => ':count Remaining',
+    'label' => 'Label',
+    'import_asset_tag_exists' => 'An asset with the asset tag :asset_tag already exists and an update was not requested. No change was made.',
+    'countries_manually_entered_help' => 'Values with an asterisk (*) were manually entered and do not match existing ISO 3166 dropdown values',
+    'accessories_assigned' => 'Assigned Accessories',
+    'user_managed_passwords' => 'Password Management',
+    'user_managed_passwords_disallow' => 'Disallow users from managing their own passwords',
+    'user_managed_passwords_allow' => 'Allow users to manage their own passwords',
+    'from' => 'From',
+    'by' => 'By',
+
+// Add form placeholders here
+    'placeholders' => [
+        'notes'  => 'Add a note',
+    ],
+
+    'breadcrumb_button_actions' => [
+        'edit_item' => 'Edit :name',
+        'checkout_item' => 'Checkout :name',
+        'checkin_item' => 'Checkin :name',
+    ],
+
+    'skins' => [
+        'site_default' => 'Site Default',
+        'default_blue' => 'Default Blue',
+        'blue_dark' => 'Blue (Dark Mode)',
+        'green' => 'Green Dark',
+        'green_dark' => 'Green (Dark Mode)',
+        'red' => 'Red Dark',
+        'red_dark' => 'Red (Dark Mode)',
+        'orange' => 'Orange Dark',
+        'orange_dark' => 'Orange (Dark Mode)',
+        'black' => 'Black',
+        'black_dark' => 'Black (Dark Mode)',
+        'purple' => 'Purple',
+        'purple_dark' => 'Purple (Dark Mode)',
+        'yellow' => 'Yellow',
+        'yellow_dark' => 'Yellow (Dark Mode)',
+        'high_contrast' => 'High Contrast',
+
+    ],
+
+    'select_all_none' => 'Select/Unselect All',
+    'generic_model_not_found' => 'That :model was not found or you do not have permission to access it',
+    'deleted_models' => 'Deleted Asset Models',
+    'deleted_users' => 'Deleted Users',
+    'cost_each' => ':amount each',
+    'remove_current_image' => 'Remove current :type image',
+
+    'seeding' => [
+        'manufacturers' => [
+            'button' => 'Create Manufacturers',
+            'prompt' => 'You do not have any manufacturers yet. Would you like to seed a list of common manufacturers? (THIS WILL OVERWRITE EXISTING MANUFACTURERS, including those that have been soft-deleted.)',
+            'success' => 'Manufacturers seeded successfully',
+            'error' => 'Could not seed manufacturers. A manufacturer record already exists and seeding would overwrite it.|Could not seed manufacturers. :count manufacturer records already exist and seeding would overwrite them.',
+        ],
+    ],
 
 ];
diff --git a/resources/lang/iu-NU/localizations.php b/resources/lang/iu-NU/localizations.php
index f1232dd138..827ed4fca1 100644
--- a/resources/lang/iu-NU/localizations.php
+++ b/resources/lang/iu-NU/localizations.php
@@ -2,7 +2,7 @@
 
 return [
 
-    'select_language' => 'Select a language',
+    'select_language' => 'Select a Language',
     'languages' => [
         'en-US'=> 'English, US',
         'en-GB'=> 'English, UK',
@@ -40,7 +40,9 @@ return [
         'ms-MY'=> 'Malay',
         'mi-NZ'=> 'Maori',
         'mn-MN'=> 'Mongolian',
-        'no-NO'=> 'Norwegian',
+        'nb-NO'=> 'Norwegian Bokmål',
+        'om-ET' => 'Oromo (Ethiopian)',
+        //'nn-NO'=> 'Norwegian Nynorsk',
         'fa-IR'=> 'Persian',
         'pl-PL'=> 'Polish',
         'pt-PT'=> 'Portuguese',
@@ -66,7 +68,7 @@ return [
         'zu-ZA'=> 'Zulu',
     ],
 
-    'select_country' => 'Select a country',
+    'select_country' => 'Select a Country',
     
     'countries' => [
         'AC'=>'Ascension Island',
@@ -133,6 +135,7 @@ return [
         'EC'=>'Ecuador',
         'EE'=>'Estonia',
         'EG'=>'Egypt',
+        'GB-ENG'=>'England',
         'ER'=>'Eritrea',
         'ES'=>'Spain',
         'ET'=>'Ethiopia',
@@ -231,6 +234,7 @@ return [
         'NG'=>'Nigeria',
         'NI'=>'Nicaragua',
         'NL'=>'Netherlands',
+        'GB-NIR' => 'Northern Ireland',
         'NO'=>'Norway',
         'NP'=>'Nepal',
         'NR'=>'Nauru',
@@ -258,7 +262,7 @@ return [
         'RU'=>'Russian Federation',
         'RW'=>'Rwanda',
         'SA'=>'Saudi Arabia',
-        'UK'=>'Scotland',
+        'GB-SCT'=>'Scotland',
         'SB'=>'Solomon Islands',
         'SC'=>'Seychelles',
         'SS'=>'South Sudan',
@@ -310,6 +314,7 @@ return [
         'VI'=>'Virgin Islands (U.S.)',
         'VN'=>'Viet Nam',
         'VU'=>'Vanuatu',
+        'GB-WLS' =>'Wales',
         'WF'=>'Wallis And Futuna Islands',
         'WS'=>'Samoa',
         'YE'=>'Yemen',
diff --git a/resources/lang/iu-NU/mail.php b/resources/lang/iu-NU/mail.php
index 759ff0f5e8..797f735a2b 100644
--- a/resources/lang/iu-NU/mail.php
+++ b/resources/lang/iu-NU/mail.php
@@ -23,24 +23,25 @@ return [
     'Item_Requested' => 'Item Requested',
     'License_Checkin_Notification' => 'License checked in',
     'License_Checkout_Notification' => 'License checked out',
+    'license_for'   => 'License for',
     'Low_Inventory_Report' => 'Low Inventory Report',
     'a_user_canceled' => 'A user has canceled an item request on the website',
     'a_user_requested' => 'A user has requested an item on the website',
     'acceptance_asset_accepted' => 'A user has accepted an item',
     'acceptance_asset_declined' => 'A user has declined an item',
-    'accessory_name' => 'Accessory Name:',
-    'additional_notes' => 'Additional Notes:',
+    'accessory_name' => 'Accessory Name',
+    'additional_notes' => 'Additional Notes',
     'admin_has_created' => 'An administrator has created an account for you on the :web website.',
-    'asset' => 'Asset:',
-    'asset_name' => 'Asset Name:',
+    'asset' => 'Asset',
+    'asset_name' => 'Asset Name',
     'asset_requested' => 'Asset requested',
     'asset_tag' => 'Asset Tag',
     'assets_warrantee_alert' => 'There is :count asset with a warranty expiring in the next :threshold days.|There are :count assets with warranties expiring in the next :threshold days.',
     'assigned_to' => 'Assigned To',
     'best_regards' => 'Best regards,',
-    'canceled' => 'Canceled:',
-    'checkin_date' => 'Checkin Date:',
-    'checkout_date' => 'Checkout Date:',
+    'canceled' => 'Canceled',
+    'checkin_date' => 'Checkin Date',
+    'checkout_date' => 'Checkout Date',
     'checkedout_from' => 'Checked out from',
     'checkedin_from'  => 'Checked in from',
     'checked_into' => 'Checked into',
@@ -49,27 +50,30 @@ return [
     'click_to_confirm' => 'Please click on the following link to confirm your :web account:',
     'current_QTY' => 'Current QTY',
     'days' => 'Days',
-    'expecting_checkin_date' => 'Expected Checkin Date:',
+    'expecting_checkin_date' => 'Expected Checkin Date',
     'expires' => 'Expires',
     'hello' => 'Hello',
     'hi' => 'Hi',
     'i_have_read' => 'I have read and agree to the terms of use, and have received this item.',
     'inventory_report' => 'Inventory Report',
-    'item' => 'Item:',
+    'item' => 'Item',
+    'item_checked_reminder' => 'This is a reminder that you currently have :count items checked out to you that you have not accepted or declined. Please click the link below to confirm your decision.',
     'license_expiring_alert' => 'There is :count license expiring in the next :threshold days.|There are :count licenses expiring in the next :threshold days.',
     'link_to_update_password' => 'Please click on the following link to update your :web password:',
-    'login' => 'Login:',
+    'login' => 'Login',
     'login_first_admin' => 'Login to your new Snipe-IT installation using the credentials below:',
     'low_inventory_alert' => 'There is :count item that is below minimum inventory or will soon be low.|There are :count items that are below minimum inventory or will soon be low.',
     'min_QTY' => 'Min QTY',
     'name' => 'Name',
     'new_item_checked' => 'A new item has been checked out under your name, details are below.',
+    'new_item_checked_with_acceptance' => 'A new item has been checked out under your name that requires acceptance, details are below.',
+    'recent_item_checked' => 'An item was recently checked out under your name that requires acceptance, details are below.',
     'notes' => 'Notes',
-    'password' => 'Password:',
+    'password' => 'Password',
     'password_reset' => 'Password Reset',
     'read_the_terms' => 'Please read the terms of use below.',
     'read_the_terms_and_click' => 'Please read the terms of use below, and click on the link at the bottom to confirm that you read and agree to the terms of use, and have received the asset.',
-    'requested' => 'Requested:',
+    'requested' => 'Requested',
     'reset_link' => 'Your Password Reset Link',
     'reset_password' => 'Click here to reset your password:',
     'rights_reserved' => 'All rights reserved.',
@@ -86,8 +90,10 @@ return [
     'upcoming-audits' => 'There is :count asset that is coming up for audit within :threshold days.|There are :count assets that are coming up for audit within :threshold days.',
     'user' => 'User',
     'username' => 'Username',
+    'unaccepted_asset_reminder' => 'Reminder: You have Unaccepted Assets.',
     'welcome' => 'Welcome :name',
     'welcome_to' => 'Welcome to :web!',
     'your_assets' => 'View Your Assets',
     'your_credentials' => 'Your Snipe-IT credentials',
+    'mail_sent' => 'Mail sent successfully!',
 ];
diff --git a/resources/lang/iu-NU/validation.php b/resources/lang/iu-NU/validation.php
index 05374e23af..99c847f589 100644
--- a/resources/lang/iu-NU/validation.php
+++ b/resources/lang/iu-NU/validation.php
@@ -13,87 +13,150 @@ return [
     |
     */
 
-    'accepted'             => 'The :attribute must be accepted.',
-    'active_url'           => 'The :attribute is not a valid URL.',
-    'after'                => 'The :attribute must be a date after :date.',
-    'after_or_equal'       => 'The :attribute must be a date after or equal to :date.',
-    'alpha'                => 'The :attribute may only contain letters.',
-    'alpha_dash'           => 'The :attribute may only contain letters, numbers, and dashes.',
-    'alpha_num'            => 'The :attribute may only contain letters and numbers.',
-    'array'                => 'The :attribute must be an array.',
-    'before'               => 'The :attribute must be a date before :date.',
-    'before_or_equal'      => 'The :attribute must be a date before or equal to :date.',
-    'between'              => [
-        'numeric' => 'The :attribute must be between :min - :max.',
-        'file'    => 'The :attribute must be between :min - :max kilobytes.',
-        'string'  => 'The :attribute must be between :min - :max characters.',
-        'array'   => 'The :attribute must have between :min and :max items.',
+    'accepted' => 'The :attribute field must be accepted.',
+    'accepted_if' => 'The :attribute field must be accepted when :other is :value.',
+    'active_url' => 'The :attribute field must be a valid URL.',
+    'after' => 'The :attribute field must be a date after :date.',
+    'after_or_equal' => 'The :attribute field must be a date after or equal to :date.',
+    'alpha' => 'The :attribute field must only contain letters.',
+    'alpha_dash' => 'The :attribute field must only contain letters, numbers, dashes, and underscores.',
+    'alpha_num' => 'The :attribute field must only contain letters and numbers.',
+    'array' => 'The :attribute field must be an array.',
+    'ascii' => 'The :attribute field must only contain single-byte alphanumeric characters and symbols.',
+    'before' => 'The :attribute field must be a date before :date.',
+    'before_or_equal' => 'The :attribute field must be a date before or equal to :date.',
+    'between' => [
+        'array' => 'The :attribute field must have between :min and :max items.',
+        'file' => 'The :attribute field must be between :min and :max kilobytes.',
+        'numeric' => 'The :attribute field must be between :min and :max.',
+        'string' => 'The :attribute field must be between :min and :max characters.',
     ],
-    'boolean'              => 'The :attribute must be true or false.',
-    'confirmed'            => 'The :attribute confirmation does not match.',
-    'date'                 => 'The :attribute is not a valid date.',
-    'date_format'          => 'The :attribute does not match the format :format.',
-    'different'            => 'The :attribute and :other must be different.',
-    'digits'               => 'The :attribute must be :digits digits.',
-    'digits_between'       => 'The :attribute must be between :min and :max digits.',
-    'dimensions'           => 'The :attribute has invalid image dimensions.',
-    'distinct'             => 'The :attribute field has a duplicate value.',
-    'email'                => 'The :attribute format is invalid.',
-    'exists'               => 'The selected :attribute is invalid.',
-    'file'                 => 'The :attribute must be a file.',
-    'filled'               => 'The :attribute field must have a value.',
-    'image'                => 'The :attribute must be an image.',
+    'boolean' => 'The :attribute field must be true or false.',
+    'can' => 'The :attribute field contains an unauthorized value.',
+    'confirmed' => 'The :attribute field confirmation does not match.',
+    'contains' => 'The :attribute field is missing a required value.',
+    'current_password' => 'The password is incorrect.',
+    'date' => 'The :attribute field must be a valid date.',
+    'date_equals' => 'The :attribute field must be a date equal to :date.',
+    'date_format' => 'The :attribute field must match the format :format.',
+    'decimal' => 'The :attribute field must have :decimal decimal places.',
+    'declined' => 'The :attribute field must be declined.',
+    'declined_if' => 'The :attribute field must be declined when :other is :value.',
+    'different' => 'The :attribute field and :other must be different.',
+    'digits' => 'The :attribute field must be :digits digits.',
+    'digits_between' => 'The :attribute field must be between :min and :max digits.',
+    'dimensions' => 'The :attribute field has invalid image dimensions.',
+    'distinct' => 'The :attribute field has a duplicate value.',
+    'doesnt_end_with' => 'The :attribute field must not end with one of the following: :values.',
+    'doesnt_start_with' => 'The :attribute field must not start with one of the following: :values.',
+    'email' => 'The :attribute field must be a valid email address.',
+    'ends_with' => 'The :attribute field must end with one of the following: :values.',
+    'enum' => 'The selected :attribute is invalid.',
+    'exists' => 'The selected :attribute is invalid.',
+    'extensions' => 'The :attribute field must have one of the following extensions: :values.',
+    'file' => 'The :attribute field must be a file.',
+    'filled' => 'The :attribute field must have a value.',
+    'gt' => [
+        'array' => 'The :attribute field must have more than :value items.',
+        'file' => 'The :attribute field must be greater than :value kilobytes.',
+        'numeric' => 'The :attribute field must be greater than :value.',
+        'string' => 'The :attribute field must be greater than :value characters.',
+    ],
+    'gte' => [
+        'array' => 'The :attribute field must have :value items or more.',
+        'file' => 'The :attribute field must be greater than or equal to :value kilobytes.',
+        'numeric' => 'The :attribute field must be greater than or equal to :value.',
+        'string' => 'The :attribute field must be greater than or equal to :value characters.',
+    ],
+    'hex_color' => 'The :attribute field must be a valid hexadecimal color.',
+    'image' => 'The :attribute field must be an image.',
     'import_field_empty'    => 'The value for :fieldname cannot be null.',
-    'in'                   => 'The selected :attribute is invalid.',
-    'in_array'             => 'The :attribute field does not exist in :other.',
-    'integer'              => 'The :attribute must be an integer.',
-    'ip'                   => 'The :attribute must be a valid IP address.',
-    'ipv4'                 => 'The :attribute must be a valid IPv4 address.',
-    'ipv6'                 => 'The :attribute must be a valid IPv6 address.',
-    'is_unique_department' => 'The :attribute must be unique to this Company Location',
-    'json'                 => 'The :attribute must be a valid JSON string.',
-    'max'                  => [
-        'numeric' => 'The :attribute may not be greater than :max.',
-        'file'    => 'The :attribute may not be greater than :max kilobytes.',
-        'string'  => 'The :attribute may not be greater than :max characters.',
-        'array'   => 'The :attribute may not have more than :max items.',
+    'in' => 'The selected :attribute is invalid.',
+    'in_array' => 'The :attribute field must exist in :other.',
+    'integer' => 'The :attribute field must be an integer.',
+    'ip' => 'The :attribute field must be a valid IP address.',
+    'ipv4' => 'The :attribute field must be a valid IPv4 address.',
+    'ipv6' => 'The :attribute field must be a valid IPv6 address.',
+    'json' => 'The :attribute field must be a valid JSON string.',
+    'list' => 'The :attribute field must be a list.',
+    'lowercase' => 'The :attribute field must be lowercase.',
+    'lt' => [
+        'array' => 'The :attribute field must have less than :value items.',
+        'file' => 'The :attribute field must be less than :value kilobytes.',
+        'numeric' => 'The :attribute field must be less than :value.',
+        'string' => 'The :attribute field must be less than :value characters.',
     ],
-    'mimes'                => 'The :attribute must be a file of type: :values.',
-    'mimetypes'            => 'The :attribute must be a file of type: :values.',
-    'min'                  => [
-        'numeric' => 'The :attribute must be at least :min.',
-        'file'    => 'The :attribute must be at least :min kilobytes.',
-        'string'  => 'The :attribute must be at least :min characters.',
-        'array'   => 'The :attribute must have at least :min items.',
+    'lte' => [
+        'array' => 'The :attribute field must not have more than :value items.',
+        'file' => 'The :attribute field must be less than or equal to :value kilobytes.',
+        'numeric' => 'The :attribute field must be less than or equal to :value.',
+        'string' => 'The :attribute field must be less than or equal to :value characters.',
     ],
-    'starts_with'          => 'The :attribute must start with one of the following: :values.',
-    'ends_with'            => 'The :attribute must end with one of the following: :values.',
+    'mac_address' => 'The :attribute field must be a valid MAC address.',
+    'max' => [
+        'array' => 'The :attribute field must not have more than :max items.',
+        'file' => 'The :attribute field must not be greater than :max kilobytes.',
+        'numeric' => 'The :attribute field must not be greater than :max.',
+        'string' => 'The :attribute field must not be greater than :max characters.',
+    ],
+    'max_digits' => 'The :attribute field must not have more than :max digits.',
+    'mimes' => 'The :attribute field must be a file of type: :values.',
+    'mimetypes' => 'The :attribute field must be a file of type: :values.',
+    'min' => [
+        'array' => 'The :attribute field must have at least :min items.',
+        'file' => 'The :attribute field must be at least :min kilobytes.',
+        'numeric' => 'The :attribute field must be at least :min.',
+        'string' => 'The :attribute field must be at least :min characters.',
+    ],
+    'min_digits' => 'The :attribute field must have at least :min digits.',
+    'missing' => 'The :attribute field must be missing.',
+    'missing_if' => 'The :attribute field must be missing when :other is :value.',
+    'missing_unless' => 'The :attribute field must be missing unless :other is :value.',
+    'missing_with' => 'The :attribute field must be missing when :values is present.',
+    'missing_with_all' => 'The :attribute field must be missing when :values are present.',
+    'multiple_of' => 'The :attribute field must be a multiple of :value.',
+    'not_in' => 'The selected :attribute is invalid.',
+    'not_regex' => 'The :attribute field format is invalid.',
+    'numeric' => 'The :attribute field must be a number.',
+    'password' => [
+        'letters' => 'The :attribute field must contain at least one letter.',
+        'mixed' => 'The :attribute field must contain at least one uppercase and one lowercase letter.',
+        'numbers' => 'The :attribute field must contain at least one number.',
+        'symbols' => 'The :attribute field must contain at least one symbol.',
+        'uncompromised' => 'The given :attribute has appeared in a data leak. Please choose a different :attribute.',
+    ],
+    'percent'       => 'The depreciation minimum must be between 0 and 100 when depreciation type is percentage.',
 
-    'not_in'               => 'The selected :attribute is invalid.',
-    'numeric'              => 'The :attribute must be a number.',
-    'present'              => 'The :attribute field must be present.',
-    'valid_regex'          => 'That is not a valid regex. ',
-    'regex'                => 'The :attribute format is invalid.',
-    'required'             => 'The :attribute field is required.',
-    'required_if'          => 'The :attribute field is required when :other is :value.',
-    'required_unless'      => 'The :attribute field is required unless :other is in :values.',
-    'required_with'        => 'The :attribute field is required when :values is present.',
-    'required_with_all'    => 'The :attribute field is required when :values is present.',
-    'required_without'     => 'The :attribute field is required when :values is not present.',
+    'present' => 'The :attribute field must be present.',
+    'present_if' => 'The :attribute field must be present when :other is :value.',
+    'present_unless' => 'The :attribute field must be present unless :other is :value.',
+    'present_with' => 'The :attribute field must be present when :values is present.',
+    'present_with_all' => 'The :attribute field must be present when :values are present.',
+    'prohibited' => 'The :attribute field is prohibited.',
+    'prohibited_if' => 'The :attribute field is prohibited when :other is :value.',
+    'prohibited_unless' => 'The :attribute field is prohibited unless :other is in :values.',
+    'prohibits' => 'The :attribute field prohibits :other from being present.',
+    'regex' => 'The :attribute field format is invalid.',
+    'required' => 'The :attribute field is required.',
+    'required_array_keys' => 'The :attribute field must contain entries for: :values.',
+    'required_if' => 'The :attribute field is required when :other is :value.',
+    'required_if_accepted' => 'The :attribute field is required when :other is accepted.',
+    'required_if_declined' => 'The :attribute field is required when :other is declined.',
+    'required_unless' => 'The :attribute field is required unless :other is in :values.',
+    'required_with' => 'The :attribute field is required when :values is present.',
+    'required_with_all' => 'The :attribute field is required when :values are present.',
+    'required_without' => 'The :attribute field is required when :values is not present.',
     'required_without_all' => 'The :attribute field is required when none of :values are present.',
-    'same'                 => 'The :attribute and :other must match.',
-    'size'                 => [
-        'numeric' => 'The :attribute must be :size.',
-        'file'    => 'The :attribute must be :size kilobytes.',
-        'string'  => 'The :attribute must be :size characters.',
-        'array'   => 'The :attribute must contain :size items.',
+    'same' => 'The :attribute field must match :other.',
+    'size' => [
+        'array' => 'The :attribute field must contain :size items.',
+        'file' => 'The :attribute field must be :size kilobytes.',
+        'numeric' => 'The :attribute field must be :size.',
+        'string' => 'The :attribute field must be :size characters.',
     ],
+    'starts_with' => 'The :attribute field must start with one of the following: :values.',
     'string'               => 'The :attribute must be a string.',
-    'timezone'             => 'The :attribute must be a valid zone.',
     'two_column_unique_undeleted' => 'The :attribute must be unique across :table1 and :table2. ',
-    'unique'               => 'The :attribute has already been taken.',
-    'uploaded'             => 'The :attribute failed to upload.',
-    'url'                  => 'The :attribute format is invalid.',
     'unique_undeleted'     => 'The :attribute must be unique.',
     'non_circular'         => 'The :attribute must not create a circular reference.',
     'not_array'            => ':attribute cannot be an array.',
@@ -102,11 +165,14 @@ return [
     'numbers'              => 'Password must contain at least one number.',
     'case_diff'            => 'Password must use mixed case.',
     'symbols'              => 'Password must contain symbols.',
-    'gte'                  => [
-        'numeric'          => 'Value cannot be negative'
-    ],
-    'checkboxes'           => ':attribute contains invalid options.',
-    'radio_buttons'        => ':attribute is invalid.',
+    'timezone' => 'The :attribute field must be a valid timezone.',
+    'unique' => 'The :attribute has already been taken.',
+    'uploaded' => 'The :attribute failed to upload.',
+    'uppercase' => 'The :attribute field must be uppercase.',
+    'url' => 'The :attribute field must be a valid URL.',
+    'ulid' => 'The :attribute field must be a valid ULID.',
+    'uuid' => 'The :attribute field must be a valid UUID.',
+    'fmcs_location' => 'Full multiple company support and location scoping is enabled in the Admin Settings, and the selected location and selected company are not compatible.',
 
 
     /*
@@ -120,16 +186,22 @@ return [
     |
     */
 
+    'email_array'      => 'One or more email addresses is invalid.',
+    'checkboxes'           => ':attribute contains invalid options.',
+    'radio_buttons'        => ':attribute is invalid.',
+    
     'custom' => [
         'alpha_space' => 'The :attribute field contains a character that is not allowed.',
-        'email_array'      => 'One or more email addresses is invalid.',
+
         'hashed_pass'      => 'Your current password is incorrect',
         'dumbpwd'          => 'That password is too common.',
         'statuslabel_type' => 'You must select a valid status label type',
+        'custom_field_not_found'          => 'This field does not seem to exist, please double check your custom field names.',
+        'custom_field_not_found_on_model' => 'This field seems to exist, but is not available on this Asset Model\'s fieldset.',
 
         // date_format validation with slightly less stupid messages. It duplicates a lot, but it gets the job done :(
-        // We use this because the default error message for date_format is reflects php Y-m-d, which non-PHP
-        // people won't know how to format. 
+        // We use this because the default error message for date_format reflects php Y-m-d, which non-PHP
+        // people won't know how to format.
         'purchase_date.date_format'     => 'The :attribute must be a valid date in YYYY-MM-DD format',
         'last_audit_date.date_format'   =>  'The :attribute must be a valid date in YYYY-MM-DD hh:mm:ss format',
         'expiration_date.date_format'   =>  'The :attribute must be a valid date in YYYY-MM-DD format',
@@ -137,9 +209,15 @@ return [
         'expected_checkin.date_format'  =>  'The :attribute must be a valid date in YYYY-MM-DD format',
         'start_date.date_format'        =>  'The :attribute must be a valid date in YYYY-MM-DD format',
         'end_date.date_format'          =>  'The :attribute must be a valid date in YYYY-MM-DD format',
+        'invalid_value_in_field' => 'Invalid value included in this field',
 
-    ],
+        'ldap_username_field' => [
+            'not_in' =>         '<code>sAMAccountName</code> (mixed case) will likely not work. You should use <code>samaccountname</code> (lowercase) instead.'
+        ],
+        'ldap_auth_filter_query' => ['not_in' => '<code>uid=samaccountname</code> is probably not a valid auth filter. You probably want <code>uid=</code> '],
+        'ldap_filter' => ['regex' => 'This value should probably not be wrapped in parentheses.'],
 
+        ],
     /*
     |--------------------------------------------------------------------------
     | Custom Validation Attributes
@@ -155,8 +233,16 @@ return [
 
     /*
     |--------------------------------------------------------------------------
-    | Generic Validation Messages
+    | Generic Validation Messages - we use these in the jquery validation where we don't have
+    | access to the :attribute
     |--------------------------------------------------------------------------
     */
-    'invalid_value_in_field' => 'Invalid value included in this field',
+
+    'generic' => [
+        'invalid_value_in_field' => 'Invalid value included in this field',
+        'required' => 'This field is required',
+        'email' => 'Please enter a valid email address',
+    ],
+
+
 ];
diff --git a/resources/lang/ja-JP/account/general.php b/resources/lang/ja-JP/account/general.php
index dfb543b43c..961f1bb934 100644
--- a/resources/lang/ja-JP/account/general.php
+++ b/resources/lang/ja-JP/account/general.php
@@ -2,10 +2,16 @@
 
 return array(
     'personal_api_keys' => '個人用APIキー',
+    'personal_access_token' => 'Personal Access Token',
+    'personal_api_keys_success' => 'Personal API Key :key created sucessfully',
+    'here_is_api_key' => 'Here is your new personal access token. This is the only time it will be shown so do not lose it! You may now use this token to make API requests.',
     'api_key_warning' => 'When generating an API token, be sure to copy it down immediately as they will not be visible to you again.',
     'api_base_url' => 'APIベースURLは以下の場所です:',
     'api_base_url_endpoint' => '/<エンドポイント>',
     'api_token_expiration_time' => 'APIトークンの有効期限:',
     'api_reference' => 'Please check the <a href="https://snipe-it.readme.io/reference" target="_blank">API reference</a> to find specific API endpoints and additional API documentation.',
     'profile_updated' => 'Account successfully updated',
+    'no_tokens' => 'You have not created any personal access tokens.',
+    'enable_sounds' => '効果音を有効にする',
+    'enable_confetti' => 'Enable confetti effects',
 );
diff --git a/resources/lang/ja-JP/admin/accessories/message.php b/resources/lang/ja-JP/admin/accessories/message.php
index 75c7f45a9a..4787fd544c 100644
--- a/resources/lang/ja-JP/admin/accessories/message.php
+++ b/resources/lang/ja-JP/admin/accessories/message.php
@@ -26,7 +26,11 @@ return array(
         'error'   		=> '付属品がチェックされませんでした。もう一度、やり直して下さい。',
         'success' 		=> '付属品のチェックが終了しました。',
         'unavailable'   => '付属品はチェックアウト中のため利用できません。',
-        'user_does_not_exist' => 'その利用者は不正です。もう一度、やり直して下さい。'
+        'user_does_not_exist' => 'その利用者は不正です。もう一度、やり直して下さい。',
+         'checkout_qty' => array(
+            'lte'  => '現在、このタイプのアクセサリーは1つしかありません。:checkout_qty をチェックアウトしようとしています。 このアクセサリの数量または総在庫数を調整して再度お試しください。 :number_currently_remaining の利用可能なアクセサリーがあり、:checkout_qty をチェックアウトしようとしています。 このアクセサリの数量または総在庫数を調整して再度お試しください。',
+            ),
+           
     ),
 
     'checkin' => array(
diff --git a/resources/lang/ja-JP/admin/accessories/table.php b/resources/lang/ja-JP/admin/accessories/table.php
index c1697e899d..f2b8102ca5 100644
--- a/resources/lang/ja-JP/admin/accessories/table.php
+++ b/resources/lang/ja-JP/admin/accessories/table.php
@@ -6,6 +6,4 @@ return array(
     'id'      					=> 'ID',
     'require_acceptance'      	=> '承諾',
     'title'      				=> '付属品名',
-
-
 );
diff --git a/resources/lang/ja-JP/admin/components/message.php b/resources/lang/ja-JP/admin/components/message.php
index e90f573a44..36d9be4f5b 100644
--- a/resources/lang/ja-JP/admin/components/message.php
+++ b/resources/lang/ja-JP/admin/components/message.php
@@ -17,7 +17,8 @@ return array(
     'delete' => array(
         'confirm'   => 'この構成部品を削除してもよろしいですか?',
         'error'   => '構成部品を削除する際に問題が発生しました。もう一度やり直して下さい。',
-        'success' => '構成部品は削除されました。'
+        'success' => '構成部品は削除されました。',
+        'error_qty'   => 'このタイプの一部のコンポーネントはまだチェックアウトされています。チェックインしてもう一度お試しください。',
     ),
 
      'checkout' => array(
diff --git a/resources/lang/ja-JP/admin/consumables/general.php b/resources/lang/ja-JP/admin/consumables/general.php
index 58cb5d89c2..106f5bfae9 100644
--- a/resources/lang/ja-JP/admin/consumables/general.php
+++ b/resources/lang/ja-JP/admin/consumables/general.php
@@ -8,4 +8,5 @@ return array(
     'remaining' 			            => '残数',
     'total' 			                => '合計',
     'update'                            => '消耗品を更新',
+    'inventory_warning'                 => 'The inventory of this consumable is below the minimum amount of :min_count',
 );
diff --git a/resources/lang/ja-JP/admin/consumables/message.php b/resources/lang/ja-JP/admin/consumables/message.php
index 1a1ab5af5c..8ebd564536 100644
--- a/resources/lang/ja-JP/admin/consumables/message.php
+++ b/resources/lang/ja-JP/admin/consumables/message.php
@@ -2,6 +2,7 @@
 
 return array(
 
+    'invalid_category_type' => 'The category must be a consumable category.',
     'does_not_exist' => '消耗品は存在しません。',
 
     'create' => array(
diff --git a/resources/lang/ja-JP/admin/custom_fields/general.php b/resources/lang/ja-JP/admin/custom_fields/general.php
index 601a97334d..28b15434fb 100644
--- a/resources/lang/ja-JP/admin/custom_fields/general.php
+++ b/resources/lang/ja-JP/admin/custom_fields/general.php
@@ -35,7 +35,7 @@ return [
     'create_field_title' => '新しいカスタムフィールドを作成',
     'value_encrypted'      	        => 'このフィールドの値は、データベースで暗号化されます。管理者ユーザーのみが復号化された値を表示することができます。',
     'show_in_email'     => 'このフィールドの値をユーザーに送信されたチェックアウトメールに含めますか？暗号化されたフィールドはメールに含めることはできません',
-    'show_in_email_short'     => '電子メールに含める。',
+    'show_in_email_short' => '電子メールに含める',
     'help_text' => 'ヘルプ テキスト',
     'help_text_description' => 'このテキストは、資産の編集中にフォーム要素の下に表示されるオプションのテキストです。',
     'about_custom_fields_title' => 'カスタムフィールドについて',
@@ -57,5 +57,8 @@ return [
     'show_in_requestable_list_short' => '要求可能なアセットリストに表示',
     'show_in_requestable_list' => '要求可能なアセットリストに値を表示します。暗号化されたフィールドは表示されません',
     'encrypted_options' => 'このフィールドは暗号化されているため、いくつかの表示オプションは利用できません。',
+    'display_checkin' => 'チェックインフォームに表示',
+    'display_checkout' => 'チェックアウトフォームに表示',
+    'display_audit' => '監査フォームに表示',
 
 ];
diff --git a/resources/lang/ja-JP/admin/custom_fields/message.php b/resources/lang/ja-JP/admin/custom_fields/message.php
index 96843f192d..feee235b68 100644
--- a/resources/lang/ja-JP/admin/custom_fields/message.php
+++ b/resources/lang/ja-JP/admin/custom_fields/message.php
@@ -5,6 +5,7 @@ return array(
     'field' => array(
         'invalid'   => 'フィールドがありません。',
         'already_added'   => 'フィールドはすでに追加されています',
+        'none_selected'   => 'No field selected',
 
         'create' => array(
             'error'   => 'フォルダーは作成されませんでした。もう一度やり直してください。',
diff --git a/resources/lang/ja-JP/admin/depreciations/general.php b/resources/lang/ja-JP/admin/depreciations/general.php
index 97da95fac3..b24d64b1af 100644
--- a/resources/lang/ja-JP/admin/depreciations/general.php
+++ b/resources/lang/ja-JP/admin/depreciations/general.php
@@ -13,4 +13,8 @@ return [
     'no_depreciations_warning'               => '<strong>警告: </strong>
                       現在、減価償却が設定されていません。
                       減価償却レポートを表示するには、少なくとも1つの減価償却を設定してください。',
+    'depreciation_method'                   => '減価償却レポート',
+    'linear_depreciation'                   => 'Linear (Default)',
+    'half_1'                                => 'Half-year convention, always applied',
+    'half_2'                                => 'Half-year convention, applied with condition',
 ];
diff --git a/resources/lang/ja-JP/admin/hardware/form.php b/resources/lang/ja-JP/admin/hardware/form.php
index 8768ee2d12..30d880411a 100644
--- a/resources/lang/ja-JP/admin/hardware/form.php
+++ b/resources/lang/ja-JP/admin/hardware/form.php
@@ -39,9 +39,9 @@ return [
     'order'				=> '注文番号',
     'qr'				=> 'ＱＲコード',
     'requestable'		=> '利用者がこの資産を要求するかもしれません。',
-    'redirect_to_all'   => 'Return to all :type',
-    'redirect_to_type'   => 'Go to :type',
-    'redirect_to_checked_out_to'   => 'Go to Checked Out to',
+    'redirect_to_all'   => '全ての:typeに戻る',
+    'redirect_to_type'   => ':type に移動',
+    'redirect_to_checked_out_to'   => 'チェックアウト先へ移動',
     'select_statustype'	=> 'ステータスタイプを選択',
     'serial'			=> 'シリアル',
     'status'			=> 'ステータス',
@@ -55,8 +55,11 @@ return [
     'asset_location_update_default' => 'デフォルトの場所のみ更新',
     'asset_location_update_actual' => '実際の場所のみ更新',
     'asset_not_deployable' => 'その資産ステータスは配備可能ではありません。この資産はチェックアウトできません。',
-    'asset_deployable' => 'その資産ステータスは配備可能です。この資産はチェックアウトできます。',
+    'asset_not_deployable_checkin' => 'その資産状態はデプロイできません。このステータスラベルを使用すると、資産をチェックインします。',
+    'asset_deployable' => 'この資産はチェックアウトできます。',
     'processing_spinner' => '処理中です... (これは大きなファイルで少し時間がかかる可能性があります)',
+    'processing' => '処理中... ',
     'optional_infos'  => 'オプション情報',
-    'order_details'   => 'オーダー関連情報'
+    'order_details'   => 'オーダー関連情報',
+    'calc_eol'    => 'If nulling the EOL date, use automatic EOL calculation based on the purchase date and EOL rate.',
 ];
diff --git a/resources/lang/ja-JP/admin/hardware/general.php b/resources/lang/ja-JP/admin/hardware/general.php
index 94fa361387..98d5e5ce2e 100644
--- a/resources/lang/ja-JP/admin/hardware/general.php
+++ b/resources/lang/ja-JP/admin/hardware/general.php
@@ -6,7 +6,7 @@ return [
     'archived'  				=> 'アーカイブ',
     'asset'  					=> '資産',
     'bulk_checkout'             => '一括チェックアウト',
-    'bulk_checkin'              => '資産をチェックイン',
+    'bulk_checkin'              => 'Bulk Checkin',
     'checkin'  					=> '資産をチェックイン',
     'checkout'  				=> '資産をチェックアウト',
     'clone'  					=> '資産を複製',
@@ -15,7 +15,7 @@ return [
     'delete_confirm'            => 'この資産を削除してもよろしいですか？',
     'edit'  					=> '資産を編集',
     'model_deleted'  			=> 'この資産モデルは削除されました。資産を復元する前に、モデルを復元する必要があります。',
-    'model_invalid'             => 'This model for this asset is invalid.',
+    'model_invalid'             => 'この資産のモデルは無効です。',
     'model_invalid_fix'         => 'The asset must be updated use a valid asset model before attempting to check it in or out, or to audit it.',
     'requestable'               => '要求可能',
     'requested'				    => '要求済',
@@ -27,8 +27,7 @@ return [
     'undeployable_tooltip'  	=> 'この資産にはデプロイできないステータスラベルがあります。現時点ではチェックアウトできません。',
     'view'  					=> '資産を表示',
     'csv_error' => 'CSVファイルにエラーがあります:',
-    'import_text' => '<p>Upload a CSV that contains asset history. The assets and users MUST already exist in the system, or they will be skipped. Matching assets for history import happens against the asset tag. We will try to find a matching user based on the user\'s name you provide, and the criteria you select below. If you do not select any criteria below, it will simply try to match on the username format you configured in the <code>Admin &gt; General Settings</code>.</p><p>Fields included in the CSV must match the headers: <strong>Asset Tag, Name, Checkout Date, Checkin Date</strong>. Any additional fields will be ignored. </p><p>Checkin Date: blank or future checkin dates will checkout items to associated user.  Excluding the Checkin Date column will create a checkin date with todays date.</p>
-    ',
+    'import_text' => '<p>Upload a CSV that contains asset history. The assets and users MUST already exist in the system, or they will be skipped. Matching assets for history import happens against the asset tag. We will try to find a matching user based on the user\'s name you provide, and the criteria you select below. If you do not select any criteria below, it will simply try to match on the username format you configured in the <code>Admin &gt; General Settings</code>.</p><p>Fields included in the CSV must match the headers: <strong>Asset Tag, Name, Checkout Date, Checkin Date</strong>. Any additional fields will be ignored. </p><p>Checkin Date: blank or future checkin dates will checkout items to associated user.  Excluding the Checkin Date column will create a checkin date with todays date.</p>    ',
     'csv_import_match_f-l' => '<strong>firstname.lastname</strong> (<code>jane.smith</code>) 形式でユーザーと一致してみてください',
     'csv_import_match_initial_last' => '<strong>最初の姓</strong> (<code>jsmith</code>) フォーマットでユーザーを一致させてみてください',
     'csv_import_match_first' => '<strong>ファーストネーム</strong> (<code>jane</code>) フォーマットでユーザーをマッチさせてみてください',
diff --git a/resources/lang/ja-JP/admin/hardware/message.php b/resources/lang/ja-JP/admin/hardware/message.php
index fe58100878..d9662305c7 100644
--- a/resources/lang/ja-JP/admin/hardware/message.php
+++ b/resources/lang/ja-JP/admin/hardware/message.php
@@ -2,19 +2,23 @@
 
 return [
 
-    'undeployable' 		=> '<strong>警告:</strong>この資産は、現在 未配備としてマークされています。
-                        この状態が変更された場合は、資産のステータスを更新してください。',
-    'does_not_exist' 	=> '資産が存在しません。',
-    'does_not_exist_var'=> 'Asset with tag :asset_tag not found.',
-    'no_tag' 	        => 'No asset tag provided.',
+    'undeployable' 		 => '<strong>警告: </strong> このアセットは現在デプロイ不可能としてマークされています。このステータスが変更された場合は、アセットのステータスを更新してください。',
+    'does_not_exist' 	 => '資産が存在しません。',
+    'does_not_exist_var' => 'タグ:asset_tag を持つアセットが見つかりません。',
+    'no_tag' 	         => 'アセットタグが提供されていません。',
     'does_not_exist_or_not_requestable' => 'その資産は存在しないか要求可能ではありません。',
-    'assoc_users'	 	=> 'この資産はユーザーに貸し出されているため削除できません。資産を返却後、もう一度、やり直して下さい。 ',
-    'warning_audit_date_mismatch' 	=> 'This asset\'s next audit date (:next_audit_date) is before the last audit date (:last_audit_date). Please update the next audit date.',
+    'assoc_users'	 	 => 'この資産はユーザーに貸し出されているため削除できません。資産を返却後、もう一度、やり直して下さい。 ',
+    'warning_audit_date_mismatch' 	=> 'この資産の次の監査日 (:next_audit_date) は最終監査日 (:last_audit_date) より前です。次の監査日を更新してください。',
+    'labels_generated'   => 'ラベルの生成に成功しました。',
+    'error_generating_labels' => 'ラベルを生成中にエラーが発生しました。',
+    'no_assets_selected' => '資産が選択されていません。',
 
     'create' => [
         'error'   		=> '資産は作成されませんでした。もう一度、やり直して下さい。',
         'success' 		=> '資産は作成されました。',
         'success_linked' => ':tag を持つアセットは正常に作成されました。 <strong><a href=":link" style="color: white;"></a></strong> を表示するにはここをクリックしてください。',
+        'multi_success_linked' => 'タグ:links のアセットが正常に作成されました。|:count アセットが正常に作成されました。',
+        'partial_failure' => 'An asset was unable to be created. Reason: :failures|:count assets were unable to be created. Reasons: :failures',
     ],
 
     'update' => [
@@ -34,7 +38,7 @@ return [
     ],
 
     'audit' => [
-        'error'   		=> 'Asset audit unsuccessful: :error ',
+        'error'   		=> '資産監査に失敗しました: :error ',
         'success' 		=> '資産の監査ログに記録しました。',
     ],
 
@@ -52,20 +56,24 @@ return [
     ],
 
     'import' => [
+        'import_button'         => 'Process Import',
         'error'                 => 'いくつかの項目は正しくインポートされませんでした。',
         'errorDetail'           => '以下のアイテムはエラーのためインポートできませんでした',
         'success'               => 'ファイルはインポートされました。',
         'file_delete_success'   => 'ファイルを削除しました。',
         'file_delete_error'      => 'ファイルが削除出来ませんでした。',
         'file_missing' => '選択されたファイルがありません',
+        'file_already_deleted' => '選択したファイルは既に削除されています',
         'header_row_has_malformed_characters' => 'ヘッダー行の1つ以上の属性に不正な形式のUTF-8文字が含まれています',
         'content_row_has_malformed_characters' => 'コンテンツの最初の行の1つまたは複数の属性に不正な形式のUTF-8文字が含まれています',
+        'transliterate_failure' => ':encoding から UTF-8 への変換に失敗しました。入力中の無効な文字が原因です。'
     ],
 
 
     'delete' => [
         'confirm'   	=> 'この資産を削除してもよろしいですか？',
         'error'   		=> '資産を削除する際に問題が発生しました。もう一度やり直して下さい。',
+        'assigned_to_error' => '{1}アセットタグ: :asset_tag は現在チェックアウトされています。削除する前にこのデバイスを確認してください。 [2,*]アセットタグ: :asset_tag は現在チェックアウトされています。削除する前にこれらのデバイスを確認してください。',
         'nothing_updated'   => '資産が選択されていないため、削除されませんでした。',
         'success' 		=> '資産は正常に削除されました。',
     ],
@@ -78,6 +86,11 @@ return [
         'no_assets_selected' => 'リストから少なくとも1つの資産を選択する必要があります',
     ],
 
+    'multi-checkout' => [
+        'error'   => 'Asset was not checked out, please try again|Assets were not checked out, please try again',
+        'success' => 'Asset checked out successfully.|Assets checked out successfully.',
+    ],
+
     'checkin' => [
         'error'   		=> '資産はチェックインされませんでした。もう一度、やり直して下さい。',
         'success' 		=> '資産は正常にチェックインされました。',
@@ -87,9 +100,10 @@ return [
     ],
 
     'requests' => [
-        'error'   		=> '資産は要求されませんでした。もう一度、やり直して下さい。',
-        'success' 		=> '資産の要求処理が成功しました。',
-        'canceled'      => 'チェックアウトリクエストが正常にキャンセルされました。',
+        'error'   		=> 'リクエストに失敗しました。もう一度やり直してください。',
+        'success' 		=> 'リクエストは正常に送信されました。',
+        'canceled'      => 'リクエストをキャンセルしました。',
+        'cancel'        => 'このアイテムのリクエストをキャンセル',
     ],
 
 ];
diff --git a/resources/lang/ja-JP/admin/hardware/table.php b/resources/lang/ja-JP/admin/hardware/table.php
index 5b21a107ca..4803831a1a 100644
--- a/resources/lang/ja-JP/admin/hardware/table.php
+++ b/resources/lang/ja-JP/admin/hardware/table.php
@@ -25,7 +25,6 @@ return [
     'image'		    => '写真',
     'days_without_acceptance' => '未受理期間',
     'monthly_depreciation' => '毎月の減価償却費（減価償却費）',
-    'assigned_to'    => '割り当て先',
     'requesting_user' => '要求ユーザー',
     'requested_date' => '要求日',
     'changed'       => '変更済み',
diff --git a/resources/lang/ja-JP/admin/kits/general.php b/resources/lang/ja-JP/admin/kits/general.php
index 6db2b8679c..03e7c2e65a 100644
--- a/resources/lang/ja-JP/admin/kits/general.php
+++ b/resources/lang/ja-JP/admin/kits/general.php
@@ -47,4 +47,5 @@ return [
     'kit_deleted'                       => '製品セットは正常に削除されました。',
     'kit_model_updated'                 => 'モデルが正常に更新されました。',
     'kit_model_detached'                => 'モデルは正常に切り離されました。',
+    'model_already_attached'            => 'Model already attached to kit',
 ];
diff --git a/resources/lang/ja-JP/admin/licenses/general.php b/resources/lang/ja-JP/admin/licenses/general.php
index fa5b778eca..a3679a9739 100644
--- a/resources/lang/ja-JP/admin/licenses/general.php
+++ b/resources/lang/ja-JP/admin/licenses/general.php
@@ -14,6 +14,7 @@ return array(
     'info'  					=> 'ライセンス情報',
     'license_seats'  			=> 'ライセンスシート',
     'seat'  					=> 'シート',
+    'seat_count'  				=> 'シート :count',
     'seats'  					=> 'シート数',
     'software_licenses'  		=> 'ソフトウェア・ライセンス',
     'user'  					=> '利用者',
@@ -23,12 +24,12 @@ return array(
         [
             'checkin_all'           => [
                 'button'            => '全てのシートをチェックイン',
-                'modal'             => 'このアクションは、1つのシートをチェックインします。 | このアクションは、このライセンスのすべての :checkedout_seats_count シートをチェックインします。',
+                'modal'             => 'This action will checkin one seat. | This action will checkin all :checkedout_seats_count seats for this license.',
                 'enabled_tooltip'   => 'ユーザーとアセットの両方から、このライセンスのすべてのシートをチェックインします',
                 'disabled_tooltip'  => '現在チェックアウトされているシートがないため、これは無効です',
                 'disabled_tooltip_reassignable'  => 'ライセンスが再割り当てできないため、これは無効です',
                 'success'           => 'ライセンスのチェックインに成功しました! | すべてのライセンスは正常にチェックインされました!',
-                'log_msg'           => 'ライセンスGUIで一括ライセンスチェックアウトを行いました',
+                'log_msg'           => 'Checked in via bulk license checkin in license GUI',
             ],
 
             'checkout_all'              => [
diff --git a/resources/lang/ja-JP/admin/licenses/message.php b/resources/lang/ja-JP/admin/licenses/message.php
index d81b1ba717..8dbb137b6b 100644
--- a/resources/lang/ja-JP/admin/licenses/message.php
+++ b/resources/lang/ja-JP/admin/licenses/message.php
@@ -44,10 +44,13 @@ return array(
         'error'   => 'ライセンスのチェックを外す際に問題が発生しました。もう一度、やり直して下さい。',
         'success' => 'ライセンスのチェックを外しました。',
         'not_enough_seats' => '購入可能なライセンスシートが不足しています',
+        'mismatch' => 'The license seat provided does not match the license',
+        'unavailable' => 'This seat is not available for checkout.',
     ),
 
     'checkin' => array(
         'error'   => 'ライセンスのチェックを入れる際に問題が発生しました。もう一度、やり直して下さい。',
+        'not_reassignable' => 'ライセンスを再割り当てできません',
         'success' => 'ライセンスのチェックを入れました。'
     ),
 
diff --git a/resources/lang/ja-JP/admin/locations/message.php b/resources/lang/ja-JP/admin/locations/message.php
index d9bd56017d..77829fdf9a 100644
--- a/resources/lang/ja-JP/admin/locations/message.php
+++ b/resources/lang/ja-JP/admin/locations/message.php
@@ -3,11 +3,12 @@
 return array(
 
     'does_not_exist' => 'ロケーションが存在しません。',
-    'assoc_users'    => 'This location is not currently deletable because it is the location of record for at least one asset or user, has assets assigned to it, or is the parent location of another location. Please update your models to no longer reference this company and try again. ',
+    'assoc_users'    => 'This location is not currently deletable because it is the location of record for at least one asset or user, has assets assigned to it, or is the parent location of another location. Please update your records to no longer reference this location and try again ',
     'assoc_assets'	 => 'この設置場所は1人以上の利用者に関連付けされているため、削除できません。設置場所の関連付けを削除し、もう一度試して下さい。 ',
     'assoc_child_loc'	 => 'この設置場所は、少なくとも一つの配下の設置場所があります。この設置場所を参照しないよう更新して下さい。 ',
     'assigned_assets' => '割り当て済みアセット',
     'current_location' => '現在の場所',
+    'open_map' => ':map_provider_icon マップで開く',
 
 
     'create' => array(
@@ -20,6 +21,11 @@ return array(
         'success' => 'ロケーションが更新されました。'
     ),
 
+    'restore' => array(
+        'error'   => 'ロケーションが復元できませんでした。もう一度やり直してください。',
+        'success' => 'ロケーションが復元されました。'
+    ),
+
     'delete' => array(
         'confirm'   	=> 'このロケーションを本当に削除してよいですか？',
         'error'   => 'ロケーションを削除する際に問題が発生しました。もう一度やり直して下さい。',
diff --git a/resources/lang/ja-JP/admin/locations/table.php b/resources/lang/ja-JP/admin/locations/table.php
index 558c1fa41a..371179dd8c 100644
--- a/resources/lang/ja-JP/admin/locations/table.php
+++ b/resources/lang/ja-JP/admin/locations/table.php
@@ -39,4 +39,5 @@ return [
     'signed_by_finance_auditor' => '署名済み(会計監査人):',
     'signed_by_location_manager' => '署名済み (ロケーションマネージャー):',
     'signed_by'                 => '署名:',
+    'clone'  					=> 'Clone Location',
 ];
diff --git a/resources/lang/ja-JP/admin/models/general.php b/resources/lang/ja-JP/admin/models/general.php
index 14b9facd26..696758d647 100644
--- a/resources/lang/ja-JP/admin/models/general.php
+++ b/resources/lang/ja-JP/admin/models/general.php
@@ -3,7 +3,7 @@
 return array(
     'about_models_title'     => '資産モデルについて',
     'about_models_text'           => '資産モデルは、同一資産をグループ化する方法です。(例:「MBP 2013」、「IPhone 6」など)',
-    'deleted'  					        => 'モデルは削除されました。',
+    'deleted'  					=> 'モデルは削除されました。',
     'bulk_delete'               => '資産モデルの一括削除',
     'bulk_delete_help'               => '下のチェックボックスを使用して、選択した資産モデルの削除を確認します。資産が関連付けられている資産モデルは、資産が別のモデルに関連付けられるまで削除できません。',
     'bulk_delete_warn'          => '1つの資産モデルを削除しようとしています。|:model_count 資産モデルを削除しようとしています。',
diff --git a/resources/lang/ja-JP/admin/models/message.php b/resources/lang/ja-JP/admin/models/message.php
index b608d9e6d1..05f4b2160b 100644
--- a/resources/lang/ja-JP/admin/models/message.php
+++ b/resources/lang/ja-JP/admin/models/message.php
@@ -7,7 +7,7 @@ return array(
     'no_association' => '警告！このアイテムのアセットモデルが無効または不足しています！',
     'no_association_fix' => 'モデルを割り当てるために今すぐこの資産を編集してください。',
     'assoc_users'	 => 'この減価償却は複数のモデルに関係付けられているため削除することができません。モデルを削除してから再度実行してください。 ',
-
+    'invalid_category_type' => 'このカテゴリは資産カテゴリにする必要があります。',
 
     'create' => array(
         'error'   => '型番が作成できませんでした。もう一度やり直して下さい。',
diff --git a/resources/lang/ja-JP/admin/reports/general.php b/resources/lang/ja-JP/admin/reports/general.php
index c678845f91..0ceba1136d 100644
--- a/resources/lang/ja-JP/admin/reports/general.php
+++ b/resources/lang/ja-JP/admin/reports/general.php
@@ -4,6 +4,7 @@ return [
     'info'   => '資産報告書のオプションを選択してください。',
     'deleted_user' => '削除されたユーザー',
     'send_reminder' => 'リマインダーを送信',
+    'cannot_send_reminder' => 'ユーザーが削除されたか、メールアドレスがないため、リマインダーを受信できません',
     'reminder_sent' => 'リマインダーを送信しました',
     'acceptance_deleted' => '承認リクエストが削除されました',
     'acceptance_request' => 'リクエストを承認',
@@ -13,5 +14,10 @@ return [
         'user_state' => 'ユーザーの状態',
         'user_country' => 'ユーザーの国',
         'user_zip' => 'ユーザー郵便番号'
-    ]
-];
\ No newline at end of file
+    ],
+    'open_saved_template' => '保存済みテンプレートを開く',
+    'save_template' =>  'テンプレートを保存',
+    'select_a_template' => 'テンプレートを選択',
+    'template_name' => 'テンプレート名',
+    'update_template' => 'テンプレートを更新',
+];
diff --git a/resources/lang/ja-JP/admin/reports/message.php b/resources/lang/ja-JP/admin/reports/message.php
index 41ec1488f4..c77c7428f9 100644
--- a/resources/lang/ja-JP/admin/reports/message.php
+++ b/resources/lang/ja-JP/admin/reports/message.php
@@ -1,5 +1,16 @@
 <?php
 
-return array(
-    'error'   => 'あなたは少なくとも一つのオプションを選択しなければなりません。'
-);
+return [
+    'about_templates' => '保存されたテンプレートについて',
+    'saving_templates_description' => 'オプションを選択した後、上部ボックスにテンプレートの名前を入力し、「テンプレートを保存」ボタンをクリックします。 ドロップダウンを使用して、以前に保存したテンプレートを選択します。',
+    'create'  => [
+        'success' => 'テンプレートが正常に保存されました',
+    ],
+    'update' => [
+        'success' => 'テンプレートが正常に更新されました',
+    ],
+    'delete' => [
+        'success' => 'テンプレートを削除しました',
+        'no_delete_permission' => 'テンプレートが存在しないか、削除する権限がありません。',
+    ],
+];
diff --git a/resources/lang/ja-JP/admin/settings/general.php b/resources/lang/ja-JP/admin/settings/general.php
index 20cc46a609..71d6872d46 100644
--- a/resources/lang/ja-JP/admin/settings/general.php
+++ b/resources/lang/ja-JP/admin/settings/general.php
@@ -8,13 +8,13 @@ return [
     'ad_append_domain'          => 'ユーザー名フィールドにドメイン名を追加',
     'ad_append_domain_help'     => 'ユーザーは "username@domain.local" を記述する必要はなく、"username" と入力するだけです。',
     'admin_cc_email'            => 'CC（カーボンコピー）メール 送信先',
-    'admin_cc_email_help'       => 'ユーザーに送信されたチェックイン/チェックアウト　メールのコピーを追加の電子メールアカウントに送信する場合は、ここにメールアドレスを入力します。必要が無ければ、このフィールドを空白にします',
+    'admin_cc_email_help'       => 'このアドレスにチェックイン/チェックアウトメールのコピーを送信します。',
     'admin_settings'            => '管理者設定',
     'is_ad'				        => 'Active Directory サーバー',
     'alerts'                	=> 'アラート',
     'alert_title'               => '通知設定を更新',
     'alert_email'				=> 'アラートの送信先',
-    'alert_email_help'    => 'アラートの送信先となるメールアドレス(カンマ区切り)。',
+    'alert_email_help'          => 'アラートの送信先となるメールアドレスまたは配布リスト（カンマ区切り）。',
     'alerts_enabled'			=> 'アラートを有効化',
     'alert_interval'			=> 'アラートを無視する期間',
     'alert_inv_threshold'		=> 'インベントリのアラート間隔',
@@ -31,15 +31,18 @@ return [
     'backups'					=> 'バックアップ',
     'backups_help'              => 'バックアップの作成、ダウンロード、および復元 ',
     'backups_restoring'         => 'バックアップから復元中',
+    'backups_clean' => '復元する前にバックアップされたデータベースをクリーンアップします',
+    'backups_clean_helptext' => "This can be useful if you're changing between database versions",
     'backups_upload'            => 'バックアップをアップロード',
     'backups_path'              => 'サーバー上のバックアップは <code>:path</code> に保存されています',
-    'backups_restore_warning'   => '復元ボタンで <small><span class="btn btn-xs btn-warning"><i class="text-white fas fa-retweet" aria-hidden="true"></i></span></small> 過去のバックアップから復元できます。(S3ファイルサーバーやDockerがサポートされません。)<br><br>ご利用中の <strong> :app_name のデータベース全体と全てのアップロードされたファイルがバックアップの内容で上書きされます。</strong>  ',
+    'backups_restore_warning'   => 'Use the restore button <small><span class="btn btn-xs btn-warning"><i class="text-white fas fa-retweet" aria-hidden="true"></i></span></small> to restore from a previous backup. (This does not currently work with S3 file storage or Docker.)<br><br>Your <strong>entire :app_name database and any uploaded files will be completely replaced</strong> by what\'s in the backup file  ',
     'backups_logged_out'         => 'あなたを含むすべての既存のユーザーは、復元が完了するとログアウトされます。',
     'backups_large'             => '非常に大きなバックアップは、復元時にタイムアウトする可能性があり、コマンドラインを介して実行する必要があります。 ',
     'barcode_settings'			=> 'バーコード設定',
     'confirm_purge'			    => 'パージを確定',
     'confirm_purge_help'		=> '削除したレコードを削除するには、下のボックスに「DELETE」というテキストを入力します。 この操作は元に戻すことができず、ソフトで削除されたすべてのアイテムとユーザーは完全に削除されます。(安全のために最初にバックアップを行う必要があります。)',
     'custom_css'				=> 'カスタム CSS:',
+    'custom_css_placeholder'	=> 'Add your custom CSS',
     'custom_css_help'			=> '使用したいカスタムCSSを入力してください。&lt;style&gt;&lt;/style&gt; タグは含めないでください',
     'custom_forgot_pass_url'	=> 'パスワードリセットURLを変更する',
     'custom_forgot_pass_url_help'	=> 'これにより、ログイン画面に表示されるパスワードリセット用のURLが置き換えられ、内部またはホストされているLDAPパスワードのリセット機能にユーザーを誘導するのに役立ちます。ローカルユーザーがパスワードを忘れた場合、その機能は無効になります。',
@@ -47,34 +50,34 @@ return [
     'dashboard_message_help'	=> 'このテキストは、ダッシュボード表示権限を持つすべての人に表示されます。',
     'default_currency'  		=> '既定の通貨',
     'default_eula_text'			=> '既定のEULA',
+    'default_eula_text_placeholder' => 'Add your default EULA text',
     'default_language'			=> '既定の言語',
     'default_eula_help_text'	=> '特殊な資産カテゴリーにカスタムEULAを関連付けられます。',
     'acceptance_note'           => 'Add a note for your decision (Optional)',
     'display_asset_name'        => '資産名を表示',
     'display_checkout_date'     => 'チェックアウト日を表示',
     'display_eol'               => '表形式でEOLを表示',
-    'display_qr'                => 'QRコードを表示',
+    'display_qr'                => '2D バーコードを表示',
     'display_alt_barcode'		=> 'バーコードを表示',
-    'email_logo'                => 'メールのロゴ',
     'barcode_type'				=> '2次元バーコードタイプ',
     'alt_barcode_type'			=> 'バーコードタイプ',
-    'email_logo_size'       => '電子メールでは正方形のロゴが見栄えよく見えます。 ',
     'enabled'                   => '有効',
     'eula_settings'				=> 'EULA設定',
     'eula_markdown'				=> 'この EULA は、<a href="https://help.github.com/articles/github-flavored-markdown/">Github flavored markdown</a>で、利用可能です。',
+    'empty_row_count'           => 'Field Start Offset (Empty Rows)',
+    'empty_row_count_help'      => 'Fields will begin populating after this many empty rows are skipped at the top of the label.',
     'favicon'                   => 'ファビコン',
     'favicon_format'            => '許可されているファイル形式は、ico、png、および gif です。他の画像形式は、すべてのブラウザで動作しない可能性があります。',
     'favicon_size'          => 'ファビコンは16x16 ピクセルの正方形の画像である必要があります。',
     'footer_text'               => '追加のフッターテキスト ',
     'footer_text_help'          => 'このテキストは右側のフッターに表示されます。 <a href="https://help.github.com/articles/github-flavored-markdown/">Github flavored markdown</a>を使用してリンクが作成できます。改行、ヘッダー、画像などは、予期しない表示結果になる可能性があります。',
+    'footer_text_placeholder'   => 'Optional footer text',
     'general_settings'			=> '全般設定',
-    'general_settings_keywords' => '会社のサポート、署名、受諾、電子メール形式、ユーザー名形式、ページあたりの画像、サムネイル、eula、gravatar、tos、ダッシュボード、プライバシー',
     'general_settings_help'     => 'デフォルトのEULAなど',
     'generate_backup'			=> 'バックアップを作成',
     'google_workspaces'         => 'Google ワークスペース',
     'header_color'              => 'ヘッダーカラー',
     'info'                      => 'これらの設定は、あなたの設備の特性に合わせてカスタマイズできます。',
-    'label_logo'                => 'ラベルのロゴ',
     'label_logo_size'           => 'ロゴは各アセットラベルの右上に表示されます。形は正方形が最良です。 ',
     'laravel'                   => 'Laravelバージョン',
     'ldap'                      => 'LDAP',
@@ -94,7 +97,7 @@ return [
     'ldap_login_sync_help'      => 'これは、LDAPが正しく同期できることをテストするだけです。 LDAP認証クエリが正しくない場合、ユーザーはまだログインできない場合があります。その前に必ず更新後のLDAP設定を保存しておいてください。',
     'ldap_manager'              => 'LDAPマネージャー',
     'ldap_server'               => 'LDAP サーバ',
-    'ldap_server_help'          => 'LDAP を使用開始 ldap:// (for unencrypted or TLS) or ldaps:// (for SSL)',
+    'ldap_server_help'          => 'This should start with ldap:// (for unencrypted) or ldaps:// (for TLS or SSL)',
     'ldap_server_cert'			=> 'LDAP SSL 認証',
     'ldap_server_cert_ignore'	=> '無効な SSL 証明書を許可します。',
     'ldap_server_cert_help'		=> '自己署名 SSL 証明書を使用して無効な SSL 証明書を受け入れたい場合は、このチェック ボックスを選択します。',
@@ -108,8 +111,8 @@ return [
     'ldap_pword'                => 'LDAP バインド パスワード',
     'ldap_basedn'               => 'LDAP 検索ベース DN',
     'ldap_filter'               => 'LDAP フィルター',
-    'ldap_pw_sync'              => 'LDAP パスワード同期',
-    'ldap_pw_sync_help'         => 'LDAPパスワードをローカルパスワードと同期させない場合は、このチェックボックスをオフにします。これをオフにすると、何らかの理由でLDAPサーバーにアクセスできない場合、ユーザーがログインできなくなる可能性があります。',
+    'ldap_pw_sync'              => 'Cache LDAP Passwords',
+    'ldap_pw_sync_help'         => 'Uncheck this box if you do not wish to keep LDAP passwords cached as local hashed passwords. Disabling this means that your users may not be able to login if your LDAP server is unreachable for some reason.',
     'ldap_username_field'       => 'ユーザー名フィールド',
     'ldap_lname_field'          => '苗字',
     'ldap_fname_field'          => 'LDAP First Name',
@@ -119,13 +122,15 @@ return [
     'ldap_activated_flag_help'  => 'この値は、同期されたユーザーがSnipe-ITにログインできるかどうかを決定するために使用されます。<strong>アイテムをチェックインまたはチェックアウトする機能には影響しません。</strong>また、<strong>値</strong>ではなく、AD/LDAP内の<strong>属性名</strong>である必要があります。<br><br>
 
 このフィールドにAD/LDAP内に存在しないフィールド名が設定されている場合、またはAD/LDAPフィールドの値が<code>0</code>または<code>false</code>に設定されている場合、<strong>ユーザログインは無効化</strong>されます。AD/LDAPフィールドの値が<code>1</code>または<code>true</code>に設定されている場合、または<em>その他のテキストが設定されている場合</em>は、ユーザーは<strong>ログインすることが可能</strong>です。ADでこのフィールドが空白の場合、<code>userAccountControl</code>属性を尊重し、通常、サスペンドされていないユーザーのログインを許可しています。',
+    'ldap_invert_active_flag'   => 'LDAP アクティブフラグの反転',
+    'ldap_invert_active_flag_help'     => '有効な場合: LDAP Active Flag に返された値が <code>0</code> または <code>false</code> の場合、ユーザーアカウントはアクティブになります。',
     'ldap_emp_num'              => 'LDAP 社員番号',
     'ldap_email'                => 'LDAP メール',
     'ldap_test'                 => 'LDAPをテスト',
     'ldap_test_sync'            => 'LDAP同期のテスト',
     'license'                   => 'ソフトウェアライセンス',
-    'load_remote'               => 'Gravatarを使用',
-    'load_remote_help_text'		=> 'インストールがスクリプトを外部から読み込めない場合は、このチェックボックスをオフにしてください。Snipe-IT が Gravatar から画像を読み込むのを防ぎます。',
+    'load_remote'               => 'Load Remote Avatars',
+    'load_remote_help_text'		=> 'Uncheck this box if your install cannot load scripts from the outside internet. This will prevent Snipe-IT from trying load avatars from Gravatar or other outside sources.',
     'login'                     => 'ログイン試行',
     'login_attempt'             => 'ログイン試行',
     'login_ip'                  => 'IPアドレス',
@@ -133,6 +138,7 @@ return [
     'login_user_agent'          => 'User Agent',
     'login_help'                => 'ログイン試行の一覧',
     'login_note'                => 'ログインメッセージ',
+    'login_note_placeholder'            => "If you do not have a login or have found a device belonging to this company, please call technical support at 888-555-1212. Thank you.",
     'login_note_help'           => 'オプションで、紛失または盗難されたデバイスを見つけた人を支援するなど、ログイン画面に文章を表示することができます。このフィールドは<a href="https://help.github.com/articles/github-flavored-markdown/">Github flavored markdown</a>が使用できます。',
     'login_remote_user_text'    => 'リモートユーザのログインオプション',
     'login_remote_user_enabled_text' => 'リモートユーザーのログインヘッダーを有効にする',
@@ -149,13 +155,16 @@ return [
     'logo_print_assets_help'    => '印刷可能な資産リストにブランドを使用する。 ',
     'full_multiple_companies_support_help_text' => 'ユーザー (管理者を含む) に 資産の割り当て を制限します。',
     'full_multiple_companies_support_text' => '複数企業をサポートします。',
+    'scope_locations_fmcs_support_text'  => 'Scope Locations with Full Multiple Companies Support',
+    'scope_locations_fmcs_support_help_text'  => 'Restrict locations to their selected company.',
+    'scope_locations_fmcs_check_button' => 'Check Compatibility',
+    'scope_locations_fmcs_support_disabled_text'  => 'This option is disabled because you have conflicting locations set for :count or more items.',
     'show_in_model_list'   => 'モデルのドロップダウンに表示',
     'optional'					=> 'オプション',
     'per_page'                  => 'ページ毎の結果',
     'php'                       => 'PHPバージョン',
-    'php_info'                  => 'PHPの情報',
+    'php_info'                  => 'PHP info',
     'php_overview'              => 'PHP',
-    'php_overview_keywords'     => 'phpinfo, system, info',
     'php_overview_help'         => 'PHPシステム情報',
     'php_gd_info'               => 'QRコードを表示するためにphp-gdをインストールする必要があります。インストールインストラクションを参照して下さい。',
     'php_gd_warning'            => 'PHP Image Processing および GD plugin が、インストールされていません。',
@@ -221,6 +230,8 @@ return [
     'webhook_integration_help'    => 'Slackとの連携は任意ですが、利用する場合はエンドポイントとチャンネルが必要です。Slackとの連携を設定するには、まず、Slackに<a href=":webhook_link" target="_new" rel="noopener">Incoming Webhookを作成</a>する必要があります。<strong>Slack統合テスト</strong> ボタンをクリックし、設定が正しいことを確認してから保存してください。 ',
     'webhook_integration_help_button'    => ':app の設定を保存すると、テストボタンが表示されます。',
     'webhook_test_help'           => ':app の連携が正しく設定されているかどうかをテストします。:app の設定を最初に保存しなければなりません。',
+    'shortcuts_enabled'         => 'ショートカットを有効化',
+    'shortcuts_help_text'       => '<strong>Windows</strong>: Alt + Access Key, <strong>Mac</strong>: Control + Option + Access key',
     'snipe_version'  			=> 'Snipe-IT バージョン',
     'support_footer'            => 'フッターのリンクをサポートします。 ',
     'support_footer_help'       => 'Snipe-ITサポート情報とユーザーマニュアルへのリンクを確認する',
@@ -230,7 +241,6 @@ return [
     'update'                    => '設定を更新',
     'value'                     => '価値',
     'brand'                     => 'ブランディング',
-    'brand_keywords'            => 'footer, logo, print, theme, skin, header, colors, color, css',
     'brand_help'                => 'ロゴ, サイト名',
     'web_brand'                 => 'Webブランディングタイプ',
     'about_settings_title'      => '設定について',
@@ -279,6 +289,8 @@ return [
     'two_factor_enrollment_text'	=> "二段階認証の登録が必要ですが、あなたのデバイスはまだ登録されていません。Google Authenticatorアプリを開き、下のQRコードをスキャンして端末を登録してください。端末を登録したら以下のコードを入力してください。",
     'require_accept_signature'      => 'シグネチャリクエスト',
     'require_accept_signature_help_text'      => 'この機能を有効にするには、ユーザーが資産を受け入れる際に物理的にサインオフする必要があります。',
+    'require_checkinout_notes'  => 'Require Notes on Checkin/Checkout',
+    'require_checkinout_notes_help_text'    => 'この機能を有効にするには、アセットをチェックインまたはチェックアウトする際にノートフィールドが必要です。',
     'left'        => '左',
     'right'        => '右',
     'top'        => '上',
@@ -316,24 +328,24 @@ return [
     'filter_by_keyword' => 'キーワードを設定してフィルター',
     'security' => 'セキュリティ',
     'security_title' => 'セキュリティ設定を更新',
-    'security_keywords' => 'password, passwords, requirements, two factor, two-factor, common passwords, remote login, logout, authentication',
     'security_help' => '二段階認証, パスワードの制限',
-    'groups_keywords' => 'permissions, permission groups, authorization',
     'groups_help' => 'アカウント権限グループ',
     'localization' => 'ローカライズ',
     'localization_title' => 'ローカライズ設定を更新',
-    'localization_keywords' => 'localization, currency, local, locale, time zone, timezone, international, internatinalization, language, languages, translation',
     'localization_help' => '言語, 日付表示',
     'notifications' => '通知',
     'notifications_help' => 'メールアラートと監査設定',
     'asset_tags_help' => '増分とプレフィクス',
     'labels' => 'ラベル',
     'labels_title' => 'ラベル設定を更新',
-    'labels_help' => 'ラベルサイズ &amp; 設定',
-    'purge_keywords' => '恒久的に削除',
+    'labels_help' => 'Barcodes &amp; label settings',
     'purge_help' => '削除したレコードを消去',
     'ldap_extension_warning' => 'このサーバーでは、LDAP 拡張モジュールがインストールされていないか、または有効になっていないようです。設定を保存することはできますが、LDAPの同期やログインを機能させるために、PHPのLDAP拡張モジュールを有効にする必要があります。',
     'ldap_ad' => 'LDAP/AD',
+    'ldap_test_label' => 'Test LDAP Sync',
+    'ldap_test_login' => ' Test LDAP Login',
+    'ldap_username_placeholder' => 'LDAP Username',
+    'ldap_password_placeholder' => 'LDAP Password',
     'employee_number' => '従業員番号',
     'create_admin_user' => 'ユーザーを作成 ::',
     'create_admin_success' => '成功！管理者ユーザーが追加されました！',
@@ -345,6 +357,8 @@ return [
     'setup_migration_create_user' => '次へ: ユーザーの作成',
     'ldap_settings_link' => 'LDAP設定ページ',
     'slack_test' => '<i class="fab fa-slack"></i> 統合テスト',
+    'status_label_name' => 'Status Label Name',
+    'super_admin_only'  => 'Super Admin Only',
     'label2_enable'           => '新しいラベルエンジン',
     'label2_enable_help'      => '新しいラベルエンジンに切り替えます。 <b>注意: 他のラベルエンジンを設定する前に、この設定を保存する必要があります。</b>',
     'label2_template'         => 'テンプレート',
@@ -359,12 +373,15 @@ return [
     'label2_2d_type'          => '2次元バーコードタイプ',
     'label2_2d_type_help'     => '2D バーコードのフォーマット',
     'label2_2d_target'        => '2次元バーコードターゲット',
-    'label2_2d_target_help'   => 'スキャン時の 2D バーコードポイントの URL',
+    'label2_2d_target_help'   => 'The data that will be contained in the 2D barcode',
     'label2_fields'           => 'フィールド定義',
     'label2_fields_help'      => '項目は左の列に追加、削除、並び替えができます。 各項目に、LabelとDataSourceの複数のオプションを右側の列に追加、削除、並び替えができます。',
+    'purge_barcodes' => 'バーコードを消去',
     'help_asterisk_bold'    => '<code>**text**</code> として入力されたテキストは太字で表示されます',
     'help_blank_to_use'     => 'Leave blank to use the value from <code>:setting_name</code>',
     'help_default_will_use' => '<code>:default</code> will use the value from <code>:setting_name</code>. <br>Note that the value of the barcodes must comply with the respective barcode spec in order to be successfully generated. Please see <a href="https://snipe-it.readme.io/docs/barcodes">the documentation <i class="fa fa-external-link"></i></a> for more details. ',
+    'asset_id'              => '資産ID',
+    'data'               => 'Data',
     'default'               => 'デフォルト',
     'none'                  => 'なし',
     'google_callback_help' => 'これは、組織&apos;s <strong><a href="https://console.cloud.google.com/" target="_blank">Google 開発者コンソール <i class="fa fa-external-link" aria-hidden="true"></i></a></strong> の Google OAuth アプリ設定のコールバックURLとして入力する必要があります。',
@@ -376,7 +393,100 @@ return [
     'database_driver' => 'データベースドライバ',
     'bs_table_storage' => 'テーブルストレージ',
     'timezone' => 'Timezone',
+    'test_mail' => 'テストメール',
     'profile_edit'          => 'Edit Profile',
     'profile_edit_help'          => 'Allow users to edit their own profiles.',
+    'default_avatar' => 'Custom Default Avatar',
+    'default_avatar_help' => 'This image will be displayed as a profile if a user does not have a profile photo.',
+    'restore_default_avatar' => 'Restore <a href=":default_avatar" data-toggle="lightbox" data-type="image">original system default avatar</a>',
+    'restore_default_avatar_help' => '',
+    'due_checkin_days' => 'チェックイン期限の警告',
+    'due_checkin_days_help' => 'アセットの期待されるチェックインの何日前に、「チェックイン期限」ページにリストされるべきですか?',
+    'no_groups' => 'No groups have been created yet. Visit <code>Admin Settings > Permission Groups</code> to add one.',
+    'text' => 'Text',
+
+    'username_formats' => [
+        'username_format'		=> 'ユーザー名の書式',
+        'firstname_lastname_format'	=> '名前.苗字 (jane.smith)',
+        'first_name_format'	        => '名前 (jane)',
+        'last_name_format'		=> 'Last Name (doe)',
+        'filastname_format'			=> '名前のイニシャル苗字 (jsmith)',
+        'lastnamefirstinitial_format' =>  '苗字名前のイニシャル (smith_j)',
+        'firstname_lastname_underscore_format' => '名前_苗字 (jane_smith)',
+        'firstinitial.lastname' => '名前のイニシャル.苗字 (j.smith)',
+        'lastname_firstinitial' => '苗字_名前のイニシャル (smith_j)',
+        'lastname_dot_firstinitial_format' => '苗字.名前のイニシャル (smith.j)',
+        'firstnamelastname'     => '名前苗字 (janesmith)',
+        'firstnamelastinitial'  => '名前と苗字のイニシャル (janes)',
+        'lastnamefirstname'      => '姓.名 (smith.jane)',
+    ],
+
+    'email_formats' => [
+        'email_format'			=> 'Eメールフォーマット',
+        'firstname_lastname_format'	=> '名前.苗字 (jane.smith@example.com)',
+        'first_name_format'		=> '名前 (jane@example.com)',
+        'last_name_format'		=> 'Last Name (doe@example.com)',
+        'filastname_format'			=> '名前のイニシャルと苗字 (jsmith@example.com)',
+        'lastnamefirstinitial_format' =>  '名前と苗字のイニシャル（smithj@example.com）',
+        'firstname_lastname_underscore_format' => '名前_苗字 (jane_smith@example.com)',
+        'firstinitial.lastname' => '名前.イニシャルと苗字 (j.smith@example.com)',
+        'lastname_firstinitial' => '苗字_名前のイニシャル (smith_j@example.com)',
+        'lastname_dot_firstinitial_format' => 'Last Name First Initial (smith.j@example.com)',
+        'firstnamelastname'     => '名前と苗字 (janesmith@example.com)',
+        'firstnamelastinitial'  => '名前と苗字のイニシャル (janes@example.com)',
+        'lastnamefirstname'      => '姓.名 (smith.jane@example.com)',
+    ],
+
+
+
+    'logo_labels' => [
+        'acceptance_pdf_logo'       => 'PDF Logo',
+        'email_logo'                => 'メールのロゴ',
+        'label_logo'                => 'ラベルのロゴ',
+        'logo'                      => 'Site Logo',
+        'favicon'                   => 'ファビコン',
+    ],
+
+    'logo_help' => [
+        'email_logo_size'       => '電子メールでは正方形のロゴが見栄えよく見えます。 ',
+    ],
+
+    'logo_option_types' => [
+        'text' => 'Text',
+        'logo' => 'ロゴ',
+        'logo_and_text' => 'Logo and Text',
+    ],
+
+
+    'legends' => [
+        'scoping' => 'Scoping',
+        'formats' => 'Default Formats',
+        'profiles' => 'User Profiles',
+        'eula' => 'EULA & Acceptance Preferences',
+        'misc_display' => 'Miscellaneous Display Options',
+        'email' => 'Email Preferences',
+        'checkin' => 'Checkin Preferences',
+        'dashboard' => 'Login & Dashboard Preferences',
+        'misc' => 'Miscellaneous',
+        'logos' => 'ロゴと表示',
+        'colors' => '色とスキン',
+        'footer' => 'フッターの設定',
+        'security' => 'セキュリティ設定',
+        'general' => '一般',
+        'intervals' => '間隔としきい値',
+    ],
+
+
+    /* Keywords for settings overview help */
+    'keywords' => [
+        'brand'             => 'footer, logo, print, theme, skin, header, colors, color, css',
+        'general_settings'  => '会社のサポート、署名、受諾、電子メール形式、ユーザー名形式、ページあたりの画像、サムネイル、eula、gravatar、tos、ダッシュボード、プライバシー',
+        'groups'            => 'permissions, permission groups, authorization',
+        'labels'            => 'labels, barcodes, barcode, sheets, print, upc, qr, 1d, 2d',
+        'localization'      => 'localization, currency, local, locale, time zone, timezone, international, internatinalization, language, languages, translation',
+        'php_overview'      => 'phpinfo, system, info',
+        'purge'             => '恒久的に削除',
+        'security'          => 'password, passwords, requirements, two factor, two-factor, common passwords, remote login, logout, authentication',
+    ],
 
 ];
diff --git a/resources/lang/ja-JP/admin/settings/message.php b/resources/lang/ja-JP/admin/settings/message.php
index 9b97d3576f..8612ef0ef8 100644
--- a/resources/lang/ja-JP/admin/settings/message.php
+++ b/resources/lang/ja-JP/admin/settings/message.php
@@ -14,6 +14,9 @@ return [
         'restore_warning'       => '復元を行います。現在データベースにある既存のデータを上書きします。 これにより、既存のすべてのユーザー(あなたを含む) もログアウトします。',
         'restore_confirm'       => ':filename からデータベースを復元してもよろしいですか？'
     ],
+    'restore' => [
+        'success'               => 'システムバックアップが復元されました。もう一度ログインしてください。'
+    ],
     'purge' => [
         'error'     => 'パージ中にエラーが発生しました。 ',
         'validation_failed'     => 'パージの確定方法が正しくありません。入力してください、単語「削除」確認ボックス。',
@@ -33,6 +36,9 @@ return [
         'testing_authentication' => 'LDAP認証のテスト中...',
         'authentication_success' => 'LDAPによるユーザー認証に成功しました！'
     ],
+    'labels' => [
+        'null_template' => 'Label template not found. Please select a template.',
+        ],
     'webhook' => [
         'sending' => ':app テストメッセージを送信しています...',
         'success' => 'あなたの:webhook_name連携は動作します！',
@@ -42,5 +48,12 @@ return [
         'error' => '問題が発生しました。:app 応答: :error_message',
         'error_redirect' => 'エラー: 301/302 :endpoint はリダイレクトを返します。セキュリティ上の理由から、リダイレクトには従いません。実際のエンドポイントを使用してください。',
         'error_misc' => '問題が発生しました。:( ',
-    ]
+        'webhook_fail' => ' webhook notification failed: Check to make sure the URL is still valid.',
+        'webhook_channel_not_found' => ' webhook channel not found.',
+        'ms_teams_deprecation' => 'The selected Microsoft Teams webhook URL will be deprecated Dec 31st, 2025. Please use a workflow URL. Microsoft\'s documentation on creating a workflow can be found <a href="https://support.microsoft.com/en-us/office/create-incoming-webhooks-with-workflows-for-microsoft-teams-8ae491c7-0394-4861-ba59-055e33f75498" target="_blank"> here.</a>',
+    ],
+    'location_scoping' => [
+        'not_saved' => '設定は保存されませんでした。',
+        'mismatch' => '位置情報を有効にする前に対応が必要な項目が、データベースに 1 件あります。|位置情報を有効にする前に対応が必要な項目が、データベースに :count 件あります。',
+    ],
 ];
diff --git a/resources/lang/ja-JP/admin/statuslabels/table.php b/resources/lang/ja-JP/admin/statuslabels/table.php
index 0efad234f3..f02138d2ff 100644
--- a/resources/lang/ja-JP/admin/statuslabels/table.php
+++ b/resources/lang/ja-JP/admin/statuslabels/table.php
@@ -1,14 +1,14 @@
 <?php
 
 return array(
-    'about'      	=> 'ステータスラベルについて',
+    'about'      	=> 'About Status Types',
     'archived'      	=> 'アーカイブ',
     'create'      	=> 'ステータスラベルを作成',
     'color'      	=> 'グラフの色',
     'default_label' => 'デフォルトラベル',
     'default_label_help' => 'もっとも一般的に使用されるステータスラベルを、資産を作成/編集する際に選択ボックスの上部に表示します。',
     'deployable'      	=> '配備可能',
-    'info'      	=> 'ステータスラベルは資産の様々な状態の説明に利用されます。修理中であったり、紛失/盗難かもしれません。資産を配備可能、ペンディング、保管といった新しいステータスラベルを作成できます。',
+    'info'      	=> 'Status label types are used to describe the various states your assets could be in. They may be out for repair, lost/stolen, etc. You can create new status labels for your deployable, pending and archived assets according to your own workflow. For more information, <a href="https://snipe-it.readme.io/docs/overview#status-labels" target="_blank">see the documentation <i class="fa fa-external-link"></i></a>.',
     'name'      	=> 'ステータス名',
     'pending'      	=> '保留中',
     'status_type'   => 'ステータスタイプ',
diff --git a/resources/lang/ja-JP/admin/users/general.php b/resources/lang/ja-JP/admin/users/general.php
index ddeb576eba..b112c6e516 100644
--- a/resources/lang/ja-JP/admin/users/general.php
+++ b/resources/lang/ja-JP/admin/users/general.php
@@ -19,6 +19,8 @@ return [
     'print_assigned'    => '割り当て先をすべて印刷',
     'email_assigned'    => '割り当てられたすべてのメール一覧',
     'user_notified'     => 'ユーザーは現在割り当てられているアイテムのリストを電子メールで送信しました。',
+    'users_notified'    => 'ユーザーに現在割り当てられているアイテムのリストをメールで送信しました。|:count ユーザーに現在割り当てられているアイテムのリストをメールで送信しました。',
+    'users_notified_warning' => ':count 人に現在割り当てられているアイテムのリストを電子メールで送信しました。 ただし、:no_email ユーザーはメールアドレスを持っていないため、メールできませんでした。 :count 人に現在割り当てられているアイテムのリストを電子メールで送信しました。 ただし、:no_email ユーザはメールアドレスを持っていないため、メールできませんでした。',
     'auto_assign_label' => '該当するライセンスを自動で割り当てる場合の、このユーザーを含める',
     'auto_assign_help'  => 'このユーザーのライセンスの自動割り当てをスキップ',
     'software_user'     => 'ソフトウェアは :name にチェックアウトしました。',
diff --git a/resources/lang/ja-JP/admin/users/message.php b/resources/lang/ja-JP/admin/users/message.php
index 09d71d9bee..e75cbca566 100644
--- a/resources/lang/ja-JP/admin/users/message.php
+++ b/resources/lang/ja-JP/admin/users/message.php
@@ -6,7 +6,7 @@ return array(
     'declined'                  => 'この資産を却下しました。',
     'bulk_manager_warn'	        => 'あなたの利用者は正常に更新されました。しかしながら、あなたの管理者エントリーは保存されませんでした。あなたが選択した管理者が、編集対象の利用者一覧に選択されていたため更新されませんでした。および利用者は彼ら自身の管理者でない場合があります。再度、管理者を除いた上で、あなたの利用者を選択してください。',
     'user_exists'               => '利用者が既に存在しています!',
-    'user_not_found'            => 'ユーザーが存在しません。',
+    'user_not_found'            => 'ユーザーが存在しないか、表示する権限がありません。',
     'user_login_required'       => 'ログインフィールドが必要です。',
     'user_has_no_assets_assigned' => 'ユーザーに割り当てられているアセットはありません。',
     'user_password_required'    => 'パスワードが必要です。',
@@ -53,6 +53,7 @@ return array(
         'ldap_could_not_search' => 'LDAPサーバーを検索できません。LDAP設定ファイル内のサーバー設定を確認して下さい。<br> LDAPサーバーからのエラー:',
         'ldap_could_not_get_entries' => 'LDAPサーバーからエンティティを取得できません。LDAP設定ファイル内のサーバー設定を確認して下さい。<br> LDAPサーバーからのエラー:',
         'password_ldap' => 'このアカウントのパスワードは、LDAPかアクティブディレクトリで管理されています。パスワードを変更するには管理者にお問い合わせください。 ',
+        'multi_company_items_assigned' => 'このユーザーには、別の会社に属するアイテムが割り当てられています。会社を確認するか、アイテムを編集してください。'
     ),
 
     'deletefile' => array(
diff --git a/resources/lang/ja-JP/admin/users/table.php b/resources/lang/ja-JP/admin/users/table.php
index dc7171e862..b62e844368 100644
--- a/resources/lang/ja-JP/admin/users/table.php
+++ b/resources/lang/ja-JP/admin/users/table.php
@@ -22,7 +22,7 @@ return array(
     'managed_locations'     => '管理ロケーション',
     'managed_users'         => '管理ユーザー',
     'name' 					=> '名前',
-    'nogroup'               => 'まだグループが作成されていません．追加する場合は，次を参照してください: ',
+    'nogroup'               => 'まだグループが作成されていません．追加する場合は，次を参照してください:',
     'notes'                 => '備考',
     'password_confirm' 		=> 'パスワードを確認',
     'password' 				=> 'パスワード',
diff --git a/resources/lang/ja-JP/auth.php b/resources/lang/ja-JP/auth.php
index 66c1dd8eb8..ea9bcd659e 100644
--- a/resources/lang/ja-JP/auth.php
+++ b/resources/lang/ja-JP/auth.php
@@ -15,6 +15,6 @@ return array(
 
     'failed' => 'これらの資格情報は記録と一致しません。',
     'password' => '入力されたパスワードが正しくありません。',
-    'throttle' => 'ログイン試行回数が多すぎます。:seconds 秒後にもう一度お試しください。',
+    'throttle' => 'ログイン試行回数が多すぎます。:minutes 分後にもう一度お試しください。',
 
 );
diff --git a/resources/lang/ja-JP/auth/message.php b/resources/lang/ja-JP/auth/message.php
index ed31fbb63e..c0f04331b5 100644
--- a/resources/lang/ja-JP/auth/message.php
+++ b/resources/lang/ja-JP/auth/message.php
@@ -6,8 +6,6 @@ return array(
     'account_not_found'      => 'ユーザー名またはパスワードが不正です。',
     'account_not_activated'  => 'このユーザーアカウントは有効化されていません。',
     'account_suspended'      => 'このユーザーアカウントは停止中です。',
-    'account_banned'         => 'このユーザーアカウントは禁止されています。',
-    'throttle'               => '複数回ログインに失敗しました。 :minutes 分後に再試行してください。',
 
     'two_factor' => array(
         'already_enrolled'      => 'お使いのデバイスは既に登録されています。',
diff --git a/resources/lang/ja-JP/button.php b/resources/lang/ja-JP/button.php
index 029faa5857..6097208106 100644
--- a/resources/lang/ja-JP/button.php
+++ b/resources/lang/ja-JP/button.php
@@ -7,6 +7,7 @@ return [
     'checkin_and_delete'  	    => 'すべてチェックイン/ユーザー削除',
     'delete'  	                => '削除',
     'edit'    	                => '編集',
+    'clone'    	                => 'Clone',
     'restore' 	                => '復元',
     'remove'                    => '削除',
     'request'                   => 'リクエスト',
@@ -21,4 +22,13 @@ return [
     'add_maintenance'           => 'メンテナンスを追加',
     'append'                    => '追加',
     'new'                       => '新規',
+    'var' => [
+        'clone'     => 'Clone :item_type',
+        'edit'      => 'Edit :item_type',
+        'delete'    => 'Delete :item_type',
+        'restore'   => 'Restore :item_type',
+        'create'    => 'Create New :item_type',
+        'checkout'  => 'Checkout :item_type',
+        'checkin'   => 'Checkin :item_type',
+    ]
 ];
diff --git a/resources/lang/ja-JP/general.php b/resources/lang/ja-JP/general.php
index b745f342d5..38fe7001c9 100644
--- a/resources/lang/ja-JP/general.php
+++ b/resources/lang/ja-JP/general.php
@@ -10,10 +10,10 @@ return [
     'action'                => '操作',
     'activity_report'		=> '操作レポート',
     'address'				=> '住所',
-    'admin'					=> '管理',
-    'admin_tooltip'			=> 'This user has admin privileges',
-    'superuser'				=> 'Superuser',
-    'superuser_tooltip'		=> 'This user has superuser privileges',
+    'admin'					=> '管理者設定',
+    'admin_tooltip'			=> 'このユーザーには管理者権限があります',
+    'superuser'				=> 'スーパーユーザー',
+    'superuser_tooltip'		=> 'このユーザーはスーパーユーザー権限を持っています',
     'administrator'			=> '管理者',
     'add_seats'             => 'シートを追加',
     'age'                   => "経過",
@@ -23,13 +23,16 @@ return [
     'asset_models'			=> '資産モデル',
     'asset_model'			=> 'モデル',
     'asset'					=> '資産',
+    'asset_previous'        => '資産 (以前に割り当て済)',
     'asset_report'          => '資産レポート',
     'asset_tag'				=> '資産タグ',
     'asset_tags'            => '資産タグ',
     'assets_available'		=> '利用可能な資産',
     'accept_assets'         => ':name の資産を承認 ',
     'accept_assets_menu'    => '資産を承認',
+    'accept_item'           => 'Accept Item',
     'audit'				    => '監査',
+    'audits'				=> '監査',
     'audit_report'			=> '監査ログ',
     'assets'				=> '資産数',
     'assets_audited'        => '監査済み資産',
@@ -61,9 +64,12 @@ return [
     'changepassword'  		=> 'パスワードを変更',
     'checkin'  				=> 'チェックイン',
     'checkin_from'  		=> 'チェックイン元',
+    'checkin_note'  		=> 'チェックインメモ',
+    'checkout_note'  		=> 'チェックアウトメモ',
     'checkout'  			=> 'チェックアウト',
     'checkouts_count'       => 'チェックアウト数',
     'checkins_count'        => 'チェックイン数',
+    'checkin_and_delete'  	=> 'チェックインと削除',
     'user_requests_count'   => 'リクエスト数',
     'city'  				=> '市区町村',
     'click_here'			=> 'ここをクリック',
@@ -77,7 +83,7 @@ return [
     'consumables'			=> '消耗品数',
     'country'  				=> '国',
     'could_not_restore'     => ':item_type: の復元エラー :error',
-    'not_deleted'           => ':item_type は削除されないため、復元できません',
+    'not_deleted'           => ':item_type は削除されたため、復元できません',
     'create'				=> '新規作成',
     'created'               => 'アイテムを作成しました',
     'created_asset'			=> '資産を作成',
@@ -86,11 +92,13 @@ return [
     'record_created' 		=> 'レコードが作成されました',
     'updated_at' 			=> '更新日',
     'currency'  			=> '¥', // this is deprecated
+    'currency_text'  		=> '通貨', //
     'current'  				=> '現在の状況',
     'current_password'      => '現在のパスワード',
     'customize_report'      => 'レポートのカスタマイズ',
     'custom_report'         => '資産レポートをカスタム',
     'dashboard'				=> 'ダッシュボード',
+    'data_source'           => 'Data Source',
     'days'      			=> '日間',
     'days_to_next_audit'    => '次の監査日',
     'date'					=> '日付',
@@ -114,29 +122,13 @@ return [
     'editprofile'  			=> 'プロファイルを編集',
     'eol'					=> 'EOL',
     'email_domain'			=> 'Eメール ドメイン',
-    'email_format'			=> 'Eメールフォーマット',
     'employee_number'       => '従業員番号',
     'email_domain_help'		=> 'インポート時に作成するe-mail アドレス',
     'error'				    => 'エラー',
     'exclude_archived'      => 'アーカイブされた資産を除外',
     'exclude_deleted'       => '削除されたアセットを除外',
     'example'				=> '例: ',
-    'filastname_format'			=> '名前のイニシャルと苗字 (jsmith@example.com)',
-    'firstname_lastname_format'	=> '名前.苗字 (jane.smith@example.com)',
-    'firstname_lastname_underscore_format' => '名前_苗字 (jane_smith@example.com)',
-    'lastnamefirstinitial_format' =>  '名前と苗字のイニシャル（smithj@example.com）',
-    'firstintial_dot_lastname_format' => '名前のイニシャル.苗字 (j.smith@example.com)',
-    'firstname_lastname_display'	=> '名 姓 (ジェーン・スミス)',
-    'lastname_firstname_display'	=> '姓 (スミス・ジェーン)',
-    'name_display_format'	=> '名前表示形式',
-    'first'					=> '最初',
-    'firstnamelastname'     => '名前と苗字 (janesmith@example.com)',
-    'lastname_firstinitial' => '苗字_名前のイニシャル (smith_j@example.com)',
-    'firstinitial.lastname' => '名前.イニシャルと苗字 (j.smith@example.com)',
-    'firstnamelastinitial'  => '名前と苗字のイニシャル (janes@example.com)',
-    'lastnamefirstname'      => 'Last Name First Name (smith.jane@example.com)',
-    'first_name'			=> '名前',
-    'first_name_format'		=> '名前 (jane@example.com)',
+
     'files'                 => 'ファイル',
     'file_name'				=> 'ファイル',
     'file_type'             => 'ファイル形式',
@@ -158,7 +150,7 @@ return [
     'image_upload'         	=> '画像をアップロード',
     'filetypes_accepted_help'    => 'アップロード可能なファイル形式は :types です。アップロード可能な最大サイズは :size です。|アップロード可能なファイル形式は :types です。アップロード可能な最大サイズは :size です。',
     'filetypes_size_help'   => '許可されている最大アップロードサイズは :size です。',
-    'image_filetypes_help'  => 'Accepted filetypes are jpg, webp, png, gif, svg, and avif. Max upload size allowed is :size.',
+    'image_filetypes_help'  => '使用できるファイルはjpg、png、gif、svgです。許可される最大ファイルサイズは:size です。',
     'unaccepted_image_type'  => 'この画像ファイルは読み取れませんでした。受け入れられるファイルタイプはjpg、webp、png、gif、svgです。このファイルのmimetypeは:mimetypeです。',
     'import'         	    => 'インポート',
     'import_this_file'      => 'フィールドをマップし、このファイルを処理します',
@@ -178,12 +170,17 @@ return [
     'last'					=> '最後',
     'last_login'            => '最終ログイン',
     'last_name'             => '苗字',
+    'firstname_lastname_display'	=> '名 姓 (ジェーン・スミス)',
+    'lastname_firstname_display'	=> '姓 (スミス・ジェーン)',
+    'name_display_format'	=> '名前表示形式',
+    'first'					=> '最初',
+    'first_name'			=> '名前',
     'license'				=> 'ライセンス',
     'license_report'        => 'ライセンスレポート',
     'licenses_available'	=> '利用可能なライセンス',
     'licenses'				=> 'ライセンス数',
     'list_all'				=> '全ての一覧',
-    'loading'				=> '読み込み中… お待ちください…',
+    'loading'				=> 'Loading... please wait...',
     'lock_passwords'        => 'このフィールド値はデモインストールでは保存されません。',
     'feature_disabled'      => 'この機能は、デモインストールでは無効化されています。',
     'location'              => '設置場所',
@@ -193,7 +190,7 @@ return [
     'logout'				=> 'ログアウト',
     'lookup_by_tag'     => '資産タグで参照',
     'maintenances'          => 'メンテナンス',
-    'manage_api_keys'       => 'APIキーの管理',
+    'manage_api_keys'       => 'API キーの管理',
     'manufacturer'			=> '製造元',
     'manufacturers'			=> '製造元の数',
     'markdown'				=> 'このフィールドでは <a href="https://help.github.com/articles/github-flavored-markdown/">Github flavored markdown</a>. が利用可能です',
@@ -215,6 +212,14 @@ return [
     'no_results'			=> '結果はありません。',
     'no'  					=> 'いいえ',
     'notes'  				=> '備考',
+    'note_added'            => 'Note Added',
+    'options'				=> 'Options',
+    'preview'				=> 'Preview',
+    'add_note'              => 'Add Note',
+    'note_edited'            => 'Note Edited',
+    'edit_note'              => 'Edit Note',
+    'note_deleted'            => 'Note Deleted',
+    'delete_note'              => 'Delete Note',
     'order_number'          => '注文番号',
     'only_deleted'          => '削除された資産のみ',
     'page_menu'				=> 'メニューアイテムを表示',
@@ -229,7 +234,7 @@ return [
     'purchase_date'         => '購入日',
     'qty'		            => '数量',
     'quantity'		        => '数量',
-    'quantity_minimum'      => '最低数量を下回る、または下回りそうなアイテムが :count 個あります。',
+    'quantity_minimum'      => 'You have one item below or almost below minimum quantity levels|You have :count items below or almost below minimum quantity levels',
     'quickscan_checkin'  	=> 'クイックスキャン チェックイン',
     'quickscan_checkin_status'  	=> 'チェックイン状況',
     'ready_to_deploy'		=> '配備可能',
@@ -274,13 +279,15 @@ return [
     'signed_off_by'         => '署名された',
     'skin'       			=> 'スキン',
     'webhook_msg_note'        => 'Webhook経由で通知が送信されます',
-    'webhook_test_msg'        => ':app とSnipe-ITの連携がうまくいっているようです！',
+    'webhook_test_msg'        => 'Oh hai! It looks like your :app integration with Snipe-IT is working!',
     'some_features_disabled' => 'デモモード ： いくつかの機能はこのインストールでは無効化されます',
     'site_name'				=> 'サイト名',
     'state'  				=> '都道府県',
     'status_labels'			=> 'ステータスラベル',
+    'status_label'			=> 'ステータスラベル',
     'status'    			=> 'ステータス',
     'accept_eula'           => '受け入れ同意',
+    'show_or_hide_eulas' => 'EULAの表示/非表示',
     'supplier'              => '仕入先',
     'suppliers'  			=> '仕入先',
     'sure_to_delete'        => '削除してもよろしいですか?',
@@ -296,9 +303,9 @@ return [
     'type'  				=> 'タイプ',
     'undeployable'			=> '配備不可',
     'unknown_admin'			=> '不明な管理者',
-    'username_format'		=> 'ユーザー名の書式',
     'username'              => 'ユーザー名',
     'update'                => '更新',
+    'updating_item' => ':item を更新中',
     'upload_filetypes_help'      => '使用できるファイルは、png、gif、jpg、jpeg、doc、docx、pdf、xls、txt、lic、zip、およびrarです。許可される最大ファイルサイズは:sizeです。',
     'uploaded'              => 'アップロード完了',
     'user'					=> '利用者',
@@ -323,10 +330,10 @@ return [
     'token_expired'         => 'セッションが失効しました。再度ログインしてください。',
     'login_enabled'         => 'ログイン可能',
     'audit_due'             => '監査期日',
-    'audit_due_days'        => '監査のための資産期限内:days|資産期限内:days',
+    'audit_due_days'        => '{}Assets Due or Overdue for Audit|[1]Assets Due or Overdue for Audit Within a Day|[2,*]Assets Due or Overdue for Audit Within :days Days',
     'checkin_due'           => 'チェックインの期限',
     'checkin_overdue'       => 'チェックインの期限を超過しました',
-    'checkin_due_days'      => '納入納入納入納入納入納入納入納入納付:days',
+    'checkin_due_days'      => '{}Due for Checkin|[1]Assets Due for Checkin Within :days Day|[2,*]Assets Due for Checkin Within :days Days',
     'audit_overdue'         => '監査期日を超過',
     'accept'                => ':assetを承認',
     'i_accept'              => '承認',
@@ -340,7 +347,7 @@ return [
     'hide_deleted'          => '削除されたものを隠す',
     'email'                 => 'メール',
     'do_not_change'         => '変更しない',
-    'bug_report'            => 'バグを報告',
+    'bug_report'            => 'バグを報告する',
     'user_manual'           => 'ユーザーマニュアル',
     'setup_step_1'          => 'ステップ 1',
     'setup_step_2'          => 'ステップ 2',
@@ -383,6 +390,8 @@ return [
     'new_license'           => '新しいライセンス',
     'new_accessory'         => '新しい付属品',
     'new_consumable'        => '新しい消耗品',
+    'new_component'         => 'New Component',
+    'new_user'              => 'New User',
     'collapse'              => '折りたたむ',
     'assigned'              => '割り当て済み',
     'asset_count'           => '資産数',
@@ -418,19 +427,20 @@ return [
     'bulk_soft_delete'      =>'また、これらのユーザーを論理削除します。管理設定で削除したレコードを削除するまで、資産履歴はそのまま残ります。',
     'bulk_checkin_delete_success' => '選択したユーザーが削除され、項目がチェックインされました。',
     'bulk_checkin_success' => '選択したユーザーの項目がチェックインされています。',
-    'set_to_null'           => 'このアセットの値を削除|全:asset_count個の資産を削除する ',
+    'set_to_null'           => 'Delete values for this selection|Delete values for all :selection_count selections ',
     'set_users_field_to_null'  => 'このユーザーの :field 値を削除|すべての :user_count ユーザーの :field 値を削除する ',
     'na_no_purchase_date'   => '該当なし - 購入日が指定されていません',
     'assets_by_status'      => 'ステータス別資産',
     'assets_by_status_type'      => 'ステータスタイプ別資産',
     'pie_chart_type'        => '円グラフタイプのダッシュボード',
     'hello_name'            => ':name さん、こんにちは！',
-    'unaccepted_profile_warning'   => '受け入れが必要な:count個のアイテムがあります。受け入れるか拒否するにはここをクリックしてください',
+    'unaccepted_profile_warning'   => '受け入れが必要なアイテムが一つあります。 ここをクリックして受け入れるか拒否します | あなたは受け入れを必要としている:count個のアイテムがあります。ここをクリックして受け入れるか拒否します',
     'start_date'            => '開始日',
     'end_date'            => '終了日',
     'alt_uploaded_image_thumbnail' => 'サムネイルのアップロード',
     'placeholder_kit'       => 'キットを選択',
     'file_not_found'        => 'ファイルが見つかりません',
+    'log_record_not_found'  => 'ログのエントリが見つかりませんでした。',
     'preview_not_available' => '(プレビューなし)',
     'setup'                 => 'セットアップ',
     'pre_flight'            => 'プレ・フライト',
@@ -512,7 +522,7 @@ return [
     'checked_out_to_fields' => 'Checked Out To Fields',
     'percent_complete' => '% 成功',
     'uploading' => 'アップロード中... ',
-    'upload_error' => 'ファイルのアップロード中にエラーが発生しました。空の行がなく、列名が重複していないことを確認してください。',
+    'upload_error' => 'Error uploading file. Please check that you have no empty rows or duplicated column names in your CSV, and that the server permissions allow uploads.',
     'copy_to_clipboard' => 'クリップボードにコピー',
     'copied' => 'コピーしました！',
     'status_compatibility' => 'アセットがすでに割り当てられている場合、デプロイできないステータスタイプに変更することはできません。この値の変更はスキップされます。',
@@ -549,6 +559,71 @@ return [
         'license_seats'  => ':count個のライセンスシート',
         'consumables'  => ':count 消耗品数',
         'components'  => ':count コンポーネント',
-    ]
+    ],
+
+    'more_info' => '詳細',
+    'quickscan_bulk_help' => 'Checking this box will edit the asset record to reflect this new location. Leaving it unchecked will simply note the location in the audit log. Note that if this asset is checked out, it will not change the location of the person, asset or location it is checked out to.',
+    'whoops' => 'Whoops!',
+    'something_went_wrong' => 'Something went wrong with your request.',
+    'close' => 'Close',
+    'expires' => '保証失効日',
+    'map_fields'=> 'Map :item_type Fields',
+    'remaining_var' => ':count Remaining',
+    'label' => 'ラベル',
+    'import_asset_tag_exists' => 'アセットタグ :asset_tag のアセットは既に存在し、アップデートは要求されませんでした。変更はありません。',
+    'countries_manually_entered_help' => 'Values with an asterisk (*) were manually entered and do not match existing ISO 3166 dropdown values',
+    'accessories_assigned' => '割り当てられたアクセサリー',
+    'user_managed_passwords' => 'Password Management',
+    'user_managed_passwords_disallow' => 'Disallow users from managing their own passwords',
+    'user_managed_passwords_allow' => 'Allow users to manage their own passwords',
+    'from' => '差出人',
+    'by' => '実行者',
+
+// Add form placeholders here
+    'placeholders' => [
+        'notes'  => 'メモを追加する',
+    ],
+
+    'breadcrumb_button_actions' => [
+        'edit_item' => 'Edit :name',
+        'checkout_item' => 'Checkout :name',
+        'checkin_item' => 'Checkin :name',
+    ],
+
+    'skins' => [
+        'site_default' => 'Site Default',
+        'default_blue' => 'Default Blue',
+        'blue_dark' => 'Blue (Dark Mode)',
+        'green' => 'Green Dark',
+        'green_dark' => 'Green (Dark Mode)',
+        'red' => 'Red Dark',
+        'red_dark' => 'Red (Dark Mode)',
+        'orange' => 'Orange Dark',
+        'orange_dark' => 'Orange (Dark Mode)',
+        'black' => 'Black',
+        'black_dark' => 'Black (Dark Mode)',
+        'purple' => 'Purple',
+        'purple_dark' => 'Purple (Dark Mode)',
+        'yellow' => 'Yellow',
+        'yellow_dark' => 'Yellow (Dark Mode)',
+        'high_contrast' => 'High Contrast',
+
+    ],
+
+    'select_all_none' => 'すべてを選択/選択解除',
+    'generic_model_not_found' => 'That :model was not found or you do not have permission to access it',
+    'deleted_models' => '削除された資産モデル',
+    'deleted_users' => 'Deleted Users',
+    'cost_each' => '各:amount',
+    'remove_current_image' => 'Remove current :type image',
+
+    'seeding' => [
+        'manufacturers' => [
+            'button' => 'Create Manufacturers',
+            'prompt' => 'You do not have any manufacturers yet. Would you like to seed a list of common manufacturers? (THIS WILL OVERWRITE EXISTING MANUFACTURERS, including those that have been soft-deleted.)',
+            'success' => 'Manufacturers seeded successfully',
+            'error' => 'Could not seed manufacturers. A manufacturer record already exists and seeding would overwrite it.|Could not seed manufacturers. :count manufacturer records already exist and seeding would overwrite them.',
+        ],
+    ],
 
 ];
diff --git a/resources/lang/ja-JP/localizations.php b/resources/lang/ja-JP/localizations.php
index 07edf8a503..61963f989f 100644
--- a/resources/lang/ja-JP/localizations.php
+++ b/resources/lang/ja-JP/localizations.php
@@ -40,7 +40,9 @@ return [
         'ms-MY'=> 'Malay',
         'mi-NZ'=> 'Maori',
         'mn-MN'=> 'Mongolian',
-        'no-NO'=> 'Norwegian',
+        'nb-NO'=> 'ノルウェー語ブークモール',
+        'om-ET' => 'Oromo (Ethiopian)',
+        //'nn-NO'=> 'Norwegian Nynorsk',
         'fa-IR'=> 'Persian',
         'pl-PL'=> 'Polish',
         'pt-PT'=> 'Portuguese',
@@ -133,6 +135,7 @@ return [
         'EC'=>'Ecuador',
         'EE'=>'Estonia',
         'EG'=>'Egypt',
+        'GB-ENG'=>'イングランド',
         'ER'=>'Eritrea',
         'ES'=>'Spain',
         'ET'=>'Ethiopia',
@@ -231,6 +234,7 @@ return [
         'NG'=>'Nigeria',
         'NI'=>'Nicaragua',
         'NL'=>'Netherlands',
+        'GB-NIR' => '北アイルランド',
         'NO'=>'Norway',
         'NP'=>'Nepal',
         'NR'=>'Nauru',
@@ -258,7 +262,7 @@ return [
         'RU'=>'Russian Federation',
         'RW'=>'Rwanda',
         'SA'=>'Saudi Arabia',
-        'UK'=>'Scotland',
+        'GB-SCT'=>'Scotland',
         'SB'=>'Solomon Islands',
         'SC'=>'Seychelles',
         'SS'=>'南スーダン',
@@ -310,6 +314,7 @@ return [
         'VI'=>'Virgin Islands (U.S.)',
         'VN'=>'Viet Nam',
         'VU'=>'Vanuatu',
+        'GB-WLS' =>'ウェールズ',
         'WF'=>'Wallis And Futuna Islands',
         'WS'=>'Samoa',
         'YE'=>'Yemen',
diff --git a/resources/lang/ja-JP/mail.php b/resources/lang/ja-JP/mail.php
index 2e63263129..a97e397056 100644
--- a/resources/lang/ja-JP/mail.php
+++ b/resources/lang/ja-JP/mail.php
@@ -23,24 +23,25 @@ return [
     'Item_Requested' => 'アイテムをリクエストしました',
     'License_Checkin_Notification' => 'ライセンスをチェックインしました',
     'License_Checkout_Notification' => 'ライセンスがチェックアウトされました',
+    'license_for'   => 'ライセンス先',
     'Low_Inventory_Report' => '在庫減レポート',
     'a_user_canceled' => 'ユーザーがアイテムリクエストをキャンセルしました。',
     'a_user_requested' => 'ユーザーがアイテムをリクエストしています',
     'acceptance_asset_accepted' => 'ユーザーがアイテムを承認しました',
     'acceptance_asset_declined' => 'ユーザーがアイテムを拒否しました',
-    'accessory_name' => '付属品名:',
-    'additional_notes' => '追記:',
+    'accessory_name' => '付属品名',
+    'additional_notes' => '追記',
     'admin_has_created' => '管理者が:web でアカウントを作成しました。',
-    'asset' => '資産:',
-    'asset_name' => '資産名:',
+    'asset' => '資産',
+    'asset_name' => '資産名',
     'asset_requested' => '資産リクエスト',
     'asset_tag' => '資産タグ',
     'assets_warrantee_alert' => ':threshold 日以内に:count 個の資産に保証期間が切れます。|:threshold 日以内に :count 個の資産に保証期間が切れます。',
     'assigned_to' => '割り当て先',
     'best_regards' => '敬具',
-    'canceled' => 'キャンセル済:',
-    'checkin_date' => 'チェックイン日:',
-    'checkout_date' => 'チェックアウト日:',
+    'canceled' => 'キャンセル済',
+    'checkin_date' => 'チェックイン日',
+    'checkout_date' => '検査日',
     'checkedout_from' => 'からチェックアウトしました',
     'checkedin_from'  => 'チェックイン元',
     'checked_into' => 'チェックインされました',
@@ -49,27 +50,30 @@ return [
     'click_to_confirm' => ':web account: を有効にする為に、次のリンクをクリックしてください。',
     'current_QTY' => '現在の数量',
     'days' => '日数',
-    'expecting_checkin_date' => 'チェックイン予定日:',
+    'expecting_checkin_date' => '希望するチェックイン日',
     'expires' => '保証失効日',
     'hello' => 'こんにちは。',
     'hi' => 'こんにちは',
     'i_have_read' => '私は使用条件を読み、同意し、このアイテムを受け取りました。',
     'inventory_report' => 'インベントリレポート',
-    'item' => 'アイテム:',
+    'item' => '品目',
+    'item_checked_reminder' => 'This is a reminder that you currently have :count items checked out to you that you have not accepted or declined. Please click the link below to confirm your decision.',
     'license_expiring_alert' => ':threshold 日後に:count ライセンスが失効します。',
     'link_to_update_password' => '次のリンクをクリックして、パスワードを更新してください。 :web password:',
-    'login' => 'ログイン:',
+    'login' => 'ログイン',
     'login_first_admin' => '以下の新しいログイン情報を使用して、Snipe-ITにログインします。',
     'low_inventory_alert' => '最小在庫を下回っているか、すぐに少なくなる :count のアイテムがあります。',
     'min_QTY' => '分数',
     'name' => '名前',
     'new_item_checked' => 'あなたの名前で新しいアイテムがチェックアウトされました。詳細は以下の通りです。',
+    'new_item_checked_with_acceptance' => 'あなたの名前で新しいアイテムがチェックアウトされました。承認が必要です。詳細は以下の通りです。',
+    'recent_item_checked' => 'あなたの名前でチェックアウトされたアイテムがあります。承認が必要です。詳細は以下の通りです。',
     'notes' => '備考',
-    'password' => 'パスワード:',
+    'password' => 'パスワード',
     'password_reset' => 'パスワードリセット',
     'read_the_terms' => '下記の利用規約をお読みください。',
     'read_the_terms_and_click' => '以下の利用規約をお読みください。 下部のリンクをクリックして、利用規約を読み、同意し、資産を受け取ったことを確認してください。',
-    'requested' => '要求済:',
+    'requested' => '要求済',
     'reset_link' => 'パスワードリセットのリンク',
     'reset_password' => 'パスワードをリセットするにはここをクリック:',
     'rights_reserved' => 'All rights reserved.',
@@ -86,8 +90,10 @@ return [
     'upcoming-audits' => ':threshold 日以内に監査が行われる資産は :count 個です。|:threshold 日以内に監査が行われる予定の資産が :count 個あります。',
     'user' => 'ユーザ',
     'username' => 'ユーザ名',
+    'unaccepted_asset_reminder' => 'リマインダー：未承認の資産があります。',
     'welcome' => 'ようこそ、 :name さん',
     'welcome_to' => ':web にようこそ!',
     'your_assets' => 'あなたの資産を表示',
     'your_credentials' => 'Snipe-IT クレデンシャル',
+    'mail_sent' => 'Mail sent successfully!',
 ];
diff --git a/resources/lang/ja-JP/validation.php b/resources/lang/ja-JP/validation.php
index 98f080b3e2..672ed5e276 100644
--- a/resources/lang/ja-JP/validation.php
+++ b/resources/lang/ja-JP/validation.php
@@ -13,87 +13,150 @@ return [
     |
     */
 
-    'accepted'             => ':attribute は、承認される必要があります。',
-    'active_url'           => ':attribute は、有効なURLではありません。',
-    'after'                => ':attribute は :date よりも後の日付にして下さい。',
-    'after_or_equal'       => ':attribute は :date よりも後の日付か同じ日にして下さい。',
-    'alpha'                => ':attribute は、文字が含まれている必要があります。',
-    'alpha_dash'           => ':attribute は、文字列、数字、ダッシュ（−）のみ含めることが出来ます。',
-    'alpha_num'            => ':attribute は、文字列と数字のみ含めることが出来ます。',
-    'array'                => ':attribute は配列にして下さい。',
-    'before'               => ':attribute は :date よりも前の日付にして下さい。',
-    'before_or_equal'      => ':attribute は :date よりも前の日付か同じ日にして下さい。',
-    'between'              => [
-        'numeric' => ':attribute は :min - :max の範囲内にして下さい。',
-        'file'    => ':attribute は :min - :max キロバイトの範囲内にして下さい。',
-        'string'  => ':attribute は :min - :max 文字の範囲内にして下さい。',
-        'array'   => ':attribute は :min ～ :max 内の数値にして下さい。',
+    'accepted' => 'The :attribute field must be accepted.',
+    'accepted_if' => 'The :attribute field must be accepted when :other is :value.',
+    'active_url' => 'The :attribute field must be a valid URL.',
+    'after' => 'The :attribute field must be a date after :date.',
+    'after_or_equal' => 'The :attribute field must be a date after or equal to :date.',
+    'alpha' => 'The :attribute field must only contain letters.',
+    'alpha_dash' => 'The :attribute field must only contain letters, numbers, dashes, and underscores.',
+    'alpha_num' => 'The :attribute field must only contain letters and numbers.',
+    'array' => 'The :attribute field must be an array.',
+    'ascii' => 'The :attribute field must only contain single-byte alphanumeric characters and symbols.',
+    'before' => 'The :attribute field must be a date before :date.',
+    'before_or_equal' => 'The :attribute field must be a date before or equal to :date.',
+    'between' => [
+        'array' => 'The :attribute field must have between :min and :max items.',
+        'file' => 'The :attribute field must be between :min and :max kilobytes.',
+        'numeric' => 'The :attribute field must be between :min and :max.',
+        'string' => 'The :attribute field must be between :min and :max characters.',
     ],
-    'boolean'              => ':attribute は、 true もしくは false にしてください。',
-    'confirmed'            => ':attribute が、一致しませんでした。',
-    'date'                 => ':attribute は、無効な日付です。',
-    'date_format'          => ':attribute フォーマット :format に一致しません。',
-    'different'            => ':attribute と :other は、異なっている必要があります。',
-    'digits'               => ':attribute は :digits 数値にして下さい。',
-    'digits_between'       => ':attribute は :min - :max 内の数値にして下さい。',
-    'dimensions'           => ':attribute に無効な画像サイズがあります。',
-    'distinct'             => ':attribute フィールドに重複する値があります。',
-    'email'                => ':attribute フォーマットが不正です。',
-    'exists'               => '選択された :attribute は不正です。',
-    'file'                 => ':attribute はファイルにして下さい。',
-    'filled'               => ':attribute フィールドは空に出来ません。',
-    'image'                => ':attribute は画像にして下さい。',
+    'boolean' => 'The :attribute field must be true or false.',
+    'can' => 'The :attribute field contains an unauthorized value.',
+    'confirmed' => 'The :attribute field confirmation does not match.',
+    'contains' => 'The :attribute field is missing a required value.',
+    'current_password' => 'The password is incorrect.',
+    'date' => 'The :attribute field must be a valid date.',
+    'date_equals' => 'The :attribute field must be a date equal to :date.',
+    'date_format' => 'The :attribute field must match the format :format.',
+    'decimal' => 'The :attribute field must have :decimal decimal places.',
+    'declined' => 'The :attribute field must be declined.',
+    'declined_if' => 'The :attribute field must be declined when :other is :value.',
+    'different' => 'The :attribute field and :other must be different.',
+    'digits' => 'The :attribute field must be :digits digits.',
+    'digits_between' => 'The :attribute field must be between :min and :max digits.',
+    'dimensions' => 'The :attribute field has invalid image dimensions.',
+    'distinct' => ':attribute フィールドに重複する値があります。',
+    'doesnt_end_with' => 'The :attribute field must not end with one of the following: :values.',
+    'doesnt_start_with' => 'The :attribute field must not start with one of the following: :values.',
+    'email' => 'The :attribute field must be a valid email address.',
+    'ends_with' => 'The :attribute field must end with one of the following: :values.',
+    'enum' => '選択された :attribute は不正です。',
+    'exists' => '選択された :attribute は不正です。',
+    'extensions' => 'The :attribute field must have one of the following extensions: :values.',
+    'file' => 'The :attribute field must be a file.',
+    'filled' => ':attribute フィールドは空に出来ません。',
+    'gt' => [
+        'array' => 'The :attribute field must have more than :value items.',
+        'file' => 'The :attribute field must be greater than :value kilobytes.',
+        'numeric' => 'The :attribute field must be greater than :value.',
+        'string' => 'The :attribute field must be greater than :value characters.',
+    ],
+    'gte' => [
+        'array' => 'The :attribute field must have :value items or more.',
+        'file' => 'The :attribute field must be greater than or equal to :value kilobytes.',
+        'numeric' => 'The :attribute field must be greater than or equal to :value.',
+        'string' => 'The :attribute field must be greater than or equal to :value characters.',
+    ],
+    'hex_color' => 'The :attribute field must be a valid hexadecimal color.',
+    'image' => 'The :attribute field must be an image.',
     'import_field_empty'    => ':fieldname の値は null にはできません。',
-    'in'                   => '選択された :attribute は不正です。',
-    'in_array'             => ':attribute フィールドが :other に存在しません。',
-    'integer'              => ':attribute は整数にして下さい。',
-    'ip'                   => ':attribute は有効なIPアドレスにして下さい。',
-    'ipv4'                 => ':attribute は有効なIPアドレスにして下さい。',
-    'ipv6'                 => ':attribute は有効なIPv6アドレスにして下さい。',
-    'is_unique_department' => ':attribute は、この会社の場所に一意である必要があります。',
-    'json'                 => ':attribute は有効なJSON文字列にして下さい。',
-    'max'                  => [
-        'numeric' => ':attribute は :max 以上にして下さい。',
-        'file'    => ':attribute は :max キロバイト以上にして下さい。',
-        'string'  => ':attribute は :max 文字以上にして下さい。',
-        'array'   => ':attribute は :max 以上のアイテムを持つことは出来ません。',
+    'in' => '選択された :attribute は不正です。',
+    'in_array' => 'The :attribute field must exist in :other.',
+    'integer' => 'The :attribute field must be an integer.',
+    'ip' => 'The :attribute field must be a valid IP address.',
+    'ipv4' => 'The :attribute field must be a valid IPv4 address.',
+    'ipv6' => 'The :attribute field must be a valid IPv6 address.',
+    'json' => 'The :attribute field must be a valid JSON string.',
+    'list' => 'The :attribute field must be a list.',
+    'lowercase' => 'The :attribute field must be lowercase.',
+    'lt' => [
+        'array' => 'The :attribute field must have less than :value items.',
+        'file' => 'The :attribute field must be less than :value kilobytes.',
+        'numeric' => 'The :attribute field must be less than :value.',
+        'string' => 'The :attribute field must be less than :value characters.',
     ],
-    'mimes'                => ':attribute は ファイルタイプ :values にして下さい。',
-    'mimetypes'            => ':attribute はファイルタイプ :values にして下さい。',
-    'min'                  => [
-        'numeric' => ':attribute は、少なくとも :min 以上にして下さい。',
-        'file'    => ':attribute は、少なくとも :min キロバイト以上にして下さい。',
-        'string'  => ':attribute は、少なくとも :min 文字以上にして下さい。',
-        'array'   => ':attribute は少なくとも :min 以上にして下さい。',
+    'lte' => [
+        'array' => 'The :attribute field must not have more than :value items.',
+        'file' => 'The :attribute field must be less than or equal to :value kilobytes.',
+        'numeric' => 'The :attribute field must be less than or equal to :value.',
+        'string' => 'The :attribute field must be less than or equal to :value characters.',
     ],
-    'starts_with'          => ':attribute は、いずれかの値で始まる必要があります: :values.',
-    'ends_with'            => ':attribute は、以下のいずれかの :values で終了する必要があります。',
+    'mac_address' => 'The :attribute field must be a valid MAC address.',
+    'max' => [
+        'array' => 'The :attribute field must not have more than :max items.',
+        'file' => 'The :attribute field must not be greater than :max kilobytes.',
+        'numeric' => 'The :attribute field must not be greater than :max.',
+        'string' => 'The :attribute field must not be greater than :max characters.',
+    ],
+    'max_digits' => 'The :attribute field must not have more than :max digits.',
+    'mimes' => 'The :attribute field must be a file of type: :values.',
+    'mimetypes' => 'The :attribute field must be a file of type: :values.',
+    'min' => [
+        'array' => 'The :attribute field must have at least :min items.',
+        'file' => 'The :attribute field must be at least :min kilobytes.',
+        'numeric' => 'The :attribute field must be at least :min.',
+        'string' => 'The :attribute field must be at least :min characters.',
+    ],
+    'min_digits' => 'The :attribute field must have at least :min digits.',
+    'missing' => 'The :attribute field must be missing.',
+    'missing_if' => 'The :attribute field must be missing when :other is :value.',
+    'missing_unless' => 'The :attribute field must be missing unless :other is :value.',
+    'missing_with' => 'The :attribute field must be missing when :values is present.',
+    'missing_with_all' => 'The :attribute field must be missing when :values are present.',
+    'multiple_of' => 'The :attribute field must be a multiple of :value.',
+    'not_in' => '選択された :attribute は不正です。',
+    'not_regex' => 'The :attribute field format is invalid.',
+    'numeric' => 'The :attribute field must be a number.',
+    'password' => [
+        'letters' => 'The :attribute field must contain at least one letter.',
+        'mixed' => 'The :attribute field must contain at least one uppercase and one lowercase letter.',
+        'numbers' => 'The :attribute field must contain at least one number.',
+        'symbols' => 'The :attribute field must contain at least one symbol.',
+        'uncompromised' => 'The given :attribute has appeared in a data leak. Please choose a different :attribute.',
+    ],
+    'percent'       => 'The depreciation minimum must be between 0 and 100 when depreciation type is percentage.',
 
-    'not_in'               => '選択された :attribute は不正です。',
-    'numeric'              => ':attribute は数字にして下さい。',
-    'present'              => ':attribute フィールドは必須です。',
-    'valid_regex'          => '有効な正規表現ではありません。',
-    'regex'                => ':attribute フォーマットが不正です。',
-    'required'             => ':attribute フィールドは、必須です。',
-    'required_if'          => ':other が :value の時、:attribute フィールドは必須です。',
-    'required_unless'      => ':other が :value の時でなければ、:attribute フィールドは必須です。',
-    'required_with'        => ':value が存在する場合、:attribute フィールドは必須です。',
-    'required_with_all'    => ':value が存在する場合、:attribute フィールドは必須です。',
-    'required_without'     => ':value が存在しな場合、:attribute フィールドは必須です。',
+    'present' => ':attribute フィールドは必須です。',
+    'present_if' => 'The :attribute field must be present when :other is :value.',
+    'present_unless' => 'The :attribute field must be present unless :other is :value.',
+    'present_with' => 'The :attribute field must be present when :values is present.',
+    'present_with_all' => 'The :attribute field must be present when :values are present.',
+    'prohibited' => 'The :attribute field is prohibited.',
+    'prohibited_if' => 'The :attribute field is prohibited when :other is :value.',
+    'prohibited_unless' => 'The :attribute field is prohibited unless :other is in :values.',
+    'prohibits' => 'The :attribute field prohibits :other from being present.',
+    'regex' => 'The :attribute field format is invalid.',
+    'required' => ':attribute フィールドは、必須です。',
+    'required_array_keys' => 'The :attribute field must contain entries for: :values.',
+    'required_if' => ':other が :value の時、:attribute フィールドは必須です。',
+    'required_if_accepted' => 'The :attribute field is required when :other is accepted.',
+    'required_if_declined' => 'The :attribute field is required when :other is declined.',
+    'required_unless' => ':other が :value の時でなければ、:attribute フィールドは必須です。',
+    'required_with' => ':value が存在する場合、:attribute フィールドは必須です。',
+    'required_with_all' => 'The :attribute field is required when :values are present.',
+    'required_without' => ':value が存在しな場合、:attribute フィールドは必須です。',
     'required_without_all' => ':value が存在しない場合、:attribute フィールドは必須です。',
-    'same'                 => ':attribute と :other は、一致しなければなりません。',
-    'size'                 => [
-        'numeric' => ':attribute は :size にして下さい。',
-        'file'    => ':attribute は :size キロバイトにして下さい。',
-        'string'  => ':attribute は :size 文字にして下さい。',
-        'array'   => ':attribute には、 :size が含まれていなければなりません。',
+    'same' => 'The :attribute field must match :other.',
+    'size' => [
+        'array' => 'The :attribute field must contain :size items.',
+        'file' => 'The :attribute field must be :size kilobytes.',
+        'numeric' => 'The :attribute field must be :size.',
+        'string' => 'The :attribute field must be :size characters.',
     ],
+    'starts_with' => 'The :attribute field must start with one of the following: :values.',
     'string'               => ':attribute は文字列にして下さい。',
-    'timezone'             => ':attribute は有効なゾーンにして下さい。',
     'two_column_unique_undeleted' => ':attributeは:table1と:table2で一意である必要があります。 ',
-    'unique'               => ':attribute は、取得済みです。',
-    'uploaded'             => ':attribute のアップロードに失敗しました。',
-    'url'                  => ':attribute フォーマットが不正です。',
     'unique_undeleted'     => ':attribute は 一意の値である必要があります。',
     'non_circular'         => ':attribute は、循環参照を作成してはいけません。',
     'not_array'            => ':attributeには配列を指定できません。',
@@ -102,11 +165,14 @@ return [
     'numbers'              => 'パスワードには数字が1つ以上必要です。',
     'case_diff'            => 'パスワードは英字と数字を混在させる必要があります。',
     'symbols'              => 'パスワードには記号を含める必要があります',
-    'gte'                  => [
-        'numeric'          => '負の値にすることはできません'
-    ],
-    'checkboxes'           => ':attribute に無効なオプションが含まれています。',
-    'radio_buttons'        => ':attribute は不正です。',
+    'timezone' => 'The :attribute field must be a valid timezone.',
+    'unique' => ':attribute は、取得済みです。',
+    'uploaded' => ':attribute のアップロードに失敗しました。',
+    'uppercase' => 'The :attribute field must be uppercase.',
+    'url' => 'The :attribute field must be a valid URL.',
+    'ulid' => 'The :attribute field must be a valid ULID.',
+    'uuid' => 'The :attribute field must be a valid UUID.',
+    'fmcs_location' => 'Full multiple company support and location scoping is enabled in the Admin Settings, and the selected location and selected company are not compatible.',
 
 
     /*
@@ -120,16 +186,22 @@ return [
     |
     */
 
+    'email_array'      => '1 つまたは複数の電子メール アドレスが無効です。',
+    'checkboxes'           => ':attribute に無効なオプションが含まれています。',
+    'radio_buttons'        => ':attribute は不正です。',
+    
     'custom' => [
         'alpha_space' => ':attribute フィールドに、禁止文字列が含まれています。',
-        'email_array'      => '1 つまたは複数の電子メール アドレスが無効です。',
+
         'hashed_pass'      => '現在のパスワードが正しくありません。',
         'dumbpwd'          => 'そのパスワードはあまりにも脆弱です。',
         'statuslabel_type' => '有効なステータスラベルの種類を選択する必要があります。',
+        'custom_field_not_found'          => 'This field does not seem to exist, please double check your custom field names.',
+        'custom_field_not_found_on_model' => 'This field seems to exist, but is not available on this Asset Model\'s fieldset.',
 
         // date_format validation with slightly less stupid messages. It duplicates a lot, but it gets the job done :(
-        // We use this because the default error message for date_format is reflects php Y-m-d, which non-PHP
-        // people won't know how to format. 
+        // We use this because the default error message for date_format reflects php Y-m-d, which non-PHP
+        // people won't know how to format.
         'purchase_date.date_format'     => ':attribute は YYYY-MM-DD 形式の有効な日付にして下さい',
         'last_audit_date.date_format'   =>  ':attribute は YYYY-MM-DD hh:mm:ss 形式の有効な日時にして下さい',
         'expiration_date.date_format'   =>  ':attribute は YYYY-MM-DD 形式の有効な日付にして下さい',
@@ -137,9 +209,15 @@ return [
         'expected_checkin.date_format'  =>  ':attribute は YYYY-MM-DD 形式の有効な日付にして下さい',
         'start_date.date_format'        =>  ':attribute は YYYY-MM-DD 形式の有効な日付にして下さい',
         'end_date.date_format'          =>  ':attribute は YYYY-MM-DD 形式の有効な日付にして下さい',
+        'invalid_value_in_field' => 'このフィールドに含まれる値が無効です',
 
-    ],
+        'ldap_username_field' => [
+            'not_in' =>         '<code>sAMAccountName</code> (mixed case) will likely not work. You should use <code>samaccountname</code> (lowercase) instead.'
+        ],
+        'ldap_auth_filter_query' => ['not_in' => '<code>uid=samaccountname</code> is probably not a valid auth filter. You probably want <code>uid=</code> '],
+        'ldap_filter' => ['regex' => 'This value should probably not be wrapped in parentheses.'],
 
+        ],
     /*
     |--------------------------------------------------------------------------
     | Custom Validation Attributes
@@ -155,8 +233,16 @@ return [
 
     /*
     |--------------------------------------------------------------------------
-    | Generic Validation Messages
+    | Generic Validation Messages - we use these in the jquery validation where we don't have
+    | access to the :attribute
     |--------------------------------------------------------------------------
     */
-    'invalid_value_in_field' => 'このフィールドに含まれる値が無効です',
+
+    'generic' => [
+        'invalid_value_in_field' => 'このフィールドに含まれる値が無効です',
+        'required' => 'This field is required',
+        'email' => 'Please enter a valid email address',
+    ],
+
+
 ];
diff --git a/resources/lang/km-KH/account/general.php b/resources/lang/km-KH/account/general.php
index 42074ab0a6..9d35b7359e 100644
--- a/resources/lang/km-KH/account/general.php
+++ b/resources/lang/km-KH/account/general.php
@@ -2,10 +2,16 @@
 
 return array(
     'personal_api_keys' => 'សោ API ផ្ទាល់ខ្លួន',
-    'api_key_warning' => 'When generating an API token, be sure to copy it down immediately as they will not be visible to you again.',
+    'personal_access_token' => 'និមិត្តសញ្ញាចូលប្រើផ្ទាល់ខ្លួន',
+    'personal_api_keys_success' => 'សោ API ផ្ទាល់ខ្លួន៖ សោត្រូវបានបង្កើតដោយជោគជ័យ',
+    'here_is_api_key' => 'នេះជាសញ្ញាសម្គាល់ការចូលប្រើផ្ទាល់ខ្លួនថ្មីរបស់អ្នក។ នេះ​ជា​ពេល​តែ​មួយ​គត់​ដែល​នឹង​ត្រូវ​បាន​បង្ហាញ​ដូច្នេះ​កុំ​ឱ្យ​បាត់បង់​វា​! ឥឡូវនេះអ្នកអាចប្រើសញ្ញាសម្ងាត់នេះដើម្បីធ្វើសំណើ API ។',
+    'api_key_warning' => 'នៅពេលបង្កើតនិមិត្តសញ្ញា API ត្រូវប្រាកដថាចម្លងវាភ្លាមៗ ព្រោះពួកវានឹងមិនអាចមើលឃើញដល់អ្នកម្តងទៀតទេ។',
     'api_base_url' => 'Url មូលដ្ឋាន API របស់អ្នកមានទីតាំងនៅ៖',
     'api_base_url_endpoint' => '/&lt;endpoint&gt;',
     'api_token_expiration_time' => 'និមិត្តសញ្ញា API ត្រូវបានកំណត់ឱ្យផុតកំណត់នៅក្នុង៖',
-    'api_reference' => 'Please check the <a href="https://snipe-it.readme.io/reference" target="_blank">API reference</a> to find specific API endpoints and additional API documentation.',
+    'api_reference' => 'សូមពិនិត្យមើល <a href="https://snipe-it.readme.io/reference" target="_blank">ឯកសារយោង API</a> ដើម្បីស្វែងរកចំណុចបញ្ចប់ API ជាក់លាក់ និងឯកសារ API បន្ថែម។',
     'profile_updated' => 'ធ្វើបច្ចុប្បន្នភាពគណនីដោយជោគជ័យ',
+    'no_tokens' => 'អ្នក​មិន​បាន​បង្កើត​ថូខឹន​ចូល​ប្រើប្រាស់​ផ្ទាល់ខ្លួន​ណា​មួយ​ទេ។',
+    'enable_sounds' => 'បើកបែបផែនសំឡេង',
+    'enable_confetti' => 'បើកបែបផែនក្រដាស',
 );
diff --git a/resources/lang/km-KH/admin/accessories/message.php b/resources/lang/km-KH/admin/accessories/message.php
index 3539fe6ed5..95065a8812 100644
--- a/resources/lang/km-KH/admin/accessories/message.php
+++ b/resources/lang/km-KH/admin/accessories/message.php
@@ -26,7 +26,11 @@ return array(
         'error'   		=> 'គ្រឿងបន្លាស់មិនchecked outទេ សូមព្យាយាមម្តងទៀត',
         'success' 		=> 'គ្រឿងបន្លាស់ត្រូវchecked out ដោយជោគជ័យ។',
         'unavailable'   => 'គ្រឿងបន្លាស់មិនមានសម្រាប់ checkout ទេ។ ពិនិត្យបរិមាណដែលអាចប្រើបាន',
-        'user_does_not_exist' => 'អ្នកប្រើប្រាស់នោះមិនត្រឹមត្រូវទេ។ សូម​ព្យាយាម​ម្តង​ទៀត។'
+        'user_does_not_exist' => 'អ្នកប្រើប្រាស់នោះមិនត្រឹមត្រូវទេ។ សូម​ព្យាយាម​ម្តង​ទៀត។',
+         'checkout_qty' => array(
+            'lte'  => 'There is currently only one available accessory of this type, and you are trying to check out :checkout_qty. Please adjust the checkout quantity or the total stock of this accessory and try again.|There are :number_currently_remaining total available accessories, and you are trying to check out :checkout_qty. Please adjust the checkout quantity or the total stock of this accessory and try again.',
+            ),
+           
     ),
 
     'checkin' => array(
diff --git a/resources/lang/km-KH/admin/accessories/table.php b/resources/lang/km-KH/admin/accessories/table.php
index 2e457446d1..133c7563da 100644
--- a/resources/lang/km-KH/admin/accessories/table.php
+++ b/resources/lang/km-KH/admin/accessories/table.php
@@ -6,6 +6,4 @@ return array(
     'id'      					=> 'ID',
     'require_acceptance'      	=> 'ការទទួលយក',
     'title'      				=> 'ឈ្មោះគ្រឿងបន្លាស់',
-
-
 );
diff --git a/resources/lang/km-KH/admin/companies/table.php b/resources/lang/km-KH/admin/companies/table.php
index 828f45f7d2..6664fdd922 100644
--- a/resources/lang/km-KH/admin/companies/table.php
+++ b/resources/lang/km-KH/admin/companies/table.php
@@ -2,9 +2,9 @@
 return array(
     'companies' => 'ក្រុមហ៊ុន',
     'create'    => 'បង្កើតក្រុមហ៊ុន',
-    'email'     => 'Company Email',
+    'email'     => 'អ៊ីមែលក្រុមហ៊ុន',
     'title'     => 'ក្រុមហ៊ុន',
-    'phone'     => 'Company Phone',
+    'phone'     => 'ទូរស័ព្ទរបស់ក្រុមហ៊ុន',
     'update'    => 'ធ្វើបច្ចុប្បន្នភាពក្រុមហ៊ុន',
     'name'      => 'ឈ្មោះ​ក្រុម​ហ៊ុន',
     'id'        => 'ID',
diff --git a/resources/lang/km-KH/admin/components/general.php b/resources/lang/km-KH/admin/components/general.php
index b15d89391f..5a112eb7c8 100644
--- a/resources/lang/km-KH/admin/components/general.php
+++ b/resources/lang/km-KH/admin/components/general.php
@@ -2,15 +2,15 @@
 
 return array(
     'component_name'                  => 'ឈ្មោះសមាសធាតុ',
-    'checkin'                             => 'Checkin Component',
-    'checkout'                             => 'Checkout Component',
+    'checkin'                             => 'ប្រគល់មកវិញ សមាសភាគ',
+    'checkout'                             => 'ប្រគល់អោយ សមាសភាគ',
     'cost'				=> 'ការចំណាយលើការទិញ',
-    'create'                             => 'Create Component',
-    'edit'                             => 'Edit Component',
+    'create'                             => 'បង្កើតសមាសភាគ',
+    'edit'                             => 'កែសម្រួលសមាសភាគ',
     'date'					=> 'កាលបរិច្ឆេទទិញ',
     'order'					=> 'លេខបញ្ជាទិញ',
-    'remaining' 			             => 'Remaining',
+    'remaining' 			             => 'នៅសល់',
     'total' 			                 => 'សរុប',
-    'update'                            => 'Update Component',
-    'checkin_limit'            => 'Amount checked in must be equal to or less than :assigned_qty'
+    'update'                            => 'ធ្វើបច្ចុប្បន្នភាព សមាសភាគ',
+    'checkin_limit'            => 'ចំនួនដែលបានប្រគល់មកវិញ ត្រូវតែស្មើនឹង ឬតិចជាង :assigned_qty'
 );
diff --git a/resources/lang/km-KH/admin/components/message.php b/resources/lang/km-KH/admin/components/message.php
index 9bc3700fae..e2900855ef 100644
--- a/resources/lang/km-KH/admin/components/message.php
+++ b/resources/lang/km-KH/admin/components/message.php
@@ -2,34 +2,35 @@
 
 return array(
 
-    'does_not_exist' => 'Component does not exist.',
+    'does_not_exist' => 'សមាសធាតុមិនមានទេ។',
 
     'create' => array(
-        'error'   => 'Component was not created, please try again.',
-        'success' => 'Component created successfully.'
+        'error'   => 'សមាសធាតុមិនត្រូវបានបង្កើតទេ សូមព្យាយាមម្តងទៀត។',
+        'success' => 'សមាសធាតុត្រូវបានបង្កើតដោយជោគជ័យ។'
     ),
 
     'update' => array(
-        'error'   => 'Component was not updated, please try again',
-        'success' => 'Component updated successfully.'
+        'error'   => 'សមាសធាតុមិនត្រូវបានធ្វើបច្ចុប្បន្នភាពទេ សូមព្យាយាមម្តងទៀត',
+        'success' => 'សមាសធាតុត្រូវបានធ្វើបច្ចុប្បន្នភាពដោយជោគជ័យ។'
     ),
 
     'delete' => array(
-        'confirm'   => 'Are you sure you wish to delete this component?',
-        'error'   => 'There was an issue deleting the component. Please try again.',
-        'success' => 'The component was deleted successfully.'
+        'confirm'   => 'តើអ្នកប្រាកដថាចង់លុបសមាសភាគនេះទេ?',
+        'error'   => 'មាន​បញ្ហា​ក្នុង​ការ​លុប​សមាសភាគ។ សូមព្យាយាមម្តងទៀត។',
+        'success' => 'សមាសភាគត្រូវបានលុបដោយជោគជ័យ។',
+        'error_qty'   => 'Some components of this type are still checked out. Please check them in and try again.',
     ),
 
      'checkout' => array(
-        'error'   		=> 'Component was not checked out, please try again',
-        'success' 		=> 'Component checked out successfully.',
+        'error'   		=> 'សមាសធាតុមិនត្រូវបានប្រគល់អោយទេ សូមព្យាយាមម្តងទៀត',
+        'success' 		=> 'សមាសធាតុត្រូវបានប្រគល់អោយដោយជោគជ័យ។',
         'user_does_not_exist' => 'អ្នកប្រើប្រាស់នោះមិនត្រឹមត្រូវទេ។ សូម​ព្យាយាម​ម្តង​ទៀត។',
-        'unavailable'      => 'Not enough components remaining: :remaining remaining, :requested requested ',
+        'unavailable'      => 'មិនមានសមាសធាតុគ្រប់គ្រាន់ទេ៖ :នៅសល់ដែលនៅសល់, :បានស្នើរសុំ ',
     ),
 
     'checkin' => array(
-        'error'   		=> 'Component was not checked in, please try again',
-        'success' 		=> 'Component checked in successfully.',
+        'error'   		=> 'សមាសធាតុមិនត្រូវបានប្រគល់មកវិញទេ សូមព្យាយាមម្តងទៀត',
+        'success' 		=> 'សមាសធាតុបានប្រគល់មកវិញដោយជោគជ័យ។',
         'user_does_not_exist' => 'អ្នកប្រើប្រាស់នោះមិនត្រឹមត្រូវទេ។ សូម​ព្យាយាម​ម្តង​ទៀត។'
     )
 
diff --git a/resources/lang/km-KH/admin/consumables/general.php b/resources/lang/km-KH/admin/consumables/general.php
index 046006b608..6983996b59 100644
--- a/resources/lang/km-KH/admin/consumables/general.php
+++ b/resources/lang/km-KH/admin/consumables/general.php
@@ -3,9 +3,10 @@
 return array(
     'checkout'                          => 'Checkout Consumable to User',
     'consumable_name'                   => 'ឈ្មោះ Consumable',
-    'create'                            => 'Create Consumable',
-    'item_no'                           => 'Item No.',
-    'remaining' 			            => 'Remaining',
+    'create'                            => 'បង្កើតឧបករណ៍ប្រើប្រាស់',
+    'item_no'                           => 'ធាតុលេខ',
+    'remaining' 			            => 'នៅសល់',
     'total' 			                => 'សរុប',
-    'update'                            => 'Update Consumable',
+    'update'                            => 'ធ្វើបច្ចុប្បន្នភាពឧបករណ៍ប្រើប្រាស់',
+    'inventory_warning'                 => 'សារពើភ័ណ្ឌនៃសម្ភារៈប្រើប្រាស់នេះគឺទាបជាងចំនួនអប្បបរមានៃ :min_count',
 );
diff --git a/resources/lang/km-KH/admin/consumables/message.php b/resources/lang/km-KH/admin/consumables/message.php
index 59158d407f..b646ffb24e 100644
--- a/resources/lang/km-KH/admin/consumables/message.php
+++ b/resources/lang/km-KH/admin/consumables/message.php
@@ -2,7 +2,8 @@
 
 return array(
 
-    'does_not_exist' => 'Consumable does not exist.',
+    'invalid_category_type' => 'ប្រភេទត្រូវតែជាប្រភេទប្រើប្រាស់បាន។',
+    'does_not_exist' => 'សម្ភារៈប្រើប្រាស់មិនមានទេ។',
 
     'create' => array(
         'error'   => 'Consumable was not created, please try again.',
diff --git a/resources/lang/km-KH/admin/custom_fields/general.php b/resources/lang/km-KH/admin/custom_fields/general.php
index e98c0273fd..58533c2852 100644
--- a/resources/lang/km-KH/admin/custom_fields/general.php
+++ b/resources/lang/km-KH/admin/custom_fields/general.php
@@ -1,41 +1,41 @@
 <?php
 
 return [
-    'custom_fields'		        => 'Custom Fields',
+    'custom_fields'		        => 'វាលផ្ទាល់ខ្លួន',
     'manage'                    => 'គ្រប់គ្រង',
-    'field'		                => 'Field',
-    'about_fieldsets_title'		=> 'About Fieldsets',
-    'about_fieldsets_text'		=> 'Fieldsets allow you to create groups of custom fields that are frequently re-used for specific asset model types.',
-    'custom_format'             => 'Custom Regex format...',
-    'encrypt_field'      	        => 'Encrypt the value of this field in the database',
-    'encrypt_field_help'      => 'WARNING: Encrypting a field makes it unsearchable.',
-    'encrypted'      	        => 'Encrypted',
+    'field'		                => 'វាល',
+    'about_fieldsets_title'		=> 'អំពី Fieldsets',
+    'about_fieldsets_text'		=> 'Fieldsets អនុញ្ញាតឱ្យអ្នកបង្កើតក្រុមនៃវាលផ្ទាល់ខ្លួនដែលត្រូវបានប្រើឡើងវិញជាញឹកញាប់សម្រាប់ប្រភេទគំរូទ្រព្យសកម្មជាក់លាក់។',
+    'custom_format'             => 'ទម្រង់ Regex ផ្ទាល់ខ្លួន...',
+    'encrypt_field'      	        => 'អ៊ិនគ្រីបតម្លៃនៃវាលនេះនៅក្នុងមូលដ្ឋានទិន្នន័យ',
+    'encrypt_field_help'      => 'ការព្រមាន៖ ការអ៊ិនគ្រីបវាលធ្វើឱ្យវាមិនអាចស្វែងរកបាន។',
+    'encrypted'      	        => 'បានអ៊ិនគ្រីប',
     'fieldset'      	        => 'Fieldset',
-    'qty_fields'      	      => 'Qty Fields',
+    'qty_fields'      	      => 'វាល Qty',
     'fieldsets'      	        => 'Fieldsets',
     'fieldset_name'           => 'Fieldset Name',
-    'field_name'              => 'Field Name',
-    'field_values'            => 'Field Values',
-    'field_values_help'       => 'Add selectable options, one per line. Blank lines other than the first line will be ignored.',
-    'field_element'           => 'Form Element',
-    'field_element_short'     => 'Element',
-    'field_format'            => 'Format',
-    'field_custom_format'     => 'Custom Regex Format',
-    'field_custom_format_help'     => 'This field allows you to use a regex expression for validation. It should start with "regex:" - for example, to validate that a custom field value contains a valid IMEI (15 numeric digits), you would use <code>regex:/^[0-9]{15}$/</code>.',
-    'required'   		          => 'Required',
+    'field_name'              => 'ឈ្មោះវាល',
+    'field_values'            => 'តម្លៃវាល',
+    'field_values_help'       => 'បន្ថែមជម្រើសដែលអាចជ្រើសរើសបាន មួយក្នុងមួយជួរ។ បន្ទាត់ទទេក្រៅពីបន្ទាត់ទីមួយនឹងមិនត្រូវបានអើពើ។',
+    'field_element'           => 'ធាតុទម្រង់',
+    'field_element_short'     => 'ធាតុ',
+    'field_format'            => 'ទម្រង់',
+    'field_custom_format'     => 'ទម្រង់ Regex ផ្ទាល់ខ្លួន',
+    'field_custom_format_help'     => 'វាលនេះអនុញ្ញាតឱ្យអ្នកប្រើកន្សោម regex សម្រាប់សុពលភាព។ វាគួរតែចាប់ផ្តើមដោយ "regex:" - ឧទាហរណ៍ ដើម្បីផ្ទៀងផ្ទាត់ថាតម្លៃវាលផ្ទាល់ខ្លួនមាន IMEI ត្រឹមត្រូវ (15 ខ្ទង់) អ្នកនឹងប្រើ <code>regex:/^[0-9]{15}$/< /code> ។',
+    'required'   		          => 'ទាមទារ',
     'req'   		              => 'Req.',
-    'used_by_models'   		    => 'Used By Models',
-    'order'   		            => 'Order',
+    'used_by_models'   		    => 'ប្រើដោយម៉ូដែល',
+    'order'   		            => 'បញ្ជាទិញ',
     'create_fieldset'         => 'New Fieldset',
     'update_fieldset'         => 'Update Fieldset',
-    'fieldset_does_not_exist'   => 'Fieldset :id does not exist',
+    'fieldset_does_not_exist'   => 'Fieldset : id មិនមានទេ។',
     'fieldset_updated'         => 'Fieldset updated',
     'create_fieldset_title' => 'Create a new fieldset',
     'create_field'            => 'New Custom Field',
     'create_field_title' => 'Create a new custom field',
     'value_encrypted'      	        => 'The value of this field is encrypted in the database. Only admin users will be able to view the decrypted value',
     'show_in_email'     => 'Include the value of this field in checkout emails sent to the user? Encrypted fields cannot be included in emails',
-    'show_in_email_short'     => 'Include in emails.',
+    'show_in_email_short' => 'Include in emails',
     'help_text' => 'Help Text',
     'help_text_description' => 'This is optional text that will appear below the form elements while editing an asset to provide context on the field.',
     'about_custom_fields_title' => 'About Custom Fields',
@@ -43,19 +43,22 @@ return [
     'add_field_to_fieldset' => 'Add Field to Fieldset',
     'make_optional' => 'Required - click to make optional',
     'make_required' => 'Optional - click to make required',
-    'reorder' => 'Reorder',
+    'reorder' => 'តម្រៀបឡើងវិញ',
     'db_field' => 'DB Field',
-    'db_convert_warning' => 'WARNING. This field is in the custom fields table as <code>:db_column</code> but should be <code>:expected</code>.',
-    'is_unique' => 'This value must be unique across all assets',
+    'db_convert_warning' => 'ព្រមាន។ fieldនេះស្ថិតនៅក្នុងតារាងfieldsផ្ទាល់ខ្លួនជា <code>:db_column</code> ប៉ុន្តែគួរតែជា <code>:expected</code>។',
+    'is_unique' => 'តម្លៃនេះត្រូវតែមានតែមួយគត់នៅទូទាំងទ្រព្យសកម្មទាំងអស់។',
     'unique' => 'Unique',
-    'display_in_user_view' => 'Allow the checked out user to view these values in their View Assigned Assets page',
-    'display_in_user_view_table' => 'Visible to User',
-    'auto_add_to_fieldsets' => 'Automatically add this to every new fieldset',
-    'add_to_preexisting_fieldsets' => 'Add to any existing fieldsets',
-    'show_in_listview' => 'Show in list views by default. Authorized users will still be able to show/hide via the column selector',
-    'show_in_listview_short' => 'Show in lists',
-    'show_in_requestable_list_short' => 'Show in requestable assets list',
-    'show_in_requestable_list' => 'Show value in requestable assets list. Encrypted fields will not be shown',
-    'encrypted_options' => 'This field is encrypted, so some display options will not be available.',
+    'display_in_user_view' => 'អនុញ្ញាតឱ្យអ្នកប្រើប្រាស់ដែលបានប្រគល់ អាចមើលតម្លៃទាំងនេះនៅក្នុងទំព័រមើលទ្រព្យសម្បត្តិដែលបានចាត់តាំងរបស់ពួកគេ។',
+    'display_in_user_view_table' => 'អ្នកប្រើប្រាស់អាចមើលឃើញ',
+    'auto_add_to_fieldsets' => 'បន្ថែមវាដោយស្វ័យប្រវត្តិទៅគ្រប់fieldsetថ្មី',
+    'add_to_preexisting_fieldsets' => 'បន្ថែមទៅfieldsetsដែលមានស្រាប់',
+    'show_in_listview' => 'បង្ហាញក្នុងទិដ្ឋភាពបញ្ជីតាមលំនាំដើម។ អ្នកប្រើប្រាស់ដែលមានការអនុញ្ញាតនឹងនៅតែអាចបង្ហាញ/លាក់តាមរយៈឧបករណ៍ជ្រើសរើសជួរឈរ',
+    'show_in_listview_short' => 'បង្ហាញក្នុងបញ្ជី',
+    'show_in_requestable_list_short' => 'បង្ហាញក្នុងបញ្ជីទ្ទ្រព្យសកម្មដែលអាចស្នើសុំបាន។',
+    'show_in_requestable_list' => 'បង្ហាញតម្លៃក្នុងបញ្ជីទ្រព្យសកម្មដែលអាចស្នើសុំបាន។ fields ដែលបានអ៊ិនគ្រីបនឹងមិនត្រូវបានបង្ហាញទេ។',
+    'encrypted_options' => 'Fieldនេះត្រូវបានអ៊ិនគ្រីប ដូច្នេះជម្រើសបង្ហាញមួយចំនួននឹងមិនមានទេ។',
+    'display_checkin' => 'Display in checkin forms',
+    'display_checkout' => 'Display in checkout forms',
+    'display_audit' => 'Display in audit forms',
 
 ];
diff --git a/resources/lang/km-KH/admin/custom_fields/message.php b/resources/lang/km-KH/admin/custom_fields/message.php
index 43ba821821..6442359b7f 100644
--- a/resources/lang/km-KH/admin/custom_fields/message.php
+++ b/resources/lang/km-KH/admin/custom_fields/message.php
@@ -5,6 +5,7 @@ return array(
     'field' => array(
         'invalid'   => 'That field does not exist.',
         'already_added'   => 'Field already added',
+        'none_selected'   => 'No field selected',
 
         'create' => array(
             'error'   => 'Field was not created, please try again.',
diff --git a/resources/lang/km-KH/admin/depreciations/general.php b/resources/lang/km-KH/admin/depreciations/general.php
index 95bf7d99e1..6801d58c5e 100644
--- a/resources/lang/km-KH/admin/depreciations/general.php
+++ b/resources/lang/km-KH/admin/depreciations/general.php
@@ -6,11 +6,15 @@ return [
     'asset_depreciations'  					=> 'ការរំលោះទ្រព្យសកម្ម',
     'create'  					            => 'បង្កើតការរំលោះ',
     'depreciation_name'  					=> 'ឈ្មោះរំលោះ',
-    'depreciation_min'                      => 'Floor Value of Depreciation',
+    'depreciation_min'                      => 'តម្លៃជាន់នៃរំលោះ',
     'number_of_months'  					=> 'ចំនួនខែ',
     'update'  					            => 'ធ្វើបច្ចុប្បន្នភាពការរំលោះ',
     'depreciation_min'                      => 'តម្លៃអប្បបរមាបន្ទាប់ពីការរំលោះ',
-    'no_depreciations_warning'               => '<strong>Warning: </strong>
-                      You do not currently have any depreciations set up.
-                      Please set up at least one depreciation to view the depreciation report.',
+    'no_depreciations_warning'               => '<strong>ការព្រមាន៖ </strong>
+                       បច្ចុប្បន្ន​នេះ អ្នក​មិន​មាន​ការ​កំណត់​ការ​រំលោះ​ទេ។
+                       សូមរៀបចំការរំលោះយ៉ាងហោចណាស់មួយ ដើម្បីមើលរបាយការណ៍រំលោះ។',
+    'depreciation_method'                   => 'របាយការណ៍រំលោះ',
+    'linear_depreciation'                   => 'Linear (Default)',
+    'half_1'                                => 'Half-year convention, always applied',
+    'half_2'                                => 'Half-year convention, applied with condition',
 ];
diff --git a/resources/lang/km-KH/admin/depreciations/table.php b/resources/lang/km-KH/admin/depreciations/table.php
index 7c01c2e984..c7f365c80f 100644
--- a/resources/lang/km-KH/admin/depreciations/table.php
+++ b/resources/lang/km-KH/admin/depreciations/table.php
@@ -6,6 +6,6 @@ return [
     'months'   => 'ខែ',
     'term'   => 'រយៈពេល',
     'title'      => 'ឈ្មោះ ',
-    'depreciation_min' => 'Floor Value',
+    'depreciation_min' => 'តម្លៃជាន់',
 
 ];
diff --git a/resources/lang/km-KH/admin/hardware/form.php b/resources/lang/km-KH/admin/hardware/form.php
index 0824f88773..5d63f5f6bd 100644
--- a/resources/lang/km-KH/admin/hardware/form.php
+++ b/resources/lang/km-KH/admin/hardware/form.php
@@ -23,7 +23,7 @@ return [
     'depreciation'	    => 'ការរំលោះ',
     'depreciates_on'	=> 'ទម្លាក់តម្លៃលើ',
     'default_location'	=> 'ទីតាំងលំនាំដើម',
-    'default_location_phone' => 'Default Location Phone',
+    'default_location_phone' => 'ទូរស័ព្ទទីតាំងលំនាំដើម',
     'eol_date'			=> 'កាលបរិច្ឆេទនៃ EOL',
     'eol_rate'			=> 'អត្រា EOL',
     'expected_checkin'  => 'កាលបរិច្ឆេទដែលរំពឹងទុកនឹង Checkin',
@@ -39,8 +39,8 @@ return [
     'order'				=> 'លេខបញ្ជាទិញ',
     'qr'				=> 'QR Code',
     'requestable'		=> 'អ្នកប្រើប្រាស់អាចស្នើសុំ Asset នេះ',
-    'redirect_to_all'   => 'Return to all :type',
-    'redirect_to_type'   => 'Go to :type',
+    'redirect_to_all'   => 'ត្រឡប់ទៅ ទាំងអស់ វិញ ៖ ប្រភេទ',
+    'redirect_to_type'   => 'ចូលទៅកាន់៖ ប្រភេទ',
     'redirect_to_checked_out_to'   => 'Go to Checked Out to',
     'select_statustype'	=> 'ជ្រើសរើសប្រភេទស្ថានភាព',
     'serial'			=> 'Serial',
@@ -55,8 +55,11 @@ return [
     'asset_location_update_default' => 'ធ្វើបច្ចុប្បន្នភាពតែទីតាំងលំនាំដើមប៉ុណ្ណោះ។',
     'asset_location_update_actual' => 'ធ្វើបច្ចុប្បន្នភាពតែទីតាំងជាក់ស្តែងប៉ុណ្ណោះ។',
     'asset_not_deployable' => 'That asset status is not deployable. This asset cannot be checked out.',
-    'asset_deployable' => 'That status is deployable. This asset can be checked out.',
+    'asset_not_deployable_checkin' => 'That asset status is not deployable. Using this status label will checkin the asset.',
+    'asset_deployable' => 'This asset can be checked out.',
     'processing_spinner' => 'កំពុងដំណើរការ... (វាអាចចំណាយពេលបន្តិចលើឯកសារធំ)',
+    'processing' => 'Processing... ',
     'optional_infos'  => 'ព័ត៌មានមិនសូវចាំបាច់',
-    'order_details'   => 'ព័ត៌មានពាក់ព័ន្ធនឹងការបញ្ជាទិញ'
+    'order_details'   => 'ព័ត៌មានពាក់ព័ន្ធនឹងការបញ្ជាទិញ',
+    'calc_eol'    => 'ប្រសិនបើទុកជាមោឃៈកាលបរិច្ឆេទ EOL ប្រើការគណនា EOL ដោយស្វ័យប្រវត្តិដោយផ្អែកលើកាលបរិច្ឆេទទិញ និងអត្រា EOL ។',
 ];
diff --git a/resources/lang/km-KH/admin/hardware/general.php b/resources/lang/km-KH/admin/hardware/general.php
index 20dab1fe03..2e268aa007 100644
--- a/resources/lang/km-KH/admin/hardware/general.php
+++ b/resources/lang/km-KH/admin/hardware/general.php
@@ -5,17 +5,17 @@ return [
     'about_assets_text'            => 'ទ្រព្យសកម្មគឺជាធាតុដែលតាមដានដោយលេខស៊េរី ឬស្លាកទ្រព្យសម្បត្តិ។ ពួកវាមានទំនោរទៅជាធាតុមានតម្លៃខ្ពស់ជាង ដែលការកំណត់អត្តសញ្ញាណធាតុជាក់លាក់មួយមានសារៈសំខាន់។',
     'archived'  				=> 'ទុកក្នុងប័ណ្ណសារ',
     'asset'  					=> 'ទ្រព្យសកម្ម',
-    'bulk_checkout'             => 'Checkout Assets',
-    'bulk_checkin'              => 'Checkin Assets',
+    'bulk_checkout'             => 'ការបញ្ចេញច្រើន',
+    'bulk_checkin'              => 'Bulk Checkin',
     'checkin'  					=> 'Checkin Asset',
     'checkout'  				=> 'Checkout Asset',
-    'clone'  					=> 'Clone Asset',
+    'clone'  					=> 'ក្លូន ទ្រព្យសកម្ម',
     'deployable'  				=> 'អាចប្រើបាន',
     'deleted'  					=> 'ទ្រព្យសកម្មនេះត្រូវបានលុប។',
     'delete_confirm'            => 'តើអ្នកប្រាកដថាចង់លុបទ្រព្យសម្បត្តិនេះទេ?',
     'edit'  					=> 'កែសម្រួលទ្រព្យសកម្ម',
     'model_deleted'  			=> 'គំរូទ្រព្យសកម្មនេះត្រូវបានលុប។ អ្នក​ត្រូវ​តែ​ស្ដារ​គំរូ​មុន​ពេល​អ្នក​អាច​ស្ដារ​ទ្រព្យសកម្ម។',
-    'model_invalid'             => 'This model for this asset is invalid.',
+    'model_invalid'             => 'គំរូនេះសម្រាប់ទ្រព្យសកម្មនេះមិនត្រឹមត្រូវទេ។',
     'model_invalid_fix'         => 'The asset must be updated use a valid asset model before attempting to check it in or out, or to audit it.',
     'requestable'               => 'អាចស្នើសុំបាន',
     'requested'				    => 'បានស្នើសុំ',
@@ -27,13 +27,12 @@ return [
     'undeployable_tooltip'  	=> 'This asset has a status label that is undeployable and cannot be checked out at this time.',
     'view'  					=> 'មើលទ្រព្យសកម្ម',
     'csv_error' => 'អ្នកមានកំហុសនៅក្នុងឯកសារ CSV របស់អ្នក៖',
-    'import_text' => '<p>Upload a CSV that contains asset history. The assets and users MUST already exist in the system, or they will be skipped. Matching assets for history import happens against the asset tag. We will try to find a matching user based on the user\'s name you provide, and the criteria you select below. If you do not select any criteria below, it will simply try to match on the username format you configured in the <code>Admin &gt; General Settings</code>.</p><p>Fields included in the CSV must match the headers: <strong>Asset Tag, Name, Checkout Date, Checkin Date</strong>. Any additional fields will be ignored. </p><p>Checkin Date: blank or future checkin dates will checkout items to associated user.  Excluding the Checkin Date column will create a checkin date with todays date.</p>
-    ',
-    'csv_import_match_f-l' => 'Try to match users by <strong>firstname.lastname</strong> (<code>jane.smith</code>) format',
-    'csv_import_match_initial_last' => 'Try to match users by <strong>first initial last name</strong> (<code>jsmith</code>) format',
-    'csv_import_match_first' => 'Try to match users by <strong>first name</strong> (<code>jane</code>) format',
-    'csv_import_match_email' => 'Try to match users by <strong>email</strong> as username',
-    'csv_import_match_username' => 'Try to match users by <strong>username</strong>',
+    'import_text' => '<p>Upload a CSV that contains asset history. The assets and users MUST already exist in the system, or they will be skipped. Matching assets for history import happens against the asset tag. We will try to find a matching user based on the user\'s name you provide, and the criteria you select below. If you do not select any criteria below, it will simply try to match on the username format you configured in the <code>Admin &gt; General Settings</code>.</p><p>Fields included in the CSV must match the headers: <strong>Asset Tag, Name, Checkout Date, Checkin Date</strong>. Any additional fields will be ignored. </p><p>Checkin Date: blank or future checkin dates will checkout items to associated user.  Excluding the Checkin Date column will create a checkin date with todays date.</p>    ',
+    'csv_import_match_f-l' => 'ព្យាយាមផ្គូផ្គងអ្នកប្រើប្រាស់តាមទម្រង់ <strong>firstname.lastname</strong> (<code>jane.smith</code>)',
+    'csv_import_match_initial_last' => 'ព្យាយាមផ្គូផ្គងអ្នកប្រើប្រាស់តាមទម្រង់ <strong>នាមត្រកូលដំបូង</strong> (<code>jsmith</code>)',
+    'csv_import_match_first' => 'ព្យាយាមផ្គូផ្គងអ្នកប្រើប្រាស់តាមទម្រង់ <strong>ឈ្មោះដំបូង</strong> (<code>jane</code>)',
+    'csv_import_match_email' => 'ព្យាយាមផ្គូផ្គងអ្នកប្រើប្រាស់តាម <strong>អ៊ីមែល</strong> ជាឈ្មោះអ្នកប្រើប្រាស់',
+    'csv_import_match_username' => 'ព្យាយាមផ្គូផ្គងអ្នកប្រើប្រាស់ដោយ <strong>ឈ្មោះអ្នកប្រើប្រាស់</strong>',
     'error_messages' => 'សារបង្ហាញពីកំហុស៖',
     'success_messages' => 'សារជោគជ័យ៖',
     'alert_details' => 'សូមមើលខាងក្រោមសម្រាប់ព័ត៌មានលម្អិត។',
diff --git a/resources/lang/km-KH/admin/hardware/message.php b/resources/lang/km-KH/admin/hardware/message.php
index 055602f2a8..573f013b6e 100644
--- a/resources/lang/km-KH/admin/hardware/message.php
+++ b/resources/lang/km-KH/admin/hardware/message.php
@@ -2,19 +2,23 @@
 
 return [
 
-    'undeployable' 		=> '<strong>ការព្រមាន៖ </strong> ទ្រព្យសកម្មនេះត្រូវបានសម្គាល់ថាមិនអាចប្រើប្រាស់បាននាពេលបច្ចុប្បន្ន។
-                         ប្រសិនបើស្ថានភាពនេះត្រូវបានផ្លាស់ប្តូរ សូមធ្វើបច្ចុប្បន្នភាពស្ថានភាពទ្រព្យសម្បត្តិ។',
-    'does_not_exist' 	=> 'ទ្រព្យសកម្មមិនមានទេ។',
-    'does_not_exist_var'=> 'Asset with tag :asset_tag not found.',
-    'no_tag' 	        => 'No asset tag provided.',
+    'undeployable' 		 => '<strong>ការព្រមាន៖ </strong> ទ្រព្យសកម្មនេះត្រូវបានសម្គាល់ថាមិនអាចប្រើប្រាស់បាននាពេលបច្ចុប្បន្ន។ ប្រសិនបើស្ថានភាពនេះត្រូវបានផ្លាស់ប្តូរ សូមធ្វើបច្ចុប្បន្នភាពស្ថានភាពទ្រព្យសម្បត្តិ។',
+    'does_not_exist' 	 => 'ទ្រព្យសកម្មមិនមានទេ។',
+    'does_not_exist_var' => 'ទ្រព្យសកម្មដែលមានស្លាក៖ asset_tag រកមិនឃើញទេ។',
+    'no_tag' 	         => 'មិនមានស្លាកទ្រព្យសម្បត្តិត្រូវបានផ្តល់ឱ្យទេ។',
     'does_not_exist_or_not_requestable' => 'ទ្រព្យសកម្មនោះមិនមានទេ ឬមិនអាចស្នើសុំបាន។',
-    'assoc_users'	 	=> 'This asset is currently checked out to a user and cannot be deleted. Please check the asset in first, and then try deleting again. ',
-    'warning_audit_date_mismatch' 	=> 'This asset\'s next audit date (:next_audit_date) is before the last audit date (:last_audit_date). Please update the next audit date.',
+    'assoc_users'	 	 => 'This asset is currently checked out to a user and cannot be deleted. Please check the asset in first, and then try deleting again. ',
+    'warning_audit_date_mismatch' 	=> 'កាលបរិច្ឆេទសវនកម្មបន្ទាប់របស់ទ្រព្យសកម្មនេះ (:next_audit_date) គឺមុនកាលបរិច្ឆេទសវនកម្មចុងក្រោយ (:last_audit_date)។ សូមធ្វើបច្ចុប្បន្នភាពកាលបរិច្ឆេទសវនកម្មបន្ទាប់។',
+    'labels_generated'   => 'ស្លាកត្រូវបានបង្កើតដោយជោគជ័យ។',
+    'error_generating_labels' => 'កំហុសខណៈពេលបង្កើតស្លាក។',
+    'no_assets_selected' => 'មិនបានជ្រើសរើសទ្រព្យសម្បត្តិទេ។',
 
     'create' => [
         'error'   		=> 'ទ្រព្យសកម្មមិនត្រូវបានបង្កើតទេ សូមព្យាយាមម្តងទៀត។ :(',
         'success' 		=> 'ទ្រព្យសកម្មត្រូវបានបង្កើតដោយជោគជ័យ។ :)',
         'success_linked' => 'ទ្រព្យសកម្មជាមួយស្លាក៖ ស្លាកត្រូវបានបង្កើតដោយជោគជ័យ។ <strong><a href=":link" style="color: white;">ចុចទីនេះដើម្បីមើល</a></strong>។',
+        'multi_success_linked' => 'ទ្រព្យសកម្មជាមួយស្លាក៖ តំណត្រូវបានបង្កើតដោយជោគជ័យ។|: ទ្រព្យសម្បត្តិរាប់ត្រូវបានបង្កើតដោយជោគជ័យ។ ៖ តំណភ្ជាប់។',
+        'partial_failure' => 'ទ្រព្យសកម្មមិនអាចបង្កើតបានទេ។ ហេតុផល៖ :failures|:រាប់ទ្រព្យសកម្មមិនអាចបង្កើតបានទេ។ មូលហេតុ៖៖ បរាជ័យ',
     ],
 
     'update' => [
@@ -23,7 +27,7 @@ return [
         'encrypted_warning' => 'Asset updated successfully, but encrypted custom fields were not due to permissions',
         'nothing_updated'	=>  'គ្មាន​វាល​ត្រូវ​បាន​ជ្រើស ដូច្នេះ​មិន​មាន​អ្វី​ត្រូវ​បាន​ធ្វើ​បច្ចុប្បន្នភាព​។',
         'no_assets_selected'  =>  'គ្មានទ្រព្យសម្បត្តិត្រូវបានជ្រើសរើស ដូច្នេះគ្មានអ្វីត្រូវបានធ្វើបច្ចុប្បន្នភាពទេ។',
-        'assets_do_not_exist_or_are_invalid' => 'Selected assets cannot be updated.',
+        'assets_do_not_exist_or_are_invalid' => 'ទ្រព្យសកម្មដែលបានជ្រើសរើសមិនអាចធ្វើបច្ចុប្បន្នភាពបានទេ។',
     ],
 
     'restore' => [
@@ -34,7 +38,7 @@ return [
     ],
 
     'audit' => [
-        'error'   		=> 'Asset audit unsuccessful: :error ',
+        'error'   		=> 'សវនកម្មទ្រព្យសកម្មមិនជោគជ័យ៖ : error ',
         'success' 		=> 'សវនកម្មទ្រព្យសកម្មត្រូវបានកត់ត្រាដោយជោគជ័យ។',
     ],
 
@@ -52,20 +56,24 @@ return [
     ],
 
     'import' => [
-        'error'                 => 'Some items did not import correctly.',
-        'errorDetail'           => 'The following Items were not imported because of errors.',
+        'import_button'         => 'ដំណើរការនាំចូល',
+        'error'                 => 'ធាតុមួយចំនួនមិនបាននាំចូលត្រឹមត្រូវ។',
+        'errorDetail'           => 'ធាតុខាងក្រោមមិនត្រូវបាននាំចូលទេ ដោយសារមានកំហុស។',
         'success'               => 'ឯកសាររបស់អ្នកត្រូវបាននាំចូល',
         'file_delete_success'   => 'ឯកសាររបស់អ្នកត្រូវបានលុបដោយជោគជ័យ',
         'file_delete_error'      => 'ឯកសារមិនអាចលុបបានទេ។',
         'file_missing' => 'បាត់ឯកសារដែលបានជ្រើសរើស',
+        'file_already_deleted' => 'ឯកសារដែលបានជ្រើសរើសត្រូវបានលុបរួចហើយ',
         'header_row_has_malformed_characters' => 'គុណលក្ខណៈមួយ ឬច្រើននៅក្នុងជួរបឋមកថាមានតួអក្សរ UTF-8 ខុសទម្រង់',
         'content_row_has_malformed_characters' => 'គុណលក្ខណៈមួយ ឬច្រើននៅក្នុងជួរទីមួយនៃមាតិកាមានតួអក្សរ UTF-8 ខុសទម្រង់',
+        'transliterate_failure' => 'Transliteration from :encoding to UTF-8 failed due to invalid characters in input'
     ],
 
 
     'delete' => [
         'confirm'   	=> 'តើអ្នកប្រាកដថាចង់លុបទ្រព្យសម្បត្តិនេះទេ?',
         'error'   		=> 'មានបញ្ហាក្នុងការលុបទ្រព្យសម្បត្តិ។ សូម​ព្យាយាម​ម្តង​ទៀត។',
+        'assigned_to_error' => '{1}Asset Tag: :asset_tag is currently checked out. Check in this device before deletion.|[2,*]Asset Tags: :asset_tag are currently checked out. Check in these devices before deletion.',
         'nothing_updated'   => 'មិនមានទ្រព្យសម្បត្តិត្រូវបានជ្រើសរើស ដូច្នេះគ្មានអ្វីត្រូវបានលុបទេ។',
         'success' 		=> 'ទ្រព្យសកម្មត្រូវបានលុបដោយជោគជ័យ។',
     ],
@@ -78,6 +86,11 @@ return [
         'no_assets_selected' => 'អ្នកត្រូវតែជ្រើសរើសយ៉ាងហោចណាស់ទ្រព្យសកម្មមួយពីបញ្ជី',
     ],
 
+    'multi-checkout' => [
+        'error'   => 'Asset was not checked out, please try again|Assets were not checked out, please try again',
+        'success' => 'Asset checked out successfully.|Assets checked out successfully.',
+    ],
+
     'checkin' => [
         'error'   		=> 'ទ្រព្យសកម្មមិនត្រូវ checked in ទេ, សូមព្យាយាមម្តងទៀត',
         'success' 		=> 'ទ្រព្យសកម្មបាន checked in ជោគជ័យ។',
@@ -87,9 +100,10 @@ return [
     ],
 
     'requests' => [
-        'error'   		=> 'ទ្រព្យសកម្មមិនត្រូវបានស្នើសុំទេ, សូមព្យាយាមម្តងទៀត',
-        'success' 		=> 'ទ្រព្យសកម្មបានស្នើសុំដោយជោគជ័យ។',
-        'canceled'      => 'សំណើ Checkout ត្រូវបានលុបចោលដោយជោគជ័យ',
+        'error'   		=> 'Request was not successful, please try again.',
+        'success' 		=> 'Request successfully submitted.',
+        'canceled'      => 'Request successfully canceled.',
+        'cancel'        => 'បោះបង់ការស្នើសុំធាតុនេះ។',
     ],
 
 ];
diff --git a/resources/lang/km-KH/admin/hardware/table.php b/resources/lang/km-KH/admin/hardware/table.php
index 3e8bea24dc..c090d98f58 100644
--- a/resources/lang/km-KH/admin/hardware/table.php
+++ b/resources/lang/km-KH/admin/hardware/table.php
@@ -5,12 +5,12 @@ return [
     'asset_tag'   	=> 'ស្លាកទ្រព្យសម្បត្តិ',
     'asset_model'       => 'គំរូ',
     'assigned_to'   => 'ចាត់តាំងទៅ',
-    'book_value'  	=> 'Current Value',
+    'book_value'  	=> 'តម្លៃបច្ចុប្បន្ន',
     'change' 		=> 'In/Out',
     'checkout_date' => 'ថ្ងៃប្រគល់អោយ',
     'checkoutto' 	=> 'Checked Out',
     'components_cost' => 'Total Components Cost',
-    'current_value' => 'Current Value',
+    'current_value' => 'តម្លៃបច្ចុប្បន្ន',
     'diff' 			=> 'Diff',
     'dl_csv' 		=> 'ទាញយក CSV',
     'eol' 			=> 'EOL',
@@ -18,16 +18,15 @@ return [
     'last_checkin_date' => 'Last Checkin Date',
     'location' 		=> 'ទីតាំង',
     'purchase_cost'	=> 'ការចំណាយ',
-    'purchase_date'	=> 'Purchased',
+    'purchase_date'	=> 'បានទិញ',
     'serial'   		=> 'Serial',
     'status'   		=> 'ស្ថានភាព',
     'title'      	=> 'ទ្រព្យសកម្ម ',
-    'image'		    => 'Device Image',
-    'days_without_acceptance' => 'Days Without Acceptance',
-    'monthly_depreciation' => 'Monthly Depreciation',
-    'assigned_to'    => 'ចាត់តាំងទៅ',
-    'requesting_user' => 'Requesting User',
-    'requested_date' => 'Requested Date',
-    'changed'       => 'Changed',
-    'icon' => 'Icon',
+    'image'		    => 'រូបភាពឧបករណ៍',
+    'days_without_acceptance' => 'ថ្ងៃដែលគ្មានការទទួលយក',
+    'monthly_depreciation' => 'ការរំលោះប្រចាំខែ',
+    'requesting_user' => 'ស្នើសុំអ្នកប្រើប្រាស់',
+    'requested_date' => 'កាលបរិច្ឆេទដែលបានស្នើសុំ',
+    'changed'       => 'បានផ្លាស់ប្តូរ',
+    'icon' => 'រូបតំណាង',
 ];
diff --git a/resources/lang/km-KH/admin/kits/general.php b/resources/lang/km-KH/admin/kits/general.php
index f57fb645c4..469d59d6c8 100644
--- a/resources/lang/km-KH/admin/kits/general.php
+++ b/resources/lang/km-KH/admin/kits/general.php
@@ -1,11 +1,11 @@
 <?php
 
 return [
-    'about_kits_title'                  => 'About Predefined Kits',
+    'about_kits_title'                  => 'អំពីកញ្ចប់ដែលបានកំណត់ជាមុន',
     'about_kits_text'                   => 'Predefined Kits let you quickly check out a collection of items (assets, licenses, etc) to a user. This can be helpful when your onboarding process is consistent across many users and all users receive the same items.',
     'checkout'                          => 'Checkout Kit ',
-    'create_success'                    => 'Kit was successfully created.',
-    'create'                            => 'Create Predefined Kit',
+    'create_success'                    => 'កញ្ចប់ត្រូវបានបង្កើតដោយជោគជ័យ។',
+    'create'                            => 'បង្កើតកញ្ចប់ដែលបានកំណត់ជាមុន',
     'update'                            => 'Update Predefined Kit',
     'delete_success'                    => 'Kit was successfully deleted.',
     'update_success'                    => 'Kit was successfully updated.',
@@ -47,4 +47,5 @@ return [
     'kit_deleted'                       => 'Kit was successfully deleted',
     'kit_model_updated'                 => 'Model was successfully updated',
     'kit_model_detached'                => 'Model was successfully detached',
+    'model_already_attached'            => 'Model already attached to kit',
 ];
diff --git a/resources/lang/km-KH/admin/labels/table.php b/resources/lang/km-KH/admin/labels/table.php
index 7af46dacc7..ac8415c6ed 100644
--- a/resources/lang/km-KH/admin/labels/table.php
+++ b/resources/lang/km-KH/admin/labels/table.php
@@ -1,19 +1,19 @@
 <?php
 
 return [
-    'example_company'    => 'Test Company Limited',
-    'example_defaultloc' => 'Building 1',
+    'example_company'    => 'ក្រុមហ៊ុន Test Limited',
+    'example_defaultloc' => 'អាគារ 1',
     'example_category'   => 'Test Category',
-    'example_location'   => 'Building 2',
+    'example_location'   => 'អគារ 2',
     'example_manufacturer'  => 'Test Manufacturing Inc.',
-    'example_model'      => 'Test Model',
-    'example_supplier'   => 'Test Company Limited',
+    'example_model'      => 'គំរូសាកល្បង',
+    'example_supplier'   => 'ក្រុមហ៊ុន Test Limited',
     'labels_per_page'    => 'ស្លាក',
     'support_fields'     => 'Fields',
     'support_asset_tag'  => 'Tag',
     'support_1d_barcode' => '1D',
     'support_2d_barcode' => '2D',
-    'support_logo'       => 'Logo',
+    'support_logo'       => 'និមិត្តសញ្ញា',
     'support_title'      => 'ចំណងជើង',
 
 ];
\ No newline at end of file
diff --git a/resources/lang/km-KH/admin/licenses/general.php b/resources/lang/km-KH/admin/licenses/general.php
index 73770ee0b7..90d83411e1 100644
--- a/resources/lang/km-KH/admin/licenses/general.php
+++ b/resources/lang/km-KH/admin/licenses/general.php
@@ -14,6 +14,7 @@ return array(
     'info'  					=> 'ព័ត៌មានអាជ្ញាប័ណ្ណ',
     'license_seats'  			=> 'ចំនួនអាជ្ញាប័ណ្ណ',
     'seat'  					=> 'ចំនួន',
+    'seat_count'  				=> 'Seat :count',
     'seats'  					=> 'កៅអី',
     'software_licenses'  		=> 'អាជ្ញាប័ណ្ណកម្មវិធី',
     'user'  					=> 'អ្នក​ប្រើ',
@@ -23,12 +24,12 @@ return array(
         [
             'checkin_all'           => [
                 'button'            => 'Checkin All Seats',
-                'modal'             => 'This will action checkin one seat. | This action will checkin all :checkedout_seats_count seats for this license.',
+                'modal'             => 'This action will checkin one seat. | This action will checkin all :checkedout_seats_count seats for this license.',
                 'enabled_tooltip'   => 'Checkin ALL seats for this license from both users and assets',
                 'disabled_tooltip'  => 'This is disabled because there are no seats currently checked out',
                 'disabled_tooltip_reassignable'  => 'This is disabled because the License is not reassignable',
                 'success'           => 'License successfully checked in! | All licenses were successfully checked in!',
-                'log_msg'           => 'Checked in via bulk license checkout in license GUI',
+                'log_msg'           => 'Checked in via bulk license checkin in license GUI',
             ],
 
             'checkout_all'              => [
diff --git a/resources/lang/km-KH/admin/licenses/message.php b/resources/lang/km-KH/admin/licenses/message.php
index c0d06bb1fc..cb7d2e1c10 100644
--- a/resources/lang/km-KH/admin/licenses/message.php
+++ b/resources/lang/km-KH/admin/licenses/message.php
@@ -44,10 +44,13 @@ return array(
         'error'   => 'There was an issue checking out the license. Please try again.',
         'success' => 'The license was checked out successfully',
         'not_enough_seats' => 'Not enough license seats available for checkout',
+        'mismatch' => 'The license seat provided does not match the license',
+        'unavailable' => 'This seat is not available for checkout.',
     ),
 
     'checkin' => array(
         'error'   => 'There was an issue checking in the license. Please try again.',
+        'not_reassignable' => 'License not reassignable',
         'success' => 'The license was checked in successfully'
     ),
 
diff --git a/resources/lang/km-KH/admin/licenses/table.php b/resources/lang/km-KH/admin/licenses/table.php
index 1e5fc65865..fb6211a481 100644
--- a/resources/lang/km-KH/admin/licenses/table.php
+++ b/resources/lang/km-KH/admin/licenses/table.php
@@ -9,7 +9,7 @@ return array(
     'license_email'   	=> 'License Email',
     'license_name'   	=> 'Licensed To',
     'purchase_date'   	=> 'កាលបរិច្ឆេទទិញ',
-    'purchased'   		=> 'Purchased',
+    'purchased'   		=> 'បានទិញ',
     'seats'   			=> 'កៅអី',
     'hardware'   		=> 'Hardware',
     'serial'   			=> 'Serial',
diff --git a/resources/lang/km-KH/admin/locations/message.php b/resources/lang/km-KH/admin/locations/message.php
index 326cd97930..93006c7893 100644
--- a/resources/lang/km-KH/admin/locations/message.php
+++ b/resources/lang/km-KH/admin/locations/message.php
@@ -3,11 +3,12 @@
 return array(
 
     'does_not_exist' => 'ទីតាំងមិនមានទេ។',
-    'assoc_users'    => 'This location is not currently deletable because it is the location of record for at least one asset or user, has assets assigned to it, or is the parent location of another location. Please update your models to no longer reference this company and try again. ',
+    'assoc_users'    => 'This location is not currently deletable because it is the location of record for at least one asset or user, has assets assigned to it, or is the parent location of another location. Please update your records to no longer reference this location and try again ',
     'assoc_assets'	 => 'បច្ចុប្បន្នទីតាំងនេះត្រូវបានភ្ជាប់ជាមួយទ្រព្យសកម្មយ៉ាងហោចណាស់មួយ ហើយមិនអាចលុបបានទេ។ សូមអាប់ដេតទ្រព្យសកម្មរបស់អ្នក ដើម្បីកុំឱ្យយោងទីតាំងនេះតទៅទៀត ហើយព្យាយាមម្តងទៀត។ ',
-    'assoc_child_loc'	 => 'This location is currently the parent of at least one child location and cannot be deleted. Please update your locations to no longer reference this location and try again. ',
+    'assoc_child_loc'	 => 'បច្ចុប្បន្នទីតាំងនេះគឺជាមេនៃទីតាំងកូនយ៉ាងហោចណាស់មួយ ហើយមិនអាចលុបបានទេ។ សូម​ធ្វើ​បច្ចុប្បន្នភាព​ទីតាំង​របស់​អ្នក​ដើម្បី​លែង​យោង​ទីតាំង​នេះ​ទៀត​ហើយ​ព្យាយាម​ម្ដង​ទៀត។ ',
     'assigned_assets' => 'ទ្រព្យសកម្មដែលបានចាត់តាំង',
     'current_location' => 'ទីតាំង​បច្ចុប្បន្',
+    'open_map' => 'បើកនៅក្នុង៖map_provider_icon ផែនទី',
 
 
     'create' => array(
@@ -20,6 +21,11 @@ return array(
         'success' => 'បានធ្វើបច្ចុប្បន្នភាពទីតាំងដោយជោគជ័យ។'
     ),
 
+    'restore' => array(
+        'error'   => 'ទីតាំងមិនត្រូវបានស្ដារឡើងវិញទេ សូមព្យាយាមម្តងទៀត',
+        'success' => 'បានស្ដារទីតាំងឡើងវិញដោយជោគជ័យ។'
+    ),
+
     'delete' => array(
         'confirm'   	=> 'តើអ្នកប្រាកដថាចង់លុបទីតាំងនេះទេ?',
         'error'   => 'មានបញ្ហាក្នុងការលុបទីតាំង។ សូម​ព្យាយាម​ម្តង​ទៀត។',
diff --git a/resources/lang/km-KH/admin/locations/table.php b/resources/lang/km-KH/admin/locations/table.php
index a8119ee74e..26582e581a 100644
--- a/resources/lang/km-KH/admin/locations/table.php
+++ b/resources/lang/km-KH/admin/locations/table.php
@@ -4,39 +4,40 @@ return [
     'about_locations_title'     => 'ទីតាំងត្រូវបានលុបដោយជោគជ័យ។',
     'about_locations'           => 'ទីតាំងត្រូវបានលុបដោយជោគជ័យ។',
     'assets_rtd'                => 'ទ្រព្យសកម្ម', // This has NEVER meant Assets Retired. I don't know how it keeps getting reverted.
-    'assets_checkedout'         => 'Assets Assigned',
+    'assets_checkedout'         => 'ទ្រព្យសម្បត្តិដែលបានចាត់តាំង',
     'id'                        => 'លេខសម្គាល់',
     'city'                      => 'ទីក្រុង',
     'state'                     => 'រដ្ឋ',
     'country'                   => 'ប្រទេស',
-    'create'                    => 'Create Location',
-    'update'                    => 'Update Location',
-    'print_assigned'            => 'Print Assigned',
+    'create'                    => 'បង្កើតទីតាំង',
+    'update'                    => 'ធ្វើបច្ចុប្បន្នភាពទីតាំង',
+    'print_assigned'            => 'បោះពុម្ពដែលបានកំណត់',
     'print_all_assigned'        => 'បោះពុម្ពដែលបានចាត់តាំងទាំងអស់។',
-    'name'                      => 'Location Name',
+    'name'                      => 'ឈ្មោះទីតាំង',
     'address'                   => 'អាស័យដ្ឋាន',
-    'address2'                   => 'Address Line 2',
-    'zip'                       => 'Postal Code',
+    'address2'                   => 'អាស័យដ្ឋាន ខ្សែទី 2',
+    'zip'                       => 'លេខកូដប្រៃសណីយ៍',
     'locations'                 => 'ទីតាំង',
     'parent'                    => 'Parent',
-    'currency'                  => 'Location Currency',
-    'ldap_ou'                   => 'LDAP Search OU',
-    'user_name'                 => 'User Name',
+    'currency'                  => 'ទីតាំងរូបិយប័ណ្ណ',
+    'ldap_ou'                   => 'LDAP ស្វែងរក OU',
+    'user_name'                 => 'ឈ្មោះអ្នកប្រើប្រាស់',
     'department'                => 'នាយកដ្ឋាន',
     'location'                  => 'ទីតាំង',
-    'asset_tag'                 => 'Assets Tag',
+    'asset_tag'                 => 'ស្លាកទ្រព្យសម្បត្តិ',
     'asset_name'                => 'ឈ្មោះ',
     'asset_category'            => 'ប្រភេទ',
     'asset_manufacturer'        => 'ក្រុមហ៊ុនផលិត',
     'asset_model'               => 'គំរូ',
     'asset_serial'              => 'Serial',
     'asset_location'            => 'ទីតាំង',
-    'asset_checked_out'         => 'Checked Out',
-    'asset_expected_checkin'    => 'Expected Checkin',
+    'asset_checked_out'         => 'បានប្រគល់',
+    'asset_expected_checkin'    => 'រំពឹងទុក Checkin',
     'date'                      => 'កាលបរិច្ឆេទ:',
-    'phone'                     => 'Location Phone',
-    'signed_by_asset_auditor'   => 'Signed By (Asset Auditor):',
-    'signed_by_finance_auditor' => 'Signed By (Finance Auditor):',
-    'signed_by_location_manager' => 'Signed By (Location Manager):',
-    'signed_by'                 => 'Signed Off By:',
+    'phone'                     => 'ទូរស័ព្ទទីតាំង',
+    'signed_by_asset_auditor'   => 'ចុះហត្ថលេខាដោយ (Asset Auditor)៖',
+    'signed_by_finance_auditor' => 'ចុះហត្ថលេខាដោយ (សវនករហិរញ្ញវត្ថុ)៖',
+    'signed_by_location_manager' => 'ចុះហត្ថលេខាដោយ (អ្នកគ្រប់គ្រងទីតាំង)៖',
+    'signed_by'                 => 'ចុះហត្ថលេខាបិទដោយ៖',
+    'clone'  					=> 'Clone Location',
 ];
diff --git a/resources/lang/km-KH/admin/manufacturers/table.php b/resources/lang/km-KH/admin/manufacturers/table.php
index df895f84aa..148b68d0ee 100644
--- a/resources/lang/km-KH/admin/manufacturers/table.php
+++ b/resources/lang/km-KH/admin/manufacturers/table.php
@@ -10,7 +10,7 @@ return array(
     'support_email'   		=> 'គាំទ្រអ៊ីម៉ែល',
     'support_phone'   		=> 'ទូរស័ព្ទគាំទ្រ',
     'support_url'   		=> 'គាំទ្រ URL',
-    'warranty_lookup_url'   => 'Warranty Lookup URL',
+    'warranty_lookup_url'   => 'URL រកមើលការធានា',
     'update'				=> 'ធ្វើបច្ចុប្បន្នភាពក្រុមហ៊ុនផលិត',
 
 );
diff --git a/resources/lang/km-KH/admin/models/general.php b/resources/lang/km-KH/admin/models/general.php
index 9cbb26024a..b53d1bce81 100644
--- a/resources/lang/km-KH/admin/models/general.php
+++ b/resources/lang/km-KH/admin/models/general.php
@@ -3,7 +3,7 @@
 return array(
     'about_models_title'     => 'អំពី Asset Models',
     'about_models_text'           => 'Asset Models គឺជាវិធីមួយសម្រាប់ដាក់ក្រុមទ្រព្យសកម្មដូចគ្នា។ "MBP 2013", "IPhone 6s" ជាដើម។',
-    'deleted'  					        => 'ម៉ូដែលនេះត្រូវបានលុប។',
+    'deleted'  					=> 'ម៉ូដែលនេះត្រូវបានលុប។',
     'bulk_delete'               => 'ភាគច្រើនលុបគំរូទ្រព្យសកម្ម',
     'bulk_delete_help'               => 'ប្រើប្រអប់ធីកខាងក្រោមដើម្បីបញ្ជាក់ការលុបគំរូទ្រព្យសកម្មដែលបានជ្រើសរើស។ គំរូទ្រព្យសកម្មដែលមានទ្រព្យសកម្មដែលភ្ជាប់ជាមួយពួកវាមិនអាចលុបបានទេ រហូតទាល់តែទ្រព្យសកម្មត្រូវបានភ្ជាប់ជាមួយគំរូផ្សេង។',
     'bulk_delete_warn'          => 'អ្នកហៀបនឹងលុបគំរូទ្រព្យសកម្មមួយ។|អ្នកហៀបនឹងលុប៖ model_count គំរូទ្រព្យសកម្ម។',
diff --git a/resources/lang/km-KH/admin/models/message.php b/resources/lang/km-KH/admin/models/message.php
index 10ad33e85d..3115365002 100644
--- a/resources/lang/km-KH/admin/models/message.php
+++ b/resources/lang/km-KH/admin/models/message.php
@@ -7,7 +7,7 @@ return array(
     'no_association' => 'ព្រមាន! គំរូទ្រព្យសកម្មសម្រាប់ធាតុនេះមិនត្រឹមត្រូវ ឬបាត់!',
     'no_association_fix' => 'វា​នឹង​បំបែក​រឿង​ក្នុង​វិធី​ចម្លែក និង​គួរ​ឲ្យ​រន្ធត់។ កែសម្រួលទ្រព្យសកម្មនេះឥឡូវនេះ ដើម្បីចាត់ឱ្យវាជាគំរូមួយ។',
     'assoc_users'	 => 'បច្ចុប្បន្ន ម៉ូដែលនេះត្រូវបានភ្ជាប់ជាមួយទ្រព្យសកម្មមួយ ឬច្រើន ហើយមិនអាចលុបបានទេ។ សូមលុបទ្រព្យសម្បត្តិ ហើយបន្ទាប់មកព្យាយាមលុបម្តងទៀត។ ',
-
+    'invalid_category_type' => 'ប្រភេទនេះត្រូវតែជាប្រភេទទ្រព្យសកម្ម។',
 
     'create' => array(
         'error'   => 'គំរូមិនត្រូវបានបង្កើតទេ សូមព្យាយាមម្តងទៀត។',
@@ -34,7 +34,7 @@ return array(
     'bulkedit' => array(
         'error'   		=> 'គ្មាន fields ត្រូវបានផ្លាស់ប្តូរ ដូច្នេះគ្មានអ្វីត្រូវបានធ្វើបច្ចុប្បន្នភាពទេ។',
         'success' 		=> 'បានធ្វើបច្ចុប្បន្នភាពគំរូដោយជោគជ័យ។ |:model_count model បានធ្វើបច្ចុប្បន្នភាពដោយជោគជ័យ។',
-        'warn'          => 'You are about to update the properties of the following model:|You are about to edit the properties of the following :model_count models:',
+        'warn'          => 'អ្នកហៀបនឹងធ្វើបច្ចុប្បន្នភាពលក្ខណសម្បត្តិនៃគំរូខាងក្រោម៖|អ្នករៀបនឹងកែសម្រួលលក្ខណសម្បត្តិដូចខាងក្រោម៖ model_count models៖',
 
     ),
 
diff --git a/resources/lang/km-KH/admin/reports/general.php b/resources/lang/km-KH/admin/reports/general.php
index f09f8f2629..479b6f3eff 100644
--- a/resources/lang/km-KH/admin/reports/general.php
+++ b/resources/lang/km-KH/admin/reports/general.php
@@ -4,6 +4,7 @@ return [
     'info'   => 'ជ្រើសរើសជម្រើសដែលអ្នកចង់បានសម្រាប់របាយការណ៍ទ្រព្យសកម្មរបស់អ្នក។',
     'deleted_user' => 'អ្នកប្រើប្រាស់ដែលបានលុប',
     'send_reminder' => 'ផ្ញើការរំលឹក',
+    'cannot_send_reminder' => 'User has been deleted or does not have an email address so cannot receive a reminder',
     'reminder_sent' => 'បានផ្ញើការរំលឹក',
     'acceptance_deleted' => 'បានលុបសំណើទទួលយក',
     'acceptance_request' => 'សំណើទទួលយក',
@@ -13,5 +14,10 @@ return [
         'user_state' => 'រដ្ឋអ្នកប្រើប្រាស់',
         'user_country' => 'ប្រទេសអ្នកប្រើប្រាស់',
         'user_zip' => 'លេខ​កូដ​អ្នក​ប្រើ'
-    ]
-];
\ No newline at end of file
+    ],
+    'open_saved_template' => 'បើកគំរូដែលបានរក្សាទុក',
+    'save_template' =>  'រក្សាទុកគំរូ',
+    'select_a_template' => 'ជ្រើសរើសគំរូមួយ។',
+    'template_name' => 'ឈ្មោះគំរូ',
+    'update_template' => 'ធ្វើបច្ចុប្បន្នភាពគំរូ',
+];
diff --git a/resources/lang/km-KH/admin/reports/message.php b/resources/lang/km-KH/admin/reports/message.php
index 5530de8f3d..c09c30c0d6 100644
--- a/resources/lang/km-KH/admin/reports/message.php
+++ b/resources/lang/km-KH/admin/reports/message.php
@@ -1,5 +1,16 @@
 <?php
 
-return array(
-    'error'   => 'អ្នកត្រូវតែជ្រើសរើសយ៉ាងហោចណាស់ជម្រើសមួយ។'
-);
+return [
+    'about_templates' => 'អំពីគំរូដែលបានរក្សាទុក',
+    'saving_templates_description' => 'ជ្រើសរើសជម្រើសរបស់អ្នក បន្ទាប់មកបញ្ចូលឈ្មោះគំរូរបស់អ្នកក្នុងប្រអប់ខាងលើ ហើយចុចប៊ូតុង \'រក្សាទុកគំរូ\'។ ប្រើបញ្ជីទម្លាក់ចុះដើម្បីជ្រើសរើសគំរូដែលបានរក្សាទុកពីមុន។',
+    'create'  => [
+        'success' => 'គំរូត្រូវបានរក្សាទុកដោយជោគជ័យ',
+    ],
+    'update' => [
+        'success' => 'បានធ្វើបច្ចុប្បន្នភាពគំរូដោយជោគជ័យ',
+    ],
+    'delete' => [
+        'success' => 'គំរូត្រូវបានលុប',
+        'no_delete_permission' => 'មិនមានគំរូឬអ្នកមិនមានសិទ្ធិលុបវាទេ។',
+    ],
+];
diff --git a/resources/lang/km-KH/admin/settings/general.php b/resources/lang/km-KH/admin/settings/general.php
index 96ac502e83..59ea6dda9c 100644
--- a/resources/lang/km-KH/admin/settings/general.php
+++ b/resources/lang/km-KH/admin/settings/general.php
@@ -8,16 +8,16 @@ return [
     'ad_append_domain'          => 'បន្ថែមឈ្មោះដែនទៅវាលឈ្មោះអ្នកប្រើប្រាស់',
     'ad_append_domain_help'     => 'អ្នក​ប្រើ​មិន​ត្រូវ​បាន​តម្រូវ​ឱ្យ​សរសេរ "username@domain.local" ទេ ពួកគេ​គ្រាន់តែ​វាយ​ពាក្យ "username"។',
     'admin_cc_email'            => 'CC អ៊ីមែល',
-    'admin_cc_email_help'       => 'ប្រសិនបើ​អ្នក​ចង់​ផ្ញើ​ច្បាប់​ចម្លង​នៃ​អ៊ីមែល checkin​/​checkout ​ដែល​ត្រូវ​បាន​ផ្ញើ​ទៅ​អ្នក​ប្រើ​ទៅកាន់​គណនី​អ៊ីមែល​បន្ថែម សូម​បញ្ចូល​វា​នៅទីនេះ។ បើមិនដូច្នោះទេទុក field នេះឱ្យនៅទទេ។',
+    'admin_cc_email_help'       => 'Send a copy of checkin/checkout emails to this address.',
     'admin_settings'            => 'ការកំណត់អ្នកគ្រប់គ្រង',
     'is_ad'				        => 'នេះគឺជាម៉ាស៊ីនមេ Active Directory',
     'alerts'                	=> 'ការជូនដំណឹង',
     'alert_title'               => 'ធ្វើបច្ចុប្បន្នភាពការកំណត់ការជូនដំណឹង',
     'alert_email'				=> 'ផ្ញើការជូនដំណឹងទៅ',
-    'alert_email_help'    => 'អាសយដ្ឋានអ៊ីមែល ឬបញ្ជីចែកចាយដែលអ្នកចង់ឱ្យការជូនដំណឹងត្រូវបានផ្ញើទៅដោយសញ្ញាក្បៀស',
+    'alert_email_help'          => 'អាសយដ្ឋានអ៊ីមែល ឬបញ្ជីចែកចាយដែលអ្នកចង់ឱ្យការជូនដំណឹងត្រូវបានផ្ញើទៅដោយសញ្ញាក្បៀស.',
     'alerts_enabled'			=> 'បានបើកការជូនដំណឹងតាមអ៊ីមែល',
-    'alert_interval'			=> 'Expiring Alerts Threshold (in days)',
-    'alert_inv_threshold'		=> 'Inventory Alert Threshold',
+    'alert_interval'			=> 'កម្រិតជូនដំណឹងអំពីការផុតកំណត់ (ជាច្រើនថ្ងៃ)',
+    'alert_inv_threshold'		=> 'កម្រិតជូនដំណឹងស្តុក',
     'allow_user_skin'           => 'Allow User Skin',
     'allow_user_skin_help_text' => 'Checking this box will allow a user to override the UI skin with a different one.',
     'asset_ids'					=> 'លេខសម្គាល់ទ្រព្យសកម្ម',
@@ -31,129 +31,140 @@ return [
     'backups'					=> 'ការបម្រុងទុក',
     'backups_help'              => 'បង្កើត ទាញយក និងស្ដារការបម្រុងទុក ',
     'backups_restoring'         => 'ការស្ដារឡើងវិញពីការបម្រុងទុក',
+    'backups_clean' => 'សម្អាតមូលដ្ឋានទិន្នន័យដែលបានបម្រុងទុកមុនពេលស្តារឡើងវិញ',
+    'backups_clean_helptext' => "វាអាចមានប្រយោជន៍ប្រសិនបើអ្នកកំពុងផ្លាស់ប្តូររវាងកំណែមូលដ្ឋានទិន្នន័យ",
     'backups_upload'            => 'ផ្ទុកឡើងការបម្រុងទុក',
     'backups_path'              => 'ការបម្រុងទុកនៅលើម៉ាស៊ីនមេត្រូវបានរក្សាទុកក្នុង <code>:path</code>',
-    'backups_restore_warning'   => 'ប្រើប៊ូតុងស្ដារ <small><span class="btn btn-xs btn-warning"><i class="text-white fas fa-retweet" aria-hidden="true"></i></span> </small> ដើម្បីស្តារពីការបម្រុងទុកពីមុន។ (បច្ចុប្បន្នវាមិនដំណើរការជាមួយការផ្ទុកឯកសារ S3 ឬ Docker ទេ។)<br><br>មូលដ្ឋានទិន្នន័យ <strong>ទាំងមូល :app_name របស់អ្នក និងឯកសារដែលបានផ្ទុកឡើងណាមួយនឹងត្រូវបានជំនួសទាំងស្រុង</strong> ដោយអ្វីដែលមាននៅក្នុងឯកសារបម្រុងទុក។  ',
+    'backups_restore_warning'   => 'Use the restore button <small><span class="btn btn-xs btn-warning"><i class="text-white fas fa-retweet" aria-hidden="true"></i></span></small> to restore from a previous backup. (This does not currently work with S3 file storage or Docker.)<br><br>Your <strong>entire :app_name database and any uploaded files will be completely replaced</strong> by what\'s in the backup file  ',
     'backups_logged_out'         => 'អ្នក​ប្រើ​ដែល​មាន​ស្រាប់​ទាំង​អស់ រួម​ទាំង​អ្នក​នឹង​ត្រូវ​បានចាក​ចេញ​នៅ​ពេល​ដែល​ការ​ស្ដារ​របស់​អ្នក​ត្រូវ​បាន​បញ្ចប់។',
     'backups_large'             => 'ការបម្រុងទុកដ៏ធំបំផុតអាចនឹងអស់ពេលក្នុងការព្យាយាមស្ដារ ហើយប្រហែលជានៅតែត្រូវដំណើរការតាមរយៈបន្ទាត់ពាក្យបញ្ជា។ ',
     'barcode_settings'			=> 'ការកំណត់បាកូដ',
     'confirm_purge'			    => 'បញ្ជាក់ការលុប',
     'confirm_purge_help'		=> 'បញ្ចូលអត្ថបទ "DELETE" នៅក្នុងប្រអប់ខាងក្រោម ដើម្បីលុបកំណត់ត្រាដែលបានលុបរបស់អ្នក។ សកម្មភាពនេះមិនអាចត្រឡប់វិញបានទេ ហើយនឹងលុបធាតុដែលបានលុប និងអ្នកប្រើប្រាស់ទាំងអស់ជាអចិន្ត្រៃយ៍។ (អ្នកគួរតែធ្វើការបម្រុងទុកជាមុនសិន ទើបមានសុវត្ថិភាព។)',
     'custom_css'				=> 'បញ្ចូលអត្ថបទ "DELETE" នៅក្នុងប្រអប់ខាងក្រោម ដើម្បីលុបកំណត់ត្រាដែលបានលុបរបស់អ្នក។ សកម្មភាពនេះមិនអាចត្រឡប់វិញបានទេ ហើយនឹងលុបធាតុដែលបានលុប និងអ្នកប្រើប្រាស់ទាំងអស់ជាអចិន្ត្រៃយ៍។ (អ្នកគួរតែធ្វើការបម្រុងទុកជាមុនសិន ទើបមានសុវត្ថិភាព។)',
+    'custom_css_placeholder'	=> 'Add your custom CSS',
     'custom_css_help'			=> 'បញ្ចូលអត្ថបទ "DELETE" នៅក្នុងប្រអប់ខាងក្រោម ដើម្បីលុបកំណត់ត្រាដែលបានលុបរបស់អ្នក។ សកម្មភាពនេះមិនអាចត្រឡប់វិញបានទេ ហើយនឹងលុបធាតុដែលបានលុប និងអ្នកប្រើប្រាស់ទាំងអស់ជាអចិន្ត្រៃយ៍។ (អ្នកគួរតែធ្វើការបម្រុងទុកជាមុនសិន ទើបមានសុវត្ថិភាព។)',
     'custom_forgot_pass_url'	=> 'បញ្ចូលអត្ថបទ "DELETE" នៅក្នុងប្រអប់ខាងក្រោម ដើម្បីលុបកំណត់ត្រាដែលបានលុបរបស់អ្នក។ សកម្មភាពនេះមិនអាចត្រឡប់វិញបានទេ ហើយនឹងលុបធាតុដែលបានលុប និងអ្នកប្រើប្រាស់ទាំងអស់ជាអចិន្ត្រៃយ៍។ (អ្នកគួរតែធ្វើការបម្រុងទុកជាមុនសិន ទើបមានសុវត្ថិភាព។)',
     'custom_forgot_pass_url_help'	=> 'បញ្ចូលអត្ថបទ "DELETE" នៅក្នុងប្រអប់ខាងក្រោម ដើម្បីលុបកំណត់ត្រាដែលបានលុបរបស់អ្នក។ សកម្មភាពនេះមិនអាចត្រឡប់វិញបានទេ ហើយនឹងលុបធាតុដែលបានលុប និងអ្នកប្រើប្រាស់ទាំងអស់ជាអចិន្ត្រៃយ៍។ (អ្នកគួរតែធ្វើការបម្រុងទុកជាមុនសិន ទើបមានសុវត្ថិភាព។)',
     'dashboard_message'			=> 'បញ្ចូលអត្ថបទ "Delete" នៅក្នុងប្រអប់ខាងក្រោម ដើម្បីលុបកំណត់ត្រាដែលបានលុបរបស់អ្នក។ សកម្មភាពនេះមិនអាចត្រឡប់វិញបានទេ ហើយនឹងលុបធាតុដែលបានលុប និងអ្នកប្រើប្រាស់ទាំងអស់ជាអចិន្ត្រៃយ៍។ (អ្នកគួរតែធ្វើការបម្រុងទុកជាមុនសិន ទើបមានសុវត្ថិភាព។)',
-    'dashboard_message_help'	=> 'This text will appear on the dashboard for anyone with permission to view the dashboard.',
+    'dashboard_message_help'	=> 'អត្ថបទនេះនឹងបង្ហាញនៅលើផ្ទាំងគ្រប់គ្រងសម្រាប់នរណាម្នាក់ដែលមានសិទ្ធិមើលផ្ទាំងគ្រប់គ្រង។',
     'default_currency'  		=> 'រូបិយប័ណ្ណលំនាំដើម',
     'default_eula_text'			=> 'EULA លំនាំដើម',
+    'default_eula_text_placeholder' => 'Add your default EULA text',
     'default_language'			=> 'ភាសាលំនាំដើម',
-    'default_eula_help_text'	=> 'You can also associate custom EULAs to specific asset categories.',
-    'acceptance_note'           => 'Add a note for your decision (Optional)',
+    'default_eula_help_text'	=> 'អ្នកក៏អាចភ្ជាប់ EULAs ផ្ទាល់ខ្លួនទៅនឹងប្រភេទទ្រព្យសម្បត្តិជាក់លាក់ផងដែរ។',
+    'acceptance_note'           => 'បន្ថែមកំណត់ចំណាំសម្រាប់ការសម្រេចចិត្តរបស់អ្នក (ជាជម្រើស)',
     'display_asset_name'        => 'បង្ហាញ​ឈ្មោះ​ទ្រព្យសកម្ម',
     'display_checkout_date'     => 'Display Checkout Date',
     'display_eol'               => 'បង្ហាញ EOL នៅក្នុងទិដ្ឋភាពតារាង',
-    'display_qr'                => 'Display Square Codes',
-    'display_alt_barcode'		=> 'Display 1D barcode',
-    'email_logo'                => 'Email Logo',
-    'barcode_type'				=> '2D Barcode Type',
-    'alt_barcode_type'			=> '1D barcode type',
-    'email_logo_size'       => 'Square logos in email look best. ',
-    'enabled'                   => 'Enabled',
-    'eula_settings'				=> 'EULA Settings',
-    'eula_markdown'				=> 'This EULA allows <a href="https://help.github.com/articles/github-flavored-markdown/">Github flavored markdown</a>.',
+    'display_qr'                => 'បង្ហាញបាកូដ 2D',
+    'display_alt_barcode'		=> 'បង្ហាញបាកូដ 1D',
+    'barcode_type'				=> 'ប្រភេទ 2D Barcode',
+    'alt_barcode_type'			=> 'ប្រភេទ 1D បាកូដ',
+    'enabled'                   => 'បានបើក',
+    'eula_settings'				=> 'ការកំណត់ EULA',
+    'eula_markdown'				=> 'EULA នេះអនុញ្ញាតឱ្យ <a href="https://help.github.com/articles/github-flavored-markdown/">Github flavored markdown</a>។',
+    'empty_row_count'           => 'Field Start Offset (Empty Rows)',
+    'empty_row_count_help'      => 'Fields will begin populating after this many empty rows are skipped at the top of the label.',
     'favicon'                   => 'Favicon',
-    'favicon_format'            => 'Accepted filetypes are ico, png, and gif. Other image formats may not work in all browsers.',
-    'favicon_size'          => 'Favicons should be square images, 16x16 pixels.',
-    'footer_text'               => 'Additional Footer Text ',
-    'footer_text_help'          => 'This text will appear in the right-side footer. Links are allowed using <a href="https://help.github.com/articles/github-flavored-markdown/">Github flavored markdown</a>. Line breaks, headers, images, etc may result in unpredictable results.',
-    'general_settings'			=> 'General Settings',
-    'general_settings_keywords' => 'company support, signature, acceptance, email format, username format, images, per page, thumbnail, eula, gravatar, tos, dashboard, privacy',
-    'general_settings_help'     => 'Default EULA and more',
-    'generate_backup'			=> 'Generate Backup',
+    'favicon_format'            => 'ប្រភេទឯកសារដែលទទួលយកគឺ ico, png និង gif ។ ទម្រង់រូបភាពផ្សេងទៀតប្រហែលជាមិនដំណើរការនៅក្នុងកម្មវិធីរុករកទាំងអស់ទេ។',
+    'favicon_size'          => 'Favicons គួរតែជារូបភាពការ៉េ ១៦x១៦ ភីកសែល។',
+    'footer_text'               => 'អត្ថបទបាតកថាបន្ថែម ',
+    'footer_text_help'          => 'អត្ថបទនេះនឹងបង្ហាញនៅក្នុងបាតកថាខាងស្តាំ។ តំណភ្ជាប់ត្រូវបានអនុញ្ញាតដោយប្រើ <a href="https://help.github.com/articles/github-flavored-markdown/">Github flavored markdown</a>។ ការបំបែកបន្ទាត់ បឋមកថា រូបភាព ជាដើម អាចបណ្តាលឱ្យមានលទ្ធផលដែលមិនអាចទាយទុកជាមុនបាន។',
+    'footer_text_placeholder'   => 'Optional footer text',
+    'general_settings'			=> 'ការកំណត់ទូទៅ',
+    'general_settings_help'     => 'EULA លំនាំដើម និងច្រើនទៀត',
+    'generate_backup'			=> 'បង្កើតការបម្រុងទុក',
     'google_workspaces'         => 'Google Workspaces',
-    'header_color'              => 'Header Color',
-    'info'                      => 'These settings let you customize certain aspects of your installation.',
-    'label_logo'                => 'Label Logo',
-    'label_logo_size'           => 'Square logos look best - will be displayed in the top right of each asset label. ',
-    'laravel'                   => 'Laravel Version',
+    'header_color'              => 'ពណ៌បឋមកថា',
+    'info'                      => 'ការកំណត់ទាំងនេះអនុញ្ញាតឱ្យអ្នកប្ដូរទិដ្ឋភាពជាក់លាក់នៃការដំឡើងរបស់អ្នក។',
+    'label_logo_size'           => 'និមិត្តសញ្ញាការ៉េមើលទៅល្អបំផុត - នឹងត្រូវបានបង្ហាញនៅខាងស្តាំខាងលើនៃស្លាកទ្រព្យសម្បត្តិនីមួយៗ។ ',
+    'laravel'                   => 'កំណែ Laravel',
     'ldap'                      => 'LDAP',
-    'ldap_default_group'        => 'Default Permissions Group',
-    'ldap_default_group_info'   => 'Select a group to assign to newly synced users. Remember that a user takes on the permissions of the group they are assigned.',
-    'no_default_group'          => 'No Default Group',
+    'ldap_default_group'        => 'ក្រុមការអនុញ្ញាតលំនាំដើម',
+    'ldap_default_group_info'   => 'ជ្រើសរើសក្រុមដើម្បីចាត់ចែងឱ្យអ្នកប្រើប្រាស់ដែលបានធ្វើសមកាលកម្មថ្មី។ ចងចាំថាអ្នកប្រើប្រាស់ទទួលយកការអនុញ្ញាតពីក្រុមដែលពួកគេត្រូវបានចាត់តាំង។',
+    'no_default_group'          => 'គ្មានក្រុមលំនាំដើម',
     'ldap_help'                 => 'LDAP/Active Directory',
     'ldap_client_tls_key'       => 'LDAP Client TLS Key',
     'ldap_client_tls_cert'      => 'LDAP Client-Side TLS Certificate',
-    'ldap_enabled'              => 'LDAP enabled',
-    'ldap_integration'          => 'LDAP Integration',
-    'ldap_settings'             => 'LDAP Settings',
-    'ldap_client_tls_cert_help' => 'Client-Side TLS Certificate and Key for LDAP connections are usually only useful in Google Workspace configurations with "Secure LDAP." Both are required.',
-    'ldap_location'             => 'LDAP Location',
-'ldap_location_help'             => 'The Ldap Location field should be used if <strong>an OU is not being used in the Base Bind DN.</strong> Leave this blank if an OU search is being used.',
-    'ldap_login_test_help'      => 'Enter a valid LDAP username and password from the base DN you specified above to test whether your LDAP login is configured correctly. YOU MUST SAVE YOUR UPDATED LDAP SETTINGS FIRST.',
-    'ldap_login_sync_help'      => 'This only tests that LDAP can sync correctly. If your LDAP Authentication query is not correct, users may still not be able to login. YOU MUST SAVE YOUR UPDATED LDAP SETTINGS FIRST.',
-    'ldap_manager'              => 'LDAP Manager',
-    'ldap_server'               => 'LDAP Server',
-    'ldap_server_help'          => 'This should start with ldap:// (for unencrypted or TLS) or ldaps:// (for SSL)',
-    'ldap_server_cert'			=> 'LDAP SSL certificate validation',
+    'ldap_enabled'              => 'LDAP ត្រូវបានបើក',
+    'ldap_integration'          => 'ការរួមបញ្ចូល LDAP',
+    'ldap_settings'             => 'ការកំណត់ LDAP',
+    'ldap_client_tls_cert_help' => 'វិញ្ញាបនបត្រ TLS ខាង Client-Side និងកូនសោសម្រាប់ការតភ្ជាប់ LDAP ជាធម្មតាមានប្រយោជន៍តែនៅក្នុងការកំណត់រចនាសម្ព័ន្ធ Google Workspace ជាមួយ " LDAP សុវត្ថិភាព។" ទាំងពីរត្រូវបានទាមទារ។',
+    'ldap_location'             => 'ទីតាំង LDAP',
+'ldap_location_help'             => 'វាលទីតាំង Ldap គួរតែត្រូវបានប្រើ ប្រសិនបើ <strong> OU មិនត្រូវបានប្រើនៅក្នុង Base Bind DN។</strong> ទុកវាឱ្យនៅទទេ ប្រសិនបើការស្វែងរក OU កំពុងត្រូវបានប្រើប្រាស់។',
+    'ldap_login_test_help'      => 'បញ្ចូលឈ្មោះអ្នកប្រើប្រាស់ និងពាក្យសម្ងាត់ LDAP ដែលមានសុពលភាពពី DN មូលដ្ឋានដែលអ្នកបានបញ្ជាក់ខាងលើ ដើម្បីសាកល្បងថាតើការចូល LDAP របស់អ្នកត្រូវបានកំណត់រចនាសម្ព័ន្ធត្រឹមត្រូវដែរឬទេ។ អ្នកត្រូវតែរក្សាទុកការកំណត់ LDAP ដែលបានធ្វើបច្ចុប្បន្នភាពរបស់អ្នកជាមុនសិន។',
+    'ldap_login_sync_help'      => 'វាសាកល្បងតែការធ្វើសមកាលកម្ម LDAP ប៉ុណ្ណោះ។ ប្រសិនបើសំណួរការផ្ទៀងផ្ទាត់ភាពត្រឹមត្រូវរបស់ LDAP មិនត្រឹមត្រូវ អ្នកប្រើអាចនៅតែមិនអាចចូលបាន។ អ្នកត្រូវរក្សាទុកការកំណត់ LDAP ដែលបានធ្វើបច្ចុប្បន្នភាពជាមុនសិន។',
+    'ldap_manager'              => 'អ្នកគ្រប់គ្រង LDAP',
+    'ldap_server'               => 'LDAP សើវើ',
+    'ldap_server_help'          => 'វាត្រូវចាប់ផ្តើមដោយ ldap:// (សម្រាប់មិនអ៊ីនគ្រីប) ឬ ldaps:// (សម្រាប់ TLS ឬ SSL)',
+    'ldap_server_cert'			=> 'សុពលភាពវិញ្ញាបនបត្រ LDAP SSL',
     'ldap_server_cert_ignore'	=> 'អនុញ្ញាតឱ្យវិញ្ញាបនបត្រ SSL មិនត្រឹមត្រូវ',
     'ldap_server_cert_help'		=> 'ជ្រើសរើសប្រអប់ធីកនេះ ប្រសិនបើអ្នកកំពុងប្រើវិញ្ញាបនបត្រ SSL ដែលបានចុះហត្ថលេខាដោយខ្លួនឯង ហើយចង់ទទួលយកវិញ្ញាបនបត្រ SSL ដែលមិនត្រឹមត្រូវ។',
     'ldap_tls'                  => 'ប្រើ TLS',
-    'ldap_tls_help'             => 'This should be checked only if you are running STARTTLS on your LDAP server. ',
-    'ldap_uname'                => 'LDAP Bind Username',
-    'ldap_dept'                 => 'LDAP Department',
-    'ldap_phone'                => 'LDAP Telephone Number',
-    'ldap_jobtitle'             => 'LDAP Job Title',
-    'ldap_country'              => 'LDAP Country',
-    'ldap_pword'                => 'LDAP Bind Password',
-    'ldap_basedn'               => 'Base Bind DN',
-    'ldap_filter'               => 'LDAP Filter',
-    'ldap_pw_sync'              => 'LDAP Password Sync',
-    'ldap_pw_sync_help'         => 'Uncheck this box if you do not wish to keep LDAP passwords synced with local passwords. Disabling this means that your users may not be able to login if your LDAP server is unreachable for some reason.',
-    'ldap_username_field'       => 'Username Field',
+    'ldap_tls_help'             => 'វាត្រូវបានពិនិត្យបើកតែប៉ុណ្ណោះ ប្រសិនបើអ្នកកំពុងប្រតិបត្តិ STARTTLS លើ LDAP សើវើ របស់អ្នក។ ',
+    'ldap_uname'                => 'LDAP ចងឈ្មោះអ្នកប្រើប្រាស់',
+    'ldap_dept'                 => 'នាយកដ្ឋាន LDAP',
+    'ldap_phone'                => 'លេខទូរស័ព្ទ LDAP',
+    'ldap_jobtitle'             => 'ចំណងជើងការងារ LDAP',
+    'ldap_country'              => 'ប្រទេស LDAP',
+    'ldap_pword'                => 'LDAP ចងពាក្យសម្ងាត់',
+    'ldap_basedn'               => 'មូលដ្ឋានចង DN',
+    'ldap_filter'               => 'តម្រង LDAP',
+    'ldap_pw_sync'              => 'Cache LDAP Passwords',
+    'ldap_pw_sync_help'         => 'Uncheck this box if you do not wish to keep LDAP passwords cached as local hashed passwords. Disabling this means that your users may not be able to login if your LDAP server is unreachable for some reason.',
+    'ldap_username_field'       => 'វាលឈ្មោះអ្នកប្រើ',
     'ldap_lname_field'          => 'នាមត្រកូល',
-    'ldap_fname_field'          => 'LDAP First Name',
-    'ldap_auth_filter_query'    => 'LDAP Authentication query',
-    'ldap_version'              => 'LDAP Version',
-    'ldap_active_flag'          => 'LDAP Active Flag',
-    'ldap_activated_flag_help'  => 'This value is used to determine whether a synced user can login to Snipe-IT. <strong>It does not affect the ability to check items in or out to them</strong>, and should be the <strong>attribute name</strong> within your AD/LDAP, <strong>not the value</strong>. <br><br>If this field is set to a field name that does not exist in your AD/LDAP, or the value in the AD/LDAP field is set to <code>0</code> or <code>false</code>, <strong>user login will be disabled</strong>. If the value in the AD/LDAP field is set to <code>1</code> or <code>true</code> or <em>any other text</em> means the user can log in. When the field is blank in your AD, we respect the <code>userAccountControl</code> attribute, which usually allows non-suspended users to log in.',
-    'ldap_emp_num'              => 'LDAP Employee Number',
-    'ldap_email'                => 'LDAP Email',
-    'ldap_test'                 => 'Test LDAP',
-    'ldap_test_sync'            => 'Test LDAP Synchronization',
+    'ldap_fname_field'          => 'ឈ្មោះ LDAP',
+    'ldap_auth_filter_query'    => 'សំណួរការផ្ទៀងផ្ទាត់ LDAP',
+    'ldap_version'              => 'កំណែ LDAP',
+    'ldap_active_flag'          => 'ទង់សកម្ម LDAP',
+    'ldap_activated_flag_help'  => 'តម្លៃនេះត្រូវបានប្រើដើម្បីកំណត់ថា អ្នកប្រើដែលបានធ្វើសមកាលកម្មអាចចូលទៅ Snipe-IT បានឬអត់។ <strong>វាមិនប៉ះពាល់ដល់សិទ្ធិពិនិត្យចេញ ឬចូលទ្រព្យសម្បត្តិរបស់ពួកគេទេ</strong> ហើយវាត្រូវជាឈ្មោះ <strong>គុណលក្ខណៈ</strong> នៅក្នុង AD/LDAP របស់អ្នក <strong>មិនមែនតម្លៃ</strong>។
+
+<br><br> ប្រសិនបើវាលនេះត្រូវបានកំណត់ទៅឈ្មោះវាលមួយដែលមិនមាននៅក្នុង AD/LDAP របស់អ្នក ឬតម្លៃក្នុងវាល AD/LDAP ត្រូវបានកំណត់ទៅ <code>0</code> ឬ <code>false</code> នោះ<strong>ការចូលរបស់អ្នកប្រើនឹងត្រូវបិទ</strong>។ ប្រសិនបើតម្លៃក្នុងវាល AD/LDAP ត្រូវបានកំណត់ទៅ <code>1</code> ឬ <code>true</code> ឬ <em>អត្ថបទផ្សេងៗ</em> នោះមានន័យថា អ្នកប្រើអាចចូលបាន។ នៅពេលដែលវាលនេះនៅក្នុង AD របស់អ្នកគ្មានតម្លៃ អ្នកប្រើនឹងត្រូវគោរពតាមគុណលក្ខណៈ <code>userAccountControl</code> ដែលជាទម្លាប់អាចអនុញ្ញាតឲ្យអ្នកប្រើដែលមិនបានផ្អាកចូលបាន។',
+    'ldap_invert_active_flag'   => 'LDAP Invert Active Flag',
+    'ldap_invert_active_flag_help'     => 'If enabled: when the value returned by LDAP Active Flag is <code>0</code> or <code>false</code> the user account will be active.',
+    'ldap_emp_num'              => 'លេខបុគ្គលិក LDAP',
+    'ldap_email'                => 'LDAP អ៊ីមែល',
+    'ldap_test'                 => 'សាកល្បង LDAP',
+    'ldap_test_sync'            => 'សាកល្បងការធ្វើសមកាលកម្ម LDAP',
     'license'                   => 'អាជ្ញាប័ណ្ណកម្មវិធី',
-    'load_remote'               => 'Use Gravatar',
-    'load_remote_help_text'		=> 'Uncheck this box if your install cannot load scripts from the outside internet. This will prevent Snipe-IT from trying load images from Gravatar.',
+    'load_remote'               => 'ផ្ទុក Avatar ពីចម្ងាយ',
+    'load_remote_help_text'		=> 'ដោះធីកប្រអប់នេះ ប្រសិនបើការដំឡើងរបស់អ្នកមិនអាចផ្ទុកស្គ្រីបពីអ៊ីនធឺណិតខាងក្រៅបានទេ។ វានឹងរារាំង Snipe-IT ពីការព្យាយាមផ្ទុករូបតំណាងពី Gravatar ឬប្រភពខាងក្រៅផ្សេងទៀត។',
     'login'                     => 'ការប៉ុនប៉ងចូល',
     'login_attempt'             => 'ការប៉ុនប៉ងចូល',
     'login_ip'                  => 'អាសយដ្ឋាន IP',
     'login_success'             => 'ជោគជ័យ?',
-    'login_user_agent'          => 'User Agent',
+    'login_user_agent'          => 'ភ្នាក់ងារអ្នកប្រើប្រាស់',
     'login_help'                => 'បញ្ជីនៃការព្យាយាមចូល',
     'login_note'                => 'កំណត់ចំណាំចូល',
-    'login_note_help'           => 'Optionally include a few sentences on your login screen, for example to assist people who have found a lost or stolen device. This field accepts <a href="https://help.github.com/articles/github-flavored-markdown/">Github flavored markdown</a>',
+    'login_note_placeholder'            => "If you do not have a login or have found a device belonging to this company, please call technical support at 888-555-1212. Thank you.",
+    'login_note_help'           => 'ជាជម្រើស រួមបញ្ចូលប្រយោគមួយចំនួននៅលើអេក្រង់ចូលរបស់អ្នក ឧទាហរណ៍ ដើម្បីជួយមនុស្សដែលបានរកឃើញឧបករណ៍ដែលបាត់ ឬត្រូវបានគេលួច។ វាលនេះទទួលយក <a href="https://help.github.com/articles/github-flavored-markdown/">Github flavored markdown</a>',
     'login_remote_user_text'    => 'ជម្រើសចូលប្រើពីចម្ងាយ',
     'login_remote_user_enabled_text' => 'បើកការចូលដោយប្រើបឋមកថាអ្នកប្រើពីចម្ងាយ',
-    'login_remote_user_enabled_help' => 'This option enables Authentication via the REMOTE_USER header according to the "Common Gateway Interface (rfc3875)"',
-    'login_common_disabled_text' => 'Disable other authentication mechanisms',
-    'login_common_disabled_help' => 'This option disables other authentication mechanisms. Just enable this option if you are sure that your REMOTE_USER login is already working',
-    'login_remote_user_custom_logout_url_text' => 'Custom logout URL',
-    'login_remote_user_custom_logout_url_help' => 'If a url is provided here, users will get redirected to this URL after the user logs out of Snipe-IT. This is useful to close the user sessions of your Authentication provider correctly.',
-    'login_remote_user_header_name_text' => 'Custom user name header',
-    'login_remote_user_header_name_help' => 'Use the specified header instead of REMOTE_USER',
-    'logo'                    	=> 'Logo',
-    'logo_print_assets'         => 'Use in Print',
-    'logo_print_assets_help'    => 'Use branding on printable asset lists ',
-    'full_multiple_companies_support_help_text' => 'Restricting users (including admins) assigned to companies to their company\'s assets.',
-    'full_multiple_companies_support_text' => 'Full Multiple Companies Support',
+    'login_remote_user_enabled_help' => 'ជម្រើសនេះបើកការផ្ទៀងផ្ទាត់តាមរយៈបឋមកថា REMOTE_USER យោងតាម ​​"ចំណុចប្រទាក់ច្រកផ្លូវទូទៅ (rfc3875)"',
+    'login_common_disabled_text' => 'បិទយន្តការផ្ទៀងផ្ទាត់ផ្សេងទៀត។',
+    'login_common_disabled_help' => 'ជម្រើសនេះបិទយន្តការផ្ទៀងផ្ទាត់ផ្សេងទៀត។ គ្រាន់តែបើកជម្រើសនេះ ប្រសិនបើអ្នកប្រាកដថាការចូល REMOTE_USER របស់អ្នកដំណើរការរួចហើយ',
+    'login_remote_user_custom_logout_url_text' => 'URL ចេញប្រើផ្ទាល់ខ្លួន',
+    'login_remote_user_custom_logout_url_help' => 'ប្រសិនបើ url ត្រូវបានផ្តល់ជូននៅទីនេះ អ្នកប្រើប្រាស់នឹងត្រូវបានបញ្ជូនបន្តទៅកាន់ URL នេះ បន្ទាប់ពីអ្នកប្រើប្រាស់ចាកចេញពី Snipe-IT។ វាមានប្រយោជន៍ក្នុងការបិទវគ្គអ្នកប្រើប្រាស់របស់អ្នកផ្តល់ការផ្ទៀងផ្ទាត់ភាពត្រឹមត្រូវរបស់អ្នក។',
+    'login_remote_user_header_name_text' => 'បឋមកថាឈ្មោះអ្នកប្រើផ្ទាល់ខ្លួន',
+    'login_remote_user_header_name_help' => 'ប្រើបឋមកថាដែលបានបញ្ជាក់ជំនួសឱ្យ REMOTE_USER',
+    'logo'                    	=> 'និមិត្តសញ្ញា',
+    'logo_print_assets'         => 'ប្រើក្នុងការបោះពុម្ព',
+    'logo_print_assets_help'    => 'ប្រើម៉ាកយីហោនៅលើបញ្ជីទ្រព្យសម្បត្តិដែលអាចបោះពុម្ពបាន ',
+    'full_multiple_companies_support_help_text' => 'ការដាក់កម្រិតអ្នកប្រើប្រាស់ (រាប់បញ្ចូលទាំងអ្នកគ្រប់គ្រង) ដែលត្រូវបានចាត់តាំងឱ្យក្រុមហ៊ុនចំពោះទ្រព្យសម្បត្តិរបស់ក្រុមហ៊ុនពួកគេ។',
+    'full_multiple_companies_support_text' => 'ការគាំទ្រក្រុមហ៊ុនច្រើនយ៉ាងពេញលេញ',
+    'scope_locations_fmcs_support_text'  => 'Scope Locations with Full Multiple Companies Support',
+    'scope_locations_fmcs_support_help_text'  => 'Restrict locations to their selected company.',
+    'scope_locations_fmcs_check_button' => 'Check Compatibility',
+    'scope_locations_fmcs_support_disabled_text'  => 'This option is disabled because you have conflicting locations set for :count or more items.',
     'show_in_model_list'   => 'Show in Model Dropdowns',
-    'optional'					=> 'optional',
+    'optional'					=> 'ជាជម្រើស',
     'per_page'                  => 'លទ្ធផលក្នុងមួយទំព័រ',
     'php'                       => 'កំណែ PHP',
     'php_info'                  => 'ព័ត៌មាន PHP',
     'php_overview'              => 'ព័ត៌មាន PHP',
-    'php_overview_keywords'     => 'phpinfo, system, info',
-    'php_overview_help'         => 'PHP System info',
+    'php_overview_help'         => 'ព័ត៌មានប្រព័ន្ធ PHP',
     'php_gd_info'               => 'អ្នកត្រូវតែដំឡើង php-gd ដើម្បីបង្ហាញកូដ QR សូមមើលការណែនាំដំឡើង។',
     'php_gd_warning'            => 'PHP Image Processing and GD plugin is NOT installed.',
     'pwd_secure_complexity'     => 'ភាពស្មុគស្មាញនៃពាក្យសម្ងាត់',
@@ -170,8 +181,8 @@ return [
     'qr_help'                   => 'បើក QR Codes ជាដំបូងដើម្បីកំណត់វា។',
     'qr_text'                   => 'អត្ថបទកូដ QR',
     'saml'                      => 'SAML',
-    'saml_title'                => 'Update SAML settings',
-    'saml_help'                 => 'SAML settings',
+    'saml_title'                => 'ធ្វើបច្ចុប្បន្នភាពការកំណត់ SAML',
+    'saml_help'                 => 'ការកំណត់ SAML',
     'saml_enabled'              => 'SAML enabled',
     'saml_integration'          => 'SAML Integration',
     'saml_sp_entityid'          => 'លេខសម្គាល់អង្គភាព',
@@ -209,56 +220,57 @@ return [
     'webhook'                   => ':app',
     'webhook_presave'           => 'Test to Save',
     'webhook_title'               => 'Update Webhook Settings',
-    'webhook_help'                => 'Integration settings',
-    'webhook_botname'             => ':app Botname',
-    'webhook_channel'             => ':app Channel',
-    'webhook_endpoint'            => ':app Endpoint',
-    'webhook_integration'         => ':app Settings',
-    'webhook_test'                 =>'Test :app integration',
-    'webhook_integration_help'    => ':app integration is optional, however the endpoint and channel are required if you wish to use it. To configure :app integration, you must first <a href=":webhook_link" target="_new" rel="noopener">create an incoming webhook</a> on your :app account. Click on the <strong>Test :app Integration</strong> button to confirm your settings are correct before saving. ',
-    'webhook_integration_help_button'    => 'Once you have saved your :app information, a test button will appear.',
-    'webhook_test_help'           => 'Test whether your :app integration is configured correctly. YOU MUST SAVE YOUR UPDATED :app SETTINGS FIRST.',
+    'webhook_help'                => 'ការកំណត់ការរួមបញ្ចូល',
+    'webhook_botname'             => '៖ ឈ្មោះកម្មវិធី',
+    'webhook_channel'             => ': ឆានែលកម្មវិធី',
+    'webhook_endpoint'            => '៖ ចំណុចបញ្ចប់កម្មវិធី',
+    'webhook_integration'         => '៖ ការកំណត់កម្មវិធី',
+    'webhook_test'                 =>'សាកល្បង៖ ការរួមបញ្ចូលកម្មវិធី',
+    'webhook_integration_help'    => '៖ ការរួមបញ្ចូលកម្មវិធីគឺស្រេចចិត្ត ទោះជាយ៉ាងណាក៏ដោយ ចំណុចបញ្ចប់ និងឆានែលត្រូវបានទាមទារប្រសិនបើអ្នកចង់ប្រើវា។ ដើម្បីកំណត់រចនាសម្ព័ន្ធ៖ ការរួមបញ្ចូលកម្មវិធី ដំបូងអ្នកត្រូវតែ <a href=":webhook_link" target="_new" rel="noopener">បង្កើត webhook ចូល</a> នៅលើគណនី :app របស់អ្នក។ ចុចលើប៊ូតុង <strong>Test :app Integration</strong> ដើម្បីបញ្ជាក់ថាការកំណត់របស់អ្នកត្រឹមត្រូវមុនពេលរក្សាទុក។ ',
+    'webhook_integration_help_button'    => 'នៅពេលដែលអ្នកបានរក្សាទុកព័ត៌មាន៖ កម្មវិធីរបស់អ្នក ប៊ូតុងសាកល្បងនឹងលេចឡើង។',
+    'webhook_test_help'           => 'សាកល្បងថាតើការរួមបញ្ចូលៈកម្មវិធីរបស់អ្នកត្រូវបានកំណត់រចនាសម្ព័ន្ធត្រឹមត្រូវ។ អ្នកត្រូវតែរក្សាទុកការអាប់ដេតរបស់អ្នក៖ ការកំណត់កម្មវិធីជាមុនសិន។',
+    'shortcuts_enabled'         => 'បើកផ្លូវកាត់',
+    'shortcuts_help_text'       => '<strong>Windows</strong>: Alt + Access key, <strong>Mac</strong>: Control + Option + Access key',
     'snipe_version'  			=> 'Snipe-IT version',
-    'support_footer'            => 'Support Footer Links ',
-    'support_footer_help'       => 'Specify who sees the links to the Snipe-IT Support info and Users Manual',
-    'version_footer'            => 'Version in Footer ',
-    'version_footer_help'       => 'Specify who sees the Snipe-IT version and build number.',
-    'system'                    => 'System Information',
-    'update'                    => 'Update Settings',
-    'value'                     => 'Value',
-    'brand'                     => 'Branding',
-    'brand_keywords'            => 'footer, logo, print, theme, skin, header, colors, color, css',
-    'brand_help'                => 'Logo, Site Name',
-    'web_brand'                 => 'Web Branding Type',
-    'about_settings_title'      => 'About Settings',
-    'about_settings_text'       => 'These settings let you customize certain aspects of your installation.',
-    'labels_per_page'           => 'Labels per page',
-    'label_dimensions'          => 'Label dimensions (inches)',
-    'next_auto_tag_base'        => 'Next auto-increment',
-    'page_padding'              => 'Page margins (inches)',
-    'privacy_policy_link'       => 'Link to Privacy Policy',
-    'privacy_policy'            => 'Privacy Policy',
-    'privacy_policy_link_help'  => 'If a url is included here, a link to your privacy policy will be included in the app footer and in any emails that the system sends out, in compliance with GDPR. ',
+    'support_footer'            => 'គាំទ្រតំណភ្ជាប់បាតកថា ',
+    'support_footer_help'       => 'បញ្ជាក់អ្នកដែលឃើញតំណភ្ជាប់ទៅកាន់ព័ត៌មានជំនួយ Snipe-IT និងសៀវភៅណែនាំអ្នកប្រើប្រាស់',
+    'version_footer'            => 'កំណែនៅក្នុងបាតកថា ',
+    'version_footer_help'       => 'បញ្ជាក់អ្នកដែលឃើញកំណែ Snipe-IT និងលេខសាងសង់។',
+    'system'                    => 'ព័ត៌មានប្រព័ន្ធ',
+    'update'                    => 'ធ្វើបច្ចុប្បន្នភាពការកំណត់',
+    'value'                     => 'តម្លៃ',
+    'brand'                     => 'ម៉ាកយីហោ',
+    'brand_help'                => 'និមិត្តសញ្ញា, ឈ្មោះគេហទំព័រ',
+    'web_brand'                 => 'ប្រភេទយីហោគេហទំព័រ',
+    'about_settings_title'      => 'អំពីការកំណត់',
+    'about_settings_text'       => 'ការកំណត់ទាំងនេះអនុញ្ញាតឱ្យអ្នកប្ដូរទិដ្ឋភាពជាក់លាក់នៃការដំឡើងរបស់អ្នក។',
+    'labels_per_page'           => 'ស្លាកក្នុងមួយទំព័រ',
+    'label_dimensions'          => 'ទំហំស្លាក (អ៊ីញ)',
+    'next_auto_tag_base'        => 'ការបង្កើនដោយស្វ័យប្រវត្តិបន្ទាប់',
+    'page_padding'              => 'រឹម​ទំព័រ (អ៊ីញ)',
+    'privacy_policy_link'       => 'ភ្ជាប់ទៅគោលការណ៍ឯកជនភាព',
+    'privacy_policy'            => 'គោលការណ៍ឯកជនភាព',
+    'privacy_policy_link_help'  => 'ប្រសិនបើ url ត្រូវបានរួមបញ្ចូលនៅទីនេះ តំណភ្ជាប់ទៅកាន់គោលការណ៍ឯកជនភាពរបស់អ្នកនឹងត្រូវបានរួមបញ្ចូលនៅក្នុងបាតកថាកម្មវិធី និងនៅក្នុងអ៊ីមែលដែលប្រព័ន្ធផ្ញើចេញ ដោយអនុលោមតាម GDPR ។ ',
     'purge'                     => 'Purge Deleted Records',
     'purge_deleted'             => 'Purge Deleted ',
     'labels_display_bgutter'    => 'Label bottom gutter',
     'labels_display_sgutter'    => 'Label side gutter',
-    'labels_fontsize'           => 'Label font size',
-    'labels_pagewidth'          => 'Label sheet width',
-    'labels_pageheight'         => 'Label sheet height',
-    'label_gutters'        => 'Label spacing (inches)',
-    'page_dimensions'        => 'Page dimensions (inches)',
-    'label_fields'          => 'Label visible fields',
-    'inches'        => 'inches',
+    'labels_fontsize'           => 'ស្លាកទំហំពុម្ពអក្សរ',
+    'labels_pagewidth'          => 'ទទឹងសន្លឹកស្លាក',
+    'labels_pageheight'         => 'កម្ពស់សន្លឹកស្លាក',
+    'label_gutters'        => 'គម្លាតស្លាក (អ៊ីញ)',
+    'page_dimensions'        => 'ទំហំទំព័រ (អ៊ីញ)',
+    'label_fields'          => 'ដាក់ស្លាកវាលដែលមើលឃើញ',
+    'inches'        => 'អុិនឈ៍',
     'width_w'        => 'w',
     'height_h'        => 'h',
-    'show_url_in_emails'                => 'Link to Snipe-IT in Emails',
-    'show_url_in_emails_help_text'      => 'Uncheck this box if you do not wish to link back to your Snipe-IT installation in your email footers. Useful if most of your users never login. ',
+    'show_url_in_emails'                => 'ភ្ជាប់ទៅ Snipe-IT នៅក្នុងអ៊ីមែល',
+    'show_url_in_emails_help_text'      => 'ដោះធីកប្រអប់នេះ ប្រសិនបើអ្នកមិនចង់ភ្ជាប់ទៅការដំឡើង Snipe-IT របស់អ្នកនៅក្នុងបាតកថាអ៊ីមែលរបស់អ្នក។ មានប្រយោជន៍ប្រសិនបើអ្នកប្រើភាគច្រើនរបស់អ្នកមិនដែលចូល។ ',
     'text_pt'        => 'pt',
-    'thumbnail_max_h'   => 'Max thumbnail height',
-    'thumbnail_max_h_help'   => 'Maximum height in pixels that thumbnails may display in the listing view. Min 25, max 500.',
-    'two_factor'        => 'Two Factor Authentication',
-    'two_factor_secret'        => 'Two-Factor Code',
+    'thumbnail_max_h'   => 'កម្ពស់រូបភាពតូចអតិបរមា',
+    'thumbnail_max_h_help'   => 'កម្ពស់អតិបរមាជាភីកសែលដែលរូបភាពតូចអាចបង្ហាញក្នុងទិដ្ឋភាពបញ្ជី។ អប្បបរមា 25, អតិបរមា 500 ។',
+    'two_factor'        => 'ការផ្ទៀងផ្ទាត់កត្តាពីរ',
+    'two_factor_secret'        => 'កូដកត្តាពីរ',
     'two_factor_enrollment'        => 'Two-Factor Enrollment',
     'two_factor_enabled_text'        => 'Enable Two Factor',
     'two_factor_reset'        => 'Reset Two-Factor Secret',
@@ -276,6 +288,8 @@ return [
     'two_factor_enrollment_text'	=> "Two factor authentication is required, however your device has not been enrolled yet. Open your Google Authenticator app and scan the QR code below to enroll your device. Once you've enrolled your device, enter the code below",
     'require_accept_signature'      => 'Require Signature',
     'require_accept_signature_help_text'      => 'Enabling this feature will require users to physically sign off on accepting an asset.',
+    'require_checkinout_notes'  => 'Require Notes on Checkin/Checkout',
+    'require_checkinout_notes_help_text'    => 'Enabling this feature will require the note fields to be populated when checking in or checking out an asset.',
     'left'        => 'left',
     'right'        => 'right',
     'top'        => 'top',
@@ -302,78 +316,176 @@ return [
     'asset_tag_title' => 'Update Asset Tag Settings',
     'barcode_title' => 'Update Barcode Settings',
     'barcodes' => 'Barcodes',
-    'barcodes_help_overview' => 'Barcode &amp; QR settings',
-    'barcodes_help' => 'This will attempt to delete cached barcodes. This would typically only be used if your barcode settings have changed, or if your Snipe-IT URL has changed. Barcodes will be re-generated when accessed next.',
-    'barcodes_spinner' => 'Attempting to delete files...',
+    'barcodes_help_overview' => 'បាកូដ &amp; ការកំណត់ QR',
+    'barcodes_help' => 'វា​នឹង​ព្យាយាម​លុប​បាកូដ​ដែល​បាន​ទុក​ក្នុង​ឃ្លាំង​សម្ងាត់។ ជាធម្មតា វានឹងត្រូវបានប្រើតែប្រសិនបើការកំណត់បាកូដរបស់អ្នកបានផ្លាស់ប្តូរ ឬប្រសិនបើ URL Snipe-IT របស់អ្នកបានផ្លាស់ប្តូរ។ Barcodes នឹង​ត្រូវ​បាន​បង្កើត​ឡើង​វិញ​នៅ​ពេល​ចូល​ប្រើ​បន្ទាប់។',
+    'barcodes_spinner' => 'កំពុងព្យាយាមលុបឯកសារ...',
     'barcode_delete_cache' => 'Delete Barcode Cache',
-    'branding_title' => 'Update Branding Settings',
-    'general_title' => 'Update General Settings',
-    'mail_test' => 'Send Test',
-    'mail_test_help' => 'This will attempt to send a test mail to :replyto.',
-    'filter_by_keyword' => 'Filter by setting keyword',
-    'security' => 'Security',
-    'security_title' => 'Update Security Settings',
-    'security_keywords' => 'password, passwords, requirements, two factor, two-factor, common passwords, remote login, logout, authentication',
-    'security_help' => 'Two-factor, Password Restrictions',
-    'groups_keywords' => 'permissions, permission groups, authorization',
-    'groups_help' => 'Account permission groups',
-    'localization' => 'Localization',
-    'localization_title' => 'Update Localization Settings',
-    'localization_keywords' => 'localization, currency, local, locale, time zone, timezone, international, internatinalization, language, languages, translation',
-    'localization_help' => 'Language, date display',
-    'notifications' => 'Notifications',
-    'notifications_help' => 'Email Alerts & Audit Settings',
-    'asset_tags_help' => 'Incrementing and prefixes',
+    'branding_title' => 'ធ្វើបច្ចុប្បន្នភាពការកំណត់ម៉ាកយីហោ',
+    'general_title' => 'ធ្វើបច្ចុប្បន្នភាពការកំណត់ទូទៅ',
+    'mail_test' => 'ផ្ញើការធ្វើតេស្ត',
+    'mail_test_help' => 'វានឹងព្យាយាមផ្ញើសំបុត្រសាកល្បងទៅ :replyto ។',
+    'filter_by_keyword' => 'ត្រងដោយកំណត់ពាក្យគន្លឹះ',
+    'security' => 'សន្តិសុខ',
+    'security_title' => 'ធ្វើបច្ចុប្បន្នភាពការកំណត់សុវត្ថិភាព',
+    'security_help' => 'កត្តាពីរ ការរឹតបន្តឹងពាក្យសម្ងាត់',
+    'groups_help' => 'ក្រុមអនុញ្ញាតគណនី',
+    'localization' => 'ការធ្វើមូលដ្ឋានីយកម្ម',
+    'localization_title' => 'ធ្វើបច្ចុប្បន្នភាពការកំណត់មូលដ្ឋានីយកម្ម',
+    'localization_help' => 'ភាសា ការបង្ហាញកាលបរិច្ឆេទ',
+    'notifications' => 'ការជូនដំណឹង',
+    'notifications_help' => 'ការជូនដំណឹងតាមអ៊ីមែល និងការកំណត់សវនកម្ម',
+    'asset_tags_help' => 'ការបង្កើននិងបុព្វបទ',
     'labels' => 'ស្លាក',
-    'labels_title' => 'Update Label Settings',
-    'labels_help' => 'Label sizes &amp; settings',
-    'purge_keywords' => 'permanently delete',
+    'labels_title' => 'ធ្វើបច្ចុប្បន្នភាពការកំណត់ស្លាក',
+    'labels_help' => 'បាកូដ &amp; ការកំណត់ស្លាក',
     'purge_help' => 'Purge Deleted Records',
-    'ldap_extension_warning' => 'It does not look like the LDAP extension is installed or enabled on this server. You can still save your settings, but you will need to enable the LDAP extension for PHP before LDAP syncing or login will work.',
+    'ldap_extension_warning' => 'វាមិនមើលទៅដូចជាផ្នែកបន្ថែម LDAP ត្រូវបានដំឡើង ឬបើកនៅលើម៉ាស៊ីនមេនេះទេ។ អ្នកនៅតែអាចរក្សាទុកការកំណត់របស់អ្នកបាន ប៉ុន្តែអ្នកនឹងត្រូវបើកដំណើរការផ្នែកបន្ថែម LDAP សម្រាប់ PHP មុនពេលការធ្វើសមកាលកម្ម LDAP ឬការចូលនឹងដំណើរការ។',
     'ldap_ad' => 'LDAP/AD',
+    'ldap_test_label' => 'Test LDAP Sync',
+    'ldap_test_login' => ' Test LDAP Login',
+    'ldap_username_placeholder' => 'LDAP Username',
+    'ldap_password_placeholder' => 'LDAP Password',
     'employee_number' => 'លេខបុគ្គលិក',
-    'create_admin_user' => 'Create a User ::',
-    'create_admin_success' => 'Success! Your admin user has been added!',
-    'create_admin_redirect' => 'Click here to go to your app login!',
-    'setup_migrations' => 'Database Migrations ::',
-    'setup_no_migrations' => 'There was nothing to migrate. Your database tables were already set up!',
-    'setup_successful_migrations' => 'Your database tables have been created',
-    'setup_migration_output' => 'Migration output:',
-    'setup_migration_create_user' => 'Next: Create User',
-    'ldap_settings_link' => 'LDAP Settings Page',
-    'slack_test' => 'Test <i class="fab fa-slack"></i> Integration',
-    'label2_enable'           => 'New Label Engine',
-    'label2_enable_help'      => 'Switch to the new label engine. <b>Note: You will need to save this setting before setting others.</b>',
-    'label2_template'         => 'Template',
-    'label2_template_help'    => 'Select which template to use for label generation',
+    'create_admin_user' => 'បង្កើតអ្នកប្រើប្រាស់ ::',
+    'create_admin_success' => 'ជោគជ័យ! អ្នកប្រើប្រាស់អ្នកគ្រប់គ្រងរបស់អ្នកត្រូវបានបន្ថែម!',
+    'create_admin_redirect' => 'ចុចត្រង់នេះ ដើម្បីចូលទៅកាន់កម្មវិធីរបស់អ្នក!',
+    'setup_migrations' => 'ការផ្លាស់ប្តូរមូលដ្ឋានទិន្នន័យ ::',
+    'setup_no_migrations' => 'មិនមានអ្វីត្រូវធ្វើចំណាកស្រុកទេ។ តារាងទិន្នន័យរបស់អ្នកត្រូវបានតំឡើងរួចហើយ!',
+    'setup_successful_migrations' => 'តារាងមូលដ្ឋានទិន្នន័យរបស់អ្នកត្រូវបានបង្កើត',
+    'setup_migration_output' => 'លទ្ធផល​នៃ​ការ​ធ្វើ​ចំណាក​ស្រុក៖',
+    'setup_migration_create_user' => 'បន្ទាប់៖ បង្កើតអ្នកប្រើប្រាស់',
+    'ldap_settings_link' => 'ទំព័រការកំណត់ LDAP',
+    'slack_test' => 'សាកល្បង<i class="fab fa-slack"></i> ការរួមបញ្ចូល',
+    'status_label_name' => 'Status Label Name',
+    'super_admin_only'  => 'Super Admin Only',
+    'label2_enable'           => 'ម៉ាស៊ីនស្លាកថ្មី។',
+    'label2_enable_help'      => 'ប្តូរទៅម៉ាស៊ីនស្លាកថ្មី។ <b>ចំណាំ៖ អ្នកនឹងត្រូវរក្សាទុកការកំណត់នេះមុនពេលកំណត់ផ្សេងទៀត។</b>',
+    'label2_template'         => 'គំរូ',
+    'label2_template_help'    => 'ជ្រើសរើសគំរូដែលត្រូវប្រើសម្រាប់ការបង្កើតស្លាក',
     'label2_title'            => 'ចំណងជើង',
-    'label2_title_help'       => 'The title to show on labels that support it',
-    'label2_title_help_phold' => 'The placeholder <code>{COMPANY}</code> will be replaced with the asset&apos;s company name',
-    'label2_asset_logo'       => 'Use Asset Logo',
-    'label2_asset_logo_help'  => 'Use the logo of the asset&apos;s assigned company, rather than the value at <code>:setting_name</code>',
-    'label2_1d_type'          => '1D Barcode Type',
-    'label2_1d_type_help'     => 'Format for 1D barcodes',
-    'label2_2d_type'          => '2D Barcode Type',
-    'label2_2d_type_help'     => 'Format for 2D barcodes',
-    'label2_2d_target'        => '2D Barcode Target',
-    'label2_2d_target_help'   => 'The URL the 2D barcode points to when scanned',
+    'label2_title_help'       => 'ចំណងជើងដែលត្រូវបង្ហាញនៅលើស្លាកដែលគាំទ្រវា។',
+    'label2_title_help_phold' => 'កន្លែងដាក់ <code>{COMPANY}</code> នឹងត្រូវបានជំនួសដោយឈ្មោះក្រុមហ៊ុនរបស់ទ្រព្យសកម្ម',
+    'label2_asset_logo'       => 'ប្រើនិមិត្តសញ្ញាទ្រព្យសកម្ម',
+    'label2_asset_logo_help'  => 'ប្រើនិមិត្តសញ្ញារបស់ក្រុមហ៊ុនដែលបានចាត់តាំងជាទ្រព្យសកម្ម &apos;s ជាជាងតម្លៃនៅ <code>:setting_name</code>',
+    'label2_1d_type'          => 'ប្រភេទ 1D បាកូដ',
+    'label2_1d_type_help'     => 'ទម្រង់សម្រាប់លេខកូដ 1D',
+    'label2_2d_type'          => 'ប្រភេទ 2D Barcode',
+    'label2_2d_type_help'     => 'ទម្រង់សម្រាប់លេខកូដ 2D',
+    'label2_2d_target'        => 'គោលដៅ 2D Barcode',
+    'label2_2d_target_help'   => 'ទិន្នន័យ​ដែល​នឹង​ត្រូវ​បាន​ផ្ទុក​ក្នុង​បាកូដ 2D',
     'label2_fields'           => 'Field Definitions',
     'label2_fields_help'      => 'Fields can be added, removed, and reordered in the left column. For each field, multiple options for Label and DataSource can be added, removed, and reordered in the right column.',
-    'help_asterisk_bold'    => 'Text entered as <code>**text**</code> will be displayed as bold',
-    'help_blank_to_use'     => 'Leave blank to use the value from <code>:setting_name</code>',
-    'help_default_will_use' => '<code>:default</code> will use the value from <code>:setting_name</code>. <br>Note that the value of the barcodes must comply with the respective barcode spec in order to be successfully generated. Please see <a href="https://snipe-it.readme.io/docs/barcodes">the documentation <i class="fa fa-external-link"></i></a> for more details. ',
-    'default'               => 'Default',
-    'none'                  => 'None',
-    'google_callback_help' => 'This should be entered as the callback URL in your Google OAuth app settings in your organization&apos;s <strong><a href="https://console.cloud.google.com/" target="_blank">Google developer console <i class="fa fa-external-link" aria-hidden="true"></i></a></strong>.',
-    'google_login'      => 'Google Workspace Login Settings',
-    'enable_google_login'  => 'Enable users to login with Google Workspace',
-    'enable_google_login_help'  => 'Users will not be automatically provisioned. They must have an existing account here AND in Google Workspace, and their username here must match their Google Workspace email address. ',
-    'mail_reply_to' => 'Mail Reply-To Address',
-    'mail_from' => 'Mail From Address',
+    'purge_barcodes' => 'Purge Barcodes',
+    'help_asterisk_bold'    => 'អត្ថបទដែលបានបញ្ចូលជា <code>**text**</code> នឹងត្រូវបានបង្ហាញជាដិត',
+    'help_blank_to_use'     => 'ទុកទទេដើម្បីប្រើតម្លៃពី <code>:setting_name</code>',
+    'help_default_will_use' => '<code>:default</code> នឹងប្រើតម្លៃពី <code>:setting_name</code>។ <br>ចំណាំថាតម្លៃនៃ barcodes ត្រូវតែគោរពតាម barcode spec រៀងៗខ្លួន ដើម្បីអាចបង្កើតបានដោយជោគជ័យ។ សូមមើល <a href="https://snipe-it.readme.io/docs/barcodes">ឯកសារ <i class="fa fa-external-link"></i></a> សម្រាប់ព័ត៌មានលម្អិតបន្ថែម. ',
+    'asset_id'              => 'លេខសម្គាល់ទ្រព្យសកម្ម',
+    'data'               => 'ទិន្នន័យ',
+    'default'               => 'លំនាំដើម',
+    'none'                  => 'គ្មាន',
+    'google_callback_help' => 'វាគួរតែត្រូវបានបញ្ចូលជា URL ហៅត្រឡប់មកវិញនៅក្នុងការកំណត់កម្មវិធី Google OAuth របស់អ្នកនៅក្នុងស្ថាប័ន &apos;s របស់អ្នក <strong><a href="https://console.cloud.google.com/" target="_blank">កុងសូលអ្នកអភិវឌ្ឍន៍ Google < i class="fa fa-external-link" aria-hidden="true"></i></a></strong>។',
+    'google_login'      => 'ការកំណត់ការចូល Google Workspace',
+    'enable_google_login'  => 'បើកឱ្យអ្នកប្រើប្រាស់ចូលជាមួយ Google Workspace',
+    'enable_google_login_help'  => 'អ្នកប្រើប្រាស់នឹងមិនត្រូវបានផ្តល់ដោយស្វ័យប្រវត្តិទេ។ ពួកគេត្រូវតែមានគណនីដែលមានស្រាប់នៅទីនេះ និងនៅក្នុង Google Workspace ហើយឈ្មោះអ្នកប្រើប្រាស់របស់ពួកគេនៅទីនេះត្រូវតែផ្គូផ្គងអាសយដ្ឋានអ៊ីមែល Google Workspace របស់ពួកគេ។ ',
+    'mail_reply_to' => 'អ៊ីមែលឆ្លើយតបទៅអាសយដ្ឋាន',
+    'mail_from' => 'សំបុត្រពីអាសយដ្ឋាន',
     'database_driver' => 'Database Driver',
     'bs_table_storage' => 'Table Storage',
-    'timezone' => 'Timezone',
-    'profile_edit'          => 'Edit Profile',
-    'profile_edit_help'          => 'Allow users to edit their own profiles.',
+    'timezone' => 'តំបន់ពេលវេលា',
+    'test_mail' => 'Test Mail',
+    'profile_edit'          => 'កែសម្រួលប្រវត្តិរូប',
+    'profile_edit_help'          => 'អនុញ្ញាតឱ្យអ្នកប្រើកែសម្រួលទម្រង់ផ្ទាល់ខ្លួនរបស់ពួកគេ។',
+    'default_avatar' => 'Custom Default Avatar',
+    'default_avatar_help' => 'រូបភាពនេះនឹងត្រូវបានបង្ហាញជាទម្រង់ ប្រសិនបើអ្នកប្រើមិនមានរូបថតកម្រងព័ត៌មាន។',
+    'restore_default_avatar' => 'ស្ដារ <a href=":default_avatar" data-toggle="lightbox" data-type="image">រូបតំណាងលំនាំដើមនៃប្រព័ន្ធដើម</a>',
+    'restore_default_avatar_help' => '',
+    'due_checkin_days' => 'Due For Checkin Warning',
+    'due_checkin_days_help' => 'How many days before the expected checkin of an asset should it be listed in the "Due for checkin" page?',
+    'no_groups' => 'មិន​ទាន់​មាន​ក្រុម​ត្រូវ​បាន​បង្កើត​នៅ​ឡើយ​ទេ។ ចូលទៅកាន់ <code>Admin Settings> Permission Groups</code> ដើម្បីបន្ថែមមួយ។',
+    'text' => 'Text',
+
+    'username_formats' => [
+        'username_format'		=> 'ទម្រង់ឈ្មោះអ្នកប្រើប្រាស់',
+        'firstname_lastname_format'	=> 'នាមត្រកូលនាមខ្លួន (jane.smith)',
+        'first_name_format'	        => 'First Name (jane)',
+        'last_name_format'		=> 'Last Name (doe)',
+        'filastname_format'			=> 'First Initial Last Name (jsmith)',
+        'lastnamefirstinitial_format' =>  'Last Name First Initial (smithj)',
+        'firstname_lastname_underscore_format' => 'First Name Last Name (jane_smith)',
+        'firstinitial.lastname' => 'First Initial Last Name (j.smith)',
+        'lastname_firstinitial' => 'Last Name First Initial (smith_j)',
+        'lastname_dot_firstinitial_format' => 'Last Name First Initial (smith.j)',
+        'firstnamelastname'     => 'First Name Last Name (janesmith)',
+        'firstnamelastinitial'  => 'First Name Last Initial (janes)',
+        'lastnamefirstname'      => 'នាមត្រកូល.នាមខ្លួន (smith.jane)',
+    ],
+
+    'email_formats' => [
+        'email_format'			=> 'ទម្រង់អ៊ីមែល',
+        'firstname_lastname_format'	=> 'នាមត្រកូលនាមខ្លួន (jane.smith@example.com)',
+        'first_name_format'		=> 'នាមខ្លួន (jane@example.com)',
+        'last_name_format'		=> 'Last Name (doe@example.com)',
+        'filastname_format'			=> 'នាមត្រកូលដំបូង (jsmith@example.com)',
+        'lastnamefirstinitial_format' =>  'នាមត្រកូល នាមខ្លួនដំបូង (smithj@example.com)',
+        'firstname_lastname_underscore_format' => 'នាមត្រកូលនាមខ្លួន (jane_smith@example.com)',
+        'firstinitial.lastname' => 'នាមត្រកូលដំបូង (j.smith@example.com)',
+        'lastname_firstinitial' => 'នាមត្រកូល នាមខ្លួនដំបូង (smith_j@example.com)',
+        'lastname_dot_firstinitial_format' => 'នាមត្រកូល អក្សរដំបូងនាមខ្លួន (smith.j@example.com)',
+        'firstnamelastname'     => 'នាមខ្លួន នាមត្រកូល (janesmith@example.com)',
+        'firstnamelastinitial'  => 'នាមខ្លួន នាមត្រកូលដំបូង (janes@example.com)',
+        'lastnamefirstname'      => 'នាមត្រកូល.នាមខ្លួន (smith.jane@example.com)',
+    ],
+
+
+
+    'logo_labels' => [
+        'acceptance_pdf_logo'       => 'PDF Logo',
+        'email_logo'                => 'រូបសញ្ញាអ៊ីមែល',
+        'label_logo'                => 'ស្លាកសញ្ញា',
+        'logo'                      => 'Site Logo',
+        'favicon'                   => 'Favicon',
+    ],
+
+    'logo_help' => [
+        'email_logo_size'       => 'ឡូហ្គោការ៉េនៅក្នុងអ៊ីមែលមើលទៅល្អបំផុត។ ',
+    ],
+
+    'logo_option_types' => [
+        'text' => 'Text',
+        'logo' => 'និមិត្តសញ្ញា',
+        'logo_and_text' => 'Logo and Text',
+    ],
+
+
+    'legends' => [
+        'scoping' => 'Scoping',
+        'formats' => 'Default Formats',
+        'profiles' => 'User Profiles',
+        'eula' => 'EULA & Acceptance Preferences',
+        'misc_display' => 'Miscellaneous Display Options',
+        'email' => 'Email Preferences',
+        'checkin' => 'Checkin Preferences',
+        'dashboard' => 'Login & Dashboard Preferences',
+        'misc' => 'Miscellaneous',
+        'logos' => 'Logos & Display',
+        'colors' => 'Colors & Skins',
+        'footer' => 'Footer Preferences',
+        'security' => 'Security Preferences',
+        'general' => 'General',
+        'intervals' => 'Intervals & Thresholds',
+    ],
+
+
+    /* Keywords for settings overview help */
+    'keywords' => [
+        'brand'             => 'បាតកថា, និមិត្តសញ្ញា, បោះពុម្,ព ស្បែក, ស្បែក, បឋមកថា, ពណ៌, ពណ៌, css',
+        'general_settings'  => 'ការគាំទ្ររបស់ក្រុមហ៊ុន ហត្ថលេខា ការទទួលយក ទម្រង់អ៊ីមែល ទម្រង់ឈ្មោះអ្នកប្រើប្រាស់ រូបភាពក្នុងមួយទំព័រ រូបភាពតូច eula gravatar tos ផ្ទាំងគ្រប់គ្រង ភាពឯកជន',
+        'groups'            => 'ការអនុញ្ញាត ក្រុមការអនុញ្ញាត ការអនុញ្ញាត',
+        'labels'            => 'ស្លាក, បាកូដ, បាកូដ, សន្លឹក, បោះពុម្ព, upc, qr, 1d, 2d',
+        'localization'      => 'ការធ្វើមូលដ្ឋានីយកម្ម, រូបិយប័ណ្ណ, មូលដ្ឋាន, មូលដ្ឋាន, តំបន់ពេលវេលា, តំបន់ពេលវេលា, អន្តរជាតិ, អន្តរជាតិ, ភាសា, ភាសា, ការបកប្រែ',
+        'php_overview'      => 'phpinfo, ប្រព័ន្ធ, info',
+        'purge'             => 'លុបជាអចិន្ត្រៃយ៍',
+        'security'          => 'ពាក្យសម្ងាត់, ពាក្យសម្ងាត់, តម្រូវការ, កត្តាពីរ, កត្តាពីរ, ពាក្យសម្ងាត់ទូទៅ, ការចូលពីចម្ងាយ, ការចាកចេញ, ការផ្ទៀងផ្ទាត់',
+    ],
 
 ];
diff --git a/resources/lang/km-KH/admin/settings/message.php b/resources/lang/km-KH/admin/settings/message.php
index 3b837d170b..a2a3a46473 100644
--- a/resources/lang/km-KH/admin/settings/message.php
+++ b/resources/lang/km-KH/admin/settings/message.php
@@ -14,6 +14,9 @@ return [
         'restore_warning'       => 'បាទ ស្ដារវាឡើងវិញ។ ខ្ញុំទទួលស្គាល់ថាវានឹងសរសេរជាន់លើទិន្នន័យដែលមានស្រាប់ណាមួយនាពេលបច្ចុប្បន្ននៅក្នុងមូលដ្ឋានទិន្នន័យ។ វាក៏នឹងចេញពីអ្នកប្រើប្រាស់ដែលមានស្រាប់របស់អ្នកទាំងអស់ (រួមទាំងអ្នក)',
         'restore_confirm'       => 'តើ​អ្នក​ប្រាកដ​ថា​អ្នក​ចង់​ស្ដារ​មូលដ្ឋាន​ទិន្នន័យ​របស់​អ្នក​ពី :filename?'
     ],
+    'restore' => [
+        'success'               => 'ការបម្រុងទុកប្រព័ន្ធរបស់អ្នកត្រូវបានស្ដារឡើងវិញ។ សូមចូលម្តងទៀត។'
+    ],
     'purge' => [
         'error'     => 'កំហុសបានកើតឡើងខណៈពេលកំពុងសម្អាត។ ',
         'validation_failed'     => 'ការបញ្ជាក់ការសម្អាតរបស់អ្នកមិនត្រឹមត្រូវទេ។ សូមវាយពាក្យ "DELETE" នៅក្នុងប្រអប់បញ្ជាក់។',
@@ -26,21 +29,31 @@ return [
         'additional' => 'គ្មាន​សារ​បញ្ហា​បន្ថែម​ត្រូវ​បាន​ផ្ដល់​ឱ្យ​។ ពិនិត្យការកំណត់សំបុត្ររបស់អ្នក និងកំណត់ហេតុកម្មវិធីរបស់អ្នក។'
     ],
     'ldap' => [
-        'testing' => 'Testing LDAP Connection, Binding & Query ...',
+        'testing' => 'កំពុងសាកល្បងការតភ្ជាប់ LDAP Binding និង Query...',
         '500' => '500 កំហុសម៉ាស៊ីនមេ។ សូមពិនិត្យមើលកំណត់ហេតុម៉ាស៊ីនមេរបស់អ្នកសម្រាប់ព័ត៌មានបន្ថែម។',
         'error' => 'មាន​អ្វីមួយ​មិន​ប្រក្រតី :(',
         'sync_success' => 'គំរូនៃអ្នកប្រើប្រាស់ 10 នាក់បានត្រឡប់ពីម៉ាស៊ីនមេ LDAP ដោយផ្អែកលើការកំណត់របស់អ្នក៖',
         'testing_authentication' => 'កំពុងសាកល្បងការផ្ទៀងផ្ទាត់ LDAP...',
         'authentication_success' => 'អ្នកប្រើប្រាស់បានផ្ទៀងផ្ទាត់ភាពត្រឹមត្រូវប្រឆាំងនឹង LDAP ដោយជោគជ័យ!'
     ],
+    'labels' => [
+        'null_template' => 'Label template not found. Please select a template.',
+        ],
     'webhook' => [
         'sending' => 'កំពុងផ្ញើ៖ សារសាកល្បងកម្មវិធី...',
         'success' => 'ការរួមបញ្ចូល៖ webhook_name របស់អ្នកដំណើរការ!',
-        'success_pt1' => 'Success! Check the ',
+        'success_pt1' => 'ជោគជ័យ! ពិនិត្យ ',
         'success_pt2' => ' ឆានែលសម្រាប់សារសាកល្បងរបស់អ្នក ហើយត្រូវប្រាកដថាចុច រក្សាទុកខាងក្រោម ដើម្បីរក្សាទុកការកំណត់របស់អ្នក។',
         '500' => '500 កំហុសម៉ាស៊ីនមេ។',
         'error' => 'មាន​អ្វីមួយ​មិន​ប្រក្រតី។ :app បានឆ្លើយតបជាមួយ៖ :error_message',
         'error_redirect' => 'កំហុស៖ 301/302៖ ចំណុចបញ្ចប់ត្រឡប់ការបញ្ជូនបន្ត។ សម្រាប់ហេតុផលសុវត្ថិភាព យើងមិនធ្វើតាមការបញ្ជូនបន្តទេ។ សូមប្រើចំណុចបញ្ចប់ពិតប្រាកដ។',
         'error_misc' => 'មាន​អ្វីមួយ​មិន​ប្រក្រតី។ :( ',
-    ]
+        'webhook_fail' => ' webhook notification failed: Check to make sure the URL is still valid.',
+        'webhook_channel_not_found' => ' webhook channel not found.',
+        'ms_teams_deprecation' => 'The selected Microsoft Teams webhook URL will be deprecated Dec 31st, 2025. Please use a workflow URL. Microsoft\'s documentation on creating a workflow can be found <a href="https://support.microsoft.com/en-us/office/create-incoming-webhooks-with-workflows-for-microsoft-teams-8ae491c7-0394-4861-ba59-055e33f75498" target="_blank"> here.</a>',
+    ],
+    'location_scoping' => [
+        'not_saved' => 'Your settings were not saved.',
+        'mismatch' => 'There is 1 item in the database that need your attention before you can enable location scoping.|There are :count items in the database that need your attention before you can enable location scoping.',
+    ],
 ];
diff --git a/resources/lang/km-KH/admin/statuslabels/message.php b/resources/lang/km-KH/admin/statuslabels/message.php
index 863102d7b0..f26eb714a9 100644
--- a/resources/lang/km-KH/admin/statuslabels/message.php
+++ b/resources/lang/km-KH/admin/statuslabels/message.php
@@ -24,8 +24,8 @@ return [
 
     'help' => [
         'undeployable'   => 'ទ្រព្យសម្បត្តិទាំងនេះមិនអាចប្រគល់ឱ្យអ្នកណាម្នាក់បានទេ។',
-        'deployable'   => 'These assets can be checked out. Once they are assigned, they will assume a meta status of <i class="fas fa-circle text-blue"></i> <strong>Deployed</strong>.',
-        'archived'   => 'These assets cannot be checked out, and will only show up in the Archived view. This is useful for retaining information about assets for budgeting/historic purposes but keeping them out of the day-to-day asset list.',
+        'deployable'   => 'ទ្រព្យសម្បត្តិទាំងនេះអាចត្រូវបានពិនិត្យចេញ។ នៅពេលដែលពួកវាត្រូវបានចាត់តាំង ពួកគេនឹងសន្មត់ស្ថានភាពមេតានៃ <i class="fas fa-circle text-blue"></i><strong>បានប្រើ</strong>។',
+        'archived'   => 'ទ្រព្យសម្បត្តិទាំងនេះមិនអាចត្រូវបានពិនិត្យចេញទេ ហើយនឹងបង្ហាញតែនៅក្នុងទិដ្ឋភាពដែលបានទុកក្នុងប័ណ្ណសារប៉ុណ្ណោះ។ វាមានប្រយោជន៍សម្រាប់ការរក្សាទុកព័ត៌មានអំពីទ្រព្យសកម្មសម្រាប់គោលបំណងថវិកា/ជាប្រវត្តិសាស្ត្រ ប៉ុន្តែការរក្សាវាចេញពីបញ្ជីទ្រព្យសកម្មប្រចាំថ្ងៃ។',
         'pending'   => 'ទ្រព្យសម្បត្តិទាំងនេះមិនទាន់អាចប្រគល់ឱ្យអ្នកណាម្នាក់បានទេ ដែលជារឿយៗត្រូវបានប្រើប្រាស់សម្រាប់វត្ថុដែលអស់សម្រាប់ការជួសជុល ប៉ុន្តែត្រូវបានគេរំពឹងថានឹងត្រឡប់មកចរាចរវិញ។',
     ],
 
diff --git a/resources/lang/km-KH/admin/statuslabels/table.php b/resources/lang/km-KH/admin/statuslabels/table.php
index 3451f3e4a6..cfed7a698a 100644
--- a/resources/lang/km-KH/admin/statuslabels/table.php
+++ b/resources/lang/km-KH/admin/statuslabels/table.php
@@ -1,19 +1,19 @@
 <?php
 
 return array(
-    'about'      	=> 'About Status Labels',
+    'about'      	=> 'About Status Types',
     'archived'      	=> 'ទុកក្នុងប័ណ្ណសារ',
-    'create'      	=> 'Create Status Label',
-    'color'      	=> 'Chart Color',
-    'default_label' => 'Default Label',
-    'default_label_help' => 'This is used to ensure your most commonly used status labels appear at the top of the select box when creating/editing assets.',
+    'create'      	=> 'បង្កើតស្លាកស្ថានភាព',
+    'color'      	=> 'ពណ៌គំនូសតាង',
+    'default_label' => 'ស្លាកលំនាំដើម',
+    'default_label_help' => 'វា​ត្រូវ​បាន​ប្រើ​ដើម្បី​ធានា​ថា​ស្លាក​ស្ថានភាព​ដែល​ប្រើ​ជា​ទូទៅ​របស់​អ្នក​បង្ហាញ​នៅ​ផ្នែក​ខាង​លើ​នៃ​ប្រអប់​ជ្រើសរើស​ពេល​បង្កើត/កែសម្រួល​ទ្រព្យសកម្ម។',
     'deployable'      	=> 'អាចប្រើបាន',
-    'info'      	=> 'Status labels are used to describe the various states your assets could be in. They may be out for repair, lost/stolen, etc. You can create new status labels for deployable, pending and archived assets.',
-    'name'      	=> 'Status Name',
+    'info'      	=> 'Status label types are used to describe the various states your assets could be in. They may be out for repair, lost/stolen, etc. You can create new status labels for your deployable, pending and archived assets according to your own workflow. For more information, <a href="https://snipe-it.readme.io/docs/overview#status-labels" target="_blank">see the documentation <i class="fa fa-external-link"></i></a>.',
+    'name'      	=> 'ឈ្មោះស្ថានភាព',
     'pending'      	=> 'កំពុងរង់ចាំ',
-    'status_type'   => 'Status Type',
-    'show_in_nav'   => 'Show in side nav',
-    'title'      	=> 'Status Labels',
+    'status_type'   => 'ប្រភេទស្ថានភាព',
+    'show_in_nav'   => 'បង្ហាញនៅក្នុង side nav',
+    'title'      	=> 'ស្លាកស្ថានភាព',
     'undeployable'  => 'មិន​អាច​ប្រើ​បាន',
-    'update'      	=> 'Update Status Label',
+    'update'      	=> 'ធ្វើបច្ចុប្បន្នភាពស្លាកស្ថានភាព',
 );
diff --git a/resources/lang/km-KH/admin/suppliers/table.php b/resources/lang/km-KH/admin/suppliers/table.php
index 123da8d87d..70b2044f9f 100644
--- a/resources/lang/km-KH/admin/suppliers/table.php
+++ b/resources/lang/km-KH/admin/suppliers/table.php
@@ -1,26 +1,26 @@
 <?php
 
 return array(
-    'about_suppliers_title' => 'About Suppliers',
-    'about_suppliers_text'  => 'Suppliers are used to track the source of items',
-    'address'               => 'Supplier Address',
+    'about_suppliers_title' => 'អំពីអ្នកផ្គត់ផ្គង់',
+    'about_suppliers_text'  => 'អ្នកផ្គត់ផ្គង់ត្រូវបានប្រើដើម្បីតាមដានប្រភពនៃធាតុ',
+    'address'               => 'អាសយដ្ឋានអ្នកផ្គត់ផ្គង់',
     'assets'                => 'ទ្រព្យសកម្ម',
     'city'                  => 'ទីក្រុង',
-    'contact'               => 'Contact Name',
+    'contact'               => 'ឈ្មោះទំនាក់ទំនង',
     'country'               => 'ប្រទេស',
-    'create'                => 'Create Supplier',
-    'email'                 => 'Email',
-    'fax'                   => 'Fax',
+    'create'                => 'បង្កើតអ្នកផ្គត់ផ្គង់',
+    'email'                 => 'អ៊ីមែល',
+    'fax'                   => 'ទូរសារ',
     'id'                    => 'លេខសម្គាល់',
     'licenses'              => 'អាជ្ញាប័ណ្ណ',
-    'name'                  => 'Supplier Name',
+    'name'                  => 'អ្នកផ្គត់ផ្គង់',
     'notes'                 => 'កំណត់ចំណាំ',
-    'phone'                 => 'Phone',
+    'phone'                 => 'ទូរស័ព្ទ',
     'state'                 => 'រដ្ឋ',
-    'suppliers'             => 'Suppliers',
-    'update'                => 'Update Supplier',
-    'view'                  => 'View Supplier',
-    'view_assets_for'       => 'View Assets for',
-    'zip'                   => 'Postal Code',
+    'suppliers'             => 'អ្នកផ្គត់ផ្គង់ច្រើន',
+    'update'                => 'អាប់ដេតអ្នកផ្គត់ផ្គង់',
+    'view'                  => 'មើលអ្នកផ្គត់ផ្គង់',
+    'view_assets_for'       => 'មើលទ្រព្យសម្បត្តិសម្រាប់',
+    'zip'                   => 'លេខកូដប្រៃសណីយ៍',
 
 );
diff --git a/resources/lang/km-KH/admin/users/general.php b/resources/lang/km-KH/admin/users/general.php
index e16d4fd1d7..9ffaba5fca 100644
--- a/resources/lang/km-KH/admin/users/general.php
+++ b/resources/lang/km-KH/admin/users/general.php
@@ -6,7 +6,7 @@ return [
     'assets_user'       => 'ទ្រព្យ​សម្បត្តិ​ដែល​ត្រូវ​បាន​ចាត់​ឱ្យ​ទៅ​: ឈ្មោះ​',
     'bulk_update_warn'	=> 'អ្នកហៀបនឹងកែសម្រួលលក្ខណៈសម្បត្តិរបស់ :user_count អ្នកប្រើប្រាស់។ សូមចំណាំថា អ្នកមិនអាចផ្លាស់ប្តូរលក្ខណៈអ្នកប្រើប្រាស់ផ្ទាល់ខ្លួនរបស់អ្នកដោយប្រើទម្រង់នេះ ហើយត្រូវតែធ្វើការកែសម្រួលអ្នកប្រើប្រាស់ផ្ទាល់ខ្លួនរបស់អ្នកជាលក្ខណៈបុគ្គល។',
     'bulk_update_help'	=> 'ទម្រង់បែបបទនេះអនុញ្ញាតឱ្យអ្នកធ្វើបច្ចុប្បន្នភាពអ្នកប្រើប្រាស់ច្រើននាក់ក្នុងពេលតែមួយ។ បំពេញតែក្នុងវាលដែលអ្នកត្រូវការផ្លាស់ប្តូរ។ វាល​ណា​មួយ​ដែល​ទុក​ឲ្យ​ទទេ​នឹង​នៅ​តែ​មិន​ផ្លាស់​ប្តូរ។',
-    'current_assets'    => 'Assets currently checked out to this user',
+    'current_assets'    => 'បច្ចុប្បន្នទ្រព្យសកម្មបានប្រគល់អោយទៅកាន់អ្នកប្រើប្រាស់នេះ។',
     'clone'             => 'ក្លូន អ្នកប្រើប្រាស់',
     'contact_user'      => 'ទំនាក់ទំនងៈ ឈ្មោះ​',
     'edit'              => 'កែសម្រួលអ្នកប្រើប្រាស់',
@@ -19,9 +19,11 @@ return [
     'print_assigned'    => 'បោះពុម្ពដែលបានចាត់តាំងទាំងអស់។',
     'email_assigned'    => 'បញ្ជីអ៊ីមែលដែលបានចាត់តាំងទាំងអស់។',
     'user_notified'     => 'អ្នក​ប្រើ​ត្រូវ​បាន​ផ្ញើ​អ៊ីមែល​នូវ​បញ្ជី​នៃ​ធាតុ​ដែល​បាន​កំណត់​បច្ចុប្បន្ន​របស់​ពួកគេ។',
+    'users_notified'    => 'The user has been emailed a list of their currently assigned items.|:count users have been emailed a list of their currently assigned items.',
+    'users_notified_warning' => ':count user has been emailed a list of their currently assigned items, however :no_email users did not have an email address so could not be emailed.|:count users have been emailed a list of their currently assigned items, however :no_email user(s) did not have an email address so could not be emailed.',
     'auto_assign_label' => 'រួមបញ្ចូលអ្នកប្រើប្រាស់នេះនៅពេលផ្តល់អាជ្ញាប័ណ្ណដែលមានសិទ្ធិដោយស្វ័យប្រវត្តិ',
     'auto_assign_help'  => 'រំលងអ្នកប្រើប្រាស់នេះក្នុងការផ្តល់អាជ្ញាប័ណ្ណដោយស្វ័យប្រវត្តិ',
-    'software_user'     => 'Software Checked out to :name',
+    'software_user'     => 'កម្មវិធីដែលបានប្រគល់ទៅកាន់៖ ឈ្មោះ',
     'send_email_help'   => 'អ្នក​ត្រូវ​តែ​ផ្តល់​អាសយដ្ឋាន​អ៊ីមែល​សម្រាប់​អ្នក​ប្រើ​នេះ​ដើម្បី​ផ្ញើ​ព័ត៌មាន​សម្ងាត់​ឱ្យ​ពួកគេ​។ ការផ្ញើអត្តសញ្ញាណប័ណ្ណតាមអ៊ីមែលអាចធ្វើបានតែលើការបង្កើតអ្នកប្រើប្រាស់ប៉ុណ្ណោះ។ ពាក្យ​សម្ងាត់​ត្រូវ​បាន​រក្សា​ទុក​ជា​សញ្ញា​មួយ​ផ្លូវ ហើយ​មិន​អាច​ទាញ​យក​វិញ​បាន​ទេ​ពេល​រក្សា​ទុក។',
     'view_user'         => 'មើលអ្នកប្រើប្រាស់៖ ឈ្មោះ',
     'usercsv'           => 'ឯកសារ CSV',
@@ -35,9 +37,9 @@ return [
     'superadmin_permission_warning' => 'មានតែ superadmins ប៉ុណ្ណោះដែលអាចផ្តល់សិទ្ធិចូលប្រើ superadmin អ្នកប្រើប្រាស់។',
     'admin_permission_warning' => 'មាន​តែ​អ្នក​ប្រើ​ដែល​មាន​សិទ្ធិ​ជា​អ្នក​គ្រប់គ្រង ឬ​ខ្ពស់​ជាង​នេះ​ប៉ុណ្ណោះ​ដែល​អាច​ផ្ដល់​សិទ្ធិ​ឱ្យ​អ្នក​ប្រើ​ជា​អ្នក​គ្រប់គ្រង។',
     'remove_group_memberships' => 'ដកសមាជិកភាពក្រុមចេញ',
-    'warning_deletion_information' => 'You are about to checkin ALL items from the :count user(s) listed below. Super admin names are highlighted in red.',
+    'warning_deletion_information' => 'អ្នកហៀបនឹងប្រគល់ត្រលប់វិញធាតុទាំងអស់ពី :count user(s) ដែលបានរាយខាងក្រោម។ ឈ្មោះអ្នកគ្រប់គ្រងជាន់ខ្ពស់ត្រូវបានបន្លិចជាពណ៌ក្រហម។',
     'update_user_assets_status' => 'អាប់ដេតទ្រព្យសកម្មទាំងអស់សម្រាប់អ្នកប្រើប្រាស់ទាំងនេះទៅកាន់ស្ថានភាពនេះ។',
-    'checkin_user_properties' => 'Check in all properties associated with these users',
+    'checkin_user_properties' => 'ប្រគល់មកវិញលក្ខណៈសម្បត្តិទាំងអស់ដែលទាក់ទងនឹងអ្នកប្រើប្រាស់ទាំងនេះ',
     'remote_label'   => 'នេះគឺជាអ្នកប្រើប្រាស់ពីចម្ងាយ',
     'remote'   => 'ពីចម្ងាយ',
     'remote_help' => 'វាអាចមានប្រយោជន៍ ប្រសិនបើអ្នកត្រូវការត្រងដោយអ្នកប្រើប្រាស់ពីចម្ងាយ ដែលមិនដែល ឬកម្រចូលមកក្នុងទីតាំងជាក់ស្តែងរបស់អ្នក។',
diff --git a/resources/lang/km-KH/admin/users/message.php b/resources/lang/km-KH/admin/users/message.php
index a4756ed5a6..70a4c41435 100644
--- a/resources/lang/km-KH/admin/users/message.php
+++ b/resources/lang/km-KH/admin/users/message.php
@@ -6,11 +6,11 @@ return array(
     'declined'                  => 'អ្នកបានបដិសេធដោយជោគជ័យនូវទ្រព្យសកម្មនេះ។',
     'bulk_manager_warn'	        => 'អ្នកប្រើប្រាស់របស់អ្នកត្រូវបានអាប់ដេតដោយជោគជ័យ ទោះជាយ៉ាងណាក៏ដោយ ធាតុគ្រប់គ្រងរបស់អ្នកមិនត្រូវបានរក្សាទុកទេ ដោយសារអ្នកគ្រប់គ្រងដែលអ្នកបានជ្រើសរើសក៏ស្ថិតនៅក្នុងបញ្ជីអ្នកប្រើប្រាស់ដែលត្រូវកែសម្រួលដែរ ហើយអ្នកប្រើប្រាស់ប្រហែលជាមិនមែនជាអ្នកគ្រប់គ្រងផ្ទាល់របស់ពួកគេទេ។ សូមជ្រើសរើសអ្នកប្រើប្រាស់របស់អ្នកម្តងទៀត ដោយមិនរាប់បញ្ចូលអ្នកគ្រប់គ្រង។',
     'user_exists'               => 'អ្នកប្រើប្រាស់មានហើយ!',
-    'user_not_found'            => 'អ្នកប្រើប្រាស់មិនមានទេ។',
-    'user_login_required'       => 'The login field is required',
+    'user_not_found'            => 'អ្នកប្រើប្រាស់មិនមានទេ ឬអ្នកមិនមានសិទ្ធិមើលពួកវា។',
+    'user_login_required'       => 'វាលចូលត្រូវបានទាមទារ',
     'user_has_no_assets_assigned' => 'មិន​មាន​ទ្រព្យ​សកម្ម​ដែល​ត្រូវ​បាន​ផ្ដល់​ឱ្យ​អ្នក​ប្រើ​នា​ពេល​បច្ចុប្បន្ន​នេះ​។',
     'user_password_required'    => 'ពាក្យសម្ងាត់គឺត្រូវបានទាមទារ។',
-    'insufficient_permissions'  => 'Insufficient Permissions.',
+    'insufficient_permissions'  => 'ការអនុញ្ញាតមិនគ្រប់គ្រាន់។',
     'user_deleted_warning'      => 'អ្នក​ប្រើ​នេះ​ត្រូវ​បាន​លុប។ អ្នកនឹងត្រូវស្តារអ្នកប្រើប្រាស់នេះឡើងវិញ ដើម្បីកែសម្រួលពួកគេ ឬផ្តល់ទ្រព្យសម្បត្តិថ្មី។',
     'ldap_not_configured'        => 'ការរួមបញ្ចូល LDAP មិនត្រូវបានកំណត់រចនាសម្ព័ន្ធសម្រាប់ការដំឡើងនេះទេ។',
     'password_resets_sent'      => 'អ្នកប្រើប្រាស់ដែលបានជ្រើសរើសដែលត្រូវបានធ្វើឱ្យសកម្ម និងមានអាសយដ្ឋានអ៊ីមែលត្រឹមត្រូវត្រូវបានផ្ញើតំណកំណត់ពាក្យសម្ងាត់ឡើងវិញ។',
@@ -27,7 +27,7 @@ return array(
         'ban'       => 'អ្នកប្រើប្រាស់ត្រូវបានហាមឃាត់ដោយជោគជ័យ។',
         'unban'     => 'អ្នកប្រើប្រាស់ត្រូវបានលុបចោលដោយជោគជ័យ។',
         'suspend'   => 'អ្នកប្រើប្រាស់ត្រូវបានផ្អាកដោយជោគជ័យ។',
-        'unsuspend' => 'User was successfully unsuspended.',
+        'unsuspend' => 'អ្នកប្រើប្រាស់ត្រូវបានបញ្ឈប់ដោយជោគជ័យ។',
         'restored'  => 'អ្នកប្រើប្រាស់ត្រូវបានស្ដារឡើងវិញដោយជោគជ័យ។',
         'import'    => 'អ្នកប្រើប្រាស់បាននាំចូលដោយជោគជ័យ។',
     ),
@@ -37,22 +37,23 @@ return array(
         'update' => 'មានបញ្ហាក្នុងការអាប់ដេតអ្នកប្រើប្រាស់។ សូម​ព្យាយាម​ម្តង​ទៀត។',
         'delete' => 'មានបញ្ហាក្នុងការលុបអ្នកប្រើប្រាស់។ សូម​ព្យាយាម​ម្តង​ទៀត។',
         'delete_has_assets' => 'អ្នក​ប្រើ​នេះ​មាន​ធាតុ​ដែល​បាន​កំណត់ ហើយ​មិន​អាច​លុប​បាន​ទេ។',
-        'delete_has_assets_var' => 'This user still has an asset assigned. Please check it in first.|This user still has :count assets assigned. Please check their assets in first.',
-        'delete_has_licenses_var' => 'This user still has a license seats assigned. Please check it in first.|This user still has :count license seats assigned. Please check them in first.',
-        'delete_has_accessories_var' => 'This user still has an accessory assigned. Please check it in first.|This user still has :count accessories assigned. Please check their assets in first.',
-        'delete_has_locations_var' => 'This user still manages a location. Please select another manager first.|This user still manages :count locations. Please select another manager first.',
-        'delete_has_users_var' => 'This user still manages another user. Please select another manager for that user first.|This user still manages :count users. Please select another manager for them first.',
+        'delete_has_assets_var' => 'អ្នកប្រើប្រាស់នេះនៅតែមានទ្រព្យសម្បត្តិដែលបានកំណត់។ សូមពិនិត្យមើលវាជាមុនសិន។|អ្នកប្រើប្រាស់នេះនៅតែមាន៖ រាប់ទ្រព្យសម្បត្តិដែលបានកំណត់។ សូមពិនិត្យមើលទ្រព្យសម្បត្តិរបស់ពួកគេជាមុនសិន។',
+        'delete_has_licenses_var' => 'អ្នកប្រើប្រាស់នេះនៅតែមានកន្លែងផ្តល់អាជ្ញាប័ណ្ណ។ សូមពិនិត្យមើលវាជាមុនសិន។|អ្នកប្រើប្រាស់នេះនៅតែមាន៖ រាប់ចំនួនអាសនៈអាជ្ញាប័ណ្ណដែលបានកំណត់។ សូមពិនិត្យមើលពួកវាជាមុនសិន។',
+        'delete_has_accessories_var' => 'អ្នកប្រើប្រាស់នេះនៅតែមានគ្រឿងបន្លាស់ដែលបានកំណត់។ សូមពិនិត្យមើលវាជាមុនសិន។|អ្នកប្រើប្រាស់នេះនៅតែមានៈរាប់គ្រឿងបន្ថែមដែលបានកំណត់។ សូមពិនិត្យមើលទ្រព្យសម្បត្តិរបស់ពួកគេជាមុនសិន។',
+        'delete_has_locations_var' => 'អ្នកប្រើប្រាស់នេះនៅតែគ្រប់គ្រងទីតាំង។ សូមជ្រើសរើសអ្នកគ្រប់គ្រងផ្សេងទៀតជាមុនសិន។|អ្នកប្រើប្រាស់នេះនៅតែគ្រប់គ្រង៖ រាប់ទីតាំង។ សូមជ្រើសរើសអ្នកគ្រប់គ្រងផ្សេងទៀតជាមុនសិន។',
+        'delete_has_users_var' => 'អ្នកប្រើប្រាស់នេះនៅតែគ្រប់គ្រងអ្នកប្រើប្រាស់ផ្សេងទៀត។ សូមជ្រើសរើសអ្នកគ្រប់គ្រងផ្សេងទៀតសម្រាប់អ្នកប្រើប្រាស់នោះជាមុនសិន។|អ្នកប្រើប្រាស់នេះនៅតែគ្រប់គ្រង៖ រាប់អ្នកប្រើប្រាស់។ សូមជ្រើសរើសអ្នកគ្រប់គ្រងផ្សេងទៀតសម្រាប់ពួកគេជាមុនសិន។',
         'unsuspend' => 'មានបញ្ហាក្នុងការឈប់ផ្អាកអ្នកប្រើប្រាស់។ សូម​ព្យាយាម​ម្តង​ទៀត។',
         'import'    => 'មានបញ្ហាក្នុងការនាំចូលអ្នកប្រើប្រាស់។ សូម​ព្យាយាម​ម្តង​ទៀត។',
         'asset_already_accepted' => 'ទ្រព្យសកម្មនេះត្រូវបានទទួលរួចហើយ។',
         'accept_or_decline' => 'អ្នក​ត្រូវតែ​ទទួល​យក ឬ​បដិសេធ​ទ្រព្យសកម្ម​នេះ។',
-        'cannot_delete_yourself' => 'We would feel really bad if you deleted yourself, please reconsider.',
-        'incorrect_user_accepted' => 'The asset you have attempted to accept was not checked out to you.',
+        'cannot_delete_yourself' => 'យើងពិតជាមានអារម្មណ៍មិនល្អ ប្រសិនបើអ្នកលុបខ្លួនឯង សូមពិចារណាឡើងវិញ។',
+        'incorrect_user_accepted' => 'ទ្រព្យសកម្មដែលអ្នកបានព្យាយាមទទួលយកមិនត្រូវបានពិនិត្យចេញសម្រាប់អ្នកទេ។',
         'ldap_could_not_connect' => 'មិនអាចភ្ជាប់ទៅម៉ាស៊ីនមេ LDAP បានទេ។ សូមពិនិត្យមើលការកំណត់រចនាសម្ព័ន្ធម៉ាស៊ីនមេ LDAP របស់អ្នកនៅក្នុងឯកសារកំណត់រចនាសម្ព័ន្ធ LDAP ។ <br>កំហុសពីម៉ាស៊ីនមេ LDAP៖',
         'ldap_could_not_bind' => 'មិនអាចភ្ជាប់ទៅម៉ាស៊ីនមេ LDAP បានទេ។ សូមពិនិត្យមើលការកំណត់រចនាសម្ព័ន្ធម៉ាស៊ីនមេ LDAP របស់អ្នកនៅក្នុងឯកសារកំណត់រចនាសម្ព័ន្ធ LDAP ។ <br>កំហុសពីម៉ាស៊ីនមេ LDAP៖ ',
         'ldap_could_not_search' => 'មិនអាចស្វែងរកម៉ាស៊ីនមេ LDAP បានទេ។ សូមពិនិត្យមើលការកំណត់រចនាសម្ព័ន្ធម៉ាស៊ីនមេ LDAP របស់អ្នកនៅក្នុងឯកសារកំណត់រចនាសម្ព័ន្ធ LDAP ។ <br>កំហុសពីម៉ាស៊ីនមេ LDAP៖',
         'ldap_could_not_get_entries' => 'មិនអាចទទួលបានធាតុពីម៉ាស៊ីនមេ LDAP ទេ។ សូមពិនិត្យមើលការកំណត់រចនាសម្ព័ន្ធម៉ាស៊ីនមេ LDAP របស់អ្នកនៅក្នុងឯកសារកំណត់រចនាសម្ព័ន្ធ LDAP ។ <br>កំហុសពីម៉ាស៊ីនមេ LDAP៖',
         'password_ldap' => 'ពាក្យសម្ងាត់សម្រាប់គណនីនេះត្រូវបានគ្រប់គ្រងដោយ LDAP/Active Directory។ សូមទាក់ទងផ្នែក IT របស់អ្នក ដើម្បីផ្លាស់ប្តូរពាក្យសម្ងាត់របស់អ្នក។ ',
+        'multi_company_items_assigned' => 'អ្នក​ប្រើ​នេះ​មាន​ធាតុ​ដែល​ត្រូវ​បាន​កំណត់​ជា​របស់​ក្រុមហ៊ុន​ផ្សេង។ សូមពិនិត្យមើលពួកគេនៅក្នុង ឬកែសម្រួលក្រុមហ៊ុនរបស់ពួកគេ។'
     ),
 
     'deletefile' => array(
diff --git a/resources/lang/km-KH/admin/users/table.php b/resources/lang/km-KH/admin/users/table.php
index db76fdec9d..5ca1182cfe 100644
--- a/resources/lang/km-KH/admin/users/table.php
+++ b/resources/lang/km-KH/admin/users/table.php
@@ -1,41 +1,41 @@
 <?php
 
 return array(
-    'activated'  			=> 'Active',
+    'activated'  			=> 'សកម្ម',
     'allow'  				=> 'អនុញ្ញាត',
     'checkedout'  			=> 'ទ្រព្យសកម្ម',
     'created_at' 			=> 'បានបង្កើត',
-    'createuser' 			=> 'Create User',
+    'createuser' 			=> 'បង្កើតអ្នកប្រើប្រាស់',
     'deny'  				=> 'បដិសេធ',
-    'email'      			=> 'Email',
-    'employee_num'      	=> 'Employee No.',
+    'email'      			=> 'អ៊ីមែល',
+    'employee_num'      	=> 'លេខបុគ្គលិក',
     'first_name' 			=> 'នាមខ្លួន',
-    'groupnotes'			=> 'Select a group to assign to the user, remember that a user takes on the permissions of the group they are assigned. Use ctrl+click (or cmd+click on MacOS) to deselect groups.',
+    'groupnotes'			=> 'ជ្រើសរើសក្រុមដែលត្រូវប្រគល់ឱ្យអ្នកប្រើប្រាស់ សូមចាំថាអ្នកប្រើប្រាស់ទទួលយកការអនុញ្ញាតពីក្រុមដែលពួកគេត្រូវបានចាត់តាំង។ ប្រើ ctrl + ចុច (ឬ cmd + ចុចលើ MacOS) ដើម្បីដកការជ្រើសរើសក្រុម។',
     'id'         			=> 'Id',
-    'inherit'  				=> 'Inherit',
-    'job' 					=> 'Job Title',
+    'inherit'  				=> 'មរតក',
+    'job' 					=> 'ចំណងជើងការងារ',
     'last_login'  			=> 'ការចូលចុងក្រោយ',
     'last_name'  			=> 'នាមត្រកូល',
     'location'  			=> 'ទីតាំង',
-    'lock_passwords'		=> 'Login details cannot be changed on this installation.',
+    'lock_passwords'		=> 'ព័ត៌មានលម្អិតនៃការចូលមិនអាចផ្លាស់ប្តូរនៅលើការដំឡើងនេះបានទេ។',
     'manager' 				=> 'អ្នកគ្រប់គ្រង',
-    'managed_locations'     => 'Managed Locations',
-    'managed_users'         => 'Managed Users',
+    'managed_locations'     => 'ទីតាំងគ្រប់គ្រង',
+    'managed_users'         => 'អ្នកប្រើប្រាស់ដែលបានគ្រប់គ្រង',
     'name' 					=> 'ឈ្មោះ',
-    'nogroup'               => 'No groups have been created yet. To add one, visit: ',
+    'nogroup'               => 'No groups have been created yet. To add one, visit:',
     'notes'                 => 'កំណត់ចំណាំ',
-    'password_confirm' 		=> 'Confirm Password',
-    'password' 				=> 'Password',
-    'phone'  				=> 'Phone',
-    'show_current'          => 'Show Current Users',
-    'show_deleted'          => 'Show Deleted Users',
+    'password_confirm' 		=> 'បញ្ជាក់ពាក្យសម្ងាត់',
+    'password' 				=> 'ពាក្យសម្ងាត់',
+    'phone'  				=> 'ទូរស័ព្ទ',
+    'show_current'          => 'បង្ហាញអ្នកប្រើប្រាស់បច្ចុប្បន្ន',
+    'show_deleted'          => 'បង្ហាញអ្នកប្រើប្រាស់ដែលបានលុប',
     'title' 				=> 'ចំណងជើង',
-	'to_restore_them'		=> 'to restore them.',
-    'total_assets_cost'     => "Total Assets Cost",
-    'updateuser' 			=> 'Update User',
+	'to_restore_them'		=> 'ដើម្បីស្ដារពួកគេ។',
+    'total_assets_cost'     => "តម្លៃទ្រព្យសកម្មសរុប",
+    'updateuser' 			=> 'ធ្វើបច្ចុប្បន្នភាពអ្នកប្រើប្រាស់',
     'username' 				=> 'ឈ្មោះ​អ្នកប្រើប្រាស់',
-	'user_deleted_text' 	=> 'This user has been marked as deleted.',
-    'username_note' 		=> '(This is used for Active Directory binding only, not for login.)',
+	'user_deleted_text' 	=> 'អ្នកប្រើប្រាស់នេះត្រូវបានសម្គាល់ថាបានលុប។',
+    'username_note' 		=> '(វា​ត្រូវ​បាន​ប្រើ​សម្រាប់​តែ​ការ​ចង Active Directory ប៉ុណ្ណោះ មិន​មែន​សម្រាប់​ចូល​ទេ។)',
     'cloneuser'             => 'ក្លូន អ្នកប្រើប្រាស់',
-    'viewusers' 			=> 'View Users',
+    'viewusers' 			=> 'មើលអ្នកប្រើប្រាស់',
 );
diff --git a/resources/lang/km-KH/auth.php b/resources/lang/km-KH/auth.php
index ab77d166a3..c454eca3fa 100644
--- a/resources/lang/km-KH/auth.php
+++ b/resources/lang/km-KH/auth.php
@@ -15,6 +15,6 @@ return array(
 
     'failed' => 'លិខិតសម្គាល់ទាំងនេះមិនត្រូវគ្នានឹងកំណត់ត្រារបស់យើងទេ។',
     'password' => 'ពាក្យសម្ងាត់ដែលបានផ្តល់គឺមិនត្រឹមត្រូវទេ។',
-    'throttle' => 'ការព្យាយាមចូលច្រើនពេក។ សូមព្យាយាមម្តងទៀតក្នុងរយៈពេល : វិនាទីវិនាទី។',
+    'throttle' => 'Too many login attempts. Please try again in :minutes minute(s).',
 
 );
diff --git a/resources/lang/km-KH/auth/message.php b/resources/lang/km-KH/auth/message.php
index 5fd211ed2f..21d51f5603 100644
--- a/resources/lang/km-KH/auth/message.php
+++ b/resources/lang/km-KH/auth/message.php
@@ -6,16 +6,14 @@ return array(
     'account_not_found'      => 'ឈ្មោះ​អ្នក​ប្រើ ឬ​ពាក្យ​សម្ងាត់​មិន​ត្រឹមត្រូវ។',
     'account_not_activated'  => 'គណនីអ្នកប្រើប្រាស់នេះមិនដំណើរការទេ។',
     'account_suspended'      => 'គណនីអ្នកប្រើប្រាស់នេះត្រូវបានផ្អាក។',
-    'account_banned'         => 'គណនីអ្នកប្រើប្រាស់នេះត្រូវបានហាមឃាត់។',
-    'throttle'               => 'ការព្យាយាមចូលដែលបរាជ័យច្រើនពេក។ សូមព្យាយាមម្តងទៀតក្នុងរយៈពេល៖ នាទីនាទី។',
 
     'two_factor' => array(
         'already_enrolled'      => 'ឧបករណ៍របស់អ្នកបានចុះឈ្មោះរួចហើយ។',
         'success'               => 'អ្នកបានចូលដោយជោគជ័យ។',
         'code_required'         => 'កូដកត្តាពីរត្រូវបានទាមទារ។',
         'invalid_code'          => 'កូដកត្តាពីរគឺមិនត្រឹមត្រូវទេ។',
-        'enter_two_factor_code' => 'Please enter your two-factor authentication code.',
-        'please_enroll'         => 'Please enroll a device in two-factor authentication.',
+        'enter_two_factor_code' => 'សូមបញ្ចូលលេខកូដផ្ទៀងផ្ទាត់ពីរកត្តារបស់អ្នក។',
+        'please_enroll'         => 'សូមចុះឈ្មោះឧបករណ៍មួយនៅក្នុងការផ្ទៀងផ្ទាត់ពីរកត្តា។',
     ),
 
     'signin' => array(
diff --git a/resources/lang/km-KH/button.php b/resources/lang/km-KH/button.php
index 9afcf24983..42ac6d8cf4 100644
--- a/resources/lang/km-KH/button.php
+++ b/resources/lang/km-KH/button.php
@@ -7,6 +7,7 @@ return [
     'checkin_and_delete'  	    => 'Checkin ទាំងអស់ / លុបអ្នកប្រើប្រាស់',
     'delete'  	                => 'លុប',
     'edit'    	                => 'កែសម្រួល',
+    'clone'    	                => 'Clone',
     'restore' 	                => 'ស្តារ',
     'remove'                    => 'ដកចេញ',
     'request'                   => 'ស្នើសុំ',
@@ -21,4 +22,13 @@ return [
     'add_maintenance'           => 'បន្ថែមការថែទាំ',
     'append'                    => 'បន្ថែម',
     'new'                       => 'ថ្មី',
+    'var' => [
+        'clone'     => 'ក្លូន៖ item_type',
+        'edit'      => 'កែសម្រួល៖ item_type',
+        'delete'    => 'លុប៖ item_type',
+        'restore'   => 'ស្ដារ៖ item_type',
+        'create'    => 'បង្កើតថ្មី៖ item_type',
+        'checkout'  => 'Checkout :item_type',
+        'checkin'   => 'Checkin :item_type',
+    ]
 ];
diff --git a/resources/lang/km-KH/general.php b/resources/lang/km-KH/general.php
index 87a8be446e..801f42f54d 100644
--- a/resources/lang/km-KH/general.php
+++ b/resources/lang/km-KH/general.php
@@ -10,7 +10,7 @@ return [
     'action'                => 'សកម្មភាព',
     'activity_report'		=> 'របាយការណ៍សកម្មភាព',
     'address'				=> 'អាស័យដ្ឋាន',
-    'admin'					=> 'Admin',
+    'admin'					=> 'ការកំណត់អ្នកគ្រប់គ្រង',
     'admin_tooltip'			=> 'អ្នកប្រើប្រាស់នេះមានសិទ្ធិជាអ្នកគ្រប់គ្រង',
     'superuser'				=> 'អ្នកប្រើជាន់ខ្ពស់',
     'superuser_tooltip'		=> 'អ្នកប្រើប្រាស់នេះមានសិទ្ធិអ្នកប្រើប្រាស់ជាន់ខ្ពស់',
@@ -23,18 +23,21 @@ return [
     'asset_models'			=> 'គំរូទ្រព្យសកម្ម',
     'asset_model'			=> 'គំរូ',
     'asset'					=> 'ទ្រព្យសកម្ម',
+    'asset_previous'        => 'Asset (Previously Assigned)',
     'asset_report'          => 'របាយការណ៍ទ្រព្យសកម្ម',
     'asset_tag'				=> 'ស្លាកទ្រព្យសម្បត្តិ',
-    'asset_tags'            => 'Asset Tags',
+    'asset_tags'            => 'ស្លាកទ្រព្យសម្បត្តិ',
     'assets_available'		=> 'ទ្រព្យសកម្មដែលមាន',
     'accept_assets'         => 'ទទួលទ្រព្យសកម្ម៖ ឈ្មោះ',
     'accept_assets_menu'    => 'ទទួលយកទ្រព្យសកម្ម',
+    'accept_item'           => 'ទទួលយកធាតុនេះ',
     'audit'				    => 'សវនកម្ម',
+    'audits'				=> 'Audits',
     'audit_report'			=> 'កំណត់ហេតុសវនកម្ម',
     'assets'				=> 'ទ្រព្យសកម្ម',
     'assets_audited'        => 'ទ្រព្យសកម្មត្រូវបានសវនកម្ម',
-    'assets_checked_in_count'     => 'assets checked in',
-    'assets_checked_out_count'     => 'assets checked out',
+    'assets_checked_in_count'     => 'ទ្រព្យសកម្មដែលបានប្រគល់មកវិញ',
+    'assets_checked_out_count'     => 'ទ្រព្យសកម្មត្រូវបានប្រគល់អោយ',
     'asset_deleted_warning'     => 'ទ្រព្យសកម្មនេះត្រូវបានលុប។ អ្នក​ត្រូវ​តែ​ស្ដារ​វា​ឡើង​វិញ មុន​ពេល​អ្នក​អាច​ប្រគល់​វា​ទៅ​នរណា​ម្នាក់។',
     'assigned_date'         => 'កាលបរិច្ឆេទត្រូវបានចាត់តាំង',
     'assigned_to'           => 'ចាត់តាំងឱ្យ៖ ឈ្មោះ',
@@ -45,11 +48,11 @@ return [
     'bad_data'      		=> 'រកមិនឃើញអ្វីទេ។ ប្រហែលជាទិន្នន័យមិនល្អ?',
     'bulkaudit'             => 'សវនកម្មច្រើន',
     'bulkaudit_status'      => 'ស្ថានភាពសវនកម្ម',
-    'bulk_checkout'  		=> 'Bulk Checkout',
+    'bulk_checkout'  		=> 'ការបញ្ចេញច្រើន',
     'bulk_edit'             => 'កែសម្រួលជាដុំ',
     'bulk_delete'           => 'លុបជាដុំ',
     'bulk_actions'          => 'សកម្មភាពច្រើន',
-    'bulk_checkin_delete'   => 'Bulk Checkin / Delete Users',
+    'bulk_checkin_delete'   => 'បញ្ចូលច្រើន / លុបអ្នកប្រើច្រើន',
     'byod'                  => 'BYOD',
     'byod_help'             => 'ឧបករណ៍នេះជាកម្មសិទ្ធិរបស់អ្នកប្រើប្រាស់',
     'bystatus'              => 'តាមស្ថានភាព',
@@ -60,24 +63,27 @@ return [
     'changeemail'  			=> 'ផ្លាស់ប្តូរអាសយដ្ឋានអ៊ីមែល',
     'changepassword'  		=> 'ផ្លាស់ប្តូរពាក្យសម្ងាត់',
     'checkin'  				=> 'Checkin',
-    'checkin_from'  		=> 'Checkin from',
-    'checkout'  			=> 'Checkout',
-    'checkouts_count'       => 'Checkouts',
-    'checkins_count'        => 'Checkins',
+    'checkin_from'  		=> 'ប្រគល់មកវិញពី',
+    'checkin_note'  		=> 'Checkin Note',
+    'checkout_note'  		=> 'Checkout Note',
+    'checkout'  			=> 'ប្រគល់អោយ',
+    'checkouts_count'       => 'ការបញ្ចេញប្រើច្រើន',
+    'checkins_count'        => 'ការបង្វិលត្រឡប់ច្រើន',
+    'checkin_and_delete'  	=> 'សង់មកវិញ និងលុប',
     'user_requests_count'   => 'សំណើ',
     'city'  				=> 'ទីក្រុង',
     'click_here'			=> 'ចុច​ទីនេះ',
     'clear_selection'		=> 'ជម្រះការជ្រើសរើស',
     'companies'			    => 'ក្រុមហ៊ុន',
     'company'				=> 'ក្រុមហ៊ុន',
-    'component'			    => 'Component',
-    'components'			=> 'Components',
+    'component'			    => 'សមាសធាតុ',
+    'components'			=> 'សមាសធាតុ ច្រើន',
     'complete'				=> 'បញ្ចប់',
     'consumable'			=> 'ប្រើប្រាស់បាន។',
-    'consumables'			=> 'Consumables',
+    'consumables'			=> 'សម្ភារៈប្រើប្រាស់',
     'country'  				=> 'ប្រទេស',
     'could_not_restore'     => 'កំហុសក្នុងការស្តារ :item_type: :error',
-    'not_deleted'           => ':item_type មិនត្រូវបានលុបទេ ដូច្នេះវាមិនអាចស្ដារឡើងវិញបានទេ។',
+    'not_deleted'           => ':item_type មិនត្រូវបានលុបទេ ដូច្នេះហើយមិនអាចស្តារឡើងវិញបានទេ។',
     'create'				=> 'បង្កើត​ថ្មី',
     'created'               => 'ធាតុត្រូវបានបង្កើត',
     'created_asset'			=> 'ទ្រព្យសកម្មដែលបានបង្កើត',
@@ -86,11 +92,13 @@ return [
     'record_created' 		=> 'បានបង្កើតកំណត់ត្រា',
     'updated_at' 			=> 'បានធ្វើបច្ចុប្បន្នភាពនៅ',
     'currency'  			=> '$', // this is deprecated
+    'currency_text'  		=> 'រូបិយប័ណ្ណ', //
     'current'  				=> 'នា​ពេល​បច្ចុប្បន្ន',
     'current_password'      => 'លេខសំងាត់​បច្ចុប្បន្ន',
     'customize_report'      => 'កំណត់របាយការណ៍តាមបំណង',
     'custom_report'         => 'របាយការណ៍ទ្រព្យសកម្មផ្ទាល់ខ្លួន',
     'dashboard'				=> 'ផ្ទាំងគ្រប់គ្រង',
+    'data_source'           => 'ប្រភពទិន្នន័យ',
     'days'      			=> 'ថ្ងៃ',
     'days_to_next_audit'    => 'ថ្ងៃទៅសវនកម្មបន្ទាប់',
     'date'					=> 'កាលបរិច្ឆេទ',
@@ -98,13 +106,13 @@ return [
     'debug_warning_text'    => 'កម្មវិធី​នេះ​កំពុង​ដំណើរការ​ក្នុង​ទម្រង់​ផលិត​ដោយ​បាន​បើក​ការ​បំបាត់​កំហុស។ វាអាចបង្ហាញទិន្នន័យរសើប ប្រសិនបើកម្មវិធីរបស់អ្នកអាចចូលប្រើបានទៅកាន់ពិភពខាងក្រៅ។ បិទមុខងារបំបាត់កំហុសដោយកំណត់តម្លៃ <code>APP_DEBUG</code> នៅក្នុងឯកសារ <code>.env</code> របស់អ្នកទៅជា <code>false</code>។',
     'delete'  				=> 'លុប',
     'delete_confirm'  		=> 'តើអ្នកប្រាកដថាចង់លុប :item មែនទេ?',
-    'delete_confirm_no_undo' => 'តើអ្នកប្រាកដថាចង់លុប :item មែនទេ? នេះមិនអាចត្រឡប់វិញបានទេ។',
+    'delete_confirm_no_undo' => 'តើអ្នកប្រាកដទេថាអ្នកចង់លុប៖ ធាតុ? នេះមិនអាចត្រឡប់វិញបានទេ។',
     'deleted'  				=> 'បានលុប',
     'delete_seats'  		=> 'កៅអីដែលបានលុប',
     'deletion_failed'       => 'ការលុបបានបរាជ័យ',
     'departments'           => 'នាយកដ្ឋានច្រើន',
     'department'            => 'នាយកដ្ឋាន',
-    'deployed'				=> 'Deployed',
+    'deployed'				=> 'បានប្រើប្រាស់',
     'depreciation'			=> 'រំលោះ',
     'depreciations'         => 'ការរំលោះ',
     'depreciation_report'	=> 'របាយការណ៍រំលោះ',
@@ -114,29 +122,13 @@ return [
     'editprofile'  			=> 'កែសម្រួលប្រវត្តិរូបរបស់អ្នក',
     'eol'					=> 'EOL',
     'email_domain'			=> 'ដែនអ៊ីមែល',
-    'email_format'			=> 'ទម្រង់អ៊ីមែល',
     'employee_number'       => 'លេខបុគ្គលិក',
     'email_domain_help'		=> 'វាត្រូវបានប្រើដើម្បីបង្កើតអាសយដ្ឋានអ៊ីមែលនៅពេលនាំចូល',
     'error'				    => 'កំហុស',
     'exclude_archived'      => 'មិនរាប់បញ្ចូលទ្រព្យសម្បត្តិដែលបានរក្សាទុក',
     'exclude_deleted'       => 'មិនរាប់បញ្ចូលទ្រព្យសម្បត្តិដែលបានលុប',
     'example'				=> 'ឧទាហរណ៍៖ ',
-    'filastname_format'			=> 'នាមត្រកូលដំបូង (jsmith@example.com)',
-    'firstname_lastname_format'	=> 'នាមត្រកូលនាមខ្លួន (jane.smith@example.com)',
-    'firstname_lastname_underscore_format' => 'នាមត្រកូលនាមខ្លួន (jane_smith@example.com)',
-    'lastnamefirstinitial_format' =>  'នាមត្រកូល នាមខ្លួនដំបូង (smithj@example.com)',
-    'firstintial_dot_lastname_format' => 'នាមត្រកូលដំបូង (j.smith@example.com)',
-    'firstname_lastname_display'	=> 'នាមត្រកូលនាមខ្លួន (Jane Smith)',
-    'lastname_firstname_display'	=> 'នាមត្រកូលនាមខ្លួន (ស្មីត ជេន)',
-    'name_display_format'	=> 'ឈ្មោះទម្រង់បង្ហាញ',
-    'first'					=> 'ទីមួយ',
-    'firstnamelastname'     => 'នាមខ្លួន នាមត្រកូល (janesmith@example.com)',
-    'lastname_firstinitial' => 'នាមត្រកូល នាមខ្លួនដំបូង (smith_j@example.com)',
-    'firstinitial.lastname' => 'នាមត្រកូលដំបូង (j.smith@example.com)',
-    'firstnamelastinitial'  => 'នាមខ្លួន នាមត្រកូលដំបូង (janes@example.com)',
-    'lastnamefirstname'      => 'Last Name First Name (smith.jane@example.com)',
-    'first_name'			=> 'នាមខ្លួន',
-    'first_name_format'		=> 'នាមខ្លួន (jane@example.com)',
+
     'files'                 => 'ឯកសារ',
     'file_name'				=> 'ឯកសារ',
     'file_type'             => 'ប្រភេទ​ឯកសារ',
@@ -145,7 +137,7 @@ return [
     'file_upload'           => 'ឯកសារ​ផ្ទុក​ឡើង',
     'generate'				=> 'បង្កើត',
     'generate_labels'       => 'បង្កើតស្លាក',
-    'github_markdown'      => 'This field accepts <a href="https://help.github.com/articles/github-flavored-markdown/">Github flavored markdown</a>.',
+    'github_markdown'      => 'វាលនេះទទួលយក <a href="https://help.github.com/articles/github-flavored-markdown/">Github flavored markdown</a>។',
     'groups'				=> 'ក្រុម',
     'gravatar_email'        => 'អាសយដ្ឋានអ៊ីមែល Gravatar',
     'gravatar_url'          => '<a href="http://gravatar.com"><small>ផ្លាស់ប្តូររូបតំណាងរបស់អ្នកនៅ Gravatar.com</small></a>។',
@@ -156,12 +148,12 @@ return [
     'image_delete'         	=> 'លុបរូបភាព',
     'include_deleted'       => 'រួមបញ្ចូលទ្រព្យសម្បត្តិដែលបានលុប',
     'image_upload'         	=> 'បង្ហោះរូបភាព',
-    'filetypes_accepted_help'    => 'ប្រភេទឯកសារដែលទទួលយកគឺ៖ ប្រភេទ. ទំហំផ្ទុកឡើងអតិបរមាដែលអនុញ្ញាតគឺ :size.|ប្រភេទឯកសារដែលទទួលយកគឺ :types. ទំហំផ្ទុកឡើងអតិបរមាដែលអនុញ្ញាតគឺ៖ ទំហំ.',
-    'filetypes_size_help'   => 'ទំហំផ្ទុកឡើងអតិបរមាដែលអនុញ្ញាតគឺ :ទំហំ.',
-    'image_filetypes_help'  => 'Accepted filetypes are jpg, webp, png, gif, svg, and avif. Max upload size allowed is :size.',
+    'filetypes_accepted_help'    => 'ប្រភេទឯកសារដែលទទួលយកគឺ៖ ប្រភេទ។ ទំហំអតិបរមាដែលអនុញ្ញាតគឺ :size.|ប្រភេទឯកសារដែលទទួលយកគឺ :types។ ទំហំផ្ទុកអតិបរមាដែលអនុញ្ញាតគឺ៖ ទំហំ។',
+    'filetypes_size_help'   => 'ទំហំផ្ទុកអតិបរមាដែលអនុញ្ញាតគឺ៖ ទំហំ។',
+    'image_filetypes_help'  => 'ប្រភេទឯកសារដែលទទួលយកគឺ jpg, webp, png, gif, svg និង avi ។ ទំហំផ្ទុកអតិបរមាដែលអនុញ្ញាតគឺ៖ ទំហំ។',
     'unaccepted_image_type'  => 'ឯកសាររូបភាពនេះមិនអាចអានបានទេ។ ប្រភេទឯកសារដែលទទួលយកគឺ jpg, webp, png, gif និង svg ។ ប្រភេទ mime នៃឯកសារនេះគឺ៖ :mimetype.',
     'import'         	    => 'នាំចូល',
-    'import_this_file'      => 'Map fields and process this file',
+    'import_this_file'      => 'ផែនទីវាល និងដំណើរការឯកសារនេះ។',
     'importing'         	=> 'ការនាំចូល',
     'importing_help'        => 'អ្នកអាចនាំចូលទ្រព្យសម្បត្តិ គ្រឿងបន្លាស់ អាជ្ញាប័ណ្ណ សមាសធាតុ សម្ភារៈប្រើប្រាស់ និងអ្នកប្រើប្រាស់តាមរយៈឯកសារ CSV ។ <br><br> CSV គួរតែត្រូវបានកំណត់ដោយសញ្ញាក្បៀស និងធ្វើទ្រង់ទ្រាយជាមួយបឋមកថាដែលត្រូវគ្នានឹងធាតុនៅក្នុង <a href="https://snipe-it.readme.io/docs/importing" target="_new"> គំរូ CSVs ក្នុងឯកសារ</a>។',
     'import-history'        => 'ប្រវត្តិនាំចូល',
@@ -178,12 +170,17 @@ return [
     'last'					=> 'ចុងក្រោយ',
     'last_login'            => 'ការចូលចុងក្រោយ',
     'last_name'             => 'នាមត្រកូល',
+    'firstname_lastname_display'	=> 'នាមត្រកូលនាមខ្លួន (Jane Smith)',
+    'lastname_firstname_display'	=> 'នាមត្រកូលនាមខ្លួន (ស្មីត ជេន)',
+    'name_display_format'	=> 'ឈ្មោះទម្រង់បង្ហាញ',
+    'first'					=> 'ទីមួយ',
+    'first_name'			=> 'នាមខ្លួន',
     'license'				=> 'អាជ្ញាប័ណ្ណ',
     'license_report'        => 'របាយការណ៍អាជ្ញាប័ណ្ណ',
     'licenses_available'	=> 'មានអាជ្ញាប័ណ្ណ',
     'licenses'				=> 'អាជ្ញាប័ណ្ណ',
     'list_all'				=> 'រាយបញ្ជីទាំងអស់',
-    'loading'				=> 'កំពុងផ្ទុក... សូមរង់ចាំ....',
+    'loading'				=> 'កំពុងផ្ទុក... សូមរង់ចាំ...',
     'lock_passwords'        => 'តម្លៃវាលនេះនឹងមិនត្រូវបានរក្សាទុកក្នុងការដំឡើងសាកល្បងទេ។',
     'feature_disabled'      => 'មុខងារនេះត្រូវបានបិទសម្រាប់ការដំឡើងសាកល្បង។',
     'location'              => 'ទីតាំង',
@@ -193,12 +190,12 @@ return [
     'logout'				=> 'ចាកចេញ',
     'lookup_by_tag'     => 'រកមើលដោយស្លាកទ្រព្យសម្បត្តិ',
     'maintenances'          => 'ការថែទាំ',
-    'manage_api_keys'       => 'គ្រប់គ្រង API Keys',
+    'manage_api_keys'       => 'គ្រប់គ្រងសោ API',
     'manufacturer'			=> 'ក្រុមហ៊ុនផលិត',
     'manufacturers'			=> 'ក្រុមហ៊ុនផលិត',
     'markdown'				=> 'វាលនេះអនុញ្ញាតឱ្យ <a href="https://help.github.com/articles/github-flavored-markdown/">Github flavored markdown</a>។',
     'min_amt'				=> 'អប្បបរមា. QTY',
-    'min_amt_help'          => 'Minimum number of items that should be available before an alert gets triggered. Leave Min. QTY blank if you do not want to receive alerts for low inventory.',
+    'min_amt_help'          => 'ចំនួនអប្បបរមានៃធាតុដែលគួរតែមានមុនពេលការជូនដំណឹងត្រូវបានកេះ។ ទុក QTY អប្បបរមា នៅទទេ ប្រសិនបើអ្នកមិនចង់ទទួលបានការជូនដំណឹងសម្រាប់សារពើភ័ណ្ឌទាប។',
     'model_no'				=> 'លេខ​ម៉ូដែល។',
     'months'				=> 'ខែ',
     'moreinfo'				=> 'ព័​ត៍​មាន​បន្ថែម',
@@ -206,57 +203,65 @@ return [
     'new_password'          => 'ពាក្យសម្ងាត់​ថ្មី',
     'next'					=> 'បន្ទាប់',
     'next_audit_date'		=> 'កាលបរិច្ឆេទសវនកម្មបន្ទាប់',
-    'next_audit_date_help'  => 'If you use auditing in your organization, this is usually automatically calculated based on the asset&apos;s last audit date and audit frequency (in <code>Admin Settings &gt; Alerts</code>) and you can leave this blank. You can manually set this date here if you need to, but it must be later than the last audit date. ',
-    'audit_images_help'     => 'You can find audit images in the asset\'s history tab.',
-    'no_email'              => 'No email address associated with this user',
+    'next_audit_date_help'  => 'ប្រសិនបើអ្នកប្រើសវនកម្មនៅក្នុងស្ថាប័នរបស់អ្នក ជាធម្មតាវាត្រូវបានគណនាដោយស្វ័យប្រវត្តិដោយផ្អែកលើកាលបរិច្ឆេទស&apos;វនកម្មចុងក្រោយរបស់ទ្រព្យសកម្ម និងប្រេកង់សវនកម្ម (នៅក្នុង <code>ការកំណត់អ្នកគ្រប់គ្រង &gt; ការជូនដំណឹង</code>) ហើយអ្នកអាចទុកវាឱ្យនៅទទេបាន។ អ្នកអាចកំណត់កាលបរិច្ឆេទនេះដោយដៃនៅទីនេះ ប្រសិនបើអ្នកត្រូវការ ប៉ុន្តែវាត្រូវតែយឺតជាងកាលបរិច្ឆេទសវនកម្មចុងក្រោយ។ ',
+    'audit_images_help'     => 'អ្នកអាចស្វែងរករូបភាពសវនកម្មនៅក្នុងផ្ទាំងប្រវត្តិរបស់ទ្រព្យសកម្ម។',
+    'no_email'              => 'គ្មានអាសយដ្ឋានអ៊ីមែលដែលពាក់ព័ន្ធជាមួយអ្នកប្រើប្រាស់នេះទេ។',
     'last_audit'		    => 'សវនកម្មចុងក្រោយ',
-    'new'					=> 'new!',
-    'no_depreciation'		=> 'No Depreciation',
-    'no_results'			=> 'No Results.',
-    'no'  					=> 'No',
+    'new'					=> 'ថ្មី!',
+    'no_depreciation'		=> 'គ្មានការរំលោះ',
+    'no_results'			=> 'គ្មានលទ្ធផល។',
+    'no'  					=> 'ល.រ',
     'notes'  				=> 'កំណត់ចំណាំ',
+    'note_added'            => 'ចំណាំបានបន្ថែម',
+    'options'				=> 'ជម្រើសច្រើន',
+    'preview'				=> 'ការមើលជាមុន',
+    'add_note'              => 'បន្ថែមចំណាំ',
+    'note_edited'            => 'ចំណាំបានកែសម្រួល',
+    'edit_note'              => 'កែសម្រួលចំណាំ',
+    'note_deleted'            => 'បានលុបចំណាំ',
+    'delete_note'              => 'លុបចំណាំ',
     'order_number'          => 'លេខបញ្ជាទិញ',
-    'only_deleted'          => 'Only Deleted Assets',
-    'page_menu'				=> 'Showing _MENU_ items',
-    'pagination_info'		=> 'Showing _START_ to _END_ of _TOTAL_ items',
+    'only_deleted'          => 'មានតែទ្រព្យសម្បត្តិដែលបានលុបប៉ុណ្ណោះ។',
+    'page_menu'				=> 'បង្ហាញ _MENU_ ធាតុ',
+    'pagination_info'		=> 'បង្ហាញ _START_ ទៅ _END_ នៃ _TOTAL_ ធាតុ',
     'pending'				=> 'កំពុងរង់ចាំ',
-    'people'				=> 'People',
+    'people'				=> 'មនុស្ស',
     'per_page'				=> 'លទ្ធផលក្នុងមួយទំព័រ',
-    'previous'				=> 'Previous',
-    'processing'			=> 'Processing',
-    'profile'				=> 'Your profile',
+    'previous'				=> 'មុន',
+    'processing'			=> 'កំពុងដំណើរការ',
+    'profile'				=> 'ប្រវត្តិរូបរបស់អ្នក។',
     'purchase_cost'                              => 'ការចំណាយលើការទិញ',
     'purchase_date'         => 'កាលបរិច្ឆេទទិញ',
     'qty'		            => 'QTY',
-    'quantity'		        => 'Quantity',
-    'quantity_minimum'      => 'You have :count items below or almost below minimum quantity levels',
-    'quickscan_checkin'  	=> 'Quick Scan Checkin',
-    'quickscan_checkin_status'  	=> 'Checkin Status',
-    'ready_to_deploy'		=> 'Ready to Deploy',
-    'recent_activity'		=> 'Recent Activity',
-    'remaining'             => 'Remaining',
-    'remove_company'        => 'Remove Company Association',
-    'reports'				=> 'Reports',
-    'restored'				=> 'restored',
+    'quantity'		        => 'បរិមាណ',
+    'quantity_minimum'      => 'អ្នកមានធាតុមួយខាងក្រោម ឬស្ទើរតែទាបជាងកម្រិតបរិមាណអប្បបរមា|អ្នកមាន៖ រាប់ធាតុខាងក្រោម ឬស្ទើរតែទាបជាងកម្រិតបរិមាណអប្បបរមា',
+    'quickscan_checkin'  	=> 'ពិនិត្យស្កេនរហ័ស',
+    'quickscan_checkin_status'  	=> 'ស្ថានភាព សងមកវិញ',
+    'ready_to_deploy'		=> 'រួចរាល់អាចប្រើប្រាស់',
+    'recent_activity'		=> 'សកម្មភាពថ្មីៗ',
+    'remaining'             => 'នៅសល់',
+    'remove_company'        => 'ដកសមាគមក្រុមហ៊ុនចេញ',
+    'reports'				=> 'របាយការណ៍',
+    'restored'				=> 'បានស្ដារឡើងវិញ',
     'restore'				=> 'ស្តារ',
-    'requestable_models'    => 'Requestable Models',
-    'requestable_items'     => 'Requestable Items',
+    'requestable_models'    => 'ម៉ូដែលដែលអាចស្នើសុំបាន។',
+    'requestable_items'     => 'វត្ថុដែលអាចស្នើសុំបាន។',
     'requested'				=> 'បានស្នើសុំ',
-    'requested_date'        => 'Requested Date',
-    'requested_assets'      => 'Requested Assets',
-    'requested_assets_menu' => 'Requested Assets',
-    'request_canceled'      => 'Request Canceled',
-    'request_item'          => 'Request this item',
-    'external_link_tooltip' => 'External link to',
-    'save'  				=> 'Save',
-    'select_var'            => 'Select :thing... ', // this will eventually replace all of our other selects
-    'select'				=> 'Select',
-    'select_all'            => 'Select All',
-    'search'				=> 'Search',
-    'select_category'       => 'Select a Category',
-    'select_datasource' => 'Select a Datasource',
-    'select_department'     => 'Select a Department',
-    'select_depreciation'	=> 'Select a Depreciation Type',
+    'requested_date'        => 'កាលបរិច្ឆេទដែលបានស្នើសុំ',
+    'requested_assets'      => 'ទ្រព្យសកម្មដែលបានស្នើសុំ',
+    'requested_assets_menu' => 'ទ្រព្យសកម្មដែលបានស្នើសុំ',
+    'request_canceled'      => 'សំណើត្រូវបានលុបចោល',
+    'request_item'          => 'ស្នើសុំធាតុនេះ។',
+    'external_link_tooltip' => 'តំណភ្ជាប់ទៅខាងក្រៅ',
+    'save'  				=> 'រក្សា​ទុក',
+    'select_var'            => 'ជ្រើសរើស៖ thing... ', // this will eventually replace all of our other selects
+    'select'				=> 'ជ្រើសរើស',
+    'select_all'            => 'ជ្រើសរើសទាំងអស់។',
+    'search'				=> 'ស្វែងរក',
+    'select_category'       => 'ជ្រើសរើសប្រភេទមួយ',
+    'select_datasource' => 'ជ្រើសរើសប្រភពទិន្នន័យ',
+    'select_department'     => 'ជ្រើសរើសនាយកដ្ឋានមួយ។',
+    'select_depreciation'	=> 'ជ្រើសរើសប្រភេទរំលោះ',
     'select_location'		=> 'ជ្រើសរើសទីតាំងមួយ',
     'select_manufacturer'	=> 'ជ្រើសរើសអ្នកផលិត',
     'select_model'			=> 'ជ្រើសរើសម៉ូដែល',
@@ -271,284 +276,354 @@ return [
     'show_current'  		=> 'បង្ហាញបច្ចុប្បន្ន',
     'sign_in'				=> 'ចូល',
     'signature'             => 'ហត្ថលេខា',
-    'signed_off_by'         => 'Signed Off By',
+    'signed_off_by'         => 'ចុះហត្ថលេខាបិទដោយ',
     'skin'       			=> 'ស្បែក',
     'webhook_msg_note'        => 'ការជូនដំណឹងនឹងត្រូវបានផ្ញើតាមរយៈ webhook',
-    'webhook_test_msg'        => 'អូ ហៃ! មើលទៅដូចជា៖ ការរួមបញ្ចូលកម្មវិធីរបស់អ្នកជាមួយ Snipe-IT កំពុងដំណើរការ!',
+    'webhook_test_msg'        => 'អូ ហៃ! វាហាក់ដូចជា៖ ការរួមបញ្ចូលកម្មវិធីរបស់អ្នកជាមួយ Snipe-IT កំពុងដំណើរការ!',
     'some_features_disabled' => 'របៀបសាកល្បង៖ មុខងារមួយចំនួនត្រូវបានបិទសម្រាប់ការដំឡើងនេះ។',
     'site_name'				=> 'ឈ្មោះ​វេ​ប​សាយ',
     'state'  				=> 'រដ្ឋ',
-    'status_labels'			=> 'Status Labels',
+    'status_labels'			=> 'ស្លាកស្ថានភាព',
+    'status_label'			=> 'ស្លាកស្ថានភាព',
     'status'    			=> 'ស្ថានភាព',
     'accept_eula'           => 'ទទួលយកកិច្ចព្រមព្រៀង',
+    'show_or_hide_eulas' => 'បង្ហាញ/លាក់ EULAs',
     'supplier'              => 'អ្នកផ្គត់ផ្គង់',
-    'suppliers'  			=> 'Suppliers',
+    'suppliers'  			=> 'អ្នកផ្គត់ផ្គង់ច្រើន',
     'sure_to_delete'        => 'តើអ្នកប្រាកដថាចង់លុប',
     'sure_to_delete_var'    => 'តើអ្នកប្រាកដថាចង់លុប :item មែនទេ?',
-    'delete_what'           => 'Delete :item',
+    'delete_what'           => 'លុប៖ ធាតុ',
     'submit'				=> 'ដាក់ស្នើ',
     'target'                => 'គោលដៅ',
     'time_and_date_display' => 'ការបង្ហាញពេលវេលា និងកាលបរិច្ឆេទ',
     'total_assets'			=> 'ទ្រព្យ​សកម្ម​សរុប',
     'total_licenses'		=> 'អាជ្ញាប័ណ្ណសរុប',
     'total_accessories'		=> 'គ្រឿងបន្ថែមសរុប',
-    'total_consumables'		=> 'total consumables',
+    'total_consumables'		=> 'សម្ភារៈប្រើប្រាស់សរុប',
     'type'  				=> 'ប្រភេទ',
-    'undeployable'			=> 'Un-deployable',
-    'unknown_admin'			=> 'Unknown Admin',
-    'username_format'		=> 'Username Format',
+    'undeployable'			=> 'មិនអាចប្រើប្រាស់បាន',
+    'unknown_admin'			=> 'មិនស្គាល់ Admin',
     'username'              => 'ឈ្មោះ​អ្នកប្រើប្រាស់',
-    'update'                => 'Update',
-    'upload_filetypes_help'      => 'Allowed filetypes are png, gif, jpg, jpeg, doc, docx, pdf, xls, xlsx, txt, lic, xml, zip, rtf and rar. Max upload size allowed is :size.',
-    'uploaded'              => 'Uploaded',
+    'update'                => 'ធ្វើបច្ចុប្បន្នភាព',
+    'updating_item' => 'ការធ្វើបច្ចុប្បន្នភាព៖ ធាតុ',
+    'upload_filetypes_help'      => 'ប្រភេទឯកសារដែលបានអនុញ្ញាតគឺ png, gif, jpg, jpeg, doc, docx, pdf, xls, xlsx, txt, lic, xml, zip, rtf និង rar ។ ទំហំផ្ទុកឡើងអតិបរមាដែលអនុញ្ញាតគឺ៖ ទំហំ។',
+    'uploaded'              => 'បានបង្ហោះ',
     'user'					=> 'អ្នក​ប្រើ',
-    'accepted'			    => 'accepted',
-    'declined'			    => 'declined',
-    'declined_note'         => 'Declined Notes',
-    'unassigned'            => 'Unassigned',
-    'unaccepted_asset_report' => 'Unaccepted Assets',
-    'users'                 => 'Users',
-    'viewall'				=> 'View All',
-    'viewassets'  			=> 'View Assigned Assets',
-    'viewassetsfor'         => 'View Assets for :name',
-    'website'               => 'Website',
-    'welcome'				=> 'Welcome, :name',
+    'accepted'			    => 'យល់ព្រម',
+    'declined'			    => 'បានបដិសេធ',
+    'declined_note'         => 'កំណត់ចំណាំដែលបដិសេធ',
+    'unassigned'            => 'មិនបានចាត់តាំង',
+    'unaccepted_asset_report' => 'ទ្រព្យសម្បត្តិដែលមិនទាន់យល់ព្រម។',
+    'users'                 => 'អ្នកប្រើប្រាស់ច្រើន',
+    'viewall'				=> 'មើលទាំងអស់',
+    'viewassets'  			=> 'មើលទ្រព្យសកម្មដែលបានចាត់តាំង',
+    'viewassetsfor'         => 'មើលទ្រព្យសម្បត្តិសម្រាប់៖ ឈ្មោះ',
+    'website'               => 'វេបសាយ',
+    'welcome'				=> 'សូមស្វាគមន៍៖ ឈ្មោះ',
     'years'					=> 'ឆ្នាំ',
-    'yes' 					=> 'Yes',
+    'yes' 					=> 'បាទ/ចា៎',
     'zip'  					=> 'Zip',
-    'noimage'				=> 'No image uploaded or image not found.',
-    'file_does_not_exist'   => 'The requested file does not exist on the server.',
-    'file_upload_success'   => 'File upload success!',
-    'no_files_uploaded'     => 'File upload success!',
-    'token_expired'         => 'Your form session has expired. Please try again.',
-    'login_enabled'         => 'Login Enabled',
-    'audit_due'             => 'Due for Audit',
-    'audit_due_days'        => 'Assets Due for Audit Within :days Day|Assets Due for Audit Within :days Days',
-    'checkin_due'           => 'Due for Checkin',
-    'checkin_overdue'       => 'Overdue for Checkin',
-    'checkin_due_days'      => 'Assets Due for Checkin Within :days Day|Assets Due for Checkin Within :days Days',
-    'audit_overdue'         => 'Overdue for Audit',
-    'accept'                => 'Accept :asset',
-    'i_accept'              => 'I accept',
-    'i_decline'             => 'I decline',
-    'accept_decline'        => 'Accept/Decline',
-    'sign_tos'              => 'Sign below to indicate that you agree to the terms of service:',
-    'clear_signature'       => 'Clear Signature',
-    'show_help'             => 'Show help',
-    'hide_help'             => 'Hide help',
-    'view_all'              => 'view all',
-    'hide_deleted'          => 'Hide Deleted',
-    'email'                 => 'Email',
-    'do_not_change'         => 'Do Not Change',
-    'bug_report'            => 'Report a Bug',
-    'user_manual'           => 'User\'s Manual',
-    'setup_step_1'          => 'Step 1',
-    'setup_step_2'          => 'Step 2',
-    'setup_step_3'          => 'Step 3',
-    'setup_step_4'          => 'Step 4',
-    'setup_config_check'    => 'Configuration Check',
-    'setup_create_database' => 'Create Database Tables',
-    'setup_create_admin'    => 'Create Admin User',
-    'setup_done'            => 'Finished!',
-    'bulk_edit_about_to'    => 'You are about to edit the following: ',
-    'checked_out'           => 'Checked Out',
-    'checked_out_to'        => 'Checked out to',
+    'noimage'				=> 'គ្មានរូបភាពដែលបានបង្ហោះ ឬរកមិនឃើញរូបភាព។',
+    'file_does_not_exist'   => 'ឯកសារដែលបានស្នើមិនមាននៅលើម៉ាស៊ីនមេទេ។',
+    'file_upload_success'   => 'ការបង្ហោះឯកសារជោគជ័យ!',
+    'no_files_uploaded'     => 'ការបង្ហោះឯកសារជោគជ័យ!',
+    'token_expired'         => 'វគ្គទម្រង់របស់អ្នកបានផុតកំណត់ហើយ។ សូមព្យាយាមម្តងទៀត។',
+    'login_enabled'         => 'បានបើកការចូល',
+    'audit_due'             => 'ដល់កំណត់សម្រាប់សវនកម្ម',
+    'audit_due_days'        => '{}ទ្រព្យសកម្មដែលត្រូវឬលើសកំណត់សម្រាប់សវនកម្ម | [1] ទ្រព្យសកម្មដែលត្រូវឬលើសកំណត់សម្រាប់សវនកម្មក្នុងមួយថ្ងៃ | [2,*] ទ្រព្យសកម្មដែលត្រូវឬលើសកំណត់សម្រាប់សវនកម្មក្នុងរយៈពេល :days ថ្ងៃ',
+    'checkin_due'           => 'ដល់ពេលសងមកវិញ',
+    'checkin_overdue'       => 'ហួសកាលកំណត់សម្រាប់ការសងមកវិញ',
+    'checkin_due_days'      => '{}ដល់កំណត់បញ្ចូលទ្រព្យសម្បត្តិ|[1]ទ្រព្យសម្បត្តិដែលត្រូវបញ្ចូលក្នុងរយៈពេល :days ថ្ងៃ|[2*]ទ្រព្យសម្បត្តិដែលត្រូវបញ្ចូលក្នុងរយៈពេល :days ថ្ងៃ',
+    'audit_overdue'         => 'ហួសកាលកំណត់សម្រាប់សវនកម្ម',
+    'accept'                => 'ទទួលយក៖ ទ្រព្យសម្បត្តិ',
+    'i_accept'              => 'ខ្ញុំទទួលយក',
+    'i_decline'             => 'ខ្ញុំបដិសេធ',
+    'accept_decline'        => 'យល់ព្រម/បដិសេធ',
+    'sign_tos'              => 'ចុះហត្ថលេខាខាងក្រោមដើម្បីបង្ហាញថាអ្នកយល់ព្រមនឹងលក្ខខណ្ឌនៃសេវាកម្ម៖',
+    'clear_signature'       => 'ជម្រះហត្ថលេខា',
+    'show_help'             => 'បង្ហាញជំនួយ',
+    'hide_help'             => 'លាក់ជំនួយ',
+    'view_all'              => 'មើលទាំងអស់។',
+    'hide_deleted'          => 'លាក់បានលុប',
+    'email'                 => 'អ៊ីមែល',
+    'do_not_change'         => 'កុំផ្លាស់ប្តូរ',
+    'bug_report'            => 'រាយការណ៍អំពីបញ្ហា',
+    'user_manual'           => 'សៀវភៅណែនាំអ្នកប្រើប្រាស់',
+    'setup_step_1'          => 'ជំហានទី 1',
+    'setup_step_2'          => 'ជំហានទី 2',
+    'setup_step_3'          => 'ជំហានទី 3',
+    'setup_step_4'          => 'ជំហានទី 4',
+    'setup_config_check'    => 'ពិនិត្យការកំណត់រចនាសម្ព័ន្ធ',
+    'setup_create_database' => 'បង្កើតតារាងទិន្នន័យ',
+    'setup_create_admin'    => 'បង្កើតអ្នកប្រើប្រាស់អ្នកគ្រប់គ្រង',
+    'setup_done'            => 'ចប់ហើយ!',
+    'bulk_edit_about_to'    => 'អ្នករៀបនឹងកែសម្រួលដូចខាងក្រោម៖ ',
+    'checked_out'           => 'បានប្រគល់',
+    'checked_out_to'        => 'បានប្រគល់ទៅ',
     'fields'                => 'Fields',
-    'last_checkout'         => 'Last Checkout',
-    'due_to_checkin'        => 'The following :count items are due to be checked in soon:',
-    'expected_checkin'      => 'Expected Checkin',
-    'reminder_checked_out_items' => 'This is a reminder of the items currently checked out to you. If you feel this list is inaccurate (something is missing, or something appears here that you believe you never received), please email :reply_to_name at :reply_to_address.',
-    'changed'               => 'Changed',
-    'to'                    => 'To',
-    'report_fields_info'    => '<p>Select the fields you would like to include in your custom report, and click Generate. The file (custom-asset-report-YYYY-mm-dd.csv) will download automatically, and you can open it in Excel.</p>
-            <p>If you would like to export only certain assets, use the options below to fine-tune your results.</p>',
-    'range'                 => 'Range',
-    'bom_remark'            => 'Add a BOM (byte-order mark) to this CSV',
-    'improvements'          => 'Improvements',
-    'information'           => 'Information',
-    'permissions'           => 'Permissions',
-    'managed_ldap'          => '(Managed via LDAP)',
-    'export'                => 'Export',
-    'ldap_sync'             => 'LDAP Sync',
-    'ldap_user_sync'        => 'LDAP User Sync',
-    'synchronize'           => 'Synchronize',
-    'sync_results'          => 'Synchronization Results',
-    'license_serial'        => 'Serial/Product Key',
-    'invalid_category'      => 'Invalid or missing category',
-    'invalid_item_category_single' => 'Invalid or missing :type category. Please update the category of this :type to include a valid category before checking out.',
-    'dashboard_info'        => 'This is your dashboard. There are many like it, but this one is yours.',
-    '60_percent_warning'    => '60% Complete (warning)',
-    'dashboard_empty'       => 'It looks like you have not added anything yet, so we do not have anything awesome to display. Get started by adding some assets, accessories, consumables, or licenses now!',
-    'new_asset'             => 'New Asset',
-    'new_license'           => 'New License',
-    'new_accessory'         => 'New Accessory',
-    'new_consumable'        => 'New Consumable',
+    'last_checkout'         => 'ប្រគល់ ចុងក្រោយ',
+    'due_to_checkin'        => 'ខាង​ក្រោម៖ រាប់​ធាតុ​នឹង​ត្រូវសងមកវិញក្នុង​ពេល​ឆាប់ៗ​នេះ៖',
+    'expected_checkin'      => 'ការសងមកវិញ ដែលរំពឹងទុក',
+    'reminder_checked_out_items' => 'នេះ​ជា​ការ​រំលឹក​អំពី​ធាតុ​ដែល​បាន​ប្រគល់​ទៅ​អ្នក​នា​ពេល​បច្ចុប្បន្ន។ ប្រសិនបើអ្នកមានអារម្មណ៍ថាបញ្ជីនេះមិនត្រឹមត្រូវ (មានអ្វីមួយបាត់ ឬមានអ្វីមួយលេចឡើងនៅទីនេះដែលអ្នកជឿថាអ្នកមិនបានទទួល) សូមផ្ញើអ៊ីមែល៖ reply_to_name នៅ :reply_to_address។',
+    'changed'               => 'បានផ្លាស់ប្តូរ',
+    'to'                    => 'ទៅ',
+    'report_fields_info'    => '<p>ជ្រើសរើសវាលដែលអ្នកចង់បញ្ចូលក្នុងរបាយការណ៍ផ្ទាល់ខ្លួនរបស់អ្នក ហើយចុចបង្កើត។  ឯកសារ (custom-asset-report-YYYY-mm-dd.csv) នឹងទាញយកដោយស្វ័យប្រវត្តិ ហើយអ្នកអាចបើកវានៅក្នុង Excel។</p>
+             <p>ប្រសិនបើអ្នកចង់នាំចេញតែទ្រព្យសកម្មមួយចំនួន សូមប្រើជម្រើសខាងក្រោមដើម្បីកែសម្រួលលទ្ធផលរបស់អ្នក។</p>',
+    'range'                 => 'ជួរ',
+    'bom_remark'            => 'បន្ថែម BOM (សញ្ញាបញ្ជាទិញបៃ) ទៅ CSV នេះ។',
+    'improvements'          => 'ការកែលម្អ',
+    'information'           => 'ព័ត៌មាន',
+    'permissions'           => 'ការអនុញ្ញាត',
+    'managed_ldap'          => '(គ្រប់គ្រងតាមរយៈ LDAP)',
+    'export'                => 'នាំចេញ',
+    'ldap_sync'             => 'LDAP សមកាលកម្ម',
+    'ldap_user_sync'        => 'សមកាលកម្មអ្នកប្រើប្រាស់ LDAP',
+    'synchronize'           => 'ធ្វើសមកាលកម្ម',
+    'sync_results'          => 'លទ្ធផលសមកាលកម្ម',
+    'license_serial'        => 'សៀរៀល/សោផលិតផល',
+    'invalid_category'      => 'ប្រភេទមិនត្រឹមត្រូវ ឬបាត់',
+    'invalid_item_category_single' => 'មិនត្រឹមត្រូវ ឬបាត់៖ ប្រភេទប្រភេទ។ សូមអាប់ដេតប្រភេទនេះ៖ វាយបញ្ចូលប្រភេទដែលមានសុពលភាពមុនពេល checking out។',
+    'dashboard_info'        => 'នេះគឺជាផ្ទាំងគ្រប់គ្រងរបស់អ្នក។ មានអ្នកចូលចិត្តច្រើន ប៉ុន្តែមួយនេះជារបស់អ្នក',
+    '60_percent_warning'    => 'សម្រេចបាន 60% (ព្រមាន)',
+    'dashboard_empty'       => 'វាហាក់ដូចជាអ្នកមិនទាន់បានបន្ថែមអ្វីនៅឡើយទេ ដូច្នេះយើងមិនមានអ្វីដែលអស្ចារ្យដើម្បីបង្ហាញនោះទេ។ ចាប់ផ្តើមដោយបន្ថែមទ្រព្យសម្បត្តិ គ្រឿងបន្លាស់ សម្ភារៈប្រើប្រាស់ ឬអាជ្ញាប័ណ្ណមួយចំនួនឥឡូវនេះ!',
+    'new_asset'             => 'ទ្រព្យសកម្មថ្មី',
+    'new_license'           => 'អាជ្ញាប័ណ្ណថ្មី',
+    'new_accessory'         => 'គ្រឿងបន្លាស់ថ្មី',
+    'new_consumable'        => 'សម្ភារៈប្រើប្រាស់ថ្មី',
+    'new_component'         => 'New Component',
+    'new_user'              => 'New User',
     'collapse'              => 'Collapse',
-    'assigned'              => 'Assigned',
-    'asset_count'           => 'Asset Count',
-    'accessories_count'     => 'Accessories Count',
-    'consumables_count'     => 'Consumables Count',
-    'components_count'      => 'Components Count',
-    'licenses_count'        => 'Licenses Count',
+    'assigned'              => 'បានចាត់តាំង',
+    'asset_count'           => 'ចំនួនទ្រព្យសកម្ម',
+    'accessories_count'     => 'ចំនួនគ្រឿងបន្ថែម',
+    'consumables_count'     => 'រាប់ចំនួនសម្ភារៈប្រើប្រាស់ច្រើន',
+    'components_count'      => 'ចំនួនសមាសភាគ',
+    'licenses_count'        => 'ចំនួនអាជ្ញាប័ណ្ណ',
     'notification_error'    => 'កំហុស',
-    'notification_error_hint' => 'Please check the form below for errors',
-    'notification_bulk_error_hint' => 'The following fields had validation errors and were not edited:',
+    'notification_error_hint' => 'សូមពិនិត្យមើលទម្រង់ខាងក្រោមសម្រាប់កំហុស',
+    'notification_bulk_error_hint' => 'វាលខាងក្រោមមានកំហុសក្នុងការផ្ទៀងផ្ទាត់ ហើយមិនត្រូវបានកែសម្រួលទេ៖',
     'notification_success'  => 'ជោគជ័យ',
     'notification_warning'   => 'ព្រមាន',
     'notification_info'      => 'ព័ត៌មាន',
-    'asset_information'     => 'Asset Information',
-    'model_name'            => 'Model Name',
+    'asset_information'     => 'ព័ត៌មានទ្រព្យសកម្ម',
+    'model_name'            => 'ឈ្មោះម៉ូដែល',
     'asset_name'            => 'ឈ្មោះទ្រព្យសម្បត្តិ',
-    'consumable_information' => 'Consumable Information:',
+    'consumable_information' => 'ព័ត៌មានដែលអាចប្រើប្រាស់បាន៖',
     'consumable_name'       => 'ឈ្មោះ Consumable:',
-    'accessory_information' => 'Accessory Information:',
+    'accessory_information' => 'ព័ត៌មានអំពីគ្រឿងបន្លាស់',
     'accessory_name'       => 'ឈ្មោះគ្រឿងបន្លាស់៖',
-    'clone_item'            => 'Clone Item',
-    'checkout_tooltip' => 'Check this item out',
-    'checkin_tooltip' => 'Check this item in so that it is available for re-issue, re-imaging, etc',
-    'checkout_user_tooltip' => 'Check this item out to a user',
-    'checkin_to_diff_location' => 'You can choose to check this asset in to a location other than this asset\'s default location of :default_location if one is set',
-    'maintenance_mode'      => 'The service is temporarily unavailable for system updates. Please check back later.',
-    'maintenance_mode_title' => 'System Temporarily Unavailable',
-    'ldap_import'           => 'User password should not be managed by LDAP. (This allows you to send forgotten password requests.)',
-    'purge_not_allowed'     => 'Purging deleted data has been disabled in the .env file. Contact support or your systems administrator.',
-    'backup_delete_not_allowed'     => 'Deleting backups has been disabled in the .env file. Contact support or your systems administrator.',
-    'additional_files'           => 'Additional Files',
-    'shitty_browser'        => 'No signature detected. If you are using an older browser, please use a more modern browser to complete your asset acceptance.',
-    'bulk_soft_delete'      =>'Also soft-delete these users. Their asset history will remain intact unless/until you purge deleted records in the Admin Settings.',
-    'bulk_checkin_delete_success' => 'Your selected users have been deleted and their items have been checked in.',
-    'bulk_checkin_success' => 'The items for the selected users have been checked in.',
-    'set_to_null'           => 'Delete values for this asset|Delete values for all :asset_count assets ',
-    'set_users_field_to_null'  => 'Delete :field values for this user|Delete :field values for all :user_count users ',
-    'na_no_purchase_date'   => 'N/A - No purchase date provided',
-    'assets_by_status'      => 'Assets by Status',
-    'assets_by_status_type'      => 'Assets by Status Type',
-    'pie_chart_type'        => 'Dashboard Pie Chart Type',
-    'hello_name'            => 'Hello, :name!',
-    'unaccepted_profile_warning'   => 'You have :count items requiring acceptance. Click here to accept or decline them',
+    'clone_item'            => 'ធាតុក្លូន',
+    'checkout_tooltip' => 'បញ្ចេញធាតុនេះ',
+    'checkin_tooltip' => 'សូមបង្វិលត្រឡប់ធាតុនេះ ដើម្បីឲ្យវាអាចប្រើបានសម្រាប់ការចេញប្រើម្តងទៀត ការធ្វើរូបភាពឡើងវិញ និងអ្វីផ្សេងទៀត',
+    'checkout_user_tooltip' => 'សូមបញ្ចេញប្រើធាតុនេះទៅឲ្យបុគ្គលអ្នកប្រើ',
+    'checkin_to_diff_location' => 'អ្នកអាចជ្រើសរើសដើម្បីពិនិត្យមើលទ្រព្យសកម្មនេះនៅក្នុងទីតាំងផ្សេងក្រៅពីទីតាំងលំនាំដើមរបស់ទ្រព្យសកម្មនេះនៃ :default_location ប្រសិនបើទីតាំងមួយត្រូវបានកំណត់',
+    'maintenance_mode'      => 'សេវាកម្មនេះមិនមានជាបណ្តោះអាសន្នសម្រាប់ការអាប់ដេតប្រព័ន្ធទេ។ សូមពិនិត្យមើលឡើងវិញនៅពេលក្រោយ។',
+    'maintenance_mode_title' => 'ប្រព័ន្ធមិនអាចប្រើបានជាបណ្តោះអាសន្ន',
+    'ldap_import'           => 'ពាក្យសម្ងាត់របស់អ្នកប្រើមិនគួរត្រូវបានគ្រប់គ្រងដោយ LDAP ទេ។ (វាអនុញ្ញាតឱ្យអ្នកផ្ញើសំណើសុំពាក្យសម្ងាត់ដែលភ្លេច។)',
+    'purge_not_allowed'     => 'ការលុបទិន្នន័យដែលបានលុបត្រូវបានបិទនៅក្នុងឯកសារ .env ។ ទាក់ទងផ្នែកជំនួយ ឬអ្នកគ្រប់គ្រងប្រព័ន្ធរបស់អ្នក។',
+    'backup_delete_not_allowed'     => 'ការលុបការបម្រុងទុកត្រូវបានបិទនៅក្នុងឯកសារ .env ។ ទាក់ទងផ្នែកជំនួយ ឬអ្នកគ្រប់គ្រងប្រព័ន្ធរបស់អ្នក។',
+    'additional_files'           => 'ឯកសារបន្ថែម',
+    'shitty_browser'        => 'រកមិនឃើញហត្ថលេខាទេ។ ប្រសិនបើអ្នកកំពុងប្រើកម្មវិធីរុករកចាស់ សូមប្រើកម្មវិធីរុករកតាមអ៊ីនធឺណិតទំនើបជាងមុន ដើម្បីបញ្ចប់ការទទួលយកទ្រព្យសកម្មរបស់អ្នក។',
+    'bulk_soft_delete'      =>'លុបអ្នកប្រើប្រាស់ទាំងនេះឱ្យទន់ផងដែរ។ ប្រវត្តិទ្រព្យសម្បត្តិរបស់ពួកគេនឹងនៅដដែល លុះត្រាតែអ្នកលុបកំណត់ត្រាដែលបានលុបនៅក្នុងការកំណត់អ្នកគ្រប់គ្រង។',
+    'bulk_checkin_delete_success' => 'អ្នកប្រើដែលអ្នកបានជ្រើសរើសត្រូវបានលុបហើយ និងធាតុរបស់ពួកគេត្រូវបានបង្វិលត្រឡប់។',
+    'bulk_checkin_success' => 'ធាតុសម្រាប់អ្នកប្រើដែលបានជ្រើសរើសត្រូវបានបង្វិលត្រឡប់។',
+    'set_to_null'           => 'លុបតម្លៃសម្រាប់ការជ្រើសរើសនេះ | លុបតម្លៃសម្រាប់ការជ្រើសរើសទាំងអស់: selection_count ',
+    'set_users_field_to_null'  => 'លុបតម្លៃ :field សម្រាប់អ្នកប្រើនេះ | លុបតម្លៃ :field សម្រាប់អ្នកប្រើទាំងអស់ :user_count ',
+    'na_no_purchase_date'   => 'N/A - មិនមានកាលបរិច្ឆេទទិញទេ',
+    'assets_by_status'      => 'ទ្រព្យសម្បត្តិតាមស្ថានភាព',
+    'assets_by_status_type'      => 'ទ្រព្យសកម្មតាមប្រភេទស្ថានភាព',
+    'pie_chart_type'        => 'ប្រភេទគំនូសតាងចំណិតនៃផ្ទាំងគ្រប់គ្រង',
+    'hello_name'            => 'សួស្តី, :ឈ្មោះ!',
+    'unaccepted_profile_warning'   => 'អ្នកមានធាតុមួយដែលត្រូវការការទទួលយក។ ចុចទីនេះដើម្បីទទួលយក ឬបដិសេធវា | អ្នកមាន៖ រាប់ធាតុដែលទាមទារការទទួលយក។ ចុចទីនេះដើម្បីទទួលយក ឬបដិសេធពួកគេ។',
     'start_date'            => 'ថ្ងៃ​ចាប់ផ្តើម',
-    'end_date'            => 'End Date',
-    'alt_uploaded_image_thumbnail' => 'Uploaded thumbnail',
-    'placeholder_kit'       => 'Select a kit',
-    'file_not_found'        => 'File not found',
-    'preview_not_available' => '(no preview)',
-    'setup'                 => 'Setup',
-    'pre_flight'            => 'Pre-Flight',
-    'skip_to_main_content'  => 'Skip to main content',
-    'toggle_navigation'     => 'Toggle navigation',
+    'end_date'            => 'កាលបរិច្ឆេទបញ្ចប់',
+    'alt_uploaded_image_thumbnail' => 'រូបភាពតូចដែលបានបង្ហោះ',
+    'placeholder_kit'       => 'ជ្រើសរើសឈុត',
+    'file_not_found'        => 'រកមិនឃើញឯកសារ',
+    'log_record_not_found'  => 'រក​មិន​ឃើញ​កំណត់ត្រា​សម្រាប់​ការ​ចូល​កំណត់​ហេតុ​នោះ​ទេ។',
+    'preview_not_available' => '(គ្មានការមើលជាមុន)',
+    'setup'                 => 'រៀបចំ',
+    'pre_flight'            => 'ការរៀបចំមុនការហោះហើរ',
+    'skip_to_main_content'  => 'រំលងទៅមាតិកាសំខាន់',
+    'toggle_navigation'     => 'បិទ/បើកការរុករក',
     'alerts'                => 'ការជូនដំណឹង',
-    'tasks_view_all'        => 'View all tasks',
-    'true'                  => 'True',
-    'false'                 => 'False',
-    'integration_option'    => 'Integration Option',
-    'log_does_not_exist'    => 'No matching log record exists.',
-    'merge_users'           => 'Merge Users',
-    'merge_information' =>  'This will merge the :count users into a single user. Select the user you wish to merge the others into below, and the associated assets, licenses, etc will be moved over to the selected user and the other users will be marked as deleted.',
-    'warning_merge_information' => 'This action CANNOT be undone and should ONLY be used when you need to merge users because of a bad import or sync. Be sure to run a backup first.',
-    'no_users_selected'     => 'No users selected',
-    'not_enough_users_selected'     => 'At least :count users must be selected',
-    'merge_success'         => ':count users merged successfully into :into_username!',
-    'merged'                => 'merged',
-    'merged_log_this_user_into' => 'Merged this user (ID :to_id - :to_username) into user ID :from_id (:from_username) ',
-    'merged_log_this_user_from' => 'Merged user ID :from_id (:from_username) into this user (ID :to_id - :to_username)',
-    'clear_and_save'            => 'Clear & Save',
-    'update_existing_values'    => 'Update Existing Values?',
-    'auto_incrementing_asset_tags_disabled_so_tags_required' => 'Generating auto-incrementing asset tags is disabled so all rows need to have the "Asset Tag" column populated.',
-    'auto_incrementing_asset_tags_enabled_so_now_assets_will_be_created' => 'Note: Generating auto-incrementing asset tags is enabled so assets will be created for rows that do not have "Asset Tag" populated. Rows that do have "Asset Tag" populated will be updated with the provided information.',
-    'send_welcome_email_to_users'   => ' Send Welcome Email for new Users?',
-    'send_email'                => 'Send Email',
-    'call'                      => 'Call number',
-    'back_before_importing'     => 'Backup before importing?',
-    'csv_header_field'          => 'CSV Header Field',
-    'import_field'              => 'Import Field',
-    'sample_value'              => 'Sample Value',
-    'no_headers'                => 'No Columns Found',
-    'error_in_import_file'      => 'There was an error reading the CSV file: :error',
-    'errors_importing'          => 'Some Errors occurred while importing: ',
-    'warning'                   => 'WARNING: :warning',
-    'success_redirecting'       => '"Success... Redirecting.',
-    'cancel_request'            => 'Cancel this item request',
-    'setup_successful_migrations' => 'Your database tables have been created',
-    'setup_migration_output' => 'Migration output:',
-    'setup_migration_create_user' => 'Next: Create User',
-    'importer_generic_error'    => 'Your file import is complete, but we did receive an error. This is usually caused by third-party API throttling from a notification webhook (such as Slack) and would not have interfered with the import itself, but you should confirm this.',
-    'confirm' => 'Confirm',
-    'autoassign_licenses' => 'Auto-Assign Licenses',
-    'autoassign_licenses_help' => 'Allow this user to have licenses assigned via the bulk-assign license UI or cli tools.',
-    'autoassign_licenses_help_long' => 'This allows a user to be have licenses assigned via the bulk-assign license UI or cli tools. (For example, you might not want contractors to be auto-assigned a license you would provide to only staff members. You can still individually assign licenses to those users, but they will not be included in the Checkout License to All Users functions.)',
-    'no_autoassign_licenses_help' => 'Do not include user for bulk-assigning through the license UI or cli tools.',
-    'modal_confirm_generic'      => 'Are you sure?',
-    'cannot_be_deleted'      => 'This item cannot be deleted',
-    'cannot_be_edited'      => 'This item cannot be edited.',
-    'undeployable_tooltip'      => 'This item cannot be checked out. Check the quantity remaining.',
-    'serial_number'        => 'Serial Number',
-    'item_notes' => ':item Notes',
-    'item_name_var' => ':item Name',
-    'error_user_company' => 'Checkout target company and asset company do not match',
-    'error_user_company_accept_view' => 'An Asset assigned to you belongs to a different company so you can\'t accept nor deny it, please check with your manager',
+    'tasks_view_all'        => 'មើលកិច្ចការទាំងអស់។',
+    'true'                  => 'ពិត',
+    'false'                 => 'មិនពិត',
+    'integration_option'    => 'ជម្រើសនៃការរួមបញ្ចូល',
+    'log_does_not_exist'    => 'មិនមានកំណត់ត្រាដែលត្រូវគ្នាទេ។',
+    'merge_users'           => 'បញ្ចូលអ្នកប្រើប្រាស់',
+    'merge_information' =>  'វានឹងបញ្ចូល៖ រាប់អ្នកប្រើប្រាស់ចូលទៅក្នុងអ្នកប្រើប្រាស់តែមួយ។ ជ្រើសរើសអ្នកប្រើប្រាស់ដែលអ្នកចង់បញ្ចូលអ្នកផ្សេងទៀតចូលទៅក្នុងខាងក្រោម ហើយទ្រព្យសម្បត្តិដែលពាក់ព័ន្ធ អាជ្ញាប័ណ្ណជាដើម នឹងត្រូវបានផ្ទេរទៅអ្នកប្រើប្រាស់ដែលបានជ្រើសរើស ហើយអ្នកប្រើប្រាស់ផ្សេងទៀតនឹងត្រូវបានសម្គាល់ថាបានលុប។',
+    'warning_merge_information' => 'សកម្មភាពនេះមិនអាចត្រឡប់វិញបានទេ ហើយគួរតែត្រូវបានប្រើតែនៅពេលដែលអ្នកត្រូវបញ្ចូលអ្នកប្រើប្រាស់ចូលគ្នា ដោយសារតែមានការនាំចូល ឬការធ្វើសមកាលកម្មមិនល្អ។ ត្រូវប្រាកដថាដំណើរការការបម្រុងទុកជាមុនសិន។',
+    'no_users_selected'     => 'គ្មានអ្នកប្រើប្រាស់ត្រូវបានជ្រើសរើសទេ។',
+    'not_enough_users_selected'     => 'យ៉ាងហោចណាស់៖ រាប់អ្នកប្រើប្រាស់ត្រូវតែត្រូវបានជ្រើសរើស',
+    'merge_success'         => ': រាប់អ្នកប្រើប្រាស់បញ្ចូលគ្នាដោយជោគជ័យទៅក្នុង :into_username!',
+    'merged'                => 'បញ្ចូលគ្នា',
+    'merged_log_this_user_into' => 'បញ្ចូល​អ្នក​ប្រើ​នេះ (ID :to_id - :to_username) ទៅ​ជា​ user ID:from_id (:from_username) ',
+    'merged_log_this_user_from' => 'បញ្ចូល​លេខ​សម្គាល់​អ្នក​ប្រើ៖from_id (:from_username) ទៅ​ក្នុង​អ្នក​ប្រើ​នេះ (ID:to_id - :to_username)',
+    'clear_and_save'            => 'ជម្រះ & រក្សាទុក',
+    'update_existing_values'    => 'ធ្វើបច្ចុប្បន្នភាពតម្លៃដែលមានស្រាប់?',
+    'auto_incrementing_asset_tags_disabled_so_tags_required' => 'ការបង្កើតស្លាកទ្រព្យសម្បត្តិដែលបង្កើនដោយស្វ័យប្រវត្តិត្រូវបានបិទ ដូច្នេះជួរទាំងអស់ត្រូវតែមានជួរឈរ "ស្លាកទ្រព្យសម្បត្តិ" លេចឡើង។',
+    'auto_incrementing_asset_tags_enabled_so_now_assets_will_be_created' => 'ចំណាំ៖ ការបង្កើតស្លាកទ្រព្យសម្បត្តិដែលបង្កើនដោយស្វ័យប្រវត្តិត្រូវបានបើក ដូច្នេះទ្រព្យសកម្មនឹងត្រូវបានបង្កើតសម្រាប់ជួរដែលមិនមាន "ស្លាក​ទ្រព្យ​សកម្ម" លេចឡើង។ ជួរ​ដេក​ដែល​មាន "ស្លាក​ទ្រព្យ​សកម្ម" ដែល​បាន​បង្ហាញ​នឹង​ត្រូវ​បាន​ធ្វើ​បច្ចុប្បន្នភាព​ជាមួយ​នឹង​ព័ត៌មាន​ដែល​បាន​ផ្តល់។',
+    'send_welcome_email_to_users'   => ' ផ្ញើអ៊ីមែលស្វាគមន៍សម្រាប់អ្នកប្រើប្រាស់ថ្មី?',
+    'send_email'                => 'ផ្ញើអ៊ីមែល',
+    'call'                      => 'ហៅទៅលេខ',
+    'back_before_importing'     => 'បម្រុងទុកមុនពេលនាំចូល?',
+    'csv_header_field'          => 'វាលក្បាល CSV',
+    'import_field'              => 'នាំចូលវាល',
+    'sample_value'              => 'តម្លៃគំរូ',
+    'no_headers'                => 'រកមិនឃើញជួរឈរទេ',
+    'error_in_import_file'      => 'មានកំហុសក្នុងការអានឯកសារ CSV: :error',
+    'errors_importing'          => 'កំហុសមួយចំនួនបានកើតឡើងនៅពេលនាំចូល៖ ',
+    'warning'                   => 'ព្រមាន: : ព្រមាន',
+    'success_redirecting'       => '"ជោគជ័យ... បញ្ជូនបន្ត។',
+    'cancel_request'            => 'បោះបង់ការស្នើសុំធាតុនេះ។',
+    'setup_successful_migrations' => 'តារាងមូលដ្ឋានទិន្នន័យរបស់អ្នកត្រូវបានបង្កើត',
+    'setup_migration_output' => 'លទ្ធផល​នៃ​ការ​ធ្វើ​ចំណាក​ស្រុក៖',
+    'setup_migration_create_user' => 'បន្ទាប់៖ បង្កើតអ្នកប្រើប្រាស់',
+    'importer_generic_error'    => 'ការនាំចូលឯកសាររបស់អ្នកបានបញ្ចប់ ប៉ុន្តែយើងបានទទួលកំហុស។ ជាធម្មតាវាបណ្តាលមកពីការបិទ API ភាគីទីបីពី webhook ការជូនដំណឹង (ដូចជា Slack) ហើយនឹងមិនមានការជ្រៀតជ្រែកជាមួយការនាំចូលដោយខ្លួនឯងទេ ប៉ុន្តែអ្នកគួរតែបញ្ជាក់រឿងនេះ។',
+    'confirm' => 'បញ្ជាក់',
+    'autoassign_licenses' => 'ផ្តល់អាជ្ញាប័ណ្ណដោយស្វ័យប្រវត្តិ',
+    'autoassign_licenses_help' => 'អនុញ្ញាតឱ្យអ្នកប្រើប្រាស់នេះមានអាជ្ញាប័ណ្ណដែលបានកំណត់តាមរយៈ UI ឬឧបករណ៍ cli ភាគច្រើនដែលផ្តល់អាជ្ញាប័ណ្ណ។',
+    'autoassign_licenses_help_long' => 'វាអនុញ្ញាតឲ្យអ្នកប្រើមានអាជ្ញាប័ណ្ណដែលត្រូវចាត់តាមរយៈ UI ការចាត់អាជ្ញាប័ណ្ណជាច្រើន ឬឧបករណ៍ CLI។ (ឧទាហរណ៍៖ អ្នកប្រហែលជាមិនចង់ឲ្យអ្នកកុងត្រាការ ទទួលអាជ្ញាប័ណ្ណដោយស្វ័យប្រវត្តិ ដែលអ្នកបម្រុងទុកសម្រាប់បុគ្គលិកប៉ុណ្ណោះ។ អ្នកនៅតែអាចចាត់អាជ្ញាប័ណ្ណជាឯកជនទៅកាន់អ្នកប្រើទាំងនោះបាន ប៉ុន្តែពួកគេនឹងមិនត្រូវរួមបញ្ចូលក្នុងមុខងារ \'Checkout License to All Users\' ឡើយ។)',
+    'no_autoassign_licenses_help' => 'កុំរួមបញ្ចូលអ្នកប្រើសម្រាប់ការចាត់អាជ្ញាប័ណ្ណជាច្រើនតាមរយៈ UI ឬឧបករណ៍ CLI។',
+    'modal_confirm_generic'      => 'តើអ្នកប្រាកដទេ?',
+    'cannot_be_deleted'      => 'ធាតុនេះមិនអាចលុបបានទេ។',
+    'cannot_be_edited'      => 'ធាតុនេះមិនអាចកែសម្រួលបានទេ។',
+    'undeployable_tooltip'      => 'ធាតុនេះមិនអាចត្រូវបានchecked out។ ពិនិត្យបរិមាណដែលនៅសល់។',
+    'serial_number'        => 'លេខស៊េរី',
+    'item_notes' => ': ចំណាំធាតុ',
+    'item_name_var' => '៖ ឈ្មោះធាតុ',
+    'error_user_company' => 'ក្រុមហ៊ុនគោលដៅនៃការចេញយក និងក្រុមហ៊ុនដែលកាន់កាប់ទ្រព្យសម្បត្តិមិនត្រូវគ្នា',
+    'error_user_company_accept_view' => 'ទ្រព្យសម្បត្តិដែលប្រគល់ឱ្យអ្នកជាកម្មសិទ្ធិរបស់ក្រុមហ៊ុនផ្សេង ដូច្នេះអ្នកមិនអាចទទួលយក ឬបដិសេធបានទេ សូមពិនិត្យជាមួយអ្នកគ្រប់គ្រងរបស់អ្នក',
     'importer' => [
-        'checked_out_to_fullname' => 'Checked Out to: Full Name',
-        'checked_out_to_first_name' => 'Checked Out to: First Name',
-        'checked_out_to_last_name' => 'Checked Out to: Last Name',
-        'checked_out_to_username' => 'Checked Out to: Username',
-        'checked_out_to_email' => 'Checked Out to: Email',
-        'checked_out_to_tag' => 'Checked Out to: Asset Tag',
-        'manager_first_name' => 'Manager First Name',
-        'manager_last_name' => 'Manager Last Name',
-        'manager_full_name' => 'Manager Full Name',
-        'manager_username' => 'Manager Username',
-        'checkout_type' => 'Checkout Type',
-        'checkout_location' => 'Checkout to Location',
-        'image_filename' => 'Image Filename',
-        'do_not_import'     => 'Do Not Import',
+        'checked_out_to_fullname' => 'បានចេញយកទៅកាន់៖ ឈ្មោះពេញ',
+        'checked_out_to_first_name' => 'បានចេញយកទៅកាន់៖ នាមខ្លួន',
+        'checked_out_to_last_name' => 'បានចេញយកទៅកាន់៖ នាមត្រកូល',
+        'checked_out_to_username' => 'បានចេញយកទៅកាន់៖ ឈ្មោះអ្នកប្រើ',
+        'checked_out_to_email' => 'បានចេញយកទៅកាន់៖ អ៊ីម៉ែល',
+        'checked_out_to_tag' => 'បានចេញយកទៅកាន់៖ ស្លាកទ្រព្យសម្បត្តិ',
+        'manager_first_name' => 'ឈ្មោះអ្នកគ្រប់គ្រង',
+        'manager_last_name' => 'នាមត្រកូលអ្នកគ្រប់គ្រង',
+        'manager_full_name' => 'ឈ្មោះពេញអ្នកគ្រប់គ្រង',
+        'manager_username' => 'ឈ្មោះអ្នកប្រើអ្នកគ្រប់គ្រង',
+        'checkout_type' => 'ប្រភេទ Checkout',
+        'checkout_location' => 'Checkout ទៅកាន់ទីតាំង',
+        'image_filename' => 'ឈ្មោះឯកសាររូបភាព',
+        'do_not_import'     => 'កុំនាំចូល',
         'vip' => 'VIP',
         'avatar'  => 'Avatar',
-        'gravatar' => 'Gravatar Email',
-        'currency' => 'Currency',
-        'address2' => 'Address Line 2',
-        'import_note' => 'Imported using csv importer',
+        'gravatar' => 'អ៊ីមែល Gravatar',
+        'currency' => 'រូបិយប័ណ្ណ',
+        'address2' => 'ខ្សែអាស័យដ្ឋាន 2',
+        'import_note' => 'បាននាំចូលដោយប្រើ csv importer',
     ],
-    'remove_customfield_association' => 'Remove this field from the fieldset. This will not delete the custom field, only this field\'s association with this fieldset.',
-    'checked_out_to_fields' => 'Checked Out To Fields',
-    'percent_complete' => '% complete',
-    'uploading' => 'Uploading... ',
-    'upload_error' => 'Error uploading file. Please check that there are no empty rows and that no column names are duplicated.',
-    'copy_to_clipboard' => 'Copy to Clipboard',
-    'copied' => 'Copied!',
-    'status_compatibility' => 'If assets are already assigned, they cannot be changed to a non-deployable status type and this value change will be skipped.',
-    'rtd_location_help' => 'This is the location of the asset when it is not checked out',
-    'item_not_found' => ':item_type ID :id does not exist or has been deleted',
-    'action_permission_denied' => 'You do not have permission to :action :item_type ID :id',
-    'action_permission_generic' => 'You do not have permission to :action this :item_type',
+    'remove_customfield_association' => 'លុបវាលនេះចេញពីសំណុំវាល។ វានឹងមិនលុបវាលផ្ទាល់ខ្លួនទេ គ្រាន់តែផ្ដាច់ការភ្ជាប់របស់វាជាមួយសំណុំវាលនេះប៉ុណ្ណោះ។',
+    'checked_out_to_fields' => 'វាលច្រើន បានចេញយកទៅកាន់',
+    'percent_complete' => '% រួចរាល់',
+    'uploading' => 'កំពុងបង្ហោះ... ',
+    'upload_error' => 'Error uploading file. Please check that you have no empty rows or duplicated column names in your CSV, and that the server permissions allow uploads.',
+    'copy_to_clipboard' => 'ចម្លងទៅក្ដារតម្បៀតខ្ទាស់',
+    'copied' => 'បានចម្លង!',
+    'status_compatibility' => 'ប្រសិនបើទ្រព្យសម្បត្តិត្រូវបានចាត់ចែងរួចហើយ ពួកវាមិនអាចប្តូរទៅជាប្រភេទស្ថានភាពដែលមិនអាចប្រើប្រាស់បានឡើយ ហើយការផ្លាស់ប្តូរតម្លៃនេះនឹងត្រូវបានរំលង។',
+    'rtd_location_help' => 'នេះគឺជាទីតាំងនៃទ្រព្យសកម្ម នៅពេលដែលវាមិនត្រូវបានពិនិត្យប្រគលឲ្យ',
+    'item_not_found' => ':item_type ID :id មិនមានទេ ឬត្រូវបានលុប',
+    'action_permission_denied' => 'អ្នកមិនមានសិទ្ធិក្នុងការ :action :item_type ID :id',
+    'action_permission_generic' => 'អ្នកមិនមានសិទ្ធិក្នុងការ :action this :item_type',
     'edit' => 'កែសម្រួល',
-    'action_source' => 'Action Source',
-    'or' => 'or',
+    'action_source' => 'ប្រភពសកម្មភាព',
+    'or' => 'ឬ',
     'url'                   => 'URL',
-    'edit_fieldset' => 'Edit fieldset fields and options',
-    'permission_denied_superuser_demo' => 'Permission denied. You cannot update user information for superadmins on the demo.',
-    'pwd_reset_not_sent' => 'User is not activated, is LDAP synced, or does not have an email address',
-    'error_sending_email' => 'Error sending email',
-    'sad_panda' => 'Sad panda. You are not authorized to do the thing. Maybe <a href=":link">return to the dashboard</a>, or contact your administrator.',
+    'edit_fieldset' => 'កែសម្រួលវាល សំណុំវាល និងជម្រើសច្រើន',
+    'permission_denied_superuser_demo' => 'ការអនុញ្ញាតត្រូវបានបដិសេធ។ អ្នកមិនអាចធ្វើបច្ចុប្បន្នភាពព័ត៌មានអ្នកប្រើប្រាស់សម្រាប់អ្នកគ្រប់គ្រងជាន់ខ្ពស់នៅលើការបង្ហាញនោះទេ។',
+    'pwd_reset_not_sent' => 'អ្នក​ប្រើ​មិន​ត្រូវ​បាន​ធ្វើ​ឱ្យ​សកម្ម, ត្រូវ​បាន​ធ្វើ​សមកាលកម្ម LDAP, ឬ​មិន​មាន​អាសយដ្ឋាន​អ៊ីមែល',
+    'error_sending_email' => 'កំហុសក្នុងការផ្ញើអ៊ីមែល',
+    'sad_panda' => 'ខ្លាឃ្មុំផេនដា។ អ្នកមិនត្រូវបានអនុញ្ញាតឱ្យធ្វើរឿងនេះទេ។ ប្រហែលជា <a href=":link">ត្រឡប់ទៅផ្ទាំងគ្រប់គ្រង</a> ឬទាក់ទងអ្នកគ្រប់គ្រងរបស់អ្នក។',
     'bulk' => [
             'delete' =>
                 [
-                'header' => 'Bulk Delete :object_type',
-                'warn'   =>  'You are about to delete one :object_type|You are about to delete :count :object_type',
-                'success'   =>  ':object_type successfully deleted|Successfully deleted :count :object_type',
-                'error'   =>  'Could not delete :object_type',
-                'nothing_selected'   =>  'No :object_type selected - nothing to do',
-                'partial'   =>  'Deleted :success_count :object_type, but :error_count :object_type could not be deleted',
+                'header' => 'លុបច្រើន :object_type',
+                'warn'   =>  'អ្នកហៀបនឹងលុបមួយ :object_type|អ្នកហៀបនឹងលុប :count :object_type',
+                'success'   =>  ':object_type បានលុបដោយជោគជ័យ|បានលុបដោយជោគជ័យ :count :object_type',
+                'error'   =>  'មិនអាចលុប៖object_type',
+                'nothing_selected'   =>  'ទេ :object_type បានជ្រើសរើស - គ្មានអ្វីត្រូវធ្វើទេ។',
+                'partial'   =>  'បានលុប :success_count :object_type ប៉ុន្តែ :error_count :object_type មិនអាចលុបបានទេ',
              ],
     ],
-    'no_requestable' => 'There are no requestable assets or asset models.',
+    'no_requestable' => 'មិនមានទ្រព្យសកម្ម ឬគំរូទ្រព្យដែលអាចស្នើសុំបានទេ។',
 
     'countable' => [
-        'accessories'  => ':count Accessory|:count Accessories',
-        'assets'  => ':count Asset|:count Assets',
-        'licenses'  => ':count License|:count Licenses',
-        'license_seats'  => ':count License Seat|:count License Seats',
-        'consumables'  => ':count Consumable|:count Consumables',
-        'components'  => ':count Component|:count Components',
-    ]
+        'accessories'  => ':count Accessory|:រាប់គ្រឿងបន្ថែម',
+        'assets'  => ':count Asset|:រាប់ទ្រព្យសកម្ម',
+        'licenses'  => ':count License|:រាប់អាជ្ញាបណ្ណ',
+        'license_seats'  => ':រាប់ អាជ្ញាប័ណ្ណ Seat|:រាប់ អាជ្ញាប័ណ្ណ Seats',
+        'consumables'  => ':រាប់ចំនួនប្រើប្រាស់|:រាប់ចំនួនប្រើប្រាស់ច្រើន',
+        'components'  => ':រាប់សមាសធាតុ|:រាប់សមាសធាតុច្រើន',
+    ],
+
+    'more_info' => 'ព័​ត៍​មាន​បន្ថែម',
+    'quickscan_bulk_help' => 'ត្រួតពិនិត្យប្រអប់នេះនឹងកែសម្រួលកំណត់ត្រាទ្រព្យសម្បត្តិដើម្បីបង្ហាញទីតាំងថ្មីនេះ។ ប្រសិនបើមិនបានត្រួតពិនិត្យប្រអប់នេះ វានឹងត្រឹមតែចុះកំណត់ត្រាទីតាំងក្នុងកំណត់ហេតុសវនកម្មប៉ុណ្ណោះ។ សូមចំណាំថា បើទ្រព្យសម្បត្តិនេះត្រូវបានបញ្ចេញប្រើ វានឹងមិនបម្លែងទីតាំងរបស់បុគ្គល ទ្រព្យសម្បត្តិ ឬទីតាំងដែលវាត្រូវបានបញ្ចេញប្រើនោះទេ។',
+    'whoops' => 'អូយ!',
+    'something_went_wrong' => 'មានអ្វីមួយខុសជាមួយសំណើរបស់អ្នក។',
+    'close' => 'បិទ',
+    'expires' => 'ផុតកំណត់',
+    'map_fields'=> 'ផែនទី៖ item_type Fields',
+    'remaining_var' => ': រាប់នៅសល់',
+    'label' => 'ស្លាក',
+    'import_asset_tag_exists' => 'ទ្រព្យសកម្មដែលមានស្លាកទ្រព្យសកម្ម :asset_tag មានរួចហើយ ហើយការធ្វើបច្ចុប្បន្នភាពមិនត្រូវបានស្នើសុំទេ។ មិនមានការផ្លាស់ប្តូរត្រូវបានធ្វើឡើងទេ។',
+    'countries_manually_entered_help' => 'តម្លៃដែលមានសញ្ញាផ្កាយ (*) ត្រូវបានបញ្ចូលដោយដៃ ហើយមិនត្រូវគ្នានឹងតម្លៃទម្លាក់ចុះ ISO 3166 ដែលមានស្រាប់ទេ',
+    'accessories_assigned' => 'គ្រឿងបន្ថែមដែលបានកំណត់',
+    'user_managed_passwords' => 'ការគ្រប់គ្រងពាក្យសម្ងាត់',
+    'user_managed_passwords_disallow' => 'មិនអនុញ្ញាតឱ្យអ្នកប្រើប្រាស់គ្រប់គ្រងពាក្យសម្ងាត់ផ្ទាល់ខ្លួនរបស់ពួកគេ។',
+    'user_managed_passwords_allow' => 'អនុញ្ញាតឱ្យអ្នកប្រើប្រាស់គ្រប់គ្រងពាក្យសម្ងាត់ផ្ទាល់ខ្លួនរបស់ពួកគេ។',
+    'from' => 'From',
+    'by' => 'ដោយ',
+
+// Add form placeholders here
+    'placeholders' => [
+        'notes'  => 'បន្ថែមកំណត់ចំណាំ',
+    ],
+
+    'breadcrumb_button_actions' => [
+        'edit_item' => 'កែសម្រួល :name',
+        'checkout_item' => 'ការបញ្ចេញប្រើ:ឈ្មោះ',
+        'checkin_item' => 'ការបង្វិលត្រឡប់:ឈ្មោះ',
+    ],
+
+    'skins' => [
+        'site_default' => 'Site Default',
+        'default_blue' => 'Default Blue',
+        'blue_dark' => 'Blue (Dark Mode)',
+        'green' => 'Green Dark',
+        'green_dark' => 'Green (Dark Mode)',
+        'red' => 'Red Dark',
+        'red_dark' => 'Red (Dark Mode)',
+        'orange' => 'Orange Dark',
+        'orange_dark' => 'Orange (Dark Mode)',
+        'black' => 'Black',
+        'black_dark' => 'Black (Dark Mode)',
+        'purple' => 'Purple',
+        'purple_dark' => 'Purple (Dark Mode)',
+        'yellow' => 'Yellow',
+        'yellow_dark' => 'Yellow (Dark Mode)',
+        'high_contrast' => 'High Contrast',
+
+    ],
+
+    'select_all_none' => 'ជ្រើសរើស/មិនជ្រើសរើសទាំងអស់',
+    'generic_model_not_found' => '៖ ម៉ូដែលនោះមិនត្រូវបានរកឃើញ ឬអ្នកមិនមានសិទ្ធិចូលប្រើវា',
+    'deleted_models' => 'ម៉ូដែលទ្រព្យសម្បត្តិដែលបានលុប',
+    'deleted_users' => 'អ្នកប្រើដែលបានលុប',
+    'cost_each' => ':amount រាល់មួយ',
+    'remove_current_image' => 'Remove current :type image',
+
+    'seeding' => [
+        'manufacturers' => [
+            'button' => 'Create Manufacturers',
+            'prompt' => 'You do not have any manufacturers yet. Would you like to seed a list of common manufacturers? (THIS WILL OVERWRITE EXISTING MANUFACTURERS, including those that have been soft-deleted.)',
+            'success' => 'Manufacturers seeded successfully',
+            'error' => 'Could not seed manufacturers. A manufacturer record already exists and seeding would overwrite it.|Could not seed manufacturers. :count manufacturer records already exist and seeding would overwrite them.',
+        ],
+    ],
 
 ];
diff --git a/resources/lang/km-KH/localizations.php b/resources/lang/km-KH/localizations.php
index 7abb9b3d5e..9eb72f124b 100644
--- a/resources/lang/km-KH/localizations.php
+++ b/resources/lang/km-KH/localizations.php
@@ -6,13 +6,13 @@ return [
     'languages' => [
         'en-US'=> 'អង់គ្លេស អាមេរិក',
         'en-GB'=> 'ភាសាអង់គ្លេស ចក្រភពអង់គ្លេស',
-        'am-ET' => 'Amharic',
+        'am-ET' => 'អាំហារិក',
         'af-ZA'=> 'អាហ្រ្វិក',
         'ar-SA'=> 'ភាសាអារ៉ាប់',
         'bg-BG'=> 'ប៊ុលហ្គារី',
         'zh-CN'=> 'ភាសាចិនសាមញ្ញ',
         'zh-TW'=> 'ភាសា​ចិន ប្រពៃណី',
-        'ca-ES' => 'Catalan',
+        'ca-ES' => 'កាតាឡាន',
         'hr-HR'=> 'ក្រូអាត',
         'cs-CZ'=> 'ឆេក',
         'da-DK'=> 'ដាណឺម៉ាក',
@@ -40,7 +40,9 @@ return [
         'ms-MY'=> 'ម៉ាឡេ',
         'mi-NZ'=> 'ម៉ៅរី',
         'mn-MN'=> 'ម៉ុងហ្គោលី',
-        'no-NO'=> 'ន័រវេស',
+        'nb-NO'=> 'ន័រវែស Bokmål',
+        'om-ET' => 'អូរ៉ូម៉ូ (អេត្យូពី)',
+        //'nn-NO'=> 'Norwegian Nynorsk',
         'fa-IR'=> 'ពែរ្ស',
         'pl-PL'=> 'ប៉ូឡូញ',
         'pt-PT'=> 'ព័រទុយហ្គាល់',
@@ -48,9 +50,9 @@ return [
         'ro-RO'=> 'រ៉ូម៉ានី',
         'ru-RU'=> 'រុស្សី',
         'sr-CS' => 'ស៊ែប៊ី (ឡាតាំង)',
-        'sk-SK'=> 'Slovak',
+        'sk-SK'=> 'ស្លូវ៉ាគី',
         'sl-SI'=> 'ស្លូវេនី',
-        'so-SO'=> 'Somali',
+        'so-SO'=> 'សូម៉ាលី',
         'es-ES'=> 'ភាសាអេស្ប៉ាញ',
         'es-CO'=> 'អេស្ប៉ាញ កូឡុំប៊ី',
         'es-MX'=> 'អេស្ប៉ាញ ម៉ិកស៊ិក',
@@ -113,54 +115,55 @@ return [
         'CG'=>'កុងហ្គោ (សាធារណរដ្ឋ)',
         'CH'=>'ប្រទេស​ស្វីស',
         'CI'=>'Côte d\'Ivoire',
-        'CK'=>'Cook Islands',
-        'CL'=>'Chile',
-        'CM'=>'Cameroon',
-        'CN'=>'People\'s Republic of China',
-        'CO'=>'Colombia',
-        'CR'=>'Costa Rica',
-        'CU'=>'Cuba',
-        'CV'=>'Cape Verde',
-        'CX'=>'Christmas Island',
-        'CY'=>'Cyprus',
-        'CZ'=>'Czech Republic',
-        'DE'=>'Germany',
-        'DJ'=>'Djibouti',
-        'DK'=>'Denmark',
-        'DM'=>'Dominica',
-        'DO'=>'Dominican Republic',
-        'DZ'=>'Algeria',
-        'EC'=>'Ecuador',
-        'EE'=>'Estonia',
-        'EG'=>'Egypt',
-        'ER'=>'Eritrea',
-        'ES'=>'Spain',
-        'ET'=>'Ethiopia',
-        'EU'=>'European Union',
-        'FI'=>'Finland',
-        'FJ'=>'Fiji',
-        'FK'=>'Falkland Islands (Malvinas)',
-        'FM'=>'Micronesia, Federated States Of',
-        'FO'=>'Faroe Islands',
-        'FR'=>'France',
-        'GA'=>'Gabon',
-        'GD'=>'Grenada',
-        'GE'=>'Georgia',
-        'GF'=>'French Guiana',
-        'GG'=>'Guernsey',
-        'GH'=>'Ghana',
-        'GI'=>'Gibraltar',
-        'GL'=>'Greenland',
-        'GM'=>'Gambia',
-        'GN'=>'Guinea',
-        'GP'=>'Guadeloupe',
-        'GQ'=>'Equatorial Guinea',
-        'GR'=>'Greece',
-        'GS'=>'South Georgia And The South Sandwich Islands',
-        'GT'=>'Guatemala',
-        'GU'=>'Guam',
-        'GW'=>'Guinea-Bissau',
-        'GY'=>'Guyana',
+        'CK'=>'កោះឃុក',
+        'CL'=>'ឈីលី',
+        'CM'=>'កេមេរូន',
+        'CN'=>'សាធារណរដ្ឋប្រជាមានិតចិន',
+        'CO'=>'កូឡុំប៊ី',
+        'CR'=>'កូស្តារីកា',
+        'CU'=>'គុយបា',
+        'CV'=>'ខេបវឺដេ',
+        'CX'=>'កោះគ្រីស្តម៉ាស',
+        'CY'=>'សាធារណរដ្ឋស៊ីពរ៍',
+        'CZ'=>'សាធារណរដ្ឋឆេក',
+        'DE'=>'អាល្លឺម៉ង់',
+        'DJ'=>'សាធារណរដ្ឋហ្ស៊ីបូទី',
+        'DK'=>'ដាណឺម៉ាក',
+        'DM'=>'ចក្រភពដូមីនីកា',
+        'DO'=>'សាធារណរដ្ឋដូមីនីកែន',
+        'DZ'=>'អាល់ហ្សេរី',
+        'EC'=>'អេក្វាឌ័រ',
+        'EE'=>'អេស្ដូនី',
+        'EG'=>'អេហ្ស៊ីប',
+        'GB-ENG'=>'ប្រទេសអង់គ្លេស',
+        'ER'=>'អេរិទ្រីយ៉ា',
+        'ES'=>'អេស្ប៉ាញ',
+        'ET'=>'អេត្យូពី',
+        'EU'=>'សហភាពអឺរ៉ុប',
+        'FI'=>'ហ្វាំងឡង់',
+        'FJ'=>'ហ្វីជី',
+        'FK'=>'កោះហ្វ៉ក់ឡង់ (ម៉ាល់វី)',
+        'FM'=>'មីក្រូណេស៊ី រដ្ឋសហព័ន្ធនៃ',
+        'FO'=>'កោះហ្វារ៉ូ',
+        'FR'=>'ប្រទេសបារាំង',
+        'GA'=>'ហ្កាបុង',
+        'GD'=>'ហ្រ្គេណាដា',
+        'GE'=>'ហ្សកហ្ស៊ី',
+        'GF'=>'ហ្វ្រង់ស្វ៊ីស',
+        'GG'=>'ហ្គេនស៊ី',
+        'GH'=>'ហ្គាណា',
+        'GI'=>'ហ្គីលប្រាត័រ',
+        'GL'=>'ហ្រ្គិនលែនដ៍',
+        'GM'=>'ហ្គាំប៊ី',
+        'GN'=>'ហ្គីណេ',
+        'GP'=>'ហ្គូដលូប',
+        'GQ'=>'អេក្វាទ័រហ្គីណេ',
+        'GR'=>'ប្រទេសក្រិក',
+        'GS'=>'ហ្សកហ្ស៊ីខាងត្បូង និងកោះសាំងវិចខាងត្បូង',
+        'GT'=>'ហ្គាតេម៉ាឡា',
+        'GU'=>'កោះហ្គាំ',
+        'GW'=>'ហ្គីណេ-ប៊ីសូ',
+        'GY'=>'ហ្គីយ៉ាណា',
         'HK'=>'ហុងកុង',
         'HM'=>'កោះ Heard និង Mcdonald',
         'HN'=>'ហុងឌូរ៉ាស',
@@ -186,7 +189,7 @@ return [
         'KH'=>'កម្ពុជា',
         'KI'=>'គីរីបាទី',
         'KM'=>'កូម៉ូរ៉ូ',
-        'KN'=>'Saint Kitts And Nevis',
+        'KN'=>'Saint Kitts និង Nevis',
         'KR'=>'កូរ៉េ សាធារណរដ្ឋ',
         'KW'=>'គុយវ៉ែត',
         'KY'=>'កោះកៃម៉ាន',
@@ -211,111 +214,113 @@ return [
         'MK'=>'ម៉ាសេដូនៀ អតីតសាធារណរដ្ឋយូហ្គោស្លាវី',
         'ML'=>'ប្រទេសម៉ាលី',
         'MM'=>'មីយ៉ាន់ម៉ា',
-        'MN'=>'Mongolia',
-        'MO'=>'Macau',
-        'MP'=>'Northern Mariana Islands',
-        'MQ'=>'Martinique',
-        'MR'=>'Mauritania',
-        'MS'=>'Montserrat',
-        'MT'=>'Malta',
-        'MU'=>'Mauritius',
-        'MV'=>'Maldives',
-        'MW'=>'Malawi',
-        'MX'=>'Mexico',
-        'MY'=>'Malaysia',
-        'MZ'=>'Mozambique',
-        'NA'=>'Namibia',
-        'NC'=>'New Caledonia',
-        'NE'=>'Niger',
-        'NF'=>'Norfolk Island',
-        'NG'=>'Nigeria',
-        'NI'=>'Nicaragua',
-        'NL'=>'Netherlands',
-        'NO'=>'Norway',
-        'NP'=>'Nepal',
-        'NR'=>'Nauru',
-        'NU'=>'Niue',
-        'NZ'=>'New Zealand',
-        'OM'=>'Oman',
-        'PA'=>'Panama',
-        'PE'=>'Peru',
-        'PF'=>'French Polynesia',
-        'PG'=>'Papua New Guinea',
-        'PH'=>'Philippines, Republic of the',
-        'PK'=>'Pakistan',
-        'PL'=>'Poland',
-        'PM'=>'St. Pierre And Miquelon',
-        'PN'=>'Pitcairn',
-        'PR'=>'Puerto Rico',
-        'PS'=>'Palestine',
-        'PT'=>'Portugal',
-        'PW'=>'Palau',
-        'PY'=>'Paraguay',
-        'QA'=>'Qatar',
+        'MN'=>'ម៉ុងហ្គោលី',
+        'MO'=>'ម៉ាកាវ',
+        'MP'=>'កោះម៉ារៀណាខាងជើង',
+        'MQ'=>'ម៉ាទីនីក',
+        'MR'=>'ម៉ូរីតានី',
+        'MS'=>'ម៉ុងសឺរ៉ាត់',
+        'MT'=>'ម៉ាល់តា',
+        'MU'=>'ម៉ូរីស',
+        'MV'=>'ម៉ាល់ឌីវ',
+        'MW'=>'ម៉ាឡាវី',
+        'MX'=>'ម៉ិកស៊ិក',
+        'MY'=>'ម៉ាឡេស៊ី',
+        'MZ'=>'ម៉ូសំប៊ិក',
+        'NA'=>'ណាមីប៊ី',
+        'NC'=>'កាឡេដូនៀថ្មី',
+        'NE'=>'នីហ្សេរីយ៉ា',
+        'NF'=>'កោះ Norfolk',
+        'NG'=>'នីហ្សេរីយ៉ា',
+        'NI'=>'នីការ៉ាហ្គា',
+        'NL'=>'ហូឡង់',
+        'GB-NIR' => 'អៀរឡង់ខាងជើង',
+        'NO'=>'ប្រទេសន័រវេស',
+        'NP'=>'នេប៉ាល់',
+        'NR'=>'ណៅរូ',
+        'NU'=>'នីយូ',
+        'NZ'=>'នូវែលសេឡង់',
+        'OM'=>'អូម៉ង់',
+        'PA'=>'ប៉ាណាម៉ា',
+        'PE'=>'ប្រទេសប៉េរូ',
+        'PF'=>'ប៉ូលីនេស៊ីបារាំង',
+        'PG'=>'ប៉ាពួញូហ្គីណេ',
+        'PH'=>'ហ្វីលីពីន សាធារណរដ្ឋ',
+        'PK'=>'ប៉ាគីស្ថាន',
+        'PL'=>'ប៉ូឡូញ',
+        'PM'=>'St. Pierre និង Miquelon',
+        'PN'=>'ភីតខេន',
+        'PR'=>'ព័រតូរីកូ',
+        'PS'=>'ប៉ាឡេស្ទីន',
+        'PT'=>'ព័រទុយហ្គាល់',
+        'PW'=>'ប៉ាឡូ',
+        'PY'=>'ប៉ារ៉ាហ្គាយ',
+        'QA'=>'កាតា',
         'RE'=>'Reunion',
-        'RO'=>'Romania',
-        'RS'=>'Serbia',
-        'RU'=>'Russian Federation',
-        'RW'=>'Rwanda',
-        'SA'=>'Saudi Arabia',
-        'UK'=>'Scotland',
-        'SB'=>'Solomon Islands',
+        'RO'=>'រូម៉ានី',
+        'RS'=>'ស៊ែប៊ី',
+        'RU'=>'សហព័ន្ធរុស្ស៊ី',
+        'RW'=>'រវ៉ាន់ដា',
+        'SA'=>'អារ៉ាប៊ីសាអូឌីត',
+        'GB-SCT'=>'ស្កុតឡេន',
+        'SB'=>'កោះសាឡូម៉ូន',
         'SC'=>'សីស្ហែល',
-        'SS'=>'South Sudan',
-        'SD'=>'Sudan',
-        'SE'=>'Sweden',
-        'SG'=>'Singapore',
-        'SH'=>'St. Helena',
-        'SI'=>'Slovenia',
-        'SJ'=>'Svalbard And Jan Mayen Islands',
-        'SK'=>'Slovakia (Slovak Republic)',
-        'SL'=>'Sierra Leone',
-        'SM'=>'San Marino',
-        'SN'=>'Senegal',
-        'SO'=>'Somalia',
-        'SR'=>'Suriname',
-        'ST'=>'Sao Tome And Principe',
-        'SU'=>'Soviet Union',
-        'SV'=>'El Salvador',
-        'SY'=>'Syrian Arab Republic',
-        'SZ'=>'Swaziland',
-        'TC'=>'Turks And Caicos Islands',
-        'TD'=>'Chad',
-        'TF'=>'French Southern Territories',
-        'TG'=>'Togo',
-        'TH'=>'Thailand',
-        'TJ'=>'Tajikistan',
-        'TK'=>'Tokelau',
-        'TI'=>'East Timor',
-        'TM'=>'Turkmenistan',
-        'TN'=>'Tunisia',
-        'TO'=>'Tonga',
-        'TP'=>'East Timor (old code)',
-        'TR'=>'Turkey',
-        'TT'=>'Trinidad And Tobago',
-        'TV'=>'Tuvalu',
-        'TW'=>'Taiwan',
-        'TZ'=>'Tanzania, United Republic Of',
-        'UA'=>'Ukraine',
-        'UG'=>'Uganda',
-        'UK'=>'United Kingdom',
-        'US'=>'United States',
-        'UM'=>'United States Minor Outlying Islands',
-        'UY'=>'Uruguay',
-        'UZ'=>'Uzbekistan',
-        'VA'=>'Vatican City State (Holy See)',
-        'VC'=>'Saint Vincent And The Grenadines',
-        'VE'=>'Venezuela',
-        'VG'=>'Virgin Islands (British)',
-        'VI'=>'Virgin Islands (U.S.)',
-        'VN'=>'Viet Nam',
-        'VU'=>'Vanuatu',
-        'WF'=>'Wallis And Futuna Islands',
-        'WS'=>'Samoa',
-        'YE'=>'Yemen',
-        'YT'=>'Mayotte',
-        'ZA'=>'South Africa',
-        'ZM'=>'Zambia',
-        'ZW'=>'Zimbabwe',
+        'SS'=>'ស៊ូដង់ខាងត្បូង',
+        'SD'=>'ស៊ូដង់',
+        'SE'=>'ស៊ុយអែត',
+        'SG'=>'សិង្ហបុរី',
+        'SH'=>'សាំងហេលេណា',
+        'SI'=>'ស្លូវេនី',
+        'SJ'=>'កោះ Svalbard និង Jan Mayen',
+        'SK'=>'ស្លូវ៉ាគី (សាធារណរដ្ឋស្លូវ៉ាគី)',
+        'SL'=>'សៀរ៉ាឡេអូន',
+        'SM'=>'សាន់ម៉ារីណូ',
+        'SN'=>'សេណេហ្គាល់',
+        'SO'=>'សូម៉ាលី',
+        'SR'=>'ស៊ូរីណាម',
+        'ST'=>'Sao Tome និង Principe',
+        'SU'=>'សហភាពសូវៀត',
+        'SV'=>'អែលសាល់វ៉ាឌ័រ',
+        'SY'=>'សាធារណរដ្ឋអារ៉ាប់ស៊ីរី',
+        'SZ'=>'ស្វាស៊ីឡង់',
+        'TC'=>'កោះ Turks និង Caicos',
+        'TD'=>'ឆាដ',
+        'TF'=>'ដែនដីភាគខាងត្បូងបារាំង',
+        'TG'=>'តូហ្គោ',
+        'TH'=>'ប្រទេសថៃ',
+        'TJ'=>'តាជីគីស្ថាន',
+        'TK'=>'តូក្លូ',
+        'TI'=>'ទីម័រខាងកើត',
+        'TM'=>'តូមិននីស្ថាន',
+        'TN'=>'ទុយនីស៊ី',
+        'TO'=>'តុងហ្គា',
+        'TP'=>'ទីម័រខាងកើត (លេខកូដចាស់)',
+        'TR'=>'តួកគី',
+        'TT'=>'ទ្រីនីដាដ និងតូបាហ្គោ',
+        'TV'=>'ទូវ៉ាលូ',
+        'TW'=>'តៃវ៉ាន់',
+        'TZ'=>'តង់ហ្សានី សាធារណរដ្ឋ',
+        'UA'=>'អ៊ុយក្រែន',
+        'UG'=>'អ៊ូហ្គង់ដា',
+        'UK'=>'ចក្រភពអង់គ្លេស',
+        'US'=>'សហរដ្ឋអាមេរិក',
+        'UM'=>'កោះ Minor Outlying របស់សហរដ្ឋអាមេរិក',
+        'UY'=>'អ៊ុយរូហ្គាយ',
+        'UZ'=>'អ៊ូសបេគីស្ថាន',
+        'VA'=>'រដ្ឋវ៉ាទីកង់ (Holy See)',
+        'VC'=>'Saint Vincent និង The Grenadines',
+        'VE'=>'វ៉េណេស៊ុយអេឡា',
+        'VG'=>'កោះវឺជីន (អង់គ្លេស)',
+        'VI'=>'កោះវឺជីន (សហរដ្ឋអាមេរិក)',
+        'VN'=>'វៀតណាម',
+        'VU'=>'វ៉ានូអាទូ',
+        'GB-WLS' =>'វេលស៍',
+        'WF'=>'កោះ Wallis និង Futuna',
+        'WS'=>'សាម័រ',
+        'YE'=>'យេម៉ែន',
+        'YT'=>'ម៉ាយ៉ាត',
+        'ZA'=>'អាហ្វ្រិកខាងត្បូង',
+        'ZM'=>'សំប៊ី',
+        'ZW'=>'ហ្ស៊ីមបាវ៉េ',
     ],
 ];
\ No newline at end of file
diff --git a/resources/lang/km-KH/mail.php b/resources/lang/km-KH/mail.php
index f38d7dbfe7..cfaed35181 100644
--- a/resources/lang/km-KH/mail.php
+++ b/resources/lang/km-KH/mail.php
@@ -23,39 +23,41 @@ return [
     'Item_Requested' => 'ធាតុដែលបានស្នើសុំ',
     'License_Checkin_Notification' => 'អាជ្ញាប័ណ្ណ checked in',
     'License_Checkout_Notification' => 'អាជ្ញាប័ណ្ណ checked out',
+    'license_for'   => 'អាជ្ញាប័ណ្ណសម្រាប់',
     'Low_Inventory_Report' => 'របាយការណ៍សារពើភ័ណ្ឌទាប',
     'a_user_canceled' => 'អ្នក​ប្រើ​បាន​លុប​ចោល​សំណើ​ធាតុ​មួយ​នៅ​លើ​គេហទំព័រ',
     'a_user_requested' => 'អ្នកប្រើប្រាស់បានស្នើសុំធាតុនៅលើគេហទំព័រ',
     'acceptance_asset_accepted' => 'អ្នកប្រើប្រាស់បានទទួលយកធាតុមួយ។',
     'acceptance_asset_declined' => 'អ្នកប្រើប្រាស់បានបដិសេធធាតុមួយ។',
-    'accessory_name' => 'ឈ្មោះគ្រឿងបន្លាស់៖',
-    'additional_notes' => 'កំណត់ចំណាំបន្ថែម៖',
+    'accessory_name' => 'ឈ្មោះគ្រឿងបន្លាស់',
+    'additional_notes' => 'កំណត់ចំណាំបន្ថែម',
     'admin_has_created' => 'អ្នកគ្រប់គ្រងបានបង្កើតគណនីមួយសម្រាប់អ្នកនៅលើគេហទំព័រ៖ គេហទំព័រ។',
-    'asset' => 'ទ្រព្យសកម្ម៖',
-    'asset_name' => 'ឈ្មោះទ្រព្យសកម្ម៖',
+    'asset' => 'ទ្រព្យសកម្ម',
+    'asset_name' => 'ឈ្មោះទ្រព្យសម្បត្តិ',
     'asset_requested' => 'បាន​ស្នើ​សុំ​ទ្រព្យ​សកម្ម',
     'asset_tag' => 'ស្លាកទ្រព្យសម្បត្តិ',
     'assets_warrantee_alert' => 'មាន : រាប់ទ្រព្យសកម្មជាមួយនឹងការធានាផុតកំណត់ក្នុងរយៈពេលបន្ទាប់ : threshold days។ | មាន : រាប់ទ្រព្យសកម្មជាមួយនឹងការធានាផុតកំណត់ក្នុងរយៈពេលបន្ទាប់ : threshold days ។',
     'assigned_to' => 'ចាត់តាំងទៅ',
     'best_regards' => 'សូមគោរព',
-    'canceled' => 'បានលុបចោល៖',
-    'checkin_date' => 'កាលបរិច្ឆេទត្រឡប់មកវិញ:',
-    'checkout_date' => 'ថ្ងៃប្រគល់អោយ:',
+    'canceled' => 'បានលុបចោល',
+    'checkin_date' => 'កាលបរិច្ឆេទត្រឡប់មកវិញ',
+    'checkout_date' => 'ថ្ងៃប្រគល់អោយ',
     'checkedout_from' => 'Checked out ពី',
     'checkedin_from'  => 'Checked in ពី',
     'checked_into' => 'Checked into',
     'click_on_the_link_accessory' => 'សូមចុចលើតំណភ្ជាប់នៅខាងក្រោមដើម្បីបញ្ជាក់ថាអ្នកបានទទួលគ្រឿងបន្លាស់។',
     'click_on_the_link_asset' => 'សូមចុចលើតំណភ្ជាប់នៅខាងក្រោម ដើម្បីបញ្ជាក់ថាអ្នកបានទទួលទ្រព្យសកម្ម។',
     'click_to_confirm' => 'សូមចុចលើតំណភ្ជាប់ខាងក្រោមដើម្បីបញ្ជាក់៖គណនីបណ្ដាញរបស់អ្នក៖',
-    'current_QTY' => 'Current QTY',
+    'current_QTY' => 'QTY បច្ចុប្បន្ន',
     'days' => 'ថ្ងៃ',
-    'expecting_checkin_date' => 'កាលបរិច្ឆេទដែលរំពឹងទុកនឹង Checkin:',
+    'expecting_checkin_date' => 'កាលបរិច្ឆេទដែលរំពឹងទុកនឹង Checkin',
     'expires' => 'ផុតកំណត់',
     'hello' => 'ជំរាបសួរ',
     'hi' => 'សួស្តី',
     'i_have_read' => 'ខ្ញុំបានអាន និងយល់ព្រមតាមលក្ខខណ្ឌនៃការប្រើប្រាស់ ហើយបានទទួលធាតុនេះ។',
     'inventory_report' => 'របាយការណ៍សារពើភ័ណ្ឌ',
     'item' => 'ធាតុ',
+    'item_checked_reminder' => 'This is a reminder that you currently have :count items checked out to you that you have not accepted or declined. Please click the link below to confirm your decision.',
     'license_expiring_alert' => 'មាន :count License ផុតកំណត់ក្នុង :threshold days បន្ទាប់។ | មាន :count licenses ផុតកំណត់ក្នុង :threshold days បន្ទាប់។',
     'link_to_update_password' => 'សូមចុចលើតំណខាងក្រោមដើម្បីធ្វើបច្ចុប្បន្នភាព៖ពាក្យសម្ងាត់បណ្ដាញរបស់អ្នក៖',
     'login' => 'ចូល',
@@ -64,6 +66,8 @@ return [
     'min_QTY' => 'Min QTY',
     'name' => 'ឈ្មោះ',
     'new_item_checked' => 'ធាតុថ្មីត្រូវបានchecked outក្រោមឈ្មោះរបស់អ្នក ព័ត៌មានលម្អិតមាននៅខាងក្រោម។',
+    'new_item_checked_with_acceptance' => 'A new item has been checked out under your name that requires acceptance, details are below.',
+    'recent_item_checked' => 'An item was recently checked out under your name that requires acceptance, details are below.',
     'notes' => 'កំណត់ចំណាំ',
     'password' => 'ពាក្យសម្ងាត់',
     'password_reset' => 'កំណត់ពាក្យសម្ងាត់ឡើងវិញ',
@@ -86,8 +90,10 @@ return [
     'upcoming-audits' => 'មាន : រាប់ទ្រព្យសកម្មដែលនឹងមកដល់សម្រាប់សវនកម្មក្នុងរយៈពេល : threshold days។|មាន : រាប់ទ្រព្យសកម្មដែលនឹងមកដល់សម្រាប់សវនកម្មក្នុងរយៈពេល : threshold days ។',
     'user' => 'អ្នក​ប្រើ',
     'username' => 'ឈ្មោះ​អ្នកប្រើប្រាស់',
+    'unaccepted_asset_reminder' => 'Reminder: You have Unaccepted Assets.',
     'welcome' => 'សូមស្វាគមន៍៖ ឈ្មោះ',
     'welcome_to' => 'សូមស្វាគមន៍មកកាន់៖ គេហទំព័រ!',
     'your_assets' => 'មើលទ្រព្យសកម្មរបស់អ្នក',
     'your_credentials' => 'លិខិតសម្គាល់ Snipe-IT របស់អ្នក។',
+    'mail_sent' => 'អ៊ីមែលបានផ្ញើដោយជោគជ័យ!',
 ];
diff --git a/resources/lang/km-KH/table.php b/resources/lang/km-KH/table.php
index 056779c4da..5c493f56dd 100644
--- a/resources/lang/km-KH/table.php
+++ b/resources/lang/km-KH/table.php
@@ -4,8 +4,8 @@ return array(
 
     'actions'	 	        => 'សកម្មភាព',
     'action' 		        => 'សកម្មភាព',
-    'by'      		        => 'By',
+    'by'      		        => 'ដោយ',
     'item' 			        => 'ធាតុ',
-    'no_matching_records'   => 'No matching records found',
+    'no_matching_records'   => 'រកមិនឃើញកំណត់ត្រាដែលត្រូវគ្នាទេ។',
 
 );
diff --git a/resources/lang/km-KH/validation.php b/resources/lang/km-KH/validation.php
index cd6d9d7e8b..d7a4f39367 100644
--- a/resources/lang/km-KH/validation.php
+++ b/resources/lang/km-KH/validation.php
@@ -13,100 +13,166 @@ return [
     |
     */
 
-    'accepted'             => 'គុណលក្ខណៈ : ត្រូវតែទទួលយក។',
-    'active_url'           => ':attribute មិនមែនជា URL ត្រឹមត្រូវទេ។',
-    'after'                => ':attribute ត្រូវតែជាកាលបរិច្ឆេទបន្ទាប់ពី :date ។',
-    'after_or_equal'       => ':attribute ត្រូវតែជាកាលបរិច្ឆេទបន្ទាប់ពី ឬស្មើនឹង :date។',
-    'alpha'                => ':attribute អាចមានត្រឹមតែអក្សរប៉ុណ្ណោះ។',
-    'alpha_dash'           => ':attribute អាចមានតែអក្សរ លេខ និងសញ្ញាដាច់ៗប៉ុណ្ណោះ។',
-    'alpha_num'            => ':attribute អាចមានត្រឹមតែអក្សរ និងលេខប៉ុណ្ណោះ។',
-    'array'                => 'The :attribute must be an array.',
-    'before'               => 'The :attribute must be a date before :date.',
-    'before_or_equal'      => 'The :attribute must be a date before or equal to :date.',
-    'between'              => [
-        'numeric' => 'The :attribute must be between :min - :max.',
-        'file'    => 'The :attribute must be between :min - :max kilobytes.',
-        'string'  => 'The :attribute must be between :min - :max characters.',
-        'array'   => 'The :attribute must have between :min and :max items.',
+    'accepted' => 'វាល :attribute ត្រូវតែទទួលយក។',
+    'accepted_if' => 'វាល :attribute ត្រូវតែទទួលយកនៅពេលដែល :other is :value។',
+    'active_url' => 'វាល :attribute ត្រូវតែជា URL ត្រឹមត្រូវ។',
+    'after' => 'វាល :attribute ត្រូវតែជាកាលបរិច្ឆេទបន្ទាប់ពី :date ។',
+    'after_or_equal' => 'វាល :attribute ត្រូវតែជាកាលបរិច្ឆេទបន្ទាប់ពី ឬស្មើនឹង :date។',
+    'alpha' => 'វាល :attribute ត្រូវតែមានអក្សរតែប៉ុណ្ណោះ។',
+    'alpha_dash' => 'វាល :attribute ត្រូវ​តែ​មាន​អក្សរ លេខ សញ្ញា​ចុច និង​សញ្ញា​គូស​ក្រោម។',
+    'alpha_num' => 'វាល :attribute ត្រូវតែមានអក្សរ និងលេខប៉ុណ្ណោះ។',
+    'array' => 'វាល :attribute ត្រូវតែជាអារេ។',
+    'ascii' => 'វាល :attribute ត្រូវតែមានតួអក្សរ និងនិមិត្តសញ្ញាលេខមួយបៃប៉ុណ្ណោះ។',
+    'before' => 'វាល :attribute ត្រូវតែជាកាលបរិច្ឆេទមុន :date ។',
+    'before_or_equal' => 'វាល :attribute ត្រូវតែជាកាលបរិច្ឆេទមុន ឬស្មើនឹង :date ។',
+    'between' => [
+        'array' => 'វាល :attribute ត្រូវតែមានរវាង :min និង :max items។',
+        'file' => 'វាល :attribute ត្រូវតែស្ថិតនៅចន្លោះ :min និង :max kilobytes។',
+        'numeric' => 'វាល :attribute ត្រូវតែស្ថិតនៅចន្លោះ :min និង :max។',
+        'string' => 'វាល :attribute ត្រូវតែស្ថិតនៅចន្លោះ :min និង :max តួអក្សរ។',
     ],
-    'boolean'              => 'The :attribute must be true or false.',
-    'confirmed'            => 'The :attribute confirmation does not match.',
-    'date'                 => 'The :attribute is not a valid date.',
-    'date_format'          => 'The :attribute does not match the format :format.',
-    'different'            => 'The :attribute and :other must be different.',
-    'digits'               => 'The :attribute must be :digits digits.',
-    'digits_between'       => 'The :attribute must be between :min and :max digits.',
-    'dimensions'           => 'The :attribute has invalid image dimensions.',
-    'distinct'             => 'The :attribute field has a duplicate value.',
-    'email'                => 'The :attribute format is invalid.',
-    'exists'               => 'The selected :attribute is invalid.',
-    'file'                 => 'The :attribute must be a file.',
-    'filled'               => 'The :attribute field must have a value.',
-    'image'                => 'The :attribute must be an image.',
+    'boolean' => 'វាល :attribute ត្រូវតែពិត ឬមិនពិត។',
+    'can' => 'វាល :attribute មានតម្លៃដែលមិនមានការអនុញ្ញាត។',
+    'confirmed' => 'ការបញ្ជាក់វាល :attribute មិនត្រូវគ្នាទេ។',
+    'contains' => 'វាល :attribute បាត់តម្លៃដែលត្រូវការ។',
+    'current_password' => 'ពាក្យ​សម្ងាត់​មិន​ត្រឹមត្រូវ។',
+    'date' => 'វាល :attribute ត្រូវតែជាកាលបរិច្ឆេទត្រឹមត្រូវ។',
+    'date_equals' => 'វាល :attribute ត្រូវតែជាកាលបរិច្ឆេទស្មើនឹង :date ។',
+    'date_format' => 'វាល :attribute ត្រូវតែផ្គូផ្គងទម្រង់ :format ។',
+    'decimal' => ':attribute វាលត្រូវតែមាន :ខ្ទង់ទសភាគ។',
+    'declined' => 'វាល :attribute ត្រូវតែត្រូវបានបដិសេធ។',
+    'declined_if' => 'វាល :attribute ត្រូវតែត្រូវបានបដិសេធនៅពេលដែល :other គឺ :value។',
+    'different' => 'វាល :attribute និង :other ត្រូវតែខុសគ្នា។',
+    'digits' => 'វាល :attribute ត្រូវតែជា :digits digits។',
+    'digits_between' => 'វាល :attribute ត្រូវតែស្ថិតនៅចន្លោះ :min និង :max digits ។',
+    'dimensions' => 'វាល :attribute មានវិមាត្ររូបភាពមិនត្រឹមត្រូវ។',
+    'distinct' => 'វាល :attribute មានតម្លៃស្ទួន។',
+    'doesnt_end_with' => 'វាល :attribute មិនត្រូវបញ្ចប់ដោយមួយក្នុងចំណោមខាងក្រោម៖ :values។',
+    'doesnt_start_with' => 'វាល :attribute មិនត្រូវចាប់ផ្តើមដោយមួយក្នុងចំណោមខាងក្រោម: :values ​​។',
+    'email' => 'វាល :attribute ត្រូវតែជាអាសយដ្ឋានអ៊ីមែលត្រឹមត្រូវ។',
+    'ends_with' => 'វាល :attribute ត្រូវតែបញ្ចប់ដោយមួយក្នុងចំណោមខាងក្រោម: :values ​​។',
+    'enum' => 'គុណលក្ខណៈដែលបានជ្រើសរើសគឺមិនត្រឹមត្រូវទេ។',
+    'exists' => 'គុណលក្ខណៈដែលបានជ្រើសរើសគឺមិនត្រឹមត្រូវទេ។',
+    'extensions' => 'វាល :attribute ត្រូវតែមានផ្នែកបន្ថែមមួយខាងក្រោម៖ :values ​​។',
+    'file' => 'វាល :attribute ត្រូវតែជាឯកសារ។',
+    'filled' => 'វាល :attribute ត្រូវតែមានតម្លៃ។',
+    'gt' => [
+        'array' => 'វាល :attribute ត្រូវតែមានច្រើនជាង :value items។',
+        'file' => 'វាល :attribute ត្រូវតែធំជាង :value kilobytes។',
+        'numeric' => 'វាល :attribute ត្រូវតែធំជាង :value។',
+        'string' => 'វាល :attribute ត្រូវតែធំជាង :value តួអក្សរ។',
+    ],
+    'gte' => [
+        'array' => 'វាល :attribute ត្រូវតែមាន :value items ឬច្រើនជាងនេះ។',
+        'file' => 'វាល :attribute ត្រូវតែធំជាង ឬស្មើនឹង :value kilobytes។',
+        'numeric' => 'វាល :attribute ត្រូវតែធំជាង ឬស្មើនឹង :value។',
+        'string' => 'វាល :attribute ត្រូវតែធំជាង ឬស្មើនឹង :value តួអក្សរ។',
+    ],
+    'hex_color' => 'វាល :attribute ត្រូវតែជាពណ៌គោលដប់ប្រាំមួយត្រឹមត្រូវ។',
+    'image' => 'The :attribute field must be an image.',
     'import_field_empty'    => 'The value for :fieldname cannot be null.',
-    'in'                   => 'The selected :attribute is invalid.',
-    'in_array'             => 'The :attribute field does not exist in :other.',
-    'integer'              => 'The :attribute must be an integer.',
-    'ip'                   => 'The :attribute must be a valid IP address.',
-    'ipv4'                 => 'The :attribute must be a valid IPv4 address.',
-    'ipv6'                 => 'The :attribute must be a valid IPv6 address.',
-    'is_unique_department' => 'The :attribute must be unique to this Company Location',
-    'json'                 => 'The :attribute must be a valid JSON string.',
-    'max'                  => [
-        'numeric' => 'The :attribute may not be greater than :max.',
-        'file'    => 'The :attribute may not be greater than :max kilobytes.',
-        'string'  => 'The :attribute may not be greater than :max characters.',
-        'array'   => 'The :attribute may not have more than :max items.',
+    'in' => 'គុណលក្ខណៈដែលបានជ្រើសរើសគឺមិនត្រឹមត្រូវទេ។',
+    'in_array' => 'The :attribute field must exist in :other.',
+    'integer' => 'The :attribute field must be an integer.',
+    'ip' => 'The :attribute field must be a valid IP address.',
+    'ipv4' => 'The :attribute field must be a valid IPv4 address.',
+    'ipv6' => 'The :attribute field must be a valid IPv6 address.',
+    'json' => 'The :attribute field must be a valid JSON string.',
+    'list' => 'The :attribute field must be a list.',
+    'lowercase' => 'The :attribute field must be lowercase.',
+    'lt' => [
+        'array' => 'The :attribute field must have less than :value items.',
+        'file' => 'The :attribute field must be less than :value kilobytes.',
+        'numeric' => 'The :attribute field must be less than :value.',
+        'string' => 'The :attribute field must be less than :value characters.',
     ],
-    'mimes'                => 'The :attribute must be a file of type: :values.',
-    'mimetypes'            => 'The :attribute must be a file of type: :values.',
-    'min'                  => [
-        'numeric' => 'The :attribute must be at least :min.',
-        'file'    => 'The :attribute must be at least :min kilobytes.',
-        'string'  => 'The :attribute must be at least :min characters.',
-        'array'   => 'The :attribute must have at least :min items.',
+    'lte' => [
+        'array' => 'The :attribute field must not have more than :value items.',
+        'file' => 'The :attribute field must be less than or equal to :value kilobytes.',
+        'numeric' => 'The :attribute field must be less than or equal to :value.',
+        'string' => 'The :attribute field must be less than or equal to :value characters.',
     ],
-    'starts_with'          => 'The :attribute must start with one of the following: :values.',
-    'ends_with'            => 'The :attribute must end with one of the following: :values.',
+    'mac_address' => 'The :attribute field must be a valid MAC address.',
+    'max' => [
+        'array' => 'The :attribute field must not have more than :max items.',
+        'file' => 'The :attribute field must not be greater than :max kilobytes.',
+        'numeric' => 'The :attribute field must not be greater than :max.',
+        'string' => 'The :attribute field must not be greater than :max characters.',
+    ],
+    'max_digits' => 'The :attribute field must not have more than :max digits.',
+    'mimes' => 'The :attribute field must be a file of type: :values.',
+    'mimetypes' => 'The :attribute field must be a file of type: :values.',
+    'min' => [
+        'array' => 'The :attribute field must have at least :min items.',
+        'file' => 'The :attribute field must be at least :min kilobytes.',
+        'numeric' => 'The :attribute field must be at least :min.',
+        'string' => 'The :attribute field must be at least :min characters.',
+    ],
+    'min_digits' => 'The :attribute field must have at least :min digits.',
+    'missing' => 'The :attribute field must be missing.',
+    'missing_if' => 'The :attribute field must be missing when :other is :value.',
+    'missing_unless' => 'The :attribute field must be missing unless :other is :value.',
+    'missing_with' => 'The :attribute field must be missing when :values is present.',
+    'missing_with_all' => 'The :attribute field must be missing when :values are present.',
+    'multiple_of' => 'The :attribute field must be a multiple of :value.',
+    'not_in' => 'គុណលក្ខណៈដែលបានជ្រើសរើសគឺមិនត្រឹមត្រូវទេ។',
+    'not_regex' => 'The :attribute field format is invalid.',
+    'numeric' => 'The :attribute field must be a number.',
+    'password' => [
+        'letters' => 'The :attribute field must contain at least one letter.',
+        'mixed' => 'The :attribute field must contain at least one uppercase and one lowercase letter.',
+        'numbers' => 'The :attribute field must contain at least one number.',
+        'symbols' => 'The :attribute field must contain at least one symbol.',
+        'uncompromised' => 'The given :attribute has appeared in a data leak. Please choose a different :attribute.',
+    ],
+    'percent'       => 'The depreciation minimum must be between 0 and 100 when depreciation type is percentage.',
 
-    'not_in'               => 'The selected :attribute is invalid.',
-    'numeric'              => 'The :attribute must be a number.',
-    'present'              => 'The :attribute field must be present.',
-    'valid_regex'          => 'That is not a valid regex. ',
-    'regex'                => 'The :attribute format is invalid.',
-    'required'             => 'The :attribute field is required.',
-    'required_if'          => 'The :attribute field is required when :other is :value.',
-    'required_unless'      => 'The :attribute field is required unless :other is in :values.',
-    'required_with'        => 'The :attribute field is required when :values is present.',
-    'required_with_all'    => 'The :attribute field is required when :values is present.',
-    'required_without'     => 'The :attribute field is required when :values is not present.',
-    'required_without_all' => 'The :attribute field is required when none of :values are present.',
-    'same'                 => 'The :attribute and :other must match.',
-    'size'                 => [
-        'numeric' => 'The :attribute must be :size.',
-        'file'    => 'The :attribute must be :size kilobytes.',
-        'string'  => 'The :attribute must be :size characters.',
-        'array'   => 'The :attribute must contain :size items.',
+    'present' => 'The :attribute field must be present.',
+    'present_if' => 'The :attribute field must be present when :other is :value.',
+    'present_unless' => 'The :attribute field must be present unless :other is :value.',
+    'present_with' => 'The :attribute field must be present when :values is present.',
+    'present_with_all' => 'The :attribute field must be present when :values are present.',
+    'prohibited' => 'វាល :attribute ត្រូវបានហាមឃាត់។',
+    'prohibited_if' => 'វាល :attribute ត្រូវបានហាមឃាត់នៅពេលដែល :other is :value។',
+    'prohibited_unless' => 'វាល :attribute ត្រូវបានហាមឃាត់ លុះត្រាតែ :other ស្ថិតនៅក្នុង :values។',
+    'prohibits' => 'វាល :attribute ហាមឃាត់ : ផ្សេងទៀតពីការមានវត្តមាន។',
+    'regex' => 'ទម្រង់វាល :attribute គឺមិនត្រឹមត្រូវទេ។',
+    'required' => 'វាល :attribute ត្រូវបានទាមទារ។',
+    'required_array_keys' => 'វាល :attribute ត្រូវតែមានធាតុសម្រាប់: :values ​​។',
+    'required_if' => 'វាល :attribute ត្រូវបានទាមទារនៅពេលដែល :other is :value។',
+    'required_if_accepted' => 'វាល :attribute ត្រូវបានទាមទារនៅពេលដែល :other ត្រូវបានទទួលយក។',
+    'required_if_declined' => 'វាល :attribute ត្រូវបានទាមទារនៅពេលដែល :other ត្រូវបានបដិសេធ។',
+    'required_unless' => 'វាល :attribute គឺត្រូវបានទាមទារ លុះត្រាតែ :other ស្ថិតនៅក្នុង :values។',
+    'required_with' => 'វាល :attribute ត្រូវបានទាមទារនៅពេលដែល :values ​​មានវត្តមាន។',
+    'required_with_all' => 'វាល :attribute ត្រូវបានទាមទារនៅពេលដែល :values ​​មានវត្តមាន។',
+    'required_without' => 'វាល :attribute ត្រូវបានទាមទារនៅពេលដែល :values ​​មិនមានវត្តមាន។',
+    'required_without_all' => 'វាល :attribute គឺត្រូវបានទាមទារនៅពេលដែលគ្មាន :values ​​មានវត្តមាន។',
+    'same' => 'វាល :attribute ត្រូវតែផ្គូផ្គង :other ។',
+    'size' => [
+        'array' => 'វាល :attribute ត្រូវតែមានធាតុ :size ។',
+        'file' => 'វាល :attribute ត្រូវតែជា :size kilobytes។',
+        'numeric' => 'វាល :attribute ត្រូវតែជា :size ។',
+        'string' => 'វាល :attribute ត្រូវតែជា :size តួអក្សរ។',
     ],
-    'string'               => 'The :attribute must be a string.',
-    'timezone'             => 'The :attribute must be a valid zone.',
-    'two_column_unique_undeleted' => 'The :attribute must be unique across :table1 and :table2. ',
-    'unique'               => 'The :attribute has already been taken.',
-    'uploaded'             => 'The :attribute failed to upload.',
-    'url'                  => 'The :attribute format is invalid.',
-    'unique_undeleted'     => 'The :attribute must be unique.',
-    'non_circular'         => 'The :attribute must not create a circular reference.',
-    'not_array'            => ':attribute cannot be an array.',
-    'disallow_same_pwd_as_user_fields' => 'Password cannot be the same as the username.',
-    'letters'              => 'Password must contain at least one letter.',
-    'numbers'              => 'Password must contain at least one number.',
-    'case_diff'            => 'Password must use mixed case.',
-    'symbols'              => 'Password must contain symbols.',
-    'gte'                  => [
-        'numeric'          => 'Value cannot be negative'
-    ],
-    'checkboxes'           => ':attribute contains invalid options.',
-    'radio_buttons'        => ':attribute is invalid.',
+    'starts_with' => 'វាល :attribute ត្រូវតែចាប់ផ្តើមដោយមួយក្នុងចំណោមខាងក្រោម: :values ​​។',
+    'string'               => 'គុណលក្ខណៈ : ត្រូវតែជាខ្សែអក្សរ។',
+    'two_column_unique_undeleted' => ':attribute ត្រូវតែមានតែមួយគត់នៅទូទាំង :table1 និង :table2។ ',
+    'unique_undeleted'     => 'គុណលក្ខណៈ : ត្រូវតែមានតែមួយគត់។',
+    'non_circular'         => ':attribute មិនត្រូវបង្កើតសេចក្តីយោងរាងជារង្វង់ទេ។',
+    'not_array'            => ':attribute មិនអាចជាអារេបានទេ។',
+    'disallow_same_pwd_as_user_fields' => 'ពាក្យ​សម្ងាត់​មិន​អាច​ដូច​គ្នា​នឹង​ឈ្មោះ​អ្នក​ប្រើ​ទេ។',
+    'letters'              => 'ពាក្យសម្ងាត់ត្រូវតែមានយ៉ាងហោចណាស់មួយអក្សរ។',
+    'numbers'              => 'ពាក្យសម្ងាត់ត្រូវតែមានយ៉ាងហោចណាស់មួយលេខ។',
+    'case_diff'            => 'ពាក្យសម្ងាត់ត្រូវតែប្រើករណីចម្រុះ។',
+    'symbols'              => 'ពាក្យសម្ងាត់ត្រូវតែមាននិមិត្តសញ្ញា។',
+    'timezone' => 'វាល :attribute ត្រូវតែជាតំបន់ពេលវេលាត្រឹមត្រូវ។',
+    'unique' => 'គុណលក្ខណៈ : ត្រូវបានគេយករួចហើយ។',
+    'uploaded' => ':attribute បរាជ័យក្នុងការបង្ហោះ។',
+    'uppercase' => 'វាល :attribute ត្រូវតែជាអក្សរធំ។',
+    'url' => 'វាល :attribute ត្រូវតែជា URL ត្រឹមត្រូវ។',
+    'ulid' => 'វាល :attribute ត្រូវតែជា ULID ត្រឹមត្រូវ។',
+    'uuid' => 'វាល :attribute ត្រូវតែជា UUID ត្រឹមត្រូវ។',
+    'fmcs_location' => 'Full multiple company support and location scoping is enabled in the Admin Settings, and the selected location and selected company are not compatible.',
 
 
     /*
@@ -120,26 +186,38 @@ return [
     |
     */
 
+    'email_array'      => 'អាសយដ្ឋានអ៊ីមែលមួយ ឬច្រើនមិនត្រឹមត្រូវទេ។',
+    'checkboxes'           => ':attribute contains invalid options.',
+    'radio_buttons'        => ':attribute is invalid.',
+    
     'custom' => [
-        'alpha_space' => 'The :attribute field contains a character that is not allowed.',
-        'email_array'      => 'One or more email addresses is invalid.',
-        'hashed_pass'      => 'Your current password is incorrect',
-        'dumbpwd'          => 'That password is too common.',
-        'statuslabel_type' => 'You must select a valid status label type',
+        'alpha_space' => 'វាល :attribute មានតួអក្សរដែលមិនត្រូវបានអនុញ្ញាត។',
+
+        'hashed_pass'      => 'ពាក្យសម្ងាត់បច្ចុប្បន្នរបស់អ្នកមិនត្រឹមត្រូវទេ។',
+        'dumbpwd'          => 'ពាក្យសម្ងាត់នោះជារឿងធម្មតាពេកហើយ។',
+        'statuslabel_type' => 'អ្នកត្រូវតែជ្រើសរើសប្រភេទស្លាកស្ថានភាពត្រឹមត្រូវ។',
+        'custom_field_not_found'          => 'វាលនេះហាក់ដូចជាមិនមានទេ សូមពិនិត្យមើលឈ្មោះវាលផ្ទាល់ខ្លួនរបស់អ្នកពីរដង។',
+        'custom_field_not_found_on_model' => 'វាលនេះហាក់ដូចជាមាន ប៉ុន្តែមិនមាននៅលើសំណុំវាលរបស់ Asset Model នេះទេ។',
 
         // date_format validation with slightly less stupid messages. It duplicates a lot, but it gets the job done :(
-        // We use this because the default error message for date_format is reflects php Y-m-d, which non-PHP
-        // people won't know how to format. 
-        'purchase_date.date_format'     => 'The :attribute must be a valid date in YYYY-MM-DD format',
-        'last_audit_date.date_format'   =>  'The :attribute must be a valid date in YYYY-MM-DD hh:mm:ss format',
-        'expiration_date.date_format'   =>  'The :attribute must be a valid date in YYYY-MM-DD format',
-        'termination_date.date_format'  =>  'The :attribute must be a valid date in YYYY-MM-DD format',
-        'expected_checkin.date_format'  =>  'The :attribute must be a valid date in YYYY-MM-DD format',
-        'start_date.date_format'        =>  'The :attribute must be a valid date in YYYY-MM-DD format',
-        'end_date.date_format'          =>  'The :attribute must be a valid date in YYYY-MM-DD format',
+        // We use this because the default error message for date_format reflects php Y-m-d, which non-PHP
+        // people won't know how to format.
+        'purchase_date.date_format'     => ':attribute ត្រូវតែជាកាលបរិច្ឆេទត្រឹមត្រូវក្នុងទម្រង់ YYYY-MM-DD',
+        'last_audit_date.date_format'   =>  ':attribute ត្រូវតែជាកាលបរិច្ឆេទត្រឹមត្រូវក្នុងទម្រង់ YYYY-MM-DD hh:mm:ss',
+        'expiration_date.date_format'   =>  ':attribute ត្រូវតែជាកាលបរិច្ឆេទត្រឹមត្រូវក្នុងទម្រង់ YYYY-MM-DD',
+        'termination_date.date_format'  =>  ':attribute ត្រូវតែជាកាលបរិច្ឆេទត្រឹមត្រូវក្នុងទម្រង់ YYYY-MM-DD',
+        'expected_checkin.date_format'  =>  ':attribute ត្រូវតែជាកាលបរិច្ឆេទត្រឹមត្រូវក្នុងទម្រង់ YYYY-MM-DD',
+        'start_date.date_format'        =>  ':attribute ត្រូវតែជាកាលបរិច្ឆេទត្រឹមត្រូវក្នុងទម្រង់ YYYY-MM-DD',
+        'end_date.date_format'          =>  ':attribute ត្រូវតែជាកាលបរិច្ឆេទត្រឹមត្រូវក្នុងទម្រង់ YYYY-MM-DD',
+        'invalid_value_in_field' => 'Invalid value included in this field',
 
-    ],
+        'ldap_username_field' => [
+            'not_in' =>         '<code>sAMAccountName</code> (mixed case) will likely not work. You should use <code>samaccountname</code> (lowercase) instead.'
+        ],
+        'ldap_auth_filter_query' => ['not_in' => '<code>uid=samaccountname</code> is probably not a valid auth filter. You probably want <code>uid=</code> '],
+        'ldap_filter' => ['regex' => 'This value should probably not be wrapped in parentheses.'],
 
+        ],
     /*
     |--------------------------------------------------------------------------
     | Custom Validation Attributes
@@ -155,8 +233,16 @@ return [
 
     /*
     |--------------------------------------------------------------------------
-    | Generic Validation Messages
+    | Generic Validation Messages - we use these in the jquery validation where we don't have
+    | access to the :attribute
     |--------------------------------------------------------------------------
     */
-    'invalid_value_in_field' => 'Invalid value included in this field',
+
+    'generic' => [
+        'invalid_value_in_field' => 'Invalid value included in this field',
+        'required' => 'This field is required',
+        'email' => 'Please enter a valid email address',
+    ],
+
+
 ];
diff --git a/resources/lang/ko-KR/account/general.php b/resources/lang/ko-KR/account/general.php
index 1a9e2c03b8..7f9e2f848e 100644
--- a/resources/lang/ko-KR/account/general.php
+++ b/resources/lang/ko-KR/account/general.php
@@ -2,10 +2,16 @@
 
 return array(
     'personal_api_keys' => 'Personal API Keys',
+    'personal_access_token' => 'Personal Access Token',
+    'personal_api_keys_success' => 'Personal API Key :key created sucessfully',
+    'here_is_api_key' => 'Here is your new personal access token. This is the only time it will be shown so do not lose it! You may now use this token to make API requests.',
     'api_key_warning' => 'When generating an API token, be sure to copy it down immediately as they will not be visible to you again.',
     'api_base_url' => 'Your API base url is located at:',
     'api_base_url_endpoint' => '/&lt;endpoint&gt;',
     'api_token_expiration_time' => 'API tokens are set to expire in:',
     'api_reference' => 'Please check the <a href="https://snipe-it.readme.io/reference" target="_blank">API reference</a> to find specific API endpoints and additional API documentation.',
     'profile_updated' => 'Account successfully updated',
+    'no_tokens' => 'You have not created any personal access tokens.',
+    'enable_sounds' => 'Enable sound effects',
+    'enable_confetti' => 'Enable confetti effects',
 );
diff --git a/resources/lang/ko-KR/admin/accessories/general.php b/resources/lang/ko-KR/admin/accessories/general.php
index 2a50e01294..f10b90d86e 100644
--- a/resources/lang/ko-KR/admin/accessories/general.php
+++ b/resources/lang/ko-KR/admin/accessories/general.php
@@ -16,7 +16,7 @@ return array(
     'update'  							=> '부속품 갱신',
     'use_default_eula'					=> '대체  <a href="#" data-toggle="modal" data-target="#eulaModal">기본 사용권 계약서</a>를 사용합니다.',
     'use_default_eula_disabled'			=> '<del>대체 기본 사용권 계약서를 사용합니다.</del> 기본 사용권 계약서가 정의되지 않았습니다. 설정에서 하나를 추가해 주세요.',
-    'clone'                             => 'Clone Accessory',
+    'clone'                             => '부속품 복제',
     'delete_disabled'                   => 'This accessory cannot be deleted yet because some items are still checked out.',
 
 );
diff --git a/resources/lang/ko-KR/admin/accessories/message.php b/resources/lang/ko-KR/admin/accessories/message.php
index 31598aceb4..0040cfa65d 100644
--- a/resources/lang/ko-KR/admin/accessories/message.php
+++ b/resources/lang/ko-KR/admin/accessories/message.php
@@ -26,7 +26,11 @@ return array(
         'error'   		=> '부속품이 반출되지 않았습니다. 다시 시도해 주세요.',
         'success' 		=> '부속품이 반출 되었습니다.',
         'unavailable'   => 'Accessory is not available for checkout. Check quantity available',
-        'user_does_not_exist' => '잘못된 사용자 입니다. 다시 시도해 주세요.'
+        'user_does_not_exist' => '잘못된 사용자 입니다. 다시 시도해 주세요.',
+         'checkout_qty' => array(
+            'lte'  => 'There is currently only one available accessory of this type, and you are trying to check out :checkout_qty. Please adjust the checkout quantity or the total stock of this accessory and try again.|There are :number_currently_remaining total available accessories, and you are trying to check out :checkout_qty. Please adjust the checkout quantity or the total stock of this accessory and try again.',
+            ),
+           
     ),
 
     'checkin' => array(
diff --git a/resources/lang/ko-KR/admin/accessories/table.php b/resources/lang/ko-KR/admin/accessories/table.php
index 1f0f71fb3e..088ef02f20 100644
--- a/resources/lang/ko-KR/admin/accessories/table.php
+++ b/resources/lang/ko-KR/admin/accessories/table.php
@@ -6,6 +6,4 @@ return array(
     'id'      					=> '아이디',
     'require_acceptance'      	=> '승인',
     'title'      				=> '부속품 명',
-
-
 );
diff --git a/resources/lang/ko-KR/admin/companies/message.php b/resources/lang/ko-KR/admin/companies/message.php
index 8d0d5ea1af..3364c15daf 100644
--- a/resources/lang/ko-KR/admin/companies/message.php
+++ b/resources/lang/ko-KR/admin/companies/message.php
@@ -2,7 +2,7 @@
 
 return [
     'does_not_exist' => '회사가 없습니다.',
-    'deleted'        => 'Deleted company',
+    'deleted'        => '삭제된 회사',
     'assoc_users'    => '이 회사는 적어도 한개의 모델과 연결되어 있기에 삭제할 수 없습니다. 이 회사를 참조하지 않게 모델을 수정하고 다시 시도해 주세요. ',
     'create' => [
         'error'   => '회사를 만들지 못했습니다. 재시도해 주십시오.',
diff --git a/resources/lang/ko-KR/admin/companies/table.php b/resources/lang/ko-KR/admin/companies/table.php
index b67a8f328c..26f27a4ba2 100644
--- a/resources/lang/ko-KR/admin/companies/table.php
+++ b/resources/lang/ko-KR/admin/companies/table.php
@@ -2,9 +2,9 @@
 return array(
     'companies' => '회사들',
     'create'    => '회사 생성',
-    'email'     => 'Company Email',
+    'email'     => '회사 이메일',
     'title'     => '회사',
-    'phone'     => 'Company Phone',
+    'phone'     => '회사 전화번호',
     'update'    => '회사 갱신',
     'name'      => '회사명',
     'id'        => '아이디',
diff --git a/resources/lang/ko-KR/admin/components/message.php b/resources/lang/ko-KR/admin/components/message.php
index 84b0cd2148..e6cfd48546 100644
--- a/resources/lang/ko-KR/admin/components/message.php
+++ b/resources/lang/ko-KR/admin/components/message.php
@@ -17,7 +17,8 @@ return array(
     'delete' => array(
         'confirm'   => '이 부품을 삭제하시겠습니까?',
         'error'   => '부품 삭제시 문제가 발생했습니다. 다시 시도해 주세요.',
-        'success' => '부품이 삭제되었습니다.'
+        'success' => '부품이 삭제되었습니다.',
+        'error_qty'   => 'Some components of this type are still checked out. Please check them in and try again.',
     ),
 
      'checkout' => array(
diff --git a/resources/lang/ko-KR/admin/consumables/general.php b/resources/lang/ko-KR/admin/consumables/general.php
index c6e5e93d1b..4e5a310d66 100644
--- a/resources/lang/ko-KR/admin/consumables/general.php
+++ b/resources/lang/ko-KR/admin/consumables/general.php
@@ -8,4 +8,5 @@ return array(
     'remaining' 			            => '잔여수량',
     'total' 			                => '총계',
     'update'                            => '소모품 갱신',
+    'inventory_warning'                 => 'The inventory of this consumable is below the minimum amount of :min_count',
 );
diff --git a/resources/lang/ko-KR/admin/consumables/message.php b/resources/lang/ko-KR/admin/consumables/message.php
index 69257d8e83..afbf0eb940 100644
--- a/resources/lang/ko-KR/admin/consumables/message.php
+++ b/resources/lang/ko-KR/admin/consumables/message.php
@@ -2,6 +2,7 @@
 
 return array(
 
+    'invalid_category_type' => 'The category must be a consumable category.',
     'does_not_exist' => '소모품이 존재하지 않습니다.',
 
     'create' => array(
diff --git a/resources/lang/ko-KR/admin/custom_fields/general.php b/resources/lang/ko-KR/admin/custom_fields/general.php
index 4dccb8d205..45025d31fd 100644
--- a/resources/lang/ko-KR/admin/custom_fields/general.php
+++ b/resources/lang/ko-KR/admin/custom_fields/general.php
@@ -35,7 +35,7 @@ return [
     'create_field_title' => 'Create a new custom field',
     'value_encrypted'      	        => '이 항목의 값은 데이터베이스 내에서 암호화 되었습니다. 관리자만이 해독된 값을 확인 할 수 있습니다.',
     'show_in_email'     => '사용자에게 전송된 반출 이메일에 이 항목의 값을 포함 시키시겠습니까? 암호화 된 항목들은 이메일에 포함될 수 없습니다',
-    'show_in_email_short'     => 'Include in emails.',
+    'show_in_email_short' => 'Include in emails',
     'help_text' => 'Help Text',
     'help_text_description' => 'This is optional text that will appear below the form elements while editing an asset to provide context on the field.',
     'about_custom_fields_title' => 'About Custom Fields',
@@ -57,5 +57,8 @@ return [
     'show_in_requestable_list_short' => 'Show in requestable assets list',
     'show_in_requestable_list' => 'Show value in requestable assets list. Encrypted fields will not be shown',
     'encrypted_options' => 'This field is encrypted, so some display options will not be available.',
+    'display_checkin' => 'Display in checkin forms',
+    'display_checkout' => 'Display in checkout forms',
+    'display_audit' => 'Display in audit forms',
 
 ];
diff --git a/resources/lang/ko-KR/admin/custom_fields/message.php b/resources/lang/ko-KR/admin/custom_fields/message.php
index 11ee554203..c4aafc69f9 100644
--- a/resources/lang/ko-KR/admin/custom_fields/message.php
+++ b/resources/lang/ko-KR/admin/custom_fields/message.php
@@ -5,6 +5,7 @@ return array(
     'field' => array(
         'invalid'   => '그 항목은 없습니다.',
         'already_added'   => '이미 추가한 항목입니다.',
+        'none_selected'   => '항목이 선택되지 않았습니다.',
 
         'create' => array(
             'error'   => '항목을 생성하지 못했습니다. 재시도해 주십시오.',
diff --git a/resources/lang/ko-KR/admin/depreciations/general.php b/resources/lang/ko-KR/admin/depreciations/general.php
index 63ee305432..509a4d1211 100644
--- a/resources/lang/ko-KR/admin/depreciations/general.php
+++ b/resources/lang/ko-KR/admin/depreciations/general.php
@@ -13,4 +13,8 @@ return [
     'no_depreciations_warning'               => '<strong>Warning: </strong>
                       You do not currently have any depreciations set up.
                       Please set up at least one depreciation to view the depreciation report.',
+    'depreciation_method'                   => '감가상각 보고서',
+    'linear_depreciation'                   => 'Linear (Default)',
+    'half_1'                                => 'Half-year convention, always applied',
+    'half_2'                                => 'Half-year convention, applied with condition',
 ];
diff --git a/resources/lang/ko-KR/admin/groups/titles.php b/resources/lang/ko-KR/admin/groups/titles.php
index a912e313cc..d0bef04630 100644
--- a/resources/lang/ko-KR/admin/groups/titles.php
+++ b/resources/lang/ko-KR/admin/groups/titles.php
@@ -10,7 +10,7 @@ return [
     'group_admin' 	 		=> '그룹 관리자',
     'allow' 	 			=> '허용',
     'deny' 	 				=> '거부',
-    'permission'            => 'Permission',
-    'grant'                 => 'Grant',
-    'no_permissions'        => 'This group has no permissions.'
+    'permission'            => '권한',
+    'grant'                 => '승인',
+    'no_permissions'        => '이 그룹은 권한이 없습니다.'
 ];
diff --git a/resources/lang/ko-KR/admin/hardware/form.php b/resources/lang/ko-KR/admin/hardware/form.php
index e918213ebf..5dab26eed8 100644
--- a/resources/lang/ko-KR/admin/hardware/form.php
+++ b/resources/lang/ko-KR/admin/hardware/form.php
@@ -6,7 +6,7 @@ return [
   'bulk_delete_help'	=> '아래의 대량 자산 삭제 내용을 검토하십시오. 삭제하시면 복구할 수 없고, 현재 할당되어 있는 사용자와의 연결이 끊어집니다.',
   'bulk_restore_help'	=> 'Review the assets for bulk restoration below. Once restored, these assets will not be associated with any users they were previously assigned to.',
   'bulk_delete_warn'	=> '삭제 대상: asset_count 개',
-  'bulk_restore_warn'	=> 'You are about to restore :asset_count assets.',
+  'bulk_restore_warn'	=> '복원 대상: asset_count 개',
     'bulk_update'		=> '대량 자산 갱신',
     'bulk_update_help'	=> '이 양식은 한번에 여러개의 자산들을 갱신하게 해줍니다. 변경하고 싶은 항목만 채워 넣으세요. 빈란으로 남겨둔 항목들은 변경되지 않을 것입니다. ',
     'bulk_update_warn'	=> 'You are about to edit the properties of a single asset.|You are about to edit the properties of :asset_count assets.',
@@ -23,7 +23,7 @@ return [
     'depreciation'	    => '감가 상각',
     'depreciates_on'	=> '감가 상각 일자',
     'default_location'	=> '기본 장소',
-    'default_location_phone' => 'Default Location Phone',
+    'default_location_phone' => '기본 유선 전화번호',
     'eol_date'			=> '폐기 일자',
     'eol_rate'			=> '폐기 비율',
     'expected_checkin'  => '반입 예상 일',
@@ -55,8 +55,11 @@ return [
     'asset_location_update_default' => 'Update only default location',
     'asset_location_update_actual' => 'Update only actual location',
     'asset_not_deployable' => 'That asset status is not deployable. This asset cannot be checked out.',
-    'asset_deployable' => 'That status is deployable. This asset can be checked out.',
+    'asset_not_deployable_checkin' => 'That asset status is not deployable. Using this status label will checkin the asset.',
+    'asset_deployable' => 'This asset can be checked out.',
     'processing_spinner' => 'Processing... (This might take a bit of time on large files)',
+    'processing' => 'Processing... ',
     'optional_infos'  => 'Optional Information',
-    'order_details'   => 'Order Related Information'
+    'order_details'   => 'Order Related Information',
+    'calc_eol'    => 'If nulling the EOL date, use automatic EOL calculation based on the purchase date and EOL rate.',
 ];
diff --git a/resources/lang/ko-KR/admin/hardware/general.php b/resources/lang/ko-KR/admin/hardware/general.php
index 6edd60c67f..36ea15c9c7 100644
--- a/resources/lang/ko-KR/admin/hardware/general.php
+++ b/resources/lang/ko-KR/admin/hardware/general.php
@@ -5,8 +5,8 @@ return [
     'about_assets_text'            => '자산은 일련 번호나 자산 꼬리표로 추적되는 품목들입니다. 특정 품목의 상황을 파악하는 것이 더 높은 가치를 갖는 추세입니다.',
     'archived'  				=> '보관됨',
     'asset'  					=> '자산',
-    'bulk_checkout'             => '반출 자산',
-    'bulk_checkin'              => 'Checkin Assets',
+    'bulk_checkout'             => '대량 반출',
+    'bulk_checkin'              => 'Bulk Checkin',
     'checkin'  					=> '반입 자산',
     'checkout'  				=> '반출 자산',
     'clone'  					=> '자산 복제',
@@ -27,15 +27,14 @@ return [
     'undeployable_tooltip'  	=> 'This asset has a status label that is undeployable and cannot be checked out at this time.',
     'view'  					=> '자산 보기',
     'csv_error' => 'You have an error in your CSV file:',
-    'import_text' => '<p>Upload a CSV that contains asset history. The assets and users MUST already exist in the system, or they will be skipped. Matching assets for history import happens against the asset tag. We will try to find a matching user based on the user\'s name you provide, and the criteria you select below. If you do not select any criteria below, it will simply try to match on the username format you configured in the <code>Admin &gt; General Settings</code>.</p><p>Fields included in the CSV must match the headers: <strong>Asset Tag, Name, Checkout Date, Checkin Date</strong>. Any additional fields will be ignored. </p><p>Checkin Date: blank or future checkin dates will checkout items to associated user.  Excluding the Checkin Date column will create a checkin date with todays date.</p>
-    ',
+    'import_text' => '<p>Upload a CSV that contains asset history. The assets and users MUST already exist in the system, or they will be skipped. Matching assets for history import happens against the asset tag. We will try to find a matching user based on the user\'s name you provide, and the criteria you select below. If you do not select any criteria below, it will simply try to match on the username format you configured in the <code>Admin &gt; General Settings</code>.</p><p>Fields included in the CSV must match the headers: <strong>Asset Tag, Name, Checkout Date, Checkin Date</strong>. Any additional fields will be ignored. </p><p>Checkin Date: blank or future checkin dates will checkout items to associated user.  Excluding the Checkin Date column will create a checkin date with todays date.</p>    ',
     'csv_import_match_f-l' => 'Try to match users by <strong>firstname.lastname</strong> (<code>jane.smith</code>) format',
     'csv_import_match_initial_last' => 'Try to match users by <strong>first initial last name</strong> (<code>jsmith</code>) format',
     'csv_import_match_first' => 'Try to match users by <strong>first name</strong> (<code>jane</code>) format',
     'csv_import_match_email' => 'Try to match users by <strong>email</strong> as username',
     'csv_import_match_username' => 'Try to match users by <strong>username</strong>',
-    'error_messages' => 'Error messages:',
-    'success_messages' => 'Success messages:',
+    'error_messages' => '오류 내용:',
+    'success_messages' => '성공 내용:',
     'alert_details' => 'Please see below for details.',
     'custom_export' => 'Custom Export',
     'mfg_warranty_lookup' => ':manufacturer Warranty Status Lookup',
diff --git a/resources/lang/ko-KR/admin/hardware/message.php b/resources/lang/ko-KR/admin/hardware/message.php
index c938451dc5..1fded9a7ba 100644
--- a/resources/lang/ko-KR/admin/hardware/message.php
+++ b/resources/lang/ko-KR/admin/hardware/message.php
@@ -2,19 +2,23 @@
 
 return [
 
-    'undeployable' 		=> '<strong>경고: </strong> 이 자산은 현재 사용불가 상태입니다.
-                        이 상태를 변경하시려면, 자산 상태를 갱신하세요.',
-    'does_not_exist' 	=> '자산이 존재하지 않습니다.',
-    'does_not_exist_var'=> 'Asset with tag :asset_tag not found.',
-    'no_tag' 	        => 'No asset tag provided.',
+    'undeployable' 		 => '<strong>Warning: </strong> This asset has been marked as currently undeployable. If this status has changed, please update the asset status.',
+    'does_not_exist' 	 => '자산이 존재하지 않습니다.',
+    'does_not_exist_var' => 'Asset with tag :asset_tag not found.',
+    'no_tag' 	         => 'No asset tag provided.',
     'does_not_exist_or_not_requestable' => 'That asset does not exist or is not requestable.',
-    'assoc_users'	 	=> '이 자산은 현재 사용자에게 반출 중이어서 삭제 할 수 없습니다. 먼저 자산을 확인해 보고 다시 삭제를 시도해 주세요. ',
+    'assoc_users'	 	 => '이 자산은 현재 사용자에게 반출 중이어서 삭제 할 수 없습니다. 먼저 자산을 확인해 보고 다시 삭제를 시도해 주세요. ',
     'warning_audit_date_mismatch' 	=> 'This asset\'s next audit date (:next_audit_date) is before the last audit date (:last_audit_date). Please update the next audit date.',
+    'labels_generated'   => 'Labels were successfully generated.',
+    'error_generating_labels' => 'Error while generating labels.',
+    'no_assets_selected' => 'No assets selected.',
 
     'create' => [
         'error'   		=> '자산이 생성되지 않았습니다. 다시 시도해 주세요. :(',
         'success' 		=> '자산이 생성되었습니다. :)',
         'success_linked' => 'Asset with tag :tag was created successfully. <strong><a href=":link" style="color: white;">Click here to view</a></strong>.',
+        'multi_success_linked' => 'Asset with tag :links was created successfully.|:count assets were created succesfully. :links.',
+        'partial_failure' => 'An asset was unable to be created. Reason: :failures|:count assets were unable to be created. Reasons: :failures',
     ],
 
     'update' => [
@@ -52,20 +56,24 @@ return [
     ],
 
     'import' => [
+        'import_button'         => 'Process Import',
         'error'                 => '몇몇 품목들을 정확하게 읽어오지 못했습니다.',
         'errorDetail'           => '다음 품목들은 오류로 읽어오지 못했습니다.',
         'success'               => '파일에서 읽어오기가 완료되었습니다',
         'file_delete_success'   => '파일 삭제가 완료되었습니다',
         'file_delete_error'      => '파일을 삭제할 수 없습니다',
         'file_missing' => 'The file selected is missing',
+        'file_already_deleted' => 'The file selected was already deleted',
         'header_row_has_malformed_characters' => 'One or more attributes in the header row contain malformed UTF-8 characters',
         'content_row_has_malformed_characters' => 'One or more attributes in the first row of content contain malformed UTF-8 characters',
+        'transliterate_failure' => 'Transliteration from :encoding to UTF-8 failed due to invalid characters in input'
     ],
 
 
     'delete' => [
         'confirm'   	=> '이 자산을 삭제하시겠습니까?',
         'error'   		=> '그룹을 삭제하는 중 문제가 발생했습니다. 다시 시도해 주세요.',
+        'assigned_to_error' => '{1}Asset Tag: :asset_tag is currently checked out. Check in this device before deletion.|[2,*]Asset Tags: :asset_tag are currently checked out. Check in these devices before deletion.',
         'nothing_updated'   => '선택된 자산이 없기에, 삭제되지 않습니다.',
         'success' 		=> '자산이 삭제되었습니다.',
     ],
@@ -78,6 +86,11 @@ return [
         'no_assets_selected' => '목록에서 자산을 하나 이상 선택해야 합니다.',
     ],
 
+    'multi-checkout' => [
+        'error'   => 'Asset was not checked out, please try again|Assets were not checked out, please try again',
+        'success' => 'Asset checked out successfully.|Assets checked out successfully.',
+    ],
+
     'checkin' => [
         'error'   		=> '자산이 반입되지 않았습니다. 다시 시도해 주세요.',
         'success' 		=> '자산이 반입되었습니다.',
@@ -87,9 +100,10 @@ return [
     ],
 
     'requests' => [
-        'error'   		=> '자산을 불러오지 못했습니다. 재시도해 주십시오.',
-        'success' 		=> '자산을 불러왔습니다.',
-        'canceled'      => '반출 요청이 취소되었습니다',
+        'error'   		=> 'Request was not successful, please try again.',
+        'success' 		=> 'Request successfully submitted.',
+        'canceled'      => 'Request successfully canceled.',
+        'cancel'        => 'Cancel this item request',
     ],
 
 ];
diff --git a/resources/lang/ko-KR/admin/hardware/table.php b/resources/lang/ko-KR/admin/hardware/table.php
index b9cc8f039f..ac10a2dacf 100644
--- a/resources/lang/ko-KR/admin/hardware/table.php
+++ b/resources/lang/ko-KR/admin/hardware/table.php
@@ -5,12 +5,12 @@ return [
     'asset_tag'   	=> '자산 태그',
     'asset_model'       => '모델',
     'assigned_to'   => '할당',
-    'book_value'  	=> 'Current Value',
+    'book_value'  	=> '현재 가치',
     'change' 		=> '입/출',
     'checkout_date' => '반출 일자',
     'checkoutto' 	=> '반출 확인',
     'components_cost' => 'Total Components Cost',
-    'current_value' => 'Current Value',
+    'current_value' => '현재 가치',
     'diff' 			=> '차액',
     'dl_csv' 		=> 'CSV로 내려받기',
     'eol' 			=> '폐기일',
@@ -25,9 +25,8 @@ return [
     'image'		    => '장비 사진',
     'days_without_acceptance' => '미 승인 기간',
     'monthly_depreciation' => '월간 감가상각',
-    'assigned_to'    => '할당',
     'requesting_user' => 'Requesting User',
     'requested_date' => 'Requested Date',
     'changed'       => '변경됨',
-    'icon' => 'Icon',
+    'icon' => '아이콘',
 ];
diff --git a/resources/lang/ko-KR/admin/kits/general.php b/resources/lang/ko-KR/admin/kits/general.php
index a7efd3d1da..158bc5fad7 100644
--- a/resources/lang/ko-KR/admin/kits/general.php
+++ b/resources/lang/ko-KR/admin/kits/general.php
@@ -47,4 +47,5 @@ return [
     'kit_deleted'                       => '키트가 삭제되었습니다',
     'kit_model_updated'                 => 'Model was successfully updated',
     'kit_model_detached'                => 'Model was successfully detached',
+    'model_already_attached'            => 'Model already attached to kit',
 ];
diff --git a/resources/lang/ko-KR/admin/licenses/general.php b/resources/lang/ko-KR/admin/licenses/general.php
index 9a52ad00b9..fdcabffbc2 100644
--- a/resources/lang/ko-KR/admin/licenses/general.php
+++ b/resources/lang/ko-KR/admin/licenses/general.php
@@ -14,6 +14,7 @@ return array(
     'info'  					=> '라이선스 정보',
     'license_seats'  			=> '라이선스 Seats',
     'seat'  					=> 'Seat',
+    'seat_count'  				=> 'Seat :count',
     'seats'  					=> 'Seats',
     'software_licenses'  		=> '소프트웨어 라이선스',
     'user'  					=> '사용자',
@@ -23,12 +24,12 @@ return array(
         [
             'checkin_all'           => [
                 'button'            => 'Checkin All Seats',
-                'modal'             => 'This will action checkin one seat. | This action will checkin all :checkedout_seats_count seats for this license.',
+                'modal'             => 'This action will checkin one seat. | This action will checkin all :checkedout_seats_count seats for this license.',
                 'enabled_tooltip'   => 'Checkin ALL seats for this license from both users and assets',
                 'disabled_tooltip'  => 'This is disabled because there are no seats currently checked out',
                 'disabled_tooltip_reassignable'  => 'This is disabled because the License is not reassignable',
                 'success'           => 'License successfully checked in! | All licenses were successfully checked in!',
-                'log_msg'           => 'Checked in via bulk license checkout in license GUI',
+                'log_msg'           => 'Checked in via bulk license checkin in license GUI',
             ],
 
             'checkout_all'              => [
diff --git a/resources/lang/ko-KR/admin/licenses/message.php b/resources/lang/ko-KR/admin/licenses/message.php
index 7353e10ff4..fb251107f6 100644
--- a/resources/lang/ko-KR/admin/licenses/message.php
+++ b/resources/lang/ko-KR/admin/licenses/message.php
@@ -44,10 +44,13 @@ return array(
         'error'   => '라이선스 반출 중 문제가 발생했습니다. 다시 시도해 주세요.',
         'success' => '라이선스가 반출 되었습니다.',
         'not_enough_seats' => 'Not enough license seats available for checkout',
+        'mismatch' => 'The license seat provided does not match the license',
+        'unavailable' => 'This seat is not available for checkout.',
     ),
 
     'checkin' => array(
         'error'   => '라이선스 반입 중 문제가 발생했습니다. 다시 시도해 주세요.',
+        'not_reassignable' => 'License not reassignable',
         'success' => '라이선스가 반입 되었습니다.'
     ),
 
diff --git a/resources/lang/ko-KR/admin/locations/message.php b/resources/lang/ko-KR/admin/locations/message.php
index 364b2dbd6d..4b9a9183bf 100644
--- a/resources/lang/ko-KR/admin/locations/message.php
+++ b/resources/lang/ko-KR/admin/locations/message.php
@@ -3,11 +3,12 @@
 return array(
 
     'does_not_exist' => '장소가 존재하지 않습니다.',
-    'assoc_users'    => 'This location is not currently deletable because it is the location of record for at least one asset or user, has assets assigned to it, or is the parent location of another location. Please update your models to no longer reference this company and try again. ',
+    'assoc_users'    => 'This location is not currently deletable because it is the location of record for at least one asset or user, has assets assigned to it, or is the parent location of another location. Please update your records to no longer reference this location and try again ',
     'assoc_assets'	 => '이 장소는 현재 적어도 한명의 사용자와 연결되어 있어서 삭제할 수 없습니다. 사용자가 더 이상 이 장소를 참조하지 않게 갱신하고 다시 시도해주세요. ',
     'assoc_child_loc'	 => '이 장소는 현재 하나 이상의 하위 장소를 가지고 있기에 삭제 할 수 없습니다. 이 장소의 참조를 수정하고 다시 시도해 주세요. ',
     'assigned_assets' => 'Assigned Assets',
-    'current_location' => 'Current Location',
+    'current_location' => '현재 위치',
+    'open_map' => 'Open in :map_provider_icon Maps',
 
 
     'create' => array(
@@ -20,6 +21,11 @@ return array(
         'success' => '장소가 갱신되었습니다.'
     ),
 
+    'restore' => array(
+        'error'   => 'Location was not restored, please try again',
+        'success' => 'Location restored successfully.'
+    ),
+
     'delete' => array(
         'confirm'   	=> '이 장소를 삭제하시겠습니까?',
         'error'   => '장소 삭제 중에 문제가 발생했습니다. 다시 시도해 주세요.',
diff --git a/resources/lang/ko-KR/admin/locations/table.php b/resources/lang/ko-KR/admin/locations/table.php
index 5a3879456b..84b8ca9aec 100644
--- a/resources/lang/ko-KR/admin/locations/table.php
+++ b/resources/lang/ko-KR/admin/locations/table.php
@@ -15,7 +15,7 @@ return [
     'print_all_assigned'        => '할당된 항목 모두 인쇄',
     'name'                      => '장소 명',
     'address'                   => '주소',
-    'address2'                   => 'Address Line 2',
+    'address2'                   => '두번재 주소',
     'zip'                       => '우편번호',
     'locations'                 => '위치',
     'parent'                    => '상위',
@@ -32,11 +32,12 @@ return [
     'asset_serial'              => '일련번호',
     'asset_location'            => '위치',
     'asset_checked_out'         => '반출 확인',
-    'asset_expected_checkin'    => 'Expected Checkin',
+    'asset_expected_checkin'    => '반납 예상일',
     'date'                      => '날짜:',
-    'phone'                     => 'Location Phone',
+    'phone'                     => '유선번호',
     'signed_by_asset_auditor'   => 'Signed By (Asset Auditor):',
     'signed_by_finance_auditor' => 'Signed By (Finance Auditor):',
     'signed_by_location_manager' => 'Signed By (Location Manager):',
     'signed_by'                 => 'Signed Off By:',
+    'clone'  					=> 'Clone Location',
 ];
diff --git a/resources/lang/ko-KR/admin/models/general.php b/resources/lang/ko-KR/admin/models/general.php
index 26b65ba871..b01629b4dd 100644
--- a/resources/lang/ko-KR/admin/models/general.php
+++ b/resources/lang/ko-KR/admin/models/general.php
@@ -3,7 +3,7 @@
 return array(
     'about_models_title'     => '자산 모델이란',
     'about_models_text'           => '자산 모델은 동일한 자산들을 그룹화 하는 방법입니다. "MBP 2013", "IPhone 6들", 등등.',
-    'deleted'  					        => '모델이 삭제되었습니다.',
+    'deleted'  					=> '모델이 삭제되었습니다.',
     'bulk_delete'               => '자산 모델 대량 삭제',
     'bulk_delete_help'               => '선택한 자산 모델의 삭제를 확인하려면 아래 체크박스를 사용하십시오. 자산에 연결된 자산 모델은 자산이 다른 모델과 연결될 때까지 삭제할 수 없습니다.',
     'bulk_delete_warn'          => 'You are about to delete one asset model.|You are about to delete :model_count asset models.',
diff --git a/resources/lang/ko-KR/admin/models/message.php b/resources/lang/ko-KR/admin/models/message.php
index 02929bd7b5..34f5c2ad9b 100644
--- a/resources/lang/ko-KR/admin/models/message.php
+++ b/resources/lang/ko-KR/admin/models/message.php
@@ -7,7 +7,7 @@ return array(
     'no_association' => 'WARNING! The asset model for this item is invalid or missing!',
     'no_association_fix' => 'This will break things in weird and horrible ways. Edit this asset now to assign it a model.',
     'assoc_users'	 => '이 모델은 현재 하나 이상의 자산들과 연결되어 있기에 삭제 할 수 없습니다. 자산들을 삭제하고 다시 삭제하길 시도하세요. ',
-
+    'invalid_category_type' => 'This category must be an asset category.',
 
     'create' => array(
         'error'   => '모델이 생성되지 않았습니다. 다시 시도하세요.',
diff --git a/resources/lang/ko-KR/admin/reports/general.php b/resources/lang/ko-KR/admin/reports/general.php
index 2d9e841bdf..886256c7a6 100644
--- a/resources/lang/ko-KR/admin/reports/general.php
+++ b/resources/lang/ko-KR/admin/reports/general.php
@@ -4,6 +4,7 @@ return [
     'info'   => '자산 보고서의 옵션을 선택해 주세요.',
     'deleted_user' => 'Deleted user',
     'send_reminder' => 'Send reminder',
+    'cannot_send_reminder' => 'User has been deleted or does not have an email address so cannot receive a reminder',
     'reminder_sent' => 'Reminder sent',
     'acceptance_deleted' => 'Acceptance request deleted',
     'acceptance_request' => 'Acceptance request',
@@ -13,5 +14,10 @@ return [
         'user_state' => 'User State',
         'user_country' => 'User Country',
         'user_zip' => 'User Zip'
-    ]
-];
\ No newline at end of file
+    ],
+    'open_saved_template' => 'Open Saved Template',
+    'save_template' =>  'Save Template',
+    'select_a_template' => 'Select a Template',
+    'template_name' => 'Template Name',
+    'update_template' => 'Update Template',
+];
diff --git a/resources/lang/ko-KR/admin/reports/message.php b/resources/lang/ko-KR/admin/reports/message.php
index 1f93029d3d..2800bbdf0b 100644
--- a/resources/lang/ko-KR/admin/reports/message.php
+++ b/resources/lang/ko-KR/admin/reports/message.php
@@ -1,5 +1,16 @@
 <?php
 
-return array(
-    'error'   => '적어도 옵션 하나는 선택해 주세요.'
-);
+return [
+    'about_templates' => 'About Saved Templates',
+    'saving_templates_description' => 'Select your options, then enter the name of your template in the box above and click the \'Save Template\' button. Use the dropdown to select a previously saved template.',
+    'create'  => [
+        'success' => 'Template saved successfully',
+    ],
+    'update' => [
+        'success' => 'Template updated successfully',
+    ],
+    'delete' => [
+        'success' => 'Template deleted',
+        'no_delete_permission' => 'Template does not exist or you do not have permission to delete it.',
+    ],
+];
diff --git a/resources/lang/ko-KR/admin/settings/general.php b/resources/lang/ko-KR/admin/settings/general.php
index b376dae2e4..d6d569a302 100644
--- a/resources/lang/ko-KR/admin/settings/general.php
+++ b/resources/lang/ko-KR/admin/settings/general.php
@@ -8,13 +8,13 @@ return [
     'ad_append_domain'          => 'username 필드에 도메인 추가',
     'ad_append_domain_help'     => '사용자는 "username@domain.local" 꼴로 입력할 필요가 없으며 "username"만 입력하면 됩니다.',
     'admin_cc_email'            => '참조 이메일',
-    'admin_cc_email_help'       => '사용자에게 보낸 반입/반출 이메일 사본을 추가 이메일 계정으로 보내려면, 여기에 입력하세요. 그렇지 않으면 이 필드를 비워 두세요.',
+    'admin_cc_email_help'       => 'Send a copy of checkin/checkout emails to this address.',
     'admin_settings'            => 'Admin Settings',
     'is_ad'				        => '이것은 액티브 디렉토리 서버입니다.',
     'alerts'                	=> 'Alerts',
     'alert_title'               => 'Update Notification Settings',
     'alert_email'				=> '알림 전송',
-    'alert_email_help'    => 'Email addresses or distribution lists you want alerts to be sent to, comma separated',
+    'alert_email_help'          => 'Email addresses or distribution lists you want alerts to be sent to, comma separated.',
     'alerts_enabled'			=> '알림 사용',
     'alert_interval'			=> '(일자) 최대값 만료 알림',
     'alert_inv_threshold'		=> '재고 알림 최대값',
@@ -31,15 +31,18 @@ return [
     'backups'					=> '예비품',
     'backups_help'              => 'Create, download, and restore backups ',
     'backups_restoring'         => 'Restoring from Backup',
+    'backups_clean' => 'Clean the backed-up database before restore',
+    'backups_clean_helptext' => "This can be useful if you're changing between database versions",
     'backups_upload'            => 'Upload Backup',
     'backups_path'              => 'Backups on the server are stored in <code>:path</code>',
-    'backups_restore_warning'   => 'Use the restore button <small><span class="btn btn-xs btn-warning"><i class="text-white fas fa-retweet" aria-hidden="true"></i></span></small> to restore from a previous backup. (This does not currently work with S3 file storage or Docker.)<br><br>Your <strong>entire :app_name database and any uploaded files will be completely replaced</strong> by what\'s in the backup file.  ',
+    'backups_restore_warning'   => 'Use the restore button <small><span class="btn btn-xs btn-warning"><i class="text-white fas fa-retweet" aria-hidden="true"></i></span></small> to restore from a previous backup. (This does not currently work with S3 file storage or Docker.)<br><br>Your <strong>entire :app_name database and any uploaded files will be completely replaced</strong> by what\'s in the backup file  ',
     'backups_logged_out'         => 'All existing users, including you, will be logged out once your restore is complete.',
     'backups_large'             => 'Very large backups may time out on the restore attempt and may still need to be run via command line. ',
     'barcode_settings'			=> '바코드 설정',
     'confirm_purge'			    => '삭제 확인',
     'confirm_purge_help'		=> '삭제된 레코드를 제거하려면 아래 입력 란에 "DELETE" 텍스트를 입력하십시오. 이 작업은 취소할 수 없으며 일시 삭제된 모든 항목과 사용자를 영구적으로 삭제합니다. (작업 전 백업을 진행하시기 바랍니다.)',
     'custom_css'				=> '사용자 지정 CSS',
+    'custom_css_placeholder'	=> 'Add your custom CSS',
     'custom_css_help'			=> '사용하려는 사용자 CSS를 입력하세요. &lt;style&gt;&lt;/style&gt; 태그들은 넣지 마세요.',
     'custom_forgot_pass_url'	=> '사용자정의 암호 재설정 URL',
     'custom_forgot_pass_url_help'	=> '이것은 로그인 화면에 내장된 잊어버린 비밀번호 URL을 변경하여, 내부 또는 호스트 LDAP 암호 재설정 기능으로 사람들을 안내할 때 유용합니다. 로컬 사용자가 잊어버린 비밀번호 기능을 효과적으로 비활성화합니다.',
@@ -47,34 +50,34 @@ return [
     'dashboard_message_help'	=> '이 문구는 대시보드 조회 권한이 있는 모든 사용자 대상으로 대시보드에 표시됩니다.',
     'default_currency'  		=> '기본 통화',
     'default_eula_text'			=> '기본 사용권 계약',
+    'default_eula_text_placeholder' => 'Add your default EULA text',
     'default_language'			=> '기본 언어',
     'default_eula_help_text'	=> '또한 특정 자산 분류에는 맞춤형 사용권 계약들과 연결을 해야 합니다.',
     'acceptance_note'           => 'Add a note for your decision (Optional)',
     'display_asset_name'        => '자산 명 표시',
     'display_checkout_date'     => '반출 일자 표시',
     'display_eol'               => '테이블 보기에서 폐기일 표시',
-    'display_qr'                => 'Qr 코드 표시',
+    'display_qr'                => '2D 바코드 표시',
     'display_alt_barcode'		=> '1 D 바코드 표시',
-    'email_logo'                => '이메일 내 로고',
     'barcode_type'				=> '2D 바코드 형식',
     'alt_barcode_type'			=> '1D 바코드 형식',
-    'email_logo_size'       => '이메일 첨부 시, 사각형 로고가 가장 적합합니다. ',
     'enabled'                   => 'Enabled',
     'eula_settings'				=> '최종 사용 계약 설정',
     'eula_markdown'				=> '이 최종 사용 계약은 <a href="https://help.github.com/articles/github-flavored-markdown/">GFM을 따른다</a>.',
+    'empty_row_count'           => 'Field Start Offset (Empty Rows)',
+    'empty_row_count_help'      => 'Fields will begin populating after this many empty rows are skipped at the top of the label.',
     'favicon'                   => '파비콘',
     'favicon_format'            => 'ico, png, gif 확장자만 혀용됩니다. 다른 이미지 포맷의 경우 모든 브라우저에서 작동하지 않을 수 있습니다.',
     'favicon_size'          => '파비콘은 16x16 픽셀을 가지는 사각형 이미지여야 합니다.',
     'footer_text'               => '추가 꼬리말',
     'footer_text_help'          => '이 글은 오른쪽 꼬리말에 보여집니다. 링크는 <a href="https://help.github.com/articles/github-flavored-markdown/">Github flavored markdown</a>를 참조하시면 됩니다. 줄 바꿈 머리글, 이미지 등은 보여지지 않습니다.',
+    'footer_text_placeholder'   => 'Optional footer text',
     'general_settings'			=> '일반 설정',
-    'general_settings_keywords' => 'company support, signature, acceptance, email format, username format, images, per page, thumbnail, eula, gravatar, tos, dashboard, privacy',
     'general_settings_help'     => 'Default EULA and more',
     'generate_backup'			=> '백업 생성',
-    'google_workspaces'         => 'Google Workspaces',
+    'google_workspaces'         => '구글 워크스페이스',
     'header_color'              => '머릿말 색상',
     'info'                      => '이 설정들은 설치본의 특정 분야를 설정하는 것입니다.',
-    'label_logo'                => '라벨 로고',
     'label_logo_size'           => '정사각형 로고가 가장 보기 좋습니다. 로고는 각 자산 레이블의 오른쪽 상단에 표시됩니다. ',
     'laravel'                   => 'Laravel 버전',
     'ldap'                      => 'LDAP',
@@ -94,7 +97,7 @@ return [
     'ldap_login_sync_help'      => '이것은 LDAP가 올바르게 동기화 될 수 있는지 테스트합니다. LDAP 인증 질의어가 올바르지 않으면 사용자가 여전히 로그인하지 못할 수 있습니다. 반드시 업데이트 된 LDAP 설정을 먼저 저장해야합니다.',
     'ldap_manager'              => 'LDAP Manager',
     'ldap_server'               => 'LDAP 서버',
-    'ldap_server_help'          => '이것은 (복호화또는 TLS 용) ldap로 시작합니다:// 또는 (SSL용) ldaps://',
+    'ldap_server_help'          => 'This should start with ldap:// (for unencrypted) or ldaps:// (for TLS or SSL)',
     'ldap_server_cert'			=> 'LDAP SSL 인증서 확인',
     'ldap_server_cert_ignore'	=> '유효하지 않은 SSL 인증서 허용',
     'ldap_server_cert_help'		=> '자체 서명한 SSL 인증서를 사용하고, 유효하지 않은 SSL 인증서 사용을 승인하고자 하는 경우, 이 확인 상자를 선택하십시오.',
@@ -108,8 +111,8 @@ return [
     'ldap_pword'                => 'LDAP 연결용 비밀번호',
     'ldap_basedn'               => 'Base BIND DN',
     'ldap_filter'               => 'LDAP 필터',
-    'ldap_pw_sync'              => 'LDAP 암호 동기화',
-    'ldap_pw_sync_help'         => '로컬 암호와 PDAP 암호를 동기화 하지 않으려면 이 박스의 체크를 풀어주세요. 이것을 해제하면 당신의 LDAP 서버에 여러 원인으로 접속할 수 없다면 사용자들도 로그인 할 수 없게 됩니다.',
+    'ldap_pw_sync'              => 'Cache LDAP Passwords',
+    'ldap_pw_sync_help'         => 'Uncheck this box if you do not wish to keep LDAP passwords cached as local hashed passwords. Disabling this means that your users may not be able to login if your LDAP server is unreachable for some reason.',
     'ldap_username_field'       => '사용자명 항목',
     'ldap_lname_field'          => '성:',
     'ldap_fname_field'          => 'LDAP 이름',
@@ -117,13 +120,15 @@ return [
     'ldap_version'              => 'LDAP 버전',
     'ldap_active_flag'          => 'LDAP 활성 플래그',
     'ldap_activated_flag_help'  => '이 값은 동기화된 사용자가 Snipe-IT에 로그인할 수 있는지 여부를 결정하는 데 사용됩니다. <strong> 항목을 체크인하거나 체크아웃하는 기능에는 영향을 미치지 않으며, AD/LDAP 내에서 값이 아닌 <strong> 속성 이름이어야 합니다. <br><br>이 필드가 AD/LDAP에 없는 필드 이름으로 설정되거나 AD/LDAP 필드의 값이 <code>0/code> 또는 <code>false/code>로 설정된 경우, <strong> 사용자 로그인이 비활성화됩니다. AD/LDAP 필드의 값이 <code>1</code>, <code>true</code> 또는 다른 텍스트<em>로 설정되어 있으면 사용자가 로그인할 수 있습니다. AD에서 필드가 비어 있으면 일반적으로 일시 중단되지 않은 사용자가 로그인할 수 있는 <code>userAccountControl</code> 속성을 사용합니다.',
+    'ldap_invert_active_flag'   => 'LDAP Invert Active Flag',
+    'ldap_invert_active_flag_help'     => 'If enabled: when the value returned by LDAP Active Flag is <code>0</code> or <code>false</code> the user account will be active.',
     'ldap_emp_num'              => 'LDAP 피고용인 번호',
     'ldap_email'                => 'LDAP 이메일',
     'ldap_test'                 => 'Test LDAP',
     'ldap_test_sync'            => 'Test LDAP Synchronization',
     'license'                   => '소프트웨어 라이센스',
-    'load_remote'               => 'Use Gravatar',
-    'load_remote_help_text'		=> 'Uncheck this box if your install cannot load scripts from the outside internet. This will prevent Snipe-IT from trying load images from Gravatar.',
+    'load_remote'               => 'Load Remote Avatars',
+    'load_remote_help_text'		=> 'Uncheck this box if your install cannot load scripts from the outside internet. This will prevent Snipe-IT from trying load avatars from Gravatar or other outside sources.',
     'login'                     => 'Login Attempts',
     'login_attempt'             => 'Login Attempt',
     'login_ip'                  => 'IP Address',
@@ -131,6 +136,7 @@ return [
     'login_user_agent'          => 'User Agent',
     'login_help'                => 'List of attempted logins',
     'login_note'                => '로그인 참고',
+    'login_note_placeholder'            => "If you do not have a login or have found a device belonging to this company, please call technical support at 888-555-1212. Thank you.",
     'login_note_help'           => '선택적으로 분실되거나 도난당한 장치를 찾은 사람들을 돕기 위한, 로그인 화면에 몇 문장을 포함하십시오. 이 항목에는 <a href="https://help.github.com/articles/github-flavored-markdown/"> Github flavored markdown </a>를 사용할 수 있습니다.',
     'login_remote_user_text'    => '원격 사용자 로그인 옵션',
     'login_remote_user_enabled_text' => '원격 사용자 헤더로 로그인 활성화',
@@ -146,13 +152,16 @@ return [
     'logo_print_assets_help'    => '브랜딩을 자산 목록 인쇄물에 사용합니다.',
     'full_multiple_companies_support_help_text' => '자신이 속한 공급자 자산에 공급자를 할당하는 것을 제한하는 사용자들 (관리자 포함)',
     'full_multiple_companies_support_text' => '전체 다중 공급자들 지원',
+    'scope_locations_fmcs_support_text'  => 'Scope Locations with Full Multiple Companies Support',
+    'scope_locations_fmcs_support_help_text'  => 'Restrict locations to their selected company.',
+    'scope_locations_fmcs_check_button' => 'Check Compatibility',
+    'scope_locations_fmcs_support_disabled_text'  => 'This option is disabled because you have conflicting locations set for :count or more items.',
     'show_in_model_list'   => '모델 드롭다운에 표시',
     'optional'					=> '선택 사항',
     'per_page'                  => '페이지 당 결과',
     'php'                       => 'PHP 버전',
-    'php_info'                  => 'PHP Info',
+    'php_info'                  => 'PHP info',
     'php_overview'              => 'PHP',
-    'php_overview_keywords'     => 'phpinfo, system, info',
     'php_overview_help'         => 'PHP System info',
     'php_gd_info'               => 'QR 코드를 보려면 php-gd를 설치하셔야 합니다. 설치 설명서를 참고하세요.',
     'php_gd_warning'            => 'PHP 이미지 처리 및 GD 플러그인이 설치되어 있지 않습니다.',
@@ -218,6 +227,8 @@ return [
     'webhook_integration_help'    => ':app integration is optional, however the endpoint and channel are required if you wish to use it. To configure :app integration, you must first <a href=":webhook_link" target="_new" rel="noopener">create an incoming webhook</a> on your :app account. Click on the <strong>Test :app Integration</strong> button to confirm your settings are correct before saving. ',
     'webhook_integration_help_button'    => 'Once you have saved your :app information, a test button will appear.',
     'webhook_test_help'           => 'Test whether your :app integration is configured correctly. YOU MUST SAVE YOUR UPDATED :app SETTINGS FIRST.',
+    'shortcuts_enabled'         => 'Enable Shortcuts',
+    'shortcuts_help_text'       => '<strong>Windows</strong>: Alt + Access key, <strong>Mac</strong>: Control + Option + Access key',
     'snipe_version'  			=> 'Snipe-IT 버전',
     'support_footer'            => '꼬리말 링크 지원',
     'support_footer_help'       => 'Snipe-IT 지원 정보 및 사용자 매뉴얼 보기 권한 설정',
@@ -227,7 +238,6 @@ return [
     'update'                    => '갱신 설정',
     'value'                     => '가치',
     'brand'                     => '브랜딩',
-    'brand_keywords'            => 'footer, logo, print, theme, skin, header, colors, color, css',
     'brand_help'                => 'Logo, Site Name',
     'web_brand'                 => 'Web Branding Type',
     'about_settings_title'      => '설정에 관해',
@@ -276,6 +286,8 @@ return [
     'two_factor_enrollment_text'	=> "2중 인증은 필수입니다만, 당신의 장치는 아직 등록되지 않았습니다. 구글 인증 앱을 실행하고 등록할 장치 아래의 QR 코드를 스캔하세요. 당신의 장치가 등록됐다면, 아래 코드를 입력하세요",
     'require_accept_signature'      => '서명 필수',
     'require_accept_signature_help_text'      => '이 기능을 활성화하면 자산 수락시에 물리적 서명을 필수로 하게 됩니다.',
+    'require_checkinout_notes'  => 'Require Notes on Checkin/Checkout',
+    'require_checkinout_notes_help_text'    => 'Enabling this feature will require the note fields to be populated when checking in or checking out an asset.',
     'left'        => '왼쪽',
     'right'        => '오른쪽',
     'top'        => '위',
@@ -313,24 +325,24 @@ return [
     'filter_by_keyword' => 'Filter by setting keyword',
     'security' => 'Security',
     'security_title' => 'Update Security Settings',
-    'security_keywords' => 'password, passwords, requirements, two factor, two-factor, common passwords, remote login, logout, authentication',
     'security_help' => 'Two-factor, Password Restrictions',
-    'groups_keywords' => 'permissions, permission groups, authorization',
     'groups_help' => 'Account permission groups',
     'localization' => 'Localization',
     'localization_title' => 'Update Localization Settings',
-    'localization_keywords' => 'localization, currency, local, locale, time zone, timezone, international, internatinalization, language, languages, translation',
     'localization_help' => 'Language, date display',
     'notifications' => 'Notifications',
     'notifications_help' => 'Email Alerts & Audit Settings',
     'asset_tags_help' => 'Incrementing and prefixes',
     'labels' => 'Labels',
     'labels_title' => 'Update Label Settings',
-    'labels_help' => 'Label sizes &amp; settings',
-    'purge_keywords' => 'permanently delete',
+    'labels_help' => 'Barcodes &amp; label settings',
     'purge_help' => '삭제된 기록들 지우기',
     'ldap_extension_warning' => 'It does not look like the LDAP extension is installed or enabled on this server. You can still save your settings, but you will need to enable the LDAP extension for PHP before LDAP syncing or login will work.',
     'ldap_ad' => 'LDAP/AD',
+    'ldap_test_label' => 'Test LDAP Sync',
+    'ldap_test_login' => ' Test LDAP Login',
+    'ldap_username_placeholder' => 'LDAP Username',
+    'ldap_password_placeholder' => 'LDAP Password',
     'employee_number' => '사원번호',
     'create_admin_user' => 'Create a User ::',
     'create_admin_success' => 'Success! Your admin user has been added!',
@@ -342,6 +354,8 @@ return [
     'setup_migration_create_user' => 'Next: Create User',
     'ldap_settings_link' => 'LDAP Settings Page',
     'slack_test' => 'Test <i class="fab fa-slack"></i> Integration',
+    'status_label_name' => 'Status Label Name',
+    'super_admin_only'  => 'Super Admin Only',
     'label2_enable'           => 'New Label Engine',
     'label2_enable_help'      => 'Switch to the new label engine. <b>Note: You will need to save this setting before setting others.</b>',
     'label2_template'         => 'Template',
@@ -356,12 +370,15 @@ return [
     'label2_2d_type'          => '2D 바코드 형식',
     'label2_2d_type_help'     => 'Format for 2D barcodes',
     'label2_2d_target'        => '2D Barcode Target',
-    'label2_2d_target_help'   => 'The URL the 2D barcode points to when scanned',
+    'label2_2d_target_help'   => 'The data that will be contained in the 2D barcode',
     'label2_fields'           => 'Field Definitions',
     'label2_fields_help'      => 'Fields can be added, removed, and reordered in the left column. For each field, multiple options for Label and DataSource can be added, removed, and reordered in the right column.',
+    'purge_barcodes' => 'Purge Barcodes',
     'help_asterisk_bold'    => 'Text entered as <code>**text**</code> will be displayed as bold',
     'help_blank_to_use'     => 'Leave blank to use the value from <code>:setting_name</code>',
     'help_default_will_use' => '<code>:default</code> will use the value from <code>:setting_name</code>. <br>Note that the value of the barcodes must comply with the respective barcode spec in order to be successfully generated. Please see <a href="https://snipe-it.readme.io/docs/barcodes">the documentation <i class="fa fa-external-link"></i></a> for more details. ',
+    'asset_id'              => 'Asset ID',
+    'data'               => 'Data',
     'default'               => 'Default',
     'none'                  => 'None',
     'google_callback_help' => 'This should be entered as the callback URL in your Google OAuth app settings in your organization&apos;s <strong><a href="https://console.cloud.google.com/" target="_blank">Google developer console <i class="fa fa-external-link" aria-hidden="true"></i></a></strong>.',
@@ -373,7 +390,100 @@ return [
     'database_driver' => 'Database Driver',
     'bs_table_storage' => 'Table Storage',
     'timezone' => 'Timezone',
+    'test_mail' => 'Test Mail',
     'profile_edit'          => 'Edit Profile',
     'profile_edit_help'          => 'Allow users to edit their own profiles.',
+    'default_avatar' => 'Custom Default Avatar',
+    'default_avatar_help' => 'This image will be displayed as a profile if a user does not have a profile photo.',
+    'restore_default_avatar' => 'Restore <a href=":default_avatar" data-toggle="lightbox" data-type="image">original system default avatar</a>',
+    'restore_default_avatar_help' => '',
+    'due_checkin_days' => 'Due For Checkin Warning',
+    'due_checkin_days_help' => 'How many days before the expected checkin of an asset should it be listed in the "Due for checkin" page?',
+    'no_groups' => 'No groups have been created yet. Visit <code>Admin Settings > Permission Groups</code> to add one.',
+    'text' => 'Text',
+
+    'username_formats' => [
+        'username_format'		=> '사용자명 형식',
+        'firstname_lastname_format'	=> '이름 성 (jane.smith)',
+        'first_name_format'	        => 'First Name (jane)',
+        'last_name_format'		=> 'Last Name (doe)',
+        'filastname_format'			=> 'First Initial Last Name (jsmith)',
+        'lastnamefirstinitial_format' =>  'Last Name First Initial (smithj)',
+        'firstname_lastname_underscore_format' => 'First Name Last Name (jane_smith)',
+        'firstinitial.lastname' => 'First Initial Last Name (j.smith)',
+        'lastname_firstinitial' => 'Last Name First Initial (smith_j)',
+        'lastname_dot_firstinitial_format' => 'Last Name First Initial (smith.j)',
+        'firstnamelastname'     => 'First Name Last Name (janesmith)',
+        'firstnamelastinitial'  => 'First Name Last Initial (janes)',
+        'lastnamefirstname'      => 'Last Name.First Name (smith.jane)',
+    ],
+
+    'email_formats' => [
+        'email_format'			=> '전자 우편 형식',
+        'firstname_lastname_format'	=> '이름 성 (jane.smith@example.com)',
+        'first_name_format'		=> '이름 (jane@example.com)',
+        'last_name_format'		=> 'Last Name (doe@example.com)',
+        'filastname_format'			=> '초기 성명 (jsmith@example.com)',
+        'lastnamefirstinitial_format' =>  '성 (姓)의 첫 이니셜 (smithj@example.com)',
+        'firstname_lastname_underscore_format' => '이름 성 (jane.smith@example.com)',
+        'firstinitial.lastname' => 'First Initial Last Name (j.smith@example.com)',
+        'lastname_firstinitial' => 'Last Name First Initial (smith_j@example.com)',
+        'lastname_dot_firstinitial_format' => 'Last Name First Initial (smith.j@example.com)',
+        'firstnamelastname'     => 'First Name Last Name (janesmith@example.com)',
+        'firstnamelastinitial'  => 'First Name Last Initial (janes@example.com)',
+        'lastnamefirstname'      => 'Last Name.First Name (smith.jane@example.com)',
+    ],
+
+
+
+    'logo_labels' => [
+        'acceptance_pdf_logo'       => 'PDF Logo',
+        'email_logo'                => '이메일 내 로고',
+        'label_logo'                => '라벨 로고',
+        'logo'                      => 'Site Logo',
+        'favicon'                   => '파비콘',
+    ],
+
+    'logo_help' => [
+        'email_logo_size'       => '이메일 첨부 시, 사각형 로고가 가장 적합합니다. ',
+    ],
+
+    'logo_option_types' => [
+        'text' => 'Text',
+        'logo' => '로고',
+        'logo_and_text' => 'Logo and Text',
+    ],
+
+
+    'legends' => [
+        'scoping' => 'Scoping',
+        'formats' => 'Default Formats',
+        'profiles' => 'User Profiles',
+        'eula' => 'EULA & Acceptance Preferences',
+        'misc_display' => 'Miscellaneous Display Options',
+        'email' => 'Email Preferences',
+        'checkin' => 'Checkin Preferences',
+        'dashboard' => 'Login & Dashboard Preferences',
+        'misc' => 'Miscellaneous',
+        'logos' => 'Logos & Display',
+        'colors' => 'Colors & Skins',
+        'footer' => 'Footer Preferences',
+        'security' => 'Security Preferences',
+        'general' => 'General',
+        'intervals' => 'Intervals & Thresholds',
+    ],
+
+
+    /* Keywords for settings overview help */
+    'keywords' => [
+        'brand'             => 'footer, logo, print, theme, skin, header, colors, color, css',
+        'general_settings'  => 'company support, signature, acceptance, email format, username format, images, per page, thumbnail, eula, gravatar, tos, dashboard, privacy',
+        'groups'            => 'permissions, permission groups, authorization',
+        'labels'            => 'labels, barcodes, barcode, sheets, print, upc, qr, 1d, 2d',
+        'localization'      => 'localization, currency, local, locale, time zone, timezone, international, internatinalization, language, languages, translation',
+        'php_overview'      => 'phpinfo, system, info',
+        'purge'             => 'permanently delete',
+        'security'          => 'password, passwords, requirements, two factor, two-factor, common passwords, remote login, logout, authentication',
+    ],
 
 ];
diff --git a/resources/lang/ko-KR/admin/settings/message.php b/resources/lang/ko-KR/admin/settings/message.php
index 7fb39894a7..f046375937 100644
--- a/resources/lang/ko-KR/admin/settings/message.php
+++ b/resources/lang/ko-KR/admin/settings/message.php
@@ -14,6 +14,9 @@ return [
         'restore_warning'       => 'Yes, restore it. I acknowledge that this will overwrite any existing data currently in the database. This will also log out all of your existing users (including you).',
         'restore_confirm'       => 'Are you sure you wish to restore your database from :filename?'
     ],
+    'restore' => [
+        'success'               => 'Your system backup has been restored. Please log in again.'
+    ],
     'purge' => [
         'error'     => '삭제중 오류가 발생하였습니다. ',
         'validation_failed'     => '삭제 확인 절차가 잘못되었습니다. 확인 상자에 "DELETE"를 입력해 주세요.',
@@ -33,6 +36,9 @@ return [
         'testing_authentication' => 'Testing LDAP Authentication...',
         'authentication_success' => 'User authenticated against LDAP successfully!'
     ],
+    'labels' => [
+        'null_template' => 'Label template not found. Please select a template.',
+        ],
     'webhook' => [
         'sending' => 'Sending :app test message...',
         'success' => 'Your :webhook_name Integration works!',
@@ -42,5 +48,12 @@ return [
         'error' => 'Something went wrong. :app responded with: :error_message',
         'error_redirect' => 'ERROR: 301/302 :endpoint returns a redirect. For security reasons, we don’t follow redirects. Please use the actual endpoint.',
         'error_misc' => 'Something went wrong. :( ',
-    ]
+        'webhook_fail' => ' webhook notification failed: Check to make sure the URL is still valid.',
+        'webhook_channel_not_found' => ' webhook channel not found.',
+        'ms_teams_deprecation' => 'The selected Microsoft Teams webhook URL will be deprecated Dec 31st, 2025. Please use a workflow URL. Microsoft\'s documentation on creating a workflow can be found <a href="https://support.microsoft.com/en-us/office/create-incoming-webhooks-with-workflows-for-microsoft-teams-8ae491c7-0394-4861-ba59-055e33f75498" target="_blank"> here.</a>',
+    ],
+    'location_scoping' => [
+        'not_saved' => 'Your settings were not saved.',
+        'mismatch' => 'There is 1 item in the database that need your attention before you can enable location scoping.|There are :count items in the database that need your attention before you can enable location scoping.',
+    ],
 ];
diff --git a/resources/lang/ko-KR/admin/settings/table.php b/resources/lang/ko-KR/admin/settings/table.php
index 8680708b18..63fb7b6844 100644
--- a/resources/lang/ko-KR/admin/settings/table.php
+++ b/resources/lang/ko-KR/admin/settings/table.php
@@ -2,5 +2,5 @@
 
 return array(
     'created'   => '생성일',
-    'size' => 'Size',
+    'size' => '크기',
 );
diff --git a/resources/lang/ko-KR/admin/statuslabels/message.php b/resources/lang/ko-KR/admin/statuslabels/message.php
index fa9725ea04..0f29f90f34 100644
--- a/resources/lang/ko-KR/admin/statuslabels/message.php
+++ b/resources/lang/ko-KR/admin/statuslabels/message.php
@@ -3,7 +3,7 @@
 return [
 
     'does_not_exist' => '상태 꼬리표가 존재하지 않습니다.',
-    'deleted_label' => 'Deleted Status Label',
+    'deleted_label' => '삭제된 상태 꼬리표',
     'assoc_assets'	 => '이 상태 꼬리표는 하나 이상의 자산과 연결되어 있어서 삭제할 수 없습니다. 이 상태를 참조하지 않게 자산을 수정하고 다시 시도해 주세요. ',
 
     'create' => [
diff --git a/resources/lang/ko-KR/admin/statuslabels/table.php b/resources/lang/ko-KR/admin/statuslabels/table.php
index 0c6e0b92fb..03a28f48dc 100644
--- a/resources/lang/ko-KR/admin/statuslabels/table.php
+++ b/resources/lang/ko-KR/admin/statuslabels/table.php
@@ -1,14 +1,14 @@
 <?php
 
 return array(
-    'about'      	=> '상태 꼬리표란',
+    'about'      	=> 'About Status Types',
     'archived'      	=> '보관됨',
     'create'      	=> '상태 꼬리표 생성',
     'color'      	=> '차트 색',
     'default_label' => '기본 라벨',
     'default_label_help' => '이것은 자산을 생성 / 수정 시에 선택 상자의 최상단의 일반적으로 상태 레이블을 표시되는데 사용됩니다.',
     'deployable'      	=> '사용가능',
-    'info'      	=> '상태 꼬리표는 소유한 자산들의 다양한 상태들을 묘사할 때 사용됩니다. 수리요망, 분실/도난 등이 될 것입니다. 사용 할 수 있거나, 대기중이거나 보관된 자산들 대상으로 새로운 상태 딱지를 생성할 수 있습니다.',
+    'info'      	=> 'Status label types are used to describe the various states your assets could be in. They may be out for repair, lost/stolen, etc. You can create new status labels for your deployable, pending and archived assets according to your own workflow. For more information, <a href="https://snipe-it.readme.io/docs/overview#status-labels" target="_blank">see the documentation <i class="fa fa-external-link"></i></a>.',
     'name'      	=> '상태 명',
     'pending'      	=> '대기중',
     'status_type'   => '상태 유형',
diff --git a/resources/lang/ko-KR/admin/users/general.php b/resources/lang/ko-KR/admin/users/general.php
index 052b56d6f3..2f014a8594 100644
--- a/resources/lang/ko-KR/admin/users/general.php
+++ b/resources/lang/ko-KR/admin/users/general.php
@@ -19,6 +19,8 @@ return [
     'print_assigned'    => 'Assigned 자산 모두 인쇄',
     'email_assigned'    => 'Email List of All Assigned',
     'user_notified'     => 'User has been emailed a list of their currently assigned items.',
+    'users_notified'    => 'The user has been emailed a list of their currently assigned items.|:count users have been emailed a list of their currently assigned items.',
+    'users_notified_warning' => ':count user has been emailed a list of their currently assigned items, however :no_email users did not have an email address so could not be emailed.|:count users have been emailed a list of their currently assigned items, however :no_email user(s) did not have an email address so could not be emailed.',
     'auto_assign_label' => 'Include this user when auto-assigning eligible licenses',
     'auto_assign_help'  => 'Skip this user in auto assignment of licenses',
     'software_user'     => '소프트웨어 반출 목록 :name',
diff --git a/resources/lang/ko-KR/admin/users/message.php b/resources/lang/ko-KR/admin/users/message.php
index efac4ad2fc..c390f4ed63 100644
--- a/resources/lang/ko-KR/admin/users/message.php
+++ b/resources/lang/ko-KR/admin/users/message.php
@@ -6,7 +6,7 @@ return array(
     'declined'                  => '이 자산이 거부되었습니다.',
     'bulk_manager_warn'	        => '사용자가 성공적으로 갱신되었지만, 선택한 관리자가 편집할 사용자 목록에도 있었고, 사용자가 자신의 관리자가 아니 어서 관리자 항목이 저장되지 않았습니다. 관리자를 제외한 사용자를 다시 선택하십시오.',
     'user_exists'               => '사용자가 이미 존재합니다!',
-    'user_not_found'            => '사용자가 존재하지 않습니다.',
+    'user_not_found'            => '사용자가 존재하지 않거나, 볼수 있는 권한이 없습니다.',
     'user_login_required'       => '로그인 항목을 입력해 주세요.',
     'user_has_no_assets_assigned' => 'No assets currently assigned to user.',
     'user_password_required'    => '비밀번호를 입력해 주세요.',
@@ -53,6 +53,7 @@ return array(
         'ldap_could_not_search' => 'LDAP 서버를 찾을 수 없습니다. LDAP 설정 파일의 LDAP 서버 구성을 확인해 보세요.<br>LDAP 서버 오류:',
         'ldap_could_not_get_entries' => 'LDAP 서버 목록을 가져올 수 없습니다. LDAP 설정 파일의 LDAP 서버 구성을 확인해 보세요.<br>LDAP 서버 오류:',
         'password_ldap' => '이 계정의 비밀번호는 LDAP/Active 디렉토리에 의해 관리됩니다. 비밀번호를 변경하려면 IT 부서에 문의하세요. ',
+        'multi_company_items_assigned' => 'This user has items assigned that belong to a different company. Please check them in or edit their company.'
     ),
 
     'deletefile' => array(
@@ -68,7 +69,7 @@ return array(
     ),
 
     'inventorynotification' => array(
-        'error'   => 'This user has no email set.',
+        'error'   => '해당 유저는 이메일이 설정되어 있지 않습니다.',
         'success' => 'The user has been notified about their current inventory.'
     )
 );
\ No newline at end of file
diff --git a/resources/lang/ko-KR/admin/users/table.php b/resources/lang/ko-KR/admin/users/table.php
index 2a7806c672..efccee8052 100644
--- a/resources/lang/ko-KR/admin/users/table.php
+++ b/resources/lang/ko-KR/admin/users/table.php
@@ -22,7 +22,7 @@ return array(
     'managed_locations'     => '관리되는 위치',
     'managed_users'         => 'Managed Users',
     'name' 					=> '이름',
-    'nogroup'               => 'No groups have been created yet. To add one, visit: ',
+    'nogroup'               => 'No groups have been created yet. To add one, visit:',
     'notes'                 => '비고',
     'password_confirm' 		=> '비밀번호 확인',
     'password' 				=> '비밀번호',
diff --git a/resources/lang/ko-KR/auth.php b/resources/lang/ko-KR/auth.php
index db310aa1bb..14d8acfce0 100644
--- a/resources/lang/ko-KR/auth.php
+++ b/resources/lang/ko-KR/auth.php
@@ -15,6 +15,6 @@ return array(
 
     'failed' => 'These credentials do not match our records.',
     'password' => 'The provided password is incorrect.',
-    'throttle' => 'Too many login attempts. Please try again in :seconds seconds.',
+    'throttle' => 'Too many login attempts. Please try again in :minutes minute(s).',
 
 );
diff --git a/resources/lang/ko-KR/auth/message.php b/resources/lang/ko-KR/auth/message.php
index 3193b9f961..6e506c9496 100644
--- a/resources/lang/ko-KR/auth/message.php
+++ b/resources/lang/ko-KR/auth/message.php
@@ -6,8 +6,6 @@ return array(
     'account_not_found'      => '사용자 명이나 비밀번호가 틀렸습니다.',
     'account_not_activated'  => '이 사용자는 비활성 계정입니다.',
     'account_suspended'      => '이 사용자는 보류 계정입니다.',
-    'account_banned'         => '이 사용자는 금지 계정입니다.',
-    'throttle'               => 'Too many failed login attempts. Please try again in :minutes minutes.',
 
     'two_factor' => array(
         'already_enrolled'      => 'Your device is already enrolled.',
diff --git a/resources/lang/ko-KR/button.php b/resources/lang/ko-KR/button.php
index f58979fe3a..5dbb5df812 100644
--- a/resources/lang/ko-KR/button.php
+++ b/resources/lang/ko-KR/button.php
@@ -7,6 +7,7 @@ return [
     'checkin_and_delete'  	    => 'Checkin All / Delete User',
     'delete'  	                => '삭제',
     'edit'    	                => '편집',
+    'clone'    	                => '복제',
     'restore' 	                => '복원',
     'remove'                    => '삭제',
     'request'                   => '요청',
@@ -17,8 +18,17 @@ return [
     'generate_labels'           => '{1} 레이블 생성|[2,*] 여러 레이블 생성',
     'send_password_link'        => '패스워드 재설정 메일 전송',
     'go'                        => 'Go',
-    'bulk_actions'              => 'Bulk Actions',
+    'bulk_actions'              => '일괄 작업',
     'add_maintenance'           => '유지 보수 정보 추가',
     'append'                    => 'Append',
     'new'                       => '신규',
+    'var' => [
+        'clone'     => 'Clone :item_type',
+        'edit'      => 'Edit :item_type',
+        'delete'    => 'Delete :item_type',
+        'restore'   => 'Restore :item_type',
+        'create'    => 'Create New :item_type',
+        'checkout'  => 'Checkout :item_type',
+        'checkin'   => 'Checkin :item_type',
+    ]
 ];
diff --git a/resources/lang/ko-KR/general.php b/resources/lang/ko-KR/general.php
index c04230465d..c52e3be597 100644
--- a/resources/lang/ko-KR/general.php
+++ b/resources/lang/ko-KR/general.php
@@ -1,44 +1,47 @@
 <?php
 
 return [
-    '2FA_reset'             => '2FA reset',
+    '2FA_reset'             => '2FA 리셋',
     'accessories'			=> '부속품들',
     'activated'			    => '활성화',
-    'accepted_date'         => 'Date Accepted',
+    'accepted_date'         => '반영일',
     'accessory'				=> '부속품',
     'accessory_report'		=> '부속품 보고서',
     'action'                => '작업',
     'activity_report'		=> '활동 보고서',
     'address'				=> '주소',
-    'admin'					=> '관리자',
-    'admin_tooltip'			=> 'This user has admin privileges',
-    'superuser'				=> 'Superuser',
-    'superuser_tooltip'		=> 'This user has superuser privileges',
+    'admin'					=> 'Admin Settings',
+    'admin_tooltip'			=> '현재 사용자는 어드민 권한을 가지고 있습니다.',
+    'superuser'				=> '슈퍼유저',
+    'superuser_tooltip'		=> '현재 사용자는 슈퍼유저 권한을 가지고 있습니다.',
     'administrator'			=> '관리자',
     'add_seats'             => '추가한 Seat',
-    'age'                   => "Age",
+    'age'                   => "나이",
     'all_assets'			=> '모든 자산들',
     'all'       			=> '전체',
     'archived'              => '보관됨',
     'asset_models'			=> '자산 모델',
     'asset_model'			=> '모델',
     'asset'					=> '자산',
+    'asset_previous'        => 'Asset (Previously Assigned)',
     'asset_report'          => '자산 보고서',
     'asset_tag'				=> '자산 태그',
     'asset_tags'            => '자산 태그',
     'assets_available'		=> '사용 가능한 자산',
-    'accept_assets'         => 'Accept Assets :name',
+    'accept_assets'         => '승인된 자산 :name',
     'accept_assets_menu'    => '승인된 자산',
+    'accept_item'           => 'Accept Item',
     'audit'				    => '감사',
+    'audits'				=> 'Audits',
     'audit_report'			=> '감사 기록',
     'assets'				=> '자산',
     'assets_audited'        => '자산 감사',
-    'assets_checked_in_count'     => 'assets checked in',
-    'assets_checked_out_count'     => 'assets checked out',
-    'asset_deleted_warning'     => 'This asset has been deleted. You must restore it before you can assign it to someone.',
-    'assigned_date'         => 'Date Assigned',
-    'assigned_to'           => 'Assigned to :name',
-    'assignee'              => 'Assigned to',
+    'assets_checked_in_count'     => '반입된 자산',
+    'assets_checked_out_count'     => '반출된 자산',
+    'asset_deleted_warning'     => '이 자산은 삭제되었습니다. 다시 할당하기 전에 복원해야 합니다.',
+    'assigned_date'         => '할당일',
+    'assigned_to'           => '수령인 :name',
+    'assignee'              => '수령인',
     'avatar_delete'         => '아바타 삭제',
     'avatar_upload'         => '아바타 올리기',
     'back'      			=> '이전',
@@ -46,9 +49,9 @@ return [
     'bulkaudit'             => '대량 감사',
     'bulkaudit_status'      => '감사 상태',
     'bulk_checkout'  		=> '대량 반출',
-    'bulk_edit'             => 'Bulk Edit',
-    'bulk_delete'           => 'Bulk Delete',
-    'bulk_actions'          => 'Bulk Actions',
+    'bulk_edit'             => '일괄 편집',
+    'bulk_delete'           => '일괄 삭제',
+    'bulk_actions'          => '일괄 작업',
     'bulk_checkin_delete'   => 'Bulk Checkin / Delete Users',
     'byod'                  => 'BYOD',
     'byod_help'             => 'This device is owned by the user',
@@ -61,9 +64,12 @@ return [
     'changepassword'  		=> '비밀번호 변경',
     'checkin'  				=> '반입',
     'checkin_from'  		=> '반입처',
+    'checkin_note'  		=> 'Checkin Note',
+    'checkout_note'  		=> 'Checkout Note',
     'checkout'  			=> '반출',
     'checkouts_count'       => '반출',
     'checkins_count'        => '반입',
+    'checkin_and_delete'  	=> 'Checkin and Delete',
     'user_requests_count'   => '요청',
     'city'  				=> '시',
     'click_here'			=> '여기를 클릭',
@@ -77,7 +83,7 @@ return [
     'consumables'			=> '소모품',
     'country'  				=> '국가명',
     'could_not_restore'     => 'Error restoring :item_type: :error',
-    'not_deleted'           => 'The :item_type is not deleted so it cannot be restored',
+    'not_deleted'           => 'The :item_type was not deleted and therefore cannot be restored',
     'create'				=> '새로 생성',
     'created'               => '품목 생성됨',
     'created_asset'			=> '생성된 자산',
@@ -86,11 +92,13 @@ return [
     'record_created' 		=> '레코드 생성',
     'updated_at' 			=> '업데이트',
     'currency'  			=> '원', // this is deprecated
+    'currency_text'  		=> 'Currency', //
     'current'  				=> '현재',
     'current_password'      => 'Current Password',
     'customize_report'      => 'Customize Report',
     'custom_report'         => '맞춤형 자산 보고서',
     'dashboard'				=> '대시보드',
+    'data_source'           => 'Data Source',
     'days'      			=> '일자',
     'days_to_next_audit'    => '다음 감사까지의 일자',
     'date'					=> '날짜',
@@ -98,7 +106,7 @@ return [
     'debug_warning_text'    => '이 프로그램은 디버깅이 가능한 제품 모드에서 구동중입니다. 당신의 프로그램이 외부 환경과 접속이 가능하다면 중요한 자료가 유출될 수 있습니다. <code>.env</code> 파일의 <code>APP_DEBUG</code> 값을 <code>false</code> 로 설정하여 디버깅을 비활성화 하세요.',
     'delete'  				=> '삭제',
     'delete_confirm'  		=> ':item 을 삭제 하시겠습니까?',
-    'delete_confirm_no_undo' => 'Are you sure you wish to delete :item? This can not be undone.',
+    'delete_confirm_no_undo' => 'Are you sure, you wish to delete :item? This cannot be undone.',
     'deleted'  				=> '삭제됨',
     'delete_seats'  		=> '삭제한 Seat',
     'deletion_failed'       => '삭제 실패',
@@ -114,29 +122,13 @@ return [
     'editprofile'  			=> '프로필 수정',
     'eol'					=> '폐기일',
     'email_domain'			=> '전자 우편 도메인',
-    'email_format'			=> '전자 우편 형식',
     'employee_number'       => '사원번호',
     'email_domain_help'		=> '읽어오기시 전자 우편 주소를 생성하는데 사용됩니다.',
     'error'				    => '오류',
     'exclude_archived'      => 'Exclude Archived Assets',
     'exclude_deleted'       => 'Exclude Deleted Assets',
     'example'				=> 'Example: ',
-    'filastname_format'			=> '초기 성명 (jsmith@example.com)',
-    'firstname_lastname_format'	=> '이름 성 (jane.smith@example.com)',
-    'firstname_lastname_underscore_format' => '이름 성 (jane.smith@example.com)',
-    'lastnamefirstinitial_format' =>  '성 (姓)의 첫 이니셜 (smithj@example.com)',
-    'firstintial_dot_lastname_format' => 'First Initial Last Name (j.smith@example.com)',
-    'firstname_lastname_display'	=> 'First Name Last Name (Jane Smith)',
-    'lastname_firstname_display'	=> 'Last Name First Name (Smith Jane)',
-    'name_display_format'	=> 'Name Display Format',
-    'first'					=> '첫번째',
-    'firstnamelastname'     => 'First Name Last Name (janesmith@example.com)',
-    'lastname_firstinitial' => 'Last Name First Initial (smith_j@example.com)',
-    'firstinitial.lastname' => 'First Initial Last Name (j.smith@example.com)',
-    'firstnamelastinitial'  => 'First Name Last Initial (janes@example.com)',
-    'lastnamefirstname'      => 'Last Name First Name (smith.jane@example.com)',
-    'first_name'			=> '이름',
-    'first_name_format'		=> '이름 (jane@example.com)',
+
     'files'                 => '파일',
     'file_name'				=> '파일',
     'file_type'             => '파일 형식',
@@ -156,9 +148,9 @@ return [
     'image_delete'         	=> '이미지 삭제',
     'include_deleted'       => 'Include Deleted Assets',
     'image_upload'         	=> '이미지 올리기',
-    'filetypes_accepted_help'    => 'Accepted filetype is :types. Max upload size allowed is :size.|Accepted filetypes are :types. Max upload size allowed is :size.',
-    'filetypes_size_help'   => 'Max upload size allowed is :size.',
-    'image_filetypes_help'  => 'Accepted filetypes are jpg, webp, png, gif, svg, and avif. Max upload size allowed is :size.',
+    'filetypes_accepted_help'    => 'Accepted filetype is :types. The maximum size allowed is :size.|Accepted filetypes are :types. The maximum upload size allowed is :size.',
+    'filetypes_size_help'   => 'The maximum upload size allowed is :size.',
+    'image_filetypes_help'  => 'Accepted Filetypes are jpg, webp, png, gif, svg, and avif. The maximum upload size allowed is :size.',
     'unaccepted_image_type'  => 'This image file was not readable. Accepted filetypes are jpg, webp, png, gif, and svg. The mimetype of this file is: :mimetype.',
     'import'         	    => '불러오기',
     'import_this_file'      => 'Map fields and process this file',
@@ -178,16 +170,21 @@ return [
     'last'					=> '마지막',
     'last_login'            => '마지막 로그인',
     'last_name'             => '성',
+    'firstname_lastname_display'	=> 'First Name Last Name (Jane Smith)',
+    'lastname_firstname_display'	=> 'Last Name First Name (Smith Jane)',
+    'name_display_format'	=> 'Name Display Format',
+    'first'					=> '첫번째',
+    'first_name'			=> '이름',
     'license'				=> '라이선스',
     'license_report'        => '라이선스 보고서',
-    'licenses_available'	=> 'Licenses available',
+    'licenses_available'	=> '사용가능 라이선스',
     'licenses'				=> '라이선스',
     'list_all'				=> '전체 목록보기',
     'loading'				=> '로딩 중입니다. 잠시만 기다려 주십시오.',
     'lock_passwords'        => '이 항목은 데모에서 저장이 불가능합니다.',
     'feature_disabled'      => '데모 설치본에서는 이 기능을 사용할 수 없습니다.',
     'location'              => '장소',
-    'location_plural'        => 'Location|Locations',
+    'location_plural'        => '장소|장소들',
     'locations'				=> '위치',
     'logo_size'				=> 'Square logos look best with Logo + Text. Logo maximum display size is 50px high x 500px wide.  ',
     'logout'				=> '로그아웃',
@@ -215,6 +212,14 @@ return [
     'no_results'			=> '결과 없음.',
     'no'  					=> '아니오',
     'notes'  				=> '비고',
+    'note_added'            => 'Note Added',
+    'options'				=> 'Options',
+    'preview'				=> 'Preview',
+    'add_note'              => 'Add Note',
+    'note_edited'            => 'Note Edited',
+    'edit_note'              => 'Edit Note',
+    'note_deleted'            => 'Note Deleted',
+    'delete_note'              => 'Delete Note',
     'order_number'          => '주문 번호',
     'only_deleted'          => 'Only Deleted Assets',
     'page_menu'				=> 'Showing _MENU_ items',
@@ -229,7 +234,7 @@ return [
     'purchase_date'         => '구매 일자',
     'qty'		            => '수량',
     'quantity'		        => '수량',
-    'quantity_minimum'      => 'You have :count items below or almost below minimum quantity levels',
+    'quantity_minimum'      => 'You have one item below or almost below minimum quantity levels|You have :count items below or almost below minimum quantity levels',
     'quickscan_checkin'  	=> 'Quick Scan Checkin',
     'quickscan_checkin_status'  	=> 'Checkin Status',
     'ready_to_deploy'		=> '사용 준비',
@@ -254,7 +259,7 @@ return [
     'select_all'            => '모두 선택',
     'search'				=> '찾기',
     'select_category'       => '분류 선택',
-    'select_datasource' => 'Select a Datasource',
+    'select_datasource' => 'Select a data source',
     'select_department'     => '부서 선택',
     'select_depreciation'	=> '감가 상각 유형 선택',
     'select_location'		=> '장소 선택',
@@ -274,18 +279,20 @@ return [
     'signed_off_by'         => 'Signed Off By',
     'skin'       			=> '스킨',
     'webhook_msg_note'        => 'A notification will be sent via webhook',
-    'webhook_test_msg'        => 'Oh hai! Looks like your :app integration with Snipe-IT is working!',
+    'webhook_test_msg'        => 'Oh hai! It looks like your :app integration with Snipe-IT is working!',
     'some_features_disabled' => '데모 모드: 설치 시 일부 기능은 사용할 수 없습니다.',
     'site_name'				=> '사이트 명',
     'state'  				=> '주',
     'status_labels'			=> '상태 딱지',
+    'status_label'			=> 'Status Label',
     'status'    			=> '상태',
     'accept_eula'           => 'Acceptance Agreement',
+    'show_or_hide_eulas' => 'Show/Hide EULAs',
     'supplier'              => '공급자',
     'suppliers'  			=> '공급자',
     'sure_to_delete'        => '정말로 삭제 하시겠습니까',
     'sure_to_delete_var'    => ':item 을 삭제 하시겠습니까?',
-    'delete_what'           => 'Delete :item',
+    'delete_what'           => '삭제 :item',
     'submit'				=> '제출',
     'target'                => '대상',
     'time_and_date_display' => '시간과 날짜 표시',
@@ -296,10 +303,10 @@ return [
     'type'  				=> '유형',
     'undeployable'			=> '사용불가',
     'unknown_admin'			=> '알수없는 관리자',
-    'username_format'		=> '사용자명 형식',
     'username'              => '사용자명',
     'update'                => '갱신',
-    'upload_filetypes_help'      => 'Allowed filetypes are png, gif, jpg, jpeg, doc, docx, pdf, xls, xlsx, txt, lic, xml, zip, rtf and rar. Max upload size allowed is :size.',
+    'updating_item' => 'Updating :item',
+    'upload_filetypes_help'      => '허용된 파일 형식은 png, gif, jpg, jpeg, doc, docx, pdf, xls, txt, lic, zip, rar 입니다. 최대 업로드 크기는 :size 입니다.',
     'uploaded'              => '업로드됨',
     'user'					=> '사용자',
     'accepted'			    => '승인됨',
@@ -310,7 +317,7 @@ return [
     'users'                 => '사용자',
     'viewall'				=> '전체 보기',
     'viewassets'  			=> '사용중인 자산 보기',
-    'viewassetsfor'         => 'View Assets for :name',
+    'viewassetsfor'         => '자산 보기 :name',
     'website'               => '웹사이트',
     'welcome'				=> '환영합니다, :name',
     'years'					=> '년',
@@ -318,15 +325,15 @@ return [
     'zip'  					=> 'Zip',
     'noimage'				=> '업로드한 사진이 없거나 사진을 찾지 못함',
     'file_does_not_exist'   => 'The requested file does not exist on the server.',
-    'file_upload_success'   => 'File upload success!',
-    'no_files_uploaded'     => 'File upload success!',
+    'file_upload_success'   => '파일 업로드 성공!',
+    'no_files_uploaded'     => '파일 업로드 성공!',
     'token_expired'         => '폼의 세션이 끝났습니다. 다시 시도해 주세요.',
     'login_enabled'         => '로그인 활성화됨',
     'audit_due'             => 'Due for Audit',
-    'audit_due_days'        => 'Assets Due for Audit Within :days Day|Assets Due for Audit Within :days Days',
+    'audit_due_days'        => '{}Assets Due or Overdue for Audit|[1]Assets Due or Overdue for Audit Within a Day|[2,*]Assets Due or Overdue for Audit Within :days Days',
     'checkin_due'           => 'Due for Checkin',
     'checkin_overdue'       => 'Overdue for Checkin',
-    'checkin_due_days'      => 'Assets Due for Checkin Within :days Day|Assets Due for Checkin Within :days Days',
+    'checkin_due_days'      => '{}Due for Checkin|[1]Assets Due for Checkin Within :days Day|[2,*]Assets Due for Checkin Within :days Days',
     'audit_overdue'         => 'Overdue for Audit',
     'accept'                => '허가됨 :asset',
     'i_accept'              => '동의합니다',
@@ -339,15 +346,15 @@ return [
     'view_all'              => '모두 보기',
     'hide_deleted'          => 'Hide Deleted',
     'email'                 => '이메일',
-    'do_not_change'         => 'Do Not Change',
-    'bug_report'            => '오류 보고',
+    'do_not_change'         => 'Do not change',
+    'bug_report'            => '버그 신고하기',
     'user_manual'           => '사용자 설명서',
     'setup_step_1'          => '1 단계',
     'setup_step_2'          => '2 단계',
     'setup_step_3'          => '3 단계',
     'setup_step_4'          => '4 단계',
     'setup_config_check'    => 'Configuration Check',
-    'setup_create_database' => 'Create Database Tables',
+    'setup_create_database' => '데이터베이스 테이블 생성',
     'setup_create_admin'    => '관리자 유저 생성',
     'setup_done'            => '완료됨',
     'bulk_edit_about_to'    => 'You are about to edit the following: ',
@@ -383,6 +390,8 @@ return [
     'new_license'           => '새 라이센스',
     'new_accessory'         => '새 부속품',
     'new_consumable'        => '새 소모품',
+    'new_component'         => 'New Component',
+    'new_user'              => 'New User',
     'collapse'              => 'Collapse',
     'assigned'              => 'Assigned',
     'asset_count'           => 'Asset Count',
@@ -397,7 +406,7 @@ return [
     'notification_warning'   => '경고',
     'notification_info'      => '정보',
     'asset_information'     => '자산 정보',
-    'model_name'            => 'Model Name',
+    'model_name'            => '모델명',
     'asset_name'            => '자산명',
     'consumable_information' => 'Consumable Information:',
     'consumable_name'       => '소모품 명:',
@@ -418,19 +427,20 @@ return [
     'bulk_soft_delete'      =>'Also soft-delete these users. Their asset history will remain intact unless/until you purge deleted records in the Admin Settings.',
     'bulk_checkin_delete_success' => 'Your selected users have been deleted and their items have been checked in.',
     'bulk_checkin_success' => 'The items for the selected users have been checked in.',
-    'set_to_null'           => 'Delete values for this asset|Delete values for all :asset_count assets ',
+    'set_to_null'           => 'Delete values for this selection|Delete values for all :selection_count selections ',
     'set_users_field_to_null'  => 'Delete :field values for this user|Delete :field values for all :user_count users ',
     'na_no_purchase_date'   => 'N/A - No purchase date provided',
     'assets_by_status'      => 'Assets by Status',
     'assets_by_status_type'      => 'Assets by Status Type',
     'pie_chart_type'        => 'Dashboard Pie Chart Type',
-    'hello_name'            => 'Hello, :name!',
-    'unaccepted_profile_warning'   => 'You have :count items requiring acceptance. Click here to accept or decline them',
+    'hello_name'            => '환영합니다, :name!',
+    'unaccepted_profile_warning'   => 'You have one item requiring acceptance. Click here to accept or decline it | You have :count items requiring acceptance. Click here to accept or decline them',
     'start_date'            => '시작일',
-    'end_date'            => 'End Date',
+    'end_date'            => '종료일',
     'alt_uploaded_image_thumbnail' => 'Uploaded thumbnail',
     'placeholder_kit'       => 'Select a kit',
     'file_not_found'        => 'File not found',
+    'log_record_not_found'  => 'No record for that log entry was found.',
     'preview_not_available' => '(no preview)',
     'setup'                 => 'Setup',
     'pre_flight'            => 'Pre-Flight',
@@ -512,7 +522,7 @@ return [
     'checked_out_to_fields' => 'Checked Out To Fields',
     'percent_complete' => '% 완료',
     'uploading' => 'Uploading... ',
-    'upload_error' => 'Error uploading file. Please check that there are no empty rows and that no column names are duplicated.',
+    'upload_error' => 'Error uploading file. Please check that you have no empty rows or duplicated column names in your CSV, and that the server permissions allow uploads.',
     'copy_to_clipboard' => 'Copy to Clipboard',
     'copied' => 'Copied!',
     'status_compatibility' => 'If assets are already assigned, they cannot be changed to a non-deployable status type and this value change will be skipped.',
@@ -549,6 +559,71 @@ return [
         'license_seats'  => ':count License Seat|:count License Seats',
         'consumables'  => ':count Consumable|:count Consumables',
         'components'  => ':count Component|:count Components',
-    ]
+    ],
+
+    'more_info' => '자세한 정보',
+    'quickscan_bulk_help' => 'Checking this box will edit the asset record to reflect this new location. Leaving it unchecked will simply note the location in the audit log. Note that if this asset is checked out, it will not change the location of the person, asset or location it is checked out to.',
+    'whoops' => 'Whoops!',
+    'something_went_wrong' => 'Something went wrong with your request.',
+    'close' => '닫기',
+    'expires' => '만료',
+    'map_fields'=> 'Map :item_type Fields',
+    'remaining_var' => ':count Remaining',
+    'label' => 'Label',
+    'import_asset_tag_exists' => 'An asset with the asset tag :asset_tag already exists and an update was not requested. No change was made.',
+    'countries_manually_entered_help' => 'Values with an asterisk (*) were manually entered and do not match existing ISO 3166 dropdown values',
+    'accessories_assigned' => 'Assigned Accessories',
+    'user_managed_passwords' => 'Password Management',
+    'user_managed_passwords_disallow' => 'Disallow users from managing their own passwords',
+    'user_managed_passwords_allow' => 'Allow users to manage their own passwords',
+    'from' => 'From',
+    'by' => '요청자',
+
+// Add form placeholders here
+    'placeholders' => [
+        'notes'  => 'Add a note',
+    ],
+
+    'breadcrumb_button_actions' => [
+        'edit_item' => 'Edit :name',
+        'checkout_item' => 'Checkout :name',
+        'checkin_item' => 'Checkin :name',
+    ],
+
+    'skins' => [
+        'site_default' => 'Site Default',
+        'default_blue' => 'Default Blue',
+        'blue_dark' => 'Blue (Dark Mode)',
+        'green' => 'Green Dark',
+        'green_dark' => 'Green (Dark Mode)',
+        'red' => 'Red Dark',
+        'red_dark' => 'Red (Dark Mode)',
+        'orange' => 'Orange Dark',
+        'orange_dark' => 'Orange (Dark Mode)',
+        'black' => 'Black',
+        'black_dark' => 'Black (Dark Mode)',
+        'purple' => 'Purple',
+        'purple_dark' => 'Purple (Dark Mode)',
+        'yellow' => 'Yellow',
+        'yellow_dark' => 'Yellow (Dark Mode)',
+        'high_contrast' => 'High Contrast',
+
+    ],
+
+    'select_all_none' => 'Select/Unselect All',
+    'generic_model_not_found' => 'That :model was not found or you do not have permission to access it',
+    'deleted_models' => 'Deleted Asset Models',
+    'deleted_users' => 'Deleted Users',
+    'cost_each' => ':amount each',
+    'remove_current_image' => 'Remove current :type image',
+
+    'seeding' => [
+        'manufacturers' => [
+            'button' => 'Create Manufacturers',
+            'prompt' => 'You do not have any manufacturers yet. Would you like to seed a list of common manufacturers? (THIS WILL OVERWRITE EXISTING MANUFACTURERS, including those that have been soft-deleted.)',
+            'success' => 'Manufacturers seeded successfully',
+            'error' => 'Could not seed manufacturers. A manufacturer record already exists and seeding would overwrite it.|Could not seed manufacturers. :count manufacturer records already exist and seeding would overwrite them.',
+        ],
+    ],
 
 ];
diff --git a/resources/lang/ko-KR/localizations.php b/resources/lang/ko-KR/localizations.php
index 863b6890a9..2f7699543e 100644
--- a/resources/lang/ko-KR/localizations.php
+++ b/resources/lang/ko-KR/localizations.php
@@ -2,7 +2,7 @@
 
 return [
 
-    'select_language' => 'Select a language',
+    'select_language' => '언어선택',
     'languages' => [
         'en-US'=> 'English, US',
         'en-GB'=> 'English, UK',
@@ -33,14 +33,16 @@ return [
         'it-IT'=> 'Italian',
         'ja-JP'=> 'Japanese',
         'km-KH'=>'Khmer',
-        'ko-KR'=> 'Korean',
+        'ko-KR'=> '한국어',
         'lt-LT'=>'Lithuanian',
         'lv-LV'=> 'Latvian',
         'mk-MK'=> 'Macedonian',
         'ms-MY'=> 'Malay',
         'mi-NZ'=> 'Maori',
         'mn-MN'=> 'Mongolian',
-        'no-NO'=> 'Norwegian',
+        'nb-NO'=> 'Norwegian Bokmål',
+        'om-ET' => 'Oromo (Ethiopian)',
+        //'nn-NO'=> 'Norwegian Nynorsk',
         'fa-IR'=> 'Persian',
         'pl-PL'=> 'Polish',
         'pt-PT'=> 'Portuguese',
@@ -66,7 +68,7 @@ return [
         'zu-ZA'=> 'Zulu',
     ],
 
-    'select_country' => 'Select a country',
+    'select_country' => 'Select a Country',
     
     'countries' => [
         'AC'=>'Ascension Island',
@@ -133,6 +135,7 @@ return [
         'EC'=>'Ecuador',
         'EE'=>'Estonia',
         'EG'=>'Egypt',
+        'GB-ENG'=>'England',
         'ER'=>'Eritrea',
         'ES'=>'Spain',
         'ET'=>'Ethiopia',
@@ -231,6 +234,7 @@ return [
         'NG'=>'Nigeria',
         'NI'=>'Nicaragua',
         'NL'=>'Netherlands',
+        'GB-NIR' => 'Northern Ireland',
         'NO'=>'Norway',
         'NP'=>'Nepal',
         'NR'=>'Nauru',
@@ -258,7 +262,7 @@ return [
         'RU'=>'Russian Federation',
         'RW'=>'Rwanda',
         'SA'=>'Saudi Arabia',
-        'UK'=>'Scotland',
+        'GB-SCT'=>'Scotland',
         'SB'=>'Solomon Islands',
         'SC'=>'Seychelles',
         'SS'=>'남수단',
@@ -310,6 +314,7 @@ return [
         'VI'=>'Virgin Islands (U.S.)',
         'VN'=>'Viet Nam',
         'VU'=>'Vanuatu',
+        'GB-WLS' =>'Wales',
         'WF'=>'Wallis And Futuna Islands',
         'WS'=>'Samoa',
         'YE'=>'Yemen',
diff --git a/resources/lang/ko-KR/mail.php b/resources/lang/ko-KR/mail.php
index 4b285e17f1..1b07df0a65 100644
--- a/resources/lang/ko-KR/mail.php
+++ b/resources/lang/ko-KR/mail.php
@@ -23,24 +23,25 @@ return [
     'Item_Requested' => '품목 요청',
     'License_Checkin_Notification' => '라이센스 확인 됨.',
     'License_Checkout_Notification' => 'License checked out',
+    'license_for'   => 'License for',
     'Low_Inventory_Report' => '재고 부족 보고서',
     'a_user_canceled' => '사용자가 웹사이트에서 품목 요청을 취소했습니다',
     'a_user_requested' => '사용자가 웹사이트에서 품목을 요청했습니다',
     'acceptance_asset_accepted' => 'A user has accepted an item',
     'acceptance_asset_declined' => 'A user has declined an item',
-    'accessory_name' => '액세서리 이름',
-    'additional_notes' => '추가 참고 사항:',
+    'accessory_name' => '부속품 명',
+    'additional_notes' => '추가 참고 사항',
     'admin_has_created' => ':web 웹사이트에서 관리자가 당신에게 계정을 생성했습니다.',
-    'asset' => '자산:',
-    'asset_name' => '자산명:',
+    'asset' => '자산',
+    'asset_name' => '자산 명',
     'asset_requested' => '자산 요청',
     'asset_tag' => '자산 태그',
     'assets_warrantee_alert' => 'There is :count asset with a warranty expiring in the next :threshold days.|There are :count assets with warranties expiring in the next :threshold days.',
     'assigned_to' => '할당',
     'best_regards' => '감사합니다,',
-    'canceled' => '취소됨',
-    'checkin_date' => '반입 날짜',
-    'checkout_date' => '반출 날짜',
+    'canceled' => 'Canceled',
+    'checkin_date' => '반입 일자',
+    'checkout_date' => '반출 일자',
     'checkedout_from' => 'Checked out from',
     'checkedin_from'  => 'Checked in from',
     'checked_into' => 'Checked into',
@@ -49,27 +50,30 @@ return [
     'click_to_confirm' => ':web 계정을 확인하려면 다음 링크를 클릭하세요:',
     'current_QTY' => '현재 수량',
     'days' => '일',
-    'expecting_checkin_date' => '반입 예상 일:',
+    'expecting_checkin_date' => '반입 예상 일',
     'expires' => '만료',
     'hello' => '안녕하세요',
     'hi' => '안녕하세요',
     'i_have_read' => '사용 조약을 읽고 동의 하며, 이 품목을 수령했습니다.',
     'inventory_report' => 'Inventory Report',
-    'item' => '품목:',
+    'item' => '항목',
+    'item_checked_reminder' => 'This is a reminder that you currently have :count items checked out to you that you have not accepted or declined. Please click the link below to confirm your decision.',
     'license_expiring_alert' => '다음 :threshold 일 내에 만료되는 라이선스가 :count 개 있습니다.|다음 :threshold 일 내에 만료되는 라이선스가 :count 개 있습니다.',
     'link_to_update_password' => ':web 비밀번호를 수정하려면 다음 링크를 클릭하세요:',
-    'login' => '로그인:',
+    'login' => '로그인',
     'login_first_admin' => '아래의 자격 증명을 사용하여 새 Snipe-IT 설치본에 로그인 하세요:',
     'low_inventory_alert' => '최소 보유량보다 낮거나 소진될 수 있는 품목이 :count 개 있습니다.|최소 보유량보다 낮거나 소진될 수 있는 품목이 :count 개 있습니다.',
     'min_QTY' => '최소 수량',
     'name' => '이름',
     'new_item_checked' => '당신의 이름으로 새 품목이 반출 되었습니다, 이하는 상세입니다.',
+    'new_item_checked_with_acceptance' => 'A new item has been checked out under your name that requires acceptance, details are below.',
+    'recent_item_checked' => 'An item was recently checked out under your name that requires acceptance, details are below.',
     'notes' => '주석',
-    'password' => '비밀번호:',
+    'password' => '비밀번호',
     'password_reset' => '비밀번호 재설정',
     'read_the_terms' => '아래의 이용 약관을 읽어 보시기 바랍니다.',
     'read_the_terms_and_click' => 'Please read the terms of use below, and click on the link at the bottom to confirm that you read and agree to the terms of use, and have received the asset.',
-    'requested' => '요청됨:',
+    'requested' => '요청됨',
     'reset_link' => '비밀번호 재설정 링크',
     'reset_password' => '이곳을 눌러 비밀번호를 재설정:',
     'rights_reserved' => 'All rights reserved.',
@@ -86,8 +90,10 @@ return [
     'upcoming-audits' => 'There is :count asset that is coming up for audit within :threshold days.|There are :count assets that are coming up for audit within :threshold days.',
     'user' => '사용자',
     'username' => '사용자명',
+    'unaccepted_asset_reminder' => 'Reminder: You have Unaccepted Assets.',
     'welcome' => '환영합니다 :name',
     'welcome_to' => '환영합니다 :web!',
     'your_assets' => '자산 확인',
     'your_credentials' => '당신의 Snipe-IT 인증들',
+    'mail_sent' => 'Mail sent successfully!',
 ];
diff --git a/resources/lang/ko-KR/validation.php b/resources/lang/ko-KR/validation.php
index edd447f250..96be36abe5 100644
--- a/resources/lang/ko-KR/validation.php
+++ b/resources/lang/ko-KR/validation.php
@@ -13,87 +13,150 @@ return [
     |
     */
 
-    'accepted'             => ':attribute 가 수락되었습니다.',
-    'active_url'           => ':attribute 는 잘못된 URL 입니다.',
-    'after'                => ':attribute 는 :date 뒤에 오는 날짜 형식이어야 합니다.',
-    'after_or_equal'       => ':attribute 는 :date 이후거나 같아야 합니다.',
-    'alpha'                => ':attribute 는 문자만 포함해야 합니다.',
-    'alpha_dash'           => ':attribute는 문자, 숫자, 대쉬기호만 포함 할 수 있습니다.',
-    'alpha_num'            => ':attribute 는 문자와 숫자만 포함할 수 있습니다.',
-    'array'                => ':attribute는 배열이어야 합니다.',
-    'before'               => ':attribute 는 :date 앞의 날짜 형식이 되야 합니다.',
-    'before_or_equal'      => ':attribute 는 :date 이전이거나 같아야 합니다.',
-    'between'              => [
-        'numeric' => ':attribute 는 :min - :max 사이의 값입니다.',
-        'file'    => ':attribute 는 :min - :max Kbyte 사이의 값입니다.',
-        'string'  => ':attribute 는 :min - :max 자 사이의 문자입니다.',
-        'array'   => ':attribute 는 :min - :max 품목 사이여야 합니다.',
+    'accepted' => 'The :attribute field must be accepted.',
+    'accepted_if' => 'The :attribute field must be accepted when :other is :value.',
+    'active_url' => 'The :attribute field must be a valid URL.',
+    'after' => 'The :attribute field must be a date after :date.',
+    'after_or_equal' => 'The :attribute field must be a date after or equal to :date.',
+    'alpha' => 'The :attribute field must only contain letters.',
+    'alpha_dash' => 'The :attribute field must only contain letters, numbers, dashes, and underscores.',
+    'alpha_num' => 'The :attribute field must only contain letters and numbers.',
+    'array' => 'The :attribute field must be an array.',
+    'ascii' => 'The :attribute field must only contain single-byte alphanumeric characters and symbols.',
+    'before' => 'The :attribute field must be a date before :date.',
+    'before_or_equal' => 'The :attribute field must be a date before or equal to :date.',
+    'between' => [
+        'array' => 'The :attribute field must have between :min and :max items.',
+        'file' => 'The :attribute field must be between :min and :max kilobytes.',
+        'numeric' => 'The :attribute field must be between :min and :max.',
+        'string' => 'The :attribute field must be between :min and :max characters.',
     ],
-    'boolean'              => ':attribute 는 참 또는 거짓의 속성만 지정 가능합니다.',
-    'confirmed'            => ':attribute 확인이 일치 하지 않습니다.',
-    'date'                 => ':attribute 는 잘못된 날짜 입니다.',
-    'date_format'          => ':attribute 는 :format 형식과 일치하지 않습니다.',
-    'different'            => ':attribute 와 :other 는 서로 달라야 합니다.',
-    'digits'               => ':attribute 는 :digits 자리수여야 합니다.',
-    'digits_between'       => ':attribute 는 :min - :max 자릿수 사이여야 합니다.',
-    'dimensions'           => ':attribute에 잘못된 이미지 크기가 있습니다.',
-    'distinct'             => ':attribute 항목은 중복된 값입니다.',
-    'email'                => ':attribute 형식이 부정확 합니다.',
-    'exists'               => '선택한 :attribute 가 부정확 합니다.',
-    'file'                 => ':attribute는 파일이어야 합니다.',
-    'filled'               => ':attribute 항목은 값이 있어야 합니다.',
-    'image'                => ':attribute 는 이미지 형식만 가능합니다.',
+    'boolean' => 'The :attribute field must be true or false.',
+    'can' => 'The :attribute field contains an unauthorized value.',
+    'confirmed' => 'The :attribute field confirmation does not match.',
+    'contains' => 'The :attribute field is missing a required value.',
+    'current_password' => 'The password is incorrect.',
+    'date' => 'The :attribute field must be a valid date.',
+    'date_equals' => 'The :attribute field must be a date equal to :date.',
+    'date_format' => 'The :attribute field must match the format :format.',
+    'decimal' => 'The :attribute field must have :decimal decimal places.',
+    'declined' => 'The :attribute field must be declined.',
+    'declined_if' => 'The :attribute field must be declined when :other is :value.',
+    'different' => 'The :attribute field and :other must be different.',
+    'digits' => 'The :attribute field must be :digits digits.',
+    'digits_between' => 'The :attribute field must be between :min and :max digits.',
+    'dimensions' => 'The :attribute field has invalid image dimensions.',
+    'distinct' => ':attribute 항목은 중복된 값입니다.',
+    'doesnt_end_with' => 'The :attribute field must not end with one of the following: :values.',
+    'doesnt_start_with' => 'The :attribute field must not start with one of the following: :values.',
+    'email' => 'The :attribute field must be a valid email address.',
+    'ends_with' => 'The :attribute field must end with one of the following: :values.',
+    'enum' => '선택한 :attribute 가 부정확 합니다.',
+    'exists' => '선택한 :attribute 가 부정확 합니다.',
+    'extensions' => 'The :attribute field must have one of the following extensions: :values.',
+    'file' => 'The :attribute field must be a file.',
+    'filled' => ':attribute 항목은 값이 있어야 합니다.',
+    'gt' => [
+        'array' => 'The :attribute field must have more than :value items.',
+        'file' => 'The :attribute field must be greater than :value kilobytes.',
+        'numeric' => 'The :attribute field must be greater than :value.',
+        'string' => 'The :attribute field must be greater than :value characters.',
+    ],
+    'gte' => [
+        'array' => 'The :attribute field must have :value items or more.',
+        'file' => 'The :attribute field must be greater than or equal to :value kilobytes.',
+        'numeric' => 'The :attribute field must be greater than or equal to :value.',
+        'string' => 'The :attribute field must be greater than or equal to :value characters.',
+    ],
+    'hex_color' => 'The :attribute field must be a valid hexadecimal color.',
+    'image' => 'The :attribute field must be an image.',
     'import_field_empty'    => 'The value for :fieldname cannot be null.',
-    'in'                   => '선택한 :attribute 가 부정확 합니다.',
-    'in_array'             => ':attribute항목이 :other에 없습니다.',
-    'integer'              => ':attribute 는 정수이어야 합니다.',
-    'ip'                   => ':attribute 는 유효한 IP 주소이어야 합니다.',
-    'ipv4'                 => ':attribute는 유효한 IPv4 주소여야 합니다.',
-    'ipv6'                 => ':attribute는 유효한 IPv6 주소여야 합니다.',
-    'is_unique_department' => 'The :attribute must be unique to this Company Location',
-    'json'                 => ':attribute는 유효한 JSON 문자값이어야 합니다.',
-    'max'                  => [
-        'numeric' => ':attribute 는 :max 보다 작아야 합니다.',
-        'file'    => ':attribute 는 :max Kbyte보다 작아야 합니다.',
-        'string'  => ':attribute 는 :max 자보다 작아야 합니다.',
-        'array'   => ':attribute는 :max 항목보다 작어야 합니다.',
+    'in' => '선택한 :attribute 가 부정확 합니다.',
+    'in_array' => 'The :attribute field must exist in :other.',
+    'integer' => 'The :attribute field must be an integer.',
+    'ip' => 'The :attribute field must be a valid IP address.',
+    'ipv4' => 'The :attribute field must be a valid IPv4 address.',
+    'ipv6' => 'The :attribute field must be a valid IPv6 address.',
+    'json' => 'The :attribute field must be a valid JSON string.',
+    'list' => 'The :attribute field must be a list.',
+    'lowercase' => 'The :attribute field must be lowercase.',
+    'lt' => [
+        'array' => 'The :attribute field must have less than :value items.',
+        'file' => 'The :attribute field must be less than :value kilobytes.',
+        'numeric' => 'The :attribute field must be less than :value.',
+        'string' => 'The :attribute field must be less than :value characters.',
     ],
-    'mimes'                => ':attribute 는 :values 형식의 파일만 가능합니다.',
-    'mimetypes'            => ':attribute 는 :values 형식의 파일만 가능합니다.',
-    'min'                  => [
-        'numeric' => ':attribute 는 최소 :min 이어야 합니다.',
-        'file'    => ':attribute 는 최소 :min Kbyte 이어야 합니다.',
-        'string'  => ':attribute 는 최소 :min 자 이어야 합니다.',
-        'array'   => ':attribute는 최소 :min 항목이어야 합니다.',
+    'lte' => [
+        'array' => 'The :attribute field must not have more than :value items.',
+        'file' => 'The :attribute field must be less than or equal to :value kilobytes.',
+        'numeric' => 'The :attribute field must be less than or equal to :value.',
+        'string' => 'The :attribute field must be less than or equal to :value characters.',
     ],
-    'starts_with'          => 'The :attribute must start with one of the following: :values.',
-    'ends_with'            => 'The :attribute must end with one of the following: :values.',
+    'mac_address' => 'The :attribute field must be a valid MAC address.',
+    'max' => [
+        'array' => 'The :attribute field must not have more than :max items.',
+        'file' => 'The :attribute field must not be greater than :max kilobytes.',
+        'numeric' => 'The :attribute field must not be greater than :max.',
+        'string' => 'The :attribute field must not be greater than :max characters.',
+    ],
+    'max_digits' => 'The :attribute field must not have more than :max digits.',
+    'mimes' => 'The :attribute field must be a file of type: :values.',
+    'mimetypes' => 'The :attribute field must be a file of type: :values.',
+    'min' => [
+        'array' => 'The :attribute field must have at least :min items.',
+        'file' => 'The :attribute field must be at least :min kilobytes.',
+        'numeric' => 'The :attribute field must be at least :min.',
+        'string' => 'The :attribute field must be at least :min characters.',
+    ],
+    'min_digits' => 'The :attribute field must have at least :min digits.',
+    'missing' => 'The :attribute field must be missing.',
+    'missing_if' => 'The :attribute field must be missing when :other is :value.',
+    'missing_unless' => 'The :attribute field must be missing unless :other is :value.',
+    'missing_with' => 'The :attribute field must be missing when :values is present.',
+    'missing_with_all' => 'The :attribute field must be missing when :values are present.',
+    'multiple_of' => 'The :attribute field must be a multiple of :value.',
+    'not_in' => '선택한 :attribute 가 부정확 합니다.',
+    'not_regex' => 'The :attribute field format is invalid.',
+    'numeric' => 'The :attribute field must be a number.',
+    'password' => [
+        'letters' => 'The :attribute field must contain at least one letter.',
+        'mixed' => 'The :attribute field must contain at least one uppercase and one lowercase letter.',
+        'numbers' => 'The :attribute field must contain at least one number.',
+        'symbols' => 'The :attribute field must contain at least one symbol.',
+        'uncompromised' => 'The given :attribute has appeared in a data leak. Please choose a different :attribute.',
+    ],
+    'percent'       => 'The depreciation minimum must be between 0 and 100 when depreciation type is percentage.',
 
-    'not_in'               => '선택한 :attribute 가 부정확 합니다.',
-    'numeric'              => ':attribute 는 숫자만 가능합니다.',
-    'present'              => ':attribute 항목이 있어야 합니다.',
-    'valid_regex'          => '그것은 유효한 정규 표현식이 아닙니다. ',
-    'regex'                => ':attribute 형식이 부정확 합니다.',
-    'required'             => ':attribute 항목을 입력해 주세요.',
-    'required_if'          => ':attribute 항목은 :other가 :value 일때 필요합니다.',
-    'required_unless'      => ':values에 :other가 있는 경우 : attribute 항목은 필요하지 않습니다.',
-    'required_with'        => ':attribute 항목은 :values 가 존재할 때 필요합니다.',
-    'required_with_all'    => ':attribute 항목은 :values가 있을 때 필요합니다.',
-    'required_without'     => ':attribute 항목은 :values 가 존재하지 않을 때 필요합니다.',
+    'present' => ':attribute 항목이 있어야 합니다.',
+    'present_if' => 'The :attribute field must be present when :other is :value.',
+    'present_unless' => 'The :attribute field must be present unless :other is :value.',
+    'present_with' => 'The :attribute field must be present when :values is present.',
+    'present_with_all' => 'The :attribute field must be present when :values are present.',
+    'prohibited' => 'The :attribute field is prohibited.',
+    'prohibited_if' => 'The :attribute field is prohibited when :other is :value.',
+    'prohibited_unless' => 'The :attribute field is prohibited unless :other is in :values.',
+    'prohibits' => 'The :attribute field prohibits :other from being present.',
+    'regex' => 'The :attribute field format is invalid.',
+    'required' => ':attribute 항목을 입력해 주세요.',
+    'required_array_keys' => 'The :attribute field must contain entries for: :values.',
+    'required_if' => ':attribute 항목은 :other가 :value 일때 필요합니다.',
+    'required_if_accepted' => 'The :attribute field is required when :other is accepted.',
+    'required_if_declined' => 'The :attribute field is required when :other is declined.',
+    'required_unless' => ':values에 :other가 있는 경우 : attribute 항목은 필요하지 않습니다.',
+    'required_with' => ':attribute 항목은 :values 가 존재할 때 필요합니다.',
+    'required_with_all' => 'The :attribute field is required when :values are present.',
+    'required_without' => ':attribute 항목은 :values 가 존재하지 않을 때 필요합니다.',
     'required_without_all' => ':attribute 항목은 :values 가 전혀 없다면 필수입니다.',
-    'same'                 => ':attribute 와 :other 는 일치해야 합니다.',
-    'size'                 => [
-        'numeric' => ':attribute 는 :size 가 되야 합니다.',
-        'file'    => ':attribute 는 :size Kbyte 가 되야 합니다.',
-        'string'  => ':attribute 는 :size 자가 되야 합니다.',
-        'array'   => ':attribute 는 :size 품목에 포함되야 합니다.',
+    'same' => 'The :attribute field must match :other.',
+    'size' => [
+        'array' => 'The :attribute field must contain :size items.',
+        'file' => 'The :attribute field must be :size kilobytes.',
+        'numeric' => 'The :attribute field must be :size.',
+        'string' => 'The :attribute field must be :size characters.',
     ],
+    'starts_with' => 'The :attribute field must start with one of the following: :values.',
     'string'               => ':attribute는 글자여야 합니다.',
-    'timezone'             => ':attribute는 유효한 지역이어야 합니다.',
     'two_column_unique_undeleted' => 'The :attribute must be unique across :table1 and :table2. ',
-    'unique'               => ':attribute 는 이미 획득하였습니다.',
-    'uploaded'             => ':attribute는 업로드 하지 못했습니다.',
-    'url'                  => ':attribute 형식이 부정확 합니다.',
     'unique_undeleted'     => ':attribute 는 고유의 값만 가져야 합니다.',
     'non_circular'         => 'The :attribute must not create a circular reference.',
     'not_array'            => ':attribute cannot be an array.',
@@ -102,11 +165,14 @@ return [
     'numbers'              => 'Password must contain at least one number.',
     'case_diff'            => 'Password must use mixed case.',
     'symbols'              => 'Password must contain symbols.',
-    'gte'                  => [
-        'numeric'          => 'Value cannot be negative'
-    ],
-    'checkboxes'           => ':attribute contains invalid options.',
-    'radio_buttons'        => ':attribute is invalid.',
+    'timezone' => 'The :attribute field must be a valid timezone.',
+    'unique' => ':attribute 는 이미 획득하였습니다.',
+    'uploaded' => ':attribute는 업로드 하지 못했습니다.',
+    'uppercase' => 'The :attribute field must be uppercase.',
+    'url' => 'The :attribute field must be a valid URL.',
+    'ulid' => 'The :attribute field must be a valid ULID.',
+    'uuid' => 'The :attribute field must be a valid UUID.',
+    'fmcs_location' => 'Full multiple company support and location scoping is enabled in the Admin Settings, and the selected location and selected company are not compatible.',
 
 
     /*
@@ -120,16 +186,22 @@ return [
     |
     */
 
+    'email_array'      => '하나 이상의 이메일 주소가 유효하지 않습니다.',
+    'checkboxes'           => ':attribute contains invalid options.',
+    'radio_buttons'        => ':attribute is invalid.',
+    
     'custom' => [
         'alpha_space' => ':attribute 항목에는 문자를 입력할 수 없습니다.',
-        'email_array'      => '하나 이상의 이메일 주소가 유효하지 않습니다.',
+
         'hashed_pass'      => '현재 비밀번호가 잘못되었습니다.',
         'dumbpwd'          => '그 비밀번호는 너무 일반적입니다.',
         'statuslabel_type' => '유효한 상태 라벨 형식을 선택해 주셔야 합니다',
+        'custom_field_not_found'          => 'This field does not seem to exist, please double check your custom field names.',
+        'custom_field_not_found_on_model' => 'This field seems to exist, but is not available on this Asset Model\'s fieldset.',
 
         // date_format validation with slightly less stupid messages. It duplicates a lot, but it gets the job done :(
-        // We use this because the default error message for date_format is reflects php Y-m-d, which non-PHP
-        // people won't know how to format. 
+        // We use this because the default error message for date_format reflects php Y-m-d, which non-PHP
+        // people won't know how to format.
         'purchase_date.date_format'     => 'The :attribute must be a valid date in YYYY-MM-DD format',
         'last_audit_date.date_format'   =>  'The :attribute must be a valid date in YYYY-MM-DD hh:mm:ss format',
         'expiration_date.date_format'   =>  'The :attribute must be a valid date in YYYY-MM-DD format',
@@ -137,9 +209,15 @@ return [
         'expected_checkin.date_format'  =>  'The :attribute must be a valid date in YYYY-MM-DD format',
         'start_date.date_format'        =>  'The :attribute must be a valid date in YYYY-MM-DD format',
         'end_date.date_format'          =>  'The :attribute must be a valid date in YYYY-MM-DD format',
+        'invalid_value_in_field' => 'Invalid value included in this field',
 
-    ],
+        'ldap_username_field' => [
+            'not_in' =>         '<code>sAMAccountName</code> (mixed case) will likely not work. You should use <code>samaccountname</code> (lowercase) instead.'
+        ],
+        'ldap_auth_filter_query' => ['not_in' => '<code>uid=samaccountname</code> is probably not a valid auth filter. You probably want <code>uid=</code> '],
+        'ldap_filter' => ['regex' => 'This value should probably not be wrapped in parentheses.'],
 
+        ],
     /*
     |--------------------------------------------------------------------------
     | Custom Validation Attributes
@@ -155,8 +233,16 @@ return [
 
     /*
     |--------------------------------------------------------------------------
-    | Generic Validation Messages
+    | Generic Validation Messages - we use these in the jquery validation where we don't have
+    | access to the :attribute
     |--------------------------------------------------------------------------
     */
-    'invalid_value_in_field' => 'Invalid value included in this field',
+
+    'generic' => [
+        'invalid_value_in_field' => 'Invalid value included in this field',
+        'required' => 'This field is required',
+        'email' => 'Please enter a valid email address',
+    ],
+
+
 ];
diff --git a/resources/lang/lt-LT/account/general.php b/resources/lang/lt-LT/account/general.php
index 6ec3ef8009..3fbab69ee7 100644
--- a/resources/lang/lt-LT/account/general.php
+++ b/resources/lang/lt-LT/account/general.php
@@ -2,10 +2,16 @@
 
 return array(
     'personal_api_keys' => 'Asmeniniai API raktai',
+    'personal_access_token' => 'Asmeninis prieigos raktas',
+    'personal_api_keys_success' => 'Asmeninis API raktas :key sėkmingai sukurtas',
+    'here_is_api_key' => 'Čia yra jūsų naujas asmeninis prieigos raktas. Tai vienintelis kartas, kada jis yra rodomas, todėl nepraraskite jo! Nuo šiol šį raktą galite naudoti API užklausoms teikti.',
     'api_key_warning' => 'Generuodami API prieigos raktą būtinai jį išsisaugokite, nes vėliau jis nebebus matomas.',
     'api_base_url' => 'Jūsų API bazinė nuoroda yra:',
     'api_base_url_endpoint' => '/&lt;endpoint&gt;',
     'api_token_expiration_time' => 'API prieigos raktai nustos galioti:',
     'api_reference' => 'Peržiūrėkite <a href="https://snipe-it.readme.io/reference" target="_blank">API informaciją</a>, kad rastumėte konkrečius API galinius taškus ir papildomą API dokumentaciją.',
     'profile_updated' => 'Paskyra atnaujinta sėkmingai',
+    'no_tokens' => 'Nesate sukūrę jokių asmeninių prieigos raktų.',
+    'enable_sounds' => 'Įjungti garso efektus',
+    'enable_confetti' => 'Įgalinti konfeti efektus',
 );
diff --git a/resources/lang/lt-LT/admin/accessories/general.php b/resources/lang/lt-LT/admin/accessories/general.php
index f208fb2c1d..8451fe88dc 100644
--- a/resources/lang/lt-LT/admin/accessories/general.php
+++ b/resources/lang/lt-LT/admin/accessories/general.php
@@ -8,8 +8,8 @@ return array(
     'create'  							=> 'Sukurti priedą',
     'edit'  							=> 'Redaguoti priedą',
     'eula_text'							=> 'Kategorijos licencinis sutikimas (EULA)',
-    'eula_text_help'					=> 'Šis laukas leidžia pritaikyti licencinius sutikimus (EULA) skirtingoms įrangos grupėms. Jei jūs turite vieną EULA visai įrangai, tuomet galite pažymėti žemiau esantį langelį, kad visuomet būtų naudojamas pirminis numatytasis.',
-    'require_acceptance'				=> 'Reikalauti, kad naudotojai patvirtintų šios kategorijos įrangos gavimą.',
+    'eula_text_help'					=> 'Šis laukas leidžia pritaikyti licencinius sutikimus (EULA) skirtingoms turto grupėms. Jei jūs turite vieną EULA visam turtui, tuomet galite pažymėti žemiau esantį langelį, kad visuomet būtų naudojamas pirminis numatytasis.',
+    'require_acceptance'				=> 'Reikalauti, kad naudotojai patvirtintų šios kategorijos turto gavimą.',
     'no_default_eula'					=> 'Nerastas pirminis numatytasis licencinis sutikimas (EULA). Pridėkite jį nustatymuose.',
     'total'  							=> 'Iš viso',
     'remaining'  						=> 'Laisva',
diff --git a/resources/lang/lt-LT/admin/accessories/message.php b/resources/lang/lt-LT/admin/accessories/message.php
index 41afaedb15..3ca3df6450 100644
--- a/resources/lang/lt-LT/admin/accessories/message.php
+++ b/resources/lang/lt-LT/admin/accessories/message.php
@@ -26,7 +26,11 @@ return array(
         'error'   		=> 'Priedo nepavyko išduoti, bandykite dar kartą',
         'success' 		=> 'Priedas išduotas sėkmingai.',
         'unavailable'   => 'Priedo išduoti negalima. Patikrinkite likutį',
-        'user_does_not_exist' => 'Neteisingas naudotojas. Bandykite dar kartą.'
+        'user_does_not_exist' => 'Neteisingas naudotojas. Bandykite dar kartą.',
+         'checkout_qty' => array(
+            'lte'  => 'Šiuo metu yra tik vienas šio tipo priedas, o jūs bandote išduoti :checkout_qty. Pakoreguokite išduodamą arba bendrą šio priedo atsargų kiekį ir bandykite dar kartą.|Yra :number_currently_remaining šio priedo vienetai (-ų), o jūs bandote išduoti :checkout_qty. Pakoreguokite išduodamą arba bendrą šio priedo atsargų kiekį ir bandykite dar kartą.',
+            ),
+           
     ),
 
     'checkin' => array(
diff --git a/resources/lang/lt-LT/admin/accessories/table.php b/resources/lang/lt-LT/admin/accessories/table.php
index b301ac2566..6e692cbeff 100644
--- a/resources/lang/lt-LT/admin/accessories/table.php
+++ b/resources/lang/lt-LT/admin/accessories/table.php
@@ -6,6 +6,4 @@ return array(
     'id'      					=> 'ID',
     'require_acceptance'      	=> 'Sutikimas',
     'title'      				=> 'Priedo pavadinimas',
-
-
 );
diff --git a/resources/lang/lt-LT/admin/asset_maintenances/form.php b/resources/lang/lt-LT/admin/asset_maintenances/form.php
index f9037a3a39..e2e8483f96 100644
--- a/resources/lang/lt-LT/admin/asset_maintenances/form.php
+++ b/resources/lang/lt-LT/admin/asset_maintenances/form.php
@@ -1,14 +1,14 @@
 <?php
 
     return [
-        'asset_maintenance_type' => 'Įrangos aptarnavimo tipas',
+        'asset_maintenance_type' => 'Turto aptarnavimo tipas',
         'title'                  => 'Antraštė',
         'start_date'             => 'Pradžios data',
         'completion_date'        => 'Pabaigos data',
         'cost'                   => 'Kaina',
         'is_warranty'            => 'Išplėstinė garantija',
-        'asset_maintenance_time' => 'Įrangos aptarnavimo trukmė (dienomis)',
+        'asset_maintenance_time' => 'Turto aptarnavimo trukmė (dienomis)',
         'notes'                  => 'Pastabos',
-        'update'                 => 'Atnaujinti įrangos aptarnavimo informaciją',
-        'create'                 => 'Registruoti įrangos aptarnavimą'
+        'update'                 => 'Atnaujinti turto aptarnavimo informaciją',
+        'create'                 => 'Registruoti turto aptarnavimą'
     ];
diff --git a/resources/lang/lt-LT/admin/asset_maintenances/general.php b/resources/lang/lt-LT/admin/asset_maintenances/general.php
index edc8efe0ec..9e0eba4da9 100644
--- a/resources/lang/lt-LT/admin/asset_maintenances/general.php
+++ b/resources/lang/lt-LT/admin/asset_maintenances/general.php
@@ -1,10 +1,10 @@
 <?php
 
     return [
-        'asset_maintenances' => 'Įrangos aptarnavimas',
-        'edit'               => 'Redaguoti įrangos aptarnavimą',
-        'delete'             => 'Panaikinti įrangos aptarnavimą',
-        'view'               => 'Peržiūrėti įrangos aptarnavimo informaciją',
+        'asset_maintenances' => 'Turto aptarnavimas',
+        'edit'               => 'Redaguoti turto aptarnavimą',
+        'delete'             => 'Panaikinti turto aptarnavimą',
+        'view'               => 'Peržiūrėti turto aptarnavimo informaciją',
         'repair'             => 'Remontas',
         'maintenance'        => 'Aptarnavimas',
         'upgrade'            => 'Pagerinimas',
diff --git a/resources/lang/lt-LT/admin/asset_maintenances/message.php b/resources/lang/lt-LT/admin/asset_maintenances/message.php
index 2b28b99f28..7971ac90c1 100644
--- a/resources/lang/lt-LT/admin/asset_maintenances/message.php
+++ b/resources/lang/lt-LT/admin/asset_maintenances/message.php
@@ -1,19 +1,19 @@
 <?php
 
     return [
-        'not_found'                    => 'Jūsų ieškomas įrangos aptarnavimas nebuvo rastas!',
+        'not_found'                    => 'Jūsų ieškomas turto aptarnavimas nebuvo rastas!',
         'delete'                       => [
-            'confirm' => 'Ar tikrai norite panaikinti šį įrangos aptarnavimą?',
-            'error'   => 'Bandant panaikinti įrangos aptarnavimą įvyko klaida. Bandykite dar kartą.',
-            'success' => 'Įrangos aptarnavimas panaikintas sėkmingai.',
+            'confirm' => 'Ar tikrai norite panaikinti šį turto aptarnavimą?',
+            'error'   => 'Bandant panaikinti turto aptarnavimą įvyko klaida. Bandykite dar kartą.',
+            'success' => 'Turto aptarnavimas panaikintas sėkmingai.',
         ],
         'create'                       => [
-            'error'   => 'Įrangos aptarnavimas nebuvo sukurtas, bandykite dar kartą.',
-            'success' => 'Įrangos aptarnavimas sukurtas sėkmingai.',
+            'error'   => 'Turto aptarnavimas nebuvo sukurtas, bandykite dar kartą.',
+            'success' => 'Turto aptarnavimas sukurtas sėkmingai.',
         ],
         'edit'                       => [
-            'error'   => 'Įrangos aptarnavimas nebuvo pakeistas, bandykite dar kartą.',
-            'success' => 'Įrangos aptarnavimas redaguotas sėkmingai.',
+            'error'   => 'Turto aptarnavimas nebuvo pakeistas, bandykite dar kartą.',
+            'success' => 'Turto aptarnavimas redaguotas sėkmingai.',
         ],
         'asset_maintenance_incomplete' => 'Nebaigta',
         'warranty'                     => 'Garantinis',
diff --git a/resources/lang/lt-LT/admin/asset_maintenances/table.php b/resources/lang/lt-LT/admin/asset_maintenances/table.php
index 00190729ab..244411cee5 100644
--- a/resources/lang/lt-LT/admin/asset_maintenances/table.php
+++ b/resources/lang/lt-LT/admin/asset_maintenances/table.php
@@ -1,8 +1,8 @@
 <?php
 
     return [
-        'title'         => 'Įrangos aptarnavimas',
-        'asset_name'    => 'Įrangos pavadinimas',
+        'title'         => 'Turto aptarnavimas',
+        'asset_name'    => 'Turto pavadinimas',
         'is_warranty'   => 'Garantija',
         'dl_csv'        => 'Atsisiųsti CSV',
     ];
diff --git a/resources/lang/lt-LT/admin/categories/general.php b/resources/lang/lt-LT/admin/categories/general.php
index ad58f44a3e..6f0eccbddc 100644
--- a/resources/lang/lt-LT/admin/categories/general.php
+++ b/resources/lang/lt-LT/admin/categories/general.php
@@ -1,7 +1,7 @@
 <?php
 
 return array(
-    'asset_categories' 					=> 'Įrangos kategorijos',
+    'asset_categories' 					=> 'Turto kategorijos',
     'category_name'  					=> 'Kategorijos pavadinimas',
     'checkin_email'                     => 'Siųsti el. laišką naudotojui, paimant/išduodant turtą.',
     'checkin_email_notification'        => 'Šis naudotojas gaus el. laišką, paimant/išduodant turtą.',
@@ -11,9 +11,9 @@ return array(
     'email_will_be_sent_due_to_global_eula' => 'Naudotojui bus išsiųstas el. laiškas, nes yra naudojamas visuotinis licencinis sutikimas (EULA).',
     'email_will_be_sent_due_to_category_eula' => 'Naudotojui bus išsiųstas el. laiškas, nes šiai kategorijai nustatytas licencinis sutikimas (EULA).',
     'eula_text'							=> 'Kategorijos licencinis sutikimas (EULA)',
-    'eula_text_help'					=> 'Šis laukas leidžia pritaikyti licencinį sutikimą (EULA) atskiroms įrangos grupėms. Jei jūs naudojate vieną EULA visoms įrangos grupėms, tuomet pažymėkite žemiau esantį langelį, kad būtų naudojamas pirminis numatytasis EULA.',
+    'eula_text_help'					=> 'Šis laukas leidžia pritaikyti licencinį sutikimą (EULA) atskiroms turto grupėms. Jei jūs naudojate vieną EULA visoms turto grupėms, tuomet pažymėkite žemiau esantį langelį, kad būtų naudojamas pirminis numatytasis EULA.',
     'name'                              => 'Kategorijos pavadinimas',
-    'require_acceptance'				=> 'Reikalauti, kad naudotojai patvirtintų šios kategorijos įrangos gavimą.',
+    'require_acceptance'				=> 'Reikalauti, kad naudotojai patvirtintų šios kategorijos turto gavimą.',
     'required_acceptance'				=> 'Šiam naudotojui bus išsiųstas el. laiškas su nuoroda šio elemento gavimo patvirtinimui.',
     'required_eula'						=> 'Šiam naudotojui bus išsiųsta licencinio sutikimo (EULA) kopija',
     'no_default_eula'					=> 'Nerastas pirminis numatytasis licencinis sutikimas (EULA). Pridėkite jį nustatymuose.',
diff --git a/resources/lang/lt-LT/admin/categories/table.php b/resources/lang/lt-LT/admin/categories/table.php
index 49b5cd36e3..acf91cd841 100644
--- a/resources/lang/lt-LT/admin/categories/table.php
+++ b/resources/lang/lt-LT/admin/categories/table.php
@@ -5,6 +5,6 @@ return array(
     'id'      					=> 'ID',
     'parent'   					=> 'Pagrindinė',
     'require_acceptance'      	=> 'Sutikimas',
-    'title'      				=> 'Įrangos kategorijos pavadinimas',
+    'title'      				=> 'Turto kategorijos pavadinimas',
 
 );
diff --git a/resources/lang/lt-LT/admin/companies/general.php b/resources/lang/lt-LT/admin/companies/general.php
index efe68dc94e..ce9eca1576 100644
--- a/resources/lang/lt-LT/admin/companies/general.php
+++ b/resources/lang/lt-LT/admin/companies/general.php
@@ -3,5 +3,5 @@
 return [
     'select_company' => 'Pasirinkite įmonę',
     'about_companies' => 'Apie įmones',
-    'about_companies_description' => '        Galite naudoti įmones kaip paprastą informacinį lauką arba norėdami apriboti įrenginių matomumą ir prieinamumą konkrečios įmonės naudotojams, Administratoriaus nustatymuose įjungę „Pilną kelių įmonių palaikymą“.',
+    'about_companies_description' => '        Galite naudoti įmones kaip paprastą informacinį lauką arba norėdami apriboti turto matomumą ir prieinamumą konkrečios įmonės naudotojams, Administratoriaus nustatymuose įjungę „Pilną kelių įmonių palaikymą“.',
 ];
diff --git a/resources/lang/lt-LT/admin/components/general.php b/resources/lang/lt-LT/admin/components/general.php
index 560389a85b..b97e67632a 100644
--- a/resources/lang/lt-LT/admin/components/general.php
+++ b/resources/lang/lt-LT/admin/components/general.php
@@ -4,10 +4,10 @@ return array(
     'component_name'                  => 'Komponento pavadinimas',
     'checkin'                             => 'Paimti komponentą',
     'checkout'                             => 'Išduoti komponentą',
-    'cost'				=> 'Pirkimo kaina',
+    'cost'				=> 'Įsigijimo kaina',
     'create'                             => 'Sukurti komponentą',
     'edit'                             => 'Redaguoti komponentą',
-    'date'					=> 'Pirkimo data',
+    'date'					=> 'Įsigijimo data',
     'order'					=> 'Užsakymo numeris',
     'remaining' 			             => 'Likutis',
     'total' 			                 => 'Iš viso',
diff --git a/resources/lang/lt-LT/admin/components/message.php b/resources/lang/lt-LT/admin/components/message.php
index 11125033c5..687fe11451 100644
--- a/resources/lang/lt-LT/admin/components/message.php
+++ b/resources/lang/lt-LT/admin/components/message.php
@@ -17,7 +17,8 @@ return array(
     'delete' => array(
         'confirm'   => 'Ar tikrai norite panaikinti šį komponentą?',
         'error'   => 'Bandant panaikinti komponentą įvyko klaida. Bandykite dar kartą.',
-        'success' => 'Komponentas panaikintas sėkmingai.'
+        'success' => 'Komponentas panaikintas sėkmingai.',
+        'error_qty'   => 'Kai kurie šio tipo komponentai vis dar yra išduoti. Paimkite juos ir bandykite dar kartą.',
     ),
 
      'checkout' => array(
diff --git a/resources/lang/lt-LT/admin/consumables/general.php b/resources/lang/lt-LT/admin/consumables/general.php
index d90754d056..a20245714a 100644
--- a/resources/lang/lt-LT/admin/consumables/general.php
+++ b/resources/lang/lt-LT/admin/consumables/general.php
@@ -4,8 +4,9 @@ return array(
     'checkout'                          => 'Išduoti eksploatacines medžiagas naudotojui',
     'consumable_name'                   => 'Eksploatacinės medžiagos pavadinimas',
     'create'                            => 'Sukurti eksploatacinę medžiagą',
-    'item_no'                           => 'Elemento Nr.',
+    'item_no'                           => 'Daikto Nr.',
     'remaining' 			            => 'Likutis',
     'total' 			                => 'Iš viso',
     'update'                            => 'Atnaujinti eksploatacinę medžiagą',
+    'inventory_warning'                 => 'Šių eksploatacinių medžiagų atsargos yra mažesnės už minimalų kiekį :min_count',
 );
diff --git a/resources/lang/lt-LT/admin/consumables/message.php b/resources/lang/lt-LT/admin/consumables/message.php
index 9eb01c25e0..ce694f402b 100644
--- a/resources/lang/lt-LT/admin/consumables/message.php
+++ b/resources/lang/lt-LT/admin/consumables/message.php
@@ -2,6 +2,7 @@
 
 return array(
 
+    'invalid_category_type' => 'Kategorija turi būti eksploatacinių medžiagų kategorija.',
     'does_not_exist' => 'Tokios eksploatacinės medžiagos nėra.',
 
     'create' => array(
diff --git a/resources/lang/lt-LT/admin/custom_fields/general.php b/resources/lang/lt-LT/admin/custom_fields/general.php
index cc7e7ed470..837df378a2 100644
--- a/resources/lang/lt-LT/admin/custom_fields/general.php
+++ b/resources/lang/lt-LT/admin/custom_fields/general.php
@@ -5,7 +5,7 @@ return [
     'manage'                    => 'Tvarkyti',
     'field'		                => 'Laukas',
     'about_fieldsets_title'		=> 'Apie laukų grupes',
-    'about_fieldsets_text'		=> 'Laukų rinkiniai leidžia kurti pritaikytų laukų grupes, kurios dažnai naudojamos konkretiems įrangos modelių tipams.',
+    'about_fieldsets_text'		=> 'Laukų rinkiniai leidžia kurti pritaikytų laukų grupes, kurios dažnai naudojamos konkretiems turto modelių tipams.',
     'custom_format'             => 'Tinkintas Regex formatas...',
     'encrypt_field'      	        => 'Šifruoti šio lauko reikšmę duomenų bazėje',
     'encrypt_field_help'      => 'ĮSPĖJIMAS: Užšifravus lauką, jo nebebus galima ieškoti.',
@@ -35,9 +35,9 @@ return [
     'create_field_title' => 'Sukurti naują pritaikytą lauką',
     'value_encrypted'      	        => 'Šio lauko reikšmė yra užšifruota duomenų bazėje. Tik administratoriai gali matyti iššifruotą reikšmę',
     'show_in_email'     => 'Įtraukti šio lauko reikšmę į išdavimo el. laiškus, siunčiamus naudotojams? Šifruotų laukų į el. laiškus įtraukti negalima',
-    'show_in_email_short'     => 'Įtraukti į el. laiškus.',
+    'show_in_email_short' => 'Įtraukti į el. laiškus',
     'help_text' => 'Pagalbos tekstas',
-    'help_text_description' => 'Tai yra nebūtinas tekstas, kuris redaguojant įrangą, bus rodomas po formos elementais, kad suteiktų kontekstą tam laukui.',
+    'help_text_description' => 'Tai yra nebūtinas tekstas, kuris redaguojant turtą, bus rodomas po formos elementais, kad suteiktų kontekstą tam laukui.',
     'about_custom_fields_title' => 'Apie pritaikytus laukus',
     'about_custom_fields_text' => 'Pritaikyti laukai leidžia turtui pridėti pasirinktinių atributų.',
     'add_field_to_fieldset' => 'Įtraukti lauką į rinkinį',
@@ -46,16 +46,19 @@ return [
     'reorder' => 'Perrikiuoti',
     'db_field' => 'DB laukas',
     'db_convert_warning' => 'ĮSPĖJIMAS. Šis laukas pritaikytų laukų lentelėje yra kaip <code>:db_column</code>, bet turėtų būti <code>:expected</code>.',
-    'is_unique' => 'Ši reikšmė tui būti unikali visai įrangai',
+    'is_unique' => 'Ši reikšmė turi būti unikali visam turtui',
     'unique' => 'Unikalu',
-    'display_in_user_view' => 'Leisti įrangą gavusiam naudotojui peržiūrėti šias reikšmes puslapyje „Peržiūrėti gautą įrangą“',
+    'display_in_user_view' => 'Leisti turtą gavusiam naudotojui peržiūrėti šias reikšmes puslapyje „Peržiūrėti gautą turtą“',
     'display_in_user_view_table' => 'Matoma naudotojui',
     'auto_add_to_fieldsets' => 'Automatiškai pridėti prie kiekvieno naujo laukų rinkinio',
     'add_to_preexisting_fieldsets' => 'Pridėti prie esamų laukų rinkinių',
     'show_in_listview' => 'Standartiškai rodyti sąrašo rodiniuose. Įgalioti naudotojai vis tiek galės pasirinkti, rodyti ar slėpti stulpelį, naudodami parinkiklį',
     'show_in_listview_short' => 'Rodyti sąrašuose',
-    'show_in_requestable_list_short' => 'Rodyti užsakomos įrangos sąraše',
-    'show_in_requestable_list' => 'Rodyti reikšmę užsakomos įrangos sąraše. Šifruoti laukai nebus rodomi',
+    'show_in_requestable_list_short' => 'Rodyti užsakomo turto sąraše',
+    'show_in_requestable_list' => 'Rodyti reikšmę užsakomo turto sąraše. Šifruoti laukai nebus rodomi',
     'encrypted_options' => 'Šis laukas yra užšifruotas, todėl kai kurios rodymo parinktys nebus pasiekiamos.',
+    'display_checkin' => 'Rodyti paėmimo formose',
+    'display_checkout' => 'Rodyti išdavimo formose',
+    'display_audit' => 'Display in audit forms',
 
 ];
diff --git a/resources/lang/lt-LT/admin/custom_fields/message.php b/resources/lang/lt-LT/admin/custom_fields/message.php
index 6ed6858fa4..a23d097e97 100644
--- a/resources/lang/lt-LT/admin/custom_fields/message.php
+++ b/resources/lang/lt-LT/admin/custom_fields/message.php
@@ -5,6 +5,7 @@ return array(
     'field' => array(
         'invalid'   => 'Tokio lauko nėra.',
         'already_added'   => 'Laukas jau pridėtas',
+        'none_selected'   => 'Nepasirinktas joks laukas',
 
         'create' => array(
             'error'   => 'Laukas nebuvo sukurtas, bandykite dar kartą.',
diff --git a/resources/lang/lt-LT/admin/depreciations/general.php b/resources/lang/lt-LT/admin/depreciations/general.php
index 14b79782f2..f708e08b66 100644
--- a/resources/lang/lt-LT/admin/depreciations/general.php
+++ b/resources/lang/lt-LT/admin/depreciations/general.php
@@ -1,9 +1,9 @@
 <?php
 
 return [
-    'about_asset_depreciations'  			=> 'Apie įrangos nusidėvėjimą',
-    'about_depreciations'  					=> 'Jūs galite nustatyti įrangos nusidėvėjimą pagal tiesinį nusidėvėjimo modelį.',
-    'asset_depreciations'  					=> 'Įrangos nusidėvėjimas',
+    'about_asset_depreciations'  			=> 'Apie turto nusidėvėjimą',
+    'about_depreciations'  					=> 'Jūs galite nustatyti turto nusidėvėjimą pagal tiesinį nusidėvėjimo modelį.',
+    'asset_depreciations'  					=> 'Turto nusidėvėjimas',
     'create'  					            => 'Sukurti nusidėvėjimą',
     'depreciation_name'  					=> 'Nusidėvėjimo pavadinimas',
     'depreciation_min'                      => 'Minimali nusidėvėjimo reikšmė',
@@ -13,4 +13,8 @@ return [
     'no_depreciations_warning'               => '<strong>Įspėjimas: </strong>
                       Neturite nustatyto nusidėvėjimo.
                       Norėdami pamatyti nusidėvėjimo ataskaitą, nustatykite bent vieną nusidėvėjimą.',
+    'depreciation_method'                   => 'Nusidėvėjimo ataskaita',
+    'linear_depreciation'                   => 'Linijinis (numatytasis)',
+    'half_1'                                => 'Pusmečio konvencija, visada taikoma',
+    'half_2'                                => 'Pusmečio konvencija, taikoma su sąlyga',
 ];
diff --git a/resources/lang/lt-LT/admin/depreciations/message.php b/resources/lang/lt-LT/admin/depreciations/message.php
index 433a1bb48c..20c24dd2aa 100644
--- a/resources/lang/lt-LT/admin/depreciations/message.php
+++ b/resources/lang/lt-LT/admin/depreciations/message.php
@@ -3,7 +3,7 @@
 return array(
 
     'does_not_exist' => 'Nėra tokios nusidėvėjimo klasės.',
-    'assoc_users'	 => 'Šis nusidėvėjimas šiuo metu yra susietas su vienu ar keliais įrangos modeliais ir negali būti panaikintas. Panaikinkite susietus modelius ir bandykite iš naujo. ',
+    'assoc_users'	 => 'Šis nusidėvėjimas šiuo metu yra susietas su vienu ar keliais modeliais ir negali būti panaikintas. Panaikinkite susietus modelius ir bandykite iš naujo. ',
 
 
     'create' => array(
diff --git a/resources/lang/lt-LT/admin/groups/message.php b/resources/lang/lt-LT/admin/groups/message.php
index 8ce76df78e..c56d35fb62 100644
--- a/resources/lang/lt-LT/admin/groups/message.php
+++ b/resources/lang/lt-LT/admin/groups/message.php
@@ -3,7 +3,7 @@
 return array(
 
     'group_exists'        => 'Tokia grupė jau yra!',
-    'group_not_found'     => 'Tokios grupės [:id] nėra.',
+    'group_not_found'     => 'Tokios grupės :id nėra.',
     'group_name_required' => 'Pavadinimo laukas yra privalomas',
 
     'success' => array(
diff --git a/resources/lang/lt-LT/admin/groups/table.php b/resources/lang/lt-LT/admin/groups/table.php
index e81468207a..03e8a4dd33 100644
--- a/resources/lang/lt-LT/admin/groups/table.php
+++ b/resources/lang/lt-LT/admin/groups/table.php
@@ -2,7 +2,7 @@
 
 return array(
 
-    'id'         => 'Id',
+    'id'         => 'ID',
     'name'       => 'Pavadinimas',
     'users'      => 'Naudotojų skaičius',
 
diff --git a/resources/lang/lt-LT/admin/hardware/form.php b/resources/lang/lt-LT/admin/hardware/form.php
index 4c203ecd2c..894454647e 100644
--- a/resources/lang/lt-LT/admin/hardware/form.php
+++ b/resources/lang/lt-LT/admin/hardware/form.php
@@ -1,25 +1,25 @@
 <?php
 
 return [
-    'bulk_delete'		=> 'Patvirtinkite masinį įrangos panaikinimą',
-    'bulk_restore'      => 'Patvirtinkite masinį įrangos atkūrimą', 
-  'bulk_delete_help'	=> 'Peržiūrėkite įrangą, kurią norite panaikinti. Panaikintą įrangą galima atkurti, tačiau ji nebebus susieta su tais naudotojais, kuriems šiuo metu yra išduota.',
-  'bulk_restore_help'	=> 'Peržiūrėkite įrangą, kurią norite atkurti. Atkūrus įrangą, ji nebus susieta su tais naudotojais, kuriems anksčiau buvo išduota.',
-  'bulk_delete_warn'	=> 'Bus panaikinta įrangos vienetų: :asset_count.',
-  'bulk_restore_warn'	=> 'Bus atkurta įrangos vienetų: :asset_count.',
-    'bulk_update'		=> 'Masinis įrangos atnaujinimas',
-    'bulk_update_help'	=> 'Ši forma suteikia galimybę atnaujinti iškart kelis įrangos vienetus. Užpildykite tik tuos laukus, kuriuos norite pakeisti. Laukai, kuriuos paliksite tuščius, liks nepakeisti. ',
-    'bulk_update_warn'	=> 'Ketinate redaguoti vienos įrangos ypatybes.|Ketinate redaguoti :asset_count įrangų ypatybes.',
-    'bulk_update_with_custom_field' => 'Atminkite, kad įranga yra :asset_model_count skirtingų modelių tipų.',
+    'bulk_delete'		=> 'Patvirtinkite masinį turto panaikinimą',
+    'bulk_restore'      => 'Patvirtinkite masinį turto atkūrimą', 
+  'bulk_delete_help'	=> 'Peržiūrėkite turtą, kurį norite panaikinti. Panaikintą turtą galima atkurti, tačiau jis nebebus susietas su tais naudotojais, kuriems šiuo metu yra išduotas.',
+  'bulk_restore_help'	=> 'Peržiūrėkite turtą, kurį norite atkurti. Atkūrus turtą, jis nebus susietas su tais naudotojais, kuriems anksčiau buvo išduotas.',
+  'bulk_delete_warn'	=> 'Bus panaikinta turto vienetų: :asset_count.',
+  'bulk_restore_warn'	=> 'Bus atkurta turto vienetų: :asset_count.',
+    'bulk_update'		=> 'Masinis turto atnaujinimas',
+    'bulk_update_help'	=> 'Ši forma suteikia galimybę atnaujinti iškart kelis turto vienetus. Užpildykite tik tuos laukus, kuriuos norite pakeisti. Laukai, kuriuos paliksite tuščius, liks nepakeisti. ',
+    'bulk_update_warn'	=> 'Ketinate redaguoti vieno turto vieneto ypatybes.|Ketinate redaguoti :asset_count turto vienetų ypatybes.',
+    'bulk_update_with_custom_field' => 'Atminkite, kad turtas yra :asset_model_count skirtingų modelių tipų.',
     'bulk_update_model_prefix' => 'Modeliams', 
     'bulk_update_custom_field_unique' => 'Tai unikalus laukas, todėl jo negalima redaguoti masinio redagavimo būdu.',
-    'checkedout_to'		=> 'Išduota',
+    'checkedout_to'		=> 'Kam išduota',
     'checkout_date'		=> 'Išdavimo data',
     'checkin_date'		=> 'Paėmimo data',
     'checkout_to'		=> 'Išduoti',
-    'cost'				=> 'Pirkimo kaina',
-    'create'			=> 'Sukurti įrangą',
-    'date'				=> 'Pirkimo data',
+    'cost'				=> 'Įsigijimo kaina',
+    'create'			=> 'Sukurti turtą',
+    'date'				=> 'Įsigijimo data',
     'depreciation'	    => 'Nusidėvėjimas',
     'depreciates_on'	=> 'Nusidėvėjimo data',
     'default_location'	=> 'Numatytoji vieta',
@@ -29,34 +29,37 @@ return [
     'expected_checkin'  => 'Numatoma paėmimo data',
     'expires'			=> 'Baigsis',
     'fully_depreciated'	=> 'Visiškai nusidėvėjo',
-    'help_checkout'		=> 'Jei norite nedelsiant išduoti šią įrangą, aukščiau esančiame būsenų sąraše pasirinkite „Paruošta naudojimui“. ',
+    'help_checkout'		=> 'Jei norite nedelsiant išduoti šį turtą, aukščiau esančiame būsenų sąraše pasirinkite „Paruoštas naudojimui“. ',
     'mac_address'		=> 'MAC adresas',
     'manufacturer'		=> 'Gamintojas',
     'model'				=> 'Modelis',
     'months'			=> 'mėnesiai',
-    'name'				=> 'Įrangos pavadinimas',
+    'name'				=> 'Turto pavadinimas',
     'notes'				=> 'Pastabos',
     'order'				=> 'Užsakymo numeris',
     'qr'				=> 'QR kodas',
-    'requestable'		=> 'Naudotojai gali užsakyti šią įrangą',
+    'requestable'		=> 'Naudotojai gali užsakyti šį turtą',
     'redirect_to_all'   => 'Grįžti prie visų :type',
     'redirect_to_type'   => 'Eiti į :type',
     'redirect_to_checked_out_to'   => 'Eiti į išduotus',
     'select_statustype'	=> 'Pasirinkite būsenos tipą',
-    'serial'			=> 'Serijos numeris',
+    'serial'			=> 'Serijinis numeris',
     'status'			=> 'Būsena',
     'tag'				=> 'Inventorinis numeris',
-    'update'			=> 'Įrangos atnaujinimas',
+    'update'			=> 'Turto atnaujinimas',
     'warranty'			=> 'Garantija',
         'warranty_expires'		=> 'Garantija baigiasi',
     'years'				=> 'metai',
-    'asset_location' => 'Atnaujinti įrangos vietą',
+    'asset_location' => 'Atnaujinti turto vietą',
     'asset_location_update_default_current' => 'Atnaujinti numatytąją vietą IR faktinę vietą',
     'asset_location_update_default' => 'Atnaujinti tik numatytąją vietą',
     'asset_location_update_actual' => 'Atnaujinti tik faktinę vietą',
-    'asset_not_deployable' => 'Įrangos būsena netinkama išdavimui, todėl ši įranga negali būti išduota.',
-    'asset_deployable' => 'Įrangos būsena tinkama išdavimui, todėl ši įranga gali būti išduota.',
+    'asset_not_deployable' => 'Turto būsena netinkama išdavimui, todėl šis turtas negali būti išduotas.',
+    'asset_not_deployable_checkin' => 'Turto su šia būsenos žyma išduoti negalima. Nustačius šią būsenos žymą, turtas bus paimtas.',
+    'asset_deployable' => 'Šį turtą galima išduoti.',
     'processing_spinner' => 'Apdorojama... (Dideliems failams gali šiek tiek užtrukti)',
+    'processing' => 'Processing... ',
     'optional_infos'  => 'Papildoma informacija',
-    'order_details'   => 'Su užsakymu susijusi informacija'
+    'order_details'   => 'Su užsakymu susijusi informacija',
+    'calc_eol'    => 'Jei EOL data nustatoma iš naujo, naudoti automatinį EOL apskaičiavimą pagal įsigijimo datą ir nusidėvėjimo laipsnį.',
 ];
diff --git a/resources/lang/lt-LT/admin/hardware/general.php b/resources/lang/lt-LT/admin/hardware/general.php
index 4502d02237..abdf0036ad 100644
--- a/resources/lang/lt-LT/admin/hardware/general.php
+++ b/resources/lang/lt-LT/admin/hardware/general.php
@@ -1,34 +1,33 @@
 <?php
 
 return [
-    'about_assets_title'           => 'Apie įrangą',
-    'about_assets_text'            => 'Įranga, tai turtas, kurį galima sekti pagal serijos ar inventoriaus numerį. Įprastai, tai yra didesnės vertės daiktai, kurių individualus identifikavimas yra svarbus.',
-    'archived'  				=> 'Archyvuota',
-    'asset'  					=> 'Įranga',
-    'bulk_checkout'             => 'Išduoti įrangą',
-    'bulk_checkin'              => 'Paimti įrangą',
-    'checkin'  					=> 'Paimti įrangą',
-    'checkout'  				=> 'Išduoti įrangą',
-    'clone'  					=> 'Klonuoti įrangą',
+    'about_assets_title'           => 'Apie turtą',
+    'about_assets_text'            => 'Turtas, tai daiktai, kuriuos galima sekti pagal serijinį ar inventorinį numerį. Įprastai, tai yra didesnės vertės daiktai, kurių individualus identifikavimas yra svarbus.',
+    'archived'  				=> 'Archyvuotas',
+    'asset'  					=> 'Turtas',
+    'bulk_checkout'             => 'Išduoti kelis',
+    'bulk_checkin'              => 'Paimti kelis',
+    'checkin'  					=> 'Paimti turtą',
+    'checkout'  				=> 'Išduoti turtą',
+    'clone'  					=> 'Klonuoti turtą',
     'deployable'  				=> 'Galima naudoti',
-    'deleted'  					=> 'Ši įranga buvo panaikinta.',
-    'delete_confirm'            => 'Ar tikrai norite panaikinti šią įrangą?',
-    'edit'  					=> 'Redaguoti įrangą',
-    'model_deleted'  			=> 'Šis įrangos modelis buvo panaikintas. Pirmiau turite atkurti modelį, tada galėsite atkurti įrangą.',
-    'model_invalid'             => 'Šiai įrangai šis modelis netinka.',
-    'model_invalid_fix'         => 'Įranga turi būti atnaujinta parenkant tinkamą įrangos modelį, kad ją būtų galima išduoti/paimti ar audituoti.',
-    'requestable'               => 'Užsakoma',
-    'requested'				    => 'Užsakyta',
-    'not_requestable'           => 'Neužsakoma',
-    'requestable_status_warning' => 'Nekeisti užsakomos įrangos būsenos',
-    'restore'  					=> 'Atkurti įrangą',
-    'pending'  					=> 'Ruošiama',
-    'undeployable'  			=> 'Negalimas naudoti',
-    'undeployable_tooltip'  	=> 'Ši įranga yra pažymėta kaip neišduotina, todėl šiuo metu jos negalima išduoti.',
-    'view'  					=> 'Peržiūrėti įrangą',
+    'deleted'  					=> 'Šis turtas buvo panaikintas.',
+    'delete_confirm'            => 'Ar tikrai norite panaikinti šį turtą?',
+    'edit'  					=> 'Redaguoti turtą',
+    'model_deleted'  			=> 'Šis turto modelis buvo panaikintas. Pirmiau turite atkurti modelį, tada galėsite atkurti patį turtą.',
+    'model_invalid'             => 'Šiam turtui šis modelis netinka.',
+    'model_invalid_fix'         => 'Turtas turi būti atnaujintas parenkant tinkamą turto modelį, kad jį būtų galima išduoti/paimti ar audituoti.',
+    'requestable'               => 'Užsakomas',
+    'requested'				    => 'Užsakytas',
+    'not_requestable'           => 'Neužsakomas',
+    'requestable_status_warning' => 'Nekeisti užsakomo turto būsenos',
+    'restore'  					=> 'Atkurti turtą',
+    'pending'  					=> 'Ruošiamas',
+    'undeployable'  			=> 'Neišduotinas',
+    'undeployable_tooltip'  	=> 'Šis turtas yra pažymėtas kaip neišduotinas, todėl šiuo metu jo negalima išduoti.',
+    'view'  					=> 'Peržiūrėti turtą',
     'csv_error' => 'Jūsų CSV faile yra klaida:',
-    'import_text' => '<p>Įkelkite CSV, kuriame yra įrangos istorija. Įranga ir naudotojai PRIVALO būti sistemoje, kitaip jie bus praleisti. Atliekant istorijos importavimą, įranga yra susiejama pagal inventorinį numerį. Bandysime rasti atitinkantį naudotoją pagal jūsų pateiktą naudotojo vardą ir žemiau pasirinktus kriterijus. Jei nepasirinksite jokio kriterijaus, tiesiog bus bandoma atlikti susiejimą pagal naudotojo vardo formatą, kurį pasirininkote <code>Administratorius &gt; Bendrieji nustatymai</code> nustatymuose.</p><p>Į CSV įtraukti laukai turi atitikti antraštes: <strong>Inventorinis numeris, Pavadinimas, Išdavimo data, Paėmimo data</strong>. Visi papildomi laukai bus ignoruojami. </p><p>Paėmimo data: tuščia arba nurodyta būsima paėmimo data –  įranga bus išduota susijusiam naudotojui. Nepasirinkus stulpelio „Paėmimo data“, bus sukurta paėmimo data su šiandienos data.</p>
-    ',
+    'import_text' => '<p>Upload a CSV that contains asset history. The assets and users MUST already exist in the system, or they will be skipped. Matching assets for history import happens against the asset tag. We will try to find a matching user based on the user\'s name you provide, and the criteria you select below. If you do not select any criteria below, it will simply try to match on the username format you configured in the <code>Admin &gt; General Settings</code>.</p><p>Fields included in the CSV must match the headers: <strong>Asset Tag, Name, Checkout Date, Checkin Date</strong>. Any additional fields will be ignored. </p><p>Checkin Date: blank or future checkin dates will checkout items to associated user.  Excluding the Checkin Date column will create a checkin date with todays date.</p>    ',
     'csv_import_match_f-l' => 'Bandyti susieti naudotojus pagal formatą <strong>vardas.pavardė</strong> (<code>vardenis.pavardenis</code>)',
     'csv_import_match_initial_last' => 'Bandyti susieti naudotojus pagal formatą <strong>pirmoji vardo raidė ir pavardė</strong> (<code>vpavardenis</code>)',
     'csv_import_match_first' => 'Bandyti susieti naudotojus pagal formatą <strong>vardas</strong> (<code>vardenis</code>)',
diff --git a/resources/lang/lt-LT/admin/hardware/message.php b/resources/lang/lt-LT/admin/hardware/message.php
index 9a93985916..aaa9206b54 100644
--- a/resources/lang/lt-LT/admin/hardware/message.php
+++ b/resources/lang/lt-LT/admin/hardware/message.php
@@ -2,38 +2,43 @@
 
 return [
 
-    'undeployable' 		=> '<strong>Įspėjimas:</strong> Ši įranga pažymėta kaip negalima išduoti. Jei ši būsena pasikeitė, atnaujinkite ją.',
-    'does_not_exist' 	=> 'Tokios įrangos nėra.',
-    'does_not_exist_var'=> 'Įranga su numeriu :asset_tag nerasta.',
-    'no_tag' 	        => 'Nenurodytas inventorinis numeris.',
-    'does_not_exist_or_not_requestable' => 'Tokios įrangos nėra arba jos negalima užsakyti.',
-    'assoc_users'	 	=> 'Ši įranga šiuo metu yra išduota naudotojui ir negali būti panaikinta. Pirmiausia paimkite įrangą ir tuomet vėl bandykite panaikinti. ',
-    'warning_audit_date_mismatch' 	=> 'Šios įrangos kito audito data (:next_audit_date) yra ankstesnė už paskutinio audito datą (:last_audit_date). Atnaujinkite kito audito datą.',
+    'undeployable' 		 => '<strong>Įspėjimas:</strong> Šis turtas pažymėtas kaip negalimas išduoti. Jei šio turto būsena pasikeitė, atnaujinkite būsenos žymą.',
+    'does_not_exist' 	 => 'Tokio turto nėra.',
+    'does_not_exist_var' => 'Turtas su numeriu :asset_tag nerastas.',
+    'no_tag' 	         => 'Nenurodytas inventorinis numeris.',
+    'does_not_exist_or_not_requestable' => 'Tokio turto nėra arba jo negalima užsakyti.',
+    'assoc_users'	 	 => 'Šis turtas šiuo metu yra išduotas naudotojui ir negali būti panaikintas. Pirmiausia paimkite turtą ir tuomet vėl bandykite jį panaikinti. ',
+    'warning_audit_date_mismatch' 	=> 'Šio turto kito audito data (:next_audit_date) yra ankstesnė už paskutinio audito datą (:last_audit_date). Atnaujinkite kito audito datą.',
+    'labels_generated'   => 'Etiketės sugeneruotos sėkmingai.',
+    'error_generating_labels' => 'Generuojant etiketes įvyko klaida.',
+    'no_assets_selected' => 'Nepasirinktas joks turtas.',
 
     'create' => [
-        'error'   		=> 'Įrangos sukurti nepavyko, bandykite dar kartą.',
-        'success' 		=> 'Įranga sukurta sėkmingai.',
-        'success_linked' => 'Įranga su žyma :tag sukurta sėkmingai. <strong><a href=":link" style="color: white;">Spustelėkite čia, kad peržiūrėtumėte</a></strong>.',
+        'error'   		=> 'Turto sukurti nepavyko, bandykite dar kartą.',
+        'success' 		=> 'Turtas sukurtas sėkmingai.',
+        'success_linked' => 'Turtas su žyma :tag sukurtas sėkmingai. <strong><a href=":link" style="color: white;">Spustelėkite čia, kad peržiūrėtumėte</a></strong>.',
+        'multi_success_linked' => 'Turtas su inventoriniu numeriu :links sukurtas sėkmingai.|:count turto vienetai(-ų) sukurti sėkmingai. :links.',
+        'partial_failure' => 'Nepavyko sukurti turto. Priežastis: :failures|:count turto vienetų nepavyko sukurti. Priežastys: :failures',
     ],
 
     'update' => [
-        'error'   			=> 'Įrangos atnaujinti nepavyko, bandykite dar kartą',
-        'success' 			=> 'Įranga atnaujinta sėkmingai.',
-        'encrypted_warning' => 'Įranga buvo atnaujinta sėkmingai, tačiau dėl trūkstamų teisių, užšifruoti pasirinktiniai laukai nebuvo atnaujinti',
+        'error'   			=> 'Turto atnaujinti nepavyko, bandykite dar kartą',
+        'success' 			=> 'Turtas atnaujintas sėkmingai.',
+        'encrypted_warning' => 'Turtas buvo atnaujintas sėkmingai, tačiau dėl nepakankamų teisių, užšifruoti pasirinktiniai laukai nebuvo atnaujinti',
         'nothing_updated'	=>  'Nebuvo pasirinktas nei vienas laukas, todėl niekas nebuvo atnaujinta.',
-        'no_assets_selected'  =>  'Nebuvo pasirinkta jokia įranga, todėl nieko nebuvo atnaujinta.',
-        'assets_do_not_exist_or_are_invalid' => 'Pasirinkta įranga negali būti atnaujinta.',
+        'no_assets_selected'  =>  'Nebuvo pasirinkta jokio turto, todėl nieko nebuvo atnaujinta.',
+        'assets_do_not_exist_or_are_invalid' => 'Pasirinktas turtas negali būti atnaujintas.',
     ],
 
     'restore' => [
-        'error'   		=> 'Įrangos atkurti nepavyko, bandykite dar kartą',
-        'success' 		=> 'Įranga atkurta sėkmingai.',
-        'bulk_success' 		=> 'Įranga atkurta sėkmingai.',
-        'nothing_updated'   => 'Nebuvo pasirinkta jokia įranga, todėl nieko nebuvo atkurta.', 
+        'error'   		=> 'Turto atkurti nepavyko, bandykite dar kartą',
+        'success' 		=> 'Turtas atkurtas sėkmingai.',
+        'bulk_success' 		=> 'Turtas atkurtas sėkmingai.',
+        'nothing_updated'   => 'Nebuvo pasirinkta jokio turto, todėl nieko nebuvo atkurta.', 
     ],
 
     'audit' => [
-        'error'   		=> 'Įrangos auditas nesėkmingas: :error ',
+        'error'   		=> 'Turto auditas nesėkmingas: :error ',
         'success' 		=> 'Turto auditas sėkmingai užregistruotas.',
     ],
 
@@ -51,44 +56,54 @@ return [
     ],
 
     'import' => [
+        'import_button'         => 'Vykdyti importavimą',
         'error'                 => 'Kai kurie elementai nebuvo tinkamai importuoti.',
         'errorDetail'           => 'Šie elementai nebuvo importuoti dėl klaidų.',
         'success'               => 'Jūsų failas buvo importuotas',
         'file_delete_success'   => 'Jūsų failas buvo sėkmingai ištrintas',
         'file_delete_error'      => 'Šio failo ištrinti nepavyko',
         'file_missing' => 'Pažymėtas failas nerastas',
+        'file_already_deleted' => 'Pasirinktas failas jau buvo panaikintas',
         'header_row_has_malformed_characters' => 'Vienas ar keli antraštinės eilutės atributai turi netinkamai suformuotų UTF-8 simbolių',
         'content_row_has_malformed_characters' => 'Vienas ar keli pirmosios eilutės atributai turi netinkamai suformuotų UTF-8 simbolių',
+        'transliterate_failure' => 'Transliteracija iš :encoding į UTF-8 nepavyko dėl netinkamų įvesties simbolių'
     ],
 
 
     'delete' => [
-        'confirm'   	=> 'Ar tikrai norite panaikinti šią įrangą?',
-        'error'   		=> 'Bandant panaikinti įrangą įvyko klaida. Bandykite dar kartą.',
-        'nothing_updated'   => 'Nebuvo pasirinkta jokia įranga, todėl nieko nebuvo panaikinta.',
-        'success' 		=> 'Įranga sėkmingai panaikinta.',
+        'confirm'   	=> 'Ar tikrai norite panaikinti šį turtą?',
+        'error'   		=> 'Bandant panaikinti turtą įvyko klaida. Bandykite dar kartą.',
+        'assigned_to_error' => '{1}Inventorinis numeris: :asset_tag šiuo metu yra išduotas. Paimkite šį įrenginį prieš panaikindami.|[2,*]Inventoriniai numeriai: :asset_tag šiuo metu yra išduoti. Paimkite šiuos įrenginius prieš panaikindami.',
+        'nothing_updated'   => 'Nebuvo pasirinkta jokio turto, todėl nieko nebuvo panaikinta.',
+        'success' 		=> 'Turtas sėkmingai panaikintas.',
     ],
 
     'checkout' => [
-        'error'   		=> 'Įranga nebuvo išduota, bandykite dar kartą',
-        'success' 		=> 'Įranga išduota sėkmingai.',
+        'error'   		=> 'Turtas nebuvo išduotas, bandykite dar kartą',
+        'success' 		=> 'Turtas išduotas sėkmingai.',
         'user_does_not_exist' => 'Neteisingas naudotojas. Bandykite dar kartą.',
-        'not_available' => 'Ši įranga negali būti išduodama!',
-        'no_assets_selected' => 'Turite pasirinkti bent vieną įrangą iš sąrašo',
+        'not_available' => 'Šis turtas negali būti išduodamas!',
+        'no_assets_selected' => 'Turite pasirinkti bent vieną turto vienetą iš sąrašo',
+    ],
+
+    'multi-checkout' => [
+        'error'   => 'Turtas nebuvo išduotas, bandykite dar kartą|Turtas nebuvo išduotas, bandykite dar kartą',
+        'success' => 'Turtas išduotas sėkmingai.|Turtas išduotas sėkmingai.',
     ],
 
     'checkin' => [
-        'error'   		=> 'Įranga nebuvo paimta, bandykite dar kartą',
-        'success' 		=> 'Įranga paimta sėkmingai.',
+        'error'   		=> 'Turtas nebuvo paimtas, bandykite dar kartą',
+        'success' 		=> 'Turtas paimtas sėkmingai.',
         'user_does_not_exist' => 'Neteisingas naudotojas. Bandykite dar kartą.',
-        'already_checked_in'  => 'Ši įranga jau yra paimta.',
+        'already_checked_in'  => 'Šis turtas jau yra paimtas.',
 
     ],
 
     'requests' => [
-        'error'   		=> 'Įranga nebuvo užsakyta, bandykite dar kartą',
-        'success' 		=> 'Įranga užsakyta sėkmingai.',
-        'canceled'      => 'Išdavimo prašymas sėkmingai atšauktas',
+        'error'   		=> 'Request was not successful, please try again.',
+        'success' 		=> 'Request successfully submitted.',
+        'canceled'      => 'Request successfully canceled.',
+        'cancel'        => 'Atšaukti šio daikto užklausą',
     ],
 
 ];
diff --git a/resources/lang/lt-LT/admin/hardware/table.php b/resources/lang/lt-LT/admin/hardware/table.php
index 320cb80bb1..4634fc3bb9 100644
--- a/resources/lang/lt-LT/admin/hardware/table.php
+++ b/resources/lang/lt-LT/admin/hardware/table.php
@@ -5,7 +5,7 @@ return [
     'asset_tag'   	=> 'Inventorinis numeris',
     'asset_model'       => 'Modelis',
     'assigned_to'   => 'Išduota',
-    'book_value'  	=> 'Dabartinė reikšmė',
+    'book_value'  	=> 'Dabartinė vertė',
     'change' 		=> 'Į/Iš',
     'checkout_date' => 'Išdavimo data',
     'checkoutto' 	=> 'Išduota',
@@ -19,13 +19,12 @@ return [
     'location' 		=> 'Vieta',
     'purchase_cost'	=> 'Kaina',
     'purchase_date'	=> 'Nupirkta',
-    'serial'   		=> 'Serijos numeris',
+    'serial'   		=> 'Serijinis numeris',
     'status'   		=> 'Būsena',
-    'title'      	=> 'Įranga ',
+    'title'      	=> 'Turtas ',
     'image'		    => 'Įrenginio atvaizdas',
     'days_without_acceptance' => 'Dienų skaičius laukiant patvirtinimo',
     'monthly_depreciation' => 'Mėnesinis nusidėvėjimas',
-    'assigned_to'    => 'Išduota',
     'requesting_user' => 'Prašantis asmuo',
     'requested_date' => 'Prašymo data',
     'changed'       => 'Keista',
diff --git a/resources/lang/lt-LT/admin/kits/general.php b/resources/lang/lt-LT/admin/kits/general.php
index e75b4e6a2d..c2ad2beb9c 100644
--- a/resources/lang/lt-LT/admin/kits/general.php
+++ b/resources/lang/lt-LT/admin/kits/general.php
@@ -2,14 +2,14 @@
 
 return [
     'about_kits_title'                  => 'Apie iš anksto nustatytus rinkinius',
-    'about_kits_text'                   => 'Iš anksto nustatyti rinkiniai leidžia greitai išduoti daiktų rinkinius (įrangą, licencijas ir kt.) naudotojui. Tai patogu, kai įrangos išdavimo procesas yra vieningas ir naudotojai gauna analogiškos įrangos komplektus.',
+    'about_kits_text'                   => 'Iš anksto nustatyti rinkiniai leidžia greitai išduoti daiktų rinkinius (turtą, licencijas ir kt.) naudotojui. Tai patogu, kai turto išdavimo procesas yra vieningas ir naudotojai gauna analogiško turto komplektus.',
     'checkout'                          => 'Išduoti rinkinį ',
     'create_success'                    => 'Rinkinys buvo sukurtas sėkmingai.',
     'create'                            => 'Sukurti iš anksto nustatytą rinkinį',
     'update'                            => 'Atnaujinti iš anksto nustatytą rinkinį',
     'delete_success'                    => 'Rinkinys buvo panaikintas sėkmingai.',
     'update_success'                    => 'Rinkinys buvo atnaujintas sėkmingai.',
-    'none_models'                       => 'Nepakanka laisvos įrangos :model išdavimui. Reikalingas likutis: :qty. ',
+    'none_models'                       => 'Nepakanka laisvo turto :model išdavimui. Reikalingas kiekis: :qty. ',
     'none_licenses'                     => 'Nepakanka laisvų licencijos vietų :license išdavimui. Reikalingas likutis: :qty. ',
     'none_consumables'                  => 'Nepakanka laisvų eksploatacinių medžiagų :consumable išdavimui. Reikalingas likutis: :qty. ',
     'none_accessory'                    => 'Nepakanka laisvų priedų :accessory išdavimui. Reikalingas likutis: :qty. ',
@@ -47,4 +47,5 @@ return [
     'kit_deleted'                       => 'Rinkinys panaikintas sėkmingai',
     'kit_model_updated'                 => 'Modelis atnaujintas sėkmingai',
     'kit_model_detached'                => 'Modelis atskirtas sėkmingai',
+    'model_already_attached'            => 'Modelis jau pridėtas prie rinkinio',
 ];
diff --git a/resources/lang/lt-LT/admin/licenses/form.php b/resources/lang/lt-LT/admin/licenses/form.php
index 4df77341db..0dd91ec054 100644
--- a/resources/lang/lt-LT/admin/licenses/form.php
+++ b/resources/lang/lt-LT/admin/licenses/form.php
@@ -2,7 +2,7 @@
 
 return array(
 
-    'asset'             => 'Įranga',
+    'asset'             => 'Turtas',
     'checkin'           => 'Paimti',
     'create'            => 'Sukurti licenciją',
     'expiration'        => 'Galiojimo pabaiga',
@@ -11,12 +11,12 @@ return array(
     'name'              => 'Programinės įrangos pavadinimas',
     'no_depreciation'   => 'Neskaičiuoti nusidėvėjimo',
     'purchase_order'    => 'Pirkimo užsakymo numeris',
-    'reassignable'      => 'Perduodamas',
+    'reassignable'      => 'Perduodama',
     'remaining_seats'   => 'Likusių vietų skaičius',
     'seats'             => 'Vietos',
     'termination_date'  => 'Galiojimo pabaiga',
     'to_email'          => 'Licencija priskirta el. paštui',
     'to_name'           => 'Licencija išduota šiuo vardu',
     'update'            => 'Atnaujinti licenciją',
-    'checkout_help'     => 'Licenciją galima priskirti įrangai arba asmeniui. Galima pasirinkti ir abu, tačiau įrangos ir licencijos naudotojas privalės būti tas pats asmuo.'
+    'checkout_help'     => 'Licenciją galima priskirti turtui arba asmeniui. Galima pasirinkti ir abu, tačiau turto ir licencijos naudotoju privalės būti tas pats asmuo.'
 );
diff --git a/resources/lang/lt-LT/admin/licenses/general.php b/resources/lang/lt-LT/admin/licenses/general.php
index 27e0b56244..e936066f97 100644
--- a/resources/lang/lt-LT/admin/licenses/general.php
+++ b/resources/lang/lt-LT/admin/licenses/general.php
@@ -14,6 +14,7 @@ return array(
     'info'  					=> 'Licencijos informacija',
     'license_seats'  			=> 'Licencijos vietų skaičius',
     'seat'  					=> 'Vieta',
+    'seat_count'  				=> 'Vietos :count',
     'seats'  					=> 'Vietos',
     'software_licenses'  		=> 'Programinės įrangos licencijos',
     'user'  					=> 'Naudotojas',
@@ -24,11 +25,11 @@ return array(
             'checkin_all'           => [
                 'button'            => 'Paimti visas vietas',
                 'modal'             => 'Šis veiksmas paims vieną vietą. | Šis veiksmas paims visas :checkedout_seats_count šios licencijos vietas.',
-                'enabled_tooltip'   => 'Paimkite VISAS licencijos vietas – tiek iš naudotojų, tiek iš įrangos',
+                'enabled_tooltip'   => 'Paimkite VISAS licencijos vietas – tiek iš naudotojų, tiek iš turto',
                 'disabled_tooltip'  => 'Išjungta, kadangi šiuo metu nėra išduotų vietų',
-                'disabled_tooltip_reassignable'  => 'Išjungta, kadangi licencijos negalima perskirti',
+                'disabled_tooltip_reassignable'  => 'Išjungta, kadangi licencijos negalima perduoti',
                 'success'           => 'Licencija paimta sėkmingai! | Visos licencijos paimtos sėkmingai!',
-                'log_msg'           => 'Paimta naudojant masinio licencijų išdavimo sąsają',
+                'log_msg'           => 'Paimta naudojant masinio licencijų paėmimo sąsają',
             ],
 
             'checkout_all'              => [
diff --git a/resources/lang/lt-LT/admin/licenses/message.php b/resources/lang/lt-LT/admin/licenses/message.php
index 486aa0e31f..8a4ff7eb4b 100644
--- a/resources/lang/lt-LT/admin/licenses/message.php
+++ b/resources/lang/lt-LT/admin/licenses/message.php
@@ -4,10 +4,10 @@ return array(
 
     'does_not_exist' => 'Tokios licencijos nėra arba jūs neturite teisės ją peržiūrėti.',
     'user_does_not_exist' => 'Tokio naudotojo nėra arba jūs neturite teisės jo peržiūrėti.',
-    'asset_does_not_exist' 	=> 'Tokios įrangos, kurią bandote susieti su šia licencija, nėra.',
-    'owner_doesnt_match_asset' => 'Įranga, kurią bandote susieti su šia licencija, yra išduota kažkam kitam, o ne asmeniui, pasirinktam iš sąrašo.',
+    'asset_does_not_exist' 	=> 'Tokio turto, kurį bandote susieti su šia licencija, nėra.',
+    'owner_doesnt_match_asset' => 'Turtas, kurį bandote susieti su šia licencija, yra išduotas kažkam kitam, o ne asmeniui, pasirinktam iš sąrašo.',
     'assoc_users'	 => 'Ši licencija šiuo metu yra išduota naudotojui ir negali būti panaikinta. Pirmiausia paimkite licenciją ir tuomet vėl bandykite panaikinti. ',
-    'select_asset_or_person' => 'Turite pasirinkti įrangą arba naudotoją, bet ne abu.',
+    'select_asset_or_person' => 'Turite pasirinkti turtą arba naudotoją, bet ne abu.',
     'not_found' => 'Licencija nerasta',
     'seats_available' => 'Liko vietų: :seat_count',
 
@@ -44,10 +44,13 @@ return array(
         'error'   => 'Bandant išduoti licenciją įvyko klaida. Bandykite dar kartą.',
         'success' => 'Licencija išduota sėkmingai',
         'not_enough_seats' => 'Turimų laisvų vietų nepakanka licencijos išdavimui',
+        'mismatch' => 'Pateikta licencijos vieta nesutampa su licencija',
+        'unavailable' => 'Šios licencijos negalima išduoti.',
     ),
 
     'checkin' => array(
         'error'   => 'Bandant paimti licenciją įvyko klaida. Bandykite dar kartą.',
+        'not_reassignable' => 'Ši licencija nėra perduodama',
         'success' => 'Licencija paimta sėkmingai'
     ),
 
diff --git a/resources/lang/lt-LT/admin/licenses/table.php b/resources/lang/lt-LT/admin/licenses/table.php
index 68efb1998a..c5d6ffad77 100644
--- a/resources/lang/lt-LT/admin/licenses/table.php
+++ b/resources/lang/lt-LT/admin/licenses/table.php
@@ -8,7 +8,7 @@ return array(
     'id'      			=> 'ID',
     'license_email'   	=> 'Licencijos el. paštas',
     'license_name'   	=> 'Licencija išduota',
-    'purchase_date'   	=> 'Pirkimo data',
+    'purchase_date'   	=> 'Įsigijimo data',
     'purchased'   		=> 'Įsigyta',
     'seats'   			=> 'Vietos',
     'hardware'   		=> 'Įranga',
diff --git a/resources/lang/lt-LT/admin/locations/message.php b/resources/lang/lt-LT/admin/locations/message.php
index 8047f9cce3..bab4a7d071 100644
--- a/resources/lang/lt-LT/admin/locations/message.php
+++ b/resources/lang/lt-LT/admin/locations/message.php
@@ -3,11 +3,12 @@
 return array(
 
     'does_not_exist' => 'Tokios vietos nėra.',
-    'assoc_users'    => 'Šios vietos negalima panaikinti, nes ji yra bent vienos įrangos ar naudotojo vieta, jai yra priskirta įranga arba ji yra nurodyta kaip pagrindinė kitos vietos vieta. Atnaujinkite savo įrangą, naudotojus ir vietas, kad jie nebeturėtų sąsajų su šia vieta ir bandykite dar kartą. ',
-    'assoc_assets'	 => 'Ši vieta šiuo metu yra susieta bent su viena įranga ir negali būti panaikinta. Atnaujinkite savo įrangą, kad nebebūtų sąsajos su šia vieta, ir bandykite dar kartą. ',
+    'assoc_users'    => 'Šios vietos negalima panaikinti, nes ji yra bent vieno turto vieneto ar naudotojo vieta, jai yra priskirtas turtas arba ji yra nurodyta kaip pagrindinė kitos vietos vieta. Atnaujinkite savo įrašus, kad jie nebeturėtų sąsajų su šia vieta ir bandykite dar kartą ',
+    'assoc_assets'	 => 'Ši vieta šiuo metu yra susieta bent su vienu turto vienetu ir negali būti panaikinta. Atnaujinkite savo turtą, kad nebebūtų sąsajos su šia vieta, ir bandykite dar kartą. ',
     'assoc_child_loc'	 => 'Ši vieta šiuo metu yra kaip pagrindinė bent vienai žemesnio lygio vietai ir negali būti panaikinta. Atnaujinkite savo žemesnio lygio vietas, kad nebebūtų sąsajos su šia vieta, ir bandykite dar kartą. ',
-    'assigned_assets' => 'Priskirta įranga',
+    'assigned_assets' => 'Priskirtas turtas',
     'current_location' => 'Dabartinė vieta',
+    'open_map' => 'Atidaryti :map_provider_icon žemėlapiuose',
 
 
     'create' => array(
@@ -20,6 +21,11 @@ return array(
         'success' => 'Vieta atnaujinta sėkmingai.'
     ),
 
+    'restore' => array(
+        'error'   => 'Vieta nebuvo atkurta. Bandykite dar kartą',
+        'success' => 'Vieta atkurta sėkmingai.'
+    ),
+
     'delete' => array(
         'confirm'   	=> 'Ar tikrai norite panaikinti šią vietą?',
         'error'   => 'Bandant panaikinti vietą įvyko klaida. Bandykite dar kartą.',
diff --git a/resources/lang/lt-LT/admin/locations/table.php b/resources/lang/lt-LT/admin/locations/table.php
index 0fde6df773..e118a92cff 100644
--- a/resources/lang/lt-LT/admin/locations/table.php
+++ b/resources/lang/lt-LT/admin/locations/table.php
@@ -2,9 +2,9 @@
 
 return [
     'about_locations_title'     => 'Apie vietas',
-    'about_locations'           => 'Vietos naudojamos stebėti naudotojų, įrangos ir kitų objektų buvimo vietą',
-    'assets_rtd'                => 'Įranga', // This has NEVER meant Assets Retired. I don't know how it keeps getting reverted.
-    'assets_checkedout'         => 'Priskirta įranga',
+    'about_locations'           => 'Vietos naudojamos stebėti naudotojų, turto ir kitų daiktų buvimo vietą',
+    'assets_rtd'                => 'Turtas', // This has NEVER meant Assets Retired. I don't know how it keeps getting reverted.
+    'assets_checkedout'         => 'Priskirtas turtas',
     'id'                        => 'ID',
     'city'                      => 'Miestas',
     'state'                     => 'Rajonas',
@@ -39,4 +39,5 @@ return [
     'signed_by_finance_auditor' => 'Pasirašė (Finansų auditorius):',
     'signed_by_location_manager' => 'Pasirašė (Vietos valdytojas):',
     'signed_by'                 => 'Patvirtino:',
+    'clone'  					=> 'Clone Location',
 ];
diff --git a/resources/lang/lt-LT/admin/manufacturers/message.php b/resources/lang/lt-LT/admin/manufacturers/message.php
index c4e026dc7b..512e45b0ba 100644
--- a/resources/lang/lt-LT/admin/manufacturers/message.php
+++ b/resources/lang/lt-LT/admin/manufacturers/message.php
@@ -2,7 +2,7 @@
 
 return array(
 
-    'support_url_help' => 'Kintamieji: <code>{LOCALE}</code>, <code>{SERIAL}</code>, <code>{MODEL_NUMBER}</code> ir <code>{MODEL_NAME}</code> gali būti naudojami jūsų URL, kad šios reikšmės būtų automatiškai įvestos peržiūrint išteklius, pvz., https://checkcoverage.apple.com/{LOCALE}/{SERIAL}.',
+    'support_url_help' => 'Kintamieji: <code>{LOCALE}</code>, <code>{SERIAL}</code>, <code>{MODEL_NUMBER}</code> ir <code>{MODEL_NAME}</code> gali būti naudojami jūsų URL, kad šios reikšmės būtų automatiškai įvestos, kai peržiūrite turtą. Pvz., https://checkcoverage.apple.com/{LOCALE}/{SERIAL}.',
     'does_not_exist' => 'Tokio gamintojo nėra.',
     'assoc_users'	 => 'Šis gamintojas šiuo metu yra susieta bent su vienu modeliu ir negali būti panaikintas. Atnaujinkite savo modelius, kad nebebūtų sąsajos su šiuo gamintoju, ir bandykite dar kartą. ',
 
diff --git a/resources/lang/lt-LT/admin/manufacturers/table.php b/resources/lang/lt-LT/admin/manufacturers/table.php
index 0acbec69a1..d7d883d8ca 100644
--- a/resources/lang/lt-LT/admin/manufacturers/table.php
+++ b/resources/lang/lt-LT/admin/manufacturers/table.php
@@ -2,8 +2,8 @@
 
 return array(
     'about_manufacturers_title'    => 'Apie gamintojus',
-    'about_manufacturers_text'  => 'Gamintojai yra įmonės, pagaminusios jūsų įrangą. Čia galite saugoti svarbią jų palaikymo kontaktinę informaciją, kuri bus rodoma jūsų įrangos išsamios informacijos puslapiuose.',
-    'asset_manufacturers'	=> 'Įrangos gamintojai',
+    'about_manufacturers_text'  => 'Gamintojai yra įmonės, pagaminusios jūsų turtą. Čia galite saugoti svarbią jų palaikymo kontaktinę informaciją, kuri bus rodoma jūsų turto išsamios informacijos puslapiuose.',
+    'asset_manufacturers'	=> 'Turto gamintojai',
     'create'				=> 'Sukurti gamintoją',
     'id'   					=> 'ID',
     'name'      			=> 'Pavadinimas',
diff --git a/resources/lang/lt-LT/admin/models/general.php b/resources/lang/lt-LT/admin/models/general.php
index 2ca1e8d9b9..86356a60b3 100644
--- a/resources/lang/lt-LT/admin/models/general.php
+++ b/resources/lang/lt-LT/admin/models/general.php
@@ -1,15 +1,15 @@
 <?php
 
 return array(
-    'about_models_title'     => 'Apie įrangos modelius',
-    'about_models_text'           => 'Įrangos modeliai yra būdas grupuoti identišką įrangą. („MBP 2013“, „IPhone 6s“ ir kt.)',
-    'deleted'  					        => 'Šis modelis buvo panaikintas.',
-    'bulk_delete'               => 'Panaikinti kelis modelius',
-    'bulk_delete_help'               => 'Naudokite žemiau esančius žymimuosius laukelius, kad patvirtintumėte pasirinktų įrangos modelių panaikinimą. Įrangos modelių, su kuriais yra susieta įranga, negalima ištrinti tol, kol ši įranga nebus susieti su kitu modeliu.',
-    'bulk_delete_warn'          => 'Ketinate panaikinti vieną įrangos modelį.|Ketinate panaikinti :model_count įrangos modelius.',
+    'about_models_title'     => 'Apie turto modelius',
+    'about_models_text'           => 'Turto modeliai yra būdas grupuoti identišką turtą. („MBP 2013“, „IPhone 6s“ ir kt.)',
+    'deleted'  					=> 'Šis modelis buvo panaikintas.',
+    'bulk_delete'               => 'Panaikinti kelis turto modelius',
+    'bulk_delete_help'               => 'Naudokite žemiau esančius žymimuosius laukelius, kad patvirtintumėte pasirinktų turto modelių panaikinimą. Turto modelių, su kuriais yra susietas turtas, negalima ištrinti tol, kol šis turtas nebus susietas su kitu modeliu.',
+    'bulk_delete_warn'          => 'Ketinate panaikinti vieną turto modelį.|Ketinate panaikinti :model_count turto modelius (-ų).',
     'restore'                   => 'Atkurti modelį',
     'requestable'               => 'Naudotojai gali užsakyti šį modelį',
-	'show_mac_address'			      => 'Rodyti MAC adreso lauką šio modelio įrangai',
+	'show_mac_address'			      => 'Rodyti MAC adreso lauką šio modelio turtui',
     'view_deleted'              => 'Peržiūrėti panaikintus',
     'view_models'               => 'Peržiūrėti modelius',
     'fieldset'                  => 'Laukų rinkinys',
diff --git a/resources/lang/lt-LT/admin/models/message.php b/resources/lang/lt-LT/admin/models/message.php
index 188724cdf6..339e888d3e 100644
--- a/resources/lang/lt-LT/admin/models/message.php
+++ b/resources/lang/lt-LT/admin/models/message.php
@@ -2,17 +2,17 @@
 
 return array(
 
-    'deleted' => 'Panaikintas įrangos modelis',
+    'deleted' => 'Panaikintas turto modelis',
     'does_not_exist' => 'Tokio modelio nėra.',
-    'no_association' => 'ĮSPĖJIMAS! Tokio įrangos modelio nėra arba jis netinkamas!',
-    'no_association_fix' => 'Tai sugadins dalykus keistais ir siaubingais būdais. Nedelsdami redaguokite šią įrangą ir priskirkite jai modelį.',
-    'assoc_users'	 => 'Šis modelis šiuo metu susietas su bent vienu įrangos vienetu, todėl negali būti panaikintas. Panaikinkite šią įrangą, tuomet vėl bandykite panaikinti modelį. ',
-
+    'no_association' => 'ĮSPĖJIMAS! Tokio turto modelio nėra arba jis neteisingas!',
+    'no_association_fix' => 'Tai sugadins dalykus keistais ir siaubingais būdais. Nedelsdami redaguokite šį turtą ir priskirkite jam modelį.',
+    'assoc_users'	 => 'Šis modelis šiuo metu susietas su bent vienu turto vienetu, todėl negali būti panaikintas. Panaikinkite šį turtą, tuomet vėl bandykite panaikinti modelį. ',
+    'invalid_category_type' => 'Kategorija turi būti turto kategorija.',
 
     'create' => array(
         'error'   => 'Modelis nebuvo panaikintas, bandykite dar kartą.',
         'success' => 'Modelis sukurtas sėkmingai.',
-        'duplicate_set' => 'Įrangos modelis su tokiu pavadinimu, gamintoju ir modelio numeriu jau yra.',
+        'duplicate_set' => 'Turto modelis su tokiu pavadinimu, gamintoju ir modelio numeriu jau yra.',
     ),
 
     'update' => array(
@@ -21,7 +21,7 @@ return array(
     ),
 
     'delete' => array(
-        'confirm'   => 'Ar tikrai norite panaikinti šį įrangos modelį?',
+        'confirm'   => 'Ar tikrai norite panaikinti šį turto modelį?',
         'error'   => 'Bandant panaikinti modelį įvyko klaida. Bandykite dar kartą.',
         'success' => 'Modelis panaikintas sėkmingai.'
     ),
@@ -40,8 +40,8 @@ return array(
 
     'bulkdelete' => array(
         'error'   		    => 'Nebuvo pasirinktas joks modelis, todėl niekas nebuvo panaikinta.',
-        'success' 		    => 'Modelis panaikintas!|:success_count modeliai panaikinti!',
-        'success_partial' 	=> 'Panaikinti modeliai – :success_count, tačiau dar :fail_count nepavyko panaikinti, nes vis dar yra su jais susietos įrangos.'
+        'success' 		    => 'Modelis panaikintas! :success_count modeliai panaikinti!',
+        'success_partial' 	=> 'Panaikinti modeliai – :success_count, tačiau dar :fail_count nepavyko panaikinti, nes vis dar yra su jais susieto turto.'
     ),
 
 );
diff --git a/resources/lang/lt-LT/admin/models/table.php b/resources/lang/lt-LT/admin/models/table.php
index 696a2c1fdb..ac9059f566 100644
--- a/resources/lang/lt-LT/admin/models/table.php
+++ b/resources/lang/lt-LT/admin/models/table.php
@@ -2,16 +2,16 @@
 
 return array(
 
-    'create'				=> 'Sukurti įrangos modelį',
+    'create'				=> 'Sukurti turto modelį',
     'created_at' 			=> 'Sukurta',
     'eol'	 				=> 'Nurašymo data',
     'modelnumber'   		=> 'Modelio Nr.',
-    'name'      			=> 'Įrangos modelio pavadinimas',
-    'numassets' 			=> 'Įranga',
-    'title'					=> 'Įrangos modeliai',
-    'update'				=> 'Atnaujinti įrangos modelį',
-    'view'					=> 'Peržiūrėti įrangos modelį',
-    'update'				=> 'Atnaujinti įrangos modelį',
+    'name'      			=> 'Turto modelio pavadinimas',
+    'numassets' 			=> 'Turtas',
+    'title'					=> 'Turto modeliai',
+    'update'				=> 'Atnaujinti turto modelį',
+    'view'					=> 'Peržiūrėti turto modelį',
+    'update'				=> 'Atnaujinti turto modelį',
     'clone'				=> 'Klonuoti modelį',
     'edit'				=> 'Redaguoti modelį',
 );
diff --git a/resources/lang/lt-LT/admin/reports/general.php b/resources/lang/lt-LT/admin/reports/general.php
index 62e2a81aa7..fbbcda1f13 100644
--- a/resources/lang/lt-LT/admin/reports/general.php
+++ b/resources/lang/lt-LT/admin/reports/general.php
@@ -1,9 +1,10 @@
 <?php
 
 return [
-    'info'   => 'Pasirinkite tai, ką norite matyti savo įrangos ataskaitoje.',
+    'info'   => 'Pasirinkite tai, ką norite matyti savo turto ataskaitoje.',
     'deleted_user' => 'Panaikintas naudotojas',
     'send_reminder' => 'Siųsti priminimą',
+    'cannot_send_reminder' => 'Naudotojas buvo panaikintas arba neturi el. pašto adreso, todėl negali gauti priminimo',
     'reminder_sent' => 'Priminimas išsiųstas',
     'acceptance_deleted' => 'Sutikimo užklausa panaikinta',
     'acceptance_request' => 'Sutikimo užklausa',
@@ -13,5 +14,10 @@ return [
         'user_state' => 'Naudotojo rajonas',
         'user_country' => 'Naudotojo šalis',
         'user_zip' => 'Naudotojo pašto kodas'
-    ]
-];
\ No newline at end of file
+    ],
+    'open_saved_template' => 'Atverti išsaugotą šabloną',
+    'save_template' =>  'Išsaugoti šabloną',
+    'select_a_template' => 'Pasirinkti šabloną',
+    'template_name' => 'Šablono pavadinimas',
+    'update_template' => 'Atnaujinti šabloną',
+];
diff --git a/resources/lang/lt-LT/admin/reports/message.php b/resources/lang/lt-LT/admin/reports/message.php
index bebb0e973d..d7b5bcb0dc 100644
--- a/resources/lang/lt-LT/admin/reports/message.php
+++ b/resources/lang/lt-LT/admin/reports/message.php
@@ -1,5 +1,16 @@
 <?php
 
-return array(
-    'error'   => 'Jūs turite pasirinkti bent vieną parametrą.'
-);
+return [
+    'about_templates' => 'Apie išsaugotus šablonus',
+    'saving_templates_description' => 'Atlikite nustatymus, tada aukščiau esančiame laukelyje įveskite šablono pavadinimą ir spustelėkite mygtuką „Išsaugoti šabloną“. Norėdami pasirinkti anksčiau išsaugotą šabloną, naudokite išskleidžiamąjį meniu.',
+    'create'  => [
+        'success' => 'Šablonas išsaugotas sėkmingai',
+    ],
+    'update' => [
+        'success' => 'Šablonas atnaujintas sėkmingai',
+    ],
+    'delete' => [
+        'success' => 'Šablonas panaikintas',
+        'no_delete_permission' => 'Tokio šablono nėra arba jūs neturite teisės jį ištrinti.',
+    ],
+];
diff --git a/resources/lang/lt-LT/admin/settings/general.php b/resources/lang/lt-LT/admin/settings/general.php
index ca73055180..11970a3727 100644
--- a/resources/lang/lt-LT/admin/settings/general.php
+++ b/resources/lang/lt-LT/admin/settings/general.php
@@ -8,38 +8,41 @@ return [
     'ad_append_domain'          => 'Pridėti domeno pavadinimą prie naudotojo vardo lauko',
     'ad_append_domain_help'     => 'Naudotojas neprivalo įvesti „naudotojovardas@domain.local“, jis gali tiesiog įvesti „naudotojovardas“.',
     'admin_cc_email'            => 'El. paštas kopijai',
-    'admin_cc_email_help'       => 'Jei norite siųsti naudotojams siunčiamų išdavimo/paėmimo el. laiškų kopijas į papildomą el. pašto adresą, įveskite jį čia. Kitu atveju palikite šį lauką tuščią.',
+    'admin_cc_email_help'       => 'Send a copy of checkin/checkout emails to this address.',
     'admin_settings'            => 'Administratoriaus nustatymai',
     'is_ad'				        => 'Tai yra Active Directory serveris',
     'alerts'                	=> 'Įspėjimai',
     'alert_title'               => 'Atnaujinti pranešimų nustatymus',
     'alert_email'				=> 'Siųsti įspėjimus į',
-    'alert_email_help'    => 'El. pašto adresai arba platinimo sąrašai, kuriems norite siųsti įspėjimus, atskirti kableliais',
+    'alert_email_help'          => 'El. pašto adresai arba platinimo sąrašai, kuriems norite siųsti įspėjimus, atskirti kableliais.',
     'alerts_enabled'			=> 'Įspėjimai įjungti',
     'alert_interval'			=> 'Įspėjimų apie garantijos pabaigą slenkstis (dienomis)',
     'alert_inv_threshold'		=> 'Įspėjimo apie atsargas slenkstis (vienetais)',
     'allow_user_skin'           => 'Įgalinti naudotojo temas',
     'allow_user_skin_help_text' => 'Pažymėjus šį langelį, naudotojas galės pasikeisti numatytąją sąsajos temą kita.',
-    'asset_ids'					=> 'Įrangos ID',
+    'asset_ids'					=> 'Turto ID',
     'audit_interval'            => 'Audito intervalas',
-    'audit_interval_help'       => 'Jei jums reikia reguliariai fiziškai tikrinti savo įrangą, nurodykite naudojamą intervalą mėnesiais. Atnaujinus šią reikšmę, bus atnaujintos visos „kito audito datos“ tai įrangai, kuriai yra nurodyta būsimo audito data.',
+    'audit_interval_help'       => 'Jei jums reikia reguliariai fiziškai audituoti savo turtą, nurodykite naudojamą intervalą mėnesiais. Atnaujinus šią reikšmę, bus atnaujintos visos „kito audito datos“ tam turtui, kuriam yra nurodyta būsimo audito data.',
     'audit_warning_days'        => 'Išankstinis įspėjimas apie auditą',
-    'audit_warning_days_help'   => 'Prieš kiek dienų turėtume jus įspėti, kai turi būti atliktas įrangos auditas?',
+    'audit_warning_days_help'   => 'Prieš kiek dienų turėtume jus įspėti, kad turi būti atliktas turto auditas?',
     'auto_increment_assets'		=> 'Generuoti automatiškai didėjančius inventorinius numerius',
     'auto_increment_prefix'		=> 'Prefiksas (pasirinktinai)',
     'auto_incrementing_help'    => 'Norėdami tai nustatyti, pirmiausia įjunkite automatiškai didėjančius inventorinius numerius',
-    'backups'					=> 'Atsarginė kopija',
+    'backups'					=> 'Atsarginės kopijos',
     'backups_help'              => 'Kurti, atsisiųsti ir atkurti atsargines kopijas ',
     'backups_restoring'         => 'Atkurti iš atsarginės kopijos',
+    'backups_clean' => 'Išvalyti išsaugotą duomenų bazę prieš atkūrimą',
+    'backups_clean_helptext' => "Tai gali būti naudinga, jei keičiate duomenų bazės versiją",
     'backups_upload'            => 'Įkelti atsarginę kopiją',
     'backups_path'              => 'Atsarginės kopijos serveryje saugomos <code>:path</code>',
-    'backups_restore_warning'   => 'Naudokite atkūrimo mygtuką <small><span class="btn btn-xs btn-warning"><i class="text-white fas fa-retweet" aria-hidden="true"></i></span> </small>, jei norite atkurti iš ankstesnės atsarginės kopijos. (Šiuo metu tai neveikia naudojant S3 failų saugyklą arba „Docker“.)<br><br>Jūsų <strong>visa :app_name duomenų bazė ir visi įkelti failai bus visiškai pakeisti</strong> tuo, kas yra atsarginės kopijos faile.  ',
+    'backups_restore_warning'   => 'Use the restore button <small><span class="btn btn-xs btn-warning"><i class="text-white fas fa-retweet" aria-hidden="true"></i></span></small> to restore from a previous backup. (This does not currently work with S3 file storage or Docker.)<br><br>Your <strong>entire :app_name database and any uploaded files will be completely replaced</strong> by what\'s in the backup file  ',
     'backups_logged_out'         => 'Kai atkūrimas bus baigtas, visi esami naudotojai, įskaitant jus, bus atjungti.',
     'backups_large'             => 'Atkuriant labai dideles atsargines kopijas, gali pasibaigti tam skirtas laikas, todėl vis tiek gali tekti atkūrimui naudoti komandinę eilutę. ',
     'barcode_settings'			=> 'Brūkšninio kodo nustatymai',
     'confirm_purge'			    => 'Patvirtinkite išvalymą',
     'confirm_purge_help'		=> 'Įveskite tekstą „DELETE“ į žemiau esantį lauką, kad išvalytumėte panaikintus įrašus. Šio veiksmo anuliuoti negalima, o visi programiškai panaikinti elementai ir naudotojai bus NEGRĮŽTAMAI ištrinti. (Pirmiausia turėtumėte sukurti atsarginę kopiją, kad būtumėte saugūs.)',
     'custom_css'				=> 'Pritaikytas CSS',
+    'custom_css_placeholder'	=> 'Pridėkite tinkintą CSS',
     'custom_css_help'			=> 'Įveskite bet kokius individualius CSS pakeitimus, kuriuos norite naudoti. Neįtraukite &lt;style&gt;&lt;/style&gt; žymų.',
     'custom_forgot_pass_url'	=> 'Tinkinta slaptažodžio nustatymo iš naujo nuoroda',
     'custom_forgot_pass_url_help'	=> 'Tai pakeičia integruotą pamiršto slaptažodžio nuorodą prisijungimo ekrane, naudinga norint nukreipti žmones į vidinę arba priglobtą LDAP slaptažodžio nustatymo iš naujo funkciją. Tai visiškai išjungs vietinio naudotojo pamiršto slaptažodžio nustatymo iš naujo funkciją.',
@@ -47,35 +50,35 @@ return [
     'dashboard_message_help'	=> 'Šis tekstas valdymo skyde bus rodomas visiems, turintiems teisę matyti valdymo skydą.',
     'default_currency'  		=> 'Numatytoji valiuta',
     'default_eula_text'			=> 'Numatytasis licencinis sutikimas (EULA)',
+    'default_eula_text_placeholder' => 'Add your default EULA text',
     'default_language'			=> 'Numatytoji kalba',
-    'default_eula_help_text'	=> 'Taip pat galite susieti tinkintus licencinius sutikimus (EULA) su konkrečiomis įrangos grupėmis.',
+    'default_eula_help_text'	=> 'Taip pat galite susieti tinkintus licencinius sutikimus (EULA) su konkrečiomis turto grupėmis.',
     'acceptance_note'           => 'Pridėkite pastabą prie savo sprendimo (nebūtina)',
-    'display_asset_name'        => 'Rodyti įrangos pavadinimą',
+    'display_asset_name'        => 'Rodyti turto pavadinimą',
     'display_checkout_date'     => 'Rodyti išdavimo datą',
-    'display_eol'               => 'Rodyti įrangos nurašymo datas lentelės rodinyje',
-    'display_qr'                => 'Rodyti kvadratinius kodus',
-    'display_alt_barcode'		=> 'Rodyti 1D brūkšninius kodus',
-    'email_logo'                => 'El. pašto logotipas',
+    'display_eol'               => 'Rodyti nurašymo datas lentelės rodinyje',
+    'display_qr'                => 'Rodyti 2D brūkšninį kodą',
+    'display_alt_barcode'		=> 'Rodyti 1D brūkšninį kodą',
     'barcode_type'				=> '2D brūkšninio kodo tipas',
     'alt_barcode_type'			=> '1D brūkšninio kodo tipas',
-    'email_logo_size'       => 'Kvadratiniai logotipai laiškuose atrodo geriausiai. ',
     'enabled'                   => 'Įjungta',
     'eula_settings'				=> 'Licencinio sutikimo (EULA) nustatymai',
     'eula_markdown'				=> 'Šis licencinis sutikimas (EULA) leidžia naudoti <a href="https://help.github.com/articles/github-flavored-markdown/">Github tipo žymėjimą (markdown)</a>.',
+    'empty_row_count'           => 'Field Start Offset (Empty Rows)',
+    'empty_row_count_help'      => 'Fields will begin populating after this many empty rows are skipped at the top of the label.',
     'favicon'                   => 'Puslapio ikonėlė (Favicon)',
     'favicon_format'            => 'Priimtini failų tipai yra ico, png ir gif. Kiti vaizdo formatai gali veikti ne visose naršyklėse.',
     'favicon_size'          => 'Puslapio ikonėlės (Favicons) turėtų būti kvadratiniai atvaizdai, 16 x 16 pikselių dydžio.',
     'footer_text'               => 'Papildomas poraštė tekstas ',
     'footer_text_help'          => 'Šis tekstas bus rodomas dešinėje poraštės pusėje. Nuorodos leidžiamos naudojant <a href="https://help.github.com/articles/github-flavored-markdown/">Github tipo žymėjimą (markdown)</a>. Eilučių lūžiai, antraštės, atvaizdai ir kt. gali sukelti nenuspėjamus rezultatus.',
+    'footer_text_placeholder'   => 'Pasirinktinis poraštės tekstas',
     'general_settings'			=> 'Bendrieji nustatymai',
-    'general_settings_keywords' => 'įmonės palaikymas, parašas, sutikimas, el. laiško formatas, naudotojo vardo formatas, atvaizdai, viename puslapyje, miniatiūra, eula, gravatar, paslaugos sąlygos, valdymo skydas, privatumas',
     'general_settings_help'     => 'Numatytasis licencinis sutikimas (EULA) ir kita',
     'generate_backup'			=> 'Kurti atsarginę kopiją',
     'google_workspaces'         => 'Google Workspaces',
     'header_color'              => 'Atraštės spalva',
     'info'                      => 'Šie nustatymai leidžia tinkinti tam tikrus diegimo aspektus.',
-    'label_logo'                => 'Etiketės logotipas',
-    'label_logo_size'           => 'Kvadratiniai logotipai atrodo geriausiai – bus rodomi kiekvienos įrangos etiketės viršuje, dešinėje. ',
+    'label_logo_size'           => 'Kvadratiniai logotipai atrodo geriausiai – bus rodomi kiekvienos turto etiketės viršuje, dešinėje. ',
     'laravel'                   => 'Laravel versija',
     'ldap'                      => 'LDAP',
     'ldap_default_group'        => 'Numatytoji teisių grupė',
@@ -94,7 +97,7 @@ return [
     'ldap_login_sync_help'      => 'Tai tik patikrina ar LDAP sinchronizuoja teisingai. Jei jūsų LDAP autentifikavimo užklausa neteisinga, naudotojai vis tiek negalės prisijungti. PIRMIAUSIA TURITE IŠSAUGOTI ATNAUJINTUS LDAP NUSTATYMUS.',
     'ldap_manager'              => 'LDAP vadovas',
     'ldap_server'               => 'LDAP serveris',
-    'ldap_server_help'          => 'Turėtų prasidėti su ldap:// (nešifruotas arba TLS) arba ldaps:// (jei tai SSL)',
+    'ldap_server_help'          => 'Turėtų prasidėti su ldap:// (nešifruotas) arba ldaps:// (jei tai TLS arba SSL)',
     'ldap_server_cert'			=> 'LDAP SSL sertifikato tikrinimas',
     'ldap_server_cert_ignore'	=> 'Leisti negaliojantį SSL sertifikatą',
     'ldap_server_cert_help'		=> 'Pažymėkite šį laukelį, jei naudojate paties pasirašytą SSL sertifikatą ir norite leisti naudoti negaliojantį SSL sertifikatą.',
@@ -108,8 +111,8 @@ return [
     'ldap_pword'                => 'LDAP susiejimo slaptažodis',
     'ldap_basedn'               => 'Base Bind DN',
     'ldap_filter'               => 'LDAP filtras',
-    'ldap_pw_sync'              => 'LDAP slaptažodžių sinchronizavimas',
-    'ldap_pw_sync_help'         => 'Atžymėkite šį langelį, jei nenorite, kad LDAP slaptažodžiai būtų sinchronizuojami su vietiniais slaptažodžiais. Tai išjungus, jūsų naudotojams gali nepavykti prisijungti, jei dėl kokios nors priežasties jūsų LDAP serveris būtų nepasiekiamas.',
+    'ldap_pw_sync'              => 'Saugoti LDAP slaptažodžius',
+    'ldap_pw_sync_help'         => 'Atžymėkite šį langelį jei nenorite, kad LDAP slaptažodžiai būtų saugomi talpykloje kaip vietiniai maišos slaptažodžiai. Jei tai išjungsite, jūsų naudotojai gali negalėti prisijungti, jei jūsų LDAP serveris dėl kokios nors priežasties bus nepasiekiamas.',
     'ldap_username_field'       => 'Naudotojo vardo laukas',
     'ldap_lname_field'          => 'Pavardė',
     'ldap_fname_field'          => 'LDAP Vardas',
@@ -117,13 +120,15 @@ return [
     'ldap_version'              => 'LDAP versija',
     'ldap_active_flag'          => 'LDAP Active Flag',
     'ldap_activated_flag_help'  => 'Ši reikšmė naudojama norint nustatyti, ar sinchronizuotas naudotojas gali prisijungti prie „Snipe-IT“. <strong>Tai neturi įtakos galimybei išduoti arba paimti daiktus iš šių naudotojų</strong> ir turėtų būti jūsų AD/LDAP <strong>atributo pavadinimas</strong>, o ne <strong>reikšmė</strong>. <br><br>Jei lauke nurodytas lauko pavadinimas, kurio nėra jūsų AD/LDAP, arba reikšmė AD/LDAP lauke nustatyta į <code>0</code> arba <code>false </code>, <strong>naudotojo prisijungimas bus išjungtas</strong>. Jei reikšmė AD/LDAP lauke nustatyta į <code>1</code> arba <code>true</code> arba <em>bet kokį kitą tekstą</em>, reiškia, kad naudotojas gali prisijungti. Kai jūsų AD šis laukas yra tuščias, bus paisoma atributo <code>userAccountControl</code>, kuris įprastai leidžia neišjungtiems naudotojams prisijungti.',
+    'ldap_invert_active_flag'   => 'Invertuoti LDAP „Active Flag“',
+    'ldap_invert_active_flag_help'     => 'Jei įjungta: kai LDAP „Active Flag“ grąžinama reikšmė yra <code>0</code> arba <code>false</code>, naudotojo paskyra bus aktyvi.',
     'ldap_emp_num'              => 'LDAP Darbuotojo numeris',
     'ldap_email'                => 'LDAP El. paštas',
     'ldap_test'                 => 'Testuoti LDAP',
     'ldap_test_sync'            => 'Testuoti LDAP sinchronizavimą',
     'license'                   => 'Programinės įrangos licencija',
-    'load_remote'               => 'Naudoti „Gravatar“',
-    'load_remote_help_text'		=> 'Atžymėkite šį langelį, jei jūsų diegimas negali vykdyti skriptų iš interneto. Tai neleis „Snipe-IT“ bandyti įkelti vaizdų iš „Gravatar“.',
+    'load_remote'               => 'Įkelti nuotolinius avatarus',
+    'load_remote_help_text'		=> 'Atžymėkite šį langelį, jei jūsų diegimas negali vykdyti skriptų iš interneto. Tai neleis „Snipe-IT“ bandyti įkelti avatarų iš „Gravatar“ ar kitų išorinių šaltinių.',
     'login'                     => 'Prisijungimo bandymai',
     'login_attempt'             => 'Prisijungimo bandymas',
     'login_ip'                  => 'IP adresas',
@@ -131,6 +136,7 @@ return [
     'login_user_agent'          => 'Naudotojo agentas',
     'login_help'                => 'Bandymų prisijungti sąrašas',
     'login_note'                => 'Prisijungimo pastaba',
+    'login_note_placeholder'            => "Jei neturite prisijungimo arba radote šiai įmonei priklausantį įrenginį, skambinkite techninės pagalbos telefonu 888-555-1212. Ačiū.",
     'login_note_help'           => 'Pasirinktinai įtraukite kelis sakinius į prisijungimo ekraną, pavyzdžiui, norėdami padėti žmonėms, radusiems pamestą arba pavogtą įrenginį. Šiame lauke galima naudoti <a href="https://help.github.com/articles/github-flavored-markdown/">Github tipo žymėjimą (markdown)</a>',
     'login_remote_user_text'    => 'Nuotolinio naudotojo prisijungimo parinktys',
     'login_remote_user_enabled_text' => 'Įjungti nuotolinį prisijungimą naudojant „Remote User Header“',
@@ -143,16 +149,19 @@ return [
     'login_remote_user_header_name_help' => 'Naudoti nurodytą antraštę, o ne REMOTE_USER',
     'logo'                    	=> 'Logotipas',
     'logo_print_assets'         => 'Naudoti spaudiniuose',
-    'logo_print_assets_help'    => 'Naudoti ženklinimą spausdinamuose įrangos sąrašuose ',
-    'full_multiple_companies_support_help_text' => 'Naudotojams (įskaitant administratorius), susietiems su konkrečia įmone, leisti pasiekti tik tos įmonės įrangą.',
+    'logo_print_assets_help'    => 'Naudoti ženklinimą spausdinamuose turto sąrašuose ',
+    'full_multiple_companies_support_help_text' => 'Naudotojams (įskaitant administratorius), susietiems su konkrečia įmone, leisti pasiekti tik tos įmonės turtą.',
     'full_multiple_companies_support_text' => 'Pilnas kelių įmonių palaikymas',
+    'scope_locations_fmcs_support_text'  => 'Scope Locations with Full Multiple Companies Support',
+    'scope_locations_fmcs_support_help_text'  => 'Restrict locations to their selected company.',
+    'scope_locations_fmcs_check_button' => 'Check Compatibility',
+    'scope_locations_fmcs_support_disabled_text'  => 'This option is disabled because you have conflicting locations set for :count or more items.',
     'show_in_model_list'   => 'Rodyti modelių išskleidžiamuosiuose meniu',
     'optional'					=> 'pasirinktinai',
     'per_page'                  => 'Rezultatų puslapyje',
     'php'                       => 'PHP versija',
     'php_info'                  => 'PHP informacija',
     'php_overview'              => 'PHP',
-    'php_overview_keywords'     => 'phpinfo, system, info',
     'php_overview_help'         => 'PHP sistemos informacija',
     'php_gd_info'               => 'Turite įdiegti php-gd, kad būtų rodomi QR kodai (žr. diegimo instrukcijas).',
     'php_gd_warning'            => 'Neįdiegti „PHP Image Processing“ ir „GD“ papildiniai.',
@@ -195,12 +204,12 @@ return [
     'setting'                   => 'Nustatymas',
     'settings'                  => 'Nustatymai',
     'show_alerts_in_menu'       => 'Rodyti įspėjimus viršutiniame meniu',
-    'show_archived_in_list'     => 'Archyvuota įranga',
-    'show_archived_in_list_text'     => 'Rodyti archyvuotą įrangą „visos įrangos“ sąraše',
-    'show_assigned_assets'      => 'Rodyti įrangą, priskirtą kitai įrangai',
-    'show_assigned_assets_help' => 'Rodyti įrangą, kuri buvo priskirta kitai įrangai, skiltyse: „Peržiūrėti naudotoją -> Įranga“, „Peržiūrėti naudotoją -> Informacija -> Spausdinti visą įrangą“ ir „Paskyra -> Peržiūrėti priskirtą įrangą".',
+    'show_archived_in_list'     => 'Archyvuotas turtas',
+    'show_archived_in_list_text'     => 'Rodyti archyvuotą turtą „viso turto“ sąraše',
+    'show_assigned_assets'      => 'Rodyti turtą, priskirtą kitam turtui',
+    'show_assigned_assets_help' => 'Rodyti turtą, kuris buvo priskirtas kitam turtui, skiltyse: „Peržiūrėti naudotoją -> Turtas“, „Peržiūrėti naudotoją -> Informacija -> Spausdinti visą turtą“ ir „Paskyra -> Peržiūrėti priskirtą turtą".',
     'show_images_in_email'     => 'Rodyti atvaizdus el. laiškuose',
-    'show_images_in_email_help'   => 'Nuimkite žymelę jeigu jūsų Snipe-IT diegimas yra už VPN arba uždarame tinkle, kitaip tinkle nesantys išorės naudotojai negalės įkelti el. laiškuose pateiktų atvaizdų.',
+    'show_images_in_email_help'   => 'Nuimkite žymelę jeigu jūsų Snipe-IT diegimas yra už VPN arba uždarame tinkle, kitaip tinkle nesantys išorės naudotojai negalės matyti el. laiškuose pateiktų atvaizdų.',
     'site_name'                 => 'Puslapio pavadinimas',
     'integrations'               => 'Integracijos',
     'slack'                     => 'Slack',
@@ -218,6 +227,8 @@ return [
     'webhook_integration_help'    => ':app integracija nėra privaloma, tačiau, jei norite ją naudoti, būtina nurodyti Endpoint ir Channel. Norėdami sukonfigūruoti :app integraciją, pirmiausia turite <a href=":webhook_link" target="_new" rel="noopener">sukurti įeinantį „Webhook“ pranešimą</a> savo :app paskyroje. Spustelėkite mygtuką <strong>Tikrinti :app integraciją</strong>, kad patvirtintumėte ar nustatymai yra teisingi, prieš juos išsaugodami. ',
     'webhook_integration_help_button'    => 'Išsaugojus :app informaciją, pasirodys testavimo mygtukas.',
     'webhook_test_help'           => 'Patikrinkite, ar jūsų :app integracija sukonfigūruota tinkamai. PIRMA PRIVALOTE IŠSAUGOTI ATNAUJINTUS :app NUSTATYMUS.',
+    'shortcuts_enabled'         => 'Įgalinti sparčiuosius klavišus',
+    'shortcuts_help_text'       => '<strong>Windows</strong>: Alt + prieigos klavišas, <strong>Mac</strong>: Control + Option + prieigos klavišas',
     'snipe_version'  			=> 'Snipe-IT versija',
     'support_footer'            => 'Palaikymo nuorodos poraštėje ',
     'support_footer_help'       => 'Nurodykite, kas mato nuorodas į Snipe-IT palaikymo informaciją ir naudotojo vadovą',
@@ -227,7 +238,6 @@ return [
     'update'                    => 'Atnaujinti nustatymus',
     'value'                     => 'Reikšmė',
     'brand'                     => 'Ženklodara',
-    'brand_keywords'            => 'poraštė, logotipas, spaudiniai, tema, apipavidalinimas, antraštė, spalvos, spalva, css',
     'brand_help'                => 'Logotipas, Puslapio pavadinimas',
     'web_brand'                 => 'Žiniatinklio ženklodaros tipas',
     'about_settings_title'      => 'Apie nustatymus',
@@ -267,7 +277,7 @@ return [
     'two_factor_reset_error'          => 'Dviejų veiksnių įrenginio nustatymas iš naujo nepavyko',
     'two_factor_enabled_warning'        => 'Įjungus dviejų veiksnių autentifikaciją (jei ji šiuo metu nėra įjungta) būsite iš karto priversti autentifikuotis naudojant „Google Authenticator“ užregistruotą įrenginį. Jei šiuo metu neturite užregistruoto įrenginio, tai turėsite galimybę jį užregistruoti.',
     'two_factor_enabled_help'        => 'Bus įjungta dviejų veiksnių autentifikacija naudojant „Google Authenticator“.',
-    'two_factor_optional'        => 'Atrankinis (vartotojai gali įjungti arba išjungti, jei tai leidžiama)',
+    'two_factor_optional'        => 'Pasirinktinis (naudotojai gali įjungti arba išjungti, jei tai leidžiama)',
     'two_factor_required'        => 'Privalomas visiems naudotojams',
     'two_factor_disabled'        => 'Išjungta',
     'two_factor_enter_code'	=> 'Įveskite dviejų veiksnių kodą',
@@ -275,7 +285,9 @@ return [
     'two_factor_enabled_edit_not_allowed' => 'Jūsų administratorius neleidžia keisti šio nustatymo.',
     'two_factor_enrollment_text'	=> "Būtina dviejų veiksnių autentifikacija, tačiau jūsų dar nesate užregistravę įrenginio. Norėdami užregistruoti įrenginį, jame atidarykite „Google Authenticator“ programą ir nuskaitykite čia pateiktą QR kodą. Užregistravę įrenginį, įveskite jo ekrane rodomą kodą į žemiau esantį lauką",
     'require_accept_signature'      => 'Reikalauti parašo',
-    'require_accept_signature_help_text'      => 'Jei įjungsite šią funkciją, naudotojai turės fiziškai pasirašyti už jiems išduodamą įrangą.',
+    'require_accept_signature_help_text'      => 'Jei įjungsite šią funkciją, naudotojai turės fiziškai pasirašyti už jiems išduodamą turtą.',
+    'require_checkinout_notes'  => 'Reikalauti pastabų paimant/išduodant',
+    'require_checkinout_notes_help_text'    => 'Įjungus šią funkciją, bus būtina užpildyti pastabų laukus paimant ar išduodant turtą.',
     'left'        => 'kairėje',
     'right'        => 'dešinėje',
     'top'        => 'viršuje',
@@ -283,7 +295,7 @@ return [
     'vertical'        => 'vertikalus',
     'horizontal'        => 'horizontalus',
     'unique_serial'                => 'Unikalus serijinis numeris',
-    'unique_serial_help_text'                => 'Pažymėjus šį langelį, bus užtikrinamas įrangos serijinių numerių unikalumas',
+    'unique_serial_help_text'                => 'Pažymėjus šį langelį, bus užtikrinamas turto serijinių numerių unikalumas',
     'zerofill_count'        => 'Inventorinių numerių ilgis, įskaitant priekinius nulius',
     'username_format_help'   => 'Šis nustatymas bus naudojamas importavimo procese tik tuo atveju, jei naudotojo vardas nebus pateiktas ir mes turėsime sugeneruoti naudotojo vardą.',
     'oauth_title' => 'OAuth API nustatymai',
@@ -313,24 +325,24 @@ return [
     'filter_by_keyword' => 'Filtruoti pagal nustatymų raktažodį',
     'security' => 'Saugumas',
     'security_title' => 'Atnaujinti saugumo nustatymus',
-    'security_keywords' => 'slaptažodis, slaptažodžiai, reikalavimai, dviejų faktorių, dviejų veiksnių, įprasti slaptažodžiai, nuotolinis prisijungimas, atsijungimas, autentifikavimas',
     'security_help' => 'Dviejų veiksnių, slaptažodžio apribojimai',
-    'groups_keywords' => 'teisės, teisių grupės, autorizacija',
     'groups_help' => 'Paskyros teisių grupės',
     'localization' => 'Lokalizacija',
     'localization_title' => 'Atnaujinti lokalizacijos nustatymus',
-    'localization_keywords' => 'lokalizacija, valiuta, vietinis, lokalė, laiko juosta, laiko juosta, tarptautinis, internacionalizavimas, kalba, kalbos, vertimas',
     'localization_help' => 'Kalba, datos atvaizdavimas',
     'notifications' => 'Pranešimai',
     'notifications_help' => 'El. pašto įspėjimų ir audito nustatymai',
     'asset_tags_help' => 'Didinimas ir prefiksai',
     'labels' => 'Etiketės',
     'labels_title' => 'Atnaujinti etikečių nustatymus',
-    'labels_help' => 'Etikečių dydžiai ir nustatymai',
-    'purge_keywords' => 'ištrinti visam laikui',
+    'labels_help' => 'Brūkšninių kodų ir etikečių nustatymai',
     'purge_help' => 'Išvalyti ištrintus įrašus',
     'ldap_extension_warning' => 'Panašu, kad šiame serveryje nėra įdiegtas arba įjungtas LDAP plėtinys. Vis tiek galite išsaugoti nustatymus, bet turėsite įjungti LDAP plėtinį PHP, kad veiktų LDAP sinchronizavimas arba prisijungimas.',
     'ldap_ad' => 'LDAP/AD',
+    'ldap_test_label' => 'Tikrinti LDAP sinchronizaciją',
+    'ldap_test_login' => ' Tikrinti LDAP prisijungimą',
+    'ldap_username_placeholder' => 'LDAP naudotojo vardas',
+    'ldap_password_placeholder' => 'LDAP slaptažodis',
     'employee_number' => 'Darbuotojo numeris',
     'create_admin_user' => 'Sukurti naudotoją ::',
     'create_admin_success' => 'Pavyko! Jūsų administratoriaus naudotojas buvo sukurtas!',
@@ -342,26 +354,31 @@ return [
     'setup_migration_create_user' => 'Kitas: Sukurti naudotoją',
     'ldap_settings_link' => 'LDAP nustatymų puslapis',
     'slack_test' => 'Patikrinti <i class="fab fa-slack"></i> integraciją',
+    'status_label_name' => 'Būsenos žymos pavadinimas',
+    'super_admin_only'  => 'Tik superadministratoriams',
     'label2_enable'           => 'Naujas etikečių variklis',
     'label2_enable_help'      => 'Perjunkite į naują etikečių variklį. <b>Pastaba: turėsite išsaugoti šį nustatymą prieš nustatydami kitus.</b>',
     'label2_template'         => 'Šablonas',
     'label2_template_help'    => 'Pasirinkite, kurį šabloną naudoti etikečių generavimui',
     'label2_title'            => 'Antraštė',
     'label2_title_help'       => 'Antraštė, kuri atvaizduojama tai palaikančiose etiketėse',
-    'label2_title_help_phold' => 'Vietaženklis <code>{COMPANY}</code> bus pakeistas įrangos įmonės pavadinimu',
-    'label2_asset_logo'       => 'Naudoti įrangos logotipą',
-    'label2_asset_logo_help'  => 'Naudokite įrangai priskirtos įmonės logotipą, o ne <code>:setting_name</code> reikšmę',
+    'label2_title_help_phold' => 'Vietaženklis <code>{COMPANY}</code> bus pakeistas turto įmonės pavadinimu',
+    'label2_asset_logo'       => 'Naudoti turto logotipą',
+    'label2_asset_logo_help'  => 'Naudokite turtui priskirtos įmonės logotipą, o ne <code>:setting_name</code> reikšmę',
     'label2_1d_type'          => '1D brūkšninio kodo tipas',
     'label2_1d_type_help'     => '1D brūkšninio kodo formatas',
     'label2_2d_type'          => '2D brūkšninio kodo tipas',
     'label2_2d_type_help'     => '2D brūkšninio kodo formatas',
     'label2_2d_target'        => '2D brūkšninio kodo kelias',
-    'label2_2d_target_help'   => 'Adresas (URL), į kurį nukreipiama nuskaičius 2D brūkšninį kodą',
+    'label2_2d_target_help'   => 'Duomenys, kurie bus 2D brūkšniniame kode',
     'label2_fields'           => 'Laukų apibrėžimai',
     'label2_fields_help'      => 'Laukus galima pridėti, pašalinti ir pertvarkyti kairiajame stulpelyje. Kiekvienam laukui, dešiniajame stulpelyje galima pridėti kelias etiketės ir „DataSource“ parinktis, taip pat, jas pašalinti ir pertvarkyti.',
+    'purge_barcodes' => 'Išvalyti brūkšninius kodus',
     'help_asterisk_bold'    => 'Tekstas, įvestas kaip <code>**tekstas**</code>, bus rodomas paryškintu šriftu',
     'help_blank_to_use'     => 'Palikite tuščią, kad būtų nauudojama <code>:setting_name</code> reikšmė',
     'help_default_will_use' => '<code>:default</code> naudos reikšmę iš <code>:setting_name</code>. <br>Atkreipkite dėmesį, kad brūkšninio kodo reikšmė turi atitikti atitinkamą brūkšninio kodo specifikaciją tam, kad būtų sėkmingai sugeneruota. Jei reikia daugiau informacijos, peržiūrėkite <a href="https://snipe-it.readme.io/docs/barcodes">dokumentaciją<i class="fa fa-external-link"></i></a>. ',
+    'asset_id'              => 'Turto ID',
+    'data'               => 'Duomenys',
     'default'               => 'Numatytasis',
     'none'                  => 'Joks',
     'google_callback_help' => 'Čia turėtų būti nurodytas tas pats autorizacijos tikrinimo adresas (URL), kurį nurodėte savo organizacijos „Google OAuth“ programos nustatymuose adresu <strong><a href="https://console.cloud.google.com/" target="_blank">„Google Developer Console“ <i class="fa fa-external-link" aria-hidden="true"></i></a></strong>.',
@@ -373,7 +390,100 @@ return [
     'database_driver' => 'Duomenų bazės tvarkyklės',
     'bs_table_storage' => 'Lentelių saugojimas',
     'timezone' => 'Laiko juosta',
+    'test_mail' => 'Tikrinti el. pašto nustatymus',
     'profile_edit'          => 'Redaguoti profilį',
     'profile_edit_help'          => 'Leisti naudotojams redaguoti savo profilius.',
+    'default_avatar' => 'Pasirinktinis numatytasis avataras',
+    'default_avatar_help' => 'Jei naudotojas neturi profilio nuotraukos, šis atvaizdas bus rodomas jo profilyje.',
+    'restore_default_avatar' => 'Atkurti <a href=":default_avatar" data-toggle="lightbox" data-type="image">pradinį sistemos numatytąjį avatarą</a>',
+    'restore_default_avatar_help' => '',
+    'due_checkin_days' => 'Įspėjimas, kad reikia paimti',
+    'due_checkin_days_help' => 'Likus kiek dienų iki numatomo turto paėmimo, jis turėtų būti rodomas puslapyje „Laukia paėmimo“?',
+    'no_groups' => 'Grupės dar nesukurtos. Apsilankykite <code>Administratoriaus nustatymai > Paskyros teisių grupės</code>, kad jų pridėtumėte.',
+    'text' => 'Tekstas',
+
+    'username_formats' => [
+        'username_format'		=> 'Naudotojo vardo formatas',
+        'firstname_lastname_format'	=> 'First Name Last Name (jane.smith)',
+        'first_name_format'	        => 'First Name (jane)',
+        'last_name_format'		=> 'Last Name (doe)',
+        'filastname_format'			=> 'First Initial Last Name (jsmith)',
+        'lastnamefirstinitial_format' =>  'Last Name First Initial (smithj)',
+        'firstname_lastname_underscore_format' => 'First Name Last Name (jane_smith)',
+        'firstinitial.lastname' => 'First Initial Last Name (j.smith)',
+        'lastname_firstinitial' => 'Last Name First Initial (smith_j)',
+        'lastname_dot_firstinitial_format' => 'Last Name First Initial (smith.j)',
+        'firstnamelastname'     => 'First Name Last Name (janesmith)',
+        'firstnamelastinitial'  => 'First Name Last Initial (janes)',
+        'lastnamefirstname'      => 'Last Name.First Name (smith.jane)',
+    ],
+
+    'email_formats' => [
+        'email_format'			=> 'El. pašto formatas',
+        'firstname_lastname_format'	=> 'Vardas.Pavardė (vardas.pavarde@example.com)',
+        'first_name_format'		=> 'Vardas (vardas@example.com)',
+        'last_name_format'		=> 'Last Name (doe@example.com)',
+        'filastname_format'			=> 'Vardo pirmoji raidė, Pavardė (vpavarde@example.com)',
+        'lastnamefirstinitial_format' =>  'Pavardė, Vardo pirmoji raidė (pavardev@example.com)',
+        'firstname_lastname_underscore_format' => 'Vardas_Pavardė (vardas_pavarde@example.com)',
+        'firstinitial.lastname' => 'Vardo pirmoji raidė.Pavardė (v.pavarde@example.com)',
+        'lastname_firstinitial' => 'Pavardė_Vardo pirmoji raidė (pavarde_v@example.com)',
+        'lastname_dot_firstinitial_format' => 'Pavardė.Vardo pirmoji raidė (pavarde.v@example.com)',
+        'firstnamelastname'     => 'VardasPavardė (vardaspavarde@example.com)',
+        'firstnamelastinitial'  => 'Vardas, Pavardės pirmoji raidė (vardasp@example.com)',
+        'lastnamefirstname'      => 'Pavardė.Vardas (pavardenis.vardenis@example.com)',
+    ],
+
+
+
+    'logo_labels' => [
+        'acceptance_pdf_logo'       => 'PDF logotipas',
+        'email_logo'                => 'El. pašto logotipas',
+        'label_logo'                => 'Etiketės logotipas',
+        'logo'                      => 'Svetainės logotipas',
+        'favicon'                   => 'Puslapio ikonėlė (Favicon)',
+    ],
+
+    'logo_help' => [
+        'email_logo_size'       => 'Kvadratiniai logotipai laiškuose atrodo geriausiai. ',
+    ],
+
+    'logo_option_types' => [
+        'text' => 'Tekstas',
+        'logo' => 'Logotipas',
+        'logo_and_text' => 'Logotipas ir tekstas',
+    ],
+
+
+    'legends' => [
+        'scoping' => 'Scoping',
+        'formats' => 'Default Formats',
+        'profiles' => 'User Profiles',
+        'eula' => 'EULA & Acceptance Preferences',
+        'misc_display' => 'Miscellaneous Display Options',
+        'email' => 'Email Preferences',
+        'checkin' => 'Checkin Preferences',
+        'dashboard' => 'Login & Dashboard Preferences',
+        'misc' => 'Miscellaneous',
+        'logos' => 'Logos & Display',
+        'colors' => 'Colors & Skins',
+        'footer' => 'Footer Preferences',
+        'security' => 'Security Preferences',
+        'general' => 'General',
+        'intervals' => 'Intervals & Thresholds',
+    ],
+
+
+    /* Keywords for settings overview help */
+    'keywords' => [
+        'brand'             => 'poraštė, logotipas, spaudiniai, tema, apipavidalinimas, antraštė, spalvos, spalva, css',
+        'general_settings'  => 'įmonės palaikymas, parašas, sutikimas, el. laiško formatas, naudotojo vardo formatas, atvaizdai, viename puslapyje, miniatiūra, eula, gravatar, paslaugos sąlygos, valdymo skydas, privatumas',
+        'groups'            => 'teisės, teisių grupės, autorizacija',
+        'labels'            => 'etiketės, brūkšniniai kodai, brūkšninis kodas, lapai, spaudiniai, upc, qr, 1d, 2d',
+        'localization'      => 'lokalizacija, valiuta, vietinis, lokalė, laiko juosta, laiko juosta, tarptautinis, internacionalizavimas, kalba, kalbos, vertimas',
+        'php_overview'      => 'phpinfo, system, info',
+        'purge'             => 'ištrinti visam laikui',
+        'security'          => 'slaptažodis, slaptažodžiai, reikalavimai, dviejų veiksnių, dviejų veiksnių, įprasti slaptažodžiai, nuotolinis prisijungimas, atsijungimas, autentifikavimas',
+    ],
 
 ];
diff --git a/resources/lang/lt-LT/admin/settings/message.php b/resources/lang/lt-LT/admin/settings/message.php
index 770d47187a..d28cb30510 100644
--- a/resources/lang/lt-LT/admin/settings/message.php
+++ b/resources/lang/lt-LT/admin/settings/message.php
@@ -14,6 +14,9 @@ return [
         'restore_warning'       => 'Taip, atkurti. Suprantu, kad tai perrašys visus šiuo metu duomenų bazėje esančius duomenis. Taip pat, kad bus atjungti visi esami naudotojai (įskaitant mane).',
         'restore_confirm'       => 'Ar tikrai norite atkurti savo duomenų bazę iš :filename?'
     ],
+    'restore' => [
+        'success'               => 'Jūsų sistemos atsarginė kopija buvo atkurta. Prisijunkite iš naujo.'
+    ],
     'purge' => [
         'error'     => 'Valymo metu įvyko klaida. ',
         'validation_failed'     => 'Jūsų įvestas išvalymo patvirtinimas yra neteisingas. Patvirtinimo lauke įveskite žodį „DELETE“.',
@@ -29,10 +32,13 @@ return [
         'testing' => 'Tikrinamas LDAP ryšys, susiejimas ir užklausos...',
         '500' => '500 serverio klaida. Norėdami gauti daugiau informacijos, patikrinkite savo serverio žurnalus.',
         'error' => 'Kažkas ne taip :(',
-        'sync_success' => 'Pavyzdys 10 vartotojų, grąžintų iš LDAP serverio, pagal jūsų nustatymus:',
+        'sync_success' => '10 naudotojų, gautų iš LDAP serverio, pagal jūsų nustatymus:',
         'testing_authentication' => 'Tikrinamas LDAP autentifikavimas...',
         'authentication_success' => 'Naudotojas sėkmingai atpažintas naudojant LDAP!'
     ],
+    'labels' => [
+        'null_template' => 'Etiketės šablonas nerastas. Pasirinkite šabloną.',
+        ],
     'webhook' => [
         'sending' => ':app siunčiamas bandomasis pranešimas...',
         'success' => 'Jūsų :webhook_name integracija veikia!',
@@ -42,5 +48,12 @@ return [
         'error' => 'Kažkas ne taip. :app atsakė: :error_message',
         'error_redirect' => 'KLAIDA: 301/302 :endpoint rodo peradresavimą. Saugumo sumetimais peradresavimų nevykdome. Naudokite tikrąjį galinį tašką.',
         'error_misc' => 'Kažkas ne taip. :( ',
-    ]
+        'webhook_fail' => ' „Webhook“ pranešimas nepavyko: patikrinkite ar URL vis dar galioja.',
+        'webhook_channel_not_found' => ' „webhook“ kanalas nerastas.',
+        'ms_teams_deprecation' => 'The selected Microsoft Teams webhook URL will be deprecated Dec 31st, 2025. Please use a workflow URL. Microsoft\'s documentation on creating a workflow can be found <a href="https://support.microsoft.com/en-us/office/create-incoming-webhooks-with-workflows-for-microsoft-teams-8ae491c7-0394-4861-ba59-055e33f75498" target="_blank"> here.</a>',
+    ],
+    'location_scoping' => [
+        'not_saved' => 'Your settings were not saved.',
+        'mismatch' => 'There is 1 item in the database that need your attention before you can enable location scoping.|There are :count items in the database that need your attention before you can enable location scoping.',
+    ],
 ];
diff --git a/resources/lang/lt-LT/admin/statuslabels/message.php b/resources/lang/lt-LT/admin/statuslabels/message.php
index 2c41d938ae..63d605c0a3 100644
--- a/resources/lang/lt-LT/admin/statuslabels/message.php
+++ b/resources/lang/lt-LT/admin/statuslabels/message.php
@@ -4,7 +4,7 @@ return [
 
     'does_not_exist' => 'Tokios būsenos žymos nėra.',
     'deleted_label' => 'Panaikinta būsenos žyma',
-    'assoc_assets'	 => 'Ši būsenos žyma šiuo metu yra susieta bent su viena įranga ir negali būti panaikinta. Atnaujinkite savo įrangą, kad nebebūtų sąsajos su šia būsenos žyma, ir bandykite dar kartą. ',
+    'assoc_assets'	 => 'Ši būsenos žyma šiuo metu yra susieta bent su vienu turto vienetu ir negali būti panaikinta. Atnaujinkite savo turtą, kad nebebūtų sąsajos su šia būsenos žyma, ir bandykite dar kartą. ',
 
     'create' => [
         'error'   => 'Būsenos žyma nebuvo sukurta, bandykite dar kartą.',
@@ -23,10 +23,10 @@ return [
     ],
 
     'help' => [
-        'undeployable'   => 'Ši įranga negali būti niekam priskiriama.',
-        'deployable'   => 'Ši įranga gali būti išduodama. Išdavus įrangą, jos meta būsena pasikeis į <i class="fas fa-circle text-blue"></i> <strong>Naudojama</strong>.',
-        'archived'   => 'Šios įrangos negalima išduoti, ji bus matoma tik archyviniame rodinyje. Ši būsena naudinga, norint išsaugoti duomenis apie įrangą biudžetavimo ar kitiems tikslams, tuo pačiu pašalinant ją iš kasdienių įrangos sąrašų.',
-        'pending'   => 'Ši įranga dar negali būti kam nors priskirta. Ši būsena dažniausiai naudojama, kai įranga yra perduota remontui, bet planuojama ją sugrąžinti į apyvartą.',
+        'undeployable'   => 'Šis turtas negali būti niekam priskiriamas.',
+        'deployable'   => 'Šis turtas gali būti išduodamas. Išdavus turtą, jo meta būsena pasikeis į <i class="fas fa-circle text-blue"></i> <strong>Naudojamas</strong>.',
+        'archived'   => 'Šio turto negalima išduoti, jis bus matomas tik archyviniame rodinyje. Ši būsena naudinga, norint išsaugoti duomenis apie turtą biudžetavimo ar kitiems tikslams, tuo pačiu pašalinant jį iš kasdienių turto sąrašų.',
+        'pending'   => 'Šis turtas dar negali būti kam nors priskirtas. Ši būsena dažniausiai naudojama, kai turtas yra perduotas remontui, bet planuojama jį sugrąžinti į apyvartą.',
     ],
 
 ];
diff --git a/resources/lang/lt-LT/admin/statuslabels/table.php b/resources/lang/lt-LT/admin/statuslabels/table.php
index 328e07c75b..908cd743d1 100644
--- a/resources/lang/lt-LT/admin/statuslabels/table.php
+++ b/resources/lang/lt-LT/admin/statuslabels/table.php
@@ -1,14 +1,14 @@
 <?php
 
 return array(
-    'about'      	=> 'Apie būsenos žymas',
+    'about'      	=> 'About Status Types',
     'archived'      	=> 'Archyvuota',
     'create'      	=> 'Kurti būsenos žymą',
     'color'      	=> 'Diagramos spalva',
     'default_label' => 'Numatytoji žyma',
-    'default_label_help' => 'Tai naudojama siekiant užtikrinti, kad kuriant ar redaguojant įrangą, dažniausiai naudojamos būsenos žymos būtų rodomos pasirinkimo lauko viršuje.',
+    'default_label_help' => 'Tai naudojama siekiant užtikrinti, kad kuriant ar redaguojant turtą, dažniausiai naudojamos būsenos žymos būtų rodomos pasirinkimo lauko viršuje.',
     'deployable'      	=> 'Naudotini',
-    'info'      	=> 'Būsenos žymos nusako galimas jūsų įrangos būsenas. Pavyzdžiui, įranga gali būti perduota remontui, pamesta/pavogta ir kt. Čia galite kurti naujas būsenos žymai naudotinai, ruošiamai ir archyvuotai įrangai.',
+    'info'      	=> 'Status label types are used to describe the various states your assets could be in. They may be out for repair, lost/stolen, etc. You can create new status labels for your deployable, pending and archived assets according to your own workflow. For more information, <a href="https://snipe-it.readme.io/docs/overview#status-labels" target="_blank">see the documentation <i class="fa fa-external-link"></i></a>.',
     'name'      	=> 'Būsenos pavadinimas',
     'pending'      	=> 'Ruošiama',
     'status_type'   => 'Būsenos tipas',
diff --git a/resources/lang/lt-LT/admin/suppliers/message.php b/resources/lang/lt-LT/admin/suppliers/message.php
index a06ff0dc60..65116c705b 100644
--- a/resources/lang/lt-LT/admin/suppliers/message.php
+++ b/resources/lang/lt-LT/admin/suppliers/message.php
@@ -20,9 +20,9 @@ return array(
         'confirm'   => 'Ar tikrai norite panaikinti šį tiekėją?',
         'error'   => 'Bandant panaikinti tiekėją įvyko klaida. Bandykite dar kartą.',
         'success' => 'Tiekėjas panaikintas sėkmingai.',
-        'assoc_assets'	 => 'Šis tiekėjas šiuo metu yra susietas su :asset_count įranga (-omis) ir negali būti panaikintas. Atnaujinkite savo įrangą, kad nebebūtų sąsajos su šiuo tiekėju, ir bandykite dar kartą. ',
+        'assoc_assets'	 => 'Šis tiekėjas šiuo metu yra susietas su :asset_count turto vienetu (-ais) ir negali būti panaikintas. Atnaujinkite savo turtą, kad nebebūtų sąsajos su šiuo tiekėju, ir bandykite dar kartą. ',
         'assoc_licenses'	 => 'Šis tiekėjas šiuo metu yra susietas su :licenses_count licencija (-omis) ir negali būti panaikintas. Atnaujinkite savo licencijas, kad nebebūtų sąsajos su šiuo tiekėju, ir bandykite dar kartą. ',
-        'assoc_maintenances'	 => 'Šis tiekėjas šiuo metu yra susietas su :asset_maintenances_count įrangos aptarnavimu (-ais) ir negali būti panaikintas. Atnaujinkite savo įrangos aptarnavimus, kad nebebūtų sąsajos su šiuo tiekėju, ir bandykite dar kartą. ',
+        'assoc_maintenances'	 => 'Šis tiekėjas šiuo metu yra susietas su :asset_maintenances_count turto aptarnavimu (-ais) ir negali būti panaikintas. Atnaujinkite savo turto aptarnavimus, kad nebebūtų sąsajos su šiuo tiekėju, ir bandykite dar kartą. ',
     )
 
 );
diff --git a/resources/lang/lt-LT/admin/suppliers/table.php b/resources/lang/lt-LT/admin/suppliers/table.php
index d7dbcae7dc..d2bc6dff84 100644
--- a/resources/lang/lt-LT/admin/suppliers/table.php
+++ b/resources/lang/lt-LT/admin/suppliers/table.php
@@ -4,7 +4,7 @@ return array(
     'about_suppliers_title' => 'Apie tiekėjus',
     'about_suppliers_text'  => 'Tiekėjai naudojami daiktų šaltiniui stebėti',
     'address'               => 'Tiekėjo adresas',
-    'assets'                => 'Įranga',
+    'assets'                => 'Turtas',
     'city'                  => 'Miestas',
     'contact'               => 'Kontaktinis asmuo',
     'country'               => 'Šalis',
@@ -20,7 +20,7 @@ return array(
     'suppliers'             => 'Tiekėjai',
     'update'                => 'Atnaujinti tiekėją',
     'view'                  => 'Peržiūrėti tiekėją',
-    'view_assets_for'       => 'Įrangos peržiūra –',
+    'view_assets_for'       => 'Turto peržiūra –',
     'zip'                   => 'Pašto kodas',
 
 );
diff --git a/resources/lang/lt-LT/admin/users/general.php b/resources/lang/lt-LT/admin/users/general.php
index 409058a67a..878e3febc4 100644
--- a/resources/lang/lt-LT/admin/users/general.php
+++ b/resources/lang/lt-LT/admin/users/general.php
@@ -3,10 +3,10 @@
 return [
     'activated_help_text' => 'Šis naudotojas gali prisijungti',
     'activated_disabled_help_text' => 'Negalite redaguoti savo paskyros aktyvinimo būsenos.',
-    'assets_user'       => 'Įranga išduota :name',
+    'assets_user'       => 'Turtas išduotas :name',
     'bulk_update_warn'	=> 'Ketinate redaguoti :user_count naudotojų savybes. Atminkite, kad naudodami šią formą, savo naudotojo atributų keisti negalite – savo naudotoją turite redaguoti atskirai.',
     'bulk_update_help'	=> 'Ši forma suteikia galimybę atnaujinti iškart kelis naudotojus. Užpildykite tik tuos laukus, kuriuos norite pakeisti. Laukai, kuriuos paliksite tuščius, liks nepakeisti.',
-    'current_assets'    => 'Šiam naudotojui išduota įranga',
+    'current_assets'    => 'Šiam naudotojui išduotas turtas',
     'clone'             => 'Klonuoti naudotoją',
     'contact_user'      => 'Susisiekti su :name',
     'edit'              => 'Redaguoti naudotoją',
@@ -17,8 +17,10 @@ return [
     'last_login'        => 'Paskutinis prisijungimas',
     'ldap_config_text'  => 'LDAP konfigūracijos nustatymus rasite „Administratorius > Nustatymai“. Pasirinkta (neprivaloma) vieta bus priskirta visiems importuotiems naudotojams.',
     'print_assigned'    => 'Spausdinti išduotą',
-    'email_assigned'    => 'El. paštu nusiųsti išduotos įrangos sąrašą',
-    'user_notified'     => 'Naudotojui el. paštu išsiųstas jam priskirto inventoriaus sąrašas.',
+    'email_assigned'    => 'El. paštu nusiųsti išduoto turto sąrašą',
+    'user_notified'     => 'Naudotojui el. paštu išsiųstas jam priskirtų daiktų sąrašas.',
+    'users_notified'    => 'Naudotojui el. paštu buvo išsiųstas jam šiuo metu išduotų daiktų sąrašas.|:count naudotojams (-ų) el. paštu buvo išsiųsti šiuo metu jiems išduotų daiktų sąrašai.',
+    'users_notified_warning' => ':count naudotojui buvo išsiųstas šiuo metu jam išduotų daiktų sąrašas, tačiau :no_email naudotojai (-ų) neturėjo el. pašto adreso, todėl jiems negalėjo būti išsiųsti el. laiškai.|:count naudotojams (-ų) buvo išsiųsti šiuo metu jiems išduotų daiktų sąrašai, tačiau :no_email naudotojas (-ai) neturėjo el. pašto adreso, todėl jam (jiems) negalėjo būti išsiųsti el. laiškai.',
     'auto_assign_label' => 'Įtraukti šį naudotoją, kai automatiškai priskiriamos tinkamos licencijos',
     'auto_assign_help'  => 'Praleisti šį naudotoją, kai automatiškai priskiriamos licencijos',
     'software_user'     => 'Programinė įranga išduota: :name',
@@ -36,7 +38,7 @@ return [
     'admin_permission_warning' => 'Tik administratoriai ir aukštesnes teises turintys naudotojai gali suteikti administratoriaus prieigą.',
     'remove_group_memberships' => 'Pašalinti grupių narystes',
     'warning_deletion_information' => 'Ketinate paimti VISUS elementus iš žemiau išvardintų :count naudotojų. Superadministratorių vardai yra paryškinti raudonai.',
-    'update_user_assets_status' => 'Atnaujinti visos šių naudotojų įrangos būsenas į šią būseną',
+    'update_user_assets_status' => 'Atnaujinti viso šių naudotojų turto būsenas į šią būseną',
     'checkin_user_properties' => 'Paimti visą su šiais naudotojais susietą turtą',
     'remote_label'   => 'Tai nuotolinis naudotojas',
     'remote'   => 'Nuotolinis',
diff --git a/resources/lang/lt-LT/admin/users/message.php b/resources/lang/lt-LT/admin/users/message.php
index 3c7d800c05..5143fcf455 100644
--- a/resources/lang/lt-LT/admin/users/message.php
+++ b/resources/lang/lt-LT/admin/users/message.php
@@ -2,16 +2,16 @@
 
 return array(
 
-    'accepted'                  => 'Jūs sėkmingai priėmėte šią įrangą.',
-    'declined'                  => 'Jūs sėkmingai atsisakėte priimti šią įrangą.',
+    'accepted'                  => 'Jūs sėkmingai priėmėte šį turtą.',
+    'declined'                  => 'Jūs sėkmingai atsisakėte priimti šį turtą.',
     'bulk_manager_warn'	        => 'Jūsų naudotojai buvo sėkmingai atnaujinti, tačiau tiesioginio vadovo informacija nebuvo išsaugota, nes jūsų nurodytas tiesioginis vadovas taip pat buvo redaguojamų naudotojų sąraše. Naudotojas negali būti savo paties tiesioginiu vadovu, todėl dar kartą pasirinkite naudotojus, neįtraukdami tiesioginio vadovo.',
     'user_exists'               => 'Toks naudotojas jau yra!',
-    'user_not_found'            => 'Tokio naudotojo nėra.',
+    'user_not_found'            => 'Tokio naudotojo nėra arba jūs neturite teisės jo peržiūrėti.',
     'user_login_required'       => 'Prisijungimo laukas yra privalomas',
-    'user_has_no_assets_assigned' => 'Naudotojui neišduota jokia įranga.',
+    'user_has_no_assets_assigned' => 'Naudotojui neišduotas joks turtas.',
     'user_password_required'    => 'Slaptažodis yra privalomas.',
     'insufficient_permissions'  => 'Nepakanka teisių.',
-    'user_deleted_warning'      => 'Šis naudotojas buvo panaikintas. Turėsite atkurti naudotoją, jeigu norėsite jį redaguoti ar priskirti jam naują įrangą.',
+    'user_deleted_warning'      => 'Šis naudotojas buvo panaikintas. Turėsite atkurti naudotoją, jeigu norėsite jį redaguoti ar priskirti jam naują turtą.',
     'ldap_not_configured'        => 'LDAP integracija nebuvo sukonfigūruota šiam diegimui.',
     'password_resets_sent'      => 'Pasirinktiems naudotojams, kurie yra aktyvuoti ir turi galiojančius el. pašto adresus, buvo išsiųsta slaptažodžio nustatymo iš naujo nuoroda.',
     'password_reset_sent'       => 'Slaptažodžio nustatymo iš naujo nuoroda buvo išsiųsta į :email!',
@@ -36,23 +36,24 @@ return array(
         'create' => 'Bandant sukurti naudotoją įvyko klaida. Bandykite dar kartą.',
         'update' => 'Bandant atnaujinti naudotoją įvyko klaida. Bandykite dar kartą.',
         'delete' => 'Bandant panaikinti naudotoją įvyko klaida. Bandykite dar kartą.',
-        'delete_has_assets' => 'Šis naudotojas turi jam išduotų elementų, todėl jo panaikinti negalima.',
-        'delete_has_assets_var' => 'Šiam naudotojui yra išduota įranga. Pirmiausia paimkite ją.|Šiam naudotojui yra išduotos :count įrangos (-ų). Pirmiausia paimkite jų įrangą.',
+        'delete_has_assets' => 'Šis naudotojas turi jam išduotų daiktų, todėl jo panaikinti negalima.',
+        'delete_has_assets_var' => 'Šiam naudotojui yra išduotas turtas. Pirmiausia paimkite jį.|Šiam naudotojui yra išduoti :count vienetai (-ų) turto. Pirmiausia paimkite jų turtą.',
         'delete_has_licenses_var' => 'Šiam naudotojui yra priskirta licencija. Pirmiausia paimkite ją.|Šiam naudotojui yra priskirtos :count licencijos (-ų). Pirmiausia paimkite jas.',
         'delete_has_accessories_var' => 'Šiam naudotojui yra išduotas priedas. Pirmiausia paimkite jį.|Šiam naudotojui yra išduoti :count priedai (-ų). Pirmiausia paimkite juos.',
         'delete_has_locations_var' => 'Šis naudotojas vis dar atsakingas už vieną vietą. Pirmiausia parinkite kitą valdytoją.|Šis naudotojas vis dar atsakingas už :count vietas (-ų). Pirmiausia parinkite kitą valdytoją.',
         'delete_has_users_var' => 'Šis naudotojas vis dar turi pavaldinį. Pirmiausia parinkite kitą tiesioginį vadovą šiam pavaldiniui.|Šis naudotojas vis dar turi :count pavaldinius (-ių). Pirmiausia parinkite kitą tiesioginį vadovą šiems naudotojams.',
         'unsuspend' => 'Bandant įjungti naudotoją įvyko klaida. Bandykite dar kartą.',
         'import'    => 'Bandant importuoti naudotojus įvyko klaida. Bandykite dar kartą.',
-        'asset_already_accepted' => 'Ši įranga jau buvo priimta.',
-        'accept_or_decline' => 'Turite arba priimti šią įrangą, arba jos atsisakyti.',
+        'asset_already_accepted' => 'Šis turtas jau buvo priimtas.',
+        'accept_or_decline' => 'Turite arba priimti šį turtą, arba jo atsisakyti.',
         'cannot_delete_yourself' => 'Jaustumėmės labai blogai, jei panaikintumėte save, dar kartą apsvarstykite.',
-        'incorrect_user_accepted' => 'Įranga kurią bandote priimti, nebuvo jums priskirta.',
+        'incorrect_user_accepted' => 'Turtas kurį bandote priimti, nebuvo jums išduotas.',
         'ldap_could_not_connect' => 'Nepavyko prisijungti prie LDAP serverio. Patikrinkite LDAP serverio konfigūraciją LDAP konfigūracijos faile. <br>LDAP serverio klaida:',
         'ldap_could_not_bind' => 'Nepavyko susieti su LDAP serveriu. Patikrinkite LDAP serverio konfigūraciją LDAP konfigūracijos faile. <br>LDAP serverio klaida: ',
         'ldap_could_not_search' => 'Nepavyko paieška LDAP serveryje. Patikrinkite LDAP serverio konfigūraciją LDAP konfigūracijos faile. <br>LDAP serverio klaida:',
         'ldap_could_not_get_entries' => 'Nepavyko gauti įrašų iš LDAP serverio. Patikrinkite LDAP serverio konfigūraciją LDAP konfigūracijos faile. <br>LDAP serverio klaida:',
         'password_ldap' => 'Šios paskyros slaptažodį tvarko LDAP / Active Directory. Prašome susisiekti su savo IT skyriumi, kad pakeistumėte slaptažodį. ',
+        'multi_company_items_assigned' => 'Šiam naudotojui yra priskirti daiktai, priklausantys kitai įmonei. Paimkite juos arba pakeiskite jų įmonę.'
     ),
 
     'deletefile' => array(
diff --git a/resources/lang/lt-LT/admin/users/table.php b/resources/lang/lt-LT/admin/users/table.php
index f934e8e909..90a52da1c0 100644
--- a/resources/lang/lt-LT/admin/users/table.php
+++ b/resources/lang/lt-LT/admin/users/table.php
@@ -3,7 +3,7 @@
 return array(
     'activated'  			=> 'Aktyvus',
     'allow'  				=> 'Leisti',
-    'checkedout'  			=> 'Įranga',
+    'checkedout'  			=> 'Turtas',
     'created_at' 			=> 'Sukurta',
     'createuser' 			=> 'Sukurti naudotoją',
     'deny'  				=> 'Neleisti',
@@ -13,7 +13,7 @@ return array(
     'groupnotes'			=> 'Pasirinkite grupę, kurią norite priskirti naudotojui ir nepamirškite, kad naudotojas gauna jam priskirtos grupės prieigos teises. Norėdami panaikinti grupių pasirinkimą, naudokite Ctrl + spustelėjimas (arba cmd + spustelėjimas, jei naudojate MacOS).',
     'id'         			=> 'Id',
     'inherit'  				=> 'Paveldėti',
-    'job' 					=> 'Pozicija',
+    'job' 					=> 'Pareigos',
     'last_login'  			=> 'Paskutinis prisijungimas',
     'last_name'  			=> 'Pavardė',
     'location'  			=> 'Vieta',
@@ -22,16 +22,16 @@ return array(
     'managed_locations'     => 'Valdomos vietos',
     'managed_users'         => 'Pavaldiniai',
     'name' 					=> 'Visas vardas',
-    'nogroup'               => 'Dar nesukurta jokia grupė. Norėdami sukurti grupę, apsilankykite: ',
+    'nogroup'               => 'Dar nesukurta jokia grupė. Norėdami sukurti grupę, apsilankykite:',
     'notes'                 => 'Pastabos',
     'password_confirm' 		=> 'Patvirtinti slaptažodį',
     'password' 				=> 'Slaptažodis',
     'phone'  				=> 'Telefono Nr.',
     'show_current'          => 'Rodyti esamus naudotojus',
     'show_deleted'          => 'Rodyti panaikintus naudotojus',
-    'title' 				=> 'Antraštė',
+    'title' 				=> 'Pareigos',
 	'to_restore_them'		=> 'juos atkurti.',
-    'total_assets_cost'     => "Bendra įrangos vertė",
+    'total_assets_cost'     => "Bendra turto vertė",
     'updateuser' 			=> 'Atnaujinti naudotoją',
     'username' 				=> 'Naudotojo vardas',
 	'user_deleted_text' 	=> 'Šis naudotojas buvo pažymėtas kaip panaikintas.',
diff --git a/resources/lang/lt-LT/auth.php b/resources/lang/lt-LT/auth.php
index 5bc6990974..12ea0d5d6e 100644
--- a/resources/lang/lt-LT/auth.php
+++ b/resources/lang/lt-LT/auth.php
@@ -15,6 +15,6 @@ return array(
 
     'failed' => 'Neteisingi prisijungimo duomenys.',
     'password' => 'Naudotojo slaptažodis neteisingas.',
-    'throttle' => 'Per daug bandymų prisijungti. Bandykite po :seconds sekundžių.',
+    'throttle' => 'Per daug nesėkmingų bandymų prisijungti. Bandykite dar kartą po :minutes minutės (-čių).',
 
 );
diff --git a/resources/lang/lt-LT/auth/message.php b/resources/lang/lt-LT/auth/message.php
index 1ba0cae989..ab81835ec0 100644
--- a/resources/lang/lt-LT/auth/message.php
+++ b/resources/lang/lt-LT/auth/message.php
@@ -6,8 +6,6 @@ return array(
     'account_not_found'      => 'Naudotojo vardas arba slaptažodis neteisingas.',
     'account_not_activated'  => 'Šio naudotojo paskyra nesuaktyvinta.',
     'account_suspended'      => 'Šio naudotojo paskyra yra išjungta.',
-    'account_banned'         => 'Šio naudotojo paskyra yra užblokuota.',
-    'throttle'               => 'Per daug nesėkmingų bandymų prisijungti. Bandykite dar kartą po :minutes minučių.',
 
     'two_factor' => array(
         'already_enrolled'      => 'Jūsų įrenginys jau yra įtrauktas.',
diff --git a/resources/lang/lt-LT/button.php b/resources/lang/lt-LT/button.php
index 953062939e..5000a6867b 100644
--- a/resources/lang/lt-LT/button.php
+++ b/resources/lang/lt-LT/button.php
@@ -7,18 +7,28 @@ return [
     'checkin_and_delete'  	    => 'Paimti viską / Panaikinti naudotoją',
     'delete'  	                => 'Panaikinti',
     'edit'    	                => 'Redaguoti',
+    'clone'    	                => 'Klonuoti',
     'restore' 	                => 'Atkurti',
     'remove'                    => 'Pašalinti',
     'request'                   => 'Užsakyti',
     'submit'  	                => 'Išsaugoti',
     'upload'                    => 'Įkelti',
-    'select_file'				=> 'Pasirinkite failą ...',
+    'select_file'				=> 'Pasirinkite failą...',
     'select_files'				=> 'Pasirinkite failus...',
     'generate_labels'           => '{1} Generuoti etiketę|[2,*] Generuoti etiketes',
     'send_password_link'        => 'Slaptažodžio nustatymo iš naujo nuoroda',
     'go'                        => 'Vykdyti',
     'bulk_actions'              => 'Masiniai veiksmai',
-    'add_maintenance'           => 'Pridėti įrangos aptarnavimą',
+    'add_maintenance'           => 'Pridėti aptarnavimą',
     'append'                    => 'Papildyti',
     'new'                       => 'Naujas',
+    'var' => [
+        'clone'     => 'Klonuoti :item_type',
+        'edit'      => 'Redaguoti :item_type',
+        'delete'    => 'Panaikinti :item_type',
+        'restore'   => 'Atkurti :item_type',
+        'create'    => 'Kurti naują :item_type',
+        'checkout'  => 'Išduoti :item_type',
+        'checkin'   => 'Paimti :item_type',
+    ]
 ];
diff --git a/resources/lang/lt-LT/general.php b/resources/lang/lt-LT/general.php
index 240ebed59b..f34547a039 100644
--- a/resources/lang/lt-LT/general.php
+++ b/resources/lang/lt-LT/general.php
@@ -10,32 +10,35 @@ return [
     'action'                => 'Veiksmas',
     'activity_report'		=> 'Veiklos ataskaita',
     'address'				=> 'Adresas',
-    'admin'					=> 'Administratorius',
+    'admin'					=> 'Administratoriaus nustatymai',
     'admin_tooltip'			=> 'Šis naudotojas turi administratoriaus teises',
     'superuser'				=> 'Supernaudotojas',
     'superuser_tooltip'		=> 'Šis naudotojas turi supernaudotojo teises',
     'administrator'			=> 'Administratorius',
     'add_seats'             => 'Pridėtos licencijos vietos',
     'age'                   => "Amžius",
-    'all_assets'			=> 'Visa įranga',
-    'all'       			=> 'Viskas',
-    'archived'              => 'Archyvuota',
-    'asset_models'			=> 'Įrangos modeliai',
+    'all_assets'			=> 'Visas turtas',
+    'all'       			=> 'Visas',
+    'archived'              => 'Archyvuotas',
+    'asset_models'			=> 'Turto modeliai',
     'asset_model'			=> 'Modelis',
-    'asset'					=> 'Įranga',
-    'asset_report'          => 'Įrangos ataskaita',
+    'asset'					=> 'Turtas',
+    'asset_previous'        => 'Asset (Previously Assigned)',
+    'asset_report'          => 'Turto ataskaita',
     'asset_tag'				=> 'Inventorinis numeris',
     'asset_tags'            => 'Inventoriniai numeriai',
-    'assets_available'		=> 'Turima įranga',
-    'accept_assets'         => 'Priimti įrangą :name',
-    'accept_assets_menu'    => 'Priimti įrangą',
+    'assets_available'		=> 'Turimas turtas',
+    'accept_assets'         => 'Priimti turtą :name',
+    'accept_assets_menu'    => 'Priimti turtą',
+    'accept_item'           => 'Priimti daiktą',
     'audit'				    => 'Auditas',
+    'audits'				=> 'Audits',
     'audit_report'			=> 'Audito žurnalas',
-    'assets'				=> 'Įranga',
-    'assets_audited'        => 'audituota įranga',
-    'assets_checked_in_count'     => 'įranga paimta',
-    'assets_checked_out_count'     => 'įranga išduota',
-    'asset_deleted_warning'     => 'Ši įranga buvo panaikinta. Jūs turite ją atkurti, kad galėtumėte vėl ją kam nors išduoti.',
+    'assets'				=> 'Turtas',
+    'assets_audited'        => 'audituotas turtas',
+    'assets_checked_in_count'     => 'paimtas turtas',
+    'assets_checked_out_count'     => 'išduotas turtas',
+    'asset_deleted_warning'     => 'Šis turtas buvo panaikintas. Jūs turite jį atkurti, kad galėtumėte vėl jį kam nors išduoti.',
     'assigned_date'         => 'Išdavimo data',
     'assigned_to'           => 'Išduota :name',
     'assignee'              => 'Išduota',
@@ -50,7 +53,7 @@ return [
     'bulk_delete'           => 'Panaikinti kelis',
     'bulk_actions'          => 'Masiniai veiksmai',
     'bulk_checkin_delete'   => 'Masinis paėmimas / Naudotojų panaikinimas',
-    'byod'                  => 'Naudotojų asmeninė įranga (BYOD)',
+    'byod'                  => 'Naudotojų asmeninis turtas (BYOD)',
     'byod_help'             => 'Įrenginys yra naudotojo nuosavybė',
     'bystatus'              => 'pagal būseną',
     'cancel'  				=> 'Atšaukti',
@@ -61,9 +64,12 @@ return [
     'changepassword'  		=> 'Pakeisti slaptažodį',
     'checkin'  				=> 'Paimti',
     'checkin_from'  		=> 'Paimti iš',
+    'checkin_note'  		=> 'Checkin Note',
+    'checkout_note'  		=> 'Checkout Note',
     'checkout'  			=> 'Išduoti',
     'checkouts_count'       => 'Išduota',
     'checkins_count'        => 'Paimta',
+    'checkin_and_delete'  	=> 'Paimti ir panaikinti',
     'user_requests_count'   => 'Užklausos',
     'city'  				=> 'Miestas',
     'click_here'			=> 'Paspauskite čia',
@@ -76,85 +82,71 @@ return [
     'consumable'			=> 'Eksploatacinė medžiaga',
     'consumables'			=> 'Eksploatacinės medžiagos',
     'country'  				=> 'Šalis',
-    'could_not_restore'     => 'Atstatymo klaida :item_type: :error',
+    'could_not_restore'     => 'Klaida atkuriant :item_type: :error',
     'not_deleted'           => ':item_type nėra panaikintas, todėl negali būti atkurtas',
     'create'				=> 'Sukurti naują',
-    'created'               => 'Elementas sukurtas',
-    'created_asset'			=> 'įranga sukurta',
+    'created'               => 'Daiktas sukurtas',
+    'created_asset'			=> 'sukurtas turtas',
     'created_at' 			=> 'Sukurta',
     'created_by'            => 'Sukūrė',
     'record_created' 		=> 'Įrašas sukurtas',
     'updated_at' 			=> 'Atnaujinta',
     'currency'  			=> 'Valiuta', // this is deprecated
+    'currency_text'  		=> 'Valiuta', //
     'current'  				=> 'Dabartinis',
     'current_password'      => 'Dabartinis slaptažodis',
     'customize_report'      => 'Individualizuoti ataskaitą',
-    'custom_report'         => 'Individualizuota įrangos ataskaita',
+    'custom_report'         => 'Individualizuota turto ataskaita',
     'dashboard'				=> 'Valdymo skydas',
+    'data_source'           => 'Duomenų šaltinis',
     'days'      			=> 'dienos',
     'days_to_next_audit'    => 'Dienos iki kito audito',
     'date'					=> 'Data',
     'debug_warning'         => 'Įspėjimas!',
-    'debug_warning_text'    => 'Ši programa veikia derinimo režimu. Tai gali atskleisti neskelbtinus duomenis, jei jūsų programa yra pasiekiama išoriniam pasauliui. Išjunkite derinimo režimą nustatydami <code>APP_DEBUG</code> reikšmę savo <code>.env</code> faile į <code>false</code>.',
+    'debug_warning_text'    => 'Ši programa veikia gamybiniu režimu, įjungus derinimą. Tai gali atskleisti neskelbtinus duomenis, jei jūsų programa yra pasiekiama išoriniam pasauliui. Išjunkite derinimo režimą nustatydami <code>APP_DEBUG</code> reikšmę savo <code>.env</code> faile į <code>false</code>.',
     'delete'  				=> 'Panaikinti',
     'delete_confirm'  		=> 'Ar tikrai norite panaikinti :item?',
     'delete_confirm_no_undo' => 'Ar tikrai norite panaikinti :item? Šis veiksmas negrįžtamas.',
-    'deleted'  				=> 'Panaikinta',
+    'deleted'  				=> 'Panaikintas',
     'delete_seats'  		=> 'Panaikintos licencijos vietos',
     'deletion_failed'       => 'Panaikinti nepavyko',
     'departments'           => 'Skyriai',
     'department'            => 'Skyrius',
-    'deployed'				=> 'Naudojama',
+    'deployed'				=> 'Naudojamas',
     'depreciation'			=> 'Nusidėvėjimas',
     'depreciations'         => 'Nusidėvėjimas',
     'depreciation_report'	=> 'Nusidėvėjimo ataskaita',
-    'details'               => 'Detaliau',
+    'details'               => 'Informacija',
     'download'				=> 'Atsisiųsti',
     'download_all'		    => 'Atsisųsti visus',
     'editprofile'  			=> 'Redaguoti savo profilį',
     'eol'					=> 'Nurašymo data',
     'email_domain'			=> 'El. pašto domenas',
-    'email_format'			=> 'El. pašto formatas',
     'employee_number'       => 'Darbuotojo numeris',
     'email_domain_help'		=> 'Naudojama el. pašto adresų generavimui importavimo metu.',
     'error'				    => 'Klaida',
-    'exclude_archived'      => 'Neįtraukti archyvuotos įrangos',
-    'exclude_deleted'       => 'Neįtraukti panaikintos įrangos',
+    'exclude_archived'      => 'Neįtraukti archyvuoto turto',
+    'exclude_deleted'       => 'Neįtraukti panaikinto turto',
     'example'				=> 'Pavyzdys: ',
-    'filastname_format'			=> 'Vardo pirmoji raidė, Pavardė (vpavarde@example.com)',
-    'firstname_lastname_format'	=> 'Vardas.Pavardė (vardas.pavarde@example.com)',
-    'firstname_lastname_underscore_format' => 'Vardas_Pavardė (vardas_pavarde@example.com)',
-    'lastnamefirstinitial_format' =>  'Pavardė, Vardo pirmoji raidė (pavardev@example.com)',
-    'firstintial_dot_lastname_format' => 'V. Pavardė (v.pavarde@example.com)',
-    'firstname_lastname_display'	=> 'Vardas Pavardė (Vardenis Pavardenis)',
-    'lastname_firstname_display'	=> 'Pavardė Vardas (Pavardenis Vardenis)',
-    'name_display_format'	=> 'Vardo atvaizdavimo formatas',
-    'first'					=> 'Pirmas',
-    'firstnamelastname'     => 'Vardas Pavardė (vardaspavarde@example.com)',
-    'lastname_firstinitial' => 'Pavardė, Vardo pirmoji raidė (pavarde_v@example.com)',
-    'firstinitial.lastname' => 'V. Pavardė (v.pavarde@example.com)',
-    'firstnamelastinitial'  => 'Vardas, Pavardės pirmoji raidė (vardasp@example.com)',
-    'lastnamefirstname'      => 'Pavardė, Vardas (pavardenis.vardenis@example.com)',
-    'first_name'			=> 'Vardas',
-    'first_name_format'		=> 'Vardas (vardas@example.com)',
+
     'files'                 => 'Failai',
     'file_name'				=> 'Failas',
     'file_type'             => 'Failo tipas',
     'filesize'              => 'Failo dydis',
     'file_uploads'			=> 'Įkelti failai',
     'file_upload'           => 'Failo įkėlimas',
-    'generate'				=> 'Sukurti',
+    'generate'				=> 'Generuoti',
     'generate_labels'       => 'Generuoti etiketes',
     'github_markdown'      => 'Šis laukas leidžia naudoti <a href="https://help.github.com/articles/github-flavored-markdown/">Github tipo žymėjimą (markdown)</a>.',
     'groups'				=> 'Grupės',
-    'gravatar_email'        => 'Gravatar el. paštas',
+    'gravatar_email'        => 'Gravatar el. pašto adresas',
     'gravatar_url'          => '<a href="http://gravatar.com"><small>Pasikeiskite savo avatarą Gravatar.com</small></a>.',
     'history'  			    => 'Istorija',
     'history_for'  			=> 'Istorija žmogui: ',
     'id'  					=> 'ID',
     'image'                 => 'Atvaizdas',
     'image_delete'         	=> 'Ištrinti atvaizdą',
-    'include_deleted'       => 'Įtraukti panaikintą įrangą',
+    'include_deleted'       => 'Įtraukti panaikintą turtą',
     'image_upload'         	=> 'Įkelti atvaizdą',
     'filetypes_accepted_help'    => 'Leidžiamas failo tipas yra :types. Didžiausias leistinas įkeliamo failo dydis yra :size.|Leidžiami failų tipai yra :types. Didžiausias leistinas įkeliamų failų dydis yra :size.',
     'filetypes_size_help'   => 'Didžiausias leistinas įkeliamų failų dydis yra :size.',
@@ -163,21 +155,26 @@ return [
     'import'         	    => 'Importavimas',
     'import_this_file'      => 'Susieti laukus ir apdoroti šį failą',
     'importing'         	=> 'Importuojama',
-    'importing_help'        => 'Galite importuoti įrangą, priedus, licencijas, komponentus, eksploatacines medžiagas ir vartotojus naudodami CSV failą. <br><br>CSV reikšmės turėtų būti atskirtos kableliais, o failas suformatuotas su antraštėmis, kurios atitinka esančias <a href="https://snipe-it.readme.io/docs/importing" target="_new">CSV pavyzdžiuose</a>.',
+    'importing_help'        => 'Galite importuoti turtą, priedus, licencijas, komponentus, eksploatacines medžiagas ir naudotojus, naudodami CSV failą. <br><br>CSV reikšmės turėtų būti atskirtos kableliais, o failas suformuotas su antraštėmis, kurios sutampa su esančiomis <a href="https://snipe-it.readme.io/docs/importing" target="_new">CSV pavyzdžiuose</a>.',
     'import-history'        => 'Importuoti istoriją',
-    'asset_maintenance'        => 'Įrangos aptarnavimas',
-    'asset_maintenance_report' => 'Įrangos aptarnavimo ataskaita',
-    'asset_maintenances'       => 'Įrangos aptarnavimas',
-    'item'  				=> 'Elementas',
-    'item_name'             => 'Elemento pavadinimas',
+    'asset_maintenance'        => 'Turto aptarnavimas',
+    'asset_maintenance_report' => 'Turto aptarnavimo ataskaita',
+    'asset_maintenances'       => 'Turto aptarnavimai',
+    'item'  				=> 'Daiktas',
+    'item_name'             => 'Daikto pavadinimas',
     'import_file'  			=> 'importuoti CSV failą',
     'import_type'  			=> 'CSV importo tipas',
     'insufficient_permissions' => 'Nepakankamos teisės!',
-    'kits'       			=> 'Įrangos rinkiniai',
+    'kits'       			=> 'Turto rinkiniai',
     'language'				=> 'Kalba',
     'last'					=> 'Paskutinis',
     'last_login'            => 'Paskutinis prisijungimas',
     'last_name'             => 'Pavardė',
+    'firstname_lastname_display'	=> 'Vardas Pavardė (Vardenis Pavardenis)',
+    'lastname_firstname_display'	=> 'Pavardė Vardas (Pavardenis Vardenis)',
+    'name_display_format'	=> 'Vardo atvaizdavimo formatas',
+    'first'					=> 'Pirmas',
+    'first_name'			=> 'Vardas',
     'license'				=> 'Licencija',
     'license_report'        => 'Licencijų ataskaita',
     'licenses_available'	=> 'Turimos licencijos',
@@ -191,23 +188,23 @@ return [
     'locations'				=> 'Vietos',
     'logo_size'				=> '"Logotipas + tekstas" tipui labiausiai tinka kvadratiniai logotipai. Didžiausias logotipo rodymo dydis yra 50 pikselių aukščio ir 500 pikselių pločio.  ',
     'logout'				=> 'Atsijungti',
-    'lookup_by_tag'     => 'Paieška pagal inventorinį numerį',
+    'lookup_by_tag'     => 'Paieška pagal inventorinį Nr.',
     'maintenances'          => 'Aptarnavimai',
     'manage_api_keys'       => 'Tvarkyti API raktus',
     'manufacturer'			=> 'Gamintojas',
     'manufacturers'			=> 'Gamintojai',
     'markdown'				=> 'Šis laukas leidžia naudoti <a href="https://help.github.com/articles/github-flavored-markdown/">Github tipo žymes (markdown)</a>.',
     'min_amt'				=> 'Mažiausias kiekis',
-    'min_amt_help'          => 'Mažiausias turimų elementų kiekis, kurį pasiekus yra aktyvuojamas įspėjimas. Palikite lauką "Mažiausias kiekis" tuščią, jei nenorite gauti įspėjimų apie mažą atsargų likutį.',
+    'min_amt_help'          => 'Mažiausias turimų daiktų kiekis, kurį pasiekus yra aktyvuojamas įspėjimas. Palikite lauką "Mažiausias kiekis" tuščią, jei nenorite gauti įspėjimų apie mažą atsargų likutį.',
     'model_no'				=> 'Modelio Nr.',
     'months'				=> 'mėnesiai',
-    'moreinfo'				=> 'Daugiau informacijos',
-    'name'					=> 'Vardas',
+    'moreinfo'				=> 'Išsamiau',
+    'name'					=> 'Pavadinimas',
     'new_password'          => 'Naujas slaptažodis',
-    'next'					=> 'Kitas',
+    'next'					=> 'Sekantis',
     'next_audit_date'		=> 'Kito audito data',
     'next_audit_date_help'  => 'Jei organizacijoje naudojate auditą, įprastai tai yra apskaičiuojama automatiškai, atsižvelgiant į paskutinio audito datą ir dažnumą, todėl šį lauką (skiltyje <code>Administratoriaus nustatymai &gt; Įspėjimai</code>) galite palikti tuščią. Jei reikia, rankiniu būdu čia galite nustatyti šią datą, tačiau ji privalo būti vėlesnė nei paskutinio audito data. ',
-    'audit_images_help'     => 'Audito atvaizdus galite rasti įrangos skirtuke „Istorija“.',
+    'audit_images_help'     => 'Audito atvaizdus galite rasti turto skirtuke „Istorija“.',
     'no_email'              => 'Su šiuo naudotoju nėra susietas joks el. pašto adresas',
     'last_audit'		    => 'Paskutinis auditas',
     'new'					=> 'naujas!',
@@ -215,24 +212,32 @@ return [
     'no_results'			=> 'Rezultatų nėra.',
     'no'  					=> 'Ne',
     'notes'  				=> 'Pastabos',
+    'note_added'            => 'Pastaba pridėta',
+    'options'				=> 'Parinktys',
+    'preview'				=> 'Peržiūra',
+    'add_note'              => 'Pridėti pastabą',
+    'note_edited'            => 'Pastaba atnaujinta',
+    'edit_note'              => 'Redaguoti pastabą',
+    'note_deleted'            => 'Pastaba panaikinta',
+    'delete_note'              => 'Naikinti pastabą',
     'order_number'          => 'Užsakymo numeris',
-    'only_deleted'          => 'Tik panaikinta įranga',
+    'only_deleted'          => 'Tik panaikintas turtas',
     'page_menu'				=> 'Rodomi _MENU_ elementai',
     'pagination_info'		=> 'Rodomi nuo _START_ iki _END_ iš _TOTAL_ vienetų',
-    'pending'				=> 'Ruošiama',
+    'pending'				=> 'Ruošiamas',
     'people'				=> 'Žmonės',
     'per_page'				=> 'Rezultatų puslapyje',
     'previous'				=> 'Ankstesnis',
     'processing'			=> 'Vykdoma',
     'profile'				=> 'Jūsų profilis',
-    'purchase_cost'                              => 'Pirkimo kaina',
-    'purchase_date'         => 'Pirkimo data',
+    'purchase_cost'                              => 'Įsigijimo kaina',
+    'purchase_date'         => 'Įsigijimo data',
     'qty'		            => 'Kiekis',
     'quantity'		        => 'Kiekis',
-    'quantity_minimum'      => 'Jūs turite įrangos (:count), kurios likutis artimas arba mažesnis už minimalų',
+    'quantity_minimum'      => 'Turite vieną daiktą, kurio kiekis yra mažesnis arba beveik mažesnis už nurodytą minimalų kiekį|Turite :count daiktus (-ų), kurių kiekis yra mažesnis arba beveik mažesnis už nurodytą minimalų kiekį',
     'quickscan_checkin'  	=> 'Greitas paėmimas skenuojant',
     'quickscan_checkin_status'  	=> 'Paėmimo būsena',
-    'ready_to_deploy'		=> 'Paruošta naudojimui',
+    'ready_to_deploy'		=> 'Paruoštas naudojimui',
     'recent_activity'		=> 'Paskutiniai veiksmai',
     'remaining'             => 'Likutis',
     'remove_company'        => 'Pašalinti sąsają su įmone',
@@ -241,10 +246,10 @@ return [
     'restore'				=> 'Atkurti',
     'requestable_models'    => 'Užsakomi modeliai',
     'requestable_items'     => 'Užsakomi daiktai',
-    'requested'				=> 'Užsakyta',
+    'requested'				=> 'Užsakytas',
     'requested_date'        => 'Prašymo data',
-    'requested_assets'      => 'Prašoma įranga',
-    'requested_assets_menu' => 'Prašoma įranga',
+    'requested_assets'      => 'Prašomas turtas',
+    'requested_assets_menu' => 'Prašomas turtas',
     'request_canceled'      => 'Prašymas atšauktas',
     'request_item'          => 'Užsakyti šį daiktą',
     'external_link_tooltip' => 'Išorinė nuoroda',
@@ -265,22 +270,24 @@ return [
     'select_date'			=> 'Pasirinkite datą (MMMM-MM-DD)',
     'select_statuslabel'	=> 'Pasirinkti būseną',
     'select_company'    	=> 'Pasirinkite įmonę',
-    'select_asset'    		=> 'Pasirinkite įrangą',
+    'select_asset'    		=> 'Pasirinkite turtą',
     'settings'				=> 'Nustatymai',
     'show_deleted'  		=> 'Rodyti panaikintus',
     'show_current'  		=> 'Rodyti dabartinį',
     'sign_in'				=> 'Prisijungti',
     'signature'             => 'Parašas',
-    'signed_off_by'         => 'Nurašyta',
-    'skin'       			=> 'Išvaizda',
+    'signed_off_by'         => 'Pasirašė',
+    'skin'       			=> 'Tema',
     'webhook_msg_note'        => 'Pranešimas bus išsiųstas naudojant „webhook“',
     'webhook_test_msg'        => 'Oh hai! Panašu jog jūsų :app integracija su Snipe-IT veikia!',
     'some_features_disabled' => 'DEMO REŽIMAS: šiame režime kai kurios funkcijos yra išjungtos.',
     'site_name'				=> 'Puslapio pavadinimas',
     'state'  				=> 'Rajonas',
     'status_labels'			=> 'Būsenos žymos',
+    'status_label'			=> 'Būsenos žyma',
     'status'    			=> 'Būsena',
     'accept_eula'           => 'Licencinis sutikimas',
+    'show_or_hide_eulas' => 'Rodyti/slėpti licencinius sutikimus',
     'supplier'              => 'Tiekėjas',
     'suppliers'  			=> 'Tiekėjai',
     'sure_to_delete'        => 'Ar tikrai norite panaikinti',
@@ -289,28 +296,28 @@ return [
     'submit'				=> 'Pateikti',
     'target'                => 'Tikslas',
     'time_and_date_display' => 'Laiko ir datos rodymas',
-    'total_assets'			=> 'iš viso įrangos',
+    'total_assets'			=> 'iš viso turto',
     'total_licenses'		=> 'iš viso licencijų',
     'total_accessories'		=> 'iš viso priedų',
     'total_consumables'		=> 'iš viso eksploatacinių medžiagų',
     'type'  				=> 'Tipas',
-    'undeployable'			=> 'Nepanaudojama',
+    'undeployable'			=> 'Neišduotinas',
     'unknown_admin'			=> 'Nežinomas administratorius',
-    'username_format'		=> 'Naudotojo vardo formatas',
     'username'              => 'Naudotojo vardas',
     'update'                => 'Atnaujinti',
+    'updating_item' => 'Atnaujinamas :item',
     'upload_filetypes_help'      => 'Leidžiami failų tipai yra: png, gif, jpg, jpeg, doc, docx, pdf, xls, xlsx, txt, lic, xml, zip, rtf ir rar. Didžiausias leidžiamas įkeliamų failų dydis yra :size.',
-    'uploaded'              => 'Įkelti',
+    'uploaded'              => 'Įkelta',
     'user'					=> 'Naudotojas',
     'accepted'			    => 'priimta',
     'declined'			    => 'nepriimta',
     'declined_note'         => 'Atsisakymo pastabos',
-    'unassigned'            => 'Nepriskirta',
-    'unaccepted_asset_report' => 'Nepriimta įranga',
+    'unassigned'            => 'Nepriskirtas',
+    'unaccepted_asset_report' => 'Nepriimtas turtas',
     'users'                 => 'Naudotojai',
     'viewall'				=> 'Rodyti viską',
-    'viewassets'  			=> 'Peržiūrėti priskirtą įrangą',
-    'viewassetsfor'         => 'Peržiūrėti :name įrangą',
+    'viewassets'  			=> 'Peržiūrėti priskirtą turtą',
+    'viewassetsfor'         => 'Peržiūrėti :name turtą',
     'website'               => 'Internetinis puslapis',
     'welcome'				=> 'Sveiki, :name',
     'years'					=> 'metai',
@@ -323,15 +330,15 @@ return [
     'token_expired'         => 'Jūsų sesija baigėsi. Bandykite dar kartą.',
     'login_enabled'         => 'Prisijungimas įjungtas',
     'audit_due'             => 'Laukia audito',
-    'audit_due_days'        => 'Įranga, kuriai turi būti atliktas auditas per :days dieną|Įranga, kuriai turi būti atliktas auditas per :days dienas',
+    'audit_due_days'        => '{}Assets Due or Overdue for Audit|[1]Assets Due or Overdue for Audit Within a Day|[2,*]Assets Due or Overdue for Audit Within :days Days',
     'checkin_due'           => 'Laukia paėmimo',
     'checkin_overdue'       => 'Vėluojama paimti',
-    'checkin_due_days'      => 'Įranga, kuri turi būti paimta per :days dieną|Įranga, kuri turi būti paimta per :days dienas',
+    'checkin_due_days'      => '{}Laukia paėmimo|[1]Turtas, kuris turi būti paimtas per :days dieną|2,*]Turtas, kuris turi būti paimtas per :days dienas (-ų)',
     'audit_overdue'         => 'Audito laikas praėjęs',
     'accept'                => 'Priimti :asset',
-    'i_accept'              => 'Aš sutinku',
-    'i_decline'             => 'Aš nesutinku',
-    'accept_decline'        => 'Sutikti/Nesutikti',
+    'i_accept'              => 'Aš priimu',
+    'i_decline'             => 'Aš nepriimu',
+    'accept_decline'        => 'Priimti/Nepriimti',
     'sign_tos'              => 'Pasirašykite žemiau, kad patvirtintumėte savo sutikimą su paslaugos sąlygomis:',
     'clear_signature'       => 'Išvalyti parašą',
     'show_help'             => 'Parodyti pagalbą',
@@ -352,16 +359,16 @@ return [
     'setup_done'            => 'Baigta!',
     'bulk_edit_about_to'    => 'Ketinate redaguoti šiuos dalykus: ',
     'checked_out'           => 'Išduota',
-    'checked_out_to'        => 'Išduota naudotojui',
+    'checked_out_to'        => 'Kam išduota',
     'fields'                => 'Laukai',
     'last_checkout'         => 'Paskutinis išdavimas',
-    'due_to_checkin'        => 'Šie daiktai (:count) netrukus turės būti išduoti:',
+    'due_to_checkin'        => 'Šie :count daiktai (-ų) netrukus turės būti paimti:',
     'expected_checkin'      => 'Numatoma paėmimo data',
-    'reminder_checked_out_items' => 'Tai yra pranešimas apie jums išduotą įrangą. Jei manote, kad šis sąrašas yra netikslus (kažko trūksta ar yra priskirta tai, ko jūs manote, kad niekada nesate gavę), prašome susisiekti el. paštu su :reply_to_name šiuo adresu :reply_to_address.',
+    'reminder_checked_out_items' => 'Tai yra pranešimas apie jums išduotus daiktus. Jei manote, kad šis sąrašas yra netikslus (kažko trūksta ar yra priskirta tai, ko jūs manote, kad niekada nesate gavę), prašome susisiekti el. paštu su :reply_to_name šiuo adresu :reply_to_address.',
     'changed'               => 'Pakeista',
-    'to'                    => 'Iki',
+    'to'                    => 'Kam',
     'report_fields_info'    => '<p>Pasirinkite laukus, kuriuos norėtumėte įtraukti į savo ataskaitą, ir spustelėkite Generuoti. Failas (custom-asset-report-YYYY-mm-dd.csv) bus parsiųstas automatiškai ir galėsite jį atidaryti programoje „Excel“.</p>
-            <p>Jei norite eksportuoti tik tam tikrą įrangą, naudokite žemiau pateiktas parinktis, kad patikslintumėte rezultatus.</p>',
+            <p>Jei norite eksportuoti tik tam tikrą turtą, naudokite žemiau pateiktas parinktis, kad patikslintumėte rezultatus.</p>',
     'range'                 => 'Intervalas',
     'bom_remark'            => 'Pridėti BOM (byte-order mark) prie šio CSV',
     'improvements'          => 'Patobulinimai',
@@ -373,19 +380,21 @@ return [
     'ldap_user_sync'        => 'LDAP naudotojų sinchronizacija',
     'synchronize'           => 'Sinchronizuoti',
     'sync_results'          => 'Sinchronizacijos rezultatai',
-    'license_serial'        => 'Serijos / produkto raktas',
+    'license_serial'        => 'Serijinis / produkto raktas',
     'invalid_category'      => 'Neteisinga kategorija arba tokios kategorijos nėra',
     'invalid_item_category_single' => 'Neteisinga :type kategorija arba tokios kategorijos nėra. Prieš bandydami išduoti daiktą, atnaujinkite šią :type kategoriją, kad joje būtų tinkama kategorija.',
     'dashboard_info'        => 'Tai jūsų valdymo skydas. Yra daug panašių, bet šis yra jūsų.',
     '60_percent_warning'    => '60% baigta (įspėjimas)',
-    'dashboard_empty'       => 'Atrodo, kad dar nieko nepridėjote, todėl neturime nieko nuostabaus, ką parodyti. Pradėkite dabar, pridėdami įrangos, priedų, eksploatacinių medžiagų ar licencijų!',
-    'new_asset'             => 'Nauja įranga',
+    'dashboard_empty'       => 'Atrodo, kad dar nieko nepridėjote, todėl neturime nieko nuostabaus, ką parodyti. Pradėkite dabar, pridėdami turto, priedų, eksploatacinių medžiagų ar licencijų!',
+    'new_asset'             => 'Naujas turtas',
     'new_license'           => 'Nauja licencija',
     'new_accessory'         => 'Naujas priedas',
     'new_consumable'        => 'Nauja eksploatacinė medžiaga',
+    'new_component'         => 'New Component',
+    'new_user'              => 'New User',
     'collapse'              => 'Sutraukti',
     'assigned'              => 'Priskirta',
-    'asset_count'           => 'Įrangos kiekis',
+    'asset_count'           => 'Turto kiekis',
     'accessories_count'     => 'Priedų kiekis',
     'consumables_count'     => 'Eksploatacinių medžiagų kiekis',
     'components_count'      => 'Komponentų kiekis',
@@ -396,41 +405,42 @@ return [
     'notification_success'  => 'Pavyko',
     'notification_warning'   => 'Įspėjimas',
     'notification_info'      => 'Informacija',
-    'asset_information'     => 'Įrangos informacija',
+    'asset_information'     => 'Turto informacija',
     'model_name'            => 'Modelio pavadinimas',
-    'asset_name'            => 'Įrangos pavadinimas',
+    'asset_name'            => 'Turto pavadinimas',
     'consumable_information' => 'Eksploatacinės medžiagos informacija:',
     'consumable_name'       => 'Eksploatacinės medžiagos pavadinimas:',
     'accessory_information' => 'Priedo informacija:',
     'accessory_name'       => 'Priedo pavadinimas:',
-    'clone_item'            => 'Klonuoti elementą',
+    'clone_item'            => 'Klonuoti daiktą',
     'checkout_tooltip' => 'Išduoti šį daiktą',
     'checkin_tooltip' => 'Paimti šį daiktą, kad jį būtų galima pakartotinai išduoti, atlikti jam aptarnavimą ir pan.',
     'checkout_user_tooltip' => 'Išduoti šį daiktą naudotojui',
-    'checkin_to_diff_location' => 'Paimamą įrangą galite perkelti ir į kitą, o ne į numatytąją vietą :default_location (jei tokia yra nurodyta)',
+    'checkin_to_diff_location' => 'Paimamą turtą galite perkelti ir į kitą, o ne į numatytąją :default_location vietą (jei tokia yra nurodyta)',
     'maintenance_mode'      => 'Paslauga laikinai nepasiekiama dėl sistemos naujinimo. Bandykite dar kartą vėliau.',
     'maintenance_mode_title' => 'Sistema laikinai nepasiekiama',
-    'ldap_import'           => 'Vartotojo slaptažodis neturėtų būti valdomas LDAP. (Tai leidžia siųsti užklausas dėl pamiršto slaptažodžio.)',
+    'ldap_import'           => 'Naudotojo slaptažodis neturėtų būti valdomas LDAP. (Tai leidžia siųsti užklausas dėl pamiršto slaptažodžio.)',
     'purge_not_allowed'     => 'Panaikintų duomenų valymas .env faile yra išjungtas. Susisiekite su palaikymo tarnyba arba savo sistemos administratoriumi.',
     'backup_delete_not_allowed'     => 'Atsarginių kopijų trynimas .env faile yra išjungtas. Susisiekite su palaikymo tarnyba arba savo sistemos administratoriumi.',
     'additional_files'           => 'Papildomi failai',
     'shitty_browser'        => 'Neaptiktas joks parašas. Jei naudojate senesnę naršyklę, naudokite modernesnę naršyklę, kad užbaigtumėte turto priėmimą.',
     'bulk_soft_delete'      =>'Taip pat, panaikinti šiuos naudotojus. Jų turto istorija išliks nepakitusi, kol neišvalysite ištrintų įrašų administratoriaus nustatymuose.',
-    'bulk_checkin_delete_success' => 'Jūsų pasirinkti naudotojai buvo panaikinti, o jų elementai buvo paimti.',
-    'bulk_checkin_success' => 'Nurodytų naudotojų elementai buvo paimti.',
-    'set_to_null'           => 'Išvalyti šios įrangos reikšmes|Išvalyti visų :asset_count įrangų reikšmes ',
+    'bulk_checkin_delete_success' => 'Jūsų pasirinkti naudotojai buvo panaikinti, o jų daiktai buvo paimti.',
+    'bulk_checkin_success' => 'Nurodytų naudotojų daiktai buvo paimti.',
+    'set_to_null'           => 'Ištrinti šio pasirinkimo reikšmes|Ištrinti visų :selection_count pasirinkimų reikšmes ',
     'set_users_field_to_null'  => 'Išvalyti :field reikšmes šiam naudotojui|Išvalyti :field reikšmes visiems :user_count naudotojams ',
     'na_no_purchase_date'   => 'N/D - Nenurodyta įsigijimo data',
-    'assets_by_status'      => 'Įranga pagal būseną',
-    'assets_by_status_type'      => 'Įranga pagal būsenos tipą',
+    'assets_by_status'      => 'Turtas pagal būseną',
+    'assets_by_status_type'      => 'Turtas pagal būsenos tipą',
     'pie_chart_type'        => 'Valdymo skydo skritulinės diagramos tipas',
     'hello_name'            => 'Sveiki, :name!',
-    'unaccepted_profile_warning'   => 'Turite :count elementus, kuriuos reikia priimti. Spustelėkite čia, jei norite juos priimti arba atmesti',
+    'unaccepted_profile_warning'   => 'Turite vieną daiktą, kurį reikia priimti. Spustelėkite čia, jei norite jį priimti arba atmesti | Turite :count daiktus(-ų), kuriuos reikia priimti. Spustelėkite čia, jei norite juos priimti arba atmesti',
     'start_date'            => 'Pradžios data',
     'end_date'            => 'Pabaigos data',
     'alt_uploaded_image_thumbnail' => 'Įkelta miniatiūra',
     'placeholder_kit'       => 'Pasirinkite rinkinį',
     'file_not_found'        => 'Failas nerastas',
+    'log_record_not_found'  => 'Įrašų apie šį žurnalo įrašą nerasta.',
     'preview_not_available' => '(nėra peržiūros galimybės)',
     'setup'                 => 'Sąranka',
     'pre_flight'            => 'Išankstinis patikrinimas',
@@ -438,13 +448,13 @@ return [
     'toggle_navigation'     => 'Rodyti/slėpti navigaciją',
     'alerts'                => 'Įspėjimai',
     'tasks_view_all'        => 'Peržiūrėti visas užduotis',
-    'true'                  => 'Teisingas',
-    'false'                 => 'Klaidingas',
+    'true'                  => 'True',
+    'false'                 => 'False',
     'integration_option'    => 'Integravimo galimybė',
     'log_does_not_exist'    => 'Nerasta atitinkančių žurnalo įrašų.',
     'merge_users'           => 'Sujungti naudotojus',
-    'merge_information' =>  'Bus sujungti :count naudotojai į vieną. Pasirinkite naudotoją, prie kurio prijungsite kitus. Visa susijusi įranga, licencijos ir kt. bus perkelta pasirinktam naudotojui, o kiti naudotojai bus pažymėti kaip panaikinti.',
-    'warning_merge_information' => 'Šis veiksmas yra NEGRĮŽTAMAS ir jį reiktų naudoti TIK tada, kai reikia sujungti vartotojus po blogo importavimo arba sinchronizavimo. Būtinai pirmiau sukurkite atsarginę kopiją.',
+    'merge_information' =>  'Bus sujungti :count naudotojai į vieną. Pasirinkite naudotoją, prie kurio prijungsite kitus. Visas susijęs turtas, licencijos ir kt. bus perkelta pasirinktam naudotojui, o kiti naudotojai bus pažymėti kaip panaikinti.',
+    'warning_merge_information' => 'Šis veiksmas yra NEGRĮŽTAMAS ir jį reiktų naudoti TIK tada, kai reikia sujungti naudotojus po blogo importavimo arba sinchronizavimo. Būtinai pirmiau sukurkite atsarginę kopiją.',
     'no_users_selected'     => 'Nepasirinktas joks naudotojas',
     'not_enough_users_selected'     => 'Turi būti pasirinkti bent :count naudotojai',
     'merge_success'         => ':count naudotojai sėkmingai sujungti į :into_username!',
@@ -454,7 +464,7 @@ return [
     'clear_and_save'            => 'Išvalyti ir išsaugoti',
     'update_existing_values'    => 'Atnaujinti esamas reikšmes?',
     'auto_incrementing_asset_tags_disabled_so_tags_required' => 'Automatiškai didėjančių inventorinių numerių generavimas yra išjungtas, todėl visose eilutėse, laukas „Inventorinis numeris“ privalo būti užpildytas.',
-    'auto_incrementing_asset_tags_enabled_so_now_assets_will_be_created' => 'Pastaba: įjungtas automatiškai didėjančių inventorinių numerių generavimas, todėl eilutėms, kuriose nėra užpildytas laukas „Inventorinis numeris“, bus sukurta nauja įranga. Eilutėse, kuriose laukas „Inventorinis numeris“ yra užpildytas, bus atnaujinta pateikta informacija.',
+    'auto_incrementing_asset_tags_enabled_so_now_assets_will_be_created' => 'Pastaba: įjungtas automatiškai didėjančių inventorinių numerių generavimas, todėl eilutėms, kuriose nėra užpildytas laukas „Inventorinis numeris“, bus sukurtas naujas turtas. Eilutėse, kuriose laukas „Inventorinis numeris“ yra užpildytas, bus atnaujinta pateikta informacija.',
     'send_welcome_email_to_users'   => ' Siųsti sveikinimo laišką naujiems naudotojams?',
     'send_email'                => 'Siųsti laišką',
     'call'                      => 'Skambinti numeriu',
@@ -478,14 +488,14 @@ return [
     'autoassign_licenses_help_long' => 'Tai leidžia priskirti licencijas naudotojui, naudojant masinio licencijų priskyrimo sąsają arba cli įrankius. (Pavyzdžiui, galite nenorėti, kad jūsų subrangovai automatiškai gautų tik darbuotojams skirtas licencijas. Jūs vis tiek galite priskirti licencijas šiems naudotojams atskirai, bet jie nebus įtraukti į funkciją „Priskirti licenciją visiems naudotojams“.)',
     'no_autoassign_licenses_help' => 'Naudotojo neįtraukti į masinį priskyrimą naudojant licencijų priskyrimo sąsają arba cli įrankius.',
     'modal_confirm_generic'      => 'Esate tikri?',
-    'cannot_be_deleted'      => 'Šis elemento ištrinti negalima',
-    'cannot_be_edited'      => 'Šio elemento redaguoti negalima.',
-    'undeployable_tooltip'      => 'Šis elemento negalima išduoti. Patikrinkite likutį.',
-    'serial_number'        => 'Serijos numeris',
+    'cannot_be_deleted'      => 'Šio daikto ištrinti negalima',
+    'cannot_be_edited'      => 'Šio daikto redaguoti negalima.',
+    'undeployable_tooltip'      => 'Šio daikto išduoti negalima. Patikrinkite likutį.',
+    'serial_number'        => 'Serijinis numeris',
     'item_notes' => ':item Pastabos',
     'item_name_var' => ':item Pavadinimas',
-    'error_user_company' => 'Paskirties ir įrangos įmonės nesutampa',
-    'error_user_company_accept_view' => 'Jums paskirta įranga priklauso kitai įmonei, todėl Jūs negalite jos priimti ar atmesti, pasitarkite su savo vadovu',
+    'error_user_company' => 'Paskirties ir turto įmonės nesutampa',
+    'error_user_company_accept_view' => 'Jums paskirtas turtas priklauso kitai įmonei, todėl jūs negalite jo priimti arba atsisakyti. Kreipkitės į savo vadovą.',
     'importer' => [
         'checked_out_to_fullname' => 'Išduota: vardas, pavardė',
         'checked_out_to_first_name' => 'Išduota: vardas',
@@ -512,11 +522,11 @@ return [
     'checked_out_to_fields' => 'Priskyrimo laukai',
     'percent_complete' => '% baigta',
     'uploading' => 'Įkeliama... ',
-    'upload_error' => 'Klaida įkeliant failą. Patikrinkite, ar nėra tuščių eilučių ir besidubliuojančių stulpelių pavadinimų.',
+    'upload_error' => 'Error uploading file. Please check that you have no empty rows or duplicated column names in your CSV, and that the server permissions allow uploads.',
     'copy_to_clipboard' => 'Kopijuoti į iškarpinę',
     'copied' => 'Nukopijuota!',
-    'status_compatibility' => 'Jei įranga jau yra išduota, jos būsena negali būti pakeista į neišduodamos būsenos tipą, todėl šios reikšmės pakeitimas nebus atliekamas.',
-    'rtd_location_help' => 'Tai yra įrangos buvimo vieta, kai ji nėra išduota',
+    'status_compatibility' => 'Jei turtas jau yra išduotas, jo būsena negali būti pakeista į neišduotinos būsenos tipą, todėl šios reikšmės pakeitimas nebus atliekamas.',
+    'rtd_location_help' => 'Tai yra turto buvimo vieta, kai jis nėra išduotas',
     'item_not_found' => ':item_type ID :id neegzistuoja arba buvo panaikintas',
     'action_permission_denied' => 'Neturite teisių atlikti :action :item_type ID :id',
     'action_permission_generic' => 'Neturite teisių atlikti :action šiam :item_type',
@@ -528,7 +538,7 @@ return [
     'permission_denied_superuser_demo' => 'Leidimas nesuteiktas. Demonstraciniame režime negalite keisti superadministratoriaus naudotojo informacijos.',
     'pwd_reset_not_sent' => 'Naudotojas nesuaktyvintas, yra sinchronizuotas LDAP arba neturi el. pašto adreso',
     'error_sending_email' => 'Siunčiant el. laišką įvyko klaida',
-    'sad_panda' => 'Sad panda. You are not authorized to do the thing. Maybe <a href=":link">return to the dashboard</a>, or contact your administrator.',
+    'sad_panda' => 'Liūdna panda. Jūs neturite reikiamų teisių šiam veiksmui. Verčiau <a href=":link">grįžkite į valdymo skydą</a> arba susisiekite su administratoriumi.',
     'bulk' => [
             'delete' =>
                 [
@@ -540,15 +550,80 @@ return [
                 'partial'   =>  'Panaikinti :success_count :object_type, bet :error_count :object_type negali būti panaikinti',
              ],
     ],
-    'no_requestable' => 'Nėra užsakomos įrangos arba įrangos modelių.',
+    'no_requestable' => 'Nėra užsakomo turto arba turto modelių.',
 
     'countable' => [
         'accessories'  => ':count Priedas|:count Priedai',
-        'assets'  => ':count Įranga|:count Įranga',
-        'licenses'  => ':count Licencija|:count Licencijos',
+        'assets'  => ':count turto vienetas|:count turto vienetai (-ų)',
+        'licenses'  => ':count licencija|:count licencijos',
         'license_seats'  => ':count Licencijos vieta|:count Licencijos vietos',
         'consumables'  => ':count Eksploatacinė medžiaga|:count Eksploatacinės medžiagos',
         'components'  => ':count Komponentas|:count Komponentai',
-    ]
+    ],
+
+    'more_info' => 'Išsamiau',
+    'quickscan_bulk_help' => 'Pažymėjus šį langelį, turto įrašas bus atnaujintas, kad atspindėtų šią naują vietą. Jei paliksite jį nepažymėtą, vieta bus pažymėta tik audito žurnale. Atkreipkite dėmesį, kad jei šis turtas bus išduotas, tai nepakeis to asmens, turto ar vietos, kuriems išduodamas turtas, buvimo vietos.',
+    'whoops' => 'Oi!',
+    'something_went_wrong' => 'Kažkas negerai su jūsų užklausa.',
+    'close' => 'Uždaryti',
+    'expires' => 'Baigiasi',
+    'map_fields'=> 'Susieti :item_type laukus',
+    'remaining_var' => ':count liko',
+    'label' => 'Etiketė',
+    'import_asset_tag_exists' => 'Turtas su inventoriniu numeriu :asset_tag jau yra ir atnaujinimo užklausa nebuvo pateikta. Jokie pakeitimai nebuvo atlikti.',
+    'countries_manually_entered_help' => 'Žvaigždute (*) pažymėtos reikšmės buvo įvestos rankiniu būdu ir neatitinka esamų ISO 3166 išskleidžiamojo sąrašo reikšmių',
+    'accessories_assigned' => 'Priskirti priedai',
+    'user_managed_passwords' => 'Slaptažodžių tvarkymas',
+    'user_managed_passwords_disallow' => 'Neleisti naudotojams tvarkyti savo slaptažodžių',
+    'user_managed_passwords_allow' => 'Leisti naudotojams tvarkyti savo slaptažodžius',
+    'from' => 'From',
+    'by' => 'Atlikti',
+
+// Add form placeholders here
+    'placeholders' => [
+        'notes'  => 'Pridėti pastabą',
+    ],
+
+    'breadcrumb_button_actions' => [
+        'edit_item' => ':name redagavimas',
+        'checkout_item' => ':name išdavimas',
+        'checkin_item' => 'Paimti :name',
+    ],
+
+    'skins' => [
+        'site_default' => 'Site Default',
+        'default_blue' => 'Default Blue',
+        'blue_dark' => 'Blue (Dark Mode)',
+        'green' => 'Green Dark',
+        'green_dark' => 'Green (Dark Mode)',
+        'red' => 'Red Dark',
+        'red_dark' => 'Red (Dark Mode)',
+        'orange' => 'Orange Dark',
+        'orange_dark' => 'Orange (Dark Mode)',
+        'black' => 'Black',
+        'black_dark' => 'Black (Dark Mode)',
+        'purple' => 'Purple',
+        'purple_dark' => 'Purple (Dark Mode)',
+        'yellow' => 'Yellow',
+        'yellow_dark' => 'Yellow (Dark Mode)',
+        'high_contrast' => 'High Contrast',
+
+    ],
+
+    'select_all_none' => 'Pažymėti/atžymėti viską',
+    'generic_model_not_found' => 'Tokio :model nėra arba jūs neturite teisės jo pasiekti',
+    'deleted_models' => 'Panaikinti turto modeliai',
+    'deleted_users' => 'Panaikinti naudotojai',
+    'cost_each' => ':amount kiekvienas',
+    'remove_current_image' => 'Remove current :type image',
+
+    'seeding' => [
+        'manufacturers' => [
+            'button' => 'Create Manufacturers',
+            'prompt' => 'You do not have any manufacturers yet. Would you like to seed a list of common manufacturers? (THIS WILL OVERWRITE EXISTING MANUFACTURERS, including those that have been soft-deleted.)',
+            'success' => 'Manufacturers seeded successfully',
+            'error' => 'Could not seed manufacturers. A manufacturer record already exists and seeding would overwrite it.|Could not seed manufacturers. :count manufacturer records already exist and seeding would overwrite them.',
+        ],
+    ],
 
 ];
diff --git a/resources/lang/lt-LT/help.php b/resources/lang/lt-LT/help.php
index f4a9039305..99f79a9f73 100644
--- a/resources/lang/lt-LT/help.php
+++ b/resources/lang/lt-LT/help.php
@@ -15,21 +15,21 @@ return [
 
     'more_info_title' => 'Detaliau',
 
-    'audit_help' => 'Pažymėjus šį langelį, įrangos įrašas bus atnaujintas, kad atspindėtų šią naują vietą. Jei paliksite jį nepažymėtą, vieta bus pažymėta tik audito žurnale.<br><br>Atkreipkite dėmesį, kad jei ši įranga bus išduota, tai nepakeis asmens, įrangos ar vietos, kuriems išduodama įranga, buvimo vietos.',
+    'audit_help' => 'Pažymėjus šį langelį, turto įrašas bus atnaujintas, kad atspindėtų šią naują vietą. Jei paliksite jį nepažymėtą, vieta bus pažymėta tik audito žurnale.<br><br>Atkreipkite dėmesį, kad jei šis turtas bus išduotas, tai nepakeis to asmens, turto ar vietos, kuriems išduodamas turtas, buvimo vietos.',
 
-    'assets' => 'Įranga, tai turtas, kurį galima sekti pagal serijos ar inventoriaus numerį. Įprastai, tai yra didesnės vertės daiktai, kurių individualus identifikavimas yra svarbus.',
+    'assets' => 'Turtas, tai daiktai, kuriuos galima sekti pagal serijinį ar inventorinį numerį. Įprastai, tai yra didesnės vertės daiktai, kurių individualus identifikavimas yra svarbus.',
 
     'categories' => 'Kategorijos padeda tvarkyti elementus. Pavyzdžiui, gali būti tokios kategorijos: „Staliniai kompiuteriai“, „Nešiojamieji kompiuteriai“, „Mobilieji telefonai“, „Planšetiniai kompiuteriai“ ir pan., bet kategorijas galite naudoti bet kokiu jums patogiu būdu.',
 
     'accessories' => 'Priedai – viskas, ką išduodate naudotojams, bet be serijinio numerio (arba jums nėra aktualu šiuos daiktus sekti individualiai). Pavyzdžiui, kompiuterių pelės ar klaviatūros.',
 
-    'companies'     => 'Galite naudoti įmones kaip paprastą informacinį lauką arba siekdami apriboti įrangos, naudotojų ir pan. matomumą, Administratoriaus nustatymuose įjungę „Pilną kelių įmonių palaikymą“.',
+    'companies'     => 'Galite naudoti įmones kaip paprastą informacinį lauką arba siekdami apriboti turto, naudotojų ir kt. matomumą, Administratoriaus nustatymuose įjungę „Pilną kelių įmonių palaikymą“.',
 
-    'components'    => 'Komponentai yra įrangos sudedamosios dalys, pvz., HDD/SSD diskai, RAM atminties moduliai ir kt.',
+    'components'    => 'Komponentai yra turto sudedamosios dalys, pvz., HDD/SSD diskai, RAM atminties moduliai ir kt.',
 
     'consumables'   => 'Eksploatacinės medžiagos – viskas, kas įsigyta ir laikui bėgant bus sunaudota. Pavyzdžiui, spausdintuvo rašalas arba kopijavimo popierius.',
 
-    'depreciations' => 'Jūs galite nustatyti įrangos nusidėvėjimą pagal tiesinį nusidėvėjimo modelį.',
+    'depreciations' => 'Jūs galite nustatyti turto nusidėvėjimą pagal tiesinį nusidėvėjimo modelį.',
     
     'empty_file'    => 'Importavimo vedlys aptiko, kad šis failas yra tuščias.'
 ];
diff --git a/resources/lang/lt-LT/localizations.php b/resources/lang/lt-LT/localizations.php
index 8b54054bf5..b76ecaaf4b 100644
--- a/resources/lang/lt-LT/localizations.php
+++ b/resources/lang/lt-LT/localizations.php
@@ -40,7 +40,9 @@ return [
         'ms-MY'=> 'Malajų',
         'mi-NZ'=> 'Maorių',
         'mn-MN'=> 'Mongolų',
-        'no-NO'=> 'Norvegų',
+        'nb-NO'=> 'Norvegų bukmolas',
+        'om-ET' => 'Oromų k. (etiopų)',
+        //'nn-NO'=> 'Norwegian Nynorsk',
         'fa-IR'=> 'Persų',
         'pl-PL'=> 'Lenkų',
         'pt-PT'=> 'Portugalų',
@@ -133,6 +135,7 @@ return [
         'EC'=>'Ekvadoras',
         'EE'=>'Estija',
         'EG'=>'Egiptas',
+        'GB-ENG'=>'Anglija',
         'ER'=>'Eritrėja',
         'ES'=>'Ispanija',
         'ET'=>'Etiopija',
@@ -231,6 +234,7 @@ return [
         'NG'=>'Nigerija',
         'NI'=>'Nikaragva',
         'NL'=>'Nyderlandai',
+        'GB-NIR' => 'Šiaurės Airija',
         'NO'=>'Norvegija',
         'NP'=>'Nepalas',
         'NR'=>'Nauru',
@@ -258,7 +262,7 @@ return [
         'RU'=>'Rusija',
         'RW'=>'Ruanda',
         'SA'=>'Saudo Arabija',
-        'UK'=>'Škotija',
+        'GB-SCT'=>'Škotija',
         'SB'=>'Saliamono salos',
         'SC'=>'Seišeliai',
         'SS'=>'Pietų Sudanas',
@@ -310,6 +314,7 @@ return [
         'VI'=>'Mergelių salos (JAV)',
         'VN'=>'Vietnamas',
         'VU'=>'Vanuatu',
+        'GB-WLS' =>'Velsas',
         'WF'=>'Voliso ir Futūnos salos',
         'WS'=>'Samoa',
         'YE'=>'Jemenas',
diff --git a/resources/lang/lt-LT/mail.php b/resources/lang/lt-LT/mail.php
index e29e198e34..d74bbb4ab1 100644
--- a/resources/lang/lt-LT/mail.php
+++ b/resources/lang/lt-LT/mail.php
@@ -4,90 +4,96 @@ return [
 
     'Accessory_Checkin_Notification' => 'Priedas paimtas',
     'Accessory_Checkout_Notification' => 'Priedas išduotas',
-    'Asset_Checkin_Notification' => 'Įranga paimta',
-    'Asset_Checkout_Notification' => 'Įranga išduota',
+    'Asset_Checkin_Notification' => 'Turtas paimtas',
+    'Asset_Checkout_Notification' => 'Turtas išduotas',
     'Confirm_Accessory_Checkin' => 'Priedo paėmimo patvirtinimas',
-    'Confirm_Asset_Checkin' => 'Įrangos paėmimo patvirtinimas',
+    'Confirm_Asset_Checkin' => 'Turto paėmimo patvirtinimas',
     'Confirm_accessory_delivery' => 'Priedo pristatymo patvirtinimas',
-    'Confirm_asset_delivery' => 'Įrangos pristatymo patvirtinimas',
+    'Confirm_asset_delivery' => 'Turto pristatymo patvirtinimas',
     'Confirm_consumable_delivery' => 'Eksploatacinės medžiagos pristatymo patvirtinimas',
     'Confirm_license_delivery' => 'Licencijos pristatymo patvirtinimas',
     'Consumable_checkout_notification' => 'Eksploatacinė medžiaga išduota',
     'Days' => 'Dienos',
-    'Expected_Checkin_Date' => 'Jums yra išduota įranga, kuri bus iš jūsų paimta :date',
+    'Expected_Checkin_Date' => 'Jums yra išduotas turtas, kuris bus iš jūsų paimtas :date d.',
     'Expected_Checkin_Notification' => 'Priminimas: artėja :name paėmimo terminas',
-    'Expected_Checkin_Report' => 'Numatomos paimti įrangos ataskaita',
-    'Expiring_Assets_Report' => 'Bebaigiančios galioti įrangos ataskaita.',
+    'Expected_Checkin_Report' => 'Numatomo paimti turto ataskaita',
+    'Expiring_Assets_Report' => 'Bebaigiančio galioti turto ataskaita.',
     'Expiring_Licenses_Report' => 'Bebaigiančių galioti licencijų ataskaita.',
-    'Item_Request_Canceled' => 'Įrangos užsakymas atšauktas',
-    'Item_Requested' => 'Įranga užsakyta',
+    'Item_Request_Canceled' => 'Daikto užsakymas atšauktas',
+    'Item_Requested' => 'Daiktas užsakytas',
     'License_Checkin_Notification' => 'Licencija paimta',
     'License_Checkout_Notification' => 'Licencija išduota',
+    'license_for'   => 'Licencija skirta',
     'Low_Inventory_Report' => 'Ataskaita apie mažas atsargas',
-    'a_user_canceled' => 'Naudotojas svetainėje atšaukė įrangos užsakymą',
-    'a_user_requested' => 'Naudotojas svetainėje užsakė įrangą',
+    'a_user_canceled' => 'Naudotojas svetainėje atšaukė daikto užsakymą',
+    'a_user_requested' => 'Naudotojas svetainėje užsakė daiktą',
     'acceptance_asset_accepted' => 'Naudotojas priėmė daiktą',
     'acceptance_asset_declined' => 'Naudotojas nepriėmė daikto',
-    'accessory_name' => 'Priedo pavadinimas:',
-    'additional_notes' => 'Papildomos pastabos:',
+    'accessory_name' => 'Priedo pavadinimas',
+    'additional_notes' => 'Papildomos pastabos',
     'admin_has_created' => 'Administratorius sukūrė jums paskyrą :web svetainėje.',
-    'asset' => 'Įranga:',
-    'asset_name' => 'Įrangos pavadinimas:',
-    'asset_requested' => 'Užsakyta įranga',
+    'asset' => 'Turtas',
+    'asset_name' => 'Turto pavadinimas',
+    'asset_requested' => 'Turtas užsakytas',
     'asset_tag' => 'Inventorinis numeris',
-    'assets_warrantee_alert' => 'Yra :count įranga, kurios garantija baigiasi per kitas :threshold dienas.|Yra :count įrangos (-ų), kurių garantija baigiasi per kitas :threshold dienas (-ų).',
+    'assets_warrantee_alert' => 'Yra :count turto vienetas, kurio garantija baigiasi per kitas :threshold dienas (-ų).|Yra :count turto vienetai (-ų), kurių garantija baigiasi per kitas :threshold dienas (-ų).',
     'assigned_to' => 'Išduota',
     'best_regards' => 'Pagarbiai,',
-    'canceled' => 'Atšauktas:',
-    'checkin_date' => 'Paėmimo data:',
-    'checkout_date' => 'Išdavimo data:',
+    'canceled' => 'Atšauktas',
+    'checkin_date' => 'Paėmimo data',
+    'checkout_date' => 'Išdavimo data',
     'checkedout_from' => 'Išduota iš',
     'checkedin_from'  => 'Paimta iš',
     'checked_into' => 'Paimta į',
     'click_on_the_link_accessory' => 'Spustelėkite nuorodą apačioje, kad patvirtintumėte, jog gavote priedą.',
-    'click_on_the_link_asset' => 'Spustelėkite nuorodą apačioje, kad patvirtintumėte, jog gavote įrangą.',
+    'click_on_the_link_asset' => 'Spustelėkite nuorodą apačioje, kad patvirtintumėte, jog gavote turtą.',
     'click_to_confirm' => 'Spustelėkite šią nuorodą, kad patvirtintumėte savo :web paskyrą:',
     'current_QTY' => 'Esamas kiekis',
     'days' => 'Dienos',
-    'expecting_checkin_date' => 'Numatoma paėmimo data:',
+    'expecting_checkin_date' => 'Numatoma paėmimo data',
     'expires' => 'Baigia galioti',
     'hello' => 'Sveiki',
     'hi' => 'Sveiki',
     'i_have_read' => 'Aš perskaičiau ir sutinku su naudojimo sąlygomis, ir patvirtinu, kad gavau šį daiktą.',
     'inventory_report' => 'Inventoriaus ataskaita',
-    'item' => 'Daiktas:',
+    'item' => 'Daiktas',
+    'item_checked_reminder' => 'Tai priminimas, kad šiuo metu jums yra išduoti :count daiktai, kurių nepriėmėte arba neatmetėte. Spustelėkite toliau pateiktą nuorodą, kad patvirtintumėte savo sprendimą.',
     'license_expiring_alert' => 'Yra :count licencija, kuri baigiasi per kitas :threshold dienas.|Yra :count licencijos (-ų), kurios baigiasi per kitas :threshold dienas (-ų).',
     'link_to_update_password' => 'Spustelėkite šią nuorodą, kad atnaujintumėte savo :web slaptažodį:',
-    'login' => 'Prisijungti:',
+    'login' => 'Prisijungti',
     'login_first_admin' => 'Prisijunkite prie savo naujojo „Snipe-IT“ diegimo naudodami žemiau pateiktus prisijungimo duomenis:',
-    'low_inventory_alert' => 'Yra :count pozicija, kurios atsargos yra mažesnės (arba greitais bus mažesnės) nei numatytos minimalios atsargos.|Yra :count pozicijų, kurių atsargos yra mažesnės (arba greitais bus mažesnės) nei numatytos minimalios atsargos.',
-    'min_QTY' => 'Min. kiekis',
+    'low_inventory_alert' => 'Yra :count daiktas, kurio atsargos yra mažesnės (arba greitais bus mažesnės) nei numatytos minimalios atsargos.|Yra :count daiktai (-ų), kurių atsargos yra mažesnės (arba greitais bus mažesnės) nei numatytos minimalios atsargos.',
+    'min_QTY' => 'Mažiausias kiekis',
     'name' => 'Pavadinimas',
-    'new_item_checked' => 'Jums buvo priskirtas naujas elementas, išsami informacija pateikta žemiau.',
+    'new_item_checked' => 'Jums buvo priskirtas naujas daiktas, išsami informacija pateikta žemiau.',
+    'new_item_checked_with_acceptance' => 'A new item has been checked out under your name that requires acceptance, details are below.',
+    'recent_item_checked' => 'An item was recently checked out under your name that requires acceptance, details are below.',
     'notes' => 'Pastabos',
-    'password' => 'Slaptažodis:',
+    'password' => 'Slaptažodis',
     'password_reset' => 'Slaptažodžio nustatymas iš naujo',
     'read_the_terms' => 'Perskaitykite žemiau pateiktas naudojimo sąlygas.',
-    'read_the_terms_and_click' => 'Perskaitykite žemiau pateiktas naudojimo sąlygas ir spustelėti apačioje esančią nuorodą, kad patvirtintumėte jog perskaitėte ir sutinkate su jomis, bei kad gavote įrangą.',
-    'requested' => 'Užsakyta:',
+    'read_the_terms_and_click' => 'Perskaitykite žemiau pateiktas naudojimo sąlygas ir spustelėti apačioje esančią nuorodą, kad patvirtintumėte jog perskaitėte ir sutinkate su jomis, bei kad gavote turtą.',
+    'requested' => 'Užsakytas',
     'reset_link' => 'Jūsų slaptažodžio nustatymo iš naujo nuoroda',
     'reset_password' => 'Spustelėkite čia norėdami iš naujo nustatyti slaptažodį:',
     'rights_reserved' => 'Visos teisės saugomos.',
-    'serial' => 'Serijos numeris',
+    'serial' => 'Serijinis numeris',
     'snipe_webhook_test' => 'Snipe-IT integracijos testas',
     'snipe_webhook_summary' => 'Snipe-IT integracijos testo suvestinė',
     'supplier' => 'Tiekėjas',
     'tag' => 'Žyma',
     'test_email' => 'Bandomasis laiškas iš „Snipe-IT“',
-    'test_mail_text' => 'Tai yra „Snipe-IT“ turto valdymo sistemos testas. Jei tai gavote, vadinasi paštas veikia.',
+    'test_mail_text' => 'Tai yra „Snipe-IT“ turto valdymo sistemos testas. Jei gavote šį pranešimą, vadinasi paštas veikia.',
     'the_following_item' => 'Šis daiktas buvo paimtas: ',
     'to_reset' => 'Norėdami iš naujo nustatyti savo :web slaptažodį, užpildykite šią formą:',
     'type' => 'Tipas',
-    'upcoming-audits' => 'Yra :count įranga, kuriai per :threshold dienas (-ų) turi būti atliktas auditas.|Yra :count įrangos (-ų), kurioms per :threshold dienas (-ų) turi būti atliktas auditas.',
+    'upcoming-audits' => 'Yra :count turto vienetas, kuriam per :threshold dienas (-ų) turi būti atliktas auditas.|Yra :count turto vienetai (-ų), kuriems per :threshold dienas (-ų) turi būti atliktas auditas.',
     'user' => 'Naudotojas',
     'username' => 'Naudotojo vardas',
-    'welcome' => 'Sveiki :vardas',
+    'unaccepted_asset_reminder' => 'Reminder: You have Unaccepted Assets.',
+    'welcome' => 'Sveiki, :name',
     'welcome_to' => 'Sveiki apsilankę :web!',
-    'your_assets' => 'Peržiūrėti jūsų įrangą',
+    'your_assets' => 'Peržiūrėti jūsų turtą',
     'your_credentials' => 'Jūsų „Snipe-IT“ prisijungimo duomenys',
+    'mail_sent' => 'Laiškas sėkmingai išsiųstas!',
 ];
diff --git a/resources/lang/lt-LT/reminders.php b/resources/lang/lt-LT/reminders.php
index a8a6c3d6d9..07a1f2cdda 100644
--- a/resources/lang/lt-LT/reminders.php
+++ b/resources/lang/lt-LT/reminders.php
@@ -13,7 +13,7 @@ return array(
     |
     */
 
-    "password" => "Slaptažodį turi sudaryti bent šeši simboliai ir jie turi sutapti.",
+    "password" => "Slaptažodis turi būti sudarytas bent iš šešių simbolių ir turi sutapti su patvirtinimu.",
     "user"     => "Neteisingas naudotojo vardas arba el. paštas",
     "token"    => 'Šis slaptažodžio nustatymo iš naujo raktas yra netinkamas, pasibaigęs jo galiojimas arba jis nesutampa su nurodytu naudotojo vardu.',
     'sent'	   => 'Jei mūsų sistemoje yra toks naudotojas su galiojančiu el. pašto adresu, jam buvo išsiųstas laiškas slaptažodžio nustatymui iš naujo.',
diff --git a/resources/lang/lt-LT/table.php b/resources/lang/lt-LT/table.php
index 836e2acf43..4203d24d8f 100644
--- a/resources/lang/lt-LT/table.php
+++ b/resources/lang/lt-LT/table.php
@@ -5,7 +5,7 @@ return array(
     'actions'	 	        => 'Veiksmai',
     'action' 		        => 'Veiksmas',
     'by'      		        => 'Atlikti',
-    'item' 			        => 'Įranga',
+    'item' 			        => 'Daiktas',
     'no_matching_records'   => 'Nerasta jokių atitinkančių įrašų',
 
 );
diff --git a/resources/lang/lt-LT/validation.php b/resources/lang/lt-LT/validation.php
index aa3bcaf690..f4fdd251b3 100644
--- a/resources/lang/lt-LT/validation.php
+++ b/resources/lang/lt-LT/validation.php
@@ -13,87 +13,150 @@ return [
     |
     */
 
-    'accepted'             => ':attribute turi būti patvirtintas.',
-    'active_url'           => ':attribute nėra tinkamas interentinis puslapis.',
-    'after'                => ':attribute privalo būti data po :date.',
-    'after_or_equal'       => ':attribute privalo būti data lygi arba vėlesnė negu :date.',
-    'alpha'                => ':attribute gali būti tik raidės.',
-    'alpha_dash'           => ':attribute gali būti tik raidės, skaičiai ir brūkšneliai.',
-    'alpha_num'            => ':attribute gali būti tik raidės ir skaičiai.',
-    'array'                => ':attribute turi būti masyvas.',
-    'before'               => ':attribute turi būti data prieš :date.',
-    'before_or_equal'      => ':attribute privalo būti data ankstesnė arba lygi :date.',
-    'between'              => [
-        'numeric' => ':attribute privalo būti tarp :min - :max.',
-        'file'    => ':attribute privalo būti tarp :min - :max kilobaitų.',
-        'string'  => ':attribute privalo būti tarp :min - :max simbolių.',
-        'array'   => ':attribute turi būti tarp :min ir :max elementų.',
+    'accepted' => ':attribute laukas turi būti patvirtintas.',
+    'accepted_if' => ':attribute laukas turi būti patvirtintas, kai :other yra :value.',
+    'active_url' => ':attribute lauke turi būti galiojantis URL adresas.',
+    'after' => ':attribute lauke turi būti data po :date.',
+    'after_or_equal' => ':attribute lauke turi būti data lygi arba vėlesnė negu :date.',
+    'alpha' => ':attribute lauke gali būti tik raidės.',
+    'alpha_dash' => ':attribute lauke gali būti tik raidės, skaičiai ir brūkšneliai.',
+    'alpha_num' => ':attribute lauke gali būti tik raidės ir skaičiai.',
+    'array' => ':attribute lauke turi būti masyvas.',
+    'ascii' => ':attribute lauke turi būti tik vieno baito raidės, skaičiai ir simboliai.',
+    'before' => ':attribute lauke turi būti data iki :date.',
+    'before_or_equal' => ':attribute lauke turi būti data lygi arba ankstesnė negu :date.',
+    'between' => [
+        'array' => ':attribute lauke turi būti nuo :min iki :max elementų.',
+        'file' => ':attribute laukas turi būti nuo :min iki :max kilobaitų.',
+        'numeric' => ':attribute laukas turi būti nuo :min iki :max.',
+        'string' => ':attribute lauke turi būti nuo :min iki :max simbolių.',
     ],
-    'boolean'              => ':attribute turi būti „Teisinga“ arba „Klaidinga“.',
-    'confirmed'            => ':attribute patvirtinimas nesutampa.',
-    'date'                 => ':attribute nėra galiojanti data.',
-    'date_format'          => ':attribute neatitinka formato :format.',
-    'different'            => ':attribute ir :other turi būti skirtingi.',
-    'digits'               => ':attribute privalo būti :digits skaitmenų.',
-    'digits_between'       => ':attribute privalo būti tarp :min ir:max skaitmenų.',
-    'dimensions'           => ':attribute atvaizdo matmenys yra netinkami.',
-    'distinct'             => ':attribute lauke yra pasikartojanti reikšmė.',
-    'email'                => ':attribute formatas neteisingas.',
-    'exists'               => 'Pasirinktas :attribute yra neteisingas.',
-    'file'                 => ':attribute turi būti failas.',
-    'filled'               => ':attribute laukas turi turėti reikšmę.',
-    'image'                => ':attribute privalo būti atvaizdas.',
+    'boolean' => ':attribute lauke turi būti „Taip“ arba „Ne“.',
+    'can' => ':attribute lauke yra neleistina reikšmė.',
+    'confirmed' => ':attribute lauko patvirtinimas nesutampa.',
+    'contains' => ':attribute lauke trūksta privalomos reikšmės.',
+    'current_password' => 'Neteisingas slaptažodis.',
+    'date' => ':attribute lauke turi būti teisinga data.',
+    'date_equals' => ':attribute lauke turi būti data, lygi :date.',
+    'date_format' => ':attribute laukas turi atitikti formatą :format.',
+    'decimal' => ':attribute lauke turi būti :decimal skaičiai po kablelio.',
+    'declined' => ':attribute laukas turi būti atmestas.',
+    'declined_if' => ':attribute laukas turi būti atmestas, kai :other yra :value.',
+    'different' => ':attribute laukas ir :other turi būti skirtingi.',
+    'digits' => ':Attribute lauke turi būti :digits skaitmenys.',
+    'digits_between' => ':attribute lauke turi būti nuo :min iki :max skaitmenų.',
+    'dimensions' => ':attribute lauke esančio atvaizdo matmenys yra netinkami.',
+    'distinct' => ':attribute lauke yra pasikartojanti reikšmė.',
+    'doesnt_end_with' => ':attribute laukas negali baigtis vienu iš šių: :values.',
+    'doesnt_start_with' => ':attribute laukas negali prasidėti vienu iš šių: :values.',
+    'email' => ':attribute lauke turi būti teisingas el. pašto adresas.',
+    'ends_with' => ':attribute laukas privalo baigtis vienu iš šių: :values.',
+    'enum' => 'Pasirinktas :attribute yra neteisingas.',
+    'exists' => 'Pasirinktas :attribute yra neteisingas.',
+    'extensions' => ':attribute laukas privalo turėti vieną iš šių plėtinių: :values.',
+    'file' => ':attribute lauke turi būti failas.',
+    'filled' => ':attribute laukas turi turėti reikšmę.',
+    'gt' => [
+        'array' => ':attribute lauke turi būti daugiau nei :value elementai (-ų).',
+        'file' => ':attribute laukas turi būti didesnis nei :max kilobaitai (-ų).',
+        'numeric' => ':attribute laukas turi būti didesnis nei :value.',
+        'string' => ':attribute lauke turi būti daugiau nei :value simboliai (-ių).',
+    ],
+    'gte' => [
+        'array' => ':attribute lauke turi būti :value arba daugiau elementų.',
+        'file' => ':attribute laukas turi būti didesnis arba lygus :value kilobaitams (-ų).',
+        'numeric' => ':attribute laukas turi būti didesnis arba lygus :value.',
+        'string' => ':attribute laukas turi būti didesnis arba lygus :value simboliams (-ų).',
+    ],
+    'hex_color' => ':attribute lauke turi būti teisinga šešioliktainė spalva.',
+    'image' => ':attribute lauke turi būti atvaizdas.',
     'import_field_empty'    => ':fieldname reikšmė negali būti tuščia.',
-    'in'                   => 'Pasirinktas :attribute neteisingas.',
-    'in_array'             => 'Lauko :attribute nėra :other.',
-    'integer'              => ':attribute turi būti sveikas skaičius.',
-    'ip'                   => ':attribute privalo būti tinkamas IP adresas.',
-    'ipv4'                 => ':attribute privalo būti tinkamas IPv4 adresas.',
-    'ipv6'                 => ':attribute privalo būti tinkamas IPv6 adresas.',
-    'is_unique_department' => ':attribute turi būti unikalus šiai įmonės vietai',
-    'json'                 => ':attribute turi būti tinkama JSON eilutė.',
-    'max'                  => [
-        'numeric' => ':attribute negali būti didesnis nei :max.',
-        'file'    => ':attribute negali būti didesnis nei :max kilobaitų.',
-        'string'  => ':attribute negali būti didesnis nei :max simboliai.',
-        'array'   => ':attribute negali turėti daugiau nei :max elementų.',
+    'in' => 'Pasirinktas :attribute neteisingas.',
+    'in_array' => ':attribute laukas turi egzistuoti :other.',
+    'integer' => ':attribute lauke turi būti sveikasis skaičius.',
+    'ip' => ':attribute lauke turi būti teisingas IP adresas.',
+    'ipv4' => ':attribute lauke turi būti teisingas IPv4 adresas.',
+    'ipv6' => ':attribute lauke turi būti teisingas IPv6 adresas.',
+    'json' => ':attribute lauke turi būti teisinga JSON eilutė.',
+    'list' => ':attribute lauke turi būti sąrašas.',
+    'lowercase' => ':attribute lauke turi būti tik mažosios raidės.',
+    'lt' => [
+        'array' => ':attribute lauke turi būti mažiau nei :value elementai (-ų).',
+        'file' => ':attribute laukas turi būti mažesnis nei :max kilobaitai (-ų).',
+        'numeric' => ':attribute laukas turi būti mažesnis nei :value.',
+        'string' => ':attribute lauke turi būti mažiau nei :value simboliai (-ių).',
     ],
-    'mimes'                => ':attribute privalo būti failas, kurio formatas :values.',
-    'mimetypes'            => ':attribute turi būti failas, kurio formatas: :values.',
-    'min'                  => [
-        'numeric' => ':attribute privalo būti ne mažesnis nei :min.',
-        'file'    => ':attribute turi būti bent :min kilobaitų.',
-        'string'  => ':attribute privalo būti bent :min simbolių.',
-        'array'   => ':attribute turi turėti bent :min elementų.',
+    'lte' => [
+        'array' => ':attribute lauke turi būti mažiau nei :value elementai (-ų).',
+        'file' => ':attribute laukas turi būti mažesnis arba lygus :value kilobaitams (-ų).',
+        'numeric' => ':attribute laukas turi būti mažesnis arba lygus :value.',
+        'string' => ':attribute laukas turi būti mažesnis arba lygus :value simboliams (-ų).',
     ],
-    'starts_with'          => ':attribute turi prasidėti viena iš šių: :values.',
-    'ends_with'            => ':attribute turi baigtis viena iš šių: :values.',
+    'mac_address' => ':attribute lauke turi būti teisingas MAC adresas.',
+    'max' => [
+        'array' => ':attribute lauke negali būti daugiau nei :max elementai (-ų).',
+        'file' => ':attribute laukas negali būti didesnis nei :max kilobaitai (-ų).',
+        'numeric' => ':attribute laukas negali būti didesnis nei :max.',
+        'string' => ':attribute lauke negali būti daugiau nei :max simboliai (-ių).',
+    ],
+    'max_digits' => ':attribute lauke negali būti daugiau nei :max skaitmenys (-ų).',
+    'mimes' => ':attribute lauke turi būti failas, kurio formatas: :values.',
+    'mimetypes' => ':attribute lauke turi būti failas, kurio formatas: :values.',
+    'min' => [
+        'array' => ':attribute lauke turi būti bent :min elementai (-ų).',
+        'file' => ':attribute laukas turi būti bent :min kilobaito (-ų).',
+        'numeric' => ':attribute laukas turi būti ne mažesnis nei :min.',
+        'string' => ':attribute lauke turi būti bent :min simboliai (-ių).',
+    ],
+    'min_digits' => ':attribute lauke turi būti bent :min skaitmenys.',
+    'missing' => ':attribute lauko turi nebūti.',
+    'missing_if' => ':attribute lauko turi nebūti, kai :other yra :value.',
+    'missing_unless' => ':attribute lauko turi nebūti, nebent :other yra :value.',
+    'missing_with' => ':attribute lauko turi nebūti, kai egzistuoja :values.',
+    'missing_with_all' => ':attribute lauko turi nebūti, kai egzistuoja :values.',
+    'multiple_of' => ':attribute laukas turi būti :value kartotinis.',
+    'not_in' => 'Pasirinktas :attribute yra neteisingas.',
+    'not_regex' => ':attribute lauko formatas neteisingas.',
+    'numeric' => ':attribute lauke turi būti skaičius.',
+    'password' => [
+        'letters' => ':attribute lauke turi būti bent viena raidė.',
+        'mixed' => ':attribute lauke turi būti bent viena didžioji ir viena mažoji raidė.',
+        'numbers' => ':attribute lauke turi būti bent vienas skaičius.',
+        'symbols' => ':attribute lauke turi būti bent vienas simbolis.',
+        'uncompromised' => 'Pateiktas :attribute buvo rastas tarp nutekėjusių duomenų. Pasirinkite kitą :attribute.',
+    ],
+    'percent'       => 'Nusidėvėjimo minimumas turi būti nuo 0 iki 100, kai nusidėvėjimo tipas yra procentinis.',
 
-    'not_in'               => 'Pasirinktas :attribute yra neteisingas.',
-    'numeric'              => ':attribute privalo būti skaičius.',
-    'present'              => 'Laukas :attribute turi būti pateiktas.',
-    'valid_regex'          => 'Tai nėra tinkamas regex. ',
-    'regex'                => ':attribute formatas neteisingas.',
-    'required'             => ':attribute laukas yra privalomas.',
-    'required_if'          => ':attribute laukas yra privalomas, kai :other yra :value.',
-    'required_unless'      => ':attribute laukas yra būtinas, nebent :other yra :values.',
-    'required_with'        => ':attribute laukas yra privalomas, kai :values yra nurodyta.',
-    'required_with_all'    => 'Laukas :attribute yra privalomas, kai :values yra nurodyta.',
-    'required_without'     => ':attribute laukelis privalomas kai :values yra nenurodytas.',
-    'required_without_all' => 'Atributo laukas reikalingas, kai nėra nė vieno iš: vertės.',
-    'same'                 => ':attribute ir :other privalo sutapti.',
-    'size'                 => [
-        'numeric' => ':attribute privalo būti :size.',
-        'file'    => ':attribute privalo būti :size kilobaitų.',
-        'string'  => ':attribute privalo būti :size ženklų.',
-        'array'   => 'Atributas turi būti: dydžio elementai.',
+    'present' => ':attribute laukas turi būti esamas.',
+    'present_if' => ':attribute laukas turi egzistuoti, kai :other yra :value.',
+    'present_unless' => ':attribute laukas turi egzistuoti, nebent :other yra :value.',
+    'present_with' => ':attribute laukas turi egzistuoti, kai egzistuoja :values.',
+    'present_with_all' => ':attribute laukas turi egzistuoti, kai egzistuoja :values.',
+    'prohibited' => ':attribute laukas yra draudžiamas.',
+    'prohibited_if' => ':attribute laukas yra draudžiamas, kai :other yra :value.',
+    'prohibited_unless' => ':attribute laukas yra draudžiamas, nebent :other yra :values.',
+    'prohibits' => ':attribute laukas uždraudžia :other egzistavimą.',
+    'regex' => ':attribute lauko formatas neteisingas.',
+    'required' => ':attribute laukas yra privalomas.',
+    'required_array_keys' => ':attribute lauke turi būti įrašų, skirtų: :values.',
+    'required_if' => ':attribute laukas yra privalomas, kai :other yra :value.',
+    'required_if_accepted' => ':attribute laukas yra privalomas, kai :other yra priimta.',
+    'required_if_declined' => ':attribute laukas yra privalomas, kai :other yra atmesta.',
+    'required_unless' => ':attribute laukas yra būtinas, nebent :other yra :values.',
+    'required_with' => ':attribute laukas yra privalomas, kai :values yra nurodyta.',
+    'required_with_all' => ':attribute laukas yra privalomas, kai nurodyta :values.',
+    'required_without' => ':attribute laukelis privalomas kai :values yra nenurodytas.',
+    'required_without_all' => ':attribute laukas ir privalomas, kai nėra nei vienos iš :values.',
+    'same' => ':attribute laukas turi sutapti su :other.',
+    'size' => [
+        'array' => ':attribute lauke turi būti :size elementai (-ų).',
+        'file' => ':attribute laukas turi būti :size kilobaito (-ų).',
+        'numeric' => ':attribute laukas turi būti :size.',
+        'string' => ':attribute lauke turi būti :size simboliai (-ių).',
     ],
+    'starts_with' => ':attribute laukas turi prasidėti vienu iš šių: :values.',
     'string'               => ':attribute turi būti eilutė.',
-    'timezone'             => ':attribute turi būti tinkama zona.',
     'two_column_unique_undeleted' => ':attribute turi būti unikalus :table1 ir :table2. ',
-    'unique'               => ':attribute jau užimtas.',
-    'uploaded'             => ':attribute įkelti nepavyko.',
-    'url'                  => ':attribute formatas neteisingas.',
     'unique_undeleted'     => ':attribute turi būti unikalus.',
     'non_circular'         => ':attribute neturi kurti žiedinės nuorodos.',
     'not_array'            => ':attribute negali būti masyvas.',
@@ -102,11 +165,14 @@ return [
     'numbers'              => 'Slaptažodyje turi būti bent vienas skaičius.',
     'case_diff'            => 'Slaptažodyje turi būti naudojamos didžiosios ir mažosios raidės.',
     'symbols'              => 'Slaptažodyje turi būti simbolių.',
-    'gte'                  => [
-        'numeric'          => 'Reikšmė negali būti neigiama'
-    ],
-    'checkboxes'           => ':attribute yra neteisingų parinkčių.',
-    'radio_buttons'        => ':atributas yra neteisingas.',
+    'timezone' => ':attribute lauke turi būti teisinga laiko juosta.',
+    'unique' => ':attribute jau užimtas.',
+    'uploaded' => ':attribute įkelti nepavyko.',
+    'uppercase' => ':attribute lauke turi būti tik didžiosios raidės.',
+    'url' => ':attribute lauke turi būti galiojantis URL adresas.',
+    'ulid' => ':attribute lauke turi būti galiojantis ULID identifikatorius.',
+    'uuid' => ':attribute lauke turi būti galiojantis UUID identifikatorius.',
+    'fmcs_location' => 'Full multiple company support and location scoping is enabled in the Admin Settings, and the selected location and selected company are not compatible.',
 
 
     /*
@@ -120,16 +186,22 @@ return [
     |
     */
 
+    'email_array'      => 'Vienas ar keli el. pašto adresai yra neteisingi.',
+    'checkboxes'           => ':attribute yra neteisingų parinkčių.',
+    'radio_buttons'        => ':atributas yra neteisingas.',
+    
     'custom' => [
         'alpha_space' => 'Lauke :attribute yra simbolis, kurio negalima naudoti.',
-        'email_array'      => 'Vienas ar keli el. pašto adresai yra neteisingi.',
+
         'hashed_pass'      => 'Jūsų dabartinis slaptažodis yra neteisingas',
         'dumbpwd'          => 'Šis slaptažodis yra per dažnas.',
         'statuslabel_type' => 'Turite pasirinkti tinkamą būsenos žymos tipą',
+        'custom_field_not_found'          => 'Panašu, kad tokio lauko nėra. Patikrinkite savo pritaikytų laukų pavadinimus.',
+        'custom_field_not_found_on_model' => 'Panašu, kad šis laukas egzistuoja, tačiau jo nėra šio turto modelio laukų rinkinyje.',
 
         // date_format validation with slightly less stupid messages. It duplicates a lot, but it gets the job done :(
-        // We use this because the default error message for date_format is reflects php Y-m-d, which non-PHP
-        // people won't know how to format. 
+        // We use this because the default error message for date_format reflects php Y-m-d, which non-PHP
+        // people won't know how to format.
         'purchase_date.date_format'     => ':attribute turi būti galiojanti data YYYY-MM-DD formatu',
         'last_audit_date.date_format'   =>  ':attribute turi būti galiojanti data YYYY-MM-DD hh:mm:ss formatu',
         'expiration_date.date_format'   =>  ':attribute turi būti galiojanti data YYYY-MM-DD formatu',
@@ -137,9 +209,15 @@ return [
         'expected_checkin.date_format'  =>  ':attribute turi būti galiojanti data YYYY-MM-DD formatu',
         'start_date.date_format'        =>  ':attribute turi būti galiojanti data YYYY-MM-DD formatu',
         'end_date.date_format'          =>  ':attribute turi būti galiojanti data YYYY-MM-DD formatu',
+        'invalid_value_in_field' => 'Šiame lauke yra neteisinga reikšmė',
 
-    ],
+        'ldap_username_field' => [
+            'not_in' =>         'Tikėtina, kad <code>sAMAccountName</code> (didžiosios ir mažosios raidės) neveiks. Vietoj to turėtumėte naudoti <code>samaccountname</code> (mažąsias raides).'
+        ],
+        'ldap_auth_filter_query' => ['not_in' => '<code>uid=samaccountname</code> tikriausiai nėra tinkamas autentifikavimo filtras. Tikriausiai jums reikia <code>uid=</code> '],
+        'ldap_filter' => ['regex' => 'Šios reikšmės tikriausiai nereikėtų rašyti skliausteliuose.'],
 
+        ],
     /*
     |--------------------------------------------------------------------------
     | Custom Validation Attributes
@@ -155,8 +233,16 @@ return [
 
     /*
     |--------------------------------------------------------------------------
-    | Generic Validation Messages
+    | Generic Validation Messages - we use these in the jquery validation where we don't have
+    | access to the :attribute
     |--------------------------------------------------------------------------
     */
-    'invalid_value_in_field' => 'Į šį lauką įtraukta netinkama reikšmė',
+
+    'generic' => [
+        'invalid_value_in_field' => 'Šiame lauke yra neteisinga reikšmė',
+        'required' => 'Šis laukas yra privalomas',
+        'email' => 'Įveskite galiojantį el. pašto adresą',
+    ],
+
+
 ];
diff --git a/resources/lang/lv-LV/account/general.php b/resources/lang/lv-LV/account/general.php
index 1a9e2c03b8..7f9e2f848e 100644
--- a/resources/lang/lv-LV/account/general.php
+++ b/resources/lang/lv-LV/account/general.php
@@ -2,10 +2,16 @@
 
 return array(
     'personal_api_keys' => 'Personal API Keys',
+    'personal_access_token' => 'Personal Access Token',
+    'personal_api_keys_success' => 'Personal API Key :key created sucessfully',
+    'here_is_api_key' => 'Here is your new personal access token. This is the only time it will be shown so do not lose it! You may now use this token to make API requests.',
     'api_key_warning' => 'When generating an API token, be sure to copy it down immediately as they will not be visible to you again.',
     'api_base_url' => 'Your API base url is located at:',
     'api_base_url_endpoint' => '/&lt;endpoint&gt;',
     'api_token_expiration_time' => 'API tokens are set to expire in:',
     'api_reference' => 'Please check the <a href="https://snipe-it.readme.io/reference" target="_blank">API reference</a> to find specific API endpoints and additional API documentation.',
     'profile_updated' => 'Account successfully updated',
+    'no_tokens' => 'You have not created any personal access tokens.',
+    'enable_sounds' => 'Enable sound effects',
+    'enable_confetti' => 'Enable confetti effects',
 );
diff --git a/resources/lang/lv-LV/admin/accessories/message.php b/resources/lang/lv-LV/admin/accessories/message.php
index c18c673ff0..9e1b0877a3 100644
--- a/resources/lang/lv-LV/admin/accessories/message.php
+++ b/resources/lang/lv-LV/admin/accessories/message.php
@@ -26,7 +26,11 @@ return array(
         'error'   		=> 'Piederums netika pārbaudīts, lūdzu, mēģiniet vēlreiz',
         'success' 		=> 'Piederums ir veiksmīgi izrakstīts.',
         'unavailable'   => 'Accessory is not available for checkout. Check quantity available',
-        'user_does_not_exist' => 'Šis lietotājs ir nederīgs. Lūdzu mēģiniet vēlreiz.'
+        'user_does_not_exist' => 'Šis lietotājs ir nederīgs. Lūdzu mēģiniet vēlreiz.',
+         'checkout_qty' => array(
+            'lte'  => 'There is currently only one available accessory of this type, and you are trying to check out :checkout_qty. Please adjust the checkout quantity or the total stock of this accessory and try again.|There are :number_currently_remaining total available accessories, and you are trying to check out :checkout_qty. Please adjust the checkout quantity or the total stock of this accessory and try again.',
+            ),
+           
     ),
 
     'checkin' => array(
diff --git a/resources/lang/lv-LV/admin/accessories/table.php b/resources/lang/lv-LV/admin/accessories/table.php
index 2291b1c4cf..be987f9b88 100644
--- a/resources/lang/lv-LV/admin/accessories/table.php
+++ b/resources/lang/lv-LV/admin/accessories/table.php
@@ -6,6 +6,4 @@ return array(
     'id'      					=> 'ID',
     'require_acceptance'      	=> 'Pieņemšana',
     'title'      				=> 'Piederumu nosaukums',
-
-
 );
diff --git a/resources/lang/lv-LV/admin/asset_maintenances/form.php b/resources/lang/lv-LV/admin/asset_maintenances/form.php
index 9941f26ea0..e6e2216396 100644
--- a/resources/lang/lv-LV/admin/asset_maintenances/form.php
+++ b/resources/lang/lv-LV/admin/asset_maintenances/form.php
@@ -3,7 +3,7 @@
     return [
         'asset_maintenance_type' => 'Asset Maintenance Type',
         'title'                  => 'Nosaukums',
-        'start_date'             => 'Start Date',
+        'start_date'             => 'Sākuma datums',
         'completion_date'        => 'Completion Date',
         'cost'                   => 'Izmaksas',
         'is_warranty'            => 'Garantijas uzlabošana',
diff --git a/resources/lang/lv-LV/admin/components/message.php b/resources/lang/lv-LV/admin/components/message.php
index 2bc43c7b49..d517fff64b 100644
--- a/resources/lang/lv-LV/admin/components/message.php
+++ b/resources/lang/lv-LV/admin/components/message.php
@@ -17,7 +17,8 @@ return array(
     'delete' => array(
         'confirm'   => 'Vai tiešām vēlaties dzēst šo komponentu?',
         'error'   => 'Radās problēma, izdzēšot komponentu. Lūdzu mēģiniet vēlreiz.',
-        'success' => 'Komponents tika veiksmīgi dzēsts.'
+        'success' => 'Komponents tika veiksmīgi dzēsts.',
+        'error_qty'   => 'Some components of this type are still checked out. Please check them in and try again.',
     ),
 
      'checkout' => array(
diff --git a/resources/lang/lv-LV/admin/consumables/general.php b/resources/lang/lv-LV/admin/consumables/general.php
index 138e40cdf1..9edec42349 100644
--- a/resources/lang/lv-LV/admin/consumables/general.php
+++ b/resources/lang/lv-LV/admin/consumables/general.php
@@ -8,4 +8,5 @@ return array(
     'remaining' 			            => 'Atlikušais',
     'total' 			                => 'Kopā',
     'update'                            => 'Atjaunināt patērējamu',
+    'inventory_warning'                 => 'The inventory of this consumable is below the minimum amount of :min_count',
 );
diff --git a/resources/lang/lv-LV/admin/consumables/message.php b/resources/lang/lv-LV/admin/consumables/message.php
index 3a675b7f5c..3de958adfa 100644
--- a/resources/lang/lv-LV/admin/consumables/message.php
+++ b/resources/lang/lv-LV/admin/consumables/message.php
@@ -2,6 +2,7 @@
 
 return array(
 
+    'invalid_category_type' => 'The category must be a consumable category.',
     'does_not_exist' => 'Patērējamais nav.',
 
     'create' => array(
diff --git a/resources/lang/lv-LV/admin/custom_fields/general.php b/resources/lang/lv-LV/admin/custom_fields/general.php
index 19cc744e75..f9a38f1274 100644
--- a/resources/lang/lv-LV/admin/custom_fields/general.php
+++ b/resources/lang/lv-LV/admin/custom_fields/general.php
@@ -35,7 +35,7 @@ return [
     'create_field_title' => 'Izveidot jaunu pielāgoto lauku',
     'value_encrypted'      	        => 'Šī lauka vērtība ir šifrēta datu bāzē. Tikai admin lietotāji varēs apskatīt atšifrēto vērtību',
     'show_in_email'     => 'Vai iekļaut šī lauka vērtību lietotājiem nosūtītajos e-pasta paziņojumos? Šifrētie lauki nevar būt iekļauti e-pasta ziņojumos',
-    'show_in_email_short'     => 'Include in emails.',
+    'show_in_email_short' => 'Include in emails',
     'help_text' => 'Palīdzības teksts',
     'help_text_description' => 'This is optional text that will appear below the form elements while editing an asset to provide context on the field.',
     'about_custom_fields_title' => 'About Custom Fields',
@@ -57,5 +57,8 @@ return [
     'show_in_requestable_list_short' => 'Show in requestable assets list',
     'show_in_requestable_list' => 'Show value in requestable assets list. Encrypted fields will not be shown',
     'encrypted_options' => 'This field is encrypted, so some display options will not be available.',
+    'display_checkin' => 'Display in checkin forms',
+    'display_checkout' => 'Display in checkout forms',
+    'display_audit' => 'Display in audit forms',
 
 ];
diff --git a/resources/lang/lv-LV/admin/custom_fields/message.php b/resources/lang/lv-LV/admin/custom_fields/message.php
index 5173f5a099..357bb0ac25 100644
--- a/resources/lang/lv-LV/admin/custom_fields/message.php
+++ b/resources/lang/lv-LV/admin/custom_fields/message.php
@@ -5,6 +5,7 @@ return array(
     'field' => array(
         'invalid'   => 'Šis lauks neeksistē.',
         'already_added'   => 'Lauks jau ir pievienots',
+        'none_selected'   => 'No field selected',
 
         'create' => array(
             'error'   => 'Lauks nav izveidots, lūdzu, mēģiniet vēlreiz.',
diff --git a/resources/lang/lv-LV/admin/depreciations/general.php b/resources/lang/lv-LV/admin/depreciations/general.php
index de85fa21b2..f476ead288 100644
--- a/resources/lang/lv-LV/admin/depreciations/general.php
+++ b/resources/lang/lv-LV/admin/depreciations/general.php
@@ -13,4 +13,8 @@ return [
     'no_depreciations_warning'               => '<strong>Uzmanību: </strong>
                       Šobrīd nav iestatīts neviens nolietojums.
                       Lūdzu iestatiet vismaz vienu nolietojumu, lai redzētu nolietojuma atskaiti.',
+    'depreciation_method'                   => 'Amortizācijas atskaite',
+    'linear_depreciation'                   => 'Linear (Default)',
+    'half_1'                                => 'Half-year convention, always applied',
+    'half_2'                                => 'Half-year convention, applied with condition',
 ];
diff --git a/resources/lang/lv-LV/admin/hardware/form.php b/resources/lang/lv-LV/admin/hardware/form.php
index ded57c1765..d74e8ba44f 100644
--- a/resources/lang/lv-LV/admin/hardware/form.php
+++ b/resources/lang/lv-LV/admin/hardware/form.php
@@ -55,8 +55,11 @@ return [
     'asset_location_update_default' => 'Atjaunināt tikai noklusēja atrašanās vietu',
     'asset_location_update_actual' => 'Update only actual location',
     'asset_not_deployable' => 'Šis statuss nav izmantojams. Pamatlīdzeklis nevar tikt izrakstīts.',
-    'asset_deployable' => 'Šis statuss ir izmantojams. Pamatlīdzeklis ir pieejams izrakstīšanai.',
+    'asset_not_deployable_checkin' => 'That asset status is not deployable. Using this status label will checkin the asset.',
+    'asset_deployable' => 'This asset can be checked out.',
     'processing_spinner' => 'Processing... (This might take a bit of time on large files)',
+    'processing' => 'Apstrādā... ',
     'optional_infos'  => 'Neobligātā informācija',
-    'order_details'   => 'Pasūtījuma informācija'
+    'order_details'   => 'Pasūtījuma informācija',
+    'calc_eol'    => 'If nulling the EOL date, use automatic EOL calculation based on the purchase date and EOL rate.',
 ];
diff --git a/resources/lang/lv-LV/admin/hardware/general.php b/resources/lang/lv-LV/admin/hardware/general.php
index 0cf01a247d..7d40ce4208 100644
--- a/resources/lang/lv-LV/admin/hardware/general.php
+++ b/resources/lang/lv-LV/admin/hardware/general.php
@@ -5,8 +5,8 @@ return [
     'about_assets_text'            => 'Aktīvi ir posteņi, ko izseko pēc sērijas numura vai aktīvu taga. Viņi mēdz būt augstākas vērtības priekšmeti, kad ir svarīgi noteikt konkrētu objektu.',
     'archived'  				=> 'Arhivēts',
     'asset'  					=> 'Aktīvs',
-    'bulk_checkout'             => 'Lielapjoma izsniegšana',
-    'bulk_checkin'              => 'Checkin Assets',
+    'bulk_checkout'             => 'Bulk Checkout',
+    'bulk_checkin'              => 'Bulk Checkin',
     'checkin'  					=> 'Reģistrēšanās aktīvs',
     'checkout'  				=> 'Checkout Asset',
     'clone'  					=> 'Clone Asset',
@@ -27,8 +27,7 @@ return [
     'undeployable_tooltip'  	=> 'This asset has a status label that is undeployable and cannot be checked out at this time.',
     'view'  					=> 'Skatīt aktīvu',
     'csv_error' => 'Jūsu CSV failā ir kļūda:',
-    'import_text' => '<p>Upload a CSV that contains asset history. The assets and users MUST already exist in the system, or they will be skipped. Matching assets for history import happens against the asset tag. We will try to find a matching user based on the user\'s name you provide, and the criteria you select below. If you do not select any criteria below, it will simply try to match on the username format you configured in the <code>Admin &gt; General Settings</code>.</p><p>Fields included in the CSV must match the headers: <strong>Asset Tag, Name, Checkout Date, Checkin Date</strong>. Any additional fields will be ignored. </p><p>Checkin Date: blank or future checkin dates will checkout items to associated user.  Excluding the Checkin Date column will create a checkin date with todays date.</p>
-    ',
+    'import_text' => '<p>Upload a CSV that contains asset history. The assets and users MUST already exist in the system, or they will be skipped. Matching assets for history import happens against the asset tag. We will try to find a matching user based on the user\'s name you provide, and the criteria you select below. If you do not select any criteria below, it will simply try to match on the username format you configured in the <code>Admin &gt; General Settings</code>.</p><p>Fields included in the CSV must match the headers: <strong>Asset Tag, Name, Checkout Date, Checkin Date</strong>. Any additional fields will be ignored. </p><p>Checkin Date: blank or future checkin dates will checkout items to associated user.  Excluding the Checkin Date column will create a checkin date with todays date.</p>    ',
     'csv_import_match_f-l' => 'Try to match users by <strong>firstname.lastname</strong> (<code>jane.smith</code>) format',
     'csv_import_match_initial_last' => 'Try to match users by <strong>first initial last name</strong> (<code>jsmith</code>) format',
     'csv_import_match_first' => 'Try to match users by <strong>first name</strong> (<code>jane</code>) format',
diff --git a/resources/lang/lv-LV/admin/hardware/message.php b/resources/lang/lv-LV/admin/hardware/message.php
index 4b01482a28..4b64b7b324 100644
--- a/resources/lang/lv-LV/admin/hardware/message.php
+++ b/resources/lang/lv-LV/admin/hardware/message.php
@@ -2,18 +2,23 @@
 
 return [
 
-    'undeployable' 		=> '<strong>Ievadīšana: </strong> Šis īpašums ir atzīmēts kā pašlaik nederīgs. Ja šis statuss ir mainījies, lūdzu, atjauniniet aktīvu statusu.',
-    'does_not_exist' 	=> 'Aktīvs neeksistē.',
-    'does_not_exist_var'=> 'Asset with tag :asset_tag not found.',
-    'no_tag' 	        => 'No asset tag provided.',
+    'undeployable' 		 => '<strong>Warning: </strong> This asset has been marked as currently undeployable. If this status has changed, please update the asset status.',
+    'does_not_exist' 	 => 'Aktīvs neeksistē.',
+    'does_not_exist_var' => 'Asset with tag :asset_tag not found.',
+    'no_tag' 	         => 'No asset tag provided.',
     'does_not_exist_or_not_requestable' => 'That asset does not exist or is not requestable.',
-    'assoc_users'	 	=> 'Šobrīd šis īpašums tiek pārbaudīts lietotājam un to nevar izdzēst. Vispirms pārbaudiet aktīvu, un pēc tam mēģiniet vēlreiz izdzēst.',
+    'assoc_users'	 	 => 'Šobrīd šis īpašums tiek pārbaudīts lietotājam un to nevar izdzēst. Vispirms pārbaudiet aktīvu, un pēc tam mēģiniet vēlreiz izdzēst.',
     'warning_audit_date_mismatch' 	=> 'This asset\'s next audit date (:next_audit_date) is before the last audit date (:last_audit_date). Please update the next audit date.',
+    'labels_generated'   => 'Iezīmes tika sekmīgi izveidotas.',
+    'error_generating_labels' => 'Kļūda iezīmju veidošanas laikā.',
+    'no_assets_selected' => 'Nav atlasīts neviens līdzeklis.',
 
     'create' => [
         'error'   		=> 'Īpašums netika izveidots, lūdzu, mēģiniet vēlreiz. :(',
         'success' 		=> 'Īpašums veiksmīgi izveidots. :)',
         'success_linked' => 'Asset with tag :tag was created successfully. <strong><a href=":link" style="color: white;">Click here to view</a></strong>.',
+        'multi_success_linked' => 'Asset with tag :links was created successfully.|:count assets were created succesfully. :links.',
+        'partial_failure' => 'An asset was unable to be created. Reason: :failures|:count assets were unable to be created. Reasons: :failures',
     ],
 
     'update' => [
@@ -51,20 +56,24 @@ return [
     ],
 
     'import' => [
+        'import_button'         => 'Process Import',
         'error'                 => 'Daži vienumi netika pareizi importēti.',
         'errorDetail'           => 'Tālāk minētie vienumi netika importēti kļūdu dēļ.',
         'success'               => 'Jūsu fails ir importēts',
         'file_delete_success'   => 'Jūsu fails ir veiksmīgi izdzēsts',
         'file_delete_error'      => 'Failu nevarēja dzēst',
         'file_missing' => 'The file selected is missing',
+        'file_already_deleted' => 'The file selected was already deleted',
         'header_row_has_malformed_characters' => 'One or more attributes in the header row contain malformed UTF-8 characters',
         'content_row_has_malformed_characters' => 'One or more attributes in the first row of content contain malformed UTF-8 characters',
+        'transliterate_failure' => 'Transliteration from :encoding to UTF-8 failed due to invalid characters in input'
     ],
 
 
     'delete' => [
         'confirm'   	=> 'Vai tiešām vēlaties dzēst šo īpašumu?',
         'error'   		=> 'Radās problēma, noņemot aktīvu. Lūdzu mēģiniet vēlreiz.',
+        'assigned_to_error' => '{1}Asset Tag: :asset_tag is currently checked out. Check in this device before deletion.|[2,*]Asset Tags: :asset_tag are currently checked out. Check in these devices before deletion.',
         'nothing_updated'   => 'Netika atlasīti neviens aktīvs, tāpēc nekas netika izdzēsts.',
         'success' 		=> 'Aktīvs tika veiksmīgi dzēsts.',
     ],
@@ -77,6 +86,11 @@ return [
         'no_assets_selected' => 'Jums jāizvēlas vismaz vienu aparatūru',
     ],
 
+    'multi-checkout' => [
+        'error'   => 'Asset was not checked out, please try again|Assets were not checked out, please try again',
+        'success' => 'Asset checked out successfully.|Assets checked out successfully.',
+    ],
+
     'checkin' => [
         'error'   		=> 'Īpašums netika reģistrēts, lūdzu, mēģiniet vēlreiz',
         'success' 		=> 'Aktīvs ir pārbaudīts veiksmīgi.',
@@ -86,9 +100,10 @@ return [
     ],
 
     'requests' => [
-        'error'   		=> 'Īpašums netika pieprasīts, lūdzu, mēģiniet vēlreiz',
-        'success' 		=> 'Īpašums pieprasīts veiksmīgi.',
-        'canceled'      => 'Norēķinu pieprasījums ir sekmīgi atcelts',
+        'error'   		=> 'Request was not successful, please try again.',
+        'success' 		=> 'Request successfully submitted.',
+        'canceled'      => 'Request successfully canceled.',
+        'cancel'        => 'Cancel this item request',
     ],
 
 ];
diff --git a/resources/lang/lv-LV/admin/hardware/table.php b/resources/lang/lv-LV/admin/hardware/table.php
index 2960d5fcf2..0d6169797b 100644
--- a/resources/lang/lv-LV/admin/hardware/table.php
+++ b/resources/lang/lv-LV/admin/hardware/table.php
@@ -25,9 +25,8 @@ return [
     'image'		    => 'Ierīces attēls',
     'days_without_acceptance' => 'Dienas bez pieņemšanas',
     'monthly_depreciation' => 'Monthly Depreciation',
-    'assigned_to'    => 'Piešķirts',
     'requesting_user' => 'Requesting User',
-    'requested_date' => 'Requested Date',
-    'changed'       => 'Changed',
+    'requested_date' => 'Pieprasīšanas datums',
+    'changed'       => 'Izmainīts',
     'icon' => 'Icon',
 ];
diff --git a/resources/lang/lv-LV/admin/kits/general.php b/resources/lang/lv-LV/admin/kits/general.php
index a8c7457cbc..5669206955 100644
--- a/resources/lang/lv-LV/admin/kits/general.php
+++ b/resources/lang/lv-LV/admin/kits/general.php
@@ -47,4 +47,5 @@ return [
     'kit_deleted'                       => 'Kit was successfully deleted',
     'kit_model_updated'                 => 'Model was successfully updated',
     'kit_model_detached'                => 'Model was successfully detached',
+    'model_already_attached'            => 'Model already attached to kit',
 ];
diff --git a/resources/lang/lv-LV/admin/labels/message.php b/resources/lang/lv-LV/admin/labels/message.php
index 96785f0754..c81991a764 100644
--- a/resources/lang/lv-LV/admin/labels/message.php
+++ b/resources/lang/lv-LV/admin/labels/message.php
@@ -2,10 +2,10 @@
 
 return [
 
-    'invalid_return_count' => 'Invalid count returned from :name. Expected :expected, got :actual.',
-    'invalid_return_type'  => 'Invalid type returned from :name. Expected :expected, got :actual.',
-    'invalid_return_value' => 'Invalid value returned from :name. Expected :expected, got :actual.',
+    'invalid_return_count' => 'Atgriezts neatbilstošs skaits :name. Paredzēts :expected, iegūts :actual.',
+    'invalid_return_type'  => 'Atgriezts neatbilstošs tips :name. Paredzēts :expected, iegūts :actual.',
+    'invalid_return_value' => 'Atgriezta neatbilstoša vērtība :name. Paredzēts :expected, iegūts :actual.',
 
-    'does_not_exist' => 'Label does not exist',
+    'does_not_exist' => 'Etiķete neeksistē',
     
 ];
diff --git a/resources/lang/lv-LV/admin/labels/table.php b/resources/lang/lv-LV/admin/labels/table.php
index 972ba84945..0591bf084c 100644
--- a/resources/lang/lv-LV/admin/labels/table.php
+++ b/resources/lang/lv-LV/admin/labels/table.php
@@ -9,7 +9,7 @@ return [
     'example_model'      => 'Test Model',
     'example_supplier'   => 'Test Company Limited',
     'labels_per_page'    => 'Labels',
-    'support_fields'     => 'Fields',
+    'support_fields'     => 'Lauki',
     'support_asset_tag'  => 'Tag',
     'support_1d_barcode' => '1D',
     'support_2d_barcode' => '2D',
diff --git a/resources/lang/lv-LV/admin/licenses/general.php b/resources/lang/lv-LV/admin/licenses/general.php
index f564867c27..52a6ed7fc0 100644
--- a/resources/lang/lv-LV/admin/licenses/general.php
+++ b/resources/lang/lv-LV/admin/licenses/general.php
@@ -14,6 +14,7 @@ return array(
     'info'  					=> 'Licences informācija',
     'license_seats'  			=> 'Licences vietas',
     'seat'  					=> 'Sēdeklis',
+    'seat_count'  				=> 'Seat :count',
     'seats'  					=> 'Sēdvietas',
     'software_licenses'  		=> 'Programmatūras licences',
     'user'  					=> 'Lietotājs',
@@ -23,12 +24,12 @@ return array(
         [
             'checkin_all'           => [
                 'button'            => 'Checkin All Seats',
-                'modal'             => 'This will action checkin one seat. | This action will checkin all :checkedout_seats_count seats for this license.',
+                'modal'             => 'This action will checkin one seat. | This action will checkin all :checkedout_seats_count seats for this license.',
                 'enabled_tooltip'   => 'Checkin ALL seats for this license from both users and assets',
                 'disabled_tooltip'  => 'This is disabled because there are no seats currently checked out',
                 'disabled_tooltip_reassignable'  => 'This is disabled because the License is not reassignable',
                 'success'           => 'License successfully checked in! | All licenses were successfully checked in!',
-                'log_msg'           => 'Checked in via bulk license checkout in license GUI',
+                'log_msg'           => 'Checked in via bulk license checkin in license GUI',
             ],
 
             'checkout_all'              => [
diff --git a/resources/lang/lv-LV/admin/licenses/message.php b/resources/lang/lv-LV/admin/licenses/message.php
index 9854d5ec0e..11c389baeb 100644
--- a/resources/lang/lv-LV/admin/licenses/message.php
+++ b/resources/lang/lv-LV/admin/licenses/message.php
@@ -44,10 +44,13 @@ return array(
         'error'   => 'Pārbaudot licenci, radās problēma. Lūdzu mēģiniet vēlreiz.',
         'success' => 'Licence tika veiksmīgi pārbaudīta',
         'not_enough_seats' => 'Not enough license seats available for checkout',
+        'mismatch' => 'The license seat provided does not match the license',
+        'unavailable' => 'This seat is not available for checkout.',
     ),
 
     'checkin' => array(
         'error'   => 'Licencē tika pārbaudīta problēma. Lūdzu mēģiniet vēlreiz.',
+        'not_reassignable' => 'License not reassignable',
         'success' => 'Licence tika veiksmīgi reģistrēta'
     ),
 
diff --git a/resources/lang/lv-LV/admin/locations/message.php b/resources/lang/lv-LV/admin/locations/message.php
index 136ef3b34a..521ec295b3 100644
--- a/resources/lang/lv-LV/admin/locations/message.php
+++ b/resources/lang/lv-LV/admin/locations/message.php
@@ -3,11 +3,12 @@
 return array(
 
     'does_not_exist' => 'Atrašanās vietas neeksistē.',
-    'assoc_users'    => 'This location is not currently deletable because it is the location of record for at least one asset or user, has assets assigned to it, or is the parent location of another location. Please update your models to no longer reference this company and try again. ',
+    'assoc_users'    => 'This location is not currently deletable because it is the location of record for at least one asset or user, has assets assigned to it, or is the parent location of another location. Please update your records to no longer reference this location and try again ',
     'assoc_assets'	 => 'Pašlaik šī atrašanās vieta ir saistīta ar vismaz vienu īpašumu un to nevar izdzēst. Lūdzu, atjauniniet savus aktīvus, lai vairs nerindotu šo atrašanās vietu, un mēģiniet vēlreiz.',
     'assoc_child_loc'	 => 'Pašlaik šī vieta ir vismaz viena bērna atrašanās vieta un to nevar izdzēst. Lūdzu, atjauniniet savas atrašanās vietas, lai vairs nerindotu šo atrašanās vietu, un mēģiniet vēlreiz.',
     'assigned_assets' => 'Assigned Assets',
     'current_location' => 'Current Location',
+    'open_map' => 'Open in :map_provider_icon Maps',
 
 
     'create' => array(
@@ -20,6 +21,11 @@ return array(
         'success' => 'Atrašanās vieta ir veiksmīgi atjaunināta.'
     ),
 
+    'restore' => array(
+        'error'   => 'Location was not restored, please try again',
+        'success' => 'Location restored successfully.'
+    ),
+
     'delete' => array(
         'confirm'   	=> 'Vai tiešām vēlaties dzēst šo atrašanās vietu?',
         'error'   => 'Radās problēma, dzēšot atrašanās vietu. Lūdzu mēģiniet vēlreiz.',
diff --git a/resources/lang/lv-LV/admin/locations/table.php b/resources/lang/lv-LV/admin/locations/table.php
index 60e5f40077..48d5812b97 100644
--- a/resources/lang/lv-LV/admin/locations/table.php
+++ b/resources/lang/lv-LV/admin/locations/table.php
@@ -32,11 +32,12 @@ return [
     'asset_serial'              => 'Sērijas numurs',
     'asset_location'            => 'Atrašanās vieta',
     'asset_checked_out'         => 'Izrakstīts',
-    'asset_expected_checkin'    => 'Expected Checkin',
+    'asset_expected_checkin'    => 'Paredzamais reģistrēšanas datums',
     'date'                      => 'Datums:',
     'phone'                     => 'Location Phone',
     'signed_by_asset_auditor'   => 'Signed By (Asset Auditor):',
     'signed_by_finance_auditor' => 'Signed By (Finance Auditor):',
     'signed_by_location_manager' => 'Signed By (Location Manager):',
     'signed_by'                 => 'Signed Off By:',
+    'clone'  					=> 'Clone Location',
 ];
diff --git a/resources/lang/lv-LV/admin/models/general.php b/resources/lang/lv-LV/admin/models/general.php
index b91edffb3a..8bd0943d65 100644
--- a/resources/lang/lv-LV/admin/models/general.php
+++ b/resources/lang/lv-LV/admin/models/general.php
@@ -3,7 +3,7 @@
 return array(
     'about_models_title'     => 'Par īpašuma modeļiem',
     'about_models_text'           => 'Aktīvu modeļi ir veids, kā grupēt identiskus aktīvus. "MBP 2013", "IPhone 6s" uc',
-    'deleted'  					        => 'Šis modelis ir izdzēsts.',
+    'deleted'  					=> 'Šis modelis ir izdzēsts.',
     'bulk_delete'               => 'Līdzekļu modeļu lielapjoma dzēšana',
     'bulk_delete_help'               => 'Lai apstiprinātu izvēlēto līdzekļu modeļu dzēšanu, ir jāatzīmē zemāk esošās izvēles rūtiņas. Līdzekļu modeļi, kuriem ir piesaistīti aktīvi, nevar tikt dzēsti, kamēr līdzekļi nav piesaistīti citam modelim.',
     'bulk_delete_warn'          => 'You are about to delete one asset model.|You are about to delete :model_count asset models.',
diff --git a/resources/lang/lv-LV/admin/models/message.php b/resources/lang/lv-LV/admin/models/message.php
index 084c092a56..7fb66f2f4a 100644
--- a/resources/lang/lv-LV/admin/models/message.php
+++ b/resources/lang/lv-LV/admin/models/message.php
@@ -7,7 +7,7 @@ return array(
     'no_association' => 'WARNING! The asset model for this item is invalid or missing!',
     'no_association_fix' => 'This will break things in weird and horrible ways. Edit this asset now to assign it a model.',
     'assoc_users'	 => 'Šobrīd šis modelis ir saistīts ar vienu vai vairākiem aktīviem, un tos nevar izdzēst. Lūdzu, izdzēsiet aktīvus un pēc tam mēģiniet vēlreiz dzēst.',
-
+    'invalid_category_type' => 'This category must be an asset category.',
 
     'create' => array(
         'error'   => 'Modelis netika izveidots, lūdzu, mēģiniet vēlreiz.',
diff --git a/resources/lang/lv-LV/admin/reports/general.php b/resources/lang/lv-LV/admin/reports/general.php
index 4e2d4c0ed1..a978f51b8b 100644
--- a/resources/lang/lv-LV/admin/reports/general.php
+++ b/resources/lang/lv-LV/admin/reports/general.php
@@ -4,6 +4,7 @@ return [
     'info'   => 'Atlasiet opcijas, kuras vēlaties izmantot savam aktīvu pārskatam.',
     'deleted_user' => 'Deleted user',
     'send_reminder' => 'Send reminder',
+    'cannot_send_reminder' => 'User has been deleted or does not have an email address so cannot receive a reminder',
     'reminder_sent' => 'Reminder sent',
     'acceptance_deleted' => 'Acceptance request deleted',
     'acceptance_request' => 'Acceptance request',
@@ -13,5 +14,10 @@ return [
         'user_state' => 'User State',
         'user_country' => 'User Country',
         'user_zip' => 'User Zip'
-    ]
-];
\ No newline at end of file
+    ],
+    'open_saved_template' => 'Open Saved Template',
+    'save_template' =>  'Save Template',
+    'select_a_template' => 'Select a Template',
+    'template_name' => 'Template Name',
+    'update_template' => 'Update Template',
+];
diff --git a/resources/lang/lv-LV/admin/reports/message.php b/resources/lang/lv-LV/admin/reports/message.php
index 49dfcc4244..2800bbdf0b 100644
--- a/resources/lang/lv-LV/admin/reports/message.php
+++ b/resources/lang/lv-LV/admin/reports/message.php
@@ -1,5 +1,16 @@
 <?php
 
-return array(
-    'error'   => 'Jums jāizvēlas vismaz ONE iespēja.'
-);
+return [
+    'about_templates' => 'About Saved Templates',
+    'saving_templates_description' => 'Select your options, then enter the name of your template in the box above and click the \'Save Template\' button. Use the dropdown to select a previously saved template.',
+    'create'  => [
+        'success' => 'Template saved successfully',
+    ],
+    'update' => [
+        'success' => 'Template updated successfully',
+    ],
+    'delete' => [
+        'success' => 'Template deleted',
+        'no_delete_permission' => 'Template does not exist or you do not have permission to delete it.',
+    ],
+];
diff --git a/resources/lang/lv-LV/admin/settings/general.php b/resources/lang/lv-LV/admin/settings/general.php
index 4197184d6a..21d9fff454 100644
--- a/resources/lang/lv-LV/admin/settings/general.php
+++ b/resources/lang/lv-LV/admin/settings/general.php
@@ -8,13 +8,13 @@ return [
     'ad_append_domain'          => 'Append domain name to username field',
     'ad_append_domain_help'     => 'User isn\'t required to write "username@domain.local", they can just type "username".',
     'admin_cc_email'            => 'E-pasta kopija',
-    'admin_cc_email_help'       => 'Šeit ievadiet epasta adresi, ja vēlaties saņemt kopiju epastiem par izsniegšanu / saņemšanu, kuras sūta lietotājiem. Atstājiet tukšu, ja nevēlaties kopijas.',
+    'admin_cc_email_help'       => 'Send a copy of checkin/checkout emails to this address.',
     'admin_settings'            => 'Admin Settings',
     'is_ad'				        => 'Tas ir Active Directory serveris',
     'alerts'                	=> 'Alerts',
     'alert_title'               => 'Update Notification Settings',
     'alert_email'				=> 'Sūtīt brīdinājumus uz',
-    'alert_email_help'    => 'Email addresses or distribution lists you want alerts to be sent to, comma separated',
+    'alert_email_help'          => 'Email addresses or distribution lists you want alerts to be sent to, comma separated.',
     'alerts_enabled'			=> 'Brīdinājumi ir iespējoti',
     'alert_interval'			=> 'Pabeidzamo brīdinājumu slieksnis (dienās)',
     'alert_inv_threshold'		=> 'Inventāra trauksmes slieksnis',
@@ -31,15 +31,18 @@ return [
     'backups'					=> 'Rezerves kopijas',
     'backups_help'              => 'Create, download, and restore backups ',
     'backups_restoring'         => 'Restoring from Backup',
+    'backups_clean' => 'Clean the backed-up database before restore',
+    'backups_clean_helptext' => "This can be useful if you're changing between database versions",
     'backups_upload'            => 'Upload Backup',
     'backups_path'              => 'Backups on the server are stored in <code>:path</code>',
-    'backups_restore_warning'   => 'Use the restore button <small><span class="btn btn-xs btn-warning"><i class="text-white fas fa-retweet" aria-hidden="true"></i></span></small> to restore from a previous backup. (This does not currently work with S3 file storage or Docker.)<br><br>Your <strong>entire :app_name database and any uploaded files will be completely replaced</strong> by what\'s in the backup file.  ',
+    'backups_restore_warning'   => 'Use the restore button <small><span class="btn btn-xs btn-warning"><i class="text-white fas fa-retweet" aria-hidden="true"></i></span></small> to restore from a previous backup. (This does not currently work with S3 file storage or Docker.)<br><br>Your <strong>entire :app_name database and any uploaded files will be completely replaced</strong> by what\'s in the backup file  ',
     'backups_logged_out'         => 'All existing users, including you, will be logged out once your restore is complete.',
     'backups_large'             => 'Very large backups may time out on the restore attempt and may still need to be run via command line. ',
     'barcode_settings'			=> 'Svītru kodu iestatījumi',
     'confirm_purge'			    => 'Apstipriniet iztīrīšanu',
     'confirm_purge_help'		=> 'Enter the text "DELETE" in the box below to purge your deleted records. This action cannot be undone and will PERMANENTLY delete all soft-deleted items and users. (You should make a backup first, just to be safe.)',
     'custom_css'				=> 'Pielāgota CSS',
+    'custom_css_placeholder'	=> 'Add your custom CSS',
     'custom_css_help'			=> 'Ievadiet jebkuru pielāgotu CSS ignorēšanu, kuru vēlaties izmantot. Neiekļaujiet &lt;style&gt;&lt;/style&gt; atzīmes.',
     'custom_forgot_pass_url'	=> 'Pielāgotā paroles atjaunošanas saite',
     'custom_forgot_pass_url_help'	=> 'Tas aizstāj pieteikšanās ekrānā iebūvēto aizmirstās paroles URL. To izmanto, lai novirzītu cilvēkus uz iekšējā vai ārēja LDAP servera paroles atiestatīšanas funkcionalitāti. Tas efektīvi atspējos lokālā lietotājā paroles atiestatīšanas funkcionalitāti.',
@@ -47,34 +50,34 @@ return [
     'dashboard_message_help'	=> 'Šis teksts parādīsies ikvienam, kuram ir atļauja, skatīt Galveno paneli.',
     'default_currency'  		=> 'Valūta pēc noklusējuma',
     'default_eula_text'			=> 'Noklusējuma EULA',
+    'default_eula_text_placeholder' => 'Add your default EULA text',
     'default_language'			=> 'Noklusējuma valoda',
     'default_eula_help_text'	=> 'Varat arī saistīt pielāgotās EULA ar noteiktām aktīvu kategorijām.',
     'acceptance_note'           => 'Add a note for your decision (Optional)',
     'display_asset_name'        => 'Displeja aktīvu nosaukums',
     'display_checkout_date'     => 'Displeja norēķinu datums',
     'display_eol'               => 'Displejs EOL tabulas skatījumā',
-    'display_qr'                => 'Displeja kvadrātveida kodi',
+    'display_qr'                => 'Display 2D barcode',
     'display_alt_barcode'		=> 'Parādiet 1D svītrkodu',
-    'email_logo'                => 'E-pasta logotips',
     'barcode_type'				=> '2D svītru kodu tips',
     'alt_barcode_type'			=> '1D svītrkoda tips',
-    'email_logo_size'       => 'Kvadrātformas logotipi e-pasta vēstulēs izskatās vislabāk. ',
     'enabled'                   => 'Enabled',
     'eula_settings'				=> 'EULA iestatījumi',
     'eula_markdown'				=> 'Šis EULA ļauj <a href="https://help.github.com/articles/github-flavored-markdown/">Github aromatizēts markdown</a>.',
+    'empty_row_count'           => 'Field Start Offset (Empty Rows)',
+    'empty_row_count_help'      => 'Fields will begin populating after this many empty rows are skipped at the top of the label.',
     'favicon'                   => 'Favicon',
     'favicon_format'            => 'Accepted filetypes are ico, png, and gif. Other image formats may not work in all browsers.',
     'favicon_size'          => 'Favicons should be square images, 16x16 pixels.',
     'footer_text'               => 'Papildu kājenes teksts ',
     'footer_text_help'          => 'Šis teksts tiks parādīts labajā kājenē. Saites ir atļautas, izmantojot <a href="https://help.github.com/articles/github-flavored-markdown/">Github flavored markdown</a>. Līniju pārtraukumi, galvenes, attēli, utt. var radīt neparedzamus rezultātus.',
+    'footer_text_placeholder'   => 'Optional footer text',
     'general_settings'			=> 'Vispārīgie iestatījumi',
-    'general_settings_keywords' => 'company support, signature, acceptance, email format, username format, images, per page, thumbnail, eula, gravatar, tos, dashboard, privacy',
     'general_settings_help'     => 'Default EULA and more',
     'generate_backup'			=> 'Izveidot dublējumu',
     'google_workspaces'         => 'Google Workspaces',
     'header_color'              => 'Galvenes krāsa',
     'info'                      => 'Šie iestatījumi ļauj jums pielāgot noteiktus instalēšanas aspektus.',
-    'label_logo'                => 'Label Logo',
     'label_logo_size'           => 'Square logos look best - will be displayed in the top right of each asset label. ',
     'laravel'                   => 'Laravel versija',
     'ldap'                      => 'LDAP',
@@ -94,7 +97,7 @@ return [
     'ldap_login_sync_help'      => 'Šis tikai pārbauda vai darbojas LDAP sinhronizācija. Ja LDAP autentifikācijas vaicājums nav pareizs, lietotāji, iespējams, joprojām nevarēs pierakstīties. VISPIRMS SAGLABĀJIET ATJAUNINĀTOS LDAP IESTATĪJUMUS.',
     'ldap_manager'              => 'LDAP Manager',
     'ldap_server'               => 'LDAP serveris',
-    'ldap_server_help'          => 'Tam vajadzētu sākt ar ldap: // (nešifrētiem vai TLS) vai ldaps: // (attiecībā uz SSL)',
+    'ldap_server_help'          => 'This should start with ldap:// (for unencrypted) or ldaps:// (for TLS or SSL)',
     'ldap_server_cert'			=> 'LDAP SSL sertifikātu validācija',
     'ldap_server_cert_ignore'	=> 'Atļaut nederīgu SSL sertifikātu',
     'ldap_server_cert_help'		=> 'Atzīmējiet šo izvēles rūtiņu, ja izmantojat pašrakstītu SSL sertifikātu un vēlaties pieņemt nederīgu SSL sertifikātu.',
@@ -108,8 +111,8 @@ return [
     'ldap_pword'                => 'LDAP Bind Parole',
     'ldap_basedn'               => 'Base Bind DN',
     'ldap_filter'               => 'LDAP filtrs',
-    'ldap_pw_sync'              => 'LDAP paroles sinhronizācija',
-    'ldap_pw_sync_help'         => 'Noņemiet atzīmi no šīs izvēles rūtiņas, ja nevēlaties, lai LDAP paroles tiktu sinhronizētas ar vietējām parolēm. Atspējojot to, tas nozīmē, ka jūsu lietotāji, iespējams, nevarēs pieteikties, ja jūsu LDAP serveris kāda iemesla dēļ nav sasniedzams.',
+    'ldap_pw_sync'              => 'Cache LDAP Passwords',
+    'ldap_pw_sync_help'         => 'Uncheck this box if you do not wish to keep LDAP passwords cached as local hashed passwords. Disabling this means that your users may not be able to login if your LDAP server is unreachable for some reason.',
     'ldap_username_field'       => 'Lietotājvārds lauks',
     'ldap_lname_field'          => 'Uzvārds',
     'ldap_fname_field'          => 'LDAP vārds',
@@ -117,13 +120,15 @@ return [
     'ldap_version'              => 'LDAP versija',
     'ldap_active_flag'          => 'LDAP aktīvā karodziņa',
     'ldap_activated_flag_help'  => 'This value is used to determine whether a synced user can login to Snipe-IT. <strong>It does not affect the ability to check items in or out to them</strong>, and should be the <strong>attribute name</strong> within your AD/LDAP, <strong>not the value</strong>. <br><br>If this field is set to a field name that does not exist in your AD/LDAP, or the value in the AD/LDAP field is set to <code>0</code> or <code>false</code>, <strong>user login will be disabled</strong>. If the value in the AD/LDAP field is set to <code>1</code> or <code>true</code> or <em>any other text</em> means the user can log in. When the field is blank in your AD, we respect the <code>userAccountControl</code> attribute, which usually allows non-suspended users to log in.',
+    'ldap_invert_active_flag'   => 'LDAP Invert Active Flag',
+    'ldap_invert_active_flag_help'     => 'If enabled: when the value returned by LDAP Active Flag is <code>0</code> or <code>false</code> the user account will be active.',
     'ldap_emp_num'              => 'LDAP darbinieku skaits',
     'ldap_email'                => 'LDAP e-pasts',
     'ldap_test'                 => 'Test LDAP',
     'ldap_test_sync'            => 'Test LDAP Synchronization',
     'license'                   => 'Programmatūras licence',
-    'load_remote'               => 'Use Gravatar',
-    'load_remote_help_text'		=> 'Uncheck this box if your install cannot load scripts from the outside internet. This will prevent Snipe-IT from trying load images from Gravatar.',
+    'load_remote'               => 'Load Remote Avatars',
+    'load_remote_help_text'		=> 'Uncheck this box if your install cannot load scripts from the outside internet. This will prevent Snipe-IT from trying load avatars from Gravatar or other outside sources.',
     'login'                     => 'Login Attempts',
     'login_attempt'             => 'Login Attempt',
     'login_ip'                  => 'IP Address',
@@ -131,6 +136,7 @@ return [
     'login_user_agent'          => 'User Agent',
     'login_help'                => 'List of attempted logins',
     'login_note'                => 'Pieteikšanās piezīme',
+    'login_note_placeholder'            => "If you do not have a login or have found a device belonging to this company, please call technical support at 888-555-1212. Thank you.",
     'login_note_help'           => 'Jūsu pieteikšanās ekrānā pēc izvēles var iekļaut dažus teikumus, piemēram, lai palīdzētu cilvēkiem, kuri ir atraduši nozaudētu vai nozagtu ierīci. Šajā laukā tiek pieņemti <a href="https://help.github.com/articles/github-flavored-markdown/">Github aromatizēti atzīme</a>',
     'login_remote_user_text'    => 'Attālā lietotāja pieslēgšanās iespējas',
     'login_remote_user_enabled_text' => 'Iespējot pieslēgšanos ar attālā lietotāja galveni',
@@ -146,13 +152,16 @@ return [
     'logo_print_assets_help'    => 'Izmantot zīmolradi drukātos līdzekļu sarakstos ',
     'full_multiple_companies_support_help_text' => 'Ierobežot lietotājus (tostarp administratorus), kas uzņēmumiem piešķirti viņu uzņēmuma aktīvos.',
     'full_multiple_companies_support_text' => 'Pilns vairāku uzņēmumu atbalsts',
+    'scope_locations_fmcs_support_text'  => 'Scope Locations with Full Multiple Companies Support',
+    'scope_locations_fmcs_support_help_text'  => 'Restrict locations to their selected company.',
+    'scope_locations_fmcs_check_button' => 'Check Compatibility',
+    'scope_locations_fmcs_support_disabled_text'  => 'This option is disabled because you have conflicting locations set for :count or more items.',
     'show_in_model_list'   => 'Rādīt iekš DropDown modeļa',
     'optional'					=> 'pēc izvēles',
     'per_page'                  => 'Rezultāti lapā',
     'php'                       => 'PHP versija',
-    'php_info'                  => 'PHP Info',
+    'php_info'                  => 'PHP info',
     'php_overview'              => 'PHP',
-    'php_overview_keywords'     => 'phpinfo, system, info',
     'php_overview_help'         => 'PHP System info',
     'php_gd_info'               => 'Jums jāinstalē php-gd, lai parādītu QR kodus, skatiet instalēšanas instrukcijas.',
     'php_gd_warning'            => 'PHP attēlu apstrāde un GD spraudnis nav instalēts.',
@@ -218,6 +227,8 @@ return [
     'webhook_integration_help'    => ':app integration is optional, however the endpoint and channel are required if you wish to use it. To configure :app integration, you must first <a href=":webhook_link" target="_new" rel="noopener">create an incoming webhook</a> on your :app account. Click on the <strong>Test :app Integration</strong> button to confirm your settings are correct before saving. ',
     'webhook_integration_help_button'    => 'Once you have saved your :app information, a test button will appear.',
     'webhook_test_help'           => 'Test whether your :app integration is configured correctly. YOU MUST SAVE YOUR UPDATED :app SETTINGS FIRST.',
+    'shortcuts_enabled'         => 'Enable Shortcuts',
+    'shortcuts_help_text'       => '<strong>Windows</strong>: Alt + Access key, <strong>Mac</strong>: Control + Option + Access key',
     'snipe_version'  			=> 'Snipe-IT versija',
     'support_footer'            => 'Atbalsta kājenes saites ',
     'support_footer_help'       => 'Norādiet, kurš redz saites uz Snipe-IT atbalsta informāciju un lietotāju rokasgrāmatu.',
@@ -227,7 +238,6 @@ return [
     'update'                    => 'Atjauniniet iestatījumus',
     'value'                     => 'Vērtība',
     'brand'                     => 'Brendings',
-    'brand_keywords'            => 'footer, logo, print, theme, skin, header, colors, color, css',
     'brand_help'                => 'Logo, Site Name',
     'web_brand'                 => 'Web Branding Type',
     'about_settings_title'      => 'Par iestatījumiem',
@@ -276,6 +286,8 @@ return [
     'two_factor_enrollment_text'	=> "Nepieciešama divu faktoru autentifikācija, tomēr jūsu ierīce vēl nav reģistrēta. Atveriet savu lietotni Google autentifikators un skenējiet zemāk redzamo QR kodu, lai reģistrētu savu ierīci. Kad esat reģistrējies savā ierīcē, ievadiet zemāk redzamo kodu",
     'require_accept_signature'      => 'Pieprasīt parakstu',
     'require_accept_signature_help_text'      => 'Iespējojot šo funkciju, lietotājiem būs jāpiesaista aktīva pieņemšana.',
+    'require_checkinout_notes'  => 'Require Notes on Checkin/Checkout',
+    'require_checkinout_notes_help_text'    => 'Enabling this feature will require the note fields to be populated when checking in or checking out an asset.',
     'left'        => 'pa kreisi',
     'right'        => 'pa labi',
     'top'        => 'tops',
@@ -313,24 +325,24 @@ return [
     'filter_by_keyword' => 'Filter by setting keyword',
     'security' => 'Security',
     'security_title' => 'Update Security Settings',
-    'security_keywords' => 'password, passwords, requirements, two factor, two-factor, common passwords, remote login, logout, authentication',
     'security_help' => 'Two-factor, Password Restrictions',
-    'groups_keywords' => 'permissions, permission groups, authorization',
     'groups_help' => 'Account permission groups',
     'localization' => 'Localization',
     'localization_title' => 'Update Localization Settings',
-    'localization_keywords' => 'localization, currency, local, locale, time zone, timezone, international, internatinalization, language, languages, translation',
     'localization_help' => 'Language, date display',
     'notifications' => 'Notifications',
     'notifications_help' => 'Email Alerts & Audit Settings',
     'asset_tags_help' => 'Incrementing and prefixes',
     'labels' => 'Labels',
     'labels_title' => 'Update Label Settings',
-    'labels_help' => 'Label sizes &amp; settings',
-    'purge_keywords' => 'permanently delete',
+    'labels_help' => 'Barcodes &amp; label settings',
     'purge_help' => 'Iztīrīt dzēstos ierakstus',
     'ldap_extension_warning' => 'It does not look like the LDAP extension is installed or enabled on this server. You can still save your settings, but you will need to enable the LDAP extension for PHP before LDAP syncing or login will work.',
     'ldap_ad' => 'LDAP/AD',
+    'ldap_test_label' => 'Test LDAP Sync',
+    'ldap_test_login' => ' Test LDAP Login',
+    'ldap_username_placeholder' => 'LDAP Username',
+    'ldap_password_placeholder' => 'LDAP Password',
     'employee_number' => 'Darbinieka numurs',
     'create_admin_user' => 'Create a User ::',
     'create_admin_success' => 'Success! Your admin user has been added!',
@@ -342,6 +354,8 @@ return [
     'setup_migration_create_user' => 'Next: Create User',
     'ldap_settings_link' => 'LDAP Settings Page',
     'slack_test' => 'Test <i class="fab fa-slack"></i> Integration',
+    'status_label_name' => 'Status Label Name',
+    'super_admin_only'  => 'Super Admin Only',
     'label2_enable'           => 'New Label Engine',
     'label2_enable_help'      => 'Switch to the new label engine. <b>Note: You will need to save this setting before setting others.</b>',
     'label2_template'         => 'Template',
@@ -356,12 +370,15 @@ return [
     'label2_2d_type'          => '2D svītru kodu tips',
     'label2_2d_type_help'     => 'Format for 2D barcodes',
     'label2_2d_target'        => '2D Barcode Target',
-    'label2_2d_target_help'   => 'The URL the 2D barcode points to when scanned',
+    'label2_2d_target_help'   => 'The data that will be contained in the 2D barcode',
     'label2_fields'           => 'Field Definitions',
     'label2_fields_help'      => 'Fields can be added, removed, and reordered in the left column. For each field, multiple options for Label and DataSource can be added, removed, and reordered in the right column.',
+    'purge_barcodes' => 'Purge Barcodes',
     'help_asterisk_bold'    => 'Text entered as <code>**text**</code> will be displayed as bold',
     'help_blank_to_use'     => 'Leave blank to use the value from <code>:setting_name</code>',
     'help_default_will_use' => '<code>:default</code> will use the value from <code>:setting_name</code>. <br>Note that the value of the barcodes must comply with the respective barcode spec in order to be successfully generated. Please see <a href="https://snipe-it.readme.io/docs/barcodes">the documentation <i class="fa fa-external-link"></i></a> for more details. ',
+    'asset_id'              => 'Asset ID',
+    'data'               => 'Data',
     'default'               => 'Default',
     'none'                  => 'None',
     'google_callback_help' => 'This should be entered as the callback URL in your Google OAuth app settings in your organization&apos;s <strong><a href="https://console.cloud.google.com/" target="_blank">Google developer console <i class="fa fa-external-link" aria-hidden="true"></i></a></strong>.',
@@ -373,7 +390,100 @@ return [
     'database_driver' => 'Database Driver',
     'bs_table_storage' => 'Table Storage',
     'timezone' => 'Timezone',
+    'test_mail' => 'Test Mail',
     'profile_edit'          => 'Edit Profile',
     'profile_edit_help'          => 'Allow users to edit their own profiles.',
+    'default_avatar' => 'Custom Default Avatar',
+    'default_avatar_help' => 'This image will be displayed as a profile if a user does not have a profile photo.',
+    'restore_default_avatar' => 'Restore <a href=":default_avatar" data-toggle="lightbox" data-type="image">original system default avatar</a>',
+    'restore_default_avatar_help' => '',
+    'due_checkin_days' => 'Due For Checkin Warning',
+    'due_checkin_days_help' => 'How many days before the expected checkin of an asset should it be listed in the "Due for checkin" page?',
+    'no_groups' => 'No groups have been created yet. Visit <code>Admin Settings > Permission Groups</code> to add one.',
+    'text' => 'Text',
+
+    'username_formats' => [
+        'username_format'		=> 'Lietotājvārds formāts',
+        'firstname_lastname_format'	=> 'Vārds un uzvārds (jane.smith)',
+        'first_name_format'	        => 'First Name (jane)',
+        'last_name_format'		=> 'Last Name (doe)',
+        'filastname_format'			=> 'First Initial Last Name (jsmith)',
+        'lastnamefirstinitial_format' =>  'Last Name First Initial (smithj)',
+        'firstname_lastname_underscore_format' => 'First Name Last Name (jane_smith)',
+        'firstinitial.lastname' => 'First Initial Last Name (j.smith)',
+        'lastname_firstinitial' => 'Last Name First Initial (smith_j)',
+        'lastname_dot_firstinitial_format' => 'Last Name First Initial (smith.j)',
+        'firstnamelastname'     => 'First Name Last Name (janesmith)',
+        'firstnamelastinitial'  => 'First Name Last Initial (janes)',
+        'lastnamefirstname'      => 'Last Name.First Name (smith.jane)',
+    ],
+
+    'email_formats' => [
+        'email_format'			=> 'E-pasta formāts',
+        'firstname_lastname_format'	=> 'Vārds un uzvārds (jane.smith@example.com)',
+        'first_name_format'		=> 'Vārds (jane@example.com)',
+        'last_name_format'		=> 'Last Name (doe@example.com)',
+        'filastname_format'			=> 'Pirmais sākotnējais uzvārds (jsmith@example.com)',
+        'lastnamefirstinitial_format' =>  'Uzvārds un vārda pirmais burts (berzinsj@epasts.lv)',
+        'firstname_lastname_underscore_format' => 'Vārds Uzvārds (jane_smith@example.com)',
+        'firstinitial.lastname' => 'Vārds un uzvārds (j.smith@example.com)',
+        'lastname_firstinitial' => 'Uzvārds un vārda pirmais burts (berzinsj@epasts.lv)',
+        'lastname_dot_firstinitial_format' => 'Last Name First Initial (smith.j@example.com)',
+        'firstnamelastname'     => 'Vārds Uzvārds (jane_smith@example.com)',
+        'firstnamelastinitial'  => 'Vārds Uzvārds (jane_smith@example.com)',
+        'lastnamefirstname'      => 'Last Name.First Name (smith.jane@example.com)',
+    ],
+
+
+
+    'logo_labels' => [
+        'acceptance_pdf_logo'       => 'PDF Logo',
+        'email_logo'                => 'E-pasta logotips',
+        'label_logo'                => 'Label Logo',
+        'logo'                      => 'Site Logo',
+        'favicon'                   => 'Favicon',
+    ],
+
+    'logo_help' => [
+        'email_logo_size'       => 'Kvadrātformas logotipi e-pasta vēstulēs izskatās vislabāk. ',
+    ],
+
+    'logo_option_types' => [
+        'text' => 'Text',
+        'logo' => 'Logotips',
+        'logo_and_text' => 'Logo and Text',
+    ],
+
+
+    'legends' => [
+        'scoping' => 'Scoping',
+        'formats' => 'Default Formats',
+        'profiles' => 'User Profiles',
+        'eula' => 'EULA & Acceptance Preferences',
+        'misc_display' => 'Miscellaneous Display Options',
+        'email' => 'Email Preferences',
+        'checkin' => 'Checkin Preferences',
+        'dashboard' => 'Login & Dashboard Preferences',
+        'misc' => 'Miscellaneous',
+        'logos' => 'Logos & Display',
+        'colors' => 'Colors & Skins',
+        'footer' => 'Footer Preferences',
+        'security' => 'Security Preferences',
+        'general' => 'General',
+        'intervals' => 'Intervals & Thresholds',
+    ],
+
+
+    /* Keywords for settings overview help */
+    'keywords' => [
+        'brand'             => 'footer, logo, print, theme, skin, header, colors, color, css',
+        'general_settings'  => 'company support, signature, acceptance, email format, username format, images, per page, thumbnail, eula, gravatar, tos, dashboard, privacy',
+        'groups'            => 'permissions, permission groups, authorization',
+        'labels'            => 'labels, barcodes, barcode, sheets, print, upc, qr, 1d, 2d',
+        'localization'      => 'localization, currency, local, locale, time zone, timezone, international, internatinalization, language, languages, translation',
+        'php_overview'      => 'phpinfo, system, info',
+        'purge'             => 'permanently delete',
+        'security'          => 'password, passwords, requirements, two factor, two-factor, common passwords, remote login, logout, authentication',
+    ],
 
 ];
diff --git a/resources/lang/lv-LV/admin/settings/message.php b/resources/lang/lv-LV/admin/settings/message.php
index 4004dcbe0a..2bf633f488 100644
--- a/resources/lang/lv-LV/admin/settings/message.php
+++ b/resources/lang/lv-LV/admin/settings/message.php
@@ -14,6 +14,9 @@ return [
         'restore_warning'       => 'Yes, restore it. I acknowledge that this will overwrite any existing data currently in the database. This will also log out all of your existing users (including you).',
         'restore_confirm'       => 'Are you sure you wish to restore your database from :filename?'
     ],
+    'restore' => [
+        'success'               => 'Your system backup has been restored. Please log in again.'
+    ],
     'purge' => [
         'error'     => 'Iztīrīšanas laikā radās kļūda.',
         'validation_failed'     => 'Jūsu tīrīšanas apstiprinājums nav pareizs. Lūdzu, ierakstiet apstiprinājuma lodziņā vārdu "DELETE".',
@@ -33,6 +36,9 @@ return [
         'testing_authentication' => 'Testing LDAP Authentication...',
         'authentication_success' => 'User authenticated against LDAP successfully!'
     ],
+    'labels' => [
+        'null_template' => 'Label template not found. Please select a template.',
+        ],
     'webhook' => [
         'sending' => 'Sending :app test message...',
         'success' => 'Your :webhook_name Integration works!',
@@ -42,5 +48,12 @@ return [
         'error' => 'Something went wrong. :app responded with: :error_message',
         'error_redirect' => 'ERROR: 301/302 :endpoint returns a redirect. For security reasons, we don’t follow redirects. Please use the actual endpoint.',
         'error_misc' => 'Something went wrong. :( ',
-    ]
+        'webhook_fail' => ' webhook notification failed: Check to make sure the URL is still valid.',
+        'webhook_channel_not_found' => ' webhook channel not found.',
+        'ms_teams_deprecation' => 'The selected Microsoft Teams webhook URL will be deprecated Dec 31st, 2025. Please use a workflow URL. Microsoft\'s documentation on creating a workflow can be found <a href="https://support.microsoft.com/en-us/office/create-incoming-webhooks-with-workflows-for-microsoft-teams-8ae491c7-0394-4861-ba59-055e33f75498" target="_blank"> here.</a>',
+    ],
+    'location_scoping' => [
+        'not_saved' => 'Your settings were not saved.',
+        'mismatch' => 'There is 1 item in the database that need your attention before you can enable location scoping.|There are :count items in the database that need your attention before you can enable location scoping.',
+    ],
 ];
diff --git a/resources/lang/lv-LV/admin/statuslabels/table.php b/resources/lang/lv-LV/admin/statuslabels/table.php
index 2b41c33f55..9f35a01504 100644
--- a/resources/lang/lv-LV/admin/statuslabels/table.php
+++ b/resources/lang/lv-LV/admin/statuslabels/table.php
@@ -1,14 +1,14 @@
 <?php
 
 return array(
-    'about'      	=> 'Par statusa etiķetēm',
+    'about'      	=> 'About Status Types',
     'archived'      	=> 'Arhivēts',
     'create'      	=> 'Izveidot statusa marķējumu',
     'color'      	=> 'Diagrammas krāsa',
     'default_label' => 'Noklusējums',
     'default_label_help' => 'Tiek lietots, lai attēlotu biežāk lietotos marķējumus izvēles saraksta augšgalā, kad tiek veidota aparatūras vienība.',
     'deployable'      	=> 'Izvietojams',
-    'info'      	=> 'Statusa etiķetes tiek izmantotas, lai aprakstītu dažādas valstis, kurās varētu būt aktīvi. Tie var būt paredzēti remontam, nozaudēšanai / nozagšanai utt. Varat izveidot jaunas statusa etiķetes izvietojamiem, gaidīšanas un arhivētiem aktīviem.',
+    'info'      	=> 'Status label types are used to describe the various states your assets could be in. They may be out for repair, lost/stolen, etc. You can create new status labels for your deployable, pending and archived assets according to your own workflow. For more information, <a href="https://snipe-it.readme.io/docs/overview#status-labels" target="_blank">see the documentation <i class="fa fa-external-link"></i></a>.',
     'name'      	=> 'Statusa nosaukums',
     'pending'      	=> 'Gaida',
     'status_type'   => 'Statusa veids',
diff --git a/resources/lang/lv-LV/admin/users/general.php b/resources/lang/lv-LV/admin/users/general.php
index b73ff04267..c9f8e4a1e0 100644
--- a/resources/lang/lv-LV/admin/users/general.php
+++ b/resources/lang/lv-LV/admin/users/general.php
@@ -19,6 +19,8 @@ return [
     'print_assigned'    => 'Drukāt izsniegto',
     'email_assigned'    => 'Email List of All Assigned',
     'user_notified'     => 'User has been emailed a list of their currently assigned items.',
+    'users_notified'    => 'The user has been emailed a list of their currently assigned items.|:count users have been emailed a list of their currently assigned items.',
+    'users_notified_warning' => ':count user has been emailed a list of their currently assigned items, however :no_email users did not have an email address so could not be emailed.|:count users have been emailed a list of their currently assigned items, however :no_email user(s) did not have an email address so could not be emailed.',
     'auto_assign_label' => 'Include this user when auto-assigning eligible licenses',
     'auto_assign_help'  => 'Skip this user in auto assignment of licenses',
     'software_user'     => 'Programmatūra Pārbaudīta: nosaukums',
diff --git a/resources/lang/lv-LV/admin/users/message.php b/resources/lang/lv-LV/admin/users/message.php
index 0779e5c823..f89ba39674 100644
--- a/resources/lang/lv-LV/admin/users/message.php
+++ b/resources/lang/lv-LV/admin/users/message.php
@@ -6,7 +6,7 @@ return array(
     'declined'                  => 'Jūs esat veiksmīgi atteicies no šī īpašuma.',
     'bulk_manager_warn'	        => 'Jūsu lietotāji ir veiksmīgi atjaunināti, taču jūsu pārvaldnieka ieraksts netika saglabāts, jo izvēlētā pārvaldnieks bija arī rediģējamo lietotāju sarakstā, un lietotāji, iespējams, nav viņu īpašnieks. Lūdzu, vēlreiz atlasiet savus lietotājus, izņemot pārvaldnieku.',
     'user_exists'               => 'Lietotājs jau eksistē!',
-    'user_not_found'            => 'Lietotājs neeksistē.',
+    'user_not_found'            => 'User does not exist or you do not have permission view them.',
     'user_login_required'       => 'Ievades lauks ir nepieciešams',
     'user_has_no_assets_assigned' => 'No assets currently assigned to user.',
     'user_password_required'    => 'Parole ir nepieciešama.',
@@ -53,6 +53,7 @@ return array(
         'ldap_could_not_search' => 'Nevarēja meklēt LDAP serverī. Lūdzu, pārbaudiet LDAP servera konfigurāciju LDAP konfigurācijas failā. <br>Par LDAP servera kļūda:',
         'ldap_could_not_get_entries' => 'Nevarēja iegūt ierakstus no LDAP servera. Lūdzu, pārbaudiet LDAP servera konfigurāciju LDAP konfigurācijas failā. <br>Par LDAP servera kļūda:',
         'password_ldap' => 'Šī konta paroli pārvalda LDAP / Active Directory. Lai mainītu savu paroli, lūdzu, sazinieties ar IT nodaļu.',
+        'multi_company_items_assigned' => 'This user has items assigned that belong to a different company. Please check them in or edit their company.'
     ),
 
     'deletefile' => array(
diff --git a/resources/lang/lv-LV/admin/users/table.php b/resources/lang/lv-LV/admin/users/table.php
index 02ef538f06..45bcbcf0e9 100644
--- a/resources/lang/lv-LV/admin/users/table.php
+++ b/resources/lang/lv-LV/admin/users/table.php
@@ -22,7 +22,7 @@ return array(
     'managed_locations'     => 'Pārvaldītās atrašanās vietas',
     'managed_users'         => 'Managed Users',
     'name' 					=> 'Nosaukums',
-    'nogroup'               => 'No groups have been created yet. To add one, visit: ',
+    'nogroup'               => 'No groups have been created yet. To add one, visit:',
     'notes'                 => 'Piezīmes',
     'password_confirm' 		=> 'apstipriniet paroli',
     'password' 				=> 'Parole',
diff --git a/resources/lang/lv-LV/auth.php b/resources/lang/lv-LV/auth.php
index db310aa1bb..14d8acfce0 100644
--- a/resources/lang/lv-LV/auth.php
+++ b/resources/lang/lv-LV/auth.php
@@ -15,6 +15,6 @@ return array(
 
     'failed' => 'These credentials do not match our records.',
     'password' => 'The provided password is incorrect.',
-    'throttle' => 'Too many login attempts. Please try again in :seconds seconds.',
+    'throttle' => 'Too many login attempts. Please try again in :minutes minute(s).',
 
 );
diff --git a/resources/lang/lv-LV/auth/message.php b/resources/lang/lv-LV/auth/message.php
index 7a93006fab..6f6623023a 100644
--- a/resources/lang/lv-LV/auth/message.php
+++ b/resources/lang/lv-LV/auth/message.php
@@ -6,8 +6,6 @@ return array(
     'account_not_found'      => 'Lietotājvārds vai parole nav pareiza.',
     'account_not_activated'  => 'Šis lietotāja konts nav aktivizēts.',
     'account_suspended'      => 'Šī lietotāja konta darbība ir apturēta.',
-    'account_banned'         => 'Šis lietotāja konts ir aizliegts.',
-    'throttle'               => 'Too many failed login attempts. Please try again in :minutes minutes.',
 
     'two_factor' => array(
         'already_enrolled'      => 'Your device is already enrolled.',
diff --git a/resources/lang/lv-LV/button.php b/resources/lang/lv-LV/button.php
index b0aeb0cbab..67acfef821 100644
--- a/resources/lang/lv-LV/button.php
+++ b/resources/lang/lv-LV/button.php
@@ -7,6 +7,7 @@ return [
     'checkin_and_delete'  	    => 'Checkin All / Delete User',
     'delete'  	                => 'Dzēst',
     'edit'    	                => 'Rediģēt',
+    'clone'    	                => 'Clone',
     'restore' 	                => 'Atjaunot',
     'remove'                    => 'Remove',
     'request'                   => 'Pieprasījums',
@@ -21,4 +22,13 @@ return [
     'add_maintenance'           => 'Add Maintenance',
     'append'                    => 'Append',
     'new'                       => 'Jauns',
+    'var' => [
+        'clone'     => 'Clone :item_type',
+        'edit'      => 'Edit :item_type',
+        'delete'    => 'Delete :item_type',
+        'restore'   => 'Restore :item_type',
+        'create'    => 'Create New :item_type',
+        'checkout'  => 'Checkout :item_type',
+        'checkin'   => 'Checkin :item_type',
+    ]
 ];
diff --git a/resources/lang/lv-LV/general.php b/resources/lang/lv-LV/general.php
index 5bdad8a25b..2feb6f66e7 100644
--- a/resources/lang/lv-LV/general.php
+++ b/resources/lang/lv-LV/general.php
@@ -1,44 +1,47 @@
 <?php
 
 return [
-    '2FA_reset'             => '2FA reset',
+    '2FA_reset'             => '2FA atiestatīšana',
     'accessories'			=> 'Aksesuāri',
     'activated'			    => 'Aktivizēts',
-    'accepted_date'         => 'Date Accepted',
+    'accepted_date'         => 'Datums pieņemts',
     'accessory'				=> 'Piederums',
     'accessory_report'		=> 'Piederumu pārskats',
     'action'                => 'Darbība',
     'activity_report'		=> 'Darbības pārskats',
     'address'				=> 'Adrese',
-    'admin'					=> 'Administrators',
-    'admin_tooltip'			=> 'This user has admin privileges',
-    'superuser'				=> 'Superuser',
-    'superuser_tooltip'		=> 'This user has superuser privileges',
+    'admin'					=> 'Admin Settings',
+    'admin_tooltip'			=> 'Šim lietotājam ir administratora tiesības',
+    'superuser'				=> 'Galvenais lietotājs',
+    'superuser_tooltip'		=> 'Šim lietotājam ir glavenā lietotāja tiesības',
     'administrator'			=> 'Administrators',
     'add_seats'             => 'Pievienoti sēdekļi',
-    'age'                   => "Age",
+    'age'                   => "Vecums",
     'all_assets'			=> 'Visi aktīvi',
     'all'       			=> 'Viss',
     'archived'              => 'Arhivēts',
     'asset_models'			=> 'Aktīvu modeļi',
     'asset_model'			=> 'Modelis',
     'asset'					=> 'Aktīvs',
+    'asset_previous'        => 'Asset (Previously Assigned)',
     'asset_report'          => 'Aktīvu pārskats',
     'asset_tag'				=> 'Asset Tag',
     'asset_tags'            => 'Inventāra birka',
     'assets_available'		=> 'Pieejamais inventārs',
     'accept_assets'         => 'Apstiprināt inventāru :name',
     'accept_assets_menu'    => 'Apstiprināt inventāru',
+    'accept_item'           => 'Accept Item',
     'audit'				    => 'Audits',
+    'audits'				=> 'Audits',
     'audit_report'			=> 'Revīzijas žurnāls',
     'assets'				=> 'Aktīvi',
-    'assets_audited'        => 'assets audited',
-    'assets_checked_in_count'     => 'assets checked in',
-    'assets_checked_out_count'     => 'assets checked out',
-    'asset_deleted_warning'     => 'This asset has been deleted. You must restore it before you can assign it to someone.',
-    'assigned_date'         => 'Date Assigned',
-    'assigned_to'           => 'Assigned to :name',
-    'assignee'              => 'Assigned to',
+    'assets_audited'        => 'inventārs pārbaudīts',
+    'assets_checked_in_count'     => 'inventārs noliktavā',
+    'assets_checked_out_count'     => 'inventārs izsniegts',
+    'asset_deleted_warning'     => 'Šis inventārs ir dzēsts. Jums tas ir jāatjauno pirms izsniedzat kādam citam.',
+    'assigned_date'         => 'Izsniegšanas Datums',
+    'assigned_to'           => 'Izsniegta :name',
+    'assignee'              => 'Izsniegts',
     'avatar_delete'         => 'Izdzēst Avatar',
     'avatar_upload'         => 'Augšupielādēt Avatar',
     'back'      			=> 'Atpakaļ',
@@ -49,9 +52,9 @@ return [
     'bulk_edit'             => 'Lielapjoma rediģēšana',
     'bulk_delete'           => 'Lielapjoma dzēšana',
     'bulk_actions'          => 'Lielapjoma darbības',
-    'bulk_checkin_delete'   => 'Bulk Checkin / Delete Users',
+    'bulk_checkin_delete'   => 'Lielapjoma Lietotāju Reģistrēšana / Dzēšana',
     'byod'                  => 'BYOD',
-    'byod_help'             => 'This device is owned by the user',
+    'byod_help'             => 'Šī iekārta pieder lietotājam',
     'bystatus'              => 'pēc statusa',
     'cancel'  				=> 'Atcelt',
     'categories'			=> 'Kategorijas',
@@ -61,9 +64,12 @@ return [
     'changepassword'  		=> 'Mainīt paroli',
     'checkin'  				=> 'Reģistrēties',
     'checkin_from'  		=> 'Reģistrēšanās no',
+    'checkin_note'  		=> 'Checkin Note',
+    'checkout_note'  		=> 'Checkout Note',
     'checkout'  			=> 'Izrakstīšanās',
     'checkouts_count'       => 'Izņemtie aktīvi',
     'checkins_count'        => 'Atgrieztie aktīvi',
+    'checkin_and_delete'  	=> 'Checkin and Delete',
     'user_requests_count'   => 'Pieprasījumi',
     'city'  				=> 'Pilsēta',
     'click_here'			=> 'Noklikšķiniet šeit',
@@ -76,21 +82,23 @@ return [
     'consumable'			=> 'Izlietojams',
     'consumables'			=> 'Izejmateriāli',
     'country'  				=> 'Valsts',
-    'could_not_restore'     => 'Error restoring :item_type: :error',
-    'not_deleted'           => 'The :item_type is not deleted so it cannot be restored',
+    'could_not_restore'     => 'Kļūda atjaunojot :item_type: :error',
+    'not_deleted'           => 'The :item_type was not deleted and therefore cannot be restored',
     'create'				=> 'Izveidot jaunu',
     'created'               => 'Izveidots vienums',
     'created_asset'			=> 'izveidots aktīvu',
-    'created_at' 			=> 'Created At',
-    'created_by'            => 'Created By',
+    'created_at' 			=> 'Izveidots',
+    'created_by'            => 'Izveidoja',
     'record_created' 		=> 'Ieraksts izceidots',
     'updated_at' 			=> 'Atjaunināts vietnē',
     'currency'  			=> '$', // this is deprecated
+    'currency_text'  		=> 'Currency', //
     'current'  				=> 'Pašreizējais',
     'current_password'      => 'Pāsreizējā parole',
     'customize_report'      => 'Pielāgot atskaiti',
     'custom_report'         => 'Pielāgoto aktīvu pārskats',
     'dashboard'				=> 'Informācijas panelis',
+    'data_source'           => 'Data Source',
     'days'      			=> 'dienas',
     'days_to_next_audit'    => 'Dienas līdz nākamajam auditam',
     'date'					=> 'Datums',
@@ -98,7 +106,7 @@ return [
     'debug_warning_text'    => 'Šī lietojumprogramma darbojas ražošanas režīmā ar iespējotu atkļūdošanu. Tas var pakļaut sensitīvus datus, ja jūsu pieteikums ir pieejams ārpasauli. Atspējošanas atkļūdošanas režīms, iestatot <code>APP_DEBUG</code> vērtību savam <code>.env</code> failam uz <code>false</code>.',
     'delete'  				=> 'Dzēst',
     'delete_confirm'  		=> 'Vai tiešām vēlaties dzēst :item?',
-    'delete_confirm_no_undo' => 'Are you sure you wish to delete :item? This can not be undone.',
+    'delete_confirm_no_undo' => 'Are you sure, you wish to delete :item? This cannot be undone.',
     'deleted'  				=> 'Svītrots',
     'delete_seats'  		=> 'Izdzēstās vietas',
     'deletion_failed'       => 'Dzēšana neizdevās',
@@ -114,33 +122,17 @@ return [
     'editprofile'  			=> 'Rediģējiet savu profilu',
     'eol'					=> 'EOL',
     'email_domain'			=> 'E-pasta domēns',
-    'email_format'			=> 'E-pasta formāts',
     'employee_number'       => 'Darbinieka numurs',
     'email_domain_help'		=> 'To izmanto, lai importētu e-pasta adreses',
     'error'				    => 'Kļūda',
-    'exclude_archived'      => 'Exclude Archived Assets',
-    'exclude_deleted'       => 'Exclude Deleted Assets',
-    'example'				=> 'Example: ',
-    'filastname_format'			=> 'Pirmais sākotnējais uzvārds (jsmith@example.com)',
-    'firstname_lastname_format'	=> 'Vārds un uzvārds (jane.smith@example.com)',
-    'firstname_lastname_underscore_format' => 'Vārds Uzvārds (jane_smith@example.com)',
-    'lastnamefirstinitial_format' =>  'Uzvārds un vārda pirmais burts (berzinsj@epasts.lv)',
-    'firstintial_dot_lastname_format' => 'Vārds un uzvārds (j.smith@example.com)',
-    'firstname_lastname_display'	=> 'First Name Last Name (Jane Smith)',
-    'lastname_firstname_display'	=> 'Last Name First Name (Smith Jane)',
-    'name_display_format'	=> 'Name Display Format',
-    'first'					=> 'Vispirms',
-    'firstnamelastname'     => 'Vārds Uzvārds (jane_smith@example.com)',
-    'lastname_firstinitial' => 'Uzvārds un vārda pirmais burts (berzinsj@epasts.lv)',
-    'firstinitial.lastname' => 'Vārds un uzvārds (j.smith@example.com)',
-    'firstnamelastinitial'  => 'Vārds Uzvārds (jane_smith@example.com)',
-    'lastnamefirstname'      => 'Last Name First Name (smith.jane@example.com)',
-    'first_name'			=> 'Vārds',
-    'first_name_format'		=> 'Vārds (jane@example.com)',
+    'exclude_archived'      => 'Neiekļaut Arhivētu Inventāru',
+    'exclude_deleted'       => 'Neiekļaut Dzēstu Inventāru',
+    'example'				=> 'Piemērs: ',
+
     'files'                 => 'Datnes',
     'file_name'				=> 'Fails',
     'file_type'             => 'Faila tips',
-    'filesize'              => 'File Size',
+    'filesize'              => 'Datnes lielums',
     'file_uploads'			=> 'Faila augšupielāde',
     'file_upload'           => 'Faila augšupielāde',
     'generate'				=> 'Izveidot',
@@ -148,57 +140,62 @@ return [
     'github_markdown'      => 'Šajā laukā tiek pieņemts <a href="https://help.github.com/articles/github-flavored-markdown/">Github pieņemtais marķējums</a>.',
     'groups'				=> 'Grupas',
     'gravatar_email'        => 'Gravatar e-pasta adrese',
-    'gravatar_url'          => '<a href="http://gravatar.com"><small>Change your avatar at Gravatar.com</small></a>.',
+    'gravatar_url'          => '<a href="http://gravatar.com"><small>Izmaini savu tēlu Gravatar.com</small></a>.',
     'history'  			    => 'Vēsture',
     'history_for'  			=> 'Vēsture par',
     'id'  					=> 'ID',
     'image'                 => 'Attēls',
     'image_delete'         	=> 'Dzēst attēlu',
-    'include_deleted'       => 'Include Deleted Assets',
+    'include_deleted'       => 'Iekļaut Dzēstu Inventāru',
     'image_upload'         	=> 'Augšupielādēt attēlu',
-    'filetypes_accepted_help'    => 'Atļautie failu tipi :types. Maksimālais atļautais failu izmērs :size.|Atļautie failu tipi :types. Maksimālais atļautais failu izmārs :size.',
-    'filetypes_size_help'   => 'Maksimālais atļautais failu izmērs :size.',
-    'image_filetypes_help'  => 'Accepted filetypes are jpg, webp, png, gif, svg, and avif. Max upload size allowed is :size.',
-    'unaccepted_image_type'  => 'This image file was not readable. Accepted filetypes are jpg, webp, png, gif, and svg. The mimetype of this file is: :mimetype.',
+    'filetypes_accepted_help'    => 'Accepted filetype is :types. The maximum size allowed is :size.|Accepted filetypes are :types. The maximum upload size allowed is :size.',
+    'filetypes_size_help'   => 'The maximum upload size allowed is :size.',
+    'image_filetypes_help'  => 'Accepted Filetypes are jpg, webp, png, gif, svg, and avif. The maximum upload size allowed is :size.',
+    'unaccepted_image_type'  => 'Šis attēls nebija izmantojams. Atļautie failu tipi ir: jpg, webp, png, gif, and svg. Šī faila tips ir :mimetype.',
     'import'         	    => 'Importēt',
-    'import_this_file'      => 'Map fields and process this file',
-    'importing'         	=> 'Importing',
-    'importing_help'        => 'You can import assets, accessories, licenses, components, consumables, and users via CSV file. <br><br>The CSV should be comma-delimited and formatted with headers that match the ones in the <a href="https://snipe-it.readme.io/docs/importing" target="_new">sample CSVs in the documentation</a>.',
+    'import_this_file'      => 'Kartējiet laukus un apstrādājiet šo failu',
+    'importing'         	=> 'Notiek ielāde',
+    'importing_help'        => 'Jūs ar CSV failu varat ielādēt inventāru, piederumus, licences, sastāvdaļas, izlietojamus materiālus un lietotājus. <br><br>CSV failam jālieto atdalītājs - komats un jābūt formētam ar datiem galvenē, kas atbilst prasībām <a href="https://snipe-it.readme.io/docs/importing" target="_new">kas norādīta CSV dokumentācijā</a>.',
     'import-history'        => 'Importa vēsture',
     'asset_maintenance'        => 'Aktīvu uzturēšana',
     'asset_maintenance_report' => 'Aktīvu uzturēšanas pārskats',
     'asset_maintenances'       => 'Aktīvu uzturēšana',
     'item'  				=> 'Vienums',
-    'item_name'             => 'Item Name',
-    'import_file'  			=> 'import CSV file',
-    'import_type'  			=> 'CSV import type',
+    'item_name'             => 'Lietas Nosaukums',
+    'import_file'  			=> 'ielādēt CSV failu',
+    'import_type'  			=> 'CSV ielādes tips',
     'insufficient_permissions' => 'Nepietiekamas atļaujas!',
-    'kits'       			=> 'Predefined Kits',
+    'kits'       			=> 'Iepriekšnoteikti komplekti',
     'language'				=> 'Valoda',
     'last'					=> 'Pēdējais',
     'last_login'            => 'Pēdējais pieteikšanās',
     'last_name'             => 'Uzvārds',
+    'firstname_lastname_display'	=> 'Vārds Uzvārds (Liene Ozoliņa)',
+    'lastname_firstname_display'	=> 'Uzvārds Vārds (Ozoliņa Liene)',
+    'name_display_format'	=> 'Vārda Attēlošanas Formāts',
+    'first'					=> 'Vispirms',
+    'first_name'			=> 'Vārds',
     'license'				=> 'Licence',
     'license_report'        => 'Licences atskaite',
-    'licenses_available'	=> 'Licenses available',
+    'licenses_available'	=> 'Pieejamās licences',
     'licenses'				=> 'Licences',
     'list_all'				=> 'Saraksts viss',
-    'loading'				=> 'Loading... please wait....',
-    'lock_passwords'        => 'This field value will not be saved in a demo installation.',
+    'loading'				=> 'Loading... please wait...',
+    'lock_passwords'        => 'Šī lauka vērtība netiks saglabāta parauga instalācijā.',
     'feature_disabled'      => 'Demonstrācijas instalēšanai šī funkcija ir atspējota.',
     'location'              => 'Atrašanās vieta',
-    'location_plural'        => 'Location|Locations',
+    'location_plural'        => 'Atrašanās vieta|Atrašanās vietas',
     'locations'				=> 'Atrašanās vietas',
-    'logo_size'				=> 'Square logos look best with Logo + Text. Logo maximum display size is 50px high x 500px wide.  ',
+    'logo_size'				=> 'Kvadrāta logotips vislabāk izskatās ar "Logotips + Teksts" ar maksimālo izmēru 50px augsts x 500px plats.  ',
     'logout'				=> 'Izlogoties',
     'lookup_by_tag'     => 'Meklēt pēc Asset Tag',
     'maintenances'          => 'Apkope',
-    'manage_api_keys'       => 'Manage API Keys',
+    'manage_api_keys'       => 'Manage API keys',
     'manufacturer'			=> 'Ražotājs',
     'manufacturers'			=> 'Ražotāji',
     'markdown'				=> 'Šajā laukā ir iespējota <a href="https://help.github.com/articles/github-flavored-markdown/">Github aromatizēta atzīme</a>.',
     'min_amt'				=> 'Min. QTY',
-    'min_amt_help'          => 'Minimum number of items that should be available before an alert gets triggered. Leave Min. QTY blank if you do not want to receive alerts for low inventory.',
+    'min_amt_help'          => 'Mazākais lietu daudzums, kam vienmēr jābūt pieejamam pirms nostrādā brīdinājums. Atstājiet "Maz.daudz." tukšu, ja Jūs negribat saņemt brīdinājumus par zemu inventāra līmeni.',
     'model_no'				=> 'Modelis Nr.',
     'months'				=> 'mēneši',
     'moreinfo'				=> 'Vairāk informācijas',
@@ -206,17 +203,25 @@ return [
     'new_password'          => 'Jauna parole',
     'next'					=> 'Nākamais',
     'next_audit_date'		=> 'Nākamā audita datums',
-    'next_audit_date_help'  => 'If you use auditing in your organization, this is usually automatically calculated based on the asset&apos;s last audit date and audit frequency (in <code>Admin Settings &gt; Alerts</code>) and you can leave this blank. You can manually set this date here if you need to, but it must be later than the last audit date. ',
-    'audit_images_help'     => 'You can find audit images in the asset\'s history tab.',
-    'no_email'              => 'No email address associated with this user',
+    'next_audit_date_help'  => 'Ja Jūs organizācijā veicat auditu, tas tiek automātiski aprēķināts balstoties uz inventāra&apos; pēdējā audita datumu un audita biežumu (<code>Admin iestatījumi &gt; Paziņojumi</code>) un to šo atstāt tukšu. Jūs varat iestatīt šeit datumu, ja tas ir nepieciešams, bet tam jābūt pēc pēdējā audita datuma. ',
+    'audit_images_help'     => 'Jūs varat atrast audita attēlus inventāra Vēstures cilnē.',
+    'no_email'              => 'Šim lietotājam nav norādīta epasta adrese',
     'last_audit'		    => 'Pēdējais audits',
     'new'					=> 'jauns!',
     'no_depreciation'		=> 'Nav nolietojuma',
     'no_results'			=> 'Nav rezultātu.',
     'no'  					=> 'Nē',
     'notes'  				=> 'Piezīmes',
+    'note_added'            => 'Note Added',
+    'options'				=> 'Options',
+    'preview'				=> 'Preview',
+    'add_note'              => 'Add Note',
+    'note_edited'            => 'Note Edited',
+    'edit_note'              => 'Edit Note',
+    'note_deleted'            => 'Note Deleted',
+    'delete_note'              => 'Delete Note',
     'order_number'          => 'Pasūtījuma numurs',
-    'only_deleted'          => 'Only Deleted Assets',
+    'only_deleted'          => 'Tikai Dzēsts Inventārs',
     'page_menu'				=> 'Rāda _MENU_ vienumus',
     'pagination_info'		=> 'Rāda _START_ līdz _END_ no _TOTAL_ vienumiem',
     'pending'				=> 'Gaida',
@@ -229,9 +234,9 @@ return [
     'purchase_date'         => 'Pirkuma datums',
     'qty'		            => 'QTY',
     'quantity'		        => 'Daudzums',
-    'quantity_minimum'      => 'You have :count items below or almost below minimum quantity levels',
-    'quickscan_checkin'  	=> 'Quick Scan Checkin',
-    'quickscan_checkin_status'  	=> 'Checkin Status',
+    'quantity_minimum'      => 'You have one item below or almost below minimum quantity levels|You have :count items below or almost below minimum quantity levels',
+    'quickscan_checkin'  	=> 'Ātrā Skenēšana un Pieņemšana',
+    'quickscan_checkin_status'  	=> 'Reģistrēšanās Statuss',
     'ready_to_deploy'		=> 'Gatavs izvietot',
     'recent_activity'		=> 'Pēdējās aktivitātes',
     'remaining'             => 'Atlikušais',
@@ -239,22 +244,22 @@ return [
     'reports'				=> 'Ziņojumi',
     'restored'				=> 'atjaunots',
     'restore'				=> 'Atjaunot',
-    'requestable_models'    => 'Requestable Models',
-    'requestable_items'     => 'Requestable Items',
+    'requestable_models'    => 'Pieprasāmie modeļi',
+    'requestable_items'     => 'Pieprasāmās lietas',
     'requested'				=> 'Pieprasīts',
-    'requested_date'        => 'Requested Date',
-    'requested_assets'      => 'Requested Assets',
-    'requested_assets_menu' => 'Requested Assets',
+    'requested_date'        => 'Pieprasīšanas datums',
+    'requested_assets'      => 'Pieprasītais inventārs',
+    'requested_assets_menu' => 'Pieprasītais inventārs',
     'request_canceled'      => 'Pieprasījums atcelts',
-    'request_item'          => 'Request this item',
-    'external_link_tooltip' => 'External link to',
+    'request_item'          => 'Pieprasīt šo lietu',
+    'external_link_tooltip' => 'Ārējā saite',
     'save'  				=> 'Saglabājiet',
-    'select_var'            => 'Select :thing... ', // this will eventually replace all of our other selects
+    'select_var'            => 'Izvēlēties :thing... ', // this will eventually replace all of our other selects
     'select'				=> 'Izvēlieties',
-    'select_all'            => 'Select All',
+    'select_all'            => 'Atlasīt Visu',
     'search'				=> 'Meklēt',
     'select_category'       => 'Izvēlies kategoriju',
-    'select_datasource' => 'Select a Datasource',
+    'select_datasource' => 'Select a data source',
     'select_department'     => 'Izvēlieties nodaļu',
     'select_depreciation'	=> 'Atlasiet nolietojuma veidu',
     'select_location'		=> 'Izvēlieties atrašanās vietu',
@@ -271,21 +276,23 @@ return [
     'show_current'  		=> 'Rādīt pašreizējo',
     'sign_in'				=> 'Ielogoties',
     'signature'             => 'Paraksts',
-    'signed_off_by'         => 'Signed Off By',
+    'signed_off_by'         => 'Izsniedza',
     'skin'       			=> 'Dizains',
-    'webhook_msg_note'        => 'A notification will be sent via webhook',
-    'webhook_test_msg'        => 'Oh hai! Looks like your :app integration with Snipe-IT is working!',
+    'webhook_msg_note'        => 'Paziņojums tiks nosūtīts ar webhook',
+    'webhook_test_msg'        => 'Oh hai! It looks like your :app integration with Snipe-IT is working!',
     'some_features_disabled' => 'DEMO MODE: dažas instalācijas funkcijas ir atspējotas.',
     'site_name'				=> 'Vietnes nosaukums',
     'state'  				=> 'Valsts',
     'status_labels'			=> 'Statusa etiķetes',
+    'status_label'			=> 'Status Label',
     'status'    			=> 'Statuss',
-    'accept_eula'           => 'Acceptance Agreement',
+    'accept_eula'           => 'Pieņemšanas Līgums',
+    'show_or_hide_eulas' => 'Show/Hide EULAs',
     'supplier'              => 'Piegādātājs',
     'suppliers'  			=> 'Piegādātāji',
     'sure_to_delete'        => 'Vai tiešām vēlaties dzēst',
     'sure_to_delete_var'    => 'Vai tiešām vēlaties dzēst :item?',
-    'delete_what'           => 'Delete :item',
+    'delete_what'           => 'Izdzēst :item',
     'submit'				=> 'Iesniegt',
     'target'                => 'Mērķis',
     'time_and_date_display' => 'Laika un datuma displejs',
@@ -296,164 +303,167 @@ return [
     'type'  				=> 'Tips',
     'undeployable'			=> 'Un-deployable',
     'unknown_admin'			=> 'Nezināms administrators',
-    'username_format'		=> 'Lietotājvārds formāts',
     'username'              => 'Lietotājvārds',
     'update'                => 'Atjaunināt',
-    'upload_filetypes_help'      => 'Allowed filetypes are png, gif, jpg, jpeg, doc, docx, pdf, xls, xlsx, txt, lic, xml, zip, rtf and rar. Max upload size allowed is :size.',
+    'updating_item' => 'Updating :item',
+    'upload_filetypes_help'      => 'Atļautie failu veidi ir: png, gif, jpg, jpeg, doc, docx, pdf, xls, xlsx, txt, lic, xml, zip, rtf un rar. Maks. augšupielādes izmērs ir: :size.',
     'uploaded'              => 'Augšupielādēts',
     'user'					=> 'Lietotājs',
     'accepted'			    => 'pieņemts',
     'declined'			    => 'noraidīja',
-    'declined_note'         => 'Declined Notes',
-    'unassigned'            => 'Unassigned',
+    'declined_note'         => 'Noraidītās Piezīmes',
+    'unassigned'            => 'Nepiešķirts',
     'unaccepted_asset_report' => 'Nepieņemtie aktīvi',
     'users'                 => 'Lietotāji',
-    'viewall'				=> 'View All',
+    'viewall'				=> 'Skatīt visus',
     'viewassets'  			=> 'Apskatīt piešķirtos aktīvus',
-    'viewassetsfor'         => 'View Assets for :name',
+    'viewassetsfor'         => 'Skatīt :name inventāru',
     'website'               => 'Tīmekļa vietne',
     'welcome'				=> 'Laipni lūdzam: vārds',
     'years'					=> 'gadiem',
     'yes' 					=> 'Jā',
     'zip'  					=> 'Zip',
     'noimage'				=> 'Nav augšupielādēts attēls vai attēls nav atrasts.',
-    'file_does_not_exist'   => 'The requested file does not exist on the server.',
-    'file_upload_success'   => 'File upload success!',
-    'no_files_uploaded'     => 'File upload success!',
+    'file_does_not_exist'   => 'Prasītais fails neatrodas uz šī servera.',
+    'file_upload_success'   => 'Faila augšupielāde veiksmīga!',
+    'no_files_uploaded'     => 'Faila augšupielāde veiksmīga!',
     'token_expired'         => 'Jūsu veidlapas sesija ir beidzies. Lūdzu mēģiniet vēlreiz.',
-    'login_enabled'         => 'Login Enabled',
-    'audit_due'             => 'Due for Audit',
-    'audit_due_days'        => 'Assets Due for Audit Within :days Day|Assets Due for Audit Within :days Days',
-    'checkin_due'           => 'Due for Checkin',
-    'checkin_overdue'       => 'Overdue for Checkin',
-    'checkin_due_days'      => 'Assets Due for Checkin Within :days Day|Assets Due for Checkin Within :days Days',
-    'audit_overdue'         => 'Overdue for Audit',
-    'accept'                => 'Accept :asset',
-    'i_accept'              => 'I accept',
-    'i_decline'             => 'I decline',
-    'accept_decline'        => 'Accept/Decline',
-    'sign_tos'              => 'Sign below to indicate that you agree to the terms of service:',
-    'clear_signature'       => 'Clear Signature',
-    'show_help'             => 'Show help',
-    'hide_help'             => 'Hide help',
-    'view_all'              => 'view all',
-    'hide_deleted'          => 'Hide Deleted',
+    'login_enabled'         => 'Pieteikšanās Iespējota',
+    'audit_due'             => 'Gaida Auditu',
+    'audit_due_days'        => '{}Assets Due or Overdue for Audit|[1]Assets Due or Overdue for Audit Within a Day|[2,*]Assets Due or Overdue for Audit Within :days Days',
+    'checkin_due'           => 'Jāpieņem',
+    'checkin_overdue'       => 'Aizkavējusies Pieņemšana',
+    'checkin_due_days'      => '{}Due for Checkin|[1]Assets Due for Checkin Within :days Day|[2,*]Assets Due for Checkin Within :days Days',
+    'audit_overdue'         => 'Aizkavējies Audits',
+    'accept'                => 'Apstiprināt :asset',
+    'i_accept'              => 'Es pieņemu',
+    'i_decline'             => 'Es noraidu',
+    'accept_decline'        => 'Pieņemt/Noraidīt',
+    'sign_tos'              => 'Parakstieties apakšā, lai apstiprinātu, ka pieņemat pakalpojuma nosacījumus:',
+    'clear_signature'       => 'Dzēst Parakstu',
+    'show_help'             => 'Parādīt palīdzību',
+    'hide_help'             => 'Paslēpt palīdzību',
+    'view_all'              => 'skatīt visu',
+    'hide_deleted'          => 'Slēpt Dzēstos',
     'email'                 => 'E-pasts',
-    'do_not_change'         => 'Do Not Change',
-    'bug_report'            => 'Report a Bug',
-    'user_manual'           => 'User\'s Manual',
-    'setup_step_1'          => 'Step 1',
-    'setup_step_2'          => 'Step 2',
-    'setup_step_3'          => 'Step 3',
-    'setup_step_4'          => 'Step 4',
-    'setup_config_check'    => 'Configuration Check',
-    'setup_create_database' => 'Create Database Tables',
-    'setup_create_admin'    => 'Create Admin User',
-    'setup_done'            => 'Finished!',
-    'bulk_edit_about_to'    => 'You are about to edit the following: ',
+    'do_not_change'         => 'Do not change',
+    'bug_report'            => 'Report a bug',
+    'user_manual'           => 'Lietotāja rokasgrāmata',
+    'setup_step_1'          => '1. Solis',
+    'setup_step_2'          => '2. Solis',
+    'setup_step_3'          => '3. Solis',
+    'setup_step_4'          => '4. Solis',
+    'setup_config_check'    => 'Konfigurācijas pārbaude',
+    'setup_create_database' => 'Create database tables',
+    'setup_create_admin'    => 'Create an admin user',
+    'setup_done'            => 'Gatavs!',
+    'bulk_edit_about_to'    => 'Jūs tūlīt rediģēsiet sekojošo: ',
     'checked_out'           => 'Izrakstīts',
-    'checked_out_to'        => 'Checked out to',
-    'fields'                => 'Fields',
-    'last_checkout'         => 'Last Checkout',
-    'due_to_checkin'        => 'The following :count items are due to be checked in soon:',
-    'expected_checkin'      => 'Expected Checkin',
-    'reminder_checked_out_items' => 'This is a reminder of the items currently checked out to you. If you feel this list is inaccurate (something is missing, or something appears here that you believe you never received), please email :reply_to_name at :reply_to_address.',
-    'changed'               => 'Changed',
-    'to'                    => 'To',
-    'report_fields_info'    => '<p>Select the fields you would like to include in your custom report, and click Generate. The file (custom-asset-report-YYYY-mm-dd.csv) will download automatically, and you can open it in Excel.</p>
-            <p>If you would like to export only certain assets, use the options below to fine-tune your results.</p>',
-    'range'                 => 'Range',
-    'bom_remark'            => 'Add a BOM (byte-order mark) to this CSV',
-    'improvements'          => 'Improvements',
-    'information'           => 'Information',
-    'permissions'           => 'Permissions',
-    'managed_ldap'          => '(Managed via LDAP)',
-    'export'                => 'Export',
-    'ldap_sync'             => 'LDAP Sync',
-    'ldap_user_sync'        => 'LDAP User Sync',
-    'synchronize'           => 'Synchronize',
-    'sync_results'          => 'Synchronization Results',
-    'license_serial'        => 'Serial/Product Key',
-    'invalid_category'      => 'Invalid or missing category',
-    'invalid_item_category_single' => 'Invalid or missing :type category. Please update the category of this :type to include a valid category before checking out.',
-    'dashboard_info'        => 'This is your dashboard. There are many like it, but this one is yours.',
-    '60_percent_warning'    => '60% Complete (warning)',
-    'dashboard_empty'       => 'It looks like you have not added anything yet, so we do not have anything awesome to display. Get started by adding some assets, accessories, consumables, or licenses now!',
-    'new_asset'             => 'New Asset',
-    'new_license'           => 'New License',
-    'new_accessory'         => 'New Accessory',
-    'new_consumable'        => 'New Consumable',
-    'collapse'              => 'Collapse',
+    'checked_out_to'        => 'Izsniegta',
+    'fields'                => 'Lauki',
+    'last_checkout'         => 'Pēdējā Izsniegšana',
+    'due_to_checkin'        => 'Sekojošās :count lietas drīz tiks izsniegtas:',
+    'expected_checkin'      => 'Paredzamais reģistrēšanas datums',
+    'reminder_checked_out_items' => 'Šis ir atgādinājums par lietām, kas šobrīd Jums ir izsniegtas. Ja Jums liekas, ka sarakstā ir kļūda (kaut kas trūkst vai attēlots kaut kas, kas Jums nav izsniegts), lūdzu atsūtiet :reply_to_name epastu uz :reply_to_address.',
+    'changed'               => 'Izmainīts',
+    'to'                    => 'Kam',
+    'report_fields_info'    => '<p>Izvēlieties laukus, kurus vēlaties iekļaut Jūsu pielāgotā atskaitē un nospiediet "Izveidot".  Fails (pielāgoto-aktīvu-pārskats-YYYY-mm-dd.csv) automātiski lejupielādēsies un Jūs to varat atvērt Excel.</p>
+            <p>Ja Jūs vēlaties eksportēt tikai dažas lietas, izmantojiet iespējas zemāk pielāgot Jūsu atskaites rezultātus.</p>',
+    'range'                 => 'Diapazons',
+    'bom_remark'            => 'Pievienot BOM (baitu secības zīmi) šim CSV',
+    'improvements'          => 'Uzlabojumi',
+    'information'           => 'Informācija',
+    'permissions'           => 'Atļaujas',
+    'managed_ldap'          => '(Pārvalda ar LDAP)',
+    'export'                => 'Eksports',
+    'ldap_sync'             => 'LDAP Sinhronizācija',
+    'ldap_user_sync'        => 'LDAP Lietotāju Sinhr',
+    'synchronize'           => 'Sinhronizēt',
+    'sync_results'          => 'Sinhronizēšanas rezultāti',
+    'license_serial'        => 'Kārtas Nr./ Produkta atslēga',
+    'invalid_category'      => 'Nepareiza vai trūkstoša kategorija',
+    'invalid_item_category_single' => 'Nepareiza vai trūkstoša :type kategorija. Lūdzu atjaunojiet šī veida :type kategoriju, lai iekļautu pareizo kategoriju pirms izsniegšanas.',
+    'dashboard_info'        => 'Šis ir Jūsu panelis. Ir daudz līdzīgu, bet šis ir Jūsu.',
+    '60_percent_warning'    => '60% Pabeigts (brīdinājums)',
+    'dashboard_empty'       => 'Šķiet, ka vēl neesat neko pievienojuši, tāpēc mums nav nekā lieliska ko attēlot. Sāciet ar inventāru, piederumiem, palīgmateriāliem vai licencēm tagad!',
+    'new_asset'             => 'Jauns inventārs',
+    'new_license'           => 'Jauna licence',
+    'new_accessory'         => 'Jauns piederums',
+    'new_consumable'        => 'Jauns palīgmateriāls',
+    'new_component'         => 'New Component',
+    'new_user'              => 'New User',
+    'collapse'              => 'Sakļaut',
     'assigned'              => 'Izsniegts',
-    'asset_count'           => 'Asset Count',
-    'accessories_count'     => 'Accessories Count',
-    'consumables_count'     => 'Consumables Count',
-    'components_count'      => 'Components Count',
-    'licenses_count'        => 'Licenses Count',
+    'asset_count'           => 'Inventāra skaits',
+    'accessories_count'     => 'Piederumu skaits',
+    'consumables_count'     => 'Palīgmateriālu skaits',
+    'components_count'      => 'Sastāvdaļu skaits',
+    'licenses_count'        => 'Licenču skaits',
     'notification_error'    => 'Kļūda',
-    'notification_error_hint' => 'Please check the form below for errors',
-    'notification_bulk_error_hint' => 'The following fields had validation errors and were not edited:',
-    'notification_success'  => 'Success',
+    'notification_error_hint' => 'Lūdzu pārbaudiet vai ir kļūdas zemāk esošajā formā',
+    'notification_bulk_error_hint' => 'Šiem laukiem bija pārbaudes kļūdas un tie netika rediģēti:',
+    'notification_success'  => 'Izdevās',
     'notification_warning'   => 'Brīdinājums',
     'notification_info'      => 'Info',
-    'asset_information'     => 'Asset Information',
-    'model_name'            => 'Model Name',
+    'asset_information'     => 'Inventāra informācija',
+    'model_name'            => 'Modeļa nosaukums',
     'asset_name'            => 'Aktīva nosaukums',
-    'consumable_information' => 'Consumable Information:',
+    'consumable_information' => 'Palīgmateriāla informācija:',
     'consumable_name'       => 'Paturējamais nosaukums:',
-    'accessory_information' => 'Accessory Information:',
+    'accessory_information' => 'Piederuma informācija:',
     'accessory_name'       => 'Piederumu nosaukums:',
-    'clone_item'            => 'Clone Item',
-    'checkout_tooltip' => 'Check this item out',
-    'checkin_tooltip' => 'Check this item in so that it is available for re-issue, re-imaging, etc',
-    'checkout_user_tooltip' => 'Check this item out to a user',
-    'checkin_to_diff_location' => 'You can choose to check this asset in to a location other than this asset\'s default location of :default_location if one is set',
-    'maintenance_mode'      => 'The service is temporarily unavailable for system updates. Please check back later.',
-    'maintenance_mode_title' => 'System Temporarily Unavailable',
-    'ldap_import'           => 'User password should not be managed by LDAP. (This allows you to send forgotten password requests.)',
-    'purge_not_allowed'     => 'Purging deleted data has been disabled in the .env file. Contact support or your systems administrator.',
-    'backup_delete_not_allowed'     => 'Deleting backups has been disabled in the .env file. Contact support or your systems administrator.',
-    'additional_files'           => 'Additional Files',
-    'shitty_browser'        => 'No signature detected. If you are using an older browser, please use a more modern browser to complete your asset acceptance.',
-    'bulk_soft_delete'      =>'Also soft-delete these users. Their asset history will remain intact unless/until you purge deleted records in the Admin Settings.',
-    'bulk_checkin_delete_success' => 'Your selected users have been deleted and their items have been checked in.',
-    'bulk_checkin_success' => 'The items for the selected users have been checked in.',
-    'set_to_null'           => 'Delete values for this asset|Delete values for all :asset_count assets ',
-    'set_users_field_to_null'  => 'Delete :field values for this user|Delete :field values for all :user_count users ',
-    'na_no_purchase_date'   => 'N/A - No purchase date provided',
-    'assets_by_status'      => 'Assets by Status',
-    'assets_by_status_type'      => 'Assets by Status Type',
-    'pie_chart_type'        => 'Dashboard Pie Chart Type',
-    'hello_name'            => 'Hello, :name!',
-    'unaccepted_profile_warning'   => 'You have :count items requiring acceptance. Click here to accept or decline them',
-    'start_date'            => 'Start Date',
-    'end_date'            => 'End Date',
-    'alt_uploaded_image_thumbnail' => 'Uploaded thumbnail',
-    'placeholder_kit'       => 'Select a kit',
-    'file_not_found'        => 'File not found',
-    'preview_not_available' => '(no preview)',
-    'setup'                 => 'Setup',
-    'pre_flight'            => 'Pre-Flight',
-    'skip_to_main_content'  => 'Skip to main content',
-    'toggle_navigation'     => 'Toggle navigation',
-    'alerts'                => 'Alerts',
-    'tasks_view_all'        => 'View all tasks',
-    'true'                  => 'True',
-    'false'                 => 'False',
-    'integration_option'    => 'Integration Option',
-    'log_does_not_exist'    => 'No matching log record exists.',
-    'merge_users'           => 'Merge Users',
-    'merge_information' =>  'This will merge the :count users into a single user. Select the user you wish to merge the others into below, and the associated assets, licenses, etc will be moved over to the selected user and the other users will be marked as deleted.',
-    'warning_merge_information' => 'This action CANNOT be undone and should ONLY be used when you need to merge users because of a bad import or sync. Be sure to run a backup first.',
-    'no_users_selected'     => 'No users selected',
-    'not_enough_users_selected'     => 'At least :count users must be selected',
-    'merge_success'         => ':count users merged successfully into :into_username!',
-    'merged'                => 'merged',
-    'merged_log_this_user_into' => 'Merged this user (ID :to_id - :to_username) into user ID :from_id (:from_username) ',
-    'merged_log_this_user_from' => 'Merged user ID :from_id (:from_username) into this user (ID :to_id - :to_username)',
-    'clear_and_save'            => 'Clear & Save',
-    'update_existing_values'    => 'Update Existing Values?',
-    'auto_incrementing_asset_tags_disabled_so_tags_required' => 'Generating auto-incrementing asset tags is disabled so all rows need to have the "Asset Tag" column populated.',
+    'clone_item'            => 'Klonēt ierakstu',
+    'checkout_tooltip' => 'Izsniegt šo inventāru',
+    'checkin_tooltip' => 'Pieņemiet šo inventāru, lai tas ir pieejams atkārtotai izsniegšanai, pārklonēšanai, utt',
+    'checkout_user_tooltip' => 'Izsniegt inventāru lietotājam',
+    'checkin_to_diff_location' => 'Jūs varat izvēlēties reģistrēt inventāru citā atrašanās vietā nekā tās noklusēta atrašanās vieta ::default_location ja tāda ir iestatīta.',
+    'maintenance_mode'      => 'Šim servisam pagaidām nav pieejami sistēmas atjauninājumi. Lūdzu pārbaudiet vēlāk.',
+    'maintenance_mode_title' => 'Sistēma pagaidām nav pieejama',
+    'ldap_import'           => 'Lietotāja paroli nevajadzētu pārvaldīt LDAP. (Tas ļauj pieprasījumos izmantot novecojušas paroles)',
+    'purge_not_allowed'     => 'Dzēstu datu iznīcināšana ir atspējota .env failā. Sazinieties ar Jūsu sistēmas administratoru.',
+    'backup_delete_not_allowed'     => 'Rezerves kopiju dzēšana ir atspējota .env failā. Sazinieties ar Jūsu sistēmas administratoru.',
+    'additional_files'           => 'Papildus faili',
+    'shitty_browser'        => 'Paraksts nav pieņemts. Ja Jūs lietojat vecāku pārlūkprogrammu, lūdzu lietojiet modernu pārlūkprogrammu, lai pabeigtu inventāra pieņemšanu.',
+    'bulk_soft_delete'      =>'Arī gandrīz-dzēsiet šos lietotājus. Viņu inventāra vēsture būs neskarta līdz Jūs iztīrīsiet dzēstos ierakstus Admin Iestatījumos.',
+    'bulk_checkin_delete_success' => 'Jūsu atlasītie lietotāji ir dzēsti un ar tiem saistītais inventārs statusā Pieņemts.',
+    'bulk_checkin_success' => 'Inventārs atlasītajiem lietotājiem ir ar statusu Pieņemts.',
+    'set_to_null'           => 'Delete values for this selection|Delete values for all :selection_count selections ',
+    'set_users_field_to_null'  => 'Dzēst lietotāja :field vērtības|Dzēst :field vērtīibas visiem :user_count lietotājiem ',
+    'na_no_purchase_date'   => 'N/A - Iegādes datums nav norādīts',
+    'assets_by_status'      => 'Inventārs pēc Statusa',
+    'assets_by_status_type'      => 'Inventārs pēc Statusa veida',
+    'pie_chart_type'        => 'Pīrāga diagrammas panelis',
+    'hello_name'            => 'Sveiki, :name!',
+    'unaccepted_profile_warning'   => 'You have one item requiring acceptance. Click here to accept or decline it | You have :count items requiring acceptance. Click here to accept or decline them',
+    'start_date'            => 'Sākuma datums',
+    'end_date'            => 'Beigu datums',
+    'alt_uploaded_image_thumbnail' => 'Augšuplādēt sīktēlu',
+    'placeholder_kit'       => 'Izvēlēties komplektu',
+    'file_not_found'        => 'Fails nav atrasts',
+    'log_record_not_found'  => 'No record for that log entry was found.',
+    'preview_not_available' => '(nav priekšskatījuma)',
+    'setup'                 => 'Iestatīt',
+    'pre_flight'            => 'Pirmspārbaude',
+    'skip_to_main_content'  => 'Doties uz galveno saturu',
+    'toggle_navigation'     => 'Pārslēgt navigāciju',
+    'alerts'                => 'Brīdinājumi',
+    'tasks_view_all'        => 'Skatīt visus uzdevumus',
+    'true'                  => 'Patiesi',
+    'false'                 => 'Nepatiesi',
+    'integration_option'    => 'Integrācijas iespējas',
+    'log_does_not_exist'    => 'Nav neviena atbilstoša ieraksta.',
+    'merge_users'           => 'Sapludināt lietotājus',
+    'merge_information' =>  'Šis sapludinās :count lietotājus vienā lietotājā. Izvēlieties lietotāju, kurā vēlaties iekļaut zemāk esošos lietotājus. Ar tiem saistīto inventāru, licences, u.c. tiks pārcelts uz izvēlēto lietotāju, bet pārējie lietotāji tiks atzīmēti kā dzēsti.',
+    'warning_merge_information' => 'Šo darbību NEVAR atsaukt un to vajadzētu lietot TIKAI lietotāju sapludināšanai sliktas sinhronizācijas vai importa dēļ. Vispirms izveidojiet rezerves kopiju.',
+    'no_users_selected'     => 'Nav izvēlēts neviens lietotājs',
+    'not_enough_users_selected'     => 'Vismaz :count lietotājiem jābūt izvēlētiem',
+    'merge_success'         => ':count lietotāji veiksmīgi sapludināti lietotājā :into_username!',
+    'merged'                => 'sapludināts',
+    'merged_log_this_user_into' => 'Sapludināts lietotājs (ID :to_id - :to_username) iekļaujot to lietotājā ID :from_id (:from_username) ',
+    'merged_log_this_user_from' => 'Sapludināts lietotāja ID :from_id (:from_username) iekļaujot šajā lietotājā (ID :to_id - :to_username)',
+    'clear_and_save'            => 'Notīrīt un Saglabāt',
+    'update_existing_values'    => 'Vai atjaunot esošās vērtības?',
+    'auto_incrementing_asset_tags_disabled_so_tags_required' => 'Auto-pieaugošu inventāra zīmes ģenerēšana ir atspējota lai visām rindām tiktu aizpildīta kolonna "Inventāra Nr.".',
     'auto_incrementing_asset_tags_enabled_so_now_assets_will_be_created' => 'Note: Generating auto-incrementing asset tags is enabled so assets will be created for rows that do not have "Asset Tag" populated. Rows that do have "Asset Tag" populated will be updated with the provided information.',
     'send_welcome_email_to_users'   => ' Send Welcome Email for new Users?',
     'send_email'                => 'Send Email',
@@ -477,27 +487,27 @@ return [
     'autoassign_licenses_help' => 'Allow this user to have licenses assigned via the bulk-assign license UI or cli tools.',
     'autoassign_licenses_help_long' => 'This allows a user to be have licenses assigned via the bulk-assign license UI or cli tools. (For example, you might not want contractors to be auto-assigned a license you would provide to only staff members. You can still individually assign licenses to those users, but they will not be included in the Checkout License to All Users functions.)',
     'no_autoassign_licenses_help' => 'Do not include user for bulk-assigning through the license UI or cli tools.',
-    'modal_confirm_generic'      => 'Are you sure?',
-    'cannot_be_deleted'      => 'This item cannot be deleted',
-    'cannot_be_edited'      => 'This item cannot be edited.',
-    'undeployable_tooltip'      => 'This item cannot be checked out. Check the quantity remaining.',
-    'serial_number'        => 'Serial Number',
-    'item_notes' => ':item Notes',
-    'item_name_var' => ':item Name',
-    'error_user_company' => 'Checkout target company and asset company do not match',
-    'error_user_company_accept_view' => 'An Asset assigned to you belongs to a different company so you can\'t accept nor deny it, please check with your manager',
+    'modal_confirm_generic'      => 'Vai Jūs esat pārliecināts?',
+    'cannot_be_deleted'      => 'Šo ierakstu nevar dzēst',
+    'cannot_be_edited'      => 'Šo ierakstu nevar dzēst.',
+    'undeployable_tooltip'      => 'Šo inventāru nevar izsniegt. Pārbaudiet atlikumu.',
+    'serial_number'        => 'Kārtas Nr.',
+    'item_notes' => ':item Piezīmes',
+    'item_name_var' => ':item Vārds',
+    'error_user_company' => 'Izsniegšanas uzņēmums un inventāra uzņēmums nesakrīt',
+    'error_user_company_accept_view' => 'Jums izsniegtais inventārs pieder citam uzņēmumam tapēc Jūs nevarat to pieņemt vai atteikties. Lūdzu sazinieties ar savu vadītāju',
     'importer' => [
-        'checked_out_to_fullname' => 'Checked Out to: Full Name',
-        'checked_out_to_first_name' => 'Checked Out to: First Name',
-        'checked_out_to_last_name' => 'Checked Out to: Last Name',
-        'checked_out_to_username' => 'Checked Out to: Username',
-        'checked_out_to_email' => 'Checked Out to: Email',
-        'checked_out_to_tag' => 'Checked Out to: Asset Tag',
-        'manager_first_name' => 'Manager First Name',
-        'manager_last_name' => 'Manager Last Name',
-        'manager_full_name' => 'Manager Full Name',
-        'manager_username' => 'Manager Username',
-        'checkout_type' => 'Checkout Type',
+        'checked_out_to_fullname' => 'Izsniegts: Vārds Uzvārds',
+        'checked_out_to_first_name' => 'Izsniegts: Vārds',
+        'checked_out_to_last_name' => 'Izsniegts: Uzvārds',
+        'checked_out_to_username' => 'Izsniegts: lietotāja vārds',
+        'checked_out_to_email' => 'Izsniegts: epasts',
+        'checked_out_to_tag' => 'Izsniegts: Inventāra Nr.',
+        'manager_first_name' => 'Vadītāja Vārds',
+        'manager_last_name' => 'Vadītāja Uzvārds',
+        'manager_full_name' => 'Vadītāja Vārds Uzvārds',
+        'manager_username' => 'Vadītāja Lietotājs',
+        'checkout_type' => 'Izsniegšanas veids',
         'checkout_location' => 'Checkout to Location',
         'image_filename' => 'Image Filename',
         'do_not_import'     => 'Do Not Import',
@@ -512,7 +522,7 @@ return [
     'checked_out_to_fields' => 'Checked Out To Fields',
     'percent_complete' => '% pabeigt',
     'uploading' => 'Uploading... ',
-    'upload_error' => 'Error uploading file. Please check that there are no empty rows and that no column names are duplicated.',
+    'upload_error' => 'Error uploading file. Please check that you have no empty rows or duplicated column names in your CSV, and that the server permissions allow uploads.',
     'copy_to_clipboard' => 'Copy to Clipboard',
     'copied' => 'Copied!',
     'status_compatibility' => 'If assets are already assigned, they cannot be changed to a non-deployable status type and this value change will be skipped.',
@@ -549,6 +559,71 @@ return [
         'license_seats'  => ':count License Seat|:count License Seats',
         'consumables'  => ':count Consumable|:count Consumables',
         'components'  => ':count Component|:count Components',
-    ]
+    ],
+
+    'more_info' => 'Vairāk informācijas',
+    'quickscan_bulk_help' => 'Checking this box will edit the asset record to reflect this new location. Leaving it unchecked will simply note the location in the audit log. Note that if this asset is checked out, it will not change the location of the person, asset or location it is checked out to.',
+    'whoops' => 'Whoops!',
+    'something_went_wrong' => 'Something went wrong with your request.',
+    'close' => 'Close',
+    'expires' => 'Beidzas',
+    'map_fields'=> 'Map :item_type Fields',
+    'remaining_var' => ':count Remaining',
+    'label' => 'Label',
+    'import_asset_tag_exists' => 'An asset with the asset tag :asset_tag already exists and an update was not requested. No change was made.',
+    'countries_manually_entered_help' => 'Values with an asterisk (*) were manually entered and do not match existing ISO 3166 dropdown values',
+    'accessories_assigned' => 'Assigned Accessories',
+    'user_managed_passwords' => 'Password Management',
+    'user_managed_passwords_disallow' => 'Disallow users from managing their own passwords',
+    'user_managed_passwords_allow' => 'Allow users to manage their own passwords',
+    'from' => 'From',
+    'by' => 'Līdz',
+
+// Add form placeholders here
+    'placeholders' => [
+        'notes'  => 'Add a note',
+    ],
+
+    'breadcrumb_button_actions' => [
+        'edit_item' => 'Edit :name',
+        'checkout_item' => 'Checkout :name',
+        'checkin_item' => 'Checkin :name',
+    ],
+
+    'skins' => [
+        'site_default' => 'Site Default',
+        'default_blue' => 'Default Blue',
+        'blue_dark' => 'Blue (Dark Mode)',
+        'green' => 'Green Dark',
+        'green_dark' => 'Green (Dark Mode)',
+        'red' => 'Red Dark',
+        'red_dark' => 'Red (Dark Mode)',
+        'orange' => 'Orange Dark',
+        'orange_dark' => 'Orange (Dark Mode)',
+        'black' => 'Black',
+        'black_dark' => 'Black (Dark Mode)',
+        'purple' => 'Purple',
+        'purple_dark' => 'Purple (Dark Mode)',
+        'yellow' => 'Yellow',
+        'yellow_dark' => 'Yellow (Dark Mode)',
+        'high_contrast' => 'High Contrast',
+
+    ],
+
+    'select_all_none' => 'Select/Unselect All',
+    'generic_model_not_found' => 'That :model was not found or you do not have permission to access it',
+    'deleted_models' => 'Deleted Asset Models',
+    'deleted_users' => 'Deleted Users',
+    'cost_each' => ':amount each',
+    'remove_current_image' => 'Remove current :type image',
+
+    'seeding' => [
+        'manufacturers' => [
+            'button' => 'Create Manufacturers',
+            'prompt' => 'You do not have any manufacturers yet. Would you like to seed a list of common manufacturers? (THIS WILL OVERWRITE EXISTING MANUFACTURERS, including those that have been soft-deleted.)',
+            'success' => 'Manufacturers seeded successfully',
+            'error' => 'Could not seed manufacturers. A manufacturer record already exists and seeding would overwrite it.|Could not seed manufacturers. :count manufacturer records already exist and seeding would overwrite them.',
+        ],
+    ],
 
 ];
diff --git a/resources/lang/lv-LV/localizations.php b/resources/lang/lv-LV/localizations.php
index f1232dd138..998c8f5f84 100644
--- a/resources/lang/lv-LV/localizations.php
+++ b/resources/lang/lv-LV/localizations.php
@@ -2,57 +2,59 @@
 
 return [
 
-    'select_language' => 'Select a language',
+    'select_language' => 'Select a Language',
     'languages' => [
-        'en-US'=> 'English, US',
-        'en-GB'=> 'English, UK',
-        'am-ET' => 'Amharic',
-        'af-ZA'=> 'Afrikaans',
-        'ar-SA'=> 'Arabic',
-        'bg-BG'=> 'Bulgarian',
-        'zh-CN'=> 'Chinese Simplified',
-        'zh-TW'=> 'Chinese Traditional',
-        'ca-ES' => 'Catalan',
-        'hr-HR'=> 'Croatian',
-        'cs-CZ'=> 'Czech',
-        'da-DK'=> 'Danish',
-        'nl-NL'=> 'Dutch',
-        'en-ID'=> 'English, Indonesia',
-        'et-EE'=> 'Estonian',
-        'fil-PH'=> 'Filipino',
-        'fi-FI'=> 'Finnish',
-        'fr-FR'=> 'French',
-        'de-DE'=> 'German',
-        'de-if'=> 'German (Informal)',
-        'el-GR'=> 'Greek',
-        'he-IL'=> 'Hebrew',
-        'hu-HU'=> 'Hungarian',
-        'is-IS' => 'Icelandic',
+        'en-US'=> 'Angļu, ASV',
+        'en-GB'=> 'Angļu, UK',
+        'am-ET' => 'Amharu',
+        'af-ZA'=> 'Āfrikāņu',
+        'ar-SA'=> 'Arābu',
+        'bg-BG'=> 'Bulgāru',
+        'zh-CN'=> 'Ķīniešu Vienkāršota',
+        'zh-TW'=> 'Ķīniešu Tradicionāla',
+        'ca-ES' => 'Kataloniešu',
+        'hr-HR'=> 'Horvātu',
+        'cs-CZ'=> 'Čehu',
+        'da-DK'=> 'Dāņu',
+        'nl-NL'=> 'Nīderlandiešu',
+        'en-ID'=> 'Angļu, Indonēzija',
+        'et-EE'=> 'Igauņu',
+        'fil-PH'=> 'Filipīniešu',
+        'fi-FI'=> 'Somu',
+        'fr-FR'=> 'Franču',
+        'de-DE'=> 'Vācu',
+        'de-if'=> 'Vācu (neformāls)',
+        'el-GR'=> 'Grieķu',
+        'he-IL'=> 'Ebreju',
+        'hu-HU'=> 'Ungāru',
+        'is-IS' => 'Islandiešu',
         'id-ID'=> 'Indonesian',
-        'ga-IE'=> 'Irish',
-        'it-IT'=> 'Italian',
-        'ja-JP'=> 'Japanese',
+        'ga-IE'=> 'Īru',
+        'it-IT'=> 'Itāļu',
+        'ja-JP'=> 'Japāņu',
         'km-KH'=>'Khmer',
-        'ko-KR'=> 'Korean',
-        'lt-LT'=>'Lithuanian',
-        'lv-LV'=> 'Latvian',
+        'ko-KR'=> 'Korejiešu',
+        'lt-LT'=>'Lietuviešu',
+        'lv-LV'=> 'Latviešu',
         'mk-MK'=> 'Macedonian',
         'ms-MY'=> 'Malay',
         'mi-NZ'=> 'Maori',
         'mn-MN'=> 'Mongolian',
-        'no-NO'=> 'Norwegian',
+        'nb-NO'=> 'Norwegian Bokmål',
+        'om-ET' => 'Oromo (Ethiopian)',
+        //'nn-NO'=> 'Norwegian Nynorsk',
         'fa-IR'=> 'Persian',
         'pl-PL'=> 'Polish',
         'pt-PT'=> 'Portuguese',
         'pt-BR'=> 'Portuguese, Brazilian',
         'ro-RO'=> 'Romanian',
-        'ru-RU'=> 'Russian',
-        'sr-CS' => 'Serbian (Latin)',
-        'sk-SK'=> 'Slovak',
-        'sl-SI'=> 'Slovenian',
-        'so-SO'=> 'Somali',
-        'es-ES'=> 'Spanish',
-        'es-CO'=> 'Spanish, Colombia',
+        'ru-RU'=> 'Krievu',
+        'sr-CS' => 'Serbu (Latīņu)',
+        'sk-SK'=> 'Slovāku',
+        'sl-SI'=> 'Slovēņu',
+        'so-SO'=> 'Somāļu',
+        'es-ES'=> 'Spāņu',
+        'es-CO'=> 'Spāņu, Kolubija',
         'es-MX'=> 'Spanish, Mexico',
         'es-VE'=> 'Spanish, Venezuela',
         'sv-SE'=> 'Swedish',
@@ -66,7 +68,7 @@ return [
         'zu-ZA'=> 'Zulu',
     ],
 
-    'select_country' => 'Select a country',
+    'select_country' => 'Select a Country',
     
     'countries' => [
         'AC'=>'Ascension Island',
@@ -133,6 +135,7 @@ return [
         'EC'=>'Ecuador',
         'EE'=>'Estonia',
         'EG'=>'Egypt',
+        'GB-ENG'=>'England',
         'ER'=>'Eritrea',
         'ES'=>'Spain',
         'ET'=>'Ethiopia',
@@ -231,6 +234,7 @@ return [
         'NG'=>'Nigeria',
         'NI'=>'Nicaragua',
         'NL'=>'Netherlands',
+        'GB-NIR' => 'Northern Ireland',
         'NO'=>'Norway',
         'NP'=>'Nepal',
         'NR'=>'Nauru',
@@ -258,7 +262,7 @@ return [
         'RU'=>'Russian Federation',
         'RW'=>'Rwanda',
         'SA'=>'Saudi Arabia',
-        'UK'=>'Scotland',
+        'GB-SCT'=>'Scotland',
         'SB'=>'Solomon Islands',
         'SC'=>'Seychelles',
         'SS'=>'South Sudan',
@@ -310,6 +314,7 @@ return [
         'VI'=>'Virgin Islands (U.S.)',
         'VN'=>'Viet Nam',
         'VU'=>'Vanuatu',
+        'GB-WLS' =>'Wales',
         'WF'=>'Wallis And Futuna Islands',
         'WS'=>'Samoa',
         'YE'=>'Yemen',
diff --git a/resources/lang/lv-LV/mail.php b/resources/lang/lv-LV/mail.php
index 28e30dc3ab..4e809234ce 100644
--- a/resources/lang/lv-LV/mail.php
+++ b/resources/lang/lv-LV/mail.php
@@ -23,24 +23,25 @@ return [
     'Item_Requested' => 'Pieprasīts vienums',
     'License_Checkin_Notification' => 'License checked in',
     'License_Checkout_Notification' => 'License checked out',
+    'license_for'   => 'License for',
     'Low_Inventory_Report' => 'Zema inventarizācijas atskaite',
     'a_user_canceled' => 'Lietotājs vietnē ir atcēlis objekta pieprasījumu',
     'a_user_requested' => 'Lietotājs ir pieprasījis vienumu vietnē',
     'acceptance_asset_accepted' => 'A user has accepted an item',
     'acceptance_asset_declined' => 'A user has declined an item',
-    'accessory_name' => 'Piederumu nosaukums:',
-    'additional_notes' => 'Papildu piezīmes:',
+    'accessory_name' => 'Piederuma nosaukums',
+    'additional_notes' => 'Papildu piezīmes',
     'admin_has_created' => 'Administrators ir izveidojis jums kontu: tīmekļa vietnē.',
-    'asset' => 'Aktīvs:',
-    'asset_name' => 'Aktīvu nosaukums:',
+    'asset' => 'Aktīvs',
+    'asset_name' => 'Aktīva nosaukums',
     'asset_requested' => 'Aktīvs pieprasīts',
     'asset_tag' => 'Asset Tag',
     'assets_warrantee_alert' => 'There is :count asset with a warranty expiring in the next :threshold days.|There are :count assets with warranties expiring in the next :threshold days.',
     'assigned_to' => 'Piešķirts',
     'best_regards' => 'Ar laba vēlējumiem,',
-    'canceled' => 'Atcelts:',
-    'checkin_date' => 'Reģistrēšanās datums:',
-    'checkout_date' => 'Izrakstīšanās datums:',
+    'canceled' => 'Atcelts',
+    'checkin_date' => 'Reģistrēšanās datums',
+    'checkout_date' => 'Izrakstīšanās datums',
     'checkedout_from' => 'Checked out from',
     'checkedin_from'  => 'Checked in from',
     'checked_into' => 'Checked into',
@@ -49,27 +50,30 @@ return [
     'click_to_confirm' => 'Lūdzu, noklikšķiniet uz šīs saites, lai apstiprinātu savu: tīmekļa kontu:',
     'current_QTY' => 'Pašreizējais QTY',
     'days' => 'Dienas',
-    'expecting_checkin_date' => 'Paredzamais reģistrēšanās datums:',
+    'expecting_checkin_date' => 'Paredzamais reģistrēšanās datums',
     'expires' => 'Beidzas',
     'hello' => 'Sveiki',
     'hi' => 'Sveiki',
     'i_have_read' => 'Esmu izlasījis un piekrītu lietošanas noteikumiem un saņēmu šo preci.',
     'inventory_report' => 'Inventory Report',
-    'item' => 'Vienība:',
+    'item' => 'Vienums',
+    'item_checked_reminder' => 'This is a reminder that you currently have :count items checked out to you that you have not accepted or declined. Please click the link below to confirm your decision.',
     'license_expiring_alert' => 'Pēc :threshold dienām beigsies termiņš :count licencei.| Pēc :threshold dienām beigsies termiņš :threshold :count licencēm.',
     'link_to_update_password' => 'Lūdzu, noklikšķiniet uz šīs saites, lai atjauninātu savu: web paroli:',
-    'login' => 'Pieslēgties:',
+    'login' => 'Pieslēgties',
     'login_first_admin' => 'Piesakieties savā jaunajā Snipe-IT instalācijā, izmantojot tālāk minētos akreditācijas datus.',
     'low_inventory_alert' => ':count vienības skaits ir zemāks par krājuma minimumu vai drīz būs zems.|:count vienību skaits ir zemāks par krājuma minimumu vai drīz būs zems.',
     'min_QTY' => 'Min QTY',
     'name' => 'Nosaukums',
     'new_item_checked' => 'Jauns objekts ir atzīmēts zem sava vārda, sīkāk ir sniegta zemāk.',
+    'new_item_checked_with_acceptance' => 'A new item has been checked out under your name that requires acceptance, details are below.',
+    'recent_item_checked' => 'An item was recently checked out under your name that requires acceptance, details are below.',
     'notes' => 'Piezīmes',
-    'password' => 'Parole:',
+    'password' => 'Parole',
     'password_reset' => 'Paroles atiestatīšana',
     'read_the_terms' => 'Lūdzu, izlasiet lietošanas noteikumus zemāk.',
     'read_the_terms_and_click' => 'Please read the terms of use below, and click on the link at the bottom to confirm that you read and agree to the terms of use, and have received the asset.',
-    'requested' => 'Pieprasīts:',
+    'requested' => 'Pieprasīts',
     'reset_link' => 'Jūsu paroles atiestatīšanas saite',
     'reset_password' => 'Noklikšķiniet šeit, lai atiestatītu savu paroli:',
     'rights_reserved' => 'All rights reserved.',
@@ -86,8 +90,10 @@ return [
     'upcoming-audits' => 'There is :count asset that is coming up for audit within :threshold days.|There are :count assets that are coming up for audit within :threshold days.',
     'user' => 'Lietotājs',
     'username' => 'Lietotājvārds',
+    'unaccepted_asset_reminder' => 'Reminder: You have Unaccepted Assets.',
     'welcome' => 'Sveicināti: vārds',
     'welcome_to' => 'Laipni lūdzam: tīmeklī!',
     'your_assets' => 'View Your Assets',
     'your_credentials' => 'Jūsu Snipe-IT akreditācijas dati',
+    'mail_sent' => 'Mail sent successfully!',
 ];
diff --git a/resources/lang/lv-LV/validation.php b/resources/lang/lv-LV/validation.php
index bb08c9734a..a5b61ff015 100644
--- a/resources/lang/lv-LV/validation.php
+++ b/resources/lang/lv-LV/validation.php
@@ -13,87 +13,150 @@ return [
     |
     */
 
-    'accepted'             => 'Atribūts jāpieņem.',
-    'active_url'           => 'Atribūts nav derīgs URL.',
-    'after'                => 'Atribūtam jābūt datumam pēc: datuma.',
-    'after_or_equal'       => 'Atribūtam jābūt datumam pēc datuma vai pēc tā: datums.',
-    'alpha'                => 'Atribūts var saturēt tikai burti.',
-    'alpha_dash'           => 'Atribūts var saturēt tikai burti, ciparus un domuzīmes.',
-    'alpha_num'            => 'Atribūts var saturēt tikai burti un ciparus.',
-    'array'                => 'Atribūtam jābūt masīvam.',
-    'before'               => 'Atribūtam jābūt datumam: datums.',
-    'before_or_equal'      => 'Atribūtam jābūt datumam pirms vai vienāds ar: datumu.',
-    'between'              => [
-        'numeric' => 'Atribūtam jābūt starp: min un: max.',
-        'file'    => 'Atribūtam jābūt starp: min un: max kilobaitiem.',
-        'string'  => 'Atribūtam jābūt no: min un max max rakstzīmēm.',
-        'array'   => 'Atribūtam jābūt starp: min un: max vienumiem.',
+    'accepted' => 'The :attribute field must be accepted.',
+    'accepted_if' => 'The :attribute field must be accepted when :other is :value.',
+    'active_url' => 'The :attribute field must be a valid URL.',
+    'after' => 'The :attribute field must be a date after :date.',
+    'after_or_equal' => 'The :attribute field must be a date after or equal to :date.',
+    'alpha' => 'The :attribute field must only contain letters.',
+    'alpha_dash' => 'The :attribute field must only contain letters, numbers, dashes, and underscores.',
+    'alpha_num' => 'The :attribute field must only contain letters and numbers.',
+    'array' => 'The :attribute field must be an array.',
+    'ascii' => 'The :attribute field must only contain single-byte alphanumeric characters and symbols.',
+    'before' => 'The :attribute field must be a date before :date.',
+    'before_or_equal' => 'The :attribute field must be a date before or equal to :date.',
+    'between' => [
+        'array' => 'The :attribute field must have between :min and :max items.',
+        'file' => 'The :attribute field must be between :min and :max kilobytes.',
+        'numeric' => 'The :attribute field must be between :min and :max.',
+        'string' => 'The :attribute field must be between :min and :max characters.',
     ],
-    'boolean'              => 'Atribūta laukam jābūt patiesam vai nepatiesam.',
-    'confirmed'            => 'Atribūta apstiprinājums neatbilst.',
-    'date'                 => 'Atribūts nav derīgs datums.',
-    'date_format'          => 'Atribūts neatbilst formātam: formātā.',
-    'different'            => 'Atribūts: un citam jābūt citam.',
-    'digits'               => 'Atribūtam jābūt: ciparu cipariem.',
-    'digits_between'       => 'Atribūtam jābūt starp: min un: max cipariem.',
-    'dimensions'           => 'Atribūts: nederīgie attēla izmēri.',
-    'distinct'             => 'Atribūta laukam ir dublikāta vērtība.',
-    'email'                => 'Atribūtam jābūt derīgai e-pasta adresei.',
-    'exists'               => 'Atlasītais: atribūts nav derīgs.',
-    'file'                 => 'Atribūts ir jābūt failam.',
-    'filled'               => 'Atribūta laukam jābūt vērtībai.',
-    'image'                => 'Atribūts ir jābūt attēlam.',
+    'boolean' => 'Atribūta laukam jābūt patiesam vai nepatiesam.',
+    'can' => 'The :attribute field contains an unauthorized value.',
+    'confirmed' => 'The :attribute field confirmation does not match.',
+    'contains' => 'The :attribute field is missing a required value.',
+    'current_password' => 'The password is incorrect.',
+    'date' => 'The :attribute field must be a valid date.',
+    'date_equals' => 'The :attribute field must be a date equal to :date.',
+    'date_format' => 'The :attribute field must match the format :format.',
+    'decimal' => 'The :attribute field must have :decimal decimal places.',
+    'declined' => 'The :attribute field must be declined.',
+    'declined_if' => 'The :attribute field must be declined when :other is :value.',
+    'different' => 'The :attribute field and :other must be different.',
+    'digits' => 'The :attribute field must be :digits digits.',
+    'digits_between' => 'The :attribute field must be between :min and :max digits.',
+    'dimensions' => 'The :attribute field has invalid image dimensions.',
+    'distinct' => 'Atribūta laukam ir dublikāta vērtība.',
+    'doesnt_end_with' => 'The :attribute field must not end with one of the following: :values.',
+    'doesnt_start_with' => 'The :attribute field must not start with one of the following: :values.',
+    'email' => 'The :attribute field must be a valid email address.',
+    'ends_with' => 'The :attribute field must end with one of the following: :values.',
+    'enum' => 'Atlasītais: atribūts nav derīgs.',
+    'exists' => 'Atlasītais: atribūts nav derīgs.',
+    'extensions' => 'The :attribute field must have one of the following extensions: :values.',
+    'file' => 'The :attribute field must be a file.',
+    'filled' => 'Atribūta laukam jābūt vērtībai.',
+    'gt' => [
+        'array' => 'The :attribute field must have more than :value items.',
+        'file' => 'The :attribute field must be greater than :value kilobytes.',
+        'numeric' => 'The :attribute field must be greater than :value.',
+        'string' => 'The :attribute field must be greater than :value characters.',
+    ],
+    'gte' => [
+        'array' => 'The :attribute field must have :value items or more.',
+        'file' => 'The :attribute field must be greater than or equal to :value kilobytes.',
+        'numeric' => 'The :attribute field must be greater than or equal to :value.',
+        'string' => 'The :attribute field must be greater than or equal to :value characters.',
+    ],
+    'hex_color' => 'The :attribute field must be a valid hexadecimal color.',
+    'image' => 'The :attribute field must be an image.',
     'import_field_empty'    => 'The value for :fieldname cannot be null.',
-    'in'                   => 'Atlasītais: atribūts nav derīgs.',
-    'in_array'             => 'Atribūta lauks neeksistē: citā.',
-    'integer'              => 'Atribūts ir jābūt veselam skaitlim.',
-    'ip'                   => 'Atribūtam jābūt derīgai IP adresei.',
-    'ipv4'                 => 'Atribūtam jābūt derīgai IPv4 adresei.',
-    'ipv6'                 => 'Atribūtam jābūt derīgai IPv6 adresei.',
-    'is_unique_department' => 'The :attribute must be unique to this Company Location',
-    'json'                 => 'Atribūtam jābūt derīgai JSON virknei.',
-    'max'                  => [
-        'numeric' => 'Atribūts: nedrīkst būt lielāks par: max.',
-        'file'    => 'Atribūts: nedrīkst būt lielāks par: maks. Kilobaitus.',
-        'string'  => 'Atribūts: nedrīkst būt lielāks par: max rakstzīmēm.',
-        'array'   => 'Atribūts: nedrīkst būt vairāk par: max vienumiem.',
+    'in' => 'Atlasītais: atribūts nav derīgs.',
+    'in_array' => 'The :attribute field must exist in :other.',
+    'integer' => 'The :attribute field must be an integer.',
+    'ip' => 'The :attribute field must be a valid IP address.',
+    'ipv4' => 'The :attribute field must be a valid IPv4 address.',
+    'ipv6' => 'The :attribute field must be a valid IPv6 address.',
+    'json' => 'The :attribute field must be a valid JSON string.',
+    'list' => 'The :attribute field must be a list.',
+    'lowercase' => 'The :attribute field must be lowercase.',
+    'lt' => [
+        'array' => 'The :attribute field must have less than :value items.',
+        'file' => 'The :attribute field must be less than :value kilobytes.',
+        'numeric' => 'The :attribute field must be less than :value.',
+        'string' => 'The :attribute field must be less than :value characters.',
     ],
-    'mimes'                => 'Atribūtam jābūt failam ar tipu:: values.',
-    'mimetypes'            => 'Atribūtam jābūt failam ar tipu:: values.',
-    'min'                  => [
-        'numeric' => 'Atribūtam jābūt vismaz: min.',
-        'file'    => 'Atribūtam jābūt vismaz: min kilobaitiem.',
-        'string'  => 'Atribūts: jābūt vismaz: min rakstzīmēm.',
-        'array'   => 'Atribūtam jābūt vismaz: min vienumiem.',
+    'lte' => [
+        'array' => 'The :attribute field must not have more than :value items.',
+        'file' => 'The :attribute field must be less than or equal to :value kilobytes.',
+        'numeric' => 'The :attribute field must be less than or equal to :value.',
+        'string' => 'The :attribute field must be less than or equal to :value characters.',
     ],
-    'starts_with'          => 'The :attribute must start with one of the following: :values.',
-    'ends_with'            => 'The :attribute must end with one of the following: :values.',
+    'mac_address' => 'The :attribute field must be a valid MAC address.',
+    'max' => [
+        'array' => 'The :attribute field must not have more than :max items.',
+        'file' => 'The :attribute field must not be greater than :max kilobytes.',
+        'numeric' => 'The :attribute field must not be greater than :max.',
+        'string' => 'The :attribute field must not be greater than :max characters.',
+    ],
+    'max_digits' => 'The :attribute field must not have more than :max digits.',
+    'mimes' => 'The :attribute field must be a file of type: :values.',
+    'mimetypes' => 'The :attribute field must be a file of type: :values.',
+    'min' => [
+        'array' => 'The :attribute field must have at least :min items.',
+        'file' => 'The :attribute field must be at least :min kilobytes.',
+        'numeric' => 'The :attribute field must be at least :min.',
+        'string' => 'The :attribute field must be at least :min characters.',
+    ],
+    'min_digits' => 'The :attribute field must have at least :min digits.',
+    'missing' => 'The :attribute field must be missing.',
+    'missing_if' => 'The :attribute field must be missing when :other is :value.',
+    'missing_unless' => 'The :attribute field must be missing unless :other is :value.',
+    'missing_with' => 'The :attribute field must be missing when :values is present.',
+    'missing_with_all' => 'The :attribute field must be missing when :values are present.',
+    'multiple_of' => 'The :attribute field must be a multiple of :value.',
+    'not_in' => 'Atlasītais: atribūts nav derīgs.',
+    'not_regex' => 'The :attribute field format is invalid.',
+    'numeric' => 'The :attribute field must be a number.',
+    'password' => [
+        'letters' => 'The :attribute field must contain at least one letter.',
+        'mixed' => 'The :attribute field must contain at least one uppercase and one lowercase letter.',
+        'numbers' => 'The :attribute field must contain at least one number.',
+        'symbols' => 'The :attribute field must contain at least one symbol.',
+        'uncompromised' => 'The given :attribute has appeared in a data leak. Please choose a different :attribute.',
+    ],
+    'percent'       => 'The depreciation minimum must be between 0 and 100 when depreciation type is percentage.',
 
-    'not_in'               => 'Atlasītais: atribūts nav derīgs.',
-    'numeric'              => 'Atribūts ir jābūt skaitlim.',
-    'present'              => 'Atribūta laukam jābūt klāt.',
-    'valid_regex'          => 'regex nav derīgs.',
-    'regex'                => 'Atribūta formāts nav derīgs.',
-    'required'             => 'Atribūta lauks ir nepieciešams.',
-    'required_if'          => 'Atribūta lauks ir nepieciešams, ja: cits ir: vērtība.',
-    'required_unless'      => 'Atribūta lauks ir nepieciešams, ja vien: citā ir: vērtības.',
-    'required_with'        => 'Atribūta lauks ir nepieciešams, ja: ir vērtības.',
-    'required_with_all'    => 'Atribūta lauks ir nepieciešams, ja: ir vērtības.',
-    'required_without'     => 'Atribūta lauks ir nepieciešams, ja: vērtības nav.',
+    'present' => 'Atribūta laukam jābūt klāt.',
+    'present_if' => 'The :attribute field must be present when :other is :value.',
+    'present_unless' => 'The :attribute field must be present unless :other is :value.',
+    'present_with' => 'The :attribute field must be present when :values is present.',
+    'present_with_all' => 'The :attribute field must be present when :values are present.',
+    'prohibited' => 'The :attribute field is prohibited.',
+    'prohibited_if' => 'The :attribute field is prohibited when :other is :value.',
+    'prohibited_unless' => 'The :attribute field is prohibited unless :other is in :values.',
+    'prohibits' => 'The :attribute field prohibits :other from being present.',
+    'regex' => 'The :attribute field format is invalid.',
+    'required' => 'Atribūta lauks ir nepieciešams.',
+    'required_array_keys' => 'The :attribute field must contain entries for: :values.',
+    'required_if' => 'Atribūta lauks ir nepieciešams, ja: cits ir: vērtība.',
+    'required_if_accepted' => 'The :attribute field is required when :other is accepted.',
+    'required_if_declined' => 'The :attribute field is required when :other is declined.',
+    'required_unless' => 'Atribūta lauks ir nepieciešams, ja vien: citā ir: vērtības.',
+    'required_with' => 'Atribūta lauks ir nepieciešams, ja: ir vērtības.',
+    'required_with_all' => 'The :attribute field is required when :values are present.',
+    'required_without' => 'Atribūta lauks ir nepieciešams, ja: vērtības nav.',
     'required_without_all' => 'Atribūta lauks ir nepieciešams, ja neviena no: vērtības nav.',
-    'same'                 => 'Atribūts: un citam jāatbilst.',
-    'size'                 => [
-        'numeric' => 'Atribūts: jābūt lielumam.',
-        'file'    => 'Atribūts: jābūt kilobaitiem.',
-        'string'  => 'Atribūts: jābūt lieluma burtiem.',
-        'array'   => 'Atribūts: jāiekļauj: lieluma vienumi.',
+    'same' => 'The :attribute field must match :other.',
+    'size' => [
+        'array' => 'The :attribute field must contain :size items.',
+        'file' => 'The :attribute field must be :size kilobytes.',
+        'numeric' => 'The :attribute field must be :size.',
+        'string' => 'The :attribute field must be :size characters.',
     ],
+    'starts_with' => 'The :attribute field must start with one of the following: :values.',
     'string'               => 'Atribūtam jābūt virknei.',
-    'timezone'             => 'Atribūtam jābūt derīgai zonai.',
     'two_column_unique_undeleted' => 'The :attribute must be unique across :table1 and :table2. ',
-    'unique'               => 'Atribūts jau ir pieņemts.',
-    'uploaded'             => 'Atribūts neizdevās augšupielādēt.',
-    'url'                  => 'Atribūta formāts nav derīgs.',
     'unique_undeleted'     => ':attribute jābūt unikālam.',
     'non_circular'         => 'The :attribute must not create a circular reference.',
     'not_array'            => ':attribute cannot be an array.',
@@ -102,11 +165,14 @@ return [
     'numbers'              => 'Password must contain at least one number.',
     'case_diff'            => 'Password must use mixed case.',
     'symbols'              => 'Password must contain symbols.',
-    'gte'                  => [
-        'numeric'          => 'Value cannot be negative'
-    ],
-    'checkboxes'           => ':attribute contains invalid options.',
-    'radio_buttons'        => ':attribute is invalid.',
+    'timezone' => 'The :attribute field must be a valid timezone.',
+    'unique' => 'Atribūts jau ir pieņemts.',
+    'uploaded' => 'Atribūts neizdevās augšupielādēt.',
+    'uppercase' => 'The :attribute field must be uppercase.',
+    'url' => 'The :attribute field must be a valid URL.',
+    'ulid' => 'The :attribute field must be a valid ULID.',
+    'uuid' => 'The :attribute field must be a valid UUID.',
+    'fmcs_location' => 'Full multiple company support and location scoping is enabled in the Admin Settings, and the selected location and selected company are not compatible.',
 
 
     /*
@@ -120,16 +186,22 @@ return [
     |
     */
 
+    'email_array'      => 'Viena vai vairākas e-pasta adreses nav derīgas.',
+    'checkboxes'           => ':attribute contains invalid options.',
+    'radio_buttons'        => ':attribute is invalid.',
+    
     'custom' => [
         'alpha_space' => 'Laukā: atribūta lauks ir rakstzīme, kas nav atļauta.',
-        'email_array'      => 'Viena vai vairākas e-pasta adreses nav derīgas.',
+
         'hashed_pass'      => 'Jūsu pašreizējā parole nav pareiza',
         'dumbpwd'          => 'Šī parole ir pārāk izplatīta.',
         'statuslabel_type' => 'Jums ir jāizvēlas derīgs statusa etiķetes veids',
+        'custom_field_not_found'          => 'This field does not seem to exist, please double check your custom field names.',
+        'custom_field_not_found_on_model' => 'This field seems to exist, but is not available on this Asset Model\'s fieldset.',
 
         // date_format validation with slightly less stupid messages. It duplicates a lot, but it gets the job done :(
-        // We use this because the default error message for date_format is reflects php Y-m-d, which non-PHP
-        // people won't know how to format. 
+        // We use this because the default error message for date_format reflects php Y-m-d, which non-PHP
+        // people won't know how to format.
         'purchase_date.date_format'     => 'The :attribute must be a valid date in YYYY-MM-DD format',
         'last_audit_date.date_format'   =>  'The :attribute must be a valid date in YYYY-MM-DD hh:mm:ss format',
         'expiration_date.date_format'   =>  'The :attribute must be a valid date in YYYY-MM-DD format',
@@ -137,9 +209,15 @@ return [
         'expected_checkin.date_format'  =>  'The :attribute must be a valid date in YYYY-MM-DD format',
         'start_date.date_format'        =>  'The :attribute must be a valid date in YYYY-MM-DD format',
         'end_date.date_format'          =>  'The :attribute must be a valid date in YYYY-MM-DD format',
+        'invalid_value_in_field' => 'Invalid value included in this field',
 
-    ],
+        'ldap_username_field' => [
+            'not_in' =>         '<code>sAMAccountName</code> (mixed case) will likely not work. You should use <code>samaccountname</code> (lowercase) instead.'
+        ],
+        'ldap_auth_filter_query' => ['not_in' => '<code>uid=samaccountname</code> is probably not a valid auth filter. You probably want <code>uid=</code> '],
+        'ldap_filter' => ['regex' => 'This value should probably not be wrapped in parentheses.'],
 
+        ],
     /*
     |--------------------------------------------------------------------------
     | Custom Validation Attributes
@@ -155,8 +233,16 @@ return [
 
     /*
     |--------------------------------------------------------------------------
-    | Generic Validation Messages
+    | Generic Validation Messages - we use these in the jquery validation where we don't have
+    | access to the :attribute
     |--------------------------------------------------------------------------
     */
-    'invalid_value_in_field' => 'Invalid value included in this field',
+
+    'generic' => [
+        'invalid_value_in_field' => 'Invalid value included in this field',
+        'required' => 'This field is required',
+        'email' => 'Please enter a valid email address',
+    ],
+
+
 ];
diff --git a/resources/lang/mi-NZ/account/general.php b/resources/lang/mi-NZ/account/general.php
index 1a9e2c03b8..7f9e2f848e 100644
--- a/resources/lang/mi-NZ/account/general.php
+++ b/resources/lang/mi-NZ/account/general.php
@@ -2,10 +2,16 @@
 
 return array(
     'personal_api_keys' => 'Personal API Keys',
+    'personal_access_token' => 'Personal Access Token',
+    'personal_api_keys_success' => 'Personal API Key :key created sucessfully',
+    'here_is_api_key' => 'Here is your new personal access token. This is the only time it will be shown so do not lose it! You may now use this token to make API requests.',
     'api_key_warning' => 'When generating an API token, be sure to copy it down immediately as they will not be visible to you again.',
     'api_base_url' => 'Your API base url is located at:',
     'api_base_url_endpoint' => '/&lt;endpoint&gt;',
     'api_token_expiration_time' => 'API tokens are set to expire in:',
     'api_reference' => 'Please check the <a href="https://snipe-it.readme.io/reference" target="_blank">API reference</a> to find specific API endpoints and additional API documentation.',
     'profile_updated' => 'Account successfully updated',
+    'no_tokens' => 'You have not created any personal access tokens.',
+    'enable_sounds' => 'Enable sound effects',
+    'enable_confetti' => 'Enable confetti effects',
 );
diff --git a/resources/lang/mi-NZ/admin/accessories/message.php b/resources/lang/mi-NZ/admin/accessories/message.php
index dbc766c9aa..2719c7022b 100644
--- a/resources/lang/mi-NZ/admin/accessories/message.php
+++ b/resources/lang/mi-NZ/admin/accessories/message.php
@@ -26,7 +26,11 @@ return array(
         'error'   		=> 'Kaore ano kia uruhia te uru, ka ngana ano',
         'success' 		=> 'He pai te tirotiro i te Accessory.',
         'unavailable'   => 'Accessory is not available for checkout. Check quantity available',
-        'user_does_not_exist' => 'He muhu te kaiwhakamahi. Tena ngana ano.'
+        'user_does_not_exist' => 'He muhu te kaiwhakamahi. Tena ngana ano.',
+         'checkout_qty' => array(
+            'lte'  => 'There is currently only one available accessory of this type, and you are trying to check out :checkout_qty. Please adjust the checkout quantity or the total stock of this accessory and try again.|There are :number_currently_remaining total available accessories, and you are trying to check out :checkout_qty. Please adjust the checkout quantity or the total stock of this accessory and try again.',
+            ),
+           
     ),
 
     'checkin' => array(
diff --git a/resources/lang/mi-NZ/admin/accessories/table.php b/resources/lang/mi-NZ/admin/accessories/table.php
index 8962f9350d..1ebff1c291 100644
--- a/resources/lang/mi-NZ/admin/accessories/table.php
+++ b/resources/lang/mi-NZ/admin/accessories/table.php
@@ -6,6 +6,4 @@ return array(
     'id'      					=> 'ID',
     'require_acceptance'      	=> 'Te whakaae',
     'title'      				=> 'Ingoa Whakauru',
-
-
 );
diff --git a/resources/lang/mi-NZ/admin/components/message.php b/resources/lang/mi-NZ/admin/components/message.php
index 3b893db5cf..c80ab346dd 100644
--- a/resources/lang/mi-NZ/admin/components/message.php
+++ b/resources/lang/mi-NZ/admin/components/message.php
@@ -17,7 +17,8 @@ return array(
     'delete' => array(
         'confirm'   => 'Kei te hiahia koe ki te muku i tenei waahanga?',
         'error'   => 'He raruraru kei te whakakore i te waahanga. Tena ngana ano.',
-        'success' => 'I mukua te wāhanga.'
+        'success' => 'I mukua te wāhanga.',
+        'error_qty'   => 'Some components of this type are still checked out. Please check them in and try again.',
     ),
 
      'checkout' => array(
diff --git a/resources/lang/mi-NZ/admin/consumables/general.php b/resources/lang/mi-NZ/admin/consumables/general.php
index c1567d7b5d..af84154e0f 100644
--- a/resources/lang/mi-NZ/admin/consumables/general.php
+++ b/resources/lang/mi-NZ/admin/consumables/general.php
@@ -8,4 +8,5 @@ return array(
     'remaining' 			            => 'Te noho',
     'total' 			                => 'Te tapeke',
     'update'                            => 'Whakahou Whakamahia',
+    'inventory_warning'                 => 'The inventory of this consumable is below the minimum amount of :min_count',
 );
diff --git a/resources/lang/mi-NZ/admin/consumables/message.php b/resources/lang/mi-NZ/admin/consumables/message.php
index 593d59bc76..a544bab369 100644
--- a/resources/lang/mi-NZ/admin/consumables/message.php
+++ b/resources/lang/mi-NZ/admin/consumables/message.php
@@ -2,6 +2,7 @@
 
 return array(
 
+    'invalid_category_type' => 'The category must be a consumable category.',
     'does_not_exist' => 'Kaore e taea te whakamahi.',
 
     'create' => array(
diff --git a/resources/lang/mi-NZ/admin/custom_fields/general.php b/resources/lang/mi-NZ/admin/custom_fields/general.php
index accb47c2ea..a43171d42f 100644
--- a/resources/lang/mi-NZ/admin/custom_fields/general.php
+++ b/resources/lang/mi-NZ/admin/custom_fields/general.php
@@ -35,7 +35,7 @@ return [
     'create_field_title' => 'Create a new custom field',
     'value_encrypted'      	        => 'Ko te uara o tenei mara kei te whakamunatia i roto i te pātengi raraunga. Ka taea anake e nga kaiwhakahaere ka kite i te uara kua tohua',
     'show_in_email'     => 'Include the value of this field in checkout emails sent to the user? Encrypted fields cannot be included in emails',
-    'show_in_email_short'     => 'Include in emails.',
+    'show_in_email_short' => 'Include in emails',
     'help_text' => 'Help Text',
     'help_text_description' => 'This is optional text that will appear below the form elements while editing an asset to provide context on the field.',
     'about_custom_fields_title' => 'About Custom Fields',
@@ -57,5 +57,8 @@ return [
     'show_in_requestable_list_short' => 'Show in requestable assets list',
     'show_in_requestable_list' => 'Show value in requestable assets list. Encrypted fields will not be shown',
     'encrypted_options' => 'This field is encrypted, so some display options will not be available.',
+    'display_checkin' => 'Display in checkin forms',
+    'display_checkout' => 'Display in checkout forms',
+    'display_audit' => 'Display in audit forms',
 
 ];
diff --git a/resources/lang/mi-NZ/admin/custom_fields/message.php b/resources/lang/mi-NZ/admin/custom_fields/message.php
index 14381a5bb2..382b48d578 100644
--- a/resources/lang/mi-NZ/admin/custom_fields/message.php
+++ b/resources/lang/mi-NZ/admin/custom_fields/message.php
@@ -5,6 +5,7 @@ return array(
     'field' => array(
         'invalid'   => 'Kāore te mara i te tīariari.',
         'already_added'   => 'Kua tapirihia te mara',
+        'none_selected'   => 'No field selected',
 
         'create' => array(
             'error'   => 'Kāore i hanga te mara, tēnā whakamātau anō.',
diff --git a/resources/lang/mi-NZ/admin/depreciations/general.php b/resources/lang/mi-NZ/admin/depreciations/general.php
index f441560909..351d6ebfd1 100644
--- a/resources/lang/mi-NZ/admin/depreciations/general.php
+++ b/resources/lang/mi-NZ/admin/depreciations/general.php
@@ -13,4 +13,8 @@ return [
     'no_depreciations_warning'               => '<strong>Warning: </strong>
                       You do not currently have any depreciations set up.
                       Please set up at least one depreciation to view the depreciation report.',
+    'depreciation_method'                   => 'Te Poari Kaute',
+    'linear_depreciation'                   => 'Linear (Default)',
+    'half_1'                                => 'Half-year convention, always applied',
+    'half_2'                                => 'Half-year convention, applied with condition',
 ];
diff --git a/resources/lang/mi-NZ/admin/hardware/form.php b/resources/lang/mi-NZ/admin/hardware/form.php
index 2c57d95a89..daeb29e9f6 100644
--- a/resources/lang/mi-NZ/admin/hardware/form.php
+++ b/resources/lang/mi-NZ/admin/hardware/form.php
@@ -55,8 +55,11 @@ return [
     'asset_location_update_default' => 'Update only default location',
     'asset_location_update_actual' => 'Update only actual location',
     'asset_not_deployable' => 'That asset status is not deployable. This asset cannot be checked out.',
-    'asset_deployable' => 'That status is deployable. This asset can be checked out.',
+    'asset_not_deployable_checkin' => 'That asset status is not deployable. Using this status label will checkin the asset.',
+    'asset_deployable' => 'This asset can be checked out.',
     'processing_spinner' => 'Processing... (This might take a bit of time on large files)',
+    'processing' => 'Processing... ',
     'optional_infos'  => 'Optional Information',
-    'order_details'   => 'Order Related Information'
+    'order_details'   => 'Order Related Information',
+    'calc_eol'    => 'If nulling the EOL date, use automatic EOL calculation based on the purchase date and EOL rate.',
 ];
diff --git a/resources/lang/mi-NZ/admin/hardware/general.php b/resources/lang/mi-NZ/admin/hardware/general.php
index e21838fc55..9d82554710 100644
--- a/resources/lang/mi-NZ/admin/hardware/general.php
+++ b/resources/lang/mi-NZ/admin/hardware/general.php
@@ -5,8 +5,8 @@ return [
     'about_assets_text'            => 'Ko nga taonga he taonga kua rapua e te tau rangatū, te tohu taonga ranei. He ahua nui ake o nga taonga kei te tautuhi i nga take e tika ana.',
     'archived'  				=> 'Whakamahia',
     'asset'  					=> 'Tahua',
-    'bulk_checkout'             => 'Checkout Assets',
-    'bulk_checkin'              => 'Checkin Assets',
+    'bulk_checkout'             => 'Putea Poaka',
+    'bulk_checkin'              => 'Bulk Checkin',
     'checkin'  					=> 'Tirohia te Ahua',
     'checkout'  				=> 'Whakaritehia te Ahua',
     'clone'  					=> 'Te Tino Tae',
@@ -27,8 +27,7 @@ return [
     'undeployable_tooltip'  	=> 'This asset has a status label that is undeployable and cannot be checked out at this time.',
     'view'  					=> 'Tirohia te Ahua',
     'csv_error' => 'You have an error in your CSV file:',
-    'import_text' => '<p>Upload a CSV that contains asset history. The assets and users MUST already exist in the system, or they will be skipped. Matching assets for history import happens against the asset tag. We will try to find a matching user based on the user\'s name you provide, and the criteria you select below. If you do not select any criteria below, it will simply try to match on the username format you configured in the <code>Admin &gt; General Settings</code>.</p><p>Fields included in the CSV must match the headers: <strong>Asset Tag, Name, Checkout Date, Checkin Date</strong>. Any additional fields will be ignored. </p><p>Checkin Date: blank or future checkin dates will checkout items to associated user.  Excluding the Checkin Date column will create a checkin date with todays date.</p>
-    ',
+    'import_text' => '<p>Upload a CSV that contains asset history. The assets and users MUST already exist in the system, or they will be skipped. Matching assets for history import happens against the asset tag. We will try to find a matching user based on the user\'s name you provide, and the criteria you select below. If you do not select any criteria below, it will simply try to match on the username format you configured in the <code>Admin &gt; General Settings</code>.</p><p>Fields included in the CSV must match the headers: <strong>Asset Tag, Name, Checkout Date, Checkin Date</strong>. Any additional fields will be ignored. </p><p>Checkin Date: blank or future checkin dates will checkout items to associated user.  Excluding the Checkin Date column will create a checkin date with todays date.</p>    ',
     'csv_import_match_f-l' => 'Try to match users by <strong>firstname.lastname</strong> (<code>jane.smith</code>) format',
     'csv_import_match_initial_last' => 'Try to match users by <strong>first initial last name</strong> (<code>jsmith</code>) format',
     'csv_import_match_first' => 'Try to match users by <strong>first name</strong> (<code>jane</code>) format',
diff --git a/resources/lang/mi-NZ/admin/hardware/message.php b/resources/lang/mi-NZ/admin/hardware/message.php
index 558a794bca..87115930b0 100644
--- a/resources/lang/mi-NZ/admin/hardware/message.php
+++ b/resources/lang/mi-NZ/admin/hardware/message.php
@@ -2,18 +2,23 @@
 
 return [
 
-    'undeployable' 		=> '<strong>Warning: </strong> Kua tohua tenei taonga i te mea kaore i te rongonui. Mena kua hurihia tenei mana, whakahouhia te mana o te taonga.',
-    'does_not_exist' 	=> 'Kaore he tahua.',
-    'does_not_exist_var'=> 'Asset with tag :asset_tag not found.',
-    'no_tag' 	        => 'No asset tag provided.',
+    'undeployable' 		 => '<strong>Warning: </strong> This asset has been marked as currently undeployable. If this status has changed, please update the asset status.',
+    'does_not_exist' 	 => 'Kaore he tahua.',
+    'does_not_exist_var' => 'Asset with tag :asset_tag not found.',
+    'no_tag' 	         => 'No asset tag provided.',
     'does_not_exist_or_not_requestable' => 'That asset does not exist or is not requestable.',
-    'assoc_users'	 	=> 'Kei te tirohia tenei taonga i tetahi kaiwhakamahi me te kore e taea te muku. Tirohia koa te taonga i te tuatahi, a ka ngana ki te muku ano.',
+    'assoc_users'	 	 => 'Kei te tirohia tenei taonga i tetahi kaiwhakamahi me te kore e taea te muku. Tirohia koa te taonga i te tuatahi, a ka ngana ki te muku ano.',
     'warning_audit_date_mismatch' 	=> 'This asset\'s next audit date (:next_audit_date) is before the last audit date (:last_audit_date). Please update the next audit date.',
+    'labels_generated'   => 'Labels were successfully generated.',
+    'error_generating_labels' => 'Error while generating labels.',
+    'no_assets_selected' => 'No assets selected.',
 
     'create' => [
         'error'   		=> 'Kaore i hangaia te tahua, tēnā whakamātau anō. :(',
         'success' 		=> 'Kua waihangatia te tahua. :)',
         'success_linked' => 'Asset with tag :tag was created successfully. <strong><a href=":link" style="color: white;">Click here to view</a></strong>.',
+        'multi_success_linked' => 'Asset with tag :links was created successfully.|:count assets were created succesfully. :links.',
+        'partial_failure' => 'An asset was unable to be created. Reason: :failures|:count assets were unable to be created. Reasons: :failures',
     ],
 
     'update' => [
@@ -51,20 +56,24 @@ return [
     ],
 
     'import' => [
+        'import_button'         => 'Process Import',
         'error'                 => 'Kāore i tika te kawemai o etahi o nga mea.',
         'errorDetail'           => 'Ko nga mea e whai ake nei kihai i kawemai no te mea he hapa.',
         'success'               => 'I kawemai to kōnae',
         'file_delete_success'   => 'Kua mukua pai to kōnae',
         'file_delete_error'      => 'Kāore i taea te mukua te kōnae',
         'file_missing' => 'The file selected is missing',
+        'file_already_deleted' => 'The file selected was already deleted',
         'header_row_has_malformed_characters' => 'One or more attributes in the header row contain malformed UTF-8 characters',
         'content_row_has_malformed_characters' => 'One or more attributes in the first row of content contain malformed UTF-8 characters',
+        'transliterate_failure' => 'Transliteration from :encoding to UTF-8 failed due to invalid characters in input'
     ],
 
 
     'delete' => [
         'confirm'   	=> 'Kei te hiahia koe ki te muku i tenei taonga?',
         'error'   		=> 'He raru kei te whakakore i te taonga. Tena ngana ano.',
+        'assigned_to_error' => '{1}Asset Tag: :asset_tag is currently checked out. Check in this device before deletion.|[2,*]Asset Tags: :asset_tag are currently checked out. Check in these devices before deletion.',
         'nothing_updated'   => 'Kaore he rawa i tohua, na reira kaore i whakakorehia.',
         'success' 		=> 'Kua mukua te taonga.',
     ],
@@ -77,6 +86,11 @@ return [
         'no_assets_selected' => 'You must select at least one asset from the list',
     ],
 
+    'multi-checkout' => [
+        'error'   => 'Asset was not checked out, please try again|Assets were not checked out, please try again',
+        'success' => 'Asset checked out successfully.|Assets checked out successfully.',
+    ],
+
     'checkin' => [
         'error'   		=> 'Kaore i whakauruhia te taketake, me ngana ano',
         'success' 		=> 'Kua tohua te tahua.',
@@ -86,9 +100,10 @@ return [
     ],
 
     'requests' => [
-        'error'   		=> 'Kāore i te tono te tahua, tēnā whakamātau anō',
-        'success' 		=> 'I tono angitu te tahua.',
-        'canceled'      => 'Kua whakakorea te manaakitia o te tono riihi',
+        'error'   		=> 'Request was not successful, please try again.',
+        'success' 		=> 'Request successfully submitted.',
+        'canceled'      => 'Request successfully canceled.',
+        'cancel'        => 'Cancel this item request',
     ],
 
 ];
diff --git a/resources/lang/mi-NZ/admin/hardware/table.php b/resources/lang/mi-NZ/admin/hardware/table.php
index 6851fccb48..e5cd0b76a4 100644
--- a/resources/lang/mi-NZ/admin/hardware/table.php
+++ b/resources/lang/mi-NZ/admin/hardware/table.php
@@ -25,7 +25,6 @@ return [
     'image'		    => 'Atahanga Pūrere',
     'days_without_acceptance' => 'Nga Rahui Te Whakaae',
     'monthly_depreciation' => 'Monthly Depreciation',
-    'assigned_to'    => 'Tohua Ki To',
     'requesting_user' => 'Requesting User',
     'requested_date' => 'Requested Date',
     'changed'       => 'Changed',
diff --git a/resources/lang/mi-NZ/admin/kits/general.php b/resources/lang/mi-NZ/admin/kits/general.php
index 79929652fb..7af77de10d 100644
--- a/resources/lang/mi-NZ/admin/kits/general.php
+++ b/resources/lang/mi-NZ/admin/kits/general.php
@@ -47,4 +47,5 @@ return [
     'kit_deleted'                       => 'Kit was successfully deleted',
     'kit_model_updated'                 => 'Model was successfully updated',
     'kit_model_detached'                => 'Model was successfully detached',
+    'model_already_attached'            => 'Model already attached to kit',
 ];
diff --git a/resources/lang/mi-NZ/admin/licenses/general.php b/resources/lang/mi-NZ/admin/licenses/general.php
index d810e6739c..4b7b868c4a 100644
--- a/resources/lang/mi-NZ/admin/licenses/general.php
+++ b/resources/lang/mi-NZ/admin/licenses/general.php
@@ -14,6 +14,7 @@ return array(
     'info'  					=> 'Raihana Raihana',
     'license_seats'  			=> 'Waahi Raihana',
     'seat'  					=> 'Noho',
+    'seat_count'  				=> 'Seat :count',
     'seats'  					=> 'Nga moenga',
     'software_licenses'  		=> 'Raihana Pūmanawa',
     'user'  					=> 'Kaiwhakamahi',
@@ -23,12 +24,12 @@ return array(
         [
             'checkin_all'           => [
                 'button'            => 'Checkin All Seats',
-                'modal'             => 'This will action checkin one seat. | This action will checkin all :checkedout_seats_count seats for this license.',
+                'modal'             => 'This action will checkin one seat. | This action will checkin all :checkedout_seats_count seats for this license.',
                 'enabled_tooltip'   => 'Checkin ALL seats for this license from both users and assets',
                 'disabled_tooltip'  => 'This is disabled because there are no seats currently checked out',
                 'disabled_tooltip_reassignable'  => 'This is disabled because the License is not reassignable',
                 'success'           => 'License successfully checked in! | All licenses were successfully checked in!',
-                'log_msg'           => 'Checked in via bulk license checkout in license GUI',
+                'log_msg'           => 'Checked in via bulk license checkin in license GUI',
             ],
 
             'checkout_all'              => [
diff --git a/resources/lang/mi-NZ/admin/licenses/message.php b/resources/lang/mi-NZ/admin/licenses/message.php
index 720c9e765c..01f6dac723 100644
--- a/resources/lang/mi-NZ/admin/licenses/message.php
+++ b/resources/lang/mi-NZ/admin/licenses/message.php
@@ -44,10 +44,13 @@ return array(
         'error'   => 'I puta he take hei tirotiro i te raihana. Tena ngana ano.',
         'success' => 'I tohua te raihana',
         'not_enough_seats' => 'Not enough license seats available for checkout',
+        'mismatch' => 'The license seat provided does not match the license',
+        'unavailable' => 'This seat is not available for checkout.',
     ),
 
     'checkin' => array(
         'error'   => 'I kitea he take e tirotirohia ana i roto i te raihana. Tena ngana ano.',
+        'not_reassignable' => 'License not reassignable',
         'success' => 'I tohua te raihana i te angitu'
     ),
 
diff --git a/resources/lang/mi-NZ/admin/locations/message.php b/resources/lang/mi-NZ/admin/locations/message.php
index c35cfa5319..2a4e9455f1 100644
--- a/resources/lang/mi-NZ/admin/locations/message.php
+++ b/resources/lang/mi-NZ/admin/locations/message.php
@@ -3,11 +3,12 @@
 return array(
 
     'does_not_exist' => 'Kāore i te tīariari te wāhi.',
-    'assoc_users'    => 'This location is not currently deletable because it is the location of record for at least one asset or user, has assets assigned to it, or is the parent location of another location. Please update your models to no longer reference this company and try again. ',
+    'assoc_users'    => 'This location is not currently deletable because it is the location of record for at least one asset or user, has assets assigned to it, or is the parent location of another location. Please update your records to no longer reference this location and try again ',
     'assoc_assets'	 => 'Kei te honohia tenei taapiri ki te iti rawa o te rawa me te kore e taea te muku. Whakaorangia nga taonga ki a koe kia kaua e tautuhi i tenei tauranga ka ngana ano.',
     'assoc_child_loc'	 => 'Kei tenei waahi te matua o te iti rawa o te mokopuna me te kore e taea te muku. Whakaorangia nga taangata ki a koe kia kaua e tautuhi i tenei tauranga ka ngana ano.',
     'assigned_assets' => 'Assigned Assets',
     'current_location' => 'Current Location',
+    'open_map' => 'Open in :map_provider_icon Maps',
 
 
     'create' => array(
@@ -20,6 +21,11 @@ return array(
         'success' => 'Kua whakahoutia te tau.'
     ),
 
+    'restore' => array(
+        'error'   => 'Location was not restored, please try again',
+        'success' => 'Location restored successfully.'
+    ),
+
     'delete' => array(
         'confirm'   	=> 'Kei te hiahia koe ki te muku i tenei tauwāhi?',
         'error'   => 'He raru kei te whakakore i te tauwāhi. Tena ngana ano.',
diff --git a/resources/lang/mi-NZ/admin/locations/table.php b/resources/lang/mi-NZ/admin/locations/table.php
index 8bf90bc3fe..8dfe18310a 100644
--- a/resources/lang/mi-NZ/admin/locations/table.php
+++ b/resources/lang/mi-NZ/admin/locations/table.php
@@ -39,4 +39,5 @@ return [
     'signed_by_finance_auditor' => 'Signed By (Finance Auditor):',
     'signed_by_location_manager' => 'Signed By (Location Manager):',
     'signed_by'                 => 'Signed Off By:',
+    'clone'  					=> 'Clone Location',
 ];
diff --git a/resources/lang/mi-NZ/admin/models/general.php b/resources/lang/mi-NZ/admin/models/general.php
index b5e42a5290..4040244778 100644
--- a/resources/lang/mi-NZ/admin/models/general.php
+++ b/resources/lang/mi-NZ/admin/models/general.php
@@ -3,7 +3,7 @@
 return array(
     'about_models_title'     => 'Mō nga tauira Ahua',
     'about_models_text'           => 'Ko nga Momo Ahuatanga he huarahi ki te whakariterite i nga rawa taatai. "MBP 2013", "IPhone 6s", etc.',
-    'deleted'  					        => 'This model has been deleted.',
+    'deleted'  					=> 'This model has been deleted.',
     'bulk_delete'               => 'Bulk Delete Asset Models',
     'bulk_delete_help'               => 'Use the checkboxes below to confirm the deletion of the selected asset models. Asset models that have assets associated with them cannot be deleted until the assets are associated with a different model.',
     'bulk_delete_warn'          => 'You are about to delete one asset model.|You are about to delete :model_count asset models.',
diff --git a/resources/lang/mi-NZ/admin/models/message.php b/resources/lang/mi-NZ/admin/models/message.php
index 830db6f425..42d85446e1 100644
--- a/resources/lang/mi-NZ/admin/models/message.php
+++ b/resources/lang/mi-NZ/admin/models/message.php
@@ -7,7 +7,7 @@ return array(
     'no_association' => 'WARNING! The asset model for this item is invalid or missing!',
     'no_association_fix' => 'This will break things in weird and horrible ways. Edit this asset now to assign it a model.',
     'assoc_users'	 => 'Kei te hono tenei tauira ki te kotahi, neke atu ranei nga rawa, kaore e taea te muku. Nganahia nga rawa, ka ngana ki te muku ano.',
-
+    'invalid_category_type' => 'This category must be an asset category.',
 
     'create' => array(
         'error'   => 'Kāore i hangaia te tauira, tēnā whakamātau anō.',
diff --git a/resources/lang/mi-NZ/admin/reports/general.php b/resources/lang/mi-NZ/admin/reports/general.php
index 701b413278..40654e1541 100644
--- a/resources/lang/mi-NZ/admin/reports/general.php
+++ b/resources/lang/mi-NZ/admin/reports/general.php
@@ -4,6 +4,7 @@ return [
     'info'   => 'Tīpakohia nga kōwhiringa e hiahia ana koe mo tō pūrongo hua.',
     'deleted_user' => 'Deleted user',
     'send_reminder' => 'Send reminder',
+    'cannot_send_reminder' => 'User has been deleted or does not have an email address so cannot receive a reminder',
     'reminder_sent' => 'Reminder sent',
     'acceptance_deleted' => 'Acceptance request deleted',
     'acceptance_request' => 'Acceptance request',
@@ -13,5 +14,10 @@ return [
         'user_state' => 'User State',
         'user_country' => 'User Country',
         'user_zip' => 'User Zip'
-    ]
-];
\ No newline at end of file
+    ],
+    'open_saved_template' => 'Open Saved Template',
+    'save_template' =>  'Save Template',
+    'select_a_template' => 'Select a Template',
+    'template_name' => 'Template Name',
+    'update_template' => 'Update Template',
+];
diff --git a/resources/lang/mi-NZ/admin/reports/message.php b/resources/lang/mi-NZ/admin/reports/message.php
index e60d2fce82..2800bbdf0b 100644
--- a/resources/lang/mi-NZ/admin/reports/message.php
+++ b/resources/lang/mi-NZ/admin/reports/message.php
@@ -1,5 +1,16 @@
 <?php
 
-return array(
-    'error'   => 'Me whiriwhiri e koe i te iti rawa kia KOTAHI awhina.'
-);
+return [
+    'about_templates' => 'About Saved Templates',
+    'saving_templates_description' => 'Select your options, then enter the name of your template in the box above and click the \'Save Template\' button. Use the dropdown to select a previously saved template.',
+    'create'  => [
+        'success' => 'Template saved successfully',
+    ],
+    'update' => [
+        'success' => 'Template updated successfully',
+    ],
+    'delete' => [
+        'success' => 'Template deleted',
+        'no_delete_permission' => 'Template does not exist or you do not have permission to delete it.',
+    ],
+];
diff --git a/resources/lang/mi-NZ/admin/settings/general.php b/resources/lang/mi-NZ/admin/settings/general.php
index e1d4bc5cee..1c6b2ec834 100644
--- a/resources/lang/mi-NZ/admin/settings/general.php
+++ b/resources/lang/mi-NZ/admin/settings/general.php
@@ -8,13 +8,13 @@ return [
     'ad_append_domain'          => 'Append domain name to username field',
     'ad_append_domain_help'     => 'User isn\'t required to write "username@domain.local", they can just type "username".',
     'admin_cc_email'            => 'CC Email',
-    'admin_cc_email_help'       => 'If you would like to send a copy of checkin/checkout emails that are sent to users to an additional email account, enter it here. Otherwise leave this field blank.',
+    'admin_cc_email_help'       => 'Send a copy of checkin/checkout emails to this address.',
     'admin_settings'            => 'Admin Settings',
     'is_ad'				        => 'He raupapa Active Directory tēnei',
     'alerts'                	=> 'Alerts',
     'alert_title'               => 'Update Notification Settings',
     'alert_email'				=> 'Tukuna nga whakamohi ki',
-    'alert_email_help'    => 'Email addresses or distribution lists you want alerts to be sent to, comma separated',
+    'alert_email_help'          => 'Email addresses or distribution lists you want alerts to be sent to, comma separated.',
     'alerts_enabled'			=> 'Kua Whakahohea nga Aler',
     'alert_interval'			=> 'Nga Mahinga Whakamutunga Nga Tae (i nga ra)',
     'alert_inv_threshold'		=> 'Waehere Awhearanga Inventory',
@@ -31,15 +31,18 @@ return [
     'backups'					=> 'Ngā Pūrua',
     'backups_help'              => 'Create, download, and restore backups ',
     'backups_restoring'         => 'Restoring from Backup',
+    'backups_clean' => 'Clean the backed-up database before restore',
+    'backups_clean_helptext' => "This can be useful if you're changing between database versions",
     'backups_upload'            => 'Upload Backup',
     'backups_path'              => 'Backups on the server are stored in <code>:path</code>',
-    'backups_restore_warning'   => 'Use the restore button <small><span class="btn btn-xs btn-warning"><i class="text-white fas fa-retweet" aria-hidden="true"></i></span></small> to restore from a previous backup. (This does not currently work with S3 file storage or Docker.)<br><br>Your <strong>entire :app_name database and any uploaded files will be completely replaced</strong> by what\'s in the backup file.  ',
+    'backups_restore_warning'   => 'Use the restore button <small><span class="btn btn-xs btn-warning"><i class="text-white fas fa-retweet" aria-hidden="true"></i></span></small> to restore from a previous backup. (This does not currently work with S3 file storage or Docker.)<br><br>Your <strong>entire :app_name database and any uploaded files will be completely replaced</strong> by what\'s in the backup file  ',
     'backups_logged_out'         => 'All existing users, including you, will be logged out once your restore is complete.',
     'backups_large'             => 'Very large backups may time out on the restore attempt and may still need to be run via command line. ',
     'barcode_settings'			=> 'Tautuhinga Karauna',
     'confirm_purge'			    => 'Whakaatu Whakataunga',
     'confirm_purge_help'		=> 'Enter the text "DELETE" in the box below to purge your deleted records. This action cannot be undone and will PERMANENTLY delete all soft-deleted items and users. (You should make a backup first, just to be safe.)',
     'custom_css'				=> 'CSS Ritenga',
+    'custom_css_placeholder'	=> 'Add your custom CSS',
     'custom_css_help'			=> 'Whakauruhia tetahi tahua CSS ritenga e hiahia ana koe ki te whakamahi. Kaua e whakauru i nga tūtohu &lt;style&gt;&lt;/style&gt;.',
     'custom_forgot_pass_url'	=> 'Custom Password Reset URL',
     'custom_forgot_pass_url_help'	=> 'This replaces the built-in forgotten password URL on the login screen, useful to direct people to internal or hosted LDAP password reset functionality. It will effectively disable local user forgotten password functionality.',
@@ -47,34 +50,34 @@ return [
     'dashboard_message_help'	=> 'This text will appear on the dashboard for anyone with permission to view the dashboard.',
     'default_currency'  		=> 'Moni Moni',
     'default_eula_text'			=> 'EULA Taunoa',
+    'default_eula_text_placeholder' => 'Add your default EULA text',
     'default_language'			=> 'Reo Taunoa',
     'default_eula_help_text'	=> 'Ka taea hoki e koe te hono atu i nga Taekerangi ritenga ki nga waahanga tahua.',
     'acceptance_note'           => 'Add a note for your decision (Optional)',
     'display_asset_name'        => 'Whakaatuhia te Ingoa Tahua',
     'display_checkout_date'     => 'Whakaatuhia te Whakataunga Rā',
     'display_eol'               => 'Whakaatuhia EOL i te tirohanga ripanga',
-    'display_qr'                => 'Whakaatuhia nga Waehere Tae',
+    'display_qr'                => 'Display 2D barcode',
     'display_alt_barcode'		=> 'Whakaatuhia te tapanga 1D',
-    'email_logo'                => 'Email Logo',
     'barcode_type'				=> '2D Type Barcode',
     'alt_barcode_type'			=> '1D momo tapanga',
-    'email_logo_size'       => 'Square logos in email look best. ',
     'enabled'                   => 'Enabled',
     'eula_settings'				=> 'Tautuhinga EULA',
     'eula_markdown'				=> 'Ka taea e tenei EULA te <a href="https://help.github.com/articles/github-flavored-markdown/">Github flavored markdown</a>.',
+    'empty_row_count'           => 'Field Start Offset (Empty Rows)',
+    'empty_row_count_help'      => 'Fields will begin populating after this many empty rows are skipped at the top of the label.',
     'favicon'                   => 'Favicon',
     'favicon_format'            => 'Accepted filetypes are ico, png, and gif. Other image formats may not work in all browsers.',
     'favicon_size'          => 'Favicons should be square images, 16x16 pixels.',
     'footer_text'               => 'Additional Footer Text ',
     'footer_text_help'          => 'This text will appear in the right-side footer. Links are allowed using <a href="https://help.github.com/articles/github-flavored-markdown/">Github flavored markdown</a>. Line breaks, headers, images, etc may result in unpredictable results.',
+    'footer_text_placeholder'   => 'Optional footer text',
     'general_settings'			=> 'Tautuhinga Whānui',
-    'general_settings_keywords' => 'company support, signature, acceptance, email format, username format, images, per page, thumbnail, eula, gravatar, tos, dashboard, privacy',
     'general_settings_help'     => 'Default EULA and more',
     'generate_backup'			=> 'Whakaritea te Whakaora',
     'google_workspaces'         => 'Google Workspaces',
     'header_color'              => 'Tae pane',
     'info'                      => 'Ko enei tautuhinga ka tautuhi koe i etahi waahanga o to tautuhinga.',
-    'label_logo'                => 'Label Logo',
     'label_logo_size'           => 'Square logos look best - will be displayed in the top right of each asset label. ',
     'laravel'                   => 'Laravel Version',
     'ldap'                      => 'LDAP',
@@ -94,7 +97,7 @@ return [
     'ldap_login_sync_help'      => 'This only tests that LDAP can sync correctly. If your LDAP Authentication query is not correct, users may still not be able to login. YOU MUST SAVE YOUR UPDATED LDAP SETTINGS FIRST.',
     'ldap_manager'              => 'LDAP Manager',
     'ldap_server'               => 'Tūmau LDAP',
-    'ldap_server_help'          => 'Me tīmata tenei ki te ldap: // (mo te whakakoretanga, TLS ranei), mo te hiri: // (mo te SSL)',
+    'ldap_server_help'          => 'This should start with ldap:// (for unencrypted) or ldaps:// (for TLS or SSL)',
     'ldap_server_cert'			=> 'Tiwhikete Tiwhikete SSL LDAP',
     'ldap_server_cert_ignore'	=> 'Tukua te Tiwhikete SSL muhu',
     'ldap_server_cert_help'		=> 'Tīpakohia tenei pouakataki mēnā kei te whakamahi koe i te cert SSL kua hainatia e koe, me te hiahia ki te whakaae i tetahi tiwhikete SSL muhu.',
@@ -108,8 +111,8 @@ return [
     'ldap_pword'                => 'LDAP Whakauru Kupuhipa',
     'ldap_basedn'               => 'Tae Tae Tae',
     'ldap_filter'               => 'Tātari LDAP',
-    'ldap_pw_sync'              => 'Tukutahi Kupuhipa LDAP',
-    'ldap_pw_sync_help'         => 'Tangohia tenei pouaka ki te kore koe e hiahia ki te pupuri i nga kupuhipa a LDAP e tukuna ana ki nga kupuhipa a rohe. Ko te whakakore i tenei ka kore e taea e to kaiwhakamahi te takiuru mēnā kaore e taea te hoko atu i tō tūmau LDAP mō ētahi take.',
+    'ldap_pw_sync'              => 'Cache LDAP Passwords',
+    'ldap_pw_sync_help'         => 'Uncheck this box if you do not wish to keep LDAP passwords cached as local hashed passwords. Disabling this means that your users may not be able to login if your LDAP server is unreachable for some reason.',
     'ldap_username_field'       => 'Ingoa Ingoa Kaiwhakamahi',
     'ldap_lname_field'          => 'Ingoa Whakamutunga',
     'ldap_fname_field'          => 'Ingoa Tuatahi LDAP',
@@ -117,13 +120,15 @@ return [
     'ldap_version'              => 'Putanga LDAP',
     'ldap_active_flag'          => 'LDAP Karaimana Mahi',
     'ldap_activated_flag_help'  => 'This value is used to determine whether a synced user can login to Snipe-IT. <strong>It does not affect the ability to check items in or out to them</strong>, and should be the <strong>attribute name</strong> within your AD/LDAP, <strong>not the value</strong>. <br><br>If this field is set to a field name that does not exist in your AD/LDAP, or the value in the AD/LDAP field is set to <code>0</code> or <code>false</code>, <strong>user login will be disabled</strong>. If the value in the AD/LDAP field is set to <code>1</code> or <code>true</code> or <em>any other text</em> means the user can log in. When the field is blank in your AD, we respect the <code>userAccountControl</code> attribute, which usually allows non-suspended users to log in.',
+    'ldap_invert_active_flag'   => 'LDAP Invert Active Flag',
+    'ldap_invert_active_flag_help'     => 'If enabled: when the value returned by LDAP Active Flag is <code>0</code> or <code>false</code> the user account will be active.',
     'ldap_emp_num'              => 'Tau Taumahi LDAP',
     'ldap_email'                => 'LDAP Email',
     'ldap_test'                 => 'Test LDAP',
     'ldap_test_sync'            => 'Test LDAP Synchronization',
     'license'                   => 'Software License',
-    'load_remote'               => 'Use Gravatar',
-    'load_remote_help_text'		=> 'Uncheck this box if your install cannot load scripts from the outside internet. This will prevent Snipe-IT from trying load images from Gravatar.',
+    'load_remote'               => 'Load Remote Avatars',
+    'load_remote_help_text'		=> 'Uncheck this box if your install cannot load scripts from the outside internet. This will prevent Snipe-IT from trying load avatars from Gravatar or other outside sources.',
     'login'                     => 'Login Attempts',
     'login_attempt'             => 'Login Attempt',
     'login_ip'                  => 'IP Address',
@@ -131,6 +136,7 @@ return [
     'login_user_agent'          => 'User Agent',
     'login_help'                => 'List of attempted logins',
     'login_note'                => 'Whakauru Tuhipoka',
+    'login_note_placeholder'            => "If you do not have a login or have found a device belonging to this company, please call technical support at 888-555-1212. Thank you.",
     'login_note_help'           => 'Ka whakauruhia etahi waahanga i runga i to mata takiuru, hei tauira hei awhina i nga tangata i kitea he mea ngaro, tahae ranei. Ka whakaaetia e tenei mara <a href="https://help.github.com/articles/github-flavored-markdown/">Github flavored markdown</a>',
     'login_remote_user_text'    => 'Remote User login options',
     'login_remote_user_enabled_text' => 'Enable Login with Remote User Header',
@@ -146,13 +152,16 @@ return [
     'logo_print_assets_help'    => 'Use branding on printable asset lists ',
     'full_multiple_companies_support_help_text' => 'Te whakaiti i nga kaiwhakamahi (tae atu ki nga kaiwhakahaere) kua tohaina ki nga kamupene ki nga taonga a to kamupene.',
     'full_multiple_companies_support_text' => 'Te Tautoko Kamupene Maha',
+    'scope_locations_fmcs_support_text'  => 'Scope Locations with Full Multiple Companies Support',
+    'scope_locations_fmcs_support_help_text'  => 'Restrict locations to their selected company.',
+    'scope_locations_fmcs_check_button' => 'Check Compatibility',
+    'scope_locations_fmcs_support_disabled_text'  => 'This option is disabled because you have conflicting locations set for :count or more items.',
     'show_in_model_list'   => 'Show in Model Dropdowns',
     'optional'					=> 'kōwhiringa',
     'per_page'                  => 'Nga Hua Nga Whārangi',
     'php'                       => 'PHP Version',
-    'php_info'                  => 'PHP Info',
+    'php_info'                  => 'PHP info',
     'php_overview'              => 'PHP',
-    'php_overview_keywords'     => 'phpinfo, system, info',
     'php_overview_help'         => 'PHP System info',
     'php_gd_info'               => 'Me whakauruhia te php-g ki te whakaatu i nga waehere QR, tirohia nga tohutohu whakauru.',
     'php_gd_warning'            => 'Kāore i te whakauruhia te taputapu Atahanga PHP me te monohanga GD.',
@@ -218,6 +227,8 @@ return [
     'webhook_integration_help'    => ':app integration is optional, however the endpoint and channel are required if you wish to use it. To configure :app integration, you must first <a href=":webhook_link" target="_new" rel="noopener">create an incoming webhook</a> on your :app account. Click on the <strong>Test :app Integration</strong> button to confirm your settings are correct before saving. ',
     'webhook_integration_help_button'    => 'Once you have saved your :app information, a test button will appear.',
     'webhook_test_help'           => 'Test whether your :app integration is configured correctly. YOU MUST SAVE YOUR UPDATED :app SETTINGS FIRST.',
+    'shortcuts_enabled'         => 'Enable Shortcuts',
+    'shortcuts_help_text'       => '<strong>Windows</strong>: Alt + Access key, <strong>Mac</strong>: Control + Option + Access key',
     'snipe_version'  			=> 'Whakaaetanga-IT putanga',
     'support_footer'            => 'Support Footer Links ',
     'support_footer_help'       => 'Specify who sees the links to the Snipe-IT Support info and Users Manual',
@@ -227,7 +238,6 @@ return [
     'update'                    => 'Tautuhinga Whakahōu',
     'value'                     => 'Uara',
     'brand'                     => 'Waitohu',
-    'brand_keywords'            => 'footer, logo, print, theme, skin, header, colors, color, css',
     'brand_help'                => 'Logo, Site Name',
     'web_brand'                 => 'Web Branding Type',
     'about_settings_title'      => 'Mō Ngā Tautuhinga',
@@ -276,6 +286,8 @@ return [
     'two_factor_enrollment_text'	=> "E rua nga tohu motuhake e hiahiatia ana, ahakoa kuaore i whakauruhia to whakaaro. Whakatūwherahia tō taupānga Authenticator Google me te matawai i te waehere QR i raro nei hei whakauru i tō pūrere. I te wa i whakauruhia e koe to whakaaro, uruhia te waehere i raro nei",
     'require_accept_signature'      => 'Me tono Waitohu',
     'require_accept_signature_help_text'      => 'Ma te whakahoahoa i tenei ahua ka hiahia nga kaiwhakamahi ki te waitohu i te waahi ki te whakaae i tetahi taonga.',
+    'require_checkinout_notes'  => 'Require Notes on Checkin/Checkout',
+    'require_checkinout_notes_help_text'    => 'Enabling this feature will require the note fields to be populated when checking in or checking out an asset.',
     'left'        => 'maui',
     'right'        => 'tika',
     'top'        => 'runga',
@@ -313,24 +325,24 @@ return [
     'filter_by_keyword' => 'Filter by setting keyword',
     'security' => 'Security',
     'security_title' => 'Update Security Settings',
-    'security_keywords' => 'password, passwords, requirements, two factor, two-factor, common passwords, remote login, logout, authentication',
     'security_help' => 'Two-factor, Password Restrictions',
-    'groups_keywords' => 'permissions, permission groups, authorization',
     'groups_help' => 'Account permission groups',
     'localization' => 'Localization',
     'localization_title' => 'Update Localization Settings',
-    'localization_keywords' => 'localization, currency, local, locale, time zone, timezone, international, internatinalization, language, languages, translation',
     'localization_help' => 'Language, date display',
     'notifications' => 'Notifications',
     'notifications_help' => 'Email Alerts & Audit Settings',
     'asset_tags_help' => 'Incrementing and prefixes',
     'labels' => 'Labels',
     'labels_title' => 'Update Label Settings',
-    'labels_help' => 'Label sizes &amp; settings',
-    'purge_keywords' => 'permanently delete',
+    'labels_help' => 'Barcodes &amp; label settings',
     'purge_help' => 'Purea nga Tiwhikete Kua Mukua',
     'ldap_extension_warning' => 'It does not look like the LDAP extension is installed or enabled on this server. You can still save your settings, but you will need to enable the LDAP extension for PHP before LDAP syncing or login will work.',
     'ldap_ad' => 'LDAP/AD',
+    'ldap_test_label' => 'Test LDAP Sync',
+    'ldap_test_login' => ' Test LDAP Login',
+    'ldap_username_placeholder' => 'LDAP Username',
+    'ldap_password_placeholder' => 'LDAP Password',
     'employee_number' => 'Employee Number',
     'create_admin_user' => 'Create a User ::',
     'create_admin_success' => 'Success! Your admin user has been added!',
@@ -342,6 +354,8 @@ return [
     'setup_migration_create_user' => 'Next: Create User',
     'ldap_settings_link' => 'LDAP Settings Page',
     'slack_test' => 'Test <i class="fab fa-slack"></i> Integration',
+    'status_label_name' => 'Status Label Name',
+    'super_admin_only'  => 'Super Admin Only',
     'label2_enable'           => 'New Label Engine',
     'label2_enable_help'      => 'Switch to the new label engine. <b>Note: You will need to save this setting before setting others.</b>',
     'label2_template'         => 'Template',
@@ -356,12 +370,15 @@ return [
     'label2_2d_type'          => '2D Type Barcode',
     'label2_2d_type_help'     => 'Format for 2D barcodes',
     'label2_2d_target'        => '2D Barcode Target',
-    'label2_2d_target_help'   => 'The URL the 2D barcode points to when scanned',
+    'label2_2d_target_help'   => 'The data that will be contained in the 2D barcode',
     'label2_fields'           => 'Field Definitions',
     'label2_fields_help'      => 'Fields can be added, removed, and reordered in the left column. For each field, multiple options for Label and DataSource can be added, removed, and reordered in the right column.',
+    'purge_barcodes' => 'Purge Barcodes',
     'help_asterisk_bold'    => 'Text entered as <code>**text**</code> will be displayed as bold',
     'help_blank_to_use'     => 'Leave blank to use the value from <code>:setting_name</code>',
     'help_default_will_use' => '<code>:default</code> will use the value from <code>:setting_name</code>. <br>Note that the value of the barcodes must comply with the respective barcode spec in order to be successfully generated. Please see <a href="https://snipe-it.readme.io/docs/barcodes">the documentation <i class="fa fa-external-link"></i></a> for more details. ',
+    'asset_id'              => 'Asset ID',
+    'data'               => 'Data',
     'default'               => 'Default',
     'none'                  => 'None',
     'google_callback_help' => 'This should be entered as the callback URL in your Google OAuth app settings in your organization&apos;s <strong><a href="https://console.cloud.google.com/" target="_blank">Google developer console <i class="fa fa-external-link" aria-hidden="true"></i></a></strong>.',
@@ -373,7 +390,100 @@ return [
     'database_driver' => 'Database Driver',
     'bs_table_storage' => 'Table Storage',
     'timezone' => 'Timezone',
+    'test_mail' => 'Test Mail',
     'profile_edit'          => 'Edit Profile',
     'profile_edit_help'          => 'Allow users to edit their own profiles.',
+    'default_avatar' => 'Custom Default Avatar',
+    'default_avatar_help' => 'This image will be displayed as a profile if a user does not have a profile photo.',
+    'restore_default_avatar' => 'Restore <a href=":default_avatar" data-toggle="lightbox" data-type="image">original system default avatar</a>',
+    'restore_default_avatar_help' => '',
+    'due_checkin_days' => 'Due For Checkin Warning',
+    'due_checkin_days_help' => 'How many days before the expected checkin of an asset should it be listed in the "Due for checkin" page?',
+    'no_groups' => 'No groups have been created yet. Visit <code>Admin Settings > Permission Groups</code> to add one.',
+    'text' => 'Text',
+
+    'username_formats' => [
+        'username_format'		=> 'Ingoa Kaiwhakamahi Hōputu',
+        'firstname_lastname_format'	=> 'Ingoa Tuatahi Ingoa Mutu (jane.smith)',
+        'first_name_format'	        => 'First Name (jane)',
+        'last_name_format'		=> 'Last Name (doe)',
+        'filastname_format'			=> 'First Initial Last Name (jsmith)',
+        'lastnamefirstinitial_format' =>  'Last Name First Initial (smithj)',
+        'firstname_lastname_underscore_format' => 'First Name Last Name (jane_smith)',
+        'firstinitial.lastname' => 'First Initial Last Name (j.smith)',
+        'lastname_firstinitial' => 'Last Name First Initial (smith_j)',
+        'lastname_dot_firstinitial_format' => 'Last Name First Initial (smith.j)',
+        'firstnamelastname'     => 'First Name Last Name (janesmith)',
+        'firstnamelastinitial'  => 'First Name Last Initial (janes)',
+        'lastnamefirstname'      => 'Last Name.First Name (smith.jane)',
+    ],
+
+    'email_formats' => [
+        'email_format'			=> 'Hōputu Īmēra',
+        'firstname_lastname_format'	=> 'Ingoa Tuatahi Ingoa Mutu (jane.smith@example.com)',
+        'first_name_format'		=> 'Ingoa Tuatahi (jane@example.com)',
+        'last_name_format'		=> 'Last Name (doe@example.com)',
+        'filastname_format'			=> 'Tuatahi Ingoa Tuatahi (jsmith@example.com)',
+        'lastnamefirstinitial_format' =>  'Last Name First Initial (smithj@example.com)',
+        'firstname_lastname_underscore_format' => 'First Name Last Name (jane_smith@example.com)',
+        'firstinitial.lastname' => 'First Initial Last Name (j.smith@example.com)',
+        'lastname_firstinitial' => 'Last Name First Initial (smith_j@example.com)',
+        'lastname_dot_firstinitial_format' => 'Last Name First Initial (smith.j@example.com)',
+        'firstnamelastname'     => 'First Name Last Name (janesmith@example.com)',
+        'firstnamelastinitial'  => 'First Name Last Initial (janes@example.com)',
+        'lastnamefirstname'      => 'Last Name.First Name (smith.jane@example.com)',
+    ],
+
+
+
+    'logo_labels' => [
+        'acceptance_pdf_logo'       => 'PDF Logo',
+        'email_logo'                => 'Email Logo',
+        'label_logo'                => 'Label Logo',
+        'logo'                      => 'Site Logo',
+        'favicon'                   => 'Favicon',
+    ],
+
+    'logo_help' => [
+        'email_logo_size'       => 'Square logos in email look best. ',
+    ],
+
+    'logo_option_types' => [
+        'text' => 'Text',
+        'logo' => 'Moko',
+        'logo_and_text' => 'Logo and Text',
+    ],
+
+
+    'legends' => [
+        'scoping' => 'Scoping',
+        'formats' => 'Default Formats',
+        'profiles' => 'User Profiles',
+        'eula' => 'EULA & Acceptance Preferences',
+        'misc_display' => 'Miscellaneous Display Options',
+        'email' => 'Email Preferences',
+        'checkin' => 'Checkin Preferences',
+        'dashboard' => 'Login & Dashboard Preferences',
+        'misc' => 'Miscellaneous',
+        'logos' => 'Logos & Display',
+        'colors' => 'Colors & Skins',
+        'footer' => 'Footer Preferences',
+        'security' => 'Security Preferences',
+        'general' => 'General',
+        'intervals' => 'Intervals & Thresholds',
+    ],
+
+
+    /* Keywords for settings overview help */
+    'keywords' => [
+        'brand'             => 'footer, logo, print, theme, skin, header, colors, color, css',
+        'general_settings'  => 'company support, signature, acceptance, email format, username format, images, per page, thumbnail, eula, gravatar, tos, dashboard, privacy',
+        'groups'            => 'permissions, permission groups, authorization',
+        'labels'            => 'labels, barcodes, barcode, sheets, print, upc, qr, 1d, 2d',
+        'localization'      => 'localization, currency, local, locale, time zone, timezone, international, internatinalization, language, languages, translation',
+        'php_overview'      => 'phpinfo, system, info',
+        'purge'             => 'permanently delete',
+        'security'          => 'password, passwords, requirements, two factor, two-factor, common passwords, remote login, logout, authentication',
+    ],
 
 ];
diff --git a/resources/lang/mi-NZ/admin/settings/message.php b/resources/lang/mi-NZ/admin/settings/message.php
index cadcb6128d..1111536c4d 100644
--- a/resources/lang/mi-NZ/admin/settings/message.php
+++ b/resources/lang/mi-NZ/admin/settings/message.php
@@ -14,6 +14,9 @@ return [
         'restore_warning'       => 'Yes, restore it. I acknowledge that this will overwrite any existing data currently in the database. This will also log out all of your existing users (including you).',
         'restore_confirm'       => 'Are you sure you wish to restore your database from :filename?'
     ],
+    'restore' => [
+        'success'               => 'Your system backup has been restored. Please log in again.'
+    ],
     'purge' => [
         'error'     => 'Kua puta he hapa i te wa e purea ana.',
         'validation_failed'     => 'He hē te whakauru o te purge. Tena koa tuhia te kupu "MOTORI" i roto i te pouaka whakauru.',
@@ -33,6 +36,9 @@ return [
         'testing_authentication' => 'Testing LDAP Authentication...',
         'authentication_success' => 'User authenticated against LDAP successfully!'
     ],
+    'labels' => [
+        'null_template' => 'Label template not found. Please select a template.',
+        ],
     'webhook' => [
         'sending' => 'Sending :app test message...',
         'success' => 'Your :webhook_name Integration works!',
@@ -42,5 +48,12 @@ return [
         'error' => 'Something went wrong. :app responded with: :error_message',
         'error_redirect' => 'ERROR: 301/302 :endpoint returns a redirect. For security reasons, we don’t follow redirects. Please use the actual endpoint.',
         'error_misc' => 'Something went wrong. :( ',
-    ]
+        'webhook_fail' => ' webhook notification failed: Check to make sure the URL is still valid.',
+        'webhook_channel_not_found' => ' webhook channel not found.',
+        'ms_teams_deprecation' => 'The selected Microsoft Teams webhook URL will be deprecated Dec 31st, 2025. Please use a workflow URL. Microsoft\'s documentation on creating a workflow can be found <a href="https://support.microsoft.com/en-us/office/create-incoming-webhooks-with-workflows-for-microsoft-teams-8ae491c7-0394-4861-ba59-055e33f75498" target="_blank"> here.</a>',
+    ],
+    'location_scoping' => [
+        'not_saved' => 'Your settings were not saved.',
+        'mismatch' => 'There is 1 item in the database that need your attention before you can enable location scoping.|There are :count items in the database that need your attention before you can enable location scoping.',
+    ],
 ];
diff --git a/resources/lang/mi-NZ/admin/statuslabels/table.php b/resources/lang/mi-NZ/admin/statuslabels/table.php
index 3bdc6ff621..31939028e9 100644
--- a/resources/lang/mi-NZ/admin/statuslabels/table.php
+++ b/resources/lang/mi-NZ/admin/statuslabels/table.php
@@ -1,14 +1,14 @@
 <?php
 
 return array(
-    'about'      	=> 'Mō nga Tapanga Tūnga',
+    'about'      	=> 'About Status Types',
     'archived'      	=> 'Whakamahia',
     'create'      	=> 'Waihanga Tapanga Whakaaetanga',
     'color'      	=> 'Tae Tae',
     'default_label' => 'Default Label',
     'default_label_help' => 'This is used to ensure your most commonly used status labels appear at the top of the select box when creating/editing assets.',
     'deployable'      	=> 'Kaore e taea',
-    'info'      	=> 'Ka whakamahia nga tapanga taatai ​​hei whakaahua i nga ahuatanga ka taea e nga taonga hei whakauru ki a koe. Ka puta pea ki te whakapai, ki te ngaro, ki te tahae, me era atu. Ka taea e koe te hanga i nga waahanga hou hou mo nga mea e taea ana e nga mea e pa ana, e tatari ana me te kounga.',
+    'info'      	=> 'Status label types are used to describe the various states your assets could be in. They may be out for repair, lost/stolen, etc. You can create new status labels for your deployable, pending and archived assets according to your own workflow. For more information, <a href="https://snipe-it.readme.io/docs/overview#status-labels" target="_blank">see the documentation <i class="fa fa-external-link"></i></a>.',
     'name'      	=> 'Ingoa Tūnga',
     'pending'      	=> 'Kei te tatari',
     'status_type'   => 'Momo Tūnga',
diff --git a/resources/lang/mi-NZ/admin/users/general.php b/resources/lang/mi-NZ/admin/users/general.php
index 6ca455c380..736cc7be42 100644
--- a/resources/lang/mi-NZ/admin/users/general.php
+++ b/resources/lang/mi-NZ/admin/users/general.php
@@ -19,6 +19,8 @@ return [
     'print_assigned'    => 'Print All Assigned',
     'email_assigned'    => 'Email List of All Assigned',
     'user_notified'     => 'User has been emailed a list of their currently assigned items.',
+    'users_notified'    => 'The user has been emailed a list of their currently assigned items.|:count users have been emailed a list of their currently assigned items.',
+    'users_notified_warning' => ':count user has been emailed a list of their currently assigned items, however :no_email users did not have an email address so could not be emailed.|:count users have been emailed a list of their currently assigned items, however :no_email user(s) did not have an email address so could not be emailed.',
     'auto_assign_label' => 'Include this user when auto-assigning eligible licenses',
     'auto_assign_help'  => 'Skip this user in auto assignment of licenses',
     'software_user'     => 'Pūmanawa Kua tirotirohia ki: ingoa',
diff --git a/resources/lang/mi-NZ/admin/users/message.php b/resources/lang/mi-NZ/admin/users/message.php
index 2ad8d30aab..0bcc798fa1 100644
--- a/resources/lang/mi-NZ/admin/users/message.php
+++ b/resources/lang/mi-NZ/admin/users/message.php
@@ -6,7 +6,7 @@ return array(
     'declined'                  => 'Kua paopao angitu koe ki tenei taonga.',
     'bulk_manager_warn'	        => 'Kua angitu te whakahoutia o nga kaiwhakamahi, heoi kihai i tohua to tautuhinga kaiwhakahaere no te mea ko te kaiwhakahaere i tohua e koe i roto i te rarangi kaiwhakamahi kia whakatikaia, kaore ano hoki nga kaiwhakamahi i to ratou ake kaiwhakahaere. Tēnā koa tīpako anō i ō kaiwhakamahi, kaore i te kaiwhakahaere.',
     'user_exists'               => 'Kua noho kē te Kaiwhakamahi!',
-    'user_not_found'            => 'Kāore te Kaiwhakamahi i te tīariari.',
+    'user_not_found'            => 'User does not exist or you do not have permission view them.',
     'user_login_required'       => 'Kei te hiahiatia te mara takiuru',
     'user_has_no_assets_assigned' => 'No assets currently assigned to user.',
     'user_password_required'    => 'Kei te hiahiatia te kupuhipa.',
@@ -53,6 +53,7 @@ return array(
         'ldap_could_not_search' => 'Kāore i taea te rapu i te tūmau LDAP. Titiro koa ki te whirihoranga o tō tūmau LDAP i te kōnae whirihora LDAP. <br>Error mai i te Tūmau LDAP:',
         'ldap_could_not_get_entries' => 'Kāore i taea te tiki tuhinga mai i te tūmau LDAP. Titiro koa ki te whirihoranga o tō tūmau LDAP i te kōnae whirihora LDAP. <br>Error mai i te Tūmau LDAP:',
         'password_ldap' => 'Ko te kupuhipa mo tenei kaute kei te whakahaeretia e LDAP / Active Directory. Tēnā whakapā atu ki tō tari IT hei huri i tō kupuhipa.',
+        'multi_company_items_assigned' => 'This user has items assigned that belong to a different company. Please check them in or edit their company.'
     ),
 
     'deletefile' => array(
diff --git a/resources/lang/mi-NZ/admin/users/table.php b/resources/lang/mi-NZ/admin/users/table.php
index b0ebca5cea..17454f1fb3 100644
--- a/resources/lang/mi-NZ/admin/users/table.php
+++ b/resources/lang/mi-NZ/admin/users/table.php
@@ -22,7 +22,7 @@ return array(
     'managed_locations'     => 'Ngā Tauwāhi Whakahaere',
     'managed_users'         => 'Managed Users',
     'name' 					=> 'Ingoa',
-    'nogroup'               => 'No groups have been created yet. To add one, visit: ',
+    'nogroup'               => 'No groups have been created yet. To add one, visit:',
     'notes'                 => 'Tuhipoka',
     'password_confirm' 		=> 'Whakaae Kupuhipa',
     'password' 				=> 'Kupuhipa',
diff --git a/resources/lang/mi-NZ/auth.php b/resources/lang/mi-NZ/auth.php
index db310aa1bb..14d8acfce0 100644
--- a/resources/lang/mi-NZ/auth.php
+++ b/resources/lang/mi-NZ/auth.php
@@ -15,6 +15,6 @@ return array(
 
     'failed' => 'These credentials do not match our records.',
     'password' => 'The provided password is incorrect.',
-    'throttle' => 'Too many login attempts. Please try again in :seconds seconds.',
+    'throttle' => 'Too many login attempts. Please try again in :minutes minute(s).',
 
 );
diff --git a/resources/lang/mi-NZ/auth/message.php b/resources/lang/mi-NZ/auth/message.php
index dffb0d32d5..8b9d85743f 100644
--- a/resources/lang/mi-NZ/auth/message.php
+++ b/resources/lang/mi-NZ/auth/message.php
@@ -6,8 +6,6 @@ return array(
     'account_not_found'      => 'He hē te ingoa kaiwhakamahi, kupuhipa rānei.',
     'account_not_activated'  => 'Kāore tēnei pūkete kaiwhakamahi i te whakahohea.',
     'account_suspended'      => 'Kua tohua tenei pūkete kaiwhakamahi.',
-    'account_banned'         => 'Ka whakatakahia tenei pūkete kaiwhakamahi.',
-    'throttle'               => 'Too many failed login attempts. Please try again in :minutes minutes.',
 
     'two_factor' => array(
         'already_enrolled'      => 'Your device is already enrolled.',
diff --git a/resources/lang/mi-NZ/button.php b/resources/lang/mi-NZ/button.php
index 529958f096..37df4452c0 100644
--- a/resources/lang/mi-NZ/button.php
+++ b/resources/lang/mi-NZ/button.php
@@ -7,6 +7,7 @@ return [
     'checkin_and_delete'  	    => 'Checkin All / Delete User',
     'delete'  	                => 'Mukua',
     'edit'    	                => 'Whakatika',
+    'clone'    	                => 'Clone',
     'restore' 	                => 'Whakaora',
     'remove'                    => 'Remove',
     'request'                   => 'Tono',
@@ -21,4 +22,13 @@ return [
     'add_maintenance'           => 'Add Maintenance',
     'append'                    => 'Append',
     'new'                       => 'Hou',
+    'var' => [
+        'clone'     => 'Clone :item_type',
+        'edit'      => 'Edit :item_type',
+        'delete'    => 'Delete :item_type',
+        'restore'   => 'Restore :item_type',
+        'create'    => 'Create New :item_type',
+        'checkout'  => 'Checkout :item_type',
+        'checkin'   => 'Checkin :item_type',
+    ]
 ];
diff --git a/resources/lang/mi-NZ/general.php b/resources/lang/mi-NZ/general.php
index 89a571f7d4..028493340b 100644
--- a/resources/lang/mi-NZ/general.php
+++ b/resources/lang/mi-NZ/general.php
@@ -10,7 +10,7 @@ return [
     'action'                => 'Mahi',
     'activity_report'		=> 'Mahinga Mahi',
     'address'				=> 'Wāhitau',
-    'admin'					=> 'Kaiwhakahaere',
+    'admin'					=> 'Admin Settings',
     'admin_tooltip'			=> 'This user has admin privileges',
     'superuser'				=> 'Superuser',
     'superuser_tooltip'		=> 'This user has superuser privileges',
@@ -23,13 +23,16 @@ return [
     'asset_models'			=> 'Ngā Ahua Ahua',
     'asset_model'			=> 'Tauira',
     'asset'					=> 'Tahua',
+    'asset_previous'        => 'Asset (Previously Assigned)',
     'asset_report'          => 'Pūrongo Ahua',
     'asset_tag'				=> 'Tae Taonga',
     'asset_tags'            => 'Asset Tags',
     'assets_available'		=> 'Assets available',
     'accept_assets'         => 'Accept Assets :name',
     'accept_assets_menu'    => 'Accept Assets',
+    'accept_item'           => 'Accept Item',
     'audit'				    => 'Arotake',
+    'audits'				=> 'Audits',
     'audit_report'			=> 'Manatoko Whakamuri',
     'assets'				=> 'Ngā taonga',
     'assets_audited'        => 'assets audited',
@@ -61,9 +64,12 @@ return [
     'changepassword'  		=> 'Hurihia te Kupuhipa',
     'checkin'  				=> 'Tirohia',
     'checkin_from'  		=> 'Tuhinga ka whai mai',
+    'checkin_note'  		=> 'Checkin Note',
+    'checkout_note'  		=> 'Checkout Note',
     'checkout'  			=> 'Taki',
     'checkouts_count'       => 'Checkouts',
     'checkins_count'        => 'Checkins',
+    'checkin_and_delete'  	=> 'Checkin and Delete',
     'user_requests_count'   => 'Requests',
     'city'  				=> 'City',
     'click_here'			=> 'Pāwhiri ki konei',
@@ -77,7 +83,7 @@ return [
     'consumables'			=> 'Ngā whakamahinga',
     'country'  				=> 'Whenua',
     'could_not_restore'     => 'Error restoring :item_type: :error',
-    'not_deleted'           => 'The :item_type is not deleted so it cannot be restored',
+    'not_deleted'           => 'The :item_type was not deleted and therefore cannot be restored',
     'create'				=> 'Waihanga Hou',
     'created'               => 'Kua waihangatia te Mea',
     'created_asset'			=> 'waihanga i te taonga',
@@ -86,11 +92,13 @@ return [
     'record_created' 		=> 'Record Created',
     'updated_at' 			=> 'Whakahoutia i',
     'currency'  			=> '$', // this is deprecated
+    'currency_text'  		=> 'Currency', //
     'current'  				=> 'I teie nei',
     'current_password'      => 'Current Password',
     'customize_report'      => 'Customize Report',
     'custom_report'         => 'Ripoata Ahua Ritenga',
     'dashboard'				=> 'Papatohu',
+    'data_source'           => 'Data Source',
     'days'      			=> 'ra',
     'days_to_next_audit'    => 'Ko nga ra ki te arotake i muri',
     'date'					=> 'Rā',
@@ -98,7 +106,7 @@ return [
     'debug_warning_text'    => 'Ko tenei tono kei te whakahaere i te mahinga whakaputa me te taraiwa kua whakahohea. Ka taea e tenei te whakaatu i nga raraunga taarata mehemea ka uru atu to tono ki te ao o waho. Monokia te aratau taapatu mā te whakarite i te uara <code>APP_DEBUG123_7____132 i roto i to kōnae <code>.env</code> ki <code>false</code>.',
     'delete'  				=> 'Mukua',
     'delete_confirm'  		=> 'Are you sure you wish to delete :item?',
-    'delete_confirm_no_undo' => 'Are you sure you wish to delete :item? This can not be undone.',
+    'delete_confirm_no_undo' => 'Are you sure, you wish to delete :item? This cannot be undone.',
     'deleted'  				=> 'Kua mukua',
     'delete_seats'  		=> 'Kua mukua nga Maatai',
     'deletion_failed'       => 'Deletion failed',
@@ -114,29 +122,13 @@ return [
     'editprofile'  			=> 'Whakatikahia to Whakaatu',
     'eol'					=> 'EOL',
     'email_domain'			=> 'Ingoa Īmēra',
-    'email_format'			=> 'Hōputu Īmēra',
     'employee_number'       => 'Employee Number',
     'email_domain_help'		=> 'Ka whakamahia tenei ki te whakaputa i nga wahitau īmēra ina kawemai',
     'error'				    => 'Error',
     'exclude_archived'      => 'Exclude Archived Assets',
     'exclude_deleted'       => 'Exclude Deleted Assets',
     'example'				=> 'Example: ',
-    'filastname_format'			=> 'Tuatahi Ingoa Tuatahi (jsmith@example.com)',
-    'firstname_lastname_format'	=> 'Ingoa Tuatahi Ingoa Mutu (jane.smith@example.com)',
-    'firstname_lastname_underscore_format' => 'First Name Last Name (jane_smith@example.com)',
-    'lastnamefirstinitial_format' =>  'Last Name First Initial (smithj@example.com)',
-    'firstintial_dot_lastname_format' => 'First Initial Last Name (j.smith@example.com)',
-    'firstname_lastname_display'	=> 'First Name Last Name (Jane Smith)',
-    'lastname_firstname_display'	=> 'Last Name First Name (Smith Jane)',
-    'name_display_format'	=> 'Name Display Format',
-    'first'					=> 'Tuatahi',
-    'firstnamelastname'     => 'First Name Last Name (janesmith@example.com)',
-    'lastname_firstinitial' => 'Last Name First Initial (smith_j@example.com)',
-    'firstinitial.lastname' => 'First Initial Last Name (j.smith@example.com)',
-    'firstnamelastinitial'  => 'First Name Last Initial (janes@example.com)',
-    'lastnamefirstname'      => 'Last Name First Name (smith.jane@example.com)',
-    'first_name'			=> 'Ingoa Tuatahi',
-    'first_name_format'		=> 'Ingoa Tuatahi (jane@example.com)',
+
     'files'                 => 'Files',
     'file_name'				=> 'Kōnae',
     'file_type'             => 'File Type',
@@ -156,9 +148,9 @@ return [
     'image_delete'         	=> 'Mukua te Whakaahua',
     'include_deleted'       => 'Include Deleted Assets',
     'image_upload'         	=> 'Tukuna Whakaahua',
-    'filetypes_accepted_help'    => 'Accepted filetype is :types. Max upload size allowed is :size.|Accepted filetypes are :types. Max upload size allowed is :size.',
-    'filetypes_size_help'   => 'Max upload size allowed is :size.',
-    'image_filetypes_help'  => 'Accepted filetypes are jpg, webp, png, gif, svg, and avif. Max upload size allowed is :size.',
+    'filetypes_accepted_help'    => 'Accepted filetype is :types. The maximum size allowed is :size.|Accepted filetypes are :types. The maximum upload size allowed is :size.',
+    'filetypes_size_help'   => 'The maximum upload size allowed is :size.',
+    'image_filetypes_help'  => 'Accepted Filetypes are jpg, webp, png, gif, svg, and avif. The maximum upload size allowed is :size.',
     'unaccepted_image_type'  => 'This image file was not readable. Accepted filetypes are jpg, webp, png, gif, and svg. The mimetype of this file is: :mimetype.',
     'import'         	    => 'Kawemai',
     'import_this_file'      => 'Map fields and process this file',
@@ -178,12 +170,17 @@ return [
     'last'					=> 'Last',
     'last_login'            => 'Whakauru Whakamutunga',
     'last_name'             => 'Ingoa Whakamutunga',
+    'firstname_lastname_display'	=> 'First Name Last Name (Jane Smith)',
+    'lastname_firstname_display'	=> 'Last Name First Name (Smith Jane)',
+    'name_display_format'	=> 'Name Display Format',
+    'first'					=> 'Tuatahi',
+    'first_name'			=> 'Ingoa Tuatahi',
     'license'				=> 'Raihana',
     'license_report'        => 'Ripoata Raihana',
     'licenses_available'	=> 'Licenses available',
     'licenses'				=> 'Raihana',
     'list_all'				=> 'Rārangi Katoa',
-    'loading'				=> 'Loading... please wait....',
+    'loading'				=> 'Loading... please wait...',
     'lock_passwords'        => 'This field value will not be saved in a demo installation.',
     'feature_disabled'      => 'Kua monokia tenei ahuatanga mo te tautuhinga whakaatu.',
     'location'              => 'Wāhi',
@@ -193,7 +190,7 @@ return [
     'logout'				=> 'Whakaaturanga',
     'lookup_by_tag'     => 'Te tirotiro i te Tohu Taonga',
     'maintenances'          => 'Maintenances',
-    'manage_api_keys'       => 'Manage API Keys',
+    'manage_api_keys'       => 'Manage API keys',
     'manufacturer'			=> 'Kaihanga',
     'manufacturers'			=> 'Kaihanga',
     'markdown'				=> 'Ka whakaaetia e tenei maraa <a href="https://help.github.com/articles/github-flavored-markdown/">Github flavored markdown</a>.',
@@ -215,6 +212,14 @@ return [
     'no_results'			=> 'Kore Hua.',
     'no'  					=> 'No',
     'notes'  				=> 'Tuhipoka',
+    'note_added'            => 'Note Added',
+    'options'				=> 'Options',
+    'preview'				=> 'Preview',
+    'add_note'              => 'Add Note',
+    'note_edited'            => 'Note Edited',
+    'edit_note'              => 'Edit Note',
+    'note_deleted'            => 'Note Deleted',
+    'delete_note'              => 'Delete Note',
     'order_number'          => 'Tau Tau',
     'only_deleted'          => 'Only Deleted Assets',
     'page_menu'				=> 'Te whakaatu i nga mea _MENU_',
@@ -229,7 +234,7 @@ return [
     'purchase_date'         => 'Raa Hokona',
     'qty'		            => 'QTY',
     'quantity'		        => 'Maha',
-    'quantity_minimum'      => 'You have :count items below or almost below minimum quantity levels',
+    'quantity_minimum'      => 'You have one item below or almost below minimum quantity levels|You have :count items below or almost below minimum quantity levels',
     'quickscan_checkin'  	=> 'Quick Scan Checkin',
     'quickscan_checkin_status'  	=> 'Checkin Status',
     'ready_to_deploy'		=> 'Kua rite ki te Whakamahia',
@@ -254,7 +259,7 @@ return [
     'select_all'            => 'Select All',
     'search'				=> 'Rapua',
     'select_category'       => 'Tīpakohia he Kāwai',
-    'select_datasource' => 'Select a Datasource',
+    'select_datasource' => 'Select a data source',
     'select_department'     => 'Tīpakohia he Tari',
     'select_depreciation'	=> 'Tīpakohia te Momo Utu',
     'select_location'		=> 'Tīpakohia he Tauwāhi',
@@ -274,13 +279,15 @@ return [
     'signed_off_by'         => 'Signed Off By',
     'skin'       			=> 'Skin',
     'webhook_msg_note'        => 'A notification will be sent via webhook',
-    'webhook_test_msg'        => 'Oh hai! Looks like your :app integration with Snipe-IT is working!',
+    'webhook_test_msg'        => 'Oh hai! It looks like your :app integration with Snipe-IT is working!',
     'some_features_disabled' => 'TE WHAKAMAHI MĀTAURANGA: Kua monokia ētahi āhuatanga mo tenei tāutanga me te raraunga i tenei pūnaha ka tautuhi i ia ra.',
     'site_name'				=> 'Ingoa Pae',
     'state'  				=> 'State',
     'status_labels'			=> 'Ngā Tapanga Tūnga',
+    'status_label'			=> 'Status Label',
     'status'    			=> 'Tūnga',
     'accept_eula'           => 'Acceptance Agreement',
+    'show_or_hide_eulas' => 'Show/Hide EULAs',
     'supplier'              => 'Kaihoko',
     'suppliers'  			=> 'Kaihoko',
     'sure_to_delete'        => 'Kei te hiahia koe kia mukua',
@@ -296,9 +303,9 @@ return [
     'type'  				=> 'Momo',
     'undeployable'			=> 'Kaore e taea te whakaputa',
     'unknown_admin'			=> 'Kaiwhakahaere unknown',
-    'username_format'		=> 'Ingoa Kaiwhakamahi Hōputu',
     'username'              => 'Ingoa Kaiwhakamahi',
     'update'                => 'Whakahou',
+    'updating_item' => 'Updating :item',
     'upload_filetypes_help'      => 'Allowed filetypes are png, gif, jpg, jpeg, doc, docx, pdf, xls, xlsx, txt, lic, xml, zip, rtf and rar. Max upload size allowed is :size.',
     'uploaded'              => 'Kua tukuna',
     'user'					=> 'Kaiwhakamahi',
@@ -323,10 +330,10 @@ return [
     'token_expired'         => 'Kua pau te raupapa puka ki a koe. Tena ngana ano.',
     'login_enabled'         => 'Login Enabled',
     'audit_due'             => 'Due for Audit',
-    'audit_due_days'        => 'Assets Due for Audit Within :days Day|Assets Due for Audit Within :days Days',
+    'audit_due_days'        => '{}Assets Due or Overdue for Audit|[1]Assets Due or Overdue for Audit Within a Day|[2,*]Assets Due or Overdue for Audit Within :days Days',
     'checkin_due'           => 'Due for Checkin',
     'checkin_overdue'       => 'Overdue for Checkin',
-    'checkin_due_days'      => 'Assets Due for Checkin Within :days Day|Assets Due for Checkin Within :days Days',
+    'checkin_due_days'      => '{}Due for Checkin|[1]Assets Due for Checkin Within :days Day|[2,*]Assets Due for Checkin Within :days Days',
     'audit_overdue'         => 'Overdue for Audit',
     'accept'                => 'Accept :asset',
     'i_accept'              => 'I accept',
@@ -339,16 +346,16 @@ return [
     'view_all'              => 'view all',
     'hide_deleted'          => 'Hide Deleted',
     'email'                 => 'Īmēra',
-    'do_not_change'         => 'Do Not Change',
-    'bug_report'            => 'Report a Bug',
+    'do_not_change'         => 'Do not change',
+    'bug_report'            => 'Report a bug',
     'user_manual'           => 'User\'s Manual',
     'setup_step_1'          => 'Step 1',
     'setup_step_2'          => 'Step 2',
     'setup_step_3'          => 'Step 3',
     'setup_step_4'          => 'Step 4',
     'setup_config_check'    => 'Configuration Check',
-    'setup_create_database' => 'Create Database Tables',
-    'setup_create_admin'    => 'Create Admin User',
+    'setup_create_database' => 'Create database tables',
+    'setup_create_admin'    => 'Create an admin user',
     'setup_done'            => 'Finished!',
     'bulk_edit_about_to'    => 'You are about to edit the following: ',
     'checked_out'           => 'Kua Mataarahia',
@@ -383,6 +390,8 @@ return [
     'new_license'           => 'New License',
     'new_accessory'         => 'New Accessory',
     'new_consumable'        => 'New Consumable',
+    'new_component'         => 'New Component',
+    'new_user'              => 'New User',
     'collapse'              => 'Collapse',
     'assigned'              => 'Assigned',
     'asset_count'           => 'Asset Count',
@@ -418,19 +427,20 @@ return [
     'bulk_soft_delete'      =>'Also soft-delete these users. Their asset history will remain intact unless/until you purge deleted records in the Admin Settings.',
     'bulk_checkin_delete_success' => 'Your selected users have been deleted and their items have been checked in.',
     'bulk_checkin_success' => 'The items for the selected users have been checked in.',
-    'set_to_null'           => 'Delete values for this asset|Delete values for all :asset_count assets ',
+    'set_to_null'           => 'Delete values for this selection|Delete values for all :selection_count selections ',
     'set_users_field_to_null'  => 'Delete :field values for this user|Delete :field values for all :user_count users ',
     'na_no_purchase_date'   => 'N/A - No purchase date provided',
     'assets_by_status'      => 'Assets by Status',
     'assets_by_status_type'      => 'Assets by Status Type',
     'pie_chart_type'        => 'Dashboard Pie Chart Type',
     'hello_name'            => 'Hello, :name!',
-    'unaccepted_profile_warning'   => 'You have :count items requiring acceptance. Click here to accept or decline them',
+    'unaccepted_profile_warning'   => 'You have one item requiring acceptance. Click here to accept or decline it | You have :count items requiring acceptance. Click here to accept or decline them',
     'start_date'            => 'Start Date',
     'end_date'            => 'End Date',
     'alt_uploaded_image_thumbnail' => 'Uploaded thumbnail',
     'placeholder_kit'       => 'Select a kit',
     'file_not_found'        => 'File not found',
+    'log_record_not_found'  => 'No record for that log entry was found.',
     'preview_not_available' => '(no preview)',
     'setup'                 => 'Setup',
     'pre_flight'            => 'Pre-Flight',
@@ -512,7 +522,7 @@ return [
     'checked_out_to_fields' => 'Checked Out To Fields',
     'percent_complete' => '% kua oti',
     'uploading' => 'Uploading... ',
-    'upload_error' => 'Error uploading file. Please check that there are no empty rows and that no column names are duplicated.',
+    'upload_error' => 'Error uploading file. Please check that you have no empty rows or duplicated column names in your CSV, and that the server permissions allow uploads.',
     'copy_to_clipboard' => 'Copy to Clipboard',
     'copied' => 'Copied!',
     'status_compatibility' => 'If assets are already assigned, they cannot be changed to a non-deployable status type and this value change will be skipped.',
@@ -549,6 +559,71 @@ return [
         'license_seats'  => ':count License Seat|:count License Seats',
         'consumables'  => ':count Consumable|:count Consumables',
         'components'  => ':count Component|:count Components',
-    ]
+    ],
+
+    'more_info' => 'He Korero Ano',
+    'quickscan_bulk_help' => 'Checking this box will edit the asset record to reflect this new location. Leaving it unchecked will simply note the location in the audit log. Note that if this asset is checked out, it will not change the location of the person, asset or location it is checked out to.',
+    'whoops' => 'Whoops!',
+    'something_went_wrong' => 'Something went wrong with your request.',
+    'close' => 'Close',
+    'expires' => 'Ka puta',
+    'map_fields'=> 'Map :item_type Fields',
+    'remaining_var' => ':count Remaining',
+    'label' => 'Label',
+    'import_asset_tag_exists' => 'An asset with the asset tag :asset_tag already exists and an update was not requested. No change was made.',
+    'countries_manually_entered_help' => 'Values with an asterisk (*) were manually entered and do not match existing ISO 3166 dropdown values',
+    'accessories_assigned' => 'Assigned Accessories',
+    'user_managed_passwords' => 'Password Management',
+    'user_managed_passwords_disallow' => 'Disallow users from managing their own passwords',
+    'user_managed_passwords_allow' => 'Allow users to manage their own passwords',
+    'from' => 'From',
+    'by' => 'Na',
+
+// Add form placeholders here
+    'placeholders' => [
+        'notes'  => 'Add a note',
+    ],
+
+    'breadcrumb_button_actions' => [
+        'edit_item' => 'Edit :name',
+        'checkout_item' => 'Checkout :name',
+        'checkin_item' => 'Checkin :name',
+    ],
+
+    'skins' => [
+        'site_default' => 'Site Default',
+        'default_blue' => 'Default Blue',
+        'blue_dark' => 'Blue (Dark Mode)',
+        'green' => 'Green Dark',
+        'green_dark' => 'Green (Dark Mode)',
+        'red' => 'Red Dark',
+        'red_dark' => 'Red (Dark Mode)',
+        'orange' => 'Orange Dark',
+        'orange_dark' => 'Orange (Dark Mode)',
+        'black' => 'Black',
+        'black_dark' => 'Black (Dark Mode)',
+        'purple' => 'Purple',
+        'purple_dark' => 'Purple (Dark Mode)',
+        'yellow' => 'Yellow',
+        'yellow_dark' => 'Yellow (Dark Mode)',
+        'high_contrast' => 'High Contrast',
+
+    ],
+
+    'select_all_none' => 'Select/Unselect All',
+    'generic_model_not_found' => 'That :model was not found or you do not have permission to access it',
+    'deleted_models' => 'Deleted Asset Models',
+    'deleted_users' => 'Deleted Users',
+    'cost_each' => ':amount each',
+    'remove_current_image' => 'Remove current :type image',
+
+    'seeding' => [
+        'manufacturers' => [
+            'button' => 'Create Manufacturers',
+            'prompt' => 'You do not have any manufacturers yet. Would you like to seed a list of common manufacturers? (THIS WILL OVERWRITE EXISTING MANUFACTURERS, including those that have been soft-deleted.)',
+            'success' => 'Manufacturers seeded successfully',
+            'error' => 'Could not seed manufacturers. A manufacturer record already exists and seeding would overwrite it.|Could not seed manufacturers. :count manufacturer records already exist and seeding would overwrite them.',
+        ],
+    ],
 
 ];
diff --git a/resources/lang/mi-NZ/localizations.php b/resources/lang/mi-NZ/localizations.php
index f1232dd138..827ed4fca1 100644
--- a/resources/lang/mi-NZ/localizations.php
+++ b/resources/lang/mi-NZ/localizations.php
@@ -2,7 +2,7 @@
 
 return [
 
-    'select_language' => 'Select a language',
+    'select_language' => 'Select a Language',
     'languages' => [
         'en-US'=> 'English, US',
         'en-GB'=> 'English, UK',
@@ -40,7 +40,9 @@ return [
         'ms-MY'=> 'Malay',
         'mi-NZ'=> 'Maori',
         'mn-MN'=> 'Mongolian',
-        'no-NO'=> 'Norwegian',
+        'nb-NO'=> 'Norwegian Bokmål',
+        'om-ET' => 'Oromo (Ethiopian)',
+        //'nn-NO'=> 'Norwegian Nynorsk',
         'fa-IR'=> 'Persian',
         'pl-PL'=> 'Polish',
         'pt-PT'=> 'Portuguese',
@@ -66,7 +68,7 @@ return [
         'zu-ZA'=> 'Zulu',
     ],
 
-    'select_country' => 'Select a country',
+    'select_country' => 'Select a Country',
     
     'countries' => [
         'AC'=>'Ascension Island',
@@ -133,6 +135,7 @@ return [
         'EC'=>'Ecuador',
         'EE'=>'Estonia',
         'EG'=>'Egypt',
+        'GB-ENG'=>'England',
         'ER'=>'Eritrea',
         'ES'=>'Spain',
         'ET'=>'Ethiopia',
@@ -231,6 +234,7 @@ return [
         'NG'=>'Nigeria',
         'NI'=>'Nicaragua',
         'NL'=>'Netherlands',
+        'GB-NIR' => 'Northern Ireland',
         'NO'=>'Norway',
         'NP'=>'Nepal',
         'NR'=>'Nauru',
@@ -258,7 +262,7 @@ return [
         'RU'=>'Russian Federation',
         'RW'=>'Rwanda',
         'SA'=>'Saudi Arabia',
-        'UK'=>'Scotland',
+        'GB-SCT'=>'Scotland',
         'SB'=>'Solomon Islands',
         'SC'=>'Seychelles',
         'SS'=>'South Sudan',
@@ -310,6 +314,7 @@ return [
         'VI'=>'Virgin Islands (U.S.)',
         'VN'=>'Viet Nam',
         'VU'=>'Vanuatu',
+        'GB-WLS' =>'Wales',
         'WF'=>'Wallis And Futuna Islands',
         'WS'=>'Samoa',
         'YE'=>'Yemen',
diff --git a/resources/lang/mi-NZ/mail.php b/resources/lang/mi-NZ/mail.php
index fa5e76fc7b..423c6f7ebb 100644
--- a/resources/lang/mi-NZ/mail.php
+++ b/resources/lang/mi-NZ/mail.php
@@ -23,24 +23,25 @@ return [
     'Item_Requested' => 'Ko te nama i tonoa',
     'License_Checkin_Notification' => 'License checked in',
     'License_Checkout_Notification' => 'License checked out',
+    'license_for'   => 'License for',
     'Low_Inventory_Report' => 'Pūrongo Inventory Low',
     'a_user_canceled' => 'Kua whakakorea e tetahi kaiwhakamahi tetahi tonoemi i runga i te paetukutuku',
     'a_user_requested' => 'Kua tono tetahi kaiwhakamahi i tetahi mea i runga i te paetukutuku',
     'acceptance_asset_accepted' => 'A user has accepted an item',
     'acceptance_asset_declined' => 'A user has declined an item',
-    'accessory_name' => 'Ingoa Whakauru:',
-    'additional_notes' => 'Nga Tuhipoka Atu:',
+    'accessory_name' => 'Ingoa Whakauru',
+    'additional_notes' => 'Nga Tuhipoka Atu',
     'admin_has_created' => 'Kua hanga e tetahi kaiwhakahaere tetahi kaute mo koe i runga i te: paetukutuku tukutuku.',
-    'asset' => 'Tahua:',
-    'asset_name' => 'Ingoa Ahua:',
+    'asset' => 'Tahua',
+    'asset_name' => 'Ingoa Ahua',
     'asset_requested' => 'Ka tonohia te taonga',
     'asset_tag' => 'Tae Taonga',
     'assets_warrantee_alert' => 'There is :count asset with a warranty expiring in the next :threshold days.|There are :count assets with warranties expiring in the next :threshold days.',
     'assigned_to' => 'Tohua Ki To',
     'best_regards' => 'Ko nga whakaaro pai,',
-    'canceled' => 'Kua whakakorehia:',
-    'checkin_date' => 'Rangi Whakatau:',
-    'checkout_date' => 'Rā Whakatau:',
+    'canceled' => 'Kua whakakorehia',
+    'checkin_date' => 'Rangi Titiro',
+    'checkout_date' => 'Rā Rārangi',
     'checkedout_from' => 'Checked out from',
     'checkedin_from'  => 'Checked in from',
     'checked_into' => 'Checked into',
@@ -49,27 +50,30 @@ return [
     'click_to_confirm' => 'Tena koahia te hono e whai ake nei hei whakauru i to:',
     'current_QTY' => 'QTY o nāianei',
     'days' => 'Nga ra',
-    'expecting_checkin_date' => 'Te Whakataunga Whakataunga Whakaaro:',
+    'expecting_checkin_date' => 'Ko te Whakataunga Whakataunga Whakaaro',
     'expires' => 'Ka puta',
     'hello' => 'Hiha',
     'hi' => 'Hi',
     'i_have_read' => 'Kua korerohia e au, kua whakaae ki nga tikanga whakamahi, kua riro mai hoki tenei mea.',
     'inventory_report' => 'Inventory Report',
-    'item' => 'Te nama:',
+    'item' => 'Tuhinga',
+    'item_checked_reminder' => 'This is a reminder that you currently have :count items checked out to you that you have not accepted or declined. Please click the link below to confirm your decision.',
     'license_expiring_alert' => 'There is :count license expiring in the next :threshold days.|There are :count licenses expiring in the next :threshold days.',
     'link_to_update_password' => 'Koahia te hono e whai ake nei hei whakahou i to: kupuhipahipa:',
-    'login' => 'Whakauru:',
+    'login' => 'Whakauru',
     'login_first_admin' => 'Whakauru ki to taahiranga hou Snipe-IT ma te whakamahi i nga taipitopito kei raro nei:',
     'low_inventory_alert' => 'There is :count item that is below minimum inventory or will soon be low.|There are :count items that are below minimum inventory or will soon be low.',
     'min_QTY' => 'Min QTY',
     'name' => 'Ingoa',
     'new_item_checked' => 'Kua tohua tetahi mea hou i raro i to ingoa, kei raro iho nga korero.',
+    'new_item_checked_with_acceptance' => 'A new item has been checked out under your name that requires acceptance, details are below.',
+    'recent_item_checked' => 'An item was recently checked out under your name that requires acceptance, details are below.',
     'notes' => 'Tuhipoka',
-    'password' => 'Kupuhipa:',
+    'password' => 'Kupuhipa',
     'password_reset' => 'Tautuhi Kupuhipa',
     'read_the_terms' => 'Tena koa korerotia nga tikanga o te whakamahi i raro.',
     'read_the_terms_and_click' => 'Please read the terms of use below, and click on the link at the bottom to confirm that you read and agree to the terms of use, and have received the asset.',
-    'requested' => 'I tonohia:',
+    'requested' => 'I tonohia',
     'reset_link' => 'Tautuhi Hononga Kupuhipa',
     'reset_password' => 'Pāwhiri ki konei kia tautuhi i to kupuhipa:',
     'rights_reserved' => 'All rights reserved.',
@@ -86,8 +90,10 @@ return [
     'upcoming-audits' => 'There is :count asset that is coming up for audit within :threshold days.|There are :count assets that are coming up for audit within :threshold days.',
     'user' => 'Kaiwhakamahi',
     'username' => 'Ingoa Kaiwhakamahi',
+    'unaccepted_asset_reminder' => 'Reminder: You have Unaccepted Assets.',
     'welcome' => 'Nau mai: ingoa',
     'welcome_to' => 'Nau mai ki: web!',
     'your_assets' => 'View Your Assets',
     'your_credentials' => 'Nga tohu tohu Snipe-IT',
+    'mail_sent' => 'Mail sent successfully!',
 ];
diff --git a/resources/lang/mi-NZ/validation.php b/resources/lang/mi-NZ/validation.php
index 6aff446fe4..b4c92ce9be 100644
--- a/resources/lang/mi-NZ/validation.php
+++ b/resources/lang/mi-NZ/validation.php
@@ -13,87 +13,150 @@ return [
     |
     */
 
-    'accepted'             => 'Ko te: me whakaae te huanga.',
-    'active_url'           => 'Ko: ko te huanga ehara i te URL whaimana.',
-    'after'                => 'Ko: ko te huanga me te ra i muri i: ra.',
-    'after_or_equal'       => 'Ko: ko te huanga me te ra i muri i te waa ranei: te ra.',
-    'alpha'                => 'Ko te: ko te huanga anake he reta.',
-    'alpha_dash'           => 'Ko te: ko te huanga anake he reta, he tau, he panga.',
-    'alpha_num'            => 'Ko te: ko te huanga anake he reta me nga tau.',
-    'array'                => 'Ko te: me tohu he huanga.',
-    'before'               => 'Ko: ko te huanga me te ra i mua i: ra.',
-    'before_or_equal'      => 'Ko: ko te huanga me he ra i mua atu i te wa ranei: te ra.',
-    'between'              => [
-        'numeric' => 'Te: ko te tohu i waenganui i: min me te: max.',
-        'file'    => 'Ko: ko te tohu i waenganui i: min me te: max kilobytes.',
-        'string'  => 'Ko te: ko te tohu i waenganui i: min me te: max.',
-        'array'   => 'Ko te: ko te tohu i waenganui i: min me te: max max.',
+    'accepted' => 'The :attribute field must be accepted.',
+    'accepted_if' => 'The :attribute field must be accepted when :other is :value.',
+    'active_url' => 'The :attribute field must be a valid URL.',
+    'after' => 'The :attribute field must be a date after :date.',
+    'after_or_equal' => 'The :attribute field must be a date after or equal to :date.',
+    'alpha' => 'The :attribute field must only contain letters.',
+    'alpha_dash' => 'The :attribute field must only contain letters, numbers, dashes, and underscores.',
+    'alpha_num' => 'The :attribute field must only contain letters and numbers.',
+    'array' => 'The :attribute field must be an array.',
+    'ascii' => 'The :attribute field must only contain single-byte alphanumeric characters and symbols.',
+    'before' => 'The :attribute field must be a date before :date.',
+    'before_or_equal' => 'The :attribute field must be a date before or equal to :date.',
+    'between' => [
+        'array' => 'The :attribute field must have between :min and :max items.',
+        'file' => 'The :attribute field must be between :min and :max kilobytes.',
+        'numeric' => 'The :attribute field must be between :min and :max.',
+        'string' => 'The :attribute field must be between :min and :max characters.',
     ],
-    'boolean'              => 'Ko: Ko te waahi tohu he pono, he teka ranei.',
-    'confirmed'            => 'Ko: ko te tohu whakatairanga kaore e taurite.',
-    'date'                 => 'Ko: ko te huanga ehara i te ra whaimana.',
-    'date_format'          => 'Ko: ko te huanga kaore e rite ki te horopaki: te whakatakotoranga.',
-    'different'            => 'Ko: te huanga me: me wehe ke atu.',
-    'digits'               => 'Ko: ko te tohu: ko nga nama tau.',
-    'digits_between'       => 'Ko te: ko te tohu i waenganui i: min me te: max tohu.',
-    'dimensions'           => 'Ko te: ko te ahuatanga o te ahua o te ahua o te whakapakoko.',
-    'distinct'             => 'Ko te: ko te tahua huanga ko te uara taapiri.',
-    'email'                => 'Ko te: ko te huanga he wahitau īmēra tika.',
-    'exists'               => 'Ko te mea i tīpakohia: he muhu te huanga.',
-    'file'                 => 'Ko: ko te huanga he kōnae.',
-    'filled'               => 'Ko: Ko te waahi tohu ka whai hua.',
-    'image'                => 'Ko te: me kii he huanga.',
+    'boolean' => 'Ko te waahi  :attribute tohu he pono, he teka ranei.',
+    'can' => 'The :attribute field contains an unauthorized value.',
+    'confirmed' => 'The :attribute field confirmation does not match.',
+    'contains' => 'The :attribute field is missing a required value.',
+    'current_password' => 'The password is incorrect.',
+    'date' => 'The :attribute field must be a valid date.',
+    'date_equals' => 'The :attribute field must be a date equal to :date.',
+    'date_format' => 'The :attribute field must match the format :format.',
+    'decimal' => 'The :attribute field must have :decimal decimal places.',
+    'declined' => 'The :attribute field must be declined.',
+    'declined_if' => 'The :attribute field must be declined when :other is :value.',
+    'different' => 'The :attribute field and :other must be different.',
+    'digits' => 'The :attribute field must be :digits digits.',
+    'digits_between' => 'The :attribute field must be between :min and :max digits.',
+    'dimensions' => 'The :attribute field has invalid image dimensions.',
+    'distinct' => 'Ko te: ko te tahua huanga ko te uara taapiri.',
+    'doesnt_end_with' => 'The :attribute field must not end with one of the following: :values.',
+    'doesnt_start_with' => 'The :attribute field must not start with one of the following: :values.',
+    'email' => 'The :attribute field must be a valid email address.',
+    'ends_with' => 'The :attribute field must end with one of the following: :values.',
+    'enum' => 'Ko te mea i  :attribute he muhu te huanga.',
+    'exists' => 'Ko te mea i tīpakohia: he muhu te huanga.',
+    'extensions' => 'The :attribute field must have one of the following extensions: :values.',
+    'file' => 'The :attribute field must be a file.',
+    'filled' => 'Ko: Ko te waahi tohu ka whai hua.',
+    'gt' => [
+        'array' => 'The :attribute field must have more than :value items.',
+        'file' => 'The :attribute field must be greater than :value kilobytes.',
+        'numeric' => 'The :attribute field must be greater than :value.',
+        'string' => 'The :attribute field must be greater than :value characters.',
+    ],
+    'gte' => [
+        'array' => 'The :attribute field must have :value items or more.',
+        'file' => 'The :attribute field must be greater than or equal to :value kilobytes.',
+        'numeric' => 'The :attribute field must be greater than or equal to :value.',
+        'string' => 'The :attribute field must be greater than or equal to :value characters.',
+    ],
+    'hex_color' => 'The :attribute field must be a valid hexadecimal color.',
+    'image' => 'The :attribute field must be an image.',
     'import_field_empty'    => 'The value for :fieldname cannot be null.',
-    'in'                   => 'Ko te mea i tīpakohia: he muhu te huanga.',
-    'in_array'             => 'Ko te: ko te waahi huanga kaore i roto i: atu.',
-    'integer'              => 'Ko te: ko te huanga me he tau.',
-    'ip'                   => 'Ko: ko te huanga me waiho he wāhitau IP tika.',
-    'ipv4'                 => 'Ko: ko te huanga me waiho he wāhitau IPv4 tika.',
-    'ipv6'                 => 'Ko te: me tohu he huanga IPv6 tika.',
-    'is_unique_department' => 'The :attribute must be unique to this Company Location',
-    'json'                 => 'Ko: he tohu JSON tika te huanga.',
-    'max'                  => [
-        'numeric' => 'Ko te: ko te huanga ka nui atu i te: max.',
-        'file'    => 'Ko te: ko te huanga ka nui atu i te: max kilobytes.',
-        'string'  => 'Ko te: ko te huanga kaore e nui atu i: max tohu.',
-        'array'   => 'Ko te: ko te huanga kaore i nui atu i: te maha o nga mea.',
+    'in' => 'Ko te mea i tīpakohia: he muhu te huanga.',
+    'in_array' => 'The :attribute field must exist in :other.',
+    'integer' => 'The :attribute field must be an integer.',
+    'ip' => 'The :attribute field must be a valid IP address.',
+    'ipv4' => 'The :attribute field must be a valid IPv4 address.',
+    'ipv6' => 'The :attribute field must be a valid IPv6 address.',
+    'json' => 'The :attribute field must be a valid JSON string.',
+    'list' => 'The :attribute field must be a list.',
+    'lowercase' => 'The :attribute field must be lowercase.',
+    'lt' => [
+        'array' => 'The :attribute field must have less than :value items.',
+        'file' => 'The :attribute field must be less than :value kilobytes.',
+        'numeric' => 'The :attribute field must be less than :value.',
+        'string' => 'The :attribute field must be less than :value characters.',
     ],
-    'mimes'                => 'Ko: ko te huanga he kōnae o te momo:: uara.',
-    'mimetypes'            => 'Ko: ko te huanga he kōnae o te momo:: uara.',
-    'min'                  => [
-        'numeric' => 'Ko: ko te tikanga kia iti ake: min.',
-        'file'    => 'Ko te: ko te tikanga kia iti ake: min kilobytes.',
-        'string'  => 'Ko te: ko te tohu ko te iti rawa: min.',
-        'array'   => 'Ko te: me whai i te huanga: iti rawa nga taonga.',
+    'lte' => [
+        'array' => 'The :attribute field must not have more than :value items.',
+        'file' => 'The :attribute field must be less than or equal to :value kilobytes.',
+        'numeric' => 'The :attribute field must be less than or equal to :value.',
+        'string' => 'The :attribute field must be less than or equal to :value characters.',
     ],
-    'starts_with'          => 'The :attribute must start with one of the following: :values.',
-    'ends_with'            => 'The :attribute must end with one of the following: :values.',
+    'mac_address' => 'The :attribute field must be a valid MAC address.',
+    'max' => [
+        'array' => 'The :attribute field must not have more than :max items.',
+        'file' => 'The :attribute field must not be greater than :max kilobytes.',
+        'numeric' => 'The :attribute field must not be greater than :max.',
+        'string' => 'The :attribute field must not be greater than :max characters.',
+    ],
+    'max_digits' => 'The :attribute field must not have more than :max digits.',
+    'mimes' => 'The :attribute field must be a file of type: :values.',
+    'mimetypes' => 'The :attribute field must be a file of type: :values.',
+    'min' => [
+        'array' => 'The :attribute field must have at least :min items.',
+        'file' => 'The :attribute field must be at least :min kilobytes.',
+        'numeric' => 'The :attribute field must be at least :min.',
+        'string' => 'The :attribute field must be at least :min characters.',
+    ],
+    'min_digits' => 'The :attribute field must have at least :min digits.',
+    'missing' => 'The :attribute field must be missing.',
+    'missing_if' => 'The :attribute field must be missing when :other is :value.',
+    'missing_unless' => 'The :attribute field must be missing unless :other is :value.',
+    'missing_with' => 'The :attribute field must be missing when :values is present.',
+    'missing_with_all' => 'The :attribute field must be missing when :values are present.',
+    'multiple_of' => 'The :attribute field must be a multiple of :value.',
+    'not_in' => 'Ko te mea i tīpakohia: he muhu te huanga.',
+    'not_regex' => 'The :attribute field format is invalid.',
+    'numeric' => 'The :attribute field must be a number.',
+    'password' => [
+        'letters' => 'The :attribute field must contain at least one letter.',
+        'mixed' => 'The :attribute field must contain at least one uppercase and one lowercase letter.',
+        'numbers' => 'The :attribute field must contain at least one number.',
+        'symbols' => 'The :attribute field must contain at least one symbol.',
+        'uncompromised' => 'The given :attribute has appeared in a data leak. Please choose a different :attribute.',
+    ],
+    'percent'       => 'The depreciation minimum must be between 0 and 100 when depreciation type is percentage.',
 
-    'not_in'               => 'Ko te mea i tīpakohia: he muhu te huanga.',
-    'numeric'              => 'Ko te: me tohu he huanga.',
-    'present'              => 'Ko te: ko te waahi tohu kia noho.',
-    'valid_regex'          => 'That is not a valid regex. ',
-    'regex'                => 'Ko te: ko te hōputu huanga he muhu.',
-    'required'             => 'Ko te: e hiahiatia ana te waahi huanga.',
-    'required_if'          => 'Ko te: ka hiahiatia te waahi huanga ina: ko etahi atu: te uara.',
-    'required_unless'      => 'Ko: E hiahiatia ana te waahi huanga engari: ko etahi atu kei roto: nga uara.',
-    'required_with'        => 'Ko: e hiahiatia ana te waahi huanga ina: kei te waahi nga uara.',
-    'required_with_all'    => 'Ko: e hiahiatia ana te waahi huanga ina: kei te waahi nga uara.',
-    'required_without'     => 'Ko: e hiahiatia ana te waahi huanga ka: kaore nga uara i te wa.',
+    'present' => 'Ko te: ko te waahi tohu kia noho.',
+    'present_if' => 'The :attribute field must be present when :other is :value.',
+    'present_unless' => 'The :attribute field must be present unless :other is :value.',
+    'present_with' => 'The :attribute field must be present when :values is present.',
+    'present_with_all' => 'The :attribute field must be present when :values are present.',
+    'prohibited' => 'The :attribute field is prohibited.',
+    'prohibited_if' => 'The :attribute field is prohibited when :other is :value.',
+    'prohibited_unless' => 'The :attribute field is prohibited unless :other is in :values.',
+    'prohibits' => 'The :attribute field prohibits :other from being present.',
+    'regex' => 'The :attribute field format is invalid.',
+    'required' => 'Ko te: e hiahiatia ana te waahi huanga.',
+    'required_array_keys' => 'The :attribute field must contain entries for: :values.',
+    'required_if' => 'Ko te: ka hiahiatia te waahi huanga ina: ko etahi atu: te uara.',
+    'required_if_accepted' => 'The :attribute field is required when :other is accepted.',
+    'required_if_declined' => 'The :attribute field is required when :other is declined.',
+    'required_unless' => 'Ko: E hiahiatia ana te waahi huanga engari: ko etahi atu kei roto: nga uara.',
+    'required_with' => 'Ko: e hiahiatia ana te waahi huanga ina: kei te waahi nga uara.',
+    'required_with_all' => 'The :attribute field is required when :values are present.',
+    'required_without' => 'Ko: e hiahiatia ana te waahi huanga ka: kaore nga uara i te wa.',
     'required_without_all' => 'Ko te: ka hiahiatia te waahi huanga kaore he: ko nga uara kei reira.',
-    'same'                 => 'Ko: te huanga me te: me uru atu tetahi atu.',
-    'size'                 => [
-        'numeric' => 'Ko: ko te huanga: te rahi.',
-        'file'    => 'Ko te: ko te tohu: ko te rahi o nga kaitao.',
-        'string'  => 'Ko: ko te tohu: ko te rahi o te kaituhi.',
-        'array'   => 'Ko te: me whai kohinga: nga taonga rahi.',
+    'same' => 'The :attribute field must match :other.',
+    'size' => [
+        'array' => 'The :attribute field must contain :size items.',
+        'file' => 'The :attribute field must be :size kilobytes.',
+        'numeric' => 'The :attribute field must be :size.',
+        'string' => 'The :attribute field must be :size characters.',
     ],
+    'starts_with' => 'The :attribute field must start with one of the following: :values.',
     'string'               => 'Ko te: me tohu he huanga.',
-    'timezone'             => 'Ko: ko te huanga he waa whaimana.',
     'two_column_unique_undeleted' => 'The :attribute must be unique across :table1 and :table2. ',
-    'unique'               => 'Ko te: kua tangohia te huanga.',
-    'uploaded'             => 'Ko te: ko te huanga i rahua te tuku.',
-    'url'                  => 'Ko te: ko te hōputu huanga he muhu.',
     'unique_undeleted'     => 'Ko te: me tino ahurei te huanga.',
     'non_circular'         => 'The :attribute must not create a circular reference.',
     'not_array'            => ':attribute cannot be an array.',
@@ -102,11 +165,14 @@ return [
     'numbers'              => 'Password must contain at least one number.',
     'case_diff'            => 'Password must use mixed case.',
     'symbols'              => 'Password must contain symbols.',
-    'gte'                  => [
-        'numeric'          => 'Value cannot be negative'
-    ],
-    'checkboxes'           => ':attribute contains invalid options.',
-    'radio_buttons'        => ':attribute is invalid.',
+    'timezone' => 'The :attribute field must be a valid timezone.',
+    'unique' => 'Ko te: kua tangohia te huanga.',
+    'uploaded' => 'Ko te: ko te huanga i rahua te tuku.',
+    'uppercase' => 'The :attribute field must be uppercase.',
+    'url' => 'The :attribute field must be a valid URL.',
+    'ulid' => 'The :attribute field must be a valid ULID.',
+    'uuid' => 'The :attribute field must be a valid UUID.',
+    'fmcs_location' => 'Full multiple company support and location scoping is enabled in the Admin Settings, and the selected location and selected company are not compatible.',
 
 
     /*
@@ -120,16 +186,22 @@ return [
     |
     */
 
+    'email_array'      => 'Kotahi, neke atu ranei nga wahitau īmēra he muhu.',
+    'checkboxes'           => ':attribute contains invalid options.',
+    'radio_buttons'        => ':attribute is invalid.',
+    
     'custom' => [
         'alpha_space' => 'Ko te: kei roto i te waahi tohu he momo e kore e whakaaetia.',
-        'email_array'      => 'Kotahi, neke atu ranei nga wahitau īmēra he muhu.',
+
         'hashed_pass'      => 'He hē tō kupuhipa o nāianei',
         'dumbpwd'          => 'He noa rawa te kupuhipa.',
         'statuslabel_type' => 'Me tīpako i te momo tahua tohu whaimana',
+        'custom_field_not_found'          => 'This field does not seem to exist, please double check your custom field names.',
+        'custom_field_not_found_on_model' => 'This field seems to exist, but is not available on this Asset Model\'s fieldset.',
 
         // date_format validation with slightly less stupid messages. It duplicates a lot, but it gets the job done :(
-        // We use this because the default error message for date_format is reflects php Y-m-d, which non-PHP
-        // people won't know how to format. 
+        // We use this because the default error message for date_format reflects php Y-m-d, which non-PHP
+        // people won't know how to format.
         'purchase_date.date_format'     => 'The :attribute must be a valid date in YYYY-MM-DD format',
         'last_audit_date.date_format'   =>  'The :attribute must be a valid date in YYYY-MM-DD hh:mm:ss format',
         'expiration_date.date_format'   =>  'The :attribute must be a valid date in YYYY-MM-DD format',
@@ -137,9 +209,15 @@ return [
         'expected_checkin.date_format'  =>  'The :attribute must be a valid date in YYYY-MM-DD format',
         'start_date.date_format'        =>  'The :attribute must be a valid date in YYYY-MM-DD format',
         'end_date.date_format'          =>  'The :attribute must be a valid date in YYYY-MM-DD format',
+        'invalid_value_in_field' => 'Invalid value included in this field',
 
-    ],
+        'ldap_username_field' => [
+            'not_in' =>         '<code>sAMAccountName</code> (mixed case) will likely not work. You should use <code>samaccountname</code> (lowercase) instead.'
+        ],
+        'ldap_auth_filter_query' => ['not_in' => '<code>uid=samaccountname</code> is probably not a valid auth filter. You probably want <code>uid=</code> '],
+        'ldap_filter' => ['regex' => 'This value should probably not be wrapped in parentheses.'],
 
+        ],
     /*
     |--------------------------------------------------------------------------
     | Custom Validation Attributes
@@ -155,8 +233,16 @@ return [
 
     /*
     |--------------------------------------------------------------------------
-    | Generic Validation Messages
+    | Generic Validation Messages - we use these in the jquery validation where we don't have
+    | access to the :attribute
     |--------------------------------------------------------------------------
     */
-    'invalid_value_in_field' => 'Invalid value included in this field',
+
+    'generic' => [
+        'invalid_value_in_field' => 'Invalid value included in this field',
+        'required' => 'This field is required',
+        'email' => 'Please enter a valid email address',
+    ],
+
+
 ];
diff --git a/resources/lang/mk-MK/account/general.php b/resources/lang/mk-MK/account/general.php
index 1a9e2c03b8..78f162bb3f 100644
--- a/resources/lang/mk-MK/account/general.php
+++ b/resources/lang/mk-MK/account/general.php
@@ -1,11 +1,17 @@
 <?php
 
 return array(
-    'personal_api_keys' => 'Personal API Keys',
-    'api_key_warning' => 'When generating an API token, be sure to copy it down immediately as they will not be visible to you again.',
-    'api_base_url' => 'Your API base url is located at:',
+    'personal_api_keys' => 'Лични API клучеви',
+    'personal_access_token' => 'Личен токен за пристап',
+    'personal_api_keys_success' => 'Личниот API клуч :key е успешно креиран',
+    'here_is_api_key' => 'Ова е вашиот личен токен за пристап. Ова е единствениот пат кога ќе биде прикажан затоа немојте да го изгубите! Сега можете да го користите токенот за да правите API барања.',
+    'api_key_warning' => 'Кога се генерира API токен, бидете сигурни да го ископирате бидејќи нема повеќе да биде прикажан.',
+    'api_base_url' => 'Вашата адреса на API база е лоцирана на:',
     'api_base_url_endpoint' => '/&lt;endpoint&gt;',
-    'api_token_expiration_time' => 'API tokens are set to expire in:',
-    'api_reference' => 'Please check the <a href="https://snipe-it.readme.io/reference" target="_blank">API reference</a> to find specific API endpoints and additional API documentation.',
-    'profile_updated' => 'Account successfully updated',
+    'api_token_expiration_time' => 'API токенот ќе истече за:',
+    'api_reference' => 'Ве молиме проверете <a href="https://snipe-it.readme.io/reference" target="_blank">API упатство </a> за да најдете API крајни точки и дополнителна API документација.',
+    'profile_updated' => 'Сметката е успешно ажурирана',
+    'no_tokens' => 'Немате креирано токени за личен пристап.',
+    'enable_sounds' => 'Овозможи звучни ефекти',
+    'enable_confetti' => 'Овозможи конфети ефекти',
 );
diff --git a/resources/lang/mk-MK/admin/accessories/general.php b/resources/lang/mk-MK/admin/accessories/general.php
index 1303eeeedb..6ab9ec14e6 100644
--- a/resources/lang/mk-MK/admin/accessories/general.php
+++ b/resources/lang/mk-MK/admin/accessories/general.php
@@ -16,7 +16,7 @@ return array(
     'update'  							=> 'Уредување на додаток',
     'use_default_eula'					=> 'Наместо ова, користете <a href="#" data-toggle="modal" data-target="#eulaModal">стандардни Услови за користење</a>.',
     'use_default_eula_disabled'			=> '<del>Наместо тоа користете стандардни Услови за користење.</del> Не се внесени стандардни Услови за користење. Ве молиме внесете ги во Поставки.',
-    'clone'                             => 'Clone Accessory',
-    'delete_disabled'                   => 'This accessory cannot be deleted yet because some items are still checked out.',
+    'clone'                             => 'Клонирај додаток',
+    'delete_disabled'                   => 'Овој додаток не може да се избрише сè уште бидејќи некои ставки сè уште се позајмени.',
 
 );
diff --git a/resources/lang/mk-MK/admin/accessories/message.php b/resources/lang/mk-MK/admin/accessories/message.php
index b3d37a9a94..077432b72a 100644
--- a/resources/lang/mk-MK/admin/accessories/message.php
+++ b/resources/lang/mk-MK/admin/accessories/message.php
@@ -2,8 +2,8 @@
 
 return array(
 
-    'does_not_exist' => 'The accessory [:id] does not exist.',
-    'not_found' => 'That accessory was not found.',
+    'does_not_exist' => 'Додатокот [:id] не постои.',
+    'not_found' => 'Додатокот не е пронајден.',
     'assoc_users'	 => 'Овој додаток во моментов има :count ставки задолжени на корисници. Ве молиме проверете во додатоците и обидете се повторно. ',
 
     'create' => array(
@@ -25,8 +25,12 @@ return array(
      'checkout' => array(
         'error'   		=> 'Додатокот не беше задолжен, обидете се повторно',
         'success' 		=> 'Додатокот е задолжен.',
-        'unavailable'   => 'Accessory is not available for checkout. Check quantity available',
-        'user_does_not_exist' => 'Тој корисник е неважечки. Обидете се повторно.'
+        'unavailable'   => 'Додатокот не е достапен за позајмување. Проверете ја достапната количина',
+        'user_does_not_exist' => 'Тој корисник е неважечки. Обидете се повторно.',
+         'checkout_qty' => array(
+            'lte'  => 'Во моментов е достапен само еден додаток од овој тип, а вие се обидувате да позајмите :checkout_qty. Ве молиме, прилагодете ја количината за позајмување или вкупната залиха на овој додаток и обидете се повторно. Има вкупно :number_currently_remaining достапни додатоци, а вие се обидувате да позајмите :checkout_qty. Ве молиме, прилагодете ја количината за позајмување или вкупната залиха на овој додаток и обидете се повторно.',
+            ),
+           
     ),
 
     'checkin' => array(
diff --git a/resources/lang/mk-MK/admin/accessories/table.php b/resources/lang/mk-MK/admin/accessories/table.php
index 46c1de7d28..ad74214081 100644
--- a/resources/lang/mk-MK/admin/accessories/table.php
+++ b/resources/lang/mk-MK/admin/accessories/table.php
@@ -6,6 +6,4 @@ return array(
     'id'      					=> 'ID',
     'require_acceptance'      	=> 'Прифаќање',
     'title'      				=> 'Име на додаток',
-
-
 );
diff --git a/resources/lang/mk-MK/admin/asset_maintenances/form.php b/resources/lang/mk-MK/admin/asset_maintenances/form.php
index eacd6cada3..ffc722d638 100644
--- a/resources/lang/mk-MK/admin/asset_maintenances/form.php
+++ b/resources/lang/mk-MK/admin/asset_maintenances/form.php
@@ -1,14 +1,14 @@
 <?php
 
     return [
-        'asset_maintenance_type' => 'Asset Maintenance Type',
+        'asset_maintenance_type' => 'Тип на оддржување на средства',
         'title'                  => 'Наслов',
-        'start_date'             => 'Start Date',
-        'completion_date'        => 'Completion Date',
+        'start_date'             => 'Почетен датум',
+        'completion_date'        => 'Датум на завршување',
         'cost'                   => 'Цена',
         'is_warranty'            => 'Подобрување на гаранцијата',
-        'asset_maintenance_time' => 'Asset Maintenance Time (in days)',
+        'asset_maintenance_time' => 'Време на одржување на средства (во денови)',
         'notes'                  => 'Забелешки',
-        'update'                 => 'Update Asset Maintenance',
-        'create'                 => 'Create Asset Maintenance'
+        'update'                 => 'Освежи одржување на средства',
+        'create'                 => 'Креирај одржување на средства'
     ];
diff --git a/resources/lang/mk-MK/admin/asset_maintenances/general.php b/resources/lang/mk-MK/admin/asset_maintenances/general.php
index dfbf043bf6..cc9a7108ec 100644
--- a/resources/lang/mk-MK/admin/asset_maintenances/general.php
+++ b/resources/lang/mk-MK/admin/asset_maintenances/general.php
@@ -8,9 +8,9 @@
         'repair'             => 'Поправка',
         'maintenance'        => 'Одржување',
         'upgrade'            => 'Надградба',
-        'calibration'        => 'Calibration',
-        'software_support'   => 'Software Support',
-        'hardware_support'   => 'Hardware Support',
-        'configuration_change'   => 'Configuration Change',
-        'pat_test'           => 'PAT Test',
+        'calibration'        => 'Калибрирање',
+        'software_support'   => 'Софтверска поддршка',
+        'hardware_support'   => 'Хардверска поддршка',
+        'configuration_change'   => 'Промена на конфигурацијата',
+        'pat_test'           => 'PAT тест',
     ];
diff --git a/resources/lang/mk-MK/admin/categories/general.php b/resources/lang/mk-MK/admin/categories/general.php
index 8862d9b365..9f51c97357 100644
--- a/resources/lang/mk-MK/admin/categories/general.php
+++ b/resources/lang/mk-MK/admin/categories/general.php
@@ -3,13 +3,13 @@
 return array(
     'asset_categories' 					=> 'Категории на основни средства',
     'category_name'  					=> 'Име на категорија',
-    'checkin_email'                     => 'Send email to user on checkin/checkout.',
-    'checkin_email_notification'        => 'This user will be sent an email on checkin/checkout.',
+    'checkin_email'                     => 'Испрати е-пошта до корисникот при позајмување/враќање.',
+    'checkin_email_notification'        => 'На корисникот ќе му биде испратена е-пошта при позајмување/враќање.',
     'clone'                             => 'Клонирај Категорија',
     'create'  							=> 'Креирај категорија',
     'edit'                              => 'Уреди категорија',
-    'email_will_be_sent_due_to_global_eula' => 'An email will be sent to the user because the global EULA is being used.',
-    'email_will_be_sent_due_to_category_eula' => 'An email will be sent to the user because a EULA is set for this category.',
+    'email_will_be_sent_due_to_global_eula' => 'Е-пошта ќе биде испратена бидејќи се користи глобалниот EULA.',
+    'email_will_be_sent_due_to_category_eula' => 'Е-пошта ќе биде испратена бидејќи EULA се користи за оваа категорија.',
     'eula_text'							=> 'Категорија - Услови за користење',
     'eula_text_help'					=> 'Ова поле ви овозможува да ги прилагодите вашите Услови за користење за сите видови на средства. Ако имате само едни Услови за користење за сите ваши основни средства, можете да вклучите подолу да се користaт стандардните Услови за користење.',
     'name'                              => 'Име на категорија',
@@ -20,6 +20,6 @@ return array(
     'update'  							=> 'Уреди категорија',
     'use_default_eula'					=> 'Наместо ова, користете <a href="#" data-toggle="modal" data-target="#eulaModal">стандардни Услови за користење</a>.',
     'use_default_eula_disabled'			=> '<del>Наместо ова, користете стандардни Услови за користење.</del> Не се внесени стандардни Услови за користење. Ве молиме внесете ги во Поставки.',
-    'use_default_eula_column'			=> 'Use default EULA',
+    'use_default_eula_column'			=> 'Користи основна EULA',
 
 );
diff --git a/resources/lang/mk-MK/admin/categories/message.php b/resources/lang/mk-MK/admin/categories/message.php
index 13578118e7..6618f71ebe 100644
--- a/resources/lang/mk-MK/admin/categories/message.php
+++ b/resources/lang/mk-MK/admin/categories/message.php
@@ -14,7 +14,7 @@ return array(
     'update' => array(
         'error'   => 'Категоријата не беше ажурирана, обидете се повторно',
         'success' => 'Категоријата е успешно ажурирана.',
-        'cannot_change_category_type'   => 'You cannot change the category type once it has been created',
+        'cannot_change_category_type'   => 'Не можете да го смените типот на категорија откако е создадена',
     ),
 
     'delete' => array(
diff --git a/resources/lang/mk-MK/admin/companies/general.php b/resources/lang/mk-MK/admin/companies/general.php
index 6e0a0f426b..8002061ce8 100644
--- a/resources/lang/mk-MK/admin/companies/general.php
+++ b/resources/lang/mk-MK/admin/companies/general.php
@@ -3,5 +3,5 @@
 return [
     'select_company' => 'Изберете компанија',
     'about_companies' => 'За компаниите',
-    'about_companies_description' => '        You can use companies as a simple informative field, or you can use them to restrict asset visibility and availability to users with a specific company by enabling Full Company Support in your Admin Settings.',
+    'about_companies_description' => '        Можете да ги користите компаниите како едноставно информативно поле или можете да ги користите за да ограничите видливоста и достапноста на средствата за корисниците со конкретна компанија со вклучување на целосна поддршка за компании во вашите административни поставки.',
 ];
diff --git a/resources/lang/mk-MK/admin/companies/message.php b/resources/lang/mk-MK/admin/companies/message.php
index c38348ecdd..6b1f79a2b5 100644
--- a/resources/lang/mk-MK/admin/companies/message.php
+++ b/resources/lang/mk-MK/admin/companies/message.php
@@ -2,7 +2,7 @@
 
 return [
     'does_not_exist' => 'Компанијата не постои.',
-    'deleted'        => 'Deleted company',
+    'deleted'        => 'Избришана компанија',
     'assoc_users'    => 'Оваа компанија моментално е поврзана со барем еден модел и не може да се избрише. Ве молиме да ги ажурирате вашите модели за да не ја користите оваа компанија и обидете се повторно. ',
     'create' => [
         'error'   => 'Компанијата не е креирана, обидете се повторно.',
diff --git a/resources/lang/mk-MK/admin/companies/table.php b/resources/lang/mk-MK/admin/companies/table.php
index 58a4d78818..21aa7e2999 100644
--- a/resources/lang/mk-MK/admin/companies/table.php
+++ b/resources/lang/mk-MK/admin/companies/table.php
@@ -2,9 +2,9 @@
 return array(
     'companies' => 'Компании',
     'create'    => 'Креирај компанија',
-    'email'     => 'Company Email',
+    'email'     => 'Е-пошта на компанијата',
     'title'     => 'Компанија',
-    'phone'     => 'Company Phone',
+    'phone'     => 'Телефон на компанијата',
     'update'    => 'Ажурирај компанија',
     'name'      => 'Име на компанија',
     'id'        => 'ID',
diff --git a/resources/lang/mk-MK/admin/components/general.php b/resources/lang/mk-MK/admin/components/general.php
index cf94d5cd0b..06488f5acc 100644
--- a/resources/lang/mk-MK/admin/components/general.php
+++ b/resources/lang/mk-MK/admin/components/general.php
@@ -12,5 +12,5 @@ return array(
     'remaining' 			             => 'Останува',
     'total' 			                 => 'Вкупно',
     'update'                            => 'Уреди компонента',
-    'checkin_limit'            => 'Amount checked in must be equal to or less than :assigned_qty'
+    'checkin_limit'            => 'Количината што е вратена мора да биде еднаква или помала од :assigned_qty'
 );
diff --git a/resources/lang/mk-MK/admin/components/message.php b/resources/lang/mk-MK/admin/components/message.php
index 3d957da9a0..69d891b1cf 100644
--- a/resources/lang/mk-MK/admin/components/message.php
+++ b/resources/lang/mk-MK/admin/components/message.php
@@ -17,14 +17,15 @@ return array(
     'delete' => array(
         'confirm'   => 'Дали сте сигурни дека сакате да ја избришете оваа компонента?',
         'error'   => 'Имаше проблем со бришење на компонентата. Обидете се повторно.',
-        'success' => 'Компонентата беше успешно избришана.'
+        'success' => 'Компонентата беше успешно избришана.',
+        'error_qty'   => 'Some components of this type are still checked out. Please check them in and try again.',
     ),
 
      'checkout' => array(
         'error'   		=> 'Компонентата не беше задолжена, обидете се повторно',
         'success' 		=> 'Компонентата е задолжена.',
         'user_does_not_exist' => 'Тој корисник е неважечки. Обидете се повторно.',
-        'unavailable'      => 'Not enough components remaining: :remaining remaining, :requested requested ',
+        'unavailable'      => 'Нема доволно компоненти: :remaining remaining, :requested requested ',
     ),
 
     'checkin' => array(
diff --git a/resources/lang/mk-MK/admin/consumables/general.php b/resources/lang/mk-MK/admin/consumables/general.php
index 3a92336c0e..b9df73ab9a 100644
--- a/resources/lang/mk-MK/admin/consumables/general.php
+++ b/resources/lang/mk-MK/admin/consumables/general.php
@@ -8,4 +8,5 @@ return array(
     'remaining' 			            => 'Останува',
     'total' 			                => 'Вкупно',
     'update'                            => 'Ажурирај потрошен материјал',
+    'inventory_warning'                 => 'Залихата на оваа потрошна стока е под минималната количина од :min_count',
 );
diff --git a/resources/lang/mk-MK/admin/consumables/message.php b/resources/lang/mk-MK/admin/consumables/message.php
index 1a827fc97b..b62a1c838f 100644
--- a/resources/lang/mk-MK/admin/consumables/message.php
+++ b/resources/lang/mk-MK/admin/consumables/message.php
@@ -2,6 +2,7 @@
 
 return array(
 
+    'invalid_category_type' => 'Категоријата мора да биде категорија на потрошни материјали.',
     'does_not_exist' => 'Потрошниот материјал не постои.',
 
     'create' => array(
@@ -24,7 +25,7 @@ return array(
         'error'   		=> 'Потрошниот материјал не е задолжен, обидете се повторно',
         'success' 		=> 'Потрошниот материјал е успешно задолжен.',
         'user_does_not_exist' => 'Тој корисник е неважечки. Обидете се повторно.',
-         'unavailable'      => 'There are not enough consumables for this checkout. Please check the quantity left. ',
+         'unavailable'      => 'Нема доволно потрошни материјали за ова позајмување. Ве молиме проверете ја преостанатата количина. ',
     ),
 
     'checkin' => array(
diff --git a/resources/lang/mk-MK/admin/custom_fields/general.php b/resources/lang/mk-MK/admin/custom_fields/general.php
index 7f48e1b0a7..8e5bd1527e 100644
--- a/resources/lang/mk-MK/admin/custom_fields/general.php
+++ b/resources/lang/mk-MK/admin/custom_fields/general.php
@@ -2,11 +2,11 @@
 
 return [
     'custom_fields'		        => 'Полиња по желба',
-    'manage'                    => 'Manage',
+    'manage'                    => 'Управувај',
     'field'		                => 'Поле',
     'about_fieldsets_title'		=> 'За Fieldsets',
-    'about_fieldsets_text'		=> 'Fieldsets allow you to create groups of custom fields that are frequently re-used for specific asset model types.',
-    'custom_format'             => 'Custom Regex format...',
+    'about_fieldsets_text'		=> 'Fildsets ви овозможуваат да создавате групи на прилагодени полиња што често се повторно користат за специфични типови на модели на средства.',
+    'custom_format'             => 'Прилагоден Regex формат...',
     'encrypt_field'      	        => 'Енкриптирајте ја вредноста на ова поле во базата на податоци',
     'encrypt_field_help'      => 'ПРЕДУПРЕДУВАЊЕ: Шифрирањето на поле прави полето да не може да се пребарува.',
     'encrypted'      	        => 'Енкриптирано',
@@ -27,35 +27,38 @@ return [
     'used_by_models'   		    => 'Користено по модели',
     'order'   		            => 'Подредување',
     'create_fieldset'         => 'Нов Fieldset',
-    'update_fieldset'         => 'Update Fieldset',
-    'fieldset_does_not_exist'   => 'Fieldset :id does not exist',
-    'fieldset_updated'         => 'Fieldset updated',
-    'create_fieldset_title' => 'Create a new fieldset',
+    'update_fieldset'         => 'Ажурирај група на полиња',
+    'fieldset_does_not_exist'   => 'Групата на полиња :id не постои',
+    'fieldset_updated'         => 'FГрупата на полиња е ажурирана',
+    'create_fieldset_title' => ' Креирај нова група на полиња',
     'create_field'            => 'Ново прилагодено поле',
-    'create_field_title' => 'Create a new custom field',
+    'create_field_title' => 'Креирај ново прилагодено поле',
     'value_encrypted'      	        => 'Вредноста на ова поле е емкриптирана во базата на податоци. Само административните корисници ќе можат да ја видат декриптираната вредност',
     'show_in_email'     => 'Вклучете ја вредноста на ова поле во е-поштата испратена до корисникот? Шифрираните полиња не можат да бидат вклучени во е-пошта',
-    'show_in_email_short'     => 'Include in emails.',
-    'help_text' => 'Help Text',
-    'help_text_description' => 'This is optional text that will appear below the form elements while editing an asset to provide context on the field.',
-    'about_custom_fields_title' => 'About Custom Fields',
-    'about_custom_fields_text' => 'Custom fields allow you to add arbitrary attributes to assets.',
-    'add_field_to_fieldset' => 'Add Field to Fieldset',
-    'make_optional' => 'Required - click to make optional',
-    'make_required' => 'Optional - click to make required',
-    'reorder' => 'Reorder',
-    'db_field' => 'DB Field',
-    'db_convert_warning' => 'WARNING. This field is in the custom fields table as <code>:db_column</code> but should be <code>:expected</code>.',
-    'is_unique' => 'This value must be unique across all assets',
-    'unique' => 'Unique',
-    'display_in_user_view' => 'Allow the checked out user to view these values in their View Assigned Assets page',
-    'display_in_user_view_table' => 'Visible to User',
-    'auto_add_to_fieldsets' => 'Automatically add this to every new fieldset',
-    'add_to_preexisting_fieldsets' => 'Add to any existing fieldsets',
-    'show_in_listview' => 'Show in list views by default. Authorized users will still be able to show/hide via the column selector',
-    'show_in_listview_short' => 'Show in lists',
-    'show_in_requestable_list_short' => 'Show in requestable assets list',
-    'show_in_requestable_list' => 'Show value in requestable assets list. Encrypted fields will not be shown',
-    'encrypted_options' => 'This field is encrypted, so some display options will not be available.',
+    'show_in_email_short' => 'Вклучи во е-пошта',
+    'help_text' => 'Текст за помош',
+    'help_text_description' => 'Ова е опционален текст што ќе се појави под елементите на формуларот додека уредувате средства за да обезбеди контекст на полето.',
+    'about_custom_fields_title' => 'За прилагодени полина',
+    'about_custom_fields_text' => 'Прилагодените полиња ви овозможуваат да додадете произволни атрибути на средствата.',
+    'add_field_to_fieldset' => 'Додади поле во групата полина',
+    'make_optional' => 'Задолжително - кликнете за да направите по избор',
+    'make_required' => 'По избор - кликнете за да го направите задолжително',
+    'reorder' => 'Преуредување',
+    'db_field' => 'Поле во базата на податоци',
+    'db_convert_warning' => 'ПРЕДУПРЕДУВАЊЕ. Ова поле е во табелата за прилагодени полиња како <code>:db_column</code> но треба да биде <code>:expected</code>.',
+    'is_unique' => 'Оваа вредност мора да биде уникатна кај сите средства',
+    'unique' => 'Уникатно',
+    'display_in_user_view' => 'Дозволете му на задолжениот корисник да ги види овие вредности на нивната страница за преглед на задолжени средства',
+    'display_in_user_view_table' => 'Видливо за корисник',
+    'auto_add_to_fieldsets' => 'Автоматски додади го на секоја група на полиња',
+    'add_to_preexisting_fieldsets' => 'Додади на сите постоечки групи полиња',
+    'show_in_listview' => 'Прикажи во табеларен приказ по дифолт. Овластените корисници сепак ќе можат да го покажат/скријат преку селекторот на колоната',
+    'show_in_listview_short' => 'Покажи во списоци',
+    'show_in_requestable_list_short' => 'Покажете во списокот со побарливи предмети',
+    'show_in_requestable_list' => 'Прикажете вредност во списокот со побарливи предмети. Енкриптираните полиња нема да бидат прикажани',
+    'encrypted_options' => 'Ова поле е енкриптирано, некои опции за приказ нема да бидат достапни.',
+    'display_checkin' => 'Display in checkin forms',
+    'display_checkout' => 'Display in checkout forms',
+    'display_audit' => 'Display in audit forms',
 
 ];
diff --git a/resources/lang/mk-MK/admin/custom_fields/message.php b/resources/lang/mk-MK/admin/custom_fields/message.php
index 2429045f3d..a659d6e556 100644
--- a/resources/lang/mk-MK/admin/custom_fields/message.php
+++ b/resources/lang/mk-MK/admin/custom_fields/message.php
@@ -5,6 +5,7 @@ return array(
     'field' => array(
         'invalid'   => 'Poleto не постои.',
         'already_added'   => 'Полето веќе е додадено',
+        'none_selected'   => 'Нема избрани полиња',
 
         'create' => array(
             'error'   => 'Полето не е креирано, обидете се повторно.',
@@ -51,7 +52,7 @@ return array(
 
     'fieldset_default_value' => array(
 
-        'error' => 'Error validating default fieldset values.',
+        'error' => 'Грешка при потврдување на основните вредности на групните полиња.',
 
     ),
 
diff --git a/resources/lang/mk-MK/admin/departments/message.php b/resources/lang/mk-MK/admin/departments/message.php
index 4fc74a3e21..8c08ac68fb 100644
--- a/resources/lang/mk-MK/admin/departments/message.php
+++ b/resources/lang/mk-MK/admin/departments/message.php
@@ -3,7 +3,7 @@
 return array(
 
     'does_not_exist' => 'Одделот не постои.',
-    'department_already_exists' => 'A department already exists with that name at this company location. Or choose a more specific name for this department. ',
+    'department_already_exists' => 'Одделот веќе постои со тоа име на локацијата на оваа компанија. Или изберете поконкретно име за одделот. ',
     'assoc_users'	 => 'Овој оддел моментално е поврзана со барем еден корисник и не може да се избрише. Ве молиме да ги ажурирате вашите корисници за да не го користите овој оддел и обидете се повторно. ',
     'create' => array(
         'error'   => 'Одделот не е креиран, обидете се повторно.',
diff --git a/resources/lang/mk-MK/admin/depreciations/general.php b/resources/lang/mk-MK/admin/depreciations/general.php
index f44b24a1df..e4a0f75b80 100644
--- a/resources/lang/mk-MK/admin/depreciations/general.php
+++ b/resources/lang/mk-MK/admin/depreciations/general.php
@@ -6,11 +6,15 @@ return [
     'asset_depreciations'  					=> 'Амортизациони планови',
     'create'  					            => 'Креирај амортизационен план',
     'depreciation_name'  					=> 'Име на амортизационен план',
-    'depreciation_min'                      => 'Floor Value of Depreciation',
+    'depreciation_min'                      => 'Подна предност на амортизација',
     'number_of_months'  					=> 'Број на месеци',
     'update'  					            => 'Ажурирај амортизационен план',
-    'depreciation_min'                      => 'Minimum Value after Depreciation',
-    'no_depreciations_warning'               => '<strong>Warning: </strong>
-                      You do not currently have any depreciations set up.
-                      Please set up at least one depreciation to view the depreciation report.',
+    'depreciation_min'                      => 'Минимална вредност после амортизација',
+    'no_depreciations_warning'               => '<strong>Предупредување: </strong>
+                      Во моментов немате поставено амортизација.
+                      Поставете барем една амортизација за да го видите извештајот за амортизација.',
+    'depreciation_method'                   => 'Извештај за амортизација',
+    'linear_depreciation'                   => 'Linear (Default)',
+    'half_1'                                => 'Half-year convention, always applied',
+    'half_2'                                => 'Half-year convention, applied with condition',
 ];
diff --git a/resources/lang/mk-MK/admin/depreciations/table.php b/resources/lang/mk-MK/admin/depreciations/table.php
index a90c00fccc..f80fe008df 100644
--- a/resources/lang/mk-MK/admin/depreciations/table.php
+++ b/resources/lang/mk-MK/admin/depreciations/table.php
@@ -6,6 +6,6 @@ return [
     'months'   => 'Месеци',
     'term'   => 'Времетраење',
     'title'      => 'Име ',
-    'depreciation_min' => 'Floor Value',
+    'depreciation_min' => 'Подна вредност',
 
 ];
diff --git a/resources/lang/mk-MK/admin/groups/message.php b/resources/lang/mk-MK/admin/groups/message.php
index 20f674c111..a5c353fe99 100644
--- a/resources/lang/mk-MK/admin/groups/message.php
+++ b/resources/lang/mk-MK/admin/groups/message.php
@@ -3,7 +3,7 @@
 return array(
 
     'group_exists'        => 'Групата веќе постои!',
-    'group_not_found'     => 'Group ID :id does not exist.',
+    'group_not_found'     => 'ID на група :id не постои.',
     'group_name_required' => 'Полето за име е задолжително',
 
     'success' => array(
diff --git a/resources/lang/mk-MK/admin/groups/titles.php b/resources/lang/mk-MK/admin/groups/titles.php
index f53d6e6cbe..16e64dfb30 100644
--- a/resources/lang/mk-MK/admin/groups/titles.php
+++ b/resources/lang/mk-MK/admin/groups/titles.php
@@ -10,7 +10,7 @@ return [
     'group_admin' 	 		=> 'Администратор на група',
     'allow' 	 			=> 'Дозволи',
     'deny' 	 				=> 'Одбиј',
-    'permission'            => 'Permission',
-    'grant'                 => 'Grant',
-    'no_permissions'        => 'This group has no permissions.'
+    'permission'            => 'Дозволи',
+    'grant'                 => 'Грант',
+    'no_permissions'        => 'Оваа група нема дозволи.'
 ];
diff --git a/resources/lang/mk-MK/admin/hardware/form.php b/resources/lang/mk-MK/admin/hardware/form.php
index 40ff699106..ff53731de0 100644
--- a/resources/lang/mk-MK/admin/hardware/form.php
+++ b/resources/lang/mk-MK/admin/hardware/form.php
@@ -2,17 +2,17 @@
 
 return [
     'bulk_delete'		=> 'Потврди масовно бришење на основни средства',
-    'bulk_restore'      => 'Confirm Bulk Restore Assets', 
+    'bulk_restore'      => 'Потврди групно враќање на основни средтва', 
   'bulk_delete_help'	=> 'Прегледајте ги основните средства за масовно бришење подолу. Откако ќе се избришат, овие основни средства можат да бидат обновени, но повеќе нема да бидат задолжени на корисник.',
-  'bulk_restore_help'	=> 'Review the assets for bulk restoration below. Once restored, these assets will not be associated with any users they were previously assigned to.',
+  'bulk_restore_help'	=> 'Прегледајте ги средствата за реставрација подолу. Откако ќе се обноват, овие средства нема да се поврзат со корисници на кои претходно им биле доделени.',
   'bulk_delete_warn'	=> 'Ќе избришете :assets_count основни средства.',
-  'bulk_restore_warn'	=> 'You are about to restore :asset_count assets.',
+  'bulk_restore_warn'	=> 'Ќе се вратат :asset_count основни средства.',
     'bulk_update'		=> 'Масовно ажурирање на основни средства',
     'bulk_update_help'	=> 'Оваа форма ви овозможува да ажурирате повеќе основни средства одеднаш. Пополнете ги полињата што треба да ги промените. Сите полиња што остануваат празни ќе останат непроменети. ',
-    'bulk_update_warn'	=> 'You are about to edit the properties of a single asset.|You are about to edit the properties of :asset_count assets.',
-    'bulk_update_with_custom_field' => 'Note the assets are :asset_model_count different types of models.',
-    'bulk_update_model_prefix' => 'On Models', 
-    'bulk_update_custom_field_unique' => 'This is a unique field and can not be bulk edited.',
+    'bulk_update_warn'	=> 'Ќе ги уредувате својствата на едно средство.|Ќе ги уредувате својствата на :asset_count средства.',
+    'bulk_update_with_custom_field' => 'Забележете дека средствата се :asset_model_count различни типови на модели.',
+    'bulk_update_model_prefix' => 'На модели', 
+    'bulk_update_custom_field_unique' => 'Ова е уникатно поле и не може да биде изменето во група.',
     'checkedout_to'		=> 'Задолжен на',
     'checkout_date'		=> 'Датум на задолжување',
     'checkin_date'		=> 'Датум на раздолжување',
@@ -23,7 +23,7 @@ return [
     'depreciation'	    => 'Амортизационен план',
     'depreciates_on'	=> 'Се амортизира на',
     'default_location'	=> 'Стандардна локација',
-    'default_location_phone' => 'Default Location Phone',
+    'default_location_phone' => 'Стандардна локација телефон',
     'eol_date'			=> 'EOL Дата',
     'eol_rate'			=> 'ЕОЛ стапка',
     'expected_checkin'  => 'Очекуван датум на раздолжување',
@@ -39,9 +39,9 @@ return [
     'order'				=> 'Број на нарачка',
     'qr'				=> 'QR Код',
     'requestable'		=> 'Корисниците може да го побараат ова средство',
-    'redirect_to_all'   => 'Return to all :type',
-    'redirect_to_type'   => 'Go to :type',
-    'redirect_to_checked_out_to'   => 'Go to Checked Out to',
+    'redirect_to_all'   => 'Врати се на сите :type',
+    'redirect_to_type'   => 'Оди на :type',
+    'redirect_to_checked_out_to'   => 'Оди на задолжени',
     'select_statustype'	=> 'Изберете статус',
     'serial'			=> 'Сериски број',
     'status'			=> 'Статус',
@@ -50,13 +50,16 @@ return [
     'warranty'			=> 'Гаранција',
         'warranty_expires'		=> 'Гаранцијата истекува',
     'years'				=> 'години',
-    'asset_location' => 'Update Asset Location',
-    'asset_location_update_default_current' => 'Update default location AND actual location',
-    'asset_location_update_default' => 'Update only default location',
-    'asset_location_update_actual' => 'Update only actual location',
-    'asset_not_deployable' => 'That asset status is not deployable. This asset cannot be checked out.',
-    'asset_deployable' => 'That status is deployable. This asset can be checked out.',
-    'processing_spinner' => 'Processing... (This might take a bit of time on large files)',
-    'optional_infos'  => 'Optional Information',
-    'order_details'   => 'Order Related Information'
+    'asset_location' => 'Ажурирај локација на средството',
+    'asset_location_update_default_current' => 'Ажурирајте ја стандардната локација и вистинската локација',
+    'asset_location_update_default' => 'Ажурирајте ја само стандардната локација',
+    'asset_location_update_actual' => 'Ажурирајте ја само вистинската локација',
+    'asset_not_deployable' => 'Статусот на средствата е незадолжливо. Средството неможе да се задолжи.',
+    'asset_not_deployable_checkin' => 'Статусот на средството е незадолжливо. Користењето на оваа ознака за статус ќе го провери средството.',
+    'asset_deployable' => 'This asset can be checked out.',
+    'processing_spinner' => 'Се обработува... (Ова може да потрае за поголеми датотеки)',
+    'processing' => 'Processing... ',
+    'optional_infos'  => 'Опционални информации',
+    'order_details'   => 'Информации за набавка',
+    'calc_eol'    => 'If nulling the EOL date, use automatic EOL calculation based on the purchase date and EOL rate.',
 ];
diff --git a/resources/lang/mk-MK/admin/hardware/general.php b/resources/lang/mk-MK/admin/hardware/general.php
index ebe0c7fbca..417fff0d1a 100644
--- a/resources/lang/mk-MK/admin/hardware/general.php
+++ b/resources/lang/mk-MK/admin/hardware/general.php
@@ -5,39 +5,38 @@ return [
     'about_assets_text'            => 'Основни средства се ставки следени по сериски број или код на средства. Тие обично имаат повисока набавна вредност и е важно нивно поединечно евидентирање.',
     'archived'  				=> 'Архивирано',
     'asset'  					=> 'Основно средство',
-    'bulk_checkout'             => 'Раздолжи основно средство',
-    'bulk_checkin'              => 'Checkin Assets',
+    'bulk_checkout'             => 'Масовно задолжување',
+    'bulk_checkin'              => 'Bulk Checkin',
     'checkin'  					=> 'Раздолжи основно средство',
     'checkout'  				=> 'Задолжи основно средство',
     'clone'  					=> 'Клонирај основно средство',
     'deployable'  				=> 'Распоредливи',
-    'deleted'  					=> 'This asset has been deleted.',
-    'delete_confirm'            => 'Are you sure you want to delete this asset?',
+    'deleted'  					=> 'Ова основно средство е избришано.',
+    'delete_confirm'            => 'Дали сте сигурни дека сакате да го избришете ова основно средство?',
     'edit'  					=> 'Уредување на основно средство',
-    'model_deleted'  			=> 'This Assets model has been deleted. You must restore the model before you can restore the Asset.',
-    'model_invalid'             => 'This model for this asset is invalid.',
-    'model_invalid_fix'         => 'The asset must be updated use a valid asset model before attempting to check it in or out, or to audit it.',
+    'model_deleted'  			=> 'Моделот на ова основно средство е избришан. Мора да го вратите моделот пред да го вратите основното средство.',
+    'model_invalid'             => 'Моделот за ова основно средство е невалиден.',
+    'model_invalid_fix'         => 'Средството мора да се ажурира користете валиден модел на средства пред да се обидете да го задолжите или раздолжите, или да го попишите.',
     'requestable'               => 'Може да се побара',
     'requested'				    => 'Побарано',
-    'not_requestable'           => 'Not Requestable',
-    'requestable_status_warning' => 'Do not change requestable status',
+    'not_requestable'           => 'Не е побарливо',
+    'requestable_status_warning' => 'Не менувајте го побарливиот статус ',
     'restore'  					=> 'Врати основно средство',
     'pending'  					=> 'Во чекање',
     'undeployable'  			=> 'Нераспоредливи',
-    'undeployable_tooltip'  	=> 'This asset has a status label that is undeployable and cannot be checked out at this time.',
+    'undeployable_tooltip'  	=> 'Ова основно средство има статус на нераспоредливо и моментално не е можно да се задолжи.',
     'view'  					=> 'Преглед на основно средство',
-    'csv_error' => 'You have an error in your CSV file:',
-    'import_text' => '<p>Upload a CSV that contains asset history. The assets and users MUST already exist in the system, or they will be skipped. Matching assets for history import happens against the asset tag. We will try to find a matching user based on the user\'s name you provide, and the criteria you select below. If you do not select any criteria below, it will simply try to match on the username format you configured in the <code>Admin &gt; General Settings</code>.</p><p>Fields included in the CSV must match the headers: <strong>Asset Tag, Name, Checkout Date, Checkin Date</strong>. Any additional fields will be ignored. </p><p>Checkin Date: blank or future checkin dates will checkout items to associated user.  Excluding the Checkin Date column will create a checkin date with todays date.</p>
-    ',
-    'csv_import_match_f-l' => 'Try to match users by <strong>firstname.lastname</strong> (<code>jane.smith</code>) format',
-    'csv_import_match_initial_last' => 'Try to match users by <strong>first initial last name</strong> (<code>jsmith</code>) format',
-    'csv_import_match_first' => 'Try to match users by <strong>first name</strong> (<code>jane</code>) format',
-    'csv_import_match_email' => 'Try to match users by <strong>email</strong> as username',
-    'csv_import_match_username' => 'Try to match users by <strong>username</strong>',
-    'error_messages' => 'Error messages:',
-    'success_messages' => 'Success messages:',
-    'alert_details' => 'Please see below for details.',
-    'custom_export' => 'Custom Export',
-    'mfg_warranty_lookup' => ':manufacturer Warranty Status Lookup',
-    'user_department' => 'User Department',
+    'csv_error' => 'Имате грешка во вашата CSV датотека:',
+    'import_text' => '<p>Upload a CSV that contains asset history. The assets and users MUST already exist in the system, or they will be skipped. Matching assets for history import happens against the asset tag. We will try to find a matching user based on the user\'s name you provide, and the criteria you select below. If you do not select any criteria below, it will simply try to match on the username format you configured in the <code>Admin &gt; General Settings</code>.</p><p>Fields included in the CSV must match the headers: <strong>Asset Tag, Name, Checkout Date, Checkin Date</strong>. Any additional fields will be ignored. </p><p>Checkin Date: blank or future checkin dates will checkout items to associated user.  Excluding the Checkin Date column will create a checkin date with todays date.</p>    ',
+    'csv_import_match_f-l' => 'Усогласи корисници по <strong>име.презиме</strong> (<code>jane.smith</code>) format',
+    'csv_import_match_initial_last' => 'Усогласи корисници по <strong>прв иницијал од презимето</strong> (<code>jsmith</code>) format',
+    'csv_import_match_first' => 'Усогласи корисници по <strong>име</strong> (<code>jane</code>) format',
+    'csv_import_match_email' => 'Усогласи корисници по <strong>е-пошта</strong> as username',
+    'csv_import_match_username' => 'Усогласи корисници по <strong>корисничко име</strong>',
+    'error_messages' => 'Порака за грешка:',
+    'success_messages' => 'Порака за успех:',
+    'alert_details' => 'Видете подолу за детали.',
+    'custom_export' => 'Обичен извоз',
+    'mfg_warranty_lookup' => 'Пребарување на статусот :manufacturer на гаранција',
+    'user_department' => 'Оддел на корисникот',
 ];
diff --git a/resources/lang/mk-MK/admin/hardware/message.php b/resources/lang/mk-MK/admin/hardware/message.php
index 3aca4a6492..cd1844157d 100644
--- a/resources/lang/mk-MK/admin/hardware/message.php
+++ b/resources/lang/mk-MK/admin/hardware/message.php
@@ -2,38 +2,43 @@
 
 return [
 
-    'undeployable' 		=> '<strong>Предупредување:</strong> Ова основно средство е означено како нераспоредливо. Ако овој статус е променет, ве молиме да го ажурирате статусот на средството.',
-    'does_not_exist' 	=> 'Основното средство не постои.',
-    'does_not_exist_var'=> 'Asset with tag :asset_tag not found.',
-    'no_tag' 	        => 'No asset tag provided.',
-    'does_not_exist_or_not_requestable' => 'That asset does not exist or is not requestable.',
-    'assoc_users'	 	=> 'Ова средство е задолжено на корисник и не може да се избрише. Проверете го, а потоа пробајте повторно да го избришете. ',
-    'warning_audit_date_mismatch' 	=> 'This asset\'s next audit date (:next_audit_date) is before the last audit date (:last_audit_date). Please update the next audit date.',
+    'undeployable' 		 => '<strong>Warning: </strong> Ова средство е обележано како моментално нераспоредливо. Ако овој статус е променет, ажурирајте го статусот на средството.',
+    'does_not_exist' 	 => 'Основното средство не постои.',
+    'does_not_exist_var' => 'Средство со ознака :asset_tag не е пронајдено.',
+    'no_tag' 	         => 'Не е обезбедена ознака за средството.',
+    'does_not_exist_or_not_requestable' => 'Тоа средство не постои или не е побараливо.',
+    'assoc_users'	 	 => 'Ова средство е задолжено на корисник и не може да се избрише. Проверете го, а потоа пробајте повторно да го избришете. ',
+    'warning_audit_date_mismatch' 	=> 'Следниот датум на ревизија на ова средство (:next_audit_date) е пред последниот датум на ревизија (:last_audit_date). Ажурирајте го следниот датум на ревизија.',
+    'labels_generated'   => 'Labels were successfully generated.',
+    'error_generating_labels' => 'Error while generating labels.',
+    'no_assets_selected' => 'No assets selected.',
 
     'create' => [
         'error'   		=> 'Основното средство не е креирано, обидете се повторно. :(',
         'success' 		=> 'Основното средство е успешно креирано. :)',
-        'success_linked' => 'Asset with tag :tag was created successfully. <strong><a href=":link" style="color: white;">Click here to view</a></strong>.',
+        'success_linked' => 'Средство со ознака :tag беше создадено успешно. <strong><a href=":link" style="color: white;">Кликнете овде за да видите</a></strong>.',
+        'multi_success_linked' => 'Asset with tag :links was created successfully.|:count assets were created succesfully. :links.',
+        'partial_failure' => 'An asset was unable to be created. Reason: :failures|:count assets were unable to be created. Reasons: :failures',
     ],
 
     'update' => [
         'error'   			=> 'Основното средство не е ажурирано, обидете се повторно',
         'success' 			=> 'Основното средство е успешно ажурирано.',
-        'encrypted_warning' => 'Asset updated successfully, but encrypted custom fields were not due to permissions',
+        'encrypted_warning' => 'Средството успешно се ажурираше, но не беа енкиптираните полиња поради овластувањата',
         'nothing_updated'	=>  'Не беа избрани полиња, затоа ништо не беше ажурирано.',
-        'no_assets_selected'  =>  'No assets were selected, so nothing was updated.',
-        'assets_do_not_exist_or_are_invalid' => 'Selected assets cannot be updated.',
+        'no_assets_selected'  =>  'Не беа избрани средства, така што ништо не се ажурираше.',
+        'assets_do_not_exist_or_are_invalid' => 'Избраните средства не можат да се ажурираат.',
     ],
 
     'restore' => [
         'error'   		=> 'Основното средство не е вратено, обидете се повторно',
         'success' 		=> 'Основното средство е успешно вратено.',
         'bulk_success' 		=> 'Основното средство е успешно вратено.',
-        'nothing_updated'   => 'No assets were selected, so nothing was restored.', 
+        'nothing_updated'   => 'Не беа избрани средства, така што ништо не беше обновено.', 
     ],
 
     'audit' => [
-        'error'   		=> 'Asset audit unsuccessful: :error ',
+        'error'   		=> 'Ревизија на средства неуспешна: :error ',
         'success' 		=> 'Ревизијата на основни средства е логирана.',
     ],
 
@@ -51,20 +56,24 @@ return [
     ],
 
     'import' => [
+        'import_button'         => 'Направи увоз',
         'error'                 => 'Некои ставки не се увезоа правилно.',
         'errorDetail'           => 'Следниве елементи не се увезени поради грешки.',
         'success'               => 'Вашата датотека е увезена',
         'file_delete_success'   => 'Вашата датотека е избришана',
         'file_delete_error'      => 'Датотеката не можеше да се избрише',
-        'file_missing' => 'The file selected is missing',
-        'header_row_has_malformed_characters' => 'One or more attributes in the header row contain malformed UTF-8 characters',
-        'content_row_has_malformed_characters' => 'One or more attributes in the first row of content contain malformed UTF-8 characters',
+        'file_missing' => 'Избраната датотека недостасува',
+        'file_already_deleted' => 'Избраната датотека е веќе избришана',
+        'header_row_has_malformed_characters' => 'Еден или повеќе атрибути во заглавието се содржат неправилни UTF-8 карактери',
+        'content_row_has_malformed_characters' => 'Еден или повеќе атрибути во првиот ред на содржина содржат неправилноUTF-8 карактери',
+        'transliterate_failure' => 'Transliteration from :encoding to UTF-8 failed due to invalid characters in input'
     ],
 
 
     'delete' => [
         'confirm'   	=> 'Дали сте сигурни дека сакате да го избришете ова основно средство?',
         'error'   		=> 'Имаше проблем со бришење на основното средство. Обидете се повторно.',
+        'assigned_to_error' => '{1}Asset Tag: :asset_tag is currently checked out. Check in this device before deletion.|[2,*]Asset Tags: :asset_tag are currently checked out. Check in these devices before deletion.',
         'nothing_updated'   => 'Не беа избрани основни средства, затоа ништо не беше избришано.',
         'success' 		=> 'Основното средство беше избришано.',
     ],
@@ -77,6 +86,11 @@ return [
         'no_assets_selected' => 'Мора да одберете најмалку едно основно средство',
     ],
 
+    'multi-checkout' => [
+        'error'   => 'Asset was not checked out, please try again|Assets were not checked out, please try again',
+        'success' => 'Asset checked out successfully.|Assets checked out successfully.',
+    ],
+
     'checkin' => [
         'error'   		=> 'Основното средство не беше раздолжено, обидете се повторно',
         'success' 		=> 'Основното средство е раздолжено.',
@@ -86,9 +100,10 @@ return [
     ],
 
     'requests' => [
-        'error'   		=> 'Основното средство не е побарано, обидете се повторно',
-        'success' 		=> 'Основното средство е побарано.',
-        'canceled'      => 'Барањето за задолжување е откажано',
+        'error'   		=> 'Request was not successful, please try again.',
+        'success' 		=> 'Request successfully submitted.',
+        'canceled'      => 'Request successfully canceled.',
+        'cancel'        => 'Откажи го ова барање',
     ],
 
 ];
diff --git a/resources/lang/mk-MK/admin/hardware/table.php b/resources/lang/mk-MK/admin/hardware/table.php
index a60fe8a4fb..616f3b53db 100644
--- a/resources/lang/mk-MK/admin/hardware/table.php
+++ b/resources/lang/mk-MK/admin/hardware/table.php
@@ -5,17 +5,17 @@ return [
     'asset_tag'   	=> 'Код на основното средство',
     'asset_model'       => 'Модел',
     'assigned_to'   => 'Задолжен на',
-    'book_value'  	=> 'Current Value',
+    'book_value'  	=> 'Моментална вредност',
     'change' 		=> 'Раздолжи/Задолжи',
     'checkout_date' => 'Датум на задолжување',
     'checkoutto' 	=> 'Задолжен на',
-    'components_cost' => 'Total Components Cost',
-    'current_value' => 'Current Value',
+    'components_cost' => 'Цената цена на сите компоненти',
+    'current_value' => 'Моментална вредност',
     'diff' 			=> 'Разлика',
     'dl_csv' 		=> 'Преземи CSV',
     'eol' 			=> 'EOL',
     'id'      		=> 'ID',
-    'last_checkin_date' => 'Last Checkin Date',
+    'last_checkin_date' => 'Датум на последно раздолжување',
     'location' 		=> 'Локација',
     'purchase_cost'	=> 'Набавна цена',
     'purchase_date'	=> 'Датум на набавка',
@@ -24,10 +24,9 @@ return [
     'title'      	=> 'Основно средство ',
     'image'		    => 'Слика',
     'days_without_acceptance' => 'Денови без прифаќање',
-    'monthly_depreciation' => 'Monthly Depreciation',
-    'assigned_to'    => 'Задолжен на',
-    'requesting_user' => 'Requesting User',
-    'requested_date' => 'Requested Date',
-    'changed'       => 'Changed',
-    'icon' => 'Icon',
+    'monthly_depreciation' => 'Месечна амортизација',
+    'requesting_user' => 'Барано од корисник',
+    'requested_date' => 'Побаран датум',
+    'changed'       => 'Променето',
+    'icon' => 'Икона',
 ];
diff --git a/resources/lang/mk-MK/admin/kits/general.php b/resources/lang/mk-MK/admin/kits/general.php
index ea5c286af7..0368e6fb81 100644
--- a/resources/lang/mk-MK/admin/kits/general.php
+++ b/resources/lang/mk-MK/admin/kits/general.php
@@ -1,50 +1,51 @@
 <?php
 
 return [
-    'about_kits_title'                  => 'About Predefined Kits',
-    'about_kits_text'                   => 'Predefined Kits let you quickly check out a collection of items (assets, licenses, etc) to a user. This can be helpful when your onboarding process is consistent across many users and all users receive the same items.',
-    'checkout'                          => 'Checkout Kit ',
-    'create_success'                    => 'Kit was successfully created.',
-    'create'                            => 'Create Predefined Kit',
-    'update'                            => 'Update Predefined Kit',
-    'delete_success'                    => 'Kit was successfully deleted.',
-    'update_success'                    => 'Kit was successfully updated.',
-    'none_models'                       => 'There are not enough available assets for :model to checkout. :qty are required. ',
-    'none_licenses'                     => 'There are not enough available seats for :license to checkout. :qty are required. ',
-    'none_consumables'                  => 'There are not enough available units of :consumable to checkout. :qty are required. ',
-    'none_accessory'                    => 'There are not enough available units of :accessory to checkout. :qty are required. ',
-    'append_accessory'                  => 'Append Accessory',
-    'update_appended_accessory'         => 'Update appended Accessory',
-    'append_consumable'                 => 'Append Consumable',
-    'update_appended_consumable'        => 'Update appended Consumable',
-    'append_license'                    => 'Append license',
-    'update_appended_license'           => 'Update appended license',
-    'append_model'                      => 'Append model',
-    'update_appended_model'             => 'Update appended model',
-    'license_error'                     => 'License already attached to kit',
-    'license_added_success'             => 'License added successfully',
-    'license_updated'                   => 'License was successfully updated',
+    'about_kits_title'                  => 'За предефинирани комплети',
+    'about_kits_text'                   => 'Предефинирани комплети ви овозможуваат брзо да проверите колекција на предмети (средства, комплети, итд) на корисник. Ова може да биде корисно кога вашиот процес на приклучување е конзистентен кај многу корисници и сите корисници добиваат исти артикли.',
+    'checkout'                          => 'Раздолжување комплет ',
+    'create_success'                    => 'Комплетот беше успешно создаден.',
+    'create'                            => 'Креирај предефиниран комплет',
+    'update'                            => 'Ажурирај предефиниран комплет',
+    'delete_success'                    => 'Комплетот е успешно избришан.',
+    'update_success'                    => 'Комплетот е успешно ажуриран.',
+    'none_models'                       => 'Нема доволно достапни средства :model за задолжување. :qty се потребни. ',
+    'none_licenses'                     => 'Нема доволно достапни места :license за задолжување. :qty се потребни. ',
+    'none_consumables'                  => 'Нема доволно достапни единици :consumable за задолжување. :qty се потребни. ',
+    'none_accessory'                    => 'Нема доволно достапни единици :accessory за задолжување. :qty се потребни. ',
+    'append_accessory'                  => 'Додадете додаток',
+    'update_appended_accessory'         => 'Ажурирање на додавање додаток',
+    'append_consumable'                 => 'Додадете потрошен материјал',
+    'update_appended_consumable'        => 'Ажурирање на додавање на потрошен материјал',
+    'append_license'                    => 'Додадете лиценца',
+    'update_appended_license'           => 'Ажурирање на додавање на лиценца',
+    'append_model'                      => 'Додадете модел',
+    'update_appended_model'             => 'Ажурирање на додавање на лиценца',
+    'license_error'                     => 'Лиценцата е веќе поврзана со комплетот',
+    'license_added_success'             => 'Лиценцата е додадена успешно',
+    'license_updated'                   => 'Лиценцата е ажурирана успешно',
     'license_none'                      => 'Лиценцата не постои',
-    'license_detached'                  => 'License was successfully detached',
-    'consumable_added_success'          => 'Consumable added successfully',
-    'consumable_updated'                => 'Consumable was successfully updated',
-    'consumable_error'                  => 'Consumable already attached to kit',
-    'consumable_deleted'                => 'Delete was successful',
+    'license_detached'                  => 'Лиценцата е успешно одвоена',
+    'consumable_added_success'          => 'Потрошниот материјал е успешно додаден',
+    'consumable_updated'                => 'Потрошниот материјал е успешно ажуриран',
+    'consumable_error'                  => 'Потрошниот материјал веќе е прикачен на комплетот',
+    'consumable_deleted'                => 'Бришењето беше успешно',
     'consumable_none'                   => 'Потрошниот материјал не постои',
-    'consumable_detached'               => 'Consumable was successfully detached',
-    'accessory_added_success'           => 'Accessory added successfully',
-    'accessory_updated'                 => 'Accessory was successfully updated',
-    'accessory_detached'                => 'Accessory was successfully detached',
-    'accessory_error'                   => 'Accessory already attached to kit',
-    'accessory_deleted'                 => 'Delete was successful',
+    'consumable_detached'               => 'Потрошниот материјал е успешно одвоен',
+    'accessory_added_success'           => 'Додатокот е додаден успешно',
+    'accessory_updated'                 => 'Додатокот е ажуриран успешно',
+    'accessory_detached'                => 'Додатокот е одвоен успешно',
+    'accessory_error'                   => 'Додатокот веќе е приклучен на комплетот',
+    'accessory_deleted'                 => 'Бришењето е успешно',
     'accessory_none'                    => 'Додатокот не постои',
-    'checkout_success'                  => 'Checkout was successful',
-    'checkout_error'                    => 'Checkout error',
-    'kit_none'                          => 'Kit does not exist',
-    'kit_created'                       => 'Kit was successfully created',
-    'kit_updated'                       => 'Kit was successfully updated',
-    'kit_not_found'                     => 'Kit not found',
-    'kit_deleted'                       => 'Kit was successfully deleted',
-    'kit_model_updated'                 => 'Model was successfully updated',
-    'kit_model_detached'                => 'Model was successfully detached',
+    'checkout_success'                  => 'Задолжувањето е успешно',
+    'checkout_error'                    => 'Грешка при задолжување',
+    'kit_none'                          => 'Комплетот непостои',
+    'kit_created'                       => 'Комплетот е успешно креиран',
+    'kit_updated'                       => 'Комплетот е успешно ажуриран',
+    'kit_not_found'                     => 'Комплетот не е пронајден',
+    'kit_deleted'                       => 'Комплетот е успешно избришан',
+    'kit_model_updated'                 => 'Моделот е успешно ажуриран',
+    'kit_model_detached'                => 'Моделот е успешно одвоен',
+    'model_already_attached'            => 'Моделот веќе е приклучен на комплетот',
 ];
diff --git a/resources/lang/mk-MK/admin/labels/message.php b/resources/lang/mk-MK/admin/labels/message.php
index 96785f0754..77874e5d1b 100644
--- a/resources/lang/mk-MK/admin/labels/message.php
+++ b/resources/lang/mk-MK/admin/labels/message.php
@@ -2,10 +2,10 @@
 
 return [
 
-    'invalid_return_count' => 'Invalid count returned from :name. Expected :expected, got :actual.',
-    'invalid_return_type'  => 'Invalid type returned from :name. Expected :expected, got :actual.',
-    'invalid_return_value' => 'Invalid value returned from :name. Expected :expected, got :actual.',
+    'invalid_return_count' => 'Неисправен бројач вратен од :name. Очекувано :expected, добиено :actual.',
+    'invalid_return_type'  => 'Неисправен тип вратен од :name. Очекувано :expected, добиено :actual.',
+    'invalid_return_value' => 'Неисправна вредност вратена од :name. Очекувана :expected, добиена :actual.',
 
-    'does_not_exist' => 'Label does not exist',
+    'does_not_exist' => 'Ознаката не постои',
     
 ];
diff --git a/resources/lang/mk-MK/admin/labels/table.php b/resources/lang/mk-MK/admin/labels/table.php
index 90386d1f2a..dec6ff01bb 100644
--- a/resources/lang/mk-MK/admin/labels/table.php
+++ b/resources/lang/mk-MK/admin/labels/table.php
@@ -1,15 +1,15 @@
 <?php
 
 return [
-    'example_company'    => 'Test Company Limited',
-    'example_defaultloc' => 'Building 1',
-    'example_category'   => 'Test Category',
-    'example_location'   => 'Building 2',
-    'example_manufacturer'  => 'Test Manufacturing Inc.',
-    'example_model'      => 'Test Model',
-    'example_supplier'   => 'Test Company Limited',
-    'labels_per_page'    => 'Labels',
-    'support_fields'     => 'Fields',
+    'example_company'    => 'Пробна компанија д.о.о.',
+    'example_defaultloc' => 'Зграда 1',
+    'example_category'   => 'Пробна категорија',
+    'example_location'   => 'Зграда 2',
+    'example_manufacturer'  => 'Пробна Производствена Компанија.',
+    'example_model'      => 'Пробен Модел',
+    'example_supplier'   => 'Пробна компанија д.о.о.',
+    'labels_per_page'    => 'Ознаки',
+    'support_fields'     => 'Полина',
     'support_asset_tag'  => 'Таг',
     'support_1d_barcode' => '1D',
     'support_2d_barcode' => '2D',
diff --git a/resources/lang/mk-MK/admin/licenses/general.php b/resources/lang/mk-MK/admin/licenses/general.php
index d8c0d1d6b5..9c5c770e72 100644
--- a/resources/lang/mk-MK/admin/licenses/general.php
+++ b/resources/lang/mk-MK/admin/licenses/general.php
@@ -14,38 +14,39 @@ return array(
     'info'  					=> 'Информации за лиценцата',
     'license_seats'  			=> 'Лиценци за места',
     'seat'  					=> 'Место',
+    'seat_count'  				=> 'Места :count',
     'seats'  					=> 'Места',
     'software_licenses'  		=> 'Лиценци за софтвер',
     'user'  					=> 'Корисник',
     'view'  					=> 'Погледнете лиценца',
-    'delete_disabled'           => 'This license cannot be deleted yet because some seats are still checked out.',
+    'delete_disabled'           => 'Оваа лиценца сè уште не може да се избрише затоа што некои места сè уште е задолжена.',
     'bulk'                      =>
         [
             'checkin_all'           => [
-                'button'            => 'Checkin All Seats',
-                'modal'             => 'This will action checkin one seat. | This action will checkin all :checkedout_seats_count seats for this license.',
-                'enabled_tooltip'   => 'Checkin ALL seats for this license from both users and assets',
-                'disabled_tooltip'  => 'This is disabled because there are no seats currently checked out',
-                'disabled_tooltip_reassignable'  => 'This is disabled because the License is not reassignable',
-                'success'           => 'License successfully checked in! | All licenses were successfully checked in!',
-                'log_msg'           => 'Checked in via bulk license checkout in license GUI',
+                'button'            => 'Раздолжи ги сите места',
+                'modal'             => 'Оваа акција ќе раздолжи едно место. | Оваа акција ќе ги раздолжи сите :checkedout_seats_count места за оваа лиценца.',
+                'enabled_tooltip'   => 'Раздолжи ги СИТЕ места за оваа лиценца од корисници и средства',
+                'disabled_tooltip'  => 'Ова е оневозможено бидејќи моментално нема задолжени места.',
+                'disabled_tooltip_reassignable'  => 'Ова е оневозможено бидејќи лиценцата не може да се преместува',
+                'success'           => 'Лиценцата е успешно раздолжена! | Сите лиценци се успешно раздолжени!',
+                'log_msg'           => 'Раздолжи преку групно раздолжување во интерфејсот за лиценци',
             ],
 
             'checkout_all'              => [
-                'button'                => 'Checkout All Seats',
-                'modal'                 => 'This action will checkout one seat to the first available user. | This action will checkout all :available_seats_count seats to the first available users. A user is considered available for this seat if they do not already have this license checked out to them, and the Auto-Assign License property is enabled on their user account.',
-                'enabled_tooltip'   => 'Checkout ALL seats (or as many as are available) to ALL users',
-                'disabled_tooltip'  => 'This is disabled because there are no seats currently available',
-                'success'           => 'License successfully checked out! | :count licenses were successfully checked out!',
-                'error_no_seats'    => 'There are no remaining seats left for this license.',
-                'warn_not_enough_seats'    => ':count users were assigned this license, but we ran out of available license seats.',
-                'warn_no_avail_users'    => 'Nothing to do. There are no users who do not already have this license assigned to them.',
-                'log_msg'           => 'Checked out via bulk license checkout in license GUI',
+                'button'                => 'Задолжи ги сите места',
+                'modal'                 => 'Оваа акција ќе го задолжи на првиот достапен корисник. | Оваа акција ќе ги задолжи :available_seats_count места за првиот достапен корисник. Корисникот се смета за достапен за ова седиште ако веќе ја немаат задолжено оваа лиценца, и автоматското доделување лиценци е овозможено на нивната сметка.',
+                'enabled_tooltip'   => 'Задолжи ги СИТЕ места (или колку што се достапни) на СИТЕ корисници',
+                'disabled_tooltip'  => 'Ова е оневозможено бидејќи моментално нема достапни места',
+                'success'           => 'Лиценцата е успешно задолжена! | :count лиценци се успешно задолжени!',
+                'error_no_seats'    => 'Нема преостанати слободни места за оваа лиценца.',
+                'warn_not_enough_seats'    => ':count корисници им е доделена оваа лиценца, но недостасуваа достапни места за оваа лиценца.',
+                'warn_no_avail_users'    => 'Не треба ништо да се прави. Нема корисници што ја немаат доделено оваа лиценца.',
+                'log_msg'           => 'Задолжено преку интерфејсот за групно задолжување лиценци',
 
 
             ],
     ],
 
-    'below_threshold' => 'There are only :remaining_count seats left for this license with a minimum quantity of :min_amt. You may want to consider purchasing more seats.',
-    'below_threshold_short' => 'This item is below the minimum required quantity.',
+    'below_threshold' => 'Има само :remaining_count места достапни за оваа лиценца со минимална количина од :min_amt. Можеби би сакале да размислите за набавка на нови количини.',
+    'below_threshold_short' => 'Овај предмет е под минималните потребни количини.',
 );
diff --git a/resources/lang/mk-MK/admin/licenses/message.php b/resources/lang/mk-MK/admin/licenses/message.php
index 5508319c1d..50b5ddb8d6 100644
--- a/resources/lang/mk-MK/admin/licenses/message.php
+++ b/resources/lang/mk-MK/admin/licenses/message.php
@@ -2,14 +2,14 @@
 
 return array(
 
-    'does_not_exist' => 'License does not exist or you do not have permission to view it.',
-    'user_does_not_exist' => 'User does not exist or you do not have permission to view them.',
+    'does_not_exist' => 'Лиценцата не постои или вие немате овластување да ја видите.',
+    'user_does_not_exist' => 'Корисникот не постои или вие намате овластување да го видите.',
     'asset_does_not_exist' 	=> 'Средството што се обидувате да го поврзете со оваа лиценца не постои.',
     'owner_doesnt_match_asset' => 'Средството што се обидувате да го поврзете со оваа лиценца е задолжено на различно лице од она кое е избрано на паѓачкото мени.',
     'assoc_users'	 => 'Оваа лиценца е задолжено на корисник и не може да се избрише. Проверете го, а потоа пробајте повторно да ја избришете. ',
     'select_asset_or_person' => 'Мора да изберете основно средство или корисник, но не и двете.',
-    'not_found' => 'License not found',
-    'seats_available' => ':seat_count seats available',
+    'not_found' => 'Лиценцата не е пронајдена',
+    'seats_available' => ':seat_count достапни места',
 
 
     'create' => array(
@@ -43,11 +43,14 @@ return array(
     'checkout' => array(
         'error'   => 'Имаше проблем со задолжување на лиценцата. Обидете се повторно.',
         'success' => 'Лиценцата беше успешно задолжена',
-        'not_enough_seats' => 'Not enough license seats available for checkout',
+        'not_enough_seats' => 'Нема доволно достапни места за задолжување',
+        'mismatch' => 'Обезбеденото место за лиценца не одговара на лиценцата',
+        'unavailable' => 'Ова не е место достапно за задолжување.',
     ),
 
     'checkin' => array(
         'error'   => 'Имаше проблем со раздолжување на лиценцата. Обидете се повторно.',
+        'not_reassignable' => 'License not reassignable',
         'success' => 'Лиценцата беше успешно раздолжена'
     ),
 
diff --git a/resources/lang/mk-MK/admin/licenses/table.php b/resources/lang/mk-MK/admin/licenses/table.php
index 72162d7bc1..9ce5e8959d 100644
--- a/resources/lang/mk-MK/admin/licenses/table.php
+++ b/resources/lang/mk-MK/admin/licenses/table.php
@@ -4,7 +4,7 @@ return array(
 
     'assigned_to'   	=> 'Задолжен на',
     'checkout'   		=> 'Раздолжи/Задолжи',
-    'deleted_at'        => 'Deleted at',
+    'deleted_at'        => 'Избришано на',
     'id'      			=> 'ID',
     'license_email'   	=> 'Лиценцирано на е-пошта',
     'license_name'   	=> 'Лиценцирано на',
diff --git a/resources/lang/mk-MK/admin/locations/message.php b/resources/lang/mk-MK/admin/locations/message.php
index c85ffb2443..9a5db74237 100644
--- a/resources/lang/mk-MK/admin/locations/message.php
+++ b/resources/lang/mk-MK/admin/locations/message.php
@@ -3,11 +3,12 @@
 return array(
 
     'does_not_exist' => 'Локацијата не постои.',
-    'assoc_users'    => 'This location is not currently deletable because it is the location of record for at least one asset or user, has assets assigned to it, or is the parent location of another location. Please update your models to no longer reference this company and try again. ',
+    'assoc_users'    => 'Локацијата моментално не може да се избрише затоа што постојат записи за најмалку едно средство или корисник, да има задолжено средство, или е главна локација на друга локација. Ве молиме, ажурирајте ги вашите записи за да немаат врска кон оваа локација и обидете се повторно ',
     'assoc_assets'	 => 'Оваа локација моментално е поврзана со барем едно основно средство и не може да се избрише. Ве молиме да ги ажурирате вашите основни средства за да не ја користите оваа локација и обидете се повторно. ',
     'assoc_child_loc'	 => 'Оваа локација моментално е родител на најмалку една локација и не може да се избрише. Ве молиме да ги ажурирате вашите локации повеќе да не ја користат оваа локација како родител и обидете се повторно. ',
-    'assigned_assets' => 'Assigned Assets',
-    'current_location' => 'Current Location',
+    'assigned_assets' => 'Доделени средства',
+    'current_location' => 'Моментална локација',
+    'open_map' => 'Отвори во :map_provider_icon мапи',
 
 
     'create' => array(
@@ -20,6 +21,11 @@ return array(
         'success' => 'Локацијата е успешно ажурирана.'
     ),
 
+    'restore' => array(
+        'error'   => 'Локацијата не е обновена, ве молиме пробајте повторно',
+        'success' => 'Локацијата е обновена успешно.'
+    ),
+
     'delete' => array(
         'confirm'   	=> 'Дали сте сигурни дека сакате да ја избришете оваа локација?',
         'error'   => 'Имаше проблем со бришење на локацијата. Обидете се повторно.',
diff --git a/resources/lang/mk-MK/admin/locations/table.php b/resources/lang/mk-MK/admin/locations/table.php
index 022f984c4c..388e4a17bd 100644
--- a/resources/lang/mk-MK/admin/locations/table.php
+++ b/resources/lang/mk-MK/admin/locations/table.php
@@ -11,20 +11,20 @@ return [
     'country'                   => 'Држава',
     'create'                    => 'Креирај локација',
     'update'                    => 'Ажурирај локација',
-    'print_assigned'            => 'Print Assigned',
+    'print_assigned'            => 'Доделено печатење',
     'print_all_assigned'        => 'Печати задолжение',
     'name'                      => 'Име на локација',
     'address'                   => 'Адреса',
-    'address2'                   => 'Address Line 2',
+    'address2'                   => 'Адреса 2',
     'zip'                       => 'Поштенски код',
     'locations'                 => 'Локации',
     'parent'                    => 'Родител',
     'currency'                  => 'Валута на локација',
     'ldap_ou'                   => 'LDAP OU за пребарување',
-    'user_name'                 => 'User Name',
+    'user_name'                 => 'Корисничко име',
     'department'                => 'Одделение',
     'location'                  => 'Локација',
-    'asset_tag'                 => 'Assets Tag',
+    'asset_tag'                 => 'Ознака на средство',
     'asset_name'                => 'Име',
     'asset_category'            => 'Категорија',
     'asset_manufacturer'        => 'Производител',
@@ -32,11 +32,12 @@ return [
     'asset_serial'              => 'Сериски',
     'asset_location'            => 'Локација',
     'asset_checked_out'         => 'Задолжен на',
-    'asset_expected_checkin'    => 'Expected Checkin',
+    'asset_expected_checkin'    => 'Очекуван раздолжување',
     'date'                      => 'Датум:',
-    'phone'                     => 'Location Phone',
-    'signed_by_asset_auditor'   => 'Signed By (Asset Auditor):',
-    'signed_by_finance_auditor' => 'Signed By (Finance Auditor):',
-    'signed_by_location_manager' => 'Signed By (Location Manager):',
-    'signed_by'                 => 'Signed Off By:',
+    'phone'                     => 'Телефон на локација',
+    'signed_by_asset_auditor'   => 'Потпишано од (Ревизор на средства):',
+    'signed_by_finance_auditor' => 'Потпишано од (Финансиски ревизор):',
+    'signed_by_location_manager' => 'Потпишано од (Менаџер за локација):',
+    'signed_by'                 => 'Потпишано од:',
+    'clone'  					=> 'Clone Location',
 ];
diff --git a/resources/lang/mk-MK/admin/manufacturers/message.php b/resources/lang/mk-MK/admin/manufacturers/message.php
index c3926ff246..2265721c3e 100644
--- a/resources/lang/mk-MK/admin/manufacturers/message.php
+++ b/resources/lang/mk-MK/admin/manufacturers/message.php
@@ -2,7 +2,7 @@
 
 return array(
 
-    'support_url_help' => 'Variables <code>{LOCALE}</code>, <code>{SERIAL}</code>, <code>{MODEL_NUMBER}</code>, and <code>{MODEL_NAME}</code> may be used in your URL to have those values auto-populate when viewing assets - for example https://checkcoverage.apple.com/{LOCALE}/{SERIAL}.',
+    'support_url_help' => 'Променливите <code>{LOCALE}</code>, <code>{SERIAL}</code>, <code>{MODEL_NUMBER}</code>, и <code>{MODEL_NAME}</code> можат да бидат користени во вашето URL за да имате автоматско пополнување кога ги гледате средствата - на пример https://checkcoverage.apple.com/{LOCALE}/{SERIAL}.',
     'does_not_exist' => 'Производителот не постои.',
     'assoc_users'	 => 'Овој производител моментално е поврзан со барем еден модел и не може да се избрише. Ве молиме да ги ажурирате моделите за да не го користат овој производител и обидете се повторно. ',
 
diff --git a/resources/lang/mk-MK/admin/manufacturers/table.php b/resources/lang/mk-MK/admin/manufacturers/table.php
index 4490b280b6..527db3d6e1 100644
--- a/resources/lang/mk-MK/admin/manufacturers/table.php
+++ b/resources/lang/mk-MK/admin/manufacturers/table.php
@@ -10,7 +10,7 @@ return array(
     'support_email'   		=> 'Е-пошта за поддршка',
     'support_phone'   		=> 'Телефон за поддршка',
     'support_url'   		=> 'Врска за поддршка',
-    'warranty_lookup_url'   => 'Warranty Lookup URL',
+    'warranty_lookup_url'   => 'Пребарување на гаранција URL',
     'update'				=> 'Ажурирај го производителот',
 
 );
diff --git a/resources/lang/mk-MK/admin/models/general.php b/resources/lang/mk-MK/admin/models/general.php
index d3f624d3cd..a2f2572326 100644
--- a/resources/lang/mk-MK/admin/models/general.php
+++ b/resources/lang/mk-MK/admin/models/general.php
@@ -3,10 +3,10 @@
 return array(
     'about_models_title'     => 'За моделите на основни средства',
     'about_models_text'           => 'Моделите на основни средства служат да се групираат идентични средства. Пр. "IPhone 6s", "ThinkPad T470" итн.',
-    'deleted'  					        => 'This model has been deleted.',
+    'deleted'  					=> 'Овој модел е избришан.',
     'bulk_delete'               => 'Масовно бришење на модели',
     'bulk_delete_help'               => 'Користете ги полињата подолу за да го потврдите бришењето на избраните модели. Моделите кои имаат основни средства поврзани со нив не може да се избришат додека средствата не се поврзанат со друг модел.',
-    'bulk_delete_warn'          => 'You are about to delete one asset model.|You are about to delete :model_count asset models.',
+    'bulk_delete_warn'          => 'Ќе избришете еден модел на средство.|Ќе избриштете :model_count модели на средства.',
     'restore'                   => 'Врати модел',
     'requestable'               => 'Корисниците може да го побараат овој модел',
 	'show_mac_address'			      => 'Покажи поле за MAC адреса во основните средства од овој модел',
diff --git a/resources/lang/mk-MK/admin/models/message.php b/resources/lang/mk-MK/admin/models/message.php
index 20be4201c0..c021549d08 100644
--- a/resources/lang/mk-MK/admin/models/message.php
+++ b/resources/lang/mk-MK/admin/models/message.php
@@ -2,12 +2,12 @@
 
 return array(
 
-    'deleted' => 'Deleted asset model',
+    'deleted' => 'Избришан модел на средство',
     'does_not_exist' => 'Моделот не постои.',
-    'no_association' => 'WARNING! The asset model for this item is invalid or missing!',
-    'no_association_fix' => 'This will break things in weird and horrible ways. Edit this asset now to assign it a model.',
+    'no_association' => 'ПРЕДУПРЕДУВАЊЕ! Моделот на средство за овој предмет е невалиден или недостасува!',
+    'no_association_fix' => 'Ова ќе ги сруши работите на чудни и ужасни начини. Ажурирајте го ова средство да му доделите модел.',
     'assoc_users'	 => 'Моделот во моментов е поврзан со едно или повеќе основни средства и не може да се избрише. Ве молиме избришете ги основните средствата, а потоа пробајте повторно да го избришете. ',
-
+    'invalid_category_type' => 'Оваа категорија мора да биде категорија на средства.',
 
     'create' => array(
         'error'   => 'Моделот не е креиран, обидете се повторно.',
@@ -33,14 +33,14 @@ return array(
 
     'bulkedit' => array(
         'error'   		=> 'Не беа сменети полиња, затоа ништо не беше ажурирано.',
-        'success' 		=> 'Model successfully updated. |:model_count models successfully updated.',
-        'warn'          => 'You are about to update the properties of the following model:|You are about to edit the properties of the following :model_count models:',
+        'success' 		=> 'Моделот е успешно ажуриран. |:model_count модели се успешно ажурирани',
+        'warn'          => 'Ќе ги ажурирате каректеристиките на следниот модел:|Ќе ги ажурирате карактеристиките на следните :model_count модели:',
 
     ),
 
     'bulkdelete' => array(
         'error'   		    => 'Не беа избрани модели, затоа ништо не беше избришано.',
-        'success' 		    => 'Model deleted!|:success_count models deleted!',
+        'success' 		    => 'Моделот е избришан!|:success_count модели се избришани!',
         'success_partial' 	=> ':success_count модел (и) се избришани, меѓутоа :fail_count не може да се избришат, бидејќи тие сè уште имаат средства поврзани со нив.'
     ),
 
diff --git a/resources/lang/mk-MK/admin/reports/general.php b/resources/lang/mk-MK/admin/reports/general.php
index 78abcef4d4..64e8a73a5f 100644
--- a/resources/lang/mk-MK/admin/reports/general.php
+++ b/resources/lang/mk-MK/admin/reports/general.php
@@ -2,16 +2,22 @@
 
 return [
     'info'   => 'Изберете ги опциите за извештајот за основни средства.',
-    'deleted_user' => 'Deleted user',
-    'send_reminder' => 'Send reminder',
-    'reminder_sent' => 'Reminder sent',
-    'acceptance_deleted' => 'Acceptance request deleted',
-    'acceptance_request' => 'Acceptance request',
+    'deleted_user' => 'Избришан корисник',
+    'send_reminder' => 'Испрати потсетник',
+    'cannot_send_reminder' => 'User has been deleted or does not have an email address so cannot receive a reminder',
+    'reminder_sent' => 'Потсетникот е испратен',
+    'acceptance_deleted' => 'Барањето за прифаќање избришано',
+    'acceptance_request' => 'Барање за прифаќање',
     'custom_export' => [
-        'user_address' => 'User Address',
-        'user_city' => 'User City',
-        'user_state' => 'User State',
-        'user_country' => 'User Country',
-        'user_zip' => 'User Zip'
-    ]
-];
\ No newline at end of file
+        'user_address' => 'Адреса на корисникот',
+        'user_city' => 'Град на корисникот',
+        'user_state' => 'Држава на корисникот',
+        'user_country' => 'Земја на корисникот',
+        'user_zip' => 'Поштенски број на корисникот'
+    ],
+    'open_saved_template' => 'Open Saved Template',
+    'save_template' =>  'Save Template',
+    'select_a_template' => 'Select a Template',
+    'template_name' => 'Template Name',
+    'update_template' => 'Update Template',
+];
diff --git a/resources/lang/mk-MK/admin/reports/message.php b/resources/lang/mk-MK/admin/reports/message.php
index 9416accc75..2800bbdf0b 100644
--- a/resources/lang/mk-MK/admin/reports/message.php
+++ b/resources/lang/mk-MK/admin/reports/message.php
@@ -1,5 +1,16 @@
 <?php
 
-return array(
-    'error'   => 'Мора да изберете барем една опција.'
-);
+return [
+    'about_templates' => 'About Saved Templates',
+    'saving_templates_description' => 'Select your options, then enter the name of your template in the box above and click the \'Save Template\' button. Use the dropdown to select a previously saved template.',
+    'create'  => [
+        'success' => 'Template saved successfully',
+    ],
+    'update' => [
+        'success' => 'Template updated successfully',
+    ],
+    'delete' => [
+        'success' => 'Template deleted',
+        'no_delete_permission' => 'Template does not exist or you do not have permission to delete it.',
+    ],
+];
diff --git a/resources/lang/mk-MK/admin/settings/general.php b/resources/lang/mk-MK/admin/settings/general.php
index a54b0c62c6..d28baf0d0d 100644
--- a/resources/lang/mk-MK/admin/settings/general.php
+++ b/resources/lang/mk-MK/admin/settings/general.php
@@ -3,377 +3,487 @@
 return [
     'ad'				        => 'Active Directory',
     'ad_domain'				    => 'Домен на Active Directory',
-    'ad_domain_help'			=> 'This is sometimes the same as your email domain, but not always.',
-    'ad_append_domain_label'    => 'Append domain name',
-    'ad_append_domain'          => 'Append domain name to username field',
-    'ad_append_domain_help'     => 'User isn\'t required to write "username@domain.local", they can just type "username".',
-    'admin_cc_email'            => 'CC Email',
-    'admin_cc_email_help'       => 'If you would like to send a copy of checkin/checkout emails that are sent to users to an additional email account, enter it here. Otherwise leave this field blank.',
-    'admin_settings'            => 'Admin Settings',
+    'ad_domain_help'			=> 'Ова е понекогаш исто како и вашиот домен за е-пошта, но не секогаш.',
+    'ad_append_domain_label'    => 'Додадете го името на доменот',
+    'ad_append_domain'          => 'Додадете го името на доменот во полето за корисничко име',
+    'ad_append_domain_help'     => 'Корисникот не е потребно да се напише "корисничко име@domain.local", тие можат само да напишат "корисничко име".',
+    'admin_cc_email'            => 'CC е-пошта',
+    'admin_cc_email_help'       => 'Send a copy of checkin/checkout emails to this address.',
+    'admin_settings'            => 'Административни подесувања',
     'is_ad'				        => 'Ова е сервер на Active Directory',
-    'alerts'                	=> 'Alerts',
-    'alert_title'               => 'Update Notification Settings',
+    'alerts'                	=> 'Предупредувања',
+    'alert_title'               => 'Известувања за надоградување',
     'alert_email'				=> 'Испрати аларм до',
-    'alert_email_help'    => 'Email addresses or distribution lists you want alerts to be sent to, comma separated',
+    'alert_email_help'          => 'Адреси за е-пошта или списоци со дистрибуција на кои сакате да бидат испратени предупредувања, одвоени со запирка.',
     'alerts_enabled'			=> 'Овозможени аларми по е-пошта',
     'alert_interval'			=> 'Праг на застарување на аларм (денови)',
     'alert_inv_threshold'		=> 'Праг на аларм за инвентар',
-    'allow_user_skin'           => 'Allow User Skin',
-    'allow_user_skin_help_text' => 'Checking this box will allow a user to override the UI skin with a different one.',
+    'allow_user_skin'           => 'Дозволете прилагоден изглед',
+    'allow_user_skin_help_text' => 'Штиклирање на ова поле ќе му овозможи на корисникот да го надмине UI-изгледот со различна.',
     'asset_ids'					=> 'ID на основни средства',
     'audit_interval'            => 'Интервал на ревизија',
-    'audit_interval_help'       => 'If you are required to regularly physically audit your assets, enter the interval in months that you use. If you update this value, all of the "next audit dates" for assets with an upcoming audit date will be updated.',
-    'audit_warning_days'        => 'Audit Warning Threshold',
-    'audit_warning_days_help'   => 'How many days in advance should we warn you when assets are due for auditing?',
-    'auto_increment_assets'		=> 'Generate auto-incrementing asset tags',
+    'audit_interval_help'       => 'Доколку се бара редовно физички да ги попишувате вашите средства, Внесете го интервалот во месеци што ги користите. Ако ја ажурирате оваа вредност, ќе се ажурираат сите „следни датуми за попис“ за средства со закажан датум на попис.',
+    'audit_warning_days'        => 'Праг за предупредување за ревизија',
+    'audit_warning_days_help'   => 'Колку дена однапред треба да ве предупредуваме кога средствата доспеваат за попис?',
+    'auto_increment_assets'		=> 'Генерирај ознаки на средства кои автоматски се зголемуваат',
     'auto_increment_prefix'		=> 'Префикс (опционално)',
-    'auto_incrementing_help'    => 'Enable auto-incrementing asset tags first to set this',
+    'auto_incrementing_help'    => 'Овозможи автоматско зголемување на ознаките на основни средства за да го поставите ова',
     'backups'					=> 'Резервни копии',
-    'backups_help'              => 'Create, download, and restore backups ',
-    'backups_restoring'         => 'Restoring from Backup',
-    'backups_upload'            => 'Upload Backup',
-    'backups_path'              => 'Backups on the server are stored in <code>:path</code>',
-    'backups_restore_warning'   => 'Use the restore button <small><span class="btn btn-xs btn-warning"><i class="text-white fas fa-retweet" aria-hidden="true"></i></span></small> to restore from a previous backup. (This does not currently work with S3 file storage or Docker.)<br><br>Your <strong>entire :app_name database and any uploaded files will be completely replaced</strong> by what\'s in the backup file.  ',
-    'backups_logged_out'         => 'All existing users, including you, will be logged out once your restore is complete.',
-    'backups_large'             => 'Very large backups may time out on the restore attempt and may still need to be run via command line. ',
+    'backups_help'              => 'Создадете, преземајте и вратете ги резервните копии ',
+    'backups_restoring'         => 'Враќање од резервна копија',
+    'backups_clean' => 'Исчистете ја резервната база на податоци пред да ја вратите',
+    'backups_clean_helptext' => "Ова може да биде корисно ако ги менувате верзиите на базата на податоци",
+    'backups_upload'            => 'Прикачете резервна копија',
+    'backups_path'              => 'Резервните копии се чуваат на <code>:path</code>',
+    'backups_restore_warning'   => 'Use the restore button <small><span class="btn btn-xs btn-warning"><i class="text-white fas fa-retweet" aria-hidden="true"></i></span></small> to restore from a previous backup. (This does not currently work with S3 file storage or Docker.)<br><br>Your <strong>entire :app_name database and any uploaded files will be completely replaced</strong> by what\'s in the backup file  ',
+    'backups_logged_out'         => 'Сите постојни корисници, вклучително и вас, ќе бидат одјавени откако ќе заврши обновувањето.',
+    'backups_large'             => 'Многу големи резервни копии може да излезат од обидот за обновување и можеби сè уште треба да се водат преку командната линија. ',
     'barcode_settings'			=> 'Поставки за баркод',
     'confirm_purge'			    => 'Потврди чистка',
-    'confirm_purge_help'		=> 'Enter the text "DELETE" in the box below to purge your deleted records. This action cannot be undone and will PERMANENTLY delete all soft-deleted items and users. (You should make a backup first, just to be safe.)',
+    'confirm_purge_help'		=> 'Внесете го текстот "Избриши" во полето подолу за да ги исчистите избришаните записи. Оваа акција не може да се откаже и трајно ќе ги избрише сите избришани артикли и корисници. (Прво треба да направите резервна копија, само за да бидете безбедни.)',
     'custom_css'				=> 'Приспособен CSS',
-    'custom_css_help'			=> 'Enter any custom CSS overrides you would like to use. Do not include the &lt;style&gt;&lt;/style&gt; tags.',
+    'custom_css_placeholder'	=> 'Add your custom CSS',
+    'custom_css_help'			=> 'Внесете ги сите сопствени подесувања на CSS што сакате да ги користите. Не вклучувајте ги &lt;style&gt;&lt;/style&gt; ознаките.',
     'custom_forgot_pass_url'	=> 'Приспособена врска за ресетирање лозинка',
-    'custom_forgot_pass_url_help'	=> 'This replaces the built-in forgotten password URL on the login screen, useful to direct people to internal or hosted LDAP password reset functionality. It will effectively disable local user forgotten password functionality.',
-    'dashboard_message'			=> 'Dashboard Message',
-    'dashboard_message_help'	=> 'This text will appear on the dashboard for anyone with permission to view the dashboard.',
+    'custom_forgot_pass_url_help'	=> 'Ова ја заменува вградената URL-адреса за заборавена лозинка на екранот за најавување, што е корисно да се насочат луѓето кон внатрешна или хостирана функционалност за ресетирање на лозинка за LDAP. Ефективно ќе ја оневозможи функционалноста за заборавена лозинка на локалниот корисник.',
+    'dashboard_message'			=> 'Порака за на работна табла',
+    'dashboard_message_help'	=> 'Овој текст ќе се појави на контролната табла за секој со дозвола да ја види контролната табла.',
     'default_currency'  		=> 'Стандардна валута',
     'default_eula_text'			=> 'Default EULA',
+    'default_eula_text_placeholder' => 'Add your default EULA text',
     'default_language'			=> 'Стандарден јазик',
     'default_eula_help_text'	=> 'Можете доделите сопствени услови за користење на одредени категории на средства.',
-    'acceptance_note'           => 'Add a note for your decision (Optional)',
+    'acceptance_note'           => 'Додадете забелешка за вашата одлука (опционално)',
     'display_asset_name'        => 'Прикажи име на основно средство',
-    'display_checkout_date'     => 'Display Checkout Date',
-    'display_eol'               => 'Display EOL in table view',
-    'display_qr'                => 'Display Square Codes',
+    'display_checkout_date'     => 'Прикажи датум на задолжување',
+    'display_eol'               => 'Прикажи EOL во табеларниот преглед',
+    'display_qr'                => 'Display 2D barcode',
     'display_alt_barcode'		=> 'Прикажи 1D баркод',
-    'email_logo'                => 'Email Logo',
     'barcode_type'				=> 'Тип на 2D бар код',
     'alt_barcode_type'			=> 'Тип на 1D бар код',
-    'email_logo_size'       => 'Square logos in email look best. ',
-    'enabled'                   => 'Enabled',
+    'enabled'                   => 'Овозможено',
     'eula_settings'				=> 'Поставки за EULA',
-    'eula_markdown'				=> 'This EULA allows <a href="https://help.github.com/articles/github-flavored-markdown/">Github flavored markdown</a>.',
+    'eula_markdown'				=> 'Правилата за користење <a href="https://help.github.com/articles/github-flavored-markdown/">Github верзија markdown</a>.',
+    'empty_row_count'           => 'Field Start Offset (Empty Rows)',
+    'empty_row_count_help'      => 'Fields will begin populating after this many empty rows are skipped at the top of the label.',
     'favicon'                   => 'Favicon',
-    'favicon_format'            => 'Accepted filetypes are ico, png, and gif. Other image formats may not work in all browsers.',
-    'favicon_size'          => 'Favicons should be square images, 16x16 pixels.',
-    'footer_text'               => 'Additional Footer Text ',
-    'footer_text_help'          => 'This text will appear in the right-side footer. Links are allowed using <a href="https://help.github.com/articles/github-flavored-markdown/">Github flavored markdown</a>. Line breaks, headers, images, etc may result in unpredictable results.',
-    'general_settings'			=> 'General Settings',
-    'general_settings_keywords' => 'company support, signature, acceptance, email format, username format, images, per page, thumbnail, eula, gravatar, tos, dashboard, privacy',
-    'general_settings_help'     => 'Default EULA and more',
-    'generate_backup'			=> 'Generate Backup',
+    'favicon_format'            => 'Прифатени типови се ico, png, и gif. Другите формати на слики може да не работат во сите прелистувачи.',
+    'favicon_size'          => 'Favicons треба да бидат квадратни слики, 16x16 пиксели.',
+    'footer_text'               => 'Дополнителен текст на подножјето ',
+    'footer_text_help'          => 'Овој текст ќе се појави во подножјето на десната страна. Врските се дозволени со употреба <a href="https://help.github.com/articles/github-flavored-markdown/">Github верзија markdown</a>. Line breaks, headers, images, итн може да резултира во непредвидливи резултати.',
+    'footer_text_placeholder'   => 'Optional footer text',
+    'general_settings'			=> 'Општи поставки',
+    'general_settings_help'     => 'Стандардно EULA и многу повеќе',
+    'generate_backup'			=> 'Генерирај резевна копија',
     'google_workspaces'         => 'Google Workspaces',
-    'header_color'              => 'Header Color',
-    'info'                      => 'These settings let you customize certain aspects of your installation.',
-    'label_logo'                => 'Label Logo',
-    'label_logo_size'           => 'Square logos look best - will be displayed in the top right of each asset label. ',
+    'header_color'              => 'Боја на заглавје',
+    'info'                      => 'Овие поставки ви овозможуваат да прилагодите одредени аспекти на вашата инсталација.',
+    'label_logo_size'           => 'Квадратните логоа изгледаат најдобро - ќе бидат прикажани во горниот десен дел од секоја етикета на средства. ',
     'laravel'                   => 'Laravel верзија',
     'ldap'                      => 'LDAP',
-    'ldap_default_group'        => 'Default Permissions Group',
-    'ldap_default_group_info'   => 'Select a group to assign to newly synced users. Remember that a user takes on the permissions of the group they are assigned.',
-    'no_default_group'          => 'No Default Group',
+    'ldap_default_group'        => 'Стандардна група за дозволи',
+    'ldap_default_group_info'   => 'Изберете група што ќе ја доделите на новите синхронизирани корисници. Запомнете дека корисникот ги презема дозволите на групата што му е доделена.',
+    'no_default_group'          => 'Нема стандардна група',
     'ldap_help'                 => 'LDAP/Active Directory',
-    'ldap_client_tls_key'       => 'LDAP Client TLS Key',
-    'ldap_client_tls_cert'      => 'LDAP Client-Side TLS Certificate',
+    'ldap_client_tls_key'       => 'LDAP Клиент TLS Клуч',
+    'ldap_client_tls_cert'      => 'LDAP Клиентски TLS Сертификат',
     'ldap_enabled'              => 'Овозможен LDAP',
     'ldap_integration'          => 'Интеграција со LDAP',
     'ldap_settings'             => 'Поставки на LDAP',
-    'ldap_client_tls_cert_help' => 'Client-Side TLS Certificate and Key for LDAP connections are usually only useful in Google Workspace configurations with "Secure LDAP." Both are required.',
-    'ldap_location'             => 'LDAP Location',
-'ldap_location_help'             => 'The Ldap Location field should be used if <strong>an OU is not being used in the Base Bind DN.</strong> Leave this blank if an OU search is being used.',
+    'ldap_client_tls_cert_help' => 'Client-Side TLS Certificate и Key за LDAP врските обично се корисни само во Google Workspace конфигурации со "Secure LDAP." И двете се потребни.',
+    'ldap_location'             => 'LDAP Локација',
+'ldap_location_help'             => 'Ldap Location полето треба да се користи ако <strong>OU не се користи во Base Bind DN.</strong> Оставете го ова празно ако се користи пребарување на OU.',
     'ldap_login_test_help'      => 'Внесете важечко LDAP корисничко име и лозинка од основниот DN што сте е наведен погоре за да проверите дали вашата LDAP најава е правилно конфигурирана. МОРА ПРВО ДА ГИ СНИМИТЕ LDAP ПОСТАВКИТЕ.',
-    'ldap_login_sync_help'      => 'This only tests that LDAP can sync correctly. If your LDAP Authentication query is not correct, users may still not be able to login. YOU MUST SAVE YOUR UPDATED LDAP SETTINGS FIRST.',
-    'ldap_manager'              => 'LDAP Manager',
-    'ldap_server'               => 'LDAP Server',
-    'ldap_server_help'          => 'This should start with ldap:// (for unencrypted or TLS) or ldaps:// (for SSL)',
-    'ldap_server_cert'			=> 'LDAP SSL certificate validation',
+    'ldap_login_sync_help'      => 'Ова само го тестира тоа LDAP може правилно да се синхронизира. Ако вашето LDAP Authentication барање не е точно, корисниците и понатаму не ќе можат да се најават. Прво мора да ги зачувате ажурираните поставки за LDAP.',
+    'ldap_manager'              => 'LDAP Менаџер',
+    'ldap_server'               => 'LDAP Сервер',
+    'ldap_server_help'          => 'Ова треба да започне со ldap:// (за некриптирано) или ldaps:// (за TLS или SSL)',
+    'ldap_server_cert'			=> 'LDAP SSL валидација на сертификати',
     'ldap_server_cert_ignore'	=> 'Дозволи неважечки SSL сертификат',
-    'ldap_server_cert_help'		=> 'Select this checkbox if you are using a self signed SSL cert and would like to accept an invalid SSL certificate.',
-    'ldap_tls'                  => 'Use TLS',
-    'ldap_tls_help'             => 'This should be checked only if you are running STARTTLS on your LDAP server. ',
-    'ldap_uname'                => 'LDAP Bind Username',
-    'ldap_dept'                 => 'LDAP Department',
-    'ldap_phone'                => 'LDAP Telephone Number',
-    'ldap_jobtitle'             => 'LDAP Job Title',
-    'ldap_country'              => 'LDAP Country',
-    'ldap_pword'                => 'LDAP Bind Password',
+    'ldap_server_cert_help'		=> 'Изберете го ова поле за избор ако користите само-потпишан SSL сертификат и сакате да прифатите невалиден SSL сертификат.',
+    'ldap_tls'                  => 'Користи TLS',
+    'ldap_tls_help'             => 'Ова треба да е избрано само ако користите STARTTLS на вашиот LDAP сервер. ',
+    'ldap_uname'                => 'LDAP Bind Корисничко име',
+    'ldap_dept'                 => 'LDAP Оддел',
+    'ldap_phone'                => 'LDAP Телефонски број',
+    'ldap_jobtitle'             => 'LDAP Работно место',
+    'ldap_country'              => 'LDAP Земја',
+    'ldap_pword'                => 'LDAP Bind Лозинка',
     'ldap_basedn'               => 'Base Bind DN',
     'ldap_filter'               => 'LDAP филтер',
-    'ldap_pw_sync'              => 'LDAP Password Sync',
-    'ldap_pw_sync_help'         => 'Uncheck this box if you do not wish to keep LDAP passwords synced with local passwords. Disabling this means that your users may not be able to login if your LDAP server is unreachable for some reason.',
-    'ldap_username_field'       => 'Username Field',
+    'ldap_pw_sync'              => 'Cache LDAP Passwords',
+    'ldap_pw_sync_help'         => 'Uncheck this box if you do not wish to keep LDAP passwords cached as local hashed passwords. Disabling this means that your users may not be able to login if your LDAP server is unreachable for some reason.',
+    'ldap_username_field'       => 'Поле за корисничко име',
     'ldap_lname_field'          => 'Презиме',
-    'ldap_fname_field'          => 'LDAP First Name',
-    'ldap_auth_filter_query'    => 'LDAP Authentication query',
+    'ldap_fname_field'          => 'LDAP Име',
+    'ldap_auth_filter_query'    => 'LDAP барање за автентикација',
     'ldap_version'              => 'LDAP верзија',
-    'ldap_active_flag'          => 'LDAP Active Flag',
-    'ldap_activated_flag_help'  => 'This value is used to determine whether a synced user can login to Snipe-IT. <strong>It does not affect the ability to check items in or out to them</strong>, and should be the <strong>attribute name</strong> within your AD/LDAP, <strong>not the value</strong>. <br><br>If this field is set to a field name that does not exist in your AD/LDAP, or the value in the AD/LDAP field is set to <code>0</code> or <code>false</code>, <strong>user login will be disabled</strong>. If the value in the AD/LDAP field is set to <code>1</code> or <code>true</code> or <em>any other text</em> means the user can log in. When the field is blank in your AD, we respect the <code>userAccountControl</code> attribute, which usually allows non-suspended users to log in.',
-    'ldap_emp_num'              => 'LDAP Employee Number',
+    'ldap_active_flag'          => 'LDAP Активно знаме',
+    'ldap_activated_flag_help'  => 'Оваа вредност се користи за да се утврди дали синхронизираниот корисник може да се најави на Snipe-It. <strong>Тоа не влијае на можноста да се задолжуваат или раздолжуваат предмети</strong>, и треба да биде <strong>име на атрибут</strong> во вашиот AD/LDAP, <strong>не вредност</strong>. <br><br>Ако ова поле е поставено на име на полето што не постои во вашето AD/LDAP, или вредноста во AD/LDAP полето е поставено на <code>0</code> или <code>грешно</code>, <strong>најавувањето на корисникот ќе биде оневозможено</strong>. Ако вредноста во AD/LDAP полето е поставено на <code>1</code> или <code>точно</code> или <em>кој било друг текст</em> значи дека корисникот може да се најави. Кога полето е празно во вашето AD, Ние ги почитуваме <code>userAccountControl</code> атрибут, што обично им овозможува на не суспендираните корисници да се најават.',
+    'ldap_invert_active_flag'   => 'LDAP Invert Active Flag',
+    'ldap_invert_active_flag_help'     => 'If enabled: when the value returned by LDAP Active Flag is <code>0</code> or <code>false</code> the user account will be active.',
+    'ldap_emp_num'              => 'LDAP Број на вработен',
     'ldap_email'                => 'LDAP меил',
-    'ldap_test'                 => 'Test LDAP',
-    'ldap_test_sync'            => 'Test LDAP Synchronization',
+    'ldap_test'                 => 'Тест LDAP',
+    'ldap_test_sync'            => 'Тест LDAP Синхронизација',
     'license'                   => 'Лиценца за софтвер',
-    'load_remote'               => 'Use Gravatar',
-    'load_remote_help_text'		=> 'Uncheck this box if your install cannot load scripts from the outside internet. This will prevent Snipe-IT from trying load images from Gravatar.',
-    'login'                     => 'Login Attempts',
-    'login_attempt'             => 'Login Attempt',
-    'login_ip'                  => 'IP Address',
-    'login_success'             => 'Success?',
-    'login_user_agent'          => 'User Agent',
-    'login_help'                => 'List of attempted logins',
-    'login_note'                => 'Login Note',
-    'login_note_help'           => 'Optionally include a few sentences on your login screen, for example to assist people who have found a lost or stolen device. This field accepts <a href="https://help.github.com/articles/github-flavored-markdown/">Github flavored markdown</a>',
+    'load_remote'               => 'Вчитај далечински аватари',
+    'load_remote_help_text'		=> 'Отштиклирајте го ова поле ако вашата инсталација не може да ги вчита скриптите од надворешниот Интернет. Ова ќе го спречи Snipe-It да проба да вчита аватари од Gravatar или други надворешни извори.',
+    'login'                     => 'Обиди за најавување',
+    'login_attempt'             => 'Обид за најавување',
+    'login_ip'                  => 'IP Адреса',
+    'login_success'             => 'Успех?',
+    'login_user_agent'          => 'Кориснички агент',
+    'login_help'                => 'Список на обиди за најавување',
+    'login_note'                => 'Забелешка за најава',
+    'login_note_placeholder'            => "If you do not have a login or have found a device belonging to this company, please call technical support at 888-555-1212. Thank you.",
+    'login_note_help'           => 'По избор, вклучете неколку реченици на вашиот екран за најавување, На пример, да им помогне на луѓето кои пронашле изгубен или украден уред. Ова поле прифаќа <a href="https://help.github.com/articles/github-flavored-markdown/">Github верзија markdown</a>',
     'login_remote_user_text'    => 'Опции за најва на далечни корисници',
-    'login_remote_user_enabled_text' => 'Enable Login with Remote User Header',
+    'login_remote_user_enabled_text' => 'Овозможете најавување со заглавие на далечински корисник',
     'login_remote_user_enabled_help' => 'Оваа опција овозможува автентикација преку заглавието REMOTE_USER во согласност со "Common Gateway Interface (rfc3875)"',
-    'login_common_disabled_text' => 'Disable other authentication mechanisms',
-    'login_common_disabled_help' => 'This option disables other authentication mechanisms. Just enable this option if you are sure that your REMOTE_USER login is already working',
-    'login_remote_user_custom_logout_url_text' => 'Custom logout URL',
-    'login_remote_user_custom_logout_url_help' => 'If a url is provided here, users will get redirected to this URL after the user logs out of Snipe-IT. This is useful to close the user sessions of your Authentication provider correctly.',
-    'login_remote_user_header_name_text' => 'Custom user name header',
-    'login_remote_user_header_name_help' => 'Use the specified header instead of REMOTE_USER',
+    'login_common_disabled_text' => 'Оневозможете ги другите механизми за автентикација',
+    'login_common_disabled_help' => 'Оваа опција оневозможува други механизми за автентикација. Овозможете ја оваа опција само ако сте сигурни дека вашето REMOTE_USER најавување веќе работи',
+    'login_remote_user_custom_logout_url_text' => 'Променлива URL адреса за одјава',
+    'login_remote_user_custom_logout_url_help' => 'Ако тука е обезбедена URL адреса, корисниците ќе се пренасочат на оваа URL-адреса откако корисникот ќе се одјави од Snipe-It. Ова е корисно за правилно да ги затворите корисничките сесии на вашиот провајдер за автентикација.',
+    'login_remote_user_header_name_text' => 'Прилагодено заглавје на корисничко име',
+    'login_remote_user_header_name_help' => 'Користете го наведеното заглавје наместо REMOTE_USER',
     'logo'                    	=> 'Лого',
-    'logo_print_assets'         => 'Use in Print',
-    'logo_print_assets_help'    => 'Use branding on printable asset lists ',
-    'full_multiple_companies_support_help_text' => 'Restricting users (including admins) assigned to companies to their company\'s assets.',
-    'full_multiple_companies_support_text' => 'Full Multiple Companies Support',
-    'show_in_model_list'   => 'Show in Model Dropdowns',
+    'logo_print_assets'         => 'Користи во печатење',
+    'logo_print_assets_help'    => 'Користете брендирање на списоците со средства за печатење ',
+    'full_multiple_companies_support_help_text' => 'Ограничување на корисниците (вклучувајќи администратори) доделени на компании на средствата на компаниите.',
+    'full_multiple_companies_support_text' => 'Целосна поддршка на повеќе компании',
+    'scope_locations_fmcs_support_text'  => 'Scope Locations with Full Multiple Companies Support',
+    'scope_locations_fmcs_support_help_text'  => 'Restrict locations to their selected company.',
+    'scope_locations_fmcs_check_button' => 'Check Compatibility',
+    'scope_locations_fmcs_support_disabled_text'  => 'This option is disabled because you have conflicting locations set for :count or more items.',
+    'show_in_model_list'   => 'Покажете во паѓачко мени на модели',
     'optional'					=> 'опционално',
     'per_page'                  => 'Резултати по страница',
     'php'                       => 'PHP верзија',
-    'php_info'                  => 'PHP Info',
+    'php_info'                  => 'PHP Инфо',
     'php_overview'              => 'PHP',
-    'php_overview_keywords'     => 'phpinfo, system, info',
-    'php_overview_help'         => 'PHP System info',
-    'php_gd_info'               => 'You must install php-gd to display QR codes, see install instructions.',
-    'php_gd_warning'            => 'PHP Image Processing and GD plugin is NOT installed.',
+    'php_overview_help'         => 'PHP Информации за системот',
+    'php_gd_info'               => 'Мора да инсталирате php-gd за прикажување QR кодови, погледнете ги инструкциите за инсталирање.',
+    'php_gd_warning'            => 'PHP обработка на слика и GD додатокот не е инсталиран.',
     'pwd_secure_complexity'     => 'Сложеност на лозинка',
-    'pwd_secure_complexity_help' => 'Select whichever password complexity rules you wish to enforce.',
-    'pwd_secure_complexity_disallow_same_pwd_as_user_fields' => 'Password cannot be the same as first name, last name, email, or username',
-    'pwd_secure_complexity_letters' => 'Require at least one letter',
-    'pwd_secure_complexity_numbers' => 'Require at least one number',
-    'pwd_secure_complexity_symbols' => 'Require at least one symbol',
-    'pwd_secure_complexity_case_diff' => 'Require at least one uppercase and one lowercase',
+    'pwd_secure_complexity_help' => 'Изберете ги правилата за сложеност на лозинка што сакате да ги спроведете.',
+    'pwd_secure_complexity_disallow_same_pwd_as_user_fields' => 'Лозинката не може да биде иста како име, презиме, е-пошта, или корисничко име',
+    'pwd_secure_complexity_letters' => 'Задолжително е барем една буква',
+    'pwd_secure_complexity_numbers' => 'Задолжително е барем еден број',
+    'pwd_secure_complexity_symbols' => 'Задолжително е барем еден симбол',
+    'pwd_secure_complexity_case_diff' => 'Задолжително е најмалку една голема буква и една мала буква',
     'pwd_secure_min'            => 'Минимум знаци во лозинка',
     'pwd_secure_min_help'       => 'Минимална дозволена вредност е 8',
     'pwd_secure_uncommon'       => 'Спречете чести лозинки',
-    'pwd_secure_uncommon_help'  => 'This will disallow users from using common passwords from the top 10,000 passwords reported in breaches.',
-    'qr_help'                   => 'Enable QR Codes first to set this',
-    'qr_text'                   => 'QR Code Text',
+    'pwd_secure_uncommon_help'  => 'Ова ќе ги оневозможи корисниците да користат вообичаени лозинки од првите 10,000 лозинки пријавени во прекршувања.',
+    'qr_help'                   => 'Овозможете QR кодови прво за да го поставите ова',
+    'qr_text'                   => 'Текст на QR код',
     'saml'                      => 'SAML',
-    'saml_title'                => 'Update SAML settings',
-    'saml_help'                 => 'SAML settings',
-    'saml_enabled'              => 'SAML enabled',
-    'saml_integration'          => 'SAML Integration',
-    'saml_sp_entityid'          => 'Entity ID',
-    'saml_sp_acs_url'           => 'Assertion Consumer Service (ACS) URL',
-    'saml_sp_sls_url'           => 'Single Logout Service (SLS) URL',
-    'saml_sp_x509cert'          => 'Public Certificate',
-    'saml_sp_metadata_url'      => 'Metadata URL',
-    'saml_idp_metadata'         => 'SAML IdP Metadata',
-    'saml_idp_metadata_help'    => 'You can specify the IdP metadata using a URL or XML file.',
-    'saml_attr_mapping_username' => 'Attribute Mapping - Username',
-    'saml_attr_mapping_username_help' => 'NameID will be used if attribute mapping is unspecified or invalid.',
-    'saml_forcelogin_label'     => 'SAML Force Login',
-    'saml_forcelogin'           => 'Make SAML the primary login',
-    'saml_forcelogin_help'      => 'You can use \'/login?nosaml\' to get to the normal login page.',
-    'saml_slo_label'            => 'SAML Single Log Out',
-    'saml_slo'                  => 'Send a LogoutRequest to IdP on Logout',
-    'saml_slo_help'             => 'This will cause the user to be first redirected to the IdP on logout. Leave unchecked if the IdP doesn\'t correctly support SP-initiated SAML SLO.',
-    'saml_custom_settings'      => 'SAML Custom Settings',
-    'saml_custom_settings_help' => 'You can specify additional settings to the onelogin/php-saml library. Use at your own risk.',
-    'saml_download'             => 'Download Metadata',
+    'saml_title'                => 'Ажурирај SAML подесувања',
+    'saml_help'                 => 'SAML подесувања',
+    'saml_enabled'              => 'SAML овозможен',
+    'saml_integration'          => 'SAML интеграција',
+    'saml_sp_entityid'          => 'Ентитети ID',
+    'saml_sp_acs_url'           => 'Услуга за тврдења на потрошувачи (ACS) URL',
+    'saml_sp_sls_url'           => 'Услуга за единечна одјава (SLS) URL',
+    'saml_sp_x509cert'          => 'Јавен сертификат',
+    'saml_sp_metadata_url'      => 'Метаподатоци URL',
+    'saml_idp_metadata'         => 'SAML IdP Метаподатоци',
+    'saml_idp_metadata_help'    => 'Можете да го наведете IdP Метаподатоци со употреба на а URL или XML file.',
+    'saml_attr_mapping_username' => 'Мапирање на атрибути - корисничко име',
+    'saml_attr_mapping_username_help' => 'NameID ќе се користи ако мапирањето на атрибути е неодредено или невалидно.',
+    'saml_forcelogin_label'     => 'SAML Најавување на сила',
+    'saml_forcelogin'           => 'Направи го SAML примарното најавување',
+    'saml_forcelogin_help'      => 'Можете да користите \'/login?nosaml\' За да стигнете до нормалната страница за најавување.',
+    'saml_slo_label'            => 'SAML Single одјавување',
+    'saml_slo'                  => 'Испрати LogoutRequest на IdP при одјава',
+    'saml_slo_help'             => 'Ова ќе предизвика корисникот прво да се пренасочи кон IdP при најава. Остави неозначено ако IdP не исправно не поддржува SP-initiated SAML SLO.',
+    'saml_custom_settings'      => 'SAML Прилагодени поставки',
+    'saml_custom_settings_help' => 'Можете да наведете дополнителни поставки на onelogin/php-saml библиотека. Користете на ваш сопствен ризик.',
+    'saml_download'             => 'Преземете метаподатоци',
     'setting'                   => 'Поставка',
     'settings'                  => 'Поставки',
-    'show_alerts_in_menu'       => 'Show alerts in top menu',
-    'show_archived_in_list'     => 'Archived Assets',
-    'show_archived_in_list_text'     => 'Show archived assets in the "all assets" listing',
-    'show_assigned_assets'      => 'Show assets assigned to assets',
-    'show_assigned_assets_help' => 'Display assets which were assigned to the other assets in View User -> Assets, View User -> Info -> Print All Assigned and in Account -> View Assigned Assets.',
-    'show_images_in_email'     => 'Show images in emails',
-    'show_images_in_email_help'   => 'Uncheck this box if your Snipe-IT installation is behind a VPN or closed network and users outside the network will not be able to load images served from this installation in their emails.',
+    'show_alerts_in_menu'       => 'Покажете предупредувања во горното мени',
+    'show_archived_in_list'     => 'Архивирани средства',
+    'show_archived_in_list_text'     => 'Покажете архивирани средства во "сите средства" табелата',
+    'show_assigned_assets'      => 'Покажете средства доделени на средства',
+    'show_assigned_assets_help' => 'Прикажете ги средствата што беа доделени на другите средства во Види Корисник -> Средства, Види Корисник -> Инфо -> Печати сите Доделени и на Сметка -> Види Доделени Средства.',
+    'show_images_in_email'     => 'Прикажи слики во е-пошта',
+    'show_images_in_email_help'   => 'Отштиклирајте ја оваа кутија ако вашата инсталација на Snipe-It е зад а VPN или затворена мрежа и корисници надвор од мрежата нема да можат да вчитаат слики што се служат од оваа инсталација во нивната е-пошта.',
     'site_name'                 => 'Име на сајтот',
-    'integrations'               => 'Integrations',
+    'integrations'               => 'Интеграции',
     'slack'                     => 'Slack',
-    'general_webhook'           => 'General Webhook',
+    'general_webhook'           => 'Генерален Webhook',
     'ms_teams'                  => 'Microsoft Teams',
     'webhook'                   => ':app',
-    'webhook_presave'           => 'Test to Save',
-    'webhook_title'               => 'Update Webhook Settings',
-    'webhook_help'                => 'Integration settings',
-    'webhook_botname'             => ':app Botname',
-    'webhook_channel'             => ':app Channel',
-    'webhook_endpoint'            => ':app Endpoint',
-    'webhook_integration'         => ':app Settings',
-    'webhook_test'                 =>'Test :app integration',
-    'webhook_integration_help'    => ':app integration is optional, however the endpoint and channel are required if you wish to use it. To configure :app integration, you must first <a href=":webhook_link" target="_new" rel="noopener">create an incoming webhook</a> on your :app account. Click on the <strong>Test :app Integration</strong> button to confirm your settings are correct before saving. ',
-    'webhook_integration_help_button'    => 'Once you have saved your :app information, a test button will appear.',
-    'webhook_test_help'           => 'Test whether your :app integration is configured correctly. YOU MUST SAVE YOUR UPDATED :app SETTINGS FIRST.',
-    'snipe_version'  			=> 'Snipe-IT version',
-    'support_footer'            => 'Support Footer Links ',
-    'support_footer_help'       => 'Specify who sees the links to the Snipe-IT Support info and Users Manual',
-    'version_footer'            => 'Version in Footer ',
-    'version_footer_help'       => 'Specify who sees the Snipe-IT version and build number.',
-    'system'                    => 'System Information',
-    'update'                    => 'Update Settings',
+    'webhook_presave'           => 'Тест за зачувување',
+    'webhook_title'               => 'Ажурирај Webhook подесувања',
+    'webhook_help'                => 'Поставки за интеграција',
+    'webhook_botname'             => ':app име на ботот',
+    'webhook_channel'             => ':app канал',
+    'webhook_endpoint'            => ':app крајна точка',
+    'webhook_integration'         => ':app поставки',
+    'webhook_test'                 =>'Тестирај :app интеграција',
+    'webhook_integration_help'    => ':app интеграцијата е по избор, Сепак, потребната е крајната точка и каналот доколку сакате да ги користите. Да се конфигурира :app интеграција, прво мора <a href=":webhook_link" target="_new" rel="noopener">создадете дојдовен webhook</a> во вашата :app сметка. Кликнете на <strong>Тест :app интеграција</strong> копче за да потврдите дека вашите поставки се точни пред да се зачуваат. ',
+    'webhook_integration_help_button'    => 'Откако ќе ги зачувате вашите :app информации, ќе се појави копче за тестирање.',
+    'webhook_test_help'           => 'Тестирајте дали вашата :app Интеграцијата е правилно конфигурирана. Мора да ги зачувате ажурираните :app поставки прво.',
+    'shortcuts_enabled'         => 'Овозможете кратенки',
+    'shortcuts_help_text'       => '<strong>Windows</strong>: Alt + Access дугме, <strong>Mac</strong>: Control + Option + Access дугме',
+    'snipe_version'  			=> 'Snipe-IT верзија',
+    'support_footer'            => 'Поддржете ги врските во подножјето ',
+    'support_footer_help'       => 'Наведете кој ги гледа врските до Snipe-IT Информации за поддршка и прирачник за корисници',
+    'version_footer'            => 'Верзија во подножјето ',
+    'version_footer_help'       => 'Наведете кој гледа Snipe-IT верзија.',
+    'system'                    => 'Информации за системот',
+    'update'                    => 'Ажурирајте ги поставките',
     'value'                     => 'Вредност',
     'brand'                     => 'Брендирање',
-    'brand_keywords'            => 'footer, logo, print, theme, skin, header, colors, color, css',
-    'brand_help'                => 'Logo, Site Name',
-    'web_brand'                 => 'Web Branding Type',
-    'about_settings_title'      => 'About Settings',
-    'about_settings_text'       => 'These settings let you customize certain aspects of your installation.',
-    'labels_per_page'           => 'Labels per page',
-    'label_dimensions'          => 'Label dimensions (inches)',
-    'next_auto_tag_base'        => 'Next auto-increment',
-    'page_padding'              => 'Page margins (inches)',
-    'privacy_policy_link'       => 'Link to Privacy Policy',
-    'privacy_policy'            => 'Privacy Policy',
-    'privacy_policy_link_help'  => 'If a url is included here, a link to your privacy policy will be included in the app footer and in any emails that the system sends out, in compliance with GDPR. ',
-    'purge'                     => 'Purge Deleted Records',
-    'purge_deleted'             => 'Purge Deleted ',
-    'labels_display_bgutter'    => 'Label bottom gutter',
-    'labels_display_sgutter'    => 'Label side gutter',
-    'labels_fontsize'           => 'Label font size',
-    'labels_pagewidth'          => 'Label sheet width',
-    'labels_pageheight'         => 'Label sheet height',
-    'label_gutters'        => 'Label spacing (inches)',
-    'page_dimensions'        => 'Page dimensions (inches)',
-    'label_fields'          => 'Label visible fields',
+    'brand_help'                => 'Лого, Име на страницата',
+    'web_brand'                 => 'Тип на веб-брендирање',
+    'about_settings_title'      => 'За поставките',
+    'about_settings_text'       => 'Овие поставки ви овозможуваат да прилагодите одредени аспекти на вашата инсталација.',
+    'labels_per_page'           => 'Етикети по страница',
+    'label_dimensions'          => 'Димензии на етикетата (инчи)',
+    'next_auto_tag_base'        => 'Следно автоматско зголемување',
+    'page_padding'              => 'Маргини на страници (инчи)',
+    'privacy_policy_link'       => 'Врска до Политиката за приватност',
+    'privacy_policy'            => 'Политика за приватност',
+    'privacy_policy_link_help'  => 'Ако URL е вклучена овде, врската до вашата политика за приватност ќе биде вклучена во подножјето на апликациите и во сите пораки на е-пошта што системот ги испраќа, во согласност со GDPR. ',
+    'purge'                     => 'Прочистете ги избришаните записи',
+    'purge_deleted'             => 'Прочисти избришани ',
+    'labels_display_bgutter'    => 'Долна маргина на етикета',
+    'labels_display_sgutter'    => 'Странична маргина на етикета',
+    'labels_fontsize'           => 'Големина на фонт на етикета',
+    'labels_pagewidth'          => 'Ширина на листот за етикети',
+    'labels_pageheight'         => 'Висина на листот за етикети',
+    'label_gutters'        => 'Растојание меѓу етикети (инчи)',
+    'page_dimensions'        => 'Димензии на страницата (инчи)',
+    'label_fields'          => 'Видливи полиња на етикетата',
     'inches'        => 'инчи',
     'width_w'        => 'w',
     'height_h'        => 'h',
-    'show_url_in_emails'                => 'Link to Snipe-IT in Emails',
-    'show_url_in_emails_help_text'      => 'Uncheck this box if you do not wish to link back to your Snipe-IT installation in your email footers. Useful if most of your users never login. ',
+    'show_url_in_emails'                => 'Врска до Snipe-It во е-пошта',
+    'show_url_in_emails_help_text'      => 'Отштиклирајте го ова поле ако не сакате да се поврзете со инсталацијата на Snipe-It во вашите подножје за е-пошта. Корисно ако повеќето од вашите корисници никогаш не се најавуваат. ',
     'text_pt'        => 'pt',
-    'thumbnail_max_h'   => 'Max thumbnail height',
-    'thumbnail_max_h_help'   => 'Maximum height in pixels that thumbnails may display in the listing view. Min 25, max 500.',
-    'two_factor'        => 'Two Factor Authentication',
-    'two_factor_secret'        => 'Two-Factor Code',
-    'two_factor_enrollment'        => 'Two-Factor Enrollment',
-    'two_factor_enabled_text'        => 'Enable Two Factor',
-    'two_factor_reset'        => 'Reset Two-Factor Secret',
-    'two_factor_reset_help'        => 'This will force the user to enroll their device with their authenticator app again. This can be useful if their currently enrolled device is lost or stolen. ',
-    'two_factor_reset_success'          => 'Two factor device successfully reset',
-    'two_factor_reset_error'          => 'Two factor device reset failed',
-    'two_factor_enabled_warning'        => 'Enabling two-factor if it is not currently enabled will immediately force you to authenticate with a Google Auth enrolled device. You will have the ability to enroll your device if one is not currently enrolled.',
-    'two_factor_enabled_help'        => 'This will turn on two-factor authentication using Google Authenticator.',
-    'two_factor_optional'        => 'Selective (Users can enable or disable if permitted)',
-    'two_factor_required'        => 'Required for all users',
-    'two_factor_disabled'        => 'Disabled',
-    'two_factor_enter_code'	=> 'Enter Two-Factor Code',
+    'thumbnail_max_h'   => 'Максимална висина на сликичката',
+    'thumbnail_max_h_help'   => 'Максимална висина во пиксели што сликичките можат да ги прикажат во табеларен преглед. мин 25, макс 500.',
+    'two_factor'        => 'Двофакторска автентикација',
+    'two_factor_secret'        => 'Двофакторски код',
+    'two_factor_enrollment'        => 'Двофакторско запишување',
+    'two_factor_enabled_text'        => 'Овозможи двофакторско',
+    'two_factor_reset'        => 'Ресетирајте ја тајната со двофакторско',
+    'two_factor_reset_help'        => 'Ова ќе го присили корисникот повторно да го запише својот уред во нивната апликација за автентикација. Ова може да биде корисно ако нивниот тековно запишан уред е изгубен или украден. ',
+    'two_factor_reset_success'          => 'Уред со двофакторско е успешно ресетиран',
+    'two_factor_reset_error'          => 'Уред со двофакторско не е успешно ресетиран',
+    'two_factor_enabled_warning'        => 'Овозможувањето двофакторско ако во моментов не е овозможено, веднаш ќе ве присили да се автентицирате со уред кој е веќе најавен на Google Auth. Ќе имате можност да го запишете вашиот уред ако не е запишан во моментов.',
+    'two_factor_enabled_help'        => 'Ова ќе ја вклучи автентикацијата со два фактори користејќи Google Authenticator.',
+    'two_factor_optional'        => 'Селективно (корисниците можат да овозможат или оневозможат доколку е дозволено)',
+    'two_factor_required'        => 'Задолжително за сите корисници',
+    'two_factor_disabled'        => 'Оневозможено',
+    'two_factor_enter_code'	=> 'Внесете двофакторски код',
     'two_factor_config_complete'	=> 'Поднесете го кодот',
     'two_factor_enabled_edit_not_allowed' => 'Вашиот администратор не дозволува да го менувате ова поставување.',
-    'two_factor_enrollment_text'	=> "Two factor authentication is required, however your device has not been enrolled yet. Open your Google Authenticator app and scan the QR code below to enroll your device. Once you've enrolled your device, enter the code below",
+    'two_factor_enrollment_text'	=> "Потребна е автентикација на два фактор, но вашиот уред сè уште не е запишан. Отворете Google Authenticator апликација и скенирајте го QR кодот подолу за да го запишете вашиот уред. Откако ќе го запишате вашиот уред, внесете го кодот подолу",
     'require_accept_signature'      => 'Потребен потпис',
-    'require_accept_signature_help_text'      => 'Enabling this feature will require users to physically sign off on accepting an asset.',
+    'require_accept_signature_help_text'      => 'Овозможувањето на оваа функција ќе бара од корисниците физички да се пријават за прифаќање на средства.',
+    'require_checkinout_notes'  => 'Require Notes on Checkin/Checkout',
+    'require_checkinout_notes_help_text'    => 'Enabling this feature will require the note fields to be populated when checking in or checking out an asset.',
     'left'        => 'лево',
     'right'        => 'десно',
     'top'        => 'врв',
     'bottom'        => 'дно',
     'vertical'        => 'вертикално',
     'horizontal'        => 'хоризонтално',
-    'unique_serial'                => 'Unique serial numbers',
-    'unique_serial_help_text'                => 'Checking this box will enforce a uniqueness constraint on asset serials',
-    'zerofill_count'        => 'Length of asset tags, including zerofill',
-    'username_format_help'   => 'This setting will only be used by the import process if a username is not provided and we have to generate a username for you.',
-    'oauth_title' => 'OAuth API Settings',
-    'oauth_clients' => 'OAuth Clients',
+    'unique_serial'                => 'Уникатен сериски број',
+    'unique_serial_help_text'                => 'Проверката на ова поле ќе спроведе ограничување на уникатноста на сериите на средства',
+    'zerofill_count'        => 'Должина на ознаките на средства, вклучително и пополнување со нули',
+    'username_format_help'   => 'Оваа поставка ќе се користи од процесот на увоз само ако не е обезбедено корисничко име и ние мора да генерираме корисничко име за вас.',
+    'oauth_title' => 'OAuth API Поставки',
+    'oauth_clients' => 'OAuth Клиенти',
     'oauth' => 'OAuth',
-    'oauth_help' => 'Oauth Endpoint Settings',
-    'oauth_no_clients' => 'You have not created any OAuth clients yet.',
-    'oauth_secret' => 'Secret',
-    'oauth_authorized_apps' => 'Authorized Applications',
-    'oauth_redirect_url' => 'Redirect URL',
-    'oauth_name_help' => ' Something your users will recognize and trust.',
-    'oauth_scopes' => 'Scopes',
-    'oauth_callback_url' => 'Your application authorization callback URL.',
-    'create_client' => 'Create Client',
-    'no_scopes' => 'No scopes',
-    'asset_tag_title' => 'Update Asset Tag Settings',
-    'barcode_title' => 'Update Barcode Settings',
-    'barcodes' => 'Barcodes',
-    'barcodes_help_overview' => 'Barcode &amp; QR settings',
-    'barcodes_help' => 'This will attempt to delete cached barcodes. This would typically only be used if your barcode settings have changed, or if your Snipe-IT URL has changed. Barcodes will be re-generated when accessed next.',
-    'barcodes_spinner' => 'Attempting to delete files...',
-    'barcode_delete_cache' => 'Delete Barcode Cache',
-    'branding_title' => 'Update Branding Settings',
-    'general_title' => 'Update General Settings',
-    'mail_test' => 'Send Test',
-    'mail_test_help' => 'This will attempt to send a test mail to :replyto.',
-    'filter_by_keyword' => 'Filter by setting keyword',
-    'security' => 'Security',
-    'security_title' => 'Update Security Settings',
-    'security_keywords' => 'password, passwords, requirements, two factor, two-factor, common passwords, remote login, logout, authentication',
-    'security_help' => 'Two-factor, Password Restrictions',
-    'groups_keywords' => 'permissions, permission groups, authorization',
-    'groups_help' => 'Account permission groups',
-    'localization' => 'Localization',
-    'localization_title' => 'Update Localization Settings',
-    'localization_keywords' => 'localization, currency, local, locale, time zone, timezone, international, internatinalization, language, languages, translation',
-    'localization_help' => 'Language, date display',
-    'notifications' => 'Notifications',
-    'notifications_help' => 'Email Alerts & Audit Settings',
-    'asset_tags_help' => 'Incrementing and prefixes',
-    'labels' => 'Labels',
-    'labels_title' => 'Update Label Settings',
-    'labels_help' => 'Label sizes &amp; settings',
-    'purge_keywords' => 'permanently delete',
-    'purge_help' => 'Purge Deleted Records',
-    'ldap_extension_warning' => 'It does not look like the LDAP extension is installed or enabled on this server. You can still save your settings, but you will need to enable the LDAP extension for PHP before LDAP syncing or login will work.',
+    'oauth_help' => 'Oauth Endpoint Поставки',
+    'oauth_no_clients' => 'Сеуште немате креирано OAuth клиент.',
+    'oauth_secret' => 'Тајна',
+    'oauth_authorized_apps' => 'Овластени апликации',
+    'oauth_redirect_url' => 'Пренасочување на URL-то',
+    'oauth_name_help' => ' Нешто што вашите корисници ќе го препознаат и веруваат.',
+    'oauth_scopes' => 'Опсег',
+    'oauth_callback_url' => 'Повратен повик за овластување за вашата апликација URL.',
+    'create_client' => 'Креирај клиент',
+    'no_scopes' => 'Без опсег',
+    'asset_tag_title' => 'Ажурирајте ги поставките за означување на средствата',
+    'barcode_title' => 'Ажурирајте ги поставките за баркод',
+    'barcodes' => 'Баркодови',
+    'barcodes_help_overview' => 'Баркод &amp; QR поставки',
+    'barcodes_help' => 'Ова ќе се обиде да ги избрише зачуваните баркодови.Ова обично се користи само ако вашите поставки за баркод се променети, или ако URL-то на Snipe-It се смени. Баркодовите ќе бидат повторно генерирани кога ќе се пристапи до следното..',
+    'barcodes_spinner' => 'Обид за бришење датотеки...',
+    'barcode_delete_cache' => 'Избришете га кешот на баркодот',
+    'branding_title' => 'Ажурирајте ги поставките за брендирање',
+    'general_title' => 'Ажурирајте ги општите поставки',
+    'mail_test' => 'Испратете тест',
+    'mail_test_help' => 'Ова ќе се обиде да испрати тест е-пошта до :replyto.',
+    'filter_by_keyword' => 'Филтер со поставување клучен збор',
+    'security' => 'Безбедност',
+    'security_title' => 'Ажурирајте ги поставките за безбедност',
+    'security_help' => 'Двофакторско, ограничувања на лозинката',
+    'groups_help' => 'Групи за дозволи за сметка',
+    'localization' => 'Локализација',
+    'localization_title' => 'Ажурирајте ги поставките за локализација',
+    'localization_help' => 'Јазик, приказ на датумот',
+    'notifications' => 'Известувања',
+    'notifications_help' => 'Известувања по е-пошта & Поставки за попис',
+    'asset_tags_help' => 'Зголемување и префикси',
+    'labels' => 'Етикети',
+    'labels_title' => 'Ажурирајте ги поставките за етикета',
+    'labels_help' => 'Barcodes &amp; label settings',
+    'purge_help' => 'Прочистете ги избришаните записи',
+    'ldap_extension_warning' => 'Не изгледа како LDAP додатокот е инсталиран или овозможен на овој сервер. Сè уште можете да ги зачувате вашите поставки, Но, ќе треба да го овозможите LDAP додатокот за PHP пред LDAP сихронизацијата и најавата да работат',
     'ldap_ad' => 'LDAP/AD',
-    'employee_number' => 'Employee Number',
-    'create_admin_user' => 'Create a User ::',
-    'create_admin_success' => 'Success! Your admin user has been added!',
-    'create_admin_redirect' => 'Click here to go to your app login!',
-    'setup_migrations' => 'Database Migrations ::',
-    'setup_no_migrations' => 'There was nothing to migrate. Your database tables were already set up!',
-    'setup_successful_migrations' => 'Your database tables have been created',
-    'setup_migration_output' => 'Migration output:',
-    'setup_migration_create_user' => 'Next: Create User',
-    'ldap_settings_link' => 'LDAP Settings Page',
-    'slack_test' => 'Test <i class="fab fa-slack"></i> Integration',
-    'label2_enable'           => 'New Label Engine',
-    'label2_enable_help'      => 'Switch to the new label engine. <b>Note: You will need to save this setting before setting others.</b>',
-    'label2_template'         => 'Template',
-    'label2_template_help'    => 'Select which template to use for label generation',
+    'ldap_test_label' => 'Test LDAP Sync',
+    'ldap_test_login' => ' Test LDAP Login',
+    'ldap_username_placeholder' => 'LDAP Username',
+    'ldap_password_placeholder' => 'LDAP Password',
+    'employee_number' => 'Број на вработен',
+    'create_admin_user' => 'Создадете корисник ::',
+    'create_admin_success' => 'Успех! Вашиот администратор е додаден!',
+    'create_admin_redirect' => 'Кликнете овде за да отидете во најава на вашата апликација!',
+    'setup_migrations' => 'Миграции на базата на податоци ::',
+    'setup_no_migrations' => 'Немаше што да се мигрира. Вашите табели во базата на податоци веќе беа поставени!',
+    'setup_successful_migrations' => 'Вашите табели во базата се создадени',
+    'setup_migration_output' => 'Резултат на миграција:',
+    'setup_migration_create_user' => 'Следно: Креирај корисник',
+    'ldap_settings_link' => 'LDAP страна за поставки',
+    'slack_test' => 'Тестирај <i class="fab fa-slack"></i> Интеграција',
+    'status_label_name' => 'Status Label Name',
+    'super_admin_only'  => 'Super Admin Only',
+    'label2_enable'           => 'Нов систем на етикети',
+    'label2_enable_help'      => 'Префрлете се на новиот систем на етикети. <b>Забелешка: Треба да ги зачувате овие поставки пред да поставите други.</b>',
+    'label2_template'         => 'Образец',
+    'label2_template_help'    => 'Изберете кој образец да го користите за генерирање на етикета',
     'label2_title'            => 'Наслов',
-    'label2_title_help'       => 'The title to show on labels that support it',
-    'label2_title_help_phold' => 'The placeholder <code>{COMPANY}</code> will be replaced with the asset&apos;s company name',
-    'label2_asset_logo'       => 'Use Asset Logo',
-    'label2_asset_logo_help'  => 'Use the logo of the asset&apos;s assigned company, rather than the value at <code>:setting_name</code>',
-    'label2_1d_type'          => '1D Barcode Type',
-    'label2_1d_type_help'     => 'Format for 1D barcodes',
+    'label2_title_help'       => 'Насловот што треба да се прикаже на етикетите што го поддржуваат',
+    'label2_title_help_phold' => 'Полето <code>{COMPANY}</code> ќе биде заменето со asset&apos;s име на компанијата',
+    'label2_asset_logo'       => 'Користете лого на средствата',
+    'label2_asset_logo_help'  => 'Користете лого на компанијата на која и е доделено средството, наместо вредноста во <code>:setting_name</code>',
+    'label2_1d_type'          => '1D Тип на баркод',
+    'label2_1d_type_help'     => 'Формат за 1D баркод',
     'label2_2d_type'          => 'Тип на 2D бар код',
-    'label2_2d_type_help'     => 'Format for 2D barcodes',
-    'label2_2d_target'        => '2D Barcode Target',
-    'label2_2d_target_help'   => 'The URL the 2D barcode points to when scanned',
-    'label2_fields'           => 'Field Definitions',
-    'label2_fields_help'      => 'Fields can be added, removed, and reordered in the left column. For each field, multiple options for Label and DataSource can be added, removed, and reordered in the right column.',
-    'help_asterisk_bold'    => 'Text entered as <code>**text**</code> will be displayed as bold',
-    'help_blank_to_use'     => 'Leave blank to use the value from <code>:setting_name</code>',
+    'label2_2d_type_help'     => 'Формат за 2D баркод',
+    'label2_2d_target'        => '2D баркод мета',
+    'label2_2d_target_help'   => 'The data that will be contained in the 2D barcode',
+    'label2_fields'           => 'Дефиниции на поле',
+    'label2_fields_help'      => 'Полињата можат да се додадат, отстранат и да се преуредат во левата колона. За секое поле, повеќе опции за Назив и Извор на податоци можат да се додадат, отстранат и преуредат во десната колона.',
+    'purge_barcodes' => 'Purge Barcodes',
+    'help_asterisk_bold'    => 'Текстот внесен како <code>**text**</code> ќе биде прикажан како здебелен',
+    'help_blank_to_use'     => 'Оставете празно за да ја користите вредноста од <code>:setting_name</code>',
     'help_default_will_use' => '<code>:default</code> will use the value from <code>:setting_name</code>. <br>Note that the value of the barcodes must comply with the respective barcode spec in order to be successfully generated. Please see <a href="https://snipe-it.readme.io/docs/barcodes">the documentation <i class="fa fa-external-link"></i></a> for more details. ',
-    'default'               => 'Default',
-    'none'                  => 'None',
-    'google_callback_help' => 'This should be entered as the callback URL in your Google OAuth app settings in your organization&apos;s <strong><a href="https://console.cloud.google.com/" target="_blank">Google developer console <i class="fa fa-external-link" aria-hidden="true"></i></a></strong>.',
-    'google_login'      => 'Google Workspace Login Settings',
-    'enable_google_login'  => 'Enable users to login with Google Workspace',
-    'enable_google_login_help'  => 'Users will not be automatically provisioned. They must have an existing account here AND in Google Workspace, and their username here must match their Google Workspace email address. ',
-    'mail_reply_to' => 'Mail Reply-To Address',
-    'mail_from' => 'Mail From Address',
-    'database_driver' => 'Database Driver',
-    'bs_table_storage' => 'Table Storage',
-    'timezone' => 'Timezone',
-    'profile_edit'          => 'Edit Profile',
-    'profile_edit_help'          => 'Allow users to edit their own profiles.',
+    'asset_id'              => 'Asset ID',
+    'data'               => 'Data',
+    'default'               => 'Стандардно',
+    'none'                  => 'Ништо',
+    'google_callback_help' => 'Ова треба да се внесе како callback URL адреса во поставките на Google OAuth апликацијата за вашата организација&apos;s <strong><a href="https://console.cloud.google.com/" target="_blank">Google developer конзола <i class="fa fa-external-link" aria-hidden="true"></i></a></strong>.',
+    'google_login'      => 'Google Workspace Поставки за најавување',
+    'enable_google_login'  => 'Овозможете им на корисниците да се најават со Google Workspace',
+    'enable_google_login_help'  => 'Корисниците нема да бидат обезбедени автоматски. Тие мора да имаат постоечка сметка тука И на Google Workspace, и нивното корисничко име тука мора да одговара на нивната Google Workspace адреса на е-пошта. ',
+    'mail_reply_to' => 'Адреса на е-пошта за одговор',
+    'mail_from' => 'Адреса на е-пошта на испраќачот',
+    'database_driver' => 'Драјвер на базата на податоци',
+    'bs_table_storage' => 'Складирање на табели',
+    'timezone' => 'Временска зона',
+    'test_mail' => 'Test Mail',
+    'profile_edit'          => 'Уреди профил',
+    'profile_edit_help'          => 'Дозволете им на корисниците да уредуваат своите профили.',
+    'default_avatar' => 'Custom Default Avatar',
+    'default_avatar_help' => 'Оваа слика ќе биде прикажана како профилна ако корисникот нема фотографија на профил.',
+    'restore_default_avatar' => 'Врати <a href=":default_avatar" data-toggle="lightbox" data-type="image">оригинален системски аватар</a>',
+    'restore_default_avatar_help' => '',
+    'due_checkin_days' => 'Предупредување дека е враме за раздолжување',
+    'due_checkin_days_help' => 'Колку дена пред очекуваното раздолжување на средството треба да биде наведено на страницата „Време е за раздолжување“?',
+    'no_groups' => 'No groups have been created yet. Visit <code>Admin Settings > Permission Groups</code> to add one.',
+    'text' => 'Text',
+
+    'username_formats' => [
+        'username_format'		=> 'Формат на корисничко име',
+        'firstname_lastname_format'	=> 'First Name Last Name (jane.smith)',
+        'first_name_format'	        => 'First Name (jane)',
+        'last_name_format'		=> 'Last Name (doe)',
+        'filastname_format'			=> 'First Initial Last Name (jsmith)',
+        'lastnamefirstinitial_format' =>  'Last Name First Initial (smithj)',
+        'firstname_lastname_underscore_format' => 'First Name Last Name (jane_smith)',
+        'firstinitial.lastname' => 'First Initial Last Name (j.smith)',
+        'lastname_firstinitial' => 'Last Name First Initial (smith_j)',
+        'lastname_dot_firstinitial_format' => 'Last Name First Initial (smith.j)',
+        'firstnamelastname'     => 'First Name Last Name (janesmith)',
+        'firstnamelastinitial'  => 'First Name Last Initial (janes)',
+        'lastnamefirstname'      => 'Презиме.Име (smith.jane)',
+    ],
+
+    'email_formats' => [
+        'email_format'			=> 'Формат на е-пошта',
+        'firstname_lastname_format'	=> 'Име, точка, Презиме (janko.jankov@example.com)',
+        'first_name_format'		=> 'Име (janko@example.com)',
+        'last_name_format'		=> 'Last Name (doe@example.com)',
+        'filastname_format'			=> 'Почетна буква од име, Презиме (jjankov@example.com)',
+        'lastnamefirstinitial_format' =>  'Презиме, Почетна буква од име (jankovj@example.com)',
+        'firstname_lastname_underscore_format' => 'Име, _, Презиме (janko_jankov@example.com)',
+        'firstinitial.lastname' => 'Иницијал на Име Презиме (j.smith@example.com)',
+        'lastname_firstinitial' => 'Презиме иницијал на Име(smith_j@example.com)',
+        'lastname_dot_firstinitial_format' => 'Last Name First Initial (smith.j@example.com)',
+        'firstnamelastname'     => 'Име Презиме (janesmith@example.com)',
+        'firstnamelastinitial'  => 'Име иницијал на Презиме(janes@example.com)',
+        'lastnamefirstname'      => 'Презиме.Име (smith.jane@example.com)',
+    ],
+
+
+
+    'logo_labels' => [
+        'acceptance_pdf_logo'       => 'PDF Logo',
+        'email_logo'                => 'Лого на е-пошта',
+        'label_logo'                => 'Лого на етикетата',
+        'logo'                      => 'Site Logo',
+        'favicon'                   => 'Favicon',
+    ],
+
+    'logo_help' => [
+        'email_logo_size'       => 'Квадратно лого во е-пошта изгледа најдобро. ',
+    ],
+
+    'logo_option_types' => [
+        'text' => 'Text',
+        'logo' => 'Лого',
+        'logo_and_text' => 'Logo and Text',
+    ],
+
+
+    'legends' => [
+        'scoping' => 'Scoping',
+        'formats' => 'Default Formats',
+        'profiles' => 'User Profiles',
+        'eula' => 'EULA & Acceptance Preferences',
+        'misc_display' => 'Miscellaneous Display Options',
+        'email' => 'Email Preferences',
+        'checkin' => 'Checkin Preferences',
+        'dashboard' => 'Login & Dashboard Preferences',
+        'misc' => 'Miscellaneous',
+        'logos' => 'Logos & Display',
+        'colors' => 'Colors & Skins',
+        'footer' => 'Footer Preferences',
+        'security' => 'Security Preferences',
+        'general' => 'General',
+        'intervals' => 'Intervals & Thresholds',
+    ],
+
+
+    /* Keywords for settings overview help */
+    'keywords' => [
+        'brand'             => 'подножје, лого, печатење, тема, изглед, заглавје, бои, боја, css',
+        'general_settings'  => 'поддршка на компанијата, потпис, прифаќање, формат на е-пошта, формат на корисничко име, слики, по страница, сликичка, eula, gravatar, tos, работна табла, приватност',
+        'groups'            => 'дозволи, групи на дозволи, авторизација',
+        'labels'            => 'labels, barcodes, barcode, sheets, print, upc, qr, 1d, 2d',
+        'localization'      => 'локализација, валута, локално, локација, временска зона, временска зона, меѓународна, Интернационализација, јазик, јазици, превод',
+        'php_overview'      => 'phpИнфо, систем, Инфо',
+        'purge'             => 'трајно избришете',
+        'security'          => 'лозинка, лозинки, барања, двофакторни, двофакторни, вообичаени лозинки, далечинско најавување, одјавување, автентикација',
+    ],
 
 ];
diff --git a/resources/lang/mk-MK/admin/settings/message.php b/resources/lang/mk-MK/admin/settings/message.php
index 2c5d282201..ab06040893 100644
--- a/resources/lang/mk-MK/admin/settings/message.php
+++ b/resources/lang/mk-MK/admin/settings/message.php
@@ -11,8 +11,11 @@ return [
         'file_deleted'          => 'Резервната копија е избришана. ',
         'generated'             => 'Направена е нова резервна копија.',
         'file_not_found'        => 'Таа резервна копија не може да се најде на серверот.',
-        'restore_warning'       => 'Yes, restore it. I acknowledge that this will overwrite any existing data currently in the database. This will also log out all of your existing users (including you).',
-        'restore_confirm'       => 'Are you sure you wish to restore your database from :filename?'
+        'restore_warning'       => 'Да, врати. Потврдувам дека ова ќе ги презапише сите постоечки податоци во моментот во базата на податоци. Ова исто така ќе ги одјави сите постоечки корисници This will also log out all of your existing users (вклучително и тебе).',
+        'restore_confirm'       => 'Дали сте сигурни дека сакате да ја вратите вашата база на податоци од :filename?'
+    ],
+    'restore' => [
+        'success'               => 'Резервната копија на вашиот систем е обновена. Повторно најавете се.'
     ],
     'purge' => [
         'error'     => 'Се случи грешка при трајното бришење. ',
@@ -20,27 +23,37 @@ return [
         'success'               => 'Записите се трајно избришани.',
     ],
     'mail' => [
-        'sending' => 'Sending Test Email...',
-        'success' => 'Mail sent!',
-        'error' => 'Mail could not be sent.',
-        'additional' => 'No additional error message provided. Check your mail settings and your app log.'
+        'sending' => 'Испраќање на тест е-пошта...',
+        'success' => 'Испратена пошта!',
+        'error' => 'Пошта не може да се испрати.',
+        'additional' => 'Не е обезбедена дополнителна порака за грешка. Проверете ги поставките за пошта и дневникот за апликации.'
     ],
     'ldap' => [
-        'testing' => 'Testing LDAP Connection, Binding & Query ...',
-        '500' => '500 Server Error. Please check your server logs for more information.',
-        'error' => 'Something went wrong :(',
-        'sync_success' => 'A sample of 10 users returned from the LDAP server based on your settings:',
-        'testing_authentication' => 'Testing LDAP Authentication...',
-        'authentication_success' => 'User authenticated against LDAP successfully!'
+        'testing' => 'Тестирање LDAP Конекција, Поврзување и пребарување ...',
+        '500' => '500 Серверска грешка. Проверете ги дневниците на вашиот сервер за повеќе информации.',
+        'error' => 'Нешто не е во ред :(',
+        'sync_success' => 'Примерок од 10 корисници е вратен од LDAP серверот на основа на вашите подесувања:',
+        'testing_authentication' => 'Тестирање LDAP Автентификација...',
+        'authentication_success' => 'Автентификацијата на корисникот на LDAP е успешна!'
     ],
+    'labels' => [
+        'null_template' => 'Label template not found. Please select a template.',
+        ],
     'webhook' => [
-        'sending' => 'Sending :app test message...',
-        'success' => 'Your :webhook_name Integration works!',
-        'success_pt1' => 'Success! Check the ',
-        'success_pt2' => ' channel for your test message, and be sure to click SAVE below to store your settings.',
-        '500' => '500 Server Error.',
-        'error' => 'Something went wrong. :app responded with: :error_message',
-        'error_redirect' => 'ERROR: 301/302 :endpoint returns a redirect. For security reasons, we don’t follow redirects. Please use the actual endpoint.',
-        'error_misc' => 'Something went wrong. :( ',
-    ]
+        'sending' => 'Испраќање :app тест порака...',
+        'success' => 'Вашата :webhook_name Интеграција работи!',
+        'success_pt1' => 'Успех! Проверете ',
+        'success_pt2' => ' канал за вашата тест порака, и не заборавајте да кликнете на Зачувај подолу за да ги зачувате поставките.',
+        '500' => '500 Серверска грешка.',
+        'error' => 'Нешто не е во ред. :app одговори со :error_message',
+        'error_redirect' => 'ГРЕШКА: 301/302 :endpoint враќа пренасочување. Од безбедносни причини, ние не ги следиме пренасочувањата. Ве молиме користете директна крајна точка.',
+        'error_misc' => 'Нешто не е во ред. :( ',
+        'webhook_fail' => ' webhook notification failed: Check to make sure the URL is still valid.',
+        'webhook_channel_not_found' => ' webhook channel not found.',
+        'ms_teams_deprecation' => 'The selected Microsoft Teams webhook URL will be deprecated Dec 31st, 2025. Please use a workflow URL. Microsoft\'s documentation on creating a workflow can be found <a href="https://support.microsoft.com/en-us/office/create-incoming-webhooks-with-workflows-for-microsoft-teams-8ae491c7-0394-4861-ba59-055e33f75498" target="_blank"> here.</a>',
+    ],
+    'location_scoping' => [
+        'not_saved' => 'Your settings were not saved.',
+        'mismatch' => 'There is 1 item in the database that need your attention before you can enable location scoping.|There are :count items in the database that need your attention before you can enable location scoping.',
+    ],
 ];
diff --git a/resources/lang/mk-MK/admin/settings/table.php b/resources/lang/mk-MK/admin/settings/table.php
index 57256ba334..dc786fa583 100644
--- a/resources/lang/mk-MK/admin/settings/table.php
+++ b/resources/lang/mk-MK/admin/settings/table.php
@@ -2,5 +2,5 @@
 
 return array(
     'created'   => 'Креиран',
-    'size' => 'Size',
+    'size' => 'Големина',
 );
diff --git a/resources/lang/mk-MK/admin/statuslabels/message.php b/resources/lang/mk-MK/admin/statuslabels/message.php
index 51a10fff63..cf3cecce3b 100644
--- a/resources/lang/mk-MK/admin/statuslabels/message.php
+++ b/resources/lang/mk-MK/admin/statuslabels/message.php
@@ -3,7 +3,7 @@
 return [
 
     'does_not_exist' => 'Етикетата за статус не постои.',
-    'deleted_label' => 'Deleted Status Label',
+    'deleted_label' => 'Избришана етикета',
     'assoc_assets'	 => 'Оваа етикета за статус моментално е поврзана со барем едно основно средство и не може да се избрише. Ве молиме да ги ажурирате вашите основни средства за да не ја користите оваа етикета за статус и обидете се повторно. ',
 
     'create' => [
diff --git a/resources/lang/mk-MK/admin/statuslabels/table.php b/resources/lang/mk-MK/admin/statuslabels/table.php
index b9dc038d4a..ffb5d85c97 100644
--- a/resources/lang/mk-MK/admin/statuslabels/table.php
+++ b/resources/lang/mk-MK/admin/statuslabels/table.php
@@ -1,14 +1,14 @@
 <?php
 
 return array(
-    'about'      	=> 'За статусните етикети',
+    'about'      	=> 'About Status Types',
     'archived'      	=> 'Архивирано',
     'create'      	=> 'Направете етикета за статус',
     'color'      	=> 'Боја на табелата',
     'default_label' => 'Стандардна етикета',
     'default_label_help' => 'Ова се користи за да се осигури дека вашите најчесто користени етикети за статус се појавуваат на врвот на полето за избор при креирање/ажурирање на средствата.',
     'deployable'      	=> 'Распоредливи',
-    'info'      	=> 'Етикетите за статусот се користат за да се опишат различните состојби во кои може да се наоѓаат вашите средства. Тие може да бидат пратени на сервис, изгубени/украдени, итн. Можете да креирате нови етикети за статуси за распоредливи, во чекање и архивирани основни средства.',
+    'info'      	=> 'Status label types are used to describe the various states your assets could be in. They may be out for repair, lost/stolen, etc. You can create new status labels for your deployable, pending and archived assets according to your own workflow. For more information, <a href="https://snipe-it.readme.io/docs/overview#status-labels" target="_blank">see the documentation <i class="fa fa-external-link"></i></a>.',
     'name'      	=> 'Име на статус',
     'pending'      	=> 'Во чекање',
     'status_type'   => 'Тип на статус',
diff --git a/resources/lang/mk-MK/admin/suppliers/message.php b/resources/lang/mk-MK/admin/suppliers/message.php
index e844d93a77..06097cbba9 100644
--- a/resources/lang/mk-MK/admin/suppliers/message.php
+++ b/resources/lang/mk-MK/admin/suppliers/message.php
@@ -2,7 +2,7 @@
 
 return array(
 
-    'deleted' => 'Deleted supplier',
+    'deleted' => 'Избришан добавувач',
     'does_not_exist' => 'Добавувачот не постои.',
 
 
diff --git a/resources/lang/mk-MK/admin/users/general.php b/resources/lang/mk-MK/admin/users/general.php
index 4c5b7c5d74..dce10e1f83 100644
--- a/resources/lang/mk-MK/admin/users/general.php
+++ b/resources/lang/mk-MK/admin/users/general.php
@@ -1,8 +1,8 @@
 <?php
 
 return [
-    'activated_help_text' => 'This user can login',
-    'activated_disabled_help_text' => 'You cannot edit activation status for your own account.',
+    'activated_help_text' => 'Овој корисник може да се најави',
+    'activated_disabled_help_text' => 'Неможете да го смените статусот на сопствената сметка.',
     'assets_user'       => 'Средства задолжени на :name',
     'bulk_update_warn'	=> 'Ќе ажурирате :user_count корисници. Не можете да ги менувате вашите сопствени кориснички атрибути користејќи го овој формулар, и мора да правите измени на вашиот кориснички профил поединечно.',
     'bulk_update_help'	=> 'Оваа форма ви овозможува да ажурирате повеќе корисници одеднаш. Пополнете ги полињата што треба да ги промените. Сите полиња што остануваат празни ќе останат непроменети.',
@@ -17,38 +17,40 @@ return [
     'last_login'        => 'Последна најава',
     'ldap_config_text'  => 'LDAP конфигурациските поставки може да се најдат во Admin > Settings. Избраната локација (опционално) ќе биде поставена за сите увезени корисници.',
     'print_assigned'    => 'Печати задолжение',
-    'email_assigned'    => 'Email List of All Assigned',
-    'user_notified'     => 'User has been emailed a list of their currently assigned items.',
-    'auto_assign_label' => 'Include this user when auto-assigning eligible licenses',
-    'auto_assign_help'  => 'Skip this user in auto assignment of licenses',
+    'email_assigned'    => 'Испрати Е-пошта со листа од сите доделени',
+    'user_notified'     => 'На корисникот му е испрати Е-пошта со листа од сите доделени предмети.',
+    'users_notified'    => 'The user has been emailed a list of their currently assigned items.|:count users have been emailed a list of their currently assigned items.',
+    'users_notified_warning' => ':count user has been emailed a list of their currently assigned items, however :no_email users did not have an email address so could not be emailed.|:count users have been emailed a list of their currently assigned items, however :no_email user(s) did not have an email address so could not be emailed.',
+    'auto_assign_label' => 'Вклучете го овој корисник при автоматско доделување подобни лиценци',
+    'auto_assign_help'  => 'Прескокнете го овој корисник при доделување лиценци',
     'software_user'     => 'Софтвер задолжен на :name',
-    'send_email_help'   => 'You must provide an email address for this user to send them credentials. Emailing credentials can only be done on user creation. Passwords are stored in a one-way hash and cannot be retrieved once saved.',
+    'send_email_help'   => 'Мора да наведете адреса на е-пошта за овој корисник да му се испратат ингеренциите. Испраќањето акредитиви преку е-пошта може да се направи само при креирање корисник. Лозинките се чуваат во еднонасочен хаш и не можат да се вратат откако ќе се зачуваат.',
     'view_user'         => 'Погледнете го/ја :name',
     'usercsv'           => 'CSV датотека',
     'two_factor_admin_optin_help' => 'Вашите тековни администраторски поставки овозможуваат селективно спроведување на автентикација со два фактори. ',
     'two_factor_enrolled' => 'Поврзан уред за 2FA ',
     'two_factor_active'   => '2FA активна',
-    'user_deactivated'  => 'User cannot login',
-    'user_activated'  => 'User can login',
-    'activation_status_warning' => 'Do not change activation status',
-    'group_memberships_helpblock' => 'Only superadmins may edit group memberships.',
-    'superadmin_permission_warning' => 'Only superadmins may grant a user superadmin access.',
-    'admin_permission_warning' => 'Only users with admins rights or greater may grant a user admin access.',
-    'remove_group_memberships' => 'Remove Group Memberships',
-    'warning_deletion_information' => 'You are about to checkin ALL items from the :count user(s) listed below. Super admin names are highlighted in red.',
-    'update_user_assets_status' => 'Update all assets for these users to this status',
-    'checkin_user_properties' => 'Check in all properties associated with these users',
-    'remote_label'   => 'This is a remote user',
-    'remote'   => 'Remote',
-    'remote_help' => 'This can be useful if you need to filter by remote users who never or rarely come into your physical locations.',
-    'not_remote_label' => 'This is not a remote user',
-    'vip_label' => 'VIP user',
-    'vip_help' => 'This can be helpful to mark important people in your org if you would like to handle them in special ways.',
-    'create_user' => 'Create a user',
-    'create_user_page_explanation' => 'This is the account information you will use to access the site for the first time.',
-    'email_credentials' => 'Email credentials',
-    'email_credentials_text' => 'Email my credentials to the email address above',
-    'next_save_user' => 'Next: Save User',
-    'all_assigned_list_generation' => 'Generated on:',
-    'email_user_creds_on_create' => 'Email this user their credentials?',
+    'user_deactivated'  => 'Корисникот неможе да се најави',
+    'user_activated'  => 'Корисникот може да се најави',
+    'activation_status_warning' => 'Не го променувај статусот на активирање',
+    'group_memberships_helpblock' => 'Само суперадминистраторите можат да изменат членство во група.',
+    'superadmin_permission_warning' => 'Само суперадминистраторите можат на корисник да доделат суперадминистраторски пристап.',
+    'admin_permission_warning' => 'Само корисници со администраторски права можат на корисник да доделат администраторски пристап.',
+    'remove_group_memberships' => 'Отстранете членство во група',
+    'warning_deletion_information' => 'Ќе ги означите СИТЕ предмети од :count корисник(ци) прикажани подолу. Суперадминистраторските имина се истакнати во црвено.',
+    'update_user_assets_status' => 'Ажурирајте ги сите средства за овие корисници на овој статус',
+    'checkin_user_properties' => 'Проверете ги сите својства поврзани со овие корисници',
+    'remote_label'   => 'Ова е далечински корисник',
+    'remote'   => 'Далечина',
+    'remote_help' => 'Ова може да биде корисно за филтрирање по далечински корисник кој никогаш или ретко доаѓа во вашите визички локации.',
+    'not_remote_label' => 'Ова не е далечински корисник',
+    'vip_label' => 'VIP корисник',
+    'vip_help' => 'Ова може да биде корисно за обележување важни личности во вашата организација ако сакате да ги опслужувате на специјален начин.',
+    'create_user' => 'Креирај корисник',
+    'create_user_page_explanation' => 'Ова е информација што ќе ја користите за првичен пристап.',
+    'email_credentials' => 'Испрати креденцијали по е-пошта',
+    'email_credentials_text' => 'Испрати ги моите креденцијали на адресата на е-пошта погоре',
+    'next_save_user' => 'Сними корисник',
+    'all_assigned_list_generation' => 'Генерирано на:',
+    'email_user_creds_on_create' => 'Да му се испрати креденцијалите на корисникот?',
 ];
diff --git a/resources/lang/mk-MK/admin/users/message.php b/resources/lang/mk-MK/admin/users/message.php
index cf76e9efb4..cd8fa254ef 100644
--- a/resources/lang/mk-MK/admin/users/message.php
+++ b/resources/lang/mk-MK/admin/users/message.php
@@ -6,17 +6,17 @@ return array(
     'declined'                  => 'Го одбивте основното средство.',
     'bulk_manager_warn'	        => 'Вашите корисници се ажурирани, но записот за менаџерот не е зачуван, бидејќи менаџерот што го избравте беше во листата на корисници што се ажурираа. Корисниците не може да бидат свој сопствен менаџер. Изберете ги корисниците повторно, со исклучок на менаџерот и пробајте пак.',
     'user_exists'               => 'Корисникот веќе постои!',
-    'user_not_found'            => 'Корисникот не постои.',
+    'user_not_found'            => 'Корисникот не постои или немате дозвола да го видите.',
     'user_login_required'       => 'Полето за корисничко име е задолжително',
-    'user_has_no_assets_assigned' => 'No assets currently assigned to user.',
+    'user_has_no_assets_assigned' => 'Моментално нема средства доделени на корисникот.',
     'user_password_required'    => 'Потребна е лозинка.',
     'insufficient_permissions'  => 'Недоволни дозволи.',
     'user_deleted_warning'      => 'Овој корисник е избришан. Ќе мора да го вратите за да го ажурирате или да му доделите нови основни средства.',
     'ldap_not_configured'        => 'Интеграција со LDAP не е конфигурирана.',
-    'password_resets_sent'      => 'The selected users who are activated and have a valid email addresses have been sent a password reset link.',
-    'password_reset_sent'       => 'A password reset link has been sent to :email!',
-    'user_has_no_email'         => 'This user does not have an email address in their profile.',
-    'log_record_not_found'        => 'A matching log record for this user could not be found.',
+    'password_resets_sent'      => 'На избраниот корисник кој е активиран и има валидна адреса на е-пошта испратен е линк за обнова на лозинката.',
+    'password_reset_sent'       => 'Линк за обнова на лозинка е испратен на :email!',
+    'user_has_no_email'         => 'Корисникот нема адреса на е-пошта во неговиот профил.',
+    'log_record_not_found'        => 'Не можеше да се најде соодветен запис од дневникот за овој корисник.',
 
 
     'success' => array(
@@ -37,22 +37,23 @@ return array(
         'update' => 'Имаше проблем со ажурирање на корисникот. Обидете се повторно.',
         'delete' => 'Имаше проблем со бришење на корисникот. Обидете се повторно.',
         'delete_has_assets' => 'Корисникот има задолжени ставки и не може да биде избришан.',
-        'delete_has_assets_var' => 'This user still has an asset assigned. Please check it in first.|This user still has :count assets assigned. Please check their assets in first.',
-        'delete_has_licenses_var' => 'This user still has a license seats assigned. Please check it in first.|This user still has :count license seats assigned. Please check them in first.',
-        'delete_has_accessories_var' => 'This user still has an accessory assigned. Please check it in first.|This user still has :count accessories assigned. Please check their assets in first.',
-        'delete_has_locations_var' => 'This user still manages a location. Please select another manager first.|This user still manages :count locations. Please select another manager first.',
-        'delete_has_users_var' => 'This user still manages another user. Please select another manager for that user first.|This user still manages :count users. Please select another manager for them first.',
+        'delete_has_assets_var' => 'Овој корисник сè уште има доделено додатоци. Ве молиме прво проверете.|Овој корисник има :count додатоци. Ве молиме прво проверете.',
+        'delete_has_licenses_var' => 'Овој корисник сè уште има доделено лиценци. Ве молиме прво проверете.|Овој корисник има :count лиценци. Ве молиме прво проверете.',
+        'delete_has_accessories_var' => 'Овој корисник сè уште има доделено додатоци. Ве молиме прво проверете.|Овој корисник има :count доделени додатоци. Ве молиме прво проверете.',
+        'delete_has_locations_var' => 'Овој корисник сè уште управува со локацијата. Ве молиме прво изберете друг менаџер.|Овој корисник управува со :count локации. Ве молиме прво изберете друг менаџер.',
+        'delete_has_users_var' => 'Овој корисник сè уште управува со друг корисник. Ве молиме прво изберете друг менаџер за тој корисник.|Овој корисник управува со :count корисници. Ве молиме прво за него изберете друг менаџер.',
         'unsuspend' => 'Имаше проблем со отстранување на привременото блокирање. Обидете се повторно.',
         'import'    => 'Имаше проблем со увозот на корисници. Обидете се повторно.',
         'asset_already_accepted' => 'Ова основно средство веќе е прифатено.',
         'accept_or_decline' => 'Мора да го прифатите или одбиете основното средство.',
-        'cannot_delete_yourself' => 'We would feel really bad if you deleted yourself, please reconsider.',
+        'cannot_delete_yourself' => 'Ќе се чувствуваме навистина лошо ако се избришите самиот себе, ве молиме размислете.',
         'incorrect_user_accepted' => 'Средството што се обидовте да го прифатите не е задожено на Вас.',
         'ldap_could_not_connect' => 'Не можам да се поврзам со LDAP серверот. Проверете ја конфигурацијата за LDAP сервер во LDAP конфигурациската датотека. <br>Грешка од LDAP-серверот:',
         'ldap_could_not_bind' => 'Не можам да се поврзам со LDAP серверот. Проверете ја конфигурацијата за LDAP сервер во LDAP конфигурациската датотека. <br>Грешка од LDAP-серверот: ',
         'ldap_could_not_search' => 'Не можам да го пребарам LDAP серверот. Проверете ја конфигурацијата за LDAP сервер во LDAP конфигурациската датотека. <br>Грешка од LDAP-серверот:',
         'ldap_could_not_get_entries' => 'Не можам да добијам записи од LDAP серверот. Проверете ја конфигурацијата за LDAP сервер во LDAP конфигурациската датотека. <br>Грешка од LDAP-серверот:',
         'password_ldap' => 'Лозинката за корисникот е управувана од LDAP/Active Directory. Ве молиме контактирајте го одделот за ИТ за да ја смените вашата лозинка. ',
+        'multi_company_items_assigned' => 'Овој корисник има доделени ставки кои припаѓаат на друга компанија. Ве молиме проверете ги или уредете ја нивната компанија.'
     ),
 
     'deletefile' => array(
@@ -68,7 +69,7 @@ return array(
     ),
 
     'inventorynotification' => array(
-        'error'   => 'This user has no email set.',
-        'success' => 'The user has been notified about their current inventory.'
+        'error'   => 'Корисникот нема внесено е-пошта.',
+        'success' => 'Корисникот е известен за неговиот тековен инвентар.'
     )
 );
\ No newline at end of file
diff --git a/resources/lang/mk-MK/admin/users/table.php b/resources/lang/mk-MK/admin/users/table.php
index f4d2a0a8a8..f78b3d1801 100644
--- a/resources/lang/mk-MK/admin/users/table.php
+++ b/resources/lang/mk-MK/admin/users/table.php
@@ -10,7 +10,7 @@ return array(
     'email'      			=> 'Е-пошта',
     'employee_num'      	=> 'Број на вработен',
     'first_name' 			=> 'Име',
-    'groupnotes'			=> 'Select a group to assign to the user, remember that a user takes on the permissions of the group they are assigned. Use ctrl+click (or cmd+click on MacOS) to deselect groups.',
+    'groupnotes'			=> 'Изберете група што ќе му ја доделите на корисникот, запомнете дека корисникот ги презема дозволите на групата што му е доделена. Користете ctrl+клик (или cmd+клик на MacOS) за да го поништите изборот на групи.',
     'id'         			=> 'ID',
     'inherit'  				=> 'Наследено',
     'job' 					=> 'Работна позиција',
@@ -20,9 +20,9 @@ return array(
     'lock_passwords'		=> 'Деталите за најава не може да се променат на оваа инсталација.',
     'manager' 				=> 'Менаџер',
     'managed_locations'     => 'Менаџирани локации',
-    'managed_users'         => 'Managed Users',
+    'managed_users'         => 'Управувани корисници',
     'name' 					=> 'Име',
-    'nogroup'               => 'No groups have been created yet. To add one, visit: ',
+    'nogroup'               => 'Сеуште нема креирано групи. За да креирате, посетете:',
     'notes'                 => 'Забелешки',
     'password_confirm' 		=> 'Потврди ја лозинката',
     'password' 				=> 'Лозинка',
@@ -31,7 +31,7 @@ return array(
     'show_deleted'          => 'Прикажи ги избришаните корисници',
     'title' 				=> 'Наслов',
 	'to_restore_them'		=> 'да се вратат.',
-    'total_assets_cost'     => "Total Assets Cost",
+    'total_assets_cost'     => "Вкупни трошоци за средствата",
     'updateuser' 			=> 'Ажурирај го корисникот',
     'username' 				=> 'Корисничко име',
 	'user_deleted_text' 	=> 'Овој корисник е обележан како избришан.',
diff --git a/resources/lang/mk-MK/auth.php b/resources/lang/mk-MK/auth.php
index db310aa1bb..b1de1cb718 100644
--- a/resources/lang/mk-MK/auth.php
+++ b/resources/lang/mk-MK/auth.php
@@ -13,8 +13,8 @@ return array(
     |
     */
 
-    'failed' => 'These credentials do not match our records.',
-    'password' => 'The provided password is incorrect.',
-    'throttle' => 'Too many login attempts. Please try again in :seconds seconds.',
+    'failed' => 'Овие ингеренциите не одговараат на нашите записи.',
+    'password' => 'Обезбедената лозинка е неточна.',
+    'throttle' => 'Too many login attempts. Please try again in :minutes minute(s).',
 
 );
diff --git a/resources/lang/mk-MK/auth/general.php b/resources/lang/mk-MK/auth/general.php
index 294d330237..2d01527a9a 100644
--- a/resources/lang/mk-MK/auth/general.php
+++ b/resources/lang/mk-MK/auth/general.php
@@ -4,15 +4,15 @@ return [
     'send_password_link'	        => 'Испрати врска за ресетирање на лозинка',
     'email_reset_password'			=> 'Ресетирање на лозинка',
     'reset_password'			    => 'Ресетирање на Лозинка',
-    'saml_login'                    => 'Login via SAML',
+    'saml_login'                    => 'Најава преку SAML',
     'login'                         => 'Најава',
     'login_prompt'                  => 'Ве молиме најавете се',
     'forgot_password'               => 'Ја заборавив мојата лозинка',
-    'ldap_reset_password'           => 'Please click here to reset your LDAP password',
+    'ldap_reset_password'           => 'Ве молиме кликнете овде за обнова на LDAP лозинката',
     'remember_me'                   => 'Запомни ме',
-    'username_help_top'                 => 'Enter your <strong>username</strong> to be emailed a password reset link.',
-    'username_help_bottom'          => 'Your username and email address <em>may</em> be the same, but may not be, depending on your configuration. If you cannot remember your username, contact your administrator. <br><br><strong>Usernames without an associated email address will not be emailed a password reset link.</strong> ',
-    'google_login'                  => 'Login with Google Workspace',
-    'google_login_failed'           => 'Google Login failed, please try again.',
+    'username_help_top'                 => 'Внесете го вашето <strong>корисничко име</strong> за да ви биде испратена Е-пошта за обнова на лозинката.',
+    'username_help_bottom'          => 'Вашето корисничко име и адреса <em>можеби</em> се исти, но можеби и не се, во зависност од вашите подесувања. Ако не се сеќавате на корисничкото име, контактирајте го администраторот. <br><br><strong>На корисничко име без адреса за Е-пошта нема да му биде испратена Е-пошта со линк за обнова на лозинка.</strong> ',
+    'google_login'                  => 'Најавете се со Google Workspace',
+    'google_login_failed'           => 'Најавата со Google е неуспешна, обидете се повторно.',
 ];
 
diff --git a/resources/lang/mk-MK/auth/message.php b/resources/lang/mk-MK/auth/message.php
index b046730920..0e3ec0e9fe 100644
--- a/resources/lang/mk-MK/auth/message.php
+++ b/resources/lang/mk-MK/auth/message.php
@@ -6,16 +6,14 @@ return array(
     'account_not_found'      => 'Корисничкото име или лозинката се неточни.',
     'account_not_activated'  => 'Оваа корисничка сметка не е активирана.',
     'account_suspended'      => 'Оваа корисничка сметка е привремено блокирана.',
-    'account_banned'         => 'Оваа корисничка сметка е блокирана.',
-    'throttle'               => 'Too many failed login attempts. Please try again in :minutes minutes.',
 
     'two_factor' => array(
-        'already_enrolled'      => 'Your device is already enrolled.',
+        'already_enrolled'      => 'Вашиот уред е веќе запишан.',
         'success'               => 'Успешно сте најавени.',
-        'code_required'         => 'Two-factor code is required.',
-        'invalid_code'          => 'Two-factor code is invalid.',
-        'enter_two_factor_code' => 'Please enter your two-factor authentication code.',
-        'please_enroll'         => 'Please enroll a device in two-factor authentication.',
+        'code_required'         => 'Дво-факторски код е задолжителен.',
+        'invalid_code'          => 'Дво-факторскиот код е невалиден.',
+        'enter_two_factor_code' => 'Ве молиме внесете дво-факторски код за автентификација.',
+        'please_enroll'         => 'Ве молиме запишете уред во двофакторна автентикација.',
     ),
 
     'signin' => array(
@@ -24,8 +22,8 @@ return array(
     ),
 
     'logout' => array(
-        'error'   => 'There was a problem while trying to log you out, please try again.',
-        'success' => 'You have successfully logged out.',
+        'error'   => 'Имаше проблем при обидот да ве одјавиме, обидете се повторно.',
+        'success' => 'Успешно сте одјавени.',
     ),
 
     'signup' => array(
@@ -35,7 +33,7 @@ return array(
 
     'forgot-password' => array(
         'error'   => 'Имаше проблем при обидот да се добие кодот за ресетирање не лозинка, обидете се повторно.',
-        'success' => 'If that email address exists in our system, a password recovery email has been sent.',
+        'success' => 'Ако таа адреса на Е-пошта постои во нашиот систем, испратена ви е Е-пошта за обнова на лозинката.',
     ),
 
     'forgot-password-confirm' => array(
diff --git a/resources/lang/mk-MK/button.php b/resources/lang/mk-MK/button.php
index 04d8a2197a..6d6b85f844 100644
--- a/resources/lang/mk-MK/button.php
+++ b/resources/lang/mk-MK/button.php
@@ -4,21 +4,31 @@ return [
     'actions' 	                => 'Акции',
     'add'    	                => 'Додади ново',
     'cancel'                    => 'Откажи',
-    'checkin_and_delete'  	    => 'Checkin All / Delete User',
+    'checkin_and_delete'  	    => 'Раздолжи Се / Избриши корисник',
     'delete'  	                => 'Избриши',
     'edit'    	                => 'Ажурирај',
+    'clone'    	                => 'Клонирај',
     'restore' 	                => 'Врати',
-    'remove'                    => 'Remove',
+    'remove'                    => 'Отстрани',
     'request'                   => 'Побарај',
     'submit'  	                => 'Поднеси',
     'upload'                    => 'Прикачи',
     'select_file'				=> 'Избери датотека...',
     'select_files'				=> 'Избери датотека...',
-    'generate_labels'           => '{1} Generate Label|[2,*] Generate Labels',
+    'generate_labels'           => '{1} Генерирај налепница|[2,*] Генерирај налепници',
     'send_password_link'        => 'Испрати врска за ресетирање на лозинка',
-    'go'                        => 'Go',
-    'bulk_actions'              => 'Bulk Actions',
-    'add_maintenance'           => 'Add Maintenance',
-    'append'                    => 'Append',
+    'go'                        => 'Оди',
+    'bulk_actions'              => 'Масовни дејства',
+    'add_maintenance'           => 'Додади одржување',
+    'append'                    => 'Додади',
     'new'                       => 'Ново',
+    'var' => [
+        'clone'     => 'Клонирај :item_type',
+        'edit'      => 'Измени :item_type',
+        'delete'    => 'Избриши :item_type',
+        'restore'   => 'Врати :item_type',
+        'create'    => 'Креирај нов :item_type',
+        'checkout'  => 'Задложи :item_type',
+        'checkin'   => 'Раздолжи :item_type',
+    ]
 ];
diff --git a/resources/lang/mk-MK/general.php b/resources/lang/mk-MK/general.php
index d810132f25..1241e6544f 100644
--- a/resources/lang/mk-MK/general.php
+++ b/resources/lang/mk-MK/general.php
@@ -1,44 +1,47 @@
 <?php
 
 return [
-    '2FA_reset'             => '2FA reset',
+    '2FA_reset'             => '2FA ресетирање',
     'accessories'			=> 'Додатоци',
     'activated'			    => 'Активиран',
-    'accepted_date'         => 'Date Accepted',
+    'accepted_date'         => 'Датум на прифаќање',
     'accessory'				=> 'Додаток',
     'accessory_report'		=> 'Извештај за додаток',
     'action'                => 'Акција',
     'activity_report'		=> 'Извештај за активност',
     'address'				=> 'Адреса',
-    'admin'					=> 'Admin',
-    'admin_tooltip'			=> 'This user has admin privileges',
-    'superuser'				=> 'Superuser',
-    'superuser_tooltip'		=> 'This user has superuser privileges',
+    'admin'					=> 'Административни подесувања',
+    'admin_tooltip'			=> 'Корисникот има администраторски привилегии',
+    'superuser'				=> 'Суперкорисник',
+    'superuser_tooltip'		=> 'Корисникот има привилегии на суперкорисник',
     'administrator'			=> 'Администратор',
     'add_seats'             => 'Додадени места',
-    'age'                   => "Age",
+    'age'                   => "Возраст",
     'all_assets'			=> 'Сите основни средства',
     'all'       			=> 'Сите',
     'archived'              => 'Архивирано',
     'asset_models'			=> 'Модели на основни средства',
     'asset_model'			=> 'Модел',
     'asset'					=> 'Основно средство',
+    'asset_previous'        => 'Asset (Previously Assigned)',
     'asset_report'          => 'Извештај за основни средства',
     'asset_tag'				=> 'Код на основното средство',
-    'asset_tags'            => 'Asset Tags',
-    'assets_available'		=> 'Assets available',
-    'accept_assets'         => 'Accept Assets :name',
-    'accept_assets_menu'    => 'Accept Assets',
+    'asset_tags'            => 'Етикети на средства',
+    'assets_available'		=> 'Достапни средства',
+    'accept_assets'         => 'Прифати средства :name',
+    'accept_assets_menu'    => 'Прифати средства',
+    'accept_item'           => 'Accept Item',
     'audit'				    => 'Ревизија',
+    'audits'				=> 'Audits',
     'audit_report'			=> 'Дневник за ревизија',
     'assets'				=> 'Основни средства',
-    'assets_audited'        => 'assets audited',
-    'assets_checked_in_count'     => 'assets checked in',
-    'assets_checked_out_count'     => 'assets checked out',
-    'asset_deleted_warning'     => 'This asset has been deleted. You must restore it before you can assign it to someone.',
-    'assigned_date'         => 'Date Assigned',
-    'assigned_to'           => 'Assigned to :name',
-    'assignee'              => 'Assigned to',
+    'assets_audited'        => 'ревидирани средства',
+    'assets_checked_in_count'     => 'вратени редства',
+    'assets_checked_out_count'     => 'позајмени средства',
+    'asset_deleted_warning'     => 'Ова средство е избришано. Мора да го вратите пред да можете да го доделите на некого.',
+    'assigned_date'         => 'Датум на задолжување',
+    'assigned_to'           => 'Задолжени на :name',
+    'assignee'              => 'Задолжен на',
     'avatar_delete'         => 'Избриши аватар',
     'avatar_upload'         => 'Прикачи аватар',
     'back'      			=> 'Назад',
@@ -46,13 +49,13 @@ return [
     'bulkaudit'             => 'Масовна ревизија',
     'bulkaudit_status'      => 'Статус на ревизија',
     'bulk_checkout'  		=> 'Масовно задолжување',
-    'bulk_edit'             => 'Bulk Edit',
-    'bulk_delete'           => 'Bulk Delete',
-    'bulk_actions'          => 'Bulk Actions',
-    'bulk_checkin_delete'   => 'Bulk Checkin / Delete Users',
+    'bulk_edit'             => 'Масовно уредување',
+    'bulk_delete'           => 'Масовно бришење',
+    'bulk_actions'          => 'Масовни дејства',
+    'bulk_checkin_delete'   => 'Раздолжи ги /  избриши ги корисниците',
     'byod'                  => 'BYOD',
-    'byod_help'             => 'This device is owned by the user',
-    'bystatus'              => 'by Status',
+    'byod_help'             => 'Уредот е во сопственост на корисникот',
+    'bystatus'              => 'по Статус',
     'cancel'  				=> 'Откажи',
     'categories'			=> 'Категории',
     'category'				=> 'Категорија',
@@ -61,9 +64,12 @@ return [
     'changepassword'  		=> 'Промена на лозинка',
     'checkin'  				=> 'Раздолжи',
     'checkin_from'  		=> 'Раздолжи од',
+    'checkin_note'  		=> 'Checkin Note',
+    'checkout_note'  		=> 'Checkout Note',
     'checkout'  			=> 'Задолжи',
     'checkouts_count'       => 'Раздолжувања',
     'checkins_count'        => 'Пријавувања',
+    'checkin_and_delete'  	=> 'Checkin and Delete',
     'user_requests_count'   => 'Барања',
     'city'  				=> 'Град',
     'click_here'			=> 'Кликни тука',
@@ -76,21 +82,23 @@ return [
     'consumable'			=> 'Потрошен материјал',
     'consumables'			=> 'Потрошен материјал',
     'country'  				=> 'Држава',
-    'could_not_restore'     => 'Error restoring :item_type: :error',
-    'not_deleted'           => 'The :item_type is not deleted so it cannot be restored',
+    'could_not_restore'     => 'Грешка при враќање :item_type: :error',
+    'not_deleted'           => 'Уредот :item_type не е избришан и затоа не може да се врати',
     'create'				=> 'Креирај Нов {0}',
     'created'               => 'Креирана ставка',
     'created_asset'			=> 'креирано основно средство',
-    'created_at' 			=> 'Created At',
-    'created_by'            => 'Created By',
-    'record_created' 		=> 'Record Created',
+    'created_at' 			=> 'Креирано на',
+    'created_by'            => 'Креирано од',
+    'record_created' 		=> 'Записот креиран',
     'updated_at' 			=> 'Ажурирано во',
     'currency'  			=> '$', // this is deprecated
+    'currency_text'  		=> 'Валута', //
     'current'  				=> 'Тековна',
-    'current_password'      => 'Current Password',
-    'customize_report'      => 'Customize Report',
+    'current_password'      => 'Тековна лозинка',
+    'customize_report'      => 'Прилагоди извештај',
     'custom_report'         => 'Приспособен извештај за основни средства',
     'dashboard'				=> 'Табла',
+    'data_source'           => 'Data Source',
     'days'      			=> 'денови',
     'days_to_next_audit'    => 'Денови до следна ревизија',
     'date'					=> 'Датум',
@@ -98,53 +106,37 @@ return [
     'debug_warning_text'    => 'Оваа апликација работи во режим на производство со овозможено дебагирање. Ова може да изложи чувствителните податоци доколку вашата апликација е достапна за надворешниот свет. Оневозможете го дебагирачкиот режим со поставување на <code>APP_DEBUG</code> во вашата <code>.env</code> датотека на <code>false</code>.',
     'delete'  				=> 'Избриши',
     'delete_confirm'  		=> 'Дали сте сигурни дека сакате да избришете: ставка?',
-    'delete_confirm_no_undo' => 'Are you sure you wish to delete :item? This can not be undone.',
+    'delete_confirm_no_undo' => 'Дали сте сигурни, сакате да го избришете :item? Ова неможе да се врати.',
     'deleted'  				=> 'Избришани',
     'delete_seats'  		=> 'Избришани места',
-    'deletion_failed'       => 'Deletion failed',
+    'deletion_failed'       => 'Неуспешно бришење',
     'departments'           => 'Одделенија',
     'department'            => 'Одделение',
     'deployed'				=> 'Распоредени',
     'depreciation'			=> 'Амортизационен план',
-    'depreciations'         => 'Depreciations',
+    'depreciations'         => 'Амортизации',
     'depreciation_report'	=> 'Извештај за амортизација',
     'details'               => 'Детали',
     'download'				=> 'Преземи',
-    'download_all'		    => 'Download All',
+    'download_all'		    => 'Преземи сè',
     'editprofile'  			=> 'Уредете го вашиот профил',
     'eol'					=> 'EOL',
     'email_domain'			=> 'Домен за е-пошта',
-    'email_format'			=> 'Формат на е-пошта',
-    'employee_number'       => 'Employee Number',
+    'employee_number'       => 'Број на вработен',
     'email_domain_help'		=> 'Ова се користи за генерирање на адреси на е-пошта при увоз',
-    'error'				    => 'Error',
-    'exclude_archived'      => 'Exclude Archived Assets',
-    'exclude_deleted'       => 'Exclude Deleted Assets',
-    'example'				=> 'Example: ',
-    'filastname_format'			=> 'Почетна буква од име, Презиме (jjankov@example.com)',
-    'firstname_lastname_format'	=> 'Име, точка, Презиме (janko.jankov@example.com)',
-    'firstname_lastname_underscore_format' => 'Име, _, Презиме (janko_jankov@example.com)',
-    'lastnamefirstinitial_format' =>  'Презиме, Почетна буква од име (jankovj@example.com)',
-    'firstintial_dot_lastname_format' => 'First Initial Last Name (j.smith@example.com)',
-    'firstname_lastname_display'	=> 'First Name Last Name (Jane Smith)',
-    'lastname_firstname_display'	=> 'Last Name First Name (Smith Jane)',
-    'name_display_format'	=> 'Name Display Format',
-    'first'					=> 'Прво',
-    'firstnamelastname'     => 'First Name Last Name (janesmith@example.com)',
-    'lastname_firstinitial' => 'Last Name First Initial (smith_j@example.com)',
-    'firstinitial.lastname' => 'First Initial Last Name (j.smith@example.com)',
-    'firstnamelastinitial'  => 'First Name Last Initial (janes@example.com)',
-    'lastnamefirstname'      => 'Last Name First Name (smith.jane@example.com)',
-    'first_name'			=> 'Име',
-    'first_name_format'		=> 'Име (janko@example.com)',
+    'error'				    => 'Грешка',
+    'exclude_archived'      => 'Исклучи архивирани средства',
+    'exclude_deleted'       => 'Исклучи избришани средства',
+    'example'				=> 'Пример: ',
+
     'files'                 => 'Датотеки',
     'file_name'				=> 'Датотека',
-    'file_type'             => 'File Type',
-    'filesize'              => 'File Size',
+    'file_type'             => 'Тип на фајл',
+    'filesize'              => 'Големина на фајл',
     'file_uploads'			=> 'Прикачување датотеки',
-    'file_upload'           => 'File Upload',
+    'file_upload'           => 'Прикачи фајл',
     'generate'				=> 'Генерирање',
-    'generate_labels'       => 'Generate Labels',
+    'generate_labels'       => 'Генерирај етикети',
     'github_markdown'      => 'Ова поле прифаќа <a href="https://help.github.com/articles/github-flavored-markdown/">означување според Github</a>.',
     'groups'				=> 'Групи',
     'gravatar_email'        => 'Gravatar е-пошта',
@@ -154,69 +146,82 @@ return [
     'id'  					=> 'ID',
     'image'                 => 'Слика',
     'image_delete'         	=> 'Избриши ја сликата',
-    'include_deleted'       => 'Include Deleted Assets',
+    'include_deleted'       => 'Вклучи избришани средства',
     'image_upload'         	=> 'Поставете слика',
-    'filetypes_accepted_help'    => 'Accepted filetype is :types. Max upload size allowed is :size.|Accepted filetypes are :types. Max upload size allowed is :size.',
-    'filetypes_size_help'   => 'Max upload size allowed is :size.',
-    'image_filetypes_help'  => 'Accepted filetypes are jpg, webp, png, gif, svg, and avif. Max upload size allowed is :size.',
-    'unaccepted_image_type'  => 'This image file was not readable. Accepted filetypes are jpg, webp, png, gif, and svg. The mimetype of this file is: :mimetype.',
+    'filetypes_accepted_help'    => 'Прифатливи типови на датотеки се :types. Максимална дозволена големина :size.|Прифатливи типови на датотеки се :types. Максимално дозволена големина за прикачување е :size.',
+    'filetypes_size_help'   => 'Максимално дозволена големина за прикачување е :size.',
+    'image_filetypes_help'  => 'Прифатените типови датотеки се jpg, webp, png, gif, svg и avif. Максималната дозволена големина на прикачување е: големина.',
+    'unaccepted_image_type'  => 'Оваа датотека со слики не беше читлива. Прифатливи типови на датотеки се jpg, webp, png, gif и svg. Миметипот на оваа датотека е: : mimetype.',
     'import'         	    => 'Увоз',
-    'import_this_file'      => 'Map fields and process this file',
-    'importing'         	=> 'Importing',
-    'importing_help'        => 'You can import assets, accessories, licenses, components, consumables, and users via CSV file. <br><br>The CSV should be comma-delimited and formatted with headers that match the ones in the <a href="https://snipe-it.readme.io/docs/importing" target="_new">sample CSVs in the documentation</a>.',
+    'import_this_file'      => 'Означи полиња и обработете ја оваа датотека',
+    'importing'         	=> 'Увоз',
+    'importing_help'        => 'Можете да увезувате средства, додатоци, лиценци, компоненти, потрошен материјали и корисници преку CSV -датотеката. <br><br>CSV треба да биде обележана со запирка и форматирана со заглавија што одговараат на оние во <a href="https://snipe-it.readme.io/docs/importing" target="_new">пример на CSV во документацијата</a>.',
     'import-history'        => 'Историја на увози',
     'asset_maintenance'        => 'Одржување на основни средства',
     'asset_maintenance_report' => 'Извештај за одржување на основни средства',
     'asset_maintenances'       => 'Одржувања на основни средства',
     'item'  				=> 'Ставка',
-    'item_name'             => 'Item Name',
-    'import_file'  			=> 'import CSV file',
-    'import_type'  			=> 'CSV import type',
+    'item_name'             => 'Име на ставката',
+    'import_file'  			=> 'Увези CSV датотека',
+    'import_type'  			=> 'тип на CSV увоз',
     'insufficient_permissions' => 'Недоволни дозволи!',
-    'kits'       			=> 'Predefined Kits',
+    'kits'       			=> 'Комплети опрема',
     'language'				=> 'Јазик',
     'last'					=> 'Последно',
     'last_login'            => 'Последна најава',
     'last_name'             => 'Презиме',
+    'firstname_lastname_display'	=> 'Име Презиме (Jane Smith)',
+    'lastname_firstname_display'	=> 'Презиме Име (Smith Jane)',
+    'name_display_format'	=> 'Формат на приказ на име',
+    'first'					=> 'Прво',
+    'first_name'			=> 'Име',
     'license'				=> 'Лиценца',
     'license_report'        => 'Извештај за лиценци',
-    'licenses_available'	=> 'Licenses available',
+    'licenses_available'	=> 'Достапни лиценци',
     'licenses'				=> 'Лиценци',
     'list_all'				=> 'Листа на сите',
-    'loading'				=> 'Loading... please wait....',
-    'lock_passwords'        => 'This field value will not be saved in a demo installation.',
+    'loading'				=> 'Вчитување... Ве молиме почекајте...',
+    'lock_passwords'        => 'Вредноста на ова поле нема да се зачува во демонстрационата инсталација.',
     'feature_disabled'      => 'Оваа функција е оневозможена за демонстрационата инсталација.',
     'location'              => 'Локација',
-    'location_plural'        => 'Location|Locations',
+    'location_plural'        => 'Локација|Локации',
     'locations'				=> 'Локации',
-    'logo_size'				=> 'Square logos look best with Logo + Text. Logo maximum display size is 50px high x 500px wide.  ',
+    'logo_size'				=> 'Четвртасто логоа изгледаат најдобро со лого + текст. Максималната големина на логото е 50px висина и 500px ширина.  ',
     'logout'				=> 'Одјави се',
     'lookup_by_tag'     => 'Пребарување по код на основно средство',
     'maintenances'          => 'Одржувања',
-    'manage_api_keys'       => 'Manage API Keys',
+    'manage_api_keys'       => 'Управување со API клучеви',
     'manufacturer'			=> 'Производител',
     'manufacturers'			=> 'Производители',
     'markdown'				=> 'Ова поле прифаќа <a href="https://help.github.com/articles/github-flavored-markdown/">означување според Github</a>.',
     'min_amt'				=> 'Минимална количина',
-    'min_amt_help'          => 'Minimum number of items that should be available before an alert gets triggered. Leave Min. QTY blank if you do not want to receive alerts for low inventory.',
+    'min_amt_help'          => 'Минимален број на ставки што треба да бидат достапни пред да се активира предупредувањето. Оставете Мин. Количина празно ако не сакате да примате известувања за мала количина во инвентарот.',
     'model_no'				=> 'Модел бр.',
     'months'				=> 'месеци',
     'moreinfo'				=> 'Повеќе информации',
     'name'					=> 'Име',
-    'new_password'          => 'New Password',
+    'new_password'          => 'Нова лозинка',
     'next'					=> 'Следно',
     'next_audit_date'		=> 'Следен датум на ревизија',
-    'next_audit_date_help'  => 'If you use auditing in your organization, this is usually automatically calculated based on the asset&apos;s last audit date and audit frequency (in <code>Admin Settings &gt; Alerts</code>) and you can leave this blank. You can manually set this date here if you need to, but it must be later than the last audit date. ',
-    'audit_images_help'     => 'You can find audit images in the asset\'s history tab.',
-    'no_email'              => 'No email address associated with this user',
+    'next_audit_date_help'  => 'Доколку вршите попис на имотот во вашата организација, ова обично автоматски се пресметува на основ на последниот попис &apos; и фрекфенција на попишување (во <code>Admin Settings &gt; Alerts</code>) и можете да го оставите празно. Овде можете да го наведете рачно доколку е потребно, но мора да биде подоцна од датумот на последниот попис. ',
+    'audit_images_help'     => 'Слики од пописот можете да ги најдете на картицата за историја на имотот.',
+    'no_email'              => 'Ниедна адреса на Е-пошта не е поврзана со овој корисник',
     'last_audit'		    => 'Последна ревизија',
     'new'					=> 'ново!',
     'no_depreciation'		=> 'Не се амортизира',
     'no_results'			=> 'Нема резултати.',
     'no'  					=> 'Не',
     'notes'  				=> 'Забелешки',
+    'note_added'            => 'Note Added',
+    'options'				=> 'Options',
+    'preview'				=> 'Preview',
+    'add_note'              => 'Add Note',
+    'note_edited'            => 'Note Edited',
+    'edit_note'              => 'Edit Note',
+    'note_deleted'            => 'Note Deleted',
+    'delete_note'              => 'Delete Note',
     'order_number'          => 'Број на нарачка',
-    'only_deleted'          => 'Only Deleted Assets',
+    'only_deleted'          => 'Само избришани средства',
     'page_menu'				=> 'Прикажани се _MENU_ ставки',
     'pagination_info'		=> 'Прикажани се _START_ до _END_ од _TOTAL_ ставки',
     'pending'				=> 'Во чекање',
@@ -229,9 +234,9 @@ return [
     'purchase_date'         => 'Датум на набавка',
     'qty'		            => 'Количина',
     'quantity'		        => 'Квантитет',
-    'quantity_minimum'      => 'You have :count items below or almost below minimum quantity levels',
-    'quickscan_checkin'  	=> 'Quick Scan Checkin',
-    'quickscan_checkin_status'  	=> 'Checkin Status',
+    'quantity_minimum'      => 'You have one item below or almost below minimum quantity levels|You have :count items below or almost below minimum quantity levels',
+    'quickscan_checkin'  	=> 'Брзо раздолжување',
+    'quickscan_checkin_status'  	=> 'Статус на раздолжувањето',
     'ready_to_deploy'		=> 'Подготвен за распоредување',
     'recent_activity'		=> 'Скорешна активност',
     'remaining'             => 'Останува',
@@ -239,22 +244,22 @@ return [
     'reports'				=> 'Извештаи',
     'restored'				=> 'вратено',
     'restore'				=> 'Врати',
-    'requestable_models'    => 'Requestable Models',
-    'requestable_items'     => 'Requestable Items',
+    'requestable_models'    => 'Побарливи модели',
+    'requestable_items'     => 'Побарливи предмети',
     'requested'				=> 'Побарано',
-    'requested_date'        => 'Requested Date',
-    'requested_assets'      => 'Requested Assets',
-    'requested_assets_menu' => 'Requested Assets',
+    'requested_date'        => 'Побаран датум',
+    'requested_assets'      => 'Побарани средства',
+    'requested_assets_menu' => 'Побарани средства',
     'request_canceled'      => 'Барањето е откажано',
-    'request_item'          => 'Request this item',
-    'external_link_tooltip' => 'External link to',
+    'request_item'          => 'Побарајте оваа ставка',
+    'external_link_tooltip' => 'Надворешна врска до',
     'save'  				=> 'Зачувај',
-    'select_var'            => 'Select :thing... ', // this will eventually replace all of our other selects
+    'select_var'            => 'Изберете: нешто... ', // this will eventually replace all of our other selects
     'select'				=> 'Избери',
-    'select_all'            => 'Select All',
+    'select_all'            => 'Избери се',
     'search'				=> 'Пребарај',
     'select_category'       => 'Одбери категорија',
-    'select_datasource' => 'Select a Datasource',
+    'select_datasource' => 'Изберете извор на податоци',
     'select_department'     => 'Изберете оддел',
     'select_depreciation'	=> 'Изберете тип на амортизација',
     'select_location'		=> 'Изберете локација',
@@ -271,21 +276,23 @@ return [
     'show_current'  		=> 'Прикажи тековно',
     'sign_in'				=> 'Најави се',
     'signature'             => 'Потпис',
-    'signed_off_by'         => 'Signed Off By',
+    'signed_off_by'         => 'Потпишано од',
     'skin'       			=> 'Кожа',
-    'webhook_msg_note'        => 'A notification will be sent via webhook',
-    'webhook_test_msg'        => 'Oh hai! Looks like your :app integration with Snipe-IT is working!',
+    'webhook_msg_note'        => 'Известување ќе биде пратено преку webhook',
+    'webhook_test_msg'        => 'О здраво! Изгледа вашата :app интеграција со Snipe-IT работи!',
     'some_features_disabled' => 'DEMO MODE: Некои функции се оневозможени за оваа инсталација.',
     'site_name'				=> 'Име на сајтот',
     'state'  				=> 'Состојба',
     'status_labels'			=> 'Етикети со статус',
+    'status_label'			=> 'Status Label',
     'status'    			=> 'Статус',
-    'accept_eula'           => 'Acceptance Agreement',
+    'accept_eula'           => 'Договор за прифаќање',
+    'show_or_hide_eulas' => 'Прикажи/Скријај EULA',
     'supplier'              => 'Добавувач',
     'suppliers'  			=> 'Добавувачи',
     'sure_to_delete'        => 'Дали сте сигурни дека сакате да ја избришете',
     'sure_to_delete_var'    => 'Дали сте сигурни дека сакате да избришете: ставка?',
-    'delete_what'           => 'Delete :item',
+    'delete_what'           => 'Избриши :item',
     'submit'				=> 'Поднеси',
     'target'                => 'Цел',
     'time_and_date_display' => 'Приказ на време и датум',
@@ -296,259 +303,327 @@ return [
     'type'  				=> 'Тип',
     'undeployable'			=> 'Не може да се распореди',
     'unknown_admin'			=> 'Непознат Администратор',
-    'username_format'		=> 'Формат на корисничко име',
     'username'              => 'Корисничко име',
     'update'                => 'Ажурирање',
-    'upload_filetypes_help'      => 'Allowed filetypes are png, gif, jpg, jpeg, doc, docx, pdf, xls, xlsx, txt, lic, xml, zip, rtf and rar. Max upload size allowed is :size.',
+    'updating_item' => 'Updating :item',
+    'upload_filetypes_help'      => 'Дозволени типови на датотеки се png, gif, jpg, jpeg, doc, docx, pdf, xls, xlsx, txt, lic, xml, zip, rtf and rar. Максимална дозволена големина е :size.',
     'uploaded'              => 'Прикачено',
     'user'					=> 'Корисник',
     'accepted'			    => 'прифатен',
     'declined'			    => 'одбиено',
-    'declined_note'         => 'Declined Notes',
-    'unassigned'            => 'Unassigned',
+    'declined_note'         => 'Одбиени белешки',
+    'unassigned'            => 'Недоделено',
     'unaccepted_asset_report' => 'Неприфатени средства',
     'users'                 => 'Корисници',
-    'viewall'				=> 'View All',
+    'viewall'				=> 'Прикажи се',
     'viewassets'  			=> 'Прикажете ги доделените основни средства',
-    'viewassetsfor'         => 'View Assets for :name',
+    'viewassetsfor'         => 'Прикажи имот од корисникот :name',
     'website'               => 'Веб страна',
     'welcome'				=> 'Добредојдовте :name',
     'years'					=> 'години',
     'yes' 					=> 'Да',
     'zip'  					=> 'Зип',
     'noimage'				=> 'Не е прикачена слика или сликата не е пронајдена.',
-    'file_does_not_exist'   => 'The requested file does not exist on the server.',
-    'file_upload_success'   => 'File upload success!',
-    'no_files_uploaded'     => 'File upload success!',
+    'file_does_not_exist'   => 'Бараната датотека не постои на серверот.',
+    'file_upload_success'   => 'Прикачувањето е успешно!',
+    'no_files_uploaded'     => 'Прикачувањето е успешно!',
     'token_expired'         => 'Вашата сесија истече. Најавете се повторно.',
-    'login_enabled'         => 'Login Enabled',
-    'audit_due'             => 'Due for Audit',
-    'audit_due_days'        => 'Assets Due for Audit Within :days Day|Assets Due for Audit Within :days Days',
-    'checkin_due'           => 'Due for Checkin',
-    'checkin_overdue'       => 'Overdue for Checkin',
-    'checkin_due_days'      => 'Assets Due for Checkin Within :days Day|Assets Due for Checkin Within :days Days',
-    'audit_overdue'         => 'Overdue for Audit',
-    'accept'                => 'Accept :asset',
-    'i_accept'              => 'I accept',
-    'i_decline'             => 'I decline',
-    'accept_decline'        => 'Accept/Decline',
-    'sign_tos'              => 'Sign below to indicate that you agree to the terms of service:',
-    'clear_signature'       => 'Clear Signature',
-    'show_help'             => 'Show help',
-    'hide_help'             => 'Hide help',
-    'view_all'              => 'view all',
-    'hide_deleted'          => 'Hide Deleted',
+    'login_enabled'         => 'Најавувањето е овозможено',
+    'audit_due'             => 'Спремно за ревизија',
+    'audit_due_days'        => '{}Assets Due or Overdue for Audit|[1]Assets Due or Overdue for Audit Within a Day|[2,*]Assets Due or Overdue for Audit Within :days Days',
+    'checkin_due'           => 'Рок за раздолжување',
+    'checkin_overdue'       => 'Поминат рок за раздолжување',
+    'checkin_due_days'      => '{}Due for Checkin|[1]Assets Due for Checkin Within :days Day|[2,*]Assets Due for Checkin Within :days Days',
+    'audit_overdue'         => 'Преку рокот за ревизија',
+    'accept'                => 'Прифати :asset',
+    'i_accept'              => 'Прифаќам',
+    'i_decline'             => 'Одбивам',
+    'accept_decline'        => 'Прифати/Одбијај',
+    'sign_tos'              => 'Потпишете се подолу за да потврдите дека ги прифаќате условите за користење:',
+    'clear_signature'       => 'Избриши потпис',
+    'show_help'             => 'Прикажи помош',
+    'hide_help'             => 'Сокриј помош',
+    'view_all'              => 'прикажи се',
+    'hide_deleted'          => 'Сокриј избришани',
     'email'                 => 'Е-пошта',
-    'do_not_change'         => 'Do Not Change',
-    'bug_report'            => 'Report a Bug',
-    'user_manual'           => 'User\'s Manual',
-    'setup_step_1'          => 'Step 1',
-    'setup_step_2'          => 'Step 2',
-    'setup_step_3'          => 'Step 3',
-    'setup_step_4'          => 'Step 4',
-    'setup_config_check'    => 'Configuration Check',
-    'setup_create_database' => 'Create Database Tables',
-    'setup_create_admin'    => 'Create Admin User',
-    'setup_done'            => 'Finished!',
-    'bulk_edit_about_to'    => 'You are about to edit the following: ',
+    'do_not_change'         => 'Не менувај',
+    'bug_report'            => 'Пријавете грешка',
+    'user_manual'           => 'Упатство за корисникот',
+    'setup_step_1'          => 'Чекор 1',
+    'setup_step_2'          => 'Чекор 2',
+    'setup_step_3'          => 'Чекор 3',
+    'setup_step_4'          => 'Чекор 4',
+    'setup_config_check'    => 'Проверка на подесувањата',
+    'setup_create_database' => 'Креирај табели во базата на податоци',
+    'setup_create_admin'    => 'Креирај администраторски корисник',
+    'setup_done'            => 'Завршено!',
+    'bulk_edit_about_to'    => 'Ќе го уредите следново: ',
     'checked_out'           => 'Задолжен на',
-    'checked_out_to'        => 'Checked out to',
-    'fields'                => 'Fields',
-    'last_checkout'         => 'Last Checkout',
-    'due_to_checkin'        => 'The following :count items are due to be checked in soon:',
-    'expected_checkin'      => 'Expected Checkin',
-    'reminder_checked_out_items' => 'This is a reminder of the items currently checked out to you. If you feel this list is inaccurate (something is missing, or something appears here that you believe you never received), please email :reply_to_name at :reply_to_address.',
-    'changed'               => 'Changed',
-    'to'                    => 'To',
-    'report_fields_info'    => '<p>Select the fields you would like to include in your custom report, and click Generate. The file (custom-asset-report-YYYY-mm-dd.csv) will download automatically, and you can open it in Excel.</p>
+    'checked_out_to'        => 'Проверено на',
+    'fields'                => 'Полиња',
+    'last_checkout'         => 'Последен задолжување',
+    'due_to_checkin'        => 'Следните :count предметите треба да се проверат наскоро:',
+    'expected_checkin'      => 'Очекувано раздолжување',
+    'reminder_checked_out_items' => 'Ова е потсетник за предметите што моментално ви се обележани. Ако сметате дека оваа листа не е точна (нешто недостасува, или се појавува нешто што не сте примиле), испратете Е-пошта :reply_to_name на :reply_to_address.',
+    'changed'               => 'Променето',
+    'to'                    => 'За',
+    'report_fields_info'    => '<p>Изберете ги полињата што сакате да ги вклучите во вашиот извештај и кликнете на генерирај. Датотеката (custom-asset-report-YYYY-mm-dd.csv) ќе се преземе автоматски, и можете да ја отворите во Excel.</p>
             <p>If you would like to export only certain assets, use the options below to fine-tune your results.</p>',
-    'range'                 => 'Range',
-    'bom_remark'            => 'Add a BOM (byte-order mark) to this CSV',
-    'improvements'          => 'Improvements',
-    'information'           => 'Information',
-    'permissions'           => 'Permissions',
-    'managed_ldap'          => '(Managed via LDAP)',
-    'export'                => 'Export',
-    'ldap_sync'             => 'LDAP Sync',
-    'ldap_user_sync'        => 'LDAP User Sync',
-    'synchronize'           => 'Synchronize',
-    'sync_results'          => 'Synchronization Results',
-    'license_serial'        => 'Serial/Product Key',
-    'invalid_category'      => 'Invalid or missing category',
-    'invalid_item_category_single' => 'Invalid or missing :type category. Please update the category of this :type to include a valid category before checking out.',
-    'dashboard_info'        => 'This is your dashboard. There are many like it, but this one is yours.',
-    '60_percent_warning'    => '60% Complete (warning)',
-    'dashboard_empty'       => 'It looks like you have not added anything yet, so we do not have anything awesome to display. Get started by adding some assets, accessories, consumables, or licenses now!',
-    'new_asset'             => 'New Asset',
-    'new_license'           => 'New License',
-    'new_accessory'         => 'New Accessory',
-    'new_consumable'        => 'New Consumable',
-    'collapse'              => 'Collapse',
-    'assigned'              => 'Assigned',
-    'asset_count'           => 'Asset Count',
-    'accessories_count'     => 'Accessories Count',
-    'consumables_count'     => 'Consumables Count',
-    'components_count'      => 'Components Count',
-    'licenses_count'        => 'Licenses Count',
-    'notification_error'    => 'Error',
-    'notification_error_hint' => 'Please check the form below for errors',
-    'notification_bulk_error_hint' => 'The following fields had validation errors and were not edited:',
-    'notification_success'  => 'Success',
+    'range'                 => 'Опсег',
+    'bom_remark'            => 'Додај BOM (byte-order mark) на овој CSV',
+    'improvements'          => 'Унапредувања',
+    'information'           => 'Информации',
+    'permissions'           => 'Дозволи',
+    'managed_ldap'          => '(Управувано преку LDAP)',
+    'export'                => 'Извоз',
+    'ldap_sync'             => 'LDAP синхронизација',
+    'ldap_user_sync'        => 'LDAP синхронизација на корисници',
+    'synchronize'           => 'Синхронизирај',
+    'sync_results'          => 'Резултати од синхронизацијата',
+    'license_serial'        => 'Сериски број',
+    'invalid_category'      => 'Невалидна или непостоечка категорија',
+    'invalid_item_category_single' => 'Невалидна или непостоечка :type категорија. Ве молима да ја ажурирате категоријата од типот :type за да содржи исправна категорија пред задолжувањето.',
+    'dashboard_info'        => 'Ова е вашата табла. Има многу како оваа, но оваа е ваша.',
+    '60_percent_warning'    => '60% завршено (предупредување)',
+    'dashboard_empty'       => 'Изгледа дека сè уште не сте додале ништо, така што немаме ништо прекрасно за прикажување. Започнете со додавање на некои средства, додатоци, потрошни материјали или лиценци сега!',
+    'new_asset'             => 'Ново средство',
+    'new_license'           => 'Нова лиценца',
+    'new_accessory'         => 'Нов додаток',
+    'new_consumable'        => 'Нов потрошен',
+    'new_component'         => 'New Component',
+    'new_user'              => 'New User',
+    'collapse'              => 'Собери',
+    'assigned'              => 'Доделено',
+    'asset_count'           => 'Количина на средства',
+    'accessories_count'     => 'Количина на додадоци',
+    'consumables_count'     => 'Количина на потрошен материјал',
+    'components_count'      => 'Количина на компоненти',
+    'licenses_count'        => 'Количина на лиценци',
+    'notification_error'    => 'Грешка',
+    'notification_error_hint' => 'Ве молиме да проверите за грешки во формуларот подолу',
+    'notification_bulk_error_hint' => 'Следниве полиња имаат грешки во валидацијата и не беа уредени:',
+    'notification_success'  => 'Успех',
     'notification_warning'   => 'Предупредување',
     'notification_info'      => 'Информации',
-    'asset_information'     => 'Asset Information',
-    'model_name'            => 'Model Name',
+    'asset_information'     => 'Информации за имотот',
+    'model_name'            => 'Назив на моделот',
     'asset_name'            => 'Име на основното средство',
-    'consumable_information' => 'Consumable Information:',
+    'consumable_information' => 'Информации за потрошен материјал:',
     'consumable_name'       => 'Име на потрошен материјал:',
-    'accessory_information' => 'Accessory Information:',
+    'accessory_information' => 'Информации за додатоци:',
     'accessory_name'       => 'Име на додаток:',
-    'clone_item'            => 'Clone Item',
-    'checkout_tooltip' => 'Check this item out',
-    'checkin_tooltip' => 'Check this item in so that it is available for re-issue, re-imaging, etc',
-    'checkout_user_tooltip' => 'Check this item out to a user',
+    'clone_item'            => 'Клонирај ставка',
+    'checkout_tooltip' => 'Задолжи ја оваа ставка',
+    'checkin_tooltip' => 'Раздолжете ја оваа ставка како би била достапна за повторно задолжување',
+    'checkout_user_tooltip' => 'Задолжи го корисникот со оваа ставка',
     'checkin_to_diff_location' => 'You can choose to check this asset in to a location other than this asset\'s default location of :default_location if one is set',
-    'maintenance_mode'      => 'The service is temporarily unavailable for system updates. Please check back later.',
-    'maintenance_mode_title' => 'System Temporarily Unavailable',
-    'ldap_import'           => 'User password should not be managed by LDAP. (This allows you to send forgotten password requests.)',
-    'purge_not_allowed'     => 'Purging deleted data has been disabled in the .env file. Contact support or your systems administrator.',
-    'backup_delete_not_allowed'     => 'Deleting backups has been disabled in the .env file. Contact support or your systems administrator.',
-    'additional_files'           => 'Additional Files',
-    'shitty_browser'        => 'No signature detected. If you are using an older browser, please use a more modern browser to complete your asset acceptance.',
-    'bulk_soft_delete'      =>'Also soft-delete these users. Their asset history will remain intact unless/until you purge deleted records in the Admin Settings.',
-    'bulk_checkin_delete_success' => 'Your selected users have been deleted and their items have been checked in.',
-    'bulk_checkin_success' => 'The items for the selected users have been checked in.',
-    'set_to_null'           => 'Delete values for this asset|Delete values for all :asset_count assets ',
-    'set_users_field_to_null'  => 'Delete :field values for this user|Delete :field values for all :user_count users ',
-    'na_no_purchase_date'   => 'N/A - No purchase date provided',
-    'assets_by_status'      => 'Assets by Status',
-    'assets_by_status_type'      => 'Assets by Status Type',
-    'pie_chart_type'        => 'Dashboard Pie Chart Type',
-    'hello_name'            => 'Hello, :name!',
-    'unaccepted_profile_warning'   => 'You have :count items requiring acceptance. Click here to accept or decline them',
-    'start_date'            => 'Start Date',
-    'end_date'            => 'End Date',
-    'alt_uploaded_image_thumbnail' => 'Uploaded thumbnail',
-    'placeholder_kit'       => 'Select a kit',
-    'file_not_found'        => 'File not found',
-    'preview_not_available' => '(no preview)',
-    'setup'                 => 'Setup',
-    'pre_flight'            => 'Pre-Flight',
-    'skip_to_main_content'  => 'Skip to main content',
-    'toggle_navigation'     => 'Toggle navigation',
-    'alerts'                => 'Alerts',
-    'tasks_view_all'        => 'View all tasks',
-    'true'                  => 'True',
-    'false'                 => 'False',
-    'integration_option'    => 'Integration Option',
-    'log_does_not_exist'    => 'No matching log record exists.',
-    'merge_users'           => 'Merge Users',
-    'merge_information' =>  'This will merge the :count users into a single user. Select the user you wish to merge the others into below, and the associated assets, licenses, etc will be moved over to the selected user and the other users will be marked as deleted.',
-    'warning_merge_information' => 'This action CANNOT be undone and should ONLY be used when you need to merge users because of a bad import or sync. Be sure to run a backup first.',
-    'no_users_selected'     => 'No users selected',
-    'not_enough_users_selected'     => 'At least :count users must be selected',
-    'merge_success'         => ':count users merged successfully into :into_username!',
-    'merged'                => 'merged',
-    'merged_log_this_user_into' => 'Merged this user (ID :to_id - :to_username) into user ID :from_id (:from_username) ',
-    'merged_log_this_user_from' => 'Merged user ID :from_id (:from_username) into this user (ID :to_id - :to_username)',
-    'clear_and_save'            => 'Clear & Save',
-    'update_existing_values'    => 'Update Existing Values?',
-    'auto_incrementing_asset_tags_disabled_so_tags_required' => 'Generating auto-incrementing asset tags is disabled so all rows need to have the "Asset Tag" column populated.',
-    'auto_incrementing_asset_tags_enabled_so_now_assets_will_be_created' => 'Note: Generating auto-incrementing asset tags is enabled so assets will be created for rows that do not have "Asset Tag" populated. Rows that do have "Asset Tag" populated will be updated with the provided information.',
-    'send_welcome_email_to_users'   => ' Send Welcome Email for new Users?',
-    'send_email'                => 'Send Email',
-    'call'                      => 'Call number',
-    'back_before_importing'     => 'Backup before importing?',
-    'csv_header_field'          => 'CSV Header Field',
-    'import_field'              => 'Import Field',
-    'sample_value'              => 'Sample Value',
-    'no_headers'                => 'No Columns Found',
-    'error_in_import_file'      => 'There was an error reading the CSV file: :error',
-    'errors_importing'          => 'Some Errors occurred while importing: ',
-    'warning'                   => 'WARNING: :warning',
-    'success_redirecting'       => '"Success... Redirecting.',
-    'cancel_request'            => 'Cancel this item request',
-    'setup_successful_migrations' => 'Your database tables have been created',
-    'setup_migration_output' => 'Migration output:',
-    'setup_migration_create_user' => 'Next: Create User',
-    'importer_generic_error'    => 'Your file import is complete, but we did receive an error. This is usually caused by third-party API throttling from a notification webhook (such as Slack) and would not have interfered with the import itself, but you should confirm this.',
-    'confirm' => 'Confirm',
-    'autoassign_licenses' => 'Auto-Assign Licenses',
-    'autoassign_licenses_help' => 'Allow this user to have licenses assigned via the bulk-assign license UI or cli tools.',
-    'autoassign_licenses_help_long' => 'This allows a user to be have licenses assigned via the bulk-assign license UI or cli tools. (For example, you might not want contractors to be auto-assigned a license you would provide to only staff members. You can still individually assign licenses to those users, but they will not be included in the Checkout License to All Users functions.)',
-    'no_autoassign_licenses_help' => 'Do not include user for bulk-assigning through the license UI or cli tools.',
-    'modal_confirm_generic'      => 'Are you sure?',
-    'cannot_be_deleted'      => 'This item cannot be deleted',
-    'cannot_be_edited'      => 'This item cannot be edited.',
-    'undeployable_tooltip'      => 'This item cannot be checked out. Check the quantity remaining.',
-    'serial_number'        => 'Serial Number',
-    'item_notes' => ':item Notes',
-    'item_name_var' => ':item Name',
-    'error_user_company' => 'Checkout target company and asset company do not match',
-    'error_user_company_accept_view' => 'An Asset assigned to you belongs to a different company so you can\'t accept nor deny it, please check with your manager',
+    'maintenance_mode'      => 'Услугата за ажурирање на системот е привремено недостапна. Ве молиме, проверете подоцна.',
+    'maintenance_mode_title' => 'Системот е привремено недостапен',
+    'ldap_import'           => 'LDAP не би требало да управува со корисничките лозинки. (Ова овозможува да праќате барања за заборавена лозинка.)',
+    'purge_not_allowed'     => 'Чистење на избришаните датотеки е оневозможено во .env датотеката. Обратете се на поддршката или системскиот администратор.',
+    'backup_delete_not_allowed'     => 'Бришење на резервните копии е оневозможено во .env датотеката. Обратете се на поддршката или системскиот администратор.',
+    'additional_files'           => 'Додатни датотеки',
+    'shitty_browser'        => 'Не е детектиран потпис. Ако користите постар прелистувач, ве молиме користете помодерен прелистувач за да го завршите прифаќањето на средствата.',
+    'bulk_soft_delete'      =>'Привремено избришете ги овие корисници. Нивната историја на средства ќе остане недопрена, освен ако не ги исчистите избришани записи во административните поставки.',
+    'bulk_checkin_delete_success' => 'Вашите избрани корисници се избришани и нивните артикли се проверени.',
+    'bulk_checkin_success' => 'Предметите за избраните корисници се проверени.',
+    'set_to_null'           => 'Избришете ги вредностите за овој избор|Избришете ги вредностите за сите :selection_count избрани ',
+    'set_users_field_to_null'  => 'Избриши :field вредности за овој корисник|Избриши :field вредности за сите :user_count корисници ',
+    'na_no_purchase_date'   => 'N/A - Не е даден датум на набавка',
+    'assets_by_status'      => 'Средства по статус',
+    'assets_by_status_type'      => 'Средства по тип на статус',
+    'pie_chart_type'        => 'Тип на пита графикон на работната таблата',
+    'hello_name'            => 'Здраво, :name!',
+    'unaccepted_profile_warning'   => 'Имате една ставка што бара прифаќање. Кликнете овде за да го прифатите или одбиете | Имате :count ставки што бараат прифаќање. Кликнете овде за да ги прифатите или одбиете',
+    'start_date'            => 'Почетен датум',
+    'end_date'            => 'Краен датум',
+    'alt_uploaded_image_thumbnail' => 'Прикачена слика',
+    'placeholder_kit'       => 'Одберете комплет',
+    'file_not_found'        => 'Датотеката не е пронајдена',
+    'log_record_not_found'  => 'No record for that log entry was found.',
+    'preview_not_available' => '(нема преглед)',
+    'setup'                 => 'Подесувања',
+    'pre_flight'            => 'Пред-полетување',
+    'skip_to_main_content'  => 'Премини на главна содржина',
+    'toggle_navigation'     => 'Навигациско мени',
+    'alerts'                => 'Предупредувања',
+    'tasks_view_all'        => 'Види ги сите задачи',
+    'true'                  => 'Точно',
+    'false'                 => 'Грешно',
+    'integration_option'    => 'Опции за интеграција',
+    'log_does_not_exist'    => 'Не постојат соодветни записи.',
+    'merge_users'           => 'Спои корисници',
+    'merge_information' =>  'Ова ќе ги спои :count корисниците во еден корисник. Изберете го корисникот во кој што сакате да ги споите корисниците подолу, а придружните средства, лиценците, итн. ќе бидат пренесени на избраниот корисник, а другите корисници ќе бидат обележани како избришани.',
+    'warning_merge_information' => 'Оваа акција не може да се врати и треба да се користи само кога треба да ги споите корисниците заради лош увоз или синхронизација. Бидете сигурни прво да извршите резервна копија.',
+    'no_users_selected'     => 'Нема избрани корисници',
+    'not_enough_users_selected'     => 'Најмалку :count корисници треба да бидат избрани',
+    'merge_success'         => ':count корисници успешно се споени во :into_username!',
+    'merged'                => 'споено',
+    'merged_log_this_user_into' => 'Корисникот (ID :to_id - :to_username) е споен во ID :from_id (:from_username) ',
+    'merged_log_this_user_from' => 'Корисникот ID :from_id (:from_username) е споен во (ID :to_id - :to_username)',
+    'clear_and_save'            => 'Исчисти & Сними',
+    'update_existing_values'    => 'Обнови ги постоечките вредности?',
+    'auto_incrementing_asset_tags_disabled_so_tags_required' => 'Генерирање на ознаки за автоматско зголемување на средствата е оневозможено, така што сите редови треба да ја имаат колоната „ознака на средства“.',
+    'auto_incrementing_asset_tags_enabled_so_now_assets_will_be_created' => 'Забелешка: Генерирање на ознаки за автоматско зголемување на средствата е овозможено, така што ќе се создадат средства за редови кои немаат „ознака на средства“. Редовите што имаат „ознака на средства“ ќе се ажурираат со предвидените информации.',
+    'send_welcome_email_to_users'   => ' Испратете добредојде на Е-пошта за нови корисници?',
+    'send_email'                => 'Испрати Е-пошта',
+    'call'                      => 'Повикај број',
+    'back_before_importing'     => 'Направете резервна копија пред увоз?',
+    'csv_header_field'          => 'CSV Поле за заглавие',
+    'import_field'              => 'Поле за увоз',
+    'sample_value'              => 'Пример за вредност',
+    'no_headers'                => 'Ниедна колона не е пронајдена',
+    'error_in_import_file'      => 'Се појави грешка при читање на CSV датотеката: :error',
+    'errors_importing'          => 'Се појавија некои грешки при увозот: ',
+    'warning'                   => 'ВНИМАНИЕ: :warning',
+    'success_redirecting'       => '"Успешно... Пренасочување.',
+    'cancel_request'            => 'Откажи го ова барање',
+    'setup_successful_migrations' => 'Направени се табелита на вашата база на податоци',
+    'setup_migration_output' => 'Резултат од миграцијата:',
+    'setup_migration_create_user' => 'Следно: Креирајте корисник',
+    'importer_generic_error'    => 'Увозот на датотеки е завршен, но се појави грешка. This is usually caused by third-party API throttling from a notification webhook (such as Slack) and would not have interfered with the import itself, but you should confirm this.',
+    'confirm' => 'Потврди',
+    'autoassign_licenses' => 'Автоматски додели лиценци',
+    'autoassign_licenses_help' => 'Дозволете му на овој корисник да има лиценци доделени преку алатки за групно доделување лиценци со обележување или конзола.',
+    'autoassign_licenses_help_long' => 'Ова му дозволува на корисникот да има лиценци доделени преку алатки за групно доделување лиценци со обележување или конзола. (На пример, можеби не сакате на привремено вработените да им биде автоматски доделено лиценца што би ја дале само на вработените. Сè уште можете индивидуално да доделите лиценци на тие корисници, но тие нема да бидат вклучени во функцијата за издавање лиценци за сите корисници.)',
+    'no_autoassign_licenses_help' => 'Не го вклучувај корисникот во функциите за групно доделување лиценци.',
+    'modal_confirm_generic'      => 'Дали сте сигурен?',
+    'cannot_be_deleted'      => 'Оваа ставка неможе да биде избришана',
+    'cannot_be_edited'      => 'Оваа ставка неможе да биде променета.',
+    'undeployable_tooltip'      => 'Предметот неможе да се задолжи. Проверете достапни количини.',
+    'serial_number'        => 'Сериски број',
+    'item_notes' => ':item Забелешки',
+    'item_name_var' => ':item Име',
+    'error_user_company' => 'Компанијата за задолжување и компанијата на предметот не се поклопуваат',
+    'error_user_company_accept_view' => 'Предметите со кои ве задолжуваат припаѓаат на друга компанија и затоа неможете ни да прифатите ни да одбиете. Во молиме проверете со вашите надредени',
     'importer' => [
-        'checked_out_to_fullname' => 'Checked Out to: Full Name',
-        'checked_out_to_first_name' => 'Checked Out to: First Name',
-        'checked_out_to_last_name' => 'Checked Out to: Last Name',
-        'checked_out_to_username' => 'Checked Out to: Username',
-        'checked_out_to_email' => 'Checked Out to: Email',
-        'checked_out_to_tag' => 'Checked Out to: Asset Tag',
-        'manager_first_name' => 'Manager First Name',
-        'manager_last_name' => 'Manager Last Name',
-        'manager_full_name' => 'Manager Full Name',
-        'manager_username' => 'Manager Username',
-        'checkout_type' => 'Checkout Type',
-        'checkout_location' => 'Checkout to Location',
-        'image_filename' => 'Image Filename',
-        'do_not_import'     => 'Do Not Import',
+        'checked_out_to_fullname' => 'Одјавено на: Целосно име',
+        'checked_out_to_first_name' => 'Одјавено на: Име',
+        'checked_out_to_last_name' => 'Одјавено на: Презиме',
+        'checked_out_to_username' => 'Одјавено на: Корисничко име',
+        'checked_out_to_email' => 'Одјавено на: Е-пошта',
+        'checked_out_to_tag' => 'Одјавено на: Ознака на средство',
+        'manager_first_name' => 'Менаџер Име',
+        'manager_last_name' => 'Менаџер Презиме',
+        'manager_full_name' => 'Менаџер Целосно име',
+        'manager_username' => 'Менаџер Корисничко име',
+        'checkout_type' => 'Тип на задолжување',
+        'checkout_location' => 'Локација на задолжување',
+        'image_filename' => 'Име на датотеката за слика',
+        'do_not_import'     => 'Не увезувај',
         'vip' => 'VIP',
         'avatar'  => 'Avatar',
         'gravatar' => 'Gravatar Email',
-        'currency' => 'Currency',
-        'address2' => 'Address Line 2',
-        'import_note' => 'Imported using csv importer',
+        'currency' => 'Валута',
+        'address2' => 'Адреса 2',
+        'import_note' => 'Увезено преку csv импортер',
     ],
-    'remove_customfield_association' => 'Remove this field from the fieldset. This will not delete the custom field, only this field\'s association with this fieldset.',
-    'checked_out_to_fields' => 'Checked Out To Fields',
+    'remove_customfield_association' => 'Одстрани го полето од групата полиња. Ова нема да го избрише прилагоденото поле, туку само полињата поврзани со групата полиња.',
+    'checked_out_to_fields' => 'Задолжено на полиња',
     'percent_complete' => '% завршено',
-    'uploading' => 'Uploading... ',
-    'upload_error' => 'Error uploading file. Please check that there are no empty rows and that no column names are duplicated.',
-    'copy_to_clipboard' => 'Copy to Clipboard',
-    'copied' => 'Copied!',
-    'status_compatibility' => 'If assets are already assigned, they cannot be changed to a non-deployable status type and this value change will be skipped.',
-    'rtd_location_help' => 'This is the location of the asset when it is not checked out',
-    'item_not_found' => ':item_type ID :id does not exist or has been deleted',
-    'action_permission_denied' => 'You do not have permission to :action :item_type ID :id',
-    'action_permission_generic' => 'You do not have permission to :action this :item_type',
+    'uploading' => 'Прикачување... ',
+    'upload_error' => 'Error uploading file. Please check that you have no empty rows or duplicated column names in your CSV, and that the server permissions allow uploads.',
+    'copy_to_clipboard' => 'Копирај во Clipboard',
+    'copied' => 'Копирано!',
+    'status_compatibility' => 'Ако средството е доделено, не е можно статусот да биде променет во статус од не-распоредлив тип и оваа вредност ќе биде прескокната.',
+    'rtd_location_help' => 'Ова е локацијата на средството кога не е задолжено',
+    'item_not_found' => ':item_type ID :id не постои или е избришано',
+    'action_permission_denied' => 'Немате овластувања за :action :item_type ID :id',
+    'action_permission_generic' => 'Немате овластувања да :action this :item_type',
     'edit' => 'ажурирај',
     'action_source' => 'Action Source',
     'or' => 'or',
     'url'                   => 'URL',
-    'edit_fieldset' => 'Edit fieldset fields and options',
-    'permission_denied_superuser_demo' => 'Permission denied. You cannot update user information for superadmins on the demo.',
-    'pwd_reset_not_sent' => 'User is not activated, is LDAP synced, or does not have an email address',
-    'error_sending_email' => 'Error sending email',
-    'sad_panda' => 'Sad panda. You are not authorized to do the thing. Maybe <a href=":link">return to the dashboard</a>, or contact your administrator.',
+    'edit_fieldset' => 'Измени полиња на групата и опции',
+    'permission_denied_superuser_demo' => 'Овластувањето е одбиено. Неможете да измените податоци за Суперадмин во оваа демонстрација.',
+    'pwd_reset_not_sent' => 'Корисникот не е активиран, дали LDAP е синхронизиран, или нема неведено адреса на Е-пошта',
+    'error_sending_email' => 'Грешка при испраќањето Е-пошта',
+    'sad_panda' => 'Тажна панда. Не сте овластени да го направите ова. Можеби <a href=":link">назад кон контролната табла</a>, или контактирајте го администраторот.',
     'bulk' => [
             'delete' =>
                 [
-                'header' => 'Bulk Delete :object_type',
-                'warn'   =>  'You are about to delete one :object_type|You are about to delete :count :object_type',
-                'success'   =>  ':object_type successfully deleted|Successfully deleted :count :object_type',
-                'error'   =>  'Could not delete :object_type',
-                'nothing_selected'   =>  'No :object_type selected - nothing to do',
-                'partial'   =>  'Deleted :success_count :object_type, but :error_count :object_type could not be deleted',
+                'header' => 'Групно бришење :object_type',
+                'warn'   =>  'Ќе го избришете :object_type|Ќе го избришете :count :object_type',
+                'success'   =>  ':object_type е успешно избришан|Успешно избришан :count :object_type',
+                'error'   =>  'Не е можно да се избирише :object_type',
+                'nothing_selected'   =>  'Ниеден :object_type не е избран - не е потребно ништо да се прави',
+                'partial'   =>  'Избришан :success_count :object_type, but :error_count :object_type не можеше да се избриши',
              ],
     ],
-    'no_requestable' => 'There are no requestable assets or asset models.',
+    'no_requestable' => 'Нема повеќе побарливи предмети или модели.',
 
     'countable' => [
-        'accessories'  => ':count Accessory|:count Accessories',
-        'assets'  => ':count Asset|:count Assets',
-        'licenses'  => ':count License|:count Licenses',
-        'license_seats'  => ':count License Seat|:count License Seats',
-        'consumables'  => ':count Consumable|:count Consumables',
-        'components'  => ':count Component|:count Components',
-    ]
+        'accessories'  => ':count Додаток|:count Додатоци',
+        'assets'  => ':count Средство|:count Средства',
+        'licenses'  => ':count Лиценца|:count Лиценци',
+        'license_seats'  => ':count Лиценцно место|:count Лиценцни места',
+        'consumables'  => ':count Потрошен материјал|:count Потрошни материјали',
+        'components'  => ':count Компонента|:count Компоненти',
+    ],
+
+    'more_info' => 'Повеќе информации',
+    'quickscan_bulk_help' => 'Потврдувањето на ова поле ќе го уреди записот на средствата за да ја одрази оваа нова локација. Оставањето непотврдено, едноставно ќе ја забележи локацијата во пописот. Забележете дека ако се потврди ова средство, нема да ја промени локацијата на лицето, средството или локацијата на која се задолжува.',
+    'whoops' => 'Упс!',
+    'something_went_wrong' => 'Нешто тргна наопаку со вашето барање.',
+    'close' => 'Затвори',
+    'expires' => 'Истекува',
+    'map_fields'=> 'Map :item_type Fields',
+    'remaining_var' => ':count преостануваат',
+    'label' => 'Етикета',
+    'import_asset_tag_exists' => 'Средство со ознаката :asset_tag веќе постои и не беше побарано ажурирање.Не е направена никаква промена.',
+    'countries_manually_entered_help' => 'Вредности со звездичка (*) биле рачно внесени и не се совпаѓаат со постојните ISO 3166 вредности во менито',
+    'accessories_assigned' => 'Assigned Accessories',
+    'user_managed_passwords' => 'Password Management',
+    'user_managed_passwords_disallow' => 'Disallow users from managing their own passwords',
+    'user_managed_passwords_allow' => 'Allow users to manage their own passwords',
+    'from' => 'From',
+    'by' => 'Од',
+
+// Add form placeholders here
+    'placeholders' => [
+        'notes'  => 'Add a note',
+    ],
+
+    'breadcrumb_button_actions' => [
+        'edit_item' => 'Edit :name',
+        'checkout_item' => 'Checkout :name',
+        'checkin_item' => 'Checkin :name',
+    ],
+
+    'skins' => [
+        'site_default' => 'Site Default',
+        'default_blue' => 'Default Blue',
+        'blue_dark' => 'Blue (Dark Mode)',
+        'green' => 'Green Dark',
+        'green_dark' => 'Green (Dark Mode)',
+        'red' => 'Red Dark',
+        'red_dark' => 'Red (Dark Mode)',
+        'orange' => 'Orange Dark',
+        'orange_dark' => 'Orange (Dark Mode)',
+        'black' => 'Black',
+        'black_dark' => 'Black (Dark Mode)',
+        'purple' => 'Purple',
+        'purple_dark' => 'Purple (Dark Mode)',
+        'yellow' => 'Yellow',
+        'yellow_dark' => 'Yellow (Dark Mode)',
+        'high_contrast' => 'High Contrast',
+
+    ],
+
+    'select_all_none' => 'Select/Unselect All',
+    'generic_model_not_found' => 'That :model was not found or you do not have permission to access it',
+    'deleted_models' => 'Deleted Asset Models',
+    'deleted_users' => 'Deleted Users',
+    'cost_each' => ':amount each',
+    'remove_current_image' => 'Remove current :type image',
+
+    'seeding' => [
+        'manufacturers' => [
+            'button' => 'Create Manufacturers',
+            'prompt' => 'You do not have any manufacturers yet. Would you like to seed a list of common manufacturers? (THIS WILL OVERWRITE EXISTING MANUFACTURERS, including those that have been soft-deleted.)',
+            'success' => 'Manufacturers seeded successfully',
+            'error' => 'Could not seed manufacturers. A manufacturer record already exists and seeding would overwrite it.|Could not seed manufacturers. :count manufacturer records already exist and seeding would overwrite them.',
+        ],
+    ],
 
 ];
diff --git a/resources/lang/mk-MK/help.php b/resources/lang/mk-MK/help.php
index 482ebcc4db..4056a664fa 100644
--- a/resources/lang/mk-MK/help.php
+++ b/resources/lang/mk-MK/help.php
@@ -15,7 +15,7 @@ return [
 
     'more_info_title' => 'Повеќе информации',
 
-    'audit_help' => 'Checking this box will edit the asset record to reflect this new location. Leaving it unchecked will simply note the location in the audit log.<br><br>Note that if this asset is checked out, it will not change the location of the person, asset or location it is checked out to.',
+    'audit_help' => 'Обележувањето на ова поле ќе го уреди записот на средствата за да ја одрази оваа нова локација. Оставањето необележано едноставно ќе ја забележи локацијата во дневникот за ревизија. <br><br>Забележете дека ако се обележи ова средство, тоа нема да ја промени локацијата на лицето, средството или локацијата на која се проверува.',
 
     'assets' => 'Основни средства се ставки следени по сериски број или код на средства. Тие обично имаат повисока набавна вредност и е важно нивно поединечно евидентирање.',
 
@@ -31,5 +31,5 @@ return [
 
     'depreciations' => 'Можете да поставите амортизационен план за основните средства за да ја намалувате нивната вредност праволиниски.',
     
-    'empty_file'    => 'The importer detects that this file is empty.'
+    'empty_file'    => 'Увозникот открива дека оваа датотека е празна.'
 ];
diff --git a/resources/lang/mk-MK/localizations.php b/resources/lang/mk-MK/localizations.php
index f1232dd138..85010c8aa7 100644
--- a/resources/lang/mk-MK/localizations.php
+++ b/resources/lang/mk-MK/localizations.php
@@ -2,320 +2,325 @@
 
 return [
 
-    'select_language' => 'Select a language',
+    'select_language' => 'Изберете јазик',
     'languages' => [
-        'en-US'=> 'English, US',
-        'en-GB'=> 'English, UK',
-        'am-ET' => 'Amharic',
-        'af-ZA'=> 'Afrikaans',
-        'ar-SA'=> 'Arabic',
-        'bg-BG'=> 'Bulgarian',
-        'zh-CN'=> 'Chinese Simplified',
-        'zh-TW'=> 'Chinese Traditional',
-        'ca-ES' => 'Catalan',
-        'hr-HR'=> 'Croatian',
-        'cs-CZ'=> 'Czech',
-        'da-DK'=> 'Danish',
-        'nl-NL'=> 'Dutch',
-        'en-ID'=> 'English, Indonesia',
-        'et-EE'=> 'Estonian',
-        'fil-PH'=> 'Filipino',
-        'fi-FI'=> 'Finnish',
-        'fr-FR'=> 'French',
-        'de-DE'=> 'German',
-        'de-if'=> 'German (Informal)',
-        'el-GR'=> 'Greek',
-        'he-IL'=> 'Hebrew',
-        'hu-HU'=> 'Hungarian',
-        'is-IS' => 'Icelandic',
-        'id-ID'=> 'Indonesian',
-        'ga-IE'=> 'Irish',
-        'it-IT'=> 'Italian',
-        'ja-JP'=> 'Japanese',
-        'km-KH'=>'Khmer',
-        'ko-KR'=> 'Korean',
-        'lt-LT'=>'Lithuanian',
-        'lv-LV'=> 'Latvian',
-        'mk-MK'=> 'Macedonian',
-        'ms-MY'=> 'Malay',
-        'mi-NZ'=> 'Maori',
-        'mn-MN'=> 'Mongolian',
-        'no-NO'=> 'Norwegian',
-        'fa-IR'=> 'Persian',
-        'pl-PL'=> 'Polish',
-        'pt-PT'=> 'Portuguese',
-        'pt-BR'=> 'Portuguese, Brazilian',
-        'ro-RO'=> 'Romanian',
-        'ru-RU'=> 'Russian',
-        'sr-CS' => 'Serbian (Latin)',
-        'sk-SK'=> 'Slovak',
-        'sl-SI'=> 'Slovenian',
-        'so-SO'=> 'Somali',
-        'es-ES'=> 'Spanish',
-        'es-CO'=> 'Spanish, Colombia',
-        'es-MX'=> 'Spanish, Mexico',
-        'es-VE'=> 'Spanish, Venezuela',
-        'sv-SE'=> 'Swedish',
-        'tl-PH'=> 'Tagalog',
-        'ta-IN'=> 'Tamil',
-        'th-TH'=> 'Thai',
-        'tr-TR'=> 'Turkish',
-        'uk-UA'=> 'Ukranian',
-        'vi-VN'=> 'Vietnamese',
-        'cy-GB'=> 'Welsh',
-        'zu-ZA'=> 'Zulu',
+        'en-US'=> 'Англиски, САД',
+        'en-GB'=> 'Англиски, ОК',
+        'am-ET' => 'Ахмарски',
+        'af-ZA'=> 'Африкански',
+        'ar-SA'=> 'Арабски',
+        'bg-BG'=> 'Бугарски',
+        'zh-CN'=> 'Кинески, поедноставен',
+        'zh-TW'=> 'Кинески, традиционален',
+        'ca-ES' => 'Каталонски',
+        'hr-HR'=> 'Хрватски',
+        'cs-CZ'=> 'Чешки',
+        'da-DK'=> 'Дански',
+        'nl-NL'=> 'Холандски',
+        'en-ID'=> 'Англиски, Индонезија',
+        'et-EE'=> 'Естонски',
+        'fil-PH'=> 'Филипински',
+        'fi-FI'=> 'Фински',
+        'fr-FR'=> 'Француски',
+        'de-DE'=> 'Германски',
+        'de-if'=> 'Германски (неформален)',
+        'el-GR'=> 'Грчки',
+        'he-IL'=> 'Еврејски',
+        'hu-HU'=> 'Унгарски',
+        'is-IS' => 'Исландски',
+        'id-ID'=> 'Индонезиски',
+        'ga-IE'=> 'Ирски',
+        'it-IT'=> 'Италијански',
+        'ja-JP'=> 'Јапонски',
+        'km-KH'=>'Кмерски',
+        'ko-KR'=> 'Корејски',
+        'lt-LT'=>'Литвански',
+        'lv-LV'=> 'Латвиски',
+        'mk-MK'=> 'Македонски',
+        'ms-MY'=> 'Малајски',
+        'mi-NZ'=> 'Маорски',
+        'mn-MN'=> 'Монголски',
+        'nb-NO'=> 'Норвешки бокмал',
+        'om-ET' => 'Oromo (Ethiopian)',
+        //'nn-NO'=> 'Norwegian Nynorsk',
+        'fa-IR'=> 'Персиски',
+        'pl-PL'=> 'Полски',
+        'pt-PT'=> 'Португалски',
+        'pt-BR'=> 'Португалски, Бразилски',
+        'ro-RO'=> 'Романски',
+        'ru-RU'=> 'Руски',
+        'sr-CS' => 'Српски (латиница)',
+        'sk-SK'=> 'Словачки',
+        'sl-SI'=> 'Словенски',
+        'so-SO'=> 'Сомалиски',
+        'es-ES'=> 'Шпански',
+        'es-CO'=> 'Шпански, Колумбија',
+        'es-MX'=> 'Шпански, Мексико',
+        'es-VE'=> 'Шпански, Венецуела',
+        'sv-SE'=> 'Шведски',
+        'tl-PH'=> 'Тугалог',
+        'ta-IN'=> 'Тамилски',
+        'th-TH'=> 'Тајландски',
+        'tr-TR'=> 'Турски',
+        'uk-UA'=> 'Украински',
+        'vi-VN'=> 'Виетнамски',
+        'cy-GB'=> 'Велшски',
+        'zu-ZA'=> 'Зулу',
     ],
 
-    'select_country' => 'Select a country',
+    'select_country' => 'Иберете Држава',
     
     'countries' => [
-        'AC'=>'Ascension Island',
-        'AD'=>'Andorra',
-        'AE'=>'United Arab Emirates',
-        'AF'=>'Afghanistan',
-        'AG'=>'Antigua And Barbuda',
-        'AI'=>'Anguilla',
-        'AL'=>'Albania',
-        'AM'=>'Armenia',
-        'AN'=>'Netherlands Antilles',
-        'AO'=>'Angola',
-        'AQ'=>'Antarctica',
-        'AR'=>'Argentina',
-        'AS'=>'American Samoa',
-        'AT'=>'Austria',
-        'AU'=>'Australia',
-        'AW'=>'Aruba',
-        'AX'=>'Ã…land',
-        'AZ'=>'Azerbaijan',
-        'BA'=>'Bosnia And Herzegovina',
-        'BB'=>'Barbados',
-        'BE'=>'Belgium',
-        'BD'=>'Bangladesh',
-        'BF'=>'Burkina Faso',
-        'BG'=>'Bulgaria',
-        'BH'=>'Bahrain',
-        'BI'=>'Burundi',
-        'BJ'=>'Benin',
-        'BM'=>'Bermuda',
-        'BN'=>'Brunei Darussalam',
-        'BO'=>'Bolivia',
-        'BR'=>'Brazil',
-        'BS'=>'Bahamas',
-        'BT'=>'Bhutan',
-        'BV'=>'Bouvet Island',
-        'BW'=>'Botswana',
-        'BY'=>'Belarus',
-        'BZ'=>'Belize',
-        'CA'=>'Canada',
-        'CC'=>'Cocos (Keeling) Islands',
-        'CD'=>'Congo (Democratic Republic)',
-        'CF'=>'Central African Republic',
-        'CG'=>'Congo (Republic)',
-        'CH'=>'Switzerland',
-        'CI'=>'Côte d\'Ivoire',
-        'CK'=>'Cook Islands',
-        'CL'=>'Chile',
-        'CM'=>'Cameroon',
-        'CN'=>'People\'s Republic of China',
-        'CO'=>'Colombia',
-        'CR'=>'Costa Rica',
-        'CU'=>'Cuba',
-        'CV'=>'Cape Verde',
-        'CX'=>'Christmas Island',
-        'CY'=>'Cyprus',
-        'CZ'=>'Czech Republic',
-        'DE'=>'Germany',
-        'DJ'=>'Djibouti',
-        'DK'=>'Denmark',
-        'DM'=>'Dominica',
-        'DO'=>'Dominican Republic',
-        'DZ'=>'Algeria',
-        'EC'=>'Ecuador',
-        'EE'=>'Estonia',
-        'EG'=>'Egypt',
-        'ER'=>'Eritrea',
-        'ES'=>'Spain',
-        'ET'=>'Ethiopia',
-        'EU'=>'European Union',
-        'FI'=>'Finland',
-        'FJ'=>'Fiji',
-        'FK'=>'Falkland Islands (Malvinas)',
-        'FM'=>'Micronesia, Federated States Of',
-        'FO'=>'Faroe Islands',
-        'FR'=>'France',
-        'GA'=>'Gabon',
-        'GD'=>'Grenada',
-        'GE'=>'Georgia',
-        'GF'=>'French Guiana',
-        'GG'=>'Guernsey',
-        'GH'=>'Ghana',
-        'GI'=>'Gibraltar',
-        'GL'=>'Greenland',
-        'GM'=>'Gambia',
-        'GN'=>'Guinea',
-        'GP'=>'Guadeloupe',
-        'GQ'=>'Equatorial Guinea',
-        'GR'=>'Greece',
-        'GS'=>'South Georgia And The South Sandwich Islands',
-        'GT'=>'Guatemala',
-        'GU'=>'Guam',
-        'GW'=>'Guinea-Bissau',
-        'GY'=>'Guyana',
-        'HK'=>'Hong Kong',
-        'HM'=>'Heard And Mc Donald Islands',
-        'HN'=>'Honduras',
-        'HR'=>'Croatia (local name: Hrvatska)',
-        'HT'=>'Haiti',
-        'HU'=>'Hungary',
-        'ID'=>'Indonesia',
-        'IE'=>'Ireland',
-        'IL'=>'Israel',
-        'IM'=>'Isle of Man',
-        'IN'=>'India',
-        'IO'=>'British Indian Ocean Territory',
-        'IQ'=>'Iraq',
-        'IR'=>'Iran, Islamic Republic Of',
-        'IS'=>'Iceland',
-        'IT'=>'Italy',
-        'JE'=>'Jersey',
-        'JM'=>'Jamaica',
-        'JO'=>'Jordan',
-        'JP'=>'Japan',
-        'KE'=>'Kenya',
-        'KG'=>'Kyrgyzstan',
-        'KH'=>'Cambodia',
-        'KI'=>'Kiribati',
-        'KM'=>'Comoros',
-        'KN'=>'Saint Kitts And Nevis',
-        'KR'=>'Korea, Republic Of',
-        'KW'=>'Kuwait',
-        'KY'=>'Cayman Islands',
-        'KZ'=>'Kazakhstan',
-        'LA'=>'Lao People\'s Democratic Republic',
-        'LB'=>'Lebanon',
-        'LC'=>'Saint Lucia',
-        'LI'=>'Liechtenstein',
-        'LK'=>'Sri Lanka',
-        'LR'=>'Liberia',
-        'LS'=>'Lesotho',
-        'LT'=>'Lithuania',
-        'LU'=>'Luxembourg',
-        'LV'=>'Latvia',
-        'LY'=>'Libyan Arab Jamahiriya',
-        'MA'=>'Morocco',
-        'MC'=>'Monaco',
-        'MD'=>'Moldova, Republic Of',
-        'ME'=>'Montenegro',
-        'MG'=>'Madagascar',
-        'MH'=>'Marshall Islands',
-        'MK'=>'Macedonia, The Former Yugoslav Republic Of',
-        'ML'=>'Mali',
-        'MM'=>'Myanmar',
-        'MN'=>'Mongolia',
-        'MO'=>'Macau',
-        'MP'=>'Northern Mariana Islands',
-        'MQ'=>'Martinique',
-        'MR'=>'Mauritania',
-        'MS'=>'Montserrat',
-        'MT'=>'Malta',
-        'MU'=>'Mauritius',
-        'MV'=>'Maldives',
-        'MW'=>'Malawi',
-        'MX'=>'Mexico',
-        'MY'=>'Malaysia',
-        'MZ'=>'Mozambique',
-        'NA'=>'Namibia',
-        'NC'=>'New Caledonia',
-        'NE'=>'Niger',
-        'NF'=>'Norfolk Island',
-        'NG'=>'Nigeria',
-        'NI'=>'Nicaragua',
-        'NL'=>'Netherlands',
-        'NO'=>'Norway',
-        'NP'=>'Nepal',
-        'NR'=>'Nauru',
-        'NU'=>'Niue',
-        'NZ'=>'New Zealand',
-        'OM'=>'Oman',
-        'PA'=>'Panama',
-        'PE'=>'Peru',
-        'PF'=>'French Polynesia',
-        'PG'=>'Papua New Guinea',
-        'PH'=>'Philippines, Republic of the',
-        'PK'=>'Pakistan',
-        'PL'=>'Poland',
-        'PM'=>'St. Pierre And Miquelon',
-        'PN'=>'Pitcairn',
-        'PR'=>'Puerto Rico',
-        'PS'=>'Palestine',
-        'PT'=>'Portugal',
-        'PW'=>'Palau',
-        'PY'=>'Paraguay',
-        'QA'=>'Qatar',
-        'RE'=>'Reunion',
-        'RO'=>'Romania',
-        'RS'=>'Serbia',
-        'RU'=>'Russian Federation',
-        'RW'=>'Rwanda',
-        'SA'=>'Saudi Arabia',
-        'UK'=>'Scotland',
-        'SB'=>'Solomon Islands',
-        'SC'=>'Seychelles',
-        'SS'=>'South Sudan',
-        'SD'=>'Sudan',
-        'SE'=>'Sweden',
-        'SG'=>'Singapore',
-        'SH'=>'St. Helena',
-        'SI'=>'Slovenia',
-        'SJ'=>'Svalbard And Jan Mayen Islands',
-        'SK'=>'Slovakia (Slovak Republic)',
-        'SL'=>'Sierra Leone',
-        'SM'=>'San Marino',
-        'SN'=>'Senegal',
-        'SO'=>'Somalia',
-        'SR'=>'Suriname',
-        'ST'=>'Sao Tome And Principe',
-        'SU'=>'Soviet Union',
-        'SV'=>'El Salvador',
-        'SY'=>'Syrian Arab Republic',
-        'SZ'=>'Swaziland',
-        'TC'=>'Turks And Caicos Islands',
-        'TD'=>'Chad',
-        'TF'=>'French Southern Territories',
-        'TG'=>'Togo',
-        'TH'=>'Thailand',
-        'TJ'=>'Tajikistan',
-        'TK'=>'Tokelau',
-        'TI'=>'East Timor',
-        'TM'=>'Turkmenistan',
-        'TN'=>'Tunisia',
-        'TO'=>'Tonga',
-        'TP'=>'East Timor (old code)',
-        'TR'=>'Turkey',
-        'TT'=>'Trinidad And Tobago',
-        'TV'=>'Tuvalu',
-        'TW'=>'Taiwan',
-        'TZ'=>'Tanzania, United Republic Of',
-        'UA'=>'Ukraine',
-        'UG'=>'Uganda',
-        'UK'=>'United Kingdom',
-        'US'=>'United States',
-        'UM'=>'United States Minor Outlying Islands',
-        'UY'=>'Uruguay',
-        'UZ'=>'Uzbekistan',
-        'VA'=>'Vatican City State (Holy See)',
-        'VC'=>'Saint Vincent And The Grenadines',
-        'VE'=>'Venezuela',
-        'VG'=>'Virgin Islands (British)',
-        'VI'=>'Virgin Islands (U.S.)',
-        'VN'=>'Viet Nam',
-        'VU'=>'Vanuatu',
-        'WF'=>'Wallis And Futuna Islands',
-        'WS'=>'Samoa',
-        'YE'=>'Yemen',
-        'YT'=>'Mayotte',
-        'ZA'=>'South Africa',
-        'ZM'=>'Zambia',
-        'ZW'=>'Zimbabwe',
+        'AC'=>'Вознесение Остров',
+        'AD'=>'Андора',
+        'AE'=>'Обединети Арабски Емирати',
+        'AF'=>'Авганистан',
+        'AG'=>'Антига и Барбуда',
+        'AI'=>'Ангила',
+        'AL'=>'Албанија',
+        'AM'=>'Ерменија',
+        'AN'=>'Холандски Антили',
+        'AO'=>'Ангола',
+        'AQ'=>'Антрактика',
+        'AR'=>'Аргентина',
+        'AS'=>'Америчка Самоа',
+        'AT'=>'Аустрија',
+        'AU'=>'Аустралија',
+        'AW'=>'Аруба',
+        'AX'=>'Ã…земја',
+        'AZ'=>'Азербејџан',
+        'BA'=>'Босна и Херцеговина',
+        'BB'=>'Барбадос',
+        'BE'=>'Белгија',
+        'BD'=>'Бангладеш',
+        'BF'=>'Буркина Фасо',
+        'BG'=>'Бугарија',
+        'BH'=>'Бахреин',
+        'BI'=>'Бурунди',
+        'BJ'=>'Бенин',
+        'BM'=>'Бермуда',
+        'BN'=>'Брунеи Дарусалам',
+        'BO'=>'Боливија',
+        'BR'=>'Бразил',
+        'BS'=>'Бахами',
+        'BT'=>'Бутан',
+        'BV'=>'Буве Остров',
+        'BW'=>'Боцвана',
+        'BY'=>'Белорусија',
+        'BZ'=>'Белизе',
+        'CA'=>'Канада',
+        'CC'=>'Кокос (Килинг) Острови',
+        'CD'=>'Конго (Демократска Република)',
+        'CF'=>'Централно Афричка Република',
+        'CG'=>'Конго (Република)',
+        'CH'=>'Швајцарија',
+        'CI'=>'Брег на слонова коска',
+        'CK'=>'Кукови острови',
+        'CL'=>'Чиле',
+        'CM'=>'Камерун',
+        'CN'=>'Народна Република Кина',
+        'CO'=>'Колумбија',
+        'CR'=>'Коста Рика',
+        'CU'=>'Куба',
+        'CV'=>'Кејп Верде',
+        'CX'=>'Божиќен Остров',
+        'CY'=>'Кипар',
+        'CZ'=>'Чешка Република',
+        'DE'=>'Германија',
+        'DJ'=>'Џибути',
+        'DK'=>'Данска',
+        'DM'=>'Доминика',
+        'DO'=>'Доминиканска Република',
+        'DZ'=>'Алжир',
+        'EC'=>'Еквадор',
+        'EE'=>'Естонија',
+        'EG'=>'Египет',
+        'GB-ENG'=>'Англија',
+        'ER'=>'Еритреја',
+        'ES'=>'Шпанија',
+        'ET'=>'Етиопија',
+        'EU'=>'Европска Унија',
+        'FI'=>'Финска',
+        'FJ'=>'Фиџи',
+        'FK'=>'Фолкландски Острови (Малвини)',
+        'FM'=>'Микронезија, Федерална Држава',
+        'FO'=>'Фарски Острови',
+        'FR'=>'Франција',
+        'GA'=>'Габон',
+        'GD'=>'Гренада',
+        'GE'=>'Грузија',
+        'GF'=>'Француска Гвајана',
+        'GG'=>'Гернзи',
+        'GH'=>'Гана',
+        'GI'=>'Гибралтар',
+        'GL'=>'Гренланд',
+        'GM'=>'Гамбија',
+        'GN'=>'Гвинеја',
+        'GP'=>'Гвадалупе',
+        'GQ'=>'Екваторијална Гвинеја',
+        'GR'=>'Грција',
+        'GS'=>'Јужна Џорџија и Јужните Сендвич Острови',
+        'GT'=>'Гватемала',
+        'GU'=>'Гуам',
+        'GW'=>'Гвинеа Бисао',
+        'GY'=>'Гвајана',
+        'HK'=>'Хонг Конг',
+        'HM'=>'Херд и Мек Доналд Островите',
+        'HN'=>'Хондурас',
+        'HR'=>'Хрватска',
+        'HT'=>'Хаити',
+        'HU'=>'Унгарија',
+        'ID'=>'Индонезија',
+        'IE'=>'Ирска',
+        'IL'=>'Израел',
+        'IM'=>'Ман Островот',
+        'IN'=>'Индија',
+        'IO'=>'Британска Територија на Индискиот Океан',
+        'IQ'=>'Ирак',
+        'IR'=>'Иран, Исламска Република',
+        'IS'=>'Исланд',
+        'IT'=>'Италија',
+        'JE'=>'Џерси',
+        'JM'=>'Јамајка',
+        'JO'=>'Јордан',
+        'JP'=>'Јапонија',
+        'KE'=>'Кенија',
+        'KG'=>'Киргистан',
+        'KH'=>'Камбоџа',
+        'KI'=>'Кирибати',
+        'KM'=>'Коморите',
+        'KN'=>'Свети Китс и Невис',
+        'KR'=>'Кореја, Република',
+        'KW'=>'Кувајт',
+        'KY'=>'Кајмански Острови',
+        'KZ'=>'Казахстан',
+        'LA'=>'Лао, Народна Демократска Република',
+        'LB'=>'Либан',
+        'LC'=>'Света Луција',
+        'LI'=>'Лихтенштајн',
+        'LK'=>'Шри Ланка',
+        'LR'=>'Либерија',
+        'LS'=>'Лесото',
+        'LT'=>'Литванија',
+        'LU'=>'Луксенбург',
+        'LV'=>'Латвија',
+        'LY'=>'Либиска Арабска Џамахирија',
+        'MA'=>'Мароко',
+        'MC'=>'Монако',
+        'MD'=>'Молдавија, Република',
+        'ME'=>'Црна Гора',
+        'MG'=>'Мадагаскар',
+        'MH'=>'Маршалски Острови',
+        'MK'=>'Македонија',
+        'ML'=>'Мали',
+        'MM'=>'Мјанмар',
+        'MN'=>'Монголија',
+        'MO'=>'Макао',
+        'MP'=>'Северни Мариански Острови',
+        'MQ'=>'Мартиник',
+        'MR'=>'Мавританија',
+        'MS'=>'Монсерат',
+        'MT'=>'Малта',
+        'MU'=>'Маурициус',
+        'MV'=>'Малдиви',
+        'MW'=>'Малави',
+        'MX'=>'Мексико',
+        'MY'=>'Малезија',
+        'MZ'=>'Мозамбик',
+        'NA'=>'Намибија',
+        'NC'=>'Нова Каледонија',
+        'NE'=>'Нигер',
+        'NF'=>'Норфолк Остров',
+        'NG'=>'Нигерија',
+        'NI'=>'Никарагва',
+        'NL'=>'Холандија',
+        'GB-NIR' => 'Северна Ирска',
+        'NO'=>'Норвешка',
+        'NP'=>'Непал',
+        'NR'=>'Науру',
+        'NU'=>'Ниуе',
+        'NZ'=>'Нов Зеланд',
+        'OM'=>'Оман',
+        'PA'=>'Панама',
+        'PE'=>'Перу',
+        'PF'=>'Француска Полинезија',
+        'PG'=>'Папуа Нова Гвинеја',
+        'PH'=>'Филипини, Република на',
+        'PK'=>'Пакистан',
+        'PL'=>'Полска',
+        'PM'=>'Сент Пјер и Микелон',
+        'PN'=>'Питкерн',
+        'PR'=>'Порто Рико',
+        'PS'=>'Палестина',
+        'PT'=>'Португалија',
+        'PW'=>'Палау',
+        'PY'=>'Парагвај',
+        'QA'=>'Катар',
+        'RE'=>'Реунион',
+        'RO'=>'Романија',
+        'RS'=>'Србија',
+        'RU'=>'Руска Федерација',
+        'RW'=>'Руанда',
+        'SA'=>'Саудиска Арабија',
+        'GB-SCT'=>'Шкотска',
+        'SB'=>'Соломонски Острови',
+        'SC'=>'Сејшели',
+        'SS'=>'Јужен Судан',
+        'SD'=>'Судан',
+        'SE'=>'Шведска',
+        'SG'=>'Сингапур',
+        'SH'=>'Св. Елена',
+        'SI'=>'Словенија',
+        'SJ'=>'Свалбард и Јан Мајен Островите',
+        'SK'=>'Словачка (Словачка Република)',
+        'SL'=>'Сиера Леоне',
+        'SM'=>'Сан Марино',
+        'SN'=>'Сенегал',
+        'SO'=>'Сомалија',
+        'SR'=>'Суринам',
+        'ST'=>'Сао Томе и Принципе',
+        'SU'=>'Советски Сојуз',
+        'SV'=>'Ел Салвадор',
+        'SY'=>'Сириска Арапска Република',
+        'SZ'=>'Свазиленд',
+        'TC'=>'Туркс и Каикос Острови',
+        'TD'=>'Чад',
+        'TF'=>'Француски Јужни Територии',
+        'TG'=>'Того',
+        'TH'=>'Тајланд',
+        'TJ'=>'Таџикистан',
+        'TK'=>'Токелау',
+        'TI'=>'Источен Тимор',
+        'TM'=>'Туркменистан',
+        'TN'=>'Тунис',
+        'TO'=>'Тонга',
+        'TP'=>'Источен Тимор (стар код)',
+        'TR'=>'Турција',
+        'TT'=>'Тринидад и Тобаго',
+        'TV'=>'Тувалу',
+        'TW'=>'Тајван',
+        'TZ'=>'Танзанија, Обединета Република',
+        'UA'=>'Украина',
+        'UG'=>'Уганда',
+        'UK'=>'Обединето Кралство',
+        'US'=>'Соединети Американски Држави',
+        'UM'=>'Соединетите Американски Држави Мали оддалечени острови',
+        'UY'=>'Уругвај',
+        'UZ'=>'Узбекистан',
+        'VA'=>'Ватикан, Град Држава (Света Столица)',
+        'VC'=>'Свети Винсент и Гренадини',
+        'VE'=>'Венецуела',
+        'VG'=>'Девствени Острови (Британски)',
+        'VI'=>'Девствени Острови (С.А.Д.)',
+        'VN'=>'Виетнам',
+        'VU'=>'Ванату',
+        'GB-WLS' =>'Велс',
+        'WF'=>'Волис и Футуна Островите',
+        'WS'=>'Самоа',
+        'YE'=>'Јемен',
+        'YT'=>'Мајоте',
+        'ZA'=>'Јужна Адрика',
+        'ZM'=>'Замбија',
+        'ZW'=>'Зимбабве',
     ],
 ];
\ No newline at end of file
diff --git a/resources/lang/mk-MK/mail.php b/resources/lang/mk-MK/mail.php
index 80d5046de7..16fddc2455 100644
--- a/resources/lang/mk-MK/mail.php
+++ b/resources/lang/mk-MK/mail.php
@@ -2,80 +2,84 @@
 
 return [
 
-    'Accessory_Checkin_Notification' => 'Accessory checked in',
-    'Accessory_Checkout_Notification' => 'Accessory checked out',
-    'Asset_Checkin_Notification' => 'Asset checked in',
-    'Asset_Checkout_Notification' => 'Asset checked out',
-    'Confirm_Accessory_Checkin' => 'Accessory checkin confirmation',
-    'Confirm_Asset_Checkin' => 'Asset checkin confirmation',
-    'Confirm_accessory_delivery' => 'Accessory delivery confirmation',
-    'Confirm_asset_delivery' => 'Asset delivery confirmation',
-    'Confirm_consumable_delivery' => 'Consumable delivery confirmation',
-    'Confirm_license_delivery' => 'License delivery confirmation',
-    'Consumable_checkout_notification' => 'Consumable checked out',
+    'Accessory_Checkin_Notification' => 'Додаток раздолжен',
+    'Accessory_Checkout_Notification' => 'Додаток задолжен',
+    'Asset_Checkin_Notification' => 'Средство раздолжено',
+    'Asset_Checkout_Notification' => 'Средство задолжено',
+    'Confirm_Accessory_Checkin' => 'Потврда за раздолжување додаток',
+    'Confirm_Asset_Checkin' => 'Потвдра за задолжување средство',
+    'Confirm_accessory_delivery' => 'Потврда за достава на додаток',
+    'Confirm_asset_delivery' => 'Потврда за испорака на средств',
+    'Confirm_consumable_delivery' => 'Потврда за испорака на потрошни материјали',
+    'Confirm_license_delivery' => 'Потврда за испорака на лиценца',
+    'Consumable_checkout_notification' => 'Задолжен потрошен материјал',
     'Days' => 'Денови',
-    'Expected_Checkin_Date' => 'An asset checked out to you is due to be checked back in on :date',
-    'Expected_Checkin_Notification' => 'Reminder: :name checkin deadline approaching',
-    'Expected_Checkin_Report' => 'Expected asset checkin report',
+    'Expected_Checkin_Date' => 'Средството со кое сте задолжени треба да се врати на :date',
+    'Expected_Checkin_Notification' => 'Потсетување: :name датумот за враќање наближува',
+    'Expected_Checkin_Report' => 'Извештај за средства кои треба да се вратат',
     'Expiring_Assets_Report' => 'Извештај за истекување на средства.',
     'Expiring_Licenses_Report' => 'Извештај за истекување на лиценци.',
     'Item_Request_Canceled' => 'Барањето е откажано',
     'Item_Requested' => 'Побарана ставка',
-    'License_Checkin_Notification' => 'License checked in',
-    'License_Checkout_Notification' => 'License checked out',
+    'License_Checkin_Notification' => 'Лиценца задолжена',
+    'License_Checkout_Notification' => 'Лиценца раздолжена',
+    'license_for'   => 'License for',
     'Low_Inventory_Report' => 'Извештај за низок инвентар',
     'a_user_canceled' => 'Корисникот го откажал барањето за средство на веб-страницата',
     'a_user_requested' => 'Корисникот побарал средство на веб-страницата',
-    'acceptance_asset_accepted' => 'A user has accepted an item',
-    'acceptance_asset_declined' => 'A user has declined an item',
-    'accessory_name' => 'Име на додаток:',
-    'additional_notes' => 'Дополнителни забелешки:',
+    'acceptance_asset_accepted' => 'Корисникот го прифати средството',
+    'acceptance_asset_declined' => 'Корисникот го одби средството',
+    'accessory_name' => 'Име на додаток',
+    'additional_notes' => 'Дополнителни забелешки',
     'admin_has_created' => 'Администраторот создаде сметка за вас на :web веб-страница.',
-    'asset' => 'Основно средство:',
-    'asset_name' => 'Име на основното средство:',
+    'asset' => 'Основно средство',
+    'asset_name' => 'Име на основното средство',
     'asset_requested' => 'Бараното основно средство',
     'asset_tag' => 'Код на основното средство',
-    'assets_warrantee_alert' => 'There is :count asset with a warranty expiring in the next :threshold days.|There are :count assets with warranties expiring in the next :threshold days.',
+    'assets_warrantee_alert' => 'Има :count средства чија гаранција истекува за :threshold дена.|Има :count средства чија гаранција истекува за :threshold дена.',
     'assigned_to' => 'Задолжен на',
     'best_regards' => 'Со почит,',
-    'canceled' => 'Откажано:',
-    'checkin_date' => 'Датум на раздолжување:',
-    'checkout_date' => 'Датум на задолжување:',
-    'checkedout_from' => 'Checked out from',
-    'checkedin_from'  => 'Checked in from',
-    'checked_into' => 'Checked into',
+    'canceled' => 'Откажано',
+    'checkin_date' => 'Датум на раздолжување',
+    'checkout_date' => 'Датум на задолжување',
+    'checkedout_from' => 'Задолжено од',
+    'checkedin_from'  => 'Раздолжено од',
+    'checked_into' => 'Пријавено во',
     'click_on_the_link_accessory' => 'Ве молиме кликнете на врската на дното за да потврдите дека сте го примиле додатокот.',
     'click_on_the_link_asset' => 'Ве молиме кликнете на врската на дното за да потврдите дека сте го примиле основното средство.',
     'click_to_confirm' => 'Ве молиме кликнете на следната врска за да ја потврдите вашата :web сметка:',
     'current_QTY' => 'Тековна количина',
     'days' => 'Денови',
-    'expecting_checkin_date' => 'Очекуван датум на раздолжување:',
+    'expecting_checkin_date' => 'Очекуван датум на раздолжување',
     'expires' => 'Истекува',
     'hello' => 'Здраво',
     'hi' => 'Здраво',
     'i_have_read' => 'Ги прочитав и се согласив со условите за користење и го примив ова средство.',
-    'inventory_report' => 'Inventory Report',
-    'item' => 'Средство:',
-    'license_expiring_alert' => 'There is :count license expiring in the next :threshold days.|There are :count licenses expiring in the next :threshold days.',
+    'inventory_report' => 'Извештај за инвентар',
+    'item' => 'Ставка',
+    'item_checked_reminder' => 'Ова е потсетник дека во моментов го имате :count предмети кои не сте прифатиле или одбиле. Кликнете на врската подолу за да ја потврдите вашата одлука.',
+    'license_expiring_alert' => 'Има :count лиценца која истекува следните :threshold дена.|Има :count лиценци кои истекуваат следните :threshold дена.',
     'link_to_update_password' => 'Ве молиме кликнете на следната врска за да ја обновите вашата :web лозинка:',
-    'login' => 'Најава:',
+    'login' => 'Најава',
     'login_first_admin' => 'Влезете во новата инсталација на Snipe-IT користејќи ги ингеренциите подолу:',
-    'low_inventory_alert' => 'There is :count item that is below minimum inventory or will soon be low.|There are :count items that are below minimum inventory or will soon be low.',
+    'low_inventory_alert' => 'Има :count предмети кои се под инвентарн минимум или ќе бидат наскоро.|Има :count предмети кои се под инвентарн минимум или ќе бидат наскоро.',
     'min_QTY' => 'Минимална количина',
     'name' => 'Име',
     'new_item_checked' => 'Ново основно средство е задолжено на Ваше име, деталите се подолу.',
+    'new_item_checked_with_acceptance' => 'A new item has been checked out under your name that requires acceptance, details are below.',
+    'recent_item_checked' => 'An item was recently checked out under your name that requires acceptance, details are below.',
     'notes' => 'Забелешки',
-    'password' => 'Лозинка:',
+    'password' => 'Лозинка',
     'password_reset' => 'Ресетирање на лозинка',
     'read_the_terms' => 'Ве молиме прочитајте ги условите за употреба подолу.',
-    'read_the_terms_and_click' => 'Please read the terms of use below, and click on the link at the bottom to confirm that you read and agree to the terms of use, and have received the asset.',
-    'requested' => 'Побарано:',
+    'read_the_terms_and_click' => 'Прочитајте ги Условите за употреба подолу, кликнете на линкот подолу за да потврдите дека сте прочитале и се сложувате со условите за користење, и сте примиле средства.',
+    'requested' => 'Побарано',
     'reset_link' => 'Вашата врска за ресетирање на лозинка',
     'reset_password' => 'За да ја ресетирате Вашата лозинка, притиснете на врската:',
-    'rights_reserved' => 'All rights reserved.',
+    'rights_reserved' => 'Сите права задржани.',
     'serial' => 'Сериски',
-    'snipe_webhook_test' => 'Snipe-IT Integration Test',
-    'snipe_webhook_summary' => 'Snipe-IT Integration Test Summary',
+    'snipe_webhook_test' => 'Snipe-IT Тест за интеграција',
+    'snipe_webhook_summary' => 'Snipe-IT Резиме на тест за интеграција',
     'supplier' => 'Добавувач',
     'tag' => 'Таг',
     'test_email' => 'Тест е-пошта од Snipe-IT',
@@ -83,11 +87,13 @@ return [
     'the_following_item' => 'Следната ставка е раздолжена: ',
     'to_reset' => 'За да ја ресетирате вашата :web лозинка, пополнете го овој формулар:',
     'type' => 'Тип',
-    'upcoming-audits' => 'There is :count asset that is coming up for audit within :threshold days.|There are :count assets that are coming up for audit within :threshold days.',
+    'upcoming-audits' => 'Има :count средство што е за ревизија за :threshold дена.|Има :count Средства што се за ревизија за :threshold дена.',
     'user' => 'Корисник',
     'username' => 'Корисничко име',
+    'unaccepted_asset_reminder' => 'Reminder: You have Unaccepted Assets.',
     'welcome' => 'Добредојдовте :name',
     'welcome_to' => 'Добредојдовте на :web!',
-    'your_assets' => 'View Your Assets',
+    'your_assets' => 'Видете ги вашите средства',
     'your_credentials' => 'Вашите корисничко име и лозинка',
+    'mail_sent' => 'Успешно испратена Е-пошта!',
 ];
diff --git a/resources/lang/mk-MK/passwords.php b/resources/lang/mk-MK/passwords.php
index 41a87f98ed..627bf6321e 100644
--- a/resources/lang/mk-MK/passwords.php
+++ b/resources/lang/mk-MK/passwords.php
@@ -1,9 +1,9 @@
 <?php
 
 return [
-    'sent'	        => 'If a matching user with a valid email address exists in our system, a password recovery email has been sent.',
-    'user'			=> 'If a matching user with a valid email address exists in our system, a password recovery email has been sent.',
-    'token'         => 'This password reset token is invalid or expired, or does not match the username provided.',
-    'reset'         => 'Your password has been reset!',
-    'password_change'  => 'Your password has been updated!',
+    'sent'	        => 'Ако постои соодветен корисник со валидна Е-пошта во нашиот систем, испратена е Е-пошта за обновување на лозинка.',
+    'user'			=> 'Ако постои соодветен корисник со валидна Е-пошта во нашиот систем, испратена е Е-пошта за обновување на лозинка.',
+    'token'         => 'Токенот за обнова на лозинката е невалиден или истечен, или не одговара со корисничкото име.',
+    'reset'         => 'Вашата лозинка е обновена!',
+    'password_change'  => 'Вашата лозинка е ажурирана!',
 ];
diff --git a/resources/lang/mk-MK/reminders.php b/resources/lang/mk-MK/reminders.php
index f71a37e041..e6b8758171 100644
--- a/resources/lang/mk-MK/reminders.php
+++ b/resources/lang/mk-MK/reminders.php
@@ -15,7 +15,7 @@ return array(
 
     "password" => "Лозинките мора да содржат најмалку шест знаци и да одговараат на потврдата.",
     "user"     => "Корисничкото име или адресата за е-пошта е неточна",
-    "token"    => 'This password reset token is invalid or expired, or does not match the username provided.',
-    'sent'	   => 'If a matching user with a valid email address exists in our system, a password recovery email has been sent.',
+    "token"    => 'Токенот за обнова на лозинката е невалиден или истечен, или не одговара со корисничкото име.',
+    'sent'	   => 'Ако постои соодветен корисник со валидна Е-пошта во нашиот систем, испратена е Е-пошта за обновување на лозинка.',
 
 );
diff --git a/resources/lang/mk-MK/table.php b/resources/lang/mk-MK/table.php
index 1099a075a4..98dca76c4a 100644
--- a/resources/lang/mk-MK/table.php
+++ b/resources/lang/mk-MK/table.php
@@ -6,6 +6,6 @@ return array(
     'action' 		        => 'Акција',
     'by'      		        => 'Од',
     'item' 			        => 'Ставка',
-    'no_matching_records'   => 'No matching records found',
+    'no_matching_records'   => 'Не се пронајдени записи што одговараат',
 
 );
diff --git a/resources/lang/mk-MK/validation.php b/resources/lang/mk-MK/validation.php
index 457dc73d11..fcb53bae4e 100644
--- a/resources/lang/mk-MK/validation.php
+++ b/resources/lang/mk-MK/validation.php
@@ -13,100 +13,166 @@ return [
     |
     */
 
-    'accepted'             => ':attribute мора да биде прифатен.',
-    'active_url'           => ':attribute не е валидна врска (URL).',
-    'after'                => ':attribute мора да биде датум после :date.',
-    'after_or_equal'       => ':attribute мора да биде датум после или на :date.',
-    'alpha'                => ':attribute може да содржи само букви.',
-    'alpha_dash'           => ':attribute може да содржи само букви, бројки и цртички.',
-    'alpha_num'            => ':attribute може да содржи само букви и броеви.',
-    'array'                => ':attribute мора да биде низа.',
-    'before'               => ':attribute мора да биде датум пред :date.',
-    'before_or_equal'      => ':attribute мора да биде датум пред или на :date.',
-    'between'              => [
-        'numeric' => ':attribute мора да биде помеѓу :min - :max.',
-        'file'    => ':attribute мора да биде помеѓу :min - :max килобајти.',
-        'string'  => ':attribute мора да биде помеѓу :min - :max знаци.',
-        'array'   => ':attribute мора да содржи помеѓу :min - :max ставки.',
+    'accepted' => 'Полето :attribute мора да биде прифатено.',
+    'accepted_if' => 'Полето :attribute мора да биде прифатено кога полето :other е :value.',
+    'active_url' => 'Полето :attribute мора да биде валидна URL.',
+    'after' => 'Полето :attribute мора да биде датум после :date.',
+    'after_or_equal' => 'Полето :attribute мора да биде датум после или еднаков на :date.',
+    'alpha' => 'Полето :attribute мора да содржи само букви.',
+    'alpha_dash' => 'Полето :attribute мора да содржи само букви, бројки, средни црти и долни црти.',
+    'alpha_num' => 'Полето :attribute мора да содржи само букви и бројки.',
+    'array' => 'Полето :attribute мора да биде низа.',
+    'ascii' => 'Полето :attribute мора да содржи само алфанумерички карактери и симболи од еден бајт.',
+    'before' => 'Полето :attribute мора да биде датум пред :date.',
+    'before_or_equal' => 'Полето :attribute мора да биде пред или еднакво на :date.',
+    'between' => [
+        'array' => 'Полето :attribute мора да биде помеѓу :min и :max средства.',
+        'file' => 'Полето :attribute мора да биде помеѓу :min и :max килобајти.',
+        'numeric' => 'Полето :attribute мора да биде помеѓу :min и :max.',
+        'string' => 'Полето :attribute мора да биде помеѓу :min и :max карактери.',
     ],
-    'boolean'              => ':attribute мора да биде точно/неточно.',
-    'confirmed'            => 'Потврдата за :attribute не се совпаѓа.',
-    'date'                 => ':attribute не е валиден датум.',
-    'date_format'          => ':attribute не се совпаѓа со форматот :format.',
-    'different'            => ':attribute и :other мора да се различни.',
-    'digits'               => ':attribute мора да биде :digits цифри.',
-    'digits_between'       => ':attribute мора да содржи помеѓу :min и :max цифри.',
-    'dimensions'           => ':attribute има неважечки димензии на сликата.',
-    'distinct'             => 'Полето :attribute има дупликат вредност.',
-    'email'                => 'Форматот на :attribute не е валиден.',
-    'exists'               => 'Избраниот :attribute не е валиден.',
-    'file'                 => ':attribute мора да биде датотека.',
-    'filled'               => 'Полето :attribute мора да има дупликат.',
-    'image'                => ':attribute мора да биде слика.',
-    'import_field_empty'    => 'The value for :fieldname cannot be null.',
-    'in'                   => 'Избраниот :attribute не е валиден.',
-    'in_array'             => 'Полето :attribute не постои во :other.',
-    'integer'              => ':attribute мора да биде цел број.',
-    'ip'                   => ':attribute мора да биде валидна IP адреса.',
-    'ipv4'                 => ':attribute мора да биде валидна IPv4 адреса.',
-    'ipv6'                 => ':attribute мора да биде валидна IPv6 адреса.',
-    'is_unique_department' => 'The :attribute must be unique to this Company Location',
-    'json'                 => ':attribute мора да биде валиден JSON стринг.',
-    'max'                  => [
-        'numeric' => ':attribute не може да биде поголем од :max.',
-        'file'    => ':attribute не може да биде поголем од :max килобајти.',
-        'string'  => ':attribute не може да биде поголем од :max значи.',
-        'array'   => ':attribute не може да содржи повеќе од :max ставки.',
+    'boolean' => 'Полето :attribute мора да биде точно или грешно.',
+    'can' => 'Полето :attribute содржи неавторизирана вредност.',
+    'confirmed' => 'Полето :attribute потврдата не соодветствува.',
+    'contains' => 'Полето :attribute недостасува задолќителна вредност.',
+    'current_password' => 'Лозинката не е точна.',
+    'date' => 'Полето :attribute мора да биде валиден датум.',
+    'date_equals' => 'Полето :attribute мора да биде датум еднаков на :date.',
+    'date_format' => 'Полето :attribute мора да биде во формат :format.',
+    'decimal' => 'Полето :attribute мора да има :decimal децимални места.',
+    'declined' => 'Полето :attribute мора да биде одбиено.',
+    'declined_if' => 'Полето :attribute мора да биде одбиено кога :other е :value.',
+    'different' => 'Полето :attribute и полето :other мора да бидат различни.',
+    'digits' => 'Полето :attribute мора да биде :digits цифри.',
+    'digits_between' => 'Полето :attribute мора да биде помеѓѕ :min и :max цифри.',
+    'dimensions' => 'Полето :attribute има невалидни димензии на сликата.',
+    'distinct' => 'Полето :attribute има дупликат вредност.',
+    'doesnt_end_with' => 'Полето :attribute не смее да завршува со една од следните: :values.',
+    'doesnt_start_with' => 'Полето :attribute не смее да почнува со една од следните: :values.',
+    'email' => 'Полето :attribute мора да биде валидна адреса на Е-пошта.',
+    'ends_with' => 'Полето :attribute мора да завршува со една од следните: :values.',
+    'enum' => 'Избраниот :attribute не е валиден.',
+    'exists' => 'Избраниот :attribute не е валиден.',
+    'extensions' => 'Полето :attribute мора да содржи една од следните екстензии: :values.',
+    'file' => 'Полето :attribute мора да биде датотека.',
+    'filled' => 'Полето :attribute мора да има дупликат.',
+    'gt' => [
+        'array' => 'Полето :attribute мора да има повеќе од :value предмети.',
+        'file' => 'Полето :attribute мора да биде поголемо од :value kilobytes.',
+        'numeric' => 'Полето :attribute мора да биде поголемо од :value.',
+        'string' => 'Полето :attribute мора да биде поголемо од :value карактери.',
     ],
-    'mimes'                => ':attribute мора да биде датотека од тип: :values.',
-    'mimetypes'            => ':attribute мора да биде датотека од тип: :values.',
-    'min'                  => [
-        'numeric' => ':attribute мора да биде поголем од :min.',
-        'file'    => ':attribute мора да биде поголем од :min килобајти.',
-        'string'  => ':attribute мора да биде поголем од :min знаци.',
-        'array'   => ':attribute мора да содржи најмалку :min ставки.',
+    'gte' => [
+        'array' => 'Полето :attribute мора да има :value предмети или повеќе.',
+        'file' => 'Полето :attribute мора да биде поголемо или еднакво на :value kilobytes.',
+        'numeric' => 'Полето :attribute мора да биде поголемо или еднакво на :value.',
+        'string' => 'Полето :attribute мора да биде поголемо или еднакво на :value карактери.',
     ],
-    'starts_with'          => 'The :attribute must start with one of the following: :values.',
-    'ends_with'            => 'The :attribute must end with one of the following: :values.',
+    'hex_color' => 'Полето :attribute мора да биде валидна хексадецимална боја.',
+    'image' => 'Полето :attribute мора да биде слика.',
+    'import_field_empty'    => 'Вредноста :fieldname неможе да биде нула.',
+    'in' => 'Избраниот :attribute не е валиден.',
+    'in_array' => 'Полето :attribute мора да се содржи во :other.',
+    'integer' => 'Полето :attribute мора да биде цел број.',
+    'ip' => 'Полето :attribute мора да биде валидна IP адреса.',
+    'ipv4' => 'Полето :attribute мора да биде валидна IPv4 адреса.',
+    'ipv6' => 'Полето :attribute мора да биде валидна IPv6 адреса.',
+    'json' => 'Полето :attribute мора да биде валиден JSON стринг.',
+    'list' => 'Полето :attribute мора да биде листа.',
+    'lowercase' => 'Полето :attribute мора да биди мали букви.',
+    'lt' => [
+        'array' => 'Полето :attribute мора да има помалку од :value предмети.',
+        'file' => 'Полето :attribute мора да биде помалку од :value килобајти.',
+        'numeric' => 'Полето :attribute мора да биде помалку од :value.',
+        'string' => 'Полето :attribute мора да биде помалку од :value карактери.',
+    ],
+    'lte' => [
+        'array' => 'Полето :attribute не смее да има повеќе од :value предмети.',
+        'file' => 'Полето :attribute мора да биде помалку или еднакво на :value килобајти.',
+        'numeric' => 'Полето :attribute мора да биде помало или еднакво на :value.',
+        'string' => 'Полето :attribute мора да биде помалку или еднакво на :value characters.',
+    ],
+    'mac_address' => 'Полето :attribute мора да биде валидна MAC адреса.',
+    'max' => [
+        'array' => 'Полето :attribute не смее да има повеќе од :max предмети.',
+        'file' => 'Полето :attribute не смее да биде поголемо од :max килобајти.',
+        'numeric' => 'Полето :attribute не смее да биде поголемо од :max.',
+        'string' => 'Полето :attribute не смее да биде поголемо од :max карактери.',
+    ],
+    'max_digits' => 'Полето :attribute не смее да има повеќе од :max цифри.',
+    'mimes' => 'Полето :attribute мора да биде датотека од тип: :values.',
+    'mimetypes' => 'Полето :attribute мора да биде датотека од тип: :values.',
+    'min' => [
+        'array' => 'Полето :attribute мора да има најмалку :min предмети.',
+        'file' => 'Полето :attribute field мора да биде најмалку :min килобајти.',
+        'numeric' => 'Полето :attribute мора да биде најмалку :min.',
+        'string' => 'Полето :attribute мора да биде најмалку :min карактери.',
+    ],
+    'min_digits' => 'Полето :attribute мора да има најмалку :min цифри.',
+    'missing' => 'Полето :attribute мора да недостасува.',
+    'missing_if' => 'Полето :attribute мора да недостасува кога :other е :value.',
+    'missing_unless' => 'Полето :attribute мора да недостасува освен :other е :value.',
+    'missing_with' => 'Полето :attribute мора да недостасува кога :values е присутна.',
+    'missing_with_all' => 'Полето :attribute мора да недостасува кога :values е присутна.',
+    'multiple_of' => 'Полето :attribute мора да биди множество од :value.',
+    'not_in' => 'Избраниот :attribute не е валиден.',
+    'not_regex' => 'Форматот на полето :attribute не е валиден.',
+    'numeric' => 'Полето :attribute мора да биде број.',
+    'password' => [
+        'letters' => 'Полето :attribute мора да содржи најмалку една буква.',
+        'mixed' => 'Полето :attribute мора да содржи најмалку една голема и една мала буква.',
+        'numbers' => 'Полето :attribute мора да содржи најмалку еден број.',
+        'symbols' => 'Полето :attribute мора да содржи најмалку еден симбол.',
+        'uncompromised' => 'Полето во дадениот :attribute се појавува во протекување на податоци. Ве молиме изберете различен :attribute.',
+    ],
+    'percent'       => 'Полето амортизација минимум мора да биде помеѓу 0 и 100 кога амортизацијата е во проценти.',
 
-    'not_in'               => 'Избраниот :attribute не е валиден.',
-    'numeric'              => ':attribute мора да биде број.',
-    'present'              => 'Полето :attribute е задолжително.',
-    'valid_regex'          => 'Тоа не е валиден regex. ',
-    'regex'                => 'Форматот на :attribute не е валиден.',
-    'required'             => 'Полето за :attribute е задолжително.',
-    'required_if'          => 'Полето :attribute е задолжително, кога :other е :values.',
-    'required_unless'      => 'Полето :attribute е задолжително, освен ако :other е :values.',
-    'required_with'        => 'Полето :attribute е задолжително кога постојат :values.',
-    'required_with_all'    => 'Полето :attribute е задолжително кога постојат :values.',
-    'required_without'     => 'Полето :attribute е задолжително кога не постојат :values.',
+    'present' => 'Полето :attribute е задолжително.',
+    'present_if' => 'Полето :attribute мора да биде присутно кога :other е :value.',
+    'present_unless' => 'Полето :attribute мора да биде присутно освен ако :other е :value.',
+    'present_with' => 'Полето :attribute мора да биде присутно кога :values е присутна.',
+    'present_with_all' => 'Полето :attribute мора да биде присутно кога :values е присутна.',
+    'prohibited' => 'Полето :attribute е забрането.',
+    'prohibited_if' => 'Полето :attribute е забрането кога :other е :value.',
+    'prohibited_unless' => 'Полето :attribute забрането освен ако :other е во :values.',
+    'prohibits' => 'Полето :attribute забранува :other да бидат присутни.',
+    'regex' => 'Форматот на полето :attribute не е валиден.',
+    'required' => 'Полето за :attribute е задолжително.',
+    'required_array_keys' => 'Полето :attribute мора да содржи податоци за: :values.',
+    'required_if' => 'Полето :attribute е задолжително, кога :other е :values.',
+    'required_if_accepted' => 'Полето :attribute е задолжително кога :other е прифатено.',
+    'required_if_declined' => 'Полето :attribute е задолжително кога :other е одбиено.',
+    'required_unless' => 'Полето :attribute е задолжително, освен ако :other е :values.',
+    'required_with' => 'Полето :attribute е задолжително кога постојат :values.',
+    'required_with_all' => 'Полето :attribute задолжително кога :values се присутни.',
+    'required_without' => 'Полето :attribute е задолжително кога не постојат :values.',
     'required_without_all' => 'Полето :attribute е задолжително кога не постои ниту една :values.',
-    'same'                 => ':attribute и :other мора да одговараат.',
-    'size'                 => [
-        'numeric' => ':attribute мора да биде :size.',
-        'file'    => ':attribute мора да биде :size килобајти.',
-        'string'  => ':attribute мора да биде :size знаци.',
-        'array'   => ':attribute мора да содржи :size ставки.',
+    'same' => 'Полето :attribute мора да е одговара на :other.',
+    'size' => [
+        'array' => 'Полето :attribute мора да содржи :size предмети.',
+        'file' => 'Полето :attribute мора да биде :size килобајти.',
+        'numeric' => 'Полето :attribute мора да биде :size.',
+        'string' => 'Полето :attribute мора да биде :size карактери.',
     ],
+    'starts_with' => 'Полето :attribute мора да почнува со една од следните: :values.',
     'string'               => ':attribute мора да биде стринг.',
-    'timezone'             => ':attribute мора да биде валидна зона.',
-    'two_column_unique_undeleted' => 'The :attribute must be unique across :table1 and :table2. ',
-    'unique'               => ':attribute е веќе зафатен.',
-    'uploaded'             => ':attribute не е прикачен.',
-    'url'                  => 'Форматот на :attribute не е валиден.',
+    'two_column_unique_undeleted' => 'Полето :attribute мора да биде уникатно низ :table1 и :table2. ',
     'unique_undeleted'     => ':attribute мора да биде уникатен.',
-    'non_circular'         => 'The :attribute must not create a circular reference.',
-    'not_array'            => ':attribute cannot be an array.',
-    'disallow_same_pwd_as_user_fields' => 'Password cannot be the same as the username.',
-    'letters'              => 'Password must contain at least one letter.',
-    'numbers'              => 'Password must contain at least one number.',
-    'case_diff'            => 'Password must use mixed case.',
-    'symbols'              => 'Password must contain symbols.',
-    'gte'                  => [
-        'numeric'          => 'Value cannot be negative'
-    ],
-    'checkboxes'           => ':attribute contains invalid options.',
-    'radio_buttons'        => ':attribute is invalid.',
+    'non_circular'         => 'Полето :attribute не смее да создава циркуларна референца.',
+    'not_array'            => ':attribute не смее да биде низа.',
+    'disallow_same_pwd_as_user_fields' => 'Лозинката не смее да биде иста со корисничкото име.',
+    'letters'              => 'Лозинката мора да содржи најмалку една буква.',
+    'numbers'              => 'Лозинката мора да содржи најмалку еден број.',
+    'case_diff'            => 'Лозинката мора да содржи мали и големи букви.',
+    'symbols'              => 'Лозинката мора да содржи симболи.',
+    'timezone' => 'Полето :attribute мора да биде валидна временска зона.',
+    'unique' => ':attribute е веќе зафатен.',
+    'uploaded' => ':attribute не е прикачен.',
+    'uppercase' => 'Полето :attribute мора да биде големи букви.',
+    'url' => 'Полето :attribute мора да биде валидна URL.',
+    'ulid' => 'Полето :attribute мора да биде валидна ULID.',
+    'uuid' => 'Полето :attribute мора да биде валидна UUID.',
+    'fmcs_location' => 'Full multiple company support and location scoping is enabled in the Admin Settings, and the selected location and selected company are not compatible.',
 
 
     /*
@@ -120,26 +186,38 @@ return [
     |
     */
 
+    'email_array'      => 'Една или повеќе е-пошти не се валидни.',
+    'checkboxes'           => ':attribute содржи невалидни опции.',
+    'radio_buttons'        => ':attribute не е валиден.',
+    
     'custom' => [
         'alpha_space' => 'Полето :attribute содржи знак што не е дозволен.',
-        'email_array'      => 'Една или повеќе е-пошти не се валидни.',
+
         'hashed_pass'      => 'Вашата тековна лозинка е неточна',
         'dumbpwd'          => 'Таа лозинка е премногу честа.',
         'statuslabel_type' => 'Мора да изберете валидна етикета за статус',
+        'custom_field_not_found'          => 'Полето изгледа дека непостои, ве молиме проверете го името на корисничкото поле.',
+        'custom_field_not_found_on_model' => 'Полето изгледа дека постои, но не е достапно во овој модел на средство\\a.',
 
         // date_format validation with slightly less stupid messages. It duplicates a lot, but it gets the job done :(
-        // We use this because the default error message for date_format is reflects php Y-m-d, which non-PHP
-        // people won't know how to format. 
-        'purchase_date.date_format'     => 'The :attribute must be a valid date in YYYY-MM-DD format',
-        'last_audit_date.date_format'   =>  'The :attribute must be a valid date in YYYY-MM-DD hh:mm:ss format',
-        'expiration_date.date_format'   =>  'The :attribute must be a valid date in YYYY-MM-DD format',
-        'termination_date.date_format'  =>  'The :attribute must be a valid date in YYYY-MM-DD format',
-        'expected_checkin.date_format'  =>  'The :attribute must be a valid date in YYYY-MM-DD format',
-        'start_date.date_format'        =>  'The :attribute must be a valid date in YYYY-MM-DD format',
-        'end_date.date_format'          =>  'The :attribute must be a valid date in YYYY-MM-DD format',
+        // We use this because the default error message for date_format reflects php Y-m-d, which non-PHP
+        // people won't know how to format.
+        'purchase_date.date_format'     => 'Полето :attribute мора да биде валиден датум во YYYY-MM-DD формат',
+        'last_audit_date.date_format'   =>  'Полето :attribute мора да биде валиден датум во YYYY-MM-DD hh:mm:ss формат',
+        'expiration_date.date_format'   =>  'Полето :attribute мора да биде валиден датум во YYYY-MM-DD формат',
+        'termination_date.date_format'  =>  'Полето :attribute мора да биде валиден датум во YYYY-MM-DD формат',
+        'expected_checkin.date_format'  =>  'Полето :attribute мора да биде валиден датум во YYYY-MM-DD формат',
+        'start_date.date_format'        =>  'Полето :attribute мора да биде валиден датум во YYYY-MM-DD формат',
+        'end_date.date_format'          =>  'Полето :attribute мора да биде валиден датум во YYYY-MM-DD fформат',
+        'invalid_value_in_field' => 'Невалидна вредност вклучена во полето',
 
-    ],
+        'ldap_username_field' => [
+            'not_in' =>         '<code>sAMAccountName</code> (mixed case) will likely not work. You should use <code>samaccountname</code> (lowercase) instead.'
+        ],
+        'ldap_auth_filter_query' => ['not_in' => '<code>uid=samaccountname</code> is probably not a valid auth filter. You probably want <code>uid=</code> '],
+        'ldap_filter' => ['regex' => 'This value should probably not be wrapped in parentheses.'],
 
+        ],
     /*
     |--------------------------------------------------------------------------
     | Custom Validation Attributes
@@ -155,8 +233,16 @@ return [
 
     /*
     |--------------------------------------------------------------------------
-    | Generic Validation Messages
+    | Generic Validation Messages - we use these in the jquery validation where we don't have
+    | access to the :attribute
     |--------------------------------------------------------------------------
     */
-    'invalid_value_in_field' => 'Invalid value included in this field',
+
+    'generic' => [
+        'invalid_value_in_field' => 'Невалидна вредност вклучена во полето',
+        'required' => 'Полето е задолжително',
+        'email' => 'Ве молиме внесете валидна адреса на Е-пошта',
+    ],
+
+
 ];
diff --git a/resources/lang/ml-IN/account/general.php b/resources/lang/ml-IN/account/general.php
index 1a9e2c03b8..7f9e2f848e 100644
--- a/resources/lang/ml-IN/account/general.php
+++ b/resources/lang/ml-IN/account/general.php
@@ -2,10 +2,16 @@
 
 return array(
     'personal_api_keys' => 'Personal API Keys',
+    'personal_access_token' => 'Personal Access Token',
+    'personal_api_keys_success' => 'Personal API Key :key created sucessfully',
+    'here_is_api_key' => 'Here is your new personal access token. This is the only time it will be shown so do not lose it! You may now use this token to make API requests.',
     'api_key_warning' => 'When generating an API token, be sure to copy it down immediately as they will not be visible to you again.',
     'api_base_url' => 'Your API base url is located at:',
     'api_base_url_endpoint' => '/&lt;endpoint&gt;',
     'api_token_expiration_time' => 'API tokens are set to expire in:',
     'api_reference' => 'Please check the <a href="https://snipe-it.readme.io/reference" target="_blank">API reference</a> to find specific API endpoints and additional API documentation.',
     'profile_updated' => 'Account successfully updated',
+    'no_tokens' => 'You have not created any personal access tokens.',
+    'enable_sounds' => 'Enable sound effects',
+    'enable_confetti' => 'Enable confetti effects',
 );
diff --git a/resources/lang/ml-IN/admin/accessories/message.php b/resources/lang/ml-IN/admin/accessories/message.php
index c688d5e03d..f60d41957b 100644
--- a/resources/lang/ml-IN/admin/accessories/message.php
+++ b/resources/lang/ml-IN/admin/accessories/message.php
@@ -26,7 +26,11 @@ return array(
         'error'   		=> 'Accessory was not checked out, please try again',
         'success' 		=> 'Accessory checked out successfully.',
         'unavailable'   => 'Accessory is not available for checkout. Check quantity available',
-        'user_does_not_exist' => 'That user is invalid. Please try again.'
+        'user_does_not_exist' => 'That user is invalid. Please try again.',
+         'checkout_qty' => array(
+            'lte'  => 'There is currently only one available accessory of this type, and you are trying to check out :checkout_qty. Please adjust the checkout quantity or the total stock of this accessory and try again.|There are :number_currently_remaining total available accessories, and you are trying to check out :checkout_qty. Please adjust the checkout quantity or the total stock of this accessory and try again.',
+            ),
+           
     ),
 
     'checkin' => array(
diff --git a/resources/lang/ml-IN/admin/accessories/table.php b/resources/lang/ml-IN/admin/accessories/table.php
index 175cc5d3d3..13381c2958 100644
--- a/resources/lang/ml-IN/admin/accessories/table.php
+++ b/resources/lang/ml-IN/admin/accessories/table.php
@@ -6,6 +6,4 @@ return array(
     'id'      					=> 'ഐഡി',
     'require_acceptance'      	=> 'Acceptance',
     'title'      				=> 'Accessory Name',
-
-
 );
diff --git a/resources/lang/ml-IN/admin/components/message.php b/resources/lang/ml-IN/admin/components/message.php
index 0a7dd8d954..ec39dc4178 100644
--- a/resources/lang/ml-IN/admin/components/message.php
+++ b/resources/lang/ml-IN/admin/components/message.php
@@ -17,7 +17,8 @@ return array(
     'delete' => array(
         'confirm'   => 'Are you sure you wish to delete this component?',
         'error'   => 'There was an issue deleting the component. Please try again.',
-        'success' => 'The component was deleted successfully.'
+        'success' => 'The component was deleted successfully.',
+        'error_qty'   => 'Some components of this type are still checked out. Please check them in and try again.',
     ),
 
      'checkout' => array(
diff --git a/resources/lang/ml-IN/admin/consumables/general.php b/resources/lang/ml-IN/admin/consumables/general.php
index 7c6bb32968..29acfedc1b 100644
--- a/resources/lang/ml-IN/admin/consumables/general.php
+++ b/resources/lang/ml-IN/admin/consumables/general.php
@@ -8,4 +8,5 @@ return array(
     'remaining' 			            => 'Remaining',
     'total' 			                => 'Total',
     'update'                            => 'Update Consumable',
+    'inventory_warning'                 => 'The inventory of this consumable is below the minimum amount of :min_count',
 );
diff --git a/resources/lang/ml-IN/admin/consumables/message.php b/resources/lang/ml-IN/admin/consumables/message.php
index c0d0aa7f68..e2591503bf 100644
--- a/resources/lang/ml-IN/admin/consumables/message.php
+++ b/resources/lang/ml-IN/admin/consumables/message.php
@@ -2,6 +2,7 @@
 
 return array(
 
+    'invalid_category_type' => 'The category must be a consumable category.',
     'does_not_exist' => 'Consumable does not exist.',
 
     'create' => array(
diff --git a/resources/lang/ml-IN/admin/custom_fields/general.php b/resources/lang/ml-IN/admin/custom_fields/general.php
index e3c21d1f0c..c9ae61c963 100644
--- a/resources/lang/ml-IN/admin/custom_fields/general.php
+++ b/resources/lang/ml-IN/admin/custom_fields/general.php
@@ -35,7 +35,7 @@ return [
     'create_field_title' => 'Create a new custom field',
     'value_encrypted'      	        => 'The value of this field is encrypted in the database. Only admin users will be able to view the decrypted value',
     'show_in_email'     => 'Include the value of this field in checkout emails sent to the user? Encrypted fields cannot be included in emails',
-    'show_in_email_short'     => 'Include in emails.',
+    'show_in_email_short' => 'Include in emails',
     'help_text' => 'Help Text',
     'help_text_description' => 'This is optional text that will appear below the form elements while editing an asset to provide context on the field.',
     'about_custom_fields_title' => 'About Custom Fields',
@@ -57,5 +57,8 @@ return [
     'show_in_requestable_list_short' => 'Show in requestable assets list',
     'show_in_requestable_list' => 'Show value in requestable assets list. Encrypted fields will not be shown',
     'encrypted_options' => 'This field is encrypted, so some display options will not be available.',
+    'display_checkin' => 'Display in checkin forms',
+    'display_checkout' => 'Display in checkout forms',
+    'display_audit' => 'Display in audit forms',
 
 ];
diff --git a/resources/lang/ml-IN/admin/custom_fields/message.php b/resources/lang/ml-IN/admin/custom_fields/message.php
index 43ba821821..6442359b7f 100644
--- a/resources/lang/ml-IN/admin/custom_fields/message.php
+++ b/resources/lang/ml-IN/admin/custom_fields/message.php
@@ -5,6 +5,7 @@ return array(
     'field' => array(
         'invalid'   => 'That field does not exist.',
         'already_added'   => 'Field already added',
+        'none_selected'   => 'No field selected',
 
         'create' => array(
             'error'   => 'Field was not created, please try again.',
diff --git a/resources/lang/ml-IN/admin/depreciations/general.php b/resources/lang/ml-IN/admin/depreciations/general.php
index 1a5666f9dc..90246e9cd8 100644
--- a/resources/lang/ml-IN/admin/depreciations/general.php
+++ b/resources/lang/ml-IN/admin/depreciations/general.php
@@ -13,4 +13,8 @@ return [
     'no_depreciations_warning'               => '<strong>Warning: </strong>
                       You do not currently have any depreciations set up.
                       Please set up at least one depreciation to view the depreciation report.',
+    'depreciation_method'                   => 'Depreciation Report',
+    'linear_depreciation'                   => 'Linear (Default)',
+    'half_1'                                => 'Half-year convention, always applied',
+    'half_2'                                => 'Half-year convention, applied with condition',
 ];
diff --git a/resources/lang/ml-IN/admin/hardware/form.php b/resources/lang/ml-IN/admin/hardware/form.php
index edec543637..8fbd0b4e87 100644
--- a/resources/lang/ml-IN/admin/hardware/form.php
+++ b/resources/lang/ml-IN/admin/hardware/form.php
@@ -55,8 +55,11 @@ return [
     'asset_location_update_default' => 'Update only default location',
     'asset_location_update_actual' => 'Update only actual location',
     'asset_not_deployable' => 'That asset status is not deployable. This asset cannot be checked out.',
-    'asset_deployable' => 'That status is deployable. This asset can be checked out.',
+    'asset_not_deployable_checkin' => 'That asset status is not deployable. Using this status label will checkin the asset.',
+    'asset_deployable' => 'This asset can be checked out.',
     'processing_spinner' => 'Processing... (This might take a bit of time on large files)',
+    'processing' => 'Processing... ',
     'optional_infos'  => 'Optional Information',
-    'order_details'   => 'Order Related Information'
+    'order_details'   => 'Order Related Information',
+    'calc_eol'    => 'If nulling the EOL date, use automatic EOL calculation based on the purchase date and EOL rate.',
 ];
diff --git a/resources/lang/ml-IN/admin/hardware/general.php b/resources/lang/ml-IN/admin/hardware/general.php
index 34ac4e63ee..6740476574 100644
--- a/resources/lang/ml-IN/admin/hardware/general.php
+++ b/resources/lang/ml-IN/admin/hardware/general.php
@@ -5,8 +5,8 @@ return [
     'about_assets_text'            => 'Assets are items tracked by serial number or asset tag.  They tend to be higher value items where identifying a specific item matters.',
     'archived'  				=> 'Archived',
     'asset'  					=> 'Asset',
-    'bulk_checkout'             => 'Checkout Assets',
-    'bulk_checkin'              => 'Checkin Assets',
+    'bulk_checkout'             => 'Bulk Checkout',
+    'bulk_checkin'              => 'Bulk Checkin',
     'checkin'  					=> 'Checkin Asset',
     'checkout'  				=> 'Checkout Asset',
     'clone'  					=> 'Clone Asset',
@@ -27,8 +27,7 @@ return [
     'undeployable_tooltip'  	=> 'This asset has a status label that is undeployable and cannot be checked out at this time.',
     'view'  					=> 'View Asset',
     'csv_error' => 'You have an error in your CSV file:',
-    'import_text' => '<p>Upload a CSV that contains asset history. The assets and users MUST already exist in the system, or they will be skipped. Matching assets for history import happens against the asset tag. We will try to find a matching user based on the user\'s name you provide, and the criteria you select below. If you do not select any criteria below, it will simply try to match on the username format you configured in the <code>Admin &gt; General Settings</code>.</p><p>Fields included in the CSV must match the headers: <strong>Asset Tag, Name, Checkout Date, Checkin Date</strong>. Any additional fields will be ignored. </p><p>Checkin Date: blank or future checkin dates will checkout items to associated user.  Excluding the Checkin Date column will create a checkin date with todays date.</p>
-    ',
+    'import_text' => '<p>Upload a CSV that contains asset history. The assets and users MUST already exist in the system, or they will be skipped. Matching assets for history import happens against the asset tag. We will try to find a matching user based on the user\'s name you provide, and the criteria you select below. If you do not select any criteria below, it will simply try to match on the username format you configured in the <code>Admin &gt; General Settings</code>.</p><p>Fields included in the CSV must match the headers: <strong>Asset Tag, Name, Checkout Date, Checkin Date</strong>. Any additional fields will be ignored. </p><p>Checkin Date: blank or future checkin dates will checkout items to associated user.  Excluding the Checkin Date column will create a checkin date with todays date.</p>    ',
     'csv_import_match_f-l' => 'Try to match users by <strong>firstname.lastname</strong> (<code>jane.smith</code>) format',
     'csv_import_match_initial_last' => 'Try to match users by <strong>first initial last name</strong> (<code>jsmith</code>) format',
     'csv_import_match_first' => 'Try to match users by <strong>first name</strong> (<code>jane</code>) format',
diff --git a/resources/lang/ml-IN/admin/hardware/message.php b/resources/lang/ml-IN/admin/hardware/message.php
index 32698b1c07..c19bc63647 100644
--- a/resources/lang/ml-IN/admin/hardware/message.php
+++ b/resources/lang/ml-IN/admin/hardware/message.php
@@ -2,19 +2,23 @@
 
 return [
 
-    'undeployable' 		=> '<strong>Warning: </strong> This asset has been marked as currently undeployable.
-                        If this status has changed, please update the asset status.',
-    'does_not_exist' 	=> 'Asset does not exist.',
-    'does_not_exist_var'=> 'Asset with tag :asset_tag not found.',
-    'no_tag' 	        => 'No asset tag provided.',
+    'undeployable' 		 => '<strong>Warning: </strong> This asset has been marked as currently undeployable. If this status has changed, please update the asset status.',
+    'does_not_exist' 	 => 'Asset does not exist.',
+    'does_not_exist_var' => 'Asset with tag :asset_tag not found.',
+    'no_tag' 	         => 'No asset tag provided.',
     'does_not_exist_or_not_requestable' => 'That asset does not exist or is not requestable.',
-    'assoc_users'	 	=> 'This asset is currently checked out to a user and cannot be deleted. Please check the asset in first, and then try deleting again. ',
+    'assoc_users'	 	 => 'This asset is currently checked out to a user and cannot be deleted. Please check the asset in first, and then try deleting again. ',
     'warning_audit_date_mismatch' 	=> 'This asset\'s next audit date (:next_audit_date) is before the last audit date (:last_audit_date). Please update the next audit date.',
+    'labels_generated'   => 'Labels were successfully generated.',
+    'error_generating_labels' => 'Error while generating labels.',
+    'no_assets_selected' => 'No assets selected.',
 
     'create' => [
         'error'   		=> 'Asset was not created, please try again. :(',
         'success' 		=> 'Asset created successfully. :)',
         'success_linked' => 'Asset with tag :tag was created successfully. <strong><a href=":link" style="color: white;">Click here to view</a></strong>.',
+        'multi_success_linked' => 'Asset with tag :links was created successfully.|:count assets were created succesfully. :links.',
+        'partial_failure' => 'An asset was unable to be created. Reason: :failures|:count assets were unable to be created. Reasons: :failures',
     ],
 
     'update' => [
@@ -52,20 +56,24 @@ return [
     ],
 
     'import' => [
+        'import_button'         => 'Process Import',
         'error'                 => 'Some items did not import correctly.',
         'errorDetail'           => 'The following Items were not imported because of errors.',
         'success'               => 'Your file has been imported',
         'file_delete_success'   => 'Your file has been been successfully deleted',
         'file_delete_error'      => 'The file was unable to be deleted',
         'file_missing' => 'The file selected is missing',
+        'file_already_deleted' => 'The file selected was already deleted',
         'header_row_has_malformed_characters' => 'One or more attributes in the header row contain malformed UTF-8 characters',
         'content_row_has_malformed_characters' => 'One or more attributes in the first row of content contain malformed UTF-8 characters',
+        'transliterate_failure' => 'Transliteration from :encoding to UTF-8 failed due to invalid characters in input'
     ],
 
 
     'delete' => [
         'confirm'   	=> 'Are you sure you wish to delete this asset?',
         'error'   		=> 'There was an issue deleting the asset. Please try again.',
+        'assigned_to_error' => '{1}Asset Tag: :asset_tag is currently checked out. Check in this device before deletion.|[2,*]Asset Tags: :asset_tag are currently checked out. Check in these devices before deletion.',
         'nothing_updated'   => 'No assets were selected, so nothing was deleted.',
         'success' 		=> 'The asset was deleted successfully.',
     ],
@@ -78,6 +86,11 @@ return [
         'no_assets_selected' => 'You must select at least one asset from the list',
     ],
 
+    'multi-checkout' => [
+        'error'   => 'Asset was not checked out, please try again|Assets were not checked out, please try again',
+        'success' => 'Asset checked out successfully.|Assets checked out successfully.',
+    ],
+
     'checkin' => [
         'error'   		=> 'Asset was not checked in, please try again',
         'success' 		=> 'Asset checked in successfully.',
@@ -87,9 +100,10 @@ return [
     ],
 
     'requests' => [
-        'error'   		=> 'Asset was not requested, please try again',
-        'success' 		=> 'Asset requested successfully.',
-        'canceled'      => 'Checkout request successfully canceled',
+        'error'   		=> 'Request was not successful, please try again.',
+        'success' 		=> 'Request successfully submitted.',
+        'canceled'      => 'Request successfully canceled.',
+        'cancel'        => 'Cancel this item request',
     ],
 
 ];
diff --git a/resources/lang/ml-IN/admin/hardware/table.php b/resources/lang/ml-IN/admin/hardware/table.php
index 55c0265bf0..558cf86c11 100644
--- a/resources/lang/ml-IN/admin/hardware/table.php
+++ b/resources/lang/ml-IN/admin/hardware/table.php
@@ -25,7 +25,6 @@ return [
     'image'		    => 'Device Image',
     'days_without_acceptance' => 'Days Without Acceptance',
     'monthly_depreciation' => 'Monthly Depreciation',
-    'assigned_to'    => 'Assigned To',
     'requesting_user' => 'Requesting User',
     'requested_date' => 'Requested Date',
     'changed'       => 'Changed',
diff --git a/resources/lang/ml-IN/admin/kits/general.php b/resources/lang/ml-IN/admin/kits/general.php
index f57fb645c4..2b5c2d9cd0 100644
--- a/resources/lang/ml-IN/admin/kits/general.php
+++ b/resources/lang/ml-IN/admin/kits/general.php
@@ -47,4 +47,5 @@ return [
     'kit_deleted'                       => 'Kit was successfully deleted',
     'kit_model_updated'                 => 'Model was successfully updated',
     'kit_model_detached'                => 'Model was successfully detached',
+    'model_already_attached'            => 'Model already attached to kit',
 ];
diff --git a/resources/lang/ml-IN/admin/licenses/general.php b/resources/lang/ml-IN/admin/licenses/general.php
index 79b69a3d94..b39030afd4 100644
--- a/resources/lang/ml-IN/admin/licenses/general.php
+++ b/resources/lang/ml-IN/admin/licenses/general.php
@@ -14,6 +14,7 @@ return array(
     'info'  					=> 'License Info',
     'license_seats'  			=> 'License Seats',
     'seat'  					=> 'Seat',
+    'seat_count'  				=> 'Seat :count',
     'seats'  					=> 'Seats',
     'software_licenses'  		=> 'Software Licenses',
     'user'  					=> 'User',
@@ -23,12 +24,12 @@ return array(
         [
             'checkin_all'           => [
                 'button'            => 'Checkin All Seats',
-                'modal'             => 'This will action checkin one seat. | This action will checkin all :checkedout_seats_count seats for this license.',
+                'modal'             => 'This action will checkin one seat. | This action will checkin all :checkedout_seats_count seats for this license.',
                 'enabled_tooltip'   => 'Checkin ALL seats for this license from both users and assets',
                 'disabled_tooltip'  => 'This is disabled because there are no seats currently checked out',
                 'disabled_tooltip_reassignable'  => 'This is disabled because the License is not reassignable',
                 'success'           => 'License successfully checked in! | All licenses were successfully checked in!',
-                'log_msg'           => 'Checked in via bulk license checkout in license GUI',
+                'log_msg'           => 'Checked in via bulk license checkin in license GUI',
             ],
 
             'checkout_all'              => [
diff --git a/resources/lang/ml-IN/admin/licenses/message.php b/resources/lang/ml-IN/admin/licenses/message.php
index 27fbfe38a9..74e1d7af5a 100644
--- a/resources/lang/ml-IN/admin/licenses/message.php
+++ b/resources/lang/ml-IN/admin/licenses/message.php
@@ -44,10 +44,13 @@ return array(
         'error'   => 'There was an issue checking out the license. Please try again.',
         'success' => 'The license was checked out successfully',
         'not_enough_seats' => 'Not enough license seats available for checkout',
+        'mismatch' => 'The license seat provided does not match the license',
+        'unavailable' => 'This seat is not available for checkout.',
     ),
 
     'checkin' => array(
         'error'   => 'There was an issue checking in the license. Please try again.',
+        'not_reassignable' => 'License not reassignable',
         'success' => 'The license was checked in successfully'
     ),
 
diff --git a/resources/lang/ml-IN/admin/locations/message.php b/resources/lang/ml-IN/admin/locations/message.php
index 8121b80687..b21c70ad89 100644
--- a/resources/lang/ml-IN/admin/locations/message.php
+++ b/resources/lang/ml-IN/admin/locations/message.php
@@ -3,11 +3,12 @@
 return array(
 
     'does_not_exist' => 'Location does not exist.',
-    'assoc_users'    => 'This location is not currently deletable because it is the location of record for at least one asset or user, has assets assigned to it, or is the parent location of another location. Please update your models to no longer reference this company and try again. ',
+    'assoc_users'    => 'This location is not currently deletable because it is the location of record for at least one asset or user, has assets assigned to it, or is the parent location of another location. Please update your records to no longer reference this location and try again ',
     'assoc_assets'	 => 'This location is currently associated with at least one asset and cannot be deleted. Please update your assets to no longer reference this location and try again. ',
     'assoc_child_loc'	 => 'This location is currently the parent of at least one child location and cannot be deleted. Please update your locations to no longer reference this location and try again. ',
     'assigned_assets' => 'Assigned Assets',
     'current_location' => 'Current Location',
+    'open_map' => 'Open in :map_provider_icon Maps',
 
 
     'create' => array(
@@ -20,6 +21,11 @@ return array(
         'success' => 'Location updated successfully.'
     ),
 
+    'restore' => array(
+        'error'   => 'Location was not restored, please try again',
+        'success' => 'Location restored successfully.'
+    ),
+
     'delete' => array(
         'confirm'   	=> 'Are you sure you wish to delete this location?',
         'error'   => 'There was an issue deleting the location. Please try again.',
diff --git a/resources/lang/ml-IN/admin/locations/table.php b/resources/lang/ml-IN/admin/locations/table.php
index ff3dfd0cd2..d8b054b630 100644
--- a/resources/lang/ml-IN/admin/locations/table.php
+++ b/resources/lang/ml-IN/admin/locations/table.php
@@ -39,4 +39,5 @@ return [
     'signed_by_finance_auditor' => 'Signed By (Finance Auditor):',
     'signed_by_location_manager' => 'Signed By (Location Manager):',
     'signed_by'                 => 'Signed Off By:',
+    'clone'  					=> 'Clone Location',
 ];
diff --git a/resources/lang/ml-IN/admin/models/general.php b/resources/lang/ml-IN/admin/models/general.php
index 7e4a77adbc..9a61b53fd0 100644
--- a/resources/lang/ml-IN/admin/models/general.php
+++ b/resources/lang/ml-IN/admin/models/general.php
@@ -3,7 +3,7 @@
 return array(
     'about_models_title'     => 'About Asset Models',
     'about_models_text'           => 'Asset Models are a way to group identical assets. "MBP 2013", "IPhone 6s", etc.',
-    'deleted'  					        => 'This model has been deleted.',
+    'deleted'  					=> 'This model has been deleted.',
     'bulk_delete'               => 'Bulk Delete Asset Models',
     'bulk_delete_help'               => 'Use the checkboxes below to confirm the deletion of the selected asset models. Asset models that have assets associated with them cannot be deleted until the assets are associated with a different model.',
     'bulk_delete_warn'          => 'You are about to delete one asset model.|You are about to delete :model_count asset models.',
diff --git a/resources/lang/ml-IN/admin/models/message.php b/resources/lang/ml-IN/admin/models/message.php
index cc38c54530..ae3bc34eed 100644
--- a/resources/lang/ml-IN/admin/models/message.php
+++ b/resources/lang/ml-IN/admin/models/message.php
@@ -7,7 +7,7 @@ return array(
     'no_association' => 'WARNING! The asset model for this item is invalid or missing!',
     'no_association_fix' => 'This will break things in weird and horrible ways. Edit this asset now to assign it a model.',
     'assoc_users'	 => 'This model is currently associated with one or more assets and cannot be deleted. Please delete the assets, and then try deleting again. ',
-
+    'invalid_category_type' => 'This category must be an asset category.',
 
     'create' => array(
         'error'   => 'Model was not created, please try again.',
diff --git a/resources/lang/ml-IN/admin/reports/general.php b/resources/lang/ml-IN/admin/reports/general.php
index 9b682f8ecd..ed8bf1a156 100644
--- a/resources/lang/ml-IN/admin/reports/general.php
+++ b/resources/lang/ml-IN/admin/reports/general.php
@@ -4,6 +4,7 @@ return [
     'info'   => 'Select the options you want for your asset report.',
     'deleted_user' => 'Deleted user',
     'send_reminder' => 'Send reminder',
+    'cannot_send_reminder' => 'User has been deleted or does not have an email address so cannot receive a reminder',
     'reminder_sent' => 'Reminder sent',
     'acceptance_deleted' => 'Acceptance request deleted',
     'acceptance_request' => 'Acceptance request',
@@ -13,5 +14,10 @@ return [
         'user_state' => 'User State',
         'user_country' => 'User Country',
         'user_zip' => 'User Zip'
-    ]
-];
\ No newline at end of file
+    ],
+    'open_saved_template' => 'Open Saved Template',
+    'save_template' =>  'Save Template',
+    'select_a_template' => 'Select a Template',
+    'template_name' => 'Template Name',
+    'update_template' => 'Update Template',
+];
diff --git a/resources/lang/ml-IN/admin/reports/message.php b/resources/lang/ml-IN/admin/reports/message.php
index d4c8f8198f..2800bbdf0b 100644
--- a/resources/lang/ml-IN/admin/reports/message.php
+++ b/resources/lang/ml-IN/admin/reports/message.php
@@ -1,5 +1,16 @@
 <?php
 
-return array(
-    'error'   => 'You must select at least ONE option.'
-);
+return [
+    'about_templates' => 'About Saved Templates',
+    'saving_templates_description' => 'Select your options, then enter the name of your template in the box above and click the \'Save Template\' button. Use the dropdown to select a previously saved template.',
+    'create'  => [
+        'success' => 'Template saved successfully',
+    ],
+    'update' => [
+        'success' => 'Template updated successfully',
+    ],
+    'delete' => [
+        'success' => 'Template deleted',
+        'no_delete_permission' => 'Template does not exist or you do not have permission to delete it.',
+    ],
+];
diff --git a/resources/lang/ml-IN/admin/settings/general.php b/resources/lang/ml-IN/admin/settings/general.php
index 8074f5082e..37cfb0de94 100644
--- a/resources/lang/ml-IN/admin/settings/general.php
+++ b/resources/lang/ml-IN/admin/settings/general.php
@@ -8,13 +8,13 @@ return [
     'ad_append_domain'          => 'Append domain name to username field',
     'ad_append_domain_help'     => 'User isn\'t required to write "username@domain.local", they can just type "username".',
     'admin_cc_email'            => 'CC Email',
-    'admin_cc_email_help'       => 'If you would like to send a copy of checkin/checkout emails that are sent to users to an additional email account, enter it here. Otherwise leave this field blank.',
+    'admin_cc_email_help'       => 'Send a copy of checkin/checkout emails to this address.',
     'admin_settings'            => 'Admin Settings',
     'is_ad'				        => 'This is an Active Directory server',
     'alerts'                	=> 'Alerts',
     'alert_title'               => 'Update Notification Settings',
     'alert_email'				=> 'Send alerts to',
-    'alert_email_help'    => 'Email addresses or distribution lists you want alerts to be sent to, comma separated',
+    'alert_email_help'          => 'Email addresses or distribution lists you want alerts to be sent to, comma separated.',
     'alerts_enabled'			=> 'Email Alerts Enabled',
     'alert_interval'			=> 'Expiring Alerts Threshold (in days)',
     'alert_inv_threshold'		=> 'Inventory Alert Threshold',
@@ -31,15 +31,18 @@ return [
     'backups'					=> 'Backups',
     'backups_help'              => 'Create, download, and restore backups ',
     'backups_restoring'         => 'Restoring from Backup',
+    'backups_clean' => 'Clean the backed-up database before restore',
+    'backups_clean_helptext' => "This can be useful if you're changing between database versions",
     'backups_upload'            => 'Upload Backup',
     'backups_path'              => 'Backups on the server are stored in <code>:path</code>',
-    'backups_restore_warning'   => 'Use the restore button <small><span class="btn btn-xs btn-warning"><i class="text-white fas fa-retweet" aria-hidden="true"></i></span></small> to restore from a previous backup. (This does not currently work with S3 file storage or Docker.)<br><br>Your <strong>entire :app_name database and any uploaded files will be completely replaced</strong> by what\'s in the backup file.  ',
+    'backups_restore_warning'   => 'Use the restore button <small><span class="btn btn-xs btn-warning"><i class="text-white fas fa-retweet" aria-hidden="true"></i></span></small> to restore from a previous backup. (This does not currently work with S3 file storage or Docker.)<br><br>Your <strong>entire :app_name database and any uploaded files will be completely replaced</strong> by what\'s in the backup file  ',
     'backups_logged_out'         => 'All existing users, including you, will be logged out once your restore is complete.',
     'backups_large'             => 'Very large backups may time out on the restore attempt and may still need to be run via command line. ',
     'barcode_settings'			=> 'Barcode Settings',
     'confirm_purge'			    => 'Confirm Purge',
     'confirm_purge_help'		=> 'Enter the text "DELETE" in the box below to purge your deleted records. This action cannot be undone and will PERMANENTLY delete all soft-deleted items and users. (You should make a backup first, just to be safe.)',
     'custom_css'				=> 'Custom CSS',
+    'custom_css_placeholder'	=> 'Add your custom CSS',
     'custom_css_help'			=> 'Enter any custom CSS overrides you would like to use. Do not include the &lt;style&gt;&lt;/style&gt; tags.',
     'custom_forgot_pass_url'	=> 'Custom Password Reset URL',
     'custom_forgot_pass_url_help'	=> 'This replaces the built-in forgotten password URL on the login screen, useful to direct people to internal or hosted LDAP password reset functionality. It will effectively disable local user forgotten password functionality.',
@@ -47,34 +50,34 @@ return [
     'dashboard_message_help'	=> 'This text will appear on the dashboard for anyone with permission to view the dashboard.',
     'default_currency'  		=> 'Default Currency',
     'default_eula_text'			=> 'Default EULA',
+    'default_eula_text_placeholder' => 'Add your default EULA text',
     'default_language'			=> 'Default Language',
     'default_eula_help_text'	=> 'You can also associate custom EULAs to specific asset categories.',
     'acceptance_note'           => 'Add a note for your decision (Optional)',
     'display_asset_name'        => 'Display Asset Name',
     'display_checkout_date'     => 'Display Checkout Date',
     'display_eol'               => 'Display EOL in table view',
-    'display_qr'                => 'Display Square Codes',
+    'display_qr'                => 'Display 2D barcode',
     'display_alt_barcode'		=> 'Display 1D barcode',
-    'email_logo'                => 'Email Logo',
     'barcode_type'				=> '2D Barcode Type',
     'alt_barcode_type'			=> '1D barcode type',
-    'email_logo_size'       => 'Square logos in email look best. ',
     'enabled'                   => 'Enabled',
     'eula_settings'				=> 'EULA Settings',
     'eula_markdown'				=> 'This EULA allows <a href="https://help.github.com/articles/github-flavored-markdown/">Github flavored markdown</a>.',
+    'empty_row_count'           => 'Field Start Offset (Empty Rows)',
+    'empty_row_count_help'      => 'Fields will begin populating after this many empty rows are skipped at the top of the label.',
     'favicon'                   => 'Favicon',
     'favicon_format'            => 'Accepted filetypes are ico, png, and gif. Other image formats may not work in all browsers.',
     'favicon_size'          => 'Favicons should be square images, 16x16 pixels.',
     'footer_text'               => 'Additional Footer Text ',
     'footer_text_help'          => 'This text will appear in the right-side footer. Links are allowed using <a href="https://help.github.com/articles/github-flavored-markdown/">Github flavored markdown</a>. Line breaks, headers, images, etc may result in unpredictable results.',
+    'footer_text_placeholder'   => 'Optional footer text',
     'general_settings'			=> 'General Settings',
-    'general_settings_keywords' => 'company support, signature, acceptance, email format, username format, images, per page, thumbnail, eula, gravatar, tos, dashboard, privacy',
     'general_settings_help'     => 'Default EULA and more',
     'generate_backup'			=> 'Generate Backup',
     'google_workspaces'         => 'Google Workspaces',
     'header_color'              => 'Header Color',
     'info'                      => 'These settings let you customize certain aspects of your installation.',
-    'label_logo'                => 'Label Logo',
     'label_logo_size'           => 'Square logos look best - will be displayed in the top right of each asset label. ',
     'laravel'                   => 'Laravel Version',
     'ldap'                      => 'LDAP',
@@ -94,7 +97,7 @@ return [
     'ldap_login_sync_help'      => 'This only tests that LDAP can sync correctly. If your LDAP Authentication query is not correct, users may still not be able to login. YOU MUST SAVE YOUR UPDATED LDAP SETTINGS FIRST.',
     'ldap_manager'              => 'LDAP Manager',
     'ldap_server'               => 'LDAP Server',
-    'ldap_server_help'          => 'This should start with ldap:// (for unencrypted or TLS) or ldaps:// (for SSL)',
+    'ldap_server_help'          => 'This should start with ldap:// (for unencrypted) or ldaps:// (for TLS or SSL)',
     'ldap_server_cert'			=> 'LDAP SSL certificate validation',
     'ldap_server_cert_ignore'	=> 'Allow invalid SSL Certificate',
     'ldap_server_cert_help'		=> 'Select this checkbox if you are using a self signed SSL cert and would like to accept an invalid SSL certificate.',
@@ -108,8 +111,8 @@ return [
     'ldap_pword'                => 'LDAP Bind Password',
     'ldap_basedn'               => 'Base Bind DN',
     'ldap_filter'               => 'LDAP Filter',
-    'ldap_pw_sync'              => 'LDAP Password Sync',
-    'ldap_pw_sync_help'         => 'Uncheck this box if you do not wish to keep LDAP passwords synced with local passwords. Disabling this means that your users may not be able to login if your LDAP server is unreachable for some reason.',
+    'ldap_pw_sync'              => 'Cache LDAP Passwords',
+    'ldap_pw_sync_help'         => 'Uncheck this box if you do not wish to keep LDAP passwords cached as local hashed passwords. Disabling this means that your users may not be able to login if your LDAP server is unreachable for some reason.',
     'ldap_username_field'       => 'Username Field',
     'ldap_lname_field'          => 'Last Name',
     'ldap_fname_field'          => 'LDAP First Name',
@@ -117,13 +120,15 @@ return [
     'ldap_version'              => 'LDAP Version',
     'ldap_active_flag'          => 'LDAP Active Flag',
     'ldap_activated_flag_help'  => 'This value is used to determine whether a synced user can login to Snipe-IT. <strong>It does not affect the ability to check items in or out to them</strong>, and should be the <strong>attribute name</strong> within your AD/LDAP, <strong>not the value</strong>. <br><br>If this field is set to a field name that does not exist in your AD/LDAP, or the value in the AD/LDAP field is set to <code>0</code> or <code>false</code>, <strong>user login will be disabled</strong>. If the value in the AD/LDAP field is set to <code>1</code> or <code>true</code> or <em>any other text</em> means the user can log in. When the field is blank in your AD, we respect the <code>userAccountControl</code> attribute, which usually allows non-suspended users to log in.',
+    'ldap_invert_active_flag'   => 'LDAP Invert Active Flag',
+    'ldap_invert_active_flag_help'     => 'If enabled: when the value returned by LDAP Active Flag is <code>0</code> or <code>false</code> the user account will be active.',
     'ldap_emp_num'              => 'LDAP Employee Number',
     'ldap_email'                => 'LDAP Email',
     'ldap_test'                 => 'Test LDAP',
     'ldap_test_sync'            => 'Test LDAP Synchronization',
     'license'                   => 'Software License',
-    'load_remote'               => 'Use Gravatar',
-    'load_remote_help_text'		=> 'Uncheck this box if your install cannot load scripts from the outside internet. This will prevent Snipe-IT from trying load images from Gravatar.',
+    'load_remote'               => 'Load Remote Avatars',
+    'load_remote_help_text'		=> 'Uncheck this box if your install cannot load scripts from the outside internet. This will prevent Snipe-IT from trying load avatars from Gravatar or other outside sources.',
     'login'                     => 'Login Attempts',
     'login_attempt'             => 'Login Attempt',
     'login_ip'                  => 'IP Address',
@@ -131,6 +136,7 @@ return [
     'login_user_agent'          => 'User Agent',
     'login_help'                => 'List of attempted logins',
     'login_note'                => 'Login Note',
+    'login_note_placeholder'            => "If you do not have a login or have found a device belonging to this company, please call technical support at 888-555-1212. Thank you.",
     'login_note_help'           => 'Optionally include a few sentences on your login screen, for example to assist people who have found a lost or stolen device. This field accepts <a href="https://help.github.com/articles/github-flavored-markdown/">Github flavored markdown</a>',
     'login_remote_user_text'    => 'Remote User login options',
     'login_remote_user_enabled_text' => 'Enable Login with Remote User Header',
@@ -146,13 +152,16 @@ return [
     'logo_print_assets_help'    => 'Use branding on printable asset lists ',
     'full_multiple_companies_support_help_text' => 'Restricting users (including admins) assigned to companies to their company\'s assets.',
     'full_multiple_companies_support_text' => 'Full Multiple Companies Support',
+    'scope_locations_fmcs_support_text'  => 'Scope Locations with Full Multiple Companies Support',
+    'scope_locations_fmcs_support_help_text'  => 'Restrict locations to their selected company.',
+    'scope_locations_fmcs_check_button' => 'Check Compatibility',
+    'scope_locations_fmcs_support_disabled_text'  => 'This option is disabled because you have conflicting locations set for :count or more items.',
     'show_in_model_list'   => 'Show in Model Dropdowns',
     'optional'					=> 'optional',
     'per_page'                  => 'Results Per Page',
     'php'                       => 'PHP Version',
-    'php_info'                  => 'PHP Info',
+    'php_info'                  => 'PHP info',
     'php_overview'              => 'PHP',
-    'php_overview_keywords'     => 'phpinfo, system, info',
     'php_overview_help'         => 'PHP System info',
     'php_gd_info'               => 'You must install php-gd to display QR codes, see install instructions.',
     'php_gd_warning'            => 'PHP Image Processing and GD plugin is NOT installed.',
@@ -218,6 +227,8 @@ return [
     'webhook_integration_help'    => ':app integration is optional, however the endpoint and channel are required if you wish to use it. To configure :app integration, you must first <a href=":webhook_link" target="_new" rel="noopener">create an incoming webhook</a> on your :app account. Click on the <strong>Test :app Integration</strong> button to confirm your settings are correct before saving. ',
     'webhook_integration_help_button'    => 'Once you have saved your :app information, a test button will appear.',
     'webhook_test_help'           => 'Test whether your :app integration is configured correctly. YOU MUST SAVE YOUR UPDATED :app SETTINGS FIRST.',
+    'shortcuts_enabled'         => 'Enable Shortcuts',
+    'shortcuts_help_text'       => '<strong>Windows</strong>: Alt + Access key, <strong>Mac</strong>: Control + Option + Access key',
     'snipe_version'  			=> 'Snipe-IT version',
     'support_footer'            => 'Support Footer Links ',
     'support_footer_help'       => 'Specify who sees the links to the Snipe-IT Support info and Users Manual',
@@ -227,7 +238,6 @@ return [
     'update'                    => 'Update Settings',
     'value'                     => 'Value',
     'brand'                     => 'Branding',
-    'brand_keywords'            => 'footer, logo, print, theme, skin, header, colors, color, css',
     'brand_help'                => 'Logo, Site Name',
     'web_brand'                 => 'Web Branding Type',
     'about_settings_title'      => 'About Settings',
@@ -276,6 +286,8 @@ return [
     'two_factor_enrollment_text'	=> "Two factor authentication is required, however your device has not been enrolled yet. Open your Google Authenticator app and scan the QR code below to enroll your device. Once you've enrolled your device, enter the code below",
     'require_accept_signature'      => 'Require Signature',
     'require_accept_signature_help_text'      => 'Enabling this feature will require users to physically sign off on accepting an asset.',
+    'require_checkinout_notes'  => 'Require Notes on Checkin/Checkout',
+    'require_checkinout_notes_help_text'    => 'Enabling this feature will require the note fields to be populated when checking in or checking out an asset.',
     'left'        => 'left',
     'right'        => 'right',
     'top'        => 'top',
@@ -313,24 +325,24 @@ return [
     'filter_by_keyword' => 'Filter by setting keyword',
     'security' => 'Security',
     'security_title' => 'Update Security Settings',
-    'security_keywords' => 'password, passwords, requirements, two factor, two-factor, common passwords, remote login, logout, authentication',
     'security_help' => 'Two-factor, Password Restrictions',
-    'groups_keywords' => 'permissions, permission groups, authorization',
     'groups_help' => 'Account permission groups',
     'localization' => 'Localization',
     'localization_title' => 'Update Localization Settings',
-    'localization_keywords' => 'localization, currency, local, locale, time zone, timezone, international, internatinalization, language, languages, translation',
     'localization_help' => 'Language, date display',
     'notifications' => 'Notifications',
     'notifications_help' => 'Email Alerts & Audit Settings',
     'asset_tags_help' => 'Incrementing and prefixes',
     'labels' => 'Labels',
     'labels_title' => 'Update Label Settings',
-    'labels_help' => 'Label sizes &amp; settings',
-    'purge_keywords' => 'permanently delete',
+    'labels_help' => 'Barcodes &amp; label settings',
     'purge_help' => 'Purge Deleted Records',
     'ldap_extension_warning' => 'It does not look like the LDAP extension is installed or enabled on this server. You can still save your settings, but you will need to enable the LDAP extension for PHP before LDAP syncing or login will work.',
     'ldap_ad' => 'LDAP/AD',
+    'ldap_test_label' => 'Test LDAP Sync',
+    'ldap_test_login' => ' Test LDAP Login',
+    'ldap_username_placeholder' => 'LDAP Username',
+    'ldap_password_placeholder' => 'LDAP Password',
     'employee_number' => 'Employee Number',
     'create_admin_user' => 'Create a User ::',
     'create_admin_success' => 'Success! Your admin user has been added!',
@@ -342,6 +354,8 @@ return [
     'setup_migration_create_user' => 'Next: Create User',
     'ldap_settings_link' => 'LDAP Settings Page',
     'slack_test' => 'Test <i class="fab fa-slack"></i> Integration',
+    'status_label_name' => 'Status Label Name',
+    'super_admin_only'  => 'Super Admin Only',
     'label2_enable'           => 'New Label Engine',
     'label2_enable_help'      => 'Switch to the new label engine. <b>Note: You will need to save this setting before setting others.</b>',
     'label2_template'         => 'Template',
@@ -356,12 +370,15 @@ return [
     'label2_2d_type'          => '2D Barcode Type',
     'label2_2d_type_help'     => 'Format for 2D barcodes',
     'label2_2d_target'        => '2D Barcode Target',
-    'label2_2d_target_help'   => 'The URL the 2D barcode points to when scanned',
+    'label2_2d_target_help'   => 'The data that will be contained in the 2D barcode',
     'label2_fields'           => 'Field Definitions',
     'label2_fields_help'      => 'Fields can be added, removed, and reordered in the left column. For each field, multiple options for Label and DataSource can be added, removed, and reordered in the right column.',
+    'purge_barcodes' => 'Purge Barcodes',
     'help_asterisk_bold'    => 'Text entered as <code>**text**</code> will be displayed as bold',
     'help_blank_to_use'     => 'Leave blank to use the value from <code>:setting_name</code>',
     'help_default_will_use' => '<code>:default</code> will use the value from <code>:setting_name</code>. <br>Note that the value of the barcodes must comply with the respective barcode spec in order to be successfully generated. Please see <a href="https://snipe-it.readme.io/docs/barcodes">the documentation <i class="fa fa-external-link"></i></a> for more details. ',
+    'asset_id'              => 'Asset ID',
+    'data'               => 'Data',
     'default'               => 'Default',
     'none'                  => 'None',
     'google_callback_help' => 'This should be entered as the callback URL in your Google OAuth app settings in your organization&apos;s <strong><a href="https://console.cloud.google.com/" target="_blank">Google developer console <i class="fa fa-external-link" aria-hidden="true"></i></a></strong>.',
@@ -373,7 +390,100 @@ return [
     'database_driver' => 'Database Driver',
     'bs_table_storage' => 'Table Storage',
     'timezone' => 'Timezone',
+    'test_mail' => 'Test Mail',
     'profile_edit'          => 'Edit Profile',
     'profile_edit_help'          => 'Allow users to edit their own profiles.',
+    'default_avatar' => 'Custom Default Avatar',
+    'default_avatar_help' => 'This image will be displayed as a profile if a user does not have a profile photo.',
+    'restore_default_avatar' => 'Restore <a href=":default_avatar" data-toggle="lightbox" data-type="image">original system default avatar</a>',
+    'restore_default_avatar_help' => '',
+    'due_checkin_days' => 'Due For Checkin Warning',
+    'due_checkin_days_help' => 'How many days before the expected checkin of an asset should it be listed in the "Due for checkin" page?',
+    'no_groups' => 'No groups have been created yet. Visit <code>Admin Settings > Permission Groups</code> to add one.',
+    'text' => 'Text',
+
+    'username_formats' => [
+        'username_format'		=> 'Username Format',
+        'firstname_lastname_format'	=> 'First Name Last Name (jane.smith)',
+        'first_name_format'	        => 'First Name (jane)',
+        'last_name_format'		=> 'Last Name (doe)',
+        'filastname_format'			=> 'First Initial Last Name (jsmith)',
+        'lastnamefirstinitial_format' =>  'Last Name First Initial (smithj)',
+        'firstname_lastname_underscore_format' => 'First Name Last Name (jane_smith)',
+        'firstinitial.lastname' => 'First Initial Last Name (j.smith)',
+        'lastname_firstinitial' => 'Last Name First Initial (smith_j)',
+        'lastname_dot_firstinitial_format' => 'Last Name First Initial (smith.j)',
+        'firstnamelastname'     => 'First Name Last Name (janesmith)',
+        'firstnamelastinitial'  => 'First Name Last Initial (janes)',
+        'lastnamefirstname'      => 'Last Name.First Name (smith.jane)',
+    ],
+
+    'email_formats' => [
+        'email_format'			=> 'Email Format',
+        'firstname_lastname_format'	=> 'First Name Last Name (jane.smith@example.com)',
+        'first_name_format'		=> 'First Name (jane@example.com)',
+        'last_name_format'		=> 'Last Name (doe@example.com)',
+        'filastname_format'			=> 'First Initial Last Name (jsmith@example.com)',
+        'lastnamefirstinitial_format' =>  'Last Name First Initial (smithj@example.com)',
+        'firstname_lastname_underscore_format' => 'First Name Last Name (jane_smith@example.com)',
+        'firstinitial.lastname' => 'First Initial Last Name (j.smith@example.com)',
+        'lastname_firstinitial' => 'Last Name First Initial (smith_j@example.com)',
+        'lastname_dot_firstinitial_format' => 'Last Name First Initial (smith.j@example.com)',
+        'firstnamelastname'     => 'First Name Last Name (janesmith@example.com)',
+        'firstnamelastinitial'  => 'First Name Last Initial (janes@example.com)',
+        'lastnamefirstname'      => 'Last Name.First Name (smith.jane@example.com)',
+    ],
+
+
+
+    'logo_labels' => [
+        'acceptance_pdf_logo'       => 'PDF Logo',
+        'email_logo'                => 'Email Logo',
+        'label_logo'                => 'Label Logo',
+        'logo'                      => 'Site Logo',
+        'favicon'                   => 'Favicon',
+    ],
+
+    'logo_help' => [
+        'email_logo_size'       => 'Square logos in email look best. ',
+    ],
+
+    'logo_option_types' => [
+        'text' => 'Text',
+        'logo' => 'Logo',
+        'logo_and_text' => 'Logo and Text',
+    ],
+
+
+    'legends' => [
+        'scoping' => 'Scoping',
+        'formats' => 'Default Formats',
+        'profiles' => 'User Profiles',
+        'eula' => 'EULA & Acceptance Preferences',
+        'misc_display' => 'Miscellaneous Display Options',
+        'email' => 'Email Preferences',
+        'checkin' => 'Checkin Preferences',
+        'dashboard' => 'Login & Dashboard Preferences',
+        'misc' => 'Miscellaneous',
+        'logos' => 'Logos & Display',
+        'colors' => 'Colors & Skins',
+        'footer' => 'Footer Preferences',
+        'security' => 'Security Preferences',
+        'general' => 'General',
+        'intervals' => 'Intervals & Thresholds',
+    ],
+
+
+    /* Keywords for settings overview help */
+    'keywords' => [
+        'brand'             => 'footer, logo, print, theme, skin, header, colors, color, css',
+        'general_settings'  => 'company support, signature, acceptance, email format, username format, images, per page, thumbnail, eula, gravatar, tos, dashboard, privacy',
+        'groups'            => 'permissions, permission groups, authorization',
+        'labels'            => 'labels, barcodes, barcode, sheets, print, upc, qr, 1d, 2d',
+        'localization'      => 'localization, currency, local, locale, time zone, timezone, international, internatinalization, language, languages, translation',
+        'php_overview'      => 'phpinfo, system, info',
+        'purge'             => 'permanently delete',
+        'security'          => 'password, passwords, requirements, two factor, two-factor, common passwords, remote login, logout, authentication',
+    ],
 
 ];
diff --git a/resources/lang/ml-IN/admin/settings/message.php b/resources/lang/ml-IN/admin/settings/message.php
index c9b0f34217..58abf14c5c 100644
--- a/resources/lang/ml-IN/admin/settings/message.php
+++ b/resources/lang/ml-IN/admin/settings/message.php
@@ -14,6 +14,9 @@ return [
         'restore_warning'       => 'Yes, restore it. I acknowledge that this will overwrite any existing data currently in the database. This will also log out all of your existing users (including you).',
         'restore_confirm'       => 'Are you sure you wish to restore your database from :filename?'
     ],
+    'restore' => [
+        'success'               => 'Your system backup has been restored. Please log in again.'
+    ],
     'purge' => [
         'error'     => 'An error has occurred while purging. ',
         'validation_failed'     => 'Your purge confirmation is incorrect. Please type the word "DELETE" in the confirmation box.',
@@ -33,6 +36,9 @@ return [
         'testing_authentication' => 'Testing LDAP Authentication...',
         'authentication_success' => 'User authenticated against LDAP successfully!'
     ],
+    'labels' => [
+        'null_template' => 'Label template not found. Please select a template.',
+        ],
     'webhook' => [
         'sending' => 'Sending :app test message...',
         'success' => 'Your :webhook_name Integration works!',
@@ -42,5 +48,12 @@ return [
         'error' => 'Something went wrong. :app responded with: :error_message',
         'error_redirect' => 'ERROR: 301/302 :endpoint returns a redirect. For security reasons, we don’t follow redirects. Please use the actual endpoint.',
         'error_misc' => 'Something went wrong. :( ',
-    ]
+        'webhook_fail' => ' webhook notification failed: Check to make sure the URL is still valid.',
+        'webhook_channel_not_found' => ' webhook channel not found.',
+        'ms_teams_deprecation' => 'The selected Microsoft Teams webhook URL will be deprecated Dec 31st, 2025. Please use a workflow URL. Microsoft\'s documentation on creating a workflow can be found <a href="https://support.microsoft.com/en-us/office/create-incoming-webhooks-with-workflows-for-microsoft-teams-8ae491c7-0394-4861-ba59-055e33f75498" target="_blank"> here.</a>',
+    ],
+    'location_scoping' => [
+        'not_saved' => 'Your settings were not saved.',
+        'mismatch' => 'There is 1 item in the database that need your attention before you can enable location scoping.|There are :count items in the database that need your attention before you can enable location scoping.',
+    ],
 ];
diff --git a/resources/lang/ml-IN/admin/statuslabels/table.php b/resources/lang/ml-IN/admin/statuslabels/table.php
index 27befb5ef7..1a0fab891e 100644
--- a/resources/lang/ml-IN/admin/statuslabels/table.php
+++ b/resources/lang/ml-IN/admin/statuslabels/table.php
@@ -1,14 +1,14 @@
 <?php
 
 return array(
-    'about'      	=> 'About Status Labels',
+    'about'      	=> 'About Status Types',
     'archived'      	=> 'Archived',
     'create'      	=> 'Create Status Label',
     'color'      	=> 'Chart Color',
     'default_label' => 'Default Label',
     'default_label_help' => 'This is used to ensure your most commonly used status labels appear at the top of the select box when creating/editing assets.',
     'deployable'      	=> 'Deployable',
-    'info'      	=> 'Status labels are used to describe the various states your assets could be in. They may be out for repair, lost/stolen, etc. You can create new status labels for deployable, pending and archived assets.',
+    'info'      	=> 'Status label types are used to describe the various states your assets could be in. They may be out for repair, lost/stolen, etc. You can create new status labels for your deployable, pending and archived assets according to your own workflow. For more information, <a href="https://snipe-it.readme.io/docs/overview#status-labels" target="_blank">see the documentation <i class="fa fa-external-link"></i></a>.',
     'name'      	=> 'Status Name',
     'pending'      	=> 'Pending',
     'status_type'   => 'Status Type',
diff --git a/resources/lang/ml-IN/admin/users/general.php b/resources/lang/ml-IN/admin/users/general.php
index b097ccec69..14f36cf151 100644
--- a/resources/lang/ml-IN/admin/users/general.php
+++ b/resources/lang/ml-IN/admin/users/general.php
@@ -19,6 +19,8 @@ return [
     'print_assigned'    => 'Print All Assigned',
     'email_assigned'    => 'Email List of All Assigned',
     'user_notified'     => 'User has been emailed a list of their currently assigned items.',
+    'users_notified'    => 'The user has been emailed a list of their currently assigned items.|:count users have been emailed a list of their currently assigned items.',
+    'users_notified_warning' => ':count user has been emailed a list of their currently assigned items, however :no_email users did not have an email address so could not be emailed.|:count users have been emailed a list of their currently assigned items, however :no_email user(s) did not have an email address so could not be emailed.',
     'auto_assign_label' => 'Include this user when auto-assigning eligible licenses',
     'auto_assign_help'  => 'Skip this user in auto assignment of licenses',
     'software_user'     => 'Software Checked out to :name',
diff --git a/resources/lang/ml-IN/admin/users/message.php b/resources/lang/ml-IN/admin/users/message.php
index 4d014775bd..b6ddad3aac 100644
--- a/resources/lang/ml-IN/admin/users/message.php
+++ b/resources/lang/ml-IN/admin/users/message.php
@@ -6,7 +6,7 @@ return array(
     'declined'                  => 'You have successfully declined this asset.',
     'bulk_manager_warn'	        => 'Your users have been successfully updated, however your manager entry was not saved because the manager you selected was also in the user list to be edited, and users may not be their own manager. Please select your users again, excluding the manager.',
     'user_exists'               => 'User already exists!',
-    'user_not_found'            => 'User does not exist.',
+    'user_not_found'            => 'User does not exist or you do not have permission view them.',
     'user_login_required'       => 'The login field is required',
     'user_has_no_assets_assigned' => 'No assets currently assigned to user.',
     'user_password_required'    => 'The password is required.',
@@ -53,6 +53,7 @@ return array(
         'ldap_could_not_search' => 'Could not search the LDAP server. Please check your LDAP server configuration in the LDAP config file. <br>Error from LDAP Server:',
         'ldap_could_not_get_entries' => 'Could not get entries from the LDAP server. Please check your LDAP server configuration in the LDAP config file. <br>Error from LDAP Server:',
         'password_ldap' => 'The password for this account is managed by LDAP/Active Directory. Please contact your IT department to change your password. ',
+        'multi_company_items_assigned' => 'This user has items assigned that belong to a different company. Please check them in or edit their company.'
     ),
 
     'deletefile' => array(
diff --git a/resources/lang/ml-IN/admin/users/table.php b/resources/lang/ml-IN/admin/users/table.php
index 7c5fb2cad5..094cdbc412 100644
--- a/resources/lang/ml-IN/admin/users/table.php
+++ b/resources/lang/ml-IN/admin/users/table.php
@@ -22,7 +22,7 @@ return array(
     'managed_locations'     => 'Managed Locations',
     'managed_users'         => 'Managed Users',
     'name' 					=> 'Name',
-    'nogroup'               => 'No groups have been created yet. To add one, visit: ',
+    'nogroup'               => 'No groups have been created yet. To add one, visit:',
     'notes'                 => 'Notes',
     'password_confirm' 		=> 'Confirm Password',
     'password' 				=> 'Password',
diff --git a/resources/lang/ml-IN/auth.php b/resources/lang/ml-IN/auth.php
index db310aa1bb..14d8acfce0 100644
--- a/resources/lang/ml-IN/auth.php
+++ b/resources/lang/ml-IN/auth.php
@@ -15,6 +15,6 @@ return array(
 
     'failed' => 'These credentials do not match our records.',
     'password' => 'The provided password is incorrect.',
-    'throttle' => 'Too many login attempts. Please try again in :seconds seconds.',
+    'throttle' => 'Too many login attempts. Please try again in :minutes minute(s).',
 
 );
diff --git a/resources/lang/ml-IN/auth/message.php b/resources/lang/ml-IN/auth/message.php
index 588c9069ca..08f638d058 100644
--- a/resources/lang/ml-IN/auth/message.php
+++ b/resources/lang/ml-IN/auth/message.php
@@ -6,8 +6,6 @@ return array(
     'account_not_found'      => 'The username or password is incorrect.',
     'account_not_activated'  => 'This user account is not activated.',
     'account_suspended'      => 'This user account is suspended.',
-    'account_banned'         => 'This user account is banned.',
-    'throttle'               => 'Too many failed login attempts. Please try again in :minutes minutes.',
 
     'two_factor' => array(
         'already_enrolled'      => 'Your device is already enrolled.',
diff --git a/resources/lang/ml-IN/button.php b/resources/lang/ml-IN/button.php
index 22821b8157..8a838e8faf 100644
--- a/resources/lang/ml-IN/button.php
+++ b/resources/lang/ml-IN/button.php
@@ -7,6 +7,7 @@ return [
     'checkin_and_delete'  	    => 'Checkin All / Delete User',
     'delete'  	                => 'Delete',
     'edit'    	                => 'Edit',
+    'clone'    	                => 'Clone',
     'restore' 	                => 'Restore',
     'remove'                    => 'Remove',
     'request'                   => 'Request',
@@ -21,4 +22,13 @@ return [
     'add_maintenance'           => 'Add Maintenance',
     'append'                    => 'Append',
     'new'                       => 'New',
+    'var' => [
+        'clone'     => 'Clone :item_type',
+        'edit'      => 'Edit :item_type',
+        'delete'    => 'Delete :item_type',
+        'restore'   => 'Restore :item_type',
+        'create'    => 'Create New :item_type',
+        'checkout'  => 'Checkout :item_type',
+        'checkin'   => 'Checkin :item_type',
+    ]
 ];
diff --git a/resources/lang/ml-IN/general.php b/resources/lang/ml-IN/general.php
index 964016eb5b..9603b989ca 100644
--- a/resources/lang/ml-IN/general.php
+++ b/resources/lang/ml-IN/general.php
@@ -10,7 +10,7 @@ return [
     'action'                => 'Action',
     'activity_report'		=> 'Activity Report',
     'address'				=> 'വിലാസം',
-    'admin'					=> 'Admin',
+    'admin'					=> 'Admin Settings',
     'admin_tooltip'			=> 'This user has admin privileges',
     'superuser'				=> 'Superuser',
     'superuser_tooltip'		=> 'This user has superuser privileges',
@@ -23,13 +23,16 @@ return [
     'asset_models'			=> 'Asset Models',
     'asset_model'			=> 'Model',
     'asset'					=> 'Asset',
+    'asset_previous'        => 'Asset (Previously Assigned)',
     'asset_report'          => 'Asset Report',
     'asset_tag'				=> 'Asset Tag',
     'asset_tags'            => 'Asset Tags',
     'assets_available'		=> 'Assets available',
     'accept_assets'         => 'Accept Assets :name',
     'accept_assets_menu'    => 'Accept Assets',
+    'accept_item'           => 'Accept Item',
     'audit'				    => 'Audit',
+    'audits'				=> 'Audits',
     'audit_report'			=> 'Audit Log',
     'assets'				=> 'Assets',
     'assets_audited'        => 'assets audited',
@@ -61,9 +64,12 @@ return [
     'changepassword'  		=> 'Change Password',
     'checkin'  				=> 'Checkin',
     'checkin_from'  		=> 'Checkin from',
+    'checkin_note'  		=> 'Checkin Note',
+    'checkout_note'  		=> 'Checkout Note',
     'checkout'  			=> 'Checkout',
     'checkouts_count'       => 'Checkouts',
     'checkins_count'        => 'Checkins',
+    'checkin_and_delete'  	=> 'Checkin and Delete',
     'user_requests_count'   => 'Requests',
     'city'  				=> 'പട്ടണം',
     'click_here'			=> 'Click here',
@@ -77,7 +83,7 @@ return [
     'consumables'			=> 'Consumables',
     'country'  				=> 'രാജ്യം',
     'could_not_restore'     => 'Error restoring :item_type: :error',
-    'not_deleted'           => 'The :item_type is not deleted so it cannot be restored',
+    'not_deleted'           => 'The :item_type was not deleted and therefore cannot be restored',
     'create'				=> 'Create New',
     'created'               => 'Item Created',
     'created_asset'			=> 'created asset',
@@ -86,11 +92,13 @@ return [
     'record_created' 		=> 'Record Created',
     'updated_at' 			=> 'Updated at',
     'currency'  			=> '$', // this is deprecated
+    'currency_text'  		=> 'Currency', //
     'current'  				=> 'Current',
     'current_password'      => 'Current Password',
     'customize_report'      => 'Customize Report',
     'custom_report'         => 'Custom Asset Report',
     'dashboard'				=> 'Dashboard',
+    'data_source'           => 'Data Source',
     'days'      			=> 'days',
     'days_to_next_audit'    => 'Days to Next Audit',
     'date'					=> 'Date',
@@ -98,7 +106,7 @@ return [
     'debug_warning_text'    => 'This application is running in production mode with debugging enabled. This can expose sensitive data if your application is accessible to the outside world. Disable debug mode by setting the <code>APP_DEBUG</code> value in your <code>.env</code> file to <code>false</code>.',
     'delete'  				=> 'Delete',
     'delete_confirm'  		=> 'Are you sure you wish to delete :item?',
-    'delete_confirm_no_undo' => 'Are you sure you wish to delete :item? This can not be undone.',
+    'delete_confirm_no_undo' => 'Are you sure, you wish to delete :item? This cannot be undone.',
     'deleted'  				=> 'Deleted',
     'delete_seats'  		=> 'Deleted Seats',
     'deletion_failed'       => 'Deletion failed',
@@ -114,29 +122,13 @@ return [
     'editprofile'  			=> 'Edit Your Profile',
     'eol'					=> 'EOL',
     'email_domain'			=> 'Email Domain',
-    'email_format'			=> 'Email Format',
     'employee_number'       => 'Employee Number',
     'email_domain_help'		=> 'This is used to generate email addresses when importing',
     'error'				    => 'Error',
     'exclude_archived'      => 'Exclude Archived Assets',
     'exclude_deleted'       => 'Exclude Deleted Assets',
     'example'				=> 'Example: ',
-    'filastname_format'			=> 'First Initial Last Name (jsmith@example.com)',
-    'firstname_lastname_format'	=> 'First Name Last Name (jane.smith@example.com)',
-    'firstname_lastname_underscore_format' => 'First Name Last Name (jane_smith@example.com)',
-    'lastnamefirstinitial_format' =>  'Last Name First Initial (smithj@example.com)',
-    'firstintial_dot_lastname_format' => 'First Initial Last Name (j.smith@example.com)',
-    'firstname_lastname_display'	=> 'First Name Last Name (Jane Smith)',
-    'lastname_firstname_display'	=> 'Last Name First Name (Smith Jane)',
-    'name_display_format'	=> 'Name Display Format',
-    'first'					=> 'First',
-    'firstnamelastname'     => 'First Name Last Name (janesmith@example.com)',
-    'lastname_firstinitial' => 'Last Name First Initial (smith_j@example.com)',
-    'firstinitial.lastname' => 'First Initial Last Name (j.smith@example.com)',
-    'firstnamelastinitial'  => 'First Name Last Initial (janes@example.com)',
-    'lastnamefirstname'      => 'Last Name First Name (smith.jane@example.com)',
-    'first_name'			=> 'First Name',
-    'first_name_format'		=> 'First Name (jane@example.com)',
+
     'files'                 => 'Files',
     'file_name'				=> 'File',
     'file_type'             => 'File Type',
@@ -156,9 +148,9 @@ return [
     'image_delete'         	=> 'Delete Image',
     'include_deleted'       => 'Include Deleted Assets',
     'image_upload'         	=> 'Upload Image',
-    'filetypes_accepted_help'    => 'Accepted filetype is :types. Max upload size allowed is :size.|Accepted filetypes are :types. Max upload size allowed is :size.',
-    'filetypes_size_help'   => 'Max upload size allowed is :size.',
-    'image_filetypes_help'  => 'Accepted filetypes are jpg, webp, png, gif, svg, and avif. Max upload size allowed is :size.',
+    'filetypes_accepted_help'    => 'Accepted filetype is :types. The maximum size allowed is :size.|Accepted filetypes are :types. The maximum upload size allowed is :size.',
+    'filetypes_size_help'   => 'The maximum upload size allowed is :size.',
+    'image_filetypes_help'  => 'Accepted Filetypes are jpg, webp, png, gif, svg, and avif. The maximum upload size allowed is :size.',
     'unaccepted_image_type'  => 'This image file was not readable. Accepted filetypes are jpg, webp, png, gif, and svg. The mimetype of this file is: :mimetype.',
     'import'         	    => 'Import',
     'import_this_file'      => 'Map fields and process this file',
@@ -178,12 +170,17 @@ return [
     'last'					=> 'Last',
     'last_login'            => 'Last Login',
     'last_name'             => 'Last Name',
+    'firstname_lastname_display'	=> 'First Name Last Name (Jane Smith)',
+    'lastname_firstname_display'	=> 'Last Name First Name (Smith Jane)',
+    'name_display_format'	=> 'Name Display Format',
+    'first'					=> 'First',
+    'first_name'			=> 'First Name',
     'license'				=> 'License',
     'license_report'        => 'License Report',
     'licenses_available'	=> 'Licenses available',
     'licenses'				=> 'Licenses',
     'list_all'				=> 'List All',
-    'loading'				=> 'Loading... please wait....',
+    'loading'				=> 'Loading... please wait...',
     'lock_passwords'        => 'This field value will not be saved in a demo installation.',
     'feature_disabled'      => 'This feature has been disabled for the demo installation.',
     'location'              => 'Location',
@@ -193,7 +190,7 @@ return [
     'logout'				=> 'Logout',
     'lookup_by_tag'     => 'Lookup by Asset Tag',
     'maintenances'          => 'Maintenances',
-    'manage_api_keys'       => 'Manage API Keys',
+    'manage_api_keys'       => 'Manage API keys',
     'manufacturer'			=> 'Manufacturer',
     'manufacturers'			=> 'Manufacturers',
     'markdown'				=> 'This field allows <a href="https://help.github.com/articles/github-flavored-markdown/">Github flavored markdown</a>.',
@@ -215,6 +212,14 @@ return [
     'no_results'			=> 'No Results.',
     'no'  					=> 'No',
     'notes'  				=> 'Notes',
+    'note_added'            => 'Note Added',
+    'options'				=> 'Options',
+    'preview'				=> 'Preview',
+    'add_note'              => 'Add Note',
+    'note_edited'            => 'Note Edited',
+    'edit_note'              => 'Edit Note',
+    'note_deleted'            => 'Note Deleted',
+    'delete_note'              => 'Delete Note',
     'order_number'          => 'Order Number',
     'only_deleted'          => 'Only Deleted Assets',
     'page_menu'				=> 'Showing _MENU_ items',
@@ -229,7 +234,7 @@ return [
     'purchase_date'         => 'Purchase Date',
     'qty'		            => 'QTY',
     'quantity'		        => 'Quantity',
-    'quantity_minimum'      => 'You have :count items below or almost below minimum quantity levels',
+    'quantity_minimum'      => 'You have one item below or almost below minimum quantity levels|You have :count items below or almost below minimum quantity levels',
     'quickscan_checkin'  	=> 'Quick Scan Checkin',
     'quickscan_checkin_status'  	=> 'Checkin Status',
     'ready_to_deploy'		=> 'Ready to Deploy',
@@ -254,7 +259,7 @@ return [
     'select_all'            => 'Select All',
     'search'				=> 'Search',
     'select_category'       => 'Select a Category',
-    'select_datasource' => 'Select a Datasource',
+    'select_datasource' => 'Select a data source',
     'select_department'     => 'Select a Department',
     'select_depreciation'	=> 'Select a Depreciation Type',
     'select_location'		=> 'Select a Location',
@@ -274,13 +279,15 @@ return [
     'signed_off_by'         => 'Signed Off By',
     'skin'       			=> 'Skin',
     'webhook_msg_note'        => 'A notification will be sent via webhook',
-    'webhook_test_msg'        => 'Oh hai! Looks like your :app integration with Snipe-IT is working!',
+    'webhook_test_msg'        => 'Oh hai! It looks like your :app integration with Snipe-IT is working!',
     'some_features_disabled' => 'DEMO MODE: Some features are disabled for this installation.',
     'site_name'				=> 'Site Name',
     'state'  				=> 'സംസ്ഥാനം',
     'status_labels'			=> 'Status Labels',
+    'status_label'			=> 'Status Label',
     'status'    			=> 'Status',
     'accept_eula'           => 'Acceptance Agreement',
+    'show_or_hide_eulas' => 'Show/Hide EULAs',
     'supplier'              => 'Supplier',
     'suppliers'  			=> 'Suppliers',
     'sure_to_delete'        => 'Are you sure you wish to delete',
@@ -296,9 +303,9 @@ return [
     'type'  				=> 'Type',
     'undeployable'			=> 'Un-deployable',
     'unknown_admin'			=> 'Unknown Admin',
-    'username_format'		=> 'Username Format',
     'username'              => 'Username',
     'update'                => 'Update',
+    'updating_item' => 'Updating :item',
     'upload_filetypes_help'      => 'Allowed filetypes are png, gif, jpg, jpeg, doc, docx, pdf, xls, xlsx, txt, lic, xml, zip, rtf and rar. Max upload size allowed is :size.',
     'uploaded'              => 'Uploaded',
     'user'					=> 'User',
@@ -323,10 +330,10 @@ return [
     'token_expired'         => 'Your form session has expired. Please try again.',
     'login_enabled'         => 'Login Enabled',
     'audit_due'             => 'Due for Audit',
-    'audit_due_days'        => 'Assets Due for Audit Within :days Day|Assets Due for Audit Within :days Days',
+    'audit_due_days'        => '{}Assets Due or Overdue for Audit|[1]Assets Due or Overdue for Audit Within a Day|[2,*]Assets Due or Overdue for Audit Within :days Days',
     'checkin_due'           => 'Due for Checkin',
     'checkin_overdue'       => 'Overdue for Checkin',
-    'checkin_due_days'      => 'Assets Due for Checkin Within :days Day|Assets Due for Checkin Within :days Days',
+    'checkin_due_days'      => '{}Due for Checkin|[1]Assets Due for Checkin Within :days Day|[2,*]Assets Due for Checkin Within :days Days',
     'audit_overdue'         => 'Overdue for Audit',
     'accept'                => 'Accept :asset',
     'i_accept'              => 'I accept',
@@ -339,16 +346,16 @@ return [
     'view_all'              => 'view all',
     'hide_deleted'          => 'Hide Deleted',
     'email'                 => 'Email',
-    'do_not_change'         => 'Do Not Change',
-    'bug_report'            => 'Report a Bug',
+    'do_not_change'         => 'Do not change',
+    'bug_report'            => 'Report a bug',
     'user_manual'           => 'User\'s Manual',
     'setup_step_1'          => 'Step 1',
     'setup_step_2'          => 'Step 2',
     'setup_step_3'          => 'Step 3',
     'setup_step_4'          => 'Step 4',
     'setup_config_check'    => 'Configuration Check',
-    'setup_create_database' => 'Create Database Tables',
-    'setup_create_admin'    => 'Create Admin User',
+    'setup_create_database' => 'Create database tables',
+    'setup_create_admin'    => 'Create an admin user',
     'setup_done'            => 'Finished!',
     'bulk_edit_about_to'    => 'You are about to edit the following: ',
     'checked_out'           => 'Checked Out',
@@ -383,6 +390,8 @@ return [
     'new_license'           => 'New License',
     'new_accessory'         => 'New Accessory',
     'new_consumable'        => 'New Consumable',
+    'new_component'         => 'New Component',
+    'new_user'              => 'New User',
     'collapse'              => 'Collapse',
     'assigned'              => 'Assigned',
     'asset_count'           => 'Asset Count',
@@ -418,19 +427,20 @@ return [
     'bulk_soft_delete'      =>'Also soft-delete these users. Their asset history will remain intact unless/until you purge deleted records in the Admin Settings.',
     'bulk_checkin_delete_success' => 'Your selected users have been deleted and their items have been checked in.',
     'bulk_checkin_success' => 'The items for the selected users have been checked in.',
-    'set_to_null'           => 'Delete values for this asset|Delete values for all :asset_count assets ',
+    'set_to_null'           => 'Delete values for this selection|Delete values for all :selection_count selections ',
     'set_users_field_to_null'  => 'Delete :field values for this user|Delete :field values for all :user_count users ',
     'na_no_purchase_date'   => 'N/A - No purchase date provided',
     'assets_by_status'      => 'Assets by Status',
     'assets_by_status_type'      => 'Assets by Status Type',
     'pie_chart_type'        => 'Dashboard Pie Chart Type',
     'hello_name'            => 'Hello, :name!',
-    'unaccepted_profile_warning'   => 'You have :count items requiring acceptance. Click here to accept or decline them',
+    'unaccepted_profile_warning'   => 'You have one item requiring acceptance. Click here to accept or decline it | You have :count items requiring acceptance. Click here to accept or decline them',
     'start_date'            => 'Start Date',
     'end_date'            => 'End Date',
     'alt_uploaded_image_thumbnail' => 'Uploaded thumbnail',
     'placeholder_kit'       => 'Select a kit',
     'file_not_found'        => 'File not found',
+    'log_record_not_found'  => 'No record for that log entry was found.',
     'preview_not_available' => '(no preview)',
     'setup'                 => 'Setup',
     'pre_flight'            => 'Pre-Flight',
@@ -512,7 +522,7 @@ return [
     'checked_out_to_fields' => 'Checked Out To Fields',
     'percent_complete' => '% complete',
     'uploading' => 'Uploading... ',
-    'upload_error' => 'Error uploading file. Please check that there are no empty rows and that no column names are duplicated.',
+    'upload_error' => 'Error uploading file. Please check that you have no empty rows or duplicated column names in your CSV, and that the server permissions allow uploads.',
     'copy_to_clipboard' => 'Copy to Clipboard',
     'copied' => 'Copied!',
     'status_compatibility' => 'If assets are already assigned, they cannot be changed to a non-deployable status type and this value change will be skipped.',
@@ -549,6 +559,71 @@ return [
         'license_seats'  => ':count License Seat|:count License Seats',
         'consumables'  => ':count Consumable|:count Consumables',
         'components'  => ':count Component|:count Components',
-    ]
+    ],
+
+    'more_info' => 'More Info',
+    'quickscan_bulk_help' => 'Checking this box will edit the asset record to reflect this new location. Leaving it unchecked will simply note the location in the audit log. Note that if this asset is checked out, it will not change the location of the person, asset or location it is checked out to.',
+    'whoops' => 'Whoops!',
+    'something_went_wrong' => 'Something went wrong with your request.',
+    'close' => 'Close',
+    'expires' => 'Expires',
+    'map_fields'=> 'Map :item_type Fields',
+    'remaining_var' => ':count Remaining',
+    'label' => 'Label',
+    'import_asset_tag_exists' => 'An asset with the asset tag :asset_tag already exists and an update was not requested. No change was made.',
+    'countries_manually_entered_help' => 'Values with an asterisk (*) were manually entered and do not match existing ISO 3166 dropdown values',
+    'accessories_assigned' => 'Assigned Accessories',
+    'user_managed_passwords' => 'Password Management',
+    'user_managed_passwords_disallow' => 'Disallow users from managing their own passwords',
+    'user_managed_passwords_allow' => 'Allow users to manage their own passwords',
+    'from' => 'From',
+    'by' => 'By',
+
+// Add form placeholders here
+    'placeholders' => [
+        'notes'  => 'Add a note',
+    ],
+
+    'breadcrumb_button_actions' => [
+        'edit_item' => 'Edit :name',
+        'checkout_item' => 'Checkout :name',
+        'checkin_item' => 'Checkin :name',
+    ],
+
+    'skins' => [
+        'site_default' => 'Site Default',
+        'default_blue' => 'Default Blue',
+        'blue_dark' => 'Blue (Dark Mode)',
+        'green' => 'Green Dark',
+        'green_dark' => 'Green (Dark Mode)',
+        'red' => 'Red Dark',
+        'red_dark' => 'Red (Dark Mode)',
+        'orange' => 'Orange Dark',
+        'orange_dark' => 'Orange (Dark Mode)',
+        'black' => 'Black',
+        'black_dark' => 'Black (Dark Mode)',
+        'purple' => 'Purple',
+        'purple_dark' => 'Purple (Dark Mode)',
+        'yellow' => 'Yellow',
+        'yellow_dark' => 'Yellow (Dark Mode)',
+        'high_contrast' => 'High Contrast',
+
+    ],
+
+    'select_all_none' => 'Select/Unselect All',
+    'generic_model_not_found' => 'That :model was not found or you do not have permission to access it',
+    'deleted_models' => 'Deleted Asset Models',
+    'deleted_users' => 'Deleted Users',
+    'cost_each' => ':amount each',
+    'remove_current_image' => 'Remove current :type image',
+
+    'seeding' => [
+        'manufacturers' => [
+            'button' => 'Create Manufacturers',
+            'prompt' => 'You do not have any manufacturers yet. Would you like to seed a list of common manufacturers? (THIS WILL OVERWRITE EXISTING MANUFACTURERS, including those that have been soft-deleted.)',
+            'success' => 'Manufacturers seeded successfully',
+            'error' => 'Could not seed manufacturers. A manufacturer record already exists and seeding would overwrite it.|Could not seed manufacturers. :count manufacturer records already exist and seeding would overwrite them.',
+        ],
+    ],
 
 ];
diff --git a/resources/lang/ml-IN/localizations.php b/resources/lang/ml-IN/localizations.php
index f1232dd138..827ed4fca1 100644
--- a/resources/lang/ml-IN/localizations.php
+++ b/resources/lang/ml-IN/localizations.php
@@ -2,7 +2,7 @@
 
 return [
 
-    'select_language' => 'Select a language',
+    'select_language' => 'Select a Language',
     'languages' => [
         'en-US'=> 'English, US',
         'en-GB'=> 'English, UK',
@@ -40,7 +40,9 @@ return [
         'ms-MY'=> 'Malay',
         'mi-NZ'=> 'Maori',
         'mn-MN'=> 'Mongolian',
-        'no-NO'=> 'Norwegian',
+        'nb-NO'=> 'Norwegian Bokmål',
+        'om-ET' => 'Oromo (Ethiopian)',
+        //'nn-NO'=> 'Norwegian Nynorsk',
         'fa-IR'=> 'Persian',
         'pl-PL'=> 'Polish',
         'pt-PT'=> 'Portuguese',
@@ -66,7 +68,7 @@ return [
         'zu-ZA'=> 'Zulu',
     ],
 
-    'select_country' => 'Select a country',
+    'select_country' => 'Select a Country',
     
     'countries' => [
         'AC'=>'Ascension Island',
@@ -133,6 +135,7 @@ return [
         'EC'=>'Ecuador',
         'EE'=>'Estonia',
         'EG'=>'Egypt',
+        'GB-ENG'=>'England',
         'ER'=>'Eritrea',
         'ES'=>'Spain',
         'ET'=>'Ethiopia',
@@ -231,6 +234,7 @@ return [
         'NG'=>'Nigeria',
         'NI'=>'Nicaragua',
         'NL'=>'Netherlands',
+        'GB-NIR' => 'Northern Ireland',
         'NO'=>'Norway',
         'NP'=>'Nepal',
         'NR'=>'Nauru',
@@ -258,7 +262,7 @@ return [
         'RU'=>'Russian Federation',
         'RW'=>'Rwanda',
         'SA'=>'Saudi Arabia',
-        'UK'=>'Scotland',
+        'GB-SCT'=>'Scotland',
         'SB'=>'Solomon Islands',
         'SC'=>'Seychelles',
         'SS'=>'South Sudan',
@@ -310,6 +314,7 @@ return [
         'VI'=>'Virgin Islands (U.S.)',
         'VN'=>'Viet Nam',
         'VU'=>'Vanuatu',
+        'GB-WLS' =>'Wales',
         'WF'=>'Wallis And Futuna Islands',
         'WS'=>'Samoa',
         'YE'=>'Yemen',
diff --git a/resources/lang/ml-IN/mail.php b/resources/lang/ml-IN/mail.php
index 759ff0f5e8..797f735a2b 100644
--- a/resources/lang/ml-IN/mail.php
+++ b/resources/lang/ml-IN/mail.php
@@ -23,24 +23,25 @@ return [
     'Item_Requested' => 'Item Requested',
     'License_Checkin_Notification' => 'License checked in',
     'License_Checkout_Notification' => 'License checked out',
+    'license_for'   => 'License for',
     'Low_Inventory_Report' => 'Low Inventory Report',
     'a_user_canceled' => 'A user has canceled an item request on the website',
     'a_user_requested' => 'A user has requested an item on the website',
     'acceptance_asset_accepted' => 'A user has accepted an item',
     'acceptance_asset_declined' => 'A user has declined an item',
-    'accessory_name' => 'Accessory Name:',
-    'additional_notes' => 'Additional Notes:',
+    'accessory_name' => 'Accessory Name',
+    'additional_notes' => 'Additional Notes',
     'admin_has_created' => 'An administrator has created an account for you on the :web website.',
-    'asset' => 'Asset:',
-    'asset_name' => 'Asset Name:',
+    'asset' => 'Asset',
+    'asset_name' => 'Asset Name',
     'asset_requested' => 'Asset requested',
     'asset_tag' => 'Asset Tag',
     'assets_warrantee_alert' => 'There is :count asset with a warranty expiring in the next :threshold days.|There are :count assets with warranties expiring in the next :threshold days.',
     'assigned_to' => 'Assigned To',
     'best_regards' => 'Best regards,',
-    'canceled' => 'Canceled:',
-    'checkin_date' => 'Checkin Date:',
-    'checkout_date' => 'Checkout Date:',
+    'canceled' => 'Canceled',
+    'checkin_date' => 'Checkin Date',
+    'checkout_date' => 'Checkout Date',
     'checkedout_from' => 'Checked out from',
     'checkedin_from'  => 'Checked in from',
     'checked_into' => 'Checked into',
@@ -49,27 +50,30 @@ return [
     'click_to_confirm' => 'Please click on the following link to confirm your :web account:',
     'current_QTY' => 'Current QTY',
     'days' => 'Days',
-    'expecting_checkin_date' => 'Expected Checkin Date:',
+    'expecting_checkin_date' => 'Expected Checkin Date',
     'expires' => 'Expires',
     'hello' => 'Hello',
     'hi' => 'Hi',
     'i_have_read' => 'I have read and agree to the terms of use, and have received this item.',
     'inventory_report' => 'Inventory Report',
-    'item' => 'Item:',
+    'item' => 'Item',
+    'item_checked_reminder' => 'This is a reminder that you currently have :count items checked out to you that you have not accepted or declined. Please click the link below to confirm your decision.',
     'license_expiring_alert' => 'There is :count license expiring in the next :threshold days.|There are :count licenses expiring in the next :threshold days.',
     'link_to_update_password' => 'Please click on the following link to update your :web password:',
-    'login' => 'Login:',
+    'login' => 'Login',
     'login_first_admin' => 'Login to your new Snipe-IT installation using the credentials below:',
     'low_inventory_alert' => 'There is :count item that is below minimum inventory or will soon be low.|There are :count items that are below minimum inventory or will soon be low.',
     'min_QTY' => 'Min QTY',
     'name' => 'Name',
     'new_item_checked' => 'A new item has been checked out under your name, details are below.',
+    'new_item_checked_with_acceptance' => 'A new item has been checked out under your name that requires acceptance, details are below.',
+    'recent_item_checked' => 'An item was recently checked out under your name that requires acceptance, details are below.',
     'notes' => 'Notes',
-    'password' => 'Password:',
+    'password' => 'Password',
     'password_reset' => 'Password Reset',
     'read_the_terms' => 'Please read the terms of use below.',
     'read_the_terms_and_click' => 'Please read the terms of use below, and click on the link at the bottom to confirm that you read and agree to the terms of use, and have received the asset.',
-    'requested' => 'Requested:',
+    'requested' => 'Requested',
     'reset_link' => 'Your Password Reset Link',
     'reset_password' => 'Click here to reset your password:',
     'rights_reserved' => 'All rights reserved.',
@@ -86,8 +90,10 @@ return [
     'upcoming-audits' => 'There is :count asset that is coming up for audit within :threshold days.|There are :count assets that are coming up for audit within :threshold days.',
     'user' => 'User',
     'username' => 'Username',
+    'unaccepted_asset_reminder' => 'Reminder: You have Unaccepted Assets.',
     'welcome' => 'Welcome :name',
     'welcome_to' => 'Welcome to :web!',
     'your_assets' => 'View Your Assets',
     'your_credentials' => 'Your Snipe-IT credentials',
+    'mail_sent' => 'Mail sent successfully!',
 ];
diff --git a/resources/lang/ml-IN/validation.php b/resources/lang/ml-IN/validation.php
index 05374e23af..99c847f589 100644
--- a/resources/lang/ml-IN/validation.php
+++ b/resources/lang/ml-IN/validation.php
@@ -13,87 +13,150 @@ return [
     |
     */
 
-    'accepted'             => 'The :attribute must be accepted.',
-    'active_url'           => 'The :attribute is not a valid URL.',
-    'after'                => 'The :attribute must be a date after :date.',
-    'after_or_equal'       => 'The :attribute must be a date after or equal to :date.',
-    'alpha'                => 'The :attribute may only contain letters.',
-    'alpha_dash'           => 'The :attribute may only contain letters, numbers, and dashes.',
-    'alpha_num'            => 'The :attribute may only contain letters and numbers.',
-    'array'                => 'The :attribute must be an array.',
-    'before'               => 'The :attribute must be a date before :date.',
-    'before_or_equal'      => 'The :attribute must be a date before or equal to :date.',
-    'between'              => [
-        'numeric' => 'The :attribute must be between :min - :max.',
-        'file'    => 'The :attribute must be between :min - :max kilobytes.',
-        'string'  => 'The :attribute must be between :min - :max characters.',
-        'array'   => 'The :attribute must have between :min and :max items.',
+    'accepted' => 'The :attribute field must be accepted.',
+    'accepted_if' => 'The :attribute field must be accepted when :other is :value.',
+    'active_url' => 'The :attribute field must be a valid URL.',
+    'after' => 'The :attribute field must be a date after :date.',
+    'after_or_equal' => 'The :attribute field must be a date after or equal to :date.',
+    'alpha' => 'The :attribute field must only contain letters.',
+    'alpha_dash' => 'The :attribute field must only contain letters, numbers, dashes, and underscores.',
+    'alpha_num' => 'The :attribute field must only contain letters and numbers.',
+    'array' => 'The :attribute field must be an array.',
+    'ascii' => 'The :attribute field must only contain single-byte alphanumeric characters and symbols.',
+    'before' => 'The :attribute field must be a date before :date.',
+    'before_or_equal' => 'The :attribute field must be a date before or equal to :date.',
+    'between' => [
+        'array' => 'The :attribute field must have between :min and :max items.',
+        'file' => 'The :attribute field must be between :min and :max kilobytes.',
+        'numeric' => 'The :attribute field must be between :min and :max.',
+        'string' => 'The :attribute field must be between :min and :max characters.',
     ],
-    'boolean'              => 'The :attribute must be true or false.',
-    'confirmed'            => 'The :attribute confirmation does not match.',
-    'date'                 => 'The :attribute is not a valid date.',
-    'date_format'          => 'The :attribute does not match the format :format.',
-    'different'            => 'The :attribute and :other must be different.',
-    'digits'               => 'The :attribute must be :digits digits.',
-    'digits_between'       => 'The :attribute must be between :min and :max digits.',
-    'dimensions'           => 'The :attribute has invalid image dimensions.',
-    'distinct'             => 'The :attribute field has a duplicate value.',
-    'email'                => 'The :attribute format is invalid.',
-    'exists'               => 'The selected :attribute is invalid.',
-    'file'                 => 'The :attribute must be a file.',
-    'filled'               => 'The :attribute field must have a value.',
-    'image'                => 'The :attribute must be an image.',
+    'boolean' => 'The :attribute field must be true or false.',
+    'can' => 'The :attribute field contains an unauthorized value.',
+    'confirmed' => 'The :attribute field confirmation does not match.',
+    'contains' => 'The :attribute field is missing a required value.',
+    'current_password' => 'The password is incorrect.',
+    'date' => 'The :attribute field must be a valid date.',
+    'date_equals' => 'The :attribute field must be a date equal to :date.',
+    'date_format' => 'The :attribute field must match the format :format.',
+    'decimal' => 'The :attribute field must have :decimal decimal places.',
+    'declined' => 'The :attribute field must be declined.',
+    'declined_if' => 'The :attribute field must be declined when :other is :value.',
+    'different' => 'The :attribute field and :other must be different.',
+    'digits' => 'The :attribute field must be :digits digits.',
+    'digits_between' => 'The :attribute field must be between :min and :max digits.',
+    'dimensions' => 'The :attribute field has invalid image dimensions.',
+    'distinct' => 'The :attribute field has a duplicate value.',
+    'doesnt_end_with' => 'The :attribute field must not end with one of the following: :values.',
+    'doesnt_start_with' => 'The :attribute field must not start with one of the following: :values.',
+    'email' => 'The :attribute field must be a valid email address.',
+    'ends_with' => 'The :attribute field must end with one of the following: :values.',
+    'enum' => 'The selected :attribute is invalid.',
+    'exists' => 'The selected :attribute is invalid.',
+    'extensions' => 'The :attribute field must have one of the following extensions: :values.',
+    'file' => 'The :attribute field must be a file.',
+    'filled' => 'The :attribute field must have a value.',
+    'gt' => [
+        'array' => 'The :attribute field must have more than :value items.',
+        'file' => 'The :attribute field must be greater than :value kilobytes.',
+        'numeric' => 'The :attribute field must be greater than :value.',
+        'string' => 'The :attribute field must be greater than :value characters.',
+    ],
+    'gte' => [
+        'array' => 'The :attribute field must have :value items or more.',
+        'file' => 'The :attribute field must be greater than or equal to :value kilobytes.',
+        'numeric' => 'The :attribute field must be greater than or equal to :value.',
+        'string' => 'The :attribute field must be greater than or equal to :value characters.',
+    ],
+    'hex_color' => 'The :attribute field must be a valid hexadecimal color.',
+    'image' => 'The :attribute field must be an image.',
     'import_field_empty'    => 'The value for :fieldname cannot be null.',
-    'in'                   => 'The selected :attribute is invalid.',
-    'in_array'             => 'The :attribute field does not exist in :other.',
-    'integer'              => 'The :attribute must be an integer.',
-    'ip'                   => 'The :attribute must be a valid IP address.',
-    'ipv4'                 => 'The :attribute must be a valid IPv4 address.',
-    'ipv6'                 => 'The :attribute must be a valid IPv6 address.',
-    'is_unique_department' => 'The :attribute must be unique to this Company Location',
-    'json'                 => 'The :attribute must be a valid JSON string.',
-    'max'                  => [
-        'numeric' => 'The :attribute may not be greater than :max.',
-        'file'    => 'The :attribute may not be greater than :max kilobytes.',
-        'string'  => 'The :attribute may not be greater than :max characters.',
-        'array'   => 'The :attribute may not have more than :max items.',
+    'in' => 'The selected :attribute is invalid.',
+    'in_array' => 'The :attribute field must exist in :other.',
+    'integer' => 'The :attribute field must be an integer.',
+    'ip' => 'The :attribute field must be a valid IP address.',
+    'ipv4' => 'The :attribute field must be a valid IPv4 address.',
+    'ipv6' => 'The :attribute field must be a valid IPv6 address.',
+    'json' => 'The :attribute field must be a valid JSON string.',
+    'list' => 'The :attribute field must be a list.',
+    'lowercase' => 'The :attribute field must be lowercase.',
+    'lt' => [
+        'array' => 'The :attribute field must have less than :value items.',
+        'file' => 'The :attribute field must be less than :value kilobytes.',
+        'numeric' => 'The :attribute field must be less than :value.',
+        'string' => 'The :attribute field must be less than :value characters.',
     ],
-    'mimes'                => 'The :attribute must be a file of type: :values.',
-    'mimetypes'            => 'The :attribute must be a file of type: :values.',
-    'min'                  => [
-        'numeric' => 'The :attribute must be at least :min.',
-        'file'    => 'The :attribute must be at least :min kilobytes.',
-        'string'  => 'The :attribute must be at least :min characters.',
-        'array'   => 'The :attribute must have at least :min items.',
+    'lte' => [
+        'array' => 'The :attribute field must not have more than :value items.',
+        'file' => 'The :attribute field must be less than or equal to :value kilobytes.',
+        'numeric' => 'The :attribute field must be less than or equal to :value.',
+        'string' => 'The :attribute field must be less than or equal to :value characters.',
     ],
-    'starts_with'          => 'The :attribute must start with one of the following: :values.',
-    'ends_with'            => 'The :attribute must end with one of the following: :values.',
+    'mac_address' => 'The :attribute field must be a valid MAC address.',
+    'max' => [
+        'array' => 'The :attribute field must not have more than :max items.',
+        'file' => 'The :attribute field must not be greater than :max kilobytes.',
+        'numeric' => 'The :attribute field must not be greater than :max.',
+        'string' => 'The :attribute field must not be greater than :max characters.',
+    ],
+    'max_digits' => 'The :attribute field must not have more than :max digits.',
+    'mimes' => 'The :attribute field must be a file of type: :values.',
+    'mimetypes' => 'The :attribute field must be a file of type: :values.',
+    'min' => [
+        'array' => 'The :attribute field must have at least :min items.',
+        'file' => 'The :attribute field must be at least :min kilobytes.',
+        'numeric' => 'The :attribute field must be at least :min.',
+        'string' => 'The :attribute field must be at least :min characters.',
+    ],
+    'min_digits' => 'The :attribute field must have at least :min digits.',
+    'missing' => 'The :attribute field must be missing.',
+    'missing_if' => 'The :attribute field must be missing when :other is :value.',
+    'missing_unless' => 'The :attribute field must be missing unless :other is :value.',
+    'missing_with' => 'The :attribute field must be missing when :values is present.',
+    'missing_with_all' => 'The :attribute field must be missing when :values are present.',
+    'multiple_of' => 'The :attribute field must be a multiple of :value.',
+    'not_in' => 'The selected :attribute is invalid.',
+    'not_regex' => 'The :attribute field format is invalid.',
+    'numeric' => 'The :attribute field must be a number.',
+    'password' => [
+        'letters' => 'The :attribute field must contain at least one letter.',
+        'mixed' => 'The :attribute field must contain at least one uppercase and one lowercase letter.',
+        'numbers' => 'The :attribute field must contain at least one number.',
+        'symbols' => 'The :attribute field must contain at least one symbol.',
+        'uncompromised' => 'The given :attribute has appeared in a data leak. Please choose a different :attribute.',
+    ],
+    'percent'       => 'The depreciation minimum must be between 0 and 100 when depreciation type is percentage.',
 
-    'not_in'               => 'The selected :attribute is invalid.',
-    'numeric'              => 'The :attribute must be a number.',
-    'present'              => 'The :attribute field must be present.',
-    'valid_regex'          => 'That is not a valid regex. ',
-    'regex'                => 'The :attribute format is invalid.',
-    'required'             => 'The :attribute field is required.',
-    'required_if'          => 'The :attribute field is required when :other is :value.',
-    'required_unless'      => 'The :attribute field is required unless :other is in :values.',
-    'required_with'        => 'The :attribute field is required when :values is present.',
-    'required_with_all'    => 'The :attribute field is required when :values is present.',
-    'required_without'     => 'The :attribute field is required when :values is not present.',
+    'present' => 'The :attribute field must be present.',
+    'present_if' => 'The :attribute field must be present when :other is :value.',
+    'present_unless' => 'The :attribute field must be present unless :other is :value.',
+    'present_with' => 'The :attribute field must be present when :values is present.',
+    'present_with_all' => 'The :attribute field must be present when :values are present.',
+    'prohibited' => 'The :attribute field is prohibited.',
+    'prohibited_if' => 'The :attribute field is prohibited when :other is :value.',
+    'prohibited_unless' => 'The :attribute field is prohibited unless :other is in :values.',
+    'prohibits' => 'The :attribute field prohibits :other from being present.',
+    'regex' => 'The :attribute field format is invalid.',
+    'required' => 'The :attribute field is required.',
+    'required_array_keys' => 'The :attribute field must contain entries for: :values.',
+    'required_if' => 'The :attribute field is required when :other is :value.',
+    'required_if_accepted' => 'The :attribute field is required when :other is accepted.',
+    'required_if_declined' => 'The :attribute field is required when :other is declined.',
+    'required_unless' => 'The :attribute field is required unless :other is in :values.',
+    'required_with' => 'The :attribute field is required when :values is present.',
+    'required_with_all' => 'The :attribute field is required when :values are present.',
+    'required_without' => 'The :attribute field is required when :values is not present.',
     'required_without_all' => 'The :attribute field is required when none of :values are present.',
-    'same'                 => 'The :attribute and :other must match.',
-    'size'                 => [
-        'numeric' => 'The :attribute must be :size.',
-        'file'    => 'The :attribute must be :size kilobytes.',
-        'string'  => 'The :attribute must be :size characters.',
-        'array'   => 'The :attribute must contain :size items.',
+    'same' => 'The :attribute field must match :other.',
+    'size' => [
+        'array' => 'The :attribute field must contain :size items.',
+        'file' => 'The :attribute field must be :size kilobytes.',
+        'numeric' => 'The :attribute field must be :size.',
+        'string' => 'The :attribute field must be :size characters.',
     ],
+    'starts_with' => 'The :attribute field must start with one of the following: :values.',
     'string'               => 'The :attribute must be a string.',
-    'timezone'             => 'The :attribute must be a valid zone.',
     'two_column_unique_undeleted' => 'The :attribute must be unique across :table1 and :table2. ',
-    'unique'               => 'The :attribute has already been taken.',
-    'uploaded'             => 'The :attribute failed to upload.',
-    'url'                  => 'The :attribute format is invalid.',
     'unique_undeleted'     => 'The :attribute must be unique.',
     'non_circular'         => 'The :attribute must not create a circular reference.',
     'not_array'            => ':attribute cannot be an array.',
@@ -102,11 +165,14 @@ return [
     'numbers'              => 'Password must contain at least one number.',
     'case_diff'            => 'Password must use mixed case.',
     'symbols'              => 'Password must contain symbols.',
-    'gte'                  => [
-        'numeric'          => 'Value cannot be negative'
-    ],
-    'checkboxes'           => ':attribute contains invalid options.',
-    'radio_buttons'        => ':attribute is invalid.',
+    'timezone' => 'The :attribute field must be a valid timezone.',
+    'unique' => 'The :attribute has already been taken.',
+    'uploaded' => 'The :attribute failed to upload.',
+    'uppercase' => 'The :attribute field must be uppercase.',
+    'url' => 'The :attribute field must be a valid URL.',
+    'ulid' => 'The :attribute field must be a valid ULID.',
+    'uuid' => 'The :attribute field must be a valid UUID.',
+    'fmcs_location' => 'Full multiple company support and location scoping is enabled in the Admin Settings, and the selected location and selected company are not compatible.',
 
 
     /*
@@ -120,16 +186,22 @@ return [
     |
     */
 
+    'email_array'      => 'One or more email addresses is invalid.',
+    'checkboxes'           => ':attribute contains invalid options.',
+    'radio_buttons'        => ':attribute is invalid.',
+    
     'custom' => [
         'alpha_space' => 'The :attribute field contains a character that is not allowed.',
-        'email_array'      => 'One or more email addresses is invalid.',
+
         'hashed_pass'      => 'Your current password is incorrect',
         'dumbpwd'          => 'That password is too common.',
         'statuslabel_type' => 'You must select a valid status label type',
+        'custom_field_not_found'          => 'This field does not seem to exist, please double check your custom field names.',
+        'custom_field_not_found_on_model' => 'This field seems to exist, but is not available on this Asset Model\'s fieldset.',
 
         // date_format validation with slightly less stupid messages. It duplicates a lot, but it gets the job done :(
-        // We use this because the default error message for date_format is reflects php Y-m-d, which non-PHP
-        // people won't know how to format. 
+        // We use this because the default error message for date_format reflects php Y-m-d, which non-PHP
+        // people won't know how to format.
         'purchase_date.date_format'     => 'The :attribute must be a valid date in YYYY-MM-DD format',
         'last_audit_date.date_format'   =>  'The :attribute must be a valid date in YYYY-MM-DD hh:mm:ss format',
         'expiration_date.date_format'   =>  'The :attribute must be a valid date in YYYY-MM-DD format',
@@ -137,9 +209,15 @@ return [
         'expected_checkin.date_format'  =>  'The :attribute must be a valid date in YYYY-MM-DD format',
         'start_date.date_format'        =>  'The :attribute must be a valid date in YYYY-MM-DD format',
         'end_date.date_format'          =>  'The :attribute must be a valid date in YYYY-MM-DD format',
+        'invalid_value_in_field' => 'Invalid value included in this field',
 
-    ],
+        'ldap_username_field' => [
+            'not_in' =>         '<code>sAMAccountName</code> (mixed case) will likely not work. You should use <code>samaccountname</code> (lowercase) instead.'
+        ],
+        'ldap_auth_filter_query' => ['not_in' => '<code>uid=samaccountname</code> is probably not a valid auth filter. You probably want <code>uid=</code> '],
+        'ldap_filter' => ['regex' => 'This value should probably not be wrapped in parentheses.'],
 
+        ],
     /*
     |--------------------------------------------------------------------------
     | Custom Validation Attributes
@@ -155,8 +233,16 @@ return [
 
     /*
     |--------------------------------------------------------------------------
-    | Generic Validation Messages
+    | Generic Validation Messages - we use these in the jquery validation where we don't have
+    | access to the :attribute
     |--------------------------------------------------------------------------
     */
-    'invalid_value_in_field' => 'Invalid value included in this field',
+
+    'generic' => [
+        'invalid_value_in_field' => 'Invalid value included in this field',
+        'required' => 'This field is required',
+        'email' => 'Please enter a valid email address',
+    ],
+
+
 ];
diff --git a/resources/lang/mn-MN/account/general.php b/resources/lang/mn-MN/account/general.php
index 1a9e2c03b8..7f9e2f848e 100644
--- a/resources/lang/mn-MN/account/general.php
+++ b/resources/lang/mn-MN/account/general.php
@@ -2,10 +2,16 @@
 
 return array(
     'personal_api_keys' => 'Personal API Keys',
+    'personal_access_token' => 'Personal Access Token',
+    'personal_api_keys_success' => 'Personal API Key :key created sucessfully',
+    'here_is_api_key' => 'Here is your new personal access token. This is the only time it will be shown so do not lose it! You may now use this token to make API requests.',
     'api_key_warning' => 'When generating an API token, be sure to copy it down immediately as they will not be visible to you again.',
     'api_base_url' => 'Your API base url is located at:',
     'api_base_url_endpoint' => '/&lt;endpoint&gt;',
     'api_token_expiration_time' => 'API tokens are set to expire in:',
     'api_reference' => 'Please check the <a href="https://snipe-it.readme.io/reference" target="_blank">API reference</a> to find specific API endpoints and additional API documentation.',
     'profile_updated' => 'Account successfully updated',
+    'no_tokens' => 'You have not created any personal access tokens.',
+    'enable_sounds' => 'Enable sound effects',
+    'enable_confetti' => 'Enable confetti effects',
 );
diff --git a/resources/lang/mn-MN/admin/accessories/message.php b/resources/lang/mn-MN/admin/accessories/message.php
index 3a826ff5fd..6a6d83eb4f 100644
--- a/resources/lang/mn-MN/admin/accessories/message.php
+++ b/resources/lang/mn-MN/admin/accessories/message.php
@@ -26,7 +26,11 @@ return array(
         'error'   		=> 'Дагалдах хэрэгсэл шалгагдаагүй байна, дахин оролдоно уу',
         'success' 		=> 'Дагалдах хэрэгсэл амжилттай шалгасан.',
         'unavailable'   => 'Accessory is not available for checkout. Check quantity available',
-        'user_does_not_exist' => 'Энэ хэрэглэгч буруу байна. Дахин оролдоно уу.'
+        'user_does_not_exist' => 'Энэ хэрэглэгч буруу байна. Дахин оролдоно уу.',
+         'checkout_qty' => array(
+            'lte'  => 'There is currently only one available accessory of this type, and you are trying to check out :checkout_qty. Please adjust the checkout quantity or the total stock of this accessory and try again.|There are :number_currently_remaining total available accessories, and you are trying to check out :checkout_qty. Please adjust the checkout quantity or the total stock of this accessory and try again.',
+            ),
+           
     ),
 
     'checkin' => array(
diff --git a/resources/lang/mn-MN/admin/accessories/table.php b/resources/lang/mn-MN/admin/accessories/table.php
index 9e7c62f2c7..03faf8a42c 100644
--- a/resources/lang/mn-MN/admin/accessories/table.php
+++ b/resources/lang/mn-MN/admin/accessories/table.php
@@ -6,6 +6,4 @@ return array(
     'id'      					=> 'ID',
     'require_acceptance'      	=> 'Зөвшөөрөл',
     'title'      				=> 'Аксессуарын нэр',
-
-
 );
diff --git a/resources/lang/mn-MN/admin/components/message.php b/resources/lang/mn-MN/admin/components/message.php
index fb2aeff6bd..86f8e7bd03 100644
--- a/resources/lang/mn-MN/admin/components/message.php
+++ b/resources/lang/mn-MN/admin/components/message.php
@@ -17,7 +17,8 @@ return array(
     'delete' => array(
         'confirm'   => 'Та энэ бүрэлдэхүүн хэсгийг устгахдаа итгэлтэй байна уу?',
         'error'   => 'Энэ бүрэлдэхүүнийг устгах асуудал гарлаа. Дахин оролдоно уу.',
-        'success' => 'Бүрэлдэхүүн хэсэг амжилттай устгагдсан.'
+        'success' => 'Бүрэлдэхүүн хэсэг амжилттай устгагдсан.',
+        'error_qty'   => 'Some components of this type are still checked out. Please check them in and try again.',
     ),
 
      'checkout' => array(
diff --git a/resources/lang/mn-MN/admin/consumables/general.php b/resources/lang/mn-MN/admin/consumables/general.php
index c3c78d0399..7386adc590 100644
--- a/resources/lang/mn-MN/admin/consumables/general.php
+++ b/resources/lang/mn-MN/admin/consumables/general.php
@@ -8,4 +8,5 @@ return array(
     'remaining' 			            => 'Үлдсэн',
     'total' 			                => 'Нийт',
     'update'                            => 'Боломжийн талаар шинэчиллээ',
+    'inventory_warning'                 => 'The inventory of this consumable is below the minimum amount of :min_count',
 );
diff --git a/resources/lang/mn-MN/admin/consumables/message.php b/resources/lang/mn-MN/admin/consumables/message.php
index ae87d63f92..a8ac2a536e 100644
--- a/resources/lang/mn-MN/admin/consumables/message.php
+++ b/resources/lang/mn-MN/admin/consumables/message.php
@@ -2,6 +2,7 @@
 
 return array(
 
+    'invalid_category_type' => 'The category must be a consumable category.',
     'does_not_exist' => 'Хадгалах боломжгүй.',
 
     'create' => array(
diff --git a/resources/lang/mn-MN/admin/custom_fields/general.php b/resources/lang/mn-MN/admin/custom_fields/general.php
index 8a406df935..f1d4ded8c5 100644
--- a/resources/lang/mn-MN/admin/custom_fields/general.php
+++ b/resources/lang/mn-MN/admin/custom_fields/general.php
@@ -35,7 +35,7 @@ return [
     'create_field_title' => 'Create a new custom field',
     'value_encrypted'      	        => 'Энэ талбарын үнэ цэнийг мэдээллийн санд шифрлэдэг. Зөвхөн админ хэрэглэгч нар нь буцаагдсан утгыг харах боломжтой байна',
     'show_in_email'     => 'Хэрэглэгчид илгээсэн олголтын имэйлд энэ талбарын утгыг оруулах уу? Шифрлэгдсэн талбаруудыг имэйлд оруулах боломжгүй',
-    'show_in_email_short'     => 'Include in emails.',
+    'show_in_email_short' => 'Include in emails',
     'help_text' => 'Help Text',
     'help_text_description' => 'This is optional text that will appear below the form elements while editing an asset to provide context on the field.',
     'about_custom_fields_title' => 'About Custom Fields',
@@ -57,5 +57,8 @@ return [
     'show_in_requestable_list_short' => 'Show in requestable assets list',
     'show_in_requestable_list' => 'Show value in requestable assets list. Encrypted fields will not be shown',
     'encrypted_options' => 'This field is encrypted, so some display options will not be available.',
+    'display_checkin' => 'Display in checkin forms',
+    'display_checkout' => 'Display in checkout forms',
+    'display_audit' => 'Display in audit forms',
 
 ];
diff --git a/resources/lang/mn-MN/admin/custom_fields/message.php b/resources/lang/mn-MN/admin/custom_fields/message.php
index 3be14c1bd2..3709684dc6 100644
--- a/resources/lang/mn-MN/admin/custom_fields/message.php
+++ b/resources/lang/mn-MN/admin/custom_fields/message.php
@@ -5,6 +5,7 @@ return array(
     'field' => array(
         'invalid'   => 'Энэ талбар байхгүй байна.',
         'already_added'   => 'Талбай нэмэгдсэн байна',
+        'none_selected'   => 'No field selected',
 
         'create' => array(
             'error'   => 'Талбар үүсгэгдсэнгүй, дахин оролдоно уу.',
diff --git a/resources/lang/mn-MN/admin/depreciations/general.php b/resources/lang/mn-MN/admin/depreciations/general.php
index 59002b411a..0565d5df56 100644
--- a/resources/lang/mn-MN/admin/depreciations/general.php
+++ b/resources/lang/mn-MN/admin/depreciations/general.php
@@ -13,4 +13,8 @@ return [
     'no_depreciations_warning'               => '<strong>Warning: </strong>
                       You do not currently have any depreciations set up.
                       Please set up at least one depreciation to view the depreciation report.',
+    'depreciation_method'                   => 'Элэгдлийн тайлан',
+    'linear_depreciation'                   => 'Linear (Default)',
+    'half_1'                                => 'Half-year convention, always applied',
+    'half_2'                                => 'Half-year convention, applied with condition',
 ];
diff --git a/resources/lang/mn-MN/admin/hardware/form.php b/resources/lang/mn-MN/admin/hardware/form.php
index 61a2ccd71a..98bad0d23f 100644
--- a/resources/lang/mn-MN/admin/hardware/form.php
+++ b/resources/lang/mn-MN/admin/hardware/form.php
@@ -55,8 +55,11 @@ return [
     'asset_location_update_default' => 'Update only default location',
     'asset_location_update_actual' => 'Update only actual location',
     'asset_not_deployable' => 'That asset status is not deployable. This asset cannot be checked out.',
-    'asset_deployable' => 'That status is deployable. This asset can be checked out.',
+    'asset_not_deployable_checkin' => 'That asset status is not deployable. Using this status label will checkin the asset.',
+    'asset_deployable' => 'This asset can be checked out.',
     'processing_spinner' => 'Processing... (This might take a bit of time on large files)',
+    'processing' => 'Processing... ',
     'optional_infos'  => 'Optional Information',
-    'order_details'   => 'Order Related Information'
+    'order_details'   => 'Order Related Information',
+    'calc_eol'    => 'If nulling the EOL date, use automatic EOL calculation based on the purchase date and EOL rate.',
 ];
diff --git a/resources/lang/mn-MN/admin/hardware/general.php b/resources/lang/mn-MN/admin/hardware/general.php
index 3e49ffa554..d957c8b4c1 100644
--- a/resources/lang/mn-MN/admin/hardware/general.php
+++ b/resources/lang/mn-MN/admin/hardware/general.php
@@ -5,8 +5,8 @@ return [
     'about_assets_text'            => 'Актив нь сериал дугаар буюу хөрөнгийн тэмдэгтээр хянагдсан зүйлс юм. Эдгээр нь тодорхой зүйлүүдийг тодорхойлоход илүү үнэ цэнэтэй зүйлс байх хандлагатай байдаг.',
     'archived'  				=> 'Архивлагдсан',
     'asset'  					=> 'Актив',
-    'bulk_checkout'             => 'Хөрөнгийг олгох',
-    'bulk_checkin'              => 'Checkin Assets',
+    'bulk_checkout'             => 'Бөөнөөр Тооцоо хийх',
+    'bulk_checkin'              => 'Bulk Checkin',
     'checkin'  					=> 'Checkin Asset',
     'checkout'  				=> 'Тооцоот Хөрөнгийн',
     'clone'  					=> 'Clone Asset',
@@ -27,8 +27,7 @@ return [
     'undeployable_tooltip'  	=> 'This asset has a status label that is undeployable and cannot be checked out at this time.',
     'view'  					=> 'Хөрөнгийг харах',
     'csv_error' => 'You have an error in your CSV file:',
-    'import_text' => '<p>Upload a CSV that contains asset history. The assets and users MUST already exist in the system, or they will be skipped. Matching assets for history import happens against the asset tag. We will try to find a matching user based on the user\'s name you provide, and the criteria you select below. If you do not select any criteria below, it will simply try to match on the username format you configured in the <code>Admin &gt; General Settings</code>.</p><p>Fields included in the CSV must match the headers: <strong>Asset Tag, Name, Checkout Date, Checkin Date</strong>. Any additional fields will be ignored. </p><p>Checkin Date: blank or future checkin dates will checkout items to associated user.  Excluding the Checkin Date column will create a checkin date with todays date.</p>
-    ',
+    'import_text' => '<p>Upload a CSV that contains asset history. The assets and users MUST already exist in the system, or they will be skipped. Matching assets for history import happens against the asset tag. We will try to find a matching user based on the user\'s name you provide, and the criteria you select below. If you do not select any criteria below, it will simply try to match on the username format you configured in the <code>Admin &gt; General Settings</code>.</p><p>Fields included in the CSV must match the headers: <strong>Asset Tag, Name, Checkout Date, Checkin Date</strong>. Any additional fields will be ignored. </p><p>Checkin Date: blank or future checkin dates will checkout items to associated user.  Excluding the Checkin Date column will create a checkin date with todays date.</p>    ',
     'csv_import_match_f-l' => 'Try to match users by <strong>firstname.lastname</strong> (<code>jane.smith</code>) format',
     'csv_import_match_initial_last' => 'Try to match users by <strong>first initial last name</strong> (<code>jsmith</code>) format',
     'csv_import_match_first' => 'Try to match users by <strong>first name</strong> (<code>jane</code>) format',
diff --git a/resources/lang/mn-MN/admin/hardware/message.php b/resources/lang/mn-MN/admin/hardware/message.php
index 3d8844cb7e..8a1c2b4a11 100644
--- a/resources/lang/mn-MN/admin/hardware/message.php
+++ b/resources/lang/mn-MN/admin/hardware/message.php
@@ -2,18 +2,23 @@
 
 return [
 
-    'undeployable' 		=> '<strong>Анхааруулга: </strong> Энэ хөрөнгө нь одоогоор хүчингүй болсон гэж тэмдэглэгдсэн байна. Хэрэв энэ байдал өөрчлөгдсөн бол хөрөнгийн статусыг шинэчлэнэ үү.',
-    'does_not_exist' 	=> 'Хөрөнгө байхгүй байна.',
-    'does_not_exist_var'=> 'Asset with tag :asset_tag not found.',
-    'no_tag' 	        => 'No asset tag provided.',
+    'undeployable' 		 => '<strong>Warning: </strong> This asset has been marked as currently undeployable. If this status has changed, please update the asset status.',
+    'does_not_exist' 	 => 'Хөрөнгө байхгүй байна.',
+    'does_not_exist_var' => 'Asset with tag :asset_tag not found.',
+    'no_tag' 	         => 'No asset tag provided.',
     'does_not_exist_or_not_requestable' => 'That asset does not exist or is not requestable.',
-    'assoc_users'	 	=> 'Энэ хөрөнгийг одоогоор хэрэглэгчид шалгаж, устгах боломжгүй байна. Эхлээд хөрөнгийг шалгаж үзээд дараа нь устга.',
+    'assoc_users'	 	 => 'Энэ хөрөнгийг одоогоор хэрэглэгчид шалгаж, устгах боломжгүй байна. Эхлээд хөрөнгийг шалгаж үзээд дараа нь устга.',
     'warning_audit_date_mismatch' 	=> 'This asset\'s next audit date (:next_audit_date) is before the last audit date (:last_audit_date). Please update the next audit date.',
+    'labels_generated'   => 'Labels were successfully generated.',
+    'error_generating_labels' => 'Error while generating labels.',
+    'no_assets_selected' => 'No assets selected.',
 
     'create' => [
         'error'   		=> 'Акт үүсгээгүй байна, дахин оролдоно уу. :(',
         'success' 		=> 'Хөрөнгө амжилттай болсон. :)',
         'success_linked' => 'Asset with tag :tag was created successfully. <strong><a href=":link" style="color: white;">Click here to view</a></strong>.',
+        'multi_success_linked' => 'Asset with tag :links was created successfully.|:count assets were created succesfully. :links.',
+        'partial_failure' => 'An asset was unable to be created. Reason: :failures|:count assets were unable to be created. Reasons: :failures',
     ],
 
     'update' => [
@@ -51,20 +56,24 @@ return [
     ],
 
     'import' => [
+        'import_button'         => 'Process Import',
         'error'                 => 'Зарим зүйлс зөв импорт хийгдээгүй байна.',
         'errorDetail'           => 'Дараах зүйлсийг алдааны улмаас импортолсонгүй.',
         'success'               => 'Таны файл импортлогдсон байна',
         'file_delete_success'   => 'Таны файл амжилттай болсон байна',
         'file_delete_error'      => 'Файл устгагдах боломжгүй байна',
         'file_missing' => 'The file selected is missing',
+        'file_already_deleted' => 'The file selected was already deleted',
         'header_row_has_malformed_characters' => 'One or more attributes in the header row contain malformed UTF-8 characters',
         'content_row_has_malformed_characters' => 'One or more attributes in the first row of content contain malformed UTF-8 characters',
+        'transliterate_failure' => 'Transliteration from :encoding to UTF-8 failed due to invalid characters in input'
     ],
 
 
     'delete' => [
         'confirm'   	=> 'Та энэ хөрөнгийг устгахыг хүсч байна уу?',
         'error'   		=> 'Хөрөнгийг устгах асуудал гарлаа. Дахин оролдоно уу.',
+        'assigned_to_error' => '{1}Asset Tag: :asset_tag is currently checked out. Check in this device before deletion.|[2,*]Asset Tags: :asset_tag are currently checked out. Check in these devices before deletion.',
         'nothing_updated'   => 'Ямар ч хөрөнгө сонгогдоогүй тул юу ч устгаагүй.',
         'success' 		=> 'Хөрөнгийг амжилттай устгасан байна.',
     ],
@@ -77,6 +86,11 @@ return [
         'no_assets_selected' => 'Жагсаалтаас доод тал нь нэг хөрөнгийг сонгоно уу',
     ],
 
+    'multi-checkout' => [
+        'error'   => 'Asset was not checked out, please try again|Assets were not checked out, please try again',
+        'success' => 'Asset checked out successfully.|Assets checked out successfully.',
+    ],
+
     'checkin' => [
         'error'   		=> 'Хөрөнгө оруулаагүй байна, дахин оролдоно уу',
         'success' 		=> 'Хөрөнгө амжилттай шалгагдсан.',
@@ -86,9 +100,10 @@ return [
     ],
 
     'requests' => [
-        'error'   		=> 'Акт хүсээгүй тул дахин оролдоно уу',
-        'success' 		=> 'Хөрөнгө амжилттай ирэв.',
-        'canceled'      => 'Тооцоо хийх хүсэлт амжилттай цуцлагдсан',
+        'error'   		=> 'Request was not successful, please try again.',
+        'success' 		=> 'Request successfully submitted.',
+        'canceled'      => 'Request successfully canceled.',
+        'cancel'        => 'Cancel this item request',
     ],
 
 ];
diff --git a/resources/lang/mn-MN/admin/hardware/table.php b/resources/lang/mn-MN/admin/hardware/table.php
index 8b9e4ac8ea..00a387bfe0 100644
--- a/resources/lang/mn-MN/admin/hardware/table.php
+++ b/resources/lang/mn-MN/admin/hardware/table.php
@@ -25,7 +25,6 @@ return [
     'image'		    => 'Төхөөрөмжийн дүрс',
     'days_without_acceptance' => 'Хүлээн зөвшөөрөхгүй өдрүүд',
     'monthly_depreciation' => 'Monthly Depreciation',
-    'assigned_to'    => 'Томилогдсон',
     'requesting_user' => 'Requesting User',
     'requested_date' => 'Requested Date',
     'changed'       => 'Changed',
diff --git a/resources/lang/mn-MN/admin/kits/general.php b/resources/lang/mn-MN/admin/kits/general.php
index 8963f3dece..42ddbe44df 100644
--- a/resources/lang/mn-MN/admin/kits/general.php
+++ b/resources/lang/mn-MN/admin/kits/general.php
@@ -47,4 +47,5 @@ return [
     'kit_deleted'                       => 'Kit was successfully deleted',
     'kit_model_updated'                 => 'Model was successfully updated',
     'kit_model_detached'                => 'Model was successfully detached',
+    'model_already_attached'            => 'Model already attached to kit',
 ];
diff --git a/resources/lang/mn-MN/admin/licenses/general.php b/resources/lang/mn-MN/admin/licenses/general.php
index 717ba1b76c..31bc40804f 100644
--- a/resources/lang/mn-MN/admin/licenses/general.php
+++ b/resources/lang/mn-MN/admin/licenses/general.php
@@ -14,6 +14,7 @@ return array(
     'info'  					=> 'Лицензийн мэдээлэл',
     'license_seats'  			=> 'Лицензийн суудал',
     'seat'  					=> 'Суудал',
+    'seat_count'  				=> 'Seat :count',
     'seats'  					=> 'Суудал',
     'software_licenses'  		=> 'Програм хангамжийн лиценз',
     'user'  					=> 'Хэрэглэгч',
@@ -23,12 +24,12 @@ return array(
         [
             'checkin_all'           => [
                 'button'            => 'Checkin All Seats',
-                'modal'             => 'This will action checkin one seat. | This action will checkin all :checkedout_seats_count seats for this license.',
+                'modal'             => 'This action will checkin one seat. | This action will checkin all :checkedout_seats_count seats for this license.',
                 'enabled_tooltip'   => 'Checkin ALL seats for this license from both users and assets',
                 'disabled_tooltip'  => 'This is disabled because there are no seats currently checked out',
                 'disabled_tooltip_reassignable'  => 'This is disabled because the License is not reassignable',
                 'success'           => 'License successfully checked in! | All licenses were successfully checked in!',
-                'log_msg'           => 'Checked in via bulk license checkout in license GUI',
+                'log_msg'           => 'Checked in via bulk license checkin in license GUI',
             ],
 
             'checkout_all'              => [
diff --git a/resources/lang/mn-MN/admin/licenses/message.php b/resources/lang/mn-MN/admin/licenses/message.php
index c7b60d5fd8..46ec5f9b60 100644
--- a/resources/lang/mn-MN/admin/licenses/message.php
+++ b/resources/lang/mn-MN/admin/licenses/message.php
@@ -44,10 +44,13 @@ return array(
         'error'   => 'Лицензийг шалгах асуудал гарлаа. Дахин оролдоно уу.',
         'success' => 'Лицензийг амжилттай шалгасан',
         'not_enough_seats' => 'Not enough license seats available for checkout',
+        'mismatch' => 'The license seat provided does not match the license',
+        'unavailable' => 'This seat is not available for checkout.',
     ),
 
     'checkin' => array(
         'error'   => 'Лиценз дээр асуудал гарлаа. Дахин оролдоно уу.',
+        'not_reassignable' => 'License not reassignable',
         'success' => 'Лицензийг амжилттай шалгасан байна'
     ),
 
diff --git a/resources/lang/mn-MN/admin/locations/message.php b/resources/lang/mn-MN/admin/locations/message.php
index e69e94bade..f9a3cf91ba 100644
--- a/resources/lang/mn-MN/admin/locations/message.php
+++ b/resources/lang/mn-MN/admin/locations/message.php
@@ -3,11 +3,12 @@
 return array(
 
     'does_not_exist' => 'Байршил байхгүй байна.',
-    'assoc_users'    => 'This location is not currently deletable because it is the location of record for at least one asset or user, has assets assigned to it, or is the parent location of another location. Please update your models to no longer reference this company and try again. ',
+    'assoc_users'    => 'This location is not currently deletable because it is the location of record for at least one asset or user, has assets assigned to it, or is the parent location of another location. Please update your records to no longer reference this location and try again ',
     'assoc_assets'	 => 'Энэ байршил нь одоогоор нэгээс доошгүй активтай холбоотой бөгөөд устгах боломжгүй байна. Энэ байршлыг лавлагаа болгохоо болихын тулд өөрийн хөрөнгийг шинэчлээд дахин оролдоно уу.',
     'assoc_child_loc'	 => 'Энэ байршил нь одоогоор хамгийн багадаа нэг хүүхдийн байрлалын эцэг эх бөгөөд устгах боломжгүй байна. Энэ байршлыг лавшруулахгүй болгохын тулд байршлаа шинэчлээд дахин оролдоно уу.',
     'assigned_assets' => 'Assigned Assets',
     'current_location' => 'Current Location',
+    'open_map' => 'Open in :map_provider_icon Maps',
 
 
     'create' => array(
@@ -20,6 +21,11 @@ return array(
         'success' => 'Байршил амжилттай шинэчлэгдсэн.'
     ),
 
+    'restore' => array(
+        'error'   => 'Location was not restored, please try again',
+        'success' => 'Location restored successfully.'
+    ),
+
     'delete' => array(
         'confirm'   	=> 'Та энэ байршлыг устгахыг хүсч байна уу?',
         'error'   => 'Байршил устгах асуудал гарлаа. Дахин оролдоно уу.',
diff --git a/resources/lang/mn-MN/admin/locations/table.php b/resources/lang/mn-MN/admin/locations/table.php
index 7594ab9742..943c021006 100644
--- a/resources/lang/mn-MN/admin/locations/table.php
+++ b/resources/lang/mn-MN/admin/locations/table.php
@@ -39,4 +39,5 @@ return [
     'signed_by_finance_auditor' => 'Signed By (Finance Auditor):',
     'signed_by_location_manager' => 'Signed By (Location Manager):',
     'signed_by'                 => 'Signed Off By:',
+    'clone'  					=> 'Clone Location',
 ];
diff --git a/resources/lang/mn-MN/admin/models/general.php b/resources/lang/mn-MN/admin/models/general.php
index 84fb665155..d9d3477401 100644
--- a/resources/lang/mn-MN/admin/models/general.php
+++ b/resources/lang/mn-MN/admin/models/general.php
@@ -3,7 +3,7 @@
 return array(
     'about_models_title'     => 'Активын загварууд',
     'about_models_text'           => 'Хөрөнгийн загвар нь ижил төрлийн хөрөнгийг бүлэглэх арга юм. "MBP 2013", "IPhone 6s", гэх мэт.',
-    'deleted'  					        => 'This model has been deleted.',
+    'deleted'  					=> 'This model has been deleted.',
     'bulk_delete'               => 'Бөөнөөр хөрөнгийн загварыг устгах',
     'bulk_delete_help'               => 'Сонгосон хөрөнгийн загварыг устгахыг баталгаажуулж доорх хайрцгийг ашиглана уу. Хөрөнгөтэй холбоотой хөрөнгийн загварыг өөр загвартай холбох хүртэл устгах боломжгүй.',
     'bulk_delete_warn'          => 'You are about to delete one asset model.|You are about to delete :model_count asset models.',
diff --git a/resources/lang/mn-MN/admin/models/message.php b/resources/lang/mn-MN/admin/models/message.php
index 05953b693f..4ded7e5048 100644
--- a/resources/lang/mn-MN/admin/models/message.php
+++ b/resources/lang/mn-MN/admin/models/message.php
@@ -7,7 +7,7 @@ return array(
     'no_association' => 'WARNING! The asset model for this item is invalid or missing!',
     'no_association_fix' => 'This will break things in weird and horrible ways. Edit this asset now to assign it a model.',
     'assoc_users'	 => 'Энэ загвар одоогоор нэг буюу хэд хэдэн хөрөнгөтэй холбоотой бөгөөд устгаж болохгүй. Хөрөнгө устгаж, дараа нь устгахыг оролдоно уу.',
-
+    'invalid_category_type' => 'This category must be an asset category.',
 
     'create' => array(
         'error'   => 'Загвар үүсгэгдсэнгүй, дахин оролдоно уу.',
diff --git a/resources/lang/mn-MN/admin/reports/general.php b/resources/lang/mn-MN/admin/reports/general.php
index e341643698..6c0a1b3ef9 100644
--- a/resources/lang/mn-MN/admin/reports/general.php
+++ b/resources/lang/mn-MN/admin/reports/general.php
@@ -4,6 +4,7 @@ return [
     'info'   => 'Хөрөнгийн тайлангаа хүссэн сонголтоо сонгоно уу.',
     'deleted_user' => 'Deleted user',
     'send_reminder' => 'Send reminder',
+    'cannot_send_reminder' => 'User has been deleted or does not have an email address so cannot receive a reminder',
     'reminder_sent' => 'Reminder sent',
     'acceptance_deleted' => 'Acceptance request deleted',
     'acceptance_request' => 'Acceptance request',
@@ -13,5 +14,10 @@ return [
         'user_state' => 'User State',
         'user_country' => 'User Country',
         'user_zip' => 'User Zip'
-    ]
-];
\ No newline at end of file
+    ],
+    'open_saved_template' => 'Open Saved Template',
+    'save_template' =>  'Save Template',
+    'select_a_template' => 'Select a Template',
+    'template_name' => 'Template Name',
+    'update_template' => 'Update Template',
+];
diff --git a/resources/lang/mn-MN/admin/reports/message.php b/resources/lang/mn-MN/admin/reports/message.php
index 452da9600f..2800bbdf0b 100644
--- a/resources/lang/mn-MN/admin/reports/message.php
+++ b/resources/lang/mn-MN/admin/reports/message.php
@@ -1,5 +1,16 @@
 <?php
 
-return array(
-    'error'   => 'Та хамгийн багадаа ONE сонголтыг сонгох ёстой.'
-);
+return [
+    'about_templates' => 'About Saved Templates',
+    'saving_templates_description' => 'Select your options, then enter the name of your template in the box above and click the \'Save Template\' button. Use the dropdown to select a previously saved template.',
+    'create'  => [
+        'success' => 'Template saved successfully',
+    ],
+    'update' => [
+        'success' => 'Template updated successfully',
+    ],
+    'delete' => [
+        'success' => 'Template deleted',
+        'no_delete_permission' => 'Template does not exist or you do not have permission to delete it.',
+    ],
+];
diff --git a/resources/lang/mn-MN/admin/settings/general.php b/resources/lang/mn-MN/admin/settings/general.php
index e6a745396f..ea88005949 100644
--- a/resources/lang/mn-MN/admin/settings/general.php
+++ b/resources/lang/mn-MN/admin/settings/general.php
@@ -8,13 +8,13 @@ return [
     'ad_append_domain'          => 'Append domain name to username field',
     'ad_append_domain_help'     => 'User isn\'t required to write "username@domain.local", they can just type "username".',
     'admin_cc_email'            => 'CC Имэйл',
-    'admin_cc_email_help'       => 'Хэрэв та хэрэглэгчдэд илгээсэн хүлээн авах/олгох имэйлийн хуулбарыг нэмэлт имэйл үрүү илгээхийг хүсвэл энд оруулна уу. Үгүй бол энэ талбарыг хоосон орхино уу.',
+    'admin_cc_email_help'       => 'Send a copy of checkin/checkout emails to this address.',
     'admin_settings'            => 'Admin Settings',
     'is_ad'				        => 'Энэ бол Active Directory Server',
     'alerts'                	=> 'Alerts',
     'alert_title'               => 'Update Notification Settings',
     'alert_email'				=> 'Анхааруулга илгээх',
-    'alert_email_help'    => 'Email addresses or distribution lists you want alerts to be sent to, comma separated',
+    'alert_email_help'          => 'Email addresses or distribution lists you want alerts to be sent to, comma separated.',
     'alerts_enabled'			=> 'Идэвхжүүлсэн дохиог',
     'alert_interval'			=> 'Exped Alerts (босоо хоногоор)',
     'alert_inv_threshold'		=> 'Бараа материалын Alert босго',
@@ -31,15 +31,18 @@ return [
     'backups'					=> 'Нөөцлөлтүүд',
     'backups_help'              => 'Create, download, and restore backups ',
     'backups_restoring'         => 'Restoring from Backup',
+    'backups_clean' => 'Clean the backed-up database before restore',
+    'backups_clean_helptext' => "This can be useful if you're changing between database versions",
     'backups_upload'            => 'Upload Backup',
     'backups_path'              => 'Backups on the server are stored in <code>:path</code>',
-    'backups_restore_warning'   => 'Use the restore button <small><span class="btn btn-xs btn-warning"><i class="text-white fas fa-retweet" aria-hidden="true"></i></span></small> to restore from a previous backup. (This does not currently work with S3 file storage or Docker.)<br><br>Your <strong>entire :app_name database and any uploaded files will be completely replaced</strong> by what\'s in the backup file.  ',
+    'backups_restore_warning'   => 'Use the restore button <small><span class="btn btn-xs btn-warning"><i class="text-white fas fa-retweet" aria-hidden="true"></i></span></small> to restore from a previous backup. (This does not currently work with S3 file storage or Docker.)<br><br>Your <strong>entire :app_name database and any uploaded files will be completely replaced</strong> by what\'s in the backup file  ',
     'backups_logged_out'         => 'All existing users, including you, will be logged out once your restore is complete.',
     'backups_large'             => 'Very large backups may time out on the restore attempt and may still need to be run via command line. ',
     'barcode_settings'			=> 'Бар кодын тохиргоо',
     'confirm_purge'			    => 'Цэвэршүүлэлтийг баталгаажуулна уу',
     'confirm_purge_help'		=> 'Enter the text "DELETE" in the box below to purge your deleted records. This action cannot be undone and will PERMANENTLY delete all soft-deleted items and users. (You should make a backup first, just to be safe.)',
     'custom_css'				=> 'CSS тохиргоо',
+    'custom_css_placeholder'	=> 'Add your custom CSS',
     'custom_css_help'			=> 'Ямар нэгэн гаалийн CSS дарж өөрчлөхийг хүсч оруулаарай. &lt;style&gt;&lt;/style&gt; хаягуудыг бүү оруулаарай.',
     'custom_forgot_pass_url'	=> 'Дурын нууц үг сэргээх URL',
     'custom_forgot_pass_url_help'	=> 'Энэ нь нэвтрэх дэлгэц дээрх мартагдсан нууц үгийн URL-г орлох ба хүмүүсийг дотоод хэрэглээний LDAP нууц үг шинэчлэх үйлдэл үрүү чиглүүлэхэд туслана. Энэ нь local хэрэглэгчийн мартсан нууц үгийн үйлдлийг идэвхгүйжүүлэх болно.',
@@ -47,34 +50,34 @@ return [
     'dashboard_message_help'	=> 'Хяналт самбарыг харах эрхтэй хэнд ч энэ текст харагдана.',
     'default_currency'  		=> 'Анхдагч валют',
     'default_eula_text'			=> 'Үндсэн EULA',
+    'default_eula_text_placeholder' => 'Add your default EULA text',
     'default_language'			=> 'Үндсэн хэл',
     'default_eula_help_text'	=> 'Та мөн EULA-г тусгай активын төрлөөр ангилж болно.',
     'acceptance_note'           => 'Add a note for your decision (Optional)',
     'display_asset_name'        => 'Дэлгэцийн нэрийг харуулах',
     'display_checkout_date'     => 'Дэлгэцийн төлбөр хийх хугацаа',
     'display_eol'               => 'EOL харуулах хүснэгтийг харна уу',
-    'display_qr'                => 'Талбай кодыг харуулах',
+    'display_qr'                => 'Display 2D barcode',
     'display_alt_barcode'		=> '1D бар кодыг харуулах',
-    'email_logo'                => 'Email Logo',
     'barcode_type'				=> '2D бар кодны төрөл',
     'alt_barcode_type'			=> '1D бар кодын төрөл',
-    'email_logo_size'       => 'Square logos in email look best. ',
     'enabled'                   => 'Enabled',
     'eula_settings'				=> 'EULA тохиргоо',
     'eula_markdown'				=> 'Энэ EULA нь <a href="https://help.github.com/articles/github-flavored-markdown/"> Гитуб амттай markdown</a>.',
+    'empty_row_count'           => 'Field Start Offset (Empty Rows)',
+    'empty_row_count_help'      => 'Fields will begin populating after this many empty rows are skipped at the top of the label.',
     'favicon'                   => 'Favicon',
     'favicon_format'            => 'Accepted filetypes are ico, png, and gif. Other image formats may not work in all browsers.',
     'favicon_size'          => 'Favicons should be square images, 16x16 pixels.',
     'footer_text'               => 'Нэмэлт хөл хэсгийн текст ',
     'footer_text_help'          => 'Энэ текст баруун талын хөл хэсэгт гарч ирнэ. Холбоосыг <a href="https://help.github.com/articles/github-flavored-markdown/"> Github маягийн markdown </a> ашиглан хэрэглэнэ. Шинэ мөр, толгой, зураг гэх мэт нь урьдчилан таамаглах аргагүй үр дүнд хүргэж болзошгүй.',
+    'footer_text_placeholder'   => 'Optional footer text',
     'general_settings'			=> 'Ерөнхий Тохиргоо',
-    'general_settings_keywords' => 'company support, signature, acceptance, email format, username format, images, per page, thumbnail, eula, gravatar, tos, dashboard, privacy',
     'general_settings_help'     => 'Default EULA and more',
     'generate_backup'			=> 'Нөөц үүсгэх',
     'google_workspaces'         => 'Google Workspaces',
     'header_color'              => 'Толгойн өнгө',
     'info'                      => 'Эдгээр тохиргоонууд нь таны суулгах зарим асуудлуудыг өөрчлөх боломжийг олгоно.',
-    'label_logo'                => 'Label Logo',
     'label_logo_size'           => 'Square logos look best - will be displayed in the top right of each asset label. ',
     'laravel'                   => 'Лараэлийн хувилбар',
     'ldap'                      => 'LDAP',
@@ -94,7 +97,7 @@ return [
     'ldap_login_sync_help'      => 'Энэ нь зөвхөн LDAP-ийг зөв синхрончлох боломжтой эсэхийг шалгадаг. Хэрэв таны LDAP баталгаажуулалтын асуулга буруу байвал хэрэглэгчид нэвтрэх боломжгүй хэвээр байх магадлалтай. ТА ЭХЛЭЭД ШИНЭЧЛЭГДСЭН LDAP ТОХИРГООГОО ХАДГАЛАХ ЁСТОЙ.',
     'ldap_manager'              => 'LDAP Manager',
     'ldap_server'               => 'LDAP сервер',
-    'ldap_server_help'          => 'Энэ нь ldap: // (unrrypted буюу TLS) эсвэл ldaps-ээр эхлэх ёстой: // (SSL нь)',
+    'ldap_server_help'          => 'This should start with ldap:// (for unencrypted) or ldaps:// (for TLS or SSL)',
     'ldap_server_cert'			=> 'LDAP SSL гэрчилгээ баталгаажуулалт',
     'ldap_server_cert_ignore'	=> 'Хүчингүй SSL гэрчилгээг зөвшөөрөх',
     'ldap_server_cert_help'		=> 'Хэрэв та өөрийгөө гарын үсэг зурсан SSL сертификат ашиглаж байгаа бол энэ сонголтыг сонгож хүчингүй SSL сертификатыг хүлээн авахыг хүсч байна.',
@@ -108,8 +111,8 @@ return [
     'ldap_pword'                => 'LDAP нууц үгийн холбох',
     'ldap_basedn'               => 'Суурь Bind DN',
     'ldap_filter'               => 'LDAP шүүгч',
-    'ldap_pw_sync'              => 'LDAP нууц үгийн синк',
-    'ldap_pw_sync_help'         => 'Хэрэв та LDAP нууц үгүүдийг локал нууц үгтэй синхрончлохыг хүсэхгүй байгаа бол энэ хайрцгийг идэвхгүй болгоно уу. Ингэхгүй бол таны LDAP сервер ямар нэг шалтгаанаар хүрэх боломжгүй бол таны хэрэглэгчид нэвтэрч чадахгүй байж болно гэсэн үг юм.',
+    'ldap_pw_sync'              => 'Cache LDAP Passwords',
+    'ldap_pw_sync_help'         => 'Uncheck this box if you do not wish to keep LDAP passwords cached as local hashed passwords. Disabling this means that your users may not be able to login if your LDAP server is unreachable for some reason.',
     'ldap_username_field'       => 'Хэрэглэгчийн талбар',
     'ldap_lname_field'          => 'Сүүлийн нэр',
     'ldap_fname_field'          => 'LDAP анхны нэр',
@@ -117,13 +120,15 @@ return [
     'ldap_version'              => 'LDAP хувилбар',
     'ldap_active_flag'          => 'LDAP Active Flag',
     'ldap_activated_flag_help'  => 'This value is used to determine whether a synced user can login to Snipe-IT. <strong>It does not affect the ability to check items in or out to them</strong>, and should be the <strong>attribute name</strong> within your AD/LDAP, <strong>not the value</strong>. <br><br>If this field is set to a field name that does not exist in your AD/LDAP, or the value in the AD/LDAP field is set to <code>0</code> or <code>false</code>, <strong>user login will be disabled</strong>. If the value in the AD/LDAP field is set to <code>1</code> or <code>true</code> or <em>any other text</em> means the user can log in. When the field is blank in your AD, we respect the <code>userAccountControl</code> attribute, which usually allows non-suspended users to log in.',
+    'ldap_invert_active_flag'   => 'LDAP Invert Active Flag',
+    'ldap_invert_active_flag_help'     => 'If enabled: when the value returned by LDAP Active Flag is <code>0</code> or <code>false</code> the user account will be active.',
     'ldap_emp_num'              => 'LDAP Ажилчдын тоо',
     'ldap_email'                => 'LDAP И-мэйл',
     'ldap_test'                 => 'Test LDAP',
     'ldap_test_sync'            => 'Test LDAP Synchronization',
     'license'                   => 'Програм хангамжийн лиценз',
-    'load_remote'               => 'Use Gravatar',
-    'load_remote_help_text'		=> 'Uncheck this box if your install cannot load scripts from the outside internet. This will prevent Snipe-IT from trying load images from Gravatar.',
+    'load_remote'               => 'Load Remote Avatars',
+    'load_remote_help_text'		=> 'Uncheck this box if your install cannot load scripts from the outside internet. This will prevent Snipe-IT from trying load avatars from Gravatar or other outside sources.',
     'login'                     => 'Login Attempts',
     'login_attempt'             => 'Login Attempt',
     'login_ip'                  => 'IP Address',
@@ -131,6 +136,7 @@ return [
     'login_user_agent'          => 'User Agent',
     'login_help'                => 'List of attempted logins',
     'login_note'                => 'Нэвтрэх Тайлбар',
+    'login_note_placeholder'            => "If you do not have a login or have found a device belonging to this company, please call technical support at 888-555-1212. Thank you.",
     'login_note_help'           => 'Нэвтрэх дэлгэц дээр цөөн хэдэн өгүүлбэрийг оруулаад, жишээ нь алдагдсан эсвэл хулгайлсан төхөөрөмжийг олж авсан хүмүүст туслах. Энэ талбар <a href="https://help.github.com/articles/github-flavored-markdown/">Github амт markdown</a>',
     'login_remote_user_text'    => 'Алсын хэрэглэгчийн нэвтрэх сонголтууд',
     'login_remote_user_enabled_text' => 'Алсын хэрэглэгчийн мэдээлэл ашиглан нэвтрэхийг идэвхжүүлэх',
@@ -146,13 +152,16 @@ return [
     'logo_print_assets_help'    => 'Хэвлэх боломжтой хөрөнгийн жагсаалтад брендинг ашиглах ',
     'full_multiple_companies_support_help_text' => 'Компаниудын өмч хөрөнгөд компанид хуваарилсан хэрэглэгчдийг (түүний дотор админуудыг) хязгаарлах.',
     'full_multiple_companies_support_text' => 'Олон тооны компаниудын дэмжлэг',
+    'scope_locations_fmcs_support_text'  => 'Scope Locations with Full Multiple Companies Support',
+    'scope_locations_fmcs_support_help_text'  => 'Restrict locations to their selected company.',
+    'scope_locations_fmcs_check_button' => 'Check Compatibility',
+    'scope_locations_fmcs_support_disabled_text'  => 'This option is disabled because you have conflicting locations set for :count or more items.',
     'show_in_model_list'   => 'Загвар сонгох хэсэгт харуулах',
     'optional'					=> 'Нэмэлт',
     'per_page'                  => 'Нэг хуудасны үр дүн',
     'php'                       => 'PHP хувилбар',
-    'php_info'                  => 'PHP Info',
+    'php_info'                  => 'PHP info',
     'php_overview'              => 'PHP',
-    'php_overview_keywords'     => 'phpinfo, system, info',
     'php_overview_help'         => 'PHP System info',
     'php_gd_info'               => 'Та php-gd-г QR кодуудыг харуулахын тулд суулгах зааврыг харах хэрэгтэй.',
     'php_gd_warning'            => 'PHP Image Processing болон GD залгаас суулгаагүй байна.',
@@ -218,6 +227,8 @@ return [
     'webhook_integration_help'    => ':app integration is optional, however the endpoint and channel are required if you wish to use it. To configure :app integration, you must first <a href=":webhook_link" target="_new" rel="noopener">create an incoming webhook</a> on your :app account. Click on the <strong>Test :app Integration</strong> button to confirm your settings are correct before saving. ',
     'webhook_integration_help_button'    => 'Once you have saved your :app information, a test button will appear.',
     'webhook_test_help'           => 'Test whether your :app integration is configured correctly. YOU MUST SAVE YOUR UPDATED :app SETTINGS FIRST.',
+    'shortcuts_enabled'         => 'Enable Shortcuts',
+    'shortcuts_help_text'       => '<strong>Windows</strong>: Alt + Access key, <strong>Mac</strong>: Control + Option + Access key',
     'snipe_version'  			=> 'Snipe-IT хувилбар',
     'support_footer'            => 'Хөл хэсэг дэх холбоосууд ',
     'support_footer_help'       => 'Snipe-IT Support мэдээлэл ба хэрэглэгчийн гарын авлагын холбоосыг хэн харж болохыг заах өгөх',
@@ -227,7 +238,6 @@ return [
     'update'                    => 'Тохиргоог шинэчлэнэ',
     'value'                     => 'Утга',
     'brand'                     => 'Брэнд',
-    'brand_keywords'            => 'footer, logo, print, theme, skin, header, colors, color, css',
     'brand_help'                => 'Logo, Site Name',
     'web_brand'                 => 'Web Branding Type',
     'about_settings_title'      => 'Тохиргооны тухай',
@@ -276,6 +286,8 @@ return [
     'two_factor_enrollment_text'	=> "Хоёр хүчин зүйлийг баталгаажуулах шаардлагатай боловч таны төхөөрөмж одоогоор бүртгэгдээгүй байна. Google Authenticator аппликейшнийг нээж, төхөөрөмжөө бүртгүүлэхийн тулд доорх QR кодыг хайна уу. Та төхөөрөмжөө бүртгүүлснийхээ дараа доорх кодыг оруулна уу",
     'require_accept_signature'      => 'Гарын үсэг зурах шаардлагатай',
     'require_accept_signature_help_text'      => 'Энэ функцийг идэвхжүүлэх нь хэрэглэгчид активыг хүлээн авахдаа биечлэн гарын үсэг зурах шаардлагатай болно.',
+    'require_checkinout_notes'  => 'Require Notes on Checkin/Checkout',
+    'require_checkinout_notes_help_text'    => 'Enabling this feature will require the note fields to be populated when checking in or checking out an asset.',
     'left'        => 'үлдсэн',
     'right'        => 'баруун',
     'top'        => 'дээд',
@@ -313,24 +325,24 @@ return [
     'filter_by_keyword' => 'Filter by setting keyword',
     'security' => 'Security',
     'security_title' => 'Update Security Settings',
-    'security_keywords' => 'password, passwords, requirements, two factor, two-factor, common passwords, remote login, logout, authentication',
     'security_help' => 'Two-factor, Password Restrictions',
-    'groups_keywords' => 'permissions, permission groups, authorization',
     'groups_help' => 'Account permission groups',
     'localization' => 'Localization',
     'localization_title' => 'Update Localization Settings',
-    'localization_keywords' => 'localization, currency, local, locale, time zone, timezone, international, internatinalization, language, languages, translation',
     'localization_help' => 'Language, date display',
     'notifications' => 'Notifications',
     'notifications_help' => 'Email Alerts & Audit Settings',
     'asset_tags_help' => 'Incrementing and prefixes',
     'labels' => 'Labels',
     'labels_title' => 'Update Label Settings',
-    'labels_help' => 'Label sizes &amp; settings',
-    'purge_keywords' => 'permanently delete',
+    'labels_help' => 'Barcodes &amp; label settings',
     'purge_help' => 'Устгагдсан бүртгэл',
     'ldap_extension_warning' => 'It does not look like the LDAP extension is installed or enabled on this server. You can still save your settings, but you will need to enable the LDAP extension for PHP before LDAP syncing or login will work.',
     'ldap_ad' => 'LDAP/AD',
+    'ldap_test_label' => 'Test LDAP Sync',
+    'ldap_test_login' => ' Test LDAP Login',
+    'ldap_username_placeholder' => 'LDAP Username',
+    'ldap_password_placeholder' => 'LDAP Password',
     'employee_number' => 'Employee Number',
     'create_admin_user' => 'Create a User ::',
     'create_admin_success' => 'Success! Your admin user has been added!',
@@ -342,6 +354,8 @@ return [
     'setup_migration_create_user' => 'Next: Create User',
     'ldap_settings_link' => 'LDAP Settings Page',
     'slack_test' => 'Test <i class="fab fa-slack"></i> Integration',
+    'status_label_name' => 'Status Label Name',
+    'super_admin_only'  => 'Super Admin Only',
     'label2_enable'           => 'New Label Engine',
     'label2_enable_help'      => 'Switch to the new label engine. <b>Note: You will need to save this setting before setting others.</b>',
     'label2_template'         => 'Template',
@@ -356,12 +370,15 @@ return [
     'label2_2d_type'          => '2D бар кодны төрөл',
     'label2_2d_type_help'     => 'Format for 2D barcodes',
     'label2_2d_target'        => '2D Barcode Target',
-    'label2_2d_target_help'   => 'The URL the 2D barcode points to when scanned',
+    'label2_2d_target_help'   => 'The data that will be contained in the 2D barcode',
     'label2_fields'           => 'Field Definitions',
     'label2_fields_help'      => 'Fields can be added, removed, and reordered in the left column. For each field, multiple options for Label and DataSource can be added, removed, and reordered in the right column.',
+    'purge_barcodes' => 'Purge Barcodes',
     'help_asterisk_bold'    => 'Text entered as <code>**text**</code> will be displayed as bold',
     'help_blank_to_use'     => 'Leave blank to use the value from <code>:setting_name</code>',
     'help_default_will_use' => '<code>:default</code> will use the value from <code>:setting_name</code>. <br>Note that the value of the barcodes must comply with the respective barcode spec in order to be successfully generated. Please see <a href="https://snipe-it.readme.io/docs/barcodes">the documentation <i class="fa fa-external-link"></i></a> for more details. ',
+    'asset_id'              => 'Asset ID',
+    'data'               => 'Data',
     'default'               => 'Default',
     'none'                  => 'None',
     'google_callback_help' => 'This should be entered as the callback URL in your Google OAuth app settings in your organization&apos;s <strong><a href="https://console.cloud.google.com/" target="_blank">Google developer console <i class="fa fa-external-link" aria-hidden="true"></i></a></strong>.',
@@ -373,7 +390,100 @@ return [
     'database_driver' => 'Database Driver',
     'bs_table_storage' => 'Table Storage',
     'timezone' => 'Timezone',
+    'test_mail' => 'Test Mail',
     'profile_edit'          => 'Edit Profile',
     'profile_edit_help'          => 'Allow users to edit their own profiles.',
+    'default_avatar' => 'Custom Default Avatar',
+    'default_avatar_help' => 'This image will be displayed as a profile if a user does not have a profile photo.',
+    'restore_default_avatar' => 'Restore <a href=":default_avatar" data-toggle="lightbox" data-type="image">original system default avatar</a>',
+    'restore_default_avatar_help' => '',
+    'due_checkin_days' => 'Due For Checkin Warning',
+    'due_checkin_days_help' => 'How many days before the expected checkin of an asset should it be listed in the "Due for checkin" page?',
+    'no_groups' => 'No groups have been created yet. Visit <code>Admin Settings > Permission Groups</code> to add one.',
+    'text' => 'Text',
+
+    'username_formats' => [
+        'username_format'		=> 'Хэрэглэгчийн нэр Формат',
+        'firstname_lastname_format'	=> 'Эхний нэрний нэр (jane.smith)',
+        'first_name_format'	        => 'First Name (jane)',
+        'last_name_format'		=> 'Last Name (doe)',
+        'filastname_format'			=> 'First Initial Last Name (jsmith)',
+        'lastnamefirstinitial_format' =>  'Last Name First Initial (smithj)',
+        'firstname_lastname_underscore_format' => 'First Name Last Name (jane_smith)',
+        'firstinitial.lastname' => 'First Initial Last Name (j.smith)',
+        'lastname_firstinitial' => 'Last Name First Initial (smith_j)',
+        'lastname_dot_firstinitial_format' => 'Last Name First Initial (smith.j)',
+        'firstnamelastname'     => 'First Name Last Name (janesmith)',
+        'firstnamelastinitial'  => 'First Name Last Initial (janes)',
+        'lastnamefirstname'      => 'Last Name.First Name (smith.jane)',
+    ],
+
+    'email_formats' => [
+        'email_format'			=> 'И-мэйл формат',
+        'firstname_lastname_format'	=> 'Эхний нэрний нэр (jane.smith@example.com)',
+        'first_name_format'		=> 'Эхний нэр (jane@example.com)',
+        'last_name_format'		=> 'Last Name (doe@example.com)',
+        'filastname_format'			=> 'Эхний анхны нэр (jsmith@example.com)',
+        'lastnamefirstinitial_format' =>  'Овгийн Эхний Үсэг Өөрийн Нэр (smithj@example.com)',
+        'firstname_lastname_underscore_format' => 'Oвог нэр (jane_smith@example.com)',
+        'firstinitial.lastname' => 'First Initial Last Name (j.smith@example.com)',
+        'lastname_firstinitial' => 'Last Name First Initial (smith_j@example.com)',
+        'lastname_dot_firstinitial_format' => 'Last Name First Initial (smith.j@example.com)',
+        'firstnamelastname'     => 'First Name Last Name (janesmith@example.com)',
+        'firstnamelastinitial'  => 'First Name Last Initial (janes@example.com)',
+        'lastnamefirstname'      => 'Last Name.First Name (smith.jane@example.com)',
+    ],
+
+
+
+    'logo_labels' => [
+        'acceptance_pdf_logo'       => 'PDF Logo',
+        'email_logo'                => 'Email Logo',
+        'label_logo'                => 'Label Logo',
+        'logo'                      => 'Site Logo',
+        'favicon'                   => 'Favicon',
+    ],
+
+    'logo_help' => [
+        'email_logo_size'       => 'Square logos in email look best. ',
+    ],
+
+    'logo_option_types' => [
+        'text' => 'Text',
+        'logo' => 'Лого',
+        'logo_and_text' => 'Logo and Text',
+    ],
+
+
+    'legends' => [
+        'scoping' => 'Scoping',
+        'formats' => 'Default Formats',
+        'profiles' => 'User Profiles',
+        'eula' => 'EULA & Acceptance Preferences',
+        'misc_display' => 'Miscellaneous Display Options',
+        'email' => 'Email Preferences',
+        'checkin' => 'Checkin Preferences',
+        'dashboard' => 'Login & Dashboard Preferences',
+        'misc' => 'Miscellaneous',
+        'logos' => 'Logos & Display',
+        'colors' => 'Colors & Skins',
+        'footer' => 'Footer Preferences',
+        'security' => 'Security Preferences',
+        'general' => 'General',
+        'intervals' => 'Intervals & Thresholds',
+    ],
+
+
+    /* Keywords for settings overview help */
+    'keywords' => [
+        'brand'             => 'footer, logo, print, theme, skin, header, colors, color, css',
+        'general_settings'  => 'company support, signature, acceptance, email format, username format, images, per page, thumbnail, eula, gravatar, tos, dashboard, privacy',
+        'groups'            => 'permissions, permission groups, authorization',
+        'labels'            => 'labels, barcodes, barcode, sheets, print, upc, qr, 1d, 2d',
+        'localization'      => 'localization, currency, local, locale, time zone, timezone, international, internatinalization, language, languages, translation',
+        'php_overview'      => 'phpinfo, system, info',
+        'purge'             => 'permanently delete',
+        'security'          => 'password, passwords, requirements, two factor, two-factor, common passwords, remote login, logout, authentication',
+    ],
 
 ];
diff --git a/resources/lang/mn-MN/admin/settings/message.php b/resources/lang/mn-MN/admin/settings/message.php
index 8a18e5d076..e117609ff7 100644
--- a/resources/lang/mn-MN/admin/settings/message.php
+++ b/resources/lang/mn-MN/admin/settings/message.php
@@ -14,6 +14,9 @@ return [
         'restore_warning'       => 'Yes, restore it. I acknowledge that this will overwrite any existing data currently in the database. This will also log out all of your existing users (including you).',
         'restore_confirm'       => 'Are you sure you wish to restore your database from :filename?'
     ],
+    'restore' => [
+        'success'               => 'Your system backup has been restored. Please log in again.'
+    ],
     'purge' => [
         'error'     => 'Цэвэрлэх явцад алдаа гарлаа.',
         'validation_failed'     => 'Таны таслалтын баталгаа буруу байна. Баталгаажуулалтын хайрцагт "DELETE" үгийг оруулна уу.',
@@ -33,6 +36,9 @@ return [
         'testing_authentication' => 'Testing LDAP Authentication...',
         'authentication_success' => 'User authenticated against LDAP successfully!'
     ],
+    'labels' => [
+        'null_template' => 'Label template not found. Please select a template.',
+        ],
     'webhook' => [
         'sending' => 'Sending :app test message...',
         'success' => 'Your :webhook_name Integration works!',
@@ -42,5 +48,12 @@ return [
         'error' => 'Something went wrong. :app responded with: :error_message',
         'error_redirect' => 'ERROR: 301/302 :endpoint returns a redirect. For security reasons, we don’t follow redirects. Please use the actual endpoint.',
         'error_misc' => 'Something went wrong. :( ',
-    ]
+        'webhook_fail' => ' webhook notification failed: Check to make sure the URL is still valid.',
+        'webhook_channel_not_found' => ' webhook channel not found.',
+        'ms_teams_deprecation' => 'The selected Microsoft Teams webhook URL will be deprecated Dec 31st, 2025. Please use a workflow URL. Microsoft\'s documentation on creating a workflow can be found <a href="https://support.microsoft.com/en-us/office/create-incoming-webhooks-with-workflows-for-microsoft-teams-8ae491c7-0394-4861-ba59-055e33f75498" target="_blank"> here.</a>',
+    ],
+    'location_scoping' => [
+        'not_saved' => 'Your settings were not saved.',
+        'mismatch' => 'There is 1 item in the database that need your attention before you can enable location scoping.|There are :count items in the database that need your attention before you can enable location scoping.',
+    ],
 ];
diff --git a/resources/lang/mn-MN/admin/statuslabels/table.php b/resources/lang/mn-MN/admin/statuslabels/table.php
index 89142f9866..9116bd3f65 100644
--- a/resources/lang/mn-MN/admin/statuslabels/table.php
+++ b/resources/lang/mn-MN/admin/statuslabels/table.php
@@ -1,14 +1,14 @@
 <?php
 
 return array(
-    'about'      	=> 'Статусын гарчгийн талаар',
+    'about'      	=> 'About Status Types',
     'archived'      	=> 'Архивлагдсан',
     'create'      	=> 'Статусын шошго үүсгэнэ үү',
     'color'      	=> 'График өнгө',
     'default_label' => 'Анхдагч шошго',
     'default_label_help' => 'Энэ нь хөрөнгө үүсгэх/засах үед таны хамгийн их ашиглагддаг статусын шошго сонгох талбарын дээд талд гарч ирэхэд ашиглагддаг.',
     'deployable'      	=> 'Даалгавартай',
-    'info'      	=> 'Статусын шошгонууд нь таны өмч хөрөнгүүдийн янз бүрийн мужуудыг тодорхойлоход хэрэглэгддэг. Засварлах, алдагдах, хулгайлагдах гэх мэтчилэн байж болно. Та байршуулах боломжтой, хүлээгдэж байгаа, архивлагдсан хөрөнгөд зориулсан шинэ статусыг үүсгэж болно.',
+    'info'      	=> 'Status label types are used to describe the various states your assets could be in. They may be out for repair, lost/stolen, etc. You can create new status labels for your deployable, pending and archived assets according to your own workflow. For more information, <a href="https://snipe-it.readme.io/docs/overview#status-labels" target="_blank">see the documentation <i class="fa fa-external-link"></i></a>.',
     'name'      	=> 'Статусын нэр',
     'pending'      	=> 'Хүлээгдэж байна',
     'status_type'   => 'Статус төрөл',
diff --git a/resources/lang/mn-MN/admin/users/general.php b/resources/lang/mn-MN/admin/users/general.php
index c2e94471ba..69462b7529 100644
--- a/resources/lang/mn-MN/admin/users/general.php
+++ b/resources/lang/mn-MN/admin/users/general.php
@@ -19,6 +19,8 @@ return [
     'print_assigned'    => 'Бүх хуваарилагдсан хөрөнгийг хэвлэх',
     'email_assigned'    => 'Email List of All Assigned',
     'user_notified'     => 'User has been emailed a list of their currently assigned items.',
+    'users_notified'    => 'The user has been emailed a list of their currently assigned items.|:count users have been emailed a list of their currently assigned items.',
+    'users_notified_warning' => ':count user has been emailed a list of their currently assigned items, however :no_email users did not have an email address so could not be emailed.|:count users have been emailed a list of their currently assigned items, however :no_email user(s) did not have an email address so could not be emailed.',
     'auto_assign_label' => 'Include this user when auto-assigning eligible licenses',
     'auto_assign_help'  => 'Skip this user in auto assignment of licenses',
     'software_user'     => 'Програм хангамж: нэр',
diff --git a/resources/lang/mn-MN/admin/users/message.php b/resources/lang/mn-MN/admin/users/message.php
index c0fad766d6..0ab1b14f0c 100644
--- a/resources/lang/mn-MN/admin/users/message.php
+++ b/resources/lang/mn-MN/admin/users/message.php
@@ -6,7 +6,7 @@ return array(
     'declined'                  => 'Та энэ хөрөнгийг амжилттай татгалзсан.',
     'bulk_manager_warn'	        => 'Таны хэрэглэгчид амжилттай шинэчлэгдсэн хэдий ч таны менежерийн оруулгыг хадгалсангүй, учир нь таны сонгосон менежер засварлах хэрэглэгчийн жагсаалт мөн хэрэглэгчид магадгүй өөрийн менежер биш байж болно. Менежерийг оруулалгүйгээр хэрэглэгчдийг дахин сонгоно уу.',
     'user_exists'               => 'Хэрэглэгч бүртгэгдсэн байна!',
-    'user_not_found'            => 'Хэрэглэгч байхгүй байна.',
+    'user_not_found'            => 'User does not exist or you do not have permission view them.',
     'user_login_required'       => 'Нэвтрэх талбар шаардлагатай байна',
     'user_has_no_assets_assigned' => 'No assets currently assigned to user.',
     'user_password_required'    => 'Нууц үг шаардагдана.',
@@ -53,6 +53,7 @@ return array(
         'ldap_could_not_search' => 'LDAP серверийг хайж чадахгүй байна. LDAP серверийн тохиргоог LDAP тохиргооны файлдаа шалгана уу. <br> LDAP серверийн алдаа:',
         'ldap_could_not_get_entries' => 'LDAP серверээс бичилтийг авч чадсангүй. LDAP серверийн тохиргоог LDAP тохиргооны файлдаа шалгана уу. <br> LDAP серверийн алдаа:',
         'password_ldap' => 'Энэ акаунтын нууц үгийг LDAP / Active Directory удирддаг. Нууц үгээ солихын тулд өөрийн IT хэлтэст хандана уу.',
+        'multi_company_items_assigned' => 'This user has items assigned that belong to a different company. Please check them in or edit their company.'
     ),
 
     'deletefile' => array(
diff --git a/resources/lang/mn-MN/admin/users/table.php b/resources/lang/mn-MN/admin/users/table.php
index 7dff251dc6..6fddfc85b9 100644
--- a/resources/lang/mn-MN/admin/users/table.php
+++ b/resources/lang/mn-MN/admin/users/table.php
@@ -22,7 +22,7 @@ return array(
     'managed_locations'     => 'Managed Locations',
     'managed_users'         => 'Managed Users',
     'name' 					=> 'Нэр',
-    'nogroup'               => 'No groups have been created yet. To add one, visit: ',
+    'nogroup'               => 'No groups have been created yet. To add one, visit:',
     'notes'                 => 'Тэмдэглэл',
     'password_confirm' 		=> 'Нууц үгээ батална уу',
     'password' 				=> 'Нууц үг',
diff --git a/resources/lang/mn-MN/auth.php b/resources/lang/mn-MN/auth.php
index db310aa1bb..14d8acfce0 100644
--- a/resources/lang/mn-MN/auth.php
+++ b/resources/lang/mn-MN/auth.php
@@ -15,6 +15,6 @@ return array(
 
     'failed' => 'These credentials do not match our records.',
     'password' => 'The provided password is incorrect.',
-    'throttle' => 'Too many login attempts. Please try again in :seconds seconds.',
+    'throttle' => 'Too many login attempts. Please try again in :minutes minute(s).',
 
 );
diff --git a/resources/lang/mn-MN/auth/message.php b/resources/lang/mn-MN/auth/message.php
index 09735146a4..ed459b8d1d 100644
--- a/resources/lang/mn-MN/auth/message.php
+++ b/resources/lang/mn-MN/auth/message.php
@@ -6,8 +6,6 @@ return array(
     'account_not_found'      => 'Хэрэглэгчийн нэр эсвэл нууц үг буруу байна.',
     'account_not_activated'  => 'Энэ хэрэглэгчийн бүртгэл идэвхжээгүй байна.',
     'account_suspended'      => 'Энэ хэрэглэгчийн бүртгэлийг түдгэлзүүлсэн байна.',
-    'account_banned'         => 'Энэ хэрэглэгчийн бүртгэлийг хориглосон байна.',
-    'throttle'               => 'Too many failed login attempts. Please try again in :minutes minutes.',
 
     'two_factor' => array(
         'already_enrolled'      => 'Your device is already enrolled.',
diff --git a/resources/lang/mn-MN/button.php b/resources/lang/mn-MN/button.php
index db7ced26c4..2628619946 100644
--- a/resources/lang/mn-MN/button.php
+++ b/resources/lang/mn-MN/button.php
@@ -7,6 +7,7 @@ return [
     'checkin_and_delete'  	    => 'Checkin All / Delete User',
     'delete'  	                => 'Устгах',
     'edit'    	                => 'Засах',
+    'clone'    	                => 'Clone',
     'restore' 	                => 'Сэргээх',
     'remove'                    => 'Remove',
     'request'                   => 'Хүсэлт',
@@ -21,4 +22,13 @@ return [
     'add_maintenance'           => 'Add Maintenance',
     'append'                    => 'Append',
     'new'                       => 'Шинэ',
+    'var' => [
+        'clone'     => 'Clone :item_type',
+        'edit'      => 'Edit :item_type',
+        'delete'    => 'Delete :item_type',
+        'restore'   => 'Restore :item_type',
+        'create'    => 'Create New :item_type',
+        'checkout'  => 'Checkout :item_type',
+        'checkin'   => 'Checkin :item_type',
+    ]
 ];
diff --git a/resources/lang/mn-MN/general.php b/resources/lang/mn-MN/general.php
index 0775a036ce..6defa0d1d3 100644
--- a/resources/lang/mn-MN/general.php
+++ b/resources/lang/mn-MN/general.php
@@ -10,7 +10,7 @@ return [
     'action'                => 'Үйлдэл',
     'activity_report'		=> 'Үйл ажиллагааны тайлан',
     'address'				=> 'Хаяг',
-    'admin'					=> 'админ',
+    'admin'					=> 'Admin Settings',
     'admin_tooltip'			=> 'This user has admin privileges',
     'superuser'				=> 'Superuser',
     'superuser_tooltip'		=> 'This user has superuser privileges',
@@ -23,13 +23,16 @@ return [
     'asset_models'			=> 'Хөрөнгийн загвар',
     'asset_model'			=> 'Загвар',
     'asset'					=> 'Актив',
+    'asset_previous'        => 'Asset (Previously Assigned)',
     'asset_report'          => 'Хөрөнгийн тайлан',
     'asset_tag'				=> 'Хөрөнгийн шошго',
     'asset_tags'            => 'Asset Tags',
     'assets_available'		=> 'Assets available',
     'accept_assets'         => 'Accept Assets :name',
     'accept_assets_menu'    => 'Accept Assets',
+    'accept_item'           => 'Accept Item',
     'audit'				    => 'Аудит',
+    'audits'				=> 'Audits',
     'audit_report'			=> 'Аудитын бүртгэл',
     'assets'				=> 'Актив',
     'assets_audited'        => 'assets audited',
@@ -61,9 +64,12 @@ return [
     'changepassword'  		=> 'Нууц үг солих',
     'checkin'  				=> 'Шалгах',
     'checkin_from'  		=> '-аас бүртгүүлэх',
+    'checkin_note'  		=> 'Checkin Note',
+    'checkout_note'  		=> 'Checkout Note',
     'checkout'  			=> 'Тооцоо хийх',
     'checkouts_count'       => 'Олгосон',
     'checkins_count'        => 'Буцаан авсан',
+    'checkin_and_delete'  	=> 'Checkin and Delete',
     'user_requests_count'   => 'Хүсэлт',
     'city'  				=> 'Хот',
     'click_here'			=> 'Энд дар',
@@ -77,7 +83,7 @@ return [
     'consumables'			=> 'Хэрэглээ',
     'country'  				=> 'Улс',
     'could_not_restore'     => 'Error restoring :item_type: :error',
-    'not_deleted'           => 'The :item_type is not deleted so it cannot be restored',
+    'not_deleted'           => 'The :item_type was not deleted and therefore cannot be restored',
     'create'				=> 'Шинэ болгох',
     'created'               => 'Үүссэн зүйл',
     'created_asset'			=> 'актив үүсгэсэн',
@@ -86,11 +92,13 @@ return [
     'record_created' 		=> 'Record Created',
     'updated_at' 			=> 'Дээр шинэчилсэн',
     'currency'  			=> '$', // this is deprecated
+    'currency_text'  		=> 'Currency', //
     'current'  				=> 'Одоогийн байдлаар',
     'current_password'      => 'Current Password',
     'customize_report'      => 'Customize Report',
     'custom_report'         => 'Гаалийн хєрєнгийн тайлан',
     'dashboard'				=> 'Хянах самбар',
+    'data_source'           => 'Data Source',
     'days'      			=> 'өдөр',
     'days_to_next_audit'    => 'Дараагийн аудитуудад орох өдрүүд',
     'date'					=> 'Огноо',
@@ -98,7 +106,7 @@ return [
     'debug_warning_text'    => 'Энэ програм нь дибаг хийх боломжтойгоор үйлдвэрлэлийн горимд ажиллаж байна. Хэрэв таны хэрэглээ гаднах ертөнцөд хүртээмжтэй бол эмзэг өгөгдлийг илтгэнэ. <code>APP_DEBUG</code> утгыг өөрийн <code>.env</code> файлыг <code>false</code> руу тохируулах замаар дибаг хийх горимыг идэвхгүй болгох.',
     'delete'  				=> 'Устгах',
     'delete_confirm'  		=> 'Та :item устгахыг хүсч байгаадаа итгэлтэй байна уу?',
-    'delete_confirm_no_undo' => 'Are you sure you wish to delete :item? This can not be undone.',
+    'delete_confirm_no_undo' => 'Are you sure, you wish to delete :item? This cannot be undone.',
     'deleted'  				=> 'Устгагдсан',
     'delete_seats'  		=> 'Устгагдсан суудал',
     'deletion_failed'       => 'Deletion failed',
@@ -114,29 +122,13 @@ return [
     'editprofile'  			=> 'Өөрийн профайлаа засах',
     'eol'					=> 'EOL',
     'email_domain'			=> 'Домэйн мэйл',
-    'email_format'			=> 'И-мэйл формат',
     'employee_number'       => 'Employee Number',
     'email_domain_help'		=> 'Энэ нь импортлох үед имэйл хаяг үүсгэхэд ашиглагддаг',
     'error'				    => 'Error',
     'exclude_archived'      => 'Exclude Archived Assets',
     'exclude_deleted'       => 'Exclude Deleted Assets',
     'example'				=> 'Example: ',
-    'filastname_format'			=> 'Эхний анхны нэр (jsmith@example.com)',
-    'firstname_lastname_format'	=> 'Эхний нэрний нэр (jane.smith@example.com)',
-    'firstname_lastname_underscore_format' => 'Oвог нэр (jane_smith@example.com)',
-    'lastnamefirstinitial_format' =>  'Овгийн Эхний Үсэг Өөрийн Нэр (smithj@example.com)',
-    'firstintial_dot_lastname_format' => 'First Initial Last Name (j.smith@example.com)',
-    'firstname_lastname_display'	=> 'First Name Last Name (Jane Smith)',
-    'lastname_firstname_display'	=> 'Last Name First Name (Smith Jane)',
-    'name_display_format'	=> 'Name Display Format',
-    'first'					=> 'Эхлээд',
-    'firstnamelastname'     => 'First Name Last Name (janesmith@example.com)',
-    'lastname_firstinitial' => 'Last Name First Initial (smith_j@example.com)',
-    'firstinitial.lastname' => 'First Initial Last Name (j.smith@example.com)',
-    'firstnamelastinitial'  => 'First Name Last Initial (janes@example.com)',
-    'lastnamefirstname'      => 'Last Name First Name (smith.jane@example.com)',
-    'first_name'			=> 'Нэр',
-    'first_name_format'		=> 'Эхний нэр (jane@example.com)',
+
     'files'                 => 'Файлууд',
     'file_name'				=> 'Файл',
     'file_type'             => 'File Type',
@@ -156,9 +148,9 @@ return [
     'image_delete'         	=> 'Зураг устгах',
     'include_deleted'       => 'Include Deleted Assets',
     'image_upload'         	=> 'Зургийн байршуулалт',
-    'filetypes_accepted_help'    => 'Accepted filetype is :types. Max upload size allowed is :size.|Accepted filetypes are :types. Max upload size allowed is :size.',
-    'filetypes_size_help'   => 'Max upload size allowed is :size.',
-    'image_filetypes_help'  => 'Accepted filetypes are jpg, webp, png, gif, svg, and avif. Max upload size allowed is :size.',
+    'filetypes_accepted_help'    => 'Accepted filetype is :types. The maximum size allowed is :size.|Accepted filetypes are :types. The maximum upload size allowed is :size.',
+    'filetypes_size_help'   => 'The maximum upload size allowed is :size.',
+    'image_filetypes_help'  => 'Accepted Filetypes are jpg, webp, png, gif, svg, and avif. The maximum upload size allowed is :size.',
     'unaccepted_image_type'  => 'This image file was not readable. Accepted filetypes are jpg, webp, png, gif, and svg. The mimetype of this file is: :mimetype.',
     'import'         	    => 'Импорт',
     'import_this_file'      => 'Map fields and process this file',
@@ -178,12 +170,17 @@ return [
     'last'					=> 'Хамгийн сүүлд',
     'last_login'            => 'Сүүлчийн Нэвтрэх',
     'last_name'             => 'Сүүлийн нэр',
+    'firstname_lastname_display'	=> 'First Name Last Name (Jane Smith)',
+    'lastname_firstname_display'	=> 'Last Name First Name (Smith Jane)',
+    'name_display_format'	=> 'Name Display Format',
+    'first'					=> 'Эхлээд',
+    'first_name'			=> 'Нэр',
     'license'				=> 'Лиценз',
     'license_report'        => 'Лицензийн тайлан',
     'licenses_available'	=> 'Licenses available',
     'licenses'				=> 'Лицензүүд',
     'list_all'				=> 'Бүгдийг жагсаах',
-    'loading'				=> 'Loading... please wait....',
+    'loading'				=> 'Loading... please wait...',
     'lock_passwords'        => 'This field value will not be saved in a demo installation.',
     'feature_disabled'      => 'Демо суулгацын энэ онцлогийг идэвхгүй болгосон байна.',
     'location'              => 'Байршил',
@@ -193,7 +190,7 @@ return [
     'logout'				=> 'Гарах',
     'lookup_by_tag'     => 'Хөрөнгийн Tagаар хайх',
     'maintenances'          => 'Засвар үйлчилгээ',
-    'manage_api_keys'       => 'Manage API Keys',
+    'manage_api_keys'       => 'Manage API keys',
     'manufacturer'			=> 'Үйлдвэрлэгч',
     'manufacturers'			=> 'Үйлдвэрлэгчид',
     'markdown'				=> 'Энэ талбар нь <a href="https://help.github.com/articles/github-flavored-markdown/"> Гитуб амттай markdown</a>.',
@@ -215,6 +212,14 @@ return [
     'no_results'			=> 'Үр дүнгүй.',
     'no'  					=> 'Үгүй',
     'notes'  				=> 'Тэмдэглэл',
+    'note_added'            => 'Note Added',
+    'options'				=> 'Options',
+    'preview'				=> 'Preview',
+    'add_note'              => 'Add Note',
+    'note_edited'            => 'Note Edited',
+    'edit_note'              => 'Edit Note',
+    'note_deleted'            => 'Note Deleted',
+    'delete_note'              => 'Delete Note',
     'order_number'          => 'Захиалгын дугаар',
     'only_deleted'          => 'Only Deleted Assets',
     'page_menu'				=> '_MENU_ зүйлсийг харуулж байна',
@@ -229,7 +234,7 @@ return [
     'purchase_date'         => 'Худалдан авах өдөр',
     'qty'		            => 'QTY',
     'quantity'		        => 'Тоо хэмжээ',
-    'quantity_minimum'      => 'You have :count items below or almost below minimum quantity levels',
+    'quantity_minimum'      => 'You have one item below or almost below minimum quantity levels|You have :count items below or almost below minimum quantity levels',
     'quickscan_checkin'  	=> 'Quick Scan Checkin',
     'quickscan_checkin_status'  	=> 'Checkin Status',
     'ready_to_deploy'		=> 'Хэрэглэхэд бэлэн байна',
@@ -254,7 +259,7 @@ return [
     'select_all'            => 'Select All',
     'search'				=> 'Хайлт',
     'select_category'       => 'Ангилал сонго',
-    'select_datasource' => 'Select a Datasource',
+    'select_datasource' => 'Select a data source',
     'select_department'     => 'Департамент сонгоно уу',
     'select_depreciation'	=> 'Элэгдэлийн төрлийг сонгоно уу',
     'select_location'		=> 'Байршлыг сонгоно уу',
@@ -274,13 +279,15 @@ return [
     'signed_off_by'         => 'Signed Off By',
     'skin'       			=> 'Гадарга',
     'webhook_msg_note'        => 'A notification will be sent via webhook',
-    'webhook_test_msg'        => 'Oh hai! Looks like your :app integration with Snipe-IT is working!',
+    'webhook_test_msg'        => 'Oh hai! It looks like your :app integration with Snipe-IT is working!',
     'some_features_disabled' => 'DEMO MODE: Энэ суулгацад зарим функцууд хаагдсан байна.',
     'site_name'				=> 'Сайтын нэр',
     'state'  				=> 'Улс',
     'status_labels'			=> 'Статусын шошго',
+    'status_label'			=> 'Status Label',
     'status'    			=> 'Статус',
     'accept_eula'           => 'Acceptance Agreement',
+    'show_or_hide_eulas' => 'Show/Hide EULAs',
     'supplier'              => 'Нийлүүлэгч',
     'suppliers'  			=> 'Нийлүүлэгч',
     'sure_to_delete'        => 'Та устгахыг хүсч байгаадаа итгэлтэй байна уу',
@@ -296,9 +303,9 @@ return [
     'type'  				=> 'Төрөл',
     'undeployable'			=> 'Дахин ашиглах боломжгүй байна',
     'unknown_admin'			=> 'Unknown Admin',
-    'username_format'		=> 'Хэрэглэгчийн нэр Формат',
     'username'              => 'Нэвтрэх нэр',
     'update'                => 'Шинэчлэх',
+    'updating_item' => 'Updating :item',
     'upload_filetypes_help'      => 'Allowed filetypes are png, gif, jpg, jpeg, doc, docx, pdf, xls, xlsx, txt, lic, xml, zip, rtf and rar. Max upload size allowed is :size.',
     'uploaded'              => 'Байршуулсан байна',
     'user'					=> 'Хэрэглэгч',
@@ -323,10 +330,10 @@ return [
     'token_expired'         => 'Таны маягт дууссан байна. Дахин оролдоно уу.',
     'login_enabled'         => 'Login Enabled',
     'audit_due'             => 'Due for Audit',
-    'audit_due_days'        => 'Assets Due for Audit Within :days Day|Assets Due for Audit Within :days Days',
+    'audit_due_days'        => '{}Assets Due or Overdue for Audit|[1]Assets Due or Overdue for Audit Within a Day|[2,*]Assets Due or Overdue for Audit Within :days Days',
     'checkin_due'           => 'Due for Checkin',
     'checkin_overdue'       => 'Overdue for Checkin',
-    'checkin_due_days'      => 'Assets Due for Checkin Within :days Day|Assets Due for Checkin Within :days Days',
+    'checkin_due_days'      => '{}Due for Checkin|[1]Assets Due for Checkin Within :days Day|[2,*]Assets Due for Checkin Within :days Days',
     'audit_overdue'         => 'Overdue for Audit',
     'accept'                => 'Accept :asset',
     'i_accept'              => 'I accept',
@@ -339,16 +346,16 @@ return [
     'view_all'              => 'view all',
     'hide_deleted'          => 'Hide Deleted',
     'email'                 => 'И-мэйл хаяг',
-    'do_not_change'         => 'Do Not Change',
-    'bug_report'            => 'Report a Bug',
+    'do_not_change'         => 'Do not change',
+    'bug_report'            => 'Report a bug',
     'user_manual'           => 'User\'s Manual',
     'setup_step_1'          => 'Step 1',
     'setup_step_2'          => 'Step 2',
     'setup_step_3'          => 'Step 3',
     'setup_step_4'          => 'Step 4',
     'setup_config_check'    => 'Configuration Check',
-    'setup_create_database' => 'Create Database Tables',
-    'setup_create_admin'    => 'Create Admin User',
+    'setup_create_database' => 'Create database tables',
+    'setup_create_admin'    => 'Create an admin user',
     'setup_done'            => 'Finished!',
     'bulk_edit_about_to'    => 'You are about to edit the following: ',
     'checked_out'           => 'Нь шалгаж',
@@ -383,6 +390,8 @@ return [
     'new_license'           => 'New License',
     'new_accessory'         => 'New Accessory',
     'new_consumable'        => 'New Consumable',
+    'new_component'         => 'New Component',
+    'new_user'              => 'New User',
     'collapse'              => 'Collapse',
     'assigned'              => 'Assigned',
     'asset_count'           => 'Asset Count',
@@ -418,19 +427,20 @@ return [
     'bulk_soft_delete'      =>'Also soft-delete these users. Their asset history will remain intact unless/until you purge deleted records in the Admin Settings.',
     'bulk_checkin_delete_success' => 'Your selected users have been deleted and their items have been checked in.',
     'bulk_checkin_success' => 'The items for the selected users have been checked in.',
-    'set_to_null'           => 'Delete values for this asset|Delete values for all :asset_count assets ',
+    'set_to_null'           => 'Delete values for this selection|Delete values for all :selection_count selections ',
     'set_users_field_to_null'  => 'Delete :field values for this user|Delete :field values for all :user_count users ',
     'na_no_purchase_date'   => 'N/A - No purchase date provided',
     'assets_by_status'      => 'Assets by Status',
     'assets_by_status_type'      => 'Assets by Status Type',
     'pie_chart_type'        => 'Dashboard Pie Chart Type',
     'hello_name'            => 'Hello, :name!',
-    'unaccepted_profile_warning'   => 'You have :count items requiring acceptance. Click here to accept or decline them',
+    'unaccepted_profile_warning'   => 'You have one item requiring acceptance. Click here to accept or decline it | You have :count items requiring acceptance. Click here to accept or decline them',
     'start_date'            => 'Start Date',
     'end_date'            => 'End Date',
     'alt_uploaded_image_thumbnail' => 'Uploaded thumbnail',
     'placeholder_kit'       => 'Select a kit',
     'file_not_found'        => 'File not found',
+    'log_record_not_found'  => 'No record for that log entry was found.',
     'preview_not_available' => '(no preview)',
     'setup'                 => 'Setup',
     'pre_flight'            => 'Pre-Flight',
@@ -512,7 +522,7 @@ return [
     'checked_out_to_fields' => 'Checked Out To Fields',
     'percent_complete' => '% бүрэн дуусгах',
     'uploading' => 'Uploading... ',
-    'upload_error' => 'Error uploading file. Please check that there are no empty rows and that no column names are duplicated.',
+    'upload_error' => 'Error uploading file. Please check that you have no empty rows or duplicated column names in your CSV, and that the server permissions allow uploads.',
     'copy_to_clipboard' => 'Copy to Clipboard',
     'copied' => 'Copied!',
     'status_compatibility' => 'If assets are already assigned, they cannot be changed to a non-deployable status type and this value change will be skipped.',
@@ -549,6 +559,71 @@ return [
         'license_seats'  => ':count License Seat|:count License Seats',
         'consumables'  => ':count Consumable|:count Consumables',
         'components'  => ':count Component|:count Components',
-    ]
+    ],
+
+    'more_info' => 'Илүү мэдээлэл',
+    'quickscan_bulk_help' => 'Checking this box will edit the asset record to reflect this new location. Leaving it unchecked will simply note the location in the audit log. Note that if this asset is checked out, it will not change the location of the person, asset or location it is checked out to.',
+    'whoops' => 'Whoops!',
+    'something_went_wrong' => 'Something went wrong with your request.',
+    'close' => 'Close',
+    'expires' => 'Хугацаа дуусна',
+    'map_fields'=> 'Map :item_type Fields',
+    'remaining_var' => ':count Remaining',
+    'label' => 'Label',
+    'import_asset_tag_exists' => 'An asset with the asset tag :asset_tag already exists and an update was not requested. No change was made.',
+    'countries_manually_entered_help' => 'Values with an asterisk (*) were manually entered and do not match existing ISO 3166 dropdown values',
+    'accessories_assigned' => 'Assigned Accessories',
+    'user_managed_passwords' => 'Password Management',
+    'user_managed_passwords_disallow' => 'Disallow users from managing their own passwords',
+    'user_managed_passwords_allow' => 'Allow users to manage their own passwords',
+    'from' => 'From',
+    'by' => 'Хэрэглэгч',
+
+// Add form placeholders here
+    'placeholders' => [
+        'notes'  => 'Add a note',
+    ],
+
+    'breadcrumb_button_actions' => [
+        'edit_item' => 'Edit :name',
+        'checkout_item' => 'Checkout :name',
+        'checkin_item' => 'Checkin :name',
+    ],
+
+    'skins' => [
+        'site_default' => 'Site Default',
+        'default_blue' => 'Default Blue',
+        'blue_dark' => 'Blue (Dark Mode)',
+        'green' => 'Green Dark',
+        'green_dark' => 'Green (Dark Mode)',
+        'red' => 'Red Dark',
+        'red_dark' => 'Red (Dark Mode)',
+        'orange' => 'Orange Dark',
+        'orange_dark' => 'Orange (Dark Mode)',
+        'black' => 'Black',
+        'black_dark' => 'Black (Dark Mode)',
+        'purple' => 'Purple',
+        'purple_dark' => 'Purple (Dark Mode)',
+        'yellow' => 'Yellow',
+        'yellow_dark' => 'Yellow (Dark Mode)',
+        'high_contrast' => 'High Contrast',
+
+    ],
+
+    'select_all_none' => 'Select/Unselect All',
+    'generic_model_not_found' => 'That :model was not found or you do not have permission to access it',
+    'deleted_models' => 'Deleted Asset Models',
+    'deleted_users' => 'Deleted Users',
+    'cost_each' => ':amount each',
+    'remove_current_image' => 'Remove current :type image',
+
+    'seeding' => [
+        'manufacturers' => [
+            'button' => 'Create Manufacturers',
+            'prompt' => 'You do not have any manufacturers yet. Would you like to seed a list of common manufacturers? (THIS WILL OVERWRITE EXISTING MANUFACTURERS, including those that have been soft-deleted.)',
+            'success' => 'Manufacturers seeded successfully',
+            'error' => 'Could not seed manufacturers. A manufacturer record already exists and seeding would overwrite it.|Could not seed manufacturers. :count manufacturer records already exist and seeding would overwrite them.',
+        ],
+    ],
 
 ];
diff --git a/resources/lang/mn-MN/localizations.php b/resources/lang/mn-MN/localizations.php
index f1232dd138..827ed4fca1 100644
--- a/resources/lang/mn-MN/localizations.php
+++ b/resources/lang/mn-MN/localizations.php
@@ -2,7 +2,7 @@
 
 return [
 
-    'select_language' => 'Select a language',
+    'select_language' => 'Select a Language',
     'languages' => [
         'en-US'=> 'English, US',
         'en-GB'=> 'English, UK',
@@ -40,7 +40,9 @@ return [
         'ms-MY'=> 'Malay',
         'mi-NZ'=> 'Maori',
         'mn-MN'=> 'Mongolian',
-        'no-NO'=> 'Norwegian',
+        'nb-NO'=> 'Norwegian Bokmål',
+        'om-ET' => 'Oromo (Ethiopian)',
+        //'nn-NO'=> 'Norwegian Nynorsk',
         'fa-IR'=> 'Persian',
         'pl-PL'=> 'Polish',
         'pt-PT'=> 'Portuguese',
@@ -66,7 +68,7 @@ return [
         'zu-ZA'=> 'Zulu',
     ],
 
-    'select_country' => 'Select a country',
+    'select_country' => 'Select a Country',
     
     'countries' => [
         'AC'=>'Ascension Island',
@@ -133,6 +135,7 @@ return [
         'EC'=>'Ecuador',
         'EE'=>'Estonia',
         'EG'=>'Egypt',
+        'GB-ENG'=>'England',
         'ER'=>'Eritrea',
         'ES'=>'Spain',
         'ET'=>'Ethiopia',
@@ -231,6 +234,7 @@ return [
         'NG'=>'Nigeria',
         'NI'=>'Nicaragua',
         'NL'=>'Netherlands',
+        'GB-NIR' => 'Northern Ireland',
         'NO'=>'Norway',
         'NP'=>'Nepal',
         'NR'=>'Nauru',
@@ -258,7 +262,7 @@ return [
         'RU'=>'Russian Federation',
         'RW'=>'Rwanda',
         'SA'=>'Saudi Arabia',
-        'UK'=>'Scotland',
+        'GB-SCT'=>'Scotland',
         'SB'=>'Solomon Islands',
         'SC'=>'Seychelles',
         'SS'=>'South Sudan',
@@ -310,6 +314,7 @@ return [
         'VI'=>'Virgin Islands (U.S.)',
         'VN'=>'Viet Nam',
         'VU'=>'Vanuatu',
+        'GB-WLS' =>'Wales',
         'WF'=>'Wallis And Futuna Islands',
         'WS'=>'Samoa',
         'YE'=>'Yemen',
diff --git a/resources/lang/mn-MN/mail.php b/resources/lang/mn-MN/mail.php
index a76f7283dc..88b5517e62 100644
--- a/resources/lang/mn-MN/mail.php
+++ b/resources/lang/mn-MN/mail.php
@@ -23,24 +23,25 @@ return [
     'Item_Requested' => 'Барааны хүсэлт',
     'License_Checkin_Notification' => 'License checked in',
     'License_Checkout_Notification' => 'License checked out',
+    'license_for'   => 'License for',
     'Low_Inventory_Report' => 'Бага нөөцийн тайлан',
     'a_user_canceled' => 'Хэрэглэгч вэбсайт дээрх зүйл хүсэлтийг цуцалсан байна',
     'a_user_requested' => 'Хэрэглэгч вэбсайт дээрх зүйлийг хүссэн байна',
     'acceptance_asset_accepted' => 'A user has accepted an item',
     'acceptance_asset_declined' => 'A user has declined an item',
-    'accessory_name' => 'Дагалдах хэрэгслийн нэр:',
-    'additional_notes' => 'Нэмэлт тайлбар:',
+    'accessory_name' => 'Дагалдах хэрэгслийн нэр',
+    'additional_notes' => 'Нэмэлт тайлбар',
     'admin_has_created' => 'Администратор танд зориулж дараах вэбсайт дээр акаунт үүсгэсэн байна.',
-    'asset' => 'Актив:',
-    'asset_name' => 'Хөрөнгийн нэр:',
+    'asset' => 'Актив',
+    'asset_name' => 'Хөрөнгийн нэр',
     'asset_requested' => 'Хөрөнгө хүссэн',
     'asset_tag' => 'Хөрөнгийн шошго',
     'assets_warrantee_alert' => 'There is :count asset with a warranty expiring in the next :threshold days.|There are :count assets with warranties expiring in the next :threshold days.',
     'assigned_to' => 'Томилогдсон',
     'best_regards' => 'Хамгийн сайн нь,',
-    'canceled' => 'Цуцалсан:',
-    'checkin_date' => 'Огноо шалгах:',
-    'checkout_date' => 'Тооцоо хийх өдөр:',
+    'canceled' => 'Цуцалсан',
+    'checkin_date' => 'Checkin Огноо',
+    'checkout_date' => 'Тооцоо хийх өдөр',
     'checkedout_from' => 'Checked out from',
     'checkedin_from'  => 'Checked in from',
     'checked_into' => 'Checked into',
@@ -49,27 +50,30 @@ return [
     'click_to_confirm' => 'Вэбсайтаа баталгаажуулахын тулд дараах холбоос дээр дарна уу:',
     'current_QTY' => 'Одоогийн QTY',
     'days' => 'Өдөр',
-    'expecting_checkin_date' => 'Хүлээгдэж буй хугацаа:',
+    'expecting_checkin_date' => 'Хүлээгдэж буй хугацаа',
     'expires' => 'Хугацаа дуусна',
     'hello' => 'Сайн уу',
     'hi' => 'Сайн уу',
     'i_have_read' => 'Би ашиглалтын нөхцөлийг уншиж, зөвшөөрч, энэ зүйлийг хүлээн авсан.',
     'inventory_report' => 'Inventory Report',
-    'item' => 'Зүйл:',
+    'item' => 'Зүйл',
+    'item_checked_reminder' => 'This is a reminder that you currently have :count items checked out to you that you have not accepted or declined. Please click the link below to confirm your decision.',
     'license_expiring_alert' => ':count ширхэг лизенц :threshhold өдрийн дотор дуусна.|:count ширхэг лизенц :threshhold өдрийн дотор дуусна.',
     'link_to_update_password' => 'Вэбсайтаа шинэчлэхийн тулд дараах холбоос дээр дарна уу:',
-    'login' => 'Нэвтрэх:',
+    'login' => 'Нэвтрэх',
     'login_first_admin' => 'Слайд-IT-г суулгахын тулд доорх итгэмжлэлүүдийг ашиглана уу:',
     'low_inventory_alert' => ':count ширхэг барааны нөөц дуусаж байна.|:count ширхэг барааны нөөц дуусаж байна.',
     'min_QTY' => 'Min QTY',
     'name' => 'Нэр',
     'new_item_checked' => 'Таны нэрээр шинэ зүйл шалгасан бөгөөд дэлгэрэнгүй мэдээлэл доор байна.',
+    'new_item_checked_with_acceptance' => 'A new item has been checked out under your name that requires acceptance, details are below.',
+    'recent_item_checked' => 'An item was recently checked out under your name that requires acceptance, details are below.',
     'notes' => 'Тэмдэглэл',
-    'password' => 'Нууц үг:',
+    'password' => 'Нууц үг',
     'password_reset' => 'Нууц үг шинэчлэх',
     'read_the_terms' => 'Доорх хэрэглээний нөхцөлийг уншина уу.',
     'read_the_terms_and_click' => 'Please read the terms of use below, and click on the link at the bottom to confirm that you read and agree to the terms of use, and have received the asset.',
-    'requested' => 'Хүсэлт гаргасан:',
+    'requested' => 'Хүсэлт гаргасан',
     'reset_link' => 'Таны нууц үгээ шинэчлэх линк',
     'reset_password' => 'Нууц үгээ дахин тохируулах бол энд дарна уу:',
     'rights_reserved' => 'All rights reserved.',
@@ -86,8 +90,10 @@ return [
     'upcoming-audits' => 'There is :count asset that is coming up for audit within :threshold days.|There are :count assets that are coming up for audit within :threshold days.',
     'user' => 'Хэрэглэгч',
     'username' => 'Нэвтрэх нэр',
+    'unaccepted_asset_reminder' => 'Reminder: You have Unaccepted Assets.',
     'welcome' => 'Тавтай морилно уу: нэр',
     'welcome_to' => 'Тавтай морилно уу: Вэб хуудас!',
     'your_assets' => 'View Your Assets',
     'your_credentials' => 'Таны Snipe-IT итгэмжлэлүүд',
+    'mail_sent' => 'Mail sent successfully!',
 ];
diff --git a/resources/lang/mn-MN/validation.php b/resources/lang/mn-MN/validation.php
index 70a99c5323..8db8392191 100644
--- a/resources/lang/mn-MN/validation.php
+++ b/resources/lang/mn-MN/validation.php
@@ -13,87 +13,150 @@ return [
     |
     */
 
-    'accepted'             => 'Үүнд: аттрибут хүлээн авах ёстой.',
-    'active_url'           => 'Үүнд: атрибут нь зөв URL биш байна.',
-    'after'                => 'Үүнд: аттрибут нь дараах огноо байх ёстой: date.',
-    'after_or_equal'       => 'Үүнд: аттрибут нь дараах огноо эсвэл тэнцүү байх огноо байх ёстой.',
-    'alpha'                => 'Үүнд: аттрибут нь зөвхөн үсэг агуулдаг.',
-    'alpha_dash'           => 'Үүнд: аттрибут нь зөвхөн үсэг, тоо, зураас агуулсан байж болно.',
-    'alpha_num'            => 'Үүнд: аттрибут нь зөвхөн үсэг, тоо агуулж болно.',
-    'array'                => 'Үүнд: атрибут нь массив байх ёстой.',
-    'before'               => 'Үүнд: аттрибут нь огноогоос өмнө он сар байх ёстой.',
-    'before_or_equal'      => 'Үүнд: аттрибут нь огноогоос өмнө эсвэл огноо байх ёстой.',
-    'between'              => [
-        'numeric' => 'Үүнд: атрибут нь дараах байх ёстой: min ба: max.',
-        'file'    => 'Үүнд: аттрибут нь: min ба: max килобайт хооронд байх ёстой.',
-        'string'  => 'Үүнд: аттрибут нь дараах байх ёстой: min ба: max тэмдэгтүүд.',
-        'array'   => 'Үүнд: аттрибут нь дараах байх ёстой: min ба: max items.',
+    'accepted' => 'The :attribute field must be accepted.',
+    'accepted_if' => 'The :attribute field must be accepted when :other is :value.',
+    'active_url' => 'The :attribute field must be a valid URL.',
+    'after' => 'The :attribute field must be a date after :date.',
+    'after_or_equal' => 'The :attribute field must be a date after or equal to :date.',
+    'alpha' => 'The :attribute field must only contain letters.',
+    'alpha_dash' => 'The :attribute field must only contain letters, numbers, dashes, and underscores.',
+    'alpha_num' => 'The :attribute field must only contain letters and numbers.',
+    'array' => 'The :attribute field must be an array.',
+    'ascii' => 'The :attribute field must only contain single-byte alphanumeric characters and symbols.',
+    'before' => 'The :attribute field must be a date before :date.',
+    'before_or_equal' => 'The :attribute field must be a date before or equal to :date.',
+    'between' => [
+        'array' => 'The :attribute field must have between :min and :max items.',
+        'file' => 'The :attribute field must be between :min and :max kilobytes.',
+        'numeric' => 'The :attribute field must be between :min and :max.',
+        'string' => 'The :attribute field must be between :min and :max characters.',
     ],
-    'boolean'              => 'Үүнд: аттрибутын талбар нь үнэн эсвэл худал байна.',
-    'confirmed'            => 'Үүнд: атрибут баталгаажуулалт таарахгүй байна.',
-    'date'                 => 'Үүнд: атрибут нь хүчинтэй хугацаа биш.',
-    'date_format'          => 'Үүнд: атрибут формат хэлбэрээр тохирохгүй байна.',
-    'different'            => 'Үүнд: аттрибут болон бусад нь өөр байх ёстой.',
-    'digits'               => 'Үүнд: аттрибут нь: цифрүүд цифр байна.',
-    'digits_between'       => 'Үүнд: аттрибут нь дараах байх ёстой: min ба: хамгийн их цифрүүд.',
-    'dimensions'           => 'Үүнд: атрибут буруу зургийн хэмжээстэй байна.',
-    'distinct'             => 'Үүнд: атрибутын талбар нь давхар утгатай.',
-    'email'                => 'Үүнд: атрибут нь зөв имэйл хаяг байх ёстой.',
-    'exists'               => 'Сонгосон: шинж чанар буруу байна.',
-    'file'                 => 'Үүнд: атрибут нь файл байх ёстой.',
-    'filled'               => 'Үүнд: аттрибутын талбар нь утгатай байх ёстой.',
-    'image'                => 'Үүнд: атрибут нь зураг байх ёстой.',
+    'boolean' => 'Үүнд: аттрибутын талбар нь үнэн эсвэл худал байна.',
+    'can' => 'The :attribute field contains an unauthorized value.',
+    'confirmed' => 'The :attribute field confirmation does not match.',
+    'contains' => 'The :attribute field is missing a required value.',
+    'current_password' => 'The password is incorrect.',
+    'date' => 'The :attribute field must be a valid date.',
+    'date_equals' => 'The :attribute field must be a date equal to :date.',
+    'date_format' => 'The :attribute field must match the format :format.',
+    'decimal' => 'The :attribute field must have :decimal decimal places.',
+    'declined' => 'The :attribute field must be declined.',
+    'declined_if' => 'The :attribute field must be declined when :other is :value.',
+    'different' => 'The :attribute field and :other must be different.',
+    'digits' => 'The :attribute field must be :digits digits.',
+    'digits_between' => 'The :attribute field must be between :min and :max digits.',
+    'dimensions' => 'The :attribute field has invalid image dimensions.',
+    'distinct' => 'Үүнд: атрибутын талбар нь давхар утгатай.',
+    'doesnt_end_with' => 'The :attribute field must not end with one of the following: :values.',
+    'doesnt_start_with' => 'The :attribute field must not start with one of the following: :values.',
+    'email' => 'The :attribute field must be a valid email address.',
+    'ends_with' => 'The :attribute field must end with one of the following: :values.',
+    'enum' => 'Сонгосон: шинж чанар буруу байна.',
+    'exists' => 'Сонгосон: шинж чанар буруу байна.',
+    'extensions' => 'The :attribute field must have one of the following extensions: :values.',
+    'file' => 'The :attribute field must be a file.',
+    'filled' => 'Үүнд: аттрибутын талбар нь утгатай байх ёстой.',
+    'gt' => [
+        'array' => 'The :attribute field must have more than :value items.',
+        'file' => 'The :attribute field must be greater than :value kilobytes.',
+        'numeric' => 'The :attribute field must be greater than :value.',
+        'string' => 'The :attribute field must be greater than :value characters.',
+    ],
+    'gte' => [
+        'array' => 'The :attribute field must have :value items or more.',
+        'file' => 'The :attribute field must be greater than or equal to :value kilobytes.',
+        'numeric' => 'The :attribute field must be greater than or equal to :value.',
+        'string' => 'The :attribute field must be greater than or equal to :value characters.',
+    ],
+    'hex_color' => 'The :attribute field must be a valid hexadecimal color.',
+    'image' => 'The :attribute field must be an image.',
     'import_field_empty'    => 'The value for :fieldname cannot be null.',
-    'in'                   => 'Сонгосон: шинж чанар буруу байна.',
-    'in_array'             => 'Үүнд: атрибутын талбар байхгүй байна: бусад.',
-    'integer'              => 'Үүнд: атрибут нь бүхэл тоо байх ёстой.',
-    'ip'                   => 'Үүнд: атрибут нь зөв IP хаяг байх ёстой.',
-    'ipv4'                 => 'Үүнд: атрибут нь хүчин төгөлдөр IPv4 хаяг байх ёстой.',
-    'ipv6'                 => 'Үүнд: аттрибут нь зөв IPv6 хаяг байх ёстой.',
-    'is_unique_department' => 'The :attribute must be unique to this Company Location',
-    'json'                 => 'Үүнд: атрибут нь JSON тэмдэгт байх ёстой.',
-    'max'                  => [
-        'numeric' => 'Үүнд: аттрибут нь: max.',
-        'file'    => 'Үүнд: аттрибут нь: килобайтаас ихгүй байж болно.',
-        'string'  => 'Үүнд: аттрибут нь хамгийн их тэмдэгтүүдээс их байж болохгүй.',
-        'array'   => 'Үүнд: аттрибут нь дараахи зүйлсээс ихгүй байна.',
+    'in' => 'Сонгосон: шинж чанар буруу байна.',
+    'in_array' => 'The :attribute field must exist in :other.',
+    'integer' => 'The :attribute field must be an integer.',
+    'ip' => 'The :attribute field must be a valid IP address.',
+    'ipv4' => 'The :attribute field must be a valid IPv4 address.',
+    'ipv6' => 'The :attribute field must be a valid IPv6 address.',
+    'json' => 'The :attribute field must be a valid JSON string.',
+    'list' => 'The :attribute field must be a list.',
+    'lowercase' => 'The :attribute field must be lowercase.',
+    'lt' => [
+        'array' => 'The :attribute field must have less than :value items.',
+        'file' => 'The :attribute field must be less than :value kilobytes.',
+        'numeric' => 'The :attribute field must be less than :value.',
+        'string' => 'The :attribute field must be less than :value characters.',
     ],
-    'mimes'                => 'Үүнд: аттрибут нь төрөл:: утгуудтай файл байх ёстой.',
-    'mimetypes'            => 'Үүнд: аттрибут нь төрөл:: утгуудтай файл байх ёстой.',
-    'min'                  => [
-        'numeric' => 'Үүнд: аттрибут дор хаяж байх ёстой.',
-        'file'    => 'Үүнд: атрибут дор хаяж нэг килобайт байх ёстой.',
-        'string'  => 'Үүнд: атрибут дор хаяж байх ёстой: min тэмдэгтүүд.',
-        'array'   => 'Үүнд: атрибут дор хаяж дараах зүйлсийг агуулсан байх ёстой.',
+    'lte' => [
+        'array' => 'The :attribute field must not have more than :value items.',
+        'file' => 'The :attribute field must be less than or equal to :value kilobytes.',
+        'numeric' => 'The :attribute field must be less than or equal to :value.',
+        'string' => 'The :attribute field must be less than or equal to :value characters.',
     ],
-    'starts_with'          => 'The :attribute must start with one of the following: :values.',
-    'ends_with'            => 'The :attribute must end with one of the following: :values.',
+    'mac_address' => 'The :attribute field must be a valid MAC address.',
+    'max' => [
+        'array' => 'The :attribute field must not have more than :max items.',
+        'file' => 'The :attribute field must not be greater than :max kilobytes.',
+        'numeric' => 'The :attribute field must not be greater than :max.',
+        'string' => 'The :attribute field must not be greater than :max characters.',
+    ],
+    'max_digits' => 'The :attribute field must not have more than :max digits.',
+    'mimes' => 'The :attribute field must be a file of type: :values.',
+    'mimetypes' => 'The :attribute field must be a file of type: :values.',
+    'min' => [
+        'array' => 'The :attribute field must have at least :min items.',
+        'file' => 'The :attribute field must be at least :min kilobytes.',
+        'numeric' => 'The :attribute field must be at least :min.',
+        'string' => 'The :attribute field must be at least :min characters.',
+    ],
+    'min_digits' => 'The :attribute field must have at least :min digits.',
+    'missing' => 'The :attribute field must be missing.',
+    'missing_if' => 'The :attribute field must be missing when :other is :value.',
+    'missing_unless' => 'The :attribute field must be missing unless :other is :value.',
+    'missing_with' => 'The :attribute field must be missing when :values is present.',
+    'missing_with_all' => 'The :attribute field must be missing when :values are present.',
+    'multiple_of' => 'The :attribute field must be a multiple of :value.',
+    'not_in' => 'Сонгосон: шинж чанар буруу байна.',
+    'not_regex' => 'The :attribute field format is invalid.',
+    'numeric' => 'The :attribute field must be a number.',
+    'password' => [
+        'letters' => 'The :attribute field must contain at least one letter.',
+        'mixed' => 'The :attribute field must contain at least one uppercase and one lowercase letter.',
+        'numbers' => 'The :attribute field must contain at least one number.',
+        'symbols' => 'The :attribute field must contain at least one symbol.',
+        'uncompromised' => 'The given :attribute has appeared in a data leak. Please choose a different :attribute.',
+    ],
+    'percent'       => 'The depreciation minimum must be between 0 and 100 when depreciation type is percentage.',
 
-    'not_in'               => 'Сонгосон: шинж чанар буруу байна.',
-    'numeric'              => 'Үүнд: атрибут нь тоо байх ёстой.',
-    'present'              => 'Үүнд: атрибутын талбар байх ёстой.',
-    'valid_regex'          => 'Энэ regex нь хүчин төгөлдөр биш. ',
-    'regex'                => 'Агуулга формат буруу байна.',
-    'required'             => 'Үүнд: атрибутын талбар шаардлагатай.',
-    'required_if'          => 'Үүнд: аттрибутын талбар шаардлагатай үед: бусад нь: утга.',
-    'required_unless'      => 'Үүнд: аттрибутын талбар шаардлагатай: бусад нь: утга байна.',
-    'required_with'        => 'Үүнд: аттрибутын талбар шаардлагатай бол: утга байгаа болно.',
-    'required_with_all'    => 'Үүнд: аттрибутын талбар шаардлагатай бол: утга байгаа болно.',
-    'required_without'     => 'Үүнд: аттрибутын талбар шаардлагатай үед: утга байхгүй байна.',
+    'present' => 'Үүнд: атрибутын талбар байх ёстой.',
+    'present_if' => 'The :attribute field must be present when :other is :value.',
+    'present_unless' => 'The :attribute field must be present unless :other is :value.',
+    'present_with' => 'The :attribute field must be present when :values is present.',
+    'present_with_all' => 'The :attribute field must be present when :values are present.',
+    'prohibited' => 'The :attribute field is prohibited.',
+    'prohibited_if' => 'The :attribute field is prohibited when :other is :value.',
+    'prohibited_unless' => 'The :attribute field is prohibited unless :other is in :values.',
+    'prohibits' => 'The :attribute field prohibits :other from being present.',
+    'regex' => 'The :attribute field format is invalid.',
+    'required' => 'Үүнд: атрибутын талбар шаардлагатай.',
+    'required_array_keys' => 'The :attribute field must contain entries for: :values.',
+    'required_if' => 'Үүнд: аттрибутын талбар шаардлагатай үед: бусад нь: утга.',
+    'required_if_accepted' => 'The :attribute field is required when :other is accepted.',
+    'required_if_declined' => 'The :attribute field is required when :other is declined.',
+    'required_unless' => 'Үүнд: аттрибутын талбар шаардлагатай: бусад нь: утга байна.',
+    'required_with' => 'Үүнд: аттрибутын талбар шаардлагатай бол: утга байгаа болно.',
+    'required_with_all' => 'The :attribute field is required when :values are present.',
+    'required_without' => 'Үүнд: аттрибутын талбар шаардлагатай үед: утга байхгүй байна.',
     'required_without_all' => 'Үүнд: аттрибутын талбар нь: утга байх ёсгүй.',
-    'same'                 => 'Үүнд: атрибут болон бусад нь таарах ёстой.',
-    'size'                 => [
-        'numeric' => 'Үүнд: атрибут нь байх ёстой: хэмжээ.',
-        'file'    => 'Үүнд: атрибут нь: хэмжээ килобайт байх ёстой.',
-        'string'  => 'Үүнд: аттрибут нь: хэмжээст тэмдэгтүүд.',
-        'array'   => 'Үүнд: атрибут нь дараах хэмжээтэй байна: size items.',
+    'same' => 'The :attribute field must match :other.',
+    'size' => [
+        'array' => 'The :attribute field must contain :size items.',
+        'file' => 'The :attribute field must be :size kilobytes.',
+        'numeric' => 'The :attribute field must be :size.',
+        'string' => 'The :attribute field must be :size characters.',
     ],
+    'starts_with' => 'The :attribute field must start with one of the following: :values.',
     'string'               => 'Үүнд: атрибут нь мөр байх ёстой.',
-    'timezone'             => 'Үүнд: атрибут нь хүчинтэй бүс байх ёстой.',
     'two_column_unique_undeleted' => 'The :attribute must be unique across :table1 and :table2. ',
-    'unique'               => 'Үүнд: атрибут аль хэдийн авсан байна.',
-    'uploaded'             => 'Үүнд: атрибут байршуулах боломжгүй байна.',
-    'url'                  => 'Агуулга формат буруу байна.',
     'unique_undeleted'     => ':attribute дахин давтагдашгүй байх ёстой.',
     'non_circular'         => 'The :attribute must not create a circular reference.',
     'not_array'            => ':attribute cannot be an array.',
@@ -102,11 +165,14 @@ return [
     'numbers'              => 'Password must contain at least one number.',
     'case_diff'            => 'Password must use mixed case.',
     'symbols'              => 'Password must contain symbols.',
-    'gte'                  => [
-        'numeric'          => 'Value cannot be negative'
-    ],
-    'checkboxes'           => ':attribute contains invalid options.',
-    'radio_buttons'        => ':attribute is invalid.',
+    'timezone' => 'The :attribute field must be a valid timezone.',
+    'unique' => 'Үүнд: атрибут аль хэдийн авсан байна.',
+    'uploaded' => 'Үүнд: атрибут байршуулах боломжгүй байна.',
+    'uppercase' => 'The :attribute field must be uppercase.',
+    'url' => 'The :attribute field must be a valid URL.',
+    'ulid' => 'The :attribute field must be a valid ULID.',
+    'uuid' => 'The :attribute field must be a valid UUID.',
+    'fmcs_location' => 'Full multiple company support and location scoping is enabled in the Admin Settings, and the selected location and selected company are not compatible.',
 
 
     /*
@@ -120,16 +186,22 @@ return [
     |
     */
 
+    'email_array'      => 'Нэг буюу хэд хэдэн имэйл хаяг буруу байна.',
+    'checkboxes'           => ':attribute contains invalid options.',
+    'radio_buttons'        => ':attribute is invalid.',
+    
     'custom' => [
         'alpha_space' => 'Үүнд: аттрибут талбар нь зөвшөөрөгдөөгүй тэмдэгт агуулна.',
-        'email_array'      => 'Нэг буюу хэд хэдэн имэйл хаяг буруу байна.',
+
         'hashed_pass'      => 'Таны одоогийн нууц үг буруу байна',
         'dumbpwd'          => 'Энэ нууц үг хэтэрхий нийтлэг байна.',
         'statuslabel_type' => 'Та зөв статустай шошгын төрлийг сонгох ёстой',
+        'custom_field_not_found'          => 'This field does not seem to exist, please double check your custom field names.',
+        'custom_field_not_found_on_model' => 'This field seems to exist, but is not available on this Asset Model\'s fieldset.',
 
         // date_format validation with slightly less stupid messages. It duplicates a lot, but it gets the job done :(
-        // We use this because the default error message for date_format is reflects php Y-m-d, which non-PHP
-        // people won't know how to format. 
+        // We use this because the default error message for date_format reflects php Y-m-d, which non-PHP
+        // people won't know how to format.
         'purchase_date.date_format'     => 'The :attribute must be a valid date in YYYY-MM-DD format',
         'last_audit_date.date_format'   =>  'The :attribute must be a valid date in YYYY-MM-DD hh:mm:ss format',
         'expiration_date.date_format'   =>  'The :attribute must be a valid date in YYYY-MM-DD format',
@@ -137,9 +209,15 @@ return [
         'expected_checkin.date_format'  =>  'The :attribute must be a valid date in YYYY-MM-DD format',
         'start_date.date_format'        =>  'The :attribute must be a valid date in YYYY-MM-DD format',
         'end_date.date_format'          =>  'The :attribute must be a valid date in YYYY-MM-DD format',
+        'invalid_value_in_field' => 'Invalid value included in this field',
 
-    ],
+        'ldap_username_field' => [
+            'not_in' =>         '<code>sAMAccountName</code> (mixed case) will likely not work. You should use <code>samaccountname</code> (lowercase) instead.'
+        ],
+        'ldap_auth_filter_query' => ['not_in' => '<code>uid=samaccountname</code> is probably not a valid auth filter. You probably want <code>uid=</code> '],
+        'ldap_filter' => ['regex' => 'This value should probably not be wrapped in parentheses.'],
 
+        ],
     /*
     |--------------------------------------------------------------------------
     | Custom Validation Attributes
@@ -155,8 +233,16 @@ return [
 
     /*
     |--------------------------------------------------------------------------
-    | Generic Validation Messages
+    | Generic Validation Messages - we use these in the jquery validation where we don't have
+    | access to the :attribute
     |--------------------------------------------------------------------------
     */
-    'invalid_value_in_field' => 'Invalid value included in this field',
+
+    'generic' => [
+        'invalid_value_in_field' => 'Invalid value included in this field',
+        'required' => 'This field is required',
+        'email' => 'Please enter a valid email address',
+    ],
+
+
 ];
diff --git a/resources/lang/mr-IN/account/general.php b/resources/lang/mr-IN/account/general.php
new file mode 100644
index 0000000000..7f9e2f848e
--- /dev/null
+++ b/resources/lang/mr-IN/account/general.php
@@ -0,0 +1,17 @@
+<?php
+
+return array(
+    'personal_api_keys' => 'Personal API Keys',
+    'personal_access_token' => 'Personal Access Token',
+    'personal_api_keys_success' => 'Personal API Key :key created sucessfully',
+    'here_is_api_key' => 'Here is your new personal access token. This is the only time it will be shown so do not lose it! You may now use this token to make API requests.',
+    'api_key_warning' => 'When generating an API token, be sure to copy it down immediately as they will not be visible to you again.',
+    'api_base_url' => 'Your API base url is located at:',
+    'api_base_url_endpoint' => '/&lt;endpoint&gt;',
+    'api_token_expiration_time' => 'API tokens are set to expire in:',
+    'api_reference' => 'Please check the <a href="https://snipe-it.readme.io/reference" target="_blank">API reference</a> to find specific API endpoints and additional API documentation.',
+    'profile_updated' => 'Account successfully updated',
+    'no_tokens' => 'You have not created any personal access tokens.',
+    'enable_sounds' => 'Enable sound effects',
+    'enable_confetti' => 'Enable confetti effects',
+);
diff --git a/resources/lang/mr-IN/admin/accessories/general.php b/resources/lang/mr-IN/admin/accessories/general.php
new file mode 100644
index 0000000000..bed7f38fab
--- /dev/null
+++ b/resources/lang/mr-IN/admin/accessories/general.php
@@ -0,0 +1,22 @@
+<?php
+
+return array(
+    'accessory_category' 				=> 'Accessory Category',
+    'accessory_name'  					=> 'Accessory Name',
+    'checkout'  							=> 'Checkout Accessory',
+    'checkin'  							=> 'Checkin Accessory',
+    'create'  							=> 'Create Accessory',
+    'edit'  							=> 'Edit Accessory',
+    'eula_text'							=> 'Category EULA',
+    'eula_text_help'					=> 'This field allows you to customize your EULAs for specific types of assets. If you only have one EULA for all of your assets, you can check the box below to use the primary default.',
+    'require_acceptance'				=> 'Require users to confirm acceptance of assets in this category.',
+    'no_default_eula'					=> 'No primary default EULA found. Add one in Settings.',
+    'total'  							=> 'Total',
+    'remaining'  						=> 'Avail',
+    'update'  							=> 'Update Accessory',
+    'use_default_eula'					=> 'Use the <a href="#" data-toggle="modal" data-target="#eulaModal">primary default EULA</a> instead.',
+    'use_default_eula_disabled'			=> '<del>Use the primary default EULA instead.</del> No primary default EULA is set. Please add one in Settings.',
+    'clone'                             => 'Clone Accessory',
+    'delete_disabled'                   => 'This accessory cannot be deleted yet because some items are still checked out.',
+
+);
diff --git a/resources/lang/mr-IN/admin/accessories/message.php b/resources/lang/mr-IN/admin/accessories/message.php
new file mode 100644
index 0000000000..f60d41957b
--- /dev/null
+++ b/resources/lang/mr-IN/admin/accessories/message.php
@@ -0,0 +1,43 @@
+<?php
+
+return array(
+
+    'does_not_exist' => 'The accessory [:id] does not exist.',
+    'not_found' => 'That accessory was not found.',
+    'assoc_users'	 => 'This accessory currently has :count items checked out to users. Please check in the accessories and and try again. ',
+
+    'create' => array(
+        'error'   => 'The accessory was not created, please try again.',
+        'success' => 'The accessory was successfully created.'
+    ),
+
+    'update' => array(
+        'error'   => 'The accessory was not updated, please try again',
+        'success' => 'The accessory was updated successfully.'
+    ),
+
+    'delete' => array(
+        'confirm'   => 'Are you sure you wish to delete this accessory?',
+        'error'   => 'There was an issue deleting the accessory. Please try again.',
+        'success' => 'The accessory was deleted successfully.'
+    ),
+
+     'checkout' => array(
+        'error'   		=> 'Accessory was not checked out, please try again',
+        'success' 		=> 'Accessory checked out successfully.',
+        'unavailable'   => 'Accessory is not available for checkout. Check quantity available',
+        'user_does_not_exist' => 'That user is invalid. Please try again.',
+         'checkout_qty' => array(
+            'lte'  => 'There is currently only one available accessory of this type, and you are trying to check out :checkout_qty. Please adjust the checkout quantity or the total stock of this accessory and try again.|There are :number_currently_remaining total available accessories, and you are trying to check out :checkout_qty. Please adjust the checkout quantity or the total stock of this accessory and try again.',
+            ),
+           
+    ),
+
+    'checkin' => array(
+        'error'   		=> 'Accessory was not checked in, please try again',
+        'success' 		=> 'Accessory checked in successfully.',
+        'user_does_not_exist' => 'That user is invalid. Please try again.'
+    )
+
+
+);
diff --git a/resources/lang/mr-IN/admin/accessories/table.php b/resources/lang/mr-IN/admin/accessories/table.php
new file mode 100644
index 0000000000..80df687161
--- /dev/null
+++ b/resources/lang/mr-IN/admin/accessories/table.php
@@ -0,0 +1,9 @@
+<?php
+
+return array(
+	'dl_csv'      				=> 'Download CSV',
+	'eula_text'      			=> 'EULA',
+    'id'      					=> 'ID',
+    'require_acceptance'      	=> 'Acceptance',
+    'title'      				=> 'Accessory Name',
+);
diff --git a/resources/lang/mr-IN/admin/asset_maintenances/form.php b/resources/lang/mr-IN/admin/asset_maintenances/form.php
new file mode 100644
index 0000000000..785d06b08f
--- /dev/null
+++ b/resources/lang/mr-IN/admin/asset_maintenances/form.php
@@ -0,0 +1,14 @@
+<?php
+
+    return [
+        'asset_maintenance_type' => 'Asset Maintenance Type',
+        'title'                  => 'Title',
+        'start_date'             => 'Start Date',
+        'completion_date'        => 'Completion Date',
+        'cost'                   => 'Cost',
+        'is_warranty'            => 'Warranty Improvement',
+        'asset_maintenance_time' => 'Asset Maintenance Time (in days)',
+        'notes'                  => 'Notes',
+        'update'                 => 'Update Asset Maintenance',
+        'create'                 => 'Create Asset Maintenance'
+    ];
diff --git a/resources/lang/mr-IN/admin/asset_maintenances/general.php b/resources/lang/mr-IN/admin/asset_maintenances/general.php
new file mode 100644
index 0000000000..0f9a4547a2
--- /dev/null
+++ b/resources/lang/mr-IN/admin/asset_maintenances/general.php
@@ -0,0 +1,16 @@
+<?php
+
+    return [
+        'asset_maintenances' => 'Asset Maintenances',
+        'edit'               => 'Edit Asset Maintenance',
+        'delete'             => 'Delete Asset Maintenance',
+        'view'               => 'View Asset Maintenance Details',
+        'repair'             => 'Repair',
+        'maintenance'        => 'Maintenance',
+        'upgrade'            => 'Upgrade',
+        'calibration'        => 'Calibration',
+        'software_support'   => 'Software Support',
+        'hardware_support'   => 'Hardware Support',
+        'configuration_change'   => 'Configuration Change',
+        'pat_test'           => 'PAT Test',
+    ];
diff --git a/resources/lang/mr-IN/admin/asset_maintenances/message.php b/resources/lang/mr-IN/admin/asset_maintenances/message.php
new file mode 100644
index 0000000000..b44f618207
--- /dev/null
+++ b/resources/lang/mr-IN/admin/asset_maintenances/message.php
@@ -0,0 +1,21 @@
+<?php
+
+    return [
+        'not_found'                    => 'Asset Maintenance you were looking for was not found!',
+        'delete'                       => [
+            'confirm' => 'Are you sure you wish to delete this asset maintenance?',
+            'error'   => 'There was an issue deleting the asset maintenance. Please try again.',
+            'success' => 'The asset maintenance was deleted successfully.',
+        ],
+        'create'                       => [
+            'error'   => 'Asset Maintenance was not created, please try again.',
+            'success' => 'Asset Maintenance created successfully.',
+        ],
+        'edit'                       => [
+            'error'   => 'Asset Maintenance was not edited, please try again.',
+            'success' => 'Asset Maintenance edited successfully.',
+        ],
+        'asset_maintenance_incomplete' => 'Not Completed Yet',
+        'warranty'                     => 'Warranty',
+        'not_warranty'                 => 'Not Warranty',
+    ];
diff --git a/resources/lang/mr-IN/admin/asset_maintenances/table.php b/resources/lang/mr-IN/admin/asset_maintenances/table.php
new file mode 100644
index 0000000000..3ba895038d
--- /dev/null
+++ b/resources/lang/mr-IN/admin/asset_maintenances/table.php
@@ -0,0 +1,8 @@
+<?php
+
+    return [
+        'title'         => 'Asset Maintenance',
+        'asset_name'    => 'Asset Name',
+        'is_warranty'   => 'Warranty',
+        'dl_csv'        => 'Download CSV',
+    ];
diff --git a/resources/lang/mr-IN/admin/categories/general.php b/resources/lang/mr-IN/admin/categories/general.php
new file mode 100644
index 0000000000..2fe448b44e
--- /dev/null
+++ b/resources/lang/mr-IN/admin/categories/general.php
@@ -0,0 +1,25 @@
+<?php
+
+return array(
+    'asset_categories' 					=> 'Asset Categories',
+    'category_name'  					=> 'Category Name',
+    'checkin_email'                     => 'Send email to user on checkin/checkout.',
+    'checkin_email_notification'        => 'This user will be sent an email on checkin/checkout.',
+    'clone'                             => 'Clone Category',
+    'create'  							=> 'Create Category',
+    'edit'                              => 'Edit Category',
+    'email_will_be_sent_due_to_global_eula' => 'An email will be sent to the user because the global EULA is being used.',
+    'email_will_be_sent_due_to_category_eula' => 'An email will be sent to the user because a EULA is set for this category.',
+    'eula_text'							=> 'Category EULA',
+    'eula_text_help'					=> 'This field allows you to customize your EULAs for specific types of assets. If you only have one EULA for all of your assets, you can check the box below to use the primary default.',
+    'name'                              => 'Category Name',
+    'require_acceptance'				=> 'Require users to confirm acceptance of assets in this category.',
+    'required_acceptance'				=> 'This user will be emailed with a link to confirm acceptance of this item.',
+    'required_eula'						=> 'This user will be emailed a copy of the EULA',
+    'no_default_eula'					=> 'No primary default EULA found. Add one in Settings.',
+    'update'  							=> 'Update Category',
+    'use_default_eula'					=> 'Use the <a href="#" data-toggle="modal" data-target="#eulaModal">primary default EULA</a> instead.',
+    'use_default_eula_disabled'			=> '<del>Use the primary default EULA instead.</del> No primary default EULA is set. Please add one in Settings.',
+    'use_default_eula_column'			=> 'Use default EULA',
+
+);
diff --git a/resources/lang/mr-IN/admin/categories/message.php b/resources/lang/mr-IN/admin/categories/message.php
new file mode 100644
index 0000000000..4e493f68b6
--- /dev/null
+++ b/resources/lang/mr-IN/admin/categories/message.php
@@ -0,0 +1,26 @@
+<?php
+
+return array(
+
+    'does_not_exist' => 'Category does not exist.',
+    'assoc_models'	 => 'This category is currently associated with at least one model and cannot be deleted. Please update your models to no longer reference this category and try again. ',
+    'assoc_items'	 => 'This category is currently associated with at least one :asset_type and cannot be deleted. Please update your :asset_type  to no longer reference this category and try again. ',
+
+    'create' => array(
+        'error'   => 'Category was not created, please try again.',
+        'success' => 'Category created successfully.'
+    ),
+
+    'update' => array(
+        'error'   => 'Category was not updated, please try again',
+        'success' => 'Category updated successfully.',
+        'cannot_change_category_type'   => 'You cannot change the category type once it has been created',
+    ),
+
+    'delete' => array(
+        'confirm'   => 'Are you sure you wish to delete this category?',
+        'error'   => 'There was an issue deleting the category. Please try again.',
+        'success' => 'The category was deleted successfully.'
+    )
+
+);
diff --git a/resources/lang/mr-IN/admin/categories/table.php b/resources/lang/mr-IN/admin/categories/table.php
new file mode 100644
index 0000000000..a3ee96ae7f
--- /dev/null
+++ b/resources/lang/mr-IN/admin/categories/table.php
@@ -0,0 +1,10 @@
+<?php
+
+return array(
+	'eula_text'      			=> 'EULA',
+    'id'      					=> 'ID',
+    'parent'   					=> 'Parent',
+    'require_acceptance'      	=> 'Acceptance',
+    'title'      				=> 'Asset Category Name',
+
+);
diff --git a/resources/lang/mr-IN/admin/companies/general.php b/resources/lang/mr-IN/admin/companies/general.php
new file mode 100644
index 0000000000..37781012ba
--- /dev/null
+++ b/resources/lang/mr-IN/admin/companies/general.php
@@ -0,0 +1,7 @@
+<?php
+
+return [
+    'select_company' => 'Select Company',
+    'about_companies' => 'About Companies',
+    'about_companies_description' => '        You can use companies as a simple informative field, or you can use them to restrict asset visibility and availability to users with a specific company by enabling Full Company Support in your Admin Settings.',
+];
diff --git a/resources/lang/mr-IN/admin/companies/message.php b/resources/lang/mr-IN/admin/companies/message.php
new file mode 100644
index 0000000000..e440b7ac5f
--- /dev/null
+++ b/resources/lang/mr-IN/admin/companies/message.php
@@ -0,0 +1,20 @@
+<?php
+
+return [
+    'does_not_exist' => 'Company does not exist.',
+    'deleted'        => 'Deleted company',
+    'assoc_users'    => 'This company is currently associated with at least one model and cannot be deleted. Please update your models to no longer reference this company and try again. ',
+    'create' => [
+        'error'   => 'Company was not created, please try again.',
+        'success' => 'Company created successfully.',
+    ],
+    'update' => [
+        'error'   => 'Company was not updated, please try again',
+        'success' => 'Company updated successfully.',
+    ],
+    'delete' => [
+        'confirm' => 'Are you sure you wish to delete this company?',
+        'error'   => 'There was an issue deleting the company. Please try again.',
+        'success' => 'The Company was deleted successfully.',
+    ],
+];
diff --git a/resources/lang/mr-IN/admin/companies/table.php b/resources/lang/mr-IN/admin/companies/table.php
new file mode 100644
index 0000000000..100b258240
--- /dev/null
+++ b/resources/lang/mr-IN/admin/companies/table.php
@@ -0,0 +1,11 @@
+<?php
+return array(
+    'companies' => 'Companies',
+    'create'    => 'Create Company',
+    'email'     => 'Company Email',
+    'title'     => 'Company',
+    'phone'     => 'Company Phone',
+    'update'    => 'Update Company',
+    'name'      => 'Company Name',
+    'id'        => 'ID',
+);
diff --git a/resources/lang/mr-IN/admin/components/general.php b/resources/lang/mr-IN/admin/components/general.php
new file mode 100644
index 0000000000..5b788a51ec
--- /dev/null
+++ b/resources/lang/mr-IN/admin/components/general.php
@@ -0,0 +1,16 @@
+<?php
+
+return array(
+    'component_name'                  => 'Component Name',
+    'checkin'                             => 'Checkin Component',
+    'checkout'                             => 'Checkout Component',
+    'cost'				=> 'Purchase Cost',
+    'create'                             => 'Create Component',
+    'edit'                             => 'Edit Component',
+    'date'					=> 'Purchase Date',
+    'order'					=> 'Order Number',
+    'remaining' 			             => 'Remaining',
+    'total' 			                 => 'Total',
+    'update'                            => 'Update Component',
+    'checkin_limit'            => 'Amount checked in must be equal to or less than :assigned_qty'
+);
diff --git a/resources/lang/mr-IN/admin/components/message.php b/resources/lang/mr-IN/admin/components/message.php
new file mode 100644
index 0000000000..ec39dc4178
--- /dev/null
+++ b/resources/lang/mr-IN/admin/components/message.php
@@ -0,0 +1,38 @@
+<?php
+
+return array(
+
+    'does_not_exist' => 'Component does not exist.',
+
+    'create' => array(
+        'error'   => 'Component was not created, please try again.',
+        'success' => 'Component created successfully.'
+    ),
+
+    'update' => array(
+        'error'   => 'Component was not updated, please try again',
+        'success' => 'Component updated successfully.'
+    ),
+
+    'delete' => array(
+        'confirm'   => 'Are you sure you wish to delete this component?',
+        'error'   => 'There was an issue deleting the component. Please try again.',
+        'success' => 'The component was deleted successfully.',
+        'error_qty'   => 'Some components of this type are still checked out. Please check them in and try again.',
+    ),
+
+     'checkout' => array(
+        'error'   		=> 'Component was not checked out, please try again',
+        'success' 		=> 'Component checked out successfully.',
+        'user_does_not_exist' => 'That user is invalid. Please try again.',
+        'unavailable'      => 'Not enough components remaining: :remaining remaining, :requested requested ',
+    ),
+
+    'checkin' => array(
+        'error'   		=> 'Component was not checked in, please try again',
+        'success' 		=> 'Component checked in successfully.',
+        'user_does_not_exist' => 'That user is invalid. Please try again.'
+    )
+
+
+);
diff --git a/resources/lang/mr-IN/admin/components/table.php b/resources/lang/mr-IN/admin/components/table.php
new file mode 100644
index 0000000000..3d4fed6a7f
--- /dev/null
+++ b/resources/lang/mr-IN/admin/components/table.php
@@ -0,0 +1,5 @@
+<?php
+
+return array(
+    'title'      				=> 'Component Name',
+);
diff --git a/resources/lang/mr-IN/admin/consumables/general.php b/resources/lang/mr-IN/admin/consumables/general.php
new file mode 100644
index 0000000000..29acfedc1b
--- /dev/null
+++ b/resources/lang/mr-IN/admin/consumables/general.php
@@ -0,0 +1,12 @@
+<?php
+
+return array(
+    'checkout'                          => 'Checkout Consumable to User',
+    'consumable_name'                   => 'Consumable Name',
+    'create'                            => 'Create Consumable',
+    'item_no'                           => 'Item No.',
+    'remaining' 			            => 'Remaining',
+    'total' 			                => 'Total',
+    'update'                            => 'Update Consumable',
+    'inventory_warning'                 => 'The inventory of this consumable is below the minimum amount of :min_count',
+);
diff --git a/resources/lang/mr-IN/admin/consumables/message.php b/resources/lang/mr-IN/admin/consumables/message.php
new file mode 100644
index 0000000000..e2591503bf
--- /dev/null
+++ b/resources/lang/mr-IN/admin/consumables/message.php
@@ -0,0 +1,38 @@
+<?php
+
+return array(
+
+    'invalid_category_type' => 'The category must be a consumable category.',
+    'does_not_exist' => 'Consumable does not exist.',
+
+    'create' => array(
+        'error'   => 'Consumable was not created, please try again.',
+        'success' => 'Consumable created successfully.'
+    ),
+
+    'update' => array(
+        'error'   => 'Consumable was not updated, please try again',
+        'success' => 'Consumable updated successfully.'
+    ),
+
+    'delete' => array(
+        'confirm'   => 'Are you sure you wish to delete this consumable?',
+        'error'   => 'There was an issue deleting the consumable. Please try again.',
+        'success' => 'The consumable was deleted successfully.'
+    ),
+
+     'checkout' => array(
+        'error'   		=> 'Consumable was not checked out, please try again',
+        'success' 		=> 'Consumable checked out successfully.',
+        'user_does_not_exist' => 'That user is invalid. Please try again.',
+         'unavailable'      => 'There are not enough consumables for this checkout. Please check the quantity left. ',
+    ),
+
+    'checkin' => array(
+        'error'   		=> 'Consumable was not checked in, please try again',
+        'success' 		=> 'Consumable checked in successfully.',
+        'user_does_not_exist' => 'That user is invalid. Please try again.'
+    )
+
+
+);
diff --git a/resources/lang/mr-IN/admin/consumables/table.php b/resources/lang/mr-IN/admin/consumables/table.php
new file mode 100644
index 0000000000..bb76721f17
--- /dev/null
+++ b/resources/lang/mr-IN/admin/consumables/table.php
@@ -0,0 +1,5 @@
+<?php
+
+return array(
+    'title'      				=> 'Consumable Name',
+);
diff --git a/resources/lang/mr-IN/admin/custom_fields/general.php b/resources/lang/mr-IN/admin/custom_fields/general.php
new file mode 100644
index 0000000000..c9ae61c963
--- /dev/null
+++ b/resources/lang/mr-IN/admin/custom_fields/general.php
@@ -0,0 +1,64 @@
+<?php
+
+return [
+    'custom_fields'		        => 'Custom Fields',
+    'manage'                    => 'Manage',
+    'field'		                => 'Field',
+    'about_fieldsets_title'		=> 'About Fieldsets',
+    'about_fieldsets_text'		=> 'Fieldsets allow you to create groups of custom fields that are frequently re-used for specific asset model types.',
+    'custom_format'             => 'Custom Regex format...',
+    'encrypt_field'      	        => 'Encrypt the value of this field in the database',
+    'encrypt_field_help'      => 'WARNING: Encrypting a field makes it unsearchable.',
+    'encrypted'      	        => 'Encrypted',
+    'fieldset'      	        => 'Fieldset',
+    'qty_fields'      	      => 'Qty Fields',
+    'fieldsets'      	        => 'Fieldsets',
+    'fieldset_name'           => 'Fieldset Name',
+    'field_name'              => 'Field Name',
+    'field_values'            => 'Field Values',
+    'field_values_help'       => 'Add selectable options, one per line. Blank lines other than the first line will be ignored.',
+    'field_element'           => 'Form Element',
+    'field_element_short'     => 'Element',
+    'field_format'            => 'Format',
+    'field_custom_format'     => 'Custom Regex Format',
+    'field_custom_format_help'     => 'This field allows you to use a regex expression for validation. It should start with "regex:" - for example, to validate that a custom field value contains a valid IMEI (15 numeric digits), you would use <code>regex:/^[0-9]{15}$/</code>.',
+    'required'   		          => 'Required',
+    'req'   		              => 'Req.',
+    'used_by_models'   		    => 'Used By Models',
+    'order'   		            => 'Order',
+    'create_fieldset'         => 'New Fieldset',
+    'update_fieldset'         => 'Update Fieldset',
+    'fieldset_does_not_exist'   => 'Fieldset :id does not exist',
+    'fieldset_updated'         => 'Fieldset updated',
+    'create_fieldset_title' => 'Create a new fieldset',
+    'create_field'            => 'New Custom Field',
+    'create_field_title' => 'Create a new custom field',
+    'value_encrypted'      	        => 'The value of this field is encrypted in the database. Only admin users will be able to view the decrypted value',
+    'show_in_email'     => 'Include the value of this field in checkout emails sent to the user? Encrypted fields cannot be included in emails',
+    'show_in_email_short' => 'Include in emails',
+    'help_text' => 'Help Text',
+    'help_text_description' => 'This is optional text that will appear below the form elements while editing an asset to provide context on the field.',
+    'about_custom_fields_title' => 'About Custom Fields',
+    'about_custom_fields_text' => 'Custom fields allow you to add arbitrary attributes to assets.',
+    'add_field_to_fieldset' => 'Add Field to Fieldset',
+    'make_optional' => 'Required - click to make optional',
+    'make_required' => 'Optional - click to make required',
+    'reorder' => 'Reorder',
+    'db_field' => 'DB Field',
+    'db_convert_warning' => 'WARNING. This field is in the custom fields table as <code>:db_column</code> but should be <code>:expected</code>.',
+    'is_unique' => 'This value must be unique across all assets',
+    'unique' => 'Unique',
+    'display_in_user_view' => 'Allow the checked out user to view these values in their View Assigned Assets page',
+    'display_in_user_view_table' => 'Visible to User',
+    'auto_add_to_fieldsets' => 'Automatically add this to every new fieldset',
+    'add_to_preexisting_fieldsets' => 'Add to any existing fieldsets',
+    'show_in_listview' => 'Show in list views by default. Authorized users will still be able to show/hide via the column selector',
+    'show_in_listview_short' => 'Show in lists',
+    'show_in_requestable_list_short' => 'Show in requestable assets list',
+    'show_in_requestable_list' => 'Show value in requestable assets list. Encrypted fields will not be shown',
+    'encrypted_options' => 'This field is encrypted, so some display options will not be available.',
+    'display_checkin' => 'Display in checkin forms',
+    'display_checkout' => 'Display in checkout forms',
+    'display_audit' => 'Display in audit forms',
+
+];
diff --git a/resources/lang/mr-IN/admin/custom_fields/message.php b/resources/lang/mr-IN/admin/custom_fields/message.php
new file mode 100644
index 0000000000..6442359b7f
--- /dev/null
+++ b/resources/lang/mr-IN/admin/custom_fields/message.php
@@ -0,0 +1,64 @@
+<?php
+
+return array(
+
+    'field' => array(
+        'invalid'   => 'That field does not exist.',
+        'already_added'   => 'Field already added',
+        'none_selected'   => 'No field selected',
+
+        'create' => array(
+            'error'   => 'Field was not created, please try again.',
+            'success' => 'Field created successfully.',
+            'assoc_success' => 'Field successfully added to fieldset.'
+        ),
+
+        'update' => array(
+            'error'   => 'Field was not updated, please try again',
+            'success' => 'Field updated successfully.'
+        ),
+
+        'delete' => array(
+            'confirm'   	=> 'Are you sure you wish to delete this field?',
+            'error'   => 'There was an issue deleting the field. Please try again.',
+            'success' => 'The field was deleted successfully.',
+            'in_use'   => 'Field is still in use.',
+        )
+
+    ),
+
+    'fieldset' => array(
+
+        'does_not_exist' => 'Fieldset does not exist',
+
+        'create' => array(
+            'error'   => 'Fieldset was not created, please try again.',
+            'success' => 'Fieldset created successfully.'
+        ),
+
+        'update' => array(
+            'error'   => 'Fieldset was not updated, please try again',
+            'success' => 'Fieldset updated successfully.'
+        ),
+
+        'delete' => array(
+            'confirm'   	=> 'Are you sure you wish to delete this fieldset?',
+            'error'   => 'There was an issue deleting the fieldset. Please try again.',
+            'success' => 'The fieldset was deleted successfully.',
+            'in_use'   => 'Fieldset is still in use.',
+        )
+
+    ),
+
+    'fieldset_default_value' => array(
+
+        'error' => 'Error validating default fieldset values.',
+
+    ),
+
+
+
+
+
+
+);
diff --git a/resources/lang/mr-IN/admin/departments/message.php b/resources/lang/mr-IN/admin/departments/message.php
new file mode 100644
index 0000000000..2e371348b9
--- /dev/null
+++ b/resources/lang/mr-IN/admin/departments/message.php
@@ -0,0 +1,22 @@
+<?php
+
+return array(
+
+    'does_not_exist' => 'Department does not exist.',
+    'department_already_exists' => 'A department already exists with that name at this company location. Or choose a more specific name for this department. ',
+    'assoc_users'	 => 'This department is currently associated with at least one user and cannot be deleted. Please update your users to no longer reference this department and try again. ',
+    'create' => array(
+        'error'   => 'Department was not created, please try again.',
+        'success' => 'Department created successfully.'
+    ),
+    'update' => array(
+        'error'   => 'Department was not updated, please try again',
+        'success' => 'Department updated successfully.'
+    ),
+    'delete' => array(
+        'confirm'   	=> 'Are you sure you wish to delete this department?',
+        'error'   => 'There was an issue deleting the department. Please try again.',
+        'success' => 'The department was deleted successfully.'
+    )
+
+);
diff --git a/resources/lang/mr-IN/admin/departments/table.php b/resources/lang/mr-IN/admin/departments/table.php
new file mode 100644
index 0000000000..76494247be
--- /dev/null
+++ b/resources/lang/mr-IN/admin/departments/table.php
@@ -0,0 +1,11 @@
+<?php
+
+return array(
+
+    'id'                        => 'ID',
+    'name'                      => 'Department Name',
+    'manager'                   => 'Manager',
+    'location'                  => 'Location',
+    'create'                    => 'Create Department',
+    'update'                    => 'Update Department',
+    );
diff --git a/resources/lang/mr-IN/admin/depreciations/general.php b/resources/lang/mr-IN/admin/depreciations/general.php
new file mode 100644
index 0000000000..90246e9cd8
--- /dev/null
+++ b/resources/lang/mr-IN/admin/depreciations/general.php
@@ -0,0 +1,20 @@
+<?php
+
+return [
+    'about_asset_depreciations'  			=> 'About Asset Depreciations',
+    'about_depreciations'  					=> 'You can set up asset depreciations to depreciate assets based on straight-line depreciation.',
+    'asset_depreciations'  					=> 'Asset Depreciations',
+    'create'  					            => 'Create Depreciation',
+    'depreciation_name'  					=> 'Depreciation Name',
+    'depreciation_min'                      => 'Floor Value of Depreciation',
+    'number_of_months'  					=> 'Number of Months',
+    'update'  					            => 'Update Depreciation',
+    'depreciation_min'                      => 'Minimum Value after Depreciation',
+    'no_depreciations_warning'               => '<strong>Warning: </strong>
+                      You do not currently have any depreciations set up.
+                      Please set up at least one depreciation to view the depreciation report.',
+    'depreciation_method'                   => 'Depreciation Report',
+    'linear_depreciation'                   => 'Linear (Default)',
+    'half_1'                                => 'Half-year convention, always applied',
+    'half_2'                                => 'Half-year convention, applied with condition',
+];
diff --git a/resources/lang/mr-IN/admin/depreciations/message.php b/resources/lang/mr-IN/admin/depreciations/message.php
new file mode 100644
index 0000000000..c20e52c13c
--- /dev/null
+++ b/resources/lang/mr-IN/admin/depreciations/message.php
@@ -0,0 +1,25 @@
+<?php
+
+return array(
+
+    'does_not_exist' => 'Depreciation class does not exist.',
+    'assoc_users'	 => 'This depreciation is currently associated with one or more models and cannot be deleted. Please delete the models, and then try deleting again. ',
+
+
+    'create' => array(
+        'error'   => 'Depreciation class was not created, please try again. :(',
+        'success' => 'Depreciation class created successfully. :)'
+    ),
+
+    'update' => array(
+        'error'   => 'Depreciation class was not updated, please try again',
+        'success' => 'Depreciation class updated successfully.'
+    ),
+
+    'delete' => array(
+        'confirm'   => 'Are you sure you wish to delete this depreciation class?',
+        'error'   => 'There was an issue deleting the depreciation class. Please try again.',
+        'success' => 'The depreciation class was deleted successfully.'
+    )
+
+);
diff --git a/resources/lang/mr-IN/admin/depreciations/table.php b/resources/lang/mr-IN/admin/depreciations/table.php
new file mode 100644
index 0000000000..256b10b92a
--- /dev/null
+++ b/resources/lang/mr-IN/admin/depreciations/table.php
@@ -0,0 +1,11 @@
+<?php
+
+return [
+
+    'id'      => 'ID',
+    'months'   => 'Months',
+    'term'   => 'Term',
+    'title'      => 'Name ',
+    'depreciation_min' => 'Floor Value',
+
+];
diff --git a/resources/lang/mr-IN/admin/groups/message.php b/resources/lang/mr-IN/admin/groups/message.php
new file mode 100644
index 0000000000..495acaf36b
--- /dev/null
+++ b/resources/lang/mr-IN/admin/groups/message.php
@@ -0,0 +1,22 @@
+<?php
+
+return array(
+
+    'group_exists'        => 'Group already exists!',
+    'group_not_found'     => 'Group ID :id does not exist.',
+    'group_name_required' => 'The name field is required',
+
+    'success' => array(
+        'create' => 'Group was successfully created.',
+        'update' => 'Group was successfully updated.',
+        'delete' => 'Group was successfully deleted.',
+    ),
+
+    'delete' => array(
+        'confirm'   => 'Are you sure you wish to delete this group?',
+        'create' => 'There was an issue creating the group. Please try again.',
+        'update' => 'There was an issue updating the group. Please try again.',
+        'delete' => 'There was an issue deleting the group. Please try again.',
+    ),
+
+);
diff --git a/resources/lang/mr-IN/admin/groups/table.php b/resources/lang/mr-IN/admin/groups/table.php
new file mode 100644
index 0000000000..61f060a116
--- /dev/null
+++ b/resources/lang/mr-IN/admin/groups/table.php
@@ -0,0 +1,9 @@
+<?php
+
+return array(
+
+    'id'         => 'Id',
+    'name'       => 'Name',
+    'users'      => '# of Users',
+
+);
diff --git a/resources/lang/mr-IN/admin/groups/titles.php b/resources/lang/mr-IN/admin/groups/titles.php
new file mode 100644
index 0000000000..d875f190d7
--- /dev/null
+++ b/resources/lang/mr-IN/admin/groups/titles.php
@@ -0,0 +1,16 @@
+<?php
+
+return [
+    'about_groups_title'            => 'About Groups',
+    'about_groups'                  => 'Groups are used to generalize user permissions.',
+    'group_management' 	 	=> 'Group Management',
+    'create' 	 	 	    => 'Create New Group',
+    'update' 	 		        => 'Edit Group',
+    'group_name' 	 		=> 'Group Name',
+    'group_admin' 	 		=> 'Group Admin',
+    'allow' 	 			=> 'Allow',
+    'deny' 	 				=> 'Deny',
+    'permission'            => 'Permission',
+    'grant'                 => 'Grant',
+    'no_permissions'        => 'This group has no permissions.'
+];
diff --git a/resources/lang/mr-IN/admin/hardware/form.php b/resources/lang/mr-IN/admin/hardware/form.php
new file mode 100644
index 0000000000..8fbd0b4e87
--- /dev/null
+++ b/resources/lang/mr-IN/admin/hardware/form.php
@@ -0,0 +1,65 @@
+<?php
+
+return [
+    'bulk_delete'		=> 'Confirm Bulk Delete Assets',
+    'bulk_restore'      => 'Confirm Bulk Restore Assets', 
+  'bulk_delete_help'	=> 'Review the assets for bulk deletion below. Once deleted, these assets can be restored, but they will no longer be associated with any users they are currently assigned to.',
+  'bulk_restore_help'	=> 'Review the assets for bulk restoration below. Once restored, these assets will not be associated with any users they were previously assigned to.',
+  'bulk_delete_warn'	=> 'You are about to delete :asset_count assets.',
+  'bulk_restore_warn'	=> 'You are about to restore :asset_count assets.',
+    'bulk_update'		=> 'Bulk Update Assets',
+    'bulk_update_help'	=> 'This form allows you to update multiple assets at once. Only fill in the fields you need to change. Any fields left blank will remain unchanged. ',
+    'bulk_update_warn'	=> 'You are about to edit the properties of a single asset.|You are about to edit the properties of :asset_count assets.',
+    'bulk_update_with_custom_field' => 'Note the assets are :asset_model_count different types of models.',
+    'bulk_update_model_prefix' => 'On Models', 
+    'bulk_update_custom_field_unique' => 'This is a unique field and can not be bulk edited.',
+    'checkedout_to'		=> 'Checked Out To',
+    'checkout_date'		=> 'Checkout Date',
+    'checkin_date'		=> 'Checkin Date',
+    'checkout_to'		=> 'Checkout to',
+    'cost'				=> 'Purchase Cost',
+    'create'			=> 'Create Asset',
+    'date'				=> 'Purchase Date',
+    'depreciation'	    => 'Depreciation',
+    'depreciates_on'	=> 'Depreciates On',
+    'default_location'	=> 'Default Location',
+    'default_location_phone' => 'Default Location Phone',
+    'eol_date'			=> 'EOL Date',
+    'eol_rate'			=> 'EOL Rate',
+    'expected_checkin'  => 'Expected Checkin Date',
+    'expires'			=> 'Expires',
+    'fully_depreciated'	=> 'Fully Depreciated',
+    'help_checkout'		=> 'If you wish to assign this asset immediately, select "Ready to Deploy" from the status list above. ',
+    'mac_address'		=> 'MAC Address',
+    'manufacturer'		=> 'Manufacturer',
+    'model'				=> 'Model',
+    'months'			=> 'months',
+    'name'				=> 'Asset Name',
+    'notes'				=> 'Notes',
+    'order'				=> 'Order Number',
+    'qr'				=> 'QR Code',
+    'requestable'		=> 'Users may request this asset',
+    'redirect_to_all'   => 'Return to all :type',
+    'redirect_to_type'   => 'Go to :type',
+    'redirect_to_checked_out_to'   => 'Go to Checked Out to',
+    'select_statustype'	=> 'Select Status Type',
+    'serial'			=> 'Serial',
+    'status'			=> 'Status',
+    'tag'				=> 'Asset Tag',
+    'update'			=> 'Asset Update',
+    'warranty'			=> 'Warranty',
+        'warranty_expires'		=> 'Warranty Expires',
+    'years'				=> 'years',
+    'asset_location' => 'Update Asset Location',
+    'asset_location_update_default_current' => 'Update default location AND actual location',
+    'asset_location_update_default' => 'Update only default location',
+    'asset_location_update_actual' => 'Update only actual location',
+    'asset_not_deployable' => 'That asset status is not deployable. This asset cannot be checked out.',
+    'asset_not_deployable_checkin' => 'That asset status is not deployable. Using this status label will checkin the asset.',
+    'asset_deployable' => 'This asset can be checked out.',
+    'processing_spinner' => 'Processing... (This might take a bit of time on large files)',
+    'processing' => 'Processing... ',
+    'optional_infos'  => 'Optional Information',
+    'order_details'   => 'Order Related Information',
+    'calc_eol'    => 'If nulling the EOL date, use automatic EOL calculation based on the purchase date and EOL rate.',
+];
diff --git a/resources/lang/mr-IN/admin/hardware/general.php b/resources/lang/mr-IN/admin/hardware/general.php
new file mode 100644
index 0000000000..6740476574
--- /dev/null
+++ b/resources/lang/mr-IN/admin/hardware/general.php
@@ -0,0 +1,42 @@
+<?php
+
+return [
+    'about_assets_title'           => 'About Assets',
+    'about_assets_text'            => 'Assets are items tracked by serial number or asset tag.  They tend to be higher value items where identifying a specific item matters.',
+    'archived'  				=> 'Archived',
+    'asset'  					=> 'Asset',
+    'bulk_checkout'             => 'Bulk Checkout',
+    'bulk_checkin'              => 'Bulk Checkin',
+    'checkin'  					=> 'Checkin Asset',
+    'checkout'  				=> 'Checkout Asset',
+    'clone'  					=> 'Clone Asset',
+    'deployable'  				=> 'Deployable',
+    'deleted'  					=> 'This asset has been deleted.',
+    'delete_confirm'            => 'Are you sure you want to delete this asset?',
+    'edit'  					=> 'Edit Asset',
+    'model_deleted'  			=> 'This Assets model has been deleted. You must restore the model before you can restore the Asset.',
+    'model_invalid'             => 'This model for this asset is invalid.',
+    'model_invalid_fix'         => 'The asset must be updated use a valid asset model before attempting to check it in or out, or to audit it.',
+    'requestable'               => 'Requestable',
+    'requested'				    => 'Requested',
+    'not_requestable'           => 'Not Requestable',
+    'requestable_status_warning' => 'Do not change requestable status',
+    'restore'  					=> 'Restore Asset',
+    'pending'  					=> 'Pending',
+    'undeployable'  			=> 'Undeployable',
+    'undeployable_tooltip'  	=> 'This asset has a status label that is undeployable and cannot be checked out at this time.',
+    'view'  					=> 'View Asset',
+    'csv_error' => 'You have an error in your CSV file:',
+    'import_text' => '<p>Upload a CSV that contains asset history. The assets and users MUST already exist in the system, or they will be skipped. Matching assets for history import happens against the asset tag. We will try to find a matching user based on the user\'s name you provide, and the criteria you select below. If you do not select any criteria below, it will simply try to match on the username format you configured in the <code>Admin &gt; General Settings</code>.</p><p>Fields included in the CSV must match the headers: <strong>Asset Tag, Name, Checkout Date, Checkin Date</strong>. Any additional fields will be ignored. </p><p>Checkin Date: blank or future checkin dates will checkout items to associated user.  Excluding the Checkin Date column will create a checkin date with todays date.</p>    ',
+    'csv_import_match_f-l' => 'Try to match users by <strong>firstname.lastname</strong> (<code>jane.smith</code>) format',
+    'csv_import_match_initial_last' => 'Try to match users by <strong>first initial last name</strong> (<code>jsmith</code>) format',
+    'csv_import_match_first' => 'Try to match users by <strong>first name</strong> (<code>jane</code>) format',
+    'csv_import_match_email' => 'Try to match users by <strong>email</strong> as username',
+    'csv_import_match_username' => 'Try to match users by <strong>username</strong>',
+    'error_messages' => 'Error messages:',
+    'success_messages' => 'Success messages:',
+    'alert_details' => 'Please see below for details.',
+    'custom_export' => 'Custom Export',
+    'mfg_warranty_lookup' => ':manufacturer Warranty Status Lookup',
+    'user_department' => 'User Department',
+];
diff --git a/resources/lang/mr-IN/admin/hardware/message.php b/resources/lang/mr-IN/admin/hardware/message.php
new file mode 100644
index 0000000000..c19bc63647
--- /dev/null
+++ b/resources/lang/mr-IN/admin/hardware/message.php
@@ -0,0 +1,109 @@
+<?php
+
+return [
+
+    'undeployable' 		 => '<strong>Warning: </strong> This asset has been marked as currently undeployable. If this status has changed, please update the asset status.',
+    'does_not_exist' 	 => 'Asset does not exist.',
+    'does_not_exist_var' => 'Asset with tag :asset_tag not found.',
+    'no_tag' 	         => 'No asset tag provided.',
+    'does_not_exist_or_not_requestable' => 'That asset does not exist or is not requestable.',
+    'assoc_users'	 	 => 'This asset is currently checked out to a user and cannot be deleted. Please check the asset in first, and then try deleting again. ',
+    'warning_audit_date_mismatch' 	=> 'This asset\'s next audit date (:next_audit_date) is before the last audit date (:last_audit_date). Please update the next audit date.',
+    'labels_generated'   => 'Labels were successfully generated.',
+    'error_generating_labels' => 'Error while generating labels.',
+    'no_assets_selected' => 'No assets selected.',
+
+    'create' => [
+        'error'   		=> 'Asset was not created, please try again. :(',
+        'success' 		=> 'Asset created successfully. :)',
+        'success_linked' => 'Asset with tag :tag was created successfully. <strong><a href=":link" style="color: white;">Click here to view</a></strong>.',
+        'multi_success_linked' => 'Asset with tag :links was created successfully.|:count assets were created succesfully. :links.',
+        'partial_failure' => 'An asset was unable to be created. Reason: :failures|:count assets were unable to be created. Reasons: :failures',
+    ],
+
+    'update' => [
+        'error'   			=> 'Asset was not updated, please try again',
+        'success' 			=> 'Asset updated successfully.',
+        'encrypted_warning' => 'Asset updated successfully, but encrypted custom fields were not due to permissions',
+        'nothing_updated'	=>  'No fields were selected, so nothing was updated.',
+        'no_assets_selected'  =>  'No assets were selected, so nothing was updated.',
+        'assets_do_not_exist_or_are_invalid' => 'Selected assets cannot be updated.',
+    ],
+
+    'restore' => [
+        'error'   		=> 'Asset was not restored, please try again',
+        'success' 		=> 'Asset restored successfully.',
+        'bulk_success' 		=> 'Asset restored successfully.',
+        'nothing_updated'   => 'No assets were selected, so nothing was restored.', 
+    ],
+
+    'audit' => [
+        'error'   		=> 'Asset audit unsuccessful: :error ',
+        'success' 		=> 'Asset audit successfully logged.',
+    ],
+
+
+    'deletefile' => [
+        'error'   => 'File not deleted. Please try again.',
+        'success' => 'File successfully deleted.',
+    ],
+
+    'upload' => [
+        'error'   => 'File(s) not uploaded. Please try again.',
+        'success' => 'File(s) successfully uploaded.',
+        'nofiles' => 'You did not select any files for upload, or the file you are trying to upload is too large',
+        'invalidfiles' => 'One or more of your files is too large or is a filetype that is not allowed. Allowed filetypes are png, gif, jpg, doc, docx, pdf, and txt.',
+    ],
+
+    'import' => [
+        'import_button'         => 'Process Import',
+        'error'                 => 'Some items did not import correctly.',
+        'errorDetail'           => 'The following Items were not imported because of errors.',
+        'success'               => 'Your file has been imported',
+        'file_delete_success'   => 'Your file has been been successfully deleted',
+        'file_delete_error'      => 'The file was unable to be deleted',
+        'file_missing' => 'The file selected is missing',
+        'file_already_deleted' => 'The file selected was already deleted',
+        'header_row_has_malformed_characters' => 'One or more attributes in the header row contain malformed UTF-8 characters',
+        'content_row_has_malformed_characters' => 'One or more attributes in the first row of content contain malformed UTF-8 characters',
+        'transliterate_failure' => 'Transliteration from :encoding to UTF-8 failed due to invalid characters in input'
+    ],
+
+
+    'delete' => [
+        'confirm'   	=> 'Are you sure you wish to delete this asset?',
+        'error'   		=> 'There was an issue deleting the asset. Please try again.',
+        'assigned_to_error' => '{1}Asset Tag: :asset_tag is currently checked out. Check in this device before deletion.|[2,*]Asset Tags: :asset_tag are currently checked out. Check in these devices before deletion.',
+        'nothing_updated'   => 'No assets were selected, so nothing was deleted.',
+        'success' 		=> 'The asset was deleted successfully.',
+    ],
+
+    'checkout' => [
+        'error'   		=> 'Asset was not checked out, please try again',
+        'success' 		=> 'Asset checked out successfully.',
+        'user_does_not_exist' => 'That user is invalid. Please try again.',
+        'not_available' => 'That asset is not available for checkout!',
+        'no_assets_selected' => 'You must select at least one asset from the list',
+    ],
+
+    'multi-checkout' => [
+        'error'   => 'Asset was not checked out, please try again|Assets were not checked out, please try again',
+        'success' => 'Asset checked out successfully.|Assets checked out successfully.',
+    ],
+
+    'checkin' => [
+        'error'   		=> 'Asset was not checked in, please try again',
+        'success' 		=> 'Asset checked in successfully.',
+        'user_does_not_exist' => 'That user is invalid. Please try again.',
+        'already_checked_in'  => 'That asset is already checked in.',
+
+    ],
+
+    'requests' => [
+        'error'   		=> 'Request was not successful, please try again.',
+        'success' 		=> 'Request successfully submitted.',
+        'canceled'      => 'Request successfully canceled.',
+        'cancel'        => 'Cancel this item request',
+    ],
+
+];
diff --git a/resources/lang/mr-IN/admin/hardware/table.php b/resources/lang/mr-IN/admin/hardware/table.php
new file mode 100644
index 0000000000..2d88c6c131
--- /dev/null
+++ b/resources/lang/mr-IN/admin/hardware/table.php
@@ -0,0 +1,32 @@
+<?php
+
+return [
+
+    'asset_tag'   	=> 'Asset Tag',
+    'asset_model'       => 'Model',
+    'assigned_to'   => 'Assigned To',
+    'book_value'  	=> 'Current Value',
+    'change' 		=> 'In/Out',
+    'checkout_date' => 'Checkout Date',
+    'checkoutto' 	=> 'Checked Out',
+    'components_cost' => 'Total Components Cost',
+    'current_value' => 'Current Value',
+    'diff' 			=> 'Diff',
+    'dl_csv' 		=> 'Download CSV',
+    'eol' 			=> 'EOL',
+    'id'      		=> 'ID',
+    'last_checkin_date' => 'Last Checkin Date',
+    'location' 		=> 'Location',
+    'purchase_cost'	=> 'Cost',
+    'purchase_date'	=> 'Purchased',
+    'serial'   		=> 'Serial',
+    'status'   		=> 'Status',
+    'title'      	=> 'Asset ',
+    'image'		    => 'Device Image',
+    'days_without_acceptance' => 'Days Without Acceptance',
+    'monthly_depreciation' => 'Monthly Depreciation',
+    'requesting_user' => 'Requesting User',
+    'requested_date' => 'Requested Date',
+    'changed'       => 'Changed',
+    'icon' => 'Icon',
+];
diff --git a/resources/lang/mr-IN/admin/kits/general.php b/resources/lang/mr-IN/admin/kits/general.php
new file mode 100644
index 0000000000..2b5c2d9cd0
--- /dev/null
+++ b/resources/lang/mr-IN/admin/kits/general.php
@@ -0,0 +1,51 @@
+<?php
+
+return [
+    'about_kits_title'                  => 'About Predefined Kits',
+    'about_kits_text'                   => 'Predefined Kits let you quickly check out a collection of items (assets, licenses, etc) to a user. This can be helpful when your onboarding process is consistent across many users and all users receive the same items.',
+    'checkout'                          => 'Checkout Kit ',
+    'create_success'                    => 'Kit was successfully created.',
+    'create'                            => 'Create Predefined Kit',
+    'update'                            => 'Update Predefined Kit',
+    'delete_success'                    => 'Kit was successfully deleted.',
+    'update_success'                    => 'Kit was successfully updated.',
+    'none_models'                       => 'There are not enough available assets for :model to checkout. :qty are required. ',
+    'none_licenses'                     => 'There are not enough available seats for :license to checkout. :qty are required. ',
+    'none_consumables'                  => 'There are not enough available units of :consumable to checkout. :qty are required. ',
+    'none_accessory'                    => 'There are not enough available units of :accessory to checkout. :qty are required. ',
+    'append_accessory'                  => 'Append Accessory',
+    'update_appended_accessory'         => 'Update appended Accessory',
+    'append_consumable'                 => 'Append Consumable',
+    'update_appended_consumable'        => 'Update appended Consumable',
+    'append_license'                    => 'Append license',
+    'update_appended_license'           => 'Update appended license',
+    'append_model'                      => 'Append model',
+    'update_appended_model'             => 'Update appended model',
+    'license_error'                     => 'License already attached to kit',
+    'license_added_success'             => 'License added successfully',
+    'license_updated'                   => 'License was successfully updated',
+    'license_none'                      => 'License does not exist',
+    'license_detached'                  => 'License was successfully detached',
+    'consumable_added_success'          => 'Consumable added successfully',
+    'consumable_updated'                => 'Consumable was successfully updated',
+    'consumable_error'                  => 'Consumable already attached to kit',
+    'consumable_deleted'                => 'Delete was successful',
+    'consumable_none'                   => 'Consumable does not exist',
+    'consumable_detached'               => 'Consumable was successfully detached',
+    'accessory_added_success'           => 'Accessory added successfully',
+    'accessory_updated'                 => 'Accessory was successfully updated',
+    'accessory_detached'                => 'Accessory was successfully detached',
+    'accessory_error'                   => 'Accessory already attached to kit',
+    'accessory_deleted'                 => 'Delete was successful',
+    'accessory_none'                    => 'The accessory does not exist',
+    'checkout_success'                  => 'Checkout was successful',
+    'checkout_error'                    => 'Checkout error',
+    'kit_none'                          => 'Kit does not exist',
+    'kit_created'                       => 'Kit was successfully created',
+    'kit_updated'                       => 'Kit was successfully updated',
+    'kit_not_found'                     => 'Kit not found',
+    'kit_deleted'                       => 'Kit was successfully deleted',
+    'kit_model_updated'                 => 'Model was successfully updated',
+    'kit_model_detached'                => 'Model was successfully detached',
+    'model_already_attached'            => 'Model already attached to kit',
+];
diff --git a/resources/lang/mr-IN/admin/labels/message.php b/resources/lang/mr-IN/admin/labels/message.php
new file mode 100644
index 0000000000..96785f0754
--- /dev/null
+++ b/resources/lang/mr-IN/admin/labels/message.php
@@ -0,0 +1,11 @@
+<?php
+
+return [
+
+    'invalid_return_count' => 'Invalid count returned from :name. Expected :expected, got :actual.',
+    'invalid_return_type'  => 'Invalid type returned from :name. Expected :expected, got :actual.',
+    'invalid_return_value' => 'Invalid value returned from :name. Expected :expected, got :actual.',
+
+    'does_not_exist' => 'Label does not exist',
+    
+];
diff --git a/resources/lang/mr-IN/admin/labels/table.php b/resources/lang/mr-IN/admin/labels/table.php
new file mode 100644
index 0000000000..bef4ba170e
--- /dev/null
+++ b/resources/lang/mr-IN/admin/labels/table.php
@@ -0,0 +1,19 @@
+<?php
+
+return [
+    'example_company'    => 'Test Company Limited',
+    'example_defaultloc' => 'Building 1',
+    'example_category'   => 'Test Category',
+    'example_location'   => 'Building 2',
+    'example_manufacturer'  => 'Test Manufacturing Inc.',
+    'example_model'      => 'Test Model',
+    'example_supplier'   => 'Test Company Limited',
+    'labels_per_page'    => 'Labels',
+    'support_fields'     => 'Fields',
+    'support_asset_tag'  => 'Tag',
+    'support_1d_barcode' => '1D',
+    'support_2d_barcode' => '2D',
+    'support_logo'       => 'Logo',
+    'support_title'      => 'Title',
+
+];
\ No newline at end of file
diff --git a/resources/lang/mr-IN/admin/licenses/form.php b/resources/lang/mr-IN/admin/licenses/form.php
new file mode 100644
index 0000000000..ce29167874
--- /dev/null
+++ b/resources/lang/mr-IN/admin/licenses/form.php
@@ -0,0 +1,22 @@
+<?php
+
+return array(
+
+    'asset'             => 'Asset',
+    'checkin'           => 'Checkin',
+    'create'            => 'Create License',
+    'expiration'        => 'Expiration Date',
+    'license_key'       => 'Product Key',
+    'maintained'        => 'Maintained',
+    'name'              => 'Software Name',
+    'no_depreciation'   => 'Do Not Depreciate',
+    'purchase_order'    => 'Purchase Order Number',
+    'reassignable'      => 'Reassignable',
+    'remaining_seats'   => 'Remaining Seats',
+    'seats'             => 'Seats',
+    'termination_date'  => 'Termination Date',
+    'to_email'          => 'Licensed to Email',
+    'to_name'           => 'Licensed to Name',
+    'update'            => 'Update License',
+    'checkout_help'     => 'You must check a license out to a hardware asset or a person. You can select both, but the owner of the asset must match the person you\'re checking the asset out to.'
+);
diff --git a/resources/lang/mr-IN/admin/licenses/general.php b/resources/lang/mr-IN/admin/licenses/general.php
new file mode 100644
index 0000000000..b39030afd4
--- /dev/null
+++ b/resources/lang/mr-IN/admin/licenses/general.php
@@ -0,0 +1,52 @@
+<?php
+
+return array(
+    'about_licenses_title'      => 'About Licenses',
+    'about_licenses'            => 'Licenses are used to track software.  They have a specified number of seats that can be checked out to individuals',
+    'checkin'  					=> 'Checkin License Seat',
+    'checkout_history'  		=> 'Checkout History',
+    'checkout'  				=> 'Checkout License Seat',
+    'edit'  					=> 'Edit License',
+    'filetype_info'				=> 'Allowed filetypes are png, gif, jpg, jpeg, doc, docx, pdf, txt, zip, and rar.',
+    'clone'  					=> 'Clone License',
+    'history_for'  				=> 'History for ',
+    'in_out'  					=> 'In/Out',
+    'info'  					=> 'License Info',
+    'license_seats'  			=> 'License Seats',
+    'seat'  					=> 'Seat',
+    'seat_count'  				=> 'Seat :count',
+    'seats'  					=> 'Seats',
+    'software_licenses'  		=> 'Software Licenses',
+    'user'  					=> 'User',
+    'view'  					=> 'View License',
+    'delete_disabled'           => 'This license cannot be deleted yet because some seats are still checked out.',
+    'bulk'                      =>
+        [
+            'checkin_all'           => [
+                'button'            => 'Checkin All Seats',
+                'modal'             => 'This action will checkin one seat. | This action will checkin all :checkedout_seats_count seats for this license.',
+                'enabled_tooltip'   => 'Checkin ALL seats for this license from both users and assets',
+                'disabled_tooltip'  => 'This is disabled because there are no seats currently checked out',
+                'disabled_tooltip_reassignable'  => 'This is disabled because the License is not reassignable',
+                'success'           => 'License successfully checked in! | All licenses were successfully checked in!',
+                'log_msg'           => 'Checked in via bulk license checkin in license GUI',
+            ],
+
+            'checkout_all'              => [
+                'button'                => 'Checkout All Seats',
+                'modal'                 => 'This action will checkout one seat to the first available user. | This action will checkout all :available_seats_count seats to the first available users. A user is considered available for this seat if they do not already have this license checked out to them, and the Auto-Assign License property is enabled on their user account.',
+                'enabled_tooltip'   => 'Checkout ALL seats (or as many as are available) to ALL users',
+                'disabled_tooltip'  => 'This is disabled because there are no seats currently available',
+                'success'           => 'License successfully checked out! | :count licenses were successfully checked out!',
+                'error_no_seats'    => 'There are no remaining seats left for this license.',
+                'warn_not_enough_seats'    => ':count users were assigned this license, but we ran out of available license seats.',
+                'warn_no_avail_users'    => 'Nothing to do. There are no users who do not already have this license assigned to them.',
+                'log_msg'           => 'Checked out via bulk license checkout in license GUI',
+
+
+            ],
+    ],
+
+    'below_threshold' => 'There are only :remaining_count seats left for this license with a minimum quantity of :min_amt. You may want to consider purchasing more seats.',
+    'below_threshold_short' => 'This item is below the minimum required quantity.',
+);
diff --git a/resources/lang/mr-IN/admin/licenses/message.php b/resources/lang/mr-IN/admin/licenses/message.php
new file mode 100644
index 0000000000..74e1d7af5a
--- /dev/null
+++ b/resources/lang/mr-IN/admin/licenses/message.php
@@ -0,0 +1,57 @@
+<?php
+
+return array(
+
+    'does_not_exist' => 'License does not exist or you do not have permission to view it.',
+    'user_does_not_exist' => 'User does not exist or you do not have permission to view them.',
+    'asset_does_not_exist' 	=> 'The asset you are trying to associate with this license does not exist.',
+    'owner_doesnt_match_asset' => 'The asset you are trying to associate with this license is owned by somene other than the person selected in the assigned to dropdown.',
+    'assoc_users'	 => 'This license is currently checked out to a user and cannot be deleted. Please check the license in first, and then try deleting again. ',
+    'select_asset_or_person' => 'You must select an asset or a user, but not both.',
+    'not_found' => 'License not found',
+    'seats_available' => ':seat_count seats available',
+
+
+    'create' => array(
+        'error'   => 'License was not created, please try again.',
+        'success' => 'License created successfully.'
+    ),
+
+    'deletefile' => array(
+        'error'   => 'File not deleted. Please try again.',
+        'success' => 'File successfully deleted.',
+    ),
+
+    'upload' => array(
+        'error'   => 'File(s) not uploaded. Please try again.',
+        'success' => 'File(s) successfully uploaded.',
+        'nofiles' => 'You did not select any files for upload, or the file you are trying to upload is too large',
+        'invalidfiles' => 'One or more of your files is too large or is a filetype that is not allowed. Allowed filetypes are png, gif, jpg, jpeg, doc, docx, pdf, txt, zip, rar, rtf, xml, and lic.',
+    ),
+
+    'update' => array(
+        'error'   => 'License was not updated, please try again',
+        'success' => 'License updated successfully.'
+    ),
+
+    'delete' => array(
+        'confirm'   => 'Are you sure you wish to delete this license?',
+        'error'   => 'There was an issue deleting the license. Please try again.',
+        'success' => 'The license was deleted successfully.'
+    ),
+
+    'checkout' => array(
+        'error'   => 'There was an issue checking out the license. Please try again.',
+        'success' => 'The license was checked out successfully',
+        'not_enough_seats' => 'Not enough license seats available for checkout',
+        'mismatch' => 'The license seat provided does not match the license',
+        'unavailable' => 'This seat is not available for checkout.',
+    ),
+
+    'checkin' => array(
+        'error'   => 'There was an issue checking in the license. Please try again.',
+        'not_reassignable' => 'License not reassignable',
+        'success' => 'The license was checked in successfully'
+    ),
+
+);
diff --git a/resources/lang/mr-IN/admin/licenses/table.php b/resources/lang/mr-IN/admin/licenses/table.php
new file mode 100644
index 0000000000..9cabf9c883
--- /dev/null
+++ b/resources/lang/mr-IN/admin/licenses/table.php
@@ -0,0 +1,18 @@
+<?php
+
+return array(
+
+    'assigned_to'   	=> 'Assigned To',
+    'checkout'   		=> 'In/Out',
+    'deleted_at'        => 'Deleted at',
+    'id'      			=> 'ID',
+    'license_email'   	=> 'License Email',
+    'license_name'   	=> 'Licensed To',
+    'purchase_date'   	=> 'Purchase Date',
+    'purchased'   		=> 'Purchased',
+    'seats'   			=> 'Seats',
+    'hardware'   		=> 'Hardware',
+    'serial'   			=> 'Serial',
+    'title'      		=> 'License',
+
+);
diff --git a/resources/lang/mr-IN/admin/locations/message.php b/resources/lang/mr-IN/admin/locations/message.php
new file mode 100644
index 0000000000..b21c70ad89
--- /dev/null
+++ b/resources/lang/mr-IN/admin/locations/message.php
@@ -0,0 +1,35 @@
+<?php
+
+return array(
+
+    'does_not_exist' => 'Location does not exist.',
+    'assoc_users'    => 'This location is not currently deletable because it is the location of record for at least one asset or user, has assets assigned to it, or is the parent location of another location. Please update your records to no longer reference this location and try again ',
+    'assoc_assets'	 => 'This location is currently associated with at least one asset and cannot be deleted. Please update your assets to no longer reference this location and try again. ',
+    'assoc_child_loc'	 => 'This location is currently the parent of at least one child location and cannot be deleted. Please update your locations to no longer reference this location and try again. ',
+    'assigned_assets' => 'Assigned Assets',
+    'current_location' => 'Current Location',
+    'open_map' => 'Open in :map_provider_icon Maps',
+
+
+    'create' => array(
+        'error'   => 'Location was not created, please try again.',
+        'success' => 'Location created successfully.'
+    ),
+
+    'update' => array(
+        'error'   => 'Location was not updated, please try again',
+        'success' => 'Location updated successfully.'
+    ),
+
+    'restore' => array(
+        'error'   => 'Location was not restored, please try again',
+        'success' => 'Location restored successfully.'
+    ),
+
+    'delete' => array(
+        'confirm'   	=> 'Are you sure you wish to delete this location?',
+        'error'   => 'There was an issue deleting the location. Please try again.',
+        'success' => 'The location was deleted successfully.'
+    )
+
+);
diff --git a/resources/lang/mr-IN/admin/locations/table.php b/resources/lang/mr-IN/admin/locations/table.php
new file mode 100644
index 0000000000..53176d8a4e
--- /dev/null
+++ b/resources/lang/mr-IN/admin/locations/table.php
@@ -0,0 +1,43 @@
+<?php
+
+return [
+    'about_locations_title'     => 'About Locations',
+    'about_locations'           => 'Locations are used to track location information for users, assets, and other items',
+    'assets_rtd'                => 'Assets', // This has NEVER meant Assets Retired. I don't know how it keeps getting reverted.
+    'assets_checkedout'         => 'Assets Assigned',
+    'id'                        => 'ID',
+    'city'                      => 'City',
+    'state'                     => 'State',
+    'country'                   => 'Country',
+    'create'                    => 'Create Location',
+    'update'                    => 'Update Location',
+    'print_assigned'            => 'Print Assigned',
+    'print_all_assigned'        => 'Print All Assigned',
+    'name'                      => 'Location Name',
+    'address'                   => 'Address',
+    'address2'                   => 'Address Line 2',
+    'zip'                       => 'Postal Code',
+    'locations'                 => 'Locations',
+    'parent'                    => 'Parent',
+    'currency'                  => 'Location Currency',
+    'ldap_ou'                   => 'LDAP Search OU',
+    'user_name'                 => 'User Name',
+    'department'                => 'Department',
+    'location'                  => 'Location',
+    'asset_tag'                 => 'Assets Tag',
+    'asset_name'                => 'Name',
+    'asset_category'            => 'Category',
+    'asset_manufacturer'        => 'Manufacturer',
+    'asset_model'               => 'Model',
+    'asset_serial'              => 'Serial',
+    'asset_location'            => 'Location',
+    'asset_checked_out'         => 'Checked Out',
+    'asset_expected_checkin'    => 'Expected Checkin',
+    'date'                      => 'Date:',
+    'phone'                     => 'Location Phone',
+    'signed_by_asset_auditor'   => 'Signed By (Asset Auditor):',
+    'signed_by_finance_auditor' => 'Signed By (Finance Auditor):',
+    'signed_by_location_manager' => 'Signed By (Location Manager):',
+    'signed_by'                 => 'Signed Off By:',
+    'clone'  					=> 'Clone Location',
+];
diff --git a/resources/lang/mr-IN/admin/manufacturers/message.php b/resources/lang/mr-IN/admin/manufacturers/message.php
new file mode 100644
index 0000000000..61416e0230
--- /dev/null
+++ b/resources/lang/mr-IN/admin/manufacturers/message.php
@@ -0,0 +1,30 @@
+<?php
+
+return array(
+
+    'support_url_help' => 'Variables <code>{LOCALE}</code>, <code>{SERIAL}</code>, <code>{MODEL_NUMBER}</code>, and <code>{MODEL_NAME}</code> may be used in your URL to have those values auto-populate when viewing assets - for example https://checkcoverage.apple.com/{LOCALE}/{SERIAL}.',
+    'does_not_exist' => 'Manufacturer does not exist.',
+    'assoc_users'	 => 'This manufacturer is currently associated with at least one model and cannot be deleted. Please update your models to no longer reference this manufacturer and try again. ',
+
+    'create' => array(
+        'error'   => 'Manufacturer was not created, please try again.',
+        'success' => 'Manufacturer created successfully.'
+    ),
+
+    'update' => array(
+        'error'   => 'Manufacturer was not updated, please try again',
+        'success' => 'Manufacturer updated successfully.'
+    ),
+
+    'restore' => array(
+        'error'   => 'Manufacturer was not restored, please try again',
+        'success' => 'Manufacturer restored successfully.'
+    ),
+
+    'delete' => array(
+        'confirm'   => 'Are you sure you wish to delete this manufacturer?',
+        'error'   => 'There was an issue deleting the manufacturer. Please try again.',
+        'success' => 'The Manufacturer was deleted successfully.'
+    )
+
+);
diff --git a/resources/lang/mr-IN/admin/manufacturers/table.php b/resources/lang/mr-IN/admin/manufacturers/table.php
new file mode 100644
index 0000000000..6a0aaa8865
--- /dev/null
+++ b/resources/lang/mr-IN/admin/manufacturers/table.php
@@ -0,0 +1,16 @@
+<?php
+
+return array(
+    'about_manufacturers_title'    => 'About manufacturers',
+    'about_manufacturers_text'  => 'Manufacturers are the companies that create your assets. You can store important support contact information about them here, which will be displayed on your asset detail pages.',
+    'asset_manufacturers'	=> 'Asset Manufacturers',
+    'create'				=> 'Create Manufacturer',
+    'id'   					=> 'ID',
+    'name'      			=> 'Name',
+    'support_email'   		=> 'Support Email',
+    'support_phone'   		=> 'Support Phone',
+    'support_url'   		=> 'Support URL',
+    'warranty_lookup_url'   => 'Warranty Lookup URL',
+    'update'				=> 'Update Manufacturer',
+
+);
diff --git a/resources/lang/mr-IN/admin/models/general.php b/resources/lang/mr-IN/admin/models/general.php
new file mode 100644
index 0000000000..9a61b53fd0
--- /dev/null
+++ b/resources/lang/mr-IN/admin/models/general.php
@@ -0,0 +1,18 @@
+<?php
+
+return array(
+    'about_models_title'     => 'About Asset Models',
+    'about_models_text'           => 'Asset Models are a way to group identical assets. "MBP 2013", "IPhone 6s", etc.',
+    'deleted'  					=> 'This model has been deleted.',
+    'bulk_delete'               => 'Bulk Delete Asset Models',
+    'bulk_delete_help'               => 'Use the checkboxes below to confirm the deletion of the selected asset models. Asset models that have assets associated with them cannot be deleted until the assets are associated with a different model.',
+    'bulk_delete_warn'          => 'You are about to delete one asset model.|You are about to delete :model_count asset models.',
+    'restore'                   => 'Restore Model',
+    'requestable'               => 'Users may request this model',
+	'show_mac_address'			      => 'Show MAC address field in assets in this model',
+    'view_deleted'              => 'View Deleted',
+    'view_models'               => 'View Models',
+    'fieldset'                  => 'Fieldset',
+    'no_custom_field'           => 'No custom fields',
+    'add_default_values'        => 'Add default values',
+);
diff --git a/resources/lang/mr-IN/admin/models/message.php b/resources/lang/mr-IN/admin/models/message.php
new file mode 100644
index 0000000000..ae3bc34eed
--- /dev/null
+++ b/resources/lang/mr-IN/admin/models/message.php
@@ -0,0 +1,47 @@
+<?php
+
+return array(
+
+    'deleted' => 'Deleted asset model',
+    'does_not_exist' => 'Model does not exist.',
+    'no_association' => 'WARNING! The asset model for this item is invalid or missing!',
+    'no_association_fix' => 'This will break things in weird and horrible ways. Edit this asset now to assign it a model.',
+    'assoc_users'	 => 'This model is currently associated with one or more assets and cannot be deleted. Please delete the assets, and then try deleting again. ',
+    'invalid_category_type' => 'This category must be an asset category.',
+
+    'create' => array(
+        'error'   => 'Model was not created, please try again.',
+        'success' => 'Model created successfully.',
+        'duplicate_set' => 'An asset model with that name, manufacturer and model number already exists.',
+    ),
+
+    'update' => array(
+        'error'   => 'Model was not updated, please try again',
+        'success' => 'Model updated successfully.',
+    ),
+
+    'delete' => array(
+        'confirm'   => 'Are you sure you wish to delete this asset model?',
+        'error'   => 'There was an issue deleting the model. Please try again.',
+        'success' => 'The model was deleted successfully.'
+    ),
+
+    'restore' => array(
+        'error'   		=> 'Model was not restored, please try again',
+        'success' 		=> 'Model restored successfully.'
+    ),
+
+    'bulkedit' => array(
+        'error'   		=> 'No fields were changed, so nothing was updated.',
+        'success' 		=> 'Model successfully updated. |:model_count models successfully updated.',
+        'warn'          => 'You are about to update the properties of the following model:|You are about to edit the properties of the following :model_count models:',
+
+    ),
+
+    'bulkdelete' => array(
+        'error'   		    => 'No models were selected, so nothing was deleted.',
+        'success' 		    => 'Model deleted!|:success_count models deleted!',
+        'success_partial' 	=> ':success_count model(s) were deleted, however :fail_count were unable to be deleted because they still have assets associated with them.'
+    ),
+
+);
diff --git a/resources/lang/mr-IN/admin/models/table.php b/resources/lang/mr-IN/admin/models/table.php
new file mode 100644
index 0000000000..11a512b3d3
--- /dev/null
+++ b/resources/lang/mr-IN/admin/models/table.php
@@ -0,0 +1,17 @@
+<?php
+
+return array(
+
+    'create'				=> 'Create Asset Model',
+    'created_at' 			=> 'Created at',
+    'eol'	 				=> 'EOL',
+    'modelnumber'   		=> 'Model No.',
+    'name'      			=> 'Asset Model Name',
+    'numassets' 			=> 'Assets',
+    'title'					=> 'Asset Models',
+    'update'				=> 'Update Asset Model',
+    'view'					=> 'View Asset Model',
+    'update'				=> 'Update Asset Model',
+    'clone'				=> 'Clone Model',
+    'edit'				=> 'Edit Model',
+);
diff --git a/resources/lang/mr-IN/admin/reports/general.php b/resources/lang/mr-IN/admin/reports/general.php
new file mode 100644
index 0000000000..ed8bf1a156
--- /dev/null
+++ b/resources/lang/mr-IN/admin/reports/general.php
@@ -0,0 +1,23 @@
+<?php
+
+return [
+    'info'   => 'Select the options you want for your asset report.',
+    'deleted_user' => 'Deleted user',
+    'send_reminder' => 'Send reminder',
+    'cannot_send_reminder' => 'User has been deleted or does not have an email address so cannot receive a reminder',
+    'reminder_sent' => 'Reminder sent',
+    'acceptance_deleted' => 'Acceptance request deleted',
+    'acceptance_request' => 'Acceptance request',
+    'custom_export' => [
+        'user_address' => 'User Address',
+        'user_city' => 'User City',
+        'user_state' => 'User State',
+        'user_country' => 'User Country',
+        'user_zip' => 'User Zip'
+    ],
+    'open_saved_template' => 'Open Saved Template',
+    'save_template' =>  'Save Template',
+    'select_a_template' => 'Select a Template',
+    'template_name' => 'Template Name',
+    'update_template' => 'Update Template',
+];
diff --git a/resources/lang/mr-IN/admin/reports/message.php b/resources/lang/mr-IN/admin/reports/message.php
new file mode 100644
index 0000000000..2800bbdf0b
--- /dev/null
+++ b/resources/lang/mr-IN/admin/reports/message.php
@@ -0,0 +1,16 @@
+<?php
+
+return [
+    'about_templates' => 'About Saved Templates',
+    'saving_templates_description' => 'Select your options, then enter the name of your template in the box above and click the \'Save Template\' button. Use the dropdown to select a previously saved template.',
+    'create'  => [
+        'success' => 'Template saved successfully',
+    ],
+    'update' => [
+        'success' => 'Template updated successfully',
+    ],
+    'delete' => [
+        'success' => 'Template deleted',
+        'no_delete_permission' => 'Template does not exist or you do not have permission to delete it.',
+    ],
+];
diff --git a/resources/lang/mr-IN/admin/settings/general.php b/resources/lang/mr-IN/admin/settings/general.php
new file mode 100644
index 0000000000..37cfb0de94
--- /dev/null
+++ b/resources/lang/mr-IN/admin/settings/general.php
@@ -0,0 +1,489 @@
+<?php
+
+return [
+    'ad'				        => 'Active Directory',
+    'ad_domain'				    => 'Active Directory domain',
+    'ad_domain_help'			=> 'This is sometimes the same as your email domain, but not always.',
+    'ad_append_domain_label'    => 'Append domain name',
+    'ad_append_domain'          => 'Append domain name to username field',
+    'ad_append_domain_help'     => 'User isn\'t required to write "username@domain.local", they can just type "username".',
+    'admin_cc_email'            => 'CC Email',
+    'admin_cc_email_help'       => 'Send a copy of checkin/checkout emails to this address.',
+    'admin_settings'            => 'Admin Settings',
+    'is_ad'				        => 'This is an Active Directory server',
+    'alerts'                	=> 'Alerts',
+    'alert_title'               => 'Update Notification Settings',
+    'alert_email'				=> 'Send alerts to',
+    'alert_email_help'          => 'Email addresses or distribution lists you want alerts to be sent to, comma separated.',
+    'alerts_enabled'			=> 'Email Alerts Enabled',
+    'alert_interval'			=> 'Expiring Alerts Threshold (in days)',
+    'alert_inv_threshold'		=> 'Inventory Alert Threshold',
+    'allow_user_skin'           => 'Allow User Skin',
+    'allow_user_skin_help_text' => 'Checking this box will allow a user to override the UI skin with a different one.',
+    'asset_ids'					=> 'Asset IDs',
+    'audit_interval'            => 'Audit Interval',
+    'audit_interval_help'       => 'If you are required to regularly physically audit your assets, enter the interval in months that you use. If you update this value, all of the "next audit dates" for assets with an upcoming audit date will be updated.',
+    'audit_warning_days'        => 'Audit Warning Threshold',
+    'audit_warning_days_help'   => 'How many days in advance should we warn you when assets are due for auditing?',
+    'auto_increment_assets'		=> 'Generate auto-incrementing asset tags',
+    'auto_increment_prefix'		=> 'Prefix (optional)',
+    'auto_incrementing_help'    => 'Enable auto-incrementing asset tags first to set this',
+    'backups'					=> 'Backups',
+    'backups_help'              => 'Create, download, and restore backups ',
+    'backups_restoring'         => 'Restoring from Backup',
+    'backups_clean' => 'Clean the backed-up database before restore',
+    'backups_clean_helptext' => "This can be useful if you're changing between database versions",
+    'backups_upload'            => 'Upload Backup',
+    'backups_path'              => 'Backups on the server are stored in <code>:path</code>',
+    'backups_restore_warning'   => 'Use the restore button <small><span class="btn btn-xs btn-warning"><i class="text-white fas fa-retweet" aria-hidden="true"></i></span></small> to restore from a previous backup. (This does not currently work with S3 file storage or Docker.)<br><br>Your <strong>entire :app_name database and any uploaded files will be completely replaced</strong> by what\'s in the backup file  ',
+    'backups_logged_out'         => 'All existing users, including you, will be logged out once your restore is complete.',
+    'backups_large'             => 'Very large backups may time out on the restore attempt and may still need to be run via command line. ',
+    'barcode_settings'			=> 'Barcode Settings',
+    'confirm_purge'			    => 'Confirm Purge',
+    'confirm_purge_help'		=> 'Enter the text "DELETE" in the box below to purge your deleted records. This action cannot be undone and will PERMANENTLY delete all soft-deleted items and users. (You should make a backup first, just to be safe.)',
+    'custom_css'				=> 'Custom CSS',
+    'custom_css_placeholder'	=> 'Add your custom CSS',
+    'custom_css_help'			=> 'Enter any custom CSS overrides you would like to use. Do not include the &lt;style&gt;&lt;/style&gt; tags.',
+    'custom_forgot_pass_url'	=> 'Custom Password Reset URL',
+    'custom_forgot_pass_url_help'	=> 'This replaces the built-in forgotten password URL on the login screen, useful to direct people to internal or hosted LDAP password reset functionality. It will effectively disable local user forgotten password functionality.',
+    'dashboard_message'			=> 'Dashboard Message',
+    'dashboard_message_help'	=> 'This text will appear on the dashboard for anyone with permission to view the dashboard.',
+    'default_currency'  		=> 'Default Currency',
+    'default_eula_text'			=> 'Default EULA',
+    'default_eula_text_placeholder' => 'Add your default EULA text',
+    'default_language'			=> 'Default Language',
+    'default_eula_help_text'	=> 'You can also associate custom EULAs to specific asset categories.',
+    'acceptance_note'           => 'Add a note for your decision (Optional)',
+    'display_asset_name'        => 'Display Asset Name',
+    'display_checkout_date'     => 'Display Checkout Date',
+    'display_eol'               => 'Display EOL in table view',
+    'display_qr'                => 'Display 2D barcode',
+    'display_alt_barcode'		=> 'Display 1D barcode',
+    'barcode_type'				=> '2D Barcode Type',
+    'alt_barcode_type'			=> '1D barcode type',
+    'enabled'                   => 'Enabled',
+    'eula_settings'				=> 'EULA Settings',
+    'eula_markdown'				=> 'This EULA allows <a href="https://help.github.com/articles/github-flavored-markdown/">Github flavored markdown</a>.',
+    'empty_row_count'           => 'Field Start Offset (Empty Rows)',
+    'empty_row_count_help'      => 'Fields will begin populating after this many empty rows are skipped at the top of the label.',
+    'favicon'                   => 'Favicon',
+    'favicon_format'            => 'Accepted filetypes are ico, png, and gif. Other image formats may not work in all browsers.',
+    'favicon_size'          => 'Favicons should be square images, 16x16 pixels.',
+    'footer_text'               => 'Additional Footer Text ',
+    'footer_text_help'          => 'This text will appear in the right-side footer. Links are allowed using <a href="https://help.github.com/articles/github-flavored-markdown/">Github flavored markdown</a>. Line breaks, headers, images, etc may result in unpredictable results.',
+    'footer_text_placeholder'   => 'Optional footer text',
+    'general_settings'			=> 'General Settings',
+    'general_settings_help'     => 'Default EULA and more',
+    'generate_backup'			=> 'Generate Backup',
+    'google_workspaces'         => 'Google Workspaces',
+    'header_color'              => 'Header Color',
+    'info'                      => 'These settings let you customize certain aspects of your installation.',
+    'label_logo_size'           => 'Square logos look best - will be displayed in the top right of each asset label. ',
+    'laravel'                   => 'Laravel Version',
+    'ldap'                      => 'LDAP',
+    'ldap_default_group'        => 'Default Permissions Group',
+    'ldap_default_group_info'   => 'Select a group to assign to newly synced users. Remember that a user takes on the permissions of the group they are assigned.',
+    'no_default_group'          => 'No Default Group',
+    'ldap_help'                 => 'LDAP/Active Directory',
+    'ldap_client_tls_key'       => 'LDAP Client TLS Key',
+    'ldap_client_tls_cert'      => 'LDAP Client-Side TLS Certificate',
+    'ldap_enabled'              => 'LDAP enabled',
+    'ldap_integration'          => 'LDAP Integration',
+    'ldap_settings'             => 'LDAP Settings',
+    'ldap_client_tls_cert_help' => 'Client-Side TLS Certificate and Key for LDAP connections are usually only useful in Google Workspace configurations with "Secure LDAP." Both are required.',
+    'ldap_location'             => 'LDAP Location',
+'ldap_location_help'             => 'The Ldap Location field should be used if <strong>an OU is not being used in the Base Bind DN.</strong> Leave this blank if an OU search is being used.',
+    'ldap_login_test_help'      => 'Enter a valid LDAP username and password from the base DN you specified above to test whether your LDAP login is configured correctly. YOU MUST SAVE YOUR UPDATED LDAP SETTINGS FIRST.',
+    'ldap_login_sync_help'      => 'This only tests that LDAP can sync correctly. If your LDAP Authentication query is not correct, users may still not be able to login. YOU MUST SAVE YOUR UPDATED LDAP SETTINGS FIRST.',
+    'ldap_manager'              => 'LDAP Manager',
+    'ldap_server'               => 'LDAP Server',
+    'ldap_server_help'          => 'This should start with ldap:// (for unencrypted) or ldaps:// (for TLS or SSL)',
+    'ldap_server_cert'			=> 'LDAP SSL certificate validation',
+    'ldap_server_cert_ignore'	=> 'Allow invalid SSL Certificate',
+    'ldap_server_cert_help'		=> 'Select this checkbox if you are using a self signed SSL cert and would like to accept an invalid SSL certificate.',
+    'ldap_tls'                  => 'Use TLS',
+    'ldap_tls_help'             => 'This should be checked only if you are running STARTTLS on your LDAP server. ',
+    'ldap_uname'                => 'LDAP Bind Username',
+    'ldap_dept'                 => 'LDAP Department',
+    'ldap_phone'                => 'LDAP Telephone Number',
+    'ldap_jobtitle'             => 'LDAP Job Title',
+    'ldap_country'              => 'LDAP Country',
+    'ldap_pword'                => 'LDAP Bind Password',
+    'ldap_basedn'               => 'Base Bind DN',
+    'ldap_filter'               => 'LDAP Filter',
+    'ldap_pw_sync'              => 'Cache LDAP Passwords',
+    'ldap_pw_sync_help'         => 'Uncheck this box if you do not wish to keep LDAP passwords cached as local hashed passwords. Disabling this means that your users may not be able to login if your LDAP server is unreachable for some reason.',
+    'ldap_username_field'       => 'Username Field',
+    'ldap_lname_field'          => 'Last Name',
+    'ldap_fname_field'          => 'LDAP First Name',
+    'ldap_auth_filter_query'    => 'LDAP Authentication query',
+    'ldap_version'              => 'LDAP Version',
+    'ldap_active_flag'          => 'LDAP Active Flag',
+    'ldap_activated_flag_help'  => 'This value is used to determine whether a synced user can login to Snipe-IT. <strong>It does not affect the ability to check items in or out to them</strong>, and should be the <strong>attribute name</strong> within your AD/LDAP, <strong>not the value</strong>. <br><br>If this field is set to a field name that does not exist in your AD/LDAP, or the value in the AD/LDAP field is set to <code>0</code> or <code>false</code>, <strong>user login will be disabled</strong>. If the value in the AD/LDAP field is set to <code>1</code> or <code>true</code> or <em>any other text</em> means the user can log in. When the field is blank in your AD, we respect the <code>userAccountControl</code> attribute, which usually allows non-suspended users to log in.',
+    'ldap_invert_active_flag'   => 'LDAP Invert Active Flag',
+    'ldap_invert_active_flag_help'     => 'If enabled: when the value returned by LDAP Active Flag is <code>0</code> or <code>false</code> the user account will be active.',
+    'ldap_emp_num'              => 'LDAP Employee Number',
+    'ldap_email'                => 'LDAP Email',
+    'ldap_test'                 => 'Test LDAP',
+    'ldap_test_sync'            => 'Test LDAP Synchronization',
+    'license'                   => 'Software License',
+    'load_remote'               => 'Load Remote Avatars',
+    'load_remote_help_text'		=> 'Uncheck this box if your install cannot load scripts from the outside internet. This will prevent Snipe-IT from trying load avatars from Gravatar or other outside sources.',
+    'login'                     => 'Login Attempts',
+    'login_attempt'             => 'Login Attempt',
+    'login_ip'                  => 'IP Address',
+    'login_success'             => 'Success?',
+    'login_user_agent'          => 'User Agent',
+    'login_help'                => 'List of attempted logins',
+    'login_note'                => 'Login Note',
+    'login_note_placeholder'            => "If you do not have a login or have found a device belonging to this company, please call technical support at 888-555-1212. Thank you.",
+    'login_note_help'           => 'Optionally include a few sentences on your login screen, for example to assist people who have found a lost or stolen device. This field accepts <a href="https://help.github.com/articles/github-flavored-markdown/">Github flavored markdown</a>',
+    'login_remote_user_text'    => 'Remote User login options',
+    'login_remote_user_enabled_text' => 'Enable Login with Remote User Header',
+    'login_remote_user_enabled_help' => 'This option enables Authentication via the REMOTE_USER header according to the "Common Gateway Interface (rfc3875)"',
+    'login_common_disabled_text' => 'Disable other authentication mechanisms',
+    'login_common_disabled_help' => 'This option disables other authentication mechanisms. Just enable this option if you are sure that your REMOTE_USER login is already working',
+    'login_remote_user_custom_logout_url_text' => 'Custom logout URL',
+    'login_remote_user_custom_logout_url_help' => 'If a url is provided here, users will get redirected to this URL after the user logs out of Snipe-IT. This is useful to close the user sessions of your Authentication provider correctly.',
+    'login_remote_user_header_name_text' => 'Custom user name header',
+    'login_remote_user_header_name_help' => 'Use the specified header instead of REMOTE_USER',
+    'logo'                    	=> 'Logo',
+    'logo_print_assets'         => 'Use in Print',
+    'logo_print_assets_help'    => 'Use branding on printable asset lists ',
+    'full_multiple_companies_support_help_text' => 'Restricting users (including admins) assigned to companies to their company\'s assets.',
+    'full_multiple_companies_support_text' => 'Full Multiple Companies Support',
+    'scope_locations_fmcs_support_text'  => 'Scope Locations with Full Multiple Companies Support',
+    'scope_locations_fmcs_support_help_text'  => 'Restrict locations to their selected company.',
+    'scope_locations_fmcs_check_button' => 'Check Compatibility',
+    'scope_locations_fmcs_support_disabled_text'  => 'This option is disabled because you have conflicting locations set for :count or more items.',
+    'show_in_model_list'   => 'Show in Model Dropdowns',
+    'optional'					=> 'optional',
+    'per_page'                  => 'Results Per Page',
+    'php'                       => 'PHP Version',
+    'php_info'                  => 'PHP info',
+    'php_overview'              => 'PHP',
+    'php_overview_help'         => 'PHP System info',
+    'php_gd_info'               => 'You must install php-gd to display QR codes, see install instructions.',
+    'php_gd_warning'            => 'PHP Image Processing and GD plugin is NOT installed.',
+    'pwd_secure_complexity'     => 'Password Complexity',
+    'pwd_secure_complexity_help' => 'Select whichever password complexity rules you wish to enforce.',
+    'pwd_secure_complexity_disallow_same_pwd_as_user_fields' => 'Password cannot be the same as first name, last name, email, or username',
+    'pwd_secure_complexity_letters' => 'Require at least one letter',
+    'pwd_secure_complexity_numbers' => 'Require at least one number',
+    'pwd_secure_complexity_symbols' => 'Require at least one symbol',
+    'pwd_secure_complexity_case_diff' => 'Require at least one uppercase and one lowercase',
+    'pwd_secure_min'            => 'Password minimum characters',
+    'pwd_secure_min_help'       => 'Minimum permitted value is 8',
+    'pwd_secure_uncommon'       => 'Prevent common passwords',
+    'pwd_secure_uncommon_help'  => 'This will disallow users from using common passwords from the top 10,000 passwords reported in breaches.',
+    'qr_help'                   => 'Enable QR Codes first to set this',
+    'qr_text'                   => 'QR Code Text',
+    'saml'                      => 'SAML',
+    'saml_title'                => 'Update SAML settings',
+    'saml_help'                 => 'SAML settings',
+    'saml_enabled'              => 'SAML enabled',
+    'saml_integration'          => 'SAML Integration',
+    'saml_sp_entityid'          => 'Entity ID',
+    'saml_sp_acs_url'           => 'Assertion Consumer Service (ACS) URL',
+    'saml_sp_sls_url'           => 'Single Logout Service (SLS) URL',
+    'saml_sp_x509cert'          => 'Public Certificate',
+    'saml_sp_metadata_url'      => 'Metadata URL',
+    'saml_idp_metadata'         => 'SAML IdP Metadata',
+    'saml_idp_metadata_help'    => 'You can specify the IdP metadata using a URL or XML file.',
+    'saml_attr_mapping_username' => 'Attribute Mapping - Username',
+    'saml_attr_mapping_username_help' => 'NameID will be used if attribute mapping is unspecified or invalid.',
+    'saml_forcelogin_label'     => 'SAML Force Login',
+    'saml_forcelogin'           => 'Make SAML the primary login',
+    'saml_forcelogin_help'      => 'You can use \'/login?nosaml\' to get to the normal login page.',
+    'saml_slo_label'            => 'SAML Single Log Out',
+    'saml_slo'                  => 'Send a LogoutRequest to IdP on Logout',
+    'saml_slo_help'             => 'This will cause the user to be first redirected to the IdP on logout. Leave unchecked if the IdP doesn\'t correctly support SP-initiated SAML SLO.',
+    'saml_custom_settings'      => 'SAML Custom Settings',
+    'saml_custom_settings_help' => 'You can specify additional settings to the onelogin/php-saml library. Use at your own risk.',
+    'saml_download'             => 'Download Metadata',
+    'setting'                   => 'Setting',
+    'settings'                  => 'Settings',
+    'show_alerts_in_menu'       => 'Show alerts in top menu',
+    'show_archived_in_list'     => 'Archived Assets',
+    'show_archived_in_list_text'     => 'Show archived assets in the "all assets" listing',
+    'show_assigned_assets'      => 'Show assets assigned to assets',
+    'show_assigned_assets_help' => 'Display assets which were assigned to the other assets in View User -> Assets, View User -> Info -> Print All Assigned and in Account -> View Assigned Assets.',
+    'show_images_in_email'     => 'Show images in emails',
+    'show_images_in_email_help'   => 'Uncheck this box if your Snipe-IT installation is behind a VPN or closed network and users outside the network will not be able to load images served from this installation in their emails.',
+    'site_name'                 => 'Site Name',
+    'integrations'               => 'Integrations',
+    'slack'                     => 'Slack',
+    'general_webhook'           => 'General Webhook',
+    'ms_teams'                  => 'Microsoft Teams',
+    'webhook'                   => ':app',
+    'webhook_presave'           => 'Test to Save',
+    'webhook_title'               => 'Update Webhook Settings',
+    'webhook_help'                => 'Integration settings',
+    'webhook_botname'             => ':app Botname',
+    'webhook_channel'             => ':app Channel',
+    'webhook_endpoint'            => ':app Endpoint',
+    'webhook_integration'         => ':app Settings',
+    'webhook_test'                 =>'Test :app integration',
+    'webhook_integration_help'    => ':app integration is optional, however the endpoint and channel are required if you wish to use it. To configure :app integration, you must first <a href=":webhook_link" target="_new" rel="noopener">create an incoming webhook</a> on your :app account. Click on the <strong>Test :app Integration</strong> button to confirm your settings are correct before saving. ',
+    'webhook_integration_help_button'    => 'Once you have saved your :app information, a test button will appear.',
+    'webhook_test_help'           => 'Test whether your :app integration is configured correctly. YOU MUST SAVE YOUR UPDATED :app SETTINGS FIRST.',
+    'shortcuts_enabled'         => 'Enable Shortcuts',
+    'shortcuts_help_text'       => '<strong>Windows</strong>: Alt + Access key, <strong>Mac</strong>: Control + Option + Access key',
+    'snipe_version'  			=> 'Snipe-IT version',
+    'support_footer'            => 'Support Footer Links ',
+    'support_footer_help'       => 'Specify who sees the links to the Snipe-IT Support info and Users Manual',
+    'version_footer'            => 'Version in Footer ',
+    'version_footer_help'       => 'Specify who sees the Snipe-IT version and build number.',
+    'system'                    => 'System Information',
+    'update'                    => 'Update Settings',
+    'value'                     => 'Value',
+    'brand'                     => 'Branding',
+    'brand_help'                => 'Logo, Site Name',
+    'web_brand'                 => 'Web Branding Type',
+    'about_settings_title'      => 'About Settings',
+    'about_settings_text'       => 'These settings let you customize certain aspects of your installation.',
+    'labels_per_page'           => 'Labels per page',
+    'label_dimensions'          => 'Label dimensions (inches)',
+    'next_auto_tag_base'        => 'Next auto-increment',
+    'page_padding'              => 'Page margins (inches)',
+    'privacy_policy_link'       => 'Link to Privacy Policy',
+    'privacy_policy'            => 'Privacy Policy',
+    'privacy_policy_link_help'  => 'If a url is included here, a link to your privacy policy will be included in the app footer and in any emails that the system sends out, in compliance with GDPR. ',
+    'purge'                     => 'Purge Deleted Records',
+    'purge_deleted'             => 'Purge Deleted ',
+    'labels_display_bgutter'    => 'Label bottom gutter',
+    'labels_display_sgutter'    => 'Label side gutter',
+    'labels_fontsize'           => 'Label font size',
+    'labels_pagewidth'          => 'Label sheet width',
+    'labels_pageheight'         => 'Label sheet height',
+    'label_gutters'        => 'Label spacing (inches)',
+    'page_dimensions'        => 'Page dimensions (inches)',
+    'label_fields'          => 'Label visible fields',
+    'inches'        => 'inches',
+    'width_w'        => 'w',
+    'height_h'        => 'h',
+    'show_url_in_emails'                => 'Link to Snipe-IT in Emails',
+    'show_url_in_emails_help_text'      => 'Uncheck this box if you do not wish to link back to your Snipe-IT installation in your email footers. Useful if most of your users never login. ',
+    'text_pt'        => 'pt',
+    'thumbnail_max_h'   => 'Max thumbnail height',
+    'thumbnail_max_h_help'   => 'Maximum height in pixels that thumbnails may display in the listing view. Min 25, max 500.',
+    'two_factor'        => 'Two Factor Authentication',
+    'two_factor_secret'        => 'Two-Factor Code',
+    'two_factor_enrollment'        => 'Two-Factor Enrollment',
+    'two_factor_enabled_text'        => 'Enable Two Factor',
+    'two_factor_reset'        => 'Reset Two-Factor Secret',
+    'two_factor_reset_help'        => 'This will force the user to enroll their device with their authenticator app again. This can be useful if their currently enrolled device is lost or stolen. ',
+    'two_factor_reset_success'          => 'Two factor device successfully reset',
+    'two_factor_reset_error'          => 'Two factor device reset failed',
+    'two_factor_enabled_warning'        => 'Enabling two-factor if it is not currently enabled will immediately force you to authenticate with a Google Auth enrolled device. You will have the ability to enroll your device if one is not currently enrolled.',
+    'two_factor_enabled_help'        => 'This will turn on two-factor authentication using Google Authenticator.',
+    'two_factor_optional'        => 'Selective (Users can enable or disable if permitted)',
+    'two_factor_required'        => 'Required for all users',
+    'two_factor_disabled'        => 'Disabled',
+    'two_factor_enter_code'	=> 'Enter Two-Factor Code',
+    'two_factor_config_complete'	=> 'Submit Code',
+    'two_factor_enabled_edit_not_allowed' => 'Your administrator does not permit you to edit this setting.',
+    'two_factor_enrollment_text'	=> "Two factor authentication is required, however your device has not been enrolled yet. Open your Google Authenticator app and scan the QR code below to enroll your device. Once you've enrolled your device, enter the code below",
+    'require_accept_signature'      => 'Require Signature',
+    'require_accept_signature_help_text'      => 'Enabling this feature will require users to physically sign off on accepting an asset.',
+    'require_checkinout_notes'  => 'Require Notes on Checkin/Checkout',
+    'require_checkinout_notes_help_text'    => 'Enabling this feature will require the note fields to be populated when checking in or checking out an asset.',
+    'left'        => 'left',
+    'right'        => 'right',
+    'top'        => 'top',
+    'bottom'        => 'bottom',
+    'vertical'        => 'vertical',
+    'horizontal'        => 'horizontal',
+    'unique_serial'                => 'Unique serial numbers',
+    'unique_serial_help_text'                => 'Checking this box will enforce a uniqueness constraint on asset serials',
+    'zerofill_count'        => 'Length of asset tags, including zerofill',
+    'username_format_help'   => 'This setting will only be used by the import process if a username is not provided and we have to generate a username for you.',
+    'oauth_title' => 'OAuth API Settings',
+    'oauth_clients' => 'OAuth Clients',
+    'oauth' => 'OAuth',
+    'oauth_help' => 'Oauth Endpoint Settings',
+    'oauth_no_clients' => 'You have not created any OAuth clients yet.',
+    'oauth_secret' => 'Secret',
+    'oauth_authorized_apps' => 'Authorized Applications',
+    'oauth_redirect_url' => 'Redirect URL',
+    'oauth_name_help' => ' Something your users will recognize and trust.',
+    'oauth_scopes' => 'Scopes',
+    'oauth_callback_url' => 'Your application authorization callback URL.',
+    'create_client' => 'Create Client',
+    'no_scopes' => 'No scopes',
+    'asset_tag_title' => 'Update Asset Tag Settings',
+    'barcode_title' => 'Update Barcode Settings',
+    'barcodes' => 'Barcodes',
+    'barcodes_help_overview' => 'Barcode &amp; QR settings',
+    'barcodes_help' => 'This will attempt to delete cached barcodes. This would typically only be used if your barcode settings have changed, or if your Snipe-IT URL has changed. Barcodes will be re-generated when accessed next.',
+    'barcodes_spinner' => 'Attempting to delete files...',
+    'barcode_delete_cache' => 'Delete Barcode Cache',
+    'branding_title' => 'Update Branding Settings',
+    'general_title' => 'Update General Settings',
+    'mail_test' => 'Send Test',
+    'mail_test_help' => 'This will attempt to send a test mail to :replyto.',
+    'filter_by_keyword' => 'Filter by setting keyword',
+    'security' => 'Security',
+    'security_title' => 'Update Security Settings',
+    'security_help' => 'Two-factor, Password Restrictions',
+    'groups_help' => 'Account permission groups',
+    'localization' => 'Localization',
+    'localization_title' => 'Update Localization Settings',
+    'localization_help' => 'Language, date display',
+    'notifications' => 'Notifications',
+    'notifications_help' => 'Email Alerts & Audit Settings',
+    'asset_tags_help' => 'Incrementing and prefixes',
+    'labels' => 'Labels',
+    'labels_title' => 'Update Label Settings',
+    'labels_help' => 'Barcodes &amp; label settings',
+    'purge_help' => 'Purge Deleted Records',
+    'ldap_extension_warning' => 'It does not look like the LDAP extension is installed or enabled on this server. You can still save your settings, but you will need to enable the LDAP extension for PHP before LDAP syncing or login will work.',
+    'ldap_ad' => 'LDAP/AD',
+    'ldap_test_label' => 'Test LDAP Sync',
+    'ldap_test_login' => ' Test LDAP Login',
+    'ldap_username_placeholder' => 'LDAP Username',
+    'ldap_password_placeholder' => 'LDAP Password',
+    'employee_number' => 'Employee Number',
+    'create_admin_user' => 'Create a User ::',
+    'create_admin_success' => 'Success! Your admin user has been added!',
+    'create_admin_redirect' => 'Click here to go to your app login!',
+    'setup_migrations' => 'Database Migrations ::',
+    'setup_no_migrations' => 'There was nothing to migrate. Your database tables were already set up!',
+    'setup_successful_migrations' => 'Your database tables have been created',
+    'setup_migration_output' => 'Migration output:',
+    'setup_migration_create_user' => 'Next: Create User',
+    'ldap_settings_link' => 'LDAP Settings Page',
+    'slack_test' => 'Test <i class="fab fa-slack"></i> Integration',
+    'status_label_name' => 'Status Label Name',
+    'super_admin_only'  => 'Super Admin Only',
+    'label2_enable'           => 'New Label Engine',
+    'label2_enable_help'      => 'Switch to the new label engine. <b>Note: You will need to save this setting before setting others.</b>',
+    'label2_template'         => 'Template',
+    'label2_template_help'    => 'Select which template to use for label generation',
+    'label2_title'            => 'Title',
+    'label2_title_help'       => 'The title to show on labels that support it',
+    'label2_title_help_phold' => 'The placeholder <code>{COMPANY}</code> will be replaced with the asset&apos;s company name',
+    'label2_asset_logo'       => 'Use Asset Logo',
+    'label2_asset_logo_help'  => 'Use the logo of the asset&apos;s assigned company, rather than the value at <code>:setting_name</code>',
+    'label2_1d_type'          => '1D Barcode Type',
+    'label2_1d_type_help'     => 'Format for 1D barcodes',
+    'label2_2d_type'          => '2D Barcode Type',
+    'label2_2d_type_help'     => 'Format for 2D barcodes',
+    'label2_2d_target'        => '2D Barcode Target',
+    'label2_2d_target_help'   => 'The data that will be contained in the 2D barcode',
+    'label2_fields'           => 'Field Definitions',
+    'label2_fields_help'      => 'Fields can be added, removed, and reordered in the left column. For each field, multiple options for Label and DataSource can be added, removed, and reordered in the right column.',
+    'purge_barcodes' => 'Purge Barcodes',
+    'help_asterisk_bold'    => 'Text entered as <code>**text**</code> will be displayed as bold',
+    'help_blank_to_use'     => 'Leave blank to use the value from <code>:setting_name</code>',
+    'help_default_will_use' => '<code>:default</code> will use the value from <code>:setting_name</code>. <br>Note that the value of the barcodes must comply with the respective barcode spec in order to be successfully generated. Please see <a href="https://snipe-it.readme.io/docs/barcodes">the documentation <i class="fa fa-external-link"></i></a> for more details. ',
+    'asset_id'              => 'Asset ID',
+    'data'               => 'Data',
+    'default'               => 'Default',
+    'none'                  => 'None',
+    'google_callback_help' => 'This should be entered as the callback URL in your Google OAuth app settings in your organization&apos;s <strong><a href="https://console.cloud.google.com/" target="_blank">Google developer console <i class="fa fa-external-link" aria-hidden="true"></i></a></strong>.',
+    'google_login'      => 'Google Workspace Login Settings',
+    'enable_google_login'  => 'Enable users to login with Google Workspace',
+    'enable_google_login_help'  => 'Users will not be automatically provisioned. They must have an existing account here AND in Google Workspace, and their username here must match their Google Workspace email address. ',
+    'mail_reply_to' => 'Mail Reply-To Address',
+    'mail_from' => 'Mail From Address',
+    'database_driver' => 'Database Driver',
+    'bs_table_storage' => 'Table Storage',
+    'timezone' => 'Timezone',
+    'test_mail' => 'Test Mail',
+    'profile_edit'          => 'Edit Profile',
+    'profile_edit_help'          => 'Allow users to edit their own profiles.',
+    'default_avatar' => 'Custom Default Avatar',
+    'default_avatar_help' => 'This image will be displayed as a profile if a user does not have a profile photo.',
+    'restore_default_avatar' => 'Restore <a href=":default_avatar" data-toggle="lightbox" data-type="image">original system default avatar</a>',
+    'restore_default_avatar_help' => '',
+    'due_checkin_days' => 'Due For Checkin Warning',
+    'due_checkin_days_help' => 'How many days before the expected checkin of an asset should it be listed in the "Due for checkin" page?',
+    'no_groups' => 'No groups have been created yet. Visit <code>Admin Settings > Permission Groups</code> to add one.',
+    'text' => 'Text',
+
+    'username_formats' => [
+        'username_format'		=> 'Username Format',
+        'firstname_lastname_format'	=> 'First Name Last Name (jane.smith)',
+        'first_name_format'	        => 'First Name (jane)',
+        'last_name_format'		=> 'Last Name (doe)',
+        'filastname_format'			=> 'First Initial Last Name (jsmith)',
+        'lastnamefirstinitial_format' =>  'Last Name First Initial (smithj)',
+        'firstname_lastname_underscore_format' => 'First Name Last Name (jane_smith)',
+        'firstinitial.lastname' => 'First Initial Last Name (j.smith)',
+        'lastname_firstinitial' => 'Last Name First Initial (smith_j)',
+        'lastname_dot_firstinitial_format' => 'Last Name First Initial (smith.j)',
+        'firstnamelastname'     => 'First Name Last Name (janesmith)',
+        'firstnamelastinitial'  => 'First Name Last Initial (janes)',
+        'lastnamefirstname'      => 'Last Name.First Name (smith.jane)',
+    ],
+
+    'email_formats' => [
+        'email_format'			=> 'Email Format',
+        'firstname_lastname_format'	=> 'First Name Last Name (jane.smith@example.com)',
+        'first_name_format'		=> 'First Name (jane@example.com)',
+        'last_name_format'		=> 'Last Name (doe@example.com)',
+        'filastname_format'			=> 'First Initial Last Name (jsmith@example.com)',
+        'lastnamefirstinitial_format' =>  'Last Name First Initial (smithj@example.com)',
+        'firstname_lastname_underscore_format' => 'First Name Last Name (jane_smith@example.com)',
+        'firstinitial.lastname' => 'First Initial Last Name (j.smith@example.com)',
+        'lastname_firstinitial' => 'Last Name First Initial (smith_j@example.com)',
+        'lastname_dot_firstinitial_format' => 'Last Name First Initial (smith.j@example.com)',
+        'firstnamelastname'     => 'First Name Last Name (janesmith@example.com)',
+        'firstnamelastinitial'  => 'First Name Last Initial (janes@example.com)',
+        'lastnamefirstname'      => 'Last Name.First Name (smith.jane@example.com)',
+    ],
+
+
+
+    'logo_labels' => [
+        'acceptance_pdf_logo'       => 'PDF Logo',
+        'email_logo'                => 'Email Logo',
+        'label_logo'                => 'Label Logo',
+        'logo'                      => 'Site Logo',
+        'favicon'                   => 'Favicon',
+    ],
+
+    'logo_help' => [
+        'email_logo_size'       => 'Square logos in email look best. ',
+    ],
+
+    'logo_option_types' => [
+        'text' => 'Text',
+        'logo' => 'Logo',
+        'logo_and_text' => 'Logo and Text',
+    ],
+
+
+    'legends' => [
+        'scoping' => 'Scoping',
+        'formats' => 'Default Formats',
+        'profiles' => 'User Profiles',
+        'eula' => 'EULA & Acceptance Preferences',
+        'misc_display' => 'Miscellaneous Display Options',
+        'email' => 'Email Preferences',
+        'checkin' => 'Checkin Preferences',
+        'dashboard' => 'Login & Dashboard Preferences',
+        'misc' => 'Miscellaneous',
+        'logos' => 'Logos & Display',
+        'colors' => 'Colors & Skins',
+        'footer' => 'Footer Preferences',
+        'security' => 'Security Preferences',
+        'general' => 'General',
+        'intervals' => 'Intervals & Thresholds',
+    ],
+
+
+    /* Keywords for settings overview help */
+    'keywords' => [
+        'brand'             => 'footer, logo, print, theme, skin, header, colors, color, css',
+        'general_settings'  => 'company support, signature, acceptance, email format, username format, images, per page, thumbnail, eula, gravatar, tos, dashboard, privacy',
+        'groups'            => 'permissions, permission groups, authorization',
+        'labels'            => 'labels, barcodes, barcode, sheets, print, upc, qr, 1d, 2d',
+        'localization'      => 'localization, currency, local, locale, time zone, timezone, international, internatinalization, language, languages, translation',
+        'php_overview'      => 'phpinfo, system, info',
+        'purge'             => 'permanently delete',
+        'security'          => 'password, passwords, requirements, two factor, two-factor, common passwords, remote login, logout, authentication',
+    ],
+
+];
diff --git a/resources/lang/mr-IN/admin/settings/message.php b/resources/lang/mr-IN/admin/settings/message.php
new file mode 100644
index 0000000000..58abf14c5c
--- /dev/null
+++ b/resources/lang/mr-IN/admin/settings/message.php
@@ -0,0 +1,59 @@
+<?php
+
+return [
+
+    'update' => [
+        'error'                 => 'An error has occurred while updating. ',
+        'success'               => 'Settings updated successfully.',
+    ],
+    'backup' => [
+        'delete_confirm'        => 'Are you sure you would like to delete this backup file? This action cannot be undone. ',
+        'file_deleted'          => 'The backup file was successfully deleted. ',
+        'generated'             => 'A new backup file was successfully created.',
+        'file_not_found'        => 'That backup file could not be found on the server.',
+        'restore_warning'       => 'Yes, restore it. I acknowledge that this will overwrite any existing data currently in the database. This will also log out all of your existing users (including you).',
+        'restore_confirm'       => 'Are you sure you wish to restore your database from :filename?'
+    ],
+    'restore' => [
+        'success'               => 'Your system backup has been restored. Please log in again.'
+    ],
+    'purge' => [
+        'error'     => 'An error has occurred while purging. ',
+        'validation_failed'     => 'Your purge confirmation is incorrect. Please type the word "DELETE" in the confirmation box.',
+        'success'               => 'Deleted records successfully purged.',
+    ],
+    'mail' => [
+        'sending' => 'Sending Test Email...',
+        'success' => 'Mail sent!',
+        'error' => 'Mail could not be sent.',
+        'additional' => 'No additional error message provided. Check your mail settings and your app log.'
+    ],
+    'ldap' => [
+        'testing' => 'Testing LDAP Connection, Binding & Query ...',
+        '500' => '500 Server Error. Please check your server logs for more information.',
+        'error' => 'Something went wrong :(',
+        'sync_success' => 'A sample of 10 users returned from the LDAP server based on your settings:',
+        'testing_authentication' => 'Testing LDAP Authentication...',
+        'authentication_success' => 'User authenticated against LDAP successfully!'
+    ],
+    'labels' => [
+        'null_template' => 'Label template not found. Please select a template.',
+        ],
+    'webhook' => [
+        'sending' => 'Sending :app test message...',
+        'success' => 'Your :webhook_name Integration works!',
+        'success_pt1' => 'Success! Check the ',
+        'success_pt2' => ' channel for your test message, and be sure to click SAVE below to store your settings.',
+        '500' => '500 Server Error.',
+        'error' => 'Something went wrong. :app responded with: :error_message',
+        'error_redirect' => 'ERROR: 301/302 :endpoint returns a redirect. For security reasons, we don’t follow redirects. Please use the actual endpoint.',
+        'error_misc' => 'Something went wrong. :( ',
+        'webhook_fail' => ' webhook notification failed: Check to make sure the URL is still valid.',
+        'webhook_channel_not_found' => ' webhook channel not found.',
+        'ms_teams_deprecation' => 'The selected Microsoft Teams webhook URL will be deprecated Dec 31st, 2025. Please use a workflow URL. Microsoft\'s documentation on creating a workflow can be found <a href="https://support.microsoft.com/en-us/office/create-incoming-webhooks-with-workflows-for-microsoft-teams-8ae491c7-0394-4861-ba59-055e33f75498" target="_blank"> here.</a>',
+    ],
+    'location_scoping' => [
+        'not_saved' => 'Your settings were not saved.',
+        'mismatch' => 'There is 1 item in the database that need your attention before you can enable location scoping.|There are :count items in the database that need your attention before you can enable location scoping.',
+    ],
+];
diff --git a/resources/lang/mr-IN/admin/settings/table.php b/resources/lang/mr-IN/admin/settings/table.php
new file mode 100644
index 0000000000..22db5c84ed
--- /dev/null
+++ b/resources/lang/mr-IN/admin/settings/table.php
@@ -0,0 +1,6 @@
+<?php
+
+return array(
+    'created'   => 'Created',
+    'size' => 'Size',
+);
diff --git a/resources/lang/mr-IN/admin/statuslabels/message.php b/resources/lang/mr-IN/admin/statuslabels/message.php
new file mode 100644
index 0000000000..b1b4034d0d
--- /dev/null
+++ b/resources/lang/mr-IN/admin/statuslabels/message.php
@@ -0,0 +1,32 @@
+<?php
+
+return [
+
+    'does_not_exist' => 'Status Label does not exist.',
+    'deleted_label' => 'Deleted Status Label',
+    'assoc_assets'	 => 'This Status Label is currently associated with at least one Asset and cannot be deleted. Please update your assets to no longer reference this status and try again. ',
+
+    'create' => [
+        'error'   => 'Status Label was not created, please try again.',
+        'success' => 'Status Label created successfully.',
+    ],
+
+    'update' => [
+        'error'   => 'Status Label was not updated, please try again',
+        'success' => 'Status Label updated successfully.',
+    ],
+
+    'delete' => [
+        'confirm'   => 'Are you sure you wish to delete this Status Label?',
+        'error'   => 'There was an issue deleting the Status Label. Please try again.',
+        'success' => 'The Status Label was deleted successfully.',
+    ],
+
+    'help' => [
+        'undeployable'   => 'These assets cannot be assigned to anyone.',
+        'deployable'   => 'These assets can be checked out. Once they are assigned, they will assume a meta status of <i class="fas fa-circle text-blue"></i> <strong>Deployed</strong>.',
+        'archived'   => 'These assets cannot be checked out, and will only show up in the Archived view. This is useful for retaining information about assets for budgeting/historic purposes but keeping them out of the day-to-day asset list.',
+        'pending'   => 'These assets can not yet be assigned to anyone, often used for items that are out for repair, but are expected to return to circulation.',
+    ],
+
+];
diff --git a/resources/lang/mr-IN/admin/statuslabels/table.php b/resources/lang/mr-IN/admin/statuslabels/table.php
new file mode 100644
index 0000000000..1a0fab891e
--- /dev/null
+++ b/resources/lang/mr-IN/admin/statuslabels/table.php
@@ -0,0 +1,19 @@
+<?php
+
+return array(
+    'about'      	=> 'About Status Types',
+    'archived'      	=> 'Archived',
+    'create'      	=> 'Create Status Label',
+    'color'      	=> 'Chart Color',
+    'default_label' => 'Default Label',
+    'default_label_help' => 'This is used to ensure your most commonly used status labels appear at the top of the select box when creating/editing assets.',
+    'deployable'      	=> 'Deployable',
+    'info'      	=> 'Status label types are used to describe the various states your assets could be in. They may be out for repair, lost/stolen, etc. You can create new status labels for your deployable, pending and archived assets according to your own workflow. For more information, <a href="https://snipe-it.readme.io/docs/overview#status-labels" target="_blank">see the documentation <i class="fa fa-external-link"></i></a>.',
+    'name'      	=> 'Status Name',
+    'pending'      	=> 'Pending',
+    'status_type'   => 'Status Type',
+    'show_in_nav'   => 'Show in side nav',
+    'title'      	=> 'Status Labels',
+    'undeployable'  => 'Undeployable',
+    'update'      	=> 'Update Status Label',
+);
diff --git a/resources/lang/mr-IN/admin/suppliers/message.php b/resources/lang/mr-IN/admin/suppliers/message.php
new file mode 100644
index 0000000000..a693669c7e
--- /dev/null
+++ b/resources/lang/mr-IN/admin/suppliers/message.php
@@ -0,0 +1,28 @@
+<?php
+
+return array(
+
+    'deleted' => 'Deleted supplier',
+    'does_not_exist' => 'Supplier does not exist.',
+
+
+    'create' => array(
+        'error'   => 'Supplier was not created, please try again.',
+        'success' => 'Supplier created successfully.'
+    ),
+
+    'update' => array(
+        'error'   => 'Supplier was not updated, please try again',
+        'success' => 'Supplier updated successfully.'
+    ),
+
+    'delete' => array(
+        'confirm'   => 'Are you sure you wish to delete this supplier?',
+        'error'   => 'There was an issue deleting the supplier. Please try again.',
+        'success' => 'Supplier was deleted successfully.',
+        'assoc_assets'	 => 'This supplier is currently associated with :asset_count asset(s) and cannot be deleted. Please update your assets to no longer reference this supplier and try again. ',
+        'assoc_licenses'	 => 'This supplier is currently associated with :licenses_count licences(s) and cannot be deleted. Please update your licenses to no longer reference this supplier and try again. ',
+        'assoc_maintenances'	 => 'This supplier is currently associated with :asset_maintenances_count asset maintenances(s) and cannot be deleted. Please update your asset maintenances to no longer reference this supplier and try again. ',
+    )
+
+);
diff --git a/resources/lang/mr-IN/admin/suppliers/table.php b/resources/lang/mr-IN/admin/suppliers/table.php
new file mode 100644
index 0000000000..fe7ce55021
--- /dev/null
+++ b/resources/lang/mr-IN/admin/suppliers/table.php
@@ -0,0 +1,26 @@
+<?php
+
+return array(
+    'about_suppliers_title' => 'About Suppliers',
+    'about_suppliers_text'  => 'Suppliers are used to track the source of items',
+    'address'               => 'Supplier Address',
+    'assets'                => 'Assets',
+    'city'                  => 'City',
+    'contact'               => 'Contact Name',
+    'country'               => 'Country',
+    'create'                => 'Create Supplier',
+    'email'                 => 'Email',
+    'fax'                   => 'Fax',
+    'id'                    => 'ID',
+    'licenses'              => 'Licenses',
+    'name'                  => 'Supplier Name',
+    'notes'                 => 'Notes',
+    'phone'                 => 'Phone',
+    'state'                 => 'State',
+    'suppliers'             => 'Suppliers',
+    'update'                => 'Update Supplier',
+    'view'                  => 'View Supplier',
+    'view_assets_for'       => 'View Assets for',
+    'zip'                   => 'Postal Code',
+
+);
diff --git a/resources/lang/mr-IN/admin/users/general.php b/resources/lang/mr-IN/admin/users/general.php
new file mode 100644
index 0000000000..14f36cf151
--- /dev/null
+++ b/resources/lang/mr-IN/admin/users/general.php
@@ -0,0 +1,56 @@
+<?php
+
+return [
+    'activated_help_text' => 'This user can login',
+    'activated_disabled_help_text' => 'You cannot edit activation status for your own account.',
+    'assets_user'       => 'Assets assigned to :name',
+    'bulk_update_warn'	=> 'You are about to edit the properties of :user_count users. Please note that you cannot change your own user attributes using this form, and must make edits to your own user individually.',
+    'bulk_update_help'	=> 'This form allows you to update multiple users at once. Only fill in the fields you need to change. Any fields left blank will remain unchanged.',
+    'current_assets'    => 'Assets currently checked out to this user',
+    'clone'             => 'Clone User',
+    'contact_user'      => 'Contact :name',
+    'edit'              => 'Edit User',
+    'filetype_info'     => 'Allowed filetypes are png, gif, jpg, jpeg, doc, docx, pdf, txt, zip, and rar.',
+    'history_user'      => 'History for :name',
+    'info'				=> 'Info',
+    'restore_user'		=> 'Click here to restore them.',
+    'last_login'        => 'Last Login',
+    'ldap_config_text'  => 'LDAP configuration settings can be found Admin > Settings. The (optional) selected location will be set for all imported users.',
+    'print_assigned'    => 'Print All Assigned',
+    'email_assigned'    => 'Email List of All Assigned',
+    'user_notified'     => 'User has been emailed a list of their currently assigned items.',
+    'users_notified'    => 'The user has been emailed a list of their currently assigned items.|:count users have been emailed a list of their currently assigned items.',
+    'users_notified_warning' => ':count user has been emailed a list of their currently assigned items, however :no_email users did not have an email address so could not be emailed.|:count users have been emailed a list of their currently assigned items, however :no_email user(s) did not have an email address so could not be emailed.',
+    'auto_assign_label' => 'Include this user when auto-assigning eligible licenses',
+    'auto_assign_help'  => 'Skip this user in auto assignment of licenses',
+    'software_user'     => 'Software Checked out to :name',
+    'send_email_help'   => 'You must provide an email address for this user to send them credentials. Emailing credentials can only be done on user creation. Passwords are stored in a one-way hash and cannot be retrieved once saved.',
+    'view_user'         => 'View User :name',
+    'usercsv'           => 'CSV file',
+    'two_factor_admin_optin_help' => 'Your current admin settings allow selective enforcement of two-factor authentication.  ',
+    'two_factor_enrolled' => '2FA Device Enrolled ',
+    'two_factor_active'   => '2FA Active ',
+    'user_deactivated'  => 'User cannot login',
+    'user_activated'  => 'User can login',
+    'activation_status_warning' => 'Do not change activation status',
+    'group_memberships_helpblock' => 'Only superadmins may edit group memberships.',
+    'superadmin_permission_warning' => 'Only superadmins may grant a user superadmin access.',
+    'admin_permission_warning' => 'Only users with admins rights or greater may grant a user admin access.',
+    'remove_group_memberships' => 'Remove Group Memberships',
+    'warning_deletion_information' => 'You are about to checkin ALL items from the :count user(s) listed below. Super admin names are highlighted in red.',
+    'update_user_assets_status' => 'Update all assets for these users to this status',
+    'checkin_user_properties' => 'Check in all properties associated with these users',
+    'remote_label'   => 'This is a remote user',
+    'remote'   => 'Remote',
+    'remote_help' => 'This can be useful if you need to filter by remote users who never or rarely come into your physical locations.',
+    'not_remote_label' => 'This is not a remote user',
+    'vip_label' => 'VIP user',
+    'vip_help' => 'This can be helpful to mark important people in your org if you would like to handle them in special ways.',
+    'create_user' => 'Create a user',
+    'create_user_page_explanation' => 'This is the account information you will use to access the site for the first time.',
+    'email_credentials' => 'Email credentials',
+    'email_credentials_text' => 'Email my credentials to the email address above',
+    'next_save_user' => 'Next: Save User',
+    'all_assigned_list_generation' => 'Generated on:',
+    'email_user_creds_on_create' => 'Email this user their credentials?',
+];
diff --git a/resources/lang/mr-IN/admin/users/message.php b/resources/lang/mr-IN/admin/users/message.php
new file mode 100644
index 0000000000..b6ddad3aac
--- /dev/null
+++ b/resources/lang/mr-IN/admin/users/message.php
@@ -0,0 +1,75 @@
+<?php
+
+return array(
+
+    'accepted'                  => 'You have successfully accepted this asset.',
+    'declined'                  => 'You have successfully declined this asset.',
+    'bulk_manager_warn'	        => 'Your users have been successfully updated, however your manager entry was not saved because the manager you selected was also in the user list to be edited, and users may not be their own manager. Please select your users again, excluding the manager.',
+    'user_exists'               => 'User already exists!',
+    'user_not_found'            => 'User does not exist or you do not have permission view them.',
+    'user_login_required'       => 'The login field is required',
+    'user_has_no_assets_assigned' => 'No assets currently assigned to user.',
+    'user_password_required'    => 'The password is required.',
+    'insufficient_permissions'  => 'Insufficient Permissions.',
+    'user_deleted_warning'      => 'This user has been deleted. You will have to restore this user to edit them or assign them new assets.',
+    'ldap_not_configured'        => 'LDAP integration has not been configured for this installation.',
+    'password_resets_sent'      => 'The selected users who are activated and have a valid email addresses have been sent a password reset link.',
+    'password_reset_sent'       => 'A password reset link has been sent to :email!',
+    'user_has_no_email'         => 'This user does not have an email address in their profile.',
+    'log_record_not_found'        => 'A matching log record for this user could not be found.',
+
+
+    'success' => array(
+        'create'    => 'User was successfully created.',
+        'update'    => 'User was successfully updated.',
+        'update_bulk'    => 'Users were successfully updated!',
+        'delete'    => 'User was successfully deleted.',
+        'ban'       => 'User was successfully banned.',
+        'unban'     => 'User was successfully unbanned.',
+        'suspend'   => 'User was successfully suspended.',
+        'unsuspend' => 'User was successfully unsuspended.',
+        'restored'  => 'User was successfully restored.',
+        'import'    => 'Users imported successfully.',
+    ),
+
+    'error' => array(
+        'create' => 'There was an issue creating the user. Please try again.',
+        'update' => 'There was an issue updating the user. Please try again.',
+        'delete' => 'There was an issue deleting the user. Please try again.',
+        'delete_has_assets' => 'This user has items assigned and could not be deleted.',
+        'delete_has_assets_var' => 'This user still has an asset assigned. Please check it in first.|This user still has :count assets assigned. Please check their assets in first.',
+        'delete_has_licenses_var' => 'This user still has a license seats assigned. Please check it in first.|This user still has :count license seats assigned. Please check them in first.',
+        'delete_has_accessories_var' => 'This user still has an accessory assigned. Please check it in first.|This user still has :count accessories assigned. Please check their assets in first.',
+        'delete_has_locations_var' => 'This user still manages a location. Please select another manager first.|This user still manages :count locations. Please select another manager first.',
+        'delete_has_users_var' => 'This user still manages another user. Please select another manager for that user first.|This user still manages :count users. Please select another manager for them first.',
+        'unsuspend' => 'There was an issue unsuspending the user. Please try again.',
+        'import'    => 'There was an issue importing users. Please try again.',
+        'asset_already_accepted' => 'This asset has already been accepted.',
+        'accept_or_decline' => 'You must either accept or decline this asset.',
+        'cannot_delete_yourself' => 'We would feel really bad if you deleted yourself, please reconsider.',
+        'incorrect_user_accepted' => 'The asset you have attempted to accept was not checked out to you.',
+        'ldap_could_not_connect' => 'Could not connect to the LDAP server. Please check your LDAP server configuration in the LDAP config file. <br>Error from LDAP Server:',
+        'ldap_could_not_bind' => 'Could not bind to the LDAP server. Please check your LDAP server configuration in the LDAP config file. <br>Error from LDAP Server: ',
+        'ldap_could_not_search' => 'Could not search the LDAP server. Please check your LDAP server configuration in the LDAP config file. <br>Error from LDAP Server:',
+        'ldap_could_not_get_entries' => 'Could not get entries from the LDAP server. Please check your LDAP server configuration in the LDAP config file. <br>Error from LDAP Server:',
+        'password_ldap' => 'The password for this account is managed by LDAP/Active Directory. Please contact your IT department to change your password. ',
+        'multi_company_items_assigned' => 'This user has items assigned that belong to a different company. Please check them in or edit their company.'
+    ),
+
+    'deletefile' => array(
+        'error'   => 'File not deleted. Please try again.',
+        'success' => 'File successfully deleted.',
+    ),
+
+    'upload' => array(
+        'error'   => 'File(s) not uploaded. Please try again.',
+        'success' => 'File(s) successfully uploaded.',
+        'nofiles' => 'You did not select any files for upload',
+        'invalidfiles' => 'One or more of your files is too large or is a filetype that is not allowed. Allowed filetypes are png, gif, jpg, doc, docx, pdf, and txt.',
+    ),
+
+    'inventorynotification' => array(
+        'error'   => 'This user has no email set.',
+        'success' => 'The user has been notified about their current inventory.'
+    )
+);
\ No newline at end of file
diff --git a/resources/lang/mr-IN/admin/users/table.php b/resources/lang/mr-IN/admin/users/table.php
new file mode 100644
index 0000000000..094cdbc412
--- /dev/null
+++ b/resources/lang/mr-IN/admin/users/table.php
@@ -0,0 +1,41 @@
+<?php
+
+return array(
+    'activated'  			=> 'Active',
+    'allow'  				=> 'Allow',
+    'checkedout'  			=> 'Assets',
+    'created_at' 			=> 'Created',
+    'createuser' 			=> 'Create User',
+    'deny'  				=> 'Deny',
+    'email'      			=> 'Email',
+    'employee_num'      	=> 'Employee No.',
+    'first_name' 			=> 'First Name',
+    'groupnotes'			=> 'Select a group to assign to the user, remember that a user takes on the permissions of the group they are assigned. Use ctrl+click (or cmd+click on MacOS) to deselect groups.',
+    'id'         			=> 'Id',
+    'inherit'  				=> 'Inherit',
+    'job' 					=> 'Job Title',
+    'last_login'  			=> 'Last Login',
+    'last_name'  			=> 'Last Name',
+    'location'  			=> 'Location',
+    'lock_passwords'		=> 'Login details cannot be changed on this installation.',
+    'manager' 				=> 'Manager',
+    'managed_locations'     => 'Managed Locations',
+    'managed_users'         => 'Managed Users',
+    'name' 					=> 'Name',
+    'nogroup'               => 'No groups have been created yet. To add one, visit:',
+    'notes'                 => 'Notes',
+    'password_confirm' 		=> 'Confirm Password',
+    'password' 				=> 'Password',
+    'phone'  				=> 'Phone',
+    'show_current'          => 'Show Current Users',
+    'show_deleted'          => 'Show Deleted Users',
+    'title' 				=> 'Title',
+	'to_restore_them'		=> 'to restore them.',
+    'total_assets_cost'     => "Total Assets Cost",
+    'updateuser' 			=> 'Update User',
+    'username' 				=> 'Username',
+	'user_deleted_text' 	=> 'This user has been marked as deleted.',
+    'username_note' 		=> '(This is used for Active Directory binding only, not for login.)',
+    'cloneuser'             => 'Clone User',
+    'viewusers' 			=> 'View Users',
+);
diff --git a/resources/lang/mr-IN/auth.php b/resources/lang/mr-IN/auth.php
new file mode 100644
index 0000000000..14d8acfce0
--- /dev/null
+++ b/resources/lang/mr-IN/auth.php
@@ -0,0 +1,20 @@
+<?php
+
+return array(
+
+    /*
+    |--------------------------------------------------------------------------
+    | Authentication Language Lines
+    |--------------------------------------------------------------------------
+    |
+    | The following language lines are used during authentication for various
+    | messages that we need to display to the user. You are free to modify
+    | these language lines according to your application's requirements.
+    |
+    */
+
+    'failed' => 'These credentials do not match our records.',
+    'password' => 'The provided password is incorrect.',
+    'throttle' => 'Too many login attempts. Please try again in :minutes minute(s).',
+
+);
diff --git a/resources/lang/mr-IN/auth/general.php b/resources/lang/mr-IN/auth/general.php
new file mode 100644
index 0000000000..2bbd112788
--- /dev/null
+++ b/resources/lang/mr-IN/auth/general.php
@@ -0,0 +1,18 @@
+<?php
+
+return [
+    'send_password_link'	        => 'Send Password Reset Link',
+    'email_reset_password'			=> 'Email Password Reset',
+    'reset_password'			    => 'Reset Password',
+    'saml_login'                    => 'Login via SAML',
+    'login'                         => 'Login',
+    'login_prompt'                  => 'Please Login',
+    'forgot_password'               => 'I forgot my password',
+    'ldap_reset_password'           => 'Please click here to reset your LDAP password',
+    'remember_me'                   => 'Remember Me',
+    'username_help_top'                 => 'Enter your <strong>username</strong> to be emailed a password reset link.',
+    'username_help_bottom'          => 'Your username and email address <em>may</em> be the same, but may not be, depending on your configuration. If you cannot remember your username, contact your administrator. <br><br><strong>Usernames without an associated email address will not be emailed a password reset link.</strong> ',
+    'google_login'                  => 'Login with Google Workspace',
+    'google_login_failed'           => 'Google Login failed, please try again.',
+];
+
diff --git a/resources/lang/mr-IN/auth/message.php b/resources/lang/mr-IN/auth/message.php
new file mode 100644
index 0000000000..08f638d058
--- /dev/null
+++ b/resources/lang/mr-IN/auth/message.php
@@ -0,0 +1,45 @@
+<?php
+
+return array(
+
+    'account_already_exists' => 'An account with the this email already exists.',
+    'account_not_found'      => 'The username or password is incorrect.',
+    'account_not_activated'  => 'This user account is not activated.',
+    'account_suspended'      => 'This user account is suspended.',
+
+    'two_factor' => array(
+        'already_enrolled'      => 'Your device is already enrolled.',
+        'success'               => 'You have successfully logged in.',
+        'code_required'         => 'Two-factor code is required.',
+        'invalid_code'          => 'Two-factor code is invalid.',
+        'enter_two_factor_code' => 'Please enter your two-factor authentication code.',
+        'please_enroll'         => 'Please enroll a device in two-factor authentication.',
+    ),
+
+    'signin' => array(
+        'error'   => 'There was a problem while trying to log you in, please try again.',
+        'success' => 'You have successfully logged in.',
+    ),
+
+    'logout' => array(
+        'error'   => 'There was a problem while trying to log you out, please try again.',
+        'success' => 'You have successfully logged out.',
+    ),
+
+    'signup' => array(
+        'error'   => 'There was a problem while trying to create your account, please try again.',
+        'success' => 'Account sucessfully created.',
+    ),
+
+    'forgot-password' => array(
+        'error'   => 'There was a problem while trying to get a reset password code, please try again.',
+        'success' => 'If that email address exists in our system, a password recovery email has been sent.',
+    ),
+
+    'forgot-password-confirm' => array(
+        'error'   => 'There was a problem while trying to reset your password, please try again.',
+        'success' => 'Your password has been successfully reset.',
+    ),
+
+
+);
diff --git a/resources/lang/mr-IN/button.php b/resources/lang/mr-IN/button.php
new file mode 100644
index 0000000000..8a838e8faf
--- /dev/null
+++ b/resources/lang/mr-IN/button.php
@@ -0,0 +1,34 @@
+<?php
+
+return [
+    'actions' 	                => 'Actions',
+    'add'    	                => 'Add New',
+    'cancel'                    => 'Cancel',
+    'checkin_and_delete'  	    => 'Checkin All / Delete User',
+    'delete'  	                => 'Delete',
+    'edit'    	                => 'Edit',
+    'clone'    	                => 'Clone',
+    'restore' 	                => 'Restore',
+    'remove'                    => 'Remove',
+    'request'                   => 'Request',
+    'submit'  	                => 'Submit',
+    'upload'                    => 'Upload',
+    'select_file'				=> 'Select File...',
+    'select_files'				=> 'Select Files...',
+    'generate_labels'           => '{1} Generate Label|[2,*] Generate Labels',
+    'send_password_link'        => 'Send Password Reset Link',
+    'go'                        => 'Go',
+    'bulk_actions'              => 'Bulk Actions',
+    'add_maintenance'           => 'Add Maintenance',
+    'append'                    => 'Append',
+    'new'                       => 'New',
+    'var' => [
+        'clone'     => 'Clone :item_type',
+        'edit'      => 'Edit :item_type',
+        'delete'    => 'Delete :item_type',
+        'restore'   => 'Restore :item_type',
+        'create'    => 'Create New :item_type',
+        'checkout'  => 'Checkout :item_type',
+        'checkin'   => 'Checkin :item_type',
+    ]
+];
diff --git a/resources/lang/mr-IN/general.php b/resources/lang/mr-IN/general.php
new file mode 100644
index 0000000000..d2e16aafbb
--- /dev/null
+++ b/resources/lang/mr-IN/general.php
@@ -0,0 +1,629 @@
+<?php
+
+return [
+    '2FA_reset'             => '2FA reset',
+    'accessories'			=> 'Accessories',
+    'activated'			    => 'Activated',
+    'accepted_date'         => 'Date Accepted',
+    'accessory'				=> 'Accessory',
+    'accessory_report'		=> 'Accessory Report',
+    'action'                => 'Action',
+    'activity_report'		=> 'Activity Report',
+    'address'				=> 'Address',
+    'admin'					=> 'Admin Settings',
+    'admin_tooltip'			=> 'This user has admin privileges',
+    'superuser'				=> 'Superuser',
+    'superuser_tooltip'		=> 'This user has superuser privileges',
+    'administrator'			=> 'Administrator',
+    'add_seats'             => 'Added seats',
+    'age'                   => "Age",
+    'all_assets'			=> 'All Assets',
+    'all'       			=> 'All',
+    'archived'              => 'Archived',
+    'asset_models'			=> 'Asset Models',
+    'asset_model'			=> 'Model',
+    'asset'					=> 'Asset',
+    'asset_previous'        => 'Asset (Previously Assigned)',
+    'asset_report'          => 'Asset Report',
+    'asset_tag'				=> 'Asset Tag',
+    'asset_tags'            => 'Asset Tags',
+    'assets_available'		=> 'Assets available',
+    'accept_assets'         => 'Accept Assets :name',
+    'accept_assets_menu'    => 'Accept Assets',
+    'accept_item'           => 'Accept Item',
+    'audit'				    => 'Audit',
+    'audits'				=> 'Audits',
+    'audit_report'			=> 'Audit Log',
+    'assets'				=> 'Assets',
+    'assets_audited'        => 'assets audited',
+    'assets_checked_in_count'     => 'assets checked in',
+    'assets_checked_out_count'     => 'assets checked out',
+    'asset_deleted_warning'     => 'This asset has been deleted. You must restore it before you can assign it to someone.',
+    'assigned_date'         => 'Date Assigned',
+    'assigned_to'           => 'Assigned to :name',
+    'assignee'              => 'Assigned to',
+    'avatar_delete'         => 'Delete Avatar',
+    'avatar_upload'         => 'Upload Avatar',
+    'back'      			=> 'Back',
+    'bad_data'      		=> 'Nothing found. Maybe bad data?',
+    'bulkaudit'             => 'Bulk Audit',
+    'bulkaudit_status'      => 'Audit Status',
+    'bulk_checkout'  		=> 'Bulk Checkout',
+    'bulk_edit'             => 'Bulk Edit',
+    'bulk_delete'           => 'Bulk Delete',
+    'bulk_actions'          => 'Bulk Actions',
+    'bulk_checkin_delete'   => 'Bulk Checkin / Delete Users',
+    'byod'                  => 'BYOD',
+    'byod_help'             => 'This device is owned by the user',
+    'bystatus'              => 'by Status',
+    'cancel'  				=> 'Cancel',
+    'categories'			=> 'Categories',
+    'category'				=> 'Category',
+    'change' 		        => 'In/Out',
+    'changeemail'  			=> 'Change Email Address',
+    'changepassword'  		=> 'Change Password',
+    'checkin'  				=> 'Checkin',
+    'checkin_from'  		=> 'Checkin from',
+    'checkin_note'  		=> 'Checkin Note',
+    'checkout_note'  		=> 'Checkout Note',
+    'checkout'  			=> 'Checkout',
+    'checkouts_count'       => 'Checkouts',
+    'checkins_count'        => 'Checkins',
+    'checkin_and_delete'  	=> 'Checkin and Delete',
+    'user_requests_count'   => 'Requests',
+    'city'  				=> 'City',
+    'click_here'			=> 'Click here',
+    'clear_selection'		=> 'Clear Selection',
+    'companies'			    => 'Companies',
+    'company'				=> 'Company',
+    'component'			    => 'Component',
+    'components'			=> 'Components',
+    'complete'				=> 'Complete',
+    'consumable'			=> 'Consumable',
+    'consumables'			=> 'Consumables',
+    'country'  				=> 'Country',
+    'could_not_restore'     => 'Error restoring :item_type: :error',
+    'not_deleted'           => 'The :item_type was not deleted and therefore cannot be restored',
+    'create'				=> 'Create New',
+    'created'               => 'Item Created',
+    'created_asset'			=> 'created asset',
+    'created_at' 			=> 'Created At',
+    'created_by'            => 'Created By',
+    'record_created' 		=> 'Record Created',
+    'updated_at' 			=> 'Updated at',
+    'currency'  			=> '$', // this is deprecated
+    'currency_text'  		=> 'Currency', //
+    'current'  				=> 'Current',
+    'current_password'      => 'Current Password',
+    'customize_report'      => 'Customize Report',
+    'custom_report'         => 'Custom Asset Report',
+    'dashboard'				=> 'Dashboard',
+    'data_source'           => 'Data Source',
+    'days'      			=> 'days',
+    'days_to_next_audit'    => 'Days to Next Audit',
+    'date'					=> 'Date',
+    'debug_warning'         => 'Warning!',
+    'debug_warning_text'    => 'This application is running in production mode with debugging enabled. This can expose sensitive data if your application is accessible to the outside world. Disable debug mode by setting the <code>APP_DEBUG</code> value in your <code>.env</code> file to <code>false</code>.',
+    'delete'  				=> 'Delete',
+    'delete_confirm'  		=> 'Are you sure you wish to delete :item?',
+    'delete_confirm_no_undo' => 'Are you sure, you wish to delete :item? This cannot be undone.',
+    'deleted'  				=> 'Deleted',
+    'delete_seats'  		=> 'Deleted Seats',
+    'deletion_failed'       => 'Deletion failed',
+    'departments'           => 'Departments',
+    'department'            => 'Department',
+    'deployed'				=> 'Deployed',
+    'depreciation'			=> 'Depreciation',
+    'depreciations'         => 'Depreciations',
+    'depreciation_report'	=> 'Depreciation Report',
+    'details'               => 'Details',
+    'download'				=> 'Download',
+    'download_all'		    => 'Download All',
+    'editprofile'  			=> 'Edit Your Profile',
+    'eol'					=> 'EOL',
+    'email_domain'			=> 'Email Domain',
+    'employee_number'       => 'Employee Number',
+    'email_domain_help'		=> 'This is used to generate email addresses when importing',
+    'error'				    => 'Error',
+    'exclude_archived'      => 'Exclude Archived Assets',
+    'exclude_deleted'       => 'Exclude Deleted Assets',
+    'example'				=> 'Example: ',
+
+    'files'                 => 'Files',
+    'file_name'				=> 'File',
+    'file_type'             => 'File Type',
+    'filesize'              => 'File Size',
+    'file_uploads'			=> 'File Uploads',
+    'file_upload'           => 'File Upload',
+    'generate'				=> 'Generate',
+    'generate_labels'       => 'Generate Labels',
+    'github_markdown'      => 'This field accepts <a href="https://help.github.com/articles/github-flavored-markdown/">Github flavored markdown</a>.',
+    'groups'				=> 'Groups',
+    'gravatar_email'        => 'Gravatar Email Address',
+    'gravatar_url'          => '<a href="http://gravatar.com"><small>Change your avatar at Gravatar.com</small></a>.',
+    'history'  			    => 'History',
+    'history_for'  			=> 'History for',
+    'id'  					=> 'ID',
+    'image'                 => 'Image',
+    'image_delete'         	=> 'Delete Image',
+    'include_deleted'       => 'Include Deleted Assets',
+    'image_upload'         	=> 'Upload Image',
+    'filetypes_accepted_help'    => 'Accepted filetype is :types. The maximum size allowed is :size.|Accepted filetypes are :types. The maximum upload size allowed is :size.',
+    'filetypes_size_help'   => 'The maximum upload size allowed is :size.',
+    'image_filetypes_help'  => 'Accepted Filetypes are jpg, webp, png, gif, svg, and avif. The maximum upload size allowed is :size.',
+    'unaccepted_image_type'  => 'This image file was not readable. Accepted filetypes are jpg, webp, png, gif, and svg. The mimetype of this file is: :mimetype.',
+    'import'         	    => 'Import',
+    'import_this_file'      => 'Map fields and process this file',
+    'importing'         	=> 'Importing',
+    'importing_help'        => 'You can import assets, accessories, licenses, components, consumables, and users via CSV file. <br><br>The CSV should be comma-delimited and formatted with headers that match the ones in the <a href="https://snipe-it.readme.io/docs/importing" target="_new">sample CSVs in the documentation</a>.',
+    'import-history'        => 'Import History',
+    'asset_maintenance'        => 'Asset Maintenance',
+    'asset_maintenance_report' => 'Asset Maintenance Report',
+    'asset_maintenances'       => 'Asset Maintenances',
+    'item'  				=> 'Item',
+    'item_name'             => 'Item Name',
+    'import_file'  			=> 'import CSV file',
+    'import_type'  			=> 'CSV import type',
+    'insufficient_permissions' => 'Insufficient permissions!',
+    'kits'       			=> 'Predefined Kits',
+    'language'				=> 'Language',
+    'last'					=> 'Last',
+    'last_login'            => 'Last Login',
+    'last_name'             => 'Last Name',
+    'firstname_lastname_display'	=> 'First Name Last Name (Jane Smith)',
+    'lastname_firstname_display'	=> 'Last Name First Name (Smith Jane)',
+    'name_display_format'	=> 'Name Display Format',
+    'first'					=> 'First',
+    'first_name'			=> 'First Name',
+    'license'				=> 'License',
+    'license_report'        => 'License Report',
+    'licenses_available'	=> 'Licenses available',
+    'licenses'				=> 'Licenses',
+    'list_all'				=> 'List All',
+    'loading'				=> 'Loading... please wait...',
+    'lock_passwords'        => 'This field value will not be saved in a demo installation.',
+    'feature_disabled'      => 'This feature has been disabled for the demo installation.',
+    'location'              => 'Location',
+    'location_plural'        => 'Location|Locations',
+    'locations'				=> 'Locations',
+    'logo_size'				=> 'Square logos look best with Logo + Text. Logo maximum display size is 50px high x 500px wide.  ',
+    'logout'				=> 'Logout',
+    'lookup_by_tag'     => 'Lookup by Asset Tag',
+    'maintenances'          => 'Maintenances',
+    'manage_api_keys'       => 'Manage API keys',
+    'manufacturer'			=> 'Manufacturer',
+    'manufacturers'			=> 'Manufacturers',
+    'markdown'				=> 'This field allows <a href="https://help.github.com/articles/github-flavored-markdown/">Github flavored markdown</a>.',
+    'min_amt'				=> 'Min. QTY',
+    'min_amt_help'          => 'Minimum number of items that should be available before an alert gets triggered. Leave Min. QTY blank if you do not want to receive alerts for low inventory.',
+    'model_no'				=> 'Model No.',
+    'months'				=> 'months',
+    'moreinfo'				=> 'More Info',
+    'name'					=> 'Name',
+    'new_password'          => 'New Password',
+    'next'					=> 'Next',
+    'next_audit_date'		=> 'Next Audit Date',
+    'next_audit_date_help'  => 'If you use auditing in your organization, this is usually automatically calculated based on the asset&apos;s last audit date and audit frequency (in <code>Admin Settings &gt; Alerts</code>) and you can leave this blank. You can manually set this date here if you need to, but it must be later than the last audit date. ',
+    'audit_images_help'     => 'You can find audit images in the asset\'s history tab.',
+    'no_email'              => 'No email address associated with this user',
+    'last_audit'		    => 'Last Audit',
+    'new'					=> 'new!',
+    'no_depreciation'		=> 'No Depreciation',
+    'no_results'			=> 'No Results.',
+    'no'  					=> 'No',
+    'notes'  				=> 'Notes',
+    'note_added'            => 'Note Added',
+    'options'				=> 'Options',
+    'preview'				=> 'Preview',
+    'add_note'              => 'Add Note',
+    'note_edited'            => 'Note Edited',
+    'edit_note'              => 'Edit Note',
+    'note_deleted'            => 'Note Deleted',
+    'delete_note'              => 'Delete Note',
+    'order_number'          => 'Order Number',
+    'only_deleted'          => 'Only Deleted Assets',
+    'page_menu'				=> 'Showing _MENU_ items',
+    'pagination_info'		=> 'Showing _START_ to _END_ of _TOTAL_ items',
+    'pending'				=> 'Pending',
+    'people'				=> 'People',
+    'per_page'				=> 'Results Per Page',
+    'previous'				=> 'Previous',
+    'processing'			=> 'Processing',
+    'profile'				=> 'Your profile',
+    'purchase_cost'                              => 'Purchase Cost',
+    'purchase_date'         => 'Purchase Date',
+    'qty'		            => 'QTY',
+    'quantity'		        => 'Quantity',
+    'quantity_minimum'      => 'You have one item below or almost below minimum quantity levels|You have :count items below or almost below minimum quantity levels',
+    'quickscan_checkin'  	=> 'Quick Scan Checkin',
+    'quickscan_checkin_status'  	=> 'Checkin Status',
+    'ready_to_deploy'		=> 'Ready to Deploy',
+    'recent_activity'		=> 'Recent Activity',
+    'remaining'             => 'Remaining',
+    'remove_company'        => 'Remove Company Association',
+    'reports'				=> 'Reports',
+    'restored'				=> 'restored',
+    'restore'				=> 'Restore',
+    'requestable_models'    => 'Requestable Models',
+    'requestable_items'     => 'Requestable Items',
+    'requested'				=> 'Requested',
+    'requested_date'        => 'Requested Date',
+    'requested_assets'      => 'Requested Assets',
+    'requested_assets_menu' => 'Requested Assets',
+    'request_canceled'      => 'Request Canceled',
+    'request_item'          => 'Request this item',
+    'external_link_tooltip' => 'External link to',
+    'save'  				=> 'Save',
+    'select_var'            => 'Select :thing... ', // this will eventually replace all of our other selects
+    'select'				=> 'Select',
+    'select_all'            => 'Select All',
+    'search'				=> 'Search',
+    'select_category'       => 'Select a Category',
+    'select_datasource' => 'Select a data source',
+    'select_department'     => 'Select a Department',
+    'select_depreciation'	=> 'Select a Depreciation Type',
+    'select_location'		=> 'Select a Location',
+    'select_manufacturer'	=> 'Select a Manufacturer',
+    'select_model'			=> 'Select a Model',
+    'select_supplier'		=> 'Select a Supplier',
+    'select_user'			=> 'Select a User',
+    'select_date'			=> 'Select Date (YYYY-MM-DD)',
+    'select_statuslabel'	=> 'Select Status',
+    'select_company'    	=> 'Select Company',
+    'select_asset'    		=> 'Select Asset',
+    'settings'				=> 'Settings',
+    'show_deleted'  		=> 'Show Deleted',
+    'show_current'  		=> 'Show Current',
+    'sign_in'				=> 'Sign in',
+    'signature'             => 'Signature',
+    'signed_off_by'         => 'Signed Off By',
+    'skin'       			=> 'Skin',
+    'webhook_msg_note'        => 'A notification will be sent via webhook',
+    'webhook_test_msg'        => 'Oh hai! It looks like your :app integration with Snipe-IT is working!',
+    'some_features_disabled' => 'DEMO MODE: Some features are disabled for this installation.',
+    'site_name'				=> 'Site Name',
+    'state'  				=> 'State',
+    'status_labels'			=> 'Status Labels',
+    'status_label'			=> 'Status Label',
+    'status'    			=> 'Status',
+    'accept_eula'           => 'Acceptance Agreement',
+    'show_or_hide_eulas' => 'Show/Hide EULAs',
+    'supplier'              => 'Supplier',
+    'suppliers'  			=> 'Suppliers',
+    'sure_to_delete'        => 'Are you sure you wish to delete',
+    'sure_to_delete_var'    => 'Are you sure you wish to delete :item?',
+    'delete_what'           => 'Delete :item',
+    'submit'				=> 'Submit',
+    'target'                => 'Target',
+    'time_and_date_display' => 'Time and Date Display',
+    'total_assets'			=> 'total assets',
+    'total_licenses'		=> 'total licenses',
+    'total_accessories'		=> 'total accessories',
+    'total_consumables'		=> 'total consumables',
+    'type'  				=> 'Type',
+    'undeployable'			=> 'Un-deployable',
+    'unknown_admin'			=> 'Unknown Admin',
+    'username'              => 'Username',
+    'update'                => 'Update',
+    'updating_item' => 'Updating :item',
+    'upload_filetypes_help'      => 'Allowed filetypes are png, gif, jpg, jpeg, doc, docx, pdf, xls, xlsx, txt, lic, xml, zip, rtf and rar. Max upload size allowed is :size.',
+    'uploaded'              => 'Uploaded',
+    'user'					=> 'User',
+    'accepted'			    => 'accepted',
+    'declined'			    => 'declined',
+    'declined_note'         => 'Declined Notes',
+    'unassigned'            => 'Unassigned',
+    'unaccepted_asset_report' => 'Unaccepted Assets',
+    'users'                 => 'Users',
+    'viewall'				=> 'View All',
+    'viewassets'  			=> 'View Assigned Assets',
+    'viewassetsfor'         => 'View Assets for :name',
+    'website'               => 'Website',
+    'welcome'				=> 'Welcome, :name',
+    'years'					=> 'years',
+    'yes' 					=> 'Yes',
+    'zip'  					=> 'Zip',
+    'noimage'				=> 'No image uploaded or image not found.',
+    'file_does_not_exist'   => 'The requested file does not exist on the server.',
+    'file_upload_success'   => 'File upload success!',
+    'no_files_uploaded'     => 'File upload success!',
+    'token_expired'         => 'Your form session has expired. Please try again.',
+    'login_enabled'         => 'Login Enabled',
+    'audit_due'             => 'Due for Audit',
+    'audit_due_days'        => '{}Assets Due or Overdue for Audit|[1]Assets Due or Overdue for Audit Within a Day|[2,*]Assets Due or Overdue for Audit Within :days Days',
+    'checkin_due'           => 'Due for Checkin',
+    'checkin_overdue'       => 'Overdue for Checkin',
+    'checkin_due_days'      => '{}Due for Checkin|[1]Assets Due for Checkin Within :days Day|[2,*]Assets Due for Checkin Within :days Days',
+    'audit_overdue'         => 'Overdue for Audit',
+    'accept'                => 'Accept :asset',
+    'i_accept'              => 'I accept',
+    'i_decline'             => 'I decline',
+    'accept_decline'        => 'Accept/Decline',
+    'sign_tos'              => 'Sign below to indicate that you agree to the terms of service:',
+    'clear_signature'       => 'Clear Signature',
+    'show_help'             => 'Show help',
+    'hide_help'             => 'Hide help',
+    'view_all'              => 'view all',
+    'hide_deleted'          => 'Hide Deleted',
+    'email'                 => 'Email',
+    'do_not_change'         => 'Do not change',
+    'bug_report'            => 'Report a bug',
+    'user_manual'           => 'User\'s Manual',
+    'setup_step_1'          => 'Step 1',
+    'setup_step_2'          => 'Step 2',
+    'setup_step_3'          => 'Step 3',
+    'setup_step_4'          => 'Step 4',
+    'setup_config_check'    => 'Configuration Check',
+    'setup_create_database' => 'Create database tables',
+    'setup_create_admin'    => 'Create an admin user',
+    'setup_done'            => 'Finished!',
+    'bulk_edit_about_to'    => 'You are about to edit the following: ',
+    'checked_out'           => 'Checked Out',
+    'checked_out_to'        => 'Checked out to',
+    'fields'                => 'Fields',
+    'last_checkout'         => 'Last Checkout',
+    'due_to_checkin'        => 'The following :count items are due to be checked in soon:',
+    'expected_checkin'      => 'Expected Checkin',
+    'reminder_checked_out_items' => 'This is a reminder of the items currently checked out to you. If you feel this list is inaccurate (something is missing, or something appears here that you believe you never received), please email :reply_to_name at :reply_to_address.',
+    'changed'               => 'Changed',
+    'to'                    => 'To',
+    'report_fields_info'    => '<p>Select the fields you would like to include in your custom report, and click Generate. The file (custom-asset-report-YYYY-mm-dd.csv) will download automatically, and you can open it in Excel.</p>
+            <p>If you would like to export only certain assets, use the options below to fine-tune your results.</p>',
+    'range'                 => 'Range',
+    'bom_remark'            => 'Add a BOM (byte-order mark) to this CSV',
+    'improvements'          => 'Improvements',
+    'information'           => 'Information',
+    'permissions'           => 'Permissions',
+    'managed_ldap'          => '(Managed via LDAP)',
+    'export'                => 'Export',
+    'ldap_sync'             => 'LDAP Sync',
+    'ldap_user_sync'        => 'LDAP User Sync',
+    'synchronize'           => 'Synchronize',
+    'sync_results'          => 'Synchronization Results',
+    'license_serial'        => 'Serial/Product Key',
+    'invalid_category'      => 'Invalid or missing category',
+    'invalid_item_category_single' => 'Invalid or missing :type category. Please update the category of this :type to include a valid category before checking out.',
+    'dashboard_info'        => 'This is your dashboard. There are many like it, but this one is yours.',
+    '60_percent_warning'    => '60% Complete (warning)',
+    'dashboard_empty'       => 'It looks like you have not added anything yet, so we do not have anything awesome to display. Get started by adding some assets, accessories, consumables, or licenses now!',
+    'new_asset'             => 'New Asset',
+    'new_license'           => 'New License',
+    'new_accessory'         => 'New Accessory',
+    'new_consumable'        => 'New Consumable',
+    'new_component'         => 'New Component',
+    'new_user'              => 'New User',
+    'collapse'              => 'Collapse',
+    'assigned'              => 'Assigned',
+    'asset_count'           => 'Asset Count',
+    'accessories_count'     => 'Accessories Count',
+    'consumables_count'     => 'Consumables Count',
+    'components_count'      => 'Components Count',
+    'licenses_count'        => 'Licenses Count',
+    'notification_error'    => 'Error',
+    'notification_error_hint' => 'Please check the form below for errors',
+    'notification_bulk_error_hint' => 'The following fields had validation errors and were not edited:',
+    'notification_success'  => 'Success',
+    'notification_warning'   => 'Warning',
+    'notification_info'      => 'Info',
+    'asset_information'     => 'Asset Information',
+    'model_name'            => 'Model Name',
+    'asset_name'            => 'Asset Name',
+    'consumable_information' => 'Consumable Information:',
+    'consumable_name'       => 'Consumable Name:',
+    'accessory_information' => 'Accessory Information:',
+    'accessory_name'       => 'Accessory Name:',
+    'clone_item'            => 'Clone Item',
+    'checkout_tooltip' => 'Check this item out',
+    'checkin_tooltip' => 'Check this item in so that it is available for re-issue, re-imaging, etc',
+    'checkout_user_tooltip' => 'Check this item out to a user',
+    'checkin_to_diff_location' => 'You can choose to check this asset in to a location other than this asset\'s default location of :default_location if one is set',
+    'maintenance_mode'      => 'The service is temporarily unavailable for system updates. Please check back later.',
+    'maintenance_mode_title' => 'System Temporarily Unavailable',
+    'ldap_import'           => 'User password should not be managed by LDAP. (This allows you to send forgotten password requests.)',
+    'purge_not_allowed'     => 'Purging deleted data has been disabled in the .env file. Contact support or your systems administrator.',
+    'backup_delete_not_allowed'     => 'Deleting backups has been disabled in the .env file. Contact support or your systems administrator.',
+    'additional_files'           => 'Additional Files',
+    'shitty_browser'        => 'No signature detected. If you are using an older browser, please use a more modern browser to complete your asset acceptance.',
+    'bulk_soft_delete'      =>'Also soft-delete these users. Their asset history will remain intact unless/until you purge deleted records in the Admin Settings.',
+    'bulk_checkin_delete_success' => 'Your selected users have been deleted and their items have been checked in.',
+    'bulk_checkin_success' => 'The items for the selected users have been checked in.',
+    'set_to_null'           => 'Delete values for this selection|Delete values for all :selection_count selections ',
+    'set_users_field_to_null'  => 'Delete :field values for this user|Delete :field values for all :user_count users ',
+    'na_no_purchase_date'   => 'N/A - No purchase date provided',
+    'assets_by_status'      => 'Assets by Status',
+    'assets_by_status_type'      => 'Assets by Status Type',
+    'pie_chart_type'        => 'Dashboard Pie Chart Type',
+    'hello_name'            => 'Hello, :name!',
+    'unaccepted_profile_warning'   => 'You have one item requiring acceptance. Click here to accept or decline it | You have :count items requiring acceptance. Click here to accept or decline them',
+    'start_date'            => 'Start Date',
+    'end_date'            => 'End Date',
+    'alt_uploaded_image_thumbnail' => 'Uploaded thumbnail',
+    'placeholder_kit'       => 'Select a kit',
+    'file_not_found'        => 'File not found',
+    'log_record_not_found'  => 'No record for that log entry was found.',
+    'preview_not_available' => '(no preview)',
+    'setup'                 => 'Setup',
+    'pre_flight'            => 'Pre-Flight',
+    'skip_to_main_content'  => 'Skip to main content',
+    'toggle_navigation'     => 'Toggle navigation',
+    'alerts'                => 'Alerts',
+    'tasks_view_all'        => 'View all tasks',
+    'true'                  => 'True',
+    'false'                 => 'False',
+    'integration_option'    => 'Integration Option',
+    'log_does_not_exist'    => 'No matching log record exists.',
+    'merge_users'           => 'Merge Users',
+    'merge_information' =>  'This will merge the :count users into a single user. Select the user you wish to merge the others into below, and the associated assets, licenses, etc will be moved over to the selected user and the other users will be marked as deleted.',
+    'warning_merge_information' => 'This action CANNOT be undone and should ONLY be used when you need to merge users because of a bad import or sync. Be sure to run a backup first.',
+    'no_users_selected'     => 'No users selected',
+    'not_enough_users_selected'     => 'At least :count users must be selected',
+    'merge_success'         => ':count users merged successfully into :into_username!',
+    'merged'                => 'merged',
+    'merged_log_this_user_into' => 'Merged this user (ID :to_id - :to_username) into user ID :from_id (:from_username) ',
+    'merged_log_this_user_from' => 'Merged user ID :from_id (:from_username) into this user (ID :to_id - :to_username)',
+    'clear_and_save'            => 'Clear & Save',
+    'update_existing_values'    => 'Update Existing Values?',
+    'auto_incrementing_asset_tags_disabled_so_tags_required' => 'Generating auto-incrementing asset tags is disabled so all rows need to have the "Asset Tag" column populated.',
+    'auto_incrementing_asset_tags_enabled_so_now_assets_will_be_created' => 'Note: Generating auto-incrementing asset tags is enabled so assets will be created for rows that do not have "Asset Tag" populated. Rows that do have "Asset Tag" populated will be updated with the provided information.',
+    'send_welcome_email_to_users'   => ' Send Welcome Email for new Users?',
+    'send_email'                => 'Send Email',
+    'call'                      => 'Call number',
+    'back_before_importing'     => 'Backup before importing?',
+    'csv_header_field'          => 'CSV Header Field',
+    'import_field'              => 'Import Field',
+    'sample_value'              => 'Sample Value',
+    'no_headers'                => 'No Columns Found',
+    'error_in_import_file'      => 'There was an error reading the CSV file: :error',
+    'errors_importing'          => 'Some Errors occurred while importing: ',
+    'warning'                   => 'WARNING: :warning',
+    'success_redirecting'       => '"Success... Redirecting.',
+    'cancel_request'            => 'Cancel this item request',
+    'setup_successful_migrations' => 'Your database tables have been created',
+    'setup_migration_output' => 'Migration output:',
+    'setup_migration_create_user' => 'Next: Create User',
+    'importer_generic_error'    => 'Your file import is complete, but we did receive an error. This is usually caused by third-party API throttling from a notification webhook (such as Slack) and would not have interfered with the import itself, but you should confirm this.',
+    'confirm' => 'Confirm',
+    'autoassign_licenses' => 'Auto-Assign Licenses',
+    'autoassign_licenses_help' => 'Allow this user to have licenses assigned via the bulk-assign license UI or cli tools.',
+    'autoassign_licenses_help_long' => 'This allows a user to be have licenses assigned via the bulk-assign license UI or cli tools. (For example, you might not want contractors to be auto-assigned a license you would provide to only staff members. You can still individually assign licenses to those users, but they will not be included in the Checkout License to All Users functions.)',
+    'no_autoassign_licenses_help' => 'Do not include user for bulk-assigning through the license UI or cli tools.',
+    'modal_confirm_generic'      => 'Are you sure?',
+    'cannot_be_deleted'      => 'This item cannot be deleted',
+    'cannot_be_edited'      => 'This item cannot be edited.',
+    'undeployable_tooltip'      => 'This item cannot be checked out. Check the quantity remaining.',
+    'serial_number'        => 'Serial Number',
+    'item_notes' => ':item Notes',
+    'item_name_var' => ':item Name',
+    'error_user_company' => 'Checkout target company and asset company do not match',
+    'error_user_company_accept_view' => 'An Asset assigned to you belongs to a different company so you can\'t accept nor deny it, please check with your manager',
+    'importer' => [
+        'checked_out_to_fullname' => 'Checked Out to: Full Name',
+        'checked_out_to_first_name' => 'Checked Out to: First Name',
+        'checked_out_to_last_name' => 'Checked Out to: Last Name',
+        'checked_out_to_username' => 'Checked Out to: Username',
+        'checked_out_to_email' => 'Checked Out to: Email',
+        'checked_out_to_tag' => 'Checked Out to: Asset Tag',
+        'manager_first_name' => 'Manager First Name',
+        'manager_last_name' => 'Manager Last Name',
+        'manager_full_name' => 'Manager Full Name',
+        'manager_username' => 'Manager Username',
+        'checkout_type' => 'Checkout Type',
+        'checkout_location' => 'Checkout to Location',
+        'image_filename' => 'Image Filename',
+        'do_not_import'     => 'Do Not Import',
+        'vip' => 'VIP',
+        'avatar'  => 'Avatar',
+        'gravatar' => 'Gravatar Email',
+        'currency' => 'Currency',
+        'address2' => 'Address Line 2',
+        'import_note' => 'Imported using csv importer',
+    ],
+    'remove_customfield_association' => 'Remove this field from the fieldset. This will not delete the custom field, only this field\'s association with this fieldset.',
+    'checked_out_to_fields' => 'Checked Out To Fields',
+    'percent_complete' => '% complete',
+    'uploading' => 'Uploading... ',
+    'upload_error' => 'Error uploading file. Please check that you have no empty rows or duplicated column names in your CSV, and that the server permissions allow uploads.',
+    'copy_to_clipboard' => 'Copy to Clipboard',
+    'copied' => 'Copied!',
+    'status_compatibility' => 'If assets are already assigned, they cannot be changed to a non-deployable status type and this value change will be skipped.',
+    'rtd_location_help' => 'This is the location of the asset when it is not checked out',
+    'item_not_found' => ':item_type ID :id does not exist or has been deleted',
+    'action_permission_denied' => 'You do not have permission to :action :item_type ID :id',
+    'action_permission_generic' => 'You do not have permission to :action this :item_type',
+    'edit' => 'edit',
+    'action_source' => 'Action Source',
+    'or' => 'or',
+    'url'                   => 'URL',
+    'edit_fieldset' => 'Edit fieldset fields and options',
+    'permission_denied_superuser_demo' => 'Permission denied. You cannot update user information for superadmins on the demo.',
+    'pwd_reset_not_sent' => 'User is not activated, is LDAP synced, or does not have an email address',
+    'error_sending_email' => 'Error sending email',
+    'sad_panda' => 'Sad panda. You are not authorized to do the thing. Maybe <a href=":link">return to the dashboard</a>, or contact your administrator.',
+    'bulk' => [
+            'delete' =>
+                [
+                'header' => 'Bulk Delete :object_type',
+                'warn'   =>  'You are about to delete one :object_type|You are about to delete :count :object_type',
+                'success'   =>  ':object_type successfully deleted|Successfully deleted :count :object_type',
+                'error'   =>  'Could not delete :object_type',
+                'nothing_selected'   =>  'No :object_type selected - nothing to do',
+                'partial'   =>  'Deleted :success_count :object_type, but :error_count :object_type could not be deleted',
+             ],
+    ],
+    'no_requestable' => 'There are no requestable assets or asset models.',
+
+    'countable' => [
+        'accessories'  => ':count Accessory|:count Accessories',
+        'assets'  => ':count Asset|:count Assets',
+        'licenses'  => ':count License|:count Licenses',
+        'license_seats'  => ':count License Seat|:count License Seats',
+        'consumables'  => ':count Consumable|:count Consumables',
+        'components'  => ':count Component|:count Components',
+    ],
+
+    'more_info' => 'More Info',
+    'quickscan_bulk_help' => 'Checking this box will edit the asset record to reflect this new location. Leaving it unchecked will simply note the location in the audit log. Note that if this asset is checked out, it will not change the location of the person, asset or location it is checked out to.',
+    'whoops' => 'Whoops!',
+    'something_went_wrong' => 'Something went wrong with your request.',
+    'close' => 'Close',
+    'expires' => 'Expires',
+    'map_fields'=> 'Map :item_type Fields',
+    'remaining_var' => ':count Remaining',
+    'label' => 'Label',
+    'import_asset_tag_exists' => 'An asset with the asset tag :asset_tag already exists and an update was not requested. No change was made.',
+    'countries_manually_entered_help' => 'Values with an asterisk (*) were manually entered and do not match existing ISO 3166 dropdown values',
+    'accessories_assigned' => 'Assigned Accessories',
+    'user_managed_passwords' => 'Password Management',
+    'user_managed_passwords_disallow' => 'Disallow users from managing their own passwords',
+    'user_managed_passwords_allow' => 'Allow users to manage their own passwords',
+    'from' => 'From',
+    'by' => 'By',
+
+// Add form placeholders here
+    'placeholders' => [
+        'notes'  => 'Add a note',
+    ],
+
+    'breadcrumb_button_actions' => [
+        'edit_item' => 'Edit :name',
+        'checkout_item' => 'Checkout :name',
+        'checkin_item' => 'Checkin :name',
+    ],
+
+    'skins' => [
+        'site_default' => 'Site Default',
+        'default_blue' => 'Default Blue',
+        'blue_dark' => 'Blue (Dark Mode)',
+        'green' => 'Green Dark',
+        'green_dark' => 'Green (Dark Mode)',
+        'red' => 'Red Dark',
+        'red_dark' => 'Red (Dark Mode)',
+        'orange' => 'Orange Dark',
+        'orange_dark' => 'Orange (Dark Mode)',
+        'black' => 'Black',
+        'black_dark' => 'Black (Dark Mode)',
+        'purple' => 'Purple',
+        'purple_dark' => 'Purple (Dark Mode)',
+        'yellow' => 'Yellow',
+        'yellow_dark' => 'Yellow (Dark Mode)',
+        'high_contrast' => 'High Contrast',
+
+    ],
+
+    'select_all_none' => 'Select/Unselect All',
+    'generic_model_not_found' => 'That :model was not found or you do not have permission to access it',
+    'deleted_models' => 'Deleted Asset Models',
+    'deleted_users' => 'Deleted Users',
+    'cost_each' => ':amount each',
+    'remove_current_image' => 'Remove current :type image',
+
+    'seeding' => [
+        'manufacturers' => [
+            'button' => 'Create Manufacturers',
+            'prompt' => 'You do not have any manufacturers yet. Would you like to seed a list of common manufacturers? (THIS WILL OVERWRITE EXISTING MANUFACTURERS, including those that have been soft-deleted.)',
+            'success' => 'Manufacturers seeded successfully',
+            'error' => 'Could not seed manufacturers. A manufacturer record already exists and seeding would overwrite it.|Could not seed manufacturers. :count manufacturer records already exist and seeding would overwrite them.',
+        ],
+    ],
+
+];
diff --git a/resources/lang/mr-IN/help.php b/resources/lang/mr-IN/help.php
new file mode 100644
index 0000000000..a59e0056be
--- /dev/null
+++ b/resources/lang/mr-IN/help.php
@@ -0,0 +1,35 @@
+<?php
+
+return [
+
+    /*
+    |--------------------------------------------------------------------------
+    | Password Reminder Language Lines
+    |--------------------------------------------------------------------------
+    |
+    | The following language lines are the default lines which match reasons
+    | that are given by the password broker for a password update attempt
+    | has failed, such as for an invalid token or invalid new password.
+    |
+    */
+
+    'more_info_title' => 'More Info',
+
+    'audit_help' => 'Checking this box will edit the asset record to reflect this new location. Leaving it unchecked will simply note the location in the audit log.<br><br>Note that if this asset is checked out, it will not change the location of the person, asset or location it is checked out to.',
+
+    'assets' => 'Assets are items tracked by serial number or asset tag.  They tend to be higher value items where identifying a specific item matters.',
+
+    'categories' => 'Categories help you organize your items. Some example categories might be &quot;Desktops&quot;, &quot;Laptops&quot;, &quot;Mobile Phones&quot;, &quot;Tablets&quot;, and so on, but you can use categories any way that makes sense for you.',
+
+    'accessories' => 'Accessories are anything you issue to users but that do not have a serial number (or you do not care about tracking them uniquely). For example, computer mice or keyboards.',
+
+    'companies'     => 'Companies can be used as a simple identifier field, or can be used to limit visibility of assets, users, etc if full company support is enabled in your Admin settings.',
+
+    'components'    => 'Components are items that are part of an asset, for example HDD, RAM, etc.',
+
+    'consumables'   => 'Consumables are anything purchased that will be used up over time. For example, printer ink or copier paper.',
+
+    'depreciations' => 'You can set up asset depreciations to depreciate assets based on straight-line depreciation.',
+    
+    'empty_file'    => 'The importer detects that this file is empty.'
+];
diff --git a/resources/lang/mr-IN/localizations.php b/resources/lang/mr-IN/localizations.php
new file mode 100644
index 0000000000..827ed4fca1
--- /dev/null
+++ b/resources/lang/mr-IN/localizations.php
@@ -0,0 +1,326 @@
+<?php
+
+return [
+
+    'select_language' => 'Select a Language',
+    'languages' => [
+        'en-US'=> 'English, US',
+        'en-GB'=> 'English, UK',
+        'am-ET' => 'Amharic',
+        'af-ZA'=> 'Afrikaans',
+        'ar-SA'=> 'Arabic',
+        'bg-BG'=> 'Bulgarian',
+        'zh-CN'=> 'Chinese Simplified',
+        'zh-TW'=> 'Chinese Traditional',
+        'ca-ES' => 'Catalan',
+        'hr-HR'=> 'Croatian',
+        'cs-CZ'=> 'Czech',
+        'da-DK'=> 'Danish',
+        'nl-NL'=> 'Dutch',
+        'en-ID'=> 'English, Indonesia',
+        'et-EE'=> 'Estonian',
+        'fil-PH'=> 'Filipino',
+        'fi-FI'=> 'Finnish',
+        'fr-FR'=> 'French',
+        'de-DE'=> 'German',
+        'de-if'=> 'German (Informal)',
+        'el-GR'=> 'Greek',
+        'he-IL'=> 'Hebrew',
+        'hu-HU'=> 'Hungarian',
+        'is-IS' => 'Icelandic',
+        'id-ID'=> 'Indonesian',
+        'ga-IE'=> 'Irish',
+        'it-IT'=> 'Italian',
+        'ja-JP'=> 'Japanese',
+        'km-KH'=>'Khmer',
+        'ko-KR'=> 'Korean',
+        'lt-LT'=>'Lithuanian',
+        'lv-LV'=> 'Latvian',
+        'mk-MK'=> 'Macedonian',
+        'ms-MY'=> 'Malay',
+        'mi-NZ'=> 'Maori',
+        'mn-MN'=> 'Mongolian',
+        'nb-NO'=> 'Norwegian Bokmål',
+        'om-ET' => 'Oromo (Ethiopian)',
+        //'nn-NO'=> 'Norwegian Nynorsk',
+        'fa-IR'=> 'Persian',
+        'pl-PL'=> 'Polish',
+        'pt-PT'=> 'Portuguese',
+        'pt-BR'=> 'Portuguese, Brazilian',
+        'ro-RO'=> 'Romanian',
+        'ru-RU'=> 'Russian',
+        'sr-CS' => 'Serbian (Latin)',
+        'sk-SK'=> 'Slovak',
+        'sl-SI'=> 'Slovenian',
+        'so-SO'=> 'Somali',
+        'es-ES'=> 'Spanish',
+        'es-CO'=> 'Spanish, Colombia',
+        'es-MX'=> 'Spanish, Mexico',
+        'es-VE'=> 'Spanish, Venezuela',
+        'sv-SE'=> 'Swedish',
+        'tl-PH'=> 'Tagalog',
+        'ta-IN'=> 'Tamil',
+        'th-TH'=> 'Thai',
+        'tr-TR'=> 'Turkish',
+        'uk-UA'=> 'Ukranian',
+        'vi-VN'=> 'Vietnamese',
+        'cy-GB'=> 'Welsh',
+        'zu-ZA'=> 'Zulu',
+    ],
+
+    'select_country' => 'Select a Country',
+    
+    'countries' => [
+        'AC'=>'Ascension Island',
+        'AD'=>'Andorra',
+        'AE'=>'United Arab Emirates',
+        'AF'=>'Afghanistan',
+        'AG'=>'Antigua And Barbuda',
+        'AI'=>'Anguilla',
+        'AL'=>'Albania',
+        'AM'=>'Armenia',
+        'AN'=>'Netherlands Antilles',
+        'AO'=>'Angola',
+        'AQ'=>'Antarctica',
+        'AR'=>'Argentina',
+        'AS'=>'American Samoa',
+        'AT'=>'Austria',
+        'AU'=>'Australia',
+        'AW'=>'Aruba',
+        'AX'=>'Ã…land',
+        'AZ'=>'Azerbaijan',
+        'BA'=>'Bosnia And Herzegovina',
+        'BB'=>'Barbados',
+        'BE'=>'Belgium',
+        'BD'=>'Bangladesh',
+        'BF'=>'Burkina Faso',
+        'BG'=>'Bulgaria',
+        'BH'=>'Bahrain',
+        'BI'=>'Burundi',
+        'BJ'=>'Benin',
+        'BM'=>'Bermuda',
+        'BN'=>'Brunei Darussalam',
+        'BO'=>'Bolivia',
+        'BR'=>'Brazil',
+        'BS'=>'Bahamas',
+        'BT'=>'Bhutan',
+        'BV'=>'Bouvet Island',
+        'BW'=>'Botswana',
+        'BY'=>'Belarus',
+        'BZ'=>'Belize',
+        'CA'=>'Canada',
+        'CC'=>'Cocos (Keeling) Islands',
+        'CD'=>'Congo (Democratic Republic)',
+        'CF'=>'Central African Republic',
+        'CG'=>'Congo (Republic)',
+        'CH'=>'Switzerland',
+        'CI'=>'Côte d\'Ivoire',
+        'CK'=>'Cook Islands',
+        'CL'=>'Chile',
+        'CM'=>'Cameroon',
+        'CN'=>'People\'s Republic of China',
+        'CO'=>'Colombia',
+        'CR'=>'Costa Rica',
+        'CU'=>'Cuba',
+        'CV'=>'Cape Verde',
+        'CX'=>'Christmas Island',
+        'CY'=>'Cyprus',
+        'CZ'=>'Czech Republic',
+        'DE'=>'Germany',
+        'DJ'=>'Djibouti',
+        'DK'=>'Denmark',
+        'DM'=>'Dominica',
+        'DO'=>'Dominican Republic',
+        'DZ'=>'Algeria',
+        'EC'=>'Ecuador',
+        'EE'=>'Estonia',
+        'EG'=>'Egypt',
+        'GB-ENG'=>'England',
+        'ER'=>'Eritrea',
+        'ES'=>'Spain',
+        'ET'=>'Ethiopia',
+        'EU'=>'European Union',
+        'FI'=>'Finland',
+        'FJ'=>'Fiji',
+        'FK'=>'Falkland Islands (Malvinas)',
+        'FM'=>'Micronesia, Federated States Of',
+        'FO'=>'Faroe Islands',
+        'FR'=>'France',
+        'GA'=>'Gabon',
+        'GD'=>'Grenada',
+        'GE'=>'Georgia',
+        'GF'=>'French Guiana',
+        'GG'=>'Guernsey',
+        'GH'=>'Ghana',
+        'GI'=>'Gibraltar',
+        'GL'=>'Greenland',
+        'GM'=>'Gambia',
+        'GN'=>'Guinea',
+        'GP'=>'Guadeloupe',
+        'GQ'=>'Equatorial Guinea',
+        'GR'=>'Greece',
+        'GS'=>'South Georgia And The South Sandwich Islands',
+        'GT'=>'Guatemala',
+        'GU'=>'Guam',
+        'GW'=>'Guinea-Bissau',
+        'GY'=>'Guyana',
+        'HK'=>'Hong Kong',
+        'HM'=>'Heard And Mc Donald Islands',
+        'HN'=>'Honduras',
+        'HR'=>'Croatia (local name: Hrvatska)',
+        'HT'=>'Haiti',
+        'HU'=>'Hungary',
+        'ID'=>'Indonesia',
+        'IE'=>'Ireland',
+        'IL'=>'Israel',
+        'IM'=>'Isle of Man',
+        'IN'=>'India',
+        'IO'=>'British Indian Ocean Territory',
+        'IQ'=>'Iraq',
+        'IR'=>'Iran, Islamic Republic Of',
+        'IS'=>'Iceland',
+        'IT'=>'Italy',
+        'JE'=>'Jersey',
+        'JM'=>'Jamaica',
+        'JO'=>'Jordan',
+        'JP'=>'Japan',
+        'KE'=>'Kenya',
+        'KG'=>'Kyrgyzstan',
+        'KH'=>'Cambodia',
+        'KI'=>'Kiribati',
+        'KM'=>'Comoros',
+        'KN'=>'Saint Kitts And Nevis',
+        'KR'=>'Korea, Republic Of',
+        'KW'=>'Kuwait',
+        'KY'=>'Cayman Islands',
+        'KZ'=>'Kazakhstan',
+        'LA'=>'Lao People\'s Democratic Republic',
+        'LB'=>'Lebanon',
+        'LC'=>'Saint Lucia',
+        'LI'=>'Liechtenstein',
+        'LK'=>'Sri Lanka',
+        'LR'=>'Liberia',
+        'LS'=>'Lesotho',
+        'LT'=>'Lithuania',
+        'LU'=>'Luxembourg',
+        'LV'=>'Latvia',
+        'LY'=>'Libyan Arab Jamahiriya',
+        'MA'=>'Morocco',
+        'MC'=>'Monaco',
+        'MD'=>'Moldova, Republic Of',
+        'ME'=>'Montenegro',
+        'MG'=>'Madagascar',
+        'MH'=>'Marshall Islands',
+        'MK'=>'Macedonia, The Former Yugoslav Republic Of',
+        'ML'=>'Mali',
+        'MM'=>'Myanmar',
+        'MN'=>'Mongolia',
+        'MO'=>'Macau',
+        'MP'=>'Northern Mariana Islands',
+        'MQ'=>'Martinique',
+        'MR'=>'Mauritania',
+        'MS'=>'Montserrat',
+        'MT'=>'Malta',
+        'MU'=>'Mauritius',
+        'MV'=>'Maldives',
+        'MW'=>'Malawi',
+        'MX'=>'Mexico',
+        'MY'=>'Malaysia',
+        'MZ'=>'Mozambique',
+        'NA'=>'Namibia',
+        'NC'=>'New Caledonia',
+        'NE'=>'Niger',
+        'NF'=>'Norfolk Island',
+        'NG'=>'Nigeria',
+        'NI'=>'Nicaragua',
+        'NL'=>'Netherlands',
+        'GB-NIR' => 'Northern Ireland',
+        'NO'=>'Norway',
+        'NP'=>'Nepal',
+        'NR'=>'Nauru',
+        'NU'=>'Niue',
+        'NZ'=>'New Zealand',
+        'OM'=>'Oman',
+        'PA'=>'Panama',
+        'PE'=>'Peru',
+        'PF'=>'French Polynesia',
+        'PG'=>'Papua New Guinea',
+        'PH'=>'Philippines, Republic of the',
+        'PK'=>'Pakistan',
+        'PL'=>'Poland',
+        'PM'=>'St. Pierre And Miquelon',
+        'PN'=>'Pitcairn',
+        'PR'=>'Puerto Rico',
+        'PS'=>'Palestine',
+        'PT'=>'Portugal',
+        'PW'=>'Palau',
+        'PY'=>'Paraguay',
+        'QA'=>'Qatar',
+        'RE'=>'Reunion',
+        'RO'=>'Romania',
+        'RS'=>'Serbia',
+        'RU'=>'Russian Federation',
+        'RW'=>'Rwanda',
+        'SA'=>'Saudi Arabia',
+        'GB-SCT'=>'Scotland',
+        'SB'=>'Solomon Islands',
+        'SC'=>'Seychelles',
+        'SS'=>'South Sudan',
+        'SD'=>'Sudan',
+        'SE'=>'Sweden',
+        'SG'=>'Singapore',
+        'SH'=>'St. Helena',
+        'SI'=>'Slovenia',
+        'SJ'=>'Svalbard And Jan Mayen Islands',
+        'SK'=>'Slovakia (Slovak Republic)',
+        'SL'=>'Sierra Leone',
+        'SM'=>'San Marino',
+        'SN'=>'Senegal',
+        'SO'=>'Somalia',
+        'SR'=>'Suriname',
+        'ST'=>'Sao Tome And Principe',
+        'SU'=>'Soviet Union',
+        'SV'=>'El Salvador',
+        'SY'=>'Syrian Arab Republic',
+        'SZ'=>'Swaziland',
+        'TC'=>'Turks And Caicos Islands',
+        'TD'=>'Chad',
+        'TF'=>'French Southern Territories',
+        'TG'=>'Togo',
+        'TH'=>'Thailand',
+        'TJ'=>'Tajikistan',
+        'TK'=>'Tokelau',
+        'TI'=>'East Timor',
+        'TM'=>'Turkmenistan',
+        'TN'=>'Tunisia',
+        'TO'=>'Tonga',
+        'TP'=>'East Timor (old code)',
+        'TR'=>'Turkey',
+        'TT'=>'Trinidad And Tobago',
+        'TV'=>'Tuvalu',
+        'TW'=>'Taiwan',
+        'TZ'=>'Tanzania, United Republic Of',
+        'UA'=>'Ukraine',
+        'UG'=>'Uganda',
+        'UK'=>'United Kingdom',
+        'US'=>'United States',
+        'UM'=>'United States Minor Outlying Islands',
+        'UY'=>'Uruguay',
+        'UZ'=>'Uzbekistan',
+        'VA'=>'Vatican City State (Holy See)',
+        'VC'=>'Saint Vincent And The Grenadines',
+        'VE'=>'Venezuela',
+        'VG'=>'Virgin Islands (British)',
+        'VI'=>'Virgin Islands (U.S.)',
+        'VN'=>'Viet Nam',
+        'VU'=>'Vanuatu',
+        'GB-WLS' =>'Wales',
+        'WF'=>'Wallis And Futuna Islands',
+        'WS'=>'Samoa',
+        'YE'=>'Yemen',
+        'YT'=>'Mayotte',
+        'ZA'=>'South Africa',
+        'ZM'=>'Zambia',
+        'ZW'=>'Zimbabwe',
+    ],
+];
\ No newline at end of file
diff --git a/resources/lang/mr-IN/mail.php b/resources/lang/mr-IN/mail.php
new file mode 100644
index 0000000000..797f735a2b
--- /dev/null
+++ b/resources/lang/mr-IN/mail.php
@@ -0,0 +1,99 @@
+<?php
+
+return [
+
+    'Accessory_Checkin_Notification' => 'Accessory checked in',
+    'Accessory_Checkout_Notification' => 'Accessory checked out',
+    'Asset_Checkin_Notification' => 'Asset checked in',
+    'Asset_Checkout_Notification' => 'Asset checked out',
+    'Confirm_Accessory_Checkin' => 'Accessory checkin confirmation',
+    'Confirm_Asset_Checkin' => 'Asset checkin confirmation',
+    'Confirm_accessory_delivery' => 'Accessory delivery confirmation',
+    'Confirm_asset_delivery' => 'Asset delivery confirmation',
+    'Confirm_consumable_delivery' => 'Consumable delivery confirmation',
+    'Confirm_license_delivery' => 'License delivery confirmation',
+    'Consumable_checkout_notification' => 'Consumable checked out',
+    'Days' => 'Days',
+    'Expected_Checkin_Date' => 'An asset checked out to you is due to be checked back in on :date',
+    'Expected_Checkin_Notification' => 'Reminder: :name checkin deadline approaching',
+    'Expected_Checkin_Report' => 'Expected asset checkin report',
+    'Expiring_Assets_Report' => 'Expiring Assets Report.',
+    'Expiring_Licenses_Report' => 'Expiring Licenses Report.',
+    'Item_Request_Canceled' => 'Item Request Canceled',
+    'Item_Requested' => 'Item Requested',
+    'License_Checkin_Notification' => 'License checked in',
+    'License_Checkout_Notification' => 'License checked out',
+    'license_for'   => 'License for',
+    'Low_Inventory_Report' => 'Low Inventory Report',
+    'a_user_canceled' => 'A user has canceled an item request on the website',
+    'a_user_requested' => 'A user has requested an item on the website',
+    'acceptance_asset_accepted' => 'A user has accepted an item',
+    'acceptance_asset_declined' => 'A user has declined an item',
+    'accessory_name' => 'Accessory Name',
+    'additional_notes' => 'Additional Notes',
+    'admin_has_created' => 'An administrator has created an account for you on the :web website.',
+    'asset' => 'Asset',
+    'asset_name' => 'Asset Name',
+    'asset_requested' => 'Asset requested',
+    'asset_tag' => 'Asset Tag',
+    'assets_warrantee_alert' => 'There is :count asset with a warranty expiring in the next :threshold days.|There are :count assets with warranties expiring in the next :threshold days.',
+    'assigned_to' => 'Assigned To',
+    'best_regards' => 'Best regards,',
+    'canceled' => 'Canceled',
+    'checkin_date' => 'Checkin Date',
+    'checkout_date' => 'Checkout Date',
+    'checkedout_from' => 'Checked out from',
+    'checkedin_from'  => 'Checked in from',
+    'checked_into' => 'Checked into',
+    'click_on_the_link_accessory' => 'Please click on the link at the bottom to confirm that you have received the accessory.',
+    'click_on_the_link_asset' => 'Please click on the link at the bottom to confirm that you have received the asset.',
+    'click_to_confirm' => 'Please click on the following link to confirm your :web account:',
+    'current_QTY' => 'Current QTY',
+    'days' => 'Days',
+    'expecting_checkin_date' => 'Expected Checkin Date',
+    'expires' => 'Expires',
+    'hello' => 'Hello',
+    'hi' => 'Hi',
+    'i_have_read' => 'I have read and agree to the terms of use, and have received this item.',
+    'inventory_report' => 'Inventory Report',
+    'item' => 'Item',
+    'item_checked_reminder' => 'This is a reminder that you currently have :count items checked out to you that you have not accepted or declined. Please click the link below to confirm your decision.',
+    'license_expiring_alert' => 'There is :count license expiring in the next :threshold days.|There are :count licenses expiring in the next :threshold days.',
+    'link_to_update_password' => 'Please click on the following link to update your :web password:',
+    'login' => 'Login',
+    'login_first_admin' => 'Login to your new Snipe-IT installation using the credentials below:',
+    'low_inventory_alert' => 'There is :count item that is below minimum inventory or will soon be low.|There are :count items that are below minimum inventory or will soon be low.',
+    'min_QTY' => 'Min QTY',
+    'name' => 'Name',
+    'new_item_checked' => 'A new item has been checked out under your name, details are below.',
+    'new_item_checked_with_acceptance' => 'A new item has been checked out under your name that requires acceptance, details are below.',
+    'recent_item_checked' => 'An item was recently checked out under your name that requires acceptance, details are below.',
+    'notes' => 'Notes',
+    'password' => 'Password',
+    'password_reset' => 'Password Reset',
+    'read_the_terms' => 'Please read the terms of use below.',
+    'read_the_terms_and_click' => 'Please read the terms of use below, and click on the link at the bottom to confirm that you read and agree to the terms of use, and have received the asset.',
+    'requested' => 'Requested',
+    'reset_link' => 'Your Password Reset Link',
+    'reset_password' => 'Click here to reset your password:',
+    'rights_reserved' => 'All rights reserved.',
+    'serial' => 'Serial',
+    'snipe_webhook_test' => 'Snipe-IT Integration Test',
+    'snipe_webhook_summary' => 'Snipe-IT Integration Test Summary',
+    'supplier' => 'Supplier',
+    'tag' => 'Tag',
+    'test_email' => 'Test Email from Snipe-IT',
+    'test_mail_text' => 'This is a test from the Snipe-IT Asset Management System. If you got this, mail is working :)',
+    'the_following_item' => 'The following item has been checked in: ',
+    'to_reset' => 'To reset your :web password, complete this form:',
+    'type' => 'Type',
+    'upcoming-audits' => 'There is :count asset that is coming up for audit within :threshold days.|There are :count assets that are coming up for audit within :threshold days.',
+    'user' => 'User',
+    'username' => 'Username',
+    'unaccepted_asset_reminder' => 'Reminder: You have Unaccepted Assets.',
+    'welcome' => 'Welcome :name',
+    'welcome_to' => 'Welcome to :web!',
+    'your_assets' => 'View Your Assets',
+    'your_credentials' => 'Your Snipe-IT credentials',
+    'mail_sent' => 'Mail sent successfully!',
+];
diff --git a/resources/lang/mr-IN/pagination.php b/resources/lang/mr-IN/pagination.php
new file mode 100644
index 0000000000..b573b51e91
--- /dev/null
+++ b/resources/lang/mr-IN/pagination.php
@@ -0,0 +1,20 @@
+<?php
+
+return array(
+
+    /*
+    |--------------------------------------------------------------------------
+    | Pagination Language Lines
+    |--------------------------------------------------------------------------
+    |
+    | The following language lines are used by the paginator library to build
+    | the simple pagination links. You are free to change them to anything
+    | you want to customize your views to better match your application.
+    |
+    */
+
+    'previous' => '&laquo; Previous',
+
+    'next'     => 'Next &raquo;',
+
+);
diff --git a/resources/lang/mr-IN/passwords.php b/resources/lang/mr-IN/passwords.php
new file mode 100644
index 0000000000..41a87f98ed
--- /dev/null
+++ b/resources/lang/mr-IN/passwords.php
@@ -0,0 +1,9 @@
+<?php
+
+return [
+    'sent'	        => 'If a matching user with a valid email address exists in our system, a password recovery email has been sent.',
+    'user'			=> 'If a matching user with a valid email address exists in our system, a password recovery email has been sent.',
+    'token'         => 'This password reset token is invalid or expired, or does not match the username provided.',
+    'reset'         => 'Your password has been reset!',
+    'password_change'  => 'Your password has been updated!',
+];
diff --git a/resources/lang/mr-IN/reminders.php b/resources/lang/mr-IN/reminders.php
new file mode 100644
index 0000000000..8a197467df
--- /dev/null
+++ b/resources/lang/mr-IN/reminders.php
@@ -0,0 +1,21 @@
+<?php
+
+return array(
+
+    /*
+    |--------------------------------------------------------------------------
+    | Password Reminder Language Lines
+    |--------------------------------------------------------------------------
+    |
+    | The following language lines are the default lines which match reasons
+    | that are given by the password broker for a password update attempt
+    | has failed, such as for an invalid token or invalid new password.
+    |
+    */
+
+    "password" => "Passwords must be six characters and match the confirmation.",
+    "user"     => "Username or email address is incorrect",
+    "token"    => 'This password reset token is invalid or expired, or does not match the username provided.',
+    'sent'	   => 'If a matching user with a valid email address exists in our system, a password recovery email has been sent.',
+
+);
diff --git a/resources/lang/mr-IN/table.php b/resources/lang/mr-IN/table.php
new file mode 100644
index 0000000000..16e32b148f
--- /dev/null
+++ b/resources/lang/mr-IN/table.php
@@ -0,0 +1,11 @@
+<?php
+
+return array(
+
+    'actions'	 	        => 'Actions',
+    'action' 		        => 'Action',
+    'by'      		        => 'By',
+    'item' 			        => 'Item',
+    'no_matching_records'   => 'No matching records found',
+
+);
diff --git a/resources/lang/mr-IN/validation.php b/resources/lang/mr-IN/validation.php
new file mode 100644
index 0000000000..99c847f589
--- /dev/null
+++ b/resources/lang/mr-IN/validation.php
@@ -0,0 +1,248 @@
+<?php
+
+return [
+
+    /*
+    |--------------------------------------------------------------------------
+    | Validation Language Lines
+    |--------------------------------------------------------------------------
+    |
+    | The following language lines contain the default error messages used by
+    | the validator class. Some of these rules have multiple versions such
+    | such as the size rules. Feel free to tweak each of these messages.
+    |
+    */
+
+    'accepted' => 'The :attribute field must be accepted.',
+    'accepted_if' => 'The :attribute field must be accepted when :other is :value.',
+    'active_url' => 'The :attribute field must be a valid URL.',
+    'after' => 'The :attribute field must be a date after :date.',
+    'after_or_equal' => 'The :attribute field must be a date after or equal to :date.',
+    'alpha' => 'The :attribute field must only contain letters.',
+    'alpha_dash' => 'The :attribute field must only contain letters, numbers, dashes, and underscores.',
+    'alpha_num' => 'The :attribute field must only contain letters and numbers.',
+    'array' => 'The :attribute field must be an array.',
+    'ascii' => 'The :attribute field must only contain single-byte alphanumeric characters and symbols.',
+    'before' => 'The :attribute field must be a date before :date.',
+    'before_or_equal' => 'The :attribute field must be a date before or equal to :date.',
+    'between' => [
+        'array' => 'The :attribute field must have between :min and :max items.',
+        'file' => 'The :attribute field must be between :min and :max kilobytes.',
+        'numeric' => 'The :attribute field must be between :min and :max.',
+        'string' => 'The :attribute field must be between :min and :max characters.',
+    ],
+    'boolean' => 'The :attribute field must be true or false.',
+    'can' => 'The :attribute field contains an unauthorized value.',
+    'confirmed' => 'The :attribute field confirmation does not match.',
+    'contains' => 'The :attribute field is missing a required value.',
+    'current_password' => 'The password is incorrect.',
+    'date' => 'The :attribute field must be a valid date.',
+    'date_equals' => 'The :attribute field must be a date equal to :date.',
+    'date_format' => 'The :attribute field must match the format :format.',
+    'decimal' => 'The :attribute field must have :decimal decimal places.',
+    'declined' => 'The :attribute field must be declined.',
+    'declined_if' => 'The :attribute field must be declined when :other is :value.',
+    'different' => 'The :attribute field and :other must be different.',
+    'digits' => 'The :attribute field must be :digits digits.',
+    'digits_between' => 'The :attribute field must be between :min and :max digits.',
+    'dimensions' => 'The :attribute field has invalid image dimensions.',
+    'distinct' => 'The :attribute field has a duplicate value.',
+    'doesnt_end_with' => 'The :attribute field must not end with one of the following: :values.',
+    'doesnt_start_with' => 'The :attribute field must not start with one of the following: :values.',
+    'email' => 'The :attribute field must be a valid email address.',
+    'ends_with' => 'The :attribute field must end with one of the following: :values.',
+    'enum' => 'The selected :attribute is invalid.',
+    'exists' => 'The selected :attribute is invalid.',
+    'extensions' => 'The :attribute field must have one of the following extensions: :values.',
+    'file' => 'The :attribute field must be a file.',
+    'filled' => 'The :attribute field must have a value.',
+    'gt' => [
+        'array' => 'The :attribute field must have more than :value items.',
+        'file' => 'The :attribute field must be greater than :value kilobytes.',
+        'numeric' => 'The :attribute field must be greater than :value.',
+        'string' => 'The :attribute field must be greater than :value characters.',
+    ],
+    'gte' => [
+        'array' => 'The :attribute field must have :value items or more.',
+        'file' => 'The :attribute field must be greater than or equal to :value kilobytes.',
+        'numeric' => 'The :attribute field must be greater than or equal to :value.',
+        'string' => 'The :attribute field must be greater than or equal to :value characters.',
+    ],
+    'hex_color' => 'The :attribute field must be a valid hexadecimal color.',
+    'image' => 'The :attribute field must be an image.',
+    'import_field_empty'    => 'The value for :fieldname cannot be null.',
+    'in' => 'The selected :attribute is invalid.',
+    'in_array' => 'The :attribute field must exist in :other.',
+    'integer' => 'The :attribute field must be an integer.',
+    'ip' => 'The :attribute field must be a valid IP address.',
+    'ipv4' => 'The :attribute field must be a valid IPv4 address.',
+    'ipv6' => 'The :attribute field must be a valid IPv6 address.',
+    'json' => 'The :attribute field must be a valid JSON string.',
+    'list' => 'The :attribute field must be a list.',
+    'lowercase' => 'The :attribute field must be lowercase.',
+    'lt' => [
+        'array' => 'The :attribute field must have less than :value items.',
+        'file' => 'The :attribute field must be less than :value kilobytes.',
+        'numeric' => 'The :attribute field must be less than :value.',
+        'string' => 'The :attribute field must be less than :value characters.',
+    ],
+    'lte' => [
+        'array' => 'The :attribute field must not have more than :value items.',
+        'file' => 'The :attribute field must be less than or equal to :value kilobytes.',
+        'numeric' => 'The :attribute field must be less than or equal to :value.',
+        'string' => 'The :attribute field must be less than or equal to :value characters.',
+    ],
+    'mac_address' => 'The :attribute field must be a valid MAC address.',
+    'max' => [
+        'array' => 'The :attribute field must not have more than :max items.',
+        'file' => 'The :attribute field must not be greater than :max kilobytes.',
+        'numeric' => 'The :attribute field must not be greater than :max.',
+        'string' => 'The :attribute field must not be greater than :max characters.',
+    ],
+    'max_digits' => 'The :attribute field must not have more than :max digits.',
+    'mimes' => 'The :attribute field must be a file of type: :values.',
+    'mimetypes' => 'The :attribute field must be a file of type: :values.',
+    'min' => [
+        'array' => 'The :attribute field must have at least :min items.',
+        'file' => 'The :attribute field must be at least :min kilobytes.',
+        'numeric' => 'The :attribute field must be at least :min.',
+        'string' => 'The :attribute field must be at least :min characters.',
+    ],
+    'min_digits' => 'The :attribute field must have at least :min digits.',
+    'missing' => 'The :attribute field must be missing.',
+    'missing_if' => 'The :attribute field must be missing when :other is :value.',
+    'missing_unless' => 'The :attribute field must be missing unless :other is :value.',
+    'missing_with' => 'The :attribute field must be missing when :values is present.',
+    'missing_with_all' => 'The :attribute field must be missing when :values are present.',
+    'multiple_of' => 'The :attribute field must be a multiple of :value.',
+    'not_in' => 'The selected :attribute is invalid.',
+    'not_regex' => 'The :attribute field format is invalid.',
+    'numeric' => 'The :attribute field must be a number.',
+    'password' => [
+        'letters' => 'The :attribute field must contain at least one letter.',
+        'mixed' => 'The :attribute field must contain at least one uppercase and one lowercase letter.',
+        'numbers' => 'The :attribute field must contain at least one number.',
+        'symbols' => 'The :attribute field must contain at least one symbol.',
+        'uncompromised' => 'The given :attribute has appeared in a data leak. Please choose a different :attribute.',
+    ],
+    'percent'       => 'The depreciation minimum must be between 0 and 100 when depreciation type is percentage.',
+
+    'present' => 'The :attribute field must be present.',
+    'present_if' => 'The :attribute field must be present when :other is :value.',
+    'present_unless' => 'The :attribute field must be present unless :other is :value.',
+    'present_with' => 'The :attribute field must be present when :values is present.',
+    'present_with_all' => 'The :attribute field must be present when :values are present.',
+    'prohibited' => 'The :attribute field is prohibited.',
+    'prohibited_if' => 'The :attribute field is prohibited when :other is :value.',
+    'prohibited_unless' => 'The :attribute field is prohibited unless :other is in :values.',
+    'prohibits' => 'The :attribute field prohibits :other from being present.',
+    'regex' => 'The :attribute field format is invalid.',
+    'required' => 'The :attribute field is required.',
+    'required_array_keys' => 'The :attribute field must contain entries for: :values.',
+    'required_if' => 'The :attribute field is required when :other is :value.',
+    'required_if_accepted' => 'The :attribute field is required when :other is accepted.',
+    'required_if_declined' => 'The :attribute field is required when :other is declined.',
+    'required_unless' => 'The :attribute field is required unless :other is in :values.',
+    'required_with' => 'The :attribute field is required when :values is present.',
+    'required_with_all' => 'The :attribute field is required when :values are present.',
+    'required_without' => 'The :attribute field is required when :values is not present.',
+    'required_without_all' => 'The :attribute field is required when none of :values are present.',
+    'same' => 'The :attribute field must match :other.',
+    'size' => [
+        'array' => 'The :attribute field must contain :size items.',
+        'file' => 'The :attribute field must be :size kilobytes.',
+        'numeric' => 'The :attribute field must be :size.',
+        'string' => 'The :attribute field must be :size characters.',
+    ],
+    'starts_with' => 'The :attribute field must start with one of the following: :values.',
+    'string'               => 'The :attribute must be a string.',
+    'two_column_unique_undeleted' => 'The :attribute must be unique across :table1 and :table2. ',
+    'unique_undeleted'     => 'The :attribute must be unique.',
+    'non_circular'         => 'The :attribute must not create a circular reference.',
+    'not_array'            => ':attribute cannot be an array.',
+    'disallow_same_pwd_as_user_fields' => 'Password cannot be the same as the username.',
+    'letters'              => 'Password must contain at least one letter.',
+    'numbers'              => 'Password must contain at least one number.',
+    'case_diff'            => 'Password must use mixed case.',
+    'symbols'              => 'Password must contain symbols.',
+    'timezone' => 'The :attribute field must be a valid timezone.',
+    'unique' => 'The :attribute has already been taken.',
+    'uploaded' => 'The :attribute failed to upload.',
+    'uppercase' => 'The :attribute field must be uppercase.',
+    'url' => 'The :attribute field must be a valid URL.',
+    'ulid' => 'The :attribute field must be a valid ULID.',
+    'uuid' => 'The :attribute field must be a valid UUID.',
+    'fmcs_location' => 'Full multiple company support and location scoping is enabled in the Admin Settings, and the selected location and selected company are not compatible.',
+
+
+    /*
+    |--------------------------------------------------------------------------
+    | Custom Validation Language Lines
+    |--------------------------------------------------------------------------
+    |
+    | Here you may specify custom validation messages for attributes using the
+    | convention "attribute.rule" to name the lines. This makes it quick to
+    | specify a specific custom language line for a given attribute rule.
+    |
+    */
+
+    'email_array'      => 'One or more email addresses is invalid.',
+    'checkboxes'           => ':attribute contains invalid options.',
+    'radio_buttons'        => ':attribute is invalid.',
+    
+    'custom' => [
+        'alpha_space' => 'The :attribute field contains a character that is not allowed.',
+
+        'hashed_pass'      => 'Your current password is incorrect',
+        'dumbpwd'          => 'That password is too common.',
+        'statuslabel_type' => 'You must select a valid status label type',
+        'custom_field_not_found'          => 'This field does not seem to exist, please double check your custom field names.',
+        'custom_field_not_found_on_model' => 'This field seems to exist, but is not available on this Asset Model\'s fieldset.',
+
+        // date_format validation with slightly less stupid messages. It duplicates a lot, but it gets the job done :(
+        // We use this because the default error message for date_format reflects php Y-m-d, which non-PHP
+        // people won't know how to format.
+        'purchase_date.date_format'     => 'The :attribute must be a valid date in YYYY-MM-DD format',
+        'last_audit_date.date_format'   =>  'The :attribute must be a valid date in YYYY-MM-DD hh:mm:ss format',
+        'expiration_date.date_format'   =>  'The :attribute must be a valid date in YYYY-MM-DD format',
+        'termination_date.date_format'  =>  'The :attribute must be a valid date in YYYY-MM-DD format',
+        'expected_checkin.date_format'  =>  'The :attribute must be a valid date in YYYY-MM-DD format',
+        'start_date.date_format'        =>  'The :attribute must be a valid date in YYYY-MM-DD format',
+        'end_date.date_format'          =>  'The :attribute must be a valid date in YYYY-MM-DD format',
+        'invalid_value_in_field' => 'Invalid value included in this field',
+
+        'ldap_username_field' => [
+            'not_in' =>         '<code>sAMAccountName</code> (mixed case) will likely not work. You should use <code>samaccountname</code> (lowercase) instead.'
+        ],
+        'ldap_auth_filter_query' => ['not_in' => '<code>uid=samaccountname</code> is probably not a valid auth filter. You probably want <code>uid=</code> '],
+        'ldap_filter' => ['regex' => 'This value should probably not be wrapped in parentheses.'],
+
+        ],
+    /*
+    |--------------------------------------------------------------------------
+    | Custom Validation Attributes
+    |--------------------------------------------------------------------------
+    |
+    | The following language lines are used to swap attribute place-holders
+    | with something more reader friendly such as E-Mail Address instead
+    | of "email". This simply helps us make messages a little cleaner.
+    |
+    */
+
+    'attributes' => [],
+
+    /*
+    |--------------------------------------------------------------------------
+    | Generic Validation Messages - we use these in the jquery validation where we don't have
+    | access to the :attribute
+    |--------------------------------------------------------------------------
+    */
+
+    'generic' => [
+        'invalid_value_in_field' => 'Invalid value included in this field',
+        'required' => 'This field is required',
+        'email' => 'Please enter a valid email address',
+    ],
+
+
+];
diff --git a/resources/lang/ms-MY/account/general.php b/resources/lang/ms-MY/account/general.php
index 1a9e2c03b8..7f9e2f848e 100644
--- a/resources/lang/ms-MY/account/general.php
+++ b/resources/lang/ms-MY/account/general.php
@@ -2,10 +2,16 @@
 
 return array(
     'personal_api_keys' => 'Personal API Keys',
+    'personal_access_token' => 'Personal Access Token',
+    'personal_api_keys_success' => 'Personal API Key :key created sucessfully',
+    'here_is_api_key' => 'Here is your new personal access token. This is the only time it will be shown so do not lose it! You may now use this token to make API requests.',
     'api_key_warning' => 'When generating an API token, be sure to copy it down immediately as they will not be visible to you again.',
     'api_base_url' => 'Your API base url is located at:',
     'api_base_url_endpoint' => '/&lt;endpoint&gt;',
     'api_token_expiration_time' => 'API tokens are set to expire in:',
     'api_reference' => 'Please check the <a href="https://snipe-it.readme.io/reference" target="_blank">API reference</a> to find specific API endpoints and additional API documentation.',
     'profile_updated' => 'Account successfully updated',
+    'no_tokens' => 'You have not created any personal access tokens.',
+    'enable_sounds' => 'Enable sound effects',
+    'enable_confetti' => 'Enable confetti effects',
 );
diff --git a/resources/lang/ms-MY/admin/accessories/general.php b/resources/lang/ms-MY/admin/accessories/general.php
index 47d11270e4..0e5b843626 100644
--- a/resources/lang/ms-MY/admin/accessories/general.php
+++ b/resources/lang/ms-MY/admin/accessories/general.php
@@ -17,6 +17,6 @@ return array(
     'use_default_eula'					=> 'Gunakan <a href="#" data-toggle="modal" data-target="#eulaModal">pilihan utama lalai EULA</a> sebaliknya.',
     'use_default_eula_disabled'			=> '<del>Gunakan EULA lalai utama bukannya.</del> Tiada seting utama EULA ditetapkan. Sila tambah satu dalam Tetapan.',
     'clone'                             => 'Clone Accessory',
-    'delete_disabled'                   => 'This accessory cannot be deleted yet because some items are still checked out.',
+    'delete_disabled'                   => 'Aksesori ini tidak boleh dibuang lagi kerana ada barangan yang masih dalam daftar keluar.',
 
 );
diff --git a/resources/lang/ms-MY/admin/accessories/message.php b/resources/lang/ms-MY/admin/accessories/message.php
index fb39faa6af..159ae1d0b2 100644
--- a/resources/lang/ms-MY/admin/accessories/message.php
+++ b/resources/lang/ms-MY/admin/accessories/message.php
@@ -25,8 +25,12 @@ return array(
      'checkout' => array(
         'error'   		=> 'Aksesori tidak diperiksa, sila cuba lagi',
         'success' 		=> 'Aksesori diperiksa dengan jayanya.',
-        'unavailable'   => 'Accessory is not available for checkout. Check quantity available',
-        'user_does_not_exist' => 'Pengguna itu tidak sah. Sila cuba lagi.'
+        'unavailable'   => 'Tiada aksesori untuk dikeluarkan. Sila periksa kuantiti sedia ada',
+        'user_does_not_exist' => 'Pengguna itu tidak sah. Sila cuba lagi.',
+         'checkout_qty' => array(
+            'lte'  => 'There is currently only one available accessory of this type, and you are trying to check out :checkout_qty. Please adjust the checkout quantity or the total stock of this accessory and try again.|There are :number_currently_remaining total available accessories, and you are trying to check out :checkout_qty. Please adjust the checkout quantity or the total stock of this accessory and try again.',
+            ),
+           
     ),
 
     'checkin' => array(
diff --git a/resources/lang/ms-MY/admin/accessories/table.php b/resources/lang/ms-MY/admin/accessories/table.php
index 3be44aa7c6..279c68136e 100644
--- a/resources/lang/ms-MY/admin/accessories/table.php
+++ b/resources/lang/ms-MY/admin/accessories/table.php
@@ -6,6 +6,4 @@ return array(
     'id'      					=> 'ID',
     'require_acceptance'      	=> 'Penerimaan',
     'title'      				=> 'Nama Aksesori',
-
-
 );
diff --git a/resources/lang/ms-MY/admin/components/message.php b/resources/lang/ms-MY/admin/components/message.php
index 68ba7deb7c..6e0dcc4b87 100644
--- a/resources/lang/ms-MY/admin/components/message.php
+++ b/resources/lang/ms-MY/admin/components/message.php
@@ -17,7 +17,8 @@ return array(
     'delete' => array(
         'confirm'   => 'Adakah anda pasti ingin memadamkan komponen ini?',
         'error'   => 'Terdapat isu memadamkan komponen. Sila cuba lagi.',
-        'success' => 'Komponen telah berjaya dipadam.'
+        'success' => 'Komponen telah berjaya dipadam.',
+        'error_qty'   => 'Some components of this type are still checked out. Please check them in and try again.',
     ),
 
      'checkout' => array(
diff --git a/resources/lang/ms-MY/admin/consumables/general.php b/resources/lang/ms-MY/admin/consumables/general.php
index 103eafe4c7..e640ff0f5d 100644
--- a/resources/lang/ms-MY/admin/consumables/general.php
+++ b/resources/lang/ms-MY/admin/consumables/general.php
@@ -8,4 +8,5 @@ return array(
     'remaining' 			            => 'Baki',
     'total' 			                => 'Jumlah',
     'update'                            => 'Kemas kini boleh digunakan',
+    'inventory_warning'                 => 'The inventory of this consumable is below the minimum amount of :min_count',
 );
diff --git a/resources/lang/ms-MY/admin/consumables/message.php b/resources/lang/ms-MY/admin/consumables/message.php
index 1a70fa1443..3ff456aea9 100644
--- a/resources/lang/ms-MY/admin/consumables/message.php
+++ b/resources/lang/ms-MY/admin/consumables/message.php
@@ -2,6 +2,7 @@
 
 return array(
 
+    'invalid_category_type' => 'The category must be a consumable category.',
     'does_not_exist' => 'Tidak boleh digunakan.',
 
     'create' => array(
diff --git a/resources/lang/ms-MY/admin/custom_fields/general.php b/resources/lang/ms-MY/admin/custom_fields/general.php
index ba570d3a0f..80e4f5ce28 100644
--- a/resources/lang/ms-MY/admin/custom_fields/general.php
+++ b/resources/lang/ms-MY/admin/custom_fields/general.php
@@ -35,7 +35,7 @@ return [
     'create_field_title' => 'Create a new custom field',
     'value_encrypted'      	        => 'Nilai medan ini disulitkan dalam pangkalan data. Hanya pengguna admin sahaja yang dapat melihat nilai yang disahkrit',
     'show_in_email'     => 'Sertakan nilai medan ini dalam e-mel semak keluar yang dihantar kepada pengguna? Medan yang disulitkan tidak boleh dimasukkan ke dalam e-mel',
-    'show_in_email_short'     => 'Include in emails.',
+    'show_in_email_short' => 'Include in emails',
     'help_text' => 'Help Text',
     'help_text_description' => 'This is optional text that will appear below the form elements while editing an asset to provide context on the field.',
     'about_custom_fields_title' => 'About Custom Fields',
@@ -57,5 +57,8 @@ return [
     'show_in_requestable_list_short' => 'Show in requestable assets list',
     'show_in_requestable_list' => 'Show value in requestable assets list. Encrypted fields will not be shown',
     'encrypted_options' => 'This field is encrypted, so some display options will not be available.',
+    'display_checkin' => 'Display in checkin forms',
+    'display_checkout' => 'Display in checkout forms',
+    'display_audit' => 'Display in audit forms',
 
 ];
diff --git a/resources/lang/ms-MY/admin/custom_fields/message.php b/resources/lang/ms-MY/admin/custom_fields/message.php
index 1e6d79f7ea..93f5eb3067 100644
--- a/resources/lang/ms-MY/admin/custom_fields/message.php
+++ b/resources/lang/ms-MY/admin/custom_fields/message.php
@@ -5,6 +5,7 @@ return array(
     'field' => array(
         'invalid'   => 'Bidang itu tidak wujud.',
         'already_added'   => 'Bidang sudah ditambahkan',
+        'none_selected'   => 'No field selected',
 
         'create' => array(
             'error'   => 'Bidang tidak dibuat, sila cuba lagi.',
diff --git a/resources/lang/ms-MY/admin/depreciations/general.php b/resources/lang/ms-MY/admin/depreciations/general.php
index 0ef73267ed..ad416a6483 100644
--- a/resources/lang/ms-MY/admin/depreciations/general.php
+++ b/resources/lang/ms-MY/admin/depreciations/general.php
@@ -13,4 +13,8 @@ return [
     'no_depreciations_warning'               => '<strong>Warning: </strong>
                       You do not currently have any depreciations set up.
                       Please set up at least one depreciation to view the depreciation report.',
+    'depreciation_method'                   => 'Laporan Susut nilai',
+    'linear_depreciation'                   => 'Linear (Default)',
+    'half_1'                                => 'Half-year convention, always applied',
+    'half_2'                                => 'Half-year convention, applied with condition',
 ];
diff --git a/resources/lang/ms-MY/admin/hardware/form.php b/resources/lang/ms-MY/admin/hardware/form.php
index d482551993..45ba0935bd 100644
--- a/resources/lang/ms-MY/admin/hardware/form.php
+++ b/resources/lang/ms-MY/admin/hardware/form.php
@@ -55,8 +55,11 @@ return [
     'asset_location_update_default' => 'Update only default location',
     'asset_location_update_actual' => 'Update only actual location',
     'asset_not_deployable' => 'That asset status is not deployable. This asset cannot be checked out.',
-    'asset_deployable' => 'That status is deployable. This asset can be checked out.',
+    'asset_not_deployable_checkin' => 'That asset status is not deployable. Using this status label will checkin the asset.',
+    'asset_deployable' => 'This asset can be checked out.',
     'processing_spinner' => 'Processing... (This might take a bit of time on large files)',
+    'processing' => 'Processing... ',
     'optional_infos'  => 'Optional Information',
-    'order_details'   => 'Order Related Information'
+    'order_details'   => 'Order Related Information',
+    'calc_eol'    => 'If nulling the EOL date, use automatic EOL calculation based on the purchase date and EOL rate.',
 ];
diff --git a/resources/lang/ms-MY/admin/hardware/general.php b/resources/lang/ms-MY/admin/hardware/general.php
index df49aaa496..07b58ed592 100644
--- a/resources/lang/ms-MY/admin/hardware/general.php
+++ b/resources/lang/ms-MY/admin/hardware/general.php
@@ -5,8 +5,8 @@ return [
     'about_assets_text'            => 'Aset adalah item yang dikesan oleh nombor siri atau tag aset. Mereka cenderung menjadi item nilai yang lebih tinggi di mana mengenal pasti perkara-perkara tertentu.',
     'archived'  				=> 'Diarkibkan',
     'asset'  					=> 'Harta',
-    'bulk_checkout'             => 'Daftar Keluar Aset',
-    'bulk_checkin'              => 'Checkin Assets',
+    'bulk_checkout'             => 'Checkout Pukal',
+    'bulk_checkin'              => 'Bulk Checkin',
     'checkin'  					=> 'Terima Harta',
     'checkout'  				=> 'Aset Checkout',
     'clone'  					=> 'Pendua Harta',
@@ -27,8 +27,7 @@ return [
     'undeployable_tooltip'  	=> 'This asset has a status label that is undeployable and cannot be checked out at this time.',
     'view'  					=> 'Papar Harta',
     'csv_error' => 'You have an error in your CSV file:',
-    'import_text' => '<p>Upload a CSV that contains asset history. The assets and users MUST already exist in the system, or they will be skipped. Matching assets for history import happens against the asset tag. We will try to find a matching user based on the user\'s name you provide, and the criteria you select below. If you do not select any criteria below, it will simply try to match on the username format you configured in the <code>Admin &gt; General Settings</code>.</p><p>Fields included in the CSV must match the headers: <strong>Asset Tag, Name, Checkout Date, Checkin Date</strong>. Any additional fields will be ignored. </p><p>Checkin Date: blank or future checkin dates will checkout items to associated user.  Excluding the Checkin Date column will create a checkin date with todays date.</p>
-    ',
+    'import_text' => '<p>Upload a CSV that contains asset history. The assets and users MUST already exist in the system, or they will be skipped. Matching assets for history import happens against the asset tag. We will try to find a matching user based on the user\'s name you provide, and the criteria you select below. If you do not select any criteria below, it will simply try to match on the username format you configured in the <code>Admin &gt; General Settings</code>.</p><p>Fields included in the CSV must match the headers: <strong>Asset Tag, Name, Checkout Date, Checkin Date</strong>. Any additional fields will be ignored. </p><p>Checkin Date: blank or future checkin dates will checkout items to associated user.  Excluding the Checkin Date column will create a checkin date with todays date.</p>    ',
     'csv_import_match_f-l' => 'Try to match users by <strong>firstname.lastname</strong> (<code>jane.smith</code>) format',
     'csv_import_match_initial_last' => 'Try to match users by <strong>first initial last name</strong> (<code>jsmith</code>) format',
     'csv_import_match_first' => 'Try to match users by <strong>first name</strong> (<code>jane</code>) format',
diff --git a/resources/lang/ms-MY/admin/hardware/message.php b/resources/lang/ms-MY/admin/hardware/message.php
index a171f17a52..367ed59e40 100644
--- a/resources/lang/ms-MY/admin/hardware/message.php
+++ b/resources/lang/ms-MY/admin/hardware/message.php
@@ -2,18 +2,23 @@
 
 return [
 
-    'undeployable' 		=> '<strong>Amaran: </strong> Aset ini telah ditandakan sebagai tidak boleh dikehendaki. Jika status ini telah berubah, sila kemas kini status aset.',
-    'does_not_exist' 	=> 'Harta tidak wujud.',
-    'does_not_exist_var'=> 'Asset with tag :asset_tag not found.',
-    'no_tag' 	        => 'No asset tag provided.',
+    'undeployable' 		 => '<strong>Amaran: </strong> Harta ini sekarang ditanda sebagai tidak boleh agih. Jika statusnya telah berubah, sila kemaskini staus harta.',
+    'does_not_exist' 	 => 'Harta tidak wujud.',
+    'does_not_exist_var' => 'Asset with tag :asset_tag not found.',
+    'no_tag' 	         => 'No asset tag provided.',
     'does_not_exist_or_not_requestable' => 'That asset does not exist or is not requestable.',
-    'assoc_users'	 	=> 'Harta ini sekarang telah diagihkan kepada pengguna dan tidak boleh dihapuskan. Sila semak status harta ini dahulu, dan kemudian cuba semula. ',
+    'assoc_users'	 	 => 'Harta ini sekarang telah diagihkan kepada pengguna dan tidak boleh dihapuskan. Sila semak status harta ini dahulu, dan kemudian cuba semula. ',
     'warning_audit_date_mismatch' 	=> 'This asset\'s next audit date (:next_audit_date) is before the last audit date (:last_audit_date). Please update the next audit date.',
+    'labels_generated'   => 'Labels were successfully generated.',
+    'error_generating_labels' => 'Error while generating labels.',
+    'no_assets_selected' => 'No assets selected.',
 
     'create' => [
         'error'   		=> 'Harta gagal dicipta, sila cuba semula. :(',
         'success' 		=> 'Harta berjaya dicipta. :)',
         'success_linked' => 'Asset with tag :tag was created successfully. <strong><a href=":link" style="color: white;">Click here to view</a></strong>.',
+        'multi_success_linked' => 'Asset with tag :links was created successfully.|:count assets were created succesfully. :links.',
+        'partial_failure' => 'An asset was unable to be created. Reason: :failures|:count assets were unable to be created. Reasons: :failures',
     ],
 
     'update' => [
@@ -51,20 +56,24 @@ return [
     ],
 
     'import' => [
+        'import_button'         => 'Process Import',
         'error'                 => 'Sesetengah item tidak diimport dengan betul.',
         'errorDetail'           => 'Item berikut tidak diimport kerana kesilapan.',
         'success'               => 'Fail anda telah diimport',
         'file_delete_success'   => 'Fail anda telah berjaya dihapuskan',
         'file_delete_error'      => 'Fail tidak dapat dipadamkan',
         'file_missing' => 'The file selected is missing',
+        'file_already_deleted' => 'The file selected was already deleted',
         'header_row_has_malformed_characters' => 'One or more attributes in the header row contain malformed UTF-8 characters',
         'content_row_has_malformed_characters' => 'One or more attributes in the first row of content contain malformed UTF-8 characters',
+        'transliterate_failure' => 'Transliteration from :encoding to UTF-8 failed due to invalid characters in input'
     ],
 
 
     'delete' => [
         'confirm'   	=> 'Anda pasti anda ingin hapuskan harta ini?',
         'error'   		=> 'Ada isu semasa menghapuskan harta. Sila cuba lagi.',
+        'assigned_to_error' => '{1}Asset Tag: :asset_tag is currently checked out. Check in this device before deletion.|[2,*]Asset Tags: :asset_tag are currently checked out. Check in these devices before deletion.',
         'nothing_updated'   => 'Tiada aset dipilih, jadi tiada apa yang dipadamkan.',
         'success' 		=> 'Harta berjaya dihapuskan.',
     ],
@@ -77,6 +86,11 @@ return [
         'no_assets_selected' => 'Anda mesti memilih sekurang-kurangnya satu aset dari senarai',
     ],
 
+    'multi-checkout' => [
+        'error'   => 'Asset was not checked out, please try again|Assets were not checked out, please try again',
+        'success' => 'Asset checked out successfully.|Assets checked out successfully.',
+    ],
+
     'checkin' => [
         'error'   		=> 'Harta tidak diterima, sila cuba lagi',
         'success' 		=> 'Harta berjaya diterima.',
@@ -86,9 +100,10 @@ return [
     ],
 
     'requests' => [
-        'error'   		=> 'Aset tidak diminta, sila cuba lagi',
-        'success' 		=> 'Aset diminta berjaya.',
-        'canceled'      => 'Permintaan keluar telah dibatalkan',
+        'error'   		=> 'Request was not successful, please try again.',
+        'success' 		=> 'Request successfully submitted.',
+        'canceled'      => 'Request successfully canceled.',
+        'cancel'        => 'Cancel this item request',
     ],
 
 ];
diff --git a/resources/lang/ms-MY/admin/hardware/table.php b/resources/lang/ms-MY/admin/hardware/table.php
index 164bba4bd3..0f92910ef4 100644
--- a/resources/lang/ms-MY/admin/hardware/table.php
+++ b/resources/lang/ms-MY/admin/hardware/table.php
@@ -25,7 +25,6 @@ return [
     'image'		    => 'Imej Peranti',
     'days_without_acceptance' => 'Hari Tanpa Penerimaan',
     'monthly_depreciation' => 'Susut Nilai Bulanan',
-    'assigned_to'    => 'Ditugaskan untuk',
     'requesting_user' => 'Requesting User',
     'requested_date' => 'Requested Date',
     'changed'       => 'Berubah',
diff --git a/resources/lang/ms-MY/admin/kits/general.php b/resources/lang/ms-MY/admin/kits/general.php
index d92cdb6806..1971697037 100644
--- a/resources/lang/ms-MY/admin/kits/general.php
+++ b/resources/lang/ms-MY/admin/kits/general.php
@@ -47,4 +47,5 @@ return [
     'kit_deleted'                       => 'Kit berjaya dipadamkan',
     'kit_model_updated'                 => 'Model was successfully updated',
     'kit_model_detached'                => 'Model was successfully detached',
+    'model_already_attached'            => 'Model already attached to kit',
 ];
diff --git a/resources/lang/ms-MY/admin/licenses/general.php b/resources/lang/ms-MY/admin/licenses/general.php
index 038cd70414..d3965e5257 100644
--- a/resources/lang/ms-MY/admin/licenses/general.php
+++ b/resources/lang/ms-MY/admin/licenses/general.php
@@ -14,6 +14,7 @@ return array(
     'info'  					=> 'Maklumat Lesen',
     'license_seats'  			=> 'Lesen Kosong',
     'seat'  					=> 'Kekosongan',
+    'seat_count'  				=> 'Seat :count',
     'seats'  					=> 'Kekosongan',
     'software_licenses'  		=> 'Lesen Perisian',
     'user'  					=> 'Pengguna',
@@ -23,12 +24,12 @@ return array(
         [
             'checkin_all'           => [
                 'button'            => 'Checkin All Seats',
-                'modal'             => 'This will action checkin one seat. | This action will checkin all :checkedout_seats_count seats for this license.',
+                'modal'             => 'This action will checkin one seat. | This action will checkin all :checkedout_seats_count seats for this license.',
                 'enabled_tooltip'   => 'Checkin ALL seats for this license from both users and assets',
                 'disabled_tooltip'  => 'This is disabled because there are no seats currently checked out',
                 'disabled_tooltip_reassignable'  => 'This is disabled because the License is not reassignable',
                 'success'           => 'License successfully checked in! | All licenses were successfully checked in!',
-                'log_msg'           => 'Checked in via bulk license checkout in license GUI',
+                'log_msg'           => 'Checked in via bulk license checkin in license GUI',
             ],
 
             'checkout_all'              => [
diff --git a/resources/lang/ms-MY/admin/licenses/message.php b/resources/lang/ms-MY/admin/licenses/message.php
index 2541898dc5..3ff4328163 100644
--- a/resources/lang/ms-MY/admin/licenses/message.php
+++ b/resources/lang/ms-MY/admin/licenses/message.php
@@ -44,10 +44,13 @@ return array(
         'error'   => 'Ada isu semasa agihan lesen. Sila cuba lagi.',
         'success' => 'Lesen berjaya diagihkan',
         'not_enough_seats' => 'Not enough license seats available for checkout',
+        'mismatch' => 'The license seat provided does not match the license',
+        'unavailable' => 'This seat is not available for checkout.',
     ),
 
     'checkin' => array(
         'error'   => 'Ada isu semasa terima lesen. Sila cuba lagi.',
+        'not_reassignable' => 'License not reassignable',
         'success' => 'Lesen berjaya diterima'
     ),
 
diff --git a/resources/lang/ms-MY/admin/locations/message.php b/resources/lang/ms-MY/admin/locations/message.php
index afd8501df2..01d001fcbc 100644
--- a/resources/lang/ms-MY/admin/locations/message.php
+++ b/resources/lang/ms-MY/admin/locations/message.php
@@ -3,11 +3,12 @@
 return array(
 
     'does_not_exist' => 'Lokasi tidak wujud.',
-    'assoc_users'    => 'This location is not currently deletable because it is the location of record for at least one asset or user, has assets assigned to it, or is the parent location of another location. Please update your models to no longer reference this company and try again. ',
+    'assoc_users'    => 'This location is not currently deletable because it is the location of record for at least one asset or user, has assets assigned to it, or is the parent location of another location. Please update your records to no longer reference this location and try again ',
     'assoc_assets'	 => 'Lokasi ini kini dikaitkan dengan sekurang-kurangnya satu aset dan tidak boleh dihapuskan. Sila kemas kini aset anda untuk tidak merujuk lagi lokasi ini dan cuba lagi.',
     'assoc_child_loc'	 => 'Lokasi ini adalah ibu bapa sekurang-kurangnya satu lokasi kanak-kanak dan tidak boleh dipadamkan. Sila kemas kini lokasi anda untuk tidak merujuk lokasi ini lagi dan cuba lagi.',
     'assigned_assets' => 'Assigned Assets',
     'current_location' => 'Current Location',
+    'open_map' => 'Open in :map_provider_icon Maps',
 
 
     'create' => array(
@@ -20,6 +21,11 @@ return array(
         'success' => 'Lokasi berjaya dikemaskini.'
     ),
 
+    'restore' => array(
+        'error'   => 'Location was not restored, please try again',
+        'success' => 'Location restored successfully.'
+    ),
+
     'delete' => array(
         'confirm'   	=> 'Anda pasti and ingin menghapuskan lokasi ini?',
         'error'   => 'Ada isu semasa menghapuskan lokasi. Sila cuba lagi.',
diff --git a/resources/lang/ms-MY/admin/locations/table.php b/resources/lang/ms-MY/admin/locations/table.php
index 579e2fa352..541dbca8ae 100644
--- a/resources/lang/ms-MY/admin/locations/table.php
+++ b/resources/lang/ms-MY/admin/locations/table.php
@@ -39,4 +39,5 @@ return [
     'signed_by_finance_auditor' => 'Ditandatangan oleh (Pengaudit Kewangan):',
     'signed_by_location_manager' => 'Ditandatangan oleh (Pengurus Lokasi):',
     'signed_by'                 => 'Signed Off By:',
+    'clone'  					=> 'Clone Location',
 ];
diff --git a/resources/lang/ms-MY/admin/models/general.php b/resources/lang/ms-MY/admin/models/general.php
index 9961221f47..5d5c8d0664 100644
--- a/resources/lang/ms-MY/admin/models/general.php
+++ b/resources/lang/ms-MY/admin/models/general.php
@@ -3,7 +3,7 @@
 return array(
     'about_models_title'     => 'Mengenai Model Asset',
     'about_models_text'           => 'Model Aset adalah cara untuk mengumpulkan aset yang sama. "MBP 2013", "IPhone 6s", dan sebagainya.',
-    'deleted'  					        => 'Model ini telah dipadamkan.',
+    'deleted'  					=> 'Model ini telah dipadamkan.',
     'bulk_delete'               => 'Padam Secara Pukal Model Aset',
     'bulk_delete_help'               => 'Gunakan kotak semakan di bawah untuk mengesahkan penghapusan model aset terpilih. Model aset yang mempunyai aset yang berkaitan dengannya tidak boleh dihapuskan sehingga aset dikaitkan dengan model yang berbeza.',
     'bulk_delete_warn'          => 'You are about to delete one asset model.|You are about to delete :model_count asset models.',
diff --git a/resources/lang/ms-MY/admin/models/message.php b/resources/lang/ms-MY/admin/models/message.php
index 61184150ac..478cf34284 100644
--- a/resources/lang/ms-MY/admin/models/message.php
+++ b/resources/lang/ms-MY/admin/models/message.php
@@ -7,7 +7,7 @@ return array(
     'no_association' => 'WARNING! The asset model for this item is invalid or missing!',
     'no_association_fix' => 'This will break things in weird and horrible ways. Edit this asset now to assign it a model.',
     'assoc_users'	 => 'Model ini sekarang disekutukan dengan sekurang2nya satu atau lebih harta dan tidak boleh dihapuskan. Sila kemaskini harta, dan kemudian cuba lagi. ',
-
+    'invalid_category_type' => 'This category must be an asset category.',
 
     'create' => array(
         'error'   => 'Model gagal dicipta, sila cuba lagi.',
diff --git a/resources/lang/ms-MY/admin/reports/general.php b/resources/lang/ms-MY/admin/reports/general.php
index 951ebb0d3d..45d032981a 100644
--- a/resources/lang/ms-MY/admin/reports/general.php
+++ b/resources/lang/ms-MY/admin/reports/general.php
@@ -4,6 +4,7 @@ return [
     'info'   => 'Pilih opsyen yang anda mahu untuk laporan harta anda.',
     'deleted_user' => 'Deleted user',
     'send_reminder' => 'Send reminder',
+    'cannot_send_reminder' => 'User has been deleted or does not have an email address so cannot receive a reminder',
     'reminder_sent' => 'Reminder sent',
     'acceptance_deleted' => 'Acceptance request deleted',
     'acceptance_request' => 'Acceptance request',
@@ -13,5 +14,10 @@ return [
         'user_state' => 'User State',
         'user_country' => 'User Country',
         'user_zip' => 'User Zip'
-    ]
-];
\ No newline at end of file
+    ],
+    'open_saved_template' => 'Open Saved Template',
+    'save_template' =>  'Save Template',
+    'select_a_template' => 'Select a Template',
+    'template_name' => 'Template Name',
+    'update_template' => 'Update Template',
+];
diff --git a/resources/lang/ms-MY/admin/reports/message.php b/resources/lang/ms-MY/admin/reports/message.php
index 799596a821..2800bbdf0b 100644
--- a/resources/lang/ms-MY/admin/reports/message.php
+++ b/resources/lang/ms-MY/admin/reports/message.php
@@ -1,5 +1,16 @@
 <?php
 
-return array(
-    'error'   => 'Anda mesti pilih sekurang-kurangnya SATU opsyen.'
-);
+return [
+    'about_templates' => 'About Saved Templates',
+    'saving_templates_description' => 'Select your options, then enter the name of your template in the box above and click the \'Save Template\' button. Use the dropdown to select a previously saved template.',
+    'create'  => [
+        'success' => 'Template saved successfully',
+    ],
+    'update' => [
+        'success' => 'Template updated successfully',
+    ],
+    'delete' => [
+        'success' => 'Template deleted',
+        'no_delete_permission' => 'Template does not exist or you do not have permission to delete it.',
+    ],
+];
diff --git a/resources/lang/ms-MY/admin/settings/general.php b/resources/lang/ms-MY/admin/settings/general.php
index 143f514009..74a0c169d4 100644
--- a/resources/lang/ms-MY/admin/settings/general.php
+++ b/resources/lang/ms-MY/admin/settings/general.php
@@ -8,13 +8,13 @@ return [
     'ad_append_domain'          => 'Tambahkan nama domain pada medan nama pengguna',
     'ad_append_domain_help'     => 'Pengguna tidak perlu menulis "nama pengguna@domain.local", mereka hanya boleh menaip "nama pengguna".',
     'admin_cc_email'            => 'SK Email',
-    'admin_cc_email_help'       => 'Jika anda ingin menghantar salinan e-mel daftar masuk/daftar keluar yang dihantar kepada pengguna ke akaun e-mel tambahan, masukkannya di sini. Jika tidak, biarkan medan ini kosong.',
+    'admin_cc_email_help'       => 'Send a copy of checkin/checkout emails to this address.',
     'admin_settings'            => 'Admin Settings',
     'is_ad'				        => 'Ini adalah pelayan Direktori Aktif',
     'alerts'                	=> 'Alerts',
     'alert_title'               => 'Update Notification Settings',
     'alert_email'				=> 'Hantar isyarat kepada',
-    'alert_email_help'    => 'Email addresses or distribution lists you want alerts to be sent to, comma separated',
+    'alert_email_help'          => 'Email addresses or distribution lists you want alerts to be sent to, comma separated.',
     'alerts_enabled'			=> 'Isyarat Dihidupkan',
     'alert_interval'			=> 'Amaran Pemberitahuan Amaran (dalam hari)',
     'alert_inv_threshold'		=> 'Ambang Amaran Inventori',
@@ -31,15 +31,18 @@ return [
     'backups'					=> 'Sandaran',
     'backups_help'              => 'Create, download, and restore backups ',
     'backups_restoring'         => 'Restoring from Backup',
+    'backups_clean' => 'Clean the backed-up database before restore',
+    'backups_clean_helptext' => "This can be useful if you're changing between database versions",
     'backups_upload'            => 'Upload Backup',
     'backups_path'              => 'Backups on the server are stored in <code>:path</code>',
-    'backups_restore_warning'   => 'Use the restore button <small><span class="btn btn-xs btn-warning"><i class="text-white fas fa-retweet" aria-hidden="true"></i></span></small> to restore from a previous backup. (This does not currently work with S3 file storage or Docker.)<br><br>Your <strong>entire :app_name database and any uploaded files will be completely replaced</strong> by what\'s in the backup file.  ',
+    'backups_restore_warning'   => 'Use the restore button <small><span class="btn btn-xs btn-warning"><i class="text-white fas fa-retweet" aria-hidden="true"></i></span></small> to restore from a previous backup. (This does not currently work with S3 file storage or Docker.)<br><br>Your <strong>entire :app_name database and any uploaded files will be completely replaced</strong> by what\'s in the backup file  ',
     'backups_logged_out'         => 'All existing users, including you, will be logged out once your restore is complete.',
     'backups_large'             => 'Very large backups may time out on the restore attempt and may still need to be run via command line. ',
     'barcode_settings'			=> 'Tetapan Kod Bar',
     'confirm_purge'			    => 'Mengesahkan Purge',
     'confirm_purge_help'		=> 'Masukkan teks "DELETE" dalam kotak di bawah untuk membersihkan rekod anda yang dipadamkan. Tindakan ini tidak boleh dibuat asal dan akan memadamkan semua item dan pengguna yang dipadam lembut secara KEKAL. (Anda harus membuat sandaran dahulu, hanya untuk selamat.)',
     'custom_css'				=> 'CSS tersuai',
+    'custom_css_placeholder'	=> 'Add your custom CSS',
     'custom_css_help'			=> 'Masukkan mana-mana CSS ubah khas yang anda mahu gunakan. Jangan masukkan tag &lt;style&gt;&lt;/style&gt;.',
     'custom_forgot_pass_url'	=> 'URL Khas untuk Penetapan Semula Kata Laluan',
     'custom_forgot_pass_url_help'	=> 'Ini menggantikan URL terlupa kata laluan terbina pada skrin log masuk, berguna untuk mengarahkan pengguna ke fungsi semula kata laluan LDAP dalaman atau dihoskan. Ia secara langsung akan melumpuhkan fungsi kata laluan terlupa pengguna tempatan.',
@@ -47,34 +50,34 @@ return [
     'dashboard_message_help'	=> 'Teks ini akan muncul pada papan pemuka untuk sesiapa sahaja yang mempunyai kebenaran untuk melihat papan pemuka.',
     'default_currency'  		=> 'Mata Wang Default',
     'default_eula_text'			=> 'EULA lalai',
+    'default_eula_text_placeholder' => 'Add your default EULA text',
     'default_language'			=> 'Bahasa Lalai',
     'default_eula_help_text'	=> 'Anda juga boleh mengaitkan EULA tersuai untuk kategori aset tertentu.',
     'acceptance_note'           => 'Add a note for your decision (Optional)',
     'display_asset_name'        => 'Papar Nama Harta',
     'display_checkout_date'     => 'Papar Tarikh \'Checkout\'',
     'display_eol'               => 'Papar EOL dalam paparan jadual',
-    'display_qr'                => 'Paparkan Kod Square',
+    'display_qr'                => 'Display 2D barcode',
     'display_alt_barcode'		=> 'Paparkan kod bar 1D',
-    'email_logo'                => 'Logo E-Mel',
     'barcode_type'				=> 'Jenis Barcode 2D',
     'alt_barcode_type'			=> 'Jenis kod bar 1D',
-    'email_logo_size'       => 'Logo segi empat sama dalam e-mel kelihatan terbaik. ',
     'enabled'                   => 'Enabled',
     'eula_settings'				=> 'Tetapan EULA',
     'eula_markdown'				=> 'EULA ini membolehkan markah <a href="https://help.github.com/articles/github-flavored-markdown/">Github berperisa</a>.',
+    'empty_row_count'           => 'Field Start Offset (Empty Rows)',
+    'empty_row_count_help'      => 'Fields will begin populating after this many empty rows are skipped at the top of the label.',
     'favicon'                   => 'Favicon',
     'favicon_format'            => 'Jenis fail yang diterima ialah ico, png dan gif. Format imej lain mungkin tidak berfungsi dalam semua penyemak imbas.',
     'favicon_size'          => 'Favicon hendaklah imej segi empat sama, 16x16 piksel.',
     'footer_text'               => 'Teks Pengaki Tambahan ',
     'footer_text_help'          => 'Teks ini akan muncul dalam pengaki sebelah kanan. Pautan dibenarkan menggunakan <a href="https://help.github.com/articles/github-flavored-markdown/">turunkan berperisa Github</a>. Pemisahan baris, pengepala, imej, dll boleh mengakibatkan hasil yang tidak dapat diramalkan.',
+    'footer_text_placeholder'   => 'Optional footer text',
     'general_settings'			=> 'Tetapan umum',
-    'general_settings_keywords' => 'company support, signature, acceptance, email format, username format, images, per page, thumbnail, eula, gravatar, tos, dashboard, privacy',
     'general_settings_help'     => 'Default EULA and more',
     'generate_backup'			=> 'Hasilkan Backup',
     'google_workspaces'         => 'Google Workspaces',
     'header_color'              => 'Warna Tandukan',
     'info'                      => 'Tetapan ini membenarkan anda menyesuaikan sesetengah aspek pemasangan anda.',
-    'label_logo'                => 'Logo Label',
     'label_logo_size'           => 'Logo segi empat sama kelihatan terbaik - akan dipaparkan di bahagian atas sebelah kanan setiap label aset. ',
     'laravel'                   => 'Versi Laravel',
     'ldap'                      => 'LDAP',
@@ -94,7 +97,7 @@ return [
     'ldap_login_sync_help'      => 'Ini hanya ujian bahawa LDAP boleh diselaraskan dengan betul. Jika pertanyaan Pengesahan LDAP anda tidak betul, pengguna mungkin masih tidak boleh log masuk. ANDA MESTI SIMPAN KONFIGURASI LDAP TERKINI DAHULU.',
     'ldap_manager'              => 'LDAP Manager',
     'ldap_server'               => 'Pelayan LDAP',
-    'ldap_server_help'          => 'Ini harus bermula dengan ldap: // (untuk tidak disulitkan atau TLS) atau ldaps: // (untuk SSL)',
+    'ldap_server_help'          => 'This should start with ldap:// (for unencrypted) or ldaps:// (for TLS or SSL)',
     'ldap_server_cert'			=> 'Pengesahan sijil LDAP SSL',
     'ldap_server_cert_ignore'	=> 'Benarkan Sijil SSL yang tidak sah',
     'ldap_server_cert_help'		=> 'Pilih kotak semak ini jika anda menggunakan sijil SSL yang ditandatangani sendiri dan ingin menerima sijil SSL yang tidak sah.',
@@ -108,8 +111,8 @@ return [
     'ldap_pword'                => 'LDAP Bind Password',
     'ldap_basedn'               => 'Pangkalan Bind DN',
     'ldap_filter'               => 'Penapis LDAP',
-    'ldap_pw_sync'              => 'Sinkron Kata Laluan LDAP',
-    'ldap_pw_sync_help'         => 'Nyahtandai kotak ini jika anda tidak mahu menyimpan kata laluan LDAP diselaraskan dengan kata laluan tempatan. Melumpuhkan ini bermakna pengguna anda mungkin tidak dapat melog masuk jika pelayan LDAP anda tidak dapat dicapai kerana sebab tertentu.',
+    'ldap_pw_sync'              => 'Cache LDAP Passwords',
+    'ldap_pw_sync_help'         => 'Uncheck this box if you do not wish to keep LDAP passwords cached as local hashed passwords. Disabling this means that your users may not be able to login if your LDAP server is unreachable for some reason.',
     'ldap_username_field'       => 'Medan Nama Pengguna',
     'ldap_lname_field'          => 'Nama terakhir',
     'ldap_fname_field'          => 'Nama Pertama LDAP',
@@ -117,13 +120,15 @@ return [
     'ldap_version'              => 'Versi LDAP',
     'ldap_active_flag'          => 'Bendera Aktif LDAP',
     'ldap_activated_flag_help'  => 'This value is used to determine whether a synced user can login to Snipe-IT. <strong>It does not affect the ability to check items in or out to them</strong>, and should be the <strong>attribute name</strong> within your AD/LDAP, <strong>not the value</strong>. <br><br>If this field is set to a field name that does not exist in your AD/LDAP, or the value in the AD/LDAP field is set to <code>0</code> or <code>false</code>, <strong>user login will be disabled</strong>. If the value in the AD/LDAP field is set to <code>1</code> or <code>true</code> or <em>any other text</em> means the user can log in. When the field is blank in your AD, we respect the <code>userAccountControl</code> attribute, which usually allows non-suspended users to log in.',
+    'ldap_invert_active_flag'   => 'LDAP Invert Active Flag',
+    'ldap_invert_active_flag_help'     => 'If enabled: when the value returned by LDAP Active Flag is <code>0</code> or <code>false</code> the user account will be active.',
     'ldap_emp_num'              => 'Nombor Kakitangan LDAP',
     'ldap_email'                => 'E-mel LDAP',
     'ldap_test'                 => 'Test LDAP',
     'ldap_test_sync'            => 'Test LDAP Synchronization',
     'license'                   => 'Lesen Perisian',
-    'load_remote'               => 'Use Gravatar',
-    'load_remote_help_text'		=> 'Uncheck this box if your install cannot load scripts from the outside internet. This will prevent Snipe-IT from trying load images from Gravatar.',
+    'load_remote'               => 'Load Remote Avatars',
+    'load_remote_help_text'		=> 'Uncheck this box if your install cannot load scripts from the outside internet. This will prevent Snipe-IT from trying load avatars from Gravatar or other outside sources.',
     'login'                     => 'Login Attempts',
     'login_attempt'             => 'Login Attempt',
     'login_ip'                  => 'IP Address',
@@ -131,6 +136,7 @@ return [
     'login_user_agent'          => 'User Agent',
     'login_help'                => 'List of attempted logins',
     'login_note'                => 'Nota Masuk',
+    'login_note_placeholder'            => "If you do not have a login or have found a device belonging to this company, please call technical support at 888-555-1212. Thank you.",
     'login_note_help'           => 'Opsyenal termasuk beberapa ayat pada skrin log masuk anda, contohnya untuk membantu orang yang telah menemui peranti yang hilang atau dicuri. Medan ini menerima markah <a href="https://help.github.com/articles/github-flavored-markdown/">Github markdown</a>',
     'login_remote_user_text'    => 'Pilihan log masuk Pengguna Jarak Jauh',
     'login_remote_user_enabled_text' => 'Dayakan Log Masuk dengan Pengepala Pengguna Jarak Jauh',
@@ -146,13 +152,16 @@ return [
     'logo_print_assets_help'    => 'Gunakan penjenamaan pada senarai aset boleh cetak ',
     'full_multiple_companies_support_help_text' => 'Membataskan pengguna (termasuk pentadbir) yang diberikan kepada syarikat kepada aset syarikat mereka.',
     'full_multiple_companies_support_text' => 'Sokongan Syarikat Pelbagai Penuh',
+    'scope_locations_fmcs_support_text'  => 'Scope Locations with Full Multiple Companies Support',
+    'scope_locations_fmcs_support_help_text'  => 'Restrict locations to their selected company.',
+    'scope_locations_fmcs_check_button' => 'Check Compatibility',
+    'scope_locations_fmcs_support_disabled_text'  => 'This option is disabled because you have conflicting locations set for :count or more items.',
     'show_in_model_list'   => 'Tunjukkan dalam Model Dropdown',
     'optional'					=> 'pilihan',
     'per_page'                  => 'Senarai Setiap Mukasurat',
     'php'                       => 'Versi PHP',
-    'php_info'                  => 'PHP Info',
+    'php_info'                  => 'PHP info',
     'php_overview'              => 'PHP',
-    'php_overview_keywords'     => 'phpinfo, system, info',
     'php_overview_help'         => 'PHP System info',
     'php_gd_info'               => 'Anda mesti pasangkan php-gd untuk paparkan kod QR, lihat arahan pemasangan.',
     'php_gd_warning'            => 'Pemproses imej PHP dan \'plugin\' GD TIDAK dipasang.',
@@ -218,6 +227,8 @@ return [
     'webhook_integration_help'    => ':app integration is optional, however the endpoint and channel are required if you wish to use it. To configure :app integration, you must first <a href=":webhook_link" target="_new" rel="noopener">create an incoming webhook</a> on your :app account. Click on the <strong>Test :app Integration</strong> button to confirm your settings are correct before saving. ',
     'webhook_integration_help_button'    => 'Once you have saved your :app information, a test button will appear.',
     'webhook_test_help'           => 'Test whether your :app integration is configured correctly. YOU MUST SAVE YOUR UPDATED :app SETTINGS FIRST.',
+    'shortcuts_enabled'         => 'Enable Shortcuts',
+    'shortcuts_help_text'       => '<strong>Windows</strong>: Alt + Access key, <strong>Mac</strong>: Control + Option + Access key',
     'snipe_version'  			=> 'Versi Snipe-IT',
     'support_footer'            => 'Support Footer Links ',
     'support_footer_help'       => 'Specify who sees the links to the Snipe-IT Support info and Users Manual',
@@ -227,7 +238,6 @@ return [
     'update'                    => 'Kemaskini Tetapan',
     'value'                     => 'Nilai',
     'brand'                     => 'Penjenamaan',
-    'brand_keywords'            => 'footer, logo, print, theme, skin, header, colors, color, css',
     'brand_help'                => 'Logo, Site Name',
     'web_brand'                 => 'Web Branding Type',
     'about_settings_title'      => 'Mengenai Tetapan',
@@ -276,6 +286,8 @@ return [
     'two_factor_enrollment_text'	=> "Dua faktor pengesahan diperlukan, namun peranti anda belum lagi mendaftar. Buka apl Google Authenticator anda dan imbas kod QR di bawah untuk mendaftarkan peranti anda. Sebaik sahaja anda telah mendaftarkan peranti anda, masukkan kod di bawah",
     'require_accept_signature'      => 'Memerlukan Tandatangan',
     'require_accept_signature_help_text'      => 'Mengaktifkan ciri ini akan menghendaki pengguna menandatangani secara fizikal apabila menerima aset.',
+    'require_checkinout_notes'  => 'Require Notes on Checkin/Checkout',
+    'require_checkinout_notes_help_text'    => 'Enabling this feature will require the note fields to be populated when checking in or checking out an asset.',
     'left'        => 'dibiarkan',
     'right'        => 'betul',
     'top'        => 'atas',
@@ -313,24 +325,24 @@ return [
     'filter_by_keyword' => 'Filter by setting keyword',
     'security' => 'Security',
     'security_title' => 'Update Security Settings',
-    'security_keywords' => 'password, passwords, requirements, two factor, two-factor, common passwords, remote login, logout, authentication',
     'security_help' => 'Two-factor, Password Restrictions',
-    'groups_keywords' => 'permissions, permission groups, authorization',
     'groups_help' => 'Account permission groups',
     'localization' => 'Localization',
     'localization_title' => 'Update Localization Settings',
-    'localization_keywords' => 'localization, currency, local, locale, time zone, timezone, international, internatinalization, language, languages, translation',
     'localization_help' => 'Language, date display',
     'notifications' => 'Notifications',
     'notifications_help' => 'Email Alerts & Audit Settings',
     'asset_tags_help' => 'Incrementing and prefixes',
     'labels' => 'Labels',
     'labels_title' => 'Update Label Settings',
-    'labels_help' => 'Label sizes &amp; settings',
-    'purge_keywords' => 'permanently delete',
+    'labels_help' => 'Barcodes &amp; label settings',
     'purge_help' => 'Rekod Menghapuskan Rekod',
     'ldap_extension_warning' => 'It does not look like the LDAP extension is installed or enabled on this server. You can still save your settings, but you will need to enable the LDAP extension for PHP before LDAP syncing or login will work.',
     'ldap_ad' => 'LDAP/AD',
+    'ldap_test_label' => 'Test LDAP Sync',
+    'ldap_test_login' => ' Test LDAP Login',
+    'ldap_username_placeholder' => 'LDAP Username',
+    'ldap_password_placeholder' => 'LDAP Password',
     'employee_number' => 'Employee Number',
     'create_admin_user' => 'Create a User ::',
     'create_admin_success' => 'Success! Your admin user has been added!',
@@ -342,6 +354,8 @@ return [
     'setup_migration_create_user' => 'Next: Create User',
     'ldap_settings_link' => 'LDAP Settings Page',
     'slack_test' => 'Test <i class="fab fa-slack"></i> Integration',
+    'status_label_name' => 'Status Label Name',
+    'super_admin_only'  => 'Super Admin Only',
     'label2_enable'           => 'New Label Engine',
     'label2_enable_help'      => 'Switch to the new label engine. <b>Note: You will need to save this setting before setting others.</b>',
     'label2_template'         => 'Template',
@@ -356,12 +370,15 @@ return [
     'label2_2d_type'          => 'Jenis Barcode 2D',
     'label2_2d_type_help'     => 'Format for 2D barcodes',
     'label2_2d_target'        => '2D Barcode Target',
-    'label2_2d_target_help'   => 'The URL the 2D barcode points to when scanned',
+    'label2_2d_target_help'   => 'The data that will be contained in the 2D barcode',
     'label2_fields'           => 'Field Definitions',
     'label2_fields_help'      => 'Fields can be added, removed, and reordered in the left column. For each field, multiple options for Label and DataSource can be added, removed, and reordered in the right column.',
+    'purge_barcodes' => 'Purge Barcodes',
     'help_asterisk_bold'    => 'Text entered as <code>**text**</code> will be displayed as bold',
     'help_blank_to_use'     => 'Leave blank to use the value from <code>:setting_name</code>',
     'help_default_will_use' => '<code>:default</code> will use the value from <code>:setting_name</code>. <br>Note that the value of the barcodes must comply with the respective barcode spec in order to be successfully generated. Please see <a href="https://snipe-it.readme.io/docs/barcodes">the documentation <i class="fa fa-external-link"></i></a> for more details. ',
+    'asset_id'              => 'Asset ID',
+    'data'               => 'Data',
     'default'               => 'Default',
     'none'                  => 'None',
     'google_callback_help' => 'This should be entered as the callback URL in your Google OAuth app settings in your organization&apos;s <strong><a href="https://console.cloud.google.com/" target="_blank">Google developer console <i class="fa fa-external-link" aria-hidden="true"></i></a></strong>.',
@@ -373,7 +390,100 @@ return [
     'database_driver' => 'Database Driver',
     'bs_table_storage' => 'Table Storage',
     'timezone' => 'Timezone',
+    'test_mail' => 'Test Mail',
     'profile_edit'          => 'Edit Profile',
     'profile_edit_help'          => 'Allow users to edit their own profiles.',
+    'default_avatar' => 'Custom Default Avatar',
+    'default_avatar_help' => 'This image will be displayed as a profile if a user does not have a profile photo.',
+    'restore_default_avatar' => 'Restore <a href=":default_avatar" data-toggle="lightbox" data-type="image">original system default avatar</a>',
+    'restore_default_avatar_help' => '',
+    'due_checkin_days' => 'Due For Checkin Warning',
+    'due_checkin_days_help' => 'How many days before the expected checkin of an asset should it be listed in the "Due for checkin" page?',
+    'no_groups' => 'No groups have been created yet. Visit <code>Admin Settings > Permission Groups</code> to add one.',
+    'text' => 'Text',
+
+    'username_formats' => [
+        'username_format'		=> 'Format Nama Pengguna',
+        'firstname_lastname_format'	=> 'Nama Akhir Nama Pertama (jane.smith)',
+        'first_name_format'	        => 'First Name (jane)',
+        'last_name_format'		=> 'Last Name (doe)',
+        'filastname_format'			=> 'First Initial Last Name (jsmith)',
+        'lastnamefirstinitial_format' =>  'Last Name First Initial (smithj)',
+        'firstname_lastname_underscore_format' => 'First Name Last Name (jane_smith)',
+        'firstinitial.lastname' => 'First Initial Last Name (j.smith)',
+        'lastname_firstinitial' => 'Last Name First Initial (smith_j)',
+        'lastname_dot_firstinitial_format' => 'Last Name First Initial (smith.j)',
+        'firstnamelastname'     => 'First Name Last Name (janesmith)',
+        'firstnamelastinitial'  => 'First Name Last Initial (janes)',
+        'lastnamefirstname'      => 'Last Name.First Name (smith.jane)',
+    ],
+
+    'email_formats' => [
+        'email_format'			=> 'Format E-mel',
+        'firstname_lastname_format'	=> 'Nama Akhir Nama Pertama (jane.smith@example.com)',
+        'first_name_format'		=> 'Nama Pertama (jane@example.com)',
+        'last_name_format'		=> 'Last Name (doe@example.com)',
+        'filastname_format'			=> 'Nama Akhir Permulaan Pertama (jsmith@example.com)',
+        'lastnamefirstinitial_format' =>  'Last Name First Initial (smithj@example.com)',
+        'firstname_lastname_underscore_format' => 'Nama Pertama Nama Akhir (jane_smith@example.com)',
+        'firstinitial.lastname' => 'First Initial Last Name (j.smith@example.com)',
+        'lastname_firstinitial' => 'Last Name First Initial (smith_j@example.com)',
+        'lastname_dot_firstinitial_format' => 'Last Name First Initial (smith.j@example.com)',
+        'firstnamelastname'     => 'First Name Last Name (janesmith@example.com)',
+        'firstnamelastinitial'  => 'First Name Last Initial (janes@example.com)',
+        'lastnamefirstname'      => 'Last Name.First Name (smith.jane@example.com)',
+    ],
+
+
+
+    'logo_labels' => [
+        'acceptance_pdf_logo'       => 'PDF Logo',
+        'email_logo'                => 'Logo E-Mel',
+        'label_logo'                => 'Logo Label',
+        'logo'                      => 'Site Logo',
+        'favicon'                   => 'Favicon',
+    ],
+
+    'logo_help' => [
+        'email_logo_size'       => 'Logo segi empat sama dalam e-mel kelihatan terbaik. ',
+    ],
+
+    'logo_option_types' => [
+        'text' => 'Text',
+        'logo' => 'Logo',
+        'logo_and_text' => 'Logo and Text',
+    ],
+
+
+    'legends' => [
+        'scoping' => 'Scoping',
+        'formats' => 'Default Formats',
+        'profiles' => 'User Profiles',
+        'eula' => 'EULA & Acceptance Preferences',
+        'misc_display' => 'Miscellaneous Display Options',
+        'email' => 'Email Preferences',
+        'checkin' => 'Checkin Preferences',
+        'dashboard' => 'Login & Dashboard Preferences',
+        'misc' => 'Miscellaneous',
+        'logos' => 'Logos & Display',
+        'colors' => 'Colors & Skins',
+        'footer' => 'Footer Preferences',
+        'security' => 'Security Preferences',
+        'general' => 'General',
+        'intervals' => 'Intervals & Thresholds',
+    ],
+
+
+    /* Keywords for settings overview help */
+    'keywords' => [
+        'brand'             => 'footer, logo, print, theme, skin, header, colors, color, css',
+        'general_settings'  => 'company support, signature, acceptance, email format, username format, images, per page, thumbnail, eula, gravatar, tos, dashboard, privacy',
+        'groups'            => 'permissions, permission groups, authorization',
+        'labels'            => 'labels, barcodes, barcode, sheets, print, upc, qr, 1d, 2d',
+        'localization'      => 'localization, currency, local, locale, time zone, timezone, international, internatinalization, language, languages, translation',
+        'php_overview'      => 'phpinfo, system, info',
+        'purge'             => 'permanently delete',
+        'security'          => 'password, passwords, requirements, two factor, two-factor, common passwords, remote login, logout, authentication',
+    ],
 
 ];
diff --git a/resources/lang/ms-MY/admin/settings/message.php b/resources/lang/ms-MY/admin/settings/message.php
index 43368b6313..43e7f952cb 100644
--- a/resources/lang/ms-MY/admin/settings/message.php
+++ b/resources/lang/ms-MY/admin/settings/message.php
@@ -14,6 +14,9 @@ return [
         'restore_warning'       => 'Yes, restore it. I acknowledge that this will overwrite any existing data currently in the database. This will also log out all of your existing users (including you).',
         'restore_confirm'       => 'Are you sure you wish to restore your database from :filename?'
     ],
+    'restore' => [
+        'success'               => 'Your system backup has been restored. Please log in again.'
+    ],
     'purge' => [
         'error'     => 'Ralat telah berlaku semasa pembersihan.',
         'validation_failed'     => 'Pengesahan pembersihan anda tidak betul. Sila taip perkataan "DELETE" dalam kotak pengesahan.',
@@ -33,6 +36,9 @@ return [
         'testing_authentication' => 'Testing LDAP Authentication...',
         'authentication_success' => 'User authenticated against LDAP successfully!'
     ],
+    'labels' => [
+        'null_template' => 'Label template not found. Please select a template.',
+        ],
     'webhook' => [
         'sending' => 'Sending :app test message...',
         'success' => 'Your :webhook_name Integration works!',
@@ -42,5 +48,12 @@ return [
         'error' => 'Something went wrong. :app responded with: :error_message',
         'error_redirect' => 'ERROR: 301/302 :endpoint returns a redirect. For security reasons, we don’t follow redirects. Please use the actual endpoint.',
         'error_misc' => 'Something went wrong. :( ',
-    ]
+        'webhook_fail' => ' webhook notification failed: Check to make sure the URL is still valid.',
+        'webhook_channel_not_found' => ' webhook channel not found.',
+        'ms_teams_deprecation' => 'The selected Microsoft Teams webhook URL will be deprecated Dec 31st, 2025. Please use a workflow URL. Microsoft\'s documentation on creating a workflow can be found <a href="https://support.microsoft.com/en-us/office/create-incoming-webhooks-with-workflows-for-microsoft-teams-8ae491c7-0394-4861-ba59-055e33f75498" target="_blank"> here.</a>',
+    ],
+    'location_scoping' => [
+        'not_saved' => 'Your settings were not saved.',
+        'mismatch' => 'There is 1 item in the database that need your attention before you can enable location scoping.|There are :count items in the database that need your attention before you can enable location scoping.',
+    ],
 ];
diff --git a/resources/lang/ms-MY/admin/statuslabels/table.php b/resources/lang/ms-MY/admin/statuslabels/table.php
index 5a23ce5243..b8035b3d90 100644
--- a/resources/lang/ms-MY/admin/statuslabels/table.php
+++ b/resources/lang/ms-MY/admin/statuslabels/table.php
@@ -1,14 +1,14 @@
 <?php
 
 return array(
-    'about'      	=> 'Mengenai Label Status',
+    'about'      	=> 'About Status Types',
     'archived'      	=> 'Diarkibkan',
     'create'      	=> 'Cipata Label Status',
     'color'      	=> 'Warna Carta',
     'default_label' => 'Label Asal',
     'default_label_help' => 'Ini digunakan untuk memastikan label status yang paling biasa anda gunakan muncul di bahagian atas kotak pilihan semasa membuat/mengedit aset.',
     'deployable'      	=> 'Deployable',
-    'info'      	=> 'Label status digunakan untuk menggambarkan pelbagai negeri aset anda boleh masuk. Mereka mungkin keluar untuk dibaiki, hilang / dicuri, dan lain-lain. Anda boleh membuat label status baru untuk aset yang boleh ditugaskan, tertunda dan diarkibkan.',
+    'info'      	=> 'Status label types are used to describe the various states your assets could be in. They may be out for repair, lost/stolen, etc. You can create new status labels for your deployable, pending and archived assets according to your own workflow. For more information, <a href="https://snipe-it.readme.io/docs/overview#status-labels" target="_blank">see the documentation <i class="fa fa-external-link"></i></a>.',
     'name'      	=> 'Nama Status',
     'pending'      	=> 'Menunggu',
     'status_type'   => 'Jenis Status',
diff --git a/resources/lang/ms-MY/admin/users/general.php b/resources/lang/ms-MY/admin/users/general.php
index 67539888fd..fc0f3b5bba 100644
--- a/resources/lang/ms-MY/admin/users/general.php
+++ b/resources/lang/ms-MY/admin/users/general.php
@@ -19,6 +19,8 @@ return [
     'print_assigned'    => 'Cetak Semua yang Diperuntukkan',
     'email_assigned'    => 'Email List of All Assigned',
     'user_notified'     => 'User has been emailed a list of their currently assigned items.',
+    'users_notified'    => 'The user has been emailed a list of their currently assigned items.|:count users have been emailed a list of their currently assigned items.',
+    'users_notified_warning' => ':count user has been emailed a list of their currently assigned items, however :no_email users did not have an email address so could not be emailed.|:count users have been emailed a list of their currently assigned items, however :no_email user(s) did not have an email address so could not be emailed.',
     'auto_assign_label' => 'Include this user when auto-assigning eligible licenses',
     'auto_assign_help'  => 'Skip this user in auto assignment of licenses',
     'software_user'     => 'Perisian diagihkan kepada :nama',
diff --git a/resources/lang/ms-MY/admin/users/message.php b/resources/lang/ms-MY/admin/users/message.php
index 893f110b21..26d7e62144 100644
--- a/resources/lang/ms-MY/admin/users/message.php
+++ b/resources/lang/ms-MY/admin/users/message.php
@@ -6,7 +6,7 @@ return array(
     'declined'                  => 'Anda telah berjaya menolak aset ini.',
     'bulk_manager_warn'	        => 'Pengguna anda telah berjaya dikemas kini, namun entri pengurus anda tidak disimpan kerana pengurus yang anda pilih juga dalam senarai pengguna untuk diedit, dan pengguna mungkin bukan pengurus mereka sendiri. Sila pilih pengguna anda sekali lagi, tidak termasuk pengurus.',
     'user_exists'               => 'Pengguna telah wujud!',
-    'user_not_found'            => 'Pengguna tidak wujud.',
+    'user_not_found'            => 'User does not exist or you do not have permission view them.',
     'user_login_required'       => 'Ruangan log masuk diperlukan',
     'user_has_no_assets_assigned' => 'No assets currently assigned to user.',
     'user_password_required'    => 'Ruangan kata kunci diperlukan.',
@@ -53,6 +53,7 @@ return array(
         'ldap_could_not_search' => 'Tidak dapat mencari pelayan LDAP. Sila periksa konfigurasi pelayan LDAP anda dalam fail konfigurasi LDAP. <br>Error dari LDAP Server:',
         'ldap_could_not_get_entries' => 'Tidak dapat masuk dari pelayan LDAP. Sila periksa konfigurasi pelayan LDAP anda dalam fail konfigurasi LDAP. <br>Error dari LDAP Server:',
         'password_ldap' => 'Kata laluan untuk akaun ini diuruskan oleh LDAP / Active Directory. Sila hubungi jabatan IT anda untuk menukar kata laluan anda.',
+        'multi_company_items_assigned' => 'This user has items assigned that belong to a different company. Please check them in or edit their company.'
     ),
 
     'deletefile' => array(
diff --git a/resources/lang/ms-MY/admin/users/table.php b/resources/lang/ms-MY/admin/users/table.php
index 86fbaac0ea..3693bbf164 100644
--- a/resources/lang/ms-MY/admin/users/table.php
+++ b/resources/lang/ms-MY/admin/users/table.php
@@ -22,7 +22,7 @@ return array(
     'managed_locations'     => 'Lokasi Terurus',
     'managed_users'         => 'Managed Users',
     'name' 					=> 'Nama',
-    'nogroup'               => 'No groups have been created yet. To add one, visit: ',
+    'nogroup'               => 'No groups have been created yet. To add one, visit:',
     'notes'                 => 'Nota',
     'password_confirm' 		=> 'Sahkan kata laluan',
     'password' 				=> 'Kata Laluan',
diff --git a/resources/lang/ms-MY/auth.php b/resources/lang/ms-MY/auth.php
index db310aa1bb..14d8acfce0 100644
--- a/resources/lang/ms-MY/auth.php
+++ b/resources/lang/ms-MY/auth.php
@@ -15,6 +15,6 @@ return array(
 
     'failed' => 'These credentials do not match our records.',
     'password' => 'The provided password is incorrect.',
-    'throttle' => 'Too many login attempts. Please try again in :seconds seconds.',
+    'throttle' => 'Too many login attempts. Please try again in :minutes minute(s).',
 
 );
diff --git a/resources/lang/ms-MY/auth/message.php b/resources/lang/ms-MY/auth/message.php
index 4efe284a4a..9058e30554 100644
--- a/resources/lang/ms-MY/auth/message.php
+++ b/resources/lang/ms-MY/auth/message.php
@@ -6,8 +6,6 @@ return array(
     'account_not_found'      => 'Nama pengguna atau kata laluan tidak betul.',
     'account_not_activated'  => 'Akaun pengguna ini tidak aktif. ',
     'account_suspended'      => 'Akaun pengguna ini digantung.',
-    'account_banned'         => 'Akaun pengguna ini di sekat.',
-    'throttle'               => 'Too many failed login attempts. Please try again in :minutes minutes.',
 
     'two_factor' => array(
         'already_enrolled'      => 'Your device is already enrolled.',
diff --git a/resources/lang/ms-MY/button.php b/resources/lang/ms-MY/button.php
index ce639259ef..73737614d7 100644
--- a/resources/lang/ms-MY/button.php
+++ b/resources/lang/ms-MY/button.php
@@ -7,6 +7,7 @@ return [
     'checkin_and_delete'  	    => 'Checkin All / Delete User',
     'delete'  	                => 'Hapuskan',
     'edit'    	                => 'Kemaskini',
+    'clone'    	                => 'Clone',
     'restore' 	                => 'Masukkan Semula',
     'remove'                    => 'Remove',
     'request'                   => 'Permintaan',
@@ -21,4 +22,13 @@ return [
     'add_maintenance'           => 'Add Maintenance',
     'append'                    => 'Append',
     'new'                       => 'Baru',
+    'var' => [
+        'clone'     => 'Clone :item_type',
+        'edit'      => 'Edit :item_type',
+        'delete'    => 'Delete :item_type',
+        'restore'   => 'Restore :item_type',
+        'create'    => 'Create New :item_type',
+        'checkout'  => 'Checkout :item_type',
+        'checkin'   => 'Checkin :item_type',
+    ]
 ];
diff --git a/resources/lang/ms-MY/general.php b/resources/lang/ms-MY/general.php
index 90cf800915..367001876c 100644
--- a/resources/lang/ms-MY/general.php
+++ b/resources/lang/ms-MY/general.php
@@ -10,26 +10,29 @@ return [
     'action'                => 'Tindakan',
     'activity_report'		=> 'Laporan Aktiviti',
     'address'				=> 'Alamat',
-    'admin'					=> 'Pentadbir',
+    'admin'					=> 'Admin Settings',
     'admin_tooltip'			=> 'This user has admin privileges',
     'superuser'				=> 'Superuser',
     'superuser_tooltip'		=> 'This user has superuser privileges',
     'administrator'			=> 'Pentadbir',
     'add_seats'             => 'Menambah kerusi',
-    'age'                   => "Age",
+    'age'                   => "Umur",
     'all_assets'			=> 'Semua Harta',
     'all'       			=> 'Semua',
     'archived'              => 'Diarkibkan',
     'asset_models'			=> 'Model Harta',
     'asset_model'			=> 'Model',
     'asset'					=> 'Harta',
+    'asset_previous'        => 'Asset (Previously Assigned)',
     'asset_report'          => 'Laporan Harta',
     'asset_tag'				=> 'Tag Harta',
-    'asset_tags'            => 'Asset Tags',
+    'asset_tags'            => 'Tag Aset:',
     'assets_available'		=> 'Assets available',
     'accept_assets'         => 'Accept Assets :name',
     'accept_assets_menu'    => 'Accept Assets',
+    'accept_item'           => 'terima barang',
     'audit'				    => 'Audit',
+    'audits'				=> 'Audits',
     'audit_report'			=> 'Log Audit',
     'assets'				=> 'Harta',
     'assets_audited'        => 'assets audited',
@@ -47,7 +50,7 @@ return [
     'bulkaudit_status'      => 'Status Audit',
     'bulk_checkout'  		=> 'Checkout Pukal',
     'bulk_edit'             => 'Bulk Edit',
-    'bulk_delete'           => 'Bulk Delete',
+    'bulk_delete'           => 'Padam Pukal',
     'bulk_actions'          => 'Bulk Actions',
     'bulk_checkin_delete'   => 'Bulk Checkin / Delete Users',
     'byod'                  => 'BYOD',
@@ -61,9 +64,12 @@ return [
     'changepassword'  		=> 'Tukar kata laluan',
     'checkin'  				=> 'Terima',
     'checkin_from'  		=> 'Semak dari',
+    'checkin_note'  		=> 'Checkin Note',
+    'checkout_note'  		=> 'Checkout Note',
     'checkout'  			=> 'Agihkan',
     'checkouts_count'       => 'Semak Keluar',
     'checkins_count'        => 'Semak masuk',
+    'checkin_and_delete'  	=> 'Checkin and Delete',
     'user_requests_count'   => 'Permintaan',
     'city'  				=> 'Bandar',
     'click_here'			=> 'Tekan di sini',
@@ -76,21 +82,23 @@ return [
     'consumable'			=> 'Boleh makan',
     'consumables'			=> 'Makanan yang boleh dimakan',
     'country'  				=> 'Negara',
-    'could_not_restore'     => 'Error restoring :item_type: :error',
-    'not_deleted'           => 'The :item_type is not deleted so it cannot be restored',
+    'could_not_restore'     => 'kesalahan memasukkan : jenis_item : salah',
+    'not_deleted'           => 'The :item_type was not deleted and therefore cannot be restored',
     'create'				=> 'Cipta Baru',
     'created'               => 'Perkara yang Dibuat',
     'created_asset'			=> 'cipta harta',
-    'created_at' 			=> 'Created At',
+    'created_at' 			=> 'dicipta pada',
     'created_by'            => 'Created By',
-    'record_created' 		=> 'Record Created',
+    'record_created' 		=> 'Rekod dicipta',
     'updated_at' 			=> 'Dikemaskini di',
     'currency'  			=> 'RM', // this is deprecated
+    'currency_text'  		=> 'Currency', //
     'current'  				=> 'Semasa',
-    'current_password'      => 'Current Password',
+    'current_password'      => 'kata laluan semasa',
     'customize_report'      => 'Customize Report',
     'custom_report'         => 'Laporan Harta Pilihan',
     'dashboard'				=> 'Papan Pemuka',
+    'data_source'           => 'Data Source',
     'days'      			=> 'hari',
     'days_to_next_audit'    => 'Hari ke Audit Seterusnya',
     'date'					=> 'Tarikh',
@@ -98,7 +106,7 @@ return [
     'debug_warning_text'    => 'Aplikasi ini berjalan dalam mod pengeluaran dengan debug membolehkan. Ini boleh mendedahkan data sensitif jika aplikasi anda boleh diakses oleh dunia luar. Lumpuhkan mod debug dengan menetapkan <code>APP_DEBUG</code> nilai dalam fail <code>.env</code> anda ke <code>false</code>.',
     'delete'  				=> 'Hapuskan',
     'delete_confirm'  		=> 'Adakah anda pasti ingin memadamkan :item?',
-    'delete_confirm_no_undo' => 'Are you sure you wish to delete :item? This can not be undone.',
+    'delete_confirm_no_undo' => 'adakah anda pasti, untuk memadam barang? Tindakan ini tidak dapat diperbetulkan lagi',
     'deleted'  				=> 'Dihapuskan',
     'delete_seats'  		=> 'Kerusi dipadamkan',
     'deletion_failed'       => 'Deletion failed',
@@ -114,37 +122,21 @@ return [
     'editprofile'  			=> 'Kemaskini Profail Anda',
     'eol'					=> 'EOL',
     'email_domain'			=> 'Domain E-mel',
-    'email_format'			=> 'Format E-mel',
     'employee_number'       => 'Employee Number',
     'email_domain_help'		=> 'Ini digunakan untuk menjana alamat e-mel semasa mengimport',
     'error'				    => 'Error',
     'exclude_archived'      => 'Exclude Archived Assets',
     'exclude_deleted'       => 'Exclude Deleted Assets',
     'example'				=> 'Example: ',
-    'filastname_format'			=> 'Nama Akhir Permulaan Pertama (jsmith@example.com)',
-    'firstname_lastname_format'	=> 'Nama Akhir Nama Pertama (jane.smith@example.com)',
-    'firstname_lastname_underscore_format' => 'Nama Pertama Nama Akhir (jane_smith@example.com)',
-    'lastnamefirstinitial_format' =>  'Last Name First Initial (smithj@example.com)',
-    'firstintial_dot_lastname_format' => 'First Initial Last Name (j.smith@example.com)',
-    'firstname_lastname_display'	=> 'First Name Last Name (Jane Smith)',
-    'lastname_firstname_display'	=> 'Last Name First Name (Smith Jane)',
-    'name_display_format'	=> 'Name Display Format',
-    'first'					=> 'Pertama',
-    'firstnamelastname'     => 'First Name Last Name (janesmith@example.com)',
-    'lastname_firstinitial' => 'Last Name First Initial (smith_j@example.com)',
-    'firstinitial.lastname' => 'First Initial Last Name (j.smith@example.com)',
-    'firstnamelastinitial'  => 'First Name Last Initial (janes@example.com)',
-    'lastnamefirstname'      => 'Last Name First Name (smith.jane@example.com)',
-    'first_name'			=> 'Nama pertama',
-    'first_name_format'		=> 'Nama Pertama (jane@example.com)',
+
     'files'                 => 'Fail-fail',
     'file_name'				=> 'Fail',
     'file_type'             => 'File Type',
     'filesize'              => 'File Size',
     'file_uploads'			=> 'Muat Naik Fail',
-    'file_upload'           => 'File Upload',
+    'file_upload'           => 'muatnaik fail',
     'generate'				=> 'Laksanakan',
-    'generate_labels'       => 'Generate Labels',
+    'generate_labels'       => 'Hasilkan Backup',
     'github_markdown'      => 'This field accepts <a href="https://help.github.com/articles/github-flavored-markdown/">Github flavored markdown</a>.',
     'groups'				=> 'Kumpulan',
     'gravatar_email'        => 'Alam e-mel gravatar',
@@ -154,11 +146,11 @@ return [
     'id'  					=> 'ID',
     'image'                 => 'Gambar',
     'image_delete'         	=> 'Hapuskan imej',
-    'include_deleted'       => 'Include Deleted Assets',
+    'include_deleted'       => 'Sahkan Pemutihan Aset Pukal',
     'image_upload'         	=> 'Muat naik imej',
-    'filetypes_accepted_help'    => 'Accepted filetype is :types. Max upload size allowed is :size.|Accepted filetypes are :types. Max upload size allowed is :size.',
-    'filetypes_size_help'   => 'Max upload size allowed is :size.',
-    'image_filetypes_help'  => 'Accepted filetypes are jpg, webp, png, gif, svg, and avif. Max upload size allowed is :size.',
+    'filetypes_accepted_help'    => 'Accepted filetype is :types. The maximum size allowed is :size.|Accepted filetypes are :types. The maximum upload size allowed is :size.',
+    'filetypes_size_help'   => 'The maximum upload size allowed is :size.',
+    'image_filetypes_help'  => 'Accepted Filetypes are jpg, webp, png, gif, svg, and avif. The maximum upload size allowed is :size.',
     'unaccepted_image_type'  => 'This image file was not readable. Accepted filetypes are jpg, webp, png, gif, and svg. The mimetype of this file is: :mimetype.',
     'import'         	    => 'Import',
     'import_this_file'      => 'Map fields and process this file',
@@ -178,22 +170,27 @@ return [
     'last'					=> 'Terakhir',
     'last_login'            => 'Log masuk kali terakhir',
     'last_name'             => 'Nama Keluarga',
+    'firstname_lastname_display'	=> 'First Name Last Name (Jane Smith)',
+    'lastname_firstname_display'	=> 'Last Name First Name (Smith Jane)',
+    'name_display_format'	=> 'Name Display Format',
+    'first'					=> 'Pertama',
+    'first_name'			=> 'Nama pertama',
     'license'				=> 'Lesen',
     'license_report'        => 'Laporan Lesen',
     'licenses_available'	=> 'Licenses available',
     'licenses'				=> 'Lesen',
     'list_all'				=> 'Senaraikan Semua',
-    'loading'				=> 'Loading... please wait....',
+    'loading'				=> 'Loading... please wait...',
     'lock_passwords'        => 'This field value will not be saved in a demo installation.',
     'feature_disabled'      => 'Ciri ini telah dilumpuhkan untuk pemasangan demo.',
     'location'              => 'Lokasi',
-    'location_plural'        => 'Location|Locations',
+    'location_plural'        => 'Lokasi',
     'locations'				=> 'Lokasi',
-    'logo_size'				=> 'Square logos look best with Logo + Text. Logo maximum display size is 50px high x 500px wide.  ',
+    'logo_size'				=> '',
     'logout'				=> 'Log keluar',
     'lookup_by_tag'     => 'Cari dengan Tag Aset',
     'maintenances'          => 'Penyelenggaraan',
-    'manage_api_keys'       => 'Manage API Keys',
+    'manage_api_keys'       => 'Manage API keys',
     'manufacturer'			=> 'Pengeluar',
     'manufacturers'			=> 'Pengeluar',
     'markdown'				=> 'Bidang ini membolehkan markah rasa <a href="https://help.github.com/articles/github-flavored-markdown/">Github</a>.',
@@ -203,10 +200,10 @@ return [
     'months'				=> 'Bulan',
     'moreinfo'				=> 'Maklumat tambahan',
     'name'					=> 'Nama',
-    'new_password'          => 'New Password',
+    'new_password'          => 'Kata Laluan Baru',
     'next'					=> 'Seterusnya',
     'next_audit_date'		=> 'Tarikh Audit Seterusnya',
-    'next_audit_date_help'  => 'If you use auditing in your organization, this is usually automatically calculated based on the asset&apos;s last audit date and audit frequency (in <code>Admin Settings &gt; Alerts</code>) and you can leave this blank. You can manually set this date here if you need to, but it must be later than the last audit date. ',
+    'next_audit_date_help'  => '',
     'audit_images_help'     => 'You can find audit images in the asset\'s history tab.',
     'no_email'              => 'No email address associated with this user',
     'last_audit'		    => 'Audit lepas',
@@ -215,6 +212,14 @@ return [
     'no_results'			=> 'Tiada kepututsan.',
     'no'  					=> 'Tidak',
     'notes'  				=> 'Nota',
+    'note_added'            => 'Note Added',
+    'options'				=> 'Options',
+    'preview'				=> 'Preview',
+    'add_note'              => 'Add Note',
+    'note_edited'            => 'Note Edited',
+    'edit_note'              => 'Edit Note',
+    'note_deleted'            => 'Note Deleted',
+    'delete_note'              => 'Delete Note',
     'order_number'          => 'Nombor Pesanan',
     'only_deleted'          => 'Only Deleted Assets',
     'page_menu'				=> 'Menunjukkan _MENU_ item',
@@ -229,7 +234,7 @@ return [
     'purchase_date'         => 'Tarikh Pembelian',
     'qty'		            => 'QTY',
     'quantity'		        => 'Kuantiti',
-    'quantity_minimum'      => 'You have :count items below or almost below minimum quantity levels',
+    'quantity_minimum'      => 'You have one item below or almost below minimum quantity levels|You have :count items below or almost below minimum quantity levels',
     'quickscan_checkin'  	=> 'Quick Scan Checkin',
     'quickscan_checkin_status'  	=> 'Checkin Status',
     'ready_to_deploy'		=> 'Sedia untuk diagihkan',
@@ -254,7 +259,7 @@ return [
     'select_all'            => 'Select All',
     'search'				=> 'Carian',
     'select_category'       => 'Pilih kategori',
-    'select_datasource' => 'Select a Datasource',
+    'select_datasource' => 'Select a data source',
     'select_department'     => 'Pilih Jabatan',
     'select_depreciation'	=> 'Pilih Jenis Susutnilai',
     'select_location'		=> 'Pilih Lokasi',
@@ -274,13 +279,15 @@ return [
     'signed_off_by'         => 'Signed Off By',
     'skin'       			=> 'Kulit',
     'webhook_msg_note'        => 'A notification will be sent via webhook',
-    'webhook_test_msg'        => 'Oh hai! Looks like your :app integration with Snipe-IT is working!',
+    'webhook_test_msg'        => 'Oh hai! It looks like your :app integration with Snipe-IT is working!',
     'some_features_disabled' => 'MODEM DEMO: Sesetengah ciri dilumpuhkan untuk pemasangan ini.',
     'site_name'				=> 'Nama Sesawang',
     'state'  				=> 'Negeri',
     'status_labels'			=> 'Label Status',
+    'status_label'			=> 'Status Label',
     'status'    			=> 'Status',
     'accept_eula'           => 'Acceptance Agreement',
+    'show_or_hide_eulas' => 'Show/Hide EULAs',
     'supplier'              => 'Pembekal',
     'suppliers'  			=> 'Pembekal',
     'sure_to_delete'        => 'Adakah anda pasti ingin memadamkannya',
@@ -296,9 +303,9 @@ return [
     'type'  				=> 'Taipkan',
     'undeployable'			=> 'Tidak Boleh Agih',
     'unknown_admin'			=> 'Pentadbir Tidak Dikenali',
-    'username_format'		=> 'Format Nama Pengguna',
     'username'              => 'Nama Pengguna',
     'update'                => 'Kemas kini',
+    'updating_item' => 'Updating :item',
     'upload_filetypes_help'      => 'Allowed filetypes are png, gif, jpg, jpeg, doc, docx, pdf, xls, xlsx, txt, lic, xml, zip, rtf and rar. Max upload size allowed is :size.',
     'uploaded'              => 'Dimuat naik',
     'user'					=> 'Pengguna',
@@ -323,10 +330,10 @@ return [
     'token_expired'         => 'Sesi borang anda telah tamat tempoh. Sila cuba lagi.',
     'login_enabled'         => 'Login Enabled',
     'audit_due'             => 'Due for Audit',
-    'audit_due_days'        => 'Assets Due for Audit Within :days Day|Assets Due for Audit Within :days Days',
+    'audit_due_days'        => '{}Assets Due or Overdue for Audit|[1]Assets Due or Overdue for Audit Within a Day|[2,*]Assets Due or Overdue for Audit Within :days Days',
     'checkin_due'           => 'Due for Checkin',
     'checkin_overdue'       => 'Overdue for Checkin',
-    'checkin_due_days'      => 'Assets Due for Checkin Within :days Day|Assets Due for Checkin Within :days Days',
+    'checkin_due_days'      => '{}Due for Checkin|[1]Assets Due for Checkin Within :days Day|[2,*]Assets Due for Checkin Within :days Days',
     'audit_overdue'         => 'Overdue for Audit',
     'accept'                => 'Accept :asset',
     'i_accept'              => 'I accept',
@@ -339,16 +346,16 @@ return [
     'view_all'              => 'view all',
     'hide_deleted'          => 'Hide Deleted',
     'email'                 => 'E-mel',
-    'do_not_change'         => 'Do Not Change',
-    'bug_report'            => 'Report a Bug',
+    'do_not_change'         => 'Do not change',
+    'bug_report'            => 'Report a bug',
     'user_manual'           => 'User\'s Manual',
     'setup_step_1'          => 'Step 1',
     'setup_step_2'          => 'Step 2',
     'setup_step_3'          => 'Step 3',
     'setup_step_4'          => 'Step 4',
     'setup_config_check'    => 'Configuration Check',
-    'setup_create_database' => 'Create Database Tables',
-    'setup_create_admin'    => 'Create Admin User',
+    'setup_create_database' => 'Create database tables',
+    'setup_create_admin'    => 'Create an admin user',
     'setup_done'            => 'Finished!',
     'bulk_edit_about_to'    => 'You are about to edit the following: ',
     'checked_out'           => 'Agihan Keluar',
@@ -383,6 +390,8 @@ return [
     'new_license'           => 'New License',
     'new_accessory'         => 'New Accessory',
     'new_consumable'        => 'New Consumable',
+    'new_component'         => 'New Component',
+    'new_user'              => 'New User',
     'collapse'              => 'Collapse',
     'assigned'              => 'Assigned',
     'asset_count'           => 'Asset Count',
@@ -418,19 +427,20 @@ return [
     'bulk_soft_delete'      =>'Also soft-delete these users. Their asset history will remain intact unless/until you purge deleted records in the Admin Settings.',
     'bulk_checkin_delete_success' => 'Your selected users have been deleted and their items have been checked in.',
     'bulk_checkin_success' => 'The items for the selected users have been checked in.',
-    'set_to_null'           => 'Delete values for this asset|Delete values for all :asset_count assets ',
+    'set_to_null'           => 'Delete values for this selection|Delete values for all :selection_count selections ',
     'set_users_field_to_null'  => 'Delete :field values for this user|Delete :field values for all :user_count users ',
     'na_no_purchase_date'   => 'N/A - No purchase date provided',
     'assets_by_status'      => 'Assets by Status',
     'assets_by_status_type'      => 'Assets by Status Type',
     'pie_chart_type'        => 'Dashboard Pie Chart Type',
     'hello_name'            => 'Hello, :name!',
-    'unaccepted_profile_warning'   => 'You have :count items requiring acceptance. Click here to accept or decline them',
+    'unaccepted_profile_warning'   => 'You have one item requiring acceptance. Click here to accept or decline it | You have :count items requiring acceptance. Click here to accept or decline them',
     'start_date'            => 'Start Date',
     'end_date'            => 'End Date',
     'alt_uploaded_image_thumbnail' => 'Uploaded thumbnail',
     'placeholder_kit'       => 'Select a kit',
     'file_not_found'        => 'File not found',
+    'log_record_not_found'  => 'No record for that log entry was found.',
     'preview_not_available' => '(no preview)',
     'setup'                 => 'Setup',
     'pre_flight'            => 'Pre-Flight',
@@ -512,7 +522,7 @@ return [
     'checked_out_to_fields' => 'Checked Out To Fields',
     'percent_complete' => '% lengkap',
     'uploading' => 'Uploading... ',
-    'upload_error' => 'Error uploading file. Please check that there are no empty rows and that no column names are duplicated.',
+    'upload_error' => 'Error uploading file. Please check that you have no empty rows or duplicated column names in your CSV, and that the server permissions allow uploads.',
     'copy_to_clipboard' => 'Copy to Clipboard',
     'copied' => 'Copied!',
     'status_compatibility' => 'If assets are already assigned, they cannot be changed to a non-deployable status type and this value change will be skipped.',
@@ -549,6 +559,71 @@ return [
         'license_seats'  => ':count License Seat|:count License Seats',
         'consumables'  => ':count Consumable|:count Consumables',
         'components'  => ':count Component|:count Components',
-    ]
+    ],
+
+    'more_info' => 'Maklumat tambahan',
+    'quickscan_bulk_help' => 'Checking this box will edit the asset record to reflect this new location. Leaving it unchecked will simply note the location in the audit log. Note that if this asset is checked out, it will not change the location of the person, asset or location it is checked out to.',
+    'whoops' => 'Whoops!',
+    'something_went_wrong' => 'Something went wrong with your request.',
+    'close' => 'Close',
+    'expires' => 'Tamat tempoh',
+    'map_fields'=> 'Map :item_type Fields',
+    'remaining_var' => ':count Remaining',
+    'label' => 'Label',
+    'import_asset_tag_exists' => 'An asset with the asset tag :asset_tag already exists and an update was not requested. No change was made.',
+    'countries_manually_entered_help' => 'Values with an asterisk (*) were manually entered and do not match existing ISO 3166 dropdown values',
+    'accessories_assigned' => 'Assigned Accessories',
+    'user_managed_passwords' => 'Password Management',
+    'user_managed_passwords_disallow' => 'Disallow users from managing their own passwords',
+    'user_managed_passwords_allow' => 'Allow users to manage their own passwords',
+    'from' => 'From',
+    'by' => 'Oleh',
+
+// Add form placeholders here
+    'placeholders' => [
+        'notes'  => 'Add a note',
+    ],
+
+    'breadcrumb_button_actions' => [
+        'edit_item' => 'Edit :name',
+        'checkout_item' => 'Checkout :name',
+        'checkin_item' => 'Checkin :name',
+    ],
+
+    'skins' => [
+        'site_default' => 'Site Default',
+        'default_blue' => 'Default Blue',
+        'blue_dark' => 'Blue (Dark Mode)',
+        'green' => 'Green Dark',
+        'green_dark' => 'Green (Dark Mode)',
+        'red' => 'Red Dark',
+        'red_dark' => 'Red (Dark Mode)',
+        'orange' => 'Orange Dark',
+        'orange_dark' => 'Orange (Dark Mode)',
+        'black' => 'Black',
+        'black_dark' => 'Black (Dark Mode)',
+        'purple' => 'Purple',
+        'purple_dark' => 'Purple (Dark Mode)',
+        'yellow' => 'Yellow',
+        'yellow_dark' => 'Yellow (Dark Mode)',
+        'high_contrast' => 'High Contrast',
+
+    ],
+
+    'select_all_none' => 'Select/Unselect All',
+    'generic_model_not_found' => 'That :model was not found or you do not have permission to access it',
+    'deleted_models' => 'Deleted Asset Models',
+    'deleted_users' => 'Deleted Users',
+    'cost_each' => ':amount each',
+    'remove_current_image' => 'Remove current :type image',
+
+    'seeding' => [
+        'manufacturers' => [
+            'button' => 'Create Manufacturers',
+            'prompt' => 'You do not have any manufacturers yet. Would you like to seed a list of common manufacturers? (THIS WILL OVERWRITE EXISTING MANUFACTURERS, including those that have been soft-deleted.)',
+            'success' => 'Manufacturers seeded successfully',
+            'error' => 'Could not seed manufacturers. A manufacturer record already exists and seeding would overwrite it.|Could not seed manufacturers. :count manufacturer records already exist and seeding would overwrite them.',
+        ],
+    ],
 
 ];
diff --git a/resources/lang/ms-MY/localizations.php b/resources/lang/ms-MY/localizations.php
index f1232dd138..827ed4fca1 100644
--- a/resources/lang/ms-MY/localizations.php
+++ b/resources/lang/ms-MY/localizations.php
@@ -2,7 +2,7 @@
 
 return [
 
-    'select_language' => 'Select a language',
+    'select_language' => 'Select a Language',
     'languages' => [
         'en-US'=> 'English, US',
         'en-GB'=> 'English, UK',
@@ -40,7 +40,9 @@ return [
         'ms-MY'=> 'Malay',
         'mi-NZ'=> 'Maori',
         'mn-MN'=> 'Mongolian',
-        'no-NO'=> 'Norwegian',
+        'nb-NO'=> 'Norwegian Bokmål',
+        'om-ET' => 'Oromo (Ethiopian)',
+        //'nn-NO'=> 'Norwegian Nynorsk',
         'fa-IR'=> 'Persian',
         'pl-PL'=> 'Polish',
         'pt-PT'=> 'Portuguese',
@@ -66,7 +68,7 @@ return [
         'zu-ZA'=> 'Zulu',
     ],
 
-    'select_country' => 'Select a country',
+    'select_country' => 'Select a Country',
     
     'countries' => [
         'AC'=>'Ascension Island',
@@ -133,6 +135,7 @@ return [
         'EC'=>'Ecuador',
         'EE'=>'Estonia',
         'EG'=>'Egypt',
+        'GB-ENG'=>'England',
         'ER'=>'Eritrea',
         'ES'=>'Spain',
         'ET'=>'Ethiopia',
@@ -231,6 +234,7 @@ return [
         'NG'=>'Nigeria',
         'NI'=>'Nicaragua',
         'NL'=>'Netherlands',
+        'GB-NIR' => 'Northern Ireland',
         'NO'=>'Norway',
         'NP'=>'Nepal',
         'NR'=>'Nauru',
@@ -258,7 +262,7 @@ return [
         'RU'=>'Russian Federation',
         'RW'=>'Rwanda',
         'SA'=>'Saudi Arabia',
-        'UK'=>'Scotland',
+        'GB-SCT'=>'Scotland',
         'SB'=>'Solomon Islands',
         'SC'=>'Seychelles',
         'SS'=>'South Sudan',
@@ -310,6 +314,7 @@ return [
         'VI'=>'Virgin Islands (U.S.)',
         'VN'=>'Viet Nam',
         'VU'=>'Vanuatu',
+        'GB-WLS' =>'Wales',
         'WF'=>'Wallis And Futuna Islands',
         'WS'=>'Samoa',
         'YE'=>'Yemen',
diff --git a/resources/lang/ms-MY/mail.php b/resources/lang/ms-MY/mail.php
index d6c9697310..288d372249 100644
--- a/resources/lang/ms-MY/mail.php
+++ b/resources/lang/ms-MY/mail.php
@@ -23,24 +23,25 @@ return [
     'Item_Requested' => 'Item yang diminta',
     'License_Checkin_Notification' => 'License checked in',
     'License_Checkout_Notification' => 'License checked out',
+    'license_for'   => 'License for',
     'Low_Inventory_Report' => 'Laporan Inventori Rendah',
     'a_user_canceled' => 'Pengguna telah membatalkan permintaan item di laman web',
     'a_user_requested' => 'Seorang pengguna telah meminta item di laman web',
     'acceptance_asset_accepted' => 'A user has accepted an item',
     'acceptance_asset_declined' => 'A user has declined an item',
-    'accessory_name' => 'Nama Aksesori:',
-    'additional_notes' => 'Nota tambahan:',
+    'accessory_name' => 'Nama Aksesori',
+    'additional_notes' => 'Nota tambahan',
     'admin_has_created' => 'Pentadbir telah membuat akaun untuk anda di: laman web web.',
-    'asset' => 'Aset:',
-    'asset_name' => 'Nama Aset:',
+    'asset' => 'Harta',
+    'asset_name' => 'Nama Harta',
     'asset_requested' => 'Aset diminta',
     'asset_tag' => 'Tag Harta',
     'assets_warrantee_alert' => 'There is :count asset with a warranty expiring in the next :threshold days.|There are :count assets with warranties expiring in the next :threshold days.',
     'assigned_to' => 'Ditugaskan untuk',
     'best_regards' => 'Selamat sejahtera,',
-    'canceled' => 'Dibatalkan:',
-    'checkin_date' => 'Tarikh Semakan:',
-    'checkout_date' => 'Tarikh Semakan:',
+    'canceled' => 'Dibatalkan',
+    'checkin_date' => 'Tarikh daftar masuk',
+    'checkout_date' => 'Tarikh Agihan',
     'checkedout_from' => 'Checked out from',
     'checkedin_from'  => 'Checked in from',
     'checked_into' => 'Checked into',
@@ -49,27 +50,30 @@ return [
     'click_to_confirm' => 'Sila klik pada pautan berikut untuk mengesahkan akaun web anda:',
     'current_QTY' => 'QTY semasa',
     'days' => 'Hari',
-    'expecting_checkin_date' => 'Tarikh Semak Yang Diharapkan:',
+    'expecting_checkin_date' => 'Tarikh Periksa Yang Diharapkan',
     'expires' => 'Tamat tempoh',
     'hello' => 'Hello',
     'hi' => 'Hi',
     'i_have_read' => 'Saya telah membaca dan bersetuju dengan terma penggunaan, dan telah menerima item ini.',
     'inventory_report' => 'Inventory Report',
-    'item' => 'Perkara:',
+    'item' => 'Perkara',
+    'item_checked_reminder' => 'This is a reminder that you currently have :count items checked out to you that you have not accepted or declined. Please click the link below to confirm your decision.',
     'license_expiring_alert' => 'Terdapat :count lesen yang akan tamat dalam tempoh :threshold hari.|Terdapat :count lesen yang akan tamat dalam tempoh :threshold hari.',
     'link_to_update_password' => 'Sila klik pada pautan berikut untuk mengemas kini kata laluan web anda:',
-    'login' => 'Log masuk:',
+    'login' => 'Log masuk',
     'login_first_admin' => 'Masuk ke pemasangan Snipe-IT baru anda menggunakan kelayakan di bawah ini:',
     'low_inventory_alert' => 'Terdapat :count item yang berada di bawah inventori minimum atau akan menjadi rendah. Terdapat :count item yang berada di bawah inventori minimum atau akan menjadi rendah.',
     'min_QTY' => 'QTY min',
     'name' => 'Nama',
     'new_item_checked' => 'Item baru telah diperiksa di bawah nama anda, butiran di bawah.',
+    'new_item_checked_with_acceptance' => 'A new item has been checked out under your name that requires acceptance, details are below.',
+    'recent_item_checked' => 'An item was recently checked out under your name that requires acceptance, details are below.',
     'notes' => 'Nota',
-    'password' => 'Kata Laluan:',
+    'password' => 'Kata Laluan',
     'password_reset' => 'Memadam kata laluan',
     'read_the_terms' => 'Sila baca terma penggunaan di bawah.',
     'read_the_terms_and_click' => 'Please read the terms of use below, and click on the link at the bottom to confirm that you read and agree to the terms of use, and have received the asset.',
-    'requested' => 'Diminta:',
+    'requested' => 'Diminta',
     'reset_link' => 'Pautan Semula Kata Laluan Anda',
     'reset_password' => 'Klik di sini untuk menetapkan semula kata laluan anda:',
     'rights_reserved' => 'All rights reserved.',
@@ -86,8 +90,10 @@ return [
     'upcoming-audits' => 'There is :count asset that is coming up for audit within :threshold days.|There are :count assets that are coming up for audit within :threshold days.',
     'user' => 'Pengguna',
     'username' => 'Nama Pengguna',
+    'unaccepted_asset_reminder' => 'Reminder: You have Unaccepted Assets.',
     'welcome' => 'Selamat datang: nama',
     'welcome_to' => 'Selamat datang ke: web!',
     'your_assets' => 'View Your Assets',
     'your_credentials' => 'Kredensial Snipe-IT anda',
+    'mail_sent' => 'Mail sent successfully!',
 ];
diff --git a/resources/lang/ms-MY/validation.php b/resources/lang/ms-MY/validation.php
index 85e8b13b95..03683191e1 100644
--- a/resources/lang/ms-MY/validation.php
+++ b/resources/lang/ms-MY/validation.php
@@ -13,87 +13,150 @@ return [
     |
     */
 
-    'accepted'             => ':attribute mesti diterima.',
-    'active_url'           => ':attribute URL yang tidak sah.',
-    'after'                => ':attribute mesti tarik selepas must :date.',
-    'after_or_equal'       => 'The: atribut mestilah tarikh selepas atau sama dengan: tarikh.',
-    'alpha'                => ':attribute hanya boleh mengandungi huruf.',
-    'alpha_dash'           => ':attribute hanya boleh mengandungi huruf, nombor dan tanda tolak.',
-    'alpha_num'            => ':attribute hanya boleh mengadungi huruf dan nombor.',
-    'array'                => 'The: attribute must be array.',
-    'before'               => ':attribute mestilah tarikh sebelum :date.',
-    'before_or_equal'      => 'The: atribut mestilah tarikh sebelum atau sama dengan: tarikh.',
-    'between'              => [
-        'numeric' => ':attribute mesti berada diantara :min - :max.',
-        'file'    => ':attribute mesti diantara :min - :max kilobytes.',
-        'string'  => ':attribute mesti diantara :min - :max characters.',
-        'array'   => 'The: attribute must have between: min and: max items.',
+    'accepted' => 'The :attribute field must be accepted.',
+    'accepted_if' => 'The :attribute field must be accepted when :other is :value.',
+    'active_url' => 'The :attribute field must be a valid URL.',
+    'after' => 'The :attribute field must be a date after :date.',
+    'after_or_equal' => 'The :attribute field must be a date after or equal to :date.',
+    'alpha' => 'The :attribute field must only contain letters.',
+    'alpha_dash' => 'The :attribute field must only contain letters, numbers, dashes, and underscores.',
+    'alpha_num' => 'The :attribute field must only contain letters and numbers.',
+    'array' => 'The :attribute field must be an array.',
+    'ascii' => 'The :attribute field must only contain single-byte alphanumeric characters and symbols.',
+    'before' => 'The :attribute field must be a date before :date.',
+    'before_or_equal' => 'The :attribute field must be a date before or equal to :date.',
+    'between' => [
+        'array' => 'The :attribute field must have between :min and :max items.',
+        'file' => 'The :attribute field must be between :min and :max kilobytes.',
+        'numeric' => 'The :attribute field must be between :min and :max.',
+        'string' => 'The :attribute field must be between :min and :max characters.',
     ],
-    'boolean'              => ': Bidang atribut mestilah benar atau palsu.',
-    'confirmed'            => ':attribute pengesahan tidak sama.',
-    'date'                 => ':attribute  tarikh yang tidak sah.',
-    'date_format'          => ':attribute tidak mengikut format :format.',
-    'different'            => ':attribute dan :other mesti berbeza.',
-    'digits'               => ':attribute mesti :digits digit.',
-    'digits_between'       => ':attribute mesti diantara :min and :max digit.',
-    'dimensions'           => 'The: attribute mempunyai dimensi imej tidak sah.',
-    'distinct'             => 'The: bidang atribut mempunyai nilai pendua.',
-    'email'                => ':attribute format tidak sah.',
-    'exists'               => 'Piliah :attribute tidak sah.',
-    'file'                 => 'The: attribute must be a file.',
-    'filled'               => ': Bidang atribut mesti mempunyai nilai.',
-    'image'                => ':attribute mesti imej.',
+    'boolean' => ': Bidang atribut mestilah benar atau palsu.',
+    'can' => 'The :attribute field contains an unauthorized value.',
+    'confirmed' => 'The :attribute field confirmation does not match.',
+    'contains' => 'The :attribute field is missing a required value.',
+    'current_password' => 'The password is incorrect.',
+    'date' => 'The :attribute field must be a valid date.',
+    'date_equals' => 'The :attribute field must be a date equal to :date.',
+    'date_format' => 'The :attribute field must match the format :format.',
+    'decimal' => 'The :attribute field must have :decimal decimal places.',
+    'declined' => 'The :attribute field must be declined.',
+    'declined_if' => 'The :attribute field must be declined when :other is :value.',
+    'different' => 'The :attribute field and :other must be different.',
+    'digits' => 'The :attribute field must be :digits digits.',
+    'digits_between' => 'The :attribute field must be between :min and :max digits.',
+    'dimensions' => 'The :attribute field has invalid image dimensions.',
+    'distinct' => 'The: bidang atribut mempunyai nilai pendua.',
+    'doesnt_end_with' => 'The :attribute field must not end with one of the following: :values.',
+    'doesnt_start_with' => 'The :attribute field must not start with one of the following: :values.',
+    'email' => 'The :attribute field must be a valid email address.',
+    'ends_with' => 'The :attribute field must end with one of the following: :values.',
+    'enum' => 'Piliah :attribute tidak sah.',
+    'exists' => 'Piliah :attribute tidak sah.',
+    'extensions' => 'The :attribute field must have one of the following extensions: :values.',
+    'file' => 'The :attribute field must be a file.',
+    'filled' => ': Bidang atribut mesti mempunyai nilai.',
+    'gt' => [
+        'array' => 'The :attribute field must have more than :value items.',
+        'file' => 'The :attribute field must be greater than :value kilobytes.',
+        'numeric' => 'The :attribute field must be greater than :value.',
+        'string' => 'The :attribute field must be greater than :value characters.',
+    ],
+    'gte' => [
+        'array' => 'The :attribute field must have :value items or more.',
+        'file' => 'The :attribute field must be greater than or equal to :value kilobytes.',
+        'numeric' => 'The :attribute field must be greater than or equal to :value.',
+        'string' => 'The :attribute field must be greater than or equal to :value characters.',
+    ],
+    'hex_color' => 'The :attribute field must be a valid hexadecimal color.',
+    'image' => 'The :attribute field must be an image.',
     'import_field_empty'    => 'The value for :fieldname cannot be null.',
-    'in'                   => 'Piliah :attribute tidak sah.',
-    'in_array'             => 'The: bidang atribut tidak wujud di: lain.',
-    'integer'              => ':attribute mesti integer.',
-    'ip'                   => ':attribute mesti alamat IP yang sah.',
-    'ipv4'                 => 'The: attribute mestilah alamat IPv4 yang sah.',
-    'ipv6'                 => 'The: atribut mestilah alamat IPv6 yang sah.',
-    'is_unique_department' => 'The :attribute must be unique to this Company Location',
-    'json'                 => 'The: attribute mestilah rentetan JSON yang sah.',
-    'max'                  => [
-        'numeric' => ':attribute tidak boleh lebih besar dari :max.',
-        'file'    => ':attribute tidak boleh lebih besar dari :max kilobytes.',
-        'string'  => ':attribute tidak boleh lebih besar dari :max characters.',
-        'array'   => 'The: attribute mungkin tidak mempunyai lebih daripada: item maks.',
+    'in' => 'Piliah :attribute tidak sah.',
+    'in_array' => 'The :attribute field must exist in :other.',
+    'integer' => 'The :attribute field must be an integer.',
+    'ip' => 'The :attribute field must be a valid IP address.',
+    'ipv4' => 'The :attribute field must be a valid IPv4 address.',
+    'ipv6' => 'The :attribute field must be a valid IPv6 address.',
+    'json' => 'The :attribute field must be a valid JSON string.',
+    'list' => 'The :attribute field must be a list.',
+    'lowercase' => 'The :attribute field must be lowercase.',
+    'lt' => [
+        'array' => 'The :attribute field must have less than :value items.',
+        'file' => 'The :attribute field must be less than :value kilobytes.',
+        'numeric' => 'The :attribute field must be less than :value.',
+        'string' => 'The :attribute field must be less than :value characters.',
     ],
-    'mimes'                => ':attribute mesti fail jenis: :values.',
-    'mimetypes'            => 'The: attribute mestilah file jenis:: nilai.',
-    'min'                  => [
-        'numeric' => ':attribute mesti sekurang2nya :min.',
-        'file'    => ':attribute mesti sekurang2nya :min kilobytes.',
-        'string'  => ':attribute mesti sekurang2nya :min characters.',
-        'array'   => 'The: atribut mesti mempunyai sekurang-kurangnya: item min.',
+    'lte' => [
+        'array' => 'The :attribute field must not have more than :value items.',
+        'file' => 'The :attribute field must be less than or equal to :value kilobytes.',
+        'numeric' => 'The :attribute field must be less than or equal to :value.',
+        'string' => 'The :attribute field must be less than or equal to :value characters.',
     ],
-    'starts_with'          => 'The :attribute must start with one of the following: :values.',
-    'ends_with'            => 'The :attribute must end with one of the following: :values.',
+    'mac_address' => 'The :attribute field must be a valid MAC address.',
+    'max' => [
+        'array' => 'The :attribute field must not have more than :max items.',
+        'file' => 'The :attribute field must not be greater than :max kilobytes.',
+        'numeric' => 'The :attribute field must not be greater than :max.',
+        'string' => 'The :attribute field must not be greater than :max characters.',
+    ],
+    'max_digits' => 'The :attribute field must not have more than :max digits.',
+    'mimes' => 'The :attribute field must be a file of type: :values.',
+    'mimetypes' => 'The :attribute field must be a file of type: :values.',
+    'min' => [
+        'array' => 'The :attribute field must have at least :min items.',
+        'file' => 'The :attribute field must be at least :min kilobytes.',
+        'numeric' => 'The :attribute field must be at least :min.',
+        'string' => 'The :attribute field must be at least :min characters.',
+    ],
+    'min_digits' => 'The :attribute field must have at least :min digits.',
+    'missing' => 'The :attribute field must be missing.',
+    'missing_if' => 'The :attribute field must be missing when :other is :value.',
+    'missing_unless' => 'The :attribute field must be missing unless :other is :value.',
+    'missing_with' => 'The :attribute field must be missing when :values is present.',
+    'missing_with_all' => 'The :attribute field must be missing when :values are present.',
+    'multiple_of' => 'The :attribute field must be a multiple of :value.',
+    'not_in' => 'Piliah :attribute tidak sah.',
+    'not_regex' => 'The :attribute field format is invalid.',
+    'numeric' => 'The :attribute field must be a number.',
+    'password' => [
+        'letters' => 'The :attribute field must contain at least one letter.',
+        'mixed' => 'The :attribute field must contain at least one uppercase and one lowercase letter.',
+        'numbers' => 'The :attribute field must contain at least one number.',
+        'symbols' => 'The :attribute field must contain at least one symbol.',
+        'uncompromised' => 'The given :attribute has appeared in a data leak. Please choose a different :attribute.',
+    ],
+    'percent'       => 'The depreciation minimum must be between 0 and 100 when depreciation type is percentage.',
 
-    'not_in'               => 'Piliah :attribute tidak sah.',
-    'numeric'              => ':attribute mesti nombor.',
-    'present'              => 'Yang: bidang atribut mesti ada.',
-    'valid_regex'          => 'Itu bukan regex yang sah. ',
-    'regex'                => ':attribute format tidak sah.',
-    'required'             => ':attribute ruangan diperlukan.',
-    'required_if'          => ':attribute rungan diperlukan bila :other adalah :value.',
-    'required_unless'      => 'Bidang: atribut diperlukan kecuali: yang lain berada dalam: nilai.',
-    'required_with'        => ':attribute ruangan diperlukan bila :values wujud.',
-    'required_with_all'    => 'Bidang: sifat diperlukan apabila: nilai hadir.',
-    'required_without'     => ':attribute ruangan diperlukan bila :values tidak wujud.',
+    'present' => 'Yang: bidang atribut mesti ada.',
+    'present_if' => 'The :attribute field must be present when :other is :value.',
+    'present_unless' => 'The :attribute field must be present unless :other is :value.',
+    'present_with' => 'The :attribute field must be present when :values is present.',
+    'present_with_all' => 'The :attribute field must be present when :values are present.',
+    'prohibited' => 'The :attribute field is prohibited.',
+    'prohibited_if' => 'The :attribute field is prohibited when :other is :value.',
+    'prohibited_unless' => 'The :attribute field is prohibited unless :other is in :values.',
+    'prohibits' => 'The :attribute field prohibits :other from being present.',
+    'regex' => 'The :attribute field format is invalid.',
+    'required' => ':attribute ruangan diperlukan.',
+    'required_array_keys' => 'The :attribute field must contain entries for: :values.',
+    'required_if' => ':attribute rungan diperlukan bila :other adalah :value.',
+    'required_if_accepted' => 'The :attribute field is required when :other is accepted.',
+    'required_if_declined' => 'The :attribute field is required when :other is declined.',
+    'required_unless' => 'Bidang: atribut diperlukan kecuali: yang lain berada dalam: nilai.',
+    'required_with' => ':attribute ruangan diperlukan bila :values wujud.',
+    'required_with_all' => 'The :attribute field is required when :values are present.',
+    'required_without' => ':attribute ruangan diperlukan bila :values tidak wujud.',
     'required_without_all' => 'The: field attribute diperlukan apabila tidak ada: nilai hadir.',
-    'same'                 => ':attribute dan :other mesti sama.',
-    'size'                 => [
-        'numeric' => ':attribute mesti :size.',
-        'file'    => ':attribute mesti :size kilobytes.',
-        'string'  => ':attribute mesti :size aksara.',
-        'array'   => 'The: attribute mesti mengandungi: item saiz.',
+    'same' => 'The :attribute field must match :other.',
+    'size' => [
+        'array' => 'The :attribute field must contain :size items.',
+        'file' => 'The :attribute field must be :size kilobytes.',
+        'numeric' => 'The :attribute field must be :size.',
+        'string' => 'The :attribute field must be :size characters.',
     ],
+    'starts_with' => 'The :attribute field must start with one of the following: :values.',
     'string'               => 'The: attribute must be string.',
-    'timezone'             => 'The: attribute mesti zon yang sah.',
     'two_column_unique_undeleted' => 'The :attribute must be unique across :table1 and :table2. ',
-    'unique'               => ':attribute telah diambil.',
-    'uploaded'             => 'The: attribute gagal untuk dimuat naik.',
-    'url'                  => ':attribute format tidak sah.',
     'unique_undeleted'     => ':attribute mesti unik.',
     'non_circular'         => 'The :attribute must not create a circular reference.',
     'not_array'            => ':attribute cannot be an array.',
@@ -102,11 +165,14 @@ return [
     'numbers'              => 'Password must contain at least one number.',
     'case_diff'            => 'Password must use mixed case.',
     'symbols'              => 'Password must contain symbols.',
-    'gte'                  => [
-        'numeric'          => 'Value cannot be negative'
-    ],
-    'checkboxes'           => ':attribute contains invalid options.',
-    'radio_buttons'        => ':attribute is invalid.',
+    'timezone' => 'The :attribute field must be a valid timezone.',
+    'unique' => ':attribute telah diambil.',
+    'uploaded' => 'The: attribute gagal untuk dimuat naik.',
+    'uppercase' => 'The :attribute field must be uppercase.',
+    'url' => 'The :attribute field must be a valid URL.',
+    'ulid' => 'The :attribute field must be a valid ULID.',
+    'uuid' => 'The :attribute field must be a valid UUID.',
+    'fmcs_location' => 'Full multiple company support and location scoping is enabled in the Admin Settings, and the selected location and selected company are not compatible.',
 
 
     /*
@@ -120,16 +186,22 @@ return [
     |
     */
 
+    'email_array'      => 'Satu atau lebih alamat e-mel tidak sah.',
+    'checkboxes'           => ':attribute contains invalid options.',
+    'radio_buttons'        => ':attribute is invalid.',
+    
     'custom' => [
         'alpha_space' => 'Bidang: atribut mengandungi aksara yang tidak dibenarkan.',
-        'email_array'      => 'Satu atau lebih alamat e-mel tidak sah.',
+
         'hashed_pass'      => 'Kata laluan semasa anda tidak betul',
         'dumbpwd'          => 'Kata laluan itu terlalu umum.',
         'statuslabel_type' => 'Anda mesti memilih jenis label status yang sah',
+        'custom_field_not_found'          => 'This field does not seem to exist, please double check your custom field names.',
+        'custom_field_not_found_on_model' => 'This field seems to exist, but is not available on this Asset Model\'s fieldset.',
 
         // date_format validation with slightly less stupid messages. It duplicates a lot, but it gets the job done :(
-        // We use this because the default error message for date_format is reflects php Y-m-d, which non-PHP
-        // people won't know how to format. 
+        // We use this because the default error message for date_format reflects php Y-m-d, which non-PHP
+        // people won't know how to format.
         'purchase_date.date_format'     => 'The :attribute must be a valid date in YYYY-MM-DD format',
         'last_audit_date.date_format'   =>  'The :attribute must be a valid date in YYYY-MM-DD hh:mm:ss format',
         'expiration_date.date_format'   =>  'The :attribute must be a valid date in YYYY-MM-DD format',
@@ -137,9 +209,15 @@ return [
         'expected_checkin.date_format'  =>  'The :attribute must be a valid date in YYYY-MM-DD format',
         'start_date.date_format'        =>  'The :attribute must be a valid date in YYYY-MM-DD format',
         'end_date.date_format'          =>  'The :attribute must be a valid date in YYYY-MM-DD format',
+        'invalid_value_in_field' => 'Invalid value included in this field',
 
-    ],
+        'ldap_username_field' => [
+            'not_in' =>         '<code>sAMAccountName</code> (mixed case) will likely not work. You should use <code>samaccountname</code> (lowercase) instead.'
+        ],
+        'ldap_auth_filter_query' => ['not_in' => '<code>uid=samaccountname</code> is probably not a valid auth filter. You probably want <code>uid=</code> '],
+        'ldap_filter' => ['regex' => 'This value should probably not be wrapped in parentheses.'],
 
+        ],
     /*
     |--------------------------------------------------------------------------
     | Custom Validation Attributes
@@ -155,8 +233,16 @@ return [
 
     /*
     |--------------------------------------------------------------------------
-    | Generic Validation Messages
+    | Generic Validation Messages - we use these in the jquery validation where we don't have
+    | access to the :attribute
     |--------------------------------------------------------------------------
     */
-    'invalid_value_in_field' => 'Invalid value included in this field',
+
+    'generic' => [
+        'invalid_value_in_field' => 'Invalid value included in this field',
+        'required' => 'This field is required',
+        'email' => 'Please enter a valid email address',
+    ],
+
+
 ];
diff --git a/resources/lang/nb-NO/account/general.php b/resources/lang/nb-NO/account/general.php
new file mode 100644
index 0000000000..99da024c80
--- /dev/null
+++ b/resources/lang/nb-NO/account/general.php
@@ -0,0 +1,17 @@
+<?php
+
+return array(
+    'personal_api_keys' => 'Personlige API-nøkler',
+    'personal_access_token' => 'Personal Access Token',
+    'personal_api_keys_success' => 'Personal API Key :key created sucessfully',
+    'here_is_api_key' => 'Here is your new personal access token. This is the only time it will be shown so do not lose it! You may now use this token to make API requests.',
+    'api_key_warning' => 'When generating an API token, be sure to copy it down immediately as they will not be visible to you again.',
+    'api_base_url' => 'Din API base-url finnes på:',
+    'api_base_url_endpoint' => '/&lt;endpoint&gt;',
+    'api_token_expiration_time' => 'API-tokens er satt til å utløpe om:',
+    'api_reference' => 'Please check the <a href="https://snipe-it.readme.io/reference" target="_blank">API reference</a> to find specific API endpoints and additional API documentation.',
+    'profile_updated' => 'Account successfully updated',
+    'no_tokens' => 'You have not created any personal access tokens.',
+    'enable_sounds' => 'Enable sound effects',
+    'enable_confetti' => 'Enable confetti effects',
+);
diff --git a/resources/lang/nb-NO/admin/accessories/general.php b/resources/lang/nb-NO/admin/accessories/general.php
new file mode 100644
index 0000000000..871c6c549c
--- /dev/null
+++ b/resources/lang/nb-NO/admin/accessories/general.php
@@ -0,0 +1,22 @@
+<?php
+
+return array(
+    'accessory_category' 				=> 'Tilbehørskategori',
+    'accessory_name'  					=> 'Navn tilbehør',
+    'checkout'  							=> 'Sjekk ut tilbehør',
+    'checkin'  							=> 'Sjekk inn tilbehør',
+    'create'  							=> 'Legg til tilbehør',
+    'edit'  							=> 'Rediger tilbehør',
+    'eula_text'							=> 'EULA-kategori',
+    'eula_text_help'					=> 'Dette feltet lar deg tilpasse dine EULA for spesifikke typer eiendeler. Hvis du har kun en EULA for alle eiendeler kan du krysse av nedenfor for å bruke standard.',
+    'require_acceptance'				=> 'Krev at brukere bekrefter aksept av eiendeler i denne kategorien.',
+    'no_default_eula'					=> 'Ingen standard EULA funnet. Legg til en i Innstillinger.',
+    'total'  							=> 'Total',
+    'remaining'  						=> 'Tilgjengelig',
+    'update'  							=> 'Oppdater tilbehør',
+    'use_default_eula'					=> 'Bruk <a href="#" data-toggle="modal" data-target="#eulaModal">standard EULA</a> i stedet.',
+    'use_default_eula_disabled'			=> '<del>Bruk standard EULA i stedet.</del> Ingen standard EULA er satt. Legg til en i Innstillinger.',
+    'clone'                             => 'Klon tilbehør',
+    'delete_disabled'                   => 'Dette tilbehøret kan ikke slettes enda fordi noen elementer er fremdeles sjekket ut.',
+
+);
diff --git a/resources/lang/nb-NO/admin/accessories/message.php b/resources/lang/nb-NO/admin/accessories/message.php
new file mode 100644
index 0000000000..62916051ab
--- /dev/null
+++ b/resources/lang/nb-NO/admin/accessories/message.php
@@ -0,0 +1,43 @@
+<?php
+
+return array(
+
+    'does_not_exist' => 'Leverandør finnes ikke.',
+    'not_found' => 'Lisens ikke funnet',
+    'assoc_users'	 => 'Denne modellen er tilknyttet en eller flere eiendeler og kan ikke slettes. Slett eiendelene, og prøv å slette modellen igjen. ',
+
+    'create' => array(
+        'error'   => 'Leverandør ble ikke opprettet. Prøv igjen.',
+        'success' => 'Opprettelse av leverandør vellykket.'
+    ),
+
+    'update' => array(
+        'error'   => 'Leverandør ble ikke oppdatert. Prøv igjen',
+        'success' => 'Oppdatering av leverandør vellykket.'
+    ),
+
+    'delete' => array(
+        'confirm'   => 'Er du sikker på at du vil slette denne leverandøren?',
+        'error'   => 'Det oppstod et problem under sletting av leverandør. Prøv igjen.',
+        'success' => 'Sletting av leverandør vellykket.'
+    ),
+
+     'checkout' => array(
+        'error'   		=> 'Det oppstod et problem under utsjekk av lisens. Vennligst prøv igjen.',
+        'success' 		=> 'Vellykket utsjekk av lisens',
+        'unavailable'   => 'This seat is not available for checkout.',
+        'user_does_not_exist' => 'Denne brukeren er ugyldig. Vennligst prøv igjen.',
+         'checkout_qty' => array(
+            'lte'  => 'There is currently only one available accessory of this type, and you are trying to check out :checkout_qty. Please adjust the checkout quantity or the total stock of this accessory and try again.|There are :number_currently_remaining total available accessories, and you are trying to check out :checkout_qty. Please adjust the checkout quantity or the total stock of this accessory and try again.',
+            ),
+           
+    ),
+
+    'checkin' => array(
+        'error'   		=> 'Det oppstod et problem under innsjekk av lisens. Vennligst prøv igjen.',
+        'success' 		=> 'Vellykket innsjekk av lisens',
+        'user_does_not_exist' => 'Denne brukeren er ugyldig. Vennligst prøv igjen.'
+    )
+
+
+);
diff --git a/resources/lang/nb-NO/admin/accessories/table.php b/resources/lang/nb-NO/admin/accessories/table.php
new file mode 100644
index 0000000000..3b39db2a47
--- /dev/null
+++ b/resources/lang/nb-NO/admin/accessories/table.php
@@ -0,0 +1,9 @@
+<?php
+
+return array(
+	'dl_csv'      				=> 'Last ned CSV',
+	'eula_text'      			=> 'EULA',
+    'id'      					=> 'Id',
+    'require_acceptance'      	=> 'Godtatt',
+    'title'      				=> 'Tittel',
+);
diff --git a/resources/lang/nb-NO/admin/asset_maintenances/form.php b/resources/lang/nb-NO/admin/asset_maintenances/form.php
new file mode 100644
index 0000000000..1c12fd5525
--- /dev/null
+++ b/resources/lang/nb-NO/admin/asset_maintenances/form.php
@@ -0,0 +1,14 @@
+<?php
+
+    return [
+        'asset_maintenance_type' => 'Ressurs vedlikeholds type',
+        'title'                  => 'Tittel',
+        'start_date'             => 'Startdato',
+        'completion_date'        => 'Fullført dato',
+        'cost'                   => 'Innkjøpskostnad',
+        'is_warranty'            => 'Uthevet garanti',
+        'asset_maintenance_time' => 'Tid brukt på ressursvedlikehold (i dager)',
+        'notes'                  => 'Notater',
+        'update'                 => 'Oppdater lisens',
+        'create'                 => 'Opprett lisens'
+    ];
diff --git a/resources/lang/nb-NO/admin/asset_maintenances/general.php b/resources/lang/nb-NO/admin/asset_maintenances/general.php
new file mode 100644
index 0000000000..4c36e8e6b9
--- /dev/null
+++ b/resources/lang/nb-NO/admin/asset_maintenances/general.php
@@ -0,0 +1,16 @@
+<?php
+
+    return [
+        'asset_maintenances' => 'Vedlikehold av eiendeler',
+        'edit'               => 'Rediger Vedlikehold',
+        'delete'             => 'Slett Vedlikehold',
+        'view'               => 'Vedlikehold detaljer',
+        'repair'             => 'Reparerasjon',
+        'maintenance'        => 'Vedlikehold',
+        'upgrade'            => 'Oppgradering',
+        'calibration'        => 'Kalibrering',
+        'software_support'   => 'Programvarestøtte',
+        'hardware_support'   => 'Maskinvare støtte',
+        'configuration_change'   => 'Konfigurasjons endring',
+        'pat_test'           => 'PAT test',
+    ];
diff --git a/resources/lang/nb-NO/admin/asset_maintenances/message.php b/resources/lang/nb-NO/admin/asset_maintenances/message.php
new file mode 100644
index 0000000000..7b387a2973
--- /dev/null
+++ b/resources/lang/nb-NO/admin/asset_maintenances/message.php
@@ -0,0 +1,21 @@
+<?php
+
+    return [
+        'not_found'                    => 'Fant ikke vedlikeholdet du så etter!',
+        'delete'                       => [
+            'confirm' => 'Er du sikker på at du vil slette dette vedlikeholdet?',
+            'error'   => 'Kunne ikke slette vedlikholdet. Prøv igjen.',
+            'success' => 'Vedlikeholdet ble slettet.',
+        ],
+        'create'                       => [
+            'error'   => 'Vedlikeholdet ble ikke opprettet, prøv igjen.',
+            'success' => 'Vedlikeholdet ble opprettet.',
+        ],
+        'edit'                       => [
+            'error'   => 'Vedlikeholdet ble ikke opprettet, prøv igjen.',
+            'success' => 'Vedlikehold endret vellykket.',
+        ],
+        'asset_maintenance_incomplete' => 'Enda Ikke fullført',
+        'warranty'                     => 'Garanti',
+        'not_warranty'                 => 'Ikke garanti',
+    ];
diff --git a/resources/lang/nb-NO/admin/asset_maintenances/table.php b/resources/lang/nb-NO/admin/asset_maintenances/table.php
new file mode 100644
index 0000000000..9a584665a5
--- /dev/null
+++ b/resources/lang/nb-NO/admin/asset_maintenances/table.php
@@ -0,0 +1,8 @@
+<?php
+
+    return [
+        'title'         => 'Vedlikehold av eiendel',
+        'asset_name'    => 'Navn',
+        'is_warranty'   => 'Garanti',
+        'dl_csv'        => 'Last ned CSV',
+    ];
diff --git a/resources/lang/nb-NO/admin/categories/general.php b/resources/lang/nb-NO/admin/categories/general.php
new file mode 100644
index 0000000000..4c02d73ecb
--- /dev/null
+++ b/resources/lang/nb-NO/admin/categories/general.php
@@ -0,0 +1,25 @@
+<?php
+
+return array(
+    'asset_categories' 					=> 'Kategorier',
+    'category_name'  					=> 'Navn',
+    'checkin_email'                     => 'Send epost til bruker ved innsjekking/utsjekking.',
+    'checkin_email_notification'        => 'Det vil bli sendt en e-post til bruker ved innsjekking/utsjekking.',
+    'clone'                             => 'Klon kategori',
+    'create'  							=> 'Opprett kategori',
+    'edit'                              => 'Rediger kategori',
+    'email_will_be_sent_due_to_global_eula' => 'En e-post sendes til brukeren fordi den globale EULA er i bruk.',
+    'email_will_be_sent_due_to_category_eula' => 'En e-post blir sendt til brukeren fordi en EULA er angitt for denne kategorien.',
+    'eula_text'							=> 'EULA-kategori',
+    'eula_text_help'					=> 'Dette feltet lar deg tilpasse dine EULA for spesifikke typer eiendeler. Hvis du kun har en EULA for alle eiendeler kan du krysse av nedenfor for å bruke standard.',
+    'name'                              => 'Kategorinavn',
+    'require_acceptance'				=> 'Krev at brukere bekrefter aksept av eiendeler i denne kategorien.',
+    'required_acceptance'				=> 'Denne brukeren vil få e-post med en lenke for å bekrefte aksept av enheten.',
+    'required_eula'						=> 'Denne brukeren vil få en kopi av EULA på e-post',
+    'no_default_eula'					=> 'Ingen standard EULA funnet. Legg til en i Innstillinger.',
+    'update'  							=> 'Oppdatere kategori',
+    'use_default_eula'					=> 'Bruk <a href="#" data-toggle="modal" data-target="#eulaModal">standard EULA</a> i stedet.',
+    'use_default_eula_disabled'			=> '<del>Bruk standard EULA i stedet.</del> Ingen standard EULA er satt. Legg til en i Innstillinger.',
+    'use_default_eula_column'			=> 'Bruk standard EULA',
+
+);
diff --git a/resources/lang/nb-NO/admin/categories/message.php b/resources/lang/nb-NO/admin/categories/message.php
new file mode 100644
index 0000000000..2d93711bc6
--- /dev/null
+++ b/resources/lang/nb-NO/admin/categories/message.php
@@ -0,0 +1,27 @@
+<?php
+
+return array(
+
+    'does_not_exist' => 'Kategorien eksisterer ikke.',
+    'assoc_models'	 => 'Denne kategorien er koblet til minst èn modell og kan ikke slettes. Vennligst oppdater dine modeller til å ikke referere til denne kategorien og prøv igjen. ',
+    'assoc_items'	 => 'Denne kategorien er knyttet til minst én :asset_type og kan ikke slettes. Oppdater din :asset_type til å ikke lenger refererer til denne kategorien, og prøv på nytt. ',
+
+    'create' => array(
+        'error'   => 'Kategorien ble ikke opprettet, vennligst prøv igjen.',
+        'success' => 'Kategorien ble opprettet.'
+    ),
+
+    'update' => array(
+        'error'   => 'Kategorien ble ikke opprettet, vennligst prøv igjen',
+        'success' => 'Kategorien ble oppdatert.',
+        'cannot_change_category_type'   => 'Du kan ikke endre kategori typen når den har blitt opprettet',
+    ),
+
+    'delete' => array(
+        'confirm'   => 'Er du sikker på du vil slette denne kategorien?',
+        'error'   => 'Det oppsto et problem ved sletting av kategorien. Vennligst prøv igjen.
+',
+        'success' => 'Kategorien ble slettet.'
+    )
+
+);
diff --git a/resources/lang/nb-NO/admin/categories/table.php b/resources/lang/nb-NO/admin/categories/table.php
new file mode 100644
index 0000000000..6f07705218
--- /dev/null
+++ b/resources/lang/nb-NO/admin/categories/table.php
@@ -0,0 +1,10 @@
+<?php
+
+return array(
+	'eula_text'      			=> 'EULA',
+    'id'      					=> 'ID',
+    'parent'   					=> 'Overordnet kategori',
+    'require_acceptance'      	=> 'Godtatt',
+    'title'      				=> 'Kategorinavn',
+
+);
diff --git a/resources/lang/nb-NO/admin/companies/general.php b/resources/lang/nb-NO/admin/companies/general.php
new file mode 100644
index 0000000000..dc4853775f
--- /dev/null
+++ b/resources/lang/nb-NO/admin/companies/general.php
@@ -0,0 +1,7 @@
+<?php
+
+return [
+    'select_company' => 'Velg bedrift',
+    'about_companies' => 'Om bedrifter',
+    'about_companies_description' => '        Du kan bruke bedrifter som et enkelt informasjonsfelt, eller slå på Full Bedriftstøtte i Admin-innstillingene for å kunne begrense tilgangen til brukere fra forskjellige bedrifter.',
+];
diff --git a/resources/lang/nb-NO/admin/companies/message.php b/resources/lang/nb-NO/admin/companies/message.php
new file mode 100644
index 0000000000..284a2d4344
--- /dev/null
+++ b/resources/lang/nb-NO/admin/companies/message.php
@@ -0,0 +1,20 @@
+<?php
+
+return [
+    'does_not_exist' => 'Bedriften eksisterer ikke.',
+    'deleted'        => 'Slett firma',
+    'assoc_users'    => 'Denne bedriften er tilknyttet minst en modell og kan ikke slettes. Oppdater modellene dine til å ikke refere til denne bedriften og prøv igjen. ',
+    'create' => [
+        'error'   => 'Bedriften ble ikke opprette. Prøv igjen.',
+        'success' => 'Bedriften ble opprettet.',
+    ],
+    'update' => [
+        'error'   => 'Bedriften ble ikke oppdatert. Prøv igjen',
+        'success' => 'Bedriften ble oppdatert.',
+    ],
+    'delete' => [
+        'confirm' => 'Er du sikker på at du vil slette denne bedriften?',
+        'error'   => 'Feil ved sletting av bedrift. Prøv igjen.',
+        'success' => 'Bedriften ble slettet.',
+    ],
+];
diff --git a/resources/lang/nb-NO/admin/companies/table.php b/resources/lang/nb-NO/admin/companies/table.php
new file mode 100644
index 0000000000..f809bbe267
--- /dev/null
+++ b/resources/lang/nb-NO/admin/companies/table.php
@@ -0,0 +1,11 @@
+<?php
+return array(
+    'companies' => 'Bedrifter',
+    'create'    => 'Opprett bedrift',
+    'email'     => 'E-postadresse for firma',
+    'title'     => 'Bedrift',
+    'phone'     => 'Telefon for firma',
+    'update'    => 'Oppdater bedrift',
+    'name'      => 'Navn på bedrift',
+    'id'        => 'ID',
+);
diff --git a/resources/lang/nb-NO/admin/components/general.php b/resources/lang/nb-NO/admin/components/general.php
new file mode 100644
index 0000000000..7f6209fad5
--- /dev/null
+++ b/resources/lang/nb-NO/admin/components/general.php
@@ -0,0 +1,16 @@
+<?php
+
+return array(
+    'component_name'                  => 'Komponent navn',
+    'checkin'                             => 'Sjekk inn komponent',
+    'checkout'                             => 'Sjekk ut komponent',
+    'cost'				=> 'Innkjøpskostnad',
+    'create'                             => 'Opprett komponent',
+    'edit'                             => 'Endre komponent',
+    'date'					=> 'Kjøpsdato',
+    'order'					=> 'Ordreummer',
+    'remaining' 			             => 'Gjenstår',
+    'total' 			                 => 'Total',
+    'update'                            => 'Oppdater komponent',
+    'checkin_limit'            => 'Antall sjekket inn må være lik eller mindre enn :assigned_qty'
+);
diff --git a/resources/lang/nb-NO/admin/components/message.php b/resources/lang/nb-NO/admin/components/message.php
new file mode 100644
index 0000000000..625f7ebdfe
--- /dev/null
+++ b/resources/lang/nb-NO/admin/components/message.php
@@ -0,0 +1,38 @@
+<?php
+
+return array(
+
+    'does_not_exist' => 'Komponenten finnes ikke.',
+
+    'create' => array(
+        'error'   => 'Komponenten ble ikke opprettet, vennligst prøv igjen.',
+        'success' => 'Komponent ble opprettet.'
+    ),
+
+    'update' => array(
+        'error'   => 'Komponenten ble ikke oppdatert. Vennligst prøv igjen',
+        'success' => 'Komponent ble oppdatert.'
+    ),
+
+    'delete' => array(
+        'confirm'   => 'Er du sikker på at du vil slette denne komponenten?',
+        'error'   => 'Det oppstod et problem under sletting av komponenten. Vennligst prøv igjen.',
+        'success' => 'Sletting av komponent vellykket.',
+        'error_qty'   => 'Some components of this type are still checked out. Please check them in and try again.',
+    ),
+
+     'checkout' => array(
+        'error'   		=> 'Komponent ble ikke sjekket ut. Prøv igjen',
+        'success' 		=> 'Vellykket utsjekk av komponent.',
+        'user_does_not_exist' => 'Denne brukeren er ugyldig. Vennligst prøv igjen.',
+        'unavailable'      => 'Ikke nok komponenter igjen: :remaining gjenværende, :requested ',
+    ),
+
+    'checkin' => array(
+        'error'   		=> 'Komponenten ble ikke sjekket inn, vennligst prøv igjen',
+        'success' 		=> 'Vellykket innsjekk av komponent.',
+        'user_does_not_exist' => 'Denne brukeren er ugyldig. Prøv igjen.'
+    )
+
+
+);
diff --git a/resources/lang/nb-NO/admin/components/table.php b/resources/lang/nb-NO/admin/components/table.php
new file mode 100644
index 0000000000..f2692003d6
--- /dev/null
+++ b/resources/lang/nb-NO/admin/components/table.php
@@ -0,0 +1,5 @@
+<?php
+
+return array(
+    'title'      				=> 'Komponentnavn',
+);
diff --git a/resources/lang/nb-NO/admin/consumables/general.php b/resources/lang/nb-NO/admin/consumables/general.php
new file mode 100644
index 0000000000..cf7e29fcd3
--- /dev/null
+++ b/resources/lang/nb-NO/admin/consumables/general.php
@@ -0,0 +1,12 @@
+<?php
+
+return array(
+    'checkout'                          => 'Sjekk ut Forbruksvare til Bruker',
+    'consumable_name'                   => 'Navn på forbruksvare',
+    'create'                            => 'Legg til forbruksvare',
+    'item_no'                           => 'Varenr.',
+    'remaining' 			            => 'Gjenstår',
+    'total' 			                => 'Total',
+    'update'                            => 'Oppdater forbruksvare',
+    'inventory_warning'                 => 'The inventory of this consumable is below the minimum amount of :min_count',
+);
diff --git a/resources/lang/nb-NO/admin/consumables/message.php b/resources/lang/nb-NO/admin/consumables/message.php
new file mode 100644
index 0000000000..e652d40ef6
--- /dev/null
+++ b/resources/lang/nb-NO/admin/consumables/message.php
@@ -0,0 +1,38 @@
+<?php
+
+return array(
+
+    'invalid_category_type' => 'The category must be a consumable category.',
+    'does_not_exist' => 'Forbruksvaren finnes ikke.',
+
+    'create' => array(
+        'error'   => 'Forbruksvaren bli ikke opprettet, prøv igjen.',
+        'success' => 'Forbruksvaren opprettet.'
+    ),
+
+    'update' => array(
+        'error'   => 'Forbruksvaren ble ikke opprettet, prøv igjen',
+        'success' => 'Forbruksvare oppdatert.'
+    ),
+
+    'delete' => array(
+        'confirm'   => 'Er du sikker på at forbruksmateriellet skal slettes?',
+        'error'   => 'Noe gikk feil under sletting av forbruksvaren. Prøv igjen.',
+        'success' => 'Forbruksmateriell ble slettet.'
+    ),
+
+     'checkout' => array(
+        'error'   		=> 'Forbruksvaren ble ikke tatt ut, prøv igjen',
+        'success' 		=> 'Forbruksvaren ble tatt ut.',
+        'user_does_not_exist' => 'Denne brukeren er ugyldig. Prøv igjen.',
+         'unavailable'      => 'Det er ikke nok forbruksvarer for denne utsjekken. Kontroller antallet igjen. ',
+    ),
+
+    'checkin' => array(
+        'error'   		=> 'Forbruksvaren ble ikke lagt inn, prøv igjen',
+        'success' 		=> 'Forbruksvaren ble tatt ut.',
+        'user_does_not_exist' => 'Denne brukeren er ugyldig. Prøv igjen.'
+    )
+
+
+);
diff --git a/resources/lang/nb-NO/admin/consumables/table.php b/resources/lang/nb-NO/admin/consumables/table.php
new file mode 100644
index 0000000000..329fb1e136
--- /dev/null
+++ b/resources/lang/nb-NO/admin/consumables/table.php
@@ -0,0 +1,5 @@
+<?php
+
+return array(
+    'title'      				=> 'Navn på forbruksvare',
+);
diff --git a/resources/lang/nb-NO/admin/custom_fields/general.php b/resources/lang/nb-NO/admin/custom_fields/general.php
new file mode 100644
index 0000000000..2b4f1b593d
--- /dev/null
+++ b/resources/lang/nb-NO/admin/custom_fields/general.php
@@ -0,0 +1,64 @@
+<?php
+
+return [
+    'custom_fields'		        => 'Egendefinerte Felt',
+    'manage'                    => 'Administrer',
+    'field'		                => 'Felt',
+    'about_fieldsets_title'		=> 'Om Feltsett',
+    'about_fieldsets_text'		=> 'Feltsett lar deg opprette grupper av egendefinerte felt som kan gjenbrukes til bestemte modelltyper.',
+    'custom_format'             => 'Tilpasset Regex-format...',
+    'encrypt_field'      	        => 'Kryptere verdien av dette feltet i databasen',
+    'encrypt_field_help'      => 'ADVARSEL: Ved å kryptere et felt gjør du at det ikke kan søkes på.',
+    'encrypted'      	        => 'Kryptert',
+    'fieldset'      	        => 'Feltsett',
+    'qty_fields'      	      => 'Antall Felt',
+    'fieldsets'      	        => 'Feltsett',
+    'fieldset_name'           => 'Feltsett Navn',
+    'field_name'              => 'Felt Navn',
+    'field_values'            => 'Felt verdier',
+    'field_values_help'       => 'Legge til alternativer, ett per linje. Tomme linjer utenom den første vil bli ignorerert.',
+    'field_element'           => 'Skjema Element',
+    'field_element_short'     => 'Element',
+    'field_format'            => 'Format',
+    'field_custom_format'     => 'Egendefinert Format',
+    'field_custom_format_help'     => 'Dette feltet lar deg bruke et regex-uttrykk for validering. Det skal begynne med "regex:" - for eksempel å validere at en egendefinert feltverdi inneholder en gyldig IMEI (15 numeriske siffer), vil du bruke <code>regex:/^[0-9]{15}$/</code>.',
+    'required'   		          => 'Obligatorisk',
+    'req'   		              => 'Obl.',
+    'used_by_models'   		    => 'Brukes av modeller',
+    'order'   		            => 'Bestill',
+    'create_fieldset'         => 'Nytt Feltsett',
+    'update_fieldset'         => 'Oppdater Feltsett',
+    'fieldset_does_not_exist'   => 'Feltsett :id eksisterer ikke',
+    'fieldset_updated'         => 'Feltsett oppdatert',
+    'create_fieldset_title' => 'Opprett et nytt feltsett',
+    'create_field'            => 'Nytt Egendefinert Felt',
+    'create_field_title' => 'Opprett nytt egendefinert felt',
+    'value_encrypted'      	        => 'Verdien i dette feltet er kryptert i databasen. Bare administratorer kan se hva som står i dette feltet',
+    'show_in_email'     => 'Inkluder verdien i dette feltet i utsjekkseposter sendt til brukeren? Krypterte felter kan ikke inkluderes i eposter',
+    'show_in_email_short' => 'Inkludere i epost',
+    'help_text' => 'Hjelpetekst',
+    'help_text_description' => 'Dette er en valgfri tekst som vises under feltet når man redigerer et element, ment for å gi kontekst til feltets innhold.',
+    'about_custom_fields_title' => 'Om egendefinerte felt',
+    'about_custom_fields_text' => 'Egendefinerte felt lar deg legge til vilkårlige attributter til eiendeler.',
+    'add_field_to_fieldset' => 'Legg feltet inn i feltsett',
+    'make_optional' => 'Påkrevd - klikk for å gjøre valgfritt',
+    'make_required' => 'Valgfritt - klikk for å gjøre påkrevd',
+    'reorder' => 'Endre rekkefølge',
+    'db_field' => 'DB-felt',
+    'db_convert_warning' => 'ADVARSEL: Dette feltet er i tabellen for egendefinerte felt som <code>:db_column</code>, men burde være <code>:expected</code>.',
+    'is_unique' => 'Denne verdien må være unik for alle ressurser',
+    'unique' => 'Unik',
+    'display_in_user_view' => 'Tillat den utsjekkede brukeren å se disse verdiene i deres Vis tildelte ressurs-side',
+    'display_in_user_view_table' => 'Synlig for bruker',
+    'auto_add_to_fieldsets' => 'Legg denne til automatisk i hvert nye feltsett',
+    'add_to_preexisting_fieldsets' => 'Legg til i alle eksisterende gruppene',
+    'show_in_listview' => 'Vis i listevisninger som standard. Autoriserte brukere kan fortsatt vise/skjule via kolonnevelgeren',
+    'show_in_listview_short' => 'Vis i lister',
+    'show_in_requestable_list_short' => 'Vis i liste over ressurser som kan være tilgjengelig på forespørsel',
+    'show_in_requestable_list' => 'Vis verdi i listen over ressurser som kan være tilgjengelig på forspørsel. Krypterte felter vises ikke',
+    'encrypted_options' => 'Feltet er kryptert, så noen visningsalternativer er ikke tilgjengelig.',
+    'display_checkin' => 'Display in checkin forms',
+    'display_checkout' => 'Display in checkout forms',
+    'display_audit' => 'Display in audit forms',
+
+];
diff --git a/resources/lang/nb-NO/admin/custom_fields/message.php b/resources/lang/nb-NO/admin/custom_fields/message.php
new file mode 100644
index 0000000000..976984aae1
--- /dev/null
+++ b/resources/lang/nb-NO/admin/custom_fields/message.php
@@ -0,0 +1,64 @@
+<?php
+
+return array(
+
+    'field' => array(
+        'invalid'   => 'Feltet finnes ikke.',
+        'already_added'   => 'Feltet er allerede lagt til',
+        'none_selected'   => 'No field selected',
+
+        'create' => array(
+            'error'   => 'Feltet ble ikke opprettet, vennligst prøv igjen.',
+            'success' => 'Felt opprettet.',
+            'assoc_success' => 'Feltet ble lagt til.'
+        ),
+
+        'update' => array(
+            'error'   => 'Feltet ble ikke oppdatert, vennligst prøv igjen',
+            'success' => 'Felt oppdatert.'
+        ),
+
+        'delete' => array(
+            'confirm'   	=> 'Er du sikker på at du vil slette dette feltet?',
+            'error'   => 'Det oppstod et problem ved sletting av feltet. Vennligst prøv igjen senere.',
+            'success' => 'Feltet ble slettet.',
+            'in_use'   => 'Feltet er fremdeles i bruk.',
+        )
+
+    ),
+
+    'fieldset' => array(
+
+        'does_not_exist' => 'Fieldset eksisterer ikke',
+
+        'create' => array(
+            'error'   => 'Feltsettet ble ikke opprettet, vennligst prøv igjen.',
+            'success' => 'Feltsettet ble opprettet.'
+        ),
+
+        'update' => array(
+            'error'   => 'Feltsettet ble ikke oppdatert, vennligst prøv igjen',
+            'success' => 'Feltsettet ble oppdatert.'
+        ),
+
+        'delete' => array(
+            'confirm'   	=> 'Er du sikker på at du vil slette feltsettet?',
+            'error'   => 'Det oppstod et problem ved sletting av feltsettet. Vennligst prøv igjen.',
+            'success' => 'Feltsettet ble slettet.',
+            'in_use'   => 'Feltsettet er fortsatt i bruk.',
+        )
+
+    ),
+
+    'fieldset_default_value' => array(
+
+        'error' => 'Feil ved validering av standardverdier for feltsett.',
+
+    ),
+
+
+
+
+
+
+);
diff --git a/resources/lang/nb-NO/admin/departments/message.php b/resources/lang/nb-NO/admin/departments/message.php
new file mode 100644
index 0000000000..5aad3f223c
--- /dev/null
+++ b/resources/lang/nb-NO/admin/departments/message.php
@@ -0,0 +1,22 @@
+<?php
+
+return array(
+
+    'does_not_exist' => 'Avdeling finnes ikke.',
+    'department_already_exists' => 'En avdeling finnes allerede med det navnet i denne bedriftsplassen. Eller velg et mer spesifikt navn for denne avdelingen. ',
+    'assoc_users'	 => 'Denne avdelingen er knyttet til minst én bruker og kan ikke slettes. Oppdater brukerne ikke lenger refererer til denne avdelingen og prøv igjen. ',
+    'create' => array(
+        'error'   => 'Avdelingen ble ikke opprettet, prøv igjen.',
+        'success' => 'Avdeling opprettet.'
+    ),
+    'update' => array(
+        'error'   => 'Avdelingen ble ikke oppdatert, prøv igjen',
+        'success' => 'Avdeling oppdatert.'
+    ),
+    'delete' => array(
+        'confirm'   	=> 'Er du sikker på at du vil slette denne avdelingen?',
+        'error'   => 'Det var et problem med å slette avdelingen. Prøv på nytt.',
+        'success' => 'Avdelingen ble slettet.'
+    )
+
+);
diff --git a/resources/lang/nb-NO/admin/departments/table.php b/resources/lang/nb-NO/admin/departments/table.php
new file mode 100644
index 0000000000..3373541407
--- /dev/null
+++ b/resources/lang/nb-NO/admin/departments/table.php
@@ -0,0 +1,11 @@
+<?php
+
+return array(
+
+    'id'                        => 'ID',
+    'name'                      => 'Avdelingsnavn',
+    'manager'                   => 'Leder',
+    'location'                  => 'Plassering',
+    'create'                    => 'Opprett avdeling',
+    'update'                    => 'Oppdater avdeling',
+    );
diff --git a/resources/lang/nb-NO/admin/depreciations/general.php b/resources/lang/nb-NO/admin/depreciations/general.php
new file mode 100644
index 0000000000..e7a8b1b0af
--- /dev/null
+++ b/resources/lang/nb-NO/admin/depreciations/general.php
@@ -0,0 +1,20 @@
+<?php
+
+return [
+    'about_asset_depreciations'  			=> 'Om avskrivninger',
+    'about_depreciations'  					=> 'Du kan sette opp avskrivninger for å kostnadsføre eiendeler basert på en lineær avskrivning i perioden.',
+    'asset_depreciations'  					=> 'Avskrivninger',
+    'create'  					            => 'Opprett avskrivning',
+    'depreciation_name'  					=> 'Avskrivningsnavn',
+    'depreciation_min'                      => 'Nedre verdi for avskrivning',
+    'number_of_months'  					=> 'Antall måneder',
+    'update'  					            => 'Oppdater avskrivninger',
+    'depreciation_min'                      => 'Minimumsverdi etter avskrivning',
+    'no_depreciations_warning'               => '<strong>Advarsel:</strong>
+                      Du har for øyeblikket ingen avskrivninger satt opp.
+                      Vennligst sett opp minst én avskrivning for å se avskrivningsrapporten.',
+    'depreciation_method'                   => 'Avskrivningsrapport',
+    'linear_depreciation'                   => 'Linear (Default)',
+    'half_1'                                => 'Half-year convention, always applied',
+    'half_2'                                => 'Half-year convention, applied with condition',
+];
diff --git a/resources/lang/nb-NO/admin/depreciations/message.php b/resources/lang/nb-NO/admin/depreciations/message.php
new file mode 100644
index 0000000000..4c56baa473
--- /dev/null
+++ b/resources/lang/nb-NO/admin/depreciations/message.php
@@ -0,0 +1,25 @@
+<?php
+
+return array(
+
+    'does_not_exist' => 'Avskrivningen eksisterer ikke.',
+    'assoc_users'	 => 'Denne avskrivningen er tilknyttet én eller flere modeller og kan ikke slettes. Vennligst slett modellene og prøv å slette på nytt. ',
+
+
+    'create' => array(
+        'error'   => 'Avskrivningen ble ikke opprettet, vennligst prøv igjen. :(',
+        'success' => 'Avskrivningen ble opprettet. :)'
+    ),
+
+    'update' => array(
+        'error'   => 'Avskrivningen ble ikke oppdatert, vennligst prøv igjen',
+        'success' => 'Avskrivningen ble oppdatert.'
+    ),
+
+    'delete' => array(
+        'confirm'   => 'Er du sikker på at du vil slette denne avskrivningen ?',
+        'error'   => 'Det oppsto et problem med sletting av avskrivningen. Vennligst prøv igjen.',
+        'success' => 'Avskrivningen ble slettet.'
+    )
+
+);
diff --git a/resources/lang/nb-NO/admin/depreciations/table.php b/resources/lang/nb-NO/admin/depreciations/table.php
new file mode 100644
index 0000000000..4e986a38be
--- /dev/null
+++ b/resources/lang/nb-NO/admin/depreciations/table.php
@@ -0,0 +1,11 @@
+<?php
+
+return [
+
+    'id'      => 'ID',
+    'months'   => 'Måneder',
+    'term'   => 'Avskrivningsperiode',
+    'title'      => 'Navn ',
+    'depreciation_min' => 'Nedre verdi',
+
+];
diff --git a/resources/lang/nb-NO/admin/groups/message.php b/resources/lang/nb-NO/admin/groups/message.php
new file mode 100644
index 0000000000..1053f2c438
--- /dev/null
+++ b/resources/lang/nb-NO/admin/groups/message.php
@@ -0,0 +1,22 @@
+<?php
+
+return array(
+
+    'group_exists'        => 'Gruppen eksisterer allerede!',
+    'group_not_found'     => 'Gruppe-ID :id finnes ikke.',
+    'group_name_required' => 'Navnefeltet er påkrevd',
+
+    'success' => array(
+        'create' => 'Gruppen ble opprettet.',
+        'update' => 'Gruppen ble oppdatert.',
+        'delete' => 'Gruppen ble slettet.',
+    ),
+
+    'delete' => array(
+        'confirm'   => 'Er du sikker på at du vil slette denne gruppen?',
+        'create' => 'Det oppsto et problem med oppretting av gruppen. Vennligst prøv igjen.',
+        'update' => 'Det oppsto et problem med oppdatering av gruppen. Vennligst prøv igjen.',
+        'delete' => 'Det oppsto et problem med sletting av gruppen. Vennligst prøv igjen.',
+    ),
+
+);
diff --git a/resources/lang/nb-NO/admin/groups/table.php b/resources/lang/nb-NO/admin/groups/table.php
new file mode 100644
index 0000000000..e8f777138c
--- /dev/null
+++ b/resources/lang/nb-NO/admin/groups/table.php
@@ -0,0 +1,9 @@
+<?php
+
+return array(
+
+    'id'         => 'Id',
+    'name'       => 'Navn',
+    'users'      => 'Antall brukere',
+
+);
diff --git a/resources/lang/nb-NO/admin/groups/titles.php b/resources/lang/nb-NO/admin/groups/titles.php
new file mode 100644
index 0000000000..bce3673e6f
--- /dev/null
+++ b/resources/lang/nb-NO/admin/groups/titles.php
@@ -0,0 +1,16 @@
+<?php
+
+return [
+    'about_groups_title'            => 'Om grupper',
+    'about_groups'                  => 'Grupper brukes til å generalisere brukertillatelser.',
+    'group_management' 	 	=> 'Gruppeadministrasjon',
+    'create' 	 	 	    => 'Opprett ny gruppe',
+    'update' 	 		        => 'Rediger gruppe',
+    'group_name' 	 		=> 'Gruppenavn',
+    'group_admin' 	 		=> 'Gruppeadministrator',
+    'allow' 	 			=> 'Tillat',
+    'deny' 	 				=> 'Avslå',
+    'permission'            => 'Rettigheter',
+    'grant'                 => 'Gi tilgang',
+    'no_permissions'        => 'Denne gruppen har ingen rettigheter.'
+];
diff --git a/resources/lang/nb-NO/admin/hardware/form.php b/resources/lang/nb-NO/admin/hardware/form.php
new file mode 100644
index 0000000000..a042e9b9e3
--- /dev/null
+++ b/resources/lang/nb-NO/admin/hardware/form.php
@@ -0,0 +1,65 @@
+<?php
+
+return [
+    'bulk_delete'		=> 'Bekreft sletting av flere enheter',
+    'bulk_restore'      => 'Bekreft sletting av flere enheter', 
+  'bulk_delete_help'	=> 'Se gjennom listen over enheter som er valgt for sletting. Etter sletting er det mulig å gjenopprette enheter, men nåværende koblinger til brukere vil ikke lenger finnes.',
+  'bulk_restore_help'	=> 'Se gjennom ressursene for massegjennoppretning nedenfor. Når de er gjenopprettet vil ikke disse eiendelene være knyttet til brukere de ble gitt til tidligere.',
+  'bulk_delete_warn'	=> 'Du er i ferd med å slette :asset_count enheter.',
+  'bulk_restore_warn'	=> 'Du er i ferd med å gjennopprette :asset_count enheter.',
+    'bulk_update'		=> 'Masseoppdater eiendeler',
+    'bulk_update_help'	=> 'Dette skjemaet lar deg oppdatere flere eiendeler på en gang. Fyll kun ut feltene du ønsker å endre. Tomme felter forblir uendret. ',
+    'bulk_update_warn'	=> 'Du er i ferd med å endre egenskapene til en ressurs. Du er i ferd med å endre egenskapene til :asset_count enheter.',
+    'bulk_update_with_custom_field' => 'Merk at ressursene er av :asset_model_count ulike modeller.',
+    'bulk_update_model_prefix' => 'På modeller', 
+    'bulk_update_custom_field_unique' => 'Dette er et unikt felt og kan ikke masseredigeres.',
+    'checkedout_to'		=> 'Utsjekket til',
+    'checkout_date'		=> 'Utsjekkdato',
+    'checkin_date'		=> 'Innsjekkdato',
+    'checkout_to'		=> 'Sjekk ut til',
+    'cost'				=> 'Innkjøpskostnad',
+    'create'			=> 'Opprett eiendel',
+    'date'				=> 'Innkjøpsdato',
+    'depreciation'	    => 'avskrivninger',
+    'depreciates_on'	=> 'Avskrivningstype',
+    'default_location'	=> 'Standard plassering',
+    'default_location_phone' => 'Standard plasseringstelefon',
+    'eol_date'			=> 'EOL dato',
+    'eol_rate'			=> 'EOL-rate',
+    'expected_checkin'  => 'Forventet dato for innsjekk',
+    'expires'			=> 'Utløper',
+    'fully_depreciated'	=> 'Ferdig nedskrevet',
+    'help_checkout'		=> 'Hvis du ønsker å tildele denne eiendelen umiddelbart, velger du "klar til å distribuere" fra status listen ovenfor. ',
+    'mac_address'		=> 'MAC-adresse',
+    'manufacturer'		=> 'Produsent',
+    'model'				=> 'Modell',
+    'months'			=> 'måneder',
+    'name'				=> 'Navn',
+    'notes'				=> 'Notater',
+    'order'				=> 'Ordrenummer',
+    'qr'				=> 'QR-kode',
+    'requestable'		=> 'Brukere kan be om eiendel',
+    'redirect_to_all'   => 'Return to all :type',
+    'redirect_to_type'   => 'Go to :type',
+    'redirect_to_checked_out_to'   => 'Go to Checked Out to',
+    'select_statustype'	=> 'Velg statustype',
+    'serial'			=> 'Serienummer',
+    'status'			=> 'Status',
+    'tag'				=> 'Eiendelsmerke',
+    'update'			=> 'Oppdater eiendel',
+    'warranty'			=> 'Garanti',
+        'warranty_expires'		=> 'Garantien utløper',
+    'years'				=> 'år',
+    'asset_location' => 'Oppdater lokasjon for eiendelen',
+    'asset_location_update_default_current' => 'Oppdater standardlokasjon OG faktisk lokasjon',
+    'asset_location_update_default' => 'Oppdater bare standardlokasjon',
+    'asset_location_update_actual' => 'Oppdater bare faktisk plassering',
+    'asset_not_deployable' => 'Den eiendelstatusen gjør at denne eiendelen ikke kan sjekkes ut.',
+    'asset_not_deployable_checkin' => 'That asset status is not deployable. Using this status label will checkin the asset.',
+    'asset_deployable' => 'This asset can be checked out.',
+    'processing_spinner' => 'Behandler... (Dette kan ta litt tid for store filer)',
+    'processing' => 'Behandler... ',
+    'optional_infos'  => 'Valgfri informasjon',
+    'order_details'   => 'Ordrerelatert informasjon',
+    'calc_eol'    => 'If nulling the EOL date, use automatic EOL calculation based on the purchase date and EOL rate.',
+];
diff --git a/resources/lang/nb-NO/admin/hardware/general.php b/resources/lang/nb-NO/admin/hardware/general.php
new file mode 100644
index 0000000000..d9006fcf32
--- /dev/null
+++ b/resources/lang/nb-NO/admin/hardware/general.php
@@ -0,0 +1,42 @@
+<?php
+
+return [
+    'about_assets_title'           => 'Om assets',
+    'about_assets_text'            => 'Eiendeler er sporet av serienummer eller assetsmerke.  De pleier å være høyere verdi f. eks for å identifisere spesielle ting.',
+    'archived'  				=> 'Arkivert',
+    'asset'  					=> 'Eiendel',
+    'bulk_checkout'             => 'Masseutsjekk',
+    'bulk_checkin'              => 'Bulk Checkin',
+    'checkin'  					=> 'Sjekk inn eiendel',
+    'checkout'  				=> 'Sjekk ut asset',
+    'clone'  					=> 'Klon eiendel',
+    'deployable'  				=> 'Utleverbar',
+    'deleted'  					=> 'Denne eiendelen har blitt slettet.',
+    'delete_confirm'            => 'Er du sikker på at du vil slette denne ressursen?',
+    'edit'  					=> 'Rediger eiendel',
+    'model_deleted'  			=> 'Denne eiendelsmodellen er slettet. Du må gjenopprette modellen før du kan gjenopprette eiendelen.',
+    'model_invalid'             => 'This model for this asset is invalid.',
+    'model_invalid_fix'         => 'The asset must be updated use a valid asset model before attempting to check it in or out, or to audit it.',
+    'requestable'               => 'Forespørrbar',
+    'requested'				    => 'Forespurt',
+    'not_requestable'           => 'Ikke mulig å spørre etter',
+    'requestable_status_warning' => 'Ikke endre forespørselsstatus',
+    'restore'  					=> 'Gjenopprett eiendel',
+    'pending'  					=> 'Under arbeid',
+    'undeployable'  			=> 'Ikke utleverbar',
+    'undeployable_tooltip'  	=> 'Denne ressursen har en statusetikett som ikke er distribuerbar og kan ikke sjekkes ut på dette tidspunktet.',
+    'view'  					=> 'Vis eiendel',
+    'csv_error' => 'Du har en feil i din CSV-fil:',
+    'import_text' => '<p>Upload a CSV that contains asset history. The assets and users MUST already exist in the system, or they will be skipped. Matching assets for history import happens against the asset tag. We will try to find a matching user based on the user\'s name you provide, and the criteria you select below. If you do not select any criteria below, it will simply try to match on the username format you configured in the <code>Admin &gt; General Settings</code>.</p><p>Fields included in the CSV must match the headers: <strong>Asset Tag, Name, Checkout Date, Checkin Date</strong>. Any additional fields will be ignored. </p><p>Checkin Date: blank or future checkin dates will checkout items to associated user.  Excluding the Checkin Date column will create a checkin date with todays date.</p>    ',
+    'csv_import_match_f-l' => 'Prøv å matche brukere av <strong>firstname.lastname</strong> (<code>jane.smith</code>) format',
+    'csv_import_match_initial_last' => 'Prøv å matche brukere med <strong>første første etternavn</strong> (<code>jsmith</code>) format',
+    'csv_import_match_first' => 'Prøv å matche brukere med <strong>fornavn</strong> (<code>jane</code>) format',
+    'csv_import_match_email' => 'Prøv å matche brukere med <strong>email</strong> som brukernavn',
+    'csv_import_match_username' => 'Prøv å matche brukere av <strong>brukernavn</strong>',
+    'error_messages' => 'Feilmeldinger:',
+    'success_messages' => 'Suksessmeldinger:',
+    'alert_details' => 'Vennligst se nedenfor for detaljer.',
+    'custom_export' => 'Egendefinert eksport',
+    'mfg_warranty_lookup' => ':manufacturer Garanti statusoppslag',
+    'user_department' => 'Bruker avdeling',
+];
diff --git a/resources/lang/nb-NO/admin/hardware/message.php b/resources/lang/nb-NO/admin/hardware/message.php
new file mode 100644
index 0000000000..04b3f4ceb7
--- /dev/null
+++ b/resources/lang/nb-NO/admin/hardware/message.php
@@ -0,0 +1,109 @@
+<?php
+
+return [
+
+    'undeployable' 		 => '<strong>Advarsel:</strong> Denne eiendelen er merket som ikke utplasserbar. Vennligst endre status for eiendel dette har endret seg.',
+    'does_not_exist' 	 => 'Eiendel eksisterer ikke.',
+    'does_not_exist_var' => 'Asset with tag :asset_tag not found.',
+    'no_tag' 	         => 'No asset tag provided.',
+    'does_not_exist_or_not_requestable' => 'Eiendelen eksisterer ikke eller kan ikke forespørres.',
+    'assoc_users'	 	 => 'Denne eiendelen er merket som utsjekket til en bruker og kan ikke slettes. Vennligst sjekk inn eiendelen først, og forsøk sletting på nytt. ',
+    'warning_audit_date_mismatch' 	=> 'This asset\'s next audit date (:next_audit_date) is before the last audit date (:last_audit_date). Please update the next audit date.',
+    'labels_generated'   => 'Labels were successfully generated.',
+    'error_generating_labels' => 'Error while generating labels.',
+    'no_assets_selected' => 'No assets selected.',
+
+    'create' => [
+        'error'   		=> 'Eiendelen ble ikke opprettet, prøv igjen :(',
+        'success' 		=> 'Eiendelen ble opprettet :)',
+        'success_linked' => 'Eiendelen med taggen :tag ble opprettet. <strong><a href=":link" style="color: white;">Klikk her for å vise</a></strong>.',
+        'multi_success_linked' => 'Asset with tag :links was created successfully.|:count assets were created succesfully. :links.',
+        'partial_failure' => 'An asset was unable to be created. Reason: :failures|:count assets were unable to be created. Reasons: :failures',
+    ],
+
+    'update' => [
+        'error'   			=> 'Eiendelen ble ikke oppdatert, prøv igjen',
+        'success' 			=> 'Oppdatering av eiendel vellykket.',
+        'encrypted_warning' => 'Eiendel er oppdatert, men kryptert tilpassede felter var ikke grunnet tillatelser',
+        'nothing_updated'	=>  'Ingen felter er valgt, så ingenting ble endret.',
+        'no_assets_selected'  =>  'Ingen felter er valgt, så ingenting ble endret.',
+        'assets_do_not_exist_or_are_invalid' => 'Valgte eiendeler kan ikke oppdateres.',
+    ],
+
+    'restore' => [
+        'error'   		=> 'Eiendel ble ikke gjenopprettet. Prøv igjen',
+        'success' 		=> 'Vellykket gjenoppretting av eiendel.',
+        'bulk_success' 		=> 'Ressursen ble gjenopprettet.',
+        'nothing_updated'   => 'Inger ressurser ble valgt, så ingenting ble gjenoprettet.', 
+    ],
+
+    'audit' => [
+        'error'   		=> 'Asset audit unsuccessful: :error ',
+        'success' 		=> 'Asset audit ble logget.',
+    ],
+
+
+    'deletefile' => [
+        'error'   => 'Fil ble ikke slettet. Prøv igjen.',
+        'success' => 'Vellykket sletting av fil.',
+    ],
+
+    'upload' => [
+        'error'   => 'Fil(er) ble ikke lastet opp. Prøv igjen.',
+        'success' => 'Vellykket opplasting av fil(er).',
+        'nofiles' => 'Ingen fil er valgt til opplasting, eller filen er for stor',
+        'invalidfiles' => 'En eller flere av filene dine er for store eller av en ikke tillatt filtype. Tillatte filtyper er png, gif, jpg, doc, docx, pdf og txt.',
+    ],
+
+    'import' => [
+        'import_button'         => 'Process Import',
+        'error'                 => 'Noen elementer ble ikke importert riktig.',
+        'errorDetail'           => 'Følgende elementer ble ikke importert på grunn av feil.',
+        'success'               => 'Filen har blitt importert',
+        'file_delete_success'   => 'Filen har blitt slettet',
+        'file_delete_error'      => 'Filen kunne ikke bli slettet',
+        'file_missing' => 'Valgt fil mangler (fant ikke filen)',
+        'file_already_deleted' => 'The file selected was already deleted',
+        'header_row_has_malformed_characters' => 'En eller flere attributter i overskriftsraden inneholder feilformede UTF-8 tegn',
+        'content_row_has_malformed_characters' => 'En eller flere attributter i første rad i inneholdet inneholder feilformet UTF-8 tegn',
+        'transliterate_failure' => 'Transliteration from :encoding to UTF-8 failed due to invalid characters in input'
+    ],
+
+
+    'delete' => [
+        'confirm'   	=> 'Er du sikker på at du vil slette eiendelen?',
+        'error'   		=> 'Det oppstod et problem under sletting av eiendel. Vennligst prøv igjen.',
+        'assigned_to_error' => '{1}Asset Tag: :asset_tag is currently checked out. Check in this device before deletion.|[2,*]Asset Tags: :asset_tag are currently checked out. Check in these devices before deletion.',
+        'nothing_updated'   => 'Ingen assets ble valgt, så ingenting ble slettet.',
+        'success' 		=> 'Vellykket sletting av eiendel.',
+    ],
+
+    'checkout' => [
+        'error'   		=> 'Eiendel ble ikke sjekket ut. Prøv igjen',
+        'success' 		=> 'Vellykket utsjekk av eiendel.',
+        'user_does_not_exist' => 'Denne brukeren er ugyldig. Vennligst prøv igjen.',
+        'not_available' => 'Den eiendelen er ikke tilgjengelig til å sjekkes ut!',
+        'no_assets_selected' => 'Du må velge minst én enhet fra listen',
+    ],
+
+    'multi-checkout' => [
+        'error'   => 'Asset was not checked out, please try again|Assets were not checked out, please try again',
+        'success' => 'Asset checked out successfully.|Assets checked out successfully.',
+    ],
+
+    'checkin' => [
+        'error'   		=> 'Eiendel ble ikke sjekket inn. Prøv igjen',
+        'success' 		=> 'Vellykket innsjekk av eiendel.',
+        'user_does_not_exist' => 'Denne brukeren er ugyldig. Vennligst prøv igjen.',
+        'already_checked_in'  => 'Den eiendelen er allerede sjekket inn.',
+
+    ],
+
+    'requests' => [
+        'error'   		=> 'Request was not successful, please try again.',
+        'success' 		=> 'Request successfully submitted.',
+        'canceled'      => 'Request successfully canceled.',
+        'cancel'        => 'Avbryt forespørsel om element',
+    ],
+
+];
diff --git a/resources/lang/nb-NO/admin/hardware/table.php b/resources/lang/nb-NO/admin/hardware/table.php
new file mode 100644
index 0000000000..38b67932af
--- /dev/null
+++ b/resources/lang/nb-NO/admin/hardware/table.php
@@ -0,0 +1,32 @@
+<?php
+
+return [
+
+    'asset_tag'   	=> 'Eiendelsmerke',
+    'asset_model'       => 'Modell',
+    'assigned_to'   => 'Tilordnet til',
+    'book_value'  	=> 'Gjeldende verdi',
+    'change' 		=> 'Inne/ute',
+    'checkout_date' => 'Utsjekkdato',
+    'checkoutto' 	=> 'Utsjekket',
+    'components_cost' => 'Total komponentkostnad',
+    'current_value' => 'Gjeldende verdi',
+    'diff' 			=> 'Forskjell',
+    'dl_csv' 		=> 'Last ned CSV',
+    'eol' 			=> 'EOL',
+    'id'      		=> 'ID',
+    'last_checkin_date' => 'Siste innsjeksdato',
+    'location' 		=> 'Plassering',
+    'purchase_cost'	=> 'Kostnad',
+    'purchase_date'	=> 'Kjøpt',
+    'serial'   		=> 'Serienummer',
+    'status'   		=> 'Status',
+    'title'      	=> 'Eiendel ',
+    'image'		    => 'Enhet bilde',
+    'days_without_acceptance' => 'Dager uten aksept',
+    'monthly_depreciation' => 'Månedlig avskrivning',
+    'requesting_user' => 'Forespurt av',
+    'requested_date' => 'Dato forespurt',
+    'changed'       => 'Endret',
+    'icon' => 'Symbol',
+];
diff --git a/resources/lang/nb-NO/admin/kits/general.php b/resources/lang/nb-NO/admin/kits/general.php
new file mode 100644
index 0000000000..9f157e0449
--- /dev/null
+++ b/resources/lang/nb-NO/admin/kits/general.php
@@ -0,0 +1,51 @@
+<?php
+
+return [
+    'about_kits_title'                  => 'Om forhåndsdefinerte sett',
+    'about_kits_text'                   => 'Forhåndsdefinerte sett lar deg raskt sjekke ut en samling av utstyr (eiendeler, lisenser, etc) til en bruker. Dette kan være nyttig når onboarding-prosessen er konsistent på tvers av mange brukere, slik at alle brukere skal ha det samme utstyret.',
+    'checkout'                          => 'Sjekk ut sett ',
+    'create_success'                    => 'Settet har blitt opprettet.',
+    'create'                            => 'Opprett forhåndsdefinert sett',
+    'update'                            => 'Oppdater forhåndsdefinert sett',
+    'delete_success'                    => 'Settet har blitt slettet.',
+    'update_success'                    => 'Settet har blitt oppdatert.',
+    'none_models'                       => 'Det er ikke nok tilgjengelige ressurser for å sjekke ut :model. Vi trenger :qty stk. ',
+    'none_licenses'                     => 'Det er ikke nok seter for :license til å sjekke ut. Det trengs :qty ekstra. ',
+    'none_consumables'                  => 'Det er ikke nok tilgjengelige :consumable til å sjekke ut. Det trengs :qty. ',
+    'none_accessory'                    => 'Det er ikke nok tilgjengelige :accessory til å sjekke ut. Det trengs :qty. ',
+    'append_accessory'                  => 'Legg til tilbehør',
+    'update_appended_accessory'         => 'Oppdater tilbehør som er lagt til',
+    'append_consumable'                 => 'Legg til forbruksvare',
+    'update_appended_consumable'        => 'Oppdater forbruksvare som er lagt til',
+    'append_license'                    => 'Legg til lisens',
+    'update_appended_license'           => 'Oppdater lisens som er lagt til',
+    'append_model'                      => 'Legg til modell',
+    'update_appended_model'             => 'Oppdater modell',
+    'license_error'                     => 'Lisensen er allerede i settet',
+    'license_added_success'             => 'Lisensen ble lagt til',
+    'license_updated'                   => 'Lisensen ble oppdatert',
+    'license_none'                      => 'Lisens eksisterer ikke',
+    'license_detached'                  => 'Lisensen ble koblet fra',
+    'consumable_added_success'          => 'Forbruksvare lagt til',
+    'consumable_updated'                => 'Forbruksvaren ble oppdatert',
+    'consumable_error'                  => 'Forbruksvaren er allerede i settet',
+    'consumable_deleted'                => 'Slettingen var vellykket',
+    'consumable_none'                   => 'Forbruksvaren finnes ikke',
+    'consumable_detached'               => 'Forbruksvaren ble fjernet',
+    'accessory_added_success'           => 'Tilbehør lagt til',
+    'accessory_updated'                 => 'Tilbehøret ble oppdatert',
+    'accessory_detached'                => 'Tilbehør ble koblet fra',
+    'accessory_error'                   => 'Tilbehøret er allerede i settet',
+    'accessory_deleted'                 => 'Slettingen var vellykket',
+    'accessory_none'                    => 'Tilbehøret finnes ikke',
+    'checkout_success'                  => 'Utsjekk vellykket',
+    'checkout_error'                    => 'Feil ved utsjekk',
+    'kit_none'                          => 'Settet eksisterer ikke',
+    'kit_created'                       => 'Settet ble opprettet',
+    'kit_updated'                       => 'Settet har blitt oppdatert',
+    'kit_not_found'                     => 'Settet ble ikke funnet',
+    'kit_deleted'                       => 'Settet har blitt slettet',
+    'kit_model_updated'                 => 'Modellen ble oppdatert',
+    'kit_model_detached'                => 'Modellen har blitt frakoblet',
+    'model_already_attached'            => 'Model already attached to kit',
+];
diff --git a/resources/lang/nb-NO/admin/labels/message.php b/resources/lang/nb-NO/admin/labels/message.php
new file mode 100644
index 0000000000..4e32365cfe
--- /dev/null
+++ b/resources/lang/nb-NO/admin/labels/message.php
@@ -0,0 +1,11 @@
+<?php
+
+return [
+
+    'invalid_return_count' => 'Ugyldig antall returnert fra :name. Forventet :expected, fikk :actual.',
+    'invalid_return_type'  => 'Ugyldig type returnert fra :name. Forventet :expected, fikk :actual.',
+    'invalid_return_value' => 'Ugyldig verdi returnert fra :name. Forventet :expected, fikk :actual.',
+
+    'does_not_exist' => 'Etiketten finnes ikke',
+    
+];
diff --git a/resources/lang/nb-NO/admin/labels/table.php b/resources/lang/nb-NO/admin/labels/table.php
new file mode 100644
index 0000000000..5bc5429c6e
--- /dev/null
+++ b/resources/lang/nb-NO/admin/labels/table.php
@@ -0,0 +1,19 @@
+<?php
+
+return [
+    'example_company'    => 'Test bedrift begrenset',
+    'example_defaultloc' => 'Bygning 1',
+    'example_category'   => 'Test kategori',
+    'example_location'   => 'Bygning 2',
+    'example_manufacturer'  => 'Test Manufacturing Inc.',
+    'example_model'      => 'Test modell',
+    'example_supplier'   => 'Test bedrift begrenset',
+    'labels_per_page'    => 'Etiketter',
+    'support_fields'     => 'Felt',
+    'support_asset_tag'  => 'Etikett',
+    'support_1d_barcode' => '1D',
+    'support_2d_barcode' => '2D',
+    'support_logo'       => 'Logo',
+    'support_title'      => 'Tittel',
+
+];
\ No newline at end of file
diff --git a/resources/lang/nb-NO/admin/licenses/form.php b/resources/lang/nb-NO/admin/licenses/form.php
new file mode 100644
index 0000000000..47a1ffcc07
--- /dev/null
+++ b/resources/lang/nb-NO/admin/licenses/form.php
@@ -0,0 +1,22 @@
+<?php
+
+return array(
+
+    'asset'             => 'Eiendel',
+    'checkin'           => 'Sjekk inn',
+    'create'            => 'Opprett lisens',
+    'expiration'        => 'Utløpsdato',
+    'license_key'       => 'Produktnøkkel',
+    'maintained'        => 'Vedlikeholdt',
+    'name'              => 'Navn programvare',
+    'no_depreciation'   => 'Ingen avskrivning',
+    'purchase_order'    => 'Innkjøpsordrenummer',
+    'reassignable'      => 'Kan tildeles på ny',
+    'remaining_seats'   => 'Gjenværende setelisenser',
+    'seats'             => 'Setelisenser',
+    'termination_date'  => 'Sluttdato',
+    'to_email'          => 'Lisensiert til e-post',
+    'to_name'           => 'Lisensiert til navn',
+    'update'            => 'Oppdater lisens',
+    'checkout_help'     => 'Du må sjekke ut en lisens til en maskinvare- eller person-eiendel. Du kan velge begge, men eier av eiendel må være lik den du sjekker eiendel ut til.'
+);
diff --git a/resources/lang/nb-NO/admin/licenses/general.php b/resources/lang/nb-NO/admin/licenses/general.php
new file mode 100644
index 0000000000..21df57a62a
--- /dev/null
+++ b/resources/lang/nb-NO/admin/licenses/general.php
@@ -0,0 +1,52 @@
+<?php
+
+return array(
+    'about_licenses_title'      => 'Om lisenser',
+    'about_licenses'            => 'Lisenser er brukt til å spore bruk av programvare.  De har et angitt antall seter som kan sjekkes ut til enkeltpersoner',
+    'checkin'  					=> 'Sjekk inn setelisens',
+    'checkout_history'  		=> 'Utsjekkhistorikk',
+    'checkout'  				=> 'Sjekk ut setelisens',
+    'edit'  					=> 'Rediger lisens',
+    'filetype_info'				=> 'Gyldige filtyper er png, gif, jpg, jpeg, doc docx, pdf, txt, zip og rar.',
+    'clone'  					=> 'Klon lisens',
+    'history_for'  				=> 'Historikk for ',
+    'in_out'  					=> 'Inne/ute',
+    'info'  					=> 'Lisensinformasjon',
+    'license_seats'  			=> 'Setelisenser',
+    'seat'  					=> 'Setelisens',
+    'seat_count'  				=> 'Seat :count',
+    'seats'  					=> 'Setelisenser',
+    'software_licenses'  		=> 'Programvarelisenser',
+    'user'  					=> 'Bruker',
+    'view'  					=> 'Vis lisens',
+    'delete_disabled'           => 'Denne lisensen kan ikke slettes ennå fordi det fremdeles er noen seter i den som er sjekket ut.',
+    'bulk'                      =>
+        [
+            'checkin_all'           => [
+                'button'            => 'Sjekk inn alle seter',
+                'modal'             => 'This action will checkin one seat. | This action will checkin all :checkedout_seats_count seats for this license.',
+                'enabled_tooltip'   => 'Sjekk inn ALLE seter for denne lisensen fra både brukere og ressurser',
+                'disabled_tooltip'  => 'Dette er deaktivert fordi det ikke er seter som er sjekket ut',
+                'disabled_tooltip_reassignable'  => 'Dette er deaktivert fordi lisensen ikke kan refordeles',
+                'success'           => 'Lisensen ble sjekket inn! | Alle lisensene ble vellykket sjekket inn!',
+                'log_msg'           => 'Checked in via bulk license checkin in license GUI',
+            ],
+
+            'checkout_all'              => [
+                'button'                => 'Sjekk ut alle seter',
+                'modal'                 => 'Denne handlingen vil utsjekke ett sete til den første tilgjengelige brukeren. | Denne handlingen vil kassere alle :available_seats_count seter til de første tilgjengelige brukerne. En bruker anses som tilgjengelig for dette setet hvis de ikke allerede har sjekket ut denne lisensen til dem, og Auto-Assign License egenskapen er aktivert på deres brukerkonto.',
+                'enabled_tooltip'   => 'Sjekk ut ALLE seter (eller så mange som er tilgjengelige) til ALLE brukere',
+                'disabled_tooltip'  => 'Dette er deaktivert fordi det ikke er tilgjengelige seter for øyeblikket',
+                'success'           => 'Lisensen ble sjekket ut! | :count lisenser ble vellykket sjekket ut!',
+                'error_no_seats'    => 'Det er ingen gjenværende seter igjen for denne lisensen.',
+                'warn_not_enough_seats'    => ':count brukere ble tildelt denne lisensen, men vi gikk tom for tilgjengelige lisensseter.',
+                'warn_no_avail_users'    => 'Ingenting å gjøre. Det er ingen brukere som ikke allerede har denne lisensen tildelt dem.',
+                'log_msg'           => 'Sjekket ut via masselisensutsjekking i lisens GUI',
+
+
+            ],
+    ],
+
+    'below_threshold' => 'Det er bare :remaining_count seter igjen for denne lisensen med et minimum av :min_amt. Du kan vurdere å kjøpe flere seter.',
+    'below_threshold_short' => 'Denne varen er under det minstekravene kreves.',
+);
diff --git a/resources/lang/nb-NO/admin/licenses/message.php b/resources/lang/nb-NO/admin/licenses/message.php
new file mode 100644
index 0000000000..d788f77a2a
--- /dev/null
+++ b/resources/lang/nb-NO/admin/licenses/message.php
@@ -0,0 +1,57 @@
+<?php
+
+return array(
+
+    'does_not_exist' => 'Lisensen finnes ikke, eller du har ikke tillatelse til å se den.',
+    'user_does_not_exist' => 'Brukeren finnes ikke, eller du har ikke tillatelse til å se dem.',
+    'asset_does_not_exist' 	=> 'Eiendelen du prøver å koble til denne lisensen eksisterer ikke.',
+    'owner_doesnt_match_asset' => 'Eiendelen du prøver å koble til denne lisensen er eid av noen andre enn personen du har valgt i tildelt til-nedtrekkslista.',
+    'assoc_users'	 => 'Denne lisensen er sjekket ut til en bruker og kan ikke slettes. Vennligst sjekk inn lisensen først, og forsøk sletting på nytt. ',
+    'select_asset_or_person' => 'Du må velge en ressurs eller en bruker, men ikke begge.',
+    'not_found' => 'Lisens ikke funnet',
+    'seats_available' => ':seat_count seter tilgjengelige',
+
+
+    'create' => array(
+        'error'   => 'Lisens ble ikke opprettet, prøv igjen.',
+        'success' => 'Vellykket opprettelse av lisens.'
+    ),
+
+    'deletefile' => array(
+        'error'   => 'Fil ble ikke slettet. Prøv igjen.',
+        'success' => 'Fil ble slettet.',
+    ),
+
+    'upload' => array(
+        'error'   => 'Fil(er) ble ikke lastet opp. Prøv igjen.',
+        'success' => 'Fil(er) ble slettet.',
+        'nofiles' => 'Ingen fil er valgt til opplasting, eller filen er for stor',
+        'invalidfiles' => 'En eller flere av filene er for stor, eller er en filtype som ikke er tillatt. Tillatte filtyper er png, gif, jpg, jpeg, doc, docx, pdf, txt, zip, rar, rtf, xml, og lic.',
+    ),
+
+    'update' => array(
+        'error'   => 'Lisens ble ikke oppdatert, prøv igjen',
+        'success' => 'Vellykket oppdatering av lisens.'
+    ),
+
+    'delete' => array(
+        'confirm'   => 'Er du sikker på at du vil slette denne lisensen?',
+        'error'   => 'Det oppstod et problem under sletting av lisens. Vennligst prøv igjen.',
+        'success' => 'Vellykket sletting av lisens.'
+    ),
+
+    'checkout' => array(
+        'error'   => 'Det oppstod et problem under utsjekk av lisens. Vennligst prøv igjen.',
+        'success' => 'Vellykket utsjekk av lisens',
+        'not_enough_seats' => 'Ikke nok lisensseter tilgjengelige for utsjekking',
+        'mismatch' => 'The license seat provided does not match the license',
+        'unavailable' => 'This seat is not available for checkout.',
+    ),
+
+    'checkin' => array(
+        'error'   => 'Det oppstod et problem under innsjekk av lisens. Vennligst prøv igjen.',
+        'not_reassignable' => 'License not reassignable',
+        'success' => 'Vellykket innsjekk av lisens'
+    ),
+
+);
diff --git a/resources/lang/nb-NO/admin/licenses/table.php b/resources/lang/nb-NO/admin/licenses/table.php
new file mode 100644
index 0000000000..dc6b160311
--- /dev/null
+++ b/resources/lang/nb-NO/admin/licenses/table.php
@@ -0,0 +1,18 @@
+<?php
+
+return array(
+
+    'assigned_to'   	=> 'Tildelt til',
+    'checkout'   		=> 'Inne/ute',
+    'deleted_at'        => 'Slettet ved',
+    'id'      			=> 'ID',
+    'license_email'   	=> 'Lisens e-post',
+    'license_name'   	=> 'Lisensiert til',
+    'purchase_date'   	=> 'Kjøpedato',
+    'purchased'   		=> 'Kjøpt',
+    'seats'   			=> 'Setelisenser',
+    'hardware'   		=> 'Maskinvare',
+    'serial'   			=> 'Serienummer',
+    'title'      		=> 'Lisens',
+
+);
diff --git a/resources/lang/nb-NO/admin/locations/message.php b/resources/lang/nb-NO/admin/locations/message.php
new file mode 100644
index 0000000000..62c2156916
--- /dev/null
+++ b/resources/lang/nb-NO/admin/locations/message.php
@@ -0,0 +1,35 @@
+<?php
+
+return array(
+
+    'does_not_exist' => 'Lokasjon eksisterer ikke.',
+    'assoc_users'    => 'This location is not currently deletable because it is the location of record for at least one asset or user, has assets assigned to it, or is the parent location of another location. Please update your records to no longer reference this location and try again ',
+    'assoc_assets'	 => 'Lokasjonen er tilknyttet minst en eiendel og kan ikke slettes. Oppdater dine eiendeler slik at de ikke refererer til denne lokasjonen, og prøv igjen. ',
+    'assoc_child_loc'	 => 'Lokasjonen er overordnet til minst en underlokasjon og kan ikke slettes. Oppdater din lokasjoner til å ikke referere til denne lokasjonen, og prøv igjen. ',
+    'assigned_assets' => 'Tildelte ressurser',
+    'current_location' => 'Gjeldende plassering',
+    'open_map' => 'Open in :map_provider_icon Maps',
+
+
+    'create' => array(
+        'error'   => 'Lokasjon ble ikke opprettet, prøv igjen.',
+        'success' => 'Vellykket opprettelse av lokasjon.'
+    ),
+
+    'update' => array(
+        'error'   => 'Lokasjon ble ikke oppdatert, prøv igjen',
+        'success' => 'Vellykket oppdatering av plassering.'
+    ),
+
+    'restore' => array(
+        'error'   => 'Location was not restored, please try again',
+        'success' => 'Location restored successfully.'
+    ),
+
+    'delete' => array(
+        'confirm'   	=> 'Er du sikker på at du vil slette denne plasseringen?',
+        'error'   => 'Det oppstod et problem under sletting av plassering. Vennligst prøv igjen.',
+        'success' => 'Vellykket sletting av plassering.'
+    )
+
+);
diff --git a/resources/lang/nb-NO/admin/locations/table.php b/resources/lang/nb-NO/admin/locations/table.php
new file mode 100644
index 0000000000..767d3fea4c
--- /dev/null
+++ b/resources/lang/nb-NO/admin/locations/table.php
@@ -0,0 +1,43 @@
+<?php
+
+return [
+    'about_locations_title'     => 'Om Lokasjoner',
+    'about_locations'           => 'Plassering brukes til å spore stedsinformasjon for brukere, eiendeler og andre elementer',
+    'assets_rtd'                => 'Eiendeler', // This has NEVER meant Assets Retired. I don't know how it keeps getting reverted.
+    'assets_checkedout'         => 'Eiendeler tildelt',
+    'id'                        => 'ID',
+    'city'                      => 'By',
+    'state'                     => 'Stat',
+    'country'                   => 'Land',
+    'create'                    => 'Opprett plassering',
+    'update'                    => 'Oppdater plassering',
+    'print_assigned'            => 'Skriv ut tilordnede',
+    'print_all_assigned'        => 'Skriv ut alle tilordnede',
+    'name'                      => 'Plasseringsnavn',
+    'address'                   => 'Adresse',
+    'address2'                   => 'Adresselinje 2',
+    'zip'                       => 'Postnummer',
+    'locations'                 => 'Plasseringer',
+    'parent'                    => 'Overordnet',
+    'currency'                  => 'Valuta i lokasjon',
+    'ldap_ou'                   => 'LDAP-søk OU',
+    'user_name'                 => 'Brukernavn',
+    'department'                => 'Avdeling',
+    'location'                  => 'Lokasjon',
+    'asset_tag'                 => 'Eiendelsmerke',
+    'asset_name'                => 'Navn',
+    'asset_category'            => 'Kategori',
+    'asset_manufacturer'        => 'Produsent',
+    'asset_model'               => 'Modell',
+    'asset_serial'              => 'Serienummer',
+    'asset_location'            => 'Lokasjon',
+    'asset_checked_out'         => 'Utsjekket',
+    'asset_expected_checkin'    => 'Forventet innsjekk',
+    'date'                      => 'Dato:',
+    'phone'                     => 'Sted telefon',
+    'signed_by_asset_auditor'   => 'Signert av (Eiendelskontrollør):',
+    'signed_by_finance_auditor' => 'Undertegnet av (finansrevisor):',
+    'signed_by_location_manager' => 'Signert av (Stedsansvarlig):',
+    'signed_by'                 => 'Signert av:',
+    'clone'  					=> 'Clone Location',
+];
diff --git a/resources/lang/nb-NO/admin/manufacturers/message.php b/resources/lang/nb-NO/admin/manufacturers/message.php
new file mode 100644
index 0000000000..83aab0c4f3
--- /dev/null
+++ b/resources/lang/nb-NO/admin/manufacturers/message.php
@@ -0,0 +1,30 @@
+<?php
+
+return array(
+
+    'support_url_help' => 'Variabler <code>{LOCALE}</code>, <code>{SERIAL}</code>, <code>{MODEL_NUMBER}</code>og <code>{MODEL_NAME}</code> kan brukes i din URL for å få disse verdiene auto-populere når du ser ressurser - for eksempel https://checkcoverage.apple.com/{LOCALE}/{SERIAL}.',
+    'does_not_exist' => 'Produsent eksisterer ikke.',
+    'assoc_users'	 => 'Denne produsenten er tilknyttet minst en modell og kan ikke slettes. Oppdatèr modellen(e) til ikke å bruke denne produsenten, og prøv igjen. ',
+
+    'create' => array(
+        'error'   => 'Produsent ble ikke opprettet. Prøv igjen.',
+        'success' => 'Opprettelse av produsent vellykket.'
+    ),
+
+    'update' => array(
+        'error'   => 'Produsent ble ikke oppdatert. Prøv igjen',
+        'success' => 'Oppdatering av produsent vellykket.'
+    ),
+
+    'restore' => array(
+        'error'   => 'Produsent ble ikke gjenopprettet. Prøv igjen',
+        'success' => 'Gjenopprettelse av produsent vellykket.'
+    ),
+
+    'delete' => array(
+        'confirm'   => 'Er du sikker på at du vil slette denne produsenten?',
+        'error'   => 'Det oppstod et problem under sletting av produsenten. Prøv igjen.',
+        'success' => 'Sletting av produsenten var vellykket.'
+    )
+
+);
diff --git a/resources/lang/nb-NO/admin/manufacturers/table.php b/resources/lang/nb-NO/admin/manufacturers/table.php
new file mode 100644
index 0000000000..084bb0392d
--- /dev/null
+++ b/resources/lang/nb-NO/admin/manufacturers/table.php
@@ -0,0 +1,16 @@
+<?php
+
+return array(
+    'about_manufacturers_title'    => 'Om produsenter',
+    'about_manufacturers_text'  => 'Produsenter er firmaer som lager dine eiendeler. Du kan lagre viktig kundestøtte kontaktinformasjon om dem her, som vises på sidene om asset-detaljer.',
+    'asset_manufacturers'	=> 'Eiendelsprodusenter',
+    'create'				=> 'Opprett produsent',
+    'id'   					=> 'ID',
+    'name'      			=> 'Navn',
+    'support_email'   		=> 'Støtte epost',
+    'support_phone'   		=> 'Støttetelefon',
+    'support_url'   		=> 'Support URL',
+    'warranty_lookup_url'   => 'Garanti oppslag URL',
+    'update'				=> 'Endre produsent',
+
+);
diff --git a/resources/lang/nb-NO/admin/models/general.php b/resources/lang/nb-NO/admin/models/general.php
new file mode 100644
index 0000000000..4a1b51f4f7
--- /dev/null
+++ b/resources/lang/nb-NO/admin/models/general.php
@@ -0,0 +1,18 @@
+<?php
+
+return array(
+    'about_models_title'     => 'Om asset modeller',
+    'about_models_text'           => 'Asset modeller er en måte å gruppere identiske eiendeler. "MBP 2013", "IPhone 6s", etc.',
+    'deleted'  					=> 'Denne modellen har blitt slettet.',
+    'bulk_delete'               => 'Bulk slett modeller',
+    'bulk_delete_help'               => 'Bruk merkeboksene nedenfor til å bekrefte sletting av de merkede modellene. Modeller som har eiendeler tilknyttet kan ikke slettes før eiendelene har blitt tilknyttet en annen modell.',
+    'bulk_delete_warn'          => 'Du er i ferd med å slette en ressursmodell. | Du er i ferd med å slette :model_count modeller.',
+    'restore'                   => 'Gjenopprett modell',
+    'requestable'               => 'Brukere kan be om denne modellen',
+	'show_mac_address'			      => 'Vis felt for MAC-adresse for denne modellen',
+    'view_deleted'              => 'Vis slettede',
+    'view_models'               => 'Vis modeller',
+    'fieldset'                  => 'Felt',
+    'no_custom_field'           => 'Ingen egendefinerte felt',
+    'add_default_values'        => 'Legg til standardverdier',
+);
diff --git a/resources/lang/nb-NO/admin/models/message.php b/resources/lang/nb-NO/admin/models/message.php
new file mode 100644
index 0000000000..002a35bffa
--- /dev/null
+++ b/resources/lang/nb-NO/admin/models/message.php
@@ -0,0 +1,47 @@
+<?php
+
+return array(
+
+    'deleted' => 'Slettet ressursmodell',
+    'does_not_exist' => 'Modell eksisterer ikke.',
+    'no_association' => 'ADVARSEL! Ressursmodellen for dette elementet er ugyldig eller mangler!',
+    'no_association_fix' => 'Dette vil ødelegge ting på merkelige og forferdelige måte. Rediger denne ressursen nå for å tildele den en modell.',
+    'assoc_users'	 => 'Denne modellen er tilknyttet en eller flere eiendeler og kan ikke slettes. Slett eiendelene, og prøv å slette modellen igjen. ',
+    'invalid_category_type' => 'This category must be an asset category.',
+
+    'create' => array(
+        'error'   => 'Modellen ble ikke opprettet. Prøv igjen.',
+        'success' => 'Opprettelse av modell var vellykket.',
+        'duplicate_set' => 'En eiendel med dette navnet, produsenten og modelnummeret eksisterer allerede.',
+    ),
+
+    'update' => array(
+        'error'   => 'Modell ble ikke oppdatert. Prøv igjen',
+        'success' => 'Oppdatering av modell vellykket.',
+    ),
+
+    'delete' => array(
+        'confirm'   => 'Er du sikker på at du vil slette denne modellen?',
+        'error'   => 'Det oppstod et problem under sletting av modellen. Prøv igjen.',
+        'success' => 'Sletting av modell vellykket.'
+    ),
+
+    'restore' => array(
+        'error'   		=> 'Modell ble ikke gjenopprettet. Prøv igjen',
+        'success' 		=> 'Vellykket gjenoppretting av modell.'
+    ),
+
+    'bulkedit' => array(
+        'error'   		=> 'Ingen felt ble endret, så ingenting ble oppdatert.',
+        'success' 		=> 'Modelloppdatering vellyket.| :model_count modeller oppdatert.',
+        'warn'          => 'Du er i ferd med å oppdatere egenskapene til følgende modell: Du er i ferd med å redigere egenskapene for følgende modeller: model_count modeller:',
+
+    ),
+
+    'bulkdelete' => array(
+        'error'   		    => 'Ingen modeller ble valgt, så ingenting ble slettet.',
+        'success' 		    => 'Modellen ble slettet!g_:success_count modeller slettet!',
+        'success_partial' 	=> ':Success_count-modell(ene) ble slettet, men fail_count kunne ikke slettes fordi de fortsatt har eiendeler knyttet til dem.'
+    ),
+
+);
diff --git a/resources/lang/nb-NO/admin/models/table.php b/resources/lang/nb-NO/admin/models/table.php
new file mode 100644
index 0000000000..b8c7daa389
--- /dev/null
+++ b/resources/lang/nb-NO/admin/models/table.php
@@ -0,0 +1,17 @@
+<?php
+
+return array(
+
+    'create'				=> 'Opprett modell',
+    'created_at' 			=> 'Opprettet',
+    'eol'	 				=> 'Levetid',
+    'modelnumber'   		=> 'Modellnummer',
+    'name'      			=> 'Modellnavn',
+    'numassets' 			=> 'Eiendeler',
+    'title'					=> 'Modeller',
+    'update'				=> 'Endre modell',
+    'view'					=> 'Vis modell',
+    'update'				=> 'Endre modell',
+    'clone'				=> 'Klon modell',
+    'edit'				=> 'Endre modell',
+);
diff --git a/resources/lang/nb-NO/admin/reports/general.php b/resources/lang/nb-NO/admin/reports/general.php
new file mode 100644
index 0000000000..17da068dba
--- /dev/null
+++ b/resources/lang/nb-NO/admin/reports/general.php
@@ -0,0 +1,23 @@
+<?php
+
+return [
+    'info'   => 'Velg de alternativene du ønsker skal inngå i rapporten.',
+    'deleted_user' => 'Slettet bruker',
+    'send_reminder' => 'Send påminnelse',
+    'cannot_send_reminder' => 'User has been deleted or does not have an email address so cannot receive a reminder',
+    'reminder_sent' => 'Påminnelse sendt',
+    'acceptance_deleted' => 'Aksepteringsforespørsel slettet',
+    'acceptance_request' => 'Akseptanseforespørsel',
+    'custom_export' => [
+        'user_address' => 'Brukerens adresse',
+        'user_city' => 'Bruker by',
+        'user_state' => 'Bruker tilstand',
+        'user_country' => 'Bruker Land',
+        'user_zip' => 'Brukers postnummer'
+    ],
+    'open_saved_template' => 'Open Saved Template',
+    'save_template' =>  'Save Template',
+    'select_a_template' => 'Select a Template',
+    'template_name' => 'Template Name',
+    'update_template' => 'Update Template',
+];
diff --git a/resources/lang/nb-NO/admin/reports/message.php b/resources/lang/nb-NO/admin/reports/message.php
new file mode 100644
index 0000000000..2800bbdf0b
--- /dev/null
+++ b/resources/lang/nb-NO/admin/reports/message.php
@@ -0,0 +1,16 @@
+<?php
+
+return [
+    'about_templates' => 'About Saved Templates',
+    'saving_templates_description' => 'Select your options, then enter the name of your template in the box above and click the \'Save Template\' button. Use the dropdown to select a previously saved template.',
+    'create'  => [
+        'success' => 'Template saved successfully',
+    ],
+    'update' => [
+        'success' => 'Template updated successfully',
+    ],
+    'delete' => [
+        'success' => 'Template deleted',
+        'no_delete_permission' => 'Template does not exist or you do not have permission to delete it.',
+    ],
+];
diff --git a/resources/lang/nb-NO/admin/settings/general.php b/resources/lang/nb-NO/admin/settings/general.php
new file mode 100644
index 0000000000..340c47efdc
--- /dev/null
+++ b/resources/lang/nb-NO/admin/settings/general.php
@@ -0,0 +1,490 @@
+<?php
+
+return [
+    'ad'				        => 'Active Directory',
+    'ad_domain'				    => 'Active Directory domene',
+    'ad_domain_help'			=> 'Dette er noen ganger det samme som e-post domene, men ikke alltid.',
+    'ad_append_domain_label'    => 'Legg til domenenavn',
+    'ad_append_domain'          => 'Legg til domenenavn i feltet for brukernavn',
+    'ad_append_domain_help'     => 'Bruker kreves ikke å skrive "brukernavn@domene.local", de kan bare skrive "brukernavn".',
+    'admin_cc_email'            => 'CC e-post',
+    'admin_cc_email_help'       => 'Send a copy of checkin/checkout emails to this address.',
+    'admin_settings'            => 'Admin innstillinger',
+    'is_ad'				        => 'Dette er en Active Directory server',
+    'alerts'                	=> 'Varsler',
+    'alert_title'               => 'Oppdater varslingsinnstillinger',
+    'alert_email'				=> 'Send varslinger til',
+    'alert_email_help'          => 'E-postadresser eller distribusjonslister som du ønsker varsler skal sendes til, kommaseparert.',
+    'alerts_enabled'			=> 'Varslinger aktivert',
+    'alert_interval'			=> 'Terskel for utløpende varslinger (dager)',
+    'alert_inv_threshold'		=> 'Terskel for eiendelsvarslinger',
+    'allow_user_skin'           => 'Tillat tilpasset utseende for bruker',
+    'allow_user_skin_help_text' => 'Kryss av denne boksen for å la brukere overstyre standardutseendet med et annet.',
+    'asset_ids'					=> 'Eiendels-IDer',
+    'audit_interval'            => 'Audit intervall',
+    'audit_interval_help'       => 'Hvis du er påkrevd å regelmessig sjekke ressursene dine, angi intervallet i måneder som du bruker. Hvis du oppdaterer denne verdien, vil hele "neste revisjonsdatoer" for ressurser med en kommende revisjonsdato bli oppdatert.',
+    'audit_warning_days'        => 'Audit terskelverdi for advarsel',
+    'audit_warning_days_help'   => 'Hvor mange dager i forveien bør vi advare deg når eiendeler forfaller for overvåking?',
+    'auto_increment_assets'		=> 'Generer automatisk økende eiendelsmerker',
+    'auto_increment_prefix'		=> 'Prefiks (valgfritt)',
+    'auto_incrementing_help'    => 'Slå på automatisk økende eiendelsmerker for å velge dette',
+    'backups'					=> 'Sikkerhetskopier',
+    'backups_help'              => 'Opprette, laste ned og gjenopprette sikkerhetskopier ',
+    'backups_restoring'         => 'Gjenoppretting fra sikkerhetskopi',
+    'backups_clean' => 'Clean the backed-up database before restore',
+    'backups_clean_helptext' => "This can be useful if you're changing between database versions",
+    'backups_upload'            => 'Last opp sikkerhetskopi',
+    'backups_path'              => 'Sikkerhetskopier på tjeneren lagres i <code>:path</code>',
+    'backups_restore_warning'   => 'Use the restore button <small><span class="btn btn-xs btn-warning"><i class="text-white fas fa-retweet" aria-hidden="true"></i></span></small> to restore from a previous backup. (This does not currently work with S3 file storage or Docker.)<br><br>Your <strong>entire :app_name database and any uploaded files will be completely replaced</strong> by what\'s in the backup file  ',
+    'backups_logged_out'         => 'Alle eksisterende brukere, inkludert deg, vil bli logget ut når din gjenoppretting er fullført.',
+    'backups_large'             => 'Veldig store sikkerhetskopier kan få tidsavbrudd under gjenopprettingsforsøket og må fortsatt kjøres via kommandolinjen. ',
+    'barcode_settings'			=> 'Strekkodeinnstillinger',
+    'confirm_purge'			    => 'Bekreft rensking',
+    'confirm_purge_help'		=> 'Skriv "DELETE" i boksen under for å fjerne dine slettende data. Denne handlingen kan ikke angres og vil PERMANENT slette alle slettede elementer og brukere. (Du bør først gjøre en sikkerhetskopi, bare for å være trygg.)',
+    'custom_css'				=> 'Egendefinert CSS',
+    'custom_css_placeholder'	=> 'Add your custom CSS',
+    'custom_css_help'			=> 'Legg til egendefinert CSS. Ikke ta med taggene &lt;style&gt;&lt;/style&gt;.',
+    'custom_forgot_pass_url'	=> 'Egendefinert passord tilbakestillings-URL',
+    'custom_forgot_pass_url_help'	=> 'Erstatter den innebygde glemt passord-URLen i innloggingsbildet. Nyttig for å sende brukere til intern eller leid LDAP passordgjenopprettingsfunksjonalitet. Vil deaktivere den lokale glemt passord-funksjonaliteten.',
+    'dashboard_message'			=> 'Dashboardmelding',
+    'dashboard_message_help'	=> 'Denne teksten vises på dashbordet for alle som har tillatelse til å vise oversikten.',
+    'default_currency'  		=> 'Standardvaluta',
+    'default_eula_text'			=> 'Standard EULA',
+    'default_eula_text_placeholder' => 'Add your default EULA text',
+    'default_language'			=> 'Standardspråk',
+    'default_eula_help_text'	=> 'Du kan også knytte tilpassede EULAer til bestemte eiendelskategorier.',
+    'acceptance_note'           => 'Add a note for your decision (Optional)',
+    'display_asset_name'        => 'Vis eiendelsnavn',
+    'display_checkout_date'     => 'Vis utsjekksdato',
+    'display_eol'               => 'Vis levetid i tabellvisning',
+    'display_qr'                => 'Display 2D barcode',
+    'display_alt_barcode'		=> 'Vis 1D strekkode',
+    'barcode_type'				=> '2D strekkodetype',
+    'alt_barcode_type'			=> '1D strekkodetype',
+    'enabled'                   => 'Slått på',
+    'eula_settings'				=> 'EULA-innstillinger',
+    'eula_markdown'				=> 'Denne EULAen tillater <a href="https://help.github.com/articles/github-flavored-markdown/">Github Flavored markdown</a>.',
+    'empty_row_count'           => 'Field Start Offset (Empty Rows)',
+    'empty_row_count_help'      => 'Fields will begin populating after this many empty rows are skipped at the top of the label.',
+    'favicon'                   => 'Favicon',
+    'favicon_format'            => 'Aksepterte filtyper er ico, png og gif. Andre bildeformater vil muligens ikke fungere i alle nettlesere.',
+    'favicon_size'          => 'Favoritt-symboler bør være kvadratiske, 16x16 punkter.',
+    'footer_text'               => 'Ekstra bunnteksttekst ',
+    'footer_text_help'          => 'Denne teksten vil fremstå i høyre del av bunnteksten. Lenker er tillatt ved å bruke <a href="https://help.github.com/articles/github-flavored-markdown/">Github flavored markdown</a>.
+Linjeskift, topptekst, bilder, osv. kan føre til uventede resultater.',
+    'footer_text_placeholder'   => 'Optional footer text',
+    'general_settings'			=> 'Generelle innstillinger',
+    'general_settings_help'     => 'Standard EULA og mer',
+    'generate_backup'			=> 'Generer Sikkerhetskopi',
+    'google_workspaces'         => 'Google arbeidsområder',
+    'header_color'              => 'Overskriftsfarge',
+    'info'                      => 'Disse innstillingene lar deg tilpasse enkelte aspekter av installasjonen din.',
+    'label_logo_size'           => 'Kvadratisk logo vil se best ut. Den vil vises øverst til høyre på hver merkelapp. ',
+    'laravel'                   => 'Laravel-versjon',
+    'ldap'                      => 'LDAP',
+    'ldap_default_group'        => 'Standard tillatelsesgruppe',
+    'ldap_default_group_info'   => 'Velg en gruppe for nylig synkroniserte brukere. Husk at brukeren får rettigheter til gruppen den tildeles.',
+    'no_default_group'          => 'Ingen standard gruppe',
+    'ldap_help'                 => 'LDAP/Active Directory',
+    'ldap_client_tls_key'       => 'LDAP-klient TLS-nøkkel',
+    'ldap_client_tls_cert'      => 'LDAP TLS klient-sertifikat',
+    'ldap_enabled'              => 'LDAP aktivert',
+    'ldap_integration'          => 'LDAP Integrering',
+    'ldap_settings'             => 'LDAP Instillinger',
+    'ldap_client_tls_cert_help' => 'Klientside TLS-sertifikat og nøkkel for LDAP tilkoblinger er vanligvis bare nyttig i Google Workspace-konfigurasjoner med "Secure LDAP." Begge er påkrevd.',
+    'ldap_location'             => 'LDAP-plassering',
+'ldap_location_help'             => 'LDAP plasserings feltet burde brukes hvis <strong> en OU ikke blir brukt i "Base Bind DN"-</strong> La denne stå tom hvis et OU søk brukes.',
+    'ldap_login_test_help'      => 'Skriv inn et gyldig LDAP brukernavn og passord fra samme base DN som du anga ovenfor for å teste at LDAP-innlogging er riktig konfigurert. DU MÅ LAGRE DINE OPPDATERTE LDAP-INNSTILLINGER FØRST.',
+    'ldap_login_sync_help'      => 'Tester at LDAP kan synkronisere. Feil i LDAP autentiseringsspørringen din kan før til at brukere ikke kan logge inn. DU MÅ LAGRE DINE OPPDATERTE LDAP-INNSTILLINGER FØRST.',
+    'ldap_manager'              => 'LDAP Administrator',
+    'ldap_server'               => 'LDAP Server',
+    'ldap_server_help'          => 'This should start with ldap:// (for unencrypted) or ldaps:// (for TLS or SSL)',
+    'ldap_server_cert'			=> 'Validering av LDAP SSL sertifikat',
+    'ldap_server_cert_ignore'	=> 'Godta ugyldig SSL sertifikat',
+    'ldap_server_cert_help'		=> 'Kryss av denne boksen hvis du bruker et selv-signert SSL sertifikat og vil akkseptere et ugyldig sertifikat.',
+    'ldap_tls'                  => 'Bruk TLS',
+    'ldap_tls_help'             => 'Kryss av denne hvis du kjører STARTTLS på LDAP-serveren. ',
+    'ldap_uname'                => 'LDAP Bundet brukernavn',
+    'ldap_dept'                 => 'LDAP avdeling',
+    'ldap_phone'                => 'LDAP telefonnummer',
+    'ldap_jobtitle'             => 'LDAP Jobbtittel',
+    'ldap_country'              => 'LDAP Land',
+    'ldap_pword'                => 'LDAP Bind passord',
+    'ldap_basedn'               => 'Base Bind DN',
+    'ldap_filter'               => 'LDAP Filter',
+    'ldap_pw_sync'              => 'Cache LDAP Passwords',
+    'ldap_pw_sync_help'         => 'Uncheck this box if you do not wish to keep LDAP passwords cached as local hashed passwords. Disabling this means that your users may not be able to login if your LDAP server is unreachable for some reason.',
+    'ldap_username_field'       => 'Brukernavn Felt',
+    'ldap_lname_field'          => 'Etternavn',
+    'ldap_fname_field'          => 'LDAP Fornavn',
+    'ldap_auth_filter_query'    => 'LDAP autentisering spørring',
+    'ldap_version'              => 'LDAP Versjon',
+    'ldap_active_flag'          => 'LDAP aktive flag',
+    'ldap_activated_flag_help'  => 'Denne verdien brukes til å bestemme om en synkronisert bruker kan logge inn på Snipe-IT. <strong>Det påvirker ikke muligheten til å sjekke elementer inn eller ut til dem</strong>, og bør være <strong>egenskapsnavn</strong> i din AD/LDAP, <strong>ikke verdien</strong>. <br><br>Hvis dette feltet er satt til et feltnavn som ikke eksisterer i AD/LDAP, eller verdien i AD/LDAP feltet er satt til <code>0</code> eller <code>usann</code>, <strong>vil bruker pålogging bli deaktivert</strong>. Hvis verdien i AD/LDAP feltet er satt til <code>1</code> eller <code>sann</code> eller <em>annen tekst</em> betyr at brukeren kan logge inn. Når feltet er tomt i din AD, respekterer vi <code>-brukerAccountControl</code> attributt, som vanligvis tillater ikke-suspenderte brukere å logge inn.',
+    'ldap_invert_active_flag'   => 'LDAP Invert Active Flag',
+    'ldap_invert_active_flag_help'     => 'If enabled: when the value returned by LDAP Active Flag is <code>0</code> or <code>false</code> the user account will be active.',
+    'ldap_emp_num'              => 'LDAP ansattnummer',
+    'ldap_email'                => 'LDAP E-post',
+    'ldap_test'                 => 'Test LDAP',
+    'ldap_test_sync'            => 'Test LDAP-synkronisering',
+    'license'                   => 'Programvarelisens',
+    'load_remote'               => 'Load Remote Avatars',
+    'load_remote_help_text'		=> 'Uncheck this box if your install cannot load scripts from the outside internet. This will prevent Snipe-IT from trying load avatars from Gravatar or other outside sources.',
+    'login'                     => 'Innloggingsforsøk',
+    'login_attempt'             => 'Innloggingsforsøk',
+    'login_ip'                  => 'IP-addresse',
+    'login_success'             => 'Suksess?',
+    'login_user_agent'          => 'Brukeragent',
+    'login_help'                => 'Liste over forsøkte pålogginger',
+    'login_note'                => 'Logg inn melding',
+    'login_note_placeholder'            => "If you do not have a login or have found a device belonging to this company, please call technical support at 888-555-1212. Thank you.",
+    'login_note_help'           => 'Eventuelt inkludere et par setninger på logg inn skjermen, for eksempel for å hjelpe mennesker som har funnet en mistet eller stjålet enhet. Dette feltet godtar <a href="https://help.github.com/articles/github-flavored-markdown/"> Github flavored markdown</a>',
+    'login_remote_user_text'    => 'Fjernbruker pålogging valg',
+    'login_remote_user_enabled_text' => 'Aktiver innlogging med Remote User Header',
+    'login_remote_user_enabled_help' => 'Aktiverer autentisering via REMOTE_USER headeren som beskrevet i "Common Gateway Interface (rfc3875)"',
+    'login_common_disabled_text' => 'Deaktiver andre godkjenningsmekanismer',
+    'login_common_disabled_help' => 'Deaktiverer andre autentiseringsmekanismer. Aktiver dette valget kun hvis du er sikker på at din REMOTE_USER innlogging allerede fungerer',
+    'login_remote_user_custom_logout_url_text' => 'Tilpasset utloggingsadresse',
+    'login_remote_user_custom_logout_url_help' => 'Hvis en URL angis her blir brukerne videresendt til denne URLen etter utlogging fra Snipe-IT. Dette er nyttig for korrekt lukking av autentiseringssesjoner hos din autentiseringsleverandør.',
+    'login_remote_user_header_name_text' => 'Egendefinert brukernavn-header',
+    'login_remote_user_header_name_help' => 'Bruk angitt header-felt i stedet for REMOTE_USER',
+    'logo'                    	=> 'Logo',
+    'logo_print_assets'         => 'Bruk i Print',
+    'logo_print_assets_help'    => 'Bruk branding på utskrivbare eiendelslister ',
+    'full_multiple_companies_support_help_text' => 'Vis kun eiendeler til bedriften brukere (inkl administratorer) er knyttet til.',
+    'full_multiple_companies_support_text' => 'Full støtte for flere bedrifter',
+    'scope_locations_fmcs_support_text'  => 'Scope Locations with Full Multiple Companies Support',
+    'scope_locations_fmcs_support_help_text'  => 'Restrict locations to their selected company.',
+    'scope_locations_fmcs_check_button' => 'Check Compatibility',
+    'scope_locations_fmcs_support_disabled_text'  => 'This option is disabled because you have conflicting locations set for :count or more items.',
+    'show_in_model_list'   => 'Vis i Model nedtrekksmeny',
+    'optional'					=> 'valgfri',
+    'per_page'                  => 'Resultater pr side',
+    'php'                       => 'PHP-versjon',
+    'php_info'                  => 'PHP info',
+    'php_overview'              => 'PHP',
+    'php_overview_help'         => 'PHP systeminfo',
+    'php_gd_info'               => 'Du må installere php-gd for å vise QR-koder. Se installasjonsinstruksjoner.',
+    'php_gd_warning'            => 'PHP bildebehandling og GD-plugin er IKKE installert.',
+    'pwd_secure_complexity'     => 'Passordkompleksitet',
+    'pwd_secure_complexity_help' => 'Velg hvilken passord kompleksitet du ønsker å håndheve.',
+    'pwd_secure_complexity_disallow_same_pwd_as_user_fields' => 'Passord kan ikke være det samme som fornavn, etternavn, e-post eller brukernavn',
+    'pwd_secure_complexity_letters' => 'Krev minst én bokstav',
+    'pwd_secure_complexity_numbers' => 'Krev minst ett tall',
+    'pwd_secure_complexity_symbols' => 'Krev minst ett symbol',
+    'pwd_secure_complexity_case_diff' => 'Krev minst én stor bokstav og én liten bokstav',
+    'pwd_secure_min'            => 'Passord minimum antall tegn',
+    'pwd_secure_min_help'       => 'Minimum tillatt verdi er 8',
+    'pwd_secure_uncommon'       => 'Forhindre vanlige passord',
+    'pwd_secure_uncommon_help'  => 'Dette vil forhindre brukere fra å bruke vanlige passord fra de vanligste 10 000 passord som er rapportert.',
+    'qr_help'                   => 'Aktiver QR-koder først for å velge denne',
+    'qr_text'                   => 'Tekst QR-kode',
+    'saml'                      => 'SAML',
+    'saml_title'                => 'Oppdater SAML-innstillinger',
+    'saml_help'                 => 'SAML-innstillinger',
+    'saml_enabled'              => 'SAML aktivert',
+    'saml_integration'          => 'SAML-integrasjon',
+    'saml_sp_entityid'          => 'Entity ID',
+    'saml_sp_acs_url'           => 'Assertion Consumer Service (ACS) URL',
+    'saml_sp_sls_url'           => 'Single Logout Service (SLS) URL',
+    'saml_sp_x509cert'          => 'Offentlig sertifikat',
+    'saml_sp_metadata_url'      => 'Metadata URL',
+    'saml_idp_metadata'         => 'SAML IdP Metadata',
+    'saml_idp_metadata_help'    => 'Du kan spesifisere IdP-metadata ved hjelp av URL eller XML-fil.',
+    'saml_attr_mapping_username' => 'Attributt for brukernavn',
+    'saml_attr_mapping_username_help' => 'NameID vil bli brukt hvis tilordning av attributtet er uspesifisert eller ugyldig.',
+    'saml_forcelogin_label'     => 'SAML Tving Innlogging',
+    'saml_forcelogin'           => 'Gjør SAML til standard innlogging',
+    'saml_forcelogin_help'      => 'Du kan bruke \'/login?nosaml\' for å komme til den normale innloggingssiden.',
+    'saml_slo_label'            => 'SAML utlogging',
+    'saml_slo'                  => 'Send en Logoutforespørsel til IdP på Logg ut',
+    'saml_slo_help'             => 'Dette vil føre til at brukeren først blir omdirigert til idP når hen logger ut. Ikke kryss av om idP ikke støtter \'SP-initiated SAML SLO\'.',
+    'saml_custom_settings'      => 'SAML Egendefinerte innstillinger',
+    'saml_custom_settings_help' => 'Du kan angi flere innstillinger til onelogin/php-saml biblioteket. Bruk på eget ansvar.',
+    'saml_download'             => 'Last ned Metadata',
+    'setting'                   => 'Innstilling',
+    'settings'                  => 'Innstillinger',
+    'show_alerts_in_menu'       => 'Vis varsler i toppmenyen',
+    'show_archived_in_list'     => 'Arkiverte eiendeler',
+    'show_archived_in_list_text'     => 'Vis arkiverte eiendeler i "alle eiendeler" utlisting',
+    'show_assigned_assets'      => 'Vis eiendeler tildelt til eiendeler',
+    'show_assigned_assets_help' => 'Vis ressurser som ble tildelt andre eiendeler i Vis bruker -> Eiendeler, Vis bruker -> Info -> Skriv ut alle tildelte og i Konto -> Vis tildelte eiendeler.',
+    'show_images_in_email'     => 'Vis bilder i e-post',
+    'show_images_in_email_help'   => 'Fjern merkingen i denne boksen hvis Snipe-IT-installasjonen er bak en VPN eller et lukket nettverk og brukere utenfor nettverket ikke vil kunne laste bilder servert fra denne installasjonen i e-posten.',
+    'site_name'                 => 'Nettstedsnavn',
+    'integrations'               => 'Integrasjoner',
+    'slack'                     => 'Slack',
+    'general_webhook'           => 'Generell Webhook',
+    'ms_teams'                  => 'Microsoft Lag',
+    'webhook'                   => ':app',
+    'webhook_presave'           => 'Test til lagring',
+    'webhook_title'               => 'Oppdater Webhook innstillinger',
+    'webhook_help'                => 'Integrasjons instillinger',
+    'webhook_botname'             => ':app botnavn',
+    'webhook_channel'             => ':app kanal',
+    'webhook_endpoint'            => ':app endepunkt',
+    'webhook_integration'         => ':app Innstillinger',
+    'webhook_test'                 =>'Test :app integrasjon',
+    'webhook_integration_help'    => ':app-integrasjon er valgfritt, men endepunktet og kanalen er påkrevd hvis du ønsker å bruke den. For å konfigurere :app integrering, må du først <a href=":webhook_link" target="_new" rel="noopener">lage en innkommende webhook</a> på din :app konto. Klikk på knappen <strong>Test :app Integrasjon</strong> for å bekrefte at innstillingene er korrekte før du lagrer. ',
+    'webhook_integration_help_button'    => 'Du vil se en testknapp etter at du har lagret din :app informasjon.',
+    'webhook_test_help'           => 'Test om din :app integrasjon er riktig konfigurert. DU MÅ LAGRE DINE OPPDATERTE :app INNSTILLINGER FØRST.',
+    'shortcuts_enabled'         => 'Enable Shortcuts',
+    'shortcuts_help_text'       => '<strong>Windows</strong>: Alt + Access key, <strong>Mac</strong>: Control + Option + Access key',
+    'snipe_version'  			=> 'Snipe-IT-versjon',
+    'support_footer'            => 'Støtte Footer Lenker ',
+    'support_footer_help'       => 'Angi hvem som kan se lenker til Snipe-IT supportinformasjon og brukermanual',
+    'version_footer'            => 'Versjon i Footer ',
+    'version_footer_help'       => 'Angi hvem som kan se Snipe-IT versjon og build-nummer.',
+    'system'                    => 'Systeminformasjon',
+    'update'                    => 'Oppdater innstillinger',
+    'value'                     => 'Verdi',
+    'brand'                     => 'Merkevare',
+    'brand_help'                => 'Logo, nettstedsnavn',
+    'web_brand'                 => 'Velg branding-type',
+    'about_settings_title'      => 'Om Innstillinger',
+    'about_settings_text'       => 'Disse innstillingene lar deg tilpasse enkelte aspekter av installasjonen din.',
+    'labels_per_page'           => 'Etiketter per side',
+    'label_dimensions'          => 'Etikettstørrelsen (inches)',
+    'next_auto_tag_base'        => 'Neste automatiske økning',
+    'page_padding'              => 'Side marger (inches)',
+    'privacy_policy_link'       => 'Link til personvernregler',
+    'privacy_policy'            => 'Personvernerklæring',
+    'privacy_policy_link_help'  => 'Angi en URL i dette feltet for å inkludere en lenke til personvern-policy i applikasjonsbunntekst og i alle eposter som dette systemet sender ut. Støtter GDPR. ',
+    'purge'                     => 'Tømme slettede poster',
+    'purge_deleted'             => 'Fjern slettede ',
+    'labels_display_bgutter'    => 'Etikett bunnmarg',
+    'labels_display_sgutter'    => 'Etikett sidemarg',
+    'labels_fontsize'           => 'Label skriftstørrelse',
+    'labels_pagewidth'          => 'Etikett arkbredde',
+    'labels_pageheight'         => 'Etikett arkhøyde',
+    'label_gutters'        => 'Etikett tegnavstand (tommer)',
+    'page_dimensions'        => 'Sidedimensjon (tommer)',
+    'label_fields'          => 'Etikett synlige felter',
+    'inches'        => 'tommer',
+    'width_w'        => 'b',
+    'height_h'        => 'h',
+    'show_url_in_emails'                => 'Link til Snipe-IT i e-post',
+    'show_url_in_emails_help_text'      => 'Fjern markeringen i denne boksen hvis du ikke vil koble tilbake til Snipe-IT-installasjonen i e-postboksene dine. Nyttig hvis de fleste av brukerne aldri logger inn.',
+    'text_pt'        => 'pt',
+    'thumbnail_max_h'   => 'Maks miniatyrbilde høyde',
+    'thumbnail_max_h_help'   => 'Maksimal høyde i piksler som miniatyrbilder kan vise i visningen liste. Min 25, maks 500.',
+    'two_factor'        => 'To-faktor autentisering',
+    'two_factor_secret'        => 'To-faktor kode',
+    'two_factor_enrollment'        => 'To-faktor registrering',
+    'two_factor_enabled_text'        => 'Aktiver to-faktor autentisering',
+    'two_factor_reset'        => 'Tilbakestill to-faktor hemmelighet',
+    'two_factor_reset_help'        => 'Dette vil tvinge brukeren til å legge inn enheten på nytt med autentiseringsappen. Dette kan være nyttig hvis enheten deres er mistet eller stjålet. ',
+    'two_factor_reset_success'          => 'To-faktor enhet resatt',
+    'two_factor_reset_error'          => 'Reset av to-faktor enhet feilet',
+    'two_factor_enabled_warning'        => 'Aktivering av to-faktor autentisering hvis ikke allerede aktivert vil øyeblikkelig tvinge deg til å autentisere med enhet som er aktivert i Google Authenticator. Du vil ha mulighet til å aktivere enheten din hvis ingen er aktivert fra før.',
+    'two_factor_enabled_help'        => 'Dette vil slå på to-faktor autentisering med Google Authenticator.',
+    'two_factor_optional'        => 'Selektiv (brukere kan aktivere eller deaktivere hvis tillatt)',
+    'two_factor_required'        => 'Påkrevd for alle brukere',
+    'two_factor_disabled'        => 'Deaktivert',
+    'two_factor_enter_code'	=> 'Skriv inn to-faktor kode',
+    'two_factor_config_complete'	=> 'Send kode',
+    'two_factor_enabled_edit_not_allowed' => 'Systemansvarlig tillater ikke at du redigerer denne innstillingen.',
+    'two_factor_enrollment_text'	=> "To-faktor autentisering er påkrevd, men enheten din har ikke blitt aktivert for dette enda. Åpne Google Authenticator-appen og scan inn QR-koden nedenfor for å aktivere. Når du har aktivert enheten din, skriv inn koden nedenfor",
+    'require_accept_signature'      => 'Kreve signatur',
+    'require_accept_signature_help_text'      => 'Aktivering av denne funksjonen ville forlange brukernes å fysisk logge ut for å akseptere en eiendel.',
+    'require_checkinout_notes'  => 'Require Notes on Checkin/Checkout',
+    'require_checkinout_notes_help_text'    => 'Enabling this feature will require the note fields to be populated when checking in or checking out an asset.',
+    'left'        => 'venstre',
+    'right'        => 'høyre',
+    'top'        => 'topp',
+    'bottom'        => 'bunn',
+    'vertical'        => 'vertikal',
+    'horizontal'        => 'horisontal',
+    'unique_serial'                => 'Unike serienumre',
+    'unique_serial_help_text'                => 'Håndhever at  eiendelsserienumre er unike',
+    'zerofill_count'        => 'Lengden på ID-merker, inkludert zerofill',
+    'username_format_help'   => 'Denne innstillingen vil bare bli brukt av importprosessen dersom et brukernavn ikke er oppgitt, og vi må generere et brukernavn for deg.',
+    'oauth_title' => 'OAuth API-innstillinger',
+    'oauth_clients' => 'OAuth Clients',
+    'oauth' => 'OAuth',
+    'oauth_help' => 'Oauth Endepunktinnstillinger',
+    'oauth_no_clients' => 'You have not created any OAuth clients yet.',
+    'oauth_secret' => 'Secret',
+    'oauth_authorized_apps' => 'Authorized Applications',
+    'oauth_redirect_url' => 'Redirect URL',
+    'oauth_name_help' => ' Something your users will recognize and trust.',
+    'oauth_scopes' => 'Scopes',
+    'oauth_callback_url' => 'Your application authorization callback URL.',
+    'create_client' => 'Create Client',
+    'no_scopes' => 'No scopes',
+    'asset_tag_title' => 'Oppdater Innstillinger for Eiendelsmerker',
+    'barcode_title' => 'Oppdater strekkodeinnstillinger',
+    'barcodes' => 'Strekkoder',
+    'barcodes_help_overview' => 'Strekkode- &amp; QR-innstillinger',
+    'barcodes_help' => 'Dette forsøker å slette hurtigbufrede strekkoder. Dette vil vanligvis bare bli brukt hvis strekkodeinnstillingene dine er endret, eller hvis Snipe-IT adressen er endret. Strekkoder genereres på nytt når de blir åpnet neste gang.',
+    'barcodes_spinner' => 'Forsøker å slette filer...',
+    'barcode_delete_cache' => 'Slett strekkode-buffer',
+    'branding_title' => 'Oppdater Branding-innstillinger',
+    'general_title' => 'Oppdater generelle innstillinger',
+    'mail_test' => 'Send test',
+    'mail_test_help' => 'Dette vil forsøke å sende en e-post til :replyto.',
+    'filter_by_keyword' => 'Filtrer ved å sette nøkkelord',
+    'security' => 'Sikkerhet',
+    'security_title' => 'Oppdater sikkerhetsinnstillinger',
+    'security_help' => 'Tofaktor, passordbegrensinger',
+    'groups_help' => 'Tillatelsesgrupper',
+    'localization' => 'Oversettelser',
+    'localization_title' => 'Oppdater språkinnstillinger',
+    'localization_help' => 'Språk, datoformat',
+    'notifications' => 'Varslinger',
+    'notifications_help' => 'E-post varsler og revisjonsinnstillinger',
+    'asset_tags_help' => 'Økninger og prefikser',
+    'labels' => 'Etiketter',
+    'labels_title' => 'Oppdater etikettinnstillinger',
+    'labels_help' => 'Barcodes &amp; label settings',
+    'purge_help' => 'Tømme slettede poster',
+    'ldap_extension_warning' => 'Det ser ikke ut som LDAP-utvidelsen er installert eller aktivert på denne serveren. Du kan fortsatt lagre innstillingene, men du må installere og aktivere LDAP-tillegget til PHP før LDAP-synkronisering eller innlogging virker.',
+    'ldap_ad' => 'LDAP/AD',
+    'ldap_test_label' => 'Test LDAP Sync',
+    'ldap_test_login' => ' Test LDAP Login',
+    'ldap_username_placeholder' => 'LDAP Username',
+    'ldap_password_placeholder' => 'LDAP Password',
+    'employee_number' => 'Ansattnummer',
+    'create_admin_user' => 'Opprett en bruker ::',
+    'create_admin_success' => 'Suksess! Din adminbruker har blitt lagt til!',
+    'create_admin_redirect' => 'Klikk her for å gå til innlogging!',
+    'setup_migrations' => 'Database-migreringer ::',
+    'setup_no_migrations' => 'Det var ingenting å migrere. Databasetabellene var allerede oppdaterte!',
+    'setup_successful_migrations' => 'Databasetabellene er opprettet',
+    'setup_migration_output' => 'Migrasjonsmeldinger:',
+    'setup_migration_create_user' => 'Neste: Opprett bruker',
+    'ldap_settings_link' => 'Side for LDAP-innstillinger',
+    'slack_test' => 'Test <i class="fab fa-slack"></i> Integrasjon',
+    'status_label_name' => 'Status Label Name',
+    'super_admin_only'  => 'Super Admin Only',
+    'label2_enable'           => 'Ny etikett generator',
+    'label2_enable_help'      => 'Bytt til den nye etikette generatoren. <b>Merk: Du må lagre denne innstillingen før du setter andre.</b>',
+    'label2_template'         => 'Mal',
+    'label2_template_help'    => 'Velg mal som skal brukes til etikettgenerering',
+    'label2_title'            => 'Tittel',
+    'label2_title_help'       => 'Tittelen som skal vises på etiketter som støtter den',
+    'label2_title_help_phold' => 'Plassholderen <code>{COMPANY}</code> vil bli erstattet med navnet til ressursen&apos;s firma navn',
+    'label2_asset_logo'       => 'Bruk ressurs logo',
+    'label2_asset_logo_help'  => 'Bruk logoen til ressursen&apos;s tildelte selskap, i stedet for verdien fra <code>:setting_name</code>',
+    'label2_1d_type'          => '1D strekkodetype',
+    'label2_1d_type_help'     => 'Format for 1D strekkoder',
+    'label2_2d_type'          => '2D strekkodetype',
+    'label2_2d_type_help'     => 'Format for 2D strekkoder',
+    'label2_2d_target'        => '2D strekkodemål',
+    'label2_2d_target_help'   => 'The data that will be contained in the 2D barcode',
+    'label2_fields'           => 'Feltdefinisjoner',
+    'label2_fields_help'      => 'Feltene kan legges til, fjernes, og sorteres i venstre kolonne. For hvert felt kan flere alternativer for etikett og datakilde legges til, fjernes, og sorteres på nytt i høyre kolonne.',
+    'purge_barcodes' => 'Purge Barcodes',
+    'help_asterisk_bold'    => 'Teksten som skrives inn som <code>**text**</code> vil vises som fet',
+    'help_blank_to_use'     => 'La stå tom for å bruke verdien fra <code>:setting_name</code>',
+    'help_default_will_use' => '<code>:default</code> will use the value from <code>:setting_name</code>. <br>Note that the value of the barcodes must comply with the respective barcode spec in order to be successfully generated. Please see <a href="https://snipe-it.readme.io/docs/barcodes">the documentation <i class="fa fa-external-link"></i></a> for more details. ',
+    'asset_id'              => 'Asset ID',
+    'data'               => 'Data',
+    'default'               => 'Standard',
+    'none'                  => 'Ingen',
+    'google_callback_help' => 'Dette bør angis som callback-URL-en i Google OAuth app innstillingene i organisasjonen din&apos;s <strong><a href="https://console.cloud.google.com/" target="_blank">Google utvikler konsoll <i class="fa fa-external-link" aria-hidden="true"></i></a></strong>.',
+    'google_login'      => 'Google Workspace innloggingsinnstillinger',
+    'enable_google_login'  => 'Aktiver innlogging med Google Workspace',
+    'enable_google_login_help'  => 'Brukerne vil ikke automatisk bli betjent. De må ha en eksisterende konto her OG i Google Workspace, og deres brukernavn her må matche sin Google Workspace e-post adresse. ',
+    'mail_reply_to' => 'E-post svar-til adresse',
+    'mail_from' => 'E-post fra adressen',
+    'database_driver' => 'Databasedriver',
+    'bs_table_storage' => 'Tabell Lagring',
+    'timezone' => 'Tidssone',
+    'test_mail' => 'Test Mail',
+    'profile_edit'          => 'Edit Profile',
+    'profile_edit_help'          => 'Allow users to edit their own profiles.',
+    'default_avatar' => 'Custom Default Avatar',
+    'default_avatar_help' => 'This image will be displayed as a profile if a user does not have a profile photo.',
+    'restore_default_avatar' => 'Restore <a href=":default_avatar" data-toggle="lightbox" data-type="image">original system default avatar</a>',
+    'restore_default_avatar_help' => '',
+    'due_checkin_days' => 'Due For Checkin Warning',
+    'due_checkin_days_help' => 'How many days before the expected checkin of an asset should it be listed in the "Due for checkin" page?',
+    'no_groups' => 'No groups have been created yet. Visit <code>Admin Settings > Permission Groups</code> to add one.',
+    'text' => 'Text',
+
+    'username_formats' => [
+        'username_format'		=> 'Format brukernavn',
+        'firstname_lastname_format'	=> 'First Name Last Name (jane.smith)',
+        'first_name_format'	        => 'First Name (jane)',
+        'last_name_format'		=> 'Last Name (doe)',
+        'filastname_format'			=> 'First Initial Last Name (jsmith)',
+        'lastnamefirstinitial_format' =>  'Last Name First Initial (smithj)',
+        'firstname_lastname_underscore_format' => 'First Name Last Name (jane_smith)',
+        'firstinitial.lastname' => 'First Initial Last Name (j.smith)',
+        'lastname_firstinitial' => 'Last Name First Initial (smith_j)',
+        'lastname_dot_firstinitial_format' => 'Last Name First Initial (smith.j)',
+        'firstnamelastname'     => 'First Name Last Name (janesmith)',
+        'firstnamelastinitial'  => 'First Name Last Initial (janes)',
+        'lastnamefirstname'      => 'Last Name.First Name (smith.jane)',
+    ],
+
+    'email_formats' => [
+        'email_format'			=> 'E-postformat',
+        'firstname_lastname_format'	=> 'Fornavn Etternavn (oladunk@example.com)',
+        'first_name_format'		=> 'Fornavn (oladunk@example.com)',
+        'last_name_format'		=> 'Last Name (doe@example.com)',
+        'filastname_format'			=> 'Fornavn (kun initial) Etternavn (oladunk@example.com)',
+        'lastnamefirstinitial_format' =>  'Etternavn Initialer (oladunk@example.com)',
+        'firstname_lastname_underscore_format' => 'Fornavn Etternavn (oladunk@example.com)',
+        'firstinitial.lastname' => 'Fornavn Initialer. Etternavn (j.smith@example.com)',
+        'lastname_firstinitial' => 'Etternavn Fornavn Initialer (smith_j@example.com)',
+        'lastname_dot_firstinitial_format' => 'Last Name First Initial (smith.j@example.com)',
+        'firstnamelastname'     => 'Fornavn Etternavn (oladunk@example.com)',
+        'firstnamelastinitial'  => 'Fornavn Etternavn Initialer (janes@example.com)',
+        'lastnamefirstname'      => 'Last Name.First Name (smith.jane@example.com)',
+    ],
+
+
+
+    'logo_labels' => [
+        'acceptance_pdf_logo'       => 'PDF Logo',
+        'email_logo'                => 'E-postlogo',
+        'label_logo'                => 'Etikett-logo',
+        'logo'                      => 'Site Logo',
+        'favicon'                   => 'Favicon',
+    ],
+
+    'logo_help' => [
+        'email_logo_size'       => 'Kvadratiske logoer ser best ut i e-post. ',
+    ],
+
+    'logo_option_types' => [
+        'text' => 'Text',
+        'logo' => 'Logo',
+        'logo_and_text' => 'Logo and Text',
+    ],
+
+
+    'legends' => [
+        'scoping' => 'Scoping',
+        'formats' => 'Default Formats',
+        'profiles' => 'User Profiles',
+        'eula' => 'EULA & Acceptance Preferences',
+        'misc_display' => 'Miscellaneous Display Options',
+        'email' => 'Email Preferences',
+        'checkin' => 'Checkin Preferences',
+        'dashboard' => 'Login & Dashboard Preferences',
+        'misc' => 'Miscellaneous',
+        'logos' => 'Logos & Display',
+        'colors' => 'Colors & Skins',
+        'footer' => 'Footer Preferences',
+        'security' => 'Security Preferences',
+        'general' => 'General',
+        'intervals' => 'Intervals & Thresholds',
+    ],
+
+
+    /* Keywords for settings overview help */
+    'keywords' => [
+        'brand'             => 'footer, logo, print, theme, skin, header, colors, color, css',
+        'general_settings'  => 'bedriftens støtte, signatur, e-postformat, brukerformat, bilder, per side, miniatyrbilde, eula, graviter, forelder, dashbord, personvern',
+        'groups'            => 'permissions, permission groups, authorization',
+        'labels'            => 'labels, barcodes, barcode, sheets, print, upc, qr, 1d, 2d',
+        'localization'      => 'localization, currency, local, locale, time zone, timezone, international, internatinalization, language, languages, translation',
+        'php_overview'      => 'phpinfo, system, info',
+        'purge'             => 'slett permanent',
+        'security'          => 'password, passwords, requirements, two factor, two-factor, common passwords, remote login, logout, authentication',
+    ],
+
+];
diff --git a/resources/lang/nb-NO/admin/settings/message.php b/resources/lang/nb-NO/admin/settings/message.php
new file mode 100644
index 0000000000..5b47ee6bcb
--- /dev/null
+++ b/resources/lang/nb-NO/admin/settings/message.php
@@ -0,0 +1,59 @@
+<?php
+
+return [
+
+    'update' => [
+        'error'                 => 'En feil oppstod under oppdatering. ',
+        'success'               => 'Oppdatering av innstillinger vellykket.',
+    ],
+    'backup' => [
+        'delete_confirm'        => 'Er du sikker på at du vil slette denne sikkerhetskopien? Denne handlingen kan ikke angres. ',
+        'file_deleted'          => 'Den Sikkerhetskopierte filen ble slettet. ',
+        'generated'             => 'En ny sikkerhetskopi fil ble opprettet.',
+        'file_not_found'        => 'Den backup-filen ble ikke funnet på serveren.',
+        'restore_warning'       => 'Ja, kjør gjenoppretting. Jeg forstår at dette vil overskive alle eksisterende data som er i databasen. Dette vil også logge ut alle eksisterende brukere (inkludert meg selv).',
+        'restore_confirm'       => 'Er du sikker på at du vil gjenopprette databasen fra :filename?'
+    ],
+    'restore' => [
+        'success'               => 'Your system backup has been restored. Please log in again.'
+    ],
+    'purge' => [
+        'error'     => 'Det oppstod en feil under fjerning. ',
+        'validation_failed'     => 'Din fjerningsbekreftelse er feil. Vennligst skriv inn ordet "DELETE" i bekreftelsesboksen.',
+        'success'               => 'Slettede rader ble fjernet.',
+    ],
+    'mail' => [
+        'sending' => 'Sender e-post...',
+        'success' => 'E-post er sendt!',
+        'error' => 'E-post kunne ikke sendes.',
+        'additional' => 'Ingen ytterligere feilmelding oppgitt. Sjekk e-postinnstillingene og loggen.'
+    ],
+    'ldap' => [
+        'testing' => 'Tester LDAP-tilkobling, binding og spørring ...',
+        '500' => '500 serverfeil. Sjekk tjenerens logger for mer informasjon.',
+        'error' => 'Noe gikk galt :(',
+        'sync_success' => 'Et utvalg på 10 brukere som returneres fra LDAP-serveren basert på innstillingene:',
+        'testing_authentication' => 'Tester LDAP-autentisering...',
+        'authentication_success' => 'Brukeren ble autentisert mot LDAP!'
+    ],
+    'labels' => [
+        'null_template' => 'Label template not found. Please select a template.',
+        ],
+    'webhook' => [
+        'sending' => 'Sender :app test melding...',
+        'success' => 'Ditt :webhook_name integrasjon fungerer!',
+        'success_pt1' => 'Suksess! Sjekk ',
+        'success_pt2' => ' kanalen din for testmelding, og sørg for å klikke på SAVE nedenfor for å lagre innstillingene.',
+        '500' => '500 Tjenerfeil.',
+        'error' => 'Noe gikk galt. :app svarte med: :error_message',
+        'error_redirect' => 'FEIL: 301/302 :endpoint returnerer en omaddressering. Av sikkerhetsgrunner følger vi ikke omadressering. Vennligst bruk det faktiske endepunktet.',
+        'error_misc' => 'Noe gikk galt. :( ',
+        'webhook_fail' => ' webhook notification failed: Check to make sure the URL is still valid.',
+        'webhook_channel_not_found' => ' webhook channel not found.',
+        'ms_teams_deprecation' => 'The selected Microsoft Teams webhook URL will be deprecated Dec 31st, 2025. Please use a workflow URL. Microsoft\'s documentation on creating a workflow can be found <a href="https://support.microsoft.com/en-us/office/create-incoming-webhooks-with-workflows-for-microsoft-teams-8ae491c7-0394-4861-ba59-055e33f75498" target="_blank"> here.</a>',
+    ],
+    'location_scoping' => [
+        'not_saved' => 'Your settings were not saved.',
+        'mismatch' => 'There is 1 item in the database that need your attention before you can enable location scoping.|There are :count items in the database that need your attention before you can enable location scoping.',
+    ],
+];
diff --git a/resources/lang/nb-NO/admin/settings/table.php b/resources/lang/nb-NO/admin/settings/table.php
new file mode 100644
index 0000000000..0dbe87ea15
--- /dev/null
+++ b/resources/lang/nb-NO/admin/settings/table.php
@@ -0,0 +1,6 @@
+<?php
+
+return array(
+    'created'   => 'Opprettet',
+    'size' => 'Størrelse',
+);
diff --git a/resources/lang/nb-NO/admin/statuslabels/message.php b/resources/lang/nb-NO/admin/statuslabels/message.php
new file mode 100644
index 0000000000..03e2bd6e9b
--- /dev/null
+++ b/resources/lang/nb-NO/admin/statuslabels/message.php
@@ -0,0 +1,32 @@
+<?php
+
+return [
+
+    'does_not_exist' => 'Status-etiketten finnes ikke.',
+    'deleted_label' => 'Slettet statusmerke',
+    'assoc_assets'	 => 'Denne status-etiketten er for øyeblikket i bruk på minst en eiendel, og kan ikke slettes. Vennligst endre dine eiendeler til å ikke bruke denne statusen, og prøv igjen. ',
+
+    'create' => [
+        'error'   => 'Statusmerket ble ikke opprettet. Prøv igjen.',
+        'success' => 'Statusmerket ble opprettet.',
+    ],
+
+    'update' => [
+        'error'   => 'Statusmerket ble ikke oppdatert. Prøv igjen',
+        'success' => 'Vellykket oppdatering av statusmerke.',
+    ],
+
+    'delete' => [
+        'confirm'   => 'Er du sikker på at du vil slette dette statusmerket?',
+        'error'   => 'Det oppstod et problem under sletting av statusmerket. Prøv igjen.',
+        'success' => 'Vellykket sletting av statusmerke.',
+    ],
+
+    'help' => [
+        'undeployable'   => 'Disse eiendelene kan ikke tilordnes noen.',
+        'deployable'   => 'Disse eiendelene kan sjekkes ut. Når de er tildelt, antar de en metastatus på <i class="fas fa-circle text-blue"></i> <strong>Utlevert</strong>.',
+        'archived'   => 'Disse eiendelene kan ikke sjekkes ut, og vises bare i arkivert visning. Dette er nyttig for å beholde informasjon om eiendeler for budsjettering / historiske formål, men å holde dem ut av den daglige aktivitetslisten.',
+        'pending'   => 'Disse eiendelene kan ikke tildeles til noen, ofte brukt til gjenstander som er ute for reparasjon, men forventes å komme tilbake til omløp.',
+    ],
+
+];
diff --git a/resources/lang/nb-NO/admin/statuslabels/table.php b/resources/lang/nb-NO/admin/statuslabels/table.php
new file mode 100644
index 0000000000..f33797c07f
--- /dev/null
+++ b/resources/lang/nb-NO/admin/statuslabels/table.php
@@ -0,0 +1,19 @@
+<?php
+
+return array(
+    'about'      	=> 'About Status Types',
+    'archived'      	=> 'Arkivert',
+    'create'      	=> 'Opprett statusmerke',
+    'color'      	=> 'Graf-farge',
+    'default_label' => 'Standard Etikett',
+    'default_label_help' => 'Dette brukes til å sikre at de mest brukte statusetikettene dine vises øverst i valgboksen når du oppretter/redigerer eiendeler.',
+    'deployable'      	=> 'Utleverbar',
+    'info'      	=> 'Status label types are used to describe the various states your assets could be in. They may be out for repair, lost/stolen, etc. You can create new status labels for your deployable, pending and archived assets according to your own workflow. For more information, <a href="https://snipe-it.readme.io/docs/overview#status-labels" target="_blank">see the documentation <i class="fa fa-external-link"></i></a>.',
+    'name'      	=> 'Statusnavn',
+    'pending'      	=> 'Under arbeid',
+    'status_type'   => 'Statustype',
+    'show_in_nav'   => 'Vis i sidenavigasjon',
+    'title'      	=> 'Statusmerke',
+    'undeployable'  => 'Ikke utleverbar',
+    'update'      	=> 'Oppdater statusmerke',
+);
diff --git a/resources/lang/nb-NO/admin/suppliers/message.php b/resources/lang/nb-NO/admin/suppliers/message.php
new file mode 100644
index 0000000000..fc12ac80bb
--- /dev/null
+++ b/resources/lang/nb-NO/admin/suppliers/message.php
@@ -0,0 +1,28 @@
+<?php
+
+return array(
+
+    'deleted' => 'Slettet leverandør',
+    'does_not_exist' => 'Leverandør finnes ikke.',
+
+
+    'create' => array(
+        'error'   => 'Leverandør ble ikke opprettet. Prøv igjen.',
+        'success' => 'Opprettelse av leverandør vellykket.'
+    ),
+
+    'update' => array(
+        'error'   => 'Leverandør ble ikke oppdatert. Prøv igjen',
+        'success' => 'Oppdatering av leverandør vellykket.'
+    ),
+
+    'delete' => array(
+        'confirm'   => 'Er du sikker på at du vil slette denne leverandøren?',
+        'error'   => 'Det oppstod et problem under sletting av leverandør. Prøv igjen.',
+        'success' => 'Sletting av leverandør vellykket.',
+        'assoc_assets'	 => 'Denne leverandøren er tilknyttet med :asset_count eiendel(er), og kan ikke slettes. Oppdater eiendelene dine til ikke å bruke denne leverandøren og prøv igjen. ',
+        'assoc_licenses'	 => 'Denne leverandøren er tilknyttet med :licenses_count lisens(er), og kan ikke slettes. Oppdater lisensene dine til ikke å bruke denne leverandøren og prøv igjen. ',
+        'assoc_maintenances'	 => 'Denne leverandøren er tilknyttet med :asset_maintenances_count eiendelsvedlikehold, og kan ikke slettes. Oppdater dine eiendelsvedlikehold til ikke å bruke denne leverandøren og prøv igjen. ',
+    )
+
+);
diff --git a/resources/lang/nb-NO/admin/suppliers/table.php b/resources/lang/nb-NO/admin/suppliers/table.php
new file mode 100644
index 0000000000..39a66faff6
--- /dev/null
+++ b/resources/lang/nb-NO/admin/suppliers/table.php
@@ -0,0 +1,26 @@
+<?php
+
+return array(
+    'about_suppliers_title' => 'Om leverandører',
+    'about_suppliers_text'  => 'Leverandører brukes til å spore kilden til varer',
+    'address'               => 'Leverandøradresse',
+    'assets'                => 'Eiendeler',
+    'city'                  => 'By',
+    'contact'               => 'Kontaktnavn',
+    'country'               => 'Land',
+    'create'                => 'Opprett leverandør',
+    'email'                 => 'E-post',
+    'fax'                   => 'Faks',
+    'id'                    => 'ID',
+    'licenses'              => 'Lisenser',
+    'name'                  => 'Leverandørnavn',
+    'notes'                 => 'Notater',
+    'phone'                 => 'Telefon',
+    'state'                 => 'Stat',
+    'suppliers'             => 'Leverandører',
+    'update'                => 'Oppdater leverandør',
+    'view'                  => 'Vis leverandør',
+    'view_assets_for'       => 'Vis eiendeler for',
+    'zip'                   => 'Postnummer',
+
+);
diff --git a/resources/lang/nb-NO/admin/users/general.php b/resources/lang/nb-NO/admin/users/general.php
new file mode 100644
index 0000000000..9c03e4b135
--- /dev/null
+++ b/resources/lang/nb-NO/admin/users/general.php
@@ -0,0 +1,56 @@
+<?php
+
+return [
+    'activated_help_text' => 'Denne brukeren kan logge inn',
+    'activated_disabled_help_text' => 'Du kan ikke redigere aktiveringsstatus for din egen konto.',
+    'assets_user'       => 'Eiendeler tildelt :name',
+    'bulk_update_warn'	=> 'Du prøver å redigere egenskapene for: user_count brukere. Merk at du kan ikke endre dine egne brukerens attributter ved hjelp av dette skjemaet, og må gjøre endringer i din egen bruker individuelt.',
+    'bulk_update_help'	=> 'I dette skjemaet kan du oppdatere flere brukere samtidig. Bare fyll ut feltene du vil endre. Eventuelle tomme felt vil forbli uendret.',
+    'current_assets'    => 'Eiendeler som er sjekket ut til denne brukeren',
+    'clone'             => 'Klon bruker',
+    'contact_user'      => 'Kontakt :navn',
+    'edit'              => 'Rediger bruker',
+    'filetype_info'     => 'Gyldige filtyper er png, gif, jpg, jpeg, doc docx, pdf, txt, zip og rar.',
+    'history_user'      => 'Historikk for :name',
+    'info'				=> 'Info',
+    'restore_user'		=> 'Klikk her for å gjenopprette dem.',
+    'last_login'        => 'Siste innlogging',
+    'ldap_config_text'  => 'LDAP-konfigurasjonsinnstillingene kan finnes på Admin > innstillinger. Den (Valgfrie) valgte plasseringen angis for alle importerte brukere.',
+    'print_assigned'    => 'Skriv ut alt tilordnet',
+    'email_assigned'    => 'Epostliste for alle tilknyttede',
+    'user_notified'     => 'Brukeren har blitt sendt en liste over elementer som er tildelt brukeren.',
+    'users_notified'    => 'The user has been emailed a list of their currently assigned items.|:count users have been emailed a list of their currently assigned items.',
+    'users_notified_warning' => ':count user has been emailed a list of their currently assigned items, however :no_email users did not have an email address so could not be emailed.|:count users have been emailed a list of their currently assigned items, however :no_email user(s) did not have an email address so could not be emailed.',
+    'auto_assign_label' => 'Inkluder denne brukeren ved automatisk tildeling av kvalifiserte lisenser',
+    'auto_assign_help'  => 'Hopp over brukeren i autotildeling av lisenser',
+    'software_user'     => 'Programvare utsjekket til :name',
+    'send_email_help'   => 'Du må legge inn brukerens e-postadresse for å kunne sende dem innloggingsinformasjon. Sending av innloggingsinformasjon kan kun gjøres når brukeren blir opprettet. Passordet lagres på en sikker måte, slik at det ikke kan hentes opp når det er lagret.',
+    'view_user'         => 'Vis bruker :name',
+    'usercsv'           => 'CSV-fil',
+    'two_factor_admin_optin_help' => 'Gjeldende administrasjonsinnstillinger tillater selektiv håndhevelse av to-faktor autentisering.  ',
+    'two_factor_enrolled' => '2FA enhet registrert ',
+    'two_factor_active'   => '2FA Aktiv ',
+    'user_deactivated'  => 'Bruker kan ikke logge inn',
+    'user_activated'  => 'Bruker kan logge inn',
+    'activation_status_warning' => 'Ikke endre aktiveringsstatus',
+    'group_memberships_helpblock' => 'Bare superbrukere kan redigere gruppemedlemskap.',
+    'superadmin_permission_warning' => 'Kun superbrukere kan gjøre en annen bruker til superbruker.',
+    'admin_permission_warning' => 'Kun brukere med adminrettigheter eller høyere kan gi en annen bruker admintilgang.',
+    'remove_group_memberships' => 'Fjern gruppemedlemskap',
+    'warning_deletion_information' => 'Du er i ferd med å sjekke inn ALLE elementene fra :count bruker(e) nedenfor. Super admin navn er uthevet med rødt.',
+    'update_user_assets_status' => 'Oppdater alle ressursene til disse brukerne til denne statusen',
+    'checkin_user_properties' => 'Sjekk inn alt tilbehør koblet til disse brukerne',
+    'remote_label'   => 'Dette er en ekstern bruker',
+    'remote'   => 'Ekstern',
+    'remote_help' => 'Dette kan være nyttig hvis du trenger å filtrere ut eksterne brukere som aldri eller sjelden kommer inn i dine fysiske steder.',
+    'not_remote_label' => 'Dette er ikke en ekstern bruker',
+    'vip_label' => 'VIP bruker',
+    'vip_help' => 'Dette kan være nyttig for å markere viktige mennesker i org hvis du vil håndtere dem på spesielle måter.',
+    'create_user' => 'Opprett en bruker',
+    'create_user_page_explanation' => 'Dette er kontoinformasjon du vil bruke for å få tilgang til nettstedet for første gang.',
+    'email_credentials' => 'E-post påloggingsinformasjon',
+    'email_credentials_text' => 'Send opplysningene mine til e-postadressen ovenfor',
+    'next_save_user' => 'Neste: Lagre bruker',
+    'all_assigned_list_generation' => 'Generert på:',
+    'email_user_creds_on_create' => 'Send denne brukeren sin påloggingsinformasjon via e-post?',
+];
diff --git a/resources/lang/nb-NO/admin/users/message.php b/resources/lang/nb-NO/admin/users/message.php
new file mode 100644
index 0000000000..4e1faa24d9
--- /dev/null
+++ b/resources/lang/nb-NO/admin/users/message.php
@@ -0,0 +1,75 @@
+<?php
+
+return array(
+
+    'accepted'                  => 'Du har akseptert eiendelen.',
+    'declined'                  => 'Du har avvist eiendelen.',
+    'bulk_manager_warn'	        => 'Brukerne er oppdatert, men lederen ble ikke lagret fordi lederen du valgte også i brukerlisten for redigering og brukere kan ikke være sin egen leder. Velg brukerne igjen, unntatt lederen.',
+    'user_exists'               => 'Bruker finnes allerede!',
+    'user_not_found'            => 'User does not exist or you do not have permission view them.',
+    'user_login_required'       => 'Login-feltet er påkrevd',
+    'user_has_no_assets_assigned' => 'Ingen eiendeler er tilordnet brukeren for øyeblikket.',
+    'user_password_required'    => 'Passord er påkrevd.',
+    'insufficient_permissions'  => 'Utilstrekkelige rettigheter.',
+    'user_deleted_warning'      => 'Denne brukeren er slettet. Du vil må gjenopprette denne brukeren for å redigere, eller tildele nye eiendeler.',
+    'ldap_not_configured'        => 'LDAP integrasjonen er ikke konfigurert i denne installasjonen.',
+    'password_resets_sent'      => 'De valgte brukerne som er aktivert og har en gyldig e-postadresse har blitt sendt en tilbakestillingslenke.',
+    'password_reset_sent'       => 'En lenke for tilbakestilling av passord har blitt sendt til :email!',
+    'user_has_no_email'         => 'Denne brukeren har ingen e-postadresse i sin profil.',
+    'log_record_not_found'        => 'Finner ikke et samsvarende loggelement for denne brukeren.',
+
+
+    'success' => array(
+        'create'    => 'Opprettelse av bruker vellykket.',
+        'update'    => 'Oppdatering av bruker vellykket.',
+        'update_bulk'    => 'Oppdatering av brukere vellykket!',
+        'delete'    => 'Sletting av bruker vellykket.',
+        'ban'       => 'Vellykket forbud av bruker.',
+        'unban'     => 'Forbud av bruker ble opphevet.',
+        'suspend'   => 'Vellykket deaktivering av bruker.',
+        'unsuspend' => 'Vellykket aktivering av bruker.',
+        'restored'  => 'Vellykket gjenopprettelse av bruker.',
+        'import'    => 'Vellykket import av brukere.',
+    ),
+
+    'error' => array(
+        'create' => 'Det oppstod et problem under opprettelse av bruker. Prøv igjen.',
+        'update' => 'Det oppstod et problem under oppdatering av bruker. Prøv igjen.',
+        'delete' => 'Det oppstod et problem under sletting av bruker. Prøv igjen.',
+        'delete_has_assets' => 'Denne brukeren har utstyr tildelt og kan ikke slettes.',
+        'delete_has_assets_var' => 'This user still has an asset assigned. Please check it in first.|This user still has :count assets assigned. Please check their assets in first.',
+        'delete_has_licenses_var' => 'This user still has a license seats assigned. Please check it in first.|This user still has :count license seats assigned. Please check them in first.',
+        'delete_has_accessories_var' => 'This user still has an accessory assigned. Please check it in first.|This user still has :count accessories assigned. Please check their assets in first.',
+        'delete_has_locations_var' => 'This user still manages a location. Please select another manager first.|This user still manages :count locations. Please select another manager first.',
+        'delete_has_users_var' => 'This user still manages another user. Please select another manager for that user first.|This user still manages :count users. Please select another manager for them first.',
+        'unsuspend' => 'Det oppstod et problem under aktivering av bruker. Prøv igjen.',
+        'import'    => 'Det oppstod et problem under import av brukere. Prøv igjen.',
+        'asset_already_accepted' => 'Denne eiendelen er allerede akseptert.',
+        'accept_or_decline' => 'Du må enten akseptere eller avvise denne eiendelen.',
+        'cannot_delete_yourself' => 'We would feel really bad if you deleted yourself, please reconsider.',
+        'incorrect_user_accepted' => 'Eiendelen du prøvde å akseptere ble ikke sjekket ut til deg.',
+        'ldap_could_not_connect' => 'Kunne ikke kople til LDAP-serveren. Sjekk LDAP-innstillingene i konfigurasjonsfilen. <br>Feil fra LDAP-server:',
+        'ldap_could_not_bind' => 'Kunne ikke opprette tilkopling til LDAP-server. Sjekk LDAP-innstillingene i konfigurasjonsfilen. <br>Feil fra LDAP-server: ',
+        'ldap_could_not_search' => 'Kunne ikke utføre søk på LDAP-serveren. Sjekk LDAP-innstillingene i konfigurasjonsfilen. <br>Feil fra LDAP-server:',
+        'ldap_could_not_get_entries' => 'Fikk ingen oppføringer fra LDAP-serveren. Sjekk LDAP-innstillingene i konfigurasjonsfilen. <br>Feil fra LDAP-server:',
+        'password_ldap' => 'Passordet for denne kontoen administreres av LDAP/Active Directory. Kontakt IT-avdelingen for å endre passordet. ',
+        'multi_company_items_assigned' => 'This user has items assigned that belong to a different company. Please check them in or edit their company.'
+    ),
+
+    'deletefile' => array(
+        'error'   => 'Fil ble ikke slettet. Prøv igjen.',
+        'success' => 'Fil ble slettet.',
+    ),
+
+    'upload' => array(
+        'error'   => 'Fil(er) ble ikke lastet opp. Prøv igjen.',
+        'success' => 'Vellykket opplasting av fil(er).',
+        'nofiles' => 'Du valgte ingen filer for opplasting',
+        'invalidfiles' => 'En eller flere av filene dine er for store eller av en filtype som ikke er tillatt. Tillatte filtyper er png, gif, jpg, doc, docx, pdf og txt.',
+    ),
+
+    'inventorynotification' => array(
+        'error'   => 'Denne brukeren har ingen e-post.',
+        'success' => 'Brukeren har blitt varslet om det gjeldende inventaret.'
+    )
+);
\ No newline at end of file
diff --git a/resources/lang/nb-NO/admin/users/table.php b/resources/lang/nb-NO/admin/users/table.php
new file mode 100644
index 0000000000..6374870aaa
--- /dev/null
+++ b/resources/lang/nb-NO/admin/users/table.php
@@ -0,0 +1,41 @@
+<?php
+
+return array(
+    'activated'  			=> 'Aktiv',
+    'allow'  				=> 'Tillatt',
+    'checkedout'  			=> 'Eiendeler',
+    'created_at' 			=> 'Opprettet',
+    'createuser' 			=> 'Opprett bruker',
+    'deny'  				=> 'Nekt',
+    'email'      			=> 'E-post',
+    'employee_num'      	=> 'Ansattnummer',
+    'first_name' 			=> 'Fornavn',
+    'groupnotes'			=> 'Velg en gruppe for brukeren. Husk at brukeren får samme rettigheter som gruppen han tildeles. Bruk ctrl+museklikk (eller cmd+museklikk på MacOS) for å velge bort grupper.',
+    'id'         			=> 'Id',
+    'inherit'  				=> 'Arv',
+    'job' 					=> 'Jobbtittel',
+    'last_login'  			=> 'Siste innlogging',
+    'last_name'  			=> 'Etternavn',
+    'location'  			=> 'Lokasjon',
+    'lock_passwords'		=> 'Innloggingsdetaljer kan ikke endres i denne installasjonen.',
+    'manager' 				=> 'Overordnet',
+    'managed_locations'     => 'Administrere plasseringer',
+    'managed_users'         => 'Administrerte brukere',
+    'name' 					=> 'Navn',
+    'nogroup'               => 'Ingen grupper er opprettet ennå. For å legge til en, besøk:',
+    'notes'                 => 'Notater',
+    'password_confirm' 		=> 'Bekreft passord',
+    'password' 				=> 'Passord',
+    'phone'  				=> 'Telefon',
+    'show_current'          => 'Vis nåværende brukere',
+    'show_deleted'          => 'Vis slettede brukere',
+    'title' 				=> 'Tittel',
+	'to_restore_them'		=> 'for å gjenopprette de.',
+    'total_assets_cost'     => "Totale ressurskostnader",
+    'updateuser' 			=> 'Oppdater bruker',
+    'username' 				=> 'Brukernavn',
+	'user_deleted_text' 	=> 'Denne brukeren er merket som slettet.',
+    'username_note' 		=> '(Dette brukes til binding i Active Directory, ikke for innlogging)',
+    'cloneuser'             => 'Klon bruker',
+    'viewusers' 			=> 'Vis brukere',
+);
diff --git a/resources/lang/nb-NO/auth.php b/resources/lang/nb-NO/auth.php
new file mode 100644
index 0000000000..4a8095babe
--- /dev/null
+++ b/resources/lang/nb-NO/auth.php
@@ -0,0 +1,20 @@
+<?php
+
+return array(
+
+    /*
+    |--------------------------------------------------------------------------
+    | Authentication Language Lines
+    |--------------------------------------------------------------------------
+    |
+    | The following language lines are used during authentication for various
+    | messages that we need to display to the user. You are free to modify
+    | these language lines according to your application's requirements.
+    |
+    */
+
+    'failed' => 'Disse opplysningene samsvarer ikke med våre oppføringer.',
+    'password' => 'Angitt passord er feil.',
+    'throttle' => 'Too many login attempts. Please try again in :minutes minute(s).',
+
+);
diff --git a/resources/lang/nb-NO/auth/general.php b/resources/lang/nb-NO/auth/general.php
new file mode 100644
index 0000000000..47fb9d7f35
--- /dev/null
+++ b/resources/lang/nb-NO/auth/general.php
@@ -0,0 +1,18 @@
+<?php
+
+return [
+    'send_password_link'	        => 'Send Passord Tilbakestillingslink',
+    'email_reset_password'			=> 'E-post Passord Tilbakestill',
+    'reset_password'			    => 'Tilbakestill Passord',
+    'saml_login'                    => 'Logg inn med SSO',
+    'login'                         => 'Logg inn',
+    'login_prompt'                  => 'Vennligst logg inn',
+    'forgot_password'               => 'Jeg har glemt passordet mitt',
+    'ldap_reset_password'           => 'Klikk her for å nullstille ditt LDAP-passord',
+    'remember_me'                   => 'Husk meg',
+    'username_help_top'                 => 'Skriv inn ditt <strong>brukernavn</strong> for å få tilsendt en lenke for tilbakestilling av passord.',
+    'username_help_bottom'          => 'Ditt brukernavn og e-postadresse <em>kan</em> være det samme, men kan være, avhengig av din konfigurasjon. Dersom du ikke husker brukernavnet ditt, ta kontakt med systemansvarlig. <br><br><strong>Brukernavn uten en tilknyttet e-postadresse vil ikke bli sendt en lenke for tilbakestilling av passordet.</strong> ',
+    'google_login'                  => 'Logg inn med Google Workspace',
+    'google_login_failed'           => 'Google innlogging feilet, vennligst prøv igjen.',
+];
+
diff --git a/resources/lang/nb-NO/auth/message.php b/resources/lang/nb-NO/auth/message.php
new file mode 100644
index 0000000000..1327f5ec1d
--- /dev/null
+++ b/resources/lang/nb-NO/auth/message.php
@@ -0,0 +1,45 @@
+<?php
+
+return array(
+
+    'account_already_exists' => 'En konto med denne e-postadressen finnes allerede.',
+    'account_not_found'      => 'Brukernavnet eller passordet er feil.',
+    'account_not_activated'  => 'Denne brukerkontoen er ikke aktiv.',
+    'account_suspended'      => 'Denne brukerkontoen er deaktivert.',
+
+    'two_factor' => array(
+        'already_enrolled'      => 'Enheten din er allerede registrert.',
+        'success'               => 'Du har logget inn.',
+        'code_required'         => 'To-faktor-kode er påkrevd.',
+        'invalid_code'          => 'To-faktor-koden er ugyldig.',
+        'enter_two_factor_code' => 'Please enter your two-factor authentication code.',
+        'please_enroll'         => 'Please enroll a device in two-factor authentication.',
+    ),
+
+    'signin' => array(
+        'error'   => 'Det oppstod et problem under innlogging. Prøv igjen.',
+        'success' => 'Vellykket innlogging.',
+    ),
+
+    'logout' => array(
+        'error'   => 'Det oppstod et problem med utlogging, prøv igjen.',
+        'success' => 'Du har logget ut.',
+    ),
+
+    'signup' => array(
+        'error'   => 'Det oppstod et problem under opprettelse av konto. Prøv igjen.',
+        'success' => 'Opprettelse av konto vellykket.',
+    ),
+
+    'forgot-password' => array(
+        'error'   => 'Det oppstod et problem under henting av kode for resetting av passord. Prøv igjen.',
+        'success' => 'Hvis den oppgitte e-postadressen finnes i systemet vårt har det blitt sendt en e-post med gjenopprettelse av passord.',
+    ),
+
+    'forgot-password-confirm' => array(
+        'error'   => 'Det oppstod et problem under gjenopprettelse av passordet ditt. Prøv igjen.',
+        'success' => 'Ditt passord er resatt.',
+    ),
+
+
+);
diff --git a/resources/lang/nb-NO/button.php b/resources/lang/nb-NO/button.php
new file mode 100644
index 0000000000..6a9e0b8665
--- /dev/null
+++ b/resources/lang/nb-NO/button.php
@@ -0,0 +1,34 @@
+<?php
+
+return [
+    'actions' 	                => 'Handlinger',
+    'add'    	                => 'Opprett ny',
+    'cancel'                    => 'Avbryt',
+    'checkin_and_delete'  	    => 'Sjekk inn alle / slett bruker',
+    'delete'  	                => 'Slett',
+    'edit'    	                => 'Rediger',
+    'clone'    	                => 'Clone',
+    'restore' 	                => 'Gjenopprett',
+    'remove'                    => 'Fjern',
+    'request'                   => 'Forespørsel',
+    'submit'  	                => 'Send',
+    'upload'                    => 'Last opp',
+    'select_file'				=> 'Velg fil...',
+    'select_files'				=> 'Velg filer...',
+    'generate_labels'           => '{1} Lag etikett [2,*] Lag etiketter',
+    'send_password_link'        => 'Send lenke for å nullstille passordet',
+    'go'                        => 'Gå',
+    'bulk_actions'              => 'Massehandlinger',
+    'add_maintenance'           => 'Legg til vedlikehold',
+    'append'                    => 'Legg til',
+    'new'                       => 'Ny',
+    'var' => [
+        'clone'     => 'Clone :item_type',
+        'edit'      => 'Edit :item_type',
+        'delete'    => 'Delete :item_type',
+        'restore'   => 'Restore :item_type',
+        'create'    => 'Create New :item_type',
+        'checkout'  => 'Checkout :item_type',
+        'checkin'   => 'Checkin :item_type',
+    ]
+];
diff --git a/resources/lang/nb-NO/general.php b/resources/lang/nb-NO/general.php
new file mode 100644
index 0000000000..5b774aae71
--- /dev/null
+++ b/resources/lang/nb-NO/general.php
@@ -0,0 +1,629 @@
+<?php
+
+return [
+    '2FA_reset'             => '2FA reset',
+    'accessories'			=> 'Tilbehør',
+    'activated'			    => 'Aktivert',
+    'accepted_date'         => 'Akseptdato',
+    'accessory'				=> 'Tilbehør',
+    'accessory_report'		=> 'Rapport over tilbehør',
+    'action'                => 'Handlinger',
+    'activity_report'		=> 'Aktivitetsrapport',
+    'address'				=> 'Adresse',
+    'admin'					=> 'Admin innstillinger',
+    'admin_tooltip'			=> 'This user has admin privileges',
+    'superuser'				=> 'Superuser',
+    'superuser_tooltip'		=> 'This user has superuser privileges',
+    'administrator'			=> 'Administrator',
+    'add_seats'             => 'Setelisenser lagt til',
+    'age'                   => "Alder",
+    'all_assets'			=> 'Alle eiendeler',
+    'all'       			=> 'Alle',
+    'archived'              => 'Arkivert',
+    'asset_models'			=> 'Eiendelsmodeller',
+    'asset_model'			=> 'Modell',
+    'asset'					=> 'Eiendel',
+    'asset_previous'        => 'Asset (Previously Assigned)',
+    'asset_report'          => 'Eiendelsrapport',
+    'asset_tag'				=> 'Eiendelsmerke',
+    'asset_tags'            => 'Eiendelsmerker',
+    'assets_available'		=> 'Tilgjengelige eiendeler',
+    'accept_assets'         => 'Godta Eiendelen :name',
+    'accept_assets_menu'    => 'Godta eiendeler',
+    'accept_item'           => 'Accept Item',
+    'audit'				    => 'Revisjon',
+    'audits'				=> 'Audits',
+    'audit_report'			=> 'Overvåkingslogg',
+    'assets'				=> 'Eiendeler',
+    'assets_audited'        => 'reviderte ressurser',
+    'assets_checked_in_count'     => 'innsjekkede ressurser',
+    'assets_checked_out_count'     => 'utsjekkede ressurser',
+    'asset_deleted_warning'     => 'Denne ressursen er slettet. Du må gjenopprette den før du kan tilordne den til noen.',
+    'assigned_date'         => 'Dato tildelt',
+    'assigned_to'           => 'Tilordnet :name',
+    'assignee'              => 'Tilordnet til',
+    'avatar_delete'         => 'Slett Avatar',
+    'avatar_upload'         => 'Last opp Avatar',
+    'back'      			=> 'Tilbake',
+    'bad_data'      		=> 'Fant ingenting. Kanskje feil i data?',
+    'bulkaudit'             => 'Bulk revisjon',
+    'bulkaudit_status'      => 'Revisjon Status',
+    'bulk_checkout'  		=> 'Masseutsjekk',
+    'bulk_edit'             => 'Masseredigering',
+    'bulk_delete'           => 'Massesletting',
+    'bulk_actions'          => 'Massehandlinger',
+    'bulk_checkin_delete'   => 'Masseinnsjekk/Slett brukere',
+    'byod'                  => 'BYOD',
+    'byod_help'             => 'Denne enheten er eid av brukeren',
+    'bystatus'              => 'etter Status',
+    'cancel'  				=> 'Avbryt',
+    'categories'			=> 'Kategorier',
+    'category'				=> 'Kategori',
+    'change' 		        => 'Inn/ut',
+    'changeemail'  			=> 'Endre e-postadresse',
+    'changepassword'  		=> 'Endre passord',
+    'checkin'  				=> 'Sjekk inn',
+    'checkin_from'  		=> 'Innsjekk fra',
+    'checkin_note'  		=> 'Checkin Note',
+    'checkout_note'  		=> 'Checkout Note',
+    'checkout'  			=> 'Sjekk ut',
+    'checkouts_count'       => 'Sjekk ut',
+    'checkins_count'        => 'Sjekk inn',
+    'checkin_and_delete'  	=> 'Checkin and Delete',
+    'user_requests_count'   => 'Forespørsler',
+    'city'  				=> 'By',
+    'click_here'			=> 'Klikk her',
+    'clear_selection'		=> 'Tøm valg',
+    'companies'			    => 'Selskaper',
+    'company'				=> 'Firmanavn',
+    'component'			    => 'Komponent',
+    'components'			=> 'Komponenter',
+    'complete'				=> 'Fullført',
+    'consumable'			=> 'Forbruksvare',
+    'consumables'			=> 'Forbruksvarer',
+    'country'  				=> 'Land',
+    'could_not_restore'     => 'Feil ved gjenoppretting av :item_type: :error',
+    'not_deleted'           => 'The :item_type was not deleted and therefore cannot be restored',
+    'create'				=> 'Opprett ny',
+    'created'               => 'Enhet opprettet',
+    'created_asset'			=> 'eiendel opprettet',
+    'created_at' 			=> 'Opprettet',
+    'created_by'            => 'Opprettet av',
+    'record_created' 		=> 'Post opprettet',
+    'updated_at' 			=> 'Oppdatert',
+    'currency'  			=> '$', // this is deprecated
+    'currency_text'  		=> 'Valuta', //
+    'current'  				=> 'Nåværende',
+    'current_password'      => 'Gjeldende passord',
+    'customize_report'      => 'Tilpass rapport',
+    'custom_report'         => 'Tilpasset eiendelsrapport',
+    'dashboard'				=> 'Kontrollpanel',
+    'data_source'           => 'Data Source',
+    'days'      			=> 'dager',
+    'days_to_next_audit'    => 'Dager til neste revisjon',
+    'date'					=> 'Dato',
+    'debug_warning'         => 'Advarsel!',
+    'debug_warning_text'    => 'Dette programmet kjører i produksjonsmodus med feilsøking aktiverert. Dette kan utsette følsomme data hvis programmet er tilgjengelig for omverdenen. Deaktiver debug modus ved å sette <code>APP_DEBUG</code>-verdien i filen <code>.env</code> til <code>false</code>.',
+    'delete'  				=> 'Slett',
+    'delete_confirm'  		=> 'Er du sikker på at du vil slette :item?',
+    'delete_confirm_no_undo' => 'Are you sure, you wish to delete :item? This cannot be undone.',
+    'deleted'  				=> 'Slettet',
+    'delete_seats'  		=> 'Slettede setelisenser',
+    'deletion_failed'       => 'Sletting mislyktes',
+    'departments'           => 'Avdelinger',
+    'department'            => 'Avdeling',
+    'deployed'				=> 'Utlevert',
+    'depreciation'			=> 'Avskrivning',
+    'depreciations'         => 'Avskrivninger',
+    'depreciation_report'	=> 'Avskrivningsrapport',
+    'details'               => 'Detaljer',
+    'download'				=> 'Last ned',
+    'download_all'		    => 'Last ned alle',
+    'editprofile'  			=> 'Rediger din profil',
+    'eol'					=> 'Livstid',
+    'email_domain'			=> 'E-postdomene',
+    'employee_number'       => 'Ansattnummer',
+    'email_domain_help'		=> 'Brukes til å generere e-postadresser ved import',
+    'error'				    => 'Feil',
+    'exclude_archived'      => 'Ekskluder arkiverte ressurser',
+    'exclude_deleted'       => 'Ekskluder slettede ressurser',
+    'example'				=> 'Eksempel: ',
+
+    'files'                 => 'Filer',
+    'file_name'				=> 'Fil',
+    'file_type'             => 'Filtype',
+    'filesize'              => 'Filstørrelse',
+    'file_uploads'			=> 'Filopplastinger',
+    'file_upload'           => 'Filopplastning',
+    'generate'				=> 'Generer',
+    'generate_labels'       => 'Opprett etiketter',
+    'github_markdown'      => 'Dette feltet tillater <a href="https://help.github.com/articles/github-flavored-markdown/">Github flavored markdown</a>.',
+    'groups'				=> 'Grupper',
+    'gravatar_email'        => 'Gravatar e-postadresse',
+    'gravatar_url'          => '<a href="http://gravatar.com"><small>Endre din avatar på Gravatar.com</small></a>.',
+    'history'  			    => 'Historie',
+    'history_for'  			=> 'Historikk for',
+    'id'  					=> 'ID',
+    'image'                 => 'Bilde',
+    'image_delete'         	=> 'Slett bilde',
+    'include_deleted'       => 'Inkluder slettede ressurser',
+    'image_upload'         	=> 'Last opp bilde',
+    'filetypes_accepted_help'    => 'Accepted filetype is :types. The maximum size allowed is :size.|Accepted filetypes are :types. The maximum upload size allowed is :size.',
+    'filetypes_size_help'   => 'The maximum upload size allowed is :size.',
+    'image_filetypes_help'  => 'Accepted Filetypes are jpg, webp, png, gif, svg, and avif. The maximum upload size allowed is :size.',
+    'unaccepted_image_type'  => 'Denne bildefilen var ikke lesbar. Aksepterte filtyper er jpg, webp, png, gif og svg. Mime-typen til denne filen er :mimetype.',
+    'import'         	    => 'Importer',
+    'import_this_file'      => 'Kartfelter og behandle denne filen',
+    'importing'         	=> 'Importerer',
+    'importing_help'        => 'Du kan importere eiendeler, tilbehør, lisenser, komponenter, forbruksvarer og brukere via CSV-fil. <br><br>CSV-en må være kommaseparert og formatert med overskrifter som stemmer overens med de i <a href="https://snipe-it.readme.io/docs/importing" target="_new">eksempel-CSV i dokumentasjonen</a>.',
+    'import-history'        => 'Importhistorikk',
+    'asset_maintenance'        => 'Vedlikehold av eiendeler',
+    'asset_maintenance_report' => 'Rapport Vedlikehold av eiendeler',
+    'asset_maintenances'       => 'Vedlikehold av eiendeler',
+    'item'  				=> 'Enhet',
+    'item_name'             => 'Navn',
+    'import_file'  			=> 'importer CSV-fil',
+    'import_type'  			=> 'Type CSV-import',
+    'insufficient_permissions' => 'Utilstrekkelige rettigheter!',
+    'kits'       			=> 'Forhåndsdefinerte sett',
+    'language'				=> 'Språk',
+    'last'					=> 'Siste',
+    'last_login'            => 'Siste pålogging',
+    'last_name'             => 'Etternavn',
+    'firstname_lastname_display'	=> 'Fornavn Etternavn (Kari Torildsdottir)',
+    'lastname_firstname_display'	=> 'Etternavn Fornavn (Torildsdottir, Kari)',
+    'name_display_format'	=> 'Navneformat',
+    'first'					=> 'Første',
+    'first_name'			=> 'Fornavn',
+    'license'				=> 'Lisens',
+    'license_report'        => 'Lisensrapport',
+    'licenses_available'	=> 'Tilgjengelige lisenser',
+    'licenses'				=> 'Lisenser',
+    'list_all'				=> 'List alle',
+    'loading'				=> 'Laster... vennligst vent...',
+    'lock_passwords'        => 'Denne feltverdien vil ikke bli lagret i en demo-installasjon.',
+    'feature_disabled'      => 'Denne funksjonen er deaktivert i demo-installasjonen.',
+    'location'              => 'Lokasjon',
+    'location_plural'        => 'Stedslokasjoner',
+    'locations'				=> 'Lokasjoner',
+    'logo_size'				=> 'Kvadratisk logo vises best med Logo + Text. Logo maximum display size is 50px high x 500px wide.  ',
+    'logout'				=> 'Logg ut',
+    'lookup_by_tag'     => 'Søk på ID-merke',
+    'maintenances'          => 'Vedlikehold',
+    'manage_api_keys'       => 'Manage API keys',
+    'manufacturer'			=> 'Produsent',
+    'manufacturers'			=> 'Produsenter',
+    'markdown'				=> 'Dette feltet tillater <a href="https://help.github.com/articles/github-flavored-markdown/">Github flavored markdown</a>.',
+    'min_amt'				=> 'Min. antall',
+    'min_amt_help'          => 'Minimum antall varer som skal være tilgjengelig før et varsel blir utløst. La stå tomt hvis du ikke vil motta varsler for lavt inventar.',
+    'model_no'				=> 'Modellnummer',
+    'months'				=> 'måneder',
+    'moreinfo'				=> 'Mer info',
+    'name'					=> 'Navn',
+    'new_password'          => 'Nytt passord',
+    'next'					=> 'Neste',
+    'next_audit_date'		=> 'Neste revisjon dato',
+    'next_audit_date_help'  => 'If you use auditing in your organization, this is usually automatically calculated based on the asset&apos;s last audit date and audit frequency (in <code>Admin Settings &gt; Alerts</code>) and you can leave this blank. You can manually set this date here if you need to, but it must be later than the last audit date. ',
+    'audit_images_help'     => 'You can find audit images in the asset\'s history tab.',
+    'no_email'              => 'Ingen e-postadresse tilknyttet denne brukeren',
+    'last_audit'		    => 'Siste revisjon',
+    'new'					=> 'ny!',
+    'no_depreciation'		=> 'Ingen avskrivning',
+    'no_results'			=> 'Ingen treff.',
+    'no'  					=> 'Nei',
+    'notes'  				=> 'Notater',
+    'note_added'            => 'Note Added',
+    'options'				=> 'Options',
+    'preview'				=> 'Preview',
+    'add_note'              => 'Add Note',
+    'note_edited'            => 'Note Edited',
+    'edit_note'              => 'Edit Note',
+    'note_deleted'            => 'Note Deleted',
+    'delete_note'              => 'Delete Note',
+    'order_number'          => 'Ordreummer',
+    'only_deleted'          => 'Kun slettede ressurser',
+    'page_menu'				=> 'Viser _MENU_ enheter',
+    'pagination_info'		=> 'Viser _START_ til _END_ av _TOTAL_ enheter',
+    'pending'				=> 'Under arbeid',
+    'people'				=> 'Folk',
+    'per_page'				=> 'Resultater pr side',
+    'previous'				=> 'Forrige',
+    'processing'			=> 'Behandler',
+    'profile'				=> 'Din profil',
+    'purchase_cost'                              => 'Innkjøpskostnad',
+    'purchase_date'         => 'Innkjøpsdato',
+    'qty'		            => 'Antall',
+    'quantity'		        => 'Antall',
+    'quantity_minimum'      => 'You have one item below or almost below minimum quantity levels|You have :count items below or almost below minimum quantity levels',
+    'quickscan_checkin'  	=> 'Hurtiginnsjekk ved skanning',
+    'quickscan_checkin_status'  	=> 'Innsjekkingsstatus',
+    'ready_to_deploy'		=> 'Klar for utlevering',
+    'recent_activity'		=> 'Nylig aktivitet',
+    'remaining'             => 'Gjenstår',
+    'remove_company'        => 'Fjern tilknytning til bedrift',
+    'reports'				=> 'Rapporter',
+    'restored'				=> 'gjenopprettet',
+    'restore'				=> 'Gjenopprett',
+    'requestable_models'    => 'Forespørrbare modeller',
+    'requestable_items'     => 'Requestable Items',
+    'requested'				=> 'Forespurt',
+    'requested_date'        => 'Forespurt dato',
+    'requested_assets'      => 'Forespurte eiendeler',
+    'requested_assets_menu' => 'Forespurte eiendeler',
+    'request_canceled'      => 'Forespørsel avbrutt',
+    'request_item'          => 'Request this item',
+    'external_link_tooltip' => 'External link to',
+    'save'  				=> 'Lagre',
+    'select_var'            => 'Velg :thing... ', // this will eventually replace all of our other selects
+    'select'				=> 'Velg',
+    'select_all'            => 'Velg alle',
+    'search'				=> 'Søk',
+    'select_category'       => 'Velg en kategori',
+    'select_datasource' => 'Select a data source',
+    'select_department'     => 'Velg en avdeling',
+    'select_depreciation'	=> 'Velg en avskrivningstype',
+    'select_location'		=> 'Velg en lokasjon',
+    'select_manufacturer'	=> 'Velg en produsent',
+    'select_model'			=> 'Velg en modell',
+    'select_supplier'		=> 'Velg en leverandør',
+    'select_user'			=> 'Velg en bruker',
+    'select_date'			=> 'Velg dato (ÅÅÅÅ-MM-DD)',
+    'select_statuslabel'	=> 'Velg status',
+    'select_company'    	=> 'Velg bedrift',
+    'select_asset'    		=> 'Velg eiendel',
+    'settings'				=> 'Innstillinger',
+    'show_deleted'  		=> 'Vis slettede',
+    'show_current'  		=> 'Vis gjeldende',
+    'sign_in'				=> 'Logg inn',
+    'signature'             => 'Signatur',
+    'signed_off_by'         => 'Godkjent av',
+    'skin'       			=> 'Tema',
+    'webhook_msg_note'        => 'En varsling vil bli sendt via webhook',
+    'webhook_test_msg'        => 'Oh hai! It looks like your :app integration with Snipe-IT is working!',
+    'some_features_disabled' => 'DEMO MODUS: Noe funksjonalitet er skrudd av i denne installasjonen.',
+    'site_name'				=> 'Nettstedsnavn',
+    'state'  				=> 'Stat',
+    'status_labels'			=> 'Statusmerker',
+    'status_label'			=> 'Status Label',
+    'status'    			=> 'Status',
+    'accept_eula'           => 'Akseptavtale',
+    'show_or_hide_eulas' => 'Show/Hide EULAs',
+    'supplier'              => 'Leverandør',
+    'suppliers'  			=> 'Leverandører',
+    'sure_to_delete'        => 'Er du sikker på at du vil slette',
+    'sure_to_delete_var'    => 'Er du sikker på at du vil slette :item?',
+    'delete_what'           => 'Slett :item',
+    'submit'				=> 'Send',
+    'target'                => 'Mål',
+    'time_and_date_display' => 'Tid og Datovisning',
+    'total_assets'			=> 'eiendeler totalt',
+    'total_licenses'		=> 'lisener totalt',
+    'total_accessories'		=> 'antall tilbehør',
+    'total_consumables'		=> 'antall forbruksvarer',
+    'type'  				=> 'Type',
+    'undeployable'			=> 'Ikke utleverbar',
+    'unknown_admin'			=> 'Ukjent admin',
+    'username'              => 'Brukernavn',
+    'update'                => 'Oppdater',
+    'updating_item' => 'Updating :item',
+    'upload_filetypes_help'      => 'Tillatte filtyper er png, gif, jpg, jpeg, doc, docx, pdf, xls, xlsx, txt, lic, xml, zip, rtf og rar. Maks. filstørrelse er :size.',
+    'uploaded'              => 'Lastet opp',
+    'user'					=> 'Bruker',
+    'accepted'			    => 'akseptert',
+    'declined'			    => 'avslått',
+    'declined_note'         => 'Declined Notes',
+    'unassigned'            => 'Ikke tildelt',
+    'unaccepted_asset_report' => 'Ikke aksepterte eiendeler',
+    'users'                 => 'Brukere',
+    'viewall'				=> 'Vis alle',
+    'viewassets'  			=> 'Vis tildelte eiendeler',
+    'viewassetsfor'         => 'Vis eiendelene til :name',
+    'website'               => 'Nettsted',
+    'welcome'				=> 'Velkommen, :name',
+    'years'					=> 'år',
+    'yes' 					=> 'Ja',
+    'zip'  					=> 'Postnummer',
+    'noimage'				=> 'Bilde er ikke lastet opp eller finner ikke bilde.',
+    'file_does_not_exist'   => 'Den forespurte filen finnes ikke på serveren.',
+    'file_upload_success'   => 'Filopplasting vellykket!',
+    'no_files_uploaded'     => 'Filopplasting vellykket!',
+    'token_expired'         => 'Din sesjon har utløpt. Prøv igjen.',
+    'login_enabled'         => 'Innlogging aktiv',
+    'audit_due'             => 'Revisjonsfrist nær',
+    'audit_due_days'        => '{}Assets Due or Overdue for Audit|[1]Assets Due or Overdue for Audit Within a Day|[2,*]Assets Due or Overdue for Audit Within :days Days',
+    'checkin_due'           => 'Forfalt for innsjekk',
+    'checkin_overdue'       => 'Forfalt for innsjekk',
+    'checkin_due_days'      => '{}Due for Checkin|[1]Assets Due for Checkin Within :days Day|[2,*]Assets Due for Checkin Within :days Days',
+    'audit_overdue'         => 'Revisjonsfrist forfalt',
+    'accept'                => 'Akseptér :asset',
+    'i_accept'              => 'Jeg aksepterer',
+    'i_decline'             => 'Jeg avslår',
+    'accept_decline'        => 'Godta/Avslå',
+    'sign_tos'              => 'Signér under for å akseptere vilkårene for tjenesten:',
+    'clear_signature'       => 'Fjern signatur',
+    'show_help'             => 'Vis hjelp',
+    'hide_help'             => 'Skjul hjelp',
+    'view_all'              => 'se alle',
+    'hide_deleted'          => 'Skjul slettede',
+    'email'                 => 'E-post',
+    'do_not_change'         => 'Do not change',
+    'bug_report'            => 'Report a bug',
+    'user_manual'           => 'Brukerhåndbok',
+    'setup_step_1'          => 'Trinn 1',
+    'setup_step_2'          => 'Trinn 2',
+    'setup_step_3'          => 'Trinn 3',
+    'setup_step_4'          => 'Trinn 4',
+    'setup_config_check'    => 'Sjekk konfigurasjon',
+    'setup_create_database' => 'Create database tables',
+    'setup_create_admin'    => 'Create an admin user',
+    'setup_done'            => 'Ferdig!',
+    'bulk_edit_about_to'    => 'Du er i ferd med å redigere følgende: ',
+    'checked_out'           => 'Sjekket ut',
+    'checked_out_to'        => 'Sjekket ut til',
+    'fields'                => 'Felter',
+    'last_checkout'         => 'Siste utsjekk',
+    'due_to_checkin'        => 'Følgende :count elementer skal snart sjekkes inn:',
+    'expected_checkin'      => 'Forventet innsjekk',
+    'reminder_checked_out_items' => 'Dette er en påminnelse om utstyr som er sjekket ut til deg. Hvis du mener at denne listen er unøyaktig (noe mangler, eller at noe vises her du tror du aldri har fått), vennligst send e-post til :reply_to_name på :reply_to_address.',
+    'changed'               => 'Endret',
+    'to'                    => 'Til',
+    'report_fields_info'    => '<p>Velg feltene du vil inkludere i din egendefinerte rapport, og klikk Generer. Filen (custom-asset-report-YYYY-mm-dd.csv) vil bli lastet ned automatisk, og du kan åpne den i Excel.</p>
+            <p>Hvis du ønsker å eksportere bare enkelte eiendeler, bruk alternativene nedenfor til å finjustere resultatene dine.</p>',
+    'range'                 => 'Område',
+    'bom_remark'            => 'Legg til et BOM (byte-order merke) i CSV-fila',
+    'improvements'          => 'Forbedringer',
+    'information'           => 'Informasjon',
+    'permissions'           => 'Tillatelser',
+    'managed_ldap'          => '(Administrert via LDAP)',
+    'export'                => 'Eksport',
+    'ldap_sync'             => 'LDAP-synk',
+    'ldap_user_sync'        => 'Synk av LDAP-brukere',
+    'synchronize'           => 'Synkroniser',
+    'sync_results'          => 'Synkroniseringsresultat',
+    'license_serial'        => 'Serienr/produktnøkkel',
+    'invalid_category'      => 'Ugyldig eller manglende kategori',
+    'invalid_item_category_single' => 'Ugyldig eller mangler :type kategori. Oppdater kategorien til denne :type for å inkludere en gyldig kategori før du går til kassen.',
+    'dashboard_info'        => 'Dette er dashbordet ditt. Det er mange som det, men dette er ditt.',
+    '60_percent_warning'    => '60% fullført (advarsel)',
+    'dashboard_empty'       => 'Det ser ut som du ikke har lagt til noe enda, så vi har ikke noe fantastisk å vise. Kom i gang ved å legge til noen eiendeler, tilbehør, forbruksartikler eller lisenser nå!',
+    'new_asset'             => 'Ny eiendel',
+    'new_license'           => 'Ny lisens',
+    'new_accessory'         => 'Nytt tilbehør',
+    'new_consumable'        => 'Ny forbruksvare',
+    'new_component'         => 'New Component',
+    'new_user'              => 'New User',
+    'collapse'              => 'Kollaps',
+    'assigned'              => 'Tilordnet',
+    'asset_count'           => 'Antall eiendeler',
+    'accessories_count'     => 'Antall tilbehør',
+    'consumables_count'     => 'Antall forbruksvarer',
+    'components_count'      => 'Antall komponenter',
+    'licenses_count'        => 'Antall lisenser',
+    'notification_error'    => 'Feil',
+    'notification_error_hint' => 'Vennligst sjekk skjemaet nedenfor for feil',
+    'notification_bulk_error_hint' => 'Følgende felt har valideringsfeil og ble ikke endret:',
+    'notification_success'  => 'Suksess',
+    'notification_warning'   => 'Advarsel',
+    'notification_info'      => 'Informasjon',
+    'asset_information'     => 'Eiendelsinfo',
+    'model_name'            => 'Modell navn',
+    'asset_name'            => 'Eiendelens navn',
+    'consumable_information' => 'Info om forbruksvare:',
+    'consumable_name'       => 'Navn på forbruksvare:',
+    'accessory_information' => 'Info om tilbehør:',
+    'accessory_name'       => 'Tilbehørets navn:',
+    'clone_item'            => 'Klon element',
+    'checkout_tooltip' => 'Sjekk ut denne gjenstanden',
+    'checkin_tooltip' => 'Check this item in so that it is available for re-issue, re-imaging, etc',
+    'checkout_user_tooltip' => 'Sjekk dette elementet ut til en bruker',
+    'checkin_to_diff_location' => 'You can choose to check this asset in to a location other than this asset\'s default location of :default_location if one is set',
+    'maintenance_mode'      => 'Tjenesten er midlertidig utilgjengelig for systemoppdateringer. Vennligst prøv igjen senere.',
+    'maintenance_mode_title' => 'System midlertidig ikke tilgjengelig',
+    'ldap_import'           => 'Brukerpassord bør ikke administreres av LDAP. (Dette lar deg sende glemte passord forespørsler.)',
+    'purge_not_allowed'     => 'Sletting av slettede data er deaktivert i .env-filen. Kontakt kundestøtte eller systemadministrator.',
+    'backup_delete_not_allowed'     => 'Sletting av sikkerhetskopier er deaktivert i .env filen. Kontakt kundestøtte eller systemadministrator.',
+    'additional_files'           => 'Flere filer',
+    'shitty_browser'        => 'Ingen signatur oppdaget. Hvis du bruker en eldre nettleser, vennligst bruk en mer moderne nettleser for å akseptere mottak av eiendel.',
+    'bulk_soft_delete'      =>'Fjern også disse brukerne ved å fjerne deres eiendelshistorikk intakt/til du fjerner slettede poster i Admin-innstillingene.',
+    'bulk_checkin_delete_success' => 'Dine valgte brukere er slettet og deres elementer har blitt sjekket inn.',
+    'bulk_checkin_success' => 'Elementene for de valgte brukerne har blitt sjekket inn.',
+    'set_to_null'           => 'Delete values for this selection|Delete values for all :selection_count selections ',
+    'set_users_field_to_null'  => 'Slett :field verdier for denne brukeren. Slett :field verdier for alle :user_count brukere ',
+    'na_no_purchase_date'   => 'N/A - Ingen kjøpsdato oppgitt',
+    'assets_by_status'      => 'Eiendeler etter status',
+    'assets_by_status_type'      => 'Eiendeler etter status',
+    'pie_chart_type'        => 'Dashbord Kakediagram type',
+    'hello_name'            => 'Velkommen, :name!',
+    'unaccepted_profile_warning'   => 'You have one item requiring acceptance. Click here to accept or decline it | You have :count items requiring acceptance. Click here to accept or decline them',
+    'start_date'            => 'Startdato',
+    'end_date'            => 'Sluttdato',
+    'alt_uploaded_image_thumbnail' => 'Opplastet miniatyrbilde',
+    'placeholder_kit'       => 'Velg ett sett',
+    'file_not_found'        => 'Finner ikke filen',
+    'log_record_not_found'  => 'No record for that log entry was found.',
+    'preview_not_available' => '(ingen forhåndsvisning)',
+    'setup'                 => 'Innstillinger',
+    'pre_flight'            => 'Test',
+    'skip_to_main_content'  => 'Gå til hovedinnhold',
+    'toggle_navigation'     => 'Vis/skjul navigasjon',
+    'alerts'                => 'Varsler',
+    'tasks_view_all'        => 'Vis alle oppgaver',
+    'true'                  => 'Sant',
+    'false'                 => 'Usant',
+    'integration_option'    => 'Innstillinger for integrering',
+    'log_does_not_exist'    => 'Det finnes ingen samsvarende loggoppføring.',
+    'merge_users'           => 'Slå sammen brukere',
+    'merge_information' =>  'Dette vil slå sammen :count brukere til en enkelt bruker. Velg brukeren du ønsker å slå de andre sammen med, og de tilknyttede eiendelene, lisenser, etc vil bli flyttet til valgt bruker, og de andre vil bli merket som slettet.',
+    'warning_merge_information' => 'Denne handlingen kan ikke angres og skal BARE brukes når du må slå sammen brukere på grunn av dårlig import eller synkronisering. Sørg for å kjøre en sikkerhetskopi først.',
+    'no_users_selected'     => 'Ingen brukere er valgt',
+    'not_enough_users_selected'     => 'Minst :count brukere må være valgt',
+    'merge_success'         => ':count brukere er slått sammen med :into_username!',
+    'merged'                => 'sammenslått',
+    'merged_log_this_user_into' => 'Flettet denne brukeren (ID :to_id - :to_username) til bruker ID :from_id (:from_username) ',
+    'merged_log_this_user_from' => 'Flettet bruker-ID :from_id (:from_username) inn i denne brukeren (ID :to_id - :to_username)',
+    'clear_and_save'            => 'Tøm og lagre',
+    'update_existing_values'    => 'Oppdatere eksisterende verdier?',
+    'auto_incrementing_asset_tags_disabled_so_tags_required' => 'Automatisk generering av inkrementerende ressurskoder er skrudd av, så alle rader må ha "ressurskode"-kollonnen utfylt.',
+    'auto_incrementing_asset_tags_enabled_so_now_assets_will_be_created' => 'Merk: Automatisk generering av inkrementerende ressurskoder er er skrudd på, så for alle rader som ikke har fult ut "ressurskoden, så vil den bli generert autmatisk. Rader som har ressurskoden utfylt vil bli oppdatert med den gitte informasjonen.',
+    'send_welcome_email_to_users'   => ' Send velkomstepost til nye brukere?',
+    'send_email'                => 'Send e-post',
+    'call'                      => 'Ring nummer',
+    'back_before_importing'     => 'Sikkerhetskopier før importering?',
+    'csv_header_field'          => 'CSV-toppfelt',
+    'import_field'              => 'Importer felt',
+    'sample_value'              => 'Eksempelverdi',
+    'no_headers'                => 'Ingen kolonner funnet',
+    'error_in_import_file'      => 'Det oppstod en feil under lesing av CSV-filen: :error',
+    'errors_importing'          => 'Det oppstod noen feil under importeringen: ',
+    'warning'                   => 'ADVARSEL: :advarsel',
+    'success_redirecting'       => '"Vellykket... omadressering.',
+    'cancel_request'            => 'Avbryt forespørsel om element',
+    'setup_successful_migrations' => 'Databasetabellene er opprettet',
+    'setup_migration_output' => 'Migrasjonsmeldinger:',
+    'setup_migration_create_user' => 'Neste: Opprett bruker',
+    'importer_generic_error'    => 'Importen av filen er fullført, men vi fikk en feil. Dette skyldes vanligvis tredjeparts "API throttling" fra en meldings webhook (som Slack) og ville ikke ha forstyrret selve importen; men du bør bekrefte dette selv.',
+    'confirm' => 'Bekreft',
+    'autoassign_licenses' => 'Tildel lisenser automatisk',
+    'autoassign_licenses_help' => 'Tillat denne brukeren å ha lisenser tildelt via bulk-tildeling UI eller cli verktøy.',
+    'autoassign_licenses_help_long' => 'Dette tillater at en bruker får tildelt lisenser via massetildeling av lisenser via UI eller cli verktøyet. (Du vil for eksempel ikke nødvendigvis at en konsulent automatisk skal tildeles en lisens, men bare ansatte vil du oppgi den. Du kan fremdeles tilordne lisens til disse brukerne, men de vil ikke bli inkludert i "Checkout License" til "Alle brukere" funksjonene.)',
+    'no_autoassign_licenses_help' => 'Ikke inkluder bruker for massetilordning gjennom lisensbrukergrensesnittet eller cli verktøy.',
+    'modal_confirm_generic'      => 'Er du sikker?',
+    'cannot_be_deleted'      => 'Dette objektet kan ikke slettes',
+    'cannot_be_edited'      => 'Dette elementet kan ikke redigeres.',
+    'undeployable_tooltip'      => 'Dette elementet kan ikke sjekkes ut. Sjekk hvor mange som gjenstår.',
+    'serial_number'        => 'Serienummer',
+    'item_notes' => ':item notater',
+    'item_name_var' => ':item navn',
+    'error_user_company' => 'Utsjekk firma og firmaet til ressursen stemmer ikke',
+    'error_user_company_accept_view' => 'En ressurs tildelt til deg tilhører en annen bedrift, slik at du ikke kan akseptere eller avslå den, vennligst sjekk med din leder',
+    'importer' => [
+        'checked_out_to_fullname' => 'Sjekket ut til: Fullt navn',
+        'checked_out_to_first_name' => 'Sjekket ut til: Fornavn',
+        'checked_out_to_last_name' => 'Sjekket ut til: Etternavn',
+        'checked_out_to_username' => 'Sjekket ut til: Brukernavn',
+        'checked_out_to_email' => 'Sjekket ut til: e-post',
+        'checked_out_to_tag' => 'Sjekket ut til: ressursmerke',
+        'manager_first_name' => 'Leders fornavn',
+        'manager_last_name' => 'Leders etternavn',
+        'manager_full_name' => 'Leders fulle navn',
+        'manager_username' => 'Leders brukernavn',
+        'checkout_type' => 'Utsjekk type',
+        'checkout_location' => 'Sjekket ut til lokasjon',
+        'image_filename' => 'Filnavn bilde',
+        'do_not_import'     => 'Ikke importer',
+        'vip' => 'VIP',
+        'avatar'  => 'Profilbilde',
+        'gravatar' => 'Gravatar e-post',
+        'currency' => 'Valuta',
+        'address2' => 'Adresselinje 2',
+        'import_note' => 'Importert med csv-importør',
+    ],
+    'remove_customfield_association' => 'Remove this field from the fieldset. This will not delete the custom field, only this field\'s association with this fieldset.',
+    'checked_out_to_fields' => 'Checked Out To Fields',
+    'percent_complete' => '% fullført',
+    'uploading' => 'Laster opp... ',
+    'upload_error' => 'Error uploading file. Please check that you have no empty rows or duplicated column names in your CSV, and that the server permissions allow uploads.',
+    'copy_to_clipboard' => 'Kopier til utklippstavlen',
+    'copied' => 'Kopiert!',
+    'status_compatibility' => 'Hvis eiendelene allerede er tilordnet, kan de ikke endres til en ikke-distribuerbar statustype og denne verdien vil bli hoppet over.',
+    'rtd_location_help' => 'Dette er stedet til eiendel når den ikke er sjekket ut',
+    'item_not_found' => ':item_type ID :id eksisterer ikke eller har blitt slettet',
+    'action_permission_denied' => 'Du har ikke tillatelse til :action :item_type ID :id',
+    'action_permission_generic' => 'Du har ikke tillatelse til :action denne :item_type',
+    'edit' => 'rediger',
+    'action_source' => 'Kilde for handling',
+    'or' => 'eller',
+    'url'                   => 'URL',
+    'edit_fieldset' => 'Redigere feltene og opsjonene',
+    'permission_denied_superuser_demo' => 'Tillatelse nektet. Du kan ikke oppdatere brukerinformasjon for superadmins på demo.',
+    'pwd_reset_not_sent' => 'Brukeren er ikke aktivert, er LDAP synkronisert eller har ikke en e-postadresse',
+    'error_sending_email' => 'Feil ved sending av e-post',
+    'sad_panda' => 'Sad panda. You are not authorized to do the thing. Maybe <a href=":link">return to the dashboard</a>, or contact your administrator.',
+    'bulk' => [
+            'delete' =>
+                [
+                'header' => 'Bulk sletting :object_type',
+                'warn'   =>  'Du er i ferd med å slette ett :object_type″Du er i ferd med å slette :count :object_type',
+                'success'   =>  ':object_type ble vellykket slettet :count :object_type',
+                'error'   =>  'Kunne ikke slette :object_type',
+                'nothing_selected'   =>  'Nei :object_type er valgt - ingenting å gjøre',
+                'partial'   =>  'Slettet :success_count :object_type, men :error_count :object_type kunne ikke slettes',
+             ],
+    ],
+    'no_requestable' => 'Det finnes ingen forespørselbare eiendeler eller modeller.',
+
+    'countable' => [
+        'accessories'  => ':count Tilbehør|:count tilbehør',
+        'assets'  => ':count Eiendeler|:count',
+        'licenses'  => ':count Lisens|:count lisenser',
+        'license_seats'  => ':count lisenssete|:count Lisensseter',
+        'consumables'  => ':count Forbruksvare|:count Forbruksvarer',
+        'components'  => ':count Komponenter|:count komponenter',
+    ],
+
+    'more_info' => 'Mer info',
+    'quickscan_bulk_help' => 'Checking this box will edit the asset record to reflect this new location. Leaving it unchecked will simply note the location in the audit log. Note that if this asset is checked out, it will not change the location of the person, asset or location it is checked out to.',
+    'whoops' => 'Whoops!',
+    'something_went_wrong' => 'Something went wrong with your request.',
+    'close' => 'Close',
+    'expires' => 'Utløper',
+    'map_fields'=> 'Map :item_type Fields',
+    'remaining_var' => ':count Remaining',
+    'label' => 'Label',
+    'import_asset_tag_exists' => 'An asset with the asset tag :asset_tag already exists and an update was not requested. No change was made.',
+    'countries_manually_entered_help' => 'Values with an asterisk (*) were manually entered and do not match existing ISO 3166 dropdown values',
+    'accessories_assigned' => 'Assigned Accessories',
+    'user_managed_passwords' => 'Password Management',
+    'user_managed_passwords_disallow' => 'Disallow users from managing their own passwords',
+    'user_managed_passwords_allow' => 'Allow users to manage their own passwords',
+    'from' => 'From',
+    'by' => 'Av',
+
+// Add form placeholders here
+    'placeholders' => [
+        'notes'  => 'Add a note',
+    ],
+
+    'breadcrumb_button_actions' => [
+        'edit_item' => 'Edit :name',
+        'checkout_item' => 'Checkout :name',
+        'checkin_item' => 'Checkin :name',
+    ],
+
+    'skins' => [
+        'site_default' => 'Site Default',
+        'default_blue' => 'Default Blue',
+        'blue_dark' => 'Blue (Dark Mode)',
+        'green' => 'Green Dark',
+        'green_dark' => 'Green (Dark Mode)',
+        'red' => 'Red Dark',
+        'red_dark' => 'Red (Dark Mode)',
+        'orange' => 'Orange Dark',
+        'orange_dark' => 'Orange (Dark Mode)',
+        'black' => 'Black',
+        'black_dark' => 'Black (Dark Mode)',
+        'purple' => 'Purple',
+        'purple_dark' => 'Purple (Dark Mode)',
+        'yellow' => 'Yellow',
+        'yellow_dark' => 'Yellow (Dark Mode)',
+        'high_contrast' => 'High Contrast',
+
+    ],
+
+    'select_all_none' => 'Select/Unselect All',
+    'generic_model_not_found' => 'That :model was not found or you do not have permission to access it',
+    'deleted_models' => 'Deleted Asset Models',
+    'deleted_users' => 'Deleted Users',
+    'cost_each' => ':amount each',
+    'remove_current_image' => 'Remove current :type image',
+
+    'seeding' => [
+        'manufacturers' => [
+            'button' => 'Create Manufacturers',
+            'prompt' => 'You do not have any manufacturers yet. Would you like to seed a list of common manufacturers? (THIS WILL OVERWRITE EXISTING MANUFACTURERS, including those that have been soft-deleted.)',
+            'success' => 'Manufacturers seeded successfully',
+            'error' => 'Could not seed manufacturers. A manufacturer record already exists and seeding would overwrite it.|Could not seed manufacturers. :count manufacturer records already exist and seeding would overwrite them.',
+        ],
+    ],
+
+];
diff --git a/resources/lang/nb-NO/help.php b/resources/lang/nb-NO/help.php
new file mode 100644
index 0000000000..e091505712
--- /dev/null
+++ b/resources/lang/nb-NO/help.php
@@ -0,0 +1,35 @@
+<?php
+
+return [
+
+    /*
+    |--------------------------------------------------------------------------
+    | Password Reminder Language Lines
+    |--------------------------------------------------------------------------
+    |
+    | The following language lines are the default lines which match reasons
+    | that are given by the password broker for a password update attempt
+    | has failed, such as for an invalid token or invalid new password.
+    |
+    */
+
+    'more_info_title' => 'Mer info',
+
+    'audit_help' => 'Kryss av for å endre eiendelen til å bruke denne nye lokasjonen. Hvis du ikke krysser av vil lokasjonen kun bli notert i revisjonsloggen.<br><br>Merk at hvis denne eiendelen er sjekket ut vil det ikke endre lokasjon for brukeren, ressursen eller lokasjonen den er sjekket ut til.',
+
+    'assets' => 'Eiendeler er enheter som spores på serienummer eller annen merking. Typisk er dette kostbare enheter der det gir mening å spore enkeltenheter.',
+
+    'categories' => 'Kategorier hjelper deg med å organisere ting. Eksempeler på kategorier kan være &quot;Skrivebord&quot;, &quot;Bærbare&quot;, &quot;Mobiltelefon&quot;, &quot;Nettbrett&quot; og så videre, men du kan bruke kategorier som gir mening for deg.',
+
+    'accessories' => 'Tilbehør er ting du leverer ut som ikke har serienummer (eller som du ikke sporer enkeltvis), for eksempel datamus og tastaturer.',
+
+    'companies'     => 'Firma kan brukes som et enkelt identifikatorfelt, eller det kan brukes til å begrense eksponeringen av eiendeler, brukere, etc hvis full firmastøtte er aktivert i innstillingene.',
+
+    'components'    => 'Komponenter er ting som er del av en eiendel, f. eks. internminne, disk o. l.',
+
+    'consumables'   => 'Forbruksvarer er alle varer som blir brukt opp over tid. For eksempel skrivertoner eller kopipapir.',
+
+    'depreciations' => 'Du kan sette opp avskrivninger for å kostnadsføre eiendeler basert på en lineær avskrivning i perioden.',
+    
+    'empty_file'    => 'Importbehandleren registrerer at filen er tom.'
+];
diff --git a/resources/lang/nb-NO/localizations.php b/resources/lang/nb-NO/localizations.php
new file mode 100644
index 0000000000..d313737f94
--- /dev/null
+++ b/resources/lang/nb-NO/localizations.php
@@ -0,0 +1,326 @@
+<?php
+
+return [
+
+    'select_language' => 'Select a Language',
+    'languages' => [
+        'en-US'=> 'Engelsk, USA',
+        'en-GB'=> 'Engelsk, Storbritannia',
+        'am-ET' => 'Amharic',
+        'af-ZA'=> 'Afrikansk',
+        'ar-SA'=> 'Arabisk',
+        'bg-BG'=> 'Bulgarsk',
+        'zh-CN'=> 'Forenklet kinesisk',
+        'zh-TW'=> 'Tradisjonell kinesisk',
+        'ca-ES' => 'Katalansk',
+        'hr-HR'=> 'Kroatisk',
+        'cs-CZ'=> 'Tsjekkisk',
+        'da-DK'=> 'Dansk',
+        'nl-NL'=> 'Nederlandsk',
+        'en-ID'=> 'Engelsk, Indonesia',
+        'et-EE'=> 'Estisk',
+        'fil-PH'=> 'Filippinsk',
+        'fi-FI'=> 'Finsk',
+        'fr-FR'=> 'Fransk',
+        'de-DE'=> 'Tysk',
+        'de-if'=> 'Tysk (uformel)',
+        'el-GR'=> 'Gresk',
+        'he-IL'=> 'Hebraisk',
+        'hu-HU'=> 'Ungarsk',
+        'is-IS' => 'Islandsk',
+        'id-ID'=> 'Indonesisk',
+        'ga-IE'=> 'Irsk',
+        'it-IT'=> 'Italiensk',
+        'ja-JP'=> 'Japansk',
+        'km-KH'=>'Khmer',
+        'ko-KR'=> 'Koreansk',
+        'lt-LT'=>'Litauisk',
+        'lv-LV'=> 'Latvisk',
+        'mk-MK'=> 'Makedonsk',
+        'ms-MY'=> 'Malayisk',
+        'mi-NZ'=> 'Maori',
+        'mn-MN'=> 'Mongolsk',
+        'nb-NO'=> 'Norwegian Bokmål',
+        'om-ET' => 'Oromo (Ethiopian)',
+        //'nn-NO'=> 'Norwegian Nynorsk',
+        'fa-IR'=> 'Persisk',
+        'pl-PL'=> 'Polsk',
+        'pt-PT'=> 'Portugisisk',
+        'pt-BR'=> 'Portugisisk, Brasiliansk',
+        'ro-RO'=> 'Rumensk',
+        'ru-RU'=> 'Russisk',
+        'sr-CS' => 'Serbisk (Latin)',
+        'sk-SK'=> 'Slovakisk',
+        'sl-SI'=> 'Slovensk',
+        'so-SO'=> 'Somali',
+        'es-ES'=> 'Spansk',
+        'es-CO'=> 'Spansk, Colombia',
+        'es-MX'=> 'Spansk, Mexico',
+        'es-VE'=> 'Spansk, Venezuela',
+        'sv-SE'=> 'Svensk',
+        'tl-PH'=> 'Tagalog',
+        'ta-IN'=> 'Tamilsk',
+        'th-TH'=> 'Thai',
+        'tr-TR'=> 'Tyrkisk',
+        'uk-UA'=> 'Ukrainsk',
+        'vi-VN'=> 'Vietnamesisk',
+        'cy-GB'=> 'Walisisk',
+        'zu-ZA'=> 'Zulu',
+    ],
+
+    'select_country' => 'Select a Country',
+    
+    'countries' => [
+        'AC'=>'Ascension Island',
+        'AD'=>'Andorra',
+        'AE'=>'De forente arabiske emirater',
+        'AF'=>'Afghanistan',
+        'AG'=>'Antigua og Barbuda',
+        'AI'=>'Anguilla',
+        'AL'=>'Albania',
+        'AM'=>'Armenia',
+        'AN'=>'De nederlandske Antillene',
+        'AO'=>'Angola',
+        'AQ'=>'Antarktis',
+        'AR'=>'Argentina',
+        'AS'=>'Amerikansk Samoa',
+        'AT'=>'Østerrike',
+        'AU'=>'Australia',
+        'AW'=>'Aruba',
+        'AX'=>'Åland',
+        'AZ'=>'Aserbajdsjan',
+        'BA'=>'Bosnia-Hercegovina',
+        'BB'=>'Barbados',
+        'BE'=>'Belgia',
+        'BD'=>'Bangladesh',
+        'BF'=>'Burkina Faso',
+        'BG'=>'Bulgaria',
+        'BH'=>'Bahrain',
+        'BI'=>'Burundi',
+        'BJ'=>'Benin',
+        'BM'=>'Bermuda',
+        'BN'=>'Brunei Darussalam',
+        'BO'=>'Bolivia',
+        'BR'=>'Brasil',
+        'BS'=>'Bahamas',
+        'BT'=>'Bhutan',
+        'BV'=>'Bouvet-øya',
+        'BW'=>'Botswana',
+        'BY'=>'Republikken Belarus',
+        'BZ'=>'Belize',
+        'CA'=>'Canada',
+        'CC'=>'Kokosøyene (Keelingøyene)',
+        'CD'=>'Den demokratiske republikken Kongo',
+        'CF'=>'Den sentralafrikanske republikk',
+        'CG'=>'Republikken Kongo',
+        'CH'=>'Sveits',
+        'CI'=>'Elfenbenskysten',
+        'CK'=>'Cook-øyene',
+        'CL'=>'Chile',
+        'CM'=>'Kamerun',
+        'CN'=>'Folkerepublikken Kina',
+        'CO'=>'Colombia',
+        'CR'=>'Costa Rica',
+        'CU'=>'Cuba',
+        'CV'=>'Kapp Verde',
+        'CX'=>'Christmasøya',
+        'CY'=>'Kypros',
+        'CZ'=>'Tsjekkia',
+        'DE'=>'Tyskland',
+        'DJ'=>'Djibouti',
+        'DK'=>'Danmark',
+        'DM'=>'Dominica',
+        'DO'=>'Den dominikanske republikk',
+        'DZ'=>'Algerie',
+        'EC'=>'Ecuador',
+        'EE'=>'Estland',
+        'EG'=>'Egypt',
+        'GB-ENG'=>'England',
+        'ER'=>'Eritrea',
+        'ES'=>'Spania',
+        'ET'=>'Etiopia',
+        'EU'=>'EU',
+        'FI'=>'Finland',
+        'FJ'=>'Fiji',
+        'FK'=>'Falklandsøyene (Malvinas)',
+        'FM'=>'Mikronesia, De forente stater',
+        'FO'=>'Færøyene',
+        'FR'=>'Frankrike',
+        'GA'=>'Gabon',
+        'GD'=>'Grenada',
+        'GE'=>'Georgia',
+        'GF'=>'Fransk Guyana',
+        'GG'=>'Guernsey',
+        'GH'=>'Ghana',
+        'GI'=>'Gibraltar',
+        'GL'=>'Grønland',
+        'GM'=>'Gambia',
+        'GN'=>'Guinea',
+        'GP'=>'Guadeloupe',
+        'GQ'=>'Ekvatorial-Guinea',
+        'GR'=>'Hellas',
+        'GS'=>'Sør-Georgia og Sør-Sandwichøyene',
+        'GT'=>'Guatemala',
+        'GU'=>'Guam',
+        'GW'=>'Guinea-Bissau',
+        'GY'=>'Guyana',
+        'HK'=>'Hong Kong',
+        'HM'=>'Heard og Mc Donald Øyene',
+        'HN'=>'Honduras',
+        'HR'=>'Kroatia (lokalt navn: Hrvatska)',
+        'HT'=>'Haiti',
+        'HU'=>'Ungarn',
+        'ID'=>'Indonesia',
+        'IE'=>'Irland',
+        'IL'=>'Israel',
+        'IM'=>'Isle of Man',
+        'IN'=>'India',
+        'IO'=>'Det britiske territoriet i Indiahavet',
+        'IQ'=>'Irak',
+        'IR'=>'Iran',
+        'IS'=>'Island',
+        'IT'=>'Italia',
+        'JE'=>'Jersey',
+        'JM'=>'Jamaica',
+        'JO'=>'Jordan',
+        'JP'=>'Japan',
+        'KE'=>'Kenya',
+        'KG'=>'Kirgisistan',
+        'KH'=>'Kambodsja',
+        'KI'=>'Kiribati',
+        'KM'=>'Komorene',
+        'KN'=>'Saint Kitts og Nevis',
+        'KR'=>'Republikken Korea',
+        'KW'=>'Kuwait',
+        'KY'=>'Caymanøyene',
+        'KZ'=>'Kasakhstan',
+        'LA'=>'Laos',
+        'LB'=>'Libanon',
+        'LC'=>'Saint Lucia',
+        'LI'=>'Liechtenstein',
+        'LK'=>'Sri Lanka',
+        'LR'=>'Liberia',
+        'LS'=>'Lesotho',
+        'LT'=>'Litauen',
+        'LU'=>'Luxemburg',
+        'LV'=>'Latvia',
+        'LY'=>'Libyan Arab Jamahiriya',
+        'MA'=>'Marokko',
+        'MC'=>'Monaco',
+        'MD'=>'Moldova',
+        'ME'=>'Montenegro',
+        'MG'=>'Madagaskar',
+        'MH'=>'Marshalløyene',
+        'MK'=>'Makedonia, den tidligere jugoslaviske republikken',
+        'ML'=>'Mali',
+        'MM'=>'Myanmar',
+        'MN'=>'Mongolia',
+        'MO'=>'Macao',
+        'MP'=>'Nord-Marianene',
+        'MQ'=>'Martinique',
+        'MR'=>'Mauritania',
+        'MS'=>'Montserrat',
+        'MT'=>'Malta',
+        'MU'=>'Mauritius',
+        'MV'=>'Maldivene',
+        'MW'=>'Malawi',
+        'MX'=>'Mexico',
+        'MY'=>'Malaysia',
+        'MZ'=>'Mosambik',
+        'NA'=>'Namibia',
+        'NC'=>'Ny Caledonia',
+        'NE'=>'Niger',
+        'NF'=>'Norfolkøyene',
+        'NG'=>'Nigeria',
+        'NI'=>'Nicaragua',
+        'NL'=>'Nederland',
+        'GB-NIR' => 'Northern Ireland',
+        'NO'=>'Norge',
+        'NP'=>'Nepal',
+        'NR'=>'Nauru',
+        'NU'=>'Niue',
+        'NZ'=>'New Zealand',
+        'OM'=>'Oman',
+        'PA'=>'Panama',
+        'PE'=>'Peru',
+        'PF'=>'Fransk Polynesia',
+        'PG'=>'Papua Ny-Guinea',
+        'PH'=>'Filippinene',
+        'PK'=>'Pakistan',
+        'PL'=>'Polen',
+        'PM'=>'St. Pierre og Miquelon',
+        'PN'=>'Pitcairnøyene',
+        'PR'=>'Puerto Rico',
+        'PS'=>'Palestina',
+        'PT'=>'Portugal',
+        'PW'=>'Palau',
+        'PY'=>'Paraguay',
+        'QA'=>'Qatar',
+        'RE'=>'Réunion',
+        'RO'=>'Romania',
+        'RS'=>'Serbia',
+        'RU'=>'Russland',
+        'RW'=>'Rwanda',
+        'SA'=>'Saudi-Arabia',
+        'GB-SCT'=>'Storbritannia',
+        'SB'=>'Salomonøyene',
+        'SC'=>'Seychellene',
+        'SS'=>'Sør-Sudan',
+        'SD'=>'Sudan',
+        'SE'=>'Sverige',
+        'SG'=>'Singapor',
+        'SH'=>'St. Helena',
+        'SI'=>'Slovenia',
+        'SJ'=>'Svalbard og Jan Mayen',
+        'SK'=>'Slovakia',
+        'SL'=>'Sierra Leone',
+        'SM'=>'San Marino',
+        'SN'=>'Senegal',
+        'SO'=>'Somalia',
+        'SR'=>'Surinam',
+        'ST'=>'Sao Tome og Principe',
+        'SU'=>'Sovjet',
+        'SV'=>'El Salvador',
+        'SY'=>'Syria',
+        'SZ'=>'Swaziland',
+        'TC'=>'Turks- og Caicosøyene',
+        'TD'=>'Tsjad',
+        'TF'=>'De franske sørterritorier',
+        'TG'=>'Togo',
+        'TH'=>'Thailand',
+        'TJ'=>'Tadsjikistan',
+        'TK'=>'Tokelau',
+        'TI'=>'Øst-Timor',
+        'TM'=>'Turkmenistan',
+        'TN'=>'Tunisia',
+        'TO'=>'Tonga',
+        'TP'=>'Øst Timor',
+        'TR'=>'Tyrkia',
+        'TT'=>'Trinidad og Tobago',
+        'TV'=>'Tuvalu',
+        'TW'=>'Taiwan',
+        'TZ'=>'Tanzania',
+        'UA'=>'Ukraina',
+        'UG'=>'Uganda',
+        'UK'=>'Storbritannia',
+        'US'=>'USA',
+        'UM'=>'USAs ytre småøyer',
+        'UY'=>'Uruguay',
+        'UZ'=>'Usbekistan',
+        'VA'=>'Vatikanstaten',
+        'VC'=>'Saint Vincent og Grenadinene',
+        'VE'=>'Venezuela',
+        'VG'=>'Jomfru øyene (Storbritannia)',
+        'VI'=>'Jomfruøyene, (USA)',
+        'VN'=>'Vietnam',
+        'VU'=>'Vanuatu',
+        'GB-WLS' =>'Wales',
+        'WF'=>'Wallis- og Futunaøyene',
+        'WS'=>'Samoa',
+        'YE'=>'Jemen',
+        'YT'=>'Mayotte',
+        'ZA'=>'South Africa',
+        'ZM'=>'Zambia',
+        'ZW'=>'Zimbabwe',
+    ],
+];
\ No newline at end of file
diff --git a/resources/lang/nb-NO/mail.php b/resources/lang/nb-NO/mail.php
new file mode 100644
index 0000000000..d2d6f59026
--- /dev/null
+++ b/resources/lang/nb-NO/mail.php
@@ -0,0 +1,99 @@
+<?php
+
+return [
+
+    'Accessory_Checkin_Notification' => 'Tilbehør sjekket inn',
+    'Accessory_Checkout_Notification' => 'Tilbehør sjekket ut',
+    'Asset_Checkin_Notification' => 'Eiendel sjekket inn',
+    'Asset_Checkout_Notification' => 'Ressurs sjekket ut',
+    'Confirm_Accessory_Checkin' => 'Bekreft innsjekk av tilbehør',
+    'Confirm_Asset_Checkin' => 'Bekreft innsjekk av eiendel',
+    'Confirm_accessory_delivery' => 'Bekreft levering av tilbehør',
+    'Confirm_asset_delivery' => 'Bekreft levering av eiendel',
+    'Confirm_consumable_delivery' => 'Bekreft levering av forbruksvare',
+    'Confirm_license_delivery' => 'Bekreft levering av lisens',
+    'Consumable_checkout_notification' => 'Forbruksvaren tatt ut',
+    'Days' => 'Dager',
+    'Expected_Checkin_Date' => 'En enhet som er sjekket ut til deg skal leveres tilbake den :date',
+    'Expected_Checkin_Notification' => 'Påminnelse: Innsjekkingsfrist for :name nærmer seg',
+    'Expected_Checkin_Report' => 'Rapport over forventet innsjekking av eiendeler',
+    'Expiring_Assets_Report' => 'Rapport utløpende eiendeler.',
+    'Expiring_Licenses_Report' => 'Rapport utløpende lisenser.',
+    'Item_Request_Canceled' => 'Forespørsel av enhet avbrutt',
+    'Item_Requested' => 'Forespurt enhet',
+    'License_Checkin_Notification' => 'Lisens sjekket inn',
+    'License_Checkout_Notification' => 'Lisens sjekket ut',
+    'license_for'   => 'License for',
+    'Low_Inventory_Report' => 'Rapport lav lagerbeholdning',
+    'a_user_canceled' => 'Brukeren har avbrutt en element-forespørsel på webområdet',
+    'a_user_requested' => 'En bruker har bedt om et element på webområdet',
+    'acceptance_asset_accepted' => 'En bruker har godtatt et element',
+    'acceptance_asset_declined' => 'En bruker har avvist et element',
+    'accessory_name' => 'Navn tilbehør',
+    'additional_notes' => 'Flere notater',
+    'admin_has_created' => 'En administrator har opprettet en konto for deg på :web nettsted.',
+    'asset' => 'Eiendel',
+    'asset_name' => 'Navn',
+    'asset_requested' => 'Eiendel forespurt',
+    'asset_tag' => 'Eiendelsmerke',
+    'assets_warrantee_alert' => 'En eiendel har garanti som utløper innenfor de neste :treshold dagene.|:count eiendeler har garanti som utløper innenfor de neste :tershold dagene.',
+    'assigned_to' => 'Tilordnet til',
+    'best_regards' => 'Med vennlig hilsen,',
+    'canceled' => 'Avbrutt',
+    'checkin_date' => 'Innsjekkdato',
+    'checkout_date' => 'Utsjekkdato',
+    'checkedout_from' => 'Sjekket ut fra',
+    'checkedin_from'  => 'Sjekket inn fra',
+    'checked_into' => 'Sjekket inn',
+    'click_on_the_link_accessory' => 'Vennligst klikk på lenken nedenfor for å bekreft at du har mottatt tilbehøret.',
+    'click_on_the_link_asset' => 'Vennligst klikk på lenken nedenfor for å bekreft at du har mottatt eiendelen.',
+    'click_to_confirm' => 'Klikk på følgende link for å bekrefte din :web konto:',
+    'current_QTY' => 'Nåværende antall',
+    'days' => 'Dager',
+    'expecting_checkin_date' => 'Forventet dato for innsjekk',
+    'expires' => 'Utløper',
+    'hello' => 'Hallo',
+    'hi' => 'Hei',
+    'i_have_read' => 'Jeg har lest og godtar vilkårene for bruk, og har mottatt denne enheten.',
+    'inventory_report' => 'Lagerbeholdnings rapport',
+    'item' => 'Enhet',
+    'item_checked_reminder' => 'This is a reminder that you currently have :count items checked out to you that you have not accepted or declined. Please click the link below to confirm your decision.',
+    'license_expiring_alert' => ':count lisens utløper de neste :threshold dagene.|:count lisenser utløper de neste :threshold dagene.',
+    'link_to_update_password' => 'Klikk på følgende link for å bekrefte din :web passord:',
+    'login' => 'Logg inn',
+    'login_first_admin' => 'Logg inn på din nye Snipe-IT-installasjon ved å bruke kontoen nedenfor:',
+    'low_inventory_alert' => ':count enhet er under minimumnivå for beholdning, eller vil snart nå dette nivået.|:count enheter er under minimumnivå for beholdning, eller vil snart nå dette nivået.',
+    'min_QTY' => 'Min. antall',
+    'name' => 'Navn',
+    'new_item_checked' => 'En ny enhet har blitt sjekket ut under ditt navn, detaljer nedenfor.',
+    'new_item_checked_with_acceptance' => 'A new item has been checked out under your name that requires acceptance, details are below.',
+    'recent_item_checked' => 'An item was recently checked out under your name that requires acceptance, details are below.',
+    'notes' => 'Notater',
+    'password' => 'Passord',
+    'password_reset' => 'Tilbakestill passord',
+    'read_the_terms' => 'Vennligst les bruksbetingelsene nedenfor.',
+    'read_the_terms_and_click' => 'Vennligst les vilkårene for bruk nedenfor. og klikk på lenken nederst for å bekrefte at du leser og godtar vilkårene for bruk, og har mottatt eiendelen.',
+    'requested' => 'Forespurt',
+    'reset_link' => 'Lenke for tilbakestilling av passord',
+    'reset_password' => 'Klikk her for å tilbakestille passordet:',
+    'rights_reserved' => 'Alle rettigheter forbeholdt.',
+    'serial' => 'Serienummer',
+    'snipe_webhook_test' => 'Snipe-IT integrasjonstest',
+    'snipe_webhook_summary' => 'Snipe-IT integrasjon test sammendrag',
+    'supplier' => 'Leverandør',
+    'tag' => 'Merke',
+    'test_email' => 'Test-epost fra Snipe-IT',
+    'test_mail_text' => 'Dette er en test fra Snipe-IT eiendelsadministrasjonssystem. Hvis du mottok denne meldingen fungerer e-post.',
+    'the_following_item' => 'Følgende enheter har blitt sjekket inn: ',
+    'to_reset' => 'Fullfør dette skjemaet for å tilbakestille ditt :web passord:',
+    'type' => 'Type',
+    'upcoming-audits' => ':count eiendel har revisjonsfrist innen :treshold dager.|:count eiendeler har revisjonsfrist innen :threshold dager.',
+    'user' => 'Bruker',
+    'username' => 'Brukernavn',
+    'unaccepted_asset_reminder' => 'Reminder: You have Unaccepted Assets.',
+    'welcome' => 'Velkommen :name',
+    'welcome_to' => 'Velkommen til :web!',
+    'your_assets' => 'Vis dine eiendeler',
+    'your_credentials' => 'Din Snipe-IT konto',
+    'mail_sent' => 'Mail sent successfully!',
+];
diff --git a/resources/lang/nb-NO/pagination.php b/resources/lang/nb-NO/pagination.php
new file mode 100644
index 0000000000..26ea2fb2ad
--- /dev/null
+++ b/resources/lang/nb-NO/pagination.php
@@ -0,0 +1,20 @@
+<?php
+
+return array(
+
+    /*
+    |--------------------------------------------------------------------------
+    | Pagination Language Lines
+    |--------------------------------------------------------------------------
+    |
+    | The following language lines are used by the paginator library to build
+    | the simple pagination links. You are free to change them to anything
+    | you want to customize your views to better match your application.
+    |
+    */
+
+    'previous' => '&laquo; Forrige',
+
+    'next'     => 'Neste &raquo;',
+
+);
diff --git a/resources/lang/nb-NO/passwords.php b/resources/lang/nb-NO/passwords.php
new file mode 100644
index 0000000000..3e82b8a1a5
--- /dev/null
+++ b/resources/lang/nb-NO/passwords.php
@@ -0,0 +1,9 @@
+<?php
+
+return [
+    'sent'	        => 'Hvis den oppgitte e-postadressen finnes i systemet vårt har det blitt sendt en e-post med informasjon for gjenopprettelse av passord.',
+    'user'			=> 'Hvis den oppgitte e-postadressen finnes i systemet vårt har det blitt sendt en e-post med gjenopprettelse av passord.',
+    'token'         => 'Token for tilbakestilling av passord er ugyldig eller utløpt, eller så stemmer den ikke overens med det angitte brukernavnet.',
+    'reset'         => 'Ditt passord har blitt tilbakestilt!',
+    'password_change'  => 'Ditt passord har blitt oppdatert!',
+];
diff --git a/resources/lang/nb-NO/reminders.php b/resources/lang/nb-NO/reminders.php
new file mode 100644
index 0000000000..a3d1e54447
--- /dev/null
+++ b/resources/lang/nb-NO/reminders.php
@@ -0,0 +1,21 @@
+<?php
+
+return array(
+
+    /*
+    |--------------------------------------------------------------------------
+    | Password Reminder Language Lines
+    |--------------------------------------------------------------------------
+    |
+    | The following language lines are the default lines which match reasons
+    | that are given by the password broker for a password update attempt
+    | has failed, such as for an invalid token or invalid new password.
+    |
+    */
+
+    "password" => "Passord må bestå av minst 6 tegn og stemme med bekreftelse.",
+    "user"     => "Brukernavn eller epostadresse er ugyldig",
+    "token"    => 'Token for tilbakestilling av passord er ugyldig eller utløpt, eller så stemmer den ikke overens med det angitte brukernavnet.',
+    'sent'	   => 'Hvis den oppgitte e-postadressen finnes i systemet vårt har det blitt sendt en e-post med informasjon for gjenopprettelse av passord.',
+
+);
diff --git a/resources/lang/nb-NO/table.php b/resources/lang/nb-NO/table.php
new file mode 100644
index 0000000000..f32ec7ca4b
--- /dev/null
+++ b/resources/lang/nb-NO/table.php
@@ -0,0 +1,11 @@
+<?php
+
+return array(
+
+    'actions'	 	        => 'Handlinger',
+    'action' 		        => 'Handling',
+    'by'      		        => 'Av',
+    'item' 			        => 'Enhet',
+    'no_matching_records'   => 'No matching records found',
+
+);
diff --git a/resources/lang/nb-NO/validation.php b/resources/lang/nb-NO/validation.php
new file mode 100644
index 0000000000..12b5bd462a
--- /dev/null
+++ b/resources/lang/nb-NO/validation.php
@@ -0,0 +1,248 @@
+<?php
+
+return [
+
+    /*
+    |--------------------------------------------------------------------------
+    | Validation Language Lines
+    |--------------------------------------------------------------------------
+    |
+    | The following language lines contain the default error messages used by
+    | the validator class. Some of these rules have multiple versions such
+    | such as the size rules. Feel free to tweak each of these messages.
+    |
+    */
+
+    'accepted' => 'The :attribute field must be accepted.',
+    'accepted_if' => 'The :attribute field must be accepted when :other is :value.',
+    'active_url' => 'The :attribute field must be a valid URL.',
+    'after' => 'The :attribute field must be a date after :date.',
+    'after_or_equal' => 'The :attribute field must be a date after or equal to :date.',
+    'alpha' => 'The :attribute field must only contain letters.',
+    'alpha_dash' => 'The :attribute field must only contain letters, numbers, dashes, and underscores.',
+    'alpha_num' => 'The :attribute field must only contain letters and numbers.',
+    'array' => 'The :attribute field must be an array.',
+    'ascii' => 'The :attribute field must only contain single-byte alphanumeric characters and symbols.',
+    'before' => 'The :attribute field must be a date before :date.',
+    'before_or_equal' => 'The :attribute field must be a date before or equal to :date.',
+    'between' => [
+        'array' => 'The :attribute field must have between :min and :max items.',
+        'file' => 'The :attribute field must be between :min and :max kilobytes.',
+        'numeric' => 'The :attribute field must be between :min and :max.',
+        'string' => 'The :attribute field must be between :min and :max characters.',
+    ],
+    'boolean' => 'Attributtfeltet må være sant eller falskt.',
+    'can' => 'The :attribute field contains an unauthorized value.',
+    'confirmed' => 'The :attribute field confirmation does not match.',
+    'contains' => 'The :attribute field is missing a required value.',
+    'current_password' => 'The password is incorrect.',
+    'date' => 'The :attribute field must be a valid date.',
+    'date_equals' => 'The :attribute field must be a date equal to :date.',
+    'date_format' => 'The :attribute field must match the format :format.',
+    'decimal' => 'The :attribute field must have :decimal decimal places.',
+    'declined' => 'The :attribute field must be declined.',
+    'declined_if' => 'The :attribute field must be declined when :other is :value.',
+    'different' => 'The :attribute field and :other must be different.',
+    'digits' => 'The :attribute field must be :digits digits.',
+    'digits_between' => 'The :attribute field must be between :min and :max digits.',
+    'dimensions' => 'The :attribute field has invalid image dimensions.',
+    'distinct' => 'Attributtfeltet har en duplikatverdi.',
+    'doesnt_end_with' => 'The :attribute field must not end with one of the following: :values.',
+    'doesnt_start_with' => 'The :attribute field must not start with one of the following: :values.',
+    'email' => 'The :attribute field must be a valid email address.',
+    'ends_with' => 'The :attribute field must end with one of the following: :values.',
+    'enum' => 'Attributtet :attribute er ugyldig.',
+    'exists' => 'Valgt attributt :attribute er ugyldig.',
+    'extensions' => 'The :attribute field must have one of the following extensions: :values.',
+    'file' => 'The :attribute field must be a file.',
+    'filled' => 'Den :attribute må ha en verdi.',
+    'gt' => [
+        'array' => 'The :attribute field must have more than :value items.',
+        'file' => 'The :attribute field must be greater than :value kilobytes.',
+        'numeric' => 'The :attribute field must be greater than :value.',
+        'string' => 'The :attribute field must be greater than :value characters.',
+    ],
+    'gte' => [
+        'array' => 'The :attribute field must have :value items or more.',
+        'file' => 'The :attribute field must be greater than or equal to :value kilobytes.',
+        'numeric' => 'The :attribute field must be greater than or equal to :value.',
+        'string' => 'The :attribute field must be greater than or equal to :value characters.',
+    ],
+    'hex_color' => 'The :attribute field must be a valid hexadecimal color.',
+    'image' => 'The :attribute field must be an image.',
+    'import_field_empty'    => 'Verdien for :fieldname kan ikke være null.',
+    'in' => 'Det valgte attributtet :attribute er ugyldig.',
+    'in_array' => 'The :attribute field must exist in :other.',
+    'integer' => 'The :attribute field must be an integer.',
+    'ip' => 'The :attribute field must be a valid IP address.',
+    'ipv4' => 'The :attribute field must be a valid IPv4 address.',
+    'ipv6' => 'The :attribute field must be a valid IPv6 address.',
+    'json' => 'The :attribute field must be a valid JSON string.',
+    'list' => 'The :attribute field must be a list.',
+    'lowercase' => 'The :attribute field must be lowercase.',
+    'lt' => [
+        'array' => 'The :attribute field must have less than :value items.',
+        'file' => 'The :attribute field must be less than :value kilobytes.',
+        'numeric' => 'The :attribute field must be less than :value.',
+        'string' => 'The :attribute field must be less than :value characters.',
+    ],
+    'lte' => [
+        'array' => 'The :attribute field must not have more than :value items.',
+        'file' => 'The :attribute field must be less than or equal to :value kilobytes.',
+        'numeric' => 'The :attribute field must be less than or equal to :value.',
+        'string' => 'The :attribute field must be less than or equal to :value characters.',
+    ],
+    'mac_address' => 'The :attribute field must be a valid MAC address.',
+    'max' => [
+        'array' => 'The :attribute field must not have more than :max items.',
+        'file' => 'The :attribute field must not be greater than :max kilobytes.',
+        'numeric' => 'The :attribute field must not be greater than :max.',
+        'string' => 'The :attribute field must not be greater than :max characters.',
+    ],
+    'max_digits' => 'The :attribute field must not have more than :max digits.',
+    'mimes' => 'The :attribute field must be a file of type: :values.',
+    'mimetypes' => 'The :attribute field must be a file of type: :values.',
+    'min' => [
+        'array' => 'The :attribute field must have at least :min items.',
+        'file' => 'The :attribute field must be at least :min kilobytes.',
+        'numeric' => 'The :attribute field must be at least :min.',
+        'string' => 'The :attribute field must be at least :min characters.',
+    ],
+    'min_digits' => 'The :attribute field must have at least :min digits.',
+    'missing' => 'The :attribute field must be missing.',
+    'missing_if' => 'The :attribute field must be missing when :other is :value.',
+    'missing_unless' => 'The :attribute field must be missing unless :other is :value.',
+    'missing_with' => 'The :attribute field must be missing when :values is present.',
+    'missing_with_all' => 'The :attribute field must be missing when :values are present.',
+    'multiple_of' => 'The :attribute field must be a multiple of :value.',
+    'not_in' => 'Attributtet :attribute er ugyldig.',
+    'not_regex' => 'The :attribute field format is invalid.',
+    'numeric' => 'The :attribute field must be a number.',
+    'password' => [
+        'letters' => 'The :attribute field must contain at least one letter.',
+        'mixed' => 'The :attribute field must contain at least one uppercase and one lowercase letter.',
+        'numbers' => 'The :attribute field must contain at least one number.',
+        'symbols' => 'The :attribute field must contain at least one symbol.',
+        'uncompromised' => 'The given :attribute has appeared in a data leak. Please choose a different :attribute.',
+    ],
+    'percent'       => 'The depreciation minimum must be between 0 and 100 when depreciation type is percentage.',
+
+    'present' => 'Atributtfeltet :attribute må ha en verdi.',
+    'present_if' => 'The :attribute field must be present when :other is :value.',
+    'present_unless' => 'The :attribute field must be present unless :other is :value.',
+    'present_with' => 'The :attribute field must be present when :values is present.',
+    'present_with_all' => 'The :attribute field must be present when :values are present.',
+    'prohibited' => 'The :attribute field is prohibited.',
+    'prohibited_if' => 'The :attribute field is prohibited when :other is :value.',
+    'prohibited_unless' => 'The :attribute field is prohibited unless :other is in :values.',
+    'prohibits' => 'The :attribute field prohibits :other from being present.',
+    'regex' => 'The :attribute field format is invalid.',
+    'required' => 'Attributt-feltet :attribute er påkrevd.',
+    'required_array_keys' => 'The :attribute field must contain entries for: :values.',
+    'required_if' => 'Attributt-feltet :attribute er påkrevd når :oher er :value.',
+    'required_if_accepted' => 'The :attribute field is required when :other is accepted.',
+    'required_if_declined' => 'The :attribute field is required when :other is declined.',
+    'required_unless' => 'Attributtfeltet kreves med mindre: annet er i: verdier.',
+    'required_with' => 'Attributt-feltet :attribute er påkrevd når :values er tilstede.',
+    'required_with_all' => 'The :attribute field is required when :values are present.',
+    'required_without' => 'Attributt-feltet :attribute er påkrevd når :values ikke er tilstede.',
+    'required_without_all' => 'Attributtfeltet kreves når ingen av: verdiene er til stede.',
+    'same' => 'The :attribute field must match :other.',
+    'size' => [
+        'array' => 'The :attribute field must contain :size items.',
+        'file' => 'The :attribute field must be :size kilobytes.',
+        'numeric' => 'The :attribute field must be :size.',
+        'string' => 'The :attribute field must be :size characters.',
+    ],
+    'starts_with' => 'The :attribute field must start with one of the following: :values.',
+    'string'               => 'Attributtet :attribute må være en tekst.',
+    'two_column_unique_undeleted' => ':attribute må være unik i forhold til :table1 og :table2. ',
+    'unique_undeleted'     => ':attribute må være unikt.',
+    'non_circular'         => 'Attributtet :attribute kan ikke opprette en sirkulær referanse.',
+    'not_array'            => ':attribute kan ikke være en matrise.',
+    'disallow_same_pwd_as_user_fields' => 'Passordet kan ikke være det samme som brukernavnet.',
+    'letters'              => 'Passordet må inneholde minst en bokstav.',
+    'numbers'              => 'Passordet må inneholde minst ett tall.',
+    'case_diff'            => 'Passordet må innehode store og små bokstaver.',
+    'symbols'              => 'Passordet må inneholde symboler.',
+    'timezone' => 'The :attribute field must be a valid timezone.',
+    'unique' => 'Attributtet :attribute er allerede tatt.',
+    'uploaded' => 'Atribbutet :attribute kunne ikke lastes opp.',
+    'uppercase' => 'The :attribute field must be uppercase.',
+    'url' => 'The :attribute field must be a valid URL.',
+    'ulid' => 'The :attribute field must be a valid ULID.',
+    'uuid' => 'The :attribute field must be a valid UUID.',
+    'fmcs_location' => 'Full multiple company support and location scoping is enabled in the Admin Settings, and the selected location and selected company are not compatible.',
+
+
+    /*
+    |--------------------------------------------------------------------------
+    | Custom Validation Language Lines
+    |--------------------------------------------------------------------------
+    |
+    | Here you may specify custom validation messages for attributes using the
+    | convention "attribute.rule" to name the lines. This makes it quick to
+    | specify a specific custom language line for a given attribute rule.
+    |
+    */
+
+    'email_array'      => 'En eller flere e-postadresser er ugyldige.',
+    'checkboxes'           => ':attribute inneholder ugyldige valg.',
+    'radio_buttons'        => ':attribute er ugyldig.',
+    
+    'custom' => [
+        'alpha_space' => 'Attributtfeltet inneholder et tegn som ikke er tillatt.',
+
+        'hashed_pass'      => 'Gjeldende passord er feil',
+        'dumbpwd'          => 'Passordet er for vanlig.',
+        'statuslabel_type' => 'Du må velge en gyldig statusetikett-type',
+        'custom_field_not_found'          => 'This field does not seem to exist, please double check your custom field names.',
+        'custom_field_not_found_on_model' => 'This field seems to exist, but is not available on this Asset Model\'s fieldset.',
+
+        // date_format validation with slightly less stupid messages. It duplicates a lot, but it gets the job done :(
+        // We use this because the default error message for date_format reflects php Y-m-d, which non-PHP
+        // people won't know how to format.
+        'purchase_date.date_format'     => ':attribute må være en gyldig dato i YYYY-MM-DD format',
+        'last_audit_date.date_format'   =>  ':attribute må være en gyldig dato i YYYY-MM-DD hh:mm:ss format',
+        'expiration_date.date_format'   =>  ':attribute må være en gyldig dato i YYYY-MM-DD format',
+        'termination_date.date_format'  =>  ':attribute må være en gyldig dato i YYYY-MM-DD format',
+        'expected_checkin.date_format'  =>  ':attribute må være en gyldig dato i YYYY-MM-DD format',
+        'start_date.date_format'        =>  ':attribute må være en gyldig dato i YYYY-MM-DD format',
+        'end_date.date_format'          =>  ':attribute må være en gyldig dato i YYYY-MM-DD format',
+        'invalid_value_in_field' => 'Ugyldig verdi inkludert i dette feltet',
+
+        'ldap_username_field' => [
+            'not_in' =>         '<code>sAMAccountName</code> (mixed case) will likely not work. You should use <code>samaccountname</code> (lowercase) instead.'
+        ],
+        'ldap_auth_filter_query' => ['not_in' => '<code>uid=samaccountname</code> is probably not a valid auth filter. You probably want <code>uid=</code> '],
+        'ldap_filter' => ['regex' => 'This value should probably not be wrapped in parentheses.'],
+
+        ],
+    /*
+    |--------------------------------------------------------------------------
+    | Custom Validation Attributes
+    |--------------------------------------------------------------------------
+    |
+    | The following language lines are used to swap attribute place-holders
+    | with something more reader friendly such as E-Mail Address instead
+    | of "email". This simply helps us make messages a little cleaner.
+    |
+    */
+
+    'attributes' => [],
+
+    /*
+    |--------------------------------------------------------------------------
+    | Generic Validation Messages - we use these in the jquery validation where we don't have
+    | access to the :attribute
+    |--------------------------------------------------------------------------
+    */
+
+    'generic' => [
+        'invalid_value_in_field' => 'Ugyldig verdi inkludert i dette feltet',
+        'required' => 'This field is required',
+        'email' => 'Please enter a valid email address',
+    ],
+
+
+];
diff --git a/resources/lang/nl-NL/account/general.php b/resources/lang/nl-NL/account/general.php
index c5fedd4815..9bae590bcd 100644
--- a/resources/lang/nl-NL/account/general.php
+++ b/resources/lang/nl-NL/account/general.php
@@ -2,10 +2,16 @@
 
 return array(
     'personal_api_keys' => 'Persoonlijke API-sleutels',
-    'api_key_warning' => 'When generating an API token, be sure to copy it down immediately as they will not be visible to you again.',
+    'personal_access_token' => 'Persoonlijke toegangs-token',
+    'personal_api_keys_success' => 'Persoonlijke API-sleutel :key succesvol gemaakt',
+    'here_is_api_key' => 'Hier is je nieuwe persoonlijke toegangstoken. Dit is de enige keer dat het wordt weergegeven, dus verlies het niet! Je kunt nu deze token gebruiken om API-verzoeken te doen.',
+    'api_key_warning' => 'Bij het genereren van een API-token, zorg ervoor dat je deze direct kopieert, omdat deze daarna niet meer zichtbaar is.',
     'api_base_url' => 'Je API-basis-url bevindt zich op:',
     'api_base_url_endpoint' => '/&lt;endpoint&gt;',
     'api_token_expiration_time' => 'API tokens zijn ingesteld om te verlopen in:',
-    'api_reference' => 'Please check the <a href="https://snipe-it.readme.io/reference" target="_blank">API reference</a> to find specific API endpoints and additional API documentation.',
-    'profile_updated' => 'Account successfully updated',
+    'api_reference' => 'Controleer de <a href="https://snipe-it.readme.io/reference" target="_blank">API referentie</a> om specifieke API eindpunten en aanvullende API documentatie te vinden.',
+    'profile_updated' => 'Account succesvol bijgewerkt',
+    'no_tokens' => 'Je hebt geen persoonlijke toegangs-tokens aangemaakt.',
+    'enable_sounds' => 'Zet geluid effecten aan',
+    'enable_confetti' => 'Zet confetti effecten aan',
 );
diff --git a/resources/lang/nl-NL/admin/accessories/message.php b/resources/lang/nl-NL/admin/accessories/message.php
index fddd09b6de..21da0c2852 100644
--- a/resources/lang/nl-NL/admin/accessories/message.php
+++ b/resources/lang/nl-NL/admin/accessories/message.php
@@ -26,7 +26,11 @@ return array(
         'error'   		=> 'Het accessoire is niet uitgecheckt. Probeer het opnieuw.',
         'success' 		=> 'Het accessoire is uitgecheckt.',
         'unavailable'   => 'Accessoire kan niet worden uitgegeven. Controleer de beschikbare hoeveelheid',
-        'user_does_not_exist' => 'Deze gebruiker is ongeldig. Probeer het opnieuw.'
+        'user_does_not_exist' => 'Deze gebruiker is ongeldig. Probeer het opnieuw.',
+         'checkout_qty' => array(
+            'lte'  => 'Er is momenteel slechts één beschikbaar accessoire van dit type en u probeert :checkout_qty uit te checken. Pas het uitcheck aantal of de totale voorraad van dit accessoire aan en probeer het opnieuw.|Er zijn :number_currently_remaining totaal beschikbare accessoires en u probeert :checkout_qty uit te checken. Pas het uitcheck aantal of de totale voorraad van dit accessoire aan en probeer het opnieuw.',
+            ),
+           
     ),
 
     'checkin' => array(
diff --git a/resources/lang/nl-NL/admin/accessories/table.php b/resources/lang/nl-NL/admin/accessories/table.php
index f808e95bc2..2245499ac2 100644
--- a/resources/lang/nl-NL/admin/accessories/table.php
+++ b/resources/lang/nl-NL/admin/accessories/table.php
@@ -6,6 +6,4 @@ return array(
     'id'      					=> 'ID',
     'require_acceptance'      	=> 'Acceptatie',
     'title'      				=> 'Accessoirenaam',
-
-
 );
diff --git a/resources/lang/nl-NL/admin/components/message.php b/resources/lang/nl-NL/admin/components/message.php
index 1b40646a16..616428c29b 100644
--- a/resources/lang/nl-NL/admin/components/message.php
+++ b/resources/lang/nl-NL/admin/components/message.php
@@ -17,7 +17,8 @@ return array(
     'delete' => array(
         'confirm'   => 'Weet je zeker dat je dit component wil verwijderen?',
         'error'   => 'Er ging iets mis bij het verwijderen van het component. Probeer het nogmaals.',
-        'success' => 'Component succesvol verwijderd.'
+        'success' => 'Component succesvol verwijderd.',
+        'error_qty'   => 'Sommige componenten van dit type zijn nog steeds uitgecheckt. Check ze in en probeer het opnieuw.',
     ),
 
      'checkout' => array(
diff --git a/resources/lang/nl-NL/admin/consumables/general.php b/resources/lang/nl-NL/admin/consumables/general.php
index 08610134ff..58ff6ce7fe 100644
--- a/resources/lang/nl-NL/admin/consumables/general.php
+++ b/resources/lang/nl-NL/admin/consumables/general.php
@@ -8,4 +8,5 @@ return array(
     'remaining' 			            => 'Resterende',
     'total' 			                => 'Totaal',
     'update'                            => 'Wijzig verbruiksartikel',
+    'inventory_warning'                 => 'De inventaris van dit verbruiksartikel is lager dan het minimum aantal van :min_count',
 );
diff --git a/resources/lang/nl-NL/admin/consumables/message.php b/resources/lang/nl-NL/admin/consumables/message.php
index ab30b212d7..467ad79e05 100644
--- a/resources/lang/nl-NL/admin/consumables/message.php
+++ b/resources/lang/nl-NL/admin/consumables/message.php
@@ -2,6 +2,7 @@
 
 return array(
 
+    'invalid_category_type' => 'Deze categorie moet een verbruik categorie zijn.',
     'does_not_exist' => 'Verbruiksartikel bestaat niet.',
 
     'create' => array(
diff --git a/resources/lang/nl-NL/admin/custom_fields/general.php b/resources/lang/nl-NL/admin/custom_fields/general.php
index c342ecbf35..1a6c8e4681 100644
--- a/resources/lang/nl-NL/admin/custom_fields/general.php
+++ b/resources/lang/nl-NL/admin/custom_fields/general.php
@@ -35,7 +35,7 @@ return [
     'create_field_title' => 'Maak een nieuw aangepast veld',
     'value_encrypted'      	        => 'De waarde van dit veld is versleuteld in de database. Alleen beheerders zullen de onversleutelde waarde kunnen weergeven.',
     'show_in_email'     => 'De waarde van dit veld opnemen in de checkout e-mails die naar de gebruiker zijn verzonden? Versleutelde velden kunnen niet worden opgenomen in e-mails',
-    'show_in_email_short'     => 'Opnemen in e-mails.',
+    'show_in_email_short' => 'Opnemen in e-mails',
     'help_text' => 'Help tekst',
     'help_text_description' => 'Dit is een optionele tekst die onder de formulierelementen verschijnt terwijl een asset wordt bewerkt om context op te geven in het veld.',
     'about_custom_fields_title' => 'Over Aangepaste Velden',
@@ -57,5 +57,8 @@ return [
     'show_in_requestable_list_short' => 'Toon in de aanvraagbare assets lijst',
     'show_in_requestable_list' => 'Toon de waarde in de aanvraagbare assets lijst. Gecodeerde velden worden niet getoond',
     'encrypted_options' => 'Dit veld is encrypted, dus sommige weergaveopties zullen niet beschikbaar zijn.',
+    'display_checkin' => 'Display in checkin forms',
+    'display_checkout' => 'Display in checkout forms',
+    'display_audit' => 'Display in audit forms',
 
 ];
diff --git a/resources/lang/nl-NL/admin/custom_fields/message.php b/resources/lang/nl-NL/admin/custom_fields/message.php
index 64945a6124..a1def524f3 100644
--- a/resources/lang/nl-NL/admin/custom_fields/message.php
+++ b/resources/lang/nl-NL/admin/custom_fields/message.php
@@ -5,6 +5,7 @@ return array(
     'field' => array(
         'invalid'   => 'Dat veld bestaat niet.',
         'already_added'   => 'Veld is al toegevoegd',
+        'none_selected'   => 'Geen veld geselecteerd',
 
         'create' => array(
             'error'   => 'Veld is niet aangemaakt, probeer het opnieuw.',
diff --git a/resources/lang/nl-NL/admin/depreciations/general.php b/resources/lang/nl-NL/admin/depreciations/general.php
index 78c128f394..d700807ce3 100644
--- a/resources/lang/nl-NL/admin/depreciations/general.php
+++ b/resources/lang/nl-NL/admin/depreciations/general.php
@@ -13,4 +13,8 @@ return [
     'no_depreciations_warning'               => '<strong>Waarschuwing: </strong>
                       U heeft momenteel geen afschrijvingen ingesteld.
                       Stel ten minste één afschrijving in om het afschrijvingsrapport te bekijken.',
+    'depreciation_method'                   => 'Afschrijvingsrapport',
+    'linear_depreciation'                   => 'Linear (Default)',
+    'half_1'                                => 'Half-year convention, always applied',
+    'half_2'                                => 'Half-year convention, applied with condition',
 ];
diff --git a/resources/lang/nl-NL/admin/hardware/form.php b/resources/lang/nl-NL/admin/hardware/form.php
index 6dbf2a442b..3588dd95ca 100644
--- a/resources/lang/nl-NL/admin/hardware/form.php
+++ b/resources/lang/nl-NL/admin/hardware/form.php
@@ -39,9 +39,9 @@ return [
     'order'				=> 'Ordernummer',
     'qr'				=> 'QR-code',
     'requestable'		=> 'Gebruikers mogen dit asset aanvragen',
-    'redirect_to_all'   => 'Return to all :type',
-    'redirect_to_type'   => 'Go to :type',
-    'redirect_to_checked_out_to'   => 'Go to Checked Out to',
+    'redirect_to_all'   => 'Terug naar alle :type',
+    'redirect_to_type'   => 'Ga naar :type',
+    'redirect_to_checked_out_to'   => 'Ga naar uitcheckt naar',
     'select_statustype'	=> 'Selecteer status type',
     'serial'			=> 'Serienummer',
     'status'			=> 'Status',
@@ -55,8 +55,11 @@ return [
     'asset_location_update_default' => 'Update alleen standaard locatie',
     'asset_location_update_actual' => 'Alleen actuele locatie bijwerken',
     'asset_not_deployable' => 'Deze Asset status is niet uitgeefbaar. Dit Asset kan niet uitgegeven worden.',
-    'asset_deployable' => 'Deze status is uitgeefbaar. Dit Asset kan uitgegeven worden.',
+    'asset_not_deployable_checkin' => 'That asset status is not deployable. Using this status label will checkin the asset.',
+    'asset_deployable' => 'This asset can be checked out.',
     'processing_spinner' => 'Verwerken... (Dit kan enige tijd duren bij grote bestanden)',
+    'processing' => 'Verwerken... ',
     'optional_infos'  => 'Optionele informatie',
-    'order_details'   => 'Bestelling Gerelateerde Informatie'
+    'order_details'   => 'Bestelling Gerelateerde Informatie',
+    'calc_eol'    => 'If nulling the EOL date, use automatic EOL calculation based on the purchase date and EOL rate.',
 ];
diff --git a/resources/lang/nl-NL/admin/hardware/general.php b/resources/lang/nl-NL/admin/hardware/general.php
index b0df639d32..462cf64b55 100644
--- a/resources/lang/nl-NL/admin/hardware/general.php
+++ b/resources/lang/nl-NL/admin/hardware/general.php
@@ -5,8 +5,8 @@ return [
     'about_assets_text'            => 'Assets zijn items die worden bijgehouden op serienummer of een tag van het product. Het zijn meestal items met een hogere waarde waarbij het identificeren van een specifiek item belangrijk is.',
     'archived'  				=> 'Gearchiveerd',
     'asset'  					=> 'Asset',
-    'bulk_checkout'             => 'Activa uitgeven',
-    'bulk_checkin'              => 'Activa innemen',
+    'bulk_checkout'             => 'Bulk uitlevering',
+    'bulk_checkin'              => 'Bulk Checkin',
     'checkin'  					=> 'Asset inchecken',
     'checkout'  				=> 'Asset uitchecken',
     'clone'  					=> 'Dupliceer Asset',
@@ -15,8 +15,8 @@ return [
     'delete_confirm'            => 'Weet u zeker dat u dit item wilt verwijderen?',
     'edit'  					=> 'Asset bewerken',
     'model_deleted'  			=> 'Dit Assets model is verwijderd. U moet het model herstellen voordat u het Asset kunt herstellen.',
-    'model_invalid'             => 'This model for this asset is invalid.',
-    'model_invalid_fix'         => 'The asset must be updated use a valid asset model before attempting to check it in or out, or to audit it.',
+    'model_invalid'             => 'Het model voor deze asset is ongeldig.',
+    'model_invalid_fix'         => 'De asset moet worden bijgewerkt en gebruikt een geldig asset model voordat u het probeert in of uit te checken, of om het te auditen.',
     'requestable'               => 'Aanvraagbaar',
     'requested'				    => 'Aangevraagd',
     'not_requestable'           => 'Niet aanvraagbaar',
@@ -27,8 +27,7 @@ return [
     'undeployable_tooltip'  	=> 'Dit item heeft een status dat op dit moment niet kan worden uitgecheckt.',
     'view'  					=> 'Bekijk Asset',
     'csv_error' => 'Je hebt een fout in je CSV-bestand:',
-    'import_text' => '<p>Upload een CSV dat asset geschiedenis bevat. De assets en gebruikers MOET al bestaan in het systeem, of ze zullen worden overgeslagen. Het vergelijken van activa met geschiedenis importeren gebeurt met de asset tag. We zullen proberen een overeenkomende gebruiker te vinden op basis van de gebruikersnaam, en de criteria die je hieronder selecteert. Als u geen criteria hieronder selecteert, selecteer dan het zal gewoon proberen overeen te komen met het gebruikersnaam formaat dat u hebt geconfigureerd in <code>Admin &gt; Algemene Instellingen</code>.</p><p>Velden die opgenomen zijn in de CSV moeten overeenkomen met de headers: <strong>Asset Tag, naam, Checkout Datum, Checkincheck Datum</strong>. Alle extra velden worden genegeerd. </p><p>Checkin datum: leeg of toekomstige checkinedatums zullen de bijbehorende gebruikers uitchecken. Als u de Checkin Datumkolom uitsluit maakt u een check-in datum met de datum van vandaag.</p>
-    ',
+    'import_text' => '<p>Upload a CSV that contains asset history. The assets and users MUST already exist in the system, or they will be skipped. Matching assets for history import happens against the asset tag. We will try to find a matching user based on the user\'s name you provide, and the criteria you select below. If you do not select any criteria below, it will simply try to match on the username format you configured in the <code>Admin &gt; General Settings</code>.</p><p>Fields included in the CSV must match the headers: <strong>Asset Tag, Name, Checkout Date, Checkin Date</strong>. Any additional fields will be ignored. </p><p>Checkin Date: blank or future checkin dates will checkout items to associated user.  Excluding the Checkin Date column will create a checkin date with todays date.</p>    ',
     'csv_import_match_f-l' => 'Probeer samen te werken met gebruikers door <strong>firstname.lastname</strong> (<code>jane.smith</code>) formaat',
     'csv_import_match_initial_last' => 'Probeer te koppelen aan gebruikers door <strong>eerste eerste achternaam</strong> (<code>jsmith</code>) formaat',
     'csv_import_match_first' => 'Probeer te koppelen aan gebruikers door <strong>voornaam</strong> (<code>jane</code>) formaat',
diff --git a/resources/lang/nl-NL/admin/hardware/message.php b/resources/lang/nl-NL/admin/hardware/message.php
index aa54f9c7f9..38139af160 100644
--- a/resources/lang/nl-NL/admin/hardware/message.php
+++ b/resources/lang/nl-NL/admin/hardware/message.php
@@ -2,19 +2,23 @@
 
 return [
 
-    'undeployable' 		=> '<strong>Waarschuwing: </strong> Dit bestand is gemarkeerd als niet-uitgeefbaar.
-                        Als deze status is veranderd, update dan de asset status.',
-    'does_not_exist' 	=> 'Dit asset bestaat niet.',
-    'does_not_exist_var'=> 'Asset with tag :asset_tag not found.',
-    'no_tag' 	        => 'No asset tag provided.',
+    'undeployable' 		 => '<strong>Waarschuwing: </strong> Dit bestand is gemarkeerd als niet-uitgeefbaar. Als deze status is veranderd, update dan de asset status.',
+    'does_not_exist' 	 => 'Dit asset bestaat niet.',
+    'does_not_exist_var' => 'Asset met tag :asset_tag niet gevonden.',
+    'no_tag' 	         => 'Geen asset tag opgegeven.',
     'does_not_exist_or_not_requestable' => 'Die asset bestaat niet of is niet aanvraagbaar.',
-    'assoc_users'	 	=> 'Dit asset is momenteel toegewezen aan een gebruiker en kan niet worden verwijderd. Controleer het asset eerst en probeer het opnieuw. ',
-    'warning_audit_date_mismatch' 	=> 'This asset\'s next audit date (:next_audit_date) is before the last audit date (:last_audit_date). Please update the next audit date.',
+    'assoc_users'	 	 => 'Dit asset is momenteel toegewezen aan een gebruiker en kan niet worden verwijderd. Controleer het asset eerst en probeer het opnieuw. ',
+    'warning_audit_date_mismatch' 	=> 'De volgende auditdatum van dit asset (:next_audit_date) ligt vóór de laatste auditdatum (:last_audit_date). Gelieve de volgende auditdatum bij te werken.',
+    'labels_generated'   => 'Labels were successfully generated.',
+    'error_generating_labels' => 'Error while generating labels.',
+    'no_assets_selected' => 'No assets selected.',
 
     'create' => [
         'error'   		=> 'Asset is niet aangemaakt, probeer het opnieuw :(',
         'success' 		=> 'Asset is succesvol aangemaakt. :)',
         'success_linked' => 'Asset met tag :tag is succesvol gemaakt. <strong><a href=":link" style="color: white;">Klik hier om te bekijken</a></strong>.',
+        'multi_success_linked' => 'Asset with tag :links was created successfully.|:count assets were created succesfully. :links.',
+        'partial_failure' => 'An asset was unable to be created. Reason: :failures|:count assets were unable to be created. Reasons: :failures',
     ],
 
     'update' => [
@@ -34,7 +38,7 @@ return [
     ],
 
     'audit' => [
-        'error'   		=> 'Asset audit unsuccessful: :error ',
+        'error'   		=> 'Asset audit mislukt: :error ',
         'success' 		=> 'Asset audit succesvol geregistreerd.',
     ],
 
@@ -52,20 +56,24 @@ return [
     ],
 
     'import' => [
+        'import_button'         => 'Import verwerken',
         'error'                 => 'Sommige items zijn niet goed geïmporteerd.',
         'errorDetail'           => 'De volgende items zijn niet geïmporteerd vanwege fouten.',
         'success'               => 'Je bestand is geïmporteerd',
         'file_delete_success'   => 'Je bestand is succesvol verwijderd',
         'file_delete_error'      => 'Het bestand kon niet worden verwijderd',
         'file_missing' => 'Het geselecteerde bestand ontbreekt',
+        'file_already_deleted' => 'Het geselecteerde bestand is al verwijderd',
         'header_row_has_malformed_characters' => 'Een of meer attributen in de kopregel bevatten ongeldige UTF-8-tekens',
         'content_row_has_malformed_characters' => 'Een of meer attributen in de eerste rij inhoud bevat ongeldige UTF-8 tekens',
+        'transliterate_failure' => 'Transliteration from :encoding to UTF-8 failed due to invalid characters in input'
     ],
 
 
     'delete' => [
         'confirm'   	=> 'Weet je zeker dat je dit asset wilt verwijderen?',
         'error'   		=> 'Er was een probleem tijdens het verwijderen van het asset. Probeer het opnieuw.',
+        'assigned_to_error' => '{1}Asset Tag: :asset_tag is currently checked out. Check in this device before deletion.|[2,*]Asset Tags: :asset_tag are currently checked out. Check in these devices before deletion.',
         'nothing_updated'   => 'Er zijn geen assets geselecteerd, er is dus niets verwijderd.',
         'success' 		=> 'Het asset is succesvol verwijderd.',
     ],
@@ -78,6 +86,11 @@ return [
         'no_assets_selected' => 'U moet minstens één asset selecteren uit de lijst',
     ],
 
+    'multi-checkout' => [
+        'error'   => 'Asset was not checked out, please try again|Assets were not checked out, please try again',
+        'success' => 'Asset checked out successfully.|Assets checked out successfully.',
+    ],
+
     'checkin' => [
         'error'   		=> 'Asset is niet ingecheckt, probeer het opnieuw',
         'success' 		=> 'Asset is met succes ingecheckt.',
@@ -87,9 +100,10 @@ return [
     ],
 
     'requests' => [
-        'error'   		=> 'Asset is niet aangevraagd. Probeer het opnieuw',
-        'success' 		=> 'Asset is succesvol aangevraagd.',
-        'canceled'      => 'Checkout aanvraag succesvol geannuleerd',
+        'error'   		=> 'Request was not successful, please try again.',
+        'success' 		=> 'Request successfully submitted.',
+        'canceled'      => 'Request successfully canceled.',
+        'cancel'        => 'Annuleer deze aanvraag',
     ],
 
 ];
diff --git a/resources/lang/nl-NL/admin/hardware/table.php b/resources/lang/nl-NL/admin/hardware/table.php
index 0a75a7b756..2400a9fd69 100644
--- a/resources/lang/nl-NL/admin/hardware/table.php
+++ b/resources/lang/nl-NL/admin/hardware/table.php
@@ -25,7 +25,6 @@ return [
     'image'		    => 'Asset afbeelding',
     'days_without_acceptance' => 'Dagen zonder acceptatie',
     'monthly_depreciation' => 'Maandelijkse afschrijving',
-    'assigned_to'    => 'Toegewezen aan',
     'requesting_user' => 'Verzoekende gebruiker',
     'requested_date' => 'Aangevraagde datum',
     'changed'       => 'Gewijzigd',
diff --git a/resources/lang/nl-NL/admin/kits/general.php b/resources/lang/nl-NL/admin/kits/general.php
index c61097f8e6..a94863a8a2 100644
--- a/resources/lang/nl-NL/admin/kits/general.php
+++ b/resources/lang/nl-NL/admin/kits/general.php
@@ -47,4 +47,5 @@ return [
     'kit_deleted'                       => 'Kit is succesvol verwijderd',
     'kit_model_updated'                 => 'Model is succesvol bijgewerkt',
     'kit_model_detached'                => 'Model is met succes losgekoppeld',
+    'model_already_attached'            => 'Model is al gekoppeld aan kit',
 ];
diff --git a/resources/lang/nl-NL/admin/licenses/general.php b/resources/lang/nl-NL/admin/licenses/general.php
index 7e19e47aa6..276cd11ef3 100644
--- a/resources/lang/nl-NL/admin/licenses/general.php
+++ b/resources/lang/nl-NL/admin/licenses/general.php
@@ -14,6 +14,7 @@ return array(
     'info'  					=> 'Licentiegegevens',
     'license_seats'  			=> 'Licentie werkplekken',
     'seat'  					=> 'Werkplek',
+    'seat_count'  				=> 'Werkplek :count',
     'seats'  					=> 'Werkplekken',
     'software_licenses'  		=> 'Applicatie Licenties',
     'user'  					=> 'Gebruiker',
@@ -28,7 +29,7 @@ return array(
                 'disabled_tooltip'  => 'Dit is uitgeschakeld omdat er nog niets is uitgecheckt',
                 'disabled_tooltip_reassignable'  => 'Dit is uitgeschakeld omdat de licentie niet opnieuw toegewezen kan worden',
                 'success'           => 'Licentie met succes ingecheckt! | Alle licenties zijn met succes ingecheckt!',
-                'log_msg'           => 'Ingecheckt via bulklicentie-checkin in licentie GUI',
+                'log_msg'           => 'Ingecheckt via bulk licentiecontrole in licentie GUI',
             ],
 
             'checkout_all'              => [
diff --git a/resources/lang/nl-NL/admin/licenses/message.php b/resources/lang/nl-NL/admin/licenses/message.php
index 385def0ec8..96da22c94f 100644
--- a/resources/lang/nl-NL/admin/licenses/message.php
+++ b/resources/lang/nl-NL/admin/licenses/message.php
@@ -44,10 +44,13 @@ return array(
         'error'   => 'Er was een probleem met het uitchecken van deze licentie. Probeer het opnieuw.',
         'success' => 'De licentie is met succes uitgecheckt',
         'not_enough_seats' => 'Niet genoeg licentieplaatsen beschikbaar voor de kassa',
+        'mismatch' => 'De opgegeven licentie werkplek komt niet overeen met de licentie',
+        'unavailable' => 'Deze licentie is niet beschikbaar voor uitchecken.',
     ),
 
     'checkin' => array(
         'error'   => 'Er was een probleem met het inchecken van deze licentie. Probeer het opnieuw.',
+        'not_reassignable' => 'License not reassignable',
         'success' => 'De licentie is met succes ingecheckt'
     ),
 
diff --git a/resources/lang/nl-NL/admin/locations/message.php b/resources/lang/nl-NL/admin/locations/message.php
index 471c641f02..18b2245209 100644
--- a/resources/lang/nl-NL/admin/locations/message.php
+++ b/resources/lang/nl-NL/admin/locations/message.php
@@ -3,11 +3,12 @@
 return array(
 
     'does_not_exist' => 'Locatie bestaat niet.',
-    'assoc_users'    => 'This location is not currently deletable because it is the location of record for at least one asset or user, has assets assigned to it, or is the parent location of another location. Please update your models to no longer reference this company and try again. ',
+    'assoc_users'    => 'Deze locatie is momenteel niet verwijderbaar omdat het de locatie is voor ten minste één product of gebruiker, heeft de assets toegewezen of is de bovenliggende locatie van een andere locatie. Update uw gegevens zodat deze locatie niet langer gebruikt wordt en probeer het opnieuw ',
     'assoc_assets'	 => 'Deze locatie is momenteel gekoppeld met tenminste één asset en kan hierdoor niet worden verwijderd. Update je assets die niet meer bij deze locatie en probeer het opnieuw. ',
     'assoc_child_loc'	 => 'Deze locatie is momenteen de ouder van ten minste één kind locatie en kan hierdoor niet worden verwijderd. Update je locaties bij die niet meer naar deze locatie verwijzen en probeer het opnieuw. ',
     'assigned_assets' => 'Toegewezen activa',
     'current_location' => 'Huidige locatie',
+    'open_map' => 'Open in :map_provider_icon kaarten',
 
 
     'create' => array(
@@ -20,6 +21,11 @@ return array(
         'success' => 'Locatie is met succes gewijzigd.'
     ),
 
+    'restore' => array(
+        'error'   => 'Locatie is niet hersteld, probeer het opnieuw',
+        'success' => 'Locatie hersteld.'
+    ),
+
     'delete' => array(
         'confirm'   	=> 'Weet je het zeker dat je deze locatie wilt verwijderen?',
         'error'   => 'Er was een probleem met het verwijderen van deze locatie. Probeer het opnieuw.',
diff --git a/resources/lang/nl-NL/admin/locations/table.php b/resources/lang/nl-NL/admin/locations/table.php
index 08ac1f913a..19e8e7ac08 100644
--- a/resources/lang/nl-NL/admin/locations/table.php
+++ b/resources/lang/nl-NL/admin/locations/table.php
@@ -39,4 +39,5 @@ return [
     'signed_by_finance_auditor' => 'Ondertekend door (Asset Auditor):',
     'signed_by_location_manager' => 'Ondertekend door (Locatiebeheer):',
     'signed_by'                 => 'Afgetekend door:',
+    'clone'  					=> 'Clone Location',
 ];
diff --git a/resources/lang/nl-NL/admin/models/general.php b/resources/lang/nl-NL/admin/models/general.php
index 41768d4756..4dd61c2931 100644
--- a/resources/lang/nl-NL/admin/models/general.php
+++ b/resources/lang/nl-NL/admin/models/general.php
@@ -3,7 +3,7 @@
 return array(
     'about_models_title'     => 'Over Asset Modellen',
     'about_models_text'           => 'Assetmodellen zijn een manier om identieke assets te groeperen. "MBP 2013", "iPhone 6s", enz.',
-    'deleted'  					        => 'Dit model is verwijderd.',
+    'deleted'  					=> 'Dit model is verwijderd.',
     'bulk_delete'               => 'In bulk verwijderen van assetmodellen',
     'bulk_delete_help'               => 'Gebruik de selectievakjes hieronder om het verwijderen van de geselecteerde assetmodellen te bevestigen. Assetmodellen waarbij assets gekoppeld zijn, kunnen niet verwijderd worden totdat de assets gekoppeld zijn aan een ander model.',
     'bulk_delete_warn'          => 'Je staat op het punt één asset model te verwijderen.|Je staat op het punt om :model_count asset modellen te verwijderen.',
diff --git a/resources/lang/nl-NL/admin/models/message.php b/resources/lang/nl-NL/admin/models/message.php
index 44bfefe9be..1cd1b6a5ec 100644
--- a/resources/lang/nl-NL/admin/models/message.php
+++ b/resources/lang/nl-NL/admin/models/message.php
@@ -7,7 +7,7 @@ return array(
     'no_association' => 'WAARSCHUWING! Het asset model voor dit item is ongeldig of ontbreekt!',
     'no_association_fix' => 'Dit maakt dingen kapot op rare en gruwelijke manieren. Bewerk dit product nu om het een model toe te wijzen.',
     'assoc_users'	 => 'Dit model is momenteel gekoppeld met één of meer assets en kan niet worden verwijderd. Verwijder de assets en probeer het opnieuw. ',
-
+    'invalid_category_type' => 'Deze categorie moet een asset categorie zijn.',
 
     'create' => array(
         'error'   => 'Model is niet aangemaakt, probeer het opnieuw.',
diff --git a/resources/lang/nl-NL/admin/reports/general.php b/resources/lang/nl-NL/admin/reports/general.php
index aba32d04aa..87b44cd178 100644
--- a/resources/lang/nl-NL/admin/reports/general.php
+++ b/resources/lang/nl-NL/admin/reports/general.php
@@ -4,6 +4,7 @@ return [
     'info'   => 'Selecteer de opties die je wilt voor je assetrapport.',
     'deleted_user' => 'Verwijderde gebruiker',
     'send_reminder' => 'Stuur herinnering',
+    'cannot_send_reminder' => 'User has been deleted or does not have an email address so cannot receive a reminder',
     'reminder_sent' => 'Herinnering verzonden',
     'acceptance_deleted' => 'Aanvaardingsverzoek verwijderd',
     'acceptance_request' => 'Aanvaarding verzoek',
@@ -13,5 +14,10 @@ return [
         'user_state' => 'Gebruiker Provincie',
         'user_country' => 'Gebruiker Land',
         'user_zip' => 'Gebruiker Postcode'
-    ]
-];
\ No newline at end of file
+    ],
+    'open_saved_template' => 'Opgeslagen sjabloon openen',
+    'save_template' =>  'Sjabloon opslaan',
+    'select_a_template' => 'Kies een sjabloon',
+    'template_name' => 'Sjabloonnaam',
+    'update_template' => 'Sjabloon bijwerken',
+];
diff --git a/resources/lang/nl-NL/admin/reports/message.php b/resources/lang/nl-NL/admin/reports/message.php
index 0f8c2a1642..2800bbdf0b 100644
--- a/resources/lang/nl-NL/admin/reports/message.php
+++ b/resources/lang/nl-NL/admin/reports/message.php
@@ -1,5 +1,16 @@
 <?php
 
-return array(
-    'error'   => 'Je moet ten minste één optie kiezen.'
-);
+return [
+    'about_templates' => 'About Saved Templates',
+    'saving_templates_description' => 'Select your options, then enter the name of your template in the box above and click the \'Save Template\' button. Use the dropdown to select a previously saved template.',
+    'create'  => [
+        'success' => 'Template saved successfully',
+    ],
+    'update' => [
+        'success' => 'Template updated successfully',
+    ],
+    'delete' => [
+        'success' => 'Template deleted',
+        'no_delete_permission' => 'Template does not exist or you do not have permission to delete it.',
+    ],
+];
diff --git a/resources/lang/nl-NL/admin/settings/general.php b/resources/lang/nl-NL/admin/settings/general.php
index f314bd3ef6..cb85bffb09 100644
--- a/resources/lang/nl-NL/admin/settings/general.php
+++ b/resources/lang/nl-NL/admin/settings/general.php
@@ -8,13 +8,13 @@ return [
     'ad_append_domain'          => 'Domeinnaam toevoegen aan veld gebruikersnaam',
     'ad_append_domain_help'     => 'Gebruiker is niet verplicht om "username@domain.local" te schrijven, deze kan alleen "username" typen.',
     'admin_cc_email'            => 'CC e-mail',
-    'admin_cc_email_help'       => 'Als u een kopie van de checkout/checkin e-mail die aan de gebruikers worden verzonden wilt verzenden naar een extra e-mailaccount, vul dan hier het e-mailadres in. Laat anders dit veld leeg.',
+    'admin_cc_email_help'       => 'Send a copy of checkin/checkout emails to this address.',
     'admin_settings'            => 'Beheerder Instellingen',
     'is_ad'				        => 'Dit is een Active Directory server',
     'alerts'                	=> 'Waarschuwingen',
     'alert_title'               => 'Meldingsinstellingen aanpassen',
     'alert_email'				=> 'Verstuur meldingen naar',
-    'alert_email_help'    => 'E-mailadressen of distributielijsten waar je meldingen naar wilt verzenden, door komma\'s gescheiden',
+    'alert_email_help'          => 'E-mailadressen of distributielijsten waar je meldingen naar wilt verzenden, door komma\'s gescheiden.',
     'alerts_enabled'			=> 'Meldingen ingeschakeld',
     'alert_interval'			=> 'Drempel verlopende meldingen (in dagen)',
     'alert_inv_threshold'		=> 'Inventaris melding drempel',
@@ -31,15 +31,18 @@ return [
     'backups'					=> 'Back-ups',
     'backups_help'              => 'Maken, downloaden en herstellen van back-ups ',
     'backups_restoring'         => 'Herstellen vanuit back-up',
+    'backups_clean' => 'Maak de backed-up database schoon voor herstel',
+    'backups_clean_helptext' => "Dit kan handig zijn als je wisselt tussen databaseversies",
     'backups_upload'            => 'Backup uploaden',
     'backups_path'              => 'Back-ups op de server worden opgeslagen in <code>:path</code>',
-    'backups_restore_warning'   => 'Gebruik de herstel knop <small><span class="btn btn-xs btn-warning"><i class="text-white fas fa-retweet" aria-hidden="true"></i></span></small> om een vorige back-up te herstellen. (Dit werkt momenteel niet met S3 bestandsopslag of Docker.)<br><br>Je <strong>gehele :app_name database en alle geüploade bestanden zullen volledig vervangen worden</strong>door wat er in het backup bestand staat.  ',
+    'backups_restore_warning'   => 'Use the restore button <small><span class="btn btn-xs btn-warning"><i class="text-white fas fa-retweet" aria-hidden="true"></i></span></small> to restore from a previous backup. (This does not currently work with S3 file storage or Docker.)<br><br>Your <strong>entire :app_name database and any uploaded files will be completely replaced</strong> by what\'s in the backup file  ',
     'backups_logged_out'         => 'Alle bestaande gebruikers, inclusief jijzelf, worden uitgelogd zodra je herstel is voltooid.',
     'backups_large'             => 'Zeer grote back-ups kunnen uitvallen op de herstelpoging en moeten mogelijk nog steeds worden uitgevoerd via de command line. ',
     'barcode_settings'			=> 'Barcode instellingen',
     'confirm_purge'			    => 'Opschoning bevestigen',
     'confirm_purge_help'		=> 'Voer de tekst "DELETE" in het vak hieronder om uw verwijderde records definitief te verwijderen. Deze actie kan niet ongedaan worden gemaakt en zal PERMANENT alle soft-deleted items en gebruikers verwijderen. (Je moet eerst een backup maken voor de zekerheid.)',
     'custom_css'				=> 'Aangepaste CSS',
+    'custom_css_placeholder'	=> 'Add your custom CSS',
     'custom_css_help'			=> 'Voer een aangepaste CSS overschrijving die je wilt gebruiken in. Gebruik geen &lt;style&gt;&lt;/style&gt; tags.',
     'custom_forgot_pass_url'	=> 'Aangepaste Paswoord reset URL',
     'custom_forgot_pass_url_help'	=> 'Dit vervangt de ingebouwde "vergeten paswoord URL" op de inlogpagina, handig om gebruikers te verwijzen naar een interne of gehoste LDAP paswoord reset functionaliteit. Deze optie inschakelen zal effectief de functionaliteit "vergeten paswoord" voor een lokale gebruiker uitschakelen.',
@@ -47,34 +50,34 @@ return [
     'dashboard_message_help'	=> 'Deze tekst verschijnt op het dashboard voor iedereen met toestemming om het dashboard te bekijken.',
     'default_currency'  		=> 'Standaard valuta',
     'default_eula_text'			=> 'Standaard gebruikersovereenkomst',
+    'default_eula_text_placeholder' => 'Add your default EULA text',
     'default_language'			=> 'Standaardtaal',
     'default_eula_help_text'	=> 'Je kunt aangepaste gebruikersovereenkomsten koppelen aan specifieke assetcategorieën.',
-    'acceptance_note'           => 'Add a note for your decision (Optional)',
+    'acceptance_note'           => 'Voeg een notitie toe voor uw beslissing (optioneel)',
     'display_asset_name'        => 'Geef Asset naam weer',
     'display_checkout_date'     => 'Toon Checkout datum',
     'display_eol'               => 'Toon EOL in tabel weergave',
-    'display_qr'                => 'QR codes weergeven',
+    'display_qr'                => 'Streepjescode weergeven',
     'display_alt_barcode'		=> 'Streepjescode weergeven',
-    'email_logo'                => 'E-mail logo',
     'barcode_type'				=> 'QR-code soort',
     'alt_barcode_type'			=> 'Streepjescode soort',
-    'email_logo_size'       => 'Vierkante logo\'s in de e-mail zien er het beste uit. ',
     'enabled'                   => 'Ingeschakeld',
     'eula_settings'				=> 'Gebruikersovereenkomsten instellingen',
     'eula_markdown'				=> 'Deze gebruikersovereenkomst staat <a href="https://help.github.com/articles/github-flavored-markdown/">Github flavored markdown</a> toe.',
+    'empty_row_count'           => 'Field Start Offset (Empty Rows)',
+    'empty_row_count_help'      => 'Fields will begin populating after this many empty rows are skipped at the top of the label.',
     'favicon'                   => 'Favicon',
     'favicon_format'            => 'Geaccepteerde bestandstypen zijn ico, png en gif. Andere afbeeldingsformaten werken mogelijk niet in alle browsers.',
     'favicon_size'          => 'Favorieten moeten vierkante afbeeldingen zijn, 16x16 pixels.',
     'footer_text'               => 'Aanvullende voettekst ',
     'footer_text_help'          => 'Deze tekst verschijnt in de voettekst aan de rechterkant. Links zijn toegestaan ​​met gebruik van <a href="https://help.github.com/articles/github-flavored-markdown/">Github-stijlen</a>. Regeleindes, koppen, afbeeldingen, enzovoort kunnen resulteren in onvoorspelbare resultaten.',
+    'footer_text_placeholder'   => 'Optional footer text',
     'general_settings'			=> 'Algemene Instellingen',
-    'general_settings_keywords' => 'bedrijfsondersteuning, handtekening, acceptantie, e-mailformaat, gebruikersnaam formaat, afbeeldingen, per pagina, thumbnail, eula, gravatar, tos, dashboard, privacy',
     'general_settings_help'     => 'Standaard gebruikersovereenkomst en meer',
     'generate_backup'			=> 'Genereer een backup',
     'google_workspaces'         => 'Google Workspaces',
     'header_color'              => 'Kleur van koptekst',
     'info'                      => 'Deze instellingen laten jou specifieke aspecten aanpassen van jou installatie.',
-    'label_logo'                => 'Label logo',
     'label_logo_size'           => 'Vierkante logo\'s zien er het beste uit - zullen worden weergegeven in de rechterbovenhoek van elk asset label. ',
     'laravel'                   => 'Laravel Versie',
     'ldap'                      => 'LDAP',
@@ -94,7 +97,7 @@ return [
     'ldap_login_sync_help'      => 'Dit test enkel of LDAP correct kan synchroniseren. Als uw LDAP authenticatie vraag niet correct is, dan is het mogelijk dat gebruikers niet kunnen inloggen. U MOET EERST UW BIJGEWERKTE LDAP INSTELLINGEN OPSLAAN.',
     'ldap_manager'              => 'LDAP manager',
     'ldap_server'               => 'LDAP server',
-    'ldap_server_help'          => 'Dit moet beginnen met ldap:// (voor onversleuteld of TLS) of ldaps:// (voor SSL)',
+    'ldap_server_help'          => 'Dit moet beginnen met ldap:// (voor onversleuteld) of ldaps:// (voor TLS of SSL)',
     'ldap_server_cert'			=> 'LDAP SSL certificaat validatie',
     'ldap_server_cert_ignore'	=> 'Staat ongeldige SSL certificaat toe',
     'ldap_server_cert_help'		=> 'Selecteer deze box als je een eigen ondergetekende SSL certificaat gebruik en deze wilt accepteren.',
@@ -108,8 +111,8 @@ return [
     'ldap_pword'                => 'LDAP Bind wachtwoord',
     'ldap_basedn'               => 'Basis Bind DN',
     'ldap_filter'               => 'LDAP filter',
-    'ldap_pw_sync'              => 'LDAP wachtwoord synchronisatie',
-    'ldap_pw_sync_help'         => 'Schakel dit vinkje uit als je niet wenst dat LDAP wachtwoorden gesynchroniseerd worden met lokale wachtwoorden. Uitschakelen kan betekenen dat gebruikers niet kunnen inloggen als de LDAP server niet bereikbaar is.',
+    'ldap_pw_sync'              => 'Cache LDAP Passwords',
+    'ldap_pw_sync_help'         => 'Uncheck this box if you do not wish to keep LDAP passwords cached as local hashed passwords. Disabling this means that your users may not be able to login if your LDAP server is unreachable for some reason.',
     'ldap_username_field'       => 'Gebruikersnaam veld',
     'ldap_lname_field'          => 'Achternaam',
     'ldap_fname_field'          => 'LDAP Voornaam',
@@ -117,13 +120,15 @@ return [
     'ldap_version'              => 'LDAP versie',
     'ldap_active_flag'          => 'LDAP actief vlag',
     'ldap_activated_flag_help'  => 'Deze waarde word gebruikt om te bepalen of een gesynchroniseerde gebruiker kan inloggen op Snipe-IT. <strong>Het beinvloed niet de mogelijkheid om artikelen in of uit te checken voor hun<strong>, en zou de <strong>attribute name<strong> binnen je AD/LDAP moeten zijn, <strong>niet de waarde<strong>. <br><br>Als dit veld is ingesteld op een veld naam dat niet bestaat in je AD/LDAP, of de waarde in de AD/LDAP veld is ingesteld op <code>0<code> of <code>false<code>, <strong>word gebruiker login uitgeschakeld<strong>. Als de waarde in het AD/LDAP veld is ingesteld op <code>1<code> of <code>true<code> of<em>iets anders<em> betekent het dat de gebruiker kan inloggen. Wanneer het veld leeg is in je AD, respecteren wij de <code>userAccountControl<code> attribuut, wat gebruikelijk niet opgeschorte gebruikers toestaat om in te loggen',
+    'ldap_invert_active_flag'   => 'LDAP Invert Active Flag',
+    'ldap_invert_active_flag_help'     => 'If enabled: when the value returned by LDAP Active Flag is <code>0</code> or <code>false</code> the user account will be active.',
     'ldap_emp_num'              => 'LDAP personeelsnummer',
     'ldap_email'                => 'LDAP E-mail',
     'ldap_test'                 => 'LDAP testen',
     'ldap_test_sync'            => 'LDAP-synchronisatie testen',
     'license'                   => 'Softwarelicentie',
-    'load_remote'               => 'Gravatar gebruiken',
-    'load_remote_help_text'		=> 'Schakel dit selectievakje uit als uw installatie geen scripts van buiten internet kan laden. Dit voorkomt dat Snipe-IT afbeeldingen van Gravatar probeert te laden.',
+    'load_remote'               => 'Laad Externe Avatars',
+    'load_remote_help_text'		=> 'Vink dit selectievakje uit als uw installatie geen scripts van het internet kan laden. Dit zal voorkomen dat Snipe-IT avatars van Gravatar of andere bronnen probeert te laden.',
     'login'                     => 'Inlog pogingen',
     'login_attempt'             => 'Inlog poging',
     'login_ip'                  => 'IP adres',
@@ -131,6 +136,7 @@ return [
     'login_user_agent'          => 'User Agent',
     'login_help'                => 'Lijst van inlogpogingen',
     'login_note'                => 'Inlog notitie',
+    'login_note_placeholder'            => "If you do not have a login or have found a device belonging to this company, please call technical support at 888-555-1212. Thank you.",
     'login_note_help'           => 'Hier kan je optioneel een paar regels tekst weergeven, bijvoorbeeld om mensen die een verloren of gestolen apparaat hebben gevonden te assisteren. Dit veld accepteert <a href="https://help.github.com/articles/github-flavored-markdown/">Github markdown opmaak</a>',
     'login_remote_user_text'    => 'Opties voor externe gebruikers',
     'login_remote_user_enabled_text' => 'Inloggen met header voor externe gebruiker inschakelen',
@@ -146,13 +152,16 @@ return [
     'logo_print_assets_help'    => 'Gebruik logo op afdrukbare assetlijsten ',
     'full_multiple_companies_support_help_text' => 'Beperk gebruikers (inclusief admins) die zijn toegewezen aan bedrijven tot hun bedrijfsassets.',
     'full_multiple_companies_support_text' => 'Volledige meerdere bedrijven ondersteuning',
+    'scope_locations_fmcs_support_text'  => 'Scope Locations with Full Multiple Companies Support',
+    'scope_locations_fmcs_support_help_text'  => 'Restrict locations to their selected company.',
+    'scope_locations_fmcs_check_button' => 'Check Compatibility',
+    'scope_locations_fmcs_support_disabled_text'  => 'This option is disabled because you have conflicting locations set for :count or more items.',
     'show_in_model_list'   => 'Toon in het dropdownmenu van modellen',
     'optional'					=> 'optioneel',
     'per_page'                  => 'Resultaten per pagina',
     'php'                       => 'PHP versie',
-    'php_info'                  => 'PHP Info',
+    'php_info'                  => 'PHP info',
     'php_overview'              => 'PHP',
-    'php_overview_keywords'     => 'phpinfo, systeem, info',
     'php_overview_help'         => 'PHP Systeem info',
     'php_gd_info'               => 'Je moet php-gd installeren om QR codes te laten zien, zie installatie instructies.',
     'php_gd_warning'            => 'PHP Image Processing en GD plugin zijn NIET geïnstalleerd.',
@@ -218,6 +227,8 @@ return [
     'webhook_integration_help'    => ':app integratie is optioneel, maar het eindpunt en kanaal zijn vereist als je het wilt gebruiken. Om :app integratie te configureren, moet je eerst <a href=":webhook_link" target="_new" rel="noopener">een inkomende webhook</a> maken op je :app account. Klik op de knop <strong>Test :app Integration</strong> om te bevestigen dat je instellingen correct zijn voordat je ze opslaat. ',
     'webhook_integration_help_button'    => 'Zodra je :app informatie hebt opgeslagen, verschijnt er een testknop.',
     'webhook_test_help'           => 'Test of je :app integratie correct is geconfigureerd. JE MOET EERST DE AANGEPASTE :app INSTELLINGEN OPSLAAN.',
+    'shortcuts_enabled'         => 'Sneltoetsen inschakelen',
+    'shortcuts_help_text'       => '<strong>Windows</strong>: Alt + Sneltoets, <strong>Mac</strong>: Control + Option + Sneltoets',
     'snipe_version'  			=> 'Snipe-IT Versie',
     'support_footer'            => 'Ondersteuningsvoettekst links ',
     'support_footer_help'       => 'Geef aan wie de links naar de Snipe-IT-ondersteuningsinformatie en gebruikershandleiding ziet',
@@ -227,7 +238,6 @@ return [
     'update'                    => 'Wijzig instelingen',
     'value'                     => 'Waarde',
     'brand'                     => 'Merk',
-    'brand_keywords'            => 'voettekst, logo, print, thema, skin, header, kleuren, kleur, css',
     'brand_help'                => 'Logo, websitenaam',
     'web_brand'                 => 'Type webmerknaam',
     'about_settings_title'      => 'Over instellingen',
@@ -276,6 +286,8 @@ return [
     'two_factor_enrollment_text'	=> "Twee factor authenticatie is vereist, echter is je apparaat nog niet geactiveerd. Open je Google Authenticator app en scan de onderstaande QR code om je apparaat te activeren. Vul wanneer je het apparaat succesvol hebt geactiveerd hieronder de code in",
     'require_accept_signature'      => 'Handtekening vereisen',
     'require_accept_signature_help_text'      => 'Het inschakelen van deze functie vereist dat gebruikers fysiek ondertekenen bij het accepteren van een asset.',
+    'require_checkinout_notes'  => 'Require Notes on Checkin/Checkout',
+    'require_checkinout_notes_help_text'    => 'Enabling this feature will require the note fields to be populated when checking in or checking out an asset.',
     'left'        => 'links',
     'right'        => 'rechts',
     'top'        => 'bovenkant',
@@ -290,15 +302,15 @@ return [
     'oauth_clients' => 'OAuth Clients',
     'oauth' => 'OAuth',
     'oauth_help' => 'Oauth eindpunt instellingen',
-    'oauth_no_clients' => 'You have not created any OAuth clients yet.',
+    'oauth_no_clients' => 'Je hebt nog geen OAuth clients aangemaakt.',
     'oauth_secret' => 'Secret',
-    'oauth_authorized_apps' => 'Authorized Applications',
-    'oauth_redirect_url' => 'Redirect URL',
-    'oauth_name_help' => ' Something your users will recognize and trust.',
+    'oauth_authorized_apps' => 'Geautoriseerde toepassingen',
+    'oauth_redirect_url' => 'Omleidings URL',
+    'oauth_name_help' => ' Iets dat uw gebruikers herkennen en vertrouwen.',
     'oauth_scopes' => 'Scopes',
-    'oauth_callback_url' => 'Your application authorization callback URL.',
-    'create_client' => 'Create Client',
-    'no_scopes' => 'No scopes',
+    'oauth_callback_url' => 'Uw applicatie autorisatie callback URL.',
+    'create_client' => 'Client aanmaken',
+    'no_scopes' => 'Geen scopes',
     'asset_tag_title' => 'Update Asset Tag Instellingen',
     'barcode_title' => 'Barcode instellingen bijwerken',
     'barcodes' => 'Barcodes',
@@ -313,24 +325,24 @@ return [
     'filter_by_keyword' => 'Filter door het instellen van trefwoord',
     'security' => 'Beveiliging',
     'security_title' => 'Veiligheidsinstellingen bijwerken',
-    'security_keywords' => 'wachtwoord, wachtwoorden, vereisten, twee factor, twee-factor, veelgebruikte wachtwoorden, externe login, logout, authenticatie',
     'security_help' => 'Twee factor, wachtwoorden beperkingen',
-    'groups_keywords' => 'machtigingen, machtigingsgroepen, autorisatie',
     'groups_help' => 'Account machtigingsgroepen',
     'localization' => 'Lokalisatie',
     'localization_title' => 'Lokalisatie-instellingen bijwerken',
-    'localization_keywords' => 'lokalisatie, valuta, lokaal, lokaal, tijdzone, tijdzone, internationaal, internatinalisatie, taal, vertaling',
     'localization_help' => 'Taal en datum weergave',
     'notifications' => 'Notificaties',
     'notifications_help' => 'E-mail Waarschuwingen & Audit Instellingen',
     'asset_tags_help' => 'Verhogen en voorvoegsels',
     'labels' => 'Labels',
     'labels_title' => 'Labelinstellingen bijwerken',
-    'labels_help' => 'Label maten &amp; instellingen',
-    'purge_keywords' => 'permanent verwijderen',
+    'labels_help' => 'Barcodes &amp; label settings',
     'purge_help' => 'Verwijderde Records opschonen',
     'ldap_extension_warning' => 'Het lijkt erop dat de LDAP-extensie niet is geïnstalleerd of ingeschakeld op deze server. U kunt nog steeds uw instellingen opslaan, maar u moet de LDAP extensie voor PHP inschakelen voordat LDAP synchronisatie of login zal werken.',
     'ldap_ad' => 'LDAP/AD',
+    'ldap_test_label' => 'Test LDAP Sync',
+    'ldap_test_login' => ' Test LDAP Login',
+    'ldap_username_placeholder' => 'LDAP Username',
+    'ldap_password_placeholder' => 'LDAP Password',
     'employee_number' => 'Personeelsnummer',
     'create_admin_user' => 'Gebruiker aanmaken ::',
     'create_admin_success' => 'Gelukt! Uw beheerder is toegevoegd!',
@@ -342,6 +354,8 @@ return [
     'setup_migration_create_user' => 'Volgende: Gebruiker aanmaken',
     'ldap_settings_link' => 'LDAP instellingen pagina',
     'slack_test' => 'Test <i class="fab fa-slack"></i> integratie',
+    'status_label_name' => 'Status Label Name',
+    'super_admin_only'  => 'Super Admin Only',
     'label2_enable'           => 'Nieuwe Label Maker',
     'label2_enable_help'      => 'Schakel over naar de nieuwe labelmaker. <b>Opmerking: u moet deze instelling opslaan voordat u anderen kunt instellen.</b>',
     'label2_template'         => 'Sjabloon',
@@ -356,12 +370,15 @@ return [
     'label2_2d_type'          => '2D streepjescode soort',
     'label2_2d_type_help'     => 'Indeling voor 2D barcodes',
     'label2_2d_target'        => '2D Barcode URL',
-    'label2_2d_target_help'   => 'De URL van de 2D streepjescode als deze gescand wordt',
+    'label2_2d_target_help'   => 'The data that will be contained in the 2D barcode',
     'label2_fields'           => 'Veld definities',
     'label2_fields_help'      => 'Velden kunnen worden toegevoegd, verwijderd en opnieuw geordend in de linker kolom. Voor elk veld kunnen meerdere opties voor label en gegevensbron worden toegevoegd, verwijderd en opnieuw geordend in de juiste kolom.',
+    'purge_barcodes' => 'Purge Barcodes',
     'help_asterisk_bold'    => 'Tekst ingevoerd als <code>**tekst**</code> wordt weergegeven als dikgedrukt',
     'help_blank_to_use'     => 'Laat leeg om de waarde van <code>:setting_name</code> te gebruiken',
-    'help_default_will_use' => '<code>:Standaard</code> gebruikt de waarde van <code>:setting_name</code>. <br>Houd er rekening mee dat de waarde van de streepjescodes moet voldoen aan de respectievelijke streepjescodespecificaties om succesvol te kunnen worden gegenereerd. Raadpleeg <a href="https://snipe-it.readme.io/docs/barcodes">de documentatie <i class="fa fa-external-link"></i></a> voor meer details. ',
+    'help_default_will_use' => '<code>:default</code> will use the value from <code>:setting_name</code>. <br>Note that the value of the barcodes must comply with the respective barcode spec in order to be successfully generated. Please see <a href="https://snipe-it.readme.io/docs/barcodes">the documentation <i class="fa fa-external-link"></i></a> for more details. ',
+    'asset_id'              => 'Asset ID',
+    'data'               => 'Data',
     'default'               => 'Standaard',
     'none'                  => 'Geen',
     'google_callback_help' => 'Dit moet worden ingevoerd als de callback URL in je Google OAuth app instellingen in je organisatie&apos;s <strong><a href="https://console.cloud.google.com/" target="_blank">Google developer console <i class="fa fa-external-link" aria-hidden="true"></i></a></strong>.',
@@ -373,7 +390,100 @@ return [
     'database_driver' => 'Database Stuurprogramma',
     'bs_table_storage' => 'Tafel opslag',
     'timezone' => 'Tijdzone',
-    'profile_edit'          => 'Edit Profile',
-    'profile_edit_help'          => 'Allow users to edit their own profiles.',
+    'test_mail' => 'Test Mail',
+    'profile_edit'          => 'Profiel bewerken',
+    'profile_edit_help'          => 'Gebruikers toestaan hun eigen profielen te bewerken.',
+    'default_avatar' => 'Custom Default Avatar',
+    'default_avatar_help' => 'Deze afbeelding wordt weergegeven als profielfoto wanneer een gebruiker geen profielfoto heeft.',
+    'restore_default_avatar' => '<a href=":default_avatar" data-toggle="lightbox" data-type="image">Originele standaard avatar</a> herstellen',
+    'restore_default_avatar_help' => '',
+    'due_checkin_days' => 'Waarschuwing voor aankomende Checkin',
+    'due_checkin_days_help' => 'Hoeveel dagen vóór de verwachte check-in van een product moet het worden weergegeven op de pagina "Waarschuwing voor aankomende Check-in"?',
+    'no_groups' => 'No groups have been created yet. Visit <code>Admin Settings > Permission Groups</code> to add one.',
+    'text' => 'Text',
+
+    'username_formats' => [
+        'username_format'		=> 'Gebruikersnaam indeling',
+        'firstname_lastname_format'	=> 'Voornaam Achternaam (jane.smith)',
+        'first_name_format'	        => 'First Name (jane)',
+        'last_name_format'		=> 'Last Name (doe)',
+        'filastname_format'			=> 'First Initial Last Name (jsmith)',
+        'lastnamefirstinitial_format' =>  'Last Name First Initial (smithj)',
+        'firstname_lastname_underscore_format' => 'First Name Last Name (jane_smith)',
+        'firstinitial.lastname' => 'First Initial Last Name (j.smith)',
+        'lastname_firstinitial' => 'Last Name First Initial (smith_j)',
+        'lastname_dot_firstinitial_format' => 'Last Name First Initial (smith.j)',
+        'firstnamelastname'     => 'First Name Last Name (janesmith)',
+        'firstnamelastinitial'  => 'First Name Last Initial (janes)',
+        'lastnamefirstname'      => 'Achternaam.Voornaam (smith.jane)',
+    ],
+
+    'email_formats' => [
+        'email_format'			=> 'E-mailindeling',
+        'firstname_lastname_format'	=> 'Voornaam Achternaam (jane.smith@example.com)',
+        'first_name_format'		=> 'Voornaam (jane@example.com)',
+        'last_name_format'		=> 'Last Name (doe@example.com)',
+        'filastname_format'			=> 'Eerste Initiaal Achternaam (jsmith@example.com)',
+        'lastnamefirstinitial_format' =>  'Achternaam eerste initiaal (nescion@voorbeeld.nl)',
+        'firstname_lastname_underscore_format' => 'Voornaam Achternaam (nomen.nescio@voorbeeld.nl)',
+        'firstinitial.lastname' => 'Eerste initiaal Achternaam (j.smith@example.com)',
+        'lastname_firstinitial' => 'Achternaam eerste initiaal (smith_j@example.com)',
+        'lastname_dot_firstinitial_format' => 'Last Name First Initial (smith.j@example.com)',
+        'firstnamelastname'     => 'Voornaam Achternaam (janesmith@example.com)',
+        'firstnamelastinitial'  => 'Voornaam Initiaal Achternaam (janes@voorbeeld.com)',
+        'lastnamefirstname'      => 'Achternaam.Voornaam (smith.jane@example.com)',
+    ],
+
+
+
+    'logo_labels' => [
+        'acceptance_pdf_logo'       => 'PDF Logo',
+        'email_logo'                => 'E-mail logo',
+        'label_logo'                => 'Label logo',
+        'logo'                      => 'Site Logo',
+        'favicon'                   => 'Favicon',
+    ],
+
+    'logo_help' => [
+        'email_logo_size'       => 'Vierkante logo\'s in de e-mail zien er het beste uit. ',
+    ],
+
+    'logo_option_types' => [
+        'text' => 'Text',
+        'logo' => 'Logo',
+        'logo_and_text' => 'Logo and Text',
+    ],
+
+
+    'legends' => [
+        'scoping' => 'Scoping',
+        'formats' => 'Default Formats',
+        'profiles' => 'User Profiles',
+        'eula' => 'EULA & Acceptance Preferences',
+        'misc_display' => 'Miscellaneous Display Options',
+        'email' => 'Email Preferences',
+        'checkin' => 'Checkin Preferences',
+        'dashboard' => 'Login & Dashboard Preferences',
+        'misc' => 'Miscellaneous',
+        'logos' => 'Logos & Display',
+        'colors' => 'Colors & Skins',
+        'footer' => 'Footer Preferences',
+        'security' => 'Security Preferences',
+        'general' => 'General',
+        'intervals' => 'Intervals & Thresholds',
+    ],
+
+
+    /* Keywords for settings overview help */
+    'keywords' => [
+        'brand'             => 'voettekst, logo, print, thema, skin, header, kleuren, kleur, css',
+        'general_settings'  => 'bedrijfsondersteuning, handtekening, acceptantie, e-mailformaat, gebruikersnaam formaat, afbeeldingen, per pagina, thumbnail, eula, gravatar, tos, dashboard, privacy',
+        'groups'            => 'machtigingen, machtigingsgroepen, autorisatie',
+        'labels'            => 'labels, barcodes, barcode, sheets, print, upc, qr, 1d, 2d',
+        'localization'      => 'lokalisatie, valuta, lokaal, lokaal, tijdzone, tijdzone, internationaal, internatinalisatie, taal, vertaling',
+        'php_overview'      => 'phpinfo, systeem, info',
+        'purge'             => 'permanent verwijderen',
+        'security'          => 'wachtwoord, wachtwoorden, vereisten, twee factor, twee-factor, veelgebruikte wachtwoorden, externe login, logout, authenticatie',
+    ],
 
 ];
diff --git a/resources/lang/nl-NL/admin/settings/message.php b/resources/lang/nl-NL/admin/settings/message.php
index a07cd34f82..041a995c51 100644
--- a/resources/lang/nl-NL/admin/settings/message.php
+++ b/resources/lang/nl-NL/admin/settings/message.php
@@ -14,6 +14,9 @@ return [
         'restore_warning'       => 'Ja, herstellen. Ik bevestig dat dit alle bestaande gegevens die momenteel in de database aanwezig zijn, overschreven worden. Dit zal ook alle bestaande gebruikers uitloggen (inclusief jijzelf).',
         'restore_confirm'       => 'Weet je zeker dat je je database wilt herstellen met :filename?'
     ],
+    'restore' => [
+        'success'               => 'Uw systeemback-up is hersteld. Log opnieuw in.'
+    ],
     'purge' => [
         'error'     => 'Er is iets fout gegaan tijdens het opschonen.',
         'validation_failed'     => 'De opschoon bevestiging is niet correct. Typ het woord "DELETE" in het bevestigingsveld.',
@@ -33,6 +36,9 @@ return [
         'testing_authentication' => 'LDAP-authenticatie testen...',
         'authentication_success' => 'Gebruiker met succes geverifieerd met LDAP!'
     ],
+    'labels' => [
+        'null_template' => 'Label template not found. Please select a template.',
+        ],
     'webhook' => [
         'sending' => ':app test bericht wordt verzonden...',
         'success' => 'Je :webhook_name integratie werkt!',
@@ -42,5 +48,12 @@ return [
         'error' => 'Er ging iets mis. :app reageerde met: :error_message',
         'error_redirect' => 'FOUT: 301/302 :endpoint geeft een omleiding. Om veiligheidsredenen volgen we geen omleidingen. Gebruik het werkelijke eindpunt.',
         'error_misc' => 'Er ging iets mis. :( ',
-    ]
+        'webhook_fail' => ' webhook notification failed: Check to make sure the URL is still valid.',
+        'webhook_channel_not_found' => ' webhook channel not found.',
+        'ms_teams_deprecation' => 'The selected Microsoft Teams webhook URL will be deprecated Dec 31st, 2025. Please use a workflow URL. Microsoft\'s documentation on creating a workflow can be found <a href="https://support.microsoft.com/en-us/office/create-incoming-webhooks-with-workflows-for-microsoft-teams-8ae491c7-0394-4861-ba59-055e33f75498" target="_blank"> here.</a>',
+    ],
+    'location_scoping' => [
+        'not_saved' => 'Your settings were not saved.',
+        'mismatch' => 'There is 1 item in the database that need your attention before you can enable location scoping.|There are :count items in the database that need your attention before you can enable location scoping.',
+    ],
 ];
diff --git a/resources/lang/nl-NL/admin/statuslabels/table.php b/resources/lang/nl-NL/admin/statuslabels/table.php
index 770f969f1e..45db338911 100644
--- a/resources/lang/nl-NL/admin/statuslabels/table.php
+++ b/resources/lang/nl-NL/admin/statuslabels/table.php
@@ -1,14 +1,14 @@
 <?php
 
 return array(
-    'about'      	=> 'Over status labels',
+    'about'      	=> 'About Status Types',
     'archived'      	=> 'Gearchiveerd',
     'create'      	=> 'Maak een Status Label',
     'color'      	=> 'Diagram kleur',
     'default_label' => 'Standaardlabel',
     'default_label_help' => 'Dit wordt gebruikt om ervoor te zorgen dat uw meest gebruikte statuslabels boven aan het selectievak verschijnen bij het maken / bewerken van items.',
     'deployable'      	=> 'Inzetbaar',
-    'info'      	=> 'Status labels worden gebruikt om de status van je assets te beschrijven. Ze kunnen worden gerepareerd, verloren/gestolen, etc. Je kan nieuwe status labels maken voor uitrolbaar, inbehandeling en gearchiveerde assets.',
+    'info'      	=> 'Status label types are used to describe the various states your assets could be in. They may be out for repair, lost/stolen, etc. You can create new status labels for your deployable, pending and archived assets according to your own workflow. For more information, <a href="https://snipe-it.readme.io/docs/overview#status-labels" target="_blank">see the documentation <i class="fa fa-external-link"></i></a>.',
     'name'      	=> 'Statusnaam',
     'pending'      	=> 'In behandeling',
     'status_type'   => 'Statustype',
diff --git a/resources/lang/nl-NL/admin/users/general.php b/resources/lang/nl-NL/admin/users/general.php
index 7669d76a24..d1cf6469cb 100644
--- a/resources/lang/nl-NL/admin/users/general.php
+++ b/resources/lang/nl-NL/admin/users/general.php
@@ -19,6 +19,8 @@ return [
     'print_assigned'    => 'Print alles wat toegewezen is',
     'email_assigned'    => 'E-maillijst met alle toegewezen artikelen',
     'user_notified'     => 'Gebruiker is een lijst van de momenteel toegewezen artikelen gemaild.',
+    'users_notified'    => 'The user has been emailed a list of their currently assigned items.|:count users have been emailed a list of their currently assigned items.',
+    'users_notified_warning' => ':count user has been emailed a list of their currently assigned items, however :no_email users did not have an email address so could not be emailed.|:count users have been emailed a list of their currently assigned items, however :no_email user(s) did not have an email address so could not be emailed.',
     'auto_assign_label' => 'Neem deze gebruiker op bij het automatisch toewijzen van in aanmerking komende licenties',
     'auto_assign_help'  => 'Automatisch licentie toewijzen overslaan voor deze gebruiker',
     'software_user'     => 'Software is uitgecheckt aan :name',
diff --git a/resources/lang/nl-NL/admin/users/message.php b/resources/lang/nl-NL/admin/users/message.php
index e6741bd994..86df6d34fc 100644
--- a/resources/lang/nl-NL/admin/users/message.php
+++ b/resources/lang/nl-NL/admin/users/message.php
@@ -6,7 +6,7 @@ return array(
     'declined'                  => 'Je hebt dit asset met succes geweigerd.',
     'bulk_manager_warn'	        => 'Uw gebruikers zijn succesvol bijgewerkt, de gekozen manager kon echter niet toegepast worden omdat deze persoon ook in de lijst staat, gebruikers mogen niet hun eigen manager zijn. Probeer het nogmaals en selecteer de gebruikers zonder de manager.',
     'user_exists'               => 'Gebruiker bestaat reeds!',
-    'user_not_found'            => 'Gebruiker bestaat niet.',
+    'user_not_found'            => 'Gebruiker bestaat niet of je hebt geen toestemming om deze gebruiker te bekijken.',
     'user_login_required'       => 'Het veld gebruikersnaam is verplicht.',
     'user_has_no_assets_assigned' => 'Geen assets toegewezen aan de gebruiker.',
     'user_password_required'    => 'Het veld wachtwoord is verplicht.',
@@ -37,22 +37,23 @@ return array(
         'update' => 'Er was een probleem tijdens het bijwerken van de gebruiker. Probeer opnieuw, aub.',
         'delete' => 'Er was een probleem tijdens het verwijderen van de gebruiker. Probeer opnieuw, aub.',
         'delete_has_assets' => 'Deze gebruiker heeft toegewezen items en kon niet worden verwijderd.',
-        'delete_has_assets_var' => 'This user still has an asset assigned. Please check it in first.|This user still has :count assets assigned. Please check their assets in first.',
-        'delete_has_licenses_var' => 'This user still has a license seats assigned. Please check it in first.|This user still has :count license seats assigned. Please check them in first.',
-        'delete_has_accessories_var' => 'This user still has an accessory assigned. Please check it in first.|This user still has :count accessories assigned. Please check their assets in first.',
-        'delete_has_locations_var' => 'This user still manages a location. Please select another manager first.|This user still manages :count locations. Please select another manager first.',
-        'delete_has_users_var' => 'This user still manages another user. Please select another manager for that user first.|This user still manages :count users. Please select another manager for them first.',
+        'delete_has_assets_var' => 'Deze gebruiker heeft nog een asset toegewezen. Controleer dit eerst.|Deze gebruiker heeft nog steeds :count assets toegewezen. Controleer dit eerst.',
+        'delete_has_licenses_var' => 'Deze gebruiker heeft nog een licentie toegewezen. Controleer dit eerst.|Deze gebruiker heeft nog steeds :count licenties toegewezen. Controleer dit eerst.',
+        'delete_has_accessories_var' => 'Deze gebruiker heeft nog een accessoires toegewezen. Controleer dit eerst.|Deze gebruiker heeft nog steeds :count accessoires toegewezen. Controleer dit eerst.',
+        'delete_has_locations_var' => 'Deze gebruiker beheert nog een locatie. Selecteer eerst een andere manager.|Deze gebruiker beheert nog steeds :count locaties. Selecteer eerst een andere manager.',
+        'delete_has_users_var' => 'Deze gebruiker beheert nog een andere gebruiker. Selecteer eerst een andere manager.|Deze gebruiker beheert nog steeds :count gebruikers. Selecteer eerst een andere manager.',
         'unsuspend' => 'Er was een probleem tijdens het opnieuw inschakelen van de gebruiker. Probeer opnieuw, aub.',
         'import'    => 'Er was een probleem met het importeren van de gebruikers. Probeer het opnieuw.',
         'asset_already_accepted' => 'Dit asset is al geaccepteerd.',
         'accept_or_decline' => 'Je moet dit asset accepteren of weigeren.',
-        'cannot_delete_yourself' => 'We would feel really bad if you deleted yourself, please reconsider.',
+        'cannot_delete_yourself' => 'We zouden het heel erg vinden als je jezelf zou verwijderen, overweeg alsjeblieft opnieuw.',
         'incorrect_user_accepted' => 'Het asset dat je probeerde te accepteren is niet uitgecheckt aan jou.',
         'ldap_could_not_connect' => 'Kan niet verbinden met de LDAP server. Controleer je LDAP server configuratie in de LDAP configuratie bestand. <br>Fout van LDAP server:',
         'ldap_could_not_bind' => 'Kan niet verbinden met de LDAP server. Controleer je LDAP server configuratie in de LDAP configuratie bestand. <br>Fout van LDAP server: ',
         'ldap_could_not_search' => 'Kan niet zoeken in de LDAP server. Controleer je LDAP server configuratie in de LDAP configuratie bestand. <br>Fout van LDAP server:',
         'ldap_could_not_get_entries' => 'Kan geen gegeven van de LDAP server krijgen. Controleer je LDAP server configuratie in de LDAP configuratie bestand. <br>Fout van LDAP server:',
         'password_ldap' => 'Het wachtwoord voor deze account wordt beheerd door LDAP/Active Directory. Neem contact op met uw IT-afdeling om uw wachtwoord te wijzigen. ',
+        'multi_company_items_assigned' => 'This user has items assigned that belong to a different company. Please check them in or edit their company.'
     ),
 
     'deletefile' => array(
diff --git a/resources/lang/nl-NL/admin/users/table.php b/resources/lang/nl-NL/admin/users/table.php
index 0816e7a08a..e7fc86b4b9 100644
--- a/resources/lang/nl-NL/admin/users/table.php
+++ b/resources/lang/nl-NL/admin/users/table.php
@@ -22,7 +22,7 @@ return array(
     'managed_locations'     => 'Beheerde locaties',
     'managed_users'         => 'Beheerde gebruikers',
     'name' 					=> 'Naam',
-    'nogroup'               => 'Er zijn nog geen groepen aangemaakt. Om er een toe te voegen, bezoek: ',
+    'nogroup'               => 'Er zijn nog geen groepen aangemaakt. Om er een toe te voegen, bezoek:',
     'notes'                 => 'Notities',
     'password_confirm' 		=> 'Bevestig uw wachtwoord',
     'password' 				=> 'Wachtwoord',
diff --git a/resources/lang/nl-NL/auth.php b/resources/lang/nl-NL/auth.php
index 64dcb5b7de..e13a30f98d 100644
--- a/resources/lang/nl-NL/auth.php
+++ b/resources/lang/nl-NL/auth.php
@@ -15,6 +15,6 @@ return array(
 
     'failed' => 'Deze gegevens komen niet overeen met onze administratie.',
     'password' => 'Het opgegeven wachtwoord is onjuist.',
-    'throttle' => 'Te veel inlogpogingen. Probeer het over :seconds seconden opnieuw.',
+    'throttle' => 'Too many login attempts. Please try again in :minutes minute(s).',
 
 );
diff --git a/resources/lang/nl-NL/auth/message.php b/resources/lang/nl-NL/auth/message.php
index 913f1e2504..db3fa325bb 100644
--- a/resources/lang/nl-NL/auth/message.php
+++ b/resources/lang/nl-NL/auth/message.php
@@ -6,16 +6,14 @@ return array(
     'account_not_found'      => 'De gebruikersnaam of het wachtwoord is niet juist.',
     'account_not_activated'  => 'Deze gebruikersaccount is niet actief.',
     'account_suspended'      => 'Deze gebruikersaccount is vergrendeld.',
-    'account_banned'         => 'Deze gebruikersaccount is geband.',
-    'throttle'               => 'Te veel mislukte inlog pogingen. Probeer het over :minuten opnieuw.',
 
     'two_factor' => array(
         'already_enrolled'      => 'Je apparaat is al uitgeleverd.',
         'success'               => 'U bent succesvol ingelogd.',
         'code_required'         => 'Tweestapsverificatie code is vereist.',
         'invalid_code'          => 'Tweestapsverificatie code is ongeldig.',
-        'enter_two_factor_code' => 'Please enter your two-factor authentication code.',
-        'please_enroll'         => 'Please enroll a device in two-factor authentication.',
+        'enter_two_factor_code' => 'Voer je tweestaps verificatiecode in.',
+        'please_enroll'         => 'Registreer een apparaat voor twee-factor-authenticatie.',
     ),
 
     'signin' => array(
diff --git a/resources/lang/nl-NL/button.php b/resources/lang/nl-NL/button.php
index 2756069bcc..a8616ccc6f 100644
--- a/resources/lang/nl-NL/button.php
+++ b/resources/lang/nl-NL/button.php
@@ -7,6 +7,7 @@ return [
     'checkin_and_delete'  	    => 'Check Alles In / Verwijder Gebruiker',
     'delete'  	                => 'Verwijder',
     'edit'    	                => 'Bewerk',
+    'clone'    	                => 'Dupliceren',
     'restore' 	                => 'Herstel',
     'remove'                    => 'Verwijder',
     'request'                   => 'Aanvraag',
@@ -21,4 +22,13 @@ return [
     'add_maintenance'           => 'Onderhoud toevoegen',
     'append'                    => 'Aanvullen',
     'new'                       => 'Nieuw',
+    'var' => [
+        'clone'     => 'Dupliceer :item_type',
+        'edit'      => ':item_type bewerken',
+        'delete'    => ':item_type verwijderen',
+        'restore'   => 'Herstel :item_type',
+        'create'    => 'Nieuw :item_type aanmaken',
+        'checkout'  => 'Checkout :item_type',
+        'checkin'   => 'Check-in :item_type',
+    ]
 ];
diff --git a/resources/lang/nl-NL/general.php b/resources/lang/nl-NL/general.php
index 24908b9fa6..56a33523a5 100644
--- a/resources/lang/nl-NL/general.php
+++ b/resources/lang/nl-NL/general.php
@@ -10,10 +10,10 @@ return [
     'action'                => 'Actie',
     'activity_report'		=> 'Activiteitenrapportage',
     'address'				=> 'Adres',
-    'admin'					=> 'Beheerder',
-    'admin_tooltip'			=> 'This user has admin privileges',
+    'admin'					=> 'Beheerder Instellingen',
+    'admin_tooltip'			=> 'Deze gebruiker heeft beheerdersrechten',
     'superuser'				=> 'Superuser',
-    'superuser_tooltip'		=> 'This user has superuser privileges',
+    'superuser_tooltip'		=> 'Deze gebruiker heeft superuser rechten',
     'administrator'			=> 'Beheerder',
     'add_seats'             => 'Toegevoegde plekken',
     'age'                   => "Leeftijd",
@@ -23,13 +23,16 @@ return [
     'asset_models'			=> 'Asset modellen',
     'asset_model'			=> 'Model',
     'asset'					=> 'Asset',
+    'asset_previous'        => 'Activa (Eerder Toegewezen)',
     'asset_report'          => 'Asset Rapport',
     'asset_tag'				=> 'Asset Tag',
     'asset_tags'            => 'Asset Tags',
     'assets_available'		=> 'Beschikbare activa',
     'accept_assets'         => 'Accepteer activa :name',
     'accept_assets_menu'    => 'Activa accepteren',
+    'accept_item'           => 'Accepteer item',
     'audit'				    => 'Audit',
+    'audits'				=> 'Audits',
     'audit_report'			=> 'Auditlogboek',
     'assets'				=> 'Activa',
     'assets_audited'        => 'objecten gecontroleerd',
@@ -61,9 +64,12 @@ return [
     'changepassword'  		=> 'Wachtwoord wijzigen',
     'checkin'  				=> 'Check in',
     'checkin_from'  		=> 'Check in van',
+    'checkin_note'  		=> 'Checkin Note',
+    'checkout_note'  		=> 'Checkout Note',
     'checkout'  			=> 'Check uit',
     'checkouts_count'       => 'Check-uit\'s',
     'checkins_count'        => 'Check in\'s',
+    'checkin_and_delete'  	=> 'Inchecken en verwijderen',
     'user_requests_count'   => 'Aanvragen',
     'city'  				=> 'Plaats',
     'click_here'			=> 'Klik hier',
@@ -77,7 +83,7 @@ return [
     'consumables'			=> 'Verbruiksartikelen',
     'country'  				=> 'Land',
     'could_not_restore'     => 'Fout herstellen :item_type: :error',
-    'not_deleted'           => 'De :item_type is niet verwijderd, het kan niet worden hersteld',
+    'not_deleted'           => 'De :item_type is niet verwijderd en kan daarom niet worden hersteld',
     'create'				=> 'Nieuwe aanmaken',
     'created'               => 'Item aangemaakt',
     'created_asset'			=> 'aangemaakt asset',
@@ -86,11 +92,13 @@ return [
     'record_created' 		=> 'Record gemaakt',
     'updated_at' 			=> 'Bijgewerkt op',
     'currency'  			=> '$', // this is deprecated
+    'currency_text'  		=> 'Valuta', //
     'current'  				=> 'Huidige',
     'current_password'      => 'Huidig wachtwoord',
     'customize_report'      => 'Rapport aanpassen',
     'custom_report'         => 'Aangepaste Asset Rapport',
     'dashboard'				=> 'Dashboard',
+    'data_source'           => 'Databron',
     'days'      			=> 'dagen',
     'days_to_next_audit'    => 'Dagen tot de volgende controle',
     'date'					=> 'Datum',
@@ -98,7 +106,7 @@ return [
     'debug_warning_text'    => 'Deze applicatie draait in productie modus met foutopsporing ingeschakeld. Dit kan betekenen dat mogelijk gevoelige gegevens zichtbaar zijn voor de buitenwereld. Schakel foutopsporing uit door de <code>APP_DEBUG</code> variabele in je <code>.env</code> bestand op <code>false</code> te zetten.',
     'delete'  				=> 'Verwijder',
     'delete_confirm'  		=> 'Weet u zeker dat u :item wilt verwijderen?',
-    'delete_confirm_no_undo' => 'Weet je zeker dat je :item wilt verwijderen? Dit kan niet ongedaan gemaakt worden.',
+    'delete_confirm_no_undo' => 'Weet je zeker dat je :item wilt verwijderen? Dit kan niet ongedaan worden gemaakt.',
     'deleted'  				=> 'Verwijderd',
     'delete_seats'  		=> 'Verwijderde plekken',
     'deletion_failed'       => 'Verwijderen mislukt',
@@ -114,29 +122,13 @@ return [
     'editprofile'  			=> 'Bewerk jouw profiel',
     'eol'					=> 'EOL',
     'email_domain'			=> 'E-maildomein',
-    'email_format'			=> 'E-mailindeling',
     'employee_number'       => 'Personeelsnummer',
     'email_domain_help'		=> 'Dit wordt gebruikt voor het genereren van e-mailadressen bij het importeren',
     'error'				    => 'Foutmelding',
     'exclude_archived'      => 'Gearchiveerde activa uitsluiten',
     'exclude_deleted'       => 'Verwijderde activa uitsluiten',
     'example'				=> 'Voorbeeld: ',
-    'filastname_format'			=> 'Eerste Initiaal Achternaam (jsmith@example.com)',
-    'firstname_lastname_format'	=> 'Voornaam Achternaam (jane.smith@example.com)',
-    'firstname_lastname_underscore_format' => 'Voornaam Achternaam (nomen.nescio@voorbeeld.nl)',
-    'lastnamefirstinitial_format' =>  'Achternaam eerste initiaal (nescion@voorbeeld.nl)',
-    'firstintial_dot_lastname_format' => 'Eerste Initiaal Achternaam (j.smith@example.com)',
-    'firstname_lastname_display'	=> 'Voornaam Achternaam (Jane Smith)',
-    'lastname_firstname_display'	=> 'Achternaam Voornaam (Smith Jane)',
-    'name_display_format'	=> 'Weergave naam',
-    'first'					=> 'Eerste',
-    'firstnamelastname'     => 'Voornaam Achternaam (janesmith@example.com)',
-    'lastname_firstinitial' => 'Achternaam eerste initiaal (smith_j@example.com)',
-    'firstinitial.lastname' => 'Eerste initiaal achternaam (j.smith@example.com)',
-    'firstnamelastinitial'  => 'Voornaam Initiaal Achternaam (janes@voorbeeld.com)',
-    'lastnamefirstname'      => 'Last Name First Name (smith.jane@example.com)',
-    'first_name'			=> 'Voornaam',
-    'first_name_format'		=> 'Voornaam (jane@example.com)',
+
     'files'                 => 'Bestanden',
     'file_name'				=> 'Bestand',
     'file_type'             => 'Bestandstype',
@@ -156,9 +148,9 @@ return [
     'image_delete'         	=> 'Afbeelding verwijderen',
     'include_deleted'       => 'Verwijderde activa opnemen',
     'image_upload'         	=> 'Afbeelding uploaden',
-    'filetypes_accepted_help'    => 'Geaccepteerde bestandstype is :types. Maximale toegestane uploadgrootte is :size.|Geaccepteerde bestandstypen zijn :types. Maximale uploadgrootte is :size.',
-    'filetypes_size_help'   => 'Maximale toegestane uploadgrootte is :size.',
-    'image_filetypes_help'  => 'Accepted filetypes are jpg, webp, png, gif, svg, and avif. Max upload size allowed is :size.',
+    'filetypes_accepted_help'    => 'Geaccepteerde bestandstype is :types. De maximale toegestane grootte is :size.|Geaccepteerde bestandstypen zijn :types. De maximale uploadgrootte is :size.',
+    'filetypes_size_help'   => 'De maximale uploadgrootte is :size.',
+    'image_filetypes_help'  => 'Geaccepteerde bestandstypen zijn jpg, webp, png, gif, svg en avif. De maximale toegestane bestandsgrootte is :size.',
     'unaccepted_image_type'  => 'Dit afbeeldingsbestand is niet leesbaar. Geaccepteerde bestandstypen zijn jpg, webp, png, gif en svg. Het mimetype van dit bestand is: :mimetype.',
     'import'         	    => 'Importeer',
     'import_this_file'      => 'Kaart velden en verwerk dit bestand',
@@ -178,12 +170,17 @@ return [
     'last'					=> 'Laatste',
     'last_login'            => 'Laatst ingelogd',
     'last_name'             => 'Achternaam',
+    'firstname_lastname_display'	=> 'Voornaam Achternaam (Jane Smith)',
+    'lastname_firstname_display'	=> 'Achternaam Voornaam (Smith Jane)',
+    'name_display_format'	=> 'Weergave naam',
+    'first'					=> 'Eerste',
+    'first_name'			=> 'Voornaam',
     'license'				=> 'Licentie',
     'license_report'        => 'Licentierapport',
     'licenses_available'	=> 'Beschikbare licenties',
     'licenses'				=> 'Licenties',
     'list_all'				=> 'Toon Alles',
-    'loading'				=> 'Laden... even geduld....',
+    'loading'				=> 'Laden... even geduld...',
     'lock_passwords'        => 'Dit veld zal niet worden opgeslagen in een demo installatie.',
     'feature_disabled'      => 'Deze functionaliteit is uitgeschakeld voor de demonstratie installatie.',
     'location'              => 'Locatie',
@@ -206,8 +203,8 @@ return [
     'new_password'          => 'Nieuw wachtwoord',
     'next'					=> 'Volgende',
     'next_audit_date'		=> 'Volgende datum van de Audit',
-    'next_audit_date_help'  => 'If you use auditing in your organization, this is usually automatically calculated based on the asset&apos;s last audit date and audit frequency (in <code>Admin Settings &gt; Alerts</code>) and you can leave this blank. You can manually set this date here if you need to, but it must be later than the last audit date. ',
-    'audit_images_help'     => 'You can find audit images in the asset\'s history tab.',
+    'next_audit_date_help'  => 'Als u auditcontrole in uw organisatie gebruikt, dit wordt meestal automatisch berekend op basis van de asset&apos;s laatste audit datum en audit frequentie (in <code>Admin Instellingen &gt; Notificaties</code>) en u kunt dit leeg laten. U kunt hier handmatig deze datum instellen indien nodig, maar het moet later zijn dan de laatste audit datum. ',
+    'audit_images_help'     => 'U vindt audit afbeeldingen op het tabblad historie van het asset.',
     'no_email'              => 'Er is geen e-mailadres gekoppeld aan deze gebruiker',
     'last_audit'		    => 'Laatste controle',
     'new'					=> 'nieuw!',
@@ -215,6 +212,14 @@ return [
     'no_results'			=> 'Geen resultaten.',
     'no'  					=> 'Nee',
     'notes'  				=> 'Notities',
+    'note_added'            => 'Notitie toegevoegd',
+    'options'				=> 'Opties',
+    'preview'				=> 'Voorbeeld',
+    'add_note'              => 'Notitie toevoegen',
+    'note_edited'            => 'Notitie aangepast',
+    'edit_note'              => 'Notitie aanpassen',
+    'note_deleted'            => 'Notitie verwijderd',
+    'delete_note'              => 'Notitie verwijderen',
     'order_number'          => 'Bestelnummer',
     'only_deleted'          => 'Alleen verwijderde activa',
     'page_menu'				=> '_MENU_ items worden weergegeven',
@@ -229,7 +234,7 @@ return [
     'purchase_date'         => 'Aankoopdatum',
     'qty'		            => 'Stks',
     'quantity'		        => 'Aantal',
-    'quantity_minimum'      => 'Je hebt :count items onder of bijna onder de minimale hoeveelheid',
+    'quantity_minimum'      => 'U hebt één artikel dat onder of bijna onder het minimum aantal ligt|U hebt :count artikelen die onder of bijna onder het minimum aantal liggen',
     'quickscan_checkin'  	=> 'Snelle Scan Checkin',
     'quickscan_checkin_status'  	=> 'Checkin Status',
     'ready_to_deploy'		=> 'Klaar voor uitgifte',
@@ -240,21 +245,21 @@ return [
     'restored'				=> 'hersteld',
     'restore'				=> 'Herstel',
     'requestable_models'    => 'Aanvraagbare modellen',
-    'requestable_items'     => 'Requestable Items',
+    'requestable_items'     => 'Aanvraagbare items',
     'requested'				=> 'Aangevraagd',
     'requested_date'        => 'Aangevraagde datum',
     'requested_assets'      => 'Aangevraagd activa',
     'requested_assets_menu' => 'Aangevraagde activa',
     'request_canceled'      => 'Aanvraag geannuleerd',
-    'request_item'          => 'Request this item',
-    'external_link_tooltip' => 'External link to',
+    'request_item'          => 'Dit item aanvragen',
+    'external_link_tooltip' => 'Externe link naar',
     'save'  				=> 'Opslaan',
     'select_var'            => 'Selecteer :thing... ', // this will eventually replace all of our other selects
     'select'				=> 'Selecteer',
     'select_all'            => 'Alles selecteren',
     'search'				=> 'Zoeken',
     'select_category'       => 'Selecteer een categorie',
-    'select_datasource' => 'Selecteer een bron',
+    'select_datasource' => 'Selecteer een gegevensbron',
     'select_department'     => 'Selecteer de afdeling',
     'select_depreciation'	=> 'Selecteer een afschrijvingstype',
     'select_location'		=> 'Selecteer een locatie',
@@ -279,8 +284,10 @@ return [
     'site_name'				=> 'Sitenaam',
     'state'  				=> 'Status',
     'status_labels'			=> 'Statuslabels',
+    'status_label'			=> 'Status label',
     'status'    			=> 'Status',
     'accept_eula'           => 'Aanvaarding overeenkomst',
+    'show_or_hide_eulas' => 'EULA\'s tonen/verbergen',
     'supplier'              => 'Leverancier',
     'suppliers'  			=> 'Leveranciers',
     'sure_to_delete'        => 'Weet u zeker dat u wilt verwijderen',
@@ -296,15 +303,15 @@ return [
     'type'  				=> 'Type',
     'undeployable'			=> 'Niet-uitgeefbaar',
     'unknown_admin'			=> 'Onbekende Beheerder',
-    'username_format'		=> 'Gebruikersnaam indeling',
     'username'              => 'Gebruikersnaam',
     'update'                => 'Bijwerken',
+    'updating_item' => 'Updating :item',
     'upload_filetypes_help'      => 'Toegestane bestandstypen zijn png, gif, jpg, jpeg, doc, docx, pdf, xlsx, txt, lic, xml, zip, rtf en rar. Maximale toegestane uploadgrootte is :size.',
     'uploaded'              => 'Geupload',
     'user'					=> 'Gebruiker',
     'accepted'			    => 'geaccepteerd',
     'declined'			    => 'afgewezen',
-    'declined_note'         => 'Declined Notes',
+    'declined_note'         => 'Geweigerde notities',
     'unassigned'            => 'Niet-toegewezen',
     'unaccepted_asset_report' => 'Niet-geaccepteerde activa',
     'users'                 => 'Gebruikers',
@@ -323,10 +330,10 @@ return [
     'token_expired'         => 'Je sessie is verlopen. Probeer het nogmaals.',
     'login_enabled'         => 'Login ingeschakeld',
     'audit_due'             => 'Klaar voor audit',
-    'audit_due_days'        => 'Assets Due for Audit binnen :days dagen|Te betalen activa binnen :days dagen',
+    'audit_due_days'        => '{}Activa die binnenkort of te laat moeten worden gecontroleerd|[1]Activa die binnen een dag moeten worden gecontroleerd|[2,*]Activa die binnen :days moeten worden gecontroleerd',
     'checkin_due'           => 'Inchecken is vereist',
     'checkin_overdue'       => 'Te laat voor inchecken',
-    'checkin_due_days'      => 'Inchecken binnen :days Dagelijkse|Assets Te betalen binnen :days dagen',
+    'checkin_due_days'      => '{}Due for Checkin|[1]Assets Due for Checkin Within :days Day|[2,*]Assets Due for Checkin Within :days Days',
     'audit_overdue'         => 'Over tijd voor audit',
     'accept'                => 'Accepteer :asset',
     'i_accept'              => 'Ik accepteer',
@@ -340,7 +347,7 @@ return [
     'hide_deleted'          => 'Verberg verwijderde',
     'email'                 => 'E-mailadres',
     'do_not_change'         => 'Niet wijzigen',
-    'bug_report'            => 'Een fout melden',
+    'bug_report'            => 'Fout (bug) rapporteren',
     'user_manual'           => 'Gebruiker\'s Handleiding',
     'setup_step_1'          => 'Stap 1',
     'setup_step_2'          => 'Stap 2',
@@ -348,7 +355,7 @@ return [
     'setup_step_4'          => 'Stap 4',
     'setup_config_check'    => 'Configuratie Controle',
     'setup_create_database' => 'Database tabellen aanmaken',
-    'setup_create_admin'    => 'Maak beheerder aan',
+    'setup_create_admin'    => 'Maak een admin gebruiker aan',
     'setup_done'            => 'Klaar!',
     'bulk_edit_about_to'    => 'Je staat op het punt om het volgende te bewerken: ',
     'checked_out'           => 'Uitgecheckt',
@@ -383,6 +390,8 @@ return [
     'new_license'           => 'Nieuwe licentie',
     'new_accessory'         => 'Nieuwe accessoire',
     'new_consumable'        => 'Nieuw verbruiksartikel',
+    'new_component'         => 'New Component',
+    'new_user'              => 'Nieuwe Gebruiker',
     'collapse'              => 'Samenvouwen',
     'assigned'              => 'Toegewezen',
     'asset_count'           => 'Asset aantal',
@@ -405,9 +414,9 @@ return [
     'accessory_name'       => 'Accessoire naam:',
     'clone_item'            => 'Item dupliceren',
     'checkout_tooltip' => 'Check dit item uit',
-    'checkin_tooltip' => 'Check this item in so that it is available for re-issue, re-imaging, etc',
+    'checkin_tooltip' => 'Check dit item in zodat het beschikbaar is om opnieuw uit te checken, opnieuw te imagen, etc',
     'checkout_user_tooltip' => 'Check dit item uit aan een gebruiker',
-    'checkin_to_diff_location' => 'You can choose to check this asset in to a location other than this asset\'s default location of :default_location if one is set',
+    'checkin_to_diff_location' => 'U kunt dit product inchecken op een andere locatie dan de standaard locatie van :default_location in dit asset als deze is ingesteld',
     'maintenance_mode'      => 'De service is tijdelijk niet beschikbaar voor systeemupdates. Probeer het later nog eens.',
     'maintenance_mode_title' => 'Dienst tijdelijk niet beschikbaar',
     'ldap_import'           => 'Het gebruikerswachtwoord mag niet worden beheerd door LDAP. (Hiermee kun je vergeten wachtwoord aanvragen verzenden.)',
@@ -418,19 +427,20 @@ return [
     'bulk_soft_delete'      =>'Ook deze gebruikers zacht verwijderen. Hun bezitting geschiedenis blijft intact tenzij u verwijderde records verwijderd in de Admin Instellingen.',
     'bulk_checkin_delete_success' => 'Uw geselecteerde gebruikers zijn verwijderd en hun artikelen zijn ingecheckt.',
     'bulk_checkin_success' => 'De artikelen voor de geselecteerde gebruikers zijn ingecheckt.',
-    'set_to_null'           => 'Waarden voor deze bezittingľWaarden verwijderen voor alle :asset_count bezittingen ',
+    'set_to_null'           => 'Waarden verwijderen voor deze selectie|Verwijder waarden voor alle :selection_count selecties ',
     'set_users_field_to_null'  => 'Verwijder :field waardes voor deze gebruiker|Verwijder :field waardes voor alle :user_count gebruikers ',
     'na_no_purchase_date'   => 'N.v.t. - Geen aankoopdatum opgegeven',
     'assets_by_status'      => 'Active op status',
     'assets_by_status_type'      => 'Active op statustype',
     'pie_chart_type'        => 'Dashboard cirkeldiagram type',
     'hello_name'            => 'Welkom :name!',
-    'unaccepted_profile_warning'   => 'Je hebt :count artikelen die acceptatie vereisen. Klik hier om ze te accepteren of te weigeren',
+    'unaccepted_profile_warning'   => 'U heeft één item dat acceptatie vereist. Klik hier om het te accepteren of te weigeren|Je hebt :count items die acceptatie vereisen. Klik hier om te accepteren of te weigeren',
     'start_date'            => 'Begindatum',
     'end_date'            => 'Einddatum',
     'alt_uploaded_image_thumbnail' => 'Upload mini-afbeelding',
     'placeholder_kit'       => 'Selecteer een set',
     'file_not_found'        => 'Bestand niet gevonden',
+    'log_record_not_found'  => 'No record for that log entry was found.',
     'preview_not_available' => '(geen voorbeeld)',
     'setup'                 => 'Installeren',
     'pre_flight'            => 'Pre-Flight',
@@ -508,11 +518,11 @@ return [
         'address2' => 'Adresregel 2',
         'import_note' => 'Geïmporteerd met csv-bestand',
     ],
-    'remove_customfield_association' => 'Remove this field from the fieldset. This will not delete the custom field, only this field\'s association with this fieldset.',
-    'checked_out_to_fields' => 'Checked Out To Fields',
+    'remove_customfield_association' => 'Verwijder dit veld uit de veldenset. Dit zal niet verwijderen van het aangepaste veld, alleen dit veld associatie met deze veldset.',
+    'checked_out_to_fields' => 'Uitgecheckt aan velden',
     'percent_complete' => '% voltooid',
     'uploading' => 'Uploaden... ',
-    'upload_error' => 'Fout bij het uploaden. Controleer of er geen lege rijen zijn en dat er geen kolomnamen zijn gedupliceerd.',
+    'upload_error' => 'Error uploading file. Please check that you have no empty rows or duplicated column names in your CSV, and that the server permissions allow uploads.',
     'copy_to_clipboard' => 'Kopiëren naar klembord',
     'copied' => 'Gekopieerd!',
     'status_compatibility' => 'Als assets al zijn toegewezen, kunnen ze niet worden gewijzigd in een niet-deploybaar statustype en deze wijziging van waarde zal worden overgeslagen.',
@@ -528,7 +538,7 @@ return [
     'permission_denied_superuser_demo' => 'Toestemming geweigerd. U kunt geen gebruikersinformatie voor superadmins op de demo bijwerken.',
     'pwd_reset_not_sent' => 'Gebruiker is niet geactiveerd, wordt LDAP-gesynchroniseerd of heeft geen e-mailadres',
     'error_sending_email' => 'Fout bij verzenden e-mail',
-    'sad_panda' => 'Sad panda. You are not authorized to do the thing. Maybe <a href=":link">return to the dashboard</a>, or contact your administrator.',
+    'sad_panda' => 'Verdrietige panda. U bent niet gemachtigd om het ding te doen. <a href=":link">Ga terug naar het dashboard</a>of neem contact op met uw beheerder.',
     'bulk' => [
             'delete' =>
                 [
@@ -549,6 +559,71 @@ return [
         'license_seats'  => ':count Licentie Zater|:count Licentie zitplaatsen',
         'consumables'  => ':count Verbruiksverbruiker|:count Verbruiksartikelen',
         'components'  => ':count Component|:count componenten',
-    ]
+    ],
+
+    'more_info' => 'Meer Info',
+    'quickscan_bulk_help' => 'Als u dit selectievakje aanvinkt, wordt het asset record bewerkt om deze nieuwe locatie te weerspiegelen. Als u het uitgevinkt laat staan ziet u de locatie in het audit logboek. Let op dat als dit asset is uitgecheckt, dan zal de locatie van de persoon, product of locatie waar het uitgecheckt is niet veranderen.',
+    'whoops' => 'Oeps!',
+    'something_went_wrong' => 'Er ging iets mis met uw verzoek.',
+    'close' => 'Sluiten',
+    'expires' => 'Verloopt',
+    'map_fields'=> 'Map :item_type Velden',
+    'remaining_var' => ':count resterend',
+    'label' => 'Label',
+    'import_asset_tag_exists' => 'Een asset met de asset tag :asset_tag bestaat al en een update is niet aangevraagd. Er is geen wijziging aangebracht.',
+    'countries_manually_entered_help' => 'De waarden met een asterisk (*) zijn handmatig ingevoerd en komen niet overeen met de bestaande ISO 3166 dropdown waarden',
+    'accessories_assigned' => 'Toegekende accessoires',
+    'user_managed_passwords' => 'Wachtwoordbeheer',
+    'user_managed_passwords_disallow' => 'Gebruikers niet toestaan hun eigen wachtwoorden te beheren',
+    'user_managed_passwords_allow' => 'Gebruikers toestaan hun eigen wachtwoorden te beheren',
+    'from' => 'Van',
+    'by' => 'Door',
+
+// Add form placeholders here
+    'placeholders' => [
+        'notes'  => 'Notitie toevoegen',
+    ],
+
+    'breadcrumb_button_actions' => [
+        'edit_item' => 'Edit :name',
+        'checkout_item' => 'Checkout :name',
+        'checkin_item' => 'Checkin :name',
+    ],
+
+    'skins' => [
+        'site_default' => 'Site Standaard',
+        'default_blue' => 'Standaard Blauw',
+        'blue_dark' => 'Blauw (Donkere Modus)',
+        'green' => 'Groen Donker',
+        'green_dark' => 'Groen (Donkere Modus)',
+        'red' => 'Rood Donker',
+        'red_dark' => 'Rood (Donkere Modus)',
+        'orange' => 'Oranje Donker',
+        'orange_dark' => 'Oranje (Donkere Modus)',
+        'black' => 'Zwart',
+        'black_dark' => 'Zwart (Donkere Modus)',
+        'purple' => 'Paars',
+        'purple_dark' => 'Paars (Donkere Modus)',
+        'yellow' => 'Geel',
+        'yellow_dark' => 'Geel (Donkere Modus)',
+        'high_contrast' => 'Hoog Contrast',
+
+    ],
+
+    'select_all_none' => 'Selecteer/Deselecteer Alles',
+    'generic_model_not_found' => 'Dat :model is niet gevonden of u hebt geen toestemming om het te openen',
+    'deleted_models' => 'Verwijderde Activamodellen',
+    'deleted_users' => 'Verwijderde Gebruikers',
+    'cost_each' => ':amount elk',
+    'remove_current_image' => 'Verwijder huidige :type afbeelding',
+
+    'seeding' => [
+        'manufacturers' => [
+            'button' => 'Fabrikanten aanmaken',
+            'prompt' => 'U hebt nog geen fabrikanten. Wilt u een lijst met veelvoorkomende fabrikanten toevoegen? (DIT OVERSCHRIJFT BESTAANDE FABRIKANTEN, inclusief fabrikanten die zacht zijn verwijderd.)',
+            'success' => 'Manufacturers seeded successfully',
+            'error' => 'Could not seed manufacturers. A manufacturer record already exists and seeding would overwrite it.|Could not seed manufacturers. :count manufacturer records already exist and seeding would overwrite them.',
+        ],
+    ],
 
 ];
diff --git a/resources/lang/nl-NL/localizations.php b/resources/lang/nl-NL/localizations.php
index 0af43adbc1..ccc03f4c7a 100644
--- a/resources/lang/nl-NL/localizations.php
+++ b/resources/lang/nl-NL/localizations.php
@@ -2,7 +2,7 @@
 
 return [
 
-    'select_language' => 'Kies een taal',
+    'select_language' => 'Selecteer een taal',
     'languages' => [
         'en-US'=> 'Engels, VS',
         'en-GB'=> 'Engels, VK',
@@ -40,7 +40,9 @@ return [
         'ms-MY'=> 'Maleis',
         'mi-NZ'=> 'Maori',
         'mn-MN'=> 'Mongools',
-        'no-NO'=> 'Noors',
+        'nb-NO'=> 'Noors Bokmål',
+        'om-ET' => 'Oromo (Ethiopian)',
+        //'nn-NO'=> 'Norwegian Nynorsk',
         'fa-IR'=> 'Perzisch',
         'pl-PL'=> 'Pools',
         'pt-PT'=> 'Portugees',
@@ -66,7 +68,7 @@ return [
         'zu-ZA'=> 'Zoeloe',
     ],
 
-    'select_country' => 'Selecteer een land',
+    'select_country' => 'Selecteer een Land',
     
     'countries' => [
         'AC'=>'Ascensie Eiland',
@@ -133,6 +135,7 @@ return [
         'EC'=>'Ecuador',
         'EE'=>'Estland',
         'EG'=>'Egypte',
+        'GB-ENG'=>'Engeland',
         'ER'=>'Eritrea',
         'ES'=>'Spanje',
         'ET'=>'Ethiopië',
@@ -231,6 +234,7 @@ return [
         'NG'=>'Nigeria',
         'NI'=>'Nicaragua',
         'NL'=>'Nederland',
+        'GB-NIR' => 'Noord-Ierland',
         'NO'=>'Noorwegen',
         'NP'=>'Nepal',
         'NR'=>'Nauru',
@@ -258,7 +262,7 @@ return [
         'RU'=>'Rusland',
         'RW'=>'Rwanda',
         'SA'=>'Saoedi-Arabië',
-        'UK'=>'Schotland',
+        'GB-SCT'=>'Schotland',
         'SB'=>'Solomon eilanden',
         'SC'=>'Seychellen',
         'SS'=>'Zuid-Soedan',
@@ -310,6 +314,7 @@ return [
         'VI'=>'Amerikaanse Maagdeneilanden',
         'VN'=>'Vietnam',
         'VU'=>'Vanuatu',
+        'GB-WLS' =>'Wales',
         'WF'=>'Wallis en Futuna eilanden',
         'WS'=>'Samoa',
         'YE'=>'Jemen',
diff --git a/resources/lang/nl-NL/mail.php b/resources/lang/nl-NL/mail.php
index 41ed546cdf..aa693f223d 100644
--- a/resources/lang/nl-NL/mail.php
+++ b/resources/lang/nl-NL/mail.php
@@ -23,24 +23,25 @@ return [
     'Item_Requested' => 'Item aangevraagd',
     'License_Checkin_Notification' => 'Licentie ingecheckt',
     'License_Checkout_Notification' => 'Licentie gecontroleerd',
+    'license_for'   => 'Licentie voor',
     'Low_Inventory_Report' => 'Lage inventarisrapport',
     'a_user_canceled' => 'Een gebruiker heeft een verzoek om een item op de website geannuleerd',
     'a_user_requested' => 'Een gebruiker heeft een item op de website aangevraagd',
     'acceptance_asset_accepted' => 'Een gebruiker heeft een artikel geaccepteerd',
     'acceptance_asset_declined' => 'Een gebruiker heeft een artikel geweigerd',
-    'accessory_name' => 'Accessoire Naam:',
-    'additional_notes' => 'Aanvullende Notities:',
+    'accessory_name' => 'Accessoirenaam',
+    'additional_notes' => 'Aanvullende Notities',
     'admin_has_created' => 'Een beheerder heeft een account voor u aangemaakt op de :web website.',
-    'asset' => 'Asset:',
-    'asset_name' => 'Asset naam:',
+    'asset' => 'Asset',
+    'asset_name' => 'Asset naam',
     'asset_requested' => 'Asset aangevraagd',
     'asset_tag' => 'Asset Tag',
     'assets_warrantee_alert' => 'Er is :count asset met een garantie die afloopt in de volgende :threshold dagen.|Er zijn :count assets met garanties die vervallen in de volgende :threshold dagen.',
     'assigned_to' => 'Toegewezen aan',
     'best_regards' => 'Met vriendelijke groeten,',
-    'canceled' => 'Geannuleerd:',
-    'checkin_date' => 'Datum ingecheckt:',
-    'checkout_date' => 'Datum uitgecheckt:',
+    'canceled' => 'Geannuleerd',
+    'checkin_date' => 'Ingecheckt datum',
+    'checkout_date' => 'Uitcheck datum',
     'checkedout_from' => 'Uitgecheckt van',
     'checkedin_from'  => 'Ingecheckt op',
     'checked_into' => 'Ingecheckt bij',
@@ -49,27 +50,30 @@ return [
     'click_to_confirm' => 'Klik op de volgende link om uw :web account te bevestigen:',
     'current_QTY' => 'Huidige hoeveelheid',
     'days' => 'Dagen',
-    'expecting_checkin_date' => 'Verwachte incheck datum:',
+    'expecting_checkin_date' => 'Verwachte incheck datum',
     'expires' => 'Verloopt',
     'hello' => 'Hallo',
     'hi' => 'Hoi',
     'i_have_read' => 'Ik heb de gebruiksvoorwaarden gelezen en geaccepteerd en heb dit item ontvangen.',
     'inventory_report' => 'Inventarisrapport',
-    'item' => 'Item:',
+    'item' => 'Item',
+    'item_checked_reminder' => 'Dit is een herinnering dat je op dit moment :count items uitgecheckt hebt die je niet hebt geaccepteerd of geweigerd. Klik op de onderstaande link om uw besluit te bevestigen.',
     'license_expiring_alert' => 'Er is :count licentie die afloopt in de volgende :threshold dagen.|Er zijn :count licenties die vervallen in de volgende :threshold dagen.',
     'link_to_update_password' => 'Klik op de volgende link om je :web wachtwoord te vernieuwen:',
-    'login' => 'Login:',
+    'login' => 'Inloggen',
     'login_first_admin' => 'Meld u aan op uw nieuwe Snipe-IT installatie met onderstaande inloggegevens:',
     'low_inventory_alert' => 'Er is :count item dat onder de minimumvoorraad ligt of binnenkort laag zal zijn.|Er zijn :count items die onder de minimumvoorraad zijn of binnenkort laag zullen zijn.',
     'min_QTY' => 'Minimale hoeveelheid',
     'name' => 'Naam',
     'new_item_checked' => 'Een nieuw item is onder uw naam uitgecheckt, details staan hieronder.',
+    'new_item_checked_with_acceptance' => 'Er is een nieuw activa onder uw naam uitgecheckt dat moet worden geaccepteerd. Hieronder vindt u de details.',
+    'recent_item_checked' => 'Er is onlangs een activa onder uw naam uitgeleend dat moet worden geaccepteerd. Hieronder vindt u de details.',
     'notes' => 'Opmerkingen',
-    'password' => 'Wachtwoord:',
+    'password' => 'Wachtwoord',
     'password_reset' => 'Wachtwoord opnieuw instellen',
     'read_the_terms' => 'Lees alstublieft de onderstaande gebruiksovereenkomst.',
     'read_the_terms_and_click' => 'Gelieve de onderstaande gebruiksvoorwaarden te lezen, en klik op de link onderaan om te bevestigen dat je de gebruiksvoorwaarden leest en accepteert en het bestand hebt ontvangen.',
-    'requested' => 'Aangevraagd:',
+    'requested' => 'Aangevraagd',
     'reset_link' => 'Je Wachtwoord Herstel Link',
     'reset_password' => 'Klik hier om uw wachtwoord opnieuw in te stellen:',
     'rights_reserved' => 'Alle rechten voorbehouden.',
@@ -86,8 +90,10 @@ return [
     'upcoming-audits' => 'Er is :count asset die binnen :threshold dagen gecontroleerd moet worden.|Er zijn :count assets die binnen :threshold dagen gecontroleerd moeten worden.',
     'user' => 'Gebruiker',
     'username' => 'Gebruikersnaam',
+    'unaccepted_asset_reminder' => 'Herinnering: U hebt Niet-geaccepteerde Asset.',
     'welcome' => 'Welkom :name',
     'welcome_to' => 'Welkom bij :web!',
     'your_assets' => 'Bekijk je activa',
     'your_credentials' => 'Je Snipe-IT inloggegevens',
+    'mail_sent' => 'Mail is succesvol verstuurd!',
 ];
diff --git a/resources/lang/nl-NL/table.php b/resources/lang/nl-NL/table.php
index 6260b042cc..fb4327a724 100644
--- a/resources/lang/nl-NL/table.php
+++ b/resources/lang/nl-NL/table.php
@@ -6,6 +6,6 @@ return array(
     'action' 		        => 'Actie',
     'by'      		        => 'Door',
     'item' 			        => 'Item',
-    'no_matching_records'   => 'No matching records found',
+    'no_matching_records'   => 'Geen overeenkomende records gevonden',
 
 );
diff --git a/resources/lang/nl-NL/validation.php b/resources/lang/nl-NL/validation.php
index 315895bdad..c7dd94e564 100644
--- a/resources/lang/nl-NL/validation.php
+++ b/resources/lang/nl-NL/validation.php
@@ -13,87 +13,150 @@ return [
     |
     */
 
-    'accepted'             => ':attribute moet geaccepteerd worden.',
-    'active_url'           => ':attribute is geen geldige URL.',
-    'after'                => ':attribute moet een datum zijn later dan :date.',
-    'after_or_equal'       => ':attribute moet een datum zijn later dan of gelijk aan :date.',
-    'alpha'                => ':attribute mag enkel letters bevatten.',
-    'alpha_dash'           => ':attribute mag enkel letters, cijfers of koppeltekens bevatten.',
-    'alpha_num'            => ':attribute mag enkel letters en cijfers bevatten.',
-    'array'                => ':attribute moet een array zijn.',
-    'before'               => ':attribute moet een datum zijn voor :date.',
-    'before_or_equal'      => ':attribute moet een datum zijn voor of gelijk aan :date.',
-    'between'              => [
-        'numeric' => ':attribute moet een waarde hebben tussen :min en :max.',
-        'file'    => ':attribute moet een waarde hebben tussen :min en :max kilobytes.',
-        'string'  => ':attribute moet tussen de :min en :max aantal karakters lang zijn.',
-        'array'   => ':attribute moet tussen de :min en :max items bevatten.',
+    'accepted' => ':attribute veld moet geaccepteerd worden.',
+    'accepted_if' => ':attribute veld moet geaccepteerd worden als :other :value is.',
+    'active_url' => ':attribute veld moet een geldige URL zijn.',
+    'after' => ':attribute veld moet een datum na :date zijn.',
+    'after_or_equal' => ':attribute veld moet een datum na of gelijk aan :date zijn.',
+    'alpha' => ':attribute veld mag alleen letters bevatten.',
+    'alpha_dash' => ':attribute veld mag alleen letters, cijfers, streepjes en onderstrepingstekens bevatten.',
+    'alpha_num' => ':attribute veld mag alleen letters en cijfers bevatten.',
+    'array' => ':attribute moet een array zijn.',
+    'ascii' => ':attribute veld mag alleen alfanumerieke tekens en symbolen bevatten.',
+    'before' => ':attribute veld moet een datum voor :date zijn.',
+    'before_or_equal' => ':attribute veld moet een datum voor of gelijk aan :date zijn.',
+    'between' => [
+        'array' => ':attribute veld moet tussen :min en :max items bevatten.',
+        'file' => ':attribute veld moet tussen :min en :max kilobytes zijn.',
+        'numeric' => ':attribute veld moet tussen de :min en de :max liggen.',
+        'string' => ':attribute veld moet tussen :min en :max karakters lang zijn.',
     ],
-    'boolean'              => ':attribute moet waar of onwaar zijn.',
-    'confirmed'            => ':attribute bevestiging komt niet overeen.',
-    'date'                 => ':attribute is geen geldige datum.',
-    'date_format'          => ':attribute komt niet overeen met het volgende formaat :format.',
-    'different'            => ':attribute en :other moeten verschillend zijn.',
-    'digits'               => ':attribute moet :digits cijfers lang zijn.',
-    'digits_between'       => ':attribute moet tussen de :min en :max cijfers bevatten.',
-    'dimensions'           => ':attribute heeft ongeldige afbeelding afmetingen.',
-    'distinct'             => ':attribute veld heeft een duplicaat waarde.',
-    'email'                => 'Het formaat van :attribute is ongeldig.',
-    'exists'               => 'Het geselecteerde kenmerk :attribute is ongeldig.',
-    'file'                 => ':attribute moet een bestand zijn.',
-    'filled'               => ':attribute veld moet een waarde hebben.',
-    'image'                => ':attribute moet een afbeelding zijn.',
+    'boolean' => ':attribute moet waar of onwaar zijn.',
+    'can' => ':attribute veld bevat een niet-geautoriseerde waarde.',
+    'confirmed' => ':attribute veld bevestiging komt niet overeen.',
+    'contains' => ':attribute veld mist een verplichte waarde.',
+    'current_password' => 'Het wachtwoord is onjuist.',
+    'date' => ':attribute veld moet een geldige datum zijn.',
+    'date_equals' => ':attribute moet een datum gelijk zijn aan :date.',
+    'date_format' => ':attribute veld moet overeenkomen met het formaat :format.',
+    'decimal' => ':attribute veld moet :decimale decimale plaatsen hebben.',
+    'declined' => ':attribute veld moet worden geweigerd.',
+    'declined_if' => ':attribute veld moet afgewezen worden als :other :value is.',
+    'different' => ':attribute veld en :other mag niet hetzelfde zijn.',
+    'digits' => ':attribute veld moet uit :digits cijfers bestaan.',
+    'digits_between' => ':attribute veld moet tussen de :min en :max cijfers zijn.',
+    'dimensions' => ':attribute veld heeft geen geldige afmetingen voor afbeeldingen.',
+    'distinct' => ':attribute veld heeft een duplicaat waarde.',
+    'doesnt_end_with' => ':attribute veld mag niet eindigen met één van de volgende: :values.',
+    'doesnt_start_with' => ':attribute veld mag niet beginnen met één van de volgende: :values.',
+    'email' => ':attribute veld moet een geldig e-mail adres zijn.',
+    'ends_with' => ':attribute veld moet eindigen met één van de volgende: :values.',
+    'enum' => 'Het geselecteerde kenmerk :attribute is ongeldig.',
+    'exists' => 'Het geselecteerde kenmerk :attribute is ongeldig.',
+    'extensions' => ':attribute veld moet een van de volgende extensies hebben: :values.',
+    'file' => ':attribute veld moet een bestand zijn.',
+    'filled' => ':attribute veld moet een waarde hebben.',
+    'gt' => [
+        'array' => 'Het :attribute veld moet meer dan :value items bevatten.',
+        'file' => 'Het :attribute veld moet groter zijn dan :value kilobytes.',
+        'numeric' => ':attribute veld moet groter zijn dan :value.',
+        'string' => 'Het veld :attribute moet meer dan :value karakters bevatten.',
+    ],
+    'gte' => [
+        'array' => 'Het :attribute veld moet :value of meer bevatten.',
+        'file' => 'Het veld :attribute moet groter of gelijk zijn aan :value kilobytes.',
+        'numeric' => ':attribute veld moet groter of gelijk zijn aan :value.',
+        'string' => 'Het veld :attribute moet :value of groter zijn.',
+    ],
+    'hex_color' => ':attribute veld moet een geldige hexadecimale kleur hebben.',
+    'image' => ':attribute veld moet een afbeelding zijn.',
     'import_field_empty'    => 'De waarde voor :fieldname kan niet leeg zijn.',
-    'in'                   => 'Het geselecteerde kenmerk :attribute is ongeldig.',
-    'in_array'             => ':attribute veld bestaat niet in :other.',
-    'integer'              => ':attribute moet van het type integer zijn.',
-    'ip'                   => ':attribute moet een geldig IP-adres zijn.',
-    'ipv4'                 => ':attribute moet een geldig IP-adres zijn.',
-    'ipv6'                 => ':attribute moet een geldig IPv6-adres zijn.',
-    'is_unique_department' => ':attribute moet uniek zijn voor deze bedrijfslocatie',
-    'json'                 => ':attribute moet valide JSON code zijn.',
-    'max'                  => [
-        'numeric' => ':attribute moet groter zijn dan :max.',
-        'file'    => ':attribute mag niet groter zijn dan :max kilobytes.',
-        'string'  => ':attribute mag niet langer zijn dan :max karakters.',
-        'array'   => ':attribute mag niet meer dan :max items bevatten.',
+    'in' => 'Het geselecteerde kenmerk :attribute is ongeldig.',
+    'in_array' => ':attribute veld moet bestaan in :other.',
+    'integer' => ':attribute veld moet een geheel getal zijn.',
+    'ip' => ':attribute veld moet een geldig IP-adres zijn.',
+    'ipv4' => ':attribute veld moet een geldig IPv4-adres zijn.',
+    'ipv6' => ':attribute veld moet een geldig IPv6-adres zijn.',
+    'json' => ':attribute veld moet een geldige JSON string zijn.',
+    'list' => ':attribute moet een lijst zijn.',
+    'lowercase' => ':attribute veld moet een kleine letters zijn.',
+    'lt' => [
+        'array' => 'Het :attribute veld moet minder dan :value items bevatten.',
+        'file' => 'Het :attribute veld moet kleiner zijn dan :value kilobytes.',
+        'numeric' => ':attribute veld moet kleiner zijn dan :value.',
+        'string' => ':attribute veld moet minder dan :value karakters bevatten.',
     ],
-    'mimes'                => ':attribute moet een bestand zijn van het type: :values.',
-    'mimetypes'            => ':attribute moet een bestand zijn van het type: :values.',
-    'min'                  => [
-        'numeric' => ':attribute moet minimum :min zijn.',
-        'file'    => ':attribute moet minstens :min kilobytes groot zijn.',
-        'string'  => ':attribute moet tenminste :min karakters bevatten.',
-        'array'   => ':attribute moet minimaal :min items bevatten.',
+    'lte' => [
+        'array' => 'Het :attribute veld mag niet meer dan :value items bevatten.',
+        'file' => 'Het veld :attribute moet kleiner of gelijk zijn aan :value kilobytes.',
+        'numeric' => ':attribute veld moet kleiner of gelijk zijn aan :value.',
+        'string' => 'Het veld :attribute moet minder of gelijk zijn aan :value tekens.',
     ],
-    'starts_with'          => ':attribute moet met één van de volgende waarden eindigen: :values.',
-    'ends_with'            => ':attribute moet met één van de volgende waarden eindigen: :values.',
+    'mac_address' => ':attribute veld moet een geldig MAC-adres zijn.',
+    'max' => [
+        'array' => ':attribute veld mag niet meer dan :max items bevatten.',
+        'file' => ':attribute veld mag niet groter zijn dan :max kilobytes.',
+        'numeric' => ':attribute veld mag niet groter zijn dan :max.',
+        'string' => ':attribute veld mag niet groter zijn dan :max tekens.',
+    ],
+    'max_digits' => ':attribute veld mag niet meer dan :max cijfers bevatten.',
+    'mimes' => ':attribute veld moet een bestand zijn van het type: :values.',
+    'mimetypes' => ':attribute veld moet een bestand zijn van het type: :values.',
+    'min' => [
+        'array' => ':attribute veld moet minstens :min items bevatten.',
+        'file' => ':attribute veld moet minstens :min kilobytes zijn.',
+        'numeric' => ':attribute veld moet minstens :min zijn.',
+        'string' => ':attribute veld moet minstens :min tekens bevatten.',
+    ],
+    'min_digits' => ':attribute veld moet minstens :min cijfers bevatten.',
+    'missing' => ':attribute moet ontbreken.',
+    'missing_if' => ':attribute veld moet ontbreken wanneer :other :value is.',
+    'missing_unless' => ':attribute veld moet ontbreken, tenzij :other gelijk is aan :value.',
+    'missing_with' => ':attribute veld moet ontbreken als :values aanwezig is.',
+    'missing_with_all' => ':attribute veld moet ontbreken wanneer :values aanwezig zijn.',
+    'multiple_of' => 'Het :attribute veld moet een veelvoud van :value zijn.',
+    'not_in' => 'Het geselecteerde kenmerk :attribute is ongeldig.',
+    'not_regex' => ':attribute veld formaat is ongeldig.',
+    'numeric' => ':attribute veld moet een getal zijn.',
+    'password' => [
+        'letters' => ':attribute moet minstens één letter bevatten.',
+        'mixed' => ':attribute veld moet minstens één hoofdletter en één kleine letter bevatten.',
+        'numbers' => ':attribute veld moet minstens één cijfer bevatten.',
+        'symbols' => ':attribute veld moet minstens één teken bevatten.',
+        'uncompromised' => 'Het gegeven :attribute is weergegeven in een gegevenslek. Kies een ander :attribuut.',
+    ],
+    'percent'       => 'Het afschrijvingsminimum moet tussen 0 en 100 liggen wanneer het afschrijvingstype procentueel is.',
 
-    'not_in'               => 'Het geselecteerde kenmerk :attribute is ongeldig.',
-    'numeric'              => ':attribute moet een getal zijn.',
-    'present'              => ':attribute veld moet aanwezig zijn.',
-    'valid_regex'          => 'Dit is geen geldige regex. ',
-    'regex'                => 'Het formaat van :attribute is ongeldig.',
-    'required'             => 'Het veld :attribute is verplicht.',
-    'required_if'          => 'het veld :attribute is verplicht als :other gelijk is aan :value.',
-    'required_unless'      => ':attribute veld is vereist tenzij :other is in :values.',
-    'required_with'        => 'Het veld :attribute is verplicht als :values ingesteld staan.',
-    'required_with_all'    => ':attribute veld is vereist wanneer :values aanwezig is.',
-    'required_without'     => 'Het veld :attribute is verplicht als :values niet ingesteld staan.',
+    'present' => ':attribute veld moet aanwezig zijn.',
+    'present_if' => ':attribute veld moet aanwezig zijn als :other :value is.',
+    'present_unless' => ':attribute veld moet aanwezig zijn tenzij :other gelijk is aan :value.',
+    'present_with' => ':attribute veld moet aanwezig zijn als :values aanwezig is.',
+    'present_with_all' => ':attribute veld moet aanwezig zijn wanneer :values aanwezig zijn.',
+    'prohibited' => ':attribute veld is verboden.',
+    'prohibited_if' => ':attribute veld is verboden wanneer :other :value is.',
+    'prohibited_unless' => ':attribute veld is verboden tenzij :other gelijk is aan :values.',
+    'prohibits' => ':attribute veld verbiedt :other van aanwezig te zijn.',
+    'regex' => ':attribute veld formaat is ongeldig.',
+    'required' => 'Het veld :attribute is verplicht.',
+    'required_array_keys' => ':attribute veld moet items bevatten voor: :values.',
+    'required_if' => 'het veld :attribute is verplicht als :other gelijk is aan :value.',
+    'required_if_accepted' => ':attribute veld is verplicht als :other wordt geaccepteerd.',
+    'required_if_declined' => ':attribute veld is verplicht als :other wordt geweigerd.',
+    'required_unless' => ':attribute veld is vereist tenzij :other is in :values.',
+    'required_with' => 'Het veld :attribute is verplicht als :values ingesteld staan.',
+    'required_with_all' => ':attribute veld is verplicht wanneer :values aanwezig zijn.',
+    'required_without' => 'Het veld :attribute is verplicht als :values niet ingesteld staan.',
     'required_without_all' => ':attribute veld is vereist wanneer geen van :values aanwezig zijn.',
-    'same'                 => ':attribute en :other moeten gelijk zijn.',
-    'size'                 => [
-        'numeric' => ':attribute moet :size zijn.',
-        'file'    => ':attribute moet :size kilobytes groot zijn.',
-        'string'  => ':attribute moet :size karakters zijn.',
-        'array'   => ':attribute moet :size items bevatten.',
+    'same' => ':attribute veld moet overeenkomen met :other.',
+    'size' => [
+        'array' => ':attribute veld moet :size items bevatten.',
+        'file' => ':attribute veld moet :size kilobytes zijn.',
+        'numeric' => ':attribute veld moet :size zijn.',
+        'string' => ':attribute veld moet :size karakters bevatten.',
     ],
+    'starts_with' => ':attribute veld moet beginnen met één van de volgende: :values.',
     'string'               => ':attribute moet een string zijn.',
-    'timezone'             => ':attribute moet een geldige zone zijn.',
     'two_column_unique_undeleted' => ':attribute moet uniek zijn in :table1 en :table2. ',
-    'unique'               => 'Het veld :attribute is reeds in gebruik.',
-    'uploaded'             => 'Uploaden van :attribute is mislukt.',
-    'url'                  => 'Het formaat van :attribute is ongeldig.',
     'unique_undeleted'     => 'De :attribute moet uniek zijn. ',
     'non_circular'         => ':attribute mag geen circulaire referentie aanmaken.',
     'not_array'            => ':attribute kan geen array zijn.',
@@ -102,11 +165,14 @@ return [
     'numbers'              => 'Wachtwoord moet ten minste één cijfer bevatten.',
     'case_diff'            => 'Wachtwoord moet kleine letters en hoofdletters bevatten.',
     'symbols'              => 'Wachtwoord moet symbolen bevatten.',
-    'gte'                  => [
-        'numeric'          => 'Waarde mag niet negatief zijn'
-    ],
-    'checkboxes'           => ':attribute bevat ongeldige opties.',
-    'radio_buttons'        => ':attribute is ongeldig.',
+    'timezone' => ':attribute moet een geldige tijdzone zijn.',
+    'unique' => 'Het veld :attribute is reeds in gebruik.',
+    'uploaded' => 'Uploaden van :attribute is mislukt.',
+    'uppercase' => ':attribute veld moet met hoofdletter zijn.',
+    'url' => ':attribute veld moet een geldige URL zijn.',
+    'ulid' => ':attribute veld moet een geldige ULID zijn.',
+    'uuid' => ':attribute veld moet een geldige UUID zijn.',
+    'fmcs_location' => 'Full multiple company support and location scoping is enabled in the Admin Settings, and the selected location and selected company are not compatible.',
 
 
     /*
@@ -120,16 +186,22 @@ return [
     |
     */
 
+    'email_array'      => 'één of meer e-mail adressen kloppen niet.',
+    'checkboxes'           => ':attribute bevat ongeldige opties.',
+    'radio_buttons'        => ':attribute is ongeldig.',
+    
     'custom' => [
         'alpha_space' => ':attribute veld bevat een karakter wat niet is toegestaan.',
-        'email_array'      => 'één of meer e-mail adressen kloppen niet.',
+
         'hashed_pass'      => 'Je huidige wachtwoord is incorrect',
         'dumbpwd'          => 'Dat wachtwoord is te veelvoorkomend.',
         'statuslabel_type' => 'Selecteer een valide status label',
+        'custom_field_not_found'          => 'Dit veld lijkt niet te bestaan, controleer uw aangepaste veldnamen.',
+        'custom_field_not_found_on_model' => 'Dit veld lijkt te bestaan, maar is niet beschikbaar in de veldset van dit Asset Model.',
 
         // date_format validation with slightly less stupid messages. It duplicates a lot, but it gets the job done :(
-        // We use this because the default error message for date_format is reflects php Y-m-d, which non-PHP
-        // people won't know how to format. 
+        // We use this because the default error message for date_format reflects php Y-m-d, which non-PHP
+        // people won't know how to format.
         'purchase_date.date_format'     => ':attribute moet een geldige datum zijn in JJJJ-MM-DD formaat',
         'last_audit_date.date_format'   =>  ':attribute moet een geldige datum zijn in JJJJ-MM-DD uu:mm:ss formaat',
         'expiration_date.date_format'   =>  ':attribute moet een geldige datum zijn in JJJJ-MM-DD formaat',
@@ -137,9 +209,15 @@ return [
         'expected_checkin.date_format'  =>  ':attribute moet een geldige datum zijn in JJJJ-MM-DD formaat',
         'start_date.date_format'        =>  ':attribute moet een geldige datum zijn in JJJJ-MM-DD formaat',
         'end_date.date_format'          =>  ':attribute moet een geldige datum zijn in JJJJ-MM-DD formaat',
+        'invalid_value_in_field' => 'Ongeldige waarde ingevoerd in dit veld',
 
-    ],
+        'ldap_username_field' => [
+            'not_in' =>         '<code>sAMAccountName</code> (Hoofd- en kleine letters) zal waarschijnlijk niet werken. Je zou in plaats hiervan <code>samaccountname</code> (kleine letters) kunnen gebruiken.'
+        ],
+        'ldap_auth_filter_query' => ['not_in' => '<code>uid=samaccountname</code> is waarschijnlijk geen geldig authenticatiefilter. Je wilt waarschijnlijk <code>uid=</code> gebruiken.'],
+        'ldap_filter' => ['regex' => 'Deze waarde hoeft waarschijnlijk niet verpakt te worden in haakjes.'],
 
+        ],
     /*
     |--------------------------------------------------------------------------
     | Custom Validation Attributes
@@ -155,8 +233,16 @@ return [
 
     /*
     |--------------------------------------------------------------------------
-    | Generic Validation Messages
+    | Generic Validation Messages - we use these in the jquery validation where we don't have
+    | access to the :attribute
     |--------------------------------------------------------------------------
     */
-    'invalid_value_in_field' => 'Ongeldige waarde ingevoerd in dit veld',
+
+    'generic' => [
+        'invalid_value_in_field' => 'Ongeldige waarde ingevoerd in dit veld',
+        'required' => 'Dit veld is verplicht',
+        'email' => 'Vul een geldig e-mailadres in',
+    ],
+
+
 ];
diff --git a/resources/lang/nn-NO/account/general.php b/resources/lang/nn-NO/account/general.php
new file mode 100644
index 0000000000..99da024c80
--- /dev/null
+++ b/resources/lang/nn-NO/account/general.php
@@ -0,0 +1,17 @@
+<?php
+
+return array(
+    'personal_api_keys' => 'Personlige API-nøkler',
+    'personal_access_token' => 'Personal Access Token',
+    'personal_api_keys_success' => 'Personal API Key :key created sucessfully',
+    'here_is_api_key' => 'Here is your new personal access token. This is the only time it will be shown so do not lose it! You may now use this token to make API requests.',
+    'api_key_warning' => 'When generating an API token, be sure to copy it down immediately as they will not be visible to you again.',
+    'api_base_url' => 'Din API base-url finnes på:',
+    'api_base_url_endpoint' => '/&lt;endpoint&gt;',
+    'api_token_expiration_time' => 'API-tokens er satt til å utløpe om:',
+    'api_reference' => 'Please check the <a href="https://snipe-it.readme.io/reference" target="_blank">API reference</a> to find specific API endpoints and additional API documentation.',
+    'profile_updated' => 'Account successfully updated',
+    'no_tokens' => 'You have not created any personal access tokens.',
+    'enable_sounds' => 'Enable sound effects',
+    'enable_confetti' => 'Enable confetti effects',
+);
diff --git a/resources/lang/nn-NO/admin/accessories/general.php b/resources/lang/nn-NO/admin/accessories/general.php
new file mode 100644
index 0000000000..871c6c549c
--- /dev/null
+++ b/resources/lang/nn-NO/admin/accessories/general.php
@@ -0,0 +1,22 @@
+<?php
+
+return array(
+    'accessory_category' 				=> 'Tilbehørskategori',
+    'accessory_name'  					=> 'Navn tilbehør',
+    'checkout'  							=> 'Sjekk ut tilbehør',
+    'checkin'  							=> 'Sjekk inn tilbehør',
+    'create'  							=> 'Legg til tilbehør',
+    'edit'  							=> 'Rediger tilbehør',
+    'eula_text'							=> 'EULA-kategori',
+    'eula_text_help'					=> 'Dette feltet lar deg tilpasse dine EULA for spesifikke typer eiendeler. Hvis du har kun en EULA for alle eiendeler kan du krysse av nedenfor for å bruke standard.',
+    'require_acceptance'				=> 'Krev at brukere bekrefter aksept av eiendeler i denne kategorien.',
+    'no_default_eula'					=> 'Ingen standard EULA funnet. Legg til en i Innstillinger.',
+    'total'  							=> 'Total',
+    'remaining'  						=> 'Tilgjengelig',
+    'update'  							=> 'Oppdater tilbehør',
+    'use_default_eula'					=> 'Bruk <a href="#" data-toggle="modal" data-target="#eulaModal">standard EULA</a> i stedet.',
+    'use_default_eula_disabled'			=> '<del>Bruk standard EULA i stedet.</del> Ingen standard EULA er satt. Legg til en i Innstillinger.',
+    'clone'                             => 'Klon tilbehør',
+    'delete_disabled'                   => 'Dette tilbehøret kan ikke slettes enda fordi noen elementer er fremdeles sjekket ut.',
+
+);
diff --git a/resources/lang/nn-NO/admin/accessories/message.php b/resources/lang/nn-NO/admin/accessories/message.php
new file mode 100644
index 0000000000..c6e641c692
--- /dev/null
+++ b/resources/lang/nn-NO/admin/accessories/message.php
@@ -0,0 +1,43 @@
+<?php
+
+return array(
+
+    'does_not_exist' => 'Tilbehøret [:id] finnes ikke.',
+    'not_found' => 'Finner ikke dette tilbehøret.',
+    'assoc_users'	 => 'Dette tilbehøret har for øyeblikket :count enheter utsjekket til brukere. Sjekk inn tilbehøret og prøv igjen. ',
+
+    'create' => array(
+        'error'   => 'Tilbehør ble ikke opprettet, vennligst prøv igjen.',
+        'success' => 'Tilbehør optrettet.'
+    ),
+
+    'update' => array(
+        'error'   => 'Tilbehør ble ikke oppdatert, vennligst prøv igjen',
+        'success' => 'Tilbehør oppdatert.'
+    ),
+
+    'delete' => array(
+        'confirm'   => 'Er du sikker på at du vil slette dette tilbehøret?',
+        'error'   => 'Det oppstod et problem under sletting av tilbehøret. Prøv igjen.',
+        'success' => 'Tilbehøret ble slettet.'
+    ),
+
+     'checkout' => array(
+        'error'   		=> 'Tilbehør ble ikke sjekket ut. Prøv igjen',
+        'success' 		=> 'Vellykket utsjekking av tilbehør.',
+        'unavailable'   => 'Tilbehør er ikke tilgjengelig for utsjekk. Sjekk antall tilgjengelig',
+        'user_does_not_exist' => 'Denne brukeren er ugyldig. Prøv igjen.',
+         'checkout_qty' => array(
+            'lte'  => 'There is currently only one available accessory of this type, and you are trying to check out :checkout_qty. Please adjust the checkout quantity or the total stock of this accessory and try again.|There are :number_currently_remaining total available accessories, and you are trying to check out :checkout_qty. Please adjust the checkout quantity or the total stock of this accessory and try again.',
+            ),
+           
+    ),
+
+    'checkin' => array(
+        'error'   		=> 'Tilbehør ble ikke sjekket inn. Prøv igjen',
+        'success' 		=> 'Vellykket innsjekk av tilbehør.',
+        'user_does_not_exist' => 'Denne brukeren er ugyldig. Prøv igjen.'
+    )
+
+
+);
diff --git a/resources/lang/nn-NO/admin/accessories/table.php b/resources/lang/nn-NO/admin/accessories/table.php
new file mode 100644
index 0000000000..6d3c5d944c
--- /dev/null
+++ b/resources/lang/nn-NO/admin/accessories/table.php
@@ -0,0 +1,9 @@
+<?php
+
+return array(
+	'dl_csv'      				=> 'Last ned CSV',
+	'eula_text'      			=> 'EULA',
+    'id'      					=> 'ID',
+    'require_acceptance'      	=> 'Godtatt',
+    'title'      				=> 'Navn tilbehør',
+);
diff --git a/resources/lang/nn-NO/admin/asset_maintenances/form.php b/resources/lang/nn-NO/admin/asset_maintenances/form.php
new file mode 100644
index 0000000000..cb77da7bbe
--- /dev/null
+++ b/resources/lang/nn-NO/admin/asset_maintenances/form.php
@@ -0,0 +1,14 @@
+<?php
+
+    return [
+        'asset_maintenance_type' => 'Ressurs vedlikeholds type',
+        'title'                  => 'Tittel',
+        'start_date'             => 'Startdato',
+        'completion_date'        => 'Fullført dato',
+        'cost'                   => 'Kostnad',
+        'is_warranty'            => 'Uthevet garanti',
+        'asset_maintenance_time' => 'Tid brukt på ressursvedlikehold (i dager)',
+        'notes'                  => 'Notater',
+        'update'                 => 'Oppdater ressurs vedlikehold',
+        'create'                 => 'Opprett ressurs vedlikehold'
+    ];
diff --git a/resources/lang/nn-NO/admin/asset_maintenances/general.php b/resources/lang/nn-NO/admin/asset_maintenances/general.php
new file mode 100644
index 0000000000..4c36e8e6b9
--- /dev/null
+++ b/resources/lang/nn-NO/admin/asset_maintenances/general.php
@@ -0,0 +1,16 @@
+<?php
+
+    return [
+        'asset_maintenances' => 'Vedlikehold av eiendeler',
+        'edit'               => 'Rediger Vedlikehold',
+        'delete'             => 'Slett Vedlikehold',
+        'view'               => 'Vedlikehold detaljer',
+        'repair'             => 'Reparerasjon',
+        'maintenance'        => 'Vedlikehold',
+        'upgrade'            => 'Oppgradering',
+        'calibration'        => 'Kalibrering',
+        'software_support'   => 'Programvarestøtte',
+        'hardware_support'   => 'Maskinvare støtte',
+        'configuration_change'   => 'Konfigurasjons endring',
+        'pat_test'           => 'PAT test',
+    ];
diff --git a/resources/lang/nn-NO/admin/asset_maintenances/message.php b/resources/lang/nn-NO/admin/asset_maintenances/message.php
new file mode 100644
index 0000000000..7b387a2973
--- /dev/null
+++ b/resources/lang/nn-NO/admin/asset_maintenances/message.php
@@ -0,0 +1,21 @@
+<?php
+
+    return [
+        'not_found'                    => 'Fant ikke vedlikeholdet du så etter!',
+        'delete'                       => [
+            'confirm' => 'Er du sikker på at du vil slette dette vedlikeholdet?',
+            'error'   => 'Kunne ikke slette vedlikholdet. Prøv igjen.',
+            'success' => 'Vedlikeholdet ble slettet.',
+        ],
+        'create'                       => [
+            'error'   => 'Vedlikeholdet ble ikke opprettet, prøv igjen.',
+            'success' => 'Vedlikeholdet ble opprettet.',
+        ],
+        'edit'                       => [
+            'error'   => 'Vedlikeholdet ble ikke opprettet, prøv igjen.',
+            'success' => 'Vedlikehold endret vellykket.',
+        ],
+        'asset_maintenance_incomplete' => 'Enda Ikke fullført',
+        'warranty'                     => 'Garanti',
+        'not_warranty'                 => 'Ikke garanti',
+    ];
diff --git a/resources/lang/nn-NO/admin/asset_maintenances/table.php b/resources/lang/nn-NO/admin/asset_maintenances/table.php
new file mode 100644
index 0000000000..9a584665a5
--- /dev/null
+++ b/resources/lang/nn-NO/admin/asset_maintenances/table.php
@@ -0,0 +1,8 @@
+<?php
+
+    return [
+        'title'         => 'Vedlikehold av eiendel',
+        'asset_name'    => 'Navn',
+        'is_warranty'   => 'Garanti',
+        'dl_csv'        => 'Last ned CSV',
+    ];
diff --git a/resources/lang/nn-NO/admin/categories/general.php b/resources/lang/nn-NO/admin/categories/general.php
new file mode 100644
index 0000000000..4c02d73ecb
--- /dev/null
+++ b/resources/lang/nn-NO/admin/categories/general.php
@@ -0,0 +1,25 @@
+<?php
+
+return array(
+    'asset_categories' 					=> 'Kategorier',
+    'category_name'  					=> 'Navn',
+    'checkin_email'                     => 'Send epost til bruker ved innsjekking/utsjekking.',
+    'checkin_email_notification'        => 'Det vil bli sendt en e-post til bruker ved innsjekking/utsjekking.',
+    'clone'                             => 'Klon kategori',
+    'create'  							=> 'Opprett kategori',
+    'edit'                              => 'Rediger kategori',
+    'email_will_be_sent_due_to_global_eula' => 'En e-post sendes til brukeren fordi den globale EULA er i bruk.',
+    'email_will_be_sent_due_to_category_eula' => 'En e-post blir sendt til brukeren fordi en EULA er angitt for denne kategorien.',
+    'eula_text'							=> 'EULA-kategori',
+    'eula_text_help'					=> 'Dette feltet lar deg tilpasse dine EULA for spesifikke typer eiendeler. Hvis du kun har en EULA for alle eiendeler kan du krysse av nedenfor for å bruke standard.',
+    'name'                              => 'Kategorinavn',
+    'require_acceptance'				=> 'Krev at brukere bekrefter aksept av eiendeler i denne kategorien.',
+    'required_acceptance'				=> 'Denne brukeren vil få e-post med en lenke for å bekrefte aksept av enheten.',
+    'required_eula'						=> 'Denne brukeren vil få en kopi av EULA på e-post',
+    'no_default_eula'					=> 'Ingen standard EULA funnet. Legg til en i Innstillinger.',
+    'update'  							=> 'Oppdatere kategori',
+    'use_default_eula'					=> 'Bruk <a href="#" data-toggle="modal" data-target="#eulaModal">standard EULA</a> i stedet.',
+    'use_default_eula_disabled'			=> '<del>Bruk standard EULA i stedet.</del> Ingen standard EULA er satt. Legg til en i Innstillinger.',
+    'use_default_eula_column'			=> 'Bruk standard EULA',
+
+);
diff --git a/resources/lang/nn-NO/admin/categories/message.php b/resources/lang/nn-NO/admin/categories/message.php
new file mode 100644
index 0000000000..2d93711bc6
--- /dev/null
+++ b/resources/lang/nn-NO/admin/categories/message.php
@@ -0,0 +1,27 @@
+<?php
+
+return array(
+
+    'does_not_exist' => 'Kategorien eksisterer ikke.',
+    'assoc_models'	 => 'Denne kategorien er koblet til minst èn modell og kan ikke slettes. Vennligst oppdater dine modeller til å ikke referere til denne kategorien og prøv igjen. ',
+    'assoc_items'	 => 'Denne kategorien er knyttet til minst én :asset_type og kan ikke slettes. Oppdater din :asset_type til å ikke lenger refererer til denne kategorien, og prøv på nytt. ',
+
+    'create' => array(
+        'error'   => 'Kategorien ble ikke opprettet, vennligst prøv igjen.',
+        'success' => 'Kategorien ble opprettet.'
+    ),
+
+    'update' => array(
+        'error'   => 'Kategorien ble ikke opprettet, vennligst prøv igjen',
+        'success' => 'Kategorien ble oppdatert.',
+        'cannot_change_category_type'   => 'Du kan ikke endre kategori typen når den har blitt opprettet',
+    ),
+
+    'delete' => array(
+        'confirm'   => 'Er du sikker på du vil slette denne kategorien?',
+        'error'   => 'Det oppsto et problem ved sletting av kategorien. Vennligst prøv igjen.
+',
+        'success' => 'Kategorien ble slettet.'
+    )
+
+);
diff --git a/resources/lang/nn-NO/admin/categories/table.php b/resources/lang/nn-NO/admin/categories/table.php
new file mode 100644
index 0000000000..6f07705218
--- /dev/null
+++ b/resources/lang/nn-NO/admin/categories/table.php
@@ -0,0 +1,10 @@
+<?php
+
+return array(
+	'eula_text'      			=> 'EULA',
+    'id'      					=> 'ID',
+    'parent'   					=> 'Overordnet kategori',
+    'require_acceptance'      	=> 'Godtatt',
+    'title'      				=> 'Kategorinavn',
+
+);
diff --git a/resources/lang/nn-NO/admin/companies/general.php b/resources/lang/nn-NO/admin/companies/general.php
new file mode 100644
index 0000000000..dc4853775f
--- /dev/null
+++ b/resources/lang/nn-NO/admin/companies/general.php
@@ -0,0 +1,7 @@
+<?php
+
+return [
+    'select_company' => 'Velg bedrift',
+    'about_companies' => 'Om bedrifter',
+    'about_companies_description' => '        Du kan bruke bedrifter som et enkelt informasjonsfelt, eller slå på Full Bedriftstøtte i Admin-innstillingene for å kunne begrense tilgangen til brukere fra forskjellige bedrifter.',
+];
diff --git a/resources/lang/nn-NO/admin/companies/message.php b/resources/lang/nn-NO/admin/companies/message.php
new file mode 100644
index 0000000000..284a2d4344
--- /dev/null
+++ b/resources/lang/nn-NO/admin/companies/message.php
@@ -0,0 +1,20 @@
+<?php
+
+return [
+    'does_not_exist' => 'Bedriften eksisterer ikke.',
+    'deleted'        => 'Slett firma',
+    'assoc_users'    => 'Denne bedriften er tilknyttet minst en modell og kan ikke slettes. Oppdater modellene dine til å ikke refere til denne bedriften og prøv igjen. ',
+    'create' => [
+        'error'   => 'Bedriften ble ikke opprette. Prøv igjen.',
+        'success' => 'Bedriften ble opprettet.',
+    ],
+    'update' => [
+        'error'   => 'Bedriften ble ikke oppdatert. Prøv igjen',
+        'success' => 'Bedriften ble oppdatert.',
+    ],
+    'delete' => [
+        'confirm' => 'Er du sikker på at du vil slette denne bedriften?',
+        'error'   => 'Feil ved sletting av bedrift. Prøv igjen.',
+        'success' => 'Bedriften ble slettet.',
+    ],
+];
diff --git a/resources/lang/nn-NO/admin/companies/table.php b/resources/lang/nn-NO/admin/companies/table.php
new file mode 100644
index 0000000000..f809bbe267
--- /dev/null
+++ b/resources/lang/nn-NO/admin/companies/table.php
@@ -0,0 +1,11 @@
+<?php
+return array(
+    'companies' => 'Bedrifter',
+    'create'    => 'Opprett bedrift',
+    'email'     => 'E-postadresse for firma',
+    'title'     => 'Bedrift',
+    'phone'     => 'Telefon for firma',
+    'update'    => 'Oppdater bedrift',
+    'name'      => 'Navn på bedrift',
+    'id'        => 'ID',
+);
diff --git a/resources/lang/nn-NO/admin/components/general.php b/resources/lang/nn-NO/admin/components/general.php
new file mode 100644
index 0000000000..7f6209fad5
--- /dev/null
+++ b/resources/lang/nn-NO/admin/components/general.php
@@ -0,0 +1,16 @@
+<?php
+
+return array(
+    'component_name'                  => 'Komponent navn',
+    'checkin'                             => 'Sjekk inn komponent',
+    'checkout'                             => 'Sjekk ut komponent',
+    'cost'				=> 'Innkjøpskostnad',
+    'create'                             => 'Opprett komponent',
+    'edit'                             => 'Endre komponent',
+    'date'					=> 'Kjøpsdato',
+    'order'					=> 'Ordreummer',
+    'remaining' 			             => 'Gjenstår',
+    'total' 			                 => 'Total',
+    'update'                            => 'Oppdater komponent',
+    'checkin_limit'            => 'Antall sjekket inn må være lik eller mindre enn :assigned_qty'
+);
diff --git a/resources/lang/nn-NO/admin/components/message.php b/resources/lang/nn-NO/admin/components/message.php
new file mode 100644
index 0000000000..625f7ebdfe
--- /dev/null
+++ b/resources/lang/nn-NO/admin/components/message.php
@@ -0,0 +1,38 @@
+<?php
+
+return array(
+
+    'does_not_exist' => 'Komponenten finnes ikke.',
+
+    'create' => array(
+        'error'   => 'Komponenten ble ikke opprettet, vennligst prøv igjen.',
+        'success' => 'Komponent ble opprettet.'
+    ),
+
+    'update' => array(
+        'error'   => 'Komponenten ble ikke oppdatert. Vennligst prøv igjen',
+        'success' => 'Komponent ble oppdatert.'
+    ),
+
+    'delete' => array(
+        'confirm'   => 'Er du sikker på at du vil slette denne komponenten?',
+        'error'   => 'Det oppstod et problem under sletting av komponenten. Vennligst prøv igjen.',
+        'success' => 'Sletting av komponent vellykket.',
+        'error_qty'   => 'Some components of this type are still checked out. Please check them in and try again.',
+    ),
+
+     'checkout' => array(
+        'error'   		=> 'Komponent ble ikke sjekket ut. Prøv igjen',
+        'success' 		=> 'Vellykket utsjekk av komponent.',
+        'user_does_not_exist' => 'Denne brukeren er ugyldig. Vennligst prøv igjen.',
+        'unavailable'      => 'Ikke nok komponenter igjen: :remaining gjenværende, :requested ',
+    ),
+
+    'checkin' => array(
+        'error'   		=> 'Komponenten ble ikke sjekket inn, vennligst prøv igjen',
+        'success' 		=> 'Vellykket innsjekk av komponent.',
+        'user_does_not_exist' => 'Denne brukeren er ugyldig. Prøv igjen.'
+    )
+
+
+);
diff --git a/resources/lang/nn-NO/admin/components/table.php b/resources/lang/nn-NO/admin/components/table.php
new file mode 100644
index 0000000000..f2692003d6
--- /dev/null
+++ b/resources/lang/nn-NO/admin/components/table.php
@@ -0,0 +1,5 @@
+<?php
+
+return array(
+    'title'      				=> 'Komponentnavn',
+);
diff --git a/resources/lang/nn-NO/admin/consumables/general.php b/resources/lang/nn-NO/admin/consumables/general.php
new file mode 100644
index 0000000000..cf7e29fcd3
--- /dev/null
+++ b/resources/lang/nn-NO/admin/consumables/general.php
@@ -0,0 +1,12 @@
+<?php
+
+return array(
+    'checkout'                          => 'Sjekk ut Forbruksvare til Bruker',
+    'consumable_name'                   => 'Navn på forbruksvare',
+    'create'                            => 'Legg til forbruksvare',
+    'item_no'                           => 'Varenr.',
+    'remaining' 			            => 'Gjenstår',
+    'total' 			                => 'Total',
+    'update'                            => 'Oppdater forbruksvare',
+    'inventory_warning'                 => 'The inventory of this consumable is below the minimum amount of :min_count',
+);
diff --git a/resources/lang/nn-NO/admin/consumables/message.php b/resources/lang/nn-NO/admin/consumables/message.php
new file mode 100644
index 0000000000..e652d40ef6
--- /dev/null
+++ b/resources/lang/nn-NO/admin/consumables/message.php
@@ -0,0 +1,38 @@
+<?php
+
+return array(
+
+    'invalid_category_type' => 'The category must be a consumable category.',
+    'does_not_exist' => 'Forbruksvaren finnes ikke.',
+
+    'create' => array(
+        'error'   => 'Forbruksvaren bli ikke opprettet, prøv igjen.',
+        'success' => 'Forbruksvaren opprettet.'
+    ),
+
+    'update' => array(
+        'error'   => 'Forbruksvaren ble ikke opprettet, prøv igjen',
+        'success' => 'Forbruksvare oppdatert.'
+    ),
+
+    'delete' => array(
+        'confirm'   => 'Er du sikker på at forbruksmateriellet skal slettes?',
+        'error'   => 'Noe gikk feil under sletting av forbruksvaren. Prøv igjen.',
+        'success' => 'Forbruksmateriell ble slettet.'
+    ),
+
+     'checkout' => array(
+        'error'   		=> 'Forbruksvaren ble ikke tatt ut, prøv igjen',
+        'success' 		=> 'Forbruksvaren ble tatt ut.',
+        'user_does_not_exist' => 'Denne brukeren er ugyldig. Prøv igjen.',
+         'unavailable'      => 'Det er ikke nok forbruksvarer for denne utsjekken. Kontroller antallet igjen. ',
+    ),
+
+    'checkin' => array(
+        'error'   		=> 'Forbruksvaren ble ikke lagt inn, prøv igjen',
+        'success' 		=> 'Forbruksvaren ble tatt ut.',
+        'user_does_not_exist' => 'Denne brukeren er ugyldig. Prøv igjen.'
+    )
+
+
+);
diff --git a/resources/lang/nn-NO/admin/consumables/table.php b/resources/lang/nn-NO/admin/consumables/table.php
new file mode 100644
index 0000000000..329fb1e136
--- /dev/null
+++ b/resources/lang/nn-NO/admin/consumables/table.php
@@ -0,0 +1,5 @@
+<?php
+
+return array(
+    'title'      				=> 'Navn på forbruksvare',
+);
diff --git a/resources/lang/nn-NO/admin/custom_fields/general.php b/resources/lang/nn-NO/admin/custom_fields/general.php
new file mode 100644
index 0000000000..2b4f1b593d
--- /dev/null
+++ b/resources/lang/nn-NO/admin/custom_fields/general.php
@@ -0,0 +1,64 @@
+<?php
+
+return [
+    'custom_fields'		        => 'Egendefinerte Felt',
+    'manage'                    => 'Administrer',
+    'field'		                => 'Felt',
+    'about_fieldsets_title'		=> 'Om Feltsett',
+    'about_fieldsets_text'		=> 'Feltsett lar deg opprette grupper av egendefinerte felt som kan gjenbrukes til bestemte modelltyper.',
+    'custom_format'             => 'Tilpasset Regex-format...',
+    'encrypt_field'      	        => 'Kryptere verdien av dette feltet i databasen',
+    'encrypt_field_help'      => 'ADVARSEL: Ved å kryptere et felt gjør du at det ikke kan søkes på.',
+    'encrypted'      	        => 'Kryptert',
+    'fieldset'      	        => 'Feltsett',
+    'qty_fields'      	      => 'Antall Felt',
+    'fieldsets'      	        => 'Feltsett',
+    'fieldset_name'           => 'Feltsett Navn',
+    'field_name'              => 'Felt Navn',
+    'field_values'            => 'Felt verdier',
+    'field_values_help'       => 'Legge til alternativer, ett per linje. Tomme linjer utenom den første vil bli ignorerert.',
+    'field_element'           => 'Skjema Element',
+    'field_element_short'     => 'Element',
+    'field_format'            => 'Format',
+    'field_custom_format'     => 'Egendefinert Format',
+    'field_custom_format_help'     => 'Dette feltet lar deg bruke et regex-uttrykk for validering. Det skal begynne med "regex:" - for eksempel å validere at en egendefinert feltverdi inneholder en gyldig IMEI (15 numeriske siffer), vil du bruke <code>regex:/^[0-9]{15}$/</code>.',
+    'required'   		          => 'Obligatorisk',
+    'req'   		              => 'Obl.',
+    'used_by_models'   		    => 'Brukes av modeller',
+    'order'   		            => 'Bestill',
+    'create_fieldset'         => 'Nytt Feltsett',
+    'update_fieldset'         => 'Oppdater Feltsett',
+    'fieldset_does_not_exist'   => 'Feltsett :id eksisterer ikke',
+    'fieldset_updated'         => 'Feltsett oppdatert',
+    'create_fieldset_title' => 'Opprett et nytt feltsett',
+    'create_field'            => 'Nytt Egendefinert Felt',
+    'create_field_title' => 'Opprett nytt egendefinert felt',
+    'value_encrypted'      	        => 'Verdien i dette feltet er kryptert i databasen. Bare administratorer kan se hva som står i dette feltet',
+    'show_in_email'     => 'Inkluder verdien i dette feltet i utsjekkseposter sendt til brukeren? Krypterte felter kan ikke inkluderes i eposter',
+    'show_in_email_short' => 'Inkludere i epost',
+    'help_text' => 'Hjelpetekst',
+    'help_text_description' => 'Dette er en valgfri tekst som vises under feltet når man redigerer et element, ment for å gi kontekst til feltets innhold.',
+    'about_custom_fields_title' => 'Om egendefinerte felt',
+    'about_custom_fields_text' => 'Egendefinerte felt lar deg legge til vilkårlige attributter til eiendeler.',
+    'add_field_to_fieldset' => 'Legg feltet inn i feltsett',
+    'make_optional' => 'Påkrevd - klikk for å gjøre valgfritt',
+    'make_required' => 'Valgfritt - klikk for å gjøre påkrevd',
+    'reorder' => 'Endre rekkefølge',
+    'db_field' => 'DB-felt',
+    'db_convert_warning' => 'ADVARSEL: Dette feltet er i tabellen for egendefinerte felt som <code>:db_column</code>, men burde være <code>:expected</code>.',
+    'is_unique' => 'Denne verdien må være unik for alle ressurser',
+    'unique' => 'Unik',
+    'display_in_user_view' => 'Tillat den utsjekkede brukeren å se disse verdiene i deres Vis tildelte ressurs-side',
+    'display_in_user_view_table' => 'Synlig for bruker',
+    'auto_add_to_fieldsets' => 'Legg denne til automatisk i hvert nye feltsett',
+    'add_to_preexisting_fieldsets' => 'Legg til i alle eksisterende gruppene',
+    'show_in_listview' => 'Vis i listevisninger som standard. Autoriserte brukere kan fortsatt vise/skjule via kolonnevelgeren',
+    'show_in_listview_short' => 'Vis i lister',
+    'show_in_requestable_list_short' => 'Vis i liste over ressurser som kan være tilgjengelig på forespørsel',
+    'show_in_requestable_list' => 'Vis verdi i listen over ressurser som kan være tilgjengelig på forspørsel. Krypterte felter vises ikke',
+    'encrypted_options' => 'Feltet er kryptert, så noen visningsalternativer er ikke tilgjengelig.',
+    'display_checkin' => 'Display in checkin forms',
+    'display_checkout' => 'Display in checkout forms',
+    'display_audit' => 'Display in audit forms',
+
+];
diff --git a/resources/lang/nn-NO/admin/custom_fields/message.php b/resources/lang/nn-NO/admin/custom_fields/message.php
new file mode 100644
index 0000000000..976984aae1
--- /dev/null
+++ b/resources/lang/nn-NO/admin/custom_fields/message.php
@@ -0,0 +1,64 @@
+<?php
+
+return array(
+
+    'field' => array(
+        'invalid'   => 'Feltet finnes ikke.',
+        'already_added'   => 'Feltet er allerede lagt til',
+        'none_selected'   => 'No field selected',
+
+        'create' => array(
+            'error'   => 'Feltet ble ikke opprettet, vennligst prøv igjen.',
+            'success' => 'Felt opprettet.',
+            'assoc_success' => 'Feltet ble lagt til.'
+        ),
+
+        'update' => array(
+            'error'   => 'Feltet ble ikke oppdatert, vennligst prøv igjen',
+            'success' => 'Felt oppdatert.'
+        ),
+
+        'delete' => array(
+            'confirm'   	=> 'Er du sikker på at du vil slette dette feltet?',
+            'error'   => 'Det oppstod et problem ved sletting av feltet. Vennligst prøv igjen senere.',
+            'success' => 'Feltet ble slettet.',
+            'in_use'   => 'Feltet er fremdeles i bruk.',
+        )
+
+    ),
+
+    'fieldset' => array(
+
+        'does_not_exist' => 'Fieldset eksisterer ikke',
+
+        'create' => array(
+            'error'   => 'Feltsettet ble ikke opprettet, vennligst prøv igjen.',
+            'success' => 'Feltsettet ble opprettet.'
+        ),
+
+        'update' => array(
+            'error'   => 'Feltsettet ble ikke oppdatert, vennligst prøv igjen',
+            'success' => 'Feltsettet ble oppdatert.'
+        ),
+
+        'delete' => array(
+            'confirm'   	=> 'Er du sikker på at du vil slette feltsettet?',
+            'error'   => 'Det oppstod et problem ved sletting av feltsettet. Vennligst prøv igjen.',
+            'success' => 'Feltsettet ble slettet.',
+            'in_use'   => 'Feltsettet er fortsatt i bruk.',
+        )
+
+    ),
+
+    'fieldset_default_value' => array(
+
+        'error' => 'Feil ved validering av standardverdier for feltsett.',
+
+    ),
+
+
+
+
+
+
+);
diff --git a/resources/lang/nn-NO/admin/departments/message.php b/resources/lang/nn-NO/admin/departments/message.php
new file mode 100644
index 0000000000..5aad3f223c
--- /dev/null
+++ b/resources/lang/nn-NO/admin/departments/message.php
@@ -0,0 +1,22 @@
+<?php
+
+return array(
+
+    'does_not_exist' => 'Avdeling finnes ikke.',
+    'department_already_exists' => 'En avdeling finnes allerede med det navnet i denne bedriftsplassen. Eller velg et mer spesifikt navn for denne avdelingen. ',
+    'assoc_users'	 => 'Denne avdelingen er knyttet til minst én bruker og kan ikke slettes. Oppdater brukerne ikke lenger refererer til denne avdelingen og prøv igjen. ',
+    'create' => array(
+        'error'   => 'Avdelingen ble ikke opprettet, prøv igjen.',
+        'success' => 'Avdeling opprettet.'
+    ),
+    'update' => array(
+        'error'   => 'Avdelingen ble ikke oppdatert, prøv igjen',
+        'success' => 'Avdeling oppdatert.'
+    ),
+    'delete' => array(
+        'confirm'   	=> 'Er du sikker på at du vil slette denne avdelingen?',
+        'error'   => 'Det var et problem med å slette avdelingen. Prøv på nytt.',
+        'success' => 'Avdelingen ble slettet.'
+    )
+
+);
diff --git a/resources/lang/nn-NO/admin/departments/table.php b/resources/lang/nn-NO/admin/departments/table.php
new file mode 100644
index 0000000000..3373541407
--- /dev/null
+++ b/resources/lang/nn-NO/admin/departments/table.php
@@ -0,0 +1,11 @@
+<?php
+
+return array(
+
+    'id'                        => 'ID',
+    'name'                      => 'Avdelingsnavn',
+    'manager'                   => 'Leder',
+    'location'                  => 'Plassering',
+    'create'                    => 'Opprett avdeling',
+    'update'                    => 'Oppdater avdeling',
+    );
diff --git a/resources/lang/nn-NO/admin/depreciations/general.php b/resources/lang/nn-NO/admin/depreciations/general.php
new file mode 100644
index 0000000000..e7a8b1b0af
--- /dev/null
+++ b/resources/lang/nn-NO/admin/depreciations/general.php
@@ -0,0 +1,20 @@
+<?php
+
+return [
+    'about_asset_depreciations'  			=> 'Om avskrivninger',
+    'about_depreciations'  					=> 'Du kan sette opp avskrivninger for å kostnadsføre eiendeler basert på en lineær avskrivning i perioden.',
+    'asset_depreciations'  					=> 'Avskrivninger',
+    'create'  					            => 'Opprett avskrivning',
+    'depreciation_name'  					=> 'Avskrivningsnavn',
+    'depreciation_min'                      => 'Nedre verdi for avskrivning',
+    'number_of_months'  					=> 'Antall måneder',
+    'update'  					            => 'Oppdater avskrivninger',
+    'depreciation_min'                      => 'Minimumsverdi etter avskrivning',
+    'no_depreciations_warning'               => '<strong>Advarsel:</strong>
+                      Du har for øyeblikket ingen avskrivninger satt opp.
+                      Vennligst sett opp minst én avskrivning for å se avskrivningsrapporten.',
+    'depreciation_method'                   => 'Avskrivningsrapport',
+    'linear_depreciation'                   => 'Linear (Default)',
+    'half_1'                                => 'Half-year convention, always applied',
+    'half_2'                                => 'Half-year convention, applied with condition',
+];
diff --git a/resources/lang/nn-NO/admin/depreciations/message.php b/resources/lang/nn-NO/admin/depreciations/message.php
new file mode 100644
index 0000000000..4c56baa473
--- /dev/null
+++ b/resources/lang/nn-NO/admin/depreciations/message.php
@@ -0,0 +1,25 @@
+<?php
+
+return array(
+
+    'does_not_exist' => 'Avskrivningen eksisterer ikke.',
+    'assoc_users'	 => 'Denne avskrivningen er tilknyttet én eller flere modeller og kan ikke slettes. Vennligst slett modellene og prøv å slette på nytt. ',
+
+
+    'create' => array(
+        'error'   => 'Avskrivningen ble ikke opprettet, vennligst prøv igjen. :(',
+        'success' => 'Avskrivningen ble opprettet. :)'
+    ),
+
+    'update' => array(
+        'error'   => 'Avskrivningen ble ikke oppdatert, vennligst prøv igjen',
+        'success' => 'Avskrivningen ble oppdatert.'
+    ),
+
+    'delete' => array(
+        'confirm'   => 'Er du sikker på at du vil slette denne avskrivningen ?',
+        'error'   => 'Det oppsto et problem med sletting av avskrivningen. Vennligst prøv igjen.',
+        'success' => 'Avskrivningen ble slettet.'
+    )
+
+);
diff --git a/resources/lang/nn-NO/admin/depreciations/table.php b/resources/lang/nn-NO/admin/depreciations/table.php
new file mode 100644
index 0000000000..4e986a38be
--- /dev/null
+++ b/resources/lang/nn-NO/admin/depreciations/table.php
@@ -0,0 +1,11 @@
+<?php
+
+return [
+
+    'id'      => 'ID',
+    'months'   => 'Måneder',
+    'term'   => 'Avskrivningsperiode',
+    'title'      => 'Navn ',
+    'depreciation_min' => 'Nedre verdi',
+
+];
diff --git a/resources/lang/nn-NO/admin/groups/message.php b/resources/lang/nn-NO/admin/groups/message.php
new file mode 100644
index 0000000000..1053f2c438
--- /dev/null
+++ b/resources/lang/nn-NO/admin/groups/message.php
@@ -0,0 +1,22 @@
+<?php
+
+return array(
+
+    'group_exists'        => 'Gruppen eksisterer allerede!',
+    'group_not_found'     => 'Gruppe-ID :id finnes ikke.',
+    'group_name_required' => 'Navnefeltet er påkrevd',
+
+    'success' => array(
+        'create' => 'Gruppen ble opprettet.',
+        'update' => 'Gruppen ble oppdatert.',
+        'delete' => 'Gruppen ble slettet.',
+    ),
+
+    'delete' => array(
+        'confirm'   => 'Er du sikker på at du vil slette denne gruppen?',
+        'create' => 'Det oppsto et problem med oppretting av gruppen. Vennligst prøv igjen.',
+        'update' => 'Det oppsto et problem med oppdatering av gruppen. Vennligst prøv igjen.',
+        'delete' => 'Det oppsto et problem med sletting av gruppen. Vennligst prøv igjen.',
+    ),
+
+);
diff --git a/resources/lang/nn-NO/admin/groups/table.php b/resources/lang/nn-NO/admin/groups/table.php
new file mode 100644
index 0000000000..e8f777138c
--- /dev/null
+++ b/resources/lang/nn-NO/admin/groups/table.php
@@ -0,0 +1,9 @@
+<?php
+
+return array(
+
+    'id'         => 'Id',
+    'name'       => 'Navn',
+    'users'      => 'Antall brukere',
+
+);
diff --git a/resources/lang/nn-NO/admin/groups/titles.php b/resources/lang/nn-NO/admin/groups/titles.php
new file mode 100644
index 0000000000..bce3673e6f
--- /dev/null
+++ b/resources/lang/nn-NO/admin/groups/titles.php
@@ -0,0 +1,16 @@
+<?php
+
+return [
+    'about_groups_title'            => 'Om grupper',
+    'about_groups'                  => 'Grupper brukes til å generalisere brukertillatelser.',
+    'group_management' 	 	=> 'Gruppeadministrasjon',
+    'create' 	 	 	    => 'Opprett ny gruppe',
+    'update' 	 		        => 'Rediger gruppe',
+    'group_name' 	 		=> 'Gruppenavn',
+    'group_admin' 	 		=> 'Gruppeadministrator',
+    'allow' 	 			=> 'Tillat',
+    'deny' 	 				=> 'Avslå',
+    'permission'            => 'Rettigheter',
+    'grant'                 => 'Gi tilgang',
+    'no_permissions'        => 'Denne gruppen har ingen rettigheter.'
+];
diff --git a/resources/lang/nn-NO/admin/hardware/form.php b/resources/lang/nn-NO/admin/hardware/form.php
new file mode 100644
index 0000000000..a042e9b9e3
--- /dev/null
+++ b/resources/lang/nn-NO/admin/hardware/form.php
@@ -0,0 +1,65 @@
+<?php
+
+return [
+    'bulk_delete'		=> 'Bekreft sletting av flere enheter',
+    'bulk_restore'      => 'Bekreft sletting av flere enheter', 
+  'bulk_delete_help'	=> 'Se gjennom listen over enheter som er valgt for sletting. Etter sletting er det mulig å gjenopprette enheter, men nåværende koblinger til brukere vil ikke lenger finnes.',
+  'bulk_restore_help'	=> 'Se gjennom ressursene for massegjennoppretning nedenfor. Når de er gjenopprettet vil ikke disse eiendelene være knyttet til brukere de ble gitt til tidligere.',
+  'bulk_delete_warn'	=> 'Du er i ferd med å slette :asset_count enheter.',
+  'bulk_restore_warn'	=> 'Du er i ferd med å gjennopprette :asset_count enheter.',
+    'bulk_update'		=> 'Masseoppdater eiendeler',
+    'bulk_update_help'	=> 'Dette skjemaet lar deg oppdatere flere eiendeler på en gang. Fyll kun ut feltene du ønsker å endre. Tomme felter forblir uendret. ',
+    'bulk_update_warn'	=> 'Du er i ferd med å endre egenskapene til en ressurs. Du er i ferd med å endre egenskapene til :asset_count enheter.',
+    'bulk_update_with_custom_field' => 'Merk at ressursene er av :asset_model_count ulike modeller.',
+    'bulk_update_model_prefix' => 'På modeller', 
+    'bulk_update_custom_field_unique' => 'Dette er et unikt felt og kan ikke masseredigeres.',
+    'checkedout_to'		=> 'Utsjekket til',
+    'checkout_date'		=> 'Utsjekkdato',
+    'checkin_date'		=> 'Innsjekkdato',
+    'checkout_to'		=> 'Sjekk ut til',
+    'cost'				=> 'Innkjøpskostnad',
+    'create'			=> 'Opprett eiendel',
+    'date'				=> 'Innkjøpsdato',
+    'depreciation'	    => 'avskrivninger',
+    'depreciates_on'	=> 'Avskrivningstype',
+    'default_location'	=> 'Standard plassering',
+    'default_location_phone' => 'Standard plasseringstelefon',
+    'eol_date'			=> 'EOL dato',
+    'eol_rate'			=> 'EOL-rate',
+    'expected_checkin'  => 'Forventet dato for innsjekk',
+    'expires'			=> 'Utløper',
+    'fully_depreciated'	=> 'Ferdig nedskrevet',
+    'help_checkout'		=> 'Hvis du ønsker å tildele denne eiendelen umiddelbart, velger du "klar til å distribuere" fra status listen ovenfor. ',
+    'mac_address'		=> 'MAC-adresse',
+    'manufacturer'		=> 'Produsent',
+    'model'				=> 'Modell',
+    'months'			=> 'måneder',
+    'name'				=> 'Navn',
+    'notes'				=> 'Notater',
+    'order'				=> 'Ordrenummer',
+    'qr'				=> 'QR-kode',
+    'requestable'		=> 'Brukere kan be om eiendel',
+    'redirect_to_all'   => 'Return to all :type',
+    'redirect_to_type'   => 'Go to :type',
+    'redirect_to_checked_out_to'   => 'Go to Checked Out to',
+    'select_statustype'	=> 'Velg statustype',
+    'serial'			=> 'Serienummer',
+    'status'			=> 'Status',
+    'tag'				=> 'Eiendelsmerke',
+    'update'			=> 'Oppdater eiendel',
+    'warranty'			=> 'Garanti',
+        'warranty_expires'		=> 'Garantien utløper',
+    'years'				=> 'år',
+    'asset_location' => 'Oppdater lokasjon for eiendelen',
+    'asset_location_update_default_current' => 'Oppdater standardlokasjon OG faktisk lokasjon',
+    'asset_location_update_default' => 'Oppdater bare standardlokasjon',
+    'asset_location_update_actual' => 'Oppdater bare faktisk plassering',
+    'asset_not_deployable' => 'Den eiendelstatusen gjør at denne eiendelen ikke kan sjekkes ut.',
+    'asset_not_deployable_checkin' => 'That asset status is not deployable. Using this status label will checkin the asset.',
+    'asset_deployable' => 'This asset can be checked out.',
+    'processing_spinner' => 'Behandler... (Dette kan ta litt tid for store filer)',
+    'processing' => 'Behandler... ',
+    'optional_infos'  => 'Valgfri informasjon',
+    'order_details'   => 'Ordrerelatert informasjon',
+    'calc_eol'    => 'If nulling the EOL date, use automatic EOL calculation based on the purchase date and EOL rate.',
+];
diff --git a/resources/lang/nn-NO/admin/hardware/general.php b/resources/lang/nn-NO/admin/hardware/general.php
new file mode 100644
index 0000000000..d9006fcf32
--- /dev/null
+++ b/resources/lang/nn-NO/admin/hardware/general.php
@@ -0,0 +1,42 @@
+<?php
+
+return [
+    'about_assets_title'           => 'Om assets',
+    'about_assets_text'            => 'Eiendeler er sporet av serienummer eller assetsmerke.  De pleier å være høyere verdi f. eks for å identifisere spesielle ting.',
+    'archived'  				=> 'Arkivert',
+    'asset'  					=> 'Eiendel',
+    'bulk_checkout'             => 'Masseutsjekk',
+    'bulk_checkin'              => 'Bulk Checkin',
+    'checkin'  					=> 'Sjekk inn eiendel',
+    'checkout'  				=> 'Sjekk ut asset',
+    'clone'  					=> 'Klon eiendel',
+    'deployable'  				=> 'Utleverbar',
+    'deleted'  					=> 'Denne eiendelen har blitt slettet.',
+    'delete_confirm'            => 'Er du sikker på at du vil slette denne ressursen?',
+    'edit'  					=> 'Rediger eiendel',
+    'model_deleted'  			=> 'Denne eiendelsmodellen er slettet. Du må gjenopprette modellen før du kan gjenopprette eiendelen.',
+    'model_invalid'             => 'This model for this asset is invalid.',
+    'model_invalid_fix'         => 'The asset must be updated use a valid asset model before attempting to check it in or out, or to audit it.',
+    'requestable'               => 'Forespørrbar',
+    'requested'				    => 'Forespurt',
+    'not_requestable'           => 'Ikke mulig å spørre etter',
+    'requestable_status_warning' => 'Ikke endre forespørselsstatus',
+    'restore'  					=> 'Gjenopprett eiendel',
+    'pending'  					=> 'Under arbeid',
+    'undeployable'  			=> 'Ikke utleverbar',
+    'undeployable_tooltip'  	=> 'Denne ressursen har en statusetikett som ikke er distribuerbar og kan ikke sjekkes ut på dette tidspunktet.',
+    'view'  					=> 'Vis eiendel',
+    'csv_error' => 'Du har en feil i din CSV-fil:',
+    'import_text' => '<p>Upload a CSV that contains asset history. The assets and users MUST already exist in the system, or they will be skipped. Matching assets for history import happens against the asset tag. We will try to find a matching user based on the user\'s name you provide, and the criteria you select below. If you do not select any criteria below, it will simply try to match on the username format you configured in the <code>Admin &gt; General Settings</code>.</p><p>Fields included in the CSV must match the headers: <strong>Asset Tag, Name, Checkout Date, Checkin Date</strong>. Any additional fields will be ignored. </p><p>Checkin Date: blank or future checkin dates will checkout items to associated user.  Excluding the Checkin Date column will create a checkin date with todays date.</p>    ',
+    'csv_import_match_f-l' => 'Prøv å matche brukere av <strong>firstname.lastname</strong> (<code>jane.smith</code>) format',
+    'csv_import_match_initial_last' => 'Prøv å matche brukere med <strong>første første etternavn</strong> (<code>jsmith</code>) format',
+    'csv_import_match_first' => 'Prøv å matche brukere med <strong>fornavn</strong> (<code>jane</code>) format',
+    'csv_import_match_email' => 'Prøv å matche brukere med <strong>email</strong> som brukernavn',
+    'csv_import_match_username' => 'Prøv å matche brukere av <strong>brukernavn</strong>',
+    'error_messages' => 'Feilmeldinger:',
+    'success_messages' => 'Suksessmeldinger:',
+    'alert_details' => 'Vennligst se nedenfor for detaljer.',
+    'custom_export' => 'Egendefinert eksport',
+    'mfg_warranty_lookup' => ':manufacturer Garanti statusoppslag',
+    'user_department' => 'Bruker avdeling',
+];
diff --git a/resources/lang/nn-NO/admin/hardware/message.php b/resources/lang/nn-NO/admin/hardware/message.php
new file mode 100644
index 0000000000..04b3f4ceb7
--- /dev/null
+++ b/resources/lang/nn-NO/admin/hardware/message.php
@@ -0,0 +1,109 @@
+<?php
+
+return [
+
+    'undeployable' 		 => '<strong>Advarsel:</strong> Denne eiendelen er merket som ikke utplasserbar. Vennligst endre status for eiendel dette har endret seg.',
+    'does_not_exist' 	 => 'Eiendel eksisterer ikke.',
+    'does_not_exist_var' => 'Asset with tag :asset_tag not found.',
+    'no_tag' 	         => 'No asset tag provided.',
+    'does_not_exist_or_not_requestable' => 'Eiendelen eksisterer ikke eller kan ikke forespørres.',
+    'assoc_users'	 	 => 'Denne eiendelen er merket som utsjekket til en bruker og kan ikke slettes. Vennligst sjekk inn eiendelen først, og forsøk sletting på nytt. ',
+    'warning_audit_date_mismatch' 	=> 'This asset\'s next audit date (:next_audit_date) is before the last audit date (:last_audit_date). Please update the next audit date.',
+    'labels_generated'   => 'Labels were successfully generated.',
+    'error_generating_labels' => 'Error while generating labels.',
+    'no_assets_selected' => 'No assets selected.',
+
+    'create' => [
+        'error'   		=> 'Eiendelen ble ikke opprettet, prøv igjen :(',
+        'success' 		=> 'Eiendelen ble opprettet :)',
+        'success_linked' => 'Eiendelen med taggen :tag ble opprettet. <strong><a href=":link" style="color: white;">Klikk her for å vise</a></strong>.',
+        'multi_success_linked' => 'Asset with tag :links was created successfully.|:count assets were created succesfully. :links.',
+        'partial_failure' => 'An asset was unable to be created. Reason: :failures|:count assets were unable to be created. Reasons: :failures',
+    ],
+
+    'update' => [
+        'error'   			=> 'Eiendelen ble ikke oppdatert, prøv igjen',
+        'success' 			=> 'Oppdatering av eiendel vellykket.',
+        'encrypted_warning' => 'Eiendel er oppdatert, men kryptert tilpassede felter var ikke grunnet tillatelser',
+        'nothing_updated'	=>  'Ingen felter er valgt, så ingenting ble endret.',
+        'no_assets_selected'  =>  'Ingen felter er valgt, så ingenting ble endret.',
+        'assets_do_not_exist_or_are_invalid' => 'Valgte eiendeler kan ikke oppdateres.',
+    ],
+
+    'restore' => [
+        'error'   		=> 'Eiendel ble ikke gjenopprettet. Prøv igjen',
+        'success' 		=> 'Vellykket gjenoppretting av eiendel.',
+        'bulk_success' 		=> 'Ressursen ble gjenopprettet.',
+        'nothing_updated'   => 'Inger ressurser ble valgt, så ingenting ble gjenoprettet.', 
+    ],
+
+    'audit' => [
+        'error'   		=> 'Asset audit unsuccessful: :error ',
+        'success' 		=> 'Asset audit ble logget.',
+    ],
+
+
+    'deletefile' => [
+        'error'   => 'Fil ble ikke slettet. Prøv igjen.',
+        'success' => 'Vellykket sletting av fil.',
+    ],
+
+    'upload' => [
+        'error'   => 'Fil(er) ble ikke lastet opp. Prøv igjen.',
+        'success' => 'Vellykket opplasting av fil(er).',
+        'nofiles' => 'Ingen fil er valgt til opplasting, eller filen er for stor',
+        'invalidfiles' => 'En eller flere av filene dine er for store eller av en ikke tillatt filtype. Tillatte filtyper er png, gif, jpg, doc, docx, pdf og txt.',
+    ],
+
+    'import' => [
+        'import_button'         => 'Process Import',
+        'error'                 => 'Noen elementer ble ikke importert riktig.',
+        'errorDetail'           => 'Følgende elementer ble ikke importert på grunn av feil.',
+        'success'               => 'Filen har blitt importert',
+        'file_delete_success'   => 'Filen har blitt slettet',
+        'file_delete_error'      => 'Filen kunne ikke bli slettet',
+        'file_missing' => 'Valgt fil mangler (fant ikke filen)',
+        'file_already_deleted' => 'The file selected was already deleted',
+        'header_row_has_malformed_characters' => 'En eller flere attributter i overskriftsraden inneholder feilformede UTF-8 tegn',
+        'content_row_has_malformed_characters' => 'En eller flere attributter i første rad i inneholdet inneholder feilformet UTF-8 tegn',
+        'transliterate_failure' => 'Transliteration from :encoding to UTF-8 failed due to invalid characters in input'
+    ],
+
+
+    'delete' => [
+        'confirm'   	=> 'Er du sikker på at du vil slette eiendelen?',
+        'error'   		=> 'Det oppstod et problem under sletting av eiendel. Vennligst prøv igjen.',
+        'assigned_to_error' => '{1}Asset Tag: :asset_tag is currently checked out. Check in this device before deletion.|[2,*]Asset Tags: :asset_tag are currently checked out. Check in these devices before deletion.',
+        'nothing_updated'   => 'Ingen assets ble valgt, så ingenting ble slettet.',
+        'success' 		=> 'Vellykket sletting av eiendel.',
+    ],
+
+    'checkout' => [
+        'error'   		=> 'Eiendel ble ikke sjekket ut. Prøv igjen',
+        'success' 		=> 'Vellykket utsjekk av eiendel.',
+        'user_does_not_exist' => 'Denne brukeren er ugyldig. Vennligst prøv igjen.',
+        'not_available' => 'Den eiendelen er ikke tilgjengelig til å sjekkes ut!',
+        'no_assets_selected' => 'Du må velge minst én enhet fra listen',
+    ],
+
+    'multi-checkout' => [
+        'error'   => 'Asset was not checked out, please try again|Assets were not checked out, please try again',
+        'success' => 'Asset checked out successfully.|Assets checked out successfully.',
+    ],
+
+    'checkin' => [
+        'error'   		=> 'Eiendel ble ikke sjekket inn. Prøv igjen',
+        'success' 		=> 'Vellykket innsjekk av eiendel.',
+        'user_does_not_exist' => 'Denne brukeren er ugyldig. Vennligst prøv igjen.',
+        'already_checked_in'  => 'Den eiendelen er allerede sjekket inn.',
+
+    ],
+
+    'requests' => [
+        'error'   		=> 'Request was not successful, please try again.',
+        'success' 		=> 'Request successfully submitted.',
+        'canceled'      => 'Request successfully canceled.',
+        'cancel'        => 'Avbryt forespørsel om element',
+    ],
+
+];
diff --git a/resources/lang/nn-NO/admin/hardware/table.php b/resources/lang/nn-NO/admin/hardware/table.php
new file mode 100644
index 0000000000..38b67932af
--- /dev/null
+++ b/resources/lang/nn-NO/admin/hardware/table.php
@@ -0,0 +1,32 @@
+<?php
+
+return [
+
+    'asset_tag'   	=> 'Eiendelsmerke',
+    'asset_model'       => 'Modell',
+    'assigned_to'   => 'Tilordnet til',
+    'book_value'  	=> 'Gjeldende verdi',
+    'change' 		=> 'Inne/ute',
+    'checkout_date' => 'Utsjekkdato',
+    'checkoutto' 	=> 'Utsjekket',
+    'components_cost' => 'Total komponentkostnad',
+    'current_value' => 'Gjeldende verdi',
+    'diff' 			=> 'Forskjell',
+    'dl_csv' 		=> 'Last ned CSV',
+    'eol' 			=> 'EOL',
+    'id'      		=> 'ID',
+    'last_checkin_date' => 'Siste innsjeksdato',
+    'location' 		=> 'Plassering',
+    'purchase_cost'	=> 'Kostnad',
+    'purchase_date'	=> 'Kjøpt',
+    'serial'   		=> 'Serienummer',
+    'status'   		=> 'Status',
+    'title'      	=> 'Eiendel ',
+    'image'		    => 'Enhet bilde',
+    'days_without_acceptance' => 'Dager uten aksept',
+    'monthly_depreciation' => 'Månedlig avskrivning',
+    'requesting_user' => 'Forespurt av',
+    'requested_date' => 'Dato forespurt',
+    'changed'       => 'Endret',
+    'icon' => 'Symbol',
+];
diff --git a/resources/lang/nn-NO/admin/kits/general.php b/resources/lang/nn-NO/admin/kits/general.php
new file mode 100644
index 0000000000..9f157e0449
--- /dev/null
+++ b/resources/lang/nn-NO/admin/kits/general.php
@@ -0,0 +1,51 @@
+<?php
+
+return [
+    'about_kits_title'                  => 'Om forhåndsdefinerte sett',
+    'about_kits_text'                   => 'Forhåndsdefinerte sett lar deg raskt sjekke ut en samling av utstyr (eiendeler, lisenser, etc) til en bruker. Dette kan være nyttig når onboarding-prosessen er konsistent på tvers av mange brukere, slik at alle brukere skal ha det samme utstyret.',
+    'checkout'                          => 'Sjekk ut sett ',
+    'create_success'                    => 'Settet har blitt opprettet.',
+    'create'                            => 'Opprett forhåndsdefinert sett',
+    'update'                            => 'Oppdater forhåndsdefinert sett',
+    'delete_success'                    => 'Settet har blitt slettet.',
+    'update_success'                    => 'Settet har blitt oppdatert.',
+    'none_models'                       => 'Det er ikke nok tilgjengelige ressurser for å sjekke ut :model. Vi trenger :qty stk. ',
+    'none_licenses'                     => 'Det er ikke nok seter for :license til å sjekke ut. Det trengs :qty ekstra. ',
+    'none_consumables'                  => 'Det er ikke nok tilgjengelige :consumable til å sjekke ut. Det trengs :qty. ',
+    'none_accessory'                    => 'Det er ikke nok tilgjengelige :accessory til å sjekke ut. Det trengs :qty. ',
+    'append_accessory'                  => 'Legg til tilbehør',
+    'update_appended_accessory'         => 'Oppdater tilbehør som er lagt til',
+    'append_consumable'                 => 'Legg til forbruksvare',
+    'update_appended_consumable'        => 'Oppdater forbruksvare som er lagt til',
+    'append_license'                    => 'Legg til lisens',
+    'update_appended_license'           => 'Oppdater lisens som er lagt til',
+    'append_model'                      => 'Legg til modell',
+    'update_appended_model'             => 'Oppdater modell',
+    'license_error'                     => 'Lisensen er allerede i settet',
+    'license_added_success'             => 'Lisensen ble lagt til',
+    'license_updated'                   => 'Lisensen ble oppdatert',
+    'license_none'                      => 'Lisens eksisterer ikke',
+    'license_detached'                  => 'Lisensen ble koblet fra',
+    'consumable_added_success'          => 'Forbruksvare lagt til',
+    'consumable_updated'                => 'Forbruksvaren ble oppdatert',
+    'consumable_error'                  => 'Forbruksvaren er allerede i settet',
+    'consumable_deleted'                => 'Slettingen var vellykket',
+    'consumable_none'                   => 'Forbruksvaren finnes ikke',
+    'consumable_detached'               => 'Forbruksvaren ble fjernet',
+    'accessory_added_success'           => 'Tilbehør lagt til',
+    'accessory_updated'                 => 'Tilbehøret ble oppdatert',
+    'accessory_detached'                => 'Tilbehør ble koblet fra',
+    'accessory_error'                   => 'Tilbehøret er allerede i settet',
+    'accessory_deleted'                 => 'Slettingen var vellykket',
+    'accessory_none'                    => 'Tilbehøret finnes ikke',
+    'checkout_success'                  => 'Utsjekk vellykket',
+    'checkout_error'                    => 'Feil ved utsjekk',
+    'kit_none'                          => 'Settet eksisterer ikke',
+    'kit_created'                       => 'Settet ble opprettet',
+    'kit_updated'                       => 'Settet har blitt oppdatert',
+    'kit_not_found'                     => 'Settet ble ikke funnet',
+    'kit_deleted'                       => 'Settet har blitt slettet',
+    'kit_model_updated'                 => 'Modellen ble oppdatert',
+    'kit_model_detached'                => 'Modellen har blitt frakoblet',
+    'model_already_attached'            => 'Model already attached to kit',
+];
diff --git a/resources/lang/nn-NO/admin/labels/message.php b/resources/lang/nn-NO/admin/labels/message.php
new file mode 100644
index 0000000000..4e32365cfe
--- /dev/null
+++ b/resources/lang/nn-NO/admin/labels/message.php
@@ -0,0 +1,11 @@
+<?php
+
+return [
+
+    'invalid_return_count' => 'Ugyldig antall returnert fra :name. Forventet :expected, fikk :actual.',
+    'invalid_return_type'  => 'Ugyldig type returnert fra :name. Forventet :expected, fikk :actual.',
+    'invalid_return_value' => 'Ugyldig verdi returnert fra :name. Forventet :expected, fikk :actual.',
+
+    'does_not_exist' => 'Etiketten finnes ikke',
+    
+];
diff --git a/resources/lang/nn-NO/admin/labels/table.php b/resources/lang/nn-NO/admin/labels/table.php
new file mode 100644
index 0000000000..5bc5429c6e
--- /dev/null
+++ b/resources/lang/nn-NO/admin/labels/table.php
@@ -0,0 +1,19 @@
+<?php
+
+return [
+    'example_company'    => 'Test bedrift begrenset',
+    'example_defaultloc' => 'Bygning 1',
+    'example_category'   => 'Test kategori',
+    'example_location'   => 'Bygning 2',
+    'example_manufacturer'  => 'Test Manufacturing Inc.',
+    'example_model'      => 'Test modell',
+    'example_supplier'   => 'Test bedrift begrenset',
+    'labels_per_page'    => 'Etiketter',
+    'support_fields'     => 'Felt',
+    'support_asset_tag'  => 'Etikett',
+    'support_1d_barcode' => '1D',
+    'support_2d_barcode' => '2D',
+    'support_logo'       => 'Logo',
+    'support_title'      => 'Tittel',
+
+];
\ No newline at end of file
diff --git a/resources/lang/nn-NO/admin/licenses/form.php b/resources/lang/nn-NO/admin/licenses/form.php
new file mode 100644
index 0000000000..47a1ffcc07
--- /dev/null
+++ b/resources/lang/nn-NO/admin/licenses/form.php
@@ -0,0 +1,22 @@
+<?php
+
+return array(
+
+    'asset'             => 'Eiendel',
+    'checkin'           => 'Sjekk inn',
+    'create'            => 'Opprett lisens',
+    'expiration'        => 'Utløpsdato',
+    'license_key'       => 'Produktnøkkel',
+    'maintained'        => 'Vedlikeholdt',
+    'name'              => 'Navn programvare',
+    'no_depreciation'   => 'Ingen avskrivning',
+    'purchase_order'    => 'Innkjøpsordrenummer',
+    'reassignable'      => 'Kan tildeles på ny',
+    'remaining_seats'   => 'Gjenværende setelisenser',
+    'seats'             => 'Setelisenser',
+    'termination_date'  => 'Sluttdato',
+    'to_email'          => 'Lisensiert til e-post',
+    'to_name'           => 'Lisensiert til navn',
+    'update'            => 'Oppdater lisens',
+    'checkout_help'     => 'Du må sjekke ut en lisens til en maskinvare- eller person-eiendel. Du kan velge begge, men eier av eiendel må være lik den du sjekker eiendel ut til.'
+);
diff --git a/resources/lang/nn-NO/admin/licenses/general.php b/resources/lang/nn-NO/admin/licenses/general.php
new file mode 100644
index 0000000000..21df57a62a
--- /dev/null
+++ b/resources/lang/nn-NO/admin/licenses/general.php
@@ -0,0 +1,52 @@
+<?php
+
+return array(
+    'about_licenses_title'      => 'Om lisenser',
+    'about_licenses'            => 'Lisenser er brukt til å spore bruk av programvare.  De har et angitt antall seter som kan sjekkes ut til enkeltpersoner',
+    'checkin'  					=> 'Sjekk inn setelisens',
+    'checkout_history'  		=> 'Utsjekkhistorikk',
+    'checkout'  				=> 'Sjekk ut setelisens',
+    'edit'  					=> 'Rediger lisens',
+    'filetype_info'				=> 'Gyldige filtyper er png, gif, jpg, jpeg, doc docx, pdf, txt, zip og rar.',
+    'clone'  					=> 'Klon lisens',
+    'history_for'  				=> 'Historikk for ',
+    'in_out'  					=> 'Inne/ute',
+    'info'  					=> 'Lisensinformasjon',
+    'license_seats'  			=> 'Setelisenser',
+    'seat'  					=> 'Setelisens',
+    'seat_count'  				=> 'Seat :count',
+    'seats'  					=> 'Setelisenser',
+    'software_licenses'  		=> 'Programvarelisenser',
+    'user'  					=> 'Bruker',
+    'view'  					=> 'Vis lisens',
+    'delete_disabled'           => 'Denne lisensen kan ikke slettes ennå fordi det fremdeles er noen seter i den som er sjekket ut.',
+    'bulk'                      =>
+        [
+            'checkin_all'           => [
+                'button'            => 'Sjekk inn alle seter',
+                'modal'             => 'This action will checkin one seat. | This action will checkin all :checkedout_seats_count seats for this license.',
+                'enabled_tooltip'   => 'Sjekk inn ALLE seter for denne lisensen fra både brukere og ressurser',
+                'disabled_tooltip'  => 'Dette er deaktivert fordi det ikke er seter som er sjekket ut',
+                'disabled_tooltip_reassignable'  => 'Dette er deaktivert fordi lisensen ikke kan refordeles',
+                'success'           => 'Lisensen ble sjekket inn! | Alle lisensene ble vellykket sjekket inn!',
+                'log_msg'           => 'Checked in via bulk license checkin in license GUI',
+            ],
+
+            'checkout_all'              => [
+                'button'                => 'Sjekk ut alle seter',
+                'modal'                 => 'Denne handlingen vil utsjekke ett sete til den første tilgjengelige brukeren. | Denne handlingen vil kassere alle :available_seats_count seter til de første tilgjengelige brukerne. En bruker anses som tilgjengelig for dette setet hvis de ikke allerede har sjekket ut denne lisensen til dem, og Auto-Assign License egenskapen er aktivert på deres brukerkonto.',
+                'enabled_tooltip'   => 'Sjekk ut ALLE seter (eller så mange som er tilgjengelige) til ALLE brukere',
+                'disabled_tooltip'  => 'Dette er deaktivert fordi det ikke er tilgjengelige seter for øyeblikket',
+                'success'           => 'Lisensen ble sjekket ut! | :count lisenser ble vellykket sjekket ut!',
+                'error_no_seats'    => 'Det er ingen gjenværende seter igjen for denne lisensen.',
+                'warn_not_enough_seats'    => ':count brukere ble tildelt denne lisensen, men vi gikk tom for tilgjengelige lisensseter.',
+                'warn_no_avail_users'    => 'Ingenting å gjøre. Det er ingen brukere som ikke allerede har denne lisensen tildelt dem.',
+                'log_msg'           => 'Sjekket ut via masselisensutsjekking i lisens GUI',
+
+
+            ],
+    ],
+
+    'below_threshold' => 'Det er bare :remaining_count seter igjen for denne lisensen med et minimum av :min_amt. Du kan vurdere å kjøpe flere seter.',
+    'below_threshold_short' => 'Denne varen er under det minstekravene kreves.',
+);
diff --git a/resources/lang/nn-NO/admin/licenses/message.php b/resources/lang/nn-NO/admin/licenses/message.php
new file mode 100644
index 0000000000..d788f77a2a
--- /dev/null
+++ b/resources/lang/nn-NO/admin/licenses/message.php
@@ -0,0 +1,57 @@
+<?php
+
+return array(
+
+    'does_not_exist' => 'Lisensen finnes ikke, eller du har ikke tillatelse til å se den.',
+    'user_does_not_exist' => 'Brukeren finnes ikke, eller du har ikke tillatelse til å se dem.',
+    'asset_does_not_exist' 	=> 'Eiendelen du prøver å koble til denne lisensen eksisterer ikke.',
+    'owner_doesnt_match_asset' => 'Eiendelen du prøver å koble til denne lisensen er eid av noen andre enn personen du har valgt i tildelt til-nedtrekkslista.',
+    'assoc_users'	 => 'Denne lisensen er sjekket ut til en bruker og kan ikke slettes. Vennligst sjekk inn lisensen først, og forsøk sletting på nytt. ',
+    'select_asset_or_person' => 'Du må velge en ressurs eller en bruker, men ikke begge.',
+    'not_found' => 'Lisens ikke funnet',
+    'seats_available' => ':seat_count seter tilgjengelige',
+
+
+    'create' => array(
+        'error'   => 'Lisens ble ikke opprettet, prøv igjen.',
+        'success' => 'Vellykket opprettelse av lisens.'
+    ),
+
+    'deletefile' => array(
+        'error'   => 'Fil ble ikke slettet. Prøv igjen.',
+        'success' => 'Fil ble slettet.',
+    ),
+
+    'upload' => array(
+        'error'   => 'Fil(er) ble ikke lastet opp. Prøv igjen.',
+        'success' => 'Fil(er) ble slettet.',
+        'nofiles' => 'Ingen fil er valgt til opplasting, eller filen er for stor',
+        'invalidfiles' => 'En eller flere av filene er for stor, eller er en filtype som ikke er tillatt. Tillatte filtyper er png, gif, jpg, jpeg, doc, docx, pdf, txt, zip, rar, rtf, xml, og lic.',
+    ),
+
+    'update' => array(
+        'error'   => 'Lisens ble ikke oppdatert, prøv igjen',
+        'success' => 'Vellykket oppdatering av lisens.'
+    ),
+
+    'delete' => array(
+        'confirm'   => 'Er du sikker på at du vil slette denne lisensen?',
+        'error'   => 'Det oppstod et problem under sletting av lisens. Vennligst prøv igjen.',
+        'success' => 'Vellykket sletting av lisens.'
+    ),
+
+    'checkout' => array(
+        'error'   => 'Det oppstod et problem under utsjekk av lisens. Vennligst prøv igjen.',
+        'success' => 'Vellykket utsjekk av lisens',
+        'not_enough_seats' => 'Ikke nok lisensseter tilgjengelige for utsjekking',
+        'mismatch' => 'The license seat provided does not match the license',
+        'unavailable' => 'This seat is not available for checkout.',
+    ),
+
+    'checkin' => array(
+        'error'   => 'Det oppstod et problem under innsjekk av lisens. Vennligst prøv igjen.',
+        'not_reassignable' => 'License not reassignable',
+        'success' => 'Vellykket innsjekk av lisens'
+    ),
+
+);
diff --git a/resources/lang/nn-NO/admin/licenses/table.php b/resources/lang/nn-NO/admin/licenses/table.php
new file mode 100644
index 0000000000..dc6b160311
--- /dev/null
+++ b/resources/lang/nn-NO/admin/licenses/table.php
@@ -0,0 +1,18 @@
+<?php
+
+return array(
+
+    'assigned_to'   	=> 'Tildelt til',
+    'checkout'   		=> 'Inne/ute',
+    'deleted_at'        => 'Slettet ved',
+    'id'      			=> 'ID',
+    'license_email'   	=> 'Lisens e-post',
+    'license_name'   	=> 'Lisensiert til',
+    'purchase_date'   	=> 'Kjøpedato',
+    'purchased'   		=> 'Kjøpt',
+    'seats'   			=> 'Setelisenser',
+    'hardware'   		=> 'Maskinvare',
+    'serial'   			=> 'Serienummer',
+    'title'      		=> 'Lisens',
+
+);
diff --git a/resources/lang/nn-NO/admin/locations/message.php b/resources/lang/nn-NO/admin/locations/message.php
new file mode 100644
index 0000000000..62c2156916
--- /dev/null
+++ b/resources/lang/nn-NO/admin/locations/message.php
@@ -0,0 +1,35 @@
+<?php
+
+return array(
+
+    'does_not_exist' => 'Lokasjon eksisterer ikke.',
+    'assoc_users'    => 'This location is not currently deletable because it is the location of record for at least one asset or user, has assets assigned to it, or is the parent location of another location. Please update your records to no longer reference this location and try again ',
+    'assoc_assets'	 => 'Lokasjonen er tilknyttet minst en eiendel og kan ikke slettes. Oppdater dine eiendeler slik at de ikke refererer til denne lokasjonen, og prøv igjen. ',
+    'assoc_child_loc'	 => 'Lokasjonen er overordnet til minst en underlokasjon og kan ikke slettes. Oppdater din lokasjoner til å ikke referere til denne lokasjonen, og prøv igjen. ',
+    'assigned_assets' => 'Tildelte ressurser',
+    'current_location' => 'Gjeldende plassering',
+    'open_map' => 'Open in :map_provider_icon Maps',
+
+
+    'create' => array(
+        'error'   => 'Lokasjon ble ikke opprettet, prøv igjen.',
+        'success' => 'Vellykket opprettelse av lokasjon.'
+    ),
+
+    'update' => array(
+        'error'   => 'Lokasjon ble ikke oppdatert, prøv igjen',
+        'success' => 'Vellykket oppdatering av plassering.'
+    ),
+
+    'restore' => array(
+        'error'   => 'Location was not restored, please try again',
+        'success' => 'Location restored successfully.'
+    ),
+
+    'delete' => array(
+        'confirm'   	=> 'Er du sikker på at du vil slette denne plasseringen?',
+        'error'   => 'Det oppstod et problem under sletting av plassering. Vennligst prøv igjen.',
+        'success' => 'Vellykket sletting av plassering.'
+    )
+
+);
diff --git a/resources/lang/nn-NO/admin/locations/table.php b/resources/lang/nn-NO/admin/locations/table.php
new file mode 100644
index 0000000000..767d3fea4c
--- /dev/null
+++ b/resources/lang/nn-NO/admin/locations/table.php
@@ -0,0 +1,43 @@
+<?php
+
+return [
+    'about_locations_title'     => 'Om Lokasjoner',
+    'about_locations'           => 'Plassering brukes til å spore stedsinformasjon for brukere, eiendeler og andre elementer',
+    'assets_rtd'                => 'Eiendeler', // This has NEVER meant Assets Retired. I don't know how it keeps getting reverted.
+    'assets_checkedout'         => 'Eiendeler tildelt',
+    'id'                        => 'ID',
+    'city'                      => 'By',
+    'state'                     => 'Stat',
+    'country'                   => 'Land',
+    'create'                    => 'Opprett plassering',
+    'update'                    => 'Oppdater plassering',
+    'print_assigned'            => 'Skriv ut tilordnede',
+    'print_all_assigned'        => 'Skriv ut alle tilordnede',
+    'name'                      => 'Plasseringsnavn',
+    'address'                   => 'Adresse',
+    'address2'                   => 'Adresselinje 2',
+    'zip'                       => 'Postnummer',
+    'locations'                 => 'Plasseringer',
+    'parent'                    => 'Overordnet',
+    'currency'                  => 'Valuta i lokasjon',
+    'ldap_ou'                   => 'LDAP-søk OU',
+    'user_name'                 => 'Brukernavn',
+    'department'                => 'Avdeling',
+    'location'                  => 'Lokasjon',
+    'asset_tag'                 => 'Eiendelsmerke',
+    'asset_name'                => 'Navn',
+    'asset_category'            => 'Kategori',
+    'asset_manufacturer'        => 'Produsent',
+    'asset_model'               => 'Modell',
+    'asset_serial'              => 'Serienummer',
+    'asset_location'            => 'Lokasjon',
+    'asset_checked_out'         => 'Utsjekket',
+    'asset_expected_checkin'    => 'Forventet innsjekk',
+    'date'                      => 'Dato:',
+    'phone'                     => 'Sted telefon',
+    'signed_by_asset_auditor'   => 'Signert av (Eiendelskontrollør):',
+    'signed_by_finance_auditor' => 'Undertegnet av (finansrevisor):',
+    'signed_by_location_manager' => 'Signert av (Stedsansvarlig):',
+    'signed_by'                 => 'Signert av:',
+    'clone'  					=> 'Clone Location',
+];
diff --git a/resources/lang/nn-NO/admin/manufacturers/message.php b/resources/lang/nn-NO/admin/manufacturers/message.php
new file mode 100644
index 0000000000..83aab0c4f3
--- /dev/null
+++ b/resources/lang/nn-NO/admin/manufacturers/message.php
@@ -0,0 +1,30 @@
+<?php
+
+return array(
+
+    'support_url_help' => 'Variabler <code>{LOCALE}</code>, <code>{SERIAL}</code>, <code>{MODEL_NUMBER}</code>og <code>{MODEL_NAME}</code> kan brukes i din URL for å få disse verdiene auto-populere når du ser ressurser - for eksempel https://checkcoverage.apple.com/{LOCALE}/{SERIAL}.',
+    'does_not_exist' => 'Produsent eksisterer ikke.',
+    'assoc_users'	 => 'Denne produsenten er tilknyttet minst en modell og kan ikke slettes. Oppdatèr modellen(e) til ikke å bruke denne produsenten, og prøv igjen. ',
+
+    'create' => array(
+        'error'   => 'Produsent ble ikke opprettet. Prøv igjen.',
+        'success' => 'Opprettelse av produsent vellykket.'
+    ),
+
+    'update' => array(
+        'error'   => 'Produsent ble ikke oppdatert. Prøv igjen',
+        'success' => 'Oppdatering av produsent vellykket.'
+    ),
+
+    'restore' => array(
+        'error'   => 'Produsent ble ikke gjenopprettet. Prøv igjen',
+        'success' => 'Gjenopprettelse av produsent vellykket.'
+    ),
+
+    'delete' => array(
+        'confirm'   => 'Er du sikker på at du vil slette denne produsenten?',
+        'error'   => 'Det oppstod et problem under sletting av produsenten. Prøv igjen.',
+        'success' => 'Sletting av produsenten var vellykket.'
+    )
+
+);
diff --git a/resources/lang/nn-NO/admin/manufacturers/table.php b/resources/lang/nn-NO/admin/manufacturers/table.php
new file mode 100644
index 0000000000..084bb0392d
--- /dev/null
+++ b/resources/lang/nn-NO/admin/manufacturers/table.php
@@ -0,0 +1,16 @@
+<?php
+
+return array(
+    'about_manufacturers_title'    => 'Om produsenter',
+    'about_manufacturers_text'  => 'Produsenter er firmaer som lager dine eiendeler. Du kan lagre viktig kundestøtte kontaktinformasjon om dem her, som vises på sidene om asset-detaljer.',
+    'asset_manufacturers'	=> 'Eiendelsprodusenter',
+    'create'				=> 'Opprett produsent',
+    'id'   					=> 'ID',
+    'name'      			=> 'Navn',
+    'support_email'   		=> 'Støtte epost',
+    'support_phone'   		=> 'Støttetelefon',
+    'support_url'   		=> 'Support URL',
+    'warranty_lookup_url'   => 'Garanti oppslag URL',
+    'update'				=> 'Endre produsent',
+
+);
diff --git a/resources/lang/nn-NO/admin/models/general.php b/resources/lang/nn-NO/admin/models/general.php
new file mode 100644
index 0000000000..4a1b51f4f7
--- /dev/null
+++ b/resources/lang/nn-NO/admin/models/general.php
@@ -0,0 +1,18 @@
+<?php
+
+return array(
+    'about_models_title'     => 'Om asset modeller',
+    'about_models_text'           => 'Asset modeller er en måte å gruppere identiske eiendeler. "MBP 2013", "IPhone 6s", etc.',
+    'deleted'  					=> 'Denne modellen har blitt slettet.',
+    'bulk_delete'               => 'Bulk slett modeller',
+    'bulk_delete_help'               => 'Bruk merkeboksene nedenfor til å bekrefte sletting av de merkede modellene. Modeller som har eiendeler tilknyttet kan ikke slettes før eiendelene har blitt tilknyttet en annen modell.',
+    'bulk_delete_warn'          => 'Du er i ferd med å slette en ressursmodell. | Du er i ferd med å slette :model_count modeller.',
+    'restore'                   => 'Gjenopprett modell',
+    'requestable'               => 'Brukere kan be om denne modellen',
+	'show_mac_address'			      => 'Vis felt for MAC-adresse for denne modellen',
+    'view_deleted'              => 'Vis slettede',
+    'view_models'               => 'Vis modeller',
+    'fieldset'                  => 'Felt',
+    'no_custom_field'           => 'Ingen egendefinerte felt',
+    'add_default_values'        => 'Legg til standardverdier',
+);
diff --git a/resources/lang/nn-NO/admin/models/message.php b/resources/lang/nn-NO/admin/models/message.php
new file mode 100644
index 0000000000..002a35bffa
--- /dev/null
+++ b/resources/lang/nn-NO/admin/models/message.php
@@ -0,0 +1,47 @@
+<?php
+
+return array(
+
+    'deleted' => 'Slettet ressursmodell',
+    'does_not_exist' => 'Modell eksisterer ikke.',
+    'no_association' => 'ADVARSEL! Ressursmodellen for dette elementet er ugyldig eller mangler!',
+    'no_association_fix' => 'Dette vil ødelegge ting på merkelige og forferdelige måte. Rediger denne ressursen nå for å tildele den en modell.',
+    'assoc_users'	 => 'Denne modellen er tilknyttet en eller flere eiendeler og kan ikke slettes. Slett eiendelene, og prøv å slette modellen igjen. ',
+    'invalid_category_type' => 'This category must be an asset category.',
+
+    'create' => array(
+        'error'   => 'Modellen ble ikke opprettet. Prøv igjen.',
+        'success' => 'Opprettelse av modell var vellykket.',
+        'duplicate_set' => 'En eiendel med dette navnet, produsenten og modelnummeret eksisterer allerede.',
+    ),
+
+    'update' => array(
+        'error'   => 'Modell ble ikke oppdatert. Prøv igjen',
+        'success' => 'Oppdatering av modell vellykket.',
+    ),
+
+    'delete' => array(
+        'confirm'   => 'Er du sikker på at du vil slette denne modellen?',
+        'error'   => 'Det oppstod et problem under sletting av modellen. Prøv igjen.',
+        'success' => 'Sletting av modell vellykket.'
+    ),
+
+    'restore' => array(
+        'error'   		=> 'Modell ble ikke gjenopprettet. Prøv igjen',
+        'success' 		=> 'Vellykket gjenoppretting av modell.'
+    ),
+
+    'bulkedit' => array(
+        'error'   		=> 'Ingen felt ble endret, så ingenting ble oppdatert.',
+        'success' 		=> 'Modelloppdatering vellyket.| :model_count modeller oppdatert.',
+        'warn'          => 'Du er i ferd med å oppdatere egenskapene til følgende modell: Du er i ferd med å redigere egenskapene for følgende modeller: model_count modeller:',
+
+    ),
+
+    'bulkdelete' => array(
+        'error'   		    => 'Ingen modeller ble valgt, så ingenting ble slettet.',
+        'success' 		    => 'Modellen ble slettet!g_:success_count modeller slettet!',
+        'success_partial' 	=> ':Success_count-modell(ene) ble slettet, men fail_count kunne ikke slettes fordi de fortsatt har eiendeler knyttet til dem.'
+    ),
+
+);
diff --git a/resources/lang/nn-NO/admin/models/table.php b/resources/lang/nn-NO/admin/models/table.php
new file mode 100644
index 0000000000..b8c7daa389
--- /dev/null
+++ b/resources/lang/nn-NO/admin/models/table.php
@@ -0,0 +1,17 @@
+<?php
+
+return array(
+
+    'create'				=> 'Opprett modell',
+    'created_at' 			=> 'Opprettet',
+    'eol'	 				=> 'Levetid',
+    'modelnumber'   		=> 'Modellnummer',
+    'name'      			=> 'Modellnavn',
+    'numassets' 			=> 'Eiendeler',
+    'title'					=> 'Modeller',
+    'update'				=> 'Endre modell',
+    'view'					=> 'Vis modell',
+    'update'				=> 'Endre modell',
+    'clone'				=> 'Klon modell',
+    'edit'				=> 'Endre modell',
+);
diff --git a/resources/lang/nn-NO/admin/reports/general.php b/resources/lang/nn-NO/admin/reports/general.php
new file mode 100644
index 0000000000..17da068dba
--- /dev/null
+++ b/resources/lang/nn-NO/admin/reports/general.php
@@ -0,0 +1,23 @@
+<?php
+
+return [
+    'info'   => 'Velg de alternativene du ønsker skal inngå i rapporten.',
+    'deleted_user' => 'Slettet bruker',
+    'send_reminder' => 'Send påminnelse',
+    'cannot_send_reminder' => 'User has been deleted or does not have an email address so cannot receive a reminder',
+    'reminder_sent' => 'Påminnelse sendt',
+    'acceptance_deleted' => 'Aksepteringsforespørsel slettet',
+    'acceptance_request' => 'Akseptanseforespørsel',
+    'custom_export' => [
+        'user_address' => 'Brukerens adresse',
+        'user_city' => 'Bruker by',
+        'user_state' => 'Bruker tilstand',
+        'user_country' => 'Bruker Land',
+        'user_zip' => 'Brukers postnummer'
+    ],
+    'open_saved_template' => 'Open Saved Template',
+    'save_template' =>  'Save Template',
+    'select_a_template' => 'Select a Template',
+    'template_name' => 'Template Name',
+    'update_template' => 'Update Template',
+];
diff --git a/resources/lang/nn-NO/admin/reports/message.php b/resources/lang/nn-NO/admin/reports/message.php
new file mode 100644
index 0000000000..2800bbdf0b
--- /dev/null
+++ b/resources/lang/nn-NO/admin/reports/message.php
@@ -0,0 +1,16 @@
+<?php
+
+return [
+    'about_templates' => 'About Saved Templates',
+    'saving_templates_description' => 'Select your options, then enter the name of your template in the box above and click the \'Save Template\' button. Use the dropdown to select a previously saved template.',
+    'create'  => [
+        'success' => 'Template saved successfully',
+    ],
+    'update' => [
+        'success' => 'Template updated successfully',
+    ],
+    'delete' => [
+        'success' => 'Template deleted',
+        'no_delete_permission' => 'Template does not exist or you do not have permission to delete it.',
+    ],
+];
diff --git a/resources/lang/nn-NO/admin/settings/general.php b/resources/lang/nn-NO/admin/settings/general.php
new file mode 100644
index 0000000000..76fd67976c
--- /dev/null
+++ b/resources/lang/nn-NO/admin/settings/general.php
@@ -0,0 +1,490 @@
+<?php
+
+return [
+    'ad'				        => 'Active Directory',
+    'ad_domain'				    => 'Active Directory domene',
+    'ad_domain_help'			=> 'Dette er noen ganger det samme som e-post domene, men ikke alltid.',
+    'ad_append_domain_label'    => 'Legg til domenenavn',
+    'ad_append_domain'          => 'Legg til domenenavn i feltet for brukernavn',
+    'ad_append_domain_help'     => 'Bruker kreves ikke å skrive "brukernavn@domene.local", de kan bare skrive "brukernavn".',
+    'admin_cc_email'            => 'CC e-post',
+    'admin_cc_email_help'       => 'Send a copy of checkin/checkout emails to this address.',
+    'admin_settings'            => 'Admin innstillinger',
+    'is_ad'				        => 'Dette er en Active Directory server',
+    'alerts'                	=> 'Varsler',
+    'alert_title'               => 'Oppdater varslingsinnstillinger',
+    'alert_email'				=> 'Send varslinger til',
+    'alert_email_help'          => 'E-postadresser eller distribusjonslister som du ønsker varsler skal sendes til, kommaseparert.',
+    'alerts_enabled'			=> 'Varslinger aktivert',
+    'alert_interval'			=> 'Terskel for utløpende varslinger (dager)',
+    'alert_inv_threshold'		=> 'Terskel for eiendelsvarslinger',
+    'allow_user_skin'           => 'Tillat tilpasset utseende for bruker',
+    'allow_user_skin_help_text' => 'Kryss av denne boksen for å la brukere overstyre standardutseendet med et annet.',
+    'asset_ids'					=> 'Eiendels-IDer',
+    'audit_interval'            => 'Audit intervall',
+    'audit_interval_help'       => 'Hvis du er påkrevd å regelmessig sjekke ressursene dine, angi intervallet i måneder som du bruker. Hvis du oppdaterer denne verdien, vil hele "neste revisjonsdatoer" for ressurser med en kommende revisjonsdato bli oppdatert.',
+    'audit_warning_days'        => 'Audit terskelverdi for advarsel',
+    'audit_warning_days_help'   => 'Hvor mange dager i forveien bør vi advare deg når eiendeler forfaller for overvåking?',
+    'auto_increment_assets'		=> 'Generer automatisk økende eiendelsmerker',
+    'auto_increment_prefix'		=> 'Prefiks (valgfritt)',
+    'auto_incrementing_help'    => 'Slå på automatisk økende eiendelsmerker for å velge dette',
+    'backups'					=> 'Sikkerhetskopier',
+    'backups_help'              => 'Opprette, laste ned og gjenopprette sikkerhetskopier ',
+    'backups_restoring'         => 'Gjenoppretting fra sikkerhetskopi',
+    'backups_clean' => 'Clean the backed-up database before restore',
+    'backups_clean_helptext' => "This can be useful if you're changing between database versions",
+    'backups_upload'            => 'Last opp sikkerhetskopi',
+    'backups_path'              => 'Sikkerhetskopier på tjeneren lagres i <code>:path</code>',
+    'backups_restore_warning'   => 'Use the restore button <small><span class="btn btn-xs btn-warning"><i class="text-white fas fa-retweet" aria-hidden="true"></i></span></small> to restore from a previous backup. (This does not currently work with S3 file storage or Docker.)<br><br>Your <strong>entire :app_name database and any uploaded files will be completely replaced</strong> by what\'s in the backup file  ',
+    'backups_logged_out'         => 'Alle eksisterende brukere, inkludert deg, vil bli logget ut når din gjenoppretting er fullført.',
+    'backups_large'             => 'Veldig store sikkerhetskopier kan få tidsavbrudd under gjenopprettingsforsøket og må fortsatt kjøres via kommandolinjen. ',
+    'barcode_settings'			=> 'Strekkodeinnstillinger',
+    'confirm_purge'			    => 'Bekreft rensking',
+    'confirm_purge_help'		=> 'Skriv "DELETE" i boksen under for å fjerne dine slettende data. Denne handlingen kan ikke angres og vil PERMANENT slette alle slettede elementer og brukere. (Du bør først gjøre en sikkerhetskopi, bare for å være trygg.)',
+    'custom_css'				=> 'Egendefinert CSS',
+    'custom_css_placeholder'	=> 'Add your custom CSS',
+    'custom_css_help'			=> 'Legg til egendefinert CSS. Ikke ta med taggene &lt;style&gt;&lt;/style&gt;.',
+    'custom_forgot_pass_url'	=> 'Egendefinert passord tilbakestillings-URL',
+    'custom_forgot_pass_url_help'	=> 'Erstatter den innebygde glemt passord-URLen i innloggingsbildet. Nyttig for å sende brukere til intern eller leid LDAP passordgjenopprettingsfunksjonalitet. Vil deaktivere den lokale glemt passord-funksjonaliteten.',
+    'dashboard_message'			=> 'Dashboardmelding',
+    'dashboard_message_help'	=> 'Denne teksten vises på dashbordet for alle som har tillatelse til å vise oversikten.',
+    'default_currency'  		=> 'Standardvaluta',
+    'default_eula_text'			=> 'Standard EULA',
+    'default_eula_text_placeholder' => 'Add your default EULA text',
+    'default_language'			=> 'Standardspråk',
+    'default_eula_help_text'	=> 'Du kan også knytte tilpassede EULAer til bestemte eiendelskategorier.',
+    'acceptance_note'           => 'Add a note for your decision (Optional)',
+    'display_asset_name'        => 'Vis eiendelsnavn',
+    'display_checkout_date'     => 'Vis utsjekksdato',
+    'display_eol'               => 'Vis levetid i tabellvisning',
+    'display_qr'                => 'Display 2D barcode',
+    'display_alt_barcode'		=> 'Vis 1D strekkode',
+    'barcode_type'				=> '2D strekkodetype',
+    'alt_barcode_type'			=> '1D strekkodetype',
+    'enabled'                   => 'Slått på',
+    'eula_settings'				=> 'EULA-innstillinger',
+    'eula_markdown'				=> 'Denne EULAen tillater <a href="https://help.github.com/articles/github-flavored-markdown/">Github Flavored markdown</a>.',
+    'empty_row_count'           => 'Field Start Offset (Empty Rows)',
+    'empty_row_count_help'      => 'Fields will begin populating after this many empty rows are skipped at the top of the label.',
+    'favicon'                   => 'Favicon',
+    'favicon_format'            => 'Aksepterte filtyper er ico, png og gif. Andre bildeformater vil muligens ikke fungere i alle nettlesere.',
+    'favicon_size'          => 'Favoritt-symboler bør være kvadratiske, 16x16 punkter.',
+    'footer_text'               => 'Ekstra bunnteksttekst ',
+    'footer_text_help'          => 'Denne teksten vil fremstå i høyre del av bunnteksten. Lenker er tillatt ved å bruke <a href="https://help.github.com/articles/github-flavored-markdown/">Github flavored markdown</a>.
+Linjeskift, topptekst, bilder, osv. kan føre til uventede resultater.',
+    'footer_text_placeholder'   => 'Optional footer text',
+    'general_settings'			=> 'Generelle innstillinger',
+    'general_settings_help'     => 'Standard EULA og mer',
+    'generate_backup'			=> 'Generer Sikkerhetskopi',
+    'google_workspaces'         => 'Google arbeidsområder',
+    'header_color'              => 'Overskriftsfarge',
+    'info'                      => 'Disse innstillingene lar deg tilpasse enkelte aspekter av installasjonen din.',
+    'label_logo_size'           => 'Kvadratisk logo vil se best ut. Den vil vises øverst til høyre på hver merkelapp. ',
+    'laravel'                   => 'Laravel-versjon',
+    'ldap'                      => 'LDAP',
+    'ldap_default_group'        => 'Standard tillatelsesgruppe',
+    'ldap_default_group_info'   => 'Velg en gruppe for nylig synkroniserte brukere. Husk at brukeren får rettigheter til gruppen den tildeles.',
+    'no_default_group'          => 'Ingen standard gruppe',
+    'ldap_help'                 => 'LDAP/Active Directory',
+    'ldap_client_tls_key'       => 'LDAP-klient TLS-nøkkel',
+    'ldap_client_tls_cert'      => 'LDAP TLS klient-sertifikat',
+    'ldap_enabled'              => 'LDAP aktivert',
+    'ldap_integration'          => 'LDAP Integrering',
+    'ldap_settings'             => 'LDAP Instillinger',
+    'ldap_client_tls_cert_help' => 'Klientside TLS-sertifikat og nøkkel for LDAP tilkoblinger er vanligvis bare nyttig i Google Workspace-konfigurasjoner med "Secure LDAP." Begge er påkrevd.',
+    'ldap_location'             => 'LDAP-plassering',
+'ldap_location_help'             => 'LDAP plasserings feltet burde brukes hvis <strong> en OU ikke blir brukt i "Base Bind DN"-</strong> La denne stå tom hvis et OU søk brukes.',
+    'ldap_login_test_help'      => 'Skriv inn et gyldig LDAP brukernavn og passord fra samme base DN som du anga ovenfor for å teste at LDAP-innlogging er riktig konfigurert. DU MÅ LAGRE DINE OPPDATERTE LDAP-INNSTILLINGER FØRST.',
+    'ldap_login_sync_help'      => 'Tester at LDAP kan synkronisere. Feil i LDAP autentiseringsspørringen din kan før til at brukere ikke kan logge inn. DU MÅ LAGRE DINE OPPDATERTE LDAP-INNSTILLINGER FØRST.',
+    'ldap_manager'              => 'LDAP Administrator',
+    'ldap_server'               => 'LDAP Server',
+    'ldap_server_help'          => 'This should start with ldap:// (for unencrypted) or ldaps:// (for TLS or SSL)',
+    'ldap_server_cert'			=> 'Validering av LDAP SSL sertifikat',
+    'ldap_server_cert_ignore'	=> 'Godta ugyldig SSL sertifikat',
+    'ldap_server_cert_help'		=> 'Kryss av denne boksen hvis du bruker et selv-signert SSL sertifikat og vil akkseptere et ugyldig sertifikat.',
+    'ldap_tls'                  => 'Bruk TLS',
+    'ldap_tls_help'             => 'Kryss av denne hvis du kjører STARTTLS på LDAP-serveren. ',
+    'ldap_uname'                => 'LDAP Bundet brukernavn',
+    'ldap_dept'                 => 'LDAP avdeling',
+    'ldap_phone'                => 'LDAP telefonnummer',
+    'ldap_jobtitle'             => 'LDAP Jobbtittel',
+    'ldap_country'              => 'LDAP Land',
+    'ldap_pword'                => 'LDAP Bind passord',
+    'ldap_basedn'               => 'Base Bind DN',
+    'ldap_filter'               => 'LDAP Filter',
+    'ldap_pw_sync'              => 'Cache LDAP Passwords',
+    'ldap_pw_sync_help'         => 'Uncheck this box if you do not wish to keep LDAP passwords cached as local hashed passwords. Disabling this means that your users may not be able to login if your LDAP server is unreachable for some reason.',
+    'ldap_username_field'       => 'Brukernavn Felt',
+    'ldap_lname_field'          => 'Etternavn',
+    'ldap_fname_field'          => 'LDAP Fornavn',
+    'ldap_auth_filter_query'    => 'LDAP autentisering spørring',
+    'ldap_version'              => 'LDAP Versjon',
+    'ldap_active_flag'          => 'LDAP aktive flag',
+    'ldap_activated_flag_help'  => 'Denne verdien brukes til å bestemme om en synkronisert bruker kan logge inn på Snipe-IT. <strong>Det påvirker ikke muligheten til å sjekke elementer inn eller ut til dem</strong>, og bør være <strong>egenskapsnavn</strong> i din AD/LDAP, <strong>ikke verdien</strong>. <br><br>Hvis dette feltet er satt til et feltnavn som ikke eksisterer i AD/LDAP, eller verdien i AD/LDAP feltet er satt til <code>0</code> eller <code>usann</code>, <strong>vil bruker pålogging bli deaktivert</strong>. Hvis verdien i AD/LDAP feltet er satt til <code>1</code> eller <code>sann</code> eller <em>annen tekst</em> betyr at brukeren kan logge inn. Når feltet er tomt i din AD, respekterer vi <code>-brukerAccountControl</code> attributt, som vanligvis tillater ikke-suspenderte brukere å logge inn.',
+    'ldap_invert_active_flag'   => 'LDAP Invert Active Flag',
+    'ldap_invert_active_flag_help'     => 'If enabled: when the value returned by LDAP Active Flag is <code>0</code> or <code>false</code> the user account will be active.',
+    'ldap_emp_num'              => 'LDAP ansattnummer',
+    'ldap_email'                => 'LDAP E-post',
+    'ldap_test'                 => 'Test LDAP',
+    'ldap_test_sync'            => 'Test LDAP-synkronisering',
+    'license'                   => 'Programvarelisens',
+    'load_remote'               => 'Load Remote Avatars',
+    'load_remote_help_text'		=> 'Uncheck this box if your install cannot load scripts from the outside internet. This will prevent Snipe-IT from trying load avatars from Gravatar or other outside sources.',
+    'login'                     => 'Innloggingsforsøk',
+    'login_attempt'             => 'Innloggingsforsøk',
+    'login_ip'                  => 'IP-addresse',
+    'login_success'             => 'Suksess?',
+    'login_user_agent'          => 'Brukeragent',
+    'login_help'                => 'Liste over forsøkte pålogginger',
+    'login_note'                => 'Logg inn melding',
+    'login_note_placeholder'            => "If you do not have a login or have found a device belonging to this company, please call technical support at 888-555-1212. Thank you.",
+    'login_note_help'           => 'Eventuelt inkludere et par setninger på logg inn skjermen, for eksempel for å hjelpe mennesker som har funnet en mistet eller stjålet enhet. Dette feltet godtar <a href="https://help.github.com/articles/github-flavored-markdown/"> Github flavored markdown</a>',
+    'login_remote_user_text'    => 'Fjernbruker pålogging valg',
+    'login_remote_user_enabled_text' => 'Aktiver innlogging med Remote User Header',
+    'login_remote_user_enabled_help' => 'Aktiverer autentisering via REMOTE_USER headeren som beskrevet i "Common Gateway Interface (rfc3875)"',
+    'login_common_disabled_text' => 'Deaktiver andre godkjenningsmekanismer',
+    'login_common_disabled_help' => 'Deaktiverer andre autentiseringsmekanismer. Aktiver dette valget kun hvis du er sikker på at din REMOTE_USER innlogging allerede fungerer',
+    'login_remote_user_custom_logout_url_text' => 'Tilpasset utloggingsadresse',
+    'login_remote_user_custom_logout_url_help' => 'Hvis en URL angis her blir brukerne videresendt til denne URLen etter utlogging fra Snipe-IT. Dette er nyttig for korrekt lukking av autentiseringssesjoner hos din autentiseringsleverandør.',
+    'login_remote_user_header_name_text' => 'Egendefinert brukernavn-header',
+    'login_remote_user_header_name_help' => 'Bruk angitt header-felt i stedet for REMOTE_USER',
+    'logo'                    	=> 'Logo',
+    'logo_print_assets'         => 'Bruk i Print',
+    'logo_print_assets_help'    => 'Bruk branding på utskrivbare eiendelslister ',
+    'full_multiple_companies_support_help_text' => 'Vis kun eiendeler til bedriften brukere (inkl administratorer) er knyttet til.',
+    'full_multiple_companies_support_text' => 'Full støtte for flere bedrifter',
+    'scope_locations_fmcs_support_text'  => 'Scope Locations with Full Multiple Companies Support',
+    'scope_locations_fmcs_support_help_text'  => 'Restrict locations to their selected company.',
+    'scope_locations_fmcs_check_button' => 'Check Compatibility',
+    'scope_locations_fmcs_support_disabled_text'  => 'This option is disabled because you have conflicting locations set for :count or more items.',
+    'show_in_model_list'   => 'Vis i Model nedtrekksmeny',
+    'optional'					=> 'valgfri',
+    'per_page'                  => 'Resultater pr side',
+    'php'                       => 'PHP-versjon',
+    'php_info'                  => 'PHP info',
+    'php_overview'              => 'PHP',
+    'php_overview_help'         => 'PHP systeminfo',
+    'php_gd_info'               => 'Du må installere php-gd for å vise QR-koder. Se installasjonsinstruksjoner.',
+    'php_gd_warning'            => 'PHP bildebehandling og GD-plugin er IKKE installert.',
+    'pwd_secure_complexity'     => 'Passordkompleksitet',
+    'pwd_secure_complexity_help' => 'Velg hvilken passord kompleksitet du ønsker å håndheve.',
+    'pwd_secure_complexity_disallow_same_pwd_as_user_fields' => 'Passord kan ikke være det samme som fornavn, etternavn, e-post eller brukernavn',
+    'pwd_secure_complexity_letters' => 'Krev minst én bokstav',
+    'pwd_secure_complexity_numbers' => 'Krev minst ett tall',
+    'pwd_secure_complexity_symbols' => 'Krev minst ett symbol',
+    'pwd_secure_complexity_case_diff' => 'Krev minst én stor bokstav og én liten bokstav',
+    'pwd_secure_min'            => 'Passord minimum antall tegn',
+    'pwd_secure_min_help'       => 'Minimum tillatt verdi er 8',
+    'pwd_secure_uncommon'       => 'Forhindre vanlige passord',
+    'pwd_secure_uncommon_help'  => 'Dette vil forhindre brukere fra å bruke vanlige passord fra de vanligste 10 000 passord som er rapportert.',
+    'qr_help'                   => 'Aktiver QR-koder først for å velge denne',
+    'qr_text'                   => 'Tekst QR-kode',
+    'saml'                      => 'SAML',
+    'saml_title'                => 'Oppdater SAML-innstillinger',
+    'saml_help'                 => 'SAML-innstillinger',
+    'saml_enabled'              => 'SAML aktivert',
+    'saml_integration'          => 'SAML-integrasjon',
+    'saml_sp_entityid'          => 'Entity ID',
+    'saml_sp_acs_url'           => 'Assertion Consumer Service (ACS) URL',
+    'saml_sp_sls_url'           => 'Single Logout Service (SLS) URL',
+    'saml_sp_x509cert'          => 'Offentlig sertifikat',
+    'saml_sp_metadata_url'      => 'Metadata URL',
+    'saml_idp_metadata'         => 'SAML IdP Metadata',
+    'saml_idp_metadata_help'    => 'Du kan spesifisere IdP-metadata ved hjelp av URL eller XML-fil.',
+    'saml_attr_mapping_username' => 'Attributt for brukernavn',
+    'saml_attr_mapping_username_help' => 'NameID vil bli brukt hvis tilordning av attributtet er uspesifisert eller ugyldig.',
+    'saml_forcelogin_label'     => 'SAML Tving Innlogging',
+    'saml_forcelogin'           => 'Gjør SAML til standard innlogging',
+    'saml_forcelogin_help'      => 'Du kan bruke \'/login?nosaml\' for å komme til den normale innloggingssiden.',
+    'saml_slo_label'            => 'SAML utlogging',
+    'saml_slo'                  => 'Send en Logoutforespørsel til IdP på Logg ut',
+    'saml_slo_help'             => 'Dette vil føre til at brukeren først blir omdirigert til idP når hen logger ut. Ikke kryss av om idP ikke støtter \'SP-initiated SAML SLO\'.',
+    'saml_custom_settings'      => 'SAML Egendefinerte innstillinger',
+    'saml_custom_settings_help' => 'Du kan angi flere innstillinger til onelogin/php-saml biblioteket. Bruk på eget ansvar.',
+    'saml_download'             => 'Last ned Metadata',
+    'setting'                   => 'Innstilling',
+    'settings'                  => 'Innstillinger',
+    'show_alerts_in_menu'       => 'Vis varsler i toppmenyen',
+    'show_archived_in_list'     => 'Arkiverte eiendeler',
+    'show_archived_in_list_text'     => 'Vis arkiverte eiendeler i "alle eiendeler" utlisting',
+    'show_assigned_assets'      => 'Vis eiendeler tildelt til eiendeler',
+    'show_assigned_assets_help' => 'Vis ressurser som ble tildelt andre eiendeler i Vis bruker -> Eiendeler, Vis bruker -> Info -> Skriv ut alle tildelte og i Konto -> Vis tildelte eiendeler.',
+    'show_images_in_email'     => 'Vis bilder i e-post',
+    'show_images_in_email_help'   => 'Fjern merkingen i denne boksen hvis Snipe-IT-installasjonen er bak en VPN eller et lukket nettverk og brukere utenfor nettverket ikke vil kunne laste bilder servert fra denne installasjonen i e-posten.',
+    'site_name'                 => 'Nettstedsnavn',
+    'integrations'               => 'Integrasjoner',
+    'slack'                     => 'Slack',
+    'general_webhook'           => 'Generell Webhook',
+    'ms_teams'                  => 'Microsoft Lag',
+    'webhook'                   => ':app',
+    'webhook_presave'           => 'Test til lagring',
+    'webhook_title'               => 'Oppdater Webhook innstillinger',
+    'webhook_help'                => 'Integrasjons instillinger',
+    'webhook_botname'             => ':app botnavn',
+    'webhook_channel'             => ':app kanal',
+    'webhook_endpoint'            => ':app endepunkt',
+    'webhook_integration'         => ':app Innstillinger',
+    'webhook_test'                 =>'Test :app integrasjon',
+    'webhook_integration_help'    => ':app-integrasjon er valgfritt, men endepunktet og kanalen er påkrevd hvis du ønsker å bruke den. For å konfigurere :app integrering, må du først <a href=":webhook_link" target="_new" rel="noopener">lage en innkommende webhook</a> på din :app konto. Klikk på knappen <strong>Test :app Integrasjon</strong> for å bekrefte at innstillingene er korrekte før du lagrer. ',
+    'webhook_integration_help_button'    => 'Du vil se en testknapp etter at du har lagret din :app informasjon.',
+    'webhook_test_help'           => 'Test om din :app integrasjon er riktig konfigurert. DU MÅ LAGRE DINE OPPDATERTE :app INNSTILLINGER FØRST.',
+    'shortcuts_enabled'         => 'Enable Shortcuts',
+    'shortcuts_help_text'       => '<strong>Windows</strong>: Alt + Access key, <strong>Mac</strong>: Control + Option + Access key',
+    'snipe_version'  			=> 'Snipe-IT-versjon',
+    'support_footer'            => 'Støtte Footer Lenker ',
+    'support_footer_help'       => 'Angi hvem som kan se lenker til Snipe-IT supportinformasjon og brukermanual',
+    'version_footer'            => 'Versjon i Footer ',
+    'version_footer_help'       => 'Angi hvem som kan se Snipe-IT versjon og build-nummer.',
+    'system'                    => 'Systeminformasjon',
+    'update'                    => 'Oppdater innstillinger',
+    'value'                     => 'Verdi',
+    'brand'                     => 'Merkevare',
+    'brand_help'                => 'Logo, nettstedsnavn',
+    'web_brand'                 => 'Velg branding-type',
+    'about_settings_title'      => 'Om Innstillinger',
+    'about_settings_text'       => 'Disse innstillingene lar deg tilpasse enkelte aspekter av installasjonen din.',
+    'labels_per_page'           => 'Etiketter per side',
+    'label_dimensions'          => 'Etikettstørrelsen (inches)',
+    'next_auto_tag_base'        => 'Neste automatiske økning',
+    'page_padding'              => 'Side marger (inches)',
+    'privacy_policy_link'       => 'Link til personvernregler',
+    'privacy_policy'            => 'Personvernerklæring',
+    'privacy_policy_link_help'  => 'Angi en URL i dette feltet for å inkludere en lenke til personvern-policy i applikasjonsbunntekst og i alle eposter som dette systemet sender ut. Støtter GDPR. ',
+    'purge'                     => 'Tømme slettede poster',
+    'purge_deleted'             => 'Fjern slettede ',
+    'labels_display_bgutter'    => 'Etikett bunnmarg',
+    'labels_display_sgutter'    => 'Etikett sidemarg',
+    'labels_fontsize'           => 'Label skriftstørrelse',
+    'labels_pagewidth'          => 'Etikett arkbredde',
+    'labels_pageheight'         => 'Etikett arkhøyde',
+    'label_gutters'        => 'Etikett tegnavstand (tommer)',
+    'page_dimensions'        => 'Sidedimensjon (tommer)',
+    'label_fields'          => 'Etikett synlige felter',
+    'inches'        => 'tommer',
+    'width_w'        => 'b',
+    'height_h'        => 'h',
+    'show_url_in_emails'                => 'Link til Snipe-IT i e-post',
+    'show_url_in_emails_help_text'      => 'Fjern markeringen i denne boksen hvis du ikke vil koble tilbake til Snipe-IT-installasjonen i e-postboksene dine. Nyttig hvis de fleste av brukerne aldri logger inn.',
+    'text_pt'        => 'pt',
+    'thumbnail_max_h'   => 'Maks miniatyrbilde høyde',
+    'thumbnail_max_h_help'   => 'Maksimal høyde i piksler som miniatyrbilder kan vise i visningen liste. Min 25, maks 500.',
+    'two_factor'        => 'To-faktor autentisering',
+    'two_factor_secret'        => 'To-faktor kode',
+    'two_factor_enrollment'        => 'To-faktor registrering',
+    'two_factor_enabled_text'        => 'Aktiver to-faktor autentisering',
+    'two_factor_reset'        => 'Tilbakestill to-faktor hemmelighet',
+    'two_factor_reset_help'        => 'Dette vil tvinge brukeren til å legge inn enheten på nytt med autentiseringsappen. Dette kan være nyttig hvis enheten deres er mistet eller stjålet. ',
+    'two_factor_reset_success'          => 'To-faktor enhet resatt',
+    'two_factor_reset_error'          => 'Reset av to-faktor enhet feilet',
+    'two_factor_enabled_warning'        => 'Aktivering av to-faktor autentisering hvis ikke allerede aktivert vil øyeblikkelig tvinge deg til å autentisere med enhet som er aktivert i Google Authenticator. Du vil ha mulighet til å aktivere enheten din hvis ingen er aktivert fra før.',
+    'two_factor_enabled_help'        => 'Dette vil slå på to-faktor autentisering med Google Authenticator.',
+    'two_factor_optional'        => 'Selektiv (brukere kan aktivere eller deaktivere hvis tillatt)',
+    'two_factor_required'        => 'Påkrevd for alle brukere',
+    'two_factor_disabled'        => 'Deaktivert',
+    'two_factor_enter_code'	=> 'Skriv inn to-faktor kode',
+    'two_factor_config_complete'	=> 'Send kode',
+    'two_factor_enabled_edit_not_allowed' => 'Systemansvarlig tillater ikke at du redigerer denne innstillingen.',
+    'two_factor_enrollment_text'	=> "To-faktor autentisering er påkrevd, men enheten din har ikke blitt aktivert for dette enda. Åpne Google Authenticator-appen og scan inn QR-koden nedenfor for å aktivere. Når du har aktivert enheten din, skriv inn koden nedenfor",
+    'require_accept_signature'      => 'Kreve signatur',
+    'require_accept_signature_help_text'      => 'Aktivering av denne funksjonen ville forlange brukernes å fysisk logge ut for å akseptere en eiendel.',
+    'require_checkinout_notes'  => 'Require Notes on Checkin/Checkout',
+    'require_checkinout_notes_help_text'    => 'Enabling this feature will require the note fields to be populated when checking in or checking out an asset.',
+    'left'        => 'venstre',
+    'right'        => 'høyre',
+    'top'        => 'topp',
+    'bottom'        => 'bunn',
+    'vertical'        => 'vertikal',
+    'horizontal'        => 'horisontal',
+    'unique_serial'                => 'Unike serienumre',
+    'unique_serial_help_text'                => 'Håndhever at  eiendelsserienumre er unike',
+    'zerofill_count'        => 'Lengden på ID-merker, inkludert zerofill',
+    'username_format_help'   => 'Denne innstillingen vil bare bli brukt av importprosessen dersom et brukernavn ikke er oppgitt, og vi må generere et brukernavn for deg.',
+    'oauth_title' => 'OAuth API-innstillinger',
+    'oauth_clients' => 'OAuth Clients',
+    'oauth' => 'OAuth',
+    'oauth_help' => 'Oauth Endepunktinnstillinger',
+    'oauth_no_clients' => 'You have not created any OAuth clients yet.',
+    'oauth_secret' => 'Secret',
+    'oauth_authorized_apps' => 'Authorized Applications',
+    'oauth_redirect_url' => 'Redirect URL',
+    'oauth_name_help' => ' Something your users will recognize and trust.',
+    'oauth_scopes' => 'Scopes',
+    'oauth_callback_url' => 'Your application authorization callback URL.',
+    'create_client' => 'Create Client',
+    'no_scopes' => 'No scopes',
+    'asset_tag_title' => 'Oppdater Innstillinger for Eiendelsmerker',
+    'barcode_title' => 'Oppdater strekkodeinnstillinger',
+    'barcodes' => 'Strekkoder',
+    'barcodes_help_overview' => 'Strekkode- &amp; QR-innstillinger',
+    'barcodes_help' => 'Dette forsøker å slette hurtigbufrede strekkoder. Dette vil vanligvis bare bli brukt hvis strekkodeinnstillingene dine er endret, eller hvis Snipe-IT adressen er endret. Strekkoder genereres på nytt når de blir åpnet neste gang.',
+    'barcodes_spinner' => 'Forsøker å slette filer...',
+    'barcode_delete_cache' => 'Slett strekkode-buffer',
+    'branding_title' => 'Oppdater Branding-innstillinger',
+    'general_title' => 'Oppdater generelle innstillinger',
+    'mail_test' => 'Send test',
+    'mail_test_help' => 'Dette vil forsøke å sende en e-post til :replyto.',
+    'filter_by_keyword' => 'Filtrer ved å sette nøkkelord',
+    'security' => 'Sikkerhet',
+    'security_title' => 'Oppdater sikkerhetsinnstillinger',
+    'security_help' => 'Tofaktor, passordbegrensinger',
+    'groups_help' => 'Tillatelsesgrupper',
+    'localization' => 'Oversettelser',
+    'localization_title' => 'Oppdater språkinnstillinger',
+    'localization_help' => 'Språk, datoformat',
+    'notifications' => 'Varslinger',
+    'notifications_help' => 'E-post varsler og revisjonsinnstillinger',
+    'asset_tags_help' => 'Økninger og prefikser',
+    'labels' => 'Etiketter',
+    'labels_title' => 'Oppdater etikettinnstillinger',
+    'labels_help' => 'Barcodes &amp; label settings',
+    'purge_help' => 'Tømme slettede poster',
+    'ldap_extension_warning' => 'Det ser ikke ut som LDAP-utvidelsen er installert eller aktivert på denne serveren. Du kan fortsatt lagre innstillingene, men du må installere og aktivere LDAP-tillegget til PHP før LDAP-synkronisering eller innlogging virker.',
+    'ldap_ad' => 'LDAP/AD',
+    'ldap_test_label' => 'Test LDAP Sync',
+    'ldap_test_login' => ' Test LDAP Login',
+    'ldap_username_placeholder' => 'LDAP Username',
+    'ldap_password_placeholder' => 'LDAP Password',
+    'employee_number' => 'Ansattnummer',
+    'create_admin_user' => 'Opprett en bruker ::',
+    'create_admin_success' => 'Suksess! Din adminbruker har blitt lagt til!',
+    'create_admin_redirect' => 'Klikk her for å gå til innlogging!',
+    'setup_migrations' => 'Database-migreringer ::',
+    'setup_no_migrations' => 'Det var ingenting å migrere. Databasetabellene var allerede oppdaterte!',
+    'setup_successful_migrations' => 'Databasetabellene er opprettet',
+    'setup_migration_output' => 'Migrasjonsmeldinger:',
+    'setup_migration_create_user' => 'Neste: Opprett bruker',
+    'ldap_settings_link' => 'Side for LDAP-innstillinger',
+    'slack_test' => 'Test <i class="fab fa-slack"></i> Integrasjon',
+    'status_label_name' => 'Status Label Name',
+    'super_admin_only'  => 'Super Admin Only',
+    'label2_enable'           => 'Ny etikett generator',
+    'label2_enable_help'      => 'Bytt til den nye etikette generatoren. <b>Merk: Du må lagre denne innstillingen før du setter andre.</b>',
+    'label2_template'         => 'Mal',
+    'label2_template_help'    => 'Velg mal som skal brukes til etikettgenerering',
+    'label2_title'            => 'Tittel',
+    'label2_title_help'       => 'Tittelen som skal vises på etiketter som støtter den',
+    'label2_title_help_phold' => 'Plassholderen <code>{COMPANY}</code> vil bli erstattet med navnet til ressursen&apos;s firma navn',
+    'label2_asset_logo'       => 'Bruk ressurs logo',
+    'label2_asset_logo_help'  => 'Bruk logoen til ressursen&apos;s tildelte selskap, i stedet for verdien fra <code>:setting_name</code>',
+    'label2_1d_type'          => '1D strekkodetype',
+    'label2_1d_type_help'     => 'Format for 1D strekkoder',
+    'label2_2d_type'          => '2D strekkodetype',
+    'label2_2d_type_help'     => 'Format for 2D strekkoder',
+    'label2_2d_target'        => '2D strekkodemål',
+    'label2_2d_target_help'   => 'The data that will be contained in the 2D barcode',
+    'label2_fields'           => 'Feltdefinisjoner',
+    'label2_fields_help'      => 'Feltene kan legges til, fjernes, og sorteres i venstre kolonne. For hvert felt kan flere alternativer for etikett og datakilde legges til, fjernes, og sorteres på nytt i høyre kolonne.',
+    'purge_barcodes' => 'Purge Barcodes',
+    'help_asterisk_bold'    => 'Teksten som skrives inn som <code>**text**</code> vil vises som fet',
+    'help_blank_to_use'     => 'La stå tom for å bruke verdien fra <code>:setting_name</code>',
+    'help_default_will_use' => '<code>:default</code> will use the value from <code>:setting_name</code>. <br>Note that the value of the barcodes must comply with the respective barcode spec in order to be successfully generated. Please see <a href="https://snipe-it.readme.io/docs/barcodes">the documentation <i class="fa fa-external-link"></i></a> for more details. ',
+    'asset_id'              => 'Asset ID',
+    'data'               => 'Data',
+    'default'               => 'Standard',
+    'none'                  => 'Ingen',
+    'google_callback_help' => 'Dette bør angis som callback-URL-en i Google OAuth app innstillingene i organisasjonen din&apos;s <strong><a href="https://console.cloud.google.com/" target="_blank">Google utvikler konsoll <i class="fa fa-external-link" aria-hidden="true"></i></a></strong>.',
+    'google_login'      => 'Google Workspace innloggingsinnstillinger',
+    'enable_google_login'  => 'Aktiver innlogging med Google Workspace',
+    'enable_google_login_help'  => 'Brukerne vil ikke automatisk bli betjent. De må ha en eksisterende konto her OG i Google Workspace, og deres brukernavn her må matche sin Google Workspace e-post adresse. ',
+    'mail_reply_to' => 'E-post svar-til adresse',
+    'mail_from' => 'E-post fra adressen',
+    'database_driver' => 'Databasedriver',
+    'bs_table_storage' => 'Tabell Lagring',
+    'timezone' => 'Tidssone',
+    'test_mail' => 'Test Mail',
+    'profile_edit'          => 'Edit Profile',
+    'profile_edit_help'          => 'Allow users to edit their own profiles.',
+    'default_avatar' => 'Custom Default Avatar',
+    'default_avatar_help' => 'This image will be displayed as a profile if a user does not have a profile photo.',
+    'restore_default_avatar' => 'Restore <a href=":default_avatar" data-toggle="lightbox" data-type="image">original system default avatar</a>',
+    'restore_default_avatar_help' => '',
+    'due_checkin_days' => 'Due For Checkin Warning',
+    'due_checkin_days_help' => 'How many days before the expected checkin of an asset should it be listed in the "Due for checkin" page?',
+    'no_groups' => 'No groups have been created yet. Visit <code>Admin Settings > Permission Groups</code> to add one.',
+    'text' => 'Text',
+
+    'username_formats' => [
+        'username_format'		=> 'Format brukernavn',
+        'firstname_lastname_format'	=> 'First Name Last Name (jane.smith)',
+        'first_name_format'	        => 'First Name (jane)',
+        'last_name_format'		=> 'Last Name (doe)',
+        'filastname_format'			=> 'First Initial Last Name (jsmith)',
+        'lastnamefirstinitial_format' =>  'Last Name First Initial (smithj)',
+        'firstname_lastname_underscore_format' => 'First Name Last Name (jane_smith)',
+        'firstinitial.lastname' => 'First Initial Last Name (j.smith)',
+        'lastname_firstinitial' => 'Last Name First Initial (smith_j)',
+        'lastname_dot_firstinitial_format' => 'Last Name First Initial (smith.j)',
+        'firstnamelastname'     => 'First Name Last Name (janesmith)',
+        'firstnamelastinitial'  => 'First Name Last Initial (janes)',
+        'lastnamefirstname'      => 'Last Name.First Name (smith.jane)',
+    ],
+
+    'email_formats' => [
+        'email_format'			=> 'E-postformat',
+        'firstname_lastname_format'	=> 'Fornavn Etternavn (oladunk@example.com)',
+        'first_name_format'		=> 'Fornavn (oladunk@example.com)',
+        'last_name_format'		=> 'Last Name (doe@example.com)',
+        'filastname_format'			=> 'Fornavn (kun initial) Etternavn (oladunk@example.com)',
+        'lastnamefirstinitial_format' =>  'Etternavn Initialer (oladunk@example.com)',
+        'firstname_lastname_underscore_format' => 'Fornavn Etternavn (oladunk@example.com)',
+        'firstinitial.lastname' => 'Fornavn Initialer Etternavn (j.smith@example.com)',
+        'lastname_firstinitial' => 'Etternavn Fornavn Initialer (smith_j@example.com)',
+        'lastname_dot_firstinitial_format' => 'Last Name First Initial (smith.j@example.com)',
+        'firstnamelastname'     => 'Fornavn Etternavn (oladunk@example.com)',
+        'firstnamelastinitial'  => 'Fornavn Etternavn Initialer (janes@example.com)',
+        'lastnamefirstname'      => 'Last Name.First Name (smith.jane@example.com)',
+    ],
+
+
+
+    'logo_labels' => [
+        'acceptance_pdf_logo'       => 'PDF Logo',
+        'email_logo'                => 'E-postlogo',
+        'label_logo'                => 'Etikett-logo',
+        'logo'                      => 'Site Logo',
+        'favicon'                   => 'Favicon',
+    ],
+
+    'logo_help' => [
+        'email_logo_size'       => 'Kvadratiske logoer ser best ut i e-post. ',
+    ],
+
+    'logo_option_types' => [
+        'text' => 'Text',
+        'logo' => 'Logo',
+        'logo_and_text' => 'Logo and Text',
+    ],
+
+
+    'legends' => [
+        'scoping' => 'Scoping',
+        'formats' => 'Default Formats',
+        'profiles' => 'User Profiles',
+        'eula' => 'EULA & Acceptance Preferences',
+        'misc_display' => 'Miscellaneous Display Options',
+        'email' => 'Email Preferences',
+        'checkin' => 'Checkin Preferences',
+        'dashboard' => 'Login & Dashboard Preferences',
+        'misc' => 'Miscellaneous',
+        'logos' => 'Logos & Display',
+        'colors' => 'Colors & Skins',
+        'footer' => 'Footer Preferences',
+        'security' => 'Security Preferences',
+        'general' => 'General',
+        'intervals' => 'Intervals & Thresholds',
+    ],
+
+
+    /* Keywords for settings overview help */
+    'keywords' => [
+        'brand'             => 'footer, logo, print, theme, skin, header, colors, color, css',
+        'general_settings'  => 'bedriftens støtte, signatur, e-postformat, brukerformat, bilder, per side, miniatyrbilde, eula, graviter, forelder, dashbord, personvern',
+        'groups'            => 'permissions, permission groups, authorization',
+        'labels'            => 'labels, barcodes, barcode, sheets, print, upc, qr, 1d, 2d',
+        'localization'      => 'localization, currency, local, locale, time zone, timezone, international, internatinalization, language, languages, translation',
+        'php_overview'      => 'phpinfo, system, info',
+        'purge'             => 'slett permanent',
+        'security'          => 'password, passwords, requirements, two factor, two-factor, common passwords, remote login, logout, authentication',
+    ],
+
+];
diff --git a/resources/lang/nn-NO/admin/settings/message.php b/resources/lang/nn-NO/admin/settings/message.php
new file mode 100644
index 0000000000..5b47ee6bcb
--- /dev/null
+++ b/resources/lang/nn-NO/admin/settings/message.php
@@ -0,0 +1,59 @@
+<?php
+
+return [
+
+    'update' => [
+        'error'                 => 'En feil oppstod under oppdatering. ',
+        'success'               => 'Oppdatering av innstillinger vellykket.',
+    ],
+    'backup' => [
+        'delete_confirm'        => 'Er du sikker på at du vil slette denne sikkerhetskopien? Denne handlingen kan ikke angres. ',
+        'file_deleted'          => 'Den Sikkerhetskopierte filen ble slettet. ',
+        'generated'             => 'En ny sikkerhetskopi fil ble opprettet.',
+        'file_not_found'        => 'Den backup-filen ble ikke funnet på serveren.',
+        'restore_warning'       => 'Ja, kjør gjenoppretting. Jeg forstår at dette vil overskive alle eksisterende data som er i databasen. Dette vil også logge ut alle eksisterende brukere (inkludert meg selv).',
+        'restore_confirm'       => 'Er du sikker på at du vil gjenopprette databasen fra :filename?'
+    ],
+    'restore' => [
+        'success'               => 'Your system backup has been restored. Please log in again.'
+    ],
+    'purge' => [
+        'error'     => 'Det oppstod en feil under fjerning. ',
+        'validation_failed'     => 'Din fjerningsbekreftelse er feil. Vennligst skriv inn ordet "DELETE" i bekreftelsesboksen.',
+        'success'               => 'Slettede rader ble fjernet.',
+    ],
+    'mail' => [
+        'sending' => 'Sender e-post...',
+        'success' => 'E-post er sendt!',
+        'error' => 'E-post kunne ikke sendes.',
+        'additional' => 'Ingen ytterligere feilmelding oppgitt. Sjekk e-postinnstillingene og loggen.'
+    ],
+    'ldap' => [
+        'testing' => 'Tester LDAP-tilkobling, binding og spørring ...',
+        '500' => '500 serverfeil. Sjekk tjenerens logger for mer informasjon.',
+        'error' => 'Noe gikk galt :(',
+        'sync_success' => 'Et utvalg på 10 brukere som returneres fra LDAP-serveren basert på innstillingene:',
+        'testing_authentication' => 'Tester LDAP-autentisering...',
+        'authentication_success' => 'Brukeren ble autentisert mot LDAP!'
+    ],
+    'labels' => [
+        'null_template' => 'Label template not found. Please select a template.',
+        ],
+    'webhook' => [
+        'sending' => 'Sender :app test melding...',
+        'success' => 'Ditt :webhook_name integrasjon fungerer!',
+        'success_pt1' => 'Suksess! Sjekk ',
+        'success_pt2' => ' kanalen din for testmelding, og sørg for å klikke på SAVE nedenfor for å lagre innstillingene.',
+        '500' => '500 Tjenerfeil.',
+        'error' => 'Noe gikk galt. :app svarte med: :error_message',
+        'error_redirect' => 'FEIL: 301/302 :endpoint returnerer en omaddressering. Av sikkerhetsgrunner følger vi ikke omadressering. Vennligst bruk det faktiske endepunktet.',
+        'error_misc' => 'Noe gikk galt. :( ',
+        'webhook_fail' => ' webhook notification failed: Check to make sure the URL is still valid.',
+        'webhook_channel_not_found' => ' webhook channel not found.',
+        'ms_teams_deprecation' => 'The selected Microsoft Teams webhook URL will be deprecated Dec 31st, 2025. Please use a workflow URL. Microsoft\'s documentation on creating a workflow can be found <a href="https://support.microsoft.com/en-us/office/create-incoming-webhooks-with-workflows-for-microsoft-teams-8ae491c7-0394-4861-ba59-055e33f75498" target="_blank"> here.</a>',
+    ],
+    'location_scoping' => [
+        'not_saved' => 'Your settings were not saved.',
+        'mismatch' => 'There is 1 item in the database that need your attention before you can enable location scoping.|There are :count items in the database that need your attention before you can enable location scoping.',
+    ],
+];
diff --git a/resources/lang/nn-NO/admin/settings/table.php b/resources/lang/nn-NO/admin/settings/table.php
new file mode 100644
index 0000000000..0dbe87ea15
--- /dev/null
+++ b/resources/lang/nn-NO/admin/settings/table.php
@@ -0,0 +1,6 @@
+<?php
+
+return array(
+    'created'   => 'Opprettet',
+    'size' => 'Størrelse',
+);
diff --git a/resources/lang/nn-NO/admin/statuslabels/message.php b/resources/lang/nn-NO/admin/statuslabels/message.php
new file mode 100644
index 0000000000..03e2bd6e9b
--- /dev/null
+++ b/resources/lang/nn-NO/admin/statuslabels/message.php
@@ -0,0 +1,32 @@
+<?php
+
+return [
+
+    'does_not_exist' => 'Status-etiketten finnes ikke.',
+    'deleted_label' => 'Slettet statusmerke',
+    'assoc_assets'	 => 'Denne status-etiketten er for øyeblikket i bruk på minst en eiendel, og kan ikke slettes. Vennligst endre dine eiendeler til å ikke bruke denne statusen, og prøv igjen. ',
+
+    'create' => [
+        'error'   => 'Statusmerket ble ikke opprettet. Prøv igjen.',
+        'success' => 'Statusmerket ble opprettet.',
+    ],
+
+    'update' => [
+        'error'   => 'Statusmerket ble ikke oppdatert. Prøv igjen',
+        'success' => 'Vellykket oppdatering av statusmerke.',
+    ],
+
+    'delete' => [
+        'confirm'   => 'Er du sikker på at du vil slette dette statusmerket?',
+        'error'   => 'Det oppstod et problem under sletting av statusmerket. Prøv igjen.',
+        'success' => 'Vellykket sletting av statusmerke.',
+    ],
+
+    'help' => [
+        'undeployable'   => 'Disse eiendelene kan ikke tilordnes noen.',
+        'deployable'   => 'Disse eiendelene kan sjekkes ut. Når de er tildelt, antar de en metastatus på <i class="fas fa-circle text-blue"></i> <strong>Utlevert</strong>.',
+        'archived'   => 'Disse eiendelene kan ikke sjekkes ut, og vises bare i arkivert visning. Dette er nyttig for å beholde informasjon om eiendeler for budsjettering / historiske formål, men å holde dem ut av den daglige aktivitetslisten.',
+        'pending'   => 'Disse eiendelene kan ikke tildeles til noen, ofte brukt til gjenstander som er ute for reparasjon, men forventes å komme tilbake til omløp.',
+    ],
+
+];
diff --git a/resources/lang/nn-NO/admin/statuslabels/table.php b/resources/lang/nn-NO/admin/statuslabels/table.php
new file mode 100644
index 0000000000..f33797c07f
--- /dev/null
+++ b/resources/lang/nn-NO/admin/statuslabels/table.php
@@ -0,0 +1,19 @@
+<?php
+
+return array(
+    'about'      	=> 'About Status Types',
+    'archived'      	=> 'Arkivert',
+    'create'      	=> 'Opprett statusmerke',
+    'color'      	=> 'Graf-farge',
+    'default_label' => 'Standard Etikett',
+    'default_label_help' => 'Dette brukes til å sikre at de mest brukte statusetikettene dine vises øverst i valgboksen når du oppretter/redigerer eiendeler.',
+    'deployable'      	=> 'Utleverbar',
+    'info'      	=> 'Status label types are used to describe the various states your assets could be in. They may be out for repair, lost/stolen, etc. You can create new status labels for your deployable, pending and archived assets according to your own workflow. For more information, <a href="https://snipe-it.readme.io/docs/overview#status-labels" target="_blank">see the documentation <i class="fa fa-external-link"></i></a>.',
+    'name'      	=> 'Statusnavn',
+    'pending'      	=> 'Under arbeid',
+    'status_type'   => 'Statustype',
+    'show_in_nav'   => 'Vis i sidenavigasjon',
+    'title'      	=> 'Statusmerke',
+    'undeployable'  => 'Ikke utleverbar',
+    'update'      	=> 'Oppdater statusmerke',
+);
diff --git a/resources/lang/nn-NO/admin/suppliers/message.php b/resources/lang/nn-NO/admin/suppliers/message.php
new file mode 100644
index 0000000000..fc12ac80bb
--- /dev/null
+++ b/resources/lang/nn-NO/admin/suppliers/message.php
@@ -0,0 +1,28 @@
+<?php
+
+return array(
+
+    'deleted' => 'Slettet leverandør',
+    'does_not_exist' => 'Leverandør finnes ikke.',
+
+
+    'create' => array(
+        'error'   => 'Leverandør ble ikke opprettet. Prøv igjen.',
+        'success' => 'Opprettelse av leverandør vellykket.'
+    ),
+
+    'update' => array(
+        'error'   => 'Leverandør ble ikke oppdatert. Prøv igjen',
+        'success' => 'Oppdatering av leverandør vellykket.'
+    ),
+
+    'delete' => array(
+        'confirm'   => 'Er du sikker på at du vil slette denne leverandøren?',
+        'error'   => 'Det oppstod et problem under sletting av leverandør. Prøv igjen.',
+        'success' => 'Sletting av leverandør vellykket.',
+        'assoc_assets'	 => 'Denne leverandøren er tilknyttet med :asset_count eiendel(er), og kan ikke slettes. Oppdater eiendelene dine til ikke å bruke denne leverandøren og prøv igjen. ',
+        'assoc_licenses'	 => 'Denne leverandøren er tilknyttet med :licenses_count lisens(er), og kan ikke slettes. Oppdater lisensene dine til ikke å bruke denne leverandøren og prøv igjen. ',
+        'assoc_maintenances'	 => 'Denne leverandøren er tilknyttet med :asset_maintenances_count eiendelsvedlikehold, og kan ikke slettes. Oppdater dine eiendelsvedlikehold til ikke å bruke denne leverandøren og prøv igjen. ',
+    )
+
+);
diff --git a/resources/lang/nn-NO/admin/suppliers/table.php b/resources/lang/nn-NO/admin/suppliers/table.php
new file mode 100644
index 0000000000..39a66faff6
--- /dev/null
+++ b/resources/lang/nn-NO/admin/suppliers/table.php
@@ -0,0 +1,26 @@
+<?php
+
+return array(
+    'about_suppliers_title' => 'Om leverandører',
+    'about_suppliers_text'  => 'Leverandører brukes til å spore kilden til varer',
+    'address'               => 'Leverandøradresse',
+    'assets'                => 'Eiendeler',
+    'city'                  => 'By',
+    'contact'               => 'Kontaktnavn',
+    'country'               => 'Land',
+    'create'                => 'Opprett leverandør',
+    'email'                 => 'E-post',
+    'fax'                   => 'Faks',
+    'id'                    => 'ID',
+    'licenses'              => 'Lisenser',
+    'name'                  => 'Leverandørnavn',
+    'notes'                 => 'Notater',
+    'phone'                 => 'Telefon',
+    'state'                 => 'Stat',
+    'suppliers'             => 'Leverandører',
+    'update'                => 'Oppdater leverandør',
+    'view'                  => 'Vis leverandør',
+    'view_assets_for'       => 'Vis eiendeler for',
+    'zip'                   => 'Postnummer',
+
+);
diff --git a/resources/lang/nn-NO/admin/users/general.php b/resources/lang/nn-NO/admin/users/general.php
new file mode 100644
index 0000000000..9c03e4b135
--- /dev/null
+++ b/resources/lang/nn-NO/admin/users/general.php
@@ -0,0 +1,56 @@
+<?php
+
+return [
+    'activated_help_text' => 'Denne brukeren kan logge inn',
+    'activated_disabled_help_text' => 'Du kan ikke redigere aktiveringsstatus for din egen konto.',
+    'assets_user'       => 'Eiendeler tildelt :name',
+    'bulk_update_warn'	=> 'Du prøver å redigere egenskapene for: user_count brukere. Merk at du kan ikke endre dine egne brukerens attributter ved hjelp av dette skjemaet, og må gjøre endringer i din egen bruker individuelt.',
+    'bulk_update_help'	=> 'I dette skjemaet kan du oppdatere flere brukere samtidig. Bare fyll ut feltene du vil endre. Eventuelle tomme felt vil forbli uendret.',
+    'current_assets'    => 'Eiendeler som er sjekket ut til denne brukeren',
+    'clone'             => 'Klon bruker',
+    'contact_user'      => 'Kontakt :navn',
+    'edit'              => 'Rediger bruker',
+    'filetype_info'     => 'Gyldige filtyper er png, gif, jpg, jpeg, doc docx, pdf, txt, zip og rar.',
+    'history_user'      => 'Historikk for :name',
+    'info'				=> 'Info',
+    'restore_user'		=> 'Klikk her for å gjenopprette dem.',
+    'last_login'        => 'Siste innlogging',
+    'ldap_config_text'  => 'LDAP-konfigurasjonsinnstillingene kan finnes på Admin > innstillinger. Den (Valgfrie) valgte plasseringen angis for alle importerte brukere.',
+    'print_assigned'    => 'Skriv ut alt tilordnet',
+    'email_assigned'    => 'Epostliste for alle tilknyttede',
+    'user_notified'     => 'Brukeren har blitt sendt en liste over elementer som er tildelt brukeren.',
+    'users_notified'    => 'The user has been emailed a list of their currently assigned items.|:count users have been emailed a list of their currently assigned items.',
+    'users_notified_warning' => ':count user has been emailed a list of their currently assigned items, however :no_email users did not have an email address so could not be emailed.|:count users have been emailed a list of their currently assigned items, however :no_email user(s) did not have an email address so could not be emailed.',
+    'auto_assign_label' => 'Inkluder denne brukeren ved automatisk tildeling av kvalifiserte lisenser',
+    'auto_assign_help'  => 'Hopp over brukeren i autotildeling av lisenser',
+    'software_user'     => 'Programvare utsjekket til :name',
+    'send_email_help'   => 'Du må legge inn brukerens e-postadresse for å kunne sende dem innloggingsinformasjon. Sending av innloggingsinformasjon kan kun gjøres når brukeren blir opprettet. Passordet lagres på en sikker måte, slik at det ikke kan hentes opp når det er lagret.',
+    'view_user'         => 'Vis bruker :name',
+    'usercsv'           => 'CSV-fil',
+    'two_factor_admin_optin_help' => 'Gjeldende administrasjonsinnstillinger tillater selektiv håndhevelse av to-faktor autentisering.  ',
+    'two_factor_enrolled' => '2FA enhet registrert ',
+    'two_factor_active'   => '2FA Aktiv ',
+    'user_deactivated'  => 'Bruker kan ikke logge inn',
+    'user_activated'  => 'Bruker kan logge inn',
+    'activation_status_warning' => 'Ikke endre aktiveringsstatus',
+    'group_memberships_helpblock' => 'Bare superbrukere kan redigere gruppemedlemskap.',
+    'superadmin_permission_warning' => 'Kun superbrukere kan gjøre en annen bruker til superbruker.',
+    'admin_permission_warning' => 'Kun brukere med adminrettigheter eller høyere kan gi en annen bruker admintilgang.',
+    'remove_group_memberships' => 'Fjern gruppemedlemskap',
+    'warning_deletion_information' => 'Du er i ferd med å sjekke inn ALLE elementene fra :count bruker(e) nedenfor. Super admin navn er uthevet med rødt.',
+    'update_user_assets_status' => 'Oppdater alle ressursene til disse brukerne til denne statusen',
+    'checkin_user_properties' => 'Sjekk inn alt tilbehør koblet til disse brukerne',
+    'remote_label'   => 'Dette er en ekstern bruker',
+    'remote'   => 'Ekstern',
+    'remote_help' => 'Dette kan være nyttig hvis du trenger å filtrere ut eksterne brukere som aldri eller sjelden kommer inn i dine fysiske steder.',
+    'not_remote_label' => 'Dette er ikke en ekstern bruker',
+    'vip_label' => 'VIP bruker',
+    'vip_help' => 'Dette kan være nyttig for å markere viktige mennesker i org hvis du vil håndtere dem på spesielle måter.',
+    'create_user' => 'Opprett en bruker',
+    'create_user_page_explanation' => 'Dette er kontoinformasjon du vil bruke for å få tilgang til nettstedet for første gang.',
+    'email_credentials' => 'E-post påloggingsinformasjon',
+    'email_credentials_text' => 'Send opplysningene mine til e-postadressen ovenfor',
+    'next_save_user' => 'Neste: Lagre bruker',
+    'all_assigned_list_generation' => 'Generert på:',
+    'email_user_creds_on_create' => 'Send denne brukeren sin påloggingsinformasjon via e-post?',
+];
diff --git a/resources/lang/nn-NO/admin/users/message.php b/resources/lang/nn-NO/admin/users/message.php
new file mode 100644
index 0000000000..4e1faa24d9
--- /dev/null
+++ b/resources/lang/nn-NO/admin/users/message.php
@@ -0,0 +1,75 @@
+<?php
+
+return array(
+
+    'accepted'                  => 'Du har akseptert eiendelen.',
+    'declined'                  => 'Du har avvist eiendelen.',
+    'bulk_manager_warn'	        => 'Brukerne er oppdatert, men lederen ble ikke lagret fordi lederen du valgte også i brukerlisten for redigering og brukere kan ikke være sin egen leder. Velg brukerne igjen, unntatt lederen.',
+    'user_exists'               => 'Bruker finnes allerede!',
+    'user_not_found'            => 'User does not exist or you do not have permission view them.',
+    'user_login_required'       => 'Login-feltet er påkrevd',
+    'user_has_no_assets_assigned' => 'Ingen eiendeler er tilordnet brukeren for øyeblikket.',
+    'user_password_required'    => 'Passord er påkrevd.',
+    'insufficient_permissions'  => 'Utilstrekkelige rettigheter.',
+    'user_deleted_warning'      => 'Denne brukeren er slettet. Du vil må gjenopprette denne brukeren for å redigere, eller tildele nye eiendeler.',
+    'ldap_not_configured'        => 'LDAP integrasjonen er ikke konfigurert i denne installasjonen.',
+    'password_resets_sent'      => 'De valgte brukerne som er aktivert og har en gyldig e-postadresse har blitt sendt en tilbakestillingslenke.',
+    'password_reset_sent'       => 'En lenke for tilbakestilling av passord har blitt sendt til :email!',
+    'user_has_no_email'         => 'Denne brukeren har ingen e-postadresse i sin profil.',
+    'log_record_not_found'        => 'Finner ikke et samsvarende loggelement for denne brukeren.',
+
+
+    'success' => array(
+        'create'    => 'Opprettelse av bruker vellykket.',
+        'update'    => 'Oppdatering av bruker vellykket.',
+        'update_bulk'    => 'Oppdatering av brukere vellykket!',
+        'delete'    => 'Sletting av bruker vellykket.',
+        'ban'       => 'Vellykket forbud av bruker.',
+        'unban'     => 'Forbud av bruker ble opphevet.',
+        'suspend'   => 'Vellykket deaktivering av bruker.',
+        'unsuspend' => 'Vellykket aktivering av bruker.',
+        'restored'  => 'Vellykket gjenopprettelse av bruker.',
+        'import'    => 'Vellykket import av brukere.',
+    ),
+
+    'error' => array(
+        'create' => 'Det oppstod et problem under opprettelse av bruker. Prøv igjen.',
+        'update' => 'Det oppstod et problem under oppdatering av bruker. Prøv igjen.',
+        'delete' => 'Det oppstod et problem under sletting av bruker. Prøv igjen.',
+        'delete_has_assets' => 'Denne brukeren har utstyr tildelt og kan ikke slettes.',
+        'delete_has_assets_var' => 'This user still has an asset assigned. Please check it in first.|This user still has :count assets assigned. Please check their assets in first.',
+        'delete_has_licenses_var' => 'This user still has a license seats assigned. Please check it in first.|This user still has :count license seats assigned. Please check them in first.',
+        'delete_has_accessories_var' => 'This user still has an accessory assigned. Please check it in first.|This user still has :count accessories assigned. Please check their assets in first.',
+        'delete_has_locations_var' => 'This user still manages a location. Please select another manager first.|This user still manages :count locations. Please select another manager first.',
+        'delete_has_users_var' => 'This user still manages another user. Please select another manager for that user first.|This user still manages :count users. Please select another manager for them first.',
+        'unsuspend' => 'Det oppstod et problem under aktivering av bruker. Prøv igjen.',
+        'import'    => 'Det oppstod et problem under import av brukere. Prøv igjen.',
+        'asset_already_accepted' => 'Denne eiendelen er allerede akseptert.',
+        'accept_or_decline' => 'Du må enten akseptere eller avvise denne eiendelen.',
+        'cannot_delete_yourself' => 'We would feel really bad if you deleted yourself, please reconsider.',
+        'incorrect_user_accepted' => 'Eiendelen du prøvde å akseptere ble ikke sjekket ut til deg.',
+        'ldap_could_not_connect' => 'Kunne ikke kople til LDAP-serveren. Sjekk LDAP-innstillingene i konfigurasjonsfilen. <br>Feil fra LDAP-server:',
+        'ldap_could_not_bind' => 'Kunne ikke opprette tilkopling til LDAP-server. Sjekk LDAP-innstillingene i konfigurasjonsfilen. <br>Feil fra LDAP-server: ',
+        'ldap_could_not_search' => 'Kunne ikke utføre søk på LDAP-serveren. Sjekk LDAP-innstillingene i konfigurasjonsfilen. <br>Feil fra LDAP-server:',
+        'ldap_could_not_get_entries' => 'Fikk ingen oppføringer fra LDAP-serveren. Sjekk LDAP-innstillingene i konfigurasjonsfilen. <br>Feil fra LDAP-server:',
+        'password_ldap' => 'Passordet for denne kontoen administreres av LDAP/Active Directory. Kontakt IT-avdelingen for å endre passordet. ',
+        'multi_company_items_assigned' => 'This user has items assigned that belong to a different company. Please check them in or edit their company.'
+    ),
+
+    'deletefile' => array(
+        'error'   => 'Fil ble ikke slettet. Prøv igjen.',
+        'success' => 'Fil ble slettet.',
+    ),
+
+    'upload' => array(
+        'error'   => 'Fil(er) ble ikke lastet opp. Prøv igjen.',
+        'success' => 'Vellykket opplasting av fil(er).',
+        'nofiles' => 'Du valgte ingen filer for opplasting',
+        'invalidfiles' => 'En eller flere av filene dine er for store eller av en filtype som ikke er tillatt. Tillatte filtyper er png, gif, jpg, doc, docx, pdf og txt.',
+    ),
+
+    'inventorynotification' => array(
+        'error'   => 'Denne brukeren har ingen e-post.',
+        'success' => 'Brukeren har blitt varslet om det gjeldende inventaret.'
+    )
+);
\ No newline at end of file
diff --git a/resources/lang/nn-NO/admin/users/table.php b/resources/lang/nn-NO/admin/users/table.php
new file mode 100644
index 0000000000..6374870aaa
--- /dev/null
+++ b/resources/lang/nn-NO/admin/users/table.php
@@ -0,0 +1,41 @@
+<?php
+
+return array(
+    'activated'  			=> 'Aktiv',
+    'allow'  				=> 'Tillatt',
+    'checkedout'  			=> 'Eiendeler',
+    'created_at' 			=> 'Opprettet',
+    'createuser' 			=> 'Opprett bruker',
+    'deny'  				=> 'Nekt',
+    'email'      			=> 'E-post',
+    'employee_num'      	=> 'Ansattnummer',
+    'first_name' 			=> 'Fornavn',
+    'groupnotes'			=> 'Velg en gruppe for brukeren. Husk at brukeren får samme rettigheter som gruppen han tildeles. Bruk ctrl+museklikk (eller cmd+museklikk på MacOS) for å velge bort grupper.',
+    'id'         			=> 'Id',
+    'inherit'  				=> 'Arv',
+    'job' 					=> 'Jobbtittel',
+    'last_login'  			=> 'Siste innlogging',
+    'last_name'  			=> 'Etternavn',
+    'location'  			=> 'Lokasjon',
+    'lock_passwords'		=> 'Innloggingsdetaljer kan ikke endres i denne installasjonen.',
+    'manager' 				=> 'Overordnet',
+    'managed_locations'     => 'Administrere plasseringer',
+    'managed_users'         => 'Administrerte brukere',
+    'name' 					=> 'Navn',
+    'nogroup'               => 'Ingen grupper er opprettet ennå. For å legge til en, besøk:',
+    'notes'                 => 'Notater',
+    'password_confirm' 		=> 'Bekreft passord',
+    'password' 				=> 'Passord',
+    'phone'  				=> 'Telefon',
+    'show_current'          => 'Vis nåværende brukere',
+    'show_deleted'          => 'Vis slettede brukere',
+    'title' 				=> 'Tittel',
+	'to_restore_them'		=> 'for å gjenopprette de.',
+    'total_assets_cost'     => "Totale ressurskostnader",
+    'updateuser' 			=> 'Oppdater bruker',
+    'username' 				=> 'Brukernavn',
+	'user_deleted_text' 	=> 'Denne brukeren er merket som slettet.',
+    'username_note' 		=> '(Dette brukes til binding i Active Directory, ikke for innlogging)',
+    'cloneuser'             => 'Klon bruker',
+    'viewusers' 			=> 'Vis brukere',
+);
diff --git a/resources/lang/nn-NO/auth.php b/resources/lang/nn-NO/auth.php
new file mode 100644
index 0000000000..4a8095babe
--- /dev/null
+++ b/resources/lang/nn-NO/auth.php
@@ -0,0 +1,20 @@
+<?php
+
+return array(
+
+    /*
+    |--------------------------------------------------------------------------
+    | Authentication Language Lines
+    |--------------------------------------------------------------------------
+    |
+    | The following language lines are used during authentication for various
+    | messages that we need to display to the user. You are free to modify
+    | these language lines according to your application's requirements.
+    |
+    */
+
+    'failed' => 'Disse opplysningene samsvarer ikke med våre oppføringer.',
+    'password' => 'Angitt passord er feil.',
+    'throttle' => 'Too many login attempts. Please try again in :minutes minute(s).',
+
+);
diff --git a/resources/lang/nn-NO/auth/general.php b/resources/lang/nn-NO/auth/general.php
new file mode 100644
index 0000000000..47fb9d7f35
--- /dev/null
+++ b/resources/lang/nn-NO/auth/general.php
@@ -0,0 +1,18 @@
+<?php
+
+return [
+    'send_password_link'	        => 'Send Passord Tilbakestillingslink',
+    'email_reset_password'			=> 'E-post Passord Tilbakestill',
+    'reset_password'			    => 'Tilbakestill Passord',
+    'saml_login'                    => 'Logg inn med SSO',
+    'login'                         => 'Logg inn',
+    'login_prompt'                  => 'Vennligst logg inn',
+    'forgot_password'               => 'Jeg har glemt passordet mitt',
+    'ldap_reset_password'           => 'Klikk her for å nullstille ditt LDAP-passord',
+    'remember_me'                   => 'Husk meg',
+    'username_help_top'                 => 'Skriv inn ditt <strong>brukernavn</strong> for å få tilsendt en lenke for tilbakestilling av passord.',
+    'username_help_bottom'          => 'Ditt brukernavn og e-postadresse <em>kan</em> være det samme, men kan være, avhengig av din konfigurasjon. Dersom du ikke husker brukernavnet ditt, ta kontakt med systemansvarlig. <br><br><strong>Brukernavn uten en tilknyttet e-postadresse vil ikke bli sendt en lenke for tilbakestilling av passordet.</strong> ',
+    'google_login'                  => 'Logg inn med Google Workspace',
+    'google_login_failed'           => 'Google innlogging feilet, vennligst prøv igjen.',
+];
+
diff --git a/resources/lang/nn-NO/auth/message.php b/resources/lang/nn-NO/auth/message.php
new file mode 100644
index 0000000000..1327f5ec1d
--- /dev/null
+++ b/resources/lang/nn-NO/auth/message.php
@@ -0,0 +1,45 @@
+<?php
+
+return array(
+
+    'account_already_exists' => 'En konto med denne e-postadressen finnes allerede.',
+    'account_not_found'      => 'Brukernavnet eller passordet er feil.',
+    'account_not_activated'  => 'Denne brukerkontoen er ikke aktiv.',
+    'account_suspended'      => 'Denne brukerkontoen er deaktivert.',
+
+    'two_factor' => array(
+        'already_enrolled'      => 'Enheten din er allerede registrert.',
+        'success'               => 'Du har logget inn.',
+        'code_required'         => 'To-faktor-kode er påkrevd.',
+        'invalid_code'          => 'To-faktor-koden er ugyldig.',
+        'enter_two_factor_code' => 'Please enter your two-factor authentication code.',
+        'please_enroll'         => 'Please enroll a device in two-factor authentication.',
+    ),
+
+    'signin' => array(
+        'error'   => 'Det oppstod et problem under innlogging. Prøv igjen.',
+        'success' => 'Vellykket innlogging.',
+    ),
+
+    'logout' => array(
+        'error'   => 'Det oppstod et problem med utlogging, prøv igjen.',
+        'success' => 'Du har logget ut.',
+    ),
+
+    'signup' => array(
+        'error'   => 'Det oppstod et problem under opprettelse av konto. Prøv igjen.',
+        'success' => 'Opprettelse av konto vellykket.',
+    ),
+
+    'forgot-password' => array(
+        'error'   => 'Det oppstod et problem under henting av kode for resetting av passord. Prøv igjen.',
+        'success' => 'Hvis den oppgitte e-postadressen finnes i systemet vårt har det blitt sendt en e-post med gjenopprettelse av passord.',
+    ),
+
+    'forgot-password-confirm' => array(
+        'error'   => 'Det oppstod et problem under gjenopprettelse av passordet ditt. Prøv igjen.',
+        'success' => 'Ditt passord er resatt.',
+    ),
+
+
+);
diff --git a/resources/lang/nn-NO/button.php b/resources/lang/nn-NO/button.php
new file mode 100644
index 0000000000..6a9e0b8665
--- /dev/null
+++ b/resources/lang/nn-NO/button.php
@@ -0,0 +1,34 @@
+<?php
+
+return [
+    'actions' 	                => 'Handlinger',
+    'add'    	                => 'Opprett ny',
+    'cancel'                    => 'Avbryt',
+    'checkin_and_delete'  	    => 'Sjekk inn alle / slett bruker',
+    'delete'  	                => 'Slett',
+    'edit'    	                => 'Rediger',
+    'clone'    	                => 'Clone',
+    'restore' 	                => 'Gjenopprett',
+    'remove'                    => 'Fjern',
+    'request'                   => 'Forespørsel',
+    'submit'  	                => 'Send',
+    'upload'                    => 'Last opp',
+    'select_file'				=> 'Velg fil...',
+    'select_files'				=> 'Velg filer...',
+    'generate_labels'           => '{1} Lag etikett [2,*] Lag etiketter',
+    'send_password_link'        => 'Send lenke for å nullstille passordet',
+    'go'                        => 'Gå',
+    'bulk_actions'              => 'Massehandlinger',
+    'add_maintenance'           => 'Legg til vedlikehold',
+    'append'                    => 'Legg til',
+    'new'                       => 'Ny',
+    'var' => [
+        'clone'     => 'Clone :item_type',
+        'edit'      => 'Edit :item_type',
+        'delete'    => 'Delete :item_type',
+        'restore'   => 'Restore :item_type',
+        'create'    => 'Create New :item_type',
+        'checkout'  => 'Checkout :item_type',
+        'checkin'   => 'Checkin :item_type',
+    ]
+];
diff --git a/resources/lang/nn-NO/general.php b/resources/lang/nn-NO/general.php
new file mode 100644
index 0000000000..5b774aae71
--- /dev/null
+++ b/resources/lang/nn-NO/general.php
@@ -0,0 +1,629 @@
+<?php
+
+return [
+    '2FA_reset'             => '2FA reset',
+    'accessories'			=> 'Tilbehør',
+    'activated'			    => 'Aktivert',
+    'accepted_date'         => 'Akseptdato',
+    'accessory'				=> 'Tilbehør',
+    'accessory_report'		=> 'Rapport over tilbehør',
+    'action'                => 'Handlinger',
+    'activity_report'		=> 'Aktivitetsrapport',
+    'address'				=> 'Adresse',
+    'admin'					=> 'Admin innstillinger',
+    'admin_tooltip'			=> 'This user has admin privileges',
+    'superuser'				=> 'Superuser',
+    'superuser_tooltip'		=> 'This user has superuser privileges',
+    'administrator'			=> 'Administrator',
+    'add_seats'             => 'Setelisenser lagt til',
+    'age'                   => "Alder",
+    'all_assets'			=> 'Alle eiendeler',
+    'all'       			=> 'Alle',
+    'archived'              => 'Arkivert',
+    'asset_models'			=> 'Eiendelsmodeller',
+    'asset_model'			=> 'Modell',
+    'asset'					=> 'Eiendel',
+    'asset_previous'        => 'Asset (Previously Assigned)',
+    'asset_report'          => 'Eiendelsrapport',
+    'asset_tag'				=> 'Eiendelsmerke',
+    'asset_tags'            => 'Eiendelsmerker',
+    'assets_available'		=> 'Tilgjengelige eiendeler',
+    'accept_assets'         => 'Godta Eiendelen :name',
+    'accept_assets_menu'    => 'Godta eiendeler',
+    'accept_item'           => 'Accept Item',
+    'audit'				    => 'Revisjon',
+    'audits'				=> 'Audits',
+    'audit_report'			=> 'Overvåkingslogg',
+    'assets'				=> 'Eiendeler',
+    'assets_audited'        => 'reviderte ressurser',
+    'assets_checked_in_count'     => 'innsjekkede ressurser',
+    'assets_checked_out_count'     => 'utsjekkede ressurser',
+    'asset_deleted_warning'     => 'Denne ressursen er slettet. Du må gjenopprette den før du kan tilordne den til noen.',
+    'assigned_date'         => 'Dato tildelt',
+    'assigned_to'           => 'Tilordnet :name',
+    'assignee'              => 'Tilordnet til',
+    'avatar_delete'         => 'Slett Avatar',
+    'avatar_upload'         => 'Last opp Avatar',
+    'back'      			=> 'Tilbake',
+    'bad_data'      		=> 'Fant ingenting. Kanskje feil i data?',
+    'bulkaudit'             => 'Bulk revisjon',
+    'bulkaudit_status'      => 'Revisjon Status',
+    'bulk_checkout'  		=> 'Masseutsjekk',
+    'bulk_edit'             => 'Masseredigering',
+    'bulk_delete'           => 'Massesletting',
+    'bulk_actions'          => 'Massehandlinger',
+    'bulk_checkin_delete'   => 'Masseinnsjekk/Slett brukere',
+    'byod'                  => 'BYOD',
+    'byod_help'             => 'Denne enheten er eid av brukeren',
+    'bystatus'              => 'etter Status',
+    'cancel'  				=> 'Avbryt',
+    'categories'			=> 'Kategorier',
+    'category'				=> 'Kategori',
+    'change' 		        => 'Inn/ut',
+    'changeemail'  			=> 'Endre e-postadresse',
+    'changepassword'  		=> 'Endre passord',
+    'checkin'  				=> 'Sjekk inn',
+    'checkin_from'  		=> 'Innsjekk fra',
+    'checkin_note'  		=> 'Checkin Note',
+    'checkout_note'  		=> 'Checkout Note',
+    'checkout'  			=> 'Sjekk ut',
+    'checkouts_count'       => 'Sjekk ut',
+    'checkins_count'        => 'Sjekk inn',
+    'checkin_and_delete'  	=> 'Checkin and Delete',
+    'user_requests_count'   => 'Forespørsler',
+    'city'  				=> 'By',
+    'click_here'			=> 'Klikk her',
+    'clear_selection'		=> 'Tøm valg',
+    'companies'			    => 'Selskaper',
+    'company'				=> 'Firmanavn',
+    'component'			    => 'Komponent',
+    'components'			=> 'Komponenter',
+    'complete'				=> 'Fullført',
+    'consumable'			=> 'Forbruksvare',
+    'consumables'			=> 'Forbruksvarer',
+    'country'  				=> 'Land',
+    'could_not_restore'     => 'Feil ved gjenoppretting av :item_type: :error',
+    'not_deleted'           => 'The :item_type was not deleted and therefore cannot be restored',
+    'create'				=> 'Opprett ny',
+    'created'               => 'Enhet opprettet',
+    'created_asset'			=> 'eiendel opprettet',
+    'created_at' 			=> 'Opprettet',
+    'created_by'            => 'Opprettet av',
+    'record_created' 		=> 'Post opprettet',
+    'updated_at' 			=> 'Oppdatert',
+    'currency'  			=> '$', // this is deprecated
+    'currency_text'  		=> 'Valuta', //
+    'current'  				=> 'Nåværende',
+    'current_password'      => 'Gjeldende passord',
+    'customize_report'      => 'Tilpass rapport',
+    'custom_report'         => 'Tilpasset eiendelsrapport',
+    'dashboard'				=> 'Kontrollpanel',
+    'data_source'           => 'Data Source',
+    'days'      			=> 'dager',
+    'days_to_next_audit'    => 'Dager til neste revisjon',
+    'date'					=> 'Dato',
+    'debug_warning'         => 'Advarsel!',
+    'debug_warning_text'    => 'Dette programmet kjører i produksjonsmodus med feilsøking aktiverert. Dette kan utsette følsomme data hvis programmet er tilgjengelig for omverdenen. Deaktiver debug modus ved å sette <code>APP_DEBUG</code>-verdien i filen <code>.env</code> til <code>false</code>.',
+    'delete'  				=> 'Slett',
+    'delete_confirm'  		=> 'Er du sikker på at du vil slette :item?',
+    'delete_confirm_no_undo' => 'Are you sure, you wish to delete :item? This cannot be undone.',
+    'deleted'  				=> 'Slettet',
+    'delete_seats'  		=> 'Slettede setelisenser',
+    'deletion_failed'       => 'Sletting mislyktes',
+    'departments'           => 'Avdelinger',
+    'department'            => 'Avdeling',
+    'deployed'				=> 'Utlevert',
+    'depreciation'			=> 'Avskrivning',
+    'depreciations'         => 'Avskrivninger',
+    'depreciation_report'	=> 'Avskrivningsrapport',
+    'details'               => 'Detaljer',
+    'download'				=> 'Last ned',
+    'download_all'		    => 'Last ned alle',
+    'editprofile'  			=> 'Rediger din profil',
+    'eol'					=> 'Livstid',
+    'email_domain'			=> 'E-postdomene',
+    'employee_number'       => 'Ansattnummer',
+    'email_domain_help'		=> 'Brukes til å generere e-postadresser ved import',
+    'error'				    => 'Feil',
+    'exclude_archived'      => 'Ekskluder arkiverte ressurser',
+    'exclude_deleted'       => 'Ekskluder slettede ressurser',
+    'example'				=> 'Eksempel: ',
+
+    'files'                 => 'Filer',
+    'file_name'				=> 'Fil',
+    'file_type'             => 'Filtype',
+    'filesize'              => 'Filstørrelse',
+    'file_uploads'			=> 'Filopplastinger',
+    'file_upload'           => 'Filopplastning',
+    'generate'				=> 'Generer',
+    'generate_labels'       => 'Opprett etiketter',
+    'github_markdown'      => 'Dette feltet tillater <a href="https://help.github.com/articles/github-flavored-markdown/">Github flavored markdown</a>.',
+    'groups'				=> 'Grupper',
+    'gravatar_email'        => 'Gravatar e-postadresse',
+    'gravatar_url'          => '<a href="http://gravatar.com"><small>Endre din avatar på Gravatar.com</small></a>.',
+    'history'  			    => 'Historie',
+    'history_for'  			=> 'Historikk for',
+    'id'  					=> 'ID',
+    'image'                 => 'Bilde',
+    'image_delete'         	=> 'Slett bilde',
+    'include_deleted'       => 'Inkluder slettede ressurser',
+    'image_upload'         	=> 'Last opp bilde',
+    'filetypes_accepted_help'    => 'Accepted filetype is :types. The maximum size allowed is :size.|Accepted filetypes are :types. The maximum upload size allowed is :size.',
+    'filetypes_size_help'   => 'The maximum upload size allowed is :size.',
+    'image_filetypes_help'  => 'Accepted Filetypes are jpg, webp, png, gif, svg, and avif. The maximum upload size allowed is :size.',
+    'unaccepted_image_type'  => 'Denne bildefilen var ikke lesbar. Aksepterte filtyper er jpg, webp, png, gif og svg. Mime-typen til denne filen er :mimetype.',
+    'import'         	    => 'Importer',
+    'import_this_file'      => 'Kartfelter og behandle denne filen',
+    'importing'         	=> 'Importerer',
+    'importing_help'        => 'Du kan importere eiendeler, tilbehør, lisenser, komponenter, forbruksvarer og brukere via CSV-fil. <br><br>CSV-en må være kommaseparert og formatert med overskrifter som stemmer overens med de i <a href="https://snipe-it.readme.io/docs/importing" target="_new">eksempel-CSV i dokumentasjonen</a>.',
+    'import-history'        => 'Importhistorikk',
+    'asset_maintenance'        => 'Vedlikehold av eiendeler',
+    'asset_maintenance_report' => 'Rapport Vedlikehold av eiendeler',
+    'asset_maintenances'       => 'Vedlikehold av eiendeler',
+    'item'  				=> 'Enhet',
+    'item_name'             => 'Navn',
+    'import_file'  			=> 'importer CSV-fil',
+    'import_type'  			=> 'Type CSV-import',
+    'insufficient_permissions' => 'Utilstrekkelige rettigheter!',
+    'kits'       			=> 'Forhåndsdefinerte sett',
+    'language'				=> 'Språk',
+    'last'					=> 'Siste',
+    'last_login'            => 'Siste pålogging',
+    'last_name'             => 'Etternavn',
+    'firstname_lastname_display'	=> 'Fornavn Etternavn (Kari Torildsdottir)',
+    'lastname_firstname_display'	=> 'Etternavn Fornavn (Torildsdottir, Kari)',
+    'name_display_format'	=> 'Navneformat',
+    'first'					=> 'Første',
+    'first_name'			=> 'Fornavn',
+    'license'				=> 'Lisens',
+    'license_report'        => 'Lisensrapport',
+    'licenses_available'	=> 'Tilgjengelige lisenser',
+    'licenses'				=> 'Lisenser',
+    'list_all'				=> 'List alle',
+    'loading'				=> 'Laster... vennligst vent...',
+    'lock_passwords'        => 'Denne feltverdien vil ikke bli lagret i en demo-installasjon.',
+    'feature_disabled'      => 'Denne funksjonen er deaktivert i demo-installasjonen.',
+    'location'              => 'Lokasjon',
+    'location_plural'        => 'Stedslokasjoner',
+    'locations'				=> 'Lokasjoner',
+    'logo_size'				=> 'Kvadratisk logo vises best med Logo + Text. Logo maximum display size is 50px high x 500px wide.  ',
+    'logout'				=> 'Logg ut',
+    'lookup_by_tag'     => 'Søk på ID-merke',
+    'maintenances'          => 'Vedlikehold',
+    'manage_api_keys'       => 'Manage API keys',
+    'manufacturer'			=> 'Produsent',
+    'manufacturers'			=> 'Produsenter',
+    'markdown'				=> 'Dette feltet tillater <a href="https://help.github.com/articles/github-flavored-markdown/">Github flavored markdown</a>.',
+    'min_amt'				=> 'Min. antall',
+    'min_amt_help'          => 'Minimum antall varer som skal være tilgjengelig før et varsel blir utløst. La stå tomt hvis du ikke vil motta varsler for lavt inventar.',
+    'model_no'				=> 'Modellnummer',
+    'months'				=> 'måneder',
+    'moreinfo'				=> 'Mer info',
+    'name'					=> 'Navn',
+    'new_password'          => 'Nytt passord',
+    'next'					=> 'Neste',
+    'next_audit_date'		=> 'Neste revisjon dato',
+    'next_audit_date_help'  => 'If you use auditing in your organization, this is usually automatically calculated based on the asset&apos;s last audit date and audit frequency (in <code>Admin Settings &gt; Alerts</code>) and you can leave this blank. You can manually set this date here if you need to, but it must be later than the last audit date. ',
+    'audit_images_help'     => 'You can find audit images in the asset\'s history tab.',
+    'no_email'              => 'Ingen e-postadresse tilknyttet denne brukeren',
+    'last_audit'		    => 'Siste revisjon',
+    'new'					=> 'ny!',
+    'no_depreciation'		=> 'Ingen avskrivning',
+    'no_results'			=> 'Ingen treff.',
+    'no'  					=> 'Nei',
+    'notes'  				=> 'Notater',
+    'note_added'            => 'Note Added',
+    'options'				=> 'Options',
+    'preview'				=> 'Preview',
+    'add_note'              => 'Add Note',
+    'note_edited'            => 'Note Edited',
+    'edit_note'              => 'Edit Note',
+    'note_deleted'            => 'Note Deleted',
+    'delete_note'              => 'Delete Note',
+    'order_number'          => 'Ordreummer',
+    'only_deleted'          => 'Kun slettede ressurser',
+    'page_menu'				=> 'Viser _MENU_ enheter',
+    'pagination_info'		=> 'Viser _START_ til _END_ av _TOTAL_ enheter',
+    'pending'				=> 'Under arbeid',
+    'people'				=> 'Folk',
+    'per_page'				=> 'Resultater pr side',
+    'previous'				=> 'Forrige',
+    'processing'			=> 'Behandler',
+    'profile'				=> 'Din profil',
+    'purchase_cost'                              => 'Innkjøpskostnad',
+    'purchase_date'         => 'Innkjøpsdato',
+    'qty'		            => 'Antall',
+    'quantity'		        => 'Antall',
+    'quantity_minimum'      => 'You have one item below or almost below minimum quantity levels|You have :count items below or almost below minimum quantity levels',
+    'quickscan_checkin'  	=> 'Hurtiginnsjekk ved skanning',
+    'quickscan_checkin_status'  	=> 'Innsjekkingsstatus',
+    'ready_to_deploy'		=> 'Klar for utlevering',
+    'recent_activity'		=> 'Nylig aktivitet',
+    'remaining'             => 'Gjenstår',
+    'remove_company'        => 'Fjern tilknytning til bedrift',
+    'reports'				=> 'Rapporter',
+    'restored'				=> 'gjenopprettet',
+    'restore'				=> 'Gjenopprett',
+    'requestable_models'    => 'Forespørrbare modeller',
+    'requestable_items'     => 'Requestable Items',
+    'requested'				=> 'Forespurt',
+    'requested_date'        => 'Forespurt dato',
+    'requested_assets'      => 'Forespurte eiendeler',
+    'requested_assets_menu' => 'Forespurte eiendeler',
+    'request_canceled'      => 'Forespørsel avbrutt',
+    'request_item'          => 'Request this item',
+    'external_link_tooltip' => 'External link to',
+    'save'  				=> 'Lagre',
+    'select_var'            => 'Velg :thing... ', // this will eventually replace all of our other selects
+    'select'				=> 'Velg',
+    'select_all'            => 'Velg alle',
+    'search'				=> 'Søk',
+    'select_category'       => 'Velg en kategori',
+    'select_datasource' => 'Select a data source',
+    'select_department'     => 'Velg en avdeling',
+    'select_depreciation'	=> 'Velg en avskrivningstype',
+    'select_location'		=> 'Velg en lokasjon',
+    'select_manufacturer'	=> 'Velg en produsent',
+    'select_model'			=> 'Velg en modell',
+    'select_supplier'		=> 'Velg en leverandør',
+    'select_user'			=> 'Velg en bruker',
+    'select_date'			=> 'Velg dato (ÅÅÅÅ-MM-DD)',
+    'select_statuslabel'	=> 'Velg status',
+    'select_company'    	=> 'Velg bedrift',
+    'select_asset'    		=> 'Velg eiendel',
+    'settings'				=> 'Innstillinger',
+    'show_deleted'  		=> 'Vis slettede',
+    'show_current'  		=> 'Vis gjeldende',
+    'sign_in'				=> 'Logg inn',
+    'signature'             => 'Signatur',
+    'signed_off_by'         => 'Godkjent av',
+    'skin'       			=> 'Tema',
+    'webhook_msg_note'        => 'En varsling vil bli sendt via webhook',
+    'webhook_test_msg'        => 'Oh hai! It looks like your :app integration with Snipe-IT is working!',
+    'some_features_disabled' => 'DEMO MODUS: Noe funksjonalitet er skrudd av i denne installasjonen.',
+    'site_name'				=> 'Nettstedsnavn',
+    'state'  				=> 'Stat',
+    'status_labels'			=> 'Statusmerker',
+    'status_label'			=> 'Status Label',
+    'status'    			=> 'Status',
+    'accept_eula'           => 'Akseptavtale',
+    'show_or_hide_eulas' => 'Show/Hide EULAs',
+    'supplier'              => 'Leverandør',
+    'suppliers'  			=> 'Leverandører',
+    'sure_to_delete'        => 'Er du sikker på at du vil slette',
+    'sure_to_delete_var'    => 'Er du sikker på at du vil slette :item?',
+    'delete_what'           => 'Slett :item',
+    'submit'				=> 'Send',
+    'target'                => 'Mål',
+    'time_and_date_display' => 'Tid og Datovisning',
+    'total_assets'			=> 'eiendeler totalt',
+    'total_licenses'		=> 'lisener totalt',
+    'total_accessories'		=> 'antall tilbehør',
+    'total_consumables'		=> 'antall forbruksvarer',
+    'type'  				=> 'Type',
+    'undeployable'			=> 'Ikke utleverbar',
+    'unknown_admin'			=> 'Ukjent admin',
+    'username'              => 'Brukernavn',
+    'update'                => 'Oppdater',
+    'updating_item' => 'Updating :item',
+    'upload_filetypes_help'      => 'Tillatte filtyper er png, gif, jpg, jpeg, doc, docx, pdf, xls, xlsx, txt, lic, xml, zip, rtf og rar. Maks. filstørrelse er :size.',
+    'uploaded'              => 'Lastet opp',
+    'user'					=> 'Bruker',
+    'accepted'			    => 'akseptert',
+    'declined'			    => 'avslått',
+    'declined_note'         => 'Declined Notes',
+    'unassigned'            => 'Ikke tildelt',
+    'unaccepted_asset_report' => 'Ikke aksepterte eiendeler',
+    'users'                 => 'Brukere',
+    'viewall'				=> 'Vis alle',
+    'viewassets'  			=> 'Vis tildelte eiendeler',
+    'viewassetsfor'         => 'Vis eiendelene til :name',
+    'website'               => 'Nettsted',
+    'welcome'				=> 'Velkommen, :name',
+    'years'					=> 'år',
+    'yes' 					=> 'Ja',
+    'zip'  					=> 'Postnummer',
+    'noimage'				=> 'Bilde er ikke lastet opp eller finner ikke bilde.',
+    'file_does_not_exist'   => 'Den forespurte filen finnes ikke på serveren.',
+    'file_upload_success'   => 'Filopplasting vellykket!',
+    'no_files_uploaded'     => 'Filopplasting vellykket!',
+    'token_expired'         => 'Din sesjon har utløpt. Prøv igjen.',
+    'login_enabled'         => 'Innlogging aktiv',
+    'audit_due'             => 'Revisjonsfrist nær',
+    'audit_due_days'        => '{}Assets Due or Overdue for Audit|[1]Assets Due or Overdue for Audit Within a Day|[2,*]Assets Due or Overdue for Audit Within :days Days',
+    'checkin_due'           => 'Forfalt for innsjekk',
+    'checkin_overdue'       => 'Forfalt for innsjekk',
+    'checkin_due_days'      => '{}Due for Checkin|[1]Assets Due for Checkin Within :days Day|[2,*]Assets Due for Checkin Within :days Days',
+    'audit_overdue'         => 'Revisjonsfrist forfalt',
+    'accept'                => 'Akseptér :asset',
+    'i_accept'              => 'Jeg aksepterer',
+    'i_decline'             => 'Jeg avslår',
+    'accept_decline'        => 'Godta/Avslå',
+    'sign_tos'              => 'Signér under for å akseptere vilkårene for tjenesten:',
+    'clear_signature'       => 'Fjern signatur',
+    'show_help'             => 'Vis hjelp',
+    'hide_help'             => 'Skjul hjelp',
+    'view_all'              => 'se alle',
+    'hide_deleted'          => 'Skjul slettede',
+    'email'                 => 'E-post',
+    'do_not_change'         => 'Do not change',
+    'bug_report'            => 'Report a bug',
+    'user_manual'           => 'Brukerhåndbok',
+    'setup_step_1'          => 'Trinn 1',
+    'setup_step_2'          => 'Trinn 2',
+    'setup_step_3'          => 'Trinn 3',
+    'setup_step_4'          => 'Trinn 4',
+    'setup_config_check'    => 'Sjekk konfigurasjon',
+    'setup_create_database' => 'Create database tables',
+    'setup_create_admin'    => 'Create an admin user',
+    'setup_done'            => 'Ferdig!',
+    'bulk_edit_about_to'    => 'Du er i ferd med å redigere følgende: ',
+    'checked_out'           => 'Sjekket ut',
+    'checked_out_to'        => 'Sjekket ut til',
+    'fields'                => 'Felter',
+    'last_checkout'         => 'Siste utsjekk',
+    'due_to_checkin'        => 'Følgende :count elementer skal snart sjekkes inn:',
+    'expected_checkin'      => 'Forventet innsjekk',
+    'reminder_checked_out_items' => 'Dette er en påminnelse om utstyr som er sjekket ut til deg. Hvis du mener at denne listen er unøyaktig (noe mangler, eller at noe vises her du tror du aldri har fått), vennligst send e-post til :reply_to_name på :reply_to_address.',
+    'changed'               => 'Endret',
+    'to'                    => 'Til',
+    'report_fields_info'    => '<p>Velg feltene du vil inkludere i din egendefinerte rapport, og klikk Generer. Filen (custom-asset-report-YYYY-mm-dd.csv) vil bli lastet ned automatisk, og du kan åpne den i Excel.</p>
+            <p>Hvis du ønsker å eksportere bare enkelte eiendeler, bruk alternativene nedenfor til å finjustere resultatene dine.</p>',
+    'range'                 => 'Område',
+    'bom_remark'            => 'Legg til et BOM (byte-order merke) i CSV-fila',
+    'improvements'          => 'Forbedringer',
+    'information'           => 'Informasjon',
+    'permissions'           => 'Tillatelser',
+    'managed_ldap'          => '(Administrert via LDAP)',
+    'export'                => 'Eksport',
+    'ldap_sync'             => 'LDAP-synk',
+    'ldap_user_sync'        => 'Synk av LDAP-brukere',
+    'synchronize'           => 'Synkroniser',
+    'sync_results'          => 'Synkroniseringsresultat',
+    'license_serial'        => 'Serienr/produktnøkkel',
+    'invalid_category'      => 'Ugyldig eller manglende kategori',
+    'invalid_item_category_single' => 'Ugyldig eller mangler :type kategori. Oppdater kategorien til denne :type for å inkludere en gyldig kategori før du går til kassen.',
+    'dashboard_info'        => 'Dette er dashbordet ditt. Det er mange som det, men dette er ditt.',
+    '60_percent_warning'    => '60% fullført (advarsel)',
+    'dashboard_empty'       => 'Det ser ut som du ikke har lagt til noe enda, så vi har ikke noe fantastisk å vise. Kom i gang ved å legge til noen eiendeler, tilbehør, forbruksartikler eller lisenser nå!',
+    'new_asset'             => 'Ny eiendel',
+    'new_license'           => 'Ny lisens',
+    'new_accessory'         => 'Nytt tilbehør',
+    'new_consumable'        => 'Ny forbruksvare',
+    'new_component'         => 'New Component',
+    'new_user'              => 'New User',
+    'collapse'              => 'Kollaps',
+    'assigned'              => 'Tilordnet',
+    'asset_count'           => 'Antall eiendeler',
+    'accessories_count'     => 'Antall tilbehør',
+    'consumables_count'     => 'Antall forbruksvarer',
+    'components_count'      => 'Antall komponenter',
+    'licenses_count'        => 'Antall lisenser',
+    'notification_error'    => 'Feil',
+    'notification_error_hint' => 'Vennligst sjekk skjemaet nedenfor for feil',
+    'notification_bulk_error_hint' => 'Følgende felt har valideringsfeil og ble ikke endret:',
+    'notification_success'  => 'Suksess',
+    'notification_warning'   => 'Advarsel',
+    'notification_info'      => 'Informasjon',
+    'asset_information'     => 'Eiendelsinfo',
+    'model_name'            => 'Modell navn',
+    'asset_name'            => 'Eiendelens navn',
+    'consumable_information' => 'Info om forbruksvare:',
+    'consumable_name'       => 'Navn på forbruksvare:',
+    'accessory_information' => 'Info om tilbehør:',
+    'accessory_name'       => 'Tilbehørets navn:',
+    'clone_item'            => 'Klon element',
+    'checkout_tooltip' => 'Sjekk ut denne gjenstanden',
+    'checkin_tooltip' => 'Check this item in so that it is available for re-issue, re-imaging, etc',
+    'checkout_user_tooltip' => 'Sjekk dette elementet ut til en bruker',
+    'checkin_to_diff_location' => 'You can choose to check this asset in to a location other than this asset\'s default location of :default_location if one is set',
+    'maintenance_mode'      => 'Tjenesten er midlertidig utilgjengelig for systemoppdateringer. Vennligst prøv igjen senere.',
+    'maintenance_mode_title' => 'System midlertidig ikke tilgjengelig',
+    'ldap_import'           => 'Brukerpassord bør ikke administreres av LDAP. (Dette lar deg sende glemte passord forespørsler.)',
+    'purge_not_allowed'     => 'Sletting av slettede data er deaktivert i .env-filen. Kontakt kundestøtte eller systemadministrator.',
+    'backup_delete_not_allowed'     => 'Sletting av sikkerhetskopier er deaktivert i .env filen. Kontakt kundestøtte eller systemadministrator.',
+    'additional_files'           => 'Flere filer',
+    'shitty_browser'        => 'Ingen signatur oppdaget. Hvis du bruker en eldre nettleser, vennligst bruk en mer moderne nettleser for å akseptere mottak av eiendel.',
+    'bulk_soft_delete'      =>'Fjern også disse brukerne ved å fjerne deres eiendelshistorikk intakt/til du fjerner slettede poster i Admin-innstillingene.',
+    'bulk_checkin_delete_success' => 'Dine valgte brukere er slettet og deres elementer har blitt sjekket inn.',
+    'bulk_checkin_success' => 'Elementene for de valgte brukerne har blitt sjekket inn.',
+    'set_to_null'           => 'Delete values for this selection|Delete values for all :selection_count selections ',
+    'set_users_field_to_null'  => 'Slett :field verdier for denne brukeren. Slett :field verdier for alle :user_count brukere ',
+    'na_no_purchase_date'   => 'N/A - Ingen kjøpsdato oppgitt',
+    'assets_by_status'      => 'Eiendeler etter status',
+    'assets_by_status_type'      => 'Eiendeler etter status',
+    'pie_chart_type'        => 'Dashbord Kakediagram type',
+    'hello_name'            => 'Velkommen, :name!',
+    'unaccepted_profile_warning'   => 'You have one item requiring acceptance. Click here to accept or decline it | You have :count items requiring acceptance. Click here to accept or decline them',
+    'start_date'            => 'Startdato',
+    'end_date'            => 'Sluttdato',
+    'alt_uploaded_image_thumbnail' => 'Opplastet miniatyrbilde',
+    'placeholder_kit'       => 'Velg ett sett',
+    'file_not_found'        => 'Finner ikke filen',
+    'log_record_not_found'  => 'No record for that log entry was found.',
+    'preview_not_available' => '(ingen forhåndsvisning)',
+    'setup'                 => 'Innstillinger',
+    'pre_flight'            => 'Test',
+    'skip_to_main_content'  => 'Gå til hovedinnhold',
+    'toggle_navigation'     => 'Vis/skjul navigasjon',
+    'alerts'                => 'Varsler',
+    'tasks_view_all'        => 'Vis alle oppgaver',
+    'true'                  => 'Sant',
+    'false'                 => 'Usant',
+    'integration_option'    => 'Innstillinger for integrering',
+    'log_does_not_exist'    => 'Det finnes ingen samsvarende loggoppføring.',
+    'merge_users'           => 'Slå sammen brukere',
+    'merge_information' =>  'Dette vil slå sammen :count brukere til en enkelt bruker. Velg brukeren du ønsker å slå de andre sammen med, og de tilknyttede eiendelene, lisenser, etc vil bli flyttet til valgt bruker, og de andre vil bli merket som slettet.',
+    'warning_merge_information' => 'Denne handlingen kan ikke angres og skal BARE brukes når du må slå sammen brukere på grunn av dårlig import eller synkronisering. Sørg for å kjøre en sikkerhetskopi først.',
+    'no_users_selected'     => 'Ingen brukere er valgt',
+    'not_enough_users_selected'     => 'Minst :count brukere må være valgt',
+    'merge_success'         => ':count brukere er slått sammen med :into_username!',
+    'merged'                => 'sammenslått',
+    'merged_log_this_user_into' => 'Flettet denne brukeren (ID :to_id - :to_username) til bruker ID :from_id (:from_username) ',
+    'merged_log_this_user_from' => 'Flettet bruker-ID :from_id (:from_username) inn i denne brukeren (ID :to_id - :to_username)',
+    'clear_and_save'            => 'Tøm og lagre',
+    'update_existing_values'    => 'Oppdatere eksisterende verdier?',
+    'auto_incrementing_asset_tags_disabled_so_tags_required' => 'Automatisk generering av inkrementerende ressurskoder er skrudd av, så alle rader må ha "ressurskode"-kollonnen utfylt.',
+    'auto_incrementing_asset_tags_enabled_so_now_assets_will_be_created' => 'Merk: Automatisk generering av inkrementerende ressurskoder er er skrudd på, så for alle rader som ikke har fult ut "ressurskoden, så vil den bli generert autmatisk. Rader som har ressurskoden utfylt vil bli oppdatert med den gitte informasjonen.',
+    'send_welcome_email_to_users'   => ' Send velkomstepost til nye brukere?',
+    'send_email'                => 'Send e-post',
+    'call'                      => 'Ring nummer',
+    'back_before_importing'     => 'Sikkerhetskopier før importering?',
+    'csv_header_field'          => 'CSV-toppfelt',
+    'import_field'              => 'Importer felt',
+    'sample_value'              => 'Eksempelverdi',
+    'no_headers'                => 'Ingen kolonner funnet',
+    'error_in_import_file'      => 'Det oppstod en feil under lesing av CSV-filen: :error',
+    'errors_importing'          => 'Det oppstod noen feil under importeringen: ',
+    'warning'                   => 'ADVARSEL: :advarsel',
+    'success_redirecting'       => '"Vellykket... omadressering.',
+    'cancel_request'            => 'Avbryt forespørsel om element',
+    'setup_successful_migrations' => 'Databasetabellene er opprettet',
+    'setup_migration_output' => 'Migrasjonsmeldinger:',
+    'setup_migration_create_user' => 'Neste: Opprett bruker',
+    'importer_generic_error'    => 'Importen av filen er fullført, men vi fikk en feil. Dette skyldes vanligvis tredjeparts "API throttling" fra en meldings webhook (som Slack) og ville ikke ha forstyrret selve importen; men du bør bekrefte dette selv.',
+    'confirm' => 'Bekreft',
+    'autoassign_licenses' => 'Tildel lisenser automatisk',
+    'autoassign_licenses_help' => 'Tillat denne brukeren å ha lisenser tildelt via bulk-tildeling UI eller cli verktøy.',
+    'autoassign_licenses_help_long' => 'Dette tillater at en bruker får tildelt lisenser via massetildeling av lisenser via UI eller cli verktøyet. (Du vil for eksempel ikke nødvendigvis at en konsulent automatisk skal tildeles en lisens, men bare ansatte vil du oppgi den. Du kan fremdeles tilordne lisens til disse brukerne, men de vil ikke bli inkludert i "Checkout License" til "Alle brukere" funksjonene.)',
+    'no_autoassign_licenses_help' => 'Ikke inkluder bruker for massetilordning gjennom lisensbrukergrensesnittet eller cli verktøy.',
+    'modal_confirm_generic'      => 'Er du sikker?',
+    'cannot_be_deleted'      => 'Dette objektet kan ikke slettes',
+    'cannot_be_edited'      => 'Dette elementet kan ikke redigeres.',
+    'undeployable_tooltip'      => 'Dette elementet kan ikke sjekkes ut. Sjekk hvor mange som gjenstår.',
+    'serial_number'        => 'Serienummer',
+    'item_notes' => ':item notater',
+    'item_name_var' => ':item navn',
+    'error_user_company' => 'Utsjekk firma og firmaet til ressursen stemmer ikke',
+    'error_user_company_accept_view' => 'En ressurs tildelt til deg tilhører en annen bedrift, slik at du ikke kan akseptere eller avslå den, vennligst sjekk med din leder',
+    'importer' => [
+        'checked_out_to_fullname' => 'Sjekket ut til: Fullt navn',
+        'checked_out_to_first_name' => 'Sjekket ut til: Fornavn',
+        'checked_out_to_last_name' => 'Sjekket ut til: Etternavn',
+        'checked_out_to_username' => 'Sjekket ut til: Brukernavn',
+        'checked_out_to_email' => 'Sjekket ut til: e-post',
+        'checked_out_to_tag' => 'Sjekket ut til: ressursmerke',
+        'manager_first_name' => 'Leders fornavn',
+        'manager_last_name' => 'Leders etternavn',
+        'manager_full_name' => 'Leders fulle navn',
+        'manager_username' => 'Leders brukernavn',
+        'checkout_type' => 'Utsjekk type',
+        'checkout_location' => 'Sjekket ut til lokasjon',
+        'image_filename' => 'Filnavn bilde',
+        'do_not_import'     => 'Ikke importer',
+        'vip' => 'VIP',
+        'avatar'  => 'Profilbilde',
+        'gravatar' => 'Gravatar e-post',
+        'currency' => 'Valuta',
+        'address2' => 'Adresselinje 2',
+        'import_note' => 'Importert med csv-importør',
+    ],
+    'remove_customfield_association' => 'Remove this field from the fieldset. This will not delete the custom field, only this field\'s association with this fieldset.',
+    'checked_out_to_fields' => 'Checked Out To Fields',
+    'percent_complete' => '% fullført',
+    'uploading' => 'Laster opp... ',
+    'upload_error' => 'Error uploading file. Please check that you have no empty rows or duplicated column names in your CSV, and that the server permissions allow uploads.',
+    'copy_to_clipboard' => 'Kopier til utklippstavlen',
+    'copied' => 'Kopiert!',
+    'status_compatibility' => 'Hvis eiendelene allerede er tilordnet, kan de ikke endres til en ikke-distribuerbar statustype og denne verdien vil bli hoppet over.',
+    'rtd_location_help' => 'Dette er stedet til eiendel når den ikke er sjekket ut',
+    'item_not_found' => ':item_type ID :id eksisterer ikke eller har blitt slettet',
+    'action_permission_denied' => 'Du har ikke tillatelse til :action :item_type ID :id',
+    'action_permission_generic' => 'Du har ikke tillatelse til :action denne :item_type',
+    'edit' => 'rediger',
+    'action_source' => 'Kilde for handling',
+    'or' => 'eller',
+    'url'                   => 'URL',
+    'edit_fieldset' => 'Redigere feltene og opsjonene',
+    'permission_denied_superuser_demo' => 'Tillatelse nektet. Du kan ikke oppdatere brukerinformasjon for superadmins på demo.',
+    'pwd_reset_not_sent' => 'Brukeren er ikke aktivert, er LDAP synkronisert eller har ikke en e-postadresse',
+    'error_sending_email' => 'Feil ved sending av e-post',
+    'sad_panda' => 'Sad panda. You are not authorized to do the thing. Maybe <a href=":link">return to the dashboard</a>, or contact your administrator.',
+    'bulk' => [
+            'delete' =>
+                [
+                'header' => 'Bulk sletting :object_type',
+                'warn'   =>  'Du er i ferd med å slette ett :object_type″Du er i ferd med å slette :count :object_type',
+                'success'   =>  ':object_type ble vellykket slettet :count :object_type',
+                'error'   =>  'Kunne ikke slette :object_type',
+                'nothing_selected'   =>  'Nei :object_type er valgt - ingenting å gjøre',
+                'partial'   =>  'Slettet :success_count :object_type, men :error_count :object_type kunne ikke slettes',
+             ],
+    ],
+    'no_requestable' => 'Det finnes ingen forespørselbare eiendeler eller modeller.',
+
+    'countable' => [
+        'accessories'  => ':count Tilbehør|:count tilbehør',
+        'assets'  => ':count Eiendeler|:count',
+        'licenses'  => ':count Lisens|:count lisenser',
+        'license_seats'  => ':count lisenssete|:count Lisensseter',
+        'consumables'  => ':count Forbruksvare|:count Forbruksvarer',
+        'components'  => ':count Komponenter|:count komponenter',
+    ],
+
+    'more_info' => 'Mer info',
+    'quickscan_bulk_help' => 'Checking this box will edit the asset record to reflect this new location. Leaving it unchecked will simply note the location in the audit log. Note that if this asset is checked out, it will not change the location of the person, asset or location it is checked out to.',
+    'whoops' => 'Whoops!',
+    'something_went_wrong' => 'Something went wrong with your request.',
+    'close' => 'Close',
+    'expires' => 'Utløper',
+    'map_fields'=> 'Map :item_type Fields',
+    'remaining_var' => ':count Remaining',
+    'label' => 'Label',
+    'import_asset_tag_exists' => 'An asset with the asset tag :asset_tag already exists and an update was not requested. No change was made.',
+    'countries_manually_entered_help' => 'Values with an asterisk (*) were manually entered and do not match existing ISO 3166 dropdown values',
+    'accessories_assigned' => 'Assigned Accessories',
+    'user_managed_passwords' => 'Password Management',
+    'user_managed_passwords_disallow' => 'Disallow users from managing their own passwords',
+    'user_managed_passwords_allow' => 'Allow users to manage their own passwords',
+    'from' => 'From',
+    'by' => 'Av',
+
+// Add form placeholders here
+    'placeholders' => [
+        'notes'  => 'Add a note',
+    ],
+
+    'breadcrumb_button_actions' => [
+        'edit_item' => 'Edit :name',
+        'checkout_item' => 'Checkout :name',
+        'checkin_item' => 'Checkin :name',
+    ],
+
+    'skins' => [
+        'site_default' => 'Site Default',
+        'default_blue' => 'Default Blue',
+        'blue_dark' => 'Blue (Dark Mode)',
+        'green' => 'Green Dark',
+        'green_dark' => 'Green (Dark Mode)',
+        'red' => 'Red Dark',
+        'red_dark' => 'Red (Dark Mode)',
+        'orange' => 'Orange Dark',
+        'orange_dark' => 'Orange (Dark Mode)',
+        'black' => 'Black',
+        'black_dark' => 'Black (Dark Mode)',
+        'purple' => 'Purple',
+        'purple_dark' => 'Purple (Dark Mode)',
+        'yellow' => 'Yellow',
+        'yellow_dark' => 'Yellow (Dark Mode)',
+        'high_contrast' => 'High Contrast',
+
+    ],
+
+    'select_all_none' => 'Select/Unselect All',
+    'generic_model_not_found' => 'That :model was not found or you do not have permission to access it',
+    'deleted_models' => 'Deleted Asset Models',
+    'deleted_users' => 'Deleted Users',
+    'cost_each' => ':amount each',
+    'remove_current_image' => 'Remove current :type image',
+
+    'seeding' => [
+        'manufacturers' => [
+            'button' => 'Create Manufacturers',
+            'prompt' => 'You do not have any manufacturers yet. Would you like to seed a list of common manufacturers? (THIS WILL OVERWRITE EXISTING MANUFACTURERS, including those that have been soft-deleted.)',
+            'success' => 'Manufacturers seeded successfully',
+            'error' => 'Could not seed manufacturers. A manufacturer record already exists and seeding would overwrite it.|Could not seed manufacturers. :count manufacturer records already exist and seeding would overwrite them.',
+        ],
+    ],
+
+];
diff --git a/resources/lang/nn-NO/help.php b/resources/lang/nn-NO/help.php
new file mode 100644
index 0000000000..e091505712
--- /dev/null
+++ b/resources/lang/nn-NO/help.php
@@ -0,0 +1,35 @@
+<?php
+
+return [
+
+    /*
+    |--------------------------------------------------------------------------
+    | Password Reminder Language Lines
+    |--------------------------------------------------------------------------
+    |
+    | The following language lines are the default lines which match reasons
+    | that are given by the password broker for a password update attempt
+    | has failed, such as for an invalid token or invalid new password.
+    |
+    */
+
+    'more_info_title' => 'Mer info',
+
+    'audit_help' => 'Kryss av for å endre eiendelen til å bruke denne nye lokasjonen. Hvis du ikke krysser av vil lokasjonen kun bli notert i revisjonsloggen.<br><br>Merk at hvis denne eiendelen er sjekket ut vil det ikke endre lokasjon for brukeren, ressursen eller lokasjonen den er sjekket ut til.',
+
+    'assets' => 'Eiendeler er enheter som spores på serienummer eller annen merking. Typisk er dette kostbare enheter der det gir mening å spore enkeltenheter.',
+
+    'categories' => 'Kategorier hjelper deg med å organisere ting. Eksempeler på kategorier kan være &quot;Skrivebord&quot;, &quot;Bærbare&quot;, &quot;Mobiltelefon&quot;, &quot;Nettbrett&quot; og så videre, men du kan bruke kategorier som gir mening for deg.',
+
+    'accessories' => 'Tilbehør er ting du leverer ut som ikke har serienummer (eller som du ikke sporer enkeltvis), for eksempel datamus og tastaturer.',
+
+    'companies'     => 'Firma kan brukes som et enkelt identifikatorfelt, eller det kan brukes til å begrense eksponeringen av eiendeler, brukere, etc hvis full firmastøtte er aktivert i innstillingene.',
+
+    'components'    => 'Komponenter er ting som er del av en eiendel, f. eks. internminne, disk o. l.',
+
+    'consumables'   => 'Forbruksvarer er alle varer som blir brukt opp over tid. For eksempel skrivertoner eller kopipapir.',
+
+    'depreciations' => 'Du kan sette opp avskrivninger for å kostnadsføre eiendeler basert på en lineær avskrivning i perioden.',
+    
+    'empty_file'    => 'Importbehandleren registrerer at filen er tom.'
+];
diff --git a/resources/lang/nn-NO/localizations.php b/resources/lang/nn-NO/localizations.php
new file mode 100644
index 0000000000..355dd5914a
--- /dev/null
+++ b/resources/lang/nn-NO/localizations.php
@@ -0,0 +1,326 @@
+<?php
+
+return [
+
+    'select_language' => 'Select a Language',
+    'languages' => [
+        'en-US'=> 'Engelsk, USA',
+        'en-GB'=> 'Engelsk, Storbritannia',
+        'am-ET' => 'Amharic',
+        'af-ZA'=> 'Afrikansk',
+        'ar-SA'=> 'Arabisk',
+        'bg-BG'=> 'Bulgarsk',
+        'zh-CN'=> 'Forenklet kinesisk',
+        'zh-TW'=> 'Tradisjonell kinesisk',
+        'ca-ES' => 'Katalansk',
+        'hr-HR'=> 'Kroatisk',
+        'cs-CZ'=> 'Tsjekkisk',
+        'da-DK'=> 'Dansk',
+        'nl-NL'=> 'Nederlandsk',
+        'en-ID'=> 'Engelsk, Indonesia',
+        'et-EE'=> 'Estisk',
+        'fil-PH'=> 'Filippinsk',
+        'fi-FI'=> 'Finsk',
+        'fr-FR'=> 'Fransk',
+        'de-DE'=> 'Tysk',
+        'de-if'=> 'Tysk (uformel)',
+        'el-GR'=> 'Gresk',
+        'he-IL'=> 'Hebraisk',
+        'hu-HU'=> 'Ungarsk',
+        'is-IS' => 'Islandsk',
+        'id-ID'=> 'Indonesisk',
+        'ga-IE'=> 'Irsk',
+        'it-IT'=> 'Italiensk',
+        'ja-JP'=> 'Japansk',
+        'km-KH'=>'Khmer',
+        'ko-KR'=> 'Koreansk',
+        'lt-LT'=>'Litauisk',
+        'lv-LV'=> 'Latvisk',
+        'mk-MK'=> 'Makedonsk',
+        'ms-MY'=> 'Malayisk',
+        'mi-NZ'=> 'Maori',
+        'mn-MN'=> 'Mongolsk',
+        'nb-NO'=> 'Norwegian Bokmål',
+        'om-ET' => 'Oromo (Ethiopian)',
+        //'nn-NO'=> 'Norwegian Nynorsk',
+        'fa-IR'=> 'Persisk',
+        'pl-PL'=> 'Polsk',
+        'pt-PT'=> 'Portugisisk',
+        'pt-BR'=> 'Portugisisk, Brasiliansk',
+        'ro-RO'=> 'Rumensk',
+        'ru-RU'=> 'Russisk',
+        'sr-CS' => 'Serbisk (Latin)',
+        'sk-SK'=> 'Slovakisk',
+        'sl-SI'=> 'Slovensk',
+        'so-SO'=> 'Somali',
+        'es-ES'=> 'Spansk',
+        'es-CO'=> 'Spansk, Colombia',
+        'es-MX'=> 'Spansk, Mexico',
+        'es-VE'=> 'Spansk, Venezuela',
+        'sv-SE'=> 'Svensk',
+        'tl-PH'=> 'Tagalog',
+        'ta-IN'=> 'Tamilsk',
+        'th-TH'=> 'Thai',
+        'tr-TR'=> 'Tyrkisk',
+        'uk-UA'=> 'Ukrainsk',
+        'vi-VN'=> 'Vietnamesisk',
+        'cy-GB'=> 'Walisisk',
+        'zu-ZA'=> 'Zulu',
+    ],
+
+    'select_country' => 'Select a Country',
+    
+    'countries' => [
+        'AC'=>'Ascension Island',
+        'AD'=>'Andorra',
+        'AE'=>'De forente arabiske emirater',
+        'AF'=>'Afghanistan',
+        'AG'=>'Antigua og Barbuda',
+        'AI'=>'Anguilla',
+        'AL'=>'Albania',
+        'AM'=>'Armenia',
+        'AN'=>'De nederlandske Antillene',
+        'AO'=>'Angola',
+        'AQ'=>'Antarktis',
+        'AR'=>'Argentina',
+        'AS'=>'Amerikansk Samoa',
+        'AT'=>'Østerrike',
+        'AU'=>'Australia',
+        'AW'=>'Aruba',
+        'AX'=>'Åland',
+        'AZ'=>'Aserbajdsjan',
+        'BA'=>'Bosnia-Hercegovina',
+        'BB'=>'Barbados',
+        'BE'=>'Belgia',
+        'BD'=>'Bangladesh',
+        'BF'=>'Burkina Faso',
+        'BG'=>'Bulgaria',
+        'BH'=>'Bahrain',
+        'BI'=>'Burundi',
+        'BJ'=>'Benin',
+        'BM'=>'Bermuda',
+        'BN'=>'Brunei Darussalam',
+        'BO'=>'Bolivia',
+        'BR'=>'Brasil',
+        'BS'=>'Bahamas',
+        'BT'=>'Bhutan',
+        'BV'=>'Bouvet-øya',
+        'BW'=>'Botswana',
+        'BY'=>'Republikken Belarus',
+        'BZ'=>'Belize',
+        'CA'=>'Canada',
+        'CC'=>'Kokosøyene (Keelingøyene)',
+        'CD'=>'Den demokratiske republikken Kongo',
+        'CF'=>'Den sentralafrikanske republikk',
+        'CG'=>'Republikken Kongo',
+        'CH'=>'Sveits',
+        'CI'=>'Elfenbenskysten',
+        'CK'=>'Cook-øyene',
+        'CL'=>'Chile',
+        'CM'=>'Kamerun',
+        'CN'=>'Folkerepublikken Kina',
+        'CO'=>'Colombia',
+        'CR'=>'Costa Rica',
+        'CU'=>'Cuba',
+        'CV'=>'Kapp Verde',
+        'CX'=>'Christmasøya',
+        'CY'=>'Kypros',
+        'CZ'=>'Tsjekkia',
+        'DE'=>'Tyskland',
+        'DJ'=>'Djibouti',
+        'DK'=>'Danmark',
+        'DM'=>'Dominica',
+        'DO'=>'Den dominikanske republikk',
+        'DZ'=>'Algerie',
+        'EC'=>'Ecuador',
+        'EE'=>'Estland',
+        'EG'=>'Egypt',
+        'GB-ENG'=>'England',
+        'ER'=>'Eritrea',
+        'ES'=>'Spania',
+        'ET'=>'Etiopia',
+        'EU'=>'EU',
+        'FI'=>'Finland',
+        'FJ'=>'Fiji',
+        'FK'=>'Falklandsøyene (Malvinas)',
+        'FM'=>'Mikronesia, De forente stater',
+        'FO'=>'Færøyene',
+        'FR'=>'Frankrike',
+        'GA'=>'Gabon',
+        'GD'=>'Grenada',
+        'GE'=>'Georgia',
+        'GF'=>'Fransk Guyana',
+        'GG'=>'Guernsey',
+        'GH'=>'Ghana',
+        'GI'=>'Gibraltar',
+        'GL'=>'Grønland',
+        'GM'=>'Gambia',
+        'GN'=>'Guinea',
+        'GP'=>'Guadeloupe',
+        'GQ'=>'Ekvatorial-Guinea',
+        'GR'=>'Hellas',
+        'GS'=>'Sør-Georgia og Sør-Sandwichøyene',
+        'GT'=>'Guatemala',
+        'GU'=>'Guam',
+        'GW'=>'Guinea-Bissau',
+        'GY'=>'Guyana',
+        'HK'=>'Hong Kong',
+        'HM'=>'Heard og Mc Donald Øyene',
+        'HN'=>'Honduras',
+        'HR'=>'Kroatia (lokalt navn: Hrvatska)',
+        'HT'=>'Haiti',
+        'HU'=>'Ungarn',
+        'ID'=>'Indonesia',
+        'IE'=>'Irland',
+        'IL'=>'Israel',
+        'IM'=>'Isle of Man',
+        'IN'=>'India',
+        'IO'=>'Det britiske territoriet i Indiahavet',
+        'IQ'=>'Irak',
+        'IR'=>'Iran',
+        'IS'=>'Island',
+        'IT'=>'Italia',
+        'JE'=>'Jersey',
+        'JM'=>'Jamaica',
+        'JO'=>'Jordan',
+        'JP'=>'Japan',
+        'KE'=>'Kenya',
+        'KG'=>'Kirgisistan',
+        'KH'=>'Kambodsja',
+        'KI'=>'Kiribati',
+        'KM'=>'Komorene',
+        'KN'=>'Saint Kitts og Nevis',
+        'KR'=>'Republikken Korea',
+        'KW'=>'Kuwait',
+        'KY'=>'Caymanøyene',
+        'KZ'=>'Kasakhstan',
+        'LA'=>'Laos',
+        'LB'=>'Libanon',
+        'LC'=>'Saint Lucia',
+        'LI'=>'Liechtenstein',
+        'LK'=>'Sri Lanka',
+        'LR'=>'Liberia',
+        'LS'=>'Lesotho',
+        'LT'=>'Litauen',
+        'LU'=>'Luxemburg',
+        'LV'=>'Latvia',
+        'LY'=>'Libyan Arab Jamahiriya',
+        'MA'=>'Marokko',
+        'MC'=>'Monaco',
+        'MD'=>'Moldova',
+        'ME'=>'Montenegro',
+        'MG'=>'Madagaskar',
+        'MH'=>'Marshalløyene',
+        'MK'=>'Makedonia, den tidligere jugoslaviske republikken',
+        'ML'=>'Mali',
+        'MM'=>'Myanmar',
+        'MN'=>'Mongolia',
+        'MO'=>'Macao',
+        'MP'=>'Nord-Marianene',
+        'MQ'=>'Martinique',
+        'MR'=>'Mauritania',
+        'MS'=>'Montserrat',
+        'MT'=>'Malta',
+        'MU'=>'Mauritius',
+        'MV'=>'Maldivene',
+        'MW'=>'Malawi',
+        'MX'=>'Mexico',
+        'MY'=>'Malaysia',
+        'MZ'=>'Mosambik',
+        'NA'=>'Namibia',
+        'NC'=>'Ny Caledonia',
+        'NE'=>'Niger',
+        'NF'=>'Norfolkøyene',
+        'NG'=>'Nigeria',
+        'NI'=>'Nicaragua',
+        'NL'=>'Nederland',
+        'GB-NIR' => 'Northern Ireland',
+        'NO'=>'Norge',
+        'NP'=>'Nepal',
+        'NR'=>'Nauru',
+        'NU'=>'Niue',
+        'NZ'=>'New Zealand',
+        'OM'=>'Oman',
+        'PA'=>'Panama',
+        'PE'=>'Peru',
+        'PF'=>'Fransk Polynesia',
+        'PG'=>'Papua Ny-Guinea',
+        'PH'=>'Filippinene',
+        'PK'=>'Pakistan',
+        'PL'=>'Polen',
+        'PM'=>'St. Pierre og Miquelon',
+        'PN'=>'Pitcairnøyene',
+        'PR'=>'Puerto Rico',
+        'PS'=>'Palestina',
+        'PT'=>'Portugal',
+        'PW'=>'Palau',
+        'PY'=>'Paraguay',
+        'QA'=>'Qatar',
+        'RE'=>'Réunion',
+        'RO'=>'Romania',
+        'RS'=>'Serbia',
+        'RU'=>'Russland',
+        'RW'=>'Rwanda',
+        'SA'=>'Saudi-Arabia',
+        'GB-SCT'=>'Skottland',
+        'SB'=>'Salomonøyene',
+        'SC'=>'Seychellene',
+        'SS'=>'Sør-Sudan',
+        'SD'=>'Sudan',
+        'SE'=>'Sverige',
+        'SG'=>'Singapor',
+        'SH'=>'St. Helena',
+        'SI'=>'Slovenia',
+        'SJ'=>'Svalbard og Jan Mayen',
+        'SK'=>'Slovakia',
+        'SL'=>'Sierra Leone',
+        'SM'=>'San Marino',
+        'SN'=>'Senegal',
+        'SO'=>'Somalia',
+        'SR'=>'Surinam',
+        'ST'=>'Sao Tome og Principe',
+        'SU'=>'Sovjet',
+        'SV'=>'El Salvador',
+        'SY'=>'Syria',
+        'SZ'=>'Swaziland',
+        'TC'=>'Turks- og Caicosøyene',
+        'TD'=>'Tsjad',
+        'TF'=>'De franske sørterritorier',
+        'TG'=>'Togo',
+        'TH'=>'Thailand',
+        'TJ'=>'Tadsjikistan',
+        'TK'=>'Tokelau',
+        'TI'=>'Øst-Timor',
+        'TM'=>'Turkmenistan',
+        'TN'=>'Tunisia',
+        'TO'=>'Tonga',
+        'TP'=>'Øst Timor',
+        'TR'=>'Tyrkia',
+        'TT'=>'Trinidad og Tobago',
+        'TV'=>'Tuvalu',
+        'TW'=>'Taiwan',
+        'TZ'=>'Tanzania',
+        'UA'=>'Ukraina',
+        'UG'=>'Uganda',
+        'UK'=>'Storbritannia',
+        'US'=>'USA',
+        'UM'=>'USAs ytre småøyer',
+        'UY'=>'Uruguay',
+        'UZ'=>'Usbekistan',
+        'VA'=>'Vatikanstaten',
+        'VC'=>'Saint Vincent og Grenadinene',
+        'VE'=>'Venezuela',
+        'VG'=>'Jomfru øyene (Storbritannia)',
+        'VI'=>'Jomfruøyene, (USA)',
+        'VN'=>'Vietnam',
+        'VU'=>'Vanuatu',
+        'GB-WLS' =>'Wales',
+        'WF'=>'Wallis- og Futunaøyene',
+        'WS'=>'Samoa',
+        'YE'=>'Jemen',
+        'YT'=>'Mayotte',
+        'ZA'=>'South Africa',
+        'ZM'=>'Zambia',
+        'ZW'=>'Zimbabwe',
+    ],
+];
\ No newline at end of file
diff --git a/resources/lang/nn-NO/mail.php b/resources/lang/nn-NO/mail.php
new file mode 100644
index 0000000000..d2d6f59026
--- /dev/null
+++ b/resources/lang/nn-NO/mail.php
@@ -0,0 +1,99 @@
+<?php
+
+return [
+
+    'Accessory_Checkin_Notification' => 'Tilbehør sjekket inn',
+    'Accessory_Checkout_Notification' => 'Tilbehør sjekket ut',
+    'Asset_Checkin_Notification' => 'Eiendel sjekket inn',
+    'Asset_Checkout_Notification' => 'Ressurs sjekket ut',
+    'Confirm_Accessory_Checkin' => 'Bekreft innsjekk av tilbehør',
+    'Confirm_Asset_Checkin' => 'Bekreft innsjekk av eiendel',
+    'Confirm_accessory_delivery' => 'Bekreft levering av tilbehør',
+    'Confirm_asset_delivery' => 'Bekreft levering av eiendel',
+    'Confirm_consumable_delivery' => 'Bekreft levering av forbruksvare',
+    'Confirm_license_delivery' => 'Bekreft levering av lisens',
+    'Consumable_checkout_notification' => 'Forbruksvaren tatt ut',
+    'Days' => 'Dager',
+    'Expected_Checkin_Date' => 'En enhet som er sjekket ut til deg skal leveres tilbake den :date',
+    'Expected_Checkin_Notification' => 'Påminnelse: Innsjekkingsfrist for :name nærmer seg',
+    'Expected_Checkin_Report' => 'Rapport over forventet innsjekking av eiendeler',
+    'Expiring_Assets_Report' => 'Rapport utløpende eiendeler.',
+    'Expiring_Licenses_Report' => 'Rapport utløpende lisenser.',
+    'Item_Request_Canceled' => 'Forespørsel av enhet avbrutt',
+    'Item_Requested' => 'Forespurt enhet',
+    'License_Checkin_Notification' => 'Lisens sjekket inn',
+    'License_Checkout_Notification' => 'Lisens sjekket ut',
+    'license_for'   => 'License for',
+    'Low_Inventory_Report' => 'Rapport lav lagerbeholdning',
+    'a_user_canceled' => 'Brukeren har avbrutt en element-forespørsel på webområdet',
+    'a_user_requested' => 'En bruker har bedt om et element på webområdet',
+    'acceptance_asset_accepted' => 'En bruker har godtatt et element',
+    'acceptance_asset_declined' => 'En bruker har avvist et element',
+    'accessory_name' => 'Navn tilbehør',
+    'additional_notes' => 'Flere notater',
+    'admin_has_created' => 'En administrator har opprettet en konto for deg på :web nettsted.',
+    'asset' => 'Eiendel',
+    'asset_name' => 'Navn',
+    'asset_requested' => 'Eiendel forespurt',
+    'asset_tag' => 'Eiendelsmerke',
+    'assets_warrantee_alert' => 'En eiendel har garanti som utløper innenfor de neste :treshold dagene.|:count eiendeler har garanti som utløper innenfor de neste :tershold dagene.',
+    'assigned_to' => 'Tilordnet til',
+    'best_regards' => 'Med vennlig hilsen,',
+    'canceled' => 'Avbrutt',
+    'checkin_date' => 'Innsjekkdato',
+    'checkout_date' => 'Utsjekkdato',
+    'checkedout_from' => 'Sjekket ut fra',
+    'checkedin_from'  => 'Sjekket inn fra',
+    'checked_into' => 'Sjekket inn',
+    'click_on_the_link_accessory' => 'Vennligst klikk på lenken nedenfor for å bekreft at du har mottatt tilbehøret.',
+    'click_on_the_link_asset' => 'Vennligst klikk på lenken nedenfor for å bekreft at du har mottatt eiendelen.',
+    'click_to_confirm' => 'Klikk på følgende link for å bekrefte din :web konto:',
+    'current_QTY' => 'Nåværende antall',
+    'days' => 'Dager',
+    'expecting_checkin_date' => 'Forventet dato for innsjekk',
+    'expires' => 'Utløper',
+    'hello' => 'Hallo',
+    'hi' => 'Hei',
+    'i_have_read' => 'Jeg har lest og godtar vilkårene for bruk, og har mottatt denne enheten.',
+    'inventory_report' => 'Lagerbeholdnings rapport',
+    'item' => 'Enhet',
+    'item_checked_reminder' => 'This is a reminder that you currently have :count items checked out to you that you have not accepted or declined. Please click the link below to confirm your decision.',
+    'license_expiring_alert' => ':count lisens utløper de neste :threshold dagene.|:count lisenser utløper de neste :threshold dagene.',
+    'link_to_update_password' => 'Klikk på følgende link for å bekrefte din :web passord:',
+    'login' => 'Logg inn',
+    'login_first_admin' => 'Logg inn på din nye Snipe-IT-installasjon ved å bruke kontoen nedenfor:',
+    'low_inventory_alert' => ':count enhet er under minimumnivå for beholdning, eller vil snart nå dette nivået.|:count enheter er under minimumnivå for beholdning, eller vil snart nå dette nivået.',
+    'min_QTY' => 'Min. antall',
+    'name' => 'Navn',
+    'new_item_checked' => 'En ny enhet har blitt sjekket ut under ditt navn, detaljer nedenfor.',
+    'new_item_checked_with_acceptance' => 'A new item has been checked out under your name that requires acceptance, details are below.',
+    'recent_item_checked' => 'An item was recently checked out under your name that requires acceptance, details are below.',
+    'notes' => 'Notater',
+    'password' => 'Passord',
+    'password_reset' => 'Tilbakestill passord',
+    'read_the_terms' => 'Vennligst les bruksbetingelsene nedenfor.',
+    'read_the_terms_and_click' => 'Vennligst les vilkårene for bruk nedenfor. og klikk på lenken nederst for å bekrefte at du leser og godtar vilkårene for bruk, og har mottatt eiendelen.',
+    'requested' => 'Forespurt',
+    'reset_link' => 'Lenke for tilbakestilling av passord',
+    'reset_password' => 'Klikk her for å tilbakestille passordet:',
+    'rights_reserved' => 'Alle rettigheter forbeholdt.',
+    'serial' => 'Serienummer',
+    'snipe_webhook_test' => 'Snipe-IT integrasjonstest',
+    'snipe_webhook_summary' => 'Snipe-IT integrasjon test sammendrag',
+    'supplier' => 'Leverandør',
+    'tag' => 'Merke',
+    'test_email' => 'Test-epost fra Snipe-IT',
+    'test_mail_text' => 'Dette er en test fra Snipe-IT eiendelsadministrasjonssystem. Hvis du mottok denne meldingen fungerer e-post.',
+    'the_following_item' => 'Følgende enheter har blitt sjekket inn: ',
+    'to_reset' => 'Fullfør dette skjemaet for å tilbakestille ditt :web passord:',
+    'type' => 'Type',
+    'upcoming-audits' => ':count eiendel har revisjonsfrist innen :treshold dager.|:count eiendeler har revisjonsfrist innen :threshold dager.',
+    'user' => 'Bruker',
+    'username' => 'Brukernavn',
+    'unaccepted_asset_reminder' => 'Reminder: You have Unaccepted Assets.',
+    'welcome' => 'Velkommen :name',
+    'welcome_to' => 'Velkommen til :web!',
+    'your_assets' => 'Vis dine eiendeler',
+    'your_credentials' => 'Din Snipe-IT konto',
+    'mail_sent' => 'Mail sent successfully!',
+];
diff --git a/resources/lang/nn-NO/pagination.php b/resources/lang/nn-NO/pagination.php
new file mode 100644
index 0000000000..26ea2fb2ad
--- /dev/null
+++ b/resources/lang/nn-NO/pagination.php
@@ -0,0 +1,20 @@
+<?php
+
+return array(
+
+    /*
+    |--------------------------------------------------------------------------
+    | Pagination Language Lines
+    |--------------------------------------------------------------------------
+    |
+    | The following language lines are used by the paginator library to build
+    | the simple pagination links. You are free to change them to anything
+    | you want to customize your views to better match your application.
+    |
+    */
+
+    'previous' => '&laquo; Forrige',
+
+    'next'     => 'Neste &raquo;',
+
+);
diff --git a/resources/lang/nn-NO/passwords.php b/resources/lang/nn-NO/passwords.php
new file mode 100644
index 0000000000..3e82b8a1a5
--- /dev/null
+++ b/resources/lang/nn-NO/passwords.php
@@ -0,0 +1,9 @@
+<?php
+
+return [
+    'sent'	        => 'Hvis den oppgitte e-postadressen finnes i systemet vårt har det blitt sendt en e-post med informasjon for gjenopprettelse av passord.',
+    'user'			=> 'Hvis den oppgitte e-postadressen finnes i systemet vårt har det blitt sendt en e-post med gjenopprettelse av passord.',
+    'token'         => 'Token for tilbakestilling av passord er ugyldig eller utløpt, eller så stemmer den ikke overens med det angitte brukernavnet.',
+    'reset'         => 'Ditt passord har blitt tilbakestilt!',
+    'password_change'  => 'Ditt passord har blitt oppdatert!',
+];
diff --git a/resources/lang/nn-NO/reminders.php b/resources/lang/nn-NO/reminders.php
new file mode 100644
index 0000000000..a3d1e54447
--- /dev/null
+++ b/resources/lang/nn-NO/reminders.php
@@ -0,0 +1,21 @@
+<?php
+
+return array(
+
+    /*
+    |--------------------------------------------------------------------------
+    | Password Reminder Language Lines
+    |--------------------------------------------------------------------------
+    |
+    | The following language lines are the default lines which match reasons
+    | that are given by the password broker for a password update attempt
+    | has failed, such as for an invalid token or invalid new password.
+    |
+    */
+
+    "password" => "Passord må bestå av minst 6 tegn og stemme med bekreftelse.",
+    "user"     => "Brukernavn eller epostadresse er ugyldig",
+    "token"    => 'Token for tilbakestilling av passord er ugyldig eller utløpt, eller så stemmer den ikke overens med det angitte brukernavnet.',
+    'sent'	   => 'Hvis den oppgitte e-postadressen finnes i systemet vårt har det blitt sendt en e-post med informasjon for gjenopprettelse av passord.',
+
+);
diff --git a/resources/lang/nn-NO/table.php b/resources/lang/nn-NO/table.php
new file mode 100644
index 0000000000..f32ec7ca4b
--- /dev/null
+++ b/resources/lang/nn-NO/table.php
@@ -0,0 +1,11 @@
+<?php
+
+return array(
+
+    'actions'	 	        => 'Handlinger',
+    'action' 		        => 'Handling',
+    'by'      		        => 'Av',
+    'item' 			        => 'Enhet',
+    'no_matching_records'   => 'No matching records found',
+
+);
diff --git a/resources/lang/nn-NO/validation.php b/resources/lang/nn-NO/validation.php
new file mode 100644
index 0000000000..12b5bd462a
--- /dev/null
+++ b/resources/lang/nn-NO/validation.php
@@ -0,0 +1,248 @@
+<?php
+
+return [
+
+    /*
+    |--------------------------------------------------------------------------
+    | Validation Language Lines
+    |--------------------------------------------------------------------------
+    |
+    | The following language lines contain the default error messages used by
+    | the validator class. Some of these rules have multiple versions such
+    | such as the size rules. Feel free to tweak each of these messages.
+    |
+    */
+
+    'accepted' => 'The :attribute field must be accepted.',
+    'accepted_if' => 'The :attribute field must be accepted when :other is :value.',
+    'active_url' => 'The :attribute field must be a valid URL.',
+    'after' => 'The :attribute field must be a date after :date.',
+    'after_or_equal' => 'The :attribute field must be a date after or equal to :date.',
+    'alpha' => 'The :attribute field must only contain letters.',
+    'alpha_dash' => 'The :attribute field must only contain letters, numbers, dashes, and underscores.',
+    'alpha_num' => 'The :attribute field must only contain letters and numbers.',
+    'array' => 'The :attribute field must be an array.',
+    'ascii' => 'The :attribute field must only contain single-byte alphanumeric characters and symbols.',
+    'before' => 'The :attribute field must be a date before :date.',
+    'before_or_equal' => 'The :attribute field must be a date before or equal to :date.',
+    'between' => [
+        'array' => 'The :attribute field must have between :min and :max items.',
+        'file' => 'The :attribute field must be between :min and :max kilobytes.',
+        'numeric' => 'The :attribute field must be between :min and :max.',
+        'string' => 'The :attribute field must be between :min and :max characters.',
+    ],
+    'boolean' => 'Attributtfeltet må være sant eller falskt.',
+    'can' => 'The :attribute field contains an unauthorized value.',
+    'confirmed' => 'The :attribute field confirmation does not match.',
+    'contains' => 'The :attribute field is missing a required value.',
+    'current_password' => 'The password is incorrect.',
+    'date' => 'The :attribute field must be a valid date.',
+    'date_equals' => 'The :attribute field must be a date equal to :date.',
+    'date_format' => 'The :attribute field must match the format :format.',
+    'decimal' => 'The :attribute field must have :decimal decimal places.',
+    'declined' => 'The :attribute field must be declined.',
+    'declined_if' => 'The :attribute field must be declined when :other is :value.',
+    'different' => 'The :attribute field and :other must be different.',
+    'digits' => 'The :attribute field must be :digits digits.',
+    'digits_between' => 'The :attribute field must be between :min and :max digits.',
+    'dimensions' => 'The :attribute field has invalid image dimensions.',
+    'distinct' => 'Attributtfeltet har en duplikatverdi.',
+    'doesnt_end_with' => 'The :attribute field must not end with one of the following: :values.',
+    'doesnt_start_with' => 'The :attribute field must not start with one of the following: :values.',
+    'email' => 'The :attribute field must be a valid email address.',
+    'ends_with' => 'The :attribute field must end with one of the following: :values.',
+    'enum' => 'Attributtet :attribute er ugyldig.',
+    'exists' => 'Valgt attributt :attribute er ugyldig.',
+    'extensions' => 'The :attribute field must have one of the following extensions: :values.',
+    'file' => 'The :attribute field must be a file.',
+    'filled' => 'Den :attribute må ha en verdi.',
+    'gt' => [
+        'array' => 'The :attribute field must have more than :value items.',
+        'file' => 'The :attribute field must be greater than :value kilobytes.',
+        'numeric' => 'The :attribute field must be greater than :value.',
+        'string' => 'The :attribute field must be greater than :value characters.',
+    ],
+    'gte' => [
+        'array' => 'The :attribute field must have :value items or more.',
+        'file' => 'The :attribute field must be greater than or equal to :value kilobytes.',
+        'numeric' => 'The :attribute field must be greater than or equal to :value.',
+        'string' => 'The :attribute field must be greater than or equal to :value characters.',
+    ],
+    'hex_color' => 'The :attribute field must be a valid hexadecimal color.',
+    'image' => 'The :attribute field must be an image.',
+    'import_field_empty'    => 'Verdien for :fieldname kan ikke være null.',
+    'in' => 'Det valgte attributtet :attribute er ugyldig.',
+    'in_array' => 'The :attribute field must exist in :other.',
+    'integer' => 'The :attribute field must be an integer.',
+    'ip' => 'The :attribute field must be a valid IP address.',
+    'ipv4' => 'The :attribute field must be a valid IPv4 address.',
+    'ipv6' => 'The :attribute field must be a valid IPv6 address.',
+    'json' => 'The :attribute field must be a valid JSON string.',
+    'list' => 'The :attribute field must be a list.',
+    'lowercase' => 'The :attribute field must be lowercase.',
+    'lt' => [
+        'array' => 'The :attribute field must have less than :value items.',
+        'file' => 'The :attribute field must be less than :value kilobytes.',
+        'numeric' => 'The :attribute field must be less than :value.',
+        'string' => 'The :attribute field must be less than :value characters.',
+    ],
+    'lte' => [
+        'array' => 'The :attribute field must not have more than :value items.',
+        'file' => 'The :attribute field must be less than or equal to :value kilobytes.',
+        'numeric' => 'The :attribute field must be less than or equal to :value.',
+        'string' => 'The :attribute field must be less than or equal to :value characters.',
+    ],
+    'mac_address' => 'The :attribute field must be a valid MAC address.',
+    'max' => [
+        'array' => 'The :attribute field must not have more than :max items.',
+        'file' => 'The :attribute field must not be greater than :max kilobytes.',
+        'numeric' => 'The :attribute field must not be greater than :max.',
+        'string' => 'The :attribute field must not be greater than :max characters.',
+    ],
+    'max_digits' => 'The :attribute field must not have more than :max digits.',
+    'mimes' => 'The :attribute field must be a file of type: :values.',
+    'mimetypes' => 'The :attribute field must be a file of type: :values.',
+    'min' => [
+        'array' => 'The :attribute field must have at least :min items.',
+        'file' => 'The :attribute field must be at least :min kilobytes.',
+        'numeric' => 'The :attribute field must be at least :min.',
+        'string' => 'The :attribute field must be at least :min characters.',
+    ],
+    'min_digits' => 'The :attribute field must have at least :min digits.',
+    'missing' => 'The :attribute field must be missing.',
+    'missing_if' => 'The :attribute field must be missing when :other is :value.',
+    'missing_unless' => 'The :attribute field must be missing unless :other is :value.',
+    'missing_with' => 'The :attribute field must be missing when :values is present.',
+    'missing_with_all' => 'The :attribute field must be missing when :values are present.',
+    'multiple_of' => 'The :attribute field must be a multiple of :value.',
+    'not_in' => 'Attributtet :attribute er ugyldig.',
+    'not_regex' => 'The :attribute field format is invalid.',
+    'numeric' => 'The :attribute field must be a number.',
+    'password' => [
+        'letters' => 'The :attribute field must contain at least one letter.',
+        'mixed' => 'The :attribute field must contain at least one uppercase and one lowercase letter.',
+        'numbers' => 'The :attribute field must contain at least one number.',
+        'symbols' => 'The :attribute field must contain at least one symbol.',
+        'uncompromised' => 'The given :attribute has appeared in a data leak. Please choose a different :attribute.',
+    ],
+    'percent'       => 'The depreciation minimum must be between 0 and 100 when depreciation type is percentage.',
+
+    'present' => 'Atributtfeltet :attribute må ha en verdi.',
+    'present_if' => 'The :attribute field must be present when :other is :value.',
+    'present_unless' => 'The :attribute field must be present unless :other is :value.',
+    'present_with' => 'The :attribute field must be present when :values is present.',
+    'present_with_all' => 'The :attribute field must be present when :values are present.',
+    'prohibited' => 'The :attribute field is prohibited.',
+    'prohibited_if' => 'The :attribute field is prohibited when :other is :value.',
+    'prohibited_unless' => 'The :attribute field is prohibited unless :other is in :values.',
+    'prohibits' => 'The :attribute field prohibits :other from being present.',
+    'regex' => 'The :attribute field format is invalid.',
+    'required' => 'Attributt-feltet :attribute er påkrevd.',
+    'required_array_keys' => 'The :attribute field must contain entries for: :values.',
+    'required_if' => 'Attributt-feltet :attribute er påkrevd når :oher er :value.',
+    'required_if_accepted' => 'The :attribute field is required when :other is accepted.',
+    'required_if_declined' => 'The :attribute field is required when :other is declined.',
+    'required_unless' => 'Attributtfeltet kreves med mindre: annet er i: verdier.',
+    'required_with' => 'Attributt-feltet :attribute er påkrevd når :values er tilstede.',
+    'required_with_all' => 'The :attribute field is required when :values are present.',
+    'required_without' => 'Attributt-feltet :attribute er påkrevd når :values ikke er tilstede.',
+    'required_without_all' => 'Attributtfeltet kreves når ingen av: verdiene er til stede.',
+    'same' => 'The :attribute field must match :other.',
+    'size' => [
+        'array' => 'The :attribute field must contain :size items.',
+        'file' => 'The :attribute field must be :size kilobytes.',
+        'numeric' => 'The :attribute field must be :size.',
+        'string' => 'The :attribute field must be :size characters.',
+    ],
+    'starts_with' => 'The :attribute field must start with one of the following: :values.',
+    'string'               => 'Attributtet :attribute må være en tekst.',
+    'two_column_unique_undeleted' => ':attribute må være unik i forhold til :table1 og :table2. ',
+    'unique_undeleted'     => ':attribute må være unikt.',
+    'non_circular'         => 'Attributtet :attribute kan ikke opprette en sirkulær referanse.',
+    'not_array'            => ':attribute kan ikke være en matrise.',
+    'disallow_same_pwd_as_user_fields' => 'Passordet kan ikke være det samme som brukernavnet.',
+    'letters'              => 'Passordet må inneholde minst en bokstav.',
+    'numbers'              => 'Passordet må inneholde minst ett tall.',
+    'case_diff'            => 'Passordet må innehode store og små bokstaver.',
+    'symbols'              => 'Passordet må inneholde symboler.',
+    'timezone' => 'The :attribute field must be a valid timezone.',
+    'unique' => 'Attributtet :attribute er allerede tatt.',
+    'uploaded' => 'Atribbutet :attribute kunne ikke lastes opp.',
+    'uppercase' => 'The :attribute field must be uppercase.',
+    'url' => 'The :attribute field must be a valid URL.',
+    'ulid' => 'The :attribute field must be a valid ULID.',
+    'uuid' => 'The :attribute field must be a valid UUID.',
+    'fmcs_location' => 'Full multiple company support and location scoping is enabled in the Admin Settings, and the selected location and selected company are not compatible.',
+
+
+    /*
+    |--------------------------------------------------------------------------
+    | Custom Validation Language Lines
+    |--------------------------------------------------------------------------
+    |
+    | Here you may specify custom validation messages for attributes using the
+    | convention "attribute.rule" to name the lines. This makes it quick to
+    | specify a specific custom language line for a given attribute rule.
+    |
+    */
+
+    'email_array'      => 'En eller flere e-postadresser er ugyldige.',
+    'checkboxes'           => ':attribute inneholder ugyldige valg.',
+    'radio_buttons'        => ':attribute er ugyldig.',
+    
+    'custom' => [
+        'alpha_space' => 'Attributtfeltet inneholder et tegn som ikke er tillatt.',
+
+        'hashed_pass'      => 'Gjeldende passord er feil',
+        'dumbpwd'          => 'Passordet er for vanlig.',
+        'statuslabel_type' => 'Du må velge en gyldig statusetikett-type',
+        'custom_field_not_found'          => 'This field does not seem to exist, please double check your custom field names.',
+        'custom_field_not_found_on_model' => 'This field seems to exist, but is not available on this Asset Model\'s fieldset.',
+
+        // date_format validation with slightly less stupid messages. It duplicates a lot, but it gets the job done :(
+        // We use this because the default error message for date_format reflects php Y-m-d, which non-PHP
+        // people won't know how to format.
+        'purchase_date.date_format'     => ':attribute må være en gyldig dato i YYYY-MM-DD format',
+        'last_audit_date.date_format'   =>  ':attribute må være en gyldig dato i YYYY-MM-DD hh:mm:ss format',
+        'expiration_date.date_format'   =>  ':attribute må være en gyldig dato i YYYY-MM-DD format',
+        'termination_date.date_format'  =>  ':attribute må være en gyldig dato i YYYY-MM-DD format',
+        'expected_checkin.date_format'  =>  ':attribute må være en gyldig dato i YYYY-MM-DD format',
+        'start_date.date_format'        =>  ':attribute må være en gyldig dato i YYYY-MM-DD format',
+        'end_date.date_format'          =>  ':attribute må være en gyldig dato i YYYY-MM-DD format',
+        'invalid_value_in_field' => 'Ugyldig verdi inkludert i dette feltet',
+
+        'ldap_username_field' => [
+            'not_in' =>         '<code>sAMAccountName</code> (mixed case) will likely not work. You should use <code>samaccountname</code> (lowercase) instead.'
+        ],
+        'ldap_auth_filter_query' => ['not_in' => '<code>uid=samaccountname</code> is probably not a valid auth filter. You probably want <code>uid=</code> '],
+        'ldap_filter' => ['regex' => 'This value should probably not be wrapped in parentheses.'],
+
+        ],
+    /*
+    |--------------------------------------------------------------------------
+    | Custom Validation Attributes
+    |--------------------------------------------------------------------------
+    |
+    | The following language lines are used to swap attribute place-holders
+    | with something more reader friendly such as E-Mail Address instead
+    | of "email". This simply helps us make messages a little cleaner.
+    |
+    */
+
+    'attributes' => [],
+
+    /*
+    |--------------------------------------------------------------------------
+    | Generic Validation Messages - we use these in the jquery validation where we don't have
+    | access to the :attribute
+    |--------------------------------------------------------------------------
+    */
+
+    'generic' => [
+        'invalid_value_in_field' => 'Ugyldig verdi inkludert i dette feltet',
+        'required' => 'This field is required',
+        'email' => 'Please enter a valid email address',
+    ],
+
+
+];
diff --git a/resources/lang/no-NO/account/general.php b/resources/lang/no-NO/account/general.php
index bb3f5350b6..99da024c80 100644
--- a/resources/lang/no-NO/account/general.php
+++ b/resources/lang/no-NO/account/general.php
@@ -2,10 +2,16 @@
 
 return array(
     'personal_api_keys' => 'Personlige API-nøkler',
+    'personal_access_token' => 'Personal Access Token',
+    'personal_api_keys_success' => 'Personal API Key :key created sucessfully',
+    'here_is_api_key' => 'Here is your new personal access token. This is the only time it will be shown so do not lose it! You may now use this token to make API requests.',
     'api_key_warning' => 'When generating an API token, be sure to copy it down immediately as they will not be visible to you again.',
     'api_base_url' => 'Din API base-url finnes på:',
     'api_base_url_endpoint' => '/&lt;endpoint&gt;',
     'api_token_expiration_time' => 'API-tokens er satt til å utløpe om:',
     'api_reference' => 'Please check the <a href="https://snipe-it.readme.io/reference" target="_blank">API reference</a> to find specific API endpoints and additional API documentation.',
     'profile_updated' => 'Account successfully updated',
+    'no_tokens' => 'You have not created any personal access tokens.',
+    'enable_sounds' => 'Enable sound effects',
+    'enable_confetti' => 'Enable confetti effects',
 );
diff --git a/resources/lang/no-NO/admin/accessories/message.php b/resources/lang/no-NO/admin/accessories/message.php
index b2762cb669..c6e641c692 100644
--- a/resources/lang/no-NO/admin/accessories/message.php
+++ b/resources/lang/no-NO/admin/accessories/message.php
@@ -26,7 +26,11 @@ return array(
         'error'   		=> 'Tilbehør ble ikke sjekket ut. Prøv igjen',
         'success' 		=> 'Vellykket utsjekking av tilbehør.',
         'unavailable'   => 'Tilbehør er ikke tilgjengelig for utsjekk. Sjekk antall tilgjengelig',
-        'user_does_not_exist' => 'Denne brukeren er ugyldig. Prøv igjen.'
+        'user_does_not_exist' => 'Denne brukeren er ugyldig. Prøv igjen.',
+         'checkout_qty' => array(
+            'lte'  => 'There is currently only one available accessory of this type, and you are trying to check out :checkout_qty. Please adjust the checkout quantity or the total stock of this accessory and try again.|There are :number_currently_remaining total available accessories, and you are trying to check out :checkout_qty. Please adjust the checkout quantity or the total stock of this accessory and try again.',
+            ),
+           
     ),
 
     'checkin' => array(
diff --git a/resources/lang/no-NO/admin/accessories/table.php b/resources/lang/no-NO/admin/accessories/table.php
index f154d8fe91..6d3c5d944c 100644
--- a/resources/lang/no-NO/admin/accessories/table.php
+++ b/resources/lang/no-NO/admin/accessories/table.php
@@ -6,6 +6,4 @@ return array(
     'id'      					=> 'ID',
     'require_acceptance'      	=> 'Godtatt',
     'title'      				=> 'Navn tilbehør',
-
-
 );
diff --git a/resources/lang/no-NO/admin/components/message.php b/resources/lang/no-NO/admin/components/message.php
index af968e45f9..625f7ebdfe 100644
--- a/resources/lang/no-NO/admin/components/message.php
+++ b/resources/lang/no-NO/admin/components/message.php
@@ -17,7 +17,8 @@ return array(
     'delete' => array(
         'confirm'   => 'Er du sikker på at du vil slette denne komponenten?',
         'error'   => 'Det oppstod et problem under sletting av komponenten. Vennligst prøv igjen.',
-        'success' => 'Sletting av komponent vellykket.'
+        'success' => 'Sletting av komponent vellykket.',
+        'error_qty'   => 'Some components of this type are still checked out. Please check them in and try again.',
     ),
 
      'checkout' => array(
diff --git a/resources/lang/no-NO/admin/consumables/general.php b/resources/lang/no-NO/admin/consumables/general.php
index bb602196b3..cf7e29fcd3 100644
--- a/resources/lang/no-NO/admin/consumables/general.php
+++ b/resources/lang/no-NO/admin/consumables/general.php
@@ -8,4 +8,5 @@ return array(
     'remaining' 			            => 'Gjenstår',
     'total' 			                => 'Total',
     'update'                            => 'Oppdater forbruksvare',
+    'inventory_warning'                 => 'The inventory of this consumable is below the minimum amount of :min_count',
 );
diff --git a/resources/lang/no-NO/admin/consumables/message.php b/resources/lang/no-NO/admin/consumables/message.php
index dad90d5f02..e652d40ef6 100644
--- a/resources/lang/no-NO/admin/consumables/message.php
+++ b/resources/lang/no-NO/admin/consumables/message.php
@@ -2,6 +2,7 @@
 
 return array(
 
+    'invalid_category_type' => 'The category must be a consumable category.',
     'does_not_exist' => 'Forbruksvaren finnes ikke.',
 
     'create' => array(
diff --git a/resources/lang/no-NO/admin/custom_fields/general.php b/resources/lang/no-NO/admin/custom_fields/general.php
index 2f88f383a7..2b4f1b593d 100644
--- a/resources/lang/no-NO/admin/custom_fields/general.php
+++ b/resources/lang/no-NO/admin/custom_fields/general.php
@@ -35,7 +35,7 @@ return [
     'create_field_title' => 'Opprett nytt egendefinert felt',
     'value_encrypted'      	        => 'Verdien i dette feltet er kryptert i databasen. Bare administratorer kan se hva som står i dette feltet',
     'show_in_email'     => 'Inkluder verdien i dette feltet i utsjekkseposter sendt til brukeren? Krypterte felter kan ikke inkluderes i eposter',
-    'show_in_email_short'     => 'Inkludere i epost.',
+    'show_in_email_short' => 'Inkludere i epost',
     'help_text' => 'Hjelpetekst',
     'help_text_description' => 'Dette er en valgfri tekst som vises under feltet når man redigerer et element, ment for å gi kontekst til feltets innhold.',
     'about_custom_fields_title' => 'Om egendefinerte felt',
@@ -57,5 +57,8 @@ return [
     'show_in_requestable_list_short' => 'Vis i liste over ressurser som kan være tilgjengelig på forespørsel',
     'show_in_requestable_list' => 'Vis verdi i listen over ressurser som kan være tilgjengelig på forspørsel. Krypterte felter vises ikke',
     'encrypted_options' => 'Feltet er kryptert, så noen visningsalternativer er ikke tilgjengelig.',
+    'display_checkin' => 'Display in checkin forms',
+    'display_checkout' => 'Display in checkout forms',
+    'display_audit' => 'Display in audit forms',
 
 ];
diff --git a/resources/lang/no-NO/admin/custom_fields/message.php b/resources/lang/no-NO/admin/custom_fields/message.php
index 0dd248415a..976984aae1 100644
--- a/resources/lang/no-NO/admin/custom_fields/message.php
+++ b/resources/lang/no-NO/admin/custom_fields/message.php
@@ -5,6 +5,7 @@ return array(
     'field' => array(
         'invalid'   => 'Feltet finnes ikke.',
         'already_added'   => 'Feltet er allerede lagt til',
+        'none_selected'   => 'No field selected',
 
         'create' => array(
             'error'   => 'Feltet ble ikke opprettet, vennligst prøv igjen.',
diff --git a/resources/lang/no-NO/admin/depreciations/general.php b/resources/lang/no-NO/admin/depreciations/general.php
index be4f6d862c..e7a8b1b0af 100644
--- a/resources/lang/no-NO/admin/depreciations/general.php
+++ b/resources/lang/no-NO/admin/depreciations/general.php
@@ -13,4 +13,8 @@ return [
     'no_depreciations_warning'               => '<strong>Advarsel:</strong>
                       Du har for øyeblikket ingen avskrivninger satt opp.
                       Vennligst sett opp minst én avskrivning for å se avskrivningsrapporten.',
+    'depreciation_method'                   => 'Avskrivningsrapport',
+    'linear_depreciation'                   => 'Linear (Default)',
+    'half_1'                                => 'Half-year convention, always applied',
+    'half_2'                                => 'Half-year convention, applied with condition',
 ];
diff --git a/resources/lang/no-NO/admin/hardware/form.php b/resources/lang/no-NO/admin/hardware/form.php
index f58d7b8cb9..a042e9b9e3 100644
--- a/resources/lang/no-NO/admin/hardware/form.php
+++ b/resources/lang/no-NO/admin/hardware/form.php
@@ -55,8 +55,11 @@ return [
     'asset_location_update_default' => 'Oppdater bare standardlokasjon',
     'asset_location_update_actual' => 'Oppdater bare faktisk plassering',
     'asset_not_deployable' => 'Den eiendelstatusen gjør at denne eiendelen ikke kan sjekkes ut.',
-    'asset_deployable' => 'Den statusen gjør det mulig å sjekke ut denne eiendelen.',
+    'asset_not_deployable_checkin' => 'That asset status is not deployable. Using this status label will checkin the asset.',
+    'asset_deployable' => 'This asset can be checked out.',
     'processing_spinner' => 'Behandler... (Dette kan ta litt tid for store filer)',
+    'processing' => 'Behandler... ',
     'optional_infos'  => 'Valgfri informasjon',
-    'order_details'   => 'Ordrerelatert informasjon'
+    'order_details'   => 'Ordrerelatert informasjon',
+    'calc_eol'    => 'If nulling the EOL date, use automatic EOL calculation based on the purchase date and EOL rate.',
 ];
diff --git a/resources/lang/no-NO/admin/hardware/general.php b/resources/lang/no-NO/admin/hardware/general.php
index 9b19b6b2a0..d9006fcf32 100644
--- a/resources/lang/no-NO/admin/hardware/general.php
+++ b/resources/lang/no-NO/admin/hardware/general.php
@@ -5,8 +5,8 @@ return [
     'about_assets_text'            => 'Eiendeler er sporet av serienummer eller assetsmerke.  De pleier å være høyere verdi f. eks for å identifisere spesielle ting.',
     'archived'  				=> 'Arkivert',
     'asset'  					=> 'Eiendel',
-    'bulk_checkout'             => 'Sjekk ut Eiendeler',
-    'bulk_checkin'              => 'Sjekk inn ressurser',
+    'bulk_checkout'             => 'Masseutsjekk',
+    'bulk_checkin'              => 'Bulk Checkin',
     'checkin'  					=> 'Sjekk inn eiendel',
     'checkout'  				=> 'Sjekk ut asset',
     'clone'  					=> 'Klon eiendel',
@@ -27,8 +27,7 @@ return [
     'undeployable_tooltip'  	=> 'Denne ressursen har en statusetikett som ikke er distribuerbar og kan ikke sjekkes ut på dette tidspunktet.',
     'view'  					=> 'Vis eiendel',
     'csv_error' => 'Du har en feil i din CSV-fil:',
-    'import_text' => '<p>Last opp en CSV som inneholder eiendeler. Eiendelene og brukerne MÅ allerede finnes i systemet, ellers vil de bli hoppet over. Samsvarende ressurser for tidligere import skjer mot eiendeler. Vi vil prøve å finne en matchende bruker basert på navnet du oppgiver, og kriteriene du velger nedenfor. Hvis du ikke velger noen av kriteriene nedenfor, det vil bare prøve å matche på brukernavnet formatet du konfigurert i <code>Admin &gt; Generelle innstillinger</code>.</p><p>Felter som er inkludert i CSV, må samsvare med overskriftene: <strong>Asset Tag, Navn, Kasse Dato, Innsjekkingsdato</strong>. Eventuelle ekstra felt vil bli ignorert. </p><p>Innsjekkingsdato: tomme eller fremtidige sjekkingsdatoer vil kassere elementer til tilhørende bruker. Ekskluder kolonnen Sjekkinn dato vil opprette en avmerkingsdato med dagens dato.</p>
-    ',
+    'import_text' => '<p>Upload a CSV that contains asset history. The assets and users MUST already exist in the system, or they will be skipped. Matching assets for history import happens against the asset tag. We will try to find a matching user based on the user\'s name you provide, and the criteria you select below. If you do not select any criteria below, it will simply try to match on the username format you configured in the <code>Admin &gt; General Settings</code>.</p><p>Fields included in the CSV must match the headers: <strong>Asset Tag, Name, Checkout Date, Checkin Date</strong>. Any additional fields will be ignored. </p><p>Checkin Date: blank or future checkin dates will checkout items to associated user.  Excluding the Checkin Date column will create a checkin date with todays date.</p>    ',
     'csv_import_match_f-l' => 'Prøv å matche brukere av <strong>firstname.lastname</strong> (<code>jane.smith</code>) format',
     'csv_import_match_initial_last' => 'Prøv å matche brukere med <strong>første første etternavn</strong> (<code>jsmith</code>) format',
     'csv_import_match_first' => 'Prøv å matche brukere med <strong>fornavn</strong> (<code>jane</code>) format',
diff --git a/resources/lang/no-NO/admin/hardware/message.php b/resources/lang/no-NO/admin/hardware/message.php
index b8afac8356..04b3f4ceb7 100644
--- a/resources/lang/no-NO/admin/hardware/message.php
+++ b/resources/lang/no-NO/admin/hardware/message.php
@@ -2,19 +2,23 @@
 
 return [
 
-    'undeployable' 		=> '<strong>Advarsel:</strong> Denne eiendelen er merket som ikke utleverbar.
-                        Oppdater eiendelsstatus hvis situasjonen har endret seg.',
-    'does_not_exist' 	=> 'Eiendel eksisterer ikke.',
-    'does_not_exist_var'=> 'Asset with tag :asset_tag not found.',
-    'no_tag' 	        => 'No asset tag provided.',
+    'undeployable' 		 => '<strong>Advarsel:</strong> Denne eiendelen er merket som ikke utplasserbar. Vennligst endre status for eiendel dette har endret seg.',
+    'does_not_exist' 	 => 'Eiendel eksisterer ikke.',
+    'does_not_exist_var' => 'Asset with tag :asset_tag not found.',
+    'no_tag' 	         => 'No asset tag provided.',
     'does_not_exist_or_not_requestable' => 'Eiendelen eksisterer ikke eller kan ikke forespørres.',
-    'assoc_users'	 	=> 'Denne eiendelen er merket som utsjekket til en bruker og kan ikke slettes. Vennligst sjekk inn eiendelen først, og forsøk sletting på nytt. ',
+    'assoc_users'	 	 => 'Denne eiendelen er merket som utsjekket til en bruker og kan ikke slettes. Vennligst sjekk inn eiendelen først, og forsøk sletting på nytt. ',
     'warning_audit_date_mismatch' 	=> 'This asset\'s next audit date (:next_audit_date) is before the last audit date (:last_audit_date). Please update the next audit date.',
+    'labels_generated'   => 'Labels were successfully generated.',
+    'error_generating_labels' => 'Error while generating labels.',
+    'no_assets_selected' => 'No assets selected.',
 
     'create' => [
         'error'   		=> 'Eiendelen ble ikke opprettet, prøv igjen :(',
         'success' 		=> 'Eiendelen ble opprettet :)',
         'success_linked' => 'Eiendelen med taggen :tag ble opprettet. <strong><a href=":link" style="color: white;">Klikk her for å vise</a></strong>.',
+        'multi_success_linked' => 'Asset with tag :links was created successfully.|:count assets were created succesfully. :links.',
+        'partial_failure' => 'An asset was unable to be created. Reason: :failures|:count assets were unable to be created. Reasons: :failures',
     ],
 
     'update' => [
@@ -52,20 +56,24 @@ return [
     ],
 
     'import' => [
+        'import_button'         => 'Process Import',
         'error'                 => 'Noen elementer ble ikke importert riktig.',
         'errorDetail'           => 'Følgende elementer ble ikke importert på grunn av feil.',
         'success'               => 'Filen har blitt importert',
         'file_delete_success'   => 'Filen har blitt slettet',
         'file_delete_error'      => 'Filen kunne ikke bli slettet',
         'file_missing' => 'Valgt fil mangler (fant ikke filen)',
+        'file_already_deleted' => 'The file selected was already deleted',
         'header_row_has_malformed_characters' => 'En eller flere attributter i overskriftsraden inneholder feilformede UTF-8 tegn',
         'content_row_has_malformed_characters' => 'En eller flere attributter i første rad i inneholdet inneholder feilformet UTF-8 tegn',
+        'transliterate_failure' => 'Transliteration from :encoding to UTF-8 failed due to invalid characters in input'
     ],
 
 
     'delete' => [
         'confirm'   	=> 'Er du sikker på at du vil slette eiendelen?',
         'error'   		=> 'Det oppstod et problem under sletting av eiendel. Vennligst prøv igjen.',
+        'assigned_to_error' => '{1}Asset Tag: :asset_tag is currently checked out. Check in this device before deletion.|[2,*]Asset Tags: :asset_tag are currently checked out. Check in these devices before deletion.',
         'nothing_updated'   => 'Ingen assets ble valgt, så ingenting ble slettet.',
         'success' 		=> 'Vellykket sletting av eiendel.',
     ],
@@ -78,6 +86,11 @@ return [
         'no_assets_selected' => 'Du må velge minst én enhet fra listen',
     ],
 
+    'multi-checkout' => [
+        'error'   => 'Asset was not checked out, please try again|Assets were not checked out, please try again',
+        'success' => 'Asset checked out successfully.|Assets checked out successfully.',
+    ],
+
     'checkin' => [
         'error'   		=> 'Eiendel ble ikke sjekket inn. Prøv igjen',
         'success' 		=> 'Vellykket innsjekk av eiendel.',
@@ -87,9 +100,10 @@ return [
     ],
 
     'requests' => [
-        'error'   		=> 'Eiendelen ble ikke forespurt, prøv igjen',
-        'success' 		=> 'Eiendel ble forespurt.',
-        'canceled'      => 'Utsjekkingsforespørselen ble kansellert',
+        'error'   		=> 'Request was not successful, please try again.',
+        'success' 		=> 'Request successfully submitted.',
+        'canceled'      => 'Request successfully canceled.',
+        'cancel'        => 'Avbryt forespørsel om element',
     ],
 
 ];
diff --git a/resources/lang/no-NO/admin/hardware/table.php b/resources/lang/no-NO/admin/hardware/table.php
index 5f39219f8a..38b67932af 100644
--- a/resources/lang/no-NO/admin/hardware/table.php
+++ b/resources/lang/no-NO/admin/hardware/table.php
@@ -25,7 +25,6 @@ return [
     'image'		    => 'Enhet bilde',
     'days_without_acceptance' => 'Dager uten aksept',
     'monthly_depreciation' => 'Månedlig avskrivning',
-    'assigned_to'    => 'Tilordnet til',
     'requesting_user' => 'Forespurt av',
     'requested_date' => 'Dato forespurt',
     'changed'       => 'Endret',
diff --git a/resources/lang/no-NO/admin/kits/general.php b/resources/lang/no-NO/admin/kits/general.php
index d877aefa1f..9f157e0449 100644
--- a/resources/lang/no-NO/admin/kits/general.php
+++ b/resources/lang/no-NO/admin/kits/general.php
@@ -47,4 +47,5 @@ return [
     'kit_deleted'                       => 'Settet har blitt slettet',
     'kit_model_updated'                 => 'Modellen ble oppdatert',
     'kit_model_detached'                => 'Modellen har blitt frakoblet',
+    'model_already_attached'            => 'Model already attached to kit',
 ];
diff --git a/resources/lang/no-NO/admin/licenses/general.php b/resources/lang/no-NO/admin/licenses/general.php
index 17914c383c..21df57a62a 100644
--- a/resources/lang/no-NO/admin/licenses/general.php
+++ b/resources/lang/no-NO/admin/licenses/general.php
@@ -14,6 +14,7 @@ return array(
     'info'  					=> 'Lisensinformasjon',
     'license_seats'  			=> 'Setelisenser',
     'seat'  					=> 'Setelisens',
+    'seat_count'  				=> 'Seat :count',
     'seats'  					=> 'Setelisenser',
     'software_licenses'  		=> 'Programvarelisenser',
     'user'  					=> 'Bruker',
@@ -23,12 +24,12 @@ return array(
         [
             'checkin_all'           => [
                 'button'            => 'Sjekk inn alle seter',
-                'modal'             => 'Dette vil handling innhente ett sete. Denne handlingen vil sjekke inn alle :checkedout_seats_count seter for denne lisensen.',
+                'modal'             => 'This action will checkin one seat. | This action will checkin all :checkedout_seats_count seats for this license.',
                 'enabled_tooltip'   => 'Sjekk inn ALLE seter for denne lisensen fra både brukere og ressurser',
                 'disabled_tooltip'  => 'Dette er deaktivert fordi det ikke er seter som er sjekket ut',
                 'disabled_tooltip_reassignable'  => 'Dette er deaktivert fordi lisensen ikke kan refordeles',
                 'success'           => 'Lisensen ble sjekket inn! | Alle lisensene ble vellykket sjekket inn!',
-                'log_msg'           => 'Sjekket inn via masselisensutsjekking i lisens GUI',
+                'log_msg'           => 'Checked in via bulk license checkin in license GUI',
             ],
 
             'checkout_all'              => [
diff --git a/resources/lang/no-NO/admin/licenses/message.php b/resources/lang/no-NO/admin/licenses/message.php
index c00c3e2c3b..d788f77a2a 100644
--- a/resources/lang/no-NO/admin/licenses/message.php
+++ b/resources/lang/no-NO/admin/licenses/message.php
@@ -44,10 +44,13 @@ return array(
         'error'   => 'Det oppstod et problem under utsjekk av lisens. Vennligst prøv igjen.',
         'success' => 'Vellykket utsjekk av lisens',
         'not_enough_seats' => 'Ikke nok lisensseter tilgjengelige for utsjekking',
+        'mismatch' => 'The license seat provided does not match the license',
+        'unavailable' => 'This seat is not available for checkout.',
     ),
 
     'checkin' => array(
         'error'   => 'Det oppstod et problem under innsjekk av lisens. Vennligst prøv igjen.',
+        'not_reassignable' => 'License not reassignable',
         'success' => 'Vellykket innsjekk av lisens'
     ),
 
diff --git a/resources/lang/no-NO/admin/locations/message.php b/resources/lang/no-NO/admin/locations/message.php
index 1f5840ba43..62c2156916 100644
--- a/resources/lang/no-NO/admin/locations/message.php
+++ b/resources/lang/no-NO/admin/locations/message.php
@@ -3,11 +3,12 @@
 return array(
 
     'does_not_exist' => 'Lokasjon eksisterer ikke.',
-    'assoc_users'    => 'This location is not currently deletable because it is the location of record for at least one asset or user, has assets assigned to it, or is the parent location of another location. Please update your models to no longer reference this company and try again. ',
+    'assoc_users'    => 'This location is not currently deletable because it is the location of record for at least one asset or user, has assets assigned to it, or is the parent location of another location. Please update your records to no longer reference this location and try again ',
     'assoc_assets'	 => 'Lokasjonen er tilknyttet minst en eiendel og kan ikke slettes. Oppdater dine eiendeler slik at de ikke refererer til denne lokasjonen, og prøv igjen. ',
     'assoc_child_loc'	 => 'Lokasjonen er overordnet til minst en underlokasjon og kan ikke slettes. Oppdater din lokasjoner til å ikke referere til denne lokasjonen, og prøv igjen. ',
     'assigned_assets' => 'Tildelte ressurser',
     'current_location' => 'Gjeldende plassering',
+    'open_map' => 'Open in :map_provider_icon Maps',
 
 
     'create' => array(
@@ -20,6 +21,11 @@ return array(
         'success' => 'Vellykket oppdatering av plassering.'
     ),
 
+    'restore' => array(
+        'error'   => 'Location was not restored, please try again',
+        'success' => 'Location restored successfully.'
+    ),
+
     'delete' => array(
         'confirm'   	=> 'Er du sikker på at du vil slette denne plasseringen?',
         'error'   => 'Det oppstod et problem under sletting av plassering. Vennligst prøv igjen.',
diff --git a/resources/lang/no-NO/admin/locations/table.php b/resources/lang/no-NO/admin/locations/table.php
index e27419c4b4..767d3fea4c 100644
--- a/resources/lang/no-NO/admin/locations/table.php
+++ b/resources/lang/no-NO/admin/locations/table.php
@@ -39,4 +39,5 @@ return [
     'signed_by_finance_auditor' => 'Undertegnet av (finansrevisor):',
     'signed_by_location_manager' => 'Signert av (Stedsansvarlig):',
     'signed_by'                 => 'Signert av:',
+    'clone'  					=> 'Clone Location',
 ];
diff --git a/resources/lang/no-NO/admin/models/general.php b/resources/lang/no-NO/admin/models/general.php
index 2b10c316da..4a1b51f4f7 100644
--- a/resources/lang/no-NO/admin/models/general.php
+++ b/resources/lang/no-NO/admin/models/general.php
@@ -3,7 +3,7 @@
 return array(
     'about_models_title'     => 'Om asset modeller',
     'about_models_text'           => 'Asset modeller er en måte å gruppere identiske eiendeler. "MBP 2013", "IPhone 6s", etc.',
-    'deleted'  					        => 'Denne modellen har blitt slettet.',
+    'deleted'  					=> 'Denne modellen har blitt slettet.',
     'bulk_delete'               => 'Bulk slett modeller',
     'bulk_delete_help'               => 'Bruk merkeboksene nedenfor til å bekrefte sletting av de merkede modellene. Modeller som har eiendeler tilknyttet kan ikke slettes før eiendelene har blitt tilknyttet en annen modell.',
     'bulk_delete_warn'          => 'Du er i ferd med å slette en ressursmodell. | Du er i ferd med å slette :model_count modeller.',
diff --git a/resources/lang/no-NO/admin/models/message.php b/resources/lang/no-NO/admin/models/message.php
index 099d18d94c..002a35bffa 100644
--- a/resources/lang/no-NO/admin/models/message.php
+++ b/resources/lang/no-NO/admin/models/message.php
@@ -7,7 +7,7 @@ return array(
     'no_association' => 'ADVARSEL! Ressursmodellen for dette elementet er ugyldig eller mangler!',
     'no_association_fix' => 'Dette vil ødelegge ting på merkelige og forferdelige måte. Rediger denne ressursen nå for å tildele den en modell.',
     'assoc_users'	 => 'Denne modellen er tilknyttet en eller flere eiendeler og kan ikke slettes. Slett eiendelene, og prøv å slette modellen igjen. ',
-
+    'invalid_category_type' => 'This category must be an asset category.',
 
     'create' => array(
         'error'   => 'Modellen ble ikke opprettet. Prøv igjen.',
diff --git a/resources/lang/no-NO/admin/reports/general.php b/resources/lang/no-NO/admin/reports/general.php
index 74ab74aacb..17da068dba 100644
--- a/resources/lang/no-NO/admin/reports/general.php
+++ b/resources/lang/no-NO/admin/reports/general.php
@@ -4,6 +4,7 @@ return [
     'info'   => 'Velg de alternativene du ønsker skal inngå i rapporten.',
     'deleted_user' => 'Slettet bruker',
     'send_reminder' => 'Send påminnelse',
+    'cannot_send_reminder' => 'User has been deleted or does not have an email address so cannot receive a reminder',
     'reminder_sent' => 'Påminnelse sendt',
     'acceptance_deleted' => 'Aksepteringsforespørsel slettet',
     'acceptance_request' => 'Akseptanseforespørsel',
@@ -13,5 +14,10 @@ return [
         'user_state' => 'Bruker tilstand',
         'user_country' => 'Bruker Land',
         'user_zip' => 'Brukers postnummer'
-    ]
-];
\ No newline at end of file
+    ],
+    'open_saved_template' => 'Open Saved Template',
+    'save_template' =>  'Save Template',
+    'select_a_template' => 'Select a Template',
+    'template_name' => 'Template Name',
+    'update_template' => 'Update Template',
+];
diff --git a/resources/lang/no-NO/admin/reports/message.php b/resources/lang/no-NO/admin/reports/message.php
index be9181f1ef..2800bbdf0b 100644
--- a/resources/lang/no-NO/admin/reports/message.php
+++ b/resources/lang/no-NO/admin/reports/message.php
@@ -1,5 +1,16 @@
 <?php
 
-return array(
-    'error'   => 'Du må velge minst ETT alternativ.'
-);
+return [
+    'about_templates' => 'About Saved Templates',
+    'saving_templates_description' => 'Select your options, then enter the name of your template in the box above and click the \'Save Template\' button. Use the dropdown to select a previously saved template.',
+    'create'  => [
+        'success' => 'Template saved successfully',
+    ],
+    'update' => [
+        'success' => 'Template updated successfully',
+    ],
+    'delete' => [
+        'success' => 'Template deleted',
+        'no_delete_permission' => 'Template does not exist or you do not have permission to delete it.',
+    ],
+];
diff --git a/resources/lang/no-NO/admin/settings/general.php b/resources/lang/no-NO/admin/settings/general.php
index 87a78de968..76fd67976c 100644
--- a/resources/lang/no-NO/admin/settings/general.php
+++ b/resources/lang/no-NO/admin/settings/general.php
@@ -8,13 +8,13 @@ return [
     'ad_append_domain'          => 'Legg til domenenavn i feltet for brukernavn',
     'ad_append_domain_help'     => 'Bruker kreves ikke å skrive "brukernavn@domene.local", de kan bare skrive "brukernavn".',
     'admin_cc_email'            => 'CC e-post',
-    'admin_cc_email_help'       => 'Hvis du vil sende en kopi av innsjekk-/utsjekkeposter som sendes til brukere til en ekstra epostadresse, skriv den inn her. La ellers feltet stå tomt.',
+    'admin_cc_email_help'       => 'Send a copy of checkin/checkout emails to this address.',
     'admin_settings'            => 'Admin innstillinger',
     'is_ad'				        => 'Dette er en Active Directory server',
     'alerts'                	=> 'Varsler',
     'alert_title'               => 'Oppdater varslingsinnstillinger',
     'alert_email'				=> 'Send varslinger til',
-    'alert_email_help'    => 'E-postadresser eller distribusjonslister som du ønsker varsler skal sendes til, kommaseparert',
+    'alert_email_help'          => 'E-postadresser eller distribusjonslister som du ønsker varsler skal sendes til, kommaseparert.',
     'alerts_enabled'			=> 'Varslinger aktivert',
     'alert_interval'			=> 'Terskel for utløpende varslinger (dager)',
     'alert_inv_threshold'		=> 'Terskel for eiendelsvarslinger',
@@ -31,15 +31,18 @@ return [
     'backups'					=> 'Sikkerhetskopier',
     'backups_help'              => 'Opprette, laste ned og gjenopprette sikkerhetskopier ',
     'backups_restoring'         => 'Gjenoppretting fra sikkerhetskopi',
+    'backups_clean' => 'Clean the backed-up database before restore',
+    'backups_clean_helptext' => "This can be useful if you're changing between database versions",
     'backups_upload'            => 'Last opp sikkerhetskopi',
     'backups_path'              => 'Sikkerhetskopier på tjeneren lagres i <code>:path</code>',
-    'backups_restore_warning'   => 'Bruk gjenopprettingsknappen <small><span class="btn btn-xs btn-warning"><i class="text-white fas fa-retweet" aria-hidden="true"></i></span></small> for å gjenopprette fra en tidligere sikkerhetskopi. (Dette fungerer ikke med S3-fillagring eller Docker.)<br><br>Din <strong>hele :app_name databasen og eventuelle opplastede filer vil bli fullstendig erstattet</strong> av det som er i sikkerhetskopifilen.  ',
+    'backups_restore_warning'   => 'Use the restore button <small><span class="btn btn-xs btn-warning"><i class="text-white fas fa-retweet" aria-hidden="true"></i></span></small> to restore from a previous backup. (This does not currently work with S3 file storage or Docker.)<br><br>Your <strong>entire :app_name database and any uploaded files will be completely replaced</strong> by what\'s in the backup file  ',
     'backups_logged_out'         => 'Alle eksisterende brukere, inkludert deg, vil bli logget ut når din gjenoppretting er fullført.',
     'backups_large'             => 'Veldig store sikkerhetskopier kan få tidsavbrudd under gjenopprettingsforsøket og må fortsatt kjøres via kommandolinjen. ',
     'barcode_settings'			=> 'Strekkodeinnstillinger',
     'confirm_purge'			    => 'Bekreft rensking',
     'confirm_purge_help'		=> 'Skriv "DELETE" i boksen under for å fjerne dine slettende data. Denne handlingen kan ikke angres og vil PERMANENT slette alle slettede elementer og brukere. (Du bør først gjøre en sikkerhetskopi, bare for å være trygg.)',
     'custom_css'				=> 'Egendefinert CSS',
+    'custom_css_placeholder'	=> 'Add your custom CSS',
     'custom_css_help'			=> 'Legg til egendefinert CSS. Ikke ta med taggene &lt;style&gt;&lt;/style&gt;.',
     'custom_forgot_pass_url'	=> 'Egendefinert passord tilbakestillings-URL',
     'custom_forgot_pass_url_help'	=> 'Erstatter den innebygde glemt passord-URLen i innloggingsbildet. Nyttig for å sende brukere til intern eller leid LDAP passordgjenopprettingsfunksjonalitet. Vil deaktivere den lokale glemt passord-funksjonaliteten.',
@@ -47,35 +50,35 @@ return [
     'dashboard_message_help'	=> 'Denne teksten vises på dashbordet for alle som har tillatelse til å vise oversikten.',
     'default_currency'  		=> 'Standardvaluta',
     'default_eula_text'			=> 'Standard EULA',
+    'default_eula_text_placeholder' => 'Add your default EULA text',
     'default_language'			=> 'Standardspråk',
     'default_eula_help_text'	=> 'Du kan også knytte tilpassede EULAer til bestemte eiendelskategorier.',
     'acceptance_note'           => 'Add a note for your decision (Optional)',
     'display_asset_name'        => 'Vis eiendelsnavn',
     'display_checkout_date'     => 'Vis utsjekksdato',
     'display_eol'               => 'Vis levetid i tabellvisning',
-    'display_qr'                => 'Vis Qr-kode',
+    'display_qr'                => 'Display 2D barcode',
     'display_alt_barcode'		=> 'Vis 1D strekkode',
-    'email_logo'                => 'E-postlogo',
     'barcode_type'				=> '2D strekkodetype',
     'alt_barcode_type'			=> '1D strekkodetype',
-    'email_logo_size'       => 'Kvadratiske logoer ser best ut i e-post. ',
     'enabled'                   => 'Slått på',
     'eula_settings'				=> 'EULA-innstillinger',
     'eula_markdown'				=> 'Denne EULAen tillater <a href="https://help.github.com/articles/github-flavored-markdown/">Github Flavored markdown</a>.',
+    'empty_row_count'           => 'Field Start Offset (Empty Rows)',
+    'empty_row_count_help'      => 'Fields will begin populating after this many empty rows are skipped at the top of the label.',
     'favicon'                   => 'Favicon',
     'favicon_format'            => 'Aksepterte filtyper er ico, png og gif. Andre bildeformater vil muligens ikke fungere i alle nettlesere.',
     'favicon_size'          => 'Favoritt-symboler bør være kvadratiske, 16x16 punkter.',
     'footer_text'               => 'Ekstra bunnteksttekst ',
     'footer_text_help'          => 'Denne teksten vil fremstå i høyre del av bunnteksten. Lenker er tillatt ved å bruke <a href="https://help.github.com/articles/github-flavored-markdown/">Github flavored markdown</a>.
 Linjeskift, topptekst, bilder, osv. kan føre til uventede resultater.',
+    'footer_text_placeholder'   => 'Optional footer text',
     'general_settings'			=> 'Generelle innstillinger',
-    'general_settings_keywords' => 'bedriftens støtte, signatur, e-postformat, brukerformat, bilder, per side, miniatyrbilde, eula, graviter, forelder, dashbord, personvern',
     'general_settings_help'     => 'Standard EULA og mer',
     'generate_backup'			=> 'Generer Sikkerhetskopi',
     'google_workspaces'         => 'Google arbeidsområder',
     'header_color'              => 'Overskriftsfarge',
     'info'                      => 'Disse innstillingene lar deg tilpasse enkelte aspekter av installasjonen din.',
-    'label_logo'                => 'Etikett-logo',
     'label_logo_size'           => 'Kvadratisk logo vil se best ut. Den vil vises øverst til høyre på hver merkelapp. ',
     'laravel'                   => 'Laravel-versjon',
     'ldap'                      => 'LDAP',
@@ -95,7 +98,7 @@ Linjeskift, topptekst, bilder, osv. kan føre til uventede resultater.',
     'ldap_login_sync_help'      => 'Tester at LDAP kan synkronisere. Feil i LDAP autentiseringsspørringen din kan før til at brukere ikke kan logge inn. DU MÅ LAGRE DINE OPPDATERTE LDAP-INNSTILLINGER FØRST.',
     'ldap_manager'              => 'LDAP Administrator',
     'ldap_server'               => 'LDAP Server',
-    'ldap_server_help'          => 'Dette bør starte med ldap:// (for ukryptert eller TLS) eller ldaps:// (for SSL)',
+    'ldap_server_help'          => 'This should start with ldap:// (for unencrypted) or ldaps:// (for TLS or SSL)',
     'ldap_server_cert'			=> 'Validering av LDAP SSL sertifikat',
     'ldap_server_cert_ignore'	=> 'Godta ugyldig SSL sertifikat',
     'ldap_server_cert_help'		=> 'Kryss av denne boksen hvis du bruker et selv-signert SSL sertifikat og vil akkseptere et ugyldig sertifikat.',
@@ -109,8 +112,8 @@ Linjeskift, topptekst, bilder, osv. kan føre til uventede resultater.',
     'ldap_pword'                => 'LDAP Bind passord',
     'ldap_basedn'               => 'Base Bind DN',
     'ldap_filter'               => 'LDAP Filter',
-    'ldap_pw_sync'              => 'LDAP-passord Sync',
-    'ldap_pw_sync_help'         => 'Ta bort kryss på denne boksen hvis du ikke vil at LDAP passord skal holdes synkronisert med lokale passord. Ved å skru av dette er det mulig at brukerne ikke vil klare å logge på om de ikke får tak i LDAP serveren.',
+    'ldap_pw_sync'              => 'Cache LDAP Passwords',
+    'ldap_pw_sync_help'         => 'Uncheck this box if you do not wish to keep LDAP passwords cached as local hashed passwords. Disabling this means that your users may not be able to login if your LDAP server is unreachable for some reason.',
     'ldap_username_field'       => 'Brukernavn Felt',
     'ldap_lname_field'          => 'Etternavn',
     'ldap_fname_field'          => 'LDAP Fornavn',
@@ -118,13 +121,15 @@ Linjeskift, topptekst, bilder, osv. kan føre til uventede resultater.',
     'ldap_version'              => 'LDAP Versjon',
     'ldap_active_flag'          => 'LDAP aktive flag',
     'ldap_activated_flag_help'  => 'Denne verdien brukes til å bestemme om en synkronisert bruker kan logge inn på Snipe-IT. <strong>Det påvirker ikke muligheten til å sjekke elementer inn eller ut til dem</strong>, og bør være <strong>egenskapsnavn</strong> i din AD/LDAP, <strong>ikke verdien</strong>. <br><br>Hvis dette feltet er satt til et feltnavn som ikke eksisterer i AD/LDAP, eller verdien i AD/LDAP feltet er satt til <code>0</code> eller <code>usann</code>, <strong>vil bruker pålogging bli deaktivert</strong>. Hvis verdien i AD/LDAP feltet er satt til <code>1</code> eller <code>sann</code> eller <em>annen tekst</em> betyr at brukeren kan logge inn. Når feltet er tomt i din AD, respekterer vi <code>-brukerAccountControl</code> attributt, som vanligvis tillater ikke-suspenderte brukere å logge inn.',
+    'ldap_invert_active_flag'   => 'LDAP Invert Active Flag',
+    'ldap_invert_active_flag_help'     => 'If enabled: when the value returned by LDAP Active Flag is <code>0</code> or <code>false</code> the user account will be active.',
     'ldap_emp_num'              => 'LDAP ansattnummer',
     'ldap_email'                => 'LDAP E-post',
     'ldap_test'                 => 'Test LDAP',
     'ldap_test_sync'            => 'Test LDAP-synkronisering',
     'license'                   => 'Programvarelisens',
-    'load_remote'               => 'Bruk Gravatar',
-    'load_remote_help_text'		=> 'Fjern avhuking på denne boksen hvis din installasjon ikke kan laste skript fra utenfor Internett. Dette forhindrer Snipe-IT at man prøver å laste bilder fra Gravatar.',
+    'load_remote'               => 'Load Remote Avatars',
+    'load_remote_help_text'		=> 'Uncheck this box if your install cannot load scripts from the outside internet. This will prevent Snipe-IT from trying load avatars from Gravatar or other outside sources.',
     'login'                     => 'Innloggingsforsøk',
     'login_attempt'             => 'Innloggingsforsøk',
     'login_ip'                  => 'IP-addresse',
@@ -132,6 +137,7 @@ Linjeskift, topptekst, bilder, osv. kan føre til uventede resultater.',
     'login_user_agent'          => 'Brukeragent',
     'login_help'                => 'Liste over forsøkte pålogginger',
     'login_note'                => 'Logg inn melding',
+    'login_note_placeholder'            => "If you do not have a login or have found a device belonging to this company, please call technical support at 888-555-1212. Thank you.",
     'login_note_help'           => 'Eventuelt inkludere et par setninger på logg inn skjermen, for eksempel for å hjelpe mennesker som har funnet en mistet eller stjålet enhet. Dette feltet godtar <a href="https://help.github.com/articles/github-flavored-markdown/"> Github flavored markdown</a>',
     'login_remote_user_text'    => 'Fjernbruker pålogging valg',
     'login_remote_user_enabled_text' => 'Aktiver innlogging med Remote User Header',
@@ -147,13 +153,16 @@ Linjeskift, topptekst, bilder, osv. kan føre til uventede resultater.',
     'logo_print_assets_help'    => 'Bruk branding på utskrivbare eiendelslister ',
     'full_multiple_companies_support_help_text' => 'Vis kun eiendeler til bedriften brukere (inkl administratorer) er knyttet til.',
     'full_multiple_companies_support_text' => 'Full støtte for flere bedrifter',
+    'scope_locations_fmcs_support_text'  => 'Scope Locations with Full Multiple Companies Support',
+    'scope_locations_fmcs_support_help_text'  => 'Restrict locations to their selected company.',
+    'scope_locations_fmcs_check_button' => 'Check Compatibility',
+    'scope_locations_fmcs_support_disabled_text'  => 'This option is disabled because you have conflicting locations set for :count or more items.',
     'show_in_model_list'   => 'Vis i Model nedtrekksmeny',
     'optional'					=> 'valgfri',
     'per_page'                  => 'Resultater pr side',
     'php'                       => 'PHP-versjon',
-    'php_info'                  => 'PHP-info',
+    'php_info'                  => 'PHP info',
     'php_overview'              => 'PHP',
-    'php_overview_keywords'     => 'phpinfo, system, info',
     'php_overview_help'         => 'PHP systeminfo',
     'php_gd_info'               => 'Du må installere php-gd for å vise QR-koder. Se installasjonsinstruksjoner.',
     'php_gd_warning'            => 'PHP bildebehandling og GD-plugin er IKKE installert.',
@@ -219,6 +228,8 @@ Linjeskift, topptekst, bilder, osv. kan føre til uventede resultater.',
     'webhook_integration_help'    => ':app-integrasjon er valgfritt, men endepunktet og kanalen er påkrevd hvis du ønsker å bruke den. For å konfigurere :app integrering, må du først <a href=":webhook_link" target="_new" rel="noopener">lage en innkommende webhook</a> på din :app konto. Klikk på knappen <strong>Test :app Integrasjon</strong> for å bekrefte at innstillingene er korrekte før du lagrer. ',
     'webhook_integration_help_button'    => 'Du vil se en testknapp etter at du har lagret din :app informasjon.',
     'webhook_test_help'           => 'Test om din :app integrasjon er riktig konfigurert. DU MÅ LAGRE DINE OPPDATERTE :app INNSTILLINGER FØRST.',
+    'shortcuts_enabled'         => 'Enable Shortcuts',
+    'shortcuts_help_text'       => '<strong>Windows</strong>: Alt + Access key, <strong>Mac</strong>: Control + Option + Access key',
     'snipe_version'  			=> 'Snipe-IT-versjon',
     'support_footer'            => 'Støtte Footer Lenker ',
     'support_footer_help'       => 'Angi hvem som kan se lenker til Snipe-IT supportinformasjon og brukermanual',
@@ -228,7 +239,6 @@ Linjeskift, topptekst, bilder, osv. kan føre til uventede resultater.',
     'update'                    => 'Oppdater innstillinger',
     'value'                     => 'Verdi',
     'brand'                     => 'Merkevare',
-    'brand_keywords'            => 'footer, logo, print, theme, skin, header, colors, color, css',
     'brand_help'                => 'Logo, nettstedsnavn',
     'web_brand'                 => 'Velg branding-type',
     'about_settings_title'      => 'Om Innstillinger',
@@ -277,6 +287,8 @@ Linjeskift, topptekst, bilder, osv. kan føre til uventede resultater.',
     'two_factor_enrollment_text'	=> "To-faktor autentisering er påkrevd, men enheten din har ikke blitt aktivert for dette enda. Åpne Google Authenticator-appen og scan inn QR-koden nedenfor for å aktivere. Når du har aktivert enheten din, skriv inn koden nedenfor",
     'require_accept_signature'      => 'Kreve signatur',
     'require_accept_signature_help_text'      => 'Aktivering av denne funksjonen ville forlange brukernes å fysisk logge ut for å akseptere en eiendel.',
+    'require_checkinout_notes'  => 'Require Notes on Checkin/Checkout',
+    'require_checkinout_notes_help_text'    => 'Enabling this feature will require the note fields to be populated when checking in or checking out an asset.',
     'left'        => 'venstre',
     'right'        => 'høyre',
     'top'        => 'topp',
@@ -314,24 +326,24 @@ Linjeskift, topptekst, bilder, osv. kan føre til uventede resultater.',
     'filter_by_keyword' => 'Filtrer ved å sette nøkkelord',
     'security' => 'Sikkerhet',
     'security_title' => 'Oppdater sikkerhetsinnstillinger',
-    'security_keywords' => 'password, passwords, requirements, two factor, two-factor, common passwords, remote login, logout, authentication',
     'security_help' => 'Tofaktor, passordbegrensinger',
-    'groups_keywords' => 'permissions, permission groups, authorization',
     'groups_help' => 'Tillatelsesgrupper',
     'localization' => 'Oversettelser',
     'localization_title' => 'Oppdater språkinnstillinger',
-    'localization_keywords' => 'localization, currency, local, locale, time zone, timezone, international, internatinalization, language, languages, translation',
     'localization_help' => 'Språk, datoformat',
     'notifications' => 'Varslinger',
     'notifications_help' => 'E-post varsler og revisjonsinnstillinger',
     'asset_tags_help' => 'Økninger og prefikser',
     'labels' => 'Etiketter',
     'labels_title' => 'Oppdater etikettinnstillinger',
-    'labels_help' => 'Etikettstørrelse &amp; innstillinger',
-    'purge_keywords' => 'slett permanent',
+    'labels_help' => 'Barcodes &amp; label settings',
     'purge_help' => 'Tømme slettede poster',
     'ldap_extension_warning' => 'Det ser ikke ut som LDAP-utvidelsen er installert eller aktivert på denne serveren. Du kan fortsatt lagre innstillingene, men du må installere og aktivere LDAP-tillegget til PHP før LDAP-synkronisering eller innlogging virker.',
     'ldap_ad' => 'LDAP/AD',
+    'ldap_test_label' => 'Test LDAP Sync',
+    'ldap_test_login' => ' Test LDAP Login',
+    'ldap_username_placeholder' => 'LDAP Username',
+    'ldap_password_placeholder' => 'LDAP Password',
     'employee_number' => 'Ansattnummer',
     'create_admin_user' => 'Opprett en bruker ::',
     'create_admin_success' => 'Suksess! Din adminbruker har blitt lagt til!',
@@ -343,6 +355,8 @@ Linjeskift, topptekst, bilder, osv. kan føre til uventede resultater.',
     'setup_migration_create_user' => 'Neste: Opprett bruker',
     'ldap_settings_link' => 'Side for LDAP-innstillinger',
     'slack_test' => 'Test <i class="fab fa-slack"></i> Integrasjon',
+    'status_label_name' => 'Status Label Name',
+    'super_admin_only'  => 'Super Admin Only',
     'label2_enable'           => 'Ny etikett generator',
     'label2_enable_help'      => 'Bytt til den nye etikette generatoren. <b>Merk: Du må lagre denne innstillingen før du setter andre.</b>',
     'label2_template'         => 'Mal',
@@ -357,12 +371,15 @@ Linjeskift, topptekst, bilder, osv. kan føre til uventede resultater.',
     'label2_2d_type'          => '2D strekkodetype',
     'label2_2d_type_help'     => 'Format for 2D strekkoder',
     'label2_2d_target'        => '2D strekkodemål',
-    'label2_2d_target_help'   => 'URL-en 2D strekkoden peker til til når den blir skannet',
+    'label2_2d_target_help'   => 'The data that will be contained in the 2D barcode',
     'label2_fields'           => 'Feltdefinisjoner',
     'label2_fields_help'      => 'Feltene kan legges til, fjernes, og sorteres i venstre kolonne. For hvert felt kan flere alternativer for etikett og datakilde legges til, fjernes, og sorteres på nytt i høyre kolonne.',
+    'purge_barcodes' => 'Purge Barcodes',
     'help_asterisk_bold'    => 'Teksten som skrives inn som <code>**text**</code> vil vises som fet',
     'help_blank_to_use'     => 'La stå tom for å bruke verdien fra <code>:setting_name</code>',
-    'help_default_will_use' => '<code>:default</code> vil bruke verdien fra <code>:setting_name</code>. <br>Vær oppmerksom på at verdien for strekkodene må oppfylle den respektive strekkodespesifikasjonen for å bli generert med hell. Vennligst se <a href="https://snipe-it.readme.io/docs/barcodes">dokumentasjonen<i class="fa fa-external-link"></i></a> for mer informasjon. ',
+    'help_default_will_use' => '<code>:default</code> will use the value from <code>:setting_name</code>. <br>Note that the value of the barcodes must comply with the respective barcode spec in order to be successfully generated. Please see <a href="https://snipe-it.readme.io/docs/barcodes">the documentation <i class="fa fa-external-link"></i></a> for more details. ',
+    'asset_id'              => 'Asset ID',
+    'data'               => 'Data',
     'default'               => 'Standard',
     'none'                  => 'Ingen',
     'google_callback_help' => 'Dette bør angis som callback-URL-en i Google OAuth app innstillingene i organisasjonen din&apos;s <strong><a href="https://console.cloud.google.com/" target="_blank">Google utvikler konsoll <i class="fa fa-external-link" aria-hidden="true"></i></a></strong>.',
@@ -374,7 +391,100 @@ Linjeskift, topptekst, bilder, osv. kan føre til uventede resultater.',
     'database_driver' => 'Databasedriver',
     'bs_table_storage' => 'Tabell Lagring',
     'timezone' => 'Tidssone',
+    'test_mail' => 'Test Mail',
     'profile_edit'          => 'Edit Profile',
     'profile_edit_help'          => 'Allow users to edit their own profiles.',
+    'default_avatar' => 'Custom Default Avatar',
+    'default_avatar_help' => 'This image will be displayed as a profile if a user does not have a profile photo.',
+    'restore_default_avatar' => 'Restore <a href=":default_avatar" data-toggle="lightbox" data-type="image">original system default avatar</a>',
+    'restore_default_avatar_help' => '',
+    'due_checkin_days' => 'Due For Checkin Warning',
+    'due_checkin_days_help' => 'How many days before the expected checkin of an asset should it be listed in the "Due for checkin" page?',
+    'no_groups' => 'No groups have been created yet. Visit <code>Admin Settings > Permission Groups</code> to add one.',
+    'text' => 'Text',
+
+    'username_formats' => [
+        'username_format'		=> 'Format brukernavn',
+        'firstname_lastname_format'	=> 'First Name Last Name (jane.smith)',
+        'first_name_format'	        => 'First Name (jane)',
+        'last_name_format'		=> 'Last Name (doe)',
+        'filastname_format'			=> 'First Initial Last Name (jsmith)',
+        'lastnamefirstinitial_format' =>  'Last Name First Initial (smithj)',
+        'firstname_lastname_underscore_format' => 'First Name Last Name (jane_smith)',
+        'firstinitial.lastname' => 'First Initial Last Name (j.smith)',
+        'lastname_firstinitial' => 'Last Name First Initial (smith_j)',
+        'lastname_dot_firstinitial_format' => 'Last Name First Initial (smith.j)',
+        'firstnamelastname'     => 'First Name Last Name (janesmith)',
+        'firstnamelastinitial'  => 'First Name Last Initial (janes)',
+        'lastnamefirstname'      => 'Last Name.First Name (smith.jane)',
+    ],
+
+    'email_formats' => [
+        'email_format'			=> 'E-postformat',
+        'firstname_lastname_format'	=> 'Fornavn Etternavn (oladunk@example.com)',
+        'first_name_format'		=> 'Fornavn (oladunk@example.com)',
+        'last_name_format'		=> 'Last Name (doe@example.com)',
+        'filastname_format'			=> 'Fornavn (kun initial) Etternavn (oladunk@example.com)',
+        'lastnamefirstinitial_format' =>  'Etternavn Initialer (oladunk@example.com)',
+        'firstname_lastname_underscore_format' => 'Fornavn Etternavn (oladunk@example.com)',
+        'firstinitial.lastname' => 'Fornavn Initialer Etternavn (j.smith@example.com)',
+        'lastname_firstinitial' => 'Etternavn Fornavn Initialer (smith_j@example.com)',
+        'lastname_dot_firstinitial_format' => 'Last Name First Initial (smith.j@example.com)',
+        'firstnamelastname'     => 'Fornavn Etternavn (oladunk@example.com)',
+        'firstnamelastinitial'  => 'Fornavn Etternavn Initialer (janes@example.com)',
+        'lastnamefirstname'      => 'Last Name.First Name (smith.jane@example.com)',
+    ],
+
+
+
+    'logo_labels' => [
+        'acceptance_pdf_logo'       => 'PDF Logo',
+        'email_logo'                => 'E-postlogo',
+        'label_logo'                => 'Etikett-logo',
+        'logo'                      => 'Site Logo',
+        'favicon'                   => 'Favicon',
+    ],
+
+    'logo_help' => [
+        'email_logo_size'       => 'Kvadratiske logoer ser best ut i e-post. ',
+    ],
+
+    'logo_option_types' => [
+        'text' => 'Text',
+        'logo' => 'Logo',
+        'logo_and_text' => 'Logo and Text',
+    ],
+
+
+    'legends' => [
+        'scoping' => 'Scoping',
+        'formats' => 'Default Formats',
+        'profiles' => 'User Profiles',
+        'eula' => 'EULA & Acceptance Preferences',
+        'misc_display' => 'Miscellaneous Display Options',
+        'email' => 'Email Preferences',
+        'checkin' => 'Checkin Preferences',
+        'dashboard' => 'Login & Dashboard Preferences',
+        'misc' => 'Miscellaneous',
+        'logos' => 'Logos & Display',
+        'colors' => 'Colors & Skins',
+        'footer' => 'Footer Preferences',
+        'security' => 'Security Preferences',
+        'general' => 'General',
+        'intervals' => 'Intervals & Thresholds',
+    ],
+
+
+    /* Keywords for settings overview help */
+    'keywords' => [
+        'brand'             => 'footer, logo, print, theme, skin, header, colors, color, css',
+        'general_settings'  => 'bedriftens støtte, signatur, e-postformat, brukerformat, bilder, per side, miniatyrbilde, eula, graviter, forelder, dashbord, personvern',
+        'groups'            => 'permissions, permission groups, authorization',
+        'labels'            => 'labels, barcodes, barcode, sheets, print, upc, qr, 1d, 2d',
+        'localization'      => 'localization, currency, local, locale, time zone, timezone, international, internatinalization, language, languages, translation',
+        'php_overview'      => 'phpinfo, system, info',
+        'purge'             => 'slett permanent',
+        'security'          => 'password, passwords, requirements, two factor, two-factor, common passwords, remote login, logout, authentication',
+    ],
 
 ];
diff --git a/resources/lang/no-NO/admin/settings/message.php b/resources/lang/no-NO/admin/settings/message.php
index 42d29371f2..5b47ee6bcb 100644
--- a/resources/lang/no-NO/admin/settings/message.php
+++ b/resources/lang/no-NO/admin/settings/message.php
@@ -14,6 +14,9 @@ return [
         'restore_warning'       => 'Ja, kjør gjenoppretting. Jeg forstår at dette vil overskive alle eksisterende data som er i databasen. Dette vil også logge ut alle eksisterende brukere (inkludert meg selv).',
         'restore_confirm'       => 'Er du sikker på at du vil gjenopprette databasen fra :filename?'
     ],
+    'restore' => [
+        'success'               => 'Your system backup has been restored. Please log in again.'
+    ],
     'purge' => [
         'error'     => 'Det oppstod en feil under fjerning. ',
         'validation_failed'     => 'Din fjerningsbekreftelse er feil. Vennligst skriv inn ordet "DELETE" i bekreftelsesboksen.',
@@ -33,6 +36,9 @@ return [
         'testing_authentication' => 'Tester LDAP-autentisering...',
         'authentication_success' => 'Brukeren ble autentisert mot LDAP!'
     ],
+    'labels' => [
+        'null_template' => 'Label template not found. Please select a template.',
+        ],
     'webhook' => [
         'sending' => 'Sender :app test melding...',
         'success' => 'Ditt :webhook_name integrasjon fungerer!',
@@ -42,5 +48,12 @@ return [
         'error' => 'Noe gikk galt. :app svarte med: :error_message',
         'error_redirect' => 'FEIL: 301/302 :endpoint returnerer en omaddressering. Av sikkerhetsgrunner følger vi ikke omadressering. Vennligst bruk det faktiske endepunktet.',
         'error_misc' => 'Noe gikk galt. :( ',
-    ]
+        'webhook_fail' => ' webhook notification failed: Check to make sure the URL is still valid.',
+        'webhook_channel_not_found' => ' webhook channel not found.',
+        'ms_teams_deprecation' => 'The selected Microsoft Teams webhook URL will be deprecated Dec 31st, 2025. Please use a workflow URL. Microsoft\'s documentation on creating a workflow can be found <a href="https://support.microsoft.com/en-us/office/create-incoming-webhooks-with-workflows-for-microsoft-teams-8ae491c7-0394-4861-ba59-055e33f75498" target="_blank"> here.</a>',
+    ],
+    'location_scoping' => [
+        'not_saved' => 'Your settings were not saved.',
+        'mismatch' => 'There is 1 item in the database that need your attention before you can enable location scoping.|There are :count items in the database that need your attention before you can enable location scoping.',
+    ],
 ];
diff --git a/resources/lang/no-NO/admin/statuslabels/table.php b/resources/lang/no-NO/admin/statuslabels/table.php
index d84409f884..f33797c07f 100644
--- a/resources/lang/no-NO/admin/statuslabels/table.php
+++ b/resources/lang/no-NO/admin/statuslabels/table.php
@@ -1,14 +1,14 @@
 <?php
 
 return array(
-    'about'      	=> 'Om statusmerker',
+    'about'      	=> 'About Status Types',
     'archived'      	=> 'Arkivert',
     'create'      	=> 'Opprett statusmerke',
     'color'      	=> 'Graf-farge',
     'default_label' => 'Standard Etikett',
     'default_label_help' => 'Dette brukes til å sikre at de mest brukte statusetikettene dine vises øverst i valgboksen når du oppretter/redigerer eiendeler.',
     'deployable'      	=> 'Utleverbar',
-    'info'      	=> 'Statusmerker brukes for å beskrive de forskjellige statusene dine eiendeler kan ha. De kan være under reparasjon, tapt/stjålet, osv. Du kan opprette nye statusmerker for utleverbare, under arbeid eller arkiverte eiendeler.',
+    'info'      	=> 'Status label types are used to describe the various states your assets could be in. They may be out for repair, lost/stolen, etc. You can create new status labels for your deployable, pending and archived assets according to your own workflow. For more information, <a href="https://snipe-it.readme.io/docs/overview#status-labels" target="_blank">see the documentation <i class="fa fa-external-link"></i></a>.',
     'name'      	=> 'Statusnavn',
     'pending'      	=> 'Under arbeid',
     'status_type'   => 'Statustype',
diff --git a/resources/lang/no-NO/admin/users/general.php b/resources/lang/no-NO/admin/users/general.php
index ffe4751d62..9c03e4b135 100644
--- a/resources/lang/no-NO/admin/users/general.php
+++ b/resources/lang/no-NO/admin/users/general.php
@@ -19,6 +19,8 @@ return [
     'print_assigned'    => 'Skriv ut alt tilordnet',
     'email_assigned'    => 'Epostliste for alle tilknyttede',
     'user_notified'     => 'Brukeren har blitt sendt en liste over elementer som er tildelt brukeren.',
+    'users_notified'    => 'The user has been emailed a list of their currently assigned items.|:count users have been emailed a list of their currently assigned items.',
+    'users_notified_warning' => ':count user has been emailed a list of their currently assigned items, however :no_email users did not have an email address so could not be emailed.|:count users have been emailed a list of their currently assigned items, however :no_email user(s) did not have an email address so could not be emailed.',
     'auto_assign_label' => 'Inkluder denne brukeren ved automatisk tildeling av kvalifiserte lisenser',
     'auto_assign_help'  => 'Hopp over brukeren i autotildeling av lisenser',
     'software_user'     => 'Programvare utsjekket til :name',
diff --git a/resources/lang/no-NO/admin/users/message.php b/resources/lang/no-NO/admin/users/message.php
index ece6cbec5e..4e1faa24d9 100644
--- a/resources/lang/no-NO/admin/users/message.php
+++ b/resources/lang/no-NO/admin/users/message.php
@@ -6,7 +6,7 @@ return array(
     'declined'                  => 'Du har avvist eiendelen.',
     'bulk_manager_warn'	        => 'Brukerne er oppdatert, men lederen ble ikke lagret fordi lederen du valgte også i brukerlisten for redigering og brukere kan ikke være sin egen leder. Velg brukerne igjen, unntatt lederen.',
     'user_exists'               => 'Bruker finnes allerede!',
-    'user_not_found'            => 'Brukeren finnes ikke.',
+    'user_not_found'            => 'User does not exist or you do not have permission view them.',
     'user_login_required'       => 'Login-feltet er påkrevd',
     'user_has_no_assets_assigned' => 'Ingen eiendeler er tilordnet brukeren for øyeblikket.',
     'user_password_required'    => 'Passord er påkrevd.',
@@ -53,6 +53,7 @@ return array(
         'ldap_could_not_search' => 'Kunne ikke utføre søk på LDAP-serveren. Sjekk LDAP-innstillingene i konfigurasjonsfilen. <br>Feil fra LDAP-server:',
         'ldap_could_not_get_entries' => 'Fikk ingen oppføringer fra LDAP-serveren. Sjekk LDAP-innstillingene i konfigurasjonsfilen. <br>Feil fra LDAP-server:',
         'password_ldap' => 'Passordet for denne kontoen administreres av LDAP/Active Directory. Kontakt IT-avdelingen for å endre passordet. ',
+        'multi_company_items_assigned' => 'This user has items assigned that belong to a different company. Please check them in or edit their company.'
     ),
 
     'deletefile' => array(
diff --git a/resources/lang/no-NO/admin/users/table.php b/resources/lang/no-NO/admin/users/table.php
index 993196129e..6374870aaa 100644
--- a/resources/lang/no-NO/admin/users/table.php
+++ b/resources/lang/no-NO/admin/users/table.php
@@ -22,7 +22,7 @@ return array(
     'managed_locations'     => 'Administrere plasseringer',
     'managed_users'         => 'Administrerte brukere',
     'name' 					=> 'Navn',
-    'nogroup'               => 'Ingen grupper er opprettet ennå. For å legge til en, besøk: ',
+    'nogroup'               => 'Ingen grupper er opprettet ennå. For å legge til en, besøk:',
     'notes'                 => 'Notater',
     'password_confirm' 		=> 'Bekreft passord',
     'password' 				=> 'Passord',
diff --git a/resources/lang/no-NO/auth.php b/resources/lang/no-NO/auth.php
index bfc2a2bd04..4a8095babe 100644
--- a/resources/lang/no-NO/auth.php
+++ b/resources/lang/no-NO/auth.php
@@ -15,6 +15,6 @@ return array(
 
     'failed' => 'Disse opplysningene samsvarer ikke med våre oppføringer.',
     'password' => 'Angitt passord er feil.',
-    'throttle' => 'For mange innloggingsforsøk. Prøv igjen om :seconds sekunder.',
+    'throttle' => 'Too many login attempts. Please try again in :minutes minute(s).',
 
 );
diff --git a/resources/lang/no-NO/auth/message.php b/resources/lang/no-NO/auth/message.php
index ba1ae4ec94..1327f5ec1d 100644
--- a/resources/lang/no-NO/auth/message.php
+++ b/resources/lang/no-NO/auth/message.php
@@ -6,8 +6,6 @@ return array(
     'account_not_found'      => 'Brukernavnet eller passordet er feil.',
     'account_not_activated'  => 'Denne brukerkontoen er ikke aktiv.',
     'account_suspended'      => 'Denne brukerkontoen er deaktivert.',
-    'account_banned'         => 'Denne brukerkontoen er forbudt.',
-    'throttle'               => 'For mange mislykkede påloggingsforsøk. Prøv igjen om :minutes minutter.',
 
     'two_factor' => array(
         'already_enrolled'      => 'Enheten din er allerede registrert.',
diff --git a/resources/lang/no-NO/button.php b/resources/lang/no-NO/button.php
index a29c19ca66..6a9e0b8665 100644
--- a/resources/lang/no-NO/button.php
+++ b/resources/lang/no-NO/button.php
@@ -7,6 +7,7 @@ return [
     'checkin_and_delete'  	    => 'Sjekk inn alle / slett bruker',
     'delete'  	                => 'Slett',
     'edit'    	                => 'Rediger',
+    'clone'    	                => 'Clone',
     'restore' 	                => 'Gjenopprett',
     'remove'                    => 'Fjern',
     'request'                   => 'Forespørsel',
@@ -21,4 +22,13 @@ return [
     'add_maintenance'           => 'Legg til vedlikehold',
     'append'                    => 'Legg til',
     'new'                       => 'Ny',
+    'var' => [
+        'clone'     => 'Clone :item_type',
+        'edit'      => 'Edit :item_type',
+        'delete'    => 'Delete :item_type',
+        'restore'   => 'Restore :item_type',
+        'create'    => 'Create New :item_type',
+        'checkout'  => 'Checkout :item_type',
+        'checkin'   => 'Checkin :item_type',
+    ]
 ];
diff --git a/resources/lang/no-NO/general.php b/resources/lang/no-NO/general.php
index 6e111a25dc..5b774aae71 100644
--- a/resources/lang/no-NO/general.php
+++ b/resources/lang/no-NO/general.php
@@ -10,7 +10,7 @@ return [
     'action'                => 'Handlinger',
     'activity_report'		=> 'Aktivitetsrapport',
     'address'				=> 'Adresse',
-    'admin'					=> 'Admin',
+    'admin'					=> 'Admin innstillinger',
     'admin_tooltip'			=> 'This user has admin privileges',
     'superuser'				=> 'Superuser',
     'superuser_tooltip'		=> 'This user has superuser privileges',
@@ -23,13 +23,16 @@ return [
     'asset_models'			=> 'Eiendelsmodeller',
     'asset_model'			=> 'Modell',
     'asset'					=> 'Eiendel',
+    'asset_previous'        => 'Asset (Previously Assigned)',
     'asset_report'          => 'Eiendelsrapport',
     'asset_tag'				=> 'Eiendelsmerke',
     'asset_tags'            => 'Eiendelsmerker',
     'assets_available'		=> 'Tilgjengelige eiendeler',
     'accept_assets'         => 'Godta Eiendelen :name',
     'accept_assets_menu'    => 'Godta eiendeler',
+    'accept_item'           => 'Accept Item',
     'audit'				    => 'Revisjon',
+    'audits'				=> 'Audits',
     'audit_report'			=> 'Overvåkingslogg',
     'assets'				=> 'Eiendeler',
     'assets_audited'        => 'reviderte ressurser',
@@ -61,9 +64,12 @@ return [
     'changepassword'  		=> 'Endre passord',
     'checkin'  				=> 'Sjekk inn',
     'checkin_from'  		=> 'Innsjekk fra',
+    'checkin_note'  		=> 'Checkin Note',
+    'checkout_note'  		=> 'Checkout Note',
     'checkout'  			=> 'Sjekk ut',
     'checkouts_count'       => 'Sjekk ut',
     'checkins_count'        => 'Sjekk inn',
+    'checkin_and_delete'  	=> 'Checkin and Delete',
     'user_requests_count'   => 'Forespørsler',
     'city'  				=> 'By',
     'click_here'			=> 'Klikk her',
@@ -77,7 +83,7 @@ return [
     'consumables'			=> 'Forbruksvarer',
     'country'  				=> 'Land',
     'could_not_restore'     => 'Feil ved gjenoppretting av :item_type: :error',
-    'not_deleted'           => ':item_type er ikke slettet og kan ikke gjenopprettes',
+    'not_deleted'           => 'The :item_type was not deleted and therefore cannot be restored',
     'create'				=> 'Opprett ny',
     'created'               => 'Enhet opprettet',
     'created_asset'			=> 'eiendel opprettet',
@@ -86,11 +92,13 @@ return [
     'record_created' 		=> 'Post opprettet',
     'updated_at' 			=> 'Oppdatert',
     'currency'  			=> '$', // this is deprecated
+    'currency_text'  		=> 'Valuta', //
     'current'  				=> 'Nåværende',
     'current_password'      => 'Gjeldende passord',
     'customize_report'      => 'Tilpass rapport',
     'custom_report'         => 'Tilpasset eiendelsrapport',
     'dashboard'				=> 'Kontrollpanel',
+    'data_source'           => 'Data Source',
     'days'      			=> 'dager',
     'days_to_next_audit'    => 'Dager til neste revisjon',
     'date'					=> 'Dato',
@@ -98,7 +106,7 @@ return [
     'debug_warning_text'    => 'Dette programmet kjører i produksjonsmodus med feilsøking aktiverert. Dette kan utsette følsomme data hvis programmet er tilgjengelig for omverdenen. Deaktiver debug modus ved å sette <code>APP_DEBUG</code>-verdien i filen <code>.env</code> til <code>false</code>.',
     'delete'  				=> 'Slett',
     'delete_confirm'  		=> 'Er du sikker på at du vil slette :item?',
-    'delete_confirm_no_undo' => 'Er du sikker på at du vil slette :item? Dette kan ikke angres.',
+    'delete_confirm_no_undo' => 'Are you sure, you wish to delete :item? This cannot be undone.',
     'deleted'  				=> 'Slettet',
     'delete_seats'  		=> 'Slettede setelisenser',
     'deletion_failed'       => 'Sletting mislyktes',
@@ -114,29 +122,13 @@ return [
     'editprofile'  			=> 'Rediger din profil',
     'eol'					=> 'Livstid',
     'email_domain'			=> 'E-postdomene',
-    'email_format'			=> 'E-postformat',
     'employee_number'       => 'Ansattnummer',
     'email_domain_help'		=> 'Brukes til å generere e-postadresser ved import',
     'error'				    => 'Feil',
     'exclude_archived'      => 'Ekskluder arkiverte ressurser',
     'exclude_deleted'       => 'Ekskluder slettede ressurser',
     'example'				=> 'Eksempel: ',
-    'filastname_format'			=> 'Fornavn (kun initial) Etternavn (oladunk@example.com)',
-    'firstname_lastname_format'	=> 'Fornavn Etternavn (oladunk@example.com)',
-    'firstname_lastname_underscore_format' => 'Fornavn Etternavn (oladunk@example.com)',
-    'lastnamefirstinitial_format' =>  'Etternavn Initialer (oladunk@example.com)',
-    'firstintial_dot_lastname_format' => 'Fornavn Initialer. Etternavn (j.smith@example.com)',
-    'firstname_lastname_display'	=> 'Fornavn Etternavn (Kari Torildsdottir)',
-    'lastname_firstname_display'	=> 'Etternavn Fornavn (Torildsdottir, Kari)',
-    'name_display_format'	=> 'Navneformat',
-    'first'					=> 'Første',
-    'firstnamelastname'     => 'Fornavn Etternavn (oladunk@example.com)',
-    'lastname_firstinitial' => 'Etternavn Fornavn Initialer (smith_j@example.com)',
-    'firstinitial.lastname' => 'Fornavn Initialer Etternavn (j.smith@example.com)',
-    'firstnamelastinitial'  => 'Fornavn Etternavn Initialer (janes@example.com)',
-    'lastnamefirstname'      => 'Last Name First Name (smith.jane@example.com)',
-    'first_name'			=> 'Fornavn',
-    'first_name_format'		=> 'Fornavn (oladunk@example.com)',
+
     'files'                 => 'Filer',
     'file_name'				=> 'Fil',
     'file_type'             => 'Filtype',
@@ -156,9 +148,9 @@ return [
     'image_delete'         	=> 'Slett bilde',
     'include_deleted'       => 'Inkluder slettede ressurser',
     'image_upload'         	=> 'Last opp bilde',
-    'filetypes_accepted_help'    => 'Godkjent filtype er :types. Maks opplastingsstørrelse er :size.|Aksepterte filtyper er :types. Maks opplastingsstørrelse er :size.',
-    'filetypes_size_help'   => 'Maks opplastingsstørrelse er :size.',
-    'image_filetypes_help'  => 'Accepted filetypes are jpg, webp, png, gif, svg, and avif. Max upload size allowed is :size.',
+    'filetypes_accepted_help'    => 'Accepted filetype is :types. The maximum size allowed is :size.|Accepted filetypes are :types. The maximum upload size allowed is :size.',
+    'filetypes_size_help'   => 'The maximum upload size allowed is :size.',
+    'image_filetypes_help'  => 'Accepted Filetypes are jpg, webp, png, gif, svg, and avif. The maximum upload size allowed is :size.',
     'unaccepted_image_type'  => 'Denne bildefilen var ikke lesbar. Aksepterte filtyper er jpg, webp, png, gif og svg. Mime-typen til denne filen er :mimetype.',
     'import'         	    => 'Importer',
     'import_this_file'      => 'Kartfelter og behandle denne filen',
@@ -178,12 +170,17 @@ return [
     'last'					=> 'Siste',
     'last_login'            => 'Siste pålogging',
     'last_name'             => 'Etternavn',
+    'firstname_lastname_display'	=> 'Fornavn Etternavn (Kari Torildsdottir)',
+    'lastname_firstname_display'	=> 'Etternavn Fornavn (Torildsdottir, Kari)',
+    'name_display_format'	=> 'Navneformat',
+    'first'					=> 'Første',
+    'first_name'			=> 'Fornavn',
     'license'				=> 'Lisens',
     'license_report'        => 'Lisensrapport',
     'licenses_available'	=> 'Tilgjengelige lisenser',
     'licenses'				=> 'Lisenser',
     'list_all'				=> 'List alle',
-    'loading'				=> 'Laster... vennligst vent....',
+    'loading'				=> 'Laster... vennligst vent...',
     'lock_passwords'        => 'Denne feltverdien vil ikke bli lagret i en demo-installasjon.',
     'feature_disabled'      => 'Denne funksjonen er deaktivert i demo-installasjonen.',
     'location'              => 'Lokasjon',
@@ -193,7 +190,7 @@ return [
     'logout'				=> 'Logg ut',
     'lookup_by_tag'     => 'Søk på ID-merke',
     'maintenances'          => 'Vedlikehold',
-    'manage_api_keys'       => 'Administrer API-nøkler',
+    'manage_api_keys'       => 'Manage API keys',
     'manufacturer'			=> 'Produsent',
     'manufacturers'			=> 'Produsenter',
     'markdown'				=> 'Dette feltet tillater <a href="https://help.github.com/articles/github-flavored-markdown/">Github flavored markdown</a>.',
@@ -215,6 +212,14 @@ return [
     'no_results'			=> 'Ingen treff.',
     'no'  					=> 'Nei',
     'notes'  				=> 'Notater',
+    'note_added'            => 'Note Added',
+    'options'				=> 'Options',
+    'preview'				=> 'Preview',
+    'add_note'              => 'Add Note',
+    'note_edited'            => 'Note Edited',
+    'edit_note'              => 'Edit Note',
+    'note_deleted'            => 'Note Deleted',
+    'delete_note'              => 'Delete Note',
     'order_number'          => 'Ordreummer',
     'only_deleted'          => 'Kun slettede ressurser',
     'page_menu'				=> 'Viser _MENU_ enheter',
@@ -229,7 +234,7 @@ return [
     'purchase_date'         => 'Innkjøpsdato',
     'qty'		            => 'Antall',
     'quantity'		        => 'Antall',
-    'quantity_minimum'      => 'Du har :count enheter under eller nesten under minimum antall',
+    'quantity_minimum'      => 'You have one item below or almost below minimum quantity levels|You have :count items below or almost below minimum quantity levels',
     'quickscan_checkin'  	=> 'Hurtiginnsjekk ved skanning',
     'quickscan_checkin_status'  	=> 'Innsjekkingsstatus',
     'ready_to_deploy'		=> 'Klar for utlevering',
@@ -254,7 +259,7 @@ return [
     'select_all'            => 'Velg alle',
     'search'				=> 'Søk',
     'select_category'       => 'Velg en kategori',
-    'select_datasource' => 'Velg en datakilde',
+    'select_datasource' => 'Select a data source',
     'select_department'     => 'Velg en avdeling',
     'select_depreciation'	=> 'Velg en avskrivningstype',
     'select_location'		=> 'Velg en lokasjon',
@@ -274,13 +279,15 @@ return [
     'signed_off_by'         => 'Godkjent av',
     'skin'       			=> 'Tema',
     'webhook_msg_note'        => 'En varsling vil bli sendt via webhook',
-    'webhook_test_msg'        => 'Hei-hå! Ser som din Slack-integrasjon med Snipe-IT fungerer!',
+    'webhook_test_msg'        => 'Oh hai! It looks like your :app integration with Snipe-IT is working!',
     'some_features_disabled' => 'DEMO MODUS: Noe funksjonalitet er skrudd av i denne installasjonen.',
     'site_name'				=> 'Nettstedsnavn',
     'state'  				=> 'Stat',
     'status_labels'			=> 'Statusmerker',
+    'status_label'			=> 'Status Label',
     'status'    			=> 'Status',
     'accept_eula'           => 'Akseptavtale',
+    'show_or_hide_eulas' => 'Show/Hide EULAs',
     'supplier'              => 'Leverandør',
     'suppliers'  			=> 'Leverandører',
     'sure_to_delete'        => 'Er du sikker på at du vil slette',
@@ -296,9 +303,9 @@ return [
     'type'  				=> 'Type',
     'undeployable'			=> 'Ikke utleverbar',
     'unknown_admin'			=> 'Ukjent admin',
-    'username_format'		=> 'Format brukernavn',
     'username'              => 'Brukernavn',
     'update'                => 'Oppdater',
+    'updating_item' => 'Updating :item',
     'upload_filetypes_help'      => 'Tillatte filtyper er png, gif, jpg, jpeg, doc, docx, pdf, xls, xlsx, txt, lic, xml, zip, rtf og rar. Maks. filstørrelse er :size.',
     'uploaded'              => 'Lastet opp',
     'user'					=> 'Bruker',
@@ -323,10 +330,10 @@ return [
     'token_expired'         => 'Din sesjon har utløpt. Prøv igjen.',
     'login_enabled'         => 'Innlogging aktiv',
     'audit_due'             => 'Revisjonsfrist nær',
-    'audit_due_days'        => 'Aktiva Frist for revisjon innen :days days|Due for Audit Om dager',
+    'audit_due_days'        => '{}Assets Due or Overdue for Audit|[1]Assets Due or Overdue for Audit Within a Day|[2,*]Assets Due or Overdue for Audit Within :days Days',
     'checkin_due'           => 'Forfalt for innsjekk',
     'checkin_overdue'       => 'Forfalt for innsjekk',
-    'checkin_due_days'      => 'Eiendeler Tidsfrist for innsjekk innen :days Day|Asset Due for Checkin Innen :days',
+    'checkin_due_days'      => '{}Due for Checkin|[1]Assets Due for Checkin Within :days Day|[2,*]Assets Due for Checkin Within :days Days',
     'audit_overdue'         => 'Revisjonsfrist forfalt',
     'accept'                => 'Akseptér :asset',
     'i_accept'              => 'Jeg aksepterer',
@@ -339,16 +346,16 @@ return [
     'view_all'              => 'se alle',
     'hide_deleted'          => 'Skjul slettede',
     'email'                 => 'E-post',
-    'do_not_change'         => 'Ikke endre',
-    'bug_report'            => 'Rapporter feil',
+    'do_not_change'         => 'Do not change',
+    'bug_report'            => 'Report a bug',
     'user_manual'           => 'Brukerhåndbok',
     'setup_step_1'          => 'Trinn 1',
     'setup_step_2'          => 'Trinn 2',
     'setup_step_3'          => 'Trinn 3',
     'setup_step_4'          => 'Trinn 4',
     'setup_config_check'    => 'Sjekk konfigurasjon',
-    'setup_create_database' => 'Opprett databasetabeller',
-    'setup_create_admin'    => 'Opprett adminbruker',
+    'setup_create_database' => 'Create database tables',
+    'setup_create_admin'    => 'Create an admin user',
     'setup_done'            => 'Ferdig!',
     'bulk_edit_about_to'    => 'Du er i ferd med å redigere følgende: ',
     'checked_out'           => 'Sjekket ut',
@@ -383,6 +390,8 @@ return [
     'new_license'           => 'Ny lisens',
     'new_accessory'         => 'Nytt tilbehør',
     'new_consumable'        => 'Ny forbruksvare',
+    'new_component'         => 'New Component',
+    'new_user'              => 'New User',
     'collapse'              => 'Kollaps',
     'assigned'              => 'Tilordnet',
     'asset_count'           => 'Antall eiendeler',
@@ -418,19 +427,20 @@ return [
     'bulk_soft_delete'      =>'Fjern også disse brukerne ved å fjerne deres eiendelshistorikk intakt/til du fjerner slettede poster i Admin-innstillingene.',
     'bulk_checkin_delete_success' => 'Dine valgte brukere er slettet og deres elementer har blitt sjekket inn.',
     'bulk_checkin_success' => 'Elementene for de valgte brukerne har blitt sjekket inn.',
-    'set_to_null'           => 'Slette verdier for denne eiendelen Slett verdier for alle :asset_count eiendeler ',
+    'set_to_null'           => 'Delete values for this selection|Delete values for all :selection_count selections ',
     'set_users_field_to_null'  => 'Slett :field verdier for denne brukeren. Slett :field verdier for alle :user_count brukere ',
     'na_no_purchase_date'   => 'N/A - Ingen kjøpsdato oppgitt',
     'assets_by_status'      => 'Eiendeler etter status',
     'assets_by_status_type'      => 'Eiendeler etter status',
     'pie_chart_type'        => 'Dashbord Kakediagram type',
     'hello_name'            => 'Velkommen, :name!',
-    'unaccepted_profile_warning'   => 'Du har :count elementer som trenger godkjenning. Klikk her for å akseptere eller avslå dem',
+    'unaccepted_profile_warning'   => 'You have one item requiring acceptance. Click here to accept or decline it | You have :count items requiring acceptance. Click here to accept or decline them',
     'start_date'            => 'Startdato',
     'end_date'            => 'Sluttdato',
     'alt_uploaded_image_thumbnail' => 'Opplastet miniatyrbilde',
     'placeholder_kit'       => 'Velg ett sett',
     'file_not_found'        => 'Finner ikke filen',
+    'log_record_not_found'  => 'No record for that log entry was found.',
     'preview_not_available' => '(ingen forhåndsvisning)',
     'setup'                 => 'Innstillinger',
     'pre_flight'            => 'Test',
@@ -512,7 +522,7 @@ return [
     'checked_out_to_fields' => 'Checked Out To Fields',
     'percent_complete' => '% fullført',
     'uploading' => 'Laster opp... ',
-    'upload_error' => 'Feil ved opplasting av fil. Vennligst sjekk at det ikke er noen tomme rader og at ingen kolonnenavn er duplisert.',
+    'upload_error' => 'Error uploading file. Please check that you have no empty rows or duplicated column names in your CSV, and that the server permissions allow uploads.',
     'copy_to_clipboard' => 'Kopier til utklippstavlen',
     'copied' => 'Kopiert!',
     'status_compatibility' => 'Hvis eiendelene allerede er tilordnet, kan de ikke endres til en ikke-distribuerbar statustype og denne verdien vil bli hoppet over.',
@@ -549,6 +559,71 @@ return [
         'license_seats'  => ':count lisenssete|:count Lisensseter',
         'consumables'  => ':count Forbruksvare|:count Forbruksvarer',
         'components'  => ':count Komponenter|:count komponenter',
-    ]
+    ],
+
+    'more_info' => 'Mer info',
+    'quickscan_bulk_help' => 'Checking this box will edit the asset record to reflect this new location. Leaving it unchecked will simply note the location in the audit log. Note that if this asset is checked out, it will not change the location of the person, asset or location it is checked out to.',
+    'whoops' => 'Whoops!',
+    'something_went_wrong' => 'Something went wrong with your request.',
+    'close' => 'Close',
+    'expires' => 'Utløper',
+    'map_fields'=> 'Map :item_type Fields',
+    'remaining_var' => ':count Remaining',
+    'label' => 'Label',
+    'import_asset_tag_exists' => 'An asset with the asset tag :asset_tag already exists and an update was not requested. No change was made.',
+    'countries_manually_entered_help' => 'Values with an asterisk (*) were manually entered and do not match existing ISO 3166 dropdown values',
+    'accessories_assigned' => 'Assigned Accessories',
+    'user_managed_passwords' => 'Password Management',
+    'user_managed_passwords_disallow' => 'Disallow users from managing their own passwords',
+    'user_managed_passwords_allow' => 'Allow users to manage their own passwords',
+    'from' => 'From',
+    'by' => 'Av',
+
+// Add form placeholders here
+    'placeholders' => [
+        'notes'  => 'Add a note',
+    ],
+
+    'breadcrumb_button_actions' => [
+        'edit_item' => 'Edit :name',
+        'checkout_item' => 'Checkout :name',
+        'checkin_item' => 'Checkin :name',
+    ],
+
+    'skins' => [
+        'site_default' => 'Site Default',
+        'default_blue' => 'Default Blue',
+        'blue_dark' => 'Blue (Dark Mode)',
+        'green' => 'Green Dark',
+        'green_dark' => 'Green (Dark Mode)',
+        'red' => 'Red Dark',
+        'red_dark' => 'Red (Dark Mode)',
+        'orange' => 'Orange Dark',
+        'orange_dark' => 'Orange (Dark Mode)',
+        'black' => 'Black',
+        'black_dark' => 'Black (Dark Mode)',
+        'purple' => 'Purple',
+        'purple_dark' => 'Purple (Dark Mode)',
+        'yellow' => 'Yellow',
+        'yellow_dark' => 'Yellow (Dark Mode)',
+        'high_contrast' => 'High Contrast',
+
+    ],
+
+    'select_all_none' => 'Select/Unselect All',
+    'generic_model_not_found' => 'That :model was not found or you do not have permission to access it',
+    'deleted_models' => 'Deleted Asset Models',
+    'deleted_users' => 'Deleted Users',
+    'cost_each' => ':amount each',
+    'remove_current_image' => 'Remove current :type image',
+
+    'seeding' => [
+        'manufacturers' => [
+            'button' => 'Create Manufacturers',
+            'prompt' => 'You do not have any manufacturers yet. Would you like to seed a list of common manufacturers? (THIS WILL OVERWRITE EXISTING MANUFACTURERS, including those that have been soft-deleted.)',
+            'success' => 'Manufacturers seeded successfully',
+            'error' => 'Could not seed manufacturers. A manufacturer record already exists and seeding would overwrite it.|Could not seed manufacturers. :count manufacturer records already exist and seeding would overwrite them.',
+        ],
+    ],
 
 ];
diff --git a/resources/lang/no-NO/localizations.php b/resources/lang/no-NO/localizations.php
index ec2ee04a80..355dd5914a 100644
--- a/resources/lang/no-NO/localizations.php
+++ b/resources/lang/no-NO/localizations.php
@@ -2,7 +2,7 @@
 
 return [
 
-    'select_language' => 'Velg et språk',
+    'select_language' => 'Select a Language',
     'languages' => [
         'en-US'=> 'Engelsk, USA',
         'en-GB'=> 'Engelsk, Storbritannia',
@@ -40,7 +40,9 @@ return [
         'ms-MY'=> 'Malayisk',
         'mi-NZ'=> 'Maori',
         'mn-MN'=> 'Mongolsk',
-        'no-NO'=> 'Norsk',
+        'nb-NO'=> 'Norwegian Bokmål',
+        'om-ET' => 'Oromo (Ethiopian)',
+        //'nn-NO'=> 'Norwegian Nynorsk',
         'fa-IR'=> 'Persisk',
         'pl-PL'=> 'Polsk',
         'pt-PT'=> 'Portugisisk',
@@ -66,7 +68,7 @@ return [
         'zu-ZA'=> 'Zulu',
     ],
 
-    'select_country' => 'Velg et land',
+    'select_country' => 'Select a Country',
     
     'countries' => [
         'AC'=>'Ascension Island',
@@ -133,6 +135,7 @@ return [
         'EC'=>'Ecuador',
         'EE'=>'Estland',
         'EG'=>'Egypt',
+        'GB-ENG'=>'England',
         'ER'=>'Eritrea',
         'ES'=>'Spania',
         'ET'=>'Etiopia',
@@ -231,6 +234,7 @@ return [
         'NG'=>'Nigeria',
         'NI'=>'Nicaragua',
         'NL'=>'Nederland',
+        'GB-NIR' => 'Northern Ireland',
         'NO'=>'Norge',
         'NP'=>'Nepal',
         'NR'=>'Nauru',
@@ -258,7 +262,7 @@ return [
         'RU'=>'Russland',
         'RW'=>'Rwanda',
         'SA'=>'Saudi-Arabia',
-        'UK'=>'Skottland',
+        'GB-SCT'=>'Skottland',
         'SB'=>'Salomonøyene',
         'SC'=>'Seychellene',
         'SS'=>'Sør-Sudan',
@@ -310,6 +314,7 @@ return [
         'VI'=>'Jomfruøyene, (USA)',
         'VN'=>'Vietnam',
         'VU'=>'Vanuatu',
+        'GB-WLS' =>'Wales',
         'WF'=>'Wallis- og Futunaøyene',
         'WS'=>'Samoa',
         'YE'=>'Jemen',
diff --git a/resources/lang/no-NO/mail.php b/resources/lang/no-NO/mail.php
index 608f83e933..d2d6f59026 100644
--- a/resources/lang/no-NO/mail.php
+++ b/resources/lang/no-NO/mail.php
@@ -23,24 +23,25 @@ return [
     'Item_Requested' => 'Forespurt enhet',
     'License_Checkin_Notification' => 'Lisens sjekket inn',
     'License_Checkout_Notification' => 'Lisens sjekket ut',
+    'license_for'   => 'License for',
     'Low_Inventory_Report' => 'Rapport lav lagerbeholdning',
     'a_user_canceled' => 'Brukeren har avbrutt en element-forespørsel på webområdet',
     'a_user_requested' => 'En bruker har bedt om et element på webområdet',
     'acceptance_asset_accepted' => 'En bruker har godtatt et element',
     'acceptance_asset_declined' => 'En bruker har avvist et element',
-    'accessory_name' => 'Navn tilbehør:',
-    'additional_notes' => 'Flere notater:',
+    'accessory_name' => 'Navn tilbehør',
+    'additional_notes' => 'Flere notater',
     'admin_has_created' => 'En administrator har opprettet en konto for deg på :web nettsted.',
-    'asset' => 'Eiendel:',
-    'asset_name' => 'Navn:',
+    'asset' => 'Eiendel',
+    'asset_name' => 'Navn',
     'asset_requested' => 'Eiendel forespurt',
     'asset_tag' => 'Eiendelsmerke',
     'assets_warrantee_alert' => 'En eiendel har garanti som utløper innenfor de neste :treshold dagene.|:count eiendeler har garanti som utløper innenfor de neste :tershold dagene.',
     'assigned_to' => 'Tilordnet til',
     'best_regards' => 'Med vennlig hilsen,',
-    'canceled' => 'Avbrutt:',
-    'checkin_date' => 'Innsjekkdato:',
-    'checkout_date' => 'Utsjekkdato:',
+    'canceled' => 'Avbrutt',
+    'checkin_date' => 'Innsjekkdato',
+    'checkout_date' => 'Utsjekkdato',
     'checkedout_from' => 'Sjekket ut fra',
     'checkedin_from'  => 'Sjekket inn fra',
     'checked_into' => 'Sjekket inn',
@@ -49,27 +50,30 @@ return [
     'click_to_confirm' => 'Klikk på følgende link for å bekrefte din :web konto:',
     'current_QTY' => 'Nåværende antall',
     'days' => 'Dager',
-    'expecting_checkin_date' => 'Forventet innsjekkdato:',
+    'expecting_checkin_date' => 'Forventet dato for innsjekk',
     'expires' => 'Utløper',
     'hello' => 'Hallo',
     'hi' => 'Hei',
     'i_have_read' => 'Jeg har lest og godtar vilkårene for bruk, og har mottatt denne enheten.',
     'inventory_report' => 'Lagerbeholdnings rapport',
-    'item' => 'Enhet:',
+    'item' => 'Enhet',
+    'item_checked_reminder' => 'This is a reminder that you currently have :count items checked out to you that you have not accepted or declined. Please click the link below to confirm your decision.',
     'license_expiring_alert' => ':count lisens utløper de neste :threshold dagene.|:count lisenser utløper de neste :threshold dagene.',
     'link_to_update_password' => 'Klikk på følgende link for å bekrefte din :web passord:',
-    'login' => 'Logg inn:',
+    'login' => 'Logg inn',
     'login_first_admin' => 'Logg inn på din nye Snipe-IT-installasjon ved å bruke kontoen nedenfor:',
     'low_inventory_alert' => ':count enhet er under minimumnivå for beholdning, eller vil snart nå dette nivået.|:count enheter er under minimumnivå for beholdning, eller vil snart nå dette nivået.',
     'min_QTY' => 'Min. antall',
     'name' => 'Navn',
     'new_item_checked' => 'En ny enhet har blitt sjekket ut under ditt navn, detaljer nedenfor.',
+    'new_item_checked_with_acceptance' => 'A new item has been checked out under your name that requires acceptance, details are below.',
+    'recent_item_checked' => 'An item was recently checked out under your name that requires acceptance, details are below.',
     'notes' => 'Notater',
-    'password' => 'Passord:',
+    'password' => 'Passord',
     'password_reset' => 'Tilbakestill passord',
     'read_the_terms' => 'Vennligst les bruksbetingelsene nedenfor.',
     'read_the_terms_and_click' => 'Vennligst les vilkårene for bruk nedenfor. og klikk på lenken nederst for å bekrefte at du leser og godtar vilkårene for bruk, og har mottatt eiendelen.',
-    'requested' => 'Forespurt:',
+    'requested' => 'Forespurt',
     'reset_link' => 'Lenke for tilbakestilling av passord',
     'reset_password' => 'Klikk her for å tilbakestille passordet:',
     'rights_reserved' => 'Alle rettigheter forbeholdt.',
@@ -86,8 +90,10 @@ return [
     'upcoming-audits' => ':count eiendel har revisjonsfrist innen :treshold dager.|:count eiendeler har revisjonsfrist innen :threshold dager.',
     'user' => 'Bruker',
     'username' => 'Brukernavn',
+    'unaccepted_asset_reminder' => 'Reminder: You have Unaccepted Assets.',
     'welcome' => 'Velkommen :name',
     'welcome_to' => 'Velkommen til :web!',
     'your_assets' => 'Vis dine eiendeler',
     'your_credentials' => 'Din Snipe-IT konto',
+    'mail_sent' => 'Mail sent successfully!',
 ];
diff --git a/resources/lang/no-NO/validation.php b/resources/lang/no-NO/validation.php
index 19d16ae394..12b5bd462a 100644
--- a/resources/lang/no-NO/validation.php
+++ b/resources/lang/no-NO/validation.php
@@ -13,87 +13,150 @@ return [
     |
     */
 
-    'accepted'             => 'Attributtet :attribute må velges.',
-    'active_url'           => 'Attributtet :attribute er ikke en gyldig URL.',
-    'after'                => 'Attributtet :attribute må være en dato etter :date.',
-    'after_or_equal'       => 'Attributtet :attribute må være en dato etter eller lik :date.',
-    'alpha'                => 'Attributtet :attribute kan kun inneholde bokstaver.',
-    'alpha_dash'           => 'Attributtet :attribute kan kun inneholde bokstaver, nummer eller bindestrek.',
-    'alpha_num'            => 'Attributtet :attribute kan kun inneholde bokstaver og numre.',
-    'array'                => 'Attributtet må være en matrise.',
-    'before'               => 'Attributtet :attribute må være en dato før :date.',
-    'before_or_equal'      => 'Attributtet :attribute må være en dato før eller lik :date.',
-    'between'              => [
-        'numeric' => 'Attributtet :attribute må være mellom :min og :max.',
-        'file'    => 'Attributtet :attribute må være mellom :min og :max kilobytes.',
-        'string'  => 'Attributtet :attribute må være mellom :min og :max tegn.',
-        'array'   => 'Attributtet må ha mellom: min og: maks elementer.',
+    'accepted' => 'The :attribute field must be accepted.',
+    'accepted_if' => 'The :attribute field must be accepted when :other is :value.',
+    'active_url' => 'The :attribute field must be a valid URL.',
+    'after' => 'The :attribute field must be a date after :date.',
+    'after_or_equal' => 'The :attribute field must be a date after or equal to :date.',
+    'alpha' => 'The :attribute field must only contain letters.',
+    'alpha_dash' => 'The :attribute field must only contain letters, numbers, dashes, and underscores.',
+    'alpha_num' => 'The :attribute field must only contain letters and numbers.',
+    'array' => 'The :attribute field must be an array.',
+    'ascii' => 'The :attribute field must only contain single-byte alphanumeric characters and symbols.',
+    'before' => 'The :attribute field must be a date before :date.',
+    'before_or_equal' => 'The :attribute field must be a date before or equal to :date.',
+    'between' => [
+        'array' => 'The :attribute field must have between :min and :max items.',
+        'file' => 'The :attribute field must be between :min and :max kilobytes.',
+        'numeric' => 'The :attribute field must be between :min and :max.',
+        'string' => 'The :attribute field must be between :min and :max characters.',
     ],
-    'boolean'              => 'Attributtfeltet må være sant eller falskt.',
-    'confirmed'            => 'Bekreftelse på attributtet :attribute stemmer ikke.',
-    'date'                 => 'Attributtet :attribute er ikke en gyldig dato.',
-    'date_format'          => 'Attributtet :attribute passer ikke formatet :format.',
-    'different'            => 'Attributtet :attribute og :other er forskjellige.',
-    'digits'               => 'Attributtet :attribute må være :digits sifre.',
-    'digits_between'       => 'Attributtet :attribute må være mellom :min og :max sifre.',
-    'dimensions'           => 'Attributtet har ugyldige bildedimensjoner.',
-    'distinct'             => 'Attributtfeltet har en duplikatverdi.',
-    'email'                => 'Attributtet :attribute er ugyldig.',
-    'exists'               => 'Valgt attributt :attribute er ugyldig.',
-    'file'                 => 'Attributtet :attribute må være en fil.',
-    'filled'               => 'Den :attribute må ha en verdi.',
-    'image'                => 'Attributtet :attribute må være et bilde.',
+    'boolean' => 'Attributtfeltet må være sant eller falskt.',
+    'can' => 'The :attribute field contains an unauthorized value.',
+    'confirmed' => 'The :attribute field confirmation does not match.',
+    'contains' => 'The :attribute field is missing a required value.',
+    'current_password' => 'The password is incorrect.',
+    'date' => 'The :attribute field must be a valid date.',
+    'date_equals' => 'The :attribute field must be a date equal to :date.',
+    'date_format' => 'The :attribute field must match the format :format.',
+    'decimal' => 'The :attribute field must have :decimal decimal places.',
+    'declined' => 'The :attribute field must be declined.',
+    'declined_if' => 'The :attribute field must be declined when :other is :value.',
+    'different' => 'The :attribute field and :other must be different.',
+    'digits' => 'The :attribute field must be :digits digits.',
+    'digits_between' => 'The :attribute field must be between :min and :max digits.',
+    'dimensions' => 'The :attribute field has invalid image dimensions.',
+    'distinct' => 'Attributtfeltet har en duplikatverdi.',
+    'doesnt_end_with' => 'The :attribute field must not end with one of the following: :values.',
+    'doesnt_start_with' => 'The :attribute field must not start with one of the following: :values.',
+    'email' => 'The :attribute field must be a valid email address.',
+    'ends_with' => 'The :attribute field must end with one of the following: :values.',
+    'enum' => 'Attributtet :attribute er ugyldig.',
+    'exists' => 'Valgt attributt :attribute er ugyldig.',
+    'extensions' => 'The :attribute field must have one of the following extensions: :values.',
+    'file' => 'The :attribute field must be a file.',
+    'filled' => 'Den :attribute må ha en verdi.',
+    'gt' => [
+        'array' => 'The :attribute field must have more than :value items.',
+        'file' => 'The :attribute field must be greater than :value kilobytes.',
+        'numeric' => 'The :attribute field must be greater than :value.',
+        'string' => 'The :attribute field must be greater than :value characters.',
+    ],
+    'gte' => [
+        'array' => 'The :attribute field must have :value items or more.',
+        'file' => 'The :attribute field must be greater than or equal to :value kilobytes.',
+        'numeric' => 'The :attribute field must be greater than or equal to :value.',
+        'string' => 'The :attribute field must be greater than or equal to :value characters.',
+    ],
+    'hex_color' => 'The :attribute field must be a valid hexadecimal color.',
+    'image' => 'The :attribute field must be an image.',
     'import_field_empty'    => 'Verdien for :fieldname kan ikke være null.',
-    'in'                   => 'Det valgte attributtet :attribute er ugyldig.',
-    'in_array'             => 'Attributtfeltet finnes ikke i: andre.',
-    'integer'              => 'Attributtet :attribute må være et heltall.',
-    'ip'                   => 'Attributtet :attribute må være en gyldig IP-adresse.',
-    'ipv4'                 => 'Attributtet :attribute må være en gyldig IPv4-adresse.',
-    'ipv6'                 => 'Attributtet :attribute må være en gyldig IPv6-adresse.',
-    'is_unique_department' => 'Attributtet :attribute må være unikt for denne bedriftslokasjonen',
-    'json'                 => 'Attributtet: må være en gyldig JSON-streng.',
-    'max'                  => [
-        'numeric' => 'Attributtet :attribute må ikke være større enn :max.',
-        'file'    => 'Attributtet :attribute kan ikke være større enn :max kilobytes.',
-        'string'  => 'Attributtet :attribute kan ikke være større enn :max tegn.',
-        'array'   => 'Attributtet: Må ikke ha mer enn: maks. Elementer.',
+    'in' => 'Det valgte attributtet :attribute er ugyldig.',
+    'in_array' => 'The :attribute field must exist in :other.',
+    'integer' => 'The :attribute field must be an integer.',
+    'ip' => 'The :attribute field must be a valid IP address.',
+    'ipv4' => 'The :attribute field must be a valid IPv4 address.',
+    'ipv6' => 'The :attribute field must be a valid IPv6 address.',
+    'json' => 'The :attribute field must be a valid JSON string.',
+    'list' => 'The :attribute field must be a list.',
+    'lowercase' => 'The :attribute field must be lowercase.',
+    'lt' => [
+        'array' => 'The :attribute field must have less than :value items.',
+        'file' => 'The :attribute field must be less than :value kilobytes.',
+        'numeric' => 'The :attribute field must be less than :value.',
+        'string' => 'The :attribute field must be less than :value characters.',
     ],
-    'mimes'                => 'Attributtet :attribute må være en fil av typen: :values.',
-    'mimetypes'            => 'Attributtet må være en fil av type:: verdier.',
-    'min'                  => [
-        'numeric' => 'Attributtet :attribute må være minst :min.',
-        'file'    => 'Attributtet :attribute må være minst :min kilobytes.',
-        'string'  => 'Attributtet :attribute må være minst :min tegn.',
-        'array'   => 'Attributtet må ha minst: min elementer.',
+    'lte' => [
+        'array' => 'The :attribute field must not have more than :value items.',
+        'file' => 'The :attribute field must be less than or equal to :value kilobytes.',
+        'numeric' => 'The :attribute field must be less than or equal to :value.',
+        'string' => 'The :attribute field must be less than or equal to :value characters.',
     ],
-    'starts_with'          => ':attribute må starte med en av følgende: :values.',
-    'ends_with'            => ':attribute må avsluttes med en av følgende: :values.',
+    'mac_address' => 'The :attribute field must be a valid MAC address.',
+    'max' => [
+        'array' => 'The :attribute field must not have more than :max items.',
+        'file' => 'The :attribute field must not be greater than :max kilobytes.',
+        'numeric' => 'The :attribute field must not be greater than :max.',
+        'string' => 'The :attribute field must not be greater than :max characters.',
+    ],
+    'max_digits' => 'The :attribute field must not have more than :max digits.',
+    'mimes' => 'The :attribute field must be a file of type: :values.',
+    'mimetypes' => 'The :attribute field must be a file of type: :values.',
+    'min' => [
+        'array' => 'The :attribute field must have at least :min items.',
+        'file' => 'The :attribute field must be at least :min kilobytes.',
+        'numeric' => 'The :attribute field must be at least :min.',
+        'string' => 'The :attribute field must be at least :min characters.',
+    ],
+    'min_digits' => 'The :attribute field must have at least :min digits.',
+    'missing' => 'The :attribute field must be missing.',
+    'missing_if' => 'The :attribute field must be missing when :other is :value.',
+    'missing_unless' => 'The :attribute field must be missing unless :other is :value.',
+    'missing_with' => 'The :attribute field must be missing when :values is present.',
+    'missing_with_all' => 'The :attribute field must be missing when :values are present.',
+    'multiple_of' => 'The :attribute field must be a multiple of :value.',
+    'not_in' => 'Attributtet :attribute er ugyldig.',
+    'not_regex' => 'The :attribute field format is invalid.',
+    'numeric' => 'The :attribute field must be a number.',
+    'password' => [
+        'letters' => 'The :attribute field must contain at least one letter.',
+        'mixed' => 'The :attribute field must contain at least one uppercase and one lowercase letter.',
+        'numbers' => 'The :attribute field must contain at least one number.',
+        'symbols' => 'The :attribute field must contain at least one symbol.',
+        'uncompromised' => 'The given :attribute has appeared in a data leak. Please choose a different :attribute.',
+    ],
+    'percent'       => 'The depreciation minimum must be between 0 and 100 when depreciation type is percentage.',
 
-    'not_in'               => 'Attributtet :attribute er ugyldig.',
-    'numeric'              => 'Attributtet :attribute må være et nummer.',
-    'present'              => 'Atributtfeltet :attribute må ha en verdi.',
-    'valid_regex'          => 'Det er ikke en gyldig regex. ',
-    'regex'                => 'Attributt-formatet til :attribute er ugyldig.',
-    'required'             => 'Attributt-feltet :attribute er påkrevd.',
-    'required_if'          => 'Attributt-feltet :attribute er påkrevd når :oher er :value.',
-    'required_unless'      => 'Attributtfeltet kreves med mindre: annet er i: verdier.',
-    'required_with'        => 'Attributt-feltet :attribute er påkrevd når :values er tilstede.',
-    'required_with_all'    => 'Attributtfeltet kreves når: verdiene er til stede.',
-    'required_without'     => 'Attributt-feltet :attribute er påkrevd når :values ikke er tilstede.',
+    'present' => 'Atributtfeltet :attribute må ha en verdi.',
+    'present_if' => 'The :attribute field must be present when :other is :value.',
+    'present_unless' => 'The :attribute field must be present unless :other is :value.',
+    'present_with' => 'The :attribute field must be present when :values is present.',
+    'present_with_all' => 'The :attribute field must be present when :values are present.',
+    'prohibited' => 'The :attribute field is prohibited.',
+    'prohibited_if' => 'The :attribute field is prohibited when :other is :value.',
+    'prohibited_unless' => 'The :attribute field is prohibited unless :other is in :values.',
+    'prohibits' => 'The :attribute field prohibits :other from being present.',
+    'regex' => 'The :attribute field format is invalid.',
+    'required' => 'Attributt-feltet :attribute er påkrevd.',
+    'required_array_keys' => 'The :attribute field must contain entries for: :values.',
+    'required_if' => 'Attributt-feltet :attribute er påkrevd når :oher er :value.',
+    'required_if_accepted' => 'The :attribute field is required when :other is accepted.',
+    'required_if_declined' => 'The :attribute field is required when :other is declined.',
+    'required_unless' => 'Attributtfeltet kreves med mindre: annet er i: verdier.',
+    'required_with' => 'Attributt-feltet :attribute er påkrevd når :values er tilstede.',
+    'required_with_all' => 'The :attribute field is required when :values are present.',
+    'required_without' => 'Attributt-feltet :attribute er påkrevd når :values ikke er tilstede.',
     'required_without_all' => 'Attributtfeltet kreves når ingen av: verdiene er til stede.',
-    'same'                 => 'Attributtet :attribute og :other må være like.',
-    'size'                 => [
-        'numeric' => 'Attributtet :attribute må være :size.',
-        'file'    => 'Attributtet :attribute må være :size kilobytes.',
-        'string'  => 'Attributtet :attribute må være :size tegn.',
-        'array'   => 'Attributtet må inneholde: størrelseselementer.',
+    'same' => 'The :attribute field must match :other.',
+    'size' => [
+        'array' => 'The :attribute field must contain :size items.',
+        'file' => 'The :attribute field must be :size kilobytes.',
+        'numeric' => 'The :attribute field must be :size.',
+        'string' => 'The :attribute field must be :size characters.',
     ],
+    'starts_with' => 'The :attribute field must start with one of the following: :values.',
     'string'               => 'Attributtet :attribute må være en tekst.',
-    'timezone'             => 'Attributtet må være en gyldig sone.',
     'two_column_unique_undeleted' => ':attribute må være unik i forhold til :table1 og :table2. ',
-    'unique'               => 'Attributtet :attribute er allerede tatt.',
-    'uploaded'             => 'Atribbutet :attribute kunne ikke lastes opp.',
-    'url'                  => 'Attributt-formatet :attribute er ugyldig.',
     'unique_undeleted'     => ':attribute må være unikt.',
     'non_circular'         => 'Attributtet :attribute kan ikke opprette en sirkulær referanse.',
     'not_array'            => ':attribute kan ikke være en matrise.',
@@ -102,11 +165,14 @@ return [
     'numbers'              => 'Passordet må inneholde minst ett tall.',
     'case_diff'            => 'Passordet må innehode store og små bokstaver.',
     'symbols'              => 'Passordet må inneholde symboler.',
-    'gte'                  => [
-        'numeric'          => 'Verdi kan ikke være negativ'
-    ],
-    'checkboxes'           => ':attribute inneholder ugyldige valg.',
-    'radio_buttons'        => ':attribute er ugyldig.',
+    'timezone' => 'The :attribute field must be a valid timezone.',
+    'unique' => 'Attributtet :attribute er allerede tatt.',
+    'uploaded' => 'Atribbutet :attribute kunne ikke lastes opp.',
+    'uppercase' => 'The :attribute field must be uppercase.',
+    'url' => 'The :attribute field must be a valid URL.',
+    'ulid' => 'The :attribute field must be a valid ULID.',
+    'uuid' => 'The :attribute field must be a valid UUID.',
+    'fmcs_location' => 'Full multiple company support and location scoping is enabled in the Admin Settings, and the selected location and selected company are not compatible.',
 
 
     /*
@@ -120,16 +186,22 @@ return [
     |
     */
 
+    'email_array'      => 'En eller flere e-postadresser er ugyldige.',
+    'checkboxes'           => ':attribute inneholder ugyldige valg.',
+    'radio_buttons'        => ':attribute er ugyldig.',
+    
     'custom' => [
         'alpha_space' => 'Attributtfeltet inneholder et tegn som ikke er tillatt.',
-        'email_array'      => 'En eller flere e-postadresser er ugyldige.',
+
         'hashed_pass'      => 'Gjeldende passord er feil',
         'dumbpwd'          => 'Passordet er for vanlig.',
         'statuslabel_type' => 'Du må velge en gyldig statusetikett-type',
+        'custom_field_not_found'          => 'This field does not seem to exist, please double check your custom field names.',
+        'custom_field_not_found_on_model' => 'This field seems to exist, but is not available on this Asset Model\'s fieldset.',
 
         // date_format validation with slightly less stupid messages. It duplicates a lot, but it gets the job done :(
-        // We use this because the default error message for date_format is reflects php Y-m-d, which non-PHP
-        // people won't know how to format. 
+        // We use this because the default error message for date_format reflects php Y-m-d, which non-PHP
+        // people won't know how to format.
         'purchase_date.date_format'     => ':attribute må være en gyldig dato i YYYY-MM-DD format',
         'last_audit_date.date_format'   =>  ':attribute må være en gyldig dato i YYYY-MM-DD hh:mm:ss format',
         'expiration_date.date_format'   =>  ':attribute må være en gyldig dato i YYYY-MM-DD format',
@@ -137,9 +209,15 @@ return [
         'expected_checkin.date_format'  =>  ':attribute må være en gyldig dato i YYYY-MM-DD format',
         'start_date.date_format'        =>  ':attribute må være en gyldig dato i YYYY-MM-DD format',
         'end_date.date_format'          =>  ':attribute må være en gyldig dato i YYYY-MM-DD format',
+        'invalid_value_in_field' => 'Ugyldig verdi inkludert i dette feltet',
 
-    ],
+        'ldap_username_field' => [
+            'not_in' =>         '<code>sAMAccountName</code> (mixed case) will likely not work. You should use <code>samaccountname</code> (lowercase) instead.'
+        ],
+        'ldap_auth_filter_query' => ['not_in' => '<code>uid=samaccountname</code> is probably not a valid auth filter. You probably want <code>uid=</code> '],
+        'ldap_filter' => ['regex' => 'This value should probably not be wrapped in parentheses.'],
 
+        ],
     /*
     |--------------------------------------------------------------------------
     | Custom Validation Attributes
@@ -155,8 +233,16 @@ return [
 
     /*
     |--------------------------------------------------------------------------
-    | Generic Validation Messages
+    | Generic Validation Messages - we use these in the jquery validation where we don't have
+    | access to the :attribute
     |--------------------------------------------------------------------------
     */
-    'invalid_value_in_field' => 'Ugyldig verdi inkludert i dette feltet',
+
+    'generic' => [
+        'invalid_value_in_field' => 'Ugyldig verdi inkludert i dette feltet',
+        'required' => 'This field is required',
+        'email' => 'Please enter a valid email address',
+    ],
+
+
 ];
diff --git a/resources/lang/om-ET/account/general.php b/resources/lang/om-ET/account/general.php
new file mode 100644
index 0000000000..7f9e2f848e
--- /dev/null
+++ b/resources/lang/om-ET/account/general.php
@@ -0,0 +1,17 @@
+<?php
+
+return array(
+    'personal_api_keys' => 'Personal API Keys',
+    'personal_access_token' => 'Personal Access Token',
+    'personal_api_keys_success' => 'Personal API Key :key created sucessfully',
+    'here_is_api_key' => 'Here is your new personal access token. This is the only time it will be shown so do not lose it! You may now use this token to make API requests.',
+    'api_key_warning' => 'When generating an API token, be sure to copy it down immediately as they will not be visible to you again.',
+    'api_base_url' => 'Your API base url is located at:',
+    'api_base_url_endpoint' => '/&lt;endpoint&gt;',
+    'api_token_expiration_time' => 'API tokens are set to expire in:',
+    'api_reference' => 'Please check the <a href="https://snipe-it.readme.io/reference" target="_blank">API reference</a> to find specific API endpoints and additional API documentation.',
+    'profile_updated' => 'Account successfully updated',
+    'no_tokens' => 'You have not created any personal access tokens.',
+    'enable_sounds' => 'Enable sound effects',
+    'enable_confetti' => 'Enable confetti effects',
+);
diff --git a/resources/lang/om-ET/admin/accessories/general.php b/resources/lang/om-ET/admin/accessories/general.php
new file mode 100644
index 0000000000..1f1c9c387a
--- /dev/null
+++ b/resources/lang/om-ET/admin/accessories/general.php
@@ -0,0 +1,22 @@
+<?php
+
+return array(
+    'accessory_category' 				=> 'Kaatagarii Gabaadaa',
+    'accessory_name'  					=> 'Maqaa Gabaadaa',
+    'checkout'  							=> 'Gabaadaa Baafachuu',
+    'checkin'  							=> 'Gabaadaa Galchu',
+    'create'  							=> 'Gabaadaa Uumuu',
+    'edit'  							=> 'Gabaadaa Haaromsuu',
+    'eula_text'							=> 'Kaatagarii EULA',
+    'eula_text_help'					=> 'Kuni bakka siif kenna EULAs kee gosa qabeenyaa addaa addaa irratti akka fooyyessuuf. Yoo EULA tokko qabeenyaa hundaa irratti qofa qabdu ta\'e, bitaa gadi jiru irratti sanduuqa cuqaasuu dandeessa EULA duraa fayyadamuuf.',
+    'require_acceptance'				=> 'Itti gaafatamtoota gatii kana keessatti qindeessuu mirkaneessuuf itti gaafatamtoota dirqama qabaachuuf.',
+    'no_default_eula'					=> 'EULA duraa sirrii tokko hin argamne. Kaayyoo keessatti tokko dabalata.',
+    'total'  							=> 'Ida\'am Walii galaa',
+    'remaining'  						=> 'Ka jiru',
+    'update'  							=> 'Gabaadaa Uumuu',
+    'use_default_eula'					=> 'Ulaagaalee <a href="#" data-toggle="modal" data-target="#eulaModal">durii sirrii</a> itti fayyadami.',
+    'use_default_eula_disabled'			=> '<del>Ulaagaalee duraa sirrii itti fayyadami.</del> EULA duraa sirrii tokko hin qophaa\'in. Mee kaayyoo keessatti tokko dabaladhu.',
+    'clone'                             => 'Gabaadaa Uumuu',
+    'delete_disabled'                   => 'Ulaagaaleen kun hatattamaan akka dhabamuu hin danda\'amne sababni isaas wantoonni muraasni ammas qabatamaa jiru.',
+
+);
diff --git a/resources/lang/om-ET/admin/accessories/message.php b/resources/lang/om-ET/admin/accessories/message.php
new file mode 100644
index 0000000000..65bec6e981
--- /dev/null
+++ b/resources/lang/om-ET/admin/accessories/message.php
@@ -0,0 +1,43 @@
+<?php
+
+return array(
+
+    'does_not_exist' => 'Meeshaa garaagaraa [:id] hin jiru, hin argamne.',
+    'not_found' => 'Meeshaan kun barbaadamee hin argamne.',
+    'assoc_users'	 => 'This accessory currently has :count items checked out to users. Please check in the accessories and and try again. ',
+
+    'create' => array(
+        'error'   => 'The accessory was not created, please try again.',
+        'success' => 'The accessory was successfully created.'
+    ),
+
+    'update' => array(
+        'error'   => 'The accessory was not updated, please try again',
+        'success' => 'The accessory was updated successfully.'
+    ),
+
+    'delete' => array(
+        'confirm'   => 'Are you sure you wish to delete this accessory?',
+        'error'   => 'There was an issue deleting the accessory. Please try again.',
+        'success' => 'The accessory was deleted successfully.'
+    ),
+
+     'checkout' => array(
+        'error'   		=> 'Accessory was not checked out, please try again',
+        'success' 		=> 'Accessory checked out successfully.',
+        'unavailable'   => 'Accessory is not available for checkout. Check quantity available',
+        'user_does_not_exist' => 'That user is invalid. Please try again.',
+         'checkout_qty' => array(
+            'lte'  => 'There is currently only one available accessory of this type, and you are trying to check out :checkout_qty. Please adjust the checkout quantity or the total stock of this accessory and try again.|There are :number_currently_remaining total available accessories, and you are trying to check out :checkout_qty. Please adjust the checkout quantity or the total stock of this accessory and try again.',
+            ),
+           
+    ),
+
+    'checkin' => array(
+        'error'   		=> 'Accessory was not checked in, please try again',
+        'success' 		=> 'Accessory checked in successfully.',
+        'user_does_not_exist' => 'That user is invalid. Please try again.'
+    )
+
+
+);
diff --git a/resources/lang/om-ET/admin/accessories/table.php b/resources/lang/om-ET/admin/accessories/table.php
new file mode 100644
index 0000000000..8a1b7b7f2e
--- /dev/null
+++ b/resources/lang/om-ET/admin/accessories/table.php
@@ -0,0 +1,9 @@
+<?php
+
+return array(
+	'dl_csv'      				=> 'CSV Gadi buusi',
+	'eula_text'      			=> 'WHFX',
+    'id'      					=> 'Eenyumeessituu',
+    'require_acceptance'      	=> 'Fudhatama',
+    'title'      				=> 'Maqaa Gabaadaa',
+);
diff --git a/resources/lang/om-ET/admin/asset_maintenances/form.php b/resources/lang/om-ET/admin/asset_maintenances/form.php
new file mode 100644
index 0000000000..785d06b08f
--- /dev/null
+++ b/resources/lang/om-ET/admin/asset_maintenances/form.php
@@ -0,0 +1,14 @@
+<?php
+
+    return [
+        'asset_maintenance_type' => 'Asset Maintenance Type',
+        'title'                  => 'Title',
+        'start_date'             => 'Start Date',
+        'completion_date'        => 'Completion Date',
+        'cost'                   => 'Cost',
+        'is_warranty'            => 'Warranty Improvement',
+        'asset_maintenance_time' => 'Asset Maintenance Time (in days)',
+        'notes'                  => 'Notes',
+        'update'                 => 'Update Asset Maintenance',
+        'create'                 => 'Create Asset Maintenance'
+    ];
diff --git a/resources/lang/om-ET/admin/asset_maintenances/general.php b/resources/lang/om-ET/admin/asset_maintenances/general.php
new file mode 100644
index 0000000000..0a54042db6
--- /dev/null
+++ b/resources/lang/om-ET/admin/asset_maintenances/general.php
@@ -0,0 +1,16 @@
+<?php
+
+    return [
+        'asset_maintenances' => 'Dhammajjuu Qabeenya',
+        'edit'               => 'Edit Asset Maintenance',
+        'delete'             => 'Delete Asset Maintenance',
+        'view'               => 'View Asset Maintenance Details',
+        'repair'             => 'Repair',
+        'maintenance'        => 'Maintenance',
+        'upgrade'            => 'Upgrade',
+        'calibration'        => 'Calibration',
+        'software_support'   => 'Software Support',
+        'hardware_support'   => 'Hardware Support',
+        'configuration_change'   => 'Configuration Change',
+        'pat_test'           => 'PAT Test',
+    ];
diff --git a/resources/lang/om-ET/admin/asset_maintenances/message.php b/resources/lang/om-ET/admin/asset_maintenances/message.php
new file mode 100644
index 0000000000..b44f618207
--- /dev/null
+++ b/resources/lang/om-ET/admin/asset_maintenances/message.php
@@ -0,0 +1,21 @@
+<?php
+
+    return [
+        'not_found'                    => 'Asset Maintenance you were looking for was not found!',
+        'delete'                       => [
+            'confirm' => 'Are you sure you wish to delete this asset maintenance?',
+            'error'   => 'There was an issue deleting the asset maintenance. Please try again.',
+            'success' => 'The asset maintenance was deleted successfully.',
+        ],
+        'create'                       => [
+            'error'   => 'Asset Maintenance was not created, please try again.',
+            'success' => 'Asset Maintenance created successfully.',
+        ],
+        'edit'                       => [
+            'error'   => 'Asset Maintenance was not edited, please try again.',
+            'success' => 'Asset Maintenance edited successfully.',
+        ],
+        'asset_maintenance_incomplete' => 'Not Completed Yet',
+        'warranty'                     => 'Warranty',
+        'not_warranty'                 => 'Not Warranty',
+    ];
diff --git a/resources/lang/om-ET/admin/asset_maintenances/table.php b/resources/lang/om-ET/admin/asset_maintenances/table.php
new file mode 100644
index 0000000000..0d3bc5ab51
--- /dev/null
+++ b/resources/lang/om-ET/admin/asset_maintenances/table.php
@@ -0,0 +1,8 @@
+<?php
+
+    return [
+        'title'         => 'Dammamoo Qabeenya Hawaasa',
+        'asset_name'    => 'Asset Name',
+        'is_warranty'   => 'Warranty',
+        'dl_csv'        => 'Download CSV',
+    ];
diff --git a/resources/lang/om-ET/admin/categories/general.php b/resources/lang/om-ET/admin/categories/general.php
new file mode 100644
index 0000000000..5467c78805
--- /dev/null
+++ b/resources/lang/om-ET/admin/categories/general.php
@@ -0,0 +1,25 @@
+<?php
+
+return array(
+    'asset_categories' 					=> 'Rimiddiiwwan Qabeenyaa',
+    'category_name'  					=> 'Maqaa Rimiddii',
+    'checkin_email'                     => 'Send email to user on checkin/checkout.',
+    'checkin_email_notification'        => 'This user will be sent an email on checkin/checkout.',
+    'clone'                             => 'Clone Category',
+    'create'  							=> 'Create Category',
+    'edit'                              => 'Edit Category',
+    'email_will_be_sent_due_to_global_eula' => 'An email will be sent to the user because the global EULA is being used.',
+    'email_will_be_sent_due_to_category_eula' => 'An email will be sent to the user because a EULA is set for this category.',
+    'eula_text'							=> 'Kaatagarii EULA',
+    'eula_text_help'					=> 'Kuni bakka siif kenna EULAs kee gosa qabeenyaa addaa addaa irratti akka fooyyessuuf. Yoo EULA tokko qabeenyaa hundaa irratti qofa qabdu ta\'e, bitaa gadi jiru irratti sanduuqa cuqaasuu dandeessa EULA duraa fayyadamuuf.',
+    'name'                              => 'Maqaa Rimiddii',
+    'require_acceptance'				=> 'Itti gaafatamtoota gatii kana keessatti qindeessuu mirkaneessuuf itti gaafatamtoota dirqama qabaachuuf.',
+    'required_acceptance'				=> 'This user will be emailed with a link to confirm acceptance of this item.',
+    'required_eula'						=> 'This user will be emailed a copy of the EULA',
+    'no_default_eula'					=> 'EULA duraa sirrii tokko hin argamne. Kaayyoo keessatti tokko dabalata.',
+    'update'  							=> 'Update Category',
+    'use_default_eula'					=> 'Ulaagaalee <a href="#" data-toggle="modal" data-target="#eulaModal">durii sirrii</a> itti fayyadami.',
+    'use_default_eula_disabled'			=> '<del>Ulaagaalee duraa sirrii itti fayyadami.</del> EULA duraa sirrii tokko hin qophaa\'in. Mee kaayyoo keessatti tokko dabaladhu.',
+    'use_default_eula_column'			=> 'Use default EULA',
+
+);
diff --git a/resources/lang/om-ET/admin/categories/message.php b/resources/lang/om-ET/admin/categories/message.php
new file mode 100644
index 0000000000..4e493f68b6
--- /dev/null
+++ b/resources/lang/om-ET/admin/categories/message.php
@@ -0,0 +1,26 @@
+<?php
+
+return array(
+
+    'does_not_exist' => 'Category does not exist.',
+    'assoc_models'	 => 'This category is currently associated with at least one model and cannot be deleted. Please update your models to no longer reference this category and try again. ',
+    'assoc_items'	 => 'This category is currently associated with at least one :asset_type and cannot be deleted. Please update your :asset_type  to no longer reference this category and try again. ',
+
+    'create' => array(
+        'error'   => 'Category was not created, please try again.',
+        'success' => 'Category created successfully.'
+    ),
+
+    'update' => array(
+        'error'   => 'Category was not updated, please try again',
+        'success' => 'Category updated successfully.',
+        'cannot_change_category_type'   => 'You cannot change the category type once it has been created',
+    ),
+
+    'delete' => array(
+        'confirm'   => 'Are you sure you wish to delete this category?',
+        'error'   => 'There was an issue deleting the category. Please try again.',
+        'success' => 'The category was deleted successfully.'
+    )
+
+);
diff --git a/resources/lang/om-ET/admin/categories/table.php b/resources/lang/om-ET/admin/categories/table.php
new file mode 100644
index 0000000000..f605d861a8
--- /dev/null
+++ b/resources/lang/om-ET/admin/categories/table.php
@@ -0,0 +1,10 @@
+<?php
+
+return array(
+	'eula_text'      			=> 'WHFX',
+    'id'      					=> 'Eenyumeessituu',
+    'parent'   					=> 'Parent',
+    'require_acceptance'      	=> 'Fudhatama',
+    'title'      				=> 'Asset Category Name',
+
+);
diff --git a/resources/lang/om-ET/admin/companies/general.php b/resources/lang/om-ET/admin/companies/general.php
new file mode 100644
index 0000000000..37781012ba
--- /dev/null
+++ b/resources/lang/om-ET/admin/companies/general.php
@@ -0,0 +1,7 @@
+<?php
+
+return [
+    'select_company' => 'Select Company',
+    'about_companies' => 'About Companies',
+    'about_companies_description' => '        You can use companies as a simple informative field, or you can use them to restrict asset visibility and availability to users with a specific company by enabling Full Company Support in your Admin Settings.',
+];
diff --git a/resources/lang/om-ET/admin/companies/message.php b/resources/lang/om-ET/admin/companies/message.php
new file mode 100644
index 0000000000..e440b7ac5f
--- /dev/null
+++ b/resources/lang/om-ET/admin/companies/message.php
@@ -0,0 +1,20 @@
+<?php
+
+return [
+    'does_not_exist' => 'Company does not exist.',
+    'deleted'        => 'Deleted company',
+    'assoc_users'    => 'This company is currently associated with at least one model and cannot be deleted. Please update your models to no longer reference this company and try again. ',
+    'create' => [
+        'error'   => 'Company was not created, please try again.',
+        'success' => 'Company created successfully.',
+    ],
+    'update' => [
+        'error'   => 'Company was not updated, please try again',
+        'success' => 'Company updated successfully.',
+    ],
+    'delete' => [
+        'confirm' => 'Are you sure you wish to delete this company?',
+        'error'   => 'There was an issue deleting the company. Please try again.',
+        'success' => 'The Company was deleted successfully.',
+    ],
+];
diff --git a/resources/lang/om-ET/admin/companies/table.php b/resources/lang/om-ET/admin/companies/table.php
new file mode 100644
index 0000000000..6e1ca8b081
--- /dev/null
+++ b/resources/lang/om-ET/admin/companies/table.php
@@ -0,0 +1,11 @@
+<?php
+return array(
+    'companies' => 'Dhaabbattoota',
+    'create'    => 'Dhaabbata Hundeessi',
+    'email'     => 'Imeeyilii Dhaabbataa',
+    'title'     => 'Dhaabbata',
+    'phone'     => 'Bilbila Dhaabbataa',
+    'update'    => 'Dhaabbata Sirreessi',
+    'name'      => 'Maqaa Dhaabbataa',
+    'id'        => 'Eenyumeessituu',
+);
diff --git a/resources/lang/om-ET/admin/components/general.php b/resources/lang/om-ET/admin/components/general.php
new file mode 100644
index 0000000000..c67afd9b44
--- /dev/null
+++ b/resources/lang/om-ET/admin/components/general.php
@@ -0,0 +1,16 @@
+<?php
+
+return array(
+    'component_name'                  => 'Maqaa Qaamaa',
+    'checkin'                             => 'Qaama meeshaa galii godhi',
+    'checkout'                             => 'Qaama Meeshaa baasii godhi',
+    'cost'				=> 'Qarshii itti bitame',
+    'create'                             => 'Qaama meeshaa hundeessi',
+    'edit'                             => 'Qaama meeshaa sirreessi',
+    'date'					=> 'Guyyaa iti bitame',
+    'order'					=> 'Lakk Tartiibaa',
+    'remaining' 			             => 'Haftee',
+    'total' 			                 => 'Ida\'ama Walii galaa',
+    'update'                            => 'Meeshaa hundeeffame sirreessi',
+    'checkin_limit'            => 'Baay\'inni seene baay\'ina ramadame :assigned_qyt walqixa tahuu yookaan isaa gadi tahuu qaba'
+);
diff --git a/resources/lang/om-ET/admin/components/message.php b/resources/lang/om-ET/admin/components/message.php
new file mode 100644
index 0000000000..ec39dc4178
--- /dev/null
+++ b/resources/lang/om-ET/admin/components/message.php
@@ -0,0 +1,38 @@
+<?php
+
+return array(
+
+    'does_not_exist' => 'Component does not exist.',
+
+    'create' => array(
+        'error'   => 'Component was not created, please try again.',
+        'success' => 'Component created successfully.'
+    ),
+
+    'update' => array(
+        'error'   => 'Component was not updated, please try again',
+        'success' => 'Component updated successfully.'
+    ),
+
+    'delete' => array(
+        'confirm'   => 'Are you sure you wish to delete this component?',
+        'error'   => 'There was an issue deleting the component. Please try again.',
+        'success' => 'The component was deleted successfully.',
+        'error_qty'   => 'Some components of this type are still checked out. Please check them in and try again.',
+    ),
+
+     'checkout' => array(
+        'error'   		=> 'Component was not checked out, please try again',
+        'success' 		=> 'Component checked out successfully.',
+        'user_does_not_exist' => 'That user is invalid. Please try again.',
+        'unavailable'      => 'Not enough components remaining: :remaining remaining, :requested requested ',
+    ),
+
+    'checkin' => array(
+        'error'   		=> 'Component was not checked in, please try again',
+        'success' 		=> 'Component checked in successfully.',
+        'user_does_not_exist' => 'That user is invalid. Please try again.'
+    )
+
+
+);
diff --git a/resources/lang/om-ET/admin/components/table.php b/resources/lang/om-ET/admin/components/table.php
new file mode 100644
index 0000000000..b86cbebcfb
--- /dev/null
+++ b/resources/lang/om-ET/admin/components/table.php
@@ -0,0 +1,5 @@
+<?php
+
+return array(
+    'title'      				=> 'Maqaa Qaamaa',
+);
diff --git a/resources/lang/om-ET/admin/consumables/general.php b/resources/lang/om-ET/admin/consumables/general.php
new file mode 100644
index 0000000000..a0086614d7
--- /dev/null
+++ b/resources/lang/om-ET/admin/consumables/general.php
@@ -0,0 +1,12 @@
+<?php
+
+return array(
+    'checkout'                          => 'Checkout Consumable to User',
+    'consumable_name'                   => 'Consumable Name',
+    'create'                            => 'Create Consumable',
+    'item_no'                           => 'Item No.',
+    'remaining' 			            => 'Remaining',
+    'total' 			                => 'Ida\'am Walii galaa',
+    'update'                            => 'Update Consumable',
+    'inventory_warning'                 => 'The inventory of this consumable is below the minimum amount of :min_count',
+);
diff --git a/resources/lang/om-ET/admin/consumables/message.php b/resources/lang/om-ET/admin/consumables/message.php
new file mode 100644
index 0000000000..e2591503bf
--- /dev/null
+++ b/resources/lang/om-ET/admin/consumables/message.php
@@ -0,0 +1,38 @@
+<?php
+
+return array(
+
+    'invalid_category_type' => 'The category must be a consumable category.',
+    'does_not_exist' => 'Consumable does not exist.',
+
+    'create' => array(
+        'error'   => 'Consumable was not created, please try again.',
+        'success' => 'Consumable created successfully.'
+    ),
+
+    'update' => array(
+        'error'   => 'Consumable was not updated, please try again',
+        'success' => 'Consumable updated successfully.'
+    ),
+
+    'delete' => array(
+        'confirm'   => 'Are you sure you wish to delete this consumable?',
+        'error'   => 'There was an issue deleting the consumable. Please try again.',
+        'success' => 'The consumable was deleted successfully.'
+    ),
+
+     'checkout' => array(
+        'error'   		=> 'Consumable was not checked out, please try again',
+        'success' 		=> 'Consumable checked out successfully.',
+        'user_does_not_exist' => 'That user is invalid. Please try again.',
+         'unavailable'      => 'There are not enough consumables for this checkout. Please check the quantity left. ',
+    ),
+
+    'checkin' => array(
+        'error'   		=> 'Consumable was not checked in, please try again',
+        'success' 		=> 'Consumable checked in successfully.',
+        'user_does_not_exist' => 'That user is invalid. Please try again.'
+    )
+
+
+);
diff --git a/resources/lang/om-ET/admin/consumables/table.php b/resources/lang/om-ET/admin/consumables/table.php
new file mode 100644
index 0000000000..bb76721f17
--- /dev/null
+++ b/resources/lang/om-ET/admin/consumables/table.php
@@ -0,0 +1,5 @@
+<?php
+
+return array(
+    'title'      				=> 'Consumable Name',
+);
diff --git a/resources/lang/om-ET/admin/custom_fields/general.php b/resources/lang/om-ET/admin/custom_fields/general.php
new file mode 100644
index 0000000000..c9ae61c963
--- /dev/null
+++ b/resources/lang/om-ET/admin/custom_fields/general.php
@@ -0,0 +1,64 @@
+<?php
+
+return [
+    'custom_fields'		        => 'Custom Fields',
+    'manage'                    => 'Manage',
+    'field'		                => 'Field',
+    'about_fieldsets_title'		=> 'About Fieldsets',
+    'about_fieldsets_text'		=> 'Fieldsets allow you to create groups of custom fields that are frequently re-used for specific asset model types.',
+    'custom_format'             => 'Custom Regex format...',
+    'encrypt_field'      	        => 'Encrypt the value of this field in the database',
+    'encrypt_field_help'      => 'WARNING: Encrypting a field makes it unsearchable.',
+    'encrypted'      	        => 'Encrypted',
+    'fieldset'      	        => 'Fieldset',
+    'qty_fields'      	      => 'Qty Fields',
+    'fieldsets'      	        => 'Fieldsets',
+    'fieldset_name'           => 'Fieldset Name',
+    'field_name'              => 'Field Name',
+    'field_values'            => 'Field Values',
+    'field_values_help'       => 'Add selectable options, one per line. Blank lines other than the first line will be ignored.',
+    'field_element'           => 'Form Element',
+    'field_element_short'     => 'Element',
+    'field_format'            => 'Format',
+    'field_custom_format'     => 'Custom Regex Format',
+    'field_custom_format_help'     => 'This field allows you to use a regex expression for validation. It should start with "regex:" - for example, to validate that a custom field value contains a valid IMEI (15 numeric digits), you would use <code>regex:/^[0-9]{15}$/</code>.',
+    'required'   		          => 'Required',
+    'req'   		              => 'Req.',
+    'used_by_models'   		    => 'Used By Models',
+    'order'   		            => 'Order',
+    'create_fieldset'         => 'New Fieldset',
+    'update_fieldset'         => 'Update Fieldset',
+    'fieldset_does_not_exist'   => 'Fieldset :id does not exist',
+    'fieldset_updated'         => 'Fieldset updated',
+    'create_fieldset_title' => 'Create a new fieldset',
+    'create_field'            => 'New Custom Field',
+    'create_field_title' => 'Create a new custom field',
+    'value_encrypted'      	        => 'The value of this field is encrypted in the database. Only admin users will be able to view the decrypted value',
+    'show_in_email'     => 'Include the value of this field in checkout emails sent to the user? Encrypted fields cannot be included in emails',
+    'show_in_email_short' => 'Include in emails',
+    'help_text' => 'Help Text',
+    'help_text_description' => 'This is optional text that will appear below the form elements while editing an asset to provide context on the field.',
+    'about_custom_fields_title' => 'About Custom Fields',
+    'about_custom_fields_text' => 'Custom fields allow you to add arbitrary attributes to assets.',
+    'add_field_to_fieldset' => 'Add Field to Fieldset',
+    'make_optional' => 'Required - click to make optional',
+    'make_required' => 'Optional - click to make required',
+    'reorder' => 'Reorder',
+    'db_field' => 'DB Field',
+    'db_convert_warning' => 'WARNING. This field is in the custom fields table as <code>:db_column</code> but should be <code>:expected</code>.',
+    'is_unique' => 'This value must be unique across all assets',
+    'unique' => 'Unique',
+    'display_in_user_view' => 'Allow the checked out user to view these values in their View Assigned Assets page',
+    'display_in_user_view_table' => 'Visible to User',
+    'auto_add_to_fieldsets' => 'Automatically add this to every new fieldset',
+    'add_to_preexisting_fieldsets' => 'Add to any existing fieldsets',
+    'show_in_listview' => 'Show in list views by default. Authorized users will still be able to show/hide via the column selector',
+    'show_in_listview_short' => 'Show in lists',
+    'show_in_requestable_list_short' => 'Show in requestable assets list',
+    'show_in_requestable_list' => 'Show value in requestable assets list. Encrypted fields will not be shown',
+    'encrypted_options' => 'This field is encrypted, so some display options will not be available.',
+    'display_checkin' => 'Display in checkin forms',
+    'display_checkout' => 'Display in checkout forms',
+    'display_audit' => 'Display in audit forms',
+
+];
diff --git a/resources/lang/om-ET/admin/custom_fields/message.php b/resources/lang/om-ET/admin/custom_fields/message.php
new file mode 100644
index 0000000000..6442359b7f
--- /dev/null
+++ b/resources/lang/om-ET/admin/custom_fields/message.php
@@ -0,0 +1,64 @@
+<?php
+
+return array(
+
+    'field' => array(
+        'invalid'   => 'That field does not exist.',
+        'already_added'   => 'Field already added',
+        'none_selected'   => 'No field selected',
+
+        'create' => array(
+            'error'   => 'Field was not created, please try again.',
+            'success' => 'Field created successfully.',
+            'assoc_success' => 'Field successfully added to fieldset.'
+        ),
+
+        'update' => array(
+            'error'   => 'Field was not updated, please try again',
+            'success' => 'Field updated successfully.'
+        ),
+
+        'delete' => array(
+            'confirm'   	=> 'Are you sure you wish to delete this field?',
+            'error'   => 'There was an issue deleting the field. Please try again.',
+            'success' => 'The field was deleted successfully.',
+            'in_use'   => 'Field is still in use.',
+        )
+
+    ),
+
+    'fieldset' => array(
+
+        'does_not_exist' => 'Fieldset does not exist',
+
+        'create' => array(
+            'error'   => 'Fieldset was not created, please try again.',
+            'success' => 'Fieldset created successfully.'
+        ),
+
+        'update' => array(
+            'error'   => 'Fieldset was not updated, please try again',
+            'success' => 'Fieldset updated successfully.'
+        ),
+
+        'delete' => array(
+            'confirm'   	=> 'Are you sure you wish to delete this fieldset?',
+            'error'   => 'There was an issue deleting the fieldset. Please try again.',
+            'success' => 'The fieldset was deleted successfully.',
+            'in_use'   => 'Fieldset is still in use.',
+        )
+
+    ),
+
+    'fieldset_default_value' => array(
+
+        'error' => 'Error validating default fieldset values.',
+
+    ),
+
+
+
+
+
+
+);
diff --git a/resources/lang/om-ET/admin/departments/message.php b/resources/lang/om-ET/admin/departments/message.php
new file mode 100644
index 0000000000..2e371348b9
--- /dev/null
+++ b/resources/lang/om-ET/admin/departments/message.php
@@ -0,0 +1,22 @@
+<?php
+
+return array(
+
+    'does_not_exist' => 'Department does not exist.',
+    'department_already_exists' => 'A department already exists with that name at this company location. Or choose a more specific name for this department. ',
+    'assoc_users'	 => 'This department is currently associated with at least one user and cannot be deleted. Please update your users to no longer reference this department and try again. ',
+    'create' => array(
+        'error'   => 'Department was not created, please try again.',
+        'success' => 'Department created successfully.'
+    ),
+    'update' => array(
+        'error'   => 'Department was not updated, please try again',
+        'success' => 'Department updated successfully.'
+    ),
+    'delete' => array(
+        'confirm'   	=> 'Are you sure you wish to delete this department?',
+        'error'   => 'There was an issue deleting the department. Please try again.',
+        'success' => 'The department was deleted successfully.'
+    )
+
+);
diff --git a/resources/lang/om-ET/admin/departments/table.php b/resources/lang/om-ET/admin/departments/table.php
new file mode 100644
index 0000000000..cbcfee8666
--- /dev/null
+++ b/resources/lang/om-ET/admin/departments/table.php
@@ -0,0 +1,11 @@
+<?php
+
+return array(
+
+    'id'                        => 'Eenyumeessituu',
+    'name'                      => 'Department Name',
+    'manager'                   => 'Manager',
+    'location'                  => 'Location',
+    'create'                    => 'Create Department',
+    'update'                    => 'Update Department',
+    );
diff --git a/resources/lang/om-ET/admin/depreciations/general.php b/resources/lang/om-ET/admin/depreciations/general.php
new file mode 100644
index 0000000000..dde92b3504
--- /dev/null
+++ b/resources/lang/om-ET/admin/depreciations/general.php
@@ -0,0 +1,20 @@
+<?php
+
+return [
+    'about_asset_depreciations'  			=> 'About Asset Depreciations',
+    'about_depreciations'  					=> 'You can set up asset depreciations to depreciate assets based on straight-line depreciation.',
+    'asset_depreciations'  					=> 'Asset Depreciations',
+    'create'  					            => 'Create Depreciation',
+    'depreciation_name'  					=> 'Depreciation Name',
+    'depreciation_min'                      => 'Floor Value of Depreciation',
+    'number_of_months'  					=> 'Number of Months',
+    'update'  					            => 'Update Depreciation',
+    'depreciation_min'                      => 'Minimum Value after Depreciation',
+    'no_depreciations_warning'               => '<strong>Warning: </strong>
+                      You do not currently have any depreciations set up.
+                      Please set up at least one depreciation to view the depreciation report.',
+    'depreciation_method'                   => 'Gabaasa Baay\'ina',
+    'linear_depreciation'                   => 'Linear (Default)',
+    'half_1'                                => 'Half-year convention, always applied',
+    'half_2'                                => 'Half-year convention, applied with condition',
+];
diff --git a/resources/lang/om-ET/admin/depreciations/message.php b/resources/lang/om-ET/admin/depreciations/message.php
new file mode 100644
index 0000000000..c20e52c13c
--- /dev/null
+++ b/resources/lang/om-ET/admin/depreciations/message.php
@@ -0,0 +1,25 @@
+<?php
+
+return array(
+
+    'does_not_exist' => 'Depreciation class does not exist.',
+    'assoc_users'	 => 'This depreciation is currently associated with one or more models and cannot be deleted. Please delete the models, and then try deleting again. ',
+
+
+    'create' => array(
+        'error'   => 'Depreciation class was not created, please try again. :(',
+        'success' => 'Depreciation class created successfully. :)'
+    ),
+
+    'update' => array(
+        'error'   => 'Depreciation class was not updated, please try again',
+        'success' => 'Depreciation class updated successfully.'
+    ),
+
+    'delete' => array(
+        'confirm'   => 'Are you sure you wish to delete this depreciation class?',
+        'error'   => 'There was an issue deleting the depreciation class. Please try again.',
+        'success' => 'The depreciation class was deleted successfully.'
+    )
+
+);
diff --git a/resources/lang/om-ET/admin/depreciations/table.php b/resources/lang/om-ET/admin/depreciations/table.php
new file mode 100644
index 0000000000..ccdb86bb86
--- /dev/null
+++ b/resources/lang/om-ET/admin/depreciations/table.php
@@ -0,0 +1,11 @@
+<?php
+
+return [
+
+    'id'      => 'Eenyumeessituu',
+    'months'   => 'Months',
+    'term'   => 'Term',
+    'title'      => 'Name ',
+    'depreciation_min' => 'Floor Value',
+
+];
diff --git a/resources/lang/om-ET/admin/groups/message.php b/resources/lang/om-ET/admin/groups/message.php
new file mode 100644
index 0000000000..495acaf36b
--- /dev/null
+++ b/resources/lang/om-ET/admin/groups/message.php
@@ -0,0 +1,22 @@
+<?php
+
+return array(
+
+    'group_exists'        => 'Group already exists!',
+    'group_not_found'     => 'Group ID :id does not exist.',
+    'group_name_required' => 'The name field is required',
+
+    'success' => array(
+        'create' => 'Group was successfully created.',
+        'update' => 'Group was successfully updated.',
+        'delete' => 'Group was successfully deleted.',
+    ),
+
+    'delete' => array(
+        'confirm'   => 'Are you sure you wish to delete this group?',
+        'create' => 'There was an issue creating the group. Please try again.',
+        'update' => 'There was an issue updating the group. Please try again.',
+        'delete' => 'There was an issue deleting the group. Please try again.',
+    ),
+
+);
diff --git a/resources/lang/om-ET/admin/groups/table.php b/resources/lang/om-ET/admin/groups/table.php
new file mode 100644
index 0000000000..61f060a116
--- /dev/null
+++ b/resources/lang/om-ET/admin/groups/table.php
@@ -0,0 +1,9 @@
+<?php
+
+return array(
+
+    'id'         => 'Id',
+    'name'       => 'Name',
+    'users'      => '# of Users',
+
+);
diff --git a/resources/lang/om-ET/admin/groups/titles.php b/resources/lang/om-ET/admin/groups/titles.php
new file mode 100644
index 0000000000..d875f190d7
--- /dev/null
+++ b/resources/lang/om-ET/admin/groups/titles.php
@@ -0,0 +1,16 @@
+<?php
+
+return [
+    'about_groups_title'            => 'About Groups',
+    'about_groups'                  => 'Groups are used to generalize user permissions.',
+    'group_management' 	 	=> 'Group Management',
+    'create' 	 	 	    => 'Create New Group',
+    'update' 	 		        => 'Edit Group',
+    'group_name' 	 		=> 'Group Name',
+    'group_admin' 	 		=> 'Group Admin',
+    'allow' 	 			=> 'Allow',
+    'deny' 	 				=> 'Deny',
+    'permission'            => 'Permission',
+    'grant'                 => 'Grant',
+    'no_permissions'        => 'This group has no permissions.'
+];
diff --git a/resources/lang/om-ET/admin/hardware/form.php b/resources/lang/om-ET/admin/hardware/form.php
new file mode 100644
index 0000000000..0e2a689230
--- /dev/null
+++ b/resources/lang/om-ET/admin/hardware/form.php
@@ -0,0 +1,65 @@
+<?php
+
+return [
+    'bulk_delete'		=> 'Confirm Bulk Delete Assets',
+    'bulk_restore'      => 'Confirm Bulk Restore Assets', 
+  'bulk_delete_help'	=> 'Review the assets for bulk deletion below. Once deleted, these assets can be restored, but they will no longer be associated with any users they are currently assigned to.',
+  'bulk_restore_help'	=> 'Review the assets for bulk restoration below. Once restored, these assets will not be associated with any users they were previously assigned to.',
+  'bulk_delete_warn'	=> 'You are about to delete :asset_count assets.',
+  'bulk_restore_warn'	=> 'You are about to restore :asset_count assets.',
+    'bulk_update'		=> 'Bulk Update Assets',
+    'bulk_update_help'	=> 'This form allows you to update multiple assets at once. Only fill in the fields you need to change. Any fields left blank will remain unchanged. ',
+    'bulk_update_warn'	=> 'You are about to edit the properties of a single asset.|You are about to edit the properties of :asset_count assets.',
+    'bulk_update_with_custom_field' => 'Note the assets are :asset_model_count different types of models.',
+    'bulk_update_model_prefix' => 'On Models', 
+    'bulk_update_custom_field_unique' => 'This is a unique field and can not be bulk edited.',
+    'checkedout_to'		=> 'Checked Out To',
+    'checkout_date'		=> 'Checkout Date',
+    'checkin_date'		=> 'Checkin Date',
+    'checkout_to'		=> 'Checkout to',
+    'cost'				=> 'Purchase Cost',
+    'create'			=> 'Create Asset',
+    'date'				=> 'Purchase Date',
+    'depreciation'	    => 'Baay\'ina',
+    'depreciates_on'	=> 'Depreciates On',
+    'default_location'	=> 'Default Location',
+    'default_location_phone' => 'Default Location Phone',
+    'eol_date'			=> 'EOL Date',
+    'eol_rate'			=> 'EOL Rate',
+    'expected_checkin'  => 'Expected Checkin Date',
+    'expires'			=> 'Expires',
+    'fully_depreciated'	=> 'Fully Depreciated',
+    'help_checkout'		=> 'If you wish to assign this asset immediately, select "Ready to Deploy" from the status list above. ',
+    'mac_address'		=> 'MAC Address',
+    'manufacturer'		=> 'Manufacturer',
+    'model'				=> 'Model',
+    'months'			=> 'months',
+    'name'				=> 'Asset Name',
+    'notes'				=> 'Notes',
+    'order'				=> 'Order Number',
+    'qr'				=> 'QR Code',
+    'requestable'		=> 'Users may request this asset',
+    'redirect_to_all'   => 'Return to all :type',
+    'redirect_to_type'   => 'Go to :type',
+    'redirect_to_checked_out_to'   => 'Go to Checked Out to',
+    'select_statustype'	=> 'Select Status Type',
+    'serial'			=> 'Serial',
+    'status'			=> 'Status',
+    'tag'				=> 'Asset Tag',
+    'update'			=> 'Asset Update',
+    'warranty'			=> 'Warranty',
+        'warranty_expires'		=> 'Warranty Expires',
+    'years'				=> 'years',
+    'asset_location' => 'Update Asset Location',
+    'asset_location_update_default_current' => 'Update default location AND actual location',
+    'asset_location_update_default' => 'Update only default location',
+    'asset_location_update_actual' => 'Update only actual location',
+    'asset_not_deployable' => 'That asset status is not deployable. This asset cannot be checked out.',
+    'asset_not_deployable_checkin' => 'That asset status is not deployable. Using this status label will checkin the asset.',
+    'asset_deployable' => 'This asset can be checked out.',
+    'processing_spinner' => 'Processing... (This might take a bit of time on large files)',
+    'processing' => 'Processing... ',
+    'optional_infos'  => 'Optional Information',
+    'order_details'   => 'Order Related Information',
+    'calc_eol'    => 'If nulling the EOL date, use automatic EOL calculation based on the purchase date and EOL rate.',
+];
diff --git a/resources/lang/om-ET/admin/hardware/general.php b/resources/lang/om-ET/admin/hardware/general.php
new file mode 100644
index 0000000000..4697508489
--- /dev/null
+++ b/resources/lang/om-ET/admin/hardware/general.php
@@ -0,0 +1,42 @@
+<?php
+
+return [
+    'about_assets_title'           => 'About Assets',
+    'about_assets_text'            => 'Assets are items tracked by serial number or asset tag.  They tend to be higher value items where identifying a specific item matters.',
+    'archived'  				=> 'Archived',
+    'asset'  					=> 'Asset',
+    'bulk_checkout'             => 'Checkout Giga',
+    'bulk_checkin'              => 'Bulk Checkin',
+    'checkin'  					=> 'Checkin Asset',
+    'checkout'  				=> 'Checkout Asset',
+    'clone'  					=> 'Clone Asset',
+    'deployable'  				=> 'Deployable',
+    'deleted'  					=> 'This asset has been deleted.',
+    'delete_confirm'            => 'Are you sure you want to delete this asset?',
+    'edit'  					=> 'Edit Asset',
+    'model_deleted'  			=> 'This Assets model has been deleted. You must restore the model before you can restore the Asset.',
+    'model_invalid'             => 'This model for this asset is invalid.',
+    'model_invalid_fix'         => 'The asset must be updated use a valid asset model before attempting to check it in or out, or to audit it.',
+    'requestable'               => 'Requestable',
+    'requested'				    => 'Gaafatame',
+    'not_requestable'           => 'Not Requestable',
+    'requestable_status_warning' => 'Do not change requestable status',
+    'restore'  					=> 'Restore Asset',
+    'pending'  					=> 'Harka qhoofaa',
+    'undeployable'  			=> 'Undeployable',
+    'undeployable_tooltip'  	=> 'This asset has a status label that is undeployable and cannot be checked out at this time.',
+    'view'  					=> 'View Asset',
+    'csv_error' => 'You have an error in your CSV file:',
+    'import_text' => '<p>Upload a CSV that contains asset history. The assets and users MUST already exist in the system, or they will be skipped. Matching assets for history import happens against the asset tag. We will try to find a matching user based on the user\'s name you provide, and the criteria you select below. If you do not select any criteria below, it will simply try to match on the username format you configured in the <code>Admin &gt; General Settings</code>.</p><p>Fields included in the CSV must match the headers: <strong>Asset Tag, Name, Checkout Date, Checkin Date</strong>. Any additional fields will be ignored. </p><p>Checkin Date: blank or future checkin dates will checkout items to associated user.  Excluding the Checkin Date column will create a checkin date with todays date.</p>    ',
+    'csv_import_match_f-l' => 'Try to match users by <strong>firstname.lastname</strong> (<code>jane.smith</code>) format',
+    'csv_import_match_initial_last' => 'Try to match users by <strong>first initial last name</strong> (<code>jsmith</code>) format',
+    'csv_import_match_first' => 'Try to match users by <strong>first name</strong> (<code>jane</code>) format',
+    'csv_import_match_email' => 'Try to match users by <strong>email</strong> as username',
+    'csv_import_match_username' => 'Try to match users by <strong>username</strong>',
+    'error_messages' => 'Error messages:',
+    'success_messages' => 'Success messages:',
+    'alert_details' => 'Please see below for details.',
+    'custom_export' => 'Custom Export',
+    'mfg_warranty_lookup' => ':manufacturer Warranty Status Lookup',
+    'user_department' => 'User Department',
+];
diff --git a/resources/lang/om-ET/admin/hardware/message.php b/resources/lang/om-ET/admin/hardware/message.php
new file mode 100644
index 0000000000..c19bc63647
--- /dev/null
+++ b/resources/lang/om-ET/admin/hardware/message.php
@@ -0,0 +1,109 @@
+<?php
+
+return [
+
+    'undeployable' 		 => '<strong>Warning: </strong> This asset has been marked as currently undeployable. If this status has changed, please update the asset status.',
+    'does_not_exist' 	 => 'Asset does not exist.',
+    'does_not_exist_var' => 'Asset with tag :asset_tag not found.',
+    'no_tag' 	         => 'No asset tag provided.',
+    'does_not_exist_or_not_requestable' => 'That asset does not exist or is not requestable.',
+    'assoc_users'	 	 => 'This asset is currently checked out to a user and cannot be deleted. Please check the asset in first, and then try deleting again. ',
+    'warning_audit_date_mismatch' 	=> 'This asset\'s next audit date (:next_audit_date) is before the last audit date (:last_audit_date). Please update the next audit date.',
+    'labels_generated'   => 'Labels were successfully generated.',
+    'error_generating_labels' => 'Error while generating labels.',
+    'no_assets_selected' => 'No assets selected.',
+
+    'create' => [
+        'error'   		=> 'Asset was not created, please try again. :(',
+        'success' 		=> 'Asset created successfully. :)',
+        'success_linked' => 'Asset with tag :tag was created successfully. <strong><a href=":link" style="color: white;">Click here to view</a></strong>.',
+        'multi_success_linked' => 'Asset with tag :links was created successfully.|:count assets were created succesfully. :links.',
+        'partial_failure' => 'An asset was unable to be created. Reason: :failures|:count assets were unable to be created. Reasons: :failures',
+    ],
+
+    'update' => [
+        'error'   			=> 'Asset was not updated, please try again',
+        'success' 			=> 'Asset updated successfully.',
+        'encrypted_warning' => 'Asset updated successfully, but encrypted custom fields were not due to permissions',
+        'nothing_updated'	=>  'No fields were selected, so nothing was updated.',
+        'no_assets_selected'  =>  'No assets were selected, so nothing was updated.',
+        'assets_do_not_exist_or_are_invalid' => 'Selected assets cannot be updated.',
+    ],
+
+    'restore' => [
+        'error'   		=> 'Asset was not restored, please try again',
+        'success' 		=> 'Asset restored successfully.',
+        'bulk_success' 		=> 'Asset restored successfully.',
+        'nothing_updated'   => 'No assets were selected, so nothing was restored.', 
+    ],
+
+    'audit' => [
+        'error'   		=> 'Asset audit unsuccessful: :error ',
+        'success' 		=> 'Asset audit successfully logged.',
+    ],
+
+
+    'deletefile' => [
+        'error'   => 'File not deleted. Please try again.',
+        'success' => 'File successfully deleted.',
+    ],
+
+    'upload' => [
+        'error'   => 'File(s) not uploaded. Please try again.',
+        'success' => 'File(s) successfully uploaded.',
+        'nofiles' => 'You did not select any files for upload, or the file you are trying to upload is too large',
+        'invalidfiles' => 'One or more of your files is too large or is a filetype that is not allowed. Allowed filetypes are png, gif, jpg, doc, docx, pdf, and txt.',
+    ],
+
+    'import' => [
+        'import_button'         => 'Process Import',
+        'error'                 => 'Some items did not import correctly.',
+        'errorDetail'           => 'The following Items were not imported because of errors.',
+        'success'               => 'Your file has been imported',
+        'file_delete_success'   => 'Your file has been been successfully deleted',
+        'file_delete_error'      => 'The file was unable to be deleted',
+        'file_missing' => 'The file selected is missing',
+        'file_already_deleted' => 'The file selected was already deleted',
+        'header_row_has_malformed_characters' => 'One or more attributes in the header row contain malformed UTF-8 characters',
+        'content_row_has_malformed_characters' => 'One or more attributes in the first row of content contain malformed UTF-8 characters',
+        'transliterate_failure' => 'Transliteration from :encoding to UTF-8 failed due to invalid characters in input'
+    ],
+
+
+    'delete' => [
+        'confirm'   	=> 'Are you sure you wish to delete this asset?',
+        'error'   		=> 'There was an issue deleting the asset. Please try again.',
+        'assigned_to_error' => '{1}Asset Tag: :asset_tag is currently checked out. Check in this device before deletion.|[2,*]Asset Tags: :asset_tag are currently checked out. Check in these devices before deletion.',
+        'nothing_updated'   => 'No assets were selected, so nothing was deleted.',
+        'success' 		=> 'The asset was deleted successfully.',
+    ],
+
+    'checkout' => [
+        'error'   		=> 'Asset was not checked out, please try again',
+        'success' 		=> 'Asset checked out successfully.',
+        'user_does_not_exist' => 'That user is invalid. Please try again.',
+        'not_available' => 'That asset is not available for checkout!',
+        'no_assets_selected' => 'You must select at least one asset from the list',
+    ],
+
+    'multi-checkout' => [
+        'error'   => 'Asset was not checked out, please try again|Assets were not checked out, please try again',
+        'success' => 'Asset checked out successfully.|Assets checked out successfully.',
+    ],
+
+    'checkin' => [
+        'error'   		=> 'Asset was not checked in, please try again',
+        'success' 		=> 'Asset checked in successfully.',
+        'user_does_not_exist' => 'That user is invalid. Please try again.',
+        'already_checked_in'  => 'That asset is already checked in.',
+
+    ],
+
+    'requests' => [
+        'error'   		=> 'Request was not successful, please try again.',
+        'success' 		=> 'Request successfully submitted.',
+        'canceled'      => 'Request successfully canceled.',
+        'cancel'        => 'Cancel this item request',
+    ],
+
+];
diff --git a/resources/lang/om-ET/admin/hardware/table.php b/resources/lang/om-ET/admin/hardware/table.php
new file mode 100644
index 0000000000..5a2399474f
--- /dev/null
+++ b/resources/lang/om-ET/admin/hardware/table.php
@@ -0,0 +1,32 @@
+<?php
+
+return [
+
+    'asset_tag'   	=> 'Asset Tag',
+    'asset_model'       => 'Model',
+    'assigned_to'   => 'Assigned To',
+    'book_value'  	=> 'Current Value',
+    'change' 		=> 'In/Out',
+    'checkout_date' => 'Checkout Date',
+    'checkoutto' 	=> 'Checked Out',
+    'components_cost' => 'Total Components Cost',
+    'current_value' => 'Current Value',
+    'diff' 			=> 'Diff',
+    'dl_csv' 		=> 'Download CSV',
+    'eol' 			=> 'EOL',
+    'id'      		=> 'Eenyumeessituu',
+    'last_checkin_date' => 'Last Checkin Date',
+    'location' 		=> 'Location',
+    'purchase_cost'	=> 'Cost',
+    'purchase_date'	=> 'Purchased',
+    'serial'   		=> 'Serial',
+    'status'   		=> 'Status',
+    'title'      	=> 'Asset ',
+    'image'		    => 'Device Image',
+    'days_without_acceptance' => 'Days Without Acceptance',
+    'monthly_depreciation' => 'Monthly Depreciation',
+    'requesting_user' => 'Requesting User',
+    'requested_date' => 'Guyyaa gaafatame',
+    'changed'       => 'Changed',
+    'icon' => 'Icon',
+];
diff --git a/resources/lang/om-ET/admin/kits/general.php b/resources/lang/om-ET/admin/kits/general.php
new file mode 100644
index 0000000000..2b5c2d9cd0
--- /dev/null
+++ b/resources/lang/om-ET/admin/kits/general.php
@@ -0,0 +1,51 @@
+<?php
+
+return [
+    'about_kits_title'                  => 'About Predefined Kits',
+    'about_kits_text'                   => 'Predefined Kits let you quickly check out a collection of items (assets, licenses, etc) to a user. This can be helpful when your onboarding process is consistent across many users and all users receive the same items.',
+    'checkout'                          => 'Checkout Kit ',
+    'create_success'                    => 'Kit was successfully created.',
+    'create'                            => 'Create Predefined Kit',
+    'update'                            => 'Update Predefined Kit',
+    'delete_success'                    => 'Kit was successfully deleted.',
+    'update_success'                    => 'Kit was successfully updated.',
+    'none_models'                       => 'There are not enough available assets for :model to checkout. :qty are required. ',
+    'none_licenses'                     => 'There are not enough available seats for :license to checkout. :qty are required. ',
+    'none_consumables'                  => 'There are not enough available units of :consumable to checkout. :qty are required. ',
+    'none_accessory'                    => 'There are not enough available units of :accessory to checkout. :qty are required. ',
+    'append_accessory'                  => 'Append Accessory',
+    'update_appended_accessory'         => 'Update appended Accessory',
+    'append_consumable'                 => 'Append Consumable',
+    'update_appended_consumable'        => 'Update appended Consumable',
+    'append_license'                    => 'Append license',
+    'update_appended_license'           => 'Update appended license',
+    'append_model'                      => 'Append model',
+    'update_appended_model'             => 'Update appended model',
+    'license_error'                     => 'License already attached to kit',
+    'license_added_success'             => 'License added successfully',
+    'license_updated'                   => 'License was successfully updated',
+    'license_none'                      => 'License does not exist',
+    'license_detached'                  => 'License was successfully detached',
+    'consumable_added_success'          => 'Consumable added successfully',
+    'consumable_updated'                => 'Consumable was successfully updated',
+    'consumable_error'                  => 'Consumable already attached to kit',
+    'consumable_deleted'                => 'Delete was successful',
+    'consumable_none'                   => 'Consumable does not exist',
+    'consumable_detached'               => 'Consumable was successfully detached',
+    'accessory_added_success'           => 'Accessory added successfully',
+    'accessory_updated'                 => 'Accessory was successfully updated',
+    'accessory_detached'                => 'Accessory was successfully detached',
+    'accessory_error'                   => 'Accessory already attached to kit',
+    'accessory_deleted'                 => 'Delete was successful',
+    'accessory_none'                    => 'The accessory does not exist',
+    'checkout_success'                  => 'Checkout was successful',
+    'checkout_error'                    => 'Checkout error',
+    'kit_none'                          => 'Kit does not exist',
+    'kit_created'                       => 'Kit was successfully created',
+    'kit_updated'                       => 'Kit was successfully updated',
+    'kit_not_found'                     => 'Kit not found',
+    'kit_deleted'                       => 'Kit was successfully deleted',
+    'kit_model_updated'                 => 'Model was successfully updated',
+    'kit_model_detached'                => 'Model was successfully detached',
+    'model_already_attached'            => 'Model already attached to kit',
+];
diff --git a/resources/lang/om-ET/admin/labels/message.php b/resources/lang/om-ET/admin/labels/message.php
new file mode 100644
index 0000000000..96785f0754
--- /dev/null
+++ b/resources/lang/om-ET/admin/labels/message.php
@@ -0,0 +1,11 @@
+<?php
+
+return [
+
+    'invalid_return_count' => 'Invalid count returned from :name. Expected :expected, got :actual.',
+    'invalid_return_type'  => 'Invalid type returned from :name. Expected :expected, got :actual.',
+    'invalid_return_value' => 'Invalid value returned from :name. Expected :expected, got :actual.',
+
+    'does_not_exist' => 'Label does not exist',
+    
+];
diff --git a/resources/lang/om-ET/admin/labels/table.php b/resources/lang/om-ET/admin/labels/table.php
new file mode 100644
index 0000000000..bef4ba170e
--- /dev/null
+++ b/resources/lang/om-ET/admin/labels/table.php
@@ -0,0 +1,19 @@
+<?php
+
+return [
+    'example_company'    => 'Test Company Limited',
+    'example_defaultloc' => 'Building 1',
+    'example_category'   => 'Test Category',
+    'example_location'   => 'Building 2',
+    'example_manufacturer'  => 'Test Manufacturing Inc.',
+    'example_model'      => 'Test Model',
+    'example_supplier'   => 'Test Company Limited',
+    'labels_per_page'    => 'Labels',
+    'support_fields'     => 'Fields',
+    'support_asset_tag'  => 'Tag',
+    'support_1d_barcode' => '1D',
+    'support_2d_barcode' => '2D',
+    'support_logo'       => 'Logo',
+    'support_title'      => 'Title',
+
+];
\ No newline at end of file
diff --git a/resources/lang/om-ET/admin/licenses/form.php b/resources/lang/om-ET/admin/licenses/form.php
new file mode 100644
index 0000000000..ce29167874
--- /dev/null
+++ b/resources/lang/om-ET/admin/licenses/form.php
@@ -0,0 +1,22 @@
+<?php
+
+return array(
+
+    'asset'             => 'Asset',
+    'checkin'           => 'Checkin',
+    'create'            => 'Create License',
+    'expiration'        => 'Expiration Date',
+    'license_key'       => 'Product Key',
+    'maintained'        => 'Maintained',
+    'name'              => 'Software Name',
+    'no_depreciation'   => 'Do Not Depreciate',
+    'purchase_order'    => 'Purchase Order Number',
+    'reassignable'      => 'Reassignable',
+    'remaining_seats'   => 'Remaining Seats',
+    'seats'             => 'Seats',
+    'termination_date'  => 'Termination Date',
+    'to_email'          => 'Licensed to Email',
+    'to_name'           => 'Licensed to Name',
+    'update'            => 'Update License',
+    'checkout_help'     => 'You must check a license out to a hardware asset or a person. You can select both, but the owner of the asset must match the person you\'re checking the asset out to.'
+);
diff --git a/resources/lang/om-ET/admin/licenses/general.php b/resources/lang/om-ET/admin/licenses/general.php
new file mode 100644
index 0000000000..b39030afd4
--- /dev/null
+++ b/resources/lang/om-ET/admin/licenses/general.php
@@ -0,0 +1,52 @@
+<?php
+
+return array(
+    'about_licenses_title'      => 'About Licenses',
+    'about_licenses'            => 'Licenses are used to track software.  They have a specified number of seats that can be checked out to individuals',
+    'checkin'  					=> 'Checkin License Seat',
+    'checkout_history'  		=> 'Checkout History',
+    'checkout'  				=> 'Checkout License Seat',
+    'edit'  					=> 'Edit License',
+    'filetype_info'				=> 'Allowed filetypes are png, gif, jpg, jpeg, doc, docx, pdf, txt, zip, and rar.',
+    'clone'  					=> 'Clone License',
+    'history_for'  				=> 'History for ',
+    'in_out'  					=> 'In/Out',
+    'info'  					=> 'License Info',
+    'license_seats'  			=> 'License Seats',
+    'seat'  					=> 'Seat',
+    'seat_count'  				=> 'Seat :count',
+    'seats'  					=> 'Seats',
+    'software_licenses'  		=> 'Software Licenses',
+    'user'  					=> 'User',
+    'view'  					=> 'View License',
+    'delete_disabled'           => 'This license cannot be deleted yet because some seats are still checked out.',
+    'bulk'                      =>
+        [
+            'checkin_all'           => [
+                'button'            => 'Checkin All Seats',
+                'modal'             => 'This action will checkin one seat. | This action will checkin all :checkedout_seats_count seats for this license.',
+                'enabled_tooltip'   => 'Checkin ALL seats for this license from both users and assets',
+                'disabled_tooltip'  => 'This is disabled because there are no seats currently checked out',
+                'disabled_tooltip_reassignable'  => 'This is disabled because the License is not reassignable',
+                'success'           => 'License successfully checked in! | All licenses were successfully checked in!',
+                'log_msg'           => 'Checked in via bulk license checkin in license GUI',
+            ],
+
+            'checkout_all'              => [
+                'button'                => 'Checkout All Seats',
+                'modal'                 => 'This action will checkout one seat to the first available user. | This action will checkout all :available_seats_count seats to the first available users. A user is considered available for this seat if they do not already have this license checked out to them, and the Auto-Assign License property is enabled on their user account.',
+                'enabled_tooltip'   => 'Checkout ALL seats (or as many as are available) to ALL users',
+                'disabled_tooltip'  => 'This is disabled because there are no seats currently available',
+                'success'           => 'License successfully checked out! | :count licenses were successfully checked out!',
+                'error_no_seats'    => 'There are no remaining seats left for this license.',
+                'warn_not_enough_seats'    => ':count users were assigned this license, but we ran out of available license seats.',
+                'warn_no_avail_users'    => 'Nothing to do. There are no users who do not already have this license assigned to them.',
+                'log_msg'           => 'Checked out via bulk license checkout in license GUI',
+
+
+            ],
+    ],
+
+    'below_threshold' => 'There are only :remaining_count seats left for this license with a minimum quantity of :min_amt. You may want to consider purchasing more seats.',
+    'below_threshold_short' => 'This item is below the minimum required quantity.',
+);
diff --git a/resources/lang/om-ET/admin/licenses/message.php b/resources/lang/om-ET/admin/licenses/message.php
new file mode 100644
index 0000000000..74e1d7af5a
--- /dev/null
+++ b/resources/lang/om-ET/admin/licenses/message.php
@@ -0,0 +1,57 @@
+<?php
+
+return array(
+
+    'does_not_exist' => 'License does not exist or you do not have permission to view it.',
+    'user_does_not_exist' => 'User does not exist or you do not have permission to view them.',
+    'asset_does_not_exist' 	=> 'The asset you are trying to associate with this license does not exist.',
+    'owner_doesnt_match_asset' => 'The asset you are trying to associate with this license is owned by somene other than the person selected in the assigned to dropdown.',
+    'assoc_users'	 => 'This license is currently checked out to a user and cannot be deleted. Please check the license in first, and then try deleting again. ',
+    'select_asset_or_person' => 'You must select an asset or a user, but not both.',
+    'not_found' => 'License not found',
+    'seats_available' => ':seat_count seats available',
+
+
+    'create' => array(
+        'error'   => 'License was not created, please try again.',
+        'success' => 'License created successfully.'
+    ),
+
+    'deletefile' => array(
+        'error'   => 'File not deleted. Please try again.',
+        'success' => 'File successfully deleted.',
+    ),
+
+    'upload' => array(
+        'error'   => 'File(s) not uploaded. Please try again.',
+        'success' => 'File(s) successfully uploaded.',
+        'nofiles' => 'You did not select any files for upload, or the file you are trying to upload is too large',
+        'invalidfiles' => 'One or more of your files is too large or is a filetype that is not allowed. Allowed filetypes are png, gif, jpg, jpeg, doc, docx, pdf, txt, zip, rar, rtf, xml, and lic.',
+    ),
+
+    'update' => array(
+        'error'   => 'License was not updated, please try again',
+        'success' => 'License updated successfully.'
+    ),
+
+    'delete' => array(
+        'confirm'   => 'Are you sure you wish to delete this license?',
+        'error'   => 'There was an issue deleting the license. Please try again.',
+        'success' => 'The license was deleted successfully.'
+    ),
+
+    'checkout' => array(
+        'error'   => 'There was an issue checking out the license. Please try again.',
+        'success' => 'The license was checked out successfully',
+        'not_enough_seats' => 'Not enough license seats available for checkout',
+        'mismatch' => 'The license seat provided does not match the license',
+        'unavailable' => 'This seat is not available for checkout.',
+    ),
+
+    'checkin' => array(
+        'error'   => 'There was an issue checking in the license. Please try again.',
+        'not_reassignable' => 'License not reassignable',
+        'success' => 'The license was checked in successfully'
+    ),
+
+);
diff --git a/resources/lang/om-ET/admin/licenses/table.php b/resources/lang/om-ET/admin/licenses/table.php
new file mode 100644
index 0000000000..b13d48e3ff
--- /dev/null
+++ b/resources/lang/om-ET/admin/licenses/table.php
@@ -0,0 +1,18 @@
+<?php
+
+return array(
+
+    'assigned_to'   	=> 'Assigned To',
+    'checkout'   		=> 'In/Out',
+    'deleted_at'        => 'Deleted at',
+    'id'      			=> 'Eenyumeessituu',
+    'license_email'   	=> 'License Email',
+    'license_name'   	=> 'Licensed To',
+    'purchase_date'   	=> 'Purchase Date',
+    'purchased'   		=> 'Purchased',
+    'seats'   			=> 'Seats',
+    'hardware'   		=> 'Hardware',
+    'serial'   			=> 'Serial',
+    'title'      		=> 'License',
+
+);
diff --git a/resources/lang/om-ET/admin/locations/message.php b/resources/lang/om-ET/admin/locations/message.php
new file mode 100644
index 0000000000..b21c70ad89
--- /dev/null
+++ b/resources/lang/om-ET/admin/locations/message.php
@@ -0,0 +1,35 @@
+<?php
+
+return array(
+
+    'does_not_exist' => 'Location does not exist.',
+    'assoc_users'    => 'This location is not currently deletable because it is the location of record for at least one asset or user, has assets assigned to it, or is the parent location of another location. Please update your records to no longer reference this location and try again ',
+    'assoc_assets'	 => 'This location is currently associated with at least one asset and cannot be deleted. Please update your assets to no longer reference this location and try again. ',
+    'assoc_child_loc'	 => 'This location is currently the parent of at least one child location and cannot be deleted. Please update your locations to no longer reference this location and try again. ',
+    'assigned_assets' => 'Assigned Assets',
+    'current_location' => 'Current Location',
+    'open_map' => 'Open in :map_provider_icon Maps',
+
+
+    'create' => array(
+        'error'   => 'Location was not created, please try again.',
+        'success' => 'Location created successfully.'
+    ),
+
+    'update' => array(
+        'error'   => 'Location was not updated, please try again',
+        'success' => 'Location updated successfully.'
+    ),
+
+    'restore' => array(
+        'error'   => 'Location was not restored, please try again',
+        'success' => 'Location restored successfully.'
+    ),
+
+    'delete' => array(
+        'confirm'   	=> 'Are you sure you wish to delete this location?',
+        'error'   => 'There was an issue deleting the location. Please try again.',
+        'success' => 'The location was deleted successfully.'
+    )
+
+);
diff --git a/resources/lang/om-ET/admin/locations/table.php b/resources/lang/om-ET/admin/locations/table.php
new file mode 100644
index 0000000000..577adae7f4
--- /dev/null
+++ b/resources/lang/om-ET/admin/locations/table.php
@@ -0,0 +1,43 @@
+<?php
+
+return [
+    'about_locations_title'     => 'About Locations',
+    'about_locations'           => 'Locations are used to track location information for users, assets, and other items',
+    'assets_rtd'                => 'Assets', // This has NEVER meant Assets Retired. I don't know how it keeps getting reverted.
+    'assets_checkedout'         => 'Assets Assigned',
+    'id'                        => 'Eenyumeessituu',
+    'city'                      => 'City',
+    'state'                     => 'State',
+    'country'                   => 'Country',
+    'create'                    => 'Create Location',
+    'update'                    => 'Update Location',
+    'print_assigned'            => 'Print Assigned',
+    'print_all_assigned'        => 'Print All Assigned',
+    'name'                      => 'Location Name',
+    'address'                   => 'Address',
+    'address2'                   => 'Address Line 2',
+    'zip'                       => 'Postal Code',
+    'locations'                 => 'Locations',
+    'parent'                    => 'Parent',
+    'currency'                  => 'Location Currency',
+    'ldap_ou'                   => 'LDAP Search OU',
+    'user_name'                 => 'User Name',
+    'department'                => 'Waldaa',
+    'location'                  => 'Location',
+    'asset_tag'                 => 'Assets Tag',
+    'asset_name'                => 'Name',
+    'asset_category'            => 'Kitaaba',
+    'asset_manufacturer'        => 'Manufacturer',
+    'asset_model'               => 'Model',
+    'asset_serial'              => 'Serial',
+    'asset_location'            => 'Location',
+    'asset_checked_out'         => 'Checked Out',
+    'asset_expected_checkin'    => 'Expected Checkin',
+    'date'                      => 'Date:',
+    'phone'                     => 'Location Phone',
+    'signed_by_asset_auditor'   => 'Signed By (Asset Auditor):',
+    'signed_by_finance_auditor' => 'Signed By (Finance Auditor):',
+    'signed_by_location_manager' => 'Signed By (Location Manager):',
+    'signed_by'                 => 'Signed Off By:',
+    'clone'  					=> 'Clone Location',
+];
diff --git a/resources/lang/om-ET/admin/manufacturers/message.php b/resources/lang/om-ET/admin/manufacturers/message.php
new file mode 100644
index 0000000000..61416e0230
--- /dev/null
+++ b/resources/lang/om-ET/admin/manufacturers/message.php
@@ -0,0 +1,30 @@
+<?php
+
+return array(
+
+    'support_url_help' => 'Variables <code>{LOCALE}</code>, <code>{SERIAL}</code>, <code>{MODEL_NUMBER}</code>, and <code>{MODEL_NAME}</code> may be used in your URL to have those values auto-populate when viewing assets - for example https://checkcoverage.apple.com/{LOCALE}/{SERIAL}.',
+    'does_not_exist' => 'Manufacturer does not exist.',
+    'assoc_users'	 => 'This manufacturer is currently associated with at least one model and cannot be deleted. Please update your models to no longer reference this manufacturer and try again. ',
+
+    'create' => array(
+        'error'   => 'Manufacturer was not created, please try again.',
+        'success' => 'Manufacturer created successfully.'
+    ),
+
+    'update' => array(
+        'error'   => 'Manufacturer was not updated, please try again',
+        'success' => 'Manufacturer updated successfully.'
+    ),
+
+    'restore' => array(
+        'error'   => 'Manufacturer was not restored, please try again',
+        'success' => 'Manufacturer restored successfully.'
+    ),
+
+    'delete' => array(
+        'confirm'   => 'Are you sure you wish to delete this manufacturer?',
+        'error'   => 'There was an issue deleting the manufacturer. Please try again.',
+        'success' => 'The Manufacturer was deleted successfully.'
+    )
+
+);
diff --git a/resources/lang/om-ET/admin/manufacturers/table.php b/resources/lang/om-ET/admin/manufacturers/table.php
new file mode 100644
index 0000000000..dbfb960932
--- /dev/null
+++ b/resources/lang/om-ET/admin/manufacturers/table.php
@@ -0,0 +1,16 @@
+<?php
+
+return array(
+    'about_manufacturers_title'    => 'About manufacturers',
+    'about_manufacturers_text'  => 'Manufacturers are the companies that create your assets. You can store important support contact information about them here, which will be displayed on your asset detail pages.',
+    'asset_manufacturers'	=> 'Asset Manufacturers',
+    'create'				=> 'Create Manufacturer',
+    'id'   					=> 'Eenyumeessituu',
+    'name'      			=> 'Name',
+    'support_email'   		=> 'Support Email',
+    'support_phone'   		=> 'Support Phone',
+    'support_url'   		=> 'Support URL',
+    'warranty_lookup_url'   => 'Warranty Lookup URL',
+    'update'				=> 'Update Manufacturer',
+
+);
diff --git a/resources/lang/om-ET/admin/models/general.php b/resources/lang/om-ET/admin/models/general.php
new file mode 100644
index 0000000000..9a61b53fd0
--- /dev/null
+++ b/resources/lang/om-ET/admin/models/general.php
@@ -0,0 +1,18 @@
+<?php
+
+return array(
+    'about_models_title'     => 'About Asset Models',
+    'about_models_text'           => 'Asset Models are a way to group identical assets. "MBP 2013", "IPhone 6s", etc.',
+    'deleted'  					=> 'This model has been deleted.',
+    'bulk_delete'               => 'Bulk Delete Asset Models',
+    'bulk_delete_help'               => 'Use the checkboxes below to confirm the deletion of the selected asset models. Asset models that have assets associated with them cannot be deleted until the assets are associated with a different model.',
+    'bulk_delete_warn'          => 'You are about to delete one asset model.|You are about to delete :model_count asset models.',
+    'restore'                   => 'Restore Model',
+    'requestable'               => 'Users may request this model',
+	'show_mac_address'			      => 'Show MAC address field in assets in this model',
+    'view_deleted'              => 'View Deleted',
+    'view_models'               => 'View Models',
+    'fieldset'                  => 'Fieldset',
+    'no_custom_field'           => 'No custom fields',
+    'add_default_values'        => 'Add default values',
+);
diff --git a/resources/lang/om-ET/admin/models/message.php b/resources/lang/om-ET/admin/models/message.php
new file mode 100644
index 0000000000..ae3bc34eed
--- /dev/null
+++ b/resources/lang/om-ET/admin/models/message.php
@@ -0,0 +1,47 @@
+<?php
+
+return array(
+
+    'deleted' => 'Deleted asset model',
+    'does_not_exist' => 'Model does not exist.',
+    'no_association' => 'WARNING! The asset model for this item is invalid or missing!',
+    'no_association_fix' => 'This will break things in weird and horrible ways. Edit this asset now to assign it a model.',
+    'assoc_users'	 => 'This model is currently associated with one or more assets and cannot be deleted. Please delete the assets, and then try deleting again. ',
+    'invalid_category_type' => 'This category must be an asset category.',
+
+    'create' => array(
+        'error'   => 'Model was not created, please try again.',
+        'success' => 'Model created successfully.',
+        'duplicate_set' => 'An asset model with that name, manufacturer and model number already exists.',
+    ),
+
+    'update' => array(
+        'error'   => 'Model was not updated, please try again',
+        'success' => 'Model updated successfully.',
+    ),
+
+    'delete' => array(
+        'confirm'   => 'Are you sure you wish to delete this asset model?',
+        'error'   => 'There was an issue deleting the model. Please try again.',
+        'success' => 'The model was deleted successfully.'
+    ),
+
+    'restore' => array(
+        'error'   		=> 'Model was not restored, please try again',
+        'success' 		=> 'Model restored successfully.'
+    ),
+
+    'bulkedit' => array(
+        'error'   		=> 'No fields were changed, so nothing was updated.',
+        'success' 		=> 'Model successfully updated. |:model_count models successfully updated.',
+        'warn'          => 'You are about to update the properties of the following model:|You are about to edit the properties of the following :model_count models:',
+
+    ),
+
+    'bulkdelete' => array(
+        'error'   		    => 'No models were selected, so nothing was deleted.',
+        'success' 		    => 'Model deleted!|:success_count models deleted!',
+        'success_partial' 	=> ':success_count model(s) were deleted, however :fail_count were unable to be deleted because they still have assets associated with them.'
+    ),
+
+);
diff --git a/resources/lang/om-ET/admin/models/table.php b/resources/lang/om-ET/admin/models/table.php
new file mode 100644
index 0000000000..11a512b3d3
--- /dev/null
+++ b/resources/lang/om-ET/admin/models/table.php
@@ -0,0 +1,17 @@
+<?php
+
+return array(
+
+    'create'				=> 'Create Asset Model',
+    'created_at' 			=> 'Created at',
+    'eol'	 				=> 'EOL',
+    'modelnumber'   		=> 'Model No.',
+    'name'      			=> 'Asset Model Name',
+    'numassets' 			=> 'Assets',
+    'title'					=> 'Asset Models',
+    'update'				=> 'Update Asset Model',
+    'view'					=> 'View Asset Model',
+    'update'				=> 'Update Asset Model',
+    'clone'				=> 'Clone Model',
+    'edit'				=> 'Edit Model',
+);
diff --git a/resources/lang/om-ET/admin/reports/general.php b/resources/lang/om-ET/admin/reports/general.php
new file mode 100644
index 0000000000..ed8bf1a156
--- /dev/null
+++ b/resources/lang/om-ET/admin/reports/general.php
@@ -0,0 +1,23 @@
+<?php
+
+return [
+    'info'   => 'Select the options you want for your asset report.',
+    'deleted_user' => 'Deleted user',
+    'send_reminder' => 'Send reminder',
+    'cannot_send_reminder' => 'User has been deleted or does not have an email address so cannot receive a reminder',
+    'reminder_sent' => 'Reminder sent',
+    'acceptance_deleted' => 'Acceptance request deleted',
+    'acceptance_request' => 'Acceptance request',
+    'custom_export' => [
+        'user_address' => 'User Address',
+        'user_city' => 'User City',
+        'user_state' => 'User State',
+        'user_country' => 'User Country',
+        'user_zip' => 'User Zip'
+    ],
+    'open_saved_template' => 'Open Saved Template',
+    'save_template' =>  'Save Template',
+    'select_a_template' => 'Select a Template',
+    'template_name' => 'Template Name',
+    'update_template' => 'Update Template',
+];
diff --git a/resources/lang/om-ET/admin/reports/message.php b/resources/lang/om-ET/admin/reports/message.php
new file mode 100644
index 0000000000..2800bbdf0b
--- /dev/null
+++ b/resources/lang/om-ET/admin/reports/message.php
@@ -0,0 +1,16 @@
+<?php
+
+return [
+    'about_templates' => 'About Saved Templates',
+    'saving_templates_description' => 'Select your options, then enter the name of your template in the box above and click the \'Save Template\' button. Use the dropdown to select a previously saved template.',
+    'create'  => [
+        'success' => 'Template saved successfully',
+    ],
+    'update' => [
+        'success' => 'Template updated successfully',
+    ],
+    'delete' => [
+        'success' => 'Template deleted',
+        'no_delete_permission' => 'Template does not exist or you do not have permission to delete it.',
+    ],
+];
diff --git a/resources/lang/om-ET/admin/settings/general.php b/resources/lang/om-ET/admin/settings/general.php
new file mode 100644
index 0000000000..cae4853277
--- /dev/null
+++ b/resources/lang/om-ET/admin/settings/general.php
@@ -0,0 +1,489 @@
+<?php
+
+return [
+    'ad'				        => 'Active Directory',
+    'ad_domain'				    => 'Active Directory domain',
+    'ad_domain_help'			=> 'This is sometimes the same as your email domain, but not always.',
+    'ad_append_domain_label'    => 'Append domain name',
+    'ad_append_domain'          => 'Append domain name to username field',
+    'ad_append_domain_help'     => 'User isn\'t required to write "username@domain.local", they can just type "username".',
+    'admin_cc_email'            => 'CC Email',
+    'admin_cc_email_help'       => 'Send a copy of checkin/checkout emails to this address.',
+    'admin_settings'            => 'Admin Settings',
+    'is_ad'				        => 'This is an Active Directory server',
+    'alerts'                	=> 'Alerts',
+    'alert_title'               => 'Update Notification Settings',
+    'alert_email'				=> 'Send alerts to',
+    'alert_email_help'          => 'Email addresses or distribution lists you want alerts to be sent to, comma separated.',
+    'alerts_enabled'			=> 'Email Alerts Enabled',
+    'alert_interval'			=> 'Expiring Alerts Threshold (in days)',
+    'alert_inv_threshold'		=> 'Inventory Alert Threshold',
+    'allow_user_skin'           => 'Allow User Skin',
+    'allow_user_skin_help_text' => 'Checking this box will allow a user to override the UI skin with a different one.',
+    'asset_ids'					=> 'Asset IDs',
+    'audit_interval'            => 'Audit Interval',
+    'audit_interval_help'       => 'If you are required to regularly physically audit your assets, enter the interval in months that you use. If you update this value, all of the "next audit dates" for assets with an upcoming audit date will be updated.',
+    'audit_warning_days'        => 'Audit Warning Threshold',
+    'audit_warning_days_help'   => 'How many days in advance should we warn you when assets are due for auditing?',
+    'auto_increment_assets'		=> 'Generate auto-incrementing asset tags',
+    'auto_increment_prefix'		=> 'Prefix (optional)',
+    'auto_incrementing_help'    => 'Enable auto-incrementing asset tags first to set this',
+    'backups'					=> 'Backups',
+    'backups_help'              => 'Create, download, and restore backups ',
+    'backups_restoring'         => 'Restoring from Backup',
+    'backups_clean' => 'Clean the backed-up database before restore',
+    'backups_clean_helptext' => "This can be useful if you're changing between database versions",
+    'backups_upload'            => 'Upload Backup',
+    'backups_path'              => 'Backups on the server are stored in <code>:path</code>',
+    'backups_restore_warning'   => 'Use the restore button <small><span class="btn btn-xs btn-warning"><i class="text-white fas fa-retweet" aria-hidden="true"></i></span></small> to restore from a previous backup. (This does not currently work with S3 file storage or Docker.)<br><br>Your <strong>entire :app_name database and any uploaded files will be completely replaced</strong> by what\'s in the backup file  ',
+    'backups_logged_out'         => 'All existing users, including you, will be logged out once your restore is complete.',
+    'backups_large'             => 'Very large backups may time out on the restore attempt and may still need to be run via command line. ',
+    'barcode_settings'			=> 'Barcode Settings',
+    'confirm_purge'			    => 'Confirm Purge',
+    'confirm_purge_help'		=> 'Enter the text "DELETE" in the box below to purge your deleted records. This action cannot be undone and will PERMANENTLY delete all soft-deleted items and users. (You should make a backup first, just to be safe.)',
+    'custom_css'				=> 'Custom CSS',
+    'custom_css_placeholder'	=> 'Add your custom CSS',
+    'custom_css_help'			=> 'Enter any custom CSS overrides you would like to use. Do not include the &lt;style&gt;&lt;/style&gt; tags.',
+    'custom_forgot_pass_url'	=> 'Custom Password Reset URL',
+    'custom_forgot_pass_url_help'	=> 'This replaces the built-in forgotten password URL on the login screen, useful to direct people to internal or hosted LDAP password reset functionality. It will effectively disable local user forgotten password functionality.',
+    'dashboard_message'			=> 'Dashboard Message',
+    'dashboard_message_help'	=> 'This text will appear on the dashboard for anyone with permission to view the dashboard.',
+    'default_currency'  		=> 'Default Currency',
+    'default_eula_text'			=> 'Default EULA',
+    'default_eula_text_placeholder' => 'Add your default EULA text',
+    'default_language'			=> 'Default Language',
+    'default_eula_help_text'	=> 'You can also associate custom EULAs to specific asset categories.',
+    'acceptance_note'           => 'Add a note for your decision (Optional)',
+    'display_asset_name'        => 'Display Asset Name',
+    'display_checkout_date'     => 'Display Checkout Date',
+    'display_eol'               => 'Display EOL in table view',
+    'display_qr'                => 'Display 2D barcode',
+    'display_alt_barcode'		=> 'Display 1D barcode',
+    'barcode_type'				=> '2D Barcode Type',
+    'alt_barcode_type'			=> '1D barcode type',
+    'enabled'                   => 'Enabled',
+    'eula_settings'				=> 'EULA Settings',
+    'eula_markdown'				=> 'This EULA allows <a href="https://help.github.com/articles/github-flavored-markdown/">Github flavored markdown</a>.',
+    'empty_row_count'           => 'Field Start Offset (Empty Rows)',
+    'empty_row_count_help'      => 'Fields will begin populating after this many empty rows are skipped at the top of the label.',
+    'favicon'                   => 'Favicon',
+    'favicon_format'            => 'Accepted filetypes are ico, png, and gif. Other image formats may not work in all browsers.',
+    'favicon_size'          => 'Favicons should be square images, 16x16 pixels.',
+    'footer_text'               => 'Additional Footer Text ',
+    'footer_text_help'          => 'This text will appear in the right-side footer. Links are allowed using <a href="https://help.github.com/articles/github-flavored-markdown/">Github flavored markdown</a>. Line breaks, headers, images, etc may result in unpredictable results.',
+    'footer_text_placeholder'   => 'Optional footer text',
+    'general_settings'			=> 'General Settings',
+    'general_settings_help'     => 'Default EULA and more',
+    'generate_backup'			=> 'Generate Backup',
+    'google_workspaces'         => 'Google Workspaces',
+    'header_color'              => 'Header Color',
+    'info'                      => 'These settings let you customize certain aspects of your installation.',
+    'label_logo_size'           => 'Square logos look best - will be displayed in the top right of each asset label. ',
+    'laravel'                   => 'Laravel Version',
+    'ldap'                      => 'LDAP',
+    'ldap_default_group'        => 'Default Permissions Group',
+    'ldap_default_group_info'   => 'Select a group to assign to newly synced users. Remember that a user takes on the permissions of the group they are assigned.',
+    'no_default_group'          => 'No Default Group',
+    'ldap_help'                 => 'LDAP/Active Directory',
+    'ldap_client_tls_key'       => 'LDAP Client TLS Key',
+    'ldap_client_tls_cert'      => 'LDAP Client-Side TLS Certificate',
+    'ldap_enabled'              => 'LDAP enabled',
+    'ldap_integration'          => 'LDAP Integration',
+    'ldap_settings'             => 'LDAP Settings',
+    'ldap_client_tls_cert_help' => 'Client-Side TLS Certificate and Key for LDAP connections are usually only useful in Google Workspace configurations with "Secure LDAP." Both are required.',
+    'ldap_location'             => 'LDAP Location',
+'ldap_location_help'             => 'The Ldap Location field should be used if <strong>an OU is not being used in the Base Bind DN.</strong> Leave this blank if an OU search is being used.',
+    'ldap_login_test_help'      => 'Enter a valid LDAP username and password from the base DN you specified above to test whether your LDAP login is configured correctly. YOU MUST SAVE YOUR UPDATED LDAP SETTINGS FIRST.',
+    'ldap_login_sync_help'      => 'This only tests that LDAP can sync correctly. If your LDAP Authentication query is not correct, users may still not be able to login. YOU MUST SAVE YOUR UPDATED LDAP SETTINGS FIRST.',
+    'ldap_manager'              => 'LDAP Manager',
+    'ldap_server'               => 'LDAP Server',
+    'ldap_server_help'          => 'This should start with ldap:// (for unencrypted) or ldaps:// (for TLS or SSL)',
+    'ldap_server_cert'			=> 'LDAP SSL certificate validation',
+    'ldap_server_cert_ignore'	=> 'Allow invalid SSL Certificate',
+    'ldap_server_cert_help'		=> 'Select this checkbox if you are using a self signed SSL cert and would like to accept an invalid SSL certificate.',
+    'ldap_tls'                  => 'Use TLS',
+    'ldap_tls_help'             => 'This should be checked only if you are running STARTTLS on your LDAP server. ',
+    'ldap_uname'                => 'LDAP Bind Username',
+    'ldap_dept'                 => 'LDAP Department',
+    'ldap_phone'                => 'LDAP Telephone Number',
+    'ldap_jobtitle'             => 'LDAP Job Title',
+    'ldap_country'              => 'LDAP Country',
+    'ldap_pword'                => 'LDAP Bind Password',
+    'ldap_basedn'               => 'Base Bind DN',
+    'ldap_filter'               => 'LDAP Filter',
+    'ldap_pw_sync'              => 'Cache LDAP Passwords',
+    'ldap_pw_sync_help'         => 'Uncheck this box if you do not wish to keep LDAP passwords cached as local hashed passwords. Disabling this means that your users may not be able to login if your LDAP server is unreachable for some reason.',
+    'ldap_username_field'       => 'Username Field',
+    'ldap_lname_field'          => 'Last Name',
+    'ldap_fname_field'          => 'LDAP First Name',
+    'ldap_auth_filter_query'    => 'LDAP Authentication query',
+    'ldap_version'              => 'LDAP Version',
+    'ldap_active_flag'          => 'LDAP Active Flag',
+    'ldap_activated_flag_help'  => 'This value is used to determine whether a synced user can login to Snipe-IT. <strong>It does not affect the ability to check items in or out to them</strong>, and should be the <strong>attribute name</strong> within your AD/LDAP, <strong>not the value</strong>. <br><br>If this field is set to a field name that does not exist in your AD/LDAP, or the value in the AD/LDAP field is set to <code>0</code> or <code>false</code>, <strong>user login will be disabled</strong>. If the value in the AD/LDAP field is set to <code>1</code> or <code>true</code> or <em>any other text</em> means the user can log in. When the field is blank in your AD, we respect the <code>userAccountControl</code> attribute, which usually allows non-suspended users to log in.',
+    'ldap_invert_active_flag'   => 'LDAP Invert Active Flag',
+    'ldap_invert_active_flag_help'     => 'If enabled: when the value returned by LDAP Active Flag is <code>0</code> or <code>false</code> the user account will be active.',
+    'ldap_emp_num'              => 'LDAP Employee Number',
+    'ldap_email'                => 'LDAP Email',
+    'ldap_test'                 => 'Test LDAP',
+    'ldap_test_sync'            => 'Test LDAP Synchronization',
+    'license'                   => 'Software License',
+    'load_remote'               => 'Load Remote Avatars',
+    'load_remote_help_text'		=> 'Uncheck this box if your install cannot load scripts from the outside internet. This will prevent Snipe-IT from trying load avatars from Gravatar or other outside sources.',
+    'login'                     => 'Login Attempts',
+    'login_attempt'             => 'Login Attempt',
+    'login_ip'                  => 'IP Address',
+    'login_success'             => 'Success?',
+    'login_user_agent'          => 'User Agent',
+    'login_help'                => 'List of attempted logins',
+    'login_note'                => 'Login Note',
+    'login_note_placeholder'            => "If you do not have a login or have found a device belonging to this company, please call technical support at 888-555-1212. Thank you.",
+    'login_note_help'           => 'Optionally include a few sentences on your login screen, for example to assist people who have found a lost or stolen device. This field accepts <a href="https://help.github.com/articles/github-flavored-markdown/">Github flavored markdown</a>',
+    'login_remote_user_text'    => 'Remote User login options',
+    'login_remote_user_enabled_text' => 'Enable Login with Remote User Header',
+    'login_remote_user_enabled_help' => 'This option enables Authentication via the REMOTE_USER header according to the "Common Gateway Interface (rfc3875)"',
+    'login_common_disabled_text' => 'Disable other authentication mechanisms',
+    'login_common_disabled_help' => 'This option disables other authentication mechanisms. Just enable this option if you are sure that your REMOTE_USER login is already working',
+    'login_remote_user_custom_logout_url_text' => 'Custom logout URL',
+    'login_remote_user_custom_logout_url_help' => 'If a url is provided here, users will get redirected to this URL after the user logs out of Snipe-IT. This is useful to close the user sessions of your Authentication provider correctly.',
+    'login_remote_user_header_name_text' => 'Custom user name header',
+    'login_remote_user_header_name_help' => 'Use the specified header instead of REMOTE_USER',
+    'logo'                    	=> 'Logo',
+    'logo_print_assets'         => 'Use in Print',
+    'logo_print_assets_help'    => 'Use branding on printable asset lists ',
+    'full_multiple_companies_support_help_text' => 'Restricting users (including admins) assigned to companies to their company\'s assets.',
+    'full_multiple_companies_support_text' => 'Full Multiple Companies Support',
+    'scope_locations_fmcs_support_text'  => 'Scope Locations with Full Multiple Companies Support',
+    'scope_locations_fmcs_support_help_text'  => 'Restrict locations to their selected company.',
+    'scope_locations_fmcs_check_button' => 'Check Compatibility',
+    'scope_locations_fmcs_support_disabled_text'  => 'This option is disabled because you have conflicting locations set for :count or more items.',
+    'show_in_model_list'   => 'Show in Model Dropdowns',
+    'optional'					=> 'optional',
+    'per_page'                  => 'Results Per Page',
+    'php'                       => 'PHP Version',
+    'php_info'                  => 'PHP info',
+    'php_overview'              => 'PHP',
+    'php_overview_help'         => 'PHP System info',
+    'php_gd_info'               => 'You must install php-gd to display QR codes, see install instructions.',
+    'php_gd_warning'            => 'PHP Image Processing and GD plugin is NOT installed.',
+    'pwd_secure_complexity'     => 'Password Complexity',
+    'pwd_secure_complexity_help' => 'Select whichever password complexity rules you wish to enforce.',
+    'pwd_secure_complexity_disallow_same_pwd_as_user_fields' => 'Password cannot be the same as first name, last name, email, or username',
+    'pwd_secure_complexity_letters' => 'Require at least one letter',
+    'pwd_secure_complexity_numbers' => 'Require at least one number',
+    'pwd_secure_complexity_symbols' => 'Require at least one symbol',
+    'pwd_secure_complexity_case_diff' => 'Require at least one uppercase and one lowercase',
+    'pwd_secure_min'            => 'Password minimum characters',
+    'pwd_secure_min_help'       => 'Minimum permitted value is 8',
+    'pwd_secure_uncommon'       => 'Prevent common passwords',
+    'pwd_secure_uncommon_help'  => 'This will disallow users from using common passwords from the top 10,000 passwords reported in breaches.',
+    'qr_help'                   => 'Enable QR Codes first to set this',
+    'qr_text'                   => 'QR Code Text',
+    'saml'                      => 'SAML',
+    'saml_title'                => 'Update SAML settings',
+    'saml_help'                 => 'SAML settings',
+    'saml_enabled'              => 'SAML enabled',
+    'saml_integration'          => 'SAML Integration',
+    'saml_sp_entityid'          => 'Entity ID',
+    'saml_sp_acs_url'           => 'Assertion Consumer Service (ACS) URL',
+    'saml_sp_sls_url'           => 'Single Logout Service (SLS) URL',
+    'saml_sp_x509cert'          => 'Public Certificate',
+    'saml_sp_metadata_url'      => 'Metadata URL',
+    'saml_idp_metadata'         => 'SAML IdP Metadata',
+    'saml_idp_metadata_help'    => 'You can specify the IdP metadata using a URL or XML file.',
+    'saml_attr_mapping_username' => 'Attribute Mapping - Username',
+    'saml_attr_mapping_username_help' => 'NameID will be used if attribute mapping is unspecified or invalid.',
+    'saml_forcelogin_label'     => 'SAML Force Login',
+    'saml_forcelogin'           => 'Make SAML the primary login',
+    'saml_forcelogin_help'      => 'You can use \'/login?nosaml\' to get to the normal login page.',
+    'saml_slo_label'            => 'SAML Single Log Out',
+    'saml_slo'                  => 'Send a LogoutRequest to IdP on Logout',
+    'saml_slo_help'             => 'This will cause the user to be first redirected to the IdP on logout. Leave unchecked if the IdP doesn\'t correctly support SP-initiated SAML SLO.',
+    'saml_custom_settings'      => 'SAML Custom Settings',
+    'saml_custom_settings_help' => 'You can specify additional settings to the onelogin/php-saml library. Use at your own risk.',
+    'saml_download'             => 'Download Metadata',
+    'setting'                   => 'Setting',
+    'settings'                  => 'Settings',
+    'show_alerts_in_menu'       => 'Show alerts in top menu',
+    'show_archived_in_list'     => 'Archived Assets',
+    'show_archived_in_list_text'     => 'Show archived assets in the "all assets" listing',
+    'show_assigned_assets'      => 'Show assets assigned to assets',
+    'show_assigned_assets_help' => 'Display assets which were assigned to the other assets in View User -> Assets, View User -> Info -> Print All Assigned and in Account -> View Assigned Assets.',
+    'show_images_in_email'     => 'Show images in emails',
+    'show_images_in_email_help'   => 'Uncheck this box if your Snipe-IT installation is behind a VPN or closed network and users outside the network will not be able to load images served from this installation in their emails.',
+    'site_name'                 => 'Site Name',
+    'integrations'               => 'Integrations',
+    'slack'                     => 'Slack',
+    'general_webhook'           => 'General Webhook',
+    'ms_teams'                  => 'Microsoft Teams',
+    'webhook'                   => ':app',
+    'webhook_presave'           => 'Test to Save',
+    'webhook_title'               => 'Update Webhook Settings',
+    'webhook_help'                => 'Integration settings',
+    'webhook_botname'             => ':app Botname',
+    'webhook_channel'             => ':app Channel',
+    'webhook_endpoint'            => ':app Endpoint',
+    'webhook_integration'         => ':app Settings',
+    'webhook_test'                 =>'Test :app integration',
+    'webhook_integration_help'    => ':app integration is optional, however the endpoint and channel are required if you wish to use it. To configure :app integration, you must first <a href=":webhook_link" target="_new" rel="noopener">create an incoming webhook</a> on your :app account. Click on the <strong>Test :app Integration</strong> button to confirm your settings are correct before saving. ',
+    'webhook_integration_help_button'    => 'Once you have saved your :app information, a test button will appear.',
+    'webhook_test_help'           => 'Test whether your :app integration is configured correctly. YOU MUST SAVE YOUR UPDATED :app SETTINGS FIRST.',
+    'shortcuts_enabled'         => 'Enable Shortcuts',
+    'shortcuts_help_text'       => '<strong>Windows</strong>: Alt + Access key, <strong>Mac</strong>: Control + Option + Access key',
+    'snipe_version'  			=> 'Snipe-IT version',
+    'support_footer'            => 'Support Footer Links ',
+    'support_footer_help'       => 'Specify who sees the links to the Snipe-IT Support info and Users Manual',
+    'version_footer'            => 'Version in Footer ',
+    'version_footer_help'       => 'Specify who sees the Snipe-IT version and build number.',
+    'system'                    => 'System Information',
+    'update'                    => 'Update Settings',
+    'value'                     => 'Value',
+    'brand'                     => 'Branding',
+    'brand_help'                => 'Logo, Site Name',
+    'web_brand'                 => 'Web Branding Type',
+    'about_settings_title'      => 'About Settings',
+    'about_settings_text'       => 'These settings let you customize certain aspects of your installation.',
+    'labels_per_page'           => 'Labels per page',
+    'label_dimensions'          => 'Label dimensions (inches)',
+    'next_auto_tag_base'        => 'Next auto-increment',
+    'page_padding'              => 'Page margins (inches)',
+    'privacy_policy_link'       => 'Link to Privacy Policy',
+    'privacy_policy'            => 'Privacy Policy',
+    'privacy_policy_link_help'  => 'If a url is included here, a link to your privacy policy will be included in the app footer and in any emails that the system sends out, in compliance with GDPR. ',
+    'purge'                     => 'Purge Deleted Records',
+    'purge_deleted'             => 'Purge Deleted ',
+    'labels_display_bgutter'    => 'Label bottom gutter',
+    'labels_display_sgutter'    => 'Label side gutter',
+    'labels_fontsize'           => 'Label font size',
+    'labels_pagewidth'          => 'Label sheet width',
+    'labels_pageheight'         => 'Label sheet height',
+    'label_gutters'        => 'Label spacing (inches)',
+    'page_dimensions'        => 'Page dimensions (inches)',
+    'label_fields'          => 'Label visible fields',
+    'inches'        => 'inches',
+    'width_w'        => 'w',
+    'height_h'        => 'h',
+    'show_url_in_emails'                => 'Link to Snipe-IT in Emails',
+    'show_url_in_emails_help_text'      => 'Uncheck this box if you do not wish to link back to your Snipe-IT installation in your email footers. Useful if most of your users never login. ',
+    'text_pt'        => 'pt',
+    'thumbnail_max_h'   => 'Max thumbnail height',
+    'thumbnail_max_h_help'   => 'Maximum height in pixels that thumbnails may display in the listing view. Min 25, max 500.',
+    'two_factor'        => 'Two Factor Authentication',
+    'two_factor_secret'        => 'Two-Factor Code',
+    'two_factor_enrollment'        => 'Two-Factor Enrollment',
+    'two_factor_enabled_text'        => 'Enable Two Factor',
+    'two_factor_reset'        => 'Reset Two-Factor Secret',
+    'two_factor_reset_help'        => 'This will force the user to enroll their device with their authenticator app again. This can be useful if their currently enrolled device is lost or stolen. ',
+    'two_factor_reset_success'          => 'Two factor device successfully reset',
+    'two_factor_reset_error'          => 'Two factor device reset failed',
+    'two_factor_enabled_warning'        => 'Enabling two-factor if it is not currently enabled will immediately force you to authenticate with a Google Auth enrolled device. You will have the ability to enroll your device if one is not currently enrolled.',
+    'two_factor_enabled_help'        => 'This will turn on two-factor authentication using Google Authenticator.',
+    'two_factor_optional'        => 'Selective (Users can enable or disable if permitted)',
+    'two_factor_required'        => 'Required for all users',
+    'two_factor_disabled'        => 'Disabled',
+    'two_factor_enter_code'	=> 'Enter Two-Factor Code',
+    'two_factor_config_complete'	=> 'Submit Code',
+    'two_factor_enabled_edit_not_allowed' => 'Your administrator does not permit you to edit this setting.',
+    'two_factor_enrollment_text'	=> "Two factor authentication is required, however your device has not been enrolled yet. Open your Google Authenticator app and scan the QR code below to enroll your device. Once you've enrolled your device, enter the code below",
+    'require_accept_signature'      => 'Require Signature',
+    'require_accept_signature_help_text'      => 'Enabling this feature will require users to physically sign off on accepting an asset.',
+    'require_checkinout_notes'  => 'Require Notes on Checkin/Checkout',
+    'require_checkinout_notes_help_text'    => 'Enabling this feature will require the note fields to be populated when checking in or checking out an asset.',
+    'left'        => 'left',
+    'right'        => 'right',
+    'top'        => 'top',
+    'bottom'        => 'bottom',
+    'vertical'        => 'vertical',
+    'horizontal'        => 'horizontal',
+    'unique_serial'                => 'Unique serial numbers',
+    'unique_serial_help_text'                => 'Checking this box will enforce a uniqueness constraint on asset serials',
+    'zerofill_count'        => 'Length of asset tags, including zerofill',
+    'username_format_help'   => 'This setting will only be used by the import process if a username is not provided and we have to generate a username for you.',
+    'oauth_title' => 'OAuth API Settings',
+    'oauth_clients' => 'OAuth Clients',
+    'oauth' => 'OAuth',
+    'oauth_help' => 'Oauth Endpoint Settings',
+    'oauth_no_clients' => 'You have not created any OAuth clients yet.',
+    'oauth_secret' => 'Secret',
+    'oauth_authorized_apps' => 'Authorized Applications',
+    'oauth_redirect_url' => 'Redirect URL',
+    'oauth_name_help' => ' Something your users will recognize and trust.',
+    'oauth_scopes' => 'Scopes',
+    'oauth_callback_url' => 'Your application authorization callback URL.',
+    'create_client' => 'Create Client',
+    'no_scopes' => 'No scopes',
+    'asset_tag_title' => 'Update Asset Tag Settings',
+    'barcode_title' => 'Update Barcode Settings',
+    'barcodes' => 'Barcodes',
+    'barcodes_help_overview' => 'Barcode &amp; QR settings',
+    'barcodes_help' => 'This will attempt to delete cached barcodes. This would typically only be used if your barcode settings have changed, or if your Snipe-IT URL has changed. Barcodes will be re-generated when accessed next.',
+    'barcodes_spinner' => 'Attempting to delete files...',
+    'barcode_delete_cache' => 'Delete Barcode Cache',
+    'branding_title' => 'Update Branding Settings',
+    'general_title' => 'Update General Settings',
+    'mail_test' => 'Send Test',
+    'mail_test_help' => 'This will attempt to send a test mail to :replyto.',
+    'filter_by_keyword' => 'Filter by setting keyword',
+    'security' => 'Security',
+    'security_title' => 'Update Security Settings',
+    'security_help' => 'Two-factor, Password Restrictions',
+    'groups_help' => 'Account permission groups',
+    'localization' => 'Localization',
+    'localization_title' => 'Update Localization Settings',
+    'localization_help' => 'Language, date display',
+    'notifications' => 'Notifications',
+    'notifications_help' => 'Email Alerts & Audit Settings',
+    'asset_tags_help' => 'Incrementing and prefixes',
+    'labels' => 'Labels',
+    'labels_title' => 'Update Label Settings',
+    'labels_help' => 'Barcodes &amp; label settings',
+    'purge_help' => 'Purge Deleted Records',
+    'ldap_extension_warning' => 'It does not look like the LDAP extension is installed or enabled on this server. You can still save your settings, but you will need to enable the LDAP extension for PHP before LDAP syncing or login will work.',
+    'ldap_ad' => 'LDAP/AD',
+    'ldap_test_label' => 'Test LDAP Sync',
+    'ldap_test_login' => ' Test LDAP Login',
+    'ldap_username_placeholder' => 'LDAP Username',
+    'ldap_password_placeholder' => 'LDAP Password',
+    'employee_number' => 'Employee Number',
+    'create_admin_user' => 'Create a User ::',
+    'create_admin_success' => 'Success! Your admin user has been added!',
+    'create_admin_redirect' => 'Click here to go to your app login!',
+    'setup_migrations' => 'Database Migrations ::',
+    'setup_no_migrations' => 'There was nothing to migrate. Your database tables were already set up!',
+    'setup_successful_migrations' => 'Your database tables have been created',
+    'setup_migration_output' => 'Migration output:',
+    'setup_migration_create_user' => 'Next: Create User',
+    'ldap_settings_link' => 'LDAP Settings Page',
+    'slack_test' => 'Test <i class="fab fa-slack"></i> Integration',
+    'status_label_name' => 'Status Label Name',
+    'super_admin_only'  => 'Super Admin Only',
+    'label2_enable'           => 'New Label Engine',
+    'label2_enable_help'      => 'Switch to the new label engine. <b>Note: You will need to save this setting before setting others.</b>',
+    'label2_template'         => 'Template',
+    'label2_template_help'    => 'Select which template to use for label generation',
+    'label2_title'            => 'Title',
+    'label2_title_help'       => 'The title to show on labels that support it',
+    'label2_title_help_phold' => 'The placeholder <code>{COMPANY}</code> will be replaced with the asset&apos;s company name',
+    'label2_asset_logo'       => 'Use Asset Logo',
+    'label2_asset_logo_help'  => 'Use the logo of the asset&apos;s assigned company, rather than the value at <code>:setting_name</code>',
+    'label2_1d_type'          => '1D Barcode Type',
+    'label2_1d_type_help'     => 'Format for 1D barcodes',
+    'label2_2d_type'          => '2D Barcode Type',
+    'label2_2d_type_help'     => 'Format for 2D barcodes',
+    'label2_2d_target'        => '2D Barcode Target',
+    'label2_2d_target_help'   => 'The data that will be contained in the 2D barcode',
+    'label2_fields'           => 'Field Definitions',
+    'label2_fields_help'      => 'Fields can be added, removed, and reordered in the left column. For each field, multiple options for Label and DataSource can be added, removed, and reordered in the right column.',
+    'purge_barcodes' => 'Purge Barcodes',
+    'help_asterisk_bold'    => 'Text entered as <code>**text**</code> will be displayed as bold',
+    'help_blank_to_use'     => 'Leave blank to use the value from <code>:setting_name</code>',
+    'help_default_will_use' => '<code>:default</code> will use the value from <code>:setting_name</code>. <br>Note that the value of the barcodes must comply with the respective barcode spec in order to be successfully generated. Please see <a href="https://snipe-it.readme.io/docs/barcodes">the documentation <i class="fa fa-external-link"></i></a> for more details. ',
+    'asset_id'              => 'Asset ID',
+    'data'               => 'Data',
+    'default'               => 'Default',
+    'none'                  => 'None',
+    'google_callback_help' => 'This should be entered as the callback URL in your Google OAuth app settings in your organization&apos;s <strong><a href="https://console.cloud.google.com/" target="_blank">Google developer console <i class="fa fa-external-link" aria-hidden="true"></i></a></strong>.',
+    'google_login'      => 'Google Workspace Login Settings',
+    'enable_google_login'  => 'Enable users to login with Google Workspace',
+    'enable_google_login_help'  => 'Users will not be automatically provisioned. They must have an existing account here AND in Google Workspace, and their username here must match their Google Workspace email address. ',
+    'mail_reply_to' => 'Mail Reply-To Address',
+    'mail_from' => 'Mail From Address',
+    'database_driver' => 'Database Driver',
+    'bs_table_storage' => 'Table Storage',
+    'timezone' => 'Timezone',
+    'test_mail' => 'Test Mail',
+    'profile_edit'          => 'Edit Profile',
+    'profile_edit_help'          => 'Allow users to edit their own profiles.',
+    'default_avatar' => 'Custom Default Avatar',
+    'default_avatar_help' => 'This image will be displayed as a profile if a user does not have a profile photo.',
+    'restore_default_avatar' => 'Restore <a href=":default_avatar" data-toggle="lightbox" data-type="image">original system default avatar</a>',
+    'restore_default_avatar_help' => '',
+    'due_checkin_days' => 'Due For Checkin Warning',
+    'due_checkin_days_help' => 'How many days before the expected checkin of an asset should it be listed in the "Due for checkin" page?',
+    'no_groups' => 'No groups have been created yet. Visit <code>Admin Settings > Permission Groups</code> to add one.',
+    'text' => 'Text',
+
+    'username_formats' => [
+        'username_format'		=> 'Username Format',
+        'firstname_lastname_format'	=> 'Maqaa Jalqabaa Maqaafi (jane.smith)',
+        'first_name_format'	        => 'First Name (jane)',
+        'last_name_format'		=> 'Last Name (doe)',
+        'filastname_format'			=> 'First Initial Last Name (jsmith)',
+        'lastnamefirstinitial_format' =>  'Last Name First Initial (smithj)',
+        'firstname_lastname_underscore_format' => 'First Name Last Name (jane_smith)',
+        'firstinitial.lastname' => 'First Initial Last Name (j.smith)',
+        'lastname_firstinitial' => 'Last Name First Initial (smith_j)',
+        'lastname_dot_firstinitial_format' => 'Last Name First Initial (smith.j)',
+        'firstnamelastname'     => 'First Name Last Name (janesmith)',
+        'firstnamelastinitial'  => 'First Name Last Initial (janes)',
+        'lastnamefirstname'      => 'Maqaa Maqaa Jalqabaa (smith.jane)',
+    ],
+
+    'email_formats' => [
+        'email_format'			=> 'E-mail Formaata',
+        'firstname_lastname_format'	=> 'Maqaa Jalqabaa Maqaafi (jane.smith@example.com)',
+        'first_name_format'		=> 'Maqaa Jalqabaa (jane@example.com)',
+        'last_name_format'		=> 'Last Name (doe@example.com)',
+        'filastname_format'			=> 'Maqaa Jalqabaa Maqaafi (jsmith@example.com)',
+        'lastnamefirstinitial_format' =>  'Maqaa Maqaa Jalqabaa (smithj@example.com)',
+        'firstname_lastname_underscore_format' => 'Maqaa Jalqabaa Maqaafi (jane_smith@example.com)',
+        'firstinitial.lastname' => 'Maqaa Jalqabaa Maqaafi (j.smith@example.com)',
+        'lastname_firstinitial' => 'Maqaa Maqaa Jalqabaa (smith_j@example.com)',
+        'lastname_dot_firstinitial_format' => 'Maqaa Jalqabaa Maqaafi (smith.j@example.com)',
+        'firstnamelastname'     => 'Maqaa Jalqabaa Maqaafi (janesmith@example.com)',
+        'firstnamelastinitial'  => 'Maqaa Jalqabaa Maqaafi (janes@example.com)',
+        'lastnamefirstname'      => 'Maqaa Maqaa Jalqabaa (smith.jane@example.com)',
+    ],
+
+
+
+    'logo_labels' => [
+        'acceptance_pdf_logo'       => 'PDF Logo',
+        'email_logo'                => 'Email Logo',
+        'label_logo'                => 'Label Logo',
+        'logo'                      => 'Site Logo',
+        'favicon'                   => 'Favicon',
+    ],
+
+    'logo_help' => [
+        'email_logo_size'       => 'Square logos in email look best. ',
+    ],
+
+    'logo_option_types' => [
+        'text' => 'Text',
+        'logo' => 'Logo',
+        'logo_and_text' => 'Logo and Text',
+    ],
+
+
+    'legends' => [
+        'scoping' => 'Scoping',
+        'formats' => 'Default Formats',
+        'profiles' => 'User Profiles',
+        'eula' => 'EULA & Acceptance Preferences',
+        'misc_display' => 'Miscellaneous Display Options',
+        'email' => 'Email Preferences',
+        'checkin' => 'Checkin Preferences',
+        'dashboard' => 'Login & Dashboard Preferences',
+        'misc' => 'Miscellaneous',
+        'logos' => 'Logos & Display',
+        'colors' => 'Colors & Skins',
+        'footer' => 'Footer Preferences',
+        'security' => 'Security Preferences',
+        'general' => 'General',
+        'intervals' => 'Intervals & Thresholds',
+    ],
+
+
+    /* Keywords for settings overview help */
+    'keywords' => [
+        'brand'             => 'footer, logo, print, theme, skin, header, colors, color, css',
+        'general_settings'  => 'company support, signature, acceptance, email format, username format, images, per page, thumbnail, eula, gravatar, tos, dashboard, privacy',
+        'groups'            => 'permissions, permission groups, authorization',
+        'labels'            => 'labels, barcodes, barcode, sheets, print, upc, qr, 1d, 2d',
+        'localization'      => 'localization, currency, local, locale, time zone, timezone, international, internatinalization, language, languages, translation',
+        'php_overview'      => 'phpinfo, system, info',
+        'purge'             => 'permanently delete',
+        'security'          => 'password, passwords, requirements, two factor, two-factor, common passwords, remote login, logout, authentication',
+    ],
+
+];
diff --git a/resources/lang/om-ET/admin/settings/message.php b/resources/lang/om-ET/admin/settings/message.php
new file mode 100644
index 0000000000..58abf14c5c
--- /dev/null
+++ b/resources/lang/om-ET/admin/settings/message.php
@@ -0,0 +1,59 @@
+<?php
+
+return [
+
+    'update' => [
+        'error'                 => 'An error has occurred while updating. ',
+        'success'               => 'Settings updated successfully.',
+    ],
+    'backup' => [
+        'delete_confirm'        => 'Are you sure you would like to delete this backup file? This action cannot be undone. ',
+        'file_deleted'          => 'The backup file was successfully deleted. ',
+        'generated'             => 'A new backup file was successfully created.',
+        'file_not_found'        => 'That backup file could not be found on the server.',
+        'restore_warning'       => 'Yes, restore it. I acknowledge that this will overwrite any existing data currently in the database. This will also log out all of your existing users (including you).',
+        'restore_confirm'       => 'Are you sure you wish to restore your database from :filename?'
+    ],
+    'restore' => [
+        'success'               => 'Your system backup has been restored. Please log in again.'
+    ],
+    'purge' => [
+        'error'     => 'An error has occurred while purging. ',
+        'validation_failed'     => 'Your purge confirmation is incorrect. Please type the word "DELETE" in the confirmation box.',
+        'success'               => 'Deleted records successfully purged.',
+    ],
+    'mail' => [
+        'sending' => 'Sending Test Email...',
+        'success' => 'Mail sent!',
+        'error' => 'Mail could not be sent.',
+        'additional' => 'No additional error message provided. Check your mail settings and your app log.'
+    ],
+    'ldap' => [
+        'testing' => 'Testing LDAP Connection, Binding & Query ...',
+        '500' => '500 Server Error. Please check your server logs for more information.',
+        'error' => 'Something went wrong :(',
+        'sync_success' => 'A sample of 10 users returned from the LDAP server based on your settings:',
+        'testing_authentication' => 'Testing LDAP Authentication...',
+        'authentication_success' => 'User authenticated against LDAP successfully!'
+    ],
+    'labels' => [
+        'null_template' => 'Label template not found. Please select a template.',
+        ],
+    'webhook' => [
+        'sending' => 'Sending :app test message...',
+        'success' => 'Your :webhook_name Integration works!',
+        'success_pt1' => 'Success! Check the ',
+        'success_pt2' => ' channel for your test message, and be sure to click SAVE below to store your settings.',
+        '500' => '500 Server Error.',
+        'error' => 'Something went wrong. :app responded with: :error_message',
+        'error_redirect' => 'ERROR: 301/302 :endpoint returns a redirect. For security reasons, we don’t follow redirects. Please use the actual endpoint.',
+        'error_misc' => 'Something went wrong. :( ',
+        'webhook_fail' => ' webhook notification failed: Check to make sure the URL is still valid.',
+        'webhook_channel_not_found' => ' webhook channel not found.',
+        'ms_teams_deprecation' => 'The selected Microsoft Teams webhook URL will be deprecated Dec 31st, 2025. Please use a workflow URL. Microsoft\'s documentation on creating a workflow can be found <a href="https://support.microsoft.com/en-us/office/create-incoming-webhooks-with-workflows-for-microsoft-teams-8ae491c7-0394-4861-ba59-055e33f75498" target="_blank"> here.</a>',
+    ],
+    'location_scoping' => [
+        'not_saved' => 'Your settings were not saved.',
+        'mismatch' => 'There is 1 item in the database that need your attention before you can enable location scoping.|There are :count items in the database that need your attention before you can enable location scoping.',
+    ],
+];
diff --git a/resources/lang/om-ET/admin/settings/table.php b/resources/lang/om-ET/admin/settings/table.php
new file mode 100644
index 0000000000..22db5c84ed
--- /dev/null
+++ b/resources/lang/om-ET/admin/settings/table.php
@@ -0,0 +1,6 @@
+<?php
+
+return array(
+    'created'   => 'Created',
+    'size' => 'Size',
+);
diff --git a/resources/lang/om-ET/admin/statuslabels/message.php b/resources/lang/om-ET/admin/statuslabels/message.php
new file mode 100644
index 0000000000..b1b4034d0d
--- /dev/null
+++ b/resources/lang/om-ET/admin/statuslabels/message.php
@@ -0,0 +1,32 @@
+<?php
+
+return [
+
+    'does_not_exist' => 'Status Label does not exist.',
+    'deleted_label' => 'Deleted Status Label',
+    'assoc_assets'	 => 'This Status Label is currently associated with at least one Asset and cannot be deleted. Please update your assets to no longer reference this status and try again. ',
+
+    'create' => [
+        'error'   => 'Status Label was not created, please try again.',
+        'success' => 'Status Label created successfully.',
+    ],
+
+    'update' => [
+        'error'   => 'Status Label was not updated, please try again',
+        'success' => 'Status Label updated successfully.',
+    ],
+
+    'delete' => [
+        'confirm'   => 'Are you sure you wish to delete this Status Label?',
+        'error'   => 'There was an issue deleting the Status Label. Please try again.',
+        'success' => 'The Status Label was deleted successfully.',
+    ],
+
+    'help' => [
+        'undeployable'   => 'These assets cannot be assigned to anyone.',
+        'deployable'   => 'These assets can be checked out. Once they are assigned, they will assume a meta status of <i class="fas fa-circle text-blue"></i> <strong>Deployed</strong>.',
+        'archived'   => 'These assets cannot be checked out, and will only show up in the Archived view. This is useful for retaining information about assets for budgeting/historic purposes but keeping them out of the day-to-day asset list.',
+        'pending'   => 'These assets can not yet be assigned to anyone, often used for items that are out for repair, but are expected to return to circulation.',
+    ],
+
+];
diff --git a/resources/lang/om-ET/admin/statuslabels/table.php b/resources/lang/om-ET/admin/statuslabels/table.php
new file mode 100644
index 0000000000..63edbcfae1
--- /dev/null
+++ b/resources/lang/om-ET/admin/statuslabels/table.php
@@ -0,0 +1,19 @@
+<?php
+
+return array(
+    'about'      	=> 'About Status Types',
+    'archived'      	=> 'Archived',
+    'create'      	=> 'Create Status Label',
+    'color'      	=> 'Chart Color',
+    'default_label' => 'Default Label',
+    'default_label_help' => 'This is used to ensure your most commonly used status labels appear at the top of the select box when creating/editing assets.',
+    'deployable'      	=> 'Deployable',
+    'info'      	=> 'Status label types are used to describe the various states your assets could be in. They may be out for repair, lost/stolen, etc. You can create new status labels for your deployable, pending and archived assets according to your own workflow. For more information, <a href="https://snipe-it.readme.io/docs/overview#status-labels" target="_blank">see the documentation <i class="fa fa-external-link"></i></a>.',
+    'name'      	=> 'Status Name',
+    'pending'      	=> 'Harka qhoofaa',
+    'status_type'   => 'Status Type',
+    'show_in_nav'   => 'Show in side nav',
+    'title'      	=> 'Status Labels',
+    'undeployable'  => 'Undeployable',
+    'update'      	=> 'Update Status Label',
+);
diff --git a/resources/lang/om-ET/admin/suppliers/message.php b/resources/lang/om-ET/admin/suppliers/message.php
new file mode 100644
index 0000000000..a693669c7e
--- /dev/null
+++ b/resources/lang/om-ET/admin/suppliers/message.php
@@ -0,0 +1,28 @@
+<?php
+
+return array(
+
+    'deleted' => 'Deleted supplier',
+    'does_not_exist' => 'Supplier does not exist.',
+
+
+    'create' => array(
+        'error'   => 'Supplier was not created, please try again.',
+        'success' => 'Supplier created successfully.'
+    ),
+
+    'update' => array(
+        'error'   => 'Supplier was not updated, please try again',
+        'success' => 'Supplier updated successfully.'
+    ),
+
+    'delete' => array(
+        'confirm'   => 'Are you sure you wish to delete this supplier?',
+        'error'   => 'There was an issue deleting the supplier. Please try again.',
+        'success' => 'Supplier was deleted successfully.',
+        'assoc_assets'	 => 'This supplier is currently associated with :asset_count asset(s) and cannot be deleted. Please update your assets to no longer reference this supplier and try again. ',
+        'assoc_licenses'	 => 'This supplier is currently associated with :licenses_count licences(s) and cannot be deleted. Please update your licenses to no longer reference this supplier and try again. ',
+        'assoc_maintenances'	 => 'This supplier is currently associated with :asset_maintenances_count asset maintenances(s) and cannot be deleted. Please update your asset maintenances to no longer reference this supplier and try again. ',
+    )
+
+);
diff --git a/resources/lang/om-ET/admin/suppliers/table.php b/resources/lang/om-ET/admin/suppliers/table.php
new file mode 100644
index 0000000000..77c32e154f
--- /dev/null
+++ b/resources/lang/om-ET/admin/suppliers/table.php
@@ -0,0 +1,26 @@
+<?php
+
+return array(
+    'about_suppliers_title' => 'About Suppliers',
+    'about_suppliers_text'  => 'Suppliers are used to track the source of items',
+    'address'               => 'Supplier Address',
+    'assets'                => 'Assets',
+    'city'                  => 'City',
+    'contact'               => 'Contact Name',
+    'country'               => 'Country',
+    'create'                => 'Create Supplier',
+    'email'                 => 'Email',
+    'fax'                   => 'Fax',
+    'id'                    => 'Eenyumeessituu',
+    'licenses'              => ':count Licenses|:count Haqumaa',
+    'name'                  => 'Supplier Name',
+    'notes'                 => 'Notes',
+    'phone'                 => 'Phone',
+    'state'                 => 'State',
+    'suppliers'             => 'Suppliers',
+    'update'                => 'Update Supplier',
+    'view'                  => 'View Supplier',
+    'view_assets_for'       => 'View Assets for',
+    'zip'                   => 'Postal Code',
+
+);
diff --git a/resources/lang/om-ET/admin/users/general.php b/resources/lang/om-ET/admin/users/general.php
new file mode 100644
index 0000000000..14f36cf151
--- /dev/null
+++ b/resources/lang/om-ET/admin/users/general.php
@@ -0,0 +1,56 @@
+<?php
+
+return [
+    'activated_help_text' => 'This user can login',
+    'activated_disabled_help_text' => 'You cannot edit activation status for your own account.',
+    'assets_user'       => 'Assets assigned to :name',
+    'bulk_update_warn'	=> 'You are about to edit the properties of :user_count users. Please note that you cannot change your own user attributes using this form, and must make edits to your own user individually.',
+    'bulk_update_help'	=> 'This form allows you to update multiple users at once. Only fill in the fields you need to change. Any fields left blank will remain unchanged.',
+    'current_assets'    => 'Assets currently checked out to this user',
+    'clone'             => 'Clone User',
+    'contact_user'      => 'Contact :name',
+    'edit'              => 'Edit User',
+    'filetype_info'     => 'Allowed filetypes are png, gif, jpg, jpeg, doc, docx, pdf, txt, zip, and rar.',
+    'history_user'      => 'History for :name',
+    'info'				=> 'Info',
+    'restore_user'		=> 'Click here to restore them.',
+    'last_login'        => 'Last Login',
+    'ldap_config_text'  => 'LDAP configuration settings can be found Admin > Settings. The (optional) selected location will be set for all imported users.',
+    'print_assigned'    => 'Print All Assigned',
+    'email_assigned'    => 'Email List of All Assigned',
+    'user_notified'     => 'User has been emailed a list of their currently assigned items.',
+    'users_notified'    => 'The user has been emailed a list of their currently assigned items.|:count users have been emailed a list of their currently assigned items.',
+    'users_notified_warning' => ':count user has been emailed a list of their currently assigned items, however :no_email users did not have an email address so could not be emailed.|:count users have been emailed a list of their currently assigned items, however :no_email user(s) did not have an email address so could not be emailed.',
+    'auto_assign_label' => 'Include this user when auto-assigning eligible licenses',
+    'auto_assign_help'  => 'Skip this user in auto assignment of licenses',
+    'software_user'     => 'Software Checked out to :name',
+    'send_email_help'   => 'You must provide an email address for this user to send them credentials. Emailing credentials can only be done on user creation. Passwords are stored in a one-way hash and cannot be retrieved once saved.',
+    'view_user'         => 'View User :name',
+    'usercsv'           => 'CSV file',
+    'two_factor_admin_optin_help' => 'Your current admin settings allow selective enforcement of two-factor authentication.  ',
+    'two_factor_enrolled' => '2FA Device Enrolled ',
+    'two_factor_active'   => '2FA Active ',
+    'user_deactivated'  => 'User cannot login',
+    'user_activated'  => 'User can login',
+    'activation_status_warning' => 'Do not change activation status',
+    'group_memberships_helpblock' => 'Only superadmins may edit group memberships.',
+    'superadmin_permission_warning' => 'Only superadmins may grant a user superadmin access.',
+    'admin_permission_warning' => 'Only users with admins rights or greater may grant a user admin access.',
+    'remove_group_memberships' => 'Remove Group Memberships',
+    'warning_deletion_information' => 'You are about to checkin ALL items from the :count user(s) listed below. Super admin names are highlighted in red.',
+    'update_user_assets_status' => 'Update all assets for these users to this status',
+    'checkin_user_properties' => 'Check in all properties associated with these users',
+    'remote_label'   => 'This is a remote user',
+    'remote'   => 'Remote',
+    'remote_help' => 'This can be useful if you need to filter by remote users who never or rarely come into your physical locations.',
+    'not_remote_label' => 'This is not a remote user',
+    'vip_label' => 'VIP user',
+    'vip_help' => 'This can be helpful to mark important people in your org if you would like to handle them in special ways.',
+    'create_user' => 'Create a user',
+    'create_user_page_explanation' => 'This is the account information you will use to access the site for the first time.',
+    'email_credentials' => 'Email credentials',
+    'email_credentials_text' => 'Email my credentials to the email address above',
+    'next_save_user' => 'Next: Save User',
+    'all_assigned_list_generation' => 'Generated on:',
+    'email_user_creds_on_create' => 'Email this user their credentials?',
+];
diff --git a/resources/lang/om-ET/admin/users/message.php b/resources/lang/om-ET/admin/users/message.php
new file mode 100644
index 0000000000..b6ddad3aac
--- /dev/null
+++ b/resources/lang/om-ET/admin/users/message.php
@@ -0,0 +1,75 @@
+<?php
+
+return array(
+
+    'accepted'                  => 'You have successfully accepted this asset.',
+    'declined'                  => 'You have successfully declined this asset.',
+    'bulk_manager_warn'	        => 'Your users have been successfully updated, however your manager entry was not saved because the manager you selected was also in the user list to be edited, and users may not be their own manager. Please select your users again, excluding the manager.',
+    'user_exists'               => 'User already exists!',
+    'user_not_found'            => 'User does not exist or you do not have permission view them.',
+    'user_login_required'       => 'The login field is required',
+    'user_has_no_assets_assigned' => 'No assets currently assigned to user.',
+    'user_password_required'    => 'The password is required.',
+    'insufficient_permissions'  => 'Insufficient Permissions.',
+    'user_deleted_warning'      => 'This user has been deleted. You will have to restore this user to edit them or assign them new assets.',
+    'ldap_not_configured'        => 'LDAP integration has not been configured for this installation.',
+    'password_resets_sent'      => 'The selected users who are activated and have a valid email addresses have been sent a password reset link.',
+    'password_reset_sent'       => 'A password reset link has been sent to :email!',
+    'user_has_no_email'         => 'This user does not have an email address in their profile.',
+    'log_record_not_found'        => 'A matching log record for this user could not be found.',
+
+
+    'success' => array(
+        'create'    => 'User was successfully created.',
+        'update'    => 'User was successfully updated.',
+        'update_bulk'    => 'Users were successfully updated!',
+        'delete'    => 'User was successfully deleted.',
+        'ban'       => 'User was successfully banned.',
+        'unban'     => 'User was successfully unbanned.',
+        'suspend'   => 'User was successfully suspended.',
+        'unsuspend' => 'User was successfully unsuspended.',
+        'restored'  => 'User was successfully restored.',
+        'import'    => 'Users imported successfully.',
+    ),
+
+    'error' => array(
+        'create' => 'There was an issue creating the user. Please try again.',
+        'update' => 'There was an issue updating the user. Please try again.',
+        'delete' => 'There was an issue deleting the user. Please try again.',
+        'delete_has_assets' => 'This user has items assigned and could not be deleted.',
+        'delete_has_assets_var' => 'This user still has an asset assigned. Please check it in first.|This user still has :count assets assigned. Please check their assets in first.',
+        'delete_has_licenses_var' => 'This user still has a license seats assigned. Please check it in first.|This user still has :count license seats assigned. Please check them in first.',
+        'delete_has_accessories_var' => 'This user still has an accessory assigned. Please check it in first.|This user still has :count accessories assigned. Please check their assets in first.',
+        'delete_has_locations_var' => 'This user still manages a location. Please select another manager first.|This user still manages :count locations. Please select another manager first.',
+        'delete_has_users_var' => 'This user still manages another user. Please select another manager for that user first.|This user still manages :count users. Please select another manager for them first.',
+        'unsuspend' => 'There was an issue unsuspending the user. Please try again.',
+        'import'    => 'There was an issue importing users. Please try again.',
+        'asset_already_accepted' => 'This asset has already been accepted.',
+        'accept_or_decline' => 'You must either accept or decline this asset.',
+        'cannot_delete_yourself' => 'We would feel really bad if you deleted yourself, please reconsider.',
+        'incorrect_user_accepted' => 'The asset you have attempted to accept was not checked out to you.',
+        'ldap_could_not_connect' => 'Could not connect to the LDAP server. Please check your LDAP server configuration in the LDAP config file. <br>Error from LDAP Server:',
+        'ldap_could_not_bind' => 'Could not bind to the LDAP server. Please check your LDAP server configuration in the LDAP config file. <br>Error from LDAP Server: ',
+        'ldap_could_not_search' => 'Could not search the LDAP server. Please check your LDAP server configuration in the LDAP config file. <br>Error from LDAP Server:',
+        'ldap_could_not_get_entries' => 'Could not get entries from the LDAP server. Please check your LDAP server configuration in the LDAP config file. <br>Error from LDAP Server:',
+        'password_ldap' => 'The password for this account is managed by LDAP/Active Directory. Please contact your IT department to change your password. ',
+        'multi_company_items_assigned' => 'This user has items assigned that belong to a different company. Please check them in or edit their company.'
+    ),
+
+    'deletefile' => array(
+        'error'   => 'File not deleted. Please try again.',
+        'success' => 'File successfully deleted.',
+    ),
+
+    'upload' => array(
+        'error'   => 'File(s) not uploaded. Please try again.',
+        'success' => 'File(s) successfully uploaded.',
+        'nofiles' => 'You did not select any files for upload',
+        'invalidfiles' => 'One or more of your files is too large or is a filetype that is not allowed. Allowed filetypes are png, gif, jpg, doc, docx, pdf, and txt.',
+    ),
+
+    'inventorynotification' => array(
+        'error'   => 'This user has no email set.',
+        'success' => 'The user has been notified about their current inventory.'
+    )
+);
\ No newline at end of file
diff --git a/resources/lang/om-ET/admin/users/table.php b/resources/lang/om-ET/admin/users/table.php
new file mode 100644
index 0000000000..094cdbc412
--- /dev/null
+++ b/resources/lang/om-ET/admin/users/table.php
@@ -0,0 +1,41 @@
+<?php
+
+return array(
+    'activated'  			=> 'Active',
+    'allow'  				=> 'Allow',
+    'checkedout'  			=> 'Assets',
+    'created_at' 			=> 'Created',
+    'createuser' 			=> 'Create User',
+    'deny'  				=> 'Deny',
+    'email'      			=> 'Email',
+    'employee_num'      	=> 'Employee No.',
+    'first_name' 			=> 'First Name',
+    'groupnotes'			=> 'Select a group to assign to the user, remember that a user takes on the permissions of the group they are assigned. Use ctrl+click (or cmd+click on MacOS) to deselect groups.',
+    'id'         			=> 'Id',
+    'inherit'  				=> 'Inherit',
+    'job' 					=> 'Job Title',
+    'last_login'  			=> 'Last Login',
+    'last_name'  			=> 'Last Name',
+    'location'  			=> 'Location',
+    'lock_passwords'		=> 'Login details cannot be changed on this installation.',
+    'manager' 				=> 'Manager',
+    'managed_locations'     => 'Managed Locations',
+    'managed_users'         => 'Managed Users',
+    'name' 					=> 'Name',
+    'nogroup'               => 'No groups have been created yet. To add one, visit:',
+    'notes'                 => 'Notes',
+    'password_confirm' 		=> 'Confirm Password',
+    'password' 				=> 'Password',
+    'phone'  				=> 'Phone',
+    'show_current'          => 'Show Current Users',
+    'show_deleted'          => 'Show Deleted Users',
+    'title' 				=> 'Title',
+	'to_restore_them'		=> 'to restore them.',
+    'total_assets_cost'     => "Total Assets Cost",
+    'updateuser' 			=> 'Update User',
+    'username' 				=> 'Username',
+	'user_deleted_text' 	=> 'This user has been marked as deleted.',
+    'username_note' 		=> '(This is used for Active Directory binding only, not for login.)',
+    'cloneuser'             => 'Clone User',
+    'viewusers' 			=> 'View Users',
+);
diff --git a/resources/lang/om-ET/auth.php b/resources/lang/om-ET/auth.php
new file mode 100644
index 0000000000..14d8acfce0
--- /dev/null
+++ b/resources/lang/om-ET/auth.php
@@ -0,0 +1,20 @@
+<?php
+
+return array(
+
+    /*
+    |--------------------------------------------------------------------------
+    | Authentication Language Lines
+    |--------------------------------------------------------------------------
+    |
+    | The following language lines are used during authentication for various
+    | messages that we need to display to the user. You are free to modify
+    | these language lines according to your application's requirements.
+    |
+    */
+
+    'failed' => 'These credentials do not match our records.',
+    'password' => 'The provided password is incorrect.',
+    'throttle' => 'Too many login attempts. Please try again in :minutes minute(s).',
+
+);
diff --git a/resources/lang/om-ET/auth/general.php b/resources/lang/om-ET/auth/general.php
new file mode 100644
index 0000000000..2bbd112788
--- /dev/null
+++ b/resources/lang/om-ET/auth/general.php
@@ -0,0 +1,18 @@
+<?php
+
+return [
+    'send_password_link'	        => 'Send Password Reset Link',
+    'email_reset_password'			=> 'Email Password Reset',
+    'reset_password'			    => 'Reset Password',
+    'saml_login'                    => 'Login via SAML',
+    'login'                         => 'Login',
+    'login_prompt'                  => 'Please Login',
+    'forgot_password'               => 'I forgot my password',
+    'ldap_reset_password'           => 'Please click here to reset your LDAP password',
+    'remember_me'                   => 'Remember Me',
+    'username_help_top'                 => 'Enter your <strong>username</strong> to be emailed a password reset link.',
+    'username_help_bottom'          => 'Your username and email address <em>may</em> be the same, but may not be, depending on your configuration. If you cannot remember your username, contact your administrator. <br><br><strong>Usernames without an associated email address will not be emailed a password reset link.</strong> ',
+    'google_login'                  => 'Login with Google Workspace',
+    'google_login_failed'           => 'Google Login failed, please try again.',
+];
+
diff --git a/resources/lang/om-ET/auth/message.php b/resources/lang/om-ET/auth/message.php
new file mode 100644
index 0000000000..08f638d058
--- /dev/null
+++ b/resources/lang/om-ET/auth/message.php
@@ -0,0 +1,45 @@
+<?php
+
+return array(
+
+    'account_already_exists' => 'An account with the this email already exists.',
+    'account_not_found'      => 'The username or password is incorrect.',
+    'account_not_activated'  => 'This user account is not activated.',
+    'account_suspended'      => 'This user account is suspended.',
+
+    'two_factor' => array(
+        'already_enrolled'      => 'Your device is already enrolled.',
+        'success'               => 'You have successfully logged in.',
+        'code_required'         => 'Two-factor code is required.',
+        'invalid_code'          => 'Two-factor code is invalid.',
+        'enter_two_factor_code' => 'Please enter your two-factor authentication code.',
+        'please_enroll'         => 'Please enroll a device in two-factor authentication.',
+    ),
+
+    'signin' => array(
+        'error'   => 'There was a problem while trying to log you in, please try again.',
+        'success' => 'You have successfully logged in.',
+    ),
+
+    'logout' => array(
+        'error'   => 'There was a problem while trying to log you out, please try again.',
+        'success' => 'You have successfully logged out.',
+    ),
+
+    'signup' => array(
+        'error'   => 'There was a problem while trying to create your account, please try again.',
+        'success' => 'Account sucessfully created.',
+    ),
+
+    'forgot-password' => array(
+        'error'   => 'There was a problem while trying to get a reset password code, please try again.',
+        'success' => 'If that email address exists in our system, a password recovery email has been sent.',
+    ),
+
+    'forgot-password-confirm' => array(
+        'error'   => 'There was a problem while trying to reset your password, please try again.',
+        'success' => 'Your password has been successfully reset.',
+    ),
+
+
+);
diff --git a/resources/lang/om-ET/button.php b/resources/lang/om-ET/button.php
new file mode 100644
index 0000000000..a55a6fcf25
--- /dev/null
+++ b/resources/lang/om-ET/button.php
@@ -0,0 +1,34 @@
+<?php
+
+return [
+    'actions' 	                => 'Actions',
+    'add'    	                => 'Add New',
+    'cancel'                    => 'Cancela',
+    'checkin_and_delete'  	    => 'Checkin All / Delete User',
+    'delete'  	                => 'Delete',
+    'edit'    	                => 'Edit',
+    'clone'    	                => 'Clone',
+    'restore' 	                => 'Restore',
+    'remove'                    => 'Remove',
+    'request'                   => 'Request',
+    'submit'  	                => 'Submit',
+    'upload'                    => 'Upload',
+    'select_file'				=> 'Select File...',
+    'select_files'				=> 'Select Files...',
+    'generate_labels'           => '{1} Generate Label|[2,*] Generate Labels',
+    'send_password_link'        => 'Send Password Reset Link',
+    'go'                        => 'Go',
+    'bulk_actions'              => 'Hojii Giga',
+    'add_maintenance'           => 'Add Maintenance',
+    'append'                    => 'Append',
+    'new'                       => 'New',
+    'var' => [
+        'clone'     => 'Clone :item_type',
+        'edit'      => 'Edit :item_type',
+        'delete'    => 'Delete :item_type',
+        'restore'   => 'Restore :item_type',
+        'create'    => 'Create New :item_type',
+        'checkout'  => 'Checkout :item_type',
+        'checkin'   => 'Checkin :item_type',
+    ]
+];
diff --git a/resources/lang/om-ET/general.php b/resources/lang/om-ET/general.php
new file mode 100644
index 0000000000..3f217785fc
--- /dev/null
+++ b/resources/lang/om-ET/general.php
@@ -0,0 +1,629 @@
+<?php
+
+return [
+    '2FA_reset'             => 'Qindaa\'ina 2FA',
+    'accessories'			=> ':count Gabaada|:count Gabaadoota',
+    'activated'			    => 'Aktivaatame',
+    'accepted_date'         => 'Guyyaa Eeyyamame',
+    'accessory'				=> 'Qabeenya',
+    'accessory_report'		=> 'Gabaasa Qabeenya',
+    'action'                => 'Hoji',
+    'activity_report'		=> 'Gabaasa Hojii',
+    'address'				=> 'Teessoo',
+    'admin'					=> 'Qindaa\'ina Bulchaa',
+    'admin_tooltip'			=> 'Namni kuni haala bulchaa qaba',
+    'superuser'				=> 'Superuser',
+    'superuser_tooltip'		=> 'Namni kuni haala superuser qaba',
+    'administrator'			=> 'Bulchaa',
+    'add_seats'             => 'Teessoo Dabaluu',
+    'age'                   => "Umuri",
+    'all_assets'			=> 'Qabeenya Hunda',
+    'all'       			=> 'Hundaa',
+    'archived'              => 'Kitaaba',
+    'asset_models'			=> 'Madda Qabeenya',
+    'asset_model'			=> 'Madda',
+    'asset'					=> 'Qabeenya',
+    'asset_previous'        => 'Asset (Previously Assigned)',
+    'asset_report'          => 'Gabaasa Qabeenya',
+    'asset_tag'				=> 'Teessoo Qabeenya',
+    'asset_tags'            => 'Teessoo Qabeenya',
+    'assets_available'		=> 'Qabeenya argamu',
+    'accept_assets'         => 'Qabeenya Eeyyamu :name',
+    'accept_assets_menu'    => 'Qabeenya Eeyyamu',
+    'accept_item'           => 'Kaa\'i Qabeenya',
+    'audit'				    => 'Qorannoo',
+    'audits'				=> 'Audits',
+    'audit_report'			=> 'Gabaasa Qorannoo',
+    'assets'				=> ':count Qabeenya|:count Qabeenyo',
+    'assets_audited'        => 'Qabeenya qorame',
+    'assets_checked_in_count'     => 'Qabeenya galfame',
+    'assets_checked_out_count'     => 'Qabeenya baafame',
+    'asset_deleted_warning'     => 'Qabeenyi kuni haqame. Nama biraa kennuu dura deebisuu qabda.',
+    'assigned_date'         => 'Guyyaa Kenname',
+    'assigned_to'           => 'Kennameef :name',
+    'assignee'              => 'Kennameef',
+    'avatar_delete'         => 'Gamerra dhaabi',
+    'avatar_upload'         => 'Avatar unka',
+    'back'      			=> 'Deebi\'i',
+    'bad_data'      		=> 'Waan hin argamne. Data badaa ta\'ee?',
+    'bulkaudit'             => 'Qoranno Giga',
+    'bulkaudit_status'      => 'Haala Qorannoo',
+    'bulk_checkout'  		=> 'Checkout Giga',
+    'bulk_edit'             => 'Gabaasa Giga',
+    'bulk_delete'           => 'Haqa Giga',
+    'bulk_actions'          => 'Hojii Giga',
+    'bulk_checkin_delete'   => 'Galfamtoota Haqaa',
+    'byod'                  => 'BYOD',
+    'byod_help'             => 'Meeshaan kuni namni qabu',
+    'bystatus'              => 'Haala',
+    'cancel'  				=> 'Cancela',
+    'categories'			=> 'Kitaabota',
+    'category'				=> 'Kitaaba',
+    'change' 		        => 'Balleessuu',
+    'changeemail'  			=> 'E-mail Address jijjiiruu',
+    'changepassword'  		=> 'Password jijjiiruu',
+    'checkin'  				=> 'Galfama',
+    'checkin_from'  		=> 'Galfama irraa',
+    'checkin_note'  		=> 'Checkin Note',
+    'checkout_note'  		=> 'Checkout Note',
+    'checkout'  			=> 'Baafama',
+    'checkouts_count'       => 'Baafamoota',
+    'checkins_count'        => 'Galfamoota',
+    'checkin_and_delete'  	=> 'Galfama fi Haqa',
+    'user_requests_count'   => 'Dhiyeessa',
+    'city'  				=> 'Magalaa',
+    'click_here'			=> 'As tuqi',
+    'clear_selection'		=> 'Filannoo Qabduu',
+    'companies'			    => 'Daldaltoota',
+    'company'				=> 'Korporatii',
+    'component'			    => 'Qabiyyee',
+    'components'			=> ':count Qabiyyee|:count Qabiyyees',
+    'complete'				=> 'Guutuu',
+    'consumable'			=> 'Gumaa',
+    'consumables'			=> ':count Gumaa|:count Gumoota',
+    'country'  				=> 'Biyya',
+    'could_not_restore'     => 'Dogogora deebi\'ee :item_type: :error',
+    'not_deleted'           => ':item_type haqame hin jiru kanaaf deebi\'uu hin dandeenyu',
+    'create'				=> 'Haaraa Uumuu',
+    'created'               => 'Qabeenya Uumame',
+    'created_asset'			=> 'Qabeenya uumame',
+    'created_at' 			=> 'Uumamee',
+    'created_by'            => 'Uumaan',
+    'record_created' 		=> 'Qorattoon Uumame',
+    'updated_at' 			=> 'Waan haarfame',
+    'currency'  			=> 'Summer', // this is deprecated
+    'currency_text'  		=> 'Maallaqa', //
+    'current'  				=> 'Amma',
+    'current_password'      => 'Password amma',
+    'customize_report'      => 'Gabaasa Qinda\'uu',
+    'custom_report'         => 'Gabaasa Qabeenya addaa',
+    'dashboard'				=> 'Dashboard',
+    'data_source'           => 'Madda Odeeffannoo',
+    'days'      			=> 'guyyaa',
+    'days_to_next_audit'    => 'Guyyaa qorannoo itti aanuu',
+    'date'					=> 'Guyyaa',
+    'debug_warning'         => 'Yaadachiisa!',
+    'debug_warning_text'    => 'Kan duraa jiru.',
+    'delete'  				=> 'Haqaa',
+    'delete_confirm'  		=> 'Si eeyyamuu barbaadaa?',
+    'delete_confirm_no_undo' => 'Si eeyyamuu barbaadaa? Kan kun hin deebi\'u.',
+    'deleted'  				=> 'Haqame',
+    'delete_seats'  		=> 'Teessoo Haqa',
+    'deletion_failed'       => 'Haqa dhabuun',
+    'departments'           => 'Waldaalee',
+    'department'            => 'Waldaa',
+    'deployed'				=> 'Galfame',
+    'depreciation'			=> 'Baay\'ina',
+    'depreciations'         => 'Baay\'een',
+    'depreciation_report'	=> 'Gabaasa Baay\'ina',
+    'details'               => 'Ibsaa',
+    'download'				=> 'Download',
+    'download_all'		    => 'Download Hunda',
+    'editprofile'  			=> 'Kitaabni Teessoo Kee',
+    'eol'					=> 'EOL',
+    'email_domain'			=> 'E-mail Domain',
+    'employee_number'       => 'Lakkoofsa Hojjetaa',
+    'email_domain_help'		=> 'Kun e-mail fi alaa osoo hin jijjiiramin qindaa\'ina jira.',
+    'error'				    => 'Haqa :object_type hin dandeenye',
+    'exclude_archived'      => 'Qabeenya Kitaabota Qorannoo',
+    'exclude_deleted'       => 'Qabeenya Haqaa',
+    'example'				=> 'Fakkeenya: ',
+
+    'files'                 => 'Faayilota',
+    'file_name'				=> 'Faayila',
+    'file_type'             => 'Haaromsaa Faayilota',
+    'filesize'              => 'Guddina Faayilota',
+    'file_uploads'			=> 'Faayilota unka',
+    'file_upload'           => 'Faayila Unka',
+    'generate'				=> 'Uumuu',
+    'generate_labels'       => 'Uumuu Daangaa',
+    'github_markdown'      => 'Kanaa gidduu seenaa <a href="https://help.github.com/articles/github-flavored-markdown/">GitHub flavored markdown</a>',
+    'groups'				=> 'Groupee',
+    'gravatar_email'        => 'E-mail Gravatar',
+    'gravatar_url'          => '<a href="http://gravatar.com"><small>Avatar kee Gravatar.com irratti jijjiiri</small></a>.',
+    'history'  			    => 'Seenaa',
+    'history_for'  			=> 'Seenaa',
+    'id'  					=> 'ID',
+    'image'                 => 'Suura',
+    'image_delete'         	=> 'Suura Haqa',
+    'include_deleted'       => 'Yaa Qabeenya Haqaa',
+    'image_upload'         	=> 'Suura Unkaa',
+    'filetypes_accepted_help'    => 'Bakka buusuu faayilota: :types. Guddina: :size.|Faayilota dabalamee: :types. Guddina maxxanfame: :size.',
+    'filetypes_size_help'   => 'Guddina maxxanfame: :size.',
+    'image_filetypes_help'  => 'Faayilota armaan gadii qabdu: jpg, webp, png, gif, svg, fi avif. Guddina maxxanfame: :size.',
+    'unaccepted_image_type'  => 'Faayila suuraa kana hin qabne. Faayilota armaan gadii qabdu: jpg, webp, png, gif, fi svg. Mimetype faayil kana: :mimetype.',
+    'import'         	    => 'Gulaali',
+    'import_this_file'      => 'Fayyadama dabalata akkasumas faayil kana',
+    'importing'         	=> 'Gulaalu',
+    'importing_help'        => 'Qabeenya, qabeenya, liqiiwwan, components, furmaata, isa kaan galchuu fdgoos.',
+    'import-history'        => 'Seenaa Gulaaluu',
+    'asset_maintenance'        => 'Dammamoo Qabeenya Hawaasa',
+    'asset_maintenance_report' => 'Gabaasa Dhammajjuu Qabeenya',
+    'asset_maintenances'       => 'Dhammajjuu Qabeenya',
+    'item'  				=> 'Kitaaba',
+    'item_name'             => 'Maqaa Kitaabaa',
+    'import_file'  			=> 'faayila CSV galchuu',
+    'import_type'  			=> 'CSV gabbate',
+    'insufficient_permissions' => 'Hayyamaa yk hubbata hin guutuu!',
+    'kits'       			=> 'Kitaa Predefined',
+    'language'				=> 'Afaan',
+    'last'					=> 'Dhuma',
+    'last_login'            => 'Seera Dhiyoo',
+    'last_name'             => 'Maqaa Dhuma',
+    'firstname_lastname_display'	=> 'Maqaa Jalqabaa Maqaafi (Jane Smith)',
+    'lastname_firstname_display'	=> 'Maqaa Maqaa Jalqabaa (Smith Jane)',
+    'name_display_format'	=> 'Format Maqaa',
+    'first'					=> 'Jalqabaa',
+    'first_name'			=> 'Maqaa Jalqabaa',
+    'license'				=> 'Liikii',
+    'license_report'        => 'Gabaasa Liikii',
+    'licenses_available'	=> 'Liikii argamu',
+    'licenses'				=> ':count Licenses|:count Haqumaa',
+    'list_all'				=> 'Hunda tarreessi',
+    'loading'				=> 'Gafuu... amala turtii',
+    'lock_passwords'        => 'Haaromsa kana hin taane',
+    'feature_disabled'      => 'Dhaabbatni kun sababa kanaaf madda',
+    'location'              => 'Kitaabota',
+    'location_plural'        => 'Kitaabota|Kitaabota',
+    'locations'				=> 'Kitaabota',
+    'logo_size'				=> 'Looga arbaanii סרטיים דקויות',
+    'logout'				=> 'As bahuu',
+    'lookup_by_tag'     => 'Bite Dhorki',
+    'maintenances'          => 'Dammamoo',
+    'manage_api_keys'       => 'Maaloon Key',
+    'manufacturer'			=> 'Meeshaa Gurgurtaa',
+    'manufacturers'			=> 'Gurgurtoota',
+    'markdown'				=> 'Kan seeraan barbaadame <a href="https://help.github.com/articles/github-flavored-markdown/">GitHub flavored markdown</a>.',
+    'min_amt'				=> 'Min. QTY',
+    'min_amt_help'          => 'Lakkoofsa tokkoo naannoo tokko dhibama dude.',
+    'model_no'				=> 'Lakkoofsa Model',
+    'months'				=> 'jiiraa',
+    'moreinfo'				=> 'Odeeffannoo Dabalataa',
+    'name'					=> 'Maqaa',
+    'new_password'          => 'Password Haaraa',
+    'next'					=> 'Itti Aanaa',
+    'next_audit_date'		=> 'Guyya \'Audit\' itti aanaa',
+    'next_audit_date_help'  => 'Yammuu auditing arraba opzichte chiroon',
+    'audit_images_help'     => 'Suura qorannoo ishii tokkeeti',
+    'no_email'              => 'E-mail hin argamu',
+    'last_audit'		    => 'Audit Dhaabaa',
+    'new'					=> 'haaraa!',
+    'no_depreciation'		=> 'Golaawwan hin jirree',
+    'no_results'			=> 'Haquu .',
+    'no'  					=> 'Lakki',
+    'notes'  				=> 'Yaada dabalataa',
+    'note_added'            => 'Yaadachi qoora',
+    'options'				=> 'Filannoon',
+    'preview'				=> 'Dhuunfatti',
+    'add_note'              => 'Yaadachi qoora',
+    'note_edited'            => 'Yaadachi haaronqu',
+    'edit_note'              => 'Yaadachi xaafachuu',
+    'note_deleted'            => 'Yaada haqame',
+    'delete_note'              => 'Kennaa',
+    'order_number'          => 'Lakkoofsa Ajaja',
+    'only_deleted'          => 'Haqamtoota Qabeenya',
+    'page_menu'				=> 'An*rfin ~ _MENU_ qotaa',
+    'pagination_info'		=> 'odeeffannoo fuulaa',
+    'pending'				=> 'Harka qhoofaa',
+    'people'				=> 'Naamusa',
+    'per_page'				=> 'Muraa fuulaan ',
+    'previous'				=> 'Guddina lammaffaa',
+    'processing'			=> 'Hojiirra',
+    'profile'				=> 'Gosi keewwatte',
+    'purchase_cost'                              => 'Gatii itti bitame',
+    'purchase_date'         => 'Guyyaa bittaa',
+    'qty'		            => 'Baayina',
+    'quantity'		        => 'Lakk. hordoffi qabeenya',
+    'quantity_minimum'      => 'Keewwatte => Siitun oolishuuf | Habuunekin itchaa Lips -->',
+    'quickscan_checkin'  	=> 'Xibaarraa Fayyadama Yeroo Gabaabaa',
+    'quickscan_checkin_status'  	=> 'Haala Seensaa',
+    'ready_to_deploy'		=> 'Tamsaasaaf Qophiidha',
+    'recent_activity'		=> 'Sochii Dhiyeenyaa',
+    'remaining'             => 'Haftee',
+    'remove_company'        => 'Hidhata Dhaabbata waliinii adda kuti',
+    'reports'				=> 'Gabaasota',
+    'restored'				=> 'jalqabatti deebihe',
+    'restore'				=> 'Jalqabatti deebisi',
+    'requestable_models'    => 'Gosoota modeloota gaafatamuu dandahanii',
+    'requestable_items'     => 'Gosoota mi\'a gaafatamuu dandahanii',
+    'requested'				=> 'Gaafatame',
+    'requested_date'        => 'Guyyaa gaafatame',
+    'requested_assets'      => 'Qabeenya gaafatame',
+    'requested_assets_menu' => 'Qabeenya gaafatame',
+    'request_canceled'      => 'Gaaffiin Haqame',
+    'request_item'          => 'Gaaffii dhiyeessi',
+    'external_link_tooltip' => 'Gara geggeessituu alaatti',
+    'save'  				=> 'Olkaahi',
+    'select_var'            => 'Filadhu :thing ', // this will eventually replace all of our other selects
+    'select'				=> 'Fili',
+    'select_all'            => 'Hunda Filadhu',
+    'search'				=> 'Barbaadi',
+    'select_category'       => 'Rimiddii Filadhu',
+    'select_datasource' => 'Argama Odeeffannoo Filadhu',
+    'select_department'     => 'Kutaa Hojii Fladhu',
+    'select_depreciation'	=> 'Select a Depreciation Type',
+    'select_location'		=> 'Select a Location',
+    'select_manufacturer'	=> 'Select a Manufacturer',
+    'select_model'			=> 'Select a Model',
+    'select_supplier'		=> 'Dhiyeessaa Filadhu',
+    'select_user'			=> 'Select a User',
+    'select_date'			=> 'Select Date (YYYY-MM-DD)',
+    'select_statuslabel'	=> 'Select Status',
+    'select_company'    	=> 'Select Company',
+    'select_asset'    		=> 'Select Asset',
+    'settings'				=> 'Settings',
+    'show_deleted'  		=> 'Show Deleted',
+    'show_current'  		=> 'Show Current',
+    'sign_in'				=> 'Sign in',
+    'signature'             => 'Signature',
+    'signed_off_by'         => 'Signed Off By',
+    'skin'       			=> 'Skin',
+    'webhook_msg_note'        => 'Beeksisa karaa webhook erguu ni taasifama',
+    'webhook_test_msg'        => 'Eeeeee! yooyyaa! :app keessan Snipe-IT waliin wal quunnamee hojiirra jira!',
+    'some_features_disabled' => 'DEMO MODE: Some features are disabled for this installation.',
+    'site_name'				=> 'Site Name',
+    'state'  				=> 'State',
+    'status_labels'			=> 'Status Labels',
+    'status_label'			=> 'Status Label',
+    'status'    			=> 'Status',
+    'accept_eula'           => 'Acceptance Agreement',
+    'show_or_hide_eulas' => 'Show/Hide EULAs',
+    'supplier'              => 'Dhiyeessaa',
+    'suppliers'  			=> 'Dhiyeessitoota',
+    'sure_to_delete'        => 'Sirriitti itt amantaa haquu feetaa',
+    'sure_to_delete_var'    => 'Si eeyyamuu barbaadaa?',
+    'delete_what'           => 'Haqi :item',
+    'submit'				=> 'Galmeessi',
+    'target'                => 'Xiyyeeffannoo',
+    'time_and_date_display' => 'Agarsiisa Yeroo for Guyyaa',
+    'total_assets'			=> 'qabeenya waliigalaa',
+    'total_licenses'		=> 'heyyama waliigalaa',
+    'total_accessories'		=> 'meeshaalee waliigalaa',
+    'total_consumables'		=> 'total consumables',
+    'type'  				=> 'Type',
+    'undeployable'			=> 'Un-deployable',
+    'unknown_admin'			=> 'Unknown Admin',
+    'username'              => 'Username',
+    'update'                => 'Update',
+    'updating_item' => 'Updating :item',
+    'upload_filetypes_help'      => 'Allowed filetypes are png, gif, jpg, jpeg, doc, docx, pdf, xls, xlsx, txt, lic, xml, zip, rtf and rar. Max upload size allowed is :size.',
+    'uploaded'              => 'Uploaded',
+    'user'					=> 'Fayyadamaa',
+    'accepted'			    => 'fudhatama argate',
+    'declined'			    => 'kufe',
+    'declined_note'         => 'Yaadannoowwan Kufan',
+    'unassigned'            => 'Kan hin ibsamin',
+    'unaccepted_asset_report' => 'Qabeenyota fudhatama hin argatin',
+    'users'                 => 'Fayyadamtoota',
+    'viewall'				=> 'Hunda agarsiisi',
+    'viewassets'  			=> 'Qabeenyota ramadaman agarsiisi',
+    'viewassetsfor'         => 'Qabeenya :name agarsiisi',
+    'website'               => 'Marsariitii',
+    'welcome'				=> 'Anaa Dhufu, :name',
+    'years'					=> 'waggoota',
+    'yes' 					=> 'Eeyyee',
+    'zip'  					=> 'Walitti kuusi',
+    'noimage'				=> 'Suurri ol fe\'ame hin jiru ykn suurri hin argamne.',
+    'file_does_not_exist'   => 'Faayilli gaafatame sarvarii irratti hin jiru.',
+    'file_upload_success'   => 'Faayila o fe\'uun milkaa\'eera!',
+    'no_files_uploaded'     => 'Faayila o fe\'uun milkaa\'eera!',
+    'token_expired'         => 'Unka keessan yeroon isaa darbeera. Adaraa irra deebi\'aa yaalaa.',
+    'login_enabled'         => 'Seensi heyamame',
+    'audit_due'             => 'Odiitiif kan dhiyaatu',
+    'audit_due_days'        => '{}Odiitiidhaaf yeroon murtaa\'e ykn yeroon isaa darbe|[1]Qabeenya guyyaa tokko keessatti odiitiidhaaf yeroon qabeenyaa ykn yeroon isaa darbe Guyyaa |[2,*]Qabeenya odiitiidhaaf yeroon itti kenname ykn yeroon isaa darbe guyyaa :days keessatti',
+    'checkin_due'           => 'Galiif kan dhiyaatu',
+    'checkin_overdue'       => 'Galchuuf yeroon isaa darbe',
+    'checkin_due_days'      => '{}Sababa Galchuu | [1]qabeenya galchuuf yeroon kennamu Guyyaa | :days qofa',
+    'audit_overdue'         => 'Odiitiidhaaf yeroon isaa darbe',
+    'accept'                => 'Qabeenya :asset Fudhadhu',
+    'i_accept'              => 'Ani nan Fudhadha ykn Ittan Walii gala',
+    'i_decline'             => 'Ani hin fudhadhu ykn itti walii hin galu',
+    'accept_decline'        => 'Fudhadhu/Didi',
+    'sign_tos'              => 'Haala tajaajilaa irratti walii galuu kee agarsiisuuf kan armaan gadiirratti mallatteessi:',
+    'clear_signature'       => 'Mallattoo qulqulleessi',
+    'show_help'             => 'Gargaarsa agarsiisi',
+    'hide_help'             => 'Gargaarsa dhoksi',
+    'view_all'              => 'hunda agarsiisi',
+    'hide_deleted'          => 'Kan haqame dhoksi',
+    'email'                 => 'Imeeyili',
+    'do_not_change'         => 'Hin jijjiirin',
+    'bug_report'            => 'Report a bug',
+    'user_manual'           => 'User\'s Manual',
+    'setup_step_1'          => 'Step 1',
+    'setup_step_2'          => 'Step 2',
+    'setup_step_3'          => 'Step 3',
+    'setup_step_4'          => 'Step 4',
+    'setup_config_check'    => 'Configuration Check',
+    'setup_create_database' => 'Create database tables',
+    'setup_create_admin'    => 'Create an admin user',
+    'setup_done'            => 'Finished!',
+    'bulk_edit_about_to'    => 'You are about to edit the following: ',
+    'checked_out'           => 'Checked Out',
+    'checked_out_to'        => 'Checked out to',
+    'fields'                => 'Fields',
+    'last_checkout'         => 'Last Checkout',
+    'due_to_checkin'        => 'The following :count items are due to be checked in soon:',
+    'expected_checkin'      => 'Expected Checkin',
+    'reminder_checked_out_items' => 'This is a reminder of the items currently checked out to you. If you feel this list is inaccurate (something is missing, or something appears here that you believe you never received), please email :reply_to_name at :reply_to_address.',
+    'changed'               => 'Changed',
+    'to'                    => 'To',
+    'report_fields_info'    => '<p>Select the fields you would like to include in your custom report, and click Generate. The file (custom-asset-report-YYYY-mm-dd.csv) will download automatically, and you can open it in Excel.</p>
+            <p>If you would like to export only certain assets, use the options below to fine-tune your results.</p>',
+    'range'                 => 'Range',
+    'bom_remark'            => 'Add a BOM (byte-order mark) to this CSV',
+    'improvements'          => 'Improvements',
+    'information'           => 'Information',
+    'permissions'           => 'Permissions',
+    'managed_ldap'          => '(Managed via LDAP)',
+    'export'                => 'Export',
+    'ldap_sync'             => 'LDAP Sync',
+    'ldap_user_sync'        => 'LDAP User Sync',
+    'synchronize'           => 'Synchronize',
+    'sync_results'          => 'Synchronization Results',
+    'license_serial'        => 'Serial/Product Key',
+    'invalid_category'      => 'Invalid or missing category',
+    'invalid_item_category_single' => 'Invalid or missing :type category. Please update the category of this :type to include a valid category before checking out.',
+    'dashboard_info'        => 'This is your dashboard. There are many like it, but this one is yours.',
+    '60_percent_warning'    => '60% Complete (warning)',
+    'dashboard_empty'       => 'It looks like you have not added anything yet, so we do not have anything awesome to display. Get started by adding some assets, accessories, consumables, or licenses now!',
+    'new_asset'             => 'New Asset',
+    'new_license'           => 'New License',
+    'new_accessory'         => 'New Accessory',
+    'new_consumable'        => 'New Consumable',
+    'new_component'         => 'New Component',
+    'new_user'              => 'New User',
+    'collapse'              => 'Collapse',
+    'assigned'              => 'Assigned',
+    'asset_count'           => 'Asset Count',
+    'accessories_count'     => 'Accessories Count',
+    'consumables_count'     => 'Consumables Count',
+    'components_count'      => 'Components Count',
+    'licenses_count'        => 'Licenses Count',
+    'notification_error'    => 'Haqa :object_type hin dandeenye',
+    'notification_error_hint' => 'Please check the form below for errors',
+    'notification_bulk_error_hint' => 'The following fields had validation errors and were not edited:',
+    'notification_success'  => 'Success',
+    'notification_warning'   => 'Warning',
+    'notification_info'      => 'Info',
+    'asset_information'     => 'Asset Information',
+    'model_name'            => 'Model Name',
+    'asset_name'            => 'Asset Name',
+    'consumable_information' => 'Consumable Information:',
+    'consumable_name'       => 'Consumable Name:',
+    'accessory_information' => 'Accessory Information:',
+    'accessory_name'       => 'Accessory Name:',
+    'clone_item'            => 'Clone Item',
+    'checkout_tooltip' => 'Check this item out',
+    'checkin_tooltip' => 'Check this item in so that it is available for re-issue, re-imaging, etc',
+    'checkout_user_tooltip' => 'Check this item out to a user',
+    'checkin_to_diff_location' => 'You can choose to check this asset in to a location other than this asset\'s default location of :default_location if one is set',
+    'maintenance_mode'      => 'The service is temporarily unavailable for system updates. Please check back later.',
+    'maintenance_mode_title' => 'System Temporarily Unavailable',
+    'ldap_import'           => 'User password should not be managed by LDAP. (This allows you to send forgotten password requests.)',
+    'purge_not_allowed'     => 'Purging deleted data has been disabled in the .env file. Contact support or your systems administrator.',
+    'backup_delete_not_allowed'     => 'Deleting backups has been disabled in the .env file. Contact support or your systems administrator.',
+    'additional_files'           => 'Additional Files',
+    'shitty_browser'        => 'No signature detected. If you are using an older browser, please use a more modern browser to complete your asset acceptance.',
+    'bulk_soft_delete'      =>'Also soft-delete these users. Their asset history will remain intact unless/until you purge deleted records in the Admin Settings.',
+    'bulk_checkin_delete_success' => 'Your selected users have been deleted and their items have been checked in.',
+    'bulk_checkin_success' => 'The items for the selected users have been checked in.',
+    'set_to_null'           => 'Delete values for this selection|Delete values for all :selection_count selections ',
+    'set_users_field_to_null'  => 'Delete :field values for this user|Delete :field values for all :user_count users ',
+    'na_no_purchase_date'   => 'N/A - No purchase date provided',
+    'assets_by_status'      => 'Assets by Status',
+    'assets_by_status_type'      => 'Assets by Status Type',
+    'pie_chart_type'        => 'Dashboard Pie Chart Type',
+    'hello_name'            => 'Hello, :name!',
+    'unaccepted_profile_warning'   => 'You have one item requiring acceptance. Click here to accept or decline it | You have :count items requiring acceptance. Click here to accept or decline them',
+    'start_date'            => 'Start Date',
+    'end_date'            => 'End Date',
+    'alt_uploaded_image_thumbnail' => 'Uploaded thumbnail',
+    'placeholder_kit'       => 'Select a kit',
+    'file_not_found'        => 'File not found',
+    'log_record_not_found'  => 'No record for that log entry was found.',
+    'preview_not_available' => '(no preview)',
+    'setup'                 => 'Setup',
+    'pre_flight'            => 'Pre-Flight',
+    'skip_to_main_content'  => 'Skip to main content',
+    'toggle_navigation'     => 'Toggle navigation',
+    'alerts'                => 'Alerts',
+    'tasks_view_all'        => 'View all tasks',
+    'true'                  => 'True',
+    'false'                 => 'False',
+    'integration_option'    => 'Integration Option',
+    'log_does_not_exist'    => 'No matching log record exists.',
+    'merge_users'           => 'Merge Users',
+    'merge_information' =>  'This will merge the :count users into a single user. Select the user you wish to merge the others into below, and the associated assets, licenses, etc will be moved over to the selected user and the other users will be marked as deleted.',
+    'warning_merge_information' => 'This action CANNOT be undone and should ONLY be used when you need to merge users because of a bad import or sync. Be sure to run a backup first.',
+    'no_users_selected'     => 'No users selected',
+    'not_enough_users_selected'     => 'At least :count users must be selected',
+    'merge_success'         => ':count users merged successfully into :into_username!',
+    'merged'                => 'merged',
+    'merged_log_this_user_into' => 'Merged this user (ID :to_id - :to_username) into user ID :from_id (:from_username) ',
+    'merged_log_this_user_from' => 'Merged user ID :from_id (:from_username) into this user (ID :to_id - :to_username)',
+    'clear_and_save'            => 'Clear & Save',
+    'update_existing_values'    => 'Update Existing Values?',
+    'auto_incrementing_asset_tags_disabled_so_tags_required' => 'Generating auto-incrementing asset tags is disabled so all rows need to have the "Asset Tag" column populated.',
+    'auto_incrementing_asset_tags_enabled_so_now_assets_will_be_created' => 'Note: Generating auto-incrementing asset tags is enabled so assets will be created for rows that do not have "Asset Tag" populated. Rows that do have "Asset Tag" populated will be updated with the provided information.',
+    'send_welcome_email_to_users'   => ' Send Welcome Email for new Users?',
+    'send_email'                => 'Send Email',
+    'call'                      => 'Call number',
+    'back_before_importing'     => 'Backup before importing?',
+    'csv_header_field'          => 'CSV Header Field',
+    'import_field'              => 'Import Field',
+    'sample_value'              => 'Sample Value',
+    'no_headers'                => 'No Columns Found',
+    'error_in_import_file'      => 'There was an error reading the CSV file: :error',
+    'errors_importing'          => 'Some Errors occurred while importing: ',
+    'warning'                   => 'WARNING: :warning',
+    'success_redirecting'       => '"Success... Redirecting.',
+    'cancel_request'            => 'Cancel this item request',
+    'setup_successful_migrations' => 'Your database tables have been created',
+    'setup_migration_output' => 'Migration output:',
+    'setup_migration_create_user' => 'Next: Create User',
+    'importer_generic_error'    => 'Your file import is complete, but we did receive an error. This is usually caused by third-party API throttling from a notification webhook (such as Slack) and would not have interfered with the import itself, but you should confirm this.',
+    'confirm' => 'Confirm',
+    'autoassign_licenses' => 'Auto-Assign Licenses',
+    'autoassign_licenses_help' => 'Allow this user to have licenses assigned via the bulk-assign license UI or cli tools.',
+    'autoassign_licenses_help_long' => 'This allows a user to be have licenses assigned via the bulk-assign license UI or cli tools. (For example, you might not want contractors to be auto-assigned a license you would provide to only staff members. You can still individually assign licenses to those users, but they will not be included in the Checkout License to All Users functions.)',
+    'no_autoassign_licenses_help' => 'Do not include user for bulk-assigning through the license UI or cli tools.',
+    'modal_confirm_generic'      => 'Are you sure?',
+    'cannot_be_deleted'      => 'This item cannot be deleted',
+    'cannot_be_edited'      => 'This item cannot be edited.',
+    'undeployable_tooltip'      => 'This item cannot be checked out. Check the quantity remaining.',
+    'serial_number'        => 'Serial Number',
+    'item_notes' => ':item Notes',
+    'item_name_var' => ':item Name',
+    'error_user_company' => 'Checkout target company and asset company do not match',
+    'error_user_company_accept_view' => 'An Asset assigned to you belongs to a different company so you can\'t accept nor deny it, please check with your manager',
+    'importer' => [
+        'checked_out_to_fullname' => 'Checked Out to: Full Name',
+        'checked_out_to_first_name' => 'Checked Out to: First Name',
+        'checked_out_to_last_name' => 'Checked Out to: Last Name',
+        'checked_out_to_username' => 'Checked Out to: Username',
+        'checked_out_to_email' => 'Checked Out to: Email',
+        'checked_out_to_tag' => 'Checked Out to: Asset Tag',
+        'manager_first_name' => 'Manager First Name',
+        'manager_last_name' => 'Manager Last Name',
+        'manager_full_name' => 'Manager Full Name',
+        'manager_username' => 'Manager Username',
+        'checkout_type' => 'Checkout Type',
+        'checkout_location' => 'Checkout to Location',
+        'image_filename' => 'Image Filename',
+        'do_not_import'     => 'Do Not Import',
+        'vip' => 'VIP',
+        'avatar'  => 'Avatar',
+        'gravatar' => 'Gravatar Email',
+        'currency' => 'Currency',
+        'address2' => 'Address Line 2',
+        'import_note' => 'Imported using csv importer',
+    ],
+    'remove_customfield_association' => 'Remove this field from the fieldset. This will not delete the custom field, only this field\'s association with this fieldset.',
+    'checked_out_to_fields' => 'Checked Out To Fields',
+    'percent_complete' => '% complete',
+    'uploading' => 'Uploading... ',
+    'upload_error' => 'Error uploading file. Please check that you have no empty rows or duplicated column names in your CSV, and that the server permissions allow uploads.',
+    'copy_to_clipboard' => 'Copy to Clipboard',
+    'copied' => 'Copied!',
+    'status_compatibility' => 'If assets are already assigned, they cannot be changed to a non-deployable status type and this value change will be skipped.',
+    'rtd_location_help' => 'This is the location of the asset when it is not checked out',
+    'item_not_found' => ':item_type ID :id does not exist or has been deleted',
+    'action_permission_denied' => 'You do not have permission to :action :item_type ID :id',
+    'action_permission_generic' => 'You do not have permission to :action this :item_type',
+    'edit' => 'edit',
+    'action_source' => 'Action Source',
+    'or' => 'or',
+    'url'                   => 'URL',
+    'edit_fieldset' => 'Edit fieldset fields and options',
+    'permission_denied_superuser_demo' => 'Permission denied. You cannot update user information for superadmins on the demo.',
+    'pwd_reset_not_sent' => 'User is not activated, is LDAP synced, or does not have an email address',
+    'error_sending_email' => 'Error sending email',
+    'sad_panda' => 'Sad panda. You are not authorized to do the thing. Maybe <a href=":link">return to the dashboard</a>, or contact your administrator.',
+    'bulk' => [
+            'delete' =>
+                [
+                'header' => 'Bulk Delete :object_type',
+                'warn'   =>  'You are about to delete one :object_type|You are about to delete :count :object_type',
+                'success'   =>  ':object_type successfully deleted|Successfully deleted :count :object_type',
+                'error'   =>  'Could not delete :object_type',
+                'nothing_selected'   =>  'No :object_type selected - nothing to do',
+                'partial'   =>  'Deleted :success_count :object_type, but :error_count :object_type could not be deleted',
+             ],
+    ],
+    'no_requestable' => 'There are no requestable assets or asset models.',
+
+    'countable' => [
+        'accessories'  => ':count Accessory|:count Accessories',
+        'assets'  => ':count Asset|:count Assets',
+        'licenses'  => ':count License|:count Licenses',
+        'license_seats'  => ':count License Seat|:count License Seats',
+        'consumables'  => ':count Consumable|:count Consumables',
+        'components'  => ':count Component|:count Components',
+    ],
+
+    'more_info' => 'Odeeffannoo Dabalataa',
+    'quickscan_bulk_help' => 'Checking this box will edit the asset record to reflect this new location. Leaving it unchecked will simply note the location in the audit log. Note that if this asset is checked out, it will not change the location of the person, asset or location it is checked out to.',
+    'whoops' => 'Whoops!',
+    'something_went_wrong' => 'Something went wrong with your request.',
+    'close' => 'Close',
+    'expires' => 'Expires',
+    'map_fields'=> 'Map :item_type Fields',
+    'remaining_var' => ':count Remaining',
+    'label' => 'Label',
+    'import_asset_tag_exists' => 'An asset with the asset tag :asset_tag already exists and an update was not requested. No change was made.',
+    'countries_manually_entered_help' => 'Values with an asterisk (*) were manually entered and do not match existing ISO 3166 dropdown values',
+    'accessories_assigned' => 'Assigned Accessories',
+    'user_managed_passwords' => 'Password Management',
+    'user_managed_passwords_disallow' => 'Disallow users from managing their own passwords',
+    'user_managed_passwords_allow' => 'Allow users to manage their own passwords',
+    'from' => 'From',
+    'by' => 'By',
+
+// Add form placeholders here
+    'placeholders' => [
+        'notes'  => 'Add a note',
+    ],
+
+    'breadcrumb_button_actions' => [
+        'edit_item' => 'Edit :name',
+        'checkout_item' => 'Checkout :name',
+        'checkin_item' => 'Checkin :name',
+    ],
+
+    'skins' => [
+        'site_default' => 'Site Default',
+        'default_blue' => 'Default Blue',
+        'blue_dark' => 'Blue (Dark Mode)',
+        'green' => 'Green Dark',
+        'green_dark' => 'Green (Dark Mode)',
+        'red' => 'Red Dark',
+        'red_dark' => 'Red (Dark Mode)',
+        'orange' => 'Orange Dark',
+        'orange_dark' => 'Orange (Dark Mode)',
+        'black' => 'Black',
+        'black_dark' => 'Black (Dark Mode)',
+        'purple' => 'Purple',
+        'purple_dark' => 'Purple (Dark Mode)',
+        'yellow' => 'Yellow',
+        'yellow_dark' => 'Yellow (Dark Mode)',
+        'high_contrast' => 'High Contrast',
+
+    ],
+
+    'select_all_none' => 'Select/Unselect All',
+    'generic_model_not_found' => 'That :model was not found or you do not have permission to access it',
+    'deleted_models' => 'Deleted Asset Models',
+    'deleted_users' => 'Deleted Users',
+    'cost_each' => ':amount each',
+    'remove_current_image' => 'Remove current :type image',
+
+    'seeding' => [
+        'manufacturers' => [
+            'button' => 'Create Manufacturers',
+            'prompt' => 'You do not have any manufacturers yet. Would you like to seed a list of common manufacturers? (THIS WILL OVERWRITE EXISTING MANUFACTURERS, including those that have been soft-deleted.)',
+            'success' => 'Manufacturers seeded successfully',
+            'error' => 'Could not seed manufacturers. A manufacturer record already exists and seeding would overwrite it.|Could not seed manufacturers. :count manufacturer records already exist and seeding would overwrite them.',
+        ],
+    ],
+
+];
diff --git a/resources/lang/om-ET/help.php b/resources/lang/om-ET/help.php
new file mode 100644
index 0000000000..cace5d5164
--- /dev/null
+++ b/resources/lang/om-ET/help.php
@@ -0,0 +1,35 @@
+<?php
+
+return [
+
+    /*
+    |--------------------------------------------------------------------------
+    | Password Reminder Language Lines
+    |--------------------------------------------------------------------------
+    |
+    | The following language lines are the default lines which match reasons
+    | that are given by the password broker for a password update attempt
+    | has failed, such as for an invalid token or invalid new password.
+    |
+    */
+
+    'more_info_title' => 'Odeeffannoo Dabalataa',
+
+    'audit_help' => 'Checking this box will edit the asset record to reflect this new location. Leaving it unchecked will simply note the location in the audit log.<br><br>Note that if this asset is checked out, it will not change the location of the person, asset or location it is checked out to.',
+
+    'assets' => 'Assets are items tracked by serial number or asset tag.  They tend to be higher value items where identifying a specific item matters.',
+
+    'categories' => 'Categories help you organize your items. Some example categories might be &quot;Desktops&quot;, &quot;Laptops&quot;, &quot;Mobile Phones&quot;, &quot;Tablets&quot;, and so on, but you can use categories any way that makes sense for you.',
+
+    'accessories' => 'Accessories are anything you issue to users but that do not have a serial number (or you do not care about tracking them uniquely). For example, computer mice or keyboards.',
+
+    'companies'     => 'Companies can be used as a simple identifier field, or can be used to limit visibility of assets, users, etc if full company support is enabled in your Admin settings.',
+
+    'components'    => 'Components are items that are part of an asset, for example HDD, RAM, etc.',
+
+    'consumables'   => 'Consumables are anything purchased that will be used up over time. For example, printer ink or copier paper.',
+
+    'depreciations' => 'You can set up asset depreciations to depreciate assets based on straight-line depreciation.',
+    
+    'empty_file'    => 'The importer detects that this file is empty.'
+];
diff --git a/resources/lang/om-ET/localizations.php b/resources/lang/om-ET/localizations.php
new file mode 100644
index 0000000000..827ed4fca1
--- /dev/null
+++ b/resources/lang/om-ET/localizations.php
@@ -0,0 +1,326 @@
+<?php
+
+return [
+
+    'select_language' => 'Select a Language',
+    'languages' => [
+        'en-US'=> 'English, US',
+        'en-GB'=> 'English, UK',
+        'am-ET' => 'Amharic',
+        'af-ZA'=> 'Afrikaans',
+        'ar-SA'=> 'Arabic',
+        'bg-BG'=> 'Bulgarian',
+        'zh-CN'=> 'Chinese Simplified',
+        'zh-TW'=> 'Chinese Traditional',
+        'ca-ES' => 'Catalan',
+        'hr-HR'=> 'Croatian',
+        'cs-CZ'=> 'Czech',
+        'da-DK'=> 'Danish',
+        'nl-NL'=> 'Dutch',
+        'en-ID'=> 'English, Indonesia',
+        'et-EE'=> 'Estonian',
+        'fil-PH'=> 'Filipino',
+        'fi-FI'=> 'Finnish',
+        'fr-FR'=> 'French',
+        'de-DE'=> 'German',
+        'de-if'=> 'German (Informal)',
+        'el-GR'=> 'Greek',
+        'he-IL'=> 'Hebrew',
+        'hu-HU'=> 'Hungarian',
+        'is-IS' => 'Icelandic',
+        'id-ID'=> 'Indonesian',
+        'ga-IE'=> 'Irish',
+        'it-IT'=> 'Italian',
+        'ja-JP'=> 'Japanese',
+        'km-KH'=>'Khmer',
+        'ko-KR'=> 'Korean',
+        'lt-LT'=>'Lithuanian',
+        'lv-LV'=> 'Latvian',
+        'mk-MK'=> 'Macedonian',
+        'ms-MY'=> 'Malay',
+        'mi-NZ'=> 'Maori',
+        'mn-MN'=> 'Mongolian',
+        'nb-NO'=> 'Norwegian Bokmål',
+        'om-ET' => 'Oromo (Ethiopian)',
+        //'nn-NO'=> 'Norwegian Nynorsk',
+        'fa-IR'=> 'Persian',
+        'pl-PL'=> 'Polish',
+        'pt-PT'=> 'Portuguese',
+        'pt-BR'=> 'Portuguese, Brazilian',
+        'ro-RO'=> 'Romanian',
+        'ru-RU'=> 'Russian',
+        'sr-CS' => 'Serbian (Latin)',
+        'sk-SK'=> 'Slovak',
+        'sl-SI'=> 'Slovenian',
+        'so-SO'=> 'Somali',
+        'es-ES'=> 'Spanish',
+        'es-CO'=> 'Spanish, Colombia',
+        'es-MX'=> 'Spanish, Mexico',
+        'es-VE'=> 'Spanish, Venezuela',
+        'sv-SE'=> 'Swedish',
+        'tl-PH'=> 'Tagalog',
+        'ta-IN'=> 'Tamil',
+        'th-TH'=> 'Thai',
+        'tr-TR'=> 'Turkish',
+        'uk-UA'=> 'Ukranian',
+        'vi-VN'=> 'Vietnamese',
+        'cy-GB'=> 'Welsh',
+        'zu-ZA'=> 'Zulu',
+    ],
+
+    'select_country' => 'Select a Country',
+    
+    'countries' => [
+        'AC'=>'Ascension Island',
+        'AD'=>'Andorra',
+        'AE'=>'United Arab Emirates',
+        'AF'=>'Afghanistan',
+        'AG'=>'Antigua And Barbuda',
+        'AI'=>'Anguilla',
+        'AL'=>'Albania',
+        'AM'=>'Armenia',
+        'AN'=>'Netherlands Antilles',
+        'AO'=>'Angola',
+        'AQ'=>'Antarctica',
+        'AR'=>'Argentina',
+        'AS'=>'American Samoa',
+        'AT'=>'Austria',
+        'AU'=>'Australia',
+        'AW'=>'Aruba',
+        'AX'=>'Ã…land',
+        'AZ'=>'Azerbaijan',
+        'BA'=>'Bosnia And Herzegovina',
+        'BB'=>'Barbados',
+        'BE'=>'Belgium',
+        'BD'=>'Bangladesh',
+        'BF'=>'Burkina Faso',
+        'BG'=>'Bulgaria',
+        'BH'=>'Bahrain',
+        'BI'=>'Burundi',
+        'BJ'=>'Benin',
+        'BM'=>'Bermuda',
+        'BN'=>'Brunei Darussalam',
+        'BO'=>'Bolivia',
+        'BR'=>'Brazil',
+        'BS'=>'Bahamas',
+        'BT'=>'Bhutan',
+        'BV'=>'Bouvet Island',
+        'BW'=>'Botswana',
+        'BY'=>'Belarus',
+        'BZ'=>'Belize',
+        'CA'=>'Canada',
+        'CC'=>'Cocos (Keeling) Islands',
+        'CD'=>'Congo (Democratic Republic)',
+        'CF'=>'Central African Republic',
+        'CG'=>'Congo (Republic)',
+        'CH'=>'Switzerland',
+        'CI'=>'Côte d\'Ivoire',
+        'CK'=>'Cook Islands',
+        'CL'=>'Chile',
+        'CM'=>'Cameroon',
+        'CN'=>'People\'s Republic of China',
+        'CO'=>'Colombia',
+        'CR'=>'Costa Rica',
+        'CU'=>'Cuba',
+        'CV'=>'Cape Verde',
+        'CX'=>'Christmas Island',
+        'CY'=>'Cyprus',
+        'CZ'=>'Czech Republic',
+        'DE'=>'Germany',
+        'DJ'=>'Djibouti',
+        'DK'=>'Denmark',
+        'DM'=>'Dominica',
+        'DO'=>'Dominican Republic',
+        'DZ'=>'Algeria',
+        'EC'=>'Ecuador',
+        'EE'=>'Estonia',
+        'EG'=>'Egypt',
+        'GB-ENG'=>'England',
+        'ER'=>'Eritrea',
+        'ES'=>'Spain',
+        'ET'=>'Ethiopia',
+        'EU'=>'European Union',
+        'FI'=>'Finland',
+        'FJ'=>'Fiji',
+        'FK'=>'Falkland Islands (Malvinas)',
+        'FM'=>'Micronesia, Federated States Of',
+        'FO'=>'Faroe Islands',
+        'FR'=>'France',
+        'GA'=>'Gabon',
+        'GD'=>'Grenada',
+        'GE'=>'Georgia',
+        'GF'=>'French Guiana',
+        'GG'=>'Guernsey',
+        'GH'=>'Ghana',
+        'GI'=>'Gibraltar',
+        'GL'=>'Greenland',
+        'GM'=>'Gambia',
+        'GN'=>'Guinea',
+        'GP'=>'Guadeloupe',
+        'GQ'=>'Equatorial Guinea',
+        'GR'=>'Greece',
+        'GS'=>'South Georgia And The South Sandwich Islands',
+        'GT'=>'Guatemala',
+        'GU'=>'Guam',
+        'GW'=>'Guinea-Bissau',
+        'GY'=>'Guyana',
+        'HK'=>'Hong Kong',
+        'HM'=>'Heard And Mc Donald Islands',
+        'HN'=>'Honduras',
+        'HR'=>'Croatia (local name: Hrvatska)',
+        'HT'=>'Haiti',
+        'HU'=>'Hungary',
+        'ID'=>'Indonesia',
+        'IE'=>'Ireland',
+        'IL'=>'Israel',
+        'IM'=>'Isle of Man',
+        'IN'=>'India',
+        'IO'=>'British Indian Ocean Territory',
+        'IQ'=>'Iraq',
+        'IR'=>'Iran, Islamic Republic Of',
+        'IS'=>'Iceland',
+        'IT'=>'Italy',
+        'JE'=>'Jersey',
+        'JM'=>'Jamaica',
+        'JO'=>'Jordan',
+        'JP'=>'Japan',
+        'KE'=>'Kenya',
+        'KG'=>'Kyrgyzstan',
+        'KH'=>'Cambodia',
+        'KI'=>'Kiribati',
+        'KM'=>'Comoros',
+        'KN'=>'Saint Kitts And Nevis',
+        'KR'=>'Korea, Republic Of',
+        'KW'=>'Kuwait',
+        'KY'=>'Cayman Islands',
+        'KZ'=>'Kazakhstan',
+        'LA'=>'Lao People\'s Democratic Republic',
+        'LB'=>'Lebanon',
+        'LC'=>'Saint Lucia',
+        'LI'=>'Liechtenstein',
+        'LK'=>'Sri Lanka',
+        'LR'=>'Liberia',
+        'LS'=>'Lesotho',
+        'LT'=>'Lithuania',
+        'LU'=>'Luxembourg',
+        'LV'=>'Latvia',
+        'LY'=>'Libyan Arab Jamahiriya',
+        'MA'=>'Morocco',
+        'MC'=>'Monaco',
+        'MD'=>'Moldova, Republic Of',
+        'ME'=>'Montenegro',
+        'MG'=>'Madagascar',
+        'MH'=>'Marshall Islands',
+        'MK'=>'Macedonia, The Former Yugoslav Republic Of',
+        'ML'=>'Mali',
+        'MM'=>'Myanmar',
+        'MN'=>'Mongolia',
+        'MO'=>'Macau',
+        'MP'=>'Northern Mariana Islands',
+        'MQ'=>'Martinique',
+        'MR'=>'Mauritania',
+        'MS'=>'Montserrat',
+        'MT'=>'Malta',
+        'MU'=>'Mauritius',
+        'MV'=>'Maldives',
+        'MW'=>'Malawi',
+        'MX'=>'Mexico',
+        'MY'=>'Malaysia',
+        'MZ'=>'Mozambique',
+        'NA'=>'Namibia',
+        'NC'=>'New Caledonia',
+        'NE'=>'Niger',
+        'NF'=>'Norfolk Island',
+        'NG'=>'Nigeria',
+        'NI'=>'Nicaragua',
+        'NL'=>'Netherlands',
+        'GB-NIR' => 'Northern Ireland',
+        'NO'=>'Norway',
+        'NP'=>'Nepal',
+        'NR'=>'Nauru',
+        'NU'=>'Niue',
+        'NZ'=>'New Zealand',
+        'OM'=>'Oman',
+        'PA'=>'Panama',
+        'PE'=>'Peru',
+        'PF'=>'French Polynesia',
+        'PG'=>'Papua New Guinea',
+        'PH'=>'Philippines, Republic of the',
+        'PK'=>'Pakistan',
+        'PL'=>'Poland',
+        'PM'=>'St. Pierre And Miquelon',
+        'PN'=>'Pitcairn',
+        'PR'=>'Puerto Rico',
+        'PS'=>'Palestine',
+        'PT'=>'Portugal',
+        'PW'=>'Palau',
+        'PY'=>'Paraguay',
+        'QA'=>'Qatar',
+        'RE'=>'Reunion',
+        'RO'=>'Romania',
+        'RS'=>'Serbia',
+        'RU'=>'Russian Federation',
+        'RW'=>'Rwanda',
+        'SA'=>'Saudi Arabia',
+        'GB-SCT'=>'Scotland',
+        'SB'=>'Solomon Islands',
+        'SC'=>'Seychelles',
+        'SS'=>'South Sudan',
+        'SD'=>'Sudan',
+        'SE'=>'Sweden',
+        'SG'=>'Singapore',
+        'SH'=>'St. Helena',
+        'SI'=>'Slovenia',
+        'SJ'=>'Svalbard And Jan Mayen Islands',
+        'SK'=>'Slovakia (Slovak Republic)',
+        'SL'=>'Sierra Leone',
+        'SM'=>'San Marino',
+        'SN'=>'Senegal',
+        'SO'=>'Somalia',
+        'SR'=>'Suriname',
+        'ST'=>'Sao Tome And Principe',
+        'SU'=>'Soviet Union',
+        'SV'=>'El Salvador',
+        'SY'=>'Syrian Arab Republic',
+        'SZ'=>'Swaziland',
+        'TC'=>'Turks And Caicos Islands',
+        'TD'=>'Chad',
+        'TF'=>'French Southern Territories',
+        'TG'=>'Togo',
+        'TH'=>'Thailand',
+        'TJ'=>'Tajikistan',
+        'TK'=>'Tokelau',
+        'TI'=>'East Timor',
+        'TM'=>'Turkmenistan',
+        'TN'=>'Tunisia',
+        'TO'=>'Tonga',
+        'TP'=>'East Timor (old code)',
+        'TR'=>'Turkey',
+        'TT'=>'Trinidad And Tobago',
+        'TV'=>'Tuvalu',
+        'TW'=>'Taiwan',
+        'TZ'=>'Tanzania, United Republic Of',
+        'UA'=>'Ukraine',
+        'UG'=>'Uganda',
+        'UK'=>'United Kingdom',
+        'US'=>'United States',
+        'UM'=>'United States Minor Outlying Islands',
+        'UY'=>'Uruguay',
+        'UZ'=>'Uzbekistan',
+        'VA'=>'Vatican City State (Holy See)',
+        'VC'=>'Saint Vincent And The Grenadines',
+        'VE'=>'Venezuela',
+        'VG'=>'Virgin Islands (British)',
+        'VI'=>'Virgin Islands (U.S.)',
+        'VN'=>'Viet Nam',
+        'VU'=>'Vanuatu',
+        'GB-WLS' =>'Wales',
+        'WF'=>'Wallis And Futuna Islands',
+        'WS'=>'Samoa',
+        'YE'=>'Yemen',
+        'YT'=>'Mayotte',
+        'ZA'=>'South Africa',
+        'ZM'=>'Zambia',
+        'ZW'=>'Zimbabwe',
+    ],
+];
\ No newline at end of file
diff --git a/resources/lang/om-ET/mail.php b/resources/lang/om-ET/mail.php
new file mode 100644
index 0000000000..93ba64a60c
--- /dev/null
+++ b/resources/lang/om-ET/mail.php
@@ -0,0 +1,99 @@
+<?php
+
+return [
+
+    'Accessory_Checkin_Notification' => 'Accessory checked in',
+    'Accessory_Checkout_Notification' => 'Accessory checked out',
+    'Asset_Checkin_Notification' => 'Asset checked in',
+    'Asset_Checkout_Notification' => 'Asset checked out',
+    'Confirm_Accessory_Checkin' => 'Accessory checkin confirmation',
+    'Confirm_Asset_Checkin' => 'Asset checkin confirmation',
+    'Confirm_accessory_delivery' => 'Accessory delivery confirmation',
+    'Confirm_asset_delivery' => 'Asset delivery confirmation',
+    'Confirm_consumable_delivery' => 'Consumable delivery confirmation',
+    'Confirm_license_delivery' => 'License delivery confirmation',
+    'Consumable_checkout_notification' => 'Consumable checked out',
+    'Days' => 'Days',
+    'Expected_Checkin_Date' => 'An asset checked out to you is due to be checked back in on :date',
+    'Expected_Checkin_Notification' => 'Reminder: :name checkin deadline approaching',
+    'Expected_Checkin_Report' => 'Expected asset checkin report',
+    'Expiring_Assets_Report' => 'Expiring Assets Report.',
+    'Expiring_Licenses_Report' => 'Expiring Licenses Report.',
+    'Item_Request_Canceled' => 'Item Request Canceled',
+    'Item_Requested' => 'Item Requested',
+    'License_Checkin_Notification' => 'License checked in',
+    'License_Checkout_Notification' => 'License checked out',
+    'license_for'   => 'License for',
+    'Low_Inventory_Report' => 'Low Inventory Report',
+    'a_user_canceled' => 'A user has canceled an item request on the website',
+    'a_user_requested' => 'A user has requested an item on the website',
+    'acceptance_asset_accepted' => 'A user has accepted an item',
+    'acceptance_asset_declined' => 'A user has declined an item',
+    'accessory_name' => 'Maqaa Gabaadaa',
+    'additional_notes' => 'Additional Notes',
+    'admin_has_created' => 'An administrator has created an account for you on the :web website.',
+    'asset' => 'Asset',
+    'asset_name' => 'Asset Name',
+    'asset_requested' => 'Asset requested',
+    'asset_tag' => 'Asset Tag',
+    'assets_warrantee_alert' => 'There is :count asset with a warranty expiring in the next :threshold days.|There are :count assets with warranties expiring in the next :threshold days.',
+    'assigned_to' => 'Assigned To',
+    'best_regards' => 'Best regards,',
+    'canceled' => 'Canceled',
+    'checkin_date' => 'Checkin Date',
+    'checkout_date' => 'Checkout Date',
+    'checkedout_from' => 'Checked out from',
+    'checkedin_from'  => 'Checked in from',
+    'checked_into' => 'Checked into',
+    'click_on_the_link_accessory' => 'Please click on the link at the bottom to confirm that you have received the accessory.',
+    'click_on_the_link_asset' => 'Please click on the link at the bottom to confirm that you have received the asset.',
+    'click_to_confirm' => 'Please click on the following link to confirm your :web account:',
+    'current_QTY' => 'Current QTY',
+    'days' => 'Days',
+    'expecting_checkin_date' => 'Expected Checkin Date',
+    'expires' => 'Expires',
+    'hello' => 'Hello',
+    'hi' => 'Hi',
+    'i_have_read' => 'I have read and agree to the terms of use, and have received this item.',
+    'inventory_report' => 'Inventory Report',
+    'item' => 'Item',
+    'item_checked_reminder' => 'This is a reminder that you currently have :count items checked out to you that you have not accepted or declined. Please click the link below to confirm your decision.',
+    'license_expiring_alert' => 'There is :count license expiring in the next :threshold days.|There are :count licenses expiring in the next :threshold days.',
+    'link_to_update_password' => 'Please click on the following link to update your :web password:',
+    'login' => 'Login',
+    'login_first_admin' => 'Login to your new Snipe-IT installation using the credentials below:',
+    'low_inventory_alert' => 'There is :count item that is below minimum inventory or will soon be low.|There are :count items that are below minimum inventory or will soon be low.',
+    'min_QTY' => 'Min QTY',
+    'name' => 'Name',
+    'new_item_checked' => 'A new item has been checked out under your name, details are below.',
+    'new_item_checked_with_acceptance' => 'A new item has been checked out under your name that requires acceptance, details are below.',
+    'recent_item_checked' => 'An item was recently checked out under your name that requires acceptance, details are below.',
+    'notes' => 'Notes',
+    'password' => 'Password',
+    'password_reset' => 'Password Reset',
+    'read_the_terms' => 'Please read the terms of use below.',
+    'read_the_terms_and_click' => 'Please read the terms of use below, and click on the link at the bottom to confirm that you read and agree to the terms of use, and have received the asset.',
+    'requested' => 'Gaafatame',
+    'reset_link' => 'Your Password Reset Link',
+    'reset_password' => 'Click here to reset your password:',
+    'rights_reserved' => 'All rights reserved.',
+    'serial' => 'Serial',
+    'snipe_webhook_test' => 'Snipe-IT Integration Test',
+    'snipe_webhook_summary' => 'Snipe-IT Integration Test Summary',
+    'supplier' => 'Supplier',
+    'tag' => 'Tag',
+    'test_email' => 'Test Email from Snipe-IT',
+    'test_mail_text' => 'This is a test from the Snipe-IT Asset Management System. If you got this, mail is working :)',
+    'the_following_item' => 'The following item has been checked in: ',
+    'to_reset' => 'To reset your :web password, complete this form:',
+    'type' => 'Type',
+    'upcoming-audits' => 'There is :count asset that is coming up for audit within :threshold days.|There are :count assets that are coming up for audit within :threshold days.',
+    'user' => 'User',
+    'username' => 'Username',
+    'unaccepted_asset_reminder' => 'Reminder: You have Unaccepted Assets.',
+    'welcome' => 'Welcome :name',
+    'welcome_to' => 'Welcome to :web!',
+    'your_assets' => 'View Your Assets',
+    'your_credentials' => 'Your Snipe-IT credentials',
+    'mail_sent' => 'Mail sent successfully!',
+];
diff --git a/resources/lang/om-ET/pagination.php b/resources/lang/om-ET/pagination.php
new file mode 100644
index 0000000000..b573b51e91
--- /dev/null
+++ b/resources/lang/om-ET/pagination.php
@@ -0,0 +1,20 @@
+<?php
+
+return array(
+
+    /*
+    |--------------------------------------------------------------------------
+    | Pagination Language Lines
+    |--------------------------------------------------------------------------
+    |
+    | The following language lines are used by the paginator library to build
+    | the simple pagination links. You are free to change them to anything
+    | you want to customize your views to better match your application.
+    |
+    */
+
+    'previous' => '&laquo; Previous',
+
+    'next'     => 'Next &raquo;',
+
+);
diff --git a/resources/lang/om-ET/passwords.php b/resources/lang/om-ET/passwords.php
new file mode 100644
index 0000000000..41a87f98ed
--- /dev/null
+++ b/resources/lang/om-ET/passwords.php
@@ -0,0 +1,9 @@
+<?php
+
+return [
+    'sent'	        => 'If a matching user with a valid email address exists in our system, a password recovery email has been sent.',
+    'user'			=> 'If a matching user with a valid email address exists in our system, a password recovery email has been sent.',
+    'token'         => 'This password reset token is invalid or expired, or does not match the username provided.',
+    'reset'         => 'Your password has been reset!',
+    'password_change'  => 'Your password has been updated!',
+];
diff --git a/resources/lang/om-ET/reminders.php b/resources/lang/om-ET/reminders.php
new file mode 100644
index 0000000000..8a197467df
--- /dev/null
+++ b/resources/lang/om-ET/reminders.php
@@ -0,0 +1,21 @@
+<?php
+
+return array(
+
+    /*
+    |--------------------------------------------------------------------------
+    | Password Reminder Language Lines
+    |--------------------------------------------------------------------------
+    |
+    | The following language lines are the default lines which match reasons
+    | that are given by the password broker for a password update attempt
+    | has failed, such as for an invalid token or invalid new password.
+    |
+    */
+
+    "password" => "Passwords must be six characters and match the confirmation.",
+    "user"     => "Username or email address is incorrect",
+    "token"    => 'This password reset token is invalid or expired, or does not match the username provided.',
+    'sent'	   => 'If a matching user with a valid email address exists in our system, a password recovery email has been sent.',
+
+);
diff --git a/resources/lang/om-ET/table.php b/resources/lang/om-ET/table.php
new file mode 100644
index 0000000000..16e32b148f
--- /dev/null
+++ b/resources/lang/om-ET/table.php
@@ -0,0 +1,11 @@
+<?php
+
+return array(
+
+    'actions'	 	        => 'Actions',
+    'action' 		        => 'Action',
+    'by'      		        => 'By',
+    'item' 			        => 'Item',
+    'no_matching_records'   => 'No matching records found',
+
+);
diff --git a/resources/lang/om-ET/validation.php b/resources/lang/om-ET/validation.php
new file mode 100644
index 0000000000..99c847f589
--- /dev/null
+++ b/resources/lang/om-ET/validation.php
@@ -0,0 +1,248 @@
+<?php
+
+return [
+
+    /*
+    |--------------------------------------------------------------------------
+    | Validation Language Lines
+    |--------------------------------------------------------------------------
+    |
+    | The following language lines contain the default error messages used by
+    | the validator class. Some of these rules have multiple versions such
+    | such as the size rules. Feel free to tweak each of these messages.
+    |
+    */
+
+    'accepted' => 'The :attribute field must be accepted.',
+    'accepted_if' => 'The :attribute field must be accepted when :other is :value.',
+    'active_url' => 'The :attribute field must be a valid URL.',
+    'after' => 'The :attribute field must be a date after :date.',
+    'after_or_equal' => 'The :attribute field must be a date after or equal to :date.',
+    'alpha' => 'The :attribute field must only contain letters.',
+    'alpha_dash' => 'The :attribute field must only contain letters, numbers, dashes, and underscores.',
+    'alpha_num' => 'The :attribute field must only contain letters and numbers.',
+    'array' => 'The :attribute field must be an array.',
+    'ascii' => 'The :attribute field must only contain single-byte alphanumeric characters and symbols.',
+    'before' => 'The :attribute field must be a date before :date.',
+    'before_or_equal' => 'The :attribute field must be a date before or equal to :date.',
+    'between' => [
+        'array' => 'The :attribute field must have between :min and :max items.',
+        'file' => 'The :attribute field must be between :min and :max kilobytes.',
+        'numeric' => 'The :attribute field must be between :min and :max.',
+        'string' => 'The :attribute field must be between :min and :max characters.',
+    ],
+    'boolean' => 'The :attribute field must be true or false.',
+    'can' => 'The :attribute field contains an unauthorized value.',
+    'confirmed' => 'The :attribute field confirmation does not match.',
+    'contains' => 'The :attribute field is missing a required value.',
+    'current_password' => 'The password is incorrect.',
+    'date' => 'The :attribute field must be a valid date.',
+    'date_equals' => 'The :attribute field must be a date equal to :date.',
+    'date_format' => 'The :attribute field must match the format :format.',
+    'decimal' => 'The :attribute field must have :decimal decimal places.',
+    'declined' => 'The :attribute field must be declined.',
+    'declined_if' => 'The :attribute field must be declined when :other is :value.',
+    'different' => 'The :attribute field and :other must be different.',
+    'digits' => 'The :attribute field must be :digits digits.',
+    'digits_between' => 'The :attribute field must be between :min and :max digits.',
+    'dimensions' => 'The :attribute field has invalid image dimensions.',
+    'distinct' => 'The :attribute field has a duplicate value.',
+    'doesnt_end_with' => 'The :attribute field must not end with one of the following: :values.',
+    'doesnt_start_with' => 'The :attribute field must not start with one of the following: :values.',
+    'email' => 'The :attribute field must be a valid email address.',
+    'ends_with' => 'The :attribute field must end with one of the following: :values.',
+    'enum' => 'The selected :attribute is invalid.',
+    'exists' => 'The selected :attribute is invalid.',
+    'extensions' => 'The :attribute field must have one of the following extensions: :values.',
+    'file' => 'The :attribute field must be a file.',
+    'filled' => 'The :attribute field must have a value.',
+    'gt' => [
+        'array' => 'The :attribute field must have more than :value items.',
+        'file' => 'The :attribute field must be greater than :value kilobytes.',
+        'numeric' => 'The :attribute field must be greater than :value.',
+        'string' => 'The :attribute field must be greater than :value characters.',
+    ],
+    'gte' => [
+        'array' => 'The :attribute field must have :value items or more.',
+        'file' => 'The :attribute field must be greater than or equal to :value kilobytes.',
+        'numeric' => 'The :attribute field must be greater than or equal to :value.',
+        'string' => 'The :attribute field must be greater than or equal to :value characters.',
+    ],
+    'hex_color' => 'The :attribute field must be a valid hexadecimal color.',
+    'image' => 'The :attribute field must be an image.',
+    'import_field_empty'    => 'The value for :fieldname cannot be null.',
+    'in' => 'The selected :attribute is invalid.',
+    'in_array' => 'The :attribute field must exist in :other.',
+    'integer' => 'The :attribute field must be an integer.',
+    'ip' => 'The :attribute field must be a valid IP address.',
+    'ipv4' => 'The :attribute field must be a valid IPv4 address.',
+    'ipv6' => 'The :attribute field must be a valid IPv6 address.',
+    'json' => 'The :attribute field must be a valid JSON string.',
+    'list' => 'The :attribute field must be a list.',
+    'lowercase' => 'The :attribute field must be lowercase.',
+    'lt' => [
+        'array' => 'The :attribute field must have less than :value items.',
+        'file' => 'The :attribute field must be less than :value kilobytes.',
+        'numeric' => 'The :attribute field must be less than :value.',
+        'string' => 'The :attribute field must be less than :value characters.',
+    ],
+    'lte' => [
+        'array' => 'The :attribute field must not have more than :value items.',
+        'file' => 'The :attribute field must be less than or equal to :value kilobytes.',
+        'numeric' => 'The :attribute field must be less than or equal to :value.',
+        'string' => 'The :attribute field must be less than or equal to :value characters.',
+    ],
+    'mac_address' => 'The :attribute field must be a valid MAC address.',
+    'max' => [
+        'array' => 'The :attribute field must not have more than :max items.',
+        'file' => 'The :attribute field must not be greater than :max kilobytes.',
+        'numeric' => 'The :attribute field must not be greater than :max.',
+        'string' => 'The :attribute field must not be greater than :max characters.',
+    ],
+    'max_digits' => 'The :attribute field must not have more than :max digits.',
+    'mimes' => 'The :attribute field must be a file of type: :values.',
+    'mimetypes' => 'The :attribute field must be a file of type: :values.',
+    'min' => [
+        'array' => 'The :attribute field must have at least :min items.',
+        'file' => 'The :attribute field must be at least :min kilobytes.',
+        'numeric' => 'The :attribute field must be at least :min.',
+        'string' => 'The :attribute field must be at least :min characters.',
+    ],
+    'min_digits' => 'The :attribute field must have at least :min digits.',
+    'missing' => 'The :attribute field must be missing.',
+    'missing_if' => 'The :attribute field must be missing when :other is :value.',
+    'missing_unless' => 'The :attribute field must be missing unless :other is :value.',
+    'missing_with' => 'The :attribute field must be missing when :values is present.',
+    'missing_with_all' => 'The :attribute field must be missing when :values are present.',
+    'multiple_of' => 'The :attribute field must be a multiple of :value.',
+    'not_in' => 'The selected :attribute is invalid.',
+    'not_regex' => 'The :attribute field format is invalid.',
+    'numeric' => 'The :attribute field must be a number.',
+    'password' => [
+        'letters' => 'The :attribute field must contain at least one letter.',
+        'mixed' => 'The :attribute field must contain at least one uppercase and one lowercase letter.',
+        'numbers' => 'The :attribute field must contain at least one number.',
+        'symbols' => 'The :attribute field must contain at least one symbol.',
+        'uncompromised' => 'The given :attribute has appeared in a data leak. Please choose a different :attribute.',
+    ],
+    'percent'       => 'The depreciation minimum must be between 0 and 100 when depreciation type is percentage.',
+
+    'present' => 'The :attribute field must be present.',
+    'present_if' => 'The :attribute field must be present when :other is :value.',
+    'present_unless' => 'The :attribute field must be present unless :other is :value.',
+    'present_with' => 'The :attribute field must be present when :values is present.',
+    'present_with_all' => 'The :attribute field must be present when :values are present.',
+    'prohibited' => 'The :attribute field is prohibited.',
+    'prohibited_if' => 'The :attribute field is prohibited when :other is :value.',
+    'prohibited_unless' => 'The :attribute field is prohibited unless :other is in :values.',
+    'prohibits' => 'The :attribute field prohibits :other from being present.',
+    'regex' => 'The :attribute field format is invalid.',
+    'required' => 'The :attribute field is required.',
+    'required_array_keys' => 'The :attribute field must contain entries for: :values.',
+    'required_if' => 'The :attribute field is required when :other is :value.',
+    'required_if_accepted' => 'The :attribute field is required when :other is accepted.',
+    'required_if_declined' => 'The :attribute field is required when :other is declined.',
+    'required_unless' => 'The :attribute field is required unless :other is in :values.',
+    'required_with' => 'The :attribute field is required when :values is present.',
+    'required_with_all' => 'The :attribute field is required when :values are present.',
+    'required_without' => 'The :attribute field is required when :values is not present.',
+    'required_without_all' => 'The :attribute field is required when none of :values are present.',
+    'same' => 'The :attribute field must match :other.',
+    'size' => [
+        'array' => 'The :attribute field must contain :size items.',
+        'file' => 'The :attribute field must be :size kilobytes.',
+        'numeric' => 'The :attribute field must be :size.',
+        'string' => 'The :attribute field must be :size characters.',
+    ],
+    'starts_with' => 'The :attribute field must start with one of the following: :values.',
+    'string'               => 'The :attribute must be a string.',
+    'two_column_unique_undeleted' => 'The :attribute must be unique across :table1 and :table2. ',
+    'unique_undeleted'     => 'The :attribute must be unique.',
+    'non_circular'         => 'The :attribute must not create a circular reference.',
+    'not_array'            => ':attribute cannot be an array.',
+    'disallow_same_pwd_as_user_fields' => 'Password cannot be the same as the username.',
+    'letters'              => 'Password must contain at least one letter.',
+    'numbers'              => 'Password must contain at least one number.',
+    'case_diff'            => 'Password must use mixed case.',
+    'symbols'              => 'Password must contain symbols.',
+    'timezone' => 'The :attribute field must be a valid timezone.',
+    'unique' => 'The :attribute has already been taken.',
+    'uploaded' => 'The :attribute failed to upload.',
+    'uppercase' => 'The :attribute field must be uppercase.',
+    'url' => 'The :attribute field must be a valid URL.',
+    'ulid' => 'The :attribute field must be a valid ULID.',
+    'uuid' => 'The :attribute field must be a valid UUID.',
+    'fmcs_location' => 'Full multiple company support and location scoping is enabled in the Admin Settings, and the selected location and selected company are not compatible.',
+
+
+    /*
+    |--------------------------------------------------------------------------
+    | Custom Validation Language Lines
+    |--------------------------------------------------------------------------
+    |
+    | Here you may specify custom validation messages for attributes using the
+    | convention "attribute.rule" to name the lines. This makes it quick to
+    | specify a specific custom language line for a given attribute rule.
+    |
+    */
+
+    'email_array'      => 'One or more email addresses is invalid.',
+    'checkboxes'           => ':attribute contains invalid options.',
+    'radio_buttons'        => ':attribute is invalid.',
+    
+    'custom' => [
+        'alpha_space' => 'The :attribute field contains a character that is not allowed.',
+
+        'hashed_pass'      => 'Your current password is incorrect',
+        'dumbpwd'          => 'That password is too common.',
+        'statuslabel_type' => 'You must select a valid status label type',
+        'custom_field_not_found'          => 'This field does not seem to exist, please double check your custom field names.',
+        'custom_field_not_found_on_model' => 'This field seems to exist, but is not available on this Asset Model\'s fieldset.',
+
+        // date_format validation with slightly less stupid messages. It duplicates a lot, but it gets the job done :(
+        // We use this because the default error message for date_format reflects php Y-m-d, which non-PHP
+        // people won't know how to format.
+        'purchase_date.date_format'     => 'The :attribute must be a valid date in YYYY-MM-DD format',
+        'last_audit_date.date_format'   =>  'The :attribute must be a valid date in YYYY-MM-DD hh:mm:ss format',
+        'expiration_date.date_format'   =>  'The :attribute must be a valid date in YYYY-MM-DD format',
+        'termination_date.date_format'  =>  'The :attribute must be a valid date in YYYY-MM-DD format',
+        'expected_checkin.date_format'  =>  'The :attribute must be a valid date in YYYY-MM-DD format',
+        'start_date.date_format'        =>  'The :attribute must be a valid date in YYYY-MM-DD format',
+        'end_date.date_format'          =>  'The :attribute must be a valid date in YYYY-MM-DD format',
+        'invalid_value_in_field' => 'Invalid value included in this field',
+
+        'ldap_username_field' => [
+            'not_in' =>         '<code>sAMAccountName</code> (mixed case) will likely not work. You should use <code>samaccountname</code> (lowercase) instead.'
+        ],
+        'ldap_auth_filter_query' => ['not_in' => '<code>uid=samaccountname</code> is probably not a valid auth filter. You probably want <code>uid=</code> '],
+        'ldap_filter' => ['regex' => 'This value should probably not be wrapped in parentheses.'],
+
+        ],
+    /*
+    |--------------------------------------------------------------------------
+    | Custom Validation Attributes
+    |--------------------------------------------------------------------------
+    |
+    | The following language lines are used to swap attribute place-holders
+    | with something more reader friendly such as E-Mail Address instead
+    | of "email". This simply helps us make messages a little cleaner.
+    |
+    */
+
+    'attributes' => [],
+
+    /*
+    |--------------------------------------------------------------------------
+    | Generic Validation Messages - we use these in the jquery validation where we don't have
+    | access to the :attribute
+    |--------------------------------------------------------------------------
+    */
+
+    'generic' => [
+        'invalid_value_in_field' => 'Invalid value included in this field',
+        'required' => 'This field is required',
+        'email' => 'Please enter a valid email address',
+    ],
+
+
+];
diff --git a/resources/lang/pl-PL/account/general.php b/resources/lang/pl-PL/account/general.php
index f957760333..c126a52836 100644
--- a/resources/lang/pl-PL/account/general.php
+++ b/resources/lang/pl-PL/account/general.php
@@ -2,10 +2,17 @@
 
 return array(
     'personal_api_keys' => 'Osobiste klucze API',
-    'api_key_warning' => 'When generating an API token, be sure to copy it down immediately as they will not be visible to you again.',
+    'personal_access_token' => 'Osobisty token dostępu',
+    'personal_api_keys_success' => 'Pomyślnie utworzono klucz dostępu API :key',
+    'here_is_api_key' => 'Oto twój nowy osobisty token dostępu. Jest to jedyny raz, gdy zostanie wyświetlony, więc nie zgub go! Możesz teraz użyć tego tokenu, aby wywołać żądania API.',
+    'api_key_warning' => 'Po wygenerowaniu tokena API upewnij się, że natychmiast go skopiujesz, ponieważ
+                    nie będzie potem widoczny.',
     'api_base_url' => 'Twój bazowy adres URL API znajduje się w:',
     'api_base_url_endpoint' => '/&lt;endpoint&gt;',
     'api_token_expiration_time' => 'Tokeny API tracą ważność za:',
-    'api_reference' => 'Please check the <a href="https://snipe-it.readme.io/reference" target="_blank">API reference</a> to find specific API endpoints and additional API documentation.',
-    'profile_updated' => 'Account successfully updated',
+    'api_reference' => 'Sprawdź <a href="https://snipe-it.readme.io/referencję" target="_blank">API reference</a>, aby                    znaleźć konkretne enpoint-y API i dodatkową dokumentację API.',
+    'profile_updated' => 'Aktualizacja konta powiodła się',
+    'no_tokens' => 'Nie utworzyłeś żadnych osobistych tokenów.',
+    'enable_sounds' => 'Włącz efekty dźwiękowe',
+    'enable_confetti' => 'Włącz efekty confetti',
 );
diff --git a/resources/lang/pl-PL/admin/accessories/message.php b/resources/lang/pl-PL/admin/accessories/message.php
index 6b16eb6678..0ad5684935 100644
--- a/resources/lang/pl-PL/admin/accessories/message.php
+++ b/resources/lang/pl-PL/admin/accessories/message.php
@@ -26,7 +26,11 @@ return array(
         'error'   		=> 'Akcesoria nie zostały przypisane, spróbuj ponownie',
         'success' 		=> 'Akcesoria przypisany pomyślnie.',
         'unavailable'   => 'Akcesoria nie są dostępne do zakupu. Sprawdź ilość dostępną',
-        'user_does_not_exist' => 'Użytkownik nie istnieje. Spróbuj ponownie.'
+        'user_does_not_exist' => 'Użytkownik nie istnieje. Spróbuj ponownie.',
+         'checkout_qty' => array(
+            'lte'  => 'Obecnie dostępne jest tylko jedno akcesorium tego typu i próbujesz wydać :checkout_qty. Dostostosuj ilość wydania lub stan magazynowy tego akcesorium i spróbuj ponownie. Obecnie jest :number_currently_remaining dostępnych akcesoriów i próbujesz wydać :checkout_qty. Dostostosuj ilość wydania lub stan magazynowy tego akcesorium i spróbuj ponownie.',
+            ),
+           
     ),
 
     'checkin' => array(
diff --git a/resources/lang/pl-PL/admin/accessories/table.php b/resources/lang/pl-PL/admin/accessories/table.php
index ec387f110d..857397db92 100644
--- a/resources/lang/pl-PL/admin/accessories/table.php
+++ b/resources/lang/pl-PL/admin/accessories/table.php
@@ -6,6 +6,4 @@ return array(
     'id'      					=> 'ID',
     'require_acceptance'      	=> 'Akceptacja',
     'title'      				=> 'Nazwa akcesoriów',
-
-
 );
diff --git a/resources/lang/pl-PL/admin/components/message.php b/resources/lang/pl-PL/admin/components/message.php
index ceac0a95e9..1ca364f5ad 100644
--- a/resources/lang/pl-PL/admin/components/message.php
+++ b/resources/lang/pl-PL/admin/components/message.php
@@ -17,7 +17,8 @@ return array(
     'delete' => array(
         'confirm'   => 'Czy na pewno chcesz usunąć ten składnik?',
         'error'   => 'Wystąpił problem podczas usuwania składnika. Spróbuj ponownie.',
-        'success' => 'Składnik został usunięty pomyślnie.'
+        'success' => 'Składnik został usunięty pomyślnie.',
+        'error_qty'   => 'Some components of this type are still checked out. Please check them in and try again.',
     ),
 
      'checkout' => array(
diff --git a/resources/lang/pl-PL/admin/consumables/general.php b/resources/lang/pl-PL/admin/consumables/general.php
index 068ae529a5..6f9e75720b 100644
--- a/resources/lang/pl-PL/admin/consumables/general.php
+++ b/resources/lang/pl-PL/admin/consumables/general.php
@@ -8,4 +8,5 @@ return array(
     'remaining' 			            => 'Pozostało',
     'total' 			                => 'Łącznie',
     'update'                            => 'Aktualizuj materiał eksploatacyjny',
+    'inventory_warning'                 => 'Stan magazynowy tego materiału jest poniżej minimum :min_count',
 );
diff --git a/resources/lang/pl-PL/admin/consumables/message.php b/resources/lang/pl-PL/admin/consumables/message.php
index 3e16db0c07..d8bc49c9b2 100644
--- a/resources/lang/pl-PL/admin/consumables/message.php
+++ b/resources/lang/pl-PL/admin/consumables/message.php
@@ -2,6 +2,7 @@
 
 return array(
 
+    'invalid_category_type' => 'Kategoria musi być materiałem eksploatacyjnym.',
     'does_not_exist' => 'Materiał eksploatacyjny nie istnieje.',
 
     'create' => array(
diff --git a/resources/lang/pl-PL/admin/custom_fields/general.php b/resources/lang/pl-PL/admin/custom_fields/general.php
index fa06f168f5..f87b2d9bd2 100644
--- a/resources/lang/pl-PL/admin/custom_fields/general.php
+++ b/resources/lang/pl-PL/admin/custom_fields/general.php
@@ -35,7 +35,7 @@ return [
     'create_field_title' => 'Utwórz pole niestandardowe',
     'value_encrypted'      	        => 'Wartość tego pola jest zaszyfrowana w bazie danych. Tylko admini będą mogli wyświetlić rozszyfrowaną wartość',
     'show_in_email'     => 'Czy podać wartość tego pola w e-mailach z przypisaniem, wysłanych do użytkownika? Zaszyfrowane pola nie mogą być zawarte w wiadomościach e-mail',
-    'show_in_email_short'     => 'Dołącz do wiadomości e-mail.',
+    'show_in_email_short' => 'Dołącz do wiadomości e-mail',
     'help_text' => 'Tekst pomocniczy',
     'help_text_description' => 'Jest to tekst opcjonalny, który pojawi się pod elementami formularza podczas edycji zasobu w celu zapewnienia kontekstu.',
     'about_custom_fields_title' => 'O polach niestandardowych',
@@ -57,5 +57,8 @@ return [
     'show_in_requestable_list_short' => 'Pokaż na liście żądanych zasobów',
     'show_in_requestable_list' => 'Pokaż wartość w żądanej liście zasobów. Zaszyfrowane pola nie będą wyświetlane',
     'encrypted_options' => 'To pole jest zaszyfrowane, więc niektóre opcje wyświetlania nie będą dostępne.',
+    'display_checkin' => 'Display in checkin forms',
+    'display_checkout' => 'Display in checkout forms',
+    'display_audit' => 'Display in audit forms',
 
 ];
diff --git a/resources/lang/pl-PL/admin/custom_fields/message.php b/resources/lang/pl-PL/admin/custom_fields/message.php
index 3394d8404b..a8eb12e951 100644
--- a/resources/lang/pl-PL/admin/custom_fields/message.php
+++ b/resources/lang/pl-PL/admin/custom_fields/message.php
@@ -5,6 +5,7 @@ return array(
     'field' => array(
         'invalid'   => 'Pole nie istnieje.',
         'already_added'   => 'Pole już istnieje',
+        'none_selected'   => 'Nie wybrano żadnego pola',
 
         'create' => array(
             'error'   => 'Pole nie zostało utworzone. Spróbuj ponownie.',
diff --git a/resources/lang/pl-PL/admin/depreciations/general.php b/resources/lang/pl-PL/admin/depreciations/general.php
index cf0d2d0ce1..2d12e14021 100644
--- a/resources/lang/pl-PL/admin/depreciations/general.php
+++ b/resources/lang/pl-PL/admin/depreciations/general.php
@@ -13,4 +13,8 @@ return [
     'no_depreciations_warning'               => '<strong>Uwaga: </strong>
                       Obecnie nie masz żadnych skonfigurowanych amortyzacji.
                       Skonfiguruj co najmniej jedną amortyzację, aby wyświetlić raport.',
+    'depreciation_method'                   => 'Raport Amortyzacji',
+    'linear_depreciation'                   => 'Linear (Default)',
+    'half_1'                                => 'Half-year convention, always applied',
+    'half_2'                                => 'Half-year convention, applied with condition',
 ];
diff --git a/resources/lang/pl-PL/admin/hardware/form.php b/resources/lang/pl-PL/admin/hardware/form.php
index 156307e07d..fb71b1272d 100644
--- a/resources/lang/pl-PL/admin/hardware/form.php
+++ b/resources/lang/pl-PL/admin/hardware/form.php
@@ -39,9 +39,9 @@ return [
     'order'				=> 'Numer zamówienia',
     'qr'				=> 'Kod QR',
     'requestable'		=> 'Użytkownicy mogą wymagać tego zasobu',
-    'redirect_to_all'   => 'Return to all :type',
-    'redirect_to_type'   => 'Go to :type',
-    'redirect_to_checked_out_to'   => 'Go to Checked Out to',
+    'redirect_to_all'   => 'Wróć do wszystkich :type',
+    'redirect_to_type'   => 'Przejdź do :type',
+    'redirect_to_checked_out_to'   => 'Przejdź do wydania do',
     'select_statustype'	=> 'Wybierz status',
     'serial'			=> 'Numer seryjny',
     'status'			=> 'Status',
@@ -55,8 +55,11 @@ return [
     'asset_location_update_default' => 'Zaktualizuj tylko domyślną lokalizację',
     'asset_location_update_actual' => 'Aktualizuj tylko bieżącą lokalizację',
     'asset_not_deployable' => 'Ten status oznacza brak możliwości wdrożenia. Ten zasób nie może zostać przypisany.',
-    'asset_deployable' => 'Ten status oznacza możliwość wdrożenia. Ten zasób może zostać przypisany.',
+    'asset_not_deployable_checkin' => 'Ten status nie jest wdrożeniowym. Użycie tego statusu uniemożliwi wydanie zasobu.',
+    'asset_deployable' => 'This asset can be checked out.',
     'processing_spinner' => 'Przetwarzanie... (To może zająć trochę czasu dla dużych plików)',
+    'processing' => 'Przetwarzanie... ',
     'optional_infos'  => 'Informacje opcjonalne',
-    'order_details'   => 'Informacje związane z zamówieniem'
+    'order_details'   => 'Informacje związane z zamówieniem',
+    'calc_eol'    => 'W przypadku unieważnienia daty wycofania z eksploatacji, użyj automatycznego obliczenia wycofania z eksploatacji w oparciu o datę zakupu i czas wycofania z eksploatacji.',
 ];
diff --git a/resources/lang/pl-PL/admin/hardware/general.php b/resources/lang/pl-PL/admin/hardware/general.php
index 3005434105..0f13cbee76 100644
--- a/resources/lang/pl-PL/admin/hardware/general.php
+++ b/resources/lang/pl-PL/admin/hardware/general.php
@@ -5,8 +5,8 @@ return [
     'about_assets_text'            => 'Aktywa są to elementy identyfikowane przez numer seryjny lub etykietę.  Są to przedmioty o większej wartości, gdzie liczy się identyfikacji określonego elementu.',
     'archived'  				=> 'Zarchiwizowane',
     'asset'  					=> 'Aktywo',
-    'bulk_checkout'             => 'Przypisz aktywa',
-    'bulk_checkin'              => 'Przyjmij aktywa',
+    'bulk_checkout'             => 'Zbiorcze Przypisanie',
+    'bulk_checkin'              => 'Bulk Checkin',
     'checkin'  					=> 'Potwierdzanie zasobu/aktywa',
     'checkout'  				=> 'Przypisz zasób',
     'clone'  					=> 'Klonuj zasób',
@@ -15,8 +15,8 @@ return [
     'delete_confirm'            => 'Czy na pewno chcesz usunąć?',
     'edit'  					=> 'Edytuj zasób',
     'model_deleted'  			=> 'Ten model zasobów został usunięty. Musisz przywrócić model zanim będziesz mógł przywrócić zasób.',
-    'model_invalid'             => 'This model for this asset is invalid.',
-    'model_invalid_fix'         => 'The asset must be updated use a valid asset model before attempting to check it in or out, or to audit it.',
+    'model_invalid'             => 'Nieprawidłowy model dla tego zasobu.',
+    'model_invalid_fix'         => 'Zasób musi być zaktualizowany za pomocą ważnego modelu aktywów przed próbą sprawdzenia go w lub poza nim lub audytu.',
     'requestable'               => 'Żądane',
     'requested'				    => 'Zamówione',
     'not_requestable'           => 'Brak możliwości zarządzania',
@@ -27,12 +27,11 @@ return [
     'undeployable_tooltip'  	=> 'Ten zasób ma etykietę statusu, która nie może być uruchomiona i nie może zostać zablokowana w tym czasie.',
     'view'  					=> 'Wyświetl nabytki',
     'csv_error' => 'Wystąpił błąd w twoim pliku CSV:',
-    'import_text' => '<p>Prześlij plik CSV zawierający historię zasobów. Aktywa i użytkownicy MUSI już istnieć w systemie lub zostaną pominięci. Dopasowywanie zasobów do importu historii odbywa się z tagiem aktywów. Będziemy próbowali znaleźć pasującego użytkownika na podstawie podanej nazwy użytkownika i kryteriów, które wybrałeś poniżej. Jeśli nie wybierzesz kryteriów poniżej, spróbuje po prostu dopasować format nazwy użytkownika, który skonfigurowałeś w <code>Admin &gt; Ustawienia ogólne</code>.</p><p>Pola zawarte w CSV muszą odpowiadać nagłówkom: <strong>Tag, Nazwa, Data Zamówienia, Data Zamówienia,</strong>. Wszelkie dodatkowe pola zostaną zignorowane. </p><p>Data sprawdzenia: puste lub przyszłe daty zaznaczenia będą zamawiać elementy do powiązanego użytkownika. Wyłączenie kolumny Data wyboru utworzy datę wyboru z dzisiejszą datą.</p>
-    ',
+    'import_text' => '<p>Upload a CSV that contains asset history. The assets and users MUST already exist in the system, or they will be skipped. Matching assets for history import happens against the asset tag. We will try to find a matching user based on the user\'s name you provide, and the criteria you select below. If you do not select any criteria below, it will simply try to match on the username format you configured in the <code>Admin &gt; General Settings</code>.</p><p>Fields included in the CSV must match the headers: <strong>Asset Tag, Name, Checkout Date, Checkin Date</strong>. Any additional fields will be ignored. </p><p>Checkin Date: blank or future checkin dates will checkout items to associated user.  Excluding the Checkin Date column will create a checkin date with todays date.</p>    ',
     'csv_import_match_f-l' => 'Spróbuj dopasować użytkowników o formacie <strong>imie.Nazwisko</strong> (<code>jane.smith</code>)',
     'csv_import_match_initial_last' => 'Spróbuj dopasować użytkowników według formatu <strong>pierwsze imię</strong> (<code>jsmith</code>)',
     'csv_import_match_first' => 'Spróbuj dopasować użytkowników o formacie <strong>imienia</strong> (<code>jane</code>)',
-    'csv_import_match_email' => 'Try to match users by <strong>email</strong> as username',
+    'csv_import_match_email' => 'Spróbuj dopasować użytkowników po <strong>adresie e-mail</strong>',
     'csv_import_match_username' => 'Spróbuj dopasować użytkowników do nazwy użytkownika <strong></strong>',
     'error_messages' => 'Komunikat błędu:',
     'success_messages' => 'Wiadomości o powodzeniu:',
diff --git a/resources/lang/pl-PL/admin/hardware/message.php b/resources/lang/pl-PL/admin/hardware/message.php
index 17f46484da..dccbd95e0f 100644
--- a/resources/lang/pl-PL/admin/hardware/message.php
+++ b/resources/lang/pl-PL/admin/hardware/message.php
@@ -2,19 +2,23 @@
 
 return [
 
-    'undeployable' 		=> '<strong>Uwaga: </strong> To aktywo zostało oznaczone jako tymczasowo niemożliwe do wdrożenia.
-                        Jeśli jego stan się zmienił, zaktualizuj status aktywa.',
-    'does_not_exist' 	=> 'Nabytek/zasób nie istnieje.',
-    'does_not_exist_var'=> 'Asset with tag :asset_tag not found.',
-    'no_tag' 	        => 'No asset tag provided.',
+    'undeployable' 		 => '<strong>Uwaga:</strong> Ten nabytek został oznaczony jako obecnie nie przypisany. Jeśli jego status uległ zmianie proszę zaktualizować status nabytku.',
+    'does_not_exist' 	 => 'Nabytek/zasób nie istnieje.',
+    'does_not_exist_var' => 'Nie znaleziono zasobu o tagu :asset_tag.',
+    'no_tag' 	         => 'Nie podano tagu zasobu.',
     'does_not_exist_or_not_requestable' => 'Aktywo nie istnieje albo nie można go zażądać.',
-    'assoc_users'	 	=> 'Ten nabytek/zasób jest przypisany do użytkownika i nie może być usunięty. Proszę sprawdzić przypisanie nabytków/zasobów a następnie spróbować ponownie.',
-    'warning_audit_date_mismatch' 	=> 'This asset\'s next audit date (:next_audit_date) is before the last audit date (:last_audit_date). Please update the next audit date.',
+    'assoc_users'	 	 => 'Ten nabytek/zasób jest przypisany do użytkownika i nie może być usunięty. Proszę sprawdzić przypisanie nabytków/zasobów a następnie spróbować ponownie.',
+    'warning_audit_date_mismatch' 	=> 'Data następnego audytu (:next_audit_date) jest przed datą poprzedniego audytu (:last_audit_date). Zaktualizuj datę następnego audytu.',
+    'labels_generated'   => 'Etykiety zostały pomyślnie wygenerowane.',
+    'error_generating_labels' => 'Błąd podczas generowania etykiet.',
+    'no_assets_selected' => 'Nie wybrano żadnych zasobów.',
 
     'create' => [
         'error'   		=> 'Nabytek nie został utworzony, proszę spróbować ponownie. :(',
         'success' 		=> 'Nowy nabytek został utworzony. :)',
         'success_linked' => 'Zasób o tagu :tag został utworzony pomyślnie. <strong><a href=":link" style="color: white;">Kliknij tutaj, aby wyświetlić</a></strong>.',
+        'multi_success_linked' => 'Zasób z tagiem :link został utworzony pomyślnie.|:count aktywów zostało utworzonych pomyślnie. :links.',
+        'partial_failure' => 'Nie można utworzyć zasobu. Powód: :failures|:count aktywów nie mogły zostać utworzone. Powód: :failed',
     ],
 
     'update' => [
@@ -34,7 +38,7 @@ return [
     ],
 
     'audit' => [
-        'error'   		=> 'Asset audit unsuccessful: :error ',
+        'error'   		=> 'Audyt zasobu zakończony niepowodzeniem :error ',
         'success' 		=> 'Audyt aktywów pomyślnie zarejestrowany.',
     ],
 
@@ -52,20 +56,24 @@ return [
     ],
 
     'import' => [
+        'import_button'         => 'Przetwórz import',
         'error'                 => 'Niektóre elementy nie zostały poprawnie zaimportowane.',
         'errorDetail'           => 'Następujące elementy nie zostały zaimportowane z powodu błędów.',
         'success'               => 'Twój plik został zaimportowany',
         'file_delete_success'   => 'Twój plik został poprawnie usunięty',
         'file_delete_error'      => 'Plik nie może zostać usunięty',
         'file_missing' => 'Brakuje wybranego pliku',
+        'file_already_deleted' => 'Wybrany plik został już usunięty',
         'header_row_has_malformed_characters' => 'Jeden lub więcej atrybutów w wierszu nagłówka zawiera nieprawidłowe znaki UTF-8',
         'content_row_has_malformed_characters' => 'Jeden lub więcej atrybutów w pierwszym rzędzie zawartości zawiera nieprawidłowe znaki UTF-8',
+        'transliterate_failure' => 'Transliteration from :encoding to UTF-8 failed due to invalid characters in input'
     ],
 
 
     'delete' => [
         'confirm'   	=> 'Czy na pewno chcesz usunąć?',
         'error'   		=> 'Nie można usunąć. Proszę spróbować ponownie.',
+        'assigned_to_error' => '{1}Asset Tag: :asset_tag is currently checked out. Check in this device before deletion.|[2,*]Asset Tags: :asset_tag are currently checked out. Check in these devices before deletion.',
         'nothing_updated'   => 'Aktywa nie zostały wybrane, więc nic nie zostało usunięte.',
         'success' 		=> 'Nabytek został usunięty.',
     ],
@@ -78,6 +86,11 @@ return [
         'no_assets_selected' => 'Musisz wybrać co najmniej jeden zasób z listy',
     ],
 
+    'multi-checkout' => [
+        'error'   => 'Zasób nie został zablokowany, spróbuj ponownie|Zasoby nie zostały zablokowane, spróbuj ponownie',
+        'success' => 'Zasób wydany pomyślnie.|Zasoby wydane pomyślnie.',
+    ],
+
     'checkin' => [
         'error'   		=> 'Nie można przypisać nabytku/zasobu, proszę spróbować ponownie',
         'success' 		=> 'Nabytek/zasób przypisany.',
@@ -87,9 +100,10 @@ return [
     ],
 
     'requests' => [
-        'error'   		=> 'Aktywo nie zostało zawnioskowane, spróbuj ponownie',
-        'success' 		=> 'Aktywo zawnioskowe pomyślnie.',
-        'canceled'      => 'Żądanie przypisania zostało anulowane',
+        'error'   		=> 'Request was not successful, please try again.',
+        'success' 		=> 'Request successfully submitted.',
+        'canceled'      => 'Request successfully canceled.',
+        'cancel'        => 'Anuluj żądanie tego elementu',
     ],
 
 ];
diff --git a/resources/lang/pl-PL/admin/hardware/table.php b/resources/lang/pl-PL/admin/hardware/table.php
index 8fe1c8c070..26cfa901d2 100644
--- a/resources/lang/pl-PL/admin/hardware/table.php
+++ b/resources/lang/pl-PL/admin/hardware/table.php
@@ -25,7 +25,6 @@ return [
     'image'		    => 'Zdjęcie urządzenia',
     'days_without_acceptance' => 'Dni bez akceptacji',
     'monthly_depreciation' => 'Amortyzacja miesięczna',
-    'assigned_to'    => 'Przypisany do',
     'requesting_user' => 'Zapotrzebowanie od użytkownika',
     'requested_date' => 'Data złożenia zapotrzebowania',
     'changed'       => 'Zmieniono',
diff --git a/resources/lang/pl-PL/admin/kits/general.php b/resources/lang/pl-PL/admin/kits/general.php
index 1e39770423..1ad5481f9c 100644
--- a/resources/lang/pl-PL/admin/kits/general.php
+++ b/resources/lang/pl-PL/admin/kits/general.php
@@ -47,4 +47,5 @@ return [
     'kit_deleted'                       => 'Zestaw został pomyślnie usunięty',
     'kit_model_updated'                 => 'Model został pomyślnie zaktualizowany',
     'kit_model_detached'                => 'Model został pomyślnie odłączony',
+    'model_already_attached'            => 'Wzór już dołączony do zestawu',
 ];
diff --git a/resources/lang/pl-PL/admin/licenses/general.php b/resources/lang/pl-PL/admin/licenses/general.php
index dca1165b6e..aa9bf45769 100644
--- a/resources/lang/pl-PL/admin/licenses/general.php
+++ b/resources/lang/pl-PL/admin/licenses/general.php
@@ -14,6 +14,7 @@ return array(
     'info'  					=> 'Informacja o licencji',
     'license_seats'  			=> 'Licencje',
     'seat'  					=> 'Miejsce',
+    'seat_count'  				=> 'Siedzenie :count',
     'seats'  					=> 'Miejsca',
     'software_licenses'  		=> 'Licencje oprogramowania',
     'user'  					=> 'Użytkownik',
@@ -23,12 +24,12 @@ return array(
         [
             'checkin_all'           => [
                 'button'            => 'Zaznacz wszystkie miejsca',
-                'modal'             => 'Spowoduje to zaznaczenie jednego miejsca. | Ta akcja będzie sprawdzać wszystkie :checkedout_seats_count miejsc dla tej licencji.',
+                'modal'             => 'Ta akcja będzie sprawdzać jedno miejsce. | Ta akcja będzie sprawdzać wszystkie :checkedout_seats_count miejsc dla tej licencji.',
                 'enabled_tooltip'   => 'Zaznacz WSZYSTKIE miejsca dla tej licencji zarówno od użytkowników, jak i aktywów',
                 'disabled_tooltip'  => 'To jest wyłączone, ponieważ nie ma obecnie zamówionych miejsc',
                 'disabled_tooltip_reassignable'  => 'To jest wyłączone, ponieważ licencja nie jest przypisywana ponownie',
                 'success'           => 'Licencja pomyślnie odblokowana! | Wszystkie licencje zostały pomyślnie sprawdzone!',
-                'log_msg'           => 'Zamówione za pomocą licencji masowej w interfejsie licencyjnym',
+                'log_msg'           => 'Sprawdzone poprzez sprawdzenie licencji zbiorczej w interfejsie licencyjnym',
             ],
 
             'checkout_all'              => [
diff --git a/resources/lang/pl-PL/admin/licenses/message.php b/resources/lang/pl-PL/admin/licenses/message.php
index 95dcf9baa3..16cc59a73d 100644
--- a/resources/lang/pl-PL/admin/licenses/message.php
+++ b/resources/lang/pl-PL/admin/licenses/message.php
@@ -44,10 +44,13 @@ return array(
         'error'   => 'Nastąpił problem podczas weryfikacji licencji. Spróbuj ponownie',
         'success' => 'Licencja poprawna',
         'not_enough_seats' => 'Za mało dostępnych miejsc do zamówienia',
+        'mismatch' => 'Podane miejsce licencji nie jest zgodne z licencją',
+        'unavailable' => 'To miejsce nie jest dostępne do wydania.',
     ),
 
     'checkin' => array(
         'error'   => 'Nastąpił problem podczas weryfikacji licencji. Spróbuj ponownie',
+        'not_reassignable' => 'Licencja nie może zostać ponownie przypisana',
         'success' => 'Licencja poprawna'
     ),
 
diff --git a/resources/lang/pl-PL/admin/locations/message.php b/resources/lang/pl-PL/admin/locations/message.php
index 148b5a8072..400e68461e 100644
--- a/resources/lang/pl-PL/admin/locations/message.php
+++ b/resources/lang/pl-PL/admin/locations/message.php
@@ -3,11 +3,12 @@
 return array(
 
     'does_not_exist' => 'Lokalizacja nie istnieje.',
-    'assoc_users'    => 'This location is not currently deletable because it is the location of record for at least one asset or user, has assets assigned to it, or is the parent location of another location. Please update your models to no longer reference this company and try again. ',
+    'assoc_users'    => 'Ta lokalizacja nie jest obecnie usuwana, ponieważ jest to lokalizacja rekordu dla co najmniej jednego zasobu lub użytkownika, posiada przypisane do niego aktywa lub jest miejscem macierzystym innej lokalizacji. Zaktualizuj swoje rekordy, aby nie odnosić się już do tej lokalizacji i spróbuj ponownie ',
     'assoc_assets'	 => 'Lokalizacja obecnie jest skojarzona z minimum jednym aktywem i nie może zostać usunięta. Uaktualnij właściwości aktywów tak aby nie było relacji z tą lokalizacją i spróbuj ponownie. ',
     'assoc_child_loc'	 => 'Lokalizacja obecnie jest rodzicem minimum jeden innej lokalizacji i nie może zostać usunięta. Uaktualnij właściwości lokalizacji tak aby nie było relacji z tą lokalizacją i spróbuj ponownie. ',
     'assigned_assets' => 'Przypisane aktywa',
     'current_location' => 'Bieżąca lokalizacja',
+    'open_map' => 'Otwórz w mapach :map_provider_icon',
 
 
     'create' => array(
@@ -20,6 +21,11 @@ return array(
         'success' => 'Lokalizacja zaktualizowana pomyślnie.'
     ),
 
+    'restore' => array(
+        'error'   => 'Lokalizacja nie została przywrócona, spróbuj ponownie',
+        'success' => 'Lokalizacja została przywrócona pomyślnie.'
+    ),
+
     'delete' => array(
         'confirm'   	=> 'Czy na pewno usunąć wybraną lokalizację?',
         'error'   => 'Podczas usuwania lokalizacji napotkano problem. Spróbuj ponownie.',
diff --git a/resources/lang/pl-PL/admin/locations/table.php b/resources/lang/pl-PL/admin/locations/table.php
index 6d7e34aa86..8667d14a34 100644
--- a/resources/lang/pl-PL/admin/locations/table.php
+++ b/resources/lang/pl-PL/admin/locations/table.php
@@ -39,4 +39,5 @@ return [
     'signed_by_finance_auditor' => 'Podpisane przez (Audytor finansowy):',
     'signed_by_location_manager' => 'Podpisane przez (Audytor Lokalizacji):',
     'signed_by'                 => 'Podpisano przez:',
+    'clone'  					=> 'Clone Location',
 ];
diff --git a/resources/lang/pl-PL/admin/models/general.php b/resources/lang/pl-PL/admin/models/general.php
index b01daa05f7..419d8c8aa4 100644
--- a/resources/lang/pl-PL/admin/models/general.php
+++ b/resources/lang/pl-PL/admin/models/general.php
@@ -3,7 +3,7 @@
 return array(
     'about_models_title'     => 'O Modelach aktywów',
     'about_models_text'           => 'Modele aktywów są sposobem grupowania identycznych aktywów. "MBP 2013", "IPhone 6s", itp.',
-    'deleted'  					        => 'Ten model został usunięty.',
+    'deleted'  					=> 'Ten model został usunięty.',
     'bulk_delete'               => 'Zbiorcze usuwanie modeli aktywów',
     'bulk_delete_help'               => 'Użyj poniższych pól wyboru, aby potwierdzić usunięcie wybranych modeli zasobów. Modele zasobów z którymi są powiązane zasoby, nie mogą zostać usunięte, dopóki zasoby nie zostaną powiązane z innym modelem.',
     'bulk_delete_warn'          => 'Usuniesz model zasobu.|Usuniesz :model_count modele/modeli zasobów.',
diff --git a/resources/lang/pl-PL/admin/models/message.php b/resources/lang/pl-PL/admin/models/message.php
index 37f03b5d17..4eff4d1f88 100644
--- a/resources/lang/pl-PL/admin/models/message.php
+++ b/resources/lang/pl-PL/admin/models/message.php
@@ -7,7 +7,7 @@ return array(
     'no_association' => 'OSTRZEŻENIE! Model aktywów dla tego przedmiotu jest nieprawidłowy lub brakuje!',
     'no_association_fix' => 'To zepsuje rzeczy w dziwny i straszny sposób. Edytuj teraz ten zasób, aby przypisać mu model.',
     'assoc_users'	 => 'Ten model jest przypisany do minim jednego aktywa i nie może być usunięty. Proszę usunąć aktywa, a następnie spróbować ponownie. ',
-
+    'invalid_category_type' => 'Kategoria musi być kategorią zasobu.',
 
     'create' => array(
         'error'   => 'Model nie został stworzony. Spróbuj ponownie.',
diff --git a/resources/lang/pl-PL/admin/reports/general.php b/resources/lang/pl-PL/admin/reports/general.php
index 223897ada7..aec4e6f5f1 100644
--- a/resources/lang/pl-PL/admin/reports/general.php
+++ b/resources/lang/pl-PL/admin/reports/general.php
@@ -4,6 +4,7 @@ return [
     'info'   => 'Wybierz opcje, które chcesz by znalazły się w raporcie aktywów.',
     'deleted_user' => 'Usuń użytkownika',
     'send_reminder' => 'Wyślij przypomnienie',
+    'cannot_send_reminder' => 'User has been deleted or does not have an email address so cannot receive a reminder',
     'reminder_sent' => 'Przypomnienie wysłane',
     'acceptance_deleted' => 'Prośba o akceptację usunięta',
     'acceptance_request' => 'Prośba o akceptację',
@@ -13,5 +14,10 @@ return [
         'user_state' => 'Województwo użytkownika',
         'user_country' => 'Kraj użytkownika',
         'user_zip' => 'Kod pocztowy użytkownika'
-    ]
-];
\ No newline at end of file
+    ],
+    'open_saved_template' => 'Otwórz zapisany szablon',
+    'save_template' =>  'Zapisz szablon',
+    'select_a_template' => 'Wybierz szablon',
+    'template_name' => 'Nazwa szablonu',
+    'update_template' => 'Aktualizuj szablon',
+];
diff --git a/resources/lang/pl-PL/admin/reports/message.php b/resources/lang/pl-PL/admin/reports/message.php
index d9b7c1d740..50c0c7143a 100644
--- a/resources/lang/pl-PL/admin/reports/message.php
+++ b/resources/lang/pl-PL/admin/reports/message.php
@@ -1,5 +1,16 @@
 <?php
 
-return array(
-    'error'   => 'Musisz wybrać przynajmniej jedną opcje.'
-);
+return [
+    'about_templates' => 'O zapisanych szablonach',
+    'saving_templates_description' => 'Wybierz swoje opcje, a następnie wprowadź nazwę szablonu w polu powyżej i kliknij przycisk \'Zapisz szablon\'. Użyj listy rozwijanej, aby wybrać wcześniej zapisany szablon.',
+    'create'  => [
+        'success' => 'Pomyślnie zapisano szablon',
+    ],
+    'update' => [
+        'success' => 'Szablon zaktualizowany pomyślnie',
+    ],
+    'delete' => [
+        'success' => 'Usunięto szablon',
+        'no_delete_permission' => 'Szablon nie istnieje lub nie masz uprawnień do jego usunięcia.',
+    ],
+];
diff --git a/resources/lang/pl-PL/admin/settings/general.php b/resources/lang/pl-PL/admin/settings/general.php
index ba370bf3c2..682ae12dad 100644
--- a/resources/lang/pl-PL/admin/settings/general.php
+++ b/resources/lang/pl-PL/admin/settings/general.php
@@ -8,13 +8,13 @@ return [
     'ad_append_domain'          => 'Dołącz nazwę domeny do pola nazwy użytkownika',
     'ad_append_domain_help'     => 'Użytkownik nie jest wymagany do wpisywania "username@domain.local", może po prostu wpisać "username".',
     'admin_cc_email'            => 'Kopia',
-    'admin_cc_email_help'       => 'Jeśli chcesz otrzymywać kopię e-maili przypisań wysyłanych do użytkowników na dodatkowy adres e-mail, wpisz go tutaj. W przeciwnym razie zostaw to pole puste.',
+    'admin_cc_email_help'       => 'Send a copy of checkin/checkout emails to this address.',
     'admin_settings'            => 'Ustawienia administratora',
     'is_ad'				        => 'To jest serwer Active Directory',
     'alerts'                	=> 'Powiadomienia',
     'alert_title'               => 'Aktualizuj ustawienia powiadomień',
     'alert_email'				=> 'Wyślij powiadomienia do',
-    'alert_email_help'    => 'Adresy e-mail lub list dystrybucyjnych, do których mają być wysyłane powiadomienia, oddzielone przecinkami',
+    'alert_email_help'          => 'Adresy e-mail lub list dystrybucyjnych, do których mają być wysyłane powiadomienia, oddzielone przecinkami.',
     'alerts_enabled'			=> 'Alarmy włączone',
     'alert_interval'			=> 'Próg wygasających alarmów (w dniach)',
     'alert_inv_threshold'		=> 'Inwentarz progu alarmów',
@@ -31,15 +31,18 @@ return [
     'backups'					=> 'Kopie zapasowe',
     'backups_help'              => 'Utwórz, pobieraj i przywracaj kopie zapasowe ',
     'backups_restoring'         => 'Przywróć z kopii zapasowej',
+    'backups_clean' => 'Wyczyść kopię zapasową bazy danych przed przywróceniem',
+    'backups_clean_helptext' => "To może być przydatne, jeśli zmieniasz się pomiędzy wersjami bazy danych",
     'backups_upload'            => 'Prześlij kopię zapasową',
     'backups_path'              => 'Kopie zapasowe na serwerze są przechowywane w <code>:path</code>',
-    'backups_restore_warning'   => 'Użyj przycisku przywracania <small><span class="btn btn-xs btn-warning"><i class="text-white fas fa-retweet" aria-hidden="true"></i></span></small> aby przywrócić z poprzedniej kopii zapasowej. (To nie działa obecnie z pamięcią plików S3 lub Docker.<br><br>Twoja baza danych <strong>cała :app_name i wszystkie przesłane pliki zostaną całkowicie zastąpione</strong> przez to, co znajduje się w pliku kopii zapasowej.  ',
+    'backups_restore_warning'   => 'Use the restore button <small><span class="btn btn-xs btn-warning"><i class="text-white fas fa-retweet" aria-hidden="true"></i></span></small> to restore from a previous backup. (This does not currently work with S3 file storage or Docker.)<br><br>Your <strong>entire :app_name database and any uploaded files will be completely replaced</strong> by what\'s in the backup file  ',
     'backups_logged_out'         => 'Wszyscy istniejący użytkownicy, w tym Ty, zostaną wylogowani po zakończeniu przywracania.',
     'backups_large'             => 'Bardzo duże kopie zapasowe mogą przekroczyć limit czasu podczas próby przywrócenia i mogą nadal wymagać uruchomienia za pomocą wiersza poleceń. ',
     'barcode_settings'			=> 'Ustawienia Kodów Kreskowych',
     'confirm_purge'			    => 'Potwierdź wyczyszczenie',
     'confirm_purge_help'		=> 'Wprowadź tekst "DELETE" w poniższym polu, aby wyczyścić usunięte rekordy. Ta akcja nie może zostać cofnięta i będzie NIEZALEŻNIE usuwać wszystkich miękkich elementów i użytkowników. (powinieneś najpierw utworzyć kopię zapasową, po prostu aby być bezpiecznym.)',
     'custom_css'				=> 'Własny CSS',
+    'custom_css_placeholder'	=> 'Add your custom CSS',
     'custom_css_help'			=> 'Wprowadź własny kod CSS. Nie używaj tagów &lt;style&gt;&lt;/style&gt;.',
     'custom_forgot_pass_url'	=> 'Niestandardowy adres URL resetowania hasła',
     'custom_forgot_pass_url_help'	=> 'Zastępuje domyślny URL do strony "zapomniałeś hasła?" na ekranie logowania. Pomocne przy potrzebie przekierowania ludzi do własnej strony resetowania hasła LDAP. Uniemożliwi użytkownikowi zresetowanie hasła tradycyjną metodą.',
@@ -47,34 +50,34 @@ return [
     'dashboard_message_help'	=> 'Ten tekst pojawi się na pulpicie nawigacyjnym dla każdego, kto ma uprawnienia do wyświetlania pulpitu.',
     'default_currency'  		=> 'Domyślna Waluta',
     'default_eula_text'			=> 'Domyślna EULA',
+    'default_eula_text_placeholder' => 'Add your default EULA text',
     'default_language'			=> 'Domyślny język',
     'default_eula_help_text'	=> 'Możesz również sporządzić własną licencje by sprecyzować kategorie aktywa.',
-    'acceptance_note'           => 'Add a note for your decision (Optional)',
+    'acceptance_note'           => 'Dodaj notatkę do swojej decyzji (opcjonalnie)',
     'display_asset_name'        => 'Wyświetl nazwę aktywa',
     'display_checkout_date'     => 'Wyświetl Datę Przypisania',
     'display_eol'               => 'Wyświetl koniec linii w widoku tabeli',
-    'display_qr'                => 'Wyświetlaj QR kody',
+    'display_qr'                => 'Wyświetl kod kreskowy 2D',
     'display_alt_barcode'		=> 'Wyświetlaj kod kreskowy w 1D',
-    'email_logo'                => 'Logo w emailach',
     'barcode_type'				=> 'Kod kreskowy typu 2D',
     'alt_barcode_type'			=> 'Kod kreskowy typu 1D',
-    'email_logo_size'       => 'Kwadratowe logo wygląda najlepiej w wiadomościach e-mail. ',
     'enabled'                   => 'Włączone',
     'eula_settings'				=> 'Ustawienia Licencji',
     'eula_markdown'				=> 'Ta licencja zezwala na <a href="https://help.github.com/articles/github-flavored-markdown/">Github flavored markdown</a>.',
+    'empty_row_count'           => 'Field Start Offset (Empty Rows)',
+    'empty_row_count_help'      => 'Fields will begin populating after this many empty rows are skipped at the top of the label.',
     'favicon'                   => 'Ikona ulubionych',
     'favicon_format'            => 'Akceptowane typy plików to ico, png i gif. Inne formaty obrazów mogą nie działać we wszystkich przeglądarkach.',
     'favicon_size'          => 'Favikony powinny być kwadratowymi grafikami 16x16 pikseli.',
     'footer_text'               => 'Dodatkowy tekst stopki ',
     'footer_text_help'          => 'Ten tekst pojawi się po prawej stronie stopki. Umieszczanie linków możliwe przy użyciu <a href="https://help.github.com/articles/github-flavored-markdown/">Github flavored markdown</a>. Przejścia linii, nagłowki, obrazki itp. dadzą nieokreślone rezultaty.',
+    'footer_text_placeholder'   => 'Optional footer text',
     'general_settings'			=> 'Ustawienia ogólne',
-    'general_settings_keywords' => 'obsługa firmy, podpis, akceptacja, format e-mail, format nazwy użytkownika, obrazy, miniatura, eula, grawatar, tos, kokpit menedżerski, prywatność',
     'general_settings_help'     => 'Domyślna licencja i więcej',
     'generate_backup'			=> 'Stwórz Kopie zapasową',
     'google_workspaces'         => 'Obszary robocze Google',
     'header_color'              => 'Kolor nagłówka',
     'info'                      => 'Te ustawienia pozwalają ci zdefiniować najważniejsze szczegóły twojej instalacji.',
-    'label_logo'                => 'Logo na etykiecie',
     'label_logo_size'           => 'Najlepiej wygląda logo kwadratowe - będzie wyświetlane w prawym górnym rogu każdej etykiety aktywów. ',
     'laravel'                   => 'Wersja Laravel',
     'ldap'                      => 'LDAP',
@@ -94,7 +97,7 @@ return [
     'ldap_login_sync_help'      => 'To tylko sprawdza, czy LDAP może poprawnie się synchronizować. Jeśli zapytanie o autoryzację LDAP nie jest poprawne, użytkownicy nadal mogą nie być w stanie się zalogować. NAJPIERW MUSISZ ZAPISAĆ TWOJE WCZEŚNIEJSZE AKTUALIZACJE USTAWIEŃ LDAP.',
     'ldap_manager'              => 'Menedżer LDAP',
     'ldap_server'               => 'Serwery LDAP',
-    'ldap_server_help'          => 'To powinno się rozpocząć od ldap: / / (dla nieszyfrowanych połączeń) lub ldaps: / / (dla szyfrowanych połączeń)',
+    'ldap_server_help'          => 'To powinno zaczynać się od ldap:// (dla nieszyfrowanych) lub ldaps:// (dla TLS lub SSL)',
     'ldap_server_cert'			=> 'Walidacja certyfikatu SSL dla LDAP',
     'ldap_server_cert_ignore'	=> 'Zezwalaj na nieprawidłowy certyfikat SSL',
     'ldap_server_cert_help'		=> 'Zaznacz tą opcje jeśli używasz certyfikatu SSL podpisanego przez samego siebie i chcesz zezwolić na nieprawidłowy certyfikat.',
@@ -108,8 +111,8 @@ return [
     'ldap_pword'                => 'Hasło użytkownika wpisanego do łączenia się z serwerem LDAP',
     'ldap_basedn'               => 'DN',
     'ldap_filter'               => 'Filtr LDAP',
-    'ldap_pw_sync'              => 'Synchronizacja haseł LDAP',
-    'ldap_pw_sync_help'         => 'Odznacz jeśli nie chcesz synchronizować haseł z LDAP z lokalnymi',
+    'ldap_pw_sync'              => 'Cache LDAP Passwords',
+    'ldap_pw_sync_help'         => 'Uncheck this box if you do not wish to keep LDAP passwords cached as local hashed passwords. Disabling this means that your users may not be able to login if your LDAP server is unreachable for some reason.',
     'ldap_username_field'       => 'Pole użytkownika',
     'ldap_lname_field'          => 'Nazwisko',
     'ldap_fname_field'          => 'Imię',
@@ -117,12 +120,14 @@ return [
     'ldap_version'              => 'Wersja LDAP',
     'ldap_active_flag'          => 'Aktywna flaga LDAP',
     'ldap_activated_flag_help'  => 'Ta wartość służy do określenia, czy zsynchronizowany użytkownik może zalogować się do Snipe-IT. <strong>Nie wpływa na możliwość zaewidencjonowania lub wyewidencjonowania elementów</strong> i powinna być <strong>nazwą atrybutu</strong> w AD/LDAP, <strong>nie wartością</strong> >. <br><br>Jeśli to pole jest ustawione na nazwę pola, która nie istnieje w twoim AD/LDAP lub wartość w polu AD/LDAP jest ustawiona na <code>0</code> lub <code>false </code>, <strong>logowanie użytkownika zostanie wyłączone</strong>. Ustawienie wartości w polu AD/LDAP na <code>1</code> lub <code>true</code> lub <em>dowolny inny tekst</em> oznacza, że użytkownik może się zalogować. Gdy pole jest pusta w AD, szanujemy atrybut <code>userAccountControl</code>, który zwykle umożliwia logowanie niezawieszonym użytkownikom.',
+    'ldap_invert_active_flag'   => 'LDAP Invert Active Flag',
+    'ldap_invert_active_flag_help'     => 'If enabled: when the value returned by LDAP Active Flag is <code>0</code> or <code>false</code> the user account will be active.',
     'ldap_emp_num'              => 'Nr pracownika LDAP',
     'ldap_email'                => 'E-mail pracownika LDAP',
     'ldap_test'                 => 'Test LDAP',
     'ldap_test_sync'            => 'Testuj synchronizację LDAP',
     'license'                   => 'Licencja oprogramowania',
-    'load_remote'               => 'Użyj Gravatara',
+    'load_remote'               => 'Załaduj zdalne awatary',
     'load_remote_help_text'		=> 'Odznacz to pole, jeśli instalacja nie może załadować skryptów z zewnętrznego internetu. To uniemożliwi Snipe-IT próby załadowania obrazów z Gravatar.',
     'login'                     => 'Próby logowania',
     'login_attempt'             => 'Próba logowania',
@@ -131,6 +136,7 @@ return [
     'login_user_agent'          => 'Agent użytkownika',
     'login_help'                => 'Lista prób logowania',
     'login_note'                => 'Noty logowania',
+    'login_note_placeholder'            => "If you do not have a login or have found a device belonging to this company, please call technical support at 888-555-1212. Thank you.",
     'login_note_help'           => 'Opcjonalnie umieść kilka zdań na ekranie logowania, na przykład w celu pomocy osobom, które znalazły zagubione lub skradzione urządzenia. To pole akceptuje <a href="https://help.github.com/articles/github-flavored-markdown/"> oznaczenia Github </a>',
     'login_remote_user_text'    => 'Opcje logowania zdalnego użytkownika',
     'login_remote_user_enabled_text' => 'Włącz Logowanie za Pomocą Nagłówka Zdalnego Użytkownika',
@@ -146,13 +152,16 @@ return [
     'logo_print_assets_help'    => 'Użyj marki na listach zasobów do wydrukowania',
     'full_multiple_companies_support_help_text' => 'Ograniczenie do użytkowników',
     'full_multiple_companies_support_text' => 'Wsparcie dla wielu firm',
+    'scope_locations_fmcs_support_text'  => 'Scope Locations with Full Multiple Companies Support',
+    'scope_locations_fmcs_support_help_text'  => 'Restrict locations to their selected company.',
+    'scope_locations_fmcs_check_button' => 'Check Compatibility',
+    'scope_locations_fmcs_support_disabled_text'  => 'This option is disabled because you have conflicting locations set for :count or more items.',
     'show_in_model_list'   => 'Pokaż w Menu Rozwijanym Modelu',
     'optional'					=> 'opcjonalny',
     'per_page'                  => 'Wyników na stronie',
     'php'                       => 'Wersja PHP',
-    'php_info'                  => 'PHP Info',
+    'php_info'                  => 'PHP info',
     'php_overview'              => 'PHP',
-    'php_overview_keywords'     => 'phpinfo, system, info',
     'php_overview_help'         => 'Informacje o systemie PHP',
     'php_gd_info'               => 'Aby wyświetlić kody QR wymagana jest instalacja php-gd, sprawdź instrukcję.',
     'php_gd_warning'            => 'PHP Image Processing i GD plugin nie są zainstalowane.',
@@ -218,6 +227,8 @@ return [
     'webhook_integration_help'    => 'Integracja z :app jest opcjonalna, jednak endpoint i kanał są wymagane, jeśli chcesz z niej korzystać. Aby skonfigurować integrację z aplikacją, musisz najpierw <a href=":webhook_link" target="_new" rel="noopener">utworzyć przychodzący webhook</a> na swoim koncie :App. Kliknij przycisk <strong>Test :app Integration</strong> , aby potwierdzić poprawność ustawień przed zapisaniem. ',
     'webhook_integration_help_button'    => 'Po zapisaniu informacji o :app pojawi się przycisk testowy.',
     'webhook_test_help'           => 'Sprawdź, czy integracja aplikacji jest poprawnie skonfigurowana. ZAPISZ SWOJE AKTUALIZOWANE :app USTAWIENIA.',
+    'shortcuts_enabled'         => 'Włącz skróty',
+    'shortcuts_help_text'       => '<strong>Windows</strong>: Alt + klucz dostępu, <strong>Mac</strong>: Kontrola + Opcja + klucz dostępu',
     'snipe_version'  			=> 'Wersja Snipe-IT',
     'support_footer'            => 'Obsługa linków stopki ',
     'support_footer_help'       => 'Określ kto widzi linki do Snipe-IT Instrukcji Obsługi oraz Wsparcia',
@@ -227,7 +238,6 @@ return [
     'update'                    => 'Ustawienia Aktualizacji',
     'value'                     => 'Wartość',
     'brand'                     => 'Nagłówek',
-    'brand_keywords'            => 'stopka, logo, druk, motyw, skórka, nagłówek, kolory, kolor, css',
     'brand_help'                => 'Logo, Nazwa witryny',
     'web_brand'                 => 'Typ markowania witryny',
     'about_settings_title'      => 'O Ustawieniach',
@@ -276,6 +286,8 @@ return [
     'two_factor_enrollment_text'	=> "Wymagane jest uwierzytelnianie dwóch elementów, ale urządzenie nie zostało jeszcze zapisane. Otwórz aplikację Google Authenticator i zeskanuj kod QR poniżej, aby zarejestrować urządzenie. Po zarejestrowaniu urządzenia wprowadź poniższy kod",
     'require_accept_signature'      => 'Wymagany podpis',
     'require_accept_signature_help_text'      => 'Włączając tę funkcjonalność wymusza się na użytkownikach fizycznego podpisania przyjęcia aktywa.',
+    'require_checkinout_notes'  => 'Wymagaj notatek o wydaniu/zwrocie',
+    'require_checkinout_notes_help_text'    => 'Włączenie tej funkcji będzie wymagało wypełnienia pól notatki podczas sprawdzania lub sprawdzania aktywów.',
     'left'        => 'lewo',
     'right'        => 'prawo',
     'top'        => 'góra',
@@ -287,18 +299,18 @@ return [
     'zerofill_count'        => 'Długość znaczników zasobów, w tym zerofill',
     'username_format_help'   => 'To ustawienie będzie używane przez proces importu tylko wtedy, gdy nazwa użytkownika nie jest podana i musimy wygenerować nazwę użytkownika dla Ciebie.',
     'oauth_title' => 'Ustawienia API OAuth',
-    'oauth_clients' => 'OAuth Clients',
+    'oauth_clients' => 'Klienci OAuth',
     'oauth' => 'OAuth',
     'oauth_help' => 'Ustawienia punktu końcowego Oauth',
-    'oauth_no_clients' => 'You have not created any OAuth clients yet.',
-    'oauth_secret' => 'Secret',
-    'oauth_authorized_apps' => 'Authorized Applications',
-    'oauth_redirect_url' => 'Redirect URL',
-    'oauth_name_help' => ' Something your users will recognize and trust.',
-    'oauth_scopes' => 'Scopes',
-    'oauth_callback_url' => 'Your application authorization callback URL.',
-    'create_client' => 'Create Client',
-    'no_scopes' => 'No scopes',
+    'oauth_no_clients' => 'Nie utworzyłeś jeszcze żadnych klientów OAuth.',
+    'oauth_secret' => 'Sekret',
+    'oauth_authorized_apps' => 'Autoryzowane aplikacje',
+    'oauth_redirect_url' => 'URL przekierowania',
+    'oauth_name_help' => ' Coś, co Twoi użytkownicy będą rozpoznawać i ufać.',
+    'oauth_scopes' => 'Zakresy',
+    'oauth_callback_url' => 'Twój URL wywołania zwrotnego autoryzacji aplikacji.',
+    'create_client' => 'Utwórz klienta',
+    'no_scopes' => 'Brak zakresów',
     'asset_tag_title' => 'Aktualizuj ustawienia tagów zasobów',
     'barcode_title' => 'Aktualizuj ustawienia kodów kreskowych',
     'barcodes' => 'Kody kreskowe',
@@ -313,24 +325,24 @@ return [
     'filter_by_keyword' => 'Filtruj przez ustawienie słowa kluczowego',
     'security' => 'Bezpieczeństwo',
     'security_title' => 'Aktualizuj ustawienia zabezpieczeń',
-    'security_keywords' => 'hasło, hasła, wymagania, dwuskładnikowe, dwuskładnikowe, wspólne hasła, zdalne logowanie, wylogowanie, uwierzytelnianie',
     'security_help' => 'Weryfikacja dwuetapowa, wymagania haseł',
-    'groups_keywords' => 'uprawnienia, grupy uprawnień, autoryzacje',
     'groups_help' => 'Grupy uprawnień',
     'localization' => 'Lokalizacja',
     'localization_title' => 'Aktualizuj ustawienia lokalizacji',
-    'localization_keywords' => 'lokalizacja, waluta, lokalna, lokalna, lokalna, strefa czasowa, strefa czasowa, międzynarodowa, internatalizacja, język, tłumaczenie',
     'localization_help' => 'Język, wyświetlanie daty',
     'notifications' => 'Powiadomienia',
     'notifications_help' => 'Powiadomienia e-mail i ustawienia audytu',
     'asset_tags_help' => 'Zwiększanie i prefiksy',
     'labels' => 'Etykiety',
     'labels_title' => 'Aktualizuj ustawienia etykiety',
-    'labels_help' => 'Rozmiary etykiet i ustawienia',
-    'purge_keywords' => 'trwałe usunięcie',
+    'labels_help' => 'Kody kreskowe &amp; ustawienia etykiety',
     'purge_help' => 'Wyczyść usunięte rekordy',
     'ldap_extension_warning' => 'Nie wygląda na to, że rozszerzenie LDAP jest zainstalowane lub włączone na tym serwerze. Nadal możesz zapisać swoje ustawienia, ale musisz włączyć rozszerzenie LDAP dla PHP, zanim synchronizacja lub logowanie LDAP zadziała.',
     'ldap_ad' => 'LDAP/AD',
+    'ldap_test_label' => 'Test LDAP Sync',
+    'ldap_test_login' => ' Test LDAP Login',
+    'ldap_username_placeholder' => 'LDAP Username',
+    'ldap_password_placeholder' => 'LDAP Password',
     'employee_number' => 'Numer pracownika',
     'create_admin_user' => 'Dodaj użytkownika ::',
     'create_admin_success' => 'Sukces! Twój użytkownik administratracyjny został dodany!',
@@ -342,6 +354,8 @@ return [
     'setup_migration_create_user' => 'Następnie: Stwórz użytkownika',
     'ldap_settings_link' => 'Ustawienia LDAP',
     'slack_test' => 'Test integracji <i class="fab fa-slack"></i>',
+    'status_label_name' => 'Status Label Name',
+    'super_admin_only'  => 'Super Admin Only',
     'label2_enable'           => 'Nowy silnik etykiet',
     'label2_enable_help'      => 'Przełącz na nowy silnik etykiet. <b>Uwaga: musisz zapisać to ustawienie przed ustawieniem innych.</b>',
     'label2_template'         => 'Szablon',
@@ -356,12 +370,15 @@ return [
     'label2_2d_type'          => 'Kod kreskowy typu 2D',
     'label2_2d_type_help'     => 'Format kodów kreskowych 2D',
     'label2_2d_target'        => '2D Kod kreskowy',
-    'label2_2d_target_help'   => 'Adres URL kodów kreskowych 2D w przypadku skanowania',
+    'label2_2d_target_help'   => 'Dane zawarte w kodzie kreskowym 2D',
     'label2_fields'           => 'Definicje pól',
     'label2_fields_help'      => 'Pola mogą być dodawane, usuwane i przesuwane w lewej kolumnie. Dla każdego pola wiele opcji etykiet i źródeł danych może być dodawanych, usuwanych i zmienianych w prawej kolumnie.',
+    'purge_barcodes' => 'Purge Barcodes',
     'help_asterisk_bold'    => 'Tekst wprowadzony jako <code>**text**</code> będzie wyświetlany jako pogrubiony',
     'help_blank_to_use'     => 'Pozostaw puste, aby użyć wartości z <code>:setting_name</code>',
-    'help_default_will_use' => '<code>:default</code> użyje wartości z <code>:setting_name</code>. <br>Zauważ, że wartość kodów kreskowych musi być zgodna z odpowiednią specyfikacją kodu kreskowego, aby mogła zostać wygenerowana. Aby uzyskać więcej informacji zapoznaj się z <a href="https://snipe-it.readme.io/docs/barcodes">dokumentacją <i class="fa fa-external-link"></i></a>. ',
+    'help_default_will_use' => '<code>:default</code> użyje wartości z <code>:setting_name</code>. <br>Zauważ, że wartość kodów kreskowych musi być zgodna z odpowiednią specyfikacją kodu kreskowego, aby mogła zostać wygenerowana. Aby uzyskać więcej informacji, zobacz <a href="https://snipe-it.readme.io/docs/barcodes">dokumentację <i class="fa fa-external-link"></i></a>. ',
+    'asset_id'              => 'ID Aktywa',
+    'data'               => 'Dane',
     'default'               => 'Domyślny',
     'none'                  => 'Brak',
     'google_callback_help' => 'Należy go wprowadzić jako adres URL wywołania zwrotnego w ustawieniach aplikacji Google OAuth w &apos;s <strong><a href="https://console.cloud.google.com/" target="_blank">konsoli programisty Google <i class="fa fa-external-link" aria-hidden="true"></i></a></strong>.',
@@ -373,7 +390,100 @@ return [
     'database_driver' => 'Sterownik bazy danych',
     'bs_table_storage' => 'Pamięć tabeli',
     'timezone' => 'Strefa czasowa',
-    'profile_edit'          => 'Edit Profile',
-    'profile_edit_help'          => 'Allow users to edit their own profiles.',
+    'test_mail' => 'Test Mail',
+    'profile_edit'          => 'Edytuj profil',
+    'profile_edit_help'          => 'Zezwalaj użytkownikom na edytowanie własnych profili.',
+    'default_avatar' => 'Custom Default Avatar',
+    'default_avatar_help' => 'Ten obraz będzie wyświetlany jako profil, jeśli użytkownik nie ma zdjęcia profilowego.',
+    'restore_default_avatar' => 'Przywróć <a href=":default_avatar" data-toggle="lightbox" data-type="image">oryginalny domyślny awatar systemowy</a>',
+    'restore_default_avatar_help' => '',
+    'due_checkin_days' => 'Wymagane ostrzeżenie za Checkin',
+    'due_checkin_days_help' => 'Ile dni przed oczekiwanym sprawdzianem zasobu powinien on być wymieniony na stronie "Do sprawdzenia"?',
+    'no_groups' => 'Nie utworzono jeszcze żadnych grup. Odwiedź <code>Ustawienia administracyjne> Grupy uprawnień</code> aby je dodać.',
+    'text' => 'Text',
+
+    'username_formats' => [
+        'username_format'		=> 'Format nazwy użytkownika',
+        'firstname_lastname_format'	=> 'Imię i nazwisko (jane.smith)',
+        'first_name_format'	        => 'First Name (jane)',
+        'last_name_format'		=> 'Last Name (doe)',
+        'filastname_format'			=> 'First Initial Last Name (jsmith)',
+        'lastnamefirstinitial_format' =>  'Last Name First Initial (smithj)',
+        'firstname_lastname_underscore_format' => 'First Name Last Name (jane_smith)',
+        'firstinitial.lastname' => 'First Initial Last Name (j.smith)',
+        'lastname_firstinitial' => 'Last Name First Initial (smith_j)',
+        'lastname_dot_firstinitial_format' => 'Last Name First Initial (smith.j)',
+        'firstnamelastname'     => 'First Name Last Name (janesmith)',
+        'firstnamelastinitial'  => 'First Name Last Initial (janes)',
+        'lastnamefirstname'      => 'Last Name.First Name (smith.jane)',
+    ],
+
+    'email_formats' => [
+        'email_format'			=> 'Format e-mail',
+        'firstname_lastname_format'	=> 'Imię i nazwisko (jane.smith@example.com)',
+        'first_name_format'		=> 'Imię (jane@example.com)',
+        'last_name_format'		=> 'Last Name (doe@example.com)',
+        'filastname_format'			=> 'Pierwsza litera imienia i nazwisko (jsmith@example.com)',
+        'lastnamefirstinitial_format' =>  'Nazwisko i pierwsza litera imienia (smithj@example.com)',
+        'firstname_lastname_underscore_format' => 'Imię i Nazwisko (pawel@example.com)',
+        'firstinitial.lastname' => 'Pierwsza litera imienia i nazwisko (jsmith@example.com)',
+        'lastname_firstinitial' => 'Nazwisko i pierwsza litera imienia (smith_j@example.com)',
+        'lastname_dot_firstinitial_format' => 'Last Name First Initial (smith.j@example.com)',
+        'firstnamelastname'     => 'Imię i nazwisko (jane.smith@example.com)',
+        'firstnamelastinitial'  => 'Nazwisko i pierwsza litera imienia (smithj@example.com)',
+        'lastnamefirstname'      => 'Nazwisko.Imię (kowal.jan@przyklad.com)',
+    ],
+
+
+
+    'logo_labels' => [
+        'acceptance_pdf_logo'       => 'PDF Logo',
+        'email_logo'                => 'Logo w emailach',
+        'label_logo'                => 'Logo na etykiecie',
+        'logo'                      => 'Site Logo',
+        'favicon'                   => 'Ikona ulubionych',
+    ],
+
+    'logo_help' => [
+        'email_logo_size'       => 'Kwadratowe logo wygląda najlepiej w wiadomościach e-mail. ',
+    ],
+
+    'logo_option_types' => [
+        'text' => 'Text',
+        'logo' => 'Logo',
+        'logo_and_text' => 'Logo and Text',
+    ],
+
+
+    'legends' => [
+        'scoping' => 'Scoping',
+        'formats' => 'Default Formats',
+        'profiles' => 'User Profiles',
+        'eula' => 'EULA & Acceptance Preferences',
+        'misc_display' => 'Miscellaneous Display Options',
+        'email' => 'Email Preferences',
+        'checkin' => 'Checkin Preferences',
+        'dashboard' => 'Login & Dashboard Preferences',
+        'misc' => 'Miscellaneous',
+        'logos' => 'Logos & Display',
+        'colors' => 'Colors & Skins',
+        'footer' => 'Footer Preferences',
+        'security' => 'Security Preferences',
+        'general' => 'General',
+        'intervals' => 'Intervals & Thresholds',
+    ],
+
+
+    /* Keywords for settings overview help */
+    'keywords' => [
+        'brand'             => 'stopka, logo, druk, motyw, skórka, nagłówek, kolory, kolor, css',
+        'general_settings'  => 'obsługa firmy, podpis, akceptacja, format e-mail, format nazwy użytkownika, obrazy, miniatura, eula, grawatar, tos, kokpit menedżerski, prywatność',
+        'groups'            => 'uprawnienia, grupy uprawnień, autoryzacje',
+        'labels'            => 'etykiety, kody kreskowe, arkusze, druk, wzór, qr, 1d, 2d',
+        'localization'      => 'lokalizacja, waluta, lokalna, lokalna, lokalna, strefa czasowa, strefa czasowa, międzynarodowa, internatalizacja, język, tłumaczenie',
+        'php_overview'      => 'phpinfo, system, info',
+        'purge'             => 'trwałe usunięcie',
+        'security'          => 'hasło, hasła, wymagania, dwuskładnikowe, dwuskładnikowe, wspólne hasła, zdalne logowanie, wylogowanie, uwierzytelnianie',
+    ],
 
 ];
diff --git a/resources/lang/pl-PL/admin/settings/message.php b/resources/lang/pl-PL/admin/settings/message.php
index 7aa9389e36..aac897dcb1 100644
--- a/resources/lang/pl-PL/admin/settings/message.php
+++ b/resources/lang/pl-PL/admin/settings/message.php
@@ -14,6 +14,9 @@ return [
         'restore_warning'       => 'Tak, przywróć. Mam świadomość, że spowoduje to nadpisanie istniejących danych w bazie danych. Spowoduje to również wylogowanie wszystkich istniejących użytkowników (w tym Ciebie).',
         'restore_confirm'       => 'Czy na pewno chcesz przywrócić bazę danych z :filename?'
     ],
+    'restore' => [
+        'success'               => 'Kopia zapasowa została przywrócona. Zaloguj się ponownie.'
+    ],
     'purge' => [
         'error'     => 'Wystąpił błąd podczas czyszczenia. ',
         'validation_failed'     => 'Potwierdzenie czyszczenia jest niepoprawne. Wpisz słowo "DELETE" w polu potwierdzenia.',
@@ -33,6 +36,9 @@ return [
         'testing_authentication' => 'Testowanie uwierzytelniania LDAP...',
         'authentication_success' => 'Użytkownik uwierzytelniony z LDAP pomyślnie!'
     ],
+    'labels' => [
+        'null_template' => 'Label template not found. Please select a template.',
+        ],
     'webhook' => [
         'sending' => 'Wysyłanie wiadomości testowej :app...',
         'success' => 'Twoja integracja :webhook_name działa!',
@@ -42,5 +48,12 @@ return [
         'error' => 'Coś poszło nie tak. :app odpowiedział: :error_message',
         'error_redirect' => 'BŁĄD: 301/302 :endpoint zwraca przekierowanie. Ze względów bezpieczeństwa nie podążamy za przekierowaniami. Proszę użyć aktualnego punktu końcowego.',
         'error_misc' => 'Coś poszło nie tak. :( ',
-    ]
+        'webhook_fail' => ' Powiadomienie webhook nie powiodło się: Sprawdź, czy adres URL jest nadal prawidłowy.',
+        'webhook_channel_not_found' => ' Nie znaleziono kanału webhook.',
+        'ms_teams_deprecation' => 'The selected Microsoft Teams webhook URL will be deprecated Dec 31st, 2025. Please use a workflow URL. Microsoft\'s documentation on creating a workflow can be found <a href="https://support.microsoft.com/en-us/office/create-incoming-webhooks-with-workflows-for-microsoft-teams-8ae491c7-0394-4861-ba59-055e33f75498" target="_blank"> here.</a>',
+    ],
+    'location_scoping' => [
+        'not_saved' => 'Your settings were not saved.',
+        'mismatch' => 'There is 1 item in the database that need your attention before you can enable location scoping.|There are :count items in the database that need your attention before you can enable location scoping.',
+    ],
 ];
diff --git a/resources/lang/pl-PL/admin/statuslabels/table.php b/resources/lang/pl-PL/admin/statuslabels/table.php
index fde97206de..25affde944 100644
--- a/resources/lang/pl-PL/admin/statuslabels/table.php
+++ b/resources/lang/pl-PL/admin/statuslabels/table.php
@@ -1,14 +1,14 @@
 <?php
 
 return array(
-    'about'      	=> 'O statusie',
+    'about'      	=> 'About Status Types',
     'archived'      	=> 'Zarchiwizowane',
     'create'      	=> 'Stwórz Status',
     'color'      	=> 'Paleta kolorów',
     'default_label' => 'Domyślna etykieta',
     'default_label_help' => 'Jest to używane w celu zapewnienia, że ​​najczęściej używane etykiety statusu pojawiają się u góry pola wyboru podczas tworzenia / edycji zasobów.',
     'deployable'      	=> 'Gotowe do wdrożenia',
-    'info'      	=> 'Status jest używany by opisać różne stany w jakich mogą znaleźć się twoje aktywa. Mogą być one w trakcie naprawy, zgubione/ukradzione itd. Możesz tworzyć nowe etykiety statusu dla gotowych do wdrożenia, oczekujących oraz zarchiwizowanych aktywów.',
+    'info'      	=> 'Status label types are used to describe the various states your assets could be in. They may be out for repair, lost/stolen, etc. You can create new status labels for your deployable, pending and archived assets according to your own workflow. For more information, <a href="https://snipe-it.readme.io/docs/overview#status-labels" target="_blank">see the documentation <i class="fa fa-external-link"></i></a>.',
     'name'      	=> 'Nazwa Statusu',
     'pending'      	=> 'Oczekujący',
     'status_type'   => 'Typ Statusu',
diff --git a/resources/lang/pl-PL/admin/users/general.php b/resources/lang/pl-PL/admin/users/general.php
index 01cd7735a2..441af0c52a 100644
--- a/resources/lang/pl-PL/admin/users/general.php
+++ b/resources/lang/pl-PL/admin/users/general.php
@@ -19,6 +19,8 @@ return [
     'print_assigned'    => 'Drukuj wszystko przypisane',
     'email_assigned'    => 'Wyślij mailem wszystkie przypisane',
     'user_notified'     => 'Wysłano do użytkowania listę przypisanych zasobów.',
+    'users_notified'    => 'The user has been emailed a list of their currently assigned items.|:count users have been emailed a list of their currently assigned items.',
+    'users_notified_warning' => ':count user has been emailed a list of their currently assigned items, however :no_email users did not have an email address so could not be emailed.|:count users have been emailed a list of their currently assigned items, however :no_email user(s) did not have an email address so could not be emailed.',
     'auto_assign_label' => 'Uwzględnij tego użytkownika podczas automatycznego przypisywania kwalifikujących się licencji',
     'auto_assign_help'  => 'Pomiń tego użytkownika w automatycznym przypisaniu licencji',
     'software_user'     => 'Oprogramowanie przypisane do :name',
diff --git a/resources/lang/pl-PL/admin/users/message.php b/resources/lang/pl-PL/admin/users/message.php
index 72172694fb..ae9b24ba39 100644
--- a/resources/lang/pl-PL/admin/users/message.php
+++ b/resources/lang/pl-PL/admin/users/message.php
@@ -6,7 +6,7 @@ return array(
     'declined'                  => 'Pomyślnie odrzuciłeś ten składnik aktywów.',
     'bulk_manager_warn'	        => 'Użytkownicy zostały pomyślnie zaktualizowane, jednak Twój wpis manager nie został zapisany, bo dyrektor wybrano był również na liście użytkowników do edycji i użytkowników nie może być ich Menedżer. Wybierz użytkowników, z wyjątkiem Menedżera.',
     'user_exists'               => 'Użytkownik już istnieje!',
-    'user_not_found'            => 'Użytkownik nie istnieje.',
+    'user_not_found'            => 'Użytkownik nie istnieje lub nie masz uprawnień.',
     'user_login_required'       => 'Pole login jest wymagane',
     'user_has_no_assets_assigned' => 'Brak aktywów aktualnie przypisanych do użytkownika.',
     'user_password_required'    => 'Pole hasło jest wymagane.',
@@ -37,22 +37,23 @@ return array(
         'update' => 'Podczas aktualizacji użytkownika wystąpił problem. Spróbuj ponownie.',
         'delete' => 'Wystąpił błąd podczas usuwania użytkownika. Spróbuj ponownie.',
         'delete_has_assets' => 'Ten użytkownik posiada elementy przypisane i nie może być usunięty.',
-        'delete_has_assets_var' => 'This user still has an asset assigned. Please check it in first.|This user still has :count assets assigned. Please check their assets in first.',
-        'delete_has_licenses_var' => 'This user still has a license seats assigned. Please check it in first.|This user still has :count license seats assigned. Please check them in first.',
-        'delete_has_accessories_var' => 'This user still has an accessory assigned. Please check it in first.|This user still has :count accessories assigned. Please check their assets in first.',
-        'delete_has_locations_var' => 'This user still manages a location. Please select another manager first.|This user still manages :count locations. Please select another manager first.',
-        'delete_has_users_var' => 'This user still manages another user. Please select another manager for that user first.|This user still manages :count users. Please select another manager for them first.',
+        'delete_has_assets_var' => 'Ten użytkownik nadal ma przypisany zasób. Proszę sprawdzić to najpierw.|Ten użytkownik nadal ma :count przypisanych zasobów. Proszę najpierw sprawdzić jego aktywa.',
+        'delete_has_licenses_var' => 'Ten użytkownik nadal ma przypisaną licencję. Proszę sprawdzić ją najpierw. | Ten użytkownik nadal ma przypisaną licencję :count. Proszę sprawdzić je najpierw.',
+        'delete_has_accessories_var' => 'Ten użytkownik nadal ma przypisane akcesoria. Proszę sprawdzić to najpierw. | Ten użytkownik nadal ma :count przyporządkowanych akcesoriów. Proszę najpierw sprawdzić ich aktywa.',
+        'delete_has_locations_var' => 'Ten użytkownik nadal zarządza lokalizacją. Proszę najpierw wybrać innego menedżera.|Ten użytkownik nadal zarządza :count lokalizacji. Proszę najpierw wybrać innego menedżera.',
+        'delete_has_users_var' => 'Ten użytkownik nadal zarządza innym użytkownikiem. Proszę najpierw wybrać innego menedżera dla tego użytkownika. Ten użytkownik nadal zarządza :count użytkowników. Najpierw wybierz innego menedżera.',
         'unsuspend' => 'Wystąpił problem podczas odblokowania użytkownika. Spróbuj ponownie.',
         'import'    => 'Podczas importowania użytkowników wystąpił błąd. Spróbuj ponownie.',
         'asset_already_accepted' => 'Aktywo zostało już zaakceptowane.',
         'accept_or_decline' => 'Musisz zaakceptować lub odrzucić to aktywo.',
-        'cannot_delete_yourself' => 'We would feel really bad if you deleted yourself, please reconsider.',
+        'cannot_delete_yourself' => 'Czujemy się naprawdę źle, jeśli usuniesz siebie, prosimy o ponowne rozważenie.',
         'incorrect_user_accepted' => 'Zasób, który próbowano zaakceptować nie został wyewidencjonowany dla użytkownika.',
         'ldap_could_not_connect' => 'Nie udało się połączyć z serwerem LDAP. Sprawdź proszę konfigurację serwera LDAP w pliku konfiguracji. <br>Błąd z serwera LDAP:',
         'ldap_could_not_bind' => 'Nie udało się połączyć z serwerem LDAP. Sprawdź proszę konfigurację serwera LDAP w pliku konfiguracji. <br>Błąd z serwera LDAP: ',
         'ldap_could_not_search' => 'Nie udało się przeszukać serwera LDAP. Sprawdź proszę konfigurację serwera LDAP w pliku konfiguracji. <br>Błąd z serwera LDAP:',
         'ldap_could_not_get_entries' => 'Nie udało się pobrać pozycji z serwera LDAP. Sprawdź proszę konfigurację serwera LDAP w pliku konfiguracji. <br>Błąd z serwera LDAP:',
         'password_ldap' => 'Hasło dla tego konta jest zarządzane przez usługę LDAP, Active Directory. Skontaktuj się z działem IT, aby zmienić swoje hasło. ',
+        'multi_company_items_assigned' => 'Ten użytkownik ma elementy przypisane do innej firmy. Sprawdź je lub edytuj swoją firmę.'
     ),
 
     'deletefile' => array(
diff --git a/resources/lang/pl-PL/admin/users/table.php b/resources/lang/pl-PL/admin/users/table.php
index eb5960979e..2d39ddb9ef 100644
--- a/resources/lang/pl-PL/admin/users/table.php
+++ b/resources/lang/pl-PL/admin/users/table.php
@@ -22,7 +22,7 @@ return array(
     'managed_locations'     => 'Zarządzane lokalizacje',
     'managed_users'         => 'Zarządzani Użytkownicy',
     'name' 					=> 'Nazwa',
-    'nogroup'               => 'Nie utworzono jeszcze żadnych grup. Aby dodać jedną, odwiedź: ',
+    'nogroup'               => 'Nie utworzono jeszcze żadnych grup. Aby dodać jedną, odwiedź:',
     'notes'                 => 'Uwagi',
     'password_confirm' 		=> 'Potwierdź hasło',
     'password' 				=> 'Hasło',
diff --git a/resources/lang/pl-PL/auth.php b/resources/lang/pl-PL/auth.php
index d3f903635d..8d6c888887 100644
--- a/resources/lang/pl-PL/auth.php
+++ b/resources/lang/pl-PL/auth.php
@@ -15,6 +15,6 @@ return array(
 
     'failed' => 'Te dane logowania nie pasują do naszych wpisów.',
     'password' => 'Podane hasło jest nieprawidłowe.',
-    'throttle' => 'Zbyt wiele nieudanych prób logowania. Spróbuj ponownie za :seconds sekund.',
+    'throttle' => 'Too many login attempts. Please try again in :minutes minute(s).',
 
 );
diff --git a/resources/lang/pl-PL/auth/message.php b/resources/lang/pl-PL/auth/message.php
index 213970647a..403f3b7bf0 100644
--- a/resources/lang/pl-PL/auth/message.php
+++ b/resources/lang/pl-PL/auth/message.php
@@ -6,16 +6,14 @@ return array(
     'account_not_found'      => 'Nazwa użytkownika lub hasło jest niepoprawne.',
     'account_not_activated'  => 'Użytkownik jest nieaktywowany.',
     'account_suspended'      => 'Twoje konto zostało zawieszone.',
-    'account_banned'         => 'Twoje konto zostało zablokowane.',
-    'throttle'               => 'Zbyt wiele nieudanych prób logowania. Spróbuj ponownie za :minutes minut(y).',
 
     'two_factor' => array(
         'already_enrolled'      => 'Twoje urządzenie jest już zapisane.',
         'success'               => 'Zalogowano pomyślnie.',
         'code_required'         => 'Kod weryfikacji dwuskładnikowej jest wymagany.',
         'invalid_code'          => 'Kod weryfikacji dwuskładnikowej jest nieprawidłowy.',
-        'enter_two_factor_code' => 'Please enter your two-factor authentication code.',
-        'please_enroll'         => 'Please enroll a device in two-factor authentication.',
+        'enter_two_factor_code' => 'Wprowadź kod uwierzytelniania dwuskładnikowego.',
+        'please_enroll'         => 'Proszę zapisać urządzenie w uwierzytelnianiu dwuskładnikowym.',
     ),
 
     'signin' => array(
diff --git a/resources/lang/pl-PL/button.php b/resources/lang/pl-PL/button.php
index 1fc155c89d..2f56768b88 100644
--- a/resources/lang/pl-PL/button.php
+++ b/resources/lang/pl-PL/button.php
@@ -7,6 +7,7 @@ return [
     'checkin_and_delete'  	    => 'Odbierz wszytko i usuń użytkownika',
     'delete'  	                => 'Kasuj',
     'edit'    	                => 'Edycja',
+    'clone'    	                => 'Powiel',
     'restore' 	                => 'Przywróć',
     'remove'                    => 'Usuń',
     'request'                   => 'Zamówienie',
@@ -21,4 +22,13 @@ return [
     'add_maintenance'           => 'Dodaj konserwację',
     'append'                    => 'Dołącz',
     'new'                       => 'Nowy',
+    'var' => [
+        'clone'     => 'Powiel :item_type',
+        'edit'      => 'Edytuj :item_type',
+        'delete'    => 'Usuń :item_type',
+        'restore'   => 'Przywróć :item_type',
+        'create'    => 'Utwórz nowy :item_type',
+        'checkout'  => 'Wydaj :item_type',
+        'checkin'   => 'Odbierz :item_type',
+    ]
 ];
diff --git a/resources/lang/pl-PL/general.php b/resources/lang/pl-PL/general.php
index a315ffb9b3..0230cbc0c9 100644
--- a/resources/lang/pl-PL/general.php
+++ b/resources/lang/pl-PL/general.php
@@ -10,10 +10,10 @@ return [
     'action'                => 'Edycja',
     'activity_report'		=> 'Raport Aktywności',
     'address'				=> 'Adres',
-    'admin'					=> 'Admin',
-    'admin_tooltip'			=> 'This user has admin privileges',
-    'superuser'				=> 'Superuser',
-    'superuser_tooltip'		=> 'This user has superuser privileges',
+    'admin'					=> 'Ustawienia administratora',
+    'admin_tooltip'			=> 'Ten użytkownik ma uprawnienia administratora',
+    'superuser'				=> 'Superużytkownik',
+    'superuser_tooltip'		=> 'Ten użytkownik ma uprawnienia superużytkownika',
     'administrator'			=> 'Administrator',
     'add_seats'             => 'Dodano miejsca',
     'age'                   => "Wiek",
@@ -23,13 +23,16 @@ return [
     'asset_models'			=> 'Typy aktywów',
     'asset_model'			=> 'Model',
     'asset'					=> 'Aktywa',
+    'asset_previous'        => 'Asset (Previously Assigned)',
     'asset_report'          => 'Raporty Aktywów',
     'asset_tag'				=> 'Krótka nazwa',
     'asset_tags'            => 'Tagi zasobu',
     'assets_available'		=> 'Dostępne zasoby',
     'accept_assets'         => 'Akceptuje zasoby',
     'accept_assets_menu'    => 'Zaakceptuj zasoby',
+    'accept_item'           => 'Accept Item',
     'audit'				    => 'Audyt',
+    'audits'				=> 'Audits',
     'audit_report'			=> 'Dziennik zdarzeń',
     'assets'				=> 'Zasoby',
     'assets_audited'        => 'aktywa poddane audytowi',
@@ -61,9 +64,12 @@ return [
     'changepassword'  		=> 'Zmień Hasło',
     'checkin'  				=> 'Odepnij',
     'checkin_from'  		=> 'Formularz odebrania',
+    'checkin_note'  		=> 'Checkin Note',
+    'checkout_note'  		=> 'Checkout Note',
     'checkout'  			=> 'Przypisz',
     'checkouts_count'       => 'Przypisania',
     'checkins_count'        => 'Odbiory',
+    'checkin_and_delete'  	=> 'Zaznacz i usuń',
     'user_requests_count'   => 'Żądania',
     'city'  				=> 'Miasto',
     'click_here'			=> 'Kliknij tutaj',
@@ -86,11 +92,13 @@ return [
     'record_created' 		=> 'Rekord utworzony',
     'updated_at' 			=> 'Zaktualizowano',
     'currency'  			=> 'PLN', // this is deprecated
+    'currency_text'  		=> 'Waluta', //
     'current'  				=> 'Lista użytkowników',
     'current_password'      => 'Bieżące hasło',
     'customize_report'      => 'Dostosuj raport',
     'custom_report'         => 'Raport niestandardowy składnik aktywów',
     'dashboard'				=> 'Panel główny',
+    'data_source'           => 'Data Source',
     'days'      			=> 'dni',
     'days_to_next_audit'    => 'Dni do następnej inspekcji',
     'date'					=> 'Data',
@@ -98,7 +106,7 @@ return [
     'debug_warning_text'    => 'Ta aplikacja jest uruchomiona w trybie produkcyjnym z włączonym debugowaniem. Jeśli aplikacja jest dostępna na zewnątrz, może to zagrażać ujawnieniem wrażliwych danych. Wyłącz tryb debugowania przez ustawienie wartości <code>APP_DEBUG</code> w pliku <code>.env</code> na <code>false</code>.',
     'delete'  				=> 'Kasuj',
     'delete_confirm'  		=> 'Czy na pewno chcesz usunąć :przedmiot?',
-    'delete_confirm_no_undo' => 'Czy na pewno chcesz usunąć :item? Nie można tego cofnąć.',
+    'delete_confirm_no_undo' => 'Czy na pewno chcesz usunąć :item? Tej operacji nie można cofnąć.',
     'deleted'  				=> 'Usunięte',
     'delete_seats'  		=> 'Usunięte miejsca',
     'deletion_failed'       => 'Usunięcie nieudane',
@@ -114,29 +122,13 @@ return [
     'editprofile'  			=> 'Edytuj Swój Profil',
     'eol'					=> 'EOL',
     'email_domain'			=> 'Domena poczty e-mail',
-    'email_format'			=> 'Format e-mail',
     'employee_number'       => 'Numer pracownika',
     'email_domain_help'		=> 'To jest używane do generowania e-maili podczas importowania',
     'error'				    => 'Błąd',
     'exclude_archived'      => 'Wyklucz zarchiwizowane zasoby',
     'exclude_deleted'       => 'Wyklucz usunięte zasoby',
     'example'				=> 'Przykład: ',
-    'filastname_format'			=> 'Pierwsza litera imienia i nazwisko (jsmith@example.com)',
-    'firstname_lastname_format'	=> 'Imię i nazwisko (jane.smith@example.com)',
-    'firstname_lastname_underscore_format' => 'Imię i Nazwisko (pawel@example.com)',
-    'lastnamefirstinitial_format' =>  'Nazwisko i pierwsza litera imienia (smithj@example.com)',
-    'firstintial_dot_lastname_format' => 'Pierwsza litera imienia i nazwisko (jsmith@example.com)',
-    'firstname_lastname_display'	=> 'Imię i Nazwisko (Jan Kowalski)',
-    'lastname_firstname_display'	=> 'Nazwisko Imię (Smith Jane)',
-    'name_display_format'	=> 'Format wyświetlania nazwy',
-    'first'					=> 'Pierwszy',
-    'firstnamelastname'     => 'Imię i nazwisko (jane.smith@example.com)',
-    'lastname_firstinitial' => 'Nazwisko i pierwsza litera imienia (smith_j@example.com)',
-    'firstinitial.lastname' => 'Pierwsza litera imienia i nazwisko (jsmith@example.com)',
-    'firstnamelastinitial'  => 'Nazwisko i pierwsza litera imienia (smithj@example.com)',
-    'lastnamefirstname'      => 'Last Name First Name (smith.jane@example.com)',
-    'first_name'			=> 'Imię',
-    'first_name_format'		=> 'Imię (jane@example.com)',
+
     'files'                 => 'Pliki',
     'file_name'				=> 'Plik',
     'file_type'             => 'Rodzaj pliku',
@@ -156,9 +148,9 @@ return [
     'image_delete'         	=> 'Usuń zdjęcie',
     'include_deleted'       => 'Dołącz usunięte zasoby',
     'image_upload'         	=> 'Dodaj zdjęcie',
-    'filetypes_accepted_help'    => 'Akceptowany typ pliku to :types. Maksymalny dozwolony rozmiar pliku to :size.|Akceptowane typy plików to :types. Maksymalny dozwolony rozmiar plików to :size.',
-    'filetypes_size_help'   => 'Maksymalny dozwolony rozmiar wysyłania to :size.',
-    'image_filetypes_help'  => 'Accepted filetypes are jpg, webp, png, gif, svg, and avif. Max upload size allowed is :size.',
+    'filetypes_accepted_help'    => 'Akceptowany typ pliku to :types. Maksymalny dozwolony rozmiar pliku to :size.|Akceptowane typy plików to :types. Maksymalny dozwolony rozmiar pliku to :size.',
+    'filetypes_size_help'   => 'Maksymalny rozmiar pliku to :size.',
+    'image_filetypes_help'  => 'Akceptowane typy plików to jpg, webp, png, gif, svg i avif. Maksymalny rozmiar pliku to :size.',
     'unaccepted_image_type'  => 'Plik z obrazem jest nieczytelny. Akceptowane typy plików to JPG, WebP, PNG, GIF i SVG. Typ MIME przesłanego pliku to :mimetype.',
     'import'         	    => 'Zaimportuj',
     'import_this_file'      => 'Mapuj pola i przetwarzaj ten plik',
@@ -178,12 +170,17 @@ return [
     'last'					=> 'Ostatni',
     'last_login'            => 'Ostatnie logowanie',
     'last_name'             => 'Nazwisko',
+    'firstname_lastname_display'	=> 'Imię i Nazwisko (Jan Kowalski)',
+    'lastname_firstname_display'	=> 'Nazwisko Imię (Smith Jane)',
+    'name_display_format'	=> 'Format wyświetlania nazwy',
+    'first'					=> 'Pierwszy',
+    'first_name'			=> 'Imię',
     'license'				=> 'Licencja',
     'license_report'        => 'Raport Licencji',
     'licenses_available'	=> 'Dostępne licencje',
     'licenses'				=> 'Licencje',
     'list_all'				=> 'Pokaż Wszystkie',
-    'loading'				=> 'Ładuję, proszę czekać....',
+    'loading'				=> 'Ładuję, proszę czekać...',
     'lock_passwords'        => 'Ta wartość pola nie zostanie zapisana w instalacji demonstracyjnej.',
     'feature_disabled'      => 'Ta funkcja została wyłączona dla instalacji demo.',
     'location'              => 'Lokalizacja',
@@ -206,8 +203,8 @@ return [
     'new_password'          => 'Nowe hasło',
     'next'					=> 'Następny',
     'next_audit_date'		=> 'Data następnej inspekcji',
-    'next_audit_date_help'  => 'If you use auditing in your organization, this is usually automatically calculated based on the asset&apos;s last audit date and audit frequency (in <code>Admin Settings &gt; Alerts</code>) and you can leave this blank. You can manually set this date here if you need to, but it must be later than the last audit date. ',
-    'audit_images_help'     => 'You can find audit images in the asset\'s history tab.',
+    'next_audit_date_help'  => 'Jeżeli używasz audytu w swojej organizacji, jest on zazwyczaj automatycznie obliczany na podstawie ostatniej daty audytu i częstotliwości audytu ( Ustawienia <code>Administratora &gt; Powiadomienia</code>) i możesz pozostawić to pole puste. Jeśli potrzebujesz to tutaj możesz ręcznie ustawić datę, ale musi być późniejsza niż data ostatniego audytu. ',
+    'audit_images_help'     => 'Obrazy audytu można znaleźć w zakładce historii zasobów (Zasób &gt; Historia).',
     'no_email'              => 'Brak adresu e-mail skojarzonego z tym użytkownikiem',
     'last_audit'		    => 'Ostatnia inspekcja',
     'new'					=> 'nowy!',
@@ -215,6 +212,14 @@ return [
     'no_results'			=> 'Brak wyników.',
     'no'  					=> 'Nie',
     'notes'  				=> 'Notatki',
+    'note_added'            => 'Dodano notatkę',
+    'options'				=> 'Options',
+    'preview'				=> 'Preview',
+    'add_note'              => 'Dodaj notatkę',
+    'note_edited'            => 'Notatka edytowana',
+    'edit_note'              => 'Edytuj notatkę',
+    'note_deleted'            => 'Notatka usunięta',
+    'delete_note'              => 'Usuń notatkę',
     'order_number'          => 'Numer zamówienia',
     'only_deleted'          => 'Tylko usunięte aktywa',
     'page_menu'				=> 'Wyświetla pozycje _MENU_',
@@ -229,7 +234,7 @@ return [
     'purchase_date'         => 'Data zakupu',
     'qty'		            => 'Ilość',
     'quantity'		        => 'Ilość',
-    'quantity_minimum'      => 'Masz :count przedmiotów poniżej lub prawie poniżej minimalnych poziomów ilości',
+    'quantity_minimum'      => 'Masz jeden przedmiot poniżej lub prawie poniżej minimalnego poziomu ilości|Masz :count przedmiotów poniżej lub prawie poniżej minimalnego poziomu ilości',
     'quickscan_checkin'  	=> 'Szybkie skanowanie',
     'quickscan_checkin_status'  	=> 'Status przypisania',
     'ready_to_deploy'		=> 'Gotowe do wdrożenia',
@@ -240,14 +245,14 @@ return [
     'restored'				=> 'przywrócone',
     'restore'				=> 'Przywróć',
     'requestable_models'    => 'Żądane modele',
-    'requestable_items'     => 'Requestable Items',
+    'requestable_items'     => 'Żądane elementy',
     'requested'				=> 'Wymagane',
     'requested_date'        => 'Data złożenia zapotrzebowania',
     'requested_assets'      => 'Żądane zasoby',
     'requested_assets_menu' => 'Żądane zasoby',
     'request_canceled'      => 'Żądanie anulowane',
-    'request_item'          => 'Request this item',
-    'external_link_tooltip' => 'External link to',
+    'request_item'          => 'Poproś o ten przedmiot',
+    'external_link_tooltip' => 'Zewnętrzny link do',
     'save'  				=> 'Zapisz',
     'select_var'            => 'Wybierz :thing... ', // this will eventually replace all of our other selects
     'select'				=> 'Wybierz',
@@ -274,13 +279,15 @@ return [
     'signed_off_by'         => 'Podpisano przez',
     'skin'       			=> 'Motyw',
     'webhook_msg_note'        => 'Powiadomienie zostanie wysłane przez webhook',
-    'webhook_test_msg'        => 'Super! Wygląda na to, że Twoja integracja :app z Snipe-IT działa!',
+    'webhook_test_msg'        => 'Wygląda na to, że Twoja integracja :app z Snipe-IT działa!',
     'some_features_disabled' => 'Wersja demonstracyjna: Pewne funkcje zostały wyłączone w tej instalacji.',
     'site_name'				=> 'Nazwa Witryny',
     'state'  				=> 'Województwo',
     'status_labels'			=> 'Etykiety Statusu',
+    'status_label'			=> 'Etykieta statusu',
     'status'    			=> 'Status',
     'accept_eula'           => 'Umowa akceptacyjna',
+    'show_or_hide_eulas' => 'Pokaż/Ukryj EULA',
     'supplier'              => 'Dostawca',
     'suppliers'  			=> 'Dostawcy',
     'sure_to_delete'        => 'Czy na pewno chcesz usunąć',
@@ -296,15 +303,15 @@ return [
     'type'  				=> 'Rodzaj',
     'undeployable'			=> 'Nie przypisane',
     'unknown_admin'			=> 'Nieznany Administrator',
-    'username_format'		=> 'Format nazwy użytkownika',
     'username'              => 'Nazwa użytkownika',
     'update'                => 'Zaktualizuj',
+    'updating_item' => 'Aktualizacja :item',
     'upload_filetypes_help'      => 'Dozwolone typy plików to png, gif, jpg, jpeg, doc, docx, pdf, xls, txt, lic, zip i rar. Maksymalny dozwolony rozmiar przesyłania to :rozmiar.',
     'uploaded'              => 'Przesłano',
     'user'					=> 'Użytkownik',
     'accepted'			    => 'zatwierdzone',
     'declined'			    => 'odrzucony',
-    'declined_note'         => 'Declined Notes',
+    'declined_note'         => 'Odrzucone notatki',
     'unassigned'            => 'Nieprzypisane',
     'unaccepted_asset_report' => 'Aktywa niezatwierdzone',
     'users'                 => 'Użytkownicy',
@@ -323,10 +330,10 @@ return [
     'token_expired'         => 'Czas trwania sesji upłynął. Spróbuj ponownie.',
     'login_enabled'         => 'Logowanie włączone',
     'audit_due'             => 'Termin przeprowadzenia audytu',
-    'audit_due_days'        => 'Należności z tytułu Audytu w ciągu :days Dnia|Należne aktywa do audytu w ciągu :days',
+    'audit_due_days'        => '{}Assets Due or Overdue for Audit|[1]Assets Due or Overdue for Audit Within a Day|[2,*]Assets Due or Overdue for Audit Within :days Days',
     'checkin_due'           => 'Należne za Checkin',
     'checkin_overdue'       => 'Zaległe za odprawę',
-    'checkin_due_days'      => 'Należne aktywa do Checkin W ciągu :days Day|Aktywa do Checkin w ciągu :days',
+    'checkin_due_days'      => '{}Due for Checkin|[1]Assets Due for Checkin Within :days Day|[2,*]Assets Due for Checkin Within :days Days',
     'audit_overdue'         => 'Zaległe z tytułu audytu',
     'accept'                => 'Zaakceptuj :asset',
     'i_accept'              => 'Akceptuję',
@@ -383,6 +390,8 @@ return [
     'new_license'           => 'Nowa licencja',
     'new_accessory'         => 'Nowe akcesorium',
     'new_consumable'        => 'Nowy materiał eksploatacyjny',
+    'new_component'         => 'New Component',
+    'new_user'              => 'New User',
     'collapse'              => 'Zwiń',
     'assigned'              => 'Przypisane',
     'asset_count'           => 'Liczba aktywów',
@@ -405,9 +414,9 @@ return [
     'accessory_name'       => 'Nazwa akcesorium:',
     'clone_item'            => 'Klonuj obiekt',
     'checkout_tooltip' => 'Sprawdź ten element',
-    'checkin_tooltip' => 'Check this item in so that it is available for re-issue, re-imaging, etc',
+    'checkin_tooltip' => 'Zaznacz ten element, aby był dostępny do ponownego zgłoszenia, ponownego obrazowania itp.',
     'checkout_user_tooltip' => 'Sprawdź ten element do użytkownika',
-    'checkin_to_diff_location' => 'You can choose to check this asset in to a location other than this asset\'s default location of :default_location if one is set',
+    'checkin_to_diff_location' => 'Możesz zaznaczyć ten zasób do lokalizacji innej niż domyślna lokalizacja tego zasobu :default_location, jeśli jeden jest ustawiony',
     'maintenance_mode'      => 'Usługa jest tymczasowo niedostępna z powodu aktualizacji systemu. Sprawdź ponownie później.',
     'maintenance_mode_title' => 'System tymczasowo niedostępny',
     'ldap_import'           => 'Hasło użytkownika nie powinno być zarządzane przez LDAP. (Pozwala to wysyłać prośbę o zresetowanie zapomnianego hasła)',
@@ -425,12 +434,13 @@ return [
     'assets_by_status_type'      => 'Zasoby według typu statusu',
     'pie_chart_type'        => 'Typ wykresu Pie Dashboard',
     'hello_name'            => 'Witaj, :name!',
-    'unaccepted_profile_warning'   => 'Masz :count elementów wymagających akceptacji. Kliknij tutaj, aby je zaakceptować lub odrzucić',
+    'unaccepted_profile_warning'   => 'Masz jeden przedmiot wymagający akceptacji. Kliknij tutaj, aby zaakceptować lub odrzucić | Masz :count elementów wymagających akceptacji. Kliknij tutaj, aby je zaakceptować lub odrzucić',
     'start_date'            => 'Data rozpoczęcia',
     'end_date'            => 'Data zakończenia',
     'alt_uploaded_image_thumbnail' => 'Przesłano miniaturę',
     'placeholder_kit'       => 'Wybierz zestaw',
     'file_not_found'        => 'Nie odnaleziono pliku',
+    'log_record_not_found'  => 'Nie znaleziono rekordu dla tego wpisu dziennika.',
     'preview_not_available' => '(brak podglądu)',
     'setup'                 => 'Ustawienia',
     'pre_flight'            => 'Sprawdzenie',
@@ -508,11 +518,11 @@ return [
         'address2' => 'Druga linia adresu',
         'import_note' => 'Zaimportowano przy użyciu importera csv',
     ],
-    'remove_customfield_association' => 'Remove this field from the fieldset. This will not delete the custom field, only this field\'s association with this fieldset.',
-    'checked_out_to_fields' => 'Checked Out To Fields',
+    'remove_customfield_association' => 'Usuń to pole z zestawu pól. To nie usunie pola niestandardowego, tylko powiązanie tego pola z tym zestawem pól.',
+    'checked_out_to_fields' => 'Zaznaczone pola',
     'percent_complete' => '% ukończone',
     'uploading' => 'Wgrywanie... ',
-    'upload_error' => 'Błąd podczas przesyłania pliku. Sprawdź, czy nie ma pustych wierszy i czy nazwy kolumn nie są zduplikowane.',
+    'upload_error' => 'Error uploading file. Please check that you have no empty rows or duplicated column names in your CSV, and that the server permissions allow uploads.',
     'copy_to_clipboard' => 'Kopiuj do schowka',
     'copied' => 'Skopiowano!',
     'status_compatibility' => 'Jeśli zasoby są już przypisane, nie mogą zostać zmienione na niewdrożalny typ statusu i ta zmiana wartości zostanie pominięta.',
@@ -528,7 +538,7 @@ return [
     'permission_denied_superuser_demo' => 'Odmowa uprawnień. Nie można zaktualizować informacji użytkownika dla superadminów na demo.',
     'pwd_reset_not_sent' => 'Użytkownik nie jest aktywny, jest zsynchronizowany z LDAP lub nie posiada adresu e-mail',
     'error_sending_email' => 'Błąd podczas wysyłania wiadomości e-mail',
-    'sad_panda' => 'Sad panda. You are not authorized to do the thing. Maybe <a href=":link">return to the dashboard</a>, or contact your administrator.',
+    'sad_panda' => 'Nie masz uprawnień, aby to zrobić. Może <a href=":link">wróć do panelu</a>lub skontaktuj się z administratorem.',
     'bulk' => [
             'delete' =>
                 [
@@ -549,6 +559,71 @@ return [
         'license_seats'  => ':count Licencja Siedzenia|:count Licencja',
         'consumables'  => ':count Materiał|:count Materiałów|:count Materiałów',
         'components'  => ':count Składnik|:count Składniki',
-    ]
+    ],
+
+    'more_info' => 'Więcej informacji',
+    'quickscan_bulk_help' => 'Zaznaczenie tego pola spowoduje edycję rekordu aktywów, aby odzwierciedlić tę nową lokalizację. Pozostawienie go niezaznaczone spowoduje po prostu odnotowanie lokalizacji w dzienniku audytu.Zauważ, że jeśli ten zasób jest zablokowany, nie zmieni lokalizacji osoby, składnika aktywów lub miejsca, w którym jest ona kontrolowana.',
+    'whoops' => 'Uuuups!',
+    'something_went_wrong' => 'Coś poszło nie tak z twoim żądaniem.',
+    'close' => 'Zamknij',
+    'expires' => 'Wygasa',
+    'map_fields'=> 'Mapa pola :item_type',
+    'remaining_var' => 'Pozostało :count',
+    'label' => 'Etykieta',
+    'import_asset_tag_exists' => 'Zasób z tagiem aktywów :asset_tag już istnieje i nie zażądano aktualizacji. Nie dokonano żadnych zmian.',
+    'countries_manually_entered_help' => 'Wartości z gwiazdką (*) zostały wprowadzone ręcznie i nie odpowiadają istniejącym wartościom rozwijanym ISO 3166',
+    'accessories_assigned' => 'Przypisane akcesoria',
+    'user_managed_passwords' => 'Zarządzanie hasłami',
+    'user_managed_passwords_disallow' => 'Nie zezwalaj użytkownikom na zarządzanie własnymi hasłami',
+    'user_managed_passwords_allow' => 'Zezwalaj użytkownikom na zarządzanie własnymi hasłami',
+    'from' => 'From',
+    'by' => 'Przez',
+
+// Add form placeholders here
+    'placeholders' => [
+        'notes'  => 'Dodaj notatkę',
+    ],
+
+    'breadcrumb_button_actions' => [
+        'edit_item' => 'Edit :name',
+        'checkout_item' => 'Checkout :name',
+        'checkin_item' => 'Checkin :name',
+    ],
+
+    'skins' => [
+        'site_default' => 'Site Default',
+        'default_blue' => 'Default Blue',
+        'blue_dark' => 'Blue (Dark Mode)',
+        'green' => 'Green Dark',
+        'green_dark' => 'Green (Dark Mode)',
+        'red' => 'Red Dark',
+        'red_dark' => 'Red (Dark Mode)',
+        'orange' => 'Orange Dark',
+        'orange_dark' => 'Orange (Dark Mode)',
+        'black' => 'Black',
+        'black_dark' => 'Black (Dark Mode)',
+        'purple' => 'Purple',
+        'purple_dark' => 'Purple (Dark Mode)',
+        'yellow' => 'Yellow',
+        'yellow_dark' => 'Yellow (Dark Mode)',
+        'high_contrast' => 'High Contrast',
+
+    ],
+
+    'select_all_none' => 'Select/Unselect All',
+    'generic_model_not_found' => 'That :model was not found or you do not have permission to access it',
+    'deleted_models' => 'Deleted Asset Models',
+    'deleted_users' => 'Deleted Users',
+    'cost_each' => ':amount each',
+    'remove_current_image' => 'Remove current :type image',
+
+    'seeding' => [
+        'manufacturers' => [
+            'button' => 'Create Manufacturers',
+            'prompt' => 'You do not have any manufacturers yet. Would you like to seed a list of common manufacturers? (THIS WILL OVERWRITE EXISTING MANUFACTURERS, including those that have been soft-deleted.)',
+            'success' => 'Manufacturers seeded successfully',
+            'error' => 'Could not seed manufacturers. A manufacturer record already exists and seeding would overwrite it.|Could not seed manufacturers. :count manufacturer records already exist and seeding would overwrite them.',
+        ],
+    ],
 
 ];
diff --git a/resources/lang/pl-PL/localizations.php b/resources/lang/pl-PL/localizations.php
index 148b0dab55..ddb473b595 100644
--- a/resources/lang/pl-PL/localizations.php
+++ b/resources/lang/pl-PL/localizations.php
@@ -40,7 +40,9 @@ return [
         'ms-MY'=> 'malajski',
         'mi-NZ'=> 'maoryski',
         'mn-MN'=> 'mongolski',
-        'no-NO'=> 'norweski',
+        'nb-NO'=> 'Norweski',
+        'om-ET' => 'Etiopski (ORMO)',
+        //'nn-NO'=> 'Norwegian Nynorsk',
         'fa-IR'=> 'perski',
         'pl-PL'=> 'polski',
         'pt-PT'=> 'portugalski',
@@ -133,6 +135,7 @@ return [
         'EC'=>'Ekwador',
         'EE'=>'Estonia',
         'EG'=>'Egipt',
+        'GB-ENG'=>'Anglia',
         'ER'=>'Erytrea',
         'ES'=>'Hiszpania',
         'ET'=>'Etiopia',
@@ -231,6 +234,7 @@ return [
         'NG'=>'Nigeria',
         'NI'=>'Nikaragua',
         'NL'=>'Holandia',
+        'GB-NIR' => 'Irlandia Północna',
         'NO'=>'Norwegia',
         'NP'=>'Nepal',
         'NR'=>'Nauru',
@@ -258,7 +262,7 @@ return [
         'RU'=>'Federacja Rosyjska',
         'RW'=>'Rwanda',
         'SA'=>'Arabia Saudyjska',
-        'UK'=>'Szkocja',
+        'GB-SCT'=>'Szkocja',
         'SB'=>'Wyspy Salomona',
         'SC'=>'Seszele',
         'SS'=>'Sudan Południowy',
@@ -310,6 +314,7 @@ return [
         'VI'=>'Wyspy Dziewicze Stanów Zjednoczonych',
         'VN'=>'Wietnam',
         'VU'=>'Vanuatu',
+        'GB-WLS' =>'Walia',
         'WF'=>'Wallis i Futuna',
         'WS'=>'Samoa',
         'YE'=>'Jemen',
diff --git a/resources/lang/pl-PL/mail.php b/resources/lang/pl-PL/mail.php
index 0fea0f6deb..6b644f2b65 100644
--- a/resources/lang/pl-PL/mail.php
+++ b/resources/lang/pl-PL/mail.php
@@ -23,24 +23,25 @@ return [
     'Item_Requested' => 'Pozycja Zamówiona',
     'License_Checkin_Notification' => 'Akcesorium zwrócono',
     'License_Checkout_Notification' => 'Licencja wyczyszczona',
+    'license_for'   => 'Licencja dla',
     'Low_Inventory_Report' => 'Raport niskiego stanu zasobów',
     'a_user_canceled' => 'Użytkownik anulował zapotrzebowanie na sprzęt na stronie www',
     'a_user_requested' => 'Użytkownik zamówił pozycję na stronie internetowej',
     'acceptance_asset_accepted' => 'Użytkownik zaakceptował zasób',
     'acceptance_asset_declined' => 'Użytkownik odrzucił zasób',
-    'accessory_name' => 'Nazwa sprzętu:',
-    'additional_notes' => 'Dodatkowe notatki:',
+    'accessory_name' => 'Nazwa akcesoriów',
+    'additional_notes' => 'Dodatkowe notatki',
     'admin_has_created' => 'Administrator utworzył dla Ciebie konto na stronie :web.',
-    'asset' => 'Sprzęt:',
-    'asset_name' => 'Nazwa sprzętu:',
+    'asset' => 'Aktywo',
+    'asset_name' => 'Nazwa nabytku',
     'asset_requested' => 'Wystosowane zapotrzebowanie na sprzęt',
     'asset_tag' => 'Tag sprzętu',
     'assets_warrantee_alert' => 'Istnieje :count aktywów z gwarancją wygasającą w ciągu następnych :thereshold dni. | Istnieje :count aktywów z gwarancją wygasającą w ciągu następnych :threshold dni.',
     'assigned_to' => 'Przypisane do',
     'best_regards' => 'Pozdrawiam',
-    'canceled' => 'Anulowane:',
-    'checkin_date' => 'Data otrzymania:',
-    'checkout_date' => 'Data przypisania:',
+    'canceled' => 'Anulowane',
+    'checkin_date' => 'Data przypisania',
+    'checkout_date' => 'Data przypisania',
     'checkedout_from' => 'Zamówiono z',
     'checkedin_from'  => 'Sprawdzone od',
     'checked_into' => 'Sprawdzone w',
@@ -49,27 +50,30 @@ return [
     'click_to_confirm' => 'Proszę kliknąć na ten link aby potwierdzić swoje konto na :web:',
     'current_QTY' => 'Bieżąca ilość',
     'days' => 'Dni',
-    'expecting_checkin_date' => 'Spodziewana data przyjęcia:',
+    'expecting_checkin_date' => 'Przewidywana data przyjęcia',
     'expires' => 'Wygasa',
     'hello' => 'Cześć',
     'hi' => 'Cześć',
     'i_have_read' => 'Przeczytałem i zgadzam się z warunkami użytkowania oraz potwierdzam otrzymanie niniejszej pozycji.',
     'inventory_report' => 'Raport z magazynu',
-    'item' => 'Pozycja:',
+    'item' => 'Przedmiot',
+    'item_checked_reminder' => 'To jest przypomnienie, że aktualnie masz :count elementów przydzielonych do Ciebie, których nie zaakceptowałeś lub nie odrzuciłeś. Kliknij poniższy link, aby potwierdzić swoją decyzję.',
     'license_expiring_alert' => 'Istnieje: liczba licencja wygasająca w ciągu następnych: dni progowe. | Istnieje: liczba licencji wygasających w ciągu następnych: dni progowe.',
     'link_to_update_password' => 'Proszę kliknąć na poniższy link, aby zaktualizować swoje hasło na :web:',
-    'login' => 'Login:',
+    'login' => 'Login',
     'login_first_admin' => 'Zaloguj się do aplikacji Snipe-IT przy użyciu poniższych poświadczeń:',
     'low_inventory_alert' => 'Istnieje: liczba przedmiot, który jest poniżej minimalnej ilości zapasów lub wkrótce ta wartość będzie niska. | Istnieją: policz przedmioty, które są poniżej minimalnej ilości zapasów lub wkrótce te wartości będą niskie.',
     'min_QTY' => 'Min. ilość',
     'name' => 'Nazwa',
-    'new_item_checked' => 'Nowy przedmiot przypisany do Ciebie został zwrócony, szczegóły poniżej.',
+    'new_item_checked' => 'Nowy przedmiot został przypisany do Ciebie, szczegóły poniżej.',
+    'new_item_checked_with_acceptance' => 'A new item has been checked out under your name that requires acceptance, details are below.',
+    'recent_item_checked' => 'An item was recently checked out under your name that requires acceptance, details are below.',
     'notes' => 'Uwagi',
-    'password' => 'Hasło:',
+    'password' => 'Hasło',
     'password_reset' => 'Resetowanie hasła',
     'read_the_terms' => 'Proszę przeczytać warunki użytkowania przedstawione poniżej.',
     'read_the_terms_and_click' => 'Proszę zapoznać się z poniższymi warunkami użycia, i kliknij na link na dole, aby potwierdzić, że przeczytałeś/aś i zgodzisz się na warunki użytkowania i otrzymałeś/aś aktywa.',
-    'requested' => 'Zamówione:',
+    'requested' => 'Wymagane',
     'reset_link' => 'Link resetujący Twoje hasło',
     'reset_password' => 'Kliknij tutaj aby zresetować swoje hasło:',
     'rights_reserved' => 'Wszystkie prawa zastrzeżone.',
@@ -86,8 +90,10 @@ return [
     'upcoming-audits' => 'Istnieje :count aktywa, które nadchodzą do rewizji w ciągu :threshold days.|Istnieje :count aktywów, które nadchodzą do rewizji w ciągu :threshold dni.',
     'user' => 'Użytkownik',
     'username' => 'Nazwa użytkownika',
+    'unaccepted_asset_reminder' => 'Reminder: You have Unaccepted Assets.',
     'welcome' => 'Witaj :name',
     'welcome_to' => 'Witamy na :web!',
     'your_assets' => 'Zobacz swój sprzęt',
     'your_credentials' => 'Twoje poświadczenia :web',
+    'mail_sent' => 'Wiadomość wysłana pomyślnie!',
 ];
diff --git a/resources/lang/pl-PL/table.php b/resources/lang/pl-PL/table.php
index 71f834cf02..98bc369bf6 100644
--- a/resources/lang/pl-PL/table.php
+++ b/resources/lang/pl-PL/table.php
@@ -6,6 +6,6 @@ return array(
     'action' 		        => 'Akcja',
     'by'      		        => 'Przez',
     'item' 			        => 'Przedmiot',
-    'no_matching_records'   => 'No matching records found',
+    'no_matching_records'   => 'Nie znaleziono pasujących wyników',
 
 );
diff --git a/resources/lang/pl-PL/validation.php b/resources/lang/pl-PL/validation.php
index 5e56b7a07c..dfe170f396 100644
--- a/resources/lang/pl-PL/validation.php
+++ b/resources/lang/pl-PL/validation.php
@@ -13,87 +13,150 @@ return [
     |
     */
 
-    'accepted'             => ':attribute musi zostać zaakceptowany.',
-    'active_url'           => ':attribute nie jest poprawnym adresem URL.',
-    'after'                => ':attribute musi być późniejszą datą w stosunku do :date.',
-    'after_or_equal'       => ':attribute musi być datą po lub równa :date.',
-    'alpha'                => ':attribute może zawierać tylko litery.',
-    'alpha_dash'           => ':attribute może zawierać tylko litery, cyfry i myślniki.',
-    'alpha_num'            => ':attribute może zawierać tylko litery i cyfry.',
-    'array'                => ':attribute musi być zbiorem.',
-    'before'               => ':attribute musi być późniejszą datą w stosunku do :date.',
-    'before_or_equal'      => ':attribute musi być datą po lub równa :date.',
-    'between'              => [
-        'numeric' => ':attribute musi być pomiędzy :min - :max.',
-        'file'    => ':attribute musi być pomiędzy :min - :max kilobajtów.',
-        'string'  => ':attribute musi być pomiędzy :min - :max znaków.',
-        'array'   => ':attribute musi być pomiędzy :min - :max.',
+    'accepted' => ':attribute musi zostać zaakceptowany.',
+    'accepted_if' => ':attribute musi być zaakceptowany, gdy :other ma wartość :value.',
+    'active_url' => 'Pole :attribute musi być prawidłowym adresem URL.',
+    'after' => 'Pole :attribute musi być datą po :date.',
+    'after_or_equal' => 'Pole :attribute musi być datą po lub równą :date.',
+    'alpha' => ':attribute może zawierać tylko litery.',
+    'alpha_dash' => ':attribute może zawierać tylko litery, cyfry i myślniki.',
+    'alpha_num' => ':attribute może zawierać tylko litery i cyfry.',
+    'array' => 'Pole :attribute nie może być tablicą.',
+    'ascii' => 'Pole :attribute musi zawierać tylko jednobajtowe znaki alfanumeryczne i symbole.',
+    'before' => 'Pole :attribute musi być datą przed :date.',
+    'before_or_equal' => 'Pole :attribute musi być datą przed lub równą :date.',
+    'between' => [
+        'array' => ':attribute musi mieć pomiędzy :min a :max elementów.',
+        'file' => 'Pole :attribute musi być pomiędzy :min a :max kilobajtów.',
+        'numeric' => 'Pole :attribute musi być pomiędzy :min a :max.',
+        'string' => 'Pole :attribute musi zawierać się między :min a :max znaków.',
     ],
-    'boolean'              => 'Pole atrybutu: musi być prawdziwe lub fałszywe.',
-    'confirmed'            => 'Potwierdzenie :attribute nie pasuje.',
-    'date'                 => ':attribute nie jest prawidłową datą.',
-    'date_format'          => 'Format :attribute nie pasuje do :format.',
-    'different'            => ':attribute musi różnić się od :other.',
-    'digits'               => ':attribute musi posiadać cyfry :digits.',
-    'digits_between'       => ':attribute musi być pomiędzy cyframi :min i :max.',
-    'dimensions'           => 'Atrybut: atrybut ma nieprawidłowe wymiary obrazu.',
-    'distinct'             => 'Pole :attribute ma zduplikowane wartości.',
-    'email'                => 'Format pola :attribute jest niewłaściwy.',
-    'exists'               => 'Wybrane :attribute jest niewłaściwe.',
-    'file'                 => ':attribute musi być plikiem.',
-    'filled'               => 'Pole :attribute musi posiadać wartość.',
-    'image'                => ':attribute musi być obrazkiem.',
+    'boolean' => 'Pole atrybutu: musi być prawdziwe lub fałszywe.',
+    'can' => 'Pole :attribute zawiera nieautoryzowaną wartość.',
+    'confirmed' => 'Potwierdzenie pola :attribute nie pasuje.',
+    'contains' => 'Pole :attribute nie posiada wymaganej wartości.',
+    'current_password' => 'Hasło jest nieprawidłowe.',
+    'date' => 'Pole :attribute musi być prawidłową datą.',
+    'date_equals' => 'Pole :attribute musi być datą równą :date.',
+    'date_format' => 'Pole :attribute musi pasować do formatu :format.',
+    'decimal' => 'Pole :attribute musi mieć :dziesiętne miejsca po przecinku.',
+    'declined' => 'Pole :attribute musi zostać odrzucone.',
+    'declined_if' => 'Pole :attribute musi zostać odrzucone, gdy :other jest :value.',
+    'different' => 'Pole :attribute i :other muszą być różne.',
+    'digits' => 'Pole :attribute musi zawierać :digits cyfry.',
+    'digits_between' => 'Pole :attribute musi zawierać się między :min a :max cyfr.',
+    'dimensions' => 'Pole :attribute ma nieprawidłowe wymiary obrazu.',
+    'distinct' => 'Pole :attribute ma zduplikowane wartości.',
+    'doesnt_end_with' => 'Pole :attribute nie może kończyć się jednym z następujących: :values.',
+    'doesnt_start_with' => 'Pole :attribute nie może zaczynać się od jednego z następujących: :values.',
+    'email' => 'Pole :attribute musi być poprawnym adresem e-mail.',
+    'ends_with' => 'Pole :attribute musi kończyć się jednym z następujących: :values.',
+    'enum' => 'Wybrany :attribute jest nieprawidłowy.',
+    'exists' => 'Wybrane :attribute jest niewłaściwe.',
+    'extensions' => 'Pole :attribute musi mieć jedno z następujących rozszerzeń: :values.',
+    'file' => 'Pole :attribute musi być plikiem.',
+    'filled' => 'Pole :attribute musi posiadać wartość.',
+    'gt' => [
+        'array' => ':attribute musi mieć więcej niż :value elementów.',
+        'file' => 'Pole :attribute musi być większe niż :value kilobajtów.',
+        'numeric' => 'Pole :attribute musi być większe niż :value.',
+        'string' => 'Pole :attribute musi być większe niż :value znaków.',
+    ],
+    'gte' => [
+        'array' => ':attribute musi mieć :value elementów lub więcej.',
+        'file' => 'Pole :attribute musi być większe lub równe :value kilobajtów.',
+        'numeric' => 'Pole :attribute musi być większe lub równe :value.',
+        'string' => 'Pole :attribute musi być większe lub równe :value znaków.',
+    ],
+    'hex_color' => 'Pole :attribute musi być prawidłowym kolorem szesnastkowym.',
+    'image' => 'Pole :attribute musi być obrazem.',
     'import_field_empty'    => 'Wartość dla :fieldname nie może być pusta.',
-    'in'                   => 'Wybrane :attribute jest niewłaściwe.',
-    'in_array'             => 'Pole: attribute nie istnieje w: other.',
-    'integer'              => ':attribute must musi być liczbą całkowitą.',
-    'ip'                   => ':attribute musi być poprawnym adresem IP.',
-    'ipv4'                 => 'Atrybut: musi być prawidłowym adresem IPv4.',
-    'ipv6'                 => 'Atrybut: musi być prawidłowym adresem IPv6.',
-    'is_unique_department' => ':attribute musi być unikatowy dla tej firmy',
-    'json'                 => 'Atrybut: musi być prawidłowym ciągiem JSON.',
-    'max'                  => [
-        'numeric' => ':attribute nie może być większy niż :max.',
-        'file'    => ':attribute nie może być więszky niż :max kilobajtów.',
-        'string'  => ':attribute nie może posiadać więcej znaków niż :max.',
-        'array'   => 'Atrybut: atrybut nie może zawierać więcej niż: max elementów.',
+    'in' => 'Wybrane :attribute jest niewłaściwe.',
+    'in_array' => 'Pole :attribute musi istnieć w :other.',
+    'integer' => 'Pole :attribute musi być liczbą całkowitą.',
+    'ip' => 'Pole :attribute musi być prawidłowym adresem IP.',
+    'ipv4' => 'Atrybut: musi być prawidłowym adresem IPv4.',
+    'ipv6' => 'Pole :attribute musi być prawidłowym adresem IPv6.',
+    'json' => 'Atrybut: musi być prawidłowym ciągiem JSON.',
+    'list' => 'Pole :attribute musi być listą.',
+    'lowercase' => 'Pole :attribute musi być małą literą.',
+    'lt' => [
+        'array' => ':attribute musi mieć mniej niż :value elementów.',
+        'file' => 'Pole :attribute musi być mniejsze niż :value kilobajtów.',
+        'numeric' => 'Pole :attribute musi być mniejsze niż :value.',
+        'string' => 'Pole :attribute musi być mniejsze niż :value znaków.',
     ],
-    'mimes'                => ':attribute musi być plikiem z rozszerzeniami :values.',
-    'mimetypes'            => 'Atrybut: atrybut musi być plikiem typu:: wartości.',
-    'min'                  => [
-        'numeric' => ':attribute musi być przynajmniej :min.',
-        'file'    => ':attribute musi być przynajmniej wielkości :min kilobajtów.',
-        'string'  => ':attribute musi być posiadać minimum :min znaki.',
-        'array'   => 'Atrybut: musi zawierać co najmniej: min.',
+    'lte' => [
+        'array' => ':attribute nie może mieć więcej niż :value elementów.',
+        'file' => 'Pole :attribute musi być mniejsze lub równe :value kilobajtów.',
+        'numeric' => 'Pole :attribute musi być mniejsze lub równe :value.',
+        'string' => 'Pole :attribute musi być mniejsze lub równe :value znaków.',
     ],
-    'starts_with'          => ':attribute musi zaczynać się jednym z następujących wartości: :values.',
-    'ends_with'            => ':attribute musi kończyć się jedną z następujących wartości: :values.',
+    'mac_address' => 'Pole :attribute musi być prawidłowym adresem MAC.',
+    'max' => [
+        'array' => ':attribute nie może mieć więcej niż :max elementów.',
+        'file' => 'Pole :attribute nie może być większe niż :max kilobajtów.',
+        'numeric' => 'Pole :attribute nie może być większe niż :max.',
+        'string' => 'Pole :attribute nie może być większe niż :max znaków.',
+    ],
+    'max_digits' => 'Pole :attribute nie może zawierać więcej niż :max cyfr.',
+    'mimes' => 'Pole :attribute musi być plikiem typu: :values.',
+    'mimetypes' => 'Pole :attribute musi być plikiem typu: :values.',
+    'min' => [
+        'array' => 'Pole :attribute musi mieć co najmniej :min elementów.',
+        'file' => 'Pole :attribute musi mieć co najmniej :min kilobajtów.',
+        'numeric' => 'Pole :attribute musi być co najmniej :min.',
+        'string' => 'Pole :attribute musi mieć co najmniej :min znaków.',
+    ],
+    'min_digits' => 'Pole :attribute musi zawierać co najmniej :min cyfr.',
+    'missing' => 'Brakuje pola :attribute',
+    'missing_if' => 'Pole :attribute musi być puste, gdy :other jest :value.',
+    'missing_unless' => 'Pole :attribute musi być puste, chyba że :other jest :value.',
+    'missing_with' => 'Pole :attribute musi być puste, gdy :values jest obecne.',
+    'missing_with_all' => 'Pole :attribute musi być puste, gdy :values są obecne.',
+    'multiple_of' => 'Pole :attribute musi być wielokrotnością :value.',
+    'not_in' => 'Wybrany :attribute jest nieprawidłowy.',
+    'not_regex' => 'Format pola :attribute jest nieprawidłowy.',
+    'numeric' => 'Pole :attribute musi być liczbą.',
+    'password' => [
+        'letters' => 'Pole :attribute musi zawierać co najmniej jedną literę.',
+        'mixed' => 'Pole :attribute musi zawierać co najmniej jedną wielką literę i jedną małą literę.',
+        'numbers' => 'Pole :attribute musi zawierać co najmniej jedną liczbę.',
+        'symbols' => 'Pole :attribute musi zawierać co najmniej jeden symbol.',
+        'uncompromised' => 'Podany :attribute pojawił się w wycieku danych. Proszę wybrać inny :attribute.',
+    ],
+    'percent'       => 'Minimalna amortyzacja musi wynosić od 0 do 100 w przypadku gdy wartość procentowa amortyzacji jest wyrażona w procentach.',
 
-    'not_in'               => 'Wybrany :attribute jest nieprawidłowy.',
-    'numeric'              => ':attribute musi być liczbą.',
-    'present'              => ':attribute nie może być puste.',
-    'valid_regex'          => 'Nieprawidłowe wyrażenie regularne. ',
-    'regex'                => 'Format :attribute jest niewłaściwy.',
-    'required'             => ':attribute nie może być puste.',
-    'required_if'          => 'Pole :attribute jest wymagane gdy :other jest :value.',
-    'required_unless'      => 'Pole atrybutów: wymagane jest, chyba że inne są w: wartościach.',
-    'required_with'        => 'Pole :attribute jest wymagane gdy :values jest podana.',
-    'required_with_all'    => 'Pole atrybutu: atrybut jest wymagane, gdy: wartości są obecne.',
-    'required_without'     => 'Pole :attribute jest wymagane gdy :values nie jest podana.',
+    'present' => ':attribute nie może być puste.',
+    'present_if' => 'Pole :attribute musi być obecne, gdy :other jest :value.',
+    'present_unless' => 'Pole :attribute musi być obecne, chyba że :other jest :value.',
+    'present_with' => ':attribute musi być obecny, gdy :values jest obecny.',
+    'present_with_all' => ':attribute musi być obecny, gdy :values są obecne.',
+    'prohibited' => 'Pole :attribute jest zabronione.',
+    'prohibited_if' => 'Pole :attribute jest zabronione, gdy :other to :value.',
+    'prohibited_unless' => 'Pole :attribute jest zabronione, chyba że :other znajduje się w :values.',
+    'prohibits' => 'Pole :attribute zabrania :other obecności .',
+    'regex' => 'Format pola :attribute jest nieprawidłowy.',
+    'required' => ':attribute nie może być puste.',
+    'required_array_keys' => 'Pole :attribute musi zawierać wpisy dla: :values.',
+    'required_if' => 'Pole :attribute jest wymagane gdy :other jest :value.',
+    'required_if_accepted' => 'Pole :attribute jest wymagane, gdy :other jest zaakceptowane.',
+    'required_if_declined' => 'Pole :attribute jest wymagane, gdy :other jest odrzucone.',
+    'required_unless' => 'Pole atrybutów: wymagane jest, chyba że inne są w: wartościach.',
+    'required_with' => 'Pole :attribute jest wymagane gdy :values jest podana.',
+    'required_with_all' => 'Pole :attribute jest wymagane, gdy :values są obecne.',
+    'required_without' => 'Pole :attribute jest wymagane gdy :values nie jest podana.',
     'required_without_all' => 'Pole atrybutu: attribute jest wymagane, gdy żadna z: wartości nie jest obecna.',
-    'same'                 => ':attribute i :other muszą pasować.',
-    'size'                 => [
-        'numeric' => ':attribute musi być wielkości :size.',
-        'file'    => ':attribute musi być :size kilobajtów.',
-        'string'  => ':attribute musi być :size znakowy.',
-        'array'   => 'Atrybut: musi zawierać: elementy rozmiaru.',
+    'same' => 'Pole :attribute musi pasować do :other.',
+    'size' => [
+        'array' => ':attribute musi zawierać :size elementów.',
+        'file' => 'Pole :attribute musi mieć :size kilobajtów.',
+        'numeric' => 'Pole :attribute musi być :size.',
+        'string' => 'Pole :attribute musi mieć :size znaków.',
     ],
+    'starts_with' => 'Pole :attribute musi zaczynać się od jednego z następujących: :values.',
     'string'               => 'Atrybut: atrybut musi być ciągiem.',
-    'timezone'             => 'Atrybut: musi być poprawną strefą.',
     'two_column_unique_undeleted' => ':attribute musi być unikalny pomiędzy :table1 i :table2. ',
-    'unique'               => ':attribute został już wzięty.',
-    'uploaded'             => 'Nie udało się przesłać atrybutu:.',
-    'url'                  => 'Format pola :attribute jest niewłaściwy.',
     'unique_undeleted'     => 'Wartość :attribute musi być unikalna.',
     'non_circular'         => ':attribute nie może tworzyć odwołań cyklicznych.',
     'not_array'            => ':attribute nie może być tablicą.',
@@ -102,11 +165,14 @@ return [
     'numbers'              => 'Hasło musi zawierać co najmniej jedną cyfrę.',
     'case_diff'            => 'Hasło musi zawierać małe i wielkie litery.',
     'symbols'              => 'Hasło musi zawierać znaki specjalne.',
-    'gte'                  => [
-        'numeric'          => 'Wartość nie może być ujemna'
-    ],
-    'checkboxes'           => ':attribute zawiera nieprawidłowe opcje.',
-    'radio_buttons'        => ':attribute jest nieprawidłowy.',
+    'timezone' => 'Pole :attribute musi być poprawną strefą czasową.',
+    'unique' => ':attribute został już wzięty.',
+    'uploaded' => 'Nie udało się przesłać atrybutu:.',
+    'uppercase' => 'Pole :attribute musi być wielkimi literami.',
+    'url' => 'Pole :attribute musi być prawidłowym adresem URL.',
+    'ulid' => 'Pole :attribute musi być poprawnym ULID.',
+    'uuid' => 'Pole :attribute musi być prawidłowym UUID.',
+    'fmcs_location' => 'Full multiple company support and location scoping is enabled in the Admin Settings, and the selected location and selected company are not compatible.',
 
 
     /*
@@ -120,16 +186,22 @@ return [
     |
     */
 
+    'email_array'      => 'Jeden lub więcej wprowadzonych adresów jest nieprawidłowy.',
+    'checkboxes'           => ':attribute zawiera nieprawidłowe opcje.',
+    'radio_buttons'        => ':attribute jest nieprawidłowy.',
+    
     'custom' => [
         'alpha_space' => 'Pole: attribute zawiera znak, który nie jest dozwolony.',
-        'email_array'      => 'Jeden lub więcej adresów e-mail jest nieprawidłowy.',
+
         'hashed_pass'      => 'Twoje bieżące hasło jest niepoprawne',
         'dumbpwd'          => 'To hasło jest zbyt powszechne.',
         'statuslabel_type' => 'Musisz wybrać odpowiedni typ etykiety statusu',
+        'custom_field_not_found'          => 'To pole nie istnieje, sprawdź dokładnie nazwy pól niestandardowych.',
+        'custom_field_not_found_on_model' => 'To pole wydaje się istnieć, ale nie jest dostępne w tym zestawie pól Modelu Zasobów.',
 
         // date_format validation with slightly less stupid messages. It duplicates a lot, but it gets the job done :(
-        // We use this because the default error message for date_format is reflects php Y-m-d, which non-PHP
-        // people won't know how to format. 
+        // We use this because the default error message for date_format reflects php Y-m-d, which non-PHP
+        // people won't know how to format.
         'purchase_date.date_format'     => ':attribute musi być prawidłową datą w formacie YYYY-MM-DD',
         'last_audit_date.date_format'   =>  ':attribute musi być prawidłową datą w formacie YYYY-MM-DD hh:mm:ss',
         'expiration_date.date_format'   =>  ':attribute musi być prawidłową datą w formacie YYYY-MM-DD',
@@ -137,9 +209,15 @@ return [
         'expected_checkin.date_format'  =>  ':attribute musi być prawidłową datą w formacie YYYY-MM-DD',
         'start_date.date_format'        =>  ':attribute musi być prawidłową datą w formacie YYYY-MM-DD',
         'end_date.date_format'          =>  ':attribute musi być prawidłową datą w formacie YYYY-MM-DD',
+        'invalid_value_in_field' => 'Nieprawidłowa wartość dołączona do tego pola',
 
-    ],
+        'ldap_username_field' => [
+            'not_in' =>         '<code>sAMAccountName</code> (przypadek mieszany) prawdopodobnie nie zadziała. Zamiast tego powinieneś użyć <code>samaccountname</code> (małe przypadki).'
+        ],
+        'ldap_auth_filter_query' => ['not_in' => '<code>uid=samaccountname</code> prawdopodobnie nie jest prawidłowym filtrem uwierzytelniającym. Prawdopodobnie chcesz <code>uid=</code> '],
+        'ldap_filter' => ['regex' => 'Ta wartość prawdopodobnie nie powinna być zawijana w nawiasy.'],
 
+        ],
     /*
     |--------------------------------------------------------------------------
     | Custom Validation Attributes
@@ -155,8 +233,16 @@ return [
 
     /*
     |--------------------------------------------------------------------------
-    | Generic Validation Messages
+    | Generic Validation Messages - we use these in the jquery validation where we don't have
+    | access to the :attribute
     |--------------------------------------------------------------------------
     */
-    'invalid_value_in_field' => 'Nieprawidłowa wartość dołączona do tego pola',
+
+    'generic' => [
+        'invalid_value_in_field' => 'Nieprawidłowa wartość dołączona do tego pola',
+        'required' => 'To pole jest wymagane',
+        'email' => 'Podaj poprawny adres e-mail',
+    ],
+
+
 ];
diff --git a/resources/lang/pt-BR/account/general.php b/resources/lang/pt-BR/account/general.php
index d5ce373167..108757c979 100644
--- a/resources/lang/pt-BR/account/general.php
+++ b/resources/lang/pt-BR/account/general.php
@@ -2,10 +2,17 @@
 
 return array(
     'personal_api_keys' => 'Chaves de API pessoal',
-    'api_key_warning' => 'When generating an API token, be sure to copy it down immediately as they will not be visible to you again.',
+    'personal_access_token' => 'Token de acesso pessoal',
+    'personal_api_keys_success' => 'Chave de API pessoal: chave criada com sucesso',
+    'here_is_api_key' => 'Aqui está seu novo token de acesso pessoal. Esta é a única vez que ela será mostrada então não perca! Agora você pode usar esse token para fazer solicitações de API.',
+    'api_key_warning' => 'Ao gerar um token de API, certifique-se de copiá-lo imediatamente porque
+ eles não serão visíveis para você novamente.',
     'api_base_url' => 'A sua URL base da API está localizada em:',
     'api_base_url_endpoint' => '/&lt;endpoint&gt;',
     'api_token_expiration_time' => 'Tokens de API estão definidos para expirar em:',
-    'api_reference' => 'Please check the <a href="https://snipe-it.readme.io/reference" target="_blank">API reference</a> to find specific API endpoints and additional API documentation.',
-    'profile_updated' => 'Account successfully updated',
+    'api_reference' => 'Por favor, verifique as <a href="https://snipe-it.readme.io/reference" target="_blank"> referências da API</a> para encontrar endpoints específicos da API e documentação adicional da API.',
+    'profile_updated' => 'Conta atualizada com sucesso',
+    'no_tokens' => 'Você não criou nenhum token de acesso pessoal.',
+    'enable_sounds' => 'Ativar efeitos de som',
+    'enable_confetti' => 'Habilitar efeitos de confete',
 );
diff --git a/resources/lang/pt-BR/admin/accessories/message.php b/resources/lang/pt-BR/admin/accessories/message.php
index e77b81131b..19dc82d5b2 100644
--- a/resources/lang/pt-BR/admin/accessories/message.php
+++ b/resources/lang/pt-BR/admin/accessories/message.php
@@ -25,8 +25,12 @@ return array(
      'checkout' => array(
         'error'   		=> 'O acessório não foi alocado, por favor tente novamente',
         'success' 		=> 'Acessório alocado com sucesso.',
-        'unavailable'   => 'Acessório não está disponível para check-out. Verifique a quantidade disponível',
-        'user_does_not_exist' => 'Este usuário é inválido. Tente novamente.'
+        'unavailable'   => 'Acessório não está disponível para saída. Verifique a quantidade disponível',
+        'user_does_not_exist' => 'Este usuário é inválido. Tente novamente.',
+         'checkout_qty' => array(
+            'lte'  => 'Atualmente há apenas um acessório disponível deste tipo, e você está tentando conferir :checkout_qty. Por favor, ajuste a quantidade do check-out ou o estoque total deste acessório e tente novamente. Existem :number_currently_remaining total accessoris disponíveis, e você está tentando conferir :checkout_qty. Por favor, ajuste a quantidade do check-out ou o estoque total deste acessório e tente novamente.',
+            ),
+           
     ),
 
     'checkin' => array(
diff --git a/resources/lang/pt-BR/admin/accessories/table.php b/resources/lang/pt-BR/admin/accessories/table.php
index 0a6a830444..f9a400394b 100644
--- a/resources/lang/pt-BR/admin/accessories/table.php
+++ b/resources/lang/pt-BR/admin/accessories/table.php
@@ -6,6 +6,4 @@ return array(
     'id'      					=> 'ID',
     'require_acceptance'      	=> 'Aceitação',
     'title'      				=> 'Nome do Acessório',
-
-
 );
diff --git a/resources/lang/pt-BR/admin/categories/general.php b/resources/lang/pt-BR/admin/categories/general.php
index 17bb582052..bb357ed8f0 100644
--- a/resources/lang/pt-BR/admin/categories/general.php
+++ b/resources/lang/pt-BR/admin/categories/general.php
@@ -3,7 +3,7 @@
 return array(
     'asset_categories' 					=> 'Categorias de Ativos',
     'category_name'  					=> 'Nome da Categoria',
-    'checkin_email'                     => 'Enviar email para o usuário no check-in / check-out.',
+    'checkin_email'                     => 'Enviar email para o usuário na devolução / saída.',
     'checkin_email_notification'        => 'Este usuário receberá um email no checkin / checkout.',
     'clone'                             => 'Clonar Categoria',
     'create'  							=> 'Criar Categoria',
diff --git a/resources/lang/pt-BR/admin/components/message.php b/resources/lang/pt-BR/admin/components/message.php
index 146b446650..08a7927046 100644
--- a/resources/lang/pt-BR/admin/components/message.php
+++ b/resources/lang/pt-BR/admin/components/message.php
@@ -17,7 +17,8 @@ return array(
     'delete' => array(
         'confirm'   => 'Tem a certeza que deseja excluir este componente?',
         'error'   => 'Existe um problema ao excluir o componente. Por favor tente de novo.',
-        'success' => 'O componente foi excluído com sucesso.'
+        'success' => 'O componente foi excluído com sucesso.',
+        'error_qty'   => 'Alguns componentes deste tipo ainda estão registrados. Por favor, verifique-os e tente novamente.',
     ),
 
      'checkout' => array(
diff --git a/resources/lang/pt-BR/admin/consumables/general.php b/resources/lang/pt-BR/admin/consumables/general.php
index 754c07d5f0..ce250a1787 100644
--- a/resources/lang/pt-BR/admin/consumables/general.php
+++ b/resources/lang/pt-BR/admin/consumables/general.php
@@ -8,4 +8,5 @@ return array(
     'remaining' 			            => 'Restante',
     'total' 			                => 'Total',
     'update'                            => 'Atualizar um suprimento',
+    'inventory_warning'                 => 'O inventário deste consumível está abaixo da quantidade mínima de :min_count',
 );
diff --git a/resources/lang/pt-BR/admin/consumables/message.php b/resources/lang/pt-BR/admin/consumables/message.php
index ee2b1e30ac..6a78ee10c3 100644
--- a/resources/lang/pt-BR/admin/consumables/message.php
+++ b/resources/lang/pt-BR/admin/consumables/message.php
@@ -2,6 +2,7 @@
 
 return array(
 
+    'invalid_category_type' => 'A categoria deve ser uma categoria de consumível.',
     'does_not_exist' => 'O consumível não existe.',
 
     'create' => array(
@@ -22,7 +23,7 @@ return array(
 
      'checkout' => array(
         'error'   		=> 'Consumível não foi verificado, por favor tente novamente',
-        'success' 		=> 'Realizada a verificação do consumível com êxito.',
+        'success' 		=> 'Realizada a saída do consumível com êxito.',
         'user_does_not_exist' => 'Esse usuário é inválido. Por favor, tente novamente.',
          'unavailable'      => 'Não há consumíveis suficientes para este checkout. Por favor, verifique a quantidade restante. ',
     ),
diff --git a/resources/lang/pt-BR/admin/custom_fields/general.php b/resources/lang/pt-BR/admin/custom_fields/general.php
index 0f95d95f84..d258bafd4f 100644
--- a/resources/lang/pt-BR/admin/custom_fields/general.php
+++ b/resources/lang/pt-BR/admin/custom_fields/general.php
@@ -35,7 +35,7 @@ return [
     'create_field_title' => 'Criar um novo campo personalizado',
     'value_encrypted'      	        => 'O valor deste campo é encriptado no banco de dados. Somente usuários administradores podem ver o valor descriptografado',
     'show_in_email'     => 'Incluir o valor desse campo nos e-mails enviados para o usuário? Campos criptografados não podem ser incluídos em e-mails',
-    'show_in_email_short'     => 'Incluir nos e-mails.',
+    'show_in_email_short' => 'Incluir nos e-mails',
     'help_text' => 'Texto de ajuda',
     'help_text_description' => 'Este é um texto opcional que irá aparecer abaixo dos elementos de formulário ao editar um ativo para fornecer o contexto no campo.',
     'about_custom_fields_title' => 'Sobre os campos personalizados',
@@ -57,5 +57,8 @@ return [
     'show_in_requestable_list_short' => 'Mostrar na lista de ativos solicitáveis',
     'show_in_requestable_list' => 'Mostrar valor na lista de ativos solicitáveis. Campos criptografados não serão exibidos',
     'encrypted_options' => 'Este campo está criptografado, então algumas opções de exibição não estarão disponíveis.',
+    'display_checkin' => 'Exibir em formulários de entrada',
+    'display_checkout' => 'Exibir em formulários de saída',
+    'display_audit' => 'Display in audit forms',
 
 ];
diff --git a/resources/lang/pt-BR/admin/custom_fields/message.php b/resources/lang/pt-BR/admin/custom_fields/message.php
index a887dfed8d..972d0e3dd5 100644
--- a/resources/lang/pt-BR/admin/custom_fields/message.php
+++ b/resources/lang/pt-BR/admin/custom_fields/message.php
@@ -5,6 +5,7 @@ return array(
     'field' => array(
         'invalid'   => 'Esse campo não existe.',
         'already_added'   => 'Campo já adicionado',
+        'none_selected'   => 'Nenhum campo selecionado',
 
         'create' => array(
             'error'   => 'Campo não criado. Por favor tente novamente.',
diff --git a/resources/lang/pt-BR/admin/depreciations/general.php b/resources/lang/pt-BR/admin/depreciations/general.php
index 9dbec37790..65a9c10cda 100644
--- a/resources/lang/pt-BR/admin/depreciations/general.php
+++ b/resources/lang/pt-BR/admin/depreciations/general.php
@@ -13,4 +13,8 @@ return [
     'no_depreciations_warning'               => '<strong>Aviso: </strong>
                       Você não tem atualmente nenhuma depreciação configurada.
                       Por favor, defina pelo menos uma depreciação para visualizar o relatório de depreciação.',
+    'depreciation_method'                   => 'Relatório de Depreciações',
+    'linear_depreciation'                   => 'Linear (Default)',
+    'half_1'                                => 'Half-year convention, always applied',
+    'half_2'                                => 'Half-year convention, applied with condition',
 ];
diff --git a/resources/lang/pt-BR/admin/hardware/form.php b/resources/lang/pt-BR/admin/hardware/form.php
index c678fc998d..0b1a5ee6f4 100644
--- a/resources/lang/pt-BR/admin/hardware/form.php
+++ b/resources/lang/pt-BR/admin/hardware/form.php
@@ -29,7 +29,7 @@ return [
     'expected_checkin'  => 'Excedeu a data dar entrada',
     'expires'			=> 'Expira',
     'fully_depreciated'	=> 'Totalmente Depreciado',
-    'help_checkout'		=> 'Se você quiser designar este ativo imediatamente, selecione "Pronto para Entregar" a partir da lista de estados acima. ',
+    'help_checkout'		=> 'Se você quiser designar este ativo imediatamente, selecione "Pronto para Entregar" a partir da lista de situações acima. ',
     'mac_address'		=> 'Endereço MAC',
     'manufacturer'		=> 'Fabricante',
     'model'				=> 'Modelo',
@@ -39,12 +39,12 @@ return [
     'order'				=> 'Número do Pedido',
     'qr'				=> 'Código QR',
     'requestable'		=> 'Usuários podem solicitar este ativo',
-    'redirect_to_all'   => 'Return to all :type',
-    'redirect_to_type'   => 'Go to :type',
-    'redirect_to_checked_out_to'   => 'Go to Checked Out to',
-    'select_statustype'	=> 'Selecione o Tipo de Status',
+    'redirect_to_all'   => 'Voltar para todos os :type',
+    'redirect_to_type'   => 'Ir para :type',
+    'redirect_to_checked_out_to'   => 'Ir para Checked Out para',
+    'select_statustype'	=> 'Selecione o Tipo de Situação',
     'serial'			=> 'Serial',
-    'status'			=> 'Status',
+    'status'			=> 'Situação',
     'tag'				=> 'Marcação do Ativo',
     'update'			=> 'Atualização do Ativo',
     'warranty'			=> 'Garantia',
@@ -54,9 +54,12 @@ return [
     'asset_location_update_default_current' => 'Atualizar a localização padrão e local real',
     'asset_location_update_default' => 'Atualizar somente local padrão',
     'asset_location_update_actual' => 'Atualizar somente a localização atual',
-    'asset_not_deployable' => 'Este status de ativo não é implantado. Este ativo não pode ser verificado.',
-    'asset_deployable' => 'Este status pode ser implementado. Este ativo pode ser verificado.',
+    'asset_not_deployable' => 'Esta situação de ativo não é implementável. A saída deste ativo não pode ser realizada.',
+    'asset_not_deployable_checkin' => 'That asset status is not deployable. Using this status label will checkin the asset.',
+    'asset_deployable' => 'This asset can be checked out.',
     'processing_spinner' => 'Processando... (Isso pode levar algum tempo em arquivos grandes)',
+    'processing' => 'Processando... ',
     'optional_infos'  => 'Informação Opcional',
-    'order_details'   => 'Informações do pedido relacionado'
+    'order_details'   => 'Informações do pedido relacionado',
+    'calc_eol'    => 'If nulling the EOL date, use automatic EOL calculation based on the purchase date and EOL rate.',
 ];
diff --git a/resources/lang/pt-BR/admin/hardware/general.php b/resources/lang/pt-BR/admin/hardware/general.php
index fae8afb6dc..a627b51340 100644
--- a/resources/lang/pt-BR/admin/hardware/general.php
+++ b/resources/lang/pt-BR/admin/hardware/general.php
@@ -5,8 +5,8 @@ return [
     'about_assets_text'            => 'Ativos são itens que são controlados e rastreáveis pelo número de série ou por uma etiqueta de ativo (patrimônio). Eles tendem a ser de valor elevado onde a identificação de itens específicos é relevante.',
     'archived'  				=> 'Arquivado',
     'asset'  					=> 'Ativo',
-    'bulk_checkout'             => 'Alocação de Ativos',
-    'bulk_checkin'              => 'Check-in de Ativo',
+    'bulk_checkout'             => 'Saída em massa',
+    'bulk_checkin'              => 'Entrada em massa',
     'checkin'  					=> 'Retornar Ativo',
     'checkout'  				=> 'Checkout de Ativo',
     'clone'  					=> 'Clonar Ativo',
@@ -15,20 +15,19 @@ return [
     'delete_confirm'            => 'Tem certeza de que deseja excluir este ativo?',
     'edit'  					=> 'Editar Ativo',
     'model_deleted'  			=> 'Este modelo de Ativos foi excluído. Você deve restaurar o modelo antes de restaurar o Ativo.',
-    'model_invalid'             => 'This model for this asset is invalid.',
-    'model_invalid_fix'         => 'The asset must be updated use a valid asset model before attempting to check it in or out, or to audit it.',
+    'model_invalid'             => 'Esse modelo para esse ativo é inválido.',
+    'model_invalid_fix'         => 'O ativo deve ser atualizado use um modelo de ativo válido antes de tentar verificá-lo ou fazer uma auditoria.',
     'requestable'               => 'Solicitável',
     'requested'				    => 'Solicitado',
     'not_requestable'           => 'Não solicitável',
-    'requestable_status_warning' => 'Não altere o status solicitável',
+    'requestable_status_warning' => 'Não altere a situação de solicitável',
     'restore'  					=> 'Restaurar Ativo',
     'pending'  					=> 'Pendente',
     'undeployable'  			=> 'Não implementável',
-    'undeployable_tooltip'  	=> 'Este ativo possui uma etiqueta de status que não é implantável e não pode ser check-out no momento.',
+    'undeployable_tooltip'  	=> 'Este ativo possui uma etiqueta de situação que não é implementável e não pode ser disponibilizado no momento.',
     'view'  					=> 'Ver Ativo',
     'csv_error' => 'Você tem um erro no seu arquivo CSV:',
-    'import_text' => '<p>Upload de um CSV que contém o histórico de ativos. Os ativos e usuários já existem no sistema, ou serão ignorados. Correspondência de mídias para o histórico de importação acontece com a tag de conteúdo. Tentaremos encontrar um usuário correspondente com base no nome de usuário que você fornece, e nos critérios que você selecionar abaixo. Se você não selecionar nenhum critério abaixo, ele simplesmente tentará combinar com o formato de nome de usuário configurado na <code>Administração &gt; Configurações Gerais</code>.</p><p>Campos incluídos no CSV devem corresponder aos cabeçalhos: <strong>Marcador de Ativo, Nome, Data de Finalização, Data de Entrada</strong>. Quaisquer campos adicionais serão ignorados. </p><p>Data de check-in: em branco ou em datas futuras de check-in fará check-in dos itens para o usuário associado. Excluindo a coluna Data de check-in criará uma data de check-in com a data de hoje.</p>
-    ',
+    'import_text' => '<p>Envie um arquivo CSV contendo o histórico de ativos. Os ativos e usuários devem existir no sistema, caso contrário, serão ignorados. A correspondência de ativos para importação do histórico é feita com base na etiqueta do ativo. Tentaremos encontrar um usuário correspondente com base no nome informado e nos critérios selecionados abaixo. Se nenhum critério for selecionado, o sistema tentará fazer a correspondência usando o formato de nome de usuário configurado em <code>Administração &gt; Configurações Gerais</code>.</p> <p>Os campos incluídos no CSV devem corresponder exatamente aos cabeçalhos: <strong>Etiqueta do Ativo, Nome, Data de saída, Data de entrada</strong>. Qualquer campo adicional será ignorado.</p> <p>Data de Devolução: datas em branco ou futuras farão com que o item seja marcado como emprestado ao usuário associado. Se a coluna Data de devolução for omitida, será registrada uma data de devolução com a data de hoje.</p>    ',
     'csv_import_match_f-l' => 'Tente corresponder aos usuários por <strong>firstname.lastname</strong> (<code>jane.smith</code>) formato',
     'csv_import_match_initial_last' => 'Tente coincidir com os usuários do formato <strong>primeiro sobrenome</strong> (<code>jsmith</code>)',
     'csv_import_match_first' => 'Tente corresponder aos usuários pelo formato <strong>primeiro nome</strong> (<code>jane</code>)',
diff --git a/resources/lang/pt-BR/admin/hardware/message.php b/resources/lang/pt-BR/admin/hardware/message.php
index 6e0094fdaa..092b150394 100644
--- a/resources/lang/pt-BR/admin/hardware/message.php
+++ b/resources/lang/pt-BR/admin/hardware/message.php
@@ -2,18 +2,23 @@
 
 return [
 
-    'undeployable' 		=> '<strong>Aviso:</strong> Este ativo foi marcado como atualmente não implementável.                        Se este status mudou, atualize o status do ativo.',
-    'does_not_exist' 	=> 'O ativo não existe.',
-    'does_not_exist_var'=> 'Asset with tag :asset_tag not found.',
-    'no_tag' 	        => 'No asset tag provided.',
+    'undeployable' 		 => '<strong>Aviso:</strong> Este ativo foi marcado como atualmente não implementável. Se esta situação mudou, por favor, atualize a situação do ativo.',
+    'does_not_exist' 	 => 'O ativo não existe.',
+    'does_not_exist_var' => 'Ativo com a etiqueta :asset_tag não encontrado.',
+    'no_tag' 	         => 'Nenhuma etiqueta de ativo fornecida.',
     'does_not_exist_or_not_requestable' => 'Esse ativo não existe ou não pode ser solicitado.',
-    'assoc_users'	 	=> 'Este bem está no momento associado com pelo menos um usuário e não pode ser deletado. Por favor, atualize seu bem para que não referencie mais este usuário e tente novamente. ',
-    'warning_audit_date_mismatch' 	=> 'This asset\'s next audit date (:next_audit_date) is before the last audit date (:last_audit_date). Please update the next audit date.',
+    'assoc_users'	 	 => 'Este ativo está no momento associado com pelo menos um usuário e não pode ser deletado. Por favor, atualize seu ativo para que não referencie mais este usuário e tente novamente. ',
+    'warning_audit_date_mismatch' 	=> 'A próxima data de auditoria deste ativo (:next_audit_date) é anterior à última data de auditoria (:last_audit_date). Por favor, atualize a próxima data de auditoria.',
+    'labels_generated'   => 'Labels were successfully generated.',
+    'error_generating_labels' => 'Error while generating labels.',
+    'no_assets_selected' => 'No assets selected.',
 
     'create' => [
         'error'   		=> 'O ativo não foi criado, tente novamente. :(',
         'success' 		=> 'Ativo criado com sucesso. :)',
         'success_linked' => 'O ativo com a tag :tag foi criado com sucesso. <strong><a href=":link" style="color: white;">clique aqui para ver</a></strong>.',
+        'multi_success_linked' => 'Asset with tag :links was created successfully.|:count assets were created succesfully. :links.',
+        'partial_failure' => 'An asset was unable to be created. Reason: :failures|:count assets were unable to be created. Reasons: :failures',
     ],
 
     'update' => [
@@ -33,7 +38,7 @@ return [
     ],
 
     'audit' => [
-        'error'   		=> 'Asset audit unsuccessful: :error ',
+        'error'   		=> 'Auditoria de ativo malsucedida: :error ',
         'success' 		=> 'Auditoria de equipamentos logada com sucesso.',
     ],
 
@@ -51,20 +56,24 @@ return [
     ],
 
     'import' => [
+        'import_button'         => 'Processar Importação',
         'error'                 => 'Alguns itens não foram importados corretamente.',
         'errorDetail'           => 'Os seguintes itens não foram importados devido a erros.',
         'success'               => 'O seu arquivo foi importado',
         'file_delete_success'   => 'O arquivo foi excluído com sucesso',
         'file_delete_error'      => 'Não foi possível excluir o arquivo',
         'file_missing' => 'O arquivo selecionado está faltando',
+        'file_already_deleted' => 'O arquivo selecionado já foi excluído',
         'header_row_has_malformed_characters' => 'Um ou mais atributos na linha do cabeçalho contém caracteres UTF-8 malformados',
         'content_row_has_malformed_characters' => 'Um ou mais atributos na primeira linha de conteúdo contém caracteres UTF-8 malformados',
+        'transliterate_failure' => 'Transliteration from :encoding to UTF-8 failed due to invalid characters in input'
     ],
 
 
     'delete' => [
         'confirm'   	=> 'Tem certeza de que deseja excluir este ativo?',
         'error'   		=> 'Houve um problema ao excluir o ativo. Tente novamente.',
+        'assigned_to_error' => '{1}Asset Tag: :asset_tag is currently checked out. Check in this device before deletion.|[2,*]Asset Tags: :asset_tag are currently checked out. Check in these devices before deletion.',
         'nothing_updated'   => 'Nenhum ativo foi selecionado, então nada foi deletado.',
         'success' 		=> 'O ativo foi excluído com sucesso.',
     ],
@@ -77,6 +86,11 @@ return [
         'no_assets_selected' => 'Você deve selecionar pelo menos um recurso da lista',
     ],
 
+    'multi-checkout' => [
+        'error'   => 'O ativo não foi registrado, por favor tente novamente. | Os ativos não foram registrados, por favor tente novamente',
+        'success' => 'Ativo registrado com sucesso. | Ativos registrados com sucesso.',
+    ],
+
     'checkin' => [
         'error'   		=> 'Ativo não foi retornado, favor tentar novamente',
         'success' 		=> 'Ativo retornado com sucesso.',
@@ -86,9 +100,10 @@ return [
     ],
 
     'requests' => [
-        'error'   		=> 'Ativo não foi solicitado, por favor tente novamente',
-        'success' 		=> 'Ativo solicitado com sucesso.',
-        'canceled'      => 'Requisição cancelada com sucesso',
+        'error'   		=> 'Request was not successful, please try again.',
+        'success' 		=> 'Request successfully submitted.',
+        'canceled'      => 'Request successfully canceled.',
+        'cancel'        => 'Cancelar solicitação deste item',
     ],
 
 ];
diff --git a/resources/lang/pt-BR/admin/hardware/table.php b/resources/lang/pt-BR/admin/hardware/table.php
index 287f578d82..3f2ee844b5 100644
--- a/resources/lang/pt-BR/admin/hardware/table.php
+++ b/resources/lang/pt-BR/admin/hardware/table.php
@@ -8,7 +8,7 @@ return [
     'book_value'  	=> 'Valor Atual',
     'change' 		=> 'Entrada/Saída',
     'checkout_date' => 'Data de saída',
-    'checkoutto' 	=> 'check-out',
+    'checkoutto' 	=> 'Disponibilizado',
     'components_cost' => 'Custo Total de Componentes',
     'current_value' => 'Valor Atual',
     'diff' 			=> 'Diferença',
@@ -20,12 +20,11 @@ return [
     'purchase_cost'	=> 'Custo',
     'purchase_date'	=> 'Comprado',
     'serial'   		=> 'Serial',
-    'status'   		=> 'Status',
+    'status'   		=> 'Situação',
     'title'      	=> 'Ativo ',
     'image'		    => 'Imagem do equipamento',
     'days_without_acceptance' => 'Dias sem que fosse aceito',
     'monthly_depreciation' => 'Depreciação Mensal',
-    'assigned_to'    => 'Atribuído a',
     'requesting_user' => 'Usuário solicitante',
     'requested_date' => 'Data de Solicitação',
     'changed'       => 'Alterado',
diff --git a/resources/lang/pt-BR/admin/kits/general.php b/resources/lang/pt-BR/admin/kits/general.php
index 7db86b01da..9f93e555c2 100644
--- a/resources/lang/pt-BR/admin/kits/general.php
+++ b/resources/lang/pt-BR/admin/kits/general.php
@@ -12,7 +12,7 @@ return [
     'none_models'                       => 'Não há ativos disponíveis o suficiente para :model fazer atribuição. :qty são necessários. ',
     'none_licenses'                     => 'Não há licenças suficientes para :model fazer atribuição. :qty são necessários. ',
     'none_consumables'                  => 'Não há quantidade de consumíveis suficientes para :model fazer atribuição. :qty são necessários. ',
-    'none_accessory'                    => 'Não há unidades disponíveis de :accessory para check-out. :qty são necessários. ',
+    'none_accessory'                    => 'Não há unidades disponíveis de :accessory para saída. :qty são necessários. ',
     'append_accessory'                  => 'Anexar acessório',
     'update_appended_accessory'         => 'Atualização de acessório anexado',
     'append_consumable'                 => 'Anexar consumível',
@@ -39,7 +39,7 @@ return [
     'accessory_deleted'                 => 'Excluído com sucesso',
     'accessory_none'                    => 'Este acessório não existe',
     'checkout_success'                  => 'Checkout feito com sucesso',
-    'checkout_error'                    => 'Erro no check-out',
+    'checkout_error'                    => 'Erro na disponibilização',
     'kit_none'                          => 'Kit não existe',
     'kit_created'                       => 'Kit foi criado com sucesso',
     'kit_updated'                       => 'Kit foi atualizado com sucesso',
@@ -47,4 +47,5 @@ return [
     'kit_deleted'                       => 'Kit foi excluído com sucesso',
     'kit_model_updated'                 => 'Modelo foi atualizado com sucesso',
     'kit_model_detached'                => 'Modelo foi desanexado com sucesso',
+    'model_already_attached'            => 'O modelo já está anexado ao kit',
 ];
diff --git a/resources/lang/pt-BR/admin/licenses/general.php b/resources/lang/pt-BR/admin/licenses/general.php
index 0a9dc5f690..4c8cae15de 100644
--- a/resources/lang/pt-BR/admin/licenses/general.php
+++ b/resources/lang/pt-BR/admin/licenses/general.php
@@ -14,6 +14,7 @@ return array(
     'info'  					=> 'Informações da Licença',
     'license_seats'  			=> 'Compartilhamentos de Licença',
     'seat'  					=> 'Licença Compartilhada',
+    'seat_count'  				=> 'Alocação :count',
     'seats'  					=> 'Licenças Compartilhadas',
     'software_licenses'  		=> 'Licenças de Software',
     'user'  					=> 'Usuário',
@@ -23,12 +24,12 @@ return array(
         [
             'checkin_all'           => [
                 'button'            => 'Checkin todas as vagas',
-                'modal'             => 'Esta ação irá realizar a verificação de uma única vaga. | Esta ação verificará todos os :checkedout_seats_count vagas para esta licença.',
+                'modal'             => 'Esta ação devolverá uma alocação. | Esta ação devolverá todos os :checkedout_seats_count alocações para esta licença.',
                 'enabled_tooltip'   => 'Check-in de TODOS as vagas para esta licença de usuários e ativos',
                 'disabled_tooltip'  => 'Isto está desativado porque não há vagas desbloqueadas no momento',
                 'disabled_tooltip_reassignable'  => 'Isto está desativado porque a licença não é transferível',
                 'success'           => 'Licença desbloqueada com sucesso! | Todas as licenças foram verificadas com sucesso!',
-                'log_msg'           => 'Check-in feito através do checkout em massa da licença GUI',
+                'log_msg'           => 'Devolvido via devolução em massa de licenças na interface gráfica de licença (GUI)',
             ],
 
             'checkout_all'              => [
@@ -40,7 +41,7 @@ return array(
                 'error_no_seats'    => 'Não há mais vagas para esta licença.',
                 'warn_not_enough_seats'    => ':count usuários foram atribuídos a esta licença, mas ficamos sem vagas de licença disponíveis.',
                 'warn_no_avail_users'    => 'Nada a ser feito. Não há usuários que ainda não tenham essa licença atribuída a eles.',
-                'log_msg'           => 'Check-out via check-out em massa de licença na GUI',
+                'log_msg'           => 'Disponibilizado via disponibilização em massa de licença na GUI',
 
 
             ],
diff --git a/resources/lang/pt-BR/admin/licenses/message.php b/resources/lang/pt-BR/admin/licenses/message.php
index 8e8f4e3abc..3d72c5da52 100644
--- a/resources/lang/pt-BR/admin/licenses/message.php
+++ b/resources/lang/pt-BR/admin/licenses/message.php
@@ -5,8 +5,8 @@ return array(
     'does_not_exist' => 'A licença não existe ou você não tem permissão para visualizá-la.',
     'user_does_not_exist' => 'O usuário não existe ou você não tem permissão para visualizá-lo.',
     'asset_does_not_exist' 	=> 'O ativo do qual você está tentando associar com esta licença não existe.',
-    'owner_doesnt_match_asset' => 'O bem que você está tentando associar a está licença é propriedade de alguma outra pessoa que não está selecionada na lista suspensa.',
-    'assoc_users'	 => 'Esta licença é atualmente check-out para um usuário e não pode ser excluído. Por favor, atualize seu bem para que não referencie mais este usuário e, em seguida, tente apagar novamente. ',
+    'owner_doesnt_match_asset' => 'O ativo que você está tentando associar a está licença é propriedade de alguma outra pessoa que não está selecionada na lista suspensa.',
+    'assoc_users'	 => 'Esta licença está atualmente disponibilizada para um usuário e não pode ser excluído. Por favor, atualize seu ativo para que não referencie mais este usuário e, em seguida, tente apagar novamente. ',
     'select_asset_or_person' => 'Você deve selecionar um ativo ou um usuário, mas não ambos.',
     'not_found' => 'Licença não encontrada',
     'seats_available' => ':seat_count vagas disponíveis',
@@ -44,10 +44,13 @@ return array(
         'error'   => 'Houve um problema de registro na licença. Favor tentar novamente.',
         'success' => 'A licença foi registrada com sucesso',
         'not_enough_seats' => 'Não há vagas de licença suficientes disponíveis para o pagamento',
+        'mismatch' => 'A alocação de licença fornecida não corresponde à licença',
+        'unavailable' => 'Esta alocação não está disponível para empréstimo.',
     ),
 
     'checkin' => array(
         'error'   => 'Houve um problema de registro na licença. Favor tentar novamente.',
+        'not_reassignable' => 'Licença não pode ser transferida',
         'success' => 'A licença foi registrada com sucesso.'
     ),
 
diff --git a/resources/lang/pt-BR/admin/locations/message.php b/resources/lang/pt-BR/admin/locations/message.php
index 8e995b9345..17754f8db6 100644
--- a/resources/lang/pt-BR/admin/locations/message.php
+++ b/resources/lang/pt-BR/admin/locations/message.php
@@ -3,11 +3,12 @@
 return array(
 
     'does_not_exist' => 'O local não existe.',
-    'assoc_users'    => 'This location is not currently deletable because it is the location of record for at least one asset or user, has assets assigned to it, or is the parent location of another location. Please update your models to no longer reference this company and try again. ',
+    'assoc_users'    => 'Este local não pode ser excluído no momento, pois é o local de registro de pelo menos um ativo ou usuário, possui ativos atribuídos a ele ou é o local principal de outro local. Atualize seus registros para que não façam mais referência a este local e tente novamente ',
     'assoc_assets'	 => 'Este local esta atualmente associado a pelo menos um ativo e não pode ser deletado. Por favor atualize seu ativo para não fazer mais referência a este local e tente novamente. ',
     'assoc_child_loc'	 => 'Este local é atualmente o principal de pelo menos local secundário e não pode ser deletado. Por favor atualize seus locais para não fazer mais referência a este local e tente novamente. ',
     'assigned_assets' => 'Ativos atribuídos',
     'current_location' => 'Localização Atual',
+    'open_map' => 'Abrir :map_provider_icon Maps',
 
 
     'create' => array(
@@ -20,6 +21,11 @@ return array(
         'success' => 'Local atualizado com sucesso.'
     ),
 
+    'restore' => array(
+        'error'   => 'A localização não foi restaurada, por favor, tente novamente',
+        'success' => 'Localização restaurada com sucesso.'
+    ),
+
     'delete' => array(
         'confirm'   	=> 'Tem certeza de que quer excluir este local?',
         'error'   => 'Houve um problema ao excluir o local. Tente novamente.',
diff --git a/resources/lang/pt-BR/admin/locations/table.php b/resources/lang/pt-BR/admin/locations/table.php
index d9a974c2b2..87ec0c8566 100644
--- a/resources/lang/pt-BR/admin/locations/table.php
+++ b/resources/lang/pt-BR/admin/locations/table.php
@@ -31,7 +31,7 @@ return [
     'asset_model'               => 'Modelo',
     'asset_serial'              => 'Nº de Série',
     'asset_location'            => 'Local',
-    'asset_checked_out'         => 'Alocado',
+    'asset_checked_out'         => 'Disponibilizado',
     'asset_expected_checkin'    => 'Check-in Esperado',
     'date'                      => 'Data:',
     'phone'                     => 'Telefone da Localização',
@@ -39,4 +39,5 @@ return [
     'signed_by_finance_auditor' => 'Assinado por (Auditoria Financeira):',
     'signed_by_location_manager' => 'Assinado por (Gerente Local):',
     'signed_by'                 => 'Assinado por:',
+    'clone'  					=> 'Clone Location',
 ];
diff --git a/resources/lang/pt-BR/admin/models/general.php b/resources/lang/pt-BR/admin/models/general.php
index c81eadc8c1..d7acee9458 100644
--- a/resources/lang/pt-BR/admin/models/general.php
+++ b/resources/lang/pt-BR/admin/models/general.php
@@ -3,7 +3,7 @@
 return array(
     'about_models_title'     => 'Sobre os Modelos de Ativos',
     'about_models_text'           => 'Os Modelos dos ativos são uma maneira para agrupar ativos idênticos. "MBP 2013", "iPhone 6s", etc.',
-    'deleted'  					        => 'Este modelo foi excluído.',
+    'deleted'  					=> 'Este modelo foi excluído.',
     'bulk_delete'               => 'Bulk deletar modelos de ativos',
     'bulk_delete_help'               => 'Use a caixa abaixo para confirmar a exlusão dos modelos de ativos selecionados. Modelos de ativos que tem ativos associados a eles não podem ser deletados a não ser que esses ativos sejam associados a um modelo diferente.',
     'bulk_delete_warn'          => 'Você está prestes a excluir um modelo de ativo.|Você está prestes a excluir :model_count modelos de ativos.',
diff --git a/resources/lang/pt-BR/admin/models/message.php b/resources/lang/pt-BR/admin/models/message.php
index d39ca0132e..7e68d2542d 100644
--- a/resources/lang/pt-BR/admin/models/message.php
+++ b/resources/lang/pt-BR/admin/models/message.php
@@ -7,7 +7,7 @@ return array(
     'no_association' => 'ATENÇÃO! O modelo de ativo para este item é inválido ou está faltando!',
     'no_association_fix' => 'Isso quebrará as coisas de maneiras estranhas e horríveis. Edite este equipamento agora para atribuir um modelo a ele.',
     'assoc_users'	 => 'Este modelo está no momento associado com um ou mais ativos e não pode ser excluído. Exclua os ativos e então tente excluir novamente. ',
-
+    'invalid_category_type' => 'Esta categoria deve ser uma categoria de ativo.',
 
     'create' => array(
         'error'   => 'O modelo não foi criado, tente novamente.',
diff --git a/resources/lang/pt-BR/admin/reports/general.php b/resources/lang/pt-BR/admin/reports/general.php
index 4600542e7a..7cb288bfaf 100644
--- a/resources/lang/pt-BR/admin/reports/general.php
+++ b/resources/lang/pt-BR/admin/reports/general.php
@@ -4,6 +4,7 @@ return [
     'info'   => 'Selecione as opções que você quer para o seu relatório de ativos.',
     'deleted_user' => 'Usuário excluído',
     'send_reminder' => 'Enviar lembrete',
+    'cannot_send_reminder' => 'User has been deleted or does not have an email address so cannot receive a reminder',
     'reminder_sent' => 'Lembrete enviado',
     'acceptance_deleted' => 'Pedido de aceitação excluído',
     'acceptance_request' => 'Solicitação de aceitação',
@@ -13,5 +14,10 @@ return [
         'user_state' => 'Estado do Usuário',
         'user_country' => 'País do usuário',
         'user_zip' => 'CEP do Usuário'
-    ]
-];
\ No newline at end of file
+    ],
+    'open_saved_template' => 'Open Saved Template',
+    'save_template' =>  'Save Template',
+    'select_a_template' => 'Select a Template',
+    'template_name' => 'Template Name',
+    'update_template' => 'Atualizar Template',
+];
diff --git a/resources/lang/pt-BR/admin/reports/message.php b/resources/lang/pt-BR/admin/reports/message.php
index c5bb86efa8..2800bbdf0b 100644
--- a/resources/lang/pt-BR/admin/reports/message.php
+++ b/resources/lang/pt-BR/admin/reports/message.php
@@ -1,5 +1,16 @@
 <?php
 
-return array(
-    'error'   => 'Você deve selecionar pelo menos UMA opção.'
-);
+return [
+    'about_templates' => 'About Saved Templates',
+    'saving_templates_description' => 'Select your options, then enter the name of your template in the box above and click the \'Save Template\' button. Use the dropdown to select a previously saved template.',
+    'create'  => [
+        'success' => 'Template saved successfully',
+    ],
+    'update' => [
+        'success' => 'Template updated successfully',
+    ],
+    'delete' => [
+        'success' => 'Template deleted',
+        'no_delete_permission' => 'Template does not exist or you do not have permission to delete it.',
+    ],
+];
diff --git a/resources/lang/pt-BR/admin/settings/general.php b/resources/lang/pt-BR/admin/settings/general.php
index 8355a5fe85..c041e77661 100644
--- a/resources/lang/pt-BR/admin/settings/general.php
+++ b/resources/lang/pt-BR/admin/settings/general.php
@@ -8,13 +8,13 @@ return [
     'ad_append_domain'          => 'Acrescentar nome de domínio ao campo de usuário',
     'ad_append_domain_help'     => 'Usuário não é necessário para escrever "username@domain.local", ele pode apenas digitar "username".',
     'admin_cc_email'            => 'E-mail em CC',
-    'admin_cc_email_help'       => 'Se você quiser enviar uma cópia dos e-mails de check-in / check-out que são enviados aos usuários para uma conta de e-mail adicional, insira-a aqui. Caso contrário, deixe este campo em branco.',
+    'admin_cc_email_help'       => 'Enviar uma cópia dos e-mails de entrega/devolução para este endereço.',
     'admin_settings'            => 'Configurações de administrador',
     'is_ad'				        => 'Este é um servidor de Diretório Ativo',
     'alerts'                	=> 'Alertas',
     'alert_title'               => 'Atualizar Configurações de Notificação',
     'alert_email'				=> 'Enviar alertas a',
-    'alert_email_help'    => 'Endereços de e-mail ou listas de distribuição que você deseja que os alertas sejam enviados, separados por vírgula',
+    'alert_email_help'          => 'Endereços de e-mail ou listas de distribuição que você deseja que os alertas sejam enviados, separados por vírgula.',
     'alerts_enabled'			=> 'Alertas ativados',
     'alert_interval'			=> 'Limite de Expiração dos Alertas (em dias)',
     'alert_inv_threshold'		=> 'Limite de Alerta de Inventário',
@@ -31,15 +31,18 @@ return [
     'backups'					=> 'Backups',
     'backups_help'              => 'Criar, baixar e restaurar backups ',
     'backups_restoring'         => 'Restaurando do Backup',
+    'backups_clean' => 'Limpe o banco de dados de backup antes de realizar a restauração',
+    'backups_clean_helptext' => "Isso pode ser útil se você estiver mudando entre versões de banco de dados",
     'backups_upload'            => 'Carregar Backup',
     'backups_path'              => 'As cópias de segurança no servidor são armazenadas em <code>:path</code>',
-    'backups_restore_warning'   => 'Use o botão de restauração <small><span class="btn btn-xs btn-warning"><i class="text-white fas fa-retweet" aria-hidden="true"></i></span></small> para restaurar de um backup anterior. (Isso atualmente não funciona com o armazenamento de arquivos S3 ou o Docker.<br><br>Seu <strong>banco de dados :app_name inteiro e todos os arquivos enviados serão completamente substituídos</strong> pelo que está no arquivo de backup.  ',
+    'backups_restore_warning'   => 'Use the restore button <small><span class="btn btn-xs btn-warning"><i class="text-white fas fa-retweet" aria-hidden="true"></i></span></small> to restore from a previous backup. (This does not currently work with S3 file storage or Docker.)<br><br>Your <strong>entire :app_name database and any uploaded files will be completely replaced</strong> by what\'s in the backup file  ',
     'backups_logged_out'         => 'Todos os usuários existentes, incluindo você, serão desconectados assim que sua restauração for concluída.',
     'backups_large'             => 'Backups muito grandes podem expirar na tentativa de restauração e ainda precisam ser executados via linha de comando. ',
     'barcode_settings'			=> 'Configuração do código de barras',
     'confirm_purge'			    => 'Confirmar a Exclusão em Lote',
     'confirm_purge_help'		=> 'Digite o texto "DELETE" na caixa abaixo para limpar seus registros excluídos. Essa ação não pode ser desfeita e irá excluir PERMANENTEMENTE todos os itens e usuários excluídos. (Você deve fazer um backup primeiro, apenas para estar seguro.)',
     'custom_css'				=> 'CSS personalizado',
+    'custom_css_placeholder'	=> 'Add your custom CSS',
     'custom_css_help'			=> 'Digite quaisquer CSS modificada que você gostaria de usar. Mas não inclua as tags &lt;style&gt;&lt;/style&gt;.',
     'custom_forgot_pass_url'	=> 'URL de redefinição de senha personalizada',
     'custom_forgot_pass_url_help'	=> 'Isso substitui o URL de senha esquecida na tela de login, útil para direcionar pessoas para a funcionalidade de redefinição de senha LDAP interna. Eke efetivamente desativará a funcionalidade de senha esquecida do usuário local.',
@@ -47,34 +50,34 @@ return [
     'dashboard_message_help'	=> 'Este texto será exibido no painel de controle para qualquer pessoa com permissão para exibi-la.',
     'default_currency'  		=> 'Moeda padrão',
     'default_eula_text'			=> 'EULA Padrão',
+    'default_eula_text_placeholder' => 'Add your default EULA text',
     'default_language'			=> 'Idioma Padrão',
     'default_eula_help_text'	=> 'Você também pode associar EULAs personalizados para categorias específicas de ativos.',
-    'acceptance_note'           => 'Add a note for your decision (Optional)',
+    'acceptance_note'           => 'Adicione uma anotação para sua decisão (Opcional)',
     'display_asset_name'        => 'Exibir Nome do Ativo',
-    'display_checkout_date'     => 'Mostrar data de check-out',
+    'display_checkout_date'     => 'Mostrar Data de Saída',
     'display_eol'               => 'Exibir EOL na visualização de tabela',
-    'display_qr'                => 'Exibir Códigos QR',
+    'display_qr'                => 'Exibir códigos de barra em 2D',
     'display_alt_barcode'		=> 'Exibir códigos de barra em 1D',
-    'email_logo'                => 'Logotipo do e-mail',
     'barcode_type'				=> 'Código de barras do tipo 2D',
     'alt_barcode_type'			=> 'Código de barras do tipo 1D',
-    'email_logo_size'       => 'Logos quadrados no e-mail são os melhores. ',
     'enabled'                   => 'Habilitado',
     'eula_settings'				=> 'Configuração do termo de uso',
     'eula_markdown'				=> 'Este EULA permite <a href="https://help.github.com/articles/github-flavored-markdown/">Github flavored markdown</a>.',
+    'empty_row_count'           => 'Field Start Offset (Empty Rows)',
+    'empty_row_count_help'      => 'Fields will begin populating after this many empty rows are skipped at the top of the label.',
     'favicon'                   => 'Favicon',
     'favicon_format'            => 'Tipos de arquivos aceitos são ico, png e gif. Outros formatos de imagem podem não funcionar em todos os navegadores.',
     'favicon_size'          => 'Favicons devem ser imagens quadradas, 16x16 pixels.',
     'footer_text'               => 'Texto de rodapé adicional ',
     'footer_text_help'          => 'Este texto aparecerá no lado direito do rodapé. São permitidos o uso de hiperligações, utilizando <a href="https://help.github.com/articles/github-flavored-markdown/">Github flavored markdown</a>. O uso de quebras de linha, cabeçalhos, imagens, etc... podem ter resultados imprevisíveis.',
+    'footer_text_placeholder'   => 'Optional footer text',
     'general_settings'			=> 'Configuracoes Gerais',
-    'general_settings_keywords' => 'suporte à empresa, assinatura, aceitação, formato de e-mail, formato de nome de usuário, imagens, por página, miniatura, gravatar, por, painel, privacidade',
     'general_settings_help'     => 'EULA padrão e mais',
     'generate_backup'			=> 'Backup Criado',
     'google_workspaces'         => 'Espaços do Google',
     'header_color'              => 'Cor do Cabeçalho',
     'info'                      => 'Estas configurações deixam-lhe personalizar certos aspectos da sua instalação.',
-    'label_logo'                => 'Logotipo da etiqueta',
     'label_logo_size'           => 'Logos quadrados são melhores - eles serão exibidos no topo à direita de cada etiqueta de ativo. ',
     'laravel'                   => 'Versão do Laravel',
     'ldap'                      => 'LDAP',
@@ -94,7 +97,7 @@ return [
     'ldap_login_sync_help'      => 'Isso apenas prova que LDAP sincroniza corretamente. Se o autenticador query LDAP não estiver correto, usuários ainda não poderão realizar o login. VOCÊ DEVE PRIMEIRO SALVAR AS NOVAS CONFIGURAÇÕES DO LDAP.',
     'ldap_manager'              => 'Gerenciador LDAP',
     'ldap_server'               => 'Servidor LDAP',
-    'ldap_server_help'          => 'Deve iniciar com ldap:// (para encriptado ou TLS) ou ldaps:// (para SSL)',
+    'ldap_server_help'          => 'Isso deve começar com ldap:// (para não criptografado) ou ldaps:// (para TLS ou SSL)',
     'ldap_server_cert'			=> 'Validação certificado SSL LDAP',
     'ldap_server_cert_ignore'	=> 'Permitir certificado SSL inválido',
     'ldap_server_cert_help'		=> 'Selecione esta opção se está utilizando um certificado SSL próprio e deseja aceitar um certificado SSL inválido.',
@@ -108,8 +111,8 @@ return [
     'ldap_pword'                => 'Senha do usuário LDAP',
     'ldap_basedn'               => 'DN de Atribuição Básico',
     'ldap_filter'               => 'Filtro LDAP',
-    'ldap_pw_sync'              => 'Sincronização de senha do LDAP',
-    'ldap_pw_sync_help'         => 'Desmarque esta caixa se não deseja guardar as passwords LDAP com passwords locais. Ao desativar esta opção quer dizer que os utilizadores poderão não conseguir fazer login se o seu servidor LDAP não estiver disponível por alguma razão.',
+    'ldap_pw_sync'              => 'Cache de senhas LDAP',
+    'ldap_pw_sync_help'         => 'Desmarque esta caixa se não deseja guardar as senhas LDAP com senhas locais. Ao desativar esta opção os usuários poderão não conseguir fazer login se o seu servidor LDAP não estiver disponível por alguma razão.',
     'ldap_username_field'       => 'Nome do utilizador',
     'ldap_lname_field'          => 'Último Nome',
     'ldap_fname_field'          => 'Primeiro nome',
@@ -117,13 +120,15 @@ return [
     'ldap_version'              => 'Versão de LDAP',
     'ldap_active_flag'          => 'Marcação ativa LDAP',
     'ldap_activated_flag_help'  => 'Este valor é usado para determinar se um usuário sincronizado pode fazer login no Snipe-IT. <strong>Isso não afeta a capacidade de verificar ou transferir itens com eles</strong>, e deve ser o <strong>nome de atributo</strong> dentro do seu AD/LDAP, <strong>não o valor</strong>. <br><br>Se este campo for definido como um nome de campo que não existe no seu AD/LDAP, ou o valor no campo AD/LDAP é definido como <code>0</code> ou <code>false</code>, <strong>O login do usuário será desativado</strong>. Se o valor no campo AD/LDAP for definido como <code>1</code> ou <code>verdadeiro</code> ou <em>qualquer outro texto</em> significa que o usuário pode acessar. Quando o campo está em branco na sua AD, respeitamos o <code>userAccountControl</code> atributo, que geralmente permite que usuários não suspensos façam login.',
+    'ldap_invert_active_flag'   => 'LDAP Invert Active Flag',
+    'ldap_invert_active_flag_help'     => 'If enabled: when the value returned by LDAP Active Flag is <code>0</code> or <code>false</code> the user account will be active.',
     'ldap_emp_num'              => 'Número do funcionário LDAP',
     'ldap_email'                => 'Email',
     'ldap_test'                 => 'Testar LDAP',
     'ldap_test_sync'            => 'Testar Sincronização LDAP',
     'license'                   => 'Licença de software',
-    'load_remote'               => 'Usar Gravatar',
-    'load_remote_help_text'		=> 'Desmarque esta caixa se sua instalação não pode carregar scripts do exterior da internet. Isso irá impedir que o Snipe-IT tente carregar imagens do Gravatar.',
+    'load_remote'               => 'Carregar Avatares Remotos',
+    'load_remote_help_text'		=> 'Desmarque essa caixa se a sua instalação não pode carregar scripts vindos da internet. Isso vai prevenir que o Snipe-IT carregue avatares do Gravatar ou outras fontes externas.',
     'login'                     => 'Tentativas de Login',
     'login_attempt'             => 'Tentativa de login',
     'login_ip'                  => 'Endereço IP',
@@ -131,6 +136,7 @@ return [
     'login_user_agent'          => 'Agente de usuário',
     'login_help'                => 'Lista de tentativas de login',
     'login_note'                => 'Login Note',
+    'login_note_placeholder'            => "If you do not have a login or have found a device belonging to this company, please call technical support at 888-555-1212. Thank you.",
     'login_note_help'           => 'Optionally inclui algumas coisas na sua tela de login, por exemplo para ajudar pessoas que acharam um equipamento perdido ou um equipamento furtado. Este campo aceita <a href="https://help.github.com/articles/github-flavored-markdown/">Github flavored markdown</a>',
     'login_remote_user_text'    => 'Opções de login do usuário remoto',
     'login_remote_user_enabled_text' => 'Ativar login de usuário remoto',
@@ -146,13 +152,16 @@ return [
     'logo_print_assets_help'    => 'Usar a marca na impressão de lista de ativos ',
     'full_multiple_companies_support_help_text' => 'Restringir utilizadores (incluindo admins) associados a empresas ao ativos da empresa.',
     'full_multiple_companies_support_text' => 'Suporte multi-empresa completo',
+    'scope_locations_fmcs_support_text'  => 'Scope Locations with Full Multiple Companies Support',
+    'scope_locations_fmcs_support_help_text'  => 'Restrict locations to their selected company.',
+    'scope_locations_fmcs_check_button' => 'Verificar compatibilidade',
+    'scope_locations_fmcs_support_disabled_text'  => 'This option is disabled because you have conflicting locations set for :count or more items.',
     'show_in_model_list'   => 'Mostrar modelos em menu de cascata',
     'optional'					=> 'Opcional',
     'per_page'                  => 'Resultados Por Página',
     'php'                       => 'Versão do PHP',
-    'php_info'                  => 'PHP Info',
+    'php_info'                  => 'Informações do PHP',
     'php_overview'              => 'PHP',
-    'php_overview_keywords'     => 'phpinfo, sistema, informações',
     'php_overview_help'         => 'Informação do sistema PHP',
     'php_gd_info'               => 'Você deve instalar o php-gd para exibir códigos QR, veja as <a href="http://www.php.net/manual/en/image.installation.php">instruções de instalação</a>.',
     'php_gd_warning'            => 'O plugin PHP Image Processing and GD NÃO está instalado.',
@@ -218,6 +227,8 @@ return [
     'webhook_integration_help'    => 'integração :app é opcional, porém o endpoint e o canal são necessários se você deseja usá-lo. Para configurar a integração :app, primeiro você deve <a href=":webhook_link" target="_new" rel="noopener">criar um webhook entrante</a> na sua conta :app. Clique no botão <strong>Teste a integração do :app</strong> para confirmar se suas configurações estão corretas antes de salvar. ',
     'webhook_integration_help_button'    => 'Depois de salvar suas informações do :app, será exibido um botão de teste.',
     'webhook_test_help'           => 'Teste se sua integração :app está configurada corretamente. VOCÊ DEVE SALVAR SUAS CONFIGURAÇÃO :app PRIMEIRO.',
+    'shortcuts_enabled'         => 'Ativar Atalhos',
+    'shortcuts_help_text'       => '<strong>Windows</strong>: Alt + Tecla de acesso, <strong>Mac</strong>: Control + Option + Tecla de acesso',
     'snipe_version'  			=> 'Versão do Snipe-IT',
     'support_footer'            => 'Links de rodapé de suporte ',
     'support_footer_help'       => 'Especifique quem vê os links para as informações de Suporte Snipe-IT e o Manual do Usuário',
@@ -227,7 +238,6 @@ return [
     'update'                    => 'Atualizar Configurações',
     'value'                     => 'Valor',
     'brand'                     => 'Marca',
-    'brand_keywords'            => 'rodapé, logo, imprimir, tema, tema, skin, cabeçalho, cores, cor, css',
     'brand_help'                => 'Logotipo, Nome do Site',
     'web_brand'                 => 'Tipo de marca da web',
     'about_settings_title'      => 'Sobre as Configurações',
@@ -276,6 +286,8 @@ return [
     'two_factor_enrollment_text'	=> "A autenticação de dois passos é obrigatória, mas se o teu dispositivo ainda não foi registrado, abra o Google Authenticator e escaneie o QR Code para registrar o teu dispositivo. Uma vez registrado, digite o código abaixo",
     'require_accept_signature'      => 'Requer assinatura',
     'require_accept_signature_help_text'      => 'Habilitar este recurso vai exigir que os usuários assinem pessoalmente o aceite do ativo.',
+    'require_checkinout_notes'  => 'Exigir notas na entrega/devolução',
+    'require_checkinout_notes_help_text'    => 'Ativar este recurso exigirá que os campos de nota sejam preenchidos quando estiver fazendo retirada ou devolução de um ativo.',
     'left'        => 'esquerda',
     'right'        => 'direita',
     'top'        => 'topo',
@@ -287,18 +299,18 @@ return [
     'zerofill_count'        => 'Comprimento de etiquetas de ativos, incluindo zerofill',
     'username_format_help'   => 'Esta configuração será usada somente pelo processo de importação, se um nome de usuário não for fornecido nós iremos gerar um nome de usuário para você.',
     'oauth_title' => 'Configurações da API OAuth',
-    'oauth_clients' => 'OAuth Clients',
+    'oauth_clients' => 'Clientes OAuth',
     'oauth' => 'OAuth',
     'oauth_help' => 'Configurações de Endpoint Oauth',
-    'oauth_no_clients' => 'You have not created any OAuth clients yet.',
-    'oauth_secret' => 'Secret',
-    'oauth_authorized_apps' => 'Authorized Applications',
-    'oauth_redirect_url' => 'Redirect URL',
-    'oauth_name_help' => ' Something your users will recognize and trust.',
-    'oauth_scopes' => 'Scopes',
-    'oauth_callback_url' => 'Your application authorization callback URL.',
-    'create_client' => 'Create Client',
-    'no_scopes' => 'No scopes',
+    'oauth_no_clients' => 'Você ainda não criou nenhum cliente OAuth.',
+    'oauth_secret' => 'Secreto',
+    'oauth_authorized_apps' => 'Aplicações autorizadas',
+    'oauth_redirect_url' => 'Redirecionar URL',
+    'oauth_name_help' => ' Algo que os usuários irão reconhecer e confiar.',
+    'oauth_scopes' => 'Escopos',
+    'oauth_callback_url' => 'URL de callback de autorização do seu aplicativo.',
+    'create_client' => 'Criar Cliente',
+    'no_scopes' => 'Sem escopos',
     'asset_tag_title' => 'Atualizar configurações de Tag do Ativo',
     'barcode_title' => 'Atualizar Configurações de Código de Barras',
     'barcodes' => 'Códigos de barras',
@@ -313,24 +325,24 @@ return [
     'filter_by_keyword' => 'Filtrar definindo a palavra-chave',
     'security' => 'Segurança',
     'security_title' => 'Atualizar Configurações de Segurança',
-    'security_keywords' => 'senha, senhas, requisitos, dois fatores, duas senhas, senha comum, logon remoto, logar, autenticação',
     'security_help' => 'Duas Factores, Restrições de Senha',
-    'groups_keywords' => 'permissões, grupos de permissão, autorização',
     'groups_help' => 'Grupos de permissão',
     'localization' => 'Localização',
     'localization_title' => 'Atualizar configurações de localização',
-    'localization_keywords' => 'localização, moeda, local, localidade, fuso horário, fuso horário, internacional, internatalização, idioma, tradução',
     'localization_help' => 'Idioma, exibição de data',
     'notifications' => 'Notificações',
     'notifications_help' => 'Alertas de e-mail e configurações de auditoria',
     'asset_tags_help' => 'Incrementando e prefixos',
     'labels' => 'Etiquetas',
     'labels_title' => 'Atualizar configurações de etiqueta',
-    'labels_help' => 'Tamanho da etiqueta &amp; configurações',
-    'purge_keywords' => 'excluir permanentemente',
+    'labels_help' => 'Barcodes &amp; label settings',
     'purge_help' => 'Limpar Registros Excluídos',
     'ldap_extension_warning' => 'Não parece que a extensão LDAP esteja instalada ou ativada neste servidor. Você ainda pode salvar suas configurações, mas precisará ativar a extensão LDAP para PHP antes de a sincronização LDAP ou login funcionar.',
     'ldap_ad' => 'LDAP/AD',
+    'ldap_test_label' => 'Test LDAP Sync',
+    'ldap_test_login' => ' Test LDAP Login',
+    'ldap_username_placeholder' => 'LDAP Username',
+    'ldap_password_placeholder' => 'LDAP Password',
     'employee_number' => 'Número de funcionário',
     'create_admin_user' => 'Criar Usuário ::',
     'create_admin_success' => 'Sucesso! Seu administrador foi adicionado!',
@@ -342,6 +354,8 @@ return [
     'setup_migration_create_user' => 'Próximo: Criar Usuário',
     'ldap_settings_link' => 'Página de configurações LDAP',
     'slack_test' => 'Testar <i class="fab fa-slack"></i> Integração',
+    'status_label_name' => 'Status Label Name',
+    'super_admin_only'  => 'Super Admin Only',
     'label2_enable'           => 'Novo Mecanismo de Etiqueta',
     'label2_enable_help'      => 'Mudar para o novo mecanismo de etiquetas. <b>Nota: Você precisará salvar esta configuração antes de configurar outras.</b>',
     'label2_template'         => 'Modelo',
@@ -356,12 +370,15 @@ return [
     'label2_2d_type'          => 'Código de barras do tipo 2D',
     'label2_2d_type_help'     => 'Formato para códigos de barras 2D',
     'label2_2d_target'        => 'Alvo de Código de Barras 2D',
-    'label2_2d_target_help'   => 'A URL para a qual o código de barras 2D aponta quando escaneado',
+    'label2_2d_target_help'   => 'The data that will be contained in the 2D barcode',
     'label2_fields'           => 'Definições de Campos',
     'label2_fields_help'      => 'Campos podem ser adicionados, removidos e reordenados na coluna esquerda. Para cada campo, várias opções de Rótulo e Fonte de Dados podem ser adicionadas, removidas e reordenadas na coluna direita.',
+    'purge_barcodes' => 'Purge Barcodes',
     'help_asterisk_bold'    => 'Texto digitado como <code>**texto**</code> será exibido como negrito',
     'help_blank_to_use'     => 'Deixe em branco para usar o valor de <code>:setting_name</code>',
-    'help_default_will_use' => '<code>:default</code> usará o valor de <code>:setting_name</code>. <br>Note que o valor dos códigos de barras deve estar em conformidade com a respectiva especificação do código de barras para ser gerado com sucesso. Por favor, consulte <a href="https://snipe-it.readme.io/docs/barcodes">a documentação <i class="fa fa-external-link"></i></a> para mais detalhes. ',
+    'help_default_will_use' => '<code>:default</code> will use the value from <code>:setting_name</code>. <br>Note that the value of the barcodes must comply with the respective barcode spec in order to be successfully generated. Please see <a href="https://snipe-it.readme.io/docs/barcodes">the documentation <i class="fa fa-external-link"></i></a> for more details. ',
+    'asset_id'              => 'Asset ID',
+    'data'               => 'Data',
     'default'               => 'Padrão',
     'none'                  => 'Nenhum',
     'google_callback_help' => 'Isto deve ser inserido como a URL de callback em suas configurações de aplicativo Google OAuth na sua organização&apos;s <strong><a href="https://console.cloud.google.com/" target="_blank">console de desenvolvedor do Google <i class="fa fa-external-link" aria-hidden="true"></i></a></strong>.',
@@ -373,7 +390,100 @@ return [
     'database_driver' => 'Driver de Banco de Dados',
     'bs_table_storage' => 'Armazenamento de Tabela',
     'timezone' => 'Fuso horário',
-    'profile_edit'          => 'Edit Profile',
-    'profile_edit_help'          => 'Allow users to edit their own profiles.',
+    'test_mail' => 'Test Mail',
+    'profile_edit'          => 'Editar perfil',
+    'profile_edit_help'          => 'Permitir que os usuários editem seus próprios perfis.',
+    'default_avatar' => 'Custom Default Avatar',
+    'default_avatar_help' => 'Esta imagem será exibida como perfil se o usuário não tiver uma foto de perfil.',
+    'restore_default_avatar' => 'Restaurar <a href=":default_avatar" data-toggle="lightbox" data-type="image">avatar padrão original do sistema</a>',
+    'restore_default_avatar_help' => '',
+    'due_checkin_days' => 'Aviso de Devolução Pendente',
+    'due_checkin_days_help' => 'Quantos dias antes da data esperada de devolução de um ativo ele deve ser listado na página "Pendente para devolução"?',
+    'no_groups' => 'No groups have been created yet. Visit <code>Admin Settings > Permission Groups</code> to add one.',
+    'text' => 'Text',
+
+    'username_formats' => [
+        'username_format'		=> 'Formato de Nome de Usuário',
+        'firstname_lastname_format'	=> 'First Name Last Name (jane.smith)',
+        'first_name_format'	        => 'First Name (jane)',
+        'last_name_format'		=> 'Last Name (doe)',
+        'filastname_format'			=> 'First Initial Last Name (jsmith)',
+        'lastnamefirstinitial_format' =>  'Last Name First Initial (smithj)',
+        'firstname_lastname_underscore_format' => 'First Name Last Name (jane_smith)',
+        'firstinitial.lastname' => 'First Initial Last Name (j.smith)',
+        'lastname_firstinitial' => 'Last Name First Initial (smith_j)',
+        'lastname_dot_firstinitial_format' => 'Last Name First Initial (smith.j)',
+        'firstnamelastname'     => 'First Name Last Name (janesmith)',
+        'firstnamelastinitial'  => 'First Name Last Initial (janes)',
+        'lastnamefirstname'      => 'Last Name.First Name (smith.jane)',
+    ],
+
+    'email_formats' => [
+        'email_format'			=> 'Formato de e-mail:',
+        'firstname_lastname_format'	=> 'Nome com Sobrenome (jose.silva@exemplo.com.br)',
+        'first_name_format'		=> 'Primeiro Nome (jose@exemplo.com.br)',
+        'last_name_format'		=> 'Last Name (doe@example.com)',
+        'filastname_format'			=> 'Inicial do Nome com Sobrenome (jsilva@exemplo.com.br)',
+        'lastnamefirstinitial_format' =>  'Sobrenome Inicial do Nome (silvaj@exemplo.com.br)',
+        'firstname_lastname_underscore_format' => 'Primeiro Nome com Sobrenome (jose.silva@exemplo.com.br)',
+        'firstinitial.lastname' => 'Inicial do Nome sobrenome (j.silva@exemplo.com.br)',
+        'lastname_firstinitial' => 'Sobrenome Primeira Inicial (silva_j@exemplo.com.br)',
+        'lastname_dot_firstinitial_format' => 'Last Name First Initial (smith.j@example.com)',
+        'firstnamelastname'     => 'Primeiro Nome com Sobrenome (josesilva@exemplo.com.br)',
+        'firstnamelastinitial'  => 'Primeiro Nome com Inicial do Sobrenome (joses@exemplo.com.br)',
+        'lastnamefirstname'      => 'Último Nome.Primeiro nome (smith.jane@exemplo.com)',
+    ],
+
+
+
+    'logo_labels' => [
+        'acceptance_pdf_logo'       => 'PDF Logo',
+        'email_logo'                => 'Logotipo do e-mail',
+        'label_logo'                => 'Logotipo da etiqueta',
+        'logo'                      => 'Site Logo',
+        'favicon'                   => 'Favicon',
+    ],
+
+    'logo_help' => [
+        'email_logo_size'       => 'Logos quadrados no e-mail são os melhores. ',
+    ],
+
+    'logo_option_types' => [
+        'text' => 'Text',
+        'logo' => 'Logo',
+        'logo_and_text' => 'Logo and Text',
+    ],
+
+
+    'legends' => [
+        'scoping' => 'Scoping',
+        'formats' => 'Default Formats',
+        'profiles' => 'User Profiles',
+        'eula' => 'EULA & Acceptance Preferences',
+        'misc_display' => 'Miscellaneous Display Options',
+        'email' => 'Email Preferences',
+        'checkin' => 'Preferências de retirada',
+        'dashboard' => 'Login & Dashboard Preferences',
+        'misc' => 'Miscellaneous',
+        'logos' => 'Logos & Display',
+        'colors' => 'Colors & Skins',
+        'footer' => 'Footer Preferences',
+        'security' => 'Security Preferences',
+        'general' => 'General',
+        'intervals' => 'Intervals & Thresholds',
+    ],
+
+
+    /* Keywords for settings overview help */
+    'keywords' => [
+        'brand'             => 'rodapé, logo, imprimir, tema, tema, skin, cabeçalho, cores, cor, css',
+        'general_settings'  => 'suporte à empresa, assinatura, aceitação, formato de e-mail, formato de nome de usuário, imagens, por página, miniatura, gravatar, por, painel, privacidade',
+        'groups'            => 'permissões, grupos de permissão, autorização',
+        'labels'            => 'labels, barcodes, barcode, sheets, print, upc, qr, 1d, 2d',
+        'localization'      => 'localização, moeda, local, localidade, fuso horário, fuso horário, internacional, internatalização, idioma, tradução',
+        'php_overview'      => 'phpinfo, sistema, informações',
+        'purge'             => 'excluir permanentemente',
+        'security'          => 'senha, senhas, requisitos, dois fatores, duas senhas, senha comum, logon remoto, logar, autenticação',
+    ],
 
 ];
diff --git a/resources/lang/pt-BR/admin/settings/message.php b/resources/lang/pt-BR/admin/settings/message.php
index ee47849e90..e116055698 100644
--- a/resources/lang/pt-BR/admin/settings/message.php
+++ b/resources/lang/pt-BR/admin/settings/message.php
@@ -14,6 +14,9 @@ return [
         'restore_warning'       => 'Sim, restaurar. Eu reconheço que isso irá sobrescrever quaisquer dados existentes atualmente no banco de dados. Isto também desconectará todos os usuários existentes (incluindo você).',
         'restore_confirm'       => 'Tem certeza que deseja restaurar seu banco de dados a partir de :filename?'
     ],
+    'restore' => [
+        'success'               => 'Seu backup do sistema foi restaurado. Por favor, faça login novamente.'
+    ],
     'purge' => [
         'error'     => 'Ocorreu um erro ao excluir os registros. ',
         'validation_failed'     => 'Sua confirmação de exclusão está incorreta. Por favor, digite a palavra "DELETE" na caixa de confirmação.',
@@ -33,6 +36,9 @@ return [
         'testing_authentication' => 'Testando Autenticação LDAP...',
         'authentication_success' => 'Usuário autenticado no LDAP com sucesso!'
     ],
+    'labels' => [
+        'null_template' => 'Label template not found. Please select a template.',
+        ],
     'webhook' => [
         'sending' => 'Enviando mensagem :app de teste...',
         'success' => 'Sua integração com :webhook_name funciona!',
@@ -42,5 +48,12 @@ return [
         'error' => 'Algo deu errado. :app respondeu com: :error_message',
         'error_redirect' => 'ERRO: 301/302 :endpoint retorna um redirecionamento. Por razões de segurança, não seguimos redirecionamentos. Por favor, use o ponto de extremidade atual.',
         'error_misc' => 'Algo deu errado. :( ',
-    ]
+        'webhook_fail' => ' Notificação do webhook falhou: Verifique se a URL ainda é válida.',
+        'webhook_channel_not_found' => ' webhook channel not found.',
+        'ms_teams_deprecation' => 'The selected Microsoft Teams webhook URL will be deprecated Dec 31st, 2025. Please use a workflow URL. Microsoft\'s documentation on creating a workflow can be found <a href="https://support.microsoft.com/en-us/office/create-incoming-webhooks-with-workflows-for-microsoft-teams-8ae491c7-0394-4861-ba59-055e33f75498" target="_blank"> here.</a>',
+    ],
+    'location_scoping' => [
+        'not_saved' => 'Your settings were not saved.',
+        'mismatch' => 'There is 1 item in the database that need your attention before you can enable location scoping.|There are :count items in the database that need your attention before you can enable location scoping.',
+    ],
 ];
diff --git a/resources/lang/pt-BR/admin/statuslabels/message.php b/resources/lang/pt-BR/admin/statuslabels/message.php
index cf236ab942..5c1fe93e5b 100644
--- a/resources/lang/pt-BR/admin/statuslabels/message.php
+++ b/resources/lang/pt-BR/admin/statuslabels/message.php
@@ -2,29 +2,29 @@
 
 return [
 
-    'does_not_exist' => 'Rótulo de estado não existe.',
-    'deleted_label' => 'Rótulo de estado excluído',
-    'assoc_assets'	 => 'Este rótulo de estado está associado com pelo menos um Asset e não pode ser removido. Por favor atualize seus assets para não referenciarem este rótulo e tente novamente. ',
+    'does_not_exist' => 'Rótulo de situação não existe.',
+    'deleted_label' => 'Rótulo de situação excluído',
+    'assoc_assets'	 => 'Este rótulo de situação está associado com pelo menos um Ativo e não pode ser removido. Por favor atualize seus ativos para não referenciarem este rótulo e tente novamente. ',
 
     'create' => [
-        'error'   => 'Rótulo de estado não foi criado, por favor tente novamente.',
-        'success' => 'Rótulo de estado criado com sucesso.',
+        'error'   => 'Rótulo de situação não foi criado, por favor tente novamente.',
+        'success' => 'Rótulo de situação criado com sucesso.',
     ],
 
     'update' => [
-        'error'   => 'Rótulo de estado não foi atualizado, por favor tente novamente',
-        'success' => 'Rótulo de estado atualizado com sucesso.',
+        'error'   => 'Rótulo de situação não foi atualizado, por favor tente novamente',
+        'success' => 'Rótulo de situação atualizado com sucesso.',
     ],
 
     'delete' => [
-        'confirm'   => 'Tem certeza que deseja deletar este Rótulo de estado?',
-        'error'   => 'Ocorreu um problema ao deletar o Rótulo de estado. Por favor tente novamente.',
-        'success' => 'O Rótulo de estado foi deletado com sucesso.',
+        'confirm'   => 'Tem certeza que deseja deletar este Rótulo de Situação?',
+        'error'   => 'Ocorreu um problema ao deletar o Rótulo de Situação. Por favor tente novamente.',
+        'success' => 'O Rótulo de Situação foi deletado com sucesso.',
     ],
 
     'help' => [
         'undeployable'   => 'Esses ativos não podem ser atribuídos a ninguém.',
-        'deployable'   => 'Esses ativos podem ser retirados. Uma vez que são retirados, eles assumirão um status meta de <i class="fas fa-circle text-blue"></i> <strong>Deployed</strong>.',
+        'deployable'   => 'Esses ativos podem ser retirados. Uma vez que são retirados, eles assumirão ums Situação meta de <i class="fas fa-circle text-blue"></i> <strong>Implementado</strong>.',
         'archived'   => 'Esses ativos não podem ser verificados, e só aparecerão na visão arquivada. Isso é útil para manter informações sobre recursos para fins orçamentários / históricos, mas mantendo-os fora da lista de ativos do dia-a-dia.',
         'pending'   => 'Esses ativos ainda não podem ser atribuídos a ninguém, muitas vezes usado para itens que estão fora para reparo, mas é esperado que retornem à circulação.',
     ],
diff --git a/resources/lang/pt-BR/admin/statuslabels/table.php b/resources/lang/pt-BR/admin/statuslabels/table.php
index c76342afcd..e41ac7f042 100644
--- a/resources/lang/pt-BR/admin/statuslabels/table.php
+++ b/resources/lang/pt-BR/admin/statuslabels/table.php
@@ -1,19 +1,19 @@
 <?php
 
 return array(
-    'about'      	=> 'Sobre os Rótulos de Status',
+    'about'      	=> 'About Status Types',
     'archived'      	=> 'Arquivado',
-    'create'      	=> 'Criar Rótulo de Status',
+    'create'      	=> 'Criar Rótulo de Situação',
     'color'      	=> 'Cor do Gráfico',
     'default_label' => 'Etiqueta padrão',
-    'default_label_help' => 'Isso é usado para garantir que seus rótulos de status usados ​​com mais frequência apareçam na parte superior da caixa de seleção ao criar / editar ativos.',
+    'default_label_help' => 'Isso é usado para garantir que seus rótulos de situação usados ​​com mais frequência apareçam na parte superior da caixa de seleção ao criar / editar ativos.',
     'deployable'      	=> 'Implementável',
-    'info'      	=> 'Rótulos de status são usados para descrever os vários estados que seus ativos podem estar. Eles podem ser fora do ar para reparo, perdido/roubado, etc. Você pode criar novos rótulos de status para ativos implementáveis, pendentes e arquivados.',
-    'name'      	=> 'Nome do Status',
+    'info'      	=> 'Status label types are used to describe the various states your assets could be in. They may be out for repair, lost/stolen, etc. You can create new status labels for your deployable, pending and archived assets according to your own workflow. For more information, <a href="https://snipe-it.readme.io/docs/overview#status-labels" target="_blank">see the documentation <i class="fa fa-external-link"></i></a>.',
+    'name'      	=> 'Nome da Situação',
     'pending'      	=> 'Pendente',
-    'status_type'   => 'Tipo do Status',
+    'status_type'   => 'Tipo de Situação',
     'show_in_nav'   => 'Mostrar na barra lateral de navegação',
-    'title'      	=> 'Rótulos de Status',
+    'title'      	=> 'Rótulos de Situação',
     'undeployable'  => 'Não implementável',
-    'update'      	=> 'Atualizar Rótulo de Status',
+    'update'      	=> 'Atualizar Rótulo de Situação',
 );
diff --git a/resources/lang/pt-BR/admin/users/general.php b/resources/lang/pt-BR/admin/users/general.php
index 5485665ffb..21d9a63f12 100644
--- a/resources/lang/pt-BR/admin/users/general.php
+++ b/resources/lang/pt-BR/admin/users/general.php
@@ -2,7 +2,7 @@
 
 return [
     'activated_help_text' => 'Este usuário pode efetuar login',
-    'activated_disabled_help_text' => 'Você não pode alterar o status de ativação da sua própria conta.',
+    'activated_disabled_help_text' => 'Você não pode alterar a situação de ativação da sua própria conta.',
     'assets_user'       => 'Bens atribuidos a :name',
     'bulk_update_warn'	=> 'Você está prestes a editar as propriedades de: user_count users. Por favor, note que você não pode alterar seus próprios atributos de usuário usando este formulário e deve fazer edições de seu próprio usuário individualmente.',
     'bulk_update_help'	=> 'Este formulário lhe permite atualizar múltiplos ativos de uma vez. Apenas preencha os campos que você precisa alterar. Qualquer campo deixado em branco permanecerá inalterado.',
@@ -19,9 +19,11 @@ return [
     'print_assigned'    => 'Imprimir todos atribuídos',
     'email_assigned'    => 'Lista de e-mails de todos os atribuídos',
     'user_notified'     => 'Um usuário recebeu um e-mail com uma lista de seus itens atualmente atribuídos.',
+    'users_notified'    => 'The user has been emailed a list of their currently assigned items.|:count users have been emailed a list of their currently assigned items.',
+    'users_notified_warning' => ':count user has been emailed a list of their currently assigned items, however :no_email users did not have an email address so could not be emailed.|:count users have been emailed a list of their currently assigned items, however :no_email user(s) did not have an email address so could not be emailed.',
     'auto_assign_label' => 'Inclua este usuário quando atribuir licenças elegíveis automaticamente',
     'auto_assign_help'  => 'Ignorar este usuário em atribuição automática de licenças',
-    'software_user'     => 'Check-out de software para :name',
+    'software_user'     => 'Disponibilização de software para :name',
     'send_email_help'   => 'Você deve fornecer um endereço de e-mail para este usuário enviar credenciais. As credenciais de e-mail só podem ser feitas na criação do usuário. As senhas são armazenadas em hash unidirecional e não podem ser recuperadas uma vez salva.',
     'view_user'         => 'Ver Usuário :name',
     'usercsv'           => 'Arquivo CSV',
@@ -30,13 +32,13 @@ return [
     'two_factor_active'   => '2FA Ativo ',
     'user_deactivated'  => 'O usuário não pode acessar',
     'user_activated'  => 'Usuário pode efetuar login',
-    'activation_status_warning' => 'Não alterar o status de ativação',
+    'activation_status_warning' => 'Não alterar a situação de ativação',
     'group_memberships_helpblock' => 'Somente superadministradores podem editar associações de grupo.',
     'superadmin_permission_warning' => 'Somente superadministradores podem conceder acesso de superadministrador ao usuário.',
     'admin_permission_warning' => 'Somente usuários com direitos de administrador ou maiores podem conceder acesso de administrador ao usuário.',
     'remove_group_memberships' => 'Remover Associações de Grupo',
     'warning_deletion_information' => 'Você está prestes a check-in TODOS os itens do(s) :count usuário(s) listado(s) abaixo. Nomes de Super admin são destacados em vermelho.',
-    'update_user_assets_status' => 'Atualizar todos os arquivos para esses usuários com este status',
+    'update_user_assets_status' => 'Atualizar todos os arquivos para esses usuários com esta situação',
     'checkin_user_properties' => 'Check-in de todas as propriedades associadas a estes usuários',
     'remote_label'   => 'Este é um usuário remoto',
     'remote'   => 'Remoto',
diff --git a/resources/lang/pt-BR/admin/users/message.php b/resources/lang/pt-BR/admin/users/message.php
index 693ef19df6..ae345ce83c 100644
--- a/resources/lang/pt-BR/admin/users/message.php
+++ b/resources/lang/pt-BR/admin/users/message.php
@@ -6,7 +6,7 @@ return array(
     'declined'                  => 'Você recusou com sucesso esse ativo.',
     'bulk_manager_warn'	        => 'Os usuários foram atualizados com êxito, no entanto seu Gerenciador de entrada não foi salvo porque o gerente selecionado estava também na lista de usuários a ser editado e usuários podem não ser seu próprio gerente. Por favor, selecione os usuários novamente, excluindo o gerente.',
     'user_exists'               => 'O usuário já existe!',
-    'user_not_found'            => 'O usuário não existe.',
+    'user_not_found'            => 'O usuário não existe ou você não tem permissão para visualizá-lo.',
     'user_login_required'       => 'O campo de login é requerido',
     'user_has_no_assets_assigned' => 'Não há ativos atualmente atribuídos ao usuário.',
     'user_password_required'    => 'A senha é requerida.',
@@ -37,22 +37,23 @@ return array(
         'update' => 'Houve um problema ao atualizar o usuário. Tente novamente.',
         'delete' => 'Houve um problema ao excluir o usuário. Tente novamente.',
         'delete_has_assets' => 'Este usuário tem itens atribuídos e não pôde ser excluído.',
-        'delete_has_assets_var' => 'This user still has an asset assigned. Please check it in first.|This user still has :count assets assigned. Please check their assets in first.',
-        'delete_has_licenses_var' => 'This user still has a license seats assigned. Please check it in first.|This user still has :count license seats assigned. Please check them in first.',
-        'delete_has_accessories_var' => 'This user still has an accessory assigned. Please check it in first.|This user still has :count accessories assigned. Please check their assets in first.',
-        'delete_has_locations_var' => 'This user still manages a location. Please select another manager first.|This user still manages :count locations. Please select another manager first.',
-        'delete_has_users_var' => 'This user still manages another user. Please select another manager for that user first.|This user still manages :count users. Please select another manager for them first.',
+        'delete_has_assets_var' => 'Este usuário ainda tem um ativo atribuído. Por favor, faça a devolução primeiro. | Este usuário ainda tem :count ativos atribuídos. Por favor, faça a devolução dos ativos primeiro.',
+        'delete_has_licenses_var' => 'Este usuário ainda tem uma licença atribuída. Por favor, faça a devolução primeiro. | Este usuário ainda tem :count licenças atribuídas. Por favor, faça a devolução delas primeiro.',
+        'delete_has_accessories_var' => 'Este usuário ainda tem um acessório atribuído. Por favor, faça a devolução primeiro. | Este usuário ainda tem :count acessórios atribuídos. Por favor, faça a devolução dos ativos primeiro.',
+        'delete_has_locations_var' => 'Este usuário ainda gerencia um local. Por favor, selecione outro gerente primeiro. | Este usuário ainda gerencia :count locais. Por favor, selecione outro gerente primeiro.',
+        'delete_has_users_var' => 'Este usuário ainda gerencia outro usuário. Por favor, selecione outro gerente para esse usuário primeiro. | Este usuário ainda gerencia :count usuários. Por favor, selecione outro gerente para eles primeiro.',
         'unsuspend' => 'Houve um problema ao remover a suspensão do usuário. Tente novamente.',
         'import'    => 'Houve um problema ao importar usuários. Tente novamente.',
         'asset_already_accepted' => 'Este ativo já foi aceito.',
         'accept_or_decline' => 'Você precisa aceita ou rejeitar esse ativo.',
-        'cannot_delete_yourself' => 'We would feel really bad if you deleted yourself, please reconsider.',
+        'cannot_delete_yourself' => 'Nós nos sentiríamos muito mal se você se deletasse, por favor, reconsidere.',
         'incorrect_user_accepted' => 'O ativo que tentou aceitar não foi solicitado por você.',
         'ldap_could_not_connect' => 'Não foi possível conectar ao servidor LDAP. Por favor verifique as configurações do servidor LDAP no arquivo de configurações.<br>Erro do Servidor LDAP:',
         'ldap_could_not_bind' => 'Não foi possível se ligar ao servidor LDAP. Por favor verifique as configurações do servidor LDAP no arquivo de configurações.<br>Erro do Servidor LDAP: ',
         'ldap_could_not_search' => 'Não foi possível procurar o servidor LDAP. Por favor verifique as configurações do servidor LDAP no arquivo de configurações.<br>Erro do Servidor LDAP:',
         'ldap_could_not_get_entries' => 'Não foi possível obter informações do servidor LDAP. Por favor verifique as configurações do servidor LDAP no arquivo de configurações.<br>Erro do Servidor LDAP:',
         'password_ldap' => 'A senha desta conta é gerenciada pelo LDAP / Active Directory. Entre em contato com seu departamento de TI para alterar sua senha. ',
+        'multi_company_items_assigned' => 'Este usuário tem itens atribuídos que pertencem a uma empresa diferente. Por favor, verifique-os ou edite a empresa deles.'
     ),
 
     'deletefile' => array(
diff --git a/resources/lang/pt-BR/admin/users/table.php b/resources/lang/pt-BR/admin/users/table.php
index 570ff20771..3a70e58de0 100644
--- a/resources/lang/pt-BR/admin/users/table.php
+++ b/resources/lang/pt-BR/admin/users/table.php
@@ -22,7 +22,7 @@ return array(
     'managed_locations'     => 'Gerenciar locações',
     'managed_users'         => 'Usuários gerenciados',
     'name' 					=> 'Nome',
-    'nogroup'               => 'Nenhum grupo foi criado ainda. Para criar um, visite: ',
+    'nogroup'               => 'Nenhum grupo foi criado ainda. Para criar um, visite:',
     'notes'                 => 'Notas',
     'password_confirm' 		=> 'Confirmar Senha',
     'password' 				=> 'Senha',
diff --git a/resources/lang/pt-BR/auth.php b/resources/lang/pt-BR/auth.php
index 9119621220..2393e84547 100644
--- a/resources/lang/pt-BR/auth.php
+++ b/resources/lang/pt-BR/auth.php
@@ -15,6 +15,6 @@ return array(
 
     'failed' => 'Credenciais inválidas.',
     'password' => 'A senha fornecida está incorreta.',
-    'throttle' => 'Tentativas de login excedidas. Por favor, tente de novo em :seconds segundos.',
+    'throttle' => 'Too many login attempts. Please try again in :minutes minute(s).',
 
 );
diff --git a/resources/lang/pt-BR/auth/message.php b/resources/lang/pt-BR/auth/message.php
index 4b5f7f1ed7..102923a748 100644
--- a/resources/lang/pt-BR/auth/message.php
+++ b/resources/lang/pt-BR/auth/message.php
@@ -6,16 +6,14 @@ return array(
     'account_not_found'      => 'O nome do usuário ou a senha estão incorretos.',
     'account_not_activated'  => 'Esta conta de usuário não está ativada.',
     'account_suspended'      => 'Esta conta de usuário está suspensa.',
-    'account_banned'         => 'Esta conta de usuário está banida.',
-    'throttle'               => 'Muitas tentativas com falha de login. Por favor, tente novamente em :minutes minutos.',
 
     'two_factor' => array(
         'already_enrolled'      => 'Seu dispositivo já está inscrito.',
         'success'               => 'Você logou na sua conta com sucesso.',
         'code_required'         => 'O código de dois fatores é obrigatório.',
         'invalid_code'          => 'O código de dois fatores é inválido.',
-        'enter_two_factor_code' => 'Please enter your two-factor authentication code.',
-        'please_enroll'         => 'Please enroll a device in two-factor authentication.',
+        'enter_two_factor_code' => 'Por favor, digite seu código de autenticação de dois fatores.',
+        'please_enroll'         => 'Por favor, registre um dispositivo na autenticação de dois fatores.',
     ),
 
     'signin' => array(
diff --git a/resources/lang/pt-BR/button.php b/resources/lang/pt-BR/button.php
index 422ca04ad7..a7147e5c85 100644
--- a/resources/lang/pt-BR/button.php
+++ b/resources/lang/pt-BR/button.php
@@ -7,6 +7,7 @@ return [
     'checkin_and_delete'  	    => 'Fazer check-in de todos / Excluir usuário',
     'delete'  	                => 'Excluir',
     'edit'    	                => 'Editar',
+    'clone'    	                => 'Clonar',
     'restore' 	                => 'Restaurar',
     'remove'                    => 'Remover',
     'request'                   => 'Solicitação',
@@ -21,4 +22,13 @@ return [
     'add_maintenance'           => 'Adicionar Manutenção',
     'append'                    => 'Acrescentar',
     'new'                       => 'Novo',
+    'var' => [
+        'clone'     => 'Clonar :item_type',
+        'edit'      => 'Editar :item_type',
+        'delete'    => 'Excluir :item_type',
+        'restore'   => 'Restaurar :item_type',
+        'create'    => 'Criar novo :item_type',
+        'checkout'  => 'Emprestar :item_type',
+        'checkin'   => 'Devolver :item_type',
+    ]
 ];
diff --git a/resources/lang/pt-BR/general.php b/resources/lang/pt-BR/general.php
index 700fa0c8d6..2fef141307 100644
--- a/resources/lang/pt-BR/general.php
+++ b/resources/lang/pt-BR/general.php
@@ -1,7 +1,7 @@
 <?php
 
 return [
-    '2FA_reset'             => '2FA reset',
+    '2FA_reset'             => 'Redefinição de 2FA (Autenticação de Dois Fatores)',
     'accessories'			=> 'Acessórios',
     'activated'			    => 'Ativado',
     'accepted_date'         => 'Data de Aceite',
@@ -10,7 +10,7 @@ return [
     'action'                => 'Ação',
     'activity_report'		=> 'Relatório de Atividade',
     'address'				=> 'Endereço',
-    'admin'					=> 'Administrador',
+    'admin'					=> 'Configurações de administrador',
     'admin_tooltip'			=> 'Este usuário tem privilégios de administrador',
     'superuser'				=> 'Super usuário',
     'superuser_tooltip'		=> 'Este usuário tem privilégios de superusuário',
@@ -23,13 +23,16 @@ return [
     'asset_models'			=> 'Modelos de Ativos',
     'asset_model'			=> 'Modelo',
     'asset'					=> 'Ativo',
+    'asset_previous'        => 'Asset (Previously Assigned)',
     'asset_report'          => 'Relatório de Ativos',
     'asset_tag'				=> 'Etiqueta do Ativo',
     'asset_tags'            => 'Etiquetas de Ativo',
     'assets_available'		=> 'Ativos disponíveis',
     'accept_assets'         => 'Aceitar Ativos :name',
     'accept_assets_menu'    => 'Aceitar Ativos',
+    'accept_item'           => 'Accept Item',
     'audit'				    => 'Auditoria',
+    'audits'				=> 'Audits',
     'audit_report'			=> 'Registro de auditoria',
     'assets'				=> 'Ativos',
     'assets_audited'        => 'ativos auditados',
@@ -44,15 +47,15 @@ return [
     'back'      			=> 'Voltar',
     'bad_data'      		=> 'Nada encontrado. As informações estão corretas?',
     'bulkaudit'             => 'Auditoria em Massa',
-    'bulkaudit_status'      => 'Status de Auditoria',
-    'bulk_checkout'  		=> 'Check-out em massa',
+    'bulkaudit_status'      => 'Situação de Auditoria',
+    'bulk_checkout'  		=> 'Saída em massa',
     'bulk_edit'             => 'Edição em massa',
     'bulk_delete'           => 'Exclusão em massa',
     'bulk_actions'          => 'Ações em massa',
     'bulk_checkin_delete'   => 'Check-in / Excluir Usuários em Massa',
     'byod'                  => 'BYOD',
     'byod_help'             => 'Este dispositivo é de propriedade do usuário',
-    'bystatus'              => 'por status',
+    'bystatus'              => 'por situação',
     'cancel'  				=> 'Cancelar',
     'categories'			=> 'Categorias',
     'category'				=> 'Categoria',
@@ -61,9 +64,12 @@ return [
     'changepassword'  		=> 'Alterar Senha',
     'checkin'  				=> 'Check-in',
     'checkin_from'  		=> 'Check-in de',
-    'checkout'  			=> 'Check-out',
+    'checkin_note'  		=> 'Anotação de entrada',
+    'checkout_note'  		=> 'Anotação de saída',
+    'checkout'  			=> 'Saída',
     'checkouts_count'       => 'Checkouts',
     'checkins_count'        => 'Check-ins',
+    'checkin_and_delete'  	=> 'Devolver e deletar',
     'user_requests_count'   => 'Solicitações',
     'city'  				=> 'Cidade',
     'click_here'			=> 'Clique aqui',
@@ -86,11 +92,13 @@ return [
     'record_created' 		=> 'Registro criado',
     'updated_at' 			=> 'Atualizado em',
     'currency'  			=> 'R$', // this is deprecated
+    'currency_text'  		=> 'Moeda', //
     'current'  				=> 'Atuais',
     'current_password'      => 'Senha atual',
     'customize_report'      => 'Personalizar Relatório',
     'custom_report'         => 'Relatório de Ativos Personalizado',
     'dashboard'				=> 'Painel de Controle',
+    'data_source'           => 'Data Source',
     'days'      			=> 'dias',
     'days_to_next_audit'    => 'Dias Até a Próxima Auditoria',
     'date'					=> 'Data',
@@ -98,7 +106,7 @@ return [
     'debug_warning_text'    => 'Esta aplicação está em execução no modo de produção com a depuração ativada. Isso pode expor dados sensíveis se seu aplicativo é acessível para o mundo exterior. Desative o modo de depuração mudando o valor de <code>APP_DEBUG</code> no seu arquivo<code>.env</code> para <code>false</code>.',
     'delete'  				=> 'Excluir',
     'delete_confirm'  		=> 'Você tem certeza que deseja excluir :item?',
-    'delete_confirm_no_undo' => 'Tem certeza que deseja excluir :item? Isto não pode ser desfeito.',
+    'delete_confirm_no_undo' => 'Tem certeza de que deseja excluir :item? Isto não pode ser desfeito.',
     'deleted'  				=> 'Excluído',
     'delete_seats'  		=> 'Assentos Excluídos',
     'deletion_failed'       => 'Falha ao excluir',
@@ -114,29 +122,13 @@ return [
     'editprofile'  			=> 'Editar Seu Perfil',
     'eol'					=> 'Fim de Vida',
     'email_domain'			=> 'Domínio do e-mail',
-    'email_format'			=> 'Formato de e-mail:',
     'employee_number'       => 'Matrícula',
     'email_domain_help'		=> 'Isto é usado para gerar endereços de e-mail na importação',
     'error'				    => 'Erro',
     'exclude_archived'      => 'Excluir Ativos Arquivados',
     'exclude_deleted'       => 'Excluir Ativos Removidos',
     'example'				=> 'Exemplo: ',
-    'filastname_format'			=> 'Inicial do Nome com Sobrenome (jsilva@exemplo.com.br)',
-    'firstname_lastname_format'	=> 'Nome com Sobrenome (jose.silva@exemplo.com.br)',
-    'firstname_lastname_underscore_format' => 'Primeiro Nome com Sobrenome (jose.silva@exemplo.com.br)',
-    'lastnamefirstinitial_format' =>  'Sobrenome Inicial do Nome (silvaj@exemplo.com.br)',
-    'firstintial_dot_lastname_format' => 'Inicial do Nome com Sobrenome (j.silva@exemplo.com.br)',
-    'firstname_lastname_display'	=> 'Primeiro nome com sobrenome (João Silva)',
-    'lastname_firstname_display'	=> 'Sobrenome com Primeiro Nome (Silva João)',
-    'name_display_format'	=> 'Formato de exibição de nome',
-    'first'					=> 'Primeiro',
-    'firstnamelastname'     => 'Primeiro Nome com Sobrenome (josesilva@exemplo.com.br)',
-    'lastname_firstinitial' => 'Sobrenome Primeira Inicial (silva_j@exemplo.com.br)',
-    'firstinitial.lastname' => 'Inicial do Nome sobrenome (j.silva@exemplo.com.br)',
-    'firstnamelastinitial'  => 'Primeiro Nome com Inicial do Sobrenome (joses@exemplo.com.br)',
-    'lastnamefirstname'      => 'Sobrenome Primeiro Nome (silva_j@exemplo.com.br)',
-    'first_name'			=> 'Primeiro Nome',
-    'first_name_format'		=> 'Primeiro Nome (jose@exemplo.com.br)',
+
     'files'                 => 'Arquivos',
     'file_name'				=> 'Arquivo',
     'file_type'             => 'Tipo de Arquivo',
@@ -158,7 +150,7 @@ return [
     'image_upload'         	=> 'Carregar Imagem',
     'filetypes_accepted_help'    => 'Os tipos de arquivos aceito são :types. O tamanho máximo de carregamento permitido é de :size.|Os tipos de arquivos aceitos são :types. O tamanho máximo de carregamentos permitido é de :size.',
     'filetypes_size_help'   => 'O tamanho máximo de carregamento permitido é de :size.',
-    'image_filetypes_help'  => 'Accepted filetypes are jpg, webp, png, gif, svg, and avif. Max upload size allowed is :size.',
+    'image_filetypes_help'  => 'Os tipos de arquivo aceitos são jpg, webp, png, gif e svg. O tamanho máximo de upload permitido é :tamanho.',
     'unaccepted_image_type'  => 'Este arquivo de imagem não é legível. Tipos de arquivos aceitos são jpg, webp, png, gif e svg. O mimetype deste arquivo é: :mimetype.',
     'import'         	    => 'Importar',
     'import_this_file'      => 'Mapear os campos e processar este arquivo',
@@ -178,12 +170,17 @@ return [
     'last'					=> 'Última',
     'last_login'            => 'Último Login',
     'last_name'             => 'Último Nome',
+    'firstname_lastname_display'	=> 'Primeiro nome com sobrenome (João Silva)',
+    'lastname_firstname_display'	=> 'Sobrenome com Primeiro Nome (Silva João)',
+    'name_display_format'	=> 'Formato de exibição de nome',
+    'first'					=> 'Primeiro',
+    'first_name'			=> 'Primeiro Nome',
     'license'				=> 'Licença',
     'license_report'        => 'Relatório de Licença',
     'licenses_available'	=> 'Licenças disponíveis',
     'licenses'				=> 'Licenças',
     'list_all'				=> 'Listar Todos',
-    'loading'				=> 'Carregando, por favor aguarde...',
+    'loading'				=> 'Carregando... Por favor, aguarde...',
     'lock_passwords'        => 'Este valor de campo não será salvo em uma instalação de demonstração.',
     'feature_disabled'      => 'Esta funcionalidade foi desativada na versão de demonstração.',
     'location'              => 'Local',
@@ -193,7 +190,7 @@ return [
     'logout'				=> 'Sair',
     'lookup_by_tag'     => 'Pesquisar por Etiqueta do Ativo',
     'maintenances'          => 'Manutenções',
-    'manage_api_keys'       => 'Gerenciar Chaves da API',
+    'manage_api_keys'       => 'Gerenciar chaves de API',
     'manufacturer'			=> 'Fabricante',
     'manufacturers'			=> 'Fabricantes',
     'markdown'				=> 'Este campo permite <a href="https://help.github.com/articles/github-flavored-markdown/">marcação com sintaxe do Github</a>.',
@@ -215,6 +212,14 @@ return [
     'no_results'			=> 'Sem Resultados.',
     'no'  					=> 'Não',
     'notes'  				=> 'Notas',
+    'note_added'            => 'Note Added',
+    'options'				=> 'Options',
+    'preview'				=> 'Preview',
+    'add_note'              => 'Add Note',
+    'note_edited'            => 'Note Edited',
+    'edit_note'              => '',
+    'note_deleted'            => 'Note Deleted',
+    'delete_note'              => 'Delete Note',
     'order_number'          => 'Número do Pedido',
     'only_deleted'          => 'Apenas Ativos Removidos',
     'page_menu'				=> 'Mostrando _MENU_ itens',
@@ -229,9 +234,9 @@ return [
     'purchase_date'         => 'Data da Aquisição',
     'qty'		            => 'Quantidade',
     'quantity'		        => 'Quantidade',
-    'quantity_minimum'      => 'Você tem :count itens abaixo ou quase abaixo dos níveis de quantidade mínima',
+    'quantity_minimum'      => 'You have one item below or almost below minimum quantity levels|You have :count items below or almost below minimum quantity levels',
     'quickscan_checkin'  	=> 'Check-in por Escaneamento Rápido',
-    'quickscan_checkin_status'  	=> 'Estado do Check-in',
+    'quickscan_checkin_status'  	=> 'Estado da Devolução',
     'ready_to_deploy'		=> 'Pronto para Implantar',
     'recent_activity'		=> 'Atividade Recente',
     'remaining'             => 'Restante',
@@ -240,7 +245,7 @@ return [
     'restored'				=> 'restaurado',
     'restore'				=> 'Restaurar',
     'requestable_models'    => 'Modelos Solicitáveis',
-    'requestable_items'     => 'Requestable Items',
+    'requestable_items'     => 'Itens Solicitáveis',
     'requested'				=> 'Solicitado',
     'requested_date'        => 'Data da Solicitação',
     'requested_assets'      => 'Ativos Solicitados',
@@ -274,13 +279,15 @@ return [
     'signed_off_by'         => 'Assinado por',
     'skin'       			=> 'Temas',
     'webhook_msg_note'        => 'Uma notificação será enviada via webhook',
-    'webhook_test_msg'        => 'Parabéns! Parece que sua integração :app com o sistema está funcionando!',
+    'webhook_test_msg'        => 'Parabéns! Parece que sua integração de :app com o sistema está funcionando!',
     'some_features_disabled' => 'MODO DE DEMONSTRAÇÃO: Algumas funcionalidades estão desativadas nesta instalação.',
     'site_name'				=> 'Nome do Site',
     'state'  				=> 'Estado',
     'status_labels'			=> 'Rótulos de Situação',
+    'status_label'			=> 'Rótulos de Situação',
     'status'    			=> 'SItuação',
     'accept_eula'           => 'Acordo de Aceitação',
+    'show_or_hide_eulas' => 'Show/Hide EULAs',
     'supplier'              => 'Fornecedor',
     'suppliers'  			=> 'Fornecedores',
     'sure_to_delete'        => 'Você tem certeza que deseja apagar',
@@ -294,11 +301,11 @@ return [
     'total_accessories'		=> 'total de acessórios',
     'total_consumables'		=> 'total de consumíveis',
     'type'  				=> 'Tipo',
-    'undeployable'			=> 'Não implantável',
+    'undeployable'			=> 'Não implementável',
     'unknown_admin'			=> 'Administrador Desconhecido',
-    'username_format'		=> 'Formato de Nome de Usuário',
     'username'              => 'Usuário',
     'update'                => 'Atualizar',
+    'updating_item' => 'Updating :item',
     'upload_filetypes_help'      => 'Os tipos de arquivos permitidos são png, gif, jpg, jpeg, doc, docx, pdf, xls, xlsx, txt, lic, xml, zip, rtf e rar. O tamanho máximo de carregamento permitido é :size.',
     'uploaded'              => 'Carregado',
     'user'					=> 'Usuário',
@@ -323,10 +330,10 @@ return [
     'token_expired'         => 'A sua sessão expirou. Por favor, tente entrar novamente.',
     'login_enabled'         => 'Login Ativado',
     'audit_due'             => 'Vencimento para auditoria',
-    'audit_due_days'        => 'Atributos devidos para auditoria dentro de :days Dias| Ativos devido para auditoria dentro de :days',
+    'audit_due_days'        => '{}Assets Due or Overdue for Audit|[1]Assets Due or Overdue for Audit Within a Day|[2,*]Assets Due or Overdue for Audit Within :days Days',
     'checkin_due'           => 'Vencimento para o checkin',
     'checkin_overdue'       => 'Atrasado por check-in',
-    'checkin_due_days'      => 'Ativos devidos para o check-in dentro de :days Dias| Ativos devido para check-in dentro de :days',
+    'checkin_due_days'      => '{}Vencendo para Devolução|[1]Ativo com Devolução Prevista em :dias Dia|[2,*]Ativos com Devolução Prevista em :dias Dias',
     'audit_overdue'         => 'Atrasado para Auditoria',
     'accept'                => 'Aceitar :asset',
     'i_accept'              => 'Eu aceito',
@@ -340,7 +347,7 @@ return [
     'hide_deleted'          => 'Ocultar excluídos',
     'email'                 => 'E-mail',
     'do_not_change'         => 'Não alterar',
-    'bug_report'            => 'Relatar um Erro/Problema',
+    'bug_report'            => 'Relatar um erro',
     'user_manual'           => 'Manual do Usuário',
     'setup_step_1'          => 'Passo 1',
     'setup_step_2'          => 'Passo 2',
@@ -348,11 +355,11 @@ return [
     'setup_step_4'          => 'Passo 4',
     'setup_config_check'    => 'Verificar Configuração',
     'setup_create_database' => 'Criar tabelas no banco de dados',
-    'setup_create_admin'    => 'Criar usuário administrativo',
+    'setup_create_admin'    => 'Criar um usuário administrador',
     'setup_done'            => 'Concluído!',
     'bulk_edit_about_to'    => 'Você está prestes a editar o seguinte: ',
-    'checked_out'           => 'Checked Out',
-    'checked_out_to'        => 'Check-out para',
+    'checked_out'           => 'Disponibilizado',
+    'checked_out_to'        => 'Disponibilizado para',
     'fields'                => 'Campos',
     'last_checkout'         => 'Último Registo de Saída',
     'due_to_checkin'        => 'Os seguintes itens :count devem ser verificados em breve:',
@@ -384,6 +391,8 @@ Resultados da Sincronização',
     'new_license'           => 'Nova Licença',
     'new_accessory'         => 'Novo acessório',
     'new_consumable'        => 'Novo consumível',
+    'new_component'         => 'New Component',
+    'new_user'              => 'New User',
     'collapse'              => 'Recolher',
     'assigned'              => 'Atribuído',
     'asset_count'           => 'Contagem de Ativos',
@@ -405,10 +414,10 @@ Resultados da Sincronização',
     'accessory_information' => 'Informações do Acessório:',
     'accessory_name'       => 'Nome do Acessório:',
     'clone_item'            => 'Clonar Item',
-    'checkout_tooltip' => 'Fazer check-out do item',
+    'checkout_tooltip' => 'Realizar saída do item',
     'checkin_tooltip' => 'Selecione este item para que ele esteja disponível para re-questão, re-imagem, etc',
-    'checkout_user_tooltip' => 'Fazer check-out deste item para um usuário',
-    'checkin_to_diff_location' => 'You can choose to check this asset in to a location other than this asset\'s default location of :default_location if one is set',
+    'checkout_user_tooltip' => 'Disponibilizar este item para um usuário',
+    'checkin_to_diff_location' => 'Você pode optar por alocar este ativo em um local diferente da localização padrão deste ativo de :default_location se este atributo estiver definido',
     'maintenance_mode'      => 'O serviço está temporariamente indisponível para atualizações do sistema. Por favor, volte mais tarde.',
     'maintenance_mode_title' => 'Sistema Temporariamente Indisponível',
     'ldap_import'           => 'A senha do usuário não deve ser gerenciada pelo LDAP. (Isso permite que você envie solicitações de senha esquecidas.)',
@@ -426,12 +435,13 @@ Resultados da Sincronização',
     'assets_by_status_type'      => 'Ativos por Tipo de Situação',
     'pie_chart_type'        => 'Painel Tipo Gráfico de Pizza',
     'hello_name'            => 'Olá, :name!',
-    'unaccepted_profile_warning'   => 'Você tem :count itens que requerem aceitação. Clique aqui para aceitar ou recusá-los',
+    'unaccepted_profile_warning'   => 'Você tem um item que requer aceitação. Clique aqui para aceitar ou recusar. Você tem :count itens que requerem aceitação. Clique aqui para aceitá-los ou recusá-los',
     'start_date'            => 'Data Inicial',
     'end_date'            => 'Data final',
     'alt_uploaded_image_thumbnail' => 'Miniatura carregada',
     'placeholder_kit'       => 'Selecione um kit',
     'file_not_found'        => 'Arquivo não encontrado',
+    'log_record_not_found'  => 'No record for that log entry was found.',
     'preview_not_available' => '(sem visualização)',
     'setup'                 => 'Configuração',
     'pre_flight'            => 'Pré-Lançamento',
@@ -476,7 +486,7 @@ Resultados da Sincronização',
     'confirm' => 'Confirmar',
     'autoassign_licenses' => 'Atribuir licenças automaticamente',
     'autoassign_licenses_help' => 'Permitir que este usuário tenha licenças atribuídas por meio da interface de atribuição em massa de licenças ou por meio de ferramentas de linha de comando.',
-    'autoassign_licenses_help_long' => 'Isto permite que um usuário possa ter licenças atribuídas através da interface de usuário ou ferramentas de licença de atribuição direta. (Por exemplo, você pode não querer que os empreiteiros tenham uma licença que você forneceria apenas para membros da equipe. Você ainda pode atribuir licenças individualmente para esses usuários, mas eles não serão incluídos na licença de check-out para as funções de todos os usuários.)',
+    'autoassign_licenses_help_long' => 'Isto permite que um usuário possa ter licenças atribuídas através da interface de usuário ou ferramentas de licença de atribuição direta. (Por exemplo, você pode não querer que os empreiteiros tenham uma licença que você forneceria apenas para membros da equipe. Você ainda pode atribuir licenças individualmente para esses usuários, mas eles não serão incluídos na licença de disponibilização para as funções de todos os usuários.)',
     'no_autoassign_licenses_help' => 'Não inclua o usuário para atribuição em massa através da interface do usuário da licença ou das ferramentas do CLI.',
     'modal_confirm_generic'      => 'Você tem certeza?',
     'cannot_be_deleted'      => 'Este item não pode ser excluído',
@@ -510,13 +520,13 @@ Resultados da Sincronização',
         'import_note' => 'Importado usando o importador csv',
     ],
     'remove_customfield_association' => 'Remover este campo do conjunto de campos. Isto não irá apagar o campo personalizado, apenas a associação deste campo com este conjunto de campos.',
-    'checked_out_to_fields' => 'Checked Out To Fields',
+    'checked_out_to_fields' => 'Check-out para os campos',
     'percent_complete' => '% completo',
     'uploading' => 'Enviando... ',
-    'upload_error' => 'Erro ao enviar o arquivo. Por favor, verifique se não existem linhas vazias e se nenhum nome de coluna está duplicado.',
+    'upload_error' => 'Erro ao enviar o arquivo. Por favor, verifique se você não tem linhas vazias ou nomes duplicados de colunas em seu arquivo CSV, e se as permissões do servidor permitem envios.',
     'copy_to_clipboard' => 'Copiar para Área de Transferência',
     'copied' => 'Copiado!',
-    'status_compatibility' => 'Se os ativos já estão atribuídos, eles não podem ser alterados para um tipo de status não implantável e este valor será ignorado.',
+    'status_compatibility' => 'Se os ativos já estão atribuídos, eles não podem ser alterados para um tipo de situação não implementável e este valor será ignorado.',
     'rtd_location_help' => 'Esta é a localização do ativo quando ele não está em uso',
     'item_not_found' => ':item_type ID :id não existe ou foi excluído',
     'action_permission_denied' => 'Você não tem permissão para :action :item_type ID :id',
@@ -529,7 +539,7 @@ Resultados da Sincronização',
     'permission_denied_superuser_demo' => 'Permissão negada. Você não pode atualizar informações de usuário para superadministradores na demonstração.',
     'pwd_reset_not_sent' => 'Usuário não está ativado, está sincronizado com o LDAP ou não tem um endereço de e-mail',
     'error_sending_email' => 'Erro ao enviar email',
-    'sad_panda' => 'Sad panda. You are not authorized to do the thing. Maybe <a href=":link">return to the dashboard</a>, or contact your administrator.',
+    'sad_panda' => 'Lamentamos. Você não está autorizado a realizar esta ação. Talvez <a href=":link">volte para o painel</a> ou entre em contato com o seu administrador.',
     'bulk' => [
             'delete' =>
                 [
@@ -550,6 +560,71 @@ Resultados da Sincronização',
         'license_seats'  => ':count licença assentonamed@@0:count licença de assentos',
         'consumables'  => ':count Consumível|:count Consumíveis',
         'components'  => ':count Componente|:count Componentes',
-    ]
+    ],
+
+    'more_info' => 'Mais Informações',
+    'quickscan_bulk_help' => 'Marcar esta caixa irá editar o registro do ativo para refletir este novo local. Deixar desmarcado irá apenas registrar a localização no log de auditoria. Observe que, se este ativo estiver emprestado, não alterará o local da pessoa, do ativo ou do local para onde ele foi emprestado.',
+    'whoops' => 'Opa!',
+    'something_went_wrong' => 'Algo deu errado com sua requisição.',
+    'close' => 'Fechar',
+    'expires' => 'Expira',
+    'map_fields'=> '',
+    'remaining_var' => ':count Restante',
+    'label' => 'Rótulo',
+    'import_asset_tag_exists' => 'Um ativo com a etiqueta de ativo :asset_tag já existe e uma atualização não foi solicitada. Nenhuma alteração foi feita.',
+    'countries_manually_entered_help' => 'Os valores com um asterisco (*) foram inseridos manualmente e não correspondem aos valores existentes na lista suspensa do ISO 3166',
+    'accessories_assigned' => 'Assigned Accessories',
+    'user_managed_passwords' => 'Password Management',
+    'user_managed_passwords_disallow' => 'Disallow users from managing their own passwords',
+    'user_managed_passwords_allow' => 'Allow users to manage their own passwords',
+    'from' => 'From',
+    'by' => 'Por',
+
+// Add form placeholders here
+    'placeholders' => [
+        'notes'  => 'Add a note',
+    ],
+
+    'breadcrumb_button_actions' => [
+        'edit_item' => 'Edit :name',
+        'checkout_item' => 'Atribuir para :nome',
+        'checkin_item' => 'Devolver de :nome',
+    ],
+
+    'skins' => [
+        'site_default' => 'Site Default',
+        'default_blue' => 'Default Blue',
+        'blue_dark' => 'Blue (Dark Mode)',
+        'green' => 'Green Dark',
+        'green_dark' => 'Green (Dark Mode)',
+        'red' => 'Red Dark',
+        'red_dark' => 'Red (Dark Mode)',
+        'orange' => 'Orange Dark',
+        'orange_dark' => 'Orange (Dark Mode)',
+        'black' => 'Black',
+        'black_dark' => 'Black (Dark Mode)',
+        'purple' => 'Purple',
+        'purple_dark' => 'Purple (Dark Mode)',
+        'yellow' => 'Yellow',
+        'yellow_dark' => 'Yellow (Dark Mode)',
+        'high_contrast' => 'High Contrast',
+
+    ],
+
+    'select_all_none' => 'Select/Unselect All',
+    'generic_model_not_found' => 'That :model was not found or you do not have permission to access it',
+    'deleted_models' => 'Deleted Asset Models',
+    'deleted_users' => 'Deleted Users',
+    'cost_each' => ':amount each',
+    'remove_current_image' => 'Remove current :type image',
+
+    'seeding' => [
+        'manufacturers' => [
+            'button' => 'Create Manufacturers',
+            'prompt' => 'You do not have any manufacturers yet. Would you like to seed a list of common manufacturers? (THIS WILL OVERWRITE EXISTING MANUFACTURERS, including those that have been soft-deleted.)',
+            'success' => 'Manufacturers seeded successfully',
+            'error' => 'Could not seed manufacturers. A manufacturer record already exists and seeding would overwrite it.|Could not seed manufacturers. :count manufacturer records already exist and seeding would overwrite them.',
+        ],
+    ],
 
 ];
diff --git a/resources/lang/pt-BR/localizations.php b/resources/lang/pt-BR/localizations.php
index af8493c864..75135781d2 100644
--- a/resources/lang/pt-BR/localizations.php
+++ b/resources/lang/pt-BR/localizations.php
@@ -2,7 +2,7 @@
 
 return [
 
-    'select_language' => 'Selecionar um idioma',
+    'select_language' => 'Selecione um Idioma',
     'languages' => [
         'en-US'=> 'Inglês, EUA',
         'en-GB'=> 'Inglês, Reino Unido',
@@ -40,7 +40,9 @@ return [
         'ms-MY'=> 'Malaio',
         'mi-NZ'=> 'Maori',
         'mn-MN'=> 'Mongol',
-        'no-NO'=> 'Norueguês',
+        'nb-NO'=> 'Norueguês Bokmål',
+        'om-ET' => 'Oromo (Ethiopian)',
+        //'nn-NO'=> 'Norwegian Nynorsk',
         'fa-IR'=> 'Persa',
         'pl-PL'=> 'Polonês',
         'pt-PT'=> 'Português',
@@ -66,7 +68,7 @@ return [
         'zu-ZA'=> 'Zulu',
     ],
 
-    'select_country' => 'Selecione um país',
+    'select_country' => 'Selecione um País',
     
     'countries' => [
         'AC'=>'Ilha de Ascensão',
@@ -133,6 +135,7 @@ return [
         'EC'=>'Equador',
         'EE'=>'Estónia',
         'EG'=>'Egito',
+        'GB-ENG'=>'Inglaterra',
         'ER'=>'Eritreia',
         'ES'=>'Espanha',
         'ET'=>'Etiópia',
@@ -231,6 +234,7 @@ return [
         'NG'=>'Nigéria',
         'NI'=>'Nicarágua',
         'NL'=>'Países Baixos',
+        'GB-NIR' => 'Irlanda do Norte',
         'NO'=>'Noruega',
         'NP'=>'Nepal',
         'NR'=>'Nauru',
@@ -258,7 +262,7 @@ return [
         'RU'=>'Federação Russa',
         'RW'=>'Ruanda',
         'SA'=>'Arábia Saudita',
-        'UK'=>'Escócia',
+        'GB-SCT'=>'Escócia',
         'SB'=>'Ilhas Salomão',
         'SC'=>'Seicheles',
         'SS'=>'Sudão do Sul',
@@ -310,6 +314,7 @@ return [
         'VI'=>'Ilhas Virgens (Americanas)',
         'VN'=>'Vietnã',
         'VU'=>'Vanuatu',
+        'GB-WLS' =>'País de Gales',
         'WF'=>'Ilhas Wallis e Futuna',
         'WS'=>'Samoa',
         'YE'=>'Iêmen',
diff --git a/resources/lang/pt-BR/mail.php b/resources/lang/pt-BR/mail.php
index a03869290c..c02b11e952 100644
--- a/resources/lang/pt-BR/mail.php
+++ b/resources/lang/pt-BR/mail.php
@@ -14,7 +14,7 @@ return [
     'Confirm_license_delivery' => 'Confirme a entrega de licença',
     'Consumable_checkout_notification' => 'Consumível verificado',
     'Days' => 'Dias',
-    'Expected_Checkin_Date' => 'Um ativo com check-out para você deve ser verificado novamente em :date',
+    'Expected_Checkin_Date' => 'Um ativo disponibilizado a você deve ser retornado em :date',
     'Expected_Checkin_Notification' => 'Lembrete: :name prazo de devolução aproximando',
     'Expected_Checkin_Report' => 'Relatório de check-in de ativos esperado',
     'Expiring_Assets_Report' => 'Relatório de ativos expirando.',
@@ -23,25 +23,26 @@ return [
     'Item_Requested' => 'Item requisitado',
     'License_Checkin_Notification' => 'Licença verificada em',
     'License_Checkout_Notification' => 'Licença registrada',
+    'license_for'   => 'License for',
     'Low_Inventory_Report' => 'Relatório de baixas de inventario',
     'a_user_canceled' => 'Um usuário cancelou uma requisição no website',
     'a_user_requested' => 'Um usuário requisitou um item no website',
     'acceptance_asset_accepted' => 'Um usuário aceitou um item',
     'acceptance_asset_declined' => 'Um usuário recusou um item',
-    'accessory_name' => 'Nome do Acessório:',
-    'additional_notes' => 'Comentários adicionais:',
+    'accessory_name' => 'Nome do Acessório',
+    'additional_notes' => 'Comentários adicionais',
     'admin_has_created' => 'Um administrador criou uma conta para você em :web.',
-    'asset' => 'Ativo:',
-    'asset_name' => 'Nome do Ativo:',
+    'asset' => 'Ativo',
+    'asset_name' => 'Nome do Ativo',
     'asset_requested' => 'Requisição de Ativo',
     'asset_tag' => 'Etiqueta de Ativo',
     'assets_warrantee_alert' => 'Há um :count ativo com a garantia expirando nos próximos :threshold dias. Existem :count ativos com a garantia expirando nos próximos :threshold dias.',
     'assigned_to' => 'Atribuído a',
     'best_regards' => 'Atenciosamente,',
-    'canceled' => 'Cancelado:',
-    'checkin_date' => 'Data de devolução:',
-    'checkout_date' => 'Data de atribuição:',
-    'checkedout_from' => 'Check-out de',
+    'canceled' => 'Cancelado',
+    'checkin_date' => 'Data de devolução',
+    'checkout_date' => 'Data de saída',
+    'checkedout_from' => 'Disponibilizado de',
     'checkedin_from'  => 'Check-in de',
     'checked_into' => 'Check-in em',
     'click_on_the_link_accessory' => 'Por favor clique no link na parte inferior para confirmar que recebeu o acessório.',
@@ -49,27 +50,30 @@ return [
     'click_to_confirm' => 'Por favor clique no link a seguir para confirmar sua conta :web:',
     'current_QTY' => 'Qtde. atual',
     'days' => 'Dias',
-    'expecting_checkin_date' => 'Data prevista de devolução:',
+    'expecting_checkin_date' => 'Excedeu a data dar entrada',
     'expires' => 'Expira',
     'hello' => 'Olá',
     'hi' => 'Oi',
     'i_have_read' => 'Li e concordo com os termos de uso e recebi este item.',
     'inventory_report' => 'Relatório de Inventário',
-    'item' => 'Item:',
+    'item' => 'Item',
+    'item_checked_reminder' => 'Este é um lembrete que você tem atualmente :count itens check-out para você que você não aceitou ou recusou. Por favor, clique no link abaixo para confirmar sua decisão.',
     'license_expiring_alert' => 'Há uma :count licença expirando nos próximos :threshold dias. | Existem :count licenças expirand nos próximos :threshold dias.',
     'link_to_update_password' => 'Por favor clique no link abaixo para atualizar a sua senha do :web:',
-    'login' => 'Login:',
+    'login' => 'Entrar',
     'login_first_admin' => 'Faça login na sua instalação do Snipe-IT usando os dados abaixo:',
     'low_inventory_alert' => 'Há um :count que está abaixo do estoque mínimo ou em breve estará abaixo. | Existem :count items que estão abaixo do estoque mínimo ou em breve estarão baixos.',
     'min_QTY' => 'Qtde. Min',
     'name' => 'Nome',
-    'new_item_checked' => 'Um novo item foi feito Check-out em seu nome, detalhes abaixo.',
+    'new_item_checked' => 'Um novo item foi atribuído em seu nome, os detalhes estão abaixo.',
+    'new_item_checked_with_acceptance' => 'Um novo item foi registrado em seu nome que requer aceitação, detalhes abaixo.',
+    'recent_item_checked' => 'Um novo item foi registrado em seu nome que requer aceitação, detalhes abaixo.',
     'notes' => 'Notas',
-    'password' => 'Senha:',
+    'password' => 'Senha',
     'password_reset' => 'Redefinir Senha',
     'read_the_terms' => 'Por favor, leia os termos de uso abaixo.',
     'read_the_terms_and_click' => 'Por favor, leia os termos de uso abaixo, e clique no link na parte inferior para confirmar que você leu e concorda com os termos de uso, e recebeu o ativo.',
-    'requested' => 'Solicitado:',
+    'requested' => 'Solicitado',
     'reset_link' => 'Seu Link de redefinição da senha',
     'reset_password' => 'Clique aqui para redefinir sua senha:',
     'rights_reserved' => 'Todos os direitos reservados.',
@@ -86,8 +90,10 @@ return [
     'upcoming-audits' => 'Existe um :count ativo que está sendo auditado dentro de :threshold days. There are :count assets que estão sendo enviados para auditoria dentro de :threshold dias.',
     'user' => 'Usuário',
     'username' => 'Nome de Usuário',
+    'unaccepted_asset_reminder' => 'Reminder: You have Unaccepted Assets.',
     'welcome' => 'Bem-vindo(a), :name',
     'welcome_to' => 'Bem-vindo ao :web!',
     'your_assets' => 'Ver seus ativos',
     'your_credentials' => 'Suas credenciais do Snipe-IT',
+    'mail_sent' => 'Email enviado com sucesso!',
 ];
diff --git a/resources/lang/pt-BR/validation.php b/resources/lang/pt-BR/validation.php
index c6efdc3dcf..00c2db7ada 100644
--- a/resources/lang/pt-BR/validation.php
+++ b/resources/lang/pt-BR/validation.php
@@ -13,87 +13,150 @@ return [
     |
     */
 
-    'accepted'             => 'O :attribute dever ser aceito.',
-    'active_url'           => 'O :attribute não é uma URL válida.',
-    'after'                => 'O :attribute deve ser uma data após :date.',
-    'after_or_equal'       => 'O :attribute deve ser uma data depois ou igual a :date.',
-    'alpha'                => 'O :attribute pode apenas conter letras.',
-    'alpha_dash'           => 'O :attribute pode apenas conter letras, números, e traços.',
-    'alpha_num'            => 'O :attribute pode apenas conter letras e números.',
-    'array'                => 'O :attribute deve estar em ordem.',
-    'before'               => 'O :attribute deve ser uma data antes de :date.',
-    'before_or_equal'      => 'O atributo: deve ser uma data anterior ou igual a: date.',
-    'between'              => [
-        'numeric' => 'O :attribute deve estar entre :min - :max.',
-        'file'    => 'O :attribute deve estar entre :min - :max kilobytes.',
-        'string'  => 'O :attribute deve estar entre :min - :max caracteres.',
-        'array'   => 'O :attribute deve ter entre :min e :max items.',
+    'accepted' => 'O campo :attribute deve ser aceito.',
+    'accepted_if' => 'O campo :attribute deve ser aceito quando :other for :value.',
+    'active_url' => 'O campo :attribute deve ser uma URL válida.',
+    'after' => 'O campo :attribute deve ser uma data posterior a :date.',
+    'after_or_equal' => 'O campo :attribute deve ser uma data posterior ou igual a :date.',
+    'alpha' => 'O campo :attribute deve conter apenas letras.',
+    'alpha_dash' => 'O campo :attribute deve conter apenas letras, números, traços e sublinhados.',
+    'alpha_num' => 'O campo :attribute deve conter apenas letras e números.',
+    'array' => 'O campo :attribute deve ser um vetor.',
+    'ascii' => 'O campo :attribute deve conter apenas caracteres e símbolos alfanuméricos de um único byte.',
+    'before' => 'O campo :attribute deve ser uma data anterior a :date.',
+    'before_or_equal' => 'O campo :attribute deve ser uma data anterior ou igual a :date.',
+    'between' => [
+        'array' => 'O campo :attribute deve ter entre :min e :max itens.',
+        'file' => 'O campo :attribute deve ter entre :min e :max kilobytes.',
+        'numeric' => 'O campo :attribute deve estar entre :min e :max.',
+        'string' => 'O campo :attribute deve ter entre :min e :max caracteres.',
     ],
-    'boolean'              => 'O :atributo têm que ser verdadeiro ou falso.',
-    'confirmed'            => 'A confirmação do :attribute não corresponde.',
-    'date'                 => 'O :attribute não é uma data válida.',
-    'date_format'          => 'O :attribute não corresponde ao formato :format.',
-    'different'            => 'O :attribute e :other devem ser diferentes.',
-    'digits'               => 'O :attribute deve ter :digits dígitos.',
-    'digits_between'       => 'O :attribute deve ter entre :min e :max dígitos.',
-    'dimensions'           => 'O :attribute tem dimensões de imagem inválidas.',
-    'distinct'             => 'O :attribute tem um valor duplicado.',
-    'email'                => 'O formato de :attribute é inválido.',
-    'exists'               => 'O :attribute selecionado é inválido.',
-    'file'                 => 'O :attribute deve ser um arquivo.',
-    'filled'               => 'O :attribute deve ter um valor.',
-    'image'                => 'O :attribute deve ser uma imagem.',
+    'boolean' => 'O campo :attribute deve ser verdadeiro ou falso.',
+    'can' => 'O campo :attribute contém um valor não autorizado.',
+    'confirmed' => 'A confirmação do campo :attribute não corresponde.',
+    'contains' => 'O campo "atributo" não contém um valor obrigatório.',
+    'current_password' => 'A senha esta incorreta.',
+    'date' => 'The :attribute field must be a valid date.',
+    'date_equals' => 'The :attribute field must be a date equal to :date.',
+    'date_format' => 'The :attribute field must match the format :format.',
+    'decimal' => 'The :attribute field must have :decimal decimal places.',
+    'declined' => 'The :attribute field must be declined.',
+    'declined_if' => 'The :attribute field must be declined when :other is :value.',
+    'different' => 'The :attribute field and :other must be different.',
+    'digits' => 'The :attribute field must be :digits digits.',
+    'digits_between' => 'The :attribute field must be between :min and :max digits.',
+    'dimensions' => 'The :attribute field has invalid image dimensions.',
+    'distinct' => 'O :attribute tem um valor duplicado.',
+    'doesnt_end_with' => 'The :attribute field must not end with one of the following: :values.',
+    'doesnt_start_with' => 'The :attribute field must not start with one of the following: :values.',
+    'email' => 'The :attribute field must be a valid email address.',
+    'ends_with' => 'O campo :attribute deve terminar com um dos seguintes: :values.',
+    'enum' => 'O :attribute selecionado é inválido.',
+    'exists' => 'O :attribute selecionado é inválido.',
+    'extensions' => 'The :attribute field must have one of the following extensions: :values.',
+    'file' => 'O campo :attribute deve ser um arquivo.',
+    'filled' => 'O :attribute deve ter um valor.',
+    'gt' => [
+        'array' => 'O :attribute não pode ter mais que :max items.',
+        'file' => 'The :attribute field must be greater than :value kilobytes.',
+        'numeric' => 'The :attribute field must be greater than :value.',
+        'string' => 'The :attribute field must be greater than :value characters.',
+    ],
+    'gte' => [
+        'array' => 'The :attribute field must have :value items or more.',
+        'file' => 'The :attribute field must be greater than or equal to :value kilobytes.',
+        'numeric' => 'The :attribute field must be greater than or equal to :value.',
+        'string' => 'The :attribute field must be greater than or equal to :value characters.',
+    ],
+    'hex_color' => 'The :attribute field must be a valid hexadecimal color.',
+    'image' => 'The :attribute field must be an image.',
     'import_field_empty'    => 'O valor para :fieldname não pode ser nulo.',
-    'in'                   => 'O :attribute selecionado é inválido.',
-    'in_array'             => 'O :attribute campo não existe em :other.',
-    'integer'              => 'O :attribute deve ser um número inteiro.',
-    'ip'                   => 'O :attribute deve ser um endereço de IP válido.',
-    'ipv4'                 => 'O :attribute deve ter um endereço IPv4.',
-    'ipv6'                 => 'O :attribute deve ter um IPv6 válido.',
-    'is_unique_department' => 'O :attribute deve ser único para esta localização da empresa',
-    'json'                 => 'The :attribute deve ser um JSON válida.',
-    'max'                  => [
-        'numeric' => 'O :attribute não pode ser maior do que :max.',
-        'file'    => 'O :attribute não pode ser maior do que :max kilobytes.',
-        'string'  => 'O :attribute não pode ser maior do que :max caracteres.',
-        'array'   => 'O :attribute não pode ter mais que :max items.',
+    'in' => 'O :attribute selecionado é inválido.',
+    'in_array' => 'The :attribute field must exist in :other.',
+    'integer' => 'The :attribute field must be an integer.',
+    'ip' => 'The :attribute field must be a valid IP address.',
+    'ipv4' => 'The :attribute field must be a valid IPv4 address.',
+    'ipv6' => 'The :attribute field must be a valid IPv6 address.',
+    'json' => 'The :attribute field must be a valid JSON string.',
+    'list' => 'The :attribute field must be a list.',
+    'lowercase' => 'The :attribute field must be lowercase.',
+    'lt' => [
+        'array' => 'The :attribute field must have less than :value items.',
+        'file' => 'The :attribute field must be less than :value kilobytes.',
+        'numeric' => 'The :attribute field must be less than :value.',
+        'string' => 'The :attribute field must be less than :value characters.',
     ],
-    'mimes'                => 'O :attribute deve ser um arquivo do tipo: :values.',
-    'mimetypes'            => 'O :attribute deve ser um arquivo de tipo: :values.',
-    'min'                  => [
-        'numeric' => 'O :attribute deve ter pelo menos :min.',
-        'file'    => 'O :attribute deve ter pelo menos :min kilobytes.',
-        'string'  => 'O :attribute deve ter pelo menos :min caracteres.',
-        'array'   => 'O :attribute deve ter pelo menos :min items.',
+    'lte' => [
+        'array' => 'The :attribute field must not have more than :value items.',
+        'file' => 'The :attribute field must be less than or equal to :value kilobytes.',
+        'numeric' => 'The :attribute field must be less than or equal to :value.',
+        'string' => 'The :attribute field must be less than or equal to :value characters.',
     ],
-    'starts_with'          => 'O atributo deve começar com um dos seguintes valores.',
-    'ends_with'            => 'O :attribute deve terminar com um dos seguintes: :values.',
+    'mac_address' => 'The :attribute field must be a valid MAC address.',
+    'max' => [
+        'array' => 'The :attribute field must not have more than :max items.',
+        'file' => 'The :attribute field must not be greater than :max kilobytes.',
+        'numeric' => 'The :attribute field must not be greater than :max.',
+        'string' => 'The :attribute field must not be greater than :max characters.',
+    ],
+    'max_digits' => 'The :attribute field must not have more than :max digits.',
+    'mimes' => 'The :attribute field must be a file of type: :values.',
+    'mimetypes' => 'The :attribute field must be a file of type: :values.',
+    'min' => [
+        'array' => 'The :attribute field must have at least :min items.',
+        'file' => 'The :attribute field must be at least :min kilobytes.',
+        'numeric' => 'The :attribute field must be at least :min.',
+        'string' => 'The :attribute field must be at least :min characters.',
+    ],
+    'min_digits' => 'The :attribute field must have at least :min digits.',
+    'missing' => 'The :attribute field must be missing.',
+    'missing_if' => 'The :attribute field must be missing when :other is :value.',
+    'missing_unless' => 'The :attribute field must be missing unless :other is :value.',
+    'missing_with' => 'The :attribute field must be missing when :values is present.',
+    'missing_with_all' => 'The :attribute field must be missing when :values are present.',
+    'multiple_of' => 'The :attribute field must be a multiple of :value.',
+    'not_in' => 'O :attribute selecionado é inválido.',
+    'not_regex' => 'The :attribute field format is invalid.',
+    'numeric' => 'The :attribute field must be a number.',
+    'password' => [
+        'letters' => 'The :attribute field must contain at least one letter.',
+        'mixed' => 'The :attribute field must contain at least one uppercase and one lowercase letter.',
+        'numbers' => 'The :attribute field must contain at least one number.',
+        'symbols' => 'The :attribute field must contain at least one symbol.',
+        'uncompromised' => 'The given :attribute has appeared in a data leak. Please choose a different :attribute.',
+    ],
+    'percent'       => 'A depreciação mínima deve estar entre 0 e 100 quando o tipo de depreciação for percentual.',
 
-    'not_in'               => 'O :attribute selecionado é inválido.',
-    'numeric'              => 'O :attribute deve ser um número.',
-    'present'              => 'O campo:attribute deve estar presente.',
-    'valid_regex'          => 'Isso não é uma regex válida. ',
-    'regex'                => 'O formato de :attribute é inválido.',
-    'required'             => 'O campo de :attribute é requerido.',
-    'required_if'          => 'O campo de :attribute é requerido quando :other é :value.',
-    'required_unless'      => 'O campo:attribute é obrigatório a não ser que: :other estiver em : :values.',
-    'required_with'        => 'O campo de :attribute é requerido quando :values está presente.',
-    'required_with_all'    => 'O campo :attribute é obrigatorio quando : :values está presente.',
-    'required_without'     => 'O campo de :attribute é requerido quando :values não está presente.',
+    'present' => 'O campo:attribute deve estar presente.',
+    'present_if' => 'The :attribute field must be present when :other is :value.',
+    'present_unless' => 'The :attribute field must be present unless :other is :value.',
+    'present_with' => 'The :attribute field must be present when :values is present.',
+    'present_with_all' => 'The :attribute field must be present when :values are present.',
+    'prohibited' => 'The :attribute field is prohibited.',
+    'prohibited_if' => 'The :attribute field is prohibited when :other is :value.',
+    'prohibited_unless' => 'The :attribute field is prohibited unless :other is in :values.',
+    'prohibits' => 'The :attribute field prohibits :other from being present.',
+    'regex' => 'The :attribute field format is invalid.',
+    'required' => 'O campo de :attribute é requerido.',
+    'required_array_keys' => 'The :attribute field must contain entries for: :values.',
+    'required_if' => 'O campo de :attribute é requerido quando :other é :value.',
+    'required_if_accepted' => 'The :attribute field is required when :other is accepted.',
+    'required_if_declined' => 'The :attribute field is required when :other is declined.',
+    'required_unless' => 'O campo:attribute é obrigatório a não ser que: :other estiver em : :values.',
+    'required_with' => 'O campo de :attribute é requerido quando :values está presente.',
+    'required_with_all' => 'The :attribute field is required when :values are present.',
+    'required_without' => 'O campo de :attribute é requerido quando :values não está presente.',
     'required_without_all' => 'O campo :attribute é obrigatório nenhum dos :values está presente.',
-    'same'                 => 'O :attribute e :other devem corresponderem.',
-    'size'                 => [
-        'numeric' => 'O :attribute deve ser :size.',
-        'file'    => 'O :attribute deve ter :size kilobytes.',
-        'string'  => 'O :attribute deve ter :size caracteres.',
-        'array'   => 'O :attribute deve conter :size items.',
+    'same' => 'The :attribute field must match :other.',
+    'size' => [
+        'array' => 'The :attribute field must contain :size items.',
+        'file' => 'The :attribute field must be :size kilobytes.',
+        'numeric' => 'The :attribute field must be :size.',
+        'string' => 'The :attribute field must be :size characters.',
     ],
+    'starts_with' => 'The :attribute field must start with one of the following: :values.',
     'string'               => 'O :attribute deve ser string.',
-    'timezone'             => 'O :attribute deve ser um campo válido.',
     'two_column_unique_undeleted' => 'O :attribute deve ser único entre :table1 e :table2. ',
-    'unique'               => 'O :attribute já foi tomado.',
-    'uploaded'             => 'O :attribute falhou no upload.',
-    'url'                  => 'O formato de :attribute é inválido.',
     'unique_undeleted'     => 'O :attribute deve ser único.',
     'non_circular'         => 'O :attribute não pode criar uma referência circular.',
     'not_array'            => ':attribute não pode ser um array.',
@@ -102,11 +165,14 @@ return [
     'numbers'              => 'A senha deve conter pelo menos um número.',
     'case_diff'            => 'A senha deve conter letras maiúsculas e minusculas.',
     'symbols'              => 'A senha deve conter símbolos.',
-    'gte'                  => [
-        'numeric'          => 'Valor não pode ser negativo'
-    ],
-    'checkboxes'           => ':attribute contém opções inválidas.',
-    'radio_buttons'        => ':attribute é inválido.',
+    'timezone' => 'The :attribute field must be a valid timezone.',
+    'unique' => 'O :attribute já foi tomado.',
+    'uploaded' => 'O :attribute falhou no upload.',
+    'uppercase' => 'The :attribute field must be uppercase.',
+    'url' => 'O campo :attribute deve ser uma URL válida.',
+    'ulid' => 'The :attribute field must be a valid ULID.',
+    'uuid' => 'The :attribute field must be a valid UUID.',
+    'fmcs_location' => 'Full multiple company support and location scoping is enabled in the Admin Settings, and the selected location and selected company are not compatible.',
 
 
     /*
@@ -120,16 +186,22 @@ return [
     |
     */
 
+    'email_array'      => 'Um ou mais e-mails sõ invalidos.',
+    'checkboxes'           => ':attribute contém opções inválidas.',
+    'radio_buttons'        => ':attribute é inválido.',
+    
     'custom' => [
         'alpha_space' => 'O campo :attribute contém um caractere que não é permitido.',
-        'email_array'      => 'Um ou mais e-mails sõ invalidos.',
+
         'hashed_pass'      => 'Sua senha atual está incorreta',
         'dumbpwd'          => 'Essa senha é muito comum.',
-        'statuslabel_type' => 'Você deve selecionar um tipo de etiqueta de status válido',
+        'statuslabel_type' => 'Você deve selecionar um tipo de etiqueta de situação válida',
+        'custom_field_not_found'          => 'Este campo parece não existir, verifique novamente os nomes dos seus campos personalizados.',
+        'custom_field_not_found_on_model' => 'This field seems to exist, but is not available on this Asset Model\'s fieldset.',
 
         // date_format validation with slightly less stupid messages. It duplicates a lot, but it gets the job done :(
-        // We use this because the default error message for date_format is reflects php Y-m-d, which non-PHP
-        // people won't know how to format. 
+        // We use this because the default error message for date_format reflects php Y-m-d, which non-PHP
+        // people won't know how to format.
         'purchase_date.date_format'     => 'O :attribute deve ser uma data válida em formato DD-MM-YYYY',
         'last_audit_date.date_format'   =>  'O :attribute deve ser uma data válida em formato DD-MM-YYYY hh:mm:ss',
         'expiration_date.date_format'   =>  'O :attribute deve ser uma data válida em formato DD-MM-YYYY',
@@ -137,9 +209,15 @@ return [
         'expected_checkin.date_format'  =>  'O :attribute deve ser uma data válida em formato DD-MM-YYYY',
         'start_date.date_format'        =>  'O :attribute deve ser uma data válida em formato DD-MM-YYYY',
         'end_date.date_format'          =>  'O :attribute deve ser uma data válida em formato DD-MM-YYYY',
+        'invalid_value_in_field' => 'Valor inválido incluído neste campo',
 
-    ],
+        'ldap_username_field' => [
+            'not_in' =>         '<code>sAMAccountName</code> (mixed case) will likely not work. You should use <code>samaccountname</code> (lowercase) instead.'
+        ],
+        'ldap_auth_filter_query' => ['not_in' => '<code>uid=samaccountname</code> is probably not a valid auth filter. You probably want <code>uid=</code> '],
+        'ldap_filter' => ['regex' => 'This value should probably not be wrapped in parentheses.'],
 
+        ],
     /*
     |--------------------------------------------------------------------------
     | Custom Validation Attributes
@@ -155,8 +233,16 @@ return [
 
     /*
     |--------------------------------------------------------------------------
-    | Generic Validation Messages
+    | Generic Validation Messages - we use these in the jquery validation where we don't have
+    | access to the :attribute
     |--------------------------------------------------------------------------
     */
-    'invalid_value_in_field' => 'Valor inválido incluído neste campo',
+
+    'generic' => [
+        'invalid_value_in_field' => 'Valor inválido incluído neste campo',
+        'required' => 'Este campo é obrigatório',
+        'email' => 'Please enter a valid email address',
+    ],
+
+
 ];
diff --git a/resources/lang/pt-PT/account/general.php b/resources/lang/pt-PT/account/general.php
index 9edf9bb3e5..76fd62bad3 100644
--- a/resources/lang/pt-PT/account/general.php
+++ b/resources/lang/pt-PT/account/general.php
@@ -2,10 +2,16 @@
 
 return array(
     'personal_api_keys' => 'Chaves Pessoais de API',
+    'personal_access_token' => 'Personal Access Token',
+    'personal_api_keys_success' => 'Personal API Key :key created sucessfully',
+    'here_is_api_key' => 'Here is your new personal access token. This is the only time it will be shown so do not lose it! You may now use this token to make API requests.',
     'api_key_warning' => 'When generating an API token, be sure to copy it down immediately as they will not be visible to you again.',
     'api_base_url' => 'O URL base da API está localizada em:',
     'api_base_url_endpoint' => '/&lt;endpoint&gt;',
     'api_token_expiration_time' => 'Tokens de API estão definidos para expirar em:',
     'api_reference' => 'Please check the <a href="https://snipe-it.readme.io/reference" target="_blank">API reference</a> to find specific API endpoints and additional API documentation.',
     'profile_updated' => 'Account successfully updated',
+    'no_tokens' => 'You have not created any personal access tokens.',
+    'enable_sounds' => 'Enable sound effects',
+    'enable_confetti' => 'Enable confetti effects',
 );
diff --git a/resources/lang/pt-PT/admin/accessories/message.php b/resources/lang/pt-PT/admin/accessories/message.php
index 23fd1ab8ca..9d8a673010 100644
--- a/resources/lang/pt-PT/admin/accessories/message.php
+++ b/resources/lang/pt-PT/admin/accessories/message.php
@@ -26,7 +26,11 @@ return array(
         'error'   		=> 'O acessório não foi alocado. Por favor, tente novamente',
         'success' 		=> 'Acessório alocado com sucesso.',
         'unavailable'   => 'O acessório não está disponível para check-out. Verifique a quantidade disponível',
-        'user_does_not_exist' => 'O utilizador é inválido. Por favor, tente novamente.'
+        'user_does_not_exist' => 'O utilizador é inválido. Por favor, tente novamente.',
+         'checkout_qty' => array(
+            'lte'  => 'Atualmente há apenas um acessório disponível deste tipo, e você está tentando conferir :checkout_qty. Por favor, ajuste a quantidade do check-out ou o estoque total deste acessório e tente novamente. Existem :number_currently_remaining total accessoris disponíveis, e você está tentando conferir :checkout_qty. Por favor, ajuste a quantidade do check-out ou o estoque total deste acessório e tente novamente.',
+            ),
+           
     ),
 
     'checkin' => array(
diff --git a/resources/lang/pt-PT/admin/accessories/table.php b/resources/lang/pt-PT/admin/accessories/table.php
index 21c79f2369..131bc8ae22 100644
--- a/resources/lang/pt-PT/admin/accessories/table.php
+++ b/resources/lang/pt-PT/admin/accessories/table.php
@@ -6,6 +6,4 @@ return array(
     'id'      					=> 'ID',
     'require_acceptance'      	=> 'Aceitação',
     'title'      				=> 'Nome do Acessório',
-
-
 );
diff --git a/resources/lang/pt-PT/admin/components/message.php b/resources/lang/pt-PT/admin/components/message.php
index 24bbf9e453..722dbc3c6e 100644
--- a/resources/lang/pt-PT/admin/components/message.php
+++ b/resources/lang/pt-PT/admin/components/message.php
@@ -17,7 +17,8 @@ return array(
     'delete' => array(
         'confirm'   => 'Tem a certeza que deseja eliminar este componente?',
         'error'   => 'Existe um problema ao eliminar o componente. Por favor tente de novo.',
-        'success' => 'O componente foi eliminado com sucesso.'
+        'success' => 'O componente foi eliminado com sucesso.',
+        'error_qty'   => 'Some components of this type are still checked out. Please check them in and try again.',
     ),
 
      'checkout' => array(
diff --git a/resources/lang/pt-PT/admin/consumables/general.php b/resources/lang/pt-PT/admin/consumables/general.php
index 5964fd5440..4e96bca10b 100644
--- a/resources/lang/pt-PT/admin/consumables/general.php
+++ b/resources/lang/pt-PT/admin/consumables/general.php
@@ -8,4 +8,5 @@ return array(
     'remaining' 			            => 'Restantes',
     'total' 			                => 'Total',
     'update'                            => 'Atualizar consumível',
+    'inventory_warning'                 => 'O inventário deste consumível está abaixo da quantidade mínima de :min_count',
 );
diff --git a/resources/lang/pt-PT/admin/consumables/message.php b/resources/lang/pt-PT/admin/consumables/message.php
index 376fe62d73..d0e9a09088 100644
--- a/resources/lang/pt-PT/admin/consumables/message.php
+++ b/resources/lang/pt-PT/admin/consumables/message.php
@@ -2,6 +2,7 @@
 
 return array(
 
+    'invalid_category_type' => 'A categoria deve ser uma categoria de consumo.',
     'does_not_exist' => 'O consumível não existe.',
 
     'create' => array(
diff --git a/resources/lang/pt-PT/admin/custom_fields/general.php b/resources/lang/pt-PT/admin/custom_fields/general.php
index 813f86e1d4..7312b23b72 100644
--- a/resources/lang/pt-PT/admin/custom_fields/general.php
+++ b/resources/lang/pt-PT/admin/custom_fields/general.php
@@ -36,7 +36,7 @@ return [
     'create_field_title' => 'Criar um novo campo personalizado',
     'value_encrypted'      	        => 'O valor deste campo está encriptado na base de dados. apenas administradores poderão ver o valor desencriptado',
     'show_in_email'     => 'Incluir o valor deste campo nos e-mails de checktout enviados ao utilizador? Os campos encriptados não serão incluídos',
-    'show_in_email_short'     => 'Incluir nos e-mails.',
+    'show_in_email_short' => 'Incluir nos e-mails',
     'help_text' => 'Texto de Ajuda',
     'help_text_description' => 'Este é um texto opcional que irá aparecer abaixo dos elementos de formulário ao editar um ativo para fornecer o contexto no campo.',
     'about_custom_fields_title' => 'Sobre os campos personalizados',
@@ -58,5 +58,8 @@ return [
     'show_in_requestable_list_short' => 'Mostrar na lista de mídias solicitáveis',
     'show_in_requestable_list' => 'Mostrar valor na lista de ativos solicitáveis. Campos criptografados não serão exibidos',
     'encrypted_options' => 'Este campo está criptografado, então algumas opções de exibição não estarão disponíveis.',
+    'display_checkin' => 'Display in checkin forms',
+    'display_checkout' => 'Display in checkout forms',
+    'display_audit' => 'Display in audit forms',
 
 ];
diff --git a/resources/lang/pt-PT/admin/custom_fields/message.php b/resources/lang/pt-PT/admin/custom_fields/message.php
index 4aab9819e0..078b7273ab 100644
--- a/resources/lang/pt-PT/admin/custom_fields/message.php
+++ b/resources/lang/pt-PT/admin/custom_fields/message.php
@@ -5,6 +5,7 @@ return array(
     'field' => array(
         'invalid'   => 'Esse campo não existe.',
         'already_added'   => 'Campo já adicionado',
+        'none_selected'   => 'Nenhum campo selecionado',
 
         'create' => array(
             'error'   => 'Campo não criado. Por favor tente novamente.',
diff --git a/resources/lang/pt-PT/admin/depreciations/general.php b/resources/lang/pt-PT/admin/depreciations/general.php
index 96218e2342..2e57a8e052 100644
--- a/resources/lang/pt-PT/admin/depreciations/general.php
+++ b/resources/lang/pt-PT/admin/depreciations/general.php
@@ -13,4 +13,8 @@ return [
     'no_depreciations_warning'               => '<strong>Aviso: </strong>
                       Não tem atualmente nenhuma depreciação configurada.
                       Por favor, defina pelo menos uma depreciação para visualizar o relatório de depreciação.',
+    'depreciation_method'                   => 'Relatório de Depreciação',
+    'linear_depreciation'                   => 'Linear (Default)',
+    'half_1'                                => 'Half-year convention, always applied',
+    'half_2'                                => 'Half-year convention, applied with condition',
 ];
diff --git a/resources/lang/pt-PT/admin/hardware/form.php b/resources/lang/pt-PT/admin/hardware/form.php
index 567134f885..1fd804fcca 100644
--- a/resources/lang/pt-PT/admin/hardware/form.php
+++ b/resources/lang/pt-PT/admin/hardware/form.php
@@ -39,7 +39,7 @@ return [
     'order'				=> 'Nº de encomenda',
     'qr'				=> 'Código QR',
     'requestable'		=> 'Utilizadores podem solicitar este ativo',
-    'redirect_to_all'   => 'Return to all :type',
+    'redirect_to_all'   => 'Retornar para :type',
     'redirect_to_type'   => 'Go to :type',
     'redirect_to_checked_out_to'   => 'Go to Checked Out to',
     'select_statustype'	=> 'Selecionar Estado',
@@ -55,8 +55,11 @@ return [
     'asset_location_update_default' => 'Atualizar apenas a localização por defeito',
     'asset_location_update_actual' => 'Atualizar apenas a localização atual',
     'asset_not_deployable' => 'Este estado de artigo não é implementável. Este artigo não pode ser verificado.',
-    'asset_deployable' => 'Este estado é implementável. Este ativo pode ser entregue.',
+    'asset_not_deployable_checkin' => 'That asset status is not deployable. Using this status label will checkin the asset.',
+    'asset_deployable' => 'This asset can be checked out.',
     'processing_spinner' => 'A processar... (Isto pode levar algum tempo em ficheiros grandes)',
+    'processing' => 'A processar... ',
     'optional_infos'  => 'Informação opcional',
-    'order_details'   => 'Informação de estado da encomenda'
+    'order_details'   => 'Informação de estado da encomenda',
+    'calc_eol'    => 'If nulling the EOL date, use automatic EOL calculation based on the purchase date and EOL rate.',
 ];
diff --git a/resources/lang/pt-PT/admin/hardware/general.php b/resources/lang/pt-PT/admin/hardware/general.php
index eea1873af9..7128d0fec7 100644
--- a/resources/lang/pt-PT/admin/hardware/general.php
+++ b/resources/lang/pt-PT/admin/hardware/general.php
@@ -5,8 +5,8 @@ return [
     'about_assets_text'            => 'Artigos são itens seguidos por números de serie ou "asset tags". Eles tendem a ser itens de maior valor, onde a identificação de um item específico importa.',
     'archived'  				=> 'Arquivado',
     'asset'  					=> 'Ativo',
-    'bulk_checkout'             => 'Artigos em checktout',
-    'bulk_checkin'              => 'Receber Artigos',
+    'bulk_checkout'             => 'Saída em massa',
+    'bulk_checkin'              => 'Bulk Checkin',
     'checkin'  					=> 'Devolver Ativo',
     'checkout'  				=> 'Ativo de compras',
     'clone'  					=> 'Clonar Ativo',
@@ -15,7 +15,7 @@ return [
     'delete_confirm'            => 'Tem a certeza de que pretende eliminar este equipamento?',
     'edit'  					=> 'Editar artigo',
     'model_deleted'  			=> 'Este modelo de artigo foi excluído. Deve restaurar o modelo antes de restaurar o artigo.',
-    'model_invalid'             => 'This model for this asset is invalid.',
+    'model_invalid'             => 'O modelo deste artigo é inválido.',
     'model_invalid_fix'         => 'The asset must be updated use a valid asset model before attempting to check it in or out, or to audit it.',
     'requestable'               => 'Solicitavel',
     'requested'				    => 'Requisitado',
@@ -27,8 +27,7 @@ return [
     'undeployable_tooltip'  	=> 'Este artigo possui uma etiqueta de estado que não é implantável e não pode ser entregue no momento.',
     'view'  					=> 'Ver Artigo',
     'csv_error' => 'Tem um erro no ficheiro CSV:',
-    'import_text' => '<p>Upload de um CSV que contém o histórico de ativos. Os ativos e usuários já existem no sistema, ou serão ignorados. Correspondência de mídias para o histórico de importação acontece com a tag de conteúdo. Tentaremos encontrar um usuário correspondente com base no nome de usuário que você fornece, e nos critérios que você selecionar abaixo. Se você não selecionar nenhum critério abaixo, ele simplesmente tentará combinar com o formato de nome de usuário configurado na <code>Administração &gt; Configurações Gerais</code>.</p><p>Campos incluídos no CSV devem corresponder aos cabeçalhos: <strong>Marcador de Ativo, Nome, Data de Finalização, Data de Entrada</strong>. Quaisquer campos adicionais serão ignorados. </p><p>Data de check-in: em branco ou em datas futuras de check-in fará check-in dos itens para o usuário associado. Excluindo a coluna Data de check-in criará uma data de check-in com a data de hoje.</p>
-    ',
+    'import_text' => '<p>Upload a CSV that contains asset history. The assets and users MUST already exist in the system, or they will be skipped. Matching assets for history import happens against the asset tag. We will try to find a matching user based on the user\'s name you provide, and the criteria you select below. If you do not select any criteria below, it will simply try to match on the username format you configured in the <code>Admin &gt; General Settings</code>.</p><p>Fields included in the CSV must match the headers: <strong>Asset Tag, Name, Checkout Date, Checkin Date</strong>. Any additional fields will be ignored. </p><p>Checkin Date: blank or future checkin dates will checkout items to associated user.  Excluding the Checkin Date column will create a checkin date with todays date.</p>    ',
     'csv_import_match_f-l' => 'Tente corresponder aos usuários por <strong>firstname.lastname</strong> (<code>jane.smith</code>) formato',
     'csv_import_match_initial_last' => 'Tente coincidir com os usuários do formato <strong>primeiro sobrenome</strong> (<code>jsmith</code>)',
     'csv_import_match_first' => 'Tente corresponder aos usuários pelo formato <strong>primeiro nome</strong> (<code>jane</code>)',
diff --git a/resources/lang/pt-PT/admin/hardware/message.php b/resources/lang/pt-PT/admin/hardware/message.php
index 4bff840076..75b5370bef 100644
--- a/resources/lang/pt-PT/admin/hardware/message.php
+++ b/resources/lang/pt-PT/admin/hardware/message.php
@@ -2,19 +2,23 @@
 
 return [
 
-    'undeployable' 		=> '<strong>Aviso: </strong> Este artigo foi assinalado como "não implementável".
-                        Se este estado mudou, por favor atualize o estado do artigo.',
-    'does_not_exist' 	=> 'Artigo não existente.',
-    'does_not_exist_var'=> 'Asset with tag :asset_tag not found.',
-    'no_tag' 	        => 'No asset tag provided.',
+    'undeployable' 		 => '<strong>Aviso: </strong> Este artigo foi assinalado como "não implementável". Se este estado mudou, por favor atualize o estado do artigo.',
+    'does_not_exist' 	 => 'Artigo não existente.',
+    'does_not_exist_var' => 'Ativo com a tag :asset_tag não encontrado.',
+    'no_tag' 	         => 'No asset tag provided.',
     'does_not_exist_or_not_requestable' => 'Esse artigo não existe ou não é solicitável.',
-    'assoc_users'	 	=> 'Este artigo está correntemente alocado a um utilizador e não pode ser removido. Por favor devolva o artigo e de seguida tente remover novamente. ',
+    'assoc_users'	 	 => 'Este artigo está correntemente alocado a um utilizador e não pode ser removido. Por favor devolva o artigo e de seguida tente remover novamente. ',
     'warning_audit_date_mismatch' 	=> 'This asset\'s next audit date (:next_audit_date) is before the last audit date (:last_audit_date). Please update the next audit date.',
+    'labels_generated'   => 'Labels were successfully generated.',
+    'error_generating_labels' => 'Error while generating labels.',
+    'no_assets_selected' => 'No assets selected.',
 
     'create' => [
         'error'   		=> 'Não foi possível criar o Artigo. Por favor, tente novamente. :(',
         'success' 		=> 'Artigo criado com sucesso. :)',
         'success_linked' => 'O ativo com a tag :tag foi criado com sucesso. <strong><a href=":link" style="color: white;">clique aqui para ver</a></strong>.',
+        'multi_success_linked' => 'Asset with tag :links was created successfully.|:count assets were created succesfully. :links.',
+        'partial_failure' => 'An asset was unable to be created. Reason: :failures|:count assets were unable to be created. Reasons: :failures',
     ],
 
     'update' => [
@@ -52,20 +56,24 @@ return [
     ],
 
     'import' => [
+        'import_button'         => 'Process Import',
         'error'                 => 'Alguns itens não foram importados corretamente.',
         'errorDetail'           => 'Os seguintes itens não foram importados devido a erros.',
         'success'               => 'O seu ficheiro foi importado',
         'file_delete_success'   => 'Ficheiro eliminado com sucesso',
         'file_delete_error'      => 'Não foi possível eliminar o ficheiro',
         'file_missing' => 'Ficheiro selecionado está a faltar',
+        'file_already_deleted' => 'The file selected was already deleted',
         'header_row_has_malformed_characters' => 'Um ou mais atributos na linha do cabeçalho contém caracteres UTF-8 mal formados',
         'content_row_has_malformed_characters' => 'Um ou mais atributos na primeira linha de conteúdo contém caracteres UTF-8 mal formados',
+        'transliterate_failure' => 'Transliteration from :encoding to UTF-8 failed due to invalid characters in input'
     ],
 
 
     'delete' => [
         'confirm'   	=> 'Tem a certeza de que pretende eliminar este artigo?',
         'error'   		=> 'Ocorreu um problema ao remover o artigo. Por favor, tente novamente.',
+        'assigned_to_error' => '{1}Asset Tag: :asset_tag is currently checked out. Check in this device before deletion.|[2,*]Asset Tags: :asset_tag are currently checked out. Check in these devices before deletion.',
         'nothing_updated'   => 'Nenhum recurso foi selecionado, então nada foi excluído.',
         'success' 		=> 'O artigo foi removido com sucesso.',
     ],
@@ -78,6 +86,11 @@ return [
         'no_assets_selected' => 'Deve escolher pelo menos um artigo da lista',
     ],
 
+    'multi-checkout' => [
+        'error'   => 'Asset was not checked out, please try again|Assets were not checked out, please try again',
+        'success' => 'Asset checked out successfully.|Assets checked out successfully.',
+    ],
+
     'checkin' => [
         'error'   		=> 'Não foi possível devolver o artigo, por favor tente novamente',
         'success' 		=> 'Artigo devolvido com sucesso.',
@@ -87,9 +100,10 @@ return [
     ],
 
     'requests' => [
-        'error'   		=> 'Ativo não foi solicitado, por favor tente novamente',
-        'success' 		=> 'Ativo solicitado com sucesso.',
-        'canceled'      => 'Requisição cancelado com sucesso',
+        'error'   		=> 'Request was not successful, please try again.',
+        'success' 		=> 'Request successfully submitted.',
+        'canceled'      => 'Request successfully canceled.',
+        'cancel'        => 'Cancelar solicitação deste artigo',
     ],
 
 ];
diff --git a/resources/lang/pt-PT/admin/hardware/table.php b/resources/lang/pt-PT/admin/hardware/table.php
index 2b510fd788..22e3dd033e 100644
--- a/resources/lang/pt-PT/admin/hardware/table.php
+++ b/resources/lang/pt-PT/admin/hardware/table.php
@@ -25,7 +25,6 @@ return [
     'image'		    => 'Imagem do equipamento',
     'days_without_acceptance' => 'Dias sem aceitação',
     'monthly_depreciation' => 'Depreciação Mensal',
-    'assigned_to'    => 'Atribuído a',
     'requesting_user' => 'Utilizador que solicitou',
     'requested_date' => 'Data de solicitação',
     'changed'       => 'Modificado',
diff --git a/resources/lang/pt-PT/admin/kits/general.php b/resources/lang/pt-PT/admin/kits/general.php
index 5551bb3c3d..e5b5b6fce1 100644
--- a/resources/lang/pt-PT/admin/kits/general.php
+++ b/resources/lang/pt-PT/admin/kits/general.php
@@ -47,4 +47,5 @@ return [
     'kit_deleted'                       => 'Kit foi apagado com sucesso',
     'kit_model_updated'                 => 'Modelo foi atualizado com sucesso',
     'kit_model_detached'                => 'Modelo foi separado com sucesso',
+    'model_already_attached'            => 'Model already attached to kit',
 ];
diff --git a/resources/lang/pt-PT/admin/licenses/general.php b/resources/lang/pt-PT/admin/licenses/general.php
index bdbac32065..2d1df2ef41 100644
--- a/resources/lang/pt-PT/admin/licenses/general.php
+++ b/resources/lang/pt-PT/admin/licenses/general.php
@@ -14,6 +14,7 @@ return array(
     'info'  					=> 'Informação de Licença',
     'license_seats'  			=> 'Instalações da Licença',
     'seat'  					=> 'Instalação',
+    'seat_count'  				=> 'Seat :count',
     'seats'  					=> 'Instalações',
     'software_licenses'  		=> 'Licenças de Software',
     'user'  					=> 'Utilizador',
@@ -23,12 +24,12 @@ return array(
         [
             'checkin_all'           => [
                 'button'            => 'Receber todos os lugares',
-                'modal'             => 'Esta ação irá realizar a verificação de um único lugar. | Esta ação verificará todos os :checkedout_seats_count lugares para esta licença.',
+                'modal'             => 'This action will checkin one seat. | This action will checkin all :checkedout_seats_count seats for this license.',
                 'enabled_tooltip'   => 'Entrega de TODOS os lugares para esta licença de utilizadores e ativos',
                 'disabled_tooltip'  => 'Isto está desativado porque não há lugares recebidos no momento',
                 'disabled_tooltip_reassignable'  => 'Isso está desativado porque a licença não é reatribuível',
                 'success'           => 'Licença entregue com sucesso! Todas as licenças foram entregues com sucesso!',
-                'log_msg'           => 'Entrega feita através da entrega em massa da licença',
+                'log_msg'           => 'Checked in via bulk license checkin in license GUI',
             ],
 
             'checkout_all'              => [
diff --git a/resources/lang/pt-PT/admin/licenses/message.php b/resources/lang/pt-PT/admin/licenses/message.php
index e5d8230ce9..fc300b24f0 100644
--- a/resources/lang/pt-PT/admin/licenses/message.php
+++ b/resources/lang/pt-PT/admin/licenses/message.php
@@ -44,10 +44,13 @@ return array(
         'error'   => 'Ocorreu um problema ao atribuir esta licença. Por favor, tente novamente.',
         'success' => 'A licença foi alocada com sucesso',
         'not_enough_seats' => 'Não há assentos de licença suficientes disponíveis para o pagamento',
+        'mismatch' => 'The license seat provided does not match the license',
+        'unavailable' => 'This seat is not available for checkout.',
     ),
 
     'checkin' => array(
         'error'   => 'Ocorreu um problema ao devolver esta licença. Por favor, tente novamente.',
+        'not_reassignable' => 'License not reassignable',
         'success' => 'A licença foi devolvida com sucesso'
     ),
 
diff --git a/resources/lang/pt-PT/admin/locations/message.php b/resources/lang/pt-PT/admin/locations/message.php
index eb175ed8b4..b70f42e56b 100644
--- a/resources/lang/pt-PT/admin/locations/message.php
+++ b/resources/lang/pt-PT/admin/locations/message.php
@@ -3,11 +3,12 @@
 return array(
 
     'does_not_exist' => 'Localização não existe.',
-    'assoc_users'    => 'This location is not currently deletable because it is the location of record for at least one asset or user, has assets assigned to it, or is the parent location of another location. Please update your models to no longer reference this company and try again. ',
+    'assoc_users'    => 'This location is not currently deletable because it is the location of record for at least one asset or user, has assets assigned to it, or is the parent location of another location. Please update your records to no longer reference this location and try again ',
     'assoc_assets'	 => 'Esta localização está atualmente associada com pelo menos um artigo e não pode ser removida. Atualize este artigos de modo a não referenciarem mais este local e tente novamente. ',
     'assoc_child_loc'	 => 'Esta localização contém pelo menos uma sub-localização e não pode ser removida. Por favor, atualize as localizações para não referenciarem mais esta localização e tente novamente. ',
     'assigned_assets' => 'Artigos atribuídos',
     'current_location' => 'Localização atual',
+    'open_map' => 'Open in :map_provider_icon Maps',
 
 
     'create' => array(
@@ -20,6 +21,11 @@ return array(
         'success' => 'Localização atualizada com sucesso.'
     ),
 
+    'restore' => array(
+        'error'   => 'Location was not restored, please try again',
+        'success' => 'Location restored successfully.'
+    ),
+
     'delete' => array(
         'confirm'   	=> 'Tem a certeza que pretende remover esta localização?',
         'error'   => 'Ocorreu um problema ao remover esta localização. Por favor, tente novamente.',
diff --git a/resources/lang/pt-PT/admin/locations/table.php b/resources/lang/pt-PT/admin/locations/table.php
index 127394ed37..2b22beb865 100644
--- a/resources/lang/pt-PT/admin/locations/table.php
+++ b/resources/lang/pt-PT/admin/locations/table.php
@@ -39,4 +39,5 @@ return [
     'signed_by_finance_auditor' => 'Assinado por (Auditor Financeiro):',
     'signed_by_location_manager' => 'Assinado por (Gestor de Localização):',
     'signed_by'                 => 'Assinado por:',
+    'clone'  					=> 'Clone Location',
 ];
diff --git a/resources/lang/pt-PT/admin/models/general.php b/resources/lang/pt-PT/admin/models/general.php
index 0f2f0789e0..1b2ee600e4 100644
--- a/resources/lang/pt-PT/admin/models/general.php
+++ b/resources/lang/pt-PT/admin/models/general.php
@@ -3,7 +3,7 @@
 return array(
     'about_models_title'     => 'Sobre os modelos dos artigos',
     'about_models_text'           => 'Os Modelos dos artigos são uma maneira para agrupar artigos idênticos. "MBP 2013", "IPhone 6s", etc.',
-    'deleted'  					        => 'Este modelo foi apagado.',
+    'deleted'  					=> 'Este modelo foi apagado.',
     'bulk_delete'               => 'Eliminar modelos de artigos em massa',
     'bulk_delete_help'               => 'Use as caixas de selecção abaixo para confirmar a eliminação dos modelos de artigos selecionados. Modelos de artigos que contenham artigos associados não serão eliminados até que estes artigos sejam associados a um modelo diferente.',
     'bulk_delete_warn'          => 'Está prestes a excluir um modelo de artigo.|Está prestes a apagar :model_count modelo de artigos.',
diff --git a/resources/lang/pt-PT/admin/models/message.php b/resources/lang/pt-PT/admin/models/message.php
index c0a85ba02b..b89f20a680 100644
--- a/resources/lang/pt-PT/admin/models/message.php
+++ b/resources/lang/pt-PT/admin/models/message.php
@@ -7,7 +7,7 @@ return array(
     'no_association' => 'AVISO! O modelo de artigo para este item é inválido ou está em falta!',
     'no_association_fix' => 'Isto estragará as coisas de maneiras estranhas e horríveis. Edite este artigo agora para lhe atribuir um modelo.',
     'assoc_users'	 => 'Este modelo está atualmente associado com pelo menos um artigo e não pode ser removido. Por favor, remova os artigos e depois tente novamente. ',
-
+    'invalid_category_type' => 'This category must be an asset category.',
 
     'create' => array(
         'error'   => 'O Modelo não foi criado. Por favor tente novamente.',
diff --git a/resources/lang/pt-PT/admin/reports/general.php b/resources/lang/pt-PT/admin/reports/general.php
index ad54c97503..ea82e62c93 100644
--- a/resources/lang/pt-PT/admin/reports/general.php
+++ b/resources/lang/pt-PT/admin/reports/general.php
@@ -4,6 +4,7 @@ return [
     'info'   => 'Selecione as opções que pretende para o seu relatório de artigos.',
     'deleted_user' => 'Utilizador apagado',
     'send_reminder' => 'Enviar Lembrete',
+    'cannot_send_reminder' => 'User has been deleted or does not have an email address so cannot receive a reminder',
     'reminder_sent' => 'Lembrete enviado',
     'acceptance_deleted' => 'Pedido de aceitação apagado',
     'acceptance_request' => 'Aceitar Pedido',
@@ -13,5 +14,10 @@ return [
         'user_state' => 'Estado do Usuário',
         'user_country' => 'País do usuário',
         'user_zip' => 'CEP do Usuário'
-    ]
-];
\ No newline at end of file
+    ],
+    'open_saved_template' => 'Open Saved Template',
+    'save_template' =>  'Save Template',
+    'select_a_template' => 'Select a Template',
+    'template_name' => 'Template Name',
+    'update_template' => 'Update Template',
+];
diff --git a/resources/lang/pt-PT/admin/reports/message.php b/resources/lang/pt-PT/admin/reports/message.php
index 9c0c9518c8..2800bbdf0b 100644
--- a/resources/lang/pt-PT/admin/reports/message.php
+++ b/resources/lang/pt-PT/admin/reports/message.php
@@ -1,5 +1,16 @@
 <?php
 
-return array(
-    'error'   => 'Deve selecionar pelo menos UMA opção.'
-);
+return [
+    'about_templates' => 'About Saved Templates',
+    'saving_templates_description' => 'Select your options, then enter the name of your template in the box above and click the \'Save Template\' button. Use the dropdown to select a previously saved template.',
+    'create'  => [
+        'success' => 'Template saved successfully',
+    ],
+    'update' => [
+        'success' => 'Template updated successfully',
+    ],
+    'delete' => [
+        'success' => 'Template deleted',
+        'no_delete_permission' => 'Template does not exist or you do not have permission to delete it.',
+    ],
+];
diff --git a/resources/lang/pt-PT/admin/settings/general.php b/resources/lang/pt-PT/admin/settings/general.php
index 1fa83d6414..6ad9d0be05 100644
--- a/resources/lang/pt-PT/admin/settings/general.php
+++ b/resources/lang/pt-PT/admin/settings/general.php
@@ -8,13 +8,13 @@ return [
     'ad_append_domain'          => 'Acrescentar nome de domínio ao campo de usuário',
     'ad_append_domain_help'     => 'O utilizador não tem que escrever "username@domain.local", pode apenas digitar "username".',
     'admin_cc_email'            => 'E-mail em CC',
-    'admin_cc_email_help'       => 'Se prefere que seja enviada uma cópia do e-mail de checkin/checktout que é enviado aos utilizadores para uma conta de e-mail adicional, introduza o endereço de e-mail aqui. Caso contrário, deixe este campo em branco.',
+    'admin_cc_email_help'       => 'Send a copy of checkin/checkout emails to this address.',
     'admin_settings'            => 'Configurações de administrador',
     'is_ad'				        => 'Isto é um servidor do Active Directoriy',
     'alerts'                	=> 'Alertas',
     'alert_title'               => 'Atualizar configurações de notificação',
     'alert_email'				=> 'Enviar alertas para',
-    'alert_email_help'    => 'Endereços de e-mail ou listas de distribuição para onde deseja que os alertas sejam enviados, separados por vírgula',
+    'alert_email_help'          => 'Endereços de e-mail ou listas de distribuição para onde deseja que os alertas sejam enviados, separados por vírgula.',
     'alerts_enabled'			=> 'Alertas ativos',
     'alert_interval'			=> 'Alertas expiram (em dias)',
     'alert_inv_threshold'		=> 'Alerta limite do inventário',
@@ -31,15 +31,18 @@ return [
     'backups'					=> 'Cópias de segurança',
     'backups_help'              => 'Criar, baixar e restaurar cópias de segurança ',
     'backups_restoring'         => 'Restaurar da cópia de segurança',
+    'backups_clean' => 'Clean the backed-up database before restore',
+    'backups_clean_helptext' => "This can be useful if you're changing between database versions",
     'backups_upload'            => 'Carregar cópia de segurança',
     'backups_path'              => 'As cópia de segurança no servidor são guardadas em <code>:path</code>',
-    'backups_restore_warning'   => 'Use o botão de restaurar <small><span class="btn btn-xs btn-warning"><i class="text-white fas fa-retweet" aria-hidden="true"></i></span></small> para restaurar de uma cópia de segurança anterior. (Isto não funciona actualmente com armazenamento de ficheiro S3 ou Docker)<br><br>A sua <strong>inteira :app_name base de dados e algum ficheiro enviado irá ser apagado</strong> pelo que está no ficheiro da cópia de segurança.  ',
+    'backups_restore_warning'   => 'Use the restore button <small><span class="btn btn-xs btn-warning"><i class="text-white fas fa-retweet" aria-hidden="true"></i></span></small> to restore from a previous backup. (This does not currently work with S3 file storage or Docker.)<br><br>Your <strong>entire :app_name database and any uploaded files will be completely replaced</strong> by what\'s in the backup file  ',
     'backups_logged_out'         => 'Todos os utilizadores existentes, incluindo você, serão desconectados assim que o seu restauro for concluído.',
     'backups_large'             => 'Cópias de segurança muito grandes podem expirar na tentativa de restauro e ainda precisam ser executadas via linha de comando. ',
     'barcode_settings'			=> 'Definições de Código de Barras',
     'confirm_purge'			    => 'Confirmar remoção',
     'confirm_purge_help'		=> 'Digite o texto "DELETE" na caixa abaixo para limpar seus registros excluídos. Essa ação não pode ser desfeita e irá excluir todos os itens e usuários excluídos por soft-delete. (Você deve fazer um backup primeiro, apenas para estar seguro.)',
     'custom_css'				=> 'CSS Personalizado',
+    'custom_css_placeholder'	=> 'Add your custom CSS',
     'custom_css_help'			=> 'Insira o CSS personalizado que deseja utilizar. Não use as tags <style></style>.',
     'custom_forgot_pass_url'	=> 'Endereço de redefinição de palavra-passe personalizado',
     'custom_forgot_pass_url_help'	=> 'Isto substitui o endereço de recuperação de palavra-passe que vem configurado por defeito na página de login, útil para direcionar utilizadores para o serviço de recuperação de palavras-passe da LDAP interna ou alojada. Vai efetivamente desabilitar a funcionalidade de "palavra-passe esquecida" do utilizador local.',
@@ -47,34 +50,34 @@ return [
     'dashboard_message_help'	=> 'Este texto aparecerá no painel de controle, para qualquer utilizador que tenha permissões para ver o painel de controle.',
     'default_currency'  		=> 'Moeda padrão',
     'default_eula_text'			=> 'EULA padrão',
+    'default_eula_text_placeholder' => 'Add your default EULA text',
     'default_language'			=> 'Idioma predefinido',
     'default_eula_help_text'	=> 'Também pode associar EULAs personalizados para categorias de artigos especificas.',
     'acceptance_note'           => 'Add a note for your decision (Optional)',
     'display_asset_name'        => 'Mostrar Nome do Artigo',
     'display_checkout_date'     => 'Mostrar Data de Alocação',
     'display_eol'               => 'Mostrar EOL na tabela',
-    'display_qr'                => 'Mostrar códigos Qr',
+    'display_qr'                => 'Mostrar codigos de barra 2D',
     'display_alt_barcode'		=> 'Mostrar codigos de barra 1D',
-    'email_logo'                => 'Logotipo do e-mail',
     'barcode_type'				=> 'Tipo de código de barras 2D',
     'alt_barcode_type'			=> 'Tipo de código de barras 1D',
-    'email_logo_size'       => 'Logos quadrados no e-mail são os melhores. ',
     'enabled'                   => 'Ativado',
     'eula_settings'				=> 'Definições de EULA',
     'eula_markdown'				=> 'Este EULA permite <a href="https://help.github.com/articles/github-flavored-markdown/">Github flavored markdown</a>.',
+    'empty_row_count'           => 'Field Start Offset (Empty Rows)',
+    'empty_row_count_help'      => 'Fields will begin populating after this many empty rows are skipped at the top of the label.',
     'favicon'                   => 'Ícone de Favoritos',
     'favicon_format'            => 'Os tipos de arquivos aceites são ico, png e gif. Outros formatos de imagem podem não funcionar em todos os navegadores.',
     'favicon_size'          => 'Favicons devem ser imagens quadradas, 16x16 pixels.',
     'footer_text'               => 'Texto de rodapé adicional',
     'footer_text_help'          => 'Este texto aparecerá no lado direito do rodapé. São permitidos o uso de hiperligações, utilizando <a href="https://help.github.com/articles/github-flavored-markdown/">Github flavored markdown</a>. O uso de quebras de linha, cabeçalhos, imagens, etc... podem ter resultados imprevisíveis. ',
+    'footer_text_placeholder'   => 'Optional footer text',
     'general_settings'			=> 'Configurações Gerais',
-    'general_settings_keywords' => 'suporte à empresa, assinatura, aceitação, formato de e-mail, formato de nome de usuário, imagens, por página, miniatura, gravatar, por, painel, privacidade',
     'general_settings_help'     => 'EULA padrão e mais',
     'generate_backup'			=> 'Gerar Backup',
     'google_workspaces'         => 'Espaços do Google',
     'header_color'              => 'Cor do cabeçalho',
     'info'                      => 'Estas configurações permitem costumizar certos aspetos desta instalação.',
-    'label_logo'                => 'Logotipo da etiqueta',
     'label_logo_size'           => 'Logos quadrados ficam melhor - serão exibidos no topo à direita de cada rótulo de artigo. ',
     'laravel'                   => 'Versão do Laravel',
     'ldap'                      => 'LDAP',
@@ -94,7 +97,7 @@ return [
     'ldap_login_sync_help'      => 'Isto apenas testa que a LDAP consegue sincronizar corretamente. Se a sua consulta de autenticação LDAP não estiver correta, os utilizadores poderão ainda não conseguir fazer a autenticação. PRIMEIRO DEVE GRAVAR AS SUAS DEFINIÇÕES ATUALIZADAS DA LDAP.',
     'ldap_manager'              => 'Gestor LDAP',
     'ldap_server'               => 'Servidor LDAP',
-    'ldap_server_help'          => 'Isso deve começar com ldap: / / (para não-criptado ou TLS) ou ldaps: / / (para SSL)',
+    'ldap_server_help'          => 'This should start with ldap:// (for unencrypted) or ldaps:// (for TLS or SSL)',
     'ldap_server_cert'			=> 'Validação certificado SSL LDAP',
     'ldap_server_cert_ignore'	=> 'Permitir certificado SSL inválido',
     'ldap_server_cert_help'		=> 'Seleccione esta opção se está a usar um certificado SSL auto-assinado e desejar aceitar um certificado SSL inválido.',
@@ -108,8 +111,8 @@ return [
     'ldap_pword'                => 'Password bind LDAP',
     'ldap_basedn'               => 'Base bind DN',
     'ldap_filter'               => 'Filtro LDAP',
-    'ldap_pw_sync'              => 'Sincronização de password LDAP',
-    'ldap_pw_sync_help'         => 'Desmarque esta caixa se não deseja guardar as passwords LDAP com passwords locais. Ao desativar esta opção quer dizer que os utilizadores poderão não conseguir fazer login se o seu servidor LDAP não estiver disponível por alguma rasão.',
+    'ldap_pw_sync'              => 'Cache LDAP Passwords',
+    'ldap_pw_sync_help'         => 'Uncheck this box if you do not wish to keep LDAP passwords cached as local hashed passwords. Disabling this means that your users may not be able to login if your LDAP server is unreachable for some reason.',
     'ldap_username_field'       => 'Campo nome de utilizador',
     'ldap_lname_field'          => 'Campo Último nome',
     'ldap_fname_field'          => 'Campo Primeiro nome',
@@ -117,13 +120,15 @@ return [
     'ldap_version'              => 'Versão de LDAP',
     'ldap_active_flag'          => 'Opção LDAP Activo',
     'ldap_activated_flag_help'  => 'Este valor é usado para determinar se um utilizador sincronizado pode fazer login no Snipe-IT. <strong>Não afeta a capacidade de receber ou enregar itens para eles</strong> e deve ser o <strong>nome do atributo</strong> no AD/LDAP, <strong>não o valor</strong >. <br><br>Se este campo for definido como um nome de campo que não existe em seu AD/LDAP, ou o valor no campo AD/LDAP for definido como <code>0</code> ou <code>false </code>, <strong>o login do utilizador será desativado</strong>. Se o valor no campo AD/LDAP for definido como <code>1</code> ou <code>true</code> ou <em>qualquer outro texto</em> significa que o utilizador pode efetuar login. Quando o campo está em branco no seu AD, respeitamos o atributo <code>userAccountControl</code>, que geralmente permite que utilizadores não suspensos façam login.',
+    'ldap_invert_active_flag'   => 'LDAP Invert Active Flag',
+    'ldap_invert_active_flag_help'     => 'If enabled: when the value returned by LDAP Active Flag is <code>0</code> or <code>false</code> the user account will be active.',
     'ldap_emp_num'              => 'Número funcionário LDAP',
     'ldap_email'                => 'Email LDAP',
     'ldap_test'                 => 'Testar LDAP',
     'ldap_test_sync'            => 'Testar Sincronização LDAP',
     'license'                   => 'Licença de software',
-    'load_remote'               => 'Usar Gravatar',
-    'load_remote_help_text'		=> 'Desmarque esta caixa se sua instalação não pode carregar scripts do exterior da internet. Isso irá impedir que o Snipe-IT tente carregar imagens do Gravatar.',
+    'load_remote'               => 'Load Remote Avatars',
+    'load_remote_help_text'		=> 'Uncheck this box if your install cannot load scripts from the outside internet. This will prevent Snipe-IT from trying load avatars from Gravatar or other outside sources.',
     'login'                     => 'Tentativas de login',
     'login_attempt'             => 'Tentativa de login',
     'login_ip'                  => 'Endereço IP',
@@ -131,6 +136,7 @@ return [
     'login_user_agent'          => 'User-Agent',
     'login_help'                => 'Lista de tentativas de login',
     'login_note'                => 'Login Note',
+    'login_note_placeholder'            => "If you do not have a login or have found a device belonging to this company, please call technical support at 888-555-1212. Thank you.",
     'login_note_help'           => 'Opcionalmente, inclua algumas frases na tela de login, por exemplo, para ajudar as pessoas que encontraram um dispositivo perdido ou roubado. Este campo aceita <a href="https://help.github.com/articles/github-flavored-markdown/">Gitão com sabor marcado</a>',
     'login_remote_user_text'    => 'Opções de login remoto de utilizadores',
     'login_remote_user_enabled_text' => 'Ativar login com cabeçalho de utilizador remoto',
@@ -146,13 +152,16 @@ return [
     'logo_print_assets_help'    => 'Usar a marca na impressão de lista de ativos ',
     'full_multiple_companies_support_help_text' => 'Restringir utilizadores (incluindo admins) associados a empresas ao ativos da empresa.',
     'full_multiple_companies_support_text' => 'Suporte multi-empresa completo',
+    'scope_locations_fmcs_support_text'  => 'Scope Locations with Full Multiple Companies Support',
+    'scope_locations_fmcs_support_help_text'  => 'Restrict locations to their selected company.',
+    'scope_locations_fmcs_check_button' => 'Check Compatibility',
+    'scope_locations_fmcs_support_disabled_text'  => 'This option is disabled because you have conflicting locations set for :count or more items.',
     'show_in_model_list'   => 'Mostrar modelos em menu de cascata',
     'optional'					=> 'opcional',
     'per_page'                  => 'Resultados por página',
     'php'                       => 'Versão do PHP',
-    'php_info'                  => 'Informações do PHP',
+    'php_info'                  => 'PHP info',
     'php_overview'              => 'PHP',
-    'php_overview_keywords'     => 'phpinfo, sistema, informações',
     'php_overview_help'         => 'Informação do sistema PHP',
     'php_gd_info'               => 'Deve instalar a extensão php-gd para mostrar códigos QR, veja as instruções de instalação.',
     'php_gd_warning'            => 'O Processamento de Imagem PHP e o plugin GD não estão instalados.',
@@ -218,6 +227,8 @@ return [
     'webhook_integration_help'    => ':A integração com Slack é opcional. Contudo, se quiser usá-la, o endpoint e o canal são obrigatórios. Para configurar a integração com Slack, deve previamente <a href=":webhook_link" target="_new" rel="noopener">criar um webhook de receção</a> na sua conta Slack. Clique no botão <strong>Teste :app Integração</strong> para confirmar que as suas configurações estão corretas antes de salvar. ',
     'webhook_integration_help_button'    => 'Após salvar as suas informações do :app, será exibido um botão de teste.',
     'webhook_test_help'           => 'Teste se a sua integração :app está configurada corretamente. VOCÊ DEVE SALVAR AS CONFIGURAÇÕES DE :app PRIMEIRO.',
+    'shortcuts_enabled'         => 'Enable Shortcuts',
+    'shortcuts_help_text'       => '<strong>Windows</strong>: Alt + Access key, <strong>Mac</strong>: Control + Option + Access key',
     'snipe_version'  			=> 'Versão Snipe-IT',
     'support_footer'            => 'Links de rodapé de suporte',
     'support_footer_help'       => 'Especifica quem vê os links de Suporte e Manual de utilizador do Snipe-IT',
@@ -227,7 +238,6 @@ return [
     'update'                    => 'Atualizar Configurações',
     'value'                     => 'Valor',
     'brand'                     => 'Branding',
-    'brand_keywords'            => 'rodapé, logo, imprimir, tema, skin, cabeçalho, cores, cor, css',
     'brand_help'                => 'Logótipo, Nome do Site',
     'web_brand'                 => 'Tipo de Marca na web',
     'about_settings_title'      => 'Sobre as Configurações',
@@ -276,6 +286,8 @@ return [
     'two_factor_enrollment_text'	=> "A autenticação de dois passos é obrigatória, mas se o teu dispositivo ainda não foi registado, abre o Google Authenticator e lê o QR Code para registar o teu dispositivo. Uma vez registado, introduz o código abaixo",
     'require_accept_signature'      => 'Requer assinatura',
     'require_accept_signature_help_text'      => 'Habilitar este recurso vai exigir que os utilizadores assinar fisicamente aceitando o artigo.',
+    'require_checkinout_notes'  => 'Require Notes on Checkin/Checkout',
+    'require_checkinout_notes_help_text'    => 'Enabling this feature will require the note fields to be populated when checking in or checking out an asset.',
     'left'        => 'esquerda',
     'right'        => 'direita',
     'top'        => 'topo',
@@ -313,24 +325,24 @@ return [
     'filter_by_keyword' => 'Filtrar pela palavra-chave',
     'security' => 'Segurança',
     'security_title' => 'Atualizar Configurações de Segurança',
-    'security_keywords' => 'senha, senhas, requisitos, dois fatores, senha comum, login remoto, login, autenticação',
     'security_help' => 'Dois Fatores, Restrições de palavra-passe',
-    'groups_keywords' => 'permissões, grupos de permissão, autorização',
     'groups_help' => 'Grupos de permissão de conta',
     'localization' => 'Localização',
     'localization_title' => 'Atualizar configurações de localização',
-    'localization_keywords' => 'localização, moeda, local, localidade, fuso horário, fuso horário, internacional, internacionalização, idioma, tradução',
     'localization_help' => 'Idioma, exibição de data',
     'notifications' => 'Notificações',
     'notifications_help' => 'Alertas de e-mail e configurações de auditoria',
     'asset_tags_help' => 'Incrementando e prefixos',
     'labels' => 'Etiquetas',
     'labels_title' => 'Atualizar Configurações de Etiquetas',
-    'labels_help' => 'Tamanho da etiqueta &amp; configurações',
-    'purge_keywords' => 'apagar permanentemente',
+    'labels_help' => 'Barcodes &amp; label settings',
     'purge_help' => 'Remover registos apagados',
     'ldap_extension_warning' => 'Não parece que a extensão LDAP esteja instalada ou ativada neste servidor. Ainda pode salvar as suas configurações, mas precisará de ativar a extensão LDAP para PHP antes de a sincronização LDAP ou login funcionar.',
     'ldap_ad' => 'LDAP/AD',
+    'ldap_test_label' => 'Test LDAP Sync',
+    'ldap_test_login' => ' Test LDAP Login',
+    'ldap_username_placeholder' => 'LDAP Username',
+    'ldap_password_placeholder' => 'LDAP Password',
     'employee_number' => 'Número de Funcionário',
     'create_admin_user' => 'Criar um utilizador ::',
     'create_admin_success' => 'Sucesso! O seu administrador foi adicionado!',
@@ -342,6 +354,8 @@ return [
     'setup_migration_create_user' => 'Próximo: Criar Utilizador',
     'ldap_settings_link' => 'Página de configurações LDAP',
     'slack_test' => 'Teste <i class="fab fa-slack"></i> Integração',
+    'status_label_name' => 'Status Label Name',
+    'super_admin_only'  => 'Super Admin Only',
     'label2_enable'           => 'Novo Motor de Etiqueta',
     'label2_enable_help'      => 'Mude para o novo motor de etiqueta. <b>Nota: Irá precisar salvar esta configuração antes de a poder usar.</b>',
     'label2_template'         => 'Modelo',
@@ -356,12 +370,15 @@ return [
     'label2_2d_type'          => 'Tipo de código de barras 2D',
     'label2_2d_type_help'     => 'Formato para códigos de barras 2D',
     'label2_2d_target'        => 'Alvo de Código de Barras 2D',
-    'label2_2d_target_help'   => 'A URL que o código de barras 2D apresenta quando digitalizado',
+    'label2_2d_target_help'   => 'The data that will be contained in the 2D barcode',
     'label2_fields'           => 'Definições de Campos',
     'label2_fields_help'      => 'Os campos podem ser adicionados, removidos, e reordenados na coluna da esquerda. Para cada campo, várias opções para Rótulo e Fonte de Dados podem ser adicionadas, removidas e reordenadas na coluna da direita.',
+    'purge_barcodes' => 'Purge Barcodes',
     'help_asterisk_bold'    => 'Texto digitado como <code>**texto**</code> será exibido como negrito',
     'help_blank_to_use'     => 'Deixe em branco para usar o valor de <code>:setting_name</code>',
-    'help_default_will_use' => '<code>:default</code> usará o valor de <code>:setting_name</code>. <br>Note que o valor dos códigos de barras deve estar em conformidade com a respectiva especificação do código de barras para ser gerado com sucesso. Por favor, consulte <a href="https://snipe-it.readme.io/docs/barcodes">a documentação <i class="fa fa-external-link"></i></a> para mais detalhes. ',
+    'help_default_will_use' => '<code>:default</code> will use the value from <code>:setting_name</code>. <br>Note that the value of the barcodes must comply with the respective barcode spec in order to be successfully generated. Please see <a href="https://snipe-it.readme.io/docs/barcodes">the documentation <i class="fa fa-external-link"></i></a> for more details. ',
+    'asset_id'              => 'Asset ID',
+    'data'               => 'Data',
     'default'               => 'Padrão',
     'none'                  => 'Nenhum',
     'google_callback_help' => 'Isto deve ser inserido como a URL de retorno de chamada nas configurações de aplicação do Google OAuth na sua organização&apos;s <strong><a href="https://console.cloud.google.com/" target="_blank">consola de desenvolvedor do Google <i class="fa fa-external-link" aria-hidden="true"></i></a></strong>.',
@@ -373,7 +390,100 @@ return [
     'database_driver' => 'Driver Base de Dados',
     'bs_table_storage' => 'Armazenamento de mesa',
     'timezone' => 'Fuso horário',
+    'test_mail' => 'Test Mail',
     'profile_edit'          => 'Edit Profile',
     'profile_edit_help'          => 'Allow users to edit their own profiles.',
+    'default_avatar' => 'Custom Default Avatar',
+    'default_avatar_help' => 'This image will be displayed as a profile if a user does not have a profile photo.',
+    'restore_default_avatar' => 'Restore <a href=":default_avatar" data-toggle="lightbox" data-type="image">original system default avatar</a>',
+    'restore_default_avatar_help' => '',
+    'due_checkin_days' => 'Due For Checkin Warning',
+    'due_checkin_days_help' => 'Quantos dias antes do esperado check-in de um ativo deve ser listado na página "Due for checkin"?',
+    'no_groups' => 'No groups have been created yet. Visit <code>Admin Settings > Permission Groups</code> to add one.',
+    'text' => 'Text',
+
+    'username_formats' => [
+        'username_format'		=> 'Formato username',
+        'firstname_lastname_format'	=> 'Primeiro Nome Último Nome (jane.smith)',
+        'first_name_format'	        => 'First Name (jane)',
+        'last_name_format'		=> 'Last Name (doe)',
+        'filastname_format'			=> 'First Initial Last Name (jsmith)',
+        'lastnamefirstinitial_format' =>  'Last Name First Initial (smithj)',
+        'firstname_lastname_underscore_format' => 'First Name Last Name (jane_smith)',
+        'firstinitial.lastname' => 'First Initial Last Name (j.smith)',
+        'lastname_firstinitial' => 'Last Name First Initial (smith_j)',
+        'lastname_dot_firstinitial_format' => 'Last Name First Initial (smith.j)',
+        'firstnamelastname'     => 'First Name Last Name (janesmith)',
+        'firstnamelastinitial'  => 'First Name Last Initial (janes)',
+        'lastnamefirstname'      => 'Last Name.First Name (smith.jane)',
+    ],
+
+    'email_formats' => [
+        'email_format'			=> 'Formato do Email',
+        'firstname_lastname_format'	=> 'Primeiro Nome Último Nome (jane.smith@example.com)',
+        'first_name_format'		=> 'Primeiro Nome (jane@example.com)',
+        'last_name_format'		=> 'Last Name (doe@example.com)',
+        'filastname_format'			=> 'Primeira Inicial Último Nome(jsmith@example.com)',
+        'lastnamefirstinitial_format' =>  'Sobrenome Primeira Inicial (smithj@example.com)',
+        'firstname_lastname_underscore_format' => 'Nome próprio e Sobrenome (jane_smith@exemplo.com)',
+        'firstinitial.lastname' => 'Inicial Nome Próprio Sobrenome(j.smith@example.com)',
+        'lastname_firstinitial' => 'Sobrenome Inicial Nome Próprio (smith_j@example.com)',
+        'lastname_dot_firstinitial_format' => 'Last Name First Initial (smith.j@example.com)',
+        'firstnamelastname'     => 'Nome próprio Sobrenome (jane_smith@exemple.com)',
+        'firstnamelastinitial'  => 'Nome próprio Sobrenome (janes@exemple.com)',
+        'lastnamefirstname'      => 'Last Name.First Name (smith.jane@example.com)',
+    ],
+
+
+
+    'logo_labels' => [
+        'acceptance_pdf_logo'       => 'PDF Logo',
+        'email_logo'                => 'Logotipo do e-mail',
+        'label_logo'                => 'Logotipo da etiqueta',
+        'logo'                      => 'Site Logo',
+        'favicon'                   => 'Ícone de Favoritos',
+    ],
+
+    'logo_help' => [
+        'email_logo_size'       => 'Logos quadrados no e-mail são os melhores. ',
+    ],
+
+    'logo_option_types' => [
+        'text' => 'Text',
+        'logo' => 'Logo',
+        'logo_and_text' => 'Logo and Text',
+    ],
+
+
+    'legends' => [
+        'scoping' => 'Scoping',
+        'formats' => 'Default Formats',
+        'profiles' => 'User Profiles',
+        'eula' => 'EULA & Acceptance Preferences',
+        'misc_display' => 'Miscellaneous Display Options',
+        'email' => 'Email Preferences',
+        'checkin' => 'Checkin Preferences',
+        'dashboard' => 'Login & Dashboard Preferences',
+        'misc' => 'Miscellaneous',
+        'logos' => 'Logos & Display',
+        'colors' => 'Colors & Skins',
+        'footer' => 'Footer Preferences',
+        'security' => 'Security Preferences',
+        'general' => 'General',
+        'intervals' => 'Intervals & Thresholds',
+    ],
+
+
+    /* Keywords for settings overview help */
+    'keywords' => [
+        'brand'             => 'rodapé, logo, imprimir, tema, skin, cabeçalho, cores, cor, css',
+        'general_settings'  => 'suporte à empresa, assinatura, aceitação, formato de e-mail, formato de nome de usuário, imagens, por página, miniatura, gravatar, por, painel, privacidade',
+        'groups'            => 'permissões, grupos de permissão, autorização',
+        'labels'            => 'labels, barcodes, barcode, sheets, print, upc, qr, 1d, 2d',
+        'localization'      => 'localização, moeda, local, localidade, fuso horário, fuso horário, internacional, internacionalização, idioma, tradução',
+        'php_overview'      => 'phpinfo, sistema, informações',
+        'purge'             => 'apagar permanentemente',
+        'security'          => 'senha, senhas, requisitos, dois fatores, senha comum, login remoto, login, autenticação',
+    ],
 
 ];
diff --git a/resources/lang/pt-PT/admin/settings/message.php b/resources/lang/pt-PT/admin/settings/message.php
index 6429f08699..fb62cdb1c4 100644
--- a/resources/lang/pt-PT/admin/settings/message.php
+++ b/resources/lang/pt-PT/admin/settings/message.php
@@ -14,6 +14,9 @@ return [
         'restore_warning'       => 'Sim, restaurar. Eu reconheço que isso irá substituir quaisquer dados existentes atualmente na base de dados. Isto também irá desligar todos os utilizadores existentes (incluindo você).',
         'restore_confirm'       => 'Tem a certeza que deseja restaurar a sua base de dados a partir de :filename?'
     ],
+    'restore' => [
+        'success'               => 'Your system backup has been restored. Please log in again.'
+    ],
     'purge' => [
         'error'     => 'Ocorreu um erro ao eliminar os dados. ',
         'validation_failed'     => 'A confirmação para limpar os dados correu mal. Digite a palavra "Apagar" na caixa de confirmação.',
@@ -33,6 +36,9 @@ return [
         'testing_authentication' => 'Testando Autenticação LDAP...',
         'authentication_success' => 'Utilizador autenticado no LDAP com sucesso!'
     ],
+    'labels' => [
+        'null_template' => 'Label template not found. Please select a template.',
+        ],
     'webhook' => [
         'sending' => 'A enviar mensagem :app de teste...',
         'success' => 'Sua integração com :webhook_name funciona!',
@@ -42,5 +48,12 @@ return [
         'error' => 'Algo deu erro. :app respondeu com: :error_message',
         'error_redirect' => 'ERRO: 301/302 :endpoint retorna um redirecionamento. Por razões de segurança, não seguimos redirecionamentos. Por favor, use o ponto de extremidade atual.',
         'error_misc' => 'Algo deu erro. :( ',
-    ]
+        'webhook_fail' => ' webhook notification failed: Check to make sure the URL is still valid.',
+        'webhook_channel_not_found' => ' webhook channel not found.',
+        'ms_teams_deprecation' => 'The selected Microsoft Teams webhook URL will be deprecated Dec 31st, 2025. Please use a workflow URL. Microsoft\'s documentation on creating a workflow can be found <a href="https://support.microsoft.com/en-us/office/create-incoming-webhooks-with-workflows-for-microsoft-teams-8ae491c7-0394-4861-ba59-055e33f75498" target="_blank"> here.</a>',
+    ],
+    'location_scoping' => [
+        'not_saved' => 'Your settings were not saved.',
+        'mismatch' => 'There is 1 item in the database that need your attention before you can enable location scoping.|There are :count items in the database that need your attention before you can enable location scoping.',
+    ],
 ];
diff --git a/resources/lang/pt-PT/admin/statuslabels/table.php b/resources/lang/pt-PT/admin/statuslabels/table.php
index 797c253541..2cfd361273 100644
--- a/resources/lang/pt-PT/admin/statuslabels/table.php
+++ b/resources/lang/pt-PT/admin/statuslabels/table.php
@@ -1,14 +1,14 @@
 <?php
 
 return array(
-    'about'      	=> 'Acerca da Rótulos de Estados',
+    'about'      	=> 'About Status Types',
     'archived'      	=> 'Arquivado',
     'create'      	=> 'Criar Estado',
     'color'      	=> 'Cor do Grafico',
     'default_label' => 'Rótulo Pré-definido',
     'default_label_help' => 'Isto é usado para garantir que o rótulo de estado mais usado aparece no topo da caixa de seleção quando estiver a criar ou a editar artigos.',
     'deployable'      	=> 'Implementável',
-    'info'      	=> 'Estados são usados para descrever as várias situações em que os artigos se podem encontrar. Podem estar em reparação, perdidos/roubados, etc. É possível criar Estados para artigos implementáveis, pendentes ou arquivados.',
+    'info'      	=> 'Status label types are used to describe the various states your assets could be in. They may be out for repair, lost/stolen, etc. You can create new status labels for your deployable, pending and archived assets according to your own workflow. For more information, <a href="https://snipe-it.readme.io/docs/overview#status-labels" target="_blank">see the documentation <i class="fa fa-external-link"></i></a>.',
     'name'      	=> 'Nome do Estado',
     'pending'      	=> 'Pendente',
     'status_type'   => 'Tipo de Estado',
diff --git a/resources/lang/pt-PT/admin/users/general.php b/resources/lang/pt-PT/admin/users/general.php
index 35a21e5189..b953c84bbe 100644
--- a/resources/lang/pt-PT/admin/users/general.php
+++ b/resources/lang/pt-PT/admin/users/general.php
@@ -19,6 +19,8 @@ return [
     'print_assigned'    => 'Imprimir todos atribuídos',
     'email_assigned'    => 'Lista de endereços eletrónicos de Todos os atribuídos',
     'user_notified'     => 'Um utilizador recebeu um endereço eletrónico com uma lista dos seus itens atualmente atribuídos.',
+    'users_notified'    => 'The user has been emailed a list of their currently assigned items.|:count users have been emailed a list of their currently assigned items.',
+    'users_notified_warning' => ':count user has been emailed a list of their currently assigned items, however :no_email users did not have an email address so could not be emailed.|:count users have been emailed a list of their currently assigned items, however :no_email user(s) did not have an email address so could not be emailed.',
     'auto_assign_label' => 'Inclua este utilizador quando atribuir licenças elegíveis automaticamente',
     'auto_assign_help'  => 'Ignorar este utilizador na atribuição automática de licenças',
     'software_user'     => 'Software alocado a :name',
diff --git a/resources/lang/pt-PT/admin/users/message.php b/resources/lang/pt-PT/admin/users/message.php
index a1ed26601f..b306bd7939 100644
--- a/resources/lang/pt-PT/admin/users/message.php
+++ b/resources/lang/pt-PT/admin/users/message.php
@@ -6,7 +6,7 @@ return array(
     'declined'                  => 'Recusou este artigo com sucesso.',
     'bulk_manager_warn'	        => 'Seus usuários foram atualizados com sucesso, no entanto, sua entrada de gerente não foi salva porque o gerente que você selecionou também estava na lista de usuários para ser editada e os usuários podem não ser seu próprio gerente. Selecione seus usuários novamente, excluindo o gerente.',
     'user_exists'               => 'Utilizador já existe!',
-    'user_not_found'            => 'O utilizador não existe.',
+    'user_not_found'            => 'User does not exist or you do not have permission view them.',
     'user_login_required'       => 'O atributo login é obrigatório',
     'user_has_no_assets_assigned' => 'Não há conteúdos atualmente atribuídos ao usuário.',
     'user_password_required'    => 'A password é obrigatória.',
@@ -53,6 +53,7 @@ return array(
         'ldap_could_not_search' => 'Não foi possível pesquisar no servidor LDAP. Por favor, verifique a configuração de servidor no ficheiro de configuração. <br>Error do Servidor LDAP:',
         'ldap_could_not_get_entries' => 'Não foi possível obter registos do servidor LDAP. Por favor, verifique a configuração de servidor no ficheiro de configuração. <br>Error do Servidor LDAP:',
         'password_ldap' => 'A senha desta conta é gerenciada pelo LDAP / Active Directory. Entre em contato com seu departamento de TI para alterar sua senha.',
+        'multi_company_items_assigned' => 'This user has items assigned that belong to a different company. Please check them in or edit their company.'
     ),
 
     'deletefile' => array(
diff --git a/resources/lang/pt-PT/admin/users/table.php b/resources/lang/pt-PT/admin/users/table.php
index 0e81ff1afe..90850e4a23 100644
--- a/resources/lang/pt-PT/admin/users/table.php
+++ b/resources/lang/pt-PT/admin/users/table.php
@@ -22,7 +22,7 @@ return array(
     'managed_locations'     => 'Locais gerenciados',
     'managed_users'         => 'Usuários gerenciados',
     'name' 					=> 'Nome',
-    'nogroup'               => 'Nenhum grupo foi criado ainda. Para adicionar um, visite: ',
+    'nogroup'               => 'Nenhum grupo foi criado ainda. Para adicionar um, visite:',
     'notes'                 => 'Notas',
     'password_confirm' 		=> 'Confirmar palavra-passe',
     'password' 				=> 'Password',
diff --git a/resources/lang/pt-PT/auth.php b/resources/lang/pt-PT/auth.php
index cd5e96b5ef..0f3b16e449 100644
--- a/resources/lang/pt-PT/auth.php
+++ b/resources/lang/pt-PT/auth.php
@@ -15,6 +15,6 @@ return array(
 
     'failed' => 'As credenciais indicadas não coincidem com as registadas no sistema.',
     'password' => 'A palavra-passe está incorreta.',
-    'throttle' => 'Muitas tentativas falhadas de login. Por favor, tente novamente no(s) próximo(s) :minutes minuto(s).',
+    'throttle' => 'Too many login attempts. Please try again in :minutes minute(s).',
 
 );
diff --git a/resources/lang/pt-PT/auth/message.php b/resources/lang/pt-PT/auth/message.php
index 7bb1dc211f..9a92acc214 100644
--- a/resources/lang/pt-PT/auth/message.php
+++ b/resources/lang/pt-PT/auth/message.php
@@ -6,8 +6,6 @@ return array(
     'account_not_found'      => 'O username ou password estão incorretos.',
     'account_not_activated'  => 'Esta conta de utilizador não está ativa.',
     'account_suspended'      => 'Está conta de utilizador encontra-se suspensa.',
-    'account_banned'         => 'Este utilizador foi desabilitado.',
-    'throttle'               => 'Muitas tentativas falhadas de início de sessão. Por favor, tente novamente dentro de :minutes minuto(s).',
 
     'two_factor' => array(
         'already_enrolled'      => 'O seu dispositivo já está inscrito.',
diff --git a/resources/lang/pt-PT/button.php b/resources/lang/pt-PT/button.php
index d42fb6dd2d..63fd78ece7 100644
--- a/resources/lang/pt-PT/button.php
+++ b/resources/lang/pt-PT/button.php
@@ -7,6 +7,7 @@ return [
     'checkin_and_delete'  	    => 'Entrega todos / Apaga Utilizadores',
     'delete'  	                => 'Remover',
     'edit'    	                => 'Editar',
+    'clone'    	                => 'Clone',
     'restore' 	                => 'Restaurar',
     'remove'                    => 'Remover',
     'request'                   => 'Solicitar',
@@ -21,4 +22,13 @@ return [
     'add_maintenance'           => 'Adicionar Manutenção',
     'append'                    => 'Anexar',
     'new'                       => 'Novo',
+    'var' => [
+        'clone'     => 'Clone :item_type',
+        'edit'      => 'Edit :item_type',
+        'delete'    => 'Delete :item_type',
+        'restore'   => 'Restore :item_type',
+        'create'    => 'Create New :item_type',
+        'checkout'  => 'Checkout :item_type',
+        'checkin'   => 'Checkin :item_type',
+    ]
 ];
diff --git a/resources/lang/pt-PT/general.php b/resources/lang/pt-PT/general.php
index 557f49e00e..08f2b37252 100644
--- a/resources/lang/pt-PT/general.php
+++ b/resources/lang/pt-PT/general.php
@@ -10,7 +10,7 @@ return [
     'action'                => 'Ação',
     'activity_report'		=> 'Relatório de atividades',
     'address'				=> 'Morada',
-    'admin'					=> 'Administração',
+    'admin'					=> 'Configurações de administrador',
     'admin_tooltip'			=> 'Este usuário tem privilégios de administrador',
     'superuser'				=> 'Superusuário',
     'superuser_tooltip'		=> 'Este usuário tem privilégios de superusuário',
@@ -23,13 +23,16 @@ return [
     'asset_models'			=> 'Modelos de Artigo',
     'asset_model'			=> 'Modelo',
     'asset'					=> 'Artigo',
+    'asset_previous'        => 'Asset (Previously Assigned)',
     'asset_report'          => 'Relatório de Artigo',
     'asset_tag'				=> 'Etiqueta de Artigo',
     'asset_tags'            => 'Etiquetas de Artigo',
     'assets_available'		=> 'Artigos Disponíveis',
     'accept_assets'         => 'Artigos Aceites :name',
     'accept_assets_menu'    => 'Artigos Aceites',
+    'accept_item'           => 'Accept Item',
     'audit'				    => 'Auditoria',
+    'audits'				=> 'Audits',
     'audit_report'			=> 'Registro de auditoria',
     'assets'				=> 'Artigos',
     'assets_audited'        => 'artigos auditados',
@@ -61,9 +64,12 @@ return [
     'changepassword'  		=> 'Alterar Palavra-passe',
     'checkin'  				=> 'Devolver',
     'checkin_from'  		=> 'Devolver de',
+    'checkin_note'  		=> 'Checkin Note',
+    'checkout_note'  		=> 'Checkout Note',
     'checkout'  			=> 'Alocar',
     'checkouts_count'       => 'Checkouts',
     'checkins_count'        => 'Checkins',
+    'checkin_and_delete'  	=> 'Checkin and Delete',
     'user_requests_count'   => 'Pedidos',
     'city'  				=> 'Cidade',
     'click_here'			=> 'Clique aqui',
@@ -77,7 +83,7 @@ return [
     'consumables'			=> 'Consumíveis',
     'country'  				=> 'País',
     'could_not_restore'     => 'Erro ao restaurar :item_type: :error',
-    'not_deleted'           => 'O :item_type não foi apagado, então ele não pode ser restaurado',
+    'not_deleted'           => 'O :item_type não foi excluído e, portanto, não pode ser restaurado',
     'create'				=> 'Criar Novo',
     'created'               => 'Item criado',
     'created_asset'			=> 'artigo criado',
@@ -86,11 +92,13 @@ return [
     'record_created' 		=> 'Registro criado',
     'updated_at' 			=> 'Atualizado em',
     'currency'  			=> '€', // this is deprecated
+    'currency_text'  		=> 'Moeda', //
     'current'  				=> 'Atuais',
     'current_password'      => 'Senha atual',
     'customize_report'      => 'Personalizar relatório',
     'custom_report'         => 'Relatório de Artigo personalizado',
     'dashboard'				=> 'Dashboard',
+    'data_source'           => 'Data Source',
     'days'      			=> 'dias',
     'days_to_next_audit'    => 'Dias para próxima auditoria',
     'date'					=> 'Data',
@@ -98,7 +106,7 @@ return [
     'debug_warning_text'    => 'Esta aplicação está em execução no modo de produção com a depuração activada. Isso pode expor dados sensíveis se seu aplicativo é acessível para o mundo exterior. Desactive o modo de depuração mudando o valor de <code>APP_DEBUG</code> no teu ficheiro <code>.env</code> para <code>false</code>.',
     'delete'  				=> 'Remover',
     'delete_confirm'  		=> 'Tem a certeza que deseja eliminar :item?',
-    'delete_confirm_no_undo' => 'Tem a certeza que deseja excluir :item? Isto não pode ser desfeito.',
+    'delete_confirm_no_undo' => 'Are you sure, you wish to delete :item? This cannot be undone.',
     'deleted'  				=> 'Removidos',
     'delete_seats'  		=> 'Utilizadores apagados',
     'deletion_failed'       => 'Falha ao Eliminar',
@@ -114,29 +122,13 @@ return [
     'editprofile'  			=> 'Editar o seu perfil',
     'eol'					=> 'EOL (Fim de vida)',
     'email_domain'			=> 'Email do Domínio',
-    'email_format'			=> 'Formato do Email',
     'employee_number'       => 'Número de Funcionário',
     'email_domain_help'		=> 'Isto é usado para criar endereços de email ao importar',
     'error'				    => 'Erro',
     'exclude_archived'      => 'Excluir Ativos Arquivados',
     'exclude_deleted'       => 'Excluir artigos apagados',
     'example'				=> 'Exemplo: ',
-    'filastname_format'			=> 'Primeira Inicial Último Nome(jsmith@example.com)',
-    'firstname_lastname_format'	=> 'Primeiro Nome Último Nome (jane.smith@example.com)',
-    'firstname_lastname_underscore_format' => 'Nome próprio e Sobrenome (jane_smith@exemplo.com)',
-    'lastnamefirstinitial_format' =>  'Sobrenome Primeira Inicial (smithj@example.com)',
-    'firstintial_dot_lastname_format' => 'Inicial Nome Próprio Sobrenome (j.smith@example.com)',
-    'firstname_lastname_display'	=> 'Primeiro nome com sobrenome (Jane Smith)',
-    'lastname_firstname_display'	=> 'Primeiro Nome do Último Nome (Smith Jane)',
-    'name_display_format'	=> 'Formato de exibição de nome',
-    'first'					=> 'Primeiro',
-    'firstnamelastname'     => 'Nome próprio Sobrenome (jane_smith@exemple.com)',
-    'lastname_firstinitial' => 'Sobrenome Inicial Nome Próprio (smith_j@example.com)',
-    'firstinitial.lastname' => 'Inicial Nome Próprio Sobrenome(j.smith@example.com)',
-    'firstnamelastinitial'  => 'Nome próprio Sobrenome (janes@exemple.com)',
-    'lastnamefirstname'      => 'Last Name First Name (smith.jane@example.com)',
-    'first_name'			=> 'Nome',
-    'first_name_format'		=> 'Primeiro Nome (jane@example.com)',
+
     'files'                 => 'Ficheiros',
     'file_name'				=> 'Ficheiro',
     'file_type'             => 'Tipo de ficheiro',
@@ -156,9 +148,9 @@ return [
     'image_delete'         	=> 'Apagar imagem',
     'include_deleted'       => 'Incluir Ativos Excluídos',
     'image_upload'         	=> 'Carregar Imagem',
-    'filetypes_accepted_help'    => 'O tipo de arquivo aceito é :types. O tamanho máximo de upload permitido é :size.abroad. tipos de arquivos aceitos são :types. O tamanho máximo de upload permitido é :size.',
-    'filetypes_size_help'   => 'O tamanho máximo de upload permitido é :size.',
-    'image_filetypes_help'  => 'Accepted filetypes are jpg, webp, png, gif, svg, and avif. Max upload size allowed is :size.',
+    'filetypes_accepted_help'    => 'Accepted filetype is :types. The maximum size allowed is :size.|Accepted filetypes are :types. The maximum upload size allowed is :size.',
+    'filetypes_size_help'   => 'The maximum upload size allowed is :size.',
+    'image_filetypes_help'  => 'Accepted Filetypes are jpg, webp, png, gif, svg, and avif. The maximum upload size allowed is :size.',
     'unaccepted_image_type'  => 'Este ficheiro de imagem não era legível. Tipos de ficheiros aceites são jpg, webp, png, gif e svg. O mimetype deste ficheiro é: :mimetype.',
     'import'         	    => 'Importar',
     'import_this_file'      => 'Mapear os campos e processar este arquivo',
@@ -178,12 +170,17 @@ return [
     'last'					=> 'Última',
     'last_login'            => 'Último login',
     'last_name'             => 'Apelido',
+    'firstname_lastname_display'	=> 'Primeiro nome com sobrenome (Jane Smith)',
+    'lastname_firstname_display'	=> 'Primeiro Nome do Último Nome (Smith Jane)',
+    'name_display_format'	=> 'Formato de exibição de nome',
+    'first'					=> 'Primeiro',
+    'first_name'			=> 'Nome',
     'license'				=> 'Licença',
     'license_report'        => 'Relatório de Licenças',
     'licenses_available'	=> 'Licenças disponíveis',
     'licenses'				=> 'Licenças',
     'list_all'				=> 'Listar todas',
-    'loading'				=> 'A carregar... por favor aguarde....',
+    'loading'				=> 'A carregar... por favor aguarde...',
     'lock_passwords'        => 'O valor do campo não será guardado numa instalação de demonstração.',
     'feature_disabled'      => 'Esta funcionalidade foi desativada na versão de demonstração.',
     'location'              => 'Localização',
@@ -193,7 +190,7 @@ return [
     'logout'				=> 'Sair',
     'lookup_by_tag'     => 'Procurar por Código',
     'maintenances'          => 'Manutenções',
-    'manage_api_keys'       => 'Gerir API Keys',
+    'manage_api_keys'       => 'Manage API keys',
     'manufacturer'			=> 'Fabricante',
     'manufacturers'			=> 'Fabricantes',
     'markdown'				=> 'Este campo permite <a href="https://help.github.com/articles/github-flavored-markdown/">Github flavored markdown</a>.',
@@ -215,6 +212,14 @@ return [
     'no_results'			=> 'Sem Resultados.',
     'no'  					=> 'Não',
     'notes'  				=> 'Notas',
+    'note_added'            => 'Note Added',
+    'options'				=> 'Options',
+    'preview'				=> 'Preview',
+    'add_note'              => 'Add Note',
+    'note_edited'            => 'Note Edited',
+    'edit_note'              => 'Edit Note',
+    'note_deleted'            => 'Note Deleted',
+    'delete_note'              => 'Delete Note',
     'order_number'          => 'Número de encomenda',
     'only_deleted'          => 'Apenas Artigos Excluídos',
     'page_menu'				=> 'Apresentando_MENU_items',
@@ -229,7 +234,7 @@ return [
     'purchase_date'         => 'Data de compra',
     'qty'		            => 'QTD',
     'quantity'		        => 'Quantidade',
-    'quantity_minimum'      => 'Você tem :count itens abaixo ou quase dos níveis de quantidade mínima',
+    'quantity_minimum'      => 'You have one item below or almost below minimum quantity levels|You have :count items below or almost below minimum quantity levels',
     'quickscan_checkin'  	=> 'Receção Rápida',
     'quickscan_checkin_status'  	=> 'Estado da receção',
     'ready_to_deploy'		=> 'Pronto para implementar',
@@ -254,7 +259,7 @@ return [
     'select_all'            => 'Selecionar Tudo',
     'search'				=> 'Pesquisar',
     'select_category'       => 'Selecionar Categoria',
-    'select_datasource' => 'Selecione uma fonte de dados',
+    'select_datasource' => 'Select a data source',
     'select_department'     => 'Selecione um Departamento',
     'select_depreciation'	=> 'Selecione um Tipo de Depreciação',
     'select_location'		=> 'Selecione uma localização',
@@ -274,13 +279,15 @@ return [
     'signed_off_by'         => 'Assinado por',
     'skin'       			=> 'Skin',
     'webhook_msg_note'        => 'Uma notificação será enviada via webhook',
-    'webhook_test_msg'        => 'Ah, hai! Parece que a sua integração com o Snipe-IT está a funcionar!',
+    'webhook_test_msg'        => 'Oh hai! It looks like your :app integration with Snipe-IT is working!',
     'some_features_disabled' => 'MODO DE DEMONSTRAÇÃO: Algumas funcionalidades estão desativadas para esta instalação.',
     'site_name'				=> 'Nome do site',
     'state'  				=> 'Distrito',
     'status_labels'			=> 'Estados',
+    'status_label'			=> 'Status Label',
     'status'    			=> 'Estado',
     'accept_eula'           => 'Contrato de licença',
+    'show_or_hide_eulas' => 'Show/Hide EULAs',
     'supplier'              => 'Fornecedor',
     'suppliers'  			=> 'Fornecedores',
     'sure_to_delete'        => 'Tem certeza de que deseja excluir',
@@ -296,9 +303,9 @@ return [
     'type'  				=> 'Tipo',
     'undeployable'			=> 'Não implementável',
     'unknown_admin'			=> 'Administrador desconhecido',
-    'username_format'		=> 'Formato username',
     'username'              => 'Nome de utilizador',
     'update'                => 'Atualizar',
+    'updating_item' => 'Updating :item',
     'upload_filetypes_help'      => 'Os tipos de ficheiros permitidos são png, gif, jpg, jpeg, doc, docx, pdf, txt, zip e rar. O tamanho máximo de upload permitido é: size.',
     'uploaded'              => 'Carregado',
     'user'					=> 'Utilizador',
@@ -323,10 +330,10 @@ return [
     'token_expired'         => 'A sua sessão expirou. Inicie sessão novamente.',
     'login_enabled'         => 'Login Ativado',
     'audit_due'             => 'Marcado para Auditoria',
-    'audit_due_days'        => 'Atributos devidos para auditoria dentro de :days Dias|Ativos devido para auditoria dentro de :days',
+    'audit_due_days'        => '{}Assets Due or Overdue for Audit|[1]Assets Due or Overdue for Audit Within a Day|[2,*]Assets Due or Overdue for Audit Within :days Days',
     'checkin_due'           => 'Vencimento para o checkin',
     'checkin_overdue'       => 'Atrasado por check-in',
-    'checkin_due_days'      => 'Ativos devidos para o check-in dentro de :days Dia| Ativos devido para check-in dentro de :days Dias',
+    'checkin_due_days'      => '{}Due for Checkin|[1]Assets Due for Checkin Within :days Day|[2,*]Assets Due for Checkin Within :days Days',
     'audit_overdue'         => 'Atrasado para Auditoria',
     'accept'                => 'Aceitar :asset',
     'i_accept'              => 'Aceito',
@@ -339,16 +346,16 @@ return [
     'view_all'              => 'ver todos',
     'hide_deleted'          => 'Ocultar apagados',
     'email'                 => 'Email',
-    'do_not_change'         => 'Não alterar',
-    'bug_report'            => 'Reportar um Erro',
+    'do_not_change'         => 'Do not change',
+    'bug_report'            => 'Report a bug',
     'user_manual'           => 'Manual do Utilizador',
     'setup_step_1'          => 'Passo 1',
     'setup_step_2'          => 'Passo 2',
     'setup_step_3'          => 'Passo 3',
     'setup_step_4'          => 'Passo 4',
     'setup_config_check'    => 'Verificação da configuração',
-    'setup_create_database' => 'Criar Tabelas de Base de Dados',
-    'setup_create_admin'    => 'Criar Administrador',
+    'setup_create_database' => 'Create database tables',
+    'setup_create_admin'    => 'Create an admin user',
     'setup_done'            => 'Concluído!',
     'bulk_edit_about_to'    => 'Está prestes a editar o seguinte: ',
     'checked_out'           => 'Entregue',
@@ -383,6 +390,8 @@ return [
     'new_license'           => 'Nova Licença',
     'new_accessory'         => 'Novo Acessório',
     'new_consumable'        => 'Novo Consumível',
+    'new_component'         => 'New Component',
+    'new_user'              => 'New User',
     'collapse'              => 'Esconder',
     'assigned'              => 'Atribuir',
     'asset_count'           => 'Contagem de Artigos',
@@ -418,19 +427,20 @@ return [
     'bulk_soft_delete'      =>'Também exclua esses utilizadores. O seu histórico de ativos permanecerá intacto a menos que / até que purgue os registos apagados nas configurações do Administrador.',
     'bulk_checkin_delete_success' => 'Os utilizadores selecionados foram apagados e os seus itens foram entregues.',
     'bulk_checkin_success' => 'Os itens para os utilizadores selecionados foram recebidos.',
-    'set_to_null'           => 'Apagar valores para este artigo|Apagar valores para todos os :asset_count ativos ',
+    'set_to_null'           => 'Delete values for this selection|Delete values for all :selection_count selections ',
     'set_users_field_to_null'  => 'Apagar os valores de :field para este utilizador|Apagar os valores de :field para todos :user_count utilizadores ',
     'na_no_purchase_date'   => 'N/D - Nenhuma data de compra fornecida',
     'assets_by_status'      => 'Artigos por Estado',
     'assets_by_status_type'      => 'Artigos por Tipo de Estado',
     'pie_chart_type'        => 'Painel Tipo Gráfico "Pie"',
     'hello_name'            => 'Olá, :name!',
-    'unaccepted_profile_warning'   => 'Tem :count artigos que requerem aceitação. Clique aqui para aceitar ou recusá-los',
+    'unaccepted_profile_warning'   => 'You have one item requiring acceptance. Click here to accept or decline it | You have :count items requiring acceptance. Click here to accept or decline them',
     'start_date'            => 'Data de início',
     'end_date'            => 'Data de Fim',
     'alt_uploaded_image_thumbnail' => 'Miniatura carregada',
     'placeholder_kit'       => 'Selecione um kit',
     'file_not_found'        => 'Ficheiro não encontrado',
+    'log_record_not_found'  => 'No record for that log entry was found.',
     'preview_not_available' => '(sem visualização)',
     'setup'                 => 'Configuração',
     'pre_flight'            => 'Pré-Voo',
@@ -512,7 +522,7 @@ return [
     'checked_out_to_fields' => 'Checked Out To Fields',
     'percent_complete' => '% completo',
     'uploading' => 'Enviando... ',
-    'upload_error' => 'Erro ao enviar o arquivo. Por favor, verifique se não existem linhas vazias e se nenhum nome de coluna está duplicado.',
+    'upload_error' => 'Error uploading file. Please check that you have no empty rows or duplicated column names in your CSV, and that the server permissions allow uploads.',
     'copy_to_clipboard' => 'Copiar para Área de Transferência',
     'copied' => 'Copiado!',
     'status_compatibility' => 'Se os ativos já estão atribuídos, eles não podem ser alterados para um tipo de status não implantável e este valor será ignorado.',
@@ -549,6 +559,71 @@ return [
         'license_seats'  => ':count licença assentonamed@@0:count licença de assentos',
         'consumables'  => ':count Consumível|:count Consumíveis',
         'components'  => ':count Componente|:count Componentes',
-    ]
+    ],
+
+    'more_info' => 'Mais Informações',
+    'quickscan_bulk_help' => 'Checking this box will edit the asset record to reflect this new location. Leaving it unchecked will simply note the location in the audit log. Note that if this asset is checked out, it will not change the location of the person, asset or location it is checked out to.',
+    'whoops' => 'Whoops!',
+    'something_went_wrong' => 'Something went wrong with your request.',
+    'close' => 'Close',
+    'expires' => 'Expira a',
+    'map_fields'=> 'Map :item_type Fields',
+    'remaining_var' => ':count Remaining',
+    'label' => 'Label',
+    'import_asset_tag_exists' => 'An asset with the asset tag :asset_tag already exists and an update was not requested. No change was made.',
+    'countries_manually_entered_help' => 'Values with an asterisk (*) were manually entered and do not match existing ISO 3166 dropdown values',
+    'accessories_assigned' => 'Assigned Accessories',
+    'user_managed_passwords' => 'Password Management',
+    'user_managed_passwords_disallow' => 'Disallow users from managing their own passwords',
+    'user_managed_passwords_allow' => 'Allow users to manage their own passwords',
+    'from' => 'From',
+    'by' => 'Por',
+
+// Add form placeholders here
+    'placeholders' => [
+        'notes'  => 'Add a note',
+    ],
+
+    'breadcrumb_button_actions' => [
+        'edit_item' => 'Edit :name',
+        'checkout_item' => 'Checkout :name',
+        'checkin_item' => 'Checkin :name',
+    ],
+
+    'skins' => [
+        'site_default' => 'Site Default',
+        'default_blue' => 'Default Blue',
+        'blue_dark' => 'Blue (Dark Mode)',
+        'green' => 'Green Dark',
+        'green_dark' => 'Green (Dark Mode)',
+        'red' => 'Red Dark',
+        'red_dark' => 'Red (Dark Mode)',
+        'orange' => 'Orange Dark',
+        'orange_dark' => 'Orange (Dark Mode)',
+        'black' => 'Black',
+        'black_dark' => 'Black (Dark Mode)',
+        'purple' => 'Purple',
+        'purple_dark' => 'Purple (Dark Mode)',
+        'yellow' => 'Yellow',
+        'yellow_dark' => 'Yellow (Dark Mode)',
+        'high_contrast' => 'High Contrast',
+
+    ],
+
+    'select_all_none' => 'Select/Unselect All',
+    'generic_model_not_found' => 'That :model was not found or you do not have permission to access it',
+    'deleted_models' => 'Deleted Asset Models',
+    'deleted_users' => 'Deleted Users',
+    'cost_each' => ':amount each',
+    'remove_current_image' => 'Remove current :type image',
+
+    'seeding' => [
+        'manufacturers' => [
+            'button' => 'Create Manufacturers',
+            'prompt' => 'You do not have any manufacturers yet. Would you like to seed a list of common manufacturers? (THIS WILL OVERWRITE EXISTING MANUFACTURERS, including those that have been soft-deleted.)',
+            'success' => 'Manufacturers seeded successfully',
+            'error' => 'Could not seed manufacturers. A manufacturer record already exists and seeding would overwrite it.|Could not seed manufacturers. :count manufacturer records already exist and seeding would overwrite them.',
+        ],
+    ],
 
 ];
diff --git a/resources/lang/pt-PT/localizations.php b/resources/lang/pt-PT/localizations.php
index d220a024f2..dec6b9a952 100644
--- a/resources/lang/pt-PT/localizations.php
+++ b/resources/lang/pt-PT/localizations.php
@@ -2,7 +2,7 @@
 
 return [
 
-    'select_language' => 'Selecione um idioma',
+    'select_language' => 'Select a Language',
     'languages' => [
         'en-US'=> 'Inglês, EUA',
         'en-GB'=> 'Inglês, Reino Unido',
@@ -40,7 +40,9 @@ return [
         'ms-MY'=> 'Malaio',
         'mi-NZ'=> 'Maori',
         'mn-MN'=> 'Mongol',
-        'no-NO'=> 'Norueguês',
+        'nb-NO'=> 'Norwegian Bokmål',
+        'om-ET' => 'Oromo (Ethiopian)',
+        //'nn-NO'=> 'Norwegian Nynorsk',
         'fa-IR'=> 'Persa',
         'pl-PL'=> 'Polaco',
         'pt-PT'=> 'Português',
@@ -66,7 +68,7 @@ return [
         'zu-ZA'=> 'Zulu',
     ],
 
-    'select_country' => 'Selecione um país',
+    'select_country' => 'Select a Country',
     
     'countries' => [
         'AC'=>'Ilha de Ascensão',
@@ -133,6 +135,7 @@ return [
         'EC'=>'Equador',
         'EE'=>'Estónia',
         'EG'=>'Egito',
+        'GB-ENG'=>'England',
         'ER'=>'Eritreia',
         'ES'=>'Espanha',
         'ET'=>'Etiópia',
@@ -231,6 +234,7 @@ return [
         'NG'=>'Nigéria',
         'NI'=>'Nicarágua',
         'NL'=>'Países Baixos',
+        'GB-NIR' => 'Northern Ireland',
         'NO'=>'Noruega',
         'NP'=>'Nepal',
         'NR'=>'Nauru',
@@ -258,7 +262,7 @@ return [
         'RU'=>'Federação Russa',
         'RW'=>'Ruanda',
         'SA'=>'Arábia Saudita',
-        'UK'=>'Escócia',
+        'GB-SCT'=>'Escócia',
         'SB'=>'Ilhas Salomão',
         'SC'=>'Seychelles',
         'SS'=>'Sudão do Sul',
@@ -310,6 +314,7 @@ return [
         'VI'=>'Ilhas Virgens (E.U.A)',
         'VN'=>'Vietname',
         'VU'=>'Vanuatu',
+        'GB-WLS' =>'Wales',
         'WF'=>'Ilhas Wallis e Futuna',
         'WS'=>'Samoa',
         'YE'=>'Iémen',
diff --git a/resources/lang/pt-PT/mail.php b/resources/lang/pt-PT/mail.php
index cbb3394edc..039ddfca4c 100644
--- a/resources/lang/pt-PT/mail.php
+++ b/resources/lang/pt-PT/mail.php
@@ -23,24 +23,25 @@ return [
     'Item_Requested' => 'Item requisitado',
     'License_Checkin_Notification' => 'Licença recebida',
     'License_Checkout_Notification' => 'Licença registrada',
+    'license_for'   => 'License for',
     'Low_Inventory_Report' => 'Relatório de baixas de inventario',
     'a_user_canceled' => 'Um utilizador cancelou um pedido de artigo no site',
     'a_user_requested' => 'Um utilizador solicitou um artigo no site',
     'acceptance_asset_accepted' => 'Um usuário aceitou um item',
     'acceptance_asset_declined' => 'Um usuário recusou um item',
-    'accessory_name' => 'Nome do acessório:',
-    'additional_notes' => 'Notas adicionais:',
+    'accessory_name' => 'Nome do Acessório',
+    'additional_notes' => 'Notas adicionais',
     'admin_has_created' => 'Um administrador criou uma conta para ti no :web site.',
-    'asset' => 'Artigo:',
-    'asset_name' => 'Nome do Artigo:',
+    'asset' => 'Ativo',
+    'asset_name' => 'Nome do Ativo',
     'asset_requested' => 'Artigo requesitado',
     'asset_tag' => 'Etiqueta do Ativo',
     'assets_warrantee_alert' => 'Existe :count artigo com a garantia a expirar nos próximos :threshold dias.|Existem :count artigos com a garantia a expirar nos próximos :threshold dias.',
     'assigned_to' => 'Atribuído a',
     'best_regards' => 'Atenciosamente',
-    'canceled' => 'Cancelado:',
-    'checkin_date' => 'Data de devolução:',
-    'checkout_date' => 'Data de atribuição:',
+    'canceled' => 'Cancelado',
+    'checkin_date' => 'Data de devolução',
+    'checkout_date' => 'Data de alocação',
     'checkedout_from' => 'Check-out de',
     'checkedin_from'  => 'Check-in de',
     'checked_into' => 'Check-in em',
@@ -49,27 +50,30 @@ return [
     'click_to_confirm' => 'Por favor clique no link a seguir para confirmar sua conta :web:',
     'current_QTY' => 'qtde. actual',
     'days' => 'Dias',
-    'expecting_checkin_date' => 'Data prevista de devolução:',
+    'expecting_checkin_date' => 'Data de devolução esperada',
     'expires' => 'Expira a',
     'hello' => 'Olá',
     'hi' => 'Oi',
     'i_have_read' => 'Li e concordo com os termos de uso e recebi este item.',
     'inventory_report' => 'Relatório de Inventário',
-    'item' => 'Item:',
+    'item' => 'Item',
+    'item_checked_reminder' => 'This is a reminder that you currently have :count items checked out to you that you have not accepted or declined. Please click the link below to confirm your decision.',
     'license_expiring_alert' => 'Há :count licença a expirar nos próximos :threshold dias. Existem :count licenças que irão expirar nos próximos :threshold dias.',
     'link_to_update_password' => 'Por favor clique no link abaixo para actualizar a sua senha do :web:',
-    'login' => 'Login:',
+    'login' => 'Nome de registo',
     'login_first_admin' => 'Faça login na sua instalação do Snipe-IT usando os dados abaixo:',
     'low_inventory_alert' => 'Há :count que está abaixo do estoque mínimo ou em breve estará baixo. Existem :count itens que estão abaixo do estoque mínimo ou em breve estarão baixos.',
     'min_QTY' => 'Qt. Min.',
     'name' => 'Nome',
     'new_item_checked' => 'Um novo item foi atribuído a ti, os detalhes estão abaixo.',
+    'new_item_checked_with_acceptance' => 'A new item has been checked out under your name that requires acceptance, details are below.',
+    'recent_item_checked' => 'An item was recently checked out under your name that requires acceptance, details are below.',
     'notes' => 'Notas',
-    'password' => 'Senha:',
+    'password' => 'Password',
     'password_reset' => 'Repor senha',
     'read_the_terms' => 'Por favor, leia os termos de uso abaixo.',
     'read_the_terms_and_click' => 'Por favor, leia os termos de uso abaixo, e clique no link na parte inferior para confirmar que você leu e concorda com os termos de uso, e recebeu o ativo.',
-    'requested' => 'Requisitado:',
+    'requested' => 'Solicitado',
     'reset_link' => 'Seu Link de redefinição da senha',
     'reset_password' => 'Clique aqui para redefinir a sua password:',
     'rights_reserved' => 'Todos os direitos reservados.',
@@ -86,8 +90,10 @@ return [
     'upcoming-audits' => 'Existe um :count ativo que está a chegar para ser auditado em :threshold dias.|Existem :count ativos que estão a chegar para serem auditados em :threshold dias.',
     'user' => 'Utilizador',
     'username' => 'Nome de utilizador',
+    'unaccepted_asset_reminder' => 'Reminder: You have Unaccepted Assets.',
     'welcome' => 'Bem vindo, :name',
     'welcome_to' => 'Bem-vindo ao :web!',
     'your_assets' => 'Ver seus ativos',
     'your_credentials' => 'Suas credenciais do Snipe-IT',
+    'mail_sent' => 'Mail sent successfully!',
 ];
diff --git a/resources/lang/pt-PT/validation.php b/resources/lang/pt-PT/validation.php
index 9fa8ba649d..7d86e66be5 100644
--- a/resources/lang/pt-PT/validation.php
+++ b/resources/lang/pt-PT/validation.php
@@ -13,87 +13,150 @@ return [
     |
     */
 
-    'accepted'             => 'O :attribute tem que ser aceite.',
-    'active_url'           => 'O :attribute não é um URL válido.',
-    'after'                => 'A :attribute tem que ser superior a :date.',
-    'after_or_equal'       => 'O atributo: deve ser uma data após ou igual a: data.',
-    'alpha'                => 'O :attribute só pode conter letras.',
-    'alpha_dash'           => 'O :attribute só pode conter letras, números e traços.',
-    'alpha_num'            => 'O :attribute só pode conter letras e números.',
-    'array'                => 'O atributo: deve ser uma matriz.',
-    'before'               => 'A :attribute tem que ser anterior a :date.',
-    'before_or_equal'      => 'O atributo: deve ser uma data anterior ou igual a: data.',
-    'between'              => [
-        'numeric' => 'O :attribute deve estar entre :min e :max.',
-        'file'    => 'O :attribute deve estar entre :min e :max kilobytes.',
-        'string'  => 'O :attribute deve estar entre :min e :max caracteres.',
-        'array'   => 'O atributo deve ter entre: min e: itens máximos.',
+    'accepted' => 'The :attribute field must be accepted.',
+    'accepted_if' => 'The :attribute field must be accepted when :other is :value.',
+    'active_url' => 'The :attribute field must be a valid URL.',
+    'after' => 'The :attribute field must be a date after :date.',
+    'after_or_equal' => 'The :attribute field must be a date after or equal to :date.',
+    'alpha' => 'The :attribute field must only contain letters.',
+    'alpha_dash' => 'The :attribute field must only contain letters, numbers, dashes, and underscores.',
+    'alpha_num' => 'The :attribute field must only contain letters and numbers.',
+    'array' => 'The :attribute field must be an array.',
+    'ascii' => 'The :attribute field must only contain single-byte alphanumeric characters and symbols.',
+    'before' => 'The :attribute field must be a date before :date.',
+    'before_or_equal' => 'The :attribute field must be a date before or equal to :date.',
+    'between' => [
+        'array' => 'The :attribute field must have between :min and :max items.',
+        'file' => 'The :attribute field must be between :min and :max kilobytes.',
+        'numeric' => 'The :attribute field must be between :min and :max.',
+        'string' => 'The :attribute field must be between :min and :max characters.',
     ],
-    'boolean'              => 'O campo: atributo deve ser verdadeiro ou falso.',
-    'confirmed'            => 'A confirmação da :attribute não coincide.',
-    'date'                 => 'A :attribute não é uma data válida.',
-    'date_format'          => ':attribute não corresponde ao formato :format.',
-    'different'            => ':attribute e :other têm que ser diferentes.',
-    'digits'               => ':attribute de contem :digits dígitos.',
-    'digits_between'       => 'O :attribute deve estar entre :min e :max dígitos.',
-    'dimensions'           => 'O atributo: tem dimensões de imagem inválidas.',
-    'distinct'             => 'O campo: atributo tem um valor duplicado.',
-    'email'                => 'O formato do :attribute é inválido.',
-    'exists'               => 'O :attribute é inválido.',
-    'file'                 => 'O atributo: deve ser um arquivo.',
-    'filled'               => 'O campo: atributo deve ter um valor.',
-    'image'                => 'O :attribute tem que ser uma imagem.',
+    'boolean' => 'O campo: atributo deve ser verdadeiro ou falso.',
+    'can' => 'The :attribute field contains an unauthorized value.',
+    'confirmed' => 'The :attribute field confirmation does not match.',
+    'contains' => 'The :attribute field is missing a required value.',
+    'current_password' => 'The password is incorrect.',
+    'date' => 'The :attribute field must be a valid date.',
+    'date_equals' => 'The :attribute field must be a date equal to :date.',
+    'date_format' => 'The :attribute field must match the format :format.',
+    'decimal' => 'The :attribute field must have :decimal decimal places.',
+    'declined' => 'The :attribute field must be declined.',
+    'declined_if' => 'The :attribute field must be declined when :other is :value.',
+    'different' => 'The :attribute field and :other must be different.',
+    'digits' => 'The :attribute field must be :digits digits.',
+    'digits_between' => 'The :attribute field must be between :min and :max digits.',
+    'dimensions' => 'The :attribute field has invalid image dimensions.',
+    'distinct' => 'O campo: atributo tem um valor duplicado.',
+    'doesnt_end_with' => 'The :attribute field must not end with one of the following: :values.',
+    'doesnt_start_with' => 'The :attribute field must not start with one of the following: :values.',
+    'email' => 'The :attribute field must be a valid email address.',
+    'ends_with' => 'The :attribute field must end with one of the following: :values.',
+    'enum' => 'O :attribute selecionado é inválido.',
+    'exists' => 'O :attribute é inválido.',
+    'extensions' => 'The :attribute field must have one of the following extensions: :values.',
+    'file' => 'The :attribute field must be a file.',
+    'filled' => 'O campo: atributo deve ter um valor.',
+    'gt' => [
+        'array' => 'The :attribute field must have more than :value items.',
+        'file' => 'The :attribute field must be greater than :value kilobytes.',
+        'numeric' => 'The :attribute field must be greater than :value.',
+        'string' => 'The :attribute field must be greater than :value characters.',
+    ],
+    'gte' => [
+        'array' => 'The :attribute field must have :value items or more.',
+        'file' => 'The :attribute field must be greater than or equal to :value kilobytes.',
+        'numeric' => 'The :attribute field must be greater than or equal to :value.',
+        'string' => 'The :attribute field must be greater than or equal to :value characters.',
+    ],
+    'hex_color' => 'The :attribute field must be a valid hexadecimal color.',
+    'image' => 'The :attribute field must be an image.',
     'import_field_empty'    => 'O valor para :fieldname não pode ser nulo.',
-    'in'                   => 'O :attribute selecionado é inválido.',
-    'in_array'             => 'O campo: atributo não existe em: outro.',
-    'integer'              => 'O :attribute tem que ser um inteiro.',
-    'ip'                   => 'O :attribute tem que ser um IP válido.',
-    'ipv4'                 => 'O atributo: deve ser um endereço IPv4 válido.',
-    'ipv6'                 => 'O atributo deve ser um endereço IPv6 válido.',
-    'is_unique_department' => 'O :attribute deve ser único para esta localização da empresa',
-    'json'                 => 'O atributo: deve ser uma string JSON válida.',
-    'max'                  => [
-        'numeric' => 'O :attribute não pode ser maior do que :max.',
-        'file'    => 'O :attribute não pode ter mais do que :max kilobytes.',
-        'string'  => 'O :attribute não pode tem mais do que :max caracteres.',
-        'array'   => 'O atributo: pode não ter mais do que: itens máximos.',
+    'in' => 'O :attribute selecionado é inválido.',
+    'in_array' => 'The :attribute field must exist in :other.',
+    'integer' => 'The :attribute field must be an integer.',
+    'ip' => 'The :attribute field must be a valid IP address.',
+    'ipv4' => 'The :attribute field must be a valid IPv4 address.',
+    'ipv6' => 'The :attribute field must be a valid IPv6 address.',
+    'json' => 'The :attribute field must be a valid JSON string.',
+    'list' => 'The :attribute field must be a list.',
+    'lowercase' => 'The :attribute field must be lowercase.',
+    'lt' => [
+        'array' => 'The :attribute field must have less than :value items.',
+        'file' => 'The :attribute field must be less than :value kilobytes.',
+        'numeric' => 'The :attribute field must be less than :value.',
+        'string' => 'The :attribute field must be less than :value characters.',
     ],
-    'mimes'                => 'O :attribute só pode contem os seguintes formatos: :values.',
-    'mimetypes'            => 'O: atributo deve ser um arquivo de tipo:: valores.',
-    'min'                  => [
-        'numeric' => ':attribute deve ter pelos menos :min.',
-        'file'    => ':attribute deve ter pelos menos :min kilobytes.',
-        'string'  => 'O :attribute deve conter pelos menos :min caracteres.',
-        'array'   => 'O atributo deve ter pelo menos: itens mínimos.',
+    'lte' => [
+        'array' => 'The :attribute field must not have more than :value items.',
+        'file' => 'The :attribute field must be less than or equal to :value kilobytes.',
+        'numeric' => 'The :attribute field must be less than or equal to :value.',
+        'string' => 'The :attribute field must be less than or equal to :value characters.',
     ],
-    'starts_with'          => 'O :attribute deve começar com um dos seguintes: :values.',
-    'ends_with'            => 'O :attribute deve terminar com um dos seguintes: :values.',
+    'mac_address' => 'The :attribute field must be a valid MAC address.',
+    'max' => [
+        'array' => 'The :attribute field must not have more than :max items.',
+        'file' => 'The :attribute field must not be greater than :max kilobytes.',
+        'numeric' => 'The :attribute field must not be greater than :max.',
+        'string' => 'The :attribute field must not be greater than :max characters.',
+    ],
+    'max_digits' => 'The :attribute field must not have more than :max digits.',
+    'mimes' => 'The :attribute field must be a file of type: :values.',
+    'mimetypes' => 'The :attribute field must be a file of type: :values.',
+    'min' => [
+        'array' => 'The :attribute field must have at least :min items.',
+        'file' => 'The :attribute field must be at least :min kilobytes.',
+        'numeric' => 'The :attribute field must be at least :min.',
+        'string' => 'The :attribute field must be at least :min characters.',
+    ],
+    'min_digits' => 'The :attribute field must have at least :min digits.',
+    'missing' => 'The :attribute field must be missing.',
+    'missing_if' => 'The :attribute field must be missing when :other is :value.',
+    'missing_unless' => 'The :attribute field must be missing unless :other is :value.',
+    'missing_with' => 'The :attribute field must be missing when :values is present.',
+    'missing_with_all' => 'The :attribute field must be missing when :values are present.',
+    'multiple_of' => 'The :attribute field must be a multiple of :value.',
+    'not_in' => 'O :attribute selecionado é inválido.',
+    'not_regex' => 'The :attribute field format is invalid.',
+    'numeric' => 'The :attribute field must be a number.',
+    'password' => [
+        'letters' => 'The :attribute field must contain at least one letter.',
+        'mixed' => 'The :attribute field must contain at least one uppercase and one lowercase letter.',
+        'numbers' => 'The :attribute field must contain at least one number.',
+        'symbols' => 'The :attribute field must contain at least one symbol.',
+        'uncompromised' => 'The given :attribute has appeared in a data leak. Please choose a different :attribute.',
+    ],
+    'percent'       => 'The depreciation minimum must be between 0 and 100 when depreciation type is percentage.',
 
-    'not_in'               => 'O :attribute selecionado é inválido.',
-    'numeric'              => ':attribute tem que ser um número.',
-    'present'              => 'O campo: atributo deve estar presente.',
-    'valid_regex'          => 'Este não é um código regex válido.',
-    'regex'                => 'O formato do :attribute é inválido.',
-    'required'             => ':attribute é obrigatório.',
-    'required_if'          => 'O :attribute é obrigatório quando :other é :value.',
-    'required_unless'      => 'O campo: atributo é necessário a menos que: outro esteja em: valores.',
-    'required_with'        => 'O :attribute é obrigatório quando :values existem.',
-    'required_with_all'    => 'O campo: atributo é obrigatório quando: os valores estão presentes.',
-    'required_without'     => 'O :attribute é obrigatório quando :values não existem.',
+    'present' => 'O campo: atributo deve estar presente.',
+    'present_if' => 'The :attribute field must be present when :other is :value.',
+    'present_unless' => 'The :attribute field must be present unless :other is :value.',
+    'present_with' => 'The :attribute field must be present when :values is present.',
+    'present_with_all' => 'The :attribute field must be present when :values are present.',
+    'prohibited' => 'The :attribute field is prohibited.',
+    'prohibited_if' => 'The :attribute field is prohibited when :other is :value.',
+    'prohibited_unless' => 'The :attribute field is prohibited unless :other is in :values.',
+    'prohibits' => 'The :attribute field prohibits :other from being present.',
+    'regex' => 'The :attribute field format is invalid.',
+    'required' => ':attribute é obrigatório.',
+    'required_array_keys' => 'The :attribute field must contain entries for: :values.',
+    'required_if' => 'O :attribute é obrigatório quando :other é :value.',
+    'required_if_accepted' => 'The :attribute field is required when :other is accepted.',
+    'required_if_declined' => 'The :attribute field is required when :other is declined.',
+    'required_unless' => 'O campo: atributo é necessário a menos que: outro esteja em: valores.',
+    'required_with' => 'O :attribute é obrigatório quando :values existem.',
+    'required_with_all' => 'The :attribute field is required when :values are present.',
+    'required_without' => 'O :attribute é obrigatório quando :values não existem.',
     'required_without_all' => 'O campo: atributo é obrigatório quando nenhum de: valores estão presentes.',
-    'same'                 => ':attribute e :other devem coincidir.',
-    'size'                 => [
-        'numeric' => 'O :attribute deve ser maior que :size.',
-        'file'    => 'O :attribute deve ter :size kilobytes.',
-        'string'  => 'O :attribute deve conter :size caracteres.',
-        'array'   => 'O atributo: deve conter: itens de tamanho.',
+    'same' => 'The :attribute field must match :other.',
+    'size' => [
+        'array' => 'The :attribute field must contain :size items.',
+        'file' => 'The :attribute field must be :size kilobytes.',
+        'numeric' => 'The :attribute field must be :size.',
+        'string' => 'The :attribute field must be :size characters.',
     ],
+    'starts_with' => 'The :attribute field must start with one of the following: :values.',
     'string'               => 'O atributo deve ser uma string.',
-    'timezone'             => 'O atributo: deve ser uma zona válida.',
     'two_column_unique_undeleted' => 'O :attribute deve ser único entre :table1 e :table2. ',
-    'unique'               => 'Este :attribute já existe.',
-    'uploaded'             => 'O atributo: não foi possível carregar.',
-    'url'                  => 'O formato do :attribute é inválido.',
     'unique_undeleted'     => 'O :atribute deve ser único.',
     'non_circular'         => 'O :attribute não deve criar uma referência circular.',
     'not_array'            => ':attribute não pode ser um array.',
@@ -102,11 +165,14 @@ return [
     'numbers'              => 'A senha deve conter no mínimo um símbolo.',
     'case_diff'            => 'A senha deve usar maiúsculas e minúsculas.',
     'symbols'              => 'A senha deve conter símbolos.',
-    'gte'                  => [
-        'numeric'          => 'Valor não pode ser negativo'
-    ],
-    'checkboxes'           => ':attribute contém opções inválidas.',
-    'radio_buttons'        => ':attribute é inválido.',
+    'timezone' => 'The :attribute field must be a valid timezone.',
+    'unique' => 'Este :attribute já existe.',
+    'uploaded' => 'O atributo: não foi possível carregar.',
+    'uppercase' => 'The :attribute field must be uppercase.',
+    'url' => 'The :attribute field must be a valid URL.',
+    'ulid' => 'The :attribute field must be a valid ULID.',
+    'uuid' => 'The :attribute field must be a valid UUID.',
+    'fmcs_location' => 'Full multiple company support and location scoping is enabled in the Admin Settings, and the selected location and selected company are not compatible.',
 
 
     /*
@@ -120,16 +186,22 @@ return [
     |
     */
 
+    'email_array'      => 'Um ou mais endereços de e-mail são inválidos.',
+    'checkboxes'           => ':attribute contém opções inválidas.',
+    'radio_buttons'        => ':attribute é inválido.',
+    
     'custom' => [
         'alpha_space' => 'O campo: atributo contém um caractere que não é permitido.',
-        'email_array'      => 'Um ou mais endereços de e-mail são inválidos.',
+
         'hashed_pass'      => 'Sua senha atual está incorreta',
         'dumbpwd'          => 'Essa senha é muito comum.',
         'statuslabel_type' => 'Você deve selecionar um tipo de etiqueta de status válido',
+        'custom_field_not_found'          => 'This field does not seem to exist, please double check your custom field names.',
+        'custom_field_not_found_on_model' => 'This field seems to exist, but is not available on this Asset Model\'s fieldset.',
 
         // date_format validation with slightly less stupid messages. It duplicates a lot, but it gets the job done :(
-        // We use this because the default error message for date_format is reflects php Y-m-d, which non-PHP
-        // people won't know how to format. 
+        // We use this because the default error message for date_format reflects php Y-m-d, which non-PHP
+        // people won't know how to format.
         'purchase_date.date_format'     => 'O :attribute deve ser uma data válida em formato YYYY-MM-DD',
         'last_audit_date.date_format'   =>  'O :attribute deve ser uma data válida em formato YYYY-MM-DD hh:mm:ss',
         'expiration_date.date_format'   =>  'O :attribute deve ser uma data válida em formato YYYY-MM-DD',
@@ -137,9 +209,15 @@ return [
         'expected_checkin.date_format'  =>  'O :attribute deve ser uma data válida em formato YYYY-MM-DD',
         'start_date.date_format'        =>  'O :attribute deve ser uma data válida em formato YYYY-MM-DD',
         'end_date.date_format'          =>  'O :attribute deve ser uma data válida em formato YYYY-MM-DD',
+        'invalid_value_in_field' => 'Valor inválido incluído neste campo',
 
-    ],
+        'ldap_username_field' => [
+            'not_in' =>         '<code>sAMAccountName</code> (mixed case) will likely not work. You should use <code>samaccountname</code> (lowercase) instead.'
+        ],
+        'ldap_auth_filter_query' => ['not_in' => '<code>uid=samaccountname</code> is probably not a valid auth filter. You probably want <code>uid=</code> '],
+        'ldap_filter' => ['regex' => 'This value should probably not be wrapped in parentheses.'],
 
+        ],
     /*
     |--------------------------------------------------------------------------
     | Custom Validation Attributes
@@ -155,8 +233,16 @@ return [
 
     /*
     |--------------------------------------------------------------------------
-    | Generic Validation Messages
+    | Generic Validation Messages - we use these in the jquery validation where we don't have
+    | access to the :attribute
     |--------------------------------------------------------------------------
     */
-    'invalid_value_in_field' => 'Valor inválido incluído neste campo',
+
+    'generic' => [
+        'invalid_value_in_field' => 'Valor inválido incluído neste campo',
+        'required' => 'This field is required',
+        'email' => 'Please enter a valid email address',
+    ],
+
+
 ];
diff --git a/resources/lang/ro-RO/account/general.php b/resources/lang/ro-RO/account/general.php
index 43143459fb..94d1f4e1e7 100644
--- a/resources/lang/ro-RO/account/general.php
+++ b/resources/lang/ro-RO/account/general.php
@@ -2,10 +2,16 @@
 
 return array(
     'personal_api_keys' => 'Chei API personale',
+    'personal_access_token' => 'Personal Access Token',
+    'personal_api_keys_success' => 'Personal API Key :key created sucessfully',
+    'here_is_api_key' => 'Here is your new personal access token. This is the only time it will be shown so do not lose it! You may now use this token to make API requests.',
     'api_key_warning' => 'When generating an API token, be sure to copy it down immediately as they will not be visible to you again.',
     'api_base_url' => 'URL-ul de bază API este localizat la:',
     'api_base_url_endpoint' => '/&lt;endpoint&gt;',
     'api_token_expiration_time' => 'Token-urile API sunt setate să expire în:',
     'api_reference' => 'Please check the <a href="https://snipe-it.readme.io/reference" target="_blank">API reference</a> to find specific API endpoints and additional API documentation.',
     'profile_updated' => 'Account successfully updated',
+    'no_tokens' => 'You have not created any personal access tokens.',
+    'enable_sounds' => 'Enable sound effects',
+    'enable_confetti' => 'Enable confetti effects',
 );
diff --git a/resources/lang/ro-RO/admin/accessories/message.php b/resources/lang/ro-RO/admin/accessories/message.php
index fd2b34befd..610c775322 100644
--- a/resources/lang/ro-RO/admin/accessories/message.php
+++ b/resources/lang/ro-RO/admin/accessories/message.php
@@ -26,7 +26,11 @@ return array(
         'error'   		=> 'Accesoriu nu a fost predat, vă rugăm să încercaţi din nou',
         'success' 		=> 'Accesoriu a fost predat.',
         'unavailable'   => 'Accesoriul nu este disponibil pentru checkout. Verificați cantitatea disponibilă',
-        'user_does_not_exist' => 'Acest utilizator nu este valid. Vă rugăm să încercaţi din nou.'
+        'user_does_not_exist' => 'Acest utilizator nu este valid. Vă rugăm să încercaţi din nou.',
+         'checkout_qty' => array(
+            'lte'  => 'There is currently only one available accessory of this type, and you are trying to check out :checkout_qty. Please adjust the checkout quantity or the total stock of this accessory and try again.|There are :number_currently_remaining total available accessories, and you are trying to check out :checkout_qty. Please adjust the checkout quantity or the total stock of this accessory and try again.',
+            ),
+           
     ),
 
     'checkin' => array(
diff --git a/resources/lang/ro-RO/admin/accessories/table.php b/resources/lang/ro-RO/admin/accessories/table.php
index 614a95a501..977654c28a 100644
--- a/resources/lang/ro-RO/admin/accessories/table.php
+++ b/resources/lang/ro-RO/admin/accessories/table.php
@@ -6,6 +6,4 @@ return array(
     'id'      					=> 'ID-ul',
     'require_acceptance'      	=> 'Acceptare',
     'title'      				=> 'Nume de accesoriu',
-
-
 );
diff --git a/resources/lang/ro-RO/admin/components/message.php b/resources/lang/ro-RO/admin/components/message.php
index b9f27ab113..9a85a29606 100644
--- a/resources/lang/ro-RO/admin/components/message.php
+++ b/resources/lang/ro-RO/admin/components/message.php
@@ -17,7 +17,8 @@ return array(
     'delete' => array(
         'confirm'   => 'Sigur doriți să ștergeți această componentă?',
         'error'   => 'A apărut o problemă de ștergere a componentei. Vă rugăm să încercați din nou.',
-        'success' => 'Componenta a fost șters cu succes.'
+        'success' => 'Componenta a fost șters cu succes.',
+        'error_qty'   => 'Some components of this type are still checked out. Please check them in and try again.',
     ),
 
      'checkout' => array(
diff --git a/resources/lang/ro-RO/admin/consumables/general.php b/resources/lang/ro-RO/admin/consumables/general.php
index 5d70a0c388..f8f89ad30b 100644
--- a/resources/lang/ro-RO/admin/consumables/general.php
+++ b/resources/lang/ro-RO/admin/consumables/general.php
@@ -8,4 +8,5 @@ return array(
     'remaining' 			            => 'Rămas',
     'total' 			                => 'Total',
     'update'                            => 'Actualizați consumabilele',
+    'inventory_warning'                 => 'The inventory of this consumable is below the minimum amount of :min_count',
 );
diff --git a/resources/lang/ro-RO/admin/consumables/message.php b/resources/lang/ro-RO/admin/consumables/message.php
index 1f97ef3b61..5c4f1e3c14 100644
--- a/resources/lang/ro-RO/admin/consumables/message.php
+++ b/resources/lang/ro-RO/admin/consumables/message.php
@@ -2,6 +2,7 @@
 
 return array(
 
+    'invalid_category_type' => 'The category must be a consumable category.',
     'does_not_exist' => 'Consumul nu există.',
 
     'create' => array(
diff --git a/resources/lang/ro-RO/admin/custom_fields/general.php b/resources/lang/ro-RO/admin/custom_fields/general.php
index afb9c31047..5ff72e3405 100644
--- a/resources/lang/ro-RO/admin/custom_fields/general.php
+++ b/resources/lang/ro-RO/admin/custom_fields/general.php
@@ -35,7 +35,7 @@ return [
     'create_field_title' => 'Creați un nou câmp personalizat',
     'value_encrypted'      	        => 'Valoarea acestui câmp este criptată în baza de date. Numai utilizatorii de administrare vor putea vizualiza valoarea decriptată',
     'show_in_email'     => 'Includeți valoarea acestui câmp în e-mailurile trimise utilizatorului? Căsuțele criptate nu pot fi incluse în e-mailuri',
-    'show_in_email_short'     => 'Include în e-mailuri.',
+    'show_in_email_short' => 'Include în e-mailuri',
     'help_text' => 'Text de ajutor',
     'help_text_description' => 'Acesta este un text opțional care va apărea mai jos de elementele formularului în timp ce editezi un activ pentru a oferi informații contextuale pentru fiecare câmp.',
     'about_custom_fields_title' => 'Despre câmpuri personalizate',
@@ -57,5 +57,8 @@ return [
     'show_in_requestable_list_short' => 'Arată în lista de active care pot fi solicitate',
     'show_in_requestable_list' => 'Arată valoarea în lista de active solicitate. Câmpurile criptate nu vor fi afișate',
     'encrypted_options' => 'Acest câmp este criptat, astfel încât unele opțiuni de afișare nu vor fi disponibile.',
+    'display_checkin' => 'Display in checkin forms',
+    'display_checkout' => 'Display in checkout forms',
+    'display_audit' => 'Display in audit forms',
 
 ];
diff --git a/resources/lang/ro-RO/admin/custom_fields/message.php b/resources/lang/ro-RO/admin/custom_fields/message.php
index 8def1ea2d2..395169fa84 100644
--- a/resources/lang/ro-RO/admin/custom_fields/message.php
+++ b/resources/lang/ro-RO/admin/custom_fields/message.php
@@ -5,6 +5,7 @@ return array(
     'field' => array(
         'invalid'   => 'Acest câmp nu există.',
         'already_added'   => 'Câmpul deja adăugat',
+        'none_selected'   => 'No field selected',
 
         'create' => array(
             'error'   => 'Câmpul nu a fost creat, încercați din nou.',
diff --git a/resources/lang/ro-RO/admin/depreciations/general.php b/resources/lang/ro-RO/admin/depreciations/general.php
index db39a1f268..e3c63436d5 100644
--- a/resources/lang/ro-RO/admin/depreciations/general.php
+++ b/resources/lang/ro-RO/admin/depreciations/general.php
@@ -13,4 +13,8 @@ return [
     'no_depreciations_warning'               => '<strong>Avertisment: </strong>
                       Nu aveți în prezent nici o depreciere configurată.
                       Te rugam sa setezi cel putin o depreciere pentru a vedea raportul deprecierii.',
+    'depreciation_method'                   => 'Raport depreciere',
+    'linear_depreciation'                   => 'Linear (Default)',
+    'half_1'                                => 'Half-year convention, always applied',
+    'half_2'                                => 'Half-year convention, applied with condition',
 ];
diff --git a/resources/lang/ro-RO/admin/hardware/form.php b/resources/lang/ro-RO/admin/hardware/form.php
index a749e19ff2..451dfeb203 100644
--- a/resources/lang/ro-RO/admin/hardware/form.php
+++ b/resources/lang/ro-RO/admin/hardware/form.php
@@ -55,8 +55,11 @@ return [
     'asset_location_update_default' => 'Actualizați doar locația implicită',
     'asset_location_update_actual' => 'Actualizează doar locația reală',
     'asset_not_deployable' => 'Activul este indisponibil și nu poate fi eliberat.',
-    'asset_deployable' => 'Activul e disponibil și poate fi eliberat.',
+    'asset_not_deployable_checkin' => 'That asset status is not deployable. Using this status label will checkin the asset.',
+    'asset_deployable' => 'This asset can be checked out.',
     'processing_spinner' => 'Procesare... (Ar putea dura puţin timp pe fişiere mari)',
+    'processing' => 'În curs de procesare... ',
     'optional_infos'  => 'Informații opționale',
-    'order_details'   => 'Informații legate de comandă'
+    'order_details'   => 'Informații legate de comandă',
+    'calc_eol'    => 'If nulling the EOL date, use automatic EOL calculation based on the purchase date and EOL rate.',
 ];
diff --git a/resources/lang/ro-RO/admin/hardware/general.php b/resources/lang/ro-RO/admin/hardware/general.php
index 9d2fe60e78..5bfb6af89c 100644
--- a/resources/lang/ro-RO/admin/hardware/general.php
+++ b/resources/lang/ro-RO/admin/hardware/general.php
@@ -5,8 +5,8 @@ return [
     'about_assets_text'            => 'Activele sunt elemente urmărite prin numărul de serie sau eticheta de activ. Ele tind să fie elemente de valoare mai mare în cazul în care identificarea unui anumit element contează.',
     'archived'  				=> 'Arhivate',
     'asset'  					=> 'Activ',
-    'bulk_checkout'             => 'Predă activ',
-    'bulk_checkin'              => 'Checkin Assets',
+    'bulk_checkout'             => 'Comenzi în numerar',
+    'bulk_checkin'              => 'Bulk Checkin',
     'checkin'  					=> 'Verifica activ',
     'checkout'  				=> 'Checkout Asset',
     'clone'  					=> 'Cloneaza activ',
@@ -27,8 +27,7 @@ return [
     'undeployable_tooltip'  	=> 'Acest activ are o etichetă de stare care nu poate fi implementată și nu poate fi verificată în acest moment.',
     'view'  					=> 'Vizualizeaza activ',
     'csv_error' => 'Aveți o eroare în fișierul dvs. CSV:',
-    'import_text' => '<p>Încărcați un CSV care conține istoricul activelor. Activele și utilizatorii TREBUIE să existe deja în sistem sau acestea vor fi ignorate. Se potrivește activele pentru importul din istorie se întâmplă cu eticheta activului. Vom încerca să găsim un utilizator care se potrivește pe baza numelui de utilizator pe care îl furnizați, și a criteriilor pe care le selectați mai jos. Dacă nu selectați niciun criteriu de mai jos, va încerca pur şi simplu să se potrivească în formatul de nume de utilizator configurat în <code>Admin &gt; General Settings</code>.</p><p>Câmpurile incluse în CSV trebuie să se potrivească cu header-urile: <strong>Tag-ul de activ, nume, data de checkkout, data de Checkin data</strong>. Orice câmpuri suplimentare vor fi ignorate. </p>Data de verificare<p>: datele de verificare necompletate sau viitoare vor verifica articole către utilizatorul asociat. Cu excepția coloanei cu data de Checkin va crea o dată de verificare cu data de jocuri.</p>
-    ',
+    'import_text' => '<p>Upload a CSV that contains asset history. The assets and users MUST already exist in the system, or they will be skipped. Matching assets for history import happens against the asset tag. We will try to find a matching user based on the user\'s name you provide, and the criteria you select below. If you do not select any criteria below, it will simply try to match on the username format you configured in the <code>Admin &gt; General Settings</code>.</p><p>Fields included in the CSV must match the headers: <strong>Asset Tag, Name, Checkout Date, Checkin Date</strong>. Any additional fields will be ignored. </p><p>Checkin Date: blank or future checkin dates will checkout items to associated user.  Excluding the Checkin Date column will create a checkin date with todays date.</p>    ',
     'csv_import_match_f-l' => 'Încercați să potriviți utilizatorii după formatul <strong>firstname.lastname</strong> (<code>jane.smith</code>)',
     'csv_import_match_initial_last' => 'Încercați să potriviți utilizatorii după <strong>primul nume de familie</strong> (<code>jsmith</code>) format',
     'csv_import_match_first' => 'Încercați să potriviți utilizatorii după formatul <strong>prenume</strong> (<code>jane</code>)',
diff --git a/resources/lang/ro-RO/admin/hardware/message.php b/resources/lang/ro-RO/admin/hardware/message.php
index 3cd257b274..d823642a7c 100644
--- a/resources/lang/ro-RO/admin/hardware/message.php
+++ b/resources/lang/ro-RO/admin/hardware/message.php
@@ -2,18 +2,23 @@
 
 return [
 
-    'undeployable' 		=> '<strong>Warning: </strong> Acest activ a fost marcat ca fiind în prezent nedelimitat. Dacă această stare sa modificat, actualizați starea activelor.',
-    'does_not_exist' 	=> 'Activul nu exista.',
-    'does_not_exist_var'=> 'Asset with tag :asset_tag not found.',
-    'no_tag' 	        => 'No asset tag provided.',
+    'undeployable' 		 => '<strong>Warning: </strong> This asset has been marked as currently undeployable. If this status has changed, please update the asset status.',
+    'does_not_exist' 	 => 'Activul nu exista.',
+    'does_not_exist_var' => 'Asset with tag :asset_tag not found.',
+    'no_tag' 	         => 'No asset tag provided.',
     'does_not_exist_or_not_requestable' => 'Acest activ nu există sau nu poate fi solicitat.',
-    'assoc_users'	 	=> 'Acest activ este predat catre un utilizator si nu se poate sterge. Va rugam verificati activul, dupa care incercati sa-l stergeti iar. ',
+    'assoc_users'	 	 => 'Acest activ este predat catre un utilizator si nu se poate sterge. Va rugam verificati activul, dupa care incercati sa-l stergeti iar. ',
     'warning_audit_date_mismatch' 	=> 'This asset\'s next audit date (:next_audit_date) is before the last audit date (:last_audit_date). Please update the next audit date.',
+    'labels_generated'   => 'Labels were successfully generated.',
+    'error_generating_labels' => 'Error while generating labels.',
+    'no_assets_selected' => 'No assets selected.',
 
     'create' => [
         'error'   		=> 'Activul nu a fost creat, va rugam incercati iar. :(',
         'success' 		=> 'Activul a fost creat. :)',
         'success_linked' => 'Activul cu tag-ul :tag a fost creat cu succes. <strong><a href=":link" style="color: white;">Click aici pentru a vizualiza</a></strong>.',
+        'multi_success_linked' => 'Asset with tag :links was created successfully.|:count assets were created succesfully. :links.',
+        'partial_failure' => 'An asset was unable to be created. Reason: :failures|:count assets were unable to be created. Reasons: :failures',
     ],
 
     'update' => [
@@ -51,20 +56,24 @@ return [
     ],
 
     'import' => [
+        'import_button'         => 'Process Import',
         'error'                 => 'Unele elemente nu au importat corect.',
         'errorDetail'           => 'Următoarele elemente nu au fost importate din cauza erorilor.',
         'success'               => 'Fișierul dvs. a fost importat',
         'file_delete_success'   => 'Fișierul dvs. a fost șters cu succes',
         'file_delete_error'      => 'Fișierul nu a putut fi șters',
         'file_missing' => 'Fișierul selectat lipsește',
+        'file_already_deleted' => 'The file selected was already deleted',
         'header_row_has_malformed_characters' => 'Unul sau mai multe atribute din rândul de antet conțin caractere UTF-8 incorecte',
         'content_row_has_malformed_characters' => 'Unul sau mai multe atribute din primul rând de conținut conțin caractere UTF-8 formatate incorect',
+        'transliterate_failure' => 'Transliteration from :encoding to UTF-8 failed due to invalid characters in input'
     ],
 
 
     'delete' => [
         'confirm'   	=> 'Sunteti sigur ca vreti sa stergeti acest activ?',
         'error'   		=> 'S-a intampinat o problema la stergerea activului. Va rugam incercati iar.',
+        'assigned_to_error' => '{1}Asset Tag: :asset_tag is currently checked out. Check in this device before deletion.|[2,*]Asset Tags: :asset_tag are currently checked out. Check in these devices before deletion.',
         'nothing_updated'   => 'Nu au fost selectate active, deci nimic nu a fost șters.',
         'success' 		=> 'Activul a fost sters.',
     ],
@@ -77,6 +86,11 @@ return [
         'no_assets_selected' => 'Trebuie să selectați cel puțin un articol din lista',
     ],
 
+    'multi-checkout' => [
+        'error'   => 'Asset was not checked out, please try again|Assets were not checked out, please try again',
+        'success' => 'Asset checked out successfully.|Assets checked out successfully.',
+    ],
+
     'checkin' => [
         'error'   		=> 'Activul nu a fost primit, va rugam incercati iar',
         'success' 		=> 'Activul a fost primit.',
@@ -86,9 +100,10 @@ return [
     ],
 
     'requests' => [
-        'error'   		=> 'Nu a fost solicitat un activ, încercați din nou',
-        'success' 		=> 'Activele solicitate cu succes.',
-        'canceled'      => 'Solicitarea de checkout a fost anulată cu succes',
+        'error'   		=> 'Request was not successful, please try again.',
+        'success' 		=> 'Request successfully submitted.',
+        'canceled'      => 'Request successfully canceled.',
+        'cancel'        => 'Anulează această cerere de articol',
     ],
 
 ];
diff --git a/resources/lang/ro-RO/admin/hardware/table.php b/resources/lang/ro-RO/admin/hardware/table.php
index 99fee87e3e..e14e7f2704 100644
--- a/resources/lang/ro-RO/admin/hardware/table.php
+++ b/resources/lang/ro-RO/admin/hardware/table.php
@@ -25,7 +25,6 @@ return [
     'image'		    => 'Imagine dispozitiv',
     'days_without_acceptance' => 'Zile fără acceptare',
     'monthly_depreciation' => 'Depreciere lunară',
-    'assigned_to'    => 'Desemnat către',
     'requesting_user' => 'Utilizatorul solicitant',
     'requested_date' => 'Data solicitării',
     'changed'       => 'Modificat',
diff --git a/resources/lang/ro-RO/admin/kits/general.php b/resources/lang/ro-RO/admin/kits/general.php
index f8d12b74b3..734ba23eb7 100644
--- a/resources/lang/ro-RO/admin/kits/general.php
+++ b/resources/lang/ro-RO/admin/kits/general.php
@@ -47,4 +47,5 @@ return [
     'kit_deleted'                       => 'Kit a fost șters cu succes',
     'kit_model_updated'                 => 'Modelul a fost actualizat cu succes',
     'kit_model_detached'                => 'Modelul a fost detașat cu succes',
+    'model_already_attached'            => 'Model already attached to kit',
 ];
diff --git a/resources/lang/ro-RO/admin/licenses/general.php b/resources/lang/ro-RO/admin/licenses/general.php
index 95a4450875..86f301504a 100644
--- a/resources/lang/ro-RO/admin/licenses/general.php
+++ b/resources/lang/ro-RO/admin/licenses/general.php
@@ -14,6 +14,7 @@ return array(
     'info'  					=> 'Info licenta',
     'license_seats'  			=> 'Locuri licenta',
     'seat'  					=> 'Loc',
+    'seat_count'  				=> 'Seat :count',
     'seats'  					=> 'Locuri',
     'software_licenses'  		=> 'Licente software',
     'user'  					=> 'Utilizator',
@@ -23,12 +24,12 @@ return array(
         [
             'checkin_all'           => [
                 'button'            => 'Verifică toate locurile',
-                'modal'             => 'Aceasta actiune va verifica un singur loc. This action will checkin all :checkedout_seats_count seats for this license.',
+                'modal'             => 'This action will checkin one seat. | This action will checkin all :checkedout_seats_count seats for this license.',
                 'enabled_tooltip'   => 'Verificați TOATE scaunele pentru această licență atât de la utilizatori, cât și de la active',
                 'disabled_tooltip'  => 'Acest lucru este dezactivat deoarece nu există locuri în prezent verificate',
                 'disabled_tooltip_reassignable'  => 'Acest lucru este dezactivat deoarece licența nu este reatribuită',
                 'success'           => 'Licenta a fost verificata cu succes! In toate licentele au fost verificate cu succes!',
-                'log_msg'           => 'Verificat prin licenta colectiva in Licenta GUI',
+                'log_msg'           => 'Checked in via bulk license checkin in license GUI',
             ],
 
             'checkout_all'              => [
diff --git a/resources/lang/ro-RO/admin/licenses/message.php b/resources/lang/ro-RO/admin/licenses/message.php
index 641c04abab..411ec37f4f 100644
--- a/resources/lang/ro-RO/admin/licenses/message.php
+++ b/resources/lang/ro-RO/admin/licenses/message.php
@@ -44,10 +44,13 @@ return array(
         'error'   => 'A aparut o problema la predarea licentei. Va rugam incercati iar.',
         'success' => 'Licenta a fost predata',
         'not_enough_seats' => 'Nu sunt disponibile suficiente locuri de licență pentru checkout',
+        'mismatch' => 'The license seat provided does not match the license',
+        'unavailable' => 'This seat is not available for checkout.',
     ),
 
     'checkin' => array(
         'error'   => 'A aparut o problema la primirea licentei. Va rugam incercati iar.',
+        'not_reassignable' => 'License not reassignable',
         'success' => 'Licenta a fost primita'
     ),
 
diff --git a/resources/lang/ro-RO/admin/locations/message.php b/resources/lang/ro-RO/admin/locations/message.php
index 4b1a136ce5..500553c36e 100644
--- a/resources/lang/ro-RO/admin/locations/message.php
+++ b/resources/lang/ro-RO/admin/locations/message.php
@@ -3,11 +3,12 @@
 return array(
 
     'does_not_exist' => 'Locatia nu exista.',
-    'assoc_users'    => 'This location is not currently deletable because it is the location of record for at least one asset or user, has assets assigned to it, or is the parent location of another location. Please update your models to no longer reference this company and try again. ',
+    'assoc_users'    => 'This location is not currently deletable because it is the location of record for at least one asset or user, has assets assigned to it, or is the parent location of another location. Please update your records to no longer reference this location and try again ',
     'assoc_assets'	 => 'Această locație este în prezent asociată cu cel puțin un material și nu poate fi ștearsă. Actualizați-vă activele astfel încât acestea să nu mai fie menționate și să încercați din nou.',
     'assoc_child_loc'	 => 'Această locație este în prezent părinte pentru cel puțin o locație copil și nu poate fi ștearsă. Actualizați locațiile dvs. pentru a nu mai referi această locație și încercați din nou.',
     'assigned_assets' => 'Atribuire Active',
     'current_location' => 'Locația curentă',
+    'open_map' => 'Open in :map_provider_icon Maps',
 
 
     'create' => array(
@@ -20,6 +21,11 @@ return array(
         'success' => 'Locatia a fost actualizata.'
     ),
 
+    'restore' => array(
+        'error'   => 'Location was not restored, please try again',
+        'success' => 'Location restored successfully.'
+    ),
+
     'delete' => array(
         'confirm'   	=> 'Sunteti sigur ca vreti sa stergeti aceasta locatie?',
         'error'   => 'A aparut o problema la stergerea locatiei. Va rugam incercati iar.',
diff --git a/resources/lang/ro-RO/admin/locations/table.php b/resources/lang/ro-RO/admin/locations/table.php
index 20e89c437b..a1021925e0 100644
--- a/resources/lang/ro-RO/admin/locations/table.php
+++ b/resources/lang/ro-RO/admin/locations/table.php
@@ -39,4 +39,5 @@ return [
     'signed_by_finance_auditor' => 'Semnat de (auditor financiar):',
     'signed_by_location_manager' => 'Semnat de (Location Manager):',
     'signed_by'                 => 'Semnat Oprit:',
+    'clone'  					=> 'Clone Location',
 ];
diff --git a/resources/lang/ro-RO/admin/models/general.php b/resources/lang/ro-RO/admin/models/general.php
index 58ba90bc91..0f6f2d3761 100644
--- a/resources/lang/ro-RO/admin/models/general.php
+++ b/resources/lang/ro-RO/admin/models/general.php
@@ -3,7 +3,7 @@
 return array(
     'about_models_title'     => 'Despre modelele de active',
     'about_models_text'           => 'Modelele de activ sunt o modalitate de a grupa active identice. "MBP 2013", "iPhone 6s" etc.',
-    'deleted'  					        => 'Acest model a fost șters.',
+    'deleted'  					=> 'Acest model a fost șters.',
     'bulk_delete'               => 'Stergere in masa a modelelor de echipamente',
     'bulk_delete_help'               => 'Utilizați casetele de selectare de mai jos pentru a confirma ștergerea modelelor de echipamente selectate. Modelele care au echipamente asociate cu acestea nu pot fi șterse până când activele nu sunt asociate cu un alt model.',
     'bulk_delete_warn'          => 'Sunteți pe cale să ștergeți un model de activ.<unk> Urmează să ștergeți modelele de active :model_count',
diff --git a/resources/lang/ro-RO/admin/models/message.php b/resources/lang/ro-RO/admin/models/message.php
index 96d27ebd67..67ab4de78c 100644
--- a/resources/lang/ro-RO/admin/models/message.php
+++ b/resources/lang/ro-RO/admin/models/message.php
@@ -7,7 +7,7 @@ return array(
     'no_association' => 'AVERTISMENT! Modelul de activ pentru acest articol este invalid sau lipsește!',
     'no_association_fix' => 'Acest lucru va strica lucrurile în moduri ciudate și oribile. Editează acest bun acum pentru a-l atribui un model.',
     'assoc_users'	 => 'Acest model este momentan asociat cu cel putin unul sau mai multe active si nu poate fi sters. Va rugam sa stergeti activul si dupa incercati iar. ',
-
+    'invalid_category_type' => 'This category must be an asset category.',
 
     'create' => array(
         'error'   => 'Modelul nu a fost creat, incercati iar.',
diff --git a/resources/lang/ro-RO/admin/reports/general.php b/resources/lang/ro-RO/admin/reports/general.php
index e24558d07c..39ff7a18a6 100644
--- a/resources/lang/ro-RO/admin/reports/general.php
+++ b/resources/lang/ro-RO/admin/reports/general.php
@@ -4,6 +4,7 @@ return [
     'info'   => 'Selectati optiunile dorite pentru raportul de active.',
     'deleted_user' => 'Utilizator șters',
     'send_reminder' => 'Trimite memento',
+    'cannot_send_reminder' => 'User has been deleted or does not have an email address so cannot receive a reminder',
     'reminder_sent' => 'Memento trimis',
     'acceptance_deleted' => 'Solicitare de acceptare ștearsă',
     'acceptance_request' => 'Cerere de acceptare',
@@ -13,5 +14,10 @@ return [
         'user_state' => 'Stare utilizator',
         'user_country' => 'Țară utilizator',
         'user_zip' => 'Zip utilizator'
-    ]
-];
\ No newline at end of file
+    ],
+    'open_saved_template' => 'Open Saved Template',
+    'save_template' =>  'Save Template',
+    'select_a_template' => 'Select a Template',
+    'template_name' => 'Template Name',
+    'update_template' => 'Update Template',
+];
diff --git a/resources/lang/ro-RO/admin/reports/message.php b/resources/lang/ro-RO/admin/reports/message.php
index 46d8b10337..2800bbdf0b 100644
--- a/resources/lang/ro-RO/admin/reports/message.php
+++ b/resources/lang/ro-RO/admin/reports/message.php
@@ -1,5 +1,16 @@
 <?php
 
-return array(
-    'error'   => 'Trebuie sa selectati cel putin o optiune.'
-);
+return [
+    'about_templates' => 'About Saved Templates',
+    'saving_templates_description' => 'Select your options, then enter the name of your template in the box above and click the \'Save Template\' button. Use the dropdown to select a previously saved template.',
+    'create'  => [
+        'success' => 'Template saved successfully',
+    ],
+    'update' => [
+        'success' => 'Template updated successfully',
+    ],
+    'delete' => [
+        'success' => 'Template deleted',
+        'no_delete_permission' => 'Template does not exist or you do not have permission to delete it.',
+    ],
+];
diff --git a/resources/lang/ro-RO/admin/settings/general.php b/resources/lang/ro-RO/admin/settings/general.php
index b51150f059..747a0bd106 100644
--- a/resources/lang/ro-RO/admin/settings/general.php
+++ b/resources/lang/ro-RO/admin/settings/general.php
@@ -8,13 +8,13 @@ return [
     'ad_append_domain'          => 'Adăugaţi numele de domeniu la câmpul de utilizator',
     'ad_append_domain_help'     => 'Utilizatorul nu este necesar pentru a scrie "username@domain.local", ei pot scrie doar "username".',
     'admin_cc_email'            => 'CC e-mail',
-    'admin_cc_email_help'       => 'Dacă doriți să trimiteți o copie a e-mailurilor de predare/ primire trimise utilizatorilor către un cont de e-mail suplimentar, introduceți-l aici. În caz contrar, lăsați acest câmp necompletat.',
+    'admin_cc_email_help'       => 'Send a copy of checkin/checkout emails to this address.',
     'admin_settings'            => 'Setări Admin',
     'is_ad'				        => 'Acesta este un server Active Directory',
     'alerts'                	=> 'Alerte',
     'alert_title'               => 'Actualizați setările notificărilor',
     'alert_email'				=> 'Trimite alerte catre',
-    'alert_email_help'    => 'Adrese de e-mail sau liste de distribuție la care doriți să fie trimise alerte, separate prin virgulă',
+    'alert_email_help'          => 'Adrese de e-mail sau liste de distribuție la care doriți să fie trimise alerte, separate prin virgulă.',
     'alerts_enabled'			=> 'Alerte activată',
     'alert_interval'			=> 'Termenul de expirare a alertelor (în zile)',
     'alert_inv_threshold'		=> 'Ajustarea pragului de inventar',
@@ -31,15 +31,18 @@ return [
     'backups'					=> 'Copiile de rezervă',
     'backups_help'              => 'Creează, descarcă și restaurează copii de rezervă ',
     'backups_restoring'         => 'Restaurare din Backup',
+    'backups_clean' => 'Clean the backed-up database before restore',
+    'backups_clean_helptext' => "This can be useful if you're changing between database versions",
     'backups_upload'            => 'Încărcare copie de rezervă',
     'backups_path'              => 'Copiile de rezervă de pe server sunt stocate în <code>:path</code>',
-    'backups_restore_warning'   => 'Utilizaţi butonul de restaurare <small><span class="btn btn-xs btn-warning"><i class="text-white fas fa-retweet" aria-hidden="true"></i></span></small> pentru a restaura dintr-o copie de rezervă anterioară. (Acest lucru nu funcționează în prezent cu stocarea fișierului S3 sau cu Docker.<br><br>Întreaga bază de date <strong>cu :app_name şi orice fişiere încărcate vor fi înlocuite complet</strong> cu ce se află în fişierul de rezervă.  ',
+    'backups_restore_warning'   => 'Use the restore button <small><span class="btn btn-xs btn-warning"><i class="text-white fas fa-retweet" aria-hidden="true"></i></span></small> to restore from a previous backup. (This does not currently work with S3 file storage or Docker.)<br><br>Your <strong>entire :app_name database and any uploaded files will be completely replaced</strong> by what\'s in the backup file  ',
     'backups_logged_out'         => 'Toți utilizatorii existenți, inclusiv dvs., vor fi deconectați odată ce restaurarea este completă.',
     'backups_large'             => 'Copiile de rezervă foarte mari pot expira în încercarea de restaurare și s-ar putea să trebuiască să fie rulate prin linia de comandă. ',
     'barcode_settings'			=> 'Setări cod de bare',
     'confirm_purge'			    => 'Confirmați purjarea',
     'confirm_purge_help'		=> 'Introduceți textul "DELETE" în caseta de mai jos pentru a șterge înregistrările șterse. Această acțiune nu poate fi anulată și va șterge definitiv toate articolele și utilizatorii șterși. (Ar trebui mai întâi să faceți o copie de rezervă doar pentru a fi în siguranță.)',
     'custom_css'				=> 'CSS personalizat',
+    'custom_css_placeholder'	=> 'Add your custom CSS',
     'custom_css_help'			=> 'Introduceți orice suprascrieri personalizate CSS pe care doriți să le utilizați. Nu includeți etichetele &lt;style&gt;&lt;/style&gt;.',
     'custom_forgot_pass_url'	=> 'Adresă URL personalizată pentru resetarea parolei',
     'custom_forgot_pass_url_help'	=> 'Acest lucru înlocuiește URL-ul de parolă uitată încorporat pe ecranul de conectare, util pentru a direcționa utilizatorii către funcția de resetare parole LDAP internă sau găzduită. Acesta va dezactiva efectiv funcționalitatea parolei uitate de utilizatorul local.',
@@ -47,34 +50,34 @@ return [
     'dashboard_message_help'	=> 'Acest text va apărea în tabloul de bord pentru orice persoană cu permisiunea de a vizualiza tabloul de bord.',
     'default_currency'  		=> 'Moneda implicita',
     'default_eula_text'			=> 'EULA implicita',
+    'default_eula_text_placeholder' => 'Add your default EULA text',
     'default_language'			=> 'Limba implicita',
     'default_eula_help_text'	=> 'De asemenea, puteți asocia clauze personalizate personalizate cu anumite categorii de active.',
     'acceptance_note'           => 'Add a note for your decision (Optional)',
     'display_asset_name'        => 'Afiseaza nume activ',
     'display_checkout_date'     => 'Arata data predare',
     'display_eol'               => 'Arata EOL in tabel',
-    'display_qr'                => 'Afișați codurile pătrată',
+    'display_qr'                => 'Display 2D barcode',
     'display_alt_barcode'		=> 'Afișați coduri de bare 1D',
-    'email_logo'                => 'Logo e-mail',
     'barcode_type'				=> 'Tip de cod de bare 2D',
     'alt_barcode_type'			=> 'Tip de cod de bare 1D',
-    'email_logo_size'       => 'Logo-urile pătrate în e-mail arată cel mai bine. ',
     'enabled'                   => 'Activat',
     'eula_settings'				=> 'Setările EULA',
     'eula_markdown'				=> 'Această licență EULA permite <a href="https://help.github.com/articles/github-flavored-markdown/">Github aromdown markdown</a>.',
+    'empty_row_count'           => 'Field Start Offset (Empty Rows)',
+    'empty_row_count_help'      => 'Fields will begin populating after this many empty rows are skipped at the top of the label.',
     'favicon'                   => 'Pictogramă',
     'favicon_format'            => 'Tipurile de fișiere acceptate sunt ico, png și gif. Este posibil ca alte formate de imagine să nu funcționeze în toate browserele.',
     'favicon_size'          => 'Favicoanele trebuie să fie imagini pătrate, 16x16 pixeli.',
     'footer_text'               => 'Textul suplimentar în subsol ',
     'footer_text_help'          => 'Acest text va apărea în subsolul din dreapta. Linkurile sunt permise folosind <a href="https://help.github.com/articles/github-flavored-markdown/">marcaje de tip Github</a>. Pauzele de linii, anteturile, imaginile etc. pot avea rezultate imprevizibile.',
+    'footer_text_placeholder'   => 'Optional footer text',
     'general_settings'			=> 'setari generale',
-    'general_settings_keywords' => 'suport companie, signature, acceptance, e-mail format, nume de utilizator, imagini, per pagină, thumbnail, eula, gravatar, tos, dashboard, confidențialitate',
     'general_settings_help'     => 'EULA implicită și altele',
     'generate_backup'			=> 'Generați Backup',
     'google_workspaces'         => 'Spaţii de lucru Google',
     'header_color'              => 'Culoarea antetului',
     'info'                      => 'Aceste setari va lasa sa modificati anumite aspecte ale instalarii.',
-    'label_logo'                => 'Sigla etichetei',
     'label_logo_size'           => 'Logo-urile pătrate arată cel mai bine - vor fi afișate în partea dreaptă sus a fiecărei etichete de active. ',
     'laravel'                   => 'Versiune Laravel',
     'ldap'                      => 'LDAP',
@@ -94,7 +97,7 @@ return [
     'ldap_login_sync_help'      => 'Acest lucru testează numai faptul că LDAP poate sincroniza corect. Dacă interogarea dvs. de autentificare LDAP nu este corectă, este posibil ca utilizatorii să nu se poată conecta. TREBUIE SĂ ACTUALIZAȚI SETĂRILE LDAP MAI ÎNTÂI.',
     'ldap_manager'              => 'Manager LDAP',
     'ldap_server'               => 'LDAP Server',
-    'ldap_server_help'          => 'Acest lucru ar trebui să înceapă cu ldap: // (pentru TCP sau TLS) sau ldaps: // (pentru SSL)',
+    'ldap_server_help'          => 'This should start with ldap:// (for unencrypted) or ldaps:// (for TLS or SSL)',
     'ldap_server_cert'			=> 'Validarea certificatelor SSL pentru LDAP',
     'ldap_server_cert_ignore'	=> 'Permiteți certificatul SSL nevalid',
     'ldap_server_cert_help'		=> 'Bifați această casetă de selectare dacă utilizați un certificat SSL auto-semnat și doriți să acceptați un certificat SSL nevalid.',
@@ -108,8 +111,8 @@ return [
     'ldap_pword'                => 'Parola de legare LDAP',
     'ldap_basedn'               => 'Base Bind DN',
     'ldap_filter'               => 'Filtrul LDAP',
-    'ldap_pw_sync'              => 'Sincronizare parolă LDAP',
-    'ldap_pw_sync_help'         => 'Debifați această casetă dacă nu doriți să păstrați parolele LDAP sincronizate cu parolele locale. Dacă dezactivați acest lucru, este posibil ca utilizatorii dvs. să nu poată să se conecteze dacă serverul dvs. LDAP nu este accesibil din anumite motive.',
+    'ldap_pw_sync'              => 'Cache LDAP Passwords',
+    'ldap_pw_sync_help'         => 'Uncheck this box if you do not wish to keep LDAP passwords cached as local hashed passwords. Disabling this means that your users may not be able to login if your LDAP server is unreachable for some reason.',
     'ldap_username_field'       => 'Nume câmp',
     'ldap_lname_field'          => 'Numele de familie',
     'ldap_fname_field'          => 'Numele LDAP',
@@ -117,13 +120,15 @@ return [
     'ldap_version'              => 'Versiunea LDAP',
     'ldap_active_flag'          => 'LDAP Active Flag',
     'ldap_activated_flag_help'  => 'Această valoare este folosită pentru a determina dacă un utilizator sincronizat se poate conecta la Snipe-IT. <strong>Nu afectează abilitatea de a verifica elementele în sau în afara lor</strong>, și ar trebui să fie numele de atribut <strong></strong> în cadrul AD/LDAP, <strong>nu valoarea</strong>. <br><br>Dacă acest câmp este setat la un nume de câmp care nu există în AD/LDAP, sau valoarea din câmpul AD/LDAP este setat la <code>0</code> sau <code>false</code>, Utilizatorul <strong>va fi dezactivat</strong>. Dacă valoarea din câmpul AD/LDAP este setat la <code>1</code> sau <code>true</code> sau <em>, orice alt text</em> înseamnă că utilizatorul se poate conecta. Când câmpul este gol în AD-ul dvs., respectăm atributul <code>userAccountControl</code> , care de obicei permite utilizatorilor care nu sunt suspendați să se autentifice.',
+    'ldap_invert_active_flag'   => 'LDAP Invert Active Flag',
+    'ldap_invert_active_flag_help'     => 'If enabled: when the value returned by LDAP Active Flag is <code>0</code> or <code>false</code> the user account will be active.',
     'ldap_emp_num'              => 'Numărul angajatului LDAP',
     'ldap_email'                => 'LDAP e-mail',
     'ldap_test'                 => 'Testează LDAP',
     'ldap_test_sync'            => 'Testează sincronizarea LDAP',
     'license'                   => 'Licență software',
-    'load_remote'               => 'Folosește Gravatar',
-    'load_remote_help_text'		=> 'Debifați această casetă dacă instalarea nu poate încărca scripturi din exterior. Acest lucru va împiedica Snipe-IT să încerce încărcarea imaginilor de la Gravatar.',
+    'load_remote'               => 'Load Remote Avatars',
+    'load_remote_help_text'		=> 'Uncheck this box if your install cannot load scripts from the outside internet. This will prevent Snipe-IT from trying load avatars from Gravatar or other outside sources.',
     'login'                     => 'Încercări de conectare',
     'login_attempt'             => 'Încercare de conectare',
     'login_ip'                  => 'Adresă IP',
@@ -131,6 +136,7 @@ return [
     'login_user_agent'          => 'Agent utilizator',
     'login_help'                => 'Lista tentativelor de autentificare',
     'login_note'                => 'Conectați-vă Notă',
+    'login_note_placeholder'            => "If you do not have a login or have found a device belonging to this company, please call technical support at 888-555-1212. Thank you.",
     'login_note_help'           => 'Opțional includeți câteva propoziții în ecranul de conectare, de exemplu, pentru a ajuta persoanele care au găsit un dispozitiv pierdut sau furat. Acest câmp acceptă markdown <a href="https://help.github.com/articles/github-flavored-markdown/">Github aromdown</a>',
     'login_remote_user_text'    => 'Opțiuni de conectare la utilizatorul de la distanță',
     'login_remote_user_enabled_text' => 'Activați autentificarea cu Antet utilizator la distanță',
@@ -146,13 +152,16 @@ return [
     'logo_print_assets_help'    => 'Utilizați brand-urie pe listele de materiale tipărite ',
     'full_multiple_companies_support_help_text' => 'Restricționarea utilizatorilor (inclusiv a administratorilor) atribuite companiilor activelor companiei lor.',
     'full_multiple_companies_support_text' => 'Suport complet pentru multiple companii',
+    'scope_locations_fmcs_support_text'  => 'Scope Locations with Full Multiple Companies Support',
+    'scope_locations_fmcs_support_help_text'  => 'Restrict locations to their selected company.',
+    'scope_locations_fmcs_check_button' => 'Check Compatibility',
+    'scope_locations_fmcs_support_disabled_text'  => 'This option is disabled because you have conflicting locations set for :count or more items.',
     'show_in_model_list'   => 'Afișați în lista de selecție de model',
     'optional'					=> 'facultativ',
     'per_page'                  => 'Rezultate pe pagina',
     'php'                       => 'Versiune PHP',
-    'php_info'                  => 'PHP Info',
+    'php_info'                  => 'PHP info',
     'php_overview'              => 'PHP',
-    'php_overview_keywords'     => 'phpinfo, sistem, info',
     'php_overview_help'         => 'Informaţii sistem PHP',
     'php_gd_info'               => 'Trebuie sa instalati php-gd ca sa afisati coduri QR, verificati instructiunile de instalare.',
     'php_gd_warning'            => 'PHP Image Processing si GD plugin NU sunt instalate.',
@@ -218,6 +227,8 @@ return [
     'webhook_integration_help'    => 'Integrarea :app este opțională, totuși punctul final și canalul sunt necesare dacă doriți să îl folosiți. Pentru a configura integrarea :app, trebuie să creați mai întâi <a href=":webhook_link" target="_new" rel="noopener">un webhook</a> primit pe contul dvs. :app. Faceți clic pe butonul <strong>Test :app Integration</strong> pentru a confirma că setările sunt corecte înainte de salvare. ',
     'webhook_integration_help_button'    => 'Odată ce ați salvat informațiile dvs. de :app, va apărea un buton de testare.',
     'webhook_test_help'           => 'Testează dacă integrarea ta :app este configurată corect. TREBUIE SĂ VĂ APĂSAȚI ACTUALIZAT :app SETTINGS FIRST.',
+    'shortcuts_enabled'         => 'Enable Shortcuts',
+    'shortcuts_help_text'       => '<strong>Windows</strong>: Alt + Access key, <strong>Mac</strong>: Control + Option + Access key',
     'snipe_version'  			=> 'Snipe-IT versiune',
     'support_footer'            => 'Legăturile de suport in subsol ',
     'support_footer_help'       => 'Specificați cine vede legăturile la informațiile despre asistența Snipe-IT și la Manualul utilizatorilor',
@@ -227,7 +238,6 @@ return [
     'update'                    => 'Actualizeaza setari',
     'value'                     => 'Valoare',
     'brand'                     => 'Branding',
-    'brand_keywords'            => 'footer, logo, print, temă, piele, antet, culori, culoare, css',
     'brand_help'                => 'Logo, Nume site',
     'web_brand'                 => 'Tip de Branding Web',
     'about_settings_title'      => 'Despre Setări',
@@ -276,6 +286,8 @@ return [
     'two_factor_enrollment_text'	=> "Este necesară autentificarea cu două factori, cu toate acestea, dispozitivul dvs. nu a fost încă înscris. Deschideți aplicația Google Authenticator și scanați codul QR de mai jos pentru a vă înregistra dispozitivul. După ce ați înscris dispozitivul, introduceți codul de mai jos",
     'require_accept_signature'      => 'Solicită semnătura',
     'require_accept_signature_help_text'      => 'Activarea acestei funcții va impune utilizatorilor să se deconecteze fizic la acceptarea unui activ.',
+    'require_checkinout_notes'  => 'Require Notes on Checkin/Checkout',
+    'require_checkinout_notes_help_text'    => 'Enabling this feature will require the note fields to be populated when checking in or checking out an asset.',
     'left'        => 'stânga',
     'right'        => 'dreapta',
     'top'        => 'top',
@@ -313,24 +325,24 @@ return [
     'filter_by_keyword' => 'Filtrează după setarea cuvântului cheie',
     'security' => 'Securitate',
     'security_title' => 'Actualizați setările de securitate',
-    'security_keywords' => 'parolă, parole, cerințe, doi factori, doi factori, parole comune, conectare la distanță, deconectare, autentificare',
     'security_help' => 'Dublu factor, Restricții la parolă',
-    'groups_keywords' => 'permisiuni, grupuri de permisiuni, autorizare',
     'groups_help' => 'Grupuri permisiuni cont',
     'localization' => 'Localizare',
     'localization_title' => 'Actualizați setările de localizare',
-    'localization_keywords' => 'localizare, monedă, locală, zonă-orar, fus orar, internațional, internatinalizare, limbă, limbă, traducere',
     'localization_help' => 'Limba, afişarea datei',
     'notifications' => 'Notificări',
     'notifications_help' => 'Setări Alerte & Audit Email',
     'asset_tags_help' => 'Creștere și prefixe',
     'labels' => 'Etichete',
     'labels_title' => 'Actualizați setările etichetei',
-    'labels_help' => 'Setări etichete &amp;',
-    'purge_keywords' => 'şterge permanent',
+    'labels_help' => 'Barcodes &amp; label settings',
     'purge_help' => 'Eliminați înregistrările șterse',
     'ldap_extension_warning' => 'Nu arată ca și cum extensia LDAP este instalată sau activată pe acest server. Încă puteți salva setările, dar va trebui să activați extensia LDAP pentru PHP înainte ca logarea sau sincronizarea LDAP să funcționeze.',
     'ldap_ad' => 'LDAP/AD',
+    'ldap_test_label' => 'Test LDAP Sync',
+    'ldap_test_login' => ' Test LDAP Login',
+    'ldap_username_placeholder' => 'LDAP Username',
+    'ldap_password_placeholder' => 'LDAP Password',
     'employee_number' => 'Număr angajat',
     'create_admin_user' => 'Creează un utilizator ::',
     'create_admin_success' => 'Succes! Utilizatorul dvs. admin a fost adăugat!',
@@ -342,6 +354,8 @@ return [
     'setup_migration_create_user' => 'Următorul: Creare utilizator',
     'ldap_settings_link' => 'Pagina de setări LDAP',
     'slack_test' => 'Test <i class="fab fa-slack"></i> Integrare',
+    'status_label_name' => 'Status Label Name',
+    'super_admin_only'  => 'Super Admin Only',
     'label2_enable'           => 'Etichetă nouă',
     'label2_enable_help'      => 'Switch to the new label engine. <b>Note: You will need to save this setting before setting others.</b>',
     'label2_template'         => 'Șablon',
@@ -356,12 +370,15 @@ return [
     'label2_2d_type'          => 'Tip de cod de bare 2D',
     'label2_2d_type_help'     => 'Format pentru coduri de bare 2D',
     'label2_2d_target'        => 'Ținta codului de bare 2D',
-    'label2_2d_target_help'   => 'URL-ul codului de bare 2D indică la momentul scanării',
+    'label2_2d_target_help'   => 'The data that will be contained in the 2D barcode',
     'label2_fields'           => 'Definiții câmp',
     'label2_fields_help'      => 'Câmpurile pot fi adăugate, șterse și reordonate în coloana din stânga. Pentru fiecare câmp, mai multe opțiuni pentru Etichetă și Sursă pot fi adăugate, eliminate și reordonate în coloana din dreapta.',
+    'purge_barcodes' => 'Purge Barcodes',
     'help_asterisk_bold'    => 'Textul introdus ca <code>**text**</code> va fi afișat ca îngroșat',
     'help_blank_to_use'     => 'Lăsați necompletat pentru a utiliza valoarea de la <code>:setting_name</code>',
-    'help_default_will_use' => '<code>:default</code> va utiliza valoarea de la <code>:setting_name</code>. <br>Reține că valoarea codurilor de bare trebuie să respecte specificațiile corespunzătoare ale codului de bare pentru a fi generată cu succes. Pentru mai multe detalii, vezi documentaţia <a href="https://snipe-it.readme.io/docs/barcodes"> <i class="fa fa-external-link"></i></a>. ',
+    'help_default_will_use' => '<code>:default</code> will use the value from <code>:setting_name</code>. <br>Note that the value of the barcodes must comply with the respective barcode spec in order to be successfully generated. Please see <a href="https://snipe-it.readme.io/docs/barcodes">the documentation <i class="fa fa-external-link"></i></a> for more details. ',
+    'asset_id'              => 'Asset ID',
+    'data'               => 'Data',
     'default'               => 'Implicit',
     'none'                  => 'Niciunul',
     'google_callback_help' => 'Acesta ar trebui introdus ca URL de apel invers în setările aplicației Google OAuth din organizația dvs.&apos;s <strong><a href="https://console.cloud.google.com/" target="_blank">Google developer console <i class="fa fa-external-link" aria-hidden="true"></i></a></strong>.',
@@ -373,7 +390,100 @@ return [
     'database_driver' => 'Șofer bază de date',
     'bs_table_storage' => 'Stocare tabel',
     'timezone' => 'Timezone',
+    'test_mail' => 'Test Mail',
     'profile_edit'          => 'Edit Profile',
     'profile_edit_help'          => 'Allow users to edit their own profiles.',
+    'default_avatar' => 'Custom Default Avatar',
+    'default_avatar_help' => 'This image will be displayed as a profile if a user does not have a profile photo.',
+    'restore_default_avatar' => 'Restore <a href=":default_avatar" data-toggle="lightbox" data-type="image">original system default avatar</a>',
+    'restore_default_avatar_help' => '',
+    'due_checkin_days' => 'Due For Checkin Warning',
+    'due_checkin_days_help' => 'How many days before the expected checkin of an asset should it be listed in the "Due for checkin" page?',
+    'no_groups' => 'No groups have been created yet. Visit <code>Admin Settings > Permission Groups</code> to add one.',
+    'text' => 'Text',
+
+    'username_formats' => [
+        'username_format'		=> 'Nume de utilizator Format',
+        'firstname_lastname_format'	=> 'Nume Prenume Nume (jane.smith)',
+        'first_name_format'	        => 'First Name (jane)',
+        'last_name_format'		=> 'Last Name (doe)',
+        'filastname_format'			=> 'First Initial Last Name (jsmith)',
+        'lastnamefirstinitial_format' =>  'Last Name First Initial (smithj)',
+        'firstname_lastname_underscore_format' => 'First Name Last Name (jane_smith)',
+        'firstinitial.lastname' => 'First Initial Last Name (j.smith)',
+        'lastname_firstinitial' => 'Last Name First Initial (smith_j)',
+        'lastname_dot_firstinitial_format' => 'Last Name First Initial (smith.j)',
+        'firstnamelastname'     => 'First Name Last Name (janesmith)',
+        'firstnamelastinitial'  => 'First Name Last Initial (janes)',
+        'lastnamefirstname'      => 'Last Name.First Name (smith.jane)',
+    ],
+
+    'email_formats' => [
+        'email_format'			=> 'Formatul e-mailului',
+        'firstname_lastname_format'	=> 'Nume Prenume Nume (jane.smith@example.com)',
+        'first_name_format'		=> 'Prenume (jane@example.com)',
+        'last_name_format'		=> 'Last Name (doe@example.com)',
+        'filastname_format'			=> 'Primul nume inițial (jsmith@example.com)',
+        'lastnamefirstinitial_format' =>  'Numele de familie Prima Inițială (smithj@example.com)',
+        'firstname_lastname_underscore_format' => 'Prenume Nume Nume (jane_smith@example.com)',
+        'firstinitial.lastname' => 'Primul nume inițial (j.smith@example.com)',
+        'lastname_firstinitial' => 'Prenume Prima Inițială (smith_j@example.com)',
+        'lastname_dot_firstinitial_format' => 'Last Name First Initial (smith.j@example.com)',
+        'firstnamelastname'     => 'Prenume Nume Nume (janesmith@example.com)',
+        'firstnamelastinitial'  => 'Prenume Nume Ultima Inițială (janes@example.com)',
+        'lastnamefirstname'      => 'Last Name.First Name (smith.jane@example.com)',
+    ],
+
+
+
+    'logo_labels' => [
+        'acceptance_pdf_logo'       => 'PDF Logo',
+        'email_logo'                => 'Logo e-mail',
+        'label_logo'                => 'Sigla etichetei',
+        'logo'                      => 'Site Logo',
+        'favicon'                   => 'Pictogramă',
+    ],
+
+    'logo_help' => [
+        'email_logo_size'       => 'Logo-urile pătrate în e-mail arată cel mai bine. ',
+    ],
+
+    'logo_option_types' => [
+        'text' => 'Text',
+        'logo' => 'Siglă',
+        'logo_and_text' => 'Logo and Text',
+    ],
+
+
+    'legends' => [
+        'scoping' => 'Scoping',
+        'formats' => 'Default Formats',
+        'profiles' => 'User Profiles',
+        'eula' => 'EULA & Acceptance Preferences',
+        'misc_display' => 'Miscellaneous Display Options',
+        'email' => 'Email Preferences',
+        'checkin' => 'Checkin Preferences',
+        'dashboard' => 'Login & Dashboard Preferences',
+        'misc' => 'Miscellaneous',
+        'logos' => 'Logos & Display',
+        'colors' => 'Colors & Skins',
+        'footer' => 'Footer Preferences',
+        'security' => 'Security Preferences',
+        'general' => 'General',
+        'intervals' => 'Intervals & Thresholds',
+    ],
+
+
+    /* Keywords for settings overview help */
+    'keywords' => [
+        'brand'             => 'footer, logo, print, temă, piele, antet, culori, culoare, css',
+        'general_settings'  => 'suport companie, signature, acceptance, e-mail format, nume de utilizator, imagini, per pagină, thumbnail, eula, gravatar, tos, dashboard, confidențialitate',
+        'groups'            => 'permisiuni, grupuri de permisiuni, autorizare',
+        'labels'            => 'labels, barcodes, barcode, sheets, print, upc, qr, 1d, 2d',
+        'localization'      => 'localizare, monedă, locală, zonă-orar, fus orar, internațional, internatinalizare, limbă, limbă, traducere',
+        'php_overview'      => 'phpinfo, sistem, info',
+        'purge'             => 'şterge permanent',
+        'security'          => 'parolă, parole, cerințe, doi factori, doi factori, parole comune, conectare la distanță, deconectare, autentificare',
+    ],
 
 ];
diff --git a/resources/lang/ro-RO/admin/settings/message.php b/resources/lang/ro-RO/admin/settings/message.php
index 31e5990d27..9e6e772188 100644
--- a/resources/lang/ro-RO/admin/settings/message.php
+++ b/resources/lang/ro-RO/admin/settings/message.php
@@ -14,6 +14,9 @@ return [
         'restore_warning'       => 'Da, restaurează. Confirm suprascrierea tuturor datelor existente în baza de date. Acest lucru va deconecta și pe toți utilizatorii curenți (inclusiv pe tine).',
         'restore_confirm'       => 'Sunteți sigur că doriți restaurarea bazei de date din fișierul :filename?'
     ],
+    'restore' => [
+        'success'               => 'Your system backup has been restored. Please log in again.'
+    ],
     'purge' => [
         'error'     => 'A apărut o eroare în timpul epurării.',
         'validation_failed'     => 'Confirmarea dvs. de purjare este incorectă. Introduceți cuvântul "DELETE" în caseta de confirmare.',
@@ -33,6 +36,9 @@ return [
         'testing_authentication' => 'Testare autentificare LDAP...',
         'authentication_success' => 'Utilizatorul s-a autentificat cu succes împotriva LDAP!'
     ],
+    'labels' => [
+        'null_template' => 'Label template not found. Please select a template.',
+        ],
     'webhook' => [
         'sending' => 'Se trimite mesajul de testare :app...',
         'success' => 'Integrarea ta :webhook_name funcționează!',
@@ -42,5 +48,12 @@ return [
         'error' => 'Ceva nu a funcționat. :app a răspuns cu: :error_message',
         'error_redirect' => 'EROARE: 301/302 :endpoint returnează o redirecționare. Din motive de securitate, nu urmărim redirecționările. Vă rugăm să folosiți obiectivul final.',
         'error_misc' => 'Ceva nu a mers bine. :( ',
-    ]
+        'webhook_fail' => ' webhook notification failed: Check to make sure the URL is still valid.',
+        'webhook_channel_not_found' => ' webhook channel not found.',
+        'ms_teams_deprecation' => 'The selected Microsoft Teams webhook URL will be deprecated Dec 31st, 2025. Please use a workflow URL. Microsoft\'s documentation on creating a workflow can be found <a href="https://support.microsoft.com/en-us/office/create-incoming-webhooks-with-workflows-for-microsoft-teams-8ae491c7-0394-4861-ba59-055e33f75498" target="_blank"> here.</a>',
+    ],
+    'location_scoping' => [
+        'not_saved' => 'Your settings were not saved.',
+        'mismatch' => 'There is 1 item in the database that need your attention before you can enable location scoping.|There are :count items in the database that need your attention before you can enable location scoping.',
+    ],
 ];
diff --git a/resources/lang/ro-RO/admin/statuslabels/table.php b/resources/lang/ro-RO/admin/statuslabels/table.php
index 033463563f..2454a2e08a 100644
--- a/resources/lang/ro-RO/admin/statuslabels/table.php
+++ b/resources/lang/ro-RO/admin/statuslabels/table.php
@@ -1,14 +1,14 @@
 <?php
 
 return array(
-    'about'      	=> 'Despre etichete status',
+    'about'      	=> 'About Status Types',
     'archived'      	=> 'Arhivat',
     'create'      	=> 'Creeaza eticheta status',
     'color'      	=> 'Grafic Culoare',
     'default_label' => 'Etichetă implicită',
     'default_label_help' => 'Acest lucru este folosit pentru a vă asigura că cele mai utilizate etichete de stare apar în partea de sus a casetei de selectare atunci când creați/editați activele.',
     'deployable'      	=> 'Lansabil',
-    'info'      	=> 'Etichetele de status sunt folosite pentru a descrie diferite statusuri in care se pot afla activele. Ele pot fi trimise la reparat, pierdut/furat, etc. Poti crea noi etichete de status pentru active lansabile, in asteptare sau arhivate.',
+    'info'      	=> 'Status label types are used to describe the various states your assets could be in. They may be out for repair, lost/stolen, etc. You can create new status labels for your deployable, pending and archived assets according to your own workflow. For more information, <a href="https://snipe-it.readme.io/docs/overview#status-labels" target="_blank">see the documentation <i class="fa fa-external-link"></i></a>.',
     'name'      	=> 'Nume status',
     'pending'      	=> 'In asteptare',
     'status_type'   => 'Tip status',
diff --git a/resources/lang/ro-RO/admin/users/general.php b/resources/lang/ro-RO/admin/users/general.php
index cf3abdc222..b91166bf72 100644
--- a/resources/lang/ro-RO/admin/users/general.php
+++ b/resources/lang/ro-RO/admin/users/general.php
@@ -19,6 +19,8 @@ return [
     'print_assigned'    => 'Tipărește toate activele atribuite',
     'email_assigned'    => 'Lista de e-mail a tuturor atribuite',
     'user_notified'     => 'Utilizatorul a primit prin e-mail o listă cu articolele alocate în prezent.',
+    'users_notified'    => 'The user has been emailed a list of their currently assigned items.|:count users have been emailed a list of their currently assigned items.',
+    'users_notified_warning' => ':count user has been emailed a list of their currently assigned items, however :no_email users did not have an email address so could not be emailed.|:count users have been emailed a list of their currently assigned items, however :no_email user(s) did not have an email address so could not be emailed.',
     'auto_assign_label' => 'Include acest utilizator la atribuirea automată a licențelor eligibile',
     'auto_assign_help'  => 'Sari peste acest utilizator în atribuirea automată a licențelor',
     'software_user'     => 'Software predat catre :name',
diff --git a/resources/lang/ro-RO/admin/users/message.php b/resources/lang/ro-RO/admin/users/message.php
index 727ceb96b8..b332d666f5 100644
--- a/resources/lang/ro-RO/admin/users/message.php
+++ b/resources/lang/ro-RO/admin/users/message.php
@@ -6,7 +6,7 @@ return array(
     'declined'                  => 'Ați refuzat cu succes acest activ.',
     'bulk_manager_warn'	        => 'Utilizatorii dvs. au fost actualizați cu succes, cu toate acestea, intrarea managerului dvs. nu a fost salvată, deoarece managerul pe care l-ați selectat a fost, de asemenea, în lista de utilizatori care urmează să fie editat și este posibil ca utilizatorii să nu fie propriul manager. Selectați din nou utilizatorii dvs., cu excepția managerului.',
     'user_exists'               => 'Utilizatorul exista deja!',
-    'user_not_found'            => 'Utilizatorul nu exista.',
+    'user_not_found'            => 'User does not exist or you do not have permission view them.',
     'user_login_required'       => 'Campul de login este necesar',
     'user_has_no_assets_assigned' => 'Nici un activ alocat utilizatorului în prezent.',
     'user_password_required'    => 'Este necesara parola.',
@@ -53,6 +53,7 @@ return array(
         'ldap_could_not_search' => 'Căutarea serverului LDAP nu a putut fi efectuată. Verificați configurația serverului LDAP în fișierul de configurare LDAP. <br>Error de la LDAP Server:',
         'ldap_could_not_get_entries' => 'Nu s-au putut obține intrări de pe serverul LDAP. Verificați configurația serverului LDAP în fișierul de configurare LDAP. <br>Error de la LDAP Server:',
         'password_ldap' => 'Parola pentru acest cont este gestionată de LDAP / Active Directory. Contactați departamentul IT pentru a vă schimba parola.',
+        'multi_company_items_assigned' => 'This user has items assigned that belong to a different company. Please check them in or edit their company.'
     ),
 
     'deletefile' => array(
diff --git a/resources/lang/ro-RO/admin/users/table.php b/resources/lang/ro-RO/admin/users/table.php
index 6c500379c5..e5b49e9759 100644
--- a/resources/lang/ro-RO/admin/users/table.php
+++ b/resources/lang/ro-RO/admin/users/table.php
@@ -22,7 +22,7 @@ return array(
     'managed_locations'     => 'Locații gestionate',
     'managed_users'         => 'Utilizatori gestionați',
     'name' 					=> 'Nume',
-    'nogroup'               => 'Nici un grup nu a fost creat încă. Pentru a adăuga unul, vizitaţi: ',
+    'nogroup'               => 'Nici un grup nu a fost creat încă. Pentru a adăuga unul, vizitaţi:',
     'notes'                 => 'notițe',
     'password_confirm' 		=> 'Confirma parola',
     'password' 				=> 'Parola',
diff --git a/resources/lang/ro-RO/auth.php b/resources/lang/ro-RO/auth.php
index c0752f6661..b4f4e0a0be 100644
--- a/resources/lang/ro-RO/auth.php
+++ b/resources/lang/ro-RO/auth.php
@@ -15,6 +15,6 @@ return array(
 
     'failed' => 'Aceste date de autentificare nu corespund înregistrărilor noastre.',
     'password' => 'Parola furnizată este incorectă.',
-    'throttle' => 'Prea multe încercări de autentificare. Vă rugăm să încercaţi din nou în :seconds secunde.',
+    'throttle' => 'Too many login attempts. Please try again in :minutes minute(s).',
 
 );
diff --git a/resources/lang/ro-RO/auth/message.php b/resources/lang/ro-RO/auth/message.php
index 7c7536366a..252d48f459 100644
--- a/resources/lang/ro-RO/auth/message.php
+++ b/resources/lang/ro-RO/auth/message.php
@@ -6,8 +6,6 @@ return array(
     'account_not_found'      => 'Numele de utilizator sau parola este incorecta.',
     'account_not_activated'  => 'Acest utilizator nu a fost activat.',
     'account_suspended'      => 'Acest utilizator este suspendat.',
-    'account_banned'         => 'Acest utilizator este banat.',
-    'throttle'               => 'Prea multe încercări de conectare nereușite. Vă rugăm să încercați din nou în :minute minute.',
 
     'two_factor' => array(
         'already_enrolled'      => 'Dispozitivul dumneavoastră este deja înscris.',
diff --git a/resources/lang/ro-RO/button.php b/resources/lang/ro-RO/button.php
index 1dbff7310e..e50219a1ae 100644
--- a/resources/lang/ro-RO/button.php
+++ b/resources/lang/ro-RO/button.php
@@ -7,6 +7,7 @@ return [
     'checkin_and_delete'  	    => 'Verifică tot / Șterge Utilizatorul',
     'delete'  	                => 'Sterge',
     'edit'    	                => 'Editeaza',
+    'clone'    	                => 'Clone',
     'restore' 	                => 'Restaureaza',
     'remove'                    => 'Elimină',
     'request'                   => 'Cerere',
@@ -21,4 +22,13 @@ return [
     'add_maintenance'           => 'Adaugă Mentenanță',
     'append'                    => 'Adăugare',
     'new'                       => 'Nou',
+    'var' => [
+        'clone'     => 'Clone :item_type',
+        'edit'      => 'Edit :item_type',
+        'delete'    => 'Delete :item_type',
+        'restore'   => 'Restore :item_type',
+        'create'    => 'Create New :item_type',
+        'checkout'  => 'Checkout :item_type',
+        'checkin'   => 'Checkin :item_type',
+    ]
 ];
diff --git a/resources/lang/ro-RO/general.php b/resources/lang/ro-RO/general.php
index f00bd2b38f..5714b590f6 100644
--- a/resources/lang/ro-RO/general.php
+++ b/resources/lang/ro-RO/general.php
@@ -10,7 +10,7 @@ return [
     'action'                => 'Acțiune',
     'activity_report'		=> 'Raport de activitate',
     'address'				=> 'Adresa',
-    'admin'					=> 'Admin',
+    'admin'					=> 'Setări Admin',
     'admin_tooltip'			=> 'This user has admin privileges',
     'superuser'				=> 'Superuser',
     'superuser_tooltip'		=> 'This user has superuser privileges',
@@ -23,13 +23,16 @@ return [
     'asset_models'			=> 'Modele active',
     'asset_model'			=> 'Model',
     'asset'					=> 'Activ',
+    'asset_previous'        => 'Asset (Previously Assigned)',
     'asset_report'          => 'Raport de active',
     'asset_tag'				=> 'Eticheta activ',
     'asset_tags'            => 'Etichete active',
     'assets_available'		=> 'Active disponibile',
     'accept_assets'         => 'Acceptați active :name',
     'accept_assets_menu'    => 'Acceptați active',
+    'accept_item'           => 'Accept Item',
     'audit'				    => 'Audit',
+    'audits'				=> 'Audits',
     'audit_report'			=> 'Jurnal de audit',
     'assets'				=> 'Active',
     'assets_audited'        => 'active auditate',
@@ -61,9 +64,12 @@ return [
     'changepassword'  		=> 'Schimba parola',
     'checkin'  				=> 'Primeste',
     'checkin_from'  		=> 'Checkin de la',
+    'checkin_note'  		=> 'Checkin Note',
+    'checkout_note'  		=> 'Checkout Note',
     'checkout'  			=> 'Preda',
     'checkouts_count'       => 'Comenzi',
     'checkins_count'        => 'Verificări',
+    'checkin_and_delete'  	=> '',
     'user_requests_count'   => 'Cereri',
     'city'  				=> 'Oras',
     'click_here'			=> 'Click aici',
@@ -77,7 +83,7 @@ return [
     'consumables'			=> 'Consumabile',
     'country'  				=> 'Tara',
     'could_not_restore'     => 'Eroare la restabilirea :item_type: :error',
-    'not_deleted'           => ':item_type nu este șters astfel încât nu poate fi restaurat',
+    'not_deleted'           => 'The :item_type was not deleted and therefore cannot be restored',
     'create'				=> 'Creeaza',
     'created'               => 'Articol creat',
     'created_asset'			=> 'Activ creat',
@@ -86,11 +92,13 @@ return [
     'record_created' 		=> 'Înregistrare creată',
     'updated_at' 			=> 'Actualizat la',
     'currency'  			=> 'LEI', // this is deprecated
+    'currency_text'  		=> 'Monedă', //
     'current'  				=> 'Curent',
     'current_password'      => 'Parola curentă',
     'customize_report'      => 'Personalizați raportul',
     'custom_report'         => 'Raport active custom',
     'dashboard'				=> 'Bord',
+    'data_source'           => 'Data Source',
     'days'      			=> 'zi',
     'days_to_next_audit'    => 'Zile până la următorul audit',
     'date'					=> 'Data',
@@ -98,7 +106,7 @@ return [
     'debug_warning_text'    => 'Această aplicație rulează în modul de producție cu debugging activat. Acest lucru poate expune date sensibile dacă aplicația dvs. este accesibilă lumii exterioare. Dezactivați modul de depanare setând valoarea <code>APP_DEBUG</code> din fișierul <code>.env</code> la <code>false</code>.',
     'delete'  				=> 'Sterge',
     'delete_confirm'  		=> 'Sigur doriți să ștergeți :item?',
-    'delete_confirm_no_undo' => 'Sigur doriți să ștergeți :item? Această acțiune nu poate fi anulată.',
+    'delete_confirm_no_undo' => 'Are you sure, you wish to delete :item? This cannot be undone.',
     'deleted'  				=> 'Sters',
     'delete_seats'  		=> 'Locurile șterse',
     'deletion_failed'       => 'Ștergerea a eșuat',
@@ -114,29 +122,13 @@ return [
     'editprofile'  			=> 'Editeaza propriul profil',
     'eol'					=> 'EOL',
     'email_domain'			=> 'Domeniul de e-mail',
-    'email_format'			=> 'Formatul e-mailului',
     'employee_number'       => 'Număr angajat',
     'email_domain_help'		=> 'Acesta este folosit pentru a genera adrese de e-mail atunci când importați',
     'error'				    => 'Eroare',
     'exclude_archived'      => 'Exclude activele arhivate',
     'exclude_deleted'       => 'Exclude activele șterse',
     'example'				=> 'Exemplu: ',
-    'filastname_format'			=> 'Primul nume inițial (jsmith@example.com)',
-    'firstname_lastname_format'	=> 'Nume Prenume Nume (jane.smith@example.com)',
-    'firstname_lastname_underscore_format' => 'Prenume Nume Nume (jane_smith@example.com)',
-    'lastnamefirstinitial_format' =>  'Numele de familie Prima Inițială (smithj@example.com)',
-    'firstintial_dot_lastname_format' => 'Primul nume inițial (j.smith@example.com)',
-    'firstname_lastname_display'	=> 'Prenume nume nume (Jane Smith)',
-    'lastname_firstname_display'	=> 'Numele de familie (Smith Jane)',
-    'name_display_format'	=> 'Nume Format Afișat',
-    'first'					=> 'Primul',
-    'firstnamelastname'     => 'Prenume Nume Nume (janesmith@example.com)',
-    'lastname_firstinitial' => 'Prenume Prima Inițială (smith_j@example.com)',
-    'firstinitial.lastname' => 'Primul nume inițial (j.smith@example.com)',
-    'firstnamelastinitial'  => 'Prenume Nume Ultima Inițială (janes@example.com)',
-    'lastnamefirstname'      => 'Last Name First Name (smith.jane@example.com)',
-    'first_name'			=> 'Prenume',
-    'first_name_format'		=> 'Prenume (jane@example.com)',
+
     'files'                 => 'Fișiere',
     'file_name'				=> 'Fisier',
     'file_type'             => 'Tip Fișier',
@@ -156,9 +148,9 @@ return [
     'image_delete'         	=> 'Sterge poza',
     'include_deleted'       => 'Include active șterse',
     'image_upload'         	=> 'Incarca poza',
-    'filetypes_accepted_help'    => 'Tipul de fișier acceptat este :types. Dimensiunea maximă permisă a încărcării este :size.<unk> Tipurile de fișiere acceptate sunt :types. Dimensiunea maximă permisă este de :size.',
-    'filetypes_size_help'   => 'Dimensiunea maximă permisă pentru încărcare este de :size.',
-    'image_filetypes_help'  => 'Accepted filetypes are jpg, webp, png, gif, svg, and avif. Max upload size allowed is :size.',
+    'filetypes_accepted_help'    => 'Accepted filetype is :types. The maximum size allowed is :size.|Accepted filetypes are :types. The maximum upload size allowed is :size.',
+    'filetypes_size_help'   => 'The maximum upload size allowed is :size.',
+    'image_filetypes_help'  => 'Accepted Filetypes are jpg, webp, png, gif, svg, and avif. The maximum upload size allowed is :size.',
     'unaccepted_image_type'  => 'Acest fișier de imagine nu a putut fi citit. Tipurile de fișiere acceptate sunt jpg, webp, png, gif și svg. Amprenta acestui fișier este: :mimetype.',
     'import'         	    => 'Import',
     'import_this_file'      => 'Harta câmpuri și procesarea acestui fișier',
@@ -178,12 +170,17 @@ return [
     'last'					=> 'Ultimul',
     'last_login'            => 'Ultima logare',
     'last_name'             => 'Nume',
+    'firstname_lastname_display'	=> 'Prenume nume nume (Jane Smith)',
+    'lastname_firstname_display'	=> 'Numele de familie (Smith Jane)',
+    'name_display_format'	=> 'Nume Format Afișat',
+    'first'					=> 'Primul',
+    'first_name'			=> 'Prenume',
     'license'				=> 'Licenta',
     'license_report'        => 'Raport licente',
     'licenses_available'	=> 'Licențe disponibile',
     'licenses'				=> 'Licente',
     'list_all'				=> 'Arata tot',
-    'loading'				=> 'Încărcare... vă rugăm așteptați....',
+    'loading'				=> 'Încărcare... vă rugăm așteptați...',
     'lock_passwords'        => 'Această valoare a câmpului nu va fi salvată într-o instalare demonstrativă.',
     'feature_disabled'      => 'Această funcție a fost dezactivată pentru instalarea demonstrativă.',
     'location'              => 'Locatie',
@@ -193,7 +190,7 @@ return [
     'logout'				=> 'Log out',
     'lookup_by_tag'     => 'Căutarea după eticheta de activ',
     'maintenances'          => 'Mentenanțe',
-    'manage_api_keys'       => 'Gestionare chei API',
+    'manage_api_keys'       => 'Manage API keys',
     'manufacturer'			=> 'Producator',
     'manufacturers'			=> 'Producatori',
     'markdown'				=> 'Acest câmp permite marcarea <a href="https://help.github.com/articles/github-flavored-markdown/">Github markdown</a>.',
@@ -215,6 +212,14 @@ return [
     'no_results'			=> 'Nici un rezultat.',
     'no'  					=> 'Nr',
     'notes'  				=> 'Note',
+    'note_added'            => 'Note Added',
+    'options'				=> 'Options',
+    'preview'				=> 'Preview',
+    'add_note'              => 'Add Note',
+    'note_edited'            => 'Note Edited',
+    'edit_note'              => 'Edit Note',
+    'note_deleted'            => 'Note Deleted',
+    'delete_note'              => 'Delete Note',
     'order_number'          => 'Numar de ordine',
     'only_deleted'          => 'Numai active șterse',
     'page_menu'				=> 'Se afișează elementele _MENU_',
@@ -229,7 +234,7 @@ return [
     'purchase_date'         => 'Data cumpărării',
     'qty'		            => 'QTY',
     'quantity'		        => 'Cantitate',
-    'quantity_minimum'      => 'Ai :count articole sub sau aproape sub nivelurile minime de cantitate',
+    'quantity_minimum'      => 'You have one item below or almost below minimum quantity levels|You have :count items below or almost below minimum quantity levels',
     'quickscan_checkin'  	=> 'Scanare rapidă Checkin',
     'quickscan_checkin_status'  	=> 'Checkin Status',
     'ready_to_deploy'		=> 'Gata de lansare',
@@ -254,7 +259,7 @@ return [
     'select_all'            => 'Selectează tot',
     'search'				=> 'Căutare',
     'select_category'       => 'Selectați o categorie',
-    'select_datasource' => 'Selectează o bază de date',
+    'select_datasource' => 'Select a data source',
     'select_department'     => 'Selectați un departament',
     'select_depreciation'	=> 'Selectați un tip de amortizare',
     'select_location'		=> 'Selectați o locație',
@@ -274,13 +279,15 @@ return [
     'signed_off_by'         => 'Semnat dezactivat de',
     'skin'       			=> 'Piele',
     'webhook_msg_note'        => 'O notificare va fi trimisă prin webhook',
-    'webhook_test_msg'        => 'Oh hai! Se pare că integrarea ta :app cu Snipe-IT funcționează!',
+    'webhook_test_msg'        => 'Oh hai! It looks like your :app integration with Snipe-IT is working!',
     'some_features_disabled' => 'Modul DEMO: Unele caracteristici sunt dezactivate pentru această instalare.',
     'site_name'				=> 'Nume site',
     'state'  				=> 'Judet',
     'status_labels'			=> 'Etichete status',
+    'status_label'			=> 'Status Label',
     'status'    			=> 'Stare',
     'accept_eula'           => 'Acceptare acord',
+    'show_or_hide_eulas' => 'Show/Hide EULAs',
     'supplier'              => 'Furnizor',
     'suppliers'  			=> 'Furnizori',
     'sure_to_delete'        => 'Sigur doriți să ștergeți',
@@ -296,9 +303,9 @@ return [
     'type'  				=> 'Tipul',
     'undeployable'			=> 'Nelansabil',
     'unknown_admin'			=> 'Admin necunoscut',
-    'username_format'		=> 'Nume de utilizator Format',
     'username'              => 'Utilizator',
     'update'                => 'Actualizează',
+    'updating_item' => 'Updating :item',
     'upload_filetypes_help'      => 'Tipurile de fișiere permise sunt png, gif, jpg, jpeg, doc, docx, pdf, xls, xlsx, txt, lic, xml, zip, rtf și rar. Dimensiunea maximă permisă este :size.',
     'uploaded'              => 'Încărcat',
     'user'					=> 'Utilizator',
@@ -323,10 +330,10 @@ return [
     'token_expired'         => 'Sesiunea de formular a expirat. Vă rugăm să încercați din nou.',
     'login_enabled'         => 'Autentificare activată',
     'audit_due'             => 'De auditat',
-    'audit_due_days'        => 'Activele scadente pentru audit în termen de :days Active datorate pentru audit în următoarele zile',
+    'audit_due_days'        => '{}Assets Due or Overdue for Audit|[1]Assets Due or Overdue for Audit Within a Day|[2,*]Assets Due or Overdue for Audit Within :days Days',
     'checkin_due'           => 'De finalizat pentru Checkin',
     'checkin_overdue'       => 'Restabilit pentru Checkin',
-    'checkin_due_days'      => 'Activele scadente pentru verificare în termen de :days Active de ziua De finalizat pentru Verificare în următoarele zile',
+    'checkin_due_days'      => '{}Due for Checkin|[1]Assets Due for Checkin Within :days Day|[2,*]Assets Due for Checkin Within :days Days',
     'audit_overdue'         => 'Audit întârziat',
     'accept'                => 'Acceptă :asset',
     'i_accept'              => 'Accept',
@@ -339,16 +346,16 @@ return [
     'view_all'              => 'vezi toate',
     'hide_deleted'          => 'Ascunde șterse',
     'email'                 => 'E-mail',
-    'do_not_change'         => 'Nu schimba',
-    'bug_report'            => 'Raportează o eroare',
+    'do_not_change'         => 'Do not change',
+    'bug_report'            => 'Report a bug',
     'user_manual'           => 'Manualul utilizatorului',
     'setup_step_1'          => 'Pasul 1',
     'setup_step_2'          => 'Pasul 2',
     'setup_step_3'          => 'Pasul 3',
     'setup_step_4'          => 'Pasul 4',
     'setup_config_check'    => 'Verificare configurație',
-    'setup_create_database' => 'Creaza tabele baza de date',
-    'setup_create_admin'    => 'Creare utilizator administrator',
+    'setup_create_database' => 'Create database tables',
+    'setup_create_admin'    => 'Create an admin user',
     'setup_done'            => 'Terminat!',
     'bulk_edit_about_to'    => 'Urmează să editați următoarele: ',
     'checked_out'           => 'Predat',
@@ -383,6 +390,8 @@ return [
     'new_license'           => 'Licență nouă',
     'new_accessory'         => 'Accesoriu nou',
     'new_consumable'        => 'Consumul nou',
+    'new_component'         => 'New Component',
+    'new_user'              => 'New User',
     'collapse'              => 'Restrânge',
     'assigned'              => 'Atribuit',
     'asset_count'           => 'Numărul de active',
@@ -418,19 +427,20 @@ return [
     'bulk_soft_delete'      =>'De asemenea, soft-delete acesti utilizatori. Istoricul lor de active va ramane intact numai in cazul in care eliminati inregistrarile sterse din Setarile Administratorului.',
     'bulk_checkin_delete_success' => 'Utilizatorii selectați au fost șterși și elementele lor au fost verificate.',
     'bulk_checkin_success' => 'Elementele pentru utilizatorii selectați au fost verificate.',
-    'set_to_null'           => 'Ștergeți valorile pentru acest element / Ștergeți valorile pentru toate cele :asset_count active ',
+    'set_to_null'           => 'Delete values for this selection|Delete values for all :selection_count selections ',
     'set_users_field_to_null'  => 'Ştergeţi :field values for this user<unk> Ştergeţi :field values for all :user_count users ',
     'na_no_purchase_date'   => 'N/A - Nicio dată de cumpărare furnizată',
     'assets_by_status'      => 'Bunuri după stare',
     'assets_by_status_type'      => 'Bunuri după tipul de stare',
     'pie_chart_type'        => 'Tip diagramă diagramă Dashboard',
     'hello_name'            => 'Salut, :name!',
-    'unaccepted_profile_warning'   => 'Aveți :count elemente care necesită acceptare. Faceți clic aici pentru a le accepta sau refuzați',
+    'unaccepted_profile_warning'   => 'You have one item requiring acceptance. Click here to accept or decline it | You have :count items requiring acceptance. Click here to accept or decline them',
     'start_date'            => 'Data de început',
     'end_date'            => 'Data de încheiere',
     'alt_uploaded_image_thumbnail' => 'Miniatură încărcată',
     'placeholder_kit'       => 'Selectează un kit',
     'file_not_found'        => 'Fișierul nu a fost găsit',
+    'log_record_not_found'  => 'No record for that log entry was found.',
     'preview_not_available' => '(fără previzualizare)',
     'setup'                 => 'Configurare',
     'pre_flight'            => 'Debrietate',
@@ -512,7 +522,7 @@ return [
     'checked_out_to_fields' => 'Checked Out To Fields',
     'percent_complete' => '% complet',
     'uploading' => 'Încărcare... ',
-    'upload_error' => 'Eroare la încărcarea fișierului. Vă rugăm să verificați că nu există rânduri goale și că nici un nume de coloane nu este duplicat.',
+    'upload_error' => 'Error uploading file. Please check that you have no empty rows or duplicated column names in your CSV, and that the server permissions allow uploads.',
     'copy_to_clipboard' => 'Copiază în clipboard',
     'copied' => 'Copiat!',
     'status_compatibility' => 'Dacă activele sunt deja alocate, acestea nu pot fi schimbate la un tip de stare neimplementabil și această modificare de valoare va fi omisă.',
@@ -549,6 +559,71 @@ return [
         'license_seats'  => ':count Locul de licență:count Locuri de licență',
         'consumables'  => ':count Consumabile|:count Consumabile',
         'components'  => ':count Component|:count Componente',
-    ]
+    ],
+
+    'more_info' => 'Mai multe',
+    'quickscan_bulk_help' => 'Checking this box will edit the asset record to reflect this new location. Leaving it unchecked will simply note the location in the audit log. Note that if this asset is checked out, it will not change the location of the person, asset or location it is checked out to.',
+    'whoops' => 'Whoops!',
+    'something_went_wrong' => 'Something went wrong with your request.',
+    'close' => 'Close',
+    'expires' => 'expiră',
+    'map_fields'=> 'Map :item_type Fields',
+    'remaining_var' => ':count Remaining',
+    'label' => 'Label',
+    'import_asset_tag_exists' => 'An asset with the asset tag :asset_tag already exists and an update was not requested. No change was made.',
+    'countries_manually_entered_help' => 'Values with an asterisk (*) were manually entered and do not match existing ISO 3166 dropdown values',
+    'accessories_assigned' => 'Assigned Accessories',
+    'user_managed_passwords' => 'Password Management',
+    'user_managed_passwords_disallow' => 'Disallow users from managing their own passwords',
+    'user_managed_passwords_allow' => 'Allow users to manage their own passwords',
+    'from' => 'From',
+    'by' => 'Facut de',
+
+// Add form placeholders here
+    'placeholders' => [
+        'notes'  => 'Add a note',
+    ],
+
+    'breadcrumb_button_actions' => [
+        'edit_item' => 'Edit :name',
+        'checkout_item' => 'Checkout :name',
+        'checkin_item' => 'Checkin :name',
+    ],
+
+    'skins' => [
+        'site_default' => 'Site Default',
+        'default_blue' => 'Default Blue',
+        'blue_dark' => 'Blue (Dark Mode)',
+        'green' => 'Green Dark',
+        'green_dark' => 'Green (Dark Mode)',
+        'red' => 'Red Dark',
+        'red_dark' => 'Red (Dark Mode)',
+        'orange' => 'Orange Dark',
+        'orange_dark' => 'Orange (Dark Mode)',
+        'black' => 'Black',
+        'black_dark' => 'Black (Dark Mode)',
+        'purple' => 'Purple',
+        'purple_dark' => 'Purple (Dark Mode)',
+        'yellow' => 'Yellow',
+        'yellow_dark' => 'Yellow (Dark Mode)',
+        'high_contrast' => 'High Contrast',
+
+    ],
+
+    'select_all_none' => 'Select/Unselect All',
+    'generic_model_not_found' => 'That :model was not found or you do not have permission to access it',
+    'deleted_models' => 'Deleted Asset Models',
+    'deleted_users' => 'Deleted Users',
+    'cost_each' => ':amount each',
+    'remove_current_image' => 'Remove current :type image',
+
+    'seeding' => [
+        'manufacturers' => [
+            'button' => 'Create Manufacturers',
+            'prompt' => 'You do not have any manufacturers yet. Would you like to seed a list of common manufacturers? (THIS WILL OVERWRITE EXISTING MANUFACTURERS, including those that have been soft-deleted.)',
+            'success' => 'Manufacturers seeded successfully',
+            'error' => 'Could not seed manufacturers. A manufacturer record already exists and seeding would overwrite it.|Could not seed manufacturers. :count manufacturer records already exist and seeding would overwrite them.',
+        ],
+    ],
 
 ];
diff --git a/resources/lang/ro-RO/localizations.php b/resources/lang/ro-RO/localizations.php
index 58600c3548..725ff78629 100644
--- a/resources/lang/ro-RO/localizations.php
+++ b/resources/lang/ro-RO/localizations.php
@@ -2,7 +2,7 @@
 
 return [
 
-    'select_language' => 'Selectaţi o limbă',
+    'select_language' => 'Select a Language',
     'languages' => [
         'en-US'=> 'Engleză, SUA',
         'en-GB'=> 'Engleză, Marea Britanie',
@@ -40,7 +40,9 @@ return [
         'ms-MY'=> 'Malaeză',
         'mi-NZ'=> 'Maori',
         'mn-MN'=> 'Mongolie',
-        'no-NO'=> 'Norvegiană',
+        'nb-NO'=> 'Norwegian Bokmål',
+        'om-ET' => 'Oromo (Ethiopian)',
+        //'nn-NO'=> 'Norwegian Nynorsk',
         'fa-IR'=> 'persană',
         'pl-PL'=> 'Poloneză',
         'pt-PT'=> 'Portugheză',
@@ -66,7 +68,7 @@ return [
         'zu-ZA'=> 'Zulu',
     ],
 
-    'select_country' => 'Selectează o țară',
+    'select_country' => 'Select a Country',
     
     'countries' => [
         'AC'=>'Insula Ascension',
@@ -133,6 +135,7 @@ return [
         'EC'=>'Ecuador',
         'EE'=>'Estonia',
         'EG'=>'Egipt',
+        'GB-ENG'=>'England',
         'ER'=>'Eritreea',
         'ES'=>'Spania',
         'ET'=>'Ethiopia',
@@ -231,6 +234,7 @@ return [
         'NG'=>'Nigeria',
         'NI'=>'Nicaragua',
         'NL'=>'Olanda',
+        'GB-NIR' => 'Northern Ireland',
         'NO'=>'Norvegia',
         'NP'=>'Nepal',
         'NR'=>'Nauru',
@@ -258,7 +262,7 @@ return [
         'RU'=>'Federaţia Rusă',
         'RW'=>'Rwanda',
         'SA'=>'Arabia Saudită',
-        'UK'=>'Scoţia',
+        'GB-SCT'=>'Scoţia',
         'SB'=>'Insulele Solomon',
         'SC'=>'Seychelles',
         'SS'=>'Sudanul de Sud',
@@ -310,6 +314,7 @@ return [
         'VI'=>'Insulele Virgine Americane',
         'VN'=>'Viet Nam',
         'VU'=>'Vanuatu',
+        'GB-WLS' =>'Wales',
         'WF'=>'Insulele Wallis și Futuna',
         'WS'=>'Samoa',
         'YE'=>'Yemen',
diff --git a/resources/lang/ro-RO/mail.php b/resources/lang/ro-RO/mail.php
index 5dc8b0906d..81f6d41e4f 100644
--- a/resources/lang/ro-RO/mail.php
+++ b/resources/lang/ro-RO/mail.php
@@ -23,24 +23,25 @@ return [
     'Item_Requested' => 'Elementul solicitat',
     'License_Checkin_Notification' => 'Licență verificată în',
     'License_Checkout_Notification' => 'Licența a fost verificată',
+    'license_for'   => 'License for',
     'Low_Inventory_Report' => 'Raport privind inventarul redus',
     'a_user_canceled' => 'Un utilizator a anulat o solicitare de element pe site',
     'a_user_requested' => 'Un utilizator a solicitat un element de pe site',
     'acceptance_asset_accepted' => 'Un utilizator a acceptat un articol',
     'acceptance_asset_declined' => 'Un utilizator a refuzat un articol',
-    'accessory_name' => 'Nume accesoriu:',
-    'additional_notes' => 'Note Aditionale:',
+    'accessory_name' => 'Nume Accesoriu',
+    'additional_notes' => 'Note Aditionale',
     'admin_has_created' => 'Un administrator a creat un cont pentru dvs. pe: site-ul Web.',
-    'asset' => 'activ:',
-    'asset_name' => 'Numele activului:',
+    'asset' => 'Activ',
+    'asset_name' => 'Nume activ',
     'asset_requested' => 'Activul solicitat',
     'asset_tag' => 'Eticheta activ',
     'assets_warrantee_alert' => 'Există :count active cu o garanție care expiră în următoarele :prag zile.<unk> Există :count active cu garanții care expiră în următoarele :threshold zile.',
     'assigned_to' => 'Atribuit',
     'best_regards' => 'Toate cele bune,',
-    'canceled' => 'Anulat:',
-    'checkin_date' => 'Checkin Data:',
-    'checkout_date' => 'Verifica data:',
+    'canceled' => 'Anulat',
+    'checkin_date' => 'Verificați data',
+    'checkout_date' => 'Data predare',
     'checkedout_from' => 'Verificat de la',
     'checkedin_from'  => 'Verificat de la',
     'checked_into' => 'Verificat în',
@@ -49,27 +50,30 @@ return [
     'click_to_confirm' => 'Dați clic pe următorul link pentru a vă confirma: contul web:',
     'current_QTY' => 'CTA curentă',
     'days' => 'zi',
-    'expecting_checkin_date' => 'Data expirării așteptate:',
+    'expecting_checkin_date' => 'Data de așteptare așteptată',
     'expires' => 'expiră',
     'hello' => 'buna',
     'hi' => 'Bună',
     'i_have_read' => 'Am citit și sunt de acord cu termenii de utilizare și am primit acest articol.',
     'inventory_report' => 'Raport de inventar',
-    'item' => 'Articol:',
+    'item' => 'Articol',
+    'item_checked_reminder' => 'This is a reminder that you currently have :count items checked out to you that you have not accepted or declined. Please click the link below to confirm your decision.',
     'license_expiring_alert' => 'Există :count licență care expiră în următoarele :prag zile.<unk> Există :count licențe care expiră în următoarele :threshold zile.',
     'link_to_update_password' => 'Faceți clic pe următorul link pentru a vă actualiza parola web:',
-    'login' => 'Logare:',
+    'login' => 'Logare',
     'login_first_admin' => 'Conectați-vă la noua dvs. instalare Snipe-IT utilizând următoarele acreditări:',
     'low_inventory_alert' => 'Există :count articol care este sub nivelul minim de inventar sau care va fi în curând scăzut. Există :count articole care sunt sub nivelul minim de inventar sau care vor fi în curând scăzute.',
     'min_QTY' => 'Cantitate min',
     'name' => 'Nume',
     'new_item_checked' => 'Un element nou a fost verificat sub numele dvs., detaliile sunt de mai jos.',
+    'new_item_checked_with_acceptance' => 'A new item has been checked out under your name that requires acceptance, details are below.',
+    'recent_item_checked' => 'An item was recently checked out under your name that requires acceptance, details are below.',
     'notes' => 'notițe',
-    'password' => 'Parola:',
+    'password' => 'Parola',
     'password_reset' => 'Resetare parola',
     'read_the_terms' => 'Citiți termenii de utilizare de mai jos.',
     'read_the_terms_and_click' => 'Vă rugăm să citiţi termenii de utilizare de mai jos, și faceți clic pe link-ul din partea de jos pentru a confirma că ați citit și sunteți de acord cu termenii de utilizare și ați primit activul.',
-    'requested' => 'Solicitat:',
+    'requested' => 'Cereri',
     'reset_link' => 'Parola Resetare parolă',
     'reset_password' => 'Faceți clic aici pentru a vă reseta parola:',
     'rights_reserved' => 'Toate drepturile rezervate.',
@@ -86,8 +90,10 @@ return [
     'upcoming-audits' => 'Există :count atuuri care vin pentru audit în :prag zile.• Există :count active care vin pentru audit în următoarele zile limită.',
     'user' => 'Utilizator',
     'username' => 'Utilizator',
+    'unaccepted_asset_reminder' => 'Reminder: You have Unaccepted Assets.',
     'welcome' => 'Bun venit: nume',
     'welcome_to' => 'Bun venit pe: web!',
     'your_assets' => 'Vezi activele tale',
     'your_credentials' => 'Informațiile dvs. Snipe-IT',
+    'mail_sent' => 'Mail sent successfully!',
 ];
diff --git a/resources/lang/ro-RO/validation.php b/resources/lang/ro-RO/validation.php
index 991ed6db96..8cb31ac36c 100644
--- a/resources/lang/ro-RO/validation.php
+++ b/resources/lang/ro-RO/validation.php
@@ -13,87 +13,150 @@ return [
     |
     */
 
-    'accepted'             => ':attribute a fost acceptat.',
-    'active_url'           => ':attribute nu este un URL valid.',
-    'after'                => ':attribute trebuie sa fie o data dupa :date.',
-    'after_or_equal'       => ': atribute trebuie să fie o dată mai mare sau egală cu :date.',
-    'alpha'                => ':attribute trebuie sa contina numai litere.',
-    'alpha_dash'           => ':attribute poate sa contina numai litere, cifre si linia de punctuatie.',
-    'alpha_num'            => ':attribute poate sa contina numai litere si cifre.',
-    'array'                => ': attribute trebuie să fie un șir/matrice.',
-    'before'               => ':attribute trebuie sa contina o data inainte de :date.',
-    'before_or_equal'      => ': atribute trebuie să fie o dată mai mică cu o zi sau egală cu :date.',
-    'between'              => [
-        'numeric' => ':attribute trebuie sa fie intre :min - :max.',
-        'file'    => ':attribute trebuie sa fie intre  :min - :max kilobytes.',
-        'string'  => ':attribute trebuie sa aiba intre :min - :max caractere.',
-        'array'   => ': atribute trebuie să fie între: min şi: max.',
+    'accepted' => 'The :attribute field must be accepted.',
+    'accepted_if' => 'The :attribute field must be accepted when :other is :value.',
+    'active_url' => 'The :attribute field must be a valid URL.',
+    'after' => 'The :attribute field must be a date after :date.',
+    'after_or_equal' => 'The :attribute field must be a date after or equal to :date.',
+    'alpha' => 'The :attribute field must only contain letters.',
+    'alpha_dash' => 'The :attribute field must only contain letters, numbers, dashes, and underscores.',
+    'alpha_num' => 'The :attribute field must only contain letters and numbers.',
+    'array' => 'The :attribute field must be an array.',
+    'ascii' => 'The :attribute field must only contain single-byte alphanumeric characters and symbols.',
+    'before' => 'The :attribute field must be a date before :date.',
+    'before_or_equal' => 'The :attribute field must be a date before or equal to :date.',
+    'between' => [
+        'array' => 'The :attribute field must have between :min and :max items.',
+        'file' => 'The :attribute field must be between :min and :max kilobytes.',
+        'numeric' => 'The :attribute field must be between :min and :max.',
+        'string' => 'The :attribute field must be between :min and :max characters.',
     ],
-    'boolean'              => 'Câmpul atributului trebuie să fie adevărat sau fals.',
-    'confirmed'            => 'Confirmarea la :attribute nu este asemanatoare.',
-    'date'                 => ':attribute nu este o data.',
-    'date_format'          => ':attribute nu se leaga cu formatul :format.',
-    'different'            => ':attribute si :other trebuie sa fie diferite.',
-    'digits'               => ':attribute trebuie sa fie de :digits cifre.',
-    'digits_between'       => ':attribute trebuie sa fie intre :min si :max cifre.',
-    'dimensions'           => 'Atributul: are dimensiuni de imagine nevalide.',
-    'distinct'             => 'Câmpul atributului: are o valoare duplicat.',
-    'email'                => 'Formatul :attribute nu este valid.',
-    'exists'               => ':attribute selectat nu e valid.',
-    'file'                 => 'Atributul: trebuie să fie un fișier.',
-    'filled'               => 'Câmpul atributului trebuie să aibă o valoare.',
-    'image'                => ':attribute trebuie sa fie o imagine.',
+    'boolean' => 'Câmpul atributului trebuie să fie adevărat sau fals.',
+    'can' => 'The :attribute field contains an unauthorized value.',
+    'confirmed' => 'The :attribute field confirmation does not match.',
+    'contains' => 'The :attribute field is missing a required value.',
+    'current_password' => 'The password is incorrect.',
+    'date' => 'The :attribute field must be a valid date.',
+    'date_equals' => 'The :attribute field must be a date equal to :date.',
+    'date_format' => 'The :attribute field must match the format :format.',
+    'decimal' => 'The :attribute field must have :decimal decimal places.',
+    'declined' => 'The :attribute field must be declined.',
+    'declined_if' => 'The :attribute field must be declined when :other is :value.',
+    'different' => 'The :attribute field and :other must be different.',
+    'digits' => 'The :attribute field must be :digits digits.',
+    'digits_between' => 'The :attribute field must be between :min and :max digits.',
+    'dimensions' => 'The :attribute field has invalid image dimensions.',
+    'distinct' => 'Câmpul atributului: are o valoare duplicat.',
+    'doesnt_end_with' => 'The :attribute field must not end with one of the following: :values.',
+    'doesnt_start_with' => 'The :attribute field must not start with one of the following: :values.',
+    'email' => 'The :attribute field must be a valid email address.',
+    'ends_with' => 'The :attribute field must end with one of the following: :values.',
+    'enum' => ':attribute selectat nu e valid.',
+    'exists' => ':attribute selectat nu e valid.',
+    'extensions' => 'The :attribute field must have one of the following extensions: :values.',
+    'file' => 'The :attribute field must be a file.',
+    'filled' => 'Câmpul atributului trebuie să aibă o valoare.',
+    'gt' => [
+        'array' => 'The :attribute field must have more than :value items.',
+        'file' => 'The :attribute field must be greater than :value kilobytes.',
+        'numeric' => 'The :attribute field must be greater than :value.',
+        'string' => 'The :attribute field must be greater than :value characters.',
+    ],
+    'gte' => [
+        'array' => 'The :attribute field must have :value items or more.',
+        'file' => 'The :attribute field must be greater than or equal to :value kilobytes.',
+        'numeric' => 'The :attribute field must be greater than or equal to :value.',
+        'string' => 'The :attribute field must be greater than or equal to :value characters.',
+    ],
+    'hex_color' => 'The :attribute field must be a valid hexadecimal color.',
+    'image' => 'The :attribute field must be an image.',
     'import_field_empty'    => 'Valoarea pentru :field name nu poate fi null.',
-    'in'                   => ':attribute selectat nu este valid.',
-    'in_array'             => 'Câmpul atributului nu există în: altul.',
-    'integer'              => ':attribute trebuie sa fie numar intreg.',
-    'ip'                   => ':attribute trebuie sa fie o adresa IP valida.',
-    'ipv4'                 => 'Atributul: trebuie să fie o adresă IPv4 validă.',
-    'ipv6'                 => 'Atributul: trebuie să fie o adresă IPv6 validă.',
-    'is_unique_department' => ':attribute trebuie să fie unic pentru această companie locaţie',
-    'json'                 => 'Atributul: trebuie să fie un șir JSON valid.',
-    'max'                  => [
-        'numeric' => ':attribute nu poate sa fie mai mare de :max.',
-        'file'    => ':attribute nu poate sa fie mai mare de :max kilobytes.',
-        'string'  => ':attribute nu trebuie sa fie mai mare de :max caractere.',
-        'array'   => 'Atributul:: nu poate avea mai mult de: elemente max.',
+    'in' => ':attribute selectat nu este valid.',
+    'in_array' => 'The :attribute field must exist in :other.',
+    'integer' => 'The :attribute field must be an integer.',
+    'ip' => 'The :attribute field must be a valid IP address.',
+    'ipv4' => 'The :attribute field must be a valid IPv4 address.',
+    'ipv6' => 'The :attribute field must be a valid IPv6 address.',
+    'json' => 'The :attribute field must be a valid JSON string.',
+    'list' => 'The :attribute field must be a list.',
+    'lowercase' => 'The :attribute field must be lowercase.',
+    'lt' => [
+        'array' => 'The :attribute field must have less than :value items.',
+        'file' => 'The :attribute field must be less than :value kilobytes.',
+        'numeric' => 'The :attribute field must be less than :value.',
+        'string' => 'The :attribute field must be less than :value characters.',
     ],
-    'mimes'                => ':attribute trebuie sa fie un fisier de tipul :values.',
-    'mimetypes'            => 'Atributul: trebuie să fie un fișier de tip:: valori.',
-    'min'                  => [
-        'numeric' => ':attribute trebuie sa aiba cel putin :min.',
-        'file'    => ':attribute trebuie sa aiba minim :min kilobytes.',
-        'string'  => ':attribute trebuie sa aiba cel putin :min caractere.',
-        'array'   => 'Atributul:: trebuie să aibă cel puțin: min.',
+    'lte' => [
+        'array' => 'The :attribute field must not have more than :value items.',
+        'file' => 'The :attribute field must be less than or equal to :value kilobytes.',
+        'numeric' => 'The :attribute field must be less than or equal to :value.',
+        'string' => 'The :attribute field must be less than or equal to :value characters.',
     ],
-    'starts_with'          => ':attribute trebuie să înceapă cu una dintre următoarele: :values.',
-    'ends_with'            => ':attribute trebuie să se termine cu una dintre următoarele: :values.',
+    'mac_address' => 'The :attribute field must be a valid MAC address.',
+    'max' => [
+        'array' => 'The :attribute field must not have more than :max items.',
+        'file' => 'The :attribute field must not be greater than :max kilobytes.',
+        'numeric' => 'The :attribute field must not be greater than :max.',
+        'string' => 'The :attribute field must not be greater than :max characters.',
+    ],
+    'max_digits' => 'The :attribute field must not have more than :max digits.',
+    'mimes' => 'The :attribute field must be a file of type: :values.',
+    'mimetypes' => 'The :attribute field must be a file of type: :values.',
+    'min' => [
+        'array' => 'The :attribute field must have at least :min items.',
+        'file' => 'The :attribute field must be at least :min kilobytes.',
+        'numeric' => 'The :attribute field must be at least :min.',
+        'string' => 'The :attribute field must be at least :min characters.',
+    ],
+    'min_digits' => 'The :attribute field must have at least :min digits.',
+    'missing' => 'The :attribute field must be missing.',
+    'missing_if' => 'The :attribute field must be missing when :other is :value.',
+    'missing_unless' => 'The :attribute field must be missing unless :other is :value.',
+    'missing_with' => 'The :attribute field must be missing when :values is present.',
+    'missing_with_all' => 'The :attribute field must be missing when :values are present.',
+    'multiple_of' => 'The :attribute field must be a multiple of :value.',
+    'not_in' => ':attribute selectat nu e valid.',
+    'not_regex' => 'The :attribute field format is invalid.',
+    'numeric' => 'The :attribute field must be a number.',
+    'password' => [
+        'letters' => 'The :attribute field must contain at least one letter.',
+        'mixed' => 'The :attribute field must contain at least one uppercase and one lowercase letter.',
+        'numbers' => 'The :attribute field must contain at least one number.',
+        'symbols' => 'The :attribute field must contain at least one symbol.',
+        'uncompromised' => 'The given :attribute has appeared in a data leak. Please choose a different :attribute.',
+    ],
+    'percent'       => 'The depreciation minimum must be between 0 and 100 when depreciation type is percentage.',
 
-    'not_in'               => ':attribute selectat nu e valid.',
-    'numeric'              => ':attribute trebuie sa fie un numar.',
-    'present'              => 'Câmpul atributului trebuie să fie prezent.',
-    'valid_regex'          => 'Acesta nu este un regex valid. ',
-    'regex'                => 'Formatul :attribute nu este valid.',
-    'required'             => 'Campul :attribute este obligatoriu.',
-    'required_if'          => ':attribute este obligatoriu atunci cand :other este :value.',
-    'required_unless'      => 'Câmpul atributului este necesar dacă: altul nu este în: valori.',
-    'required_with'        => ':attribute este obligatoriu atunci cand :values este prezent.',
-    'required_with_all'    => 'Câmpul atributului este necesar când: există valori.',
-    'required_without'     => ':attribute este obligatoriu atunci cand :values nu este prezent.',
+    'present' => 'Câmpul atributului trebuie să fie prezent.',
+    'present_if' => 'The :attribute field must be present when :other is :value.',
+    'present_unless' => 'The :attribute field must be present unless :other is :value.',
+    'present_with' => 'The :attribute field must be present when :values is present.',
+    'present_with_all' => 'The :attribute field must be present when :values are present.',
+    'prohibited' => 'The :attribute field is prohibited.',
+    'prohibited_if' => 'The :attribute field is prohibited when :other is :value.',
+    'prohibited_unless' => 'The :attribute field is prohibited unless :other is in :values.',
+    'prohibits' => 'The :attribute field prohibits :other from being present.',
+    'regex' => 'The :attribute field format is invalid.',
+    'required' => 'Campul :attribute este obligatoriu.',
+    'required_array_keys' => 'The :attribute field must contain entries for: :values.',
+    'required_if' => ':attribute este obligatoriu atunci cand :other este :value.',
+    'required_if_accepted' => 'The :attribute field is required when :other is accepted.',
+    'required_if_declined' => 'The :attribute field is required when :other is declined.',
+    'required_unless' => 'Câmpul atributului este necesar dacă: altul nu este în: valori.',
+    'required_with' => ':attribute este obligatoriu atunci cand :values este prezent.',
+    'required_with_all' => 'The :attribute field is required when :values are present.',
+    'required_without' => ':attribute este obligatoriu atunci cand :values nu este prezent.',
     'required_without_all' => 'Câmpul atributului este necesar atunci când niciuna dintre valorile: nu este prezentă.',
-    'same'                 => ':attribute si :other trebuie sa fie la fel.',
-    'size'                 => [
-        'numeric' => ':attribute trebuie sa aiba :size.',
-        'file'    => ':attribute trebuie sa aiba :size kilobytes.',
-        'string'  => ':attribute trebuie sa aiba :size caractere.',
-        'array'   => 'Atributul:: trebuie să conțină: elemente de dimensiune.',
+    'same' => 'The :attribute field must match :other.',
+    'size' => [
+        'array' => 'The :attribute field must contain :size items.',
+        'file' => 'The :attribute field must be :size kilobytes.',
+        'numeric' => 'The :attribute field must be :size.',
+        'string' => 'The :attribute field must be :size characters.',
     ],
+    'starts_with' => 'The :attribute field must start with one of the following: :values.',
     'string'               => 'Atributul: trebuie să fie un șir.',
-    'timezone'             => 'Atributul: trebuie să fie o zonă validă.',
     'two_column_unique_undeleted' => ':attribute trebuie să fie unic în :table1 și :table2. ',
-    'unique'               => ':attribute este deja folosit.',
-    'uploaded'             => 'Atributul: nu a reușit să se încarce.',
-    'url'                  => 'Formatul :attribute nu este valid.',
     'unique_undeleted'     => 'Atributul: trebuie să fie unic.',
     'non_circular'         => ':attribute nu trebuie să creeze o referință circulară.',
     'not_array'            => ':attribute nu poate fi un array.',
@@ -102,11 +165,14 @@ return [
     'numbers'              => 'Parola trebuie să conțină cel puțin un număr.',
     'case_diff'            => 'Parola trebuie să fie utilizată cu majuscule.',
     'symbols'              => 'Parola trebuie să conțină simboluri.',
-    'gte'                  => [
-        'numeric'          => 'Valoarea nu poate fi negativă'
-    ],
-    'checkboxes'           => ':attribute conține opțiuni invalide.',
-    'radio_buttons'        => ':attribute nu este valid.',
+    'timezone' => 'The :attribute field must be a valid timezone.',
+    'unique' => ':attribute este deja folosit.',
+    'uploaded' => 'Atributul: nu a reușit să se încarce.',
+    'uppercase' => 'The :attribute field must be uppercase.',
+    'url' => 'The :attribute field must be a valid URL.',
+    'ulid' => 'The :attribute field must be a valid ULID.',
+    'uuid' => 'The :attribute field must be a valid UUID.',
+    'fmcs_location' => 'Full multiple company support and location scoping is enabled in the Admin Settings, and the selected location and selected company are not compatible.',
 
 
     /*
@@ -120,16 +186,22 @@ return [
     |
     */
 
+    'email_array'      => 'Una sau mai multe adrese de e-mail este nevalidă.',
+    'checkboxes'           => ':attribute conține opțiuni invalide.',
+    'radio_buttons'        => ':attribute nu este valid.',
+    
     'custom' => [
         'alpha_space' => 'Câmpul atributului: conține un caracter care nu este permis.',
-        'email_array'      => 'Una sau mai multe adrese de e-mail este nevalidă.',
+
         'hashed_pass'      => 'Parola curentă este incorectă',
         'dumbpwd'          => 'Această parolă este prea obișnuită.',
         'statuslabel_type' => 'Trebuie să selectați un tip de etichetă de stare validă',
+        'custom_field_not_found'          => 'This field does not seem to exist, please double check your custom field names.',
+        'custom_field_not_found_on_model' => 'This field seems to exist, but is not available on this Asset Model\'s fieldset.',
 
         // date_format validation with slightly less stupid messages. It duplicates a lot, but it gets the job done :(
-        // We use this because the default error message for date_format is reflects php Y-m-d, which non-PHP
-        // people won't know how to format. 
+        // We use this because the default error message for date_format reflects php Y-m-d, which non-PHP
+        // people won't know how to format.
         'purchase_date.date_format'     => ':attribute trebuie să fie o dată validă în formatul AAAA-LL-ZZ',
         'last_audit_date.date_format'   =>  ':attribute trebuie să fie o dată validă în AAAA-LL-ZZ hh:mm:ss format',
         'expiration_date.date_format'   =>  ':attribute trebuie să fie o dată validă în formatul AAAA-LL-ZZ',
@@ -137,9 +209,15 @@ return [
         'expected_checkin.date_format'  =>  ':attribute trebuie să fie o dată validă în formatul AAAA-LL-ZZ',
         'start_date.date_format'        =>  ':attribute trebuie să fie o dată validă în formatul AAAA-LL-ZZ',
         'end_date.date_format'          =>  ':attribute trebuie să fie o dată validă în formatul AAAA-LL-ZZ',
+        'invalid_value_in_field' => 'Valoare nevalidă inclusă în acest câmp',
 
-    ],
+        'ldap_username_field' => [
+            'not_in' =>         '<code>sAMAccountName</code> (mixed case) will likely not work. You should use <code>samaccountname</code> (lowercase) instead.'
+        ],
+        'ldap_auth_filter_query' => ['not_in' => '<code>uid=samaccountname</code> is probably not a valid auth filter. You probably want <code>uid=</code> '],
+        'ldap_filter' => ['regex' => 'This value should probably not be wrapped in parentheses.'],
 
+        ],
     /*
     |--------------------------------------------------------------------------
     | Custom Validation Attributes
@@ -155,8 +233,16 @@ return [
 
     /*
     |--------------------------------------------------------------------------
-    | Generic Validation Messages
+    | Generic Validation Messages - we use these in the jquery validation where we don't have
+    | access to the :attribute
     |--------------------------------------------------------------------------
     */
-    'invalid_value_in_field' => 'Valoare nevalidă inclusă în acest câmp',
+
+    'generic' => [
+        'invalid_value_in_field' => 'Valoare nevalidă inclusă în acest câmp',
+        'required' => 'This field is required',
+        'email' => 'Please enter a valid email address',
+    ],
+
+
 ];
diff --git a/resources/lang/ru-RU/account/general.php b/resources/lang/ru-RU/account/general.php
index 546ad05945..8e78a543d0 100644
--- a/resources/lang/ru-RU/account/general.php
+++ b/resources/lang/ru-RU/account/general.php
@@ -2,10 +2,16 @@
 
 return array(
     'personal_api_keys' => 'Персональные API ключи',
-    'api_key_warning' => 'When generating an API token, be sure to copy it down immediately as they will not be visible to you again.',
+    'personal_access_token' => 'Персональный токен доступа',
+    'personal_api_keys_success' => 'Ключ персонального API :key создан успешно',
+    'here_is_api_key' => 'Вот Ваш новый персональный токен доступа. Это единственный раз, когда он показывается. Не потеряйте его! Теперь Вы можете использовать данный токен для выполнения запросов API.',
+    'api_key_warning' => 'При создании ключа API скопируйте его сразу, его больше нельзя посмотреть.',
     'api_base_url' => 'Ваш базовый URL-адрес API находится в:',
     'api_base_url_endpoint' => '/&lt;endpoint&gt;',
     'api_token_expiration_time' => 'API токены истекут:',
-    'api_reference' => 'Please check the <a href="https://snipe-it.readme.io/reference" target="_blank">API reference</a> to find specific API endpoints and additional API documentation.',
-    'profile_updated' => 'Account successfully updated',
+    'api_reference' => 'Пожалуйста, обратитесь к <a href="https://snipe-it.readme.io/reference" target="_blank">справочнику API</a>, чтобы найти конкретные конечные точки API и дополнительную документацию API.',
+    'profile_updated' => 'Аккаунт успешно обновлен',
+    'no_tokens' => 'Вы не создали никаких персональных токенов доступа.',
+    'enable_sounds' => 'Включить звуковые эффекты',
+    'enable_confetti' => 'Включить эффект конфетти',
 );
diff --git a/resources/lang/ru-RU/admin/accessories/general.php b/resources/lang/ru-RU/admin/accessories/general.php
index 5eb29d2b6d..c9eeba5a69 100644
--- a/resources/lang/ru-RU/admin/accessories/general.php
+++ b/resources/lang/ru-RU/admin/accessories/general.php
@@ -3,13 +3,13 @@
 return array(
     'accessory_category' 				=> 'Категория аксессуара',
     'accessory_name'  					=> 'Имя аксессуара',
-    'checkout'  							=> 'Отвязать прочее',
-    'checkin'  							=> 'Привязать прочее',
-    'create'  							=> 'Создать аксесуар',
-    'edit'  							=> 'Править прочее',
+    'checkout'  							=> 'Выдать аксессуар',
+    'checkin'  							=> 'Вернуть аксессуар',
+    'create'  							=> 'Создать аксессуар',
+    'edit'  							=> 'Редактировать аксессуар',
     'eula_text'							=> 'Категория EULA',
     'eula_text_help'					=> 'Это поле позволяет персонализировать пользовательские соглашения для определенных типов активов. Если у вас только одно пользовательское соглашение для всех активов, вы можете отметить чекбокс внизу, чтобы использовать основное соглашение по умолчанию.',
-    'require_acceptance'				=> 'Требовать обязательного подтверждения пользователем прием активов в этой категории.',
+    'require_acceptance'				=> 'Требовать от пользователей подтверждения приёма активов в этой категории.',
     'no_default_eula'					=> 'Не найдено пользовательского соглашения по умолчанию. Добавьте его в Настройках.',
     'total'  							=> 'Всего',
     'remaining'  						=> 'Наличие',
@@ -17,6 +17,6 @@ return array(
     'use_default_eula'					=> 'Использовать <a href="#" data-toggle="modal" data-target="#eulaModal">главное пользовательское соглашение по умолчанию</a>.',
     'use_default_eula_disabled'			=> '<del>Использовать основное пользовательское соглашение.</del> Не задано основное пользовательское соглашение. Добавьте его в Настройках.',
     'clone'                             => 'Клонировать аксессуар',
-    'delete_disabled'                   => 'Этот аксессуар не может быть удален потому, что некоторые элементы по-прежнему заблокированы.',
+    'delete_disabled'                   => 'Этот аксессуар не может быть удалён, т. к. некоторые элементы всё ещё выданы.',
 
 );
diff --git a/resources/lang/ru-RU/admin/accessories/message.php b/resources/lang/ru-RU/admin/accessories/message.php
index 4f4abee8ed..ca3763cb91 100644
--- a/resources/lang/ru-RU/admin/accessories/message.php
+++ b/resources/lang/ru-RU/admin/accessories/message.php
@@ -4,35 +4,39 @@ return array(
 
     'does_not_exist' => 'Аксессуар [:id] не существует.',
     'not_found' => 'Этот аксессуар не найден.',
-    'assoc_users'	 => 'Данный аксессуар выдан пользователям в количестве :count. Сделайте возврат аксессуара и попробуйте снова. ',
+    'assoc_users'	 => 'Этот аксессуар выдан пользователям в количестве :count. Сделайте возврат аксессуара и попробуйте снова. ',
 
     'create' => array(
-        'error'   => 'Аксесуар не был создан, попробуйте ещё раз.',
-        'success' => 'Аксесуар успешно создан.'
+        'error'   => 'Аксессуар не был создан, попробуйте снова.',
+        'success' => 'Аксессуар создан.'
     ),
 
     'update' => array(
-        'error'   => 'Аксесуар не обновлён, попробуйте ещё раз',
-        'success' => 'Аксесуар успешно обновлён.'
+        'error'   => 'Аксессуар не обновлён, попробуйте снова',
+        'success' => 'Аксессуар обновлён.'
     ),
 
     'delete' => array(
-        'confirm'   => 'Вы уверены, что хотите удалить этот компонент?',
-        'error'   => 'Невозможно удалить компонент. Пожалуйста, попробуйте еще раз.',
-        'success' => 'Копонент удален успешно.'
+        'confirm'   => 'Вы уверены, что хотите удалить этот аксессуар?',
+        'error'   => 'Возникла проблема при удалении аксессуара. Пожалуйста, попробуйте снова.',
+        'success' => 'Аксессуар удалён.'
     ),
 
      'checkout' => array(
-        'error'   		=> 'Ошибка при выдаче аксессуара. Повторите попытку',
-        'success' 		=> 'Аксессуар успешно выдан.',
+        'error'   		=> 'Ошибка при выдаче аксессуара, попробуйте снова',
+        'success' 		=> 'Аксессуар выдан.',
         'unavailable'   => 'Нет доступных аксессуаров для выдачи. Проверьте их количество',
-        'user_does_not_exist' => 'Этот пользователь является недопустимым. Пожалуйста, попробуйте еще раз.'
+        'user_does_not_exist' => 'Неверный пользователь. Попробуйте снова.',
+         'checkout_qty' => array(
+            'lte'  => 'Вы пытаетесь выдать :checkout_qty аксессуаров, но в настоящее время доступен только один аксессуар данного типа. Пожалуйста, измените количество для выдачи или доступный остаток и попробуйте снова.|Вы пытаетесь выдать :checkout_qty аксессуаров, но доступно всего :number_currently_remaining. Пожалуйста, измените количество для выдачи или доступный остаток этого аксессуара и попробуйте снова.',
+            ),
+           
     ),
 
     'checkin' => array(
-        'error'   		=> 'Ошибка при возврате аксессуара. Повторите попытку',
-        'success' 		=> 'Аксессуар успешно возвращен.',
-        'user_does_not_exist' => 'Этот пользователь является недопустимым. Пожалуйста, попробуйте еще раз.'
+        'error'   		=> 'Ошибка при возврате аксессуара, попробуйте снова',
+        'success' 		=> 'Аксессуар возвращён.',
+        'user_does_not_exist' => 'Неверный пользователь. Попробуйте снова.'
     )
 
 
diff --git a/resources/lang/ru-RU/admin/accessories/table.php b/resources/lang/ru-RU/admin/accessories/table.php
index f452ee49da..695790da7c 100644
--- a/resources/lang/ru-RU/admin/accessories/table.php
+++ b/resources/lang/ru-RU/admin/accessories/table.php
@@ -6,6 +6,4 @@ return array(
     'id'      					=> 'ID',
     'require_acceptance'      	=> 'Принятие',
     'title'      				=> 'Название аксессуара',
-
-
 );
diff --git a/resources/lang/ru-RU/admin/asset_maintenances/form.php b/resources/lang/ru-RU/admin/asset_maintenances/form.php
index 17eef0c484..d2ac833a2e 100644
--- a/resources/lang/ru-RU/admin/asset_maintenances/form.php
+++ b/resources/lang/ru-RU/admin/asset_maintenances/form.php
@@ -5,7 +5,7 @@
         'title'                  => 'Заголовок',
         'start_date'             => 'Дата начала',
         'completion_date'        => 'Дата завершения',
-        'cost'                   => 'Стоймость',
+        'cost'                   => 'Стоимость',
         'is_warranty'            => 'Расширенная гарантия',
         'asset_maintenance_time' => 'Время обслуживания (в днях)',
         'notes'                  => 'Примечания',
diff --git a/resources/lang/ru-RU/admin/categories/general.php b/resources/lang/ru-RU/admin/categories/general.php
index dc31399a75..825ecd4577 100644
--- a/resources/lang/ru-RU/admin/categories/general.php
+++ b/resources/lang/ru-RU/admin/categories/general.php
@@ -10,16 +10,16 @@ return array(
     'edit'                              => 'Редактировать категорию',
     'email_will_be_sent_due_to_global_eula' => 'Письмо будет отправлено пользователю, потому что используется глобальное соглашение с конечным пользователем (EULA).',
     'email_will_be_sent_due_to_category_eula' => 'Письмо будет отправлено пользователю, потому что для данной категории используется соглашение с конечным пользователем (EULA).',
-    'eula_text'							=> 'Категория EULA',
+    'eula_text'							=> 'Пользовательское соглашение для категории',
     'eula_text_help'					=> 'Это поле позволяет персонализировать пользовательские соглашения для определенных типов активов. Если у вас только одно пользовательское соглашение для всех активов, вы можете отметить чекбокс внизу, чтобы использовать основное соглашение по умолчанию.',
     'name'                              => 'Название категории',
-    'require_acceptance'				=> 'Требовать обязательного подтверждения пользователем прием активов в этой категории.',
+    'require_acceptance'				=> 'Требовать от пользователей подтверждения приёма активов в этой категории.',
     'required_acceptance'				=> 'Этому пользователю будет выслано электронное письмо со ссылкой для подтверждения получения этого предмета.',
-    'required_eula'						=> 'Пользователю будет отправлена копия EULA',
+    'required_eula'						=> 'Пользователю будет отправлена копия пользовательского соглашения',
     'no_default_eula'					=> 'Не найдено пользовательского соглашения по умолчанию. Добавьте его в Настройках.',
-    'update'  							=> 'Изменить категорию',
-    'use_default_eula'					=> 'Использовать <a href="#" data-toggle="modal" data-target="#eulaModal">главное пользовательское соглашение по умолчанию</a>.',
+    'update'  							=> 'Обновить категорию',
+    'use_default_eula'					=> 'Использовать <a href="#" data-toggle="modal" data-target="#eulaModal">основное пользовательское соглашение по умолчанию</a>.',
     'use_default_eula_disabled'			=> '<del>Использовать основное пользовательское соглашение.</del> Не задано основное пользовательское соглашение. Добавьте его в Настройках.',
-    'use_default_eula_column'			=> 'Использовать лицензию по умолчанию',
+    'use_default_eula_column'			=> 'Использовать пользовательское соглашение по умолчанию',
 
 );
diff --git a/resources/lang/ru-RU/admin/categories/message.php b/resources/lang/ru-RU/admin/categories/message.php
index 94c5ed6c9f..a17da2ef41 100644
--- a/resources/lang/ru-RU/admin/categories/message.php
+++ b/resources/lang/ru-RU/admin/categories/message.php
@@ -3,24 +3,24 @@
 return array(
 
     'does_not_exist' => 'Категория не существует.',
-    'assoc_models'	 => 'Эта категория уже связана с одной или несколькими моделями и не может быть удалена. Пожалуйста обновите категории в моделях и повторите попытку. ',
-    'assoc_items'	 => 'Эта категория связана с одним или несколькими типами активов и не может быть удалена. Пожалуйста обновите категории типов активов и повторите попытку. ',
+    'assoc_models'	 => 'Эта категория уже связана с одной или несколькими моделями и не может быть удалена. Измените модели, чтобы они не ссылались на эту категорию, и попробуйте снова. ',
+    'assoc_items'	 => 'Эта категория связана с одним или несколькими :asset_type и не может быть удалена. Измените :asset_type, чтобы они не ссылались на эту категорию, и попробуйте снова. ',
 
     'create' => array(
-        'error'   => 'Категория не создана, пожалуйста попробуйте снова.',
-        'success' => 'Категория успешно создана.'
+        'error'   => 'Категория не создана, попробуйте снова.',
+        'success' => 'Категория создана.'
     ),
 
     'update' => array(
-        'error'   => 'Категория не изменена, пожалуйста попробуйте снова',
-        'success' => 'Категория успешно изменена.',
+        'error'   => 'Категория не изменена, попробуйте снова',
+        'success' => 'Категория изменена.',
         'cannot_change_category_type'   => 'Вы не можете изменить тип категории после ее создания',
     ),
 
     'delete' => array(
-        'confirm'   => 'Вы уверены что хотите удалить категорию?',
-        'error'   => 'При удалении категории возникла проблема. Пожалуйста попробуйте снова.',
-        'success' => 'Категория успешно удалена.'
+        'confirm'   => 'Вы уверены, что хотите удалить категорию?',
+        'error'   => 'При удалении категории возникла проблема. Попробуйте снова.',
+        'success' => 'Категория удалена.'
     )
 
 );
diff --git a/resources/lang/ru-RU/admin/companies/message.php b/resources/lang/ru-RU/admin/companies/message.php
index e83a7d62d3..c533e407de 100644
--- a/resources/lang/ru-RU/admin/companies/message.php
+++ b/resources/lang/ru-RU/admin/companies/message.php
@@ -2,19 +2,19 @@
 
 return [
     'does_not_exist' => 'Компания не существует.',
-    'deleted'        => 'Удаленная компания',
-    'assoc_users'    => 'Эта компания на данный момент связана по крайней мере с одной моделью и не может быть удалена. Пожалуйста обновите модели, убрав ссылку на эту компанию, и попробуйте снова. ',
+    'deleted'        => 'Удалённая компания',
+    'assoc_users'    => 'Эта компания связана с одной или несколькими моделями и не может быть удалена. Измените модели, чтобы они не ссылались на эту компанию, и попробуйте снова. ',
     'create' => [
-        'error'   => 'Компания не была создана, попробуйте ещё раз.',
-        'success' => 'Компания создана успешно.',
+        'error'   => 'Компания не была создана, попробуйте снова.',
+        'success' => 'Компания создана.',
     ],
     'update' => [
-        'error'   => 'Компания не была обновлена, попробуйте ещё раз',
-        'success' => 'Компания обновлена успешно.',
+        'error'   => 'Компания не была обновлена, попробуйте снова',
+        'success' => 'Компания обновлена.',
     ],
     'delete' => [
         'confirm' => 'Вы уверены, что хотите удалить эту компанию?',
-        'error'   => 'Возникла проблема при удалении компании. Пожалуйста попробуйте снова.',
-        'success' => 'Компания была успешно удалена.',
+        'error'   => 'Возникла проблема при удалении компании. Попробуйте снова.',
+        'success' => 'Компания удалена.',
     ],
 ];
diff --git a/resources/lang/ru-RU/admin/components/general.php b/resources/lang/ru-RU/admin/components/general.php
index 49836c234d..fcac481da2 100644
--- a/resources/lang/ru-RU/admin/components/general.php
+++ b/resources/lang/ru-RU/admin/components/general.php
@@ -1,15 +1,15 @@
 <?php
 
 return array(
-    'component_name'                  => 'Наименование компонента',
-    'checkin'                             => 'Привязать компонент',
-    'checkout'                             => 'Отвязать компонент',
+    'component_name'                  => 'Название компонента',
+    'checkin'                             => 'Вернуть компонент',
+    'checkout'                             => 'Выдать компонент',
     'cost'				=> 'Закупочная цена',
     'create'                             => 'Создать компонент',
-    'edit'                             => 'править компонент',
-    'date'					=> 'Дата закупки',
+    'edit'                             => 'Редактировать компонент',
+    'date'					=> 'Дата покупки',
     'order'					=> 'Номер заказа',
-    'remaining' 			             => 'Остаток',
+    'remaining' 			             => 'Осталось',
     'total' 			                 => 'Всего',
     'update'                            => 'Обновить компонент',
     'checkin_limit'            => 'Количество должно быть меньше или равно :assigned_qty'
diff --git a/resources/lang/ru-RU/admin/components/message.php b/resources/lang/ru-RU/admin/components/message.php
index e78d128d94..691627355c 100644
--- a/resources/lang/ru-RU/admin/components/message.php
+++ b/resources/lang/ru-RU/admin/components/message.php
@@ -5,32 +5,33 @@ return array(
     'does_not_exist' => 'Компонент не существует.',
 
     'create' => array(
-        'error'   => 'Не удалось создать компонент, попробуйте еще раз.',
-        'success' => 'Компонент успешно создан.'
+        'error'   => 'Не удалось создать компонент, попробуйте снова.',
+        'success' => 'Компонент создан.'
     ),
 
     'update' => array(
-        'error'   => 'Не удалось обновить компонент, попробуйте еще раз',
-        'success' => 'Компонент успешно обновлен.'
+        'error'   => 'Не удалось обновить компонент, попробуйте снова',
+        'success' => 'Компонент обновлён.'
     ),
 
     'delete' => array(
         'confirm'   => 'Вы уверены, что хотите удалить этот компонент?',
-        'error'   => 'Возникла проблема при удалении компонента, пожалуйста попробуйте еще раз.',
-        'success' => 'Компонент успешно удален.'
+        'error'   => 'Возникла проблема при удалении компонента. Попробуйте снова.',
+        'success' => 'Компонент успешно удалён.',
+        'error_qty'   => 'Некоторые компоненты этого типа всё ещё выданы. Проверьте их и попробуйте снова.',
     ),
 
      'checkout' => array(
-        'error'   		=> 'Не удалось отвязать компонент, пожалуйста попробуйте еще раз',
-        'success' 		=> 'Связь с компонентом успешно удалена.',
-        'user_does_not_exist' => 'Неверный пользователь. Попробуйте еще раз.',
+        'error'   		=> 'Не удалось выдать компонент, попробуйте снова',
+        'success' 		=> 'Компонент выдан.',
+        'user_does_not_exist' => 'Неверный пользователь. Попробуйте снова.',
         'unavailable'      => 'Недостаточно компонентов: :remaining - осталось, :requested - запрошено',
     ),
 
     'checkin' => array(
-        'error'   		=> 'Не удалось привязать компонент, пожалуйста попробуйте еще раз',
-        'success' 		=> 'Компонент успешно привязан.',
-        'user_does_not_exist' => 'Неверный пользователь. Пожалуйста, попробуйте еще раз.'
+        'error'   		=> 'Не удалось вернуть компонент, попробуйте снова',
+        'success' 		=> 'Компонент возвращён.',
+        'user_does_not_exist' => 'Неверный пользователь. Попробуйте снова.'
     )
 
 
diff --git a/resources/lang/ru-RU/admin/consumables/general.php b/resources/lang/ru-RU/admin/consumables/general.php
index 0738a7d215..d9078dc710 100644
--- a/resources/lang/ru-RU/admin/consumables/general.php
+++ b/resources/lang/ru-RU/admin/consumables/general.php
@@ -1,11 +1,12 @@
 <?php
 
 return array(
-    'checkout'                          => 'Выдать расходники пользователю',
+    'checkout'                          => 'Выдать расходный материал пользователю',
     'consumable_name'                   => 'Название расходного материала',
     'create'                            => 'Создать расходный материал',
-    'item_no'                           => 'Пункт №.',
+    'item_no'                           => 'Артикул',
     'remaining' 			            => 'Осталось',
     'total' 			                => 'Всего',
     'update'                            => 'Обновить расходный материал',
+    'inventory_warning'                 => 'Количество расходных материалов меньше минимального количества :min_count',
 );
diff --git a/resources/lang/ru-RU/admin/consumables/message.php b/resources/lang/ru-RU/admin/consumables/message.php
index b4dce77f68..58a28efb2d 100644
--- a/resources/lang/ru-RU/admin/consumables/message.php
+++ b/resources/lang/ru-RU/admin/consumables/message.php
@@ -2,35 +2,36 @@
 
 return array(
 
+    'invalid_category_type' => 'Категория должна быть категорией расходных материалов.',
     'does_not_exist' => 'Расходный материал не существует.',
 
     'create' => array(
-        'error'   => 'Расходный материал не создан, попробуйте ещё раз.',
-        'success' => 'Расходный материал успешно создан.'
+        'error'   => 'Расходный материал не создан, попробуйте снова.',
+        'success' => 'Расходный материал создан.'
     ),
 
     'update' => array(
-        'error'   => 'Расходный материал не был обновлён, попробуйте ещё раз',
-        'success' => 'Расходный материал успешно обновлён.'
+        'error'   => 'Расходный материал не был обновлён, попробуйте снова',
+        'success' => 'Расходный материал обновлён.'
     ),
 
     'delete' => array(
         'confirm'   => 'Вы уверены, что хотите удалить расходный материал?',
-        'error'   => 'В процессе удаления расходного материала произошла ошибка. Попробуйте ещё раз.',
-        'success' => 'Расходный материал успешно удалён.'
+        'error'   => 'В процессе удаления расходного материала произошла ошибка. Попробуйте снова.',
+        'success' => 'Расходный материал удалён.'
     ),
 
      'checkout' => array(
-        'error'   		=> 'Расходный материал не был выдан, попробуйте ещё раз',
-        'success' 		=> 'Расходный материал успешно выдан.',
-        'user_does_not_exist' => 'Неверный пользователь. Попробуйте ещё раз.',
-         'unavailable'      => 'Недостаточно расходных материалов для выдачи. Пожалуйста, проверьте их количество.',
+        'error'   		=> 'Расходный материал не был выдан, попробуйте снова',
+        'success' 		=> 'Расходный материал выдан.',
+        'user_does_not_exist' => 'Неверный пользователь. Попробуйте снова.',
+         'unavailable'      => 'Недостаточно расходных материалов для выдачи. Проверьте их количество. ',
     ),
 
     'checkin' => array(
-        'error'   		=> 'Расходный материал не был принят, попробуйте ещё раз',
-        'success' 		=> 'Расходный материал успешно принят.',
-        'user_does_not_exist' => 'Неверный пользователь. Попробуйте ещё раз.'
+        'error'   		=> 'Расходный материал не был возвращён, попробуйте снова',
+        'success' 		=> 'Расходный материал возвращён.',
+        'user_does_not_exist' => 'Неверный пользователь. Попробуйте снова.'
     )
 
 
diff --git a/resources/lang/ru-RU/admin/custom_fields/general.php b/resources/lang/ru-RU/admin/custom_fields/general.php
index bf7830bdf0..9977b6e992 100644
--- a/resources/lang/ru-RU/admin/custom_fields/general.php
+++ b/resources/lang/ru-RU/admin/custom_fields/general.php
@@ -5,23 +5,23 @@ return [
     'manage'                    => 'Управление',
     'field'		                => 'Поле',
     'about_fieldsets_title'		=> 'О наборах полей',
-    'about_fieldsets_text'		=> 'Наборы полей позволяют вам создавать группы пользовательских полей, которые часто используются для конкретных типов модели активов.',
+    'about_fieldsets_text'		=> 'Наборы полей позволяют создавать группы настраиваемых полей, которые часто переиспользуются для конкретных типов моделей активов.',
     'custom_format'             => 'Пользовательский формат регулярных выражений...',
     'encrypt_field'      	        => 'Зашифровать значение этого поля в базе данных',
-    'encrypt_field_help'      => 'ПРЕДУПРЕЖДЕНИЕ: Шифрование поля исключит возможность его поиска.',
+    'encrypt_field_help'      => 'ПРЕДУПРЕЖДЕНИЕ: Шифрование поля исключит возможность поиска по нему.',
     'encrypted'      	        => 'Зашифровано',
     'fieldset'      	        => 'Набор полей',
     'qty_fields'      	      => 'Кол-во полей',
     'fieldsets'      	        => 'Наборы полей',
-    'fieldset_name'           => 'Имя набора',
-    'field_name'              => 'Имя поля',
+    'fieldset_name'           => 'Название набора полей',
+    'field_name'              => 'Название поля',
     'field_values'            => 'Значения полей',
-    'field_values_help'       => 'Добавьте выбранные значения по одной в строку. Пустые строки, кроме первой, будут проигнорованы.',
+    'field_values_help'       => 'Добавьте выбранные значения по одному на строку. Пустые строки, кроме первой, будут проигнорированы.',
     'field_element'           => 'Элемент формы',
     'field_element_short'     => 'Элемент',
     'field_format'            => 'Формат',
-    'field_custom_format'     => 'Пользовательский формат',
-    'field_custom_format_help'     => 'Это поле позволяет использовать регулярное выражения для проверки. Оно должен начинаться с «regex:». Например, чтобы проверить, что значение настраиваемого поля содержит допустимый IMEI (15 цифр), вы должны использовать <code>regex:/^[0-9]{15}$/</code>.',
+    'field_custom_format'     => 'Пользовательский формат регулярных выражений',
+    'field_custom_format_help'     => 'Это поле позволяет использовать регулярное выражения для проверки. Оно должно начинаться с "regex:". Например, чтобы проверить, что значение настраиваемого поля содержит допустимый IMEI (15 цифр), вы должны использовать <code>regex:/^[0-9]{15}$/</code>.',
     'required'   		          => 'Обязательно',
     'req'   		              => 'Треб.',
     'used_by_models'   		    => 'Использован в моделях',
@@ -29,20 +29,20 @@ return [
     'create_fieldset'         => 'Новый набор полей',
     'update_fieldset'         => 'Обновить набор полей',
     'fieldset_does_not_exist'   => 'Набор полей :id не существует',
-    'fieldset_updated'         => 'Набор полей обновлен',
-    'create_fieldset_title' => 'Создайте новый набор полей',
+    'fieldset_updated'         => 'Набор полей обновлён',
+    'create_fieldset_title' => 'Создать новый набор полей',
     'create_field'            => 'Новое настраиваемое поле',
-    'create_field_title' => 'Создайте новое настраиваемое поле',
-    'value_encrypted'      	        => 'Значение этого поля зашифровано в базе данных. Только администраторам будет доступно для просмотра расшифрованное значение',
-    'show_in_email'     => 'Включить значение этого поля в письмах оформления заказа, отправленных пользователю? Зашифрованные поля не могут быть включены в письма',
-    'show_in_email_short'     => 'Включить в письма.',
+    'create_field_title' => 'Создать новое настраиваемое поле',
+    'value_encrypted'      	        => 'Значение этого поля зашифровано в базе данных. Только администраторы смогут просматривать расшифрованное значение',
+    'show_in_email'     => 'Включить значение этого поля в письма о выдаче, отправляемые пользователю? Зашифрованные поля не могут быть включены в письма',
+    'show_in_email_short' => 'Включить в письма',
     'help_text' => 'Текст справки',
-    'help_text_description' => 'Это необязательный текст, который будет отображаться под элементами формы при редактировании ресурса для предоставления контекста в поле.',
-    'about_custom_fields_title' => 'О пользовательских полях',
-    'about_custom_fields_text' => 'Настраиваемые поля позволяют добавлять произвольные атрибуты к ресурсам.',
+    'help_text_description' => 'Это необязательный текст, который будет отображаться под элементами формы при редактировании актива для предоставления контекста о поле.',
+    'about_custom_fields_title' => 'О настраиваемых полях',
+    'about_custom_fields_text' => 'Настраиваемые поля позволяют добавлять произвольные атрибуты к активам.',
     'add_field_to_fieldset' => 'Добавить поле к набору полей',
-    'make_optional' => 'Требуется - нажмите чтобы сделать необязательным',
-    'make_required' => 'Необязательное - нажмите чтобы сделать обязательным',
+    'make_optional' => 'Обязательное - нажмите, чтобы сделать необязательным',
+    'make_required' => 'Необязательное - нажмите, чтобы сделать обязательным',
     'reorder' => 'Изменить порядок',
     'db_field' => 'Поле БД',
     'db_convert_warning' => 'ВНИМАНИЕ. Настраиваемое поле <code>:db_column</code>, должно быть <code>:expected</code>.',
@@ -50,12 +50,15 @@ return [
     'unique' => 'Уникальный',
     'display_in_user_view' => 'Разрешить владельцу актива просматривать эти значения на странице Просмотр Назначенных Активов',
     'display_in_user_view_table' => 'Видимый для пользователя',
-    'auto_add_to_fieldsets' => 'Автоматически добавлять это к каждому новому набору полей',
+    'auto_add_to_fieldsets' => 'Автоматически добавлять к каждому новому набору полей',
     'add_to_preexisting_fieldsets' => 'Добавить в любые существующие наборы полей',
     'show_in_listview' => 'Показывать в списках по умолчанию. Авторизованные пользователи будут по-прежнему иметь возможность показывать/скрывать через выбор столбца',
     'show_in_listview_short' => 'Показать в списках',
     'show_in_requestable_list_short' => 'Показать в списке запрашиваемых активов',
     'show_in_requestable_list' => 'Показать значение в списке запрашиваемых активов. Зашифрованные поля не будут показаны',
     'encrypted_options' => 'Это поле зашифровано, поэтому некоторые параметры отображения будут недоступны.',
+    'display_checkin' => 'Отображать в формах возврата',
+    'display_checkout' => 'Отображать в формах выдачи',
+    'display_audit' => 'Отображать в формах аудита',
 
 ];
diff --git a/resources/lang/ru-RU/admin/custom_fields/message.php b/resources/lang/ru-RU/admin/custom_fields/message.php
index 124db7d697..01f03cd370 100644
--- a/resources/lang/ru-RU/admin/custom_fields/message.php
+++ b/resources/lang/ru-RU/admin/custom_fields/message.php
@@ -5,23 +5,24 @@ return array(
     'field' => array(
         'invalid'   => 'Это поле не существует.',
         'already_added'   => 'Поле уже добавлено',
+        'none_selected'   => 'Ни одно поле не выбрано',
 
         'create' => array(
-            'error'   => 'Поле не было создано, попробуйте ещё раз.',
-            'success' => 'Поле успешно создано.',
-            'assoc_success' => 'Поле успешно добавлено в набор.'
+            'error'   => 'Поле не было создано, попробуйте снова.',
+            'success' => 'Поле создано.',
+            'assoc_success' => 'Поле добавлено в набор.'
         ),
 
         'update' => array(
-            'error'   => 'Поле не было обновлено, попробуйте ещё раз',
-            'success' => 'Поле успешно обновлено.'
+            'error'   => 'Поле не было обновлено, попробуйте снова',
+            'success' => 'Поле обновлено.'
         ),
 
         'delete' => array(
             'confirm'   	=> 'Вы уверены, что хотите удалить это поле?',
-            'error'   => 'При удалении поля возникла ошибка. Попробуйте еще раз.',
-            'success' => 'Поле было успешно удалено.',
-            'in_use'   => 'Поле ещё используется.',
+            'error'   => 'При удалении поля возникла ошибка. Попробуйте снова.',
+            'success' => 'Поле удалено.',
+            'in_use'   => 'Поле всё ещё используется.',
         )
 
     ),
@@ -31,19 +32,19 @@ return array(
         'does_not_exist' => 'Набор полей не существует',
 
         'create' => array(
-            'error'   => 'Набор полей не был создан, попробуйте ещё раз.',
-            'success' => 'Набор полей создан успешно.'
+            'error'   => 'Набор полей не был создан, попробуйте снова.',
+            'success' => 'Набор полей создан.'
         ),
 
         'update' => array(
-            'error'   => 'Набор полей не был обновлен, попробуйте ещё раз',
-            'success' => 'Набор полей успешно обновлён.'
+            'error'   => 'Набор полей не был обновлен, попробуйте снова',
+            'success' => 'Набор полей обновлён.'
         ),
 
         'delete' => array(
             'confirm'   	=> 'Вы уверены, что хотите удалить этот набор полей?',
-            'error'   => 'При удалении набора полей возникла ошибка. Попробуйте еще раз.',
-            'success' => 'Набор полей был успешно удален.',
+            'error'   => 'При удалении набора полей возникла ошибка. Попробуйте снова.',
+            'success' => 'Набор полей удален.',
             'in_use'   => 'Набор полей всё ещё используется.',
         )
 
@@ -51,7 +52,7 @@ return array(
 
     'fieldset_default_value' => array(
 
-        'error' => 'Ошибка проверки значений полей по умолчанию.',
+        'error' => 'Ошибка при проверке значений полей по умолчанию.',
 
     ),
 
diff --git a/resources/lang/ru-RU/admin/departments/message.php b/resources/lang/ru-RU/admin/departments/message.php
index d18b4ab153..403f8e24a8 100644
--- a/resources/lang/ru-RU/admin/departments/message.php
+++ b/resources/lang/ru-RU/admin/departments/message.php
@@ -4,19 +4,19 @@ return array(
 
     'does_not_exist' => 'Департамент не существует.',
     'department_already_exists' => 'Отдел с таким названием уже существует в данном местоположении. Попробуйте уточнить название для этого отдела. ',
-    'assoc_users'	 => 'Департамент в данный момент связан с одним или несколькими пользователями и не может быть удалён. Удалите или измените связи в пользователях и попробуйте ещё раз. ',
+    'assoc_users'	 => 'Отдел в данный момент связан с одним или несколькими пользователями и не может быть удалён. Измените данные пользователей так, чтобы они больше не ссылались на этот отдел, и попробуйте снова. ',
     'create' => array(
-        'error'   => 'Департамент не был создан, попробуйте ещё раз.',
-        'success' => 'Департамент успешно создан.'
+        'error'   => 'Отдел не был создан, попробуйте снова.',
+        'success' => 'Отдел создан.'
     ),
     'update' => array(
-        'error'   => 'Департамент не был изменён, попробуйте ещё раз',
-        'success' => 'Департамент успешно изменён.'
+        'error'   => 'Отдел не был изменён, попробуйте снова',
+        'success' => 'Отдел изменён.'
     ),
     'delete' => array(
-        'confirm'   	=> 'Вы уверены, что хотите удалить этот департамент?',
-        'error'   => 'При удалении департамента возникла проблема. Пожалуйста, попробуйте ещё раз.',
-        'success' => 'Департамент был успешно удалён.'
+        'confirm'   	=> 'Вы уверены, что хотите удалить этот отдел?',
+        'error'   => 'При удалении отдела возникла проблема. Попробуйте снова.',
+        'success' => 'Отдел удалён.'
     )
 
 );
diff --git a/resources/lang/ru-RU/admin/departments/table.php b/resources/lang/ru-RU/admin/departments/table.php
index 3c88e259b3..47d542d2b2 100644
--- a/resources/lang/ru-RU/admin/departments/table.php
+++ b/resources/lang/ru-RU/admin/departments/table.php
@@ -3,9 +3,9 @@
 return array(
 
     'id'                        => 'ID',
-    'name'                      => 'Название департамента',
+    'name'                      => 'Название отдела',
     'manager'                   => 'Руководитель',
     'location'                  => 'Расположение',
-    'create'                    => 'Создать департамент',
-    'update'                    => 'Изменить департамент',
+    'create'                    => 'Создать отдел',
+    'update'                    => 'Изменить отдел',
     );
diff --git a/resources/lang/ru-RU/admin/depreciations/general.php b/resources/lang/ru-RU/admin/depreciations/general.php
index 716ecb70e0..80c0da5007 100644
--- a/resources/lang/ru-RU/admin/depreciations/general.php
+++ b/resources/lang/ru-RU/admin/depreciations/general.php
@@ -13,4 +13,8 @@ return [
     'no_depreciations_warning'               => '<strong>Предупреждение: </strong>
                       В настоящее время у вас нет настроенных амортизаций.
                       Пожалуйста, установите хотя бы одну амортизацию для просмотра отчета об амортизации.',
+    'depreciation_method'                   => 'Отчет по амортизации',
+    'linear_depreciation'                   => 'Linear (Default)',
+    'half_1'                                => 'Half-year convention, always applied',
+    'half_2'                                => 'Half-year convention, applied with condition',
 ];
diff --git a/resources/lang/ru-RU/admin/groups/message.php b/resources/lang/ru-RU/admin/groups/message.php
index 577238b092..bf28f8f513 100644
--- a/resources/lang/ru-RU/admin/groups/message.php
+++ b/resources/lang/ru-RU/admin/groups/message.php
@@ -4,19 +4,19 @@ return array(
 
     'group_exists'        => 'Группа уже существует!',
     'group_not_found'     => 'Группа [:id] не существует.',
-    'group_name_required' => 'Поле "Имя" является обязательным',
+    'group_name_required' => 'Поле "Название" является обязательным',
 
     'success' => array(
-        'create' => 'Группа успешно создана.',
-        'update' => 'Группа успешно изменена.',
-        'delete' => 'Группа успешно удалена.',
+        'create' => 'Группа создана.',
+        'update' => 'Группа изменена.',
+        'delete' => 'Группа удалена.',
     ),
 
     'delete' => array(
         'confirm'   => 'Вы уверены что хотите удалить эту группу?',
-        'create' => 'При созданий группы возникла проблема. Пожалуйста попробуйте снова.',
-        'update' => 'При изменении группы возникла проблема. Пожалуйста попробуйте снова.',
-        'delete' => 'При удалении группы возникла проблема. Пожалуйста попробуйте снова.',
+        'create' => 'При создании группы возникла проблема. Попробуйте снова.',
+        'update' => 'При изменении группы возникла проблема. Попробуйте снова.',
+        'delete' => 'При удалении группы возникла проблема. Попробуйте снова.',
     ),
 
 );
diff --git a/resources/lang/ru-RU/admin/hardware/form.php b/resources/lang/ru-RU/admin/hardware/form.php
index e639d27978..3b74a52de7 100644
--- a/resources/lang/ru-RU/admin/hardware/form.php
+++ b/resources/lang/ru-RU/admin/hardware/form.php
@@ -39,9 +39,9 @@ return [
     'order'				=> 'Номер заказа',
     'qr'				=> 'QR-код',
     'requestable'		=> 'Пользователи могут запросить этот актив',
-    'redirect_to_all'   => 'Return to all :type',
-    'redirect_to_type'   => 'Go to :type',
-    'redirect_to_checked_out_to'   => 'Go to Checked Out to',
+    'redirect_to_all'   => 'Вернуться ко всем :type',
+    'redirect_to_type'   => 'Перейти к :type',
+    'redirect_to_checked_out_to'   => 'Перейти к заметке',
     'select_statustype'	=> 'Выберите тип статуса',
     'serial'			=> 'Серийный номер',
     'status'			=> 'Статус',
@@ -55,8 +55,11 @@ return [
     'asset_location_update_default' => 'Обновить только местоположение по умолчанию',
     'asset_location_update_actual' => 'Обновить только фактическое местоположение',
     'asset_not_deployable' => 'Этот статус актива не подлежит развертыванию. Этот актив не может быть проверен.',
-    'asset_deployable' => 'Этот статус доступен для развертывания. Этот актив может быть привязан.',
+    'asset_not_deployable_checkin' => 'That asset status is not deployable. Using this status label will checkin the asset.',
+    'asset_deployable' => 'Этот актив может быть выдан.',
     'processing_spinner' => 'Обработка... (Это может занять некоторое время на больших файлах)',
+    'processing' => 'Обработка... ',
     'optional_infos'  => 'Дополнительная информация',
-    'order_details'   => 'Информация, связанная с заказом'
+    'order_details'   => 'Информация, связанная с заказом',
+    'calc_eol'    => 'If nulling the EOL date, use automatic EOL calculation based on the purchase date and EOL rate.',
 ];
diff --git a/resources/lang/ru-RU/admin/hardware/general.php b/resources/lang/ru-RU/admin/hardware/general.php
index 9bcd752559..6d28f6058b 100644
--- a/resources/lang/ru-RU/admin/hardware/general.php
+++ b/resources/lang/ru-RU/admin/hardware/general.php
@@ -5,8 +5,8 @@ return [
     'about_assets_text'            => 'Активы - вещи, которые отслеживаются по серийному номеру или инвентарному номеру. Они, как правило, являются ценными.',
     'archived'  				=> 'Архивированные',
     'asset'  					=> 'Актив',
-    'bulk_checkout'             => 'Выдать актив пользователю',
-    'bulk_checkin'              => 'Проверка активов',
+    'bulk_checkout'             => 'Массовая выдача',
+    'bulk_checkin'              => 'Массовый возврат',
     'checkin'  					=> 'Вернуть актив на склад',
     'checkout'  				=> 'Выдать актив пользователю',
     'clone'  					=> 'Клонировать актив',
@@ -15,8 +15,8 @@ return [
     'delete_confirm'            => 'Вы уверены, что хотите удалить этот актив?',
     'edit'  					=> 'Редактировать актив',
     'model_deleted'  			=> 'Эта модель была удалена. Вы должны восстановить модель прежде, чем сможете восстановить актив.',
-    'model_invalid'             => 'This model for this asset is invalid.',
-    'model_invalid_fix'         => 'The asset must be updated use a valid asset model before attempting to check it in or out, or to audit it.',
+    'model_invalid'             => 'Модель недействительна для этого актива.',
+    'model_invalid_fix'         => 'Актив должен быть обновлен, используйте действительную модель активов, прежде чем пытаться забрать/выдать или проверить его.',
     'requestable'               => 'Готов к выдаче',
     'requested'				    => 'Запрошенное',
     'not_requestable'           => 'Не подлежит запросу',
@@ -27,8 +27,7 @@ return [
     'undeployable_tooltip'  	=> 'Статус этого актива помечен как "не готов к выдаче". Поэтому он не может быть выдан в данный момент.',
     'view'  					=> 'Показать актив',
     'csv_error' => 'У вас ошибка в вашем CSV-файле:',
-    'import_text' => '<p>Загрузите CSV, который содержит историю активов. Ресурсы и пользователи ДОЛЖНЫ уже существуют в системе, или они будут пропущены. Сопоставление ресурсов импорта истории происходит с тегом активов. Мы постараемся найти подходящего пользователя по указанному вами имени и выбранным ниже критериям. Если вы не выбрали критерии ниже, он просто попытается сопоставить формат имени пользователя, который вы настроили в <code>Администратор &gt; Общие настройки</code>.</p><p>Поля, включенные в CSV должны совпадать с заголовками: <strong>Тег активов, имя, дата выписки, Дата выписки</strong>. Любые дополнительные поля будут игнорироваться. </p><p>Дата подтверждения: даты оформления чеков или пустые (пустые или будущие даты) будут выдавать элементы соответствующему пользователю. За исключением столбца Дата возврата создается дата чека с днями даты.</p>
-    ',
+    'import_text' => '<p>Upload a CSV that contains asset history. The assets and users MUST already exist in the system, or they will be skipped. Matching assets for history import happens against the asset tag. We will try to find a matching user based on the user\'s name you provide, and the criteria you select below. If you do not select any criteria below, it will simply try to match on the username format you configured in the <code>Admin &gt; General Settings</code>.</p><p>Fields included in the CSV must match the headers: <strong>Asset Tag, Name, Checkout Date, Checkin Date</strong>. Any additional fields will be ignored. </p><p>Checkin Date: blank or future checkin dates will checkout items to associated user.  Excluding the Checkin Date column will create a checkin date with todays date.</p>    ',
     'csv_import_match_f-l' => 'Попробуйте сопоставить пользователей с форматом <strong>firstname.lastname</strong> (<code>jane.smith</code>)',
     'csv_import_match_initial_last' => 'Попробуйте сопоставить пользователей с форматом <strong>первого первоначального имени</strong> (<code>jsmith</code>)',
     'csv_import_match_first' => 'Попробуйте сопоставить пользователей с форматом <strong>имени</strong> (<code>jane</code>)',
diff --git a/resources/lang/ru-RU/admin/hardware/message.php b/resources/lang/ru-RU/admin/hardware/message.php
index 4c075b42f2..5de9f26093 100644
--- a/resources/lang/ru-RU/admin/hardware/message.php
+++ b/resources/lang/ru-RU/admin/hardware/message.php
@@ -2,19 +2,23 @@
 
 return [
 
-    'undeployable' 		=> '<strong>Внимание: </strong> Этот актив был помечен как выданный.
-                        Если этот статус изменился, необходимо его обновить.',
-    'does_not_exist' 	=> 'Актив не существует.',
-    'does_not_exist_var'=> 'Asset with tag :asset_tag not found.',
-    'no_tag' 	        => 'No asset tag provided.',
+    'undeployable' 		 => '<strong>Внимание: </strong> Этот актив в настоящее время помечен как не подлежащий установке. Если этот статус изменился, пожалуйста обновите статус актива.',
+    'does_not_exist' 	 => 'Актив не существует.',
+    'does_not_exist_var' => 'Актив с тегом :asset_tag не найден.',
+    'no_tag' 	         => 'Тег актива не предоставлен.',
     'does_not_exist_or_not_requestable' => 'Этот актив не существует или не подлежит запросу.',
-    'assoc_users'	 	=> 'Этот актив в настоящее время привязан к пользователю и не может быть удален. Пожалуйста сначала снимите привязку, и затем попробуйте удалить снова. ',
-    'warning_audit_date_mismatch' 	=> 'This asset\'s next audit date (:next_audit_date) is before the last audit date (:last_audit_date). Please update the next audit date.',
+    'assoc_users'	 	 => 'Этот актив в настоящее время привязан к пользователю и не может быть удален. Пожалуйста сначала снимите привязку, и затем попробуйте удалить снова. ',
+    'warning_audit_date_mismatch' 	=> 'Дата следующего аудита этого актива (:next_audit_date) не может быть раньше последней даты аудита (:last_audit_date). Пожалуйста, обновите следующую дату аудита.',
+    'labels_generated'   => 'Этикетки успешно сгенерированы.',
+    'error_generating_labels' => 'Ошибка при создании этикеток.',
+    'no_assets_selected' => 'Активы не выбраны.',
 
     'create' => [
         'error'   		=> 'Актив не был создан, пожалуйста попробуйте снова. :(',
         'success' 		=> 'Актив успешно создан. :)',
         'success_linked' => 'Актив с тегом :tag успешно создан. <strong><a href=":link" style="color: white;">Нажмите для просмотра</a></strong>.',
+        'multi_success_linked' => 'Актив с номером :links успешно создан.|:count активов успешно созданы. :links.',
+        'partial_failure' => 'Актив не может быть создан. Причина: :failures|:count активов не могут быть созданы. Причины: :failures',
     ],
 
     'update' => [
@@ -34,7 +38,7 @@ return [
     ],
 
     'audit' => [
-        'error'   		=> 'Asset audit unsuccessful: :error ',
+        'error'   		=> 'Аудит активов не удался: :error ',
         'success' 		=> 'Аудит успешно выполнен.',
     ],
 
@@ -52,20 +56,24 @@ return [
     ],
 
     'import' => [
+        'import_button'         => 'Процесс Импорта',
         'error'                 => 'Некоторые элементы не были импортированы корректно.',
         'errorDetail'           => 'Следующие элементы не были импортированы из за ошибок.',
         'success'               => 'Ваш файл был импортирован',
         'file_delete_success'   => 'Ваш файл был успешно удален',
         'file_delete_error'      => 'Невозможно удалить файл',
         'file_missing' => 'Выбранный файл отсутствует',
+        'file_already_deleted' => 'Выбранный файл уже удален',
         'header_row_has_malformed_characters' => 'Один или несколько атрибутов в строке заголовка содержат неправильно сформированные символы UTF-8',
         'content_row_has_malformed_characters' => 'Один или несколько атрибутов в первой строке содержимого содержат неправильно сформированные символы UTF-8',
+        'transliterate_failure' => 'Транслитерация из :encoding в UTF-8 не удалась из-за недопустимых символов во входных данных'
     ],
 
 
     'delete' => [
         'confirm'   	=> 'Вы уверены что хотите удалить этот актив?',
         'error'   		=> 'При удалении актива возникла проблема. Пожалуйста попробуйте снова.',
+        'assigned_to_error' => '{1}Инвентарный номер: :asset_tag выдан в данный момент. Верните это устройство перед удалением. [2,*]Инвентарные номера: :asset_tag выданы в данный момент. Верните эти устройства перед удалением.',
         'nothing_updated'   => 'Ни один из активов не выбран, поэтому ничего не удалено.',
         'success' 		=> 'Актив был успешно удален.',
     ],
@@ -78,6 +86,11 @@ return [
         'no_assets_selected' => 'Вы должны выбрать хотя бы один актив из списка',
     ],
 
+    'multi-checkout' => [
+        'error'   => 'Актив не был выдан, пожалуйста попробуйте снова|Активы не были выданы, пожалуйста попробуйте снова',
+        'success' => 'Актив успешно выдан.|Активы успешно выданы.',
+    ],
+
     'checkin' => [
         'error'   		=> 'Актив не был отвязан, пожалуйста попробуйте снова',
         'success' 		=> 'Актив успешно отвязан.',
@@ -87,9 +100,10 @@ return [
     ],
 
     'requests' => [
-        'error'   		=> 'Актив не был запрошен, попробуйте ещё раз',
-        'success' 		=> 'Актив запрошен успешно.',
-        'canceled'      => 'Запрос актива успешно отменен',
+        'error'   		=> 'Request was not successful, please try again.',
+        'success' 		=> 'Request successfully submitted.',
+        'canceled'      => 'Request successfully canceled.',
+        'cancel'        => 'Отменить запрос предмета',
     ],
 
 ];
diff --git a/resources/lang/ru-RU/admin/hardware/table.php b/resources/lang/ru-RU/admin/hardware/table.php
index e20fc201e9..1735316368 100644
--- a/resources/lang/ru-RU/admin/hardware/table.php
+++ b/resources/lang/ru-RU/admin/hardware/table.php
@@ -25,7 +25,6 @@ return [
     'image'		    => 'Изображение устройства',
     'days_without_acceptance' => 'Дней без принятия',
     'monthly_depreciation' => 'Ежемесячная амортизация',
-    'assigned_to'    => 'Назначенный На',
     'requesting_user' => 'Запрашивающий пользователь',
     'requested_date' => 'Запрошенная дата',
     'changed'       => 'Измененный',
diff --git a/resources/lang/ru-RU/admin/kits/general.php b/resources/lang/ru-RU/admin/kits/general.php
index 4acd040f48..e166e704f9 100644
--- a/resources/lang/ru-RU/admin/kits/general.php
+++ b/resources/lang/ru-RU/admin/kits/general.php
@@ -2,17 +2,17 @@
 
 return [
     'about_kits_title'                  => 'О готовых наборах',
-    'about_kits_text'                   => 'Готовые Наборы позволяют быстро выдать несколько предметов (активов, лицензий, и т. д.) пользователю. Это может быть очень удобно, когда Вы сталкиваетесь с процессом массовой выдачи предметов большому количеству пользователей или же Ваши пользователи часто получают одни и те же предметы.',
-    'checkout'                          => 'Выдать готовый набор ',
-    'create_success'                    => 'Набор был успешно создан.',
-    'create'                            => 'Создать Готовый Набор',
-    'update'                            => 'Изменить Готовый Набор',
-    'delete_success'                    => 'Набор был успешно удалён.',
-    'update_success'                    => 'Набор был успешно изменен.',
+    'about_kits_text'                   => 'Готовые наборы позволяют быстро выдать несколько предметов (активов, лицензий, и т. д.) пользователю. Это может быть полезно, если процесс адаптации единообразен для многих пользователей и все пользователи получают одни и те же предметы.',
+    'checkout'                          => 'Выдать набор ',
+    'create_success'                    => 'Набор создан.',
+    'create'                            => 'Создать готовый набор',
+    'update'                            => 'Изменить готовый набор',
+    'delete_success'                    => 'Набор удалён.',
+    'update_success'                    => 'Набор изменён.',
     'none_models'                       => 'Недостаточно доступных активов :model для выдачи. Необходимое количество - :qty. ',
     'none_licenses'                     => 'Недостаточно доступных мест :license для выдачи. Необходимое количество мест - :qty. ',
-    'none_consumables'                  => 'Недостаточно доступных единиц :consumable для выдачи. Необходимое количество - :qty ед. ',
-    'none_accessory'                    => 'Недостаточно единиц :accessory для выдачи. Необходимое количество - :qty ед. ',
+    'none_consumables'                  => 'Недостаточно доступных единиц :consumable для выдачи. Необходимое количество - :qty. ',
+    'none_accessory'                    => 'Недостаточно единиц :accessory для выдачи. Необходимое количество - :qty. ',
     'append_accessory'                  => 'Добавить аксессуар',
     'update_appended_accessory'         => 'Обновить добавленный аксессуар',
     'append_consumable'                 => 'Добавить расходный материал',
@@ -22,29 +22,30 @@ return [
     'append_model'                      => 'Добавить модель',
     'update_appended_model'             => 'Обновить добавленную модель',
     'license_error'                     => 'Лицензия уже прикреплена к комплекту',
-    'license_added_success'             => 'Лицензия успешно добавлена',
-    'license_updated'                   => 'Лицензия успешно обновлена',
+    'license_added_success'             => 'Лицензия добавлена',
+    'license_updated'                   => 'Лицензия обновлена',
     'license_none'                      => 'Лицензия не существует',
-    'license_detached'                  => 'Лицензия успешно отсоединена',
-    'consumable_added_success'          => 'Расходный материал успешно добавлен',
-    'consumable_updated'                => 'Расходный материал успешно обновлен',
-    'consumable_error'                  => 'Расходный материал уже подключен к комплекту',
+    'license_detached'                  => 'Лицензия откреплена',
+    'consumable_added_success'          => 'Расходный материал добавлен',
+    'consumable_updated'                => 'Расходный материал обновлён',
+    'consumable_error'                  => 'Расходный материал уже прикреплён к набору',
     'consumable_deleted'                => 'Удаление прошло успешно',
     'consumable_none'                   => 'Расходный материал не существует',
-    'consumable_detached'               => 'Расходный материал успешно отсоединен',
-    'accessory_added_success'           => 'Аксессуар успешно добавлен',
-    'accessory_updated'                 => 'Аксессуар успешно обновлен',
-    'accessory_detached'                => 'Аксессуар успешно отсоединен',
-    'accessory_error'                   => 'Аксессуар уже прикреплен к комплекту',
+    'consumable_detached'               => 'Расходный материал откреплён',
+    'accessory_added_success'           => 'Аксессуар добавлен',
+    'accessory_updated'                 => 'Аксессуар обновлён',
+    'accessory_detached'                => 'Аксессуар откреплён',
+    'accessory_error'                   => 'Аксессуар уже прикреплён к набору',
     'accessory_deleted'                 => 'Удаление прошло успешно',
-    'accessory_none'                    => 'Аксесуар не существует',
-    'checkout_success'                  => 'Выдача успешна',
+    'accessory_none'                    => 'Аксессуар не существует',
+    'checkout_success'                  => 'Выдача прошла успешно',
     'checkout_error'                    => 'Ошибка выдачи',
-    'kit_none'                          => 'Комплекта не существует',
-    'kit_created'                       => 'Комплект успешно создан',
-    'kit_updated'                       => 'Комплект успешно изменен',
-    'kit_not_found'                     => 'Комплект не найден',
-    'kit_deleted'                       => 'Комплект успешно удален',
-    'kit_model_updated'                 => 'Модель успешно изменена',
-    'kit_model_detached'                => 'Модель успешно отсоединена',
+    'kit_none'                          => 'Набор не существует',
+    'kit_created'                       => 'Набор создан',
+    'kit_updated'                       => 'Набор изменён',
+    'kit_not_found'                     => 'Набор не найден',
+    'kit_deleted'                       => 'Набор удалён',
+    'kit_model_updated'                 => 'Модель изменена',
+    'kit_model_detached'                => 'Модель откреплена',
+    'model_already_attached'            => 'Модель уже прикреплена к набору',
 ];
diff --git a/resources/lang/ru-RU/admin/licenses/form.php b/resources/lang/ru-RU/admin/licenses/form.php
index c3ab4eff5f..35bee7e477 100644
--- a/resources/lang/ru-RU/admin/licenses/form.php
+++ b/resources/lang/ru-RU/admin/licenses/form.php
@@ -3,20 +3,20 @@
 return array(
 
     'asset'             => 'Актив',
-    'checkin'           => 'Привязать',
+    'checkin'           => 'Вернуть',
     'create'            => 'Создать лицензию',
-    'expiration'        => 'Истекает',
+    'expiration'        => 'Дата истечения',
     'license_key'       => 'Ключ продукта',
     'maintained'        => 'Поддерживаемая',
     'name'              => 'Название ПО',
     'no_depreciation'   => 'Не амортизируется',
     'purchase_order'    => 'Номер заказа на поставку',
-    'reassignable'      => 'Переназначаемый',
-    'remaining_seats'   => 'Осталось лицезий',
+    'reassignable'      => 'Переназначаемая',
+    'remaining_seats'   => 'Осталось лицензий',
     'seats'             => 'Количество рабочих мест',
-    'termination_date'  => 'Дата окончания',
-    'to_email'          => 'Лицензирован на E-mail',
+    'termination_date'  => 'Дата прекращения',
+    'to_email'          => 'Лицензирована на Email',
     'to_name'           => 'Лицензировано на имя',
     'update'            => 'Обновить лицензию',
-    'checkout_help'     => 'Вы должны привязать лицензию к физическому активу или человеку. Вы можете выбрать оба варианта, но владелец актива должен соответствовать человеку привязанному к этому активу.'
+    'checkout_help'     => 'Вы должны выдать лицензию физическому активу или человеку. Вы можете выбрать оба варианта, но владелец актива должен совпадать с человеком, которому выдается этот актив.'
 );
diff --git a/resources/lang/ru-RU/admin/licenses/general.php b/resources/lang/ru-RU/admin/licenses/general.php
index 9086062db7..bb545c5df9 100644
--- a/resources/lang/ru-RU/admin/licenses/general.php
+++ b/resources/lang/ru-RU/admin/licenses/general.php
@@ -14,6 +14,7 @@ return array(
     'info'  					=> 'Информация о лицензии',
     'license_seats'  			=> 'Лицензируемых мест',
     'seat'  					=> 'Место',
+    'seat_count'  				=> 'Мест :count',
     'seats'  					=> 'Мест',
     'software_licenses'  		=> 'Лицензии ПО',
     'user'  					=> 'Пользователь',
@@ -23,12 +24,12 @@ return array(
         [
             'checkin_all'           => [
                 'button'            => 'Изъять все места',
-                'modal'             => 'Это действие освободит одно место. | Это действие освободит все места :checkedout_seats_count для этой лицензии.',
+                'modal'             => 'Это действие вернёт одно место. | Это действие вернёт все :checkedout_seats_count места для этой лицензии.',
                 'enabled_tooltip'   => 'Освободить назначения ВСЕХ мест на эту лицензию как от пользователей, так и от активов',
                 'disabled_tooltip'  => 'Недоступно, т.к. в настоящее время нет выданных (назначенных) мест',
                 'disabled_tooltip_reassignable'  => 'Недоступно, т.к. Лицензия не переназначаема',
                 'success'           => 'Лицензия успешно получена! | Все лицензии были успешно получены!',
-                'log_msg'           => 'Принято через массовую выдачу лицензий в веб-интерфейсе лицензии',
+                'log_msg'           => 'Возвращено через массовый отзыв лицензий в GUI',
             ],
 
             'checkout_all'              => [
diff --git a/resources/lang/ru-RU/admin/licenses/message.php b/resources/lang/ru-RU/admin/licenses/message.php
index 5526c8ac80..78d2409f74 100644
--- a/resources/lang/ru-RU/admin/licenses/message.php
+++ b/resources/lang/ru-RU/admin/licenses/message.php
@@ -44,10 +44,13 @@ return array(
         'error'   => 'При выдаче лицензии произошла ошибка. Повторите попытку.',
         'success' => 'Лицензия успешно назначена',
         'not_enough_seats' => 'Недостаточно лицензионных мест для оформления заказа',
+        'mismatch' => 'Предоставленное лицензионное место не соответствует лицензии',
+        'unavailable' => 'Место недоступно для выдачи.',
     ),
 
     'checkin' => array(
         'error'   => 'При возврате лицензии произошла ошибка. Попробуйте еще раз.',
+        'not_reassignable' => 'License not reassignable',
         'success' => 'Лицензия успешно назначена'
     ),
 
diff --git a/resources/lang/ru-RU/admin/locations/message.php b/resources/lang/ru-RU/admin/locations/message.php
index b76abe49b6..8592afc96f 100644
--- a/resources/lang/ru-RU/admin/locations/message.php
+++ b/resources/lang/ru-RU/admin/locations/message.php
@@ -2,28 +2,34 @@
 
 return array(
 
-    'does_not_exist' => 'Статус актива не существует.',
-    'assoc_users'    => 'This location is not currently deletable because it is the location of record for at least one asset or user, has assets assigned to it, or is the parent location of another location. Please update your models to no longer reference this company and try again. ',
-    'assoc_assets'	 => 'Это месторасположение связано как минимум с одним активом и не может быть удалено. Измените ваши активы так, чтобы они не ссылались на это месторасположение и попробуйте ещё раз. ',
-    'assoc_child_loc'	 => 'У этого месторасположения является родительским и у него есть как минимум одно месторасположение уровнем ниже. Поэтому оно не может быть удалено. Обновите ваши месторасположения, так чтобы не ссылаться на него и попробуйте снова. ',
-    'assigned_assets' => 'Присвоенные активы',
+    'does_not_exist' => 'Местоположение не существует.',
+    'assoc_users'    => 'Это местоположение в не может быть удалено, потому что поскольку это местоположение по крайней мере для одного актива или пользователя, имеет назначенные ему активы или является родительским местоположением другого местоположения. Измените записи так, чтобы они не ссылались на это местоположение, и попробуйте снова ',
+    'assoc_assets'	 => 'Это местоположение связано по крайней мере с одним активом и не может быть удалено. Измените активы так, чтобы они не ссылались на это местоположение и попробуйте снова. ',
+    'assoc_child_loc'	 => 'У этого месторасположения является родительским и у него есть как минимум одно месторасположение уровнем ниже. Поэтому оно не может быть удалено. Обновите ваши месторасположения, так чтобы не ссылаться на него, и попробуйте снова. ',
+    'assigned_assets' => 'Назначенные активы',
     'current_location' => 'Текущее местоположение',
+    'open_map' => 'Открыть в картах :map_provider_icon',
 
 
     'create' => array(
-        'error'   => 'Статус актива не был создан, попробуйте еще раз.',
-        'success' => 'Статус актива успешно создан.'
+        'error'   => 'Местоположение не было создано, попробуйте снова.',
+        'success' => 'Местоположение создано.'
     ),
 
     'update' => array(
-        'error'   => 'Статус актива не был обновлен, попробуйте еще раз',
-        'success' => 'Статус актива успешно обновлен.'
+        'error'   => 'Местоположение не было обновлено, попробуйте снова',
+        'success' => 'Местоположение обновлено.'
+    ),
+
+    'restore' => array(
+        'error'   => 'Местоположение не было восстановлено, попробуйте снова',
+        'success' => 'Местоположение восстановлено.'
     ),
 
     'delete' => array(
-        'confirm'   	=> 'Вы уверено, что хотите удалить этот статус?',
-        'error'   => 'При удалении статуса актива произошла ошибка. Попробуйте еще раз.',
-        'success' => 'Статус актива успешно удален.'
+        'confirm'   	=> 'Вы уверены, что хотите удалить это местоположение?',
+        'error'   => 'При удалении местоположения возникла проблема. Попробуйте снова.',
+        'success' => 'Местоположение удалено.'
     )
 
 );
diff --git a/resources/lang/ru-RU/admin/locations/table.php b/resources/lang/ru-RU/admin/locations/table.php
index e6c7b6a551..b91fcaf834 100644
--- a/resources/lang/ru-RU/admin/locations/table.php
+++ b/resources/lang/ru-RU/admin/locations/table.php
@@ -1,42 +1,43 @@
 <?php
 
 return [
-    'about_locations_title'     => 'О местонахождениях',
-    'about_locations'           => 'Местонахождения используются для отслеживания информации о месте находжения активов, и прочих элементов',
+    'about_locations_title'     => 'О местоположениях',
+    'about_locations'           => 'Местоположения используются для отслеживания информации о расположении пользователей, активов и прочих предметов',
     'assets_rtd'                => 'Активы', // This has NEVER meant Assets Retired. I don't know how it keeps getting reverted.
-    'assets_checkedout'         => 'Присвоенные активы',
+    'assets_checkedout'         => 'Назначено активов',
     'id'                        => 'ID',
     'city'                      => 'Город',
     'state'                     => 'Область/Регион',
     'country'                   => 'Страна',
-    'create'                    => 'Создать статус',
-    'update'                    => 'Обновить статус',
-    'print_assigned'            => 'Печать выделенных',
+    'create'                    => 'Создать местоположение',
+    'update'                    => 'Обновить местоположение',
+    'print_assigned'            => 'Печать назначенных',
     'print_all_assigned'        => 'Печать всех выделенных',
-    'name'                      => 'Имя статуса',
+    'name'                      => 'Название',
     'address'                   => 'Адрес',
     'address2'                   => 'Адрес, строка 2',
     'zip'                       => 'Почтовый индекс',
-    'locations'                 => 'Размещения',
+    'locations'                 => 'Местоположения',
     'parent'                    => 'Родитель',
-    'currency'                  => 'Валюта местонахождения',
+    'currency'                  => 'Валюта местоположения',
     'ldap_ou'                   => 'Поиск в LDAP OU',
     'user_name'                 => 'Имя пользователя',
-    'department'                => 'Подразделение',
+    'department'                => 'Отдел',
     'location'                  => 'Местоположение',
-    'asset_tag'                 => 'Тег активов',
+    'asset_tag'                 => 'Инвентарный номер',
     'asset_name'                => 'Название',
     'asset_category'            => 'Категория',
     'asset_manufacturer'        => 'Производитель',
     'asset_model'               => 'Модель',
     'asset_serial'              => 'Серийный номер',
-    'asset_location'            => 'Расположение',
-    'asset_checked_out'         => 'Проверено',
-    'asset_expected_checkin'    => 'Ожидаемая проверка',
+    'asset_location'            => 'Местоположение',
+    'asset_checked_out'         => 'Выдано',
+    'asset_expected_checkin'    => 'Ожидаемая дата возврата',
     'date'                      => 'Дата:',
     'phone'                     => 'Телефон местоположения',
-    'signed_by_asset_auditor'   => 'Подписано (Аудитором активов):',
-    'signed_by_finance_auditor' => 'Подписано (Аудитором активов):',
-    'signed_by_location_manager' => 'Подписано (Менеджер по местоположению):',
+    'signed_by_asset_auditor'   => 'Подписано (аудитор активов):',
+    'signed_by_finance_auditor' => 'Подписано (финансовый аудитор):',
+    'signed_by_location_manager' => 'Подписано (руководитель):',
     'signed_by'                 => 'Подписано:',
+    'clone'  					=> 'Клонировать местоположение',
 ];
diff --git a/resources/lang/ru-RU/admin/models/general.php b/resources/lang/ru-RU/admin/models/general.php
index 0f6339b9e5..f66940f752 100644
--- a/resources/lang/ru-RU/admin/models/general.php
+++ b/resources/lang/ru-RU/admin/models/general.php
@@ -3,7 +3,7 @@
 return array(
     'about_models_title'     => 'О моделях активов',
     'about_models_text'           => 'Модели активов это способ группировки идентичных активов. Например, "MacBookPro 2013, iPhone 6s", и т. д.',
-    'deleted'  					        => 'Эта модель была удалена.',
+    'deleted'  					=> 'Эта модель была удалена.',
     'bulk_delete'               => 'Массовое удаление моделей активов',
     'bulk_delete_help'               => 'Установите флажки ниже, чтобы подтвердить удаление выбранных моделей активов. Модели, имеющие связанные с ними активы, не могут быть удалены до тех пор, пока активы не будут связаны с другой моделью.',
     'bulk_delete_warn'          => 'Вы собираетесь удалить одну модель активов.|Вы собираетесь удалить :model_count моделей активов.',
diff --git a/resources/lang/ru-RU/admin/models/message.php b/resources/lang/ru-RU/admin/models/message.php
index 548c45ca0a..d27fcd6f6a 100644
--- a/resources/lang/ru-RU/admin/models/message.php
+++ b/resources/lang/ru-RU/admin/models/message.php
@@ -7,7 +7,7 @@ return array(
     'no_association' => 'ПРЕДУПРЕЖДЕНИЕ! Модель активов для этого элемента неверна или отсутствует!',
     'no_association_fix' => 'Это странно и ужасно сломает вещи. Отредактируйте этот актив сейчас, чтобы назначить ему модель.',
     'assoc_users'	 => 'Данная модель связана с одним или несколькими активами, и не может быть удалена. Удалите либо измените связанные активы. ',
-
+    'invalid_category_type' => 'Эта категория должна быть категорией активов.',
 
     'create' => array(
         'error'   => 'Модель не была создана, повторите еще раз.',
diff --git a/resources/lang/ru-RU/admin/reports/general.php b/resources/lang/ru-RU/admin/reports/general.php
index e8a38a1182..6108fb8308 100644
--- a/resources/lang/ru-RU/admin/reports/general.php
+++ b/resources/lang/ru-RU/admin/reports/general.php
@@ -4,6 +4,7 @@ return [
     'info'   => 'Выберите опции, которые должны отображаться в отчете актива.',
     'deleted_user' => 'Удаленный пользователь',
     'send_reminder' => 'Отправить напоминание',
+    'cannot_send_reminder' => 'User has been deleted or does not have an email address so cannot receive a reminder',
     'reminder_sent' => 'Напоминание отправлено',
     'acceptance_deleted' => 'Запрос на приемку удален',
     'acceptance_request' => 'Запрос на приемку',
@@ -13,5 +14,10 @@ return [
         'user_state' => 'Область\\Штат',
         'user_country' => 'Страна',
         'user_zip' => 'Индекс'
-    ]
-];
\ No newline at end of file
+    ],
+    'open_saved_template' => 'Open Saved Template',
+    'save_template' =>  'Save Template',
+    'select_a_template' => 'Select a Template',
+    'template_name' => 'Template Name',
+    'update_template' => 'Update Template',
+];
diff --git a/resources/lang/ru-RU/admin/reports/message.php b/resources/lang/ru-RU/admin/reports/message.php
index 4fbceef207..2800bbdf0b 100644
--- a/resources/lang/ru-RU/admin/reports/message.php
+++ b/resources/lang/ru-RU/admin/reports/message.php
@@ -1,5 +1,16 @@
 <?php
 
-return array(
-    'error'   => 'Необходимо выбрать как минимум ОДНУ опцию.'
-);
+return [
+    'about_templates' => 'About Saved Templates',
+    'saving_templates_description' => 'Select your options, then enter the name of your template in the box above and click the \'Save Template\' button. Use the dropdown to select a previously saved template.',
+    'create'  => [
+        'success' => 'Template saved successfully',
+    ],
+    'update' => [
+        'success' => 'Template updated successfully',
+    ],
+    'delete' => [
+        'success' => 'Template deleted',
+        'no_delete_permission' => 'Template does not exist or you do not have permission to delete it.',
+    ],
+];
diff --git a/resources/lang/ru-RU/admin/settings/general.php b/resources/lang/ru-RU/admin/settings/general.php
index cd70011f18..06380d3b07 100644
--- a/resources/lang/ru-RU/admin/settings/general.php
+++ b/resources/lang/ru-RU/admin/settings/general.php
@@ -8,13 +8,13 @@ return [
     'ad_append_domain'          => 'Добавить имя домена к имени пользователя',
     'ad_append_domain_help'     => 'Пользователю не нужно будет вводить "username@domain.local", можно просто ввести "username".',
     'admin_cc_email'            => 'Скрытая копия',
-    'admin_cc_email_help'       => 'Если вы хотите отправлять копии писем, что приходят пользователям при выдаче/возврате, на какой-то дополнительный адрес электронной почты, то введите его здесь. В противном случае оставьте это поле пустым.',
+    'admin_cc_email_help'       => 'Send a copy of checkin/checkout emails to this address.',
     'admin_settings'            => 'Настройки администратора',
     'is_ad'				        => 'У вас сервер Active Directory',
     'alerts'                	=> 'Уведомления',
     'alert_title'               => 'Обновить настройки уведомлений',
     'alert_email'				=> 'Посылать уведомления на',
-    'alert_email_help'    => 'Адреса электронной почты или списки рассылки которые вы хотите отправить, должны быть разделены запятыми',
+    'alert_email_help'          => 'Адреса электронной почты или списки рассылки которые вы хотите отправить, должны быть разделены запятыми.',
     'alerts_enabled'			=> 'Уведомления включены',
     'alert_interval'			=> 'Предупреждение об истечении срока (в днях)',
     'alert_inv_threshold'		=> 'Порог оповещения о запасах',
@@ -31,15 +31,18 @@ return [
     'backups'					=> 'Резервные копии',
     'backups_help'              => 'Создавать, загружать и восстанавливать резервные копии ',
     'backups_restoring'         => 'Восстановление из резервной копии',
+    'backups_clean' => 'Очистить резервную базу данных перед восстановлением',
+    'backups_clean_helptext' => "Это может быть полезно, если вы переключаетесь между версиями базы данных",
     'backups_upload'            => 'Загрузить резервную копию',
     'backups_path'              => 'Резервные копии хранятся на сервере в <code>:path</code>',
-    'backups_restore_warning'   => 'Используйте кнопку восстановления <small><span class="btn btn-xs btn-warning"><i class="text-white fas fa-retweet" aria-hidden="true"></i></span></small> для восстановления из предыдущей резервной копии. (В настоящее время он не работает с хранилищем файлов S3 или Docker.)<br><br>Ваша <strong>база данных :app_name и все загруженные файлы будут полностью заменены</strong> на те, что находится в файле резервной копии.  ',
+    'backups_restore_warning'   => 'Use the restore button <small><span class="btn btn-xs btn-warning"><i class="text-white fas fa-retweet" aria-hidden="true"></i></span></small> to restore from a previous backup. (This does not currently work with S3 file storage or Docker.)<br><br>Your <strong>entire :app_name database and any uploaded files will be completely replaced</strong> by what\'s in the backup file  ',
     'backups_logged_out'         => 'Все пользователи, включая текущего, будут разлогинены после завершения восстановления.',
     'backups_large'             => 'Очень большой бекап может не уложиться в стандартные значения ожидания и может потребоваться запуск восстановления через командную строку.',
     'barcode_settings'			=> 'Настройки штрихкода',
     'confirm_purge'			    => 'Подтвердить удаление',
     'confirm_purge_help'		=> 'Введите "DELETE" в поле ниже для окончательного удаления ваших удаленных записей. Это действие не может быть отменено и ПОЛНОСТЬЮ очистит все удаленные записи. (Предварительно сделайте бекап, просто на всякий случай.)',
     'custom_css'				=> 'Пользовательское CSS',
+    'custom_css_placeholder'	=> 'Add your custom CSS',
     'custom_css_help'			=> 'Введите любое пользовательское CSS, которые вы хотите использовать. Не указывайте &lt;style&gt;&lt;/style&gt; теги.',
     'custom_forgot_pass_url'	=> 'Пользовательский URL для сброса пароля',
     'custom_forgot_pass_url_help'	=> 'Этим заменяется встроенный URL забытого пароля на экране входа в систему, что полезно, чтобы направлять пользователей на внутренние или размещенные в LDAP функции сброса пароля. Это позволит эффективно отключить локальный функционал восстановления забытого пользовательского пароля.',
@@ -47,34 +50,34 @@ return [
     'dashboard_message_help'	=> 'Этот текст будет отображаться на панели управления у всех кто обладает правом просмотра панели управления.',
     'default_currency'  		=> 'Валюта по-умолчанию',
     'default_eula_text'			=> 'Пользовательское соглашение по умолчанию',
+    'default_eula_text_placeholder' => 'Add your default EULA text',
     'default_language'			=> 'Язык по умолчанию',
     'default_eula_help_text'	=> 'Вы так же можете привязать собственные пользовательские соглашения к определенным категориям активов.',
-    'acceptance_note'           => 'Add a note for your decision (Optional)',
+    'acceptance_note'           => 'Добавить заметку для вашего решения (необязательно)',
     'display_asset_name'        => 'Отображаемое имя актива',
     'display_checkout_date'     => 'Отображать дату выдачи',
     'display_eol'               => 'Отображать дату истечения срока гарантии в таблице',
-    'display_qr'                => 'Отображать QR коды',
+    'display_qr'                => 'Display 2D barcode',
     'display_alt_barcode'		=> 'Показывать штрих-коды',
-    'email_logo'                => 'Логотип E-Mail',
     'barcode_type'				=> 'Тип 2D штрихкода',
     'alt_barcode_type'			=> 'Тип линейного штрихкода',
-    'email_logo_size'       => 'В почте лучше всего выглядят квадратные логотипы. ',
     'enabled'                   => 'Включено',
     'eula_settings'				=> 'Настройки лицензионного соглашения',
     'eula_markdown'				=> 'Это EULA поддерживает <a href="https://help.github.com/articles/github-flavored-markdown/">форматирование Github flavored markdown</a>.',
+    'empty_row_count'           => 'Field Start Offset (Empty Rows)',
+    'empty_row_count_help'      => 'Fields will begin populating after this many empty rows are skipped at the top of the label.',
     'favicon'                   => 'Favicon',
     'favicon_format'            => 'Разрешенные типы файлов: ico, png и gif. Другие форматы изображений могут не отображаться во всех браузерах.',
     'favicon_size'          => 'Favicon\'ы быть квадратными размером 16х16 пикселей.',
     'footer_text'               => 'Дополнительный текст нижнего колонтитула ',
     'footer_text_help'          => 'Этот текст будет отображаться в правой части нижнего колонтитула. Разрешается использовать ссылки следующего вида <a href="https://help.github.com/articles/github-flavored-markdown/">Github ароматизированные уценок</a>. Использование прочей HTML разметки, переводов строк, изображений - может привести к непредсказуемым результатам.',
+    'footer_text_placeholder'   => 'Optional footer text',
     'general_settings'			=> 'Общие настройки',
-    'general_settings_keywords' => 'поддержка компании, подписание, принятие, формат электронной почты, формат имени пользователя, изображения, на страницу, эскизы, eula, Gravatar, tos, dashard, конфиденциальность',
     'general_settings_help'     => 'EULA по умолчанию и прочее',
     'generate_backup'			=> 'Создать резервную копию',
     'google_workspaces'         => 'Рабочие области Google',
     'header_color'              => 'Цвет заголовка',
     'info'                      => 'Эти настройки позволяют персонализировать некоторые аспекты вашей установки.',
-    'label_logo'                => 'Логотип этикетки',
     'label_logo_size'           => 'Для маркировки активов лучше всего подойдут квадратные логотипы. Они будт отображаться в правом верхнем углу актива. ',
     'laravel'                   => 'Версия Laravel',
     'ldap'                      => 'LDAP',
@@ -94,7 +97,7 @@ return [
     'ldap_login_sync_help'      => 'Этим производится проверка правильности синхронизации LDAP. Если тест подлинности LDAP не пройдёт, пользователи так и не смогут войти в систему. СНАЧАЛА ВЫ ДОЛЖНЫ СОХРАНИТЬ ВАШИ ОБНОВЛЕННЫЕ НАСТРОЙКИ LDAP.',
     'ldap_manager'              => 'LDAP Manager',
     'ldap_server'               => 'Сервер LDAP',
-    'ldap_server_help'          => 'Должен начинаться с ldap:// (для незашифрованных или TLS соединений) или ldaps:// (SSL)',
+    'ldap_server_help'          => 'Должен начинаться с ldap:// (для незашифрованных соединений) или ldaps:// (для TLS или SSL)',
     'ldap_server_cert'			=> 'Подтверждение SSL сертификата LDAP',
     'ldap_server_cert_ignore'	=> 'Разрешить невалидный SSL сертификат',
     'ldap_server_cert_help'		=> 'Выберите галочку если вы используете самоподписанный SSL сертификат и хотите принять невалидный SSL сертификат.',
@@ -108,8 +111,8 @@ return [
     'ldap_pword'                => 'Пароль LDAP Bind',
     'ldap_basedn'               => 'Основной Bind DN',
     'ldap_filter'               => 'Фильтр LDAP',
-    'ldap_pw_sync'              => 'LDAP синхронизация паролей',
-    'ldap_pw_sync_help'         => 'Снимите галку, если вы не хотите синхронизировать LDAP пароли с локальными. Отключение этого означает, что ваши пользователи не смогут зайти в систему, если ваш LDAP сервер станет недоступным.',
+    'ldap_pw_sync'              => 'Cache LDAP Passwords',
+    'ldap_pw_sync_help'         => 'Uncheck this box if you do not wish to keep LDAP passwords cached as local hashed passwords. Disabling this means that your users may not be able to login if your LDAP server is unreachable for some reason.',
     'ldap_username_field'       => 'Поле имени пользователя',
     'ldap_lname_field'          => 'Фамилия',
     'ldap_fname_field'          => 'LDAP Имя',
@@ -117,13 +120,15 @@ return [
     'ldap_version'              => 'Версия LDAP',
     'ldap_active_flag'          => 'Активный флаг LDAP',
     'ldap_activated_flag_help'  => 'Это значение используется для определения того, может ли синхронизированный пользователь войти в Snipe-IT. <strong>Это не влияет на возможность проверки элементов в них или из них</strong>, и должен быть <strong>атрибутом</strong> в AD/LDAP, <strong>не значением</strong>. <br><br>Если это поле установлено в имени поля, которого нет в вашем AD/LDAP, или значение в поле AD/LDAP установлено в <code>0</code> или <code>false</code>, <strong>логин пользователя будет отключён</strong>. Если значение в поле AD/LDAP установлено в <code></code> или <code>true</code> или <em>любой другой текст</em> означает, что пользователь может войти в систему. Когда поле пустое в вашем объявлении, мы уважаем атрибут <code>userAccountControl</code> , который обычно позволяет не заблокированным пользователям входить в систему.',
+    'ldap_invert_active_flag'   => 'LDAP Invert Active Flag',
+    'ldap_invert_active_flag_help'     => 'If enabled: when the value returned by LDAP Active Flag is <code>0</code> or <code>false</code> the user account will be active.',
     'ldap_emp_num'              => 'Номер сотрудника LDAP',
     'ldap_email'                => 'Email LDAP',
     'ldap_test'                 => 'Тест LDAP',
     'ldap_test_sync'            => 'Тест синхронизации LDAP',
     'license'                   => 'Лицензия на ПО',
-    'load_remote'               => 'Использовать Gravatar',
-    'load_remote_help_text'		=> 'Снимите флажок, если вы не можете загрузить скрипты из внешнего интернета. Это не позволит Snipe-IT пытаться загрузить образы из Gravatar.',
+    'load_remote'               => 'Загрузить аватары из внешних источников',
+    'load_remote_help_text'		=> 'Снимите флажок, если вы не можете загрузить скрипты из интернета. Это предотвратит попытки Snipe-IT загрузить аватары из Gravatar или других внешних источников.',
     'login'                     => 'Попытки входа',
     'login_attempt'             => 'Попытка входа',
     'login_ip'                  => 'IP-адрес',
@@ -131,6 +136,7 @@ return [
     'login_user_agent'          => 'Браузер пользователя',
     'login_help'                => 'Список попыток входа',
     'login_note'                => 'Комментарий для экрана логина',
+    'login_note_placeholder'            => "If you do not have a login or have found a device belonging to this company, please call technical support at 888-555-1212. Thank you.",
     'login_note_help'           => 'Опционально выводит несколько предложений на экране логина. Например, чтобы помочь людям, которые нашли потерянное или украденное устройство. Здесь можно использовать <a href="https://help.github.com/articles/github-flavored-markdown/">Github flavored markdown</a>',
     'login_remote_user_text'    => 'Параметры входа удаленного пользователя',
     'login_remote_user_enabled_text' => 'Включение входа через использование Remote User Header',
@@ -146,13 +152,16 @@ return [
     'logo_print_assets_help'    => 'Использование брендинга в распечатке списка активов ',
     'full_multiple_companies_support_help_text' => 'Ограничить доступ пользователям (включая админов) только активами их компаний.',
     'full_multiple_companies_support_text' => 'Полная поддержка нескольких компаний',
+    'scope_locations_fmcs_support_text'  => 'Scope Locations with Full Multiple Companies Support',
+    'scope_locations_fmcs_support_help_text'  => 'Restrict locations to their selected company.',
+    'scope_locations_fmcs_check_button' => 'Check Compatibility',
+    'scope_locations_fmcs_support_disabled_text'  => 'This option is disabled because you have conflicting locations set for :count or more items.',
     'show_in_model_list'   => 'Показать в списках (дропдаунах) модели',
     'optional'					=> 'не обязательно',
     'per_page'                  => 'Результатов на страницу',
     'php'                       => 'Версия PHP',
-    'php_info'                  => 'PHP информация',
+    'php_info'                  => 'Информация о PHP',
     'php_overview'              => 'PHP',
-    'php_overview_keywords'     => 'phpinfo, system, info',
     'php_overview_help'         => 'PHP System info',
     'php_gd_info'               => 'Для отображения QR кодов необходимо установить модуль php-gd.',
     'php_gd_warning'            => 'Библиотеки PHP Image Processing и GD plugin не установлены.',
@@ -218,6 +227,8 @@ return [
     'webhook_integration_help'    => 'Интеграция с :app необязательна, однако конечная точка и канал - обязательны, если Вы планируете её использовать. Для конфигурации интеграции с :app, Вы должны в первую очередь <a href=":webhook_link" target="_new" rel="noopener"> создать исходящий веб-хук</a> на свою учетную запись в :app. Нажмите на кнопку <strong> Протестировать Интеграцию с :app</strong> чтобы убедится перед сохранением, что Ваши параметры - верны. ',
     'webhook_integration_help_button'    => 'Как только вы сохраните :app информацию, появится тестовая кнопка.',
     'webhook_test_help'           => 'Проверьте, правильно ли настроена интеграция :app. ВЫ ДОЛЖНЫ СОХРАНИТЬ ВАШЕЕ ОБНОВЛЕННЫЕ :app НАСТРОЙКИ ПРИВЛЕЧЕНИЯ.',
+    'shortcuts_enabled'         => 'Включить ярлыки',
+    'shortcuts_help_text'       => '<strong>Windows</strong>: Alt + Access key, <strong>Mac</strong>: Control + Option + Access key',
     'snipe_version'  			=> 'Версия Snipe-IT',
     'support_footer'            => 'Ссылки на поддержу в нижнем колонтитуле ',
     'support_footer_help'       => 'Отображать или не отображать ссылку на руководство пользователя и поддержку Snipe-IT',
@@ -227,7 +238,6 @@ return [
     'update'                    => 'Обновить настройки',
     'value'                     => 'Значение',
     'brand'                     => 'Фирменный стиль',
-    'brand_keywords'            => 'нижняя часть страницы, логотип, print, тема, оболочка, верхняя часть страницы, цветовая палитра, цвет, css',
     'brand_help'                => 'Логотип, Имя сайта',
     'web_brand'                 => 'Тип Web-Брендинга',
     'about_settings_title'      => 'О настройках',
@@ -276,6 +286,8 @@ return [
     'two_factor_enrollment_text'	=> "Требуется двухфакторная аутентификация, однако ваше устройство еще не зарегистрировано. Откройте приложение Google Authenticator и отсканируйте QR-код ниже, чтобы зарегистрировать свое устройство. После того, как вы зарегистрируете свое устройство, введите приведенный ниже код",
     'require_accept_signature'      => 'Требуется подпись',
     'require_accept_signature_help_text'      => 'Включение этой функции потребует от пользователей физического выхода из системы при принятии актива.',
+    'require_checkinout_notes'  => 'Require Notes on Checkin/Checkout',
+    'require_checkinout_notes_help_text'    => 'Enabling this feature will require the note fields to be populated when checking in or checking out an asset.',
     'left'        => 'слева',
     'right'        => 'справа',
     'top'        => 'сверху',
@@ -287,18 +299,18 @@ return [
     'zerofill_count'        => 'Длина инвентарного номера, включая заполнение нулями',
     'username_format_help'   => 'Этот параметр используется только в процессе импорта, если имя пользователя не предоставляется и мы должны сгенерировать его для Вас.',
     'oauth_title' => 'Настройки OAuth API',
-    'oauth_clients' => 'OAuth Clients',
+    'oauth_clients' => 'Клиенты OAuth',
     'oauth' => 'OAuth',
     'oauth_help' => 'Настройки Oauth Endpoint',
     'oauth_no_clients' => 'У вас ещё нет клиентов OAuth.',
     'oauth_secret' => 'Секретный ключ',
     'oauth_authorized_apps' => 'Авторизированные приложения',
     'oauth_redirect_url' => 'Ссылка переадресации',
-    'oauth_name_help' => ' Something your users will recognize and trust.',
+    'oauth_name_help' => ' То, что ваши пользователи распознают и чему доверяют.',
     'oauth_scopes' => 'Области видимости',
-    'oauth_callback_url' => 'Your application authorization callback URL.',
-    'create_client' => 'Create Client',
-    'no_scopes' => 'No scopes',
+    'oauth_callback_url' => 'URL обратного вызова авторизации вашего приложения.',
+    'create_client' => 'Создать клиента',
+    'no_scopes' => 'Нет областей действия',
     'asset_tag_title' => 'Обновить Настройки Тега Актива',
     'barcode_title' => 'Обновить Настройки Штрих-кода',
     'barcodes' => 'Штрихкоды',
@@ -313,24 +325,24 @@ return [
     'filter_by_keyword' => 'Сортировать по ключевому слову',
     'security' => 'Безопасность',
     'security_title' => 'Обновить настройки безопасности',
-    'security_keywords' => 'пароль, пароли, требования, два фактора, два фактора, общие пароли, удаленный вход, выход из системы, аутентификация',
     'security_help' => 'Двухфакторная авторизация, ограничения паролей',
-    'groups_keywords' => 'разрешения, группы разрешений, авторизация',
     'groups_help' => 'Группы прав доступа',
     'localization' => 'Локализация',
     'localization_title' => 'Обновить настройки локализации',
-    'localization_keywords' => 'локализация, валюта, локальный, локаль, временная зона, интернационализация, язык, перевод',
     'localization_help' => 'Язык, формат даты',
     'notifications' => 'Уведомления',
     'notifications_help' => 'Настройки оповещений и аудита электронной почты',
     'asset_tags_help' => 'Инкременты и префиксы',
     'labels' => 'Этикетки',
     'labels_title' => 'Обновить настройки этикетки',
-    'labels_help' => 'Настройки &amp; размеров этикетки',
-    'purge_keywords' => 'удалить полностью',
+    'labels_help' => 'Barcodes &amp; label settings',
     'purge_help' => 'Очистка удалённых записей',
     'ldap_extension_warning' => 'Похоже на вашем сервере не установлен или не включен модуль LDAP синхронизации. Вы можете сохранить ваши параметры, но вам потребуется установить\\включить модуль для PHP прежде выполнить синхронизацию с доменом.',
     'ldap_ad' => 'LDAP/Active Directory',
+    'ldap_test_label' => 'Test LDAP Sync',
+    'ldap_test_login' => ' Test LDAP Login',
+    'ldap_username_placeholder' => 'LDAP Username',
+    'ldap_password_placeholder' => 'LDAP Password',
     'employee_number' => 'Номер сотрудника',
     'create_admin_user' => 'Создать пользователя ::',
     'create_admin_success' => 'Отлично! Администратор успешно добавлен!',
@@ -342,6 +354,8 @@ return [
     'setup_migration_create_user' => 'Далее: Создать пользователя',
     'ldap_settings_link' => 'Страница настроек LDAP',
     'slack_test' => 'Протестировать <i class="fab fa-slack"></i> интеграцию',
+    'status_label_name' => 'Status Label Name',
+    'super_admin_only'  => 'Super Admin Only',
     'label2_enable'           => 'Новый движок этикеток',
     'label2_enable_help'      => 'Переключиться на новый движок этикеток. <b>Важно: вам нужно сохранить эти настройки перед изменением других настроек.</b>',
     'label2_template'         => 'Шаблон',
@@ -356,12 +370,15 @@ return [
     'label2_2d_type'          => 'Тип 2D штрих-кода',
     'label2_2d_type_help'     => 'Формат 2D штрих-кодов',
     'label2_2d_target'        => 'Цель 2D штрих-кода',
-    'label2_2d_target_help'   => 'URL для 2D штрих-кодов указывает адрес сайта с активом/объектом',
+    'label2_2d_target_help'   => 'The data that will be contained in the 2D barcode',
     'label2_fields'           => 'Определения полей',
     'label2_fields_help'      => 'Поля могут быть добавлены, удалены и переупорядочены в левой колонке. Для каждого поля можно добавлять, удалять и переупорядочивать несколько параметров меток и DataSource.',
+    'purge_barcodes' => 'Purge Barcodes',
     'help_asterisk_bold'    => 'Текст, введенный как <code>**текст**</code> будет отображаться как жирный',
     'help_blank_to_use'     => 'Оставьте пустым, чтобы использовать значение из <code>:setting_name</code>',
-    'help_default_will_use' => '<code>:default</code> будет использовать значение из <code>:setting_name</code>. <br>Обратите внимание, что для успешной генерации значение штрих-кодов должно соответствовать соответствующей спецификации штрих-кода. Подробнее см. <a href="https://snipe-it.readme.io/docs/barcodes">в документации <i class="fa fa-external-link"></i></a>. ',
+    'help_default_will_use' => '<code>:default</code> will use the value from <code>:setting_name</code>. <br>Note that the value of the barcodes must comply with the respective barcode spec in order to be successfully generated. Please see <a href="https://snipe-it.readme.io/docs/barcodes">the documentation <i class="fa fa-external-link"></i></a> for more details. ',
+    'asset_id'              => 'Asset ID',
+    'data'               => '',
     'default'               => 'По умолчанию',
     'none'                  => 'None',
     'google_callback_help' => 'Это должно быть введено как URL обратного вызова в настройках приложения Google OAuth в вашей организации&apos;s <strong><a href="https://console.cloud.google.com/" target="_blank">консоль разработчика Google <i class="fa fa-external-link" aria-hidden="true"></i></a></strong>.',
@@ -373,7 +390,100 @@ return [
     'database_driver' => 'Драйвер базы данных',
     'bs_table_storage' => 'Хранилище таблицы',
     'timezone' => 'Часовой пояс',
-    'profile_edit'          => 'Edit Profile',
-    'profile_edit_help'          => 'Allow users to edit their own profiles.',
+    'test_mail' => 'Test Mail',
+    'profile_edit'          => 'Редактировать Профиль',
+    'profile_edit_help'          => 'Разрешить пользователям редактировать свои профили.',
+    'default_avatar' => 'Custom Default Avatar',
+    'default_avatar_help' => 'Это изображение будет отображаться как фото профиля, если у пользователя оно не установлено.',
+    'restore_default_avatar' => 'Восстановить <a href=":default_avatar" data-toggle="lightbox" data-type="image">исходный системный аватар</a>',
+    'restore_default_avatar_help' => '',
+    'due_checkin_days' => 'Предупреждение о возврате',
+    'due_checkin_days_help' => 'Сколько дней до ожидаемого возврата актива должно быть указано на странице «Подлежит возврату»?',
+    'no_groups' => 'No groups have been created yet. Visit <code>Admin Settings > Permission Groups</code> to add one.',
+    'text' => 'Text',
+
+    'username_formats' => [
+        'username_format'		=> 'Формат имени пользователя',
+        'firstname_lastname_format'	=> 'Имя и фамилия через точку  (jane.smith)',
+        'first_name_format'	        => 'First Name (jane)',
+        'last_name_format'		=> 'Last Name (doe)',
+        'filastname_format'			=> 'First Initial Last Name (jsmith)',
+        'lastnamefirstinitial_format' =>  'Last Name First Initial (smithj)',
+        'firstname_lastname_underscore_format' => 'First Name Last Name (jane_smith)',
+        'firstinitial.lastname' => 'First Initial Last Name (j.smith)',
+        'lastname_firstinitial' => 'Last Name First Initial (smith_j)',
+        'lastname_dot_firstinitial_format' => 'Last Name First Initial (smith.j)',
+        'firstnamelastname'     => 'First Name Last Name (janesmith)',
+        'firstnamelastinitial'  => 'First Name Last Initial (janes)',
+        'lastnamefirstname'      => 'Фамилия.Имя (smith.jane)',
+    ],
+
+    'email_formats' => [
+        'email_format'			=> 'Формат адреса электронной почты',
+        'firstname_lastname_format'	=> 'Имя и фамилия через точку  (jane.smith@example.com)',
+        'first_name_format'		=> 'Имя (jane@example.com)',
+        'last_name_format'		=> 'Last Name (doe@example.com)',
+        'filastname_format'			=> 'Первая буква имени и фамилия (jsmith@example.com)',
+        'lastnamefirstinitial_format' =>  'Фамилия и первая буква имени (smithj@example.com)',
+        'firstname_lastname_underscore_format' => 'Имя и фамилия (jane_smith@example.com)',
+        'firstinitial.lastname' => 'Первая буква имени и фамилия (i.ivanov@example.com)',
+        'lastname_firstinitial' => 'Фамилия Первая буква имени (ivanov_i@example.com)',
+        'lastname_dot_firstinitial_format' => 'Фамилия и первая буква имени (smith.j@example.com)',
+        'firstnamelastname'     => 'Имя Фамилия (ivanivanov@example.com)',
+        'firstnamelastinitial'  => 'First Name Last Initial (janes@example.com)',
+        'lastnamefirstname'      => 'Фамилия.Имя (smith.jane@example.com)',
+    ],
+
+
+
+    'logo_labels' => [
+        'acceptance_pdf_logo'       => 'PDF Logo',
+        'email_logo'                => 'Логотип E-Mail',
+        'label_logo'                => 'Логотип этикетки',
+        'logo'                      => 'Site Logo',
+        'favicon'                   => 'Favicon',
+    ],
+
+    'logo_help' => [
+        'email_logo_size'       => 'В почте лучше всего выглядят квадратные логотипы. ',
+    ],
+
+    'logo_option_types' => [
+        'text' => 'Text',
+        'logo' => 'Логотип',
+        'logo_and_text' => 'Logo and Text',
+    ],
+
+
+    'legends' => [
+        'scoping' => 'Scoping',
+        'formats' => 'Default Formats',
+        'profiles' => 'User Profiles',
+        'eula' => 'EULA & Acceptance Preferences',
+        'misc_display' => 'Miscellaneous Display Options',
+        'email' => 'Email Preferences',
+        'checkin' => 'Checkin Preferences',
+        'dashboard' => 'Login & Dashboard Preferences',
+        'misc' => 'Miscellaneous',
+        'logos' => 'Logos & Display',
+        'colors' => 'Colors & Skins',
+        'footer' => 'Footer Preferences',
+        'security' => 'Security Preferences',
+        'general' => 'General',
+        'intervals' => 'Intervals & Thresholds',
+    ],
+
+
+    /* Keywords for settings overview help */
+    'keywords' => [
+        'brand'             => 'нижняя часть страницы, логотип, print, тема, оболочка, верхняя часть страницы, цветовая палитра, цвет, css',
+        'general_settings'  => 'поддержка компании, подписание, принятие, формат электронной почты, формат имени пользователя, изображения, на страницу, эскизы, eula, Gravatar, tos, dashard, конфиденциальность',
+        'groups'            => 'разрешения, группы разрешений, авторизация',
+        'labels'            => 'labels, barcodes, barcode, sheets, print, upc, qr, 1d, 2d',
+        'localization'      => 'локализация, валюта, локальный, локаль, временная зона, интернационализация, язык, перевод',
+        'php_overview'      => 'phpinfo, system, info',
+        'purge'             => 'удалить полностью',
+        'security'          => 'пароль, пароли, требования, два фактора, два фактора, общие пароли, удаленный вход, выход из системы, аутентификация',
+    ],
 
 ];
diff --git a/resources/lang/ru-RU/admin/settings/message.php b/resources/lang/ru-RU/admin/settings/message.php
index dc7b02a989..37d1ce2883 100644
--- a/resources/lang/ru-RU/admin/settings/message.php
+++ b/resources/lang/ru-RU/admin/settings/message.php
@@ -14,6 +14,9 @@ return [
         'restore_warning'       => 'Да, восстановить. Я осознаю, что это перезапишет все существующие данные в базе данных. Это также выйдет из учетных записей всех ваших существующих пользователей (включая вас).',
         'restore_confirm'       => 'Вы уверены, что хотите восстановить базу данных из :filename?'
     ],
+    'restore' => [
+        'success'               => 'Ваша резервная копия была восстановлена. Пожалуйста, войдите в систему снова.'
+    ],
     'purge' => [
         'error'     => 'Возникла ошибка при попытке очистки. ',
         'validation_failed'     => 'Ваш текст подтверждения очистки неверен. Пожалуйста, наберите слово "DELETE" в поле подтверждения.',
@@ -33,6 +36,9 @@ return [
         'testing_authentication' => 'Тестирование LDAP аутентификации...',
         'authentication_success' => 'Пользователь успешно аутентифицирован с LDAP!'
     ],
+    'labels' => [
+        'null_template' => 'Label template not found. Please select a template.',
+        ],
     'webhook' => [
         'sending' => 'Отправка тестового сообщения в :app...',
         'success' => 'Ваша интеграция :webhook_name работает!',
@@ -42,5 +48,12 @@ return [
         'error' => 'Что-то пошло не так. :app ответил: :error_message',
         'error_redirect' => 'ОШИБКА: 301/302 :endpoint возвращает редирект. По соображениям безопасности мы не переходим по редиректам. Пожалуйста, используйте фактическую конечную точку.',
         'error_misc' => 'Что-то пошло не так. :( ',
-    ]
+        'webhook_fail' => ' webhook notification failed: Check to make sure the URL is still valid.',
+        'webhook_channel_not_found' => ' webhook channel not found.',
+        'ms_teams_deprecation' => 'The selected Microsoft Teams webhook URL will be deprecated Dec 31st, 2025. Please use a workflow URL. Microsoft\'s documentation on creating a workflow can be found <a href="https://support.microsoft.com/en-us/office/create-incoming-webhooks-with-workflows-for-microsoft-teams-8ae491c7-0394-4861-ba59-055e33f75498" target="_blank"> here.</a>',
+    ],
+    'location_scoping' => [
+        'not_saved' => 'Your settings were not saved.',
+        'mismatch' => 'There is 1 item in the database that need your attention before you can enable location scoping.|There are :count items in the database that need your attention before you can enable location scoping.',
+    ],
 ];
diff --git a/resources/lang/ru-RU/admin/statuslabels/table.php b/resources/lang/ru-RU/admin/statuslabels/table.php
index f5445e36e7..2d82cb3e32 100644
--- a/resources/lang/ru-RU/admin/statuslabels/table.php
+++ b/resources/lang/ru-RU/admin/statuslabels/table.php
@@ -1,14 +1,14 @@
 <?php
 
 return array(
-    'about'      	=> 'Справка по статусам активов',
+    'about'      	=> 'About Status Types',
     'archived'      	=> 'Архивные',
     'create'      	=> 'Создать статус актива',
     'color'      	=> 'Цвет диаграммы',
     'default_label' => 'Метка по умолчанию',
     'default_label_help' => 'Это нужно для того, чтобы ваши наиболее часто используемые статусы отображались первыми в выпадающем списке при создании/редактировании активов.',
     'deployable'      	=> 'Доступные',
-    'info'      	=> 'Статус активов необходим для отслеживания состояния активов. Активы могут быть утеряны, находится в сервисных центрах, в архиве либо быть готовыми к использованию.',
+    'info'      	=> 'Status label types are used to describe the various states your assets could be in. They may be out for repair, lost/stolen, etc. You can create new status labels for your deployable, pending and archived assets according to your own workflow. For more information, <a href="https://snipe-it.readme.io/docs/overview#status-labels" target="_blank">see the documentation <i class="fa fa-external-link"></i></a>.',
     'name'      	=> 'Название статуса',
     'pending'      	=> 'Ожидающие',
     'status_type'   => 'Тип статуса',
diff --git a/resources/lang/ru-RU/admin/users/general.php b/resources/lang/ru-RU/admin/users/general.php
index 99786f6ed5..e26b47332d 100644
--- a/resources/lang/ru-RU/admin/users/general.php
+++ b/resources/lang/ru-RU/admin/users/general.php
@@ -19,6 +19,8 @@ return [
     'print_assigned'    => 'Печать всех назначенных',
     'email_assigned'    => 'Список адресов электронной почты всех назначенных',
     'user_notified'     => 'Пользователю был отправлен по электронной почте список назначенных им в данный момент элементов.',
+    'users_notified'    => 'The user has been emailed a list of their currently assigned items.|:count users have been emailed a list of their currently assigned items.',
+    'users_notified_warning' => ':count user has been emailed a list of their currently assigned items, however :no_email users did not have an email address so could not be emailed.|:count users have been emailed a list of their currently assigned items, however :no_email user(s) did not have an email address so could not be emailed.',
     'auto_assign_label' => 'Включить этого пользователя при автоматическом назначении лицензий',
     'auto_assign_help'  => 'Пропустить этого пользователя в автоматическом назначении лицензий',
     'software_user'     => 'Программное обеспечение привязано к :name',
diff --git a/resources/lang/ru-RU/admin/users/message.php b/resources/lang/ru-RU/admin/users/message.php
index 1889feb84c..69666f3c35 100644
--- a/resources/lang/ru-RU/admin/users/message.php
+++ b/resources/lang/ru-RU/admin/users/message.php
@@ -6,7 +6,7 @@ return array(
     'declined'                  => 'Вы успешно отклонили актив.',
     'bulk_manager_warn'	        => 'Ваши пользователи были успешно обновлены, однако запись менеджера не была сохранена, потому что выбранный менеджер также присутствовал в редактируемом списке пользователей, и пользователи не могут быть менеджерами самим себе. Пожалуйста выберите ваших пользователей снова, за исключением их менеджера.',
     'user_exists'               => 'Пользователь уже существует!',
-    'user_not_found'            => 'Пользователь не существует.',
+    'user_not_found'            => 'User does not exist or you do not have permission view them.',
     'user_login_required'       => 'Поле "Логин" является обязательным',
     'user_has_no_assets_assigned' => 'Нет активов закреплённых за этим пользователем.',
     'user_password_required'    => 'Поле "Пароль" является обязательным.',
@@ -37,22 +37,23 @@ return array(
         'update' => 'При изменении пользователя возникла проблема. Пожалуйста попробуйте снова.',
         'delete' => 'При удалении пользователя возникла проблема. Пожалуйста попробуйте снова.',
         'delete_has_assets' => 'У пользователя есть назначенные ему активы и не может быть удалён.',
-        'delete_has_assets_var' => 'This user still has an asset assigned. Please check it in first.|This user still has :count assets assigned. Please check their assets in first.',
-        'delete_has_licenses_var' => 'This user still has a license seats assigned. Please check it in first.|This user still has :count license seats assigned. Please check them in first.',
-        'delete_has_accessories_var' => 'This user still has an accessory assigned. Please check it in first.|This user still has :count accessories assigned. Please check their assets in first.',
-        'delete_has_locations_var' => 'This user still manages a location. Please select another manager first.|This user still manages :count locations. Please select another manager first.',
-        'delete_has_users_var' => 'This user still manages another user. Please select another manager for that user first.|This user still manages :count users. Please select another manager for them first.',
+        'delete_has_assets_var' => 'У этого пользователя все еще есть назначенный актив. Пожалуйста, проверьте его сначала.|Этот пользователь все еще имеет :count назначенных активов. Пожалуйста, проверьте его активы в первую очередь.',
+        'delete_has_licenses_var' => 'У этого пользователя все еще есть назначенные лицензионные места. Пожалуйста, проверьте их сначала.|У этого пользователя все еще есть назначенные :count лицензионные места. Пожалуйста, проверьте их сначала.',
+        'delete_has_accessories_var' => 'У этого пользователя все еще есть назначенный аксессуар. Пожалуйста, проверьте его сначала.|У этого пользователя все еще есть назначенные :count аксессуары. Пожалуйста, проверьте его активы сначала.',
+        'delete_has_locations_var' => 'Этот пользователь все еще управляет местоположением. Сначала выберите другого управляющего.|Этот пользователь все еще управляет :count местоположениями. Сначала выберите другого управляющего.',
+        'delete_has_users_var' => 'Этот пользователь все еще является руководителем другого пользователя. Сначала выберите другого руководителя для этого пользователя.|Этот пользователь все является руководителем :count пользователей. Сначала выберите для них другого руководителя.',
         'unsuspend' => 'При разморозке пользователя возникла проблема. Пожалуйста попробуйте снова.',
         'import'    => 'При импорте пользователей произошла ошибка. Попробуйте еще раз.',
         'asset_already_accepted' => 'Этот актив уже был принят.',
         'accept_or_decline' => 'Примите или отклоните актив.',
-        'cannot_delete_yourself' => 'We would feel really bad if you deleted yourself, please reconsider.',
+        'cannot_delete_yourself' => 'Нам было бы очень жаль, если бы вы удалили себя. Пожалуйста, подумайте еще раз.',
         'incorrect_user_accepted' => 'Актив, который вы попытались принять, не был записан на вас.',
         'ldap_could_not_connect' => 'Не могу подключиться к серверу LDAP. Проверьте настройки LDAP сервера в файле конфигурации LDAP.<br>Ошибка от LDAP сервера:',
         'ldap_could_not_bind' => 'Не могу связаться (bind) с сервером LDAP. Проверьте настройки LDAP сервера в файле конфигурации LDAP.<br>Ошибка от LDAP сервера: ',
         'ldap_could_not_search' => 'Не могу найти сервер LDAP. Проверьте настройки LDAP сервера в файле конфигурации LDAP.<br>Ошибка от LDAP сервера:',
         'ldap_could_not_get_entries' => 'Не могу загрузить записи с сервера LDAP. Проверьте настройки LDAP сервера в файле конфигурации LDAP.<br>Ошибка от LDAP сервера:',
         'password_ldap' => 'Пароль для этой учетной записи управляется LDAP/Active Directory. Пожалуйста, свяжитесь с департаментом ИТ, чтобы изменить свой пароль. ',
+        'multi_company_items_assigned' => 'This user has items assigned that belong to a different company. Please check them in or edit their company.'
     ),
 
     'deletefile' => array(
diff --git a/resources/lang/ru-RU/admin/users/table.php b/resources/lang/ru-RU/admin/users/table.php
index e16dfa3bc0..fb16b507f9 100644
--- a/resources/lang/ru-RU/admin/users/table.php
+++ b/resources/lang/ru-RU/admin/users/table.php
@@ -22,7 +22,7 @@ return array(
     'managed_locations'     => 'Управляемые расположения',
     'managed_users'         => 'Управляемые пользователи',
     'name' 					=> 'Имя',
-    'nogroup'               => 'Ни одной группы ещё не было создано. Что бы добавить, посетите: ',
+    'nogroup'               => 'Ни одной группы ещё не было создано. Что бы добавить, посетите:',
     'notes'                 => 'Заметки',
     'password_confirm' 		=> 'Подтверждение пароля',
     'password' 				=> 'Пароль',
diff --git a/resources/lang/ru-RU/auth.php b/resources/lang/ru-RU/auth.php
index 80a618183a..d021935150 100644
--- a/resources/lang/ru-RU/auth.php
+++ b/resources/lang/ru-RU/auth.php
@@ -15,6 +15,6 @@ return array(
 
     'failed' => 'Учетные данные не совпадают с нашими записями.',
     'password' => 'Неверный пароль',
-    'throttle' => 'Слишком много неудачных попыток входа. Пожалуйста, попробуйте через :seconds секунд.',
+    'throttle' => 'Too many login attempts. Please try again in :minutes minute(s).',
 
 );
diff --git a/resources/lang/ru-RU/auth/message.php b/resources/lang/ru-RU/auth/message.php
index b71cf47f8e..20e4273be4 100644
--- a/resources/lang/ru-RU/auth/message.php
+++ b/resources/lang/ru-RU/auth/message.php
@@ -6,16 +6,14 @@ return array(
     'account_not_found'      => 'Неверный Логин или Пароль.',
     'account_not_activated'  => 'Эта учетная запись не активирована.',
     'account_suspended'      => 'Эта учетная запись приостановлена.',
-    'account_banned'         => 'Эта учетная запись заблокирована.',
-    'throttle'               => 'Слишком много неудачных попыток входа. Пожалуйста, попробуйте через :minutes минут.',
 
     'two_factor' => array(
         'already_enrolled'      => 'Ваше устройство уже зарегистрировано.',
         'success'               => 'Вы успешно вошли.',
         'code_required'         => 'Требуется Двух-Факторный код подтверждения.',
         'invalid_code'          => 'Недействительный Двух-Факторный код подтверждения.',
-        'enter_two_factor_code' => 'Please enter your two-factor authentication code.',
-        'please_enroll'         => 'Please enroll a device in two-factor authentication.',
+        'enter_two_factor_code' => 'Пожалуйста, введите код двухфакторной аутентификации.',
+        'please_enroll'         => 'Пожалуйста, зарегистрируйте устройство для двухфакторной аутентификации.',
     ),
 
     'signin' => array(
diff --git a/resources/lang/ru-RU/button.php b/resources/lang/ru-RU/button.php
index 293bdc7d17..4a43081a3f 100644
--- a/resources/lang/ru-RU/button.php
+++ b/resources/lang/ru-RU/button.php
@@ -7,6 +7,7 @@ return [
     'checkin_and_delete'  	    => 'Вернуть все и удалить пользователя',
     'delete'  	                => 'Удалить',
     'edit'    	                => 'Редактировать',
+    'clone'    	                => 'Клонировать',
     'restore' 	                => 'Восстановить',
     'remove'                    => 'Удалить',
     'request'                   => 'Требовать',
@@ -21,4 +22,13 @@ return [
     'add_maintenance'           => 'Добавить техническое обслуживание',
     'append'                    => 'Добавить',
     'new'                       => 'Создать',
+    'var' => [
+        'clone'     => 'Клонировать :item_type',
+        'edit'      => 'Редактировать :item_type',
+        'delete'    => 'Удалить :item_type',
+        'restore'   => 'Восстановить :item_type',
+        'create'    => 'Создать новый :item_type',
+        'checkout'  => 'Выдать :item_type',
+        'checkin'   => 'Забрать :item_type',
+    ]
 ];
diff --git a/resources/lang/ru-RU/general.php b/resources/lang/ru-RU/general.php
index 697c390bb3..2afe4fb116 100644
--- a/resources/lang/ru-RU/general.php
+++ b/resources/lang/ru-RU/general.php
@@ -1,16 +1,16 @@
 <?php
 
 return [
-    '2FA_reset'             => '2FA reset',
+    '2FA_reset'             => 'Сброс 2FA',
     'accessories'			=> 'Аксессуары',
     'activated'			    => 'Активно',
     'accepted_date'         => 'Дата принятия',
     'accessory'				=> 'Аксессуар',
     'accessory_report'		=> 'Отчёт по аксессуарам',
     'action'                => 'Действие',
-    'activity_report'		=> 'Oтчет о деятельности',
+    'activity_report'		=> 'Отчёт о деятельности',
     'address'				=> 'Адрес',
-    'admin'					=> 'Администратор',
+    'admin'					=> 'Настройки администратора',
     'admin_tooltip'			=> 'Этот пользователь имеет права администратора',
     'superuser'				=> 'Суперпользователь',
     'superuser_tooltip'		=> 'Этот пользователь имеет права суперпользователя',
@@ -23,13 +23,16 @@ return [
     'asset_models'			=> 'Модели активов',
     'asset_model'			=> 'Модель',
     'asset'					=> 'Актив',
+    'asset_previous'        => 'Актив (ранее назначенный)',
     'asset_report'          => 'Отчет по активам',
     'asset_tag'				=> 'Тег актива',
     'asset_tags'            => 'Инвентарный номер актива',
     'assets_available'		=> 'Доступные активы',
     'accept_assets'         => 'Принять активы: название',
     'accept_assets_menu'    => 'Принять активы',
+    'accept_item'           => 'Принять актив',
     'audit'				    => 'аудит',
+    'audits'				=> 'Аудиты',
     'audit_report'			=> 'Журнал аудита',
     'assets'				=> 'Активы',
     'assets_audited'        => 'активы проверены',
@@ -61,9 +64,12 @@ return [
     'changepassword'  		=> 'Изменить пароль',
     'checkin'  				=> 'Привязать',
     'checkin_from'  		=> 'Возврат из',
+    'checkin_note'  		=> 'Заметка о возврате',
+    'checkout_note'  		=> 'Заметка о выдаче',
     'checkout'  			=> 'Отвязать',
     'checkouts_count'       => 'Отвязать',
     'checkins_count'        => 'Привязать',
+    'checkin_and_delete'  	=> 'Вернуть и удалить',
     'user_requests_count'   => 'Запросы',
     'city'  				=> 'Город',
     'click_here'			=> 'Нажмите здесь',
@@ -77,7 +83,7 @@ return [
     'consumables'			=> 'Расходные материалы',
     'country'  				=> 'Страна',
     'could_not_restore'     => 'Ошибка восстановления :item_type: :error',
-    'not_deleted'           => ':item_type не удален, поэтому его нельзя восстановить',
+    'not_deleted'           => ':item_type не был удален и поэтому не может быть восстановлен',
     'create'				=> 'Создать нового',
     'created'               => 'Элемент создан',
     'created_asset'			=> 'Создать актив',
@@ -86,11 +92,13 @@ return [
     'record_created' 		=> 'Запись Создана',
     'updated_at' 			=> 'Обновлено',
     'currency'  			=> 'Руб.', // this is deprecated
+    'currency_text'  		=> 'Валюта', //
     'current'  				=> 'Текущий',
     'current_password'      => 'Текущий пароль',
     'customize_report'      => 'Настройка отчета',
     'custom_report'         => 'Пользовательский отчет по активам',
     'dashboard'				=> 'Панель мониторинга',
+    'data_source'           => 'Источник данных',
     'days'      			=> 'дней',
     'days_to_next_audit'    => 'Дней на следующий аудит',
     'date'					=> 'Дата',
@@ -98,7 +106,7 @@ return [
     'debug_warning_text'    => 'Это приложение выполняется в режиме с включенной отладкой. Это может нарушить конфиденциальность данных, если приложение доступно для внешнего мира. Отключите режим отладки, поменяв значение <code>APP_DEBUG</code> в файле <code>.env</code> на <code>false</code>.',
     'delete'  				=> 'Удалить',
     'delete_confirm'  		=> 'Вы действительно хотите удалить?',
-    'delete_confirm_no_undo' => 'Вы уверенны, что хотите удалить :item? Это действие нельзя будет отменить.',
+    'delete_confirm_no_undo' => 'Вы уверены, что хотите удалить :item? Это действие нельзя отменить.',
     'deleted'  				=> 'Удалено',
     'delete_seats'  		=> 'Удаленные лицензии',
     'deletion_failed'       => 'Не удалось удалить',
@@ -114,29 +122,13 @@ return [
     'editprofile'  			=> 'Редактировать свой профиль',
     'eol'					=> 'EOL',
     'email_domain'			=> 'Домен адреса электронной почты',
-    'email_format'			=> 'Формат адреса электронной почты',
     'employee_number'       => 'Номер сотрудника',
     'email_domain_help'		=> 'Он используется для генерации адреса при импорте',
     'error'				    => 'Ошибка',
     'exclude_archived'      => 'Исключить архивные активы',
     'exclude_deleted'       => 'Исключить удаленные активы',
     'example'				=> 'Пример: ',
-    'filastname_format'			=> 'Первая буква имени и фамилия (jsmith@example.com)',
-    'firstname_lastname_format'	=> 'Имя и фамилия через точку  (jane.smith@example.com)',
-    'firstname_lastname_underscore_format' => 'Имя и фамилия (jane_smith@example.com)',
-    'lastnamefirstinitial_format' =>  'Фамилия и первая буква имени (smithj@example.com)',
-    'firstintial_dot_lastname_format' => 'Первая буква имени Фамилия (i.ivanov@example.com)',
-    'firstname_lastname_display'	=> 'Имя Фамилия (Иван Иванов)',
-    'lastname_firstname_display'	=> 'Фамилия Имя (Иванов Иван)',
-    'name_display_format'	=> 'Формат имени',
-    'first'					=> 'В начало',
-    'firstnamelastname'     => 'Имя Фамилия (ivanivanov@example.com)',
-    'lastname_firstinitial' => 'Фамилия Первая буква имени (ivanov_i@example.com)',
-    'firstinitial.lastname' => 'Первая буква имени и фамилия (i.ivanov@example.com)',
-    'firstnamelastinitial'  => 'First Name Last Initial (janes@example.com)',
-    'lastnamefirstname'      => 'Last Name First Name (smith.jane@example.com)',
-    'first_name'			=> 'Имя',
-    'first_name_format'		=> 'Имя (jane@example.com)',
+
     'files'                 => 'Файлы',
     'file_name'				=> 'Файл',
     'file_type'             => 'Тип файла',
@@ -156,9 +148,9 @@ return [
     'image_delete'         	=> 'Удалить изображение',
     'include_deleted'       => 'Включать удаленные активы',
     'image_upload'         	=> 'Загрузить изображение',
-    'filetypes_accepted_help'    => 'Разрешенный тип файлов :types. Максимальный допустимый размер загружаемых файлов :size.|Разрешенные типы файлов :types. Максимальный допустимый размер загружаемых файлов :size.',
-    'filetypes_size_help'   => 'Максимальный размер файла - :size.',
-    'image_filetypes_help'  => 'Accepted filetypes are jpg, webp, png, gif, svg, and avif. Max upload size allowed is :size.',
+    'filetypes_accepted_help'    => 'Принимаемый тип файлов :types. Максимальный допустимый размер - :size.|Принимаемые типы файлов - :types. Максимальный допустимый размер загружаемых файлов - :size.',
+    'filetypes_size_help'   => 'Максимальный допустимый размер загружаемых файлов: size.',
+    'image_filetypes_help'  => 'Допустимые типы файлов - pg, webp, png, gif, и svg. Максимальный размер файла :size.',
     'unaccepted_image_type'  => 'Нечитаемый файл изображения. Допустимые типы файлов: jpg, webp, png, gif и svg. Медиа тип этого файла: :mimetype.',
     'import'         	    => 'Импорт',
     'import_this_file'      => 'Сопоставить поля и обработать этот файл',
@@ -178,12 +170,17 @@ return [
     'last'					=> 'В конец',
     'last_login'            => 'Последний вход',
     'last_name'             => 'Фамилия',
+    'firstname_lastname_display'	=> 'Имя Фамилия (Иван Иванов)',
+    'lastname_firstname_display'	=> 'Фамилия Имя (Иванов Иван)',
+    'name_display_format'	=> 'Формат имени',
+    'first'					=> 'В начало',
+    'first_name'			=> 'Имя',
     'license'				=> 'Лицензия',
     'license_report'        => 'Отчет по лицензиям',
     'licenses_available'	=> 'Доступные лицензии',
     'licenses'				=> 'Лицензии',
     'list_all'				=> 'Весь список',
-    'loading'				=> 'Загрузка, пожалуйста подождите...',
+    'loading'				=> 'Загрузка... пожалуйста, подождите...',
     'lock_passwords'        => 'Это значение не будет сохранено в демо-версии.',
     'feature_disabled'      => 'Функция отключена в этой версии.',
     'location'              => 'Расположение',
@@ -193,7 +190,7 @@ return [
     'logout'				=> 'Выйти',
     'lookup_by_tag'     => 'Поиск по тегу актива',
     'maintenances'          => 'Техобслуживание',
-    'manage_api_keys'       => 'Управление API ключами',
+    'manage_api_keys'       => 'Управление ключами API',
     'manufacturer'			=> 'Производитель',
     'manufacturers'			=> 'Производители',
     'markdown'				=> 'облегченный язык разметки.',
@@ -206,8 +203,8 @@ return [
     'new_password'          => 'Новый пароль',
     'next'					=> 'Далее',
     'next_audit_date'		=> 'Следующая дата аудита',
-    'next_audit_date_help'  => 'If you use auditing in your organization, this is usually automatically calculated based on the asset&apos;s last audit date and audit frequency (in <code>Admin Settings &gt; Alerts</code>) and you can leave this blank. You can manually set this date here if you need to, but it must be later than the last audit date. ',
-    'audit_images_help'     => 'You can find audit images in the asset\'s history tab.',
+    'next_audit_date_help'  => 'Если Вы используете аудит в вашей организации, обычно значение вычисляется автоматически на основе даты последнего аудита актива&apos; и частоты аудита (в <code>Настройках Администратора &gt; Предупреждения</code>). Вы можете оставить это поле пустым. Если Вам нужно, Вы можете установить эту дату, но она должна быть позже последней даты аудита. ',
+    'audit_images_help'     => 'Вы можете найти изображения аудита на вкладке «История активов».',
     'no_email'              => 'Нет адреса электронной почты, связанные с этим пользователем',
     'last_audit'		    => 'Последний аудит',
     'new'					=> 'новое!',
@@ -215,6 +212,14 @@ return [
     'no_results'			=> 'Нет результатов.',
     'no'  					=> 'Нет',
     'notes'  				=> 'Примечания',
+    'note_added'            => 'Примечание добавлено',
+    'options'				=> 'Параметры',
+    'preview'				=> 'Предпросмотр',
+    'add_note'              => 'Добавить примечание',
+    'note_edited'            => 'Примечание изменено',
+    'edit_note'              => 'Изменить примечание',
+    'note_deleted'            => 'Примечание удалено',
+    'delete_note'              => 'Удалить примечание',
     'order_number'          => 'Номер заказа',
     'only_deleted'          => 'Только удаленные активы',
     'page_menu'				=> 'Показаны элементы _MENU_',
@@ -229,7 +234,7 @@ return [
     'purchase_date'         => 'Дата закупки',
     'qty'		            => 'Кол-во',
     'quantity'		        => 'Количество',
-    'quantity_minimum'      => ':count элемента (-ов) меньше или почти меньше порога минимального количества',
+    'quantity_minimum'      => 'У вас есть один предмет, количество которого ниже или почти ниже минимального уровня|У вас есть :count предметов, количество которого ниже или почти ниже минимального уровня',
     'quickscan_checkin'  	=> 'Получение быстрым сканированием',
     'quickscan_checkin_status'  	=> 'Статус получения',
     'ready_to_deploy'		=> 'Готов к установке',
@@ -240,13 +245,13 @@ return [
     'restored'				=> 'восстановлено',
     'restore'				=> 'Восстановить',
     'requestable_models'    => 'Запрашиваемые модели',
-    'requestable_items'     => 'Requestable Items',
+    'requestable_items'     => 'Запрашиваемые элементы',
     'requested'				=> 'Запрошено',
     'requested_date'        => 'Запрашиваемая дата',
     'requested_assets'      => 'Запрашиваемые активы',
     'requested_assets_menu' => 'Запрошенные активы',
     'request_canceled'      => 'Запрос отменен',
-    'request_item'          => 'Request this item',
+    'request_item'          => 'Запросить этот элемент',
     'external_link_tooltip' => 'Внешняя ссылка на',
     'save'  				=> 'Сохранить',
     'select_var'            => 'Выберите :thing... ', // this will eventually replace all of our other selects
@@ -274,13 +279,15 @@ return [
     'signed_off_by'         => 'Подписано:',
     'skin'       			=> 'Оформление',
     'webhook_msg_note'        => 'Уведомление будет отправлено через webhook',
-    'webhook_test_msg'        => 'Ого! Похоже, что интеграция :app со Snipe-IT работает!',
+    'webhook_test_msg'        => 'О, привет! Похоже, что ваша интеграция :app с Snipe-IT работает!',
     'some_features_disabled' => 'ДЕМО РЕЖИМ: Некоторые функции отключены.',
     'site_name'				=> 'Название сайта',
     'state'  				=> 'Область/Регион',
     'status_labels'			=> 'Этикетки',
+    'status_label'			=> 'Метки статуса',
     'status'    			=> 'Статус',
     'accept_eula'           => 'Соглашение о приемке',
+    'show_or_hide_eulas' => 'Показать/скрыть EULA',
     'supplier'              => 'Поставщик',
     'suppliers'  			=> 'Поставщики',
     'sure_to_delete'        => 'Вы действительно хотите удалить',
@@ -296,15 +303,15 @@ return [
     'type'  				=> 'Тип',
     'undeployable'			=> 'Не развертываемый',
     'unknown_admin'			=> 'Неизвестный администратор',
-    'username_format'		=> 'Формат имени пользователя',
     'username'              => 'Пользователь',
     'update'                => 'Обновить',
+    'updating_item' => 'Обновление :item',
     'upload_filetypes_help'      => 'Допустимые типы файлов: png, gif, jpg, jpeg, doc, docx, pdf, xlsx, txt, lic, xml, zip, rtf и rar. Максимальный размер - :size.',
     'uploaded'              => 'Загружено',
     'user'					=> 'Пользователь',
     'accepted'			    => 'принято',
     'declined'			    => 'отменено',
-    'declined_note'         => 'Declined Notes',
+    'declined_note'         => 'Отклоненные заметки',
     'unassigned'            => 'Не назначено',
     'unaccepted_asset_report' => 'Непринятые активы',
     'users'                 => 'Пользователи',
@@ -323,10 +330,10 @@ return [
     'token_expired'         => 'Время вашей сессии истекло. Пожалуйста, войдите снова.',
     'login_enabled'         => 'Вход разрешен',
     'audit_due'             => 'Ожидает аудита',
-    'audit_due_days'        => 'Активы, подлежащие аудиту в течение :days дней|Срок сдачи активов в течение :days дней',
+    'audit_due_days'        => '{}Активы, подлежащие или просроченные для аудита |[1]Активы, подлежащие или просроченные для аудита в течение дня|[2,*]Активы, подлежащие или просроченные для аудита в течение :days дней',
     'checkin_due'           => 'Срок сдачи чека',
     'checkin_overdue'       => 'Просрочено для чекина',
-    'checkin_due_days'      => 'Срок действия активов зачисления в течение :days дней|Активы должны быть зачислены в течение :days дней',
+    'checkin_due_days'      => '{}Активы, подлежащие выдаче|[1]Активы, подлежащие выдаче в течение :days дня|[2,*]Активы, подлежащие выдаче в течение :days дней',
     'audit_overdue'         => 'Проверка просрочена',
     'accept'                => 'Принять :asset',
     'i_accept'              => 'Принимаю',
@@ -348,7 +355,7 @@ return [
     'setup_step_4'          => 'Шаг 4',
     'setup_config_check'    => 'Проверка конфигурации',
     'setup_create_database' => 'Создание таблиц базы данных',
-    'setup_create_admin'    => 'Создать Администратора',
+    'setup_create_admin'    => 'Создать пользователя с привилегиями администратора',
     'setup_done'            => 'Готово!',
     'bulk_edit_about_to'    => 'Вы собираетесь изменить следующее: ',
     'checked_out'           => 'Выдано',
@@ -383,6 +390,8 @@ return [
     'new_license'           => 'Создать лицензию',
     'new_accessory'         => 'Создать аксессуар',
     'new_consumable'        => 'Создать новый расходник',
+    'new_component'         => 'Новый компонент',
+    'new_user'              => 'Новый пользователь',
     'collapse'              => 'Свернуть',
     'assigned'              => 'Назначено',
     'asset_count'           => 'Количество активов',
@@ -405,9 +414,9 @@ return [
     'accessory_name'       => 'Название аксессуара:',
     'clone_item'            => 'Клонировать позицию',
     'checkout_tooltip' => 'Выдать этот элемент',
-    'checkin_tooltip' => 'Check this item in so that it is available for re-issue, re-imaging, etc',
+    'checkin_tooltip' => 'Пометить этот элемент, чтобы он был доступен для повторного использования, повторного отображения и т.д.',
     'checkout_user_tooltip' => 'Выдать эту единицу пользователю',
-    'checkin_to_diff_location' => 'You can choose to check this asset in to a location other than this asset\'s default location of :default_location if one is set',
+    'checkin_to_diff_location' => 'Вы можете забрать этот актив в расположение, отличное от указанного для актива по умолчанию :default_location, если оно задано',
     'maintenance_mode'      => 'Служба временно недоступна для системных обновлений. Пожалуйста, проверьте позже.',
     'maintenance_mode_title' => 'Система временно недоступна',
     'ldap_import'           => 'Пароль пользователя не должен управляться LDAP. (Это позволяет отправлять ссылку на сброс забытого пароля.)',
@@ -418,19 +427,20 @@ return [
     'bulk_soft_delete'      =>'Также безопасно удалите этих пользователей. Их история активов останется неизменной до тех пор, пока вы не очистите записи в настройках администратора.',
     'bulk_checkin_delete_success' => 'Выбранные пользователи были удалены, а их активы перенесены.',
     'bulk_checkin_success' => 'Элементы для выбранных пользователей были получены.',
-    'set_to_null'           => 'Удалить значения для этого актива|Удалить значения для всех :asset_count активов ',
+    'set_to_null'           => 'Удалить значения для выбранного элемента|Удалить значения для всех :selection_count выбранных элементов ',
     'set_users_field_to_null'  => 'Удалить значения поля :field этого пользователя|Удалить значения поля :field для всех :user_count пользователей ',
     'na_no_purchase_date'   => 'N/A - Дата покупки не указана',
     'assets_by_status'      => 'Активы по статусу',
     'assets_by_status_type'      => 'Активы по типу статуса',
     'pie_chart_type'        => 'Тип диаграммы Pie в Дашборде',
     'hello_name'            => 'Добро пожаловать, :name!',
-    'unaccepted_profile_warning'   => 'Вам переданы :count активов. Нажмите здесь, чтобы принять или отклонить.',
+    'unaccepted_profile_warning'   => 'У вас есть один элемент, требующий подтверждения. Нажмите здесь, чтобы принять или отклонить его | У вас есть :count элементов требующих принятия. Нажмите здесь, чтобы принять или отклонить их',
     'start_date'            => 'Дата начала',
     'end_date'            => 'Дата окончания',
     'alt_uploaded_image_thumbnail' => 'Загруженная миниатюра',
     'placeholder_kit'       => 'Выберите набор',
     'file_not_found'        => 'Файл не найден',
+    'log_record_not_found'  => 'Запись для этого журнала не найдена.',
     'preview_not_available' => '(без превью)',
     'setup'                 => 'Установка',
     'pre_flight'            => 'Предварительные проверки',
@@ -508,11 +518,11 @@ return [
         'address2' => 'Адрес, строка 2',
         'import_note' => 'Импортировано с помощью csv импортера',
     ],
-    'remove_customfield_association' => 'Remove this field from the fieldset. This will not delete the custom field, only this field\'s association with this fieldset.',
-    'checked_out_to_fields' => 'Checked Out To Fields',
+    'remove_customfield_association' => 'Удалить это поле из набора полей. Это не удалит пользовательское поле, только связь поля с этим набором.',
+    'checked_out_to_fields' => 'Перемещено в Поля',
     'percent_complete' => '% завершено',
     'uploading' => 'Загрузка... ',
-    'upload_error' => 'Ошибка загрузки файла. Пожалуйста, проверьте, что нет пустых строк и нет повторяющихся названий столбцов.',
+    'upload_error' => 'Ошибка загрузки файла. Проверьте, что у вас нет пустых строк или повторяющихся названий столбцов в CSV, и что разрешения сервера позволяют загрузки.',
     'copy_to_clipboard' => 'Скопировать в буфер обмена',
     'copied' => 'Скопировано!',
     'status_compatibility' => 'Если активы уже назначены, они не могут быть изменены на неразвертываемый тип статуса и это значение будет пропущено.',
@@ -528,7 +538,7 @@ return [
     'permission_denied_superuser_demo' => 'В разрешении отказано. Вы не можете обновить информацию пользователя для суперадминов в демо.',
     'pwd_reset_not_sent' => 'Пользователь не активирован, синхронизирован LDAP или не имеет адреса электронной почты',
     'error_sending_email' => 'Ошибка при отправке письма',
-    'sad_panda' => 'Sad panda. You are not authorized to do the thing. Maybe <a href=":link">return to the dashboard</a>, or contact your administrator.',
+    'sad_panda' => 'Грустная панда. Вы не авторизованы, чтобы выполнить данную операцию. Может быть, <a href=":link">вернитесь на Дашборд</a>или обратитесь к администратору.',
     'bulk' => [
             'delete' =>
                 [
@@ -549,6 +559,71 @@ return [
         'license_seats'  => ':count лицензия на место|:count мест',
         'consumables'  => ':count расходный материал|:count расходников',
         'components'  => ':count компонент|:count компонентов',
-    ]
+    ],
+
+    'more_info' => 'Подробнее',
+    'quickscan_bulk_help' => 'Установка этого флажка приведет к изменению записи об активе с учетом нового местоположения. Если флажок не установлен, то местоположение будет просто отмечено в журнале аудита. Обратите внимание, что если этот актив выписан, то он не изменит местоположение человека, актива или места, на которое он выписан.',
+    'whoops' => 'Упс!',
+    'something_went_wrong' => 'Что-то пошло не так с вашим запросом.',
+    'close' => 'Закрыть',
+    'expires' => 'Истекает',
+    'map_fields'=> 'Сопоставьте поля :item_type',
+    'remaining_var' => ':count Осталось',
+    'label' => 'Метка',
+    'import_asset_tag_exists' => 'Актив с тегом актива :asset_tag уже существует и обновление не было запрошено. Изменения не были произведены.',
+    'countries_manually_entered_help' => 'Значения со звездочкой (*) были введены вручную и не соответствуют существующим значениям выпадающего списка ISO 3166',
+    'accessories_assigned' => 'Назначенные аксессуары',
+    'user_managed_passwords' => 'Управление паролями',
+    'user_managed_passwords_disallow' => 'Запретить пользователям управлять своими паролями',
+    'user_managed_passwords_allow' => 'Разрешить пользователям управлять своими паролями',
+    'from' => 'От',
+    'by' => 'Кем',
+
+// Add form placeholders here
+    'placeholders' => [
+        'notes'  => 'Добавить примечание',
+    ],
+
+    'breadcrumb_button_actions' => [
+        'edit_item' => 'Редактировать :name',
+        'checkout_item' => 'Выдать :name',
+        'checkin_item' => 'Вернуть :name',
+    ],
+
+    'skins' => [
+        'site_default' => 'Стандартный',
+        'default_blue' => 'Стандартный синий',
+        'blue_dark' => 'Синий (тёмный режим)',
+        'green' => 'Тёмно-зелёный',
+        'green_dark' => 'Зелёный (темный режим)',
+        'red' => 'Тёмно-красный',
+        'red_dark' => 'Красный (тёмный режим)',
+        'orange' => 'Тёмно-оранжевый',
+        'orange_dark' => 'Оранжевый (тёмный режим)',
+        'black' => 'Чёрный',
+        'black_dark' => 'Чёрный (тёмный режим)',
+        'purple' => 'Фиолетовый',
+        'purple_dark' => 'Фиолетовый (тёмный режим)',
+        'yellow' => 'Жёлтый',
+        'yellow_dark' => 'Жёлтый (тёмный режим)',
+        'high_contrast' => 'Высокий контраст',
+
+    ],
+
+    'select_all_none' => 'Выбрать/Отменить выбор всех',
+    'generic_model_not_found' => ':model не найден или у вас нет разрешения на доступ',
+    'deleted_models' => 'Удаленные модели активов',
+    'deleted_users' => 'Удаленные пользователи',
+    'cost_each' => ':amount каждого',
+    'remove_current_image' => 'Удалить текущее изображение :type',
+
+    'seeding' => [
+        'manufacturers' => [
+            'button' => 'Создать производителей',
+            'prompt' => 'У вас пока нет ни одного производителя. Хотите создать список распространённых производителей? (ЭТО ЗАМЕНИТ СУЩЕСТВУЮЩИХ ПРОИЗВОДИТЕЛЕЙ, включая тех, которые были удалены.)',
+            'success' => 'Список производителей создан',
+            'error' => 'Не удалось создать список производителей. Производитель уже существует, и создание списка перезапишет его.|Не удалось создать список производителей. :count производителей уже существуют, и создание списка перезапишет их.',
+        ],
+    ],
 
 ];
diff --git a/resources/lang/ru-RU/localizations.php b/resources/lang/ru-RU/localizations.php
index 38dce0ea74..54cef61baa 100644
--- a/resources/lang/ru-RU/localizations.php
+++ b/resources/lang/ru-RU/localizations.php
@@ -2,7 +2,7 @@
 
 return [
 
-    'select_language' => 'Выберите язык',
+    'select_language' => 'Select a Language',
     'languages' => [
         'en-US'=> 'Английский, США',
         'en-GB'=> 'Английский, Великобритания',
@@ -40,7 +40,9 @@ return [
         'ms-MY'=> 'Малайский',
         'mi-NZ'=> 'Маори',
         'mn-MN'=> 'Монгольский',
-        'no-NO'=> 'Норвежский',
+        'nb-NO'=> 'Норвежский Букмол',
+        'om-ET' => 'Oromo (Ethiopian)',
+        //'nn-NO'=> 'Norwegian Nynorsk',
         'fa-IR'=> 'Персидский',
         'pl-PL'=> 'Польский',
         'pt-PT'=> 'Португальский',
@@ -66,7 +68,7 @@ return [
         'zu-ZA'=> 'Зулу',
     ],
 
-    'select_country' => 'Выберите страну',
+    'select_country' => 'Select a Country',
     
     'countries' => [
         'AC'=>'Остров Вознесения',
@@ -133,6 +135,7 @@ return [
         'EC'=>'Ecuador',
         'EE'=>'Эстония',
         'EG'=>'Египет',
+        'GB-ENG'=>'Англия',
         'ER'=>'Эритрея',
         'ES'=>'Испания',
         'ET'=>'Ethiopia',
@@ -231,6 +234,7 @@ return [
         'NG'=>'Nigeria',
         'NI'=>'Nicaragua',
         'NL'=>'Нидерланды',
+        'GB-NIR' => 'Северная Ирландия',
         'NO'=>'Норвегия',
         'NP'=>'Непал',
         'NR'=>'Nauru',
@@ -258,7 +262,7 @@ return [
         'RU'=>'Российская Федерация',
         'RW'=>'Руанда',
         'SA'=>'Саудовская Аравия',
-        'UK'=>'Шотландия',
+        'GB-SCT'=>'Шотландия',
         'SB'=>'Соломоновы острова',
         'SC'=>'Сейшелы',
         'SS'=>'Южный Судан',
@@ -310,6 +314,7 @@ return [
         'VI'=>'Виргинские острова (США)',
         'VN'=>'Viet Nam',
         'VU'=>'Vanuatu',
+        'GB-WLS' =>'Уэльс',
         'WF'=>'Уоллис и Футуна',
         'WS'=>'Samoa',
         'YE'=>'Йемен',
diff --git a/resources/lang/ru-RU/mail.php b/resources/lang/ru-RU/mail.php
index 7f32f35d9f..7713963aec 100644
--- a/resources/lang/ru-RU/mail.php
+++ b/resources/lang/ru-RU/mail.php
@@ -23,24 +23,25 @@ return [
     'Item_Requested' => 'Предмет запрошен',
     'License_Checkin_Notification' => 'Лицензия выдана',
     'License_Checkout_Notification' => 'Лицензия заблокирована',
+    'license_for'   => 'License for',
     'Low_Inventory_Report' => 'Отчет о заканчивающихся предметах',
     'a_user_canceled' => 'Пользователь отменил запрос элемента на веб-сайте',
     'a_user_requested' => 'Пользователь запросил элемент на веб-сайте',
     'acceptance_asset_accepted' => 'Пользователь принял элемент',
     'acceptance_asset_declined' => 'Пользователь отклонил элемент',
-    'accessory_name' => 'Аксессуар:',
-    'additional_notes' => 'Дополнительные Примечания:',
+    'accessory_name' => 'Имя аксессуара',
+    'additional_notes' => 'Дополнительные Примечания',
     'admin_has_created' => 'Администратор создал аккаунт для вас на :web.',
-    'asset' => 'Актив:',
-    'asset_name' => 'Имя актива:',
+    'asset' => 'Актив',
+    'asset_name' => 'Имя актива',
     'asset_requested' => 'Актив запрошен',
     'asset_tag' => 'Тег актива',
     'assets_warrantee_alert' => 'Имеется :count актив, гарантия на который истечет в следующ(ие/ий) :threshold дней/день.|Имеется :count активов, гарантия на которые истечет в следующ(ие/ий) :threshold дней/день.',
     'assigned_to' => 'Выдано',
     'best_regards' => 'С наилучшими пожеланиями,',
-    'canceled' => 'Отменен:',
-    'checkin_date' => 'Дата возврата:',
-    'checkout_date' => 'Дата выдачи:',
+    'canceled' => 'Отменен',
+    'checkin_date' => 'Дата возврата',
+    'checkout_date' => 'Дата привязки',
     'checkedout_from' => 'Отключено от',
     'checkedin_from'  => 'Возврат из',
     'checked_into' => 'Выдано',
@@ -49,27 +50,30 @@ return [
     'click_to_confirm' => 'Пожалуйста, перейдите по ссылке, чтобы подтвердить ваш :web аккаунт:',
     'current_QTY' => 'Текущее количество',
     'days' => 'Дни',
-    'expecting_checkin_date' => 'Ожидаемая дата возврата:',
+    'expecting_checkin_date' => 'Ожидаемая дата возврата',
     'expires' => 'Истекает',
     'hello' => 'Привет',
     'hi' => 'Привет',
     'i_have_read' => 'Я прочитал и согласен с условиями использования, и получил этот предмет.',
     'inventory_report' => 'Отчет о запасах',
-    'item' => 'Предмет:',
+    'item' => 'Предмет',
+    'item_checked_reminder' => 'Напоминание о том, что в настоящее время у вас есть :count предметов, выданных вам, которые вы не приняли. Пожалуйста, нажмите на ссылку ниже, чтобы принять решение.',
     'license_expiring_alert' => 'Имеется :count лицензия, срок которой истечет в следующ(ие/ий) :threshold дней/день.|Имеются :count лицензии, срок которых истечет в следующ(ие/ий) :threshold дней/день.',
     'link_to_update_password' => 'Пожалуйста, перейдите по ссылке, чтобы обновить ваш :web пароль:',
-    'login' => 'Логин:',
+    'login' => 'Логин',
     'login_first_admin' => 'Чтобы войти в Snipe-It используйте следующие логин и пароль:',
     'low_inventory_alert' => 'Осталась :count штука, что или уже ниже минимального запаса, или скоро будет ниже.|Осталось :count штук, что или уже ниже минимального запаса, или скоро будет ниже.',
     'min_QTY' => 'Мин Кол-во',
     'name' => 'Название',
     'new_item_checked' => 'Новый предмет был выдан под вашем именем, подробности ниже.',
+    'new_item_checked_with_acceptance' => 'A new item has been checked out under your name that requires acceptance, details are below.',
+    'recent_item_checked' => 'An item was recently checked out under your name that requires acceptance, details are below.',
     'notes' => 'Заметки',
-    'password' => 'Пароль:',
+    'password' => 'Пароль',
     'password_reset' => 'Сброс пароля',
     'read_the_terms' => 'Пожалуйста, прочитайте условия использования ниже.',
     'read_the_terms_and_click' => 'Пожалуйста, ознакомьтесь с нижеприведёнными условиями использования ПО и нажмите на ссылку внизу, чтобы подтвердить, что и соглашаетесь с условиями использования и получили актив.',
-    'requested' => 'Запрошено:',
+    'requested' => 'Запрошено',
     'reset_link' => 'Ваша ссылка на сброс пароля',
     'reset_password' => 'Нажмите здесь, чтобы сбросить свой пароль:',
     'rights_reserved' => 'Все права защищены.',
@@ -86,8 +90,10 @@ return [
     'upcoming-audits' => ':count активов запланированы для аудита в течение :threshold дней.| :count активов будут запланированы для аудита через :threshold дней.',
     'user' => 'Пользователь',
     'username' => 'Имя пользователя',
+    'unaccepted_asset_reminder' => 'Reminder: You have Unaccepted Assets.',
     'welcome' => 'Добро пожаловать, :name',
     'welcome_to' => 'Добро пожаловать на :web!',
     'your_assets' => 'Посмотреть активы',
     'your_credentials' => 'Ваш логин и пароль от Snipe-IT',
+    'mail_sent' => 'Письмо успешно отправлено!',
 ];
diff --git a/resources/lang/ru-RU/table.php b/resources/lang/ru-RU/table.php
index 9566f58598..986073f166 100644
--- a/resources/lang/ru-RU/table.php
+++ b/resources/lang/ru-RU/table.php
@@ -6,6 +6,6 @@ return array(
     'action' 		        => 'Действие',
     'by'      		        => 'Кем',
     'item' 			        => 'Предмет',
-    'no_matching_records'   => 'No matching records found',
+    'no_matching_records'   => 'Подходящие записи не найдены',
 
 );
diff --git a/resources/lang/ru-RU/validation.php b/resources/lang/ru-RU/validation.php
index ed24e7bbda..09997b5e24 100644
--- a/resources/lang/ru-RU/validation.php
+++ b/resources/lang/ru-RU/validation.php
@@ -13,87 +13,150 @@ return [
     |
     */
 
-    'accepted'             => ':attribute должен быть принят.',
-    'active_url'           => ':attribute некорректный URL.',
-    'after'                => 'The :attribute должен быть после :date.',
-    'after_or_equal'       => 'Атрибут: должен быть датой после или равной: дата.',
-    'alpha'                => ':attribute может содержать только символы.',
-    'alpha_dash'           => ':attribute может содержать только буквы, цифры и тире.',
-    'alpha_num'            => ':attribute может содержать только буквы и цифры.',
-    'array'                => 'Атрибут: должен быть массивом.',
-    'before'               => ':attribute должен быть датой до :date.',
-    'before_or_equal'      => 'Атрибут: должен быть дата до или равна: дата.',
-    'between'              => [
-        'numeric' => ':attribute должен быть между :min - :max.',
-        'file'    => ':attribute должен быть между :min - :max килобайт.',
-        'string'  => ':attribute должен быть между :min - :max символов.',
-        'array'   => 'Атрибут: должен находиться между: min и: max элементами.',
+    'accepted' => 'Поле :attribute должно быть принято.',
+    'accepted_if' => 'Поле :attribute должно быть принято, когда :other равно :value.',
+    'active_url' => 'Поле :attribute должно быть действительным URL-адресом.',
+    'after' => 'Поле :attribute должно содержать дату после :date.',
+    'after_or_equal' => 'Поле :attribute должно содержать дату, которая позже или равна :date.',
+    'alpha' => 'Поле :attribute должно содержать только буквы.',
+    'alpha_dash' => 'Поле :attribute должно содержать только буквы, цифры, тире и знаки подчеркивания.',
+    'alpha_num' => 'Поле :attribute должно содержать только буквы и цифры.',
+    'array' => 'Поле :attribute должно быть массивом.',
+    'ascii' => 'Поле :attribute должно содержать только однобайтные буквенно-цифровые символы.',
+    'before' => 'Поле :attribute должно содержать дату до :date.',
+    'before_or_equal' => 'Дата в поле :attribute должна быть не позже :date.',
+    'between' => [
+        'array' => 'Поле :attribute должно быть между :min и :max элементов.',
+        'file' => 'Поле :attribute должно быть между :min и :max килобайт.',
+        'numeric' => 'Поле :attribute должно быть между :min и :max.',
+        'string' => 'Поле :attribute должно содержать от :min до :max символов.',
     ],
-    'boolean'              => ':attribute должен быть true или false.',
-    'confirmed'            => 'Подтверждение :attribute не совпадает.',
-    'date'                 => ':attribute неправильная дата.',
-    'date_format'          => ':attribute не совпадает с форматом :format.',
-    'different'            => ':attribute и :other должны быть разными.',
-    'digits'               => ':attribute должен содержать :digits цифр.',
-    'digits_between'       => ':attribute должно быть между :min и :max цифр.',
-    'dimensions'           => 'Атрибут: имеет недопустимые размеры изображения.',
-    'distinct'             => 'Поле атрибута: имеет двойное значение.',
-    'email'                => 'Неправильный формат :attribute.',
-    'exists'               => 'Выбранный :attribute неправильный.',
-    'file'                 => 'Атрибут: должен быть файлом.',
-    'filled'               => 'Поле атрибута: должно иметь значение.',
-    'image'                => ':attribute должен быть изображением.',
+    'boolean' => 'Поле :attribute должно быть true или false.',
+    'can' => 'Поле :attribute содержит недопустимое значение.',
+    'confirmed' => 'Подтверждение поля :attribute не совпадает.',
+    'contains' => 'В поле :attribute отсутствует обязательное значение.',
+    'current_password' => 'Неверный пароль.',
+    'date' => 'Поле :attribute должно содержать допустимую дату.',
+    'date_equals' => 'Поле :attribute должно содержать значение даты :date.',
+    'date_format' => 'Поле :attribute должно соответствовать формату :format.',
+    'decimal' => 'Поле :attribute должно иметь :decimal десятичных знаков.',
+    'declined' => 'Поле :attribute должно быть отклонено.',
+    'declined_if' => 'Поле :attribute должно быть отклонено, когда :other равно :value.',
+    'different' => 'Поле :attribute и :other должны различаться.',
+    'digits' => 'Поле :attribute должно содержать :digits цифр.',
+    'digits_between' => 'Поле :attribute должно содержать от :min до :max цифр.',
+    'dimensions' => 'Поле :attribute имеет неверные размеры изображения.',
+    'distinct' => 'Поле атрибута: имеет двойное значение.',
+    'doesnt_end_with' => 'Поле :attribute не должно заканчиваться одним из следующих значений: :values.',
+    'doesnt_start_with' => 'Поле :attribute не должно начинаться с одного из следующих значений: :values.',
+    'email' => 'Поле :attribute должно быть действительным адресом электронной почты.',
+    'ends_with' => 'Поле :attribute должно заканчиваться одним из следующих значений: :values.',
+    'enum' => 'Выбранный :attribute неправильный.',
+    'exists' => 'Выбранный :attribute неправильный.',
+    'extensions' => 'Поле :attribute должно иметь одно из следующих расширений: :values.',
+    'file' => 'Поле :attribute должно быть файлом.',
+    'filled' => 'Поле атрибута: должно иметь значение.',
+    'gt' => [
+        'array' => 'Поле :attribute должно иметь более :value элементов.',
+        'file' => 'Поле :attribute должно быть больше :value килобайт.',
+        'numeric' => 'Поле :attribute должно быть больше :value.',
+        'string' => 'Поле :attribute должно содержать более :value символов.',
+    ],
+    'gte' => [
+        'array' => 'Поле :attribute должно иметь :value или более элементов.',
+        'file' => 'Поле :attribute должно быть больше или равно :value килобайт.',
+        'numeric' => 'Поле :attribute должно быть больше или равно :value.',
+        'string' => 'Поле :attribute должно содержать :value и более символов.',
+    ],
+    'hex_color' => 'Поле :attribute должно быть допустимым шестнадцатеричным цветом.',
+    'image' => 'Поле :attribute должно быть изображением.',
     'import_field_empty'    => 'Значение :fieldname не может быть пустым.',
-    'in'                   => 'Выбранный :attribute неправильный.',
-    'in_array'             => 'Поле: атрибут не существует в: other.',
-    'integer'              => ':attribute должно быть числом.',
-    'ip'                   => ':attribute должно быть IP адресом.',
-    'ipv4'                 => 'Атрибут: должен быть действительным адресом IPv4.',
-    'ipv6'                 => 'Атрибут: должен быть действительным адресом IPv6.',
-    'is_unique_department' => ':attribute должен быть уникальным для этого местоположения компании',
-    'json'                 => 'Атрибут: должен быть действительной строкой JSON.',
-    'max'                  => [
-        'numeric' => ':attribute не должно быть больше :max.',
-        'file'    => ':attribute не должен превышать :max килобайт.',
-        'string'  => ':attribute не должно превышать :max символов.',
-        'array'   => 'Атрибут: может быть не больше: max элементов.',
+    'in' => 'Выбранный :attribute неправильный.',
+    'in_array' => 'Поле :attribute должно существовать в :other.',
+    'integer' => 'Поле :attribute должно быть целым числом.',
+    'ip' => 'Поле :attribute должно быть действительным IP-адресом.',
+    'ipv4' => 'Поле :attribute должно быть допустимым IPv4 адресом.',
+    'ipv6' => 'Поле :attribute должно быть допустимым IPv6 адресом.',
+    'json' => 'Поле :attribute должно быть действительной строкой JSON.',
+    'list' => 'Поле :attribute должно быть списком.',
+    'lowercase' => 'Поле :attribute должно быть указано строчными буквами.',
+    'lt' => [
+        'array' => 'Поле :attribute должно иметь менее :value элементов.',
+        'file' => 'Поле :attribute должно быть меньше :value килобайт.',
+        'numeric' => 'Поле :attribute должно быть меньше :value.',
+        'string' => 'Поле :attribute должно содержать менее :value символов.',
     ],
-    'mimes'                => ':attribute тип файла должен быть: :values.',
-    'mimetypes'            => 'Атрибут: должен быть файл типа:: values.',
-    'min'                  => [
-        'numeric' => ':attribute должно быть не менее :min.',
-        'file'    => ':attribute должно быть не менее :min килобайт.',
-        'string'  => ':attribute должно быть не менее :min символов.',
-        'array'   => 'Атрибут: должен содержать не менее: мин.',
+    'lte' => [
+        'array' => 'Поле :attribute не должно содержать более :value элементов.',
+        'file' => 'Поле :attribute должно быть меньше или равно :value килобайт.',
+        'numeric' => 'Поле :attribute должно быть меньше или равно :value.',
+        'string' => 'Поле :attribute должно содержать :value или менее символов.',
     ],
-    'starts_with'          => ':attribute должен начинаться с одного из следующих значений: :values.',
-    'ends_with'            => 'Атрибут :attribute должен заканчиваться одним из следующих значений: :values.',
+    'mac_address' => 'Поле :attribute должно быть действительным MAC-адресом.',
+    'max' => [
+        'array' => 'Поле :attribute не должно содержать более :value элементов.',
+        'file' => 'Поле :attribute не должно быть больше :max килобайт.',
+        'numeric' => 'Поле :attribute не должно быть больше :max.',
+        'string' => 'Поле :attribute должно быть не длиннее :max символов.',
+    ],
+    'max_digits' => 'Поле :attribute должно содержать не более :max цифр.',
+    'mimes' => 'Поле :attribute должно быть файлом типа: :values.',
+    'mimetypes' => 'Поле :attribute должно быть файлом типа: :values.',
+    'min' => [
+        'array' => 'Поле :attribute должно содержать не менее :min элементов.',
+        'file' => 'Поле :attribute должно быть не менее :min килобайт.',
+        'numeric' => 'Поле :attribute должно быть не менее :min.',
+        'string' => 'Поле :attribute должно содержать не менее :min символов.',
+    ],
+    'min_digits' => 'Поле :attribute должно содержать не менее :min цифр.',
+    'missing' => 'Поле :attribute должно отсутствовать.',
+    'missing_if' => 'Поле :attribute должно быть пропущено, когда :other равно :value.',
+    'missing_unless' => 'Поле :attribute должно отсутствовать, если только :other не равно :value.',
+    'missing_with' => 'Поле :attribute должно быть пропущено, если присутствует :values.',
+    'missing_with_all' => 'Поле :attribute должно быть пропущено, если присутствуют :values.',
+    'multiple_of' => 'Поле :attribute должно быть кратно :value.',
+    'not_in' => 'Выбранный :attribute неправильный.',
+    'not_regex' => 'Поле :attribute имеет неверный формат.',
+    'numeric' => 'Поле :attribute должно быть числом.',
+    'password' => [
+        'letters' => 'Поле :attribute должно содержать хотя бы одну букву.',
+        'mixed' => 'Поле :attribute должно содержать хотя бы одну заглавную букву и одну строчную букву.',
+        'numbers' => 'Поле :attribute должно содержать хотя бы одно число.',
+        'symbols' => 'Поле :attribute должно содержать хотя бы один символ.',
+        'uncompromised' => 'Данный :attribute появился при утечке данных. Пожалуйста, выберите другой :attribute.',
+    ],
+    'percent'       => 'Минимальная амортизация должна быть в пределах от 0 до 100, если тип амортизации — процентный.',
 
-    'not_in'               => 'Выбранный :attribute неправильный.',
-    'numeric'              => ':attribute должно быть числом.',
-    'present'              => 'Поле атрибута: должно присутствовать.',
-    'valid_regex'          => 'Это не верно составленное регулярное выражение. ',
-    'regex'                => 'Неправильный формат :attribute.',
-    'required'             => ':attribute обязательное поле.',
-    'required_if'          => ':attribute обязательное поле, когда :other :value.',
-    'required_unless'      => 'Поле атрибута: требуется, если: other находится в: значения.',
-    'required_with'        => ':attribute обязательное поле, когда присутствует :values.',
-    'required_with_all'    => 'Поле атрибута: требуется, когда: есть значения.',
-    'required_without'     => ':attribute обязательное поле, когда отсутствует :values.',
+    'present' => 'Поле атрибута: должно присутствовать.',
+    'present_if' => 'Поле :attribute должно присутствовать, когда :other равно :value.',
+    'present_unless' => 'Поле :attribute должно присутствовать, если только :other не равно :value.',
+    'present_with' => 'Поле :attribute должно присутствовать, если присутствует :values.',
+    'present_with_all' => 'Поле :attribute должно присутствовать при наличии :values.',
+    'prohibited' => 'Поле :attribute запрещено.',
+    'prohibited_if' => 'Поле :attribute запрещено если :other равно :value.',
+    'prohibited_unless' => 'Поле :attribute запрещено, если :other не находится в :values.',
+    'prohibits' => 'Поле :attribute запрещает присутствие :other.',
+    'regex' => 'Поле :attribute имеет неверный формат.',
+    'required' => ':attribute обязательное поле.',
+    'required_array_keys' => 'Поле :attribute должно содержать записи для: :values.',
+    'required_if' => ':attribute обязательное поле, когда :other :value.',
+    'required_if_accepted' => 'Поле :attribute является обязательным, если :other принят.',
+    'required_if_declined' => 'Поле :attribute является обязательным, если :other отклонено.',
+    'required_unless' => 'Поле атрибута: требуется, если: other находится в: значения.',
+    'required_with' => ':attribute обязательное поле, когда присутствует :values.',
+    'required_with_all' => 'Поле :attribute является обязательным, если присутствуют :values.',
+    'required_without' => ':attribute обязательное поле, когда отсутствует :values.',
     'required_without_all' => 'Поле атрибута: требуется, если ни один из: значений не присутствует.',
-    'same'                 => ':attribute и :other должны совпадать.',
-    'size'                 => [
-        'numeric' => ':attribute должен быть :size.',
-        'file'    => ':attribute должен быть :size килобайт.',
-        'string'  => ':attribute должен быть :size символов.',
-        'array'   => 'Атрибут: должен содержать: элементы размера.',
+    'same' => 'Поле :attribute должно соответствовать :other.',
+    'size' => [
+        'array' => 'Поле :attribute должно содержать :size элементов.',
+        'file' => 'Поле :attribute должно быть :size килобайт.',
+        'numeric' => 'Поле :attribute должно быть :size.',
+        'string' => 'Поле :attribute должно содержать :size символов.',
     ],
+    'starts_with' => 'Поле :attribute должно начинаться с одного из следующих значений: :values.',
     'string'               => 'Атрибут: должен быть строкой.',
-    'timezone'             => 'Атрибут: должен быть допустимой зоной.',
     'two_column_unique_undeleted' => 'Поле :attribute должно быть уникальным для :table1 и :table2. ',
-    'unique'               => ':attribute уже занят.',
-    'uploaded'             => 'Атрибут: не удалось загрузить.',
-    'url'                  => 'Неправильный формат :attribute.',
     'unique_undeleted'     => 'Свойство :attribute должно быть уникальным.',
     'non_circular'         => ':attribute не должен создавать циклическую ссылку.',
     'not_array'            => ':attribute не может быть массивом.',
@@ -102,11 +165,14 @@ return [
     'numbers'              => 'Пароль должен содержать хотя бы одну цифру.',
     'case_diff'            => 'Пароль должен использовать смешанный регистр.',
     'symbols'              => 'Пароль должен содержать символы.',
-    'gte'                  => [
-        'numeric'          => 'Значение не может быть отрицательным'
-    ],
-    'checkboxes'           => ':attribute содержит недопустимые параметры.',
-    'radio_buttons'        => ':attribute не верно.',
+    'timezone' => 'Поле :attribute должно содержать действительный часовой пояс.',
+    'unique' => ':attribute уже занят.',
+    'uploaded' => 'Атрибут: не удалось загрузить.',
+    'uppercase' => 'Поле :attribute должно быть указано заглавными буквами.',
+    'url' => 'Поле :attribute должно быть действительным URL-адресом.',
+    'ulid' => 'Поле :attribute должно быть корректным значением UUID.',
+    'uuid' => 'Поле :attribute должно быть корректным значением UUID.',
+    'fmcs_location' => 'Full multiple company support and location scoping is enabled in the Admin Settings, and the selected location and selected company are not compatible.',
 
 
     /*
@@ -120,16 +186,22 @@ return [
     |
     */
 
+    'email_array'      => 'Один или несколько адресов эл. почты являются недействительным.',
+    'checkboxes'           => ':attribute содержит недопустимые параметры.',
+    'radio_buttons'        => ':attribute не верно.',
+    
     'custom' => [
         'alpha_space' => 'Поле атрибута: содержит символ, который не разрешен.',
-        'email_array'      => 'Один или несколько адресов электронной почты недействительны.',
+
         'hashed_pass'      => 'Ваш текущий пароль неверен',
         'dumbpwd'          => 'Этот пароль слишком распространен.',
         'statuslabel_type' => 'Вы должны выбрать допустимый тип метки статуса',
+        'custom_field_not_found'          => 'Похоже, это поле не существует. Пожалуйста, проверьте еще раз имена ваших пользовательских полей.',
+        'custom_field_not_found_on_model' => 'Это поле существует, но недоступно в наборе полей этой модели актива.',
 
         // date_format validation with slightly less stupid messages. It duplicates a lot, but it gets the job done :(
-        // We use this because the default error message for date_format is reflects php Y-m-d, which non-PHP
-        // people won't know how to format. 
+        // We use this because the default error message for date_format reflects php Y-m-d, which non-PHP
+        // people won't know how to format.
         'purchase_date.date_format'     => ':attribute должен быть допустимой датой в формате YYYY-MM-DD',
         'last_audit_date.date_format'   =>  ':attribute должен быть допустимой датой в формате YYYY-MM-DD hh:mm:ss',
         'expiration_date.date_format'   =>  ':attribute должен быть допустимой датой в формате YYYY-MM-DD',
@@ -137,9 +209,15 @@ return [
         'expected_checkin.date_format'  =>  ':attribute должен быть допустимой датой в формате YYYY-MM-DD',
         'start_date.date_format'        =>  ':attribute должен быть допустимой датой в формате YYYY-MM-DD',
         'end_date.date_format'          =>  ':attribute должен быть допустимой датой в формате YYYY-MM-DD',
+        'invalid_value_in_field' => 'Недопустимое значение в этом поле',
 
-    ],
+        'ldap_username_field' => [
+            'not_in' =>         '<code>sAMAccountName</code> (mixed case) will likely not work. You should use <code>samaccountname</code> (lowercase) instead.'
+        ],
+        'ldap_auth_filter_query' => ['not_in' => '<code>uid=samaccountname</code> is probably not a valid auth filter. You probably want <code>uid=</code> '],
+        'ldap_filter' => ['regex' => 'This value should probably not be wrapped in parentheses.'],
 
+        ],
     /*
     |--------------------------------------------------------------------------
     | Custom Validation Attributes
@@ -155,8 +233,16 @@ return [
 
     /*
     |--------------------------------------------------------------------------
-    | Generic Validation Messages
+    | Generic Validation Messages - we use these in the jquery validation where we don't have
+    | access to the :attribute
     |--------------------------------------------------------------------------
     */
-    'invalid_value_in_field' => 'Недопустимое значение в этом поле',
+
+    'generic' => [
+        'invalid_value_in_field' => 'Недопустимое значение в этом поле',
+        'required' => 'Это поле является обязательным',
+        'email' => 'Пожалуйста, введите действительный адрес электронной почты',
+    ],
+
+
 ];
diff --git a/resources/lang/si-LK/account/general.php b/resources/lang/si-LK/account/general.php
index 1a9e2c03b8..7f9e2f848e 100644
--- a/resources/lang/si-LK/account/general.php
+++ b/resources/lang/si-LK/account/general.php
@@ -2,10 +2,16 @@
 
 return array(
     'personal_api_keys' => 'Personal API Keys',
+    'personal_access_token' => 'Personal Access Token',
+    'personal_api_keys_success' => 'Personal API Key :key created sucessfully',
+    'here_is_api_key' => 'Here is your new personal access token. This is the only time it will be shown so do not lose it! You may now use this token to make API requests.',
     'api_key_warning' => 'When generating an API token, be sure to copy it down immediately as they will not be visible to you again.',
     'api_base_url' => 'Your API base url is located at:',
     'api_base_url_endpoint' => '/&lt;endpoint&gt;',
     'api_token_expiration_time' => 'API tokens are set to expire in:',
     'api_reference' => 'Please check the <a href="https://snipe-it.readme.io/reference" target="_blank">API reference</a> to find specific API endpoints and additional API documentation.',
     'profile_updated' => 'Account successfully updated',
+    'no_tokens' => 'You have not created any personal access tokens.',
+    'enable_sounds' => 'Enable sound effects',
+    'enable_confetti' => 'Enable confetti effects',
 );
diff --git a/resources/lang/si-LK/admin/accessories/message.php b/resources/lang/si-LK/admin/accessories/message.php
index c688d5e03d..f60d41957b 100644
--- a/resources/lang/si-LK/admin/accessories/message.php
+++ b/resources/lang/si-LK/admin/accessories/message.php
@@ -26,7 +26,11 @@ return array(
         'error'   		=> 'Accessory was not checked out, please try again',
         'success' 		=> 'Accessory checked out successfully.',
         'unavailable'   => 'Accessory is not available for checkout. Check quantity available',
-        'user_does_not_exist' => 'That user is invalid. Please try again.'
+        'user_does_not_exist' => 'That user is invalid. Please try again.',
+         'checkout_qty' => array(
+            'lte'  => 'There is currently only one available accessory of this type, and you are trying to check out :checkout_qty. Please adjust the checkout quantity or the total stock of this accessory and try again.|There are :number_currently_remaining total available accessories, and you are trying to check out :checkout_qty. Please adjust the checkout quantity or the total stock of this accessory and try again.',
+            ),
+           
     ),
 
     'checkin' => array(
diff --git a/resources/lang/si-LK/admin/accessories/table.php b/resources/lang/si-LK/admin/accessories/table.php
index e02d9f22e4..80df687161 100644
--- a/resources/lang/si-LK/admin/accessories/table.php
+++ b/resources/lang/si-LK/admin/accessories/table.php
@@ -6,6 +6,4 @@ return array(
     'id'      					=> 'ID',
     'require_acceptance'      	=> 'Acceptance',
     'title'      				=> 'Accessory Name',
-
-
 );
diff --git a/resources/lang/si-LK/admin/components/message.php b/resources/lang/si-LK/admin/components/message.php
index 0a7dd8d954..ec39dc4178 100644
--- a/resources/lang/si-LK/admin/components/message.php
+++ b/resources/lang/si-LK/admin/components/message.php
@@ -17,7 +17,8 @@ return array(
     'delete' => array(
         'confirm'   => 'Are you sure you wish to delete this component?',
         'error'   => 'There was an issue deleting the component. Please try again.',
-        'success' => 'The component was deleted successfully.'
+        'success' => 'The component was deleted successfully.',
+        'error_qty'   => 'Some components of this type are still checked out. Please check them in and try again.',
     ),
 
      'checkout' => array(
diff --git a/resources/lang/si-LK/admin/consumables/general.php b/resources/lang/si-LK/admin/consumables/general.php
index fb8c28443b..e5c8f6d256 100644
--- a/resources/lang/si-LK/admin/consumables/general.php
+++ b/resources/lang/si-LK/admin/consumables/general.php
@@ -8,4 +8,5 @@ return array(
     'remaining' 			            => 'Remaining',
     'total' 			                => 'එකතුව',
     'update'                            => 'Update Consumable',
+    'inventory_warning'                 => 'The inventory of this consumable is below the minimum amount of :min_count',
 );
diff --git a/resources/lang/si-LK/admin/consumables/message.php b/resources/lang/si-LK/admin/consumables/message.php
index c0d0aa7f68..e2591503bf 100644
--- a/resources/lang/si-LK/admin/consumables/message.php
+++ b/resources/lang/si-LK/admin/consumables/message.php
@@ -2,6 +2,7 @@
 
 return array(
 
+    'invalid_category_type' => 'The category must be a consumable category.',
     'does_not_exist' => 'Consumable does not exist.',
 
     'create' => array(
diff --git a/resources/lang/si-LK/admin/custom_fields/general.php b/resources/lang/si-LK/admin/custom_fields/general.php
index e3c21d1f0c..c9ae61c963 100644
--- a/resources/lang/si-LK/admin/custom_fields/general.php
+++ b/resources/lang/si-LK/admin/custom_fields/general.php
@@ -35,7 +35,7 @@ return [
     'create_field_title' => 'Create a new custom field',
     'value_encrypted'      	        => 'The value of this field is encrypted in the database. Only admin users will be able to view the decrypted value',
     'show_in_email'     => 'Include the value of this field in checkout emails sent to the user? Encrypted fields cannot be included in emails',
-    'show_in_email_short'     => 'Include in emails.',
+    'show_in_email_short' => 'Include in emails',
     'help_text' => 'Help Text',
     'help_text_description' => 'This is optional text that will appear below the form elements while editing an asset to provide context on the field.',
     'about_custom_fields_title' => 'About Custom Fields',
@@ -57,5 +57,8 @@ return [
     'show_in_requestable_list_short' => 'Show in requestable assets list',
     'show_in_requestable_list' => 'Show value in requestable assets list. Encrypted fields will not be shown',
     'encrypted_options' => 'This field is encrypted, so some display options will not be available.',
+    'display_checkin' => 'Display in checkin forms',
+    'display_checkout' => 'Display in checkout forms',
+    'display_audit' => 'Display in audit forms',
 
 ];
diff --git a/resources/lang/si-LK/admin/custom_fields/message.php b/resources/lang/si-LK/admin/custom_fields/message.php
index 43ba821821..6442359b7f 100644
--- a/resources/lang/si-LK/admin/custom_fields/message.php
+++ b/resources/lang/si-LK/admin/custom_fields/message.php
@@ -5,6 +5,7 @@ return array(
     'field' => array(
         'invalid'   => 'That field does not exist.',
         'already_added'   => 'Field already added',
+        'none_selected'   => 'No field selected',
 
         'create' => array(
             'error'   => 'Field was not created, please try again.',
diff --git a/resources/lang/si-LK/admin/depreciations/general.php b/resources/lang/si-LK/admin/depreciations/general.php
index 1a5666f9dc..90246e9cd8 100644
--- a/resources/lang/si-LK/admin/depreciations/general.php
+++ b/resources/lang/si-LK/admin/depreciations/general.php
@@ -13,4 +13,8 @@ return [
     'no_depreciations_warning'               => '<strong>Warning: </strong>
                       You do not currently have any depreciations set up.
                       Please set up at least one depreciation to view the depreciation report.',
+    'depreciation_method'                   => 'Depreciation Report',
+    'linear_depreciation'                   => 'Linear (Default)',
+    'half_1'                                => 'Half-year convention, always applied',
+    'half_2'                                => 'Half-year convention, applied with condition',
 ];
diff --git a/resources/lang/si-LK/admin/hardware/form.php b/resources/lang/si-LK/admin/hardware/form.php
index a3555a96d2..2ba04ea5ea 100644
--- a/resources/lang/si-LK/admin/hardware/form.php
+++ b/resources/lang/si-LK/admin/hardware/form.php
@@ -55,8 +55,11 @@ return [
     'asset_location_update_default' => 'Update only default location',
     'asset_location_update_actual' => 'Update only actual location',
     'asset_not_deployable' => 'That asset status is not deployable. This asset cannot be checked out.',
-    'asset_deployable' => 'That status is deployable. This asset can be checked out.',
+    'asset_not_deployable_checkin' => 'That asset status is not deployable. Using this status label will checkin the asset.',
+    'asset_deployable' => 'This asset can be checked out.',
     'processing_spinner' => 'Processing... (This might take a bit of time on large files)',
+    'processing' => 'Processing... ',
     'optional_infos'  => 'Optional Information',
-    'order_details'   => 'Order Related Information'
+    'order_details'   => 'Order Related Information',
+    'calc_eol'    => 'If nulling the EOL date, use automatic EOL calculation based on the purchase date and EOL rate.',
 ];
diff --git a/resources/lang/si-LK/admin/hardware/general.php b/resources/lang/si-LK/admin/hardware/general.php
index 34ac4e63ee..6740476574 100644
--- a/resources/lang/si-LK/admin/hardware/general.php
+++ b/resources/lang/si-LK/admin/hardware/general.php
@@ -5,8 +5,8 @@ return [
     'about_assets_text'            => 'Assets are items tracked by serial number or asset tag.  They tend to be higher value items where identifying a specific item matters.',
     'archived'  				=> 'Archived',
     'asset'  					=> 'Asset',
-    'bulk_checkout'             => 'Checkout Assets',
-    'bulk_checkin'              => 'Checkin Assets',
+    'bulk_checkout'             => 'Bulk Checkout',
+    'bulk_checkin'              => 'Bulk Checkin',
     'checkin'  					=> 'Checkin Asset',
     'checkout'  				=> 'Checkout Asset',
     'clone'  					=> 'Clone Asset',
@@ -27,8 +27,7 @@ return [
     'undeployable_tooltip'  	=> 'This asset has a status label that is undeployable and cannot be checked out at this time.',
     'view'  					=> 'View Asset',
     'csv_error' => 'You have an error in your CSV file:',
-    'import_text' => '<p>Upload a CSV that contains asset history. The assets and users MUST already exist in the system, or they will be skipped. Matching assets for history import happens against the asset tag. We will try to find a matching user based on the user\'s name you provide, and the criteria you select below. If you do not select any criteria below, it will simply try to match on the username format you configured in the <code>Admin &gt; General Settings</code>.</p><p>Fields included in the CSV must match the headers: <strong>Asset Tag, Name, Checkout Date, Checkin Date</strong>. Any additional fields will be ignored. </p><p>Checkin Date: blank or future checkin dates will checkout items to associated user.  Excluding the Checkin Date column will create a checkin date with todays date.</p>
-    ',
+    'import_text' => '<p>Upload a CSV that contains asset history. The assets and users MUST already exist in the system, or they will be skipped. Matching assets for history import happens against the asset tag. We will try to find a matching user based on the user\'s name you provide, and the criteria you select below. If you do not select any criteria below, it will simply try to match on the username format you configured in the <code>Admin &gt; General Settings</code>.</p><p>Fields included in the CSV must match the headers: <strong>Asset Tag, Name, Checkout Date, Checkin Date</strong>. Any additional fields will be ignored. </p><p>Checkin Date: blank or future checkin dates will checkout items to associated user.  Excluding the Checkin Date column will create a checkin date with todays date.</p>    ',
     'csv_import_match_f-l' => 'Try to match users by <strong>firstname.lastname</strong> (<code>jane.smith</code>) format',
     'csv_import_match_initial_last' => 'Try to match users by <strong>first initial last name</strong> (<code>jsmith</code>) format',
     'csv_import_match_first' => 'Try to match users by <strong>first name</strong> (<code>jane</code>) format',
diff --git a/resources/lang/si-LK/admin/hardware/message.php b/resources/lang/si-LK/admin/hardware/message.php
index 32698b1c07..c19bc63647 100644
--- a/resources/lang/si-LK/admin/hardware/message.php
+++ b/resources/lang/si-LK/admin/hardware/message.php
@@ -2,19 +2,23 @@
 
 return [
 
-    'undeployable' 		=> '<strong>Warning: </strong> This asset has been marked as currently undeployable.
-                        If this status has changed, please update the asset status.',
-    'does_not_exist' 	=> 'Asset does not exist.',
-    'does_not_exist_var'=> 'Asset with tag :asset_tag not found.',
-    'no_tag' 	        => 'No asset tag provided.',
+    'undeployable' 		 => '<strong>Warning: </strong> This asset has been marked as currently undeployable. If this status has changed, please update the asset status.',
+    'does_not_exist' 	 => 'Asset does not exist.',
+    'does_not_exist_var' => 'Asset with tag :asset_tag not found.',
+    'no_tag' 	         => 'No asset tag provided.',
     'does_not_exist_or_not_requestable' => 'That asset does not exist or is not requestable.',
-    'assoc_users'	 	=> 'This asset is currently checked out to a user and cannot be deleted. Please check the asset in first, and then try deleting again. ',
+    'assoc_users'	 	 => 'This asset is currently checked out to a user and cannot be deleted. Please check the asset in first, and then try deleting again. ',
     'warning_audit_date_mismatch' 	=> 'This asset\'s next audit date (:next_audit_date) is before the last audit date (:last_audit_date). Please update the next audit date.',
+    'labels_generated'   => 'Labels were successfully generated.',
+    'error_generating_labels' => 'Error while generating labels.',
+    'no_assets_selected' => 'No assets selected.',
 
     'create' => [
         'error'   		=> 'Asset was not created, please try again. :(',
         'success' 		=> 'Asset created successfully. :)',
         'success_linked' => 'Asset with tag :tag was created successfully. <strong><a href=":link" style="color: white;">Click here to view</a></strong>.',
+        'multi_success_linked' => 'Asset with tag :links was created successfully.|:count assets were created succesfully. :links.',
+        'partial_failure' => 'An asset was unable to be created. Reason: :failures|:count assets were unable to be created. Reasons: :failures',
     ],
 
     'update' => [
@@ -52,20 +56,24 @@ return [
     ],
 
     'import' => [
+        'import_button'         => 'Process Import',
         'error'                 => 'Some items did not import correctly.',
         'errorDetail'           => 'The following Items were not imported because of errors.',
         'success'               => 'Your file has been imported',
         'file_delete_success'   => 'Your file has been been successfully deleted',
         'file_delete_error'      => 'The file was unable to be deleted',
         'file_missing' => 'The file selected is missing',
+        'file_already_deleted' => 'The file selected was already deleted',
         'header_row_has_malformed_characters' => 'One or more attributes in the header row contain malformed UTF-8 characters',
         'content_row_has_malformed_characters' => 'One or more attributes in the first row of content contain malformed UTF-8 characters',
+        'transliterate_failure' => 'Transliteration from :encoding to UTF-8 failed due to invalid characters in input'
     ],
 
 
     'delete' => [
         'confirm'   	=> 'Are you sure you wish to delete this asset?',
         'error'   		=> 'There was an issue deleting the asset. Please try again.',
+        'assigned_to_error' => '{1}Asset Tag: :asset_tag is currently checked out. Check in this device before deletion.|[2,*]Asset Tags: :asset_tag are currently checked out. Check in these devices before deletion.',
         'nothing_updated'   => 'No assets were selected, so nothing was deleted.',
         'success' 		=> 'The asset was deleted successfully.',
     ],
@@ -78,6 +86,11 @@ return [
         'no_assets_selected' => 'You must select at least one asset from the list',
     ],
 
+    'multi-checkout' => [
+        'error'   => 'Asset was not checked out, please try again|Assets were not checked out, please try again',
+        'success' => 'Asset checked out successfully.|Assets checked out successfully.',
+    ],
+
     'checkin' => [
         'error'   		=> 'Asset was not checked in, please try again',
         'success' 		=> 'Asset checked in successfully.',
@@ -87,9 +100,10 @@ return [
     ],
 
     'requests' => [
-        'error'   		=> 'Asset was not requested, please try again',
-        'success' 		=> 'Asset requested successfully.',
-        'canceled'      => 'Checkout request successfully canceled',
+        'error'   		=> 'Request was not successful, please try again.',
+        'success' 		=> 'Request successfully submitted.',
+        'canceled'      => 'Request successfully canceled.',
+        'cancel'        => 'Cancel this item request',
     ],
 
 ];
diff --git a/resources/lang/si-LK/admin/hardware/table.php b/resources/lang/si-LK/admin/hardware/table.php
index a01c7d8cf3..efc7ebf550 100644
--- a/resources/lang/si-LK/admin/hardware/table.php
+++ b/resources/lang/si-LK/admin/hardware/table.php
@@ -25,7 +25,6 @@ return [
     'image'		    => 'Device Image',
     'days_without_acceptance' => 'Days Without Acceptance',
     'monthly_depreciation' => 'Monthly Depreciation',
-    'assigned_to'    => 'Assigned To',
     'requesting_user' => 'Requesting User',
     'requested_date' => 'Requested Date',
     'changed'       => 'Changed',
diff --git a/resources/lang/si-LK/admin/kits/general.php b/resources/lang/si-LK/admin/kits/general.php
index f57fb645c4..2b5c2d9cd0 100644
--- a/resources/lang/si-LK/admin/kits/general.php
+++ b/resources/lang/si-LK/admin/kits/general.php
@@ -47,4 +47,5 @@ return [
     'kit_deleted'                       => 'Kit was successfully deleted',
     'kit_model_updated'                 => 'Model was successfully updated',
     'kit_model_detached'                => 'Model was successfully detached',
+    'model_already_attached'            => 'Model already attached to kit',
 ];
diff --git a/resources/lang/si-LK/admin/licenses/general.php b/resources/lang/si-LK/admin/licenses/general.php
index 79b69a3d94..b39030afd4 100644
--- a/resources/lang/si-LK/admin/licenses/general.php
+++ b/resources/lang/si-LK/admin/licenses/general.php
@@ -14,6 +14,7 @@ return array(
     'info'  					=> 'License Info',
     'license_seats'  			=> 'License Seats',
     'seat'  					=> 'Seat',
+    'seat_count'  				=> 'Seat :count',
     'seats'  					=> 'Seats',
     'software_licenses'  		=> 'Software Licenses',
     'user'  					=> 'User',
@@ -23,12 +24,12 @@ return array(
         [
             'checkin_all'           => [
                 'button'            => 'Checkin All Seats',
-                'modal'             => 'This will action checkin one seat. | This action will checkin all :checkedout_seats_count seats for this license.',
+                'modal'             => 'This action will checkin one seat. | This action will checkin all :checkedout_seats_count seats for this license.',
                 'enabled_tooltip'   => 'Checkin ALL seats for this license from both users and assets',
                 'disabled_tooltip'  => 'This is disabled because there are no seats currently checked out',
                 'disabled_tooltip_reassignable'  => 'This is disabled because the License is not reassignable',
                 'success'           => 'License successfully checked in! | All licenses were successfully checked in!',
-                'log_msg'           => 'Checked in via bulk license checkout in license GUI',
+                'log_msg'           => 'Checked in via bulk license checkin in license GUI',
             ],
 
             'checkout_all'              => [
diff --git a/resources/lang/si-LK/admin/licenses/message.php b/resources/lang/si-LK/admin/licenses/message.php
index 27fbfe38a9..74e1d7af5a 100644
--- a/resources/lang/si-LK/admin/licenses/message.php
+++ b/resources/lang/si-LK/admin/licenses/message.php
@@ -44,10 +44,13 @@ return array(
         'error'   => 'There was an issue checking out the license. Please try again.',
         'success' => 'The license was checked out successfully',
         'not_enough_seats' => 'Not enough license seats available for checkout',
+        'mismatch' => 'The license seat provided does not match the license',
+        'unavailable' => 'This seat is not available for checkout.',
     ),
 
     'checkin' => array(
         'error'   => 'There was an issue checking in the license. Please try again.',
+        'not_reassignable' => 'License not reassignable',
         'success' => 'The license was checked in successfully'
     ),
 
diff --git a/resources/lang/si-LK/admin/locations/message.php b/resources/lang/si-LK/admin/locations/message.php
index 8121b80687..b21c70ad89 100644
--- a/resources/lang/si-LK/admin/locations/message.php
+++ b/resources/lang/si-LK/admin/locations/message.php
@@ -3,11 +3,12 @@
 return array(
 
     'does_not_exist' => 'Location does not exist.',
-    'assoc_users'    => 'This location is not currently deletable because it is the location of record for at least one asset or user, has assets assigned to it, or is the parent location of another location. Please update your models to no longer reference this company and try again. ',
+    'assoc_users'    => 'This location is not currently deletable because it is the location of record for at least one asset or user, has assets assigned to it, or is the parent location of another location. Please update your records to no longer reference this location and try again ',
     'assoc_assets'	 => 'This location is currently associated with at least one asset and cannot be deleted. Please update your assets to no longer reference this location and try again. ',
     'assoc_child_loc'	 => 'This location is currently the parent of at least one child location and cannot be deleted. Please update your locations to no longer reference this location and try again. ',
     'assigned_assets' => 'Assigned Assets',
     'current_location' => 'Current Location',
+    'open_map' => 'Open in :map_provider_icon Maps',
 
 
     'create' => array(
@@ -20,6 +21,11 @@ return array(
         'success' => 'Location updated successfully.'
     ),
 
+    'restore' => array(
+        'error'   => 'Location was not restored, please try again',
+        'success' => 'Location restored successfully.'
+    ),
+
     'delete' => array(
         'confirm'   	=> 'Are you sure you wish to delete this location?',
         'error'   => 'There was an issue deleting the location. Please try again.',
diff --git a/resources/lang/si-LK/admin/locations/table.php b/resources/lang/si-LK/admin/locations/table.php
index ed3f96f6b4..53176d8a4e 100644
--- a/resources/lang/si-LK/admin/locations/table.php
+++ b/resources/lang/si-LK/admin/locations/table.php
@@ -39,4 +39,5 @@ return [
     'signed_by_finance_auditor' => 'Signed By (Finance Auditor):',
     'signed_by_location_manager' => 'Signed By (Location Manager):',
     'signed_by'                 => 'Signed Off By:',
+    'clone'  					=> 'Clone Location',
 ];
diff --git a/resources/lang/si-LK/admin/models/general.php b/resources/lang/si-LK/admin/models/general.php
index 7e4a77adbc..9a61b53fd0 100644
--- a/resources/lang/si-LK/admin/models/general.php
+++ b/resources/lang/si-LK/admin/models/general.php
@@ -3,7 +3,7 @@
 return array(
     'about_models_title'     => 'About Asset Models',
     'about_models_text'           => 'Asset Models are a way to group identical assets. "MBP 2013", "IPhone 6s", etc.',
-    'deleted'  					        => 'This model has been deleted.',
+    'deleted'  					=> 'This model has been deleted.',
     'bulk_delete'               => 'Bulk Delete Asset Models',
     'bulk_delete_help'               => 'Use the checkboxes below to confirm the deletion of the selected asset models. Asset models that have assets associated with them cannot be deleted until the assets are associated with a different model.',
     'bulk_delete_warn'          => 'You are about to delete one asset model.|You are about to delete :model_count asset models.',
diff --git a/resources/lang/si-LK/admin/models/message.php b/resources/lang/si-LK/admin/models/message.php
index cc38c54530..ae3bc34eed 100644
--- a/resources/lang/si-LK/admin/models/message.php
+++ b/resources/lang/si-LK/admin/models/message.php
@@ -7,7 +7,7 @@ return array(
     'no_association' => 'WARNING! The asset model for this item is invalid or missing!',
     'no_association_fix' => 'This will break things in weird and horrible ways. Edit this asset now to assign it a model.',
     'assoc_users'	 => 'This model is currently associated with one or more assets and cannot be deleted. Please delete the assets, and then try deleting again. ',
-
+    'invalid_category_type' => 'This category must be an asset category.',
 
     'create' => array(
         'error'   => 'Model was not created, please try again.',
diff --git a/resources/lang/si-LK/admin/reports/general.php b/resources/lang/si-LK/admin/reports/general.php
index 9b682f8ecd..ed8bf1a156 100644
--- a/resources/lang/si-LK/admin/reports/general.php
+++ b/resources/lang/si-LK/admin/reports/general.php
@@ -4,6 +4,7 @@ return [
     'info'   => 'Select the options you want for your asset report.',
     'deleted_user' => 'Deleted user',
     'send_reminder' => 'Send reminder',
+    'cannot_send_reminder' => 'User has been deleted or does not have an email address so cannot receive a reminder',
     'reminder_sent' => 'Reminder sent',
     'acceptance_deleted' => 'Acceptance request deleted',
     'acceptance_request' => 'Acceptance request',
@@ -13,5 +14,10 @@ return [
         'user_state' => 'User State',
         'user_country' => 'User Country',
         'user_zip' => 'User Zip'
-    ]
-];
\ No newline at end of file
+    ],
+    'open_saved_template' => 'Open Saved Template',
+    'save_template' =>  'Save Template',
+    'select_a_template' => 'Select a Template',
+    'template_name' => 'Template Name',
+    'update_template' => 'Update Template',
+];
diff --git a/resources/lang/si-LK/admin/reports/message.php b/resources/lang/si-LK/admin/reports/message.php
index d4c8f8198f..2800bbdf0b 100644
--- a/resources/lang/si-LK/admin/reports/message.php
+++ b/resources/lang/si-LK/admin/reports/message.php
@@ -1,5 +1,16 @@
 <?php
 
-return array(
-    'error'   => 'You must select at least ONE option.'
-);
+return [
+    'about_templates' => 'About Saved Templates',
+    'saving_templates_description' => 'Select your options, then enter the name of your template in the box above and click the \'Save Template\' button. Use the dropdown to select a previously saved template.',
+    'create'  => [
+        'success' => 'Template saved successfully',
+    ],
+    'update' => [
+        'success' => 'Template updated successfully',
+    ],
+    'delete' => [
+        'success' => 'Template deleted',
+        'no_delete_permission' => 'Template does not exist or you do not have permission to delete it.',
+    ],
+];
diff --git a/resources/lang/si-LK/admin/settings/general.php b/resources/lang/si-LK/admin/settings/general.php
index 8074f5082e..37cfb0de94 100644
--- a/resources/lang/si-LK/admin/settings/general.php
+++ b/resources/lang/si-LK/admin/settings/general.php
@@ -8,13 +8,13 @@ return [
     'ad_append_domain'          => 'Append domain name to username field',
     'ad_append_domain_help'     => 'User isn\'t required to write "username@domain.local", they can just type "username".',
     'admin_cc_email'            => 'CC Email',
-    'admin_cc_email_help'       => 'If you would like to send a copy of checkin/checkout emails that are sent to users to an additional email account, enter it here. Otherwise leave this field blank.',
+    'admin_cc_email_help'       => 'Send a copy of checkin/checkout emails to this address.',
     'admin_settings'            => 'Admin Settings',
     'is_ad'				        => 'This is an Active Directory server',
     'alerts'                	=> 'Alerts',
     'alert_title'               => 'Update Notification Settings',
     'alert_email'				=> 'Send alerts to',
-    'alert_email_help'    => 'Email addresses or distribution lists you want alerts to be sent to, comma separated',
+    'alert_email_help'          => 'Email addresses or distribution lists you want alerts to be sent to, comma separated.',
     'alerts_enabled'			=> 'Email Alerts Enabled',
     'alert_interval'			=> 'Expiring Alerts Threshold (in days)',
     'alert_inv_threshold'		=> 'Inventory Alert Threshold',
@@ -31,15 +31,18 @@ return [
     'backups'					=> 'Backups',
     'backups_help'              => 'Create, download, and restore backups ',
     'backups_restoring'         => 'Restoring from Backup',
+    'backups_clean' => 'Clean the backed-up database before restore',
+    'backups_clean_helptext' => "This can be useful if you're changing between database versions",
     'backups_upload'            => 'Upload Backup',
     'backups_path'              => 'Backups on the server are stored in <code>:path</code>',
-    'backups_restore_warning'   => 'Use the restore button <small><span class="btn btn-xs btn-warning"><i class="text-white fas fa-retweet" aria-hidden="true"></i></span></small> to restore from a previous backup. (This does not currently work with S3 file storage or Docker.)<br><br>Your <strong>entire :app_name database and any uploaded files will be completely replaced</strong> by what\'s in the backup file.  ',
+    'backups_restore_warning'   => 'Use the restore button <small><span class="btn btn-xs btn-warning"><i class="text-white fas fa-retweet" aria-hidden="true"></i></span></small> to restore from a previous backup. (This does not currently work with S3 file storage or Docker.)<br><br>Your <strong>entire :app_name database and any uploaded files will be completely replaced</strong> by what\'s in the backup file  ',
     'backups_logged_out'         => 'All existing users, including you, will be logged out once your restore is complete.',
     'backups_large'             => 'Very large backups may time out on the restore attempt and may still need to be run via command line. ',
     'barcode_settings'			=> 'Barcode Settings',
     'confirm_purge'			    => 'Confirm Purge',
     'confirm_purge_help'		=> 'Enter the text "DELETE" in the box below to purge your deleted records. This action cannot be undone and will PERMANENTLY delete all soft-deleted items and users. (You should make a backup first, just to be safe.)',
     'custom_css'				=> 'Custom CSS',
+    'custom_css_placeholder'	=> 'Add your custom CSS',
     'custom_css_help'			=> 'Enter any custom CSS overrides you would like to use. Do not include the &lt;style&gt;&lt;/style&gt; tags.',
     'custom_forgot_pass_url'	=> 'Custom Password Reset URL',
     'custom_forgot_pass_url_help'	=> 'This replaces the built-in forgotten password URL on the login screen, useful to direct people to internal or hosted LDAP password reset functionality. It will effectively disable local user forgotten password functionality.',
@@ -47,34 +50,34 @@ return [
     'dashboard_message_help'	=> 'This text will appear on the dashboard for anyone with permission to view the dashboard.',
     'default_currency'  		=> 'Default Currency',
     'default_eula_text'			=> 'Default EULA',
+    'default_eula_text_placeholder' => 'Add your default EULA text',
     'default_language'			=> 'Default Language',
     'default_eula_help_text'	=> 'You can also associate custom EULAs to specific asset categories.',
     'acceptance_note'           => 'Add a note for your decision (Optional)',
     'display_asset_name'        => 'Display Asset Name',
     'display_checkout_date'     => 'Display Checkout Date',
     'display_eol'               => 'Display EOL in table view',
-    'display_qr'                => 'Display Square Codes',
+    'display_qr'                => 'Display 2D barcode',
     'display_alt_barcode'		=> 'Display 1D barcode',
-    'email_logo'                => 'Email Logo',
     'barcode_type'				=> '2D Barcode Type',
     'alt_barcode_type'			=> '1D barcode type',
-    'email_logo_size'       => 'Square logos in email look best. ',
     'enabled'                   => 'Enabled',
     'eula_settings'				=> 'EULA Settings',
     'eula_markdown'				=> 'This EULA allows <a href="https://help.github.com/articles/github-flavored-markdown/">Github flavored markdown</a>.',
+    'empty_row_count'           => 'Field Start Offset (Empty Rows)',
+    'empty_row_count_help'      => 'Fields will begin populating after this many empty rows are skipped at the top of the label.',
     'favicon'                   => 'Favicon',
     'favicon_format'            => 'Accepted filetypes are ico, png, and gif. Other image formats may not work in all browsers.',
     'favicon_size'          => 'Favicons should be square images, 16x16 pixels.',
     'footer_text'               => 'Additional Footer Text ',
     'footer_text_help'          => 'This text will appear in the right-side footer. Links are allowed using <a href="https://help.github.com/articles/github-flavored-markdown/">Github flavored markdown</a>. Line breaks, headers, images, etc may result in unpredictable results.',
+    'footer_text_placeholder'   => 'Optional footer text',
     'general_settings'			=> 'General Settings',
-    'general_settings_keywords' => 'company support, signature, acceptance, email format, username format, images, per page, thumbnail, eula, gravatar, tos, dashboard, privacy',
     'general_settings_help'     => 'Default EULA and more',
     'generate_backup'			=> 'Generate Backup',
     'google_workspaces'         => 'Google Workspaces',
     'header_color'              => 'Header Color',
     'info'                      => 'These settings let you customize certain aspects of your installation.',
-    'label_logo'                => 'Label Logo',
     'label_logo_size'           => 'Square logos look best - will be displayed in the top right of each asset label. ',
     'laravel'                   => 'Laravel Version',
     'ldap'                      => 'LDAP',
@@ -94,7 +97,7 @@ return [
     'ldap_login_sync_help'      => 'This only tests that LDAP can sync correctly. If your LDAP Authentication query is not correct, users may still not be able to login. YOU MUST SAVE YOUR UPDATED LDAP SETTINGS FIRST.',
     'ldap_manager'              => 'LDAP Manager',
     'ldap_server'               => 'LDAP Server',
-    'ldap_server_help'          => 'This should start with ldap:// (for unencrypted or TLS) or ldaps:// (for SSL)',
+    'ldap_server_help'          => 'This should start with ldap:// (for unencrypted) or ldaps:// (for TLS or SSL)',
     'ldap_server_cert'			=> 'LDAP SSL certificate validation',
     'ldap_server_cert_ignore'	=> 'Allow invalid SSL Certificate',
     'ldap_server_cert_help'		=> 'Select this checkbox if you are using a self signed SSL cert and would like to accept an invalid SSL certificate.',
@@ -108,8 +111,8 @@ return [
     'ldap_pword'                => 'LDAP Bind Password',
     'ldap_basedn'               => 'Base Bind DN',
     'ldap_filter'               => 'LDAP Filter',
-    'ldap_pw_sync'              => 'LDAP Password Sync',
-    'ldap_pw_sync_help'         => 'Uncheck this box if you do not wish to keep LDAP passwords synced with local passwords. Disabling this means that your users may not be able to login if your LDAP server is unreachable for some reason.',
+    'ldap_pw_sync'              => 'Cache LDAP Passwords',
+    'ldap_pw_sync_help'         => 'Uncheck this box if you do not wish to keep LDAP passwords cached as local hashed passwords. Disabling this means that your users may not be able to login if your LDAP server is unreachable for some reason.',
     'ldap_username_field'       => 'Username Field',
     'ldap_lname_field'          => 'Last Name',
     'ldap_fname_field'          => 'LDAP First Name',
@@ -117,13 +120,15 @@ return [
     'ldap_version'              => 'LDAP Version',
     'ldap_active_flag'          => 'LDAP Active Flag',
     'ldap_activated_flag_help'  => 'This value is used to determine whether a synced user can login to Snipe-IT. <strong>It does not affect the ability to check items in or out to them</strong>, and should be the <strong>attribute name</strong> within your AD/LDAP, <strong>not the value</strong>. <br><br>If this field is set to a field name that does not exist in your AD/LDAP, or the value in the AD/LDAP field is set to <code>0</code> or <code>false</code>, <strong>user login will be disabled</strong>. If the value in the AD/LDAP field is set to <code>1</code> or <code>true</code> or <em>any other text</em> means the user can log in. When the field is blank in your AD, we respect the <code>userAccountControl</code> attribute, which usually allows non-suspended users to log in.',
+    'ldap_invert_active_flag'   => 'LDAP Invert Active Flag',
+    'ldap_invert_active_flag_help'     => 'If enabled: when the value returned by LDAP Active Flag is <code>0</code> or <code>false</code> the user account will be active.',
     'ldap_emp_num'              => 'LDAP Employee Number',
     'ldap_email'                => 'LDAP Email',
     'ldap_test'                 => 'Test LDAP',
     'ldap_test_sync'            => 'Test LDAP Synchronization',
     'license'                   => 'Software License',
-    'load_remote'               => 'Use Gravatar',
-    'load_remote_help_text'		=> 'Uncheck this box if your install cannot load scripts from the outside internet. This will prevent Snipe-IT from trying load images from Gravatar.',
+    'load_remote'               => 'Load Remote Avatars',
+    'load_remote_help_text'		=> 'Uncheck this box if your install cannot load scripts from the outside internet. This will prevent Snipe-IT from trying load avatars from Gravatar or other outside sources.',
     'login'                     => 'Login Attempts',
     'login_attempt'             => 'Login Attempt',
     'login_ip'                  => 'IP Address',
@@ -131,6 +136,7 @@ return [
     'login_user_agent'          => 'User Agent',
     'login_help'                => 'List of attempted logins',
     'login_note'                => 'Login Note',
+    'login_note_placeholder'            => "If you do not have a login or have found a device belonging to this company, please call technical support at 888-555-1212. Thank you.",
     'login_note_help'           => 'Optionally include a few sentences on your login screen, for example to assist people who have found a lost or stolen device. This field accepts <a href="https://help.github.com/articles/github-flavored-markdown/">Github flavored markdown</a>',
     'login_remote_user_text'    => 'Remote User login options',
     'login_remote_user_enabled_text' => 'Enable Login with Remote User Header',
@@ -146,13 +152,16 @@ return [
     'logo_print_assets_help'    => 'Use branding on printable asset lists ',
     'full_multiple_companies_support_help_text' => 'Restricting users (including admins) assigned to companies to their company\'s assets.',
     'full_multiple_companies_support_text' => 'Full Multiple Companies Support',
+    'scope_locations_fmcs_support_text'  => 'Scope Locations with Full Multiple Companies Support',
+    'scope_locations_fmcs_support_help_text'  => 'Restrict locations to their selected company.',
+    'scope_locations_fmcs_check_button' => 'Check Compatibility',
+    'scope_locations_fmcs_support_disabled_text'  => 'This option is disabled because you have conflicting locations set for :count or more items.',
     'show_in_model_list'   => 'Show in Model Dropdowns',
     'optional'					=> 'optional',
     'per_page'                  => 'Results Per Page',
     'php'                       => 'PHP Version',
-    'php_info'                  => 'PHP Info',
+    'php_info'                  => 'PHP info',
     'php_overview'              => 'PHP',
-    'php_overview_keywords'     => 'phpinfo, system, info',
     'php_overview_help'         => 'PHP System info',
     'php_gd_info'               => 'You must install php-gd to display QR codes, see install instructions.',
     'php_gd_warning'            => 'PHP Image Processing and GD plugin is NOT installed.',
@@ -218,6 +227,8 @@ return [
     'webhook_integration_help'    => ':app integration is optional, however the endpoint and channel are required if you wish to use it. To configure :app integration, you must first <a href=":webhook_link" target="_new" rel="noopener">create an incoming webhook</a> on your :app account. Click on the <strong>Test :app Integration</strong> button to confirm your settings are correct before saving. ',
     'webhook_integration_help_button'    => 'Once you have saved your :app information, a test button will appear.',
     'webhook_test_help'           => 'Test whether your :app integration is configured correctly. YOU MUST SAVE YOUR UPDATED :app SETTINGS FIRST.',
+    'shortcuts_enabled'         => 'Enable Shortcuts',
+    'shortcuts_help_text'       => '<strong>Windows</strong>: Alt + Access key, <strong>Mac</strong>: Control + Option + Access key',
     'snipe_version'  			=> 'Snipe-IT version',
     'support_footer'            => 'Support Footer Links ',
     'support_footer_help'       => 'Specify who sees the links to the Snipe-IT Support info and Users Manual',
@@ -227,7 +238,6 @@ return [
     'update'                    => 'Update Settings',
     'value'                     => 'Value',
     'brand'                     => 'Branding',
-    'brand_keywords'            => 'footer, logo, print, theme, skin, header, colors, color, css',
     'brand_help'                => 'Logo, Site Name',
     'web_brand'                 => 'Web Branding Type',
     'about_settings_title'      => 'About Settings',
@@ -276,6 +286,8 @@ return [
     'two_factor_enrollment_text'	=> "Two factor authentication is required, however your device has not been enrolled yet. Open your Google Authenticator app and scan the QR code below to enroll your device. Once you've enrolled your device, enter the code below",
     'require_accept_signature'      => 'Require Signature',
     'require_accept_signature_help_text'      => 'Enabling this feature will require users to physically sign off on accepting an asset.',
+    'require_checkinout_notes'  => 'Require Notes on Checkin/Checkout',
+    'require_checkinout_notes_help_text'    => 'Enabling this feature will require the note fields to be populated when checking in or checking out an asset.',
     'left'        => 'left',
     'right'        => 'right',
     'top'        => 'top',
@@ -313,24 +325,24 @@ return [
     'filter_by_keyword' => 'Filter by setting keyword',
     'security' => 'Security',
     'security_title' => 'Update Security Settings',
-    'security_keywords' => 'password, passwords, requirements, two factor, two-factor, common passwords, remote login, logout, authentication',
     'security_help' => 'Two-factor, Password Restrictions',
-    'groups_keywords' => 'permissions, permission groups, authorization',
     'groups_help' => 'Account permission groups',
     'localization' => 'Localization',
     'localization_title' => 'Update Localization Settings',
-    'localization_keywords' => 'localization, currency, local, locale, time zone, timezone, international, internatinalization, language, languages, translation',
     'localization_help' => 'Language, date display',
     'notifications' => 'Notifications',
     'notifications_help' => 'Email Alerts & Audit Settings',
     'asset_tags_help' => 'Incrementing and prefixes',
     'labels' => 'Labels',
     'labels_title' => 'Update Label Settings',
-    'labels_help' => 'Label sizes &amp; settings',
-    'purge_keywords' => 'permanently delete',
+    'labels_help' => 'Barcodes &amp; label settings',
     'purge_help' => 'Purge Deleted Records',
     'ldap_extension_warning' => 'It does not look like the LDAP extension is installed or enabled on this server. You can still save your settings, but you will need to enable the LDAP extension for PHP before LDAP syncing or login will work.',
     'ldap_ad' => 'LDAP/AD',
+    'ldap_test_label' => 'Test LDAP Sync',
+    'ldap_test_login' => ' Test LDAP Login',
+    'ldap_username_placeholder' => 'LDAP Username',
+    'ldap_password_placeholder' => 'LDAP Password',
     'employee_number' => 'Employee Number',
     'create_admin_user' => 'Create a User ::',
     'create_admin_success' => 'Success! Your admin user has been added!',
@@ -342,6 +354,8 @@ return [
     'setup_migration_create_user' => 'Next: Create User',
     'ldap_settings_link' => 'LDAP Settings Page',
     'slack_test' => 'Test <i class="fab fa-slack"></i> Integration',
+    'status_label_name' => 'Status Label Name',
+    'super_admin_only'  => 'Super Admin Only',
     'label2_enable'           => 'New Label Engine',
     'label2_enable_help'      => 'Switch to the new label engine. <b>Note: You will need to save this setting before setting others.</b>',
     'label2_template'         => 'Template',
@@ -356,12 +370,15 @@ return [
     'label2_2d_type'          => '2D Barcode Type',
     'label2_2d_type_help'     => 'Format for 2D barcodes',
     'label2_2d_target'        => '2D Barcode Target',
-    'label2_2d_target_help'   => 'The URL the 2D barcode points to when scanned',
+    'label2_2d_target_help'   => 'The data that will be contained in the 2D barcode',
     'label2_fields'           => 'Field Definitions',
     'label2_fields_help'      => 'Fields can be added, removed, and reordered in the left column. For each field, multiple options for Label and DataSource can be added, removed, and reordered in the right column.',
+    'purge_barcodes' => 'Purge Barcodes',
     'help_asterisk_bold'    => 'Text entered as <code>**text**</code> will be displayed as bold',
     'help_blank_to_use'     => 'Leave blank to use the value from <code>:setting_name</code>',
     'help_default_will_use' => '<code>:default</code> will use the value from <code>:setting_name</code>. <br>Note that the value of the barcodes must comply with the respective barcode spec in order to be successfully generated. Please see <a href="https://snipe-it.readme.io/docs/barcodes">the documentation <i class="fa fa-external-link"></i></a> for more details. ',
+    'asset_id'              => 'Asset ID',
+    'data'               => 'Data',
     'default'               => 'Default',
     'none'                  => 'None',
     'google_callback_help' => 'This should be entered as the callback URL in your Google OAuth app settings in your organization&apos;s <strong><a href="https://console.cloud.google.com/" target="_blank">Google developer console <i class="fa fa-external-link" aria-hidden="true"></i></a></strong>.',
@@ -373,7 +390,100 @@ return [
     'database_driver' => 'Database Driver',
     'bs_table_storage' => 'Table Storage',
     'timezone' => 'Timezone',
+    'test_mail' => 'Test Mail',
     'profile_edit'          => 'Edit Profile',
     'profile_edit_help'          => 'Allow users to edit their own profiles.',
+    'default_avatar' => 'Custom Default Avatar',
+    'default_avatar_help' => 'This image will be displayed as a profile if a user does not have a profile photo.',
+    'restore_default_avatar' => 'Restore <a href=":default_avatar" data-toggle="lightbox" data-type="image">original system default avatar</a>',
+    'restore_default_avatar_help' => '',
+    'due_checkin_days' => 'Due For Checkin Warning',
+    'due_checkin_days_help' => 'How many days before the expected checkin of an asset should it be listed in the "Due for checkin" page?',
+    'no_groups' => 'No groups have been created yet. Visit <code>Admin Settings > Permission Groups</code> to add one.',
+    'text' => 'Text',
+
+    'username_formats' => [
+        'username_format'		=> 'Username Format',
+        'firstname_lastname_format'	=> 'First Name Last Name (jane.smith)',
+        'first_name_format'	        => 'First Name (jane)',
+        'last_name_format'		=> 'Last Name (doe)',
+        'filastname_format'			=> 'First Initial Last Name (jsmith)',
+        'lastnamefirstinitial_format' =>  'Last Name First Initial (smithj)',
+        'firstname_lastname_underscore_format' => 'First Name Last Name (jane_smith)',
+        'firstinitial.lastname' => 'First Initial Last Name (j.smith)',
+        'lastname_firstinitial' => 'Last Name First Initial (smith_j)',
+        'lastname_dot_firstinitial_format' => 'Last Name First Initial (smith.j)',
+        'firstnamelastname'     => 'First Name Last Name (janesmith)',
+        'firstnamelastinitial'  => 'First Name Last Initial (janes)',
+        'lastnamefirstname'      => 'Last Name.First Name (smith.jane)',
+    ],
+
+    'email_formats' => [
+        'email_format'			=> 'Email Format',
+        'firstname_lastname_format'	=> 'First Name Last Name (jane.smith@example.com)',
+        'first_name_format'		=> 'First Name (jane@example.com)',
+        'last_name_format'		=> 'Last Name (doe@example.com)',
+        'filastname_format'			=> 'First Initial Last Name (jsmith@example.com)',
+        'lastnamefirstinitial_format' =>  'Last Name First Initial (smithj@example.com)',
+        'firstname_lastname_underscore_format' => 'First Name Last Name (jane_smith@example.com)',
+        'firstinitial.lastname' => 'First Initial Last Name (j.smith@example.com)',
+        'lastname_firstinitial' => 'Last Name First Initial (smith_j@example.com)',
+        'lastname_dot_firstinitial_format' => 'Last Name First Initial (smith.j@example.com)',
+        'firstnamelastname'     => 'First Name Last Name (janesmith@example.com)',
+        'firstnamelastinitial'  => 'First Name Last Initial (janes@example.com)',
+        'lastnamefirstname'      => 'Last Name.First Name (smith.jane@example.com)',
+    ],
+
+
+
+    'logo_labels' => [
+        'acceptance_pdf_logo'       => 'PDF Logo',
+        'email_logo'                => 'Email Logo',
+        'label_logo'                => 'Label Logo',
+        'logo'                      => 'Site Logo',
+        'favicon'                   => 'Favicon',
+    ],
+
+    'logo_help' => [
+        'email_logo_size'       => 'Square logos in email look best. ',
+    ],
+
+    'logo_option_types' => [
+        'text' => 'Text',
+        'logo' => 'Logo',
+        'logo_and_text' => 'Logo and Text',
+    ],
+
+
+    'legends' => [
+        'scoping' => 'Scoping',
+        'formats' => 'Default Formats',
+        'profiles' => 'User Profiles',
+        'eula' => 'EULA & Acceptance Preferences',
+        'misc_display' => 'Miscellaneous Display Options',
+        'email' => 'Email Preferences',
+        'checkin' => 'Checkin Preferences',
+        'dashboard' => 'Login & Dashboard Preferences',
+        'misc' => 'Miscellaneous',
+        'logos' => 'Logos & Display',
+        'colors' => 'Colors & Skins',
+        'footer' => 'Footer Preferences',
+        'security' => 'Security Preferences',
+        'general' => 'General',
+        'intervals' => 'Intervals & Thresholds',
+    ],
+
+
+    /* Keywords for settings overview help */
+    'keywords' => [
+        'brand'             => 'footer, logo, print, theme, skin, header, colors, color, css',
+        'general_settings'  => 'company support, signature, acceptance, email format, username format, images, per page, thumbnail, eula, gravatar, tos, dashboard, privacy',
+        'groups'            => 'permissions, permission groups, authorization',
+        'labels'            => 'labels, barcodes, barcode, sheets, print, upc, qr, 1d, 2d',
+        'localization'      => 'localization, currency, local, locale, time zone, timezone, international, internatinalization, language, languages, translation',
+        'php_overview'      => 'phpinfo, system, info',
+        'purge'             => 'permanently delete',
+        'security'          => 'password, passwords, requirements, two factor, two-factor, common passwords, remote login, logout, authentication',
+    ],
 
 ];
diff --git a/resources/lang/si-LK/admin/settings/message.php b/resources/lang/si-LK/admin/settings/message.php
index c9b0f34217..58abf14c5c 100644
--- a/resources/lang/si-LK/admin/settings/message.php
+++ b/resources/lang/si-LK/admin/settings/message.php
@@ -14,6 +14,9 @@ return [
         'restore_warning'       => 'Yes, restore it. I acknowledge that this will overwrite any existing data currently in the database. This will also log out all of your existing users (including you).',
         'restore_confirm'       => 'Are you sure you wish to restore your database from :filename?'
     ],
+    'restore' => [
+        'success'               => 'Your system backup has been restored. Please log in again.'
+    ],
     'purge' => [
         'error'     => 'An error has occurred while purging. ',
         'validation_failed'     => 'Your purge confirmation is incorrect. Please type the word "DELETE" in the confirmation box.',
@@ -33,6 +36,9 @@ return [
         'testing_authentication' => 'Testing LDAP Authentication...',
         'authentication_success' => 'User authenticated against LDAP successfully!'
     ],
+    'labels' => [
+        'null_template' => 'Label template not found. Please select a template.',
+        ],
     'webhook' => [
         'sending' => 'Sending :app test message...',
         'success' => 'Your :webhook_name Integration works!',
@@ -42,5 +48,12 @@ return [
         'error' => 'Something went wrong. :app responded with: :error_message',
         'error_redirect' => 'ERROR: 301/302 :endpoint returns a redirect. For security reasons, we don’t follow redirects. Please use the actual endpoint.',
         'error_misc' => 'Something went wrong. :( ',
-    ]
+        'webhook_fail' => ' webhook notification failed: Check to make sure the URL is still valid.',
+        'webhook_channel_not_found' => ' webhook channel not found.',
+        'ms_teams_deprecation' => 'The selected Microsoft Teams webhook URL will be deprecated Dec 31st, 2025. Please use a workflow URL. Microsoft\'s documentation on creating a workflow can be found <a href="https://support.microsoft.com/en-us/office/create-incoming-webhooks-with-workflows-for-microsoft-teams-8ae491c7-0394-4861-ba59-055e33f75498" target="_blank"> here.</a>',
+    ],
+    'location_scoping' => [
+        'not_saved' => 'Your settings were not saved.',
+        'mismatch' => 'There is 1 item in the database that need your attention before you can enable location scoping.|There are :count items in the database that need your attention before you can enable location scoping.',
+    ],
 ];
diff --git a/resources/lang/si-LK/admin/statuslabels/table.php b/resources/lang/si-LK/admin/statuslabels/table.php
index 27befb5ef7..1a0fab891e 100644
--- a/resources/lang/si-LK/admin/statuslabels/table.php
+++ b/resources/lang/si-LK/admin/statuslabels/table.php
@@ -1,14 +1,14 @@
 <?php
 
 return array(
-    'about'      	=> 'About Status Labels',
+    'about'      	=> 'About Status Types',
     'archived'      	=> 'Archived',
     'create'      	=> 'Create Status Label',
     'color'      	=> 'Chart Color',
     'default_label' => 'Default Label',
     'default_label_help' => 'This is used to ensure your most commonly used status labels appear at the top of the select box when creating/editing assets.',
     'deployable'      	=> 'Deployable',
-    'info'      	=> 'Status labels are used to describe the various states your assets could be in. They may be out for repair, lost/stolen, etc. You can create new status labels for deployable, pending and archived assets.',
+    'info'      	=> 'Status label types are used to describe the various states your assets could be in. They may be out for repair, lost/stolen, etc. You can create new status labels for your deployable, pending and archived assets according to your own workflow. For more information, <a href="https://snipe-it.readme.io/docs/overview#status-labels" target="_blank">see the documentation <i class="fa fa-external-link"></i></a>.',
     'name'      	=> 'Status Name',
     'pending'      	=> 'Pending',
     'status_type'   => 'Status Type',
diff --git a/resources/lang/si-LK/admin/users/general.php b/resources/lang/si-LK/admin/users/general.php
index b097ccec69..14f36cf151 100644
--- a/resources/lang/si-LK/admin/users/general.php
+++ b/resources/lang/si-LK/admin/users/general.php
@@ -19,6 +19,8 @@ return [
     'print_assigned'    => 'Print All Assigned',
     'email_assigned'    => 'Email List of All Assigned',
     'user_notified'     => 'User has been emailed a list of their currently assigned items.',
+    'users_notified'    => 'The user has been emailed a list of their currently assigned items.|:count users have been emailed a list of their currently assigned items.',
+    'users_notified_warning' => ':count user has been emailed a list of their currently assigned items, however :no_email users did not have an email address so could not be emailed.|:count users have been emailed a list of their currently assigned items, however :no_email user(s) did not have an email address so could not be emailed.',
     'auto_assign_label' => 'Include this user when auto-assigning eligible licenses',
     'auto_assign_help'  => 'Skip this user in auto assignment of licenses',
     'software_user'     => 'Software Checked out to :name',
diff --git a/resources/lang/si-LK/admin/users/message.php b/resources/lang/si-LK/admin/users/message.php
index 4d014775bd..b6ddad3aac 100644
--- a/resources/lang/si-LK/admin/users/message.php
+++ b/resources/lang/si-LK/admin/users/message.php
@@ -6,7 +6,7 @@ return array(
     'declined'                  => 'You have successfully declined this asset.',
     'bulk_manager_warn'	        => 'Your users have been successfully updated, however your manager entry was not saved because the manager you selected was also in the user list to be edited, and users may not be their own manager. Please select your users again, excluding the manager.',
     'user_exists'               => 'User already exists!',
-    'user_not_found'            => 'User does not exist.',
+    'user_not_found'            => 'User does not exist or you do not have permission view them.',
     'user_login_required'       => 'The login field is required',
     'user_has_no_assets_assigned' => 'No assets currently assigned to user.',
     'user_password_required'    => 'The password is required.',
@@ -53,6 +53,7 @@ return array(
         'ldap_could_not_search' => 'Could not search the LDAP server. Please check your LDAP server configuration in the LDAP config file. <br>Error from LDAP Server:',
         'ldap_could_not_get_entries' => 'Could not get entries from the LDAP server. Please check your LDAP server configuration in the LDAP config file. <br>Error from LDAP Server:',
         'password_ldap' => 'The password for this account is managed by LDAP/Active Directory. Please contact your IT department to change your password. ',
+        'multi_company_items_assigned' => 'This user has items assigned that belong to a different company. Please check them in or edit their company.'
     ),
 
     'deletefile' => array(
diff --git a/resources/lang/si-LK/admin/users/table.php b/resources/lang/si-LK/admin/users/table.php
index d6aea8f11d..3fc97fa220 100644
--- a/resources/lang/si-LK/admin/users/table.php
+++ b/resources/lang/si-LK/admin/users/table.php
@@ -22,7 +22,7 @@ return array(
     'managed_locations'     => 'Managed Locations',
     'managed_users'         => 'Managed Users',
     'name' 					=> 'Name',
-    'nogroup'               => 'No groups have been created yet. To add one, visit: ',
+    'nogroup'               => 'No groups have been created yet. To add one, visit:',
     'notes'                 => 'සටහන්',
     'password_confirm' 		=> 'Confirm Password',
     'password' 				=> 'Password',
diff --git a/resources/lang/si-LK/auth.php b/resources/lang/si-LK/auth.php
index db310aa1bb..14d8acfce0 100644
--- a/resources/lang/si-LK/auth.php
+++ b/resources/lang/si-LK/auth.php
@@ -15,6 +15,6 @@ return array(
 
     'failed' => 'These credentials do not match our records.',
     'password' => 'The provided password is incorrect.',
-    'throttle' => 'Too many login attempts. Please try again in :seconds seconds.',
+    'throttle' => 'Too many login attempts. Please try again in :minutes minute(s).',
 
 );
diff --git a/resources/lang/si-LK/auth/message.php b/resources/lang/si-LK/auth/message.php
index 588c9069ca..08f638d058 100644
--- a/resources/lang/si-LK/auth/message.php
+++ b/resources/lang/si-LK/auth/message.php
@@ -6,8 +6,6 @@ return array(
     'account_not_found'      => 'The username or password is incorrect.',
     'account_not_activated'  => 'This user account is not activated.',
     'account_suspended'      => 'This user account is suspended.',
-    'account_banned'         => 'This user account is banned.',
-    'throttle'               => 'Too many failed login attempts. Please try again in :minutes minutes.',
 
     'two_factor' => array(
         'already_enrolled'      => 'Your device is already enrolled.',
diff --git a/resources/lang/si-LK/button.php b/resources/lang/si-LK/button.php
index 22821b8157..8a838e8faf 100644
--- a/resources/lang/si-LK/button.php
+++ b/resources/lang/si-LK/button.php
@@ -7,6 +7,7 @@ return [
     'checkin_and_delete'  	    => 'Checkin All / Delete User',
     'delete'  	                => 'Delete',
     'edit'    	                => 'Edit',
+    'clone'    	                => 'Clone',
     'restore' 	                => 'Restore',
     'remove'                    => 'Remove',
     'request'                   => 'Request',
@@ -21,4 +22,13 @@ return [
     'add_maintenance'           => 'Add Maintenance',
     'append'                    => 'Append',
     'new'                       => 'New',
+    'var' => [
+        'clone'     => 'Clone :item_type',
+        'edit'      => 'Edit :item_type',
+        'delete'    => 'Delete :item_type',
+        'restore'   => 'Restore :item_type',
+        'create'    => 'Create New :item_type',
+        'checkout'  => 'Checkout :item_type',
+        'checkin'   => 'Checkin :item_type',
+    ]
 ];
diff --git a/resources/lang/si-LK/general.php b/resources/lang/si-LK/general.php
index b698ec1ac9..0d6d83b555 100644
--- a/resources/lang/si-LK/general.php
+++ b/resources/lang/si-LK/general.php
@@ -10,7 +10,7 @@ return [
     'action'                => 'Action',
     'activity_report'		=> 'Activity Report',
     'address'				=> 'Address',
-    'admin'					=> 'Admin',
+    'admin'					=> 'Admin Settings',
     'admin_tooltip'			=> 'This user has admin privileges',
     'superuser'				=> 'Superuser',
     'superuser_tooltip'		=> 'This user has superuser privileges',
@@ -23,13 +23,16 @@ return [
     'asset_models'			=> 'Asset Models',
     'asset_model'			=> 'Model',
     'asset'					=> 'Asset',
+    'asset_previous'        => 'Asset (Previously Assigned)',
     'asset_report'          => 'Asset Report',
     'asset_tag'				=> 'Asset Tag',
     'asset_tags'            => 'Asset Tags',
     'assets_available'		=> 'Assets available',
     'accept_assets'         => 'Accept Assets :name',
     'accept_assets_menu'    => 'Accept Assets',
+    'accept_item'           => 'Accept Item',
     'audit'				    => 'Audit',
+    'audits'				=> 'Audits',
     'audit_report'			=> 'Audit Log',
     'assets'				=> 'Assets',
     'assets_audited'        => 'assets audited',
@@ -61,9 +64,12 @@ return [
     'changepassword'  		=> 'Change Password',
     'checkin'  				=> 'Checkin',
     'checkin_from'  		=> 'Checkin from',
+    'checkin_note'  		=> 'Checkin Note',
+    'checkout_note'  		=> 'Checkout Note',
     'checkout'  			=> 'Checkout',
     'checkouts_count'       => 'Checkouts',
     'checkins_count'        => 'Checkins',
+    'checkin_and_delete'  	=> 'Checkin and Delete',
     'user_requests_count'   => 'Requests',
     'city'  				=> 'City',
     'click_here'			=> 'Click here',
@@ -77,7 +83,7 @@ return [
     'consumables'			=> 'Consumables',
     'country'  				=> 'Country',
     'could_not_restore'     => 'Error restoring :item_type: :error',
-    'not_deleted'           => 'The :item_type is not deleted so it cannot be restored',
+    'not_deleted'           => 'The :item_type was not deleted and therefore cannot be restored',
     'create'				=> 'Create New',
     'created'               => 'Item Created',
     'created_asset'			=> 'created asset',
@@ -86,11 +92,13 @@ return [
     'record_created' 		=> 'Record Created',
     'updated_at' 			=> 'Updated at',
     'currency'  			=> '$', // this is deprecated
+    'currency_text'  		=> 'Currency', //
     'current'  				=> 'Current',
     'current_password'      => 'Current Password',
     'customize_report'      => 'Customize Report',
     'custom_report'         => 'Custom Asset Report',
     'dashboard'				=> 'Dashboard',
+    'data_source'           => 'Data Source',
     'days'      			=> 'දින',
     'days_to_next_audit'    => 'Days to Next Audit',
     'date'					=> 'Date',
@@ -98,7 +106,7 @@ return [
     'debug_warning_text'    => 'This application is running in production mode with debugging enabled. This can expose sensitive data if your application is accessible to the outside world. Disable debug mode by setting the <code>APP_DEBUG</code> value in your <code>.env</code> file to <code>false</code>.',
     'delete'  				=> 'Delete',
     'delete_confirm'  		=> 'Are you sure you wish to delete :item?',
-    'delete_confirm_no_undo' => 'Are you sure you wish to delete :item? This can not be undone.',
+    'delete_confirm_no_undo' => 'Are you sure, you wish to delete :item? This cannot be undone.',
     'deleted'  				=> 'Deleted',
     'delete_seats'  		=> 'Deleted Seats',
     'deletion_failed'       => 'Deletion failed',
@@ -114,29 +122,13 @@ return [
     'editprofile'  			=> 'Edit Your Profile',
     'eol'					=> 'EOL',
     'email_domain'			=> 'Email Domain',
-    'email_format'			=> 'Email Format',
     'employee_number'       => 'Employee Number',
     'email_domain_help'		=> 'This is used to generate email addresses when importing',
     'error'				    => 'Error',
     'exclude_archived'      => 'Exclude Archived Assets',
     'exclude_deleted'       => 'Exclude Deleted Assets',
     'example'				=> 'Example: ',
-    'filastname_format'			=> 'First Initial Last Name (jsmith@example.com)',
-    'firstname_lastname_format'	=> 'First Name Last Name (jane.smith@example.com)',
-    'firstname_lastname_underscore_format' => 'First Name Last Name (jane_smith@example.com)',
-    'lastnamefirstinitial_format' =>  'Last Name First Initial (smithj@example.com)',
-    'firstintial_dot_lastname_format' => 'First Initial Last Name (j.smith@example.com)',
-    'firstname_lastname_display'	=> 'First Name Last Name (Jane Smith)',
-    'lastname_firstname_display'	=> 'Last Name First Name (Smith Jane)',
-    'name_display_format'	=> 'Name Display Format',
-    'first'					=> 'First',
-    'firstnamelastname'     => 'First Name Last Name (janesmith@example.com)',
-    'lastname_firstinitial' => 'Last Name First Initial (smith_j@example.com)',
-    'firstinitial.lastname' => 'First Initial Last Name (j.smith@example.com)',
-    'firstnamelastinitial'  => 'First Name Last Initial (janes@example.com)',
-    'lastnamefirstname'      => 'Last Name First Name (smith.jane@example.com)',
-    'first_name'			=> 'First Name',
-    'first_name_format'		=> 'First Name (jane@example.com)',
+
     'files'                 => 'Files',
     'file_name'				=> 'File',
     'file_type'             => 'File Type',
@@ -156,9 +148,9 @@ return [
     'image_delete'         	=> 'Delete Image',
     'include_deleted'       => 'Include Deleted Assets',
     'image_upload'         	=> 'Upload Image',
-    'filetypes_accepted_help'    => 'Accepted filetype is :types. Max upload size allowed is :size.|Accepted filetypes are :types. Max upload size allowed is :size.',
-    'filetypes_size_help'   => 'Max upload size allowed is :size.',
-    'image_filetypes_help'  => 'Accepted filetypes are jpg, webp, png, gif, svg, and avif. Max upload size allowed is :size.',
+    'filetypes_accepted_help'    => 'Accepted filetype is :types. The maximum size allowed is :size.|Accepted filetypes are :types. The maximum upload size allowed is :size.',
+    'filetypes_size_help'   => 'The maximum upload size allowed is :size.',
+    'image_filetypes_help'  => 'Accepted Filetypes are jpg, webp, png, gif, svg, and avif. The maximum upload size allowed is :size.',
     'unaccepted_image_type'  => 'This image file was not readable. Accepted filetypes are jpg, webp, png, gif, and svg. The mimetype of this file is: :mimetype.',
     'import'         	    => 'Import',
     'import_this_file'      => 'Map fields and process this file',
@@ -178,12 +170,17 @@ return [
     'last'					=> 'Last',
     'last_login'            => 'Last Login',
     'last_name'             => 'Last Name',
+    'firstname_lastname_display'	=> 'First Name Last Name (Jane Smith)',
+    'lastname_firstname_display'	=> 'Last Name First Name (Smith Jane)',
+    'name_display_format'	=> 'Name Display Format',
+    'first'					=> 'First',
+    'first_name'			=> 'First Name',
     'license'				=> 'License',
     'license_report'        => 'License Report',
     'licenses_available'	=> 'Licenses available',
     'licenses'				=> 'Licenses',
     'list_all'				=> 'List All',
-    'loading'				=> 'Loading... please wait....',
+    'loading'				=> 'Loading... please wait...',
     'lock_passwords'        => 'This field value will not be saved in a demo installation.',
     'feature_disabled'      => 'This feature has been disabled for the demo installation.',
     'location'              => 'Location',
@@ -193,7 +190,7 @@ return [
     'logout'				=> 'Logout',
     'lookup_by_tag'     => 'Lookup by Asset Tag',
     'maintenances'          => 'Maintenances',
-    'manage_api_keys'       => 'Manage API Keys',
+    'manage_api_keys'       => 'Manage API keys',
     'manufacturer'			=> 'Manufacturer',
     'manufacturers'			=> 'Manufacturers',
     'markdown'				=> 'This field allows <a href="https://help.github.com/articles/github-flavored-markdown/">Github flavored markdown</a>.',
@@ -215,6 +212,14 @@ return [
     'no_results'			=> 'No Results.',
     'no'  					=> 'No',
     'notes'  				=> 'සටහන්',
+    'note_added'            => 'Note Added',
+    'options'				=> 'Options',
+    'preview'				=> 'Preview',
+    'add_note'              => 'Add Note',
+    'note_edited'            => 'Note Edited',
+    'edit_note'              => 'Edit Note',
+    'note_deleted'            => 'Note Deleted',
+    'delete_note'              => 'Delete Note',
     'order_number'          => 'Order Number',
     'only_deleted'          => 'Only Deleted Assets',
     'page_menu'				=> 'Showing _MENU_ items',
@@ -229,7 +234,7 @@ return [
     'purchase_date'         => 'Purchase Date',
     'qty'		            => 'QTY',
     'quantity'		        => 'Quantity',
-    'quantity_minimum'      => 'You have :count items below or almost below minimum quantity levels',
+    'quantity_minimum'      => 'You have one item below or almost below minimum quantity levels|You have :count items below or almost below minimum quantity levels',
     'quickscan_checkin'  	=> 'Quick Scan Checkin',
     'quickscan_checkin_status'  	=> 'Checkin Status',
     'ready_to_deploy'		=> 'Ready to Deploy',
@@ -254,7 +259,7 @@ return [
     'select_all'            => 'Select All',
     'search'				=> 'Search',
     'select_category'       => 'Select a Category',
-    'select_datasource' => 'Select a Datasource',
+    'select_datasource' => 'Select a data source',
     'select_department'     => 'Select a Department',
     'select_depreciation'	=> 'Select a Depreciation Type',
     'select_location'		=> 'Select a Location',
@@ -274,13 +279,15 @@ return [
     'signed_off_by'         => 'Signed Off By',
     'skin'       			=> 'Skin',
     'webhook_msg_note'        => 'A notification will be sent via webhook',
-    'webhook_test_msg'        => 'Oh hai! Looks like your :app integration with Snipe-IT is working!',
+    'webhook_test_msg'        => 'Oh hai! It looks like your :app integration with Snipe-IT is working!',
     'some_features_disabled' => 'DEMO MODE: Some features are disabled for this installation.',
     'site_name'				=> 'Site Name',
     'state'  				=> 'State',
     'status_labels'			=> 'Status Labels',
+    'status_label'			=> 'Status Label',
     'status'    			=> 'Status',
     'accept_eula'           => 'Acceptance Agreement',
+    'show_or_hide_eulas' => 'Show/Hide EULAs',
     'supplier'              => 'Supplier',
     'suppliers'  			=> 'Suppliers',
     'sure_to_delete'        => 'Are you sure you wish to delete',
@@ -296,9 +303,9 @@ return [
     'type'  				=> 'Type',
     'undeployable'			=> 'Un-deployable',
     'unknown_admin'			=> 'Unknown Admin',
-    'username_format'		=> 'Username Format',
     'username'              => 'Username',
     'update'                => 'යාවත්කාල',
+    'updating_item' => 'Updating :item',
     'upload_filetypes_help'      => 'Allowed filetypes are png, gif, jpg, jpeg, doc, docx, pdf, xls, xlsx, txt, lic, xml, zip, rtf and rar. Max upload size allowed is :size.',
     'uploaded'              => 'Uploaded',
     'user'					=> 'User',
@@ -323,10 +330,10 @@ return [
     'token_expired'         => 'Your form session has expired. Please try again.',
     'login_enabled'         => 'Login Enabled',
     'audit_due'             => 'Due for Audit',
-    'audit_due_days'        => 'Assets Due for Audit Within :days Day|Assets Due for Audit Within :days Days',
+    'audit_due_days'        => '{}Assets Due or Overdue for Audit|[1]Assets Due or Overdue for Audit Within a Day|[2,*]Assets Due or Overdue for Audit Within :days Days',
     'checkin_due'           => 'Due for Checkin',
     'checkin_overdue'       => 'Overdue for Checkin',
-    'checkin_due_days'      => 'Assets Due for Checkin Within :days Day|Assets Due for Checkin Within :days Days',
+    'checkin_due_days'      => '{}Due for Checkin|[1]Assets Due for Checkin Within :days Day|[2,*]Assets Due for Checkin Within :days Days',
     'audit_overdue'         => 'Overdue for Audit',
     'accept'                => 'Accept :asset',
     'i_accept'              => 'I accept',
@@ -339,16 +346,16 @@ return [
     'view_all'              => 'view all',
     'hide_deleted'          => 'Hide Deleted',
     'email'                 => 'Email',
-    'do_not_change'         => 'Do Not Change',
-    'bug_report'            => 'Report a Bug',
+    'do_not_change'         => 'Do not change',
+    'bug_report'            => 'Report a bug',
     'user_manual'           => 'User\'s Manual',
     'setup_step_1'          => 'Step 1',
     'setup_step_2'          => 'Step 2',
     'setup_step_3'          => 'Step 3',
     'setup_step_4'          => 'Step 4',
     'setup_config_check'    => 'Configuration Check',
-    'setup_create_database' => 'Create Database Tables',
-    'setup_create_admin'    => 'Create Admin User',
+    'setup_create_database' => 'Create database tables',
+    'setup_create_admin'    => 'Create an admin user',
     'setup_done'            => 'Finished!',
     'bulk_edit_about_to'    => 'You are about to edit the following: ',
     'checked_out'           => 'Checked Out',
@@ -383,6 +390,8 @@ return [
     'new_license'           => 'New License',
     'new_accessory'         => 'New Accessory',
     'new_consumable'        => 'New Consumable',
+    'new_component'         => 'New Component',
+    'new_user'              => 'New User',
     'collapse'              => 'Collapse',
     'assigned'              => 'Assigned',
     'asset_count'           => 'Asset Count',
@@ -418,19 +427,20 @@ return [
     'bulk_soft_delete'      =>'Also soft-delete these users. Their asset history will remain intact unless/until you purge deleted records in the Admin Settings.',
     'bulk_checkin_delete_success' => 'Your selected users have been deleted and their items have been checked in.',
     'bulk_checkin_success' => 'The items for the selected users have been checked in.',
-    'set_to_null'           => 'Delete values for this asset|Delete values for all :asset_count assets ',
+    'set_to_null'           => 'Delete values for this selection|Delete values for all :selection_count selections ',
     'set_users_field_to_null'  => 'Delete :field values for this user|Delete :field values for all :user_count users ',
     'na_no_purchase_date'   => 'N/A - No purchase date provided',
     'assets_by_status'      => 'Assets by Status',
     'assets_by_status_type'      => 'Assets by Status Type',
     'pie_chart_type'        => 'Dashboard Pie Chart Type',
     'hello_name'            => 'Hello, :name!',
-    'unaccepted_profile_warning'   => 'You have :count items requiring acceptance. Click here to accept or decline them',
+    'unaccepted_profile_warning'   => 'You have one item requiring acceptance. Click here to accept or decline it | You have :count items requiring acceptance. Click here to accept or decline them',
     'start_date'            => 'Start Date',
     'end_date'            => 'End Date',
     'alt_uploaded_image_thumbnail' => 'Uploaded thumbnail',
     'placeholder_kit'       => 'Select a kit',
     'file_not_found'        => 'File not found',
+    'log_record_not_found'  => 'No record for that log entry was found.',
     'preview_not_available' => '(no preview)',
     'setup'                 => 'Setup',
     'pre_flight'            => 'Pre-Flight',
@@ -512,7 +522,7 @@ return [
     'checked_out_to_fields' => 'Checked Out To Fields',
     'percent_complete' => '% complete',
     'uploading' => 'Uploading... ',
-    'upload_error' => 'Error uploading file. Please check that there are no empty rows and that no column names are duplicated.',
+    'upload_error' => 'Error uploading file. Please check that you have no empty rows or duplicated column names in your CSV, and that the server permissions allow uploads.',
     'copy_to_clipboard' => 'Copy to Clipboard',
     'copied' => 'Copied!',
     'status_compatibility' => 'If assets are already assigned, they cannot be changed to a non-deployable status type and this value change will be skipped.',
@@ -549,6 +559,71 @@ return [
         'license_seats'  => ':count License Seat|:count License Seats',
         'consumables'  => ':count Consumable|:count Consumables',
         'components'  => ':count Component|:count Components',
-    ]
+    ],
+
+    'more_info' => 'More Info',
+    'quickscan_bulk_help' => 'Checking this box will edit the asset record to reflect this new location. Leaving it unchecked will simply note the location in the audit log. Note that if this asset is checked out, it will not change the location of the person, asset or location it is checked out to.',
+    'whoops' => 'Whoops!',
+    'something_went_wrong' => 'Something went wrong with your request.',
+    'close' => 'Close',
+    'expires' => 'Expires',
+    'map_fields'=> 'Map :item_type Fields',
+    'remaining_var' => ':count Remaining',
+    'label' => 'Label',
+    'import_asset_tag_exists' => 'An asset with the asset tag :asset_tag already exists and an update was not requested. No change was made.',
+    'countries_manually_entered_help' => 'Values with an asterisk (*) were manually entered and do not match existing ISO 3166 dropdown values',
+    'accessories_assigned' => 'Assigned Accessories',
+    'user_managed_passwords' => 'Password Management',
+    'user_managed_passwords_disallow' => 'Disallow users from managing their own passwords',
+    'user_managed_passwords_allow' => 'Allow users to manage their own passwords',
+    'from' => 'From',
+    'by' => 'By',
+
+// Add form placeholders here
+    'placeholders' => [
+        'notes'  => 'Add a note',
+    ],
+
+    'breadcrumb_button_actions' => [
+        'edit_item' => 'Edit :name',
+        'checkout_item' => 'Checkout :name',
+        'checkin_item' => 'Checkin :name',
+    ],
+
+    'skins' => [
+        'site_default' => 'Site Default',
+        'default_blue' => 'Default Blue',
+        'blue_dark' => 'Blue (Dark Mode)',
+        'green' => 'Green Dark',
+        'green_dark' => 'Green (Dark Mode)',
+        'red' => 'Red Dark',
+        'red_dark' => 'Red (Dark Mode)',
+        'orange' => 'Orange Dark',
+        'orange_dark' => 'Orange (Dark Mode)',
+        'black' => 'Black',
+        'black_dark' => 'Black (Dark Mode)',
+        'purple' => 'Purple',
+        'purple_dark' => 'Purple (Dark Mode)',
+        'yellow' => 'Yellow',
+        'yellow_dark' => 'Yellow (Dark Mode)',
+        'high_contrast' => 'High Contrast',
+
+    ],
+
+    'select_all_none' => 'Select/Unselect All',
+    'generic_model_not_found' => 'That :model was not found or you do not have permission to access it',
+    'deleted_models' => 'Deleted Asset Models',
+    'deleted_users' => 'Deleted Users',
+    'cost_each' => ':amount each',
+    'remove_current_image' => 'Remove current :type image',
+
+    'seeding' => [
+        'manufacturers' => [
+            'button' => 'Create Manufacturers',
+            'prompt' => 'You do not have any manufacturers yet. Would you like to seed a list of common manufacturers? (THIS WILL OVERWRITE EXISTING MANUFACTURERS, including those that have been soft-deleted.)',
+            'success' => 'Manufacturers seeded successfully',
+            'error' => 'Could not seed manufacturers. A manufacturer record already exists and seeding would overwrite it.|Could not seed manufacturers. :count manufacturer records already exist and seeding would overwrite them.',
+        ],
+    ],
 
 ];
diff --git a/resources/lang/si-LK/localizations.php b/resources/lang/si-LK/localizations.php
index f1232dd138..827ed4fca1 100644
--- a/resources/lang/si-LK/localizations.php
+++ b/resources/lang/si-LK/localizations.php
@@ -2,7 +2,7 @@
 
 return [
 
-    'select_language' => 'Select a language',
+    'select_language' => 'Select a Language',
     'languages' => [
         'en-US'=> 'English, US',
         'en-GB'=> 'English, UK',
@@ -40,7 +40,9 @@ return [
         'ms-MY'=> 'Malay',
         'mi-NZ'=> 'Maori',
         'mn-MN'=> 'Mongolian',
-        'no-NO'=> 'Norwegian',
+        'nb-NO'=> 'Norwegian Bokmål',
+        'om-ET' => 'Oromo (Ethiopian)',
+        //'nn-NO'=> 'Norwegian Nynorsk',
         'fa-IR'=> 'Persian',
         'pl-PL'=> 'Polish',
         'pt-PT'=> 'Portuguese',
@@ -66,7 +68,7 @@ return [
         'zu-ZA'=> 'Zulu',
     ],
 
-    'select_country' => 'Select a country',
+    'select_country' => 'Select a Country',
     
     'countries' => [
         'AC'=>'Ascension Island',
@@ -133,6 +135,7 @@ return [
         'EC'=>'Ecuador',
         'EE'=>'Estonia',
         'EG'=>'Egypt',
+        'GB-ENG'=>'England',
         'ER'=>'Eritrea',
         'ES'=>'Spain',
         'ET'=>'Ethiopia',
@@ -231,6 +234,7 @@ return [
         'NG'=>'Nigeria',
         'NI'=>'Nicaragua',
         'NL'=>'Netherlands',
+        'GB-NIR' => 'Northern Ireland',
         'NO'=>'Norway',
         'NP'=>'Nepal',
         'NR'=>'Nauru',
@@ -258,7 +262,7 @@ return [
         'RU'=>'Russian Federation',
         'RW'=>'Rwanda',
         'SA'=>'Saudi Arabia',
-        'UK'=>'Scotland',
+        'GB-SCT'=>'Scotland',
         'SB'=>'Solomon Islands',
         'SC'=>'Seychelles',
         'SS'=>'South Sudan',
@@ -310,6 +314,7 @@ return [
         'VI'=>'Virgin Islands (U.S.)',
         'VN'=>'Viet Nam',
         'VU'=>'Vanuatu',
+        'GB-WLS' =>'Wales',
         'WF'=>'Wallis And Futuna Islands',
         'WS'=>'Samoa',
         'YE'=>'Yemen',
diff --git a/resources/lang/si-LK/mail.php b/resources/lang/si-LK/mail.php
index bb7891c06f..abca4a253a 100644
--- a/resources/lang/si-LK/mail.php
+++ b/resources/lang/si-LK/mail.php
@@ -23,24 +23,25 @@ return [
     'Item_Requested' => 'Item Requested',
     'License_Checkin_Notification' => 'License checked in',
     'License_Checkout_Notification' => 'License checked out',
+    'license_for'   => 'License for',
     'Low_Inventory_Report' => 'Low Inventory Report',
     'a_user_canceled' => 'A user has canceled an item request on the website',
     'a_user_requested' => 'A user has requested an item on the website',
     'acceptance_asset_accepted' => 'A user has accepted an item',
     'acceptance_asset_declined' => 'A user has declined an item',
-    'accessory_name' => 'Accessory Name:',
-    'additional_notes' => 'Additional Notes:',
+    'accessory_name' => 'Accessory Name',
+    'additional_notes' => 'Additional Notes',
     'admin_has_created' => 'An administrator has created an account for you on the :web website.',
-    'asset' => 'Asset:',
-    'asset_name' => 'Asset Name:',
+    'asset' => 'Asset',
+    'asset_name' => 'Asset Name',
     'asset_requested' => 'Asset requested',
     'asset_tag' => 'Asset Tag',
     'assets_warrantee_alert' => 'There is :count asset with a warranty expiring in the next :threshold days.|There are :count assets with warranties expiring in the next :threshold days.',
     'assigned_to' => 'Assigned To',
     'best_regards' => 'Best regards,',
-    'canceled' => 'Canceled:',
-    'checkin_date' => 'Checkin Date:',
-    'checkout_date' => 'Checkout Date:',
+    'canceled' => 'Canceled',
+    'checkin_date' => 'Checkin Date',
+    'checkout_date' => 'Checkout Date',
     'checkedout_from' => 'Checked out from',
     'checkedin_from'  => 'Checked in from',
     'checked_into' => 'Checked into',
@@ -49,27 +50,30 @@ return [
     'click_to_confirm' => 'Please click on the following link to confirm your :web account:',
     'current_QTY' => 'Current QTY',
     'days' => 'දින',
-    'expecting_checkin_date' => 'Expected Checkin Date:',
+    'expecting_checkin_date' => 'Expected Checkin Date',
     'expires' => 'Expires',
     'hello' => 'Hello',
     'hi' => 'Hi',
     'i_have_read' => 'I have read and agree to the terms of use, and have received this item.',
     'inventory_report' => 'Inventory Report',
-    'item' => 'Item:',
+    'item' => 'Item',
+    'item_checked_reminder' => 'This is a reminder that you currently have :count items checked out to you that you have not accepted or declined. Please click the link below to confirm your decision.',
     'license_expiring_alert' => 'There is :count license expiring in the next :threshold days.|There are :count licenses expiring in the next :threshold days.',
     'link_to_update_password' => 'Please click on the following link to update your :web password:',
-    'login' => 'Login:',
+    'login' => 'Login',
     'login_first_admin' => 'Login to your new Snipe-IT installation using the credentials below:',
     'low_inventory_alert' => 'There is :count item that is below minimum inventory or will soon be low.|There are :count items that are below minimum inventory or will soon be low.',
     'min_QTY' => 'Min QTY',
     'name' => 'Name',
     'new_item_checked' => 'A new item has been checked out under your name, details are below.',
+    'new_item_checked_with_acceptance' => 'A new item has been checked out under your name that requires acceptance, details are below.',
+    'recent_item_checked' => 'An item was recently checked out under your name that requires acceptance, details are below.',
     'notes' => 'සටහන්',
-    'password' => 'Password:',
+    'password' => 'Password',
     'password_reset' => 'Password Reset',
     'read_the_terms' => 'Please read the terms of use below.',
     'read_the_terms_and_click' => 'Please read the terms of use below, and click on the link at the bottom to confirm that you read and agree to the terms of use, and have received the asset.',
-    'requested' => 'Requested:',
+    'requested' => 'Requested',
     'reset_link' => 'Your Password Reset Link',
     'reset_password' => 'Click here to reset your password:',
     'rights_reserved' => 'All rights reserved.',
@@ -86,8 +90,10 @@ return [
     'upcoming-audits' => 'There is :count asset that is coming up for audit within :threshold days.|There are :count assets that are coming up for audit within :threshold days.',
     'user' => 'User',
     'username' => 'Username',
+    'unaccepted_asset_reminder' => 'Reminder: You have Unaccepted Assets.',
     'welcome' => 'Welcome :name',
     'welcome_to' => 'Welcome to :web!',
     'your_assets' => 'View Your Assets',
     'your_credentials' => 'Your Snipe-IT credentials',
+    'mail_sent' => 'Mail sent successfully!',
 ];
diff --git a/resources/lang/si-LK/validation.php b/resources/lang/si-LK/validation.php
index 05374e23af..99c847f589 100644
--- a/resources/lang/si-LK/validation.php
+++ b/resources/lang/si-LK/validation.php
@@ -13,87 +13,150 @@ return [
     |
     */
 
-    'accepted'             => 'The :attribute must be accepted.',
-    'active_url'           => 'The :attribute is not a valid URL.',
-    'after'                => 'The :attribute must be a date after :date.',
-    'after_or_equal'       => 'The :attribute must be a date after or equal to :date.',
-    'alpha'                => 'The :attribute may only contain letters.',
-    'alpha_dash'           => 'The :attribute may only contain letters, numbers, and dashes.',
-    'alpha_num'            => 'The :attribute may only contain letters and numbers.',
-    'array'                => 'The :attribute must be an array.',
-    'before'               => 'The :attribute must be a date before :date.',
-    'before_or_equal'      => 'The :attribute must be a date before or equal to :date.',
-    'between'              => [
-        'numeric' => 'The :attribute must be between :min - :max.',
-        'file'    => 'The :attribute must be between :min - :max kilobytes.',
-        'string'  => 'The :attribute must be between :min - :max characters.',
-        'array'   => 'The :attribute must have between :min and :max items.',
+    'accepted' => 'The :attribute field must be accepted.',
+    'accepted_if' => 'The :attribute field must be accepted when :other is :value.',
+    'active_url' => 'The :attribute field must be a valid URL.',
+    'after' => 'The :attribute field must be a date after :date.',
+    'after_or_equal' => 'The :attribute field must be a date after or equal to :date.',
+    'alpha' => 'The :attribute field must only contain letters.',
+    'alpha_dash' => 'The :attribute field must only contain letters, numbers, dashes, and underscores.',
+    'alpha_num' => 'The :attribute field must only contain letters and numbers.',
+    'array' => 'The :attribute field must be an array.',
+    'ascii' => 'The :attribute field must only contain single-byte alphanumeric characters and symbols.',
+    'before' => 'The :attribute field must be a date before :date.',
+    'before_or_equal' => 'The :attribute field must be a date before or equal to :date.',
+    'between' => [
+        'array' => 'The :attribute field must have between :min and :max items.',
+        'file' => 'The :attribute field must be between :min and :max kilobytes.',
+        'numeric' => 'The :attribute field must be between :min and :max.',
+        'string' => 'The :attribute field must be between :min and :max characters.',
     ],
-    'boolean'              => 'The :attribute must be true or false.',
-    'confirmed'            => 'The :attribute confirmation does not match.',
-    'date'                 => 'The :attribute is not a valid date.',
-    'date_format'          => 'The :attribute does not match the format :format.',
-    'different'            => 'The :attribute and :other must be different.',
-    'digits'               => 'The :attribute must be :digits digits.',
-    'digits_between'       => 'The :attribute must be between :min and :max digits.',
-    'dimensions'           => 'The :attribute has invalid image dimensions.',
-    'distinct'             => 'The :attribute field has a duplicate value.',
-    'email'                => 'The :attribute format is invalid.',
-    'exists'               => 'The selected :attribute is invalid.',
-    'file'                 => 'The :attribute must be a file.',
-    'filled'               => 'The :attribute field must have a value.',
-    'image'                => 'The :attribute must be an image.',
+    'boolean' => 'The :attribute field must be true or false.',
+    'can' => 'The :attribute field contains an unauthorized value.',
+    'confirmed' => 'The :attribute field confirmation does not match.',
+    'contains' => 'The :attribute field is missing a required value.',
+    'current_password' => 'The password is incorrect.',
+    'date' => 'The :attribute field must be a valid date.',
+    'date_equals' => 'The :attribute field must be a date equal to :date.',
+    'date_format' => 'The :attribute field must match the format :format.',
+    'decimal' => 'The :attribute field must have :decimal decimal places.',
+    'declined' => 'The :attribute field must be declined.',
+    'declined_if' => 'The :attribute field must be declined when :other is :value.',
+    'different' => 'The :attribute field and :other must be different.',
+    'digits' => 'The :attribute field must be :digits digits.',
+    'digits_between' => 'The :attribute field must be between :min and :max digits.',
+    'dimensions' => 'The :attribute field has invalid image dimensions.',
+    'distinct' => 'The :attribute field has a duplicate value.',
+    'doesnt_end_with' => 'The :attribute field must not end with one of the following: :values.',
+    'doesnt_start_with' => 'The :attribute field must not start with one of the following: :values.',
+    'email' => 'The :attribute field must be a valid email address.',
+    'ends_with' => 'The :attribute field must end with one of the following: :values.',
+    'enum' => 'The selected :attribute is invalid.',
+    'exists' => 'The selected :attribute is invalid.',
+    'extensions' => 'The :attribute field must have one of the following extensions: :values.',
+    'file' => 'The :attribute field must be a file.',
+    'filled' => 'The :attribute field must have a value.',
+    'gt' => [
+        'array' => 'The :attribute field must have more than :value items.',
+        'file' => 'The :attribute field must be greater than :value kilobytes.',
+        'numeric' => 'The :attribute field must be greater than :value.',
+        'string' => 'The :attribute field must be greater than :value characters.',
+    ],
+    'gte' => [
+        'array' => 'The :attribute field must have :value items or more.',
+        'file' => 'The :attribute field must be greater than or equal to :value kilobytes.',
+        'numeric' => 'The :attribute field must be greater than or equal to :value.',
+        'string' => 'The :attribute field must be greater than or equal to :value characters.',
+    ],
+    'hex_color' => 'The :attribute field must be a valid hexadecimal color.',
+    'image' => 'The :attribute field must be an image.',
     'import_field_empty'    => 'The value for :fieldname cannot be null.',
-    'in'                   => 'The selected :attribute is invalid.',
-    'in_array'             => 'The :attribute field does not exist in :other.',
-    'integer'              => 'The :attribute must be an integer.',
-    'ip'                   => 'The :attribute must be a valid IP address.',
-    'ipv4'                 => 'The :attribute must be a valid IPv4 address.',
-    'ipv6'                 => 'The :attribute must be a valid IPv6 address.',
-    'is_unique_department' => 'The :attribute must be unique to this Company Location',
-    'json'                 => 'The :attribute must be a valid JSON string.',
-    'max'                  => [
-        'numeric' => 'The :attribute may not be greater than :max.',
-        'file'    => 'The :attribute may not be greater than :max kilobytes.',
-        'string'  => 'The :attribute may not be greater than :max characters.',
-        'array'   => 'The :attribute may not have more than :max items.',
+    'in' => 'The selected :attribute is invalid.',
+    'in_array' => 'The :attribute field must exist in :other.',
+    'integer' => 'The :attribute field must be an integer.',
+    'ip' => 'The :attribute field must be a valid IP address.',
+    'ipv4' => 'The :attribute field must be a valid IPv4 address.',
+    'ipv6' => 'The :attribute field must be a valid IPv6 address.',
+    'json' => 'The :attribute field must be a valid JSON string.',
+    'list' => 'The :attribute field must be a list.',
+    'lowercase' => 'The :attribute field must be lowercase.',
+    'lt' => [
+        'array' => 'The :attribute field must have less than :value items.',
+        'file' => 'The :attribute field must be less than :value kilobytes.',
+        'numeric' => 'The :attribute field must be less than :value.',
+        'string' => 'The :attribute field must be less than :value characters.',
     ],
-    'mimes'                => 'The :attribute must be a file of type: :values.',
-    'mimetypes'            => 'The :attribute must be a file of type: :values.',
-    'min'                  => [
-        'numeric' => 'The :attribute must be at least :min.',
-        'file'    => 'The :attribute must be at least :min kilobytes.',
-        'string'  => 'The :attribute must be at least :min characters.',
-        'array'   => 'The :attribute must have at least :min items.',
+    'lte' => [
+        'array' => 'The :attribute field must not have more than :value items.',
+        'file' => 'The :attribute field must be less than or equal to :value kilobytes.',
+        'numeric' => 'The :attribute field must be less than or equal to :value.',
+        'string' => 'The :attribute field must be less than or equal to :value characters.',
     ],
-    'starts_with'          => 'The :attribute must start with one of the following: :values.',
-    'ends_with'            => 'The :attribute must end with one of the following: :values.',
+    'mac_address' => 'The :attribute field must be a valid MAC address.',
+    'max' => [
+        'array' => 'The :attribute field must not have more than :max items.',
+        'file' => 'The :attribute field must not be greater than :max kilobytes.',
+        'numeric' => 'The :attribute field must not be greater than :max.',
+        'string' => 'The :attribute field must not be greater than :max characters.',
+    ],
+    'max_digits' => 'The :attribute field must not have more than :max digits.',
+    'mimes' => 'The :attribute field must be a file of type: :values.',
+    'mimetypes' => 'The :attribute field must be a file of type: :values.',
+    'min' => [
+        'array' => 'The :attribute field must have at least :min items.',
+        'file' => 'The :attribute field must be at least :min kilobytes.',
+        'numeric' => 'The :attribute field must be at least :min.',
+        'string' => 'The :attribute field must be at least :min characters.',
+    ],
+    'min_digits' => 'The :attribute field must have at least :min digits.',
+    'missing' => 'The :attribute field must be missing.',
+    'missing_if' => 'The :attribute field must be missing when :other is :value.',
+    'missing_unless' => 'The :attribute field must be missing unless :other is :value.',
+    'missing_with' => 'The :attribute field must be missing when :values is present.',
+    'missing_with_all' => 'The :attribute field must be missing when :values are present.',
+    'multiple_of' => 'The :attribute field must be a multiple of :value.',
+    'not_in' => 'The selected :attribute is invalid.',
+    'not_regex' => 'The :attribute field format is invalid.',
+    'numeric' => 'The :attribute field must be a number.',
+    'password' => [
+        'letters' => 'The :attribute field must contain at least one letter.',
+        'mixed' => 'The :attribute field must contain at least one uppercase and one lowercase letter.',
+        'numbers' => 'The :attribute field must contain at least one number.',
+        'symbols' => 'The :attribute field must contain at least one symbol.',
+        'uncompromised' => 'The given :attribute has appeared in a data leak. Please choose a different :attribute.',
+    ],
+    'percent'       => 'The depreciation minimum must be between 0 and 100 when depreciation type is percentage.',
 
-    'not_in'               => 'The selected :attribute is invalid.',
-    'numeric'              => 'The :attribute must be a number.',
-    'present'              => 'The :attribute field must be present.',
-    'valid_regex'          => 'That is not a valid regex. ',
-    'regex'                => 'The :attribute format is invalid.',
-    'required'             => 'The :attribute field is required.',
-    'required_if'          => 'The :attribute field is required when :other is :value.',
-    'required_unless'      => 'The :attribute field is required unless :other is in :values.',
-    'required_with'        => 'The :attribute field is required when :values is present.',
-    'required_with_all'    => 'The :attribute field is required when :values is present.',
-    'required_without'     => 'The :attribute field is required when :values is not present.',
+    'present' => 'The :attribute field must be present.',
+    'present_if' => 'The :attribute field must be present when :other is :value.',
+    'present_unless' => 'The :attribute field must be present unless :other is :value.',
+    'present_with' => 'The :attribute field must be present when :values is present.',
+    'present_with_all' => 'The :attribute field must be present when :values are present.',
+    'prohibited' => 'The :attribute field is prohibited.',
+    'prohibited_if' => 'The :attribute field is prohibited when :other is :value.',
+    'prohibited_unless' => 'The :attribute field is prohibited unless :other is in :values.',
+    'prohibits' => 'The :attribute field prohibits :other from being present.',
+    'regex' => 'The :attribute field format is invalid.',
+    'required' => 'The :attribute field is required.',
+    'required_array_keys' => 'The :attribute field must contain entries for: :values.',
+    'required_if' => 'The :attribute field is required when :other is :value.',
+    'required_if_accepted' => 'The :attribute field is required when :other is accepted.',
+    'required_if_declined' => 'The :attribute field is required when :other is declined.',
+    'required_unless' => 'The :attribute field is required unless :other is in :values.',
+    'required_with' => 'The :attribute field is required when :values is present.',
+    'required_with_all' => 'The :attribute field is required when :values are present.',
+    'required_without' => 'The :attribute field is required when :values is not present.',
     'required_without_all' => 'The :attribute field is required when none of :values are present.',
-    'same'                 => 'The :attribute and :other must match.',
-    'size'                 => [
-        'numeric' => 'The :attribute must be :size.',
-        'file'    => 'The :attribute must be :size kilobytes.',
-        'string'  => 'The :attribute must be :size characters.',
-        'array'   => 'The :attribute must contain :size items.',
+    'same' => 'The :attribute field must match :other.',
+    'size' => [
+        'array' => 'The :attribute field must contain :size items.',
+        'file' => 'The :attribute field must be :size kilobytes.',
+        'numeric' => 'The :attribute field must be :size.',
+        'string' => 'The :attribute field must be :size characters.',
     ],
+    'starts_with' => 'The :attribute field must start with one of the following: :values.',
     'string'               => 'The :attribute must be a string.',
-    'timezone'             => 'The :attribute must be a valid zone.',
     'two_column_unique_undeleted' => 'The :attribute must be unique across :table1 and :table2. ',
-    'unique'               => 'The :attribute has already been taken.',
-    'uploaded'             => 'The :attribute failed to upload.',
-    'url'                  => 'The :attribute format is invalid.',
     'unique_undeleted'     => 'The :attribute must be unique.',
     'non_circular'         => 'The :attribute must not create a circular reference.',
     'not_array'            => ':attribute cannot be an array.',
@@ -102,11 +165,14 @@ return [
     'numbers'              => 'Password must contain at least one number.',
     'case_diff'            => 'Password must use mixed case.',
     'symbols'              => 'Password must contain symbols.',
-    'gte'                  => [
-        'numeric'          => 'Value cannot be negative'
-    ],
-    'checkboxes'           => ':attribute contains invalid options.',
-    'radio_buttons'        => ':attribute is invalid.',
+    'timezone' => 'The :attribute field must be a valid timezone.',
+    'unique' => 'The :attribute has already been taken.',
+    'uploaded' => 'The :attribute failed to upload.',
+    'uppercase' => 'The :attribute field must be uppercase.',
+    'url' => 'The :attribute field must be a valid URL.',
+    'ulid' => 'The :attribute field must be a valid ULID.',
+    'uuid' => 'The :attribute field must be a valid UUID.',
+    'fmcs_location' => 'Full multiple company support and location scoping is enabled in the Admin Settings, and the selected location and selected company are not compatible.',
 
 
     /*
@@ -120,16 +186,22 @@ return [
     |
     */
 
+    'email_array'      => 'One or more email addresses is invalid.',
+    'checkboxes'           => ':attribute contains invalid options.',
+    'radio_buttons'        => ':attribute is invalid.',
+    
     'custom' => [
         'alpha_space' => 'The :attribute field contains a character that is not allowed.',
-        'email_array'      => 'One or more email addresses is invalid.',
+
         'hashed_pass'      => 'Your current password is incorrect',
         'dumbpwd'          => 'That password is too common.',
         'statuslabel_type' => 'You must select a valid status label type',
+        'custom_field_not_found'          => 'This field does not seem to exist, please double check your custom field names.',
+        'custom_field_not_found_on_model' => 'This field seems to exist, but is not available on this Asset Model\'s fieldset.',
 
         // date_format validation with slightly less stupid messages. It duplicates a lot, but it gets the job done :(
-        // We use this because the default error message for date_format is reflects php Y-m-d, which non-PHP
-        // people won't know how to format. 
+        // We use this because the default error message for date_format reflects php Y-m-d, which non-PHP
+        // people won't know how to format.
         'purchase_date.date_format'     => 'The :attribute must be a valid date in YYYY-MM-DD format',
         'last_audit_date.date_format'   =>  'The :attribute must be a valid date in YYYY-MM-DD hh:mm:ss format',
         'expiration_date.date_format'   =>  'The :attribute must be a valid date in YYYY-MM-DD format',
@@ -137,9 +209,15 @@ return [
         'expected_checkin.date_format'  =>  'The :attribute must be a valid date in YYYY-MM-DD format',
         'start_date.date_format'        =>  'The :attribute must be a valid date in YYYY-MM-DD format',
         'end_date.date_format'          =>  'The :attribute must be a valid date in YYYY-MM-DD format',
+        'invalid_value_in_field' => 'Invalid value included in this field',
 
-    ],
+        'ldap_username_field' => [
+            'not_in' =>         '<code>sAMAccountName</code> (mixed case) will likely not work. You should use <code>samaccountname</code> (lowercase) instead.'
+        ],
+        'ldap_auth_filter_query' => ['not_in' => '<code>uid=samaccountname</code> is probably not a valid auth filter. You probably want <code>uid=</code> '],
+        'ldap_filter' => ['regex' => 'This value should probably not be wrapped in parentheses.'],
 
+        ],
     /*
     |--------------------------------------------------------------------------
     | Custom Validation Attributes
@@ -155,8 +233,16 @@ return [
 
     /*
     |--------------------------------------------------------------------------
-    | Generic Validation Messages
+    | Generic Validation Messages - we use these in the jquery validation where we don't have
+    | access to the :attribute
     |--------------------------------------------------------------------------
     */
-    'invalid_value_in_field' => 'Invalid value included in this field',
+
+    'generic' => [
+        'invalid_value_in_field' => 'Invalid value included in this field',
+        'required' => 'This field is required',
+        'email' => 'Please enter a valid email address',
+    ],
+
+
 ];
diff --git a/resources/lang/sk-SK/account/general.php b/resources/lang/sk-SK/account/general.php
index a1759f999f..98f48ae487 100644
--- a/resources/lang/sk-SK/account/general.php
+++ b/resources/lang/sk-SK/account/general.php
@@ -2,10 +2,16 @@
 
 return array(
     'personal_api_keys' => 'Osobné API kľúče',
-    'api_key_warning' => 'When generating an API token, be sure to copy it down immediately as they will not be visible to you again.',
-    'api_base_url' => 'Your API base url is located at:',
+    'personal_access_token' => 'Osobný prístupový nebolo nájdené',
+    'personal_api_keys_success' => 'Osobný API kľúč :key bol vytovrený úspešne',
+    'here_is_api_key' => 'Tu je váš nový osobný prístupový token. Bude zobrazený iba jeden krát, je dôležité ho nestratiť! Token je možné využiť na realizáciu API volaní.',
+    'api_key_warning' => 'Pri generovaní API tokenu sa uistite, že si ho hneď skopírujete, znovu sa nezobrazí.',
+    'api_base_url' => 'Základná adresa pre API volanie sa nachádza na:',
     'api_base_url_endpoint' => '/&lt;endpoint&gt;',
-    'api_token_expiration_time' => 'API tokens are set to expire in:',
-    'api_reference' => 'Please check the <a href="https://snipe-it.readme.io/reference" target="_blank">API reference</a> to find specific API endpoints and additional API documentation.',
-    'profile_updated' => 'Account successfully updated',
+    'api_token_expiration_time' => 'API token exspiruje:',
+    'api_reference' => 'Prosím skontrolujte <a href="https://snipe-it.readme.io/reference" target="_blank">API referenčnú príručku</a> pre získanie špecifických API endpointov a doplňujúcej API dokumentácie.',
+    'profile_updated' => 'Účet bol úspešne upravený',
+    'no_tokens' => 'Nemáte žiadne osobné prístupové tokeny.',
+    'enable_sounds' => 'Povoliť zvukové efekty',
+    'enable_confetti' => 'Povoliť efekty confetti',
 );
diff --git a/resources/lang/sk-SK/admin/accessories/general.php b/resources/lang/sk-SK/admin/accessories/general.php
index 9041c5120b..e4dad32541 100644
--- a/resources/lang/sk-SK/admin/accessories/general.php
+++ b/resources/lang/sk-SK/admin/accessories/general.php
@@ -16,7 +16,7 @@ return array(
     'update'  							=> 'Upraviť príslušenstvo',
     'use_default_eula'					=> 'Použiť <a href="#" data-toggle="modal" data-target="#eulaModal">predvolený dokument EULA</a> namiesto aktuálneho.',
     'use_default_eula_disabled'			=> '<del>Použiť namiesto aktuálneho predvolený dokument EULA.</del> Predvolený dokument EULA nie je nastavený. Prosím vyberte predvolený dokument v Nastaveniach.',
-    'clone'                             => 'Clone Accessory',
-    'delete_disabled'                   => 'This accessory cannot be deleted yet because some items are still checked out.',
+    'clone'                             => 'Duplikovať príslušenstvo',
+    'delete_disabled'                   => 'Toto príslušenstvo nemôže byť zmazané pretože niektoré položky sú stále odovzdané.',
 
 );
diff --git a/resources/lang/sk-SK/admin/accessories/message.php b/resources/lang/sk-SK/admin/accessories/message.php
index 75fef16772..311baa1742 100644
--- a/resources/lang/sk-SK/admin/accessories/message.php
+++ b/resources/lang/sk-SK/admin/accessories/message.php
@@ -3,35 +3,39 @@
 return array(
 
     'does_not_exist' => 'Príslušenstvo [:id] neexistuje.',
-    'not_found' => 'That accessory was not found.',
-    'assoc_users'	 => 'This accessory currently has :count items checked out to users. Please check in the accessories and and try again. ',
+    'not_found' => 'Toto príslušenstvo nebolo nájdené.',
+    'assoc_users'	 => 'Toto príslušenstvo má momentálne :count položiek priradených používateľom. Prosím prevezmite príslušenstvo od používateľov a skúste znovu. ',
 
     'create' => array(
-        'error'   => 'The accessory was not created, please try again.',
-        'success' => 'The accessory was successfully created.'
+        'error'   => 'Príslušenstvo nebolo vytvorené, skúste prosím znovu.',
+        'success' => 'Príslušenstvo bolo úspešne vytvorené.'
     ),
 
     'update' => array(
-        'error'   => 'The accessory was not updated, please try again',
-        'success' => 'The accessory was updated successfully.'
+        'error'   => 'Príslušenstvo nebolo upravené, skúste prosím znovu',
+        'success' => 'Príslušenstvo bolo úspešne upravené.'
     ),
 
     'delete' => array(
-        'confirm'   => 'Are you sure you wish to delete this accessory?',
-        'error'   => 'There was an issue deleting the accessory. Please try again.',
-        'success' => 'The accessory was deleted successfully.'
+        'confirm'   => 'Ste si istý, že chcete zmazať toto príslušenstvo?',
+        'error'   => 'Pri mazaní príslušenstva nastala chyba. Skúste prosím znovu.',
+        'success' => 'Príslušenstvo bolo úspešne zmazané.'
     ),
 
      'checkout' => array(
-        'error'   		=> 'Accessory was not checked out, please try again',
-        'success' 		=> 'Accessory checked out successfully.',
-        'unavailable'   => 'Accessory is not available for checkout. Check quantity available',
-        'user_does_not_exist' => 'Tento užívateľ nie je platný. Prosím skúste znovu.'
+        'error'   		=> 'Príslušenstvo nebolo priradené, skúste prosím znovu',
+        'success' 		=> 'Príslušenstvo bolo úspešne priradené.',
+        'unavailable'   => 'Príslušenstvo nie je dostupné na priradenie. Overte dostupné množstvo',
+        'user_does_not_exist' => 'Tento užívateľ nie je platný. Prosím skúste znovu.',
+         'checkout_qty' => array(
+            'lte'  => 'Aktuálne je dostupný iba jeden kus tohto príslušenstva a vy sa snažíte priradiť :checkout_qty. Prosím upravte priraďované množstvo alebo celkové zásoby tohto príslušenstva a skúste znovu.|Aktuálne sú dostupné iba :number_currently_remaining kusy tohto príslušenstva a vy sa snažíte priradiť :checkout_qty. Prosím upravte priraďované množstvo alebo celkové zásoby tohto príslušenstva a skúste znovu.',
+            ),
+           
     ),
 
     'checkin' => array(
-        'error'   		=> 'Accessory was not checked in, please try again',
-        'success' 		=> 'Accessory checked in successfully.',
+        'error'   		=> 'Príslušenstvo nebolo prevzaté, skúste znovu',
+        'success' 		=> 'Príslušenstvo bolo úspešne prevzaté.',
         'user_does_not_exist' => 'Tento užívateľ nie je platný. Prosím skúste znovu.'
     )
 
diff --git a/resources/lang/sk-SK/admin/accessories/table.php b/resources/lang/sk-SK/admin/accessories/table.php
index 8d1db06154..bba586a555 100644
--- a/resources/lang/sk-SK/admin/accessories/table.php
+++ b/resources/lang/sk-SK/admin/accessories/table.php
@@ -6,6 +6,4 @@ return array(
     'id'      					=> 'ID',
     'require_acceptance'      	=> 'Akceptácia',
     'title'      				=> 'Názov príslušenstva',
-
-
 );
diff --git a/resources/lang/sk-SK/admin/asset_maintenances/form.php b/resources/lang/sk-SK/admin/asset_maintenances/form.php
index 15fc69db74..fb7399ad3b 100644
--- a/resources/lang/sk-SK/admin/asset_maintenances/form.php
+++ b/resources/lang/sk-SK/admin/asset_maintenances/form.php
@@ -1,14 +1,14 @@
 <?php
 
     return [
-        'asset_maintenance_type' => 'Asset Maintenance Type',
+        'asset_maintenance_type' => 'Typ údržby majetku',
         'title'                  => 'Názov',
         'start_date'             => 'Dátum začiatku',
-        'completion_date'        => 'Completion Date',
+        'completion_date'        => 'Dátum ukončenia',
         'cost'                   => 'Cena',
-        'is_warranty'            => 'Warranty Improvement',
-        'asset_maintenance_time' => 'Asset Maintenance Time (in days)',
+        'is_warranty'            => 'Rozšírenie záruky',
+        'asset_maintenance_time' => 'Doba údržby majetku (v dňoch)',
         'notes'                  => 'Poznámky',
-        'update'                 => 'Update Asset Maintenance',
-        'create'                 => 'Create Asset Maintenance'
+        'update'                 => 'Upraviť záznam o údržbe majetku',
+        'create'                 => 'Vytvoriť záznam o údržbe majetku'
     ];
diff --git a/resources/lang/sk-SK/admin/asset_maintenances/general.php b/resources/lang/sk-SK/admin/asset_maintenances/general.php
index b301b87826..282bc3e245 100644
--- a/resources/lang/sk-SK/admin/asset_maintenances/general.php
+++ b/resources/lang/sk-SK/admin/asset_maintenances/general.php
@@ -1,16 +1,16 @@
 <?php
 
     return [
-        'asset_maintenances' => 'Asset Maintenances',
-        'edit'               => 'Edit Asset Maintenance',
-        'delete'             => 'Delete Asset Maintenance',
-        'view'               => 'View Asset Maintenance Details',
-        'repair'             => 'Repair',
-        'maintenance'        => 'Maintenance',
+        'asset_maintenances' => 'Záznamy o údržbe majetku',
+        'edit'               => 'Upraviť záznam o údržbe majetku',
+        'delete'             => 'Odstrániť záznam o údržbe majetku',
+        'view'               => 'Zobraziž podrobnosti o údržbe majetku',
+        'repair'             => 'Oprava',
+        'maintenance'        => 'Údržba',
         'upgrade'            => 'Upgrade',
         'calibration'        => 'Kalibrácia',
         'software_support'   => 'Softvérová podpora',
         'hardware_support'   => 'Hardvérová podpora',
-        'configuration_change'   => 'Configuration Change',
-        'pat_test'           => 'PAT Test',
+        'configuration_change'   => 'Zmena konfigurácie',
+        'pat_test'           => 'PAT test',
     ];
diff --git a/resources/lang/sk-SK/admin/asset_maintenances/message.php b/resources/lang/sk-SK/admin/asset_maintenances/message.php
index 16d2c69de9..5e73a71d26 100644
--- a/resources/lang/sk-SK/admin/asset_maintenances/message.php
+++ b/resources/lang/sk-SK/admin/asset_maintenances/message.php
@@ -1,21 +1,21 @@
 <?php
 
     return [
-        'not_found'                    => 'Asset Maintenance you were looking for was not found!',
+        'not_found'                    => 'Hľadaný záznam o údržbe majetku nebol nájdený!',
         'delete'                       => [
-            'confirm' => 'Are you sure you wish to delete this asset maintenance?',
-            'error'   => 'There was an issue deleting the asset maintenance. Please try again.',
-            'success' => 'The asset maintenance was deleted successfully.',
+            'confirm' => 'Ste si istý, že chcete zmazať tento záznam o údržbe majetku?',
+            'error'   => 'Pri odstrňovaní záznamu o údržbe majetku nastala chyba. Prosím skúste znovu.',
+            'success' => 'Záznam o údržbe majetku bol úspešne odstránený.',
         ],
         'create'                       => [
-            'error'   => 'Asset Maintenance was not created, please try again.',
-            'success' => 'Asset Maintenance created successfully.',
+            'error'   => 'Záznam o údržba majetku nebol vytvorený, prosím skúste znovu.',
+            'success' => 'Záznam o údržbe majetku bol úspešne vytvorený.',
         ],
         'edit'                       => [
-            'error'   => 'Asset Maintenance was not edited, please try again.',
-            'success' => 'Asset Maintenance edited successfully.',
+            'error'   => 'Záznam o údržba majetku nebol upravený, prosím skúste znovu.',
+            'success' => 'Záznam o údržbe majetku bol úspešne upravený.',
         ],
-        'asset_maintenance_incomplete' => 'Not Completed Yet',
+        'asset_maintenance_incomplete' => 'Zatiaľ nedokončené',
         'warranty'                     => 'Záruka',
-        'not_warranty'                 => 'Not Warranty',
+        'not_warranty'                 => 'Bez záruky',
     ];
diff --git a/resources/lang/sk-SK/admin/asset_maintenances/table.php b/resources/lang/sk-SK/admin/asset_maintenances/table.php
index 93217d83d3..e0e4b3e0d2 100644
--- a/resources/lang/sk-SK/admin/asset_maintenances/table.php
+++ b/resources/lang/sk-SK/admin/asset_maintenances/table.php
@@ -1,7 +1,7 @@
 <?php
 
     return [
-        'title'         => 'Asset Maintenance',
+        'title'         => 'Opravy majetku',
         'asset_name'    => 'Názov asetu',
         'is_warranty'   => 'Záruka',
         'dl_csv'        => 'Stiahnuť CSV',
diff --git a/resources/lang/sk-SK/admin/categories/general.php b/resources/lang/sk-SK/admin/categories/general.php
index 441e3defae..c7d191e1c4 100644
--- a/resources/lang/sk-SK/admin/categories/general.php
+++ b/resources/lang/sk-SK/admin/categories/general.php
@@ -3,17 +3,17 @@
 return array(
     'asset_categories' 					=> 'Kategórie majetku',
     'category_name'  					=> 'Názov kategórie',
-    'checkin_email'                     => 'Poslať email používateľovi pri prijatí / odovzdaní.',
-    'checkin_email_notification'        => 'Používateľovi bude odoslaný mail pri prijatí / odovzdaní.',
+    'checkin_email'                     => 'Poslať email používateľovi pri prevzatí / odovzdaní.',
+    'checkin_email_notification'        => 'Používateľovi bude odoslaný mail pri prevzatí / odovzdaní.',
     'clone'                             => 'Duplikovať kategóriu',
     'create'  							=> 'Vytvoriť kategóriu',
     'edit'                              => 'Upraviť kategóriu',
-    'email_will_be_sent_due_to_global_eula' => 'An email will be sent to the user because the global EULA is being used.',
-    'email_will_be_sent_due_to_category_eula' => 'An email will be sent to the user because a EULA is set for this category.',
+    'email_will_be_sent_due_to_global_eula' => 'Používateľovi bude zaslaný mail pretože sa používa globálna EULA.',
+    'email_will_be_sent_due_to_category_eula' => 'Používateľovi bude zaslaný mail pretože je pre zvolenú kategóriu nastavená EULA.',
     'eula_text'							=> 'Kategória EULA',
-    'eula_text_help'					=> 'Toto políčko umožňuje prispôsobiť dokument EULA špecifikcému typu majetku. Ak máte iba jeden dokument EULA pre všetky typy majetku, môžete oznaciť možnosť nižšie, aby sa použil predvolený dokument.',
+    'eula_text_help'					=> 'Toto políčko umožňuje prispôsobiť EULA špecifickému typu majetku. Ak máte iba jednu EULA pre všetky typy majetku, môžete označiť možnosť nižšie, aby sa použila predvolená.',
     'name'                              => 'Názov kategórie',
-    'require_acceptance'				=> 'Vyžadovač od používatľov aby potvrdili prijatie majetku v tejto kategórii.',
+    'require_acceptance'				=> 'Vyžadovať od používateľov aby potvrdili prijatie majetku v tejto kategórii.',
     'required_acceptance'				=> 'Tomuto používateľovi bude zaslaný mailom odkaz na potvrdenie prijatia tejto položky.',
     'required_eula'						=> 'Tomuto používateľovi bude zaslaná kópia dokumentu EULA',
     'no_default_eula'					=> 'Žiaden predvolený EULA dokument nebol nájdený. Pridajte nový v Nastaveniach.',
diff --git a/resources/lang/sk-SK/admin/categories/message.php b/resources/lang/sk-SK/admin/categories/message.php
index 52e060b96a..401ee5faa2 100644
--- a/resources/lang/sk-SK/admin/categories/message.php
+++ b/resources/lang/sk-SK/admin/categories/message.php
@@ -14,7 +14,7 @@ return array(
     'update' => array(
         'error'   => 'Kategóriu sa nepodarilo aktualizovať, skúste prosím znovu',
         'success' => 'Kategória bola úspešne aktualizovaná.',
-        'cannot_change_category_type'   => 'You cannot change the category type once it has been created',
+        'cannot_change_category_type'   => 'Nie je možné upraviť kategóriu potom čo bola vytvorená',
     ),
 
     'delete' => array(
diff --git a/resources/lang/sk-SK/admin/companies/general.php b/resources/lang/sk-SK/admin/companies/general.php
index 37781012ba..374494afd3 100644
--- a/resources/lang/sk-SK/admin/companies/general.php
+++ b/resources/lang/sk-SK/admin/companies/general.php
@@ -1,7 +1,7 @@
 <?php
 
 return [
-    'select_company' => 'Select Company',
-    'about_companies' => 'About Companies',
-    'about_companies_description' => '        You can use companies as a simple informative field, or you can use them to restrict asset visibility and availability to users with a specific company by enabling Full Company Support in your Admin Settings.',
+    'select_company' => 'Vybrať spoločnosť',
+    'about_companies' => 'O spoločnostiach',
+    'about_companies_description' => '        Spoločnosti môžete používať ako jednoduché informačné pole alebo nimi môžete obmedzovať viditeľnosť a dostupnosť majetku jednotlivým používateľom z vybranej spoločnosti povolením módu Plnej podpory spoločností v Admin nastaveniach.',
 ];
diff --git a/resources/lang/sk-SK/admin/companies/message.php b/resources/lang/sk-SK/admin/companies/message.php
index e440b7ac5f..1bd5ed42ab 100644
--- a/resources/lang/sk-SK/admin/companies/message.php
+++ b/resources/lang/sk-SK/admin/companies/message.php
@@ -1,20 +1,20 @@
 <?php
 
 return [
-    'does_not_exist' => 'Company does not exist.',
-    'deleted'        => 'Deleted company',
-    'assoc_users'    => 'This company is currently associated with at least one model and cannot be deleted. Please update your models to no longer reference this company and try again. ',
+    'does_not_exist' => 'Spoločnosť neexistuje.',
+    'deleted'        => 'Zmazané spoločnosti',
+    'assoc_users'    => 'Táto spoločnosť je aktuálne priradená jednému alebo viacerým modelom, preto nemôže byť odstránená. Prosím aktualizujte vaše modely, aby nevyužívali túto spoločnosť a skúste znovu. ',
     'create' => [
-        'error'   => 'Company was not created, please try again.',
-        'success' => 'Company created successfully.',
+        'error'   => 'Spoločnosť nebola pridaná, prosím skúste znovu.',
+        'success' => 'Spoločnosť bola úspešne pridaná.',
     ],
     'update' => [
-        'error'   => 'Company was not updated, please try again',
-        'success' => 'Company updated successfully.',
+        'error'   => 'Spoločnosť nebola upravená, prosím skúste znovu',
+        'success' => 'Spoločnosť bola úspešne upravená.',
     ],
     'delete' => [
-        'confirm' => 'Are you sure you wish to delete this company?',
-        'error'   => 'There was an issue deleting the company. Please try again.',
-        'success' => 'The Company was deleted successfully.',
+        'confirm' => 'Ste si istý, že chcete zmazať túto spoločnosť?',
+        'error'   => 'Pri mazaní spoločnosti nastal problém. Skúste znovu.',
+        'success' => 'Spoločnosť bola úspešne zmazaná.',
     ],
 ];
diff --git a/resources/lang/sk-SK/admin/companies/table.php b/resources/lang/sk-SK/admin/companies/table.php
index 100b258240..ed153ff088 100644
--- a/resources/lang/sk-SK/admin/companies/table.php
+++ b/resources/lang/sk-SK/admin/companies/table.php
@@ -1,11 +1,11 @@
 <?php
 return array(
-    'companies' => 'Companies',
-    'create'    => 'Create Company',
-    'email'     => 'Company Email',
-    'title'     => 'Company',
-    'phone'     => 'Company Phone',
-    'update'    => 'Update Company',
-    'name'      => 'Company Name',
+    'companies' => 'Spoločnosti',
+    'create'    => 'Pridať spoločnosť',
+    'email'     => 'Emailová adresa spoločnosti',
+    'title'     => 'Spoločnosť',
+    'phone'     => 'Telefónne čislo spoločnosti',
+    'update'    => 'Upraviť spoločnosť',
+    'name'      => 'Názov spoločnosti',
     'id'        => 'ID',
 );
diff --git a/resources/lang/sk-SK/admin/components/general.php b/resources/lang/sk-SK/admin/components/general.php
index 97946aa3a5..964037cfc1 100644
--- a/resources/lang/sk-SK/admin/components/general.php
+++ b/resources/lang/sk-SK/admin/components/general.php
@@ -1,16 +1,16 @@
 <?php
 
 return array(
-    'component_name'                  => 'Component Name',
-    'checkin'                             => 'Checkin Component',
-    'checkout'                             => 'Checkout Component',
+    'component_name'                  => 'Názov komponentu',
+    'checkin'                             => 'Prevziať komponent',
+    'checkout'                             => 'Odovzdať komponent',
     'cost'				=> 'Kúpna cena',
-    'create'                             => 'Create Component',
-    'edit'                             => 'Edit Component',
+    'create'                             => 'Pridať komponent',
+    'edit'                             => 'Upraviť komponent',
     'date'					=> 'Dátum nákupu',
     'order'					=> 'Číslo objednávky',
-    'remaining' 			             => 'Remaining',
+    'remaining' 			             => 'Zostáva',
     'total' 			                 => 'Celkom',
-    'update'                            => 'Update Component',
-    'checkin_limit'            => 'Amount checked in must be equal to or less than :assigned_qty'
+    'update'                            => 'O komponentoch',
+    'checkin_limit'            => 'Prijaté množstvo musí byť rovné alebo menšie ako :assigned_qty'
 );
diff --git a/resources/lang/sk-SK/admin/components/message.php b/resources/lang/sk-SK/admin/components/message.php
index 911f848d2d..e2eb46cfda 100644
--- a/resources/lang/sk-SK/admin/components/message.php
+++ b/resources/lang/sk-SK/admin/components/message.php
@@ -2,34 +2,35 @@
 
 return array(
 
-    'does_not_exist' => 'Component does not exist.',
+    'does_not_exist' => 'Komponent neexistuje.',
 
     'create' => array(
-        'error'   => 'Component was not created, please try again.',
-        'success' => 'Component created successfully.'
+        'error'   => 'Komponent sa nepodarilo pridať, skúste znovu.',
+        'success' => 'Komponent bol úspešne pridaný.'
     ),
 
     'update' => array(
-        'error'   => 'Component was not updated, please try again',
-        'success' => 'Component updated successfully.'
+        'error'   => 'Komponent sa nepodarilo upraviť, skúste znovu',
+        'success' => 'Komponent bol úspešne upravený.'
     ),
 
     'delete' => array(
-        'confirm'   => 'Are you sure you wish to delete this component?',
-        'error'   => 'There was an issue deleting the component. Please try again.',
-        'success' => 'The component was deleted successfully.'
+        'confirm'   => 'Ste si istý, že chcete zmazať tento komponent?',
+        'error'   => 'Nastal problém pri mazani komponentu. Prosím skúste znovu.',
+        'success' => 'Komponent bol úspešne zmazaný.',
+        'error_qty'   => 'Some components of this type are still checked out. Please check them in and try again.',
     ),
 
      'checkout' => array(
-        'error'   		=> 'Component was not checked out, please try again',
-        'success' 		=> 'Component checked out successfully.',
+        'error'   		=> 'Komponent nebol priradený, prosím skúste znovu',
+        'success' 		=> 'Komponent bol úspešne priradený.',
         'user_does_not_exist' => 'Tento užívateľ nie je platný. Prosím skúste znovu.',
-        'unavailable'      => 'Not enough components remaining: :remaining remaining, :requested requested ',
+        'unavailable'      => 'Nedostatok komponentov: :remaining skladom, :requested vyžiadaných ',
     ),
 
     'checkin' => array(
-        'error'   		=> 'Component was not checked in, please try again',
-        'success' 		=> 'Component checked in successfully.',
+        'error'   		=> 'Komponent nebol prevzatý, skúste znovu',
+        'success' 		=> 'Komponent bol úspešne prevzatý.',
         'user_does_not_exist' => 'Tento užívateľ nie je platný. Prosím skúste znovu.'
     )
 
diff --git a/resources/lang/sk-SK/admin/components/table.php b/resources/lang/sk-SK/admin/components/table.php
index 3d4fed6a7f..62b543946f 100644
--- a/resources/lang/sk-SK/admin/components/table.php
+++ b/resources/lang/sk-SK/admin/components/table.php
@@ -1,5 +1,5 @@
 <?php
 
 return array(
-    'title'      				=> 'Component Name',
+    'title'      				=> 'Názov komponentu',
 );
diff --git a/resources/lang/sk-SK/admin/consumables/general.php b/resources/lang/sk-SK/admin/consumables/general.php
index a1c7a5fda6..739578e8ca 100644
--- a/resources/lang/sk-SK/admin/consumables/general.php
+++ b/resources/lang/sk-SK/admin/consumables/general.php
@@ -1,11 +1,12 @@
 <?php
 
 return array(
-    'checkout'                          => 'Checkout Consumable to User',
-    'consumable_name'                   => 'Consumable Name',
-    'create'                            => 'Create Consumable',
-    'item_no'                           => 'Item No.',
-    'remaining' 			            => 'Remaining',
+    'checkout'                          => 'Odovzdať spotrebný materiál používateľovi',
+    'consumable_name'                   => 'Názov spotrebného materiálu',
+    'create'                            => 'Pridať spotrebný materiál',
+    'item_no'                           => 'Položka číslo',
+    'remaining' 			            => 'Zostáva',
     'total' 			                => 'Celkom',
-    'update'                            => 'Update Consumable',
+    'update'                            => 'Upraviť spotrebný materiál',
+    'inventory_warning'                 => 'Zostatok stavu tohto spotrebného materiálu je pod minimálnym množstvom :min_count',
 );
diff --git a/resources/lang/sk-SK/admin/consumables/message.php b/resources/lang/sk-SK/admin/consumables/message.php
index 6bb2663459..bd5e879cac 100644
--- a/resources/lang/sk-SK/admin/consumables/message.php
+++ b/resources/lang/sk-SK/admin/consumables/message.php
@@ -2,34 +2,35 @@
 
 return array(
 
-    'does_not_exist' => 'Consumable does not exist.',
+    'invalid_category_type' => 'Kategória musí byť kategóriou spotrebného materiálu.',
+    'does_not_exist' => 'Spotrebný materiál neexistuje.',
 
     'create' => array(
-        'error'   => 'Consumable was not created, please try again.',
-        'success' => 'Consumable created successfully.'
+        'error'   => 'Spotrebný materiál nebol pridaný, prosím skúste znovu.',
+        'success' => 'Spotrebný materiál bol úspešne pridaný.'
     ),
 
     'update' => array(
-        'error'   => 'Consumable was not updated, please try again',
-        'success' => 'Consumable updated successfully.'
+        'error'   => 'Spotrebný materiál nebol upravený, prosím skúste znovu',
+        'success' => 'Spotrebný materiál bol úspešne upravený.'
     ),
 
     'delete' => array(
-        'confirm'   => 'Are you sure you wish to delete this consumable?',
-        'error'   => 'There was an issue deleting the consumable. Please try again.',
-        'success' => 'The consumable was deleted successfully.'
+        'confirm'   => 'Ste si istý, že chcete zmazať tento spotrebný materiál?',
+        'error'   => 'Pri mazaní spotrebného materiálu nastal problém. Skúste prosím znovu.',
+        'success' => 'Spotrebný materiál bol úspešne zmazaný.'
     ),
 
      'checkout' => array(
-        'error'   		=> 'Consumable was not checked out, please try again',
-        'success' 		=> 'Consumable checked out successfully.',
+        'error'   		=> 'Spotrebný materiál nebol priradený, prosím skúsiť znovu',
+        'success' 		=> 'Spotrebný materiál bol úspešne priradený.',
         'user_does_not_exist' => 'Tento užívateľ nie je platný. Prosím skúste znovu.',
-         'unavailable'      => 'There are not enough consumables for this checkout. Please check the quantity left. ',
+         'unavailable'      => 'Nedostatok spotrebného materiálu pre priradenie. Prosím skontrolujte zostávajúce množstvo. ',
     ),
 
     'checkin' => array(
-        'error'   		=> 'Consumable was not checked in, please try again',
-        'success' 		=> 'Consumable checked in successfully.',
+        'error'   		=> 'Spotrebný materiál nebol prevzatý, prosím skúste znovu',
+        'success' 		=> 'Spotrebný materiál bol prevzatý úspešne.',
         'user_does_not_exist' => 'Tento užívateľ nie je platný. Prosím skúste znovu.'
     )
 
diff --git a/resources/lang/sk-SK/admin/consumables/table.php b/resources/lang/sk-SK/admin/consumables/table.php
index bb76721f17..433b0b7997 100644
--- a/resources/lang/sk-SK/admin/consumables/table.php
+++ b/resources/lang/sk-SK/admin/consumables/table.php
@@ -1,5 +1,5 @@
 <?php
 
 return array(
-    'title'      				=> 'Consumable Name',
+    'title'      				=> 'Názov spotrebného materiálu',
 );
diff --git a/resources/lang/sk-SK/admin/custom_fields/general.php b/resources/lang/sk-SK/admin/custom_fields/general.php
index c1d75e3007..eea95e75ed 100644
--- a/resources/lang/sk-SK/admin/custom_fields/general.php
+++ b/resources/lang/sk-SK/admin/custom_fields/general.php
@@ -1,61 +1,64 @@
 <?php
 
 return [
-    'custom_fields'		        => 'Custom Fields',
-    'manage'                    => 'Manage',
-    'field'		                => 'Field',
-    'about_fieldsets_title'		=> 'About Fieldsets',
-    'about_fieldsets_text'		=> 'Fieldsets allow you to create groups of custom fields that are frequently re-used for specific asset model types.',
-    'custom_format'             => 'Custom Regex format...',
-    'encrypt_field'      	        => 'Encrypt the value of this field in the database',
-    'encrypt_field_help'      => 'WARNING: Encrypting a field makes it unsearchable.',
-    'encrypted'      	        => 'Encrypted',
-    'fieldset'      	        => 'Fieldset',
-    'qty_fields'      	      => 'Qty Fields',
-    'fieldsets'      	        => 'Fieldsets',
-    'fieldset_name'           => 'Fieldset Name',
-    'field_name'              => 'Field Name',
-    'field_values'            => 'Field Values',
-    'field_values_help'       => 'Add selectable options, one per line. Blank lines other than the first line will be ignored.',
-    'field_element'           => 'Form Element',
-    'field_element_short'     => 'Element',
-    'field_format'            => 'Format',
-    'field_custom_format'     => 'Custom Regex Format',
-    'field_custom_format_help'     => 'This field allows you to use a regex expression for validation. It should start with "regex:" - for example, to validate that a custom field value contains a valid IMEI (15 numeric digits), you would use <code>regex:/^[0-9]{15}$/</code>.',
-    'required'   		          => 'Required',
-    'req'   		              => 'Req.',
-    'used_by_models'   		    => 'Used By Models',
-    'order'   		            => 'Order',
-    'create_fieldset'         => 'New Fieldset',
-    'update_fieldset'         => 'Update Fieldset',
-    'fieldset_does_not_exist'   => 'Fieldset :id does not exist',
-    'fieldset_updated'         => 'Fieldset updated',
-    'create_fieldset_title' => 'Create a new fieldset',
-    'create_field'            => 'New Custom Field',
-    'create_field_title' => 'Create a new custom field',
-    'value_encrypted'      	        => 'The value of this field is encrypted in the database. Only admin users will be able to view the decrypted value',
-    'show_in_email'     => 'Include the value of this field in checkout emails sent to the user? Encrypted fields cannot be included in emails',
-    'show_in_email_short'     => 'Include in emails.',
-    'help_text' => 'Help Text',
-    'help_text_description' => 'This is optional text that will appear below the form elements while editing an asset to provide context on the field.',
-    'about_custom_fields_title' => 'About Custom Fields',
-    'about_custom_fields_text' => 'Custom fields allow you to add arbitrary attributes to assets.',
-    'add_field_to_fieldset' => 'Add Field to Fieldset',
-    'make_optional' => 'Required - click to make optional',
-    'make_required' => 'Optional - click to make required',
-    'reorder' => 'Reorder',
-    'db_field' => 'DB Field',
+    'custom_fields'		        => 'Vlastné polia',
+    'manage'                    => 'Spravovať',
+    'field'		                => 'Pole',
+    'about_fieldsets_title'		=> 'O skupinách polí',
+    'about_fieldsets_text'		=> 'Skupina polí umožňuje vytvoriť skupinu vlastných polí ktoré sú často prepoužívané pre špecifické typy modelov majetku.',
+    'custom_format'             => 'Vlastný formát regexu...',
+    'encrypt_field'      	        => 'Zašifrovať hodnotu tohto poľa v databáze',
+    'encrypt_field_help'      => 'VAROVANIE: Šifrované pole bude nevyhľadateľné.',
+    'encrypted'      	        => 'Šifrované',
+    'fieldset'      	        => 'Skupina polí',
+    'qty_fields'      	      => 'Počet polí',
+    'fieldsets'      	        => 'Skupiny polí',
+    'fieldset_name'           => 'Názov skupiny polí',
+    'field_name'              => 'Názov poľa',
+    'field_values'            => 'Hodnota poľa',
+    'field_values_help'       => 'Pridať možnosť výberu, jedna možnosť na riadok. Prázdne riadky okrem prvého riadku budu ignorované.',
+    'field_element'           => 'Typ pola',
+    'field_element_short'     => 'Pole',
+    'field_format'            => 'Formát',
+    'field_custom_format'     => 'Vlastný formát regexu',
+    'field_custom_format_help'     => 'Toto pole umožňuje použitie regulárneho výrazu pre validáciu. Musí začínať s "regex:" - napríklad pre validáciu, že vlastné pole obsahuje validný IMEI (15 znakov dlhé číslo), je potrebné zadať <code>regex:/^[0-9]{15}$/</code>.',
+    'required'   		          => 'Povinné',
+    'req'   		              => 'Pov.',
+    'used_by_models'   		    => 'Použíte v modeloch',
+    'order'   		            => 'Poradie',
+    'create_fieldset'         => 'Pridať skupinu polí',
+    'update_fieldset'         => 'Upraviť skupinu polí',
+    'fieldset_does_not_exist'   => 'Skupina polí :id neexistuje',
+    'fieldset_updated'         => 'Skupina polí bola upravená',
+    'create_fieldset_title' => 'Vytvoriť novú skupinu polí',
+    'create_field'            => 'Nové vlastné pole',
+    'create_field_title' => 'Vytvoriť nové vlastné pole',
+    'value_encrypted'      	        => 'Hodnota tohto poľa je v databáze šifrovaná. Iba admin používatelia budú schopní dešiforvať jeho hodnotu',
+    'show_in_email'     => 'Zahrnúť hodnotu tohto poľa do emailu o priradení posielaného používateľom? Šifrované polia nemôžu byť použíté v mailoch',
+    'show_in_email_short' => 'Zahnúť do mailu',
+    'help_text' => 'Text nápovedy',
+    'help_text_description' => 'Toto je voliteľný text, ktorý sa zobrazí pod prvkami formuláru pri editovaní majetku pre poskytnutie kontextu k vypĺňanému polu.',
+    'about_custom_fields_title' => 'O vlastných poliach',
+    'about_custom_fields_text' => 'Vlastné polia umožňujú pridať povinné atribúty k majetku.',
+    'add_field_to_fieldset' => 'Pridať pole do skupiny polí',
+    'make_optional' => 'Povinné - kliknite pre nastavenie ako voliteľné',
+    'make_required' => 'Voliteľné - kliknitete pre nastavenie ako povinné',
+    'reorder' => 'Preusporiadať',
+    'db_field' => 'DB pole',
     'db_convert_warning' => 'VÝSTRAHA. Toto pole je v tabuľke vlastných polí ako <code>:db_column</code>, ale malo by byť <code>:expected</code>.',
-    'is_unique' => 'This value must be unique across all assets',
-    'unique' => 'Unique',
-    'display_in_user_view' => 'Allow the checked out user to view these values in their View Assigned Assets page',
-    'display_in_user_view_table' => 'Visible to User',
-    'auto_add_to_fieldsets' => 'Automatically add this to every new fieldset',
-    'add_to_preexisting_fieldsets' => 'Add to any existing fieldsets',
-    'show_in_listview' => 'Show in list views by default. Authorized users will still be able to show/hide via the column selector',
-    'show_in_listview_short' => 'Show in lists',
-    'show_in_requestable_list_short' => 'Show in requestable assets list',
-    'show_in_requestable_list' => 'Show value in requestable assets list. Encrypted fields will not be shown',
-    'encrypted_options' => 'This field is encrypted, so some display options will not be available.',
+    'is_unique' => 'Táto hodnota musí byť unikátna naprieč všetkými majetkami',
+    'unique' => 'Unikátne',
+    'display_in_user_view' => 'Umožni používateľom vidieť tieto hodnoty v prehľade priradných majetkov',
+    'display_in_user_view_table' => 'Viditeľné pre používateľa',
+    'auto_add_to_fieldsets' => 'Automaticky pridať do každej novej skupiny polí',
+    'add_to_preexisting_fieldsets' => 'Pridať do všetkých existujúcich skupín polí',
+    'show_in_listview' => 'Zobrazovať v zoznamoch. Autorizovaní používatelia si hodnotu budú môcť aj naďalej skryť cez výber zobrazovaných stĺpcov',
+    'show_in_listview_short' => 'Zobraziť v zoznamoch',
+    'show_in_requestable_list_short' => 'Zobraziť v zozname vyžiadateľných majetkov',
+    'show_in_requestable_list' => 'Zobraziť hodnotu v zoznamu vyžiadateľných majetkov. Šifrované polia nebudu zobratené',
+    'encrypted_options' => 'Toto pole je šifrované, takže niektoré možnosti zobrazenia nebudú k dispozícii.',
+    'display_checkin' => 'Display in checkin forms',
+    'display_checkout' => 'Display in checkout forms',
+    'display_audit' => 'Display in audit forms',
 
 ];
diff --git a/resources/lang/sk-SK/admin/custom_fields/message.php b/resources/lang/sk-SK/admin/custom_fields/message.php
index e3ff88ac5f..dd8332c1f9 100644
--- a/resources/lang/sk-SK/admin/custom_fields/message.php
+++ b/resources/lang/sk-SK/admin/custom_fields/message.php
@@ -3,48 +3,49 @@
 return array(
 
     'field' => array(
-        'invalid'   => 'That field does not exist.',
-        'already_added'   => 'Field already added',
+        'invalid'   => 'Toto pole neexistuje.',
+        'already_added'   => 'Pole už bolo pridané',
+        'none_selected'   => 'Nebolo zvolené žiadne pole',
 
         'create' => array(
-            'error'   => 'Field was not created, please try again.',
-            'success' => 'Field created successfully.',
-            'assoc_success' => 'Field successfully added to fieldset.'
+            'error'   => 'Pole nebolo pridané, prosím skúste znovu.',
+            'success' => 'Pole bolo úspešne pridané.',
+            'assoc_success' => 'Pole bolo úspešne pridané do skupiny polí.'
         ),
 
         'update' => array(
-            'error'   => 'Field was not updated, please try again',
-            'success' => 'Field updated successfully.'
+            'error'   => 'Pole nebolo upravené, skúste prosím znovu',
+            'success' => 'Pole bolo úspešne upravené.'
         ),
 
         'delete' => array(
-            'confirm'   	=> 'Are you sure you wish to delete this field?',
-            'error'   => 'There was an issue deleting the field. Please try again.',
-            'success' => 'The field was deleted successfully.',
-            'in_use'   => 'Field is still in use.',
+            'confirm'   	=> 'Ste si istý, že chcete zmazať toto pole?',
+            'error'   => 'Pri mazaní pola nastala chyba. Skúste prosím znovu.',
+            'success' => 'Pole bolo úspešne zmazané.',
+            'in_use'   => 'Pole sa stále používa.',
         )
 
     ),
 
     'fieldset' => array(
 
-        'does_not_exist' => 'Fieldset does not exist',
+        'does_not_exist' => 'Skupina polí neexistuje',
 
         'create' => array(
-            'error'   => 'Fieldset was not created, please try again.',
-            'success' => 'Fieldset created successfully.'
+            'error'   => 'Skupina polí nebola vytvorená, skúste prosím znovu.',
+            'success' => 'Skupina polí bola úspešne vytvorená.'
         ),
 
         'update' => array(
-            'error'   => 'Fieldset was not updated, please try again',
-            'success' => 'Fieldset updated successfully.'
+            'error'   => 'Skupina polí nebola upravená, skúste znovu',
+            'success' => 'Skupina polí bola úspešne upravená.'
         ),
 
         'delete' => array(
-            'confirm'   	=> 'Are you sure you wish to delete this fieldset?',
-            'error'   => 'There was an issue deleting the fieldset. Please try again.',
-            'success' => 'The fieldset was deleted successfully.',
-            'in_use'   => 'Fieldset is still in use.',
+            'confirm'   	=> 'Ste si istý, že chcete odstrániť túto skupinu polí?',
+            'error'   => 'Pri mazaní skupiny polí nastala chyba. Skúste znovu.',
+            'success' => 'Skupina polí bola úspešne zmazaná.',
+            'in_use'   => 'Skupina polí sa stále používa.',
         )
 
     ),
diff --git a/resources/lang/sk-SK/admin/departments/message.php b/resources/lang/sk-SK/admin/departments/message.php
index 2e371348b9..1103060a7a 100644
--- a/resources/lang/sk-SK/admin/departments/message.php
+++ b/resources/lang/sk-SK/admin/departments/message.php
@@ -2,21 +2,21 @@
 
 return array(
 
-    'does_not_exist' => 'Department does not exist.',
-    'department_already_exists' => 'A department already exists with that name at this company location. Or choose a more specific name for this department. ',
-    'assoc_users'	 => 'This department is currently associated with at least one user and cannot be deleted. Please update your users to no longer reference this department and try again. ',
+    'does_not_exist' => 'Oddelenie neexistuje.',
+    'department_already_exists' => 'Oddelenie s daným názvom v danej lokalite spoločnosti už existuje. Skúste zvoliť viac špecifický názov oddelenia. ',
+    'assoc_users'	 => 'Toto oddelenie je aktuálne priradené minimálne jednému používateľovi, preto nemôže by zmazané. Prosím aktualizuje vašich používateľov aby dané oddelenie nevyužívali a skúste znovu. ',
     'create' => array(
-        'error'   => 'Department was not created, please try again.',
-        'success' => 'Department created successfully.'
+        'error'   => 'Oddelenie nebolo pridané, skúste prosím znovu.',
+        'success' => 'Oddelenie bolo úspešne pridané.'
     ),
     'update' => array(
-        'error'   => 'Department was not updated, please try again',
-        'success' => 'Department updated successfully.'
+        'error'   => 'Oddelenie nebolo upravené, prosím skúste znovu',
+        'success' => 'Oddelenie bolo úspešne upravené.'
     ),
     'delete' => array(
-        'confirm'   	=> 'Are you sure you wish to delete this department?',
-        'error'   => 'There was an issue deleting the department. Please try again.',
-        'success' => 'The department was deleted successfully.'
+        'confirm'   	=> 'Ste si istý, že chcete zmazať toto oddelenie?',
+        'error'   => 'Pri mazaní oddelenia nastal problém. Skúste znovu.',
+        'success' => 'Oddelenie bolo úspešne odstránené.'
     )
 
 );
diff --git a/resources/lang/sk-SK/admin/departments/table.php b/resources/lang/sk-SK/admin/departments/table.php
index 4316e53a36..2f7aee6529 100644
--- a/resources/lang/sk-SK/admin/departments/table.php
+++ b/resources/lang/sk-SK/admin/departments/table.php
@@ -3,9 +3,9 @@
 return array(
 
     'id'                        => 'ID',
-    'name'                      => 'Department Name',
+    'name'                      => 'Názov oddelenia',
     'manager'                   => 'Manažér',
     'location'                  => 'Lokalita',
-    'create'                    => 'Create Department',
-    'update'                    => 'Update Department',
+    'create'                    => 'Pridať oddelenie',
+    'update'                    => 'Upraviť oddelenie',
     );
diff --git a/resources/lang/sk-SK/admin/depreciations/general.php b/resources/lang/sk-SK/admin/depreciations/general.php
index c9a2fd3438..1aab072e4f 100644
--- a/resources/lang/sk-SK/admin/depreciations/general.php
+++ b/resources/lang/sk-SK/admin/depreciations/general.php
@@ -6,11 +6,15 @@ return [
     'asset_depreciations'  					=> 'Odpisy majetku',
     'create'  					            => 'Vytovirť typ odpisu',
     'depreciation_name'  					=> 'Názov odpisovania',
-    'depreciation_min'                      => 'Floor Value of Depreciation',
+    'depreciation_min'                      => 'Minimálna hodnota odpisu',
     'number_of_months'  					=> 'Počet mesiacov',
     'update'  					            => 'Upraviť odpisovanie',
-    'depreciation_min'                      => 'Minimum Value after Depreciation',
-    'no_depreciations_warning'               => '<strong>Warning: </strong>
-                      You do not currently have any depreciations set up.
-                      Please set up at least one depreciation to view the depreciation report.',
+    'depreciation_min'                      => 'Minimálna hodnota po odpísaní',
+    'no_depreciations_warning'               => '<strong>Varovanie: </strong>
+                      Nenastavili ste žiadne odpisovanie.
+                      Prosím nastavte aspoň jeden typ odpisov aby sa zobrazoval prehľad odpisovania.',
+    'depreciation_method'                   => 'Report odpisov',
+    'linear_depreciation'                   => 'Linear (Default)',
+    'half_1'                                => 'Half-year convention, always applied',
+    'half_2'                                => 'Half-year convention, applied with condition',
 ];
diff --git a/resources/lang/sk-SK/admin/depreciations/table.php b/resources/lang/sk-SK/admin/depreciations/table.php
index 67801f72e4..7cacdd0456 100644
--- a/resources/lang/sk-SK/admin/depreciations/table.php
+++ b/resources/lang/sk-SK/admin/depreciations/table.php
@@ -6,6 +6,6 @@ return [
     'months'   => 'Mesiace',
     'term'   => 'Lehota',
     'title'      => 'Názov ',
-    'depreciation_min' => 'Floor Value',
+    'depreciation_min' => 'Minimálna hodnota',
 
 ];
diff --git a/resources/lang/sk-SK/admin/groups/message.php b/resources/lang/sk-SK/admin/groups/message.php
index 71a7fe83e9..d72207bf3f 100644
--- a/resources/lang/sk-SK/admin/groups/message.php
+++ b/resources/lang/sk-SK/admin/groups/message.php
@@ -3,7 +3,7 @@
 return array(
 
     'group_exists'        => 'Skupiny už existuje!',
-    'group_not_found'     => 'Group ID :id does not exist.',
+    'group_not_found'     => 'ID skupiny :id neexistuje.',
     'group_name_required' => 'Pole názov je povinné',
 
     'success' => array(
diff --git a/resources/lang/sk-SK/admin/groups/titles.php b/resources/lang/sk-SK/admin/groups/titles.php
index 2f350232a7..3a14a201cf 100644
--- a/resources/lang/sk-SK/admin/groups/titles.php
+++ b/resources/lang/sk-SK/admin/groups/titles.php
@@ -10,7 +10,7 @@ return [
     'group_admin' 	 		=> 'Administrátor skupiny',
     'allow' 	 			=> 'Povoliť',
     'deny' 	 				=> 'Odmietnuť',
-    'permission'            => 'Permission',
-    'grant'                 => 'Grant',
-    'no_permissions'        => 'This group has no permissions.'
+    'permission'            => 'Oprávnenia',
+    'grant'                 => 'Udeliť',
+    'no_permissions'        => 'Táto skupina nemá žiadne oprávnenia.'
 ];
diff --git a/resources/lang/sk-SK/admin/hardware/form.php b/resources/lang/sk-SK/admin/hardware/form.php
index 49f2ef5edc..af177da66c 100644
--- a/resources/lang/sk-SK/admin/hardware/form.php
+++ b/resources/lang/sk-SK/admin/hardware/form.php
@@ -1,21 +1,21 @@
 <?php
 
 return [
-    'bulk_delete'		=> 'Potvrdiť hromadné odstránenie majetku',
-    'bulk_restore'      => 'Confirm Bulk Restore Assets', 
+    'bulk_delete'		=> 'Potvrdiť hromadné odstránenie položiek majetku',
+    'bulk_restore'      => 'Potvrdiť hromadnú obnovu položiek majetku', 
   'bulk_delete_help'	=> 'Nižšie skontrolujte zoznam majetku na odstránenie. Po odstránení je možné tieto majetky obnoviť, nebudú už ale priradené k žiadnym používateľom, ku ktorým sú momentálne priradení.',
-  'bulk_restore_help'	=> 'Review the assets for bulk restoration below. Once restored, these assets will not be associated with any users they were previously assigned to.',
+  'bulk_restore_help'	=> 'Skontrolujte zoznam majetkov pre hromadnú obnovu. Po obnovní nebude majetok prepojený so žiadnymi používateľmi, s ktorým bol predtým priradený.',
   'bulk_delete_warn'	=> 'Chystáte sa odstrániť :asset_count majetky.',
-  'bulk_restore_warn'	=> 'You are about to restore :asset_count assets.',
-    'bulk_update'		=> 'Hromadná úprava majetku',
+  'bulk_restore_warn'	=> 'Chystáte sa obnoviť :asset_count majetkov.',
+    'bulk_update'		=> 'Hromadná úprava položiek majetku',
     'bulk_update_help'	=> 'Tento formulár umožňuje hromadnú úpravu majetku. Vyplňte iba položky, ktoré chcete zmeniť. Akékoľvek prázdne položky zostanú nezmenené. ',
-    'bulk_update_warn'	=> 'You are about to edit the properties of a single asset.|You are about to edit the properties of :asset_count assets.',
-    'bulk_update_with_custom_field' => 'Note the assets are :asset_model_count different types of models.',
-    'bulk_update_model_prefix' => 'On Models', 
-    'bulk_update_custom_field_unique' => 'This is a unique field and can not be bulk edited.',
+    'bulk_update_warn'	=> 'Chystáte sa upraviť vlastnosti jedného majetku.|Chystáte sa obnoviť vlastnosti :asset_count majetkov.',
+    'bulk_update_with_custom_field' => 'Upozorňujeme, že majetky sú :asset_mode_count rôznych typov modelov.',
+    'bulk_update_model_prefix' => 'Na modeloch', 
+    'bulk_update_custom_field_unique' => 'Toto je unikátne pole, preto nemôže byť hromadne upravené.',
     'checkedout_to'		=> 'Odovzdané',
     'checkout_date'		=> 'Dátum odovzdania',
-    'checkin_date'		=> 'Dátum prijatia',
+    'checkin_date'		=> 'Dátum prevzatia',
     'checkout_to'		=> 'Odovzdať',
     'cost'				=> 'Kúpna cena',
     'create'			=> 'Pridať majetok',
@@ -23,13 +23,13 @@ return [
     'depreciation'	    => 'Odpisovanie',
     'depreciates_on'	=> 'Plne odpísaný',
     'default_location'	=> 'Povodná lokalita',
-    'default_location_phone' => 'Default Location Phone',
+    'default_location_phone' => 'Telefón východzej lokality',
     'eol_date'			=> 'Dátum EOL',
-    'eol_rate'			=> 'Miera EOL',
-    'expected_checkin'  => 'Očakávaný dátum prijatia',
+    'eol_rate'			=> 'Interval EOL',
+    'expected_checkin'  => 'Očakávaný dátum prevzatia',
     'expires'			=> 'Exspiruje',
     'fully_depreciated'	=> 'Plne odpísaný',
-    'help_checkout'		=> 'Ak si prajete priradiť tento majetok okamžite, zvoľte možnosť "Pripravený na odovzdanie" z vyššie dostupného zoznamu stavov. ',
+    'help_checkout'		=> 'Ak si prajete priradiť tento majetok okamžite, zvoľte možnosť "Pripravený na odovzdanie" z dostupného zoznamu stavov. ',
     'mac_address'		=> 'MAC adresa',
     'manufacturer'		=> 'Výrobca',
     'model'				=> 'Model',
@@ -39,24 +39,27 @@ return [
     'order'				=> 'Číslo objednávky',
     'qr'				=> 'QR kód',
     'requestable'		=> 'Používatelia môžu žiadať tento majetok',
-    'redirect_to_all'   => 'Return to all :type',
-    'redirect_to_type'   => 'Go to :type',
-    'redirect_to_checked_out_to'   => 'Go to Checked Out to',
+    'redirect_to_all'   => 'Naspať na všetky :type',
+    'redirect_to_type'   => 'Prejsť na :type',
+    'redirect_to_checked_out_to'   => 'Prejsť na priradenie',
     'select_statustype'	=> 'Vyberte typ stavu',
     'serial'			=> 'Sériové číslo',
     'status'			=> 'Stav',
     'tag'				=> 'Označenie majetku',
-    'update'			=> 'Aktualizácia majetku',
+    'update'			=> 'Úprava majetku',
     'warranty'			=> 'Záruka',
         'warranty_expires'		=> 'Koniec záruky',
     'years'				=> 'roky/ov',
-    'asset_location' => 'Update Asset Location',
-    'asset_location_update_default_current' => 'Update default location AND actual location',
-    'asset_location_update_default' => 'Update only default location',
-    'asset_location_update_actual' => 'Update only actual location',
-    'asset_not_deployable' => 'That asset status is not deployable. This asset cannot be checked out.',
-    'asset_deployable' => 'That status is deployable. This asset can be checked out.',
-    'processing_spinner' => 'Processing... (This might take a bit of time on large files)',
+    'asset_location' => 'Upraviť lokalitu majetku',
+    'asset_location_update_default_current' => 'Upraviť predvolenú lokalitu A aktulánu lokalitu',
+    'asset_location_update_default' => 'Upraviť iba predvolenú lokalitu',
+    'asset_location_update_actual' => 'Upraviť iba aktuálnu lokalitu',
+    'asset_not_deployable' => 'Tento majetok nie je odovzdateľný. Tento majetok nemôže byť priradený.',
+    'asset_not_deployable_checkin' => 'Tento majetok nie je odovzdateľný. Použitím tohto typu stavu bude majetok prevzatý od priradeného používateľa.',
+    'asset_deployable' => 'This asset can be checked out.',
+    'processing_spinner' => 'Procesujem... (Môže to chvíľu trvať v prípade veľkých súborov)',
+    'processing' => 'Processing... ',
     'optional_infos'  => 'Nepovinné informácie',
-    'order_details'   => 'Informácie súvisiace s objednávkou'
+    'order_details'   => 'Informácie súvisiace s objednávkou',
+    'calc_eol'    => 'Ak odstránite EOL dátum použite sa automatická EOL kalkulácia vychádzajúca z dátumu nákupu a EOL periody.',
 ];
diff --git a/resources/lang/sk-SK/admin/hardware/general.php b/resources/lang/sk-SK/admin/hardware/general.php
index 533d491912..0d8981db2e 100644
--- a/resources/lang/sk-SK/admin/hardware/general.php
+++ b/resources/lang/sk-SK/admin/hardware/general.php
@@ -1,43 +1,42 @@
 <?php
 
 return [
-    'about_assets_title'           => 'O majetkoch',
-    'about_assets_text'            => 'Majetkom sú položky identifikované sériovým čislom alebo značkou majetku. Väčšinou ide o položky s vyššou hodnotou, pri ktorých je dôležité identifikovať konkrétnu položku.',
+    'about_assets_title'           => 'O položkách majetku',
+    'about_assets_text'            => 'Položky majetku sú identifikované sériovým číslom alebo značkou majetku. Väčšinou ide o položky s vyššou hodnotou, pri ktorých je dôležité identifikovať konkrétnu položku.',
     'archived'  				=> 'Archivované',
     'asset'  					=> 'Majetok',
-    'bulk_checkout'             => 'Vyskladniť majetky',
-    'bulk_checkin'              => 'Checkin Assets',
+    'bulk_checkout'             => 'Hromadné odovzdanie',
+    'bulk_checkin'              => 'Bulk Checkin',
     'checkin'  					=> 'Prevziať majetok',
-    'checkout'  				=> 'Vyskladniť majetok',
+    'checkout'  				=> 'Odovzdať majetok',
     'clone'  					=> 'Duplikovať majetok',
-    'deployable'  				=> 'Vyskladniteľný',
-    'deleted'  					=> 'This asset has been deleted.',
-    'delete_confirm'            => 'Are you sure you want to delete this asset?',
+    'deployable'  				=> 'Odovzdateľný',
+    'deleted'  					=> 'Tento majetok bol zmazaný.',
+    'delete_confirm'            => 'Ste si istý, že chcete zmazať tento majetok?',
     'edit'  					=> 'Upraviť majetok',
-    'model_deleted'  			=> 'This Assets model has been deleted. You must restore the model before you can restore the Asset.',
-    'model_invalid'             => 'This model for this asset is invalid.',
-    'model_invalid_fix'         => 'The asset must be updated use a valid asset model before attempting to check it in or out, or to audit it.',
+    'model_deleted'  			=> 'Tento Model majetku bol zmazaný. Pred obnovením majetku musíte obnoviť model majetku.',
+    'model_invalid'             => 'Tento model je pre daný majetok neplatný.',
+    'model_invalid_fix'         => 'Tento majetok musí byť upravený. Použite platný model majetku predtým ako sa ho pokúsite prevziať alebo odovzdať alebo auditovať.',
     'requestable'               => 'Vyžiadateľný',
     'requested'				    => 'Vyžiadané',
-    'not_requestable'           => 'Not Requestable',
-    'requestable_status_warning' => 'Do not change requestable status',
+    'not_requestable'           => 'Nevyžiadateľný',
+    'requestable_status_warning' => 'Nemeniť stav vyžiadateľnosti',
     'restore'  					=> 'Obnoviť majetok',
     'pending'  					=> 'Čakajúce',
-    'undeployable'  			=> 'Nevyskladniteľný',
-    'undeployable_tooltip'  	=> 'This asset has a status label that is undeployable and cannot be checked out at this time.',
+    'undeployable'  			=> 'Neodovzdateľný',
+    'undeployable_tooltip'  	=> 'Tento majetok je v stave, ktorý neumožňuje odovzdanie a preto nemôže byť teraz odovzdaný.',
     'view'  					=> 'Zobraziť majetok',
-    'csv_error' => 'You have an error in your CSV file:',
-    'import_text' => '<p>Upload a CSV that contains asset history. The assets and users MUST already exist in the system, or they will be skipped. Matching assets for history import happens against the asset tag. We will try to find a matching user based on the user\'s name you provide, and the criteria you select below. If you do not select any criteria below, it will simply try to match on the username format you configured in the <code>Admin &gt; General Settings</code>.</p><p>Fields included in the CSV must match the headers: <strong>Asset Tag, Name, Checkout Date, Checkin Date</strong>. Any additional fields will be ignored. </p><p>Checkin Date: blank or future checkin dates will checkout items to associated user.  Excluding the Checkin Date column will create a checkin date with todays date.</p>
-    ',
-    'csv_import_match_f-l' => 'Try to match users by <strong>firstname.lastname</strong> (<code>jane.smith</code>) format',
-    'csv_import_match_initial_last' => 'Try to match users by <strong>first initial last name</strong> (<code>jsmith</code>) format',
-    'csv_import_match_first' => 'Try to match users by <strong>first name</strong> (<code>jane</code>) format',
-    'csv_import_match_email' => 'Try to match users by <strong>email</strong> as username',
-    'csv_import_match_username' => 'Try to match users by <strong>username</strong>',
-    'error_messages' => 'Error messages:',
-    'success_messages' => 'Success messages:',
-    'alert_details' => 'Please see below for details.',
-    'custom_export' => 'Custom Export',
-    'mfg_warranty_lookup' => ':manufacturer Warranty Status Lookup',
-    'user_department' => 'User Department',
+    'csv_error' => 'V CSV súbore sa nachádza chyba:',
+    'import_text' => '<p>Upload a CSV that contains asset history. The assets and users MUST already exist in the system, or they will be skipped. Matching assets for history import happens against the asset tag. We will try to find a matching user based on the user\'s name you provide, and the criteria you select below. If you do not select any criteria below, it will simply try to match on the username format you configured in the <code>Admin &gt; General Settings</code>.</p><p>Fields included in the CSV must match the headers: <strong>Asset Tag, Name, Checkout Date, Checkin Date</strong>. Any additional fields will be ignored. </p><p>Checkin Date: blank or future checkin dates will checkout items to associated user.  Excluding the Checkin Date column will create a checkin date with todays date.</p>    ',
+    'csv_import_match_f-l' => 'Pokúsiť sa porovnať používateľov podľa tvaru <strong>meno.priezvisko</strong>  (<code>jane.smith</code>)',
+    'csv_import_match_initial_last' => 'Pokúsiť sa porovnať používateľov podľa tvaru <strong>inciálka mena priezvisko</strong> (<code>jsmith</code>)',
+    'csv_import_match_first' => 'Pokúsiť sa porovnať používateľov podľa tvaru <strong>meno</strong> (<code>jane</code>)',
+    'csv_import_match_email' => 'Pokúsiť sa porovnať používateľov <strong>email</strong> ako používateľského mena',
+    'csv_import_match_username' => 'Pokúsiť sa porovnať používateľov podľad <strong>používateľského mena</strong>',
+    'error_messages' => 'Chybové hlášky:',
+    'success_messages' => 'Výsledky:',
+    'alert_details' => 'Podrobnosti nájdete nižšie.',
+    'custom_export' => 'Uživateľsky definovaný export',
+    'mfg_warranty_lookup' => 'Vyhľadávanie stavu záruky :manufacturer',
+    'user_department' => 'Oddelenie používateľa',
 ];
diff --git a/resources/lang/sk-SK/admin/hardware/message.php b/resources/lang/sk-SK/admin/hardware/message.php
index 16a6c4b230..ac03902b37 100644
--- a/resources/lang/sk-SK/admin/hardware/message.php
+++ b/resources/lang/sk-SK/admin/hardware/message.php
@@ -2,39 +2,43 @@
 
 return [
 
-    'undeployable' 		=> '<strong>Varovanie: </strong> Tento majetok bol oznáčený ako nepriraditeľný. 
-                        Ak došlo k zmene, prosím upravte aktuálny stav majetku.',
-    'does_not_exist' 	=> 'Majetok neexistuje.',
-    'does_not_exist_var'=> 'Asset with tag :asset_tag not found.',
-    'no_tag' 	        => 'No asset tag provided.',
-    'does_not_exist_or_not_requestable' => 'That asset does not exist or is not requestable.',
-    'assoc_users'	 	=> 'Tento majetok je práve priradený používateľovi, preto nemôže byť odstránený. Prosim najprv odoberte majetok používateľovi, následne skúste znovu. ',
-    'warning_audit_date_mismatch' 	=> 'This asset\'s next audit date (:next_audit_date) is before the last audit date (:last_audit_date). Please update the next audit date.',
+    'undeployable' 		 => '<strong>Varovanie: </strong> Tento majetok bol označný ako neodovzdateľný. Ak došlo k zmene, prosím upravte aktuálny stav majetku.',
+    'does_not_exist' 	 => 'Majetok neexistuje.',
+    'does_not_exist_var' => 'Majetok s označením :asset_tag nebol nájdený.',
+    'no_tag' 	         => 'Nebolo zadané žiadne označenie majetku.',
+    'does_not_exist_or_not_requestable' => 'Tento majetok neexistuje alebo sa nedá vyžiadať.',
+    'assoc_users'	 	 => 'Tento majetok je práve priradený používateľovi, preto nemôže byť odstránený. Prosim najprv odoberte majetok používateľovi, následne skúste znovu. ',
+    'warning_audit_date_mismatch' 	=> 'Nastavený dátum nasledujúceho auditu (:next_audit_date) je skorší ako dátum posledného auditu (:last_audit_date). Prosím upravte dátum nasledujúceho auditu.',
+    'labels_generated'   => 'Štítky boli úspešne vygenerované.',
+    'error_generating_labels' => 'Pri generovaní štítkov nastala chyba.',
+    'no_assets_selected' => 'Neboli zvolené žiadne položky majetku.',
 
     'create' => [
         'error'   		=> 'Majetok nebol vytvorený, prosím skúste znovu. :(',
         'success' 		=> 'Majetok bol úspešne vytvorený. :)',
-        'success_linked' => 'Asset with tag :tag was created successfully. <strong><a href=":link" style="color: white;">Click here to view</a></strong>.',
+        'success_linked' => 'Majetok s označením :tag bol úspešne pridaný. <strong><a href=":link" style="color: white;">Kliknite sem pre zobrazenie</a></strong>.',
+        'multi_success_linked' => 'Majetok s označením :links bol úspešne pridaný.|:count majetkov bolo úspešne pridaných :links.',
+        'partial_failure' => 'Majetok sa nepodarilo pridať. Dôvod: :failuers|:count majetkov nebolo možné pridať. Dôvody: :failures',
     ],
 
     'update' => [
         'error'   			=> 'Majetok sa nepodarilo upraviť, skúste prosím znovu',
         'success' 			=> 'Majetok bol úspešne upravený.',
-        'encrypted_warning' => 'Asset updated successfully, but encrypted custom fields were not due to permissions',
+        'encrypted_warning' => 'Majetok bol úspešne upravený, avšak šifrované vlastné polia neboli upravené z dôvodu oprávnení',
         'nothing_updated'	=>  'Neboli vybrané žiadne položky, preto nebolo nič upravené.',
-        'no_assets_selected'  =>  'No assets were selected, so nothing was updated.',
-        'assets_do_not_exist_or_are_invalid' => 'Selected assets cannot be updated.',
+        'no_assets_selected'  =>  'Neboli vybrané žiadne majetky, preto nebolo nič upravené.',
+        'assets_do_not_exist_or_are_invalid' => 'Zvolené položky majetku nemôžu byť upravené.',
     ],
 
     'restore' => [
         'error'   		=> 'Majetok nebol obnovený, prosím skúste znovu',
         'success' 		=> 'Majetok bol úspešne obnovený.',
         'bulk_success' 		=> 'Majetok bol úspešne obnovený.',
-        'nothing_updated'   => 'No assets were selected, so nothing was restored.', 
+        'nothing_updated'   => 'Neboli zvolené žiadne položky majetku, preto nebolo nič obnovené.', 
     ],
 
     'audit' => [
-        'error'   		=> 'Asset audit unsuccessful: :error ',
+        'error'   		=> 'Audit majetku nebol úspešný :error ',
         'success' 		=> 'Audit majetko bol úspešne zaznamenaný.',
     ],
 
@@ -52,44 +56,54 @@ return [
     ],
 
     'import' => [
+        'import_button'         => 'Spracovať import',
         'error'                 => 'Niektoré položky neboli správne naimportované.',
         'errorDetail'           => 'Nasledujúce položky neboli kvôli chybám importované.',
         'success'               => 'Súbor bol naimportovaný',
         'file_delete_success'   => 'Súbor bol úspešné odstránený',
         'file_delete_error'      => 'Súbor sa nepodarilo odstrániť',
-        'file_missing' => 'The file selected is missing',
-        'header_row_has_malformed_characters' => 'One or more attributes in the header row contain malformed UTF-8 characters',
-        'content_row_has_malformed_characters' => 'One or more attributes in the first row of content contain malformed UTF-8 characters',
+        'file_missing' => 'Vybraný súbor nebol nájdený',
+        'file_already_deleted' => 'Vybraný súbor už bol odstránený',
+        'header_row_has_malformed_characters' => 'Jeden alebo viacero stĺpcov obsahujú poškodené UTF-8 znaky',
+        'content_row_has_malformed_characters' => 'Jeden alebo viacero atribútov v prvom riadku obsahu obsahuje poškodené UTF-8 znaky',
+        'transliterate_failure' => 'Transliteration from :encoding to UTF-8 failed due to invalid characters in input'
     ],
 
 
     'delete' => [
         'confirm'   	=> 'Ste si istý, že chcete odstrániť tento majetok?',
         'error'   		=> 'Pri odstraňovaní majetku sa vyskytla chyba. Skúste prosím znovu.',
-        'nothing_updated'   => 'Neboli zvolený žiaden majetok, preto nebolo nič odstránené.',
+        'assigned_to_error' => '{1}Asset Tag: :asset_tag is currently checked out. Check in this device before deletion.|[2,*]Asset Tags: :asset_tag are currently checked out. Check in these devices before deletion.',
+        'nothing_updated'   => 'Neboli zvolený žiadne položky majetku, preto nebolo nič odstránené.',
         'success' 		=> 'Majetok bol úspešne odstránený.',
     ],
 
     'checkout' => [
-        'error'   		=> 'Majetok sa nepodarilo priradiť, skúste prosím znovu',
-        'success' 		=> 'Majetok bol úspešne priradený.',
+        'error'   		=> 'Majetok sa nepodarilo odovzdať, skúste prosím znovu',
+        'success' 		=> 'Majetok bol úspešne odovzdaný.',
         'user_does_not_exist' => 'Tento užívateľ nie je platný. Prosím skúste znovu.',
-        'not_available' => 'Tento majetok nie je k dospozícii pre priradenie!',
+        'not_available' => 'Tento majetok nie je k dospozícii pre odovzdanie!',
         'no_assets_selected' => 'Musíte vybrať najmenej jednu položku majetku zo zoznamu',
     ],
 
+    'multi-checkout' => [
+        'error'   => 'Majetok nebol odovzdaný, prosím skúste znovu|Majetky neboli odovzdané, prosím skúste znovu',
+        'success' => 'Majetok bol úspešne odovzdaný.|Majetky boli úspešne odovzdané.',
+    ],
+
     'checkin' => [
-        'error'   		=> 'Majetok sa nepodarilo prijať, skúste prosím znovu',
-        'success' 		=> 'Majetok bol úspešne prijatý.',
+        'error'   		=> 'Majetok sa nepodarilo prevziať, skúste prosím znovu',
+        'success' 		=> 'Majetok bol úspešne prevzatý.',
         'user_does_not_exist' => 'Tento užívateľ nie je platný. Prosím skúste znovu.',
         'already_checked_in'  => 'Tento majetok je už prevzatý.',
 
     ],
 
     'requests' => [
-        'error'   		=> 'Majetok nebol vyžiadaný, prosím skúste znovu',
-        'success' 		=> 'Majetok úspešne vyžiadaný.',
-        'canceled'      => 'Požiadavka na priradenie bola úspešne zrušená',
+        'error'   		=> 'Request was not successful, please try again.',
+        'success' 		=> 'Request successfully submitted.',
+        'canceled'      => 'Request successfully canceled.',
+        'cancel'        => 'Zrušiť túto žiadosť o položku',
     ],
 
 ];
diff --git a/resources/lang/sk-SK/admin/hardware/table.php b/resources/lang/sk-SK/admin/hardware/table.php
index 538bf091ef..9b44efc972 100644
--- a/resources/lang/sk-SK/admin/hardware/table.php
+++ b/resources/lang/sk-SK/admin/hardware/table.php
@@ -4,18 +4,18 @@ return [
 
     'asset_tag'   	=> 'Označenie majetku',
     'asset_model'       => 'Model',
-    'assigned_to'   => 'Assigned To',
-    'book_value'  	=> 'Current Value',
+    'assigned_to'   => 'Priradené',
+    'book_value'  	=> 'Aktuálna hodnota',
     'change' 		=> 'Vsetup/Výstup',
     'checkout_date' => 'Dátum odovzdania',
     'checkoutto' 	=> 'Odovzdané',
-    'components_cost' => 'Total Components Cost',
-    'current_value' => 'Current Value',
+    'components_cost' => 'Celkové náklady na komponenty',
+    'current_value' => 'Aktuálna hodnota',
     'diff' 			=> 'Rozdiel',
     'dl_csv' 		=> 'Stiahnuť CSV',
     'eol' 			=> 'Koniec životnosti',
     'id'      		=> 'ID',
-    'last_checkin_date' => 'Last Checkin Date',
+    'last_checkin_date' => 'Dátum posledného prevzatia',
     'location' 		=> 'Umiestnenie',
     'purchase_cost'	=> 'Cena',
     'purchase_date'	=> 'Zakúpené',
@@ -25,9 +25,8 @@ return [
     'image'		    => 'Obrázok zariadenia',
     'days_without_acceptance' => 'Počet dní bez potvrdenia',
     'monthly_depreciation' => 'Mesačný odpis',
-    'assigned_to'    => 'Assigned To',
-    'requesting_user' => 'Requesting User',
-    'requested_date' => 'Requested Date',
+    'requesting_user' => 'Žiadajúci používateľ',
+    'requested_date' => 'Dátum vyžiadania',
     'changed'       => 'Zmenené',
     'icon' => 'Ikona',
 ];
diff --git a/resources/lang/sk-SK/admin/kits/general.php b/resources/lang/sk-SK/admin/kits/general.php
index f57fb645c4..2d803c0aec 100644
--- a/resources/lang/sk-SK/admin/kits/general.php
+++ b/resources/lang/sk-SK/admin/kits/general.php
@@ -1,50 +1,51 @@
 <?php
 
 return [
-    'about_kits_title'                  => 'About Predefined Kits',
-    'about_kits_text'                   => 'Predefined Kits let you quickly check out a collection of items (assets, licenses, etc) to a user. This can be helpful when your onboarding process is consistent across many users and all users receive the same items.',
-    'checkout'                          => 'Checkout Kit ',
-    'create_success'                    => 'Kit was successfully created.',
-    'create'                            => 'Create Predefined Kit',
-    'update'                            => 'Update Predefined Kit',
-    'delete_success'                    => 'Kit was successfully deleted.',
-    'update_success'                    => 'Kit was successfully updated.',
-    'none_models'                       => 'There are not enough available assets for :model to checkout. :qty are required. ',
-    'none_licenses'                     => 'There are not enough available seats for :license to checkout. :qty are required. ',
-    'none_consumables'                  => 'There are not enough available units of :consumable to checkout. :qty are required. ',
-    'none_accessory'                    => 'There are not enough available units of :accessory to checkout. :qty are required. ',
-    'append_accessory'                  => 'Append Accessory',
-    'update_appended_accessory'         => 'Update appended Accessory',
-    'append_consumable'                 => 'Append Consumable',
-    'update_appended_consumable'        => 'Update appended Consumable',
-    'append_license'                    => 'Append license',
-    'update_appended_license'           => 'Update appended license',
-    'append_model'                      => 'Append model',
-    'update_appended_model'             => 'Update appended model',
-    'license_error'                     => 'License already attached to kit',
-    'license_added_success'             => 'License added successfully',
-    'license_updated'                   => 'License was successfully updated',
-    'license_none'                      => 'License does not exist',
-    'license_detached'                  => 'License was successfully detached',
-    'consumable_added_success'          => 'Consumable added successfully',
-    'consumable_updated'                => 'Consumable was successfully updated',
-    'consumable_error'                  => 'Consumable already attached to kit',
-    'consumable_deleted'                => 'Delete was successful',
-    'consumable_none'                   => 'Consumable does not exist',
-    'consumable_detached'               => 'Consumable was successfully detached',
-    'accessory_added_success'           => 'Accessory added successfully',
-    'accessory_updated'                 => 'Accessory was successfully updated',
-    'accessory_detached'                => 'Accessory was successfully detached',
-    'accessory_error'                   => 'Accessory already attached to kit',
-    'accessory_deleted'                 => 'Delete was successful',
-    'accessory_none'                    => 'The accessory does not exist',
-    'checkout_success'                  => 'Checkout was successful',
-    'checkout_error'                    => 'Checkout error',
-    'kit_none'                          => 'Kit does not exist',
-    'kit_created'                       => 'Kit was successfully created',
-    'kit_updated'                       => 'Kit was successfully updated',
-    'kit_not_found'                     => 'Kit not found',
-    'kit_deleted'                       => 'Kit was successfully deleted',
-    'kit_model_updated'                 => 'Model was successfully updated',
-    'kit_model_detached'                => 'Model was successfully detached',
+    'about_kits_title'                  => 'O preddefinovaných sadách',
+    'about_kits_text'                   => 'Preddefinované sady umožňujú rýchle odovzdanie sady položiek (majetky, licencie, atď.) používateľovi. Výhodu to ma v prípade, ak je proces nástupu rovnaký pri viacerých používateľoch a všetci dostávajú tie isté položky.',
+    'checkout'                          => 'Odovzdať sadu ',
+    'create_success'                    => 'Sada bol úspešne vytvorená.',
+    'create'                            => 'Vytvoriť preddefinovanú sadu',
+    'update'                            => 'Upraviť preddefinovanú sadu',
+    'delete_success'                    => 'Sada bol úspešne zmazaná.',
+    'update_success'                    => 'Sada bol úspešne upravená.',
+    'none_models'                       => 'Nie je k dispozícií dostatočný počet majetkov typu :model k odovzdaniu. Je potrebných :qty. ',
+    'none_licenses'                     => 'Nie je k dispozícií dostatočný počet licenčných miest pre :license k odovzdaniu. Je potrebných :qty. ',
+    'none_consumables'                  => 'Nie je k dispozícií dostatočný počet položiek :consumable k odovzdaniu. Je potrebných :qty. ',
+    'none_accessory'                    => 'Nie je k dispozícií dostatočný počet položiek :accessory k odovzdaniu. Je potrebných :qty. ',
+    'append_accessory'                  => 'Pripojiť príslušenstvo',
+    'update_appended_accessory'         => 'Upraviť pripojené príslušenstvo',
+    'append_consumable'                 => 'Pripojiť spotrebný materiál',
+    'update_appended_consumable'        => 'Upraviť pripojený spotrebný materiál',
+    'append_license'                    => 'Pripojiť licencie',
+    'update_appended_license'           => 'Upraviť pripojené licencie',
+    'append_model'                      => 'Pripojiť model',
+    'update_appended_model'             => 'Upraviť pripojený model',
+    'license_error'                     => 'Licencie sú už súčasťou sady',
+    'license_added_success'             => 'Licencia bola úspešne pridaná',
+    'license_updated'                   => 'Licensie bol úspešne upravená',
+    'license_none'                      => 'Licensia neexistuje',
+    'license_detached'                  => 'Licencia bola úspešne odpojená',
+    'consumable_added_success'          => 'Spotrebný materiál bol úspešne pridaný',
+    'consumable_updated'                => 'Spotrebný materiál bol úspešne upravený',
+    'consumable_error'                  => 'Spotrebná materiál je už súčasťou sady',
+    'consumable_deleted'                => 'Zmazanie bolo úspešné',
+    'consumable_none'                   => 'Spotrebný materiál neexistuje',
+    'consumable_detached'               => 'Spotrebný materiál bol úspešne odpojený',
+    'accessory_added_success'           => 'Príslušenstvo bolo úspešne pridané',
+    'accessory_updated'                 => 'Príslušenstvo bolo úspešne upravené',
+    'accessory_detached'                => 'Príslušenstvo bolo úspešne odpojené',
+    'accessory_error'                   => 'Príslúšenstvo je už súčasťou sady',
+    'accessory_deleted'                 => 'Zmazanie bolo úspešné',
+    'accessory_none'                    => 'Príslušenstvo neexistuje',
+    'checkout_success'                  => 'Odovzdanie bolo úspešné',
+    'checkout_error'                    => 'Pri odovzdaní nastala chyba',
+    'kit_none'                          => 'Sada neexistuje',
+    'kit_created'                       => 'Sada bol úspešne vytvorená',
+    'kit_updated'                       => 'Sada bola úspešne upravená',
+    'kit_not_found'                     => 'Sada nebol nájdená',
+    'kit_deleted'                       => 'Sada bola úspešne odstránená',
+    'kit_model_updated'                 => 'Model bol úspešne upravený',
+    'kit_model_detached'                => 'Model bol úspešne odpojený',
+    'model_already_attached'            => 'Model je už súčasťou sady',
 ];
diff --git a/resources/lang/sk-SK/admin/labels/message.php b/resources/lang/sk-SK/admin/labels/message.php
index 96785f0754..641f1ac471 100644
--- a/resources/lang/sk-SK/admin/labels/message.php
+++ b/resources/lang/sk-SK/admin/labels/message.php
@@ -2,10 +2,10 @@
 
 return [
 
-    'invalid_return_count' => 'Invalid count returned from :name. Expected :expected, got :actual.',
-    'invalid_return_type'  => 'Invalid type returned from :name. Expected :expected, got :actual.',
-    'invalid_return_value' => 'Invalid value returned from :name. Expected :expected, got :actual.',
+    'invalid_return_count' => 'Neplatný počet vrátený z :name. Očakávaný :expected, vrátený :actual.',
+    'invalid_return_type'  => 'Nesprávny typ vrátený z :name. Očakávaný :expected, vrátený :actual.',
+    'invalid_return_value' => 'Nesprávna hodnota vrátaná z :name. Očakávaná :expected, vrátaná: actual.',
 
-    'does_not_exist' => 'Label does not exist',
+    'does_not_exist' => 'Štítok neexistuje',
     
 ];
diff --git a/resources/lang/sk-SK/admin/labels/table.php b/resources/lang/sk-SK/admin/labels/table.php
index 08ff0faed0..b22ffb4606 100644
--- a/resources/lang/sk-SK/admin/labels/table.php
+++ b/resources/lang/sk-SK/admin/labels/table.php
@@ -1,16 +1,16 @@
 <?php
 
 return [
-    'example_company'    => 'Test Company Limited',
-    'example_defaultloc' => 'Building 1',
-    'example_category'   => 'Test Category',
-    'example_location'   => 'Building 2',
-    'example_manufacturer'  => 'Test Manufacturing Inc.',
-    'example_model'      => 'Test Model',
-    'example_supplier'   => 'Test Company Limited',
+    'example_company'    => 'Testovacia spoločnosť s obmedzením',
+    'example_defaultloc' => 'Budova 1',
+    'example_category'   => 'Testovacia kategória',
+    'example_location'   => 'Budova 2',
+    'example_manufacturer'  => 'Testovacia výrobňa',
+    'example_model'      => 'Testovací model',
+    'example_supplier'   => 'Testovacia spoločnosť s obmedzením',
     'labels_per_page'    => 'Štítky',
     'support_fields'     => 'Polia',
-    'support_asset_tag'  => 'Tag',
+    'support_asset_tag'  => 'Značka',
     'support_1d_barcode' => '1D',
     'support_2d_barcode' => '2D',
     'support_logo'       => 'Logo',
diff --git a/resources/lang/sk-SK/admin/licenses/form.php b/resources/lang/sk-SK/admin/licenses/form.php
index 5e8b28300f..a2f7389a42 100644
--- a/resources/lang/sk-SK/admin/licenses/form.php
+++ b/resources/lang/sk-SK/admin/licenses/form.php
@@ -3,20 +3,20 @@
 return array(
 
     'asset'             => 'Majetok',
-    'checkin'           => 'Checkin',
-    'create'            => 'Create License',
-    'expiration'        => 'Expiration Date',
-    'license_key'       => 'Product Key',
-    'maintained'        => 'Maintained',
-    'name'              => 'Software Name',
-    'no_depreciation'   => 'Do Not Depreciate',
-    'purchase_order'    => 'Purchase Order Number',
-    'reassignable'      => 'Reassignable',
-    'remaining_seats'   => 'Remaining Seats',
-    'seats'             => 'Seats',
-    'termination_date'  => 'Termination Date',
-    'to_email'          => 'Licensed to Email',
-    'to_name'           => 'Licensed to Name',
-    'update'            => 'Update License',
-    'checkout_help'     => 'You must check a license out to a hardware asset or a person. You can select both, but the owner of the asset must match the person you\'re checking the asset out to.'
+    'checkin'           => 'Prevzatie',
+    'create'            => 'Pridať licenciu',
+    'expiration'        => 'Exspirácia licencie',
+    'license_key'       => 'Produktový kľúč',
+    'maintained'        => 'Udržiavané',
+    'name'              => 'Názov softvéru',
+    'no_depreciation'   => 'Neodpisovať',
+    'purchase_order'    => 'Číslo nákupnej objednávky',
+    'reassignable'      => 'Znovu priraditeľná',
+    'remaining_seats'   => 'Zostávajúce sídla',
+    'seats'             => 'Sídla',
+    'termination_date'  => 'Platná do',
+    'to_email'          => 'Registrovaná na mail',
+    'to_name'           => 'Registrovaná na meno',
+    'update'            => 'Upraviť licenciu',
+    'checkout_help'     => 'Musíte priradiť licenciu majetku alebo osobe. Môžete vybrať oboje ale majiteľ majetku sa musí zhodovať s osobou, ktorej je licencia priradená.'
 );
diff --git a/resources/lang/sk-SK/admin/licenses/general.php b/resources/lang/sk-SK/admin/licenses/general.php
index e7f8412c1d..aaa55dbded 100644
--- a/resources/lang/sk-SK/admin/licenses/general.php
+++ b/resources/lang/sk-SK/admin/licenses/general.php
@@ -2,50 +2,51 @@
 
 return array(
     'about_licenses_title'      => 'O licenciach',
-    'about_licenses'            => 'Licenses are used to track software.  They have a specified number of seats that can be checked out to individuals',
-    'checkin'  					=> 'Checkin License Seat',
-    'checkout_history'  		=> 'Checkout History',
-    'checkout'  				=> 'Checkout License Seat',
-    'edit'  					=> 'Edit License',
+    'about_licenses'            => 'Licencie sa využívajú k sledovaniu softvéru. Majú stanovený počet slotov, ktoré môžu byť odovzdané používateľom',
+    'checkin'  					=> 'Prevziať licenčný slot',
+    'checkout_history'  		=> 'História odovzdania',
+    'checkout'  				=> 'Odovzdať licenčný slot',
+    'edit'  					=> 'Upraviť licenciu',
     'filetype_info'				=> 'Podporované typy súborov: png, gif, jpg, jpeg, doc, docx, pdf, txt, zip a rar.',
-    'clone'  					=> 'Clone License',
-    'history_for'  				=> 'History for ',
+    'clone'  					=> 'Duplikovať licenciu',
+    'history_for'  				=> 'História pre ',
     'in_out'  					=> 'Vsetup/Výstup',
-    'info'  					=> 'License Info',
-    'license_seats'  			=> 'License Seats',
-    'seat'  					=> 'Seat',
-    'seats'  					=> 'Seats',
-    'software_licenses'  		=> 'Software Licenses',
-    'user'  					=> 'User',
-    'view'  					=> 'View License',
-    'delete_disabled'           => 'This license cannot be deleted yet because some seats are still checked out.',
+    'info'  					=> 'Informácie o licencii',
+    'license_seats'  			=> 'Počet slotov',
+    'seat'  					=> 'Slot',
+    'seat_count'  				=> 'Slot :count',
+    'seats'  					=> 'Sloty',
+    'software_licenses'  		=> 'Softvérové licencie',
+    'user'  					=> 'Používateľ',
+    'view'  					=> 'Podrobnosti o licencii',
+    'delete_disabled'           => 'Tieto licencie nemôžu byť zmazané pretože niektoré sloty sú stále odovzdané.',
     'bulk'                      =>
         [
             'checkin_all'           => [
-                'button'            => 'Checkin All Seats',
-                'modal'             => 'This will action checkin one seat. | This action will checkin all :checkedout_seats_count seats for this license.',
-                'enabled_tooltip'   => 'Checkin ALL seats for this license from both users and assets',
-                'disabled_tooltip'  => 'This is disabled because there are no seats currently checked out',
-                'disabled_tooltip_reassignable'  => 'This is disabled because the License is not reassignable',
-                'success'           => 'License successfully checked in! | All licenses were successfully checked in!',
-                'log_msg'           => 'Checked in via bulk license checkout in license GUI',
+                'button'            => 'Prevziať všetky sloty',
+                'modal'             => 'Táto akcia prevezme jeden slot. | Táto akcia prevezme všetkých :checkedout_seats_count slotov tejto licencie.',
+                'enabled_tooltip'   => 'Prevziať všetky sloty tejto licencie od používateľov aj majetkov',
+                'disabled_tooltip'  => 'Táto akcia je zakázaná, keďže nie je odovzdaná žiadna licencia',
+                'disabled_tooltip_reassignable'  => 'Táto akcia je zakázaná pretože licencia nie je znovu priraditeľná',
+                'success'           => 'Licencia úspešne prevzatá! | Všetky licencie boli úspešne prevzaté!',
+                'log_msg'           => 'Hromadne prevziať v rozhraní pre správu licencií',
             ],
 
             'checkout_all'              => [
-                'button'                => 'Checkout All Seats',
-                'modal'                 => 'This action will checkout one seat to the first available user. | This action will checkout all :available_seats_count seats to the first available users. A user is considered available for this seat if they do not already have this license checked out to them, and the Auto-Assign License property is enabled on their user account.',
-                'enabled_tooltip'   => 'Checkout ALL seats (or as many as are available) to ALL users',
-                'disabled_tooltip'  => 'This is disabled because there are no seats currently available',
-                'success'           => 'License successfully checked out! | :count licenses were successfully checked out!',
-                'error_no_seats'    => 'There are no remaining seats left for this license.',
-                'warn_not_enough_seats'    => ':count users were assigned this license, but we ran out of available license seats.',
-                'warn_no_avail_users'    => 'Nothing to do. There are no users who do not already have this license assigned to them.',
-                'log_msg'           => 'Checked out via bulk license checkout in license GUI',
+                'button'                => 'Odovzdať všetky sloty',
+                'modal'                 => 'Táto akcia odovzdá jeden slot prvému dostupnému používateľovi. | Táto akcia odovzdá všetkých :available_seats_count slotov prvých dostupných používateľom. Používateľ je považovaný za dostupného v prípade, ak mu ešte nebola odovzdaná táto licencia a daný používateľ ma povolené automatické priradzovanie licencií.',
+                'enabled_tooltip'   => 'Odovzdať všetky (dostupné) sloty všetkých používateľom',
+                'disabled_tooltip'  => 'Táto možnosť je zablokovaná pretože nie sú dostupné žiadne sloty',
+                'success'           => 'Licencia bola úspešne odovzdaná! | :count licencií bolo úspešne odovzdaných!',
+                'error_no_seats'    => 'Nezostávajú žiadne voľné sloty pri tejto licencii.',
+                'warn_not_enough_seats'    => ':count používateľom bola licencia priradená, avšak už nezostali žiadne voľné sloty.',
+                'warn_no_avail_users'    => 'Nie je možné zrealizovať. Nezostal žiaden používateľ, ktorý by túto licenciu ešte nemal priradenú.',
+                'log_msg'           => 'Hromadne odovzdať v rozhraní pre správu licencií',
 
 
             ],
     ],
 
-    'below_threshold' => 'There are only :remaining_count seats left for this license with a minimum quantity of :min_amt. You may want to consider purchasing more seats.',
-    'below_threshold_short' => 'This item is below the minimum required quantity.',
+    'below_threshold' => 'Zostáva už iba :remaining_count voľných slotov pre túto licenciu s nastaveným minimálnym množstvom :min_amt. Mali by ste zvážiť dokúpenie ďalších slotov.',
+    'below_threshold_short' => 'Táto položka je pod hranicou minimálneho požadovaného množstva.',
 );
diff --git a/resources/lang/sk-SK/admin/licenses/message.php b/resources/lang/sk-SK/admin/licenses/message.php
index ae08d2cfcb..b76b49d01c 100644
--- a/resources/lang/sk-SK/admin/licenses/message.php
+++ b/resources/lang/sk-SK/admin/licenses/message.php
@@ -2,19 +2,19 @@
 
 return array(
 
-    'does_not_exist' => 'License does not exist or you do not have permission to view it.',
-    'user_does_not_exist' => 'User does not exist or you do not have permission to view them.',
-    'asset_does_not_exist' 	=> 'The asset you are trying to associate with this license does not exist.',
-    'owner_doesnt_match_asset' => 'The asset you are trying to associate with this license is owned by somene other than the person selected in the assigned to dropdown.',
-    'assoc_users'	 => 'This license is currently checked out to a user and cannot be deleted. Please check the license in first, and then try deleting again. ',
-    'select_asset_or_person' => 'You must select an asset or a user, but not both.',
-    'not_found' => 'License not found',
-    'seats_available' => ':seat_count seats available',
+    'does_not_exist' => 'Licencia neexistuje alebo nemáte oprávnenie na jej zobrazenie.',
+    'user_does_not_exist' => 'Používateľ neexistuje alebo nemáte oprávnenie na jeho zobrazenie.',
+    'asset_does_not_exist' 	=> 'Majetok, ktorý sa pokúšate spojiť s touto licenciou, neexistuje.',
+    'owner_doesnt_match_asset' => 'Majetok, ktorý sa snažíte spojiť s touto licenciou je vlastné niekým iným ako zvolenou osobou.',
+    'assoc_users'	 => 'Táto licencia je aktuálne priradená používateľovi a preto nemôže byť zmazaná. Prosím odoberte najprv licenciou používateľovi a následne skúste zmazať znovu. ',
+    'select_asset_or_person' => 'Musíte vybrať majetok alebo používatelia, ale nie oboje.',
+    'not_found' => 'Licencia nebol nájdená',
+    'seats_available' => ':seat_count miest k dispozícií',
 
 
     'create' => array(
-        'error'   => 'License was not created, please try again.',
-        'success' => 'License created successfully.'
+        'error'   => 'Licencia nebola pridaná, prosím skúste znovu.',
+        'success' => 'Licencia bol úspešne pridaná.'
     ),
 
     'deletefile' => array(
@@ -41,14 +41,17 @@ return array(
     ),
 
     'checkout' => array(
-        'error'   => 'Pri priraďovaní licencie nastala chyba. Skúste prosím znovu.',
-        'success' => 'Licencia bola úspešne priradená',
-        'not_enough_seats' => 'Not enough license seats available for checkout',
+        'error'   => 'Pri odovzdaní licencie nastala chyba. Skúste prosím znovu.',
+        'success' => 'Licencia bola úspešne odovzdaná',
+        'not_enough_seats' => 'Nedostatok licenčných miest pre odovzdanie',
+        'mismatch' => 'Poskytnutý licenčný slot sa nezhoduje s licenciou',
+        'unavailable' => 'Tento slot nie je dostupné pre odovzdanie.',
     ),
 
     'checkin' => array(
-        'error'   => 'Pri odoberaní licencie nastala chyba. Skúste prosím znovu.',
-        'success' => 'Licencia bola úspešne odobratá'
+        'error'   => 'Pri prevzatí licencie nastala chyba. Skúste prosím znovu.',
+        'not_reassignable' => 'Licencia nie je preraditeľná',
+        'success' => 'Licencia bola úspešne prevzatá'
     ),
 
 );
diff --git a/resources/lang/sk-SK/admin/licenses/table.php b/resources/lang/sk-SK/admin/licenses/table.php
index d7ac834ee6..9e5e35b2e0 100644
--- a/resources/lang/sk-SK/admin/licenses/table.php
+++ b/resources/lang/sk-SK/admin/licenses/table.php
@@ -2,17 +2,17 @@
 
 return array(
 
-    'assigned_to'   	=> 'Assigned To',
+    'assigned_to'   	=> 'Priradené',
     'checkout'   		=> 'Vsetup/Výstup',
-    'deleted_at'        => 'Deleted at',
+    'deleted_at'        => 'Zmazané',
     'id'      			=> 'ID',
-    'license_email'   	=> 'License Email',
-    'license_name'   	=> 'Licensed To',
+    'license_email'   	=> 'Licenčný mail',
+    'license_name'   	=> 'Registrované na',
     'purchase_date'   	=> 'Dátum nákupu',
     'purchased'   		=> 'Zakúpené',
-    'seats'   			=> 'Seats',
-    'hardware'   		=> 'Hardware',
+    'seats'   			=> 'Počet',
+    'hardware'   		=> 'Hardvér',
     'serial'   			=> 'Sériové číslo',
-    'title'      		=> 'License',
+    'title'      		=> 'Licencia',
 
 );
diff --git a/resources/lang/sk-SK/admin/locations/message.php b/resources/lang/sk-SK/admin/locations/message.php
index 6814c63be0..8406050876 100644
--- a/resources/lang/sk-SK/admin/locations/message.php
+++ b/resources/lang/sk-SK/admin/locations/message.php
@@ -3,11 +3,12 @@
 return array(
 
     'does_not_exist' => 'Lokalita neexistuje.',
-    'assoc_users'    => 'This location is not currently deletable because it is the location of record for at least one asset or user, has assets assigned to it, or is the parent location of another location. Please update your models to no longer reference this company and try again. ',
+    'assoc_users'    => 'Túto lokalitu nie je možné odstrániť nakoľko je využívaná pri minimálne jednom majetku alebo užívateľovi, má priradené majetky alebo je nadradenou lokalitou inej lokality. Prosím upravte ostatné záznamy, aby nevyužívali túto lokalitu a skúste znovu ',
     'assoc_assets'	 => 'Táto lokalita je priradená minimálne jednému majetku, preto nemôže byť odstránená. Prosím odstráňte referenciu na túto lokalitu z príslušného majetku a skúste znovu. ',
     'assoc_child_loc'	 => 'Táto lokalita je nadradenou minimálne jednej podradenej lokalite, preto nemôže byť odstránená. Prosím odstráňte referenciu s príslušnej lokality a skúste znovu. ',
-    'assigned_assets' => 'Assigned Assets',
-    'current_location' => 'Current Location',
+    'assigned_assets' => 'Priradené položky majetku',
+    'current_location' => 'Aktuálna lokalita',
+    'open_map' => 'Otvoriť v :map_provider_icon mapách',
 
 
     'create' => array(
@@ -20,6 +21,11 @@ return array(
         'success' => 'Lokalita bola úspešne upravená.'
     ),
 
+    'restore' => array(
+        'error'   => 'Lokalita nebola obnovená, prosím skúste znovu',
+        'success' => 'Lokalita bola úspešne obnovená.'
+    ),
+
     'delete' => array(
         'confirm'   	=> 'Ste si istý, že chcete odstrániť túto lokalitu?',
         'error'   => 'Pri odstraňovaní lokality nastala chyba. Skúste prosím znovu.',
diff --git a/resources/lang/sk-SK/admin/locations/table.php b/resources/lang/sk-SK/admin/locations/table.php
index a1c0db3b7d..119fd28dfd 100644
--- a/resources/lang/sk-SK/admin/locations/table.php
+++ b/resources/lang/sk-SK/admin/locations/table.php
@@ -2,8 +2,8 @@
 
 return [
     'about_locations_title'     => 'O lokalitách',
-    'about_locations'           => 'Lokality sa využívajú na sledovanie umiestnenia používateľov, majetku a ostatných položiek',
-    'assets_rtd'                => 'Majetok', // This has NEVER meant Assets Retired. I don't know how it keeps getting reverted.
+    'about_locations'           => 'Lokality sa využívajú na sledovanie umiestnenia používateľov, položiek majetku a ostatných položiek',
+    'assets_rtd'                => 'Položky majetku', // This has NEVER meant Assets Retired. I don't know how it keeps getting reverted.
     'assets_checkedout'         => 'Priradený majetok',
     'id'                        => 'ID',
     'city'                      => 'Mesto',
@@ -15,7 +15,7 @@ return [
     'print_all_assigned'        => 'Vytlačiť všetky priradené',
     'name'                      => 'Názov lokality',
     'address'                   => 'Adresa',
-    'address2'                   => 'Address Line 2',
+    'address2'                   => 'Adresa 2. riadok',
     'zip'                       => 'PSČ',
     'locations'                 => 'Lokality',
     'parent'                    => 'Nadradené',
@@ -24,7 +24,7 @@ return [
     'user_name'                 => 'Meno používateľa',
     'department'                => 'Oddelenie',
     'location'                  => 'Lokalita',
-    'asset_tag'                 => 'Označenie majetku',
+    'asset_tag'                 => 'Označenia majetku',
     'asset_name'                => 'Názov',
     'asset_category'            => 'Kategória',
     'asset_manufacturer'        => 'Výrobca',
@@ -32,11 +32,12 @@ return [
     'asset_serial'              => 'Sériové číslo',
     'asset_location'            => 'Lokalita',
     'asset_checked_out'         => 'Odovzdané',
-    'asset_expected_checkin'    => 'Očakávaný dátum prijatia',
+    'asset_expected_checkin'    => 'Očakávaný dátum prevzatia',
     'date'                      => 'Dátum:',
-    'phone'                     => 'Location Phone',
+    'phone'                     => 'Telefónne čislo lokality',
     'signed_by_asset_auditor'   => 'Podpísané (Audítor majetku):',
     'signed_by_finance_auditor' => 'Podpísané (Finančný auditor):',
     'signed_by_location_manager' => 'Podpísané (Manažér lokality):',
     'signed_by'                 => 'Odpísal:',
+    'clone'  					=> 'Clone Location',
 ];
diff --git a/resources/lang/sk-SK/admin/manufacturers/message.php b/resources/lang/sk-SK/admin/manufacturers/message.php
index 61416e0230..b32b103662 100644
--- a/resources/lang/sk-SK/admin/manufacturers/message.php
+++ b/resources/lang/sk-SK/admin/manufacturers/message.php
@@ -2,29 +2,29 @@
 
 return array(
 
-    'support_url_help' => 'Variables <code>{LOCALE}</code>, <code>{SERIAL}</code>, <code>{MODEL_NUMBER}</code>, and <code>{MODEL_NAME}</code> may be used in your URL to have those values auto-populate when viewing assets - for example https://checkcoverage.apple.com/{LOCALE}/{SERIAL}.',
-    'does_not_exist' => 'Manufacturer does not exist.',
-    'assoc_users'	 => 'This manufacturer is currently associated with at least one model and cannot be deleted. Please update your models to no longer reference this manufacturer and try again. ',
+    'support_url_help' => 'Premenné <code>{LOCALE}</code>, <code>{SERIAL}</code>, <code>{MODEL_NUMBER}</code>, and <code>{MODEL_NAME}</code> môžu byť použité v URL pre automatické vyplnenie týchto hodnôt pri prehliadaní aktív - napríklad https://checkcoverage.apple.com/{LOCALE}/{SERIAL}.',
+    'does_not_exist' => 'Výrobca neexistuje.',
+    'assoc_users'	 => 'Tento výrobca je uvedený minimálne pri jednom modely a preto nemôže byť zmazaný. Prosím upravte vaše modely, aby už nevyužívali referenciu na tohto výrobcu a skúste znovu. ',
 
     'create' => array(
-        'error'   => 'Manufacturer was not created, please try again.',
-        'success' => 'Manufacturer created successfully.'
+        'error'   => 'Výrobca nebol pridaný, skúste znovu.',
+        'success' => 'Výrobca bol úspešne pridaný.'
     ),
 
     'update' => array(
-        'error'   => 'Manufacturer was not updated, please try again',
-        'success' => 'Manufacturer updated successfully.'
+        'error'   => 'Výrobca nebol aktualizovaný, skúste znovu',
+        'success' => 'Výrobca bol úspešne aktualizovaný.'
     ),
 
     'restore' => array(
-        'error'   => 'Manufacturer was not restored, please try again',
-        'success' => 'Manufacturer restored successfully.'
+        'error'   => 'Výrobca nebol obnovený, skúste znovu',
+        'success' => 'Výrobca bol úspešne obnovený.'
     ),
 
     'delete' => array(
-        'confirm'   => 'Are you sure you wish to delete this manufacturer?',
-        'error'   => 'There was an issue deleting the manufacturer. Please try again.',
-        'success' => 'The Manufacturer was deleted successfully.'
+        'confirm'   => 'Ste si istí, že chete zmazať tohto výrobcu?',
+        'error'   => 'Pri mazaní výrobcu nastala chyba. Skúste znovu.',
+        'success' => 'Výrobca bol úspešne zmazaný.'
     )
 
 );
diff --git a/resources/lang/sk-SK/admin/manufacturers/table.php b/resources/lang/sk-SK/admin/manufacturers/table.php
index 16360fffdb..cd74a530dc 100644
--- a/resources/lang/sk-SK/admin/manufacturers/table.php
+++ b/resources/lang/sk-SK/admin/manufacturers/table.php
@@ -10,7 +10,7 @@ return array(
     'support_email'   		=> 'Emailová podpora',
     'support_phone'   		=> 'Telefónna podpora',
     'support_url'   		=> 'URL podpory',
-    'warranty_lookup_url'   => 'Warranty Lookup URL',
+    'warranty_lookup_url'   => 'URL pre overenie záruky',
     'update'				=> 'Upraviť výrobcu',
 
 );
diff --git a/resources/lang/sk-SK/admin/models/general.php b/resources/lang/sk-SK/admin/models/general.php
index 7e4a77adbc..6200f698a7 100644
--- a/resources/lang/sk-SK/admin/models/general.php
+++ b/resources/lang/sk-SK/admin/models/general.php
@@ -1,18 +1,18 @@
 <?php
 
 return array(
-    'about_models_title'     => 'About Asset Models',
-    'about_models_text'           => 'Asset Models are a way to group identical assets. "MBP 2013", "IPhone 6s", etc.',
-    'deleted'  					        => 'This model has been deleted.',
-    'bulk_delete'               => 'Bulk Delete Asset Models',
-    'bulk_delete_help'               => 'Use the checkboxes below to confirm the deletion of the selected asset models. Asset models that have assets associated with them cannot be deleted until the assets are associated with a different model.',
-    'bulk_delete_warn'          => 'You are about to delete one asset model.|You are about to delete :model_count asset models.',
-    'restore'                   => 'Restore Model',
-    'requestable'               => 'Users may request this model',
-	'show_mac_address'			      => 'Show MAC address field in assets in this model',
-    'view_deleted'              => 'View Deleted',
-    'view_models'               => 'View Models',
-    'fieldset'                  => 'Fieldset',
-    'no_custom_field'           => 'No custom fields',
-    'add_default_values'        => 'Add default values',
+    'about_models_title'     => 'O modeloch majetku',
+    'about_models_text'           => 'Modely majetku umožňujú vytvoriť skupiny identických majetkov. "MBP 2013", "iPhone 6s", etc.',
+    'deleted'  					=> 'Tento model bol zmazaná.',
+    'bulk_delete'               => 'Hromadne zmazať modely majetku',
+    'bulk_delete_help'               => 'Pomocou zaškrtávacích polí potvrďte zmazanie označených modelov majetku. Modely majetku, ku ktorým je priradený majetok, nemôžu byť zmazané pokým im priradený majetok nebude priradený k inému modelu.',
+    'bulk_delete_warn'          => 'Chystáte sa zmazať jeden model majetku.|Chystáte sa zmazať :mode_count modelov majetku.',
+    'restore'                   => 'Obnoviť model',
+    'requestable'               => 'Používatelia môžu dopytovať tento model',
+	'show_mac_address'			      => 'Zobraziť pole s MAC adresou v majetkoch tohto modelu',
+    'view_deleted'              => 'Zobraziť zmazané',
+    'view_models'               => 'Zobraziť modely',
+    'fieldset'                  => 'Skupina polí',
+    'no_custom_field'           => 'Žiadne vlastné polia',
+    'add_default_values'        => 'Pridať predvolené hodnoty',
 );
diff --git a/resources/lang/sk-SK/admin/models/message.php b/resources/lang/sk-SK/admin/models/message.php
index 0bbb27bc82..2dfad97cda 100644
--- a/resources/lang/sk-SK/admin/models/message.php
+++ b/resources/lang/sk-SK/admin/models/message.php
@@ -2,12 +2,12 @@
 
 return array(
 
-    'deleted' => 'Deleted asset model',
+    'deleted' => 'Odstránený model majetku',
     'does_not_exist' => 'Model neexistuje.',
-    'no_association' => 'WARNING! The asset model for this item is invalid or missing!',
-    'no_association_fix' => 'This will break things in weird and horrible ways. Edit this asset now to assign it a model.',
-    'assoc_users'	 => 'Tento model je použítý v jednom alebo viacerých majetkoch, preto nemôže byť odstránený. Prosím odstráňte príslušný majetok a skúste odstrániť znovu. ',
-
+    'no_association' => 'VAROVANIE! Model majetku pre túto položku je neplatný alebo neexistuje!',
+    'no_association_fix' => 'Tento stav môže spôsobiť nepredvídateľné problémy. Priraďte danému majetku správny model.',
+    'assoc_users'	 => 'Tento model je použitý v jednom alebo viacerých majetkoch, preto nemôže byť odstránený. Prosím odstráňte príslušný majetok a skúste odstrániť znovu. ',
+    'invalid_category_type' => 'Táto kategória musí byť kategóriou majetku.',
 
     'create' => array(
         'error'   => 'Model nebol vytovrený, prosím skúste znovu.',
@@ -33,14 +33,14 @@ return array(
 
     'bulkedit' => array(
         'error'   		=> 'Neboli zmenené žiadne polia, preto nebolo nič aktualizované.',
-        'success' 		=> 'Model successfully updated. |:model_count models successfully updated.',
-        'warn'          => 'You are about to update the properties of the following model:|You are about to edit the properties of the following :model_count models:',
+        'success' 		=> 'Model bol úspešne upravený. |:model_count modelov bolo úspešne upravených.',
+        'warn'          => 'Chystáte sa upraviť nastavenia nasledovného modelu:|Chystáte sa upraviť nastavenia nasledovných :model_count modelov:',
 
     ),
 
     'bulkdelete' => array(
         'error'   		    => 'Neboli vybrané ziadne modely, preto nebolo nič odmazané.',
-        'success' 		    => 'Model deleted!|:success_count models deleted!',
+        'success' 		    => 'Model zmazaný!|:success_count_models modelov zmazaných!',
         'success_partial' 	=> ':success_count model(y) odstránené, avšak :fail_count nebolo možné odstrániť pretože stále majú priradené majetky.'
     ),
 
diff --git a/resources/lang/sk-SK/admin/models/table.php b/resources/lang/sk-SK/admin/models/table.php
index ec6a5b6076..718b57b0eb 100644
--- a/resources/lang/sk-SK/admin/models/table.php
+++ b/resources/lang/sk-SK/admin/models/table.php
@@ -7,7 +7,7 @@ return array(
     'eol'	 				=> 'EOL',
     'modelnumber'   		=> 'Číslo modelu',
     'name'      			=> 'Názov modelu majetku',
-    'numassets' 			=> 'Majetok',
+    'numassets' 			=> 'Položky majetku',
     'title'					=> 'Typy majetku',
     'update'				=> 'Upraviť typ majetku',
     'view'					=> 'Zobraziť typ majetku',
diff --git a/resources/lang/sk-SK/admin/reports/general.php b/resources/lang/sk-SK/admin/reports/general.php
index 9b682f8ecd..dbee7513e7 100644
--- a/resources/lang/sk-SK/admin/reports/general.php
+++ b/resources/lang/sk-SK/admin/reports/general.php
@@ -1,17 +1,23 @@
 <?php
 
 return [
-    'info'   => 'Select the options you want for your asset report.',
-    'deleted_user' => 'Deleted user',
-    'send_reminder' => 'Send reminder',
-    'reminder_sent' => 'Reminder sent',
-    'acceptance_deleted' => 'Acceptance request deleted',
-    'acceptance_request' => 'Acceptance request',
+    'info'   => 'Vyberte možnosti pre váš report majetku.',
+    'deleted_user' => 'Zmazaní používatelia',
+    'send_reminder' => 'Poslať pripomienku',
+    'cannot_send_reminder' => 'User has been deleted or does not have an email address so cannot receive a reminder',
+    'reminder_sent' => 'Pripomienka zaslaná',
+    'acceptance_deleted' => 'Požiadavka na akceptáciu odstránená',
+    'acceptance_request' => 'Požiadavka na akceptáciu',
     'custom_export' => [
-        'user_address' => 'User Address',
-        'user_city' => 'User City',
-        'user_state' => 'User State',
-        'user_country' => 'User Country',
-        'user_zip' => 'User Zip'
-    ]
-];
\ No newline at end of file
+        'user_address' => 'Adresa používateľa',
+        'user_city' => 'Mesto používateľa',
+        'user_state' => 'Štát používateľa',
+        'user_country' => 'Krajina používateľa',
+        'user_zip' => 'PSČ používateľa'
+    ],
+    'open_saved_template' => 'Otvoriť uloženú šablónu',
+    'save_template' =>  'Uložiť šablónu',
+    'select_a_template' => 'Vybrať šablónu',
+    'template_name' => 'Názov šablóny',
+    'update_template' => 'Upraviť šablónu',
+];
diff --git a/resources/lang/sk-SK/admin/reports/message.php b/resources/lang/sk-SK/admin/reports/message.php
index d4c8f8198f..dcf39f1548 100644
--- a/resources/lang/sk-SK/admin/reports/message.php
+++ b/resources/lang/sk-SK/admin/reports/message.php
@@ -1,5 +1,16 @@
 <?php
 
-return array(
-    'error'   => 'You must select at least ONE option.'
-);
+return [
+    'about_templates' => 'O uložených šablónach',
+    'saving_templates_description' => 'Vyberte vaše voľby, potom zadefinujte názov šablóny do políčka hore a kliknite na tlačidlo Uložiť šablónu\'. Použite políčko na výber pre opätovné použitie uloženej šablóny.',
+    'create'  => [
+        'success' => 'Šablóna bola úspešne uložená',
+    ],
+    'update' => [
+        'success' => 'Šablóna bola úspešne upravená',
+    ],
+    'delete' => [
+        'success' => 'Šablóna bola úspešne zmazaná',
+        'no_delete_permission' => 'Šablóna neexistuje alebo nemáte oprávnenie na jej zmazanie.',
+    ],
+];
diff --git a/resources/lang/sk-SK/admin/settings/general.php b/resources/lang/sk-SK/admin/settings/general.php
index 3d92a81ff8..dfb059017a 100644
--- a/resources/lang/sk-SK/admin/settings/general.php
+++ b/resources/lang/sk-SK/admin/settings/general.php
@@ -8,38 +8,41 @@ return [
     'ad_append_domain'          => 'Pridať názov domény k používateľskému menu',
     'ad_append_domain_help'     => 'Od používateľa nie je vyžadované používaľ tvar "username@domain.local", stačí keď použije "username".',
     'admin_cc_email'            => 'Kópia e-mailu',
-    'admin_cc_email_help'       => 'Ak chcete poslať kópiu potvrdzujúceho emailu o prevzatí / odovzdaní, ktorý sa posiela používateľom, aj na ďalšiu e-mailovú adresu, tu ju zadajte. V opačnom prípade nechajte políčko prázdne.',
-    'admin_settings'            => 'Admin Settings',
+    'admin_cc_email_help'       => 'Send a copy of checkin/checkout emails to this address.',
+    'admin_settings'            => 'Admin nastavenia',
     'is_ad'				        => 'Toto je server typu Active Directory',
     'alerts'                	=> 'Upozornenia',
-    'alert_title'               => 'Update Notification Settings',
+    'alert_title'               => 'Upraviť nastavenia notifikácií',
     'alert_email'				=> 'Poslať varovania na adresu',
-    'alert_email_help'    => 'Email addresses or distribution lists you want alerts to be sent to, comma separated',
+    'alert_email_help'          => 'Mailové adresy alebo distribučné zoznamy, na ktorý majú byť zasielané upozornenia, oddelené čiarkou.',
     'alerts_enabled'			=> 'Povoliť varovania mailom',
     'alert_interval'			=> 'Interval pre varovania o exspirácií (v dňoch)',
     'alert_inv_threshold'		=> 'Interval pre varovania o skladových zásobách',
     'allow_user_skin'           => 'Povoliť používateľské tému',
-    'allow_user_skin_help_text' => 'Zaškrtnutím tohto políčka sa povolíí používateľovi nahradiť UI tému vlastnou.',
+    'allow_user_skin_help_text' => 'Zaškrtnutím tohto políčka sa povolí používateľovi nahradiť UI tému vlastnou.',
     'asset_ids'					=> 'ID-čka majetku',
     'audit_interval'            => 'Interval pre auditovanie',
-    'audit_interval_help'       => 'If you are required to regularly physically audit your assets, enter the interval in months that you use. If you update this value, all of the "next audit dates" for assets with an upcoming audit date will be updated.',
+    'audit_interval_help'       => 'Ak je požadovaný pravidelný fyzický audit majetku, zadajte interval v mesiacoch, ktorý používate. Ak túto hodnotu aktualizujete, aktualizujú sa všetky „dátumy ďalšieho auditu“ pre majetok s blížiacim sa dátumom auditu.',
     'audit_warning_days'        => 'Prah výstrahy auditu',
     'audit_warning_days_help'   => 'Koľko dní dopredu by sme vás mali upozorňovať, keď je majetok čakajúci na audit?',
-    'auto_increment_assets'		=> 'Generate auto-incrementing asset tags',
+    'auto_increment_assets'		=> 'Generovať automatické inkrementálne označenie majetku',
     'auto_increment_prefix'		=> 'Predpona (volitelna)',
-    'auto_incrementing_help'    => 'Enable auto-incrementing asset tags first to set this',
+    'auto_incrementing_help'    => 'Pre nastavenie musíte najprv povoliť automaticky generované označenie majetku',
     'backups'					=> 'Zálohy',
-    'backups_help'              => 'Create, download, and restore backups ',
+    'backups_help'              => 'Vytvoriť, stiahnuť a obnoviť zálohy ',
     'backups_restoring'         => 'Obnovenie zo zálohy',
-    'backups_upload'            => 'Upload Backup',
-    'backups_path'              => 'Backups on the server are stored in <code>:path</code>',
-    'backups_restore_warning'   => 'Use the restore button <small><span class="btn btn-xs btn-warning"><i class="text-white fas fa-retweet" aria-hidden="true"></i></span></small> to restore from a previous backup. (This does not currently work with S3 file storage or Docker.)<br><br>Your <strong>entire :app_name database and any uploaded files will be completely replaced</strong> by what\'s in the backup file.  ',
-    'backups_logged_out'         => 'All existing users, including you, will be logged out once your restore is complete.',
-    'backups_large'             => 'Very large backups may time out on the restore attempt and may still need to be run via command line. ',
+    'backups_clean' => 'Vyčistiť zálohovanú databázu pred obnovou',
+    'backups_clean_helptext' => "Toto môže byť užitočne ak prepínate medzi dvoma databázovými verziami",
+    'backups_upload'            => 'Nahrať zálohu',
+    'backups_path'              => 'Zálohy na servery sú uložené v <code>:path</code>',
+    'backups_restore_warning'   => 'Use the restore button <small><span class="btn btn-xs btn-warning"><i class="text-white fas fa-retweet" aria-hidden="true"></i></span></small> to restore from a previous backup. (This does not currently work with S3 file storage or Docker.)<br><br>Your <strong>entire :app_name database and any uploaded files will be completely replaced</strong> by what\'s in the backup file  ',
+    'backups_logged_out'         => 'Všetci existujúci používatelia vrátane Vás budú odhlásení, keď sa ukončí obnova.',
+    'backups_large'             => 'Veľmi veľké zálohy môžu naraziť na časový limit počas pokusu o obnovu a možno budú musieť byť spustené cez príkazový riadok. ',
     'barcode_settings'			=> 'Nastavnia čiarového kódu',
     'confirm_purge'			    => 'Potvrdiť čistenie',
     'confirm_purge_help'		=> 'Zadajte text "DELETE" do políčka nižšie k vyčisteniu odmazaných záznamov. Táto akcia je nenávratná, natrvalo odstrání všetky položky a užívateľov označených na odstránenie. (Mali by ste si pre istotu najprv spraviť zálohu.)',
     'custom_css'				=> 'Vlasné CSS',
+    'custom_css_placeholder'	=> 'Add your custom CSS',
     'custom_css_help'			=> 'Vložte akékoľvek vlastné CSS, ktoré chcete použiť. Nevkladajte &lt;style&gt;&lt;/style&gt; tagy.',
     'custom_forgot_pass_url'	=> 'Vlastná URL pre reset hesla',
     'custom_forgot_pass_url_help'	=> 'Kompletne nahradzuje vstavanú funkcionalitu zabudnutého hesla na prihlasovacej obrazovke. Slúži k nasmerovaniu používateľov na internú alebo hostovanú funkciu obnovenia hesla DLAP. Zablokuje prístup k funkcii zmeny hesla lokálneho používateľa.',
@@ -47,94 +50,97 @@ return [
     'dashboard_message_help'	=> 'Tento text sa zobrazí na nástenke všetkým používateľom s právom na zobrazenie nástenky.',
     'default_currency'  		=> 'Predvolená mena',
     'default_eula_text'			=> 'Predvolená EULA',
+    'default_eula_text_placeholder' => 'Add your default EULA text',
     'default_language'			=> 'Predvolený jazyk',
     'default_eula_help_text'	=> 'Môžete tiež spojiť vlasnú EULA so špecifickými kategóriami majetku.',
-    'acceptance_note'           => 'Add a note for your decision (Optional)',
+    'acceptance_note'           => 'Pridajte poznámku pre Vaše rozhodnutie (voliteľné)',
     'display_asset_name'        => 'Zobraziť názov majetku',
     'display_checkout_date'     => 'Zobraziť dátum odovzdania',
     'display_eol'               => 'Zobraziť EOL v tabuľkovom zobrazení',
-    'display_qr'                => 'Zobraziť štvorcové kódy',
+    'display_qr'                => 'Zobraziť 2D čiarový kód',
     'display_alt_barcode'		=> 'Zobraziť 1D čiarový kód',
-    'email_logo'                => 'E-mail logo',
     'barcode_type'				=> 'Typ 2D čiarového kódu',
     'alt_barcode_type'			=> 'Typ 1D čiarového kódu',
-    'email_logo_size'       => 'Štvorcové logá vypadajú v mailoch najlepšie. ',
-    'enabled'                   => 'Enabled',
+    'enabled'                   => 'Povolené',
     'eula_settings'				=> 'EULA nastavenia',
     'eula_markdown'				=> 'Táto EULA umožňuje <a href="https://help.github.com/articles/github-flavored-markdown/">Github markdown</a>.',
+    'empty_row_count'           => 'Field Start Offset (Empty Rows)',
+    'empty_row_count_help'      => 'Fields will begin populating after this many empty rows are skipped at the top of the label.',
     'favicon'                   => 'Favicon',
-    'favicon_format'            => 'Accepted filetypes are ico, png, and gif. Other image formats may not work in all browsers.',
-    'favicon_size'          => 'Favicons should be square images, 16x16 pixels.',
-    'footer_text'               => 'Additional Footer Text ',
-    'footer_text_help'          => 'This text will appear in the right-side footer. Links are allowed using <a href="https://help.github.com/articles/github-flavored-markdown/">Github flavored markdown</a>. Line breaks, headers, images, etc may result in unpredictable results.',
+    'favicon_format'            => 'Akceptované typy súborov sú ico, png a gif. Ostatné typy obrázkov nemusia správne fungovať vo všetkých prehliadačoch.',
+    'favicon_size'          => 'Favikony by mali byť štvorcové obrázky s rozmermi 16 x 16 pixelov.',
+    'footer_text'               => 'Dodatočný text do pätičky ',
+    'footer_text_help'          => 'Tento text sa zobrazí v pravej strane pätičky. Odkazy sú povolené pomocou <a href="https://help.github.com/articles/github-flavored-markdown/">Githubom podporovanou markdown syntaxou</a>. Zalamovanie riadkov, hlavičky, obrázky atď.môžu mať za následok nepredvídateľné výsledky.',
+    'footer_text_placeholder'   => 'Optional footer text',
     'general_settings'			=> 'Všeobecné nastavenia',
-    'general_settings_keywords' => 'company support, signature, acceptance, email format, username format, images, per page, thumbnail, eula, gravatar, tos, dashboard, privacy',
-    'general_settings_help'     => 'Default EULA and more',
-    'generate_backup'			=> 'Generate Backup',
+    'general_settings_help'     => 'Predvolená EULA a ďalšie',
+    'generate_backup'			=> 'Vytvoriť zálohu',
     'google_workspaces'         => 'Google Workspaces',
-    'header_color'              => 'Header Color',
+    'header_color'              => 'Farba hlavičky',
     'info'                      => 'Tieto nastavenia umožňujú upraviť vybrané aspekty Vašej inštalácie.',
-    'label_logo'                => 'Label Logo',
-    'label_logo_size'           => 'Square logos look best - will be displayed in the top right of each asset label. ',
-    'laravel'                   => 'Laravel Version',
+    'label_logo_size'           => 'Štvorcové logá vypadajú najlepšie - budú zobrazené hore vpravo v každom štítku majetku.',
+    'laravel'                   => 'Verzia Laravelu',
     'ldap'                      => 'LDAP',
-    'ldap_default_group'        => 'Default Permissions Group',
-    'ldap_default_group_info'   => 'Select a group to assign to newly synced users. Remember that a user takes on the permissions of the group they are assigned.',
-    'no_default_group'          => 'No Default Group',
+    'ldap_default_group'        => 'Predvolená skupina oprávnení',
+    'ldap_default_group_info'   => 'Vyberte skupinu, ktorú chcete priradiť novým používateľom. Nezabudnite, že používateľ preberá oprávnenia skupiny, ktorá je mu priradená.',
+    'no_default_group'          => 'Žiadna predvolená skupina',
     'ldap_help'                 => 'LDAP/Active Directory',
     'ldap_client_tls_key'       => 'Kľúč TLS na strane klienta LDAP',
-    'ldap_client_tls_cert'      => 'LDAP Client-Side TLS Certificate',
-    'ldap_enabled'              => 'LDAP enabled',
-    'ldap_integration'          => 'LDAP Integration',
-    'ldap_settings'             => 'LDAP Settings',
+    'ldap_client_tls_cert'      => 'LDAP klientský TLS certifikát',
+    'ldap_enabled'              => 'LDAP povolený',
+    'ldap_integration'          => 'LDAP integrácia',
+    'ldap_settings'             => 'LDAP nastavenia',
     'ldap_client_tls_cert_help' => 'Certifikát a kľúč TLS na strane klienta pre pripojenia LDAP sú zvyčajne užitočné iba v konfiguráciách služby Google Workspace so zabezpečeným protokolom LDAP. Obe sú povinné.',
-    'ldap_location'             => 'LDAP Location',
-'ldap_location_help'             => 'The Ldap Location field should be used if <strong>an OU is not being used in the Base Bind DN.</strong> Leave this blank if an OU search is being used.',
-    'ldap_login_test_help'      => 'Enter a valid LDAP username and password from the base DN you specified above to test whether your LDAP login is configured correctly. YOU MUST SAVE YOUR UPDATED LDAP SETTINGS FIRST.',
-    'ldap_login_sync_help'      => 'This only tests that LDAP can sync correctly. If your LDAP Authentication query is not correct, users may still not be able to login. YOU MUST SAVE YOUR UPDATED LDAP SETTINGS FIRST.',
-    'ldap_manager'              => 'LDAP Manager',
-    'ldap_server'               => 'LDAP Server',
-    'ldap_server_help'          => 'This should start with ldap:// (for unencrypted or TLS) or ldaps:// (for SSL)',
-    'ldap_server_cert'			=> 'LDAP SSL certificate validation',
-    'ldap_server_cert_ignore'	=> 'Allow invalid SSL Certificate',
-    'ldap_server_cert_help'		=> 'Select this checkbox if you are using a self signed SSL cert and would like to accept an invalid SSL certificate.',
-    'ldap_tls'                  => 'Use TLS',
-    'ldap_tls_help'             => 'This should be checked only if you are running STARTTLS on your LDAP server. ',
-    'ldap_uname'                => 'LDAP Bind Username',
-    'ldap_dept'                 => 'LDAP Department',
-    'ldap_phone'                => 'LDAP Telephone Number',
-    'ldap_jobtitle'             => 'LDAP Job Title',
-    'ldap_country'              => 'LDAP Country',
-    'ldap_pword'                => 'LDAP Bind Password',
-    'ldap_basedn'               => 'Base Bind DN',
-    'ldap_filter'               => 'LDAP Filter',
-    'ldap_pw_sync'              => 'LDAP Password Sync',
-    'ldap_pw_sync_help'         => 'Uncheck this box if you do not wish to keep LDAP passwords synced with local passwords. Disabling this means that your users may not be able to login if your LDAP server is unreachable for some reason.',
-    'ldap_username_field'       => 'Username Field',
+    'ldap_location'             => 'LDAP lokalita',
+'ldap_location_help'             => 'Pole Ldap lokalita by sa malo použiť, ak <strong>sa OU nepoužíva v základne väzbe DN.</strong> Nechajte toto prázdne, ak sa používa OU vyhľadávanie.',
+    'ldap_login_test_help'      => 'Zadajte platné LDAP používateľské meno a heslo zo základného DN, ktoré ste špecifikovali vyššie a vyskúšajte, či je LDAP prihlásenie správne nakonfigurované. NAJPRV JE POTREBNÉ ULOŽIŤ ZEMENY V LDAP NASTAVENIACH.',
+    'ldap_login_sync_help'      => 'Táto akcia iba testuje, či funguje LDAP synchronizácia. Ak overovací LDAP dotaz nie je správny, používatelia môžu mať naďalej problém s prihlásením. MUSÍTE NAJPRV ULOŽIŤ ZMENU V LDAP NASTAVENIACH.',
+    'ldap_manager'              => 'LDAP manažér',
+    'ldap_server'               => 'LDAP server',
+    'ldap_server_help'          => 'Musí začínať s ldap:// (pre nešifrované spojenie) alebo ldaps:// (pre TLS alebo SSL)',
+    'ldap_server_cert'			=> 'Validácia LDAP SSL certifikátu',
+    'ldap_server_cert_ignore'	=> 'Povoliť neplatný SSL certifikát',
+    'ldap_server_cert_help'		=> 'Zaškrtnite toto políčko, ak používate SSL certifikát s vlastným podpisom a chcete akceptovať neplatný certifikát SSL.',
+    'ldap_tls'                  => 'Použiť TLS',
+    'ldap_tls_help'             => 'Zaškrtnite toto políčko iba ak používate STARTTLS na Vašom LDAP servery. ',
+    'ldap_uname'                => 'LDAP používateľské meno spojenia',
+    'ldap_dept'                 => 'LDAP oddelenie',
+    'ldap_phone'                => 'LDAP telefónne číslo',
+    'ldap_jobtitle'             => 'LDAP názov pozície',
+    'ldap_country'              => 'LDAP krajina',
+    'ldap_pword'                => 'LDAP heslo spojenia',
+    'ldap_basedn'               => 'Základné Bind DN',
+    'ldap_filter'               => 'LDAP filter',
+    'ldap_pw_sync'              => 'Cache LDAP Passwords',
+    'ldap_pw_sync_help'         => 'Uncheck this box if you do not wish to keep LDAP passwords cached as local hashed passwords. Disabling this means that your users may not be able to login if your LDAP server is unreachable for some reason.',
+    'ldap_username_field'       => 'Pole s používateľským menom',
     'ldap_lname_field'          => 'Priezvisko',
-    'ldap_fname_field'          => 'LDAP First Name',
-    'ldap_auth_filter_query'    => 'LDAP Authentication query',
-    'ldap_version'              => 'LDAP Version',
+    'ldap_fname_field'          => 'LDAP meno',
+    'ldap_auth_filter_query'    => 'LDAP overovací dotaz',
+    'ldap_version'              => 'LDAP verzia',
     'ldap_active_flag'          => 'LDAP Active Flag',
-    'ldap_activated_flag_help'  => 'This value is used to determine whether a synced user can login to Snipe-IT. <strong>It does not affect the ability to check items in or out to them</strong>, and should be the <strong>attribute name</strong> within your AD/LDAP, <strong>not the value</strong>. <br><br>If this field is set to a field name that does not exist in your AD/LDAP, or the value in the AD/LDAP field is set to <code>0</code> or <code>false</code>, <strong>user login will be disabled</strong>. If the value in the AD/LDAP field is set to <code>1</code> or <code>true</code> or <em>any other text</em> means the user can log in. When the field is blank in your AD, we respect the <code>userAccountControl</code> attribute, which usually allows non-suspended users to log in.',
-    'ldap_emp_num'              => 'LDAP Employee Number',
-    'ldap_email'                => 'LDAP Email',
+    'ldap_activated_flag_help'  => 'Tato hodnota se používa k určeniu, či se synchronizovaný používateľ môze prihlásiť do Snipe-IT. <strong>To neovplyvňuje schopnosť prevziať alebo odovzdať položky</strong> a mal by to byť <strong>názov atribútu</strong> v rámci vášho AD/LDAP, <strong>nie hodnota</strong>. <br><br>Ak je v tomto poli zadaný názov poľa, ktoré neexistuje vo vašom AD/LDAP alebo je hodnota v poli AD/LDAP nastavená na <code>0</code> alebo <code>nepravda</code>, prihlasovanie používateľa <strong>bude zakázané</strong>. Ak je hodnota v poli AD/LDAP nastavená na <code>1</code> alebo <code>pravda</code> alebo <em>akýkoľvek iný text</em>, používateľ sa môže prihlásiť. Pokiaľ je pole prázdne vo vašom AD, rešpektujeme atribút <code>userAccountControl</code>, který obvykle umožňuje nepozastaveným používateľom sa prihlásiť.',
+    'ldap_invert_active_flag'   => 'LDAP Invert Active Flag',
+    'ldap_invert_active_flag_help'     => 'If enabled: when the value returned by LDAP Active Flag is <code>0</code> or <code>false</code> the user account will be active.',
+    'ldap_emp_num'              => 'LDAP číslo zamestnanca',
+    'ldap_email'                => 'LDAP mail',
     'ldap_test'                 => 'Test LDAP',
-    'ldap_test_sync'            => 'Test LDAP Synchronization',
+    'ldap_test_sync'            => 'Testovať LDAP synchronizáciu',
     'license'                   => 'Softvérová licencia',
-    'load_remote'               => 'Use Gravatar',
-    'load_remote_help_text'		=> 'Uncheck this box if your install cannot load scripts from the outside internet. This will prevent Snipe-IT from trying load images from Gravatar.',
+    'load_remote'               => 'Načítať externých avatarov',
+    'load_remote_help_text'		=> 'Odkliknite toto pole ak vaša inštancia nemôže načítavať skripty z internetu. Toto znemožní Snipe-IT, aby sa pokúšal načítať avatary z Gravatar alebo externých zdrojov.',
     'login'                     => 'Pokusy o prihlásenie',
     'login_attempt'             => 'Pokus o prihlásenie',
     'login_ip'                  => 'IP adresa',
-    'login_success'             => 'Success?',
+    'login_success'             => 'Hotovo?',
     'login_user_agent'          => 'User Agent',
-    'login_help'                => 'List of attempted logins',
-    'login_note'                => 'Login Note',
-    'login_note_help'           => 'Optionally include a few sentences on your login screen, for example to assist people who have found a lost or stolen device. This field accepts <a href="https://help.github.com/articles/github-flavored-markdown/">Github flavored markdown</a>',
-    'login_remote_user_text'    => 'Remote User login options',
-    'login_remote_user_enabled_text' => 'Enable Login with Remote User Header',
-    'login_remote_user_enabled_help' => 'This option enables Authentication via the REMOTE_USER header according to the "Common Gateway Interface (rfc3875)"',
+    'login_help'                => 'Zoznam pokusov o prihlásenie',
+    'login_note'                => 'Poznámka k prihláseniu',
+    'login_note_placeholder'            => "If you do not have a login or have found a device belonging to this company, please call technical support at 888-555-1212. Thank you.",
+    'login_note_help'           => 'Volitelne môžete na zadať niekoľko viet, ktoré sa zobrazia na prihlasovacej obrazovke, napríklad pomôcť ľuďom, ktorí našli stratené nebo ukradnuté zariadenia. Toto pole akceptuje značku podporovanú <a href="https://help.github.com/articles/github-flavored-markdown/">Github štýlom markdownu</a>',
+    'login_remote_user_text'    => 'Nastavenia vzdialeného prihlásenia používateľa',
+    'login_remote_user_enabled_text' => 'Povoliť prihlásenie s hlavičkou vzdialený používateľ',
+    'login_remote_user_enabled_help' => 'Tato voľba zapne overovanie prostredníctvom hlavičky REMOTE_USER v súlade s „Common Gateway Interface (rfc3875)“',
     'login_common_disabled_text' => 'Zakázať ostatné spôsoby overovania',
     'login_common_disabled_help' => 'Táto možnosť zakáže ostatné metódy prihlasovania. Povoľte túto možnosť iba ak ste si istý, že Váše REMOTE_USER prihlasovanie už funguje',
     'login_remote_user_custom_logout_url_text' => 'Vlastná URL pre odhlásenie',
@@ -146,13 +152,16 @@ return [
     'logo_print_assets_help'    => 'Použiť branding na zoznamoch pre tlačenie ',
     'full_multiple_companies_support_help_text' => 'Obmedzenie používateľov (vrátane administrátorov) iba na majetok vo vlastníctve ich spoločnosti.',
     'full_multiple_companies_support_text' => 'Plná podpora pre viacero spoločností',
+    'scope_locations_fmcs_support_text'  => 'Scope Locations with Full Multiple Companies Support',
+    'scope_locations_fmcs_support_help_text'  => 'Restrict locations to their selected company.',
+    'scope_locations_fmcs_check_button' => 'Check Compatibility',
+    'scope_locations_fmcs_support_disabled_text'  => 'This option is disabled because you have conflicting locations set for :count or more items.',
     'show_in_model_list'   => 'Zobraziť v robaľovacom menu modelu',
     'optional'					=> 'voliteľné',
     'per_page'                  => 'Výsledkov na stránku',
     'php'                       => 'PHP verzia',
-    'php_info'                  => 'PHP Info',
+    'php_info'                  => 'PHP info',
     'php_overview'              => 'PHP',
-    'php_overview_keywords'     => 'phpinfo, systém, info',
     'php_overview_help'         => 'PHP systémové info',
     'php_gd_info'               => 'Musíte nainštalovať php-gd ak chcete zobrazovať QR kódu. Viac v inštalačnej príručke.',
     'php_gd_warning'            => 'PHP plugin pre spracovanie obrázkov a GD plugin nie sú nainštalované.',
@@ -202,22 +211,24 @@ return [
     'show_images_in_email'     => 'Zobraziť obrázky v mailoch',
     'show_images_in_email_help'   => 'Odznačne toto políčko ak je Vaša Snipe-IT inštalácia za VPN alebo uzavretou sieťou a používatelia mimo siete nebudú mocť zobraziť obrázky z tejto inštancie v ich mailoch.',
     'site_name'                 => 'Názov stránky',
-    'integrations'               => 'Integrations',
+    'integrations'               => 'Integrácie',
     'slack'                     => 'Slack',
-    'general_webhook'           => 'General Webhook',
+    'general_webhook'           => 'Všeobecný Webhook',
     'ms_teams'                  => 'Microsoft Teams',
     'webhook'                   => ':app',
-    'webhook_presave'           => 'Test to Save',
-    'webhook_title'               => 'Update Webhook Settings',
-    'webhook_help'                => 'Integration settings',
+    'webhook_presave'           => 'Testovať pred uložením',
+    'webhook_title'               => 'Aktualizovať nastavenia Webhooku',
+    'webhook_help'                => 'Nastavenia integrácie',
     'webhook_botname'             => ':app Botname',
-    'webhook_channel'             => ':app Channel',
-    'webhook_endpoint'            => ':app Endpoint',
-    'webhook_integration'         => ':app Settings',
-    'webhook_test'                 =>'Test :app integration',
-    'webhook_integration_help'    => ':app integration is optional, however the endpoint and channel are required if you wish to use it. To configure :app integration, you must first <a href=":webhook_link" target="_new" rel="noopener">create an incoming webhook</a> on your :app account. Click on the <strong>Test :app Integration</strong> button to confirm your settings are correct before saving. ',
-    'webhook_integration_help_button'    => 'Once you have saved your :app information, a test button will appear.',
-    'webhook_test_help'           => 'Test whether your :app integration is configured correctly. YOU MUST SAVE YOUR UPDATED :app SETTINGS FIRST.',
+    'webhook_channel'             => ':app kanál',
+    'webhook_endpoint'            => ':app endpoint',
+    'webhook_integration'         => ':app nastavenia',
+    'webhook_test'                 =>'Otestovať integráciu :app',
+    'webhook_integration_help'    => '"app je voliteľná, avšak endpoint a kanál sú povinné ak ich chcete používať. K nastaveniu integrácie s :app musíte najprv <a href=":webhook_link" target="_new" rel="noopener">vytvoriť prichádzajúci webhook</a> vo vačom :app účte. Kliknite na tlačidlo <strong>Otestovať integráciu :app</strong> pre potvrdenie správnosti vašich nastavení pred uložením. ',
+    'webhook_integration_help_button'    => 'Po uložení nastavení :app sa zobrazí tlačidlo na ich otestovanie.',
+    'webhook_test_help'           => 'Otestuje či je vaša :app integrácia nastavená správne. MUSÍTE NAJPRV ULOŽIŤ AKTUALIZOVANÉ NASTAVENIA :app.',
+    'shortcuts_enabled'         => 'Povoliť skratky',
+    'shortcuts_help_text'       => '<strong>Windows</strong>: Alt + Access key, <strong>Mac</strong>: Control + Option + Access key',
     'snipe_version'  			=> 'Snipe-IT verzia',
     'support_footer'            => 'Odkaz v záhlaví na podporu ',
     'support_footer_help'       => 'Nastavte, kto môže vidieť prekliky na Snipe-IT stránku podpory a používateľský manuál',
@@ -227,7 +238,6 @@ return [
     'update'                    => 'Aktualizovať nastavenia',
     'value'                     => 'Hodnota',
     'brand'                     => 'Branding',
-    'brand_keywords'            => 'päta, logo, tlač, téma, skin, hlavička, farby, farba, css',
     'brand_help'                => 'Logo, Názov stránky',
     'web_brand'                 => 'Typ webového brandingu',
     'about_settings_title'      => 'O nastaveniach',
@@ -240,7 +250,7 @@ return [
     'privacy_policy'            => 'Zásady ochrany osobných údajov',
     'privacy_policy_link_help'  => 'Ak je url adresa špecifikovaná, odkaz na zásady ochrany osobných údajov bude vložený do pätičky stránka a do každého odoslaného mailu, v súlade s GDPR. ',
     'purge'                     => 'Odstrániť odmazané záznamy',
-    'purge_deleted'             => 'Purge Deleted ',
+    'purge_deleted'             => 'Odstrániť zmazané ',
     'labels_display_bgutter'    => 'Spodný okraj štítkov',
     'labels_display_sgutter'    => 'Bočný okraj štítkov',
     'labels_fontsize'           => 'Veľkosť písma štítkov',
@@ -252,128 +262,228 @@ return [
     'inches'        => 'palce',
     'width_w'        => 'š',
     'height_h'        => 'h',
-    'show_url_in_emails'                => 'Link to Snipe-IT in Emails',
-    'show_url_in_emails_help_text'      => 'Uncheck this box if you do not wish to link back to your Snipe-IT installation in your email footers. Useful if most of your users never login. ',
+    'show_url_in_emails'                => 'Odkaz na Snipe-IT v mailoch',
+    'show_url_in_emails_help_text'      => 'Zrušte zaškrtnutie tohoto políčka, ak nechcete odkazovať späť na inštaláciu Snipe-IT v pätičke vašich mailov. Užitočné, ak sa väčšina vašich používateľov nikdy neprihlasuje. ',
     'text_pt'        => 'pt',
-    'thumbnail_max_h'   => 'Max thumbnail height',
-    'thumbnail_max_h_help'   => 'Maximum height in pixels that thumbnails may display in the listing view. Min 25, max 500.',
-    'two_factor'        => 'Two Factor Authentication',
-    'two_factor_secret'        => 'Two-Factor Code',
-    'two_factor_enrollment'        => 'Two-Factor Enrollment',
-    'two_factor_enabled_text'        => 'Enable Two Factor',
-    'two_factor_reset'        => 'Reset Two-Factor Secret',
-    'two_factor_reset_help'        => 'This will force the user to enroll their device with their authenticator app again. This can be useful if their currently enrolled device is lost or stolen. ',
-    'two_factor_reset_success'          => 'Two factor device successfully reset',
-    'two_factor_reset_error'          => 'Two factor device reset failed',
-    'two_factor_enabled_warning'        => 'Enabling two-factor if it is not currently enabled will immediately force you to authenticate with a Google Auth enrolled device. You will have the ability to enroll your device if one is not currently enrolled.',
-    'two_factor_enabled_help'        => 'This will turn on two-factor authentication using Google Authenticator.',
-    'two_factor_optional'        => 'Selective (Users can enable or disable if permitted)',
-    'two_factor_required'        => 'Required for all users',
-    'two_factor_disabled'        => 'Disabled',
-    'two_factor_enter_code'	=> 'Enter Two-Factor Code',
-    'two_factor_config_complete'	=> 'Submit Code',
-    'two_factor_enabled_edit_not_allowed' => 'Your administrator does not permit you to edit this setting.',
-    'two_factor_enrollment_text'	=> "Two factor authentication is required, however your device has not been enrolled yet. Open your Google Authenticator app and scan the QR code below to enroll your device. Once you've enrolled your device, enter the code below",
-    'require_accept_signature'      => 'Require Signature',
-    'require_accept_signature_help_text'      => 'Enabling this feature will require users to physically sign off on accepting an asset.',
-    'left'        => 'left',
-    'right'        => 'right',
-    'top'        => 'top',
-    'bottom'        => 'bottom',
-    'vertical'        => 'vertical',
-    'horizontal'        => 'horizontal',
-    'unique_serial'                => 'Unique serial numbers',
-    'unique_serial_help_text'                => 'Checking this box will enforce a uniqueness constraint on asset serials',
-    'zerofill_count'        => 'Length of asset tags, including zerofill',
-    'username_format_help'   => 'This setting will only be used by the import process if a username is not provided and we have to generate a username for you.',
+    'thumbnail_max_h'   => 'Maximálna výška náhľadových obrázkov',
+    'thumbnail_max_h_help'   => 'Maximálna výška v pixeloch pre zobrazenie náhľadového obrázku v zozname položiek. Min 25, max 500.',
+    'two_factor'        => 'Dvojfaktorová autentifikácia',
+    'two_factor_secret'        => 'Kód dvojfaktorovej autentifikácie',
+    'two_factor_enrollment'        => 'Aktivácia dvojfaktorovej autentifikácie',
+    'two_factor_enabled_text'        => 'Povoliť druhý faktor',
+    'two_factor_reset'        => 'Resetnúť druhý faktor',
+    'two_factor_reset_help'        => 'To používateľa donúti znovu prejsť procesom aktivácie v autentifikačnej aplikácií. Môže byť užitočné, ak pôvodné zariadenie používateľa bolo stratené alebo ukradnuté. ',
+    'two_factor_reset_success'          => 'Resetovanie zariadenia pre druhý faktor bolo úspešné',
+    'two_factor_reset_error'          => 'Resetovanie zariadenia pre druhý faktor zlyhalo',
+    'two_factor_enabled_warning'        => 'Povolenie dvojfaktorového zabezpečenia, ak už nie je v súčasnej dobe povolené, vás okamžite donúti k overeniu pomocou zariadenia s aktivovaným Google Auth. Ak nie je v súčasnosti žiadne zariadenie aktivované, budete mať možnosť aktivovať svoje zariadenie.',
+    'two_factor_enabled_help'        => 'Toto zapne dvojfaktorovú autentifikáciu s využitím služby Google Authenticator.',
+    'two_factor_optional'        => 'Selektívne (Používatelia môžu povoliť alebo zakázať ak je povolené)',
+    'two_factor_required'        => 'Vyžadovať pre všetkých používateľov',
+    'two_factor_disabled'        => 'Zakázané',
+    'two_factor_enter_code'	=> 'Zadaje dvojfaktorový kód',
+    'two_factor_config_complete'	=> 'Odoslať kód',
+    'two_factor_enabled_edit_not_allowed' => 'Správca vám neumožňuje upraviť toto nastavenie.',
+    'two_factor_enrollment_text'	=> "Je vyžadované dvojfaktorové overenie, avšak vaše zariadenie ešte nebolo zaregistrované. Otvorte aplikáciu Google Authenticator a oskenujte nižšie uvedený QR kód pre registráciu vášho zariadenia. Akonáhle zaregistrujete svoje zariadenie, zadajte nižšie uvedený kód",
+    'require_accept_signature'      => 'Vyžadovať podpis',
+    'require_accept_signature_help_text'      => 'Aktiváciou tejto funkcie bude vyžadovať, aby sa používatelia fyzicky podpísali k potvrdeniu prijatia majetku.',
+    'require_checkinout_notes'  => 'Vyžadovať poznámky pri prevzatí / odovzdaní',
+    'require_checkinout_notes_help_text'    => 'Aktiváciou tejto funkcie bude vyžadovať, aby bolo pole s poznámkou vždy vyplnené, keď je realizované odovzdanie alebo prevzatie majetku.',
+    'left'        => 'vľavo',
+    'right'        => 'vpravo',
+    'top'        => 'hore',
+    'bottom'        => 'dole',
+    'vertical'        => 'vertikálne',
+    'horizontal'        => 'horizontálne',
+    'unique_serial'                => 'Unikátne sériové čísla',
+    'unique_serial_help_text'                => 'Zaškrtnutím tohto políčka sa aktivuje overovanie unikátnosti sériového čísla majetku',
+    'zerofill_count'        => 'Dĺžka označenia majetku, vrátane doplnených núl',
+    'username_format_help'   => 'Toto nastavenie bude použité počas importu ak používateľ nie je zadaný alebo je potrebné generovať používateľské meno.',
     'oauth_title' => 'OAuth API nastavenia ',
-    'oauth_clients' => 'OAuth Clients',
+    'oauth_clients' => 'Klienti OAuth',
     'oauth' => 'OAuth',
-    'oauth_help' => 'Oauth Endpoint Settings',
-    'oauth_no_clients' => 'You have not created any OAuth clients yet.',
+    'oauth_help' => 'Nastavení koncových bodov Oauth',
+    'oauth_no_clients' => 'Zatiaľ ste nevytvorili žiadneho Oauth klienta.',
     'oauth_secret' => 'Secret',
-    'oauth_authorized_apps' => 'Authorized Applications',
-    'oauth_redirect_url' => 'Redirect URL',
-    'oauth_name_help' => ' Something your users will recognize and trust.',
+    'oauth_authorized_apps' => 'Autorizované aplikácie',
+    'oauth_redirect_url' => 'URL presmerovania',
+    'oauth_name_help' => ' Niečo čo vaši používateliarozpoznajúú a budú považovať za dôveryhodné.',
     'oauth_scopes' => 'Scopes',
-    'oauth_callback_url' => 'Your application authorization callback URL.',
-    'create_client' => 'Create Client',
-    'no_scopes' => 'No scopes',
-    'asset_tag_title' => 'Update Asset Tag Settings',
-    'barcode_title' => 'Update Barcode Settings',
+    'oauth_callback_url' => 'Adresa URL spätného volania autorizácie vašej aplikácie.',
+    'create_client' => 'Vytvoriť klienta',
+    'no_scopes' => 'Žiadne scopes',
+    'asset_tag_title' => 'Aktualizovať nastavenia označenia majetku',
+    'barcode_title' => 'Aktualizovať nastavenia čiarových kódov',
     'barcodes' => 'Čiarové kódy',
     'barcodes_help_overview' => 'Čiarový kód &amp; QR nastavenia',
-    'barcodes_help' => 'This will attempt to delete cached barcodes. This would typically only be used if your barcode settings have changed, or if your Snipe-IT URL has changed. Barcodes will be re-generated when accessed next.',
+    'barcodes_help' => 'Toto se pokúsi odstrániť čiarové kódy z medzipamäte. Obvykle se používa v prípade, keď došlo k zmene nastavení čiarového kódu alebo v prípade, že se zmenila URL adresa Snipe-IT. Kódy budú vygenerované znovu.',
     'barcodes_spinner' => 'Pokus o mazanie súborov...',
     'barcode_delete_cache' => 'Vymazať cache čiarových kódov',
     'branding_title' => 'Aktualizovať nastavenia značky',
     'general_title' => 'Aktualizovať všeobecné nastavenia',
     'mail_test' => 'Poslať Test',
-    'mail_test_help' => 'This will attempt to send a test mail to :replyto.',
-    'filter_by_keyword' => 'Filter by setting keyword',
+    'mail_test_help' => 'Pokúsi sa odoslať testovací mail na adresu :replyto.',
+    'filter_by_keyword' => 'Filtrovať podľa kľúčového slova',
     'security' => 'Zabezpečenie',
     'security_title' => 'Aktualizovať nastavenia zabezpečenia',
-    'security_keywords' => 'heslo, heslá, požiadavky, dvoj faktorové, dvoj-faktorové, bežné heslá, vzdialené prihlásenie, odhlásenie, autentifikácia',
-    'security_help' => 'Two-factor, Password Restrictions',
-    'groups_keywords' => 'permissions, permission groups, authorization',
-    'groups_help' => 'Account permission groups',
-    'localization' => 'Localization',
-    'localization_title' => 'Update Localization Settings',
-    'localization_keywords' => 'localization, currency, local, locale, time zone, timezone, international, internatinalization, language, languages, translation',
+    'security_help' => 'Dvojfaktor, obmedzenia hesiel',
+    'groups_help' => 'Skupiny oprávnení k účtu',
+    'localization' => 'Lokalizácia',
+    'localization_title' => 'Aktualizovať nastavenia lokalizácie',
     'localization_help' => 'Jazyk, zobrazenie dátumu',
     'notifications' => 'Notifikácie',
-    'notifications_help' => 'Email Alerts & Audit Settings',
-    'asset_tags_help' => 'Incrementing and prefixes',
+    'notifications_help' => 'Mailové upozornenia a nastavenia intentúry',
+    'asset_tags_help' => 'Zvyšovanie a prefixy',
     'labels' => 'Štítky',
     'labels_title' => 'Aktualizovať nastavenia štítka',
-    'labels_help' => 'Veľkosti štítka &amp; nastavenia',
-    'purge_keywords' => 'natrvalo odstrániť',
+    'labels_help' => 'Čiarové kód &amp; nastavenie štítkov',
     'purge_help' => 'Odstrániť odmazané záznamy',
-    'ldap_extension_warning' => 'It does not look like the LDAP extension is installed or enabled on this server. You can still save your settings, but you will need to enable the LDAP extension for PHP before LDAP syncing or login will work.',
+    'ldap_extension_warning' => 'Nevypadá to, že LDAP rozšírenie je nainštalované alebo povolené na tomto servere. Stále môžete uložiť vaše nastavenia ale budete musieť povoliť LDAP rozšírenie pre PHP, aby začala LDAP synchronizácia alebo prihlásenie fungovať.',
     'ldap_ad' => 'LDAP/AD',
+    'ldap_test_label' => 'Test LDAP Sync',
+    'ldap_test_login' => ' Test LDAP Login',
+    'ldap_username_placeholder' => 'LDAP Username',
+    'ldap_password_placeholder' => 'LDAP Password',
     'employee_number' => 'Číslo zamestnanca',
     'create_admin_user' => 'Vytvoriť Užívateľa ::',
     'create_admin_success' => 'Úspech! Váš admin užívateľ bol pridaný!',
-    'create_admin_redirect' => 'Click here to go to your app login!',
+    'create_admin_redirect' => 'Kliknite sem pre prihlásenie do aplikácie!',
     'setup_migrations' => 'Migrácie databázy ::',
-    'setup_no_migrations' => 'There was nothing to migrate. Your database tables were already set up!',
-    'setup_successful_migrations' => 'Your database tables have been created',
-    'setup_migration_output' => 'Migration output:',
-    'setup_migration_create_user' => 'Next: Create User',
+    'setup_no_migrations' => 'Nenašlo sa nič na migráciu. Tabuľky vašej databázy už boli nastavené!',
+    'setup_successful_migrations' => 'Tabuľky vašej databázy už boli vytovrené',
+    'setup_migration_output' => 'Výstup z migrácie:',
+    'setup_migration_create_user' => 'Ďalej: Vytvoriť používateľa',
     'ldap_settings_link' => 'Stránka nastavenia LDAP',
-    'slack_test' => 'Test <i class="fab fa-slack"></i> Integration',
-    'label2_enable'           => 'New Label Engine',
-    'label2_enable_help'      => 'Switch to the new label engine. <b>Note: You will need to save this setting before setting others.</b>',
-    'label2_template'         => 'Template',
-    'label2_template_help'    => 'Select which template to use for label generation',
+    'slack_test' => 'Otestovať <i class="fab fa-slack"></i> integráciu',
+    'status_label_name' => 'Status Label Name',
+    'super_admin_only'  => 'Super Admin Only',
+    'label2_enable'           => 'Nový systém štítkovania',
+    'label2_enable_help'      => 'Prepnúť na nový systém štítkovania. <b>Poznámka: Musíte uložiť toto nastavenie pred zmenou ďalších nastavení.</b>',
+    'label2_template'         => 'Šablóna',
+    'label2_template_help'    => 'Vyberte šablónu, ktorú chcete použiť pre generovanie štítkov',
     'label2_title'            => 'Názov',
-    'label2_title_help'       => 'The title to show on labels that support it',
-    'label2_title_help_phold' => 'The placeholder <code>{COMPANY}</code> will be replaced with the asset&apos;s company name',
-    'label2_asset_logo'       => 'Use Asset Logo',
-    'label2_asset_logo_help'  => 'Use the logo of the asset&apos;s assigned company, rather than the value at <code>:setting_name</code>',
-    'label2_1d_type'          => '1D Barcode Type',
-    'label2_1d_type_help'     => 'Format for 1D barcodes',
+    'label2_title_help'       => 'Titulok pre zobrazenie na štítkoch, ktoré ho podporujú',
+    'label2_title_help_phold' => 'Zástupný symbol <code>{COMPANY}</code> bude nahradený názvom spoločnosti priradenej majetku',
+    'label2_asset_logo'       => 'Použiť logo majetku',
+    'label2_asset_logo_help'  => 'Použiť logo spoločnosti priradenej k majetku namiesto hodnoty <code>:setting_name</code>',
+    'label2_1d_type'          => 'Typ 1D čiarového kódu',
+    'label2_1d_type_help'     => 'Formát pre 1D čiarové kódy',
     'label2_2d_type'          => 'Typ 2D čiarového kódu',
-    'label2_2d_type_help'     => 'Format for 2D barcodes',
-    'label2_2d_target'        => '2D Barcode Target',
-    'label2_2d_target_help'   => 'The URL the 2D barcode points to when scanned',
-    'label2_fields'           => 'Field Definitions',
-    'label2_fields_help'      => 'Fields can be added, removed, and reordered in the left column. For each field, multiple options for Label and DataSource can be added, removed, and reordered in the right column.',
-    'help_asterisk_bold'    => 'Text entered as <code>**text**</code> will be displayed as bold',
-    'help_blank_to_use'     => 'Leave blank to use the value from <code>:setting_name</code>',
-    'help_default_will_use' => '<code>:default</code> will use the value from <code>:setting_name</code>. <br>Note that the value of the barcodes must comply with the respective barcode spec in order to be successfully generated. Please see <a href="https://snipe-it.readme.io/docs/barcodes">the documentation <i class="fa fa-external-link"></i></a> for more details. ',
-    'default'               => 'Default',
-    'none'                  => 'None',
-    'google_callback_help' => 'This should be entered as the callback URL in your Google OAuth app settings in your organization&apos;s <strong><a href="https://console.cloud.google.com/" target="_blank">Google developer console <i class="fa fa-external-link" aria-hidden="true"></i></a></strong>.',
-    'google_login'      => 'Google Workspace Login Settings',
-    'enable_google_login'  => 'Enable users to login with Google Workspace',
-    'enable_google_login_help'  => 'Users will not be automatically provisioned. They must have an existing account here AND in Google Workspace, and their username here must match their Google Workspace email address. ',
-    'mail_reply_to' => 'Mail Reply-To Address',
-    'mail_from' => 'Mail From Address',
-    'database_driver' => 'Database Driver',
-    'bs_table_storage' => 'Table Storage',
-    'timezone' => 'Timezone',
-    'profile_edit'          => 'Edit Profile',
-    'profile_edit_help'          => 'Allow users to edit their own profiles.',
+    'label2_2d_type_help'     => 'Formát pre 2D čiarové kódy',
+    'label2_2d_target'        => 'Cieľ 2D čiarového kódu',
+    'label2_2d_target_help'   => 'Údaje, ktore budú zahrnuté do 2d čiarového kódu',
+    'label2_fields'           => 'Definícia polí',
+    'label2_fields_help'      => 'Polia môžu byť pridané, odstránené alebo usporiadané v ľavom stĺpci. Pre každé pole je možné pridať, odstrániť viacero možností pre popis a DataSource a zmeniť poradie v pravom stĺpci.',
+    'purge_barcodes' => 'Purge Barcodes',
+    'help_asterisk_bold'    => 'Text zadaný ako <code>**text**</code> bude zobrazený ako tučný',
+    'help_blank_to_use'     => 'Ponechajte prázdne pre použitie hodnoty z <code>:setting_name</code>',
+    'help_default_will_use' => '<code>:default</code> použije hodnotu z <code>:setting_name</code>. <br>Upozorňujeme, že hodnota čiarových kódov musí byť v súlade s príslušnými špecifikáciami čiarových kódov, aby sa úspešne vygenerovali. Pozrite <a href="https://snipe-it.readme.io/docs/barcodes">dokumentáciu <i class="fa fa-external-link"></i></a> pre ďalšie podrobnosti. ',
+    'asset_id'              => 'ID majetku',
+    'data'               => 'Dáta',
+    'default'               => 'Predvolený',
+    'none'                  => 'Žiadny',
+    'google_callback_help' => 'Toto by malo byť zadané ako URL spätného volania v nastaveniach aplikácie Google OAuth vo <strong><a href="https://console.cloud.google.com/" target="_blank">vývojová konzole Google vašej organizácie <i class="fa fa-external-link" aria-hidden="true"></i></a></strong>.',
+    'google_login'      => 'Nastavnia prihlasovania Google Workspace',
+    'enable_google_login'  => 'Povoliť používateľom prihlasovať sa s kontom Google Workspace',
+    'enable_google_login_help'  => 'Používatelia nebudú automaticky vytvorení. Musia mať už vytvorený účet tu a v Google Workspace a ich používateľské meno sa musí zhodovať s ich e-mailovou adresou Google. ',
+    'mail_reply_to' => 'Adresa pre odpoveď',
+    'mail_from' => 'Adresa odosielateľa',
+    'database_driver' => 'Ovládať databáze',
+    'bs_table_storage' => 'Úložisko tabuliek',
+    'timezone' => 'Časová zóna',
+    'test_mail' => 'Test Mail',
+    'profile_edit'          => 'Upraviť profil',
+    'profile_edit_help'          => 'Povoliť používateľom upravovať ich vlastný profil.',
+    'default_avatar' => 'Custom Default Avatar',
+    'default_avatar_help' => 'Tento obrázok bude zobrazený ako profilový ak používateľ nemá profilovú fotku.',
+    'restore_default_avatar' => 'Obnoviť <a href=":default_avatar" data-toggle="lightbox" data-type="image">pôvodný predvolený avatar</a>',
+    'restore_default_avatar_help' => '',
+    'due_checkin_days' => 'Varovanie pripravené k prevzatiu',
+    'due_checkin_days_help' => 'Koľko dní pred očakávaným prevzatím majetku má byť zaradený do zoznamu "Čaká na prevzatie"?',
+    'no_groups' => 'Žiadne skupiny ešte neboli vytvorené. Navštívte <code>Admin nastavenia > Skupiny oprávnení</code> pre pridanie.',
+    'text' => 'Text',
+
+    'username_formats' => [
+        'username_format'		=> 'Formát používateľského mena',
+        'firstname_lastname_format'	=> 'Meno Priezvisko (jane.smith)',
+        'first_name_format'	        => 'First Name (jane)',
+        'last_name_format'		=> 'Last Name (doe)',
+        'filastname_format'			=> 'First Initial Last Name (jsmith)',
+        'lastnamefirstinitial_format' =>  'Last Name First Initial (smithj)',
+        'firstname_lastname_underscore_format' => 'First Name Last Name (jane_smith)',
+        'firstinitial.lastname' => 'First Initial Last Name (j.smith)',
+        'lastname_firstinitial' => 'Last Name First Initial (smith_j)',
+        'lastname_dot_firstinitial_format' => 'Last Name First Initial (smith.j)',
+        'firstnamelastname'     => 'First Name Last Name (janesmith)',
+        'firstnamelastinitial'  => 'First Name Last Initial (janes)',
+        'lastnamefirstname'      => 'Priezvisko.Meno (smith.jane)',
+    ],
+
+    'email_formats' => [
+        'email_format'			=> 'Tvar emailu',
+        'firstname_lastname_format'	=> 'Meno Priezvisko (jane.smith@example.com)',
+        'first_name_format'		=> 'Meno (jane@example.com)',
+        'last_name_format'		=> 'Last Name (doe@example.com)',
+        'filastname_format'			=> 'Iniciálka mena Priezvisko (jsmith@example.com)',
+        'lastnamefirstinitial_format' =>  'Priezvisko Iniciálka mena (smithj@example.com)',
+        'firstname_lastname_underscore_format' => 'Meno Priezvisko (jane_smith@example.com)',
+        'firstinitial.lastname' => 'Iniciálka mena Priezvisko (j.smith@example.com)',
+        'lastname_firstinitial' => 'Priezvisko Iniciálka mena (smith_j@example.com)',
+        'lastname_dot_firstinitial_format' => 'Last Name First Initial (smith.j@example.com)',
+        'firstnamelastname'     => 'Meno Priezvisko (janesmith@example.com)',
+        'firstnamelastinitial'  => 'Meno Iniciálka priezviska (janes@example.com)',
+        'lastnamefirstname'      => 'Priezvisko.Meno (smith.jane@example.com)',
+    ],
+
+
+
+    'logo_labels' => [
+        'acceptance_pdf_logo'       => 'PDF Logo',
+        'email_logo'                => 'E-mail logo',
+        'label_logo'                => 'Logo štítku',
+        'logo'                      => 'Site Logo',
+        'favicon'                   => 'Favicon',
+    ],
+
+    'logo_help' => [
+        'email_logo_size'       => 'Štvorcové logá vypadajú v mailoch najlepšie. ',
+    ],
+
+    'logo_option_types' => [
+        'text' => 'Text',
+        'logo' => 'Logo',
+        'logo_and_text' => 'Logo and Text',
+    ],
+
+
+    'legends' => [
+        'scoping' => 'Scoping',
+        'formats' => 'Default Formats',
+        'profiles' => 'User Profiles',
+        'eula' => 'EULA & Acceptance Preferences',
+        'misc_display' => 'Miscellaneous Display Options',
+        'email' => 'Email Preferences',
+        'checkin' => 'Checkin Preferences',
+        'dashboard' => 'Login & Dashboard Preferences',
+        'misc' => 'Miscellaneous',
+        'logos' => 'Logos & Display',
+        'colors' => 'Colors & Skins',
+        'footer' => 'Footer Preferences',
+        'security' => 'Security Preferences',
+        'general' => 'General',
+        'intervals' => 'Intervals & Thresholds',
+    ],
+
+
+    /* Keywords for settings overview help */
+    'keywords' => [
+        'brand'             => 'päta, logo, tlač, téma, skin, hlavička, farby, farba, css',
+        'general_settings'  => 'podpora spoločnosti, podpis, prijatie, mailový formát, formát užívateľského mena, obrázky, na stránku, náhľad, eula, gravatar, tos, prehľad, súkromie',
+        'groups'            => 'oprávnenia, skupiny oprávnení, autorizácia',
+        'labels'            => 'štítky, čiarové kódy, čiarový kód, záložky, tlačiť, ups, qr, 1d, 2d',
+        'localization'      => 'lokalizácia, mena, miestny, miestny, časové pásmo, časové pásmo, medzinárodný, internacionalizácia, jazyk, jazyky, preklad',
+        'php_overview'      => 'phpinfo, systém, info',
+        'purge'             => 'natrvalo odstrániť',
+        'security'          => 'heslo, heslá, požiadavky, dvoj faktorové, dvoj-faktorové, bežné heslá, vzdialené prihlásenie, odhlásenie, autentifikácia',
+    ],
 
 ];
diff --git a/resources/lang/sk-SK/admin/settings/message.php b/resources/lang/sk-SK/admin/settings/message.php
index 08d0be465d..5cbe77e02b 100644
--- a/resources/lang/sk-SK/admin/settings/message.php
+++ b/resources/lang/sk-SK/admin/settings/message.php
@@ -11,8 +11,11 @@ return [
         'file_deleted'          => 'Súbor so zálohou bol úspešne odstránený. ',
         'generated'             => 'Nový súbor so zálohou bol úspešne vytvorený.',
         'file_not_found'        => 'Súbor so zálohou sa nepodarilo nájsť na serveri.',
-        'restore_warning'       => 'Yes, restore it. I acknowledge that this will overwrite any existing data currently in the database. This will also log out all of your existing users (including you).',
-        'restore_confirm'       => 'Are you sure you wish to restore your database from :filename?'
+        'restore_warning'       => 'Áno, obnoviť. Uvedomujem si, že táto akcia prepíše všetky existujúce dáta v databáze. Taktiež budú odhlásení všetci používatelia (vrátane vás).',
+        'restore_confirm'       => 'Ste si istí, že chcete obnoviť databázu z :fielname?'
+    ],
+    'restore' => [
+        'success'               => 'Vaša systémová záloha bola obnovená. Prosím znovu sa prihláste.'
     ],
     'purge' => [
         'error'     => 'Počas čistenia sa vyskytla chyba. ',
@@ -20,27 +23,37 @@ return [
         'success'               => 'Odstránené záznamy boli úspešne očistené.',
     ],
     'mail' => [
-        'sending' => 'Sending Test Email...',
+        'sending' => 'Posielam testovací email...',
         'success' => 'Email odoslaný!',
         'error' => 'Email sa nepodarilo odoslať.',
-        'additional' => 'No additional error message provided. Check your mail settings and your app log.'
+        'additional' => 'Podrobná správa o chybe nie je dostupná. Skontrolujte nastavenia pošty a logy.'
     ],
     'ldap' => [
-        'testing' => 'Testing LDAP Connection, Binding & Query ...',
-        '500' => '500 Server Error. Please check your server logs for more information.',
+        'testing' => 'Testujem LDAP spojenie, väzbu a dopyty ...',
+        '500' => '500 chyba servera. Prosím skontroluje serverové logy pre viac informácií.',
         'error' => 'Niečo sa pokazilo :(',
-        'sync_success' => 'A sample of 10 users returned from the LDAP server based on your settings:',
-        'testing_authentication' => 'Testing LDAP Authentication...',
-        'authentication_success' => 'User authenticated against LDAP successfully!'
+        'sync_success' => 'Ukážka 10 používateľov vrátená z LDAP server na základe vašich nastavení:',
+        'testing_authentication' => 'Testujem LDAP autentifikáciu...',
+        'authentication_success' => 'Používateľ sa úspešne autentifikoval voči LDAP-u!'
     ],
+    'labels' => [
+        'null_template' => 'Label template not found. Please select a template.',
+        ],
     'webhook' => [
-        'sending' => 'Sending :app test message...',
-        'success' => 'Your :webhook_name Integration works!',
-        'success_pt1' => 'Success! Check the ',
-        'success_pt2' => ' channel for your test message, and be sure to click SAVE below to store your settings.',
+        'sending' => 'Posielam :app testovaciu správu...',
+        'success' => 'Vaša :webhook_name integrácia funguje!',
+        'success_pt1' => 'Úspešné! Skontrolujte ',
+        'success_pt2' => ' kanál pre vaše testovacie správy a uistite sa, že kliknete na tlačidlo ULOŽIŤ pre uloženie nastavení.',
         '500' => '500 Chyba servera.',
-        'error' => 'Something went wrong. :app responded with: :error_message',
-        'error_redirect' => 'ERROR: 301/302 :endpoint returns a redirect. For security reasons, we don’t follow redirects. Please use the actual endpoint.',
+        'error' => 'Nastala chyba. :app odpovedala s: :error_message',
+        'error_redirect' => 'CHBA: 301/302 :endpoint vrátil presmerovanie. Z bezpečnostných dôvodov nenasledujeme presmerovania. Prosím použite správny koncový bod.',
         'error_misc' => 'Niečo sa pokazilo. :( ',
-    ]
+        'webhook_fail' => ' webhook notifikácia zlyhala: Overte správnosť zadanej URL adresy.',
+        'webhook_channel_not_found' => ' kanál webhooku nebol nájdený.',
+        'ms_teams_deprecation' => 'The selected Microsoft Teams webhook URL will be deprecated Dec 31st, 2025. Please use a workflow URL. Microsoft\'s documentation on creating a workflow can be found <a href="https://support.microsoft.com/en-us/office/create-incoming-webhooks-with-workflows-for-microsoft-teams-8ae491c7-0394-4861-ba59-055e33f75498" target="_blank"> here.</a>',
+    ],
+    'location_scoping' => [
+        'not_saved' => 'Your settings were not saved.',
+        'mismatch' => 'There is 1 item in the database that need your attention before you can enable location scoping.|There are :count items in the database that need your attention before you can enable location scoping.',
+    ],
 ];
diff --git a/resources/lang/sk-SK/admin/settings/table.php b/resources/lang/sk-SK/admin/settings/table.php
index e8ac35ccd4..5981317dcb 100644
--- a/resources/lang/sk-SK/admin/settings/table.php
+++ b/resources/lang/sk-SK/admin/settings/table.php
@@ -2,5 +2,5 @@
 
 return array(
     'created'   => 'Vytvorený',
-    'size' => 'Size',
+    'size' => 'Veľkosť',
 );
diff --git a/resources/lang/sk-SK/admin/statuslabels/message.php b/resources/lang/sk-SK/admin/statuslabels/message.php
index 807a42a7d4..e2dea48e2a 100644
--- a/resources/lang/sk-SK/admin/statuslabels/message.php
+++ b/resources/lang/sk-SK/admin/statuslabels/message.php
@@ -3,7 +3,7 @@
 return [
 
     'does_not_exist' => 'Stav neexistuje.',
-    'deleted_label' => 'Deleted Status Label',
+    'deleted_label' => 'Odstránený stav',
     'assoc_assets'	 => 'Tento stav je priradený minimálne jednému mejtku, preto nemôže byť odstránený. Prosím odstráňte referenciu na tento stav z príslušného majetku a skúste znovu. ',
 
     'create' => [
@@ -23,7 +23,7 @@ return [
     ],
 
     'help' => [
-        'undeployable'   => 'Tieto majetky nemôžu byť nikomu priradené.',
+        'undeployable'   => 'Tieto položky majetku nemôžu byť nikomu priradené.',
         'deployable'   => 'Tieto majetky môžu byť priradené. Akonáhle sú priradené nadobudnú stav <i class="fas fa-circle text-blue"></i> <strong>Priradené</strong>.',
         'archived'   => 'Tieto majetky nemôžu byť priradené, budú zobrazené iba vo výpise Archovavné. Tento stav je vhodný, ak si chcete ponechať informácie o predchádzajúcom majetku pre historické účely alebo prípravu rozpočtu, ale zároveň ich nechcete mať zobrazené v prehľade aktuálneho majetku.',
         'pending'   => 'Tieto majetky nemôžu byť ešte nikomu priradené. Často sa používa na predmety, ktoré čakajú na opravu ale očakáva sa ich návrat do obehu.',
diff --git a/resources/lang/sk-SK/admin/statuslabels/table.php b/resources/lang/sk-SK/admin/statuslabels/table.php
index 7063dc53cd..188a20659e 100644
--- a/resources/lang/sk-SK/admin/statuslabels/table.php
+++ b/resources/lang/sk-SK/admin/statuslabels/table.php
@@ -1,19 +1,19 @@
 <?php
 
 return array(
-    'about'      	=> 'O stavoch',
+    'about'      	=> 'About Status Types',
     'archived'      	=> 'Archivované',
     'create'      	=> 'Vyvoriť nový stav',
     'color'      	=> 'Farba grafu',
     'default_label' => 'Predvolený štítok',
     'default_label_help' => 'Používa sa k zabezpečeniu, aby sa najčastejšie používé stavy zobrazili na vrchu zoznamu pri vytváraní / úprave majetku.',
-    'deployable'      	=> 'Priraditeľný',
-    'info'      	=> 'Stavy sa využívajú k popísaniu rozličných fáz, ktorými môže majetok prechádzť. Môžu byť vytvorené pre prípad opravy, straty / krádeže, atď. Môžete vytvoriť nový stav pre priraditeľlné, čakajúce a archivované položky majetku.',
+    'deployable'      	=> 'Odovzdateľný',
+    'info'      	=> 'Status label types are used to describe the various states your assets could be in. They may be out for repair, lost/stolen, etc. You can create new status labels for your deployable, pending and archived assets according to your own workflow. For more information, <a href="https://snipe-it.readme.io/docs/overview#status-labels" target="_blank">see the documentation <i class="fa fa-external-link"></i></a>.',
     'name'      	=> 'Názov stavu',
     'pending'      	=> 'Čakajúce',
     'status_type'   => 'Typ stavu',
     'show_in_nav'   => 'Zobraziť v bočnom menu',
     'title'      	=> 'Stavy',
-    'undeployable'  => 'Nepriraditeľný',
+    'undeployable'  => 'Neodovzdateľný',
     'update'      	=> 'Upraviť stav',
 );
diff --git a/resources/lang/sk-SK/admin/suppliers/message.php b/resources/lang/sk-SK/admin/suppliers/message.php
index 1c5279236a..1d06b6ac27 100644
--- a/resources/lang/sk-SK/admin/suppliers/message.php
+++ b/resources/lang/sk-SK/admin/suppliers/message.php
@@ -2,7 +2,7 @@
 
 return array(
 
-    'deleted' => 'Deleted supplier',
+    'deleted' => 'Odstrániť dodávateľa',
     'does_not_exist' => 'Dodávateľ neexistuje.',
 
 
diff --git a/resources/lang/sk-SK/admin/suppliers/table.php b/resources/lang/sk-SK/admin/suppliers/table.php
index a938745354..cc1e224f91 100644
--- a/resources/lang/sk-SK/admin/suppliers/table.php
+++ b/resources/lang/sk-SK/admin/suppliers/table.php
@@ -1,19 +1,19 @@
 <?php
 
 return array(
-    'about_suppliers_title' => 'About Suppliers',
-    'about_suppliers_text'  => 'Suppliers are used to track the source of items',
-    'address'               => 'Supplier Address',
+    'about_suppliers_title' => 'O dodávateľoch',
+    'about_suppliers_text'  => 'Dodávatelia sa využívajú na sledovanie zdroja položiek',
+    'address'               => 'Adresa dodávateľa',
     'assets'                => 'Majetok',
     'city'                  => 'Mesto',
-    'contact'               => 'Contact Name',
+    'contact'               => 'Meno kontaktnej osoby',
     'country'               => 'Krajina',
-    'create'                => 'Create Supplier',
+    'create'                => 'Pridať dodávateľa',
     'email'                 => 'E-mail',
     'fax'                   => 'Fax',
     'id'                    => 'ID',
-    'licenses'              => 'Licenses',
-    'name'                  => 'Supplier Name',
+    'licenses'              => 'Licencie',
+    'name'                  => 'Názov dodávateľa',
     'notes'                 => 'Poznámky',
     'phone'                 => 'Telefón',
     'state'                 => 'Štát',
diff --git a/resources/lang/sk-SK/admin/users/general.php b/resources/lang/sk-SK/admin/users/general.php
index e70f35e64f..bc9d72436f 100644
--- a/resources/lang/sk-SK/admin/users/general.php
+++ b/resources/lang/sk-SK/admin/users/general.php
@@ -17,10 +17,12 @@ return [
     'last_login'        => 'Posledné prihlásenie',
     'ldap_config_text'  => 'Nastavenia LDAP-u sa nachádzajú v menu Administrácia => Nastavenia. Vybraná (voliteľná) lokalita bude nastavená pre všetkých importovaných používateľov.',
     'print_assigned'    => 'Vytlačiť všetky priradené',
-    'email_assigned'    => 'Email List of All Assigned',
-    'user_notified'     => 'User has been emailed a list of their currently assigned items.',
-    'auto_assign_label' => 'Include this user when auto-assigning eligible licenses',
-    'auto_assign_help'  => 'Skip this user in auto assignment of licenses',
+    'email_assigned'    => 'Zaslať zoznam aktuálne priradeného majetku',
+    'user_notified'     => 'Používateľovi bol zaslaný email so zoznamom aktuálne priradených položiek.',
+    'users_notified'    => 'The user has been emailed a list of their currently assigned items.|:count users have been emailed a list of their currently assigned items.',
+    'users_notified_warning' => ':count user has been emailed a list of their currently assigned items, however :no_email users did not have an email address so could not be emailed.|:count users have been emailed a list of their currently assigned items, however :no_email user(s) did not have an email address so could not be emailed.',
+    'auto_assign_label' => 'Zahrnúť tohto používateľa do automatického priraďovania licencií',
+    'auto_assign_help'  => 'Nezaradiť tohto používateľa do automatického priraďovania licencií',
     'software_user'     => 'Software priradený :name',
     'send_email_help'   => 'Pre zaslanie prístupových údajov musíte zadať e-mailovú adresu používateľa. Zaslanie prístupových údajov je možné iba v procese vytvárania nového používateľa. Heslá sú ukladané šifrované, nie je ich možné prečítať po uložení.',
     'view_user'         => 'Zobraziť používateľa :name',
@@ -30,25 +32,25 @@ return [
     'two_factor_active'   => '2FA aktívne ',
     'user_deactivated'  => 'Užívateľ sa nemôže prihlásiť',
     'user_activated'  => 'Užívateľ sa môže prihlásiť',
-    'activation_status_warning' => 'Do not change activation status',
-    'group_memberships_helpblock' => 'Only superadmins may edit group memberships.',
-    'superadmin_permission_warning' => 'Only superadmins may grant a user superadmin access.',
-    'admin_permission_warning' => 'Only users with admins rights or greater may grant a user admin access.',
+    'activation_status_warning' => 'Nezmeniť stav aktivácie',
+    'group_memberships_helpblock' => 'Iba superadmini môžu upravovať členstvo v skupine.',
+    'superadmin_permission_warning' => 'Iba superadmini môžu garantovať superadmin prístup.',
+    'admin_permission_warning' => 'Iba používatelia s administrátorskými oprávneniami môžu garantovať administrátorsky prístup.',
     'remove_group_memberships' => 'Odstrániť členstvo v skupine',
-    'warning_deletion_information' => 'You are about to checkin ALL items from the :count user(s) listed below. Super admin names are highlighted in red.',
+    'warning_deletion_information' => 'Chystáte sa prevziať všetky položky od :count používateľov uvedených nižšie. Mena superadmin používateľov sú zobrazené červeným.',
     'update_user_assets_status' => 'Aktualizovať všetky asety pre týchto užívateľov na tento status',
-    'checkin_user_properties' => 'Check in all properties associated with these users',
-    'remote_label'   => 'This is a remote user',
-    'remote'   => 'Remote',
-    'remote_help' => 'This can be useful if you need to filter by remote users who never or rarely come into your physical locations.',
-    'not_remote_label' => 'This is not a remote user',
-    'vip_label' => 'VIP user',
-    'vip_help' => 'This can be helpful to mark important people in your org if you would like to handle them in special ways.',
-    'create_user' => 'Create a user',
-    'create_user_page_explanation' => 'This is the account information you will use to access the site for the first time.',
-    'email_credentials' => 'Email credentials',
-    'email_credentials_text' => 'Email my credentials to the email address above',
-    'next_save_user' => 'Next: Save User',
-    'all_assigned_list_generation' => 'Generated on:',
-    'email_user_creds_on_create' => 'Email this user their credentials?',
+    'checkin_user_properties' => 'Prevziať všetky vlastnosti spojené s týmito používateľmi',
+    'remote_label'   => 'Toto je vzdialený používateľ',
+    'remote'   => 'Vzdialený',
+    'remote_help' => 'Toto môže byť užitočne v prípade ak potrebujete odfiltrovať vzdialených používateľov, ktorí nikdy alebo zriedkavo navštevujú fyzické lokality.',
+    'not_remote_label' => 'Toto nie je vzdialený používateľ',
+    'vip_label' => 'VIP používateľ',
+    'vip_help' => 'Toto môže byť užitočné k označeniu dôležitých osôb vo Vašej organizácií, ku ktorým sa má aplikovať odlišný prístup.',
+    'create_user' => 'Pridať používateľa',
+    'create_user_page_explanation' => 'Tieto údaje použijete pre prvé prihlásenie na stránku.',
+    'email_credentials' => 'Poslať prihlasovacie údaje',
+    'email_credentials_text' => 'Odošle moje prihlasovacie údaje na emailovú adresu uvedenú vyššie',
+    'next_save_user' => 'Ďalej: Uložiť používateľa',
+    'all_assigned_list_generation' => 'Generované dňa:',
+    'email_user_creds_on_create' => 'Zaslať tomuto používateľovi prihlasovacie údaje mailom?',
 ];
diff --git a/resources/lang/sk-SK/admin/users/message.php b/resources/lang/sk-SK/admin/users/message.php
index ea9c90bb8c..93d5b0aebf 100644
--- a/resources/lang/sk-SK/admin/users/message.php
+++ b/resources/lang/sk-SK/admin/users/message.php
@@ -6,17 +6,17 @@ return array(
     'declined'                  => 'Odmietnutie majetku bolo úspešné.',
     'bulk_manager_warn'	        => 'Používatelia boli úspešné aktualizovaný, avčak položka manažér nebola uložená, pretože zvolený manažér sa taktiež nachádzal v zoznam na úpravu a používatel nemôže byť sám sebe manazérom. Prosim zvoľte Vašich používateľov znovu s vynechaním manažéera.',
     'user_exists'               => 'Používateľ už existuje!',
-    'user_not_found'            => 'User does not exist.',
+    'user_not_found'            => 'Používateľ neexistuje alebo nemáte oprávnenie na jeho zobrazenie.',
     'user_login_required'       => 'Prihlasovacie meno je povinné',
-    'user_has_no_assets_assigned' => 'No assets currently assigned to user.',
+    'user_has_no_assets_assigned' => 'Momentálne nie je priradený používateľovi žiaden majetok.',
     'user_password_required'    => 'Heslo je povinné.',
     'insufficient_permissions'  => 'Nedostatočné oprávnenia.',
     'user_deleted_warning'      => 'Tento používateľ bol odstránený. Používateľa musíte obnoviť, ak ho chcete upraviť alebo mu priradiť majetok.',
     'ldap_not_configured'        => 'LDAP prepojenie nebolo nastavené pre túto inštaláciu.',
     'password_resets_sent'      => 'Vybraní používatelia sú aktivovaný. Na ich adresu bola zaslaný okaz na resetovanie hesla.',
-    'password_reset_sent'       => 'A password reset link has been sent to :email!',
-    'user_has_no_email'         => 'This user does not have an email address in their profile.',
-    'log_record_not_found'        => 'A matching log record for this user could not be found.',
+    'password_reset_sent'       => 'Odkaz na obnovenie hesla bol zaslaný na emailovú adresu :email!',
+    'user_has_no_email'         => 'Tento používateľ nemá zadanú emailovú adresu v profile.',
+    'log_record_not_found'        => 'Pre tohto používateľa sa nepodarilo nájsť odpovedajúci záznam v logoch.',
 
 
     'success' => array(
@@ -37,22 +37,23 @@ return array(
         'update' => 'Pri aktualizácií používateľa sa vyskytla chyba. Prosím skúste znovu.',
         'delete' => 'Pri odstraňovaní používateľa sa vyskytla chyba. Skúste prosím neskôr.',
         'delete_has_assets' => 'Tento používateľ ma priradené položky a nemôže byť odstránený.',
-        'delete_has_assets_var' => 'This user still has an asset assigned. Please check it in first.|This user still has :count assets assigned. Please check their assets in first.',
-        'delete_has_licenses_var' => 'This user still has a license seats assigned. Please check it in first.|This user still has :count license seats assigned. Please check them in first.',
-        'delete_has_accessories_var' => 'This user still has an accessory assigned. Please check it in first.|This user still has :count accessories assigned. Please check their assets in first.',
-        'delete_has_locations_var' => 'This user still manages a location. Please select another manager first.|This user still manages :count locations. Please select another manager first.',
-        'delete_has_users_var' => 'This user still manages another user. Please select another manager for that user first.|This user still manages :count users. Please select another manager for them first.',
+        'delete_has_assets_var' => 'Tento používateľ má stále priradený majetok. Prosím prevezmite najprv majetok.|Tento používateľ má stále priradených :count majetkov. Prosím prevezmite najprv všetok majetok.',
+        'delete_has_licenses_var' => 'Tento používateľ má stále priradené licenčné sloty. Prosím prevezmite ich najprv.|Tento používateľ má stále priradených :count licenčných slotov. Prosím prevezmite ich najprv.',
+        'delete_has_accessories_var' => 'Tento používateľ ma priradené príslušenstvo. Prosím prevezmite ho najprv.|Tento používateľ má stále priradených :count príslušenstiev. Prosím prevezmite ich najprv.',
+        'delete_has_locations_var' => 'Tento používateľ je správcom lokalite. Prosím zvoľte najprv iného správcu.|Tento používateľ stále manažuje :count lokalít. Prosím zvoľte najprv iných správcov.',
+        'delete_has_users_var' => 'Tento používateľ stále manažuje iného používateľa. Prosím nastavte najprv iného manažéra pre daného používateľa.|Tento používateľ stále manažuje :count používateľov. Prosím nastavte im najprv iného manažéra.',
         'unsuspend' => 'Pri pokuse o zrušenie pozastavenia používateľa nastala chyba. Skúste prosím znovu.',
         'import'    => 'Pri importovaní používateľov nastala chyba. Prosím skúste znovu.',
         'asset_already_accepted' => 'Tento majetok bol už prijatý.',
         'accept_or_decline' => 'Musíte prijať alebo odmietnuť tento majetok.',
-        'cannot_delete_yourself' => 'We would feel really bad if you deleted yourself, please reconsider.',
+        'cannot_delete_yourself' => 'Budeme veľmi smutní, ak zmažete samého seba. Prosím zvážte to.',
         'incorrect_user_accepted' => 'Majetok, ktorý sa pokúšate prijať, Vám nebol priradený.',
         'ldap_could_not_connect' => 'Nepodarilo sa pripojiť k LDAP serveru. Prosím skontrolujte nastavenia LDAP serveru v Admin nastavenia > LDAP/AD <br>Chyba LDAP serveru:',
         'ldap_could_not_bind' => 'Nepodarilo sa napojiť na LDAP server. Prosím skontrolujte nastavenia LDAP serveru v Admin nastavenia > LDAP/AD <br>Chyba LDAP serveru: ',
         'ldap_could_not_search' => 'Nepodarilo sa vyhladať v rámci LDAP serveru. Prosím skontrolujte nastavenia LDAP serveru v Admin nastavenia > LDAP/AD a všetky lokality ktoré môžu mať nastavené OU. <br>Chyba LDAP serveru:',
         'ldap_could_not_get_entries' => 'Nepodarilo sa získať záznamy z LDAP servera. Prosím skontrolujte nastavenia LDAP serveru v Admin nastavenia > LDAP/AD a všetky lokality ktoré môžu mať nastavené OU. <br>Chyba LDAP serveru:',
         'password_ldap' => 'Heslo pre tento účet je spravované cez LDAP/Active Directory. Pre zmneu hesla prosím kontaktujte Vaše IT oddelenie. ',
+        'multi_company_items_assigned' => 'Tento používateľ má priradené položky vo vlastníctve inej spoločnosti. Prosím prevezmite ich alebo upravte spoločnosť.'
     ),
 
     'deletefile' => array(
@@ -68,7 +69,7 @@ return array(
     ),
 
     'inventorynotification' => array(
-        'error'   => 'This user has no email set.',
-        'success' => 'The user has been notified about their current inventory.'
+        'error'   => 'Tento používateľ nemá nastavenú emailovú adresu.',
+        'success' => 'Používateľ bol notifikovaný o aktuálne priradenom majetku.'
     )
 );
\ No newline at end of file
diff --git a/resources/lang/sk-SK/admin/users/table.php b/resources/lang/sk-SK/admin/users/table.php
index d78480091d..9b744f0698 100644
--- a/resources/lang/sk-SK/admin/users/table.php
+++ b/resources/lang/sk-SK/admin/users/table.php
@@ -3,14 +3,14 @@
 return array(
     'activated'  			=> 'Aktívny',
     'allow'  				=> 'Povoliť',
-    'checkedout'  			=> 'Majetok',
+    'checkedout'  			=> 'Položky majetku',
     'created_at' 			=> 'Vytvorený',
     'createuser' 			=> 'Vytvoriť používateľa',
     'deny'  				=> 'Odmietnuť',
     'email'      			=> 'E-mail',
     'employee_num'      	=> 'Číslo zamestnanca',
     'first_name' 			=> 'Meno',
-    'groupnotes'			=> 'Select a group to assign to the user, remember that a user takes on the permissions of the group they are assigned. Use ctrl+click (or cmd+click on MacOS) to deselect groups.',
+    'groupnotes'			=> 'Vyberte skupinu na priradenie používateľovi, pamätajte že užívateľ zdedí oprávnenia priradenej skupiny. Použite ctrl+klik (alebo cmd+klik na MacOS) k odznačeniu skupín.',
     'id'         			=> 'Id',
     'inherit'  				=> 'Prevziať',
     'job' 					=> 'Názov pracovnej pozície',
@@ -20,18 +20,18 @@ return array(
     'lock_passwords'		=> 'Detaily prihlásenia nemôžu byť zmenené v tejto inštalácii.',
     'manager' 				=> 'Manažér',
     'managed_locations'     => 'Spravované lokality',
-    'managed_users'         => 'Managed Users',
+    'managed_users'         => 'Manažovaní používatelia',
     'name' 					=> 'Názov',
-    'nogroup'               => 'No groups have been created yet. To add one, visit: ',
+    'nogroup'               => 'Zatiaľ neboli vytvorené žiadne skupiny. K pridaniu prvej navštívte:',
     'notes'                 => 'Poznámky',
     'password_confirm' 		=> 'Potvrdiť heslo',
     'password' 				=> 'Heslo',
     'phone'  				=> 'Telefón',
     'show_current'          => 'Zobraziť aktuálnych používateľov',
-    'show_deleted'          => 'Zobraziť ostránených používateľov',
+    'show_deleted'          => 'Zobraziť zmazaných používateľov',
     'title' 				=> 'Titul',
 	'to_restore_them'		=> 'na obnovenie.',
-    'total_assets_cost'     => "Total Assets Cost",
+    'total_assets_cost'     => "Celkové náklady na majetok",
     'updateuser' 			=> 'Upraviť používateľa',
     'username' 				=> 'Používateľské meno',
 	'user_deleted_text' 	=> 'Tento používateľ bol označený ako odstránený.',
diff --git a/resources/lang/sk-SK/auth.php b/resources/lang/sk-SK/auth.php
index db310aa1bb..a7122e3caf 100644
--- a/resources/lang/sk-SK/auth.php
+++ b/resources/lang/sk-SK/auth.php
@@ -13,8 +13,8 @@ return array(
     |
     */
 
-    'failed' => 'These credentials do not match our records.',
-    'password' => 'The provided password is incorrect.',
-    'throttle' => 'Too many login attempts. Please try again in :seconds seconds.',
+    'failed' => 'Prihlasovacie údaje nezodpovedajú žiadnemu záznamu.',
+    'password' => 'Zadané heslo je nesprávne.',
+    'throttle' => 'Too many login attempts. Please try again in :minutes minute(s).',
 
 );
diff --git a/resources/lang/sk-SK/auth/general.php b/resources/lang/sk-SK/auth/general.php
index cd31a8cc2d..f9753d79af 100644
--- a/resources/lang/sk-SK/auth/general.php
+++ b/resources/lang/sk-SK/auth/general.php
@@ -12,7 +12,7 @@ return [
     'remember_me'                   => 'Zapamätať prihlásenie',
     'username_help_top'                 => 'Vložte Vaše <strong>užívateľské meno</strong> pre odoslanie odkazu emailom na resetovanie hesla.',
     'username_help_bottom'          => 'Vaše používateľské meno a e-mailová adresa <em>môžu</em> byť rovnaké, ale nemusia, v závislosti od vašej konfigurácie. Ak si nepamätáte svoje používateľské meno, obráťte sa na správcu. <br><br><strong>Používateľským menám bez priradenej e-mailovej adresy nebude odoslaný odkaz na obnovenie hesla.</strong> ',
-    'google_login'                  => 'Login with Google Workspace',
-    'google_login_failed'           => 'Google Login failed, please try again.',
+    'google_login'                  => 'Prihlásenie s Google Workspace',
+    'google_login_failed'           => 'Google prihlásenie zlyhalo, prosím skúste znovu.',
 ];
 
diff --git a/resources/lang/sk-SK/auth/message.php b/resources/lang/sk-SK/auth/message.php
index 588c9069ca..d61bafb34a 100644
--- a/resources/lang/sk-SK/auth/message.php
+++ b/resources/lang/sk-SK/auth/message.php
@@ -2,45 +2,43 @@
 
 return array(
 
-    'account_already_exists' => 'An account with the this email already exists.',
-    'account_not_found'      => 'The username or password is incorrect.',
-    'account_not_activated'  => 'This user account is not activated.',
-    'account_suspended'      => 'This user account is suspended.',
-    'account_banned'         => 'This user account is banned.',
-    'throttle'               => 'Too many failed login attempts. Please try again in :minutes minutes.',
+    'account_already_exists' => 'Účet s touto emailovou adresou už existuje.',
+    'account_not_found'      => 'Používateľské meno alebo heslo je nesprávne.',
+    'account_not_activated'  => 'Tento účet nie je aktivovaný.',
+    'account_suspended'      => 'Tento účet bol pozastavený.',
 
     'two_factor' => array(
-        'already_enrolled'      => 'Your device is already enrolled.',
-        'success'               => 'You have successfully logged in.',
-        'code_required'         => 'Two-factor code is required.',
-        'invalid_code'          => 'Two-factor code is invalid.',
-        'enter_two_factor_code' => 'Please enter your two-factor authentication code.',
-        'please_enroll'         => 'Please enroll a device in two-factor authentication.',
+        'already_enrolled'      => 'Vaše zariadenie bolo už bolo zapísané.',
+        'success'               => 'Úspešne ste sa prihlásili.',
+        'code_required'         => 'Dvojfaktorová autentifikácia je vyžadovaná.',
+        'invalid_code'          => 'Kód pre dvojfaktorovú autentifikáciu je neplatný.',
+        'enter_two_factor_code' => 'Prosím zadajte váš kód pre dvojfaktorovú autentifikáciu.',
+        'please_enroll'         => 'Prosím pridajte zariadenie pre dvojfaktorovú autentifikáciu.',
     ),
 
     'signin' => array(
-        'error'   => 'There was a problem while trying to log you in, please try again.',
-        'success' => 'You have successfully logged in.',
+        'error'   => 'Nastal problém pri pokuse o prihlásenie, prosím skúste znovu.',
+        'success' => 'Úspešne ste sa prihlásili.',
     ),
 
     'logout' => array(
-        'error'   => 'There was a problem while trying to log you out, please try again.',
-        'success' => 'You have successfully logged out.',
+        'error'   => 'Nastal problém pri pokuse o odhlásenie, prosím skúste znovu.',
+        'success' => 'Úspešne ste sa odhlásili.',
     ),
 
     'signup' => array(
-        'error'   => 'There was a problem while trying to create your account, please try again.',
-        'success' => 'Account sucessfully created.',
+        'error'   => 'Nastal problém pri vytvorení vášho účtu, prosím skúste znovu.',
+        'success' => 'Účet bol úspešne vytvorený.',
     ),
 
     'forgot-password' => array(
-        'error'   => 'There was a problem while trying to get a reset password code, please try again.',
-        'success' => 'If that email address exists in our system, a password recovery email has been sent.',
+        'error'   => 'Nastal problém pri pokuse o získanie kódu pre reset hesla, prosím skúste znovu.',
+        'success' => 'Ak uvedená emailová adresa existuje v našom systému, bude na ňu odoslaný email s inštrukciami pre obnovu hesla.',
     ),
 
     'forgot-password-confirm' => array(
-        'error'   => 'There was a problem while trying to reset your password, please try again.',
-        'success' => 'Your password has been successfully reset.',
+        'error'   => 'Nastal problém pri pokuse o obnovu hesla, prosím skúste znovu.',
+        'success' => 'Vaše heslo bolo úspešne obnovené.',
     ),
 
 
diff --git a/resources/lang/sk-SK/button.php b/resources/lang/sk-SK/button.php
index f22349b2c1..e5d24c49c2 100644
--- a/resources/lang/sk-SK/button.php
+++ b/resources/lang/sk-SK/button.php
@@ -4,9 +4,10 @@ return [
     'actions' 	                => 'Akcie',
     'add'    	                => 'Pridať nové',
     'cancel'                    => 'Zrušiť',
-    'checkin_and_delete'  	    => 'Checkin All / Delete User',
-    'delete'  	                => 'Odstrániť',
+    'checkin_and_delete'  	    => 'Prijať všetko / Zmazať používateľa',
+    'delete'  	                => 'Vymazať',
     'edit'    	                => 'Upraviť',
+    'clone'    	                => 'Duplikovať',
     'restore' 	                => 'Obnoviť',
     'remove'                    => 'Odstrániť',
     'request'                   => 'Požiadavka',
@@ -16,9 +17,18 @@ return [
     'select_files'				=> 'Vybrať súbory...',
     'generate_labels'           => '{1} Generovať štítok|[2,*] Generovať štítky',
     'send_password_link'        => 'Odoslať odkaz na zmenu hesla',
-    'go'                        => 'Go',
+    'go'                        => 'Spustiť',
     'bulk_actions'              => 'Hromadné akcie',
     'add_maintenance'           => 'Pridať údržbu',
-    'append'                    => 'Append',
+    'append'                    => 'Pripojiť',
     'new'                       => 'Nový',
+    'var' => [
+        'clone'     => 'Duplikovať :item_type',
+        'edit'      => 'Upraviť :item_type',
+        'delete'    => 'Zmazať :item_type',
+        'restore'   => 'Obnoviť :item_type',
+        'create'    => 'Vytvoriť nový :item_type',
+        'checkout'  => 'Odovzdať :item_type',
+        'checkin'   => 'Prevziať :item_type',
+    ]
 ];
diff --git a/resources/lang/sk-SK/general.php b/resources/lang/sk-SK/general.php
index 6882fd3cd9..e9289ad2fe 100644
--- a/resources/lang/sk-SK/general.php
+++ b/resources/lang/sk-SK/general.php
@@ -1,369 +1,376 @@
 <?php
 
 return [
-    '2FA_reset'             => '2FA reset',
-    'accessories'			=> 'Accessories',
-    'activated'			    => 'Activated',
-    'accepted_date'         => 'Date Accepted',
-    'accessory'				=> 'Accessory',
-    'accessory_report'		=> 'Accessory Report',
+    '2FA_reset'             => 'Reset 2FA',
+    'accessories'			=> 'Príslušenstvo',
+    'activated'			    => 'Aktivovaný',
+    'accepted_date'         => 'Dátum prijatia',
+    'accessory'				=> 'Príslušenstvo',
+    'accessory_report'		=> 'Report píslušenstva',
     'action'                => 'Akcia',
-    'activity_report'		=> 'Activity Report',
+    'activity_report'		=> 'Report aktivity',
     'address'				=> 'Adresa',
-    'admin'					=> 'Admin',
-    'admin_tooltip'			=> 'This user has admin privileges',
-    'superuser'				=> 'Superuser',
-    'superuser_tooltip'		=> 'This user has superuser privileges',
-    'administrator'			=> 'Administrator',
-    'add_seats'             => 'Added seats',
-    'age'                   => "Age",
-    'all_assets'			=> 'All Assets',
-    'all'       			=> 'All',
+    'admin'					=> 'Admin nastavenia',
+    'admin_tooltip'			=> 'Tento používateľ má admin oprávnenia',
+    'superuser'				=> 'Superadmin',
+    'superuser_tooltip'		=> 'Tento používateľ má superadmin oprávnenia',
+    'administrator'			=> 'Administrátor',
+    'add_seats'             => 'Pridané licenčné sloty',
+    'age'                   => "Vek",
+    'all_assets'			=> 'Všetky zariadenia',
+    'all'       			=> 'Všetky',
     'archived'              => 'Archivované',
     'asset_models'			=> 'Typy majetku',
     'asset_model'			=> 'Model',
     'asset'					=> 'Majetok',
-    'asset_report'          => 'Asset Report',
+    'asset_previous'        => 'Asset (Previously Assigned)',
+    'asset_report'          => 'Report majetku',
     'asset_tag'				=> 'Označenie majetku',
-    'asset_tags'            => 'Asset Tags',
-    'assets_available'		=> 'Assets available',
-    'accept_assets'         => 'Accept Assets :name',
-    'accept_assets_menu'    => 'Accept Assets',
+    'asset_tags'            => 'Označenia majetku',
+    'assets_available'		=> 'Dostupné zariadenia',
+    'accept_assets'         => 'Potvrdiť prijatie majetku :name',
+    'accept_assets_menu'    => 'Prijať majetok',
+    'accept_item'           => 'Accept Item',
     'audit'				    => 'Audit',
-    'audit_report'			=> 'Audit Log',
+    'audits'				=> 'Audits',
+    'audit_report'			=> 'Záznam z auditu',
     'assets'				=> 'Majetok',
-    'assets_audited'        => 'assets audited',
-    'assets_checked_in_count'     => 'assets checked in',
-    'assets_checked_out_count'     => 'assets checked out',
-    'asset_deleted_warning'     => 'This asset has been deleted. You must restore it before you can assign it to someone.',
-    'assigned_date'         => 'Date Assigned',
+    'assets_audited'        => 'auditovaný majetok',
+    'assets_checked_in_count'     => 'majetok prijatý',
+    'assets_checked_out_count'     => 'majetok odovzdaný',
+    'asset_deleted_warning'     => 'Tento majetok bol odstránený. Musíte ho obnoviť predtým ako ho bude možné opätovne niekomu priradiť.',
+    'assigned_date'         => 'Dátum pridelenia',
     'assigned_to'           => 'Pridelené k :name',
-    'assignee'              => 'Assigned to',
-    'avatar_delete'         => 'Delete Avatar',
-    'avatar_upload'         => 'Upload Avatar',
-    'back'      			=> 'Back',
-    'bad_data'      		=> 'Nothing found. Maybe bad data?',
-    'bulkaudit'             => 'Bulk Audit',
-    'bulkaudit_status'      => 'Audit Status',
-    'bulk_checkout'  		=> 'Bulk Checkout',
+    'assignee'              => 'Pridelené',
+    'avatar_delete'         => 'Vymazať avatara',
+    'avatar_upload'         => 'Nahrať avatara',
+    'back'      			=> 'Späť',
+    'bad_data'      		=> 'Nič nebolo nájdené. Možno zadávate zlé dáta?',
+    'bulkaudit'             => 'Hromadný audit',
+    'bulkaudit_status'      => 'Stav auditu',
+    'bulk_checkout'  		=> 'Hromadné odovzdanie',
     'bulk_edit'             => 'Hromadná editácia',
     'bulk_delete'           => 'Hromadné vymazanie',
     'bulk_actions'          => 'Hromadné akcie',
-    'bulk_checkin_delete'   => 'Bulk Checkin / Delete Users',
+    'bulk_checkin_delete'   => 'Hromadné prevzatie / Odstránenie užívateľov',
     'byod'                  => 'BYOD',
-    'byod_help'             => 'This device is owned by the user',
-    'bystatus'              => 'by Status',
+    'byod_help'             => 'Toto zariadenie je vlastnené používateľom',
+    'bystatus'              => 'podľa Stavu',
     'cancel'  				=> 'Zrušiť',
-    'categories'			=> 'Categories',
+    'categories'			=> 'Kategórie',
     'category'				=> 'Kategória',
     'change' 		        => 'Vsetup/Výstup',
-    'changeemail'  			=> 'Change Email Address',
-    'changepassword'  		=> 'Change Password',
-    'checkin'  				=> 'Checkin',
-    'checkin_from'  		=> 'Checkin from',
-    'checkout'  			=> 'Checkout',
-    'checkouts_count'       => 'Checkouts',
-    'checkins_count'        => 'Checkins',
-    'user_requests_count'   => 'Requests',
+    'changeemail'  			=> 'Zmeniť emailovú adresu',
+    'changepassword'  		=> 'Zmena hesla',
+    'checkin'  				=> 'Prevziať',
+    'checkin_from'  		=> 'Prevziať od',
+    'checkin_note'  		=> 'Checkin Note',
+    'checkout_note'  		=> 'Checkout Note',
+    'checkout'  			=> 'Odovzdať',
+    'checkouts_count'       => 'Odovzdania',
+    'checkins_count'        => 'Prevzatia',
+    'checkin_and_delete'  	=> 'Prevziať a vymazať',
+    'user_requests_count'   => 'Požidavky',
     'city'  				=> 'Mesto',
-    'click_here'			=> 'Click here',
-    'clear_selection'		=> 'Clear Selection',
-    'companies'			    => 'Companies',
-    'company'				=> 'Company',
-    'component'			    => 'Component',
-    'components'			=> 'Components',
-    'complete'				=> 'Complete',
-    'consumable'			=> 'Consumable',
-    'consumables'			=> 'Consumables',
+    'click_here'			=> 'Klikni sem',
+    'clear_selection'		=> 'Zrušiť výber',
+    'companies'			    => 'Spoločnosti',
+    'company'				=> 'Spoločnosť',
+    'component'			    => 'Komponent',
+    'components'			=> 'Komponenty',
+    'complete'				=> 'Dokončiť',
+    'consumable'			=> 'Spotrebný materiál',
+    'consumables'			=> 'Spotrebný materiál',
     'country'  				=> 'Krajina',
-    'could_not_restore'     => 'Error restoring :item_type: :error',
-    'not_deleted'           => 'The :item_type is not deleted so it cannot be restored',
-    'create'				=> 'Create New',
-    'created'               => 'Item Created',
-    'created_asset'			=> 'created asset',
+    'could_not_restore'     => 'Chyba pri obnove :item_type: :error',
+    'not_deleted'           => ':item_type nebola odstránená a preto nemôže byť obnovená',
+    'create'				=> 'Pridať',
+    'created'               => 'Položka pridaná',
+    'created_asset'			=> 'pridaný majetok',
     'created_at' 			=> 'Vytvorené',
     'created_by'            => 'Vytvoril',
-    'record_created' 		=> 'Record Created',
-    'updated_at' 			=> 'Updated at',
+    'record_created' 		=> 'Záznam vytvorený',
+    'updated_at' 			=> 'Aktualizované',
     'currency'  			=> '$', // this is deprecated
-    'current'  				=> 'Current',
+    'currency_text'  		=> 'Mena', //
+    'current'  				=> 'Aktuálne',
     'current_password'      => 'Aktuálne heslo',
     'customize_report'      => 'Prispôsobiť report',
-    'custom_report'         => 'Custom Asset Report',
-    'dashboard'				=> 'Dashboard',
-    'days'      			=> 'days',
-    'days_to_next_audit'    => 'Days to Next Audit',
+    'custom_report'         => 'Vlastný report majetku',
+    'dashboard'				=> 'Prehľad',
+    'data_source'           => 'Data Source',
+    'days'      			=> 'dni',
+    'days_to_next_audit'    => 'Do najbližšieho auditu',
     'date'					=> 'Dátum',
     'debug_warning'         => 'Upozornenie!',
-    'debug_warning_text'    => 'This application is running in production mode with debugging enabled. This can expose sensitive data if your application is accessible to the outside world. Disable debug mode by setting the <code>APP_DEBUG</code> value in your <code>.env</code> file to <code>false</code>.',
+    'debug_warning_text'    => 'Táto aplikácia beží v produkčnom režime s povoleným ladením. To môže odhaliť citlivé údaje, ak je vaša aplikácia dostupná z vonkajšieho sveta. Zakážte režim ladenia nastavením hodnoty <code>APP_DEBUG</code> v súbore <code>.env</code> na hodnotu <code>false</code>.',
     'delete'  				=> 'Odstrániť',
-    'delete_confirm'  		=> 'Are you sure you wish to delete :item?',
-    'delete_confirm_no_undo' => 'Are you sure you wish to delete :item? This can not be undone.',
-    'deleted'  				=> 'Deleted',
-    'delete_seats'  		=> 'Deleted Seats',
+    'delete_confirm'  		=> 'Ste si istý, že chcete odstrániť :item?',
+    'delete_confirm_no_undo' => 'Ste si istý, že chcete odstrániť :item? Táto akcia sa nedá vrátiť späť.',
+    'deleted'  				=> 'Odstránené',
+    'delete_seats'  		=> 'Odstránené licenčné miesta',
     'deletion_failed'       => 'Vymazanie zlyhalo',
-    'departments'           => 'Departments',
+    'departments'           => 'Oddelenia',
     'department'            => 'Oddelenie',
-    'deployed'				=> 'Deployed',
+    'deployed'				=> 'Odovzdané',
     'depreciation'			=> 'Odpisovanie',
-    'depreciations'         => 'Depreciations',
-    'depreciation_report'	=> 'Depreciation Report',
-    'details'               => 'Details',
-    'download'				=> 'Download',
-    'download_all'		    => 'Download All',
-    'editprofile'  			=> 'Edit Your Profile',
+    'depreciations'         => 'Odpisy',
+    'depreciation_report'	=> 'Report odpisov',
+    'details'               => 'Detaily',
+    'download'				=> 'Stiahnuť',
+    'download_all'		    => 'Stiahnuť všetko',
+    'editprofile'  			=> 'Upraviť profil',
     'eol'					=> 'EOL',
-    'email_domain'			=> 'Email Domain',
-    'email_format'			=> 'Email Format',
+    'email_domain'			=> 'Emailová doména',
     'employee_number'       => 'Číslo zamestnanca',
-    'email_domain_help'		=> 'This is used to generate email addresses when importing',
+    'email_domain_help'		=> 'Používa sa na generovanie emailovej adresy pri importe',
     'error'				    => 'Chyba',
-    'exclude_archived'      => 'Exclude Archived Assets',
-    'exclude_deleted'       => 'Exclude Deleted Assets',
+    'exclude_archived'      => 'Vylúčiť archivovaný majetok',
+    'exclude_deleted'       => 'Vylúčiť odstránený majetok',
     'example'				=> 'Príklad: ',
-    'filastname_format'			=> 'First Initial Last Name (jsmith@example.com)',
-    'firstname_lastname_format'	=> 'First Name Last Name (jane.smith@example.com)',
-    'firstname_lastname_underscore_format' => 'First Name Last Name (jane_smith@example.com)',
-    'lastnamefirstinitial_format' =>  'Last Name First Initial (smithj@example.com)',
-    'firstintial_dot_lastname_format' => 'First Initial Last Name (j.smith@example.com)',
-    'firstname_lastname_display'	=> 'First Name Last Name (Jane Smith)',
-    'lastname_firstname_display'	=> 'Last Name First Name (Smith Jane)',
-    'name_display_format'	=> 'Name Display Format',
-    'first'					=> 'First',
-    'firstnamelastname'     => 'First Name Last Name (janesmith@example.com)',
-    'lastname_firstinitial' => 'Last Name First Initial (smith_j@example.com)',
-    'firstinitial.lastname' => 'First Initial Last Name (j.smith@example.com)',
-    'firstnamelastinitial'  => 'First Name Last Initial (janes@example.com)',
-    'lastnamefirstname'      => 'Last Name First Name (smith.jane@example.com)',
-    'first_name'			=> 'Meno',
-    'first_name_format'		=> 'First Name (jane@example.com)',
-    'files'                 => 'Files',
+
+    'files'                 => 'Súbory',
     'file_name'				=> 'Súbor',
-    'file_type'             => 'File Type',
+    'file_type'             => 'Typ súboru',
     'filesize'              => 'Veľkosť súboru',
-    'file_uploads'			=> 'File Uploads',
+    'file_uploads'			=> 'Nahranie súborov',
     'file_upload'           => 'Nahratie súboru',
-    'generate'				=> 'Generate',
+    'generate'				=> 'Generovať',
     'generate_labels'       => 'Generovať štítky',
-    'github_markdown'      => 'This field accepts <a href="https://help.github.com/articles/github-flavored-markdown/">Github flavored markdown</a>.',
-    'groups'				=> 'Groups',
-    'gravatar_email'        => 'Gravatar Email Address',
+    'github_markdown'      => 'V tomto poli je možné použiť <a href="https://help.github.com/articles/github-flavored-markdown/">Github variantu markdownu</a>.',
+    'groups'				=> 'Skupiny',
+    'gravatar_email'        => 'Emailová adresa Gravatara',
     'gravatar_url'          => '<a href="http://gravatar.com"><small>Zmeniť avatar na Gravatar.com</small></a>.',
-    'history'  			    => 'History',
-    'history_for'  			=> 'History for',
+    'history'  			    => 'História',
+    'history_for'  			=> 'História užívateľa',
     'id'  					=> 'ID',
-    'image'                 => 'Image',
-    'image_delete'         	=> 'Delete Image',
-    'include_deleted'       => 'Include Deleted Assets',
-    'image_upload'         	=> 'Upload Image',
+    'image'                 => 'Obrázok',
+    'image_delete'         	=> 'Odstrániť obrázok',
+    'include_deleted'       => 'Zahrnúť odstránený majetok',
+    'image_upload'         	=> 'Nahrať obrázok',
     'filetypes_accepted_help'    => 'Akceptovaný typ súboru :types. Maximálna povolená veľkosť :size.|Akceptované typy súborov :types. Maximálna povolená veľkosť :size.',
     'filetypes_size_help'   => 'Maximálna povolená veľkosť :size.',
-    'image_filetypes_help'  => 'Accepted filetypes are jpg, webp, png, gif, svg, and avif. Max upload size allowed is :size.',
-    'unaccepted_image_type'  => 'This image file was not readable. Accepted filetypes are jpg, webp, png, gif, and svg. The mimetype of this file is: :mimetype.',
+    'image_filetypes_help'  => 'Povolené typy súborov sú jpg, webp, png, gif, svg, and avif. Maximálna veľkosť nahrávaného obrázku :size.',
+    'unaccepted_image_type'  => 'Obrázok nebol čitateľlný. Akceptované typy súborov sú jpg, webp, png, gif a svg. Nahratý obrázok je typu :mimetype.',
     'import'         	    => 'Import',
-    'import_this_file'      => 'Map fields and process this file',
-    'importing'         	=> 'Importing',
-    'importing_help'        => 'You can import assets, accessories, licenses, components, consumables, and users via CSV file. <br><br>The CSV should be comma-delimited and formatted with headers that match the ones in the <a href="https://snipe-it.readme.io/docs/importing" target="_new">sample CSVs in the documentation</a>.',
-    'import-history'        => 'Import History',
-    'asset_maintenance'        => 'Asset Maintenance',
-    'asset_maintenance_report' => 'Asset Maintenance Report',
-    'asset_maintenances'       => 'Asset Maintenances',
+    'import_this_file'      => 'Namapovať polia a spracovať tento súbor',
+    'importing'         	=> 'Importujem',
+    'importing_help'        => 'Môžete importovať majetok, príslušenstvo, licencie, komponenty, spotrebný materiál a používateľov cez CSV súbor. <br><br> CSV súbor musí používať ako oddelovač čiarku a obsahovať hlavičky v súlade s definíciou <a href="https://snipe-it.readme.io/docs/importing" target="_new">vzorového CSV uvedeného v dokumentácií</a>.',
+    'import-history'        => 'Importovať históriu',
+    'asset_maintenance'        => 'Opravy majetku',
+    'asset_maintenance_report' => 'Report opráv majetku',
+    'asset_maintenances'       => 'Záznamy o údržbe majetku',
     'item'  				=> 'Položka',
     'item_name'             => 'Názov položky',
-    'import_file'  			=> 'import CSV file',
-    'import_type'  			=> 'CSV import type',
-    'insufficient_permissions' => 'Insufficient permissions!',
-    'kits'       			=> 'Predefined Kits',
-    'language'				=> 'Language',
-    'last'					=> 'Last',
+    'import_file'  			=> 'importovať CSV súbor',
+    'import_type'  			=> 'Typ importu CSV',
+    'insufficient_permissions' => 'Nedostatočné oprávnenia!',
+    'kits'       			=> 'Predvolené sady',
+    'language'				=> 'Jazyk',
+    'last'					=> 'Posledné',
     'last_login'            => 'Posledné prihlásenie',
     'last_name'             => 'Priezvisko',
-    'license'				=> 'License',
-    'license_report'        => 'License Report',
-    'licenses_available'	=> 'Licenses available',
-    'licenses'				=> 'Licenses',
-    'list_all'				=> 'List All',
-    'loading'				=> 'Načítavanie... prosím čakajte....',
-    'lock_passwords'        => 'This field value will not be saved in a demo installation.',
-    'feature_disabled'      => 'This feature has been disabled for the demo installation.',
+    'firstname_lastname_display'	=> 'Meno Priezvisko (Jane Smith)',
+    'lastname_firstname_display'	=> 'Priezvisko Meno (Smith Jane)',
+    'name_display_format'	=> 'Formát zobrazenia mena',
+    'first'					=> 'Prvé',
+    'first_name'			=> 'Meno',
+    'license'				=> 'Licencia',
+    'license_report'        => 'Report licencií',
+    'licenses_available'	=> 'Dostupné licencie',
+    'licenses'				=> 'Licencie',
+    'list_all'				=> 'Zobraziť všetko',
+    'loading'				=> 'Načítavanie... prosím čakajte...',
+    'lock_passwords'        => 'Hodnota tohto poľa nebude uložená v demo verzii.',
+    'feature_disabled'      => 'Táto funkcionalita bola zakázaná v demo verzii.',
     'location'              => 'Lokalita',
-    'location_plural'        => 'Location|Locations',
+    'location_plural'        => 'Lokalita|Lokality',
     'locations'				=> 'Lokality',
-    'logo_size'				=> 'Square logos look best with Logo + Text. Logo maximum display size is 50px high x 500px wide.  ',
-    'logout'				=> 'Logout',
-    'lookup_by_tag'     => 'Lookup by Asset Tag',
-    'maintenances'          => 'Maintenances',
+    'logo_size'				=> 'Štvorcové logá vypadajú najlepšie s Logo + Text. Maximálna veľkosť loga je 50px na výšku x 500px na šírku.  ',
+    'logout'				=> 'Odhlásenie',
+    'lookup_by_tag'     => 'Hľadať podľa označenia majetku',
+    'maintenances'          => 'Opravy',
     'manage_api_keys'       => 'Spravovať API kľúče',
     'manufacturer'			=> 'Výrobca',
-    'manufacturers'			=> 'Manufacturers',
-    'markdown'				=> 'This field allows <a href="https://help.github.com/articles/github-flavored-markdown/">Github flavored markdown</a>.',
-    'min_amt'				=> 'Min. QTY',
+    'manufacturers'			=> 'Výrobcovia',
+    'markdown'				=> 'Toto pole podporuje <a href="https://help.github.com/articles/github-flavored-markdown/">Github štýl markdownu</a>.',
+    'min_amt'				=> 'Minimálne množstvo',
     'min_amt_help'          => 'Minimálny počet položiek, ktoré by mali byť dostupné pred spustením upozornenia. Nechajte minimálne množstvo prázdne, ak nechcete dostávať upozornenia na nízky inventár.',
     'model_no'				=> 'Číslo modelu',
     'months'				=> 'mesiace/ov',
     'moreinfo'				=> 'Viac info',
     'name'					=> 'Názov',
     'new_password'          => 'Nové Heslo',
-    'next'					=> 'Next',
-    'next_audit_date'		=> 'Next Audit Date',
-    'next_audit_date_help'  => 'If you use auditing in your organization, this is usually automatically calculated based on the asset&apos;s last audit date and audit frequency (in <code>Admin Settings &gt; Alerts</code>) and you can leave this blank. You can manually set this date here if you need to, but it must be later than the last audit date. ',
-    'audit_images_help'     => 'You can find audit images in the asset\'s history tab.',
-    'no_email'              => 'No email address associated with this user',
-    'last_audit'		    => 'Last Audit',
+    'next'					=> 'Ďalší',
+    'next_audit_date'		=> 'Dátum nasledujúceho auditu',
+    'next_audit_date_help'  => 'Ak používate auditovanie vo Vašej organizácií, toto je obvykle automaticky dopočítané na základe dátumu posledného auditu a frekvencie auditov (<code>Admin nastavenia &gt; Upozornenia</code>) a môžete ho ponechať prázdne. Ak potrebujete, možete tu zadať dátum ručne, musí byť ale neskorší ako dátum posledného auditu. ',
+    'audit_images_help'     => 'Obrázky auditov nájdete na záložke História.',
+    'no_email'              => 'K tomuto používateľovi nie je priradená žiadna e-mailová adresa',
+    'last_audit'		    => 'Posledný audit',
     'new'					=> 'nový!',
-    'no_depreciation'		=> 'No Depreciation',
-    'no_results'			=> 'No Results.',
+    'no_depreciation'		=> 'Žiadne odpisovanie',
+    'no_results'			=> 'Žiadne výsledky.',
     'no'  					=> 'Nie',
     'notes'  				=> 'Poznámky',
+    'note_added'            => 'Poznámka pridaná',
+    'options'				=> 'Options',
+    'preview'				=> 'Preview',
+    'add_note'              => 'Pridať poznámku',
+    'note_edited'            => 'Poznámka upravená',
+    'edit_note'              => 'Upraviť poznámku',
+    'note_deleted'            => 'Poznámka zmazaná',
+    'delete_note'              => 'Zmazať poznámku',
     'order_number'          => 'Číslo objednávky',
-    'only_deleted'          => 'Only Deleted Assets',
-    'page_menu'				=> 'Showing _MENU_ items',
-    'pagination_info'		=> 'Showing _START_ to _END_ of _TOTAL_ items',
+    'only_deleted'          => 'Iba odstránený majetok',
+    'page_menu'				=> 'Zobrazené _MENU_ položky',
+    'pagination_info'		=> 'Zobrazené _START_ do _END_ z _TOTAL_ položiek',
     'pending'				=> 'Čakajúce',
-    'people'				=> 'People',
+    'people'				=> 'Používatelia',
     'per_page'				=> 'Výsledkov na stránku',
-    'previous'				=> 'Previous',
-    'processing'			=> 'Processing',
-    'profile'				=> 'Your profile',
+    'previous'				=> 'Predchádzajúce',
+    'processing'			=> 'Spracovávam',
+    'profile'				=> 'Váš profil',
     'purchase_cost'                              => 'Kúpna cena',
     'purchase_date'         => 'Dátum nákupu',
-    'qty'		            => 'QTY',
-    'quantity'		        => 'Quantity',
-    'quantity_minimum'      => 'You have :count items below or almost below minimum quantity levels',
-    'quickscan_checkin'  	=> 'Quick Scan Checkin',
-    'quickscan_checkin_status'  	=> 'Checkin Status',
-    'ready_to_deploy'		=> 'Ready to Deploy',
-    'recent_activity'		=> 'Recent Activity',
-    'remaining'             => 'Remaining',
-    'remove_company'        => 'Remove Company Association',
-    'reports'				=> 'Reports',
-    'restored'				=> 'restored',
+    'qty'		            => 'Množstvo',
+    'quantity'		        => 'Množstvo',
+    'quantity_minimum'      => 'Máte jednu položku pod alebo takmer na minimálnom množstve|Máte :count položiek pod alebo takmer na minimálnom množstve',
+    'quickscan_checkin'  	=> 'Rýchle skenovania prevzatých zariadení',
+    'quickscan_checkin_status'  	=> 'Stav prijatia',
+    'ready_to_deploy'		=> 'Pripravené na odovzdanie',
+    'recent_activity'		=> 'Posledná aktivita',
+    'remaining'             => 'Zostavajúce',
+    'remove_company'        => 'Odstrániť priradenie spoločnosti',
+    'reports'				=> 'Reporty',
+    'restored'				=> 'obnovené',
     'restore'				=> 'Obnoviť',
-    'requestable_models'    => 'Requestable Models',
-    'requestable_items'     => 'Requestable Items',
+    'requestable_models'    => 'Vyžiadateľné modely',
+    'requestable_items'     => 'Vyžiadateľné položky',
     'requested'				=> 'Vyžiadané',
-    'requested_date'        => 'Requested Date',
-    'requested_assets'      => 'Requested Assets',
-    'requested_assets_menu' => 'Requested Assets',
-    'request_canceled'      => 'Request Canceled',
-    'request_item'          => 'Request this item',
-    'external_link_tooltip' => 'External link to',
+    'requested_date'        => 'Dátum vyžiadania',
+    'requested_assets'      => 'Vyžiadaný majetok',
+    'requested_assets_menu' => 'Vyžiadaný majetok',
+    'request_canceled'      => 'Požiadavka zrušená',
+    'request_item'          => 'Požiadať o túto položku',
+    'external_link_tooltip' => 'Externé odkazy',
     'save'  				=> 'Uložiť',
-    'select_var'            => 'Select :thing... ', // this will eventually replace all of our other selects
-    'select'				=> 'Select',
+    'select_var'            => 'Vybrať :thing... ', // this will eventually replace all of our other selects
+    'select'				=> 'Vybrať',
     'select_all'            => 'Vybrať všetko',
-    'search'				=> 'Search',
-    'select_category'       => 'Select a Category',
-    'select_datasource' => 'Select a Datasource',
-    'select_department'     => 'Select a Department',
-    'select_depreciation'	=> 'Select a Depreciation Type',
-    'select_location'		=> 'Select a Location',
-    'select_manufacturer'	=> 'Select a Manufacturer',
-    'select_model'			=> 'Select a Model',
-    'select_supplier'		=> 'Select a Supplier',
-    'select_user'			=> 'Select a User',
-    'select_date'			=> 'Select Date (YYYY-MM-DD)',
-    'select_statuslabel'	=> 'Select Status',
-    'select_company'    	=> 'Select Company',
-    'select_asset'    		=> 'Select Asset',
+    'search'				=> 'Hľadať',
+    'select_category'       => 'Vybrať kategóriu',
+    'select_datasource' => 'Vybrať zdroj dát',
+    'select_department'     => 'Vybrať oddelenie',
+    'select_depreciation'	=> 'Vybrať typ odpisov',
+    'select_location'		=> 'Vybrať lokalitu',
+    'select_manufacturer'	=> 'Vybrať výrobcu',
+    'select_model'			=> 'Vybrať model',
+    'select_supplier'		=> 'Vybrať dodávateľa',
+    'select_user'			=> 'Vybrať používateľa',
+    'select_date'			=> 'Zvoliť dátum (YYYY-MM-DD)',
+    'select_statuslabel'	=> 'Vybrať stav',
+    'select_company'    	=> 'Vybrať spoločnosť',
+    'select_asset'    		=> 'Vybrať majetok',
     'settings'				=> 'Nastavenia',
-    'show_deleted'  		=> 'Show Deleted',
-    'show_current'  		=> 'Show Current',
-    'sign_in'				=> 'Sign in',
-    'signature'             => 'Signature',
+    'show_deleted'  		=> 'Zobraziť odstránené',
+    'show_current'  		=> 'Zobraziť aktuálne',
+    'sign_in'				=> 'Prihlásiť sa',
+    'signature'             => 'Popdis',
     'signed_off_by'         => 'Podpísal',
-    'skin'       			=> 'Skin',
-    'webhook_msg_note'        => 'A notification will be sent via webhook',
-    'webhook_test_msg'        => 'Oh hai! Looks like your :app integration with Snipe-IT is working!',
-    'some_features_disabled' => 'DEMO MODE: Some features are disabled for this installation.',
+    'skin'       			=> 'Vzhľad',
+    'webhook_msg_note'        => 'Notifikácia bude poslaná zavolaním webhooku',
+    'webhook_test_msg'        => 'Paráda! Vypadá to tak že :app integrácia spolupracuje so Snipe-IT!',
+    'some_features_disabled' => 'DEMO MÓD: Niektoré funkcionality sú zakázané.',
     'site_name'				=> 'Názov stránky',
     'state'  				=> 'Štát',
     'status_labels'			=> 'Stavy',
+    'status_label'			=> 'Stav',
     'status'    			=> 'Stav',
     'accept_eula'           => 'Licenčné podmienky',
-    'supplier'              => 'Supplier',
+    'show_or_hide_eulas' => 'Zobraziť/Skryť EULA',
+    'supplier'              => 'Dodávateľ',
     'suppliers'  			=> 'Dodávatelia',
-    'sure_to_delete'        => 'Are you sure you wish to delete',
-    'sure_to_delete_var'    => 'Are you sure you wish to delete :item?',
-    'delete_what'           => 'Delete :item',
+    'sure_to_delete'        => 'Ste si istí, že chcete odstrániť',
+    'sure_to_delete_var'    => 'Ste si istý, že chcete odstrániť :item?',
+    'delete_what'           => 'Odstrániť :item',
     'submit'				=> 'Odoslať',
-    'target'                => 'Target',
-    'time_and_date_display' => 'Time and Date Display',
-    'total_assets'			=> 'total assets',
-    'total_licenses'		=> 'total licenses',
-    'total_accessories'		=> 'total accessories',
-    'total_consumables'		=> 'total consumables',
-    'type'  				=> 'Type',
-    'undeployable'			=> 'Un-deployable',
-    'unknown_admin'			=> 'Unknown Admin',
-    'username_format'		=> 'Username Format',
+    'target'                => 'Cieľ',
+    'time_and_date_display' => 'Zobrazenie dátumu a času',
+    'total_assets'			=> 'celkom zariadení',
+    'total_licenses'		=> 'celkom licencií',
+    'total_accessories'		=> 'celkom príslušenstva',
+    'total_consumables'		=> 'celkom spotrebného materiálu',
+    'type'  				=> 'Typ',
+    'undeployable'			=> 'Neodovzdateľné',
+    'unknown_admin'			=> 'Neznámy admin',
     'username'              => 'Používateľské meno',
-    'update'                => 'Update',
-    'upload_filetypes_help'      => 'Allowed filetypes are png, gif, jpg, jpeg, doc, docx, pdf, xls, xlsx, txt, lic, xml, zip, rtf and rar. Max upload size allowed is :size.',
-    'uploaded'              => 'Uploaded',
-    'user'					=> 'User',
-    'accepted'			    => 'accepted',
-    'declined'			    => 'declined',
-    'declined_note'         => 'Declined Notes',
-    'unassigned'            => 'Unassigned',
-    'unaccepted_asset_report' => 'Unaccepted Assets',
-    'users'                 => 'Users',
-    'viewall'				=> 'View All',
-    'viewassets'  			=> 'View Assigned Assets',
-    'viewassetsfor'         => 'View Assets for :name',
-    'website'               => 'Website',
-    'welcome'				=> 'Welcome, :name',
+    'update'                => 'Aktualizovať',
+    'updating_item' => 'Aktualizujem :item',
+    'upload_filetypes_help'      => 'Povolené typy súborov sú png, gif, jpg, jpeg, doc, docx, pdf, xls, xlsx, txt, lic, xml, zip, rtf and rar. Maximálna povolená veľkosť :size.',
+    'uploaded'              => 'Odoslané',
+    'user'					=> 'Používateľ',
+    'accepted'			    => 'akceptované',
+    'declined'			    => 'zamietnuté',
+    'declined_note'         => 'Poznámky k zamietnutiu',
+    'unassigned'            => 'Nepriradené',
+    'unaccepted_asset_report' => 'Nepotvrdené majetky',
+    'users'                 => 'Používatelia',
+    'viewall'				=> 'Zobraziť všetko',
+    'viewassets'  			=> 'Zobraziť priradený majetok',
+    'viewassetsfor'         => 'Zobraziť majetok pre :name',
+    'website'               => 'Webstránka',
+    'welcome'				=> 'Vitaj, :name',
     'years'					=> 'roky/ov',
     'yes' 					=> 'Áno',
-    'zip'  					=> 'Zip',
-    'noimage'				=> 'No image uploaded or image not found.',
-    'file_does_not_exist'   => 'The requested file does not exist on the server.',
-    'file_upload_success'   => 'File upload success!',
-    'no_files_uploaded'     => 'File upload success!',
-    'token_expired'         => 'Your form session has expired. Please try again.',
-    'login_enabled'         => 'Login Enabled',
-    'audit_due'             => 'Due for Audit',
-    'audit_due_days'        => 'Assets Due for Audit Within :days Day|Assets Due for Audit Within :days Days',
-    'checkin_due'           => 'Due for Checkin',
-    'checkin_overdue'       => 'Overdue for Checkin',
-    'checkin_due_days'      => 'Assets Due for Checkin Within :days Day|Assets Due for Checkin Within :days Days',
-    'audit_overdue'         => 'Overdue for Audit',
-    'accept'                => 'Accept :asset',
-    'i_accept'              => 'I accept',
-    'i_decline'             => 'I decline',
+    'zip'  					=> 'PSČ',
+    'noimage'				=> 'Obrázok nebol nahraný alebo sa nenašiel.',
+    'file_does_not_exist'   => 'Požadovaný súbor neexistuje.',
+    'file_upload_success'   => 'Súbor bol úspešne nahraný!',
+    'no_files_uploaded'     => 'Súbor bol úspešne nahraný!',
+    'token_expired'         => 'Platnosť relácie vypršala. Prosím skúste to znovu.',
+    'login_enabled'         => 'Prihlásenie povolené',
+    'audit_due'             => 'K inventúre',
+    'audit_due_days'        => '{}Assets Due or Overdue for Audit|[1]Assets Due or Overdue for Audit Within a Day|[2,*]Assets Due or Overdue for Audit Within :days Days',
+    'checkin_due'           => 'Do prevzatia',
+    'checkin_overdue'       => 'Po termíne prevzatia',
+    'checkin_due_days'      => '{}Due for Checkin|[1]Assets Due for Checkin Within :days Day|[2,*]Assets Due for Checkin Within :days Days',
+    'audit_overdue'         => 'Po termíne na inventúru',
+    'accept'                => 'Prijať :asset',
+    'i_accept'              => 'Príjmam',
+    'i_decline'             => 'Odmietam',
     'accept_decline'        => 'Prijať/Odmietnuť',
-    'sign_tos'              => 'Sign below to indicate that you agree to the terms of service:',
-    'clear_signature'       => 'Clear Signature',
-    'show_help'             => 'Show help',
-    'hide_help'             => 'Hide help',
+    'sign_tos'              => 'Podpísaním nižšie akceptujete podmienky služby:',
+    'clear_signature'       => 'Vymazať podpis',
+    'show_help'             => 'Zobraziť pomoc',
+    'hide_help'             => 'Skyť pomoc',
     'view_all'              => 'zobraziť všetko',
     'hide_deleted'          => 'Skryť zmazané',
     'email'                 => 'E-mail',
     'do_not_change'         => 'Nemeniť',
-    'bug_report'            => 'Nahlásiť chybu',
+    'bug_report'            => 'Nahlásiť problém',
     'user_manual'           => 'Užívateľský manuál',
     'setup_step_1'          => 'Krok 1',
     'setup_step_2'          => 'Krok 2',
     'setup_step_3'          => 'Krok 3',
     'setup_step_4'          => 'Krok 4',
     'setup_config_check'    => 'Kontrola konfigurácie',
-    'setup_create_database' => 'Vytvoriť databázové tabuľky',
-    'setup_create_admin'    => 'Vytvoriť admin užívateľa',
+    'setup_create_database' => 'Vytvoriť tabuľky v databáze',
+    'setup_create_admin'    => 'Vytvoriť admin používateľa',
     'setup_done'            => 'Hotovo!',
-    'bulk_edit_about_to'    => 'You are about to edit the following: ',
+    'bulk_edit_about_to'    => 'Chystáte sa upraviť nasledovné: ',
     'checked_out'           => 'Odovzdané',
-    'checked_out_to'        => 'Checked out to',
+    'checked_out_to'        => 'Odovzdané',
     'fields'                => 'Polia',
-    'last_checkout'         => 'Last Checkout',
-    'due_to_checkin'        => 'The following :count items are due to be checked in soon:',
+    'last_checkout'         => 'Naposledy odovzdané',
+    'due_to_checkin'        => 'Nasledovných :count položiek čaká na prevzatie v krátkom čase:',
     'expected_checkin'      => 'Očakávaný dátum prijatia',
-    'reminder_checked_out_items' => 'This is a reminder of the items currently checked out to you. If you feel this list is inaccurate (something is missing, or something appears here that you believe you never received), please email :reply_to_name at :reply_to_address.',
+    'reminder_checked_out_items' => 'Toto je pripomienka položiek, ktoré Vám boli odovzdané. Ak sa domnievate, že niečo nie je správne (niečo chýba alebo sa zobrazuje niečo, čo ste neprevzali), napíšte prosím :reply_to_name na :reply_to_address.',
     'changed'               => 'Zmenené',
-    'to'                    => 'To',
-    'report_fields_info'    => '<p>Select the fields you would like to include in your custom report, and click Generate. The file (custom-asset-report-YYYY-mm-dd.csv) will download automatically, and you can open it in Excel.</p>
-            <p>If you would like to export only certain assets, use the options below to fine-tune your results.</p>',
+    'to'                    => 'Pre',
+    'report_fields_info'    => '<p>Vyberte pole, ktoré chcete zahrnúť do vlastnej zostavy a kliknite na tlačidlo Generovať. Súbor (custom-asset-report-YYYY-mm-dd.csv) bude automaticky sitahnutý a môžete ho otvoriť v Exceli.</p>
+            <p>Ak chcete exportovať iba niektoré aktíva, použite nižšie uvedeneé možnosti pre úpravu výsledkov.</p>',
     'range'                 => 'Rozsah',
-    'bom_remark'            => 'Add a BOM (byte-order mark) to this CSV',
+    'bom_remark'            => 'Pridať BOM (byte-order mark) do tohto CSV',
     'improvements'          => 'Vylepšenia',
     'information'           => 'Informácie',
     'permissions'           => 'Oprávnenia',
@@ -372,183 +379,251 @@ return [
     'ldap_sync'             => 'LDAP synchronizácia',
     'ldap_user_sync'        => 'LDAP užívateľská synchronizácia',
     'synchronize'           => 'Synchronizovať',
-    'sync_results'          => 'Synchronization Results',
+    'sync_results'          => 'Výsledky synchronizácie',
     'license_serial'        => 'Sériové číslo/Produktový kľúč',
-    'invalid_category'      => 'Invalid or missing category',
-    'invalid_item_category_single' => 'Invalid or missing :type category. Please update the category of this :type to include a valid category before checking out.',
+    'invalid_category'      => 'Neplatná alebo chýbajúca kategória',
+    'invalid_item_category_single' => 'Neplatná alebo chýbajúca :type kategória. Prosím aktualizujte kategóriu tohto :type tak, aby zahrňovala platnú kategóriu pred zaškrtnutím.',
     'dashboard_info'        => 'Toto je Vaša nástenka. Je ich veľa podobných, ale toto táto konkrétna je Vaša.',
     '60_percent_warning'    => '60% hotové (pozor)',
-    'dashboard_empty'       => 'It looks like you have not added anything yet, so we do not have anything awesome to display. Get started by adding some assets, accessories, consumables, or licenses now!',
+    'dashboard_empty'       => 'Zdá sa, že ste ešte nič nepridali, takže nemáme nič úžastného čo by sme Vám ukázali. Začnite pridaním prvých položiek!',
     'new_asset'             => 'Nový asset/majetok',
     'new_license'           => 'Nová licencia',
     'new_accessory'         => 'Nové príslušenstvo',
     'new_consumable'        => 'Nový spotrebný materiál',
-    'collapse'              => 'Collapse',
+    'new_component'         => 'New Component',
+    'new_user'              => 'New User',
+    'collapse'              => 'Zbaliť',
     'assigned'              => 'Priradené',
-    'asset_count'           => 'Asset Count',
-    'accessories_count'     => 'Accessories Count',
-    'consumables_count'     => 'Consumables Count',
-    'components_count'      => 'Components Count',
-    'licenses_count'        => 'Licenses Count',
+    'asset_count'           => 'Počet majetkov',
+    'accessories_count'     => 'Počet príslušenstva',
+    'consumables_count'     => 'Počet spotrebných materiálov',
+    'components_count'      => 'Počet komponentov',
+    'licenses_count'        => 'Počet licencií',
     'notification_error'    => 'Chyba',
-    'notification_error_hint' => 'Please check the form below for errors',
-    'notification_bulk_error_hint' => 'The following fields had validation errors and were not edited:',
-    'notification_success'  => 'Success',
+    'notification_error_hint' => 'Prosím overte chyby vo formulári',
+    'notification_bulk_error_hint' => 'Nasledujúce položky obsahujú chyby a neboli editované:',
+    'notification_success'  => 'Hotovo',
     'notification_warning'   => 'Upozornenie',
     'notification_info'      => 'Info',
-    'asset_information'     => 'Asset Information',
-    'model_name'            => 'Model Name',
+    'asset_information'     => 'Informácie o majetku',
+    'model_name'            => 'Názov modelu',
     'asset_name'            => 'Názov asetu',
-    'consumable_information' => 'Consumable Information:',
-    'consumable_name'       => 'Consumable Name:',
-    'accessory_information' => 'Accessory Information:',
+    'consumable_information' => 'Spotrebný materiál - informácie:',
+    'consumable_name'       => 'Spotrebný materiál - názov:',
+    'accessory_information' => 'Príslušenstvo - informácie:',
     'accessory_name'       => 'Názov príslušenstva:',
     'clone_item'            => 'Duplikovať položku',
-    'checkout_tooltip' => 'Check this item out',
-    'checkin_tooltip' => 'Check this item in so that it is available for re-issue, re-imaging, etc',
-    'checkout_user_tooltip' => 'Check this item out to a user',
-    'checkin_to_diff_location' => 'You can choose to check this asset in to a location other than this asset\'s default location of :default_location if one is set',
+    'checkout_tooltip' => 'Odovzdať túto položku',
+    'checkin_tooltip' => 'Prevziať túto položku tak, aby bola dostupná pre opätovné vydanie, zobrazenie, atď.',
+    'checkout_user_tooltip' => 'Odovzdať túto položku používateľovi',
+    'checkin_to_diff_location' => 'Môžete sa rozhodnúť, že tento majetok zaradíte to inej lokality ako je predvolená lokalita tohto majetku :default_location, ak je nastavená',
     'maintenance_mode'      => 'Služba je dočasne nedostupná pre aktualizácie systému. Skúste to neskôr.',
     'maintenance_mode_title' => 'Systém je dočasne nedostupný',
     'ldap_import'           => 'Používateľské heslo by nemalo spravovať LDAP. (Umožni Vám to odosielať žiadosti o zabudnuté heslo.)',
-    'purge_not_allowed'     => 'Purging deleted data has been disabled in the .env file. Contact support or your systems administrator.',
-    'backup_delete_not_allowed'     => 'Deleting backups has been disabled in the .env file. Contact support or your systems administrator.',
-    'additional_files'           => 'Additional Files',
-    'shitty_browser'        => 'No signature detected. If you are using an older browser, please use a more modern browser to complete your asset acceptance.',
-    'bulk_soft_delete'      =>'Also soft-delete these users. Their asset history will remain intact unless/until you purge deleted records in the Admin Settings.',
-    'bulk_checkin_delete_success' => 'Your selected users have been deleted and their items have been checked in.',
-    'bulk_checkin_success' => 'The items for the selected users have been checked in.',
-    'set_to_null'           => 'Delete values for this asset|Delete values for all :asset_count assets ',
-    'set_users_field_to_null'  => 'Delete :field values for this user|Delete :field values for all :user_count users ',
-    'na_no_purchase_date'   => 'N/A - No purchase date provided',
-    'assets_by_status'      => 'Assets by Status',
-    'assets_by_status_type'      => 'Assets by Status Type',
-    'pie_chart_type'        => 'Dashboard Pie Chart Type',
-    'hello_name'            => 'Hello, :name!',
-    'unaccepted_profile_warning'   => 'You have :count items requiring acceptance. Click here to accept or decline them',
+    'purge_not_allowed'     => 'Vymazanie odstránených dát bolo zakázané v .env súbore. Kontaktuje podporu alebo správcu systému.',
+    'backup_delete_not_allowed'     => 'Odstránenie záloh bolo zakázané v súbore .env. Kontaktuje podporu alebo správu systému.',
+    'additional_files'           => 'Ďalšie súbory',
+    'shitty_browser'        => 'Nebol zistený žiaden podpis. Ak používate starší prehliadať, prosím skúste znovu v modernejšom prehliadači dokončiť potvrdenie prevzatia majetku.',
+    'bulk_soft_delete'      =>'Taktiež vymazať týchto používateľov. História ich majetku zostane neporušená pokým neodstránite vymazané záznamy v nastaveniach správcu.',
+    'bulk_checkin_delete_success' => 'Vybraní používatelia boli odstránení a ich položky odobraté.',
+    'bulk_checkin_success' => 'Položky vybraných používateľov boly prevzaté.',
+    'set_to_null'           => 'Odstrániť hodnoty pre tento výber|Odstrániť hodnoty pre všetkých :selection_count vybratých položiek ',
+    'set_users_field_to_null'  => 'Vymazať hodnoty :field pre tohto užívateľa|Vymazať :field hodnoty pre všetkých :user_count používateľov ',
+    'na_no_purchase_date'   => 'N/A - neznámy dátum nákupu',
+    'assets_by_status'      => 'Majetok podľa stavu',
+    'assets_by_status_type'      => 'Majetok podľa typu stavu',
+    'pie_chart_type'        => 'Typ koláčového grafu na prehľade',
+    'hello_name'            => 'Ahoj, :name!',
+    'unaccepted_profile_warning'   => 'Máte jednu položku vyžadujúcu potvrdenie prevzatia. Kliknite sem pre akceptáciu alebo odmietnutie | Máte :count položiek vyžadujúcich potvrdenie prevzatia. Kliknite sem pre ich akceptáciu alebo odmietnutie',
     'start_date'            => 'Dátum začiatku',
-    'end_date'            => 'End Date',
-    'alt_uploaded_image_thumbnail' => 'Uploaded thumbnail',
-    'placeholder_kit'       => 'Select a kit',
-    'file_not_found'        => 'File not found',
-    'preview_not_available' => '(no preview)',
-    'setup'                 => 'Setup',
-    'pre_flight'            => 'Pre-Flight',
-    'skip_to_main_content'  => 'Skip to main content',
-    'toggle_navigation'     => 'Toggle navigation',
+    'end_date'            => 'Dátum konca',
+    'alt_uploaded_image_thumbnail' => 'Náhraný náhľadový obrázok',
+    'placeholder_kit'       => 'Vyberte sadu',
+    'file_not_found'        => 'Súbor sa nenašiel',
+    'log_record_not_found'  => 'Neboli nájdené žiadne záznamy pre vybanú položku.',
+    'preview_not_available' => '(žiaden náhľad)',
+    'setup'                 => 'Nastavenia',
+    'pre_flight'            => 'Testovací',
+    'skip_to_main_content'  => 'Prejsť k hlavnému obsahu',
+    'toggle_navigation'     => 'Prepnúť navigáciu',
     'alerts'                => 'Upozornenia',
-    'tasks_view_all'        => 'View all tasks',
-    'true'                  => 'True',
-    'false'                 => 'False',
-    'integration_option'    => 'Integration Option',
-    'log_does_not_exist'    => 'No matching log record exists.',
-    'merge_users'           => 'Merge Users',
-    'merge_information' =>  'This will merge the :count users into a single user. Select the user you wish to merge the others into below, and the associated assets, licenses, etc will be moved over to the selected user and the other users will be marked as deleted.',
-    'warning_merge_information' => 'This action CANNOT be undone and should ONLY be used when you need to merge users because of a bad import or sync. Be sure to run a backup first.',
-    'no_users_selected'     => 'No users selected',
-    'not_enough_users_selected'     => 'At least :count users must be selected',
-    'merge_success'         => ':count users merged successfully into :into_username!',
-    'merged'                => 'merged',
-    'merged_log_this_user_into' => 'Merged this user (ID :to_id - :to_username) into user ID :from_id (:from_username) ',
-    'merged_log_this_user_from' => 'Merged user ID :from_id (:from_username) into this user (ID :to_id - :to_username)',
-    'clear_and_save'            => 'Clear & Save',
-    'update_existing_values'    => 'Update Existing Values?',
-    'auto_incrementing_asset_tags_disabled_so_tags_required' => 'Generating auto-incrementing asset tags is disabled so all rows need to have the "Asset Tag" column populated.',
-    'auto_incrementing_asset_tags_enabled_so_now_assets_will_be_created' => 'Note: Generating auto-incrementing asset tags is enabled so assets will be created for rows that do not have "Asset Tag" populated. Rows that do have "Asset Tag" populated will be updated with the provided information.',
-    'send_welcome_email_to_users'   => ' Send Welcome Email for new Users?',
-    'send_email'                => 'Send Email',
-    'call'                      => 'Call number',
-    'back_before_importing'     => 'Backup before importing?',
-    'csv_header_field'          => 'CSV Header Field',
-    'import_field'              => 'Import Field',
-    'sample_value'              => 'Sample Value',
-    'no_headers'                => 'No Columns Found',
-    'error_in_import_file'      => 'There was an error reading the CSV file: :error',
-    'errors_importing'          => 'Some Errors occurred while importing: ',
-    'warning'                   => 'WARNING: :warning',
-    'success_redirecting'       => '"Success... Redirecting.',
-    'cancel_request'            => 'Cancel this item request',
-    'setup_successful_migrations' => 'Your database tables have been created',
-    'setup_migration_output' => 'Migration output:',
-    'setup_migration_create_user' => 'Next: Create User',
-    'importer_generic_error'    => 'Your file import is complete, but we did receive an error. This is usually caused by third-party API throttling from a notification webhook (such as Slack) and would not have interfered with the import itself, but you should confirm this.',
-    'confirm' => 'Confirm',
-    'autoassign_licenses' => 'Auto-Assign Licenses',
-    'autoassign_licenses_help' => 'Allow this user to have licenses assigned via the bulk-assign license UI or cli tools.',
-    'autoassign_licenses_help_long' => 'This allows a user to be have licenses assigned via the bulk-assign license UI or cli tools. (For example, you might not want contractors to be auto-assigned a license you would provide to only staff members. You can still individually assign licenses to those users, but they will not be included in the Checkout License to All Users functions.)',
-    'no_autoassign_licenses_help' => 'Do not include user for bulk-assigning through the license UI or cli tools.',
-    'modal_confirm_generic'      => 'Are you sure?',
-    'cannot_be_deleted'      => 'This item cannot be deleted',
-    'cannot_be_edited'      => 'This item cannot be edited.',
-    'undeployable_tooltip'      => 'This item cannot be checked out. Check the quantity remaining.',
-    'serial_number'        => 'Serial Number',
-    'item_notes' => ':item Notes',
+    'tasks_view_all'        => 'Zobraziť všetky úlohy',
+    'true'                  => 'Súhlasí',
+    'false'                 => 'Nesúhlasí',
+    'integration_option'    => 'Nastavenie integrácie',
+    'log_does_not_exist'    => 'Neexistujú žiadne logovacie záznamy.',
+    'merge_users'           => 'Zlúčiť používateľov',
+    'merge_information' =>  'Toto zlúči :count používateľov do jedného používateľa. Vyberte používateľa, do ktorého chcete zlúčiť ostatných používateľov a súvisiaci majetok, licencie atď. budú presunuté na vybraného používateľa, následne budú ostatný používatelia vymazaný.',
+    'warning_merge_information' => 'Táto akcia NEMÔŽE byť vrátená späť a mala by byť potvrdená IBA keď naozaj potrebujete zlúčiť používateľov z dôvodu zlého importu alebo synchronizácie. Vždy vykonajte zálohu pred potvrdením.',
+    'no_users_selected'     => 'Nie sú vybraní žiadni používatelia',
+    'not_enough_users_selected'     => 'Minimálne :count používatelia musia byť zvolení',
+    'merge_success'         => ':count používateľov zlúčených úspešne do :into_username!',
+    'merged'                => 'zlúčené',
+    'merged_log_this_user_into' => 'Zlúčiť tohto používateľa (ID :to_id - :to_username) s používateľom ID :from_id (:from_username) ',
+    'merged_log_this_user_from' => 'Zlúčiť používateľa ID :from_id (:from_username) s používateľom (ID :to_id - :to_username)',
+    'clear_and_save'            => 'Vymazať a uložiť',
+    'update_existing_values'    => 'Aktualizovať existujúce hodnoty?',
+    'auto_incrementing_asset_tags_disabled_so_tags_required' => 'Generovanie automatického inkrementu značiek majetku je zakázané, preto všetky nové položky musia mať Značku majetku vyplnenú.',
+    'auto_incrementing_asset_tags_enabled_so_now_assets_will_be_created' => 'Poznámka: Generovanie automatického inkrementu značiek majetku je povolené, takže majetok bude zaevidovaný pre položky, ktoré nemajú značku majetku zadefinovanú. Položky ktoré majú značku majetku vyplnenú budú aktualizované s poskytnutými informáciami.',
+    'send_welcome_email_to_users'   => ' Poslať uvítací mail pre nových používateľov?',
+    'send_email'                => 'Poslať mail',
+    'call'                      => 'Zavolať číslo',
+    'back_before_importing'     => 'Vytvoriť zálohu pre importovaním?',
+    'csv_header_field'          => 'Pole hlavičky CSV',
+    'import_field'              => 'Importovať pole',
+    'sample_value'              => 'Vzorová hodnota',
+    'no_headers'                => 'Neboli nájdené žiadne stĺpce',
+    'error_in_import_file'      => 'Pri čítaní CSV súboru došlo k chby :error',
+    'errors_importing'          => 'Počas importu došlo k chybám: ',
+    'warning'                   => 'VAROVANIE: :warning',
+    'success_redirecting'       => '"Úspešné... presmerovávam.',
+    'cancel_request'            => 'Zrušiť túto žiadosť o položku',
+    'setup_successful_migrations' => 'Tabuľky databázy boli vytvorené',
+    'setup_migration_output' => 'Výstup z migrácie:',
+    'setup_migration_create_user' => 'Ďalší: Vytvoriť používateľa',
+    'importer_generic_error'    => 'Import súboru bol dokončený, počas importu sa ale vyskytla chyba. Obvykle to súvisí s prerušením API spojenia tretej strany z oznamovacieho webhooku (ako napr. Slack) a neovplyvňuje to ovykle samotný import, ale pre istotu si to skontrolujte.',
+    'confirm' => 'Potvrdiť',
+    'autoassign_licenses' => 'Automatické priradenie licencií',
+    'autoassign_licenses_help' => 'Povoliť tomuto používateľovi mať priradené licencie prostredníctvom užívateľského rozhrania pre hromadné priradeni alebo CLI nástrojov.',
+    'autoassign_licenses_help_long' => 'Povolí používateľovi získať licencie cez hromadnú správu licencií, či už cez GUI alebo CLI. Napríklad pokiaľ si neprajete, aby externisti nedostávali automaticky licencie, ktoré patria iba zamestnanom. Licencie im môžete aj naďalej priraďovať ručne, iba nebudú zahrnutí pri hromadnom pridelení',
+    'no_autoassign_licenses_help' => 'Nezhrňovať používateľa do hromadného priradenia licencií cez UI alebo CLI nástroje.',
+    'modal_confirm_generic'      => 'Ste si istý?',
+    'cannot_be_deleted'      => 'Táto položka nemože byť vymazaná',
+    'cannot_be_edited'      => 'Táto položka nemôže byť editovaná.',
+    'undeployable_tooltip'      => 'Táto položka nemôže byť odovzdaná. Overte zostávajúce množstvo.',
+    'serial_number'        => 'Sériové čislo',
+    'item_notes' => ':item poznámky',
     'item_name_var' => ':názov položky',
-    'error_user_company' => 'Checkout target company and asset company do not match',
-    'error_user_company_accept_view' => 'An Asset assigned to you belongs to a different company so you can\'t accept nor deny it, please check with your manager',
+    'error_user_company' => 'Cieľová spoločnosť pre odovzdanie sa nezhoduje so spoločnosťou majetku',
+    'error_user_company_accept_view' => 'Priradený majetok patrí inej spoločnosti, takže nemôžete potvrdiť ani odmietnuť jeho prijatie, prosím kontaktujte svojho nadriadeného',
     'importer' => [
-        'checked_out_to_fullname' => 'Checked Out to: Full Name',
-        'checked_out_to_first_name' => 'Checked Out to: First Name',
-        'checked_out_to_last_name' => 'Checked Out to: Last Name',
-        'checked_out_to_username' => 'Checked Out to: Username',
-        'checked_out_to_email' => 'Checked Out to: Email',
-        'checked_out_to_tag' => 'Checked Out to: Asset Tag',
-        'manager_first_name' => 'Manager First Name',
-        'manager_last_name' => 'Manager Last Name',
-        'manager_full_name' => 'Manager Full Name',
-        'manager_username' => 'Manager Username',
-        'checkout_type' => 'Checkout Type',
-        'checkout_location' => 'Checkout to Location',
-        'image_filename' => 'Image Filename',
-        'do_not_import'     => 'Do Not Import',
+        'checked_out_to_fullname' => 'Odovzdané: Celé meno',
+        'checked_out_to_first_name' => 'Odovzdané: Meno',
+        'checked_out_to_last_name' => 'Odovzdané: Priezvisko',
+        'checked_out_to_username' => 'Odovzdané: používateľské meno',
+        'checked_out_to_email' => 'Odovzdané: Mail',
+        'checked_out_to_tag' => 'Odovzdané: Značka majetku',
+        'manager_first_name' => 'Meno manažéra',
+        'manager_last_name' => 'Priezvisko manažéra',
+        'manager_full_name' => 'Celé meno manažéra',
+        'manager_username' => 'Používateľké meno manažéra',
+        'checkout_type' => 'Typ odovzdania',
+        'checkout_location' => 'Odovzdané na lokalitu',
+        'image_filename' => 'Názov obrázku',
+        'do_not_import'     => 'Neimportovať',
         'vip' => 'VIP',
         'avatar'  => 'Avatar',
-        'gravatar' => 'Gravatar Email',
-        'currency' => 'Currency',
-        'address2' => 'Address Line 2',
-        'import_note' => 'Imported using csv importer',
+        'gravatar' => 'Gravatar email',
+        'currency' => 'Mena',
+        'address2' => 'Adresa 2. riadok',
+        'import_note' => 'Importované pomocou CSV importu',
     ],
-    'remove_customfield_association' => 'Remove this field from the fieldset. This will not delete the custom field, only this field\'s association with this fieldset.',
-    'checked_out_to_fields' => 'Checked Out To Fields',
-    'percent_complete' => '% complete',
-    'uploading' => 'Uploading... ',
-    'upload_error' => 'Error uploading file. Please check that there are no empty rows and that no column names are duplicated.',
-    'copy_to_clipboard' => 'Copy to Clipboard',
-    'copied' => 'Copied!',
-    'status_compatibility' => 'If assets are already assigned, they cannot be changed to a non-deployable status type and this value change will be skipped.',
-    'rtd_location_help' => 'This is the location of the asset when it is not checked out',
-    'item_not_found' => ':item_type ID :id does not exist or has been deleted',
-    'action_permission_denied' => 'You do not have permission to :action :item_type ID :id',
-    'action_permission_generic' => 'You do not have permission to :action this :item_type',
+    'remove_customfield_association' => 'Odstrániť toto pole zo sady polí. Táto akcia neodmaže vlastné pole, iba jeho priradenie do sady polí.',
+    'checked_out_to_fields' => 'Polia pre odovzdanie',
+    'percent_complete' => '% hotovo',
+    'uploading' => 'Nahrávam... ',
+    'upload_error' => 'Error uploading file. Please check that you have no empty rows or duplicated column names in your CSV, and that the server permissions allow uploads.',
+    'copy_to_clipboard' => 'Kopírovať do schránky',
+    'copied' => 'Skopírované!',
+    'status_compatibility' => 'Keď je majetok už priradený, nemôže byť jeho stav zmenený na nepriraditeľný a hodnota tejto položky bude preskočená.',
+    'rtd_location_help' => 'Toto je lokalita majetku keď nie je priradený',
+    'item_not_found' => ':item_type ID :id neexistuje alebo bol vymazaný',
+    'action_permission_denied' => 'Nemáte povolenie na :action :item_type ID :id',
+    'action_permission_generic' => 'Nemáte povolenie na :action tohto :item_type',
     'edit' => 'upraviť',
-    'action_source' => 'Action Source',
-    'or' => 'or',
+    'action_source' => 'Zdroj akcie',
+    'or' => 'alebo',
     'url'                   => 'URL',
-    'edit_fieldset' => 'Edit fieldset fields and options',
-    'permission_denied_superuser_demo' => 'Permission denied. You cannot update user information for superadmins on the demo.',
-    'pwd_reset_not_sent' => 'User is not activated, is LDAP synced, or does not have an email address',
-    'error_sending_email' => 'Error sending email',
-    'sad_panda' => 'Sad panda. You are not authorized to do the thing. Maybe <a href=":link">return to the dashboard</a>, or contact your administrator.',
+    'edit_fieldset' => 'Upraviť pole a možnosti sady polí',
+    'permission_denied_superuser_demo' => 'Oprávnenie bolo zakázané. Nemôžete aktualizovať informácie o superadmin používateľoch v demo verzii.',
+    'pwd_reset_not_sent' => 'Používateľ nie je aktivovaný, je synchronizovaný cez LDAP alebo nemá zadanú emailovú adresu',
+    'error_sending_email' => 'Pri odosielaní mailu nastala chyba',
+    'sad_panda' => 'Smutná panda. Nemáte oprávnenia na túto akciu. Skúste <a href=":link">k návratu na Prehľad</a> alebo kontaktujte svojho administrátora.',
     'bulk' => [
             'delete' =>
                 [
-                'header' => 'Bulk Delete :object_type',
-                'warn'   =>  'You are about to delete one :object_type|You are about to delete :count :object_type',
-                'success'   =>  ':object_type successfully deleted|Successfully deleted :count :object_type',
-                'error'   =>  'Could not delete :object_type',
-                'nothing_selected'   =>  'No :object_type selected - nothing to do',
-                'partial'   =>  'Deleted :success_count :object_type, but :error_count :object_type could not be deleted',
+                'header' => 'Hromadné zmazanie :object_type',
+                'warn'   =>  'Chystáte sa zmazať jeden :object_type|Chystáte sa zmazať :count :object_type',
+                'success'   =>  ':object_type úspešne zmazaný|Úspešne zmazaných :count :object_type',
+                'error'   =>  'Nie je možné zmazať :object_type',
+                'nothing_selected'   =>  'Nebol zvolený žiaden :object_type - nič sa nedá robiť',
+                'partial'   =>  'Zmazaných :success_count :object_type, ale :erro_count :object_type nemohlo byť zmazaných',
              ],
     ],
-    'no_requestable' => 'There are no requestable assets or asset models.',
+    'no_requestable' => 'Neexistujú žiadne vyžiadateľné zariadenia alebo typy majetku.',
 
     'countable' => [
-        'accessories'  => ':count Accessory|:count Accessories',
-        'assets'  => ':count Asset|:count Assets',
-        'licenses'  => ':count License|:count Licenses',
-        'license_seats'  => ':count License Seat|:count License Seats',
-        'consumables'  => ':count Consumable|:count Consumables',
-        'components'  => ':count Component|:count Components',
-    ]
+        'accessories'  => ':count príslušenstvo|:count príslušenstiev',
+        'assets'  => ':count zariadenie|:count zariadení',
+        'licenses'  => ':count licencia|:count licencií',
+        'license_seats'  => ':count licenčné miesto|:count licenčných miest',
+        'consumables'  => ':count spotrebný materiál|:count spotrebných matriálov',
+        'components'  => ':count komponent|:count komponentov',
+    ],
+
+    'more_info' => 'Viac info',
+    'quickscan_bulk_help' => 'Zakliknutím tohto poľa upravíte majetkové záznamy tak, aby reflektovali novú lokalitu. Ak ho nezakliknete, tak sa iba poznačí lokalita v logovacom zázname. Majte na pamäti, že pri priradení majetku nedochádza k zmene lokality používateľa, majetku alebo lokality, do ktorej na priradený.',
+    'whoops' => 'Hopsla!',
+    'something_went_wrong' => 'Niekde sa stala chyba pri realizácie požíadavky.',
+    'close' => 'Zatvoriť',
+    'expires' => 'Exspiruje',
+    'map_fields'=> 'Namapovať :item_type položky',
+    'remaining_var' => ':count zostáva',
+    'label' => 'Štítok',
+    'import_asset_tag_exists' => 'Majetok so značkou majetku :asset_tag už existuje a nebol aktualizovaný. Žiadna zmena sa neudiala.',
+    'countries_manually_entered_help' => 'Hodnoty s hviezdičkou (*) boli manuálne zadané a nezhodujú sa s existujúcim hodnotami výberu podľa ISO 3166',
+    'accessories_assigned' => 'Priradené príslušenstvo',
+    'user_managed_passwords' => 'Správca hesiel',
+    'user_managed_passwords_disallow' => 'Neumožniť používateľom spravovať ich vlastné heslá',
+    'user_managed_passwords_allow' => 'Povoliť používateľom spravovať ich vlastné heslá',
+    'from' => 'From',
+    'by' => 'Podľa',
+
+// Add form placeholders here
+    'placeholders' => [
+        'notes'  => 'Add a note',
+    ],
+
+    'breadcrumb_button_actions' => [
+        'edit_item' => 'Edit :name',
+        'checkout_item' => 'Checkout :name',
+        'checkin_item' => 'Checkin :name',
+    ],
+
+    'skins' => [
+        'site_default' => 'Site Default',
+        'default_blue' => 'Default Blue',
+        'blue_dark' => 'Blue (Dark Mode)',
+        'green' => 'Green Dark',
+        'green_dark' => 'Green (Dark Mode)',
+        'red' => 'Red Dark',
+        'red_dark' => 'Red (Dark Mode)',
+        'orange' => 'Orange Dark',
+        'orange_dark' => 'Orange (Dark Mode)',
+        'black' => 'Black',
+        'black_dark' => 'Black (Dark Mode)',
+        'purple' => 'Purple',
+        'purple_dark' => 'Purple (Dark Mode)',
+        'yellow' => 'Yellow',
+        'yellow_dark' => 'Yellow (Dark Mode)',
+        'high_contrast' => 'High Contrast',
+
+    ],
+
+    'select_all_none' => 'Select/Unselect All',
+    'generic_model_not_found' => 'That :model was not found or you do not have permission to access it',
+    'deleted_models' => 'Deleted Asset Models',
+    'deleted_users' => 'Deleted Users',
+    'cost_each' => ':amount each',
+    'remove_current_image' => 'Remove current :type image',
+
+    'seeding' => [
+        'manufacturers' => [
+            'button' => 'Create Manufacturers',
+            'prompt' => 'You do not have any manufacturers yet. Would you like to seed a list of common manufacturers? (THIS WILL OVERWRITE EXISTING MANUFACTURERS, including those that have been soft-deleted.)',
+            'success' => 'Manufacturers seeded successfully',
+            'error' => 'Could not seed manufacturers. A manufacturer record already exists and seeding would overwrite it.|Could not seed manufacturers. :count manufacturer records already exist and seeding would overwrite them.',
+        ],
+    ],
 
 ];
diff --git a/resources/lang/sk-SK/help.php b/resources/lang/sk-SK/help.php
index 87bebbee3a..9aca58b44e 100644
--- a/resources/lang/sk-SK/help.php
+++ b/resources/lang/sk-SK/help.php
@@ -15,21 +15,21 @@ return [
 
     'more_info_title' => 'Viac info',
 
-    'audit_help' => 'Checking this box will edit the asset record to reflect this new location. Leaving it unchecked will simply note the location in the audit log.<br><br>Note that if this asset is checked out, it will not change the location of the person, asset or location it is checked out to.',
+    'audit_help' => 'Zakliknutím tohto poľa upravíte majetkové záznamy tak, aby reflektovali novú lokalitu. Ak ho nezakliknete, tak sa iba poznačí lokalita v logovacom zázname.<br><br>Majte na pamäti, že pri priradení majetku nedochádza k zmene lokality používateľa, majetku alebo lokality, do ktorej na priradený.',
 
     'assets' => 'Majetkom sú položky identifikované sériovým čislom alebo značkou majetku. Väčšinou ide o položky s vyššou hodnotou, pri ktorých je dôležité identifikovať konkrétnu položku.',
 
-    'categories' => 'Categories help you organize your items. Some example categories might be &quot;Desktops&quot;, &quot;Laptops&quot;, &quot;Mobile Phones&quot;, &quot;Tablets&quot;, and so on, but you can use categories any way that makes sense for you.',
+    'categories' => 'Kategórie pomáhajú organizovať Vaše položky. Príkladom kategórií sú &quot;PC&quot;, &quot;Notebooky&quot;, &quot;Mobilné telefóny&quot;, &quot;Tablety&quot;, atď., ale môžete si kategórie vytvoriť ľubovoľne tak, ako Vám to vyhovuje.',
 
-    'accessories' => 'Accessories are anything you issue to users but that do not have a serial number (or you do not care about tracking them uniquely). For example, computer mice or keyboards.',
+    'accessories' => 'Príslušenstvom je všetko čo je odovzdávané používateľom a nedisponuje sériovým číslom (alebo nezáleží na sledovaní každého kusu individuálne). Príkladom je počítačová myš alebo klávesnica.',
 
-    'companies'     => 'Companies can be used as a simple identifier field, or can be used to limit visibility of assets, users, etc if full company support is enabled in your Admin settings.',
+    'companies'     => 'Spoločnosti môžu byť použité ako jednoduchý identifikátor alebo môžu byť využité na obmedzenie viditeľnosti majetku, používateľov, atď. ak je zapnutý mód plnej podpory spoločností v Admin nastaveniach.',
 
-    'components'    => 'Components are items that are part of an asset, for example HDD, RAM, etc.',
+    'components'    => 'Komponenty sú položky ktoré sú súčasťou majetku, napríklad HDD, RAM, atď.',
 
-    'consumables'   => 'Consumables are anything purchased that will be used up over time. For example, printer ink or copier paper.',
+    'consumables'   => 'Spotrebný materiál je čokoľvek zakúpené čo sa spotrebuje v čase. Napríklad tonery alebo papiere.',
 
     'depreciations' => 'Môžete nastaviť odpisovanie majetku, aby dochádzalo k rovnomernému odpisovaniu.',
     
-    'empty_file'    => 'The importer detects that this file is empty.'
+    'empty_file'    => 'Importovací nástroj zistil, že tento súbor je prázdny.'
 ];
diff --git a/resources/lang/sk-SK/localizations.php b/resources/lang/sk-SK/localizations.php
index f1232dd138..4e50b88067 100644
--- a/resources/lang/sk-SK/localizations.php
+++ b/resources/lang/sk-SK/localizations.php
@@ -2,319 +2,324 @@
 
 return [
 
-    'select_language' => 'Select a language',
+    'select_language' => 'Vybrať jazyk',
     'languages' => [
-        'en-US'=> 'English, US',
-        'en-GB'=> 'English, UK',
-        'am-ET' => 'Amharic',
-        'af-ZA'=> 'Afrikaans',
-        'ar-SA'=> 'Arabic',
-        'bg-BG'=> 'Bulgarian',
-        'zh-CN'=> 'Chinese Simplified',
-        'zh-TW'=> 'Chinese Traditional',
-        'ca-ES' => 'Catalan',
-        'hr-HR'=> 'Croatian',
-        'cs-CZ'=> 'Czech',
-        'da-DK'=> 'Danish',
-        'nl-NL'=> 'Dutch',
-        'en-ID'=> 'English, Indonesia',
-        'et-EE'=> 'Estonian',
-        'fil-PH'=> 'Filipino',
-        'fi-FI'=> 'Finnish',
-        'fr-FR'=> 'French',
-        'de-DE'=> 'German',
-        'de-if'=> 'German (Informal)',
-        'el-GR'=> 'Greek',
-        'he-IL'=> 'Hebrew',
-        'hu-HU'=> 'Hungarian',
-        'is-IS' => 'Icelandic',
-        'id-ID'=> 'Indonesian',
-        'ga-IE'=> 'Irish',
-        'it-IT'=> 'Italian',
-        'ja-JP'=> 'Japanese',
-        'km-KH'=>'Khmer',
-        'ko-KR'=> 'Korean',
-        'lt-LT'=>'Lithuanian',
-        'lv-LV'=> 'Latvian',
-        'mk-MK'=> 'Macedonian',
-        'ms-MY'=> 'Malay',
-        'mi-NZ'=> 'Maori',
-        'mn-MN'=> 'Mongolian',
-        'no-NO'=> 'Norwegian',
-        'fa-IR'=> 'Persian',
-        'pl-PL'=> 'Polish',
-        'pt-PT'=> 'Portuguese',
-        'pt-BR'=> 'Portuguese, Brazilian',
-        'ro-RO'=> 'Romanian',
-        'ru-RU'=> 'Russian',
-        'sr-CS' => 'Serbian (Latin)',
-        'sk-SK'=> 'Slovak',
-        'sl-SI'=> 'Slovenian',
-        'so-SO'=> 'Somali',
-        'es-ES'=> 'Spanish',
-        'es-CO'=> 'Spanish, Colombia',
-        'es-MX'=> 'Spanish, Mexico',
-        'es-VE'=> 'Spanish, Venezuela',
-        'sv-SE'=> 'Swedish',
+        'en-US'=> 'Angličtina, USA',
+        'en-GB'=> 'Angličtina, Spojené kráľovstvo',
+        'am-ET' => 'Amharčina',
+        'af-ZA'=> 'Afrikánčina',
+        'ar-SA'=> 'Arabčina',
+        'bg-BG'=> 'Bulharčina',
+        'zh-CN'=> 'Čínština (zjednodušená)',
+        'zh-TW'=> 'Čínština (tradičná)',
+        'ca-ES' => 'Katalánčina',
+        'hr-HR'=> 'Chorvátčina',
+        'cs-CZ'=> 'Čeština',
+        'da-DK'=> 'Dánčina',
+        'nl-NL'=> 'Holandčina',
+        'en-ID'=> 'Angličtina, Indonesia',
+        'et-EE'=> 'Estónčina',
+        'fil-PH'=> 'Filipínčina',
+        'fi-FI'=> 'Fínština',
+        'fr-FR'=> 'Francúzština',
+        'de-DE'=> 'Nemčina',
+        'de-if'=> 'Nemčina (neformálna)',
+        'el-GR'=> 'Gréčtina',
+        'he-IL'=> 'Hebrejčina',
+        'hu-HU'=> 'Maďarčina',
+        'is-IS' => 'Islandčina',
+        'id-ID'=> 'Indonézština',
+        'ga-IE'=> 'Írčina',
+        'it-IT'=> 'Taliančina',
+        'ja-JP'=> 'Japončina',
+        'km-KH'=>'Khmérčina',
+        'ko-KR'=> 'Kórejčina',
+        'lt-LT'=>'Litovčina',
+        'lv-LV'=> 'Lotyština',
+        'mk-MK'=> 'Macedónčina',
+        'ms-MY'=> 'Malajčina',
+        'mi-NZ'=> 'Maorijčina',
+        'mn-MN'=> 'Mongolčina',
+        'nb-NO'=> 'Nórčina (Bokmål)',
+        'om-ET' => 'Oromo (Ethiopian)',
+        //'nn-NO'=> 'Norwegian Nynorsk',
+        'fa-IR'=> 'Perzština',
+        'pl-PL'=> 'Poľština',
+        'pt-PT'=> 'Portugalština',
+        'pt-BR'=> 'Portugalčina, Brazília',
+        'ro-RO'=> 'Rumunčina',
+        'ru-RU'=> 'Ruština',
+        'sr-CS' => 'Srbčina (latinka)',
+        'sk-SK'=> 'Slovenčina',
+        'sl-SI'=> 'Slovinčina',
+        'so-SO'=> 'Somálčina',
+        'es-ES'=> 'Španielčina',
+        'es-CO'=> 'Španielčina, Kolumia',
+        'es-MX'=> 'Španielčina, Mexiko',
+        'es-VE'=> 'Španielčina, Venezuela',
+        'sv-SE'=> 'Švédčina',
         'tl-PH'=> 'Tagalog',
-        'ta-IN'=> 'Tamil',
-        'th-TH'=> 'Thai',
-        'tr-TR'=> 'Turkish',
-        'uk-UA'=> 'Ukranian',
-        'vi-VN'=> 'Vietnamese',
-        'cy-GB'=> 'Welsh',
+        'ta-IN'=> 'Tamilština',
+        'th-TH'=> 'Thajčina',
+        'tr-TR'=> 'Turečtina',
+        'uk-UA'=> 'Ukrajinčina',
+        'vi-VN'=> 'Vietnamčina',
+        'cy-GB'=> 'Waleština',
         'zu-ZA'=> 'Zulu',
     ],
 
-    'select_country' => 'Select a country',
+    'select_country' => 'Vybrať krajinu',
     
     'countries' => [
-        'AC'=>'Ascension Island',
-        'AD'=>'Andorra',
-        'AE'=>'United Arab Emirates',
-        'AF'=>'Afghanistan',
-        'AG'=>'Antigua And Barbuda',
+        'AC'=>'Ostrov Ascension',
+        'AD'=>'Andora',
+        'AE'=>'Spojené arabské emiráty',
+        'AF'=>'Afganistan',
+        'AG'=>'Antigua a Barbuda',
         'AI'=>'Anguilla',
-        'AL'=>'Albania',
-        'AM'=>'Armenia',
-        'AN'=>'Netherlands Antilles',
+        'AL'=>'Albánsko',
+        'AM'=>'Arménsko',
+        'AN'=>'Holandské Antily',
         'AO'=>'Angola',
-        'AQ'=>'Antarctica',
-        'AR'=>'Argentina',
-        'AS'=>'American Samoa',
-        'AT'=>'Austria',
-        'AU'=>'Australia',
+        'AQ'=>'Antarktída',
+        'AR'=>'Argentína',
+        'AS'=>'Americká Samoa',
+        'AT'=>'Rakúsko',
+        'AU'=>'Austrália',
         'AW'=>'Aruba',
-        'AX'=>'Ã…land',
-        'AZ'=>'Azerbaijan',
-        'BA'=>'Bosnia And Herzegovina',
+        'AX'=>'Åland',
+        'AZ'=>'Azerbajdžan',
+        'BA'=>'Bosna a Hercegovina',
         'BB'=>'Barbados',
-        'BE'=>'Belgium',
-        'BD'=>'Bangladesh',
+        'BE'=>'Belgicko',
+        'BD'=>'Bangladéš',
         'BF'=>'Burkina Faso',
-        'BG'=>'Bulgaria',
-        'BH'=>'Bahrain',
+        'BG'=>'Bulharsko',
+        'BH'=>'Bahrajn',
         'BI'=>'Burundi',
         'BJ'=>'Benin',
-        'BM'=>'Bermuda',
-        'BN'=>'Brunei Darussalam',
-        'BO'=>'Bolivia',
-        'BR'=>'Brazil',
-        'BS'=>'Bahamas',
-        'BT'=>'Bhutan',
-        'BV'=>'Bouvet Island',
+        'BM'=>'Bermudy',
+        'BN'=>'Brunejsko-darussalamský štát',
+        'BO'=>'Bolívia',
+        'BR'=>'Brazília',
+        'BS'=>'Bahamy',
+        'BT'=>'Bhután',
+        'BV'=>'Ostrov Bouvet',
         'BW'=>'Botswana',
-        'BY'=>'Belarus',
+        'BY'=>'Bielorusko',
         'BZ'=>'Belize',
-        'CA'=>'Canada',
-        'CC'=>'Cocos (Keeling) Islands',
-        'CD'=>'Congo (Democratic Republic)',
-        'CF'=>'Central African Republic',
-        'CG'=>'Congo (Republic)',
-        'CH'=>'Switzerland',
-        'CI'=>'Côte d\'Ivoire',
-        'CK'=>'Cook Islands',
-        'CL'=>'Chile',
-        'CM'=>'Cameroon',
-        'CN'=>'People\'s Republic of China',
-        'CO'=>'Colombia',
-        'CR'=>'Costa Rica',
-        'CU'=>'Cuba',
-        'CV'=>'Cape Verde',
-        'CX'=>'Christmas Island',
+        'CA'=>'Kanada',
+        'CC'=>'Kokosové ostrovy (Keeling)',
+        'CD'=>'Konžská demokratická republika',
+        'CF'=>'Stredoafrická republika',
+        'CG'=>'Kongo (republika)',
+        'CH'=>'Švajčiarsko',
+        'CI'=>'Pobrežie Slonoviny',
+        'CK'=>'Cookove ostrovy',
+        'CL'=>'Čile',
+        'CM'=>'Kamerun',
+        'CN'=>'Čínská ľudová republika',
+        'CO'=>'Kolumbia',
+        'CR'=>'Kostarika',
+        'CU'=>'Kuba',
+        'CV'=>'Kapverdy',
+        'CX'=>'Vianočný ostrov',
         'CY'=>'Cyprus',
-        'CZ'=>'Czech Republic',
-        'DE'=>'Germany',
-        'DJ'=>'Djibouti',
-        'DK'=>'Denmark',
-        'DM'=>'Dominica',
-        'DO'=>'Dominican Republic',
-        'DZ'=>'Algeria',
-        'EC'=>'Ecuador',
-        'EE'=>'Estonia',
+        'CZ'=>'Česká republika',
+        'DE'=>'Nemecko',
+        'DJ'=>'Džibutsko',
+        'DK'=>'Dánsko',
+        'DM'=>'Dominika',
+        'DO'=>'Dominikánska republika',
+        'DZ'=>'Alžírsko',
+        'EC'=>'Ekvádor',
+        'EE'=>'Estónsko',
         'EG'=>'Egypt',
+        'GB-ENG'=>'Anglicko',
         'ER'=>'Eritrea',
-        'ES'=>'Spain',
-        'ET'=>'Ethiopia',
-        'EU'=>'European Union',
-        'FI'=>'Finland',
-        'FJ'=>'Fiji',
-        'FK'=>'Falkland Islands (Malvinas)',
-        'FM'=>'Micronesia, Federated States Of',
-        'FO'=>'Faroe Islands',
-        'FR'=>'France',
+        'ES'=>'Španielsko',
+        'ET'=>'Etiópia',
+        'EU'=>'Európska únia',
+        'FI'=>'Fínsko',
+        'FJ'=>'Fidži',
+        'FK'=>'Falklandské ostrovy (Malvíny)',
+        'FM'=>'Mikronézia, federatívne štáty',
+        'FO'=>'Faerské ostrovy',
+        'FR'=>'Francúzsko',
         'GA'=>'Gabon',
         'GD'=>'Grenada',
-        'GE'=>'Georgia',
-        'GF'=>'French Guiana',
+        'GE'=>'Gruzínsko',
+        'GF'=>'Francúzska Guyana',
         'GG'=>'Guernsey',
         'GH'=>'Ghana',
-        'GI'=>'Gibraltar',
-        'GL'=>'Greenland',
+        'GI'=>'Gibraltár',
+        'GL'=>'Grónsko',
         'GM'=>'Gambia',
         'GN'=>'Guinea',
         'GP'=>'Guadeloupe',
-        'GQ'=>'Equatorial Guinea',
-        'GR'=>'Greece',
-        'GS'=>'South Georgia And The South Sandwich Islands',
+        'GQ'=>'Rovníková Guinea',
+        'GR'=>'Grécko',
+        'GS'=>'Južná Georgia a Južné Sandwichove ostrovy',
         'GT'=>'Guatemala',
         'GU'=>'Guam',
         'GW'=>'Guinea-Bissau',
         'GY'=>'Guyana',
-        'HK'=>'Hong Kong',
-        'HM'=>'Heard And Mc Donald Islands',
+        'HK'=>'Hongkong',
+        'HM'=>'Heardov ostrov a MacDonaldovy ostrovy',
         'HN'=>'Honduras',
-        'HR'=>'Croatia (local name: Hrvatska)',
+        'HR'=>'Chorvátsko (miestny názov: Hrvatska)',
         'HT'=>'Haiti',
-        'HU'=>'Hungary',
-        'ID'=>'Indonesia',
-        'IE'=>'Ireland',
-        'IL'=>'Israel',
-        'IM'=>'Isle of Man',
+        'HU'=>'Maďarsko',
+        'ID'=>'Indonézia',
+        'IE'=>'Írsko',
+        'IL'=>'Izrael',
+        'IM'=>'Ostrov Man',
         'IN'=>'India',
-        'IO'=>'British Indian Ocean Territory',
-        'IQ'=>'Iraq',
-        'IR'=>'Iran, Islamic Republic Of',
-        'IS'=>'Iceland',
-        'IT'=>'Italy',
+        'IO'=>'Britské indickooceánske územie',
+        'IQ'=>'Irak',
+        'IR'=>'Irán, Islamská republika',
+        'IS'=>'Island',
+        'IT'=>'Taliansko',
         'JE'=>'Jersey',
-        'JM'=>'Jamaica',
-        'JO'=>'Jordan',
-        'JP'=>'Japan',
-        'KE'=>'Kenya',
-        'KG'=>'Kyrgyzstan',
-        'KH'=>'Cambodia',
+        'JM'=>'Jamajka',
+        'JO'=>'Jordánsko',
+        'JP'=>'Japonsko',
+        'KE'=>'Keňa',
+        'KG'=>'Kirgizsko',
+        'KH'=>'Kambodža',
         'KI'=>'Kiribati',
-        'KM'=>'Comoros',
-        'KN'=>'Saint Kitts And Nevis',
-        'KR'=>'Korea, Republic Of',
-        'KW'=>'Kuwait',
-        'KY'=>'Cayman Islands',
-        'KZ'=>'Kazakhstan',
-        'LA'=>'Lao People\'s Democratic Republic',
-        'LB'=>'Lebanon',
-        'LC'=>'Saint Lucia',
-        'LI'=>'Liechtenstein',
-        'LK'=>'Sri Lanka',
-        'LR'=>'Liberia',
+        'KM'=>'Komory',
+        'KN'=>'Svätý Krištof a Nevis',
+        'KR'=>'Kórejská republika',
+        'KW'=>'Kuvajt',
+        'KY'=>'Kajmanské ostrovy',
+        'KZ'=>'Kazachstan',
+        'LA'=>'Laoská ľudová demokratická republika',
+        'LB'=>'Libanon',
+        'LC'=>'Svätá Lucia',
+        'LI'=>'Lichtenštajnsko',
+        'LK'=>'Srí Lanka',
+        'LR'=>'Libéria',
         'LS'=>'Lesotho',
-        'LT'=>'Lithuania',
-        'LU'=>'Luxembourg',
-        'LV'=>'Latvia',
-        'LY'=>'Libyan Arab Jamahiriya',
-        'MA'=>'Morocco',
-        'MC'=>'Monaco',
-        'MD'=>'Moldova, Republic Of',
-        'ME'=>'Montenegro',
-        'MG'=>'Madagascar',
-        'MH'=>'Marshall Islands',
-        'MK'=>'Macedonia, The Former Yugoslav Republic Of',
+        'LT'=>'Litva',
+        'LU'=>'Luxembursko',
+        'LV'=>'Lotyšsko',
+        'LY'=>'Líbyjská Arabská Jamahiriya',
+        'MA'=>'Maroko',
+        'MC'=>'Monako',
+        'MD'=>'Moldavská republika',
+        'ME'=>'Čierna Hora',
+        'MG'=>'Madagaskar',
+        'MH'=>'Marshallove ostrovy',
+        'MK'=>'Macedónsko, Bývalá juhoslovanská republika',
         'ML'=>'Mali',
-        'MM'=>'Myanmar',
-        'MN'=>'Mongolia',
+        'MM'=>'Mjanmarsko',
+        'MN'=>'Mongolsko',
         'MO'=>'Macau',
-        'MP'=>'Northern Mariana Islands',
-        'MQ'=>'Martinique',
-        'MR'=>'Mauritania',
+        'MP'=>'Severné Mariánske ostrovy',
+        'MQ'=>'Martinik',
+        'MR'=>'Mauritánia',
         'MS'=>'Montserrat',
         'MT'=>'Malta',
-        'MU'=>'Mauritius',
-        'MV'=>'Maldives',
+        'MU'=>'Maurícius',
+        'MV'=>'Maledivy',
         'MW'=>'Malawi',
-        'MX'=>'Mexico',
-        'MY'=>'Malaysia',
-        'MZ'=>'Mozambique',
-        'NA'=>'Namibia',
-        'NC'=>'New Caledonia',
+        'MX'=>'Mexiko',
+        'MY'=>'Malajzia',
+        'MZ'=>'Mozambik',
+        'NA'=>'Namíbia',
+        'NC'=>'Nová Kaledónia',
         'NE'=>'Niger',
-        'NF'=>'Norfolk Island',
-        'NG'=>'Nigeria',
-        'NI'=>'Nicaragua',
-        'NL'=>'Netherlands',
-        'NO'=>'Norway',
-        'NP'=>'Nepal',
+        'NF'=>'Ostrov Norfolk',
+        'NG'=>'Nigéria',
+        'NI'=>'Nikaragua',
+        'NL'=>'Holandsko',
+        'GB-NIR' => 'Severné Írsko',
+        'NO'=>'Nórsko',
+        'NP'=>'Nepál',
         'NR'=>'Nauru',
         'NU'=>'Niue',
-        'NZ'=>'New Zealand',
-        'OM'=>'Oman',
+        'NZ'=>'Nový Zéland',
+        'OM'=>'Omán',
         'PA'=>'Panama',
         'PE'=>'Peru',
-        'PF'=>'French Polynesia',
-        'PG'=>'Papua New Guinea',
-        'PH'=>'Philippines, Republic of the',
+        'PF'=>'Francúzska Polynézia',
+        'PG'=>'Papua Nová Guinea',
+        'PH'=>'Filipíny, Republika',
         'PK'=>'Pakistan',
-        'PL'=>'Poland',
-        'PM'=>'St. Pierre And Miquelon',
-        'PN'=>'Pitcairn',
-        'PR'=>'Puerto Rico',
-        'PS'=>'Palestine',
-        'PT'=>'Portugal',
+        'PL'=>'Poľsko',
+        'PM'=>'Saint-Pierre a Miquelon',
+        'PN'=>'Pitcairnove ostrovy',
+        'PR'=>'Portoriko',
+        'PS'=>'Palestína',
+        'PT'=>'Portugalsko',
         'PW'=>'Palau',
-        'PY'=>'Paraguay',
-        'QA'=>'Qatar',
-        'RE'=>'Reunion',
-        'RO'=>'Romania',
-        'RS'=>'Serbia',
-        'RU'=>'Russian Federation',
+        'PY'=>'Paraguaj',
+        'QA'=>'Katar',
+        'RE'=>'Réunion',
+        'RO'=>'Rumunsko',
+        'RS'=>'Srbsko',
+        'RU'=>'Ruská Federácia',
         'RW'=>'Rwanda',
-        'SA'=>'Saudi Arabia',
-        'UK'=>'Scotland',
-        'SB'=>'Solomon Islands',
-        'SC'=>'Seychelles',
-        'SS'=>'South Sudan',
-        'SD'=>'Sudan',
-        'SE'=>'Sweden',
-        'SG'=>'Singapore',
-        'SH'=>'St. Helena',
-        'SI'=>'Slovenia',
-        'SJ'=>'Svalbard And Jan Mayen Islands',
-        'SK'=>'Slovakia (Slovak Republic)',
+        'SA'=>'Saudská Arábia',
+        'GB-SCT'=>'Škótsko',
+        'SB'=>'Šalamúnove ostrovy',
+        'SC'=>'Seychely',
+        'SS'=>'Južný Sudán',
+        'SD'=>'Sudán',
+        'SE'=>'Švédsko',
+        'SG'=>'Singapur',
+        'SH'=>'Svätá Helena',
+        'SI'=>'Slovinsko',
+        'SJ'=>'Svalbardské ostrovy a ostrovy Jan Mayen',
+        'SK'=>'Slovensko (Slovenská republika)',
         'SL'=>'Sierra Leone',
-        'SM'=>'San Marino',
+        'SM'=>'San Maríno',
         'SN'=>'Senegal',
-        'SO'=>'Somalia',
-        'SR'=>'Suriname',
-        'ST'=>'Sao Tome And Principe',
-        'SU'=>'Soviet Union',
-        'SV'=>'El Salvador',
-        'SY'=>'Syrian Arab Republic',
-        'SZ'=>'Swaziland',
-        'TC'=>'Turks And Caicos Islands',
-        'TD'=>'Chad',
-        'TF'=>'French Southern Territories',
+        'SO'=>'Somálsko',
+        'SR'=>'Surinam',
+        'ST'=>'Svätý Tomáš a Princov ostrov',
+        'SU'=>'Sovietsky zväz',
+        'SV'=>'Salvádor',
+        'SY'=>'Sýrska arabská republika',
+        'SZ'=>'Svazijsko',
+        'TC'=>'Ostrovy Turks a Caicos',
+        'TD'=>'Čad',
+        'TF'=>'Francúzske južné územia',
         'TG'=>'Togo',
-        'TH'=>'Thailand',
-        'TJ'=>'Tajikistan',
+        'TH'=>'Thajsko',
+        'TJ'=>'Tadžikistan',
         'TK'=>'Tokelau',
-        'TI'=>'East Timor',
-        'TM'=>'Turkmenistan',
-        'TN'=>'Tunisia',
+        'TI'=>'Východný Timor',
+        'TM'=>'Turkménsko',
+        'TN'=>'Tunisko',
         'TO'=>'Tonga',
-        'TP'=>'East Timor (old code)',
-        'TR'=>'Turkey',
-        'TT'=>'Trinidad And Tobago',
+        'TP'=>'Východný Timor (starý kód)',
+        'TR'=>'Turecko',
+        'TT'=>'Trinidad a Tobago',
         'TV'=>'Tuvalu',
         'TW'=>'Taiwan',
-        'TZ'=>'Tanzania, United Republic Of',
-        'UA'=>'Ukraine',
+        'TZ'=>'Tanzánia',
+        'UA'=>'Ukrajina',
         'UG'=>'Uganda',
-        'UK'=>'United Kingdom',
-        'US'=>'United States',
-        'UM'=>'United States Minor Outlying Islands',
-        'UY'=>'Uruguay',
+        'UK'=>'Spojené kráľovstvo',
+        'US'=>'Spojené štáty',
+        'UM'=>'Menšie odľahlé ostrovy USA',
+        'UY'=>'Uruguaj',
         'UZ'=>'Uzbekistan',
-        'VA'=>'Vatican City State (Holy See)',
-        'VC'=>'Saint Vincent And The Grenadines',
+        'VA'=>'Vatikánsky mestský štát (Holy See)',
+        'VC'=>'Svätý Vincent a Grenadíny',
         'VE'=>'Venezuela',
-        'VG'=>'Virgin Islands (British)',
-        'VI'=>'Virgin Islands (U.S.)',
-        'VN'=>'Viet Nam',
+        'VG'=>'Britské Panenské ostrovy',
+        'VI'=>'Americké Panenské ostrovy',
+        'VN'=>'Vietnam',
         'VU'=>'Vanuatu',
-        'WF'=>'Wallis And Futuna Islands',
+        'GB-WLS' =>'Wales',
+        'WF'=>'Ostrovy Wallis a Futuna',
         'WS'=>'Samoa',
-        'YE'=>'Yemen',
+        'YE'=>'Jemen',
         'YT'=>'Mayotte',
-        'ZA'=>'South Africa',
+        'ZA'=>'Južná Afrika',
         'ZM'=>'Zambia',
         'ZW'=>'Zimbabwe',
     ],
diff --git a/resources/lang/sk-SK/mail.php b/resources/lang/sk-SK/mail.php
index 3315db3cf2..d938a41436 100644
--- a/resources/lang/sk-SK/mail.php
+++ b/resources/lang/sk-SK/mail.php
@@ -2,92 +2,98 @@
 
 return [
 
-    'Accessory_Checkin_Notification' => 'Accessory checked in',
-    'Accessory_Checkout_Notification' => 'Accessory checked out',
-    'Asset_Checkin_Notification' => 'Asset checked in',
-    'Asset_Checkout_Notification' => 'Asset checked out',
-    'Confirm_Accessory_Checkin' => 'Accessory checkin confirmation',
-    'Confirm_Asset_Checkin' => 'Asset checkin confirmation',
-    'Confirm_accessory_delivery' => 'Accessory delivery confirmation',
-    'Confirm_asset_delivery' => 'Asset delivery confirmation',
-    'Confirm_consumable_delivery' => 'Consumable delivery confirmation',
-    'Confirm_license_delivery' => 'License delivery confirmation',
-    'Consumable_checkout_notification' => 'Consumable checked out',
-    'Days' => 'Days',
-    'Expected_Checkin_Date' => 'An asset checked out to you is due to be checked back in on :date',
-    'Expected_Checkin_Notification' => 'Reminder: :name checkin deadline approaching',
-    'Expected_Checkin_Report' => 'Expected asset checkin report',
-    'Expiring_Assets_Report' => 'Expiring Assets Report.',
-    'Expiring_Licenses_Report' => 'Expiring Licenses Report.',
-    'Item_Request_Canceled' => 'Item Request Canceled',
-    'Item_Requested' => 'Item Requested',
-    'License_Checkin_Notification' => 'License checked in',
-    'License_Checkout_Notification' => 'License checked out',
-    'Low_Inventory_Report' => 'Low Inventory Report',
-    'a_user_canceled' => 'A user has canceled an item request on the website',
-    'a_user_requested' => 'A user has requested an item on the website',
-    'acceptance_asset_accepted' => 'A user has accepted an item',
-    'acceptance_asset_declined' => 'A user has declined an item',
-    'accessory_name' => 'Názov príslušenstva:',
-    'additional_notes' => 'Additional Notes:',
-    'admin_has_created' => 'An administrator has created an account for you on the :web website.',
-    'asset' => 'Majetok:',
-    'asset_name' => 'Názov assetu/majetku:',
-    'asset_requested' => 'Asset requested',
+    'Accessory_Checkin_Notification' => 'Príslušenstvo vrátené',
+    'Accessory_Checkout_Notification' => 'Príslušenstvo odovzdané',
+    'Asset_Checkin_Notification' => 'Majetok vrátený',
+    'Asset_Checkout_Notification' => 'Majetok odovzdaný',
+    'Confirm_Accessory_Checkin' => 'Potvrdenie vrátenia príslušenstva',
+    'Confirm_Asset_Checkin' => 'Potvrdenie vrátenia majetku',
+    'Confirm_accessory_delivery' => 'Potvrdenie odovzdania príslušenstva',
+    'Confirm_asset_delivery' => 'Potvrdenie odovzdania majetku',
+    'Confirm_consumable_delivery' => 'Potvrdenie odovzdania spotrebného materiálu',
+    'Confirm_license_delivery' => 'Potvrdenie priradenia licencie',
+    'Consumable_checkout_notification' => 'Spotrebný materiál odovzdaný',
+    'Days' => 'Dni',
+    'Expected_Checkin_Date' => 'Majetok, ktorý vám bol odovzdaný, musí byť vrátený späť do :date',
+    'Expected_Checkin_Notification' => 'Pripomienka: Termín na vrátenie :name sa blíži',
+    'Expected_Checkin_Report' => 'Report očakávaných vrátení majetku',
+    'Expiring_Assets_Report' => 'Report majetku s končiacou zárukou.',
+    'Expiring_Licenses_Report' => 'Report exspirujúcich licencií.',
+    'Item_Request_Canceled' => 'Požiadavka na položku zrušená',
+    'Item_Requested' => 'Položka vyžiadaná',
+    'License_Checkin_Notification' => 'Licencia odobratá',
+    'License_Checkout_Notification' => 'Licencie priradená',
+    'license_for'   => 'Licencia pre',
+    'Low_Inventory_Report' => 'Report nízkych zásob',
+    'a_user_canceled' => 'Používateľ zrušil žiadosť o položku na webe',
+    'a_user_requested' => 'Používateľ vytvoril žiadosť o položku na webe',
+    'acceptance_asset_accepted' => 'Používateľ potvrdil prijatie položky',
+    'acceptance_asset_declined' => 'Používateľ zamietol prijatie položky',
+    'accessory_name' => 'Názov príslušenstva',
+    'additional_notes' => 'Ďalšie poznámky',
+    'admin_has_created' => 'Administrátor pre vás vytvoril účet na stránke :web.',
+    'asset' => 'Majetok',
+    'asset_name' => 'Názov majetku',
+    'asset_requested' => 'Vyžiadaný majetok',
     'asset_tag' => 'Označenie majetku',
-    'assets_warrantee_alert' => 'There is :count asset with a warranty expiring in the next :threshold days.|There are :count assets with warranties expiring in the next :threshold days.',
-    'assigned_to' => 'Assigned To',
-    'best_regards' => 'Best regards,',
-    'canceled' => 'Canceled:',
-    'checkin_date' => 'Dátum prijatia:',
-    'checkout_date' => 'Dátum odovzdania:',
-    'checkedout_from' => 'Checked out from',
-    'checkedin_from'  => 'Checked in from',
-    'checked_into' => 'Checked into',
-    'click_on_the_link_accessory' => 'Please click on the link at the bottom to confirm that you have received the accessory.',
-    'click_on_the_link_asset' => 'Please click on the link at the bottom to confirm that you have received the asset.',
-    'click_to_confirm' => 'Please click on the following link to confirm your :web account:',
-    'current_QTY' => 'Current QTY',
-    'days' => 'Days',
-    'expecting_checkin_date' => 'Očakávaný dátum prijatia:',
+    'assets_warrantee_alert' => 'Existuje :count položka majetku, ktorej končí záruka v najbližších :threshold dňoch.|Existuje :count položiek majetku, ktorým končí záruka v najbližších :threshold dňoch.',
+    'assigned_to' => 'Pridelené',
+    'best_regards' => 'S pozdravom,',
+    'canceled' => 'Zrušené',
+    'checkin_date' => 'Dátum vrátenia',
+    'checkout_date' => 'Dátum odovzdania',
+    'checkedout_from' => 'Odovzadené od',
+    'checkedin_from'  => 'Prijaté od',
+    'checked_into' => 'Priradené do',
+    'click_on_the_link_accessory' => 'Prosím kliknite na nižšie priložený odkaz pre potvrdenie prevzatia príslušenstva.',
+    'click_on_the_link_asset' => 'Prosím kliknite na nižšie priložený odkaz pre potvrdenie prevzatia majetku.',
+    'click_to_confirm' => 'Prosím kliknite na nasledujúci odkaz pre potvrdenie vášho :web účtu:',
+    'current_QTY' => 'Aktuálne množstvo',
+    'days' => 'Dní',
+    'expecting_checkin_date' => 'Očakávaný dátum vrátenia',
     'expires' => 'Exspiruje',
-    'hello' => 'Hello',
-    'hi' => 'Hi',
-    'i_have_read' => 'I have read and agree to the terms of use, and have received this item.',
-    'inventory_report' => 'Inventory Report',
-    'item' => 'Položka:',
-    'license_expiring_alert' => 'There is :count license expiring in the next :threshold days.|There are :count licenses expiring in the next :threshold days.',
-    'link_to_update_password' => 'Please click on the following link to update your :web password:',
-    'login' => 'Prihlásenie:',
-    'login_first_admin' => 'Login to your new Snipe-IT installation using the credentials below:',
-    'low_inventory_alert' => 'There is :count item that is below minimum inventory or will soon be low.|There are :count items that are below minimum inventory or will soon be low.',
-    'min_QTY' => 'Min QTY',
+    'hello' => 'Ahoj',
+    'hi' => 'Ahoj',
+    'i_have_read' => 'Súhlasím s podmienkami používania, potvrdzujem prevzatie položky.',
+    'inventory_report' => 'Report majetku',
+    'item' => 'Položka',
+    'item_checked_reminder' => 'Toto je pripomienka, že vám boli odovzdané :count položky, ktorých prijatie ste nepotvrdili a ani neodmietli. Prosím kliknite na odkaz nižšie pre potvrdenie vašej voľby.',
+    'license_expiring_alert' => 'V nasledujúcich :threshold dňoch exspiruje :count licencia.|V nasledujúcich :threshold dňoch exspirujú :count licencie.',
+    'link_to_update_password' => 'Prosím kliknite na nasledovný odkaz pre zmenu hesla na stránke :web :',
+    'login' => 'Prihlásenie',
+    'login_first_admin' => 'Prihláste sa do vašej novej Snipe-IT inštalácie s použitím prihlasovacích údajov:',
+    'low_inventory_alert' => 'Existuje :count položka, ktorá je alebo čoskoro bude pod hranicou minimálnych skladových zásob.|Existuje :count položiek, ktoré sú alebo čoskoro budú pod hranicou minimálnych skladových zásob.',
+    'min_QTY' => 'Minimálne množstvo',
     'name' => 'Názov',
-    'new_item_checked' => 'A new item has been checked out under your name, details are below.',
+    'new_item_checked' => 'bola ti odovzdaná nová položka, podrobnosti sú uvedené nižšie.',
+    'new_item_checked_with_acceptance' => 'A new item has been checked out under your name that requires acceptance, details are below.',
+    'recent_item_checked' => 'An item was recently checked out under your name that requires acceptance, details are below.',
     'notes' => 'Poznámky',
-    'password' => 'Heslo:',
-    'password_reset' => 'Password Reset',
-    'read_the_terms' => 'Please read the terms of use below.',
-    'read_the_terms_and_click' => 'Please read the terms of use below, and click on the link at the bottom to confirm that you read and agree to the terms of use, and have received the asset.',
-    'requested' => 'Vyžiadané:',
-    'reset_link' => 'Your Password Reset Link',
-    'reset_password' => 'Click here to reset your password:',
-    'rights_reserved' => 'All rights reserved.',
+    'password' => 'Heslo',
+    'password_reset' => 'Reset hesla',
+    'read_the_terms' => 'Prosím prečítajte si nižšie uvedené podmienky používania.',
+    'read_the_terms_and_click' => 'Prosím prečítajte si nižšie uvedené podmienky používania a kliknite na odkaz v dolnej časti pre potvrdenie, že ste si prečítali a súhlasili s podmienkami používania a prevzali majetok.',
+    'requested' => 'Vyžiadané',
+    'reset_link' => 'Váš odkaz na resetovanie hesla',
+    'reset_password' => 'Kliknite sem pre resetovanie vášho hesla:',
+    'rights_reserved' => 'Všetky práva vyhradené.',
     'serial' => 'Sériové číslo',
-    'snipe_webhook_test' => 'Snipe-IT Integration Test',
-    'snipe_webhook_summary' => 'Snipe-IT Integration Test Summary',
-    'supplier' => 'Supplier',
-    'tag' => 'Tag',
-    'test_email' => 'Test Email from Snipe-IT',
-    'test_mail_text' => 'This is a test from the Snipe-IT Asset Management System. If you got this, mail is working :)',
-    'the_following_item' => 'The following item has been checked in: ',
-    'to_reset' => 'To reset your :web password, complete this form:',
-    'type' => 'Type',
-    'upcoming-audits' => 'There is :count asset that is coming up for audit within :threshold days.|There are :count assets that are coming up for audit within :threshold days.',
-    'user' => 'User',
+    'snipe_webhook_test' => 'Snipe-IT integračný test',
+    'snipe_webhook_summary' => 'Snipe-IT výsledok integračného testu',
+    'supplier' => 'Dodávateľ',
+    'tag' => 'Značka',
+    'test_email' => 'Testovací mail zo Snipe-IT',
+    'test_mail_text' => 'Toto je test odoslaný zo Snipe-IT Asset Manažmentu. Všetko funguje, ak ste obdržali tento mail :)',
+    'the_following_item' => 'nasledujúca položka bola vrátená: ',
+    'to_reset' => 'Pre resetovanie vášho :web hesla, prosím vyplňte nasledujúci formulár:',
+    'type' => 'Typ',
+    'upcoming-audits' => 'Existuje :count položka, ktorá bude podliehať auditu v priebehu :threshold dní.|Existujú :count položky, ktoré budú podliehať auditu v priebehu :threshold dní.',
+    'user' => 'Používateľ',
     'username' => 'Používateľské meno',
-    'welcome' => 'Welcome :name',
-    'welcome_to' => 'Welcome to :web!',
-    'your_assets' => 'View Your Assets',
-    'your_credentials' => 'Your Snipe-IT credentials',
+    'unaccepted_asset_reminder' => 'Reminder: You have Unaccepted Assets.',
+    'welcome' => 'Vitaj :name',
+    'welcome_to' => 'Vitaj na :web!',
+    'your_assets' => 'Zobraziť vaše položky majetku',
+    'your_credentials' => 'Vaše Snipe-IT prihlasovacie údaje',
+    'mail_sent' => 'Mail bol úspešne odoslaný!',
 ];
diff --git a/resources/lang/sk-SK/pagination.php b/resources/lang/sk-SK/pagination.php
index b573b51e91..6cae093502 100644
--- a/resources/lang/sk-SK/pagination.php
+++ b/resources/lang/sk-SK/pagination.php
@@ -13,8 +13,8 @@ return array(
     |
     */
 
-    'previous' => '&laquo; Previous',
+    'previous' => '&laquo; Predchádzajúca',
 
-    'next'     => 'Next &raquo;',
+    'next'     => 'Nasledujúca &raquo;',
 
 );
diff --git a/resources/lang/sk-SK/passwords.php b/resources/lang/sk-SK/passwords.php
index 41a87f98ed..cb7667f0af 100644
--- a/resources/lang/sk-SK/passwords.php
+++ b/resources/lang/sk-SK/passwords.php
@@ -1,9 +1,9 @@
 <?php
 
 return [
-    'sent'	        => 'If a matching user with a valid email address exists in our system, a password recovery email has been sent.',
-    'user'			=> 'If a matching user with a valid email address exists in our system, a password recovery email has been sent.',
-    'token'         => 'This password reset token is invalid or expired, or does not match the username provided.',
-    'reset'         => 'Your password has been reset!',
-    'password_change'  => 'Your password has been updated!',
+    'sent'	        => 'Ak uvedený používateľ s platnou emailovou adresou existuje v našom systému, bude odoslaný email s inštrukciami pre obnovu hesla.',
+    'user'			=> 'Ak uvedený používateľ s platnou emailovou adresou existuje v našom systému, bude odoslaný email s inštrukciami pre obnovu hesla.',
+    'token'         => 'Kód na reset hesla je neplatný, vypršal alebo exspiroval alebo sa nezhoduje so zadaným používateľským menom.',
+    'reset'         => 'Vaše heslo bolo úspešne resetované!',
+    'password_change'  => 'Vaše heslo bolo úspešne aktualizované!',
 ];
diff --git a/resources/lang/sk-SK/reminders.php b/resources/lang/sk-SK/reminders.php
index 8a197467df..f46b052242 100644
--- a/resources/lang/sk-SK/reminders.php
+++ b/resources/lang/sk-SK/reminders.php
@@ -13,9 +13,9 @@ return array(
     |
     */
 
-    "password" => "Passwords must be six characters and match the confirmation.",
-    "user"     => "Username or email address is incorrect",
-    "token"    => 'This password reset token is invalid or expired, or does not match the username provided.',
-    'sent'	   => 'If a matching user with a valid email address exists in our system, a password recovery email has been sent.',
+    "password" => "Heslo musí obsahovať 6 znakov a zhodovať sa s potvrdzujúcim heslom.",
+    "user"     => "Nesprávne používateľské heslo alebo emailová adresa",
+    "token"    => 'Kód na reset hesla je neplatný, vypršal alebo exspiroval alebo sa nezhoduje so zadaným používateľským menom.',
+    'sent'	   => 'Ak uvedená emailová adresa existuje v našom systému, bude na ňu odoslaný email s inštrukciami pre obnovu hesla.',
 
 );
diff --git a/resources/lang/sk-SK/table.php b/resources/lang/sk-SK/table.php
index d0c4be4b8f..d7cde7c567 100644
--- a/resources/lang/sk-SK/table.php
+++ b/resources/lang/sk-SK/table.php
@@ -6,6 +6,6 @@ return array(
     'action' 		        => 'Akcia',
     'by'      		        => 'Podľa',
     'item' 			        => 'Položka',
-    'no_matching_records'   => 'No matching records found',
+    'no_matching_records'   => 'Nenašli sa žiadne zodpovedajúce záznamy',
 
 );
diff --git a/resources/lang/sk-SK/validation.php b/resources/lang/sk-SK/validation.php
index a2ef32d5c7..5baa8c58ed 100644
--- a/resources/lang/sk-SK/validation.php
+++ b/resources/lang/sk-SK/validation.php
@@ -13,100 +13,166 @@ return [
     |
     */
 
-    'accepted'             => 'The :attribute must be accepted.',
-    'active_url'           => 'The :attribute is not a valid URL.',
-    'after'                => 'The :attribute must be a date after :date.',
-    'after_or_equal'       => 'The :attribute must be a date after or equal to :date.',
-    'alpha'                => 'The :attribute may only contain letters.',
-    'alpha_dash'           => 'The :attribute may only contain letters, numbers, and dashes.',
-    'alpha_num'            => 'The :attribute may only contain letters and numbers.',
-    'array'                => 'The :attribute must be an array.',
-    'before'               => 'The :attribute must be a date before :date.',
-    'before_or_equal'      => 'The :attribute must be a date before or equal to :date.',
-    'between'              => [
-        'numeric' => 'The :attribute must be between :min - :max.',
-        'file'    => 'The :attribute must be between :min - :max kilobytes.',
-        'string'  => 'The :attribute must be between :min - :max characters.',
-        'array'   => 'The :attribute must have between :min and :max items.',
+    'accepted' => 'Potrebné potvrdiť :attribute.',
+    'accepted_if' => 'Položka :attribute musí vyť potvrdená ak :other je :value.',
+    'active_url' => 'Pole :attribute musí obsahovať správnu URL adresu.',
+    'after' => 'Pole :attribute musí obsahovať dátum po :date.',
+    'after_or_equal' => 'Pole :attribute musí obsahovať dátum rovnaký alebo nasledujúci po :date.',
+    'alpha' => 'Pole :attribute musí obsahovať iba písmená.',
+    'alpha_dash' => 'Pole :attribute musí obsahovať iba písmená, čísla, pomlčky a podčiarkovníky.',
+    'alpha_num' => 'Pole :attribute músí obsahovať iba písmená a čisla.',
+    'array' => 'Pole :attribute musí obsahovať pole hodnôt.',
+    'ascii' => 'Pole :attribute musí obsahovať iba jednoznakové alfanumerické znaky a symboly.',
+    'before' => 'Pole :attribute musí obsahovať dátum pred :date.',
+    'before_or_equal' => 'Pole :attribute musí obsahovať dátum rovnaký alebo predchádzajúci dátumu :date.',
+    'between' => [
+        'array' => 'Pole :attribute musí obsahovať hodnotu medzi :min a :max položkami.',
+        'file' => 'Pole :attribute musí obsahovať hodnotu medzi :min a :max kilobajtami.',
+        'numeric' => 'Pole :attribute musí obsahovať hodnotu medzi :min a :max.',
+        'string' => 'Pole :attribute musí obsahovať hodnotu medzi :min a :max znamkmi.',
     ],
-    'boolean'              => 'The :attribute must be true or false.',
-    'confirmed'            => 'The :attribute confirmation does not match.',
-    'date'                 => 'The :attribute is not a valid date.',
-    'date_format'          => 'The :attribute does not match the format :format.',
-    'different'            => 'The :attribute and :other must be different.',
-    'digits'               => 'The :attribute must be :digits digits.',
-    'digits_between'       => 'The :attribute must be between :min and :max digits.',
-    'dimensions'           => 'The :attribute has invalid image dimensions.',
-    'distinct'             => 'The :attribute field has a duplicate value.',
-    'email'                => 'The :attribute format is invalid.',
-    'exists'               => 'The selected :attribute is invalid.',
-    'file'                 => 'The :attribute must be a file.',
-    'filled'               => 'The :attribute field must have a value.',
-    'image'                => 'The :attribute must be an image.',
-    'import_field_empty'    => 'The value for :fieldname cannot be null.',
-    'in'                   => 'The selected :attribute is invalid.',
-    'in_array'             => 'The :attribute field does not exist in :other.',
-    'integer'              => 'The :attribute must be an integer.',
-    'ip'                   => 'The :attribute must be a valid IP address.',
-    'ipv4'                 => 'The :attribute must be a valid IPv4 address.',
-    'ipv6'                 => 'The :attribute must be a valid IPv6 address.',
-    'is_unique_department' => 'The :attribute must be unique to this Company Location',
-    'json'                 => 'The :attribute must be a valid JSON string.',
-    'max'                  => [
-        'numeric' => 'The :attribute may not be greater than :max.',
-        'file'    => 'The :attribute may not be greater than :max kilobytes.',
-        'string'  => 'The :attribute may not be greater than :max characters.',
-        'array'   => 'The :attribute may not have more than :max items.',
+    'boolean' => 'Pole :attribút musí obsahovať hodnoty pravda alebo nepravda.',
+    'can' => 'Pole :attribute obsahuje nepovolenú hodnotu.',
+    'confirmed' => 'Pole :attribute nesedí s overením.',
+    'contains' => 'Pole :attribute neobsahuje požadovanú hodnotu.',
+    'current_password' => 'Heslo je nesprávne.',
+    'date' => 'Pole :attribute musí obsahovať platný dátum.',
+    'date_equals' => 'Pole :attribute musí obsahovať dátum rovnaký ako :date.',
+    'date_format' => 'Pole :attribute musí obashovať hodnotnu zhodnú s formátom :format.',
+    'decimal' => 'Pole :attribute musí obsahovať :decimal desatinných miest.',
+    'declined' => 'Pole :attribute musí byť zakázané.',
+    'declined_if' => 'Pole :attribute musí byť zakázané keď :other má hodnotu :value.',
+    'different' => 'Polia :attribute a :other sa nemôžu zhodovať.',
+    'digits' => 'Pole :attribute musí obsahovať :digits číslic.',
+    'digits_between' => 'Pole :attribute musí obsahovať od :min do :max číslic.',
+    'dimensions' => 'Pole :attribute má nesprávne rozmery obrázku.',
+    'distinct' => 'Pole :attribute obsahoje duplicitnú hodnotu.',
+    'doesnt_end_with' => 'Pole :attribute nemôže končiť jednou z nasledujúcich hodnôt: :values.',
+    'doesnt_start_with' => 'Pole :attribute nemôže začínať s jednou z nasledujúcich hodnôt: :values.',
+    'email' => 'Pole :attribute musí obsahovať platnú emailovú adresu.',
+    'ends_with' => 'Pole :attribute musí končiť jednou z nasledujúcich hodnôt: :values.',
+    'enum' => 'Označený :attribute je neplatný.',
+    'exists' => 'Označený :attribute je neplatný.',
+    'extensions' => 'Pole :attribute musí mať jednu z nasledujúcich prípon: :values.',
+    'file' => 'Pole :attribute musí obsahovať súbor.',
+    'filled' => 'Pole :attribute musí obsahovať hodnotu.',
+    'gt' => [
+        'array' => 'Pole :attribute musí obsahovať viac ako :value položiek.',
+        'file' => 'Pole :attribute musí byť väčšie ako :value kilobytov.',
+        'numeric' => 'Pole :attribute musí byť vačie ako :value.',
+        'string' => 'Pole :attribute musí byť vačšie ako :value znakov.',
     ],
-    'mimes'                => 'The :attribute must be a file of type: :values.',
-    'mimetypes'            => 'The :attribute must be a file of type: :values.',
-    'min'                  => [
-        'numeric' => 'The :attribute must be at least :min.',
-        'file'    => 'The :attribute must be at least :min kilobytes.',
-        'string'  => 'The :attribute must be at least :min characters.',
-        'array'   => 'The :attribute must have at least :min items.',
+    'gte' => [
+        'array' => 'Pole :attribute musí mať :value alebo viac položiek.',
+        'file' => 'Pole :attribute musí byť väčšie alebo rovné ako :value kilobytov.',
+        'numeric' => 'Pole :attribute musí byť väčšie alebo rovnaké ako :value.',
+        'string' => 'Hodnota poľa :attribute musí byť väčia alebo rovná :value znakov.',
     ],
-    'starts_with'          => ':attribute musí začínať jedným z nasledujúcich výrazov: :values.',
-    'ends_with'            => 'The :attribute must end with one of the following: :values.',
+    'hex_color' => 'Hodnota poľa :attribute musí byť platným zápisom farby v hexadecimálnom formáte.',
+    'image' => 'Pole :attribute musí obsahovať obrázok.',
+    'import_field_empty'    => 'Hodnote pre :fieldname nemôže byť nulová.',
+    'in' => 'Označený :attribute je neplatný.',
+    'in_array' => 'Pole :attribute musí existovať v :other.',
+    'integer' => 'Pole :attribute musí byť číslom.',
+    'ip' => 'Pole :attribute musí byť platnou IP adresou.',
+    'ipv4' => 'Pole :attribute musí byť platnou IPv4 adresou.',
+    'ipv6' => 'Pole :attribute musí byť platnou IPv6 adresou.',
+    'json' => 'Pole :attribute musí byť platným JSON-om.',
+    'list' => 'Pole :attribute musí byť zoznamom.',
+    'lowercase' => 'Pole :attribute musí obsahovať malé písmenka.',
+    'lt' => [
+        'array' => 'Pole :attribute musí obsahovať menej ako :value položiek.',
+        'file' => 'Pole :attribute musí byť menšie ako :value kilobajtov.',
+        'numeric' => 'Pole :attribute musí byť menšie ako :value.',
+        'string' => 'Pole :attribute musí byť menšie ako :value znakov.',
+    ],
+    'lte' => [
+        'array' => 'Pole :attribute nemôže obsahovať viac ako :value položiek.',
+        'file' => 'Pole :attribute musí byť menšie alebo rovné ako :value kilobajtov.',
+        'numeric' => 'Pole :attribute musí byť menšie alebo rovné :value.',
+        'string' => 'Pole :attribute musí byť menšie alebo rovné ako :value znakov.',
+    ],
+    'mac_address' => 'Pole :attribute musí obsahovať platnú MAC adresu.',
+    'max' => [
+        'array' => 'Pole :attribute nemôže obsahovať viac ako :max položiek.',
+        'file' => 'Pole :attribute nemôže byť väčšie ako :max kilobajtov.',
+        'numeric' => 'Pole :attribute nemôže byť väčšie ako :max.',
+        'string' => 'Pole :attribute nemôže byť väčšie ako :max znakov.',
+    ],
+    'max_digits' => 'Pole :attribute nemôže obsahovať viac ako :max čislic.',
+    'mimes' => 'Pole :attribute musí obsahovať súbory typu: :values.',
+    'mimetypes' => 'Pole :attribute musí obsahovať súborytypu: :values.',
+    'min' => [
+        'array' => 'Pole :attribute musí obsahovať minimálne :min položiek.',
+        'file' => 'Pole :attribute musí byť minimálne :min kilobajtov.',
+        'numeric' => 'Pole :attribute musí byť minimálne :min.',
+        'string' => 'Pole :attribute musí obsahovať minimálne :min znakov.',
+    ],
+    'min_digits' => 'Pole :attribute musí máť minimálne :min čislic.',
+    'missing' => 'Pole :attribute musí chýbať.',
+    'missing_if' => 'Pole :attribute musí chýbať keď :other je :value.',
+    'missing_unless' => 'Pole :attribute musí chýbať pokým :other je :value.',
+    'missing_with' => 'Pole :attribute musí chýbať keď :values sú prítomné.',
+    'missing_with_all' => 'Pole :attribute musí chýbať keď :values sú prítomné.',
+    'multiple_of' => 'Pole :attribute musí byť násobkom hodnoty :value.',
+    'not_in' => 'Označený :attribute je neplatný.',
+    'not_regex' => 'Pole :attribute má nesprávny formát.',
+    'numeric' => 'Pole :attribute musí obsahovať čislo.',
+    'password' => [
+        'letters' => 'Pole :attribute musí obsahovať aspoň jeden znak.',
+        'mixed' => 'Pole :attribute musí obsahovať aspoň jedno veľke a jedno mále písmeno.',
+        'numbers' => 'Pole :attribute musí obsahovať aspoň jedno čislo.',
+        'symbols' => 'Pole :attribute musí obsahovať aspoň jeden symbol.',
+        'uncompromised' => 'Zadaný :attribute sa nachádza na zozname dátových únikov. Prosím zvoľte iný :attribute.',
+    ],
+    'percent'       => 'Minimálne odpisy musia byť medzi 0 a 100, keď je typ odpisu percentuálny.',
 
-    'not_in'               => 'The selected :attribute is invalid.',
-    'numeric'              => 'The :attribute must be a number.',
-    'present'              => 'The :attribute field must be present.',
-    'valid_regex'          => 'That is not a valid regex. ',
-    'regex'                => 'The :attribute format is invalid.',
-    'required'             => 'The :attribute field is required.',
-    'required_if'          => 'The :attribute field is required when :other is :value.',
-    'required_unless'      => 'The :attribute field is required unless :other is in :values.',
-    'required_with'        => 'The :attribute field is required when :values is present.',
-    'required_with_all'    => 'The :attribute field is required when :values is present.',
-    'required_without'     => 'The :attribute field is required when :values is not present.',
-    'required_without_all' => 'The :attribute field is required when none of :values are present.',
-    'same'                 => 'The :attribute and :other must match.',
-    'size'                 => [
-        'numeric' => 'The :attribute must be :size.',
-        'file'    => 'The :attribute must be :size kilobytes.',
-        'string'  => 'The :attribute must be :size characters.',
-        'array'   => 'The :attribute must contain :size items.',
+    'present' => 'Pole :attribute musí byť prítomné.',
+    'present_if' => 'Pole :attribute musí byť prítomné keď :other je :value.',
+    'present_unless' => 'Pole :attribute musí byť prítomné pokým :other je :value.',
+    'present_with' => 'Pole :attribute musí byť prítomné keď :values je prítomné.',
+    'present_with_all' => 'Pole :attribute musí byť prítomné keď :values sú prítomné.',
+    'prohibited' => 'Pole :attribute musí byť zakázané.',
+    'prohibited_if' => 'Pole :attribute je zakázané keď :other je :value.',
+    'prohibited_unless' => 'Pole :attribute je zakázané pokým :other je medzi :values.',
+    'prohibits' => 'Pole :attribute je zakáže zobrazovať :other.',
+    'regex' => 'Pole :attribute má nesprávny formát.',
+    'required' => 'Pole :attribute je povinné.',
+    'required_array_keys' => 'Pole :attribute musí obsahovať položky z :values.',
+    'required_if' => 'Pole :attribute je povinné keď :other je :value.',
+    'required_if_accepted' => 'Pole :attribute je povinné keď :other je akceptované.',
+    'required_if_declined' => 'Pole :attribute je povinné keď :other je odmietnuté.',
+    'required_unless' => 'Pole :attribute je povinné pokým :other je z :values.',
+    'required_with' => 'Pole :attribute je povinné keď :values sú prítomné.',
+    'required_with_all' => 'Pole :attribute je povinné keď :value sú prítomné.',
+    'required_without' => 'Pole :attribute je povinné keď :values nie sú prítomné.',
+    'required_without_all' => 'Pole :attribute je povinné keď žiadna z hodnôt :values nie je použitá.',
+    'same' => 'Pole :attribute sa musí zhodovať s :other.',
+    'size' => [
+        'array' => 'Pole :attribute musí obsahovať :size položiek.',
+        'file' => 'Pole :attribute musí byť :size kilobajtov.',
+        'numeric' => 'Pole :attribute musí byť :size.',
+        'string' => 'Pole :attribute musí obsahovať :size znakov.',
     ],
-    'string'               => 'The :attribute must be a string.',
-    'timezone'             => 'The :attribute must be a valid zone.',
-    'two_column_unique_undeleted' => 'The :attribute must be unique across :table1 and :table2. ',
-    'unique'               => 'The :attribute has already been taken.',
-    'uploaded'             => 'The :attribute failed to upload.',
-    'url'                  => 'The :attribute format is invalid.',
-    'unique_undeleted'     => 'The :attribute must be unique.',
-    'non_circular'         => 'The :attribute must not create a circular reference.',
-    'not_array'            => ':attribute cannot be an array.',
+    'starts_with' => 'Pole :attribute musí začínať s jedným z nasledovných hodnôt: values.',
+    'string'               => 'Pole :attribute musí obsahovať text.',
+    'two_column_unique_undeleted' => 'Pole :attribute musí byť unikátne naprieč :table1 a :table2. ',
+    'unique_undeleted'     => 'Pole :attribute musí byť unikátne.',
+    'non_circular'         => 'Pole :attribute nemôže vytvárať kruhovú referenciu.',
+    'not_array'            => ':attribute nemôže byť poľom.',
     'disallow_same_pwd_as_user_fields' => 'Heslo nemôže byť rovnaké ako užívateľské meno.',
     'letters'              => 'Heslo musí obsahovať najmenej jedno písmeno.',
     'numbers'              => 'Heslo musí obsahovať najmenej jednu číslicu.',
     'case_diff'            => 'Heslo musí obsahovať veľké aj malé písmena.',
     'symbols'              => 'Heslo musí obsahovať symboly.',
-    'gte'                  => [
-        'numeric'          => '´Hodnota nemôže byť záporná'
-    ],
-    'checkboxes'           => ':attribute contains invalid options.',
-    'radio_buttons'        => ':attribute is invalid.',
+    'timezone' => 'Pole :attribute musí obsahovať platnú časovú zónu.',
+    'unique' => 'Pole :attribute už bolo vybrané.',
+    'uploaded' => 'Pole :attribute sa nepodarilo nahrať.',
+    'uppercase' => 'Pole :attribute musí obsahovať veľké písmená.',
+    'url' => 'Pole :attribute musí obsahovať správnu URL adresu.',
+    'ulid' => 'Pole :attribute musí obsahovať platný ULID.',
+    'uuid' => 'Pole :attribute musí obsahovať platný ULID.',
+    'fmcs_location' => 'Full multiple company support and location scoping is enabled in the Admin Settings, and the selected location and selected company are not compatible.',
 
 
     /*
@@ -120,26 +186,38 @@ return [
     |
     */
 
+    'email_array'      => 'Neplatná jedna alebo viacero emailových adries.',
+    'checkboxes'           => ':attribute obsahuje neplatné možnosti.',
+    'radio_buttons'        => ':attribute je neplatný.',
+    
     'custom' => [
-        'alpha_space' => 'The :attribute field contains a character that is not allowed.',
-        'email_array'      => 'One or more email addresses is invalid.',
-        'hashed_pass'      => 'Your current password is incorrect',
-        'dumbpwd'          => 'That password is too common.',
-        'statuslabel_type' => 'You must select a valid status label type',
+        'alpha_space' => 'Pole :attribute obsahuje nepovolený znak.',
+
+        'hashed_pass'      => 'Vaše aktuálne heslo je nesprávne',
+        'dumbpwd'          => 'Heslo je príliš bežné.',
+        'statuslabel_type' => 'Musíte zvoliť platný typ stavového štítku',
+        'custom_field_not_found'          => 'Pole podľa všetkého neexistuje, prosím overte názvy vlastných polí.',
+        'custom_field_not_found_on_model' => 'Pole podľa všetkého existuje, avšak nie je dostupné pre sadu polí tohto modelu majetku.',
 
         // date_format validation with slightly less stupid messages. It duplicates a lot, but it gets the job done :(
-        // We use this because the default error message for date_format is reflects php Y-m-d, which non-PHP
-        // people won't know how to format. 
-        'purchase_date.date_format'     => 'The :attribute must be a valid date in YYYY-MM-DD format',
-        'last_audit_date.date_format'   =>  'The :attribute must be a valid date in YYYY-MM-DD hh:mm:ss format',
-        'expiration_date.date_format'   =>  'The :attribute must be a valid date in YYYY-MM-DD format',
-        'termination_date.date_format'  =>  'The :attribute must be a valid date in YYYY-MM-DD format',
-        'expected_checkin.date_format'  =>  'The :attribute must be a valid date in YYYY-MM-DD format',
-        'start_date.date_format'        =>  'The :attribute must be a valid date in YYYY-MM-DD format',
-        'end_date.date_format'          =>  'The :attribute must be a valid date in YYYY-MM-DD format',
+        // We use this because the default error message for date_format reflects php Y-m-d, which non-PHP
+        // people won't know how to format.
+        'purchase_date.date_format'     => 'Pole :attribute musí obsahovať platný dátum vo formáte YYYY-MM-DD',
+        'last_audit_date.date_format'   =>  'Pole :attribute musí obsahovať platný dátum vo formáte YYYY-MM-DD hh:mm:ss',
+        'expiration_date.date_format'   =>  'Pole :attribute musí obsahovať platný dátum vo formáte YYYY-MM-DD',
+        'termination_date.date_format'  =>  'Pole :attribute musí obsahovať platný dátum vo formáte YYYY-MM-DD',
+        'expected_checkin.date_format'  =>  'Pole :attribute musí obsahovať platný dátum vo formáte YYYY-MM-DD',
+        'start_date.date_format'        =>  'Pole :attribute musí obsahovať platný dátum vo formáte YYYY-MM-DD',
+        'end_date.date_format'          =>  'Pole :attribute musí obsahovať platný dátum vo formáte YYYY-MM-DD',
+        'invalid_value_in_field' => 'Neplatná hodnota zahrnutá v tomto poli',
 
-    ],
+        'ldap_username_field' => [
+            'not_in' =>         '<code>sAMAccountName</code> (malé aj veľké znaky) pravdepodobne nebude fungovať. Mali by ste použiť <code>samaccountname</code> (malé znaky) namiesto neho.'
+        ],
+        'ldap_auth_filter_query' => ['not_in' => '<code>uid=samaccountname</code> nie je pravdepodobné platné pole pre filter autentifikácie. Pravdepodobne ste chceli <code>uid=</code> '],
+        'ldap_filter' => ['regex' => 'Táto hodnota by nemala byť obalená v zátvorkách.'],
 
+        ],
     /*
     |--------------------------------------------------------------------------
     | Custom Validation Attributes
@@ -155,8 +233,16 @@ return [
 
     /*
     |--------------------------------------------------------------------------
-    | Generic Validation Messages
+    | Generic Validation Messages - we use these in the jquery validation where we don't have
+    | access to the :attribute
     |--------------------------------------------------------------------------
     */
-    'invalid_value_in_field' => 'Invalid value included in this field',
+
+    'generic' => [
+        'invalid_value_in_field' => 'Neplatná hodnota zahrnutá v tomto poli',
+        'required' => 'Toto pole je povinné',
+        'email' => 'Zadajte platnú e-mailovú adresu',
+    ],
+
+
 ];
diff --git a/resources/lang/sl-SI/account/general.php b/resources/lang/sl-SI/account/general.php
index 1a9e2c03b8..7f9e2f848e 100644
--- a/resources/lang/sl-SI/account/general.php
+++ b/resources/lang/sl-SI/account/general.php
@@ -2,10 +2,16 @@
 
 return array(
     'personal_api_keys' => 'Personal API Keys',
+    'personal_access_token' => 'Personal Access Token',
+    'personal_api_keys_success' => 'Personal API Key :key created sucessfully',
+    'here_is_api_key' => 'Here is your new personal access token. This is the only time it will be shown so do not lose it! You may now use this token to make API requests.',
     'api_key_warning' => 'When generating an API token, be sure to copy it down immediately as they will not be visible to you again.',
     'api_base_url' => 'Your API base url is located at:',
     'api_base_url_endpoint' => '/&lt;endpoint&gt;',
     'api_token_expiration_time' => 'API tokens are set to expire in:',
     'api_reference' => 'Please check the <a href="https://snipe-it.readme.io/reference" target="_blank">API reference</a> to find specific API endpoints and additional API documentation.',
     'profile_updated' => 'Account successfully updated',
+    'no_tokens' => 'You have not created any personal access tokens.',
+    'enable_sounds' => 'Enable sound effects',
+    'enable_confetti' => 'Enable confetti effects',
 );
diff --git a/resources/lang/sl-SI/admin/accessories/message.php b/resources/lang/sl-SI/admin/accessories/message.php
index 2ec1e8ab95..3d9007940f 100644
--- a/resources/lang/sl-SI/admin/accessories/message.php
+++ b/resources/lang/sl-SI/admin/accessories/message.php
@@ -26,7 +26,11 @@ return array(
         'error'   		=> 'Dodatek ni bil izdan, poskusite znova',
         'success' 		=> 'Dodatek uspešno izdan.',
         'unavailable'   => 'Accessory is not available for checkout. Check quantity available',
-        'user_does_not_exist' => 'Uporabnik je napačen. Prosim poskusite ponovno.'
+        'user_does_not_exist' => 'Uporabnik je napačen. Prosim poskusite ponovno.',
+         'checkout_qty' => array(
+            'lte'  => 'There is currently only one available accessory of this type, and you are trying to check out :checkout_qty. Please adjust the checkout quantity or the total stock of this accessory and try again.|There are :number_currently_remaining total available accessories, and you are trying to check out :checkout_qty. Please adjust the checkout quantity or the total stock of this accessory and try again.',
+            ),
+           
     ),
 
     'checkin' => array(
diff --git a/resources/lang/sl-SI/admin/accessories/table.php b/resources/lang/sl-SI/admin/accessories/table.php
index 5992630b1b..1c2209e728 100644
--- a/resources/lang/sl-SI/admin/accessories/table.php
+++ b/resources/lang/sl-SI/admin/accessories/table.php
@@ -6,6 +6,4 @@ return array(
     'id'      					=> 'ID',
     'require_acceptance'      	=> 'Sprejemljivost',
     'title'      				=> 'Ime Dodatka',
-
-
 );
diff --git a/resources/lang/sl-SI/admin/asset_maintenances/form.php b/resources/lang/sl-SI/admin/asset_maintenances/form.php
index 522c262920..d5b2620bee 100644
--- a/resources/lang/sl-SI/admin/asset_maintenances/form.php
+++ b/resources/lang/sl-SI/admin/asset_maintenances/form.php
@@ -3,7 +3,7 @@
     return [
         'asset_maintenance_type' => 'Asset Maintenance Type',
         'title'                  => 'Naslov',
-        'start_date'             => 'Start Date',
+        'start_date'             => 'Datum začetka',
         'completion_date'        => 'Completion Date',
         'cost'                   => 'Cena',
         'is_warranty'            => 'Izboljšanje garancije',
diff --git a/resources/lang/sl-SI/admin/categories/general.php b/resources/lang/sl-SI/admin/categories/general.php
index 94d0916909..eaedce923f 100644
--- a/resources/lang/sl-SI/admin/categories/general.php
+++ b/resources/lang/sl-SI/admin/categories/general.php
@@ -8,8 +8,8 @@ return array(
     'clone'                             => 'Kloniraj Karegorijo',
     'create'  							=> 'Ustvari kategorijo',
     'edit'                              => 'Uredi Kategorijo',
-    'email_will_be_sent_due_to_global_eula' => 'An email will be sent to the user because the global EULA is being used.',
-    'email_will_be_sent_due_to_category_eula' => 'An email will be sent to the user because a EULA is set for this category.',
+    'email_will_be_sent_due_to_global_eula' => 'E pošta bo uporabniku poslana ker je v uporabi globalna EULA.',
+    'email_will_be_sent_due_to_category_eula' => 'E pošta bo bila poslana uporabniku, ker je za to kategorijo v uporabi EULA.',
     'eula_text'							=> 'Kategorija EULA',
     'eula_text_help'					=> 'To polje vam omogoča prilagajanje EULA za določene vrste sredstev. Če imate samo eno EULA za vsa vaša sredstva, lahko potrdite spodnje polje, da uporabite kot privzeto.',
     'name'                              => 'Ime kategorije',
diff --git a/resources/lang/sl-SI/admin/categories/message.php b/resources/lang/sl-SI/admin/categories/message.php
index a9a34d2a95..61981436bb 100644
--- a/resources/lang/sl-SI/admin/categories/message.php
+++ b/resources/lang/sl-SI/admin/categories/message.php
@@ -14,7 +14,7 @@ return array(
     'update' => array(
         'error'   => 'Kategorija ni bila posodobljena, poskusite znova',
         'success' => 'Kategorija uspešno posodobljena.',
-        'cannot_change_category_type'   => 'You cannot change the category type once it has been created',
+        'cannot_change_category_type'   => 'Ne moreš spremeniti tipa kategorije po tem ko je bila kreirana',
     ),
 
     'delete' => array(
diff --git a/resources/lang/sl-SI/admin/companies/table.php b/resources/lang/sl-SI/admin/companies/table.php
index 5c773973c4..f28188fe08 100644
--- a/resources/lang/sl-SI/admin/companies/table.php
+++ b/resources/lang/sl-SI/admin/companies/table.php
@@ -2,7 +2,7 @@
 return array(
     'companies' => 'Podjetja',
     'create'    => 'Ustvari podjetje',
-    'email'     => 'Company Email',
+    'email'     => 'E-naslov podjetja',
     'title'     => 'Podjetje',
     'phone'     => 'Company Phone',
     'update'    => 'Posodobi podjetje',
diff --git a/resources/lang/sl-SI/admin/components/message.php b/resources/lang/sl-SI/admin/components/message.php
index cf0c03f8bf..bf7f522a08 100644
--- a/resources/lang/sl-SI/admin/components/message.php
+++ b/resources/lang/sl-SI/admin/components/message.php
@@ -17,7 +17,8 @@ return array(
     'delete' => array(
         'confirm'   => 'Ali ste prepričani, da želite izbrisati to komponento?',
         'error'   => 'Prišlo je do težave pri brisanju komponente. Prosim poskusite ponovno.',
-        'success' => 'Komponenta je bila uspešno izbrisana.'
+        'success' => 'Komponenta je bila uspešno izbrisana.',
+        'error_qty'   => 'Some components of this type are still checked out. Please check them in and try again.',
     ),
 
      'checkout' => array(
diff --git a/resources/lang/sl-SI/admin/consumables/general.php b/resources/lang/sl-SI/admin/consumables/general.php
index c655f95f1a..ef5cc82500 100644
--- a/resources/lang/sl-SI/admin/consumables/general.php
+++ b/resources/lang/sl-SI/admin/consumables/general.php
@@ -8,4 +8,5 @@ return array(
     'remaining' 			            => 'Preostanek',
     'total' 			                => 'Skupaj',
     'update'                            => 'Posodobi potrošni material',
+    'inventory_warning'                 => 'The inventory of this consumable is below the minimum amount of :min_count',
 );
diff --git a/resources/lang/sl-SI/admin/consumables/message.php b/resources/lang/sl-SI/admin/consumables/message.php
index 9edcd7a8c9..9943c5d90e 100644
--- a/resources/lang/sl-SI/admin/consumables/message.php
+++ b/resources/lang/sl-SI/admin/consumables/message.php
@@ -2,6 +2,7 @@
 
 return array(
 
+    'invalid_category_type' => 'The category must be a consumable category.',
     'does_not_exist' => 'Potrošni material ne obstaja.',
 
     'create' => array(
diff --git a/resources/lang/sl-SI/admin/custom_fields/general.php b/resources/lang/sl-SI/admin/custom_fields/general.php
index 6e6ecb074b..bfbcd1b1da 100644
--- a/resources/lang/sl-SI/admin/custom_fields/general.php
+++ b/resources/lang/sl-SI/admin/custom_fields/general.php
@@ -2,11 +2,11 @@
 
 return [
     'custom_fields'		        => 'Polja po meri',
-    'manage'                    => 'Manage',
+    'manage'                    => 'Upravljaj',
     'field'		                => 'Polje',
     'about_fieldsets_title'		=> 'O setih polj',
-    'about_fieldsets_text'		=> 'Fieldsets allow you to create groups of custom fields that are frequently re-used for specific asset model types.',
-    'custom_format'             => 'Custom Regex format...',
+    'about_fieldsets_text'		=> 'Seti polj vam omogočajo, da ustvarite skupine polj po meri, ki se pogosto znova uporabijo za določene tipe modelov sredstev.',
+    'custom_format'             => 'Oblika zapisa po meri regex...',
     'encrypt_field'      	        => 'Šifriraj vrednost tega polja v bazi podatkov',
     'encrypt_field_help'      => 'OPOZORILO: Šifriranje polja onemogoča iskanje.',
     'encrypted'      	        => 'Šifrirano',
@@ -35,7 +35,7 @@ return [
     'create_field_title' => 'Create a new custom field',
     'value_encrypted'      	        => 'Vrednost tega polja je šifrirana v bazi podatkov. Dešifrirane vrednosti bodo lahko videli samo skrbniki sistema',
     'show_in_email'     => 'Vključi vrednost tega polja v izdajni e-pošti poslani uporabniku? Šifriranih polj ni mogoče vključiti v e-pošti',
-    'show_in_email_short'     => 'Include in emails.',
+    'show_in_email_short' => 'Include in emails',
     'help_text' => 'Help Text',
     'help_text_description' => 'This is optional text that will appear below the form elements while editing an asset to provide context on the field.',
     'about_custom_fields_title' => 'About Custom Fields',
@@ -43,19 +43,22 @@ return [
     'add_field_to_fieldset' => 'Add Field to Fieldset',
     'make_optional' => 'Required - click to make optional',
     'make_required' => 'Optional - click to make required',
-    'reorder' => 'Reorder',
+    'reorder' => 'Spremeni vrstni red',
     'db_field' => 'DB Field',
     'db_convert_warning' => 'WARNING. This field is in the custom fields table as <code>:db_column</code> but should be <code>:expected</code>.',
     'is_unique' => 'This value must be unique across all assets',
     'unique' => 'Unique',
     'display_in_user_view' => 'Allow the checked out user to view these values in their View Assigned Assets page',
-    'display_in_user_view_table' => 'Visible to User',
+    'display_in_user_view_table' => 'Vidno uporabniku',
     'auto_add_to_fieldsets' => 'Automatically add this to every new fieldset',
     'add_to_preexisting_fieldsets' => 'Add to any existing fieldsets',
     'show_in_listview' => 'Show in list views by default. Authorized users will still be able to show/hide via the column selector',
-    'show_in_listview_short' => 'Show in lists',
+    'show_in_listview_short' => 'Pokaži v seznamih',
     'show_in_requestable_list_short' => 'Show in requestable assets list',
     'show_in_requestable_list' => 'Show value in requestable assets list. Encrypted fields will not be shown',
     'encrypted_options' => 'This field is encrypted, so some display options will not be available.',
+    'display_checkin' => 'Display in checkin forms',
+    'display_checkout' => 'Display in checkout forms',
+    'display_audit' => 'Display in audit forms',
 
 ];
diff --git a/resources/lang/sl-SI/admin/custom_fields/message.php b/resources/lang/sl-SI/admin/custom_fields/message.php
index 637dbfb554..6d147fc732 100644
--- a/resources/lang/sl-SI/admin/custom_fields/message.php
+++ b/resources/lang/sl-SI/admin/custom_fields/message.php
@@ -5,6 +5,7 @@ return array(
     'field' => array(
         'invalid'   => 'To polje ne obstaja.',
         'already_added'   => 'Polje je že dodano',
+        'none_selected'   => 'No field selected',
 
         'create' => array(
             'error'   => 'Polje ni bilo ustvarjeno, poskusite znova.',
diff --git a/resources/lang/sl-SI/admin/depreciations/general.php b/resources/lang/sl-SI/admin/depreciations/general.php
index 54833fe360..07444e3425 100644
--- a/resources/lang/sl-SI/admin/depreciations/general.php
+++ b/resources/lang/sl-SI/admin/depreciations/general.php
@@ -13,4 +13,8 @@ return [
     'no_depreciations_warning'               => '<strong>Warning: </strong>
                       You do not currently have any depreciations set up.
                       Please set up at least one depreciation to view the depreciation report.',
+    'depreciation_method'                   => 'Poročilo o amortizaciji',
+    'linear_depreciation'                   => 'Linear (Default)',
+    'half_1'                                => 'Half-year convention, always applied',
+    'half_2'                                => 'Half-year convention, applied with condition',
 ];
diff --git a/resources/lang/sl-SI/admin/groups/titles.php b/resources/lang/sl-SI/admin/groups/titles.php
index 5af53da68a..dcdf85dad4 100644
--- a/resources/lang/sl-SI/admin/groups/titles.php
+++ b/resources/lang/sl-SI/admin/groups/titles.php
@@ -11,6 +11,6 @@ return [
     'allow' 	 			=> 'Dovoli',
     'deny' 	 				=> 'Zavrni',
     'permission'            => 'Permission',
-    'grant'                 => 'Grant',
+    'grant'                 => 'Omogoči',
     'no_permissions'        => 'This group has no permissions.'
 ];
diff --git a/resources/lang/sl-SI/admin/hardware/form.php b/resources/lang/sl-SI/admin/hardware/form.php
index 2180f99244..f9038dd327 100644
--- a/resources/lang/sl-SI/admin/hardware/form.php
+++ b/resources/lang/sl-SI/admin/hardware/form.php
@@ -2,17 +2,17 @@
 
 return [
     'bulk_delete'		=> 'Potrdite množičn izbris sredstev',
-    'bulk_restore'      => 'Confirm Bulk Restore Assets', 
+    'bulk_restore'      => 'Potrdite množično obnovitev sredstev', 
   'bulk_delete_help'	=> 'Pregled sredstev za množično brisanje je v seznamu spodaj. Ko bodo sredstva izbrisana, jih je mogoče obnoviti, vendar ne bodo povezana z nobenimi uporabnikom, kot so jim trenutno dodeljena.',
-  'bulk_restore_help'	=> 'Review the assets for bulk restoration below. Once restored, these assets will not be associated with any users they were previously assigned to.',
+  'bulk_restore_help'	=> 'Spodaj si oglejte sredstva za obnovo v množičnem stanju. Po obnovitvi ta sredstva ne bodo povezana z nobenim uporabnikom, ki so mu bila prej dodeljena.',
   'bulk_delete_warn'	=> 'Brisali boste: asset_count sredstev.',
-  'bulk_restore_warn'	=> 'You are about to restore :asset_count assets.',
+  'bulk_restore_warn'	=> 'Obnovili boste: asset_count sredstev.',
     'bulk_update'		=> 'Množično posodabljanje sredstev',
     'bulk_update_help'	=> 'Ta obrazec vam omogoča, da posodobite več sredstev hkrati. Izpolnite le polja, ki jih morate spremeniti. Vsa polja, ki ostanejo prazna, bodo ostala nespremenjena. ',
-    'bulk_update_warn'	=> 'You are about to edit the properties of a single asset.|You are about to edit the properties of :asset_count assets.',
-    'bulk_update_with_custom_field' => 'Note the assets are :asset_model_count different types of models.',
-    'bulk_update_model_prefix' => 'On Models', 
-    'bulk_update_custom_field_unique' => 'This is a unique field and can not be bulk edited.',
+    'bulk_update_warn'	=> 'Urejali boste lastnosti posameznega sredstva.|Urejali boste lastnosti :asset_count sredstev.',
+    'bulk_update_with_custom_field' => 'Opomnik, da :asset_model_count različni tipi modelov.',
+    'bulk_update_model_prefix' => 'Na modelih', 
+    'bulk_update_custom_field_unique' => 'To je unikatno polje in ne more biti množično urejeno.',
     'checkedout_to'		=> 'Izdano osebi',
     'checkout_date'		=> 'Datum izdaje',
     'checkin_date'		=> 'Datum sprejema',
@@ -23,7 +23,7 @@ return [
     'depreciation'	    => 'Amortizacija',
     'depreciates_on'	=> 'Amortizacija na',
     'default_location'	=> 'Privzeta lokacija',
-    'default_location_phone' => 'Default Location Phone',
+    'default_location_phone' => 'Privzeta lokacija telefona',
     'eol_date'			=> 'EOL datum',
     'eol_rate'			=> 'EOL stopnja',
     'expected_checkin'  => 'Predviden datum dobave',
@@ -39,9 +39,9 @@ return [
     'order'				=> 'Številka naročila',
     'qr'				=> 'QR-koda',
     'requestable'		=> 'Uporabniki lahko zahtevajo to sredstvo',
-    'redirect_to_all'   => 'Return to all :type',
-    'redirect_to_type'   => 'Go to :type',
-    'redirect_to_checked_out_to'   => 'Go to Checked Out to',
+    'redirect_to_all'   => 'Vrni se na vse :tip',
+    'redirect_to_type'   => 'Pojdi na :tip',
+    'redirect_to_checked_out_to'   => 'Pojdite na odjavljeno do',
     'select_statustype'	=> 'Izberite vrsto statusa',
     'serial'			=> 'Serijska številka',
     'status'			=> 'Status',
@@ -50,13 +50,16 @@ return [
     'warranty'			=> 'Garancija',
         'warranty_expires'		=> 'Garancija poteče',
     'years'				=> 'let',
-    'asset_location' => 'Update Asset Location',
-    'asset_location_update_default_current' => 'Update default location AND actual location',
-    'asset_location_update_default' => 'Update only default location',
-    'asset_location_update_actual' => 'Update only actual location',
-    'asset_not_deployable' => 'That asset status is not deployable. This asset cannot be checked out.',
-    'asset_deployable' => 'That status is deployable. This asset can be checked out.',
-    'processing_spinner' => 'Processing... (This might take a bit of time on large files)',
-    'optional_infos'  => 'Optional Information',
-    'order_details'   => 'Order Related Information'
+    'asset_location' => 'Posodobi lokacijo sredstva',
+    'asset_location_update_default_current' => 'Posodobi privzeto lokacijo in aktualno lokacijo',
+    'asset_location_update_default' => 'Posodobi samo privzeto lokacijo',
+    'asset_location_update_actual' => 'Posodobi samo aktualno lokacijo',
+    'asset_not_deployable' => 'Tega statusa sredstev ni mogoče uporabiti. Tega sredstva ni mogoče odjaviti.',
+    'asset_not_deployable_checkin' => 'That asset status is not deployable. Using this status label will checkin the asset.',
+    'asset_deployable' => 'This asset can be checked out.',
+    'processing_spinner' => 'Obdelava (pri velikih datotekah lahko traja nekaj časa)',
+    'processing' => 'Processing... ',
+    'optional_infos'  => 'Neobvezne informacije',
+    'order_details'   => 'Informacije povezane z naročilom',
+    'calc_eol'    => 'If nulling the EOL date, use automatic EOL calculation based on the purchase date and EOL rate.',
 ];
diff --git a/resources/lang/sl-SI/admin/hardware/general.php b/resources/lang/sl-SI/admin/hardware/general.php
index ffac9330bb..8a553652c7 100644
--- a/resources/lang/sl-SI/admin/hardware/general.php
+++ b/resources/lang/sl-SI/admin/hardware/general.php
@@ -5,8 +5,8 @@ return [
     'about_assets_text'            => 'Sredstva so stvari, ki so sledene po serijski številki ali oznaki sredstva. Ponavadi so stvari z višjo vrednostjo, pri katerih je opredelitev določenega predmeta pomembna.',
     'archived'  				=> 'Arhivirano',
     'asset'  					=> 'Sredstev',
-    'bulk_checkout'             => 'Izdaja sredstev',
-    'bulk_checkin'              => 'Checkin Assets',
+    'bulk_checkout'             => 'Množična izdaja',
+    'bulk_checkin'              => 'Bulk Checkin',
     'checkin'  					=> 'Sprejem sredstev',
     'checkout'  				=> 'Izdaja sredstev',
     'clone'  					=> 'Klonska sredstvo',
@@ -27,17 +27,16 @@ return [
     'undeployable_tooltip'  	=> 'This asset has a status label that is undeployable and cannot be checked out at this time.',
     'view'  					=> 'Ogled sredstva',
     'csv_error' => 'You have an error in your CSV file:',
-    'import_text' => '<p>Upload a CSV that contains asset history. The assets and users MUST already exist in the system, or they will be skipped. Matching assets for history import happens against the asset tag. We will try to find a matching user based on the user\'s name you provide, and the criteria you select below. If you do not select any criteria below, it will simply try to match on the username format you configured in the <code>Admin &gt; General Settings</code>.</p><p>Fields included in the CSV must match the headers: <strong>Asset Tag, Name, Checkout Date, Checkin Date</strong>. Any additional fields will be ignored. </p><p>Checkin Date: blank or future checkin dates will checkout items to associated user.  Excluding the Checkin Date column will create a checkin date with todays date.</p>
-    ',
+    'import_text' => '<p>Upload a CSV that contains asset history. The assets and users MUST already exist in the system, or they will be skipped. Matching assets for history import happens against the asset tag. We will try to find a matching user based on the user\'s name you provide, and the criteria you select below. If you do not select any criteria below, it will simply try to match on the username format you configured in the <code>Admin &gt; General Settings</code>.</p><p>Fields included in the CSV must match the headers: <strong>Asset Tag, Name, Checkout Date, Checkin Date</strong>. Any additional fields will be ignored. </p><p>Checkin Date: blank or future checkin dates will checkout items to associated user.  Excluding the Checkin Date column will create a checkin date with todays date.</p>    ',
     'csv_import_match_f-l' => 'Try to match users by <strong>firstname.lastname</strong> (<code>jane.smith</code>) format',
     'csv_import_match_initial_last' => 'Try to match users by <strong>first initial last name</strong> (<code>jsmith</code>) format',
     'csv_import_match_first' => 'Try to match users by <strong>first name</strong> (<code>jane</code>) format',
     'csv_import_match_email' => 'Try to match users by <strong>email</strong> as username',
     'csv_import_match_username' => 'Try to match users by <strong>username</strong>',
-    'error_messages' => 'Error messages:',
-    'success_messages' => 'Success messages:',
-    'alert_details' => 'Please see below for details.',
-    'custom_export' => 'Custom Export',
+    'error_messages' => 'Sporočila napak:',
+    'success_messages' => 'Sporočila uspeha:',
+    'alert_details' => 'Glej dol za detajle.',
+    'custom_export' => 'Izvoz po meri',
     'mfg_warranty_lookup' => ':manufacturer Warranty Status Lookup',
     'user_department' => 'User Department',
 ];
diff --git a/resources/lang/sl-SI/admin/hardware/message.php b/resources/lang/sl-SI/admin/hardware/message.php
index 813c6b2cad..170c3bf656 100644
--- a/resources/lang/sl-SI/admin/hardware/message.php
+++ b/resources/lang/sl-SI/admin/hardware/message.php
@@ -2,18 +2,23 @@
 
 return [
 
-    'undeployable' 		=> '<strong>Opozorilo: </strong> To sredstvo je bilo označeno kot trenutno nerazdeljeno. Če se je ta status spremenil, posodobite status sredstva.',
-    'does_not_exist' 	=> 'Sredstvo ne obstaja.',
-    'does_not_exist_var'=> 'Asset with tag :asset_tag not found.',
-    'no_tag' 	        => 'No asset tag provided.',
-    'does_not_exist_or_not_requestable' => 'That asset does not exist or is not requestable.',
-    'assoc_users'	 	=> 'To sredstvo je trenutno izdano uporabniku in ga ni mogoče izbrisati. Najprej preverite sredstvo in poskusite znova izbrisati. ',
+    'undeployable' 		 => '<strong>Opozorilo: </strong> To sredstvo je bilo označeno kot trenutno nerazdeljeno. Če se je ta status spremenil, posodobite status sredstva.',
+    'does_not_exist' 	 => 'Sredstvo ne obstaja.',
+    'does_not_exist_var' => 'Sredstvo z oznako :oznaka_sredstva ni bilo najdeno.',
+    'no_tag' 	         => 'Oznaka sredstva ni podana.',
+    'does_not_exist_or_not_requestable' => 'To sredstvo ne obstaja ali ga ni mogoče zahtevati.',
+    'assoc_users'	 	 => 'To sredstvo je trenutno izdano uporabniku in ga ni mogoče izbrisati. Najprej preverite sredstvo in poskusite znova izbrisati. ',
     'warning_audit_date_mismatch' 	=> 'This asset\'s next audit date (:next_audit_date) is before the last audit date (:last_audit_date). Please update the next audit date.',
+    'labels_generated'   => 'Labels were successfully generated.',
+    'error_generating_labels' => 'Error while generating labels.',
+    'no_assets_selected' => 'No assets selected.',
 
     'create' => [
         'error'   		=> 'Sredstvo ni bilo ustvarjeno, poskusite znova. :(',
         'success' 		=> 'Sredstvo je uspešno ustvarjeno. :)',
         'success_linked' => 'Asset with tag :tag was created successfully. <strong><a href=":link" style="color: white;">Click here to view</a></strong>.',
+        'multi_success_linked' => 'Asset with tag :links was created successfully.|:count assets were created succesfully. :links.',
+        'partial_failure' => 'An asset was unable to be created. Reason: :failures|:count assets were unable to be created. Reasons: :failures',
     ],
 
     'update' => [
@@ -21,15 +26,15 @@ return [
         'success' 			=> 'Sredstvo je uspešno posodobljeno.',
         'encrypted_warning' => 'Asset updated successfully, but encrypted custom fields were not due to permissions',
         'nothing_updated'	=>  'Nobeno polje ni bilo izbrana, zato nebo nič posodobljeno.',
-        'no_assets_selected'  =>  'No assets were selected, so nothing was updated.',
-        'assets_do_not_exist_or_are_invalid' => 'Selected assets cannot be updated.',
+        'no_assets_selected'  =>  'Nobena sredstva niso bila izbrana, zato ni bilo nič izbrisanih.',
+        'assets_do_not_exist_or_are_invalid' => 'Izbrana sredstva ni mogoče posodobiti.',
     ],
 
     'restore' => [
         'error'   		=> 'Sredstvo ni bilo obnovljeno, poskusite znova',
         'success' 		=> 'Sredstvo je bilo uspešno obnovljeno.',
         'bulk_success' 		=> 'Sredstvo je bilo uspešno obnovljeno.',
-        'nothing_updated'   => 'No assets were selected, so nothing was restored.', 
+        'nothing_updated'   => 'Nobeno sredstvo ni bilo izbran, zato nebo nič obnovljeno.', 
     ],
 
     'audit' => [
@@ -51,20 +56,24 @@ return [
     ],
 
     'import' => [
+        'import_button'         => 'Process Import',
         'error'                 => 'Nekateri elementi niso bili pravilno uvoženi.',
         'errorDetail'           => 'Naslednji elementi niso bili uvoženi zaradi napak.',
         'success'               => 'Vaša datoteka je bila uvožena',
         'file_delete_success'   => 'Vaša datoteka je bila uspešno izbrisana',
         'file_delete_error'      => 'Datoteke ni bilo mogoče izbrisati',
-        'file_missing' => 'The file selected is missing',
+        'file_missing' => 'Izbrana datoteka manjka',
+        'file_already_deleted' => 'The file selected was already deleted',
         'header_row_has_malformed_characters' => 'One or more attributes in the header row contain malformed UTF-8 characters',
         'content_row_has_malformed_characters' => 'One or more attributes in the first row of content contain malformed UTF-8 characters',
+        'transliterate_failure' => 'Transliteration from :encoding to UTF-8 failed due to invalid characters in input'
     ],
 
 
     'delete' => [
         'confirm'   	=> 'Ali ste prepričani, da želite izbrisati to sredstvo?',
         'error'   		=> 'Prišlo je do težave z izbrisom sredstva. Prosim poskusite ponovno.',
+        'assigned_to_error' => '{1}Asset Tag: :asset_tag is currently checked out. Check in this device before deletion.|[2,*]Asset Tags: :asset_tag are currently checked out. Check in these devices before deletion.',
         'nothing_updated'   => 'Nobena sredstva niso bila izbrana, zato ni bilo nič izbrisanih.',
         'success' 		=> 'Sredstvo je bilo uspešno izbrisano.',
     ],
@@ -77,6 +86,11 @@ return [
         'no_assets_selected' => 'Na seznamu morate izbrati vsaj eno sredstev',
     ],
 
+    'multi-checkout' => [
+        'error'   => 'Asset was not checked out, please try again|Assets were not checked out, please try again',
+        'success' => 'Asset checked out successfully.|Assets checked out successfully.',
+    ],
+
     'checkin' => [
         'error'   		=> 'Sredstev ni bilo prevzeto, poskusite znova',
         'success' 		=> 'Sredstev je bilo uspešno prevzeta.',
@@ -86,9 +100,10 @@ return [
     ],
 
     'requests' => [
-        'error'   		=> 'Sredstev ni bila zahtevana, poskusite znova',
-        'success' 		=> 'Sredstev je uspešno zahtevana.',
-        'canceled'      => 'Zahteva za izdajo je bila uspešno preklicana',
+        'error'   		=> 'Request was not successful, please try again.',
+        'success' 		=> 'Request successfully submitted.',
+        'canceled'      => 'Request successfully canceled.',
+        'cancel'        => 'Cancel this item request',
     ],
 
 ];
diff --git a/resources/lang/sl-SI/admin/hardware/table.php b/resources/lang/sl-SI/admin/hardware/table.php
index 8739412b90..a676ac5055 100644
--- a/resources/lang/sl-SI/admin/hardware/table.php
+++ b/resources/lang/sl-SI/admin/hardware/table.php
@@ -5,17 +5,17 @@ return [
     'asset_tag'   	=> 'Oznaka sredstva',
     'asset_model'       => 'Model',
     'assigned_to'   => 'Dodeljena',
-    'book_value'  	=> 'Current Value',
+    'book_value'  	=> 'Trenutna vrednost',
     'change' 		=> 'Prejeto/Izdano',
     'checkout_date' => 'Datum Izdaje',
     'checkoutto' 	=> 'Izdano',
-    'components_cost' => 'Total Components Cost',
-    'current_value' => 'Current Value',
+    'components_cost' => 'Skupna cena komponent',
+    'current_value' => 'Trenutna vrednost',
     'diff' 			=> 'Razlika',
     'dl_csv' 		=> 'Prenesi CSV',
     'eol' 			=> 'EOL',
     'id'      		=> 'ID',
-    'last_checkin_date' => 'Last Checkin Date',
+    'last_checkin_date' => 'Zadnji datum sprejema',
     'location' 		=> 'Lokacija',
     'purchase_cost'	=> 'Cena',
     'purchase_date'	=> 'Kupljeno',
@@ -25,9 +25,8 @@ return [
     'image'		    => 'Slika naprave',
     'days_without_acceptance' => 'Dnevi brez sprejema',
     'monthly_depreciation' => 'Mesečna amortizacija',
-    'assigned_to'    => 'Dodeljena',
-    'requesting_user' => 'Requesting User',
-    'requested_date' => 'Requested Date',
-    'changed'       => 'Changed',
-    'icon' => 'Icon',
+    'requesting_user' => 'Uporabnik, ki je vložil zahtevo',
+    'requested_date' => 'Zahtevan datum',
+    'changed'       => 'Spremenjeno',
+    'icon' => 'Ikona',
 ];
diff --git a/resources/lang/sl-SI/admin/kits/general.php b/resources/lang/sl-SI/admin/kits/general.php
index 7fa019ac62..fca7d1fd98 100644
--- a/resources/lang/sl-SI/admin/kits/general.php
+++ b/resources/lang/sl-SI/admin/kits/general.php
@@ -47,4 +47,5 @@ return [
     'kit_deleted'                       => 'Komplet uspešno izbrisan',
     'kit_model_updated'                 => 'Model was successfully updated',
     'kit_model_detached'                => 'Model was successfully detached',
+    'model_already_attached'            => 'Model already attached to kit',
 ];
diff --git a/resources/lang/sl-SI/admin/labels/message.php b/resources/lang/sl-SI/admin/labels/message.php
index 96785f0754..1f0c0ccdb9 100644
--- a/resources/lang/sl-SI/admin/labels/message.php
+++ b/resources/lang/sl-SI/admin/labels/message.php
@@ -6,6 +6,6 @@ return [
     'invalid_return_type'  => 'Invalid type returned from :name. Expected :expected, got :actual.',
     'invalid_return_value' => 'Invalid value returned from :name. Expected :expected, got :actual.',
 
-    'does_not_exist' => 'Label does not exist',
+    'does_not_exist' => 'Oznaka ne obstaja',
     
 ];
diff --git a/resources/lang/sl-SI/admin/labels/table.php b/resources/lang/sl-SI/admin/labels/table.php
index 184425e95e..e9068ea668 100644
--- a/resources/lang/sl-SI/admin/labels/table.php
+++ b/resources/lang/sl-SI/admin/labels/table.php
@@ -6,10 +6,10 @@ return [
     'example_category'   => 'Test Category',
     'example_location'   => 'Building 2',
     'example_manufacturer'  => 'Test Manufacturing Inc.',
-    'example_model'      => 'Test Model',
+    'example_model'      => 'Testiraj model',
     'example_supplier'   => 'Test Company Limited',
-    'labels_per_page'    => 'Labels',
-    'support_fields'     => 'Fields',
+    'labels_per_page'    => 'Oznake',
+    'support_fields'     => 'Polja',
     'support_asset_tag'  => 'Oznaka',
     'support_1d_barcode' => '1D',
     'support_2d_barcode' => '2D',
diff --git a/resources/lang/sl-SI/admin/licenses/general.php b/resources/lang/sl-SI/admin/licenses/general.php
index b38e3b3f64..394377436d 100644
--- a/resources/lang/sl-SI/admin/licenses/general.php
+++ b/resources/lang/sl-SI/admin/licenses/general.php
@@ -14,6 +14,7 @@ return array(
     'info'  					=> 'Informacije o licenci',
     'license_seats'  			=> 'Število licenc',
     'seat'  					=> 'Število licenc',
+    'seat_count'  				=> 'Seat :count',
     'seats'  					=> 'Število licenc',
     'software_licenses'  		=> 'Licence za programsko opremo',
     'user'  					=> 'Uporabnik',
@@ -23,12 +24,12 @@ return array(
         [
             'checkin_all'           => [
                 'button'            => 'Checkin All Seats',
-                'modal'             => 'This will action checkin one seat. | This action will checkin all :checkedout_seats_count seats for this license.',
+                'modal'             => 'This action will checkin one seat. | This action will checkin all :checkedout_seats_count seats for this license.',
                 'enabled_tooltip'   => 'Checkin ALL seats for this license from both users and assets',
                 'disabled_tooltip'  => 'This is disabled because there are no seats currently checked out',
                 'disabled_tooltip_reassignable'  => 'This is disabled because the License is not reassignable',
                 'success'           => 'License successfully checked in! | All licenses were successfully checked in!',
-                'log_msg'           => 'Checked in via bulk license checkout in license GUI',
+                'log_msg'           => 'Checked in via bulk license checkin in license GUI',
             ],
 
             'checkout_all'              => [
diff --git a/resources/lang/sl-SI/admin/licenses/message.php b/resources/lang/sl-SI/admin/licenses/message.php
index bfdb6533cc..68638be9a5 100644
--- a/resources/lang/sl-SI/admin/licenses/message.php
+++ b/resources/lang/sl-SI/admin/licenses/message.php
@@ -44,10 +44,13 @@ return array(
         'error'   => 'Prišlo je do težave pri izdji licence. Prosim poskusite ponovno.',
         'success' => 'Licenca je uspešno izdana',
         'not_enough_seats' => 'Not enough license seats available for checkout',
+        'mismatch' => 'The license seat provided does not match the license',
+        'unavailable' => 'This seat is not available for checkout.',
     ),
 
     'checkin' => array(
         'error'   => 'Prišlo je do težave pri prevzemu licence. Prosim poskusite ponovno.',
+        'not_reassignable' => 'License not reassignable',
         'success' => 'Licenca je uspešno prevzeta'
     ),
 
diff --git a/resources/lang/sl-SI/admin/licenses/table.php b/resources/lang/sl-SI/admin/licenses/table.php
index f65e454c91..3bf1abe02f 100644
--- a/resources/lang/sl-SI/admin/licenses/table.php
+++ b/resources/lang/sl-SI/admin/licenses/table.php
@@ -4,7 +4,7 @@ return array(
 
     'assigned_to'   	=> 'Dodeljena',
     'checkout'   		=> 'Prejeto/Izdano',
-    'deleted_at'        => 'Deleted at',
+    'deleted_at'        => 'Izbrisano',
     'id'      			=> 'ID',
     'license_email'   	=> 'Licenca registrirana na e-pošto',
     'license_name'   	=> 'Licencirano na',
diff --git a/resources/lang/sl-SI/admin/locations/message.php b/resources/lang/sl-SI/admin/locations/message.php
index 5f3af41edc..925cc3f34a 100644
--- a/resources/lang/sl-SI/admin/locations/message.php
+++ b/resources/lang/sl-SI/admin/locations/message.php
@@ -3,11 +3,12 @@
 return array(
 
     'does_not_exist' => 'Lokacija ne obstaja.',
-    'assoc_users'    => 'This location is not currently deletable because it is the location of record for at least one asset or user, has assets assigned to it, or is the parent location of another location. Please update your models to no longer reference this company and try again. ',
+    'assoc_users'    => 'Te lokacije trenutno ni mogoče izbrisati, ker je lokacija zapisa za vsaj eno sredstvo ali uporabnika, ker so ji dodeljena sredstva ali ker je starševska lokacija druge lokacije. Posodobite svoje zapise tako, da se na to lokacijo ne boste več sklicevali, in poskusite znova ',
     'assoc_assets'	 => 'Ta lokacija je trenutno povezana z vsaj enim sredstvom in je ni mogoče izbrisati. Prosimo, posodobite svoja sredstva, da ne bodo več vsebovali te lokacije in poskusite znova. ',
     'assoc_child_loc'	 => 'Ta lokacija je trenutno starš vsaj ene lokacije otroka in je ni mogoče izbrisati. Posodobite svoje lokacije, da ne bodo več vsebovale te lokacije in poskusite znova. ',
-    'assigned_assets' => 'Assigned Assets',
-    'current_location' => 'Current Location',
+    'assigned_assets' => 'Dodeljena sredstva',
+    'current_location' => 'Trenutna lokacija',
+    'open_map' => 'Odpri v :map_provider_icon Zemljevidih',
 
 
     'create' => array(
@@ -20,6 +21,11 @@ return array(
         'success' => 'Lokacija je bila posodobljena.'
     ),
 
+    'restore' => array(
+        'error'   => 'Lokacija ni bila obnovljena, poskusite znova',
+        'success' => 'Lokacija je bila uspešno obnovljena.'
+    ),
+
     'delete' => array(
         'confirm'   	=> 'Ali ste prepričani, da želite izbrisati to lokacijo?',
         'error'   => 'Prišlo je do težave z brisanjem lokacije. Prosim poskusite ponovno.',
diff --git a/resources/lang/sl-SI/admin/locations/table.php b/resources/lang/sl-SI/admin/locations/table.php
index 6f8c25a975..17b01369ac 100644
--- a/resources/lang/sl-SI/admin/locations/table.php
+++ b/resources/lang/sl-SI/admin/locations/table.php
@@ -15,16 +15,16 @@ return [
     'print_all_assigned'        => 'Natisni vse dodeljene',
     'name'                      => 'Ime lokacije',
     'address'                   => 'Naslov',
-    'address2'                   => 'Address Line 2',
+    'address2'                   => 'Druga vrstica naslova',
     'zip'                       => 'Poštna številka',
     'locations'                 => 'Lokacije',
     'parent'                    => 'Starš',
     'currency'                  => 'Lokalna valuta',
     'ldap_ou'                   => 'LDAP Search OU',
-    'user_name'                 => 'User Name',
+    'user_name'                 => 'Uporabniško ime',
     'department'                => 'Oddelek',
     'location'                  => 'Lokacija',
-    'asset_tag'                 => 'Assets Tag',
+    'asset_tag'                 => 'Oznaka sredstva',
     'asset_name'                => 'Ime',
     'asset_category'            => 'Kategorija',
     'asset_manufacturer'        => 'Proizvajalec',
@@ -32,11 +32,12 @@ return [
     'asset_serial'              => 'Serijska številka',
     'asset_location'            => 'Lokacija',
     'asset_checked_out'         => 'Izdano',
-    'asset_expected_checkin'    => 'Expected Checkin',
+    'asset_expected_checkin'    => 'Predviden datum dobave',
     'date'                      => 'Datum:',
-    'phone'                     => 'Location Phone',
-    'signed_by_asset_auditor'   => 'Signed By (Asset Auditor):',
-    'signed_by_finance_auditor' => 'Signed By (Finance Auditor):',
-    'signed_by_location_manager' => 'Signed By (Location Manager):',
-    'signed_by'                 => 'Signed Off By:',
+    'phone'                     => 'Telefonska št. Lokacije',
+    'signed_by_asset_auditor'   => 'Podpisal/a Je (revizor sredstva):',
+    'signed_by_finance_auditor' => 'Podpisal/a Je (finančni revizor):',
+    'signed_by_location_manager' => 'Podpisal/a Je (lokacijski menedžer):',
+    'signed_by'                 => 'Odpisal/a Je:',
+    'clone'  					=> 'Clone Location',
 ];
diff --git a/resources/lang/sl-SI/admin/models/general.php b/resources/lang/sl-SI/admin/models/general.php
index 6dfd342001..da2bfa7708 100644
--- a/resources/lang/sl-SI/admin/models/general.php
+++ b/resources/lang/sl-SI/admin/models/general.php
@@ -3,7 +3,7 @@
 return array(
     'about_models_title'     => 'O modelih sredstev',
     'about_models_text'           => 'Modeli sredstev so način za združevanje identičnih sredstev. "MBP 2013", "IPhone 6s" itd.',
-    'deleted'  					        => 'Ta model je bil izbrisan.',
+    'deleted'  					=> 'Ta model je bil izbrisan.',
     'bulk_delete'               => 'Množično brisanje modelov sredstva',
     'bulk_delete_help'               => 'S potrditvenimi polji spodaj potrdite izbris izbranih modelov sredstev. Modelov sredstev, ki imajo z njimi povezana sredstva, ni mogoče izbrisati, dokler sredstva niso povezana z drugačnim modelom.',
     'bulk_delete_warn'          => 'You are about to delete one asset model.|You are about to delete :model_count asset models.',
diff --git a/resources/lang/sl-SI/admin/models/message.php b/resources/lang/sl-SI/admin/models/message.php
index a31e23fbdf..7e06321d57 100644
--- a/resources/lang/sl-SI/admin/models/message.php
+++ b/resources/lang/sl-SI/admin/models/message.php
@@ -2,12 +2,12 @@
 
 return array(
 
-    'deleted' => 'Deleted asset model',
+    'deleted' => 'Izbrisan model sredstva',
     'does_not_exist' => 'Model ne obstaja.',
-    'no_association' => 'WARNING! The asset model for this item is invalid or missing!',
-    'no_association_fix' => 'This will break things in weird and horrible ways. Edit this asset now to assign it a model.',
+    'no_association' => 'OPOZORILO! Model sredstva za ta element je neveljaven ali manjka!',
+    'no_association_fix' => 'To bo zrušilo stvari na čudne in grozljive načine. Uredite to sredstvo zdaj in mu dodelite model.',
     'assoc_users'	 => 'Ta model je trenutno povezan z enim ali več sredstvi in ​​ga ni mogoče izbrisati. Prosimo, izbrišite sredstva in poskusite zbrisati znova. ',
-
+    'invalid_category_type' => 'Ta kategorija mora biti kategorija sredstva.',
 
     'create' => array(
         'error'   => 'Model ni bil ustvarjen, poskusite znova.',
@@ -33,14 +33,14 @@ return array(
 
     'bulkedit' => array(
         'error'   		=> 'Polja niso bila spremenjena, nič ni posodobljeno.',
-        'success' 		=> 'Model successfully updated. |:model_count models successfully updated.',
-        'warn'          => 'You are about to update the properties of the following model:|You are about to edit the properties of the following :model_count models:',
+        'success' 		=> 'Model je bil uspešno posodobljen. |:model_count modeli uspešno posodobljeni.',
+        'warn'          => 'Posodobili boste lastnosti naslednjega modela:|Urejali boste lastnosti naslednjega :model_count modeli:',
 
     ),
 
     'bulkdelete' => array(
         'error'   		    => 'Modeli niso bili izbrani, nič ni izbrisano.',
-        'success' 		    => 'Model deleted!|:success_count models deleted!',
+        'success' 		    => 'Model izbrisan!|:success_count modeli izbrisani!',
         'success_partial' 	=> ': modeli so bili izbrisani, vendar: fail_count ni bilo mogoče izbrisati, ker so še vedno sredstva, povezana z njimi.'
     ),
 
diff --git a/resources/lang/sl-SI/admin/reports/general.php b/resources/lang/sl-SI/admin/reports/general.php
index 932fd8f4c5..1c59967cf6 100644
--- a/resources/lang/sl-SI/admin/reports/general.php
+++ b/resources/lang/sl-SI/admin/reports/general.php
@@ -2,9 +2,10 @@
 
 return [
     'info'   => 'Izberite možnosti, ki jih želite za poročilo o sredstvih.',
-    'deleted_user' => 'Deleted user',
-    'send_reminder' => 'Send reminder',
-    'reminder_sent' => 'Reminder sent',
+    'deleted_user' => 'Izbrisan uporabnika',
+    'send_reminder' => 'Pošlji opomnik',
+    'cannot_send_reminder' => 'User has been deleted or does not have an email address so cannot receive a reminder',
+    'reminder_sent' => 'Opomnik poslan',
     'acceptance_deleted' => 'Acceptance request deleted',
     'acceptance_request' => 'Acceptance request',
     'custom_export' => [
@@ -13,5 +14,10 @@ return [
         'user_state' => 'User State',
         'user_country' => 'User Country',
         'user_zip' => 'User Zip'
-    ]
-];
\ No newline at end of file
+    ],
+    'open_saved_template' => 'Open Saved Template',
+    'save_template' =>  'Save Template',
+    'select_a_template' => 'Select a Template',
+    'template_name' => 'Template Name',
+    'update_template' => 'Update Template',
+];
diff --git a/resources/lang/sl-SI/admin/reports/message.php b/resources/lang/sl-SI/admin/reports/message.php
index 9fee01dea9..2800bbdf0b 100644
--- a/resources/lang/sl-SI/admin/reports/message.php
+++ b/resources/lang/sl-SI/admin/reports/message.php
@@ -1,5 +1,16 @@
 <?php
 
-return array(
-    'error'   => 'Izbrati morate vsaj eno možnost.'
-);
+return [
+    'about_templates' => 'About Saved Templates',
+    'saving_templates_description' => 'Select your options, then enter the name of your template in the box above and click the \'Save Template\' button. Use the dropdown to select a previously saved template.',
+    'create'  => [
+        'success' => 'Template saved successfully',
+    ],
+    'update' => [
+        'success' => 'Template updated successfully',
+    ],
+    'delete' => [
+        'success' => 'Template deleted',
+        'no_delete_permission' => 'Template does not exist or you do not have permission to delete it.',
+    ],
+];
diff --git a/resources/lang/sl-SI/admin/settings/general.php b/resources/lang/sl-SI/admin/settings/general.php
index 987a013c95..d0692044b1 100644
--- a/resources/lang/sl-SI/admin/settings/general.php
+++ b/resources/lang/sl-SI/admin/settings/general.php
@@ -8,13 +8,13 @@ return [
     'ad_append_domain'          => 'Dodaj ime domene polju z uporabniškim imenom',
     'ad_append_domain_help'     => 'Uporabniku ni potrebno vnesti "uporabnisko-ime@domena.local", vnesejo lahko le "uporabnisko-ime".',
     'admin_cc_email'            => 'E-pošta v vednost',
-    'admin_cc_email_help'       => 'V kolikor želite poslati kopijo sprejemne/izdajne e-pošte poslane uporabnikom tudi na dodaten e-poštni račun, ga vnesite tu. V nasprotnem primeru pustite polje prazno.',
-    'admin_settings'            => 'Admin Settings',
+    'admin_cc_email_help'       => 'Send a copy of checkin/checkout emails to this address.',
+    'admin_settings'            => 'Adminske nastavitve',
     'is_ad'				        => 'To je strežnik Active Directory',
-    'alerts'                	=> 'Alerts',
-    'alert_title'               => 'Update Notification Settings',
+    'alerts'                	=> 'Opozorila',
+    'alert_title'               => 'Posodobi nastavitve notifikacij',
     'alert_email'				=> 'Pošlji opozorila na',
-    'alert_email_help'    => 'Email addresses or distribution lists you want alerts to be sent to, comma separated',
+    'alert_email_help'          => 'Email addresses or distribution lists you want alerts to be sent to, comma separated.',
     'alerts_enabled'			=> 'Opozorila e-pošte so omogočena',
     'alert_interval'			=> 'Prag za opozorilo pri poteku (v dneh)',
     'alert_inv_threshold'		=> 'Prag za opozorilo pri inventuri',
@@ -31,15 +31,18 @@ return [
     'backups'					=> 'Varnostna kopija',
     'backups_help'              => 'Create, download, and restore backups ',
     'backups_restoring'         => 'Restoring from Backup',
-    'backups_upload'            => 'Upload Backup',
+    'backups_clean' => 'Clean the backed-up database before restore',
+    'backups_clean_helptext' => "This can be useful if you're changing between database versions",
+    'backups_upload'            => 'Naloži varnostno kopijo',
     'backups_path'              => 'Backups on the server are stored in <code>:path</code>',
-    'backups_restore_warning'   => 'Use the restore button <small><span class="btn btn-xs btn-warning"><i class="text-white fas fa-retweet" aria-hidden="true"></i></span></small> to restore from a previous backup. (This does not currently work with S3 file storage or Docker.)<br><br>Your <strong>entire :app_name database and any uploaded files will be completely replaced</strong> by what\'s in the backup file.  ',
+    'backups_restore_warning'   => 'Use the restore button <small><span class="btn btn-xs btn-warning"><i class="text-white fas fa-retweet" aria-hidden="true"></i></span></small> to restore from a previous backup. (This does not currently work with S3 file storage or Docker.)<br><br>Your <strong>entire :app_name database and any uploaded files will be completely replaced</strong> by what\'s in the backup file  ',
     'backups_logged_out'         => 'All existing users, including you, will be logged out once your restore is complete.',
     'backups_large'             => 'Very large backups may time out on the restore attempt and may still need to be run via command line. ',
     'barcode_settings'			=> 'Nastavitve črtne kode',
     'confirm_purge'			    => 'Potrdi čiščenje',
     'confirm_purge_help'		=> 'Enter the text "DELETE" in the box below to purge your deleted records. This action cannot be undone and will PERMANENTLY delete all soft-deleted items and users. (You should make a backup first, just to be safe.)',
     'custom_css'				=> 'CSS po meri',
+    'custom_css_placeholder'	=> 'Add your custom CSS',
     'custom_css_help'			=> 'Vnesite CSS po meri, ki bi jih radi uporabili. Ne vključite &lt;style&gt;&lt;/style&gt; oznake.',
     'custom_forgot_pass_url'	=> 'URL za ponastavitev gesla po meri',
     'custom_forgot_pass_url_help'	=> 'S tem se nadomešča vgrajeni URL za pozabljeni geslo na zaslonu za prijavo, ki je uporaben za usmerjanje ljudi v notranje ali gostiteljsko funkcijo ponastavitve gesla LDAP. Učinkovito bo onemogočil lokalno uporabniško pozabljeno geslo.',
@@ -47,54 +50,54 @@ return [
     'dashboard_message_help'	=> 'To besedilo bo prikazano na nadzorni plošči za vse, ki imajo dovoljenje za ogled nadzorne plošče.',
     'default_currency'  		=> 'Privzeta valuta',
     'default_eula_text'			=> 'Privzeta EULA',
+    'default_eula_text_placeholder' => 'Add your default EULA text',
     'default_language'			=> 'Privzeti jezik',
     'default_eula_help_text'	=> 'Prav tako lahko povežete EULA po meri z določenimi kategorijami sredstev.',
     'acceptance_note'           => 'Add a note for your decision (Optional)',
     'display_asset_name'        => 'Prikaži ime sredstva',
     'display_checkout_date'     => 'Prikaže datum izdaje',
     'display_eol'               => 'Prikaz EOL v pogledu tabele',
-    'display_qr'                => 'Prikaži kvadratne kode',
+    'display_qr'                => 'Display 2D barcode',
     'display_alt_barcode'		=> 'Prikaži 1D črtno kodo',
-    'email_logo'                => 'Email Logo',
     'barcode_type'				=> 'Tip 2D črtne kode',
     'alt_barcode_type'			=> 'Tip 1D črtne kode',
-    'email_logo_size'       => 'Square logos in email look best. ',
-    'enabled'                   => 'Enabled',
+    'enabled'                   => 'Omogočeno',
     'eula_settings'				=> 'Nastavitve EULA',
     'eula_markdown'				=> 'Ta EULA dovoljuje <a href="https://help.github.com/articles/github-flavored-markdown/">Github z okusom markdowna</a>.',
-    'favicon'                   => 'Favicon',
+    'empty_row_count'           => 'Field Start Offset (Empty Rows)',
+    'empty_row_count_help'      => 'Fields will begin populating after this many empty rows are skipped at the top of the label.',
+    'favicon'                   => 'Favikona',
     'favicon_format'            => 'Accepted filetypes are ico, png, and gif. Other image formats may not work in all browsers.',
     'favicon_size'          => 'Favicons should be square images, 16x16 pixels.',
     'footer_text'               => 'Dodatno besedilo noge ',
     'footer_text_help'          => 'To besedilo bo prikazano v desnem delu noge. Povezave so dovoljene z uporabo <a href="https://help.github.com/articles/github-flavored-markdown/">Gothub okusno markdown</a>. Prelomi vrstic, glave, slike itd. Lahko povzročijo nepredvidljive rezultate.',
+    'footer_text_placeholder'   => 'Optional footer text',
     'general_settings'			=> 'Splošne nastavitve',
-    'general_settings_keywords' => 'company support, signature, acceptance, email format, username format, images, per page, thumbnail, eula, gravatar, tos, dashboard, privacy',
-    'general_settings_help'     => 'Default EULA and more',
+    'general_settings_help'     => 'Privzeta EULA in več',
     'generate_backup'			=> 'Ustvari varnostno kopiranje',
     'google_workspaces'         => 'Google Workspaces',
     'header_color'              => 'Barva glave',
     'info'                      => 'Te nastavitve vam omogočajo prilagoditev določenih vidikov vaše namestitve.',
-    'label_logo'                => 'Label Logo',
     'label_logo_size'           => 'Square logos look best - will be displayed in the top right of each asset label. ',
     'laravel'                   => 'Laravel Version',
     'ldap'                      => 'LDAP',
     'ldap_default_group'        => 'Default Permissions Group',
     'ldap_default_group_info'   => 'Select a group to assign to newly synced users. Remember that a user takes on the permissions of the group they are assigned.',
-    'no_default_group'          => 'No Default Group',
-    'ldap_help'                 => 'LDAP/Active Directory',
-    'ldap_client_tls_key'       => 'LDAP Client TLS Key',
-    'ldap_client_tls_cert'      => 'LDAP Client-Side TLS Certificate',
+    'no_default_group'          => 'Brez privzete skupine',
+    'ldap_help'                 => 'Active Directory',
+    'ldap_client_tls_key'       => 'LDAP Klientski TLS Ključ',
+    'ldap_client_tls_cert'      => 'LDAP Klientski TLS certifikat',
     'ldap_enabled'              => 'Omogočen LDAP',
     'ldap_integration'          => 'Integracija LDAP',
     'ldap_settings'             => 'Nastavitve LDAP',
     'ldap_client_tls_cert_help' => 'Client-Side TLS Certificate and Key for LDAP connections are usually only useful in Google Workspace configurations with "Secure LDAP." Both are required.',
-    'ldap_location'             => 'LDAP Location',
+    'ldap_location'             => 'LDAP Lokacija',
 'ldap_location_help'             => 'The Ldap Location field should be used if <strong>an OU is not being used in the Base Bind DN.</strong> Leave this blank if an OU search is being used.',
     'ldap_login_test_help'      => 'Vnesite veljavno uporabniško ime in geslo za LDAP iz osnovnega DN, ki ste ga navedli zgoraj, da preizkusite, ali je vaša prijava LDAP konfigurirana pravilno. Najprej morate shraniti posodobljene nastavitve za LDAP.',
     'ldap_login_sync_help'      => 'To samo testira, če lahko LDAP pravilno sinhronizira. Če vaša poizvedba LDAP Authentication ni pravilna, se uporabniki morda še vedno ne morejo prijaviti. Najprej morate shraniti posodobljene nastavitve za LDAP.',
-    'ldap_manager'              => 'LDAP Manager',
+    'ldap_manager'              => 'LDAP menedžer',
     'ldap_server'               => 'Strežnik LDAP',
-    'ldap_server_help'          => 'To se mora začeti z ldap: / / (za nešifrirano ali TLS) ali ldaps: / / (za SSL)',
+    'ldap_server_help'          => 'This should start with ldap:// (for unencrypted) or ldaps:// (for TLS or SSL)',
     'ldap_server_cert'			=> 'Validacija potrdila SSL LDAP',
     'ldap_server_cert_ignore'	=> 'Dovoli neveljavno potrdilo SSL',
     'ldap_server_cert_help'		=> 'Izberite to potrditveno polje, če uporabljate samo-podpisano potrdilo SSL in želite sprejeti neveljavno potrdilo SSL.',
@@ -108,8 +111,8 @@ return [
     'ldap_pword'                => 'LDAP uporabniško geslo',
     'ldap_basedn'               => 'Base Bind DN',
     'ldap_filter'               => 'LDAP Filter',
-    'ldap_pw_sync'              => 'LDAP sinhronizacija gesla',
-    'ldap_pw_sync_help'         => 'Počistite polje, če ne želite, da se gesla LDAP sinhronizirajo z lokalnimi gesli. Če funkcijo onemogočite, se vaši uporabniki morda ne bodo mogli prijaviti, če vaš strežnik LDAP iz neznanega razloga ni dosegljiv.',
+    'ldap_pw_sync'              => 'Cache LDAP Passwords',
+    'ldap_pw_sync_help'         => 'Uncheck this box if you do not wish to keep LDAP passwords cached as local hashed passwords. Disabling this means that your users may not be able to login if your LDAP server is unreachable for some reason.',
     'ldap_username_field'       => 'Uporabniško polje',
     'ldap_lname_field'          => 'Priimek',
     'ldap_fname_field'          => 'LDAP ime',
@@ -117,27 +120,30 @@ return [
     'ldap_version'              => 'Različica LDAP',
     'ldap_active_flag'          => 'Aktivna zastava LDAP',
     'ldap_activated_flag_help'  => 'This value is used to determine whether a synced user can login to Snipe-IT. <strong>It does not affect the ability to check items in or out to them</strong>, and should be the <strong>attribute name</strong> within your AD/LDAP, <strong>not the value</strong>. <br><br>If this field is set to a field name that does not exist in your AD/LDAP, or the value in the AD/LDAP field is set to <code>0</code> or <code>false</code>, <strong>user login will be disabled</strong>. If the value in the AD/LDAP field is set to <code>1</code> or <code>true</code> or <em>any other text</em> means the user can log in. When the field is blank in your AD, we respect the <code>userAccountControl</code> attribute, which usually allows non-suspended users to log in.',
+    'ldap_invert_active_flag'   => 'LDAP Invert Active Flag',
+    'ldap_invert_active_flag_help'     => 'If enabled: when the value returned by LDAP Active Flag is <code>0</code> or <code>false</code> the user account will be active.',
     'ldap_emp_num'              => 'LDAP številka zaposlenega',
     'ldap_email'                => 'E-pošta LDAP',
-    'ldap_test'                 => 'Test LDAP',
-    'ldap_test_sync'            => 'Test LDAP Synchronization',
+    'ldap_test'                 => 'Testiraj LDAP',
+    'ldap_test_sync'            => 'Testiraj LDAP sinhronizacijo',
     'license'                   => 'Licenca za programsko opremo',
-    'load_remote'               => 'Use Gravatar',
-    'load_remote_help_text'		=> 'Uncheck this box if your install cannot load scripts from the outside internet. This will prevent Snipe-IT from trying load images from Gravatar.',
-    'login'                     => 'Login Attempts',
-    'login_attempt'             => 'Login Attempt',
-    'login_ip'                  => 'IP Address',
-    'login_success'             => 'Success?',
-    'login_user_agent'          => 'User Agent',
-    'login_help'                => 'List of attempted logins',
+    'load_remote'               => 'Naloži oddaljene avatarje',
+    'load_remote_help_text'		=> 'Uncheck this box if your install cannot load scripts from the outside internet. This will prevent Snipe-IT from trying load avatars from Gravatar or other outside sources.',
+    'login'                     => 'Poskusi prijave',
+    'login_attempt'             => 'Poskus prijave',
+    'login_ip'                  => 'IP naslov',
+    'login_success'             => 'Uspeh?',
+    'login_user_agent'          => 'Uporabniški agent',
+    'login_help'                => 'Seznam poskusov prijav',
     'login_note'                => 'Opomba za prijavo',
+    'login_note_placeholder'            => "If you do not have a login or have found a device belonging to this company, please call technical support at 888-555-1212. Thank you.",
     'login_note_help'           => 'Na zaslonu za prijavo lahko dodate še nekaj stavkov, na primer za pomoč ljudem, ki so našli izgubljeno ali ukradeno napravo. To polje sprejema <a href="https://help.github.com/articles/github-flavored-markdown/">Github flavored markdown</a>',
-    'login_remote_user_text'    => 'Remote User login options',
-    'login_remote_user_enabled_text' => 'Enable Login with Remote User Header',
+    'login_remote_user_text'    => 'Možnosti za prijavo oddaljenih uporabnikov',
+    'login_remote_user_enabled_text' => 'Omogoči prijavo z oddaljenim uporabniškim headerjem',
     'login_remote_user_enabled_help' => 'This option enables Authentication via the REMOTE_USER header according to the "Common Gateway Interface (rfc3875)"',
-    'login_common_disabled_text' => 'Disable other authentication mechanisms',
+    'login_common_disabled_text' => 'Onemogoči ostale avtentikacijske mehanizme',
     'login_common_disabled_help' => 'This option disables other authentication mechanisms. Just enable this option if you are sure that your REMOTE_USER login is already working',
-    'login_remote_user_custom_logout_url_text' => 'Custom logout URL',
+    'login_remote_user_custom_logout_url_text' => 'Izpisni URL po meri',
     'login_remote_user_custom_logout_url_help' => 'If a url is provided here, users will get redirected to this URL after the user logs out of Snipe-IT. This is useful to close the user sessions of your Authentication provider correctly.',
     'login_remote_user_header_name_text' => 'Custom user name header',
     'login_remote_user_header_name_help' => 'Use the specified header instead of REMOTE_USER',
@@ -146,22 +152,25 @@ return [
     'logo_print_assets_help'    => 'Use branding on printable asset lists ',
     'full_multiple_companies_support_help_text' => 'Omejevanje uporabnikov (tudi administratorjev), dodeljenih podjetjem za sredstva podjetja.',
     'full_multiple_companies_support_text' => 'Popolna podpora podjetij',
+    'scope_locations_fmcs_support_text'  => 'Scope Locations with Full Multiple Companies Support',
+    'scope_locations_fmcs_support_help_text'  => 'Restrict locations to their selected company.',
+    'scope_locations_fmcs_check_button' => 'Check Compatibility',
+    'scope_locations_fmcs_support_disabled_text'  => 'This option is disabled because you have conflicting locations set for :count or more items.',
     'show_in_model_list'   => 'Prikaži v spustnem meniju Modeli',
     'optional'					=> 'Opcijsko',
     'per_page'                  => 'Rezultatov na stran',
     'php'                       => 'PHP različica',
-    'php_info'                  => 'PHP Info',
+    'php_info'                  => 'PHP informacije',
     'php_overview'              => 'PHP',
-    'php_overview_keywords'     => 'phpinfo, system, info',
-    'php_overview_help'         => 'PHP System info',
+    'php_overview_help'         => 'Php sistemske informacije',
     'php_gd_info'               => 'Za prikaz QR kod morate namestiti php-gd, glejte navodila za namestitev.',
     'php_gd_warning'            => 'PHP Obdelava slik in vtičnik GD nista nameščena.',
     'pwd_secure_complexity'     => 'Zapletenost gesla',
     'pwd_secure_complexity_help' => 'Izberite katera pravila zapletenosti gesel želite uveljaviti.',
-    'pwd_secure_complexity_disallow_same_pwd_as_user_fields' => 'Password cannot be the same as first name, last name, email, or username',
-    'pwd_secure_complexity_letters' => 'Require at least one letter',
-    'pwd_secure_complexity_numbers' => 'Require at least one number',
-    'pwd_secure_complexity_symbols' => 'Require at least one symbol',
+    'pwd_secure_complexity_disallow_same_pwd_as_user_fields' => 'Geslo ne more biti isto kot ime, priimek, E mail ali uporabniško ime',
+    'pwd_secure_complexity_letters' => 'Obvezuj k uporabi vsaj ene črke',
+    'pwd_secure_complexity_numbers' => 'Obvezuj k uporabi vsaj ene številke',
+    'pwd_secure_complexity_symbols' => 'Obvezuj k uporabi vsaj enega simbola',
     'pwd_secure_complexity_case_diff' => 'Require at least one uppercase and one lowercase',
     'pwd_secure_min'            => 'Minimalni znaki gesla',
     'pwd_secure_min_help'       => 'Najmanjša dovoljena vrednost je 8',
@@ -174,11 +183,11 @@ return [
     'saml_help'                 => 'SAML settings',
     'saml_enabled'              => 'SAML enabled',
     'saml_integration'          => 'SAML Integration',
-    'saml_sp_entityid'          => 'Entity ID',
+    'saml_sp_entityid'          => 'ID entitete',
     'saml_sp_acs_url'           => 'Assertion Consumer Service (ACS) URL',
     'saml_sp_sls_url'           => 'Single Logout Service (SLS) URL',
     'saml_sp_x509cert'          => 'Public Certificate',
-    'saml_sp_metadata_url'      => 'Metadata URL',
+    'saml_sp_metadata_url'      => 'URL metapodatkov',
     'saml_idp_metadata'         => 'SAML IdP Metadata',
     'saml_idp_metadata_help'    => 'You can specify the IdP metadata using a URL or XML file.',
     'saml_attr_mapping_username' => 'Attribute Mapping - Username',
@@ -204,12 +213,12 @@ return [
     'site_name'                 => 'Ime mesta',
     'integrations'               => 'Integrations',
     'slack'                     => 'Slack',
-    'general_webhook'           => 'General Webhook',
+    'general_webhook'           => 'Splošni webhook',
     'ms_teams'                  => 'Microsoft Teams',
-    'webhook'                   => ':app',
-    'webhook_presave'           => 'Test to Save',
-    'webhook_title'               => 'Update Webhook Settings',
-    'webhook_help'                => 'Integration settings',
+    'webhook'                   => ':aplikacija',
+    'webhook_presave'           => 'Shrani za testiranje',
+    'webhook_title'               => 'Posodobi webhook nastavitve',
+    'webhook_help'                => 'Nastavitve integracij',
     'webhook_botname'             => ':app Botname',
     'webhook_channel'             => ':app Channel',
     'webhook_endpoint'            => ':app Endpoint',
@@ -218,17 +227,18 @@ return [
     'webhook_integration_help'    => ':app integration is optional, however the endpoint and channel are required if you wish to use it. To configure :app integration, you must first <a href=":webhook_link" target="_new" rel="noopener">create an incoming webhook</a> on your :app account. Click on the <strong>Test :app Integration</strong> button to confirm your settings are correct before saving. ',
     'webhook_integration_help_button'    => 'Once you have saved your :app information, a test button will appear.',
     'webhook_test_help'           => 'Test whether your :app integration is configured correctly. YOU MUST SAVE YOUR UPDATED :app SETTINGS FIRST.',
+    'shortcuts_enabled'         => 'Enable Shortcuts',
+    'shortcuts_help_text'       => '<strong>Windows</strong>: Alt + Access key, <strong>Mac</strong>: Control + Option + Access key',
     'snipe_version'  			=> 'Snipe-IT različica',
     'support_footer'            => 'Povezava do podpore v nogi ',
     'support_footer_help'       => 'Določite, kdo vidi povezave do informacij o podpori Snipe-IT in uporabniškega priročnika',
-    'version_footer'            => 'Version in Footer ',
+    'version_footer'            => 'Verzija v nogi ',
     'version_footer_help'       => 'Specify who sees the Snipe-IT version and build number.',
     'system'                    => 'Sistemske informacije',
     'update'                    => 'Posodobi nastavitve',
     'value'                     => 'Vrednost',
     'brand'                     => 'Branding',
-    'brand_keywords'            => 'footer, logo, print, theme, skin, header, colors, color, css',
-    'brand_help'                => 'Logo, Site Name',
+    'brand_help'                => 'Logotip, ime strani',
     'web_brand'                 => 'Web Branding Type',
     'about_settings_title'      => 'O nastavitvah',
     'about_settings_text'       => 'Te nastavitve vam omogočajo prilagoditev določenih vidikov vaše namestitve.',
@@ -276,6 +286,8 @@ return [
     'two_factor_enrollment_text'	=> "Zahtevano je dvo-stopenjsko preverjanje pristnosti, vendar vaša naprava še ni bila včlanjena. Odprite aplikacijo Google Authenticator in si oglejte spodnjo kodo QR, če želite vnesti svojo napravo. Ko vnesete napravo, vnesite spodnjo kodo",
     'require_accept_signature'      => 'Zahtevaj podpis',
     'require_accept_signature_help_text'      => 'Če omogočite to funkcijo, se bodo uporabniki morali fizično odjaviti ob sprejemu sredstva.',
+    'require_checkinout_notes'  => 'Require Notes on Checkin/Checkout',
+    'require_checkinout_notes_help_text'    => 'Enabling this feature will require the note fields to be populated when checking in or checking out an asset.',
     'left'        => 'levo',
     'right'        => 'desno',
     'top'        => 'na vrh',
@@ -297,54 +309,56 @@ return [
     'oauth_name_help' => ' Something your users will recognize and trust.',
     'oauth_scopes' => 'Scopes',
     'oauth_callback_url' => 'Your application authorization callback URL.',
-    'create_client' => 'Create Client',
+    'create_client' => 'Naredi klienta',
     'no_scopes' => 'No scopes',
     'asset_tag_title' => 'Update Asset Tag Settings',
     'barcode_title' => 'Update Barcode Settings',
-    'barcodes' => 'Barcodes',
+    'barcodes' => 'Črtne kode',
     'barcodes_help_overview' => 'Barcode &amp; QR settings',
     'barcodes_help' => 'This will attempt to delete cached barcodes. This would typically only be used if your barcode settings have changed, or if your Snipe-IT URL has changed. Barcodes will be re-generated when accessed next.',
     'barcodes_spinner' => 'Attempting to delete files...',
     'barcode_delete_cache' => 'Delete Barcode Cache',
     'branding_title' => 'Update Branding Settings',
     'general_title' => 'Update General Settings',
-    'mail_test' => 'Send Test',
+    'mail_test' => 'Pošlji test',
     'mail_test_help' => 'This will attempt to send a test mail to :replyto.',
     'filter_by_keyword' => 'Filter by setting keyword',
-    'security' => 'Security',
-    'security_title' => 'Update Security Settings',
-    'security_keywords' => 'password, passwords, requirements, two factor, two-factor, common passwords, remote login, logout, authentication',
+    'security' => 'Varnost',
+    'security_title' => 'Posodobi varnostne nastavitve',
     'security_help' => 'Two-factor, Password Restrictions',
-    'groups_keywords' => 'permissions, permission groups, authorization',
     'groups_help' => 'Account permission groups',
-    'localization' => 'Localization',
-    'localization_title' => 'Update Localization Settings',
-    'localization_keywords' => 'localization, currency, local, locale, time zone, timezone, international, internatinalization, language, languages, translation',
+    'localization' => 'Lokalizacija',
+    'localization_title' => 'Posodobi nastavitve lokalizacije',
     'localization_help' => 'Language, date display',
-    'notifications' => 'Notifications',
+    'notifications' => 'Obvestila',
     'notifications_help' => 'Email Alerts & Audit Settings',
     'asset_tags_help' => 'Incrementing and prefixes',
-    'labels' => 'Labels',
-    'labels_title' => 'Update Label Settings',
-    'labels_help' => 'Label sizes &amp; settings',
-    'purge_keywords' => 'permanently delete',
+    'labels' => 'Oznake',
+    'labels_title' => 'Posodobi nastavitve oznak',
+    'labels_help' => 'Barcodes &amp; label settings',
     'purge_help' => 'Počisti izbrisane zapise',
     'ldap_extension_warning' => 'It does not look like the LDAP extension is installed or enabled on this server. You can still save your settings, but you will need to enable the LDAP extension for PHP before LDAP syncing or login will work.',
     'ldap_ad' => 'LDAP/AD',
+    'ldap_test_label' => 'Test LDAP Sync',
+    'ldap_test_login' => ' Test LDAP Login',
+    'ldap_username_placeholder' => 'LDAP Username',
+    'ldap_password_placeholder' => 'LDAP Password',
     'employee_number' => 'Employee Number',
-    'create_admin_user' => 'Create a User ::',
+    'create_admin_user' => 'Ustvari uporabnika ::',
     'create_admin_success' => 'Success! Your admin user has been added!',
     'create_admin_redirect' => 'Click here to go to your app login!',
-    'setup_migrations' => 'Database Migrations ::',
+    'setup_migrations' => 'Migracije podatkovne baze ::',
     'setup_no_migrations' => 'There was nothing to migrate. Your database tables were already set up!',
     'setup_successful_migrations' => 'Your database tables have been created',
     'setup_migration_output' => 'Migration output:',
-    'setup_migration_create_user' => 'Next: Create User',
+    'setup_migration_create_user' => 'Naslednje: ustvari uporabnika',
     'ldap_settings_link' => 'LDAP Settings Page',
     'slack_test' => 'Test <i class="fab fa-slack"></i> Integration',
+    'status_label_name' => 'Status Label Name',
+    'super_admin_only'  => 'Super Admin Only',
     'label2_enable'           => 'New Label Engine',
     'label2_enable_help'      => 'Switch to the new label engine. <b>Note: You will need to save this setting before setting others.</b>',
-    'label2_template'         => 'Template',
+    'label2_template'         => 'Predloga',
     'label2_template_help'    => 'Select which template to use for label generation',
     'label2_title'            => 'Naslov',
     'label2_title_help'       => 'The title to show on labels that support it',
@@ -356,14 +370,17 @@ return [
     'label2_2d_type'          => 'Tip 2D črtne kode',
     'label2_2d_type_help'     => 'Format for 2D barcodes',
     'label2_2d_target'        => '2D Barcode Target',
-    'label2_2d_target_help'   => 'The URL the 2D barcode points to when scanned',
+    'label2_2d_target_help'   => 'The data that will be contained in the 2D barcode',
     'label2_fields'           => 'Field Definitions',
     'label2_fields_help'      => 'Fields can be added, removed, and reordered in the left column. For each field, multiple options for Label and DataSource can be added, removed, and reordered in the right column.',
+    'purge_barcodes' => 'Purge Barcodes',
     'help_asterisk_bold'    => 'Text entered as <code>**text**</code> will be displayed as bold',
     'help_blank_to_use'     => 'Leave blank to use the value from <code>:setting_name</code>',
     'help_default_will_use' => '<code>:default</code> will use the value from <code>:setting_name</code>. <br>Note that the value of the barcodes must comply with the respective barcode spec in order to be successfully generated. Please see <a href="https://snipe-it.readme.io/docs/barcodes">the documentation <i class="fa fa-external-link"></i></a> for more details. ',
-    'default'               => 'Default',
-    'none'                  => 'None',
+    'asset_id'              => 'Asset ID',
+    'data'               => 'Data',
+    'default'               => 'Privzeto',
+    'none'                  => 'Nobena',
     'google_callback_help' => 'This should be entered as the callback URL in your Google OAuth app settings in your organization&apos;s <strong><a href="https://console.cloud.google.com/" target="_blank">Google developer console <i class="fa fa-external-link" aria-hidden="true"></i></a></strong>.',
     'google_login'      => 'Google Workspace Login Settings',
     'enable_google_login'  => 'Enable users to login with Google Workspace',
@@ -373,7 +390,100 @@ return [
     'database_driver' => 'Database Driver',
     'bs_table_storage' => 'Table Storage',
     'timezone' => 'Timezone',
-    'profile_edit'          => 'Edit Profile',
-    'profile_edit_help'          => 'Allow users to edit their own profiles.',
+    'test_mail' => 'Test Mail',
+    'profile_edit'          => 'Uredi profil',
+    'profile_edit_help'          => 'Omogoči uporabnikom, da urejajo svoje profile.',
+    'default_avatar' => 'Custom Default Avatar',
+    'default_avatar_help' => 'This image will be displayed as a profile if a user does not have a profile photo.',
+    'restore_default_avatar' => 'Restore <a href=":default_avatar" data-toggle="lightbox" data-type="image">original system default avatar</a>',
+    'restore_default_avatar_help' => '',
+    'due_checkin_days' => 'Due For Checkin Warning',
+    'due_checkin_days_help' => 'How many days before the expected checkin of an asset should it be listed in the "Due for checkin" page?',
+    'no_groups' => 'No groups have been created yet. Visit <code>Admin Settings > Permission Groups</code> to add one.',
+    'text' => 'Text',
+
+    'username_formats' => [
+        'username_format'		=> 'Format za uporabniško ime',
+        'firstname_lastname_format'	=> 'Ime priimek (jane.smith)',
+        'first_name_format'	        => 'First Name (jane)',
+        'last_name_format'		=> 'Last Name (doe)',
+        'filastname_format'			=> 'First Initial Last Name (jsmith)',
+        'lastnamefirstinitial_format' =>  'Last Name First Initial (smithj)',
+        'firstname_lastname_underscore_format' => 'First Name Last Name (jane_smith)',
+        'firstinitial.lastname' => 'First Initial Last Name (j.smith)',
+        'lastname_firstinitial' => 'Last Name First Initial (smith_j)',
+        'lastname_dot_firstinitial_format' => 'Last Name First Initial (smith.j)',
+        'firstnamelastname'     => 'First Name Last Name (janesmith)',
+        'firstnamelastinitial'  => 'First Name Last Initial (janes)',
+        'lastnamefirstname'      => 'Last Name.First Name (smith.jane)',
+    ],
+
+    'email_formats' => [
+        'email_format'			=> 'Format e-pošte',
+        'firstname_lastname_format'	=> 'Ime priimek (jane.smith@example.com)',
+        'first_name_format'		=> 'Ime (jane@example.com)',
+        'last_name_format'		=> 'Last Name (doe@example.com)',
+        'filastname_format'			=> 'Prva črka imena priimek (jsmith@example.com)',
+        'lastnamefirstinitial_format' =>  'Priimek s prvo črko imena (smithj@example.com)',
+        'firstname_lastname_underscore_format' => 'Ime priimek (jane.smith@example.com)',
+        'firstinitial.lastname' => 'Prva črka imena s priimkom (j.smith@example.com)',
+        'lastname_firstinitial' => 'Priimek s prvo črko imena (smith_j@example.com)',
+        'lastname_dot_firstinitial_format' => 'Last Name First Initial (smith.j@example.com)',
+        'firstnamelastname'     => 'Ime s priimkom (janesmith@example.com)',
+        'firstnamelastinitial'  => 'Ime s prvo črko priimka (janes@example.com)',
+        'lastnamefirstname'      => 'Last Name.First Name (smith.jane@example.com)',
+    ],
+
+
+
+    'logo_labels' => [
+        'acceptance_pdf_logo'       => 'PDF Logo',
+        'email_logo'                => 'Email Logo',
+        'label_logo'                => 'Logotip labele',
+        'logo'                      => 'Site Logo',
+        'favicon'                   => 'Favikona',
+    ],
+
+    'logo_help' => [
+        'email_logo_size'       => 'Square logos in email look best. ',
+    ],
+
+    'logo_option_types' => [
+        'text' => 'Text',
+        'logo' => 'Logotip',
+        'logo_and_text' => 'Logo and Text',
+    ],
+
+
+    'legends' => [
+        'scoping' => 'Scoping',
+        'formats' => 'Default Formats',
+        'profiles' => 'User Profiles',
+        'eula' => 'EULA & Acceptance Preferences',
+        'misc_display' => 'Miscellaneous Display Options',
+        'email' => 'Email Preferences',
+        'checkin' => 'Checkin Preferences',
+        'dashboard' => 'Login & Dashboard Preferences',
+        'misc' => 'Miscellaneous',
+        'logos' => 'Logos & Display',
+        'colors' => 'Colors & Skins',
+        'footer' => 'Footer Preferences',
+        'security' => 'Security Preferences',
+        'general' => 'General',
+        'intervals' => 'Intervals & Thresholds',
+    ],
+
+
+    /* Keywords for settings overview help */
+    'keywords' => [
+        'brand'             => 'footer, logo, print, theme, skin, header, colors, color, css',
+        'general_settings'  => 'company support, signature, acceptance, email format, username format, images, per page, thumbnail, eula, gravatar, tos, dashboard, privacy',
+        'groups'            => 'permissions, permission groups, authorization',
+        'labels'            => 'labels, barcodes, barcode, sheets, print, upc, qr, 1d, 2d',
+        'localization'      => 'localization, currency, local, locale, time zone, timezone, international, internatinalization, language, languages, translation',
+        'php_overview'      => 'phpinformacije, sistem, informacije',
+        'purge'             => 'izbriši za vedno',
+        'security'          => 'password, passwords, requirements, two factor, two-factor, common passwords, remote login, logout, authentication',
+    ],
 
 ];
diff --git a/resources/lang/sl-SI/admin/settings/message.php b/resources/lang/sl-SI/admin/settings/message.php
index ff3006089e..577fd2f546 100644
--- a/resources/lang/sl-SI/admin/settings/message.php
+++ b/resources/lang/sl-SI/admin/settings/message.php
@@ -14,6 +14,9 @@ return [
         'restore_warning'       => 'Yes, restore it. I acknowledge that this will overwrite any existing data currently in the database. This will also log out all of your existing users (including you).',
         'restore_confirm'       => 'Are you sure you wish to restore your database from :filename?'
     ],
+    'restore' => [
+        'success'               => 'Your system backup has been restored. Please log in again.'
+    ],
     'purge' => [
         'error'     => 'Pri čiščenju je prišlo do napake. ',
         'validation_failed'     => 'Vaša potrditev čiščenja je napačna. V polje za potrditev vnesite besedo »DELETE«.',
@@ -28,19 +31,29 @@ return [
     'ldap' => [
         'testing' => 'Testing LDAP Connection, Binding & Query ...',
         '500' => '500 Server Error. Please check your server logs for more information.',
-        'error' => 'Something went wrong :(',
+        'error' => 'Nekaj je šlo narobe :(',
         'sync_success' => 'A sample of 10 users returned from the LDAP server based on your settings:',
-        'testing_authentication' => 'Testing LDAP Authentication...',
-        'authentication_success' => 'User authenticated against LDAP successfully!'
+        'testing_authentication' => 'Testiranje LDAP Avtentikacije...',
+        'authentication_success' => 'Uporabnik se je uspešno avtoriziral z LDAP!'
     ],
+    'labels' => [
+        'null_template' => 'Label template not found. Please select a template.',
+        ],
     'webhook' => [
-        'sending' => 'Sending :app test message...',
-        'success' => 'Your :webhook_name Integration works!',
+        'sending' => 'Pošiljanje :apikacija testirno sporočilo...',
+        'success' => 'Tvoj :ime_webhooka integracija deluje!',
         'success_pt1' => 'Success! Check the ',
         'success_pt2' => ' channel for your test message, and be sure to click SAVE below to store your settings.',
-        '500' => '500 Server Error.',
+        '500' => '500 strežniška napaka.',
         'error' => 'Something went wrong. :app responded with: :error_message',
         'error_redirect' => 'ERROR: 301/302 :endpoint returns a redirect. For security reasons, we don’t follow redirects. Please use the actual endpoint.',
-        'error_misc' => 'Something went wrong. :( ',
-    ]
+        'error_misc' => 'Nekaj je šlo narobe. :( ',
+        'webhook_fail' => ' webhook notification failed: Check to make sure the URL is still valid.',
+        'webhook_channel_not_found' => ' webhook channel not found.',
+        'ms_teams_deprecation' => 'The selected Microsoft Teams webhook URL will be deprecated Dec 31st, 2025. Please use a workflow URL. Microsoft\'s documentation on creating a workflow can be found <a href="https://support.microsoft.com/en-us/office/create-incoming-webhooks-with-workflows-for-microsoft-teams-8ae491c7-0394-4861-ba59-055e33f75498" target="_blank"> here.</a>',
+    ],
+    'location_scoping' => [
+        'not_saved' => 'Your settings were not saved.',
+        'mismatch' => 'There is 1 item in the database that need your attention before you can enable location scoping.|There are :count items in the database that need your attention before you can enable location scoping.',
+    ],
 ];
diff --git a/resources/lang/sl-SI/admin/settings/table.php b/resources/lang/sl-SI/admin/settings/table.php
index 70192894cf..88ef3653f4 100644
--- a/resources/lang/sl-SI/admin/settings/table.php
+++ b/resources/lang/sl-SI/admin/settings/table.php
@@ -2,5 +2,5 @@
 
 return array(
     'created'   => 'Ustvarjeno',
-    'size' => 'Size',
+    'size' => 'Velikost',
 );
diff --git a/resources/lang/sl-SI/admin/statuslabels/message.php b/resources/lang/sl-SI/admin/statuslabels/message.php
index 6a85dcd1b5..0586251cf6 100644
--- a/resources/lang/sl-SI/admin/statuslabels/message.php
+++ b/resources/lang/sl-SI/admin/statuslabels/message.php
@@ -3,7 +3,7 @@
 return [
 
     'does_not_exist' => 'Oznaka statusa ne obstaja.',
-    'deleted_label' => 'Deleted Status Label',
+    'deleted_label' => 'Izbrisana statusna oznaka',
     'assoc_assets'	 => 'Ta oznaka statusa je trenutno povezana z vsaj enim sredstvom in je ni mogoče izbrisati. Posodobite svoja sredstva, da ne bodo več v tem stanju in poskusite znova. ',
 
     'create' => [
diff --git a/resources/lang/sl-SI/admin/statuslabels/table.php b/resources/lang/sl-SI/admin/statuslabels/table.php
index a0d79c1e35..1b3e8ff105 100644
--- a/resources/lang/sl-SI/admin/statuslabels/table.php
+++ b/resources/lang/sl-SI/admin/statuslabels/table.php
@@ -1,14 +1,14 @@
 <?php
 
 return array(
-    'about'      	=> 'O oznakah stanja',
+    'about'      	=> 'About Status Types',
     'archived'      	=> 'Arhivirano',
     'create'      	=> 'Ustvari oznako stanja',
     'color'      	=> 'Barva grafikona',
     'default_label' => 'Privzeta oznaka',
     'default_label_help' => 'Zagotavlja, da se najpogosteje uporabljana oznaka statusa pojavi na vrhu izbirnega polja ob ustvarjanju/urejanju sredstev.',
     'deployable'      	=> 'Razporejeno',
-    'info'      	=> 'Oznake stanja se uporabljajo za oznako različnih statusov, v katerih so lahko vaša sredstva. Morda so na popravilu, so izgubljene / ukradene itd. Ustvarite lahko nove oznake statusov za sredstva.',
+    'info'      	=> 'Status label types are used to describe the various states your assets could be in. They may be out for repair, lost/stolen, etc. You can create new status labels for your deployable, pending and archived assets according to your own workflow. For more information, <a href="https://snipe-it.readme.io/docs/overview#status-labels" target="_blank">see the documentation <i class="fa fa-external-link"></i></a>.',
     'name'      	=> 'Ime statusa',
     'pending'      	=> 'Na čakanju',
     'status_type'   => 'Vrsta statusa',
diff --git a/resources/lang/sl-SI/admin/users/general.php b/resources/lang/sl-SI/admin/users/general.php
index 9a922d6bb9..42b5601898 100644
--- a/resources/lang/sl-SI/admin/users/general.php
+++ b/resources/lang/sl-SI/admin/users/general.php
@@ -17,10 +17,12 @@ return [
     'last_login'        => 'Zadnja prijava',
     'ldap_config_text'  => 'Nastavitve konfiguracije LDAP-a lahko najdete v zavihku Admin> Nastavitve. Izbrana lokacija bo nastavljena za vse uvožene uporabnike.',
     'print_assigned'    => 'Natisni vse dodeljene',
-    'email_assigned'    => 'Email List of All Assigned',
-    'user_notified'     => 'User has been emailed a list of their currently assigned items.',
-    'auto_assign_label' => 'Include this user when auto-assigning eligible licenses',
-    'auto_assign_help'  => 'Skip this user in auto assignment of licenses',
+    'email_assigned'    => 'Izpis E pošt od vseh dodeljenih',
+    'user_notified'     => 'Uporabnik je bil po E pošti obveščen o seznamu vseh njemu dodeljenih stvari.',
+    'users_notified'    => 'The user has been emailed a list of their currently assigned items.|:count users have been emailed a list of their currently assigned items.',
+    'users_notified_warning' => ':count user has been emailed a list of their currently assigned items, however :no_email users did not have an email address so could not be emailed.|:count users have been emailed a list of their currently assigned items, however :no_email user(s) did not have an email address so could not be emailed.',
+    'auto_assign_label' => 'Vključi tega uporabnika pri samodejni dodelitvi upravičenih licenc',
+    'auto_assign_help'  => 'Preskoči tega uporabnika pri samodejni dodelitvi licenc',
     'software_user'     => 'Programska oprema izdana osebi :name',
     'send_email_help'   => 'Obvezno je potrebno navesti e-poštni račun za tega uporabnika kamor bo prejel poverilnice. Pošiljanje poverilnic je mogoče le ob ustvarjanju uporabnika. Gesla so shranjena eno-smerno šifrirano in jih je nemogoče pridobiti po shranjenju.',
     'view_user'         => 'Ogled uporabnika :name',
@@ -28,27 +30,27 @@ return [
     'two_factor_admin_optin_help' => 'Vaše trenutne nastavitve skrbnika omogočajo selektivno uveljavljanje dvotaktne pristnosti.  ',
     'two_factor_enrolled' => 'Vgrajena naprava 2FA ',
     'two_factor_active'   => '2FA aktivna ',
-    'user_deactivated'  => 'User cannot login',
-    'user_activated'  => 'User can login',
-    'activation_status_warning' => 'Do not change activation status',
-    'group_memberships_helpblock' => 'Only superadmins may edit group memberships.',
-    'superadmin_permission_warning' => 'Only superadmins may grant a user superadmin access.',
-    'admin_permission_warning' => 'Only users with admins rights or greater may grant a user admin access.',
-    'remove_group_memberships' => 'Remove Group Memberships',
-    'warning_deletion_information' => 'You are about to checkin ALL items from the :count user(s) listed below. Super admin names are highlighted in red.',
-    'update_user_assets_status' => 'Update all assets for these users to this status',
-    'checkin_user_properties' => 'Check in all properties associated with these users',
-    'remote_label'   => 'This is a remote user',
-    'remote'   => 'Remote',
-    'remote_help' => 'This can be useful if you need to filter by remote users who never or rarely come into your physical locations.',
-    'not_remote_label' => 'This is not a remote user',
-    'vip_label' => 'VIP user',
+    'user_deactivated'  => 'Uporabnik se ne more prijaviti',
+    'user_activated'  => 'Uporabnik se lahko prijavi',
+    'activation_status_warning' => 'Ne spremeni aktivacijskega statusa',
+    'group_memberships_helpblock' => 'Samo superadmini lahko urejajo članstvo skupinam.',
+    'superadmin_permission_warning' => 'Samo superadmin lahko dodeli uporabniku superadminske pravice.',
+    'admin_permission_warning' => 'Samo uporabniki z adminskimi pravicami ali večjimi lahko dodelijo uporabniku adminske pravice.',
+    'remove_group_memberships' => 'Odstrani članstva skupinam',
+    'warning_deletion_information' => 'Prijavili boste VSE predmete od spodaj navedenih uporabnikov :seštevek. Imena superadminov so označena z rdečo barvo.',
+    'update_user_assets_status' => 'Posodobi vsa sredstva za te uporabnike do tega statusa',
+    'checkin_user_properties' => 'Prijavite vse lastnosti, povezane s temi uporabniki',
+    'remote_label'   => 'To je oddaljen uporabnik',
+    'remote'   => 'Oddaljen',
+    'remote_help' => 'To je lahko uporabno če rabiš filtrirati oddaljene uporabnike, ki niso nikoli ali redko prišli na fizične lokacije.',
+    'not_remote_label' => 'To ni oddaljen uporabnik',
+    'vip_label' => 'VIP uporabnik',
     'vip_help' => 'This can be helpful to mark important people in your org if you would like to handle them in special ways.',
     'create_user' => 'Create a user',
     'create_user_page_explanation' => 'This is the account information you will use to access the site for the first time.',
     'email_credentials' => 'Email credentials',
     'email_credentials_text' => 'Email my credentials to the email address above',
-    'next_save_user' => 'Next: Save User',
-    'all_assigned_list_generation' => 'Generated on:',
-    'email_user_creds_on_create' => 'Email this user their credentials?',
+    'next_save_user' => 'Naslednje: shrani uporabnika',
+    'all_assigned_list_generation' => 'Ustvarjena na:',
+    'email_user_creds_on_create' => 'Sporoči temu uporabniku poverilnice po E pošti?',
 ];
diff --git a/resources/lang/sl-SI/admin/users/message.php b/resources/lang/sl-SI/admin/users/message.php
index 01b0654786..febda6578f 100644
--- a/resources/lang/sl-SI/admin/users/message.php
+++ b/resources/lang/sl-SI/admin/users/message.php
@@ -6,9 +6,9 @@ return array(
     'declined'                  => 'To sredstev ste uspešno zavrnili.',
     'bulk_manager_warn'	        => 'Vaši uporabniki so bili uspešno posodobljeni, vendar vnos v upravitelju ni bil shranjen, ker je bil izbran upravitelj tudi na seznamu uporabnikov, ki ga je treba urediti, uporabniki pa morda niso njihovi lastniki. Prosimo, izberite svoje uporabnike, razen upravitelja.',
     'user_exists'               => 'Uporabnik že obstaja!',
-    'user_not_found'            => 'Uporabnik ne obstaja.',
+    'user_not_found'            => 'User does not exist or you do not have permission view them.',
     'user_login_required'       => 'Polje za prijavo je obvezno',
-    'user_has_no_assets_assigned' => 'No assets currently assigned to user.',
+    'user_has_no_assets_assigned' => 'Brez sredstev dodeljenih uporabniku.',
     'user_password_required'    => 'Geslo je obvezno.',
     'insufficient_permissions'  => 'Nezadostna dovoljenja.',
     'user_deleted_warning'      => 'Ta uporabnik je bil izbrisan. Tega uporabnika boste morali obnoviti, da ga uredite ali dodelite nova sredstva.',
@@ -41,18 +41,19 @@ return array(
         'delete_has_licenses_var' => 'This user still has a license seats assigned. Please check it in first.|This user still has :count license seats assigned. Please check them in first.',
         'delete_has_accessories_var' => 'This user still has an accessory assigned. Please check it in first.|This user still has :count accessories assigned. Please check their assets in first.',
         'delete_has_locations_var' => 'This user still manages a location. Please select another manager first.|This user still manages :count locations. Please select another manager first.',
-        'delete_has_users_var' => 'This user still manages another user. Please select another manager for that user first.|This user still manages :count users. Please select another manager for them first.',
+        'delete_has_users_var' => 'Ta uporabnik še vedno upravlja drugega uporabnika. Prosimo, da najprej izberete drugega upravitelja za tega uporabnika.|Ta uporabnik še vedno upravlja :seštevek uporabnikov. Prosimo, da najprej izberete drugega menedžerja zanje.',
         'unsuspend' => 'Prišlo je do težave pri od-suspendiranju uporabnika. Prosim poskusite ponovno.',
         'import'    => 'Pri uvozu uporabnikov je prišlo do težave. Prosim poskusite ponovno.',
         'asset_already_accepted' => 'To sredstvo je bilo že sprejeto.',
         'accept_or_decline' => 'To sredstev morate sprejeti ali zavrniti.',
-        'cannot_delete_yourself' => 'We would feel really bad if you deleted yourself, please reconsider.',
+        'cannot_delete_yourself' => 'Počutili bi se zelo slabo, če bi se izbrisali, zato razmislite o tem.',
         'incorrect_user_accepted' => 'Sredstev, ki ste ga poskušali sprejeti, ni bilo izdano za vas.',
         'ldap_could_not_connect' => 'Povezave s strežnikom LDAP ni bilo mogoče vzpostaviti. Preverite konfiguracijo strežnika LDAP v konfiguracijski datoteki LDAP. <br>Napaka strežnika LDAP:',
         'ldap_could_not_bind' => 'Povezave s strežnikom LDAP ni bilo mogoče vzpostaviti. Preverite konfiguracijo strežnika LDAP v konfiguracijski datoteki LDAP. <br>Napaka strežnika LDAP: ',
         'ldap_could_not_search' => 'Strežnika LDAP ni bilo mogoče najti. Preverite konfiguracijo strežnika LDAP v konfiguracijski datoteki LDAP. <br>Napaka strežnika LDAP:',
         'ldap_could_not_get_entries' => 'Vnose iz strežnika LDAP ni bilo mogoče pridobiti. Preverite konfiguracijo strežnika LDAP v konfiguracijski datoteki LDAP. <br>Napaka strežnika LDAP:',
         'password_ldap' => 'Geslo za ta račun upravlja LDAP / Active Directory. Za spremembo gesla se obrnite na oddelek IT. ',
+        'multi_company_items_assigned' => 'This user has items assigned that belong to a different company. Please check them in or edit their company.'
     ),
 
     'deletefile' => array(
@@ -68,7 +69,7 @@ return array(
     ),
 
     'inventorynotification' => array(
-        'error'   => 'This user has no email set.',
-        'success' => 'The user has been notified about their current inventory.'
+        'error'   => 'Ta uporabnik ima nastavljene E pošte.',
+        'success' => 'Uporabnik je bil obveščen o trenutnem inventarju.'
     )
 );
\ No newline at end of file
diff --git a/resources/lang/sl-SI/admin/users/table.php b/resources/lang/sl-SI/admin/users/table.php
index 801f303d59..fc149420d3 100644
--- a/resources/lang/sl-SI/admin/users/table.php
+++ b/resources/lang/sl-SI/admin/users/table.php
@@ -22,7 +22,7 @@ return array(
     'managed_locations'     => 'Upravljane lokacije',
     'managed_users'         => 'Managed Users',
     'name' 					=> 'Ime',
-    'nogroup'               => 'No groups have been created yet. To add one, visit: ',
+    'nogroup'               => 'No groups have been created yet. To add one, visit:',
     'notes'                 => 'Opombe',
     'password_confirm' 		=> 'Potrdite geslo',
     'password' 				=> 'Geslo',
@@ -31,7 +31,7 @@ return array(
     'show_deleted'          => 'Prikaži izbrisane uporabnike',
     'title' 				=> 'Naslov',
 	'to_restore_them'		=> 'da jih obnovite.',
-    'total_assets_cost'     => "Total Assets Cost",
+    'total_assets_cost'     => "Celotna cena sredstev",
     'updateuser' 			=> 'Posodobi uporabnika',
     'username' 				=> 'Uporabniško ime',
 	'user_deleted_text' 	=> 'Ta uporabnik je bil označen kot izbrisan.',
diff --git a/resources/lang/sl-SI/auth.php b/resources/lang/sl-SI/auth.php
index db310aa1bb..14d8acfce0 100644
--- a/resources/lang/sl-SI/auth.php
+++ b/resources/lang/sl-SI/auth.php
@@ -15,6 +15,6 @@ return array(
 
     'failed' => 'These credentials do not match our records.',
     'password' => 'The provided password is incorrect.',
-    'throttle' => 'Too many login attempts. Please try again in :seconds seconds.',
+    'throttle' => 'Too many login attempts. Please try again in :minutes minute(s).',
 
 );
diff --git a/resources/lang/sl-SI/auth/message.php b/resources/lang/sl-SI/auth/message.php
index 13da6781f1..b253e7bf08 100644
--- a/resources/lang/sl-SI/auth/message.php
+++ b/resources/lang/sl-SI/auth/message.php
@@ -6,8 +6,6 @@ return array(
     'account_not_found'      => 'Uporabniško ime ali geslo ni pravilno.',
     'account_not_activated'  => 'Ta uporabniški račun ni aktiviran.',
     'account_suspended'      => 'Ta uporabniški račun je onemogočen.',
-    'account_banned'         => 'Ta uporabniški račun je onemogočen.',
-    'throttle'               => 'Preveč neuspešnih prijav. Prosim poskusi ponovno čez :minutes minut.',
 
     'two_factor' => array(
         'already_enrolled'      => 'Tvoja naprava je že vpisana.',
diff --git a/resources/lang/sl-SI/button.php b/resources/lang/sl-SI/button.php
index 811a461bb6..033460bf6c 100644
--- a/resources/lang/sl-SI/button.php
+++ b/resources/lang/sl-SI/button.php
@@ -7,6 +7,7 @@ return [
     'checkin_and_delete'  	    => 'Checkin All / Delete User',
     'delete'  	                => 'Izbriši',
     'edit'    	                => 'Uredi',
+    'clone'    	                => 'Clone',
     'restore' 	                => 'Obnovi',
     'remove'                    => 'Remove',
     'request'                   => 'Zahteva',
@@ -17,8 +18,17 @@ return [
     'generate_labels'           => '{1} Generiraj Oznako|[2,2] Generiraj Oznaki|[3,*] Generiraj Oznake',
     'send_password_link'        => 'Pošlji povezavo za ponastavitev gesla',
     'go'                        => 'Go',
-    'bulk_actions'              => 'Bulk Actions',
-    'add_maintenance'           => 'Add Maintenance',
-    'append'                    => 'Append',
+    'bulk_actions'              => 'Množične akcije',
+    'add_maintenance'           => 'Dodaj vzdrževanje',
+    'append'                    => 'Priloži',
     'new'                       => 'Novo',
+    'var' => [
+        'clone'     => 'Clone :item_type',
+        'edit'      => 'Edit :item_type',
+        'delete'    => 'Delete :item_type',
+        'restore'   => 'Restore :item_type',
+        'create'    => 'Create New :item_type',
+        'checkout'  => 'Checkout :item_type',
+        'checkin'   => 'Checkin :item_type',
+    ]
 ];
diff --git a/resources/lang/sl-SI/general.php b/resources/lang/sl-SI/general.php
index 94f5d9461c..36825ecf37 100644
--- a/resources/lang/sl-SI/general.php
+++ b/resources/lang/sl-SI/general.php
@@ -10,7 +10,7 @@ return [
     'action'                => 'Dejanje',
     'activity_report'		=> 'Poročilo o dejavnosti',
     'address'				=> 'Naslov',
-    'admin'					=> 'Administrator',
+    'admin'					=> 'Adminske nastavitve',
     'admin_tooltip'			=> 'This user has admin privileges',
     'superuser'				=> 'Superuser',
     'superuser_tooltip'		=> 'This user has superuser privileges',
@@ -23,13 +23,16 @@ return [
     'asset_models'			=> 'Modeli sredstva',
     'asset_model'			=> 'Model',
     'asset'					=> 'Sredstvo',
+    'asset_previous'        => 'Asset (Previously Assigned)',
     'asset_report'          => 'Poročilo o sredstvih',
     'asset_tag'				=> 'Oznaka sredstva',
     'asset_tags'            => 'Asset Tags',
     'assets_available'		=> 'Razpoložljiva sredstva',
     'accept_assets'         => 'Accept Assets :name',
     'accept_assets_menu'    => 'Accept Assets',
+    'accept_item'           => 'Accept Item',
     'audit'				    => 'Revizija',
+    'audits'				=> 'Audits',
     'audit_report'			=> 'Dnevnik revizije',
     'assets'				=> 'Sredstva',
     'assets_audited'        => 'assets audited',
@@ -46,9 +49,9 @@ return [
     'bulkaudit'             => 'Množična revizija',
     'bulkaudit_status'      => 'Stanje revizije',
     'bulk_checkout'  		=> 'Množična izdaja',
-    'bulk_edit'             => 'Bulk Edit',
-    'bulk_delete'           => 'Bulk Delete',
-    'bulk_actions'          => 'Bulk Actions',
+    'bulk_edit'             => 'Množično urejanje',
+    'bulk_delete'           => 'Množični izbris',
+    'bulk_actions'          => 'Množične akcije',
     'bulk_checkin_delete'   => 'Bulk Checkin / Delete Users',
     'byod'                  => 'BYOD',
     'byod_help'             => 'This device is owned by the user',
@@ -61,9 +64,12 @@ return [
     'changepassword'  		=> 'Spremeni geslo',
     'checkin'  				=> 'Prevzem',
     'checkin_from'  		=> 'Prevzem od',
+    'checkin_note'  		=> 'Checkin Note',
+    'checkout_note'  		=> 'Checkout Note',
     'checkout'  			=> 'Izdaja',
     'checkouts_count'       => 'Izdaje',
     'checkins_count'        => 'Sprejemi',
+    'checkin_and_delete'  	=> 'Checkin and Delete',
     'user_requests_count'   => 'Zahteve',
     'city'  				=> 'Mesto',
     'click_here'			=> 'Kliknite tukaj',
@@ -77,20 +83,22 @@ return [
     'consumables'			=> 'Potrošni material',
     'country'  				=> 'Država',
     'could_not_restore'     => 'Error restoring :item_type: :error',
-    'not_deleted'           => 'The :item_type is not deleted so it cannot be restored',
+    'not_deleted'           => 'The :item_type was not deleted and therefore cannot be restored',
     'create'				=> 'Ustvari novo',
     'created'               => 'Ustvarjeno',
     'created_asset'			=> 'ustvarjeno sredstvo',
-    'created_at' 			=> 'Created At',
-    'created_by'            => 'Created By',
+    'created_at' 			=> 'Ustvarjeno',
+    'created_by'            => 'Stvaritelj',
     'record_created' 		=> 'Zapis ustvarjen',
     'updated_at' 			=> 'Posodobljeno ob',
     'currency'  			=> '$', // this is deprecated
+    'currency_text'  		=> 'Currency', //
     'current'  				=> 'Trenutni',
-    'current_password'      => 'Current Password',
+    'current_password'      => 'Trenutno geslo',
     'customize_report'      => 'Customize Report',
     'custom_report'         => 'Poročilo o sredstvih po meri',
     'dashboard'				=> 'Nadzorna plošča',
+    'data_source'           => 'Data Source',
     'days'      			=> 'dni',
     'days_to_next_audit'    => 'Dnevi do naslednje revizije',
     'date'					=> 'Datum',
@@ -98,7 +106,7 @@ return [
     'debug_warning_text'    => 'Ta aplikacija deluje v načinu proizvodnje z omogočenim odpravljanjem napak. To lahko razkrije občutljive podatke, če je vaša aplikacija dostopna zunanjemu svetu. Onemogoči način za odpravljanje napak z nastavitvijo <code>APP_DEBUG</code> vrednost v vaši <code>.env</code> datoteki do <code>false</code>.',
     'delete'  				=> 'Izbriši',
     'delete_confirm'  		=> 'Ali ste prepričani, da želite izbrisati :item?',
-    'delete_confirm_no_undo' => 'Are you sure you wish to delete :item? This can not be undone.',
+    'delete_confirm_no_undo' => 'Are you sure, you wish to delete :item? This cannot be undone.',
     'deleted'  				=> 'Izbrisano',
     'delete_seats'  		=> 'Izbrisana mesta',
     'deletion_failed'       => 'Deletion failed',
@@ -114,37 +122,21 @@ return [
     'editprofile'  			=> 'Uredite svoj profil',
     'eol'					=> 'EOL',
     'email_domain'			=> 'E-poštna domena',
-    'email_format'			=> 'Format e-pošte',
     'employee_number'       => 'Employee Number',
     'email_domain_help'		=> 'To se uporablja za ustvarjanje e-poštnih naslovov pri uvozu',
     'error'				    => 'Napaka',
     'exclude_archived'      => 'Exclude Archived Assets',
     'exclude_deleted'       => 'Exclude Deleted Assets',
     'example'				=> 'Example: ',
-    'filastname_format'			=> 'Prva črka imena priimek (jsmith@example.com)',
-    'firstname_lastname_format'	=> 'Ime priimek (jane.smith@example.com)',
-    'firstname_lastname_underscore_format' => 'Ime priimek (jane.smith@example.com)',
-    'lastnamefirstinitial_format' =>  'Priimek s prvo črko imena (smithj@example.com)',
-    'firstintial_dot_lastname_format' => 'Prva črka imena s priimkom (j.smith@example.com)',
-    'firstname_lastname_display'	=> 'First Name Last Name (Jane Smith)',
-    'lastname_firstname_display'	=> 'Last Name First Name (Smith Jane)',
-    'name_display_format'	=> 'Name Display Format',
-    'first'					=> 'Prvi',
-    'firstnamelastname'     => 'Ime s priimkom (janesmith@example.com)',
-    'lastname_firstinitial' => 'Priimek s prvo črko imena (smith_j@example.com)',
-    'firstinitial.lastname' => 'Prva črka imena s priimkom (j.smith@example.com)',
-    'firstnamelastinitial'  => 'Ime s prvo črko priimka (janes@example.com)',
-    'lastnamefirstname'      => 'Last Name First Name (smith.jane@example.com)',
-    'first_name'			=> 'Ime',
-    'first_name_format'		=> 'Ime (jane@example.com)',
+
     'files'                 => 'Datoteke',
     'file_name'				=> 'Datoteka',
     'file_type'             => 'Tip datoteke',
-    'filesize'              => 'File Size',
+    'filesize'              => 'Velikost datoteke',
     'file_uploads'			=> 'Nalaganje datotek',
-    'file_upload'           => 'File Upload',
+    'file_upload'           => 'Nalaganje datotek',
     'generate'				=> 'Ustvari',
-    'generate_labels'       => 'Generate Labels',
+    'generate_labels'       => 'Ustvari oznake',
     'github_markdown'      => 'To polje omogoča <a href="https://help.github.com/articles/github-flavored-markdown/">Github z okusom markdowna</a>.',
     'groups'				=> 'Skupine',
     'gravatar_email'        => 'E-poštni naslov Gravatar',
@@ -156,9 +148,9 @@ return [
     'image_delete'         	=> 'Izbriši sliko',
     'include_deleted'       => 'Include Deleted Assets',
     'image_upload'         	=> 'Naloži sliko',
-    'filetypes_accepted_help'    => 'Accepted filetype is :types. Max upload size allowed is :size.|Accepted filetypes are :types. Max upload size allowed is :size.',
-    'filetypes_size_help'   => 'Max upload size allowed is :size.',
-    'image_filetypes_help'  => 'Accepted filetypes are jpg, webp, png, gif, svg, and avif. Max upload size allowed is :size.',
+    'filetypes_accepted_help'    => 'Accepted filetype is :types. The maximum size allowed is :size.|Accepted filetypes are :types. The maximum upload size allowed is :size.',
+    'filetypes_size_help'   => 'The maximum upload size allowed is :size.',
+    'image_filetypes_help'  => 'Accepted Filetypes are jpg, webp, png, gif, svg, and avif. The maximum upload size allowed is :size.',
     'unaccepted_image_type'  => 'This image file was not readable. Accepted filetypes are jpg, webp, png, gif, and svg. The mimetype of this file is: :mimetype.',
     'import'         	    => 'Uvozi',
     'import_this_file'      => 'Map fields and process this file',
@@ -170,8 +162,8 @@ return [
     'asset_maintenance_report' => 'Poročilo o vzdrževanju sredstev',
     'asset_maintenances'       => 'Sredstva vzdrževanja',
     'item'  				=> 'Element',
-    'item_name'             => 'Item Name',
-    'import_file'  			=> 'import CSV file',
+    'item_name'             => 'Ime Artikla',
+    'import_file'  			=> 'uvozi CSV datoteko',
     'import_type'  			=> 'CSV import type',
     'insufficient_permissions' => 'Nezadostna dovoljenja!',
     'kits'       			=> 'Vnaprej določeni kompleti',
@@ -179,12 +171,17 @@ return [
     'last'					=> 'Zadnji',
     'last_login'            => 'Zadnja prijava',
     'last_name'             => 'Priimek',
+    'firstname_lastname_display'	=> 'First Name Last Name (Jane Smith)',
+    'lastname_firstname_display'	=> 'Last Name First Name (Smith Jane)',
+    'name_display_format'	=> 'Name Display Format',
+    'first'					=> 'Prvi',
+    'first_name'			=> 'Ime',
     'license'				=> 'Licenca',
     'license_report'        => 'Poročilo o licenci',
     'licenses_available'	=> 'Licenses available',
     'licenses'				=> 'Licence',
     'list_all'				=> 'Seznam vseh',
-    'loading'				=> 'Loading... please wait....',
+    'loading'				=> 'Loading... please wait...',
     'lock_passwords'        => 'Vrednost tega polja ne bo shranjena v demo namestitvi.',
     'feature_disabled'      => 'Ta funkcija je bila onemogočena za demo namestitev.',
     'location'              => 'Lokacija',
@@ -194,7 +191,7 @@ return [
     'logout'				=> 'Odjava',
     'lookup_by_tag'     => 'Iskanje po oznaki sredstva',
     'maintenances'          => 'Vzdrževanje',
-    'manage_api_keys'       => 'Manage API Keys',
+    'manage_api_keys'       => 'Manage API keys',
     'manufacturer'			=> 'Proizvajalec',
     'manufacturers'			=> 'Proizvajalci',
     'markdown'				=> 'To polje omogoča <a href="https://help.github.com/articles/github-flavored-markdown/">Github z okusom markdowna</a>.',
@@ -216,6 +213,14 @@ return [
     'no_results'			=> 'Ni rezultatov.',
     'no'  					=> 'Ne',
     'notes'  				=> 'Opombe',
+    'note_added'            => 'Note Added',
+    'options'				=> 'Options',
+    'preview'				=> 'Preview',
+    'add_note'              => 'Add Note',
+    'note_edited'            => 'Note Edited',
+    'edit_note'              => 'Edit Note',
+    'note_deleted'            => 'Note Deleted',
+    'delete_note'              => 'Delete Note',
     'order_number'          => 'Številka naročila',
     'only_deleted'          => 'Only Deleted Assets',
     'page_menu'				=> 'Prikazuj elemente _MENU_',
@@ -230,7 +235,7 @@ return [
     'purchase_date'         => 'Datum nakupa',
     'qty'		            => 'KOLIČINA',
     'quantity'		        => 'Količina',
-    'quantity_minimum'      => 'You have :count items below or almost below minimum quantity levels',
+    'quantity_minimum'      => 'You have one item below or almost below minimum quantity levels|You have :count items below or almost below minimum quantity levels',
     'quickscan_checkin'  	=> 'Quick Scan Checkin',
     'quickscan_checkin_status'  	=> 'Checkin Status',
     'ready_to_deploy'		=> 'Pripravljeni za uporabo',
@@ -243,19 +248,19 @@ return [
     'requestable_models'    => 'Requestable Models',
     'requestable_items'     => 'Requestable Items',
     'requested'				=> 'Zahtevano',
-    'requested_date'        => 'Requested Date',
-    'requested_assets'      => 'Requested Assets',
-    'requested_assets_menu' => 'Requested Assets',
+    'requested_date'        => 'Zahtevan datum',
+    'requested_assets'      => 'Zahtevana sredstva',
+    'requested_assets_menu' => 'Zahtevana sredstva',
     'request_canceled'      => 'Zahteva je bila preklicana',
     'request_item'          => 'Request this item',
     'external_link_tooltip' => 'External link to',
     'save'  				=> 'Shrani',
     'select_var'            => 'Select :thing... ', // this will eventually replace all of our other selects
     'select'				=> 'Izberite',
-    'select_all'            => 'Select All',
+    'select_all'            => 'Izberi vse',
     'search'				=> 'Iskanje',
     'select_category'       => 'Izberite kategorijo',
-    'select_datasource' => 'Select a Datasource',
+    'select_datasource' => 'Select a data source',
     'select_department'     => 'Izberite oddelek',
     'select_depreciation'	=> 'Izberite vrsto amortizacije',
     'select_location'		=> 'Izberite lokacijo',
@@ -275,13 +280,15 @@ return [
     'signed_off_by'         => 'Signed Off By',
     'skin'       			=> 'Preobleka',
     'webhook_msg_note'        => 'A notification will be sent via webhook',
-    'webhook_test_msg'        => 'Oh hai! Looks like your :app integration with Snipe-IT is working!',
+    'webhook_test_msg'        => 'Oh hai! It looks like your :app integration with Snipe-IT is working!',
     'some_features_disabled' => 'DEMO MODE: nekatere funkcije so onemogočene za to namestitev.',
     'site_name'				=> 'Ime mesta',
     'state'  				=> 'Stanje',
     'status_labels'			=> 'Oznake statusa',
+    'status_label'			=> 'Status Label',
     'status'    			=> 'Status',
     'accept_eula'           => 'Acceptance Agreement',
+    'show_or_hide_eulas' => 'Show/Hide EULAs',
     'supplier'              => 'Dobavitelj',
     'suppliers'  			=> 'Dobavitelji',
     'sure_to_delete'        => 'Ali ste prepričani, da želite izbrisati',
@@ -297,9 +304,9 @@ return [
     'type'  				=> 'Tip',
     'undeployable'			=> 'Nerazporejeno',
     'unknown_admin'			=> 'Neznan skrbnik',
-    'username_format'		=> 'Format za uporabniško ime',
     'username'              => 'Uporabniško ime',
     'update'                => 'Posodobi',
+    'updating_item' => 'Updating :item',
     'upload_filetypes_help'      => 'Dovoljeni tipi datotek so png, gif, jpg, jpeg, doc, docx, pdf, xls, xlsx, txt, lic, xml, zip, rtf in rar. Dovoljena je največja velikost nalaganja :size.',
     'uploaded'              => 'Naloženo',
     'user'					=> 'Uporabnik',
@@ -324,10 +331,10 @@ return [
     'token_expired'         => 'Vaša seja je potekla. Prosimo, poizkusite ponovno.',
     'login_enabled'         => 'Prijava omogočena',
     'audit_due'             => 'Za revizijo',
-    'audit_due_days'        => 'Assets Due for Audit Within :days Day|Assets Due for Audit Within :days Days',
+    'audit_due_days'        => '{}Assets Due or Overdue for Audit|[1]Assets Due or Overdue for Audit Within a Day|[2,*]Assets Due or Overdue for Audit Within :days Days',
     'checkin_due'           => 'Due for Checkin',
     'checkin_overdue'       => 'Overdue for Checkin',
-    'checkin_due_days'      => 'Assets Due for Checkin Within :days Day|Assets Due for Checkin Within :days Days',
+    'checkin_due_days'      => '{}Due for Checkin|[1]Assets Due for Checkin Within :days Day|[2,*]Assets Due for Checkin Within :days Days',
     'audit_overdue'         => 'Zamuda za revizijo',
     'accept'                => 'Sprejmi :asset',
     'i_accept'              => 'Sprejmem',
@@ -337,33 +344,33 @@ return [
     'clear_signature'       => 'Počisti podpise',
     'show_help'             => 'Pokaži pomoč',
     'hide_help'             => 'Skrij pomoč',
-    'view_all'              => 'view all',
-    'hide_deleted'          => 'Hide Deleted',
+    'view_all'              => 'prikaži vse',
+    'hide_deleted'          => 'Ogled izbrisanih',
     'email'                 => 'E-pošta',
-    'do_not_change'         => 'Do Not Change',
-    'bug_report'            => 'Report a Bug',
+    'do_not_change'         => 'Ne spreminjaj',
+    'bug_report'            => 'Sporoči hrošča',
     'user_manual'           => 'User\'s Manual',
     'setup_step_1'          => 'Step 1',
     'setup_step_2'          => 'Step 2',
     'setup_step_3'          => 'Step 3',
     'setup_step_4'          => 'Step 4',
     'setup_config_check'    => 'Configuration Check',
-    'setup_create_database' => 'Create Database Tables',
-    'setup_create_admin'    => 'Create Admin User',
-    'setup_done'            => 'Finished!',
+    'setup_create_database' => 'Create database tables',
+    'setup_create_admin'    => 'Create an admin user',
+    'setup_done'            => 'Končano!',
     'bulk_edit_about_to'    => 'You are about to edit the following: ',
     'checked_out'           => 'Izdano',
     'checked_out_to'        => 'Checked out to',
-    'fields'                => 'Fields',
+    'fields'                => 'Polja',
     'last_checkout'         => 'Last Checkout',
     'due_to_checkin'        => 'The following :count items are due to be checked in soon:',
     'expected_checkin'      => 'Expected Checkin',
     'reminder_checked_out_items' => 'This is a reminder of the items currently checked out to you. If you feel this list is inaccurate (something is missing, or something appears here that you believe you never received), please email :reply_to_name at :reply_to_address.',
     'changed'               => 'Changed',
-    'to'                    => 'To',
+    'to'                    => 'Za',
     'report_fields_info'    => '<p>Select the fields you would like to include in your custom report, and click Generate. The file (custom-asset-report-YYYY-mm-dd.csv) will download automatically, and you can open it in Excel.</p>
             <p>If you would like to export only certain assets, use the options below to fine-tune your results.</p>',
-    'range'                 => 'Range',
+    'range'                 => 'Obseg',
     'bom_remark'            => 'Add a BOM (byte-order mark) to this CSV',
     'improvements'          => 'Improvements',
     'information'           => 'Information',
@@ -380,13 +387,15 @@ return [
     'dashboard_info'        => 'This is your dashboard. There are many like it, but this one is yours.',
     '60_percent_warning'    => '60% Complete (warning)',
     'dashboard_empty'       => 'It looks like you have not added anything yet, so we do not have anything awesome to display. Get started by adding some assets, accessories, consumables, or licenses now!',
-    'new_asset'             => 'New Asset',
-    'new_license'           => 'New License',
-    'new_accessory'         => 'New Accessory',
-    'new_consumable'        => 'New Consumable',
-    'collapse'              => 'Collapse',
-    'assigned'              => 'Assigned',
-    'asset_count'           => 'Asset Count',
+    'new_asset'             => 'Novo sredstvo',
+    'new_license'           => 'Nova licenca',
+    'new_accessory'         => 'Nov dodatek',
+    'new_consumable'        => 'Nov potrošni material',
+    'new_component'         => 'New Component',
+    'new_user'              => 'New User',
+    'collapse'              => 'Strni',
+    'assigned'              => 'Dodeljeno',
+    'asset_count'           => 'Št. vseh sredstev',
     'accessories_count'     => 'Accessories Count',
     'consumables_count'     => 'Consumables Count',
     'components_count'      => 'Components Count',
@@ -394,11 +403,11 @@ return [
     'notification_error'    => 'Napaka',
     'notification_error_hint' => 'Please check the form below for errors',
     'notification_bulk_error_hint' => 'The following fields had validation errors and were not edited:',
-    'notification_success'  => 'Success',
+    'notification_success'  => 'Uspešno',
     'notification_warning'   => 'Opozorilo',
     'notification_info'      => 'Informacije',
     'asset_information'     => 'Asset Information',
-    'model_name'            => 'Model Name',
+    'model_name'            => 'Številka modela',
     'asset_name'            => 'Ime sredstva',
     'consumable_information' => 'Consumable Information:',
     'consumable_name'       => 'Ime potrošnega materiala:',
@@ -414,30 +423,31 @@ return [
     'ldap_import'           => 'User password should not be managed by LDAP. (This allows you to send forgotten password requests.)',
     'purge_not_allowed'     => 'Purging deleted data has been disabled in the .env file. Contact support or your systems administrator.',
     'backup_delete_not_allowed'     => 'Deleting backups has been disabled in the .env file. Contact support or your systems administrator.',
-    'additional_files'           => 'Additional Files',
+    'additional_files'           => 'Dodatne datoteke',
     'shitty_browser'        => 'No signature detected. If you are using an older browser, please use a more modern browser to complete your asset acceptance.',
     'bulk_soft_delete'      =>'Also soft-delete these users. Their asset history will remain intact unless/until you purge deleted records in the Admin Settings.',
     'bulk_checkin_delete_success' => 'Your selected users have been deleted and their items have been checked in.',
     'bulk_checkin_success' => 'The items for the selected users have been checked in.',
-    'set_to_null'           => 'Delete values for this asset|Delete values for all :asset_count assets ',
+    'set_to_null'           => 'Delete values for this selection|Delete values for all :selection_count selections ',
     'set_users_field_to_null'  => 'Delete :field values for this user|Delete :field values for all :user_count users ',
     'na_no_purchase_date'   => 'N/A - No purchase date provided',
     'assets_by_status'      => 'Assets by Status',
     'assets_by_status_type'      => 'Assets by Status Type',
     'pie_chart_type'        => 'Dashboard Pie Chart Type',
     'hello_name'            => 'Hello, :name!',
-    'unaccepted_profile_warning'   => 'You have :count items requiring acceptance. Click here to accept or decline them',
-    'start_date'            => 'Start Date',
-    'end_date'            => 'End Date',
+    'unaccepted_profile_warning'   => 'You have one item requiring acceptance. Click here to accept or decline it | You have :count items requiring acceptance. Click here to accept or decline them',
+    'start_date'            => 'Datum začetka',
+    'end_date'            => 'Datum zaključka',
     'alt_uploaded_image_thumbnail' => 'Uploaded thumbnail',
-    'placeholder_kit'       => 'Select a kit',
-    'file_not_found'        => 'File not found',
+    'placeholder_kit'       => 'Izberi kit',
+    'file_not_found'        => 'Datoteke ni mogoče najti',
+    'log_record_not_found'  => 'No record for that log entry was found.',
     'preview_not_available' => '(no preview)',
     'setup'                 => 'Setup',
     'pre_flight'            => 'Pre-Flight',
     'skip_to_main_content'  => 'Skip to main content',
     'toggle_navigation'     => 'Toggle navigation',
-    'alerts'                => 'Alerts',
+    'alerts'                => 'Opozorila',
     'tasks_view_all'        => 'View all tasks',
     'true'                  => 'True',
     'false'                 => 'False',
@@ -457,7 +467,7 @@ return [
     'auto_incrementing_asset_tags_disabled_so_tags_required' => 'Generating auto-incrementing asset tags is disabled so all rows need to have the "Asset Tag" column populated.',
     'auto_incrementing_asset_tags_enabled_so_now_assets_will_be_created' => 'Note: Generating auto-incrementing asset tags is enabled so assets will be created for rows that do not have "Asset Tag" populated. Rows that do have "Asset Tag" populated will be updated with the provided information.',
     'send_welcome_email_to_users'   => ' Send Welcome Email for new Users?',
-    'send_email'                => 'Send Email',
+    'send_email'                => 'Pošljite e-pošto',
     'call'                      => 'Call number',
     'back_before_importing'     => 'Backup before importing?',
     'csv_header_field'          => 'CSV Header Field',
@@ -471,10 +481,10 @@ return [
     'cancel_request'            => 'Cancel this item request',
     'setup_successful_migrations' => 'Your database tables have been created',
     'setup_migration_output' => 'Migration output:',
-    'setup_migration_create_user' => 'Next: Create User',
+    'setup_migration_create_user' => 'Naslednje: ustvari uporabnika',
     'importer_generic_error'    => 'Your file import is complete, but we did receive an error. This is usually caused by third-party API throttling from a notification webhook (such as Slack) and would not have interfered with the import itself, but you should confirm this.',
-    'confirm' => 'Confirm',
-    'autoassign_licenses' => 'Auto-Assign Licenses',
+    'confirm' => 'Potrdi',
+    'autoassign_licenses' => 'Avtomatsko dodeli licence',
     'autoassign_licenses_help' => 'Allow this user to have licenses assigned via the bulk-assign license UI or cli tools.',
     'autoassign_licenses_help_long' => 'This allows a user to be have licenses assigned via the bulk-assign license UI or cli tools. (For example, you might not want contractors to be auto-assigned a license you would provide to only staff members. You can still individually assign licenses to those users, but they will not be included in the Checkout License to All Users functions.)',
     'no_autoassign_licenses_help' => 'Do not include user for bulk-assigning through the license UI or cli tools.',
@@ -482,7 +492,7 @@ return [
     'cannot_be_deleted'      => 'This item cannot be deleted',
     'cannot_be_edited'      => 'This item cannot be edited.',
     'undeployable_tooltip'      => 'This item cannot be checked out. Check the quantity remaining.',
-    'serial_number'        => 'Serial Number',
+    'serial_number'        => 'Serijska številka',
     'item_notes' => ':item Notes',
     'item_name_var' => ':item Name',
     'error_user_company' => 'Checkout target company and asset company do not match',
@@ -513,7 +523,7 @@ return [
     'checked_out_to_fields' => 'Checked Out To Fields',
     'percent_complete' => '% končano',
     'uploading' => 'Uploading... ',
-    'upload_error' => 'Error uploading file. Please check that there are no empty rows and that no column names are duplicated.',
+    'upload_error' => 'Error uploading file. Please check that you have no empty rows or duplicated column names in your CSV, and that the server permissions allow uploads.',
     'copy_to_clipboard' => 'Copy to Clipboard',
     'copied' => 'Copied!',
     'status_compatibility' => 'If assets are already assigned, they cannot be changed to a non-deployable status type and this value change will be skipped.',
@@ -523,12 +533,12 @@ return [
     'action_permission_generic' => 'You do not have permission to :action this :item_type',
     'edit' => 'uredi',
     'action_source' => 'Action Source',
-    'or' => 'or',
+    'or' => 'ali',
     'url'                   => 'URL',
     'edit_fieldset' => 'Edit fieldset fields and options',
     'permission_denied_superuser_demo' => 'Permission denied. You cannot update user information for superadmins on the demo.',
     'pwd_reset_not_sent' => 'User is not activated, is LDAP synced, or does not have an email address',
-    'error_sending_email' => 'Error sending email',
+    'error_sending_email' => 'Napaka pri pošiljanju e-pošte',
     'sad_panda' => 'Sad panda. You are not authorized to do the thing. Maybe <a href=":link">return to the dashboard</a>, or contact your administrator.',
     'bulk' => [
             'delete' =>
@@ -550,6 +560,71 @@ return [
         'license_seats'  => ':count License Seat|:count License Seats',
         'consumables'  => ':count Consumable|:count Consumables',
         'components'  => ':count Component|:count Components',
-    ]
+    ],
+
+    'more_info' => 'Več informacij',
+    'quickscan_bulk_help' => 'Checking this box will edit the asset record to reflect this new location. Leaving it unchecked will simply note the location in the audit log. Note that if this asset is checked out, it will not change the location of the person, asset or location it is checked out to.',
+    'whoops' => 'Ups!',
+    'something_went_wrong' => 'Something went wrong with your request.',
+    'close' => 'Zapri',
+    'expires' => 'Poteče',
+    'map_fields'=> 'Map :item_type Fields',
+    'remaining_var' => ':count Remaining',
+    'label' => 'Oznaka',
+    'import_asset_tag_exists' => 'An asset with the asset tag :asset_tag already exists and an update was not requested. No change was made.',
+    'countries_manually_entered_help' => 'Values with an asterisk (*) were manually entered and do not match existing ISO 3166 dropdown values',
+    'accessories_assigned' => 'Assigned Accessories',
+    'user_managed_passwords' => 'Password Management',
+    'user_managed_passwords_disallow' => 'Disallow users from managing their own passwords',
+    'user_managed_passwords_allow' => 'Allow users to manage their own passwords',
+    'from' => 'From',
+    'by' => 'Od',
+
+// Add form placeholders here
+    'placeholders' => [
+        'notes'  => 'Add a note',
+    ],
+
+    'breadcrumb_button_actions' => [
+        'edit_item' => 'Edit :name',
+        'checkout_item' => 'Checkout :name',
+        'checkin_item' => 'Checkin :name',
+    ],
+
+    'skins' => [
+        'site_default' => 'Site Default',
+        'default_blue' => 'Default Blue',
+        'blue_dark' => 'Blue (Dark Mode)',
+        'green' => 'Green Dark',
+        'green_dark' => 'Green (Dark Mode)',
+        'red' => 'Red Dark',
+        'red_dark' => 'Red (Dark Mode)',
+        'orange' => 'Orange Dark',
+        'orange_dark' => 'Orange (Dark Mode)',
+        'black' => 'Black',
+        'black_dark' => 'Black (Dark Mode)',
+        'purple' => 'Purple',
+        'purple_dark' => 'Purple (Dark Mode)',
+        'yellow' => 'Yellow',
+        'yellow_dark' => 'Yellow (Dark Mode)',
+        'high_contrast' => 'High Contrast',
+
+    ],
+
+    'select_all_none' => 'Select/Unselect All',
+    'generic_model_not_found' => 'That :model was not found or you do not have permission to access it',
+    'deleted_models' => 'Deleted Asset Models',
+    'deleted_users' => 'Deleted Users',
+    'cost_each' => ':amount each',
+    'remove_current_image' => 'Remove current :type image',
+
+    'seeding' => [
+        'manufacturers' => [
+            'button' => 'Create Manufacturers',
+            'prompt' => 'You do not have any manufacturers yet. Would you like to seed a list of common manufacturers? (THIS WILL OVERWRITE EXISTING MANUFACTURERS, including those that have been soft-deleted.)',
+            'success' => 'Manufacturers seeded successfully',
+            'error' => 'Could not seed manufacturers. A manufacturer record already exists and seeding would overwrite it.|Could not seed manufacturers. :count manufacturer records already exist and seeding would overwrite them.',
+        ],
+    ],
 
 ];
diff --git a/resources/lang/sl-SI/localizations.php b/resources/lang/sl-SI/localizations.php
index f1232dd138..21273780ce 100644
--- a/resources/lang/sl-SI/localizations.php
+++ b/resources/lang/sl-SI/localizations.php
@@ -2,18 +2,18 @@
 
 return [
 
-    'select_language' => 'Select a language',
+    'select_language' => 'Select a Language',
     'languages' => [
-        'en-US'=> 'English, US',
-        'en-GB'=> 'English, UK',
-        'am-ET' => 'Amharic',
-        'af-ZA'=> 'Afrikaans',
-        'ar-SA'=> 'Arabic',
-        'bg-BG'=> 'Bulgarian',
-        'zh-CN'=> 'Chinese Simplified',
-        'zh-TW'=> 'Chinese Traditional',
-        'ca-ES' => 'Catalan',
-        'hr-HR'=> 'Croatian',
+        'en-US'=> 'Angleščina, ZDA',
+        'en-GB'=> 'Angleščina, ZK',
+        'am-ET' => 'Amharščina',
+        'af-ZA'=> 'Afriško',
+        'ar-SA'=> 'Arabščina',
+        'bg-BG'=> 'Bolgarščina',
+        'zh-CN'=> 'Kitajščina (Poenostavljena)',
+        'zh-TW'=> 'Kitajščina (Tradicionalna)',
+        'ca-ES' => 'Katalonščina',
+        'hr-HR'=> 'Hrvaščina',
         'cs-CZ'=> 'Czech',
         'da-DK'=> 'Danish',
         'nl-NL'=> 'Dutch',
@@ -40,7 +40,9 @@ return [
         'ms-MY'=> 'Malay',
         'mi-NZ'=> 'Maori',
         'mn-MN'=> 'Mongolian',
-        'no-NO'=> 'Norwegian',
+        'nb-NO'=> 'Norwegian Bokmål',
+        'om-ET' => 'Oromo (Ethiopian)',
+        //'nn-NO'=> 'Norwegian Nynorsk',
         'fa-IR'=> 'Persian',
         'pl-PL'=> 'Polish',
         'pt-PT'=> 'Portuguese',
@@ -66,7 +68,7 @@ return [
         'zu-ZA'=> 'Zulu',
     ],
 
-    'select_country' => 'Select a country',
+    'select_country' => 'Select a Country',
     
     'countries' => [
         'AC'=>'Ascension Island',
@@ -133,6 +135,7 @@ return [
         'EC'=>'Ecuador',
         'EE'=>'Estonia',
         'EG'=>'Egypt',
+        'GB-ENG'=>'England',
         'ER'=>'Eritrea',
         'ES'=>'Spain',
         'ET'=>'Ethiopia',
@@ -231,6 +234,7 @@ return [
         'NG'=>'Nigeria',
         'NI'=>'Nicaragua',
         'NL'=>'Netherlands',
+        'GB-NIR' => 'Northern Ireland',
         'NO'=>'Norway',
         'NP'=>'Nepal',
         'NR'=>'Nauru',
@@ -258,7 +262,7 @@ return [
         'RU'=>'Russian Federation',
         'RW'=>'Rwanda',
         'SA'=>'Saudi Arabia',
-        'UK'=>'Scotland',
+        'GB-SCT'=>'Scotland',
         'SB'=>'Solomon Islands',
         'SC'=>'Seychelles',
         'SS'=>'South Sudan',
@@ -310,6 +314,7 @@ return [
         'VI'=>'Virgin Islands (U.S.)',
         'VN'=>'Viet Nam',
         'VU'=>'Vanuatu',
+        'GB-WLS' =>'Wales',
         'WF'=>'Wallis And Futuna Islands',
         'WS'=>'Samoa',
         'YE'=>'Yemen',
diff --git a/resources/lang/sl-SI/mail.php b/resources/lang/sl-SI/mail.php
index 429cb51a97..012d6a741e 100644
--- a/resources/lang/sl-SI/mail.php
+++ b/resources/lang/sl-SI/mail.php
@@ -23,24 +23,25 @@ return [
     'Item_Requested' => 'Zahtevana postavka',
     'License_Checkin_Notification' => 'License checked in',
     'License_Checkout_Notification' => 'License checked out',
+    'license_for'   => 'License for',
     'Low_Inventory_Report' => 'Poročilo o nizki zalogi',
     'a_user_canceled' => 'Uporabnik je preklical zahtevo za sredstev na spletnem mestu',
     'a_user_requested' => 'Uporabnik je zahteval sredstev na spletnem mestu',
     'acceptance_asset_accepted' => 'A user has accepted an item',
     'acceptance_asset_declined' => 'A user has declined an item',
-    'accessory_name' => 'Ime Dodatka:',
-    'additional_notes' => 'Dodatne opombe:',
+    'accessory_name' => 'Ime Dodatka',
+    'additional_notes' => 'Dodatne opombe',
     'admin_has_created' => 'Skrbnik vam je ustvaril račun na :web spletni strani.',
-    'asset' => 'Sredstvo:',
-    'asset_name' => 'Ime sredstva:',
+    'asset' => 'Sredstev',
+    'asset_name' => 'Ime sredstva',
     'asset_requested' => 'Sredstev zahtevano',
     'asset_tag' => 'Oznaka sredstva',
     'assets_warrantee_alert' => 'There is :count asset with a warranty expiring in the next :threshold days.|There are :count assets with warranties expiring in the next :threshold days.',
     'assigned_to' => 'Dodeljena',
     'best_regards' => 'Lep pozdrav,',
-    'canceled' => 'Preklicana:',
-    'checkin_date' => 'Datum sprejema:',
-    'checkout_date' => 'Datum izdaje:',
+    'canceled' => 'Preklicana',
+    'checkin_date' => 'Datum sprejema',
+    'checkout_date' => 'Datum Izdaje',
     'checkedout_from' => 'Checked out from',
     'checkedin_from'  => 'Checked in from',
     'checked_into' => 'Checked into',
@@ -49,27 +50,30 @@ return [
     'click_to_confirm' => 'Prosimo, kliknite na naslednjo povezavo, da potrdite svoj :spletni račun:',
     'current_QTY' => 'Trenutna količina',
     'days' => 'Dnevi',
-    'expecting_checkin_date' => 'Predviden datum dobave:',
+    'expecting_checkin_date' => 'Predviden datum dobave',
     'expires' => 'Poteče',
     'hello' => 'Pozdravljeni',
     'hi' => 'Zdravo',
     'i_have_read' => 'Sem prebral oz. prebrala in se strinjam s pogoji uporabe. Potrjujem prejetje opreme.',
-    'inventory_report' => 'Inventory Report',
-    'item' => 'Element:',
+    'inventory_report' => 'Poročilo o inventarju',
+    'item' => 'Element',
+    'item_checked_reminder' => 'This is a reminder that you currently have :count items checked out to you that you have not accepted or declined. Please click the link below to confirm your decision.',
     'license_expiring_alert' => 'There is :count license expiring in the next :threshold days.|There are :count licenses expiring in the next :threshold days.',
     'link_to_update_password' => 'Prosimo, kliknite na to povezavo, da posodobite svoje: spletno geslo:',
-    'login' => 'Prijava:',
+    'login' => 'Prijava',
     'login_first_admin' => 'Prijavite se v svojo novo namestitev Snipe-IT s spodnjimi poverilnicami:',
     'low_inventory_alert' => 'There is :count item that is below minimum inventory or will soon be low.|There are :count items that are below minimum inventory or will soon be low.',
     'min_QTY' => 'Min kol',
     'name' => 'Ime',
     'new_item_checked' => 'Pod vašim imenom je bil izdan nov element, spodaj so podrobnosti.',
+    'new_item_checked_with_acceptance' => 'A new item has been checked out under your name that requires acceptance, details are below.',
+    'recent_item_checked' => 'An item was recently checked out under your name that requires acceptance, details are below.',
     'notes' => 'Opombe',
-    'password' => 'Geslo:',
+    'password' => 'Geslo',
     'password_reset' => 'Ponastavitev gesla',
     'read_the_terms' => 'Prosimo, preberite pogoje uporabe spodaj.',
     'read_the_terms_and_click' => 'Please read the terms of use below, and click on the link at the bottom to confirm that you read and agree to the terms of use, and have received the asset.',
-    'requested' => 'Zahtevano:',
+    'requested' => 'Zahtevano',
     'reset_link' => 'Povezava za ponastavitev gesla',
     'reset_password' => 'Kliknite tukaj, če želite ponastaviti geslo:',
     'rights_reserved' => 'All rights reserved.',
@@ -86,8 +90,10 @@ return [
     'upcoming-audits' => 'There is :count asset that is coming up for audit within :threshold days.|There are :count assets that are coming up for audit within :threshold days.',
     'user' => 'Uporabnik',
     'username' => 'Uporabniško ime',
+    'unaccepted_asset_reminder' => 'Reminder: You have Unaccepted Assets.',
     'welcome' => 'Dobrodošli: ime',
     'welcome_to' => 'Dobrodošli na :web!',
     'your_assets' => 'View Your Assets',
     'your_credentials' => 'Vaše poverilnice Snipe-IT',
+    'mail_sent' => 'Mail sent successfully!',
 ];
diff --git a/resources/lang/sl-SI/passwords.php b/resources/lang/sl-SI/passwords.php
index 41a87f98ed..9d9fbaa63f 100644
--- a/resources/lang/sl-SI/passwords.php
+++ b/resources/lang/sl-SI/passwords.php
@@ -4,6 +4,6 @@ return [
     'sent'	        => 'If a matching user with a valid email address exists in our system, a password recovery email has been sent.',
     'user'			=> 'If a matching user with a valid email address exists in our system, a password recovery email has been sent.',
     'token'         => 'This password reset token is invalid or expired, or does not match the username provided.',
-    'reset'         => 'Your password has been reset!',
-    'password_change'  => 'Your password has been updated!',
+    'reset'         => 'Geslo je bilo ponastavljeno!',
+    'password_change'  => 'Geslo posodobljeno!',
 ];
diff --git a/resources/lang/sl-SI/validation.php b/resources/lang/sl-SI/validation.php
index 5e4dd5b226..41fa16b90e 100644
--- a/resources/lang/sl-SI/validation.php
+++ b/resources/lang/sl-SI/validation.php
@@ -13,87 +13,150 @@ return [
     |
     */
 
-    'accepted'             => 'Atribut mora biti sprejet.',
-    'active_url'           => 'Atribut ni veljaven URL.',
-    'after'                => 'Atribut mora biti datum po: datumu.',
-    'after_or_equal'       => 'Atribut mora biti datum po ali enak: datumu.',
-    'alpha'                => 'Atribut lahko vsebuje le črke.',
-    'alpha_dash'           => 'Atribut lahko vsebuje samo črke, številke in pomišljaje.',
-    'alpha_num'            => 'Atribut lahko vsebuje le črke in številke.',
-    'array'                => 'Atribut mora biti matrika.',
-    'before'               => 'Atribut mora biti datum pred: datum.',
-    'before_or_equal'      => 'Atribut mora biti datum, ki je pred ali enakovreden datumu.',
-    'between'              => [
-        'numeric' => 'Atribut mora biti med: min -: max.',
-        'file'    => 'Atribut mora biti med: min -: max kilobajtov.',
-        'string'  => 'Atribut mora biti med: min -: max znakov.',
-        'array'   => 'Atribut mora imeti med: min in: max elementov.',
+    'accepted' => 'The :attribute field must be accepted.',
+    'accepted_if' => 'The :attribute field must be accepted when :other is :value.',
+    'active_url' => 'The :attribute field must be a valid URL.',
+    'after' => 'The :attribute field must be a date after :date.',
+    'after_or_equal' => 'The :attribute field must be a date after or equal to :date.',
+    'alpha' => 'The :attribute field must only contain letters.',
+    'alpha_dash' => 'The :attribute field must only contain letters, numbers, dashes, and underscores.',
+    'alpha_num' => 'The :attribute field must only contain letters and numbers.',
+    'array' => 'The :attribute field must be an array.',
+    'ascii' => 'The :attribute field must only contain single-byte alphanumeric characters and symbols.',
+    'before' => 'The :attribute field must be a date before :date.',
+    'before_or_equal' => 'The :attribute field must be a date before or equal to :date.',
+    'between' => [
+        'array' => 'The :attribute field must have between :min and :max items.',
+        'file' => 'The :attribute field must be between :min and :max kilobytes.',
+        'numeric' => 'The :attribute field must be between :min and :max.',
+        'string' => 'The :attribute field must be between :min and :max characters.',
     ],
-    'boolean'              => 'Atribut mora biti true ali false.',
-    'confirmed'            => 'Potrditev atributa se ne ujema.',
-    'date'                 => 'Atribut ni veljaven datum.',
-    'date_format'          => 'Atribut se ne ujema z obliko: format.',
-    'different'            => 'Atribut: drugi mora biti drugačen.',
-    'digits'               => 'Atribut mora biti: števnik.',
-    'digits_between'       => 'Atribut mora biti med: min in: max števkami.',
-    'dimensions'           => 'Atribut ima neveljavne dimenzije slike.',
-    'distinct'             => 'Polje atribut ima podvojeno vrednost.',
-    'email'                => 'Oblika atributa je neveljavna.',
-    'exists'               => 'Izbrani atribut je neveljaven.',
-    'file'                 => 'Atribut mora biti datoteka.',
-    'filled'               => 'Polje atribut mora imeti vrednost.',
-    'image'                => 'Atribut mora biti slika.',
+    'boolean' => 'The :attribute field must be true or false.',
+    'can' => 'The :attribute field contains an unauthorized value.',
+    'confirmed' => 'The :attribute field confirmation does not match.',
+    'contains' => 'The :attribute field is missing a required value.',
+    'current_password' => 'The password is incorrect.',
+    'date' => 'The :attribute field must be a valid date.',
+    'date_equals' => 'The :attribute field must be a date equal to :date.',
+    'date_format' => 'The :attribute field must match the format :format.',
+    'decimal' => 'The :attribute field must have :decimal decimal places.',
+    'declined' => 'The :attribute field must be declined.',
+    'declined_if' => 'The :attribute field must be declined when :other is :value.',
+    'different' => 'The :attribute field and :other must be different.',
+    'digits' => 'The :attribute field must be :digits digits.',
+    'digits_between' => 'The :attribute field must be between :min and :max digits.',
+    'dimensions' => 'The :attribute field has invalid image dimensions.',
+    'distinct' => 'Polje atribut ima podvojeno vrednost.',
+    'doesnt_end_with' => 'The :attribute field must not end with one of the following: :values.',
+    'doesnt_start_with' => 'The :attribute field must not start with one of the following: :values.',
+    'email' => 'The :attribute field must be a valid email address.',
+    'ends_with' => 'The :attribute field must end with one of the following: :values.',
+    'enum' => 'Izbrani atribut je neveljaven.',
+    'exists' => 'Izbrani atribut je neveljaven.',
+    'extensions' => 'The :attribute field must have one of the following extensions: :values.',
+    'file' => 'The :attribute field must be a file.',
+    'filled' => 'Polje atribut mora imeti vrednost.',
+    'gt' => [
+        'array' => 'The :attribute field must have more than :value items.',
+        'file' => 'The :attribute field must be greater than :value kilobytes.',
+        'numeric' => 'The :attribute field must be greater than :value.',
+        'string' => 'The :attribute field must be greater than :value characters.',
+    ],
+    'gte' => [
+        'array' => 'The :attribute field must have :value items or more.',
+        'file' => 'The :attribute field must be greater than or equal to :value kilobytes.',
+        'numeric' => 'The :attribute field must be greater than or equal to :value.',
+        'string' => 'The :attribute field must be greater than or equal to :value characters.',
+    ],
+    'hex_color' => 'The :attribute field must be a valid hexadecimal color.',
+    'image' => 'The :attribute field must be an image.',
     'import_field_empty'    => 'The value for :fieldname cannot be null.',
-    'in'                   => 'Izbrani atribut je neveljaven.',
-    'in_array'             => 'Polje atributov ne obstaja v: drugem.',
-    'integer'              => 'Atribut mora biti celo število.',
-    'ip'                   => 'Atribut mora biti veljaven IP-naslov.',
-    'ipv4'                 => 'Atribut mora biti veljaven IPv4 naslov.',
-    'ipv6'                 => 'Atribut mora biti veljaven IPv6 naslov.',
-    'is_unique_department' => 'The :attribute must be unique to this Company Location',
-    'json'                 => 'Atribut mora biti veljaven JSON niz.',
-    'max'                  => [
-        'numeric' => 'Atribut ne sme biti večji od: max.',
-        'file'    => 'Atribut ne sme biti večji od: max kilobajtov.',
-        'string'  => 'Atribut ne sme biti večji od: max znakov.',
-        'array'   => 'Atribut ne sme vsebovati več kot: max elementov.',
+    'in' => 'Izbrani atribut je neveljaven.',
+    'in_array' => 'The :attribute field must exist in :other.',
+    'integer' => 'The :attribute field must be an integer.',
+    'ip' => 'The :attribute field must be a valid IP address.',
+    'ipv4' => 'The :attribute field must be a valid IPv4 address.',
+    'ipv6' => 'The :attribute field must be a valid IPv6 address.',
+    'json' => 'The :attribute field must be a valid JSON string.',
+    'list' => 'The :attribute field must be a list.',
+    'lowercase' => 'The :attribute field must be lowercase.',
+    'lt' => [
+        'array' => 'The :attribute field must have less than :value items.',
+        'file' => 'The :attribute field must be less than :value kilobytes.',
+        'numeric' => 'The :attribute field must be less than :value.',
+        'string' => 'The :attribute field must be less than :value characters.',
     ],
-    'mimes'                => 'Atribut mora biti datoteka vrste:: vrednost.',
-    'mimetypes'            => 'Atribut mora biti datoteka vrste:: vrednosti.',
-    'min'                  => [
-        'numeric' => 'Atribut mora biti vsaj: min.',
-        'file'    => 'Atribut mora biti vsaj: min kilobajtov.',
-        'string'  => 'Atribut mora biti vsaj: min znakov.',
-        'array'   => 'Atribut mora imeti vsaj: min elementov.',
+    'lte' => [
+        'array' => 'The :attribute field must not have more than :value items.',
+        'file' => 'The :attribute field must be less than or equal to :value kilobytes.',
+        'numeric' => 'The :attribute field must be less than or equal to :value.',
+        'string' => 'The :attribute field must be less than or equal to :value characters.',
     ],
-    'starts_with'          => 'The :attribute must start with one of the following: :values.',
-    'ends_with'            => 'The :attribute must end with one of the following: :values.',
+    'mac_address' => 'The :attribute field must be a valid MAC address.',
+    'max' => [
+        'array' => 'The :attribute field must not have more than :max items.',
+        'file' => 'The :attribute field must not be greater than :max kilobytes.',
+        'numeric' => 'The :attribute field must not be greater than :max.',
+        'string' => 'The :attribute field must not be greater than :max characters.',
+    ],
+    'max_digits' => 'The :attribute field must not have more than :max digits.',
+    'mimes' => 'The :attribute field must be a file of type: :values.',
+    'mimetypes' => 'The :attribute field must be a file of type: :values.',
+    'min' => [
+        'array' => 'The :attribute field must have at least :min items.',
+        'file' => 'The :attribute field must be at least :min kilobytes.',
+        'numeric' => 'The :attribute field must be at least :min.',
+        'string' => 'The :attribute field must be at least :min characters.',
+    ],
+    'min_digits' => 'The :attribute field must have at least :min digits.',
+    'missing' => 'The :attribute field must be missing.',
+    'missing_if' => 'The :attribute field must be missing when :other is :value.',
+    'missing_unless' => 'The :attribute field must be missing unless :other is :value.',
+    'missing_with' => 'The :attribute field must be missing when :values is present.',
+    'missing_with_all' => 'The :attribute field must be missing when :values are present.',
+    'multiple_of' => 'The :attribute field must be a multiple of :value.',
+    'not_in' => 'Izbrani atribut je neveljaven.',
+    'not_regex' => 'The :attribute field format is invalid.',
+    'numeric' => 'The :attribute field must be a number.',
+    'password' => [
+        'letters' => 'The :attribute field must contain at least one letter.',
+        'mixed' => 'The :attribute field must contain at least one uppercase and one lowercase letter.',
+        'numbers' => 'The :attribute field must contain at least one number.',
+        'symbols' => 'The :attribute field must contain at least one symbol.',
+        'uncompromised' => 'The given :attribute has appeared in a data leak. Please choose a different :attribute.',
+    ],
+    'percent'       => 'The depreciation minimum must be between 0 and 100 when depreciation type is percentage.',
 
-    'not_in'               => 'Izbrani atribut je neveljaven.',
-    'numeric'              => 'Atribut mora biti število.',
-    'present'              => 'Polje atribut mora biti prisotno.',
-    'valid_regex'          => 'To ni veljaven regex. ',
-    'regex'                => 'Oblika atributa je neveljavna.',
-    'required'             => 'Polje ne sme biti prazno.',
-    'required_if'          => 'Polje atributa je obvezno, če: drugo je: vrednost.',
-    'required_unless'      => 'Polje atributa je obvezno, razen če je: drugo v: vrednosti.',
-    'required_with'        => 'Polje atributa je obvezno, ko: so prisotne vrednosti.',
-    'required_with_all'    => 'Polje atributa je obvezno, ko: so prisotne vrednosti.',
-    'required_without'     => 'Polje atributa je obvezno, če: vrednosti niso prisotne.',
+    'present' => 'Polje atribut mora biti prisotno.',
+    'present_if' => 'The :attribute field must be present when :other is :value.',
+    'present_unless' => 'The :attribute field must be present unless :other is :value.',
+    'present_with' => 'The :attribute field must be present when :values is present.',
+    'present_with_all' => 'The :attribute field must be present when :values are present.',
+    'prohibited' => 'The :attribute field is prohibited.',
+    'prohibited_if' => 'The :attribute field is prohibited when :other is :value.',
+    'prohibited_unless' => 'The :attribute field is prohibited unless :other is in :values.',
+    'prohibits' => 'The :attribute field prohibits :other from being present.',
+    'regex' => 'The :attribute field format is invalid.',
+    'required' => 'Polje ne sme biti prazno.',
+    'required_array_keys' => 'The :attribute field must contain entries for: :values.',
+    'required_if' => 'Polje atributa je obvezno, če: drugo je: vrednost.',
+    'required_if_accepted' => 'The :attribute field is required when :other is accepted.',
+    'required_if_declined' => 'The :attribute field is required when :other is declined.',
+    'required_unless' => 'Polje atributa je obvezno, razen če je: drugo v: vrednosti.',
+    'required_with' => 'Polje atributa je obvezno, ko: so prisotne vrednosti.',
+    'required_with_all' => 'The :attribute field is required when :values are present.',
+    'required_without' => 'Polje atributa je obvezno, če: vrednosti niso prisotne.',
     'required_without_all' => 'Polje atributa je obvezno, če nobena od: vrednosti ni prisotna.',
-    'same'                 => 'Atribut in: drugi se morajo ujemati.',
-    'size'                 => [
-        'numeric' => 'Atribut mora biti: velikost.',
-        'file'    => 'Atribut mora biti: velikost kilobajtov.',
-        'string'  => 'Atribut mora biti: velikost znakov.',
-        'array'   => 'Atribut mora vsebovati: elemente velikosti.',
+    'same' => 'The :attribute field must match :other.',
+    'size' => [
+        'array' => 'The :attribute field must contain :size items.',
+        'file' => 'The :attribute field must be :size kilobytes.',
+        'numeric' => 'The :attribute field must be :size.',
+        'string' => 'The :attribute field must be :size characters.',
     ],
+    'starts_with' => 'The :attribute field must start with one of the following: :values.',
     'string'               => 'Atribut mora biti niz.',
-    'timezone'             => 'Atribut mora biti veljavno območje.',
     'two_column_unique_undeleted' => 'The :attribute must be unique across :table1 and :table2. ',
-    'unique'               => 'Atribut je bil že sprejet.',
-    'uploaded'             => 'Atribut se ni uspel naložiti.',
-    'url'                  => 'Oblika atributa je neveljavna.',
     'unique_undeleted'     => 'Atribut mora biti edinstven.',
     'non_circular'         => 'The :attribute must not create a circular reference.',
     'not_array'            => ':attribute cannot be an array.',
@@ -102,11 +165,14 @@ return [
     'numbers'              => 'Password must contain at least one number.',
     'case_diff'            => 'Password must use mixed case.',
     'symbols'              => 'Password must contain symbols.',
-    'gte'                  => [
-        'numeric'          => 'Value cannot be negative'
-    ],
-    'checkboxes'           => ':attribute contains invalid options.',
-    'radio_buttons'        => ':attribute is invalid.',
+    'timezone' => 'The :attribute field must be a valid timezone.',
+    'unique' => 'Atribut je bil že sprejet.',
+    'uploaded' => 'Atribut se ni uspel naložiti.',
+    'uppercase' => 'The :attribute field must be uppercase.',
+    'url' => 'The :attribute field must be a valid URL.',
+    'ulid' => 'The :attribute field must be a valid ULID.',
+    'uuid' => 'The :attribute field must be a valid UUID.',
+    'fmcs_location' => 'Full multiple company support and location scoping is enabled in the Admin Settings, and the selected location and selected company are not compatible.',
 
 
     /*
@@ -120,16 +186,22 @@ return [
     |
     */
 
+    'email_array'      => 'En ali več e-poštnih naslovov je napačnih.',
+    'checkboxes'           => ':attribute contains invalid options.',
+    'radio_buttons'        => ':attribute is invalid.',
+    
     'custom' => [
         'alpha_space' => 'Polje atributa vsebuje znak, ki ni dovoljen.',
-        'email_array'      => 'En ali več e-poštnih naslovov je napačnih.',
+
         'hashed_pass'      => 'Vaše trenutno geslo je napačno',
         'dumbpwd'          => 'To geslo je preveč pogosto.',
         'statuslabel_type' => 'Izbrati morate veljavn status oznake',
+        'custom_field_not_found'          => 'This field does not seem to exist, please double check your custom field names.',
+        'custom_field_not_found_on_model' => 'This field seems to exist, but is not available on this Asset Model\'s fieldset.',
 
         // date_format validation with slightly less stupid messages. It duplicates a lot, but it gets the job done :(
-        // We use this because the default error message for date_format is reflects php Y-m-d, which non-PHP
-        // people won't know how to format. 
+        // We use this because the default error message for date_format reflects php Y-m-d, which non-PHP
+        // people won't know how to format.
         'purchase_date.date_format'     => 'The :attribute must be a valid date in YYYY-MM-DD format',
         'last_audit_date.date_format'   =>  'The :attribute must be a valid date in YYYY-MM-DD hh:mm:ss format',
         'expiration_date.date_format'   =>  'The :attribute must be a valid date in YYYY-MM-DD format',
@@ -137,9 +209,15 @@ return [
         'expected_checkin.date_format'  =>  'The :attribute must be a valid date in YYYY-MM-DD format',
         'start_date.date_format'        =>  'The :attribute must be a valid date in YYYY-MM-DD format',
         'end_date.date_format'          =>  'The :attribute must be a valid date in YYYY-MM-DD format',
+        'invalid_value_in_field' => 'Invalid value included in this field',
 
-    ],
+        'ldap_username_field' => [
+            'not_in' =>         '<code>sAMAccountName</code> (mixed case) will likely not work. You should use <code>samaccountname</code> (lowercase) instead.'
+        ],
+        'ldap_auth_filter_query' => ['not_in' => '<code>uid=samaccountname</code> is probably not a valid auth filter. You probably want <code>uid=</code> '],
+        'ldap_filter' => ['regex' => 'This value should probably not be wrapped in parentheses.'],
 
+        ],
     /*
     |--------------------------------------------------------------------------
     | Custom Validation Attributes
@@ -155,8 +233,16 @@ return [
 
     /*
     |--------------------------------------------------------------------------
-    | Generic Validation Messages
+    | Generic Validation Messages - we use these in the jquery validation where we don't have
+    | access to the :attribute
     |--------------------------------------------------------------------------
     */
-    'invalid_value_in_field' => 'Invalid value included in this field',
+
+    'generic' => [
+        'invalid_value_in_field' => 'Invalid value included in this field',
+        'required' => 'To polje je obvezno',
+        'email' => 'Please enter a valid email address',
+    ],
+
+
 ];
diff --git a/resources/lang/so-SO/account/general.php b/resources/lang/so-SO/account/general.php
index df21ad820e..93f07e7a61 100644
--- a/resources/lang/so-SO/account/general.php
+++ b/resources/lang/so-SO/account/general.php
@@ -1,11 +1,17 @@
 <?php
 
 return array(
-    'personal_api_keys' => 'Furayaasha API Personal',
+    'personal_api_keys' => 'Furayaasha gaarka ah ee API',
+    'personal_access_token' => 'Personal Access Token',
+    'personal_api_keys_success' => 'Personal API Key :key created sucessfully',
+    'here_is_api_key' => 'Here is your new personal access token. This is the only time it will be shown so do not lose it! You may now use this token to make API requests.',
     'api_key_warning' => 'When generating an API token, be sure to copy it down immediately as they will not be visible to you again.',
-    'api_base_url' => 'Url saldhigga API wuxuu ku yaalaa:',
+    'api_base_url' => 'Saldhiga API-gaaga linkgiisa wuxuu yaalaa:',
     'api_base_url_endpoint' => '/&lt; dhamaadka&gt;',
-    'api_token_expiration_time' => 'Calaamadaha API waxa lagu dejiyay inay ku dhacaan:',
+    'api_token_expiration_time' => 'Calaamadaha API waxa lagu jaan gooyay inay ku dhacaan:',
     'api_reference' => 'Please check the <a href="https://snipe-it.readme.io/reference" target="_blank">API reference</a> to find specific API endpoints and additional API documentation.',
     'profile_updated' => 'Account successfully updated',
+    'no_tokens' => 'You have not created any personal access tokens.',
+    'enable_sounds' => 'Enable sound effects',
+    'enable_confetti' => 'Enable confetti effects',
 );
diff --git a/resources/lang/so-SO/admin/accessories/general.php b/resources/lang/so-SO/admin/accessories/general.php
index 40a7f9f732..94ef9fdad8 100644
--- a/resources/lang/so-SO/admin/accessories/general.php
+++ b/resources/lang/so-SO/admin/accessories/general.php
@@ -10,12 +10,12 @@ return array(
     'eula_text'							=> 'Qaybta EULA',
     'eula_text_help'					=> 'Goobtani waxay kuu ogolaanaysaa inaad u habayso EULA-gaaga noocyo gaar ah oo hanti ah. Haddii aad haysato hal EULA oo keliya dhammaan hantidaada, waxaad calamdi kartaa sanduuqa hoose si aad u isticmaasho asalka aasaasiga ah.',
     'require_acceptance'				=> 'U baahan isticmaalayaashu inay xaqiijiyaan aqbalaadda hantida qaybtan.',
-    'no_default_eula'					=> 'Ma jiro EULA aasaasiga ah oo la helay Mid ku dar Settings',
+    'no_default_eula'					=> 'Ma jiro hannaanka EULA ee aasaasiga ah oo la helay. Mid ku dar Settings.',
     'total'  							=> 'Wadarta',
     'remaining'  						=> 'Ka faaideyso',
     'update'  							=> 'Cusbooneysii Agabka',
     'use_default_eula'					=> 'Isticmaal <a href="#" data-toggle="modal" data-target="#eulaModal">horta u ah EULA</a> beddelkeeda.',
-    'use_default_eula_disabled'			=> '<del>Isticmaal beddelka EULA-ga aasaasiga ah.</del> Ma jiro EULA aasaasiga ah oo la dejiyay. Fadlan ku dar mid Settings',
+    'use_default_eula_disabled'			=> '<del>Isticmaal beddelka EULA-ga aasaasiga ah.</del> Ma jiro EULA aasaasiga ah oo la habeeyay. Fadlan hal mid kudar Settings.',
     'clone'                             => 'Qalabka Clone',
     'delete_disabled'                   => 'Qalabkan weli lama tirtiri karo sababtoo ah walxaha qaarkood weli waa la hubiyay.',
 
diff --git a/resources/lang/so-SO/admin/accessories/message.php b/resources/lang/so-SO/admin/accessories/message.php
index c3d08b8a41..7001fed738 100644
--- a/resources/lang/so-SO/admin/accessories/message.php
+++ b/resources/lang/so-SO/admin/accessories/message.php
@@ -2,37 +2,41 @@
 
 return array(
 
-    'does_not_exist' => 'Qalabka [:id] ma jiro',
+    'does_not_exist' => 'Mulxaqa lasoo raaciyay [:aqoonsiga] ma ahan mid jira.',
     'not_found' => 'Qalabkaas lama helin.',
     'assoc_users'	 => 'Qalabkan waxa uu hadda hayaa :count walxo la hubiyay isticmaalayaasha Fadlan iska hubi agabka oo isku day markale. ',
 
     'create' => array(
         'error'   => 'Qalabka lama abuurin, fadlan isku day mar kale.',
-        'success' => 'Qalabka si guul leh ayaa loo sameeyay'
+        'success' => 'Mulxaqa lasoo raaciyay waa lagu guuleystay in la sameeyo.'
     ),
 
     'update' => array(
         'error'   => 'Qalabka lama cusboonaysiin, fadlan isku day mar kale',
-        'success' => 'Qalabka si guul leh ayaa loo cusboonaysiiyay'
+        'success' => 'Mulxaqa lasoo raaciyay waa lagu guuleystay in la sameeyo.'
     ),
 
     'delete' => array(
         'confirm'   => 'Ma hubtaa inaad rabto inaad tirtirto qalabkan?',
-        'error'   => 'Waxaa jiray arrin la tirtiray qalabyada Fadlan isku day mar kale',
-        'success' => 'Qalabka si guul leh ayaa loo tirtiray'
+        'error'   => 'Waxaa jirtay xaalad tirtireysay mulxaqa. Fadlan isku day mar kale.',
+        'success' => 'Mulxaqa lasoo raaciyay waa lagu guuleystay in la tir-tiro.'
     ),
 
      'checkout' => array(
         'error'   		=> 'Agabka lama hubin, fadlan isku day mar kale',
-        'success' 		=> 'Qalabka si guul leh ayaa loo hubiyay',
+        'success' 		=> 'Mulxaqa lasoo raaciyay waa lagu guuleystay in la hubiyo.',
         'unavailable'   => 'Agabka looma hayo hubinta Hubi tirada la heli karo',
-        'user_does_not_exist' => 'Isticmaalahaasi waa khalad Fadlan isku day mar kale'
+        'user_does_not_exist' => 'Isticmaalahaas maahan mid jira. Fadlan isku day mar kale.',
+         'checkout_qty' => array(
+            'lte'  => 'There is currently only one available accessory of this type, and you are trying to check out :checkout_qty. Please adjust the checkout quantity or the total stock of this accessory and try again.|There are :number_currently_remaining total available accessories, and you are trying to check out :checkout_qty. Please adjust the checkout quantity or the total stock of this accessory and try again.',
+            ),
+           
     ),
 
     'checkin' => array(
         'error'   		=> 'Agabka lama hubin, fadlan isku day mar kale',
-        'success' 		=> 'Qalabka si guul leh ayaa loo hubiyay',
-        'user_does_not_exist' => 'Isticmaalahaasi waa khalad Fadlan isku day mar kale'
+        'success' 		=> 'Mulxaqa waa lagu guuleystay in la hubiyo.',
+        'user_does_not_exist' => 'Isticmaalahaasi mahan mid jira. Fadlan isku day mar kale.'
     )
 
 
diff --git a/resources/lang/so-SO/admin/accessories/table.php b/resources/lang/so-SO/admin/accessories/table.php
index f2a41e6701..c99bc67b3b 100644
--- a/resources/lang/so-SO/admin/accessories/table.php
+++ b/resources/lang/so-SO/admin/accessories/table.php
@@ -6,6 +6,4 @@ return array(
     'id'      					=> 'Aqoonsi',
     'require_acceptance'      	=> 'Ogolaanshaha',
     'title'      				=> 'Magaca dheeriga ah',
-
-
 );
diff --git a/resources/lang/so-SO/admin/asset_maintenances/message.php b/resources/lang/so-SO/admin/asset_maintenances/message.php
index 3592ffe495..8b2e6c281f 100644
--- a/resources/lang/so-SO/admin/asset_maintenances/message.php
+++ b/resources/lang/so-SO/admin/asset_maintenances/message.php
@@ -4,8 +4,8 @@
         'not_found'                    => 'Dayactirka hantida aad raadinaysay lama helin!',
         'delete'                       => [
             'confirm' => 'Ma hubtaa inaad rabto inaad tirtirto dayactirka hantida?',
-            'error'   => 'Waxaa jirtay arrin lagu tirtirayo dayactirka hantida. Fadlan isku day mar kale',
-            'success' => 'Dayactirka hantida ayaa si guul leh loo tirtiray',
+            'error'   => 'Waxaa jirtay arrin tir-tireysay dayactirka hantida. Fadlan isku day mar kale.',
+            'success' => 'Dayactirka hantida waa lagu guuleystay in la tir-tiro.',
         ],
         'create'                       => [
             'error'   => 'Dayactirka hantida lama abuurin, fadlan isku day mar kale.',
@@ -13,7 +13,7 @@
         ],
         'edit'                       => [
             'error'   => 'Dayactirka hantida lama tafatirin, fadlan isku day mar kale.',
-            'success' => 'Dayactirka hantida ayaa si guul leh loo tafatiray',
+            'success' => 'Dayactirka hantida waa lagu guuleystay in la tifaftiro.',
         ],
         'asset_maintenance_incomplete' => 'Wali lama dhamaystirin',
         'warranty'                     => 'Dammaanad',
diff --git a/resources/lang/so-SO/admin/categories/general.php b/resources/lang/so-SO/admin/categories/general.php
index f8bf04ca8a..d2559e1517 100644
--- a/resources/lang/so-SO/admin/categories/general.php
+++ b/resources/lang/so-SO/admin/categories/general.php
@@ -1,25 +1,25 @@
 <?php
 
 return array(
-    'asset_categories' 					=> 'Qaybaha Hantida',
-    'category_name'  					=> 'Magaca Qaybta',
-    'checkin_email'                     => 'U dir iimaylka isticmaalaha marka la jeegeynayo/baaro.',
-    'checkin_email_notification'        => 'Isticmaalahan waxa loo soo diri doonaa iimayl marka la hubinayo/baaro.',
-    'clone'                             => 'Qaybta Clone',
-    'create'  							=> 'Abuur Qaybta',
-    'edit'                              => 'Wax ka beddel qaybta',
-    'email_will_be_sent_due_to_global_eula' => 'Iimayl ayaa loo diri doonaa isticmaalaha sababtoo ah EULA caalamiga ah ayaa la isticmaalayaa.',
-    'email_will_be_sent_due_to_category_eula' => 'Iimayl ayaa loo diri doona isticmaalaha sababtoo ah EULA ayaa loo dejiyay qaybtan.',
-    'eula_text'							=> 'Qaybta EULA',
-    'eula_text_help'					=> 'Goobtani waxay kuu ogolaanaysaa inaad u habayso EULA-gaaga noocyo gaar ah oo hanti ah. Haddii aad haysato hal EULA oo keliya dhammaan hantidaada, waxaad calamdi kartaa sanduuqa hoose si aad u isticmaasho asalka aasaasiga ah.',
-    'name'                              => 'Magaca Qaybta',
-    'require_acceptance'				=> 'U baahan isticmaalayaashu inay xaqiijiyaan aqbalaadda hantida qaybtan.',
+    'asset_categories' 					=> 'Qaanadda Ra\'samaalka',
+    'category_name'  					=> 'Magaca Qaanadda',
+    'checkin_email'                     => 'U dir email isticmaalaha marka la galayo/baarayo.',
+    'checkin_email_notification'        => 'Isticmaalahan waxa loo soo diri doonaa email marka la hubinayo/baarayo.',
+    'clone'                             => 'Qaanadda koobiyeynta',
+    'create'  							=> 'Sameey Qaanad',
+    'edit'                              => 'Wax ka beddel qaanadda',
+    'email_will_be_sent_due_to_global_eula' => 'Iimayl ayaa loo diri doonaa isticmaalaha sababtoo ah nidaamka caalamiga ee EULA caalamiga ah ayaa la isticmaalay.',
+    'email_will_be_sent_due_to_category_eula' => 'Iimayl ayaa loo diri doonaa isticmaalaha sababtoo ah nidaamka caalamiga ee EULA caalamiga ah ayaa lagu habeeyey qaanadan.',
+    'eula_text'							=> 'Qaanadda EULA',
+    'eula_text_help'					=> 'Goobtani waxay kuu ogolaanaysaa inaad u habayso EULA-gaaga noocyo gaar ah oo hanti ah. Haddii aad haysato hal EULA oo keliya dhammaan hantidaada, waxaad calaamadeyn kartaa sanduuqa hoose si aad u isticmaasho asalka aasaasiga ah.',
+    'name'                              => 'Magaca Qaanadda',
+    'require_acceptance'				=> 'Isticmaalayaashu waxay u baahanyihiin iney xaqiijiyaan aqbalaadda hantida qaybtan.',
     'required_acceptance'				=> 'Isticmaalahan waxaa iimayl loogu soo diri doonaa xiriiriye si loo xaqiijiyo aqbalaada shaygan.',
     'required_eula'						=> 'Isticmaalahan waxaa iimayl loogu soo diri doonaa koobiga EULA',
-    'no_default_eula'					=> 'Ma jiro EULA aasaasiga ah oo la helay Mid ku dar Settings.',
-    'update'  							=> 'Cusbooneysii Qaybta',
-    'use_default_eula'					=> 'Isticmaal <a href="#" data-toggle="modal" data-target="#eulaModal">horta u ah EULA</a> beddelkeeda.',
-    'use_default_eula_disabled'			=> '<del>Isticmaal beddelka EULA-ga aasaasiga ah.</del> Ma jiro EULA aasaasiga ah oo la dejiyay. Fadlan ku dar mid Settings.',
+    'no_default_eula'					=> 'Ma jiro EULA aasaasi ah oo la helay. Mid ku dar Settings.',
+    'update'  							=> 'Cusbooneysii Qaanadda',
+    'use_default_eula'					=> 'Isticmaal <a href="#" data-toggle="modal" data-target="#eulaModal">asaaska koowaad ee EULA</a> beddelkeeda.',
+    'use_default_eula_disabled'			=> '<del>Isticmaal beddelka EULA-ga aasaasiga ah.</del> Ma jiro EULA aasaasi ah oo la dejiyay. Fadlan ku dar mid Settings.',
     'use_default_eula_column'			=> 'Isticmaal EULA caadiga ah',
 
 );
diff --git a/resources/lang/so-SO/admin/categories/message.php b/resources/lang/so-SO/admin/categories/message.php
index e1a3ae6aa9..4717df917b 100644
--- a/resources/lang/so-SO/admin/categories/message.php
+++ b/resources/lang/so-SO/admin/categories/message.php
@@ -2,25 +2,25 @@
 
 return array(
 
-    'does_not_exist' => 'Qaybta ma jirto.',
-    'assoc_models'	 => 'Qaybtan hadda waxay la xidhiidhaa ugu yaraan hal nooc oo lama tirtiri karo. Fadlan cusboonaysii moodooyinkaaga si aanay u tixraacin qaybtan oo isku day mar kale. ',
-    'assoc_items'	 => 'Qaybtan hadda waxa lala xidhiidhiyaa ugu yaraan hal :asset_type lamana tirtiri karo. Fadlan cusboonaysii :asset_type kaaga si aanad mar dambe tixraac qaybtan oo isku day mar kale. ',
+    'does_not_exist' => 'Qaanadda majirto.',
+    'assoc_models'	 => 'Qaanadan hadda waxay la xiriirtaa ugu yaraan hal nooc oo lama tirtiri karo. Fadlan cusboonaysii noocyadaada si aanay u tixraacin qaanadan iskuna day mar kale. ',
+    'assoc_items'	 => 'Qaanadan hadda waxay la xiriirtaa ugu yaraan hal nooc oo lama tirtiri karo. Fadlan cusboonaysii noocyadaada si aanay u tixraacin qaanadan iskuna day mar kale. ',
 
     'create' => array(
-        'error'   => 'Qaybta lama abuurin, fadlan isku day mar kale.',
-        'success' => 'Qaybta si guul leh ayaa loo sameeyay.'
+        'error'   => 'Qaanadda lama sameynin. fadlan isku day markale.',
+        'success' => 'Qaanadda waa lag guuleystay in la sameeyo.'
     ),
 
     'update' => array(
-        'error'   => 'Qaybta lama cusboonaysiin, fadlan isku day mar kale',
-        'success' => 'Qaybta si guul leh ayaa loo cusboonaysiiyay.',
-        'cannot_change_category_type'   => 'Ma beddeli kartid nooca qaybta marka la abuuro',
+        'error'   => 'Qaanadda lama cusbooneysiin, fadlan isku day markale',
+        'success' => 'Qaanadda waa lagu guuleystay in la cusbooneysiiyo.',
+        'cannot_change_category_type'   => 'Ma bedeli kartid nooca qaanadda marka la abuuro',
     ),
 
     'delete' => array(
-        'confirm'   => 'Ma hubtaa inaad doonayso inaad tirtirto qaybtan?',
-        'error'   => 'Waxaa jirtay arrin la tirtiray qaybta Fadlan isku day mar kale.',
-        'success' => 'Qaybta si guul leh ayaa loo tirtiray.'
+        'confirm'   => 'Ma hubtaa inaad doonayso inaad tirtirto qaanadan?',
+        'error'   => 'Waxaa jirtay arrin tir-tireysay qaanadda. Fadlan isku day mar kale.',
+        'success' => 'Qaanadda waa lag guuleystay in la tir-tiro.'
     )
 
 );
diff --git a/resources/lang/so-SO/admin/categories/table.php b/resources/lang/so-SO/admin/categories/table.php
index ce07a08901..07e7f3396d 100644
--- a/resources/lang/so-SO/admin/categories/table.php
+++ b/resources/lang/so-SO/admin/categories/table.php
@@ -5,6 +5,6 @@ return array(
     'id'      					=> 'Aqoonsi',
     'parent'   					=> 'Waalid',
     'require_acceptance'      	=> 'Ogolaanshaha',
-    'title'      				=> 'Magaca Qaybta Hantida',
+    'title'      				=> 'Magaca qaanadda Hantida',
 
 );
diff --git a/resources/lang/so-SO/admin/companies/message.php b/resources/lang/so-SO/admin/companies/message.php
index 1710670cec..184983bd43 100644
--- a/resources/lang/so-SO/admin/companies/message.php
+++ b/resources/lang/so-SO/admin/companies/message.php
@@ -6,15 +6,15 @@ return [
     'assoc_users'    => 'Shirkaddan hadda waxay ku xidhan tahay ugu yaraan hal nooc oo lama tirtiri karo. Fadlan cusboonaysii moodooyinkaaga si aanay u tixraacin shirkaddan oo isku day mar kale. ',
     'create' => [
         'error'   => 'Shirkadda lama abuurin, fadlan isku day mar kale.',
-        'success' => 'Shirkadda si guul leh ayaa loo abuuray',
+        'success' => 'Shirkadda waa lagu guuleystay in la sameeyo.',
     ],
     'update' => [
         'error'   => 'Shirkadda lama cusboonaysiin, fadlan isku day mar kale',
-        'success' => 'Shirkadda si guul leh ayaa loo cusboonaysiiyay',
+        'success' => 'Shirkadda waa lagu guuleystay in la cusbooneysiiyo.',
     ],
     'delete' => [
         'confirm' => 'Ma hubtaa inaad rabto inaad tirtirto shirkaddan?',
-        'error'   => 'Waxaa jirtay arrin la tirtiray shirkadda. Fadlan isku day mar kale',
-        'success' => 'Shirkadda si guul leh ayaa loo tirtiray',
+        'error'   => 'Waxaa jirtay arrin tir-tireysay shirkadda. Fadlan isku day mar kale.',
+        'success' => 'Shirkadda waa lagu guuleystay in la tir-tiro.',
     ],
 ];
diff --git a/resources/lang/so-SO/admin/components/message.php b/resources/lang/so-SO/admin/components/message.php
index 4953cc0e61..f8e4dc8e48 100644
--- a/resources/lang/so-SO/admin/components/message.php
+++ b/resources/lang/so-SO/admin/components/message.php
@@ -2,35 +2,36 @@
 
 return array(
 
-    'does_not_exist' => 'Qayb ma jiraan',
+    'does_not_exist' => 'Qeyb ahaan majirto.',
 
     'create' => array(
         'error'   => 'Qayb lama abuurin, fadlan isku day mar kale.',
-        'success' => 'Qayb ayaa loo sameeyay si guul leh'
+        'success' => 'Qayb ahaan waa lagu guuleystay in la sameeyo.'
     ),
 
     'update' => array(
         'error'   => 'Qaybaha lama cusboonaysiin, fadlan isku day mar kale',
-        'success' => 'Qaybta si guul leh ayaa loo cusboonaysiiyay'
+        'success' => 'Qeyb ahaan waa lagu guuleystay in la cusbooneysiiyo.'
     ),
 
     'delete' => array(
         'confirm'   => 'Ma hubtaa inaad rabto inaad tirtirto qaybtan?',
-        'error'   => 'Waxaa jirtay arrin la tirtirayo qaybta Fadlan isku day mar kale',
-        'success' => 'Qaybta si guul leh ayaa loo tirtiray'
+        'error'   => 'Waxaa jirtay arrin tir-tireysay qaybta. Fadlan isku day mar kale.',
+        'success' => 'Qaybta waa lagu guuleystay in la tir-tiro.',
+        'error_qty'   => 'Some components of this type are still checked out. Please check them in and try again.',
     ),
 
      'checkout' => array(
         'error'   		=> 'Qaybaha lama hubin, fadlan isku day mar kale',
-        'success' 		=> 'Qaybta si guul leh ayaa loo hubiyay',
-        'user_does_not_exist' => 'Isticmaalahaasi waa khalad Fadlan isku day mar kale',
+        'success' 		=> 'Qaybta waa lagu guuleystay in la hubiyo.',
+        'user_does_not_exist' => 'Isticmaalahaasi ma ahan mid jira. Fadlan isku day mar kale.',
         'unavailable'      => 'Qaybo aan ku filnayn ayaa hadhsan: :remaining hadhay, :requested waa la codsaday ',
     ),
 
     'checkin' => array(
         'error'   		=> 'Qaybaha lama hubin, fadlan isku day mar kale',
-        'success' 		=> 'Qaybta si guul leh ayaa loo hubiyay',
-        'user_does_not_exist' => 'Isticmaalahaasi waa khalad Fadlan isku day mar kale'
+        'success' 		=> 'Qaybta waa lagu guuleystay in la hubiyo.',
+        'user_does_not_exist' => 'Isticmaalahaasi ma ahan mid jira. Fadlan isku day mar kale.'
     )
 
 
diff --git a/resources/lang/so-SO/admin/consumables/general.php b/resources/lang/so-SO/admin/consumables/general.php
index 3a8e013a02..1879f8bd9a 100644
--- a/resources/lang/so-SO/admin/consumables/general.php
+++ b/resources/lang/so-SO/admin/consumables/general.php
@@ -8,4 +8,5 @@ return array(
     'remaining' 			            => 'Haraaga',
     'total' 			                => 'Wadarta',
     'update'                            => 'Cusbooneysii Isticmaalka',
+    'inventory_warning'                 => 'The inventory of this consumable is below the minimum amount of :min_count',
 );
diff --git a/resources/lang/so-SO/admin/consumables/message.php b/resources/lang/so-SO/admin/consumables/message.php
index 6a672d9941..809659bdd1 100644
--- a/resources/lang/so-SO/admin/consumables/message.php
+++ b/resources/lang/so-SO/admin/consumables/message.php
@@ -2,35 +2,36 @@
 
 return array(
 
+    'invalid_category_type' => 'The category must be a consumable category.',
     'does_not_exist' => 'Wax la isticmaali karo ma jiro.',
 
     'create' => array(
         'error'   => 'La isticmaali karo lama abuurin, fadlan isku day mar kale.',
-        'success' => 'Isticmaalka ayaa si guul leh loo abuuray'
+        'success' => 'Isticmaalka waa lagu guuleystay in la abuuro.'
     ),
 
     'update' => array(
         'error'   => 'Isticmaalka lama cusboonaysiin, fadlan isku day mar kale',
-        'success' => 'Isticmaalka si guul leh ayaa loo cusboonaysiiyay'
+        'success' => 'Isticmaalka waa lagu guuleystay in la cusbooneysiiyo.'
     ),
 
     'delete' => array(
         'confirm'   => 'Ma hubtaa inaad rabto inaad tirtirto alaabtan?',
-        'error'   => 'Waxaa jirtay arrin la tirtirayo alaabta. Fadlan isku day mar kale',
-        'success' => 'Isticmaalka si guul leh ayaa loo tirtiray'
+        'error'   => 'Waxaa jirtay arin tireysay isticmaalka alaabta. Fadlan isku day mar kale.',
+        'success' => 'Isticmaalka waa lagu guuleystay in la tir-tiro.'
     ),
 
      'checkout' => array(
         'error'   		=> 'Isticmaalka lama hubin, fadlan isku day mar kale',
-        'success' 		=> 'Isticmaalka si guul leh ayaa loo hubiyay',
-        'user_does_not_exist' => 'Isticmaalahaasi waa khalad Fadlan isku day mar kale',
+        'success' 		=> 'Isticmaalka waa lagu guuleystay in la hubiyo.',
+        'user_does_not_exist' => 'Isticmaalahaasi ma ahan mid jira. Fadlan isku day mar kale.',
          'unavailable'      => 'Ma jiraan alaabooyin ku filan hubintan. Fadlan hubi tirada hadhay ',
     ),
 
     'checkin' => array(
         'error'   		=> 'Isticmaalka lama hubin, fadlan isku day mar kale',
-        'success' 		=> 'Isticmaalka si guul leh ayaa loo hubiyay',
-        'user_does_not_exist' => 'Isticmaalahaasi waa khalad Fadlan isku day mar kale'
+        'success' 		=> 'Isticmaalka waa lagu guuleystay in la hubiyo.',
+        'user_does_not_exist' => 'Isticmaalahaasi ma ahan mida jira. Fadlan isku day mar kale.'
     )
 
 
diff --git a/resources/lang/so-SO/admin/custom_fields/general.php b/resources/lang/so-SO/admin/custom_fields/general.php
index b87fb43829..d2e91858b8 100644
--- a/resources/lang/so-SO/admin/custom_fields/general.php
+++ b/resources/lang/so-SO/admin/custom_fields/general.php
@@ -16,12 +16,12 @@ return [
     'fieldset_name'           => 'Magaca Goobta',
     'field_name'              => 'Magaca Goobta',
     'field_values'            => 'Qiimaha Goobta',
-    'field_values_help'       => 'Ku dar xulashooyinka la dooran karo, midkiiba. Khadadka maran ee aan ahayn xariiqda koowaad waa la iska indhatiraa',
+    'field_values_help'       => 'Ku dar xulashooyin la dooran karo, sadar kasta hal xulasho. waa la iska indha tiri doonaa sadarada faaruqa ah marka laga reebo sadarka koowaad.',
     'field_element'           => 'Qaybta Foomka',
     'field_element_short'     => 'Cunsurka',
     'field_format'            => 'Qaabka',
     'field_custom_format'     => 'Qaabka Regex Custom',
-    'field_custom_format_help'     => 'Goobtani waxay kuu ogolaanaysaa inaad isticmaasho odhaah regex si loo xaqiijiyo Waa inay ku bilaabataa "regex:" - tusaale ahaan, si loo xaqiijiyo in qiimaha goobta gaarka ahi ka kooban yahay IMEI sax ah (15 lambar), waxaad isticmaali doontaa <code>regex:/^[0-9]{15}$ /</code>',
+    'field_custom_format_help'     => 'Goobtani waxay kuu ogolaanaysaa inaad isticmaasho tacbiir cadi ah si aad u hubsato sax ahaanshaha. waa inuu ka billowdaaa "regex:" - tusaale ahaan, si loo xaqiijiyo in qiimaha goobta gaarka ahi ku jirto nambar  saxan oo IMEI (15 lambar), waxaad isticmaali doontaa <code>regex:/^[0-9]{15}$ /</code>.',
     'required'   		          => 'Loo baahan yahay',
     'req'   		              => 'Req.',
     'used_by_models'   		    => 'Waxaa Isticmaala Moodooyinka',
@@ -35,7 +35,7 @@ return [
     'create_field_title' => 'Samee goob cusub oo caado ah',
     'value_encrypted'      	        => 'Qiimaha goobtan waxa lagu sir ah kaydka xogta. Kaliya isticmaalayaasha maamulka ayaa awoodi doona inay arkaan qiimaha la furay',
     'show_in_email'     => 'Ku dar qiimaha goobtan fariimaha hubinta ee loo soo diray isticmaalaha? Goobaha sirta ah laguma dari karo iimaylada',
-    'show_in_email_short'     => 'Ku dar emails',
+    'show_in_email_short' => 'Ku dar emails',
     'help_text' => 'Qoraalka Caawinta',
     'help_text_description' => 'Kani waa qoraal ikhtiyaari ah oo ka soo bixi doona hoosta qaybaha foomka marka la tafatiro hantida si loo bixiyo macnaha guud ee goobta.',
     'about_custom_fields_title' => 'Ku saabsan Goobaha Gaarka ah',
@@ -57,5 +57,8 @@ return [
     'show_in_requestable_list_short' => 'Ku muuji liiska hantida la codsan karo',
     'show_in_requestable_list' => 'Muuji qiimaha liiska hantida la codsan karo. Goobaha sirta ah lama tusi doono',
     'encrypted_options' => 'Goobtan waa la sir sir ah, marka qaar ka mid ah xulashooyinka bandhiga lama heli doono.',
+    'display_checkin' => 'Display in checkin forms',
+    'display_checkout' => 'Display in checkout forms',
+    'display_audit' => 'Display in audit forms',
 
 ];
diff --git a/resources/lang/so-SO/admin/custom_fields/message.php b/resources/lang/so-SO/admin/custom_fields/message.php
index caff4e7720..986bc47e3b 100644
--- a/resources/lang/so-SO/admin/custom_fields/message.php
+++ b/resources/lang/so-SO/admin/custom_fields/message.php
@@ -5,22 +5,23 @@ return array(
     'field' => array(
         'invalid'   => 'Goobtaas ma jirto.',
         'already_added'   => 'Goobta mar hore ayaa lagu daray',
+        'none_selected'   => 'No field selected',
 
         'create' => array(
             'error'   => 'Goobta lama abuurin, fadlan isku day mar kale.',
-            'success' => 'Goobta si guul leh ayaa loo sameeyay',
+            'success' => 'Feild-dhiga waa lagu guuleystay in la sameeyo.',
             'assoc_success' => 'Goobta si guul leh ayaa loogu daray goobta.'
         ),
 
         'update' => array(
             'error'   => 'Goobta lama cusboonaysiin, fadlan isku day mar kale',
-            'success' => 'Goobta si guul leh ayaa loo cusboonaysiiyay'
+            'success' => 'Feild-dhiga waa lagu guuleystay in la cusbooneysiiyo.'
         ),
 
         'delete' => array(
             'confirm'   	=> 'Ma hubtaa inaad doonayso inaad tirtirto goobtan?',
-            'error'   => 'Waxaa jirtay arrin la tirtiray garoonka. Fadlan isku day mar kale',
-            'success' => 'Goobta si guul leh ayaa loo tirtiray',
+            'error'   => 'Waxaa jirtay arrin tir-tireysay feild-dhiga. Fadlan isku day mar kale.',
+            'success' => 'Feild-dhiga waa lagu guuleystay in la tir-tiro.',
             'in_use'   => 'Goobta weli waa la isticmaalayaa.',
         )
 
@@ -32,26 +33,26 @@ return array(
 
         'create' => array(
             'error'   => 'Fieldset lama abuurin, fadlan isku day mar kale.',
-            'success' => 'Fieldset si guul leh ayaa loo sameeyay'
+            'success' => 'Fieldset waa lagu guuleystay in la sameeyo.'
         ),
 
         'update' => array(
             'error'   => 'Fieldset lama cusboonaysiin, fadlan isku day mar kale',
-            'success' => 'Goobta goobta ayaa si guul leh loo cusboonaysiiyay'
+            'success' => 'Feildset waa lagu guuleystay in la cusbooneysiiyo.'
         ),
 
         'delete' => array(
             'confirm'   	=> 'Ma hubtaa inaad rabto inaad tirtirto goobtan?',
-            'error'   => 'Waxaa jirtay arrin la tirtiray goobta. Fadlan isku day mar kale',
-            'success' => 'Goobta garoonka si guul leh ayaa loo tirtiray',
-            'in_use'   => 'Fieldset weli waa la isticmaalayaa',
+            'error'   => 'Waxaa jirtay arrin tir-tireysay feild-dhiga. Fadlan isku day mar kale.',
+            'success' => 'Fieldset waa lagu guuleystay in la tir-tiro.',
+            'in_use'   => 'Fieldset weli waa la isticmaalayaa.',
         )
 
     ),
 
     'fieldset_default_value' => array(
 
-        'error' => 'Khalad ansaxinta qiyamka godadka goobta caadiga ah',
+        'error' => 'Khalad ayaa kajira hubinta qiimaha feildset-ka.',
 
     ),
 
diff --git a/resources/lang/so-SO/admin/departments/message.php b/resources/lang/so-SO/admin/departments/message.php
index 13b948c750..fa42627664 100644
--- a/resources/lang/so-SO/admin/departments/message.php
+++ b/resources/lang/so-SO/admin/departments/message.php
@@ -11,12 +11,12 @@ return array(
     ),
     'update' => array(
         'error'   => 'Waaxda lama cusboonaysiin, fadlan isku day mar kale',
-        'success' => 'Waaxdu si guul leh ayaa loo cusboonaysiiyay'
+        'success' => 'Waaxda waa lagu guuleystay in la cusbooneysiiyo.'
     ),
     'delete' => array(
         'confirm'   	=> 'Ma hubtaa inaad rabto inaad tirtirto waaxdan?',
-        'error'   => 'Waxaa jirtay arrin la tirtiray waaxda. Fadlan isku day mar kale',
-        'success' => 'Waaxda si guul leh ayaa loo tirtiray'
+        'error'   => 'Waxaa jirtay arin tir-tireysay waaxda. Fadlan isku day mar kale.',
+        'success' => 'Waaxda waa lagu guuleystay in la tir-tiro.'
     )
 
 );
diff --git a/resources/lang/so-SO/admin/depreciations/general.php b/resources/lang/so-SO/admin/depreciations/general.php
index 47e76f5c96..f3e259cacf 100644
--- a/resources/lang/so-SO/admin/depreciations/general.php
+++ b/resources/lang/so-SO/admin/depreciations/general.php
@@ -11,4 +11,8 @@ return [
     'update'  					            => 'Cusbooneysii Qiima dhaca',
     'depreciation_min'                      => 'Qiimaha Ugu Yar Kadib Qiima Dhaca',
     'no_depreciations_warning'               => '<xooggan> Digniin: </strong> Hadda ma haysatid wax qiimo dhimis ah oo la dejiyay. Fadlan samee ugu yaraan hal qiimo dhimis si aad u aragto warbixinta qiimo dhimista.',
+    'depreciation_method'                   => 'Warbixinta Qiima dhaca',
+    'linear_depreciation'                   => 'Linear (Default)',
+    'half_1'                                => 'Half-year convention, always applied',
+    'half_2'                                => 'Half-year convention, applied with condition',
 ];
diff --git a/resources/lang/so-SO/admin/depreciations/message.php b/resources/lang/so-SO/admin/depreciations/message.php
index 07377b6a0a..fb8f788be6 100644
--- a/resources/lang/so-SO/admin/depreciations/message.php
+++ b/resources/lang/so-SO/admin/depreciations/message.php
@@ -13,13 +13,13 @@ return array(
 
     'update' => array(
         'error'   => 'Fasalka qiima dhaca lama cusboonaysiin, fadlan isku day mar kale',
-        'success' => 'Heerka qiima dhaca ayaa si guul leh loo cusboonaysiiyay'
+        'success' => 'Heerka isticmaalka si guul ah ayaa loo cusbooneysiiyay.'
     ),
 
     'delete' => array(
         'confirm'   => 'Ma hubtaa inaad rabto inaad tirtirto heerkan qiimo-dhaca?',
-        'error'   => 'Waxaa jirtay arrin lagu tirtirayo heerka qiima dhaca. Fadlan isku day mar kale',
-        'success' => 'Heerka qiima dhimista ayaa si guul leh loo tirtiray'
+        'error'   => 'Laguma guuleysan tir-tiritaanka. Fadlan ku celi markale.',
+        'success' => 'Qiimo dhimista heerka isticmaalka waa lagu guuleystay in la tir-tiro.'
     )
 
 );
diff --git a/resources/lang/so-SO/admin/depreciations/table.php b/resources/lang/so-SO/admin/depreciations/table.php
index ebf8b6b67d..e83e975bb6 100644
--- a/resources/lang/so-SO/admin/depreciations/table.php
+++ b/resources/lang/so-SO/admin/depreciations/table.php
@@ -5,7 +5,7 @@ return [
     'id'      => 'Aqoonsi',
     'months'   => 'Bilo',
     'term'   => 'Muddada',
-    'title'      => 'Magaca',
+    'title'      => 'Magaca ',
     'depreciation_min' => 'Qiimaha Dabaqa',
 
 ];
diff --git a/resources/lang/so-SO/admin/groups/message.php b/resources/lang/so-SO/admin/groups/message.php
index 22da067a71..6eb0001cbe 100644
--- a/resources/lang/so-SO/admin/groups/message.php
+++ b/resources/lang/so-SO/admin/groups/message.php
@@ -7,16 +7,16 @@ return array(
     'group_name_required' => 'Goobta magaca ayaa loo baahan yahay',
 
     'success' => array(
-        'create' => 'Kooxda si guul leh ayaa loo abuuray',
-        'update' => 'Kooxda si guul leh ayaa loo cusboonaysiiyay',
-        'delete' => 'Kooxda si guul leh ayaa loo tirtiray',
+        'create' => 'Kooxdani waa lagu guuleystay in la abuuro.',
+        'update' => 'Kooxdani waa lagu guuleystay in la abuuro.',
+        'delete' => 'Kooxdani waa lagu guuleystay in la abuuro.',
     ),
 
     'delete' => array(
         'confirm'   => 'Ma hubtaa inaad doonayso inaad tirtirto kooxdan?',
-        'create' => 'Waxaa jirtay arin abuurista kooxda. Fadlan isku day mar kale',
-        'update' => 'Waxaa jirtay arrin la cusboonaysiiyay kooxda. Fadlan isku day mar kale',
-        'delete' => 'Waxaa jirtay arrin la tirtiray kooxda. Fadlan isku day mar kale',
+        'create' => 'Cillad ayaa ka jirta abuuridda kooxdan. Fadlan kuceli markale.',
+        'update' => 'Cillad ayaa ka jirta abuuridda kooxdan. Fadlan isku day markale.',
+        'delete' => 'Cillad ayaa ka jirta abuuridda kooxdan. Fadlan isku day markale.',
     ),
 
 );
diff --git a/resources/lang/so-SO/admin/groups/titles.php b/resources/lang/so-SO/admin/groups/titles.php
index 4d90d14e1e..329cb9f15e 100644
--- a/resources/lang/so-SO/admin/groups/titles.php
+++ b/resources/lang/so-SO/admin/groups/titles.php
@@ -8,9 +8,9 @@ return [
     'update' 	 		        => 'Kooxda wax ka beddel',
     'group_name' 	 		=> 'Magaca Kooxda',
     'group_admin' 	 		=> 'Kooxda Maamulka',
-    'allow' 	 			=> 'Oggolow',
+    'allow' 	 			=> 'Ogolaansho',
     'deny' 	 				=> 'Inkira',
     'permission'            => 'Ogolaanshaha',
     'grant'                 => 'Deeq',
-    'no_permissions'        => 'Kooxdani wax ogolaansho ah ma lahan'
+    'no_permissions'        => 'Kooxdani wax ogolaansho ah ma heysato.'
 ];
diff --git a/resources/lang/so-SO/admin/hardware/form.php b/resources/lang/so-SO/admin/hardware/form.php
index 122e4ab52a..683ff9aa6c 100644
--- a/resources/lang/so-SO/admin/hardware/form.php
+++ b/resources/lang/so-SO/admin/hardware/form.php
@@ -55,8 +55,11 @@ return [
     'asset_location_update_default' => 'Cusbooneysii kaliya goobta caadiga ah',
     'asset_location_update_actual' => 'Cusbooneysii goobta dhabta ah oo kaliya',
     'asset_not_deployable' => 'Heerka hantidu maaha mid la diri karo Hantidan lama hubin karo.',
-    'asset_deployable' => 'Heerkaas waa la geyn karaa Hantidan waa la hubin karaa.',
+    'asset_not_deployable_checkin' => 'That asset status is not deployable. Using this status label will checkin the asset.',
+    'asset_deployable' => 'This asset can be checked out.',
     'processing_spinner' => 'Hagaajinta... (Tani waxa laga yaabaa inay wakhti yar ku qaadato faylalka waaweyn)',
+    'processing' => 'Processing... ',
     'optional_infos'  => 'Macluumaadka Ikhtiyaarka ah',
-    'order_details'   => 'Dalbo Macluumaadka La Xiriira'
+    'order_details'   => 'Dalbo Macluumaadka La Xiriira',
+    'calc_eol'    => 'If nulling the EOL date, use automatic EOL calculation based on the purchase date and EOL rate.',
 ];
diff --git a/resources/lang/so-SO/admin/hardware/general.php b/resources/lang/so-SO/admin/hardware/general.php
index 0682e12893..10e0c56264 100644
--- a/resources/lang/so-SO/admin/hardware/general.php
+++ b/resources/lang/so-SO/admin/hardware/general.php
@@ -5,8 +5,8 @@ return [
     'about_assets_text'            => 'Hantidu waa shay lagu raadraaco lambar taxane ah ama sumad hanti ah. Waxay u muuqdaan inay yihiin shay qiimo sare leh marka la aqoonsanayo shay gaar ah.',
     'archived'  				=> 'Kaydsan',
     'asset'  					=> 'Hantida',
-    'bulk_checkout'             => 'Hubinta Hantida',
-    'bulk_checkin'              => 'Hubi Hantida',
+    'bulk_checkout'             => 'Hubinta Buuxda',
+    'bulk_checkin'              => 'Bulk Checkin',
     'checkin'  					=> 'Hubi Hantida',
     'checkout'  				=> 'Hubi Hantida',
     'clone'  					=> 'Hantida Clone',
@@ -27,7 +27,7 @@ return [
     'undeployable_tooltip'  	=> 'Hantidani waxay leedahay calaamad xaaladeed oo aan la hawlgelin oo aan la hubin karin wakhtigan.',
     'view'  					=> 'Daawo Hantida',
     'csv_error' => 'Khalad baad ku leedahay faylkaaga CSV:',
-    'import_text' => 'Soo rar CSV oo ka kooban taariikhda hantida Hantida iyo isticmaalayaashu waa inay hore ugu jiraan nidaamka, ama waa laga boodi doonaa. Hantida ku habboon soo dejinta taariikhda waxay ku dhacdaa calaamadda hantida Waxaan isku dayi doonaa inaan helno isticmaale u dhigma iyadoo lagu salaynayo magaca isticmaalaha aad bixisay, iyo shuruudaha aad hoos ku doorato. Haddii aadan hoos dooran wax shuruud ah, waxay si fudud isku dayi doontaa inay ku habboonaato qaabka isticmaale ee aad ku habaysay <code>Admin &gt; Goobaha Guud</p><p>Meelaha ku jira CSV-ga waa in ay iswaafaqaan madaxyada: <strong>Hanti Tag, Magaca, Taariikhda hubinta, Taariikhda hubinta</strong>. Goob kasta oo dheeri ah waa la iska indhatiraa </p><p>Taariikhda jeegeynta: taariikhaha jeegeynta banaan ama mustaqbalka waxay hubin doontaa alaabta isticmaalaha. Marka laga reebo tiirka Taariikhda Jeegaynta waxay abuuri doontaa taariikh hubin leh taariikhda maanta.</p>    ',
+    'import_text' => '<p>Upload a CSV that contains asset history. The assets and users MUST already exist in the system, or they will be skipped. Matching assets for history import happens against the asset tag. We will try to find a matching user based on the user\'s name you provide, and the criteria you select below. If you do not select any criteria below, it will simply try to match on the username format you configured in the <code>Admin &gt; General Settings</code>.</p><p>Fields included in the CSV must match the headers: <strong>Asset Tag, Name, Checkout Date, Checkin Date</strong>. Any additional fields will be ignored. </p><p>Checkin Date: blank or future checkin dates will checkout items to associated user.  Excluding the Checkin Date column will create a checkin date with todays date.</p>    ',
     'csv_import_match_f-l' => 'Isku day inaad isticmaalayaasha ku wajahdo qaabka<strong>firstname.name</strong>(<code>jane.smith</code>)',
     'csv_import_match_initial_last' => 'Isku day inaad isticmaalayaasha ku wajahdo qaabka<strong>firstname. name</strong>(<code>jane. smith</code>)',
     'csv_import_match_first' => 'Isku day inaad isticmaalayaasha ku wajahdo qaabka <strong>firstname. name</strong>(<code>jane. smith</code>) format',
diff --git a/resources/lang/so-SO/admin/hardware/message.php b/resources/lang/so-SO/admin/hardware/message.php
index 144bdad52d..db1769ddc2 100644
--- a/resources/lang/so-SO/admin/hardware/message.php
+++ b/resources/lang/so-SO/admin/hardware/message.php
@@ -2,19 +2,23 @@
 
 return [
 
-    'undeployable' 		=> '<strong>Digniin: </strong> Hantidan waxaa loo calaamadeeyay mid aan hadda la daabul karin.
-                        Haddii heerkan uu isbedelay, fadlan cusboonaysii heerka hantida.',
-    'does_not_exist' 	=> 'Hantidu ma jirto.',
-    'does_not_exist_var'=> 'Asset with tag :asset_tag not found.',
-    'no_tag' 	        => 'No asset tag provided.',
+    'undeployable' 		 => '<strong>Warning: </strong> This asset has been marked as currently undeployable. If this status has changed, please update the asset status.',
+    'does_not_exist' 	 => 'Hantidu ma jirto.',
+    'does_not_exist_var' => 'Asset with tag :asset_tag not found.',
+    'no_tag' 	         => 'No asset tag provided.',
     'does_not_exist_or_not_requestable' => 'Hantidaas ma jirto ama lama codsan karo.',
-    'assoc_users'	 	=> 'Hantidan hadda waa la hubiyay isticmaale lamana tirtiri karo Fadlan marka hore hubi hantida, ka dibna isku day mar kale in aad tirtirto. ',
+    'assoc_users'	 	 => 'Hantidan hadda waa la hubiyay isticmaale lamana tirtiri karo Fadlan marka hore hubi hantida, ka dibna isku day mar kale in aad tirtirto. ',
     'warning_audit_date_mismatch' 	=> 'This asset\'s next audit date (:next_audit_date) is before the last audit date (:last_audit_date). Please update the next audit date.',
+    'labels_generated'   => 'Labels were successfully generated.',
+    'error_generating_labels' => 'Error while generating labels.',
+    'no_assets_selected' => 'No assets selected.',
 
     'create' => [
         'error'   		=> 'Hantida lama abuurin, fadlan isku day mar kale. :(',
         'success' 		=> 'Hantida loo sameeyay si guul leh :)',
         'success_linked' => 'Hanti leh sumad :tag si guul leh ayaa loo abuuray. <strong><a href=":link" style="color: white;">Riix halkan si aad u aragto</a></strong>.',
+        'multi_success_linked' => 'Asset with tag :links was created successfully.|:count assets were created succesfully. :links.',
+        'partial_failure' => 'An asset was unable to be created. Reason: :failures|:count assets were unable to be created. Reasons: :failures',
     ],
 
     'update' => [
@@ -52,20 +56,24 @@ return [
     ],
 
     'import' => [
+        'import_button'         => 'Process Import',
         'error'                 => 'Alaabta qaar si sax ah uma soo dejin.',
         'errorDetail'           => 'Alaabta soo socota looma soo dejin khaladaad dartood.',
         'success'               => 'Faylkaaga waa la soo dejiyay',
         'file_delete_success'   => 'Faylkaaga si guul leh ayaa loo tirtiray',
         'file_delete_error'      => 'Faylka waa la tirtiri waayay',
         'file_missing' => 'Faylka la doortay waa maqan yahay',
+        'file_already_deleted' => 'The file selected was already deleted',
         'header_row_has_malformed_characters' => 'Hal ama in ka badan oo sifooyin ah oo ku jira safka madaxa waxa ku jira xarfaha UTF-8 oo khaldan',
         'content_row_has_malformed_characters' => 'Hal ama in ka badan oo sifooyin ah safka koowaad ee nuxurka waxa ku jira xarfo UTF-8 oo khaldan',
+        'transliterate_failure' => 'Transliteration from :encoding to UTF-8 failed due to invalid characters in input'
     ],
 
 
     'delete' => [
         'confirm'   	=> 'Ma hubtaa inaad rabto inaad tirtirto hantidan?',
         'error'   		=> 'Waxaa jirtay arrin la tirtiray hantida Fadlan isku day mar kale.',
+        'assigned_to_error' => '{1}Asset Tag: :asset_tag is currently checked out. Check in this device before deletion.|[2,*]Asset Tags: :asset_tag are currently checked out. Check in these devices before deletion.',
         'nothing_updated'   => 'Wax hanti ah lama dooran, markaa waxba lama tirtirin.',
         'success' 		=> 'Hantida si guul leh ayaa loo tirtiray.',
     ],
@@ -78,6 +86,11 @@ return [
         'no_assets_selected' => 'Waa inaad liiska ka doorataa ugu yaraan hal hanti',
     ],
 
+    'multi-checkout' => [
+        'error'   => 'Asset was not checked out, please try again|Assets were not checked out, please try again',
+        'success' => 'Asset checked out successfully.|Assets checked out successfully.',
+    ],
+
     'checkin' => [
         'error'   		=> 'Hantida lama hubin, fadlan isku day mar kale',
         'success' 		=> 'Hantida si guul leh ayaa loo hubiyay.',
@@ -87,9 +100,10 @@ return [
     ],
 
     'requests' => [
-        'error'   		=> 'Hantida lama codsan, fadlan isku day mar kale',
-        'success' 		=> 'Hantida ayaa si guul leh u codsatay.',
-        'canceled'      => 'Codsiga hubinta si guul leh waa la joojiyay',
+        'error'   		=> 'Request was not successful, please try again.',
+        'success' 		=> 'Request successfully submitted.',
+        'canceled'      => 'Request successfully canceled.',
+        'cancel'        => 'Jooji codsiga shaygan',
     ],
 
 ];
diff --git a/resources/lang/so-SO/admin/hardware/table.php b/resources/lang/so-SO/admin/hardware/table.php
index 5311631d97..84154c9f3c 100644
--- a/resources/lang/so-SO/admin/hardware/table.php
+++ b/resources/lang/so-SO/admin/hardware/table.php
@@ -25,7 +25,6 @@ return [
     'image'		    => 'Sawirka Qalabka',
     'days_without_acceptance' => 'Maalmo Aqbali La\'aan',
     'monthly_depreciation' => 'Qiima dhaca bishii',
-    'assigned_to'    => 'Loo xilsaaray',
     'requesting_user' => 'Codsada Isticmaalaha',
     'requested_date' => 'Taariikhda la codsaday',
     'changed'       => 'Bedelay',
diff --git a/resources/lang/so-SO/admin/kits/general.php b/resources/lang/so-SO/admin/kits/general.php
index f2f5e7c933..57495f09a4 100644
--- a/resources/lang/so-SO/admin/kits/general.php
+++ b/resources/lang/so-SO/admin/kits/general.php
@@ -4,11 +4,11 @@ return [
     'about_kits_title'                  => 'Ku saabsan Xirmooyinka Horay loo Qeexay',
     'about_kits_text'                   => 'Xirmooyinka Horay loo Qeexay ayaa kuu oggolaanaya inaad si dhakhso leh u hubiso ururinta alaabta (hanti, shatiyada, iwm) ee isticmaalaha. Tani waxay noqon kartaa mid waxtar leh marka habka fuuliddu uu yahay mid joogto ah isticmaalayaasha badan oo dhammaan isticmaalayaasha ay helaan shay isku mid ah.',
     'checkout'                          => 'Qalabka hubinta ',
-    'create_success'                    => 'Qalabka si guul leh ayaa loo sameeyay',
+    'create_success'                    => 'Waa lagu guuleystay in la abuuro kooxda.',
     'create'                            => 'Samee xirmo horay loo sii qeexay',
     'update'                            => 'Cusbooneysii Kit Horay u Qeexay',
-    'delete_success'                    => 'Qalabka si guul leh ayaa loo tirtiray',
-    'update_success'                    => 'Qalabka si guul leh ayaa loo cusboonaysiiyay',
+    'delete_success'                    => 'Waa lagu guuleystay in la tir-tiro kooxda.',
+    'update_success'                    => 'Waa lagu guuleystay kooxda in la cusbooneysiiyo.',
     'none_models'                       => 'Ma jiraan hanti ku filan oo la heli karo :model si loo hubiyo :qty ayaa loo baahan yahay ',
     'none_licenses'                     => 'Ma jiraan kuraas ku filan oo la heli karo :license si loo hubiyo. :qty ayaa loo baahan yahay ',
     'none_consumables'                  => 'Ma jiraan unugyo :consumable ku filan oo la heli karo si loo hubiyo. :qty ayaa loo baahan yahay ',
@@ -21,30 +21,31 @@ return [
     'update_appended_license'           => 'Cusbooneysii shatiga lifaaqan',
     'append_model'                      => 'Qaabka ku lifaaq',
     'update_appended_model'             => 'Cusbooneysii qaabka ku lifaaqan',
-    'license_error'                     => 'Ruqsadda hore loogu xidhay xirmada',
-    'license_added_success'             => 'Shatiga si guul leh loogu daray',
+    'license_error'                     => 'Ruqsadda horey ayaa loogu xiray xirmada',
+    'license_added_success'             => 'Shatiga si guul leh ayaa loogu daray',
     'license_updated'                   => 'Shatiga si guul leh ayaa loo cusboonaysiiyay',
     'license_none'                      => 'Shatiga ma jiro',
-    'license_detached'                  => 'Shatiga si guul leh ayaa loo jaray',
-    'consumable_added_success'          => 'Isticmaalka ayaa si guul leh loogu daray',
-    'consumable_updated'                => 'Isticmaalka si guul leh ayaa loo cusboonaysiiyay',
-    'consumable_error'                  => 'Isticmaalka horeba ugu xidhan xirmada',
+    'license_detached'                  => 'Shatiga waa lagu gulueystay in la jaro',
+    'consumable_added_success'          => 'Badeecadda waa lagu guuleystay in lagu soo daro',
+    'consumable_updated'                => 'Badeecaddu waa lagu guuleystay in la cusbooneysiiyo',
+    'consumable_error'                  => 'Badeecaddu waxay la socotaa kooxda',
     'consumable_deleted'                => 'Tirtiridda waa lagu guulaystay',
-    'consumable_none'                   => 'Wax la isticmaali karo ma jiro',
-    'consumable_detached'               => 'Isticmaalka ayaa si guul leh u go\'ay',
-    'accessory_added_success'           => 'Qalabka lagu daray si guul leh',
-    'accessory_updated'                 => 'Qalabka si guul leh ayaa loo cusboonaysiiyay',
-    'accessory_detached'                => 'Qalabka si guul leh ayaa loo go\'ay',
-    'accessory_error'                   => 'Agabka horeba loogu xidhay xirmada',
+    'consumable_none'                   => 'Badeecadda maahan mid jirta',
+    'consumable_detached'               => 'Waa lagu guuleysatay in badeecadda la isticmaalay laga jaro',
+    'accessory_added_success'           => 'Mulxaqa lasoo raaciyay waa lagu guuleystay in lagu daro',
+    'accessory_updated'                 => 'Mulxaqa lasoo raaciyay waa lagu guuleystay in la cusbooneysiiyo',
+    'accessory_detached'                => 'Mulxaqa lasoo raaciyay waa lagu guuleystay in laga gooyo',
+    'accessory_error'                   => 'Mulxaqu wax uu ku jiraa kooxda',
     'accessory_deleted'                 => 'Tirtiridda waa lagu guulaystay',
-    'accessory_none'                    => 'The accessory does not exist',
-    'checkout_success'                  => 'Jeedintu waa lagu guulaystay',
-    'checkout_error'                    => 'Khaladka hubinta',
-    'kit_none'                          => 'Kitaabku ma jiro',
-    'kit_created'                       => 'Qalabka si guul leh ayaa loo sameeyay',
-    'kit_updated'                       => 'Qalabka si guul leh ayaa loo cusboonaysiiyay',
-    'kit_not_found'                     => 'Qalabka lama helin',
-    'kit_deleted'                       => 'Qalabka si guul leh ayaa loo tirtiray',
-    'kit_model_updated'                 => 'Qaabka si guul leh ayaa loo cusboonaysiiyay',
-    'kit_model_detached'                => 'Qaabka ayaa si guul leh u go\'ay',
+    'accessory_none'                    => 'Mulxaqa lasoo raaciyay maahan mid jira',
+    'checkout_success'                  => 'Hubinta waa lagu guuleystay',
+    'checkout_error'                    => 'Hubinta khalad ayaa kajira',
+    'kit_none'                          => 'Kooxdu ma ahan mid jirta',
+    'kit_created'                       => 'Kooxda waa lagu guuleystay in la sameeyo',
+    'kit_updated'                       => 'Kooxda waa lagu guuleystay in la cusbooneysiiyo',
+    'kit_not_found'                     => 'Kooxda lama helin',
+    'kit_deleted'                       => 'Kooxda waa lagu guuleystay in la kala jaro',
+    'kit_model_updated'                 => 'Tusaalaha waa lagu guuleystay in la cusbooneysiiyo',
+    'kit_model_detached'                => 'Tusaalaha waa lagu guuleystay in la kala saaro',
+    'model_already_attached'            => 'Model already attached to kit',
 ];
diff --git a/resources/lang/so-SO/admin/labels/message.php b/resources/lang/so-SO/admin/labels/message.php
index 82b9784385..c0fe9c7536 100644
--- a/resources/lang/so-SO/admin/labels/message.php
+++ b/resources/lang/so-SO/admin/labels/message.php
@@ -2,9 +2,9 @@
 
 return [
 
-    'invalid_return_count' => 'Tiro aan sax ahayn ayaa laga soo celiyay :name. la filayo :expected, helay :actual.',
-    'invalid_return_type'  => 'Nooca aan sax ahayn ayaa laga soo celiyay :name. la filayo :expected, helay :actual.',
-    'invalid_return_value' => 'Qiimo aan sax ahayn ayaa laga soo celiyay :name. la filayo :expected, helay :actual.',
+    'invalid_return_count' => 'Tiro aan sax ahayn ayaa laga soo celiyay :magaca. la filayay :expected, filasho :actual.',
+    'invalid_return_type'  => 'Nooca aan sax ahayn ayaa laga soo celiyay :magaca. la filayay :fiilasho, helay :dhabta.',
+    'invalid_return_value' => 'Qiimo aan sax ahayn ayaa laga soo celiyay :magaca. la filayay :filasho, helay :dhabta.',
 
     'does_not_exist' => 'Calaamaduhu ma jiraan',
     
diff --git a/resources/lang/so-SO/admin/labels/table.php b/resources/lang/so-SO/admin/labels/table.php
index 310c6f6076..6505d060d6 100644
--- a/resources/lang/so-SO/admin/labels/table.php
+++ b/resources/lang/so-SO/admin/labels/table.php
@@ -1,19 +1,19 @@
 <?php
 
 return [
-    'example_company'    => 'Test Company Limited',
-    'example_defaultloc' => 'Building 1',
-    'example_category'   => 'Test Category',
-    'example_location'   => 'Building 2',
-    'example_manufacturer'  => 'Test Manufacturing Inc.',
-    'example_model'      => 'Test Model',
-    'example_supplier'   => 'Test Company Limited',
+    'example_company'    => 'Shirkadda tijaabada xadidan',
+    'example_defaultloc' => 'Dhismaha 1',
+    'example_category'   => 'Tijaabada daaqad',
+    'example_location'   => 'Dhismaha 2',
+    'example_manufacturer'  => 'Shirkadda tijaabooyinka sameysa.',
+    'example_model'      => 'Tijaabada nooca',
+    'example_supplier'   => 'Tijaabada ugu hooseysa ee shirkadda',
     'labels_per_page'    => 'Calaamadaha',
-    'support_fields'     => 'Beeraha',
-    'support_asset_tag'  => 'Tag',
+    'support_fields'     => 'Fields',
+    'support_asset_tag'  => 'Calaamad',
     'support_1d_barcode' => '1D',
     'support_2d_barcode' => '2D',
-    'support_logo'       => 'Logo',
+    'support_logo'       => 'Astaan',
     'support_title'      => 'Ciwaanka',
 
 ];
\ No newline at end of file
diff --git a/resources/lang/so-SO/admin/licenses/form.php b/resources/lang/so-SO/admin/licenses/form.php
index 6a12b96763..8f1f4fffd2 100644
--- a/resources/lang/so-SO/admin/licenses/form.php
+++ b/resources/lang/so-SO/admin/licenses/form.php
@@ -4,7 +4,7 @@ return array(
 
     'asset'             => 'Hantida',
     'checkin'           => 'Is xaadiri',
-    'create'            => 'Samee shatiga',
+    'create'            => 'Abuur shatiga',
     'expiration'        => 'Taariikhda uu dhacayo',
     'license_key'       => 'Furaha Alaabta',
     'maintained'        => 'La ilaaliyo',
diff --git a/resources/lang/so-SO/admin/licenses/general.php b/resources/lang/so-SO/admin/licenses/general.php
index 4d45176581..b3f71166a9 100644
--- a/resources/lang/so-SO/admin/licenses/general.php
+++ b/resources/lang/so-SO/admin/licenses/general.php
@@ -9,11 +9,12 @@ return array(
     'edit'  					=> 'Wax ka beddel shatiga',
     'filetype_info'				=> 'Noocyada faylalka la oggol yahay waa png, gif, jpg, jpeg, doc, docx, pdf, txt, zip, iyo rar.',
     'clone'  					=> 'Shatiga Clone',
-    'history_for'  				=> 'Taariikhda',
+    'history_for'  				=> 'Taariikhda ',
     'in_out'  					=> 'Gudaha/kabaxsan',
     'info'  					=> 'Macluumaadka shatiga',
     'license_seats'  			=> 'Kuraasta shatiga',
     'seat'  					=> 'Kursiga',
+    'seat_count'  				=> 'Seat :count',
     'seats'  					=> 'Kuraasta',
     'software_licenses'  		=> 'Shatiyada Software',
     'user'  					=> 'Isticmaale',
@@ -23,12 +24,12 @@ return array(
         [
             'checkin_all'           => [
                 'button'            => 'Hubi Dhammaan Kuraasta',
-                'modal'             => 'Tani waxay tallaabo ku hubin doontaa hal kursi. | Tallaabadani waxay hubin doontaa dhammaan :checkedout_seats_count kuraasida shatigan.',
+                'modal'             => 'This action will checkin one seat. | This action will checkin all :checkedout_seats_count seats for this license.',
                 'enabled_tooltip'   => 'Hubi dhammaan kuraasta shatigan isticmaalayaasha iyo hantida labadaba',
                 'disabled_tooltip'  => 'Tani waa naafo sababtoo ah ma jiraan kuraas hadda la hubiyay',
                 'disabled_tooltip_reassignable'  => 'Tani waa naafo sababtoo ah shatiga dib looma wareejin karo',
                 'success'           => 'Shatiga si guul leh ayaa loo hubiyay! | Dhammaan shatiyada si guul leh ayaa loo hubiyay!',
-                'log_msg'           => 'Lagu hubiyay hubinta shatiga bulk ee shatiga GUI',
+                'log_msg'           => 'Checked in via bulk license checkin in license GUI',
             ],
 
             'checkout_all'              => [
@@ -46,6 +47,6 @@ return array(
             ],
     ],
 
-    'below_threshold' => 'There are only :remaining_count seats left for this license with a minimum quantity of :min_amt. You may want to consider purchasing more seats.',
-    'below_threshold_short' => 'This item is below the minimum required quantity.',
+    'below_threshold' => 'Kama banaana kuraastan waxaan ka ahayn :remaining_count waxaa dhici karta inaad ku fakareyso iibashada boosas kale.',
+    'below_threshold_short' => 'Cunsurkan wuu ka yaryahay xadkii ugu hooseysay ee la rabay.',
 );
diff --git a/resources/lang/so-SO/admin/licenses/message.php b/resources/lang/so-SO/admin/licenses/message.php
index 18697e8ae5..f07a883856 100644
--- a/resources/lang/so-SO/admin/licenses/message.php
+++ b/resources/lang/so-SO/admin/licenses/message.php
@@ -9,7 +9,7 @@ return array(
     'assoc_users'	 => 'Shatigan hadda waa la hubiyay isticmaale lamana tirtiri karo. Fadlan marka hore iska hubi shatiga, ka dibna isku day mar kale in aad tirtirto. ',
     'select_asset_or_person' => 'Waa inaad doorataa hanti ama isticmaale, laakiin labadaba maaha.',
     'not_found' => 'Shatiga lama helin',
-    'seats_available' => ':seat_count seats available',
+    'seats_available' => ':seat_tirada kuraasta la heli karo',
 
 
     'create' => array(
@@ -18,12 +18,12 @@ return array(
     ),
 
     'deletefile' => array(
-        'error'   => 'Faylka lama tirtirin Fadlan isku day mar kale',
-        'success' => 'Faylka si guul leh waa la tirtiray',
+        'error'   => 'Faylka lama tirtirin. Fadlan isku day mar kale.',
+        'success' => 'Faylka waa lagu guuleystay in la tirtiro.',
     ),
 
     'upload' => array(
-        'error'   => 'Faylka lama soo rarin Fadlan isku day mar kale',
+        'error'   => 'Faylka lama rafcin. Fadlan iskuday markale.',
         'success' => 'Faylka(yada) si guul leh loo soo raray.',
         'nofiles' => 'Ma aadan dooran wax fayl ah oo la soo geliyo, ama faylka aad isku dayeyso inaad geliyaan waa mid aad u weyn',
         'invalidfiles' => 'Mid ama in ka badan oo ka mid ah faylalkaagu aad bay u weyn yihiin ama waa nooc faylal ah oo aan la oggolayn. Noocyada faylalka la oggol yahay waa png, gif, jpg, jpeg, doc, docx, pdf, txt, zip, rar, rtf, xml, iyo lic.',
@@ -31,23 +31,26 @@ return array(
 
     'update' => array(
         'error'   => 'Shatiga lama cusboonaysiin, fadlan isku day mar kale',
-        'success' => 'Shatiga si guul leh ayaa loo cusboonaysiiyay'
+        'success' => 'Shatiga si guul leh ayaa loo cusboonaysiiyay.'
     ),
 
     'delete' => array(
         'confirm'   => 'Ma hubtaa inaad rabto inaad tirtirto shatigan?',
-        'error'   => 'Waxaa jirtay arrin la tirtiray shatiga Fadlan isku day mar kale',
-        'success' => 'Shatiga si guul leh ayaa loo tirtiray'
+        'error'   => 'Waxaa jirtay arrin la tirtireysa shatiga. Fadlan isku day mar kale.',
+        'success' => 'Shatiga si guul leh ayaa loo tirtiray.'
     ),
 
     'checkout' => array(
-        'error'   => 'Waxaa jirtay arrin lagu hubinayo shatiga. Fadlan isku day mar kale',
+        'error'   => 'Cillad ayaa dhacday intii la hubinayay shatiga. Fadlan isku day markale.',
         'success' => 'Shatiga si guul leh ayaa loo hubiyay',
-        'not_enough_seats' => 'Not enough license seats available for checkout',
+        'not_enough_seats' => 'Lama hayo shatiyo ku filan wax bixinta',
+        'mismatch' => 'The license seat provided does not match the license',
+        'unavailable' => 'This seat is not available for checkout.',
     ),
 
     'checkin' => array(
-        'error'   => 'Waxaa jirtay arrin hubinta shatiga. Fadlan isku day mar kale',
+        'error'   => 'Cillad ayaa dhacday intii la hubinayay shatiga. Fadlan kuceli markale.',
+        'not_reassignable' => 'License not reassignable',
         'success' => 'Shatiga si guul leh ayaa loo hubiyay'
     ),
 
diff --git a/resources/lang/so-SO/admin/licenses/table.php b/resources/lang/so-SO/admin/licenses/table.php
index 00518f66d8..50fa1a71f7 100644
--- a/resources/lang/so-SO/admin/licenses/table.php
+++ b/resources/lang/so-SO/admin/licenses/table.php
@@ -11,7 +11,7 @@ return array(
     'purchase_date'   	=> 'Taariikhda Iibka',
     'purchased'   		=> 'Iibsaday',
     'seats'   			=> 'Kuraasta',
-    'hardware'   		=> 'Hardware',
+    'hardware'   		=> 'Qalab',
     'serial'   			=> 'Taxane',
     'title'      		=> 'Shatiga',
 
diff --git a/resources/lang/so-SO/admin/locations/message.php b/resources/lang/so-SO/admin/locations/message.php
index f9676f1f3e..4913b0c7ec 100644
--- a/resources/lang/so-SO/admin/locations/message.php
+++ b/resources/lang/so-SO/admin/locations/message.php
@@ -3,26 +3,32 @@
 return array(
 
     'does_not_exist' => 'Goobtu ma jirto.',
-    'assoc_users'    => 'This location is not currently deletable because it is the location of record for at least one asset or user, has assets assigned to it, or is the parent location of another location. Please update your models to no longer reference this company and try again. ',
-    'assoc_assets'	 => 'Goobtan hadda waxa lala xidhiidhiyaa ugu yaraan hal hanti lamana tirtiri karo. Fadlan cusboonaysii hantidaada si aanay meeshan u tixraacin oo mar kale isku day. ',
-    'assoc_child_loc'	 => 'Goobtan hadda waa waalidka ugu yaraan hal meel oo caruur ah lamana tirtiri karo. Fadlan cusboonaysii goobahaaga si aanay mar dambe tixraac goobtan oo isku day mar kale. ',
-    'assigned_assets' => 'Hantida loo qoondeeyay',
-    'current_location' => 'Goobta Hadda',
+    'assoc_users'    => 'This location is not currently deletable because it is the location of record for at least one asset or user, has assets assigned to it, or is the parent location of another location. Please update your records to no longer reference this location and try again ',
+    'assoc_assets'	 => 'Goobtan waxaa hadda ku xiran hal isticmaale suurogalna maahan in latiro. Fadlan cusboonaysii hantidaada si aanay meeshan u tixraacin mar kalena isku day. ',
+    'assoc_child_loc'	 => 'Goobtan waxay xarun rasmi ah u tahay farac kale ugu yaraan suuragalna maahan in la tir-tiro. Fadlan cusbooneysii goobtaada si aaney markale usoo tilmaamin mowqican iskuna day markale. ',
+    'assigned_assets' => 'Hantida la qoondeeyay',
+    'current_location' => 'Goobta xilligan',
+    'open_map' => 'Open in :map_provider_icon Maps',
 
 
     'create' => array(
         'error'   => 'Goobta lama abuurin, fadlan isku day mar kale.',
-        'success' => 'Goobta si guul leh ayaa loo sameeyay.'
+        'success' => 'Goobta waa lagu guuleystay in la sameeyo.'
     ),
 
     'update' => array(
         'error'   => 'Goobta lama cusboonaysiin, fadlan isku day mar kale',
-        'success' => 'Goobta si guul leh ayaa loo cusboonaysiiyay.'
+        'success' => 'Goobta waa lagu guuleystay in la cusbooneysiiyo.'
+    ),
+
+    'restore' => array(
+        'error'   => 'Location was not restored, please try again',
+        'success' => 'Location restored successfully.'
     ),
 
     'delete' => array(
         'confirm'   	=> 'Ma hubtaa inaad rabto inaad tirtirto goobtan?',
-        'error'   => 'Waxaa jirtay arrin meesha laga saarayo. Fadlan isku day mar kale.',
+        'error'   => 'Waxaa jirtay arrin meesha ka saareysa goobtan. Fadlan isku day mar kale.',
         'success' => 'Goobta si guul leh ayaa loo tirtiray.'
     )
 
diff --git a/resources/lang/so-SO/admin/locations/table.php b/resources/lang/so-SO/admin/locations/table.php
index 0942c3e77d..06d7a2f0e0 100644
--- a/resources/lang/so-SO/admin/locations/table.php
+++ b/resources/lang/so-SO/admin/locations/table.php
@@ -4,15 +4,15 @@ return [
     'about_locations_title'     => 'Ku saabsan Goobaha',
     'about_locations'           => 'Goobaha waxaa loo isticmaalaa si loola socdo macluumaadka goobta isticmaalayaasha, hantida, iyo walxaha kale',
     'assets_rtd'                => 'Hantida', // This has NEVER meant Assets Retired. I don't know how it keeps getting reverted.
-    'assets_checkedout'         => 'Hantida loo qoondeeyay',
+    'assets_checkedout'         => 'Hantida la qoondeeyay',
     'id'                        => 'Aqoonsi',
     'city'                      => 'Magaalada',
     'state'                     => 'Gobolka',
     'country'                   => 'Dalka',
     'create'                    => 'Samee Goobta',
     'update'                    => 'Cusbooneysii Goobta',
-    'print_assigned'            => 'Daabacaadda loo qoondeeyay',
-    'print_all_assigned'        => 'Daabac Dhammaan Ku-meel-gaadhka ah',
+    'print_assigned'            => 'Daabacaadda la qoondeeyay',
+    'print_all_assigned'        => 'Daabac Dhammaan kuwa la qoondeeyay',
     'name'                      => 'Magaca Goobta',
     'address'                   => 'Cinwaanka',
     'address2'                   => 'Khadka Ciwaanka 2',
@@ -20,11 +20,11 @@ return [
     'locations'                 => 'Goobaha',
     'parent'                    => 'Waalid',
     'currency'                  => 'Lacagta Goobta',
-    'ldap_ou'                   => 'Raadi LDAP',
+    'ldap_ou'                   => 'LDAP raadinaya OU',
     'user_name'                 => 'Magaca isticmaalaha',
     'department'                => 'Waaxda',
     'location'                  => 'Goobta',
-    'asset_tag'                 => 'Hantida Tag',
+    'asset_tag'                 => 'Hantida calaamadeysan',
     'asset_name'                => 'Magaca',
     'asset_category'            => 'Qaybta',
     'asset_manufacturer'        => 'Soo saaraha',
@@ -34,9 +34,10 @@ return [
     'asset_checked_out'         => 'La Hubiyay',
     'asset_expected_checkin'    => 'Hubinta la filayo',
     'date'                      => 'Taariikhda:',
-    'phone'                     => 'Magaca Goobta',
-    'signed_by_asset_auditor'   => 'Waxa saxeexay (Hantidhawraha Hantida):',
-    'signed_by_finance_auditor' => 'Waxa saxeexay (Hantidhawraha Maaliyadda):',
-    'signed_by_location_manager' => 'Waxa saxeexay (Maamulaha Goobta):',
+    'phone'                     => 'Teleefanka goobta',
+    'signed_by_asset_auditor'   => 'Waxaa saxiixay (Hantidhawraha guud):',
+    'signed_by_finance_auditor' => 'Waxaa saxiixay (Hantidhawraha Maaliyadda):',
+    'signed_by_location_manager' => 'Waxaa saxiixay (Maamulaha Goobta):',
     'signed_by'                 => 'Saxiixay:',
+    'clone'  					=> 'Clone Location',
 ];
diff --git a/resources/lang/so-SO/admin/manufacturers/message.php b/resources/lang/so-SO/admin/manufacturers/message.php
index 44e42e1cca..cb8f47306f 100644
--- a/resources/lang/so-SO/admin/manufacturers/message.php
+++ b/resources/lang/so-SO/admin/manufacturers/message.php
@@ -8,23 +8,23 @@ return array(
 
     'create' => array(
         'error'   => 'Soo saaraha lama abuurin, fadlan isku day mar kale.',
-        'success' => 'Soo saaraha ayaa si guul leh u abuuray'
+        'success' => 'Soo saaraha ayaa ku guuleystay inuu abuuro.'
     ),
 
     'update' => array(
         'error'   => 'Soo saaraha lama cusboonaysiin, fadlan isku day mar kale',
-        'success' => 'Soo saaraha si guul leh ayaa loo cusboonaysiiyay'
+        'success' => 'Soo saaraha ayaa ku guuleystay inuu cusbooneysiiyo.'
     ),
 
     'restore' => array(
         'error'   => 'Soo saaraha lama soo celin, fadlan isku day mar kale',
-        'success' => 'Soo saaraha si guul leh ayaa loo soo celiyay'
+        'success' => 'Soo saaraha ayaa ku guuleystay inuu dib usoo celiyio.'
     ),
 
     'delete' => array(
         'confirm'   => 'Ma hubtaa inaad rabto inaad tirtirto soo saarahan?',
-        'error'   => 'Waxaa jirtay arrin la tirtiray soo saaraha. Fadlan isku day mar kale',
-        'success' => 'Soo saaraha si guul leh ayaa loo tirtiray'
+        'error'   => 'Cillad ayaa kajirta tir-tiradda soo saaraha. Fadlan iskuday markale.',
+        'success' => 'Soo saaraha si guul leh ayaa loo tirtiray.'
     )
 
 );
diff --git a/resources/lang/so-SO/admin/models/general.php b/resources/lang/so-SO/admin/models/general.php
index d214e5c6ec..463f4e6137 100644
--- a/resources/lang/so-SO/admin/models/general.php
+++ b/resources/lang/so-SO/admin/models/general.php
@@ -3,7 +3,7 @@
 return array(
     'about_models_title'     => 'Ku saabsan Qaababka Hantida',
     'about_models_text'           => 'Moodooyinka Hantidu waa hab lagu kooxeeyo hantida isku midka ah. "MBP 2013", "IPhone 6s", iwm.',
-    'deleted'  					        => 'Qaabkan waa la tirtiray',
+    'deleted'  					=> 'Noocan waa la tir-tiray.',
     'bulk_delete'               => 'Tusaalooyinka Hantida Badan ee Tirtir',
     'bulk_delete_help'               => 'Isticmaal sanduuqyada hubinta ee hoose si aad u xaqiijiso tirtirka noocyada hantida ee la doortay. Noocyada hantida ee leh hantida la xidhiidha iyaga lama tirtiri karo ilaa hantida lala xidhiidhiyo qaab kale.',
     'bulk_delete_warn'          => 'Waxaad ku dhowdahay inaad tirtirto hal nooc oo hanti ah.|Waxaad qarka u saaran tahay inaad tirtirto :model_count noocyada hantida.',
diff --git a/resources/lang/so-SO/admin/models/message.php b/resources/lang/so-SO/admin/models/message.php
index ea835549f8..3eb8863192 100644
--- a/resources/lang/so-SO/admin/models/message.php
+++ b/resources/lang/so-SO/admin/models/message.php
@@ -2,17 +2,17 @@
 
 return array(
 
-    'deleted' => 'Qaabka hantida ee la tirtiray',
+    'deleted' => 'Waa la tiray qaabka hantida',
     'does_not_exist' => 'Qaabku ma jiro.',
     'no_association' => 'DIGNIIN! Qaabka hantida shaygan waa mid aan sax ahayn ama maqan!',
-    'no_association_fix' => 'Tani waxay wax u jebin doontaa siyaabo yaab leh oo naxdin leh. Wax ka beddel hantidan hadda si aad mooddo.',
-    'assoc_users'	 => 'Qaabkani waxa uu hadda la xidhiidha hal ama ka badan oo hanti ah lamana tirtiri karo. Fadlan tirtir hantida, ka dibna isku day in aad mar kale tirtirto. ',
-
+    'no_association_fix' => 'Tani waxay keeni doontaa in ashya\'du u jabaan si argagax badan oo la yaab leh. Wax ka bedel hantidan si aad Model uga dhigto.',
+    'assoc_users'	 => 'Noocani wuxuu ku xiranyahay hal ra\'samaal ama wax kabadan suurgalna maahan in latiro. Fadlan tirtir hantida iskuna day markale inaad tirtirto. ',
+    'invalid_category_type' => 'This category must be an asset category.',
 
     'create' => array(
         'error'   => 'Qaabka lama abuurin, fadlan isku day mar kale.',
         'success' => 'Qaabka si guul leh ayaa loo sameeyay.',
-        'duplicate_set' => 'Nashqada hantida leh magacaas, soo saaraha iyo nambarka moodeelka ayaa horay u jiray.',
+        'duplicate_set' => 'Nashqada hantida leh magacaas, soo saaraha iyo nambarka moodeelka ayaa horay u jirtay.',
     ),
 
     'update' => array(
@@ -22,7 +22,7 @@ return array(
 
     'delete' => array(
         'confirm'   => 'Ma hubtaa inaad rabto inaad tirtirto qaabkan hantida?',
-        'error'   => 'Waxaa jirtay arrin la tirtiray qaabka Fadlan isku day mar kale.',
+        'error'   => 'Waxaa jirtay arrin tir-tireysay qaabka. Fadlan isku day mar kale.',
         'success' => 'Qaabka si guul leh ayaa loo tirtiray.'
     ),
 
@@ -32,16 +32,16 @@ return array(
     ),
 
     'bulkedit' => array(
-        'error'   		=> 'Wax beero ah lama beddelin, markaa waxba lama cusboonaysiin.',
-        'success' 		=> 'Qaabka si guul leh ayaa loo cusboonaysiiyay |:model_count moodooyinka si guul leh ayaa loo cusboonaysiiyay.',
+        'error'   		=> 'Wax feilds ah lama beddelin, markaa waxba lama cusboonaysiin.',
+        'success' 		=> 'Qaabka si guul leh ayaa loo cusboonaysiiyay |:model_count moodaladana si guul leh ayaa loo cusboonaysiiyay.',
         'warn'          => 'Waxaad ku dhowdahay inaad cusboonaysiiso sifooyinka qaabkan soo socda:|Waxaad ku dhowdahay inaad wax ka beddesho sifooyinka soo socda: model_count models:',
 
     ),
 
     'bulkdelete' => array(
-        'error'   		    => 'Noocyo lama dooran, markaa waxba lama tirtirin.',
-        'success' 		    => 'Model waa la tirtiray!|:success_count moodooyinka waa la tirtiray!',
-        'success_partial' 	=> ':success_count moodeel(yaasha) waa la tirtiray, si kastaba ha ahaatee :fail_count waa la tirtiri waayay sababtoo ah wali waxay haystaan ​​hanti iyaga la xidhiidha.'
+        'error'   		    => 'Noocyo lama dooran, marka waxba lama tirtirin.',
+        'success' 		    => 'Model waa la tirtiray!|:success_count moodallada ah waa la tirtiray!',
+        'success_partial' 	=> ':success_count moodeel(yaasha) waa la tirtiray, si kastaba ha ahaatee :fail_count waa la tirtiri waayay sababtoo ah wali waxay haystaan ​​hanti iyaga la xriirta.'
     ),
 
 );
diff --git a/resources/lang/so-SO/admin/models/table.php b/resources/lang/so-SO/admin/models/table.php
index 79878e6ca0..2b431f5b81 100644
--- a/resources/lang/so-SO/admin/models/table.php
+++ b/resources/lang/so-SO/admin/models/table.php
@@ -10,7 +10,7 @@ return array(
     'numassets' 			=> 'Hantida',
     'title'					=> 'Qaababka Hantida',
     'update'				=> 'Cusbooneysii Qaabka Hantida',
-    'view'					=> 'Daawo Qaabka Hantida',
+    'view'					=> 'Soo bandhig Qaabka Hantida',
     'update'				=> 'Cusbooneysii Qaabka Hantida',
     'clone'				=> 'Qaabka Clone',
     'edit'				=> 'Wax ka beddel Model',
diff --git a/resources/lang/so-SO/admin/reports/general.php b/resources/lang/so-SO/admin/reports/general.php
index 1b2d83fc96..469a40de06 100644
--- a/resources/lang/so-SO/admin/reports/general.php
+++ b/resources/lang/so-SO/admin/reports/general.php
@@ -4,6 +4,7 @@ return [
     'info'   => 'Dooro xulashooyinka aad rabto warbixinta hantidaada.',
     'deleted_user' => 'Isticmaale la tirtiray',
     'send_reminder' => 'Soo dir xasuusin',
+    'cannot_send_reminder' => 'User has been deleted or does not have an email address so cannot receive a reminder',
     'reminder_sent' => 'Xusuusin la diray',
     'acceptance_deleted' => 'Codsiga aqbalaadda waa la tirtiray',
     'acceptance_request' => 'Codsiga aqbalida',
@@ -13,5 +14,10 @@ return [
         'user_state' => 'Gobolka Isticmaalaha',
         'user_country' => 'Dalka Isticmaalaha',
         'user_zip' => 'Isticmaalaha Zip'
-    ]
-];
\ No newline at end of file
+    ],
+    'open_saved_template' => 'Open Saved Template',
+    'save_template' =>  'Save Template',
+    'select_a_template' => 'Select a Template',
+    'template_name' => 'Template Name',
+    'update_template' => 'Update Template',
+];
diff --git a/resources/lang/so-SO/admin/reports/message.php b/resources/lang/so-SO/admin/reports/message.php
index 40e945e48d..2800bbdf0b 100644
--- a/resources/lang/so-SO/admin/reports/message.php
+++ b/resources/lang/so-SO/admin/reports/message.php
@@ -1,5 +1,16 @@
 <?php
 
-return array(
-    'error'   => 'Waa inaad doorataa ugu yaraan HAL doorasho.'
-);
+return [
+    'about_templates' => 'About Saved Templates',
+    'saving_templates_description' => 'Select your options, then enter the name of your template in the box above and click the \'Save Template\' button. Use the dropdown to select a previously saved template.',
+    'create'  => [
+        'success' => 'Template saved successfully',
+    ],
+    'update' => [
+        'success' => 'Template updated successfully',
+    ],
+    'delete' => [
+        'success' => 'Template deleted',
+        'no_delete_permission' => 'Template does not exist or you do not have permission to delete it.',
+    ],
+];
diff --git a/resources/lang/so-SO/admin/settings/general.php b/resources/lang/so-SO/admin/settings/general.php
index 579e7c1d1e..8422239d4b 100644
--- a/resources/lang/so-SO/admin/settings/general.php
+++ b/resources/lang/so-SO/admin/settings/general.php
@@ -8,13 +8,13 @@ return [
     'ad_append_domain'          => 'Ku dheji magaca domainka goobta isticmaalaha',
     'ad_append_domain_help'     => 'Isticmaalaha loogama baahna inuu qoro "username@domain.local", kaliya waxay qori karaan "username".',
     'admin_cc_email'            => 'CC iimaylka',
-    'admin_cc_email_help'       => 'Haddii aad jeclaan lahayd inaad u dirto nuqul ka mid ah iimaylada hubinta/Checkout ee loo diro isticmaalayaasha koontada iimaylka dheeraadka ah, ku geli halkan. Hadii kale ka tag goobtan oo banaan.',
+    'admin_cc_email_help'       => 'Send a copy of checkin/checkout emails to this address.',
     'admin_settings'            => 'Dejinta maamulka',
     'is_ad'				        => 'Kani waa adeegaha Hagaha Active',
     'alerts'                	=> 'Digniin',
     'alert_title'               => 'Cusbooneysii Dejinta Ogeysiinta',
     'alert_email'				=> 'U dir digniinaha',
-    'alert_email_help'    => 'Cinwaannada iimaylka ama liisaska qaybinta ee aad rabto in digniinaha loo diro, kala miirad',
+    'alert_email_help'          => 'Cinwaannada iimaylka ama liisaska qaybinta ee aad rabto in digniinaha loo diro, kala miirad.',
     'alerts_enabled'			=> 'Ogeysiinta iimaylka waa la dajiyay',
     'alert_interval'			=> 'Heerka Ogeysiinta Dhacaya (maalmo gudahood)',
     'alert_inv_threshold'		=> 'Xaddiga Digniinaha Alaabta',
@@ -31,56 +31,59 @@ return [
     'backups'					=> 'Kaabta',
     'backups_help'              => 'Abuur, soo deji, oo soo celi kaydinta ',
     'backups_restoring'         => 'Ka soo celinta kaabta',
+    'backups_clean' => 'Clean the backed-up database before restore',
+    'backups_clean_helptext' => "This can be useful if you're changing between database versions",
     'backups_upload'            => 'Soo rar kaabta',
     'backups_path'              => 'Kaydka serfarka waxa lagu kaydiyaa <code>:path</code>',
-    'backups_restore_warning'   => 'Isticmaal badhanka soo celinta <small><span class="btn btn-xs btn-warning"><i class="text-white fas fa-retweet" aria-hidden="true"></i></span> </small>si looga soo celiyo kayd hore.(Tani hadda kuma shaqaynayso kaydinta faylka S3 ama Docker.)<br><br>Macluumaadkaaga <strong>dhan :app_name iyo wixii faylal ah ee la shubo waxaa gabi ahaanba lagu bedeli doonaa</strong>waxa ku jira faylka kaydinta.  ',
+    'backups_restore_warning'   => 'Use the restore button <small><span class="btn btn-xs btn-warning"><i class="text-white fas fa-retweet" aria-hidden="true"></i></span></small> to restore from a previous backup. (This does not currently work with S3 file storage or Docker.)<br><br>Your <strong>entire :app_name database and any uploaded files will be completely replaced</strong> by what\'s in the backup file  ',
     'backups_logged_out'         => 'Dhammaan isticmaalayaasha jira, oo ay ku jiraan adiga, waa laga bixi doonaa marka soo celintaada dhammaato.',
     'backups_large'             => 'Kaydka aadka u weyn ayaa laga yaabaa inuu waqti ku qaato isku dayga soo celinta waxaana laga yaabaa inuu weli u baahdo in lagu socodsiiyo khadka taliska. ',
     'barcode_settings'			=> 'Dejinta Barcode',
     'confirm_purge'			    => 'Xaqiiji Nadiifinta',
     'confirm_purge_help'		=> 'Geli qoraalka "DELETE" sanduuqa hoose si aad u nadiifiso diiwaannadaada tirtiray. Tallaabadan dib looma noqon karo oo waxay si joogto ah u tirtiri doontaa dhammaan walxaha la tirtiray iyo isticmaalayaasha. (Waa inaad marka hore samaysataa kayd, si aad u nabad gasho.)',
     'custom_css'				=> 'CSS gaar ah',
-    'custom_css_help'			=> 'Geli wixii caado ah oo CSS ah oo aad jeclaan lahayd inaad isticmaasho. Ha ku darin &lt;style&gt;&lt;/style&gt; tags',
+    'custom_css_placeholder'	=> 'Add your custom CSS',
+    'custom_css_help'			=> 'Geli wax weliba oo CSS ah oo aad jeclaan lahayd inaad isticmaasho. Ha ku darin &lt;style&gt;&lt;/style&gt; tags.',
     'custom_forgot_pass_url'	=> 'Dib u habeynta erayga sirta ah ee URL',
     'custom_forgot_pass_url_help'	=> 'Tani waxay beddeshaa URL-ka sirta ah ee la illoobay ee ku dhex jira shaashadda gelitaanka, faa\'iido u leh in lagu hago dadka gudaha ama la martigeliyay ee LDAP dib u habeynta sirta. Waxay si wax ku ool ah u baabi\'in doontaa isticmaale maxalli ah oo la iloobay shaqeynta sirta ah.',
     'dashboard_message'			=> 'Fariinta Dashboard-ka',
     'dashboard_message_help'	=> 'Qoraalkani waxa uu ka soo muuqan doonaa dashboardka qof kasta oo fasax u haysta inuu dashboard-ka eego.',
     'default_currency'  		=> 'Lacagta caadiga ah',
     'default_eula_text'			=> 'EULA asalka ah',
+    'default_eula_text_placeholder' => 'Add your default EULA text',
     'default_language'			=> 'Luuqada caadiga ah',
     'default_eula_help_text'	=> 'Waxa kale oo aad ku xidhidhi kartaa EULA-yada gaarka ah qaybaha hantida gaarka ah.',
     'acceptance_note'           => 'Add a note for your decision (Optional)',
     'display_asset_name'        => 'Muuji Magaca Hantida',
     'display_checkout_date'     => 'Muujin Taariikhda Bixinta',
     'display_eol'               => 'Ku muuji EOL muuqaalka miiska',
-    'display_qr'                => 'Muuji Koodhadhka labajibbaaran',
+    'display_qr'                => 'Display 2D barcode',
     'display_alt_barcode'		=> 'Muuji 1D barcode',
-    'email_logo'                => 'Email Logo',
     'barcode_type'				=> 'Nooca Barcode 2D',
     'alt_barcode_type'			=> '1D nooca barcode',
-    'email_logo_size'       => 'Calaamadaha labajibbaaran ee iimaylka ayaa u muuqda kuwa ugu fiican. ',
     'enabled'                   => 'La dajiyay',
     'eula_settings'				=> 'Dejinta EULA',
     'eula_markdown'				=> 'EULA-dani waxay ogolaataa <href="https://help.github.com/articles/github-flavored-markdown/">Github calaamadaynta dhadhanka</a>.',
+    'empty_row_count'           => 'Field Start Offset (Empty Rows)',
+    'empty_row_count_help'      => 'Fields will begin populating after this many empty rows are skipped at the top of the label.',
     'favicon'                   => 'Favicon',
-    'favicon_format'            => 'Noocyada faylalka la aqbalay waa ico, png, iyo gif. Qaababka kale ee sawirku waxa laga yaabaa inaanay ka shaqayn dhammaan daalacashada',
+    'favicon_format'            => 'Noocyada faylalka la ogolyahay waa ico, png, iyo gif. Qaababka kale ee sawirku waxa laga yaabaa inaanay ku shaqayn browserada.',
     'favicon_size'          => 'Favicons waa inay ahaadaan sawirro labajibbaaran, 16x16 pixels.',
     'footer_text'               => 'Qoraal Footer Dheeraad ah ',
     'footer_text_help'          => 'Qoraalkani waxa uu ka soo bixi doona cagtiisa midig. Isku xirka waa la ogol yahay isticmaalka <href="https://help.github.com/articles/github-flavored-markdown/">Github calaamadaynta dhadhanka</a>. Xadhka goosashada, madaxa, sawirada, iwm waxay keeni karaan natiijooyin aan la saadaalin karin.',
+    'footer_text_placeholder'   => 'Optional footer text',
     'general_settings'			=> 'Goobaha Guud',
-    'general_settings_keywords' => 'taageerada shirkadda, saxeexa, aqbalaadda, qaabka iimaylka, qaabka adeegsadaha, sawirada, bog kasta, thumbnail, eula, gravatar, tos, dashboard, sir',
     'general_settings_help'     => 'EULA asalka ah iyo qaar kaloo badan',
     'generate_backup'			=> 'Samee kaabta',
     'google_workspaces'         => 'Goobaha shaqada Google',
     'header_color'              => 'Midabka madaxa',
     'info'                      => 'Dejintani waxay kuu ogolaanayaan inaad habayso qaybo ka mid ah rakibaadaada.',
-    'label_logo'                => 'Summada Summada',
     'label_logo_size'           => 'Calaamadaha labajibbaaran waxay u muuqdaan kuwa ugu fiican - waxaa lagu muujin doonaa midigta sare ee calaamad kasta oo hanti ah. ',
     'laravel'                   => 'Nooca Laravel',
     'ldap'                      => 'LDAP',
     'ldap_default_group'        => 'Kooxda Ogolaanshaha Hore',
     'ldap_default_group_info'   => 'Dooro koox si aad ugu meelayso isticmaalayaasha cusub ee la habeeyey. Xusuusnow in isticmaaluhu uu qaato oggolaanshaha kooxda loo xilsaaray.',
-    'no_default_group'          => 'No Default Group',
+    'no_default_group'          => 'Lama hayo majmuuco iftiraadi ah',
     'ldap_help'                 => 'LDAP/Hagaha Firfircoon',
     'ldap_client_tls_key'       => 'Furaha TLS ee macmiilka LDAP',
     'ldap_client_tls_cert'      => 'Shahaadada TLS ee dhinaca Macmiilka LDAP',
@@ -88,13 +91,13 @@ return [
     'ldap_integration'          => 'Is dhexgalka LDAP',
     'ldap_settings'             => 'Dejinta LDAP',
     'ldap_client_tls_cert_help' => 'Shahaadada TLS-Dhinaca Macmiilka iyo Furaha isku xirka LDAP ayaa inta badan faa\'iido u leh isku xidhka Google Workspace ee leh "LDAP sugan." Labadaba waa loo baahan yahay.',
-    'ldap_location'             => 'LDAP Location',
-'ldap_location_help'             => 'The Ldap Location field should be used if <strong>an OU is not being used in the Base Bind DN.</strong> Leave this blank if an OU search is being used.',
+    'ldap_location'             => 'Goobta LDAP',
+'ldap_location_help'             => 'Waa in la isticmaalaa goobta Ldap <strong>haddii aan la isticmaalin hanaan mideysan DN.</strong> Uga tag halkan isagoo faaruq ah haddii la isticmalaay hanaan wax raadin oo nidaamsan.',
     'ldap_login_test_help'      => 'Geli magaca isticmaale ee LDAP iyo erayga sirta ah ee saxda ah DN-ga aad kor ku sheegtay si aad u tijaabiso in galitaanka LDAP si sax ah loo habeeyey. WAA IN AAD KORDHISAY DEABKAAGA LA CUSBOONAYSAY EE LDAP.',
     'ldap_login_sync_help'      => 'Tani waxay tijaabinaysaa kaliya in LDAP ay si sax ah u wada shaqayn karto. Haddii su\'aasha xaqiijinta LDAP aysan sax ahayn, isticmaalayaashu wali ma awoodi karaan inay soo galaan WAA IN AAD KORDHISAY DEABKAAGA LA CUSBOONAYSAY EE LDAP.',
-    'ldap_manager'              => 'LDAP Manager',
+    'ldap_manager'              => 'Maamulaha LDAP',
     'ldap_server'               => 'Adeegaha LDAP',
-    'ldap_server_help'          => 'Tani waa inay ku bilaabataa ldap: // (mid aan qarsoodi ahayn ama TLS) ama ldaps:// (loogu talagalay SSL)',
+    'ldap_server_help'          => 'This should start with ldap:// (for unencrypted) or ldaps:// (for TLS or SSL)',
     'ldap_server_cert'			=> 'Xaqiijinta shahaadada LDAP SSL',
     'ldap_server_cert_ignore'	=> 'Oggolow shahaadada SSL aan ansax ahayn',
     'ldap_server_cert_help'		=> 'Dooro sanduuqan hubinta haddii aad isticmaalayso shahaadada SSL oo aad adigu iskaa u saxeexday oo aad jeclaan lahayd inaad aqbasho shahaado SSL oo aan sax ahayn.',
@@ -105,25 +108,27 @@ return [
     'ldap_phone'                => 'Lambarka Taleefanka LDAP',
     'ldap_jobtitle'             => 'Magaca Shaqada LDAP',
     'ldap_country'              => 'Dalka LDAP',
-    'ldap_pword'                => 'LDAP Bind Password',
+    'ldap_pword'                => 'Pasowrd ku xiran',
     'ldap_basedn'               => 'Saldhig Bind DN',
     'ldap_filter'               => 'Shaandhaynta LDAP',
-    'ldap_pw_sync'              => 'LDAP Password Sync',
-    'ldap_pw_sync_help'         => 'Ka saar sanduuqan haddii aadan rabin inaad ku hayso furaha LDAP ee erayga sirta ah ee gudaha. Deminta tani waxay la macno tahay in isticmaalayaashaadu ay awoodi waayaan inay soo galaan haddii server-kaaga LDAP aan la heli karin sabab qaar ka mid ah.',
+    'ldap_pw_sync'              => 'Cache LDAP Passwords',
+    'ldap_pw_sync_help'         => 'Uncheck this box if you do not wish to keep LDAP passwords cached as local hashed passwords. Disabling this means that your users may not be able to login if your LDAP server is unreachable for some reason.',
     'ldap_username_field'       => 'Magaca isticmaalaha Field',
     'ldap_lname_field'          => 'Magaca dambe',
     'ldap_fname_field'          => 'Magaca Hore ee LDAP',
     'ldap_auth_filter_query'    => 'Weydiinta Xaqiijinta LDAP',
     'ldap_version'              => 'Nooca LDAP',
     'ldap_active_flag'          => 'Calan Firfircoon LDAP',
-    'ldap_activated_flag_help'  => 'This value is used to determine whether a synced user can login to Snipe-IT. <strong>It does not affect the ability to check items in or out to them</strong>, and should be the <strong>attribute name</strong> within your AD/LDAP, <strong>not the value</strong>. <br><br>If this field is set to a field name that does not exist in your AD/LDAP, or the value in the AD/LDAP field is set to <code>0</code> or <code>false</code>, <strong>user login will be disabled</strong>. If the value in the AD/LDAP field is set to <code>1</code> or <code>true</code> or <em>any other text</em> means the user can log in. When the field is blank in your AD, we respect the <code>userAccountControl</code> attribute, which usually allows non-suspended users to log in.',
+    'ldap_activated_flag_help'  => 'Qiimahan waxaa loo adeegsadaa in lagu xadido haddii isticmalaaha uu geli karo Snipe-IT. <strong>ma saameyneyso awoodda geitaanka ama kasoo bixitaanka </strong>, waa waajib in<strong>magaca sumadda</strong> uu ku jiro AD/LDAP, <strong>ma ahan qiimaha</strong>. <br><br>haddii field-gan lagu set gareeyo field aan ku jirin AD/LDAP, ama in la cayimo qimaha AD/LDAP field-ga waxaa lagu set gareeyay <code>0</code> or <code>false</code>, <strong>gelitaanka userka waa la xanibi doonaa</strong>. haddii qiimaha kujira AD/LDAP field-ga waxaa lagu set gareeyay <code>1</code> or <code>run</code> or <qoraal kasta</em> waxay ka dhigantahay in userka laga soo geli karo. marka field-ga uu maranyahay, waan qadarineynaa <code>userAccountControl</code> attribute, waxay u ogolaaneysaa isticmaaliyaasha iney gudaha u galaan.',
+    'ldap_invert_active_flag'   => 'LDAP Invert Active Flag',
+    'ldap_invert_active_flag_help'     => 'If enabled: when the value returned by LDAP Active Flag is <code>0</code> or <code>false</code> the user account will be active.',
     'ldap_emp_num'              => 'Lambarka Shaqaalaha LDAP',
     'ldap_email'                => 'LDAP iimaylka',
     'ldap_test'                 => 'Tijaabi LDAP',
     'ldap_test_sync'            => 'Tijaabi wada shaqaynta LDAP',
     'license'                   => 'Shatiga Software',
-    'load_remote'               => 'Use Gravatar',
-    'load_remote_help_text'		=> 'Uncheck this box if your install cannot load scripts from the outside internet. This will prevent Snipe-IT from trying load images from Gravatar.',
+    'load_remote'               => 'Load Remote Avatars',
+    'load_remote_help_text'		=> 'Uncheck this box if your install cannot load scripts from the outside internet. This will prevent Snipe-IT from trying load avatars from Gravatar or other outside sources.',
     'login'                     => 'Isku-dayga Galitaanka',
     'login_attempt'             => 'Isku day Login',
     'login_ip'                  => 'Ciwaanka IP-ga',
@@ -131,6 +136,7 @@ return [
     'login_user_agent'          => 'Wakiilka Isticmaalaha',
     'login_help'                => 'Liiska la isku dayay in la galo',
     'login_note'                => 'Xusuusin soo gal',
+    'login_note_placeholder'            => "If you do not have a login or have found a device belonging to this company, please call technical support at 888-555-1212. Thank you.",
     'login_note_help'           => 'Ikhtiyaar ahaan ku dar jumlado kooban shaashaddaada soo gelida, tusaale ahaan si aad u caawiso dadka helay qalab lumay ama la xaday. Goobtani waxa ay aqbashaa <href="https://help.github.com/articles/github-flavored-markdown/">Github calaamadaynta dhadhanka</a>',
     'login_remote_user_text'    => 'Ikhtiyaarada gelitaanka Isticmaalaha fog',
     'login_remote_user_enabled_text' => 'Ku oggolow Gelitaanka Madaxa Isticmaalaha Fog',
@@ -141,18 +147,21 @@ return [
     'login_remote_user_custom_logout_url_help' => 'Haddii url halkan lagu bixiyo, isticmaalayaashu waxa loo wareejin doonaa URL-kan ka dib marka isticmaaluhu ka baxo Snipe-IT. Tani waxay faa\'iido u leedahay in si sax ah loo xiro fadhiyada isticmaale bixiyahaaga Xaqiijinta.',
     'login_remote_user_header_name_text' => 'Madaxa magaca isticmaale ee gaarka ah',
     'login_remote_user_header_name_help' => 'Isticmaal madaxa la cayimay bedelkii REMOTE_USER',
-    'logo'                    	=> 'Logo',
+    'logo'                    	=> 'Summad',
     'logo_print_assets'         => 'Ku isticmaal Daabacaadda',
     'logo_print_assets_help'    => 'Ku isticmaal calaamadaynta liisaska hantida la daabacan karo ',
     'full_multiple_companies_support_help_text' => 'Ku xaddidida isticmaalayaasha (ay ku jiraan admins) shirkadaha loo qoondeeyay hantida shirkadooda.',
     'full_multiple_companies_support_text' => 'Taageerada Shirkado Badan oo Buuxa',
+    'scope_locations_fmcs_support_text'  => 'Scope Locations with Full Multiple Companies Support',
+    'scope_locations_fmcs_support_help_text'  => 'Restrict locations to their selected company.',
+    'scope_locations_fmcs_check_button' => 'Check Compatibility',
+    'scope_locations_fmcs_support_disabled_text'  => 'This option is disabled because you have conflicting locations set for :count or more items.',
     'show_in_model_list'   => 'Ku muuji Tusmooyinka Hoos u dhaca',
-    'optional'					=> 'Ikhtiyaar',
+    'optional'					=> 'doorasho',
     'per_page'                  => 'Natiijooyinka boggiiba',
     'php'                       => 'Nooca PHP',
-    'php_info'                  => 'Macluumaadka PHP',
+    'php_info'                  => 'PHP info',
     'php_overview'              => 'PHP',
-    'php_overview_keywords'     => 'phpinfo, nidaamka, macluumaadka',
     'php_overview_help'         => 'Macluumaadka Nidaamka PHP',
     'php_gd_info'               => 'Waa inaad ku rakibtaa php-gd si aad u muujiso koodka QR, eeg habka rakibaadda.',
     'php_gd_warning'            => 'Habaynta Sawirka PHP iyo GD plugin lama rakibin.',
@@ -180,56 +189,57 @@ return [
     'saml_sp_x509cert'          => 'Shahaadada Dadweynaha',
     'saml_sp_metadata_url'      => 'Xogta badan URL',
     'saml_idp_metadata'         => 'SAML IdP Metadata',
-    'saml_idp_metadata_help'    => 'You can specify the IdP metadata using a URL or XML file.',
-    'saml_attr_mapping_username' => 'Attribute Mapping - Username',
-    'saml_attr_mapping_username_help' => 'NameID will be used if attribute mapping is unspecified or invalid.',
-    'saml_forcelogin_label'     => 'SAML Force Login',
-    'saml_forcelogin'           => 'Make SAML the primary login',
-    'saml_forcelogin_help'      => 'You can use \'/login?nosaml\' to get to the normal login page.',
-    'saml_slo_label'            => 'SAML Single Log Out',
-    'saml_slo'                  => 'Send a LogoutRequest to IdP on Logout',
-    'saml_slo_help'             => 'This will cause the user to be first redirected to the IdP on logout. Leave unchecked if the IdP doesn\'t correctly support SP-initiated SAML SLO.',
-    'saml_custom_settings'      => 'SAML Custom Settings',
-    'saml_custom_settings_help' => 'You can specify additional settings to the onelogin/php-saml library. Use at your own risk.',
-    'saml_download'             => 'Download Metadata',
-    'setting'                   => 'Dejinta',
-    'settings'                  => 'Dejinta',
+    'saml_idp_metadata_help'    => 'Waa kuu suurogal inaad xadido qofka bixinaya hawiyada adigoo adeegsanaya URL ama XML file.',
+    'saml_attr_mapping_username' => 'Calaamadee astaamaha- magaca isticmaalaha',
+    'saml_attr_mapping_username_help' => 'MagacaID waxaa la isticmaali doonaa haddii cayimidda astaanta aaney xadidneyn ama shaqeynin.',
+    'saml_forcelogin_label'     => 'SAML xoog ku gelid',
+    'saml_forcelogin'           => 'Ka dhig SAML asaaska gelitaanka',
+    'saml_forcelogin_help'      => 'Waxaad adeegsan kartaa \'/login?nosaml\' si aad u hesho page-ka gelitaanka caadiga ah.',
+    'saml_slo_label'            => 'Diiwaangelinta ka bixitaanka keliga ah ee SAML',
+    'saml_slo'                  => 'U dir codsiga kabixitaanka IdP markaad ka baxeyso',
+    'saml_slo_help'             => 'Tani waxay keeneysaa in isticmaalaha loo jiheeyo bixiyaha hawiyada marka uu ka baxayo. ha xadidin khiyaarkan haddii bixiyaha hawiyada aanu si dhab ah u taageereynin SP-initiated SAML SLO.',
+    'saml_custom_settings'      => 'Settings SAML ee gaarka ah',
+    'saml_custom_settings_help' => 'Waxaad cayimi kartaa inaad wax kusoo kordhiso settings-ka maktabadda onelogin/php-saml. isticmaal adigoo qaadanaya masuuliyadda wixii ka yimaada.',
+    'saml_download'             => 'Soo deji Metadata',
+    'setting'                   => 'Setting',
+    'settings'                  => 'Settings',
     'show_alerts_in_menu'       => 'Muuji digniinaha liiska sare',
     'show_archived_in_list'     => 'Hanti kaydsan',
-    'show_archived_in_list_text'     => 'Tus hantida kaydsan ee liiska "dhammaan hantida".',
-    'show_assigned_assets'      => 'Show assets assigned to assets',
-    'show_assigned_assets_help' => 'Display assets which were assigned to the other assets in View User -> Assets, View User -> Info -> Print All Assigned and in Account -> View Assigned Assets.',
+    'show_archived_in_list_text'     => 'Kasoo Muuji Ra\'samaalka keydsan liiska "Dhamaan Ra\'samaalka"',
+    'show_assigned_assets'      => 'Muuji hantida u gaarka ah Ra\'samaalka',
+    'show_assigned_assets_help' => 'Kasoo muujis hantida loo gaar yeeley Ra\'samaalka kale qeybta User -> hanti, soo bandhig User -> Info -> Ku daabac dhamaan hantida gaarka ah Xisaabka -> Muuji hantida gaarka.',
     'show_images_in_email'     => 'Ku muuji sawirada iimaylada',
     'show_images_in_email_help'   => 'Calaamadee sanduuqan haddii rakibaada Snipe-IT ay ka danbeyso VPN ama shabakad xidhan iyo isticmaalayaasha ka baxsan shabakada ma awoodi doonaan inay ku shubaan sawirada loo soo diray rakibaaddan iimayladooda.',
     'site_name'                 => 'Magaca Goobta',
-    'integrations'               => 'Integrations',
-    'slack'                     => 'Slack',
-    'general_webhook'           => 'General Webhook',
+    'integrations'               => 'Is-dhameystir',
+    'slack'                     => 'Fadhiidnimo',
+    'general_webhook'           => 'Guud ahaan Webhook',
     'ms_teams'                  => 'Microsoft Teams',
-    'webhook'                   => ':app',
-    'webhook_presave'           => 'Test to Save',
-    'webhook_title'               => 'Update Webhook Settings',
-    'webhook_help'                => 'Integration settings',
-    'webhook_botname'             => ':app Botname',
-    'webhook_channel'             => ':app Channel',
-    'webhook_endpoint'            => ':app Endpoint',
+    'webhook'                   => ':app-ka',
+    'webhook_presave'           => 'Tijaabo si loo xifdiyo',
+    'webhook_title'               => 'Cusbooneysii Webhook Settings',
+    'webhook_help'                => 'Settings isdhameystirka',
+    'webhook_botname'             => ':app magaca botka',
+    'webhook_channel'             => ':app Kanaal',
+    'webhook_endpoint'            => ':app pointiga dhamaadka',
     'webhook_integration'         => ':app Settings',
-    'webhook_test'                 =>'Test :app integration',
-    'webhook_integration_help'    => ':app integration is optional, however the endpoint and channel are required if you wish to use it. To configure :app integration, you must first <a href=":webhook_link" target="_new" rel="noopener">create an incoming webhook</a> on your :app account. Click on the <strong>Test :app Integration</strong> button to confirm your settings are correct before saving. ',
-    'webhook_integration_help_button'    => 'Once you have saved your :app information, a test button will appear.',
-    'webhook_test_help'           => 'Test whether your :app integration is configured correctly. YOU MUST SAVE YOUR UPDATED :app SETTINGS FIRST.',
+    'webhook_test'                 =>'Tijaabo :app is-dhameystira',
+    'webhook_integration_help'    => ':is dhameystirka appka waa doorasho, laakiin dhamaadka Iyo kanaalka waa lagaa doonayaa haddii aad dooneyso inaad isticmaasho. Si aad u sameyso app is dhameystira, waa qasab in marka hore <a href=":webhook_link" target="_new" rel="noopener">samee webhook</a> on your :akoonka xisaabkaaga. Ku dhufo <strong>tijaabada :app is dhameystira </strong> si aad u hubiso settings kahor inta aadan xafidin. ',
+    'webhook_integration_help_button'    => 'Markaad save gareysato appka kuu gaarka ah, waxaa kuu soo bixi doona badhanka tijaabada.',
+    'webhook_test_help'           => 'Iska ogow in appka adiga laguu sameeyay uu yahay mid saxan. WAA INAAD ILAALSATAA CUSBOONEYSIINTAADA :appka la cusbooneysiiyay marka hore.',
+    'shortcuts_enabled'         => 'Enable Shortcuts',
+    'shortcuts_help_text'       => '<strong>Windows</strong>: Alt + Access key, <strong>Mac</strong>: Control + Option + Access key',
     'snipe_version'  			=> 'Nooca Snipe-IT',
     'support_footer'            => 'Taageerada Xidhiidhada Footer ',
     'support_footer_help'       => 'Sheeg cidda arkaysa isku xirka macluumaadka Taageerada Snipe-IT iyo Buugga Isticmaalayaasha',
     'version_footer'            => 'Nooca ku yaal Footer ',
-    'version_footer_help'       => 'Sheeg cidda arkaysa nooca Snipe-IT oo nambarka dhis',
+    'version_footer_help'       => 'Sheeg oo cayin cidda arkaysa nooca Snipe-IT, nambarkana dhis.',
     'system'                    => 'Macluumaadka Nidaamka',
     'update'                    => 'Cusbooneysii Settings',
     'value'                     => 'Qiimaha',
     'brand'                     => 'Calaamadaynta',
-    'brand_keywords'            => 'cagta, astaanta, daabacaadda, mawduuca, maqaarka, madaxa, midabada, midabka, css',
     'brand_help'                => 'Logo, Magaca Goobta',
-    'web_brand'                 => 'Web Branding Type',
+    'web_brand'                 => 'Nooca calaamadda ganacsi ee webka',
     'about_settings_title'      => 'Ku saabsan Dejinta',
     'about_settings_text'       => 'Dejintani waxay kuu ogolaanayaan inaad habayso qaybo ka mid ah rakibaadaada.',
     'labels_per_page'           => 'Calaamadaha boggiiba',
@@ -240,7 +250,7 @@ return [
     'privacy_policy'            => 'Qaanuunka Arrimaha Khaaska ah',
     'privacy_policy_link_help'  => 'Haddii url halkan lagu daro, xidhiidhka siyaasaddaada khaaska ah ayaa lagu dari doonaa abka abka iyo iimaylo kasta oo nidaamku soo diro, iyadoo la raacayo GDPR. ',
     'purge'                     => 'Nadiifi Diiwaanada La Tiray',
-    'purge_deleted'             => 'Purge Deleted ',
+    'purge_deleted'             => 'Wixii La tiray oo meesha laga saaro ',
     'labels_display_bgutter'    => 'Ku calaamadee qulqulka hoose',
     'labels_display_sgutter'    => 'Ku calaamadee qulqulka dhinaca',
     'labels_fontsize'           => 'Calaamadee cabbirka farta',
@@ -269,23 +279,25 @@ return [
     'two_factor_enabled_help'        => 'Tani waxay daari doontaa xaqiijinta laba-factor iyadoo la isticmaalayo Google Authenticator.',
     'two_factor_optional'        => 'Xulasho (Isticmaalayaasha ayaa awood u yeelan kara ama joojin kara haddii la oggolaado)',
     'two_factor_required'        => 'Loo baahan yahay dhammaan isticmaalayaasha',
-    'two_factor_disabled'        => 'Naafada',
+    'two_factor_disabled'        => 'Xiritaan',
     'two_factor_enter_code'	=> 'Geli Koodhka Laba-Armood',
     'two_factor_config_complete'	=> 'Soo gudbi Koodhka',
-    'two_factor_enabled_edit_not_allowed' => 'Maamulahaagu kuma ogola inaad wax ka beddesho goobtan',
+    'two_factor_enabled_edit_not_allowed' => 'Maamulahaagu kuma ogola inaad wax ka beddesho qeybtan.',
     'two_factor_enrollment_text'	=> "Xaqiijinta laba arrimood ayaa loo baahan yahay, si kastaba ha ahaatee qalabkaagu weli lama diiwaan gelin. Fur app kaaga Google Authenticator oo iska sawir summada QR ee hoose si aad u diiwaan geliso qalabkaaga. Marka aad ku qorto qalabkaaga, geli koodka hoose",
     'require_accept_signature'      => 'U baahan Saxeexa',
     'require_accept_signature_help_text'      => 'Awood u yeelashada sifadan waxay u baahan doontaa isticmaalayaashu inay jidh ahaan u saxeexaan aqbalaadda hantida.',
+    'require_checkinout_notes'  => 'Require Notes on Checkin/Checkout',
+    'require_checkinout_notes_help_text'    => 'Enabling this feature will require the note fields to be populated when checking in or checking out an asset.',
     'left'        => 'bidix',
     'right'        => 'xaq',
-    'top'        => 'Sare',
+    'top'        => 'sare',
     'bottom'        => 'hoose',
     'vertical'        => 'toosan',
     'horizontal'        => 'siman',
     'unique_serial'                => 'Tirooyinka taxanaha gaarka ah',
     'unique_serial_help_text'                => 'Saxeexa santuuqan waxa ay dhaqan galin doontaa xaddidaadda gaarka ah ee taxanaha hantida',
     'zerofill_count'        => 'Dhererka calaamadaha hantida, oo ay ku jiraan eber-fill',
-    'username_format_help'   => 'This setting will only be used by the import process if a username is not provided and we have to generate a username for you.',
+    'username_format_help'   => 'Setting-kan waxaa loo isticmaali doonaa keliya soo dhoofinta haddii aan la helin username anaga ayaana kuu sameyn doono user.',
     'oauth_title' => 'OAuth API Settings',
     'oauth_clients' => 'OAuth Clients',
     'oauth' => 'OAuth',
@@ -311,26 +323,26 @@ return [
     'mail_test' => 'Dir Imtixaan',
     'mail_test_help' => 'Tani waxay isku dayi doontaa inay u dirto boostada tijaabada ah: replyto.',
     'filter_by_keyword' => 'Ku shaandhee adigoo dejinaya erayga muhiimka ah',
-    'security' => 'Security',
-    'security_title' => 'Update Security Settings',
-    'security_keywords' => 'password, passwords, requirements, two factor, two-factor, common passwords, remote login, logout, authentication',
+    'security' => 'Amaan',
+    'security_title' => 'Cusbooneysii Settings-ka amaanka',
     'security_help' => 'Laba arrimood, Xakamaynta erayga sirta ah',
-    'groups_keywords' => 'permissions, permission groups, authorization',
     'groups_help' => 'Kooxaha ogolaanshaha xisaabta',
-    'localization' => 'Localization',
-    'localization_title' => 'Update Localization Settings',
-    'localization_keywords' => 'localization, currency, local, locale, time zone, timezone, international, internatinalization, language, languages, translation',
+    'localization' => 'Meeleyn',
+    'localization_title' => 'Cusbooneysii Settings-ka meeleynta',
     'localization_help' => 'Luqadda, soo bandhigida taariikhda',
-    'notifications' => 'Notifications',
-    'notifications_help' => 'Email Alerts & Audit Settings',
+    'notifications' => 'Baraarujin',
+    'notifications_help' => 'Digniinaha Emailka & Sugidda Settings',
     'asset_tags_help' => 'Kordhinta iyo horgalayaasha',
     'labels' => 'Calaamadaha',
     'labels_title' => 'Cusbooneysii Settings Label',
-    'labels_help' => 'Cabbirrada summada &amp; goobaha',
-    'purge_keywords' => 'si joogto ah u tirtir',
+    'labels_help' => 'Barcodes &amp; label settings',
     'purge_help' => 'Nadiifi Diiwaanada La Tiray',
     'ldap_extension_warning' => 'Uma eka in kordhinta LDAP lagu rakibay ama lagu furay serfarkan. Weli waad kaydin kartaa dejimahaaga, laakiin waxaad u baahan doontaa inaad awood u siiso kordhinta LDAP ee PHP ka hor inta LDAP isku-xidhka ama galitaanka aanu shaqayn.',
     'ldap_ad' => 'LDAP/AD',
+    'ldap_test_label' => 'Test LDAP Sync',
+    'ldap_test_login' => ' Test LDAP Login',
+    'ldap_username_placeholder' => 'LDAP Username',
+    'ldap_password_placeholder' => 'LDAP Password',
     'employee_number' => 'Lambarka Shaqaalaha',
     'create_admin_user' => 'Abuur Isticmaale ::',
     'create_admin_success' => 'Guul! Isticmaalahaaga maamulka ayaa lagu daray!',
@@ -342,13 +354,15 @@ return [
     'setup_migration_create_user' => 'Xiga: Abuur Isticmaalaha',
     'ldap_settings_link' => 'LDAP Settings Page',
     'slack_test' => 'Tijaabi <i class="fab fa-slack"></i> Isdhexgalka',
+    'status_label_name' => 'Status Label Name',
+    'super_admin_only'  => 'Super Admin Only',
     'label2_enable'           => 'Matoorka Summada Cusub',
     'label2_enable_help'      => 'U beddel mashiinka sumadda cusub. <b>Fiiro gaar ah: Waxaad u baahan doontaa inaad kaydiso goobtan ka hor inta aanad dejin kuwa kale.</b>',
-    'label2_template'         => 'Template',
+    'label2_template'         => 'Tusaale',
     'label2_template_help'    => 'Dooro template si aad u isticmaasho jiilka summada',
     'label2_title'            => 'Ciwaanka',
     'label2_title_help'       => 'Cinwaanka lagu muujinayo calaamadaha taageeraya',
-    'label2_title_help_phold' => 'The placeholder <code>{COMPANY}</code> will be replaced with the asset&apos;s company name',
+    'label2_title_help_phold' => 'Cunsurka kuxigeenka ah <code>{COMPANY}</code> waxaa lagu bedeli doonaa asalka&apos;s magaca shirkadda',
     'label2_asset_logo'       => 'Isticmaal Logo Hantida',
     'label2_asset_logo_help'  => 'Adeegso astaanta hantida&apos; ee shirkadda loo qoondeeyay, halkii aad ka isticmaali lahayd qiimaha <code>:setting_name</code>',
     'label2_1d_type'          => '1D nooca barcode',
@@ -356,24 +370,120 @@ return [
     'label2_2d_type'          => 'Nooca Barcode 2D',
     'label2_2d_type_help'     => 'Qaabka barcode 2D',
     'label2_2d_target'        => 'Barcode Barcode 2D',
-    'label2_2d_target_help'   => 'URL-ka 2D barcode wuxuu tilmaamayaa marka la sawiro',
+    'label2_2d_target_help'   => 'The data that will be contained in the 2D barcode',
     'label2_fields'           => 'Qeexitaannada goobta',
     'label2_fields_help'      => 'Goobaha waa lagu dari karaa, laga saari karaa, oo dib loo habayn karaa tiirka bidix. Goob kasta, xulashooyin badan oo ah Label iyo DataSource ayaa lagu dari karaa, laga saari karaa, oo dib loo dalbi karaa tiirka saxda ah.',
+    'purge_barcodes' => 'Purge Barcodes',
     'help_asterisk_bold'    => 'Qoraalka loo galiyay sida <kood>**qoraal**</code> ayaa loo soo bandhigi doonaa si geesinimo leh',
     'help_blank_to_use'     => 'Banaan ku dhaaf si aad u isticmaasho qiimaha <code>:setting_name</code>',
     'help_default_will_use' => '<code>:default</code> will use the value from <code>:setting_name</code>. <br>Note that the value of the barcodes must comply with the respective barcode spec in order to be successfully generated. Please see <a href="https://snipe-it.readme.io/docs/barcodes">the documentation <i class="fa fa-external-link"></i></a> for more details. ',
+    'asset_id'              => 'Asset ID',
+    'data'               => 'Data',
     'default'               => 'Asal ahaan',
     'none'                  => 'Midna',
-    'google_callback_help' => 'This should be entered as the callback URL in your Google OAuth app settings in your organization&apos;s <strong><a href="https://console.cloud.google.com/" target="_blank">Google developer console <i class="fa fa-external-link" aria-hidden="true"></i></a></strong>.',
-    'google_login'      => 'Google Workspace Login Settings',
-    'enable_google_login'  => 'Enable users to login with Google Workspace',
-    'enable_google_login_help'  => 'Users will not be automatically provisioned. They must have an existing account here AND in Google Workspace, and their username here must match their Google Workspace email address. ',
-    'mail_reply_to' => 'Mail Reply-To Address',
-    'mail_from' => 'Mail From Address',
-    'database_driver' => 'Database Driver',
-    'bs_table_storage' => 'Table Storage',
-    'timezone' => 'Timezone',
+    'google_callback_help' => 'Waa in halkan la geliyo ciwaank URL si loola xiriir appka Google OAuth&apos;s <strong><a href="https://console.cloud.google.com/" target="_blank">waaxda maamulka horumariyaasha Google <i class="fa fa-external-link" aria-hidden="true"></i></a></strong>.',
+    'google_login'      => 'Setting-ka gelitaanka Google Workspace',
+    'enable_google_login'  => 'Isticmaalayaasha waxaa loo ogolyahay iney soo galaan halkan iyagoo isticmaalaya emailkooda Google Workspace',
+    'enable_google_login_help'  => 'Akoonada isticmaalayaasha si degdeg ah looma heli doono waa iney halkan ku lahaadaan akoono ama Google Workspace, magaca userka ay halkan ku leeyihiinna waa inuu lamid ahaadaa ciwaankooda Google Workspace. ',
+    'mail_reply_to' => 'Ciwaanka jawaab celinta emailka',
+    'mail_from' => 'Ciwaanka emailka soo diraha',
+    'database_driver' => 'Hagaha Database',
+    'bs_table_storage' => 'Jadwalka waxqaadka',
+    'timezone' => 'Waqtiga goobta',
+    'test_mail' => 'Test Mail',
     'profile_edit'          => 'Edit Profile',
     'profile_edit_help'          => 'Allow users to edit their own profiles.',
+    'default_avatar' => 'Custom Default Avatar',
+    'default_avatar_help' => 'This image will be displayed as a profile if a user does not have a profile photo.',
+    'restore_default_avatar' => 'Restore <a href=":default_avatar" data-toggle="lightbox" data-type="image">original system default avatar</a>',
+    'restore_default_avatar_help' => '',
+    'due_checkin_days' => 'Due For Checkin Warning',
+    'due_checkin_days_help' => 'How many days before the expected checkin of an asset should it be listed in the "Due for checkin" page?',
+    'no_groups' => 'No groups have been created yet. Visit <code>Admin Settings > Permission Groups</code> to add one.',
+    'text' => 'Text',
+
+    'username_formats' => [
+        'username_format'		=> 'Qaabka magaca isticmaalaha',
+        'firstname_lastname_format'	=> 'Magaca Hore Magaca Dambe (jane.smith)',
+        'first_name_format'	        => 'First Name (jane)',
+        'last_name_format'		=> 'Last Name (doe)',
+        'filastname_format'			=> 'First Initial Last Name (jsmith)',
+        'lastnamefirstinitial_format' =>  'Last Name First Initial (smithj)',
+        'firstname_lastname_underscore_format' => 'First Name Last Name (jane_smith)',
+        'firstinitial.lastname' => 'First Initial Last Name (j.smith)',
+        'lastname_firstinitial' => 'Last Name First Initial (smith_j)',
+        'lastname_dot_firstinitial_format' => 'Last Name First Initial (smith.j)',
+        'firstnamelastname'     => 'First Name Last Name (janesmith)',
+        'firstnamelastinitial'  => 'First Name Last Initial (janes)',
+        'lastnamefirstname'      => 'Last Name.First Name (smith.jane)',
+    ],
+
+    'email_formats' => [
+        'email_format'			=> 'Qaabka iimaylka',
+        'firstname_lastname_format'	=> 'Magaca Hore Magaca Dambe (jane.smith@example.com)',
+        'first_name_format'		=> 'Magaca koowaad (jane@example.com)',
+        'last_name_format'		=> 'Last Name (doe@example.com)',
+        'filastname_format'			=> 'Magaca Dambe ee Koowaad (jsmith@example.com)',
+        'lastnamefirstinitial_format' =>  'Magaca Dambe ee Hore (smithj@example.com)',
+        'firstname_lastname_underscore_format' => 'Magaca Hore Magaca Dambe (jane_smith@example.com)',
+        'firstinitial.lastname' => 'Magaca Dambe ee Koowaad (j.smith@example.com)',
+        'lastname_firstinitial' => 'Magaca Dambe ee ugu horreeya (smith_j@example.com)',
+        'lastname_dot_firstinitial_format' => 'Last Name First Initial (smith.j@example.com)',
+        'firstnamelastname'     => 'Magaca Hore Magaca Dambe (janesmith@example.com)',
+        'firstnamelastinitial'  => 'Magaca hore ee ugu dambeeya (janes@example.com)',
+        'lastnamefirstname'      => 'Last Name.First Name (smith.jane@example.com)',
+    ],
+
+
+
+    'logo_labels' => [
+        'acceptance_pdf_logo'       => 'PDF Logo',
+        'email_logo'                => 'Email Logo',
+        'label_logo'                => 'Summada Summada',
+        'logo'                      => 'Site Logo',
+        'favicon'                   => 'Favicon',
+    ],
+
+    'logo_help' => [
+        'email_logo_size'       => 'Calaamadaha labajibbaaran ee iimaylka ayaa u muuqda kuwa ugu fiican. ',
+    ],
+
+    'logo_option_types' => [
+        'text' => 'Text',
+        'logo' => 'Summad',
+        'logo_and_text' => 'Logo and Text',
+    ],
+
+
+    'legends' => [
+        'scoping' => 'Scoping',
+        'formats' => 'Default Formats',
+        'profiles' => 'User Profiles',
+        'eula' => 'EULA & Acceptance Preferences',
+        'misc_display' => 'Miscellaneous Display Options',
+        'email' => 'Email Preferences',
+        'checkin' => 'Checkin Preferences',
+        'dashboard' => 'Login & Dashboard Preferences',
+        'misc' => 'Miscellaneous',
+        'logos' => 'Logos & Display',
+        'colors' => 'Colors & Skins',
+        'footer' => 'Footer Preferences',
+        'security' => 'Security Preferences',
+        'general' => 'General',
+        'intervals' => 'Intervals & Thresholds',
+    ],
+
+
+    /* Keywords for settings overview help */
+    'keywords' => [
+        'brand'             => 'cagta, astaanta, daabacaadda, mawduuca, maqaarka, madaxa, midabada, midabka, css',
+        'general_settings'  => 'taageerada shirkadda, saxeexa, aqbalaadda, qaabka iimaylka, qaabka adeegsadaha, sawirada, bog kasta, thumbnail, eula, gravatar, tos, dashboard, sir',
+        'groups'            => 'ogolaansho, kooxda ogolaanshah, wakiilasho',
+        'labels'            => 'labels, barcodes, barcode, sheets, print, upc, qr, 1d, 2d',
+        'localization'      => 'meeleyn, lacag, gudaha, goob, goobta waqtiga, waqtiga goobta, caalami, wareejin, luuqad, luuqado, tarjamo',
+        'php_overview'      => 'phpinfo, nidaamka, macluumaadka',
+        'purge'             => 'si joogto ah u tirtir',
+        'security'          => 'password, passwords, baahiyaha, labo factor, labo-factor, passwords guud, fogaan kasoo gelid, kabixid, ogolaansho',
+    ],
 
 ];
diff --git a/resources/lang/so-SO/admin/settings/message.php b/resources/lang/so-SO/admin/settings/message.php
index 9a30194c80..8a685d3713 100644
--- a/resources/lang/so-SO/admin/settings/message.php
+++ b/resources/lang/so-SO/admin/settings/message.php
@@ -4,20 +4,23 @@ return [
 
     'update' => [
         'error'                 => 'Khalad ayaa dhacay markii la cusboonaysiiyay ',
-        'success'               => 'Dejinta si guul leh ayaa loo cusboonaysiiyay',
+        'success'               => 'Cusbooneysiinta qaabeynta waa lagu guuleystay.',
     ],
     'backup' => [
         'delete_confirm'        => 'Ma hubtaa inaad jeclaan lahayd inaad tirtirto faylka kaydka ah? Tallaabadan lama noqon karo. ',
         'file_deleted'          => 'Faylka kaabta ayaa si guul leh loo tirtiray ',
-        'generated'             => 'Fayl cusub oo gurmad ah ayaa si guul leh loo abuuray',
+        'generated'             => 'Feyl cusub oo keyd ah ayaa lagu guuleystay in la abuuro.',
         'file_not_found'        => 'Faylkaas kaydka ah ayaa laga waayay seerfarka.',
         'restore_warning'       => 'Haa, soo celi Waxaan qirayaa in tani ay dib u qori doonto xog kasta oo hadda ku jirta kaydka xogta. Tani waxay sidoo kale ka saari doontaa dhammaan isticmaalayaashaada jira (oo ay ku jirto adiga).',
         'restore_confirm'       => 'Ma hubtaa inaad rabto inaad ka soo celiso xogtaada: filename?'
     ],
+    'restore' => [
+        'success'               => 'Your system backup has been restored. Please log in again.'
+    ],
     'purge' => [
         'error'     => 'Khalad ayaa dhacay markii la nadiifinayo ',
         'validation_failed'     => 'Xaqiijinta nadiifintaadu waa khalad. Fadlan ku qor kelmadda "DELETE" sanduuqa xaqiijinta.',
-        'success'               => 'Diiwaanada la tirtiray ayaa si guul leh loo nadiifiyay',
+        'success'               => 'Diiwaanada la tirtiray si guul leh ayaa loo nadiifiyay.',
     ],
     'mail' => [
         'sending' => 'Diraya Iimayl tijaabo ah...',
@@ -33,6 +36,9 @@ return [
         'testing_authentication' => 'Tijaabi aqoonsiga LDAP...',
         'authentication_success' => 'Isticmaaluhu wuxuu ka xaqiijiyay LDAP si guul leh!'
     ],
+    'labels' => [
+        'null_template' => 'Label template not found. Please select a template.',
+        ],
     'webhook' => [
         'sending' => 'Diraya :app fariinta tijaabada abka...',
         'success' => 'Magacaaga:webhook_name Isdhexgalka wuu shaqeeyaa!',
@@ -42,5 +48,12 @@ return [
         'error' => 'Waxbaa qaldamay. :app waxa uu kaga jawaabay: : error_message',
         'error_redirect' => 'CILAD: 301/302 :endpoint Sababo ammaan dartood, ma raacno dib u jiheynta Fadlan isticmaal barta dhamaadka dhabta ah.',
         'error_misc' => 'Waxbaa qaldamay. :( ',
-    ]
+        'webhook_fail' => ' webhook notification failed: Check to make sure the URL is still valid.',
+        'webhook_channel_not_found' => ' webhook channel not found.',
+        'ms_teams_deprecation' => 'The selected Microsoft Teams webhook URL will be deprecated Dec 31st, 2025. Please use a workflow URL. Microsoft\'s documentation on creating a workflow can be found <a href="https://support.microsoft.com/en-us/office/create-incoming-webhooks-with-workflows-for-microsoft-teams-8ae491c7-0394-4861-ba59-055e33f75498" target="_blank"> here.</a>',
+    ],
+    'location_scoping' => [
+        'not_saved' => 'Your settings were not saved.',
+        'mismatch' => 'There is 1 item in the database that need your attention before you can enable location scoping.|There are :count items in the database that need your attention before you can enable location scoping.',
+    ],
 ];
diff --git a/resources/lang/so-SO/admin/statuslabels/table.php b/resources/lang/so-SO/admin/statuslabels/table.php
index 99e2a19243..e7054c3051 100644
--- a/resources/lang/so-SO/admin/statuslabels/table.php
+++ b/resources/lang/so-SO/admin/statuslabels/table.php
@@ -1,14 +1,14 @@
 <?php
 
 return array(
-    'about'      	=> 'Ku saabsan Calaamadaha Xaaladda',
+    'about'      	=> 'About Status Types',
     'archived'      	=> 'Kaydsan',
     'create'      	=> 'Samee Summada Xaaladda',
     'color'      	=> 'Midabka Shaxda',
     'default_label' => 'Summada asalka ah',
     'default_label_help' => 'Tan waxa loo isticmaalaa si loo hubiyo in summadaada heerka aadka loo isticmaalo ay ka muuqdaan xagga sare ee sanduuqa xulashada marka la abuurayo/tafatirka hantida.',
     'deployable'      	=> 'La geyn karo',
-    'info'      	=> 'Calaamadaha heerka waxaa loo isticmaalaa in lagu qeexo gobolada kala duwan ee hantidaadu ku jiri karto. Waxa laga yaabaa inay maqan yihiin dayactir, lumay/lagu xado, iwm. Waxaad samayn kartaa calaamado xaalad cusub oo la diri karo, la sugayo iyo hantida kaydsan.',
+    'info'      	=> 'Status label types are used to describe the various states your assets could be in. They may be out for repair, lost/stolen, etc. You can create new status labels for your deployable, pending and archived assets according to your own workflow. For more information, <a href="https://snipe-it.readme.io/docs/overview#status-labels" target="_blank">see the documentation <i class="fa fa-external-link"></i></a>.',
     'name'      	=> 'Magaca heerka',
     'pending'      	=> 'La sugayo',
     'status_type'   => 'Nooca Xaaladda',
diff --git a/resources/lang/so-SO/admin/suppliers/message.php b/resources/lang/so-SO/admin/suppliers/message.php
index 3704f46502..cfe35b1789 100644
--- a/resources/lang/so-SO/admin/suppliers/message.php
+++ b/resources/lang/so-SO/admin/suppliers/message.php
@@ -8,7 +8,7 @@ return array(
 
     'create' => array(
         'error'   => 'Iibiyaha lama abuurin, fadlan isku day mar kale.',
-        'success' => 'Iibiyaha si guul leh ayaa loo sameeyay'
+        'success' => 'Gaarsiiyaha si guul leh ayaa loo sameeyay.'
     ),
 
     'update' => array(
@@ -18,8 +18,8 @@ return array(
 
     'delete' => array(
         'confirm'   => 'Ma hubtaa inaad rabto inaad tirtirto alaab-qeybiyahan?',
-        'error'   => 'Waxaa jirtay arrin la tirtirayo alaab-qeybiyaha Fadlan isku day mar kale',
-        'success' => 'Iibiyaha si guul leh ayaa loo tirtiray',
+        'error'   => 'Cillad ayaa ka taagan tir-tiraanka alaab gudbiyahan. Fadlan ku celi marakale.',
+        'success' => 'Gaarsiiyaha si guul leh ayaa loo sameeyay.',
         'assoc_assets'	 => 'Alaab-qeybiyahan hadda waxa lala xidhiidhiyaa :asset_count hantida lamana tirtiri karo Fadlan cusboonaysii hantidaada si aanay mar dambe tixraac alaab-qeybiyahan oo isku day mar kale. ',
         'assoc_licenses'	 => 'Iibiyahan hadda waxa lala xidhiidhiyaa :licenses_count shatiyada lamana tirtiri karo Fadlan cusboonaysii shatiyadaada si aadan mar dambe u tixraacin alaab-qeybiyaha oo isku day mar kale. ',
         'assoc_maintenances'	 => 'Alaab-qeybiyahan waxa uu hadda ku xidhan yahay :asset_maintenances_count dayactirka(yada) hantida lamana tirtiri karo Fadlan cusboonaysii dayactirka hantidaada si aadan mar dambe tixraac alaab-qeybiyahan oo isku day mar kale. ',
diff --git a/resources/lang/so-SO/admin/users/general.php b/resources/lang/so-SO/admin/users/general.php
index fbfa8c249b..2e673de695 100644
--- a/resources/lang/so-SO/admin/users/general.php
+++ b/resources/lang/so-SO/admin/users/general.php
@@ -19,6 +19,8 @@ return [
     'print_assigned'    => 'Daabac Dhammaan Ku-meel-gaadhka ah',
     'email_assigned'    => 'Liistada iimaylka ee Dhammaan la qoondeeyay',
     'user_notified'     => 'Isticmaalaha waxaa loo soo diray iimayl liiska alaabta hadda loo qoondeeyay.',
+    'users_notified'    => 'The user has been emailed a list of their currently assigned items.|:count users have been emailed a list of their currently assigned items.',
+    'users_notified_warning' => ':count user has been emailed a list of their currently assigned items, however :no_email users did not have an email address so could not be emailed.|:count users have been emailed a list of their currently assigned items, however :no_email user(s) did not have an email address so could not be emailed.',
     'auto_assign_label' => 'Ku dar isticmaalahaan marka si toos ah loo qoondeeyo shatiyada xaqa u leh',
     'auto_assign_help'  => 'Ka bood isticmaalehan si otomaatig ah loogu diri lahaa shatiyada',
     'software_user'     => 'Software-ka la hubiyay :name',
diff --git a/resources/lang/so-SO/admin/users/message.php b/resources/lang/so-SO/admin/users/message.php
index 0bfdb4decd..40a1a93289 100644
--- a/resources/lang/so-SO/admin/users/message.php
+++ b/resources/lang/so-SO/admin/users/message.php
@@ -6,7 +6,7 @@ return array(
     'declined'                  => 'Si guul leh ayaad u diiday hantidan.',
     'bulk_manager_warn'	        => 'Isticmaalayaashaada si guul leh ayaa loo cusboonaysiiyay, si kastaba ha ahaatee gelitaanka maamulahaaga lama kaydin sababtoo ah maareeyaha aad dooratay sidoo kale waxa uu ku jiray liiska isticmaalayaasha ee la tafatiray, isticmaalayaashuna waxa laga yaabaa in aanay noqon maamulahooda. Fadlan dooro isticmaalayaashaada mar labaad, marka laga reebo maamulaha.',
     'user_exists'               => 'Isticmaale ayaa hore u jiray!',
-    'user_not_found'            => 'Isticmaaluhu ma jiro.',
+    'user_not_found'            => 'User does not exist or you do not have permission view them.',
     'user_login_required'       => 'Goobta galitaanka ayaa loo baahan yahay',
     'user_has_no_assets_assigned' => 'Ma jirto hanti hadda loo qoondeeyay isticmaalaha.',
     'user_password_required'    => 'Furaha sirta ah ayaa loo baahan yahay.',
@@ -53,6 +53,7 @@ return array(
         'ldap_could_not_search' => 'Ma baadhi karin server-ka LDAP Fadlan ka hubi server-kaaga LDAP ee ku jira faylka habaynta LDAP. <br>Khalad ka yimid Server LDAP:',
         'ldap_could_not_get_entries' => 'Waa lagu xidhi kari waayay serfarka LDAP Fadlan ka hubi server-kaaga LDAP ee ku jira faylka habaynta LDAP. Khalad ka yimid Server LDAP:',
         'password_ldap' => 'Furaha koontada waxaa maamula LDAP/Hagaha Firfircoon. Fadlan la xidhiidh waaxda IT-ga si aad u bedesho eraygaaga sirta ah. ',
+        'multi_company_items_assigned' => 'This user has items assigned that belong to a different company. Please check them in or edit their company.'
     ),
 
     'deletefile' => array(
@@ -68,7 +69,7 @@ return array(
     ),
 
     'inventorynotification' => array(
-        'error'   => 'Isticmaalahaan ma laha wax iimayl ah oo la dhigay,',
+        'error'   => 'Isticmaalahaan ma heysto Email loo abuuray.',
         'success' => 'Isticmaalaha waa la ogeysiiyay wax ku saabsan alaabtooda hadda.'
     )
 );
\ No newline at end of file
diff --git a/resources/lang/so-SO/admin/users/table.php b/resources/lang/so-SO/admin/users/table.php
index 7a4165e475..8414363f84 100644
--- a/resources/lang/so-SO/admin/users/table.php
+++ b/resources/lang/so-SO/admin/users/table.php
@@ -22,7 +22,7 @@ return array(
     'managed_locations'     => 'Goobaha la maamulay',
     'managed_users'         => 'Managed Users',
     'name' 					=> 'Magaca',
-    'nogroup'               => 'Weli kooxo lama abuurin Si aad mid ugu darto, booqo: ',
+    'nogroup'               => 'Weli kooxo lama abuurin Si aad mid ugu darto, booqo:',
     'notes'                 => 'Xusuusin',
     'password_confirm' 		=> 'Xaqiiji erayga sirta ah',
     'password' 				=> 'Password-ka',
diff --git a/resources/lang/so-SO/auth.php b/resources/lang/so-SO/auth.php
index e71216963c..aae631a1e9 100644
--- a/resources/lang/so-SO/auth.php
+++ b/resources/lang/so-SO/auth.php
@@ -13,8 +13,8 @@ return array(
     |
     */
 
-    'failed' => 'Aqoonsigani kuma eka diiwaannadayada.',
+    'failed' => 'Aqoonsigani kuma jiro diiwaankeenna.',
     'password' => 'Furaha sirta ah ee la bixiyay waa khalad.',
-    'throttle' => 'Isku dayo soo gal oo aad u badan Fadlan isku day mar kale :seconds ilbiriqsi gudahood.',
+    'throttle' => 'Too many login attempts. Please try again in :minutes minute(s).',
 
 );
diff --git a/resources/lang/so-SO/auth/message.php b/resources/lang/so-SO/auth/message.php
index 7fe14d53d8..171ebdf669 100644
--- a/resources/lang/so-SO/auth/message.php
+++ b/resources/lang/so-SO/auth/message.php
@@ -4,14 +4,12 @@ return array(
 
     'account_already_exists' => 'Koonto leh iimaylkan ayaa horay u jiray.',
     'account_not_found'      => 'Magaca isticmaale ama erayga sirta ah waa khalad.',
-    'account_not_activated'  => 'Koontadan isticmaale lama hawlgelin',
-    'account_suspended'      => 'Koontada isticmaalaha waa la hakiyay',
-    'account_banned'         => 'Koontadan isticmaale waa mamnuuc.',
-    'throttle'               => 'Isku dayo galitaanka oo aad u badan ayaa guul daraystay. Fadlan isku day markale :minutes daqiiqo gudahood',
+    'account_not_activated'  => 'Koontada isticmaalahan lama hawlgelin.',
+    'account_suspended'      => 'Koontada isticmaalahan waa la hakiyay.',
 
     'two_factor' => array(
         'already_enrolled'      => 'Qalabkaaga mar horeba wuu diiwaan gashan yahay.',
-        'success'               => 'Si guul leh ayaad u soo gashay',
+        'success'               => 'Waad ku guuleysatay inaad soo gasho.',
         'code_required'         => 'Koodhka laba-factor ayaa loo baahan yahay.',
         'invalid_code'          => 'Koodhka laba-factor waa mid aan shaqayn.',
         'enter_two_factor_code' => 'Please enter your two-factor authentication code.',
@@ -20,17 +18,17 @@ return array(
 
     'signin' => array(
         'error'   => 'Dhib baa jirtay markii la isku deyayay in lagu soo galo, fadlan isku day mar kale.',
-        'success' => 'Si guul leh ayaad u soo gashay',
+        'success' => 'Waad ku guuleysatay inaad soo gasho.',
     ),
 
     'logout' => array(
         'error'   => 'Dhib baa jirtay markii la isku deyayay inaan kaa saaro, fadlan isku day mar kale.',
-        'success' => 'Si guul leh ayaad uga baxday',
+        'success' => 'Waad ku guuleysatay inaad ka baxdo.',
     ),
 
     'signup' => array(
         'error'   => 'Dhib baa jirtay markii aad isku dayaysay inaad abuurto akoonkaaga, fadlan isku day mar kale.',
-        'success' => 'Akoonka si guul leh ayaa loo sameeyay',
+        'success' => 'Akoonka waa lagu guuleystay in la sameeyo.',
     ),
 
     'forgot-password' => array(
@@ -40,7 +38,7 @@ return array(
 
     'forgot-password-confirm' => array(
         'error'   => 'Dhib baa jirtay markii aad isku dayaysay inaad dib u dejiso eraygaaga sirta ah, fadlan isku day mar kale.',
-        'success' => 'Furahaaga si guul leh ayaa dib loo dajiyay',
+        'success' => 'Furahaaga waa lagu guuleystay in laguu soo celiyo.',
     ),
 
 
diff --git a/resources/lang/so-SO/button.php b/resources/lang/so-SO/button.php
index 680e868354..e351b6fba0 100644
--- a/resources/lang/so-SO/button.php
+++ b/resources/lang/so-SO/button.php
@@ -7,6 +7,7 @@ return [
     'checkin_and_delete'  	    => 'Geli Dhammaan / Tirtir Isticmaalaha',
     'delete'  	                => 'Tirtir',
     'edit'    	                => 'Wax ka beddel',
+    'clone'    	                => 'Clone',
     'restore' 	                => 'Soo celi',
     'remove'                    => 'Ka saar',
     'request'                   => 'Codsi',
@@ -15,10 +16,19 @@ return [
     'select_file'				=> 'Dooro File...',
     'select_files'				=> 'Dooro faylal...',
     'generate_labels'           => '{1} Samee Summada|[2,*] Samee Calaamadaha',
-    'send_password_link'        => 'Soo dir Linkiga Dib-u-dejinta Furaha',
+    'send_password_link'        => 'Soo dir Linkiga Dib-usoo-celinta Furaha',
     'go'                        => 'Tag',
     'bulk_actions'              => 'Ficilada waaweyn',
     'add_maintenance'           => 'Ku dar Dayactirka',
     'append'                    => 'Ku lifaaq',
     'new'                       => 'Cusub',
+    'var' => [
+        'clone'     => 'Clone :item_type',
+        'edit'      => 'Edit :item_type',
+        'delete'    => 'Delete :item_type',
+        'restore'   => 'Restore :item_type',
+        'create'    => 'Create New :item_type',
+        'checkout'  => 'Checkout :item_type',
+        'checkin'   => 'Checkin :item_type',
+    ]
 ];
diff --git a/resources/lang/so-SO/general.php b/resources/lang/so-SO/general.php
index 60919859d9..0ef5537ce8 100644
--- a/resources/lang/so-SO/general.php
+++ b/resources/lang/so-SO/general.php
@@ -10,7 +10,7 @@ return [
     'action'                => 'Ficil',
     'activity_report'		=> 'Warbixinta Dhaqdhaqaaqa',
     'address'				=> 'Cinwaanka',
-    'admin'					=> 'Admin',
+    'admin'					=> 'Dejinta maamulka',
     'admin_tooltip'			=> 'This user has admin privileges',
     'superuser'				=> 'Superuser',
     'superuser_tooltip'		=> 'This user has superuser privileges',
@@ -23,18 +23,21 @@ return [
     'asset_models'			=> 'Qaababka Hantida',
     'asset_model'			=> 'Qaabka',
     'asset'					=> 'Hantida',
+    'asset_previous'        => 'Asset (Previously Assigned)',
     'asset_report'          => 'Warbixinta Hantida',
     'asset_tag'				=> 'Hantida Tag',
     'asset_tags'            => 'Asset Tags',
     'assets_available'		=> 'Hanti la heli karo',
     'accept_assets'         => 'Aqbal hantida :name',
     'accept_assets_menu'    => 'Aqbal Hantida',
+    'accept_item'           => 'Accept Item',
     'audit'				    => 'Hantidhawrka',
+    'audits'				=> 'Audits',
     'audit_report'			=> 'Diiwaanka Hanti-dhawrka',
     'assets'				=> 'Hantida',
     'assets_audited'        => 'hantidii la baadhay',
-    'assets_checked_in_count'     => 'Hantida la hubiyay',
-    'assets_checked_out_count'     => 'Hantida la hubiyay',
+    'assets_checked_in_count'     => 'hantida la hubiyay',
+    'assets_checked_out_count'     => 'hantida la baaray',
     'asset_deleted_warning'     => 'Hantidan waa la tirtiray Waa inaad soo celisaa ka hor intaadan qof u dhiibin.',
     'assigned_date'         => 'Taariikhda loo qoondeeyay',
     'assigned_to'           => 'Loo qoondeeyay :name',
@@ -61,9 +64,12 @@ return [
     'changepassword'  		=> 'Badalida Lambarka sirta ah',
     'checkin'  				=> 'Is xaadiri',
     'checkin_from'  		=> 'Ka soo hubi',
+    'checkin_note'  		=> 'Checkin Note',
+    'checkout_note'  		=> 'Checkout Note',
     'checkout'  			=> 'Baadhid',
     'checkouts_count'       => 'Hubinta',
     'checkins_count'        => 'Hubinta',
+    'checkin_and_delete'  	=> 'Checkin and Delete',
     'user_requests_count'   => 'Codsiyada',
     'city'  				=> 'Magaalada',
     'click_here'			=> 'Riix halkan',
@@ -77,7 +83,7 @@ return [
     'consumables'			=> 'Alaabta la isticmaalo',
     'country'  				=> 'Dalka',
     'could_not_restore'     => 'Khalad soo celinta :item_type: :error',
-    'not_deleted'           => ' :item_type lama tirtirin sidaa darteed dib looma soo celin karo',
+    'not_deleted'           => 'The :item_type was not deleted and therefore cannot be restored',
     'create'				=> 'Abuur Cusub',
     'created'               => 'Shayga la sameeyay',
     'created_asset'			=> 'hanti abuuray',
@@ -86,11 +92,13 @@ return [
     'record_created' 		=> 'Diiwaanka la sameeyay',
     'updated_at' 			=> 'La cusboonaysiiyay',
     'currency'  			=> '$', // this is deprecated
+    'currency_text'  		=> 'Lacagta', //
     'current'  				=> 'Hadda',
     'current_password'      => 'Magaca Sirta Hadda',
     'customize_report'      => 'Habbee Warbixinta',
     'custom_report'         => 'Warbixinta Hantida Gaarka ah',
     'dashboard'				=> 'Dashboard-ka',
+    'data_source'           => 'Data Source',
     'days'      			=> 'maalmo',
     'days_to_next_audit'    => 'Maalmo ku xiga Hanti-dhawrka',
     'date'					=> 'Taariikhda',
@@ -98,7 +106,7 @@ return [
     'debug_warning_text'    => 'Codsigan waxa uu ku shaqaynayaa qaabka wax soo saarka iyada oo la furayo cilladaha Tani waxay soo bandhigi kartaa xogta xasaasiga ah haddii codsigaaga la heli karo adduunka ka baxsan. Dami qaabka qaladka adoo dejinaya <code>APP_DEBUG</code> qiimaha ku jira <code>.env</code> faylka <code>beenta</code>.',
     'delete'  				=> 'Tirtir',
     'delete_confirm'  		=> 'Ma hubtaa inaad rabto inaad tirtirto :item?',
-    'delete_confirm_no_undo' => 'Ma hubtaa inaad rabto inaad tirtirto :item? Tan lama celin karo',
+    'delete_confirm_no_undo' => 'Are you sure, you wish to delete :item? This cannot be undone.',
     'deleted'  				=> 'La tirtiray',
     'delete_seats'  		=> 'Kuraasta la tirtiray',
     'deletion_failed'       => 'Tirtiridda waa fashilantay',
@@ -114,29 +122,13 @@ return [
     'editprofile'  			=> 'Wax ka beddel xogtaada',
     'eol'					=> 'EOL',
     'email_domain'			=> 'Email Domain',
-    'email_format'			=> 'Qaabka iimaylka',
     'employee_number'       => 'Lambarka Shaqaalaha',
     'email_domain_help'		=> 'Tan waxa loo isticmaalaa in lagu soo saaro ciwaannada iimaylka marka la soo dejinayo',
     'error'				    => 'Khalad',
     'exclude_archived'      => 'Ka Saar Hantida Kaydsan',
     'exclude_deleted'       => 'Ka saar hantida la tirtiray',
     'example'				=> 'Tusaale: ',
-    'filastname_format'			=> 'Magaca Dambe ee Koowaad (jsmith@example.com)',
-    'firstname_lastname_format'	=> 'Magaca Hore Magaca Dambe (jane.smith@example.com)',
-    'firstname_lastname_underscore_format' => 'Magaca Hore Magaca Dambe (jane_smith@example.com)',
-    'lastnamefirstinitial_format' =>  'Magaca Dambe ee Hore (smithj@example.com)',
-    'firstintial_dot_lastname_format' => 'Magaca Dambe ee Koowaad (j.smith@example.com)',
-    'firstname_lastname_display'	=> 'Magaca Hore Magaca Dambe (Jane Smith)',
-    'lastname_firstname_display'	=> 'Magaca Dambe Magaca Hore (Smith Jane)',
-    'name_display_format'	=> 'Qaabka Muujinta Magaca',
-    'first'					=> 'Marka hore',
-    'firstnamelastname'     => 'Magaca Hore Magaca Dambe (janesmith@example.com)',
-    'lastname_firstinitial' => 'Magaca Dambe ee ugu horreeya (smith_j@example.com)',
-    'firstinitial.lastname' => 'Magaca Dambe ee Koowaad (j.smith@example.com)',
-    'firstnamelastinitial'  => 'Magaca hore ee ugu dambeeya (janes@example.com)',
-    'lastnamefirstname'      => 'Last Name First Name (smith.jane@example.com)',
-    'first_name'			=> 'Magaca koowaad',
-    'first_name_format'		=> 'Magaca koowaad (jane@example.com)',
+
     'files'                 => 'Faylasha',
     'file_name'				=> 'Faylka',
     'file_type'             => 'Nooca faylka',
@@ -156,9 +148,9 @@ return [
     'image_delete'         	=> 'Tirtir sawirka',
     'include_deleted'       => 'Ku dar Hantida la tirtiray',
     'image_upload'         	=> 'Soo rar sawirka',
-    'filetypes_accepted_help'    => 'Nooca faylka la aqbalay waa :types. Cabbirka ugu badan ee soo dejinta la oggol yahay waa :size.| Noocyada faylalka la aqbalay waa :types. Cabbirka gelinta ugu badan ee la ogolyahay waa :size.',
-    'filetypes_size_help'   => 'Cabbirka gelinta ugu badan ee la ogolyahay waa :size.',
-    'image_filetypes_help'  => 'Accepted filetypes are jpg, webp, png, gif, svg, and avif. Max upload size allowed is :size.',
+    'filetypes_accepted_help'    => 'Accepted filetype is :types. The maximum size allowed is :size.|Accepted filetypes are :types. The maximum upload size allowed is :size.',
+    'filetypes_size_help'   => 'The maximum upload size allowed is :size.',
+    'image_filetypes_help'  => 'Accepted Filetypes are jpg, webp, png, gif, svg, and avif. The maximum upload size allowed is :size.',
     'unaccepted_image_type'  => 'Sawirkan ma ahayn mid la akhriyi karo Noocyada faylalka la aqbalay waa jpg, webp, png, gif, iyo svg. Nooca faylkani waa: :mimetype.',
     'import'         	    => 'Soo dejinta',
     'import_this_file'      => 'Meelaha khariidad samee oo habee faylkan',
@@ -178,14 +170,19 @@ return [
     'last'					=> 'Dambe',
     'last_login'            => 'Gelidii u dambaysay',
     'last_name'             => 'Magaca dambe',
+    'firstname_lastname_display'	=> 'Magaca Hore Magaca Dambe (Jane Smith)',
+    'lastname_firstname_display'	=> 'Magaca Dambe Magaca Hore (Smith Jane)',
+    'name_display_format'	=> 'Qaabka Muujinta Magaca',
+    'first'					=> 'Marka hore',
+    'first_name'			=> 'Magaca koowaad',
     'license'				=> 'Shatiga',
     'license_report'        => 'Warbixinta Shatiga',
     'licenses_available'	=> 'Licenses available',
     'licenses'				=> 'Shatiyada',
     'list_all'				=> 'Liiska oo dhan',
-    'loading'				=> 'Soodejinaya...fadlan sug....',
+    'loading'				=> 'Soodejinaya...fadlan sug...',
     'lock_passwords'        => 'Qiimaha goobtan laguma kaydin doono rakibaadda demo.',
-    'feature_disabled'      => 'Sifadan waxa loo damiyay rakibaadda demo',
+    'feature_disabled'      => 'Adeegan lagama helayo ku shubitaanka tijaabada ah.',
     'location'              => 'Goobta',
     'location_plural'        => 'Location|Locations',
     'locations'				=> 'Goobaha',
@@ -193,7 +190,7 @@ return [
     'logout'				=> 'Ka bax',
     'lookup_by_tag'     => 'Ku raadi Tag Hantiyeed',
     'maintenances'          => 'Dayactirka',
-    'manage_api_keys'       => 'Maamul furayaasha API',
+    'manage_api_keys'       => 'Manage API keys',
     'manufacturer'			=> 'Soo saaraha',
     'manufacturers'			=> 'Soosaarayaasha',
     'markdown'				=> 'Goobtani waxay ogolaatay <href="https://help.github.com/articles/github-flavored-markdown/">Github summadaynta dhadhanka</a>.',
@@ -212,9 +209,17 @@ return [
     'last_audit'		    => 'Hantidhawrka u dambeeyay',
     'new'					=> 'cusub!',
     'no_depreciation'		=> 'Qiimo-dhimis ma jiro',
-    'no_results'			=> 'Natiijooyin ma jiraan',
+    'no_results'			=> 'Wax natiijo ah lama hayo.',
     'no'  					=> 'Maya',
     'notes'  				=> 'Xusuusin',
+    'note_added'            => 'Note Added',
+    'options'				=> 'Options',
+    'preview'				=> 'Preview',
+    'add_note'              => 'Add Note',
+    'note_edited'            => 'Note Edited',
+    'edit_note'              => 'Edit Note',
+    'note_deleted'            => 'Note Deleted',
+    'delete_note'              => 'Delete Note',
     'order_number'          => 'Nambarka dalbashada',
     'only_deleted'          => 'Kaliya Hantida La Tiray',
     'page_menu'				=> 'Muujinaya _MENU_ walxo',
@@ -229,7 +234,7 @@ return [
     'purchase_date'         => 'Taariikhda Iibka',
     'qty'		            => 'Qty',
     'quantity'		        => 'TIRADA',
-    'quantity_minimum'      => 'Waxaad haysataa :count shay ka hooseeya ama ku dhawaad ​​ka hooseeya heerka tirada ugu yar',
+    'quantity_minimum'      => 'You have one item below or almost below minimum quantity levels|You have :count items below or almost below minimum quantity levels',
     'quickscan_checkin'  	=> 'Baaritaanka Degdegga ah ee hubinta',
     'quickscan_checkin_status'  	=> 'Xaalada hubinta',
     'ready_to_deploy'		=> 'Diyaar u ah in la geeyo',
@@ -249,12 +254,12 @@ return [
     'request_item'          => 'Request this item',
     'external_link_tooltip' => 'External link to',
     'save'  				=> 'Badbaadin',
-    'select_var'            => 'Dooro :thing', // this will eventually replace all of our other selects
+    'select_var'            => 'Dooro :shey... ', // this will eventually replace all of our other selects
     'select'				=> 'Dooro',
     'select_all'            => 'Dhammaan dooro',
     'search'				=> 'Raadi',
     'select_category'       => 'Dooro Qayb',
-    'select_datasource' => 'Select a Datasource',
+    'select_datasource' => 'Select a data source',
     'select_department'     => 'Dooro Waax',
     'select_depreciation'	=> 'Dooro Nooca Qiima-dhaca',
     'select_location'		=> 'Dooro Goob',
@@ -274,13 +279,15 @@ return [
     'signed_off_by'         => 'Saxiixay By',
     'skin'       			=> 'Maqaarka',
     'webhook_msg_note'        => 'Ogeysiinta waxaa lagu soo diri doonaa webhook',
-    'webhook_test_msg'        => 'Oh hai! Waxay u egtahay in :app is dhexgalkaaga Snipe-IT uu shaqaynayo!',
+    'webhook_test_msg'        => 'Oh hai! It looks like your :app integration with Snipe-IT is working!',
     'some_features_disabled' => 'DEMO MODE: Astaamaha qaar ayaa naafada u ah rakibaaddan.',
     'site_name'				=> 'Magaca Goobta',
     'state'  				=> 'Gobolka',
     'status_labels'			=> 'Calaamadaha heerka',
+    'status_label'			=> 'Status Label',
     'status'    			=> 'Xaalada',
     'accept_eula'           => 'Heshiiska Ogolaanshaha',
+    'show_or_hide_eulas' => 'Show/Hide EULAs',
     'supplier'              => 'Alaab-qeybiye',
     'suppliers'  			=> 'Alaab-qeybiyeyaal',
     'sure_to_delete'        => 'Ma hubtaa inaad rabto inaad tirtirto',
@@ -296,9 +303,9 @@ return [
     'type'  				=> 'Nooca',
     'undeployable'			=> 'Aan la diri karin',
     'unknown_admin'			=> 'Admin aan la garanayn',
-    'username_format'		=> 'Qaabka magaca isticmaalaha',
     'username'              => 'Magaca isticmaale',
     'update'                => 'Cusbooneysii',
+    'updating_item' => 'Updating :item',
     'upload_filetypes_help'      => 'Noocyada faylalka la oggol yahay waa png, gif, jpg, jpeg, doc, docx, pdf, xls, xlsx, txt, lic, xml, zip, rtf iyo rar. Cabbirka gelinta ugu badan ee la ogolyahay waa :size.',
     'uploaded'              => 'La soo galiyay',
     'user'					=> 'Isticmaale',
@@ -317,16 +324,16 @@ return [
     'yes' 					=> 'HAA',
     'zip'  					=> 'Zip',
     'noimage'				=> 'Ma jiro sawir la soo geliyay ama sawir lama helin.',
-    'file_does_not_exist'   => 'Faylka la codsaday kuma jiro server-ka',
+    'file_does_not_exist'   => 'Faylka la codsaday kuma jiro server-ka.',
     'file_upload_success'   => 'Guusha soo dejinta faylka!',
     'no_files_uploaded'     => 'Guusha soo dejinta faylka!',
-    'token_expired'         => 'Fadhiga foomku wuu dhacay Fadlan isku day mar kale',
+    'token_expired'         => 'Foomkaagu wuu dhacay. Fadlan isku day markale.',
     'login_enabled'         => 'Login waa la dajiyay',
     'audit_due'             => 'Hanti-dhawrka awgeed',
-    'audit_due_days'        => 'Assets Due for Audit Within :days Day|Assets Due for Audit Within :days Days',
+    'audit_due_days'        => '{}Assets Due or Overdue for Audit|[1]Assets Due or Overdue for Audit Within a Day|[2,*]Assets Due or Overdue for Audit Within :days Days',
     'checkin_due'           => 'Due for Checkin',
     'checkin_overdue'       => 'Overdue for Checkin',
-    'checkin_due_days'      => 'Assets Due for Checkin Within :days Day|Assets Due for Checkin Within :days Days',
+    'checkin_due_days'      => '{}Due for Checkin|[1]Assets Due for Checkin Within :days Day|[2,*]Assets Due for Checkin Within :days Days',
     'audit_overdue'         => 'Dib u dhac ku yimid Hanti-dhawrka',
     'accept'                => 'Aqbal :asset',
     'i_accept'              => 'Waan aqbalay',
@@ -336,19 +343,19 @@ return [
     'clear_signature'       => 'Saxeexa Saxeexa',
     'show_help'             => 'Muuji caawimo',
     'hide_help'             => 'Qari caawimada',
-    'view_all'              => 'Daawo Dhammaan',
+    'view_all'              => 'bandhig dhamaan',
     'hide_deleted'          => 'Qari la tirtiray',
     'email'                 => 'Iimaylka',
-    'do_not_change'         => 'Ha Bedelin',
-    'bug_report'            => 'Ka warbixi cilad',
+    'do_not_change'         => 'Do not change',
+    'bug_report'            => 'Report a bug',
     'user_manual'           => 'Buugga Isticmaalaha',
     'setup_step_1'          => 'Tallaabada 1',
     'setup_step_2'          => 'Tallaabada 2',
     'setup_step_3'          => 'Tallaabada 3',
     'setup_step_4'          => 'Tallaabada 4',
     'setup_config_check'    => 'Hubinta qaabeynta',
-    'setup_create_database' => 'Samee Shaxanka Xogta',
-    'setup_create_admin'    => 'Abuur Admin User',
+    'setup_create_database' => 'Create database tables',
+    'setup_create_admin'    => 'Create an admin user',
     'setup_done'            => 'Dhammaatay!',
     'bulk_edit_about_to'    => 'Waxaad ku dhowdahay inaad wax ka beddesho kuwa soo socda: ',
     'checked_out'           => 'La Hubiyay',
@@ -382,6 +389,8 @@ return [
     'new_license'           => 'Shatiga Cusub',
     'new_accessory'         => 'Qalabka Cusub',
     'new_consumable'        => 'La Isticmaali karo Cusub',
+    'new_component'         => 'New Component',
+    'new_user'              => 'New User',
     'collapse'              => 'Burbur',
     'assigned'              => 'Loo xilsaaray',
     'asset_count'           => 'Tirada Hantida',
@@ -407,7 +416,7 @@ return [
     'checkin_tooltip' => 'Check this item in so that it is available for re-issue, re-imaging, etc',
     'checkout_user_tooltip' => 'Hubi shaygan isticmaalaha',
     'checkin_to_diff_location' => 'You can choose to check this asset in to a location other than this asset\'s default location of :default_location if one is set',
-    'maintenance_mode'      => 'Adeeggu si ku meel gaar ah uma heli karo cusboonaysiinta nidaamka. Fadlan dib u eeg hadhow',
+    'maintenance_mode'      => 'Adeegan si kumeel gaar ah looguma heli karo system cusbooneysiin. Fadlan dib u tijaabi goor dambe.',
     'maintenance_mode_title' => 'Nidaamka Si Ku Meel Gaar Ah Aan Loo Helin',
     'ldap_import'           => 'Furaha isticmaalaha waa in uusan maamulin LDAP. (Tani waxay kuu ogolaanaysaa inaad soo dirto codsiyada sirta ah ee la illoobay.)',
     'purge_not_allowed'     => 'Nadiifinta xogta la tirtiray waa la joojiyay faylka .env La xidhiidh taageerada ama maamulaha nidaamkaaga.',
@@ -416,20 +425,21 @@ return [
     'shitty_browser'        => 'Wax saxiix ah lama ogaan Haddii aad isticmaalayso browser duug ah, fadlan isticmaal browser ka casri ah si aad u dhamaystirto aqbalaadda hantidaada.',
     'bulk_soft_delete'      =>'Sidoo kale jilicsan-tirtir isticmaalayaashan. Taariikhdooda hantiyeed way ahaan doontaa ilaa aad ka nadiifiso diiwaanada la tirtiray ee goobaha maamulka.',
     'bulk_checkin_delete_success' => 'Isticmaalayaasha aad dooratay waa la tirtiray oo alaabtooda waa la hubiyay.',
-    'bulk_checkin_success' => 'Alaabta isticmaalayaasha la xushay waa la hubiyay',
-    'set_to_null'           => 'Tirtir qiyamka hantidan|Tirtir qiyamka dhammaan :asset_count hantida ',
+    'bulk_checkin_success' => 'Ashyaa\'da ay leeyihiin Useradan waa la hubiyay.',
+    'set_to_null'           => 'Delete values for this selection|Delete values for all :selection_count selections ',
     'set_users_field_to_null'  => 'Tirtir :field qiyamka isticmaalaha|Tirtir :field qiimayaasha dhammaan :user_count isticmaalayaasha ',
     'na_no_purchase_date'   => 'N/A - Taariikhda iibsi lama bixin',
     'assets_by_status'      => 'Hantida xaalka',
     'assets_by_status_type'      => 'Hantida Xaaladda Nooca',
     'pie_chart_type'        => 'Nooca Shaxda Dashboard Pie',
     'hello_name'            => 'Hello, :name!',
-    'unaccepted_profile_warning'   => 'Waxaad haysaa :count walxo u baahan aqbalid Riix halkan si aad u aqbasho ama u diido',
+    'unaccepted_profile_warning'   => 'You have one item requiring acceptance. Click here to accept or decline it | You have :count items requiring acceptance. Click here to accept or decline them',
     'start_date'            => 'Taariikhda billowga',
     'end_date'            => 'Taariikhda dhamaadka',
     'alt_uploaded_image_thumbnail' => 'La soo galiyay thumbnail',
     'placeholder_kit'       => 'Dooro qalab',
     'file_not_found'        => 'Faylka lama helin',
+    'log_record_not_found'  => 'No record for that log entry was found.',
     'preview_not_available' => '(ma jiro horudhac)',
     'setup'                 => 'Dejinta',
     'pre_flight'            => 'Duulimaadka kahor',
@@ -473,13 +483,13 @@ return [
     'importer_generic_error'    => 'Soo dejinta faylkaagu waa dhammaatay, laakiin waxa aanu helnay cilad Tan waxaa badanaa sababa qolo saddexaad oo API ah oo ka soo rogtay shabkada ogeysiinta (sida Slack) mana faragelin la\'aanta soo dejinta lafteeda, laakiin waa inaad xaqiijisaa tan.',
     'confirm' => 'Xaqiiji',
     'autoassign_licenses' => 'Si otomaatig ah u qoondee shatiyada',
-    'autoassign_licenses_help' => 'U oggolow isticmaaleha in uu haysto shatiyo loo qoondeeyay shatiga UI ama cli',
+    'autoassign_licenses_help' => 'U ogolow isticmaalahan in uu haysto shatiyo lagu asteeyay tuulka UI ama cli tools.',
     'autoassign_licenses_help_long' => 'Tani waxay u oggolaanaysaa isticmaalaha in loo qoondeeyo shatiyada loo qoondeeyey shatiga UI ama cli qalabyada. (Tusaale ahaan, waxaa laga yaabaa inaadan rabin qandaraaslayaasha in si toos ah loogu qoondeeyo shatiga aad siin lahayd xubnaha shaqaalaha oo kaliya. Wali waxaad si gaar ah u siin kartaa shatiga isticmaalayaasha, laakiin laguma dari doono shatiga hubinta ee dhammaan howlaha isticmaalayaasha.)',
     'no_autoassign_licenses_help' => 'Ha ku darin isticmaale ku meelaynta bulk-ku-meelaynta iyada oo loo marayo shatiga UI ama cli qalabyada.',
     'modal_confirm_generic'      => 'Ma hubtaa?',
     'cannot_be_deleted'      => 'Shaygan lama tirtiri karo',
     'cannot_be_edited'      => 'This item cannot be edited.',
-    'undeployable_tooltip'      => 'Shaygan lama hubin karo Hubi inta hartay',
+    'undeployable_tooltip'      => 'Suurogal maahan in la hubiyo sheygan. iska hubi inta hartay.',
     'serial_number'        => 'Nambarada taxan',
     'item_notes' => ':item Xusuusin',
     'item_name_var' => ':item Magaca',
@@ -511,7 +521,7 @@ return [
     'checked_out_to_fields' => 'Checked Out To Fields',
     'percent_complete' => '% dhamaystiran',
     'uploading' => 'Soo dejinta... ',
-    'upload_error' => 'Error uploading file. Please check that there are no empty rows and that no column names are duplicated.',
+    'upload_error' => 'Error uploading file. Please check that you have no empty rows or duplicated column names in your CSV, and that the server permissions allow uploads.',
     'copy_to_clipboard' => 'Ku koobi kara sabuuradda',
     'copied' => 'La guuriyay!',
     'status_compatibility' => 'If assets are already assigned, they cannot be changed to a non-deployable status type and this value change will be skipped.',
@@ -548,6 +558,71 @@ return [
         'license_seats'  => ':count License Seat|:count License Seats',
         'consumables'  => ':count Consumable|:count Consumables',
         'components'  => ':count Component|:count Components',
-    ]
+    ],
+
+    'more_info' => 'Macluumaad dheeraad ah',
+    'quickscan_bulk_help' => 'Checking this box will edit the asset record to reflect this new location. Leaving it unchecked will simply note the location in the audit log. Note that if this asset is checked out, it will not change the location of the person, asset or location it is checked out to.',
+    'whoops' => 'Whoops!',
+    'something_went_wrong' => 'Something went wrong with your request.',
+    'close' => 'Close',
+    'expires' => 'Dhacaya',
+    'map_fields'=> 'Map :item_type Fields',
+    'remaining_var' => ':count Remaining',
+    'label' => 'Label',
+    'import_asset_tag_exists' => 'An asset with the asset tag :asset_tag already exists and an update was not requested. No change was made.',
+    'countries_manually_entered_help' => 'Values with an asterisk (*) were manually entered and do not match existing ISO 3166 dropdown values',
+    'accessories_assigned' => 'Assigned Accessories',
+    'user_managed_passwords' => 'Password Management',
+    'user_managed_passwords_disallow' => 'Disallow users from managing their own passwords',
+    'user_managed_passwords_allow' => 'Allow users to manage their own passwords',
+    'from' => 'From',
+    'by' => 'Loo marayo',
+
+// Add form placeholders here
+    'placeholders' => [
+        'notes'  => 'Add a note',
+    ],
+
+    'breadcrumb_button_actions' => [
+        'edit_item' => 'Edit :name',
+        'checkout_item' => 'Checkout :name',
+        'checkin_item' => 'Checkin :name',
+    ],
+
+    'skins' => [
+        'site_default' => 'Site Default',
+        'default_blue' => 'Default Blue',
+        'blue_dark' => 'Blue (Dark Mode)',
+        'green' => 'Green Dark',
+        'green_dark' => 'Green (Dark Mode)',
+        'red' => 'Red Dark',
+        'red_dark' => 'Red (Dark Mode)',
+        'orange' => 'Orange Dark',
+        'orange_dark' => 'Orange (Dark Mode)',
+        'black' => 'Black',
+        'black_dark' => 'Black (Dark Mode)',
+        'purple' => 'Purple',
+        'purple_dark' => 'Purple (Dark Mode)',
+        'yellow' => 'Yellow',
+        'yellow_dark' => 'Yellow (Dark Mode)',
+        'high_contrast' => 'High Contrast',
+
+    ],
+
+    'select_all_none' => 'Select/Unselect All',
+    'generic_model_not_found' => 'That :model was not found or you do not have permission to access it',
+    'deleted_models' => 'Deleted Asset Models',
+    'deleted_users' => 'Deleted Users',
+    'cost_each' => ':amount each',
+    'remove_current_image' => 'Remove current :type image',
+
+    'seeding' => [
+        'manufacturers' => [
+            'button' => 'Create Manufacturers',
+            'prompt' => 'You do not have any manufacturers yet. Would you like to seed a list of common manufacturers? (THIS WILL OVERWRITE EXISTING MANUFACTURERS, including those that have been soft-deleted.)',
+            'success' => 'Manufacturers seeded successfully',
+            'error' => 'Could not seed manufacturers. A manufacturer record already exists and seeding would overwrite it.|Could not seed manufacturers. :count manufacturer records already exist and seeding would overwrite them.',
+        ],
+    ],
 
 ];
diff --git a/resources/lang/so-SO/help.php b/resources/lang/so-SO/help.php
index b665ff3c8a..c9bc31992a 100644
--- a/resources/lang/so-SO/help.php
+++ b/resources/lang/so-SO/help.php
@@ -15,7 +15,7 @@ return [
 
     'more_info_title' => 'Macluumaad dheeraad ah',
 
-    'audit_help' => 'Saxeexinta sanduuqan waxay wax ka beddeli doontaa diiwaanka hantida si ay u muujiso goobtan cusub. Ka tagista iyada oo aan la hubin waxay si fudud u ogaan doontaa meesha ku jirta diiwaanka hanti dhawrka.<br><',
+    'audit_help' => 'Wuxuu keeni doonaa in la xadido sanduuqan isbedel ku yimaada ra\'samaalka taasoo laga dareemi doono booska cusub. inaan la xadidinna waxay keeneysaa in laga mulaaxadeeyo liiska hubinta. <br><br>ogow haddii laga baxo ra\'samaalka waxba iskama bedeli doono booska qofka ama hantida ama booska laga baxay.',
 
     'assets' => 'Hantidu waa shay lagu raadraaco lambar taxane ah ama sumad hanti ah. Waxay u muuqdaan inay yihiin shay qiimo sare leh marka la aqoonsanayo shay gaar ah.',
 
diff --git a/resources/lang/so-SO/localizations.php b/resources/lang/so-SO/localizations.php
index 79f6d2a1b3..cdfbe37717 100644
--- a/resources/lang/so-SO/localizations.php
+++ b/resources/lang/so-SO/localizations.php
@@ -2,7 +2,7 @@
 
 return [
 
-    'select_language' => 'Dooro luqad',
+    'select_language' => 'Select a Language',
     'languages' => [
         'en-US'=> 'Ingiriis, US',
         'en-GB'=> 'Ingiriis, UK',
@@ -40,7 +40,9 @@ return [
         'ms-MY'=> 'Malaay',
         'mi-NZ'=> 'Maori',
         'mn-MN'=> 'Mongoliyaan',
-        'no-NO'=> 'Noorwiiji',
+        'nb-NO'=> 'Norwegian Bokmål',
+        'om-ET' => 'Oromo (Ethiopian)',
+        //'nn-NO'=> 'Norwegian Nynorsk',
         'fa-IR'=> 'Faaris',
         'pl-PL'=> 'Boolish',
         'pt-PT'=> 'Boortaqiis',
@@ -66,7 +68,7 @@ return [
         'zu-ZA'=> 'Zulu',
     ],
 
-    'select_country' => 'Dal dooro',
+    'select_country' => 'Select a Country',
     
     'countries' => [
         'AC'=>'Jasiiradda Ascension',
@@ -107,7 +109,7 @@ return [
         'BY'=>'Belarus',
         'BZ'=>'Belize',
         'CA'=>'Kanada',
-        'CC'=>'Jasiiradaha Cocos (Keeling).',
+        'CC'=>'Jasiiradaha Cocos (Keeling)',
         'CD'=>'Kongo (Jamhuuriyadda Dimuqraadiga ah)',
         'CF'=>'Jamhuuriyadda Afrikada Dhexe',
         'CG'=>'Kongo (Jamhuuriyadda)',
@@ -133,6 +135,7 @@ return [
         'EC'=>'Ecuador',
         'EE'=>'Estonia',
         'EG'=>'Masar',
+        'GB-ENG'=>'England',
         'ER'=>'Eritrea',
         'ES'=>'Isbayn',
         'ET'=>'Itoobiya',
@@ -201,7 +204,7 @@ return [
         'LT'=>'Lithuania',
         'LU'=>'Luxembourg',
         'LV'=>'Latfiya',
-        'LY'=>'Liibiya Carab Jaamaca',
+        'LY'=>'Liibiya',
         'MA'=>'Morocco',
         'MC'=>'Monaco',
         'MD'=>'Moldova, Jamhuuriyadda',
@@ -231,6 +234,7 @@ return [
         'NG'=>'Nigeria',
         'NI'=>'Nicaragua',
         'NL'=>'Nederlaan',
+        'GB-NIR' => 'Northern Ireland',
         'NO'=>'Norway',
         'NP'=>'Nepal',
         'NR'=>'Nauru',
@@ -258,7 +262,7 @@ return [
         'RU'=>'Xiriirka Ruushka',
         'RW'=>'Rwanda',
         'SA'=>'Sacuudi Carabiya',
-        'UK'=>'Scotland',
+        'GB-SCT'=>'Scotland',
         'SB'=>'Solomon Islands',
         'SC'=>'Seychelles',
         'SS'=>'Koonfurta Suudaan',
@@ -310,6 +314,7 @@ return [
         'VI'=>'Jasiiradaha Virgin (US)',
         'VN'=>'Fiitnaam',
         'VU'=>'Vanuatu',
+        'GB-WLS' =>'Wales',
         'WF'=>'Wallis iyo Futuna Islands',
         'WS'=>'Samoa',
         'YE'=>'Yemen',
diff --git a/resources/lang/so-SO/mail.php b/resources/lang/so-SO/mail.php
index 1c15875506..0b2463506d 100644
--- a/resources/lang/so-SO/mail.php
+++ b/resources/lang/so-SO/mail.php
@@ -17,30 +17,31 @@ return [
     'Expected_Checkin_Date' => 'Hantida lagugu hubiyay waa in lagugu soo celiyaa :date',
     'Expected_Checkin_Notification' => 'Xusuusin: :name wakhtiga kama dambaysta ah ee hubinta ayaa soo dhow',
     'Expected_Checkin_Report' => 'Warbixinta hubinta hantida la filayo',
-    'Expiring_Assets_Report' => 'Warbixinta Hantida Dhacaysa',
-    'Expiring_Licenses_Report' => 'Warbixinta Shatiyada Dhacaya',
+    'Expiring_Assets_Report' => 'Warbixinta hantida dhaceysa.',
+    'Expiring_Licenses_Report' => 'Warbixinta Shatiyada dhacaya.',
     'Item_Request_Canceled' => 'Codsiga shayga waa la joojiyay',
     'Item_Requested' => 'Shayga la codsaday',
     'License_Checkin_Notification' => 'Shatiga waa la hubiyay',
     'License_Checkout_Notification' => 'License checked out',
+    'license_for'   => 'License for',
     'Low_Inventory_Report' => 'Warbixinta Alaabada Hoose',
     'a_user_canceled' => 'Isticmaaluhu waxa uu joojiyay shay codsi ah oo ku jiray mareegaha',
     'a_user_requested' => 'Isticmaaluhu wuxuu ka codsaday shay shabakada',
     'acceptance_asset_accepted' => 'Isticmaaluhu waa aqbalay shay',
     'acceptance_asset_declined' => 'Isticmaaluhu waa diiday shay',
-    'accessory_name' => 'Magaca Agabka:',
-    'additional_notes' => 'Qoraalo Dheeraad ah:',
-    'admin_has_created' => 'Maamule ayaa akoon kaaga sameeyay :web mareegaha',
-    'asset' => 'Hantida:',
-    'asset_name' => 'Magaca Hantida:',
+    'accessory_name' => 'Magaca dheeriga ah',
+    'additional_notes' => 'Qoraalo Dheeraad ah',
+    'admin_has_created' => 'Maamule ayaa akoon kaaga sameeyay :web website.',
+    'asset' => 'Hantida',
+    'asset_name' => 'Magaca Hantida',
     'asset_requested' => 'Hantida la codsaday',
     'asset_tag' => 'Hantida Tag',
     'assets_warrantee_alert' => 'There is :count asset with a warranty expiring in the next :threshold days.|There are :count assets with warranties expiring in the next :threshold days.',
     'assigned_to' => 'Loo xilsaaray',
-    'best_regards' => 'Salaan wanagsan',
-    'canceled' => 'La joojiyay:',
-    'checkin_date' => 'Taariikhda la soo galayo:',
-    'checkout_date' => 'Taariikhda Bixinta:',
+    'best_regards' => 'Salaan wanagsan,',
+    'canceled' => 'La joojiyay',
+    'checkin_date' => 'Taariikhda la soo galayo',
+    'checkout_date' => 'Taariikhda Bixinta',
     'checkedout_from' => 'Checked out from',
     'checkedin_from'  => 'Laga soo hubiyay',
     'checked_into' => 'Checked into',
@@ -49,30 +50,33 @@ return [
     'click_to_confirm' => 'Fadlan dhagsii xidhiidhka soo socda si aad u xaqiijiso :web akoonkaaga:',
     'current_QTY' => 'QTY-da hadda',
     'days' => 'Maalmo',
-    'expecting_checkin_date' => 'Taariikhda la filayo:',
+    'expecting_checkin_date' => 'Taariikhda la filayo',
     'expires' => 'Dhacaya',
     'hello' => 'Hello',
     'hi' => 'Hi',
     'i_have_read' => 'Waan akhriyay oo waan aqbalay shuruudaha isticmaalka, waxaana helay shaygan.',
     'inventory_report' => 'Warbixinta Alaabada',
-    'item' => 'Shayga:',
+    'item' => 'Shayga',
+    'item_checked_reminder' => 'This is a reminder that you currently have :count items checked out to you that you have not accepted or declined. Please click the link below to confirm your decision.',
     'license_expiring_alert' => 'There is :count license expiring in the next :threshold days.|There are :count licenses expiring in the next :threshold days.',
     'link_to_update_password' => 'Fadlan dhagsii xidhiidhka soo socda si aad u cusboonaysiiso :web eraygaaga sirta ah:',
-    'login' => 'Soo gal:',
+    'login' => 'Soo gal',
     'login_first_admin' => 'Soo gal rakibaaddaada cusub ee Snipe-IT adoo isticmaalaya aqoonsiga hoose:',
     'low_inventory_alert' => 'There is :count item that is below minimum inventory or will soon be low.|There are :count items that are below minimum inventory or will soon be low.',
     'min_QTY' => 'Min QTY',
     'name' => 'Magaca',
     'new_item_checked' => 'Shay cusub ayaa lagu hubiyay magacaaga hoostiisa.',
+    'new_item_checked_with_acceptance' => 'A new item has been checked out under your name that requires acceptance, details are below.',
+    'recent_item_checked' => 'An item was recently checked out under your name that requires acceptance, details are below.',
     'notes' => 'Xusuusin',
-    'password' => 'Furaha sirta ah:',
+    'password' => 'Password-ka',
     'password_reset' => 'Dib u habaynta erayga sirta ah',
-    'read_the_terms' => 'Fadlan hoos ka akhri shuruudaha isticmaalka',
+    'read_the_terms' => 'Fadlan hoos ka akhri shuruudaha isticmaalka.',
     'read_the_terms_and_click' => 'Please read the terms of use below, and click on the link at the bottom to confirm that you read and agree to the terms of use, and have received the asset.',
-    'requested' => 'La codsaday:',
+    'requested' => 'La codsaday',
     'reset_link' => 'Xidhiidhka Dib-u-dejinta Furahaaga',
     'reset_password' => 'Riix halkan si aad dib ugu dejiso eraygaaga sirta ah:',
-    'rights_reserved' => 'Dhammaan xuquuqaha way xifdiyeen',
+    'rights_reserved' => 'Dhammaan xuquuqda waa la dhowray.',
     'serial' => 'Taxane',
     'snipe_webhook_test' => 'Snipe-IT Integration Test',
     'snipe_webhook_summary' => 'Snipe-IT Integration Test Summary',
@@ -86,8 +90,10 @@ return [
     'upcoming-audits' => 'There is :count asset that is coming up for audit within :threshold days.|There are :count assets that are coming up for audit within :threshold days.',
     'user' => 'Isticmaale',
     'username' => 'Magaca isticmaale',
+    'unaccepted_asset_reminder' => 'Reminder: You have Unaccepted Assets.',
     'welcome' => 'Soo dhawoow :name',
     'welcome_to' => 'Ku soo dhawoow :web!',
     'your_assets' => 'Arag Hantidaada',
     'your_credentials' => 'Aqoonsigaaga Snipe-IT',
+    'mail_sent' => 'Mail sent successfully!',
 ];
diff --git a/resources/lang/so-SO/table.php b/resources/lang/so-SO/table.php
index 7112144ecf..6824ba00ac 100644
--- a/resources/lang/so-SO/table.php
+++ b/resources/lang/so-SO/table.php
@@ -4,7 +4,7 @@ return array(
 
     'actions'	 	        => 'Ficilada',
     'action' 		        => 'Ficil',
-    'by'      		        => 'By',
+    'by'      		        => 'Loo marayo',
     'item' 			        => 'Shayga',
     'no_matching_records'   => 'No matching records found',
 
diff --git a/resources/lang/so-SO/validation.php b/resources/lang/so-SO/validation.php
index aee37fac3d..dbc4c46d61 100644
--- a/resources/lang/so-SO/validation.php
+++ b/resources/lang/so-SO/validation.php
@@ -13,100 +13,166 @@ return [
     |
     */
 
-    'accepted'             => ' :attribute waa in la aqbalaa',
-    'active_url'           => ' :attribute ku maaha URL sax ah.',
-    'after'                => ' :attribute ku waa inuu noqdaa taariikh ka dambaysa :date.',
-    'after_or_equal'       => ' :attribute ku waa inuu noqdaa taariikh ka dambaysa ama la mid ah :date.',
-    'alpha'                => ' :attribute waxa ku jiri kara xarfo kaliya',
-    'alpha_dash'           => ' :attribute ku waxa uu ka koobnaan karaa xarfo, tirooyin, iyo jajab.',
-    'alpha_num'            => ' :attribute ku waxa uu ka koobnaan karaa xarfo iyo tirooyin keliya.',
-    'array'                => ' :attribute ku waa inuu noqdaa hannaan',
-    'before'               => ' :attribute ku waa inuu ahaadaa taariikh ka horeysa :date.',
-    'before_or_equal'      => ' :attribute ku waa inuu ahaadaa taariikh ka horeysa ama la mid ah :date.',
-    'between'              => [
-        'numeric' => ' :attribute ku waa inuu u dhexeeyaa :min - :max.',
-        'file'    => ' :attribute ku waa inuu u dhexeeyaa :min - :max kilobytes.',
-        'string'  => ' :attribute ku waa inuu u dhexeeyaa :min - :max xaraf.',
-        'array'   => ' :attribute ku waa inuu lahaadaa inta u dhaxaysa :min iyo :max shay.',
+    'accepted' => 'The :attribute field must be accepted.',
+    'accepted_if' => 'The :attribute field must be accepted when :other is :value.',
+    'active_url' => 'The :attribute field must be a valid URL.',
+    'after' => 'The :attribute field must be a date after :date.',
+    'after_or_equal' => 'The :attribute field must be a date after or equal to :date.',
+    'alpha' => 'The :attribute field must only contain letters.',
+    'alpha_dash' => 'The :attribute field must only contain letters, numbers, dashes, and underscores.',
+    'alpha_num' => 'The :attribute field must only contain letters and numbers.',
+    'array' => 'The :attribute field must be an array.',
+    'ascii' => 'The :attribute field must only contain single-byte alphanumeric characters and symbols.',
+    'before' => 'The :attribute field must be a date before :date.',
+    'before_or_equal' => 'The :attribute field must be a date before or equal to :date.',
+    'between' => [
+        'array' => 'The :attribute field must have between :min and :max items.',
+        'file' => 'The :attribute field must be between :min and :max kilobytes.',
+        'numeric' => 'The :attribute field must be between :min and :max.',
+        'string' => 'The :attribute field must be between :min and :max characters.',
     ],
-    'boolean'              => ' :attribute ku waa inuu run yahay ama been yahay.',
-    'confirmed'            => 'Xaqiijinta :attribute kuma habboona',
-    'date'                 => ' :attribute maaha taariikh ansax ah.',
-    'date_format'          => ' :attribute ku kuma habboona qaabka :format.',
-    'different'            => ' :attribute iyo :other waa inay kala duwanaadaan.',
-    'digits'               => ' :attribute ku waa inuu noqdaa :digits lambar',
-    'digits_between'       => ' :attribute ku waa inuu u dhexeeyaa :min iyo :max lambar',
-    'dimensions'           => ' :attribute ku wuxuu leeyahay cabbir sawireed aan sax ahayn.',
-    'distinct'             => 'Goobta :attribute waxay leedahay qiime nuqul ah',
-    'email'                => 'Qaabka :attribute waa mid aan sax ahayn',
-    'exists'               => 'Xulashada :attribute waa mid aan sax ahayn.',
-    'file'                 => ' :attribute ku waa inuu noqdaa fayl',
-    'filled'               => 'Goobta :attribute waa in ay leedahay qiimo.',
-    'image'                => ' :attribute ku waa inuu noqdaa sawir',
+    'boolean' => 'The :attribute field must be true or false.',
+    'can' => 'The :attribute field contains an unauthorized value.',
+    'confirmed' => 'The :attribute field confirmation does not match.',
+    'contains' => 'The :attribute field is missing a required value.',
+    'current_password' => 'The password is incorrect.',
+    'date' => 'The :attribute field must be a valid date.',
+    'date_equals' => 'The :attribute field must be a date equal to :date.',
+    'date_format' => 'The :attribute field must match the format :format.',
+    'decimal' => 'The :attribute field must have :decimal decimal places.',
+    'declined' => 'The :attribute field must be declined.',
+    'declined_if' => 'The :attribute field must be declined when :other is :value.',
+    'different' => 'The :attribute field and :other must be different.',
+    'digits' => 'The :attribute field must be :digits digits.',
+    'digits_between' => 'The :attribute field must be between :min and :max digits.',
+    'dimensions' => 'The :attribute field has invalid image dimensions.',
+    'distinct' => 'Sumadda :astaanta waxay leedahay qiime labo jibaaran.',
+    'doesnt_end_with' => 'The :attribute field must not end with one of the following: :values.',
+    'doesnt_start_with' => 'The :attribute field must not start with one of the following: :values.',
+    'email' => 'The :attribute field must be a valid email address.',
+    'ends_with' => 'The :attribute field must end with one of the following: :values.',
+    'enum' => 'Xulashada :attribute waa mid aan sax ahayn.',
+    'exists' => 'Xulashada :attribute waa mid aan sax ahayn.',
+    'extensions' => 'The :attribute field must have one of the following extensions: :values.',
+    'file' => 'The :attribute field must be a file.',
+    'filled' => 'Goobta :attribute waa in ay leedahay qiimo.',
+    'gt' => [
+        'array' => 'The :attribute field must have more than :value items.',
+        'file' => 'The :attribute field must be greater than :value kilobytes.',
+        'numeric' => 'The :attribute field must be greater than :value.',
+        'string' => 'The :attribute field must be greater than :value characters.',
+    ],
+    'gte' => [
+        'array' => 'The :attribute field must have :value items or more.',
+        'file' => 'The :attribute field must be greater than or equal to :value kilobytes.',
+        'numeric' => 'The :attribute field must be greater than or equal to :value.',
+        'string' => 'The :attribute field must be greater than or equal to :value characters.',
+    ],
+    'hex_color' => 'The :attribute field must be a valid hexadecimal color.',
+    'image' => 'The :attribute field must be an image.',
     'import_field_empty'    => 'Qiimaha :fieldname ma noqon karo waxba.',
-    'in'                   => 'Xulashada :attribute waa mid aan sax ahayn.',
-    'in_array'             => 'Goobta :attribute kuma jirto gudaha :other.',
-    'integer'              => ' :attribute ku waa inuu noqdaa tiro',
-    'ip'                   => ' :attribute ku waa inuu noqdaa ciwaanka IP sax ah',
-    'ipv4'                 => ' :attribute ku waa inuu noqdaa ciwaanka IPv4 ansax ah.',
-    'ipv6'                 => ' :attribute ku waa inuu noqdaa ciwaanka IPv6 ansax ah.',
-    'is_unique_department' => ' :attribute ku waa inuu noqdaa mid u gaar ah Goobta Shirkadda',
-    'json'                 => ' :attribute ku waa inuu noqdaa xadhig JSON sax ah.',
-    'max'                  => [
-        'numeric' => ' :attribute waxaa laga yaabaa inuusan ka weyneyn :max.',
-        'file'    => ' :attribute waxa laga yaabaa in aanu ka badnayn :max kilobytes.',
-        'string'  => ' :attribute waxa laga yaabaa in aanu ka badnayn :max xaraf',
-        'array'   => ' :attribute waxa laga yaabaa in aanu ka badnayn :max shay.',
+    'in' => 'Xulashada :attribute waa mid aan sax ahayn.',
+    'in_array' => 'The :attribute field must exist in :other.',
+    'integer' => 'The :attribute field must be an integer.',
+    'ip' => 'The :attribute field must be a valid IP address.',
+    'ipv4' => 'The :attribute field must be a valid IPv4 address.',
+    'ipv6' => 'The :attribute field must be a valid IPv6 address.',
+    'json' => 'The :attribute field must be a valid JSON string.',
+    'list' => 'The :attribute field must be a list.',
+    'lowercase' => 'The :attribute field must be lowercase.',
+    'lt' => [
+        'array' => 'The :attribute field must have less than :value items.',
+        'file' => 'The :attribute field must be less than :value kilobytes.',
+        'numeric' => 'The :attribute field must be less than :value.',
+        'string' => 'The :attribute field must be less than :value characters.',
     ],
-    'mimes'                => ' :attribute ku waa inuu noqdaa fayl nooca: :values.',
-    'mimetypes'            => ' :attribute ku waa inuu noqdaa fayl nooca: :values.',
-    'min'                  => [
-        'numeric' => ' :attribute ku waa inuu ahaadaa ugu yaraan :min.',
-        'file'    => ' :attribute ku waa inuu ahaadaa ugu yaraan :min kilobytes.',
-        'string'  => ' :attribute ku waa inuu noqdaa ugu yaraan :min xaraf',
-        'array'   => ' :attribute ku waa inuu lahaadaa ugu yaraan :min walxood.',
+    'lte' => [
+        'array' => 'The :attribute field must not have more than :value items.',
+        'file' => 'The :attribute field must be less than or equal to :value kilobytes.',
+        'numeric' => 'The :attribute field must be less than or equal to :value.',
+        'string' => 'The :attribute field must be less than or equal to :value characters.',
     ],
-    'starts_with'          => ' :attribute ku waa inuu ku bilaabmaa mid ka mid ah kuwan soo socda: :values.',
-    'ends_with'            => ' :attribute ku waa inuu ku dhamaadaa mid ka mid ah kuwan soo socda: :values.',
+    'mac_address' => 'The :attribute field must be a valid MAC address.',
+    'max' => [
+        'array' => 'The :attribute field must not have more than :max items.',
+        'file' => 'The :attribute field must not be greater than :max kilobytes.',
+        'numeric' => 'The :attribute field must not be greater than :max.',
+        'string' => 'The :attribute field must not be greater than :max characters.',
+    ],
+    'max_digits' => 'The :attribute field must not have more than :max digits.',
+    'mimes' => 'The :attribute field must be a file of type: :values.',
+    'mimetypes' => 'The :attribute field must be a file of type: :values.',
+    'min' => [
+        'array' => 'The :attribute field must have at least :min items.',
+        'file' => 'The :attribute field must be at least :min kilobytes.',
+        'numeric' => 'The :attribute field must be at least :min.',
+        'string' => 'The :attribute field must be at least :min characters.',
+    ],
+    'min_digits' => 'The :attribute field must have at least :min digits.',
+    'missing' => 'The :attribute field must be missing.',
+    'missing_if' => 'The :attribute field must be missing when :other is :value.',
+    'missing_unless' => 'The :attribute field must be missing unless :other is :value.',
+    'missing_with' => 'The :attribute field must be missing when :values is present.',
+    'missing_with_all' => 'The :attribute field must be missing when :values are present.',
+    'multiple_of' => 'The :attribute field must be a multiple of :value.',
+    'not_in' => 'Xulashada :attribute waa mid aan sax ahayn.',
+    'not_regex' => 'The :attribute field format is invalid.',
+    'numeric' => 'The :attribute field must be a number.',
+    'password' => [
+        'letters' => 'The :attribute field must contain at least one letter.',
+        'mixed' => 'The :attribute field must contain at least one uppercase and one lowercase letter.',
+        'numbers' => 'The :attribute field must contain at least one number.',
+        'symbols' => 'The :attribute field must contain at least one symbol.',
+        'uncompromised' => 'The given :attribute has appeared in a data leak. Please choose a different :attribute.',
+    ],
+    'percent'       => 'The depreciation minimum must be between 0 and 100 when depreciation type is percentage.',
 
-    'not_in'               => 'Xulashada :attribute waa mid aan sax ahayn.',
-    'numeric'              => ' :attribute ku waa inuu noqdaa tiro',
-    'present'              => 'Goobta :attribute waa inay jirtaa',
-    'valid_regex'          => 'Taasi ma aha regex sax ah. ',
-    'regex'                => 'Qaabka :attribute waa mid aan sax ahayn',
-    'required'             => 'Goobta :attribute waa loo baahan yahay',
-    'required_if'          => 'Goobta :attribute ayaa loo baahan yahay marka :other uu yahay :value.',
-    'required_unless'      => 'Goobta :attribute waa loo baahan yahay ilaa :other ku jiro :values.',
-    'required_with'        => 'Goobta :attribute ayaa loo baahan yahay marka :values uu joogo.',
-    'required_with_all'    => 'Goobta :attribute ayaa loo baahan yahay marka :values uu joogo.',
-    'required_without'     => 'Goobta :attribute ayaa loo baahan yahay marka :values aanu joogin.',
+    'present' => 'Sumadda :astaanta liiska waa iney goobjoog ahaataa.',
+    'present_if' => 'The :attribute field must be present when :other is :value.',
+    'present_unless' => 'The :attribute field must be present unless :other is :value.',
+    'present_with' => 'The :attribute field must be present when :values is present.',
+    'present_with_all' => 'The :attribute field must be present when :values are present.',
+    'prohibited' => 'The :attribute field is prohibited.',
+    'prohibited_if' => 'The :attribute field is prohibited when :other is :value.',
+    'prohibited_unless' => 'The :attribute field is prohibited unless :other is in :values.',
+    'prohibits' => 'The :attribute field prohibits :other from being present.',
+    'regex' => 'The :attribute field format is invalid.',
+    'required' => 'Sumadda :astaanta liiska waa loo baahan yahay.',
+    'required_array_keys' => 'The :attribute field must contain entries for: :values.',
+    'required_if' => 'Goobta :attribute ayaa loo baahan yahay marka :other uu yahay :value.',
+    'required_if_accepted' => 'The :attribute field is required when :other is accepted.',
+    'required_if_declined' => 'The :attribute field is required when :other is declined.',
+    'required_unless' => 'Goobta :attribute waa loo baahan yahay ilaa :other ku jiro :values.',
+    'required_with' => 'Goobta :attribute ayaa loo baahan yahay marka :values uu joogo.',
+    'required_with_all' => 'The :attribute field is required when :values are present.',
+    'required_without' => 'Goobta :attribute ayaa loo baahan yahay marka :values aanu joogin.',
     'required_without_all' => 'Goobta :attribute ayaa loo baahan yahay marka midna :values aanu joogin.',
-    'same'                 => ' :attribute iyo :other waa inay iswaafaqaan',
-    'size'                 => [
-        'numeric' => ' :attribute ku waa inuu ahaadaa :size.',
-        'file'    => ' :attribute ku waa inuu ahaadaa :size kilobytes.',
-        'string'  => ' :attribute ku waa inuu noqdaa :size xaraf',
-        'array'   => ' :attribute ku waa inuu ka kooban yahay :size walxood.',
+    'same' => 'The :attribute field must match :other.',
+    'size' => [
+        'array' => 'The :attribute field must contain :size items.',
+        'file' => 'The :attribute field must be :size kilobytes.',
+        'numeric' => 'The :attribute field must be :size.',
+        'string' => 'The :attribute field must be :size characters.',
     ],
-    'string'               => ' :attribute ku waa inuu noqdaa xadhig',
-    'timezone'             => ' :attribute ku waa inuu noqdaa aag ansax ah.',
-    'two_column_unique_undeleted' => 'The :attribute must be unique across :table1 and :table2. ',
-    'unique'               => ' :attribute waa la qaatay mar hore',
-    'uploaded'             => ' :attribute ku wuu ku guul daraystay inuu soo geliyo',
-    'url'                  => 'Qaabka :attribute waa mid aan sax ahayn',
-    'unique_undeleted'     => ' :attribute ku waa inuu noqdaa mid gaar ah',
-    'non_circular'         => ' :attribute waa inaanu samayn tixraac wareeg ah.',
-    'not_array'            => ':attribute cannot be an array.',
-    'disallow_same_pwd_as_user_fields' => 'Password ma la mid noqon karo magaca isticmaalaha',
+    'starts_with' => 'The :attribute field must start with one of the following: :values.',
+    'string'               => 'Sumadda :astaanta waa iney noqoto silsilad.',
+    'two_column_unique_undeleted' => 'Waa iney :noqotaa qeybtan mid fariid ah :jadwal1 and :jadwal2. ',
+    'unique_undeleted'     => 'Sumadda :astaanta waa iney ahaataa mid gaar ah.',
+    'non_circular'         => 'Sumadda :astaanta waa ineysan abuurin tixraac wareeg ah.',
+    'not_array'            => ':suurogal maahan iney saf noqoto.',
+    'disallow_same_pwd_as_user_fields' => 'Password-ku lama mid noqon karo magaca user-ka.',
     'letters'              => 'Furaha waa in uu ka kooban yahay ugu yaraan hal xaraf.',
     'numbers'              => 'Furaha waa in uu ka kooban yahay ugu yaraan hal lambar.',
     'case_diff'            => 'Furaha waa in uu isticmaalo kiis isku dhafan.',
     'symbols'              => 'Erayga sirta ah waa inuu ka kooban yahay calaamado.',
-    'gte'                  => [
-        'numeric'          => 'Qiimuhu ma noqon karo mid xun'
-    ],
-    'checkboxes'           => ':attribute contains invalid options.',
-    'radio_buttons'        => ':attribute is invalid.',
+    'timezone' => 'The :attribute field must be a valid timezone.',
+    'unique' => 'Sumadda :astaanta waxaa la qaatay mar hore.',
+    'uploaded' => 'Sumadda :astaanta waa lagu guul dareystay in lasoo rafciyo.',
+    'uppercase' => 'The :attribute field must be uppercase.',
+    'url' => 'The :attribute field must be a valid URL.',
+    'ulid' => 'The :attribute field must be a valid ULID.',
+    'uuid' => 'The :attribute field must be a valid UUID.',
+    'fmcs_location' => 'Full multiple company support and location scoping is enabled in the Admin Settings, and the selected location and selected company are not compatible.',
 
 
     /*
@@ -120,26 +186,38 @@ return [
     |
     */
 
+    'email_array'      => 'Hal ama ka badan ciwaanka iimaylka waa mid aan shaqayn.',
+    'checkboxes'           => ':attribute contains invalid options.',
+    'radio_buttons'        => ':attribute is invalid.',
+    
     'custom' => [
         'alpha_space' => 'Goobta :attribute waxay ka kooban tahay xarfo aan la oggolayn.',
-        'email_array'      => 'Hal ama ka badan ciwaanka iimaylka waa mid aan shaqayn.',
+
         'hashed_pass'      => 'Eraygaaga hadda jira waa khalad',
         'dumbpwd'          => 'Furahaas aad buu u badan yahay.',
         'statuslabel_type' => 'Waa inaad doorataa nooca summada heerka ansax ah',
+        'custom_field_not_found'          => 'This field does not seem to exist, please double check your custom field names.',
+        'custom_field_not_found_on_model' => 'This field seems to exist, but is not available on this Asset Model\'s fieldset.',
 
         // date_format validation with slightly less stupid messages. It duplicates a lot, but it gets the job done :(
-        // We use this because the default error message for date_format is reflects php Y-m-d, which non-PHP
-        // people won't know how to format. 
-        'purchase_date.date_format'     => ' :attribute ku waa inuu ahaado taariikh ansax ah oo qaabaysan YYY-MM-DD',
-        'last_audit_date.date_format'   =>  ' :attribute ku waa inuu ahaado taariikh ansax ah oo qaabaysan YYY-MM-DD hh:mm:ss ',
-        'expiration_date.date_format'   =>  ' :attribute ku waa inuu ahaado taariikh ansax ah oo qaabaysan YYY-MM-DD',
-        'termination_date.date_format'  =>  ' :attribute ku waa inuu ahaado taariikh ansax ah oo qaabaysan YYY-MM-DD',
-        'expected_checkin.date_format'  =>  ' :attribute ku waa inuu ahaado taariikh ansax ah oo qaabaysan YYY-MM-DD',
-        'start_date.date_format'        =>  ' :attribute ku waa inuu ahaado taariikh ansax ah oo qaabaysan YYY-MM-DD',
-        'end_date.date_format'          =>  ' :attribute ku waa inuu ahaado taariikh ansax ah oo qaabaysan YYY-MM-DD',
+        // We use this because the default error message for date_format reflects php Y-m-d, which non-PHP
+        // people won't know how to format.
+        'purchase_date.date_format'     => 'Sumadda :astaanta waa inuu ahaado taariikh saxan oo u qaabeysan YYY-MM-DD',
+        'last_audit_date.date_format'   =>  'Sumadda :astaanta waa iney ahaato taariikh saxan oo u qaabeysan hannaanka YYY-MM-DD hh:mm:ss',
+        'expiration_date.date_format'   =>  'Sumadda :astaanta waa iney ahaato taariikh saxan oo u qaabeysan hannaanka YYY-MM-DD',
+        'termination_date.date_format'  =>  'Sumadda :astaanta waa iney ahaato taariikh saxan oo u qaabeysan hannaanka qaabaysan YYY-MM-DD',
+        'expected_checkin.date_format'  =>  'Sumadda :astaanta waa iney ahaato taariikh saxan oo u qaabeysan hannaanka YYY-MM-DD',
+        'start_date.date_format'        =>  'Sumadda :astaanta waa iney ahaato taariikh saxan oo u qaabeysan hannaanka YYY-MM-DD',
+        'end_date.date_format'          =>  'Sumadda :astaanta waa iney ahaato taariikh saxan oo u qaabeysan YYY-MM-DD',
+        'invalid_value_in_field' => 'Invalid value included in this field',
 
-    ],
+        'ldap_username_field' => [
+            'not_in' =>         '<code>sAMAccountName</code> (mixed case) will likely not work. You should use <code>samaccountname</code> (lowercase) instead.'
+        ],
+        'ldap_auth_filter_query' => ['not_in' => '<code>uid=samaccountname</code> is probably not a valid auth filter. You probably want <code>uid=</code> '],
+        'ldap_filter' => ['regex' => 'This value should probably not be wrapped in parentheses.'],
 
+        ],
     /*
     |--------------------------------------------------------------------------
     | Custom Validation Attributes
@@ -155,8 +233,16 @@ return [
 
     /*
     |--------------------------------------------------------------------------
-    | Generic Validation Messages
+    | Generic Validation Messages - we use these in the jquery validation where we don't have
+    | access to the :attribute
     |--------------------------------------------------------------------------
     */
-    'invalid_value_in_field' => 'Invalid value included in this field',
+
+    'generic' => [
+        'invalid_value_in_field' => 'Invalid value included in this field',
+        'required' => 'This field is required',
+        'email' => 'Please enter a valid email address',
+    ],
+
+
 ];
diff --git a/resources/lang/sq-AL/account/general.php b/resources/lang/sq-AL/account/general.php
index 1a9e2c03b8..7f9e2f848e 100644
--- a/resources/lang/sq-AL/account/general.php
+++ b/resources/lang/sq-AL/account/general.php
@@ -2,10 +2,16 @@
 
 return array(
     'personal_api_keys' => 'Personal API Keys',
+    'personal_access_token' => 'Personal Access Token',
+    'personal_api_keys_success' => 'Personal API Key :key created sucessfully',
+    'here_is_api_key' => 'Here is your new personal access token. This is the only time it will be shown so do not lose it! You may now use this token to make API requests.',
     'api_key_warning' => 'When generating an API token, be sure to copy it down immediately as they will not be visible to you again.',
     'api_base_url' => 'Your API base url is located at:',
     'api_base_url_endpoint' => '/&lt;endpoint&gt;',
     'api_token_expiration_time' => 'API tokens are set to expire in:',
     'api_reference' => 'Please check the <a href="https://snipe-it.readme.io/reference" target="_blank">API reference</a> to find specific API endpoints and additional API documentation.',
     'profile_updated' => 'Account successfully updated',
+    'no_tokens' => 'You have not created any personal access tokens.',
+    'enable_sounds' => 'Enable sound effects',
+    'enable_confetti' => 'Enable confetti effects',
 );
diff --git a/resources/lang/sq-AL/admin/accessories/message.php b/resources/lang/sq-AL/admin/accessories/message.php
index c688d5e03d..f60d41957b 100644
--- a/resources/lang/sq-AL/admin/accessories/message.php
+++ b/resources/lang/sq-AL/admin/accessories/message.php
@@ -26,7 +26,11 @@ return array(
         'error'   		=> 'Accessory was not checked out, please try again',
         'success' 		=> 'Accessory checked out successfully.',
         'unavailable'   => 'Accessory is not available for checkout. Check quantity available',
-        'user_does_not_exist' => 'That user is invalid. Please try again.'
+        'user_does_not_exist' => 'That user is invalid. Please try again.',
+         'checkout_qty' => array(
+            'lte'  => 'There is currently only one available accessory of this type, and you are trying to check out :checkout_qty. Please adjust the checkout quantity or the total stock of this accessory and try again.|There are :number_currently_remaining total available accessories, and you are trying to check out :checkout_qty. Please adjust the checkout quantity or the total stock of this accessory and try again.',
+            ),
+           
     ),
 
     'checkin' => array(
diff --git a/resources/lang/sq-AL/admin/accessories/table.php b/resources/lang/sq-AL/admin/accessories/table.php
index e02d9f22e4..80df687161 100644
--- a/resources/lang/sq-AL/admin/accessories/table.php
+++ b/resources/lang/sq-AL/admin/accessories/table.php
@@ -6,6 +6,4 @@ return array(
     'id'      					=> 'ID',
     'require_acceptance'      	=> 'Acceptance',
     'title'      				=> 'Accessory Name',
-
-
 );
diff --git a/resources/lang/sq-AL/admin/components/message.php b/resources/lang/sq-AL/admin/components/message.php
index 0a7dd8d954..ec39dc4178 100644
--- a/resources/lang/sq-AL/admin/components/message.php
+++ b/resources/lang/sq-AL/admin/components/message.php
@@ -17,7 +17,8 @@ return array(
     'delete' => array(
         'confirm'   => 'Are you sure you wish to delete this component?',
         'error'   => 'There was an issue deleting the component. Please try again.',
-        'success' => 'The component was deleted successfully.'
+        'success' => 'The component was deleted successfully.',
+        'error_qty'   => 'Some components of this type are still checked out. Please check them in and try again.',
     ),
 
      'checkout' => array(
diff --git a/resources/lang/sq-AL/admin/consumables/general.php b/resources/lang/sq-AL/admin/consumables/general.php
index 7c6bb32968..29acfedc1b 100644
--- a/resources/lang/sq-AL/admin/consumables/general.php
+++ b/resources/lang/sq-AL/admin/consumables/general.php
@@ -8,4 +8,5 @@ return array(
     'remaining' 			            => 'Remaining',
     'total' 			                => 'Total',
     'update'                            => 'Update Consumable',
+    'inventory_warning'                 => 'The inventory of this consumable is below the minimum amount of :min_count',
 );
diff --git a/resources/lang/sq-AL/admin/consumables/message.php b/resources/lang/sq-AL/admin/consumables/message.php
index c0d0aa7f68..e2591503bf 100644
--- a/resources/lang/sq-AL/admin/consumables/message.php
+++ b/resources/lang/sq-AL/admin/consumables/message.php
@@ -2,6 +2,7 @@
 
 return array(
 
+    'invalid_category_type' => 'The category must be a consumable category.',
     'does_not_exist' => 'Consumable does not exist.',
 
     'create' => array(
diff --git a/resources/lang/sq-AL/admin/custom_fields/general.php b/resources/lang/sq-AL/admin/custom_fields/general.php
index e3c21d1f0c..c9ae61c963 100644
--- a/resources/lang/sq-AL/admin/custom_fields/general.php
+++ b/resources/lang/sq-AL/admin/custom_fields/general.php
@@ -35,7 +35,7 @@ return [
     'create_field_title' => 'Create a new custom field',
     'value_encrypted'      	        => 'The value of this field is encrypted in the database. Only admin users will be able to view the decrypted value',
     'show_in_email'     => 'Include the value of this field in checkout emails sent to the user? Encrypted fields cannot be included in emails',
-    'show_in_email_short'     => 'Include in emails.',
+    'show_in_email_short' => 'Include in emails',
     'help_text' => 'Help Text',
     'help_text_description' => 'This is optional text that will appear below the form elements while editing an asset to provide context on the field.',
     'about_custom_fields_title' => 'About Custom Fields',
@@ -57,5 +57,8 @@ return [
     'show_in_requestable_list_short' => 'Show in requestable assets list',
     'show_in_requestable_list' => 'Show value in requestable assets list. Encrypted fields will not be shown',
     'encrypted_options' => 'This field is encrypted, so some display options will not be available.',
+    'display_checkin' => 'Display in checkin forms',
+    'display_checkout' => 'Display in checkout forms',
+    'display_audit' => 'Display in audit forms',
 
 ];
diff --git a/resources/lang/sq-AL/admin/custom_fields/message.php b/resources/lang/sq-AL/admin/custom_fields/message.php
index 43ba821821..6442359b7f 100644
--- a/resources/lang/sq-AL/admin/custom_fields/message.php
+++ b/resources/lang/sq-AL/admin/custom_fields/message.php
@@ -5,6 +5,7 @@ return array(
     'field' => array(
         'invalid'   => 'That field does not exist.',
         'already_added'   => 'Field already added',
+        'none_selected'   => 'No field selected',
 
         'create' => array(
             'error'   => 'Field was not created, please try again.',
diff --git a/resources/lang/sq-AL/admin/depreciations/general.php b/resources/lang/sq-AL/admin/depreciations/general.php
index 1a5666f9dc..90246e9cd8 100644
--- a/resources/lang/sq-AL/admin/depreciations/general.php
+++ b/resources/lang/sq-AL/admin/depreciations/general.php
@@ -13,4 +13,8 @@ return [
     'no_depreciations_warning'               => '<strong>Warning: </strong>
                       You do not currently have any depreciations set up.
                       Please set up at least one depreciation to view the depreciation report.',
+    'depreciation_method'                   => 'Depreciation Report',
+    'linear_depreciation'                   => 'Linear (Default)',
+    'half_1'                                => 'Half-year convention, always applied',
+    'half_2'                                => 'Half-year convention, applied with condition',
 ];
diff --git a/resources/lang/sq-AL/admin/hardware/form.php b/resources/lang/sq-AL/admin/hardware/form.php
index edec543637..8fbd0b4e87 100644
--- a/resources/lang/sq-AL/admin/hardware/form.php
+++ b/resources/lang/sq-AL/admin/hardware/form.php
@@ -55,8 +55,11 @@ return [
     'asset_location_update_default' => 'Update only default location',
     'asset_location_update_actual' => 'Update only actual location',
     'asset_not_deployable' => 'That asset status is not deployable. This asset cannot be checked out.',
-    'asset_deployable' => 'That status is deployable. This asset can be checked out.',
+    'asset_not_deployable_checkin' => 'That asset status is not deployable. Using this status label will checkin the asset.',
+    'asset_deployable' => 'This asset can be checked out.',
     'processing_spinner' => 'Processing... (This might take a bit of time on large files)',
+    'processing' => 'Processing... ',
     'optional_infos'  => 'Optional Information',
-    'order_details'   => 'Order Related Information'
+    'order_details'   => 'Order Related Information',
+    'calc_eol'    => 'If nulling the EOL date, use automatic EOL calculation based on the purchase date and EOL rate.',
 ];
diff --git a/resources/lang/sq-AL/admin/hardware/general.php b/resources/lang/sq-AL/admin/hardware/general.php
index 34ac4e63ee..6740476574 100644
--- a/resources/lang/sq-AL/admin/hardware/general.php
+++ b/resources/lang/sq-AL/admin/hardware/general.php
@@ -5,8 +5,8 @@ return [
     'about_assets_text'            => 'Assets are items tracked by serial number or asset tag.  They tend to be higher value items where identifying a specific item matters.',
     'archived'  				=> 'Archived',
     'asset'  					=> 'Asset',
-    'bulk_checkout'             => 'Checkout Assets',
-    'bulk_checkin'              => 'Checkin Assets',
+    'bulk_checkout'             => 'Bulk Checkout',
+    'bulk_checkin'              => 'Bulk Checkin',
     'checkin'  					=> 'Checkin Asset',
     'checkout'  				=> 'Checkout Asset',
     'clone'  					=> 'Clone Asset',
@@ -27,8 +27,7 @@ return [
     'undeployable_tooltip'  	=> 'This asset has a status label that is undeployable and cannot be checked out at this time.',
     'view'  					=> 'View Asset',
     'csv_error' => 'You have an error in your CSV file:',
-    'import_text' => '<p>Upload a CSV that contains asset history. The assets and users MUST already exist in the system, or they will be skipped. Matching assets for history import happens against the asset tag. We will try to find a matching user based on the user\'s name you provide, and the criteria you select below. If you do not select any criteria below, it will simply try to match on the username format you configured in the <code>Admin &gt; General Settings</code>.</p><p>Fields included in the CSV must match the headers: <strong>Asset Tag, Name, Checkout Date, Checkin Date</strong>. Any additional fields will be ignored. </p><p>Checkin Date: blank or future checkin dates will checkout items to associated user.  Excluding the Checkin Date column will create a checkin date with todays date.</p>
-    ',
+    'import_text' => '<p>Upload a CSV that contains asset history. The assets and users MUST already exist in the system, or they will be skipped. Matching assets for history import happens against the asset tag. We will try to find a matching user based on the user\'s name you provide, and the criteria you select below. If you do not select any criteria below, it will simply try to match on the username format you configured in the <code>Admin &gt; General Settings</code>.</p><p>Fields included in the CSV must match the headers: <strong>Asset Tag, Name, Checkout Date, Checkin Date</strong>. Any additional fields will be ignored. </p><p>Checkin Date: blank or future checkin dates will checkout items to associated user.  Excluding the Checkin Date column will create a checkin date with todays date.</p>    ',
     'csv_import_match_f-l' => 'Try to match users by <strong>firstname.lastname</strong> (<code>jane.smith</code>) format',
     'csv_import_match_initial_last' => 'Try to match users by <strong>first initial last name</strong> (<code>jsmith</code>) format',
     'csv_import_match_first' => 'Try to match users by <strong>first name</strong> (<code>jane</code>) format',
diff --git a/resources/lang/sq-AL/admin/hardware/message.php b/resources/lang/sq-AL/admin/hardware/message.php
index 32698b1c07..c19bc63647 100644
--- a/resources/lang/sq-AL/admin/hardware/message.php
+++ b/resources/lang/sq-AL/admin/hardware/message.php
@@ -2,19 +2,23 @@
 
 return [
 
-    'undeployable' 		=> '<strong>Warning: </strong> This asset has been marked as currently undeployable.
-                        If this status has changed, please update the asset status.',
-    'does_not_exist' 	=> 'Asset does not exist.',
-    'does_not_exist_var'=> 'Asset with tag :asset_tag not found.',
-    'no_tag' 	        => 'No asset tag provided.',
+    'undeployable' 		 => '<strong>Warning: </strong> This asset has been marked as currently undeployable. If this status has changed, please update the asset status.',
+    'does_not_exist' 	 => 'Asset does not exist.',
+    'does_not_exist_var' => 'Asset with tag :asset_tag not found.',
+    'no_tag' 	         => 'No asset tag provided.',
     'does_not_exist_or_not_requestable' => 'That asset does not exist or is not requestable.',
-    'assoc_users'	 	=> 'This asset is currently checked out to a user and cannot be deleted. Please check the asset in first, and then try deleting again. ',
+    'assoc_users'	 	 => 'This asset is currently checked out to a user and cannot be deleted. Please check the asset in first, and then try deleting again. ',
     'warning_audit_date_mismatch' 	=> 'This asset\'s next audit date (:next_audit_date) is before the last audit date (:last_audit_date). Please update the next audit date.',
+    'labels_generated'   => 'Labels were successfully generated.',
+    'error_generating_labels' => 'Error while generating labels.',
+    'no_assets_selected' => 'No assets selected.',
 
     'create' => [
         'error'   		=> 'Asset was not created, please try again. :(',
         'success' 		=> 'Asset created successfully. :)',
         'success_linked' => 'Asset with tag :tag was created successfully. <strong><a href=":link" style="color: white;">Click here to view</a></strong>.',
+        'multi_success_linked' => 'Asset with tag :links was created successfully.|:count assets were created succesfully. :links.',
+        'partial_failure' => 'An asset was unable to be created. Reason: :failures|:count assets were unable to be created. Reasons: :failures',
     ],
 
     'update' => [
@@ -52,20 +56,24 @@ return [
     ],
 
     'import' => [
+        'import_button'         => 'Process Import',
         'error'                 => 'Some items did not import correctly.',
         'errorDetail'           => 'The following Items were not imported because of errors.',
         'success'               => 'Your file has been imported',
         'file_delete_success'   => 'Your file has been been successfully deleted',
         'file_delete_error'      => 'The file was unable to be deleted',
         'file_missing' => 'The file selected is missing',
+        'file_already_deleted' => 'The file selected was already deleted',
         'header_row_has_malformed_characters' => 'One or more attributes in the header row contain malformed UTF-8 characters',
         'content_row_has_malformed_characters' => 'One or more attributes in the first row of content contain malformed UTF-8 characters',
+        'transliterate_failure' => 'Transliteration from :encoding to UTF-8 failed due to invalid characters in input'
     ],
 
 
     'delete' => [
         'confirm'   	=> 'Are you sure you wish to delete this asset?',
         'error'   		=> 'There was an issue deleting the asset. Please try again.',
+        'assigned_to_error' => '{1}Asset Tag: :asset_tag is currently checked out. Check in this device before deletion.|[2,*]Asset Tags: :asset_tag are currently checked out. Check in these devices before deletion.',
         'nothing_updated'   => 'No assets were selected, so nothing was deleted.',
         'success' 		=> 'The asset was deleted successfully.',
     ],
@@ -78,6 +86,11 @@ return [
         'no_assets_selected' => 'You must select at least one asset from the list',
     ],
 
+    'multi-checkout' => [
+        'error'   => 'Asset was not checked out, please try again|Assets were not checked out, please try again',
+        'success' => 'Asset checked out successfully.|Assets checked out successfully.',
+    ],
+
     'checkin' => [
         'error'   		=> 'Asset was not checked in, please try again',
         'success' 		=> 'Asset checked in successfully.',
@@ -87,9 +100,10 @@ return [
     ],
 
     'requests' => [
-        'error'   		=> 'Asset was not requested, please try again',
-        'success' 		=> 'Asset requested successfully.',
-        'canceled'      => 'Checkout request successfully canceled',
+        'error'   		=> 'Request was not successful, please try again.',
+        'success' 		=> 'Request successfully submitted.',
+        'canceled'      => 'Request successfully canceled.',
+        'cancel'        => 'Cancel this item request',
     ],
 
 ];
diff --git a/resources/lang/sq-AL/admin/hardware/table.php b/resources/lang/sq-AL/admin/hardware/table.php
index 92b228dccd..2d88c6c131 100644
--- a/resources/lang/sq-AL/admin/hardware/table.php
+++ b/resources/lang/sq-AL/admin/hardware/table.php
@@ -25,7 +25,6 @@ return [
     'image'		    => 'Device Image',
     'days_without_acceptance' => 'Days Without Acceptance',
     'monthly_depreciation' => 'Monthly Depreciation',
-    'assigned_to'    => 'Assigned To',
     'requesting_user' => 'Requesting User',
     'requested_date' => 'Requested Date',
     'changed'       => 'Changed',
diff --git a/resources/lang/sq-AL/admin/kits/general.php b/resources/lang/sq-AL/admin/kits/general.php
index f57fb645c4..2b5c2d9cd0 100644
--- a/resources/lang/sq-AL/admin/kits/general.php
+++ b/resources/lang/sq-AL/admin/kits/general.php
@@ -47,4 +47,5 @@ return [
     'kit_deleted'                       => 'Kit was successfully deleted',
     'kit_model_updated'                 => 'Model was successfully updated',
     'kit_model_detached'                => 'Model was successfully detached',
+    'model_already_attached'            => 'Model already attached to kit',
 ];
diff --git a/resources/lang/sq-AL/admin/licenses/general.php b/resources/lang/sq-AL/admin/licenses/general.php
index 79b69a3d94..b39030afd4 100644
--- a/resources/lang/sq-AL/admin/licenses/general.php
+++ b/resources/lang/sq-AL/admin/licenses/general.php
@@ -14,6 +14,7 @@ return array(
     'info'  					=> 'License Info',
     'license_seats'  			=> 'License Seats',
     'seat'  					=> 'Seat',
+    'seat_count'  				=> 'Seat :count',
     'seats'  					=> 'Seats',
     'software_licenses'  		=> 'Software Licenses',
     'user'  					=> 'User',
@@ -23,12 +24,12 @@ return array(
         [
             'checkin_all'           => [
                 'button'            => 'Checkin All Seats',
-                'modal'             => 'This will action checkin one seat. | This action will checkin all :checkedout_seats_count seats for this license.',
+                'modal'             => 'This action will checkin one seat. | This action will checkin all :checkedout_seats_count seats for this license.',
                 'enabled_tooltip'   => 'Checkin ALL seats for this license from both users and assets',
                 'disabled_tooltip'  => 'This is disabled because there are no seats currently checked out',
                 'disabled_tooltip_reassignable'  => 'This is disabled because the License is not reassignable',
                 'success'           => 'License successfully checked in! | All licenses were successfully checked in!',
-                'log_msg'           => 'Checked in via bulk license checkout in license GUI',
+                'log_msg'           => 'Checked in via bulk license checkin in license GUI',
             ],
 
             'checkout_all'              => [
diff --git a/resources/lang/sq-AL/admin/licenses/message.php b/resources/lang/sq-AL/admin/licenses/message.php
index 27fbfe38a9..74e1d7af5a 100644
--- a/resources/lang/sq-AL/admin/licenses/message.php
+++ b/resources/lang/sq-AL/admin/licenses/message.php
@@ -44,10 +44,13 @@ return array(
         'error'   => 'There was an issue checking out the license. Please try again.',
         'success' => 'The license was checked out successfully',
         'not_enough_seats' => 'Not enough license seats available for checkout',
+        'mismatch' => 'The license seat provided does not match the license',
+        'unavailable' => 'This seat is not available for checkout.',
     ),
 
     'checkin' => array(
         'error'   => 'There was an issue checking in the license. Please try again.',
+        'not_reassignable' => 'License not reassignable',
         'success' => 'The license was checked in successfully'
     ),
 
diff --git a/resources/lang/sq-AL/admin/locations/message.php b/resources/lang/sq-AL/admin/locations/message.php
index 8121b80687..b21c70ad89 100644
--- a/resources/lang/sq-AL/admin/locations/message.php
+++ b/resources/lang/sq-AL/admin/locations/message.php
@@ -3,11 +3,12 @@
 return array(
 
     'does_not_exist' => 'Location does not exist.',
-    'assoc_users'    => 'This location is not currently deletable because it is the location of record for at least one asset or user, has assets assigned to it, or is the parent location of another location. Please update your models to no longer reference this company and try again. ',
+    'assoc_users'    => 'This location is not currently deletable because it is the location of record for at least one asset or user, has assets assigned to it, or is the parent location of another location. Please update your records to no longer reference this location and try again ',
     'assoc_assets'	 => 'This location is currently associated with at least one asset and cannot be deleted. Please update your assets to no longer reference this location and try again. ',
     'assoc_child_loc'	 => 'This location is currently the parent of at least one child location and cannot be deleted. Please update your locations to no longer reference this location and try again. ',
     'assigned_assets' => 'Assigned Assets',
     'current_location' => 'Current Location',
+    'open_map' => 'Open in :map_provider_icon Maps',
 
 
     'create' => array(
@@ -20,6 +21,11 @@ return array(
         'success' => 'Location updated successfully.'
     ),
 
+    'restore' => array(
+        'error'   => 'Location was not restored, please try again',
+        'success' => 'Location restored successfully.'
+    ),
+
     'delete' => array(
         'confirm'   	=> 'Are you sure you wish to delete this location?',
         'error'   => 'There was an issue deleting the location. Please try again.',
diff --git a/resources/lang/sq-AL/admin/locations/table.php b/resources/lang/sq-AL/admin/locations/table.php
index ed3f96f6b4..53176d8a4e 100644
--- a/resources/lang/sq-AL/admin/locations/table.php
+++ b/resources/lang/sq-AL/admin/locations/table.php
@@ -39,4 +39,5 @@ return [
     'signed_by_finance_auditor' => 'Signed By (Finance Auditor):',
     'signed_by_location_manager' => 'Signed By (Location Manager):',
     'signed_by'                 => 'Signed Off By:',
+    'clone'  					=> 'Clone Location',
 ];
diff --git a/resources/lang/sq-AL/admin/models/general.php b/resources/lang/sq-AL/admin/models/general.php
index 7e4a77adbc..9a61b53fd0 100644
--- a/resources/lang/sq-AL/admin/models/general.php
+++ b/resources/lang/sq-AL/admin/models/general.php
@@ -3,7 +3,7 @@
 return array(
     'about_models_title'     => 'About Asset Models',
     'about_models_text'           => 'Asset Models are a way to group identical assets. "MBP 2013", "IPhone 6s", etc.',
-    'deleted'  					        => 'This model has been deleted.',
+    'deleted'  					=> 'This model has been deleted.',
     'bulk_delete'               => 'Bulk Delete Asset Models',
     'bulk_delete_help'               => 'Use the checkboxes below to confirm the deletion of the selected asset models. Asset models that have assets associated with them cannot be deleted until the assets are associated with a different model.',
     'bulk_delete_warn'          => 'You are about to delete one asset model.|You are about to delete :model_count asset models.',
diff --git a/resources/lang/sq-AL/admin/models/message.php b/resources/lang/sq-AL/admin/models/message.php
index cc38c54530..ae3bc34eed 100644
--- a/resources/lang/sq-AL/admin/models/message.php
+++ b/resources/lang/sq-AL/admin/models/message.php
@@ -7,7 +7,7 @@ return array(
     'no_association' => 'WARNING! The asset model for this item is invalid or missing!',
     'no_association_fix' => 'This will break things in weird and horrible ways. Edit this asset now to assign it a model.',
     'assoc_users'	 => 'This model is currently associated with one or more assets and cannot be deleted. Please delete the assets, and then try deleting again. ',
-
+    'invalid_category_type' => 'This category must be an asset category.',
 
     'create' => array(
         'error'   => 'Model was not created, please try again.',
diff --git a/resources/lang/sq-AL/admin/reports/general.php b/resources/lang/sq-AL/admin/reports/general.php
index 9b682f8ecd..ed8bf1a156 100644
--- a/resources/lang/sq-AL/admin/reports/general.php
+++ b/resources/lang/sq-AL/admin/reports/general.php
@@ -4,6 +4,7 @@ return [
     'info'   => 'Select the options you want for your asset report.',
     'deleted_user' => 'Deleted user',
     'send_reminder' => 'Send reminder',
+    'cannot_send_reminder' => 'User has been deleted or does not have an email address so cannot receive a reminder',
     'reminder_sent' => 'Reminder sent',
     'acceptance_deleted' => 'Acceptance request deleted',
     'acceptance_request' => 'Acceptance request',
@@ -13,5 +14,10 @@ return [
         'user_state' => 'User State',
         'user_country' => 'User Country',
         'user_zip' => 'User Zip'
-    ]
-];
\ No newline at end of file
+    ],
+    'open_saved_template' => 'Open Saved Template',
+    'save_template' =>  'Save Template',
+    'select_a_template' => 'Select a Template',
+    'template_name' => 'Template Name',
+    'update_template' => 'Update Template',
+];
diff --git a/resources/lang/sq-AL/admin/reports/message.php b/resources/lang/sq-AL/admin/reports/message.php
index d4c8f8198f..2800bbdf0b 100644
--- a/resources/lang/sq-AL/admin/reports/message.php
+++ b/resources/lang/sq-AL/admin/reports/message.php
@@ -1,5 +1,16 @@
 <?php
 
-return array(
-    'error'   => 'You must select at least ONE option.'
-);
+return [
+    'about_templates' => 'About Saved Templates',
+    'saving_templates_description' => 'Select your options, then enter the name of your template in the box above and click the \'Save Template\' button. Use the dropdown to select a previously saved template.',
+    'create'  => [
+        'success' => 'Template saved successfully',
+    ],
+    'update' => [
+        'success' => 'Template updated successfully',
+    ],
+    'delete' => [
+        'success' => 'Template deleted',
+        'no_delete_permission' => 'Template does not exist or you do not have permission to delete it.',
+    ],
+];
diff --git a/resources/lang/sq-AL/admin/settings/general.php b/resources/lang/sq-AL/admin/settings/general.php
index 8074f5082e..37cfb0de94 100644
--- a/resources/lang/sq-AL/admin/settings/general.php
+++ b/resources/lang/sq-AL/admin/settings/general.php
@@ -8,13 +8,13 @@ return [
     'ad_append_domain'          => 'Append domain name to username field',
     'ad_append_domain_help'     => 'User isn\'t required to write "username@domain.local", they can just type "username".',
     'admin_cc_email'            => 'CC Email',
-    'admin_cc_email_help'       => 'If you would like to send a copy of checkin/checkout emails that are sent to users to an additional email account, enter it here. Otherwise leave this field blank.',
+    'admin_cc_email_help'       => 'Send a copy of checkin/checkout emails to this address.',
     'admin_settings'            => 'Admin Settings',
     'is_ad'				        => 'This is an Active Directory server',
     'alerts'                	=> 'Alerts',
     'alert_title'               => 'Update Notification Settings',
     'alert_email'				=> 'Send alerts to',
-    'alert_email_help'    => 'Email addresses or distribution lists you want alerts to be sent to, comma separated',
+    'alert_email_help'          => 'Email addresses or distribution lists you want alerts to be sent to, comma separated.',
     'alerts_enabled'			=> 'Email Alerts Enabled',
     'alert_interval'			=> 'Expiring Alerts Threshold (in days)',
     'alert_inv_threshold'		=> 'Inventory Alert Threshold',
@@ -31,15 +31,18 @@ return [
     'backups'					=> 'Backups',
     'backups_help'              => 'Create, download, and restore backups ',
     'backups_restoring'         => 'Restoring from Backup',
+    'backups_clean' => 'Clean the backed-up database before restore',
+    'backups_clean_helptext' => "This can be useful if you're changing between database versions",
     'backups_upload'            => 'Upload Backup',
     'backups_path'              => 'Backups on the server are stored in <code>:path</code>',
-    'backups_restore_warning'   => 'Use the restore button <small><span class="btn btn-xs btn-warning"><i class="text-white fas fa-retweet" aria-hidden="true"></i></span></small> to restore from a previous backup. (This does not currently work with S3 file storage or Docker.)<br><br>Your <strong>entire :app_name database and any uploaded files will be completely replaced</strong> by what\'s in the backup file.  ',
+    'backups_restore_warning'   => 'Use the restore button <small><span class="btn btn-xs btn-warning"><i class="text-white fas fa-retweet" aria-hidden="true"></i></span></small> to restore from a previous backup. (This does not currently work with S3 file storage or Docker.)<br><br>Your <strong>entire :app_name database and any uploaded files will be completely replaced</strong> by what\'s in the backup file  ',
     'backups_logged_out'         => 'All existing users, including you, will be logged out once your restore is complete.',
     'backups_large'             => 'Very large backups may time out on the restore attempt and may still need to be run via command line. ',
     'barcode_settings'			=> 'Barcode Settings',
     'confirm_purge'			    => 'Confirm Purge',
     'confirm_purge_help'		=> 'Enter the text "DELETE" in the box below to purge your deleted records. This action cannot be undone and will PERMANENTLY delete all soft-deleted items and users. (You should make a backup first, just to be safe.)',
     'custom_css'				=> 'Custom CSS',
+    'custom_css_placeholder'	=> 'Add your custom CSS',
     'custom_css_help'			=> 'Enter any custom CSS overrides you would like to use. Do not include the &lt;style&gt;&lt;/style&gt; tags.',
     'custom_forgot_pass_url'	=> 'Custom Password Reset URL',
     'custom_forgot_pass_url_help'	=> 'This replaces the built-in forgotten password URL on the login screen, useful to direct people to internal or hosted LDAP password reset functionality. It will effectively disable local user forgotten password functionality.',
@@ -47,34 +50,34 @@ return [
     'dashboard_message_help'	=> 'This text will appear on the dashboard for anyone with permission to view the dashboard.',
     'default_currency'  		=> 'Default Currency',
     'default_eula_text'			=> 'Default EULA',
+    'default_eula_text_placeholder' => 'Add your default EULA text',
     'default_language'			=> 'Default Language',
     'default_eula_help_text'	=> 'You can also associate custom EULAs to specific asset categories.',
     'acceptance_note'           => 'Add a note for your decision (Optional)',
     'display_asset_name'        => 'Display Asset Name',
     'display_checkout_date'     => 'Display Checkout Date',
     'display_eol'               => 'Display EOL in table view',
-    'display_qr'                => 'Display Square Codes',
+    'display_qr'                => 'Display 2D barcode',
     'display_alt_barcode'		=> 'Display 1D barcode',
-    'email_logo'                => 'Email Logo',
     'barcode_type'				=> '2D Barcode Type',
     'alt_barcode_type'			=> '1D barcode type',
-    'email_logo_size'       => 'Square logos in email look best. ',
     'enabled'                   => 'Enabled',
     'eula_settings'				=> 'EULA Settings',
     'eula_markdown'				=> 'This EULA allows <a href="https://help.github.com/articles/github-flavored-markdown/">Github flavored markdown</a>.',
+    'empty_row_count'           => 'Field Start Offset (Empty Rows)',
+    'empty_row_count_help'      => 'Fields will begin populating after this many empty rows are skipped at the top of the label.',
     'favicon'                   => 'Favicon',
     'favicon_format'            => 'Accepted filetypes are ico, png, and gif. Other image formats may not work in all browsers.',
     'favicon_size'          => 'Favicons should be square images, 16x16 pixels.',
     'footer_text'               => 'Additional Footer Text ',
     'footer_text_help'          => 'This text will appear in the right-side footer. Links are allowed using <a href="https://help.github.com/articles/github-flavored-markdown/">Github flavored markdown</a>. Line breaks, headers, images, etc may result in unpredictable results.',
+    'footer_text_placeholder'   => 'Optional footer text',
     'general_settings'			=> 'General Settings',
-    'general_settings_keywords' => 'company support, signature, acceptance, email format, username format, images, per page, thumbnail, eula, gravatar, tos, dashboard, privacy',
     'general_settings_help'     => 'Default EULA and more',
     'generate_backup'			=> 'Generate Backup',
     'google_workspaces'         => 'Google Workspaces',
     'header_color'              => 'Header Color',
     'info'                      => 'These settings let you customize certain aspects of your installation.',
-    'label_logo'                => 'Label Logo',
     'label_logo_size'           => 'Square logos look best - will be displayed in the top right of each asset label. ',
     'laravel'                   => 'Laravel Version',
     'ldap'                      => 'LDAP',
@@ -94,7 +97,7 @@ return [
     'ldap_login_sync_help'      => 'This only tests that LDAP can sync correctly. If your LDAP Authentication query is not correct, users may still not be able to login. YOU MUST SAVE YOUR UPDATED LDAP SETTINGS FIRST.',
     'ldap_manager'              => 'LDAP Manager',
     'ldap_server'               => 'LDAP Server',
-    'ldap_server_help'          => 'This should start with ldap:// (for unencrypted or TLS) or ldaps:// (for SSL)',
+    'ldap_server_help'          => 'This should start with ldap:// (for unencrypted) or ldaps:// (for TLS or SSL)',
     'ldap_server_cert'			=> 'LDAP SSL certificate validation',
     'ldap_server_cert_ignore'	=> 'Allow invalid SSL Certificate',
     'ldap_server_cert_help'		=> 'Select this checkbox if you are using a self signed SSL cert and would like to accept an invalid SSL certificate.',
@@ -108,8 +111,8 @@ return [
     'ldap_pword'                => 'LDAP Bind Password',
     'ldap_basedn'               => 'Base Bind DN',
     'ldap_filter'               => 'LDAP Filter',
-    'ldap_pw_sync'              => 'LDAP Password Sync',
-    'ldap_pw_sync_help'         => 'Uncheck this box if you do not wish to keep LDAP passwords synced with local passwords. Disabling this means that your users may not be able to login if your LDAP server is unreachable for some reason.',
+    'ldap_pw_sync'              => 'Cache LDAP Passwords',
+    'ldap_pw_sync_help'         => 'Uncheck this box if you do not wish to keep LDAP passwords cached as local hashed passwords. Disabling this means that your users may not be able to login if your LDAP server is unreachable for some reason.',
     'ldap_username_field'       => 'Username Field',
     'ldap_lname_field'          => 'Last Name',
     'ldap_fname_field'          => 'LDAP First Name',
@@ -117,13 +120,15 @@ return [
     'ldap_version'              => 'LDAP Version',
     'ldap_active_flag'          => 'LDAP Active Flag',
     'ldap_activated_flag_help'  => 'This value is used to determine whether a synced user can login to Snipe-IT. <strong>It does not affect the ability to check items in or out to them</strong>, and should be the <strong>attribute name</strong> within your AD/LDAP, <strong>not the value</strong>. <br><br>If this field is set to a field name that does not exist in your AD/LDAP, or the value in the AD/LDAP field is set to <code>0</code> or <code>false</code>, <strong>user login will be disabled</strong>. If the value in the AD/LDAP field is set to <code>1</code> or <code>true</code> or <em>any other text</em> means the user can log in. When the field is blank in your AD, we respect the <code>userAccountControl</code> attribute, which usually allows non-suspended users to log in.',
+    'ldap_invert_active_flag'   => 'LDAP Invert Active Flag',
+    'ldap_invert_active_flag_help'     => 'If enabled: when the value returned by LDAP Active Flag is <code>0</code> or <code>false</code> the user account will be active.',
     'ldap_emp_num'              => 'LDAP Employee Number',
     'ldap_email'                => 'LDAP Email',
     'ldap_test'                 => 'Test LDAP',
     'ldap_test_sync'            => 'Test LDAP Synchronization',
     'license'                   => 'Software License',
-    'load_remote'               => 'Use Gravatar',
-    'load_remote_help_text'		=> 'Uncheck this box if your install cannot load scripts from the outside internet. This will prevent Snipe-IT from trying load images from Gravatar.',
+    'load_remote'               => 'Load Remote Avatars',
+    'load_remote_help_text'		=> 'Uncheck this box if your install cannot load scripts from the outside internet. This will prevent Snipe-IT from trying load avatars from Gravatar or other outside sources.',
     'login'                     => 'Login Attempts',
     'login_attempt'             => 'Login Attempt',
     'login_ip'                  => 'IP Address',
@@ -131,6 +136,7 @@ return [
     'login_user_agent'          => 'User Agent',
     'login_help'                => 'List of attempted logins',
     'login_note'                => 'Login Note',
+    'login_note_placeholder'            => "If you do not have a login or have found a device belonging to this company, please call technical support at 888-555-1212. Thank you.",
     'login_note_help'           => 'Optionally include a few sentences on your login screen, for example to assist people who have found a lost or stolen device. This field accepts <a href="https://help.github.com/articles/github-flavored-markdown/">Github flavored markdown</a>',
     'login_remote_user_text'    => 'Remote User login options',
     'login_remote_user_enabled_text' => 'Enable Login with Remote User Header',
@@ -146,13 +152,16 @@ return [
     'logo_print_assets_help'    => 'Use branding on printable asset lists ',
     'full_multiple_companies_support_help_text' => 'Restricting users (including admins) assigned to companies to their company\'s assets.',
     'full_multiple_companies_support_text' => 'Full Multiple Companies Support',
+    'scope_locations_fmcs_support_text'  => 'Scope Locations with Full Multiple Companies Support',
+    'scope_locations_fmcs_support_help_text'  => 'Restrict locations to their selected company.',
+    'scope_locations_fmcs_check_button' => 'Check Compatibility',
+    'scope_locations_fmcs_support_disabled_text'  => 'This option is disabled because you have conflicting locations set for :count or more items.',
     'show_in_model_list'   => 'Show in Model Dropdowns',
     'optional'					=> 'optional',
     'per_page'                  => 'Results Per Page',
     'php'                       => 'PHP Version',
-    'php_info'                  => 'PHP Info',
+    'php_info'                  => 'PHP info',
     'php_overview'              => 'PHP',
-    'php_overview_keywords'     => 'phpinfo, system, info',
     'php_overview_help'         => 'PHP System info',
     'php_gd_info'               => 'You must install php-gd to display QR codes, see install instructions.',
     'php_gd_warning'            => 'PHP Image Processing and GD plugin is NOT installed.',
@@ -218,6 +227,8 @@ return [
     'webhook_integration_help'    => ':app integration is optional, however the endpoint and channel are required if you wish to use it. To configure :app integration, you must first <a href=":webhook_link" target="_new" rel="noopener">create an incoming webhook</a> on your :app account. Click on the <strong>Test :app Integration</strong> button to confirm your settings are correct before saving. ',
     'webhook_integration_help_button'    => 'Once you have saved your :app information, a test button will appear.',
     'webhook_test_help'           => 'Test whether your :app integration is configured correctly. YOU MUST SAVE YOUR UPDATED :app SETTINGS FIRST.',
+    'shortcuts_enabled'         => 'Enable Shortcuts',
+    'shortcuts_help_text'       => '<strong>Windows</strong>: Alt + Access key, <strong>Mac</strong>: Control + Option + Access key',
     'snipe_version'  			=> 'Snipe-IT version',
     'support_footer'            => 'Support Footer Links ',
     'support_footer_help'       => 'Specify who sees the links to the Snipe-IT Support info and Users Manual',
@@ -227,7 +238,6 @@ return [
     'update'                    => 'Update Settings',
     'value'                     => 'Value',
     'brand'                     => 'Branding',
-    'brand_keywords'            => 'footer, logo, print, theme, skin, header, colors, color, css',
     'brand_help'                => 'Logo, Site Name',
     'web_brand'                 => 'Web Branding Type',
     'about_settings_title'      => 'About Settings',
@@ -276,6 +286,8 @@ return [
     'two_factor_enrollment_text'	=> "Two factor authentication is required, however your device has not been enrolled yet. Open your Google Authenticator app and scan the QR code below to enroll your device. Once you've enrolled your device, enter the code below",
     'require_accept_signature'      => 'Require Signature',
     'require_accept_signature_help_text'      => 'Enabling this feature will require users to physically sign off on accepting an asset.',
+    'require_checkinout_notes'  => 'Require Notes on Checkin/Checkout',
+    'require_checkinout_notes_help_text'    => 'Enabling this feature will require the note fields to be populated when checking in or checking out an asset.',
     'left'        => 'left',
     'right'        => 'right',
     'top'        => 'top',
@@ -313,24 +325,24 @@ return [
     'filter_by_keyword' => 'Filter by setting keyword',
     'security' => 'Security',
     'security_title' => 'Update Security Settings',
-    'security_keywords' => 'password, passwords, requirements, two factor, two-factor, common passwords, remote login, logout, authentication',
     'security_help' => 'Two-factor, Password Restrictions',
-    'groups_keywords' => 'permissions, permission groups, authorization',
     'groups_help' => 'Account permission groups',
     'localization' => 'Localization',
     'localization_title' => 'Update Localization Settings',
-    'localization_keywords' => 'localization, currency, local, locale, time zone, timezone, international, internatinalization, language, languages, translation',
     'localization_help' => 'Language, date display',
     'notifications' => 'Notifications',
     'notifications_help' => 'Email Alerts & Audit Settings',
     'asset_tags_help' => 'Incrementing and prefixes',
     'labels' => 'Labels',
     'labels_title' => 'Update Label Settings',
-    'labels_help' => 'Label sizes &amp; settings',
-    'purge_keywords' => 'permanently delete',
+    'labels_help' => 'Barcodes &amp; label settings',
     'purge_help' => 'Purge Deleted Records',
     'ldap_extension_warning' => 'It does not look like the LDAP extension is installed or enabled on this server. You can still save your settings, but you will need to enable the LDAP extension for PHP before LDAP syncing or login will work.',
     'ldap_ad' => 'LDAP/AD',
+    'ldap_test_label' => 'Test LDAP Sync',
+    'ldap_test_login' => ' Test LDAP Login',
+    'ldap_username_placeholder' => 'LDAP Username',
+    'ldap_password_placeholder' => 'LDAP Password',
     'employee_number' => 'Employee Number',
     'create_admin_user' => 'Create a User ::',
     'create_admin_success' => 'Success! Your admin user has been added!',
@@ -342,6 +354,8 @@ return [
     'setup_migration_create_user' => 'Next: Create User',
     'ldap_settings_link' => 'LDAP Settings Page',
     'slack_test' => 'Test <i class="fab fa-slack"></i> Integration',
+    'status_label_name' => 'Status Label Name',
+    'super_admin_only'  => 'Super Admin Only',
     'label2_enable'           => 'New Label Engine',
     'label2_enable_help'      => 'Switch to the new label engine. <b>Note: You will need to save this setting before setting others.</b>',
     'label2_template'         => 'Template',
@@ -356,12 +370,15 @@ return [
     'label2_2d_type'          => '2D Barcode Type',
     'label2_2d_type_help'     => 'Format for 2D barcodes',
     'label2_2d_target'        => '2D Barcode Target',
-    'label2_2d_target_help'   => 'The URL the 2D barcode points to when scanned',
+    'label2_2d_target_help'   => 'The data that will be contained in the 2D barcode',
     'label2_fields'           => 'Field Definitions',
     'label2_fields_help'      => 'Fields can be added, removed, and reordered in the left column. For each field, multiple options for Label and DataSource can be added, removed, and reordered in the right column.',
+    'purge_barcodes' => 'Purge Barcodes',
     'help_asterisk_bold'    => 'Text entered as <code>**text**</code> will be displayed as bold',
     'help_blank_to_use'     => 'Leave blank to use the value from <code>:setting_name</code>',
     'help_default_will_use' => '<code>:default</code> will use the value from <code>:setting_name</code>. <br>Note that the value of the barcodes must comply with the respective barcode spec in order to be successfully generated. Please see <a href="https://snipe-it.readme.io/docs/barcodes">the documentation <i class="fa fa-external-link"></i></a> for more details. ',
+    'asset_id'              => 'Asset ID',
+    'data'               => 'Data',
     'default'               => 'Default',
     'none'                  => 'None',
     'google_callback_help' => 'This should be entered as the callback URL in your Google OAuth app settings in your organization&apos;s <strong><a href="https://console.cloud.google.com/" target="_blank">Google developer console <i class="fa fa-external-link" aria-hidden="true"></i></a></strong>.',
@@ -373,7 +390,100 @@ return [
     'database_driver' => 'Database Driver',
     'bs_table_storage' => 'Table Storage',
     'timezone' => 'Timezone',
+    'test_mail' => 'Test Mail',
     'profile_edit'          => 'Edit Profile',
     'profile_edit_help'          => 'Allow users to edit their own profiles.',
+    'default_avatar' => 'Custom Default Avatar',
+    'default_avatar_help' => 'This image will be displayed as a profile if a user does not have a profile photo.',
+    'restore_default_avatar' => 'Restore <a href=":default_avatar" data-toggle="lightbox" data-type="image">original system default avatar</a>',
+    'restore_default_avatar_help' => '',
+    'due_checkin_days' => 'Due For Checkin Warning',
+    'due_checkin_days_help' => 'How many days before the expected checkin of an asset should it be listed in the "Due for checkin" page?',
+    'no_groups' => 'No groups have been created yet. Visit <code>Admin Settings > Permission Groups</code> to add one.',
+    'text' => 'Text',
+
+    'username_formats' => [
+        'username_format'		=> 'Username Format',
+        'firstname_lastname_format'	=> 'First Name Last Name (jane.smith)',
+        'first_name_format'	        => 'First Name (jane)',
+        'last_name_format'		=> 'Last Name (doe)',
+        'filastname_format'			=> 'First Initial Last Name (jsmith)',
+        'lastnamefirstinitial_format' =>  'Last Name First Initial (smithj)',
+        'firstname_lastname_underscore_format' => 'First Name Last Name (jane_smith)',
+        'firstinitial.lastname' => 'First Initial Last Name (j.smith)',
+        'lastname_firstinitial' => 'Last Name First Initial (smith_j)',
+        'lastname_dot_firstinitial_format' => 'Last Name First Initial (smith.j)',
+        'firstnamelastname'     => 'First Name Last Name (janesmith)',
+        'firstnamelastinitial'  => 'First Name Last Initial (janes)',
+        'lastnamefirstname'      => 'Last Name.First Name (smith.jane)',
+    ],
+
+    'email_formats' => [
+        'email_format'			=> 'Email Format',
+        'firstname_lastname_format'	=> 'First Name Last Name (jane.smith@example.com)',
+        'first_name_format'		=> 'First Name (jane@example.com)',
+        'last_name_format'		=> 'Last Name (doe@example.com)',
+        'filastname_format'			=> 'First Initial Last Name (jsmith@example.com)',
+        'lastnamefirstinitial_format' =>  'Last Name First Initial (smithj@example.com)',
+        'firstname_lastname_underscore_format' => 'First Name Last Name (jane_smith@example.com)',
+        'firstinitial.lastname' => 'First Initial Last Name (j.smith@example.com)',
+        'lastname_firstinitial' => 'Last Name First Initial (smith_j@example.com)',
+        'lastname_dot_firstinitial_format' => 'Last Name First Initial (smith.j@example.com)',
+        'firstnamelastname'     => 'First Name Last Name (janesmith@example.com)',
+        'firstnamelastinitial'  => 'First Name Last Initial (janes@example.com)',
+        'lastnamefirstname'      => 'Last Name.First Name (smith.jane@example.com)',
+    ],
+
+
+
+    'logo_labels' => [
+        'acceptance_pdf_logo'       => 'PDF Logo',
+        'email_logo'                => 'Email Logo',
+        'label_logo'                => 'Label Logo',
+        'logo'                      => 'Site Logo',
+        'favicon'                   => 'Favicon',
+    ],
+
+    'logo_help' => [
+        'email_logo_size'       => 'Square logos in email look best. ',
+    ],
+
+    'logo_option_types' => [
+        'text' => 'Text',
+        'logo' => 'Logo',
+        'logo_and_text' => 'Logo and Text',
+    ],
+
+
+    'legends' => [
+        'scoping' => 'Scoping',
+        'formats' => 'Default Formats',
+        'profiles' => 'User Profiles',
+        'eula' => 'EULA & Acceptance Preferences',
+        'misc_display' => 'Miscellaneous Display Options',
+        'email' => 'Email Preferences',
+        'checkin' => 'Checkin Preferences',
+        'dashboard' => 'Login & Dashboard Preferences',
+        'misc' => 'Miscellaneous',
+        'logos' => 'Logos & Display',
+        'colors' => 'Colors & Skins',
+        'footer' => 'Footer Preferences',
+        'security' => 'Security Preferences',
+        'general' => 'General',
+        'intervals' => 'Intervals & Thresholds',
+    ],
+
+
+    /* Keywords for settings overview help */
+    'keywords' => [
+        'brand'             => 'footer, logo, print, theme, skin, header, colors, color, css',
+        'general_settings'  => 'company support, signature, acceptance, email format, username format, images, per page, thumbnail, eula, gravatar, tos, dashboard, privacy',
+        'groups'            => 'permissions, permission groups, authorization',
+        'labels'            => 'labels, barcodes, barcode, sheets, print, upc, qr, 1d, 2d',
+        'localization'      => 'localization, currency, local, locale, time zone, timezone, international, internatinalization, language, languages, translation',
+        'php_overview'      => 'phpinfo, system, info',
+        'purge'             => 'permanently delete',
+        'security'          => 'password, passwords, requirements, two factor, two-factor, common passwords, remote login, logout, authentication',
+    ],
 
 ];
diff --git a/resources/lang/sq-AL/admin/settings/message.php b/resources/lang/sq-AL/admin/settings/message.php
index c9b0f34217..58abf14c5c 100644
--- a/resources/lang/sq-AL/admin/settings/message.php
+++ b/resources/lang/sq-AL/admin/settings/message.php
@@ -14,6 +14,9 @@ return [
         'restore_warning'       => 'Yes, restore it. I acknowledge that this will overwrite any existing data currently in the database. This will also log out all of your existing users (including you).',
         'restore_confirm'       => 'Are you sure you wish to restore your database from :filename?'
     ],
+    'restore' => [
+        'success'               => 'Your system backup has been restored. Please log in again.'
+    ],
     'purge' => [
         'error'     => 'An error has occurred while purging. ',
         'validation_failed'     => 'Your purge confirmation is incorrect. Please type the word "DELETE" in the confirmation box.',
@@ -33,6 +36,9 @@ return [
         'testing_authentication' => 'Testing LDAP Authentication...',
         'authentication_success' => 'User authenticated against LDAP successfully!'
     ],
+    'labels' => [
+        'null_template' => 'Label template not found. Please select a template.',
+        ],
     'webhook' => [
         'sending' => 'Sending :app test message...',
         'success' => 'Your :webhook_name Integration works!',
@@ -42,5 +48,12 @@ return [
         'error' => 'Something went wrong. :app responded with: :error_message',
         'error_redirect' => 'ERROR: 301/302 :endpoint returns a redirect. For security reasons, we don’t follow redirects. Please use the actual endpoint.',
         'error_misc' => 'Something went wrong. :( ',
-    ]
+        'webhook_fail' => ' webhook notification failed: Check to make sure the URL is still valid.',
+        'webhook_channel_not_found' => ' webhook channel not found.',
+        'ms_teams_deprecation' => 'The selected Microsoft Teams webhook URL will be deprecated Dec 31st, 2025. Please use a workflow URL. Microsoft\'s documentation on creating a workflow can be found <a href="https://support.microsoft.com/en-us/office/create-incoming-webhooks-with-workflows-for-microsoft-teams-8ae491c7-0394-4861-ba59-055e33f75498" target="_blank"> here.</a>',
+    ],
+    'location_scoping' => [
+        'not_saved' => 'Your settings were not saved.',
+        'mismatch' => 'There is 1 item in the database that need your attention before you can enable location scoping.|There are :count items in the database that need your attention before you can enable location scoping.',
+    ],
 ];
diff --git a/resources/lang/sq-AL/admin/statuslabels/table.php b/resources/lang/sq-AL/admin/statuslabels/table.php
index 27befb5ef7..1a0fab891e 100644
--- a/resources/lang/sq-AL/admin/statuslabels/table.php
+++ b/resources/lang/sq-AL/admin/statuslabels/table.php
@@ -1,14 +1,14 @@
 <?php
 
 return array(
-    'about'      	=> 'About Status Labels',
+    'about'      	=> 'About Status Types',
     'archived'      	=> 'Archived',
     'create'      	=> 'Create Status Label',
     'color'      	=> 'Chart Color',
     'default_label' => 'Default Label',
     'default_label_help' => 'This is used to ensure your most commonly used status labels appear at the top of the select box when creating/editing assets.',
     'deployable'      	=> 'Deployable',
-    'info'      	=> 'Status labels are used to describe the various states your assets could be in. They may be out for repair, lost/stolen, etc. You can create new status labels for deployable, pending and archived assets.',
+    'info'      	=> 'Status label types are used to describe the various states your assets could be in. They may be out for repair, lost/stolen, etc. You can create new status labels for your deployable, pending and archived assets according to your own workflow. For more information, <a href="https://snipe-it.readme.io/docs/overview#status-labels" target="_blank">see the documentation <i class="fa fa-external-link"></i></a>.',
     'name'      	=> 'Status Name',
     'pending'      	=> 'Pending',
     'status_type'   => 'Status Type',
diff --git a/resources/lang/sq-AL/admin/users/general.php b/resources/lang/sq-AL/admin/users/general.php
index b097ccec69..14f36cf151 100644
--- a/resources/lang/sq-AL/admin/users/general.php
+++ b/resources/lang/sq-AL/admin/users/general.php
@@ -19,6 +19,8 @@ return [
     'print_assigned'    => 'Print All Assigned',
     'email_assigned'    => 'Email List of All Assigned',
     'user_notified'     => 'User has been emailed a list of their currently assigned items.',
+    'users_notified'    => 'The user has been emailed a list of their currently assigned items.|:count users have been emailed a list of their currently assigned items.',
+    'users_notified_warning' => ':count user has been emailed a list of their currently assigned items, however :no_email users did not have an email address so could not be emailed.|:count users have been emailed a list of their currently assigned items, however :no_email user(s) did not have an email address so could not be emailed.',
     'auto_assign_label' => 'Include this user when auto-assigning eligible licenses',
     'auto_assign_help'  => 'Skip this user in auto assignment of licenses',
     'software_user'     => 'Software Checked out to :name',
diff --git a/resources/lang/sq-AL/admin/users/message.php b/resources/lang/sq-AL/admin/users/message.php
index 4d014775bd..b6ddad3aac 100644
--- a/resources/lang/sq-AL/admin/users/message.php
+++ b/resources/lang/sq-AL/admin/users/message.php
@@ -6,7 +6,7 @@ return array(
     'declined'                  => 'You have successfully declined this asset.',
     'bulk_manager_warn'	        => 'Your users have been successfully updated, however your manager entry was not saved because the manager you selected was also in the user list to be edited, and users may not be their own manager. Please select your users again, excluding the manager.',
     'user_exists'               => 'User already exists!',
-    'user_not_found'            => 'User does not exist.',
+    'user_not_found'            => 'User does not exist or you do not have permission view them.',
     'user_login_required'       => 'The login field is required',
     'user_has_no_assets_assigned' => 'No assets currently assigned to user.',
     'user_password_required'    => 'The password is required.',
@@ -53,6 +53,7 @@ return array(
         'ldap_could_not_search' => 'Could not search the LDAP server. Please check your LDAP server configuration in the LDAP config file. <br>Error from LDAP Server:',
         'ldap_could_not_get_entries' => 'Could not get entries from the LDAP server. Please check your LDAP server configuration in the LDAP config file. <br>Error from LDAP Server:',
         'password_ldap' => 'The password for this account is managed by LDAP/Active Directory. Please contact your IT department to change your password. ',
+        'multi_company_items_assigned' => 'This user has items assigned that belong to a different company. Please check them in or edit their company.'
     ),
 
     'deletefile' => array(
diff --git a/resources/lang/sq-AL/admin/users/table.php b/resources/lang/sq-AL/admin/users/table.php
index 7c5fb2cad5..094cdbc412 100644
--- a/resources/lang/sq-AL/admin/users/table.php
+++ b/resources/lang/sq-AL/admin/users/table.php
@@ -22,7 +22,7 @@ return array(
     'managed_locations'     => 'Managed Locations',
     'managed_users'         => 'Managed Users',
     'name' 					=> 'Name',
-    'nogroup'               => 'No groups have been created yet. To add one, visit: ',
+    'nogroup'               => 'No groups have been created yet. To add one, visit:',
     'notes'                 => 'Notes',
     'password_confirm' 		=> 'Confirm Password',
     'password' 				=> 'Password',
diff --git a/resources/lang/sq-AL/auth.php b/resources/lang/sq-AL/auth.php
index db310aa1bb..14d8acfce0 100644
--- a/resources/lang/sq-AL/auth.php
+++ b/resources/lang/sq-AL/auth.php
@@ -15,6 +15,6 @@ return array(
 
     'failed' => 'These credentials do not match our records.',
     'password' => 'The provided password is incorrect.',
-    'throttle' => 'Too many login attempts. Please try again in :seconds seconds.',
+    'throttle' => 'Too many login attempts. Please try again in :minutes minute(s).',
 
 );
diff --git a/resources/lang/sq-AL/auth/message.php b/resources/lang/sq-AL/auth/message.php
index 588c9069ca..08f638d058 100644
--- a/resources/lang/sq-AL/auth/message.php
+++ b/resources/lang/sq-AL/auth/message.php
@@ -6,8 +6,6 @@ return array(
     'account_not_found'      => 'The username or password is incorrect.',
     'account_not_activated'  => 'This user account is not activated.',
     'account_suspended'      => 'This user account is suspended.',
-    'account_banned'         => 'This user account is banned.',
-    'throttle'               => 'Too many failed login attempts. Please try again in :minutes minutes.',
 
     'two_factor' => array(
         'already_enrolled'      => 'Your device is already enrolled.',
diff --git a/resources/lang/sq-AL/button.php b/resources/lang/sq-AL/button.php
index 22821b8157..8a838e8faf 100644
--- a/resources/lang/sq-AL/button.php
+++ b/resources/lang/sq-AL/button.php
@@ -7,6 +7,7 @@ return [
     'checkin_and_delete'  	    => 'Checkin All / Delete User',
     'delete'  	                => 'Delete',
     'edit'    	                => 'Edit',
+    'clone'    	                => 'Clone',
     'restore' 	                => 'Restore',
     'remove'                    => 'Remove',
     'request'                   => 'Request',
@@ -21,4 +22,13 @@ return [
     'add_maintenance'           => 'Add Maintenance',
     'append'                    => 'Append',
     'new'                       => 'New',
+    'var' => [
+        'clone'     => 'Clone :item_type',
+        'edit'      => 'Edit :item_type',
+        'delete'    => 'Delete :item_type',
+        'restore'   => 'Restore :item_type',
+        'create'    => 'Create New :item_type',
+        'checkout'  => 'Checkout :item_type',
+        'checkin'   => 'Checkin :item_type',
+    ]
 ];
diff --git a/resources/lang/sq-AL/general.php b/resources/lang/sq-AL/general.php
index 5b1d0e9b3c..d2e16aafbb 100644
--- a/resources/lang/sq-AL/general.php
+++ b/resources/lang/sq-AL/general.php
@@ -10,7 +10,7 @@ return [
     'action'                => 'Action',
     'activity_report'		=> 'Activity Report',
     'address'				=> 'Address',
-    'admin'					=> 'Admin',
+    'admin'					=> 'Admin Settings',
     'admin_tooltip'			=> 'This user has admin privileges',
     'superuser'				=> 'Superuser',
     'superuser_tooltip'		=> 'This user has superuser privileges',
@@ -23,13 +23,16 @@ return [
     'asset_models'			=> 'Asset Models',
     'asset_model'			=> 'Model',
     'asset'					=> 'Asset',
+    'asset_previous'        => 'Asset (Previously Assigned)',
     'asset_report'          => 'Asset Report',
     'asset_tag'				=> 'Asset Tag',
     'asset_tags'            => 'Asset Tags',
     'assets_available'		=> 'Assets available',
     'accept_assets'         => 'Accept Assets :name',
     'accept_assets_menu'    => 'Accept Assets',
+    'accept_item'           => 'Accept Item',
     'audit'				    => 'Audit',
+    'audits'				=> 'Audits',
     'audit_report'			=> 'Audit Log',
     'assets'				=> 'Assets',
     'assets_audited'        => 'assets audited',
@@ -61,9 +64,12 @@ return [
     'changepassword'  		=> 'Change Password',
     'checkin'  				=> 'Checkin',
     'checkin_from'  		=> 'Checkin from',
+    'checkin_note'  		=> 'Checkin Note',
+    'checkout_note'  		=> 'Checkout Note',
     'checkout'  			=> 'Checkout',
     'checkouts_count'       => 'Checkouts',
     'checkins_count'        => 'Checkins',
+    'checkin_and_delete'  	=> 'Checkin and Delete',
     'user_requests_count'   => 'Requests',
     'city'  				=> 'City',
     'click_here'			=> 'Click here',
@@ -77,7 +83,7 @@ return [
     'consumables'			=> 'Consumables',
     'country'  				=> 'Country',
     'could_not_restore'     => 'Error restoring :item_type: :error',
-    'not_deleted'           => 'The :item_type is not deleted so it cannot be restored',
+    'not_deleted'           => 'The :item_type was not deleted and therefore cannot be restored',
     'create'				=> 'Create New',
     'created'               => 'Item Created',
     'created_asset'			=> 'created asset',
@@ -86,11 +92,13 @@ return [
     'record_created' 		=> 'Record Created',
     'updated_at' 			=> 'Updated at',
     'currency'  			=> '$', // this is deprecated
+    'currency_text'  		=> 'Currency', //
     'current'  				=> 'Current',
     'current_password'      => 'Current Password',
     'customize_report'      => 'Customize Report',
     'custom_report'         => 'Custom Asset Report',
     'dashboard'				=> 'Dashboard',
+    'data_source'           => 'Data Source',
     'days'      			=> 'days',
     'days_to_next_audit'    => 'Days to Next Audit',
     'date'					=> 'Date',
@@ -98,7 +106,7 @@ return [
     'debug_warning_text'    => 'This application is running in production mode with debugging enabled. This can expose sensitive data if your application is accessible to the outside world. Disable debug mode by setting the <code>APP_DEBUG</code> value in your <code>.env</code> file to <code>false</code>.',
     'delete'  				=> 'Delete',
     'delete_confirm'  		=> 'Are you sure you wish to delete :item?',
-    'delete_confirm_no_undo' => 'Are you sure you wish to delete :item? This can not be undone.',
+    'delete_confirm_no_undo' => 'Are you sure, you wish to delete :item? This cannot be undone.',
     'deleted'  				=> 'Deleted',
     'delete_seats'  		=> 'Deleted Seats',
     'deletion_failed'       => 'Deletion failed',
@@ -114,29 +122,13 @@ return [
     'editprofile'  			=> 'Edit Your Profile',
     'eol'					=> 'EOL',
     'email_domain'			=> 'Email Domain',
-    'email_format'			=> 'Email Format',
     'employee_number'       => 'Employee Number',
     'email_domain_help'		=> 'This is used to generate email addresses when importing',
     'error'				    => 'Error',
     'exclude_archived'      => 'Exclude Archived Assets',
     'exclude_deleted'       => 'Exclude Deleted Assets',
     'example'				=> 'Example: ',
-    'filastname_format'			=> 'First Initial Last Name (jsmith@example.com)',
-    'firstname_lastname_format'	=> 'First Name Last Name (jane.smith@example.com)',
-    'firstname_lastname_underscore_format' => 'First Name Last Name (jane_smith@example.com)',
-    'lastnamefirstinitial_format' =>  'Last Name First Initial (smithj@example.com)',
-    'firstintial_dot_lastname_format' => 'First Initial Last Name (j.smith@example.com)',
-    'firstname_lastname_display'	=> 'First Name Last Name (Jane Smith)',
-    'lastname_firstname_display'	=> 'Last Name First Name (Smith Jane)',
-    'name_display_format'	=> 'Name Display Format',
-    'first'					=> 'First',
-    'firstnamelastname'     => 'First Name Last Name (janesmith@example.com)',
-    'lastname_firstinitial' => 'Last Name First Initial (smith_j@example.com)',
-    'firstinitial.lastname' => 'First Initial Last Name (j.smith@example.com)',
-    'firstnamelastinitial'  => 'First Name Last Initial (janes@example.com)',
-    'lastnamefirstname'      => 'Last Name First Name (smith.jane@example.com)',
-    'first_name'			=> 'First Name',
-    'first_name_format'		=> 'First Name (jane@example.com)',
+
     'files'                 => 'Files',
     'file_name'				=> 'File',
     'file_type'             => 'File Type',
@@ -156,9 +148,9 @@ return [
     'image_delete'         	=> 'Delete Image',
     'include_deleted'       => 'Include Deleted Assets',
     'image_upload'         	=> 'Upload Image',
-    'filetypes_accepted_help'    => 'Accepted filetype is :types. Max upload size allowed is :size.|Accepted filetypes are :types. Max upload size allowed is :size.',
-    'filetypes_size_help'   => 'Max upload size allowed is :size.',
-    'image_filetypes_help'  => 'Accepted filetypes are jpg, webp, png, gif, svg, and avif. Max upload size allowed is :size.',
+    'filetypes_accepted_help'    => 'Accepted filetype is :types. The maximum size allowed is :size.|Accepted filetypes are :types. The maximum upload size allowed is :size.',
+    'filetypes_size_help'   => 'The maximum upload size allowed is :size.',
+    'image_filetypes_help'  => 'Accepted Filetypes are jpg, webp, png, gif, svg, and avif. The maximum upload size allowed is :size.',
     'unaccepted_image_type'  => 'This image file was not readable. Accepted filetypes are jpg, webp, png, gif, and svg. The mimetype of this file is: :mimetype.',
     'import'         	    => 'Import',
     'import_this_file'      => 'Map fields and process this file',
@@ -178,12 +170,17 @@ return [
     'last'					=> 'Last',
     'last_login'            => 'Last Login',
     'last_name'             => 'Last Name',
+    'firstname_lastname_display'	=> 'First Name Last Name (Jane Smith)',
+    'lastname_firstname_display'	=> 'Last Name First Name (Smith Jane)',
+    'name_display_format'	=> 'Name Display Format',
+    'first'					=> 'First',
+    'first_name'			=> 'First Name',
     'license'				=> 'License',
     'license_report'        => 'License Report',
     'licenses_available'	=> 'Licenses available',
     'licenses'				=> 'Licenses',
     'list_all'				=> 'List All',
-    'loading'				=> 'Loading... please wait....',
+    'loading'				=> 'Loading... please wait...',
     'lock_passwords'        => 'This field value will not be saved in a demo installation.',
     'feature_disabled'      => 'This feature has been disabled for the demo installation.',
     'location'              => 'Location',
@@ -193,7 +190,7 @@ return [
     'logout'				=> 'Logout',
     'lookup_by_tag'     => 'Lookup by Asset Tag',
     'maintenances'          => 'Maintenances',
-    'manage_api_keys'       => 'Manage API Keys',
+    'manage_api_keys'       => 'Manage API keys',
     'manufacturer'			=> 'Manufacturer',
     'manufacturers'			=> 'Manufacturers',
     'markdown'				=> 'This field allows <a href="https://help.github.com/articles/github-flavored-markdown/">Github flavored markdown</a>.',
@@ -215,6 +212,14 @@ return [
     'no_results'			=> 'No Results.',
     'no'  					=> 'No',
     'notes'  				=> 'Notes',
+    'note_added'            => 'Note Added',
+    'options'				=> 'Options',
+    'preview'				=> 'Preview',
+    'add_note'              => 'Add Note',
+    'note_edited'            => 'Note Edited',
+    'edit_note'              => 'Edit Note',
+    'note_deleted'            => 'Note Deleted',
+    'delete_note'              => 'Delete Note',
     'order_number'          => 'Order Number',
     'only_deleted'          => 'Only Deleted Assets',
     'page_menu'				=> 'Showing _MENU_ items',
@@ -229,7 +234,7 @@ return [
     'purchase_date'         => 'Purchase Date',
     'qty'		            => 'QTY',
     'quantity'		        => 'Quantity',
-    'quantity_minimum'      => 'You have :count items below or almost below minimum quantity levels',
+    'quantity_minimum'      => 'You have one item below or almost below minimum quantity levels|You have :count items below or almost below minimum quantity levels',
     'quickscan_checkin'  	=> 'Quick Scan Checkin',
     'quickscan_checkin_status'  	=> 'Checkin Status',
     'ready_to_deploy'		=> 'Ready to Deploy',
@@ -254,7 +259,7 @@ return [
     'select_all'            => 'Select All',
     'search'				=> 'Search',
     'select_category'       => 'Select a Category',
-    'select_datasource' => 'Select a Datasource',
+    'select_datasource' => 'Select a data source',
     'select_department'     => 'Select a Department',
     'select_depreciation'	=> 'Select a Depreciation Type',
     'select_location'		=> 'Select a Location',
@@ -274,13 +279,15 @@ return [
     'signed_off_by'         => 'Signed Off By',
     'skin'       			=> 'Skin',
     'webhook_msg_note'        => 'A notification will be sent via webhook',
-    'webhook_test_msg'        => 'Oh hai! Looks like your :app integration with Snipe-IT is working!',
+    'webhook_test_msg'        => 'Oh hai! It looks like your :app integration with Snipe-IT is working!',
     'some_features_disabled' => 'DEMO MODE: Some features are disabled for this installation.',
     'site_name'				=> 'Site Name',
     'state'  				=> 'State',
     'status_labels'			=> 'Status Labels',
+    'status_label'			=> 'Status Label',
     'status'    			=> 'Status',
     'accept_eula'           => 'Acceptance Agreement',
+    'show_or_hide_eulas' => 'Show/Hide EULAs',
     'supplier'              => 'Supplier',
     'suppliers'  			=> 'Suppliers',
     'sure_to_delete'        => 'Are you sure you wish to delete',
@@ -296,9 +303,9 @@ return [
     'type'  				=> 'Type',
     'undeployable'			=> 'Un-deployable',
     'unknown_admin'			=> 'Unknown Admin',
-    'username_format'		=> 'Username Format',
     'username'              => 'Username',
     'update'                => 'Update',
+    'updating_item' => 'Updating :item',
     'upload_filetypes_help'      => 'Allowed filetypes are png, gif, jpg, jpeg, doc, docx, pdf, xls, xlsx, txt, lic, xml, zip, rtf and rar. Max upload size allowed is :size.',
     'uploaded'              => 'Uploaded',
     'user'					=> 'User',
@@ -323,10 +330,10 @@ return [
     'token_expired'         => 'Your form session has expired. Please try again.',
     'login_enabled'         => 'Login Enabled',
     'audit_due'             => 'Due for Audit',
-    'audit_due_days'        => 'Assets Due for Audit Within :days Day|Assets Due for Audit Within :days Days',
+    'audit_due_days'        => '{}Assets Due or Overdue for Audit|[1]Assets Due or Overdue for Audit Within a Day|[2,*]Assets Due or Overdue for Audit Within :days Days',
     'checkin_due'           => 'Due for Checkin',
     'checkin_overdue'       => 'Overdue for Checkin',
-    'checkin_due_days'      => 'Assets Due for Checkin Within :days Day|Assets Due for Checkin Within :days Days',
+    'checkin_due_days'      => '{}Due for Checkin|[1]Assets Due for Checkin Within :days Day|[2,*]Assets Due for Checkin Within :days Days',
     'audit_overdue'         => 'Overdue for Audit',
     'accept'                => 'Accept :asset',
     'i_accept'              => 'I accept',
@@ -339,16 +346,16 @@ return [
     'view_all'              => 'view all',
     'hide_deleted'          => 'Hide Deleted',
     'email'                 => 'Email',
-    'do_not_change'         => 'Do Not Change',
-    'bug_report'            => 'Report a Bug',
+    'do_not_change'         => 'Do not change',
+    'bug_report'            => 'Report a bug',
     'user_manual'           => 'User\'s Manual',
     'setup_step_1'          => 'Step 1',
     'setup_step_2'          => 'Step 2',
     'setup_step_3'          => 'Step 3',
     'setup_step_4'          => 'Step 4',
     'setup_config_check'    => 'Configuration Check',
-    'setup_create_database' => 'Create Database Tables',
-    'setup_create_admin'    => 'Create Admin User',
+    'setup_create_database' => 'Create database tables',
+    'setup_create_admin'    => 'Create an admin user',
     'setup_done'            => 'Finished!',
     'bulk_edit_about_to'    => 'You are about to edit the following: ',
     'checked_out'           => 'Checked Out',
@@ -383,6 +390,8 @@ return [
     'new_license'           => 'New License',
     'new_accessory'         => 'New Accessory',
     'new_consumable'        => 'New Consumable',
+    'new_component'         => 'New Component',
+    'new_user'              => 'New User',
     'collapse'              => 'Collapse',
     'assigned'              => 'Assigned',
     'asset_count'           => 'Asset Count',
@@ -418,19 +427,20 @@ return [
     'bulk_soft_delete'      =>'Also soft-delete these users. Their asset history will remain intact unless/until you purge deleted records in the Admin Settings.',
     'bulk_checkin_delete_success' => 'Your selected users have been deleted and their items have been checked in.',
     'bulk_checkin_success' => 'The items for the selected users have been checked in.',
-    'set_to_null'           => 'Delete values for this asset|Delete values for all :asset_count assets ',
+    'set_to_null'           => 'Delete values for this selection|Delete values for all :selection_count selections ',
     'set_users_field_to_null'  => 'Delete :field values for this user|Delete :field values for all :user_count users ',
     'na_no_purchase_date'   => 'N/A - No purchase date provided',
     'assets_by_status'      => 'Assets by Status',
     'assets_by_status_type'      => 'Assets by Status Type',
     'pie_chart_type'        => 'Dashboard Pie Chart Type',
     'hello_name'            => 'Hello, :name!',
-    'unaccepted_profile_warning'   => 'You have :count items requiring acceptance. Click here to accept or decline them',
+    'unaccepted_profile_warning'   => 'You have one item requiring acceptance. Click here to accept or decline it | You have :count items requiring acceptance. Click here to accept or decline them',
     'start_date'            => 'Start Date',
     'end_date'            => 'End Date',
     'alt_uploaded_image_thumbnail' => 'Uploaded thumbnail',
     'placeholder_kit'       => 'Select a kit',
     'file_not_found'        => 'File not found',
+    'log_record_not_found'  => 'No record for that log entry was found.',
     'preview_not_available' => '(no preview)',
     'setup'                 => 'Setup',
     'pre_flight'            => 'Pre-Flight',
@@ -512,7 +522,7 @@ return [
     'checked_out_to_fields' => 'Checked Out To Fields',
     'percent_complete' => '% complete',
     'uploading' => 'Uploading... ',
-    'upload_error' => 'Error uploading file. Please check that there are no empty rows and that no column names are duplicated.',
+    'upload_error' => 'Error uploading file. Please check that you have no empty rows or duplicated column names in your CSV, and that the server permissions allow uploads.',
     'copy_to_clipboard' => 'Copy to Clipboard',
     'copied' => 'Copied!',
     'status_compatibility' => 'If assets are already assigned, they cannot be changed to a non-deployable status type and this value change will be skipped.',
@@ -549,6 +559,71 @@ return [
         'license_seats'  => ':count License Seat|:count License Seats',
         'consumables'  => ':count Consumable|:count Consumables',
         'components'  => ':count Component|:count Components',
-    ]
+    ],
+
+    'more_info' => 'More Info',
+    'quickscan_bulk_help' => 'Checking this box will edit the asset record to reflect this new location. Leaving it unchecked will simply note the location in the audit log. Note that if this asset is checked out, it will not change the location of the person, asset or location it is checked out to.',
+    'whoops' => 'Whoops!',
+    'something_went_wrong' => 'Something went wrong with your request.',
+    'close' => 'Close',
+    'expires' => 'Expires',
+    'map_fields'=> 'Map :item_type Fields',
+    'remaining_var' => ':count Remaining',
+    'label' => 'Label',
+    'import_asset_tag_exists' => 'An asset with the asset tag :asset_tag already exists and an update was not requested. No change was made.',
+    'countries_manually_entered_help' => 'Values with an asterisk (*) were manually entered and do not match existing ISO 3166 dropdown values',
+    'accessories_assigned' => 'Assigned Accessories',
+    'user_managed_passwords' => 'Password Management',
+    'user_managed_passwords_disallow' => 'Disallow users from managing their own passwords',
+    'user_managed_passwords_allow' => 'Allow users to manage their own passwords',
+    'from' => 'From',
+    'by' => 'By',
+
+// Add form placeholders here
+    'placeholders' => [
+        'notes'  => 'Add a note',
+    ],
+
+    'breadcrumb_button_actions' => [
+        'edit_item' => 'Edit :name',
+        'checkout_item' => 'Checkout :name',
+        'checkin_item' => 'Checkin :name',
+    ],
+
+    'skins' => [
+        'site_default' => 'Site Default',
+        'default_blue' => 'Default Blue',
+        'blue_dark' => 'Blue (Dark Mode)',
+        'green' => 'Green Dark',
+        'green_dark' => 'Green (Dark Mode)',
+        'red' => 'Red Dark',
+        'red_dark' => 'Red (Dark Mode)',
+        'orange' => 'Orange Dark',
+        'orange_dark' => 'Orange (Dark Mode)',
+        'black' => 'Black',
+        'black_dark' => 'Black (Dark Mode)',
+        'purple' => 'Purple',
+        'purple_dark' => 'Purple (Dark Mode)',
+        'yellow' => 'Yellow',
+        'yellow_dark' => 'Yellow (Dark Mode)',
+        'high_contrast' => 'High Contrast',
+
+    ],
+
+    'select_all_none' => 'Select/Unselect All',
+    'generic_model_not_found' => 'That :model was not found or you do not have permission to access it',
+    'deleted_models' => 'Deleted Asset Models',
+    'deleted_users' => 'Deleted Users',
+    'cost_each' => ':amount each',
+    'remove_current_image' => 'Remove current :type image',
+
+    'seeding' => [
+        'manufacturers' => [
+            'button' => 'Create Manufacturers',
+            'prompt' => 'You do not have any manufacturers yet. Would you like to seed a list of common manufacturers? (THIS WILL OVERWRITE EXISTING MANUFACTURERS, including those that have been soft-deleted.)',
+            'success' => 'Manufacturers seeded successfully',
+            'error' => 'Could not seed manufacturers. A manufacturer record already exists and seeding would overwrite it.|Could not seed manufacturers. :count manufacturer records already exist and seeding would overwrite them.',
+        ],
+    ],
 
 ];
diff --git a/resources/lang/sq-AL/localizations.php b/resources/lang/sq-AL/localizations.php
index f1232dd138..827ed4fca1 100644
--- a/resources/lang/sq-AL/localizations.php
+++ b/resources/lang/sq-AL/localizations.php
@@ -2,7 +2,7 @@
 
 return [
 
-    'select_language' => 'Select a language',
+    'select_language' => 'Select a Language',
     'languages' => [
         'en-US'=> 'English, US',
         'en-GB'=> 'English, UK',
@@ -40,7 +40,9 @@ return [
         'ms-MY'=> 'Malay',
         'mi-NZ'=> 'Maori',
         'mn-MN'=> 'Mongolian',
-        'no-NO'=> 'Norwegian',
+        'nb-NO'=> 'Norwegian Bokmål',
+        'om-ET' => 'Oromo (Ethiopian)',
+        //'nn-NO'=> 'Norwegian Nynorsk',
         'fa-IR'=> 'Persian',
         'pl-PL'=> 'Polish',
         'pt-PT'=> 'Portuguese',
@@ -66,7 +68,7 @@ return [
         'zu-ZA'=> 'Zulu',
     ],
 
-    'select_country' => 'Select a country',
+    'select_country' => 'Select a Country',
     
     'countries' => [
         'AC'=>'Ascension Island',
@@ -133,6 +135,7 @@ return [
         'EC'=>'Ecuador',
         'EE'=>'Estonia',
         'EG'=>'Egypt',
+        'GB-ENG'=>'England',
         'ER'=>'Eritrea',
         'ES'=>'Spain',
         'ET'=>'Ethiopia',
@@ -231,6 +234,7 @@ return [
         'NG'=>'Nigeria',
         'NI'=>'Nicaragua',
         'NL'=>'Netherlands',
+        'GB-NIR' => 'Northern Ireland',
         'NO'=>'Norway',
         'NP'=>'Nepal',
         'NR'=>'Nauru',
@@ -258,7 +262,7 @@ return [
         'RU'=>'Russian Federation',
         'RW'=>'Rwanda',
         'SA'=>'Saudi Arabia',
-        'UK'=>'Scotland',
+        'GB-SCT'=>'Scotland',
         'SB'=>'Solomon Islands',
         'SC'=>'Seychelles',
         'SS'=>'South Sudan',
@@ -310,6 +314,7 @@ return [
         'VI'=>'Virgin Islands (U.S.)',
         'VN'=>'Viet Nam',
         'VU'=>'Vanuatu',
+        'GB-WLS' =>'Wales',
         'WF'=>'Wallis And Futuna Islands',
         'WS'=>'Samoa',
         'YE'=>'Yemen',
diff --git a/resources/lang/sq-AL/mail.php b/resources/lang/sq-AL/mail.php
index 759ff0f5e8..797f735a2b 100644
--- a/resources/lang/sq-AL/mail.php
+++ b/resources/lang/sq-AL/mail.php
@@ -23,24 +23,25 @@ return [
     'Item_Requested' => 'Item Requested',
     'License_Checkin_Notification' => 'License checked in',
     'License_Checkout_Notification' => 'License checked out',
+    'license_for'   => 'License for',
     'Low_Inventory_Report' => 'Low Inventory Report',
     'a_user_canceled' => 'A user has canceled an item request on the website',
     'a_user_requested' => 'A user has requested an item on the website',
     'acceptance_asset_accepted' => 'A user has accepted an item',
     'acceptance_asset_declined' => 'A user has declined an item',
-    'accessory_name' => 'Accessory Name:',
-    'additional_notes' => 'Additional Notes:',
+    'accessory_name' => 'Accessory Name',
+    'additional_notes' => 'Additional Notes',
     'admin_has_created' => 'An administrator has created an account for you on the :web website.',
-    'asset' => 'Asset:',
-    'asset_name' => 'Asset Name:',
+    'asset' => 'Asset',
+    'asset_name' => 'Asset Name',
     'asset_requested' => 'Asset requested',
     'asset_tag' => 'Asset Tag',
     'assets_warrantee_alert' => 'There is :count asset with a warranty expiring in the next :threshold days.|There are :count assets with warranties expiring in the next :threshold days.',
     'assigned_to' => 'Assigned To',
     'best_regards' => 'Best regards,',
-    'canceled' => 'Canceled:',
-    'checkin_date' => 'Checkin Date:',
-    'checkout_date' => 'Checkout Date:',
+    'canceled' => 'Canceled',
+    'checkin_date' => 'Checkin Date',
+    'checkout_date' => 'Checkout Date',
     'checkedout_from' => 'Checked out from',
     'checkedin_from'  => 'Checked in from',
     'checked_into' => 'Checked into',
@@ -49,27 +50,30 @@ return [
     'click_to_confirm' => 'Please click on the following link to confirm your :web account:',
     'current_QTY' => 'Current QTY',
     'days' => 'Days',
-    'expecting_checkin_date' => 'Expected Checkin Date:',
+    'expecting_checkin_date' => 'Expected Checkin Date',
     'expires' => 'Expires',
     'hello' => 'Hello',
     'hi' => 'Hi',
     'i_have_read' => 'I have read and agree to the terms of use, and have received this item.',
     'inventory_report' => 'Inventory Report',
-    'item' => 'Item:',
+    'item' => 'Item',
+    'item_checked_reminder' => 'This is a reminder that you currently have :count items checked out to you that you have not accepted or declined. Please click the link below to confirm your decision.',
     'license_expiring_alert' => 'There is :count license expiring in the next :threshold days.|There are :count licenses expiring in the next :threshold days.',
     'link_to_update_password' => 'Please click on the following link to update your :web password:',
-    'login' => 'Login:',
+    'login' => 'Login',
     'login_first_admin' => 'Login to your new Snipe-IT installation using the credentials below:',
     'low_inventory_alert' => 'There is :count item that is below minimum inventory or will soon be low.|There are :count items that are below minimum inventory or will soon be low.',
     'min_QTY' => 'Min QTY',
     'name' => 'Name',
     'new_item_checked' => 'A new item has been checked out under your name, details are below.',
+    'new_item_checked_with_acceptance' => 'A new item has been checked out under your name that requires acceptance, details are below.',
+    'recent_item_checked' => 'An item was recently checked out under your name that requires acceptance, details are below.',
     'notes' => 'Notes',
-    'password' => 'Password:',
+    'password' => 'Password',
     'password_reset' => 'Password Reset',
     'read_the_terms' => 'Please read the terms of use below.',
     'read_the_terms_and_click' => 'Please read the terms of use below, and click on the link at the bottom to confirm that you read and agree to the terms of use, and have received the asset.',
-    'requested' => 'Requested:',
+    'requested' => 'Requested',
     'reset_link' => 'Your Password Reset Link',
     'reset_password' => 'Click here to reset your password:',
     'rights_reserved' => 'All rights reserved.',
@@ -86,8 +90,10 @@ return [
     'upcoming-audits' => 'There is :count asset that is coming up for audit within :threshold days.|There are :count assets that are coming up for audit within :threshold days.',
     'user' => 'User',
     'username' => 'Username',
+    'unaccepted_asset_reminder' => 'Reminder: You have Unaccepted Assets.',
     'welcome' => 'Welcome :name',
     'welcome_to' => 'Welcome to :web!',
     'your_assets' => 'View Your Assets',
     'your_credentials' => 'Your Snipe-IT credentials',
+    'mail_sent' => 'Mail sent successfully!',
 ];
diff --git a/resources/lang/sq-AL/validation.php b/resources/lang/sq-AL/validation.php
index 05374e23af..99c847f589 100644
--- a/resources/lang/sq-AL/validation.php
+++ b/resources/lang/sq-AL/validation.php
@@ -13,87 +13,150 @@ return [
     |
     */
 
-    'accepted'             => 'The :attribute must be accepted.',
-    'active_url'           => 'The :attribute is not a valid URL.',
-    'after'                => 'The :attribute must be a date after :date.',
-    'after_or_equal'       => 'The :attribute must be a date after or equal to :date.',
-    'alpha'                => 'The :attribute may only contain letters.',
-    'alpha_dash'           => 'The :attribute may only contain letters, numbers, and dashes.',
-    'alpha_num'            => 'The :attribute may only contain letters and numbers.',
-    'array'                => 'The :attribute must be an array.',
-    'before'               => 'The :attribute must be a date before :date.',
-    'before_or_equal'      => 'The :attribute must be a date before or equal to :date.',
-    'between'              => [
-        'numeric' => 'The :attribute must be between :min - :max.',
-        'file'    => 'The :attribute must be between :min - :max kilobytes.',
-        'string'  => 'The :attribute must be between :min - :max characters.',
-        'array'   => 'The :attribute must have between :min and :max items.',
+    'accepted' => 'The :attribute field must be accepted.',
+    'accepted_if' => 'The :attribute field must be accepted when :other is :value.',
+    'active_url' => 'The :attribute field must be a valid URL.',
+    'after' => 'The :attribute field must be a date after :date.',
+    'after_or_equal' => 'The :attribute field must be a date after or equal to :date.',
+    'alpha' => 'The :attribute field must only contain letters.',
+    'alpha_dash' => 'The :attribute field must only contain letters, numbers, dashes, and underscores.',
+    'alpha_num' => 'The :attribute field must only contain letters and numbers.',
+    'array' => 'The :attribute field must be an array.',
+    'ascii' => 'The :attribute field must only contain single-byte alphanumeric characters and symbols.',
+    'before' => 'The :attribute field must be a date before :date.',
+    'before_or_equal' => 'The :attribute field must be a date before or equal to :date.',
+    'between' => [
+        'array' => 'The :attribute field must have between :min and :max items.',
+        'file' => 'The :attribute field must be between :min and :max kilobytes.',
+        'numeric' => 'The :attribute field must be between :min and :max.',
+        'string' => 'The :attribute field must be between :min and :max characters.',
     ],
-    'boolean'              => 'The :attribute must be true or false.',
-    'confirmed'            => 'The :attribute confirmation does not match.',
-    'date'                 => 'The :attribute is not a valid date.',
-    'date_format'          => 'The :attribute does not match the format :format.',
-    'different'            => 'The :attribute and :other must be different.',
-    'digits'               => 'The :attribute must be :digits digits.',
-    'digits_between'       => 'The :attribute must be between :min and :max digits.',
-    'dimensions'           => 'The :attribute has invalid image dimensions.',
-    'distinct'             => 'The :attribute field has a duplicate value.',
-    'email'                => 'The :attribute format is invalid.',
-    'exists'               => 'The selected :attribute is invalid.',
-    'file'                 => 'The :attribute must be a file.',
-    'filled'               => 'The :attribute field must have a value.',
-    'image'                => 'The :attribute must be an image.',
+    'boolean' => 'The :attribute field must be true or false.',
+    'can' => 'The :attribute field contains an unauthorized value.',
+    'confirmed' => 'The :attribute field confirmation does not match.',
+    'contains' => 'The :attribute field is missing a required value.',
+    'current_password' => 'The password is incorrect.',
+    'date' => 'The :attribute field must be a valid date.',
+    'date_equals' => 'The :attribute field must be a date equal to :date.',
+    'date_format' => 'The :attribute field must match the format :format.',
+    'decimal' => 'The :attribute field must have :decimal decimal places.',
+    'declined' => 'The :attribute field must be declined.',
+    'declined_if' => 'The :attribute field must be declined when :other is :value.',
+    'different' => 'The :attribute field and :other must be different.',
+    'digits' => 'The :attribute field must be :digits digits.',
+    'digits_between' => 'The :attribute field must be between :min and :max digits.',
+    'dimensions' => 'The :attribute field has invalid image dimensions.',
+    'distinct' => 'The :attribute field has a duplicate value.',
+    'doesnt_end_with' => 'The :attribute field must not end with one of the following: :values.',
+    'doesnt_start_with' => 'The :attribute field must not start with one of the following: :values.',
+    'email' => 'The :attribute field must be a valid email address.',
+    'ends_with' => 'The :attribute field must end with one of the following: :values.',
+    'enum' => 'The selected :attribute is invalid.',
+    'exists' => 'The selected :attribute is invalid.',
+    'extensions' => 'The :attribute field must have one of the following extensions: :values.',
+    'file' => 'The :attribute field must be a file.',
+    'filled' => 'The :attribute field must have a value.',
+    'gt' => [
+        'array' => 'The :attribute field must have more than :value items.',
+        'file' => 'The :attribute field must be greater than :value kilobytes.',
+        'numeric' => 'The :attribute field must be greater than :value.',
+        'string' => 'The :attribute field must be greater than :value characters.',
+    ],
+    'gte' => [
+        'array' => 'The :attribute field must have :value items or more.',
+        'file' => 'The :attribute field must be greater than or equal to :value kilobytes.',
+        'numeric' => 'The :attribute field must be greater than or equal to :value.',
+        'string' => 'The :attribute field must be greater than or equal to :value characters.',
+    ],
+    'hex_color' => 'The :attribute field must be a valid hexadecimal color.',
+    'image' => 'The :attribute field must be an image.',
     'import_field_empty'    => 'The value for :fieldname cannot be null.',
-    'in'                   => 'The selected :attribute is invalid.',
-    'in_array'             => 'The :attribute field does not exist in :other.',
-    'integer'              => 'The :attribute must be an integer.',
-    'ip'                   => 'The :attribute must be a valid IP address.',
-    'ipv4'                 => 'The :attribute must be a valid IPv4 address.',
-    'ipv6'                 => 'The :attribute must be a valid IPv6 address.',
-    'is_unique_department' => 'The :attribute must be unique to this Company Location',
-    'json'                 => 'The :attribute must be a valid JSON string.',
-    'max'                  => [
-        'numeric' => 'The :attribute may not be greater than :max.',
-        'file'    => 'The :attribute may not be greater than :max kilobytes.',
-        'string'  => 'The :attribute may not be greater than :max characters.',
-        'array'   => 'The :attribute may not have more than :max items.',
+    'in' => 'The selected :attribute is invalid.',
+    'in_array' => 'The :attribute field must exist in :other.',
+    'integer' => 'The :attribute field must be an integer.',
+    'ip' => 'The :attribute field must be a valid IP address.',
+    'ipv4' => 'The :attribute field must be a valid IPv4 address.',
+    'ipv6' => 'The :attribute field must be a valid IPv6 address.',
+    'json' => 'The :attribute field must be a valid JSON string.',
+    'list' => 'The :attribute field must be a list.',
+    'lowercase' => 'The :attribute field must be lowercase.',
+    'lt' => [
+        'array' => 'The :attribute field must have less than :value items.',
+        'file' => 'The :attribute field must be less than :value kilobytes.',
+        'numeric' => 'The :attribute field must be less than :value.',
+        'string' => 'The :attribute field must be less than :value characters.',
     ],
-    'mimes'                => 'The :attribute must be a file of type: :values.',
-    'mimetypes'            => 'The :attribute must be a file of type: :values.',
-    'min'                  => [
-        'numeric' => 'The :attribute must be at least :min.',
-        'file'    => 'The :attribute must be at least :min kilobytes.',
-        'string'  => 'The :attribute must be at least :min characters.',
-        'array'   => 'The :attribute must have at least :min items.',
+    'lte' => [
+        'array' => 'The :attribute field must not have more than :value items.',
+        'file' => 'The :attribute field must be less than or equal to :value kilobytes.',
+        'numeric' => 'The :attribute field must be less than or equal to :value.',
+        'string' => 'The :attribute field must be less than or equal to :value characters.',
     ],
-    'starts_with'          => 'The :attribute must start with one of the following: :values.',
-    'ends_with'            => 'The :attribute must end with one of the following: :values.',
+    'mac_address' => 'The :attribute field must be a valid MAC address.',
+    'max' => [
+        'array' => 'The :attribute field must not have more than :max items.',
+        'file' => 'The :attribute field must not be greater than :max kilobytes.',
+        'numeric' => 'The :attribute field must not be greater than :max.',
+        'string' => 'The :attribute field must not be greater than :max characters.',
+    ],
+    'max_digits' => 'The :attribute field must not have more than :max digits.',
+    'mimes' => 'The :attribute field must be a file of type: :values.',
+    'mimetypes' => 'The :attribute field must be a file of type: :values.',
+    'min' => [
+        'array' => 'The :attribute field must have at least :min items.',
+        'file' => 'The :attribute field must be at least :min kilobytes.',
+        'numeric' => 'The :attribute field must be at least :min.',
+        'string' => 'The :attribute field must be at least :min characters.',
+    ],
+    'min_digits' => 'The :attribute field must have at least :min digits.',
+    'missing' => 'The :attribute field must be missing.',
+    'missing_if' => 'The :attribute field must be missing when :other is :value.',
+    'missing_unless' => 'The :attribute field must be missing unless :other is :value.',
+    'missing_with' => 'The :attribute field must be missing when :values is present.',
+    'missing_with_all' => 'The :attribute field must be missing when :values are present.',
+    'multiple_of' => 'The :attribute field must be a multiple of :value.',
+    'not_in' => 'The selected :attribute is invalid.',
+    'not_regex' => 'The :attribute field format is invalid.',
+    'numeric' => 'The :attribute field must be a number.',
+    'password' => [
+        'letters' => 'The :attribute field must contain at least one letter.',
+        'mixed' => 'The :attribute field must contain at least one uppercase and one lowercase letter.',
+        'numbers' => 'The :attribute field must contain at least one number.',
+        'symbols' => 'The :attribute field must contain at least one symbol.',
+        'uncompromised' => 'The given :attribute has appeared in a data leak. Please choose a different :attribute.',
+    ],
+    'percent'       => 'The depreciation minimum must be between 0 and 100 when depreciation type is percentage.',
 
-    'not_in'               => 'The selected :attribute is invalid.',
-    'numeric'              => 'The :attribute must be a number.',
-    'present'              => 'The :attribute field must be present.',
-    'valid_regex'          => 'That is not a valid regex. ',
-    'regex'                => 'The :attribute format is invalid.',
-    'required'             => 'The :attribute field is required.',
-    'required_if'          => 'The :attribute field is required when :other is :value.',
-    'required_unless'      => 'The :attribute field is required unless :other is in :values.',
-    'required_with'        => 'The :attribute field is required when :values is present.',
-    'required_with_all'    => 'The :attribute field is required when :values is present.',
-    'required_without'     => 'The :attribute field is required when :values is not present.',
+    'present' => 'The :attribute field must be present.',
+    'present_if' => 'The :attribute field must be present when :other is :value.',
+    'present_unless' => 'The :attribute field must be present unless :other is :value.',
+    'present_with' => 'The :attribute field must be present when :values is present.',
+    'present_with_all' => 'The :attribute field must be present when :values are present.',
+    'prohibited' => 'The :attribute field is prohibited.',
+    'prohibited_if' => 'The :attribute field is prohibited when :other is :value.',
+    'prohibited_unless' => 'The :attribute field is prohibited unless :other is in :values.',
+    'prohibits' => 'The :attribute field prohibits :other from being present.',
+    'regex' => 'The :attribute field format is invalid.',
+    'required' => 'The :attribute field is required.',
+    'required_array_keys' => 'The :attribute field must contain entries for: :values.',
+    'required_if' => 'The :attribute field is required when :other is :value.',
+    'required_if_accepted' => 'The :attribute field is required when :other is accepted.',
+    'required_if_declined' => 'The :attribute field is required when :other is declined.',
+    'required_unless' => 'The :attribute field is required unless :other is in :values.',
+    'required_with' => 'The :attribute field is required when :values is present.',
+    'required_with_all' => 'The :attribute field is required when :values are present.',
+    'required_without' => 'The :attribute field is required when :values is not present.',
     'required_without_all' => 'The :attribute field is required when none of :values are present.',
-    'same'                 => 'The :attribute and :other must match.',
-    'size'                 => [
-        'numeric' => 'The :attribute must be :size.',
-        'file'    => 'The :attribute must be :size kilobytes.',
-        'string'  => 'The :attribute must be :size characters.',
-        'array'   => 'The :attribute must contain :size items.',
+    'same' => 'The :attribute field must match :other.',
+    'size' => [
+        'array' => 'The :attribute field must contain :size items.',
+        'file' => 'The :attribute field must be :size kilobytes.',
+        'numeric' => 'The :attribute field must be :size.',
+        'string' => 'The :attribute field must be :size characters.',
     ],
+    'starts_with' => 'The :attribute field must start with one of the following: :values.',
     'string'               => 'The :attribute must be a string.',
-    'timezone'             => 'The :attribute must be a valid zone.',
     'two_column_unique_undeleted' => 'The :attribute must be unique across :table1 and :table2. ',
-    'unique'               => 'The :attribute has already been taken.',
-    'uploaded'             => 'The :attribute failed to upload.',
-    'url'                  => 'The :attribute format is invalid.',
     'unique_undeleted'     => 'The :attribute must be unique.',
     'non_circular'         => 'The :attribute must not create a circular reference.',
     'not_array'            => ':attribute cannot be an array.',
@@ -102,11 +165,14 @@ return [
     'numbers'              => 'Password must contain at least one number.',
     'case_diff'            => 'Password must use mixed case.',
     'symbols'              => 'Password must contain symbols.',
-    'gte'                  => [
-        'numeric'          => 'Value cannot be negative'
-    ],
-    'checkboxes'           => ':attribute contains invalid options.',
-    'radio_buttons'        => ':attribute is invalid.',
+    'timezone' => 'The :attribute field must be a valid timezone.',
+    'unique' => 'The :attribute has already been taken.',
+    'uploaded' => 'The :attribute failed to upload.',
+    'uppercase' => 'The :attribute field must be uppercase.',
+    'url' => 'The :attribute field must be a valid URL.',
+    'ulid' => 'The :attribute field must be a valid ULID.',
+    'uuid' => 'The :attribute field must be a valid UUID.',
+    'fmcs_location' => 'Full multiple company support and location scoping is enabled in the Admin Settings, and the selected location and selected company are not compatible.',
 
 
     /*
@@ -120,16 +186,22 @@ return [
     |
     */
 
+    'email_array'      => 'One or more email addresses is invalid.',
+    'checkboxes'           => ':attribute contains invalid options.',
+    'radio_buttons'        => ':attribute is invalid.',
+    
     'custom' => [
         'alpha_space' => 'The :attribute field contains a character that is not allowed.',
-        'email_array'      => 'One or more email addresses is invalid.',
+
         'hashed_pass'      => 'Your current password is incorrect',
         'dumbpwd'          => 'That password is too common.',
         'statuslabel_type' => 'You must select a valid status label type',
+        'custom_field_not_found'          => 'This field does not seem to exist, please double check your custom field names.',
+        'custom_field_not_found_on_model' => 'This field seems to exist, but is not available on this Asset Model\'s fieldset.',
 
         // date_format validation with slightly less stupid messages. It duplicates a lot, but it gets the job done :(
-        // We use this because the default error message for date_format is reflects php Y-m-d, which non-PHP
-        // people won't know how to format. 
+        // We use this because the default error message for date_format reflects php Y-m-d, which non-PHP
+        // people won't know how to format.
         'purchase_date.date_format'     => 'The :attribute must be a valid date in YYYY-MM-DD format',
         'last_audit_date.date_format'   =>  'The :attribute must be a valid date in YYYY-MM-DD hh:mm:ss format',
         'expiration_date.date_format'   =>  'The :attribute must be a valid date in YYYY-MM-DD format',
@@ -137,9 +209,15 @@ return [
         'expected_checkin.date_format'  =>  'The :attribute must be a valid date in YYYY-MM-DD format',
         'start_date.date_format'        =>  'The :attribute must be a valid date in YYYY-MM-DD format',
         'end_date.date_format'          =>  'The :attribute must be a valid date in YYYY-MM-DD format',
+        'invalid_value_in_field' => 'Invalid value included in this field',
 
-    ],
+        'ldap_username_field' => [
+            'not_in' =>         '<code>sAMAccountName</code> (mixed case) will likely not work. You should use <code>samaccountname</code> (lowercase) instead.'
+        ],
+        'ldap_auth_filter_query' => ['not_in' => '<code>uid=samaccountname</code> is probably not a valid auth filter. You probably want <code>uid=</code> '],
+        'ldap_filter' => ['regex' => 'This value should probably not be wrapped in parentheses.'],
 
+        ],
     /*
     |--------------------------------------------------------------------------
     | Custom Validation Attributes
@@ -155,8 +233,16 @@ return [
 
     /*
     |--------------------------------------------------------------------------
-    | Generic Validation Messages
+    | Generic Validation Messages - we use these in the jquery validation where we don't have
+    | access to the :attribute
     |--------------------------------------------------------------------------
     */
-    'invalid_value_in_field' => 'Invalid value included in this field',
+
+    'generic' => [
+        'invalid_value_in_field' => 'Invalid value included in this field',
+        'required' => 'This field is required',
+        'email' => 'Please enter a valid email address',
+    ],
+
+
 ];
diff --git a/resources/lang/sr-CS/account/general.php b/resources/lang/sr-CS/account/general.php
index 3e24d0c4d6..e0b3f44eeb 100644
--- a/resources/lang/sr-CS/account/general.php
+++ b/resources/lang/sr-CS/account/general.php
@@ -2,10 +2,16 @@
 
 return array(
     'personal_api_keys' => 'Lični API kključevi',
+    'personal_access_token' => 'Lični token za pristup',
+    'personal_api_keys_success' => 'Lični API ključ :key je uspešno napravljen',
+    'here_is_api_key' => 'Evo ga vaš novi lični token za pristup. Ovo je jedini put kada će biti prikazan zato ga nemojte izgubiti! Sada možete da koristite ovaj token za slanje API zahteva.',
     'api_key_warning' => 'Po generisanju API tokena, obavezno ga odmah iskopirajte jer vam neće biti ponovo vidljiv.',
     'api_base_url' => 'Vaša osnovna adresa API-ja se nalazi u:',
     'api_base_url_endpoint' => '&lt;endpoint&gt;',
     'api_token_expiration_time' => 'API tokeni će isteći za:',
     'api_reference' => 'Molim vas konsultujte <a href="https://snipe-it.readme.io/reference" target="_blank">API podsetnik</a> da bi ste pronašli određene API krajnje tačke i dodatnu API dokumentaciju.',
     'profile_updated' => 'Nalog je uspešno izmenjen',
+    'no_tokens' => 'Još uvek niste napravili nijedan lični token za pristup.',
+    'enable_sounds' => 'Omogući zvučne efekte',
+    'enable_confetti' => 'Omogući efekat konfeta',
 );
diff --git a/resources/lang/sr-CS/admin/accessories/message.php b/resources/lang/sr-CS/admin/accessories/message.php
index 31b3e0d1a2..eb234e6b68 100644
--- a/resources/lang/sr-CS/admin/accessories/message.php
+++ b/resources/lang/sr-CS/admin/accessories/message.php
@@ -26,7 +26,11 @@ return array(
         'error'   		=> 'Pribor nije potvrdjen, pokušajte ponovo',
         'success' 		=> 'Pribor je uspešno proveren.',
         'unavailable'   => 'Pribor nije dostupan za zaduživanje. Proverite dostupnu količinu',
-        'user_does_not_exist' => 'Korisnik nevažeći. Molim pokušajte ponovo.'
+        'user_does_not_exist' => 'Korisnik nevažeći. Molim pokušajte ponovo.',
+         'checkout_qty' => array(
+            'lte'  => 'Trenutno ima samo jedna dostupna dodatna oprema ove vrste, a vi pokušavate da zadužite :checkout_qty. Molim vas prilagodite količinu za zaduživanje prema dostupnom stanju ove opreme i pokušajte ponovo.|Trenutno ima ukupno :number_currently_remaining dodatne opreme, a vi pokušavate da zadužite :checkout_qty. Molim vas prilagodite količinu za zaduživanje prema dostupnom stanju ove opreme i pokušajte ponovo.',
+            ),
+           
     ),
 
     'checkin' => array(
diff --git a/resources/lang/sr-CS/admin/accessories/table.php b/resources/lang/sr-CS/admin/accessories/table.php
index 108bd201cc..094ab190ac 100644
--- a/resources/lang/sr-CS/admin/accessories/table.php
+++ b/resources/lang/sr-CS/admin/accessories/table.php
@@ -6,6 +6,4 @@ return array(
     'id'      					=> 'ID',
     'require_acceptance'      	=> 'Prihvatanje',
     'title'      				=> 'Naziv dodatne opreme, pribora',
-
-
 );
diff --git a/resources/lang/sr-CS/admin/components/message.php b/resources/lang/sr-CS/admin/components/message.php
index f1680719fa..565957130a 100644
--- a/resources/lang/sr-CS/admin/components/message.php
+++ b/resources/lang/sr-CS/admin/components/message.php
@@ -17,7 +17,8 @@ return array(
     'delete' => array(
         'confirm'   => 'Da li ste sigurni da želite izbrisati ovu komponentu?',
         'error'   => 'Došlo je do problema s brisanjem komponente. Molim pokušaj te ponovo.',
-        'success' => 'Komponenta je uspješno izbrisana.'
+        'success' => 'Komponenta je uspješno izbrisana.',
+        'error_qty'   => 'Neke komponente ovog tipa su još uvek zadužene. Razdužite ih i pokušajte ponovo.',
     ),
 
      'checkout' => array(
diff --git a/resources/lang/sr-CS/admin/consumables/general.php b/resources/lang/sr-CS/admin/consumables/general.php
index 26e154ba22..b43005a0b3 100644
--- a/resources/lang/sr-CS/admin/consumables/general.php
+++ b/resources/lang/sr-CS/admin/consumables/general.php
@@ -8,4 +8,5 @@ return array(
     'remaining' 			            => 'Preostalo',
     'total' 			                => 'Ukupno',
     'update'                            => 'Ažuriraj potrošni materijal',
+    'inventory_warning'                 => 'Stanje ove potrošne robe je ispod minimalne količine od :min_count',
 );
diff --git a/resources/lang/sr-CS/admin/consumables/message.php b/resources/lang/sr-CS/admin/consumables/message.php
index 0e8c0fa9ba..07ff15b4fc 100644
--- a/resources/lang/sr-CS/admin/consumables/message.php
+++ b/resources/lang/sr-CS/admin/consumables/message.php
@@ -2,6 +2,7 @@
 
 return array(
 
+    'invalid_category_type' => 'Kategorija mora biti kategorija potrošne robe.',
     'does_not_exist' => 'Potrošni materijal ne postoji.',
 
     'create' => array(
diff --git a/resources/lang/sr-CS/admin/custom_fields/general.php b/resources/lang/sr-CS/admin/custom_fields/general.php
index 8a1fe0a9f0..207d4dfd9a 100644
--- a/resources/lang/sr-CS/admin/custom_fields/general.php
+++ b/resources/lang/sr-CS/admin/custom_fields/general.php
@@ -35,7 +35,7 @@ return [
     'create_field_title' => 'Kreirajte prilagođeno polje',
     'value_encrypted'      	        => 'Vrednost ovog polja je šifrovana u bazi podataka. Samo administratori će moći da vide dešifrovanu vrednost',
     'show_in_email'     => 'Uvrsti vrednost ovog polja u e-porukama zaduženja koja se šalju korisnicima? Enkriptovana polja se ne mogu uvrstiti u e-porukama',
-    'show_in_email_short'     => 'Uvrsti u e-poruke.',
+    'show_in_email_short' => 'Uvrsti u e-poruke',
     'help_text' => 'Pomoćni tekst',
     'help_text_description' => 'Ovo je opcioni tekst koji će se pojaviti ispod elemenata obrasca tokom uređivanja elementa da bi se pružio kontekst na polju.',
     'about_custom_fields_title' => 'O prilagodljivom polju',
@@ -57,5 +57,8 @@ return [
     'show_in_requestable_list_short' => 'Prikaži u spisku imovine koja se može zatražiti',
     'show_in_requestable_list' => 'Prikaži vrednost u spisku imovine koja se može zatražiti. Enkriptovana polja neće biti prikazana',
     'encrypted_options' => 'Ovo polje je enkriptovano, zato neke opcije prikaza neće biti dostupne.',
+    'display_checkin' => 'Prikaži u formularima razduživanja',
+    'display_checkout' => 'Prikaži u formularima zaduživanja',
+    'display_audit' => 'Prikaži u formularu revizije',
 
 ];
diff --git a/resources/lang/sr-CS/admin/custom_fields/message.php b/resources/lang/sr-CS/admin/custom_fields/message.php
index ddbe4a6e6e..7ee2bd3c5e 100644
--- a/resources/lang/sr-CS/admin/custom_fields/message.php
+++ b/resources/lang/sr-CS/admin/custom_fields/message.php
@@ -5,6 +5,7 @@ return array(
     'field' => array(
         'invalid'   => 'Oznaka statusa ne postoji.',
         'already_added'   => 'Polje je već dodato',
+        'none_selected'   => 'Nijedno polje nije izabrano',
 
         'create' => array(
             'error'   => 'Polje nije kreirano, pokušajte ponovo.',
diff --git a/resources/lang/sr-CS/admin/depreciations/general.php b/resources/lang/sr-CS/admin/depreciations/general.php
index 9ead0e4096..9738e907c2 100644
--- a/resources/lang/sr-CS/admin/depreciations/general.php
+++ b/resources/lang/sr-CS/admin/depreciations/general.php
@@ -13,4 +13,8 @@ return [
     'no_depreciations_warning'               => 'strong>Upozorenje: </strong>
  Trenutno nemate podešene stope amortizacije.
  Podesite najmanje jednu stopu amortizacije da biste videli izveštaj o amortizaciji.',
+    'depreciation_method'                   => 'Izvještaj o amortizaciji',
+    'linear_depreciation'                   => 'Linearna (podrazumevano)',
+    'half_1'                                => 'Polugodišnja, uvek se primenjuje',
+    'half_2'                                => 'Polugodišnja, primenjuje se uz uslov',
 ];
diff --git a/resources/lang/sr-CS/admin/hardware/form.php b/resources/lang/sr-CS/admin/hardware/form.php
index 964ced76af..7cfba5b682 100644
--- a/resources/lang/sr-CS/admin/hardware/form.php
+++ b/resources/lang/sr-CS/admin/hardware/form.php
@@ -55,8 +55,11 @@ return [
     'asset_location_update_default' => 'Izmeni samo predefinisanu lokaciju',
     'asset_location_update_actual' => 'Izmeni samo stvarnu lokaciju',
     'asset_not_deployable' => 'Status imovine je nezaduživo. Ova imovina se ne može zadužiti.',
-    'asset_deployable' => 'Status imovine je zaduživo. Ova imovina se može zadužiti.',
+    'asset_not_deployable_checkin' => 'Status ove imovine nije zaduživ. Korišćenje ove oznake statusa će razdužiti imovinu.',
+    'asset_deployable' => 'Ova imovina može biti zadužena.',
     'processing_spinner' => 'Obrađivanje... (Ovo bi moglo da potraje u slučaju velikih datoteka)',
+    'processing' => 'Obrada... ',
     'optional_infos'  => 'Opcione informacije',
-    'order_details'   => 'Informacije o nabavci'
+    'order_details'   => 'Informacije o nabavci',
+    'calc_eol'    => 'Ako nulirate datum isteka, koristite automatsko izračunavanje isteka na osnovu datuma kupovine i stope isticanja.',
 ];
diff --git a/resources/lang/sr-CS/admin/hardware/general.php b/resources/lang/sr-CS/admin/hardware/general.php
index d428c34d32..fbb8c91427 100644
--- a/resources/lang/sr-CS/admin/hardware/general.php
+++ b/resources/lang/sr-CS/admin/hardware/general.php
@@ -5,8 +5,8 @@ return [
     'about_assets_text'            => 'Assets are items tracked by serial number or asset tag.  They tend to be higher value items where identifying a specific item matters.',
     'archived'  				=> 'Arhivirano',
     'asset'  					=> 'Imovina',
-    'bulk_checkout'             => 'Checkout Assets',
-    'bulk_checkin'              => 'Razduži imovinu',
+    'bulk_checkout'             => 'Bulk Checkout',
+    'bulk_checkin'              => 'Grupno razduživanje',
     'checkin'  					=> 'Checkin Asset',
     'checkout'  				=> 'Checkout Asset',
     'clone'  					=> 'Kloniraj imovinu',
@@ -27,8 +27,7 @@ return [
     'undeployable_tooltip'  	=> 'Ova imovina ima oznaku statusa koja nije zaduživa i nije je moguće zadužiti u ovom trenutku.',
     'view'  					=> 'Prikaz imovine',
     'csv_error' => 'Postoji greška u tvojoj CSV datoteci:',
-    'import_text' => '<p>Pošaljite CSV koji sadrži istoriju imovine. Imovina i korisnici MORAJU već da postoje u sistemu, ili će biti preskočeni. Poklapanje imovine za uvoz istorije se vrši prema inventarnom broju. Pokušaćemo da pronađemo odgovarajućeg korisnika prema imenu korisnika koji nam dostavite, i prema kriterijumu koji izaberete ispod. Ako ne izaberete kriterijume, pokušaćemo da izvršimo poklapanje prema formatu korisničkog imena koji ste podesili u <code>Administracija &gt; Opšta podešavanja</code>.</p><p>Polja uključena u CSV datoteci koraju da se poklope sa zaglavljima: <strong>Inventarni broj, Naziv, Datum zaduživanja, Datum razduživanja</strong>. Sva ostala polja će biti ignorisana. </p><p>Datum razduživanja: prazno ili datumi razduživanja u budućnosti će zadužiti stavke navedenom korisniku.  Nenavođenje datuma u koloni datuma razduživanja će upisati datum razduživanja sa današnjim datumom.</p>
-    ',
+    'import_text' => '<p>Postavi CSV koji sadrži istoriju imovine. Imovina i korisnici MORAJU već da postoje u sistemu, ili će biti preskočeni. Poklapanje imovine za potrebe uvoza istorije vrši se prema inventarnom broju. Pokušaćemo da pronađemo odgovarajuće g korisnika prema imenu korisnika koji ste dostavili, i prema uslovima koje izaberete ispod. Ako ne izaberete nijedan uslov, pokušažemo da ga pronađemo prema formatu korisničkog imena koje ste podesili u <code>Opštim administrativnim podešavanjima</code>.</p><p>Polja koja su sadržana u CSV-u moraju da se poklapaju sa zaglavljima: <strong>Inventarni broj, Naziv, Datum zaduživanja, Datum razduživanja</strong>. Sva ostala polja će biti ignorisana. </p><p>Datum razduživanja: prazno ili sa datumom u budućnosti će zadužiti stavku određenom korisniku. Izuzimanje kolone Datum razduživanja će kreirati datum razduživanja na današnji dan.</p>    ',
     'csv_import_match_f-l' => 'Pokušaj da poklopiš korisnike po <strong>ime.prezime</strong> (<code>pera.peric</code>) formatu',
     'csv_import_match_initial_last' => 'Pokušaj da poklopiš korisnike po <strong>prvi inicijal prezime</strong> (<code>pperic</code>) formatu',
     'csv_import_match_first' => 'Pokušaj da poklopiš korisnike po <strong>ime</strong> (<code>pera</code>) formatu',
diff --git a/resources/lang/sr-CS/admin/hardware/message.php b/resources/lang/sr-CS/admin/hardware/message.php
index 3f7ea019f8..010128e180 100644
--- a/resources/lang/sr-CS/admin/hardware/message.php
+++ b/resources/lang/sr-CS/admin/hardware/message.php
@@ -2,18 +2,23 @@
 
 return [
 
-    'undeployable' 		=> '<strong>Upozorenje: </strong> Ovaj resurs, imovina je označena kao trenutno nedeljiva. Ako se ovaj status promenio, ažurirajte status imovine.',
-    'does_not_exist' 	=> 'Imovina ne postoji.',
-    'does_not_exist_var'=> 'Nije pronađena imovina za oznakom :asset_tag.',
-    'no_tag' 	        => 'Nije navedena oznaka imovine.',
+    'undeployable' 		 => '<strong>Upozorenje: </strong> Ova imovina je trenutno označena kao nezaduživa. Ukoliko je status drugačiji, molim vas ažurirajte status imovine.',
+    'does_not_exist' 	 => 'Imovina ne postoji.',
+    'does_not_exist_var' => 'Nije pronađena imovina za oznakom :asset_tag.',
+    'no_tag' 	         => 'Nije navedena oznaka imovine.',
     'does_not_exist_or_not_requestable' => 'Imovina ne postoji ili se ne može zatražiti.',
-    'assoc_users'	 	=> 'Ovaj je resurs trenutno poveren korisniku i ne može se izbrisati. Najprije proverite resurs, a zatim ponovo pokušajte brisanje. ',
+    'assoc_users'	 	 => 'Ovaj je resurs trenutno poveren korisniku i ne može se izbrisati. Najprije proverite resurs, a zatim ponovo pokušajte brisanje. ',
     'warning_audit_date_mismatch' 	=> 'Naredni datum popisa ove imovine (:next_audit_date) je pre poslednjeg datuma popisa (:last_audit_date). Molim vas izmenite datum narednog popisa.',
+    'labels_generated'   => 'Oznake su uspešno generisane.',
+    'error_generating_labels' => 'Greška prilikom generisanja oznaka.',
+    'no_assets_selected' => 'Nijedna imovina nije izabrana.',
 
     'create' => [
         'error'   		=> 'Imovina, resurs nije kreiran, pokušajte ponovo. :(',
         'success' 		=> 'Imovina, resurs uspešno kreiran. :)',
         'success_linked' => 'Imovina sa oznakom :tag je uspešno napravljena. <strong><a href=":link" style="color: white;">Kliknite ovde za pregled</a></strong>.',
+        'multi_success_linked' => 'Imovina sa oznakom :links je uspešno dodata.|:count imovine je uspešno dodato. :links.',
+        'partial_failure' => 'Imovina nije mogla biti dodata. Razlog: :failures|:count imovine nisu mogle biti dodate. Razlozi: :failures',
     ],
 
     'update' => [
@@ -51,20 +56,24 @@ return [
     ],
 
     'import' => [
+        'import_button'         => 'Izvrši uvoz',
         'error'                 => 'Neke stavke nisu pravilno uvezene.',
         'errorDetail'           => 'Sledeće stavke nisu uvezene zbog grešaka.',
         'success'               => 'Vaš fajl je importovan',
         'file_delete_success'   => 'Vaš je fajl uspešno izbrisan',
         'file_delete_error'      => 'Fajl nime moguće izbrisati',
         'file_missing' => 'Nedostaje izabrana datoteka',
+        'file_already_deleted' => 'Izabrana datoteka je već obrisana',
         'header_row_has_malformed_characters' => 'Jedan ili više atributa u redu zaglavlja sadrži loše formatirane UTF-8 karaktere',
         'content_row_has_malformed_characters' => 'Jedan ili više atributa u prvom redu sadržaja sadrži loše formatirane UTF-8 karaktere',
+        'transliterate_failure' => 'Transliteracija iz :encoding u UTF8 nije uspela zbog neispravnih unetih karaktera'
     ],
 
 
     'delete' => [
         'confirm'   	=> 'Jeste li sigurni da želite izbrisati ovaj resurs?',
         'error'   		=> 'Došlo je do problema s brisanjem resursa. Molim pokušajte ponovo.',
+        'assigned_to_error' => '{1}Oznaka imovine: :asset_tag je trenutno zadužena. Razduži ovaj uređaj pre brisanja.|[2,*]Oznake imovine: :asset_tag su trenutno zadužene. Razduži ove uređaje pre brisanja.',
         'nothing_updated'   => 'Nijedna imovina nije odabrana, tako da ništa nije izbrisano.',
         'success' 		=> 'Imovina je uspešno obrisana.',
     ],
@@ -77,6 +86,11 @@ return [
         'no_assets_selected' => 'Morate odabrati barem jednu imovinu s popisa',
     ],
 
+    'multi-checkout' => [
+        'error'   => 'Imovina nije zadužena, molim vas pokušajte ponovo|Imovine nisu zadužene, molim vas pokušajte ponovo',
+        'success' => 'Imovina je uspešno zadužena.|Imovine su uspešno zadužene.',
+    ],
+
     'checkin' => [
         'error'   		=> 'Imovina nije prijavljena. Pokušajte ponovo',
         'success' 		=> 'Imovina je uspešno prijavljena.',
@@ -86,9 +100,10 @@ return [
     ],
 
     'requests' => [
-        'error'   		=> 'Imovina nije zatražena, pokušajte ponovo',
-        'success' 		=> 'Imovina je uspešno zatražena.',
-        'canceled'      => 'Checkout request successfully canceled',
+        'error'   		=> 'Zahtev nije bio uspešan, pokušajte ponovo.',
+        'success' 		=> 'Zahtev je uspešno podnet.',
+        'canceled'      => 'Zahtev je uspešno poništen.',
+        'cancel'        => 'Otkažite zahtev za ovu stavku',
     ],
 
 ];
diff --git a/resources/lang/sr-CS/admin/hardware/table.php b/resources/lang/sr-CS/admin/hardware/table.php
index a4dceb570f..656907b758 100644
--- a/resources/lang/sr-CS/admin/hardware/table.php
+++ b/resources/lang/sr-CS/admin/hardware/table.php
@@ -25,7 +25,6 @@ return [
     'image'		    => 'Slika uređaja',
     'days_without_acceptance' => 'Days Without Acceptance',
     'monthly_depreciation' => 'Mesečna amortizacija',
-    'assigned_to'    => 'Zadužen',
     'requesting_user' => 'Zahtevalac',
     'requested_date' => 'Datum zahteva',
     'changed'       => 'Izmenjeno',
diff --git a/resources/lang/sr-CS/admin/kits/general.php b/resources/lang/sr-CS/admin/kits/general.php
index bdb141fcbe..c87e6ea538 100644
--- a/resources/lang/sr-CS/admin/kits/general.php
+++ b/resources/lang/sr-CS/admin/kits/general.php
@@ -47,4 +47,5 @@ return [
     'kit_deleted'                       => 'Komplet je uspešno izbrisan',
     'kit_model_updated'                 => 'Model je uspešno ažuriran',
     'kit_model_detached'                => 'Model je uspešno odvojen',
+    'model_already_attached'            => 'Model je već povezan sa kompletom',
 ];
diff --git a/resources/lang/sr-CS/admin/licenses/general.php b/resources/lang/sr-CS/admin/licenses/general.php
index 2ab4c027d4..4eb98cc1dd 100644
--- a/resources/lang/sr-CS/admin/licenses/general.php
+++ b/resources/lang/sr-CS/admin/licenses/general.php
@@ -14,6 +14,7 @@ return array(
     'info'  					=> 'Informacije o licenci',
     'license_seats'  			=> 'Broj licenciranih mesta',
     'seat'  					=> 'Mesto',
+    'seat_count'  				=> 'Mesta :count',
     'seats'  					=> 'Mesta',
     'software_licenses'  		=> 'Licence za softver',
     'user'  					=> 'Korisnik',
@@ -23,12 +24,12 @@ return array(
         [
             'checkin_all'           => [
                 'button'            => 'Razduži sva mesta',
-                'modal'             => 'Ova radnja će razdužiti jedno mesto. | Ova radnja će razdužiti svih :checkedout_seats_count mesta za ovu licencu.',
+                'modal'             => 'Ova radnja će razdužiti jedno mesto. | Ova radnja će razdužiti svih :checkedout_seats_count mesta ove licence.',
                 'enabled_tooltip'   => 'Razduži SVA mesta za ovu licencu od korisnika i imovine',
                 'disabled_tooltip'  => 'Ovo je onemogućeno jer trenutno nema zaduženih mesta',
                 'disabled_tooltip_reassignable'  => 'Ovo je onemogućeno jer Licenca nije premestiva',
                 'success'           => 'Licenca je uspešno razdužena! | Sve licence su uspešno razdužene!',
-                'log_msg'           => 'Razduženo grupnim razduživanjem u ekranu licenci',
+                'log_msg'           => 'Razduži putem grupnog razduživanja u interfejsu licence',
             ],
 
             'checkout_all'              => [
diff --git a/resources/lang/sr-CS/admin/licenses/message.php b/resources/lang/sr-CS/admin/licenses/message.php
index 2eb89f1325..5a996b6e30 100644
--- a/resources/lang/sr-CS/admin/licenses/message.php
+++ b/resources/lang/sr-CS/admin/licenses/message.php
@@ -44,10 +44,13 @@ return array(
         'error'   => 'Došlo je do problema prilikom provere licence. Molim pokušajte ponovo.',
         'success' => 'Licenca je uspešno proverena',
         'not_enough_seats' => 'Nema dovoljno dostupnih licenci za zaduživanje',
+        'mismatch' => 'Dostavljeno mesto licence se ne poklapa sa licencom',
+        'unavailable' => 'Ovo mesto nije dostupno za zaduživanje.',
     ),
 
     'checkin' => array(
         'error'   => 'Došlo je do problema prilikom provere licence. Molim pokušajte ponovo.',
+        'not_reassignable' => 'Licenca nije premestiva',
         'success' => 'Licenca je uspešno proverena'
     ),
 
diff --git a/resources/lang/sr-CS/admin/locations/message.php b/resources/lang/sr-CS/admin/locations/message.php
index 522a7cce40..e29f0bb8c1 100644
--- a/resources/lang/sr-CS/admin/locations/message.php
+++ b/resources/lang/sr-CS/admin/locations/message.php
@@ -3,11 +3,12 @@
 return array(
 
     'does_not_exist' => 'Lokacija ne postoji.',
-    'assoc_users'    => 'Ova lokacija trenutno se ne može obrisati jer je navedena kao lokacija barem jedne imovine ili korisnika, ima imovinu dodeljenu njoj, ili je nadlokacija druge lokacije. Molim vas izmenite vaše modele da više nisu povezane sa ovom kompanijom i pokušajte ponovo. ',
+    'assoc_users'    => 'Lokacija trenutno nije obrisiva zato što je to lokacija zapisa barem jedne imovine ili korisnika, ima imovinu zaduženju njoj, ili je nadlokacija druge lokacije. Molim vas izmenite vaše podatke tako da više nemaju vezu ka ovoj lokaciji i pokušajte ponovo ',
     'assoc_assets'	 => 'Ta je lokacija trenutno povezana s barem jednim resursom i ne može se izbrisati. Ažurirajte resurs da se više ne referencira na tu lokaciju i pokušajte ponovno. ',
     'assoc_child_loc'	 => 'Ta je lokacija trenutno roditelj najmanje jednoj podredjenoj lokaciji i ne može se izbrisati. Ažurirajte svoje lokacije da se više ne referenciraju na ovu lokaciju i pokušajte ponovo. ',
     'assigned_assets' => 'Dodeljena imovina',
     'current_location' => 'Trenutna lokacija',
+    'open_map' => 'Otvori u :map_provider_icon mapama',
 
 
     'create' => array(
@@ -20,6 +21,11 @@ return array(
         'success' => 'Lokacija je uspešno ažurirana.'
     ),
 
+    'restore' => array(
+        'error'   => 'Lokacija nije povraćena, molim vas pokušajte ponovo',
+        'success' => 'Lokacija je uspešno povraćena.'
+    ),
+
     'delete' => array(
         'confirm'   	=> 'Jeste li sigurni da želite izbrisati tu lokaciju?',
         'error'   => 'Došlo je do problema s brisanjem lokacije. Molim pokušajte ponovo.',
diff --git a/resources/lang/sr-CS/admin/locations/table.php b/resources/lang/sr-CS/admin/locations/table.php
index 8ec9e89a20..35de465946 100644
--- a/resources/lang/sr-CS/admin/locations/table.php
+++ b/resources/lang/sr-CS/admin/locations/table.php
@@ -39,4 +39,5 @@ return [
     'signed_by_finance_auditor' => 'Obodrio:',
     'signed_by_location_manager' => 'Odobio:',
     'signed_by'                 => 'Signed Off By:',
+    'clone'  					=> 'Kloniraj lokaciju',
 ];
diff --git a/resources/lang/sr-CS/admin/models/general.php b/resources/lang/sr-CS/admin/models/general.php
index b0a0a6c684..f0ccc17c5c 100644
--- a/resources/lang/sr-CS/admin/models/general.php
+++ b/resources/lang/sr-CS/admin/models/general.php
@@ -3,7 +3,7 @@
 return array(
     'about_models_title'     => 'O modelu imovine',
     'about_models_text'           => 'Modeli imovine su način grupisanja identične imovine. "MBP 2013", "IPhone 6s" itd.',
-    'deleted'  					        => 'Ovaj model je izbrisan.',
+    'deleted'  					=> 'Ovaj model je izbrisan.',
     'bulk_delete'               => 'Skupno brisanje modela imovine',
     'bulk_delete_help'               => 'Use the checkboxes below to confirm the deletion of the selected asset models. Asset models that have assets associated with them cannot be deleted until the assets are associated with a different model.',
     'bulk_delete_warn'          => 'Spremate se da obrišete jedan model imovine.|Spremate se da obrišete :model_count modela imovine.',
diff --git a/resources/lang/sr-CS/admin/models/message.php b/resources/lang/sr-CS/admin/models/message.php
index e688d2b397..dc3f12f426 100644
--- a/resources/lang/sr-CS/admin/models/message.php
+++ b/resources/lang/sr-CS/admin/models/message.php
@@ -7,7 +7,7 @@ return array(
     'no_association' => 'UPOZORENJE! Model za ovu stavku je ili pogrešan ili nedostaje!',
     'no_association_fix' => 'Ovo će polomiti stvari na čudne i užasne načine. Uredite odmah ovu imovinu da bi ste je povezali sa modelom.',
     'assoc_users'	 => 'Ovaj je model trenutno povezan s jednom ili više imovina i ne može se izbrisati. Izbrišite imovinu pa pokušajte ponovo. ',
-
+    'invalid_category_type' => 'Ova kategorija mora biti kategorija imovine.',
 
     'create' => array(
         'error'   => 'Model nije kreiran, pokušajte ponovo.',
diff --git a/resources/lang/sr-CS/admin/reports/general.php b/resources/lang/sr-CS/admin/reports/general.php
index b60664102a..97339a7ca4 100644
--- a/resources/lang/sr-CS/admin/reports/general.php
+++ b/resources/lang/sr-CS/admin/reports/general.php
@@ -4,6 +4,7 @@ return [
     'info'   => 'Odaberite željene opcije za izveštaj o imovini.',
     'deleted_user' => 'Izbrisan korisnika',
     'send_reminder' => 'Pošalji podsetnik',
+    'cannot_send_reminder' => 'Korisnik je obrisan ili nema navedenu adresu e-pošte pa ne može da dobije potsetnik',
     'reminder_sent' => 'Podsetnik je poslat',
     'acceptance_deleted' => 'Zahtev za prihvatanje je izbrisan',
     'acceptance_request' => 'Zahtev za prihvatanje',
@@ -13,5 +14,10 @@ return [
         'user_state' => 'Pokrajina korisnika',
         'user_country' => 'Država korisnika',
         'user_zip' => 'Poštanski broj korisnika'
-    ]
-];
\ No newline at end of file
+    ],
+    'open_saved_template' => 'Otvori sačuvani šablon',
+    'save_template' =>  'Sačuvaj šablon',
+    'select_a_template' => 'Izaberi šablon',
+    'template_name' => 'Naziv šablona',
+    'update_template' => 'Izmeni šablon',
+];
diff --git a/resources/lang/sr-CS/admin/reports/message.php b/resources/lang/sr-CS/admin/reports/message.php
index 827fb0f52e..de4c476826 100644
--- a/resources/lang/sr-CS/admin/reports/message.php
+++ b/resources/lang/sr-CS/admin/reports/message.php
@@ -1,5 +1,16 @@
 <?php
 
-return array(
-    'error'   => 'Morate odabrati barem jednu opciju.'
-);
+return [
+    'about_templates' => 'O sačuvanim šablonima',
+    'saving_templates_description' => 'Izaberite vaše opcije, zatim unesite naziv šablona u polje iznad i kliknite na dugme \'Sačuvaj šablon\'. Koristite padajući meni da bi ste izabrali prethodno sačuvani šablon.',
+    'create'  => [
+        'success' => 'Šablon je uspešno sačuvan',
+    ],
+    'update' => [
+        'success' => 'Šablon je uspešno izmenjen',
+    ],
+    'delete' => [
+        'success' => 'Šablon je obrisan',
+        'no_delete_permission' => 'Šablon ne postoji ili vi nemate ovlašćenja da ga obrišete.',
+    ],
+];
diff --git a/resources/lang/sr-CS/admin/settings/general.php b/resources/lang/sr-CS/admin/settings/general.php
index 7dea809b82..735af5b95f 100644
--- a/resources/lang/sr-CS/admin/settings/general.php
+++ b/resources/lang/sr-CS/admin/settings/general.php
@@ -8,13 +8,13 @@ return [
     'ad_append_domain'          => 'Dodaj naziv domena polju za korisničko ime',
     'ad_append_domain_help'     => 'Od korisnika se ne traži da piše „korisničko ime@domain.local“, može samo da unese „korisničko ime“.',
     'admin_cc_email'            => 'CC Email',
-    'admin_cc_email_help'       => 'Ako želite da pošaljete kopiju mejlova za prijavu/odjavu koji se šalju korisnicima na dodatni nalog e-pošte, unesite je ovde. U suprotnom ostavite ovo polje praznim.',
+    'admin_cc_email_help'       => 'Pošalji kopiju e-poruke zaduženja/razduženja na ovu adresu.',
     'admin_settings'            => 'Administratorska podešavanja',
     'is_ad'				        => 'Ovo je Active Directory server',
     'alerts'                	=> 'Upozorenja',
     'alert_title'               => 'Podešavanja obaveštenja o nadogradnji',
     'alert_email'				=> 'Pošaljite upozorenja na',
-    'alert_email_help'    => 'Adrese e-pošte ili liste distribucije na koje želite da se šalju upozorenja, odvojene zarezima',
+    'alert_email_help'          => 'Adrese e-pošte ili liste distribucije na koje želite da se šalju upozorenja, odvojene zarezima.',
     'alerts_enabled'			=> 'Upozorenja na email su omogućena',
     'alert_interval'			=> 'Expiring Alerts Threshold (in days)',
     'alert_inv_threshold'		=> 'Inventory Alert Threshold',
@@ -31,15 +31,18 @@ return [
     'backups'					=> 'Rezervne kopije',
     'backups_help'              => 'Kreirajte, preuzmite i vratite rezervne kopije ',
     'backups_restoring'         => 'Vraćanje rezervne kopije',
+    'backups_clean' => 'Očisti rezervnu kopiju baze podataka pre povraćanja',
+    'backups_clean_helptext' => "Ovo može biti korisno ako menjate verzije baza popdataka",
     'backups_upload'            => 'Učitavanje rezervne kopije',
     'backups_path'              => 'Rezervne kopije se čuvaju na <code>:path</code>',
-    'backups_restore_warning'   => 'Koristite dugme za vraćanje <small><span class="btn btn-xs btn-warning"><i class="text-white fas fa-retweet" aria-hidden="true"></i></span></small> da bi ste vratili na raniju rezervnu kopiju. (Ovo trenutno ne radi sa S3 skladištem datoteka ili Docker-om.)<br><br>Vaša <strong>kompletna :app_name baza podataka i sve zakačene datoteke će biti potpuno zamenjene</strong> sa onim što je u rezervnoj kopiji.  ',
+    'backups_restore_warning'   => 'Koristite dugme za vraćanje <small><span class="btn btn-xs btn-warning"><i class="text-white fas fa-retweet" aria-hidden="true"></i></span></small> da bi ste vratili na raniju rezervnu kopiju. (Ovo trenutno ne radi sa S3 skladištem datoteka ili Docker-om.)<br><br>Vaša <strong>kompletna :app_name baza podataka i sve zakačene datoteke će biti potpuno zamenjene</strong> sa onim što je u rezervnoj kopiji  ',
     'backups_logged_out'         => 'Svi postojeći korisnici, uključujući i vas, biće odjavljeni kada se vraćanje završi.',
     'backups_large'             => 'Veoma velike rezervne kopije mogu da istekne tokom pokušaja vraćanja i možda će morati da se pokrenu preko komandne linije. ',
     'barcode_settings'			=> 'Podešavanja barkoda',
     'confirm_purge'			    => 'Potvrdite čišćenje',
     'confirm_purge_help'		=> 'Unesite tekst „IZBRIŠI“ u polje ispod da biste obrisali svoje izbrisane zapise. Ova radnja se ne može opozvati i TRAJNO će izbrisati sve meko izbrisane stavke i korisnike. (Trebalo bi prvo da napravite rezervnu kopiju, samo da biste bili sigurni.)',
     'custom_css'				=> 'Podesivi CSS',
+    'custom_css_placeholder'	=> 'Dodajte svoj prilagođeni CSS',
     'custom_css_help'			=> 'Unesite sve prilagođene CSS zamene koje želite da koristite. Nemojte uključivati &lt;stile&gt;&lt;/stile&gt; oznake.',
     'custom_forgot_pass_url'	=> 'Promenljivi URL za resetovanje lozinke',
     'custom_forgot_pass_url_help'	=> 'Ovo zamenjuje ugrađeni URL zaboravljene lozinke na ekranu za prijavljivanje, što je korisno za usmeravanje ljudi na internu ili hostovanu LDAP funkciju resetovanja lozinke. To će efikasno onemogućiti funkciju zaboravljene lozinke lokalnog korisnika.',
@@ -47,34 +50,34 @@ return [
     'dashboard_message_help'	=> 'Ovaj tekst će se pojaviti na kontrolnoj tabli za svakoga ko ima dozvolu da vidi kontrolnu tablu.',
     'default_currency'  		=> 'Podrazumevana valuta',
     'default_eula_text'			=> 'Default EULA',
+    'default_eula_text_placeholder' => 'Dodajte tekst vaše podrazumevane EULA-e',
     'default_language'			=> 'Podrazumevani jezik',
     'default_eula_help_text'	=> 'Takođe možete da povežete prilagođene EULA-e sa određenim kategorijama sredstava.',
     'acceptance_note'           => 'Dodajte napomenu vašoj odluci (opciono)',
     'display_asset_name'        => 'Naziv osnovnog sredstva',
     'display_checkout_date'     => 'Prikaži datum razduženja',
     'display_eol'               => 'Prikažite EOL u prikazu tabele',
-    'display_qr'                => 'Prikaži kodove',
+    'display_qr'                => 'Prikaži 2D barkod',
     'display_alt_barcode'		=> 'Prikaži 1D barkod',
-    'email_logo'                => 'Email Logo',
     'barcode_type'				=> '2D tip barkoda',
     'alt_barcode_type'			=> '1D barkod tip',
-    'email_logo_size'       => 'Kvadratni logotipi u imejlu izgledaju najbolje. ',
     'enabled'                   => 'Omogućeno',
     'eula_settings'				=> 'EULA Podešavanja',
     'eula_markdown'				=> 'Pravila korišćenja dopuštaju <a href="https://help.github.com/articles/github-flavored-markdown/">Github verziju markdown</a>.',
+    'empty_row_count'           => 'Razmak na početku polja (prazni redovi)',
+    'empty_row_count_help'      => 'Polja će se početi popunjavati nakon ovoliko preskočenih praznih redova na vrhu oznake.',
     'favicon'                   => 'Favicon',
     'favicon_format'            => 'Prihvaćeni tipovi datoteka su ico, png i gif. Drugi formati slika možda neće raditi u svim pretraživačima.',
     'favicon_size'          => 'Faviconi treba da budu slike kvadrvatog oblika, 16x16 piksela.',
     'footer_text'               => 'Dodatni tekst u futeru ',
     'footer_text_help'          => 'Ovaj tekst će se pojaviti u desnom podnožju. Veze su dozvoljene korišćenjem <a href="https://help.github.com/articles/github-flavored-markdovn/">Github flavored markdovn</a>. Prelomi redova, zaglavlja, slike itd. mogu dovesti do nepredvidivih rezultata.',
+    'footer_text_placeholder'   => 'Opcioni tekst u podnožju',
     'general_settings'			=> 'Osnovna podešavanja',
-    'general_settings_keywords' => 'podrška kompanije, potpis, prihvatanje, format e-poruke, format korisničkog imena, slike, po stranici, sličica, ugovor o korišćenju, gravatar, uslovi usluga, komandna tabla, privatnost',
     'general_settings_help'     => 'Podrazumevani EULA i još mnogo toga',
     'generate_backup'			=> 'Generiši rezervnu kopiju',
     'google_workspaces'         => 'Google Workspaces',
     'header_color'              => 'Boja zaglavlja',
     'info'                      => 'Ova podešavanja vam omogućavaju da prilagodite određene aspekte vaše instalacije.',
-    'label_logo'                => 'Label Logo',
     'label_logo_size'           => 'Kvadratni logotipi izgledaju najbolje – biće prikazani u gornjem desnom uglu svake oznake sredstva. ',
     'laravel'                   => 'Laravel verzija',
     'ldap'                      => 'LDAP',
@@ -94,7 +97,7 @@ return [
     'ldap_login_sync_help'      => 'Ovo samo testira da LDAP može ispravno da se sinhronizuje. Ako vaš upit za LDAP autentifikaciju nije tačan, korisnici možda i dalje neće moći da se prijave. PRVO MORATE SAČUVATI VAŠA AŽURIRANA LDAP PODEŠAVANJA.',
     'ldap_manager'              => 'LDAP Menadžer',
     'ldap_server'               => 'LDAP Server',
-    'ldap_server_help'          => 'Ovo bi trebalo da počne sa ldap:// (za nešifrovani ili TLS) ili ldaps:// (za SSL)',
+    'ldap_server_help'          => 'Ovo bi trebalo da počne sa ldap:// (za neenkriptovanu) ili ldaps:// (za TLS ili SSL)',
     'ldap_server_cert'			=> 'LDAP SSL validacija sertifikata',
     'ldap_server_cert_ignore'	=> 'Dopusti neispravne SSL sertifikate',
     'ldap_server_cert_help'		=> 'Označite ovo polje za potvrdu ako koristite samopotpisani SSL sertifikat i želite da prihvatite nevažeći SSL sertifikat.',
@@ -108,8 +111,8 @@ return [
     'ldap_pword'                => 'LDAP Bind lozinka',
     'ldap_basedn'               => 'Base Bind DN',
     'ldap_filter'               => 'LDAP Filter',
-    'ldap_pw_sync'              => 'LDAP sinhronizacija lozinke',
-    'ldap_pw_sync_help'         => 'Poništite izbor ovog polja ako ne želite da LDAP lozinke budu sinhronizovane sa lokalnim lozinkama. Onemogućavanje ovoga znači da vaši korisnici možda neće moći da se prijave ako je vaš LDAP server iz nekog razloga nedostupan.',
+    'ldap_pw_sync'              => 'Keširaj LDAP lozinke',
+    'ldap_pw_sync_help'         => 'Isključite ovu opciju ako ne želite da LDAP lozinke držite keširane kao lokalne hešovane lozinke. Onemogućavanje ovoga znači da vaši korisnici neće moći da se prijave ako vaš LDAP server nije dostupan iz nekog razloga.',
     'ldap_username_field'       => 'Polje za korisničko ime',
     'ldap_lname_field'          => 'Prezime',
     'ldap_fname_field'          => 'LDAP Ime',
@@ -117,13 +120,15 @@ return [
     'ldap_version'              => 'LDAP verzija',
     'ldap_active_flag'          => 'LDAP Active Flag',
     'ldap_activated_flag_help'  => 'Ova vrednost određuje da li sinhronizovani korisnik može da se prijavi u Snipe-IT. <strong>To ne utiče na mogućnost zaduživanja i razduživanja stavki prema njima</strong>, i trebao bi biti <strong>naziv atributa</strong> u okviru vašeg AD/LDAP-a, <strong>ne vrednost</strong>. <br><br>Ukoliko je ovo polje podešeno na naziv polja koje ne postoji u vašem AD/LDAP-u, ili je vrednost u AD/LDAP polju podešena na <code>0</code> ili <code>false</code>, <strong>prijava korisniku će biti onemogućena</strong>. Ukoliko je vrednost u AD/LDAP polju podešena na <code>1</code> ili <code>true</code> ili <em>bilo koji drugi tekst</em> znači da korisnik može da se prijavi. Kada je polje prazno u vašem AD-u, mi poštujemo <code>userAccountControl</code> atribut, koji obično omogućava nedeaktiviranim korisnicima da se prijave.',
+    'ldap_invert_active_flag'   => 'LDAP obrni oznaku aktivnosti',
+    'ldap_invert_active_flag_help'     => 'Ako je omogućeno: kada je vrednost LDAP oznake aktivnosti <code>0</code> ili <code>netačno</code> nalog korisnika biće aktivan.',
     'ldap_emp_num'              => 'LDAP broj zaposlenog',
     'ldap_email'                => 'LDAP Email',
     'ldap_test'                 => 'Test LDAP',
     'ldap_test_sync'            => 'Test LDAP sinhronizaciju',
     'license'                   => 'Licence za softver',
-    'load_remote'               => 'Koristi Gravatar',
-    'load_remote_help_text'		=> 'Isključi ovo polje ako tvoja instalacija ne može da učita skripte izvan interneta. Ovo će sprečiti Snipe-IT od pokušaja da učita slike sa Gravatara.',
+    'load_remote'               => 'Učitaj udaljene avatare',
+    'load_remote_help_text'		=> 'Isključi ovo polje ako tvoja instalacija ne može da učita skripte sa spoljnog interneta. Ovo će sprečiti Snipe-IT od pokušaja da učita slike sa Gravatara ili drugih spoljnih izvora.',
     'login'                     => 'Pokušaj logovanja',
     'login_attempt'             => 'Pokušaj logovanja',
     'login_ip'                  => 'IP adresa',
@@ -131,6 +136,7 @@ return [
     'login_user_agent'          => 'Korisnički agent',
     'login_help'                => 'Spisak pokušaja logovanja',
     'login_note'                => 'Poruka prilikom prijave',
+    'login_note_placeholder'            => "Ukoliko nemate akreditive za pristup ili ste pronašli uređaj koji pripada ovoj kompaniji, molim vas pozovite tehničku podršku na 888-555-1212. Hvala vam.",
     'login_note_help'           => 'Opciono uključite nekoliko rečenica na ekran za prijavu, na primer da biste pomogli ljudima koji su pronašli izgubljeni ili ukradeni uređaj. Ovo polje prihvata <a href="https://help.github.com/articles/github-flavored-markdovn/">Github flavored markdovn</a>',
     'login_remote_user_text'    => 'Opcije za prijavu udaljenog korisnika',
     'login_remote_user_enabled_text' => 'Omogućite prijavu pomoću zaglavlja udaljenog korisnika',
@@ -146,13 +152,16 @@ return [
     'logo_print_assets_help'    => 'Koristite brendiranje na listama sredstava za štampanje ',
     'full_multiple_companies_support_help_text' => 'Ograničavanje korisnika (uključujući administratore) dodeljenih kompanijama na imovinu njihove kompanije.',
     'full_multiple_companies_support_text' => 'Potpuna podrška za više kompanija',
+    'scope_locations_fmcs_support_text'  => 'Opseg lokacija sa punom podrškom višestruko kompanija',
+    'scope_locations_fmcs_support_help_text'  => 'Ograniči lokacije prema izabranoj kompaniji.',
+    'scope_locations_fmcs_check_button' => 'Proveri kompatibilnost',
+    'scope_locations_fmcs_support_disabled_text'  => 'Ova opcija je onemogućena jer imate neispravne lokacije podešene za :count ili više stavki.',
     'show_in_model_list'   => 'Prikaži u padajućim menijima modela',
     'optional'					=> 'opciono',
     'per_page'                  => 'Rezultati po stranici',
     'php'                       => 'PHP verzija',
-    'php_info'                  => 'PHP Info',
+    'php_info'                  => 'PHP informacije',
     'php_overview'              => 'PHP',
-    'php_overview_keywords'     => 'phpinfo, system, info',
     'php_overview_help'         => 'PHP sistem info',
     'php_gd_info'               => 'Morate da instalirate php-gd da biste prikazali QR kodove, pogledajte uputstva za instalaciju.',
     'php_gd_warning'            => 'PHP Image Processing i GD dodatak NIJE instaliran.',
@@ -218,6 +227,8 @@ return [
     'webhook_integration_help'    => ':app integracija je opciona, međutim krajnja tačka i kanal su neophodni ako želite da je koristitie. Da bi ste podesili :app integraciju, prvo morate da <a href=":webhook_link" target="_new" rel="noopener">napravite dolaznu veb zakačku</a> na vašem :app nalogu. Kliknite na <strong>Testiraj :app integraciju</strong> dugme da bi ste potvrdili da su podešavanja ispravna pre čuvanja. ',
     'webhook_integration_help_button'    => 'Onda kada sačuvate :app informacije, dugme za testiranje će se pojaviti.',
     'webhook_test_help'           => 'Testirajte da li je vaša integracija sa :app uspešno podešena. PRVO MORATE DA SAČUVATE IZMENJENA :app PODEŠAVANJA.',
+    'shortcuts_enabled'         => 'Omogući prečice',
+    'shortcuts_help_text'       => '<strong>Windows</strong>: Alt + Access taster, <strong>Mac</strong>: Control + Option + Access taster',
     'snipe_version'  			=> 'Snipe-IT verzija',
     'support_footer'            => 'Podška za linkove u podnožju ',
     'support_footer_help'       => 'Navedite ko vidi veze do informacija o podršci za Snipe-IT i korisničkog priručnika',
@@ -227,7 +238,6 @@ return [
     'update'                    => 'Obnovite podešavanja',
     'value'                     => 'Vrednost',
     'brand'                     => 'Brendiranje',
-    'brand_keywords'            => 'footer, logo, print, theme, skin, header, colors, color, css',
     'brand_help'                => 'Logo, naziv sajta',
     'web_brand'                 => 'Tip veb brendiranja',
     'about_settings_title'      => 'O podešavanjima',
@@ -276,6 +286,8 @@ return [
     'two_factor_enrollment_text'	=> "Potrebna je dvofaktorska autentifikacija, ali vaš uređaj još nije registrovan. Otvorite aplikaciju Google Authenticator i skenirajte QR kod u nastavku da biste registrovali svoj uređaj. Kada registrujete svoj uređaj, unesite kod ispod",
     'require_accept_signature'      => 'Zahtevan potpis',
     'require_accept_signature_help_text'      => 'Omogućavanje ove funkcije će zahtevati od korisnika da se fizički odjave za prihvatanje sredstva.',
+    'require_checkinout_notes'  => 'Zahteva se beleška pri razduživanju/zaduživanju',
+    'require_checkinout_notes_help_text'    => 'Uključivanjem ove opcije zahtevaće se da polje za belešku bude popunjeno prilikom razduživanja ili razduživanja imovine.',
     'left'        => 'levo',
     'right'        => 'desno',
     'top'        => 'gore',
@@ -313,24 +325,24 @@ return [
     'filter_by_keyword' => 'Filtrirajte po podešavanju ključne reči',
     'security' => 'Bezbednost',
     'security_title' => 'Obnovite bezbednosna podešavanja',
-    'security_keywords' => 'lozinka, lozinke, zahtevi, dva faktora, dva faktora, uobičajene lozinke, daljinsko prijavljivanje, odjava, autentifikacija',
     'security_help' => 'Dvofaktorska autentifikacija, ograničenja lozinkom',
-    'groups_keywords' => 'dozvole, grupe dozvola, ovlašćenje',
     'groups_help' => 'Grupe dozvola naloga',
     'localization' => 'Lokalizacija',
     'localization_title' => 'Obnovi podešavanja lokalizacije',
-    'localization_keywords' => 'okalizacija, valuta, lokalni, lokal, vremenska zona, vremenska zona, međunarodna, internacionalizacija, jezik, jezici, prevod',
     'localization_help' => 'Jezik, prikaz datuma',
     'notifications' => 'Obaveštenja',
     'notifications_help' => 'Obaveštenja e-poštom i podešavanja popisa',
     'asset_tags_help' => 'Povećavanje i prefiksi',
     'labels' => 'Oznake',
     'labels_title' => 'Obnovite podešavanja oznaka',
-    'labels_help' => 'Veličina oznake &amp; podešavanja',
-    'purge_keywords' => 'trajno brisanje',
+    'labels_help' => 'Podešavanja barkodova i nalepnica',
     'purge_help' => 'Očistite izbrisane zapise',
     'ldap_extension_warning' => 'Ne izgleda da je LDAP ekstenzija instalirana ili omogućena na ovom serveru. I dalje možete da sačuvate svoja podešavanja, ali ćete morati da omogućite LDAP ekstenziju za PHP pre nego što LDAP sinhronizacija ili prijavljivanje budu funkcionisali.',
     'ldap_ad' => 'LDAP/AD',
+    'ldap_test_label' => 'Testiraj LDAP sinhronizaciju',
+    'ldap_test_login' => ' Testiraj LDAP prijavu',
+    'ldap_username_placeholder' => 'LDAP korisničko ime',
+    'ldap_password_placeholder' => 'LDAP lozinka',
     'employee_number' => 'Broj zaposlenog',
     'create_admin_user' => 'Kreiraj korisnika ::',
     'create_admin_success' => 'Uspešno! Vaš admin korisnik je dodat!',
@@ -342,6 +354,8 @@ return [
     'setup_migration_create_user' => 'Sledeće: Kreirajte korisnika',
     'ldap_settings_link' => 'LDAP podešavanja stranice',
     'slack_test' => 'Testirajte <i class="fab fa-slack"></i> integraciju',
+    'status_label_name' => 'Naziv oznake statusa',
+    'super_admin_only'  => 'Samo super admin',
     'label2_enable'           => 'Novi sistem nalepnica',
     'label2_enable_help'      => 'Pređite na novi sistem nalepnica. <b>Napomena: Moraćete da sačuvate ovo podešavanje pre podešavanja ostalih.</b>',
     'label2_template'         => 'Šablon',
@@ -356,12 +370,15 @@ return [
     'label2_2d_type'          => 'Vrsta 2D barkoda',
     'label2_2d_type_help'     => 'Format za 2D barkodove',
     'label2_2d_target'        => '2D barkod meta',
-    'label2_2d_target_help'   => 'URL adresa gde cilja 2D barkod kada se skenira',
+    'label2_2d_target_help'   => 'Podatak koji će biti sadržan u 2D barkodu',
     'label2_fields'           => 'Definicija polja',
     'label2_fields_help'      => 'Polja mogi biti dodata, uklonjena i presložena u levoj koloni. Za svako polje, višestruko opcija za Naziv i IzvorPodataka mogu biti dodato, uklonjeno i presloženo u desnoj koloni.',
+    'purge_barcodes' => 'Obriši sve barkodove',
     'help_asterisk_bold'    => 'Tekst unet kao <code>**tekst**</code> biće prikazan podebljan',
     'help_blank_to_use'     => 'Ostavite prazno da bi se koristila vrednost iz <code>:setting_name</code>',
     'help_default_will_use' => '<code>:default</code> će koristiti vrednost iz <code>:setting_name</code>. <br>Upamtite da vrednost barkoda mora da se usaglasi sa specifikacijom odgovarajućeg barkoda da bi bio uspešno generisan. Molim vas pogledajte <a href="https://snipe-it.readme.io/docs/barcodes">dokumentaciju <i class="fa fa-external-link"></i></a> za više detalja. ',
+    'asset_id'              => 'ID imovine',
+    'data'               => 'Podatak',
     'default'               => 'Podrazumevano',
     'none'                  => 'Ništa',
     'google_callback_help' => 'Ovo treba uneti kao pozivna URL adresa u vašim Google OAuth podešavanjima aplikacije u vašoj organizaciji <strong><a href="https://console.cloud.google.com/" target="_blank">Google developer konzole <i class="fa fa-external-link" aria-hidden="true"></i></a></strong>.',
@@ -373,7 +390,100 @@ return [
     'database_driver' => 'Drajver Baze Podataka',
     'bs_table_storage' => 'Skladište tabele',
     'timezone' => 'Vremenska zona',
+    'test_mail' => 'Probna e-poruka',
     'profile_edit'          => 'Izmeni profil',
     'profile_edit_help'          => 'Dozvoli korisnicima da izmene svoje profile.',
+    'default_avatar' => 'Prilagođeni podrazumevani avatar',
+    'default_avatar_help' => 'Ova slika će se prikazivati kao profilna ako korisnik nema svoju sliku profila.',
+    'restore_default_avatar' => 'Vrati <a href=":default_avatar" data-toggle="lightbox" data-type="image">originalnu podrazumevanu sličicu</a>',
+    'restore_default_avatar_help' => '',
+    'due_checkin_days' => 'Upozorenje da je vreme za razduženje',
+    'due_checkin_days_help' => 'Koliko dana ranije pre očekivanog razduženja imovine bi trebalo biti navedena u stranici "Vreme je za razduživanje"?',
+    'no_groups' => 'Još uvak nisu kreirane nikakve grupe. Poseti <code>Administrativna podešavanja > Grupe dozvola</code> da bi dodao neku.',
+    'text' => 'Tekst',
+
+    'username_formats' => [
+        'username_format'		=> 'Format korisničkog imena',
+        'firstname_lastname_format'	=> 'Ime Prezime (jane.smith)',
+        'first_name_format'	        => 'Ime (jane)',
+        'last_name_format'		=> 'Prezime (doe)',
+        'filastname_format'			=> 'Prvo slovo imena Prezime (jsmith)',
+        'lastnamefirstinitial_format' =>  'Prezime Prvo slovo imena (smithj)',
+        'firstname_lastname_underscore_format' => 'Ime Prezime (jane_smith)',
+        'firstinitial.lastname' => 'Prvo slovo imena Prezime (j.smith)',
+        'lastname_firstinitial' => 'Prezime Prvo slovo imena (smith_j)',
+        'lastname_dot_firstinitial_format' => 'Prezime Prvo slovo imena (smith.j)',
+        'firstnamelastname'     => 'Ime Prezime (janesmith)',
+        'firstnamelastinitial'  => 'Ime Prvo slovo prezimena (janes)',
+        'lastnamefirstname'      => 'Prezime.Ime (smith.jane)',
+    ],
+
+    'email_formats' => [
+        'email_format'			=> 'Email Format',
+        'firstname_lastname_format'	=> 'Ime Prezime (jane.smith@example.com)',
+        'first_name_format'		=> 'Ime (jane@example.com)',
+        'last_name_format'		=> 'Prezime (doe@example.com)',
+        'filastname_format'			=> 'Prvo slovo imena Prezime (jsmith@example.com)',
+        'lastnamefirstinitial_format' =>  'Prezime Prvo slovo imena (smithj@example.com)',
+        'firstname_lastname_underscore_format' => 'Ime Prezime (jane_smith@example.com)',
+        'firstinitial.lastname' => 'Inicijal imena Prezime (j.smith@example.com)',
+        'lastname_firstinitial' => 'Prezime inicijal Imena (smith_j@example.com)',
+        'lastname_dot_firstinitial_format' => 'Prezime Prvo slovo imena (smith.j@example.com)',
+        'firstnamelastname'     => 'Ime Prezime (janesmith@example.com)',
+        'firstnamelastinitial'  => 'Ime inicijal Prezimena (janes@example.com)',
+        'lastnamefirstname'      => 'Prezime.Ime (smith.jane@example.com)',
+    ],
+
+
+
+    'logo_labels' => [
+        'acceptance_pdf_logo'       => 'Logotip u PDF-u',
+        'email_logo'                => 'Logotip u e-poruci',
+        'label_logo'                => 'Logotip u e-poruci',
+        'logo'                      => 'Logotip na sajtu',
+        'favicon'                   => 'Favicon',
+    ],
+
+    'logo_help' => [
+        'email_logo_size'       => 'Kvadratni logotipi u e-poruci izgledaju najbolje. ',
+    ],
+
+    'logo_option_types' => [
+        'text' => 'Tekst',
+        'logo' => 'Logotip',
+        'logo_and_text' => 'Logotip i tekst',
+    ],
+
+
+    'legends' => [
+        'scoping' => 'Opsezanje',
+        'formats' => 'Podrazumevani formati',
+        'profiles' => 'Korisnički profili',
+        'eula' => 'EULA i podešavanja prihvatanja',
+        'misc_display' => 'Razne opcije prikaza',
+        'email' => 'Podešavanja e-pošte',
+        'checkin' => 'Podešavanja razduženja',
+        'dashboard' => 'Podešavanja prijave i kontrolne table',
+        'misc' => 'Razno',
+        'logos' => 'Logotipi i prikaz',
+        'colors' => 'Boje i izgled',
+        'footer' => 'Podešavanja podnožja',
+        'security' => 'Podešavanja bezbednosti',
+        'general' => 'Opšte',
+        'intervals' => 'Intervali i granice',
+    ],
+
+
+    /* Keywords for settings overview help */
+    'keywords' => [
+        'brand'             => 'footer, logo, print, theme, skin, header, colors, color, css',
+        'general_settings'  => 'podrška kompanije, potpis, prihvatanje, format e-poruke, format korisničkog imena, slike, po stranici, sličica, ugovor o korišćenju, gravatar, uslovi usluga, komandna tabla, privatnost',
+        'groups'            => 'dozvole, grupe dozvola, ovlašćenje',
+        'labels'            => 'nalepvnice, barkodovi, barkod, listovi papira, štampa, upc, qr, 1d, 2d',
+        'localization'      => 'okalizacija, valuta, lokalni, lokal, vremenska zona, vremenska zona, međunarodna, internacionalizacija, jezik, jezici, prevod',
+        'php_overview'      => 'phpinfo, system, info',
+        'purge'             => 'trajno brisanje',
+        'security'          => 'lozinka, lozinke, zahtevi, dva faktora, dva faktora, uobičajene lozinke, daljinsko prijavljivanje, odjava, autentifikacija',
+    ],
 
 ];
diff --git a/resources/lang/sr-CS/admin/settings/message.php b/resources/lang/sr-CS/admin/settings/message.php
index 7a40d85f92..c594de10b0 100644
--- a/resources/lang/sr-CS/admin/settings/message.php
+++ b/resources/lang/sr-CS/admin/settings/message.php
@@ -14,6 +14,9 @@ return [
         'restore_warning'       => 'Da, vrati. Potvrđujem da će ovo zameniti sve postojeće podatke koji se trenutno nalaze u bazi podataka. Ovo će takođe odjaviti sve vaše postojeće korisnike (uključujući i Vas).',
         'restore_confirm'       => 'Da li ste sigurni da želite da vratite svoju bazu podataka sa :filename?'
     ],
+    'restore' => [
+        'success'               => 'Rezervna kopija vašeg sistema je povraćena. Molim vas prijavite se ponovo.'
+    ],
     'purge' => [
         'error'     => 'Došlo je do pogreške prilikom brisanja. ',
         'validation_failed'     => 'Vaša potvrda o brisanju nije ispravna. Upišite reč "DELETE" u okvir potvrde.',
@@ -33,6 +36,9 @@ return [
         'testing_authentication' => 'Testiranje LDAP autentifikacije...',
         'authentication_success' => 'Autentifikacija korisnika na LDAP-u je uspešna!'
     ],
+    'labels' => [
+        'null_template' => 'Nije pronađen šablon oznake. Molim vas izaberite šablon.',
+        ],
     'webhook' => [
         'sending' => 'Slanje :app probne poruke...',
         'success' => 'Vaša :webhook_name integracija funkcioniše!',
@@ -42,5 +48,12 @@ return [
         'error' => 'Nešto nije u redu. :app je adgovorila sa: :error_message',
         'error_redirect' => 'ERROR: 301/302 :endpoint vraća preusmerenje. Zbog bezbednosnih razloga, mi ne sledimo preusmerenja. Molim vas koristite direktnu krajnju tačku.',
         'error_misc' => 'Nešto nije u redu. :( ',
-    ]
+        'webhook_fail' => ' neuspelo obaveštavanje putem veb zakačke: Proverite da li je URL i dalje validan.',
+        'webhook_channel_not_found' => ' kanal veb zakačke nije pronađen.',
+        'ms_teams_deprecation' => 'Izabrana adresa veb zakačke za Microsoft Teams će zastariti 31. decembra 2025. Molim vas koristite adresa radnog toka. Microsoft-ovu dokumentaciju za kreiranje radnog toka možete pronaći <a href="https://support.microsoft.com/en-us/office/create-incoming-webhooks-with-workflows-for-microsoft-teams-8ae491c7-0394-4861-ba59-055e33f75498" target="_blank">ovde.</a>',
+    ],
+    'location_scoping' => [
+        'not_saved' => 'Vaša podešavanja nisu sačuvana.',
+        'mismatch' => 'Postoji 1 stavka u bazi podataka koja iziskuje vašu pažnju pre uključivanja opsega lokacije.|Postoji :count stavki u bazi podataka koje iziskuju vašu pažnju pre uključivanja opsega lokacije.',
+    ],
 ];
diff --git a/resources/lang/sr-CS/admin/statuslabels/table.php b/resources/lang/sr-CS/admin/statuslabels/table.php
index 9592977532..30e8609393 100644
--- a/resources/lang/sr-CS/admin/statuslabels/table.php
+++ b/resources/lang/sr-CS/admin/statuslabels/table.php
@@ -8,7 +8,7 @@ return array(
     'default_label' => 'Default oznaka',
     'default_label_help' => 'Ovo se koristi za osiguravanje da se najčešće korišćene oznake statusa pojavljuju pri vrhu okvira za odabir prilikom kreiranja/uređivanja imovine.',
     'deployable'      	=> 'Deployable',
-    'info'      	=> 'Oznake statusa upotrebljavaju se za opisivanje različitih stanja u kojima može biti vaša imovina. Ona mogu biti: na popravci, izgubljen / ukraden, itd. Možete stvoriti nove oznake statusa za imovinu.',
+    'info'      	=> 'Vrste oznaka statusa se koriste da opišu razne statuse u kojima može biti vaša imovina. Ona može biti na popravci, izgubljena/ukradena, itd. Možete napraviti novu oznaku statusa za zaduživu, na čekanju i arhiviranu imovinu prema vašem procesu rada. Za više infomracija, <a href="https://snipe-it.readme.io/docs/overview#status-labels" target="_blank">pogledajte dokumentaciju<i class="fa fa-external-link"></i></a>.',
     'name'      	=> 'Naziv statusa',
     'pending'      	=> 'Pending',
     'status_type'   => 'Vrsta statusa',
diff --git a/resources/lang/sr-CS/admin/users/general.php b/resources/lang/sr-CS/admin/users/general.php
index 9a5abaa436..0fe96acfaa 100644
--- a/resources/lang/sr-CS/admin/users/general.php
+++ b/resources/lang/sr-CS/admin/users/general.php
@@ -19,6 +19,8 @@ return [
     'print_assigned'    => 'Print All Assigned',
     'email_assigned'    => 'Pošalji spisak svega zaduženog',
     'user_notified'     => 'Korisniku je poslata poruka sa spiskom svega zaduženog na njegovo ime.',
+    'users_notified'    => 'Korisniku je poslata e-poruka sa spiskom trenutno zaduženih stavki.|:count korisnicima je poslata e-poruka sa spiskom trenutno zaduženih stavki.',
+    'users_notified_warning' => ':count korisnicima je poslata e-poruka sa spiskom trenutno zaduženih stavki, međutim :no_email korisnika nemaju adresu e-pošte pa im poruka nije mogla biti poslata.|:count korisnicima je poslata e-poruka sa spiskom trenutno zaduženih stavki, međutim :no_email korisnika nemaju adresu e-pošte pa im poruka nije mogla biti poslata.',
     'auto_assign_label' => 'Uvrsti ovog korisnika u automatskom dodeljivanju kvalifikovanih licenci',
     'auto_assign_help'  => 'Preskoči ovog korisnika u automatskoj dodeli licenci',
     'software_user'     => 'Software Checked out to :name',
diff --git a/resources/lang/sr-CS/admin/users/message.php b/resources/lang/sr-CS/admin/users/message.php
index fbd36dd480..d007300481 100644
--- a/resources/lang/sr-CS/admin/users/message.php
+++ b/resources/lang/sr-CS/admin/users/message.php
@@ -6,7 +6,7 @@ return array(
     'declined'                  => 'Uspješno ste odbili ovaj resurs.',
     'bulk_manager_warn'	        => 'Your users have been successfully updated, however your manager entry was not saved because the manager you selected was also in the user list to be edited, and users may not be their own manager. Please select your users again, excluding the manager.',
     'user_exists'               => 'Korisnik već postoji!',
-    'user_not_found'            => 'Korisnik ne postoji.',
+    'user_not_found'            => 'Korisnik ne postoji ili vi nemate ovlašćenja da ih vidite.',
     'user_login_required'       => 'Polje za prijavu je obavezno',
     'user_has_no_assets_assigned' => 'Trenutno nema imovine zadužene korisniku.',
     'user_password_required'    => 'Lozinka je obavezna.',
@@ -37,22 +37,23 @@ return array(
         'update' => 'Došlo je do problema s ažuriranjem korisnika. Molim pokušajte ponovo.',
         'delete' => 'Došlo je do problema s brisanjem korisnika. Molim pokušajte ponovo.',
         'delete_has_assets' => 'Ovaj korisnik ima dodeljene stavke i ne može biti obrisan.',
-        'delete_has_assets_var' => 'This user still has an asset assigned. Please check it in first.|This user still has :count assets assigned. Please check their assets in first.',
-        'delete_has_licenses_var' => 'This user still has a license seats assigned. Please check it in first.|This user still has :count license seats assigned. Please check them in first.',
-        'delete_has_accessories_var' => 'This user still has an accessory assigned. Please check it in first.|This user still has :count accessories assigned. Please check their assets in first.',
-        'delete_has_locations_var' => 'This user still manages a location. Please select another manager first.|This user still manages :count locations. Please select another manager first.',
-        'delete_has_users_var' => 'This user still manages another user. Please select another manager for that user first.|This user still manages :count users. Please select another manager for them first.',
+        'delete_has_assets_var' => 'Ovaj korisnik još uvek ima zaduženu imovinu. Molim vas prvo je razdužite.|Ovaj korisnik još uvek ima :count imovine zadužene. Molim vas prvo ih razdužite.',
+        'delete_has_licenses_var' => 'Ovaj korisnik još uvek ima zaduženu licencu. Molim vas prvo je razdužite.|Ovaj korisnik još uvek ima :count licence zadužene. Molim vas prvo ih razdužite.',
+        'delete_has_accessories_var' => 'Ovaj korisnik još uvek ima zaduženu dodatnu opremu. Molim vas prvo je razdužite.|Ovaj korisnik još uvek ima :count zadužene dodatne opreme. Molim vas prvo ih razdužite.',
+        'delete_has_locations_var' => 'Ovaj korisnik još uvek upravlja lokacijom. Molim vas prvo izaberite drugog rukovodioca.|Ovaj korisnik još uvek upravlja :count lokacijama. Molim vas prvo izaberite drugog rukovodioca.',
+        'delete_has_users_var' => 'Ovaj korisnik još uvek upravlja drugim korisnikom. Molim vas prvo izaberite drugog rukovodioca tom korisniku.|Ovaj korisnik još uvek upravlja :count korisnicima. Molim vas prvo im izaberite drugog rukovodioca.',
         'unsuspend' => 'There was an issue unsuspending the user. Please try again.',
         'import'    => 'Došlo je do problema s importom korisnika. Molim pokušajte ponovo.',
         'asset_already_accepted' => 'Ova je imovina već prihvaćena.',
         'accept_or_decline' => 'Morate prihvatiti ili odbaciti ovaj resurs, imovinu.',
-        'cannot_delete_yourself' => 'We would feel really bad if you deleted yourself, please reconsider.',
+        'cannot_delete_yourself' => 'Osećali bi smo se veoma loše kada bi ste obrisali samog sebe. Razmotrite šta pokušavate.',
         'incorrect_user_accepted' => 'The asset you have attempted to accept was not checked out to you.',
         'ldap_could_not_connect' => 'Povezivanje s LDAP serverom nije uspelo. Proverite konfiguraciju LDAP servera u LDAP konfig datoteci. <br>Greška sa LDAP servera:',
         'ldap_could_not_bind' => 'Nije moguće povezati se sa LDAP serverom. Provjerite konfiguraciju LDAP servera. <br>Greška sa LDAP servera: ',
         'ldap_could_not_search' => 'Nije moguće pretražiti LDAP server. Proverite konfiguraciju LDAP servera. <br>Greška sa LDAP servera:',
         'ldap_could_not_get_entries' => 'Nije bilo moguće dobiti zapise sa LDAP servera. Proverite konfiguraciju LDAP servera. <br>Greška sa LDAP servera:',
         'password_ldap' => 'Lozinku za ovaj nalog kontroliše LDAP / Active Directory. Obratite se IT centru za promenu lozinke. ',
+        'multi_company_items_assigned' => 'Ovaj korisnik poseduje zadužene stavke koje pripadaju drugoj kompaniji. Molim vas razdužite ih ili promenite njihovu kompaniju.'
     ),
 
     'deletefile' => array(
diff --git a/resources/lang/sr-CS/admin/users/table.php b/resources/lang/sr-CS/admin/users/table.php
index 8cde7b5af5..66238c6181 100644
--- a/resources/lang/sr-CS/admin/users/table.php
+++ b/resources/lang/sr-CS/admin/users/table.php
@@ -22,7 +22,7 @@ return array(
     'managed_locations'     => 'Managed Locations',
     'managed_users'         => 'Upravljani korisnici',
     'name' 					=> 'Ime',
-    'nogroup'               => 'Nijedna grupa još uvek nije napravljena. Da je dodate, posetite: ',
+    'nogroup'               => 'Nijedna grupa još uvek nije napravljena. Da je dodate, posetite:',
     'notes'                 => 'Zabeleške',
     'password_confirm' 		=> 'Potvrdi lozinku',
     'password' 				=> 'Lozinka',
diff --git a/resources/lang/sr-CS/auth.php b/resources/lang/sr-CS/auth.php
index 23ff5b357b..d189770eaf 100644
--- a/resources/lang/sr-CS/auth.php
+++ b/resources/lang/sr-CS/auth.php
@@ -15,6 +15,6 @@ return array(
 
     'failed' => 'Ovi kredencijali se ne poklapaju sa našim podacima.',
     'password' => 'Unešena lozinka nije ispravna.',
-    'throttle' => 'Previše pokušaja prijave. Molim vas pokušajte ponovo za :seconds sekundi.',
+    'throttle' => 'Previše pokušaja prijave. Pokušajte ponovo za :minutes minuta.',
 
 );
diff --git a/resources/lang/sr-CS/auth/message.php b/resources/lang/sr-CS/auth/message.php
index 1c20569fa5..667822638f 100644
--- a/resources/lang/sr-CS/auth/message.php
+++ b/resources/lang/sr-CS/auth/message.php
@@ -6,8 +6,6 @@ return array(
     'account_not_found'      => 'Korisničko ime ili lozinka nisu ispravni.',
     'account_not_activated'  => 'Ovaj korisnički nalog nije aktiviran.',
     'account_suspended'      => 'Ovaj je korisnički nalog je blokiran.',
-    'account_banned'         => 'Ovaj je korisnički nalog je zabranjen.',
-    'throttle'               => 'Previše neuspelih pokušaja. Pokušajte ponovo za :seconds sekundi.',
 
     'two_factor' => array(
         'already_enrolled'      => 'Vaš uređaj je već registrovan.',
diff --git a/resources/lang/sr-CS/button.php b/resources/lang/sr-CS/button.php
index 0b8e70801b..80828f1d84 100644
--- a/resources/lang/sr-CS/button.php
+++ b/resources/lang/sr-CS/button.php
@@ -7,6 +7,7 @@ return [
     'checkin_and_delete'  	    => 'Prijava i brisanje korisnika',
     'delete'  	                => 'Izbrisati',
     'edit'    	                => 'Uredi',
+    'clone'    	                => 'Dupliraj',
     'restore' 	                => 'Vratiti',
     'remove'                    => 'Ukloni',
     'request'                   => 'Zahtev',
@@ -21,4 +22,13 @@ return [
     'add_maintenance'           => 'Dodaj održavanje',
     'append'                    => 'Nadoveži',
     'new'                       => 'Novo',
+    'var' => [
+        'clone'     => 'Dupliraj :item_type',
+        'edit'      => 'Izmeni :item_type',
+        'delete'    => 'Obriši :item_type',
+        'restore'   => 'Vrati :item_type',
+        'create'    => 'Napravi novu :item_type',
+        'checkout'  => 'Zaduži :item_type',
+        'checkin'   => 'Razduži :item_type',
+    ]
 ];
diff --git a/resources/lang/sr-CS/general.php b/resources/lang/sr-CS/general.php
index dcc189d21b..8abaa7986c 100644
--- a/resources/lang/sr-CS/general.php
+++ b/resources/lang/sr-CS/general.php
@@ -10,7 +10,7 @@ return [
     'action'                => 'Akcija',
     'activity_report'		=> 'Izveštaj o aktivnostima',
     'address'				=> 'Adresa',
-    'admin'					=> 'Admin',
+    'admin'					=> 'Administratorska podešavanja',
     'admin_tooltip'			=> 'Ovaj korisnik ima admin privilegije',
     'superuser'				=> 'Superuser',
     'superuser_tooltip'		=> 'Ovaj korisnik ima superuser privilegije',
@@ -23,13 +23,16 @@ return [
     'asset_models'			=> 'Modeli imovine',
     'asset_model'			=> 'Model',
     'asset'					=> 'Imovina',
+    'asset_previous'        => 'Imovina (prethodno dodeljena)',
     'asset_report'          => 'Izveštaj o imovini',
     'asset_tag'				=> 'Oznaka imovine',
     'asset_tags'            => 'Oznake imovine',
     'assets_available'		=> 'Dostupna imovina',
     'accept_assets'         => 'Prihvati imovinu :name',
     'accept_assets_menu'    => 'Prihvati imovinu',
+    'accept_item'           => 'Prihvati stavku',
     'audit'				    => 'Revizija',
+    'audits'				=> 'Revizije',
     'audit_report'			=> 'Zapisnik revizije',
     'assets'				=> 'Imovina',
     'assets_audited'        => 'popisana imovina',
@@ -61,9 +64,12 @@ return [
     'changepassword'  		=> 'Promeni lozinku',
     'checkin'  				=> 'Checkin',
     'checkin_from'  		=> 'Checkin from',
+    'checkin_note'  		=> 'Beleška razduženja',
+    'checkout_note'  		=> 'Beleška zaduženja',
     'checkout'  			=> 'Checkout',
     'checkouts_count'       => 'Checkouts',
     'checkins_count'        => 'Checkins',
+    'checkin_and_delete'  	=> 'Razduži i obriši',
     'user_requests_count'   => 'Zahtevi',
     'city'  				=> 'Grad',
     'click_here'			=> 'Kliknite ovde',
@@ -77,7 +83,7 @@ return [
     'consumables'			=> 'Potrošni materijal',
     'country'  				=> 'Zemlja',
     'could_not_restore'     => 'Greška pri vraćanju :item_type: :error',
-    'not_deleted'           => ':item_type nije obrisano tako da ne može biti vraćeno',
+    'not_deleted'           => ':item_type nije obrisan i samim time ne može biti povraćen',
     'create'				=> 'Napravi novi unos',
     'created'               => 'Stavka kreirana',
     'created_asset'			=> 'kreirana imovina',
@@ -86,11 +92,13 @@ return [
     'record_created' 		=> 'Zapis kreiran',
     'updated_at' 			=> 'Ažurirano',
     'currency'  			=> '$', // this is deprecated
+    'currency_text'  		=> 'Valuta', //
     'current'  				=> 'Current',
     'current_password'      => 'Trenutna lozinka',
     'customize_report'      => 'Prilagodi izveštaj',
     'custom_report'         => 'Prilagođeni izveštaj o imovini',
     'dashboard'				=> 'Dashboard',
+    'data_source'           => 'Izvor podataka',
     'days'      			=> 'dana',
     'days_to_next_audit'    => 'Dana do sledeće revizije',
     'date'					=> 'Datum',
@@ -98,7 +106,7 @@ return [
     'debug_warning_text'    => 'This application is running in production mode with debugging enabled. This can expose sensitive data if your application is accessible to the outside world. Disable debug mode by setting the <code>APP_DEBUG</code> value in your <code>.env</code> file to <code>false</code>.',
     'delete'  				=> 'Izbrisati',
     'delete_confirm'  		=> 'Jeste li sigurni da želite izbrisati :item?',
-    'delete_confirm_no_undo' => 'Da li ste sigurni da želite da obrišete :item? Ova radnja ne može biti poništena.',
+    'delete_confirm_no_undo' => 'Da li zaista, želite da obrišete :item? Ovo nije moguće poništiti.',
     'deleted'  				=> 'Izbrisano',
     'delete_seats'  		=> 'Izbrisana mesta',
     'deletion_failed'       => 'Neuspelo brisanje',
@@ -114,29 +122,13 @@ return [
     'editprofile'  			=> 'Uredi svoj profil',
     'eol'					=> 'EOL',
     'email_domain'			=> 'Email Domain',
-    'email_format'			=> 'Email Format',
     'employee_number'       => 'Broj zaposlenog',
     'email_domain_help'		=> 'Ovo se koristi za generisanje e-mail adrese prilikom uvoza',
     'error'				    => 'Greška',
     'exclude_archived'      => 'Izuzmi izbrisana sredstva',
     'exclude_deleted'       => 'Izuzmi izbrisana sredstva',
     'example'				=> 'Primer: ',
-    'filastname_format'			=> 'Prvo slovo imena Prezime (jsmith@example.com)',
-    'firstname_lastname_format'	=> 'Ime Prezime (jane.smith@example.com)',
-    'firstname_lastname_underscore_format' => 'Ime Prezime (jane_smith@example.com)',
-    'lastnamefirstinitial_format' =>  'Prezime Prvo slovo imena (smithj@example.com)',
-    'firstintial_dot_lastname_format' => 'Inicijal imena Prezime (j.smith@example.com)',
-    'firstname_lastname_display'	=> 'Ime Prezime (Petar Petrović)',
-    'lastname_firstname_display'	=> 'Prezime Ime (Petrović Petar)',
-    'name_display_format'	=> 'Format prikaza imena',
-    'first'					=> 'Prvi',
-    'firstnamelastname'     => 'Ime Prezime (janesmith@example.com)',
-    'lastname_firstinitial' => 'Prezime inicijal Imena (smith_j@example.com)',
-    'firstinitial.lastname' => 'Inicijal imena Prezime (j.smith@example.com)',
-    'firstnamelastinitial'  => 'Ime inicijal Prezimena (janes@example.com)',
-    'lastnamefirstname'      => 'Prezime Ime (smith.jane@example.com)',
-    'first_name'			=> 'Ime',
-    'first_name_format'		=> 'Ime (jane@example.com)',
+
     'files'                 => 'Datoteke',
     'file_name'				=> 'Datoteka',
     'file_type'             => 'Tip datoteke',
@@ -156,9 +148,9 @@ return [
     'image_delete'         	=> 'Izbriši sliku',
     'include_deleted'       => 'Uključi izbrisana sredstva',
     'image_upload'         	=> 'Upload Image',
-    'filetypes_accepted_help'    => 'Uključi izbrisana sredstva.',
+    'filetypes_accepted_help'    => 'Prihvatljiv tip datoteke je :types. Maksimalno dozvoljena veličina je :size.| Prihvatljivi tipovi datoteka su :types. Maksimalno dozvoljena veličina za postavljanje je :size.',
     'filetypes_size_help'   => 'Maksimalna dozvoljena veličina za otpremanje je :size.',
-    'image_filetypes_help'  => 'Prihvatljivi tipovi datoteka su jpg, webp, png, gif, svg i avig. Maksimalna veličina datoteke je :size.',
+    'image_filetypes_help'  => 'Prihvatljivi tipovi datoteka su jpg, webp, png, gif, svg i avif. Maksimalna veličina datoteke je :size.',
     'unaccepted_image_type'  => 'Datoteka slike nije čitljiva. Prihvatljivi tipovi datoteka su jpg, webp, png, gif i svg. Mimetip ove datoteke je: :mimetype.',
     'import'         	    => 'Import',
     'import_this_file'      => 'Mapiraj polja i obradi ovu datoteku',
@@ -178,12 +170,17 @@ return [
     'last'					=> 'Poslednji',
     'last_login'            => 'Poslednja prijava',
     'last_name'             => 'Prezime',
+    'firstname_lastname_display'	=> 'Ime Prezime (Petar Petrović)',
+    'lastname_firstname_display'	=> 'Prezime Ime (Petrović Petar)',
+    'name_display_format'	=> 'Format prikaza imena',
+    'first'					=> 'Prvi',
+    'first_name'			=> 'Ime',
     'license'				=> 'Licenca',
     'license_report'        => 'Izveštaj o licenci',
     'licenses_available'	=> 'Dostupno licenci',
     'licenses'				=> 'Licence',
     'list_all'				=> 'Lista svih',
-    'loading'				=> 'Učitavanje... molim sačekajte....',
+    'loading'				=> 'Učitavanje... molim sačekajte...',
     'lock_passwords'        => 'Ova vrednost polja neće biti sačuvana u demo instalaciji.',
     'feature_disabled'      => 'This feature has been disabled for the demo installation.',
     'location'              => 'Lokacija',
@@ -215,6 +212,14 @@ return [
     'no_results'			=> 'Nema rezultata.',
     'no'  					=> 'Ne',
     'notes'  				=> 'Zabeleške',
+    'note_added'            => 'Napomena je dodata',
+    'options'				=> 'Opcije',
+    'preview'				=> 'Pregled',
+    'add_note'              => 'Dodaj napomenu',
+    'note_edited'            => 'Napomena je izmenjena',
+    'edit_note'              => 'Izmeni napomenu',
+    'note_deleted'            => 'Napomena je obrisana',
+    'delete_note'              => 'Obriši napomenu',
     'order_number'          => 'Broj narudžbe',
     'only_deleted'          => 'Samo izbrisana sredstva',
     'page_menu'				=> 'Showing _MENU_ items',
@@ -229,7 +234,7 @@ return [
     'purchase_date'         => 'Datum kupovine',
     'qty'		            => 'KOL',
     'quantity'		        => 'Količina',
-    'quantity_minimum'      => 'Imate :stanje artikala ispod ili skoro ispod nivoa minimalne količine',
+    'quantity_minimum'      => 'Imate jednu stavku ispod ili gotovo ispod nivoa minimalne količine|Imate :count stavki ispod ili gotovo ispod nivoa minimalne količine',
     'quickscan_checkin'  	=> 'Brzo razduživanje',
     'quickscan_checkin_status'  	=> 'Status razduženja',
     'ready_to_deploy'		=> 'Spremna za raspoređivanje',
@@ -279,8 +284,10 @@ return [
     'site_name'				=> 'Naziv sajta',
     'state'  				=> 'Savezna država',
     'status_labels'			=> 'Oznake Statusa',
+    'status_label'			=> 'Oznaka statusa',
     'status'    			=> 'Status',
     'accept_eula'           => 'Ugovor o prihvatanju',
+    'show_or_hide_eulas' => 'Prikaži/Sakrij EULA',
     'supplier'              => 'Dobavljač',
     'suppliers'  			=> 'Dobavljači',
     'sure_to_delete'        => 'Da li ste sigurni da želite izbrisati',
@@ -296,9 +303,9 @@ return [
     'type'  				=> 'Tip',
     'undeployable'			=> 'Un-deployable',
     'unknown_admin'			=> 'Nepoznati administrator',
-    'username_format'		=> 'Format korisničkog imena',
     'username'              => 'Korisničko ime',
     'update'                => 'Ažuriraj',
+    'updating_item' => 'Izmena :item',
     'upload_filetypes_help'      => 'Dozvoljeni tipovi datoteka su png, gif, jpg, jpeg, doc, docx, pdf, xls, xlsx, txt, lic, xml, zip, rtf i rar. Maksimalna veličina datoteke je :size.',
     'uploaded'              => 'Uploaded',
     'user'					=> 'Korisnik',
@@ -323,10 +330,10 @@ return [
     'token_expired'         => 'Sesija za obrazac je istekla. Molim pokušajte ponovo.',
     'login_enabled'         => 'Prijava je omogućena',
     'audit_due'             => 'Spremno za reviziju',
-    'audit_due_days'        => 'Imovina u roku za popis u narednih :days dana|Imovina u roku za popis u narednih :days dana',
+    'audit_due_days'        => '{}Imovine u roku ili preko roka za popis|[1]Imovine u roku ili preko roka za popis za jedan dan|[2,*]Imovine u roku ili preko roka za popis u okviru :days dana',
     'checkin_due'           => 'Rok za razduživanje',
     'checkin_overdue'       => 'Preko roka za razduživanje',
-    'checkin_due_days'      => 'Imovina do roka za razduživanje u narednih :days dana|Imovina do roka za razduživanje u narednih :days dana',
+    'checkin_due_days'      => '{}U roku za razduživanje|[1]Imovine u roku za razduživanje u okviru :days dana|[2,*]Imovine u roku za razduživanje u okviru :days dana',
     'audit_overdue'         => 'Preko roka za reviziju',
     'accept'                => 'Prihvati :asset',
     'i_accept'              => 'Prihvatam',
@@ -340,15 +347,15 @@ return [
     'hide_deleted'          => 'Sakrij obrisano',
     'email'                 => 'E-pošta',
     'do_not_change'         => 'Ne menjaj',
-    'bug_report'            => 'Prijavi grešku',
+    'bug_report'            => 'Prijavite grešku',
     'user_manual'           => 'Korisničko uputstvo',
     'setup_step_1'          => 'Korak 1',
     'setup_step_2'          => 'Korak 2',
     'setup_step_3'          => 'Korak 3',
     'setup_step_4'          => 'Korak 4',
     'setup_config_check'    => 'Provera podešavanja',
-    'setup_create_database' => 'Kreiraj tabele baze podataka',
-    'setup_create_admin'    => 'Kreiraj admin korisnika',
+    'setup_create_database' => 'Napravi tabele baze podataka',
+    'setup_create_admin'    => 'Napravi administratorskog korisnika',
     'setup_done'            => 'Završeno!',
     'bulk_edit_about_to'    => 'Spremate se da uredite sledeće: ',
     'checked_out'           => 'Zaduženo',
@@ -383,6 +390,8 @@ return [
     'new_license'           => 'Nova licenca',
     'new_accessory'         => 'Novi dodatak',
     'new_consumable'        => 'Nov potrošni materijal',
+    'new_component'         => 'Nova komponenta',
+    'new_user'              => 'Novi korisnik',
     'collapse'              => 'Skupi',
     'assigned'              => 'Dodeljeno',
     'asset_count'           => 'Količina imovine',
@@ -418,19 +427,20 @@ return [
     'bulk_soft_delete'      =>'Privremeno obrišite ove korisnike. Njihova istorija imovine će ostati netaknuta osim/sve dok ne očistite izbrisane zapise u podešavanjima administratora.',
     'bulk_checkin_delete_success' => 'Vaši izabrani korisnici su izbrisani i njihove stavke su čekirane.',
     'bulk_checkin_success' => 'Stavke za izabrane korisnike su čekirane.',
-    'set_to_null'           => 'Obriši vrednosti ove imovine|Obriši vrednosti za svih :asset_count imovina ',
+    'set_to_null'           => 'Obriši vrednosti ovog izbora|Obriši vrednosti svih :selection_count izbora ',
     'set_users_field_to_null'  => 'Obriši :field vrednosti za ovog korisnika|Obriši :field vrednosti za svih :user_count korisnika ',
     'na_no_purchase_date'   => 'N/A - Nema datuma porudžbine',
     'assets_by_status'      => 'Imovina prema statusu',
     'assets_by_status_type'      => 'Imovina prema vrsti statusa',
     'pie_chart_type'        => 'Tip grafikona pite na radnoj tabli',
     'hello_name'            => 'Pozdrav, :name!',
-    'unaccepted_profile_warning'   => 'Imate :count stavki koje traže vaše odobrenje. Kliknite ovde da ih prihvatite ili da ih odbijete',
+    'unaccepted_profile_warning'   => 'Imate jednu stavku koja zahteva prihvatanje. Kliknite ovde da je prihvatite ili odbijete | Imate :count stavki koje zahtevaju prihvatanje. Kliknite ovde da ih prihvatite ili odbijete',
     'start_date'            => 'Datum početka',
     'end_date'            => 'Datum kraja',
     'alt_uploaded_image_thumbnail' => 'Postavljena slika',
     'placeholder_kit'       => 'Izaberite komplet',
     'file_not_found'        => 'Fajl nije pronađen',
+    'log_record_not_found'  => 'Nije pronađen zapis za taj unos.',
     'preview_not_available' => '(nema predpregleda)',
     'setup'                 => 'Postavke',
     'pre_flight'            => 'Pre poletanja',
@@ -512,7 +522,7 @@ return [
     'checked_out_to_fields' => 'Zaduženo poljima',
     'percent_complete' => '% završeno',
     'uploading' => 'Slanje... ',
-    'upload_error' => 'Greška tokom slanja datoteke. Molim vas potvrdite da nema praznih redova i da nazivi kolona nisu duplirani.',
+    'upload_error' => 'Greška pri slanju datoteke. Molim vas proverite da nemate prazne redove ili duplirane nazive kolona u vašem CSV-u i da dozvole na serveru dozvoljavaju snimanje datoteka.',
     'copy_to_clipboard' => 'Kopiraj u beležnicu',
     'copied' => 'Kopirano!',
     'status_compatibility' => 'Ako je imovina već zadužena, ne može biti promenjena u nezaduživi status i promena ove vrednosti će biti preskočena.',
@@ -528,7 +538,7 @@ return [
     'permission_denied_superuser_demo' => 'Ovlašćenje je odbijeno. Ne možete da izmenite podatke o superadmin korisniku u ovoj demostraciji.',
     'pwd_reset_not_sent' => 'Korisnik nije aktiviran, nije sinhronizovan sa LDAP-om, ili nema navedenu adresu e-pošte',
     'error_sending_email' => 'Greška prilikom slanja e-poruke',
-    'sad_panda' => 'Sad panda. You are not authorized to do the thing. Maybe <a href=":link">return to the dashboard</a>, or contact your administrator.',
+    'sad_panda' => 'Tužni panda. Niste ovlašćeni da uradite tu stvar. Možda da se <a href=":link">vratite na kontrolnu tablu</a>, ili kontaktirajte vašeg administratora.',
     'bulk' => [
             'delete' =>
                 [
@@ -549,6 +559,71 @@ return [
         'license_seats'  => ':count licencnih mesta|:count licencnih mesta',
         'consumables'  => ':count potrošni materijal|:count potrošnih materijala',
         'components'  => ':count komponenta|:count komponenti',
-    ]
+    ],
+
+    'more_info' => 'Više informacija',
+    'quickscan_bulk_help' => 'Potvrđivanjem ovog polja će izmeniti zapis imovine kako bi se ažurirala ova nova lokacija. Ukoliko ostane nepotvrđeno lokacija će se evidentirati samo u zapisu popisa. Imajte na umu da, ukoliko je imovina zadužena, neće promeniti lokaciju osobe, imovine ili lokacije za koju je zadužena.',
+    'whoops' => 'Ups!',
+    'something_went_wrong' => 'Nešto je pošlo po zlu sa vašim zahtevom.',
+    'close' => 'Zatvori',
+    'expires' => 'Ističe',
+    'map_fields'=> 'Mapiraj :item_type polja',
+    'remaining_var' => ':count preostalo',
+    'label' => 'Oznaka',
+    'import_asset_tag_exists' => 'Imovina sa oznakom imovine :asset_tag već postoji i izmena nije zatražena. Nijedna izmena nije izvršena.',
+    'countries_manually_entered_help' => 'Vrednosti sa zvezdicom (*) su ručno upisane i ne poklapaju se sa postojećim ISO 3166 vrednostima iz padajućeg menija',
+    'accessories_assigned' => 'Dodeljen dodatni pribor',
+    'user_managed_passwords' => 'Upravljanje lozinkama',
+    'user_managed_passwords_disallow' => 'Onemogući korisnicima da upravljaju svojim lozinkama',
+    'user_managed_passwords_allow' => 'Omogući korisnicima da upravljaju svojim lozinkama',
+    'from' => 'Od',
+    'by' => 'By',
+
+// Add form placeholders here
+    'placeholders' => [
+        'notes'  => 'Dodaj napomenu',
+    ],
+
+    'breadcrumb_button_actions' => [
+        'edit_item' => 'Izmeni :name',
+        'checkout_item' => 'Zaduži :name',
+        'checkin_item' => 'Razduži :name',
+    ],
+
+    'skins' => [
+        'site_default' => 'Podrazumevano za lokaciju',
+        'default_blue' => 'Podrazumevana plava',
+        'blue_dark' => 'Plava (tamni režim)',
+        'green' => 'Tamno zelena',
+        'green_dark' => 'Zelena (tamni režim)',
+        'red' => 'Tamno crvena',
+        'red_dark' => 'Crvena (tamni režim)',
+        'orange' => 'Tamno narandžasta',
+        'orange_dark' => 'Narandžasta (tamni režim)',
+        'black' => 'Crna',
+        'black_dark' => 'Crna (tamni režim)',
+        'purple' => 'Ljubičasta',
+        'purple_dark' => 'Ljubičasta (tamni režim)',
+        'yellow' => 'Žuta',
+        'yellow_dark' => 'Žuta (tamni režim)',
+        'high_contrast' => 'Visoki kontrast',
+
+    ],
+
+    'select_all_none' => 'Izaberi sve/ništa',
+    'generic_model_not_found' => 'Taj :model nije pronađen ili vi nemate ovlašćenja da mu pristupite',
+    'deleted_models' => 'Obrisani modeli imovine',
+    'deleted_users' => 'Obrisani korisnici',
+    'cost_each' => ':amount svaki',
+    'remove_current_image' => 'Ukloni trenutnu :type sliku',
+
+    'seeding' => [
+        'manufacturers' => [
+            'button' => 'Napravi proizvođače',
+            'prompt' => 'Još uvek nemate nijednog proizvođača. Da li bi ste želeli da popunite spisak sa uobičajenim proizvođačima? (OVO ĆE PREPISATI POSTOJEĆE PROIZVOĐAČE, uključujući one premeštene u kantu za otpatke.)',
+            'success' => 'Proizvođači su uspešno dodati',
+            'error' => 'Nije bilo moguće dodati proizvođače. Proizvođač već postoji i ovo bi ga prepisalo.|Nije bilo moguće dodati proizvođače. :count proizvođača već postoji i ovo bi ih prepisalo.',
+        ],
+    ],
 
 ];
diff --git a/resources/lang/sr-CS/localizations.php b/resources/lang/sr-CS/localizations.php
index fdca53b7c7..c974f681ab 100644
--- a/resources/lang/sr-CS/localizations.php
+++ b/resources/lang/sr-CS/localizations.php
@@ -2,7 +2,7 @@
 
 return [
 
-    'select_language' => 'Izaberi jezik',
+    'select_language' => 'Izaberite jezik',
     'languages' => [
         'en-US'=> 'Engleski, SAD',
         'en-GB'=> 'Engleski, UK',
@@ -40,7 +40,9 @@ return [
         'ms-MY'=> 'Malajski',
         'mi-NZ'=> 'Maorski',
         'mn-MN'=> 'Mongolski',
-        'no-NO'=> 'Norveški',
+        'nb-NO'=> 'Norveški Bokmål',
+        'om-ET' => 'Oromo (Etiopijski)',
+        //'nn-NO'=> 'Norwegian Nynorsk',
         'fa-IR'=> 'Persijski',
         'pl-PL'=> 'Poljski',
         'pt-PT'=> 'Portugalski',
@@ -133,6 +135,7 @@ return [
         'EC'=>'Ekvador',
         'EE'=>'Estonija',
         'EG'=>'Egipat',
+        'GB-ENG'=>'Engleska',
         'ER'=>'Eritreja',
         'ES'=>'Španija',
         'ET'=>'Etiopija',
@@ -231,6 +234,7 @@ return [
         'NG'=>'Nigerija',
         'NI'=>'Nikaragva',
         'NL'=>'Holandija',
+        'GB-NIR' => 'Severna Irska',
         'NO'=>'Norveška',
         'NP'=>'Nepal',
         'NR'=>'Nauru',
@@ -258,7 +262,7 @@ return [
         'RU'=>'Rusija',
         'RW'=>'Ruanda',
         'SA'=>'Južna Arabija',
-        'UK'=>'Škotska',
+        'GB-SCT'=>'Škotska',
         'SB'=>'Solomonska ostrva',
         'SC'=>'Sejšeli',
         'SS'=>'Južni Sudan',
@@ -310,6 +314,7 @@ return [
         'VI'=>'Devičanska ostrva (SAD)',
         'VN'=>'Vijetnam',
         'VU'=>'Vanuatu',
+        'GB-WLS' =>'Vels',
         'WF'=>'Ostrva Valis i Futuna',
         'WS'=>'Samoa',
         'YE'=>'Jemen',
diff --git a/resources/lang/sr-CS/mail.php b/resources/lang/sr-CS/mail.php
index 05b2a997ca..635a7daffa 100644
--- a/resources/lang/sr-CS/mail.php
+++ b/resources/lang/sr-CS/mail.php
@@ -23,24 +23,25 @@ return [
     'Item_Requested' => 'Zahtevana stavka',
     'License_Checkin_Notification' => 'Licenca razdužena',
     'License_Checkout_Notification' => 'Licenca je zadužena',
+    'license_for'   => 'Licenca za',
     'Low_Inventory_Report' => 'Izveštaj o niskim zalihama',
     'a_user_canceled' => 'Korisnik je otkazao zahtev za stavke na Web lokaciji',
     'a_user_requested' => 'Korisnik je zatražio stavke na Web lokaciji',
     'acceptance_asset_accepted' => 'Korisnik je prihvatio stavku',
     'acceptance_asset_declined' => 'Korisnik je odbio stavku',
-    'accessory_name' => 'Naziv dodatne opreme, pribora:',
-    'additional_notes' => 'Dodatne napomene:',
+    'accessory_name' => 'Naziv pribora',
+    'additional_notes' => 'Dodatne napomene',
     'admin_has_created' => 'Administrator je kreirao nalog za vas na na :web vebsajtu.',
-    'asset' => 'Imovina:',
-    'asset_name' => 'Naziv imovine:',
+    'asset' => 'Imovina',
+    'asset_name' => 'Naziv imovine',
     'asset_requested' => 'Traženo sredstvo',
     'asset_tag' => 'Oznaka imovine',
     'assets_warrantee_alert' => 'Postoji :stanje licenci koja/e ističe u narednih :treshold dana.|Postoje :count licenci koje ističu u narednih :treshold dana.',
     'assigned_to' => 'Dodijeljena',
     'best_regards' => 'Srdačan pozdrav',
-    'canceled' => 'Otkazano:',
-    'checkin_date' => 'Checkin Date:',
-    'checkout_date' => 'Checkout Date:',
+    'canceled' => 'Otkazano',
+    'checkin_date' => 'Datum razduženja',
+    'checkout_date' => 'Datum zaduženja',
     'checkedout_from' => 'Zaduženo iz',
     'checkedin_from'  => 'Razduženo od',
     'checked_into' => 'Razduženo u',
@@ -49,27 +50,30 @@ return [
     'click_to_confirm' => 'Kliknite na sljedeći link kako biste potvrdili svoj :web nalog:',
     'current_QTY' => 'Trenutna QTY',
     'days' => 'Dana',
-    'expecting_checkin_date' => 'Expected Checkin Date:',
+    'expecting_checkin_date' => 'Očekivani datum razduženja',
     'expires' => 'Ističe',
     'hello' => 'Zdravo',
     'hi' => 'Zdravo',
     'i_have_read' => 'Pročitao sam i prihvatam uvete korištenja i primio sam ovu stavku.',
     'inventory_report' => 'Izveštaj o zalihama',
-    'item' => 'Artikal:',
+    'item' => 'Stavka',
+    'item_checked_reminder' => 'Ovo je podsetnik da trenutno imate :count stavki koje su zadužene vama koje niste prihvatili ili odbili. Molim vas kliknite na vezu ispod da bi ste potvrdili vašu odluku.',
     'license_expiring_alert' => 'Postoji :count licenci koja/e ističe u narednih treshold dana.|Postoje :count licencei koje ističu u narednih :treshold dana.',
     'link_to_update_password' => 'Kliknite na sledeću vezu kako biste obnovili svoju :web lozinku:',
-    'login' => 'Login:',
+    'login' => 'Prijava',
     'login_first_admin' => 'Prijavite se u vašu novu Snipe-IT instalaciju koristeći kredencijale ispod:',
     'low_inventory_alert' => 'Postoji :count artikla ispod minimalne zalihe ili će uskoro biti nizak. |Postoje :count artikla koji su ispod minimalne zalihe ili će uskoro biti.',
     'min_QTY' => 'Min Kol',
     'name' => 'Naziv',
     'new_item_checked' => 'Nova stavka je proverena pod vašim imenom, detalji su u nastavku.',
+    'new_item_checked_with_acceptance' => 'Nova stavka je zadužena na vaše ime što zahteva prihvatanje. Detalji su u nastavku.',
+    'recent_item_checked' => 'Stavka je nedavno zadužena na vaše ime što zahteva prihvatanje. Detalji su u nastavku.',
     'notes' => 'Zabeleške',
-    'password' => 'Lozinka:',
+    'password' => 'Lozinka',
     'password_reset' => 'Ponovno postavljanje lozinke',
     'read_the_terms' => 'Pročitajte uslove upotrebe u nastavku.',
     'read_the_terms_and_click' => 'Molim vas pročitajte uslove ispod, i kliknite na vezu na dnu da bi ste potvrdili da ste ih pročitali i da se slažete sa uslovima korišćenja, i da ste primili imovinu.',
-    'requested' => 'Traženi:',
+    'requested' => 'Tražena',
     'reset_link' => 'Link za resetovanje lozinke',
     'reset_password' => 'Kliknite ovde da biste poništili lozinku:',
     'rights_reserved' => 'Sva prava zadržana.',
@@ -86,8 +90,10 @@ return [
     'upcoming-audits' => 'Ima :count imovina kojoj je vreme za popis za :threshold dana.|Ima :count imovine kojoj je vreme za popis za :threshold dana.',
     'user' => 'Korisnik',
     'username' => 'Korisničko ime',
+    'unaccepted_asset_reminder' => 'Podsetnik: Imate neprihvaćevenu imovinu.',
     'welcome' => 'Dobrodošli :name',
     'welcome_to' => 'Dobrodošli na :web!',
     'your_assets' => 'Pregledaj svoju imovinu',
     'your_credentials' => 'Vaši Snipe-IT kredencijali',
+    'mail_sent' => 'E-poruka je uspešno poslata!',
 ];
diff --git a/resources/lang/sr-CS/validation.php b/resources/lang/sr-CS/validation.php
index eacadee0f2..ac5b9504ea 100644
--- a/resources/lang/sr-CS/validation.php
+++ b/resources/lang/sr-CS/validation.php
@@ -13,87 +13,150 @@ return [
     |
     */
 
-    'accepted'             => ':attribute mora biti prihvaćen.',
-    'active_url'           => ':attribute nije važeći URL.',
-    'after'                => ':attribute mora biti datum nakon :datum.',
-    'after_or_equal'       => ':attribute mora biti datum nakon ili jednak :date.',
-    'alpha'                => ':attribute može sadržavati samo slova.',
-    'alpha_dash'           => ':attribute može sadržavati samo slova, brojeve i crtice.',
-    'alpha_num'            => ':attribute može sadržavati samo slova i brojeve.',
-    'array'                => ':attribute mora biti niz.',
-    'before'               => ':attribute mora biti datum pre :date.',
-    'before_or_equal'      => ':attribute mora biti datum pre ili jednak :date.',
-    'between'              => [
-        'numeric' => ':attribute mora biti između :min - :max.',
-        'file'    => ':attribute mora biti između :min i :max kilobajta.',
-        'string'  => ':attribute mora biti između :min i :max znakova.',
-        'array'   => ':attribute mora imati između :min i :max stavki.',
+    'accepted' => 'Polje :attribute mora biti prihvaćeno.',
+    'accepted_if' => 'Polje :attribute je mora biti prihvaćeno kada polje :other sadrži :value.',
+    'active_url' => 'Polje :attribute mora biti ispravna URL adresa.',
+    'after' => 'Polje :attribute mora biti datum kasniji od :date.',
+    'after_or_equal' => 'Polje :attribute mora biti datum kasniji ili jednak od :date.',
+    'alpha' => 'Polje :attribute mora da sadrži samo slova.',
+    'alpha_dash' => 'Polje :attribute mora da sadrži jedino slova, brojeve, crtice i donje crtice.',
+    'alpha_num' => 'Polje :attribute mora da sadrži samo slova i brojeve.',
+    'array' => 'Polje :attribute mora biti niz.',
+    'ascii' => 'Polje :attribute mora da sadrži samo alfanumeričke karaktere i simbole od jednog bajta.',
+    'before' => 'Polje :attribute mora biti datum raniji od :date.',
+    'before_or_equal' => 'Polje :attribute mora biti datum raniji ili jednak od :date.',
+    'between' => [
+        'array' => 'Polje :attribute mora sadržati između :min i :max stavki.',
+        'file' => 'Polje :attribute mora biti između :min i :max kilobajta.',
+        'numeric' => 'Polje :attribute mora biti između :min i :max.',
+        'string' => 'Polje :attribute mora biti između :min i :max karaktera.',
     ],
-    'boolean'              => ':attribute mora biti true or false.',
-    'confirmed'            => 'The :attribute confirmation does not match.',
-    'date'                 => ':attribute nije ispravan datum.',
-    'date_format'          => ':attribute ne odgovara formatu :format.',
-    'different'            => ':attributei i :other moraju biti različiti.',
-    'digits'               => ':attribute mora biti :digits brojevi.',
-    'digits_between'       => ':attribute mora biti između :min i :max cifara.',
-    'dimensions'           => ':attribute ima pogrešnu dimenzije slike.',
-    'distinct'             => 'The :attribute field has a duplicate value.',
-    'email'                => ':attribute format pogrešan.',
-    'exists'               => 'Odabrani :attribute nije korektan.',
-    'file'                 => ':attribute mora biti datoteka.',
-    'filled'               => ':attribute mora imati vrednost.',
-    'image'                => ':attribute mora biti slika.',
+    'boolean' => 'Polje :attribute mora biti tačno ili netačno.',
+    'can' => 'Polje :attribute mora da sadrži neovlašćenu vrednost.',
+    'confirmed' => 'Potvrda polja :attribute se ne poklapa.',
+    'contains' => 'Polju :attribute nedostaje neophodna vrednost.',
+    'current_password' => 'Lozinka nije ispravna.',
+    'date' => 'Polje :attribute mora biti ispravan datum.',
+    'date_equals' => 'Polje :attribute mora biti datum jednak :data.',
+    'date_format' => 'Polje :attribute mora da se poklapa sa formatom :format.',
+    'decimal' => 'Polje :attribute mora da sadrži :decimal decimalnih mesta.',
+    'declined' => 'Polje :attribute mora biti odbijeno.',
+    'declined_if' => 'Polje :attribute mora biti odbijeno kada :other sadrži :value.',
+    'different' => 'Polje :attribute i :other moraju da se razlikuju.',
+    'digits' => 'Polje :attribute mora da sadrži :digits cifara.',
+    'digits_between' => 'Polje :attribute mora da sadrži između :min i :max cifara.',
+    'dimensions' => 'Polje :attribute sadrži neispravne dimenzije slike.',
+    'distinct' => 'The :attribute field has a duplicate value.',
+    'doesnt_end_with' => 'Polje :attribute ne sme da se završi sa jednim od sledećih: :values.',
+    'doesnt_start_with' => 'Polje :attribute ne sme da počen sa jednim od sledećih: :values.',
+    'email' => 'Polje :attribute mora biti ispravna adresa e-pošte.',
+    'ends_with' => 'Polje :attribute mora se završiti sa jednim od sledećih: :values.',
+    'enum' => 'Odabrani :attribute nije ispravan.',
+    'exists' => 'Odabrani :attribute nije korektan.',
+    'extensions' => 'Polje :attribute mora da sadrži jednu od sledećih ekstenzija: :values.',
+    'file' => 'Polje :attribute mora biti datoteka.',
+    'filled' => ':attribute mora imati vrednost.',
+    'gt' => [
+        'array' => 'Polje :attribute mora sa sadrži više od :values stavki.',
+        'file' => 'Polje :attribute mora biti veće od :value kilobajta.',
+        'numeric' => 'Polje :attribute mora biti veće od :value.',
+        'string' => 'Polje :attribute mora biti veće od :value karaktera.',
+    ],
+    'gte' => [
+        'array' => 'Polje :attribute mora da sadrži :value ili više stavki.',
+        'file' => 'Polje :attribute mora biti veće ili jednako sa :value kilobajta.',
+        'numeric' => 'Polje :attribute mora biti veće od ili jednako sa :value.',
+        'string' => 'Polje :attribute mora da sadrži više ili jednako :value karaktera.',
+    ],
+    'hex_color' => 'Polje :attribute mora biti ispravna heksadecimalna boja.',
+    'image' => 'Polje :attribute mora biti slika.',
     'import_field_empty'    => 'Vrednost za :fieldname ne može biti prazna.',
-    'in'                   => 'Odabrani :attribute nije korektan.',
-    'in_array'             => ':attribute polje ne postoji u :other.',
-    'integer'              => ':attribute mora biti ceo broj.',
-    'ip'                   => ':attribute mora biti važeća IP adresa.',
-    'ipv4'                 => ':attribute mora biti važeća IPv4 adresa.',
-    'ipv6'                 => ':attribute mora biti važeća IPv6 adresa.',
-    'is_unique_department' => ':attribute mora biti jedinstven za ovu Kompanijsku lokaciju',
-    'json'                 => ':attribute mora biti ispravan JSON niz.',
-    'max'                  => [
-        'numeric' => ':attribute ne sme biti veći od :max.',
-        'file'    => ':attribute ne sme biti veći od : max. kilobajta.',
-        'string'  => ':attribute ne sme biti veći od :max znakova.',
-        'array'   => ':attribute ne sme imati više od :max stavki.',
+    'in' => 'Odabrani :attribute nije korektan.',
+    'in_array' => 'Polje :attribute mora da postoji u :other.',
+    'integer' => 'Polje :attribute mora biti celobrojna vrednost.',
+    'ip' => 'Polje :attribute mora biti ispravna IP adresa.',
+    'ipv4' => 'Polje :attribute mora biti ispravna IPv4 adresa.',
+    'ipv6' => 'Polje :attribute mora biti ispravna IPv6 adresa.',
+    'json' => 'Polje :attribute mora biti ispravan JSON tekst.',
+    'list' => 'Polje :attribute mora biti spisak.',
+    'lowercase' => 'Polje :attribute mora da sadrži sve mala slova.',
+    'lt' => [
+        'array' => 'Polje :attribute mora da sadrži manje od :value stavki.',
+        'file' => 'Polje :attribute mora biti manje od :value kilobajta.',
+        'numeric' => 'Polje :attribute mora biti manje od :value.',
+        'string' => 'Polje :attribute mora da sadrži manje od :value karaktera.',
     ],
-    'mimes'                => ':attribute mora biti datoteka tipa: :values.',
-    'mimetypes'            => ':attribute mora biti datoteka tipa: :values.',
-    'min'                  => [
-        'numeric' => ':attribute mora biti najmanje :min.',
-        'file'    => ':attribute mora biti najmanje :min kilobajta.',
-        'string'  => ':attribute mora biti najmanje :min znakova.',
-        'array'   => ':attribute mora imati barem :min stavke.',
+    'lte' => [
+        'array' => 'Polje :attribute ne sme da sadrži više od :value stavki.',
+        'file' => 'Polje :attribute mora biti manje od ili jednako :value kilobajta.',
+        'numeric' => 'Polje :attribute mora biti manje ili jednako sa :value.',
+        'string' => 'Polje :attribute mora da sadrži manje ili jednako :value karaktera.',
     ],
-    'starts_with'          => ':attribute mora da počne sa jednom od sledećih vrednosti: :values.',
-    'ends_with'            => ':attribute mora da se završi sa jednim od sledećih: :values.',
+    'mac_address' => 'Polje :attribute mora biti ispravna MAC adresa.',
+    'max' => [
+        'array' => 'Polje :attribute ne sme da sadrži više od :max stavki.',
+        'file' => 'Polje :attribute ne sme biti veće od :max kilobajta.',
+        'numeric' => 'Polje :attribute ne sme biti veće od :max.',
+        'string' => 'Polje :attribute ne sme da sadrži više od :max karaktera.',
+    ],
+    'max_digits' => 'Polje :attribute ne sme da sadrži više od :max cifara.',
+    'mimes' => 'Polje :attribute mora biti datoteka tipa: :values.',
+    'mimetypes' => 'Polje :attribute mora biti datoteka tipa: :values.',
+    'min' => [
+        'array' => 'Polje :attribute mora da sdarži najmanje :min stavki.',
+        'file' => 'Polje :attribute mora biti najmanje :min kilobajta.',
+        'numeric' => 'Polje :attribute mora biti najmanje :min.',
+        'string' => 'Polje :attribute mora da sadrži najmanje :min karaktera.',
+    ],
+    'min_digits' => 'Polje :attribute mora da sadrži najmanje :min cifara.',
+    'missing' => 'Polje :attribute mora biti nedostajuće.',
+    'missing_if' => 'Polje :attribute mora biti nedostajuće kada :other sadrži :value.',
+    'missing_unless' => 'Polje :attribute mora biti nedostajuće osim ako :other sadrži :value.',
+    'missing_with' => 'Polje :attribute mora biti nedostajuće kada je :values izabrano.',
+    'missing_with_all' => 'Polje :attribute mora biti nedostajuće kada je :values izabrano.',
+    'multiple_of' => 'Polje :attribute mora biti proizvod množenja sa :value.',
+    'not_in' => 'Odabrani :attribute nije ispravan.',
+    'not_regex' => 'Format polja :attribute nije ispravan.',
+    'numeric' => 'Polje :attribute mora biti broj.',
+    'password' => [
+        'letters' => 'Polje :attribute mora da sadrži najmanje jedno slovo.',
+        'mixed' => 'Polje :attribute mora da sadrži najmanje jedno veliko i jedno malo slovo.',
+        'numbers' => 'Polje :attribute mora da sadrži najmanje jedan broj.',
+        'symbols' => 'Polje :attribute mora da sadrži najmanje jedan simbol.',
+        'uncompromised' => 'Uneto :attribute se pojavilo među procurelim podacima. Molim vas unesite drugo :attribute.',
+    ],
+    'percent'       => 'Minimum amortizacije mora biti između 0 i 100 kada je vrsta amortizacije procentna vrednost.',
 
-    'not_in'               => 'Odabrani :attribute nije ispravan.',
-    'numeric'              => ':attribute mora biti broj.',
-    'present'              => ':attribute polje mora biti prisutno.',
-    'valid_regex'          => 'To nije valjani regex. ',
-    'regex'                => ':attribute format nije ispravan.',
-    'required'             => ':attribute polje je obavezno.',
-    'required_if'          => ':attribute polje je obavezno kada je :other :value.',
-    'required_unless'      => ':attribute polje je obavezno unless :other is in :values.',
-    'required_with'        => ':attribute polje je obavezno kada postoji :values.',
-    'required_with_all'    => ':attribute polje je obavezno kada :values postoji.',
-    'required_without'     => ':attribute polje je obavezno kada :values ne postoji.',
+    'present' => ':attribute polje mora biti prisutno.',
+    'present_if' => 'Polje :attribute mora imati vrednost kada :other sadrži :value.',
+    'present_unless' => 'Polje :attribute mora imati vrednost osim ako :other sadrži :value.',
+    'present_with' => 'Polje :attribute mora imati vrednost kada je :values izabrano.',
+    'present_with_all' => 'Polje :attribute mora imati vrednost kada je :values izabrano.',
+    'prohibited' => 'Polje :attribute je zabranjeno.',
+    'prohibited_if' => 'Polje :attribute je zabranjeno kada :other sadrži :value.',
+    'prohibited_unless' => 'Polje :attribute je zabranjeno osim ako :other sadrži :values.',
+    'prohibits' => 'Polje :attribute zabranjuje da :other bude izabrano.',
+    'regex' => 'Format polja :attribute nije ispravan.',
+    'required' => ':attribute polje je obavezno.',
+    'required_array_keys' => 'Polje :attribute mora da sadrži unose za : :values.',
+    'required_if' => ':attribute polje je obavezno kada je :other :value.',
+    'required_if_accepted' => 'Polje :attribute je obavezno kada je :other prihvaćeno.',
+    'required_if_declined' => 'Polje :attribute je neophodno kada je :other odbijeno.',
+    'required_unless' => ':attribute polje je obavezno unless :other is in :values.',
+    'required_with' => ':attribute polje je obavezno kada postoji :values.',
+    'required_with_all' => 'Polje :attribute je neophodno kada je :values izabrano.',
+    'required_without' => ':attribute polje je obavezno kada :values ne postoji.',
     'required_without_all' => ':attribute polje je obavezno ako nijedna od :values nije prisutna.',
-    'same'                 => ':attribute i :other moraju da su isti.',
-    'size'                 => [
-        'numeric' => ':attribute mora biti :size.',
-        'file'    => ':attribute mora biti :size kilobajta.',
-        'string'  => ':attribute mora biti :size znakova.',
-        'array'   => ':attribute mora sadržavati :size stavki.',
+    'same' => 'Polje :attribute se mora poklapati sa :other.',
+    'size' => [
+        'array' => 'Polje :attribute mora da sadrži :size stavki.',
+        'file' => 'Polje :attribute mora biti :size kilobajta.',
+        'numeric' => 'Polje :attribute mora biti :size.',
+        'string' => 'Polje :attribute mora da sadrži :size karaktera.',
     ],
+    'starts_with' => 'Polje :attribute mora da počne sa jednim od sledećih: :values.',
     'string'               => ':attribute mora biti :string.',
-    'timezone'             => ':attribute mora biti ispravna zona.',
     'two_column_unique_undeleted' => ':attribute mora biti jedinstven kako u :table1 tako i u :table2. ',
-    'unique'               => ':attribute je već zauzet.',
-    'uploaded'             => ':attribute nije prenet.',
-    'url'                  => ':attribute format je neispravan.',
     'unique_undeleted'     => ':attribute mora biti jedinstven.',
     'non_circular'         => ':attribute ne sme da kreira cirkularnu referencu.',
     'not_array'            => ':attribute ne može biti niz.',
@@ -102,11 +165,14 @@ return [
     'numbers'              => 'Lozinka mora da sadrži barem jednu cifru.',
     'case_diff'            => 'Lozinka mora da sadrži malo i veliko slovo.',
     'symbols'              => 'Lozinka mora da sadrži simbole.',
-    'gte'                  => [
-        'numeric'          => 'Vrednost ne može biti negativna'
-    ],
-    'checkboxes'           => ':attribute sadrži neispravne opcije.',
-    'radio_buttons'        => ':attribute je neispravan.',
+    'timezone' => 'Polje :attribute mora biti ispravna vremenska zona.',
+    'unique' => ':attribute je već zauzet.',
+    'uploaded' => ':attribute nije prenet.',
+    'uppercase' => 'Polje :attribute mora da sadrži sve velika slova.',
+    'url' => 'Polje :attribute mora biti ispravna URL adresa.',
+    'ulid' => 'Polje :attribute mora biti ispravan ULID.',
+    'uuid' => 'Polje :attribute mora biti ispravan UUID.',
+    'fmcs_location' => 'Puna podrška za višestruko kompanija i opsezi lokacija je omogućeno u administratorskim podešavanjima, a izabrana lokacija i kompanija nisu kompatibilne.',
 
 
     /*
@@ -120,16 +186,22 @@ return [
     |
     */
 
+    'email_array'      => 'Jedna ili više adresa e-pošte nisu ispravne.',
+    'checkboxes'           => ':attribute sadrži neispravne opcije.',
+    'radio_buttons'        => ':attribute je neispravan.',
+    
     'custom' => [
         'alpha_space' => ':attribute polje sadrži znak koji nije dozvoljen.',
-        'email_array'      => 'Jedna ili više email adresa nisu ispravne.',
+
         'hashed_pass'      => 'Vaša lozinka je neispravna',
         'dumbpwd'          => 'Lozinka nije sigurna.',
         'statuslabel_type' => 'Morate odabrati ispravnu vrstu oznake statusa',
+        'custom_field_not_found'          => 'Izgleda da ovo polje ne postoji. Molim vas proverite imena vaših prilagođenih polja.',
+        'custom_field_not_found_on_model' => 'Izgleda da ovo polje postoji, ali nije dostupno za grupu polja ovog modela imovine.',
 
         // date_format validation with slightly less stupid messages. It duplicates a lot, but it gets the job done :(
-        // We use this because the default error message for date_format is reflects php Y-m-d, which non-PHP
-        // people won't know how to format. 
+        // We use this because the default error message for date_format reflects php Y-m-d, which non-PHP
+        // people won't know how to format.
         'purchase_date.date_format'     => ':attribute mora biti ispravan datum u YYYY-MM-DD formatu',
         'last_audit_date.date_format'   =>  ':attribute mora biti ispravan datum u YYYY-MM-DD hh:mm:ss formatu',
         'expiration_date.date_format'   =>  ':attribute mora biti ispravan datum u YYYY-MM-DD formatu',
@@ -137,9 +209,15 @@ return [
         'expected_checkin.date_format'  =>  ':attribute mora biti ispravan datum u YYYY-MM-DD formatu',
         'start_date.date_format'        =>  ':attribute mora biti ispravan datum u YYYY-MM-DD formatu',
         'end_date.date_format'          =>  ':attribute mora biti ispravan datum u YYYY-MM-DD formatu',
+        'invalid_value_in_field' => 'Neispravna vrednost je sadržana u ovom polju',
 
-    ],
+        'ldap_username_field' => [
+            'not_in' =>         '<code>sAMAccountName</code> (mala i velika slova) verovatno neće raditi. Trebalo bi da umesto toga koristite <code>samaccountname</code> (mala slova).'
+        ],
+        'ldap_auth_filter_query' => ['not_in' => '<code>uid=samaccountname</code> verovatno nije ispravan filter za autentifikaciju. Verovatno želite <code>uid=</code> '],
+        'ldap_filter' => ['regex' => 'Ova vrednost verovatno ne bi trebalo da bude u zagradi.'],
 
+        ],
     /*
     |--------------------------------------------------------------------------
     | Custom Validation Attributes
@@ -155,8 +233,16 @@ return [
 
     /*
     |--------------------------------------------------------------------------
-    | Generic Validation Messages
+    | Generic Validation Messages - we use these in the jquery validation where we don't have
+    | access to the :attribute
     |--------------------------------------------------------------------------
     */
-    'invalid_value_in_field' => 'Neispravna vrednost je sadržana u ovom polju',
+
+    'generic' => [
+        'invalid_value_in_field' => 'Neispravna vrednost je sadržana u ovom polju',
+        'required' => 'Ovo polje je obavezno',
+        'email' => 'Molim vas unesite ispravnu adresu e-pošte',
+    ],
+
+
 ];
diff --git a/resources/lang/sv-SE/account/general.php b/resources/lang/sv-SE/account/general.php
index b1de0f7ce0..b2e1212e7b 100644
--- a/resources/lang/sv-SE/account/general.php
+++ b/resources/lang/sv-SE/account/general.php
@@ -2,10 +2,16 @@
 
 return array(
     'personal_api_keys' => 'Personliga API-nycklar',
-    'api_key_warning' => 'When generating an API token, be sure to copy it down immediately as they will not be visible to you again.',
+    'personal_access_token' => 'Personligt Access Token',
+    'personal_api_keys_success' => 'Personlig API-nyckel skapad',
+    'here_is_api_key' => 'Här är din nya personliga access token. Detta är den enda gången den kommer att visas så tappa inte bort den! Du kan nu använda denna token för att göra API-förfrågningar.',
+    'api_key_warning' => 'När du genererar ett API-token, se till att kopiera den omedelbart eftersom den inte kommer att vara synlig för dig igen.',
     'api_base_url' => 'Din API-bas-url finns på:',
     'api_base_url_endpoint' => '/&lt;endpoint&gt;',
-    'api_token_expiration_time' => 'API-tokens är inställda på att gå ut om:',
-    'api_reference' => 'Please check the <a href="https://snipe-it.readme.io/reference" target="_blank">API reference</a> to find specific API endpoints and additional API documentation.',
-    'profile_updated' => 'Account successfully updated',
+    'api_token_expiration_time' => 'API-tokens är inställda på att upphöra om:',
+    'api_reference' => 'Vänligen kontrollera <a href="https://snipe-it.readme.io/reference" target="_blank">API-dokumentationen</a> för att hitta specifika API-endpoints och ytterligare API relaterad information.',
+    'profile_updated' => 'Kontot har uppdaterats',
+    'no_tokens' => 'Du har inte skapat några personliga åtkomsttokens.',
+    'enable_sounds' => 'Aktivera ljudeffekter',
+    'enable_confetti' => 'Aktivera konfettieffekter',
 );
diff --git a/resources/lang/sv-SE/admin/accessories/general.php b/resources/lang/sv-SE/admin/accessories/general.php
index b2dc828932..208b72e5ef 100644
--- a/resources/lang/sv-SE/admin/accessories/general.php
+++ b/resources/lang/sv-SE/admin/accessories/general.php
@@ -7,16 +7,16 @@ return array(
     'checkin'  							=> 'Checka in tillbehör',
     'create'  							=> 'Skapa tillbehör',
     'edit'  							=> 'Redigera tillbehör',
-    'eula_text'							=> 'Kategori EULA',
+    'eula_text'							=> 'EULA-kategori',
     'eula_text_help'					=> 'Det här fältet tillåter att du ändrar din EULA för specifika typer av tillgångar. Om du endast har en EULA för samtliga tillgångar så kan du kryssa i rutan nedan för att använda den.',
     'require_acceptance'				=> 'Kräv att användare bekräftar mottagande av tillgångar i denna kategori.',
-    'no_default_eula'					=> 'Ingen EULA funnen. Lägg till en i inställningar.',
+    'no_default_eula'					=> 'Ingen EULA funnen. Lägg till en i inställningarna.',
     'total'  							=> 'Totalt',
-    'remaining'  						=> 'Tillgängliga',
+    'remaining'  						=> 'Kvarvarande',
     'update'  							=> 'Uppdatera tillbehör',
     'use_default_eula'					=> 'Använd <a href="#" data-toggle="modal" data-target="#eulaModal">den primära EULA:n</a> istället.',
     'use_default_eula_disabled'			=> '<del>Använd den primära EULA:n istället.</del> Ingen primär EULA är satt. Vänligen lägg till en i Inställningar.',
-    'clone'                             => 'Klona tillbehör',
+    'clone'                             => 'Kopiera tillbehör',
     'delete_disabled'                   => 'Detta tillbehör kan inte tas bort ännu eftersom vissa objekt fortfarande är utcheckade.',
 
 );
diff --git a/resources/lang/sv-SE/admin/accessories/message.php b/resources/lang/sv-SE/admin/accessories/message.php
index d537bfba42..d2f047b6f3 100644
--- a/resources/lang/sv-SE/admin/accessories/message.php
+++ b/resources/lang/sv-SE/admin/accessories/message.php
@@ -7,32 +7,36 @@ return array(
     'assoc_users'	 => 'Detta tillbehör har för närvarande :count objekt utcheckade till användare. Checka in tillbehöret och försök igen. ',
 
     'create' => array(
-        'error'   => 'Tillbehöret skapades inte, vänligen försök igen.',
-        'success' => 'Tillbehöret skapades.'
+        'error'   => 'Tillbehöret kunde inte skapas. Vänligen försök igen.',
+        'success' => 'Tillbehör skapat.'
     ),
 
     'update' => array(
-        'error'   => 'Tillbehöret uppdaterades inte, försök igen',
-        'success' => 'Tillbehöret uppdaterades.'
+        'error'   => 'Tillbehöret kunde inte uppdateras. Vänligen försök igen.',
+        'success' => 'Tillbehör uppdaterat.'
     ),
 
     'delete' => array(
         'confirm'   => 'Är du säker på att du vill ta bort det här tillbehöret?',
-        'error'   => 'Ett problem uppstod då tillbehöret skulle tas bort. Vänligen försök igen.',
-        'success' => 'Tillbehöret togs bort.'
+        'error'   => 'Ett fel uppstod när tillbehöret skulle tas bort. Vänligen försök igen.',
+        'success' => 'Tillbehör raderat.'
     ),
 
      'checkout' => array(
-        'error'   		=> 'Tillbehöret checkades inte ut. Vänligen försök igen',
-        'success' 		=> 'Tillbehöret checkades ut.',
+        'error'   		=> 'Tillbehöret kunde inte checkas ut. Vänligen försök igen.',
+        'success' 		=> 'Tillbehör utcheckat.',
         'unavailable'   => 'Tillbehöret är inte tillgängligt för utcheckning. Kontrollera antal tillgängligt',
-        'user_does_not_exist' => 'Användaren är ogiltig. Försök igen.'
+        'user_does_not_exist' => 'Användaren är ogiltig. Vänligen försök igen.',
+         'checkout_qty' => array(
+            'lte'  => 'Det finns för närvarande bara ett tillgängligt tillbehör av den här typen, och du försöker checka ut :checkout_qty stycken. Vänligen justera utcheckningsantalet eller det totala lagret av detta tillbehör och försök igen.|Det finns totalt :number_currently_remaining tillgängliga tillbehör, och du försöker checka ut :checkout_qty stycken. Vänligen justera utcheckningsantalet eller det totala lagret av detta tillbehör och försök igen.',
+            ),
+           
     ),
 
     'checkin' => array(
-        'error'   		=> 'Tillbehöret checkades inte in. Vänligen försök igen',
-        'success' 		=> 'Tillbehöret checkades in.',
-        'user_does_not_exist' => 'Användaren är ogiltig. Försök igen.'
+        'error'   		=> 'Tillbehöret kunde inte checkas in. Vänligen försök igen.',
+        'success' 		=> 'Tillbehör incheckat.',
+        'user_does_not_exist' => 'Användaren är ogiltig. Vänligen försök igen.'
     )
 
 
diff --git a/resources/lang/sv-SE/admin/accessories/table.php b/resources/lang/sv-SE/admin/accessories/table.php
index e72c3481ab..1ebe005cab 100644
--- a/resources/lang/sv-SE/admin/accessories/table.php
+++ b/resources/lang/sv-SE/admin/accessories/table.php
@@ -1,11 +1,9 @@
 <?php
 
 return array(
-	'dl_csv'      				=> 'Ladda ner CSV',
+	'dl_csv'      				=> 'Ladda ned CSV',
 	'eula_text'      			=> 'EULA',
     'id'      					=> 'ID',
     'require_acceptance'      	=> 'Godkännande',
     'title'      				=> 'Tillbehörsnamn',
-
-
 );
diff --git a/resources/lang/sv-SE/admin/asset_maintenances/form.php b/resources/lang/sv-SE/admin/asset_maintenances/form.php
index 96dbb4b58f..e0553fa7bd 100644
--- a/resources/lang/sv-SE/admin/asset_maintenances/form.php
+++ b/resources/lang/sv-SE/admin/asset_maintenances/form.php
@@ -5,9 +5,9 @@
         'title'                  => 'Titel',
         'start_date'             => 'Startdatum',
         'completion_date'        => 'Datum för slutförande',
-        'cost'                   => 'Kostnad',
+        'cost'                   => 'Inköpspris',
         'is_warranty'            => 'Förbättring av garanti',
-        'asset_maintenance_time' => 'Tillgångs underhållstid (i dagar)',
+        'asset_maintenance_time' => 'Tillgångens underhållstid (i dagar)',
         'notes'                  => 'Anteckningar',
         'update'                 => 'Uppdatera tillgångsunderhåll',
         'create'                 => 'Skapa tillgångsunderhåll'
diff --git a/resources/lang/sv-SE/admin/asset_maintenances/general.php b/resources/lang/sv-SE/admin/asset_maintenances/general.php
index 5baa4af0e2..9f34ea876f 100644
--- a/resources/lang/sv-SE/admin/asset_maintenances/general.php
+++ b/resources/lang/sv-SE/admin/asset_maintenances/general.php
@@ -9,7 +9,7 @@
         'maintenance'        => 'Underhåll',
         'upgrade'            => 'Uppgradera',
         'calibration'        => 'Kalibrering',
-        'software_support'   => 'Programvarusupport',
+        'software_support'   => 'Mjukvarusupport',
         'hardware_support'   => 'Hårdvarusupport',
         'configuration_change'   => 'Konfigurationsändring',
         'pat_test'           => 'PAT-test',
diff --git a/resources/lang/sv-SE/admin/asset_maintenances/message.php b/resources/lang/sv-SE/admin/asset_maintenances/message.php
index 5e48a5f322..177bd71023 100644
--- a/resources/lang/sv-SE/admin/asset_maintenances/message.php
+++ b/resources/lang/sv-SE/admin/asset_maintenances/message.php
@@ -1,21 +1,21 @@
 <?php
 
     return [
-        'not_found'                    => 'Underhåll av tillgången du letade efter kunde inte hittas!',
+        'not_found'                    => 'Tillgångsunderhållet du letade efter kunde inte hittas!',
         'delete'                       => [
-            'confirm' => 'År du säker på att du vill radera inventarieunderhållet?',
-            'error'   => 'Ett fel uppstod vid radering av underhåll av tillgång. Var god försök igen.',
-            'success' => 'Underhåll av tillgången raderades.',
+            'confirm' => 'År du säker på att du vill radera tillgångsunderhållet?',
+            'error'   => 'Ett fel uppstod vid radering av tillgångsunderhåll. Vänligen försök igen.',
+            'success' => 'Tillgångsunderhåll raderat.',
         ],
         'create'                       => [
-            'error'   => 'Underhåll av tillgången skapades inte. Var god försök igen.',
-            'success' => 'Underhåll av tillgången skapades.',
+            'error'   => 'Tillgångsunderhållet kunde inte skapas. Vänligen försök igen.',
+            'success' => 'Tillgångsunderhåll skapat.',
         ],
         'edit'                       => [
-            'error'   => 'Underhåll av tillgång redigerades inte, försök igen.',
-            'success' => 'Underhåll av tillgång redigerades.',
+            'error'   => 'Tillgångsunderhållet kunde inte redigeras. Vänligen försök igen.',
+            'success' => 'Tillgångsunderhåll redigerat.',
         ],
-        'asset_maintenance_incomplete' => 'Inte klar ännu',
+        'asset_maintenance_incomplete' => 'Inte färdigställt ännu',
         'warranty'                     => 'Garanti',
-        'not_warranty'                 => 'Inte garanti',
+        'not_warranty'                 => 'Ej garanti',
     ];
diff --git a/resources/lang/sv-SE/admin/asset_maintenances/table.php b/resources/lang/sv-SE/admin/asset_maintenances/table.php
index 0fdfef10e5..0f17726ca9 100644
--- a/resources/lang/sv-SE/admin/asset_maintenances/table.php
+++ b/resources/lang/sv-SE/admin/asset_maintenances/table.php
@@ -1,8 +1,8 @@
 <?php
 
     return [
-        'title'         => 'Inventarieunderhåll',
-        'asset_name'    => 'Namn på tillgång',
+        'title'         => 'Tillgångsunderhåll',
+        'asset_name'    => 'Företagsnamn',
         'is_warranty'   => 'Garanti',
-        'dl_csv'        => 'Ladda ner CSV',
+        'dl_csv'        => 'Ladda ned CSV',
     ];
diff --git a/resources/lang/sv-SE/admin/categories/general.php b/resources/lang/sv-SE/admin/categories/general.php
index aa9387e7f3..8df2368e1b 100644
--- a/resources/lang/sv-SE/admin/categories/general.php
+++ b/resources/lang/sv-SE/admin/categories/general.php
@@ -1,16 +1,16 @@
 <?php
 
 return array(
-    'asset_categories' 					=> 'Kategorier',
+    'asset_categories' 					=> 'Tillgångskategorier',
     'category_name'  					=> 'Kategorinamn',
-    'checkin_email'                     => 'Skicka e-post till användaren vid incheckning / utcheckning.',
-    'checkin_email_notification'        => 'Den här användaren kommer att skickas ett mail vid incheckning / utcheckning.',
-    'clone'                             => 'Klona kategori',
+    'checkin_email'                     => 'Skicka e-post till användaren vid incheckning/utcheckning.',
+    'checkin_email_notification'        => 'Den här användaren kommer att få e-post vid incheckning/utcheckning.',
+    'clone'                             => 'Kopiera kategori',
     'create'  							=> 'Skapa kategori',
     'edit'                              => 'Redigera kategori',
     'email_will_be_sent_due_to_global_eula' => 'Ett e-postmeddelande kommer att skickas till användaren eftersom det globala användaravtalet (EULA) används.',
     'email_will_be_sent_due_to_category_eula' => 'Ett e-postmeddelande kommer att skickas till användaren eftersom ett användaravtal (EULA) är inställt för denna kategori.',
-    'eula_text'							=> 'Kategori EULA',
+    'eula_text'							=> 'EULA-kategori',
     'eula_text_help'					=> 'I detta fält kan du anpassa dina licensavtal för slutanvändare, EULA, för vissa typer av tillgångar. Om du bara har ett licensavtal för alla dina tillgångar, kan du markera rutan nedan för att använda standardlicensavtalet.',
     'name'                              => 'Kategorinamn',
     'require_acceptance'				=> 'Kräv att användare bekräftar mottagande av tillgångar i denna kategori.',
@@ -20,6 +20,6 @@ return array(
     'update'  							=> 'Uppdatera kategori',
     'use_default_eula'					=> 'Använd <a href="#" data-toggle="modal" data-target="#eulaModal">standard-licensavtal, EULA</a> istället.',
     'use_default_eula_disabled'			=> '<del>Använd den primära licensavtalet, EULA:n, istället.</del> Inget primärt licensavtal, EULA, är satt. Vänligen lägg till en under Inställningar.',
-    'use_default_eula_column'			=> 'Använd standard EULA',
+    'use_default_eula_column'			=> 'Använd standard-EULA',
 
 );
diff --git a/resources/lang/sv-SE/admin/categories/table.php b/resources/lang/sv-SE/admin/categories/table.php
index 8c25729968..bc2c37fd8b 100644
--- a/resources/lang/sv-SE/admin/categories/table.php
+++ b/resources/lang/sv-SE/admin/categories/table.php
@@ -5,6 +5,6 @@ return array(
     'id'      					=> 'ID',
     'parent'   					=> 'Överordnad',
     'require_acceptance'      	=> 'Godkännande',
-    'title'      				=> 'Namn på kategori',
+    'title'      				=> 'Tillgångskategori',
 
 );
diff --git a/resources/lang/sv-SE/admin/companies/general.php b/resources/lang/sv-SE/admin/companies/general.php
index b8d22a2523..f5e5a3a437 100644
--- a/resources/lang/sv-SE/admin/companies/general.php
+++ b/resources/lang/sv-SE/admin/companies/general.php
@@ -3,5 +3,5 @@
 return [
     'select_company' => 'Välj företag',
     'about_companies' => 'Om företag',
-    'about_companies_description' => '        Du kan använda företag som ett enkelt informativt fält, eller så kan du använda dem för att begränsa tillgångar och tillgängligheten för användare med ett visst företag genom att aktivera Full Företagssupport i dina administratörsinställningar.',
+    'about_companies_description' => '        Du kan använda företag som ett enkelt informativt fält, eller så kan du använda dem för att begränsa tillgångars synlighet och tillgängligheten för användare med ett visst företag genom att aktivera Full Företagssupport i dina administratörsinställningar.',
 ];
diff --git a/resources/lang/sv-SE/admin/companies/message.php b/resources/lang/sv-SE/admin/companies/message.php
index 63b63bac8c..f802c2801e 100644
--- a/resources/lang/sv-SE/admin/companies/message.php
+++ b/resources/lang/sv-SE/admin/companies/message.php
@@ -3,18 +3,18 @@
 return [
     'does_not_exist' => 'Företaget finns inte.',
     'deleted'        => 'Raderat företag',
-    'assoc_users'    => 'Detta företag är för närvarande är associerade med minst en modell och kan inte tas bort. Vänligen uppdatera din modeller för att inte längre referera till detta företag och försök igen. ',
+    'assoc_users'    => 'Detta företag är för närvarande kopplat till minst en modell och kan inte tas bort. Vänligen uppdatera din modeller för att inte längre referera till detta företag och försök igen. ',
     'create' => [
-        'error'   => 'Företaget skapades inte, försök igen.',
-        'success' => 'Företaget har skapats.',
+        'error'   => 'Företaget kunde inte skapas. Vänligen försök igen.',
+        'success' => 'Företag skapat.',
     ],
     'update' => [
-        'error'   => 'Företaget har inte uppdaterats, försök igen',
-        'success' => 'Företaget uppdaterades.',
+        'error'   => 'Företaget kunde inte uppdateras. Vänligen försök igen.',
+        'success' => 'Företag uppdaterat.',
     ],
     'delete' => [
         'confirm' => 'Är du säker på att du vill ta bort det här företaget?',
-        'error'   => 'Ett problem uppstod när företaget skulle tas bort. Vänligen försök igen.',
-        'success' => 'Företaget har tagits bort.',
+        'error'   => 'Ett fel uppstod när företaget skulle tas bort. Vänligen försök igen.',
+        'success' => 'Företag raderat.',
     ],
 ];
diff --git a/resources/lang/sv-SE/admin/companies/table.php b/resources/lang/sv-SE/admin/companies/table.php
index a8ccf36038..57897a53cb 100644
--- a/resources/lang/sv-SE/admin/companies/table.php
+++ b/resources/lang/sv-SE/admin/companies/table.php
@@ -4,7 +4,7 @@ return array(
     'create'    => 'Skapa företag',
     'email'     => 'Företagets e-postadress',
     'title'     => 'Företag',
-    'phone'     => 'Företagstelefon',
+    'phone'     => 'Företagets telefonnummer',
     'update'    => 'Uppdatera företag',
     'name'      => 'Företagsnamn',
     'id'        => 'ID',
diff --git a/resources/lang/sv-SE/admin/components/general.php b/resources/lang/sv-SE/admin/components/general.php
index 6219255cf0..637584e863 100644
--- a/resources/lang/sv-SE/admin/components/general.php
+++ b/resources/lang/sv-SE/admin/components/general.php
@@ -4,13 +4,13 @@ return array(
     'component_name'                  => 'Komponentnamn',
     'checkin'                             => 'Checka in komponent',
     'checkout'                             => 'Checka ut komponent',
-    'cost'				=> 'Inköpskostnad',
+    'cost'				=> 'Inköpspris',
     'create'                             => 'Skapa komponent',
     'edit'                             => 'Redigera komponent',
     'date'					=> 'Inköpsdatum',
-    'order'					=> 'Beställningsnummer',
+    'order'					=> 'Ordernummer',
     'remaining' 			             => 'Återstående',
     'total' 			                 => 'Totalt',
     'update'                            => 'Uppdatera komponent',
-    'checkin_limit'            => 'Incheckad mängd måste vara lika med eller mindre än :assigned_qty'
+    'checkin_limit'            => 'Incheckat antal måste vara lika med eller mindre än :assigned_qty'
 );
diff --git a/resources/lang/sv-SE/admin/components/message.php b/resources/lang/sv-SE/admin/components/message.php
index fa6b09bf79..4d71bc23d4 100644
--- a/resources/lang/sv-SE/admin/components/message.php
+++ b/resources/lang/sv-SE/admin/components/message.php
@@ -5,32 +5,33 @@ return array(
     'does_not_exist' => 'Komponenten existerar inte.',
 
     'create' => array(
-        'error'   => 'Komponent skapades inte, försök igen.',
-        'success' => 'Komponent skapad framgångsrikt.'
+        'error'   => 'Komponenten kunde inte skapas. Vänligen försök igen.',
+        'success' => 'Komponent skapad.'
     ),
 
     'update' => array(
-        'error'   => 'Komponenten uppdaterades inte, var god försök igen',
-        'success' => 'Komponent uppdaterad framgångsrikt.'
+        'error'   => 'Komponenten kunde inte uppdateras. Vänligen försök igen.',
+        'success' => 'Komponent uppdaterad.'
     ),
 
     'delete' => array(
         'confirm'   => 'Är du säker på att du vill radera den här komponenten?',
-        'error'   => 'Det gick inte att ta bort komponenten. Var god försök igen.',
-        'success' => 'Komponenten har tagits bort.'
+        'error'   => 'Kunde inte ta bort komponenten. Vänligen försök igen.',
+        'success' => 'Komponent raderad.',
+        'error_qty'   => 'Some components of this type are still checked out. Please check them in and try again.',
     ),
 
      'checkout' => array(
-        'error'   		=> 'Komponenten var inte utcheckad, försök igen',
-        'success' 		=> 'Komponent utcheckad framgångsrikt.',
-        'user_does_not_exist' => 'Den användaren är ogiltig. Var god försök igen.',
+        'error'   		=> 'Komponenten kunde inte checkas. Vänligen försök igen.',
+        'success' 		=> 'Komponent utcheckad.',
+        'user_does_not_exist' => 'Användaren är ogiltig. Vänligen försök igen.',
         'unavailable'      => 'Inte tillräckligt med komponenter kvar: :remaining kvar, :requested efterfrågat ',
     ),
 
     'checkin' => array(
-        'error'   		=> 'Komponenten har inte kontrollerats, var vänlig försök igen',
-        'success' 		=> 'Komponent incheckad framgångsrikt.',
-        'user_does_not_exist' => 'Den användaren är ogiltig. Var god försök igen.'
+        'error'   		=> 'Komponenten kunde inte checkas in. Vänligen försök igen.',
+        'success' 		=> 'Komponent incheckad.',
+        'user_does_not_exist' => 'Den användaren är ogiltig. Vänligen försök igen.'
     )
 
 
diff --git a/resources/lang/sv-SE/admin/consumables/general.php b/resources/lang/sv-SE/admin/consumables/general.php
index c053250e91..10b09eb9a7 100644
--- a/resources/lang/sv-SE/admin/consumables/general.php
+++ b/resources/lang/sv-SE/admin/consumables/general.php
@@ -1,11 +1,12 @@
 <?php
 
 return array(
-    'checkout'                          => 'Förbrukningsvaror',
+    'checkout'                          => 'Checka ut förbrukningsvara till användare',
     'consumable_name'                   => 'Namn på förbrukningsvara',
     'create'                            => 'Skapa förbrukningvara',
-    'item_no'                           => 'Artikelnummer',
+    'item_no'                           => 'Objektnummer',
     'remaining' 			            => 'Återstående',
     'total' 			                => 'Totalt',
     'update'                            => 'Uppdatera förbrukningsvara',
+    'inventory_warning'                 => 'Lagret av denna förbrukningsvara är under minima; :min_count stycken.',
 );
diff --git a/resources/lang/sv-SE/admin/consumables/message.php b/resources/lang/sv-SE/admin/consumables/message.php
index 5858e376fc..2e164e255f 100644
--- a/resources/lang/sv-SE/admin/consumables/message.php
+++ b/resources/lang/sv-SE/admin/consumables/message.php
@@ -2,35 +2,36 @@
 
 return array(
 
-    'does_not_exist' => 'Förbrukningsartiklar existerar inte.',
+    'invalid_category_type' => 'Kategorin måste vara en förbrukningsvarukategori.',
+    'does_not_exist' => 'Förbrukningvaran existerar inte.',
 
     'create' => array(
-        'error'   => 'Förbrukningsbarhet skapades inte, försök igen.',
-        'success' => 'Förbrukningsbar skapad framgångsrik.'
+        'error'   => 'Förbrukningsvaran kunde inte skapas. Vänligen försök igen.',
+        'success' => 'Förbrukningsvara skapad.'
     ),
 
     'update' => array(
-        'error'   => 'Förbrukningsvaror uppdaterades inte, var god försök igen',
-        'success' => 'Förbrukningsvaror uppdateras framgångsrikt.'
+        'error'   => 'Förbrukningsvaran kunde inte uppdateras.Vänligen försök igen.',
+        'success' => 'Förbruksningsvara uppdaterad.'
     ),
 
     'delete' => array(
         'confirm'   => 'Är du säker på att du vill radera denna förbrukningsartiklar?',
-        'error'   => 'Det gick inte att ta bort förbrukningen. Var god försök igen.',
-        'success' => 'Konsumtionen har tagits bort.'
+        'error'   => 'Kunde inte ta bort förbrukningsvaran. Vänligen försök igen.',
+        'success' => 'Förbrukningsvaran raderad.'
     ),
 
      'checkout' => array(
-        'error'   		=> 'Förbrukningsartiklarna är inte utcheckade, försök igen',
-        'success' 		=> 'Förbrukningsbar utcheckad framgångsrik.',
-        'user_does_not_exist' => 'Den användaren är ogiltig. Var god försök igen.',
-         'unavailable'      => 'Det finns inte tillräckligt med förbrukningsvaror för denna checkout. Vänligen kontrollera antalet kvar. ',
+        'error'   		=> 'Förbrukningsvaran kunde inte checkas ut. Vänligen försök igen.',
+        'success' 		=> 'Förbrukningsvaran utcheckad.',
+        'user_does_not_exist' => 'Användaren är ogiltig. Vänligen försök igen.',
+         'unavailable'      => 'Det finns inte tillräckligt med förbrukningsvaror för denna utcheckning. Vänligen kontrollera antalet kvar i lager. ',
     ),
 
     'checkin' => array(
-        'error'   		=> 'Förbrukningsartiklarna kontrollerades inte, försök igen',
-        'success' 		=> 'Konsumtionskontrollen kontrolleras framgångsrikt.',
-        'user_does_not_exist' => 'Den användaren är ogiltig. Var god försök igen.'
+        'error'   		=> 'Förbrukningsvaran kunde inte checkas in. Vänligen försök igen.',
+        'success' 		=> 'Förbrukningsvara incheckad.',
+        'user_does_not_exist' => 'Användaren är ogiltig. Vänligen försök igen.'
     )
 
 
diff --git a/resources/lang/sv-SE/admin/consumables/table.php b/resources/lang/sv-SE/admin/consumables/table.php
index c91d1a9abd..4c6030a368 100644
--- a/resources/lang/sv-SE/admin/consumables/table.php
+++ b/resources/lang/sv-SE/admin/consumables/table.php
@@ -1,5 +1,5 @@
 <?php
 
 return array(
-    'title'      				=> 'Förbrukningsnamn',
+    'title'      				=> 'Förbrukningsvarunamn',
 );
diff --git a/resources/lang/sv-SE/admin/custom_fields/general.php b/resources/lang/sv-SE/admin/custom_fields/general.php
index 246001aba0..246dd435ff 100644
--- a/resources/lang/sv-SE/admin/custom_fields/general.php
+++ b/resources/lang/sv-SE/admin/custom_fields/general.php
@@ -4,58 +4,61 @@ return [
     'custom_fields'		        => 'Anpassade fält',
     'manage'                    => 'Hantera',
     'field'		                => 'Fält',
-    'about_fieldsets_title'		=> 'Om fältsamlingar',
-    'about_fieldsets_text'		=> 'Fältsamlingar låter dig skapa grupper av fält som är anpassade efter ofta använda av en viss typ av tillgång. Ex. "Cpu", "Ram", "Hdd", etc.',
+    'about_fieldsets_title'		=> 'Om fältuppsättningar',
+    'about_fieldsets_text'		=> 'Fältuppsättningar låter dig skapa grupper av anpassade fält som ofta återanvänds för specifika tillgångsmodelltyper.',
     'custom_format'             => 'Anpassat Regex-format...',
-    'encrypt_field'      	        => 'Kryptera värdet på det här fältet i databasen',
-    'encrypt_field_help'      => 'VARNING: Kryptering av ett fält gör det oförsvarligt.',
-    'encrypted'      	        => 'krypterad',
-    'fieldset'      	        => 'Fältsamling',
+    'encrypt_field'      	        => 'Kryptera värdet för det här fältet i databasen',
+    'encrypt_field_help'      => 'VARNING: Kryptering av ett fält genererar fältet osökbart.',
+    'encrypted'      	        => 'Krypterat',
+    'fieldset'      	        => 'Fältuppsättning',
     'qty_fields'      	      => 'Antal fält',
-    'fieldsets'      	        => 'Fältsamlingar',
-    'fieldset_name'           => 'Namn på fältsamling',
+    'fieldsets'      	        => 'Fältuppsättningar',
+    'fieldset_name'           => 'Namn på fältuppsättning',
     'field_name'              => 'Fältnamn',
     'field_values'            => 'Fältvärden',
-    'field_values_help'       => 'Lägg till valbara alternativ, en per rad. Andra linjer än första raden kommer att ignoreras.',
+    'field_values_help'       => 'Lägg till valbara alternativ, en per rad. Tomma rader förutom första raden kommer att ignoreras.',
     'field_element'           => 'Formulärelement',
     'field_element_short'     => 'Element',
     'field_format'            => 'Format',
-    'field_custom_format'     => 'Anpassat format',
+    'field_custom_format'     => 'Anpassat Regex-format',
     'field_custom_format_help'     => 'Detta fält låter dig använda ett regex-uttryck för validering. Det ska börja med "regex:" - till exempel för att säkerställa att värdet i ett anpassat fält innehåller ett giltigt IMEI (15 siffror), skulle du använda: <code>regex:/^[0-9]{15}$/</code>.',
-    'required'   		          => 'Krävs',
+    'required'   		          => 'Obligatoriskt',
     'req'   		              => 'Obl.',
     'used_by_models'   		    => 'Används av modeller',
     'order'   		            => 'Sortering',
-    'create_fieldset'         => 'Ny fältsamling',
-    'update_fieldset'         => 'Uppdatera fältsamling',
+    'create_fieldset'         => 'Ny fältuppsättning',
+    'update_fieldset'         => 'Uppdatera fältuppsättning',
     'fieldset_does_not_exist'   => 'Användare [: id] existerar inte',
-    'fieldset_updated'         => 'Fältsamling uppdaterad',
-    'create_fieldset_title' => 'Skapa en ny fältsamling',
+    'fieldset_updated'         => 'Fältuppsättning uppdaterad',
+    'create_fieldset_title' => 'Skapa ny fältuppsättning',
     'create_field'            => 'Nytt anpassat fält',
     'create_field_title' => 'Skapa ett nytt anpassat fält',
     'value_encrypted'      	        => 'Värdet på det här fältet är krypterat i databasen. Endast adminanvändare kan se det dekrypterade värdet',
-    'show_in_email'     => 'Inkludera värdet på det här fältet i utcheckning mailen som skickas till användarna? Krypterade fält kan inte inkluderas i e-postmeddelanden',
-    'show_in_email_short'     => 'Inkludera i e-post.',
+    'show_in_email'     => 'Inkludera värdet på det här fältet i utcheckningsmejlen som skickas till användarna? Krypterade fält inkluderas inte i e-postmeddelanden',
+    'show_in_email_short' => 'Inkludera i e-post',
     'help_text' => 'Hjälptext',
-    'help_text_description' => 'Detta är valfri text som visas under formulärelementen medan du redigerar en tillgång för att ge sammanhang på fältet.',
+    'help_text_description' => 'Detta är valfri text som visas under formulärelementen medan du redigerar en tillgång för att ge sammanhang till fältet.',
     'about_custom_fields_title' => 'Om anpassade fält',
-    'about_custom_fields_text' => 'Anpassade fält låter dig lägga till egna attribut till tillgångar.',
-    'add_field_to_fieldset' => 'Lägg till fält till fältsamlingar',
+    'about_custom_fields_text' => 'Anpassade fält låter dig lägga till egna attribut för tillgångar.',
+    'add_field_to_fieldset' => 'Lägg till fält för fältuppsättning',
     'make_optional' => 'Obligatoriskt - klicka för att göra valfritt',
-    'make_required' => 'Valfritt - klicka för att begära',
+    'make_required' => 'Valfritt - klicka för att göra obligatoriskt',
     'reorder' => 'Ändra ordning',
-    'db_field' => 'DB Fält',
+    'db_field' => 'DB-fält',
     'db_convert_warning' => 'VARNING. Detta fält finns i tabellen för anpassade fält som <code>:db_column</code> men borde vara <code>:expected</code>.',
     'is_unique' => 'Detta värde måste vara unikt för alla tillgångar',
     'unique' => 'Unik',
-    'display_in_user_view' => 'Tillåt den utcheckade användaren att visa dessa värden i sin vy tilldelad tillgångssida',
+    'display_in_user_view' => 'Tillåt den utcheckade användaren att visa dessa värden i sin vy "Visa tilldelade tillgångar"',
     'display_in_user_view_table' => 'Synlig för användare',
-    'auto_add_to_fieldsets' => 'Lägg automatiskt till detta i varje nytt fält',
-    'add_to_preexisting_fieldsets' => 'Lägg till en befintlig lista',
-    'show_in_listview' => 'Visa i listvyer som standard. Auktoriserade användare kommer fortfarande att kunna visa/dölja via kolumnväljaren',
-    'show_in_listview_short' => 'Visa i listor',
-    'show_in_requestable_list_short' => 'Visa i listan med begärbara tillgångar',
-    'show_in_requestable_list' => 'Visa värde i listan med begärbara tillgångar. Krypterade fält kommer inte att visas',
+    'auto_add_to_fieldsets' => 'Lägg automatiskt till detta fält för varje ny fältuppsättning',
+    'add_to_preexisting_fieldsets' => 'Lägg till i alla existerande fältuppsättningar',
+    'show_in_listview' => 'Visa i listvyer som standard. Användare med tillräcklig behörighet kommer fortfarande att kunna visa/dölja via kolumnväljaren',
+    'show_in_listview_short' => 'Visa i vy',
+    'show_in_requestable_list_short' => 'Visa i vyn för begärbara tillgångar',
+    'show_in_requestable_list' => 'Visa värde i vyn för begärbara tillgångar. Krypterade fält kommer inte att visas',
     'encrypted_options' => 'Detta fält är krypterat, så vissa visningsalternativ kommer inte att vara tillgängliga.',
+    'display_checkin' => 'Display in checkin forms',
+    'display_checkout' => 'Display in checkout forms',
+    'display_audit' => 'Display in audit forms',
 
 ];
diff --git a/resources/lang/sv-SE/admin/custom_fields/message.php b/resources/lang/sv-SE/admin/custom_fields/message.php
index 28ec085b02..4f23a34c45 100644
--- a/resources/lang/sv-SE/admin/custom_fields/message.php
+++ b/resources/lang/sv-SE/admin/custom_fields/message.php
@@ -3,24 +3,25 @@
 return array(
 
     'field' => array(
-        'invalid'   => 'Det fältet existerar inte.',
-        'already_added'   => 'Fält som redan lagts till',
+        'invalid'   => 'Fältet existerar inte.',
+        'already_added'   => 'Fältet har redan lagts till',
+        'none_selected'   => 'Inget fält valt',
 
         'create' => array(
-            'error'   => 'Fältet skapades inte, var vänlig försök igen.',
-            'success' => 'Fält skapat framgångsrikt.',
-            'assoc_success' => 'Fält med framgång tillfogas till fältet.'
+            'error'   => 'Fältet kunde inte skapas. Vänligen försök igen.',
+            'success' => 'Fält skapat.',
+            'assoc_success' => 'Fältet lades till i fältuppsättningen.'
         ),
 
         'update' => array(
-            'error'   => 'Fältet uppdaterades inte, var vänlig försök igen',
-            'success' => 'Fältet uppdateras framgångsrikt.'
+            'error'   => 'Fältet kunde inte uppdateras. Vänligen försök igen.',
+            'success' => 'Fältet uppdaterat.'
         ),
 
         'delete' => array(
             'confirm'   	=> 'Är du säker på att du vill radera det här fältet?',
-            'error'   => 'Det gick inte att ta bort fältet. Var god försök igen.',
-            'success' => 'Fältet raderades framgångsrikt.',
+            'error'   => 'Kunde inte ta bort fältet. Vänligen försök igen.',
+            'success' => 'Fält raderat.',
             'in_use'   => 'Fältet är fortfarande i bruk.',
         )
 
@@ -28,30 +29,30 @@ return array(
 
     'fieldset' => array(
 
-        'does_not_exist' => 'Fieldset existerar inte',
+        'does_not_exist' => 'Fältuppsättningen existerar inte',
 
         'create' => array(
-            'error'   => 'Fieldset skapades inte, försök igen.',
-            'success' => 'Fältet skapades framgångsrikt.'
+            'error'   => 'Fältuppsättningen kunde inte skapas. Vänligen försök igen.',
+            'success' => 'Fält skapat.'
         ),
 
         'update' => array(
-            'error'   => 'Fieldset uppdaterades inte, försök igen',
-            'success' => 'Fältet uppdateras framgångsrikt.'
+            'error'   => 'Fältuppsättningen kunde inte uppdateras. Vänligen försök igen.',
+            'success' => 'Fält uppdaterat.'
         ),
 
         'delete' => array(
-            'confirm'   	=> 'Är du säker på att du vill radera den här fältet?',
-            'error'   => 'Det gick inte att ta bort fältet. Var god försök igen.',
-            'success' => 'Fältet raderades framgångsrikt.',
-            'in_use'   => 'Fieldset är fortfarande i bruk.',
+            'confirm'   	=> 'Är du säker på att du vill radera det här fältet?',
+            'error'   => 'Det gick inte att ta bort fältet. Vänligen försök igen.',
+            'success' => 'Fält raderat.',
+            'in_use'   => 'Fältuppsättningen är fortfarande i bruk.',
         )
 
     ),
 
     'fieldset_default_value' => array(
 
-        'error' => 'Fel vid validering av standardvärden för fältsamlingen.',
+        'error' => 'Fel vid validering av standardvärden för för fältuppsättningen.',
 
     ),
 
diff --git a/resources/lang/sv-SE/admin/departments/message.php b/resources/lang/sv-SE/admin/departments/message.php
index 1f19ac2363..1c0f8466db 100644
--- a/resources/lang/sv-SE/admin/departments/message.php
+++ b/resources/lang/sv-SE/admin/departments/message.php
@@ -3,20 +3,20 @@
 return array(
 
     'does_not_exist' => 'Avdelningen existerar inte.',
-    'department_already_exists' => 'En avdelning finns redan med det namnet på den här företagsplatsen. Eller välj ett mer specifikt namn för den här avdelningen. ',
-    'assoc_users'	 => 'Den här avdelningen är för närvarande associerad med minst en användare och kan inte raderas. Uppdatera dina användare för att inte längre referera till den här avdelningen och försök igen.',
+    'department_already_exists' => 'En avdelning finns redan med det namnet på den här företagsplatsen. Välj ett mer specifikt namn för den här avdelningen. ',
+    'assoc_users'	 => 'Den här avdelningen är för närvarande kopplad till minst en användare och kan inte raderas. Uppdatera dina användare för att inte längre referera till den här avdelningen och försök igen.',
     'create' => array(
-        'error'   => 'Avdelningen skapades inte, var god försök igen.',
-        'success' => 'Institutionen skapades framgångsrikt.'
+        'error'   => 'Avdelningen kunde inte skapas. Vänligen försök igen.',
+        'success' => 'Avdelning skapad.'
     ),
     'update' => array(
-        'error'   => 'Avdelningen uppdaterades inte, var god försök igen',
-        'success' => 'Avdelning uppdaterad framgångsrikt.'
+        'error'   => 'Avdelningen kunde inte uppdateras. Vänligen försök igen.',
+        'success' => 'Avdelning uppdaterad.'
     ),
     'delete' => array(
         'confirm'   	=> 'Är du säker på att du vill radera den här avdelningen?',
-        'error'   => 'Det gick inte att ta bort avdelningen. Var god försök igen.',
-        'success' => 'Avdelningen har tagits bort framgångsrikt.'
+        'error'   => 'Kunde inte ta bort avdelningen. Vänligen försök igen.',
+        'success' => 'Avdelning raderad.'
     )
 
 );
diff --git a/resources/lang/sv-SE/admin/departments/table.php b/resources/lang/sv-SE/admin/departments/table.php
index c261283075..00fa38e4b2 100644
--- a/resources/lang/sv-SE/admin/departments/table.php
+++ b/resources/lang/sv-SE/admin/departments/table.php
@@ -4,8 +4,8 @@ return array(
 
     'id'                        => 'ID',
     'name'                      => 'Avdelningsnamn',
-    'manager'                   => 'Chef',
+    'manager'                   => 'Ansvarig',
     'location'                  => 'Plats',
     'create'                    => 'Skapa avdelning',
-    'update'                    => 'Uppdateringsavdelning',
+    'update'                    => 'Uppdatera avdelning',
     );
diff --git a/resources/lang/sv-SE/admin/depreciations/general.php b/resources/lang/sv-SE/admin/depreciations/general.php
index 22bf7d4f8e..c776d8bf22 100644
--- a/resources/lang/sv-SE/admin/depreciations/general.php
+++ b/resources/lang/sv-SE/admin/depreciations/general.php
@@ -1,16 +1,20 @@
 <?php
 
 return [
-    'about_asset_depreciations'  			=> 'Om avskrivning av tillgångar',
-    'about_depreciations'  					=> 'Du kan ställa in avskrivning av tillgångar baserat på linjär avskrivning.',
-    'asset_depreciations'  					=> 'Avskrivningar av tillgångar',
-    'create'  					            => 'Skapa avskrivningar',
-    'depreciation_name'  					=> 'Avskrivningsnamn',
+    'about_asset_depreciations'  			=> 'Om värdeminskning av tillgångar',
+    'about_depreciations'  					=> 'Du kan ställa in värdeminskning av tillgångar baserat på linjär värdeminskning.',
+    'asset_depreciations'  					=> 'Värdeminskning av tillgångar',
+    'create'  					            => 'Skapa värdeminskning',
+    'depreciation_name'  					=> 'Värdeminskningsnamn',
     'depreciation_min'                      => 'Nuvarande värde',
-    'number_of_months'  					=> 'Antal Månader',
-    'update'  					            => 'Uppdatera avskrivningar',
-    'depreciation_min'                      => 'Minsta värde efter avskrivningar',
+    'number_of_months'  					=> 'Antal månader',
+    'update'  					            => 'Uppdatera värdeminskning',
+    'depreciation_min'                      => 'Minsta värde efter värdeminskning',
     'no_depreciations_warning'               => '<strong>Varning: </strong>
-                      Du har för närvarande inte några avskrivningar.
-                      Vänligen ställ in minst en avskrivning för att se avskrivningsrapporten.',
+                      Du har för närvarande inte några värdeminskningar uppsatta.
+                      Vänligen ställ in minst en värdeminskning för att se värdeminskningsrapporten.',
+    'depreciation_method'                   => 'Värdeminskningsrapport',
+    'linear_depreciation'                   => 'Linear (Default)',
+    'half_1'                                => 'Half-year convention, always applied',
+    'half_2'                                => 'Half-year convention, applied with condition',
 ];
diff --git a/resources/lang/sv-SE/admin/depreciations/message.php b/resources/lang/sv-SE/admin/depreciations/message.php
index 3464c7d3f1..91b9badc30 100644
--- a/resources/lang/sv-SE/admin/depreciations/message.php
+++ b/resources/lang/sv-SE/admin/depreciations/message.php
@@ -2,24 +2,24 @@
 
 return array(
 
-    'does_not_exist' => 'Denna avskrivningskategori existerar inte.',
-    'assoc_users'	 => 'Denna avskrivning är för närvarande kopplad till en eller flera modeller och kan inte raderas. Ta bort modellerna och försök sedan radera igen.',
+    'does_not_exist' => 'Denna värdeminskningskategori existerar inte.',
+    'assoc_users'	 => 'Denna värdeminskning är för närvarande kopplad till en eller flera modeller och kan inte raderas. Ta bort modellerna och försök sedan radera igen. ',
 
 
     'create' => array(
-        'error'   => 'Avskrivningsklassen skapades inte, försök igen. :(',
-        'success' => 'Avskrivningsklassen skapades framgångsrikt. :)'
+        'error'   => 'Värdeminskningsklassen skapades inte, vänligen försök igen.',
+        'success' => 'Värdeminskningsklassen skapades.'
     ),
 
     'update' => array(
-        'error'   => 'Avskrivningsklassen uppdaterades inte, var god försök igen',
-        'success' => 'Avskrivningsklassen uppdaterades framgångsrikt.'
+        'error'   => 'Värdeminskningsklassen uppdaterades inte, vänligen försök igen',
+        'success' => 'Värdeminskningsklassen uppdaterades.'
     ),
 
     'delete' => array(
-        'confirm'   => 'Är du säker på att du vill ta bort denna avskrivningsklass?',
-        'error'   => 'Det gick inte att ta bort avskrivningsklassen. Var god försök igen.',
-        'success' => 'Avskrivningsklassen har tagits bort.'
+        'confirm'   => 'Är du säker på att du vill ta bort denna värdeminskningsklass?',
+        'error'   => 'Det gick inte att ta bort värdeminskningsklassen. Vänligen försök igen.',
+        'success' => 'Värdeminskningsklassen har tagits bort.'
     )
 
 );
diff --git a/resources/lang/sv-SE/admin/groups/message.php b/resources/lang/sv-SE/admin/groups/message.php
index 1541448bf4..86cdaf3c52 100644
--- a/resources/lang/sv-SE/admin/groups/message.php
+++ b/resources/lang/sv-SE/admin/groups/message.php
@@ -4,19 +4,19 @@ return array(
 
     'group_exists'        => 'Gruppen existerar redan!',
     'group_not_found'     => 'Grupp-ID :id finns inte.',
-    'group_name_required' => 'Namnfältet är obligatoriskt',
+    'group_name_required' => 'Namn är obligatoriskt',
 
     'success' => array(
-        'create' => 'Gruppen skapades.',
-        'update' => 'Gruppen uppdaterades.',
-        'delete' => 'Gruppen raderades.',
+        'create' => 'Grupp skapad.',
+        'update' => 'Grupp uppdaterad.',
+        'delete' => 'Grupp raderad.',
     ),
 
     'delete' => array(
         'confirm'   => 'Är du säker på att du vill radera denna grupp?',
-        'create' => 'Det uppstod ett problem med att skapa gruppen. Var god försök igen.',
-        'update' => 'Det uppstod ett problem med att uppdatera gruppen. Var god försök igen.',
-        'delete' => 'Det uppstod ett problem med att ta bort gruppen. Var god försök igen.',
+        'create' => 'Det gick inte att skapa gruppen. Vänligen försök igen.',
+        'update' => 'Det gick inte att uppdatera gruppen. Vänligen försök igen.',
+        'delete' => 'Det gick inte att ta bort gruppen. Vänligen försök igen.',
     ),
 
 );
diff --git a/resources/lang/sv-SE/admin/hardware/form.php b/resources/lang/sv-SE/admin/hardware/form.php
index 7342e23c49..6158bb9523 100644
--- a/resources/lang/sv-SE/admin/hardware/form.php
+++ b/resources/lang/sv-SE/admin/hardware/form.php
@@ -1,62 +1,65 @@
 <?php
 
 return [
-    'bulk_delete'		=> 'Bekräfta storlekar för borttagning av bulk',
+    'bulk_delete'		=> 'Bekräfta massradering av tillgångar',
     'bulk_restore'      => 'Bekräfta massåterställning av tillgångar', 
-  'bulk_delete_help'	=> 'Granska tillgångarna för delad borttagning nedan. En gång raderas kan dessa tillgångar återställas, men de kommer inte längre att vara associerade med några användare de tilldelas för närvarande.',
-  'bulk_restore_help'	=> 'Granska tillgångar för massåterställning nedan. När återställd, kommer dessa tillgångar inte att associeras med några användare som de tidigare tilldelats.',
-  'bulk_delete_warn'	=> 'Du håller på att ta bort: asset_count-tillgångar.',
-  'bulk_restore_warn'	=> 'Du håller på att återställa :asset_count tillgångar.',
-    'bulk_update'		=> 'Bulk Update Assets',
+  'bulk_delete_help'	=> 'Granska tillgångarna för massradering nedan. Efter radering kan dessa tillgångar återställas, men de kommer inte längre att vara associerade med de användare de för närvarande är tilldelade.',
+  'bulk_restore_help'	=> 'Granska tillgångar för massåterställning nedan. Vid återställning kommer dessa tillgångar inte att associeras med några användare som de tidigare tilldelats.',
+  'bulk_delete_warn'	=> 'Du är på väg att ta bort: asset_count tillgångar.',
+  'bulk_restore_warn'	=> 'Du är på väg att återställa :asset_count tillgångar.',
+    'bulk_update'		=> 'Massuppdatera tillgångar',
     'bulk_update_help'	=> 'I det här formuläret kan du uppdatera flera tillgångar på en gång. Fyll bara i de fält du behöver ändra. Alla fält som lämnas tomma kommer att förbli oförändrade.',
-    'bulk_update_warn'	=> 'Du håller på att redigera egenskaperna för en enda tillgång.|Du håller på att redigera egenskaperna för :asset_count tillgångar.',
+    'bulk_update_warn'	=> 'Du håller på att redigera egenskaperna för en tillgång.|Du håller på att redigera egenskaperna för :asset_count tillgångar.',
     'bulk_update_with_custom_field' => 'Notera att tillgångarna är :asset_model_count olika typer av modeller.',
     'bulk_update_model_prefix' => 'På modeller', 
-    'bulk_update_custom_field_unique' => 'Detta är ett unikt fält och kan inte bulk redigeras.',
+    'bulk_update_custom_field_unique' => 'Detta är ett unikt fält och kan inte massredigeras.',
     'checkedout_to'		=> 'Utcheckad till',
-    'checkout_date'		=> 'Utcheckningsdatum',
-    'checkin_date'		=> 'Incheckningsdatum',
+    'checkout_date'		=> 'Utcheck.dat.',
+    'checkin_date'		=> 'Incheck.dat.',
     'checkout_to'		=> 'Checka ut till',
     'cost'				=> 'Inköpskostnad',
-    'create'			=> 'Skapa Tillgång',
+    'create'			=> 'Skapa tillgång',
     'date'				=> 'Köpdatum',
-    'depreciation'	    => 'Avskrivning',
-    'depreciates_on'	=> 'Depreciates On',
-    'default_location'	=> 'Standard plats',
-    'default_location_phone' => 'Telefonnummer för standardplats',
-    'eol_date'			=> 'EOL Datum',
-    'eol_rate'			=> 'EOL-hastighet',
-    'expected_checkin'  => 'Förväntad incheckningsdatum',
+    'depreciation'	    => 'Värdeminskning',
+    'depreciates_on'	=> 'Värdeminskning av',
+    'default_location'	=> 'Standardplats',
+    'default_location_phone' => 'Tel.nr för standardplats',
+    'eol_date'			=> 'EOL-datum',
+    'eol_rate'			=> 'EOL-period',
+    'expected_checkin'  => 'Förväntat incheck.dat.',
     'expires'			=> 'Förfaller',
     'fully_depreciated'	=> 'Helt avskrivna',
-    'help_checkout'		=> 'Om du vill tilldela denna tillgång omedelbart, välj "Redo att distribuera" från statuslistan ovan. ',
+    'help_checkout'		=> 'Om du vill tilldela denna tillgång omedelbart, välj "Redo för leverans" från statuslistan ovan. ',
     'mac_address'		=> 'MAC-adress',
     'manufacturer'		=> 'Tillverkare',
     'model'				=> 'Modell',
     'months'			=> 'månader',
-    'name'				=> 'Asset Name',
+    'name'				=> 'Företagsnamn',
     'notes'				=> 'Anteckningar',
-    'order'				=> 'Order Nummer',
+    'order'				=> 'Ordernummer',
     'qr'				=> 'QR-kod',
     'requestable'		=> 'Användare kan begära denna tillgång',
-    'redirect_to_all'   => 'Return to all :type',
-    'redirect_to_type'   => 'Go to :type',
-    'redirect_to_checked_out_to'   => 'Go to Checked Out to',
-    'select_statustype'	=> 'Välj Statustyp',
+    'redirect_to_all'   => 'Tillbaka till alla :type',
+    'redirect_to_type'   => 'Navigera till :type',
+    'redirect_to_checked_out_to'   => 'Navigera till "utcheckade till"',
+    'select_statustype'	=> 'Välj statustyp',
     'serial'			=> 'Serienummer',
     'status'			=> 'Status',
-    'tag'				=> 'Asset Tag',
-    'update'			=> 'Asset Update',
+    'tag'				=> 'Tillgångstagg',
+    'update'			=> 'Tillgångsuppdatering',
     'warranty'			=> 'Garanti',
         'warranty_expires'		=> 'Garantin löper ut',
     'years'				=> 'år',
     'asset_location' => 'Uppdatera tillgångsplats',
-    'asset_location_update_default_current' => 'Uppdatera standardplats och aktuell plats',
+    'asset_location_update_default_current' => 'Uppdatera standardplats OCH nuvarande plats',
     'asset_location_update_default' => 'Uppdatera endast standardplats',
-    'asset_location_update_actual' => 'Uppdatera endast faktisk plats',
-    'asset_not_deployable' => 'Denna tillgångs status kan inte distribueras. Denna tillgång kan inte checkas ut.',
-    'asset_deployable' => 'Denna status är distribuerbar. Denna tillgång kan checkas ut.',
-    'processing_spinner' => 'Bearbetar... (Detta kan ta lite tid på stora filer)',
+    'asset_location_update_actual' => 'Uppdatera endast nuvarande plats',
+    'asset_not_deployable' => 'Denna tillgångsstatus kan inte levereras. Denna tillgång kan inte checkas ut.',
+    'asset_not_deployable_checkin' => 'Denna tillgångsstatus kan inte levereras. Användning av denna statusetikett kommer att checka in tillgången.',
+    'asset_deployable' => 'This asset can be checked out.',
+    'processing_spinner' => 'Bearbetar... (Detta kan ta tid vid stora filer)',
+    'processing' => 'Bearbetar... ',
     'optional_infos'  => 'Valfri information',
-    'order_details'   => 'Beställningsrelaterad information'
+    'order_details'   => 'Beställningsrelaterad information',
+    'calc_eol'    => 'Vid nollställning av EOL-datum, använd den automatiserade EOL-uträkningen baserat på inköpingsdatum och EOL-datum.',
 ];
diff --git a/resources/lang/sv-SE/admin/hardware/general.php b/resources/lang/sv-SE/admin/hardware/general.php
index 1d25a2a7fc..52b788d3db 100644
--- a/resources/lang/sv-SE/admin/hardware/general.php
+++ b/resources/lang/sv-SE/admin/hardware/general.php
@@ -2,42 +2,41 @@
 
 return [
     'about_assets_title'           => 'Om tillgångar',
-    'about_assets_text'            => 'Tillgångar är poster som spåras med serienummer eller tillgångstagg. De tenderar att vara mer värdefulla saker där identifiering av en viss sak är viktig.',
+    'about_assets_text'            => 'Tillgångar är objekt som spåras med serienummer eller tillgångstagg. De tenderar att vara mer värdefulla objekt där identifiering av ett visst objekt är viktigt.',
     'archived'  				=> 'Arkiverade',
     'asset'  					=> 'Tillgång',
-    'bulk_checkout'             => 'Checkout tillgångar',
-    'bulk_checkin'              => 'Återta tillgångar',
-    'checkin'  					=> 'Checkin Asset',
-    'checkout'  				=> 'Checkout Asset',
-    'clone'  					=> 'Klon tillgång',
-    'deployable'  				=> 'Deployable',
+    'bulk_checkout'             => 'Massutcheckning',
+    'bulk_checkin'              => 'Bulk Checkin',
+    'checkin'  					=> 'Checka in tillgång',
+    'checkout'  				=> 'Checka ut tillgång',
+    'clone'  					=> 'Kopiera tillgång',
+    'deployable'  				=> 'Tillgänglig',
     'deleted'  					=> 'Denna tillgång har tagits bort.',
     'delete_confirm'            => 'Är du säker du vill radera denna tillgång?',
     'edit'  					=> 'Redigera tillgång',
     'model_deleted'  			=> 'Denna tillgångsmodell har tagits bort. Du måste återställa modellen innan du kan återställa tillgången.',
-    'model_invalid'             => 'This model for this asset is invalid.',
-    'model_invalid_fix'         => 'The asset must be updated use a valid asset model before attempting to check it in or out, or to audit it.',
-    'requestable'               => 'Tillgängliga',
+    'model_invalid'             => 'Denna modell för denna tillgång är ogiltig.',
+    'model_invalid_fix'         => 'Tillgången måste uppdateras med en giltig tillgångsmodell innan du försöker checka in eller ut den, eller för att inventera den.',
+    'requestable'               => 'Begärbara',
     'requested'				    => 'Begärda',
     'not_requestable'           => 'Inte begärbar',
     'requestable_status_warning' => 'Ändra inte begärbar status',
     'restore'  					=> 'Återställ tillgången',
     'pending'  					=> 'Väntande',
-    'undeployable'  			=> 'Undeployable',
-    'undeployable_tooltip'  	=> 'Denna tillgång har en statusetikett som inte går att distribuera och som inte kan checkas ut just nu.',
+    'undeployable'  			=> 'Otillgänglig',
+    'undeployable_tooltip'  	=> 'Denna tillgång har en statusetikett som är otillgänglig och som inte kan checkas ut just nu.',
     'view'  					=> 'Visa tillgång',
-    'csv_error' => 'Du har ett fel i din CSV-fil:',
-    'import_text' => '<p>Ladda upp en CSV som innehåller tillgångshistorik. Tillgångarna och användarna MÅSTE redan finnas i systemet, annars kommer de att hoppas över. Matchande tillgångar för historikimport sker mot tillgångstaggen. Vi kommer att försöka hitta en matchande användare baserat på användarens namn du anger, och kriterierna du väljer nedan. Om du inte väljer några kriterier nedan, det kommer helt enkelt att försöka matcha på användarnamnet format du konfigurerade i <code>Admin &gt; Allmänna inställningar</code>.</p><p>Fält som ingår i CSV måste matcha rubrikerna: <strong>Asset Tag, Namn, Checkout Date, Checkin Date</strong>. Eventuella ytterligare fält kommer att ignoreras. </p><p>Checkin Datum: tomt eller framtida checkin datum kommer att checka ut objekt till associerad användare. Exklusive kolumnen Checkin Date kommer att skapa ett checkin datum med dagens datum.</p>
-    ',
+    'csv_error' => 'Fel i CSV-fil:',
+    'import_text' => '<p>Upload a CSV that contains asset history. The assets and users MUST already exist in the system, or they will be skipped. Matching assets for history import happens against the asset tag. We will try to find a matching user based on the user\'s name you provide, and the criteria you select below. If you do not select any criteria below, it will simply try to match on the username format you configured in the <code>Admin &gt; General Settings</code>.</p><p>Fields included in the CSV must match the headers: <strong>Asset Tag, Name, Checkout Date, Checkin Date</strong>. Any additional fields will be ignored. </p><p>Checkin Date: blank or future checkin dates will checkout items to associated user.  Excluding the Checkin Date column will create a checkin date with todays date.</p>    ',
     'csv_import_match_f-l' => 'Försök att matcha användare med <strong>fornamn.lastname</strong> (<code>jane.smith</code>) format',
     'csv_import_match_initial_last' => 'Försök att matcha användare med <strong>förnamn</strong> (<code>jsmith</code>) format',
     'csv_import_match_first' => 'Försök att matcha användare med <strong>förnamn</strong> (<code>jane</code>) format',
     'csv_import_match_email' => 'Försök att matcha användare med <strong>e-post</strong> som användarnamn',
     'csv_import_match_username' => 'Försök att matcha användare med <strong>användarnamn</strong>',
     'error_messages' => 'Felmeddelanden:',
-    'success_messages' => 'Lyckade meddelande:',
+    'success_messages' => 'Lyckade resultat:',
     'alert_details' => 'Se nedan för detaljer.',
     'custom_export' => 'Anpassad export',
-    'mfg_warranty_lookup' => ':manufacturer Garantistatus Uppsök',
-    'user_department' => 'Användares avdelning',
+    'mfg_warranty_lookup' => ':manufacturer Garantistatussökning',
+    'user_department' => 'Användaravdelning',
 ];
diff --git a/resources/lang/sv-SE/admin/hardware/message.php b/resources/lang/sv-SE/admin/hardware/message.php
index cee5b0304b..9243047fd9 100644
--- a/resources/lang/sv-SE/admin/hardware/message.php
+++ b/resources/lang/sv-SE/admin/hardware/message.php
@@ -2,93 +2,108 @@
 
 return [
 
-    'undeployable' 		=> '<strong>Varning: </strong> Den här tillgången har markerats som omöjlig för närvarande. Om denna status har ändrats uppdaterar du tillgångsstatusen.',
-    'does_not_exist' 	=> 'Tillgång existerar inte.',
-    'does_not_exist_var'=> 'Asset with tag :asset_tag not found.',
-    'no_tag' 	        => 'No asset tag provided.',
-    'does_not_exist_or_not_requestable' => 'Den tillgången finns inte eller är inte önskvärd.',
-    'assoc_users'	 	=> 'Denna tillgång kontrolleras för närvarande till en användare och kan inte raderas. Kontrollera tillgången först och försök sedan radera igen.',
-    'warning_audit_date_mismatch' 	=> 'This asset\'s next audit date (:next_audit_date) is before the last audit date (:last_audit_date). Please update the next audit date.',
+    'undeployable' 		 => '<strong>Varning: </strong> Den här tillgången har för närvarande markerats som otillgänglig. Om denna status har ändrats; vänligen uppdatera tillgångsstatusen.',
+    'does_not_exist' 	 => 'Tillgång existerar inte.',
+    'does_not_exist_var' => 'Tillgång med taggen :asset_tag hittades inte.',
+    'no_tag' 	         => 'Ingen tillgångstagg angiven.',
+    'does_not_exist_or_not_requestable' => 'Den tillgången finns inte eller är inte tillgänglig.',
+    'assoc_users'	 	 => 'Denna tillgång har checkats ut till en användare och kan inte raderas. Kontrollera tillgången först och försök sedan radera igen. ',
+    'warning_audit_date_mismatch' 	=> 'Nästa inventeringsdatum för denna tillgång (:next_audit_date) är före det senaste inventeringsdatumet (:last_audit_date). Vänligen uppdatera nästa inventeringsdatum.',
+    'labels_generated'   => 'Etiketter har genererats.',
+    'error_generating_labels' => 'Ett fel uppstod vid generering av etiketter.',
+    'no_assets_selected' => 'Inga tillgångar valda.',
 
     'create' => [
-        'error'   		=> 'Tillgången skapades inte, försök igen. :(',
-        'success' 		=> 'Asset skapades framgångsrikt. :)',
-        'success_linked' => 'Tillgången med taggen :tag har skapats. <strong><a href=":link" style="color: white;">Klicka här för att se</a></strong>.',
+        'error'   		=> 'Tillgången skapades inte :( Försök igen.',
+        'success' 		=> 'Tillgången skapades.',
+        'success_linked' => 'Tillgången med taggen :tag har skapats. <strong><a href=":link" style="color: white;">Klicka här för att visa</a></strong>.',
+        'multi_success_linked' => 'Tillgång med taggen :links skapades.|:count tillgångar skapades. :links.',
+        'partial_failure' => 'En tillgång kunde inte skapas. Anledning: :failures|:count tillgångar kunde inte skapas. Anledning: :failures',
     ],
 
     'update' => [
-        'error'   			=> 'Tillgången var inte uppdaterad, försök igen',
-        'success' 			=> 'Asset uppdaterad framgångsrikt.',
-        'encrypted_warning' => 'Tillgången uppdaterades framgångsrikt, men krypterade anpassade fält berodde inte på behörigheter',
-        'nothing_updated'	=>  'Inga fält valdes, så ingenting uppdaterades.',
-        'no_assets_selected'  =>  'Inga tillgångar valdes, så ingenting uppdaterades.',
+        'error'   			=> 'Tillgången kunde inte uppdateras, försök igen',
+        'success' 			=> 'Tillgång uppdaterad.',
+        'encrypted_warning' => 'Tillgången uppdaterades, men krypterade egenanpassade fält kunde inte uppdateras p.g.a. behörigheter',
+        'nothing_updated'	=>  'Inga fält valdes. Ingenting uppdaterades.',
+        'no_assets_selected'  =>  'Inga tillgångar valdes. Ingenting uppdaterades.',
         'assets_do_not_exist_or_are_invalid' => 'Valda tillgångar kan inte uppdateras.',
     ],
 
     'restore' => [
         'error'   		=> 'Tillgången återställdes inte, försök igen',
-        'success' 		=> 'Tillgången återställs framgångsrikt.',
-        'bulk_success' 		=> 'Återställning av tillgång lyckades.',
-        'nothing_updated'   => 'Inga tillgångar valdes, så ingenting återställdes.', 
+        'success' 		=> 'Tillgång återställd.',
+        'bulk_success' 		=> 'Återställning av tillgången lyckades.',
+        'nothing_updated'   => 'Inga tillgångar valda. Ingenting återställdes.', 
     ],
 
     'audit' => [
-        'error'   		=> 'Asset audit unsuccessful: :error ',
+        'error'   		=> 'Tillgångsinventeringen misslyckades: :error ',
         'success' 		=> 'Inventeringen av tillgången har loggats.',
     ],
 
 
     'deletefile' => [
-        'error'   => 'Filen har inte tagits bort. Var god försök igen.',
+        'error'   => 'Filen kunde inte tas bort. Var god försök igen.',
         'success' => 'Filen har tagits bort.',
     ],
 
     'upload' => [
-        'error'   => 'Fil (er) inte uppladdade. Var god försök igen.',
-        'success' => 'Filer som har laddats upp.',
-        'nofiles' => 'Du valde inte några filer för uppladdning, eller filen du försöker ladda upp är för stor',
-        'invalidfiles' => 'En eller flera av dina filer är för stora eller är en filtyp som inte är tillåten. Tillåtna filtyper är png, gif, jpg, doc, docx, pdf och txt.',
+        'error'   => 'Fil(er) kunde inte laddas upp. Var god försök igen.',
+        'success' => 'Fil(er) har laddats upp.',
+        'nofiles' => 'Du valde inte några filer för uppladdning, eller så är filen du försöker ladda upp för stor',
+        'invalidfiles' => 'En eller fler av dina filer är för stora eller är en filtyp som inte är tillåten. Tillåtna filtyper är png, gif, jpg, doc, docx, pdf och txt.',
     ],
 
     'import' => [
+        'import_button'         => 'Bearbeta import',
         'error'                 => 'Vissa objekt importerades inte korrekt.',
         'errorDetail'           => 'Följande objekt importerades inte på grund av fel.',
         'success'               => 'Din fil har importerats',
         'file_delete_success'   => 'Din fil har tagits bort',
         'file_delete_error'      => 'Filen kunde inte raderas',
         'file_missing' => 'Den valda filen saknas',
+        'file_already_deleted' => 'Den valda filen har redan tagits bort',
         'header_row_has_malformed_characters' => 'Ett eller flera attribut i rubrikraden innehåller felaktigt formatterade UTF-8-tecken',
         'content_row_has_malformed_characters' => 'Ett eller flera attribut i den första raden av innehållet innehåller felaktigt formatterade UTF-8-tecken',
+        'transliterate_failure' => 'Transliteration from :encoding to UTF-8 failed due to invalid characters in input'
     ],
 
 
     'delete' => [
         'confirm'   	=> 'Är du säker på att du vill radera den här tillgången?',
         'error'   		=> 'Det gick inte att ta bort tillgången. Var god försök igen.',
-        'nothing_updated'   => 'Inga tillgångar valdes, så ingenting togs bort.',
-        'success' 		=> 'Tillgången raderades framgångsrikt.',
+        'assigned_to_error' => '{1}Asset Tag: :asset_tag is currently checked out. Check in this device before deletion.|[2,*]Asset Tags: :asset_tag are currently checked out. Check in these devices before deletion.',
+        'nothing_updated'   => 'Inga tillgångar valdes. Ingenting togs bort.',
+        'success' 		=> 'Tillgång raderad.',
     ],
 
     'checkout' => [
-        'error'   		=> 'Tillgången utcheckades inte, försök igen',
-        'success' 		=> 'Tillgången checkas ut framgångsrikt.',
+        'error'   		=> 'Tillgången kunde inte checkas ut, försök igen',
+        'success' 		=> 'Tillgången har checkats ut.',
         'user_does_not_exist' => 'Den användaren är ogiltig. Var god försök igen.',
-        'not_available' => 'Den tillgången är inte tillgänglig för kassan!',
+        'not_available' => 'Den valda tillgången är inte tillgänglig för utcheckning.',
         'no_assets_selected' => 'Du måste välja minst en tillgång från listan',
     ],
 
+    'multi-checkout' => [
+        'error'   => 'Tillgången har inte checkats ut, försök igen|Tillgångarna har inte checkats ut, försök igen',
+        'success' => 'Utcheckning av tillgången lyckades.|Utcheckning av tillgångarna lyckades.',
+    ],
+
     'checkin' => [
-        'error'   		=> 'Tillgången kontrollerades inte, försök igen',
-        'success' 		=> 'Asset kontrolleras framgångsrikt.',
-        'user_does_not_exist' => 'Den användaren är ogiltig. Var god försök igen.',
-        'already_checked_in'  => 'Den tillgången är redan incheckad.',
+        'error'   		=> 'Tillgången kunde inte checkas in, försök igen',
+        'success' 		=> 'Tillgången har checkats in.',
+        'user_does_not_exist' => 'Användaren är ogiltig. Var god försök igen.',
+        'already_checked_in'  => 'Tillgången är redan incheckad.',
 
     ],
 
     'requests' => [
-        'error'   		=> 'Tillgången begärdes inte, försök igen',
-        'success' 		=> 'Tillgången begärdes framgångsrikt.',
-        'canceled'      => 'Checkout förfrågan har avbrutits',
+        'error'   		=> 'Request was not successful, please try again.',
+        'success' 		=> 'Request successfully submitted.',
+        'canceled'      => 'Request successfully canceled.',
+        'cancel'        => 'Avbryt objektbegäran',
     ],
 
 ];
diff --git a/resources/lang/sv-SE/admin/hardware/table.php b/resources/lang/sv-SE/admin/hardware/table.php
index 307b96ee95..2baaa4ea70 100644
--- a/resources/lang/sv-SE/admin/hardware/table.php
+++ b/resources/lang/sv-SE/admin/hardware/table.php
@@ -2,30 +2,29 @@
 
 return [
 
-    'asset_tag'   	=> 'Asset Tag',
+    'asset_tag'   	=> 'Tillgångstagg',
     'asset_model'       => 'Modell',
     'assigned_to'   => 'Tilldelad till',
     'book_value'  	=> 'Nuvarande värde',
-    'change' 		=> 'In ut',
-    'checkout_date' => 'Checkout Date',
-    'checkoutto' 	=> 'Checkat ut',
+    'change' 		=> 'In/ut',
+    'checkout_date' => 'Utcheck.dat.',
+    'checkoutto' 	=> 'Utcheckad',
     'components_cost' => 'Total kostnad för komponenter',
     'current_value' => 'Nuvarande värde',
-    'diff' 			=> 'Diff',
-    'dl_csv' 		=> 'Hämta CSV',
+    'diff' 			=> 'Differens',
+    'dl_csv' 		=> 'Ladda ned CSV',
     'eol' 			=> 'EOL',
     'id'      		=> 'ID',
-    'last_checkin_date' => 'Incheckningsdatum',
+    'last_checkin_date' => 'Senaste incheck.dat.',
     'location' 		=> 'Plats',
-    'purchase_cost'	=> 'Kosta',
-    'purchase_date'	=> 'Köpt',
-    'serial'   		=> 'Serie',
+    'purchase_cost'	=> 'Pris',
+    'purchase_date'	=> 'Inköpt',
+    'serial'   		=> 'Serienummer',
     'status'   		=> 'Status',
     'title'      	=> 'Tillgång',
-    'image'		    => 'Enhetsbild',
+    'image'		    => 'Bild',
     'days_without_acceptance' => 'Dagar utan godkännande',
-    'monthly_depreciation' => 'Månatlig avskrivning',
-    'assigned_to'    => 'Tilldelad till',
+    'monthly_depreciation' => 'Månatlig värdeminskning',
     'requesting_user' => 'Begär användare',
     'requested_date' => 'Begärt datum',
     'changed'       => 'Ändrad',
diff --git a/resources/lang/sv-SE/admin/kits/general.php b/resources/lang/sv-SE/admin/kits/general.php
index 0c9e78b2aa..5f0b37dad4 100644
--- a/resources/lang/sv-SE/admin/kits/general.php
+++ b/resources/lang/sv-SE/admin/kits/general.php
@@ -2,49 +2,50 @@
 
 return [
     'about_kits_title'                  => 'Om fördefinierade produktpaket',
-    'about_kits_text'                   => 'Fördefinierade produktpaket låter dig snabbt checka ut en samling artiklar (tillgångar, licenser, etc) till en användare. Detta kan vara till hjälp när din registreringsprocess är konsekvent för många användare och alla användare får samma objekt.',
+    'about_kits_text'                   => 'Fördefinierade produktpaket låter dig snabbt checka ut en samling objekt (tillgångar, licenser, etc) till en användare. Detta kan vara till hjälp när din registreringsprocess är konsekvent för många användare och alla användare får samma objekt.',
     'checkout'                          => 'Checka ut produktpaket ',
-    'create_success'                    => 'Produktpaketet skapades.',
+    'create_success'                    => 'Produktpaket skapat.',
     'create'                            => 'Skapa fördefinierat produktpaket',
     'update'                            => 'Uppdatera fördefinierat produktpaket',
-    'delete_success'                    => 'Produktpaketet har tagits bort.',
-    'update_success'                    => 'Produktpaketet har uppdaterats.',
+    'delete_success'                    => 'Produktpaket raderat.',
+    'update_success'                    => 'Produktpaket uppdaterat.',
     'none_models'                       => 'Det finns inte tillräckligt med tillgängliga resurser av :model att checka ut. :qty krävs. ',
-    'none_licenses'                     => 'Det finns inte tillräckligt med tillgängliga licenser av : license att checka ut. :qty krävs. ',
-    'none_consumables'                  => 'Det finns inte tillräckligt antal tillgängliga av : consumable att checka ut. :qty krävs. ',
-    'none_accessory'                    => 'Det finns inte tillräckligt antal tillgängliga av : accessory att checka ut. :qty krävs. ',
+    'none_licenses'                     => 'Det finns inte tillräckligt med tillgängliga licenser av :license att checka ut. :qty krävs. ',
+    'none_consumables'                  => 'Det finns inte tillräckligt antal tillgängliga av :consumable att checka ut. :qty krävs. ',
+    'none_accessory'                    => 'Det finns inte tillräckligt antal tillgängliga av :accessory att checka ut. :qty krävs. ',
     'append_accessory'                  => 'Lägg till tillbehör',
-    'update_appended_accessory'         => 'Uppdatera tillagad tillbehör',
-    'append_consumable'                 => 'Lägg till förbrukningsmaterial',
-    'update_appended_consumable'        => 'Uppdatera tillagda förbrukningsvara',
+    'update_appended_accessory'         => 'Uppdatera tillagt tillbehör',
+    'append_consumable'                 => 'Lägg till förbrukningsvara',
+    'update_appended_consumable'        => 'Uppdatera tillagd förbrukningsvara',
     'append_license'                    => 'Lägg till licens',
-    'update_appended_license'           => 'Uppdatera tillagda licensen',
+    'update_appended_license'           => 'Uppdatera tillagd licens',
     'append_model'                      => 'Lägg till modell',
-    'update_appended_model'             => 'Uppdatera tillagda modell',
-    'license_error'                     => 'Licensen är redan kopplad till kit',
-    'license_added_success'             => 'Licensen har lagts till',
-    'license_updated'                   => 'Licensen har uppdaterats',
+    'update_appended_model'             => 'Uppdatera tillagd modell',
+    'license_error'                     => 'Licensen är redan kopplad till produktpaketet',
+    'license_added_success'             => 'Licens tillagd',
+    'license_updated'                   => 'Licens uppdaterad',
     'license_none'                      => 'Licensen finns inte',
-    'license_detached'                  => 'Licensen har tagits bort',
-    'consumable_added_success'          => 'Förbrukningsvaror har lagts till',
-    'consumable_updated'                => 'Förbrukningsvaror har uppdaterats',
-    'consumable_error'                  => 'Förbrukningsvaror som är redan i en kit',
-    'consumable_deleted'                => 'Radering lyckades',
-    'consumable_none'                   => 'Förbrukningsvaror finns inte',
-    'consumable_detached'               => 'Förbrukningsvaror har tagits bort',
-    'accessory_added_success'           => 'Tillbehöret har lagts till',
-    'accessory_updated'                 => 'Tillbehöret har uppdaterats',
+    'license_detached'                  => 'Licens raderad',
+    'consumable_added_success'          => 'Förbrukningsvaror tillagd',
+    'consumable_updated'                => 'Förbrukningsvara uppdaterad',
+    'consumable_error'                  => 'Förbrukningsvaran är redan tillagd i ett produktpaket',
+    'consumable_deleted'                => 'Borttagningen lyckades',
+    'consumable_none'                   => 'Förbrukningsvaran finns inte',
+    'consumable_detached'               => 'Förbrukningsvaran har kopplats bort',
+    'accessory_added_success'           => 'Tillbehör tillagt',
+    'accessory_updated'                 => 'Tillbehör uppdaterat',
     'accessory_detached'                => 'Tillbehöret har kopplats bort',
-    'accessory_error'                   => 'Tillbehören är redan i en kit',
-    'accessory_deleted'                 => 'Radering lyckades',
+    'accessory_error'                   => 'Tillbehöret är redan tillagt i ett produktpaket',
+    'accessory_deleted'                 => 'Borttagningen lyckades',
     'accessory_none'                    => 'Tillbehöret finns inte',
-    'checkout_success'                  => 'Utcheckning lyckades',
-    'checkout_error'                    => 'Utcheckningen blev fel',
-    'kit_none'                          => 'Kit finns inte',
-    'kit_created'                       => 'Kit har skapats',
-    'kit_updated'                       => 'Kit har uppdaterats',
-    'kit_not_found'                     => 'Kit hittades inte',
-    'kit_deleted'                       => 'Kit har tagits bort',
-    'kit_model_updated'                 => 'Modellen har uppdaterats',
-    'kit_model_detached'                => 'Modellen har tagits bort',
+    'checkout_success'                  => 'Utcheckningen lyckades',
+    'checkout_error'                    => 'Utcheckningsfel',
+    'kit_none'                          => 'Produktpaketet finns inte',
+    'kit_created'                       => 'Produktpaket skapat',
+    'kit_updated'                       => 'Produktpaket uppdaterat',
+    'kit_not_found'                     => 'Produktpaketet existerar inte',
+    'kit_deleted'                       => 'Produktpaketet raderat',
+    'kit_model_updated'                 => 'Modell uppdaterad',
+    'kit_model_detached'                => 'Modellen har kopplats bort',
+    'model_already_attached'            => 'Modellen är redan kopplad till ett produktpaket',
 ];
diff --git a/resources/lang/sv-SE/admin/labels/message.php b/resources/lang/sv-SE/admin/labels/message.php
index 0563efed34..66a1113849 100644
--- a/resources/lang/sv-SE/admin/labels/message.php
+++ b/resources/lang/sv-SE/admin/labels/message.php
@@ -2,10 +2,10 @@
 
 return [
 
-    'invalid_return_count' => 'Ogiltigt antal returnerade från :name. Förväntade :expected, fick :actual.',
-    'invalid_return_type'  => 'Ogiltig typ returneras från :name. Förväntad :expected, fick :actual.',
-    'invalid_return_value' => 'Ogiltigt värde returneras från :name. Förväntade :expected, fick :actual.',
+    'invalid_return_count' => 'Ogiltigt antal returnerades från :name. Förväntade :expected, mottog :actual.',
+    'invalid_return_type'  => 'Ogiltig typ returnerades från :name. Förväntade :expected, mottog :actual.',
+    'invalid_return_value' => 'Ogiltigt värde returnerades från :name. Förväntade :expected, mottog :actual.',
 
-    'does_not_exist' => 'Etiketten finns inte',
+    'does_not_exist' => 'Etiketten existerar inte',
     
 ];
diff --git a/resources/lang/sv-SE/admin/labels/table.php b/resources/lang/sv-SE/admin/labels/table.php
index 8f4a8d3a04..c90acbb511 100644
--- a/resources/lang/sv-SE/admin/labels/table.php
+++ b/resources/lang/sv-SE/admin/labels/table.php
@@ -1,16 +1,16 @@
 <?php
 
 return [
-    'example_company'    => 'Test Company Limited',
+    'example_company'    => 'Testbolaget AB',
     'example_defaultloc' => 'Byggnad 1',
-    'example_category'   => 'Testa kategori',
+    'example_category'   => 'Testkategori',
     'example_location'   => 'Byggnad 2',
-    'example_manufacturer'  => 'Test Manufacturing Inc.',
+    'example_manufacturer'  => 'Testtillverkaren AB',
     'example_model'      => 'Testa modell',
-    'example_supplier'   => 'Test Company Limited',
+    'example_supplier'   => 'Testbolaget AB',
     'labels_per_page'    => 'Etiketter',
     'support_fields'     => 'Fält',
-    'support_asset_tag'  => 'Tag',
+    'support_asset_tag'  => 'Tagg',
     'support_1d_barcode' => '1D',
     'support_2d_barcode' => '2D',
     'support_logo'       => 'Logotyp',
diff --git a/resources/lang/sv-SE/admin/licenses/form.php b/resources/lang/sv-SE/admin/licenses/form.php
index 08a6b09d20..e00d9f4a06 100644
--- a/resources/lang/sv-SE/admin/licenses/form.php
+++ b/resources/lang/sv-SE/admin/licenses/form.php
@@ -9,14 +9,14 @@ return array(
     'license_key'       => 'Produktnyckel',
     'maintained'        => 'Bibehållen',
     'name'              => 'Programnamn',
-    'no_depreciation'   => 'Depreciera inte',
-    'purchase_order'    => 'Beställningsnummer',
-    'reassignable'      => 'Reassignable',
-    'remaining_seats'   => 'Återstående platser',
+    'no_depreciation'   => 'Ingen värdeminskning',
+    'purchase_order'    => 'Ordernummer',
+    'reassignable'      => 'Allokerbar',
+    'remaining_seats'   => 'Återstående säten',
     'seats'             => 'Säten',
     'termination_date'  => 'Slutdatum',
-    'to_email'          => 'Licensierad till Email',
+    'to_email'          => 'Licensierad till E-post',
     'to_name'           => 'Licensierad till Namn',
     'update'            => 'Uppdateringslicens',
-    'checkout_help'     => 'Du måste kolla en licens ut till en maskinvaru tillgång eller en person. Du kan välja båda, men ägaren av tillgången måste matcha den person du kontrollerar tillgången ut till.'
+    'checkout_help'     => 'Du behöver checka ut en licens till en tillgång eller en användare. Du kan välja båda, men ägaren av tillgången måste matcha den användare du checkar ut tillgången till.'
 );
diff --git a/resources/lang/sv-SE/admin/licenses/general.php b/resources/lang/sv-SE/admin/licenses/general.php
index e1a318b0ab..99bb2c33c9 100644
--- a/resources/lang/sv-SE/admin/licenses/general.php
+++ b/resources/lang/sv-SE/admin/licenses/general.php
@@ -2,50 +2,51 @@
 
 return array(
     'about_licenses_title'      => 'Om licenser',
-    'about_licenses'            => 'Licenser används för att spåra programvara. De har ett visst antal platser som kan checkas ut till individer',
-    'checkin'  					=> 'Checkin License Seat',
-    'checkout_history'  		=> 'Checkout historia',
-    'checkout'  				=> 'Checkout License Seat',
+    'about_licenses'            => 'Licenser används för att spåra programvara. De har ett visst antal säten som kan checkas ut till användare',
+    'checkin'  					=> 'Checka in licenssäte',
+    'checkout_history'  		=> 'Utcheckningshistorik',
+    'checkout'  				=> 'Checka ut licenssäte',
     'edit'  					=> 'Redigera licens',
     'filetype_info'				=> 'Tillåtna filtyper är png, gif, jpg, jpeg, doc, docx, pdf, txt, zip och rar.',
-    'clone'  					=> 'Klonlicens',
-    'history_for'  				=> 'Historia för',
-    'in_out'  					=> 'In ut',
+    'clone'  					=> 'Kopiera licens',
+    'history_for'  				=> 'Historik för ',
+    'in_out'  					=> 'In/ut',
     'info'  					=> 'Licensinfo',
     'license_seats'  			=> 'Licenssäten',
-    'seat'  					=> 'Sittplats',
+    'seat'  					=> 'Säte',
+    'seat_count'  				=> 'Säte :count',
     'seats'  					=> 'Säten',
-    'software_licenses'  		=> 'Programvarulicenser',
+    'software_licenses'  		=> 'Mjukvarulicenser',
     'user'  					=> 'Användare',
     'view'  					=> 'Visa licens',
-    'delete_disabled'           => 'Licensen kan inte tas bort ännu eftersom vissa platser fortfarande är utcheckade.',
+    'delete_disabled'           => 'Licensen kan inte tas bort ännu eftersom vissa säten fortfarande är utcheckade.',
     'bulk'                      =>
         [
             'checkin_all'           => [
-                'button'            => 'Checka in alla platser',
-                'modal'             => 'Detta kommer att checka in en plats.|Denna åtgärd kommer att checka in alla :checkedout_seats_count platser för denna licens.',
-                'enabled_tooltip'   => 'Checka in ALLA platser för denna licens från både användare och tillgångar',
-                'disabled_tooltip'  => 'Detta är inaktiverat eftersom det för närvarande inte finns några platser utcheckade',
-                'disabled_tooltip_reassignable'  => 'Detta är inaktiverat eftersom licensen inte är omtilldelbar',
+                'button'            => 'Checka in alla säten',
+                'modal'             => 'Denna åtgärd checkar in ett säte. | Denna åtgärd checkar in alla :checkedout_seats_count sätenför denna licens.',
+                'enabled_tooltip'   => 'Checka in ALLA säten för denna licens från både användare och tillgångar',
+                'disabled_tooltip'  => 'Detta är inaktiverat eftersom det för närvarande inte finns några säten utcheckade',
+                'disabled_tooltip_reassignable'  => 'Detta är inaktiverat eftersom licensen inte är omallokerbar',
                 'success'           => 'Licensen har checkats in! | Alla licenser har checkats in!',
-                'log_msg'           => 'Incheckad via bulk licens checkout i licens GUI',
+                'log_msg'           => 'Incheckad via massincheckning av licenser i licensgränssnittet',
             ],
 
             'checkout_all'              => [
-                'button'                => 'Checka ut alla platser',
-                'modal'                 => 'Denna åtgärd kommer att checka ut en plats till den första tillgängliga användaren. | Den här åtgärden kommer att checka ut alla :available_seats_count platser till de första tillgängliga användarna. En användare anses vara tillgänglig för denna plats om de inte redan har denna licens checkas ut till dem, och auto-tilldela licensegenskapen är aktiverad på deras användarkonto.',
-                'enabled_tooltip'   => 'Checka ut alla platser (eller så många som finns tillgängliga) till ALLA användare',
-                'disabled_tooltip'  => 'Detta är inaktiverat eftersom det för närvarande inte finns några platser tillgängliga',
+                'button'                => 'Checka ut alla säten',
+                'modal'                 => 'Denna åtgärd kommer att checka ut ett säte till den första tillgängliga användaren. | Den här åtgärden kommer att checka ut alla :available_seats_count platser till de första tillgängliga användarna. En användare anses vara tillgänglig för detta säte om de inte redan har denna licens utcheckad till dem, och auto-tilldela licensegenskaper är aktiverad på deras användarkonto.',
+                'enabled_tooltip'   => 'Checka ut alla säten (eller så många som finns tillgängliga) till ALLA användare',
+                'disabled_tooltip'  => 'Detta är inaktiverat eftersom det för närvarande inte finns några säten tillgängliga',
                 'success'           => 'Licensen har checkats ut! | :count licenser har checkats ut!',
-                'error_no_seats'    => 'Det finns inga återstående platser kvar för denna licens.',
+                'error_no_seats'    => 'Det finns inga återstående säten kvar för denna licens.',
                 'warn_not_enough_seats'    => ':count användare tilldelades denna licens, men vi fick slut på tillgängliga licenser.',
                 'warn_no_avail_users'    => 'Inget att göra. Det finns inga användare som inte redan har denna licens tilldelad dem.',
-                'log_msg'           => 'Checkade ut via bulk licens checkout i licens GUI',
+                'log_msg'           => 'Utcheckad via massincheckning av licenser i licensgränssnittet',
 
 
             ],
     ],
 
-    'below_threshold' => 'Det finns bara :remaining_count platser kvar för denna licens med en minsta mängd :min_amt. Du kanske vill överväga att köpa fler platser.',
-    'below_threshold_short' => 'Detta objekt är under det minsta obligatoriska antalet.',
+    'below_threshold' => 'Det finns bara :remaining_count säten kvar för denna licens med en minsta mängd :min_amt. Du kanske vill överväga att köpa fler säten.',
+    'below_threshold_short' => 'Detta objekt underskrider den minimikvantitet som krävs.',
 );
diff --git a/resources/lang/sv-SE/admin/licenses/message.php b/resources/lang/sv-SE/admin/licenses/message.php
index 103bff3a2f..1f3e73e647 100644
--- a/resources/lang/sv-SE/admin/licenses/message.php
+++ b/resources/lang/sv-SE/admin/licenses/message.php
@@ -3,52 +3,55 @@
 return array(
 
     'does_not_exist' => 'Licensen finns inte eller så har du inte behörighet att se den.',
-    'user_does_not_exist' => 'Användaren finns inte eller så har du inte behörighet att se dem.',
-    'asset_does_not_exist' 	=> 'Den tillgång du försöker associera med denna licens existerar inte.',
-    'owner_doesnt_match_asset' => 'Den tillgång du försöker associera med denna licens ägs av någon annan än den person som valts i den tilldelade till rullgardinsmenyn.',
+    'user_does_not_exist' => 'Användaren finns inte eller så har du inte behörighet att se den.',
+    'asset_does_not_exist' 	=> 'Den tillgång du försöker sammankoppla med denna licens existerar inte.',
+    'owner_doesnt_match_asset' => 'Den tillgång du försöker sammankoppla med denna licens ägs av någon annan än den person som valts i den tilldelade till rullgardinsmenyn.',
     'assoc_users'	 => 'Licensen är nu utcheckad till en användare och kan inte raderas. Var god kontrollera licensen först och försök sedan radera igen.',
     'select_asset_or_person' => 'Du måste välja en tillgång eller en användare, men inte båda.',
     'not_found' => 'Licensen hittades inte',
-    'seats_available' => ':seat_count platser tillgängliga',
+    'seats_available' => ':seat_count säten tillgängliga',
 
 
     'create' => array(
-        'error'   => 'Licensen skapades inte, försök igen.',
-        'success' => 'Licensen skapades framgångsrikt.'
+        'error'   => 'Licensen kunde inte skapas. Vänligen försök igen.',
+        'success' => 'Licens skapad.'
     ),
 
     'deletefile' => array(
-        'error'   => 'Filen har inte tagits bort. Var god försök igen.',
+        'error'   => 'Filen har inte tagits bort. Vänligen försök igen.',
         'success' => 'Filen har tagits bort.',
     ),
 
     'upload' => array(
-        'error'   => 'Fil (er) inte uppladdade. Var god försök igen.',
-        'success' => 'Filer som har laddats upp.',
-        'nofiles' => 'Du valde inte några filer för uppladdning, eller filen du försöker ladda upp är för stor',
-        'invalidfiles' => 'En eller flera av dina filer är för stora eller är en filtyp som inte är tillåten. Tillåtna filtyper är png, gif, jpg, jpeg, doc, docx, pdf, txt, zip, rar, rtf, xml och lic.',
+        'error'   => 'Fil(er) kunde inte laddas upp. Vänligen försök igen.',
+        'success' => 'Fil(er) uppladdad(e).',
+        'nofiles' => 'Du valde inte några filer för uppladdning eller så är filen du försöker ladda upp för stor',
+        'invalidfiles' => 'En eller flera av dina filer är för stora eller är av en filtyp som inte är tillåten. Tillåtna filtyper är png, gif, jpg, jpeg, doc, docx, pdf, txt, zip, rar, rtf, xml och lic.',
     ),
 
     'update' => array(
-        'error'   => 'Licensen uppdaterades inte, var god försök igen',
-        'success' => 'Licensen uppdateras framgångsrikt.'
+        'error'   => 'Licensen kunde inte uppdateras. Vänligen försök igen.',
+        'success' => 'Licens uppdaterad.'
     ),
 
     'delete' => array(
         'confirm'   => 'Är du säker på att du vill radera denna licens?',
-        'error'   => 'Det gick inte att ta bort licensen. Var god försök igen.',
+        'error'   => 'Licensen kunde inte tas bort. Vänligen försök igen.',
         'success' => 'Licensen har tagits bort.'
     ),
 
     'checkout' => array(
-        'error'   => 'Det gick inte att kontrollera licensen. Var god försök igen.',
-        'success' => 'Licensen utcheckades framgångsrikt',
-        'not_enough_seats' => 'Inte tillräckligt med licensplatser tillgängliga för utcheckning',
+        'error'   => 'Det gick inte att checka ut licensen. Vänligen försök igen.',
+        'success' => 'Licens utcheckad.',
+        'not_enough_seats' => 'Inte tillräckligt med licenssäten tillgängliga för utcheckning',
+        'mismatch' => 'Licenssätet som anges matchar inte licensen',
+        'unavailable' => 'Detta säte är inte tillgängligt för utcheckning.',
     ),
 
     'checkin' => array(
-        'error'   => 'Det gick inte att kontrollera licensen. Var god försök igen.',
-        'success' => 'Licensen incheckades med framgång'
+        'error'   => 'Det gick inte att checka in licensen. Vänligen försök igen.',
+        'not_reassignable' => 'Licens ej omfördelningsbar',
+        'success' => 'Licens incheckad.'
     ),
 
 );
diff --git a/resources/lang/sv-SE/admin/licenses/table.php b/resources/lang/sv-SE/admin/licenses/table.php
index 35efe30be8..ee2d312e46 100644
--- a/resources/lang/sv-SE/admin/licenses/table.php
+++ b/resources/lang/sv-SE/admin/licenses/table.php
@@ -2,17 +2,17 @@
 
 return array(
 
-    'assigned_to'   	=> 'Tilldelats',
-    'checkout'   		=> 'In ut',
-    'deleted_at'        => 'Borttagen den',
+    'assigned_to'   	=> 'Tilldelad till',
+    'checkout'   		=> 'In/ut',
+    'deleted_at'        => 'Borttagen',
     'id'      			=> 'ID',
-    'license_email'   	=> 'Licens Email',
+    'license_email'   	=> 'Licens E-post',
     'license_name'   	=> 'Licensierad till',
-    'purchase_date'   	=> 'inköpsdatum',
-    'purchased'   		=> 'Köpt',
+    'purchase_date'   	=> 'Inköpsdatum',
+    'purchased'   		=> 'Inköpt',
     'seats'   			=> 'Säten',
     'hardware'   		=> 'Hårdvara',
-    'serial'   			=> 'Serie',
+    'serial'   			=> 'Serienummer',
     'title'      		=> 'Licens',
 
 );
diff --git a/resources/lang/sv-SE/admin/locations/message.php b/resources/lang/sv-SE/admin/locations/message.php
index 22e2354e29..1bc34c8713 100644
--- a/resources/lang/sv-SE/admin/locations/message.php
+++ b/resources/lang/sv-SE/admin/locations/message.php
@@ -3,11 +3,12 @@
 return array(
 
     'does_not_exist' => 'Platsen finns inte.',
-    'assoc_users'    => 'This location is not currently deletable because it is the location of record for at least one asset or user, has assets assigned to it, or is the parent location of another location. Please update your models to no longer reference this company and try again. ',
+    'assoc_users'    => 'Denna plats går inte att ta bort eftersom det är en plats tillhörande minst en tillgång eller användare, har kopplade tillgångar eller är standardplats för en annan plats. Vänligen uppdatera dina register för att ta bort referenser till denna plats och försök igen ',
     'assoc_assets'	 => 'Platsen är associerad med minst en tillgång och kan inte tas bort. Vänligen uppdatera dina tillgångar så dom inte refererar till denna plats och försök igen. ',
     'assoc_child_loc'	 => 'Denna plats är för närvarande överliggande för minst en annan plats och kan inte tas bort. Vänligen uppdatera dina platser så dom inte längre refererar till denna och försök igen.',
     'assigned_assets' => 'Tilldelade tillgångar',
     'current_location' => 'Nuvarande plats',
+    'open_map' => 'Öppna i :map_provider_icon Kartor',
 
 
     'create' => array(
@@ -20,6 +21,11 @@ return array(
         'success' => 'Platsen uppdaterades.'
     ),
 
+    'restore' => array(
+        'error'   => 'Platsen återställdes inte, försök igen',
+        'success' => 'Platsen har återställts.'
+    ),
+
     'delete' => array(
         'confirm'   	=> 'Är du säker du vill ta bort denna plats?',
         'error'   => 'Ett fel inträffade när denna plats skulle tas bort. Vänligen försök igen.',
diff --git a/resources/lang/sv-SE/admin/locations/table.php b/resources/lang/sv-SE/admin/locations/table.php
index 1f96644348..f3e3c1d67c 100644
--- a/resources/lang/sv-SE/admin/locations/table.php
+++ b/resources/lang/sv-SE/admin/locations/table.php
@@ -7,7 +7,7 @@ return [
     'assets_checkedout'         => 'Tilldelade tillgångar',
     'id'                        => 'ID',
     'city'                      => 'Stad',
-    'state'                     => 'stat',
+    'state'                     => 'Län',
     'country'                   => 'Land',
     'create'                    => 'Skapa plats',
     'update'                    => 'Uppdatera plats',
@@ -16,27 +16,28 @@ return [
     'name'                      => 'Platsnamn',
     'address'                   => 'Adress',
     'address2'                   => 'Adressrad 2',
-    'zip'                       => 'postnummer',
-    'locations'                 => 'platser',
+    'zip'                       => 'Postnummer',
+    'locations'                 => 'Platser',
     'parent'                    => 'Förälder',
     'currency'                  => 'Platsvaluta',
     'ldap_ou'                   => 'LDAP-sökning OU',
     'user_name'                 => 'Användarnamn',
     'department'                => 'Avdelning',
     'location'                  => 'Plats',
-    'asset_tag'                 => 'Stöldnummer',
+    'asset_tag'                 => 'Tillgångstagg',
     'asset_name'                => 'Namn',
     'asset_category'            => 'Kategori',
     'asset_manufacturer'        => 'Tillverkare',
     'asset_model'               => 'Modell',
     'asset_serial'              => 'Serienummer',
     'asset_location'            => 'Plats',
-    'asset_checked_out'         => 'Checkat ut',
-    'asset_expected_checkin'    => 'Förväntad incheckning',
+    'asset_checked_out'         => 'Utcheckad',
+    'asset_expected_checkin'    => 'Förväntas incheckad',
     'date'                      => 'Datum:',
     'phone'                     => 'Plats Telefon',
-    'signed_by_asset_auditor'   => 'Signerad av (Asset Auditor):',
-    'signed_by_finance_auditor' => 'Undertecknad av (Finansrevisor):',
+    'signed_by_asset_auditor'   => 'Signerad av (Tillgångsansvarig):',
+    'signed_by_finance_auditor' => 'Undertecknad av (Revisor):',
     'signed_by_location_manager' => 'Undertecknad av (Platschef):',
     'signed_by'                 => 'Undertecknad av:',
+    'clone'  					=> 'Clone Location',
 ];
diff --git a/resources/lang/sv-SE/admin/manufacturers/message.php b/resources/lang/sv-SE/admin/manufacturers/message.php
index 3fdca603b4..d0f816e8c7 100644
--- a/resources/lang/sv-SE/admin/manufacturers/message.php
+++ b/resources/lang/sv-SE/admin/manufacturers/message.php
@@ -2,27 +2,27 @@
 
 return array(
 
-    'support_url_help' => 'Variabler <code>{LOCALE}</code>, <code>{SERIAL}</code>, <code>{MODEL_NUMBER}</code>, och <code>{MODEL_NAME}</code> kan användas i din URL för att få dessa värden automatiskt fyllda när du visar tillgångar - till exempel https://checkcoverage. pple<unk>{LOCALE}/{SERIAL}.',
+    'support_url_help' => 'Variabler <code>{LOCALE}</code>, <code>{SERIAL}</code>, <code>{MODEL_NUMBER}</code>, och <code>{MODEL_NAME}</code> kan användas i din URL för att få dessa värden att automatiskt fyllas på när du visar tillgångar - till exempel https://checkcoverage.apple.com/{LOCALE}/{SERIAL}.',
     'does_not_exist' => 'Tillverkaren existerar inte.',
-    'assoc_users'	 => 'Tillverkaren är för tillfället associerad med en modell och kan inte tas bort. Vänligen uppdatera dina modeller till att inte vara associerade med denna tillverkare och försök igen. ',
+    'assoc_users'	 => 'Tillverkaren är för tillfället associerad med minst en modell och kan inte tas bort. Vänligen uppdatera dina modeller för att inte associeras med denna tillverkare och försök igen. ',
 
     'create' => array(
         'error'   => 'Tillverkaren kunde inte skapas. Vänligen försök igen.',
-        'success' => 'Tillverkaren skapades utan problem.'
+        'success' => 'Tillverkare skapad.'
     ),
 
     'update' => array(
         'error'   => 'Tillverkaren kunde inte uppdateras, vänligen försök igen',
-        'success' => 'Tillverkaren uppdaterades utan problem.'
+        'success' => 'Tillverkare uppdaterad.'
     ),
 
     'restore' => array(
         'error'   => 'Tillverkaren kunde inte återskapas. Vänligen försök igen',
-        'success' => 'Tillverkaren återskapades utan problem.'
+        'success' => 'Tillverkare återskapad.'
     ),
 
     'delete' => array(
-        'confirm'   => 'Är du säker på att du vill ta bort?',
+        'confirm'   => 'Är du säker på att du vill ta bort denna tillverkare?',
         'error'   => 'Det gick inte att ta bort tillverkaren. Vänligen försök igen.',
         'success' => 'Tillverkaren har tagits bort.'
     )
diff --git a/resources/lang/sv-SE/admin/manufacturers/table.php b/resources/lang/sv-SE/admin/manufacturers/table.php
index cae1bc0eef..6f0627db89 100644
--- a/resources/lang/sv-SE/admin/manufacturers/table.php
+++ b/resources/lang/sv-SE/admin/manufacturers/table.php
@@ -2,15 +2,15 @@
 
 return array(
     'about_manufacturers_title'    => 'Om tillverkare',
-    'about_manufacturers_text'  => 'Tillverkare är de företag som skapar dina tillgångar. Du kan lagra viktig supportkontaktinformation om dem här, som kommer att visas på dina tillgångssidor.',
+    'about_manufacturers_text'  => 'Tillverkare är de företag som tillhandahåller dina tillgångar. Du kan lagra viktig kontaktinformation om dem som kommer att visas på dina tillgångssidor.',
     'asset_manufacturers'	=> 'Tillverkare',
-    'create'				=> 'Skapa Tillverkare',
+    'create'				=> 'Skapa tillverkare',
     'id'   					=> 'ID',
-    'name'      			=> 'namn',
-    'support_email'   		=> 'Support Email',
-    'support_phone'   		=> 'Support Telefon',
-    'support_url'   		=> 'Stödadress',
+    'name'      			=> 'Namn',
+    'support_email'   		=> 'Support E-post',
+    'support_phone'   		=> 'Support Telefonnummer',
+    'support_url'   		=> 'Support URL',
     'warranty_lookup_url'   => 'Garanti Lookup URL',
-    'update'				=> 'Uppdatera Tillverkare',
+    'update'				=> 'Uppdatera tillverkare',
 
 );
diff --git a/resources/lang/sv-SE/admin/models/general.php b/resources/lang/sv-SE/admin/models/general.php
index 6d4bc840f9..592a0d113f 100644
--- a/resources/lang/sv-SE/admin/models/general.php
+++ b/resources/lang/sv-SE/admin/models/general.php
@@ -2,17 +2,17 @@
 
 return array(
     'about_models_title'     => 'Om modeller',
-    'about_models_text'           => 'Modeller är ett sätt att gruppera identiska tillgångar. "Galaxy S20", "iPhone 12", etc.',
-    'deleted'  					        => 'Denna modell har tagits bort.',
-    'bulk_delete'               => 'Bulk Radera modeller',
-    'bulk_delete_help'               => 'Använd kryssrutan här under för att bekräfta borttagning av valda modeller. Modeller som har tillgångar kopplade till sig kan inte raderas innan dessa är kopplade till en annan modell.',
+    'about_models_text'           => 'Modeller är ett sätt att gruppera identiska tillgångar. "Galaxy S24", "iPhone 15", etc.',
+    'deleted'  					=> 'Denna modell har tagits bort.',
+    'bulk_delete'               => 'Massradera modeller',
+    'bulk_delete_help'               => 'Använd kryssrutan nedan för att bekräfta borttagning av valda modeller. Modeller som har tillgångar kopplade till sig kan inte raderas innan dessa är kopplade till en annan modell.',
     'bulk_delete_warn'          => 'Du håller på att ta bort en tillgångsmodell.|Du håller på att ta bort :model_count tillgångsmodeller.',
-    'restore'                   => 'Återskapa Modell',
+    'restore'                   => 'Återskapa modell',
     'requestable'               => 'Användare kan begära denna modell',
-	'show_mac_address'			      => 'Visa fältet MAC-adress för tillgångar av denna modell',
-    'view_deleted'              => 'Visa Borttagna',
+	'show_mac_address'			      => 'Visa MAC-adress i fältet för tillgångar av denna modell',
+    'view_deleted'              => 'Visa borttagna',
     'view_models'               => 'Visa modeller',
-    'fieldset'                  => 'Fältsamling',
-    'no_custom_field'           => 'Inga anpassade fält',
+    'fieldset'                  => 'Fältuppsättning',
+    'no_custom_field'           => 'Inga egenanpassade fält',
     'add_default_values'        => 'Lägg till standardvärden',
 );
diff --git a/resources/lang/sv-SE/admin/models/message.php b/resources/lang/sv-SE/admin/models/message.php
index dfd40864db..1030cfed03 100644
--- a/resources/lang/sv-SE/admin/models/message.php
+++ b/resources/lang/sv-SE/admin/models/message.php
@@ -4,10 +4,10 @@ return array(
 
     'deleted' => 'Raderad tillgångsmodell',
     'does_not_exist' => 'Modellen finns inte.',
-    'no_association' => 'VARNING! Modellen för detta objekt är ogiltigt eller saknas!',
-    'no_association_fix' => 'Detta kommer att bryta saker på konstiga och hemska sätt. Redigera denna tillgång nu för att tilldela det en modell.',
+    'no_association' => 'VARNING! Tillgångsmodellen för detta objekt är ogiltig eller saknas!',
+    'no_association_fix' => 'Detta kommer att förstöra saker på märkliga sätt. Redigera denna tillgång nu för att tilldela det till en modell.',
     'assoc_users'	 => 'Denna modell är redan associerad med en eller flera tillgångar och kan inte tas bort. Ta bort tillgången och försök sedan igen. ',
-
+    'invalid_category_type' => 'Denna kategori måste vara en tillgångskategori.',
 
     'create' => array(
         'error'   => 'Modellen skapades inte, försök igen.',
@@ -17,24 +17,24 @@ return array(
 
     'update' => array(
         'error'   => 'Modellen uppdaterades inte, försök igen',
-        'success' => 'Modellen uppdaterad.',
+        'success' => 'Modellen uppdaterades.',
     ),
 
     'delete' => array(
         'confirm'   => 'Är du säker på att du vill ta bort denna modell?',
-        'error'   => 'Problem att ta bort modellen. Försök igen.',
+        'error'   => 'Kunde inte ta bort modellen. Försök igen.',
         'success' => 'Modellen borttagen.'
     ),
 
     'restore' => array(
-        'error'   		=> 'Modellen återskapades inte, försök igen',
+        'error'   		=> 'Modellen kunde inte återskapas, försök igen',
         'success' 		=> 'Modellen återskapades.'
     ),
 
     'bulkedit' => array(
         'error'   		=> 'Inga fält ändrades, så ingenting uppdaterades.',
         'success' 		=> 'Modellen har uppdaterats. |:model_count modeller har uppdaterats.',
-        'warn'          => 'Du håller på att uppdatera egenskaperna för följande modell:|Du håller på att redigera egenskaperna för följande :model_count modeller:',
+        'warn'          => 'Du är på väg att uppdatera egenskaperna för följande modell:|Du håller på att redigera egenskaperna för följande :model_count modeller:',
 
     ),
 
diff --git a/resources/lang/sv-SE/admin/models/table.php b/resources/lang/sv-SE/admin/models/table.php
index 85395d261a..5690fa30f2 100644
--- a/resources/lang/sv-SE/admin/models/table.php
+++ b/resources/lang/sv-SE/admin/models/table.php
@@ -3,15 +3,15 @@
 return array(
 
     'create'				=> 'Skapa Modell',
-    'created_at' 			=> 'Skapad den',
+    'created_at' 			=> 'Skapad',
     'eol'	 				=> 'EOL',
-    'modelnumber'   		=> 'modell nr.',
-    'name'      			=> 'Anläggningsmodell Namn',
+    'modelnumber'   		=> 'Modellnr.',
+    'name'      			=> 'Tillgångens modellnamn',
     'numassets' 			=> 'Tillgångar',
     'title'					=> 'Modeller',
-    'update'				=> 'Uppdatera modell',
+    'update'				=> 'Uppdatera tillgångsmodell',
     'view'					=> 'Visa tillgångsmodell',
-    'update'				=> 'Uppdatera modell',
-    'clone'				=> 'Kopiera Modell',
-    'edit'				=> 'Ändra Modell',
+    'update'				=> 'Uppdatera tillgångsmodell',
+    'clone'				=> 'Kopiera modell',
+    'edit'				=> 'Ändra modell',
 );
diff --git a/resources/lang/sv-SE/admin/reports/general.php b/resources/lang/sv-SE/admin/reports/general.php
index 6a63a5b01f..a7103a5b7d 100644
--- a/resources/lang/sv-SE/admin/reports/general.php
+++ b/resources/lang/sv-SE/admin/reports/general.php
@@ -4,14 +4,20 @@ return [
     'info'   => 'Välj de alternativ du vill ha för din tillgångsrapport.',
     'deleted_user' => 'Raderad användare',
     'send_reminder' => 'Skicka påminnelse',
+    'cannot_send_reminder' => 'User has been deleted or does not have an email address so cannot receive a reminder',
     'reminder_sent' => 'Påminnelse har skickats',
     'acceptance_deleted' => 'Begäran om godkännande borttagen',
-    'acceptance_request' => 'Godkänn begäran',
+    'acceptance_request' => 'Begäran om godkännande',
     'custom_export' => [
         'user_address' => 'Användarens adress',
         'user_city' => 'Användarens stad',
-        'user_state' => 'Användarens tillstånd',
+        'user_state' => 'Användarens län',
         'user_country' => 'Användarens land',
-        'user_zip' => 'Användar Zip'
-    ]
-];
\ No newline at end of file
+        'user_zip' => 'Användarens postnummer'
+    ],
+    'open_saved_template' => 'Öppna sparad mall',
+    'save_template' =>  'Spara mall',
+    'select_a_template' => 'Välj mall',
+    'template_name' => 'Mallnamn',
+    'update_template' => 'Uppdatera mall',
+];
diff --git a/resources/lang/sv-SE/admin/reports/message.php b/resources/lang/sv-SE/admin/reports/message.php
index 9260f0b343..3f105a58ab 100644
--- a/resources/lang/sv-SE/admin/reports/message.php
+++ b/resources/lang/sv-SE/admin/reports/message.php
@@ -1,5 +1,16 @@
 <?php
 
-return array(
-    'error'   => 'Du måste välja minst ett alternativ.'
-);
+return [
+    'about_templates' => 'Om sparade mallar',
+    'saving_templates_description' => 'Gör dina val, skriv sedan in namnet på din mall i rutan ovanför och tryck på "Spara mall"-knappen. Använd listrutan för att välja en tidigare sparad mall.',
+    'create'  => [
+        'success' => 'Mall sparad',
+    ],
+    'update' => [
+        'success' => 'Mall uppdaterad',
+    ],
+    'delete' => [
+        'success' => 'Mall borttagen',
+        'no_delete_permission' => 'Mallen existerar inte eller så har du inte tillgång till att ta bort den.',
+    ],
+];
diff --git a/resources/lang/sv-SE/admin/settings/general.php b/resources/lang/sv-SE/admin/settings/general.php
index ddd70aa9d7..08de0a975f 100644
--- a/resources/lang/sv-SE/admin/settings/general.php
+++ b/resources/lang/sv-SE/admin/settings/general.php
@@ -3,83 +3,86 @@
 return [
     'ad'				        => 'Active Directory',
     'ad_domain'				    => 'Active Directory-domän',
-    'ad_domain_help'			=> 'Detta är ibland samma som din e-post domän, men inte alltid.',
+    'ad_domain_help'			=> 'Detta är ibland samma som din e-postdomän, men inte alltid.',
     'ad_append_domain_label'    => 'Lägg till domännamn',
     'ad_append_domain'          => 'Lägg till domännamn i fältet användarnamn',
-    'ad_append_domain_help'     => 'Användaren behöver inte skriva "username@domain.local", det räcker att skriva "username".',
-    'admin_cc_email'            => 'CC Email',
-    'admin_cc_email_help'       => 'Om du vill skicka en kopia av checkin / checkout-e-postmeddelanden som skickas till användare till ett extra e-postkonto, skriv det här. Annars lämnar du fältet tomt.',
+    'ad_append_domain_help'     => 'Användaren behöver inte skriva "username@domain.local", det räcker med att skriva "username".',
+    'admin_cc_email'            => 'CC E-post',
+    'admin_cc_email_help'       => 'Send a copy of checkin/checkout emails to this address.',
     'admin_settings'            => 'Administratörsinställningar',
     'is_ad'				        => 'Detta är en Active Directory-server',
     'alerts'                	=> 'Varningar',
     'alert_title'               => 'Uppdatera aviseringsinställningar',
-    'alert_email'				=> 'Skicka larm till',
-    'alert_email_help'    => 'E-postadresser eller distributionslistor som du vill att varningar ska skickas till, kommaseparerade',
-    'alerts_enabled'			=> 'Larm aktivt',
+    'alert_email'				=> 'Skicka varningar till',
+    'alert_email_help'          => 'E-postadresser eller distributionslistor som du vill att varningar ska skickas till, kommaseparerade.',
+    'alerts_enabled'			=> 'Varningar via e-post aktiverade',
     'alert_interval'			=> 'Utgående varningströskel (i dagar)',
-    'alert_inv_threshold'		=> 'Varna om lågt lagersaldo',
+    'alert_inv_threshold'		=> 'Varning vid lågt lagersaldo',
     'allow_user_skin'           => 'Tillåt användartema',
-    'allow_user_skin_help_text' => 'Genom att markera denna ruta kan en användare åsidosätta gränssnittet med ett annat.',
+    'allow_user_skin_help_text' => 'Genom att markera denna ruta kan en användare ändra gränssnittet till ett annat.',
     'asset_ids'					=> 'Tillgångs-ID',
     'audit_interval'            => 'Inventeringsintervall',
-    'audit_interval_help'       => 'Om du behöver regelbundet fysiskt granska dina tillgångar, ange intervallet i månader som du använder. Om du uppdaterar detta värde kommer alla "nästa revisionsdatum" för tillgångar med ett kommande revisionsdatum att uppdateras.',
+    'audit_interval_help'       => 'Om du regelbundet fysiskt behöver granska dina tillgångar, ange intervallet i månader. Om du uppdaterar detta värde kommer alla "nästkommande revisionsdatum" för tillgångar med ett kommande revisionsdatum att uppdateras.',
     'audit_warning_days'        => 'Gränsvärde för varning om nästa inventering',
-    'audit_warning_days_help'   => 'Hur många dagar i förväg vill du bli varnad när det närmar sig revision av tillgångar?',
+    'audit_warning_days_help'   => 'Hur många dagar i förväg vill du bli varnad när det närmar sig inventering av tillgångar?',
     'auto_increment_assets'		=> 'Generera automatisk ökning av tillgångstaggar',
     'auto_increment_prefix'		=> 'Prefix (frivilligt)',
-    'auto_incrementing_help'    => 'Aktivera automatisk ökning av anläggningstillgångar först innan du ställer in detta',
+    'auto_incrementing_help'    => 'Aktivera automatisk ökning av tillgångstaggar innan du ställer in detta',
     'backups'					=> 'Säkerhetskopior',
-    'backups_help'              => 'Skapa, ladda ner och återställ säkerhetskopior ',
+    'backups_help'              => 'Skapa, ladda ned och återställ säkerhetskopior ',
     'backups_restoring'         => 'Återställ från säkerhetskopia',
+    'backups_clean' => 'Rensa den säkerhetskopierade databasen innan återställning',
+    'backups_clean_helptext' => "Detta kan vara användbart om du skiftar mellan databasversioner",
     'backups_upload'            => 'Ladda upp säkerhetskopia',
     'backups_path'              => 'Säkerhetskopior på servern lagras i <code>:path</code>',
-    'backups_restore_warning'   => 'Använd återställningsknappen <small><span class="btn btn-xs btn-warning"><i class="text-white fas fa-retweet" aria-hidden="true"></i></span></small> för att återställa från en tidigare säkerhetskopia. (Detta fungerar för närvarande inte med S3-fillagring eller Docker.)<br><br>Din <strong>hela :app_name databas och alla uppladdade filer kommer att helt ersättas</strong> av vad som finns i backupfilen.  ',
-    'backups_logged_out'         => 'Alla befintliga användare, inklusive du, kommer att loggas ut när din återställning är klar.',
+    'backups_restore_warning'   => 'Use the restore button <small><span class="btn btn-xs btn-warning"><i class="text-white fas fa-retweet" aria-hidden="true"></i></span></small> to restore from a previous backup. (This does not currently work with S3 file storage or Docker.)<br><br>Your <strong>entire :app_name database and any uploaded files will be completely replaced</strong> by what\'s in the backup file  ',
+    'backups_logged_out'         => 'Alla befintliga användare, inklusive du, kommer att loggas ut när din återställning är slutförd.',
     'backups_large'             => 'Mycket stora säkerhetskopior kan stoppa omställningsprocessen och behöver köras via kommandoraden. ',
     'barcode_settings'			=> 'Streckkodsinställningar',
     'confirm_purge'			    => 'Bekräfta tömning',
-    'confirm_purge_help'		=> 'Ange texten "DELETE" i rutan nedan för att rensa dina raderade poster. Denna åtgärd kan inte ångras och kommer PERMANENT ta bort alla mjuk-raderade objekt och användare. (Du bör göra en säkerhetskopia först, för att vara säker.)',
+    'confirm_purge_help'		=> 'Ange texten "DELETE" i rutan nedan för att rensa dina raderade poster. Denna åtgärd kan inte ångras och kommer PERMANENT att ta bort alla tidigare raderade objekt och användare. (Du bör ta en säkerhetskopia först, för att vara på säkra sidan!)',
     'custom_css'				=> 'Anpassad CSS',
+    'custom_css_placeholder'	=> 'Add your custom CSS',
     'custom_css_help'			=> 'Fyll i eventuella anpassade CSS-överskridningar du vill använda. Inkludera inte &lt;style&gt;&lt;/style&gt; taggar.',
-    'custom_forgot_pass_url'	=> 'Anpassad lösenordsåterställningsadress',
-    'custom_forgot_pass_url_help'	=> 'Detta ersätter den inbyggda glömda lösenord URLen på inloggningsskärmen, användbart för att styra människor till den interna eller hostade LDAP-lösenordsåterställningen. Det kommer att effektivt inaktivera den lokala "glömt lösenord" funktionen.',
-    'dashboard_message'			=> 'Dashboard-meddelande',
-    'dashboard_message_help'	=> 'Denna text kommer att visas på instrumentbrädan för alla med behörighet att visa instrumentbrädan.',
+    'custom_forgot_pass_url'	=> 'Anpassad URL för lösenordsåterställning',
+    'custom_forgot_pass_url_help'	=> 'Detta ersätter den inbyggda URL\'n för "Glömt lösenord" på inloggningsskärmen, vilket är användbart för att styra användare till den interna eller hostade LDAP-lösenordsåterställningen. Detta kommer att inaktivera den lokala "Glömt lösenord"-funktionen.',
+    'dashboard_message'			=> 'Instrumentpanelsmeddelande',
+    'dashboard_message_help'	=> 'Denna text kommer att visas på instrumentpanelen för alla med tillräcklig behörighet för att visa instrumentpanelen.',
     'default_currency'  		=> 'Standardvaluta',
-    'default_eula_text'			=> 'Standard EULA',
+    'default_eula_text'			=> 'Standard-EULA',
+    'default_eula_text_placeholder' => 'Add your default EULA text',
     'default_language'			=> 'Standardspråk',
     'default_eula_help_text'	=> 'Du kan också associera anpassade EULA till specifika tillgångskategorier.',
-    'acceptance_note'           => 'Add a note for your decision (Optional)',
-    'display_asset_name'        => 'Visa tillgångens namn',
-    'display_checkout_date'     => 'Visa utcheckningsdatum',
+    'acceptance_note'           => 'Lägg till en anteckning för ditt beslut (valfritt)',
+    'display_asset_name'        => 'Visa företagsnamn',
+    'display_checkout_date'     => 'Visa utcheck.dat.',
     'display_eol'               => 'Visa EOL i tabellvy',
-    'display_qr'                => 'Visa QR-koder',
+    'display_qr'                => 'Display 2D barcode',
     'display_alt_barcode'		=> 'Visa 1D streckkod',
-    'email_logo'                => 'E-Post logotyp',
     'barcode_type'				=> '2D streckkodstyp',
     'alt_barcode_type'			=> '1D streckkodstyp',
-    'email_logo_size'       => 'Kvadratiska logotyper i e-post ser bäst ut. ',
     'enabled'                   => 'Aktiverad',
     'eula_settings'				=> 'EULA-inställningar',
-    'eula_markdown'				=> 'Detta EULA tillåter <a href="https://help.github.com/articles/github-flavored-markdown/">Github smaksatt markdown</a>.',
+    'eula_markdown'				=> 'Detta EULA tillåter <a href="https://help.github.com/articles/github-flavored-markdown/">Github-genererad markdown</a>.',
+    'empty_row_count'           => 'Field Start Offset (Empty Rows)',
+    'empty_row_count_help'      => 'Fields will begin populating after this many empty rows are skipped at the top of the label.',
     'favicon'                   => 'Favicon',
     'favicon_format'            => 'Godkända filtyper är ico, png och gif. Andra bildformat fungerar inte i alla webbläsare.',
     'favicon_size'          => 'Favicon-bilder ska vara fyrkantiga, 16x16 pixlar.',
-    'footer_text'               => 'Ytterligare Footer Text ',
-    'footer_text_help'          => 'Denna text kommer visas i höger sidfot. Länkar ska anges enligt <a href="https://help.github.com/articles/github-flavored-markdown/">Github flavored markdown</a>. Radbrytningar, rubriker, bilder, etc kan ge oförutsägbara resultat.',
+    'footer_text'               => 'Ytterligare sidfotstext ',
+    'footer_text_help'          => 'Denna text kommer visas i höger sidfot. Länkar ska anges enligt <a href="https://help.github.com/articles/github-flavored-markdown/">Github-genererad markdown</a>. Radbrytningar, rubriker, bilder etc kan ge oförutsägbara resultat.',
+    'footer_text_placeholder'   => 'Optional footer text',
     'general_settings'			=> 'Allmänna inställningar',
-    'general_settings_keywords' => 'företagets support, signatur, acceptans, e-postformat, användarnamn format, bilder, per sida, miniatyr, eula, gravatar, tos, instrumentbräda, integritet',
     'general_settings_help'     => 'Standard EULA och mer',
     'generate_backup'			=> 'Skapa säkerhetskopia',
     'google_workspaces'         => 'Google Workspaces',
     'header_color'              => 'Sidhuvudets färg',
-    'info'                      => 'Med dessa inställningar kan du anpassa vissa delar av din installation.',
-    'label_logo'                => 'Etikett logotyp',
-    'label_logo_size'           => 'Fyrkantiga logotyper ser bäst ut - kommer att visas i det övre högra hörnet av varje tillgångsetikett. ',
-    'laravel'                   => 'Laravel Version',
+    'info'                      => 'Med dessa inställningar kan du anpassa vissa delar av din uppsättning.',
+    'label_logo_size'           => 'En fyrkantig logotyp syns tydligast. Den kommer att visas i det övre högra hörnet av varje tillgångsetikett. ',
+    'laravel'                   => 'Laravel-version',
     'ldap'                      => 'LDAP',
     'ldap_default_group'        => 'Standard behörighetsgrupp',
-    'ldap_default_group_info'   => 'Välj en grupp som ska tilldelas användaren, kom ihåg att en användare tar emot behörigheterna för den grupp de tilldelas.',
+    'ldap_default_group_info'   => 'Välj en grupp som ska tilldelas användaren. Kom ihåg att en användare tilldelas behörigheterna för den grupp de kopplas till.',
     'no_default_group'          => 'Ingen standardgrupp',
     'ldap_help'                 => 'LDAP/Active Directory',
     'ldap_client_tls_key'       => 'LDAP-klient TLS-nyckel',
@@ -94,7 +97,7 @@ return [
     'ldap_login_sync_help'      => 'Detta testar bara att LDAP kan synkroniseras korrekt. Om din LDAP-autentiseringsfråga inte är korrekt kan användarna fortfarande inte logga in. DU MÅSTE SPARA DINA UPPDATERADE LDAPINSTÄLLNINGAR FÖRST.',
     'ldap_manager'              => 'LDAP-hanterare',
     'ldap_server'               => 'LDAP-server',
-    'ldap_server_help'          => 'Detta bör börja med ldap: // (för okrypterad eller TLS) eller ldaps: // (för SSL)',
+    'ldap_server_help'          => 'Detta bör starta med ldap:// (för okrypterad) eller ldaps:// (för TLS eller SSL)',
     'ldap_server_cert'			=> 'Validering av LDAP SSL-certifikat',
     'ldap_server_cert_ignore'	=> 'Tillåt ogiltigt SSL-certifikat',
     'ldap_server_cert_help'		=> 'Markera den här kryssrutan om du använder en självtecknad SSL-cert och vill acceptera ett ogiltigt SSL-certifikat.',
@@ -108,73 +111,79 @@ return [
     'ldap_pword'                => 'LDAP-bindlösenord',
     'ldap_basedn'               => 'Base Bind DN',
     'ldap_filter'               => 'LDAP-filter',
-    'ldap_pw_sync'              => 'LDAP-lösenordssynkronisering',
-    'ldap_pw_sync_help'         => 'Avmarkera den här rutan om du inte vill behålla LDAP-lösenord synkroniserade med lokala lösenord. Inaktivera detta innebär att dina användare kanske inte kan logga in om din LDAP-server inte är tillgänglig för någon anledning.',
-    'ldap_username_field'       => 'Användarnamn fält',
+    'ldap_pw_sync'              => 'Cache LDAP Passwords',
+    'ldap_pw_sync_help'         => 'Uncheck this box if you do not wish to keep LDAP passwords cached as local hashed passwords. Disabling this means that your users may not be able to login if your LDAP server is unreachable for some reason.',
+    'ldap_username_field'       => 'Användarnamn',
     'ldap_lname_field'          => 'Efternamn',
     'ldap_fname_field'          => 'LDAP förnamn',
     'ldap_auth_filter_query'    => 'LDAP-autentiseringsfråga',
     'ldap_version'              => 'LDAP-version',
     'ldap_active_flag'          => 'LDAP Active Flag',
     'ldap_activated_flag_help'  => 'Detta värde används för att avgöra om en synkroniserad användare kan logga in på Snipe-IT. <strong>Det påverkar inte möjligheten att checka in eller checka ut objekt till dem</strong>, och bör vara <strong>attributnamnet</strong> inom ditt AD/LDAP, <strong>inte värdet</strong>. <br><br>Om detta fält är satt till ett fältnamn som inte finns i ditt AD/LDAP, eller värdet i AD/LDAP-fältet är satt till <code>0</code> eller <code>falskt</code>, <strong>kommer användarinloggning vara inaktiverad</strong>. Om värdet i AD/LDAP-fältet är satt till <code>1</code> eller <code>sant</code> eller <em>någon annan text</em> innebär att användaren kan logga in. När fältet är tomt i ditt AD respekterar vi <code>userAccountControl</code> attributet, vilket vanligtvis tillåter icke-avstängda användare att logga in.',
-    'ldap_emp_num'              => 'LDAP anställd nummer',
+    'ldap_invert_active_flag'   => 'LDAP Invert Active Flag',
+    'ldap_invert_active_flag_help'     => 'If enabled: when the value returned by LDAP Active Flag is <code>0</code> or <code>false</code> the user account will be active.',
+    'ldap_emp_num'              => 'LDAP anställningsnummer',
     'ldap_email'                => 'LDAP-e-post',
     'ldap_test'                 => 'Testa LDAP',
     'ldap_test_sync'            => 'Testa LDAP-synkronisering',
     'license'                   => 'Mjukvarulicens',
-    'load_remote'               => 'Använd Gravatar',
-    'load_remote_help_text'		=> 'Avmarkera den här rutan om din installation inte kan ladda skript från utsidan Internet. Detta kommer att förhindra Snipe-IT från att försöka ladda bilder från Gravatar.',
+    'load_remote'               => 'Ladda in avatarer',
+    'load_remote_help_text'		=> 'Avmarkera denna ruta om din installation inte kan ladda skript från externa källor. Detta förhindrar att Snipe-IT försöker ladda avatarer från Gravatar eller andra externa källor.',
     'login'                     => 'Inloggningsförsök',
     'login_attempt'             => 'Inloggningsförsök',
     'login_ip'                  => 'IP-adress',
     'login_success'             => 'Lyckades?',
     'login_user_agent'          => 'User Agent',
-    'login_help'                => 'Lista över försök att logga in',
-    'login_note'                => 'Inloggning Obs',
-    'login_note_help'           => 'Lägg till valfri text på din inloggningsskärm, till exempel för att hjälpa personer som har hittat en borttappad eller stulen enhet. Detta fält accepterar <a href="https://help.github.com/articles/github-flavored-markdown/">GitHub Flavored Markdown</a>',
-    'login_remote_user_text'    => 'Alternativ för fjärrinloggning',
-    'login_remote_user_enabled_text' => 'Aktivera inloggning med REMOTE_USER header',
-    'login_remote_user_enabled_help' => 'Detta gör det möjligt att autentisera via REMOTE_USER header i enlighet med "Common Gateway Interface (rfc3875)"',
+    'login_help'                => 'Lista över inloggningsförsök',
+    'login_note'                => 'Inloggningsnotering',
+    'login_note_placeholder'            => "If you do not have a login or have found a device belonging to this company, please call technical support at 888-555-1212. Thank you.",
+    'login_note_help'           => 'Lägg till valfri text på din inloggningsskärm, till exempel för att hjälpa användare som har hittat en borttappad eller stulen enhet. Detta fält accepterar <a href="https://help.github.com/articles/github-flavored-markdown/">GitHub-genererad Markdown</a>',
+    'login_remote_user_text'    => 'Alternativ för distansinloggning',
+    'login_remote_user_enabled_text' => 'Aktivera inloggning med distansanvändarhuvud',
+    'login_remote_user_enabled_help' => 'Detta gör det möjligt att autentisera via distansanvändarhuvud i enlighet med "Common Gateway Interface (rfc3875)"',
     'login_common_disabled_text' => 'Inaktivera andra autentiseringsmekanismer',
-    'login_common_disabled_help' => 'Det här alternativet inaktiverar andra autentiseringsmetoder. Aktivera bara detta om du är säker på att din REMOTE_USER inloggning fungerar',
+    'login_common_disabled_help' => 'Det här alternativet inaktiverar andra autentiseringsmetoder. Aktivera bara detta om du är säker på att din REMOTE_USER-inloggning fungerar',
     'login_remote_user_custom_logout_url_text' => 'Anpassad utloggnings-URL',
     'login_remote_user_custom_logout_url_help' => 'Om en URL tillhandahålls här kommer användarna att omdirigeras till den här webbadressen efter att användaren loggat ut från Snipe-IT. Det här är användbart för att stänga användarsessionerna i din autentiseringsleverantör korrekt.',
-    'login_remote_user_header_name_text' => 'Anpassad användarnamn-header',
-    'login_remote_user_header_name_help' => 'Använd angiven header istället för REMOTE_USER',
+    'login_remote_user_header_name_text' => 'Anpassad användarnamnshuvud',
+    'login_remote_user_header_name_help' => 'Använd angivet huvud istället för REMOTE_USER',
     'logo'                    	=> 'Logotyp',
     'logo_print_assets'         => 'Använd vid utskrift',
-    'logo_print_assets_help'    => 'Använda branding på utskrivbara tillgångs-listor ',
+    'logo_print_assets_help'    => 'Använd ditt varumärke på utskriftsaktiva tillgångslistor ',
     'full_multiple_companies_support_help_text' => 'Begränsa användare (inklusive administratörer) tilldelade företag till företagets tillgångar.',
-    'full_multiple_companies_support_text' => 'Full Multiple Companies Support',
-    'show_in_model_list'   => 'Visa i rullgardinsmeny för modell',
+    'full_multiple_companies_support_text' => 'Stöd för fleranvändarföretag',
+    'scope_locations_fmcs_support_text'  => 'Scope Locations with Full Multiple Companies Support',
+    'scope_locations_fmcs_support_help_text'  => 'Restrict locations to their selected company.',
+    'scope_locations_fmcs_check_button' => 'Check Compatibility',
+    'scope_locations_fmcs_support_disabled_text'  => 'This option is disabled because you have conflicting locations set for :count or more items.',
+    'show_in_model_list'   => 'Visa i rullgardin för modeller',
     'optional'					=> 'frivillig',
     'per_page'                  => 'Resultat per sida',
-    'php'                       => 'PHP-versionen',
-    'php_info'                  => 'PHP Info',
+    'php'                       => 'PHP-version',
+    'php_info'                  => 'PHP-information',
     'php_overview'              => 'PHP',
-    'php_overview_keywords'     => 'phpinfo, system, info',
-    'php_overview_help'         => 'PHP-system info',
-    'php_gd_info'               => 'Du måste installera php-gd för att visa QR-koder, se installationsanvisningarna.',
+    'php_overview_help'         => 'PHP-systeminformation',
+    'php_gd_info'               => 'Du måste installera php-gd för att visa QR-koder. Se installationsanvisningarna.',
     'php_gd_warning'            => 'PHP Image Processing och GD plugin är INTE installerat.',
     'pwd_secure_complexity'     => 'Lösenordspolicy',
     'pwd_secure_complexity_help' => 'Välj vilka kriterier lösenordet måste uppfylla.',
     'pwd_secure_complexity_disallow_same_pwd_as_user_fields' => 'Lösenordet kan inte vara samma som förnamn, efternamn, e-post eller användarnamn',
     'pwd_secure_complexity_letters' => 'Kräv minst en bokstav',
-    'pwd_secure_complexity_numbers' => 'Kräv minst ett nummer',
+    'pwd_secure_complexity_numbers' => 'Kräv minst en siffra',
     'pwd_secure_complexity_symbols' => 'Kräv minst en symbol',
-    'pwd_secure_complexity_case_diff' => 'Kräv minst ett versaler och ett gemener',
+    'pwd_secure_complexity_case_diff' => 'Kräv minst en versal och en gemen',
     'pwd_secure_min'            => 'Minsta antal tecken för lösenord',
     'pwd_secure_min_help'       => 'Lägsta tillåtna värde är 8',
     'pwd_secure_uncommon'       => 'Förbjud vanliga lösenord',
-    'pwd_secure_uncommon_help'  => 'Det här kommer att förhindra användarna från att använda något av de 10,000 oftast förekommande lösenorden som rapporterats vid dataintrång.',
-    'qr_help'                   => 'Aktivera QR-koder först för att ställa in detta',
-    'qr_text'                   => 'QR Kod Text',
+    'pwd_secure_uncommon_help'  => 'Det här kommer att förhindra användarna från att använda något av de 10,000 ofta-förekommande lösenorden som rapporterats vid dataintrång.',
+    'qr_help'                   => 'Aktivera QR-koder för att ställa in detta',
+    'qr_text'                   => 'QR-kodstext',
     'saml'                      => 'SAML',
     'saml_title'                => 'Uppdatera SAML-inställningar',
-    'saml_help'                 => 'SAML inställningar',
+    'saml_help'                 => 'SAML-inställningar',
     'saml_enabled'              => 'SAML aktiverat',
-    'saml_integration'          => 'SAML Integration',
-    'saml_sp_entityid'          => 'Entitet ID',
+    'saml_integration'          => 'SAML-integration',
+    'saml_sp_entityid'          => 'Entitets-ID',
     'saml_sp_acs_url'           => 'Assertion Consumer Service (ACS) URL',
     'saml_sp_sls_url'           => 'Single Logout Service (SLS) URL',
     'saml_sp_x509cert'          => 'Offentligt certifikat',
@@ -183,99 +192,102 @@ return [
     'saml_idp_metadata_help'    => 'Du kan ange idP-metadata med hjälp av en URL eller XML-fil.',
     'saml_attr_mapping_username' => 'Attributkartläggning - Användarnamn',
     'saml_attr_mapping_username_help' => 'NameID kommer att användas om attributkartläggningen är ospecificerad eller ogiltig.',
-    'saml_forcelogin_label'     => 'SAML Tvinga inloggning',
+    'saml_forcelogin_label'     => 'SAML Inloggningstvång',
     'saml_forcelogin'           => 'Gör SAML till den primära inloggningstypen',
-    'saml_forcelogin_help'      => 'Du kan använda \'/login?nosaml\' för att komma till den normala inloggningssidan.',
+    'saml_forcelogin_help'      => 'Du kan använda \'/login?nosaml\' för att komma till den vanliga inloggningssidan.',
     'saml_slo_label'            => 'SAML engångsutloggning',
     'saml_slo'                  => 'Skicka en utloggningsförfrågan till IdP vid utloggning',
     'saml_slo_help'             => 'Detta kommer att göra att användaren först omdirigeras till idP vid utloggning. Lämna omarkerad om idP inte stöder SP-initierad SAML SLO på rätt sätt.',
-    'saml_custom_settings'      => 'SAML egna inställningar',
+    'saml_custom_settings'      => 'SAML-anpassade inställningar',
     'saml_custom_settings_help' => 'Du kan ange ytterligare inställningar till onelogin/php-saml-biblioteket. Använd på egen risk.',
     'saml_download'             => 'Hämta Metadata',
-    'setting'                   => 'Miljö',
+    'setting'                   => 'Inställning',
     'settings'                  => 'inställningar',
     'show_alerts_in_menu'       => 'Visa varningar i toppmenyn',
     'show_archived_in_list'     => 'Arkiverade tillgångar',
-    'show_archived_in_list_text'     => 'Visa arkiverade tillgångar i listan "alla tillgångar"',
+    'show_archived_in_list_text'     => 'Visa arkiverade tillgångar i listan för "alla tillgångar"',
     'show_assigned_assets'      => 'Visa tillgångar tilldelade till tillgångar',
     'show_assigned_assets_help' => 'Visa tillgångar som tilldelats andra tillgångar i Visa användare -> Tillgångar, Se användare -> Information -> Skriv ut Alla Tilldelade och i Konto -> Visa Tilldelade Tillgångar.',
     'show_images_in_email'     => 'Visa bilder i e-postmeddelanden',
-    'show_images_in_email_help'   => 'Avmarkera den här rutan om din Snipe-IT-installation ligger bakom ett VPN eller ett stängt nätverk och användare utanför nätverket kan inte ladda bilder som visas från den här installationen i sina e-postmeddelanden.',
-    'site_name'                 => 'Sidnamn',
+    'show_images_in_email_help'   => 'Avmarkera den här rutan om din Snipe-IT-uppsättning ligger bakom ett VPN eller ett stängt nätverk och användare utanför nätverket kan inte ladda bilder som visas från den här installationen i sina e-postmeddelanden.',
+    'site_name'                 => 'Uppsättningsnamn',
     'integrations'               => 'Integreringar',
     'slack'                     => 'Slack',
-    'general_webhook'           => 'Allmän Webhook',
-    'ms_teams'                  => 'Microsoft Team',
+    'general_webhook'           => 'General Webhook',
+    'ms_teams'                  => 'Microsoft Teams',
     'webhook'                   => ':app',
-    'webhook_presave'           => 'Test att spara',
-    'webhook_title'               => 'Uppdatera Webhook inställningar',
+    'webhook_presave'           => 'Testa innan du sparar',
+    'webhook_title'               => 'Uppdatera Webhook-inställningar',
     'webhook_help'                => 'Integrationsinställningar',
-    'webhook_botname'             => ':app Botnamn',
-    'webhook_channel'             => ':app Kanal',
-    'webhook_endpoint'            => ':app Slutpunkt',
-    'webhook_integration'         => ':app inställningar',
-    'webhook_test'                 =>'Testa :app integration',
-    'webhook_integration_help'    => ':app integration är frivilligt, men slutpunkt och kanal krävs om du vill använda den. För att konfigurera :app integration, måste du först <a href=":webhook_link" target="_new" rel="noopener">skapa en inkommande webhook</a> på ditt :app konto. Klicka på <strong>Test :app Integration</strong> -knappen för att bekräfta att dina inställningar är korrekta innan du sparar. ',
+    'webhook_botname'             => ':app-botnamn',
+    'webhook_channel'             => ':app-kanal',
+    'webhook_endpoint'            => ':app-endpoint',
+    'webhook_integration'         => ':app-inställningar',
+    'webhook_test'                 =>'Testa :app-integration',
+    'webhook_integration_help'    => ':app-integrering är frivilligt, men endpoint och kanal krävs om du vill använda den. För att konfigurera :app-integrationer måste du först <a href=":webhook_link" target="_new" rel="noopener">skapa en inkommande webhook</a> på ditt :app-konto. Klicka på <strong>Testa :app-integrationsknappen</strong> för att bekräfta att dina inställningar är korrekta innan du sparar. ',
     'webhook_integration_help_button'    => 'När du har sparat information om :app visas en testknapp.',
-    'webhook_test_help'           => 'Testa om din :app integration är korrekt konfigurerad. DU MÅSTE SPARA DIN UPPDATERAD :app INSTÄLLNINGAR FÖRST.',
-    'snipe_version'  			=> 'Snipe-IT-versionen',
-    'support_footer'            => 'Stöd länkar i sidfot ',
-    'support_footer_help'       => 'Ange vem som kan se länkarna till Snipe-IT Support info och användarmanual',
+    'webhook_test_help'           => 'Testa om din :app-integration är korrekt konfigurerad. DU MÅSTE SPARA DINA UPPDATERADE :app-INSTÄLLNINGAR FÖRST.',
+    'shortcuts_enabled'         => 'Aktivera genvägar',
+    'shortcuts_help_text'       => '<strong>Windows</strong>: Alt + Access-nyckel, <strong>Mac</strong>: Control + Option + Access-nyckel',
+    'snipe_version'  			=> 'Snipe-IT-version',
+    'support_footer'            => 'Supportlänkar i sidfot ',
+    'support_footer_help'       => 'Ange vem som kan se länkarna till Snipe-IT-supportinfo och användarmanual',
     'version_footer'            => 'Version i sidfot ',
-    'version_footer_help'       => 'Specificera vilka som kan se Snipe-IT version och build nummer.',
+    'version_footer_help'       => 'Specificera vilka som kan se Snipe-IT-version och versionsnummer.',
     'system'                    => 'Systeminformation',
     'update'                    => 'Uppdatera inställningarna',
     'value'                     => 'Värde',
-    'brand'                     => 'branding',
-    'brand_keywords'            => 'sidfot, logotyp, tryck, tema, hud, rubrik, färger, färg, css',
+    'brand'                     => 'Varumärke',
     'brand_help'                => 'Logo, webbplatsens namn',
-    'web_brand'                 => 'Webb varumärke Typ',
+    'web_brand'                 => 'Webbprofilering',
     'about_settings_title'      => 'Om inställningar',
-    'about_settings_text'       => 'Med dessa inställningar kan du anpassa vissa aspekter av din installation.',
+    'about_settings_text'       => 'Med dessa inställningar kan du anpassa vissa aspekter av din uppsättning.',
     'labels_per_page'           => 'Etiketter per sida',
     'label_dimensions'          => 'Märkdimensioner (tum)',
-    'next_auto_tag_base'        => 'Nästa auto-inkrement',
+    'next_auto_tag_base'        => 'Nästa autoinkrement',
     'page_padding'              => 'Sidmarginaler (tum)',
     'privacy_policy_link'       => 'Länk till sekretesspolicy',
     'privacy_policy'            => 'Integritetspolicy',
-    'privacy_policy_link_help'  => 'Om en URL ingår här kommer en länk till din integritetspolicy att finnas med i appfoten och i alla e-postmeddelanden som systemet skickar ut, i enlighet med GDPR. ',
+    'privacy_policy_link_help'  => 'Om en URL anges här kommer en länk till din integritetspolicy att finnas med i sidfoten och i alla e-postmeddelanden som systemet skickar ut, i enlighet med GDPR. ',
     'purge'                     => 'Rensa borttagna poster',
     'purge_deleted'             => 'Rensa borttagna ',
-    'labels_display_bgutter'    => 'Etikett botten takrännan',
-    'labels_display_sgutter'    => 'Etikett sidotång',
-    'labels_fontsize'           => 'Etikettstorlek',
-    'labels_pagewidth'          => 'Märkbladets bredd',
-    'labels_pageheight'         => 'Märkbladshöjd',
+    'labels_display_bgutter'    => 'Mellanrum under etikett',
+    'labels_display_sgutter'    => 'Sidoavstånd för etikett',
+    'labels_fontsize'           => 'Teckenstorlek för etiketter',
+    'labels_pagewidth'          => 'Etikettbladets bredd',
+    'labels_pageheight'         => 'Etikettbladshöjd',
     'label_gutters'        => 'Etikettavstånd (tum)',
     'page_dimensions'        => 'Siddimensioner (tum)',
-    'label_fields'          => 'Etikett synliga fält',
-    'inches'        => 'inches',
-    'width_w'        => 'w',
+    'label_fields'          => 'Synliga fält för etikett',
+    'inches'        => 'tum',
+    'width_w'        => 'b',
     'height_h'        => 'h',
-    'show_url_in_emails'                => 'Länk till Snipe-IT i e-post',
-    'show_url_in_emails_help_text'      => 'Avmarkera den här rutan om du inte vill länka tillbaka till din Snipe-IT-installation i dina e-postfoton. Användbart om de flesta av dina användare aldrig loggar in.',
+    'show_url_in_emails'                => 'Länk till Snipe-IT för e-postmeddelanden',
+    'show_url_in_emails_help_text'      => 'Avmarkera den här rutan om du inte vill länka tillbaka till din Snipe-IT-installation i e-postfoten. Användbart om de flesta av dina användare aldrig loggar in. ',
     'text_pt'        => 'pt',
     'thumbnail_max_h'   => 'Max miniatyrhöjd',
-    'thumbnail_max_h_help'   => 'Maximal höjd i pixlar som miniatyrer kan visas i listningsvyn. Min 25, max 500.',
+    'thumbnail_max_h_help'   => 'Maximal höjd i pixlar för miniatyrer som visas i listningsvyn. Minst 25, max 500.',
     'two_factor'        => 'Tvåfaktorsautentisering',
     'two_factor_secret'        => 'Tvåfaktorskod',
     'two_factor_enrollment'        => 'Tvåfaktorsregistrering',
     'two_factor_enabled_text'        => 'Aktivera tvåfaktorsautentisering',
     'two_factor_reset'        => 'Återställ tvåfaktorshemlighet',
-    'two_factor_reset_help'        => 'Detta kommer att tvinga användaren att registrera sin enhet med sin autentiseringsapp igen. Detta kan vara användbart om deras nuvarande inskrivna enhet är förlorad eller stulen. ',
+    'two_factor_reset_help'        => 'Detta kommer att tvinga användaren att registrera sin enhet med sin autentiseringsapp igen. Detta kan vara användbart om deras nuvarande enhet är förlorad eller stulen. ',
     'two_factor_reset_success'          => 'Tvåfaktorsenheten har återställts',
-    'two_factor_reset_error'          => 'Återställningen av tvåfelsenhet misslyckades',
+    'two_factor_reset_error'          => 'Återställningen av tvåfaktorsenheten misslyckades',
     'two_factor_enabled_warning'        => 'Aktivering av tvåfaktorn om den inte är aktiverad för tillfället tvingar dig omedelbart att verifiera med en Google Auth-registrerad enhet. Du kommer att ha möjlighet att registrera din enhet om du inte är inloggad för närvarande.',
     'two_factor_enabled_help'        => 'Detta aktiverar tvåfaktorsautentisering med hjälp av Google Authenticator.',
-    'two_factor_optional'        => 'Selective (Användare kan aktivera eller inaktivera om tillåtet)',
-    'two_factor_required'        => 'Krävs för alla användare',
+    'two_factor_optional'        => 'Selektiv (användare kan aktivera eller inaktivera om det tillåts)',
+    'two_factor_required'        => 'Obligatoriskt för alla användare',
     'two_factor_disabled'        => 'Inaktiverad',
     'two_factor_enter_code'	=> 'Ange tvåfaktorskod',
     'two_factor_config_complete'	=> 'Skicka kod',
     'two_factor_enabled_edit_not_allowed' => 'Din administratör tillåter dig inte att redigera den här inställningen.',
     'two_factor_enrollment_text'	=> "Tvåfaktorsautentisering krävs, men din enhet har inte registrerats än. Öppna din Google Authenticator-app och skanna QR-koden nedan för att registrera din enhet. När enheten är registrerad anger du koden nedan",
-    'require_accept_signature'      => 'Kräver signatur',
-    'require_accept_signature_help_text'      => 'Aktivering av denna funktion kräver att användarna fysiskt loggar av när de accepterar en tillgång.',
+    'require_accept_signature'      => 'Kräv signatur',
+    'require_accept_signature_help_text'      => 'Aktivering av denna funktion kräver att användarna fysiskt signerar när de accepterar en tillgång.',
+    'require_checkinout_notes'  => 'Gör anteckningar obligatoriskt vid in-/utcheckning',
+    'require_checkinout_notes_help_text'    => 'Aktivering av denna funktion kräver att anteckningsfältet fylls i vid in- eller utcheckning av en tillgång.',
     'left'        => 'vänster',
     'right'        => 'höger',
     'top'        => 'topp',
@@ -283,97 +295,195 @@ return [
     'vertical'        => 'vertikal',
     'horizontal'        => 'horisontell',
     'unique_serial'                => 'Unika serienummer',
-    'unique_serial_help_text'                => 'Genom att kryssa denna ruta skapas ett krav på unikt serienummer för varje enhet',
+    'unique_serial_help_text'                => 'Genom att kryssa denna ruta skapas ett krav på unikt serienummer för varje objekt',
     'zerofill_count'        => 'Längd på tillgångstaggar, inklusive zerofill',
     'username_format_help'   => 'Denna inställning kommer endast att användas av importprocessen om ett användarnamn inte finns och vi måste generera ett användarnamn åt dig.',
     'oauth_title' => 'OAuth API-inställningar',
-    'oauth_clients' => 'OAuth Clients',
+    'oauth_clients' => 'OAuth-klienter',
     'oauth' => 'OAuth',
-    'oauth_help' => 'Oauth användarvillkor inställningar',
-    'oauth_no_clients' => 'You have not created any OAuth clients yet.',
-    'oauth_secret' => 'Secret',
-    'oauth_authorized_apps' => 'Authorized Applications',
+    'oauth_help' => 'Oauth Endpoint-inställningar',
+    'oauth_no_clients' => 'Du har inte skapat några OAuth-klienter ännu.',
+    'oauth_secret' => 'Hemlighet',
+    'oauth_authorized_apps' => 'Auktoriserade program',
     'oauth_redirect_url' => 'Redirect URL',
-    'oauth_name_help' => ' Something your users will recognize and trust.',
+    'oauth_name_help' => 'Något som dina användare känner igen och har förtroende för',
     'oauth_scopes' => 'Scopes',
-    'oauth_callback_url' => 'Your application authorization callback URL.',
-    'create_client' => 'Create Client',
-    'no_scopes' => 'No scopes',
-    'asset_tag_title' => 'Uppdatera stöldmärknings inställningar',
+    'oauth_callback_url' => 'Din applikations authorization callback URL.',
+    'create_client' => 'Skapa klient',
+    'no_scopes' => 'Inga scopes',
+    'asset_tag_title' => 'Uppdatera tillgångstagg-inställningar',
     'barcode_title' => 'Uppdatera streckkodsinställningar',
     'barcodes' => 'Streckkoder',
     'barcodes_help_overview' => 'Streckkod &amp; QR-inställningar',
-    'barcodes_help' => 'Detta kommer att försöka ta bort cachade streckkoder. Detta skulle normalt bara användas om dina streckkodsinställningar har ändrats, eller om din Snipe-IT-URL har ändrats. Streckkoder kommer att återskapas när de nås härnäst.',
+    'barcodes_help' => 'Detta kommer att försöka ta bort cachade streckkoder. Detta skall normalt enbart användas om dina streckkodsinställningar har ändrats eller om din Snipe-IT-URL har ändrats. Streckkoder kommer att återskapas när de används nästa gång.',
     'barcodes_spinner' => 'Försöker ta bort filer...',
     'barcode_delete_cache' => 'Ta bort streckkodscache',
     'branding_title' => 'Uppdatera varumärkesinställningar',
     'general_title' => 'Uppdatera allmänna inställningar',
-    'mail_test' => 'Skicka Test',
-    'mail_test_help' => 'Detta kommer att försöka skicka ett testmail till :replyto.',
+    'mail_test' => 'Skicka test',
+    'mail_test_help' => 'Detta kommer att försöka skicka ett testmeddelande till :replyto.',
     'filter_by_keyword' => 'Filtrera efter nyckelord',
     'security' => 'Säkerhet',
     'security_title' => 'Uppdatera säkerhetsinställningar',
-    'security_keywords' => 'lösenord, lösenord, krav, två faktorer, tvåfaktor, vanliga lösenord, fjärrinloggning, utloggning, autentisering',
     'security_help' => 'Tvåfaktor, lösenordsbegränsningar',
-    'groups_keywords' => 'behörigheter, behörighetsgrupper, auktorisation',
     'groups_help' => 'Behörighetsgrupper för konto',
     'localization' => 'Lokalisering',
-    'localization_title' => 'Uppdatera Lokaliseringsinställningar',
-    'localization_keywords' => 'lokalisering, valuta, lokal, lokal, tidszon, tidszon, internationell, internatinalisering, språk, språk, översättning',
+    'localization_title' => 'Uppdatera lokaliseringsinställningar',
     'localization_help' => 'Språk, datumvisning',
     'notifications' => 'Aviseringar',
-    'notifications_help' => 'E-postnotiser och revisionsinställningar',
-    'asset_tags_help' => 'Ökande och prefix',
+    'notifications_help' => 'E-postnotiser och inventeringsinställningar',
+    'asset_tags_help' => 'Inkrementering och prefix',
     'labels' => 'Etiketter',
     'labels_title' => 'Uppdatera etikettinställningar',
-    'labels_help' => 'Etikettstorlekar &amp; inställningar',
-    'purge_keywords' => 'radera permanent',
+    'labels_help' => 'Barcodes &amp; label settings',
     'purge_help' => 'Rensa borttagna poster',
     'ldap_extension_warning' => 'Det ser inte ut som LDAP-tillägget är installerat eller aktiverat på denna server. Du kan fortfarande spara dina inställningar, men du måste aktivera LDAP-tillägget för PHP innan LDAP-synkronisering eller inloggning fungerar.',
     'ldap_ad' => 'LDAP/AD',
+    'ldap_test_label' => 'Test LDAP Sync',
+    'ldap_test_login' => ' Test LDAP Login',
+    'ldap_username_placeholder' => 'LDAP Username',
+    'ldap_password_placeholder' => 'LDAP Password',
     'employee_number' => 'Anställningsnummer',
     'create_admin_user' => 'Skapa användare ::',
     'create_admin_success' => 'Klart! Din administratörsanvändare har lagts till!',
-    'create_admin_redirect' => 'Klicka här för att gå till din app-inloggning!',
-    'setup_migrations' => 'Databasens migreringar ::',
+    'create_admin_redirect' => 'Klicka här för att navigera till din app-inloggning!',
+    'setup_migrations' => 'Databasmigreringar ::',
     'setup_no_migrations' => 'Det fanns inget att migrera. Dina databastabeller var redan uppsatta!',
     'setup_successful_migrations' => 'Dina databastabeller har skapats',
-    'setup_migration_output' => 'Migrering utgång:',
+    'setup_migration_output' => 'Migreringsresultat:',
     'setup_migration_create_user' => 'Nästa: Skapa användare',
     'ldap_settings_link' => 'Sida för LDAP-inställningar',
-    'slack_test' => 'Testa <i class="fab fa-slack"></i> Integration',
+    'slack_test' => 'Testa <i class="fab fa-slack"></i>-integration',
+    'status_label_name' => 'Status Label Name',
+    'super_admin_only'  => 'Super Admin Only',
     'label2_enable'           => 'Ny etikettmotor',
-    'label2_enable_help'      => 'Byt till den nya etikettmotorn. <b> Obs! Du måste spara den här inställningen innan du ställer in andra inställningar.</b>',
+    'label2_enable_help'      => 'Byt till den nya etikettmotorn. <b> Obs! Du måste aktivera och spara den här inställningen innan du kan styra andra inställningar.</b>',
     'label2_template'         => 'Mall',
     'label2_template_help'    => 'Välj vilken mall som ska användas för etikettgenerering',
     'label2_title'            => 'Rubrik',
-    'label2_title_help'       => 'Rubriken att visa på etiketter som stöder det',
-    'label2_title_help_phold' => 'Platshållaren <code>{COMPANY}</code> kommer att ersättas med tillgången&apos;s företagsnamn',
+    'label2_title_help'       => 'Rubrik att visa på etiketter (med stöd för rubrik)',
+    'label2_title_help_phold' => 'Platsen <code>{COMPANY}</code> kommer att ersättas med tillgångens företagsnamn',
     'label2_asset_logo'       => 'Använd tillgångslogotyp',
-    'label2_asset_logo_help'  => 'Använd logotypen för tillgången&apos;s tilldelade företag, snarare än värdet på <code>:setting_name</code>',
+    'label2_asset_logo_help'  => 'Använd logotypen för tillgångens tilldelade företag, istället för värdet på <code>:setting_name</code>',
     'label2_1d_type'          => '1D streckkodstyp',
     'label2_1d_type_help'     => 'Format för 1D-streckkoder',
     'label2_2d_type'          => '2D streckkodstyp',
     'label2_2d_type_help'     => 'Format för 2D-streckkoder',
-    'label2_2d_target'        => '2D streckkodstyp',
-    'label2_2d_target_help'   => 'URL som 2D-streckkoden pekar på när den skannas',
-    'label2_fields'           => 'Fältdefinitioner',
+    'label2_2d_target'        => '2D streckkodslänkning',
+    'label2_2d_target_help'   => 'The data that will be contained in the 2D barcode',
+    'label2_fields'           => 'Fältdefiniering',
     'label2_fields_help'      => 'Fält kan läggas till, tas bort och ordnas om i den vänstra kolumnen. För varje fält kan flera alternativ för etikett- och datakällan läggas till, tas bort och ordnas om i högerspalten.',
-    'help_asterisk_bold'    => 'Text inlagd som <code>**text**</code> kommer att visas som fet text',
+    'purge_barcodes' => 'Purge Barcodes',
+    'help_asterisk_bold'    => 'Text inlagd som <code>**text**</code> kommer att visas som fetstilad',
     'help_blank_to_use'     => 'Lämna tomt för att använda värdet från <code>:setting_name</code>',
-    'help_default_will_use' => '<code>:default</code> kommer att använda värdet från <code>:setting_name</code>. <br>Observera att värdet på streckkoderna måste följa respektive streckkodspec för att framgångsrikt kunna genereras. Se <a href="https://snipe-it.readme.io/docs/barcodes">dokumentationen <i class="fa fa-external-link"></i></a> för mer information. ',
+    'help_default_will_use' => '<code>:default</code> will use the value from <code>:setting_name</code>. <br>Note that the value of the barcodes must comply with the respective barcode spec in order to be successfully generated. Please see <a href="https://snipe-it.readme.io/docs/barcodes">the documentation <i class="fa fa-external-link"></i></a> for more details. ',
+    'asset_id'              => 'Tillgångs-ID',
+    'data'               => 'Data',
     'default'               => 'Standard',
     'none'                  => 'Inga',
-    'google_callback_help' => 'Detta bör anges som callback URL i din Google OAuth app inställningar i din organisation&apos;s <strong><a href="https://console.cloud.google.com/" target="_blank">Google developer console <i class="fa fa-external-link" aria-hidden="true"></i></a></strong>.',
+    'google_callback_help' => 'Detta bör anges som callback-URL inom dina Google OAuth-appinställningar i din organisation&apos;s <strong><a href="https://console.cloud.google.com/" target="_blank">Google developer console <i class="fa fa-external-link" aria-hidden="true"></i></a></strong>.',
     'google_login'      => 'Inloggningsinställningar för Google Workspace',
     'enable_google_login'  => 'Aktivera inloggning med Google Workspace',
-    'enable_google_login_help'  => 'Användarna kommer inte att tilldelas automatiskt. De måste ha ett befintligt konto här OCH i Google Workspace, och deras användarnamn här måste matcha deras e-postadress för Google Workspace. ',
-    'mail_reply_to' => 'E-Post Reply-To adress',
-    'mail_from' => 'E-post från adress',
-    'database_driver' => 'Databasdrivrutinen',
-    'bs_table_storage' => 'Tabell Lagring',
+    'enable_google_login_help'  => 'Användare kommer inte att tilldelas automatiskt. De måste ha ett befintligt konto här OCH i Google Workspace, och deras användarnamn här måste matcha deras e-postadress för Google Workspace. ',
+    'mail_reply_to' => 'E-post svarsadress',
+    'mail_from' => 'E-post "Från"-adress',
+    'database_driver' => 'Databasdrivrutin',
+    'bs_table_storage' => 'Tabell-lagring',
     'timezone' => 'Tidszon',
-    'profile_edit'          => 'Edit Profile',
-    'profile_edit_help'          => 'Allow users to edit their own profiles.',
+    'test_mail' => 'Test Mail',
+    'profile_edit'          => 'Redigera profil',
+    'profile_edit_help'          => 'Tillåt användare att redigera sina egna profiler.',
+    'default_avatar' => 'Custom Default Avatar',
+    'default_avatar_help' => 'Denna bild kommer att visas som profilbild om en användare inte har en profilbild.',
+    'restore_default_avatar' => 'Återställ <a href=":default_avatar" data-toggle="lightbox" data-type="image">ursprunglig systemavatar</a>',
+    'restore_default_avatar_help' => 'Återställ standardavatar',
+    'due_checkin_days' => 'Förfaller för incheckningsvarning',
+    'due_checkin_days_help' => 'Hur många dagar innan den förväntade incheckningen av en tillgång ska den anges på sidan "Förfaller för incheckning"?',
+    'no_groups' => 'Inga grupper har skapats än. Besök <code>Administratörsinställningar > Grupper</code> för att lägga till en.',
+    'text' => 'Text',
+
+    'username_formats' => [
+        'username_format'		=> 'Användarnamnsformat',
+        'firstname_lastname_format'	=> 'Förnamn + Efternamn (jane.smith)',
+        'first_name_format'	        => 'First Name (jane)',
+        'last_name_format'		=> 'Last Name (doe)',
+        'filastname_format'			=> 'First Initial Last Name (jsmith)',
+        'lastnamefirstinitial_format' =>  'Last Name First Initial (smithj)',
+        'firstname_lastname_underscore_format' => 'First Name Last Name (jane_smith)',
+        'firstinitial.lastname' => 'First Initial Last Name (j.smith)',
+        'lastname_firstinitial' => 'Last Name First Initial (smith_j)',
+        'lastname_dot_firstinitial_format' => 'Last Name First Initial (smith.j)',
+        'firstnamelastname'     => 'First Name Last Name (janesmith)',
+        'firstnamelastinitial'  => 'First Name Last Initial (janes)',
+        'lastnamefirstname'      => 'Efternamn.Förnamn (smith.jane)',
+    ],
+
+    'email_formats' => [
+        'email_format'			=> 'E-postformat',
+        'firstname_lastname_format'	=> 'Förnamn + Efternamn (jane.smith@example.com)',
+        'first_name_format'		=> 'Förnamn (jane@example.com)',
+        'last_name_format'		=> 'Last Name (doe@example.com)',
+        'filastname_format'			=> 'Första initialen + Efternamn (jsmith@example.com)',
+        'lastnamefirstinitial_format' =>  'Efternamn + Första initial (smithj@example.com)',
+        'firstname_lastname_underscore_format' => 'Förnamn + Efternamn (jane.smith@example.com)',
+        'firstinitial.lastname' => 'Första initialen + Efternamn (j.smith@example.com)',
+        'lastname_firstinitial' => 'Efternamn + Första initialen (smith_j@example.com)',
+        'lastname_dot_firstinitial_format' => 'Efternamn + Första initialen (smith.j@example.com)',
+        'firstnamelastname'     => 'Förnamn + Efternamn (janesmith@example.com)',
+        'firstnamelastinitial'  => 'Efternamn + Första initialen (janes@example.com)',
+        'lastnamefirstname'      => 'Efternamn.Förnamn (smith.jane@example.com)',
+    ],
+
+
+
+    'logo_labels' => [
+        'acceptance_pdf_logo'       => 'PDF Logo',
+        'email_logo'                => 'Logotyp för e-post',
+        'label_logo'                => 'Etikettlogotyp',
+        'logo'                      => 'Site Logo',
+        'favicon'                   => 'Favicon',
+    ],
+
+    'logo_help' => [
+        'email_logo_size'       => 'Kvadratiska logotyper för e-post syns tydligast. ',
+    ],
+
+    'logo_option_types' => [
+        'text' => 'Text',
+        'logo' => 'Logotyp',
+        'logo_and_text' => 'Logo and Text',
+    ],
+
+
+    'legends' => [
+        'scoping' => 'Scoping',
+        'formats' => 'Default Formats',
+        'profiles' => 'User Profiles',
+        'eula' => 'EULA & Acceptance Preferences',
+        'misc_display' => 'Miscellaneous Display Options',
+        'email' => 'Email Preferences',
+        'checkin' => 'Checkin Preferences',
+        'dashboard' => 'Login & Dashboard Preferences',
+        'misc' => 'Miscellaneous',
+        'logos' => 'Logos & Display',
+        'colors' => 'Colors & Skins',
+        'footer' => 'Footer Preferences',
+        'security' => 'Security Preferences',
+        'general' => 'General',
+        'intervals' => 'Intervals & Thresholds',
+    ],
+
+
+    /* Keywords for settings overview help */
+    'keywords' => [
+        'brand'             => 'sidfot, logotyp, tryck, tema, hud, rubrik, färger, färg, css',
+        'general_settings'  => 'företagets support, signatur, acceptans, e-postformat, användarnamnsformat, bilder, per sida, miniatyr, eula, gravatar, tos, instrumentpanel, integritet',
+        'groups'            => 'behörigheter, behörighetsgrupper, auktorisation',
+        'labels'            => 'etiketter, streckkoder, streckkod, ark, utskrift, upc, qr, 1d, 2d',
+        'localization'      => 'lokalisering, valuta, lokal, lokal, tidszon, tidszon, internationell, internatinalisering, språk, språk, översättning',
+        'php_overview'      => 'phpinfo, system, info',
+        'purge'             => 'radera permanent',
+        'security'          => 'lösenord, lösenord, krav, tvåfaktor, tvåfaktor, vanliga lösenord, distansinloggning, utloggning, autentisering',
+    ],
 
 ];
diff --git a/resources/lang/sv-SE/admin/settings/message.php b/resources/lang/sv-SE/admin/settings/message.php
index 7e81ec13f3..68f72ca944 100644
--- a/resources/lang/sv-SE/admin/settings/message.php
+++ b/resources/lang/sv-SE/admin/settings/message.php
@@ -3,44 +3,57 @@
 return [
 
     'update' => [
-        'error'                 => 'Ett fel har uppstått under uppdateringen.',
-        'success'               => 'Inställningarna uppdaterades framgångsrikt.',
+        'error'                 => 'Ett fel har uppstått vid uppdatering. ',
+        'success'               => 'Inställningarna uppdaterades.',
     ],
     'backup' => [
-        'delete_confirm'        => 'Är du säker på att du vill ta bort den här säkerhetskopieringsfilen? Den här åtgärden kan inte ångras.',
-        'file_deleted'          => 'Säkerhetsfilen har tagits bort.',
-        'generated'             => 'En ny säkerhetskopieringsfil skapades med framgång.',
-        'file_not_found'        => 'Den säkerhetskopieringsfilen kunde inte hittas på servern.',
-        'restore_warning'       => 'Ja, återställ den. Jag är medveten att detta kommer att skriva över befintliga data som finns i databasen. Detta kommer också att logga ut alla dina befintliga användare (inklusive dig).',
-        'restore_confirm'       => 'Är du säker på att du vill återställa din databas från :filnamn?'
+        'delete_confirm'        => 'Är du säker på att du vill ta bort den här säkerhetskopian? Den här åtgärden kan inte ångras. ',
+        'file_deleted'          => 'Säkerhetskopian har tagits bort. ',
+        'generated'             => 'En ny säkerhetskopia skapades.',
+        'file_not_found'        => 'Säkerhetskopian kunde inte hittas på servern.',
+        'restore_warning'       => 'Ja, återställ den. Jag är medveten att detta kommer att skriva över befintlig data som redan finns i databasen. Detta kommer också att logga ut alla befintliga användare (inklusive dig själv).',
+        'restore_confirm'       => 'Är du säker på att du vill återställa din databas från :filename?'
+    ],
+    'restore' => [
+        'success'               => 'Din säkerhetskopia har återställts. Vänligen logga in igen.'
     ],
     'purge' => [
-        'error'     => 'Ett fel har uppstått vid spolning.',
-        'validation_failed'     => 'Din rengöringsbekräftelse är felaktig. Vänligen skriv ordet "DELETE" i bekräftelsen rutan.',
-        'success'               => 'Raderade poster som rensats framgångsrikt.',
+        'error'     => 'Ett fel har uppstått vid radering. ',
+        'validation_failed'     => 'Raderingsbekräftelsekoden är felaktig. Vänligen skriv ordet "DELETE" i bekräftelserutan.',
+        'success'               => 'Tidigare raderade poster har raderats för gott.',
     ],
     'mail' => [
-        'sending' => 'Skicka Testmeddelande...',
+        'sending' => 'Skickar testmeddelande...',
         'success' => 'E-post skickat!',
-        'error' => 'Mailet kunde inte skickas.',
-        'additional' => 'Inga ytterligare felmeddelanden tillhandahålls. Kontrollera dina e-postinställningar och din app-logg.'
+        'error' => 'E-postmeddelandet kunde inte skickas.',
+        'additional' => 'Inga ytterligare felmeddelanden. Kontrollera dina e-postinställningar och din app-logg.'
     ],
     'ldap' => [
-        'testing' => 'Testar LDAP-anslutning, bindning och fråga ...',
-        '500' => '500 Serverfel. Kontrollera dina serverloggar för mer information.',
-        'error' => 'Något gick fel :(',
+        'testing' => 'Testar LDAP-anslutning, Bindning och Query...',
+        '500' => '500 Server Error. Kontrollera dina serverloggar för mer information.',
+        'error' => 'Något gick snett :(',
         'sync_success' => 'Ett urval av 10 användare som returneras från LDAP-servern baserat på dina inställningar:',
         'testing_authentication' => 'Testar LDAP-autentisering...',
-        'authentication_success' => 'Användaren är autentiserad mot LDAP framgångsrikt!'
+        'authentication_success' => 'Användaren har autentiserats via LDAP!'
     ],
+    'labels' => [
+        'null_template' => 'Label template not found. Please select a template.',
+        ],
     'webhook' => [
         'sending' => 'Skickar :app testmeddelande...',
-        'success' => 'Din :webhook_name Integration fungerar!',
+        'success' => 'Din :webhook_name-integration fungerar!',
         'success_pt1' => 'Klart! Kontrollera ',
         'success_pt2' => ' kanal för ditt testmeddelande, och se till att klicka på SPARA nedan för att lagra dina inställningar.',
-        '500' => '500 Server fel.',
-        'error' => 'Något gick fel. :app svarade med: :error_message',
-        'error_redirect' => 'FEL: 301/302 :endpoint returnerar en omdirigering. Av säkerhetsskäl följer vi inte omdirigeringar. Använd själva slutpunkten.',
-        'error_misc' => 'Någonting gick fel. :( ',
-    ]
+        '500' => '500 Server Error.',
+        'error' => 'Något gick snett! :app svarade med: :error_message',
+        'error_redirect' => 'FEL: 301/302 :endpoint returnerar en redirect. Av säkerhetsskäl följer vi inte redirects. Använd den faktiska endpointen.',
+        'error_misc' => 'Någonting gick snett :( ',
+        'webhook_fail' => 'webhook-notis misslyckades. Kontrollera att URL\'en fortfarande är giltig.',
+        'webhook_channel_not_found' => ' webhook channel not found.',
+        'ms_teams_deprecation' => 'The selected Microsoft Teams webhook URL will be deprecated Dec 31st, 2025. Please use a workflow URL. Microsoft\'s documentation on creating a workflow can be found <a href="https://support.microsoft.com/en-us/office/create-incoming-webhooks-with-workflows-for-microsoft-teams-8ae491c7-0394-4861-ba59-055e33f75498" target="_blank"> here.</a>',
+    ],
+    'location_scoping' => [
+        'not_saved' => 'Your settings were not saved.',
+        'mismatch' => 'There is 1 item in the database that need your attention before you can enable location scoping.|There are :count items in the database that need your attention before you can enable location scoping.',
+    ],
 ];
diff --git a/resources/lang/sv-SE/admin/statuslabels/message.php b/resources/lang/sv-SE/admin/statuslabels/message.php
index ff6372f46e..4443f899b6 100644
--- a/resources/lang/sv-SE/admin/statuslabels/message.php
+++ b/resources/lang/sv-SE/admin/statuslabels/message.php
@@ -2,18 +2,18 @@
 
 return [
 
-    'does_not_exist' => 'Status Label existerar inte.',
+    'does_not_exist' => 'Statusetiketten existerar inte.',
     'deleted_label' => 'Statusetikett borttagen',
-    'assoc_assets'	 => 'Denna statusetikett är för närvarande associerad med minst en tillgång och kan inte raderas. Uppdatera dina tillgångar för att inte längre referera till denna status och försök igen.',
+    'assoc_assets'	 => 'Denna statusetikett är för närvarande associerad med minst en tillgång och kan inte raderas. Uppdatera dina tillgångar och försök igen. ',
 
     'create' => [
         'error'   => 'Statusetiketten skapades inte, försök igen.',
-        'success' => 'Status Label skapades framgångsrikt.',
+        'success' => 'Statusetikett skapad.',
     ],
 
     'update' => [
         'error'   => 'Statusetiketten uppdaterades inte, var god försök igen',
-        'success' => 'Statusetiketten uppdateras framgångsrikt.',
+        'success' => 'Statusetikett uppdaterad.',
     ],
 
     'delete' => [
@@ -24,8 +24,8 @@ return [
 
     'help' => [
         'undeployable'   => 'Dessa tillgångar kan inte tilldelas någon.',
-        'deployable'   => 'Dessa tillgångar kan checkas ut. När de har tilldelats, antar de en metastatus på <i class="fas fa-circle text-blue"></i> <strong>Deployed</strong>.',
-        'archived'   => 'Dessa tillgångar kan inte checkas ut och visas bara i arkiverad vy. Detta är användbart för att behålla information om tillgångar för budgetering / historiska ändamål men att hålla dem borta från den dagliga tillgångslistan.',
+        'deployable'   => 'Dessa tillgångar kan checkas ut. När de har tilldelats, antar de en metastatus på <i class="fas fa-circle text-blue"></i> <strong>Levererad</strong>.',
+        'archived'   => 'Dessa tillgångar kan inte checkas ut och visas enbart i den arkiverade vyn. Detta är användbart för att behålla information om tillgångar för budgetering/historiska ändamål men att hålla dem borta från den dagliga tillgångslistan.',
         'pending'   => 'Dessa tillgångar kan ännu inte tilldelas någon som ofta används för föremål som är ute för reparation, men förväntas återgå till omlopp.',
     ],
 
diff --git a/resources/lang/sv-SE/admin/statuslabels/table.php b/resources/lang/sv-SE/admin/statuslabels/table.php
index 04b83bc864..4319980e63 100644
--- a/resources/lang/sv-SE/admin/statuslabels/table.php
+++ b/resources/lang/sv-SE/admin/statuslabels/table.php
@@ -1,19 +1,19 @@
 <?php
 
 return array(
-    'about'      	=> 'Om statusetiketter',
+    'about'      	=> 'About Status Types',
     'archived'      	=> 'Arkiverade',
     'create'      	=> 'Skapa statusetikett',
     'color'      	=> 'Diagramfärg',
     'default_label' => 'Förvald etikett',
     'default_label_help' => 'Detta gör att dina oftast använda statusetiketter hamnar överst i menyn när du skapar eller redigerar tillgångar.',
     'deployable'      	=> 'Tillgänglig',
-    'info'      	=> 'Statusetiketter används för att beskriva de olika tillstånd som dina tillgångar kan vara i. De kan vara ute för reparation, förlorade / stulna etc. Du kan skapa nya statusetiketter för tillgängliga, upptagna och arkiverade tillgångar.',
+    'info'      	=> 'Status label types are used to describe the various states your assets could be in. They may be out for repair, lost/stolen, etc. You can create new status labels for your deployable, pending and archived assets according to your own workflow. For more information, <a href="https://snipe-it.readme.io/docs/overview#status-labels" target="_blank">see the documentation <i class="fa fa-external-link"></i></a>.',
     'name'      	=> 'Statusnamn',
     'pending'      	=> 'Pågående',
     'status_type'   => 'Statustyp',
     'show_in_nav'   => 'Visa i sidofältet',
     'title'      	=> 'Statusetiketter',
-    'undeployable'  => 'Ej tillgänglig',
+    'undeployable'  => 'Otillgänglig',
     'update'      	=> 'Uppdatera statusetikett',
 );
diff --git a/resources/lang/sv-SE/admin/suppliers/message.php b/resources/lang/sv-SE/admin/suppliers/message.php
index 6e67c4bc5e..1c1f162b05 100644
--- a/resources/lang/sv-SE/admin/suppliers/message.php
+++ b/resources/lang/sv-SE/admin/suppliers/message.php
@@ -2,27 +2,27 @@
 
 return array(
 
-    'deleted' => 'Tog bort leverantör',
-    'does_not_exist' => 'Leverantören finns inte.',
+    'deleted' => 'Raderad leverantör',
+    'does_not_exist' => 'Leverantören existerar inte.',
 
 
     'create' => array(
-        'error'   => 'Leverantören skapades inte, var god försök igen.',
-        'success' => 'Leverantören skapades framgångsrikt.'
+        'error'   => 'Leverantören kunde inte skapas. Vänligen försök igen.',
+        'success' => 'Leverantör skapad.'
     ),
 
     'update' => array(
-        'error'   => 'Leverantören uppdaterades inte, var god försök igen',
-        'success' => 'Leverantören uppdaterades framgångsrikt.'
+        'error'   => 'Leverantören kunde inte uppdateras. Vänligen försök igen.',
+        'success' => 'Leverantör uppdaterad.'
     ),
 
     'delete' => array(
         'confirm'   => 'Är du säker på att du vill radera denna leverantör?',
-        'error'   => 'Det uppstod ett problem med att ta bort leverantören. Var god försök igen.',
-        'success' => 'Leverantören har tagits bort.',
-        'assoc_assets'	 => 'Denna leverantör är för närvarande är associerad med: asset_count tillgång(ar) och kan inte tas bort. Vänligen uppdatera dina tillgångar för att inte längre referera denna leverantör och försök igen. ',
-        'assoc_licenses'	 => 'Denna leverantör är för närvarande är associerade med: licenses_count licenser (s) och kan inte tas bort. Vänligen uppdatera dina licenser för att inte längre referera denna leverantör och försök igen. ',
-        'assoc_maintenances'	 => 'Denna leverantör är för närvarande associerad med: asset_maintenances_count asset maintenances (s) och kan inte raderas. Var vänlig uppdatera dina tillgångsinrättningar för att inte längre referera till denna leverantör och försök igen. ',
+        'error'   => 'Det uppstod ett problem vid radering av leverantör. Var god försök igen.',
+        'success' => 'Leverantör raderad.',
+        'assoc_assets'	 => 'Denna leverantör är för närvarande associerad med :asset_count tillgång(ar) och kan inte tas bort. Vänligen uppdatera dina tillgångar för att inte längre referera till denna leverantör och försök igen. ',
+        'assoc_licenses'	 => 'Denna leverantör är för närvarande är associerade med :licenses_count licens(er) och kan inte tas bort. Vänligen uppdatera din(a) licens(er) för att inte längre referera till denna leverantör och försök igen. ',
+        'assoc_maintenances'	 => 'Denna leverantör är för närvarande associerad med :asset_maintenances_count underhållningsposter för tillgångar och kan inte raderas. Var vänlig uppdatera dina underhållningsposter för tillgångar för att inte längre referera till denna leverantör och försök igen. ',
     )
 
 );
diff --git a/resources/lang/sv-SE/admin/suppliers/table.php b/resources/lang/sv-SE/admin/suppliers/table.php
index 6b6a795420..24890ea399 100644
--- a/resources/lang/sv-SE/admin/suppliers/table.php
+++ b/resources/lang/sv-SE/admin/suppliers/table.php
@@ -2,25 +2,25 @@
 
 return array(
     'about_suppliers_title' => 'Om leverantörer',
-    'about_suppliers_text'  => 'Leverantörer används för att spåra källan till objekt',
+    'about_suppliers_text'  => 'Leverantörer används för att spåra objektkällor',
     'address'               => 'Leverantörsadress',
     'assets'                => 'Tillgångar',
     'city'                  => 'Stad',
-    'contact'               => 'Kontaktnamn',
+    'contact'               => 'Kontaktperson',
     'country'               => 'Land',
     'create'                => 'Skapa leverantör',
     'email'                 => 'E-post',
     'fax'                   => 'Fax',
     'id'                    => 'ID',
-    'licenses'              => 'licenser',
+    'licenses'              => 'Licenser',
     'name'                  => 'Leverantörsnamn',
-    'notes'                 => 'anteckningar',
+    'notes'                 => 'Anteckningar',
     'phone'                 => 'Telefon',
-    'state'                 => 'stat',
+    'state'                 => 'Län',
     'suppliers'             => 'Leverantörer',
-    'update'                => 'Uppdatera Leverantör',
+    'update'                => 'Uppdatera leverantör',
     'view'                  => 'Visa leverantör',
     'view_assets_for'       => 'Visa tillgångar för',
-    'zip'                   => 'postnummer',
+    'zip'                   => 'Postnummer',
 
 );
diff --git a/resources/lang/sv-SE/admin/users/general.php b/resources/lang/sv-SE/admin/users/general.php
index 442d9d88bc..386be44d8b 100644
--- a/resources/lang/sv-SE/admin/users/general.php
+++ b/resources/lang/sv-SE/admin/users/general.php
@@ -3,52 +3,54 @@
 return [
     'activated_help_text' => 'Den här användaren kan logga in',
     'activated_disabled_help_text' => 'Du kan inte redigera aktiveringsstatus för ditt eget konto.',
-    'assets_user'       => 'Tillgångar tilldelade: namn',
-    'bulk_update_warn'	=> 'Du håller på att redigera egenskaperna hos: user_count-användare. Observera att du inte kan ändra dina egna användarattribut med hjälp av det här formuläret, och måste göra ändringar till din egen användare enskilt.',
-    'bulk_update_help'	=> 'Den här blanketten låter dig uppdatera flera användare samtidigt. Fyll bara i de fält du behöver ändra. Alla fält som lämnas tomma kommer att förbli oförändrade.',
-    'current_assets'    => 'Tillgångar som för närvarande kontrolleras ut till den här användaren',
-    'clone'             => 'Klonanvändare',
-    'contact_user'      => 'Kontaktnamn',
+    'assets_user'       => 'Tillgångar tilldelade :name',
+    'bulk_update_warn'	=> 'Du håller på att redigera egenskaperna hos :user_count användare. Observera att du inte kan ändra dina egna användarattribut med hjälp av det här formuläret utan du måste göra ändringar till din egen användare enskilt.',
+    'bulk_update_help'	=> 'Det här formuläret låter dig uppdatera flera användare samtidigt. Fyll i de fält du behöver ändra. Alla fält som lämnas tomma kommer att förbli oförändrade.',
+    'current_assets'    => 'Tillgångar utcheckade till denna användare',
+    'clone'             => 'Kopiera användare',
+    'contact_user'      => 'Kontakta :name',
     'edit'              => 'Redigera användare',
     'filetype_info'     => 'Tillåtna filtyper är png, gif, jpg, jpeg, doc, docx, pdf, txt, zip och rar.',
-    'history_user'      => 'Historia för: namn',
+    'history_user'      => 'Historik för :name',
     'info'				=> 'Info',
     'restore_user'		=> 'Klicka här för att återställa dem.',
     'last_login'        => 'Senaste inloggning',
-    'ldap_config_text'  => 'LDAP-konfigurationsinställningar finns Admin> Inställningar. Den (valfria) valda platsen kommer att ställas in för alla importerade användare.',
+    'ldap_config_text'  => 'LDAP-konfigurationsinställningar återfinnes under Admin > Inställningar. Den (valfria) valda platsen kommer att ställas in för alla importerade användare.',
     'print_assigned'    => 'Skriv ut alla tilldelade',
     'email_assigned'    => 'E-postlista med alla tilldelade',
     'user_notified'     => 'Användaren har blivit e-postad med en lista över sina nuvarande tilldelade objekt.',
+    'users_notified'    => 'The user has been emailed a list of their currently assigned items.|:count users have been emailed a list of their currently assigned items.',
+    'users_notified_warning' => ':count user has been emailed a list of their currently assigned items, however :no_email users did not have an email address so could not be emailed.|:count users have been emailed a list of their currently assigned items, however :no_email user(s) did not have an email address so could not be emailed.',
     'auto_assign_label' => 'Inkludera denna användare när du automatiskt tilldelar kvalificerade licenser',
     'auto_assign_help'  => 'Hoppa över denna användare i automatisk tilldelning av licenser',
-    'software_user'     => 'Programvara Kontrollerad till: namn',
+    'software_user'     => 'Programvara utcheckad till :name',
     'send_email_help'   => 'Du måste ange en e-postadress till användaren för att kunna skicka inloggningsuppgifterna. Utskick av inloggningsuppgifter kan endast göras när användaren skapas. Lösenorden lagras i en one-way hash och kan inte hämtas när de väl sparats.',
-    'view_user'         => 'Visa användare: namn',
+    'view_user'         => 'Visa användare :name',
     'usercsv'           => 'CSV-fil',
     'two_factor_admin_optin_help' => 'Dina nuvarande administratörsinställningar tillåter selektiv tillämpning av tvåfaktorsautentisering.  ',
     'two_factor_enrolled' => '2FA-enhet konfigurerad ',
-    'two_factor_active'   => '2FA Aktiv ',
+    'two_factor_active'   => '2FA aktiv ',
     'user_deactivated'  => 'Användaren kan inte logga in',
     'user_activated'  => 'Användaren kan logga in',
     'activation_status_warning' => 'Ändra inte aktiveringsstatus',
-    'group_memberships_helpblock' => 'Endast superadministratörer kan redigera gruppmedlemskap.',
-    'superadmin_permission_warning' => 'Endast superadministratörer kan ge en användare superadmin åtkomst.',
+    'group_memberships_helpblock' => 'Endast huvudanvändare kan redigera gruppmedlemskap.',
+    'superadmin_permission_warning' => 'Endast huvudanvändare kan ge en användare huvudanvändaråtkomst.',
     'admin_permission_warning' => 'Endast användare med administratörsrättigheter eller högre kan ge administratörsbehörighet.',
     'remove_group_memberships' => 'Ta bort gruppmedlemskap',
-    'warning_deletion_information' => 'Du håller på att checka in ALLA objekt från :count användare som anges nedan. Super admins namn markeras med rött.',
+    'warning_deletion_information' => 'Du är på väg att checka in ALLA objekt från :count användare som anges nedan. Huvudanvändares namn markeras i rött.',
     'update_user_assets_status' => 'Uppdatera alla tillgångar för dessa användare till denna status',
-    'checkin_user_properties' => 'Kolla in alla egenskaper som är associerade med dessa användare',
+    'checkin_user_properties' => 'Checka in alla egenskaper som är associerade med dessa användare',
     'remote_label'   => 'Detta är en fjärranvändare',
-    'remote'   => 'Fjärr',
-    'remote_help' => 'Detta kan vara användbart om du behöver filtrera fjärranvändare som aldrig eller sällan kommer till dina fysiska platser.',
-    'not_remote_label' => 'Detta är inte en fjärranvändare',
-    'vip_label' => 'VIP användare',
-    'vip_help' => 'Detta kan vara till hjälp för att markera viktiga personer i din org om du vill hantera dem på speciella sätt.',
+    'remote'   => 'Distansarbete',
+    'remote_help' => 'Detta kan vara användbart om du behöver filtrera användare som arbetar på distans som aldrig eller sällan besöker dina fysiska platser.',
+    'not_remote_label' => 'Detta är inte en distansanvändare',
+    'vip_label' => 'VIP-användare',
+    'vip_help' => 'Detta kan vara till hjälp för att markera viktiga personer i din organisation om du vill hantera dem på speciella sätt.',
     'create_user' => 'Skapa en användare',
     'create_user_page_explanation' => 'Detta är den kontoinformation du kommer att använda för att komma åt webbplatsen för första gången.',
-    'email_credentials' => 'E-post autentiseringsuppgifter',
+    'email_credentials' => 'E-postuppgifter',
     'email_credentials_text' => 'E-posta mina uppgifter till e-postadressen ovan',
     'next_save_user' => 'Nästa: Spara användare',
-    'all_assigned_list_generation' => 'Skapad den:',
+    'all_assigned_list_generation' => 'Skapad:',
     'email_user_creds_on_create' => 'E-posta den här användaren sina inloggningsuppgifter?',
 ];
diff --git a/resources/lang/sv-SE/admin/users/message.php b/resources/lang/sv-SE/admin/users/message.php
index b7390912ab..9cf70ef055 100644
--- a/resources/lang/sv-SE/admin/users/message.php
+++ b/resources/lang/sv-SE/admin/users/message.php
@@ -2,57 +2,58 @@
 
 return array(
 
-    'accepted'                  => 'Du har framgångsrikt godkänt den här tillgången.',
-    'declined'                  => 'Du har framgångsrikt nekat den här tillgången.',
-    'bulk_manager_warn'	        => 'Dina användare har uppdaterats, men chefsfältet sparades inte eftersom den chef du valt även finns i användarlistan, en användare kanske inte ange sig själv som chef. Vänligen välj dina användare igen, med undantag av chefen.',
+    'accepted'                  => 'Du har godkänt denna tillgång.',
+    'declined'                  => 'Du har avböjt denna tillgång.',
+    'bulk_manager_warn'	        => 'Dina användare har uppdaterats, men ansvarigfältet sparades inte eftersom den ansvarige du valt även finns i användarlistan varvid en användare inte kan ange sig själv som ansvarig. Vänligen välj dina användare igen, med den ansvarige exkluderad ur valen.',
     'user_exists'               => 'Användaren existerar redan!',
-    'user_not_found'            => 'Användaren finns inte.',
+    'user_not_found'            => 'Användaren existerar inte eller så har du inte behörighet att se den.',
     'user_login_required'       => 'Inloggningsfältet krävs',
-    'user_has_no_assets_assigned' => 'Inga tillgångar som för närvarande tilldelats användaren.',
+    'user_has_no_assets_assigned' => 'Inga tillgångar har tilldelats denna användare.',
     'user_password_required'    => 'Lösenordet krävs.',
-    'insufficient_permissions'  => 'Otillräckliga tillstånd.',
-    'user_deleted_warning'      => 'Den här användaren har raderats. Du måste återställa den här användaren för att redigera dem eller tilldela dem nya tillgångar.',
-    'ldap_not_configured'        => 'LDAP-integrationen har inte konfigurerats för den här installationen.',
-    'password_resets_sent'      => 'De valda användare som är aktiverade och har en giltig e-postadress har skickats en länk för att återställa lösenordet.',
+    'insufficient_permissions'  => 'Otillräckliga behörigheter.',
+    'user_deleted_warning'      => 'Den här användaren har raderats. Du måste återställa den här användaren för att redigera eller tilldela nya tillgångar.',
+    'ldap_not_configured'        => 'LDAP-integrationen har inte konfigurerats för den här uppsättningen.',
+    'password_resets_sent'      => 'De valda användarna som är aktiverade och har en giltig e-postadress har skickats en länk för lösenordsåterställning.',
     'password_reset_sent'       => 'En återställningslänk för lösenord har skickats till :email!',
     'user_has_no_email'         => 'Den här användaren har ingen e-postadress i sin profil.',
-    'log_record_not_found'        => 'Det gick inte att hitta en matchande loggpost för den här användaren.',
+    'log_record_not_found'        => 'Det gick inte att hitta en matchande logg för den här användaren.',
 
 
     'success' => array(
-        'create'    => 'Användaren skapades med framgång.',
-        'update'    => 'Användaren har uppdaterats.',
-        'update_bulk'    => 'Användarna uppdaterades med framgång!',
+        'create'    => 'Användare skapad.',
+        'update'    => 'Användare uppdaterad.',
+        'update_bulk'    => 'Användare uppdaterade.',
         'delete'    => 'Användaren har tagits bort.',
-        'ban'       => 'Användaren har blivit bannlyst.',
-        'unban'     => 'Användaren var framgångsrikt obuten.',
-        'suspend'   => 'Användaren avbröts.',
-        'unsuspend' => 'Användaren blev framgångsrikt uppslagen.',
-        'restored'  => 'Användaren lyckades återställas.',
-        'import'    => 'Användare importerades framgångsrikt.',
+        'ban'       => 'Användare avstängd.',
+        'unban'     => 'Användare aktiverad.',
+        'suspend'   => 'Användare suspenderad.',
+        'unsuspend' => 'Användare aktiverad.',
+        'restored'  => 'Användare återställd.',
+        'import'    => 'Användare importerades.',
     ),
 
     'error' => array(
-        'create' => 'Det var ett problem att skapa användaren. Var god försök igen.',
+        'create' => 'Det gick inte att skapa användaren. Var god försök igen.',
         'update' => 'Det gick inte att uppdatera användaren. Var god försök igen.',
         'delete' => 'Det gick inte att ta bort användaren. Var god försök igen.',
         'delete_has_assets' => 'Den här användaren har objekt tilldelade och kunde inte raderas.',
-        'delete_has_assets_var' => 'This user still has an asset assigned. Please check it in first.|This user still has :count assets assigned. Please check their assets in first.',
-        'delete_has_licenses_var' => 'This user still has a license seats assigned. Please check it in first.|This user still has :count license seats assigned. Please check them in first.',
-        'delete_has_accessories_var' => 'This user still has an accessory assigned. Please check it in first.|This user still has :count accessories assigned. Please check their assets in first.',
-        'delete_has_locations_var' => 'This user still manages a location. Please select another manager first.|This user still manages :count locations. Please select another manager first.',
-        'delete_has_users_var' => 'This user still manages another user. Please select another manager for that user first.|This user still manages :count users. Please select another manager for them first.',
-        'unsuspend' => 'Det uppstod ett problem som avbröt användaren. Var god försök igen.',
+        'delete_has_assets_var' => 'Den här användaren har fortfarande en tilldelad tillgång. Vänligen checka in den först.|Den här användaren har fortfarande :count tillgångar tilldelade. Vänligen check in dem först.',
+        'delete_has_licenses_var' => 'Den här användaren har en licensplats tilldelad. Vänligen checka in den först.|Den här användaren har fortfarande :count licensplatser tilldelade. Vänligen checka in dem först.',
+        'delete_has_accessories_var' => 'Den här användaren har fortfarande ett tillbehör tilldelat. Vänligen checka in det först.|Den här användaren har fortfarande :count tillbehör tilldelade. Vänligen checka in dem först.',
+        'delete_has_locations_var' => 'Den här användaren hanterar fortfarande en plats. Välj en annan ansvarig först.|Den här användaren hanterar fortfarande :count platser. Välj en annan ansvarig först.',
+        'delete_has_users_var' => 'Den här användaren hanterar fortfarande en annan användare. Välj en annan ansvarig för den användaren först. Den här användaren hanterar fortfarande :count användare. Välj en annan ansvarig för dem först.',
+        'unsuspend' => 'Det gick inte att aktivera användaren. Var god försök igen.',
         'import'    => 'Det gick inte att importera användare. Var god försök igen.',
         'asset_already_accepted' => 'Denna tillgång har redan godkänts.',
-        'accept_or_decline' => 'Du måste antingen godkänna eller neka den här tillgången.',
-        'cannot_delete_yourself' => 'We would feel really bad if you deleted yourself, please reconsider.',
+        'accept_or_decline' => 'Du måste antingen godkänna eller avböja den här tillgången.',
+        'cannot_delete_yourself' => 'Vi skulle verkligen bli ledsna om du raderade ditt konto. Hoppas att du kan tänka om.',
         'incorrect_user_accepted' => 'Den tillgång du försökte acceptera har inte checkats ut till dig.',
         'ldap_could_not_connect' => 'Det gick inte att ansluta till LDAP-servern. Kontrollera din LDAP-serverkonfiguration i LDAP-konfigurationsfilen. <br>Fel från LDAP-servern:',
-        'ldap_could_not_bind' => 'Kunde inte binda till LDAP-servern. Kontrollera din LDAP-serverkonfiguration i LDAP-konfigurationsfilen. <br>Fel från LDAP-servern:',
+        'ldap_could_not_bind' => 'Kunde inte ansluta till LDAP-servern. Kontrollera din LDAP-serverkonfiguration i LDAP-konfigurationsfilen. <br>Fel från LDAP-servern: ',
         'ldap_could_not_search' => 'Det gick inte att söka på LDAP-servern. Kontrollera din LDAP-serverkonfiguration i LDAP-konfigurationsfilen. <br>Fel från LDAP-servern:',
-        'ldap_could_not_get_entries' => 'Det gick inte att få poster från LDAP-servern. Kontrollera din LDAP-serverkonfiguration i LDAP-konfigurationsfilen. <br>Fel från LDAP-servern:',
-        'password_ldap' => 'Lösenordet för det här kontot hanteras av LDAP / Active Directory. Vänligen kontakta din IT-avdelning för att ändra ditt lösenord.',
+        'ldap_could_not_get_entries' => 'Det gick inte att erhålla värden från LDAP-servern. Kontrollera din LDAP-serverkonfiguration i LDAP-konfigurationsfilen. <br>Fel från LDAP-servern:',
+        'password_ldap' => 'Lösenordet för det här kontot hanteras av LDAP/Active Directory. Vänligen kontakta din IT-ansvarige för att ändra ditt lösenord. ',
+        'multi_company_items_assigned' => 'Denna användare har objekt tilldelade som tillhör ett annat företag. Vänligen checka in dem eller redigera deras företag.'
     ),
 
     'deletefile' => array(
@@ -61,10 +62,10 @@ return array(
     ),
 
     'upload' => array(
-        'error'   => 'Fil (er) inte uppladdade. Var god försök igen.',
-        'success' => 'Filer som har laddats upp.',
-        'nofiles' => 'Du valde inte några filer för uppladdning',
-        'invalidfiles' => 'En eller flera av dina filer är för stora eller är en filtyp som inte är tillåten. Tillåtna filtyper är png, gif, jpg, doc, docx, pdf och txt.',
+        'error'   => 'Fil(er) har inte laddats upp. Var god försök igen.',
+        'success' => 'Fil(er) uppladdad(e).',
+        'nofiles' => 'Inga filer valda för uppladdning.',
+        'invalidfiles' => 'En eller flera av dina filer är för stora eller är av en filtyp som inte stöds. Tillåtna filtyper är png, gif, jpg, doc, docx, pdf och txt.',
     ),
 
     'inventorynotification' => array(
diff --git a/resources/lang/sv-SE/admin/users/table.php b/resources/lang/sv-SE/admin/users/table.php
index 77de0f102e..6fcfcd2a49 100644
--- a/resources/lang/sv-SE/admin/users/table.php
+++ b/resources/lang/sv-SE/admin/users/table.php
@@ -2,28 +2,28 @@
 
 return array(
     'activated'  			=> 'Aktiva',
-    'allow'  				=> 'Tillåta',
+    'allow'  				=> 'Tillåt',
     'checkedout'  			=> 'Tillgångar',
     'created_at' 			=> 'Skapad',
     'createuser' 			=> 'Skapa användare',
-    'deny'  				=> 'Förneka',
+    'deny'  				=> 'Avböj',
     'email'      			=> 'E-post',
     'employee_num'      	=> 'Anställningsnummer.',
     'first_name' 			=> 'Förnamn',
-    'groupnotes'			=> 'Välj en grupp att tilldela användaren, kom ihåg att en användare tar på sig behörigheterna för den grupp de tilldelas. Använd ctrl + klicka (eller cmd + klicka på MacOS) för att avmarkera grupper.',
+    'groupnotes'			=> 'Välj en grupp att tilldela användaren. Kom ihåg att en användare tilldelas behörigheterna för den grupp de tilldelas. Använd ctrl + vänsterklick (eller cmd + vänsterklick på MacOS) för att avmarkera grupper.',
     'id'         			=> 'Id',
-    'inherit'  				=> 'Ärva',
+    'inherit'  				=> 'Ärv',
     'job' 					=> 'Jobbtitel',
     'last_login'  			=> 'Senaste inloggning',
     'last_name'  			=> 'Efternamn',
     'location'  			=> 'Plats',
-    'lock_passwords'		=> 'Inloggningsuppgifter kan inte ändras på den här installationen.',
-    'manager' 				=> 'Chef',
+    'lock_passwords'		=> 'Inloggningsuppgifter kan inte ändras för den här uppsättningen.',
+    'manager' 				=> 'Ansvarig person',
     'managed_locations'     => 'Hanterade platser',
     'managed_users'         => 'Hanterade användare',
-    'name' 					=> 'namn',
-    'nogroup'               => 'Inga grupper har skapats ännu. För att lägga till ett, besök: ',
-    'notes'                 => 'anteckningar',
+    'name' 					=> 'Namn',
+    'nogroup'               => 'Inga grupper har skapats ännu. För att lägga till en, navigera till:',
+    'notes'                 => 'Anteckningar',
     'password_confirm' 		=> 'Bekräfta lösenord',
     'password' 				=> 'Lösenord',
     'phone'  				=> 'Telefon',
@@ -31,11 +31,11 @@ return array(
     'show_deleted'          => 'Visa borttagna användare',
     'title' 				=> 'Titel',
 	'to_restore_them'		=> 'att återställa dem.',
-    'total_assets_cost'     => "Totala Tillgångar Kostnad",
+    'total_assets_cost'     => "Total inköpskostnad",
     'updateuser' 			=> 'Uppdatera användaren',
     'username' 				=> 'Användarnamn',
 	'user_deleted_text' 	=> 'Den här användaren har markerats som borttagen.',
     'username_note' 		=> '(Detta används endast för Active Directory-bindning, inte för inloggning.)',
-    'cloneuser'             => 'Klonanvändare',
+    'cloneuser'             => 'Kopiera användare',
     'viewusers' 			=> 'Visa användare',
 );
diff --git a/resources/lang/sv-SE/auth.php b/resources/lang/sv-SE/auth.php
index 6c2cee28ec..cde6f39b8f 100644
--- a/resources/lang/sv-SE/auth.php
+++ b/resources/lang/sv-SE/auth.php
@@ -13,8 +13,8 @@ return array(
     |
     */
 
-    'failed' => 'Dessa uppgifter stämmer inte överens med vårt register.',
+    'failed' => 'Dessa uppgifter stämmer inte överens med våra register.',
     'password' => 'Det angivna lösenordet är felaktigt.',
-    'throttle' => 'För många inloggningsförsök. Vänligen försök igen om :seconds sekunder.',
+    'throttle' => 'Too many login attempts. Please try again in :minutes minute(s).',
 
 );
diff --git a/resources/lang/sv-SE/auth/general.php b/resources/lang/sv-SE/auth/general.php
index e524806c54..7488cf5360 100644
--- a/resources/lang/sv-SE/auth/general.php
+++ b/resources/lang/sv-SE/auth/general.php
@@ -10,9 +10,9 @@ return [
     'forgot_password'               => 'Jag har glömt mitt lösenord',
     'ldap_reset_password'           => 'Klicka här för att återställa ditt LDAP-lösenord',
     'remember_me'                   => 'Kom ihåg mig',
-    'username_help_top'                 => 'Ange ditt <strong>användarnamn</strong> för att få en länk för att återställa lösenordet.',
-    'username_help_bottom'          => 'Ditt användarnamn och e-postadress <em>kan</em> vara samma, men kanske inte är beroende på din konfiguration. Om du inte kommer ihåg ditt användarnamn, kontakta din administratör. <br><br><strong>Användarnamn utan en associerad e-postadress kommer inte att få en länk för att återställa lösenordet.</strong> ',
+    'username_help_top'                 => 'Ange ditt <strong>användarnamn</strong> för att få en återställningslänk.',
+    'username_help_bottom'          => 'Ditt användarnamn och din e-postadress <em>kan</em> vara samma, men kanske inte är beroende på din konfiguration. Om du inte kommer ihåg ditt användarnamn, kontakta din administratör. <br><br><strong>Användarnamn utan en associerad e-postadress kommer inte att få en länk e-postad för att återställa lösenordet.</strong> ',
     'google_login'                  => 'Logga in med Google Workspace',
-    'google_login_failed'           => 'Google-inloggning misslyckades, försök igen.',
+    'google_login_failed'           => 'Google-inloggningen misslyckades. Vänligen försök igen.',
 ];
 
diff --git a/resources/lang/sv-SE/auth/message.php b/resources/lang/sv-SE/auth/message.php
index 71ffe6eb1f..d21233f996 100644
--- a/resources/lang/sv-SE/auth/message.php
+++ b/resources/lang/sv-SE/auth/message.php
@@ -5,26 +5,24 @@ return array(
     'account_already_exists' => 'Ett konto med denna e-postadress finns redan.',
     'account_not_found'      => 'Användarnamnet eller lösenordet är felaktigt.',
     'account_not_activated'  => 'Detta användarkonto är inte aktiverat.',
-    'account_suspended'      => 'Detta användarkonto har blivit suspenderat.',
-    'account_banned'         => 'Detta användarkonto har blivit avstängt.',
-    'throttle'               => 'För många misslyckade inloggningsförsök. Försök igen om :minutes minuter.',
+    'account_suspended'      => 'Detta användarkonto är suspenderat.',
 
     'two_factor' => array(
         'already_enrolled'      => 'Din enhet är redan registrerad.',
         'success'               => 'Din inloggning lyckades.',
         'code_required'         => 'Tvåfaktorskod krävs.',
         'invalid_code'          => 'Tvåfaktorskoden är ogiltig.',
-        'enter_two_factor_code' => 'Please enter your two-factor authentication code.',
-        'please_enroll'         => 'Please enroll a device in two-factor authentication.',
+        'enter_two_factor_code' => 'Ange din tvåfaktorsautentiseringskod.',
+        'please_enroll'         => 'Vänligen registrera en enhet med tvåfaktorsautentisering.',
     ),
 
     'signin' => array(
-        'error'   => 'Det uppstod ett problem när du försökte logga in, försök igen.',
+        'error'   => 'Det uppstod ett fel vid inloggningen. Vänligen försök igen.',
         'success' => 'Din inloggning lyckades.',
     ),
 
     'logout' => array(
-        'error'   => 'Det uppstod ett problem när du försökte logga ut, försök igen.',
+        'error'   => 'Det uppstod ett fel vid utloggningen. Vänligen försök igen.',
         'success' => 'Du har loggat ut.',
     ),
 
@@ -34,12 +32,12 @@ return array(
     ),
 
     'forgot-password' => array(
-        'error'   => 'Det uppstod ett problem med att nollställa ditt lösenord, var god försök igen.',
-        'success' => 'Om den e-postadressen finns i vårt system har ett e-postmeddelande om lösenordsåterställning skickats.',
+        'error'   => 'Det uppstod ett fel med att nollställa ditt lösenord. Vänligen försök igen.',
+        'success' => 'Om e-postadressen finns i vårt system har ett e-postmeddelande om lösenordsåterställning skickats.',
     ),
 
     'forgot-password-confirm' => array(
-        'error'   => 'Det uppstod ett problem med nollställning av ditt lösenord, var god försök igen.',
+        'error'   => 'Det uppstod ett fel med återställning av ditt lösenord. Vänlgien försök igen.',
         'success' => 'Ditt lösenord har återställts.',
     ),
 
diff --git a/resources/lang/sv-SE/button.php b/resources/lang/sv-SE/button.php
index 506f4ad1ad..aff6e284ee 100644
--- a/resources/lang/sv-SE/button.php
+++ b/resources/lang/sv-SE/button.php
@@ -7,6 +7,7 @@ return [
     'checkin_and_delete'  	    => 'Checka in alla / ta bort användare',
     'delete'  	                => 'Radera',
     'edit'    	                => 'Ändra',
+    'clone'    	                => 'Kopiera',
     'restore' 	                => 'Återställ',
     'remove'                    => 'Ta bort',
     'request'                   => 'Begäran',
@@ -14,11 +15,20 @@ return [
     'upload'                    => 'Ladda upp',
     'select_file'				=> 'Välj fil...',
     'select_files'				=> 'Välj filer...',
-    'generate_labels'           => '{1} Generera etikett|[2,*]] Generera etiketter',
+    'generate_labels'           => '{1} Generera etikett|[2,*] Generera etiketter',
     'send_password_link'        => 'Skicka länk för lösenordsåterställning',
-    'go'                        => 'Gå',
+    'go'                        => 'Kör',
     'bulk_actions'              => 'Massåtgärder',
     'add_maintenance'           => 'Inventarieunderhåll',
     'append'                    => 'Lägg till',
     'new'                       => 'Ny',
+    'var' => [
+        'clone'     => 'Kopiera :item_type',
+        'edit'      => 'Redigera :item_type',
+        'delete'    => 'Ta bort :item_type',
+        'restore'   => 'Återställ :item_type',
+        'create'    => 'Skapa ny :item_type',
+        'checkout'  => 'Checka ut :item_type',
+        'checkin'   => 'Checka in :item_type',
+    ]
 ];
diff --git a/resources/lang/sv-SE/general.php b/resources/lang/sv-SE/general.php
index d688e2f4b2..4b224a980f 100644
--- a/resources/lang/sv-SE/general.php
+++ b/resources/lang/sv-SE/general.php
@@ -1,142 +1,134 @@
 <?php
 
 return [
-    '2FA_reset'             => '2FA reset',
+    '2FA_reset'             => '2FA-återställning',
     'accessories'			=> 'Tillbehör',
     'activated'			    => 'Aktiverad',
     'accepted_date'         => 'Datum Accepterat',
     'accessory'				=> 'Tillbehör',
     'accessory_report'		=> 'Tillbehörsrapport',
     'action'                => 'Åtgärd',
-    'activity_report'		=> 'Aktivitets Rapport',
+    'activity_report'		=> 'Aktivitetsrapport',
     'address'				=> 'Adress',
-    'admin'					=> 'Administratör',
-    'admin_tooltip'			=> 'This user has admin privileges',
-    'superuser'				=> 'Superuser',
-    'superuser_tooltip'		=> 'This user has superuser privileges',
+    'admin'					=> 'Administratörsinställningar',
+    'admin_tooltip'			=> 'Den här användaren har administratörsrättigheter',
+    'superuser'				=> 'Huvudanvändare',
+    'superuser_tooltip'		=> 'Den här användaren har huvudanvändarrättigheter',
     'administrator'			=> 'Administratör',
     'add_seats'             => 'Tillagda platser',
     'age'                   => "Ålder",
-    'all_assets'			=> 'Alla Tillgångar',
+    'all_assets'			=> 'Alla tillgångar',
     'all'       			=> 'Alla',
     'archived'              => 'Arkiverad',
-    'asset_models'			=> 'Modeller',
+    'asset_models'			=> 'Tillgångsmodeller',
     'asset_model'			=> 'Modell',
     'asset'					=> 'Tillgång',
-    'asset_report'          => 'Rapport om tillgångar',
-    'asset_tag'				=> 'Märkning av tillgångar',
-    'asset_tags'            => 'Stöldnummer',
+    'asset_previous'        => 'Asset (Previously Assigned)',
+    'asset_report'          => 'Tillgångsrapport',
+    'asset_tag'				=> 'Tillgångstagg',
+    'asset_tags'            => 'Tillgångstaggar',
     'assets_available'		=> 'Tillgängliga tillgångar',
-    'accept_assets'         => 'Acceptera tillgångar: namn',
-    'accept_assets_menu'    => 'Accepterade tillgångar',
-    'audit'				    => 'Inventera',
+    'accept_assets'         => 'Acceptera tillgångar :name',
+    'accept_assets_menu'    => 'Acceptera tillgångar',
+    'accept_item'           => 'Acceptera objekt',
+    'audit'				    => 'Inventering',
+    'audits'				=> 'Audits',
     'audit_report'			=> 'Inventeringsloggar',
     'assets'				=> 'Tillgångar',
     'assets_audited'        => 'inventarier granskade',
-    'assets_checked_in_count'     => 'tillgångar incheckade',
+    'assets_checked_in_count'     => 'incheckade tillgångar',
     'assets_checked_out_count'     => 'utcheckade tillgångar',
     'asset_deleted_warning'     => 'Denna tillgång har tagits bort. Du måste återställa den innan du kan tilldela den till någon.',
-    'assigned_date'         => 'Tilldelad datum',
-    'assigned_to'           => 'Tillgångar tilldelade: namn',
+    'assigned_date'         => 'Tilldelat datum',
+    'assigned_to'           => 'Tillgångar tilldelade: name',
     'assignee'              => 'Tilldelad till',
-    'avatar_delete'         => 'Ta bort Avatar',
-    'avatar_upload'         => 'Ladda upp Avatar',
+    'avatar_delete'         => 'Ta bort avatar',
+    'avatar_upload'         => 'Ladda upp avatar',
     'back'      			=> 'Bakåt',
-    'bad_data'      		=> 'Inget hittat. Kanske dåliga data?',
-    'bulkaudit'             => 'Bulk Inventering',
+    'bad_data'      		=> 'Inga resultat. Kanske felaktig data?',
+    'bulkaudit'             => 'Massinventering',
     'bulkaudit_status'      => 'Inventeringsstatus',
-    'bulk_checkout'  		=> 'Bulk Checkout',
+    'bulk_checkout'  		=> 'Massutcheckning',
     'bulk_edit'             => 'Massredigera',
-    'bulk_delete'           => 'Massradering',
+    'bulk_delete'           => 'Massradera',
     'bulk_actions'          => 'Massåtgärder',
-    'bulk_checkin_delete'   => 'Bulk Checkin / Ta bort användare',
+    'bulk_checkin_delete'   => 'Massincheckning / Ta bort användare',
     'byod'                  => 'BYOD',
     'byod_help'             => 'Denna enhet ägs av användaren',
-    'bystatus'              => 'efter status',
+    'bystatus'              => 'efter Status',
     'cancel'  				=> 'Avbryt',
     'categories'			=> 'Kategorier',
     'category'				=> 'Kategori',
-    'change' 		        => 'In ut',
+    'change' 		        => 'In/ut',
     'changeemail'  			=> 'Ändra E-postadress',
-    'changepassword'  		=> 'Ändra Lösenord',
+    'changepassword'  		=> 'Byt lösenord',
     'checkin'  				=> 'Checka in',
-    'checkin_from'  		=> 'Checka in från',
+    'checkin_from'  		=> 'Incheckning från',
+    'checkin_note'  		=> 'Checkin Note',
+    'checkout_note'  		=> 'Checkout Note',
     'checkout'  			=> 'Checka ut',
-    'checkouts_count'       => 'Utregistreringar',
-    'checkins_count'        => 'Inregristreringar',
+    'checkouts_count'       => 'Utcheckningar',
+    'checkins_count'        => 'Incheckningar',
+    'checkin_and_delete'  	=> 'Checka in och ta bort',
     'user_requests_count'   => 'Förfrågningar',
     'city'  				=> 'Ort',
     'click_here'			=> 'Klicka här',
-    'clear_selection'		=> 'Rensa urvalet',
+    'clear_selection'		=> 'Rensa urval',
     'companies'			    => 'Företag',
     'company'				=> 'Företag',
     'component'			    => 'Komponent',
     'components'			=> 'Komponenter',
-    'complete'				=> 'Komplett',
+    'complete'				=> 'Slutför',
     'consumable'			=> 'Förbrukningsmaterial',
     'consumables'			=> 'Förbrukningsmaterial',
     'country'  				=> 'Land',
     'could_not_restore'     => 'Fel vid återställning av :item_type: :error',
-    'not_deleted'           => ':item_type är inte borttagen så den kan inte återställas',
-    'create'				=> 'Skapa Ny',
-    'created'               => 'Artikel skapad',
-    'created_asset'			=> 'skapa tillgång',
-    'created_at' 			=> 'Skapad den',
+    'not_deleted'           => ':item_type blev inte borttagen och kan därför inte återställas',
+    'create'				=> 'Skapa ny',
+    'created'               => 'Objekt skapat',
+    'created_asset'			=> 'skapad tillgång',
+    'created_at' 			=> 'Skapad',
     'created_by'            => 'Skapad av',
     'record_created' 		=> 'Poster skapade',
-    'updated_at' 			=> 'Uppdaterad på',
+    'updated_at' 			=> 'Senast uppdaterad',
     'currency'  			=> 'SEK', // this is deprecated
+    'currency_text'  		=> 'Valuta', //
     'current'  				=> 'Nuvarande',
     'current_password'      => 'Nuvarande lösenord',
-    'customize_report'      => 'Anpassad tillgångsrapport',
+    'customize_report'      => 'Anpassa rapport',
     'custom_report'         => 'Anpassad tillgångsrapport',
-    'dashboard'				=> 'Översikt',
+    'dashboard'				=> 'Instrumentpanel',
+    'data_source'           => 'Datakälla',
     'days'      			=> 'dagar',
     'days_to_next_audit'    => 'Dagar till nästa inventering',
     'date'					=> 'Datum',
     'debug_warning'         => 'Varning!',
-    'debug_warning_text'    => 'Programmet körs i produktionsläge med debugging aktiverat. Detta kan avslöja känslig data om din ansökan är tillgänglig för omvärlden. Inaktivera felsökningsläge genom att ange värdet <code>APP_DEBUG</code> i filen <code>.env</code> till <code>false</code>.',
+    'debug_warning_text'    => 'Programmet körs i produktionsläge med debugging aktiverat. Detta kan exponera känslig data om ditt system är tillgängligt för omvärlden. Inaktivera felsökningsläge genom att ange värdet <code>APP_DEBUG</code> i filen <code>.env</code> till <code>false</code>.',
     'delete'  				=> 'Ta bort',
-    'delete_confirm'  		=> 'Är du säker på att du vill radera: föremål?',
-    'delete_confirm_no_undo' => 'Är du säker på att du vill ta bort :item? Detta kan inte ångras.',
+    'delete_confirm'  		=> 'Är du säker på att du vill radera :item?',
+    'delete_confirm_no_undo' => 'Är du säker på att du vill radera :item? Detta kan inte ångras.',
     'deleted'  				=> 'Raderad',
-    'delete_seats'  		=> 'Borttagna platser',
-    'deletion_failed'       => 'Borttagning misslyckades',
+    'delete_seats'  		=> 'Borttagna säten',
+    'deletion_failed'       => 'Borttagning misslyckad.',
     'departments'           => 'Avdelningar',
     'department'            => 'Avdelning',
-    'deployed'				=> 'Används',
-    'depreciation'			=> 'Avskrivning',
+    'deployed'				=> 'Levererad',
+    'depreciation'			=> 'Värdeminskning',
     'depreciations'         => 'Värdeminskning',
-    'depreciation_report'	=> 'Avskrivningsrapport',
+    'depreciation_report'	=> 'Värdeminskningsrapport',
     'details'               => 'Information',
-    'download'				=> 'Ladda ner',
+    'download'				=> 'Ladda ned',
     'download_all'		    => 'Ladda ned alla',
-    'editprofile'  			=> 'Ändra Din Profil',
+    'editprofile'  			=> 'Redigera din profil',
     'eol'					=> 'EOL',
     'email_domain'			=> 'E-postdomän',
-    'email_format'			=> 'E-postformat',
     'employee_number'       => 'Anställningsnummer',
     'email_domain_help'		=> 'Detta används för att generera e-postadresser vid import',
-    'error'				    => 'Fel',
+    'error'				    => 'Error',
     'exclude_archived'      => 'Exkludera arkiverade tillgångar',
     'exclude_deleted'       => 'Exkludera borttagna tillgångar',
     'example'				=> 'Exempel: ',
-    'filastname_format'			=> 'Första Initiala Efternamn (jsmith@example.com)',
-    'firstname_lastname_format'	=> 'Förnamn Efternamn (jane.smith@example.com)',
-    'firstname_lastname_underscore_format' => 'Förnamn Efternamn (jane.smith@example.com)',
-    'lastnamefirstinitial_format' =>  'Efternamn Första Initial (smithj@example.com)',
-    'firstintial_dot_lastname_format' => 'Första Initialen Efternamn (j.smith@example.com)',
-    'firstname_lastname_display'	=> 'Förnamn Efternamn (Jane Smith)',
-    'lastname_firstname_display'	=> 'Efternamn Förnamn (Smith Jane)',
-    'name_display_format'	=> 'Visningsformat för namn',
-    'first'					=> 'Först',
-    'firstnamelastname'     => 'Förnamn Efternamn (janesmith@example.com)',
-    'lastname_firstinitial' => 'Efternamn Första Initialen (smith_j@example.com)',
-    'firstinitial.lastname' => 'Första Initialen Efternamn (j.smith@example.com)',
-    'firstnamelastinitial'  => 'Efternamn Första Initialen (janes@example.com)',
-    'lastnamefirstname'      => 'Last Name First Name (smith.jane@example.com)',
-    'first_name'			=> 'Förnamn',
-    'first_name_format'		=> 'Förnamn (jane@example.com)',
+
     'files'                 => 'Filer',
     'file_name'				=> 'Fil',
     'file_type'             => 'Filtyp',
@@ -145,127 +137,140 @@ return [
     'file_upload'           => 'Ladda upp fil',
     'generate'				=> 'Generera',
     'generate_labels'       => 'Generera etiketter',
-    'github_markdown'      => 'Detta fält tillåter <a href="https://help.github.com/articles/github-flavored-markdown/">Github smaksatt markdown</a>.',
+    'github_markdown'      => 'Detta fält tillåter <a href="https://help.github.com/articles/github-flavored-markdown/">Github-genererad markdown</a>.',
     'groups'				=> 'Grupper',
-    'gravatar_email'        => 'Gravatar e-postadress',
+    'gravatar_email'        => 'E-postadress för Gravatar',
     'gravatar_url'          => '<a href="http://gravatar.com"><small>Ändra din avatar på Gravatar.com</small></a>.',
     'history'  			    => 'Historik',
     'history_for'  			=> 'Historik för',
     'id'  					=> 'ID',
     'image'                 => 'Bild',
-    'image_delete'         	=> 'Ta bort Bild',
+    'image_delete'         	=> 'Ta bort bild',
     'include_deleted'       => 'Inkludera borttagna tillgångar',
-    'image_upload'         	=> 'Ladda upp Bild',
-    'filetypes_accepted_help'    => 'Accepterad filtyp är :types. Max tillåten uppladdningsstorlek är :size.<unk> Accepterade filtyper är :types. Max tillåten uppladdningsstorlek är :size.',
-    'filetypes_size_help'   => 'Max tillåten uppladdningsstorlek är :size.',
-    'image_filetypes_help'  => 'Accepted filetypes are jpg, webp, png, gif, svg, and avif. Max upload size allowed is :size.',
+    'image_upload'         	=> 'Ladda upp bild',
+    'filetypes_accepted_help'    => 'Tillåtna filtyper är :types. Maximalt tillåten storlek är :size.|Tillåtna filtyper är :types. Maximalt tillåten uppladdningsstorlek är :size.',
+    'filetypes_size_help'   => 'Maximalt tillåten uppladdningsstorlek är :size.',
+    'image_filetypes_help'  => 'Tillåtna filtyper är jpg, webp, png, gif, svg och avif. Maximalt tillåten uppladdningsstorlek är :size.',
     'unaccepted_image_type'  => 'Denna bildfil kunde inte läsas. Godkända filtyper är jpg, webp, png, gif, och svg. Filens mimetyp är: :mimetype.',
     'import'         	    => 'Importera',
-    'import_this_file'      => 'Karta fält och bearbeta denna fil',
+    'import_this_file'      => 'Mappa fält och bearbeta denna fil',
     'importing'         	=> 'Importerar',
-    'importing_help'        => 'Du kan importera tillgångar, tillbehör, licenser, komponenter, förbrukningsvaror och användare via CSV-fil. <br><br>CSV bör vara komma-avgränsad och formaterad med rubriker som matchar de i <a href="https://snipe-it.readme.io/docs/importing" target="_new">ta prov CSVs i dokumentationen</a>.',
+    'importing_help'        => 'Du kan importera tillgångar, tillbehör, licenser, komponenter, förbrukningsvaror och användare via CSV-fil. <br><br>CSV-filen bör vara komma-avgränsad och formaterad med rubriker som matchar de i <a href="https://snipe-it.readme.io/docs/importing" target="_new">ta prov CSVs i dokumentationen</a>.',
     'import-history'        => 'Importera historik',
-    'asset_maintenance'        => 'Underhåll av tillgångar',
-    'asset_maintenance_report' => 'Asset Maintenance Report',
-    'asset_maintenances'       => 'Asset Maintenances',
-    'item'  				=> 'Artikel',
+    'asset_maintenance'        => 'Tillgångsunderhåll',
+    'asset_maintenance_report' => 'Tillgångsunderhållsrapport',
+    'asset_maintenances'       => 'Tillgångsunderhåll',
+    'item'  				=> 'Objekt',
     'item_name'             => 'Objektnamn',
     'import_file'  			=> 'importera CSV-fil',
-    'import_type'  			=> 'CSV importtyp',
-    'insufficient_permissions' => 'Otillräckliga behörigheter!',
+    'import_type'  			=> 'CSV-importtyp',
+    'insufficient_permissions' => 'Behörigheter saknas!',
     'kits'       			=> 'Fördefinierade paket',
     'language'				=> 'Språk',
     'last'					=> 'Sista',
     'last_login'            => 'Senaste inloggning',
     'last_name'             => 'Efternamn',
+    'firstname_lastname_display'	=> 'Förnamn + Efternamn (Jane Smith)',
+    'lastname_firstname_display'	=> 'Efternamn + Förnamn (Smith Jane)',
+    'name_display_format'	=> 'Visningsformat för namn',
+    'first'					=> 'Först',
+    'first_name'			=> 'Förnamn',
     'license'				=> 'Licens',
     'license_report'        => 'Licensrapport',
     'licenses_available'	=> 'Tillgängliga licenser',
     'licenses'				=> 'Licenser',
-    'list_all'				=> 'Lista Alla',
-    'loading'				=> 'Läser in... var god vänta....',
+    'list_all'				=> 'Visa alla',
+    'loading'				=> 'Läser in... var god vänta...',
     'lock_passwords'        => 'Detta fältvärde kommer inte att sparas i en demoinstallation.',
     'feature_disabled'      => 'Den här funktionen har inaktiverats för demoinstallationen.',
     'location'              => 'Plats',
-    'location_plural'        => 'Plats<unk> platser',
+    'location_plural'        => 'Plats|Platser',
     'locations'				=> 'Platser',
-    'logo_size'				=> 'Fyrkantiga logotyper ser bäst ut med Logo + Text. Logotypen maximal visningsstorlek är 50px hög x 500px bred.  ',
+    'logo_size'				=> 'Fyrkantiga logotyper syns tydligast med Logo + Text. Logotypens maximala visningsstorlek är 50px hög x 500px bred.  ',
     'logout'				=> 'Logga ut',
-    'lookup_by_tag'     => 'Lookup med tillgångslabel',
+    'lookup_by_tag'     => 'Sök via tillgångstagg',
     'maintenances'          => 'Underhåll',
     'manage_api_keys'       => 'Hantera API-nycklar',
     'manufacturer'			=> 'Tillverkare',
     'manufacturers'			=> 'Tillverkare',
-    'markdown'				=> 'Detta fält tillåter <a href="https://help.github.com/articles/github-flavored-markdown/">Github smaksatt markdown</a>.',
-    'min_amt'				=> 'Min. ANTAL',
-    'min_amt_help'          => 'Minsta antal objekt som ska vara tillgängliga innan en varning utlöses. Lämna Min. QTY tomt om du inte vill få varningar för lågt lager.',
-    'model_no'				=> 'modell nr.',
+    'markdown'				=> 'Detta fält tillåter <a href="https://help.github.com/articles/github-flavored-markdown/">Github-genererad markdown</a>.',
+    'min_amt'				=> 'Minsta antal',
+    'min_amt_help'          => 'Minsta antal objekt som ska vara tillgängliga innan en varning genereras. Lämna "Min. antal" tomt om du inte vill få varningar för lågt lager.',
+    'model_no'				=> 'Modellnr.',
     'months'				=> 'månader',
     'moreinfo'				=> 'Mer information',
     'name'					=> 'Namn',
     'new_password'          => 'Nytt lösenord',
     'next'					=> 'Nästa',
     'next_audit_date'		=> 'Nästa inventeringsdatum',
-    'next_audit_date_help'  => 'If you use auditing in your organization, this is usually automatically calculated based on the asset&apos;s last audit date and audit frequency (in <code>Admin Settings &gt; Alerts</code>) and you can leave this blank. You can manually set this date here if you need to, but it must be later than the last audit date. ',
-    'audit_images_help'     => 'You can find audit images in the asset\'s history tab.',
+    'next_audit_date_help'  => 'Om du använder inventeringsverktyget i din verksamhet så beräknas detta vanligtvis automatiskt baserat på tillgången&apos;s senaste inventeringsdatum och inventeringsintervall (i <code>Admininställningar &gt; Aviseringar</code>) och du kan således lämna detta tomt. Du kan manuellt ställa in detta datum här om du behöver, men det måste vara senare än det senaste inventeringsdatumet. ',
+    'audit_images_help'     => 'Du kan hitta bilder för inventering i tillgångens historikflik.',
     'no_email'              => 'Ingen e-postadress kopplad till den här användaren',
-    'last_audit'		    => 'Senaste inventeringen',
+    'last_audit'		    => 'Senaste inventering',
     'new'					=> 'ny!',
-    'no_depreciation'		=> 'Ingen avskrivning',
+    'no_depreciation'		=> 'Ingen värdeminskning',
     'no_results'			=> 'Inga resultat.',
     'no'  					=> 'Nej',
     'notes'  				=> 'Anteckningar',
-    'order_number'          => 'Order Nummer',
+    'note_added'            => 'Notering tillagd',
+    'options'				=> 'Alternativ',
+    'preview'				=> 'Förhandsvisa',
+    'add_note'              => 'Lägg till notering',
+    'note_edited'            => 'Notering redigerad',
+    'edit_note'              => 'Redigera notering',
+    'note_deleted'            => 'Notering borttagen',
+    'delete_note'              => 'Ta bort notering',
+    'order_number'          => 'Ordernummer',
     'only_deleted'          => 'Endast borttagna tillgångar',
     'page_menu'				=> 'Visar _MENU_ objekt',
     'pagination_info'		=> 'Visar _START_ till _END_ av _TOTAL_ objekt',
     'pending'				=> 'Väntande',
-    'people'				=> 'Personer',
+    'people'				=> 'Användare',
     'per_page'				=> 'Resultat per sida',
     'previous'				=> 'Föregående',
     'processing'			=> 'Bearbetar',
     'profile'				=> 'Din profil',
-    'purchase_cost'                              => 'Köpkostnad',
+    'purchase_cost'                              => 'Inköpspris',
     'purchase_date'         => 'Inköpsdatum',
     'qty'		            => 'Antal',
     'quantity'		        => 'Antal',
-    'quantity_minimum'      => 'Du har :count objekt under eller nästan under minsta kvantitet',
-    'quickscan_checkin'  	=> 'Snabb incheckning',
+    'quantity_minimum'      => 'Du har ett objekt under eller nästan under minsta lagervarningsnivå|Du har :count objekt under eller nästan under minsta lagervarningsnivå',
+    'quickscan_checkin'  	=> 'Snabbincheckning',
     'quickscan_checkin_status'  	=> 'Incheckningsstatus',
-    'ready_to_deploy'		=> 'Redo att distribuera',
+    'ready_to_deploy'		=> 'Redo för leverans',
     'recent_activity'		=> 'Senaste aktivitet',
     'remaining'             => 'Återstående',
-    'remove_company'        => 'Ta bort företagsföreningen',
+    'remove_company'        => 'Ta bort företagskoppling',
     'reports'				=> 'Rapporter',
     'restored'				=> 'återställd',
     'restore'				=> 'Återställ',
     'requestable_models'    => 'Begärbara modeller',
-    'requestable_items'     => 'Requestable Items',
+    'requestable_items'     => 'Begärbara objekt',
     'requested'				=> 'Begärda',
     'requested_date'        => 'Begärt datum',
     'requested_assets'      => 'Begärda tillgångar',
     'requested_assets_menu' => 'Begärda tillgångar',
-    'request_canceled'      => 'Förfrågan annulleras',
-    'request_item'          => 'Request this item',
-    'external_link_tooltip' => 'External link to',
+    'request_canceled'      => 'Förfrågan avbruten',
+    'request_item'          => 'Begär detta objekt',
+    'external_link_tooltip' => 'Extern länk till',
     'save'  				=> 'Spara',
     'select_var'            => 'Välj :thing... ', // this will eventually replace all of our other selects
     'select'				=> 'Välj',
     'select_all'            => 'Markera alla',
     'search'				=> 'Sök',
     'select_category'       => 'Välj en kategori',
-    'select_datasource' => 'Välj en datakurs',
+    'select_datasource' => 'Välj en datakälla',
     'select_department'     => 'Välj en avdelning',
-    'select_depreciation'	=> 'Välj en avskrivningstyp',
+    'select_depreciation'	=> 'Välj en värdeminskningstyp',
     'select_location'		=> 'Välj en plats',
-    'select_manufacturer'	=> 'Välj Tillverkare',
-    'select_model'			=> 'Välj Modell',
-    'select_supplier'		=> 'Välj Leverantör',
-    'select_user'			=> 'Välj Användare',
-    'select_date'			=> 'Välj datum (ÅÅÅÅ-MM-DD)',
-    'select_statuslabel'	=> 'Välj Status',
+    'select_manufacturer'	=> 'Välj tillverkare',
+    'select_model'			=> 'Välj modell',
+    'select_supplier'		=> 'Välj leverantör',
+    'select_user'			=> 'Välj användare',
+    'select_date'			=> 'Ange datum (ÅÅÅÅ-MM-DD)',
+    'select_statuslabel'	=> 'Välj status',
     'select_company'    	=> 'Välj företag',
-    'select_asset'    		=> 'Välj Asset',
+    'select_asset'    		=> 'Välj tillgång',
     'settings'				=> 'Inställningar',
     'show_deleted'  		=> 'Visa borttagna',
     'show_current'  		=> 'Visa nuvarande',
@@ -274,70 +279,72 @@ return [
     'signed_off_by'         => 'Signerad av',
     'skin'       			=> 'Skal',
     'webhook_msg_note'        => 'Ett meddelande kommer att skickas via webhook',
-    'webhook_test_msg'        => 'Hej! Ser ut som din :app integration med Snipe-IT fungerar!',
+    'webhook_test_msg'        => 'Snyggt! Det ser ut som din :app integrering med Snipe-IT fungerar!',
     'some_features_disabled' => 'DEMO MODE: Vissa funktioner är inaktiverade för den här installationen.',
-    'site_name'				=> 'Sidnamn',
-    'state'  				=> 'stat',
+    'site_name'				=> 'Webbplatsnamn',
+    'state'  				=> 'Län',
     'status_labels'			=> 'Statusetiketter',
+    'status_label'			=> 'Statusetikett',
     'status'    			=> 'Status',
     'accept_eula'           => 'Acceptansavtal',
+    'show_or_hide_eulas' => 'Visa/Dölj EULAs',
     'supplier'              => 'Leverantör',
     'suppliers'  			=> 'Leverantörer',
     'sure_to_delete'        => 'Är du säker på att du vill radera',
-    'sure_to_delete_var'    => 'Är du säker på att du vill radera?',
-    'delete_what'           => 'Ta bort objekt',
-    'submit'				=> 'Lämna',
+    'sure_to_delete_var'    => 'Är du säker på att du vill radera :item?',
+    'delete_what'           => 'Ta bort :item',
+    'submit'				=> 'Bekräfta',
     'target'                => 'Mål',
-    'time_and_date_display' => 'Tid och datumvisning',
-    'total_assets'			=> 'totala tillgångar',
-    'total_licenses'		=> 'totala licenser',
-    'total_accessories'		=> 'Totala tillbehör',
-    'total_consumables'		=> 'totala förbrukningsvaror',
+    'time_and_date_display' => 'Tid- och datumvisning',
+    'total_assets'			=> 'Tillgångar',
+    'total_licenses'		=> 'Licenser',
+    'total_accessories'		=> 'Tillbehör',
+    'total_consumables'		=> 'Förbrukningsvaror',
     'type'  				=> 'Typ',
-    'undeployable'			=> 'Ej tillgängliga',
-    'unknown_admin'			=> 'Okänd Admin',
-    'username_format'		=> 'Användarnamn Format',
+    'undeployable'			=> 'Otillgängliga tillgångar',
+    'unknown_admin'			=> 'Okänd Administratör',
     'username'              => 'Användarnamn',
-    'update'                => 'Uppdatering',
+    'update'                => 'Uppdatera',
+    'updating_item' => 'Uppdaterar :item',
     'upload_filetypes_help'      => 'Tillåtna filtyper är png, gif, jpg, jpeg, doc, docx, pdf, xls, txt, lic, zip och rar. Max tillåten uppladdningsstorlek är: storlek.',
     'uploaded'              => 'Uppladdad',
     'user'					=> 'Användare',
     'accepted'			    => 'accepterad',
-    'declined'			    => 'tackade nej',
-    'declined_note'         => 'Declined Notes',
+    'declined'			    => 'nekad',
+    'declined_note'         => 'Nekade noteringar',
     'unassigned'            => 'Ej tilldelad',
     'unaccepted_asset_report' => 'Oaccepterade tillgångar',
     'users'                 => 'Användare',
     'viewall'				=> 'Visa alla',
-    'viewassets'  			=> 'Visa Tilldelade tillgångar',
-    'viewassetsfor'         => 'Visa tillgångar för',
+    'viewassets'  			=> 'Visa tilldelade tillgångar',
+    'viewassetsfor'         => 'Visa tillgångar för :name',
     'website'               => 'Webbsida',
-    'welcome'				=> 'Välkommen, namn',
+    'welcome'				=> 'Välkommen :name!',
     'years'					=> 'år',
     'yes' 					=> 'Ja',
-    'zip'  					=> 'Blixtlås',
-    'noimage'				=> 'Ingen bild uppladdad eller bild hittades inte.',
+    'zip'  					=> 'Zippa',
+    'noimage'				=> 'Ingen bild uppladdad eller så hittades ingen bild.',
     'file_does_not_exist'   => 'Den begärda filen finns inte på servern.',
     'file_upload_success'   => 'Filuppladdningen lyckades!',
-    'no_files_uploaded'     => 'Filuppladdningen lyckades!',
-    'token_expired'         => 'Din formulärperiod har löpt ut. Var god försök igen.',
+    'no_files_uploaded'     => 'Inga filer laddades upp.',
+    'token_expired'         => 'Din session har löpt ut. Var god försök igen.',
     'login_enabled'         => 'Inloggning aktiverad',
     'audit_due'             => 'Nästa inventering',
-    'audit_due_days'        => 'Tillgångar som ska granskas inom :days Day|Tillgångar som ska granskas inom :days Days',
-    'checkin_due'           => 'Klar för incheckning',
+    'audit_due_days'        => '{}Assets Due or Overdue for Audit|[1]Assets Due or Overdue for Audit Within a Day|[2,*]Assets Due or Overdue for Audit Within :days Days',
+    'checkin_due'           => 'Förväntas checkas in',
     'checkin_overdue'       => 'Förfallen för incheckning',
-    'checkin_due_days'      => 'Tillgångar som förfaller för incheckning inom :days Day|Tillgångar som förfaller för incheckning inom :days Days',
-    'audit_overdue'         => 'Förfallen inventering',
+    'checkin_due_days'      => '{}Due for Checkin|[1]Assets Due for Checkin Within :days Day|[2,*]Assets Due for Checkin Within :days Days',
+    'audit_overdue'         => 'Förfallen för inventering',
     'accept'                => 'Acceptera :asset',
     'i_accept'              => 'Jag accepterar',
     'i_decline'             => 'Jag nekar',
     'accept_decline'        => 'Acceptera/Neka',
-    'sign_tos'              => 'Skriv under nedan för att ange att du godkänner användarvillkoren:',
+    'sign_tos'              => 'Signera nedan för att godkänna användarvillkoren:',
     'clear_signature'       => 'Rensa signatur',
-    'show_help'             => 'Visa hjälp',
-    'hide_help'             => 'Dölj hjälp',
+    'show_help'             => 'Visa hjälpsektion',
+    'hide_help'             => 'Dölj hjälpsektion',
     'view_all'              => 'visa alla',
-    'hide_deleted'          => 'Visa Borttagna',
+    'hide_deleted'          => 'Visa borttagna',
     'email'                 => 'E-post',
     'do_not_change'         => 'Ändra inte',
     'bug_report'            => 'Rapportera ett fel',
@@ -348,20 +355,20 @@ return [
     'setup_step_4'          => 'Steg 4',
     'setup_config_check'    => 'Konfigurationskontroll',
     'setup_create_database' => 'Skapa databastabeller',
-    'setup_create_admin'    => 'Skapa admin-användare',
-    'setup_done'            => 'Slutförd!',
-    'bulk_edit_about_to'    => 'Du håller på att redigera följande: ',
-    'checked_out'           => 'Låna ut',
-    'checked_out_to'        => 'Låna ut till',
+    'setup_create_admin'    => 'Skapa administratör',
+    'setup_done'            => 'Slutfört!',
+    'bulk_edit_about_to'    => 'Du är på väg att redigera följande: ',
+    'checked_out'           => 'Utcheckad',
+    'checked_out_to'        => 'Utcheckad till',
     'fields'                => 'Fält',
-    'last_checkout'         => 'Senaste utlånad',
-    'due_to_checkin'        => 'Följande :count objekt ska lämnas in snart:',
-    'expected_checkin'      => 'Förväntad inlämningsdatum',
-    'reminder_checked_out_items' => 'Detta är en påminnelse om för objekt som för närvarande är utlånad till dig. Om du tycker att denna lista är felaktig (något saknas, eller något visas här som du tror att du aldrig fått), vänligen maila :reply_to_name på :reply_to_adress.',
+    'last_checkout'         => 'Senast utcheckad',
+    'due_to_checkin'        => 'Följande :count objekt förfaller snart för incheckning:',
+    'expected_checkin'      => 'Förväntat incheckningsdatum',
+    'reminder_checked_out_items' => 'Detta är en påminnelse om objekt som för närvarande är utcheckade till dig. Om du anser att denna lista är felaktig (något saknas, eller något visas här som du anser att du aldrig fått), vänligen sänd ett e-postmeddelande till :reply_to_name på :reply_to_adress.',
     'changed'               => 'Ändrad',
     'to'                    => 'Till',
-    'report_fields_info'    => '<p>Välj de fält du vill inkludera i din anpassade rapport och klicka på Generera. Filen (custom-asset-report-YYY-mm-dd.csv) laddas ner automatiskt, och du kan öppna den i Excel.</p>
-            <p>Om du vill exportera endast vissa tillgångar, använd alternativen nedan för att finjustera dina resultat.</p>',
+    'report_fields_info'    => '<p>Välj de fält du vill inkludera i din anpassade rapport och klicka på Generera. Filen (custom-asset-report-YYY-mm-dd.csv) laddas ned automatiskt varvid du kan öppna den i Excel.</p>
+            <p>Om du endast vill exportera vissa tillgångar; använd alternativen nedan för att finjustera dina resultat.</p>',
     'range'                 => 'Intervall',
     'bom_remark'            => 'Lägg till en BOM (byte-order mark) till denna CSV',
     'improvements'          => 'Förbättringar',
@@ -369,68 +376,71 @@ return [
     'permissions'           => 'Behörigheter',
     'managed_ldap'          => '(Hanteras via LDAP)',
     'export'                => 'Exportera',
-    'ldap_sync'             => 'LDAP Sync',
-    'ldap_user_sync'        => 'LDAP användarsynkronisering',
+    'ldap_sync'             => 'LDAP-synkronisering',
+    'ldap_user_sync'        => 'LDAP-användarsynkronisering',
     'synchronize'           => 'Synkronisera',
-    'sync_results'          => 'Synkronisering Resultat',
-    'license_serial'        => 'Seriell/produktnyckel',
+    'sync_results'          => 'Synkroniseringsresultat',
+    'license_serial'        => 'Serie/produktnyckel',
     'invalid_category'      => 'Ogiltig eller saknad kategori',
     'invalid_item_category_single' => 'Ogiltig eller saknad :type kategori. Vänligen uppdatera kategorin för denna :type för att inkludera en giltig kategori innan du checkar ut.',
     'dashboard_info'        => 'Detta är din instrumentpanel. Det finns många som det, men den här är din.',
-    '60_percent_warning'    => '60% Slutför (varning)',
+    '60_percent_warning'    => '60% Slutförd (varning)',
     'dashboard_empty'       => 'Det verkar som om du inte har lagt till något ännu, så vi har inte något häftigt att visa. Kom igång genom att lägga till några tillgångar, tillbehör, förbrukningsartiklar eller licenser nu!',
     'new_asset'             => 'Ny tillgång',
     'new_license'           => 'Ny licens',
     'new_accessory'         => 'Nytt tillbehör',
     'new_consumable'        => 'Ny förbrukningsvara',
-    'collapse'              => 'Fäll ihop',
-    'assigned'              => 'Tilldelat',
+    'new_component'         => 'New Component',
+    'new_user'              => 'New User',
+    'collapse'              => 'Dölj',
+    'assigned'              => 'Tilldelad',
     'asset_count'           => 'Antal tillgångar',
     'accessories_count'     => 'Antal tillbehör',
     'consumables_count'     => 'Antal förbrukningsvaror',
     'components_count'      => 'Antal komponenter',
     'licenses_count'        => 'Antal licenser',
     'notification_error'    => 'Fel',
-    'notification_error_hint' => 'Vänligen kontrollera formuläret nedan för fel',
+    'notification_error_hint' => 'Vänligen kontrollera de fel som uppstått i formuläret nedan',
     'notification_bulk_error_hint' => 'Följande fält hade valideringsfel och redigerades inte:',
-    'notification_success'  => 'Klart',
+    'notification_success'  => 'Lyckades',
     'notification_warning'   => 'Varning',
     'notification_info'      => 'Info',
     'asset_information'     => 'Information om tillgång',
     'model_name'            => 'Modellnamn',
-    'asset_name'            => 'Tillgångsnamn',
+    'asset_name'            => 'Företagsnamn',
     'consumable_information' => 'Förbrukningsinformation:',
     'consumable_name'       => 'Namn på förbrukningsvara:',
     'accessory_information' => 'Information om tillgång:',
     'accessory_name'       => 'Tillbehörsnamn:',
-    'clone_item'            => 'Klona objekt',
-    'checkout_tooltip' => 'Låna utdetta objekt',
-    'checkin_tooltip' => 'Check this item in so that it is available for re-issue, re-imaging, etc',
-    'checkout_user_tooltip' => 'Låna utdetta objekt till en användare',
-    'checkin_to_diff_location' => 'You can choose to check this asset in to a location other than this asset\'s default location of :default_location if one is set',
+    'clone_item'            => 'Kopiera objekt',
+    'checkout_tooltip' => 'Checka ut detta objekt',
+    'checkin_tooltip' => 'Checka in detta objekt så den blir tillgänglig för återanvändning, återskapning, osv',
+    'checkout_user_tooltip' => 'Checka ut detta objekt till en användare',
+    'checkin_to_diff_location' => 'Du kan välja att checka in denna tillgång till en annan plats än tillgångens standardplats (:default_location) om en sådan är satt',
     'maintenance_mode'      => 'Tjänsten är för tillfället inte tillgänglig för systemuppdateringar. Kontrollera igen senare.',
     'maintenance_mode_title' => 'Systemet är tillfälligt otillgängligt',
     'ldap_import'           => 'Användarlösenord bör inte hanteras av LDAP. (Detta gör att du kan skicka bortglömda lösenordsförfrågningar.)',
     'purge_not_allowed'     => 'Rensning av raderad data har inaktiverats i .env-filen. Kontakta support eller din systemadministratör.',
-    'backup_delete_not_allowed'     => 'Borttagning av säkerhetskopior har inaktiverats i .env-filen. Kontakta support eller systemadministratör.',
+    'backup_delete_not_allowed'     => 'Borttagning av säkerhetskopior har inaktiverats i .env-filen. Kontakta support eller din systemadministratör.',
     'additional_files'           => 'Ytterligare filer',
-    'shitty_browser'        => 'Ingen signatur upptäckt. Om du använder en äldre webbläsare, använd en modernare webbläsare för att slutföra din tillgångs godkännande.',
+    'shitty_browser'        => 'Ingen signatur upptäckt. Om du använder en äldre webbläsare, använd då istället en modernare webbläsare för att slutföra din tillgångs godkännande.',
     'bulk_soft_delete'      =>'Samt ta bort dessa användare. Deras tillgångshistorik kommer att förbli intakt om inte/tills du rensar bort borttagna poster i administratörsinställningarna.',
     'bulk_checkin_delete_success' => 'Dina valda användare har tagits bort och deras objekt har checkats in.',
     'bulk_checkin_success' => 'Objekten för de valda användarna har checkats in.',
-    'set_to_null'           => 'Ta bort värden för denna tillgång|Ta bort värden för alla :asset_count tillgångar ',
+    'set_to_null'           => 'Ta bort värden för detta val|Ta bort värden för alla :selection_count val ',
     'set_users_field_to_null'  => 'Ta bort :field värden för denna användare|Ta bort :field värden för alla :user_count användare ',
     'na_no_purchase_date'   => 'N/A - Inget inköpsdatum angivet',
     'assets_by_status'      => 'Tillgångar efter status',
     'assets_by_status_type'      => 'Tillgångar efter statustyp',
-    'pie_chart_type'        => 'Instrumentpanelens cirkeldiagrams typ',
+    'pie_chart_type'        => 'Instrumentpanelens cirkeldiagram',
     'hello_name'            => 'Hej, :name!',
-    'unaccepted_profile_warning'   => 'Du har :count objekt som kräver godkännande. Klicka här för att acceptera eller avböja dem',
+    'unaccepted_profile_warning'   => 'Du har ett objekt som kräver godkännande. Klicka här för att acceptera eller avböja det | Du har :count objekt som kräver godkännande. Klicka här för att acceptera eller avböja dem',
     'start_date'            => 'Startdatum',
     'end_date'            => 'Slutdatum',
     'alt_uploaded_image_thumbnail' => 'Uppladdad miniatyrbild',
     'placeholder_kit'       => 'Välj ett kit',
     'file_not_found'        => 'Filen kan inte hittas',
+    'log_record_not_found'  => 'Inga poster för den loggposten hittades.',
     'preview_not_available' => '(ingen förhandsgranskning)',
     'setup'                 => 'Ställ in',
     'pre_flight'            => 'Förtest',
@@ -444,111 +454,176 @@ return [
     'log_does_not_exist'    => 'Det finns inga matchande loggposter.',
     'merge_users'           => 'Slå ihop användare',
     'merge_information' =>  'Detta kommer att slå samman :count användare till en enda användare. Välj användaren du vill slå samman de andra med nedan, varpå relaterade tillgångar, licenser, etc. kommer att flyttas till den valda användaren och övriga användare markeras som raderade.',
-    'warning_merge_information' => 'Denna åtgärd kan INTE ångras och bör ENDAST användas när du behöver slå samman användare på grund av en dålig import eller synkronisering. Se till att köra en säkerhetskopia först.',
+    'warning_merge_information' => 'Denna åtgärd kan INTE ångras och bör ENDAST användas när du behöver slå ihop användare på grund av en felaktig import eller synkronisering. Se till att ta en säkerhetskopia först.',
     'no_users_selected'     => 'Inga användare valda',
     'not_enough_users_selected'     => 'Minst :count användare måste väljas',
-    'merge_success'         => ':count användare slogs samman till :into_username!',
+    'merge_success'         => ':count användare slogs ihop till :into_username!',
     'merged'                => 'sammanfogad',
-    'merged_log_this_user_into' => 'Sammanfogade denna användare (ID :to_id - :to_username) till användar-ID :from_id (:from_username) ',
+    'merged_log_this_user_into' => 'Sammanfogat användare (ID :to_id - :to_username) till användar-ID :from_id (:from_username) ',
     'merged_log_this_user_from' => 'Sammanfogat användar-ID :from_id (:from_username) till denna användare (ID :to_id - :to_username)',
     'clear_and_save'            => 'Rensa & Spara',
     'update_existing_values'    => 'Uppdatera befintliga värden?',
-    'auto_incrementing_asset_tags_disabled_so_tags_required' => 'Automatiskt ökande tillgångsmarkeringar är inaktiverad, så alla rader måste ha kolumnen "Asset Tag" ifylld.',
-    'auto_incrementing_asset_tags_enabled_so_now_assets_will_be_created' => 'Notera: Generering av automatiskt ökande tillgångsmarkeringar är aktiverad så tillgångar kommer att skapas för rader som inte har "Asset Tag" ifyllt. Rader där "Asset Tag" är ifylld kommer att uppdateras med den angivna informationen.',
-    'send_welcome_email_to_users'   => ' Skicka välkomstmail för nya användare?',
+    'auto_incrementing_asset_tags_disabled_so_tags_required' => 'Automatiskt ökande tillgångstaggar är inaktiverat, således måste alla rader ha kolumnen "Tillgångstagg" ifyllt.',
+    'auto_incrementing_asset_tags_enabled_so_now_assets_will_be_created' => 'Notera: Generering av automatiskt ökande tillgångstaggar är aktiverat, varvid tillgångar kommer att skapas för rader som inte har "Tillgångstagg" ifyllt. Rader med "Tillgångstagg" ifyllt kommer att uppdateras med den angivna informationen.',
+    'send_welcome_email_to_users'   => ' Skicka välkomstmejl för nya användare?',
     'send_email'                => 'Skicka e-post',
     'call'                      => 'Ring nummer',
     'back_before_importing'     => 'Säkerhetskopiera innan import?',
-    'csv_header_field'          => 'CSV Header Fält',
-    'import_field'              => 'Import Fält',
-    'sample_value'              => 'Exempel värde',
+    'csv_header_field'          => 'CSV huvudfält',
+    'import_field'              => 'Importfält',
+    'sample_value'              => 'Exempelvärde',
     'no_headers'                => 'Inga kolumner hittades',
     'error_in_import_file'      => 'Det gick inte att läsa CSV-filen: :error',
-    'errors_importing'          => 'Några fel inträffade vid import: ',
+    'errors_importing'          => 'Fel inträffade vid import: ',
     'warning'                   => 'VARNING: :warning',
     'success_redirecting'       => '"Lyckades... Omdirigerar.',
-    'cancel_request'            => 'Avbryt den här begäran om objekt',
+    'cancel_request'            => 'Avbryt objektbegäran',
     'setup_successful_migrations' => 'Dina databastabeller har skapats',
-    'setup_migration_output' => 'Migrationsresultat:',
+    'setup_migration_output' => 'Migreringssresultat:',
     'setup_migration_create_user' => 'Nästa: Skapa användare',
-    'importer_generic_error'    => 'Din filimport är klar, men vi fick ett fel. Detta orsakas vanligtvis av tredje parts API strypning från en anmälan webhook (såsom Slack) och skulle inte ha stört själva importen, men du bör bekräfta detta.',
+    'importer_generic_error'    => 'Din filimport är klar, men ett fel uppstod. Detta orsakas vanligtvis av tredjeparts API-throttling från en notifikationswebhook (såsom Slack) och bör inte ha stört själva importen, men du bör kontrollera detta.',
     'confirm' => 'Bekräfta',
     'autoassign_licenses' => 'Auto-tilldela licenser',
-    'autoassign_licenses_help' => 'Tillåt den här användaren att få licencer tilldelade via bulk-tilldelnings gränssnittet eller via cli verktyg.',
-    'autoassign_licenses_help_long' => 'Detta gör det möjligt för en användare att ha licenser tilldelade via bulk-tilldela licens UI eller cli verktyg. (Du kanske till exempel inte vill att entreprenörerna ska tilldelas en licens som du skulle tillhandahålla till endast personalmedlemmar. Du kan fortfarande individuellt tilldela licenser till dessa användare, men de kommer inte att inkluderas i Tilldela licens för alla användarfunktioner.)',
-    'no_autoassign_licenses_help' => 'Inkludera inte användare för bulk-tilldelning genom licens UI eller cli verktyg.',
+    'autoassign_licenses_help' => 'Tillåt den här användaren att få licencer tilldelade via masstilldelningsgränssnittet för licenser eller via cli verktyg.',
+    'autoassign_licenses_help_long' => 'Detta gör det möjligt för en användare att ha licenser tilldelade via masstilldelningsgränssnittet eller cli verktyg. (Du kanske till exempel inte vill att tredje part ska tilldelas en licens som du skulle tillhandahållit en andra part. Du kan fortfarande individuellt tilldela licenser till dessa användare, men de kommer inte att inkluderas i Tilldela licens för alla användarfunktioner.)',
+    'no_autoassign_licenses_help' => 'Inkludera inte användare för masstilldelning genom licensgränssnittet eller cli verktyg.',
     'modal_confirm_generic'      => 'Är du säker?',
-    'cannot_be_deleted'      => 'Det här objektet kan inte raderas',
+    'cannot_be_deleted'      => 'Detta objekt kan inte raderas',
     'cannot_be_edited'      => 'Detta objekt kan inte redigeras.',
-    'undeployable_tooltip'      => 'Det här objektet kan inte checkas ut. Kolla antalet kvar.',
+    'undeployable_tooltip'      => 'Detta objekt kan inte checkas ut. Kontrollera antal kvar i lager.',
     'serial_number'        => 'Serienummer',
     'item_notes' => ':item noteringar',
     'item_name_var' => ':item namn',
     'error_user_company' => 'Checkout målbolag och tillgångsbolag matchar inte',
-    'error_user_company_accept_view' => 'En tillgång tilldelad till dig tillhör ett annat företag så att du inte kan acceptera eller neka det, vänligen kontrollera med din chef',
+    'error_user_company_accept_view' => 'En tillgång tilldelad till dig tillhör ett annat företag så att du inte kan acceptera eller neka det, vänligen kontrollera detta med din ansvarige',
     'importer' => [
-        'checked_out_to_fullname' => 'Utcheckat till: Fullständigt namn',
+        'checked_out_to_fullname' => 'Utcheckad till: Fullständigt namn',
         'checked_out_to_first_name' => 'Utcheckad till: Förnamn',
         'checked_out_to_last_name' => 'Utcheckad till: Efternamn',
         'checked_out_to_username' => 'Utcheckad till: Användarnamn',
         'checked_out_to_email' => 'Utcheckad till: E-post',
         'checked_out_to_tag' => 'Utcheckad till: Tillgångstagg',
-        'manager_first_name' => 'Chefens förnamn',
-        'manager_last_name' => 'Chefens efternamn',
-        'manager_full_name' => 'Chefens fullständiga namn',
-        'manager_username' => 'Chefens användarnamn',
+        'manager_first_name' => 'Ansvariges förnamn',
+        'manager_last_name' => 'Ansvariges efternamn',
+        'manager_full_name' => 'Ansvariges fullständiga namn',
+        'manager_username' => 'Ansvariges användarnamn',
         'checkout_type' => 'Utcheckningstyp',
-        'checkout_location' => 'Utcheckad till plats',
-        'image_filename' => 'Bild filnamn',
+        'checkout_location' => 'Checka ut till plats',
+        'image_filename' => 'Bildens filnamn',
         'do_not_import'     => 'Importera inte',
         'vip' => 'VIP',
         'avatar'  => 'Avatar',
         'gravatar' => 'Gravatar e-post',
         'currency' => 'Valuta',
         'address2' => 'Adressrad 2',
-        'import_note' => 'Importerad med csv importerare',
+        'import_note' => 'Importerad med csv-importerare',
     ],
-    'remove_customfield_association' => 'Remove this field from the fieldset. This will not delete the custom field, only this field\'s association with this fieldset.',
-    'checked_out_to_fields' => 'Checked Out To Fields',
+    'remove_customfield_association' => 'Ta bort detta fält från fältuppsättningen. Detta kommer inte att ta bort det anpassade fältet, bara fältets association med denna fältuppsättning.',
+    'checked_out_to_fields' => 'Utcheckad till fält',
     'percent_complete' => '% slutförd',
-    'uploading' => 'Uppladdar... ',
-    'upload_error' => 'Fel vid uppladdning av fil. Kontrollera att det inte finns några tomma rader och att inga kolumnnamn dupliceras.',
+    'uploading' => 'Laddar upp... ',
+    'upload_error' => 'Error uploading file. Please check that you have no empty rows or duplicated column names in your CSV, and that the server permissions allow uploads.',
     'copy_to_clipboard' => 'Kopiera till urklipp',
     'copied' => 'Kopierad!',
-    'status_compatibility' => 'Om tillgångar redan tilldelats kan de inte ändras till en icke distribuerbar statustyp och denna värdeändring kommer att hoppas över.',
-    'rtd_location_help' => 'Detta är platsen för tillgången när det inte är checkat ut',
+    'status_compatibility' => 'Om tillgångar redan tilldelats kan de inte ändras till en otillgänglig statustyp varvid denna värdeändring kommer att ignoreras.',
+    'rtd_location_help' => 'Detta är platsen för tillgången när den inte är utcheckad',
     'item_not_found' => ':item_type ID :id finns inte eller har tagits bort',
     'action_permission_denied' => 'Du har inte behörighet att :action :item_type ID :id',
     'action_permission_generic' => 'Du har inte behörighet att :action denna :item_type',
     'edit' => 'ändra',
-    'action_source' => 'Åtgärd Källa',
+    'action_source' => 'Åtgärdskälla',
     'or' => 'eller',
     'url'                   => 'URL',
-    'edit_fieldset' => 'Redigera fältfält och alternativ',
-    'permission_denied_superuser_demo' => 'Åtkomst nekad. Du kan inte uppdatera användarinformation för superadministratörer på demo.',
+    'edit_fieldset' => 'Redigera fältuppsättningens fält och alternativ',
+    'permission_denied_superuser_demo' => 'Åtkomst nekad. Du kan inte uppdatera användarinformation för huvudanvändare i demomiljö.',
     'pwd_reset_not_sent' => 'Användaren är inte aktiverad, är LDAP-synkroniserad, eller har ingen e-postadress',
-    'error_sending_email' => 'Fel vid sändning av e-post',
-    'sad_panda' => 'Sad panda. You are not authorized to do the thing. Maybe <a href=":link">return to the dashboard</a>, or contact your administrator.',
+    'error_sending_email' => 'Fel vid e-postsändning',
+    'sad_panda' => 'Sad panda. Du har inte behörighet att göra det du vill. <a href=":link">Återgå till instrumentpanelen</a> eller kontakta din administratör.',
     'bulk' => [
             'delete' =>
                 [
-                'header' => 'Bulk Ta bort :object_type',
-                'warn'   =>  'Du håller på att ta bort ett :object_type<unk> Du håller på att ta bort :count :object_type',
-                'success'   =>  ':object_type har tagits bort framgångsrikt|:count :object_type har tagits bort framgångsrikt',
+                'header' => 'Massradera :object_type',
+                'warn'   =>  'Du är på väg att ta bort ett :object_type|Du är påväg att ta bort :count :object_type',
+                'success'   =>  ':object_type har tagits bort|:count :object_type har tagits bort',
                 'error'   =>  'Kunde inte ta bort :object_type',
-                'nothing_selected'   =>  'Inga :object_type valda - inget att göra',
+                'nothing_selected'   =>  'Inga :object_type valda - inget mer att utföra',
                 'partial'   =>  'Borttagna :success_count :object_type, men :error_count :object_type kunde inte tas bort',
              ],
     ],
     'no_requestable' => 'Det finns inga begärbara tillgångar eller tillgångsmodeller.',
 
     'countable' => [
-        'accessories'  => ':count Tillbehör :count Tillbehör',
-        'assets'  => ':count Tillgång:count Tillgångar',
-        'licenses'  => ':count License<unk> :count Licenser',
-        'license_seats'  => ':count License Seat<unk> :count License Seats',
-        'consumables'  => ':count Förbrukningsmedel<unk> :count Förbrukningsvaror',
+        'accessories'  => ':count Tillbehör|:count Tillbehör',
+        'assets'  => ':count Tillgång|:count Tillgångar',
+        'licenses'  => ':count Licens|:count Licenser',
+        'license_seats'  => ':count Licenssäte|:count Licenssäten',
+        'consumables'  => ':count Förbrukningsvara|:count Förbrukningsvaror',
         'components'  => ':count Component|:count Komponenter',
-    ]
+    ],
+
+    'more_info' => 'Mer information',
+    'quickscan_bulk_help' => 'Markering av denna ruta kommer att justera tillgångshistoriken till att visa den nya platsen. Om du lämnar rutan omarkerad noteras platsen i inventeringsloggen. Observera att om tillgången är utcheckad kommer inte ändringar hos användaren, tillgången eller platsen att göras.',
+    'whoops' => 'Hoppsan!',
+    'something_went_wrong' => 'Något gick fel med din begäran.',
+    'close' => 'Stäng',
+    'expires' => 'Utgår',
+    'map_fields'=> 'Koppla :item_type fält',
+    'remaining_var' => ':count återstående',
+    'label' => 'Etikett',
+    'import_asset_tag_exists' => 'En tillgång med tillgångstaggen :asset_tag finns redan och en uppdatering begärdes inte. Ingen ändring gjordes.',
+    'countries_manually_entered_help' => 'Värden med en asterisk (*) matades in manuellt och matchar inte befintliga ISO 3166 rullgardinsvärden',
+    'accessories_assigned' => 'Tilldelade tillbehör',
+    'user_managed_passwords' => 'Lösenordshantering',
+    'user_managed_passwords_disallow' => 'Neka användare att hantera sina egna lösenord',
+    'user_managed_passwords_allow' => 'Tillåt användare att hantera sina egna lösenord',
+    'from' => 'From',
+    'by' => 'Av',
+
+// Add form placeholders here
+    'placeholders' => [
+        'notes'  => 'Lägg till en anteckning',
+    ],
+
+    'breadcrumb_button_actions' => [
+        'edit_item' => 'Ändra :name',
+        'checkout_item' => 'Checkout :name',
+        'checkin_item' => 'Checkin :name',
+    ],
+
+    'skins' => [
+        'site_default' => 'Site Default',
+        'default_blue' => 'Default Blue',
+        'blue_dark' => 'Blue (Dark Mode)',
+        'green' => 'Green Dark',
+        'green_dark' => 'Green (Dark Mode)',
+        'red' => 'Red Dark',
+        'red_dark' => 'Red (Dark Mode)',
+        'orange' => 'Orange Dark',
+        'orange_dark' => 'Orange (Dark Mode)',
+        'black' => 'Black',
+        'black_dark' => 'Black (Dark Mode)',
+        'purple' => 'Purple',
+        'purple_dark' => 'Purple (Dark Mode)',
+        'yellow' => 'Yellow',
+        'yellow_dark' => 'Yellow (Dark Mode)',
+        'high_contrast' => 'High Contrast',
+
+    ],
+
+    'select_all_none' => 'Markera/Avmarkera alla',
+    'generic_model_not_found' => ':model hittades inte eller så har du inte behörighet att komma åt den',
+    'deleted_models' => 'Raderade tillgångsmodeller',
+    'deleted_users' => 'Raderade användare',
+    'cost_each' => ':amount styck',
+    'remove_current_image' => 'Remove current :type image',
+
+    'seeding' => [
+        'manufacturers' => [
+            'button' => 'Create Manufacturers',
+            'prompt' => 'You do not have any manufacturers yet. Would you like to seed a list of common manufacturers? (THIS WILL OVERWRITE EXISTING MANUFACTURERS, including those that have been soft-deleted.)',
+            'success' => 'Manufacturers seeded successfully',
+            'error' => 'Could not seed manufacturers. A manufacturer record already exists and seeding would overwrite it.|Could not seed manufacturers. :count manufacturer records already exist and seeding would overwrite them.',
+        ],
+    ],
 
 ];
diff --git a/resources/lang/sv-SE/help.php b/resources/lang/sv-SE/help.php
index a97a78bd04..2299b2c76d 100644
--- a/resources/lang/sv-SE/help.php
+++ b/resources/lang/sv-SE/help.php
@@ -17,19 +17,19 @@ return [
 
     'audit_help' => 'Om du markerar denna ruta kommer tillgången att ändras för att återspegla denna nya plats. Om du lämnar den omarkerad kommer den helt enkelt att notera platsen i revisionsloggen.<br><br>Observera att om denna tillgång är utcheckad, det kommer inte att ändra platsen för personen, tillgång eller plats det checkas ut till.',
 
-    'assets' => 'Tillgångar är objekt som spåras med serienummer eller tillgångstagg. De tenderar att vara objekt med högre värde där identifiering av ett visst objekt spelar roll.',
+    'assets' => 'Tillgångar är objekt som spåras med serienummer eller tillgångstagg. De tenderar att vara objekt med högre värde där identifiering av ett visst objekt har betydelse.',
 
-    'categories' => 'Kategorier hjälper dig att organisera dina objekt. Exempel på kategorier kan vara &quot;Stationära datorer&quot;, &quot;Bärbara datorer&quot;, &quot;Mobiltelefoner&quot;, &quot;surfplattor&quot; och så vidare, men du kan använda kategorier på det sätt som passar bäst för dig.',
+    'categories' => 'Kategorier hjälper dig att organisera dina objekt. Exempel på kategorier kan vara &quot;Stationära datorer&quot;, &quot;Bärbara datorer&quot;, &quot;Mobiltelefoner&quot;, &quot;Surfplattor&quot; och så vidare, men du kan använda kategorier på det sätt som passar bäst för dig.',
 
-    'accessories' => 'Tillbehör är sånt som tilldelas användare men som inte har något serienummer (eller inte kräver att de registreras som en unik enhet). Till exempel, datormöss eller tangentbord.',
+    'accessories' => 'Tillbehör är sådant som tilldelas användare men som inte har något unikt serienummer (eller inte kräver att de registreras som en unik enhet). Till exempel datormöss eller tangentbord.',
 
-    'companies'     => 'Företag kan användas som ett enkelt identifieringsfält, eller kan användas för att begränsa synligheten av tillgångar, användare osv. om fullständigt företagsstöd är aktiverat i dina administratörsinställningar.',
+    'companies'     => 'Företag kan användas som ett enkelt identifieringsfält eller för att begränsa synligheten av tillgångar, användare osv. under förutsättning att fullständigt företagsstöd är aktiverat i dina administratörsinställningar.',
 
     'components'    => 'Komponenter är objekt som ingår i en tillgång, till exempel HDD, RAM, osv.',
 
-    'consumables'   => 'Förbrukningsvaror är allt som köps som kommer att användas med tiden. Till exempel skrivarbläck eller kopieringspapper.',
+    'consumables'   => 'Förbrukningsvaror är allt som köps som kommer att användas och förbrukas över tid, t.ex. skrivarbläck eller kopieringspapper.',
 
-    'depreciations' => 'Du kan ställa in tillgångsavskrivningar för att avskriva tillgångar baserat på rak linjär avskrivning.',
+    'depreciations' => 'Du kan ställa in värdeminskningar för att avskriva tillgångar baserat på linjär värdeminskning.',
     
-    'empty_file'    => 'Importören upptäcker att denna fil är tom.'
+    'empty_file'    => 'Importeringsverktyget har upptäckt att denna fil är tom.'
 ];
diff --git a/resources/lang/sv-SE/localizations.php b/resources/lang/sv-SE/localizations.php
index 2dc003fe78..70e7859a0f 100644
--- a/resources/lang/sv-SE/localizations.php
+++ b/resources/lang/sv-SE/localizations.php
@@ -40,7 +40,9 @@ return [
         'ms-MY'=> 'Malajiska',
         'mi-NZ'=> 'Maori',
         'mn-MN'=> 'Mongoliska',
-        'no-NO'=> 'Norska',
+        'nb-NO'=> 'Norsk bokmål',
+        'om-ET' => 'Oromo (Ethiopian)',
+        //'nn-NO'=> 'Norwegian Nynorsk',
         'fa-IR'=> 'Persiska',
         'pl-PL'=> 'Polska',
         'pt-PT'=> 'Portugisiska',
@@ -133,6 +135,7 @@ return [
         'EC'=>'Ecuador',
         'EE'=>'Estland',
         'EG'=>'Egypten',
+        'GB-ENG'=>'England',
         'ER'=>'Eritrea',
         'ES'=>'Spanien',
         'ET'=>'Etiopien',
@@ -231,6 +234,7 @@ return [
         'NG'=>'Nigeria',
         'NI'=>'Nicaragua',
         'NL'=>'Nederländerna',
+        'GB-NIR' => 'Nordirland',
         'NO'=>'Norge',
         'NP'=>'Nepal',
         'NR'=>'Nauru',
@@ -258,7 +262,7 @@ return [
         'RU'=>'Ryssland',
         'RW'=>'Rwanda',
         'SA'=>'Saudiarabien',
-        'UK'=>'Skottland',
+        'GB-SCT'=>'Skottland',
         'SB'=>'Salomonöarna',
         'SC'=>'Seychellerna',
         'SS'=>'Södra Sudan',
@@ -310,6 +314,7 @@ return [
         'VI'=>'Jungfruöarna (USA)',
         'VN'=>'Vietnam',
         'VU'=>'Vanuatu',
+        'GB-WLS' =>'Wales',
         'WF'=>'Wallis- och Futunaöarna',
         'WS'=>'Samoa',
         'YE'=>'Jemen',
diff --git a/resources/lang/sv-SE/mail.php b/resources/lang/sv-SE/mail.php
index 18dc11bf23..7c9cc4b80b 100644
--- a/resources/lang/sv-SE/mail.php
+++ b/resources/lang/sv-SE/mail.php
@@ -2,92 +2,98 @@
 
 return [
 
-    'Accessory_Checkin_Notification' => 'Tillbehöret har checkats in',
-    'Accessory_Checkout_Notification' => 'Tillbehören checkas ut',
-    'Asset_Checkin_Notification' => 'Tillgången har checkats in',
+    'Accessory_Checkin_Notification' => 'Tillbehör incheckat',
+    'Accessory_Checkout_Notification' => 'Tillbehör utchekat',
+    'Asset_Checkin_Notification' => 'Tillgång incheckat',
     'Asset_Checkout_Notification' => 'Tillgång utcheckad',
     'Confirm_Accessory_Checkin' => 'Bekräfta incheckning av tillbehör',
     'Confirm_Asset_Checkin' => 'Bekräfta incheckning av tillgång',
     'Confirm_accessory_delivery' => 'Leveransbekräftelse för tillbehör',
     'Confirm_asset_delivery' => 'Leveransbekräftelse för tillgång',
-    'Confirm_consumable_delivery' => 'Leveransbekräftelse för förbrukningsmaterial',
+    'Confirm_consumable_delivery' => 'Leveransbekräftelse för förbrukningsvara',
     'Confirm_license_delivery' => 'Leveransbekräftelse för licens',
-    'Consumable_checkout_notification' => 'Förbrukningsvaror utcheckad',
-    'Days' => 'dagar',
+    'Consumable_checkout_notification' => 'Förbrukningsvara utcheckat',
+    'Days' => 'Dagar',
     'Expected_Checkin_Date' => 'En tillgång som checkas ut till dig kommer att checkas in igen :date',
     'Expected_Checkin_Notification' => 'Påminnelse: :name sluttiden för incheckning närmar sig',
     'Expected_Checkin_Report' => 'Förväntad incheckningsrapport för tillgång',
     'Expiring_Assets_Report' => 'Rapport över tillgångar med förfallodatum.',
     'Expiring_Licenses_Report' => 'Rapport över licenser med förfallodatum.',
-    'Item_Request_Canceled' => 'Artikelförfrågan annulleras',
-    'Item_Requested' => 'Artikel som begärs',
-    'License_Checkin_Notification' => 'Licensen har checkats in',
+    'Item_Request_Canceled' => 'Objektförfrågan avbruten',
+    'Item_Requested' => 'Objekt begärt',
+    'License_Checkin_Notification' => 'Licens incheckad',
     'License_Checkout_Notification' => 'Licens utcheckad',
+    'license_for'   => 'Licens för',
     'Low_Inventory_Report' => 'Meddelande om lågt lagersaldo',
-    'a_user_canceled' => 'En användare har avbrutit en artikelförfrågan på webbplatsen',
-    'a_user_requested' => 'En användare har efterfrågat en artikel webbplatsen',
+    'a_user_canceled' => 'En användare har avbrutit en objektbegäran på webbplatsen',
+    'a_user_requested' => 'En användare har efterfrågat ett objekt på webbplatsen',
     'acceptance_asset_accepted' => 'En användare har accepterat ett objekt',
     'acceptance_asset_declined' => 'En användare har avböjt ett objekt',
-    'accessory_name' => 'Tillbehörsnamn:',
-    'additional_notes' => 'Ytterligare anmärkningar:',
-    'admin_has_created' => 'En administratör har skapat ett konto för dig på: webbsidan.',
-    'asset' => 'Tillgång:',
-    'asset_name' => 'Tillgångsnamn:',
-    'asset_requested' => 'Tillgången begärd',
+    'accessory_name' => 'Tillbehörsnamn',
+    'additional_notes' => 'Ytterligare anmärkningar',
+    'admin_has_created' => 'En administratör har skapat ett konto för dig på :web.',
+    'asset' => 'Tillgång',
+    'asset_name' => 'Företagsnamn',
+    'asset_requested' => 'Tillgång begärd',
     'asset_tag' => 'Tillgångstagg',
-    'assets_warrantee_alert' => 'Det finns :count tillgång med en garanti som löper ut under de kommande :threshold dagar.|Det finns :count tillgångar med garantier som löper ut under de kommande :threshold dagar.',
-    'assigned_to' => 'Tilldelats',
+    'assets_warrantee_alert' => 'Det finns :count tillgång vars garanti löper ut under de kommande :threshold dagar.|Det finns :count tillgångar med garantier som löper ut under de kommande :threshold dagar.',
+    'assigned_to' => 'Tilldelat till',
     'best_regards' => 'Vänliga hälsningar,',
-    'canceled' => 'Avbruten:',
-    'checkin_date' => 'Incheckningsdatum:',
-    'checkout_date' => 'Utcheckningsdatum:',
-    'checkedout_from' => 'Checkade ut från',
+    'canceled' => 'Avbruten',
+    'checkin_date' => 'Incheck.dat.',
+    'checkout_date' => 'Utcheck.dat.',
+    'checkedout_from' => 'Utcheckad från',
     'checkedin_from'  => 'Incheckad från',
-    'checked_into' => 'Incheckad',
-    'click_on_the_link_accessory' => 'Vänligen klicka på länken längst ner för att bekräfta att du har fått tillbehöret.',
-    'click_on_the_link_asset' => 'Vänligen klicka på länken längst ner för att bekräfta att du har tagit emot tillgången.',
-    'click_to_confirm' => 'Vänligen klicka på följande länk för att bekräfta ditt: webbkonto:',
+    'checked_into' => 'Incheckad till',
+    'click_on_the_link_accessory' => 'Vänligen klicka på länken nedan för att bekräfta att du har mottagit tillbehöret.',
+    'click_on_the_link_asset' => 'Vänligen klicka på länken nedan för att bekräfta att du har mottagit tillgången.',
+    'click_to_confirm' => 'Vänligen klicka på följande länk för att bekräfta ditt :web konto:',
     'current_QTY' => 'Nuvarande antal',
-    'days' => 'dagar',
-    'expecting_checkin_date' => 'Förväntat incheckningsdatum:',
+    'days' => 'Dagar',
+    'expecting_checkin_date' => 'Förväntat incheck.dat.',
     'expires' => 'Utgår',
-    'hello' => 'Hallå',
+    'hello' => 'Hejsan',
     'hi' => 'Hej',
-    'i_have_read' => 'Jag har läst och godkänt användarvillkoren och har fått den här produkten.',
+    'i_have_read' => 'Jag har läst och godkänt användarvillkoren och har mottagit det här objektet.',
     'inventory_report' => 'Inventarierapport',
-    'item' => 'Artikel:',
+    'item' => 'Objekt',
+    'item_checked_reminder' => 'Detta är en påminnelse om att du för närvarande har :count objekt utcheckade till dig som du inte har accepterat eller nekat. Klicka på länken nedan för att bekräfta ditt beslut.',
     'license_expiring_alert' => ':count licens löper ut inom :threshold dagar.|:count licenser löper ut inom :threshold days.',
-    'link_to_update_password' => 'Vänligen klicka på följande länk för att uppdatera ditt: webblösenord:',
-    'login' => 'Logga in:',
+    'link_to_update_password' => 'Vänligen klicka på följande länk för att uppdatera ditt :web lösenord:',
+    'login' => 'Logga in',
     'login_first_admin' => 'Logga in på din nya Snipe-IT-installation med hjälp av inloggningsuppgifterna nedan:',
-    'low_inventory_alert' => ':count artikel understiger det lägsta tillåtna lagersaldot eller håller på att ta slut.|:count artiklar understiger det lägsta tillåtna lagersaldot eller håller på att ta slut.',
+    'low_inventory_alert' => ':count artikel understiger det lägsta tillåtna lagersaldot eller är på väg att ta slut.|:count artiklar understiger det lägsta tillåtna lagersaldot eller är på väg att ta slut.',
     'min_QTY' => 'Min. antal',
-    'name' => 'namn',
-    'new_item_checked' => 'En ny artikel har blivit utcheckad i ditt namn, se detaljer nedan.',
-    'notes' => 'anteckningar',
-    'password' => 'Lösenord:',
+    'name' => 'Namn',
+    'new_item_checked' => 'Ett nytt objekt har blivit utcheckat i ditt namn, se detaljer nedan.',
+    'new_item_checked_with_acceptance' => 'A new item has been checked out under your name that requires acceptance, details are below.',
+    'recent_item_checked' => 'An item was recently checked out under your name that requires acceptance, details are below.',
+    'notes' => 'Anteckningar',
+    'password' => 'Lösenord',
     'password_reset' => 'Lösenordsåterställning',
     'read_the_terms' => 'Läs användarvillkoren nedan.',
-    'read_the_terms_and_click' => 'Läs användarvillkoren nedan, och klicka på länken längst ner för att bekräfta att du läst och godkänner användarvillkoren och har fått tillgången.',
-    'requested' => 'Begärda:',
+    'read_the_terms_and_click' => 'Läs användarvillkoren nedan och klicka på länken nedan för att bekräfta att du läst och godkänner användarvillkoren samt har mottagit objektet.',
+    'requested' => 'Begärda',
     'reset_link' => 'Länk för att återställa ditt lösenord',
     'reset_password' => 'Klicka här för att återställa ditt lösenord:',
     'rights_reserved' => 'Med ensamrätt.',
     'serial' => 'Serienummer',
     'snipe_webhook_test' => 'Snipe-IT Integration Test',
-    'snipe_webhook_summary' => 'Sammanfattning av Snipe-IT Integration',
+    'snipe_webhook_summary' => 'Sammanfattning av Snipe-IT-integrationen',
     'supplier' => 'Leverantör',
     'tag' => 'Tagg',
     'test_email' => 'Testa e-post från Snipe-IT',
-    'test_mail_text' => 'Detta är ett test från Snipe-IT Asset Management System. Om du får detta, så fungerar mailen :)',
-    'the_following_item' => 'Följande artikel har blivit incheckad: ',
+    'test_mail_text' => 'Detta är ett test från Snipe-IT Asset Management System. Om du får detta så fungerar mejlen :)',
+    'the_following_item' => 'Följande objekt har blivit incheckat: ',
     'to_reset' => 'För att återställa ditt :web lösenord, fyll i det här formuläret:',
     'type' => 'Typ',
-    'upcoming-audits' => 'Det finns :count tillgång som kommer upp för revision inom :threshold days.|Det finns :count tillgångar som kommer upp för revision inom :threshold dagar.',
+    'upcoming-audits' => 'Det finns :count tillgång som skall inventeras inom :threshold dagar.|Det finns :count tillgångar som skall inventeras inom :threshold dagar.',
     'user' => 'Användare',
     'username' => 'Användarnamn',
-    'welcome' => 'Välkommen: namn',
-    'welcome_to' => 'Välkommen till: web!',
+    'unaccepted_asset_reminder' => 'Reminder: You have Unaccepted Assets.',
+    'welcome' => 'Välkommen :name!',
+    'welcome_to' => 'Välkommen till :web!',
     'your_assets' => 'Visa dina tillgångar',
     'your_credentials' => 'Dina Snipe-IT användaruppgifter',
+    'mail_sent' => 'E-post har skickats!',
 ];
diff --git a/resources/lang/sv-SE/passwords.php b/resources/lang/sv-SE/passwords.php
index 21fd8e499d..6c091d950d 100644
--- a/resources/lang/sv-SE/passwords.php
+++ b/resources/lang/sv-SE/passwords.php
@@ -1,9 +1,9 @@
 <?php
 
 return [
-    'sent'	        => 'Om en matchande användare med en giltig e-postadress finns i vårt system, har ett e-postmeddelande om lösenordsåterställning skickats.',
-    'user'			=> 'Om en matchande användare med en giltig e-postadress finns i vårt system, har ett e-postmeddelande om lösenordsåterställning skickats.',
-    'token'         => 'Denna återställningstoken för lösenord är ogiltig eller har löpt ut, eller matchar inte det angivna användarnamnet.',
+    'sent'	        => 'Om en matchande användare med en giltig e-postadress finns i systemet kommer ett e-postmeddelande om lösenordsåterställning att skickas.',
+    'user'			=> 'Om en matchande användare med en giltig e-postadress finns i systemet kommer ett e-postmeddelande om lösenordsåterställning att skickas.',
+    'token'         => 'Detta återställningstoken för lösenord är ogiltigt eller, har löpt ut eller matchar inte det angivna användarnamnet.',
     'reset'         => 'Ditt lösenord har återställts!',
     'password_change'  => 'Ditt lösenord har uppdaterats!',
 ];
diff --git a/resources/lang/sv-SE/reminders.php b/resources/lang/sv-SE/reminders.php
index 1d11b6ba82..ce98d6c573 100644
--- a/resources/lang/sv-SE/reminders.php
+++ b/resources/lang/sv-SE/reminders.php
@@ -15,7 +15,7 @@ return array(
 
     "password" => "Lösenord måste vara sex tecken och matcha lösenordsbekräftelsen.",
     "user"     => "Användarnamnet eller e-postadressen är felaktigt",
-    "token"    => 'Denna återställningstoken för lösenord är ogiltig eller har löpt ut, eller matchar inte det angivna användarnamnet.',
-    'sent'	   => 'Om en matchande användare med en giltig e-postadress finns i vårt system, har ett e-postmeddelande om lösenordsåterställning skickats.',
+    "token"    => 'Detta återställningstoken för lösenord är ogiltigt, har löpt ut eller matchar inte det angivna användarnamnet.',
+    'sent'	   => 'Om en matchande användare med en giltig e-postadress finns i systemet har ett e-postmeddelande om lösenordsåterställning skickats.',
 
 );
diff --git a/resources/lang/sv-SE/table.php b/resources/lang/sv-SE/table.php
index 40a20a319d..f1265a0626 100644
--- a/resources/lang/sv-SE/table.php
+++ b/resources/lang/sv-SE/table.php
@@ -2,10 +2,10 @@
 
 return array(
 
-    'actions'	 	        => 'Handlingar',
-    'action' 		        => 'Handling',
+    'actions'	 	        => 'Åtgärder',
+    'action' 		        => 'Åtgärd',
     'by'      		        => 'Av',
-    'item' 			        => 'Artikel',
-    'no_matching_records'   => 'No matching records found',
+    'item' 			        => 'Objekt',
+    'no_matching_records'   => 'Inga matchande resultat',
 
 );
diff --git a/resources/lang/sv-SE/validation.php b/resources/lang/sv-SE/validation.php
index f7ca0a6b41..d986e3da19 100644
--- a/resources/lang/sv-SE/validation.php
+++ b/resources/lang/sv-SE/validation.php
@@ -13,87 +13,150 @@ return [
     |
     */
 
-    'accepted'             => ':attribute måste accepteras.',
-    'active_url'           => ':attribute är inte en giltig URL.',
-    'after'                => ':attribute måste vara ett datum efter :date.',
-    'after_or_equal'       => ':attribute måste vara ett datum efter eller lika med :date.',
-    'alpha'                => ':attribute får bara innehålla bokstäver.',
-    'alpha_dash'           => ':attribute får bara innehålla bokstäver, siffror och bindestreck.',
-    'alpha_num'            => ':attribute får bara innehålla bokstäver och siffror.',
-    'array'                => ':attribute måste vara en tabell.',
-    'before'               => ':attribute måste vara ett datum före :date.',
-    'before_or_equal'      => ':attribute måste vara ett datum före eller lika med :date.',
-    'between'              => [
-        'numeric' => ':attribute måste vara mellan :min och :max.',
-        'file'    => ':attribute måste vara mellan :min och :max kilobytes.',
-        'string'  => ':attribute måste vara mellan :min och :max tecken.',
-        'array'   => ':attribute måste ha mellan :min och :max objekt.',
+    'accepted' => ':attribute-fältet måste accepteras.',
+    'accepted_if' => ':attribute-fältet måste accepteras när :other är :value.',
+    'active_url' => ':attribute-fältet måste vara en giltig URL.',
+    'after' => ':attribute-fältet måste vara ett datum efter :date.',
+    'after_or_equal' => ':attribute-fältet-fältet måste vara ett datum efter eller samma som :date.',
+    'alpha' => ':attribute-fältet får endast innehålla bokstäver.',
+    'alpha_dash' => ':attribute-fältet får endast innehålla bokstäver, siffror, bindestreck eller understreck.',
+    'alpha_num' => ':attribute-fältet får endast innehålla bokstäver och siffror.',
+    'array' => ':attribute-fältet måste vara en array.',
+    'ascii' => ':attribute-fältet får endast innehålla en single-byte alfanumeriska tecken och symboler.',
+    'before' => ':attribute-fältet måste vara ett datum före :date.',
+    'before_or_equal' => ':attribute-fältet måste vara ett datum före eller samma som :date.',
+    'between' => [
+        'array' => ':attribute-fältet måste ha mellan :min och :max objekt.',
+        'file' => ':attribute-fältet måste vara mellan :min och :max kilobyte.',
+        'numeric' => ':attribute-fältet måste vara mellan :min och :max.',
+        'string' => ':attribute-fältet måste vara mellan :min och :max tecken.',
     ],
-    'boolean'              => ':attribute måste vara sant eller falskt.',
-    'confirmed'            => ':attribute matchar inte.',
-    'date'                 => ':attribute är inte ett giltigt datum.',
-    'date_format'          => ':attribute matchar inte formatet :format.',
-    'different'            => ':attribute och :other kan inte vara samma.',
-    'digits'               => ':attributet måste vara :digits siffror.',
-    'digits_between'       => ':attribute måste vara mellan :min och :max siffror.',
-    'dimensions'           => ':attribute har ogiltigt bildmått.',
-    'distinct'             => ':attribute fältet har samma värde.',
-    'email'                => ':attribute måste vara en giltig e-postadress.',
-    'exists'               => 'Det valda :attribute är ogiltigt.',
-    'file'                 => ':attribute måste vara en fil.',
-    'filled'               => ':attribute fältet måste ha ett värde.',
-    'image'                => ':attribute måste vara en bild.',
+    'boolean' => 'Attributfältet måste vara sant eller felaktigt.',
+    'can' => ':attribute-fältet innehåller ett otillåtet värde.',
+    'confirmed' => ':attribute-fältets bekräftelse matchar inte.',
+    'contains' => ':attribute-fältet saknar ett obligatoriskt värde.',
+    'current_password' => 'Lösenordet är felaktigt.',
+    'date' => ':attribute-fältet måste ha ett giltigt datum.',
+    'date_equals' => ':attribute-fältets datum måste vara samma som :date.',
+    'date_format' => ':attribute-fältet måste matcha formatet :format.',
+    'decimal' => ':attribute-fältet måste ha :decimal decimaltecken.',
+    'declined' => ':attribute-fältet måste nekas.',
+    'declined_if' => ':attribute-fältet måste nekas när :other är :value.',
+    'different' => ':attribute-fältet och :annat måste vara unika.',
+    'digits' => ':attribute-fältet måste vara :digits siffror.',
+    'digits_between' => ':attribute-fältet måste vara mellan :min och :max siffror.',
+    'dimensions' => ':attribute-fältet has inkorrekta bilddimensioner.',
+    'distinct' => ':attribute fältet har samma värde.',
+    'doesnt_end_with' => ':attribute-fältet får inte sluta med en av följande värden: :values.',
+    'doesnt_start_with' => ':attribute-fältet får inte börja med en av följande värden: :values.',
+    'email' => ':attribute-fältet måste vara en giltig e-postadress.',
+    'ends_with' => ':attribute-fältet måste sluta med en av följande värden: :values.',
+    'enum' => 'Det valda :attribute är ogiltigt.',
+    'exists' => 'Det valda :attribute är ogiltigt.',
+    'extensions' => ':attribute-fältet måste ha någon av följande tillval: :values.',
+    'file' => ':attribute-fältet måste vara en fil.',
+    'filled' => ':attribute fältet måste ha ett värde.',
+    'gt' => [
+        'array' => ':attribute-fältet måste ha mer än :value objekt.',
+        'file' => ':attribute-fältet måste vara större än :value kilobyte.',
+        'numeric' => ':attribute-fältet måste vara större än :value.',
+        'string' => ':attribute-fältet måste vara större än :value tecken.',
+    ],
+    'gte' => [
+        'array' => ':attribute-fältet måste ha :value objekt eller fler.',
+        'file' => ':attribute-fältet måste vara större än eller lika med :value kilobyte.',
+        'numeric' => ':attribute-fältet måste vara större än eller lika med :value.',
+        'string' => ':attribute-fältet måste vara större än eller lika med :value tecken.',
+    ],
+    'hex_color' => ':attribute-fältet måste vara en giltig hexadecimalfärg.',
+    'image' => ':attribute-fältet måste vara en bild.',
     'import_field_empty'    => 'Värdet för :fieldname kan inte vara noll.',
-    'in'                   => 'Det valda :attribute är ogiltigt.',
-    'in_array'             => ':attribute fältet existerar inte i :other.',
-    'integer'              => ':attribute måste vara ett heltal.',
-    'ip'                   => ':attribute måste vara en giltig IP-adress.',
-    'ipv4'                 => ':attribute måste vara en giltig IPv4-adress.',
-    'ipv6'                 => ':attribute måste vara en giltig IPv6-adress.',
-    'is_unique_department' => ':attribute måste vara unikt för detta företag',
-    'json'                 => ':attribute måste vara en giltig JSON-sträng.',
-    'max'                  => [
-        'numeric' => ':attribute får inte vara större än :max.',
-        'file'    => ':attribute får inte vara större än :max kilobytes.',
-        'string'  => ':attribute får inte vara större än :max tecken.',
-        'array'   => ':attribute får inte ha mer än :max objekt.',
+    'in' => 'Det valda :attribute är ogiltigt.',
+    'in_array' => ':attribute-fältet måste existera i :other.',
+    'integer' => ':attribute-fältet måste vara en integer.',
+    'ip' => ':attribute-fältet måste vara en giltig IP-adress.',
+    'ipv4' => ':attribute-fältet måste vara en giltig IPv4-adress.',
+    'ipv6' => ':attribute-fältet måste vara en giltig IPv6-adress.',
+    'json' => ':attribute-fältet måste vara en giltig JSON-sträng.',
+    'list' => ':attribute-fältet måste vara en lista.',
+    'lowercase' => ':attribute-fältet måste skrivas med gemener.',
+    'lt' => [
+        'array' => ':attribute-fältet måste ha färre än :value objekt.',
+        'file' => ':attribute-fältet måste vara mindre än :value kilobyte.',
+        'numeric' => ':attribute-fältet måste vara mindre än :value.',
+        'string' => ':attribute-fältet måste vara färre än :value tecken.',
     ],
-    'mimes'                => ':attribute måste vara en fil av typen: :values.',
-    'mimetypes'            => ':attribute måste vara en fil av typen: :values.',
-    'min'                  => [
-        'numeric' => ':attribute måste vara minst :min.',
-        'file'    => ':attribute måste vara minst :min kilobytes.',
-        'string'  => ':attribute måste vara minst :min tecken.',
-        'array'   => ':attribute måste innehålla minst :min saker.',
+    'lte' => [
+        'array' => ':attribute-fältet får inte ha fler än :value objekt.',
+        'file' => ':attribute-fältet måste vara mindre än eller lika med :value kilobyte.',
+        'numeric' => ':attribute-fältet måste vara mindre än eller lika med :value.',
+        'string' => ':attribute-fältet måste vara färre än eller lika med :value tecken.',
     ],
-    'starts_with'          => ':attribute måste börja med något av följande: :values.',
-    'ends_with'            => ':attribute måste sluta med en eller flera av följande värden: :values.',
+    'mac_address' => ':attribute-fältet måste vara en giltig MAC-adress.',
+    'max' => [
+        'array' => ':attribute-fältet får inte ha fler än :max objekt.',
+        'file' => ':attribute-fältet får inte vara större än :max kilobyte.',
+        'numeric' => ':attribute-fältet får inte vara större än :max.',
+        'string' => ':attribute-fältet får inte vara fler än :max tecken.',
+    ],
+    'max_digits' => ':attribute-fältet får inte ha fler än :max siffror.',
+    'mimes' => ':attribute-fältet måste vara av filtyp: :values.',
+    'mimetypes' => ':attribute-fältet måste vara av filtyp: :values.',
+    'min' => [
+        'array' => ':attribute-fältet måste ha färre än :min objekt.',
+        'file' => ':attribute-fältet måste vara minst :min kilobyte.',
+        'numeric' => ':attribute-fältet måste vara minst :min.',
+        'string' => ':attribute-fältet måste innehålla minst :min tecken.',
+    ],
+    'min_digits' => ':attribute-fältet måste vara minst :min siffror.',
+    'missing' => ':attribute-fältet måste vara tom.',
+    'missing_if' => ':attribute-fältet måste vara tom när :other är :value.',
+    'missing_unless' => ':attribute-fältet måste vara tom om inte :other är :value.',
+    'missing_with' => ':attribute-fältet måste vara tom när :values finns.',
+    'missing_with_all' => ':attribute-fältet måste vara tom när :values finns.',
+    'multiple_of' => ':attribute-fältet måste vara multipel av :value.',
+    'not_in' => 'Det valda :attribute är ogiltigt.',
+    'not_regex' => ':attribute-fältets format är ogiltigt.',
+    'numeric' => ':attribute-fältet måste vara ett nummer.',
+    'password' => [
+        'letters' => ':attribute-fältet måste innehålla minst en bokstav.',
+        'mixed' => ':attribute-fältet måste innehåller minst en stor och en liten bokstav.',
+        'numbers' => ':attribute-fältet måste innehålla minst ett nummer.',
+        'symbols' => ':attribute-fältet måste innehåll minst en symbol.',
+        'uncompromised' => ':attribute-fältet har upptäckts i en dataläcka. Vänligen ange ett annat :attribute.',
+    ],
+    'percent'       => 'Värdeminskningsminimum måste vara mellan 0 och 100 när värdeminskningstypen är i procent.',
 
-    'not_in'               => 'Det valda :attribute är ogiltigt.',
-    'numeric'              => ':attribute måste vara ett nummer.',
-    'present'              => ':attribute fältet måste finnas.',
-    'valid_regex'          => 'Ogiltig regex. ',
-    'regex'                => ':attribute formatet är ogiltigt.',
-    'required'             => 'Fältet: :attribute är obligatoriskt.',
-    'required_if'          => 'Fältet :attribute krävs när :other är :value.',
-    'required_unless'      => 'Fältet :attribute krävs om inte :other anges i :values.',
-    'required_with'        => 'Fältet :attribute krävs när :values angivits.',
-    'required_with_all'    => 'Fältet :attribute krävs när :values angivits.',
-    'required_without'     => 'Fältet :attribute krävs när :values saknas.',
+    'present' => ':attribute fältet måste finnas.',
+    'present_if' => ':attribute-fältet måste vara ifyllt om :other är :value.',
+    'present_unless' => ':attribute-fältet måste vara ifyllt så länge inte :other är :value.',
+    'present_with' => ':attribute-fältet måste vara ifyllt om :values är angivet.',
+    'present_with_all' => ':attribute-fältet måste vara ifyllt om :values är angivna.',
+    'prohibited' => ':attribute-fältet är förbjudet.',
+    'prohibited_if' => ':attribute-fältet är förbjudet när :other är :value.',
+    'prohibited_unless' => ':attribute-fältet är förbjudet om inte :other finns i :values.',
+    'prohibits' => ':attribute-fältet förbjuder :other från att vara angivet.',
+    'regex' => ':attribute-fältets format är ogiltigt.',
+    'required' => 'Fältet: :attribute är obligatoriskt.',
+    'required_array_keys' => ':attribute-fältet måste innehålla värden för: :values.',
+    'required_if' => 'Fältet :attribute krävs när :other är :value.',
+    'required_if_accepted' => ':attribute-fältet är obligatoriskt när :other är accepterat.',
+    'required_if_declined' => ':attribute-fältet är obligatoriskt om :other är nekat.',
+    'required_unless' => 'Fältet :attribute krävs om inte :other anges i :values.',
+    'required_with' => 'Fältet :attribute krävs när :values angivits.',
+    'required_with_all' => ':attribute-fältet är obligatoriskt när :values är angivet.',
+    'required_without' => 'Fältet :attribute krävs när :values saknas.',
     'required_without_all' => 'Fältet :attribute krävs när inga :values har angetts.',
-    'same'                 => ':attribute och :other måste vara samma.',
-    'size'                 => [
-        'numeric' => ':attribute måste vara :size.',
-        'file'    => ':attribute måste vara :size kilobytes.',
-        'string'  => ':attribute måste vara :size tecken.',
-        'array'   => ':attribute måste innehålla :size artiklar.',
+    'same' => ':attribute-fältet måste matcha :other.',
+    'size' => [
+        'array' => ':attribute-fältet måste innehålla :size objekt.',
+        'file' => ':attribute-fältet måste vara :size kilobyte.',
+        'numeric' => ':attribute-fältet måste vara :size.',
+        'string' => ':attribute-fältet måste vara :size tecken.',
     ],
+    'starts_with' => ':attribute-fältet måste starta med minst ett av följande: :values.',
     'string'               => ':attribute måste vara en sträng.',
-    'timezone'             => ':attribute måste vara en giltig zon.',
     'two_column_unique_undeleted' => ':attribute måste vara unikt i :table1 och :table2. ',
-    'unique'               => ':attribute är upptaget.',
-    'uploaded'             => 'Uppladdningen av :attribute misslyckades.',
-    'url'                  => ':attribute Formatet är ogiltigt.',
     'unique_undeleted'     => ':attribute måste vara unikt.',
     'non_circular'         => ':attribute får inte skapa en cirkulär referens.',
     'not_array'            => ':attribute kan inte vara en array.',
@@ -102,11 +165,14 @@ return [
     'numbers'              => 'Lösenord måste innehålla minst en siffra.',
     'case_diff'            => 'Lösenordet måste innehålla både versaler och gemener.',
     'symbols'              => 'Lösenordet måste innehålla symboler.',
-    'gte'                  => [
-        'numeric'          => 'Värdet kan inte vara negativ'
-    ],
-    'checkboxes'           => ':attribute innehåller ogiltiga alternativ.',
-    'radio_buttons'        => ':attribute är ogiltigt.',
+    'timezone' => ':attribute-fältet måste vara en giltig tidszon.',
+    'unique' => ':attribute är upptaget.',
+    'uploaded' => 'Uppladdningen av :attribute misslyckades.',
+    'uppercase' => ':attribute-fältet måste vara versaler.',
+    'url' => ':attribute-fältet måste vara en giltig URL.',
+    'ulid' => ':attribute-fältet måste vara ett giltigt ULID.',
+    'uuid' => ':attribute-fältet måste vara ett giltigt UUID.',
+    'fmcs_location' => 'Full multiple company support and location scoping is enabled in the Admin Settings, and the selected location and selected company are not compatible.',
 
 
     /*
@@ -120,16 +186,22 @@ return [
     |
     */
 
+    'email_array'      => 'En eller flera e-postadresser är ogiltiga.',
+    'checkboxes'           => ':attribute innehåller ogiltiga alternativ.',
+    'radio_buttons'        => ':attribute är ogiltigt.',
+    
     'custom' => [
         'alpha_space' => 'Fältet :attribute innehåller ett tecken som inte är tillåtet.',
-        'email_array'      => 'En eller flera e-postadresser är ogiltiga.',
+
         'hashed_pass'      => 'Ditt nuvarande lösenord är felaktigt',
         'dumbpwd'          => 'Det angivna lösenordet är för vanligt.',
-        'statuslabel_type' => 'Du måste ange en giltig typ av statusetikett',
+        'statuslabel_type' => 'Du måste ange en giltig statusetikett',
+        'custom_field_not_found'          => 'Detta fält verkar inte existera, vänligen dubbelkolla dina anpassade fält.',
+        'custom_field_not_found_on_model' => 'Detta fält verkar existera, men är inte tillgängligt på tillgångsmodellens fältuppsättning.',
 
         // date_format validation with slightly less stupid messages. It duplicates a lot, but it gets the job done :(
-        // We use this because the default error message for date_format is reflects php Y-m-d, which non-PHP
-        // people won't know how to format. 
+        // We use this because the default error message for date_format reflects php Y-m-d, which non-PHP
+        // people won't know how to format.
         'purchase_date.date_format'     => ':attribute måste vara ett giltigt datum i YYYY-MM-DD format',
         'last_audit_date.date_format'   =>  ':attribute måste vara ett giltigt datum i YYYY-MM-DD hh:mm:ss format',
         'expiration_date.date_format'   =>  ':attribute måste vara ett giltigt datum i YYYY-MM-DD format',
@@ -137,9 +209,15 @@ return [
         'expected_checkin.date_format'  =>  ':attribute måste vara ett giltigt datum i YYYY-MM-DD format',
         'start_date.date_format'        =>  ':attribute måste vara ett giltigt datum i YYYY-MM-DD format',
         'end_date.date_format'          =>  ':attribute måste vara ett giltigt datum i YYYY-MM-DD format',
+        'invalid_value_in_field' => 'Ogiltigt värde i detta fält',
 
-    ],
+        'ldap_username_field' => [
+            'not_in' =>         '<code>sAMAccountName</code> (blandade gemener och versaler) kommer sannolikt inte att fungera. Du bör använda <code>samaccountname</code> (gemener) istället.'
+        ],
+        'ldap_auth_filter_query' => ['not_in' => '<code>uid=samaccountname</code> är förmodligen inte ett giltigt aut-filter. Du vill förmodligen ha <code>uid=</code> '],
+        'ldap_filter' => ['regex' => 'Detta värde bör sannolikt inte vara inom parantes.'],
 
+        ],
     /*
     |--------------------------------------------------------------------------
     | Custom Validation Attributes
@@ -155,8 +233,16 @@ return [
 
     /*
     |--------------------------------------------------------------------------
-    | Generic Validation Messages
+    | Generic Validation Messages - we use these in the jquery validation where we don't have
+    | access to the :attribute
     |--------------------------------------------------------------------------
     */
-    'invalid_value_in_field' => 'Ogiltigt värde som ingår i detta fält',
+
+    'generic' => [
+        'invalid_value_in_field' => 'Ogiltigt värde i detta fält',
+        'required' => 'Detta fält är obligatoriskt',
+        'email' => 'Vänligen ange en giltig e-postadress',
+    ],
+
+
 ];
diff --git a/resources/lang/ta-IN/account/general.php b/resources/lang/ta-IN/account/general.php
index 1a9e2c03b8..7f9e2f848e 100644
--- a/resources/lang/ta-IN/account/general.php
+++ b/resources/lang/ta-IN/account/general.php
@@ -2,10 +2,16 @@
 
 return array(
     'personal_api_keys' => 'Personal API Keys',
+    'personal_access_token' => 'Personal Access Token',
+    'personal_api_keys_success' => 'Personal API Key :key created sucessfully',
+    'here_is_api_key' => 'Here is your new personal access token. This is the only time it will be shown so do not lose it! You may now use this token to make API requests.',
     'api_key_warning' => 'When generating an API token, be sure to copy it down immediately as they will not be visible to you again.',
     'api_base_url' => 'Your API base url is located at:',
     'api_base_url_endpoint' => '/&lt;endpoint&gt;',
     'api_token_expiration_time' => 'API tokens are set to expire in:',
     'api_reference' => 'Please check the <a href="https://snipe-it.readme.io/reference" target="_blank">API reference</a> to find specific API endpoints and additional API documentation.',
     'profile_updated' => 'Account successfully updated',
+    'no_tokens' => 'You have not created any personal access tokens.',
+    'enable_sounds' => 'Enable sound effects',
+    'enable_confetti' => 'Enable confetti effects',
 );
diff --git a/resources/lang/ta-IN/admin/accessories/message.php b/resources/lang/ta-IN/admin/accessories/message.php
index 8e4d4dc1e9..9cf89c1e31 100644
--- a/resources/lang/ta-IN/admin/accessories/message.php
+++ b/resources/lang/ta-IN/admin/accessories/message.php
@@ -26,7 +26,11 @@ return array(
         'error'   		=> 'அசெஸரி அவுட் சரிபார்க்கப்படவில்லை, மீண்டும் முயற்சிக்கவும்',
         'success' 		=> 'அசெஸரி வெற்றிகரமாக சோதிக்கப்பட்டது.',
         'unavailable'   => 'Accessory is not available for checkout. Check quantity available',
-        'user_does_not_exist' => 'அந்த பயனர் தவறானது. தயவு செய்து மீண்டும் முயற்சிக்கவும்.'
+        'user_does_not_exist' => 'அந்த பயனர் தவறானது. தயவு செய்து மீண்டும் முயற்சிக்கவும்.',
+         'checkout_qty' => array(
+            'lte'  => 'There is currently only one available accessory of this type, and you are trying to check out :checkout_qty. Please adjust the checkout quantity or the total stock of this accessory and try again.|There are :number_currently_remaining total available accessories, and you are trying to check out :checkout_qty. Please adjust the checkout quantity or the total stock of this accessory and try again.',
+            ),
+           
     ),
 
     'checkin' => array(
diff --git a/resources/lang/ta-IN/admin/accessories/table.php b/resources/lang/ta-IN/admin/accessories/table.php
index a7236efd84..383b87b473 100644
--- a/resources/lang/ta-IN/admin/accessories/table.php
+++ b/resources/lang/ta-IN/admin/accessories/table.php
@@ -6,6 +6,4 @@ return array(
     'id'      					=> 'ஐடி',
     'require_acceptance'      	=> 'ஏற்றுக்கொள்ளுதல்',
     'title'      				=> 'துணை பெயர்',
-
-
 );
diff --git a/resources/lang/ta-IN/admin/components/message.php b/resources/lang/ta-IN/admin/components/message.php
index 25bea8e57c..f2c372c047 100644
--- a/resources/lang/ta-IN/admin/components/message.php
+++ b/resources/lang/ta-IN/admin/components/message.php
@@ -17,7 +17,8 @@ return array(
     'delete' => array(
         'confirm'   => 'நிச்சயமாக இந்த உறுப்பு நீக்க வேண்டுமா?',
         'error'   => 'கூறு நீக்குவதில் ஒரு சிக்கல் இருந்தது. தயவு செய்து மீண்டும் முயற்சிக்கவும்.',
-        'success' => 'கூறு வெற்றிகரமாக நீக்கப்பட்டது.'
+        'success' => 'கூறு வெற்றிகரமாக நீக்கப்பட்டது.',
+        'error_qty'   => 'Some components of this type are still checked out. Please check them in and try again.',
     ),
 
      'checkout' => array(
diff --git a/resources/lang/ta-IN/admin/consumables/general.php b/resources/lang/ta-IN/admin/consumables/general.php
index e134d0b918..e0f663d28e 100644
--- a/resources/lang/ta-IN/admin/consumables/general.php
+++ b/resources/lang/ta-IN/admin/consumables/general.php
@@ -8,4 +8,5 @@ return array(
     'remaining' 			            => 'மீதமுள்ள',
     'total' 			                => 'மொத்த',
     'update'                            => 'நுகர்வோர் புதுப்பிக்கவும்',
+    'inventory_warning'                 => 'The inventory of this consumable is below the minimum amount of :min_count',
 );
diff --git a/resources/lang/ta-IN/admin/consumables/message.php b/resources/lang/ta-IN/admin/consumables/message.php
index df08773648..38ffe4b60a 100644
--- a/resources/lang/ta-IN/admin/consumables/message.php
+++ b/resources/lang/ta-IN/admin/consumables/message.php
@@ -2,6 +2,7 @@
 
 return array(
 
+    'invalid_category_type' => 'The category must be a consumable category.',
     'does_not_exist' => 'நுகர்வோர் இல்லை.',
 
     'create' => array(
diff --git a/resources/lang/ta-IN/admin/custom_fields/general.php b/resources/lang/ta-IN/admin/custom_fields/general.php
index f0d81ad53f..47d0086b0a 100644
--- a/resources/lang/ta-IN/admin/custom_fields/general.php
+++ b/resources/lang/ta-IN/admin/custom_fields/general.php
@@ -35,7 +35,7 @@ return [
     'create_field_title' => 'Create a new custom field',
     'value_encrypted'      	        => 'இந்த புலத்தின் மதிப்பு தரவுத்தளத்தில் குறியாக்கம் செய்யப்பட்டுள்ளது. நிர்வாக பயனர்கள் மட்டுமே குறியாக்கப்பட்ட மதிப்புகளைக் காண முடியும்',
     'show_in_email'     => 'Include the value of this field in checkout emails sent to the user? Encrypted fields cannot be included in emails',
-    'show_in_email_short'     => 'Include in emails.',
+    'show_in_email_short' => 'Include in emails',
     'help_text' => 'Help Text',
     'help_text_description' => 'This is optional text that will appear below the form elements while editing an asset to provide context on the field.',
     'about_custom_fields_title' => 'About Custom Fields',
@@ -57,5 +57,8 @@ return [
     'show_in_requestable_list_short' => 'Show in requestable assets list',
     'show_in_requestable_list' => 'Show value in requestable assets list. Encrypted fields will not be shown',
     'encrypted_options' => 'This field is encrypted, so some display options will not be available.',
+    'display_checkin' => 'Display in checkin forms',
+    'display_checkout' => 'Display in checkout forms',
+    'display_audit' => 'Display in audit forms',
 
 ];
diff --git a/resources/lang/ta-IN/admin/custom_fields/message.php b/resources/lang/ta-IN/admin/custom_fields/message.php
index 93366a986d..5a8830bbc1 100644
--- a/resources/lang/ta-IN/admin/custom_fields/message.php
+++ b/resources/lang/ta-IN/admin/custom_fields/message.php
@@ -5,6 +5,7 @@ return array(
     'field' => array(
         'invalid'   => 'அந்த புலம் இல்லை.',
         'already_added'   => 'புலம் ஏற்கனவே சேர்க்கப்பட்டது',
+        'none_selected'   => 'No field selected',
 
         'create' => array(
             'error'   => 'புலம் உருவாக்கப்படவில்லை, மீண்டும் முயற்சிக்கவும்.',
diff --git a/resources/lang/ta-IN/admin/depreciations/general.php b/resources/lang/ta-IN/admin/depreciations/general.php
index cc279d5680..134df23b0e 100644
--- a/resources/lang/ta-IN/admin/depreciations/general.php
+++ b/resources/lang/ta-IN/admin/depreciations/general.php
@@ -13,4 +13,8 @@ return [
     'no_depreciations_warning'               => '<strong>Warning: </strong>
                       You do not currently have any depreciations set up.
                       Please set up at least one depreciation to view the depreciation report.',
+    'depreciation_method'                   => 'தேய்மானம் அறிக்கை',
+    'linear_depreciation'                   => 'Linear (Default)',
+    'half_1'                                => 'Half-year convention, always applied',
+    'half_2'                                => 'Half-year convention, applied with condition',
 ];
diff --git a/resources/lang/ta-IN/admin/hardware/form.php b/resources/lang/ta-IN/admin/hardware/form.php
index 8c62d147f6..48a7cb8836 100644
--- a/resources/lang/ta-IN/admin/hardware/form.php
+++ b/resources/lang/ta-IN/admin/hardware/form.php
@@ -55,8 +55,11 @@ return [
     'asset_location_update_default' => 'Update only default location',
     'asset_location_update_actual' => 'Update only actual location',
     'asset_not_deployable' => 'That asset status is not deployable. This asset cannot be checked out.',
-    'asset_deployable' => 'That status is deployable. This asset can be checked out.',
+    'asset_not_deployable_checkin' => 'That asset status is not deployable. Using this status label will checkin the asset.',
+    'asset_deployable' => 'This asset can be checked out.',
     'processing_spinner' => 'Processing... (This might take a bit of time on large files)',
+    'processing' => 'Processing... ',
     'optional_infos'  => 'Optional Information',
-    'order_details'   => 'Order Related Information'
+    'order_details'   => 'Order Related Information',
+    'calc_eol'    => 'If nulling the EOL date, use automatic EOL calculation based on the purchase date and EOL rate.',
 ];
diff --git a/resources/lang/ta-IN/admin/hardware/general.php b/resources/lang/ta-IN/admin/hardware/general.php
index 297fde84c6..30c592431d 100644
--- a/resources/lang/ta-IN/admin/hardware/general.php
+++ b/resources/lang/ta-IN/admin/hardware/general.php
@@ -5,8 +5,8 @@ return [
     'about_assets_text'            => 'சொத்துகள் வரிசை எண் அல்லது சொத்து குறிச்சொல் மூலம் கண்காணிக்கப்படும் உருப்படிகளாக இருக்கின்றன. ஒரு குறிப்பிட்ட உருப்படி விஷயங்களை அடையாளம் காண்பிக்கும் அதிக மதிப்புள்ள பொருட்களாக அவை இருக்கும்.',
     'archived'  				=> 'காப்பகப்படுத்தியவை',
     'asset'  					=> 'சொத்து',
-    'bulk_checkout'             => 'Checkout Assets',
-    'bulk_checkin'              => 'Checkin Assets',
+    'bulk_checkout'             => 'மொத்த புதுப்பிப்பு',
+    'bulk_checkin'              => 'Bulk Checkin',
     'checkin'  					=> 'சரிபார்ப்பு சொத்து',
     'checkout'  				=> 'சரிபார்ப்புச் சொத்து',
     'clone'  					=> 'குளோன் சொத்து',
@@ -27,8 +27,7 @@ return [
     'undeployable_tooltip'  	=> 'This asset has a status label that is undeployable and cannot be checked out at this time.',
     'view'  					=> 'சொத்து காண்க',
     'csv_error' => 'You have an error in your CSV file:',
-    'import_text' => '<p>Upload a CSV that contains asset history. The assets and users MUST already exist in the system, or they will be skipped. Matching assets for history import happens against the asset tag. We will try to find a matching user based on the user\'s name you provide, and the criteria you select below. If you do not select any criteria below, it will simply try to match on the username format you configured in the <code>Admin &gt; General Settings</code>.</p><p>Fields included in the CSV must match the headers: <strong>Asset Tag, Name, Checkout Date, Checkin Date</strong>. Any additional fields will be ignored. </p><p>Checkin Date: blank or future checkin dates will checkout items to associated user.  Excluding the Checkin Date column will create a checkin date with todays date.</p>
-    ',
+    'import_text' => '<p>Upload a CSV that contains asset history. The assets and users MUST already exist in the system, or they will be skipped. Matching assets for history import happens against the asset tag. We will try to find a matching user based on the user\'s name you provide, and the criteria you select below. If you do not select any criteria below, it will simply try to match on the username format you configured in the <code>Admin &gt; General Settings</code>.</p><p>Fields included in the CSV must match the headers: <strong>Asset Tag, Name, Checkout Date, Checkin Date</strong>. Any additional fields will be ignored. </p><p>Checkin Date: blank or future checkin dates will checkout items to associated user.  Excluding the Checkin Date column will create a checkin date with todays date.</p>    ',
     'csv_import_match_f-l' => 'Try to match users by <strong>firstname.lastname</strong> (<code>jane.smith</code>) format',
     'csv_import_match_initial_last' => 'Try to match users by <strong>first initial last name</strong> (<code>jsmith</code>) format',
     'csv_import_match_first' => 'Try to match users by <strong>first name</strong> (<code>jane</code>) format',
diff --git a/resources/lang/ta-IN/admin/hardware/message.php b/resources/lang/ta-IN/admin/hardware/message.php
index c051190f0a..17a5689d83 100644
--- a/resources/lang/ta-IN/admin/hardware/message.php
+++ b/resources/lang/ta-IN/admin/hardware/message.php
@@ -2,18 +2,23 @@
 
 return [
 
-    'undeployable' 		=> '<strong> எச்சரிக்கை: </strong> இந்த சொத்து தற்போது undeployable என குறிக்கப்பட்டுள்ளது. இந்த நிலை மாறியிருந்தால், சொத்து நிலையை புதுப்பிக்கவும்.',
-    'does_not_exist' 	=> 'சொத்து இல்லை.',
-    'does_not_exist_var'=> 'Asset with tag :asset_tag not found.',
-    'no_tag' 	        => 'No asset tag provided.',
+    'undeployable' 		 => '<strong>Warning: </strong> This asset has been marked as currently undeployable. If this status has changed, please update the asset status.',
+    'does_not_exist' 	 => 'சொத்து இல்லை.',
+    'does_not_exist_var' => 'Asset with tag :asset_tag not found.',
+    'no_tag' 	         => 'No asset tag provided.',
     'does_not_exist_or_not_requestable' => 'That asset does not exist or is not requestable.',
-    'assoc_users'	 	=> 'இந்த சொத்து தற்போது ஒரு பயனர் வெளியே சோதிக்கப்பட்டது மற்றும் நீக்க முடியாது. முதலில் சொத்தை சரிபார்த்து, மீண்டும் நீக்கி முயற்சிக்கவும்.',
+    'assoc_users'	 	 => 'இந்த சொத்து தற்போது ஒரு பயனர் வெளியே சோதிக்கப்பட்டது மற்றும் நீக்க முடியாது. முதலில் சொத்தை சரிபார்த்து, மீண்டும் நீக்கி முயற்சிக்கவும்.',
     'warning_audit_date_mismatch' 	=> 'This asset\'s next audit date (:next_audit_date) is before the last audit date (:last_audit_date). Please update the next audit date.',
+    'labels_generated'   => 'Labels were successfully generated.',
+    'error_generating_labels' => 'Error while generating labels.',
+    'no_assets_selected' => 'No assets selected.',
 
     'create' => [
         'error'   		=> 'சொத்து உருவாக்கப்படவில்லை, மீண்டும் முயற்சிக்கவும். :(',
         'success' 		=> 'சொத்து வெற்றிகரமாக உருவாக்கப்பட்டது. :)',
         'success_linked' => 'Asset with tag :tag was created successfully. <strong><a href=":link" style="color: white;">Click here to view</a></strong>.',
+        'multi_success_linked' => 'Asset with tag :links was created successfully.|:count assets were created succesfully. :links.',
+        'partial_failure' => 'An asset was unable to be created. Reason: :failures|:count assets were unable to be created. Reasons: :failures',
     ],
 
     'update' => [
@@ -51,20 +56,24 @@ return [
     ],
 
     'import' => [
+        'import_button'         => 'Process Import',
         'error'                 => 'சில உருப்படிகளை சரியாக இறக்குமதி செய்யவில்லை.',
         'errorDetail'           => 'பிழைகள் காரணமாக பின்வரும் உருப்படிகளை இறக்குமதி செய்யப்படவில்லை.',
         'success'               => 'உங்கள் கோப்பு இறக்குமதி செய்யப்பட்டது',
         'file_delete_success'   => 'உங்கள் கோப்பு வெற்றிகரமாக நீக்கப்பட்டது',
         'file_delete_error'      => 'கோப்பை நீக்க முடியவில்லை',
         'file_missing' => 'The file selected is missing',
+        'file_already_deleted' => 'The file selected was already deleted',
         'header_row_has_malformed_characters' => 'One or more attributes in the header row contain malformed UTF-8 characters',
         'content_row_has_malformed_characters' => 'One or more attributes in the first row of content contain malformed UTF-8 characters',
+        'transliterate_failure' => 'Transliteration from :encoding to UTF-8 failed due to invalid characters in input'
     ],
 
 
     'delete' => [
         'confirm'   	=> 'இந்த சொத்தை நிச்சயமாக நீக்க விரும்புகிறீர்களா?',
         'error'   		=> 'சொத்தை நீக்குவதில் ஒரு சிக்கல் இருந்தது. தயவு செய்து மீண்டும் முயற்சிக்கவும்.',
+        'assigned_to_error' => '{1}Asset Tag: :asset_tag is currently checked out. Check in this device before deletion.|[2,*]Asset Tags: :asset_tag are currently checked out. Check in these devices before deletion.',
         'nothing_updated'   => 'சொத்துகள் எதுவும் தேர்ந்தெடுக்கப்படவில்லை, எனவே எதுவும் நீக்கப்படவில்லை.',
         'success' 		=> 'சொத்து வெற்றிகரமாக நீக்கப்பட்டது.',
     ],
@@ -77,6 +86,11 @@ return [
         'no_assets_selected' => 'You must select at least one asset from the list',
     ],
 
+    'multi-checkout' => [
+        'error'   => 'Asset was not checked out, please try again|Assets were not checked out, please try again',
+        'success' => 'Asset checked out successfully.|Assets checked out successfully.',
+    ],
+
     'checkin' => [
         'error'   		=> 'சொத்து சரிபார்க்கப்படவில்லை, மீண்டும் முயற்சிக்கவும்',
         'success' 		=> 'சொத்து வெற்றிகரமாக சரிபார்க்கப்பட்டது.',
@@ -86,9 +100,10 @@ return [
     ],
 
     'requests' => [
-        'error'   		=> 'சொத்து கோரப்படவில்லை, மீண்டும் முயற்சிக்கவும்',
-        'success' 		=> 'சொத்து வெற்றிகரமாக கோரப்பட்டது.',
-        'canceled'      => 'புதுப்பித்து கோரிக்கை வெற்றிகரமாக ரத்துசெய்யப்பட்டது',
+        'error'   		=> 'Request was not successful, please try again.',
+        'success' 		=> 'Request successfully submitted.',
+        'canceled'      => 'Request successfully canceled.',
+        'cancel'        => 'Cancel this item request',
     ],
 
 ];
diff --git a/resources/lang/ta-IN/admin/hardware/table.php b/resources/lang/ta-IN/admin/hardware/table.php
index 74b6f6e1e2..88e6a6c3bc 100644
--- a/resources/lang/ta-IN/admin/hardware/table.php
+++ b/resources/lang/ta-IN/admin/hardware/table.php
@@ -25,7 +25,6 @@ return [
     'image'		    => 'சாதன படம்',
     'days_without_acceptance' => 'ஏற்றுக்கொள்ளாத நாட்கள்',
     'monthly_depreciation' => 'Monthly Depreciation',
-    'assigned_to'    => 'ஒதுக்கப்படும்',
     'requesting_user' => 'Requesting User',
     'requested_date' => 'Requested Date',
     'changed'       => 'Changed',
diff --git a/resources/lang/ta-IN/admin/kits/general.php b/resources/lang/ta-IN/admin/kits/general.php
index f57fb645c4..2b5c2d9cd0 100644
--- a/resources/lang/ta-IN/admin/kits/general.php
+++ b/resources/lang/ta-IN/admin/kits/general.php
@@ -47,4 +47,5 @@ return [
     'kit_deleted'                       => 'Kit was successfully deleted',
     'kit_model_updated'                 => 'Model was successfully updated',
     'kit_model_detached'                => 'Model was successfully detached',
+    'model_already_attached'            => 'Model already attached to kit',
 ];
diff --git a/resources/lang/ta-IN/admin/licenses/general.php b/resources/lang/ta-IN/admin/licenses/general.php
index 50632d752a..5015e6f72c 100644
--- a/resources/lang/ta-IN/admin/licenses/general.php
+++ b/resources/lang/ta-IN/admin/licenses/general.php
@@ -14,6 +14,7 @@ return array(
     'info'  					=> 'உரிமம் தகவல்',
     'license_seats'  			=> 'உரிமம் இருக்கைகள்',
     'seat'  					=> 'இருக்கை',
+    'seat_count'  				=> 'Seat :count',
     'seats'  					=> 'இருக்கைகள்',
     'software_licenses'  		=> 'மென்பொருள் உரிமங்கள்',
     'user'  					=> 'பயனர்',
@@ -23,12 +24,12 @@ return array(
         [
             'checkin_all'           => [
                 'button'            => 'Checkin All Seats',
-                'modal'             => 'This will action checkin one seat. | This action will checkin all :checkedout_seats_count seats for this license.',
+                'modal'             => 'This action will checkin one seat. | This action will checkin all :checkedout_seats_count seats for this license.',
                 'enabled_tooltip'   => 'Checkin ALL seats for this license from both users and assets',
                 'disabled_tooltip'  => 'This is disabled because there are no seats currently checked out',
                 'disabled_tooltip_reassignable'  => 'This is disabled because the License is not reassignable',
                 'success'           => 'License successfully checked in! | All licenses were successfully checked in!',
-                'log_msg'           => 'Checked in via bulk license checkout in license GUI',
+                'log_msg'           => 'Checked in via bulk license checkin in license GUI',
             ],
 
             'checkout_all'              => [
diff --git a/resources/lang/ta-IN/admin/licenses/message.php b/resources/lang/ta-IN/admin/licenses/message.php
index b95f37bbd5..a2b2e7f3f8 100644
--- a/resources/lang/ta-IN/admin/licenses/message.php
+++ b/resources/lang/ta-IN/admin/licenses/message.php
@@ -44,10 +44,13 @@ return array(
         'error'   => 'உரிமத்தை சரிபார்க்க ஒரு சிக்கல் இருந்தது. தயவு செய்து மீண்டும் முயற்சிக்கவும்.',
         'success' => 'உரிமம் வெற்றிகரமாக சரிபார்க்கப்பட்டது',
         'not_enough_seats' => 'Not enough license seats available for checkout',
+        'mismatch' => 'The license seat provided does not match the license',
+        'unavailable' => 'This seat is not available for checkout.',
     ),
 
     'checkin' => array(
         'error'   => 'உரிமத்தில் சோதனை ஒரு சிக்கல் இருந்தது. தயவு செய்து மீண்டும் முயற்சிக்கவும்.',
+        'not_reassignable' => 'License not reassignable',
         'success' => 'உரிமம் வெற்றிகரமாக சரிபார்க்கப்பட்டது'
     ),
 
diff --git a/resources/lang/ta-IN/admin/locations/message.php b/resources/lang/ta-IN/admin/locations/message.php
index 88f392b2e2..d114130efa 100644
--- a/resources/lang/ta-IN/admin/locations/message.php
+++ b/resources/lang/ta-IN/admin/locations/message.php
@@ -3,11 +3,12 @@
 return array(
 
     'does_not_exist' => 'இருப்பிடம் இல்லை.',
-    'assoc_users'    => 'This location is not currently deletable because it is the location of record for at least one asset or user, has assets assigned to it, or is the parent location of another location. Please update your models to no longer reference this company and try again. ',
+    'assoc_users'    => 'This location is not currently deletable because it is the location of record for at least one asset or user, has assets assigned to it, or is the parent location of another location. Please update your records to no longer reference this location and try again ',
     'assoc_assets'	 => 'இந்த இடம் தற்போது குறைந்தது ஒரு சொத்துடன் தொடர்புடையது மற்றும் நீக்கப்பட முடியாது. இந்த இருப்பிடத்தை இனி குறிப்பிடாமல் உங்கள் சொத்துக்களை புதுப்பித்து மீண்டும் முயற்சிக்கவும்.',
     'assoc_child_loc'	 => 'இந்த இடம் தற்போது குறைந்தது ஒரு குழந்தையின் இருப்பிடத்தின் பெற்றோர் மற்றும் அதை நீக்க முடியாது. இந்த இருப்பிடத்தை இனி குறிப்பிடாமல் இருக்க உங்கள் இருப்பிடங்களை புதுப்பித்து மீண்டும் முயற்சிக்கவும்.',
     'assigned_assets' => 'Assigned Assets',
     'current_location' => 'Current Location',
+    'open_map' => 'Open in :map_provider_icon Maps',
 
 
     'create' => array(
@@ -20,6 +21,11 @@ return array(
         'success' => 'இருப்பிடம் வெற்றிகரமாக புதுப்பிக்கப்பட்டது.'
     ),
 
+    'restore' => array(
+        'error'   => 'Location was not restored, please try again',
+        'success' => 'Location restored successfully.'
+    ),
+
     'delete' => array(
         'confirm'   	=> 'இந்த இருப்பிடத்தை நிச்சயமாக நீக்க விரும்புகிறீர்களா?',
         'error'   => 'இருப்பிடத்தை நீக்குவதில் ஒரு சிக்கல் இருந்தது. தயவு செய்து மீண்டும் முயற்சிக்கவும்.',
diff --git a/resources/lang/ta-IN/admin/locations/table.php b/resources/lang/ta-IN/admin/locations/table.php
index da22ce5fa0..06d989d39c 100644
--- a/resources/lang/ta-IN/admin/locations/table.php
+++ b/resources/lang/ta-IN/admin/locations/table.php
@@ -39,4 +39,5 @@ return [
     'signed_by_finance_auditor' => 'Signed By (Finance Auditor):',
     'signed_by_location_manager' => 'Signed By (Location Manager):',
     'signed_by'                 => 'Signed Off By:',
+    'clone'  					=> 'Clone Location',
 ];
diff --git a/resources/lang/ta-IN/admin/models/general.php b/resources/lang/ta-IN/admin/models/general.php
index 71d86f3707..29db82382b 100644
--- a/resources/lang/ta-IN/admin/models/general.php
+++ b/resources/lang/ta-IN/admin/models/general.php
@@ -3,7 +3,7 @@
 return array(
     'about_models_title'     => 'சொத்து மாடல்களைப் பற்றி',
     'about_models_text'           => 'சொத்து மாதிரிகள் ஒரே மாதிரியான சொத்துக்களை குழுவாக மாற்றுகின்றன. "MBP 2013", "ஐபோன் 6s", முதலியன',
-    'deleted'  					        => 'This model has been deleted.',
+    'deleted'  					=> 'This model has been deleted.',
     'bulk_delete'               => 'Bulk Delete Asset Models',
     'bulk_delete_help'               => 'Use the checkboxes below to confirm the deletion of the selected asset models. Asset models that have assets associated with them cannot be deleted until the assets are associated with a different model.',
     'bulk_delete_warn'          => 'You are about to delete one asset model.|You are about to delete :model_count asset models.',
diff --git a/resources/lang/ta-IN/admin/models/message.php b/resources/lang/ta-IN/admin/models/message.php
index 8c68944510..5dc52dff30 100644
--- a/resources/lang/ta-IN/admin/models/message.php
+++ b/resources/lang/ta-IN/admin/models/message.php
@@ -7,7 +7,7 @@ return array(
     'no_association' => 'WARNING! The asset model for this item is invalid or missing!',
     'no_association_fix' => 'This will break things in weird and horrible ways. Edit this asset now to assign it a model.',
     'assoc_users'	 => 'தற்போது இந்த மாதிரி ஒன்று ஒன்று அல்லது அதற்கு மேற்பட்ட சொத்துக்களுடன் தொடர்புடையது மற்றும் நீக்கப்பட முடியாது. சொத்துக்களை நீக்கிவிட்டு மீண்டும் நீக்குவதற்கு முயற்சிக்கவும்.',
-
+    'invalid_category_type' => 'This category must be an asset category.',
 
     'create' => array(
         'error'   => 'மாதிரி உருவாக்கப்பட்டது இல்லை, மீண்டும் முயற்சிக்கவும்.',
diff --git a/resources/lang/ta-IN/admin/reports/general.php b/resources/lang/ta-IN/admin/reports/general.php
index de7c1c9e2a..6641c6bfb6 100644
--- a/resources/lang/ta-IN/admin/reports/general.php
+++ b/resources/lang/ta-IN/admin/reports/general.php
@@ -4,6 +4,7 @@ return [
     'info'   => 'உங்கள் சொத்து அறிக்கையில் நீங்கள் விரும்பும் விருப்பங்களைத் தேர்ந்தெடுக்கவும்.',
     'deleted_user' => 'Deleted user',
     'send_reminder' => 'Send reminder',
+    'cannot_send_reminder' => 'User has been deleted or does not have an email address so cannot receive a reminder',
     'reminder_sent' => 'Reminder sent',
     'acceptance_deleted' => 'Acceptance request deleted',
     'acceptance_request' => 'Acceptance request',
@@ -13,5 +14,10 @@ return [
         'user_state' => 'User State',
         'user_country' => 'User Country',
         'user_zip' => 'User Zip'
-    ]
-];
\ No newline at end of file
+    ],
+    'open_saved_template' => 'Open Saved Template',
+    'save_template' =>  'Save Template',
+    'select_a_template' => 'Select a Template',
+    'template_name' => 'Template Name',
+    'update_template' => 'Update Template',
+];
diff --git a/resources/lang/ta-IN/admin/reports/message.php b/resources/lang/ta-IN/admin/reports/message.php
index 64ea8dbb67..2800bbdf0b 100644
--- a/resources/lang/ta-IN/admin/reports/message.php
+++ b/resources/lang/ta-IN/admin/reports/message.php
@@ -1,5 +1,16 @@
 <?php
 
-return array(
-    'error'   => 'நீங்கள் குறைந்தது ஒரு விருப்பத்தை தேர்ந்தெடுக்க வேண்டும்.'
-);
+return [
+    'about_templates' => 'About Saved Templates',
+    'saving_templates_description' => 'Select your options, then enter the name of your template in the box above and click the \'Save Template\' button. Use the dropdown to select a previously saved template.',
+    'create'  => [
+        'success' => 'Template saved successfully',
+    ],
+    'update' => [
+        'success' => 'Template updated successfully',
+    ],
+    'delete' => [
+        'success' => 'Template deleted',
+        'no_delete_permission' => 'Template does not exist or you do not have permission to delete it.',
+    ],
+];
diff --git a/resources/lang/ta-IN/admin/settings/general.php b/resources/lang/ta-IN/admin/settings/general.php
index 4a1facac3b..295e1f547a 100644
--- a/resources/lang/ta-IN/admin/settings/general.php
+++ b/resources/lang/ta-IN/admin/settings/general.php
@@ -8,13 +8,13 @@ return [
     'ad_append_domain'          => 'Append domain name to username field',
     'ad_append_domain_help'     => 'User isn\'t required to write "username@domain.local", they can just type "username".',
     'admin_cc_email'            => 'CC Email',
-    'admin_cc_email_help'       => 'If you would like to send a copy of checkin/checkout emails that are sent to users to an additional email account, enter it here. Otherwise leave this field blank.',
+    'admin_cc_email_help'       => 'Send a copy of checkin/checkout emails to this address.',
     'admin_settings'            => 'Admin Settings',
     'is_ad'				        => 'இது ஒரு Active Directory சேவையகம்',
     'alerts'                	=> 'Alerts',
     'alert_title'               => 'Update Notification Settings',
     'alert_email'				=> 'எச்சரிக்கைகள் அனுப்ப',
-    'alert_email_help'    => 'Email addresses or distribution lists you want alerts to be sent to, comma separated',
+    'alert_email_help'          => 'Email addresses or distribution lists you want alerts to be sent to, comma separated.',
     'alerts_enabled'			=> 'எச்சரிக்கைகள் இயக்கப்பட்டன',
     'alert_interval'			=> 'அலாரங்கள் முற்றுப்பெறல் (நாட்களில்)',
     'alert_inv_threshold'		=> 'சரக்கு அலர்ட் த்ரொல்ஹோல்',
@@ -31,15 +31,18 @@ return [
     'backups'					=> 'காப்புப்பிரதிகளில்',
     'backups_help'              => 'Create, download, and restore backups ',
     'backups_restoring'         => 'Restoring from Backup',
+    'backups_clean' => 'Clean the backed-up database before restore',
+    'backups_clean_helptext' => "This can be useful if you're changing between database versions",
     'backups_upload'            => 'Upload Backup',
     'backups_path'              => 'Backups on the server are stored in <code>:path</code>',
-    'backups_restore_warning'   => 'Use the restore button <small><span class="btn btn-xs btn-warning"><i class="text-white fas fa-retweet" aria-hidden="true"></i></span></small> to restore from a previous backup. (This does not currently work with S3 file storage or Docker.)<br><br>Your <strong>entire :app_name database and any uploaded files will be completely replaced</strong> by what\'s in the backup file.  ',
+    'backups_restore_warning'   => 'Use the restore button <small><span class="btn btn-xs btn-warning"><i class="text-white fas fa-retweet" aria-hidden="true"></i></span></small> to restore from a previous backup. (This does not currently work with S3 file storage or Docker.)<br><br>Your <strong>entire :app_name database and any uploaded files will be completely replaced</strong> by what\'s in the backup file  ',
     'backups_logged_out'         => 'All existing users, including you, will be logged out once your restore is complete.',
     'backups_large'             => 'Very large backups may time out on the restore attempt and may still need to be run via command line. ',
     'barcode_settings'			=> 'பார்கோடு அமைப்புகள்',
     'confirm_purge'			    => 'தூய்மையை உறுதிப்படுத்துக',
     'confirm_purge_help'		=> 'Enter the text "DELETE" in the box below to purge your deleted records. This action cannot be undone and will PERMANENTLY delete all soft-deleted items and users. (You should make a backup first, just to be safe.)',
     'custom_css'				=> 'தனிப்பயன் CSS',
+    'custom_css_placeholder'	=> 'Add your custom CSS',
     'custom_css_help'			=> 'நீங்கள் பயன்படுத்த விரும்பும் தனிப்பயன் CSS மீறல்களை உள்ளிடுக. &lt;style&gt;&lt;/style&gt; குறிச்சொற்களை சேர்க்க வேண்டாம்.',
     'custom_forgot_pass_url'	=> 'Custom Password Reset URL',
     'custom_forgot_pass_url_help'	=> 'This replaces the built-in forgotten password URL on the login screen, useful to direct people to internal or hosted LDAP password reset functionality. It will effectively disable local user forgotten password functionality.',
@@ -47,34 +50,34 @@ return [
     'dashboard_message_help'	=> 'This text will appear on the dashboard for anyone with permission to view the dashboard.',
     'default_currency'  		=> 'இயல்புநிலை நாணயம்',
     'default_eula_text'			=> 'இயல்புநிலை EULA',
+    'default_eula_text_placeholder' => 'Add your default EULA text',
     'default_language'			=> 'இயல்புநிலை மொழி',
     'default_eula_help_text'	=> 'நீங்கள் தனிபயன் EULA களை குறிப்பிட்ட சொத்து வகையுடன் இணைக்கலாம்.',
     'acceptance_note'           => 'Add a note for your decision (Optional)',
     'display_asset_name'        => 'சொத்து பெயரைக் காட்டு',
     'display_checkout_date'     => 'காட்சி புதுப்பிப்பு தேதி',
     'display_eol'               => 'அட்டவணை பார்வையில் EOL காட்டவும்',
-    'display_qr'                => 'சதுரக் குறியீடுகள் காட்டவும்',
+    'display_qr'                => 'Display 2D barcode',
     'display_alt_barcode'		=> '1D பார்கோடு காட்டவும்',
-    'email_logo'                => 'Email Logo',
     'barcode_type'				=> '2 டி பார்கோடு வகை',
     'alt_barcode_type'			=> '1 டி பார்கோடு வகை',
-    'email_logo_size'       => 'Square logos in email look best. ',
     'enabled'                   => 'Enabled',
     'eula_settings'				=> 'EULA அமைப்புகள்',
     'eula_markdown'				=> 'இந்த EULA <a href="https://help.github.com/articles/github-flavored-markdown/"> கிட் ருசியான மார்க் டவுன் 12335_1_321 ஐ அனுமதிக்கிறது.',
+    'empty_row_count'           => 'Field Start Offset (Empty Rows)',
+    'empty_row_count_help'      => 'Fields will begin populating after this many empty rows are skipped at the top of the label.',
     'favicon'                   => 'Favicon',
     'favicon_format'            => 'Accepted filetypes are ico, png, and gif. Other image formats may not work in all browsers.',
     'favicon_size'          => 'Favicons should be square images, 16x16 pixels.',
     'footer_text'               => 'Additional Footer Text ',
     'footer_text_help'          => 'This text will appear in the right-side footer. Links are allowed using <a href="https://help.github.com/articles/github-flavored-markdown/">Github flavored markdown</a>. Line breaks, headers, images, etc may result in unpredictable results.',
+    'footer_text_placeholder'   => 'Optional footer text',
     'general_settings'			=> 'பொது அமைப்புகள்',
-    'general_settings_keywords' => 'company support, signature, acceptance, email format, username format, images, per page, thumbnail, eula, gravatar, tos, dashboard, privacy',
     'general_settings_help'     => 'Default EULA and more',
     'generate_backup'			=> 'காப்பு உருவாக்குதல்',
     'google_workspaces'         => 'Google Workspaces',
     'header_color'              => 'தலைப்பு வண்ணம்',
     'info'                      => 'உங்கள் நிறுவலின் சில அம்சங்களைத் தனிப்பயனாக்க இந்த அமைப்புகள் உங்களை அனுமதிக்கின்றன.',
-    'label_logo'                => 'Label Logo',
     'label_logo_size'           => 'Square logos look best - will be displayed in the top right of each asset label. ',
     'laravel'                   => 'லாரேவல் பதிப்பு',
     'ldap'                      => 'LDAP',
@@ -94,7 +97,7 @@ return [
     'ldap_login_sync_help'      => 'This only tests that LDAP can sync correctly. If your LDAP Authentication query is not correct, users may still not be able to login. YOU MUST SAVE YOUR UPDATED LDAP SETTINGS FIRST.',
     'ldap_manager'              => 'LDAP Manager',
     'ldap_server'               => 'LDAP சேவையகம்',
-    'ldap_server_help'          => 'இது ldap: // (மறைகுறியாக்கப்பட்ட அல்லது TLS க்கு) அல்லது ldaps: // (SSL க்கு) தொடங்க வேண்டும்.',
+    'ldap_server_help'          => 'This should start with ldap:// (for unencrypted) or ldaps:// (for TLS or SSL)',
     'ldap_server_cert'			=> 'LDAP SSL சான்றிதழ் சரிபார்ப்பு',
     'ldap_server_cert_ignore'	=> 'தவறான SSL சான்றிதழை அனுமதி',
     'ldap_server_cert_help'		=> 'நீங்கள் சுயமாக கையொப்பமிடப்பட்ட SSL சான்றிதழைப் பயன்படுத்துகிறீர்கள் என்றால், இந்த செல்லாத பெட்டியை தேர்வுசெய்து தவறான SSL சான்றிதழை ஏற்றுக்கொள்ள விரும்புகிறேன்.',
@@ -108,8 +111,8 @@ return [
     'ldap_pword'                => 'LDAP Bind கடவுச்சொல்',
     'ldap_basedn'               => 'அடிப்படை பிணை DN',
     'ldap_filter'               => 'LDAP வடிகட்டி',
-    'ldap_pw_sync'              => 'LDAP கடவுச்சொல் ஒத்திசைவு',
-    'ldap_pw_sync_help'         => 'உள்ளூர் கடவுச்சொற்களை ஒத்திசைத்த LDAP கடவுச்சொற்களை வைத்திருக்க விரும்பவில்லை என்றால், இந்த பெட்டியை தேர்வுநீக்கம் செய்யவும். இதன் விளைவாக உங்கள் LDAP சேவையகம் சில காரணங்களுக்காக கிடைக்கவில்லை என்றால் உங்கள் பயனர் உள்நுழைய முடியாது என்று அர்த்தம்.',
+    'ldap_pw_sync'              => 'Cache LDAP Passwords',
+    'ldap_pw_sync_help'         => 'Uncheck this box if you do not wish to keep LDAP passwords cached as local hashed passwords. Disabling this means that your users may not be able to login if your LDAP server is unreachable for some reason.',
     'ldap_username_field'       => 'பயனாளர் புலம்',
     'ldap_lname_field'          => 'கடைசி பெயர்',
     'ldap_fname_field'          => 'LDAP முதல் பெயர்',
@@ -117,13 +120,15 @@ return [
     'ldap_version'              => 'LDAP பதிப்பு',
     'ldap_active_flag'          => 'LDAP செயலில் கொடி',
     'ldap_activated_flag_help'  => 'This value is used to determine whether a synced user can login to Snipe-IT. <strong>It does not affect the ability to check items in or out to them</strong>, and should be the <strong>attribute name</strong> within your AD/LDAP, <strong>not the value</strong>. <br><br>If this field is set to a field name that does not exist in your AD/LDAP, or the value in the AD/LDAP field is set to <code>0</code> or <code>false</code>, <strong>user login will be disabled</strong>. If the value in the AD/LDAP field is set to <code>1</code> or <code>true</code> or <em>any other text</em> means the user can log in. When the field is blank in your AD, we respect the <code>userAccountControl</code> attribute, which usually allows non-suspended users to log in.',
+    'ldap_invert_active_flag'   => 'LDAP Invert Active Flag',
+    'ldap_invert_active_flag_help'     => 'If enabled: when the value returned by LDAP Active Flag is <code>0</code> or <code>false</code> the user account will be active.',
     'ldap_emp_num'              => 'LDAP பணியாளர் எண்',
     'ldap_email'                => 'LDAP மின்னஞ்சல்',
     'ldap_test'                 => 'Test LDAP',
     'ldap_test_sync'            => 'Test LDAP Synchronization',
     'license'                   => 'Software License',
-    'load_remote'               => 'Use Gravatar',
-    'load_remote_help_text'		=> 'Uncheck this box if your install cannot load scripts from the outside internet. This will prevent Snipe-IT from trying load images from Gravatar.',
+    'load_remote'               => 'Load Remote Avatars',
+    'load_remote_help_text'		=> 'Uncheck this box if your install cannot load scripts from the outside internet. This will prevent Snipe-IT from trying load avatars from Gravatar or other outside sources.',
     'login'                     => 'Login Attempts',
     'login_attempt'             => 'Login Attempt',
     'login_ip'                  => 'IP Address',
@@ -131,6 +136,7 @@ return [
     'login_user_agent'          => 'User Agent',
     'login_help'                => 'List of attempted logins',
     'login_note'                => 'குறிப்பு குறிப்பு',
+    'login_note_placeholder'            => "If you do not have a login or have found a device belonging to this company, please call technical support at 888-555-1212. Thank you.",
     'login_note_help'           => 'விருப்பமாக உங்கள் உள்நுழைவுத் திரையில் சில விதிமுறைகளைச் சேர்க்கலாம், உதாரணமாக இழந்த அல்லது களவாடப்பட்ட சாதனத்தை கண்டறிந்தவர்களுக்கு உதவவும். இந்த புலம் <a href="https://help.github.com/articles/github-flavored-markdown/"> ஜி.ஐ.டி ருசியான மார்க் டவுன் </a> ஐ ஏற்றுக்கொள்கிறது',
     'login_remote_user_text'    => 'Remote User login options',
     'login_remote_user_enabled_text' => 'Enable Login with Remote User Header',
@@ -146,13 +152,16 @@ return [
     'logo_print_assets_help'    => 'Use branding on printable asset lists ',
     'full_multiple_companies_support_help_text' => 'தங்கள் நிறுவனத்தின் சொத்துக்களுக்கு நிறுவனங்களுக்கு ஒதுக்கப்பட்டுள்ள பயனர்களை (நிர்வாகிகள் உட்பட) கட்டுப்படுத்துதல்.',
     'full_multiple_companies_support_text' => 'முழு பல நிறுவனங்கள் ஆதரவு',
+    'scope_locations_fmcs_support_text'  => 'Scope Locations with Full Multiple Companies Support',
+    'scope_locations_fmcs_support_help_text'  => 'Restrict locations to their selected company.',
+    'scope_locations_fmcs_check_button' => 'Check Compatibility',
+    'scope_locations_fmcs_support_disabled_text'  => 'This option is disabled because you have conflicting locations set for :count or more items.',
     'show_in_model_list'   => 'Show in Model Dropdowns',
     'optional'					=> 'விருப்ப',
     'per_page'                  => 'பக்கம் ஒன்றுக்கு முடிவு',
     'php'                       => 'PHP பதிப்பு',
-    'php_info'                  => 'PHP Info',
+    'php_info'                  => 'PHP info',
     'php_overview'              => 'PHP',
-    'php_overview_keywords'     => 'phpinfo, system, info',
     'php_overview_help'         => 'PHP System info',
     'php_gd_info'               => 'நீங்கள் QR குறியீடுகள் காட்ட PHP- ஜிடி நிறுவ வேண்டும், நிறுவல் வழிமுறைகளை பார்க்கவும்.',
     'php_gd_warning'            => 'PHP பட செயலாக்கம் மற்றும் GD சொருகி நிறுவப்படவில்லை.',
@@ -218,6 +227,8 @@ return [
     'webhook_integration_help'    => ':app integration is optional, however the endpoint and channel are required if you wish to use it. To configure :app integration, you must first <a href=":webhook_link" target="_new" rel="noopener">create an incoming webhook</a> on your :app account. Click on the <strong>Test :app Integration</strong> button to confirm your settings are correct before saving. ',
     'webhook_integration_help_button'    => 'Once you have saved your :app information, a test button will appear.',
     'webhook_test_help'           => 'Test whether your :app integration is configured correctly. YOU MUST SAVE YOUR UPDATED :app SETTINGS FIRST.',
+    'shortcuts_enabled'         => 'Enable Shortcuts',
+    'shortcuts_help_text'       => '<strong>Windows</strong>: Alt + Access key, <strong>Mac</strong>: Control + Option + Access key',
     'snipe_version'  			=> 'ஸ்னாப்-ஐடி பதிப்பு',
     'support_footer'            => 'Support Footer Links ',
     'support_footer_help'       => 'Specify who sees the links to the Snipe-IT Support info and Users Manual',
@@ -227,7 +238,6 @@ return [
     'update'                    => 'அமைப்புகள் புதுப்பிக்கவும்',
     'value'                     => 'மதிப்பு',
     'brand'                     => 'பிராண்டிங்',
-    'brand_keywords'            => 'footer, logo, print, theme, skin, header, colors, color, css',
     'brand_help'                => 'Logo, Site Name',
     'web_brand'                 => 'Web Branding Type',
     'about_settings_title'      => 'அமைப்புகள் பற்றி',
@@ -276,6 +286,8 @@ return [
     'two_factor_enrollment_text'	=> "இரண்டு காரணி அங்கீகாரம் தேவைப்படுகிறது, ஆனால் உங்கள் சாதனம் இதுவரை பதிவுசெய்யப்படவில்லை. உங்கள் Google Authenticator பயன்பாட்டைத் திறந்து உங்கள் சாதனத்தை சேர்ப்பதற்கு கீழே உள்ள QR குறியீட்டை ஸ்கேன் செய்யவும். உங்கள் சாதனத்தை நீங்கள் சேர்ந்தவுடன், கீழே உள்ள குறியீட்டை உள்ளிடுக",
     'require_accept_signature'      => 'கையொப்பம் தேவை',
     'require_accept_signature_help_text'      => 'இந்த அம்சத்தை இயக்குவதால், சொத்துக்களை ஏற்கும் வகையில் பயனர்கள் உடனே உள்நுழைய வேண்டும்.',
+    'require_checkinout_notes'  => 'Require Notes on Checkin/Checkout',
+    'require_checkinout_notes_help_text'    => 'Enabling this feature will require the note fields to be populated when checking in or checking out an asset.',
     'left'        => 'விட்டு',
     'right'        => 'வலது',
     'top'        => 'மேல்',
@@ -313,24 +325,24 @@ return [
     'filter_by_keyword' => 'Filter by setting keyword',
     'security' => 'Security',
     'security_title' => 'Update Security Settings',
-    'security_keywords' => 'password, passwords, requirements, two factor, two-factor, common passwords, remote login, logout, authentication',
     'security_help' => 'Two-factor, Password Restrictions',
-    'groups_keywords' => 'permissions, permission groups, authorization',
     'groups_help' => 'Account permission groups',
     'localization' => 'Localization',
     'localization_title' => 'Update Localization Settings',
-    'localization_keywords' => 'localization, currency, local, locale, time zone, timezone, international, internatinalization, language, languages, translation',
     'localization_help' => 'Language, date display',
     'notifications' => 'Notifications',
     'notifications_help' => 'Email Alerts & Audit Settings',
     'asset_tags_help' => 'Incrementing and prefixes',
     'labels' => 'Labels',
     'labels_title' => 'Update Label Settings',
-    'labels_help' => 'Label sizes &amp; settings',
-    'purge_keywords' => 'permanently delete',
+    'labels_help' => 'Barcodes &amp; label settings',
     'purge_help' => 'நீக்கப்பட்ட ரெகார்டுகளை அகற்றவும்',
     'ldap_extension_warning' => 'It does not look like the LDAP extension is installed or enabled on this server. You can still save your settings, but you will need to enable the LDAP extension for PHP before LDAP syncing or login will work.',
     'ldap_ad' => 'LDAP/AD',
+    'ldap_test_label' => 'Test LDAP Sync',
+    'ldap_test_login' => ' Test LDAP Login',
+    'ldap_username_placeholder' => 'LDAP Username',
+    'ldap_password_placeholder' => 'LDAP Password',
     'employee_number' => 'Employee Number',
     'create_admin_user' => 'Create a User ::',
     'create_admin_success' => 'Success! Your admin user has been added!',
@@ -342,6 +354,8 @@ return [
     'setup_migration_create_user' => 'Next: Create User',
     'ldap_settings_link' => 'LDAP Settings Page',
     'slack_test' => 'Test <i class="fab fa-slack"></i> Integration',
+    'status_label_name' => 'Status Label Name',
+    'super_admin_only'  => 'Super Admin Only',
     'label2_enable'           => 'New Label Engine',
     'label2_enable_help'      => 'Switch to the new label engine. <b>Note: You will need to save this setting before setting others.</b>',
     'label2_template'         => 'Template',
@@ -356,12 +370,15 @@ return [
     'label2_2d_type'          => '2 டி பார்கோடு வகை',
     'label2_2d_type_help'     => 'Format for 2D barcodes',
     'label2_2d_target'        => '2D Barcode Target',
-    'label2_2d_target_help'   => 'The URL the 2D barcode points to when scanned',
+    'label2_2d_target_help'   => 'The data that will be contained in the 2D barcode',
     'label2_fields'           => 'Field Definitions',
     'label2_fields_help'      => 'Fields can be added, removed, and reordered in the left column. For each field, multiple options for Label and DataSource can be added, removed, and reordered in the right column.',
+    'purge_barcodes' => 'Purge Barcodes',
     'help_asterisk_bold'    => 'Text entered as <code>**text**</code> will be displayed as bold',
     'help_blank_to_use'     => 'Leave blank to use the value from <code>:setting_name</code>',
     'help_default_will_use' => '<code>:default</code> will use the value from <code>:setting_name</code>. <br>Note that the value of the barcodes must comply with the respective barcode spec in order to be successfully generated. Please see <a href="https://snipe-it.readme.io/docs/barcodes">the documentation <i class="fa fa-external-link"></i></a> for more details. ',
+    'asset_id'              => 'Asset ID',
+    'data'               => 'Data',
     'default'               => 'Default',
     'none'                  => 'None',
     'google_callback_help' => 'This should be entered as the callback URL in your Google OAuth app settings in your organization&apos;s <strong><a href="https://console.cloud.google.com/" target="_blank">Google developer console <i class="fa fa-external-link" aria-hidden="true"></i></a></strong>.',
@@ -373,7 +390,100 @@ return [
     'database_driver' => 'Database Driver',
     'bs_table_storage' => 'Table Storage',
     'timezone' => 'Timezone',
+    'test_mail' => 'Test Mail',
     'profile_edit'          => 'Edit Profile',
     'profile_edit_help'          => 'Allow users to edit their own profiles.',
+    'default_avatar' => 'Custom Default Avatar',
+    'default_avatar_help' => 'This image will be displayed as a profile if a user does not have a profile photo.',
+    'restore_default_avatar' => 'Restore <a href=":default_avatar" data-toggle="lightbox" data-type="image">original system default avatar</a>',
+    'restore_default_avatar_help' => '',
+    'due_checkin_days' => 'Due For Checkin Warning',
+    'due_checkin_days_help' => 'How many days before the expected checkin of an asset should it be listed in the "Due for checkin" page?',
+    'no_groups' => 'No groups have been created yet. Visit <code>Admin Settings > Permission Groups</code> to add one.',
+    'text' => 'Text',
+
+    'username_formats' => [
+        'username_format'		=> 'பயனர்பெயர் வடிவமைப்பு',
+        'firstname_lastname_format'	=> 'முதல் பெயர் கடைசி பெயர் (jane.smith)',
+        'first_name_format'	        => 'First Name (jane)',
+        'last_name_format'		=> 'Last Name (doe)',
+        'filastname_format'			=> 'First Initial Last Name (jsmith)',
+        'lastnamefirstinitial_format' =>  'Last Name First Initial (smithj)',
+        'firstname_lastname_underscore_format' => 'First Name Last Name (jane_smith)',
+        'firstinitial.lastname' => 'First Initial Last Name (j.smith)',
+        'lastname_firstinitial' => 'Last Name First Initial (smith_j)',
+        'lastname_dot_firstinitial_format' => 'Last Name First Initial (smith.j)',
+        'firstnamelastname'     => 'First Name Last Name (janesmith)',
+        'firstnamelastinitial'  => 'First Name Last Initial (janes)',
+        'lastnamefirstname'      => 'Last Name.First Name (smith.jane)',
+    ],
+
+    'email_formats' => [
+        'email_format'			=> 'மின்னஞ்சல் வடிவமைப்பு',
+        'firstname_lastname_format'	=> 'முதல் பெயர் கடைசி பெயர் (jane.smith@example.com)',
+        'first_name_format'		=> 'முதல் பெயர் (jane@example.com)',
+        'last_name_format'		=> 'Last Name (doe@example.com)',
+        'filastname_format'			=> 'முதல் தொடக்க கடைசி பெயர் (jsmith@example.com)',
+        'lastnamefirstinitial_format' =>  'Last Name First Initial (smithj@example.com)',
+        'firstname_lastname_underscore_format' => 'முதல் பெயர் கடைசி பெயர் (jane.smith@example.com)',
+        'firstinitial.lastname' => 'First Initial Last Name (j.smith@example.com)',
+        'lastname_firstinitial' => 'Last Name First Initial (smith_j@example.com)',
+        'lastname_dot_firstinitial_format' => 'Last Name First Initial (smith.j@example.com)',
+        'firstnamelastname'     => 'First Name Last Name (janesmith@example.com)',
+        'firstnamelastinitial'  => 'First Name Last Initial (janes@example.com)',
+        'lastnamefirstname'      => 'Last Name.First Name (smith.jane@example.com)',
+    ],
+
+
+
+    'logo_labels' => [
+        'acceptance_pdf_logo'       => 'PDF Logo',
+        'email_logo'                => 'Email Logo',
+        'label_logo'                => 'Label Logo',
+        'logo'                      => 'Site Logo',
+        'favicon'                   => 'Favicon',
+    ],
+
+    'logo_help' => [
+        'email_logo_size'       => 'Square logos in email look best. ',
+    ],
+
+    'logo_option_types' => [
+        'text' => 'Text',
+        'logo' => 'சின்னம்',
+        'logo_and_text' => 'Logo and Text',
+    ],
+
+
+    'legends' => [
+        'scoping' => 'Scoping',
+        'formats' => 'Default Formats',
+        'profiles' => 'User Profiles',
+        'eula' => 'EULA & Acceptance Preferences',
+        'misc_display' => 'Miscellaneous Display Options',
+        'email' => 'Email Preferences',
+        'checkin' => 'Checkin Preferences',
+        'dashboard' => 'Login & Dashboard Preferences',
+        'misc' => 'Miscellaneous',
+        'logos' => 'Logos & Display',
+        'colors' => 'Colors & Skins',
+        'footer' => 'Footer Preferences',
+        'security' => 'Security Preferences',
+        'general' => 'General',
+        'intervals' => 'Intervals & Thresholds',
+    ],
+
+
+    /* Keywords for settings overview help */
+    'keywords' => [
+        'brand'             => 'footer, logo, print, theme, skin, header, colors, color, css',
+        'general_settings'  => 'company support, signature, acceptance, email format, username format, images, per page, thumbnail, eula, gravatar, tos, dashboard, privacy',
+        'groups'            => 'permissions, permission groups, authorization',
+        'labels'            => 'labels, barcodes, barcode, sheets, print, upc, qr, 1d, 2d',
+        'localization'      => 'localization, currency, local, locale, time zone, timezone, international, internatinalization, language, languages, translation',
+        'php_overview'      => 'phpinfo, system, info',
+        'purge'             => 'permanently delete',
+        'security'          => 'password, passwords, requirements, two factor, two-factor, common passwords, remote login, logout, authentication',
+    ],
 
 ];
diff --git a/resources/lang/ta-IN/admin/settings/message.php b/resources/lang/ta-IN/admin/settings/message.php
index a7511fe5ed..9cc3bc08a3 100644
--- a/resources/lang/ta-IN/admin/settings/message.php
+++ b/resources/lang/ta-IN/admin/settings/message.php
@@ -14,6 +14,9 @@ return [
         'restore_warning'       => 'Yes, restore it. I acknowledge that this will overwrite any existing data currently in the database. This will also log out all of your existing users (including you).',
         'restore_confirm'       => 'Are you sure you wish to restore your database from :filename?'
     ],
+    'restore' => [
+        'success'               => 'Your system backup has been restored. Please log in again.'
+    ],
     'purge' => [
         'error'     => 'அகற்றும் போது பிழை ஏற்பட்டது.',
         'validation_failed'     => 'உங்கள் தூய்மைப்படுத்தல் உறுதிப்படுத்தல் தவறானது. உறுதிப்படுத்தல் பெட்டியில் "DELETE" என்ற வார்த்தையை தயவுசெய்து தட்டச்சு செய்யவும்.',
@@ -33,6 +36,9 @@ return [
         'testing_authentication' => 'Testing LDAP Authentication...',
         'authentication_success' => 'User authenticated against LDAP successfully!'
     ],
+    'labels' => [
+        'null_template' => 'Label template not found. Please select a template.',
+        ],
     'webhook' => [
         'sending' => 'Sending :app test message...',
         'success' => 'Your :webhook_name Integration works!',
@@ -42,5 +48,12 @@ return [
         'error' => 'Something went wrong. :app responded with: :error_message',
         'error_redirect' => 'ERROR: 301/302 :endpoint returns a redirect. For security reasons, we don’t follow redirects. Please use the actual endpoint.',
         'error_misc' => 'Something went wrong. :( ',
-    ]
+        'webhook_fail' => ' webhook notification failed: Check to make sure the URL is still valid.',
+        'webhook_channel_not_found' => ' webhook channel not found.',
+        'ms_teams_deprecation' => 'The selected Microsoft Teams webhook URL will be deprecated Dec 31st, 2025. Please use a workflow URL. Microsoft\'s documentation on creating a workflow can be found <a href="https://support.microsoft.com/en-us/office/create-incoming-webhooks-with-workflows-for-microsoft-teams-8ae491c7-0394-4861-ba59-055e33f75498" target="_blank"> here.</a>',
+    ],
+    'location_scoping' => [
+        'not_saved' => 'Your settings were not saved.',
+        'mismatch' => 'There is 1 item in the database that need your attention before you can enable location scoping.|There are :count items in the database that need your attention before you can enable location scoping.',
+    ],
 ];
diff --git a/resources/lang/ta-IN/admin/statuslabels/table.php b/resources/lang/ta-IN/admin/statuslabels/table.php
index cf2a70dd86..cc2f6c57d6 100644
--- a/resources/lang/ta-IN/admin/statuslabels/table.php
+++ b/resources/lang/ta-IN/admin/statuslabels/table.php
@@ -1,14 +1,14 @@
 <?php
 
 return array(
-    'about'      	=> 'தகுதி லேபிள்களைப் பற்றி',
+    'about'      	=> 'About Status Types',
     'archived'      	=> 'காப்பகப்படுத்தியவை',
     'create'      	=> 'நிலை லேபிள் உருவாக்கவும்',
     'color'      	=> 'விளக்கப்படம் நிறம்',
     'default_label' => 'Default Label',
     'default_label_help' => 'This is used to ensure your most commonly used status labels appear at the top of the select box when creating/editing assets.',
     'deployable'      	=> 'அணியப்படுத்தக்',
-    'info'      	=> 'நிலைமை லேபிள்கள் உங்கள் சொத்துக்கள் இருக்கும் பல்வேறு மாநிலங்களை விவரிக்க பயன்படுத்தப்படுகின்றன. அவை சரிசெய்யப்பட்டு, இழந்த / திருடப்பட்டவையாக இருக்கலாம். நீங்கள் வரிசைப்படுத்தக்கூடிய, நிலுவையிலுள்ள மற்றும் காப்பகப்படுத்தப்பட்ட சொத்துகளுக்கான புதிய நிலை லேபிள்களை உருவாக்கலாம்.',
+    'info'      	=> 'Status label types are used to describe the various states your assets could be in. They may be out for repair, lost/stolen, etc. You can create new status labels for your deployable, pending and archived assets according to your own workflow. For more information, <a href="https://snipe-it.readme.io/docs/overview#status-labels" target="_blank">see the documentation <i class="fa fa-external-link"></i></a>.',
     'name'      	=> 'நிலைமை பெயர்',
     'pending'      	=> 'நிலுவையில்',
     'status_type'   => 'நிலை வகை',
diff --git a/resources/lang/ta-IN/admin/users/general.php b/resources/lang/ta-IN/admin/users/general.php
index a61ec5bfc1..4432efbede 100644
--- a/resources/lang/ta-IN/admin/users/general.php
+++ b/resources/lang/ta-IN/admin/users/general.php
@@ -19,6 +19,8 @@ return [
     'print_assigned'    => 'ஒப்படைக்கப்பட்ட அனைத்தையும் அச்சிடு',
     'email_assigned'    => 'Email List of All Assigned',
     'user_notified'     => 'User has been emailed a list of their currently assigned items.',
+    'users_notified'    => 'The user has been emailed a list of their currently assigned items.|:count users have been emailed a list of their currently assigned items.',
+    'users_notified_warning' => ':count user has been emailed a list of their currently assigned items, however :no_email users did not have an email address so could not be emailed.|:count users have been emailed a list of their currently assigned items, however :no_email user(s) did not have an email address so could not be emailed.',
     'auto_assign_label' => 'Include this user when auto-assigning eligible licenses',
     'auto_assign_help'  => 'Skip this user in auto assignment of licenses',
     'software_user'     => 'மென்பொருள் சரிபார்க்கப்பட்டது: பெயர்',
diff --git a/resources/lang/ta-IN/admin/users/message.php b/resources/lang/ta-IN/admin/users/message.php
index 9176bea4fe..54b2271a7e 100644
--- a/resources/lang/ta-IN/admin/users/message.php
+++ b/resources/lang/ta-IN/admin/users/message.php
@@ -6,7 +6,7 @@ return array(
     'declined'                  => 'இந்த சொத்து வெற்றிகரமாக நிராகரித்தது.',
     'bulk_manager_warn'	        => 'உங்கள் பயனர் வெற்றிகரமாக புதுப்பிக்கப்பட்டிருந்தாலும், உங்கள் மேலாளர் நுழைவு சேமிக்கப்படவில்லை, ஏனெனில் நீங்கள் தேர்ந்தெடுத்த மேலாளர் பயனர் பட்டியலில் திருத்தப்பட வேண்டும், மேலும் பயனர்கள் தங்கள் மேலாளராக இருக்கலாம். மேலாளரைத் தவிர்த்து உங்கள் பயனர்களை மீண்டும் தேர்ந்தெடுக்கவும்.',
     'user_exists'               => 'பயனர் ஏற்கனவே உள்ளது!',
-    'user_not_found'            => 'பயனர் இல்லை.',
+    'user_not_found'            => 'User does not exist or you do not have permission view them.',
     'user_login_required'       => 'உள்நுழைவுத் துறை தேவைப்படுகிறது',
     'user_has_no_assets_assigned' => 'No assets currently assigned to user.',
     'user_password_required'    => 'கடவுச்சொல் தேவை.',
@@ -53,6 +53,7 @@ return array(
         'ldap_could_not_search' => 'LDAP சேவையகத்தை தேட முடியவில்லை. LDAP கட்டமைப்பு கோப்பில் உங்கள் LDAP சர்வர் கட்டமைப்பை சரிபார்க்கவும். <br> LDAP சேவையகத்திலிருந்து பிழை:',
         'ldap_could_not_get_entries' => 'LDAP சேவையகத்திலிருந்து உள்ளீடுகளை பெற முடியவில்லை. LDAP கட்டமைப்பு கோப்பில் உங்கள் LDAP சர்வர் கட்டமைப்பை சரிபார்க்கவும். <br> LDAP சேவையகத்திலிருந்து பிழை:',
         'password_ldap' => 'இந்த கணக்கிற்கான கடவுச்சொல் LDAP / Active Directory மூலம் நிர்வகிக்கப்படுகிறது. உங்கள் கடவுச்சொல்லை மாற்ற உங்கள் IT பிரிவை தொடர்பு கொள்ளவும்.',
+        'multi_company_items_assigned' => 'This user has items assigned that belong to a different company. Please check them in or edit their company.'
     ),
 
     'deletefile' => array(
diff --git a/resources/lang/ta-IN/admin/users/table.php b/resources/lang/ta-IN/admin/users/table.php
index 196d0921fc..df09f319d5 100644
--- a/resources/lang/ta-IN/admin/users/table.php
+++ b/resources/lang/ta-IN/admin/users/table.php
@@ -22,7 +22,7 @@ return array(
     'managed_locations'     => 'நிர்வகிக்கப்பட்ட இடங்கள்',
     'managed_users'         => 'Managed Users',
     'name' 					=> 'பெயர்',
-    'nogroup'               => 'No groups have been created yet. To add one, visit: ',
+    'nogroup'               => 'No groups have been created yet. To add one, visit:',
     'notes'                 => 'குறிப்புக்கள்',
     'password_confirm' 		=> 'கடவுச்சொல்லை உறுதிப்படுத்துக',
     'password' 				=> 'கடவுச்சொல்',
diff --git a/resources/lang/ta-IN/auth.php b/resources/lang/ta-IN/auth.php
index 5346ff7497..b319b97c62 100644
--- a/resources/lang/ta-IN/auth.php
+++ b/resources/lang/ta-IN/auth.php
@@ -15,6 +15,6 @@ return array(
 
     'failed' => 'இந்த விவரங்கள் எங்கள் பதிவுகளுடன் பொருந்தவில்லை.',
     'password' => 'உள்ளிடப்பட்ட கடவுச்சொல் தவறானது.',
-    'throttle' => 'பல உள்நுழைவு முயற்சிகள். தயவுசெய்து மீண்டும் :seconds விநாடிகள் கழித்து முயற்சிக்கவும்.',
+    'throttle' => 'Too many login attempts. Please try again in :minutes minute(s).',
 
 );
diff --git a/resources/lang/ta-IN/auth/message.php b/resources/lang/ta-IN/auth/message.php
index 9eded8b32c..d85f3d0bab 100644
--- a/resources/lang/ta-IN/auth/message.php
+++ b/resources/lang/ta-IN/auth/message.php
@@ -6,8 +6,6 @@ return array(
     'account_not_found'      => 'பயனர் பெயர் அல்லது கடவுச்சொல் தவறானது.',
     'account_not_activated'  => 'இந்த பயனர் கணக்கு செயல்படுத்தப்படவில்லை.',
     'account_suspended'      => 'இந்த பயனர் கணக்கு இடைநீக்கம் செய்யப்பட்டுள்ளது.',
-    'account_banned'         => 'இந்த பயனர் கணக்கு தடைசெய்யப்பட்டுள்ளது.',
-    'throttle'               => 'Too many failed login attempts. Please try again in :minutes minutes.',
 
     'two_factor' => array(
         'already_enrolled'      => 'Your device is already enrolled.',
diff --git a/resources/lang/ta-IN/button.php b/resources/lang/ta-IN/button.php
index ecc7bf0f90..d000cac87e 100644
--- a/resources/lang/ta-IN/button.php
+++ b/resources/lang/ta-IN/button.php
@@ -7,6 +7,7 @@ return [
     'checkin_and_delete'  	    => 'அனைத்தையும் பெற்றுக்கொள் / பயனரை நீக்கு',
     'delete'  	                => 'அழி',
     'edit'    	                => 'தொகு',
+    'clone'    	                => 'Clone',
     'restore' 	                => 'மீட்டமை',
     'remove'                    => 'நீக்கு',
     'request'                   => 'வேண்டுகோள்',
@@ -21,4 +22,13 @@ return [
     'add_maintenance'           => 'பராமரிப்பைச் சேர்',
     'append'                    => 'இணைக்கவும்',
     'new'                       => 'புதிய',
+    'var' => [
+        'clone'     => 'Clone :item_type',
+        'edit'      => 'Edit :item_type',
+        'delete'    => 'Delete :item_type',
+        'restore'   => 'Restore :item_type',
+        'create'    => 'Create New :item_type',
+        'checkout'  => 'Checkout :item_type',
+        'checkin'   => 'Checkin :item_type',
+    ]
 ];
diff --git a/resources/lang/ta-IN/general.php b/resources/lang/ta-IN/general.php
index e61411ab58..9db1e37fc0 100644
--- a/resources/lang/ta-IN/general.php
+++ b/resources/lang/ta-IN/general.php
@@ -1,19 +1,19 @@
 <?php
 
 return [
-    '2FA_reset'             => '2FA reset',
+    '2FA_reset'             => '2FA மீட்டமை',
     'accessories'			=> 'கருவிகள்',
     'activated'			    => 'இயக்கப்பட்டது',
-    'accepted_date'         => 'Date Accepted',
+    'accepted_date'         => 'ஏற்றுக்கொள்ளப்பட்ட தேதி',
     'accessory'				=> 'துணை',
     'accessory_report'		=> 'துணை குறிப்பு',
     'action'                => 'அதிரடி',
     'activity_report'		=> 'செயல்பாட்டு அறிக்கை',
     'address'				=> 'முகவரி',
-    'admin'					=> 'நிர்வாகம்',
-    'admin_tooltip'			=> 'This user has admin privileges',
-    'superuser'				=> 'Superuser',
-    'superuser_tooltip'		=> 'This user has superuser privileges',
+    'admin'					=> 'Admin Settings',
+    'admin_tooltip'			=> 'இந்தப் பயனருக்கு நிர்வாகச் சிறப்புரிமைகள் உள்ளன',
+    'superuser'				=> 'சூப்பர் யூசர்',
+    'superuser_tooltip'		=> 'இந்தப் பயனருக்கு சூப்பர் யூசர் சிறப்புரிமைகள் உள்ளன',
     'administrator'			=> 'நிர்வாகி',
     'add_seats'             => 'சேர்க்கப்பட்டது இடங்கள்',
     'age'                   => "வயது",
@@ -23,20 +23,23 @@ return [
     'asset_models'			=> 'சொத்து மாதிரிகள்',
     'asset_model'			=> 'மாதிரி',
     'asset'					=> 'சொத்து',
+    'asset_previous'        => 'Asset (Previously Assigned)',
     'asset_report'          => 'சொத்து அறிக்கை',
     'asset_tag'				=> 'சொத்து டேக்',
     'asset_tags'            => 'சொத்துக் குறிகள்',
     'assets_available'		=> 'சொத்துக்கள் கிடைக்கின்றன',
     'accept_assets'         => ':name சொத்துக்களை ஒப்புக்கொள்',
     'accept_assets_menu'    => 'சொத்துக்களை ஒப்புக்கொள்',
+    'accept_item'           => 'Accept Item',
     'audit'				    => 'தணிக்கை',
+    'audits'				=> 'Audits',
     'audit_report'			=> 'தணிக்கைப் பதிவு',
     'assets'				=> 'சொத்துக்கள்',
-    'assets_audited'        => 'assets audited',
-    'assets_checked_in_count'     => 'assets checked in',
-    'assets_checked_out_count'     => 'assets checked out',
-    'asset_deleted_warning'     => 'This asset has been deleted. You must restore it before you can assign it to someone.',
-    'assigned_date'         => 'Date Assigned',
+    'assets_audited'        => 'தணிக்கை செய்யப்பட்ட பொருள்கள்',
+    'assets_checked_in_count'     => 'பொருள்கள் திரும்பபெறப்பட்டது',
+    'assets_checked_out_count'     => 'பொருள்கள் ஒப்படைக்கப்பட்டது',
+    'asset_deleted_warning'     => 'இந்தப் பொருள் நீக்கப்பட்டுள்ளது. ஒருவருக்கு ஒதுக்கும் முன், அதை மீட்டெடுக்க வேண்டும்.',
+    'assigned_date'         => 'ஒதுக்கப்பட்ட தேதி',
     'assigned_to'           => ':nameக்கு ஒதுக்கப்பட்டது',
     'assignee'              => 'Assigned to',
     'avatar_delete'         => 'Avatar நீக்கு',
@@ -61,9 +64,12 @@ return [
     'changepassword'  		=> 'கடவுச்சொல்லை மாற்று',
     'checkin'  				=> 'புதுப்பிப்பது',
     'checkin_from'  		=> 'இருந்து சரிபார்க்கவும்',
+    'checkin_note'  		=> 'Checkin Note',
+    'checkout_note'  		=> 'Checkout Note',
     'checkout'  			=> 'வெளியேறுதல்',
     'checkouts_count'       => 'Checkouts',
     'checkins_count'        => 'Checkins',
+    'checkin_and_delete'  	=> 'Checkin and Delete',
     'user_requests_count'   => 'வேண்டுகோள்',
     'city'  				=> 'பெருநகரம்',
     'click_here'			=> 'இங்கே கிளிக் செய்யவும்',
@@ -77,7 +83,7 @@ return [
     'consumables'			=> 'நுகர்பொருள்கள்',
     'country'  				=> 'நாடு',
     'could_not_restore'     => 'Error restoring :item_type: :error',
-    'not_deleted'           => 'The :item_type is not deleted so it cannot be restored',
+    'not_deleted'           => 'The :item_type was not deleted and therefore cannot be restored',
     'create'				=> 'புதிதாக உருவாக்கு',
     'created'               => 'உருப்படி உருவாக்கப்பட்டது',
     'created_asset'			=> 'சொத்து உருவாக்கப்பட்டது',
@@ -86,11 +92,13 @@ return [
     'record_created' 		=> 'Record Created',
     'updated_at' 			=> 'புதுப்பிக்கப்பட்டது',
     'currency'  			=> '$', // this is deprecated
+    'currency_text'  		=> 'Currency', //
     'current'  				=> 'தற்போதைய',
     'current_password'      => 'Current Password',
     'customize_report'      => 'Customize Report',
     'custom_report'         => 'விருப்ப சொத்து அறிக்கை',
     'dashboard'				=> 'டாஷ்போர்டு',
+    'data_source'           => 'Data Source',
     'days'      			=> 'நாட்களில்',
     'days_to_next_audit'    => 'அடுத்த ஆடிட்டிற்கு நாட்கள்',
     'date'					=> 'தேதி',
@@ -98,7 +106,7 @@ return [
     'debug_warning_text'    => 'இயல்பான பிழைத்திருத்தத்துடன் இந்த பயன்பாட்டை உற்பத்தி முறையில் இயக்கும். வெளிப்புற உலகத்திற்கு உங்கள் பயன்பாடு அணுகக்கூடியதாக இருந்தால் இது முக்கியமான தரவுகளை அம்பலப்படுத்தலாம். உங்கள் <code>.env</code> கோப்பில் <code>false</code> இல் <code>APP_DEBUG</code> மதிப்பை அமைப்பதன் மூலம் பிழைத்திருத்த முடையை முடக்கு.',
     'delete'  				=> 'அழி',
     'delete_confirm'  		=> 'Are you sure you wish to delete :item?',
-    'delete_confirm_no_undo' => 'Are you sure you wish to delete :item? This can not be undone.',
+    'delete_confirm_no_undo' => 'Are you sure, you wish to delete :item? This cannot be undone.',
     'deleted'  				=> 'நீக்கப்பட்ட',
     'delete_seats'  		=> 'நீக்கப்பட்ட இடங்கள்',
     'deletion_failed'       => 'Deletion failed',
@@ -114,29 +122,13 @@ return [
     'editprofile'  			=> 'உங்கள் சுயவிவரம் திருத்தவும்',
     'eol'					=> ', EOL',
     'email_domain'			=> 'மின்னஞ்சல் டொமைன்',
-    'email_format'			=> 'மின்னஞ்சல் வடிவமைப்பு',
     'employee_number'       => 'Employee Number',
     'email_domain_help'		=> 'இறக்குமதி செய்யும் போது மின்னஞ்சல் முகவரிகள் உருவாக்க இது பயன்படுகிறது',
     'error'				    => 'Error',
     'exclude_archived'      => 'Exclude Archived Assets',
     'exclude_deleted'       => 'Exclude Deleted Assets',
     'example'				=> 'Example: ',
-    'filastname_format'			=> 'முதல் தொடக்க கடைசி பெயர் (jsmith@example.com)',
-    'firstname_lastname_format'	=> 'முதல் பெயர் கடைசி பெயர் (jane.smith@example.com)',
-    'firstname_lastname_underscore_format' => 'முதல் பெயர் கடைசி பெயர் (jane.smith@example.com)',
-    'lastnamefirstinitial_format' =>  'Last Name First Initial (smithj@example.com)',
-    'firstintial_dot_lastname_format' => 'First Initial Last Name (j.smith@example.com)',
-    'firstname_lastname_display'	=> 'First Name Last Name (Jane Smith)',
-    'lastname_firstname_display'	=> 'Last Name First Name (Smith Jane)',
-    'name_display_format'	=> 'Name Display Format',
-    'first'					=> 'முதல்',
-    'firstnamelastname'     => 'First Name Last Name (janesmith@example.com)',
-    'lastname_firstinitial' => 'Last Name First Initial (smith_j@example.com)',
-    'firstinitial.lastname' => 'First Initial Last Name (j.smith@example.com)',
-    'firstnamelastinitial'  => 'First Name Last Initial (janes@example.com)',
-    'lastnamefirstname'      => 'Last Name First Name (smith.jane@example.com)',
-    'first_name'			=> 'முதல் பெயர்',
-    'first_name_format'		=> 'முதல் பெயர் (jane@example.com)',
+
     'files'                 => 'Files',
     'file_name'				=> 'கோப்பு',
     'file_type'             => 'File Type',
@@ -156,9 +148,9 @@ return [
     'image_delete'         	=> 'படத்தை நீக்கு',
     'include_deleted'       => 'Include Deleted Assets',
     'image_upload'         	=> 'படத்தை பதிவேற்றம் செய்யவும்',
-    'filetypes_accepted_help'    => 'Accepted filetype is :types. Max upload size allowed is :size.|Accepted filetypes are :types. Max upload size allowed is :size.',
-    'filetypes_size_help'   => 'Max upload size allowed is :size.',
-    'image_filetypes_help'  => 'Accepted filetypes are jpg, webp, png, gif, svg, and avif. Max upload size allowed is :size.',
+    'filetypes_accepted_help'    => 'Accepted filetype is :types. The maximum size allowed is :size.|Accepted filetypes are :types. The maximum upload size allowed is :size.',
+    'filetypes_size_help'   => 'The maximum upload size allowed is :size.',
+    'image_filetypes_help'  => 'Accepted Filetypes are jpg, webp, png, gif, svg, and avif. The maximum upload size allowed is :size.',
     'unaccepted_image_type'  => 'This image file was not readable. Accepted filetypes are jpg, webp, png, gif, and svg. The mimetype of this file is: :mimetype.',
     'import'         	    => 'இறக்குமதி',
     'import_this_file'      => 'Map fields and process this file',
@@ -178,12 +170,17 @@ return [
     'last'					=> 'கடந்த',
     'last_login'            => 'கடைசி தேதி',
     'last_name'             => 'கடைசி பெயர்',
+    'firstname_lastname_display'	=> 'First Name Last Name (Jane Smith)',
+    'lastname_firstname_display'	=> 'Last Name First Name (Smith Jane)',
+    'name_display_format'	=> 'Name Display Format',
+    'first'					=> 'முதல்',
+    'first_name'			=> 'முதல் பெயர்',
     'license'				=> 'உரிமம்',
     'license_report'        => 'உரிமம் அறிக்கை',
     'licenses_available'	=> 'Licenses available',
     'licenses'				=> 'உரிமங்கள்',
     'list_all'				=> 'அனைத்தையும் பட்டியலிடு',
-    'loading'				=> 'Loading... please wait....',
+    'loading'				=> 'Loading... please wait...',
     'lock_passwords'        => 'This field value will not be saved in a demo installation.',
     'feature_disabled'      => 'டெமோ நிறுவலுக்கு இந்த அம்சம் முடக்கப்பட்டுள்ளது.',
     'location'              => 'இருப்பிடம்',
@@ -193,7 +190,7 @@ return [
     'logout'				=> 'வெளியேறு',
     'lookup_by_tag'     => 'சொத்து டேக் மூலம் பார்',
     'maintenances'          => 'Maintenances',
-    'manage_api_keys'       => 'Manage API Keys',
+    'manage_api_keys'       => 'Manage API keys',
     'manufacturer'			=> 'உற்பத்தியாளர்',
     'manufacturers'			=> 'உற்பத்தியாளர்கள்',
     'markdown'				=> 'இந்தத் துறையில் <a href="https://help.github.com/articles/github-flavored-markdown/"> ஜிடிப் ருசியான மார்க் டவுன் </a> ஐ அனுமதிக்கிறது.',
@@ -215,6 +212,14 @@ return [
     'no_results'			=> 'முடிவுகள் இல்லை.',
     'no'  					=> 'இல்லை',
     'notes'  				=> 'குறிப்புக்கள்',
+    'note_added'            => 'Note Added',
+    'options'				=> 'Options',
+    'preview'				=> 'Preview',
+    'add_note'              => 'Add Note',
+    'note_edited'            => 'Note Edited',
+    'edit_note'              => 'Edit Note',
+    'note_deleted'            => 'Note Deleted',
+    'delete_note'              => 'Delete Note',
     'order_number'          => 'ஆர்டர் எண்',
     'only_deleted'          => 'Only Deleted Assets',
     'page_menu'				=> '_MENU_ உருப்படிகளைக் காண்பிக்கிறது',
@@ -229,7 +234,7 @@ return [
     'purchase_date'         => 'கொள்முதல் தேதி',
     'qty'		            => 'கொத்தமல்லி',
     'quantity'		        => 'அளவு',
-    'quantity_minimum'      => 'You have :count items below or almost below minimum quantity levels',
+    'quantity_minimum'      => 'You have one item below or almost below minimum quantity levels|You have :count items below or almost below minimum quantity levels',
     'quickscan_checkin'  	=> 'Quick Scan Checkin',
     'quickscan_checkin_status'  	=> 'Checkin Status',
     'ready_to_deploy'		=> 'வரிசைப்படுத்த தயாராக உள்ளது',
@@ -254,7 +259,7 @@ return [
     'select_all'            => 'Select All',
     'search'				=> 'தேடல்',
     'select_category'       => 'ஓர் வகையறாவை தேர்ந்தெடு',
-    'select_datasource' => 'Select a Datasource',
+    'select_datasource' => 'Select a data source',
     'select_department'     => 'ஒரு துறையைத் தேர்ந்தெடுக்கவும்',
     'select_depreciation'	=> 'தேய்மான வகை ஒன்றைத் தேர்ந்தெடுக்கவும்',
     'select_location'		=> 'இருப்பிடம் தேர்ந்தெடுக்கவும்',
@@ -274,13 +279,15 @@ return [
     'signed_off_by'         => 'Signed Off By',
     'skin'       			=> 'Skin',
     'webhook_msg_note'        => 'A notification will be sent via webhook',
-    'webhook_test_msg'        => 'Oh hai! Looks like your :app integration with Snipe-IT is working!',
+    'webhook_test_msg'        => 'Oh hai! It looks like your :app integration with Snipe-IT is working!',
     'some_features_disabled' => 'டெமோ முறை: இந்த நிறுவலுக்கு சில அம்சங்கள் முடக்கப்பட்டுள்ளன.',
     'site_name'				=> 'தள பெயர்',
     'state'  				=> 'நிலை',
     'status_labels'			=> 'நிலை லேபிள்கள்',
+    'status_label'			=> 'Status Label',
     'status'    			=> 'நிலைமை',
     'accept_eula'           => 'Acceptance Agreement',
+    'show_or_hide_eulas' => 'Show/Hide EULAs',
     'supplier'              => 'சப்ளையர்',
     'suppliers'  			=> 'சப்ளையர்கள்',
     'sure_to_delete'        => 'நீங்கள் நிச்சயமாக நீக்க விரும்புகிறீர்களா?',
@@ -296,9 +303,9 @@ return [
     'type'  				=> 'வகை',
     'undeployable'			=> 'அன்-அணியப்படுத்தக்',
     'unknown_admin'			=> 'அறியப்படாத நிர்வாகம்',
-    'username_format'		=> 'பயனர்பெயர் வடிவமைப்பு',
     'username'              => 'பயனர்பெயர்',
     'update'                => 'புதுப்பிக்கப்பட்டது',
+    'updating_item' => 'Updating :item',
     'upload_filetypes_help'      => 'Allowed filetypes are png, gif, jpg, jpeg, doc, docx, pdf, xls, xlsx, txt, lic, xml, zip, rtf and rar. Max upload size allowed is :size.',
     'uploaded'              => 'Uploaded',
     'user'					=> 'பயனர்',
@@ -323,10 +330,10 @@ return [
     'token_expired'         => 'உங்கள் படிவத்தின் அமர்வு காலாவதியாகிவிட்டது. தயவு செய்து மீண்டும் முயற்சிக்கவும்.',
     'login_enabled'         => 'Login Enabled',
     'audit_due'             => 'Due for Audit',
-    'audit_due_days'        => 'Assets Due for Audit Within :days Day|Assets Due for Audit Within :days Days',
+    'audit_due_days'        => '{}Assets Due or Overdue for Audit|[1]Assets Due or Overdue for Audit Within a Day|[2,*]Assets Due or Overdue for Audit Within :days Days',
     'checkin_due'           => 'Due for Checkin',
     'checkin_overdue'       => 'Overdue for Checkin',
-    'checkin_due_days'      => 'Assets Due for Checkin Within :days Day|Assets Due for Checkin Within :days Days',
+    'checkin_due_days'      => '{}Due for Checkin|[1]Assets Due for Checkin Within :days Day|[2,*]Assets Due for Checkin Within :days Days',
     'audit_overdue'         => 'Overdue for Audit',
     'accept'                => 'Accept :asset',
     'i_accept'              => 'I accept',
@@ -339,16 +346,16 @@ return [
     'view_all'              => 'view all',
     'hide_deleted'          => 'Hide Deleted',
     'email'                 => 'மின்னஞ்சல்',
-    'do_not_change'         => 'Do Not Change',
-    'bug_report'            => 'Report a Bug',
+    'do_not_change'         => 'Do not change',
+    'bug_report'            => 'Report a bug',
     'user_manual'           => 'User\'s Manual',
     'setup_step_1'          => 'Step 1',
     'setup_step_2'          => 'Step 2',
     'setup_step_3'          => 'Step 3',
     'setup_step_4'          => 'Step 4',
     'setup_config_check'    => 'Configuration Check',
-    'setup_create_database' => 'Create Database Tables',
-    'setup_create_admin'    => 'Create Admin User',
+    'setup_create_database' => 'Create database tables',
+    'setup_create_admin'    => 'Create an admin user',
     'setup_done'            => 'Finished!',
     'bulk_edit_about_to'    => 'You are about to edit the following: ',
     'checked_out'           => 'ஒப்படைக்கப்பட்டது',
@@ -383,6 +390,8 @@ return [
     'new_license'           => 'New License',
     'new_accessory'         => 'New Accessory',
     'new_consumable'        => 'New Consumable',
+    'new_component'         => 'New Component',
+    'new_user'              => 'New User',
     'collapse'              => 'Collapse',
     'assigned'              => 'Assigned',
     'asset_count'           => 'Asset Count',
@@ -418,19 +427,20 @@ return [
     'bulk_soft_delete'      =>'Also soft-delete these users. Their asset history will remain intact unless/until you purge deleted records in the Admin Settings.',
     'bulk_checkin_delete_success' => 'Your selected users have been deleted and their items have been checked in.',
     'bulk_checkin_success' => 'The items for the selected users have been checked in.',
-    'set_to_null'           => 'Delete values for this asset|Delete values for all :asset_count assets ',
+    'set_to_null'           => 'Delete values for this selection|Delete values for all :selection_count selections ',
     'set_users_field_to_null'  => 'Delete :field values for this user|Delete :field values for all :user_count users ',
     'na_no_purchase_date'   => 'N/A - No purchase date provided',
     'assets_by_status'      => 'Assets by Status',
     'assets_by_status_type'      => 'Assets by Status Type',
     'pie_chart_type'        => 'Dashboard Pie Chart Type',
     'hello_name'            => 'Hello, :name!',
-    'unaccepted_profile_warning'   => 'You have :count items requiring acceptance. Click here to accept or decline them',
+    'unaccepted_profile_warning'   => 'You have one item requiring acceptance. Click here to accept or decline it | You have :count items requiring acceptance. Click here to accept or decline them',
     'start_date'            => 'Start Date',
     'end_date'            => 'End Date',
     'alt_uploaded_image_thumbnail' => 'Uploaded thumbnail',
     'placeholder_kit'       => 'Select a kit',
     'file_not_found'        => 'File not found',
+    'log_record_not_found'  => 'No record for that log entry was found.',
     'preview_not_available' => '(no preview)',
     'setup'                 => 'Setup',
     'pre_flight'            => 'Pre-Flight',
@@ -512,7 +522,7 @@ return [
     'checked_out_to_fields' => 'Checked Out To Fields',
     'percent_complete' => '% முழுமையான',
     'uploading' => 'Uploading... ',
-    'upload_error' => 'Error uploading file. Please check that there are no empty rows and that no column names are duplicated.',
+    'upload_error' => 'Error uploading file. Please check that you have no empty rows or duplicated column names in your CSV, and that the server permissions allow uploads.',
     'copy_to_clipboard' => 'Copy to Clipboard',
     'copied' => 'Copied!',
     'status_compatibility' => 'If assets are already assigned, they cannot be changed to a non-deployable status type and this value change will be skipped.',
@@ -549,6 +559,71 @@ return [
         'license_seats'  => ':count License Seat|:count License Seats',
         'consumables'  => ':count Consumable|:count Consumables',
         'components'  => ':count Component|:count Components',
-    ]
+    ],
+
+    'more_info' => 'மேலும் தகவல்',
+    'quickscan_bulk_help' => 'Checking this box will edit the asset record to reflect this new location. Leaving it unchecked will simply note the location in the audit log. Note that if this asset is checked out, it will not change the location of the person, asset or location it is checked out to.',
+    'whoops' => 'Whoops!',
+    'something_went_wrong' => 'Something went wrong with your request.',
+    'close' => 'Close',
+    'expires' => 'காலாவதியாகிறது',
+    'map_fields'=> 'Map :item_type Fields',
+    'remaining_var' => ':count Remaining',
+    'label' => 'Label',
+    'import_asset_tag_exists' => 'An asset with the asset tag :asset_tag already exists and an update was not requested. No change was made.',
+    'countries_manually_entered_help' => 'Values with an asterisk (*) were manually entered and do not match existing ISO 3166 dropdown values',
+    'accessories_assigned' => 'Assigned Accessories',
+    'user_managed_passwords' => 'Password Management',
+    'user_managed_passwords_disallow' => 'Disallow users from managing their own passwords',
+    'user_managed_passwords_allow' => 'Allow users to manage their own passwords',
+    'from' => 'From',
+    'by' => 'மூலம்',
+
+// Add form placeholders here
+    'placeholders' => [
+        'notes'  => 'Add a note',
+    ],
+
+    'breadcrumb_button_actions' => [
+        'edit_item' => 'Edit :name',
+        'checkout_item' => 'Checkout :name',
+        'checkin_item' => 'Checkin :name',
+    ],
+
+    'skins' => [
+        'site_default' => 'Site Default',
+        'default_blue' => 'Default Blue',
+        'blue_dark' => 'Blue (Dark Mode)',
+        'green' => 'Green Dark',
+        'green_dark' => 'Green (Dark Mode)',
+        'red' => 'Red Dark',
+        'red_dark' => 'Red (Dark Mode)',
+        'orange' => 'Orange Dark',
+        'orange_dark' => 'Orange (Dark Mode)',
+        'black' => 'Black',
+        'black_dark' => 'Black (Dark Mode)',
+        'purple' => 'Purple',
+        'purple_dark' => 'Purple (Dark Mode)',
+        'yellow' => 'Yellow',
+        'yellow_dark' => 'Yellow (Dark Mode)',
+        'high_contrast' => 'High Contrast',
+
+    ],
+
+    'select_all_none' => 'Select/Unselect All',
+    'generic_model_not_found' => 'That :model was not found or you do not have permission to access it',
+    'deleted_models' => 'Deleted Asset Models',
+    'deleted_users' => 'Deleted Users',
+    'cost_each' => ':amount each',
+    'remove_current_image' => 'Remove current :type image',
+
+    'seeding' => [
+        'manufacturers' => [
+            'button' => 'Create Manufacturers',
+            'prompt' => 'You do not have any manufacturers yet. Would you like to seed a list of common manufacturers? (THIS WILL OVERWRITE EXISTING MANUFACTURERS, including those that have been soft-deleted.)',
+            'success' => 'Manufacturers seeded successfully',
+            'error' => 'Could not seed manufacturers. A manufacturer record already exists and seeding would overwrite it.|Could not seed manufacturers. :count manufacturer records already exist and seeding would overwrite them.',
+        ],
+    ],
 
 ];
diff --git a/resources/lang/ta-IN/localizations.php b/resources/lang/ta-IN/localizations.php
index f1232dd138..827ed4fca1 100644
--- a/resources/lang/ta-IN/localizations.php
+++ b/resources/lang/ta-IN/localizations.php
@@ -2,7 +2,7 @@
 
 return [
 
-    'select_language' => 'Select a language',
+    'select_language' => 'Select a Language',
     'languages' => [
         'en-US'=> 'English, US',
         'en-GB'=> 'English, UK',
@@ -40,7 +40,9 @@ return [
         'ms-MY'=> 'Malay',
         'mi-NZ'=> 'Maori',
         'mn-MN'=> 'Mongolian',
-        'no-NO'=> 'Norwegian',
+        'nb-NO'=> 'Norwegian Bokmål',
+        'om-ET' => 'Oromo (Ethiopian)',
+        //'nn-NO'=> 'Norwegian Nynorsk',
         'fa-IR'=> 'Persian',
         'pl-PL'=> 'Polish',
         'pt-PT'=> 'Portuguese',
@@ -66,7 +68,7 @@ return [
         'zu-ZA'=> 'Zulu',
     ],
 
-    'select_country' => 'Select a country',
+    'select_country' => 'Select a Country',
     
     'countries' => [
         'AC'=>'Ascension Island',
@@ -133,6 +135,7 @@ return [
         'EC'=>'Ecuador',
         'EE'=>'Estonia',
         'EG'=>'Egypt',
+        'GB-ENG'=>'England',
         'ER'=>'Eritrea',
         'ES'=>'Spain',
         'ET'=>'Ethiopia',
@@ -231,6 +234,7 @@ return [
         'NG'=>'Nigeria',
         'NI'=>'Nicaragua',
         'NL'=>'Netherlands',
+        'GB-NIR' => 'Northern Ireland',
         'NO'=>'Norway',
         'NP'=>'Nepal',
         'NR'=>'Nauru',
@@ -258,7 +262,7 @@ return [
         'RU'=>'Russian Federation',
         'RW'=>'Rwanda',
         'SA'=>'Saudi Arabia',
-        'UK'=>'Scotland',
+        'GB-SCT'=>'Scotland',
         'SB'=>'Solomon Islands',
         'SC'=>'Seychelles',
         'SS'=>'South Sudan',
@@ -310,6 +314,7 @@ return [
         'VI'=>'Virgin Islands (U.S.)',
         'VN'=>'Viet Nam',
         'VU'=>'Vanuatu',
+        'GB-WLS' =>'Wales',
         'WF'=>'Wallis And Futuna Islands',
         'WS'=>'Samoa',
         'YE'=>'Yemen',
diff --git a/resources/lang/ta-IN/mail.php b/resources/lang/ta-IN/mail.php
index a0176d351e..76413a2cd4 100644
--- a/resources/lang/ta-IN/mail.php
+++ b/resources/lang/ta-IN/mail.php
@@ -23,24 +23,25 @@ return [
     'Item_Requested' => 'பொருள் கோரியது',
     'License_Checkin_Notification' => 'License checked in',
     'License_Checkout_Notification' => 'License checked out',
+    'license_for'   => 'License for',
     'Low_Inventory_Report' => 'குறைவான சரக்கு அறிக்கை',
     'a_user_canceled' => 'வலைத்தளத்தில் பயனர் ஒரு உருப்படி கோரிக்கையை ரத்து செய்துள்ளார்',
     'a_user_requested' => 'வலைத்தளத்தில் பயனர் ஒரு உருப்படியைக் கோரியுள்ளார்',
     'acceptance_asset_accepted' => 'A user has accepted an item',
     'acceptance_asset_declined' => 'A user has declined an item',
-    'accessory_name' => 'துணை பெயர்:',
-    'additional_notes' => 'கூடுதல் குறிப்புகள்:',
+    'accessory_name' => 'துணை பெயர்',
+    'additional_notes' => 'Additional Notes',
     'admin_has_created' => 'ஒரு வலைத்தளம் உங்களுக்கு ஒரு கணக்கை உருவாக்கியுள்ளது: இணையத்தளம்.',
-    'asset' => 'சொத்து:',
-    'asset_name' => 'சொத்து பெயர்:',
+    'asset' => 'சொத்து',
+    'asset_name' => 'சொத்து பெயர்',
     'asset_requested' => 'சொத்து கோரப்பட்டது',
     'asset_tag' => 'சொத்து டேக்',
     'assets_warrantee_alert' => 'There is :count asset with a warranty expiring in the next :threshold days.|There are :count assets with warranties expiring in the next :threshold days.',
     'assigned_to' => 'ஒதுக்கப்படும்',
     'best_regards' => 'சிறந்த வாழ்த்துக்கள்,',
-    'canceled' => 'ரத்து செய்தவர்:',
+    'canceled' => 'Canceled',
     'checkin_date' => 'சரி தேதி',
-    'checkout_date' => 'புதுப்பிப்பு தேதி:',
+    'checkout_date' => 'புதுப்பிப்பு தேதி',
     'checkedout_from' => 'Checked out from',
     'checkedin_from'  => 'Checked in from',
     'checked_into' => 'Checked into',
@@ -49,27 +50,30 @@ return [
     'click_to_confirm' => 'உங்கள்: இணைய கணக்கை உறுதிப்படுத்த பின்வரும் இணைப்பை கிளிக் செய்யவும்:',
     'current_QTY' => 'தற்போதைய QTY',
     'days' => 'நாட்களில்',
-    'expecting_checkin_date' => 'எதிர்பார்த்த செக்கின் தேதி:',
+    'expecting_checkin_date' => 'எதிர்பார்த்த செக்கின் தேதி',
     'expires' => 'காலாவதியாகிறது',
     'hello' => 'வணக்கம்',
     'hi' => 'வணக்கம்',
     'i_have_read' => 'நான் பயன்பாட்டு விதிமுறைகளைப் படித்து ஒப்புக்கொள்கிறேன், இந்த உருப்படியைப் பெற்றுள்ளேன்.',
     'inventory_report' => 'Inventory Report',
-    'item' => 'பொருள்:',
+    'item' => 'பொருள்',
+    'item_checked_reminder' => 'This is a reminder that you currently have :count items checked out to you that you have not accepted or declined. Please click the link below to confirm your decision.',
     'license_expiring_alert' => 'There is :count license expiring in the next :threshold days.|There are :count licenses expiring in the next :threshold days.',
     'link_to_update_password' => 'தயவுசெய்து புதுப்பிக்க பின்வரும் இணைப்பை கிளிக் செய்யவும்: உங்கள் இணைய கடவுச்சொல்:',
-    'login' => 'உள் நுழை:',
+    'login' => 'உள் நுழை',
     'login_first_admin' => 'கீழே உள்ள சான்றுகளை பயன்படுத்தி உங்கள் புதிய Snipe-IT நிறுவலுக்கு உள்நுழையவும்:',
     'low_inventory_alert' => 'There is :count item that is below minimum inventory or will soon be low.|There are :count items that are below minimum inventory or will soon be low.',
     'min_QTY' => 'குறைந்தது QTY',
     'name' => 'பெயர்',
     'new_item_checked' => 'உங்கள் பெயரில் ஒரு புதிய உருப்படி சோதிக்கப்பட்டது, விவரங்கள் கீழே உள்ளன.',
+    'new_item_checked_with_acceptance' => 'A new item has been checked out under your name that requires acceptance, details are below.',
+    'recent_item_checked' => 'An item was recently checked out under your name that requires acceptance, details are below.',
     'notes' => 'குறிப்புக்கள்',
-    'password' => 'கடவுச்சொல்:',
+    'password' => 'கடவுச்சொல்',
     'password_reset' => 'கடவுச்சொல்லை மீட்டமை',
     'read_the_terms' => 'கீழே உள்ள விதிமுறைகளை தயவுசெய்து படித்துப் பாருங்கள்.',
     'read_the_terms_and_click' => 'Please read the terms of use below, and click on the link at the bottom to confirm that you read and agree to the terms of use, and have received the asset.',
-    'requested' => 'கோரியவர்:',
+    'requested' => 'கோரப்பட்டது',
     'reset_link' => 'உங்கள் கடவுச்சொல்லை மீட்டமை இணைப்பு',
     'reset_password' => 'உங்கள் கடவுச்சொல்லை மீட்டமைக்க இங்கே கிளிக் செய்க:',
     'rights_reserved' => 'All rights reserved.',
@@ -86,8 +90,10 @@ return [
     'upcoming-audits' => 'There is :count asset that is coming up for audit within :threshold days.|There are :count assets that are coming up for audit within :threshold days.',
     'user' => 'பயனர்',
     'username' => 'பயனர்பெயர்',
+    'unaccepted_asset_reminder' => 'Reminder: You have Unaccepted Assets.',
     'welcome' => 'வரவேற்பு: பெயர்',
     'welcome_to' => 'வரவேற்கிறோம்: வலை!',
     'your_assets' => 'View Your Assets',
     'your_credentials' => 'உங்கள் கத்தரி-ஐடி சான்றுகள்',
+    'mail_sent' => 'Mail sent successfully!',
 ];
diff --git a/resources/lang/ta-IN/validation.php b/resources/lang/ta-IN/validation.php
index 714504cbb9..be6dc23e22 100644
--- a/resources/lang/ta-IN/validation.php
+++ b/resources/lang/ta-IN/validation.php
@@ -13,87 +13,150 @@ return [
     |
     */
 
-    'accepted'             => ': பண்புக்கூறு ஏற்றுக்கொள்ளப்பட வேண்டும்.',
-    'active_url'           => 'பண்புக்கூறு: செல்லுபடியாகாத URL அல்ல.',
-    'after'                => 'பின்: பண்புக்கூறு: தேதி தேதி.',
-    'after_or_equal'       => 'தேதி: தேதி அல்லது அதற்கு சமமாக தேதி இருக்க வேண்டும்: தேதி.',
-    'alpha'                => 'பண்புக்கூறு: கடிதங்கள் மட்டுமே கொண்டிருக்கும்.',
-    'alpha_dash'           => 'பண்புக்கூறு, எண்கள், கோடுகள் ஆகியவற்றைக் கொண்டிருக்கும்.',
-    'alpha_num'            => ': பண்புக்கூறுகள் மற்றும் எண்களை மட்டும் கொண்டிருக்கும்.',
-    'array'                => ': பண்புக்கூறாக ஒரு வரிசை இருக்க வேண்டும்.',
-    'before'               => ': பண்புக்கூறு முன் தேதி இருக்க வேண்டும்: தேதி.',
-    'before_or_equal'      => 'தேதி: தேதி முன் அல்லது சமமாக தேதி இருக்க வேண்டும்: தேதி.',
-    'between'              => [
-        'numeric' => ': பண்புக்கூறு: நிமிடம் மற்றும் அதிகபட்சம்.',
-        'file'    => 'தி: பண்புக்கூறு: நிமிடம் மற்றும்: அதிகபட்ச கிலோபைட்.',
-        'string'  => 'The: பண்புக்கூறு: min மற்றும்: max characters.',
-        'array'   => ': பண்புக்கூறு: நிமிடம் மற்றும்: அதிகபட்சம் உருப்படிகள்',
+    'accepted' => 'The :attribute field must be accepted.',
+    'accepted_if' => 'The :attribute field must be accepted when :other is :value.',
+    'active_url' => 'The :attribute field must be a valid URL.',
+    'after' => 'The :attribute field must be a date after :date.',
+    'after_or_equal' => 'The :attribute field must be a date after or equal to :date.',
+    'alpha' => 'The :attribute field must only contain letters.',
+    'alpha_dash' => 'The :attribute field must only contain letters, numbers, dashes, and underscores.',
+    'alpha_num' => 'The :attribute field must only contain letters and numbers.',
+    'array' => 'The :attribute field must be an array.',
+    'ascii' => 'The :attribute field must only contain single-byte alphanumeric characters and symbols.',
+    'before' => 'The :attribute field must be a date before :date.',
+    'before_or_equal' => 'The :attribute field must be a date before or equal to :date.',
+    'between' => [
+        'array' => 'The :attribute field must have between :min and :max items.',
+        'file' => 'The :attribute field must be between :min and :max kilobytes.',
+        'numeric' => 'The :attribute field must be between :min and :max.',
+        'string' => 'The :attribute field must be between :min and :max characters.',
     ],
-    'boolean'              => 'கற்பனை புலம் உண்மையாகவோ தவறாகவோ இருக்க வேண்டும்.',
-    'confirmed'            => 'பண்புக்கூறு உறுதிப்படுத்தல் பொருந்தவில்லை.',
-    'date'                 => ': பண்புக்கூறு சரியான தேதி அல்ல.',
-    'date_format'          => 'வடிவமைப்பு: வடிவம் பொருந்தவில்லை வடிவமைப்பு.',
-    'different'            => 'பண்புக்கூறு: மற்றொன்று வித்தியாசமாக இருக்க வேண்டும்.',
-    'digits'               => 'பண்புக்கூறு: எண் இலக்கங்கள் இருக்க வேண்டும்.',
-    'digits_between'       => ': பண்புக்கூறு: நிமிடம் மற்றும்: அதிகபட்ச இலக்கங்கள்.',
-    'dimensions'           => 'பண்புக்கூறு: தவறான பட பரிமாணங்களை கொண்டுள்ளது.',
-    'distinct'             => ': பண்புக்கூறு துறையில் ஒரு போலி மதிப்பு உள்ளது.',
-    'email'                => 'பண்புக்கூறு: செல்லுபடியாகும் மின்னஞ்சல் முகவரி இருக்க வேண்டும்.',
-    'exists'               => 'தேர்ந்தெடுக்கப்பட்ட: பண்பு தவறானது.',
-    'file'                 => 'பண்புக்கூறு ஒரு கோப்பாக இருக்க வேண்டும்.',
-    'filled'               => 'பண்புக்கூறு துறையில் ஒரு மதிப்பு இருக்க வேண்டும்.',
-    'image'                => 'பண்புக்கூறு: ஒரு படம் இருக்க வேண்டும்.',
+    'boolean' => 'கற்பனை புலம் உண்மையாகவோ தவறாகவோ இருக்க வேண்டும்.',
+    'can' => 'The :attribute field contains an unauthorized value.',
+    'confirmed' => 'The :attribute field confirmation does not match.',
+    'contains' => 'The :attribute field is missing a required value.',
+    'current_password' => 'The password is incorrect.',
+    'date' => 'The :attribute field must be a valid date.',
+    'date_equals' => 'The :attribute field must be a date equal to :date.',
+    'date_format' => 'The :attribute field must match the format :format.',
+    'decimal' => 'The :attribute field must have :decimal decimal places.',
+    'declined' => 'The :attribute field must be declined.',
+    'declined_if' => 'The :attribute field must be declined when :other is :value.',
+    'different' => 'The :attribute field and :other must be different.',
+    'digits' => 'The :attribute field must be :digits digits.',
+    'digits_between' => 'The :attribute field must be between :min and :max digits.',
+    'dimensions' => 'The :attribute field has invalid image dimensions.',
+    'distinct' => ': பண்புக்கூறு துறையில் ஒரு போலி மதிப்பு உள்ளது.',
+    'doesnt_end_with' => 'The :attribute field must not end with one of the following: :values.',
+    'doesnt_start_with' => 'The :attribute field must not start with one of the following: :values.',
+    'email' => 'The :attribute field must be a valid email address.',
+    'ends_with' => 'The :attribute field must end with one of the following: :values.',
+    'enum' => 'தேர்ந்தெடுக்கப்பட்ட: பண்பு தவறானது.',
+    'exists' => 'தேர்ந்தெடுக்கப்பட்ட: பண்பு தவறானது.',
+    'extensions' => 'The :attribute field must have one of the following extensions: :values.',
+    'file' => 'The :attribute field must be a file.',
+    'filled' => 'பண்புக்கூறு துறையில் ஒரு மதிப்பு இருக்க வேண்டும்.',
+    'gt' => [
+        'array' => 'The :attribute field must have more than :value items.',
+        'file' => 'The :attribute field must be greater than :value kilobytes.',
+        'numeric' => 'The :attribute field must be greater than :value.',
+        'string' => 'The :attribute field must be greater than :value characters.',
+    ],
+    'gte' => [
+        'array' => 'The :attribute field must have :value items or more.',
+        'file' => 'The :attribute field must be greater than or equal to :value kilobytes.',
+        'numeric' => 'The :attribute field must be greater than or equal to :value.',
+        'string' => 'The :attribute field must be greater than or equal to :value characters.',
+    ],
+    'hex_color' => 'The :attribute field must be a valid hexadecimal color.',
+    'image' => 'The :attribute field must be an image.',
     'import_field_empty'    => 'The value for :fieldname cannot be null.',
-    'in'                   => 'தேர்ந்தெடுக்கப்பட்ட: பண்பு தவறானது.',
-    'in_array'             => ': பண்புக்கூறு புலம் இல்லை: மற்றவை.',
-    'integer'              => 'பண்புக்கூறு: ஒரு முழு எண்ணாக இருக்க வேண்டும்.',
-    'ip'                   => 'பண்புக்கூறு: செல்லுபடியாகும் IP முகவரி இருக்க வேண்டும்.',
-    'ipv4'                 => 'பண்புக்கூறு: செல்லுபடியாகும் IPv4 முகவரி இருக்க வேண்டும்.',
-    'ipv6'                 => 'பண்புக்கூறு: செல்லுபடியாகும் IPv6 முகவரி இருக்க வேண்டும்.',
-    'is_unique_department' => 'The :attribute must be unique to this Company Location',
-    'json'                 => 'பண்புக்கூறு செல்லுபடியான JSON சரமாக இருக்க வேண்டும்.',
-    'max'                  => [
-        'numeric' => ': பண்புக்கூறு அதிகமாக இருக்கலாம்: அதிகபட்சம்.',
-        'file'    => 'உருக்கு: பண்பு அதிகமாக இருக்கலாம்: அதிகபட்ச கிலோபைட்.',
-        'string'  => ': பண்புக்கூறு அதிகமாக இருக்கலாம்: அதிக எழுத்துகள்.',
-        'array'   => ': பண்புக்கூறு அதிகமாக இல்லை: அதிகபட்சம் பொருட்களை.',
+    'in' => 'தேர்ந்தெடுக்கப்பட்ட: பண்பு தவறானது.',
+    'in_array' => 'The :attribute field must exist in :other.',
+    'integer' => 'The :attribute field must be an integer.',
+    'ip' => 'The :attribute field must be a valid IP address.',
+    'ipv4' => 'The :attribute field must be a valid IPv4 address.',
+    'ipv6' => 'The :attribute field must be a valid IPv6 address.',
+    'json' => 'The :attribute field must be a valid JSON string.',
+    'list' => 'The :attribute field must be a list.',
+    'lowercase' => 'The :attribute field must be lowercase.',
+    'lt' => [
+        'array' => 'The :attribute field must have less than :value items.',
+        'file' => 'The :attribute field must be less than :value kilobytes.',
+        'numeric' => 'The :attribute field must be less than :value.',
+        'string' => 'The :attribute field must be less than :value characters.',
     ],
-    'mimes'                => 'வகை: வகை ஒரு கோப்பு இருக்க வேண்டும்:: மதிப்புகள்.',
-    'mimetypes'            => 'வகை: வகை ஒரு கோப்பு இருக்க வேண்டும்:: மதிப்புகள்.',
-    'min'                  => [
-        'numeric' => ': பண்புக்கூறு குறைந்தது: நிமிடம்.',
-        'file'    => ': பண்புக்கூறு குறைந்தது: நிமிட கிலோபைட்.',
-        'string'  => ': பண்புக்கூறு குறைந்தது: குறைந்த எழுத்துகள்.',
-        'array'   => ': பண்புக்கூறு குறைந்தபட்சம்: நிமிடம் உருப்படிகள் வேண்டும்.',
+    'lte' => [
+        'array' => 'The :attribute field must not have more than :value items.',
+        'file' => 'The :attribute field must be less than or equal to :value kilobytes.',
+        'numeric' => 'The :attribute field must be less than or equal to :value.',
+        'string' => 'The :attribute field must be less than or equal to :value characters.',
     ],
-    'starts_with'          => 'The :attribute must start with one of the following: :values.',
-    'ends_with'            => 'The :attribute must end with one of the following: :values.',
+    'mac_address' => 'The :attribute field must be a valid MAC address.',
+    'max' => [
+        'array' => 'The :attribute field must not have more than :max items.',
+        'file' => 'The :attribute field must not be greater than :max kilobytes.',
+        'numeric' => 'The :attribute field must not be greater than :max.',
+        'string' => 'The :attribute field must not be greater than :max characters.',
+    ],
+    'max_digits' => 'The :attribute field must not have more than :max digits.',
+    'mimes' => 'The :attribute field must be a file of type: :values.',
+    'mimetypes' => 'The :attribute field must be a file of type: :values.',
+    'min' => [
+        'array' => 'The :attribute field must have at least :min items.',
+        'file' => 'The :attribute field must be at least :min kilobytes.',
+        'numeric' => 'The :attribute field must be at least :min.',
+        'string' => 'The :attribute field must be at least :min characters.',
+    ],
+    'min_digits' => 'The :attribute field must have at least :min digits.',
+    'missing' => 'The :attribute field must be missing.',
+    'missing_if' => 'The :attribute field must be missing when :other is :value.',
+    'missing_unless' => 'The :attribute field must be missing unless :other is :value.',
+    'missing_with' => 'The :attribute field must be missing when :values is present.',
+    'missing_with_all' => 'The :attribute field must be missing when :values are present.',
+    'multiple_of' => 'The :attribute field must be a multiple of :value.',
+    'not_in' => 'தேர்ந்தெடுக்கப்பட்ட: பண்பு தவறானது.',
+    'not_regex' => 'The :attribute field format is invalid.',
+    'numeric' => 'The :attribute field must be a number.',
+    'password' => [
+        'letters' => 'The :attribute field must contain at least one letter.',
+        'mixed' => 'The :attribute field must contain at least one uppercase and one lowercase letter.',
+        'numbers' => 'The :attribute field must contain at least one number.',
+        'symbols' => 'The :attribute field must contain at least one symbol.',
+        'uncompromised' => 'The given :attribute has appeared in a data leak. Please choose a different :attribute.',
+    ],
+    'percent'       => 'The depreciation minimum must be between 0 and 100 when depreciation type is percentage.',
 
-    'not_in'               => 'தேர்ந்தெடுக்கப்பட்ட: பண்பு தவறானது.',
-    'numeric'              => 'பண்புக்கூறு: ஒரு எண் இருக்க வேண்டும்.',
-    'present'              => ': பண்புக்கூறு களஞ்சியம் இருக்க வேண்டும்.',
-    'valid_regex'          => 'That is not a valid regex. ',
-    'regex'                => 'பண்புக்கூறு வடிவமைப்பு தவறானது.',
-    'required'             => ': பண்புக்கூறு தேவைப்படுகிறது.',
-    'required_if'          => ': பண்புக்கூறு புலம் தேவை: மற்றது: மதிப்பு.',
-    'required_unless'      => ': பண்புக்கூறு தேவைப்படுகிறது: மற்றது: மதிப்புகள்.',
-    'required_with'        => ': பண்புக்கூறு: போது மதிப்புகள் உள்ளது.',
-    'required_with_all'    => ': பண்புக்கூறு: போது மதிப்புகள் உள்ளது.',
-    'required_without'     => ': பண்புக்கூறு புலம் தேவை: மதிப்புகள் இல்லை.',
+    'present' => ': பண்புக்கூறு களஞ்சியம் இருக்க வேண்டும்.',
+    'present_if' => 'The :attribute field must be present when :other is :value.',
+    'present_unless' => 'The :attribute field must be present unless :other is :value.',
+    'present_with' => 'The :attribute field must be present when :values is present.',
+    'present_with_all' => 'The :attribute field must be present when :values are present.',
+    'prohibited' => 'The :attribute field is prohibited.',
+    'prohibited_if' => 'The :attribute field is prohibited when :other is :value.',
+    'prohibited_unless' => 'The :attribute field is prohibited unless :other is in :values.',
+    'prohibits' => 'The :attribute field prohibits :other from being present.',
+    'regex' => 'The :attribute field format is invalid.',
+    'required' => ': பண்புக்கூறு தேவைப்படுகிறது.',
+    'required_array_keys' => 'The :attribute field must contain entries for: :values.',
+    'required_if' => ': பண்புக்கூறு புலம் தேவை: மற்றது: மதிப்பு.',
+    'required_if_accepted' => 'The :attribute field is required when :other is accepted.',
+    'required_if_declined' => 'The :attribute field is required when :other is declined.',
+    'required_unless' => ': பண்புக்கூறு தேவைப்படுகிறது: மற்றது: மதிப்புகள்.',
+    'required_with' => ': பண்புக்கூறு: போது மதிப்புகள் உள்ளது.',
+    'required_with_all' => 'The :attribute field is required when :values are present.',
+    'required_without' => ': பண்புக்கூறு புலம் தேவை: மதிப்புகள் இல்லை.',
     'required_without_all' => ': மதிப்புகள் இல்லை போது பண்பு துறையில் தேவைப்படுகிறது.',
-    'same'                 => 'பண்புக்கூறு: மற்றொன்று பொருந்த வேண்டும்.',
-    'size'                 => [
-        'numeric' => 'பண்புக்கூறு: அளவு இருக்க வேண்டும்.',
-        'file'    => 'பண்புக்கூறு: அளவு கிலோபைட்டுகள்.',
-        'string'  => 'பண்புக்கூறு: அளவுருக்கள் இருக்க வேண்டும்.',
-        'array'   => ': பண்புக்கூறு: அளவு உருப்படிகளைக் கொண்டிருக்க வேண்டும்.',
+    'same' => 'The :attribute field must match :other.',
+    'size' => [
+        'array' => 'The :attribute field must contain :size items.',
+        'file' => 'The :attribute field must be :size kilobytes.',
+        'numeric' => 'The :attribute field must be :size.',
+        'string' => 'The :attribute field must be :size characters.',
     ],
+    'starts_with' => 'The :attribute field must start with one of the following: :values.',
     'string'               => 'பண்புக்கூறு ஒரு சரம் இருக்க வேண்டும்.',
-    'timezone'             => 'பண்புக்கூறு: செல்லுபடியாகும் மண்டலம் இருக்க வேண்டும்.',
     'two_column_unique_undeleted' => 'The :attribute must be unique across :table1 and :table2. ',
-    'unique'               => ': பண்பு ஏற்கனவே ஏற்கப்பட்டுள்ளது.',
-    'uploaded'             => ': பண்புக்கூறு பதிவேற்றத் தவறியது.',
-    'url'                  => 'பண்புக்கூறு வடிவமைப்பு தவறானது.',
     'unique_undeleted'     => 'பண்பு: பண்பு தனித்துவமானது.',
     'non_circular'         => 'The :attribute must not create a circular reference.',
     'not_array'            => ':attribute cannot be an array.',
@@ -102,11 +165,14 @@ return [
     'numbers'              => 'Password must contain at least one number.',
     'case_diff'            => 'Password must use mixed case.',
     'symbols'              => 'Password must contain symbols.',
-    'gte'                  => [
-        'numeric'          => 'Value cannot be negative'
-    ],
-    'checkboxes'           => ':attribute contains invalid options.',
-    'radio_buttons'        => ':attribute is invalid.',
+    'timezone' => 'The :attribute field must be a valid timezone.',
+    'unique' => ': பண்பு ஏற்கனவே ஏற்கப்பட்டுள்ளது.',
+    'uploaded' => ': பண்புக்கூறு பதிவேற்றத் தவறியது.',
+    'uppercase' => 'The :attribute field must be uppercase.',
+    'url' => 'The :attribute field must be a valid URL.',
+    'ulid' => 'The :attribute field must be a valid ULID.',
+    'uuid' => 'The :attribute field must be a valid UUID.',
+    'fmcs_location' => 'Full multiple company support and location scoping is enabled in the Admin Settings, and the selected location and selected company are not compatible.',
 
 
     /*
@@ -120,16 +186,22 @@ return [
     |
     */
 
+    'email_array'      => 'ஒன்று அல்லது அதற்கு மேற்பட்ட மின்னஞ்சல் முகவரிகள் தவறானவை.',
+    'checkboxes'           => ':attribute contains invalid options.',
+    'radio_buttons'        => ':attribute is invalid.',
+    
     'custom' => [
         'alpha_space' => 'பண்புக்கூறு துறையில் அனுமதிக்கப்படாத ஒரு பாத்திரம் உள்ளது.',
-        'email_array'      => 'ஒன்று அல்லது அதற்கு மேற்பட்ட மின்னஞ்சல் முகவரிகள் தவறானவை.',
+
         'hashed_pass'      => 'உங்கள் தற்போதைய கடவுச்சொல் தவறானது',
         'dumbpwd'          => 'அந்த கடவுச்சொல் மிகவும் பொதுவானது.',
         'statuslabel_type' => 'செல்லுபடியாகும் நிலை லேபிள் வகை தேர்ந்தெடுக்க வேண்டும்',
+        'custom_field_not_found'          => 'This field does not seem to exist, please double check your custom field names.',
+        'custom_field_not_found_on_model' => 'This field seems to exist, but is not available on this Asset Model\'s fieldset.',
 
         // date_format validation with slightly less stupid messages. It duplicates a lot, but it gets the job done :(
-        // We use this because the default error message for date_format is reflects php Y-m-d, which non-PHP
-        // people won't know how to format. 
+        // We use this because the default error message for date_format reflects php Y-m-d, which non-PHP
+        // people won't know how to format.
         'purchase_date.date_format'     => 'The :attribute must be a valid date in YYYY-MM-DD format',
         'last_audit_date.date_format'   =>  'The :attribute must be a valid date in YYYY-MM-DD hh:mm:ss format',
         'expiration_date.date_format'   =>  'The :attribute must be a valid date in YYYY-MM-DD format',
@@ -137,9 +209,15 @@ return [
         'expected_checkin.date_format'  =>  'The :attribute must be a valid date in YYYY-MM-DD format',
         'start_date.date_format'        =>  'The :attribute must be a valid date in YYYY-MM-DD format',
         'end_date.date_format'          =>  'The :attribute must be a valid date in YYYY-MM-DD format',
+        'invalid_value_in_field' => 'Invalid value included in this field',
 
-    ],
+        'ldap_username_field' => [
+            'not_in' =>         '<code>sAMAccountName</code> (mixed case) will likely not work. You should use <code>samaccountname</code> (lowercase) instead.'
+        ],
+        'ldap_auth_filter_query' => ['not_in' => '<code>uid=samaccountname</code> is probably not a valid auth filter. You probably want <code>uid=</code> '],
+        'ldap_filter' => ['regex' => 'This value should probably not be wrapped in parentheses.'],
 
+        ],
     /*
     |--------------------------------------------------------------------------
     | Custom Validation Attributes
@@ -155,8 +233,16 @@ return [
 
     /*
     |--------------------------------------------------------------------------
-    | Generic Validation Messages
+    | Generic Validation Messages - we use these in the jquery validation where we don't have
+    | access to the :attribute
     |--------------------------------------------------------------------------
     */
-    'invalid_value_in_field' => 'Invalid value included in this field',
+
+    'generic' => [
+        'invalid_value_in_field' => 'Invalid value included in this field',
+        'required' => 'This field is required',
+        'email' => 'Please enter a valid email address',
+    ],
+
+
 ];
diff --git a/resources/lang/th-TH/account/general.php b/resources/lang/th-TH/account/general.php
index 1a9e2c03b8..7f9e2f848e 100644
--- a/resources/lang/th-TH/account/general.php
+++ b/resources/lang/th-TH/account/general.php
@@ -2,10 +2,16 @@
 
 return array(
     'personal_api_keys' => 'Personal API Keys',
+    'personal_access_token' => 'Personal Access Token',
+    'personal_api_keys_success' => 'Personal API Key :key created sucessfully',
+    'here_is_api_key' => 'Here is your new personal access token. This is the only time it will be shown so do not lose it! You may now use this token to make API requests.',
     'api_key_warning' => 'When generating an API token, be sure to copy it down immediately as they will not be visible to you again.',
     'api_base_url' => 'Your API base url is located at:',
     'api_base_url_endpoint' => '/&lt;endpoint&gt;',
     'api_token_expiration_time' => 'API tokens are set to expire in:',
     'api_reference' => 'Please check the <a href="https://snipe-it.readme.io/reference" target="_blank">API reference</a> to find specific API endpoints and additional API documentation.',
     'profile_updated' => 'Account successfully updated',
+    'no_tokens' => 'You have not created any personal access tokens.',
+    'enable_sounds' => 'Enable sound effects',
+    'enable_confetti' => 'Enable confetti effects',
 );
diff --git a/resources/lang/th-TH/admin/accessories/message.php b/resources/lang/th-TH/admin/accessories/message.php
index 87be141c92..a11d9bc43d 100644
--- a/resources/lang/th-TH/admin/accessories/message.php
+++ b/resources/lang/th-TH/admin/accessories/message.php
@@ -3,7 +3,7 @@
 return array(
 
     'does_not_exist' => '[;id] อุปกรณ์เสริม ไม่มีอยู่',
-    'not_found' => 'That accessory was not found.',
+    'not_found' => 'ไม่พบอุปกรณ์เสริมนั้น',
     'assoc_users'	 => 'อุปกรณ์เสริมนี้ได้เช็คเอ้าท์ให้ผู้ใช้งานแล้วจำนวน :count รายการในปัจจุบัน กรุณาเช็คอินอุปกรณ์เสริม และลองอีกครั้ง ',
 
     'create' => array(
@@ -25,8 +25,12 @@ return array(
      'checkout' => array(
         'error'   		=> 'อุปกรณ์เสริมยังไม่ถูกเช็คเอ้าท์ กรุณาลองอีกครั้ง',
         'success' 		=> 'อุปกรณ์เสริมเช็คเอ้าท์เรียบร้อยแล้ว',
-        'unavailable'   => 'Accessory is not available for checkout. Check quantity available',
-        'user_does_not_exist' => 'ผู้ใช้งานไม่ถูกต้อง กรุณาลองใหม่อีกครั้ง'
+        'unavailable'   => 'ไม่มีอุปกรณ์เสริมสำหรับการชำระเงิน ตรวจสอบปริมาณที่มีอยู่',
+        'user_does_not_exist' => 'ผู้ใช้งานไม่ถูกต้อง กรุณาลองใหม่อีกครั้ง',
+         'checkout_qty' => array(
+            'lte'  => ':checkout_qty โปรดปรับจำนวนในการชำระเงินหรือจำนวนในสต็อกของอุปกรณ์เสริมนี้แล้วลองอีกครั้ง|มีอุปกรณ์เสริมที่มีอยู่ :number_currently_remaining ทั้งหมด และคุณกำลังพยายามตรวจสอบ :checkout_qty โปรดปรับปริมาณการชำระเงินหรือสต็อกรวมของอุปกรณ์เสริมนี้แล้วลองอีกครั้ง',
+            ),
+           
     ),
 
     'checkin' => array(
diff --git a/resources/lang/th-TH/admin/accessories/table.php b/resources/lang/th-TH/admin/accessories/table.php
index 28de60b54c..35c8e0c69c 100644
--- a/resources/lang/th-TH/admin/accessories/table.php
+++ b/resources/lang/th-TH/admin/accessories/table.php
@@ -6,6 +6,4 @@ return array(
     'id'      					=> 'ไอดี',
     'require_acceptance'      	=> 'การยอมรับ',
     'title'      				=> 'ชื่ออุปกรณ์เสริม',
-
-
 );
diff --git a/resources/lang/th-TH/admin/categories/general.php b/resources/lang/th-TH/admin/categories/general.php
index 09161697f0..096b62996d 100644
--- a/resources/lang/th-TH/admin/categories/general.php
+++ b/resources/lang/th-TH/admin/categories/general.php
@@ -8,8 +8,8 @@ return array(
     'clone'                             => 'คัดลอกหมวดหมู่',
     'create'  							=> 'สร้างหมวดหมู่',
     'edit'                              => 'แก้ไขหมวดหมู่',
-    'email_will_be_sent_due_to_global_eula' => 'An email will be sent to the user because the global EULA is being used.',
-    'email_will_be_sent_due_to_category_eula' => 'An email will be sent to the user because a EULA is set for this category.',
+    'email_will_be_sent_due_to_global_eula' => 'อีเมลจะถูกส่งไปยังผู้ใช้เนื่องจากมีการใช้งาน EULA ทั่วโลก',
+    'email_will_be_sent_due_to_category_eula' => 'อีเมลจะถูกส่งไปยังผู้ใช้เนื่องจากมีการตั้งค่า EULA สำหรับหมวดหมู่นี้',
     'eula_text'							=> 'หมวดหมู่ข้อกำหนดการใช้งาน',
     'eula_text_help'					=> 'ส่วนนี้อนุญาตให้คุณสามารถทำการปรับแต่งข้อตกลงการใช้งานสำหรับกำหนดชนิดของทรัพย์สินได้ หากคุณมีข้อตกลงการใช้งานเพียงหนึ่ง หรือเรื่องเดียวที่ใช้ครอบคลุมทรัพย์สินของคุณทั้งหมด คุณสามารถตั้งค่าให้เป็นการใช้งานหลัก โดยการทำเครื่องหมายในช่องด้านล่างนี้',
     'name'                              => 'ชื่อหมวดหมู่',
diff --git a/resources/lang/th-TH/admin/categories/message.php b/resources/lang/th-TH/admin/categories/message.php
index d75989743b..a779805cab 100644
--- a/resources/lang/th-TH/admin/categories/message.php
+++ b/resources/lang/th-TH/admin/categories/message.php
@@ -14,7 +14,7 @@ return array(
     'update' => array(
         'error'   => 'ยังไม่ได้ปรับปรุงหมวดหมู่ กรุณาลองอีกครั้ง',
         'success' => 'ปรับปรุงหมวดหมู่เรียบร้อยแล้ว.',
-        'cannot_change_category_type'   => 'You cannot change the category type once it has been created',
+        'cannot_change_category_type'   => 'คุณไม่สามารถเปลี่ยนประเภทหมวดหมู่ได้เมื่อสร้างแล้ว',
     ),
 
     'delete' => array(
diff --git a/resources/lang/th-TH/admin/companies/table.php b/resources/lang/th-TH/admin/companies/table.php
index 7424d2809d..341e681079 100644
--- a/resources/lang/th-TH/admin/companies/table.php
+++ b/resources/lang/th-TH/admin/companies/table.php
@@ -2,9 +2,9 @@
 return array(
     'companies' => 'บริษัท',
     'create'    => 'สร้าง บริษัท',
-    'email'     => 'Company Email',
+    'email'     => 'อีเมล์บริษัท',
     'title'     => 'บริษัท',
-    'phone'     => 'Company Phone',
+    'phone'     => 'โทรศัพท์บริษัท',
     'update'    => 'ปรับปรุง บริษัท',
     'name'      => 'ชื่อ บริษัท',
     'id'        => 'ID',
diff --git a/resources/lang/th-TH/admin/components/general.php b/resources/lang/th-TH/admin/components/general.php
index dc19e71191..b4bd2a9bbb 100644
--- a/resources/lang/th-TH/admin/components/general.php
+++ b/resources/lang/th-TH/admin/components/general.php
@@ -12,5 +12,5 @@ return array(
     'remaining' 			             => 'ที่เหลืออยู่',
     'total' 			                 => 'ทั้งหมด',
     'update'                            => 'อัพเดตคอมโพเนนต์',
-    'checkin_limit'            => 'Amount checked in must be equal to or less than :assigned_qty'
+    'checkin_limit'            => 'จำนวนเงินที่เช็คอินจะต้องเท่ากับหรือน้อยกว่า :assigned_qty'
 );
diff --git a/resources/lang/th-TH/admin/components/message.php b/resources/lang/th-TH/admin/components/message.php
index 887b7e6cd0..2d73f4c574 100644
--- a/resources/lang/th-TH/admin/components/message.php
+++ b/resources/lang/th-TH/admin/components/message.php
@@ -17,7 +17,8 @@ return array(
     'delete' => array(
         'confirm'   => 'คุณแน่ใจหรือไม่ว่าต้องการลบคอมโพเนนต์นี้',
         'error'   => 'เกิดปัญหาในการลบคอมโพเนนต์ กรุณาลองอีกครั้ง.',
-        'success' => 'คอมโพเนนต์ถูกลบเรียบร้อยแล้ว'
+        'success' => 'คอมโพเนนต์ถูกลบเรียบร้อยแล้ว',
+        'error_qty'   => 'Some components of this type are still checked out. Please check them in and try again.',
     ),
 
      'checkout' => array(
diff --git a/resources/lang/th-TH/admin/consumables/general.php b/resources/lang/th-TH/admin/consumables/general.php
index 892abb6cc5..f67944b0b3 100644
--- a/resources/lang/th-TH/admin/consumables/general.php
+++ b/resources/lang/th-TH/admin/consumables/general.php
@@ -8,4 +8,5 @@ return array(
     'remaining' 			            => 'คงค้าง',
     'total' 			                => 'รวมทั้งหมด',
     'update'                            => 'ปรับปรุงวัสดุสิ้นเปลือง',
+    'inventory_warning'                 => 'The inventory of this consumable is below the minimum amount of :min_count',
 );
diff --git a/resources/lang/th-TH/admin/consumables/message.php b/resources/lang/th-TH/admin/consumables/message.php
index 98f3d3e82b..8690922e8a 100644
--- a/resources/lang/th-TH/admin/consumables/message.php
+++ b/resources/lang/th-TH/admin/consumables/message.php
@@ -2,6 +2,7 @@
 
 return array(
 
+    'invalid_category_type' => 'The category must be a consumable category.',
     'does_not_exist' => 'ไม่มีรายการวัสดุสิ้นเปลืองนี้',
 
     'create' => array(
diff --git a/resources/lang/th-TH/admin/custom_fields/general.php b/resources/lang/th-TH/admin/custom_fields/general.php
index dca1c58b23..da24d27b9e 100644
--- a/resources/lang/th-TH/admin/custom_fields/general.php
+++ b/resources/lang/th-TH/admin/custom_fields/general.php
@@ -35,7 +35,7 @@ return [
     'create_field_title' => 'สร้างฟิลด์ที่กำหนดเองใหม่',
     'value_encrypted'      	        => 'ค่าของฟิลด์นี้ถูกเข้ารหัสในฐานข้อมูล เฉพาะผู้ดูแลระบบเท่านั้นที่สามารถดูค่าที่ถอดรหัสได้',
     'show_in_email'     => 'Include the value of this field in checkout emails sent to the user? Encrypted fields cannot be included in emails',
-    'show_in_email_short'     => 'Include in emails.',
+    'show_in_email_short' => 'Include in emails',
     'help_text' => 'ช่วยเหลือ',
     'help_text_description' => 'ข้อความนี้จะปรากฏขึ้นมาด้านล่างในขณะแก้แบบฟอร์มของเนื้อหาสินทรัพย์',
     'about_custom_fields_title' => 'เกี่ยวกับการกำหนดฟิลด์',
@@ -57,5 +57,8 @@ return [
     'show_in_requestable_list_short' => 'Show in requestable assets list',
     'show_in_requestable_list' => 'Show value in requestable assets list. Encrypted fields will not be shown',
     'encrypted_options' => 'This field is encrypted, so some display options will not be available.',
+    'display_checkin' => 'Display in checkin forms',
+    'display_checkout' => 'Display in checkout forms',
+    'display_audit' => 'Display in audit forms',
 
 ];
diff --git a/resources/lang/th-TH/admin/custom_fields/message.php b/resources/lang/th-TH/admin/custom_fields/message.php
index 5824244772..c2244df249 100644
--- a/resources/lang/th-TH/admin/custom_fields/message.php
+++ b/resources/lang/th-TH/admin/custom_fields/message.php
@@ -5,6 +5,7 @@ return array(
     'field' => array(
         'invalid'   => 'ฟิลด์นั้นไม่มีอยู่',
         'already_added'   => 'ฟิลด์ถูกเพิ่มแล้ว',
+        'none_selected'   => 'No field selected',
 
         'create' => array(
             'error'   => 'ไม่ได้สร้างฟิลด์โปรดลองอีกครั้ง',
diff --git a/resources/lang/th-TH/admin/depreciations/general.php b/resources/lang/th-TH/admin/depreciations/general.php
index f5156f60f5..070ac0f694 100644
--- a/resources/lang/th-TH/admin/depreciations/general.php
+++ b/resources/lang/th-TH/admin/depreciations/general.php
@@ -13,4 +13,8 @@ return [
     'no_depreciations_warning'               => '<strong>Warning: </strong>
                       You do not currently have any depreciations set up.
                       Please set up at least one depreciation to view the depreciation report.',
+    'depreciation_method'                   => 'รายงานการเสื่อมราคา',
+    'linear_depreciation'                   => 'Linear (Default)',
+    'half_1'                                => 'Half-year convention, always applied',
+    'half_2'                                => 'Half-year convention, applied with condition',
 ];
diff --git a/resources/lang/th-TH/admin/hardware/form.php b/resources/lang/th-TH/admin/hardware/form.php
index a824805392..42307a87ce 100644
--- a/resources/lang/th-TH/admin/hardware/form.php
+++ b/resources/lang/th-TH/admin/hardware/form.php
@@ -55,8 +55,11 @@ return [
     'asset_location_update_default' => 'Update only default location',
     'asset_location_update_actual' => 'Update only actual location',
     'asset_not_deployable' => 'That asset status is not deployable. This asset cannot be checked out.',
-    'asset_deployable' => 'That status is deployable. This asset can be checked out.',
+    'asset_not_deployable_checkin' => 'That asset status is not deployable. Using this status label will checkin the asset.',
+    'asset_deployable' => 'This asset can be checked out.',
     'processing_spinner' => 'Processing... (This might take a bit of time on large files)',
+    'processing' => 'Processing... ',
     'optional_infos'  => 'Optional Information',
-    'order_details'   => 'Order Related Information'
+    'order_details'   => 'Order Related Information',
+    'calc_eol'    => 'If nulling the EOL date, use automatic EOL calculation based on the purchase date and EOL rate.',
 ];
diff --git a/resources/lang/th-TH/admin/hardware/general.php b/resources/lang/th-TH/admin/hardware/general.php
index 8c07efe25b..e7d4e1dde8 100644
--- a/resources/lang/th-TH/admin/hardware/general.php
+++ b/resources/lang/th-TH/admin/hardware/general.php
@@ -5,8 +5,8 @@ return [
     'about_assets_text'            => 'สินทรัพย์คือรายการที่ติดตามโดยใช้หมายเลขซีเรียลหรือแท็กเนื้อหา พวกเขามีแนวโน้มที่จะเป็นรายการมูลค่าที่สูงขึ้นซึ่งจะระบุรายการที่เฉพาะเจาะจง',
     'archived'  				=> 'ถูกเก็บไว้',
     'asset'  					=> 'สินทรัพย์',
-    'bulk_checkout'             => 'ตรวจสอบสินทรัพย์',
-    'bulk_checkin'              => 'Checkin Assets',
+    'bulk_checkout'             => 'Checkout เป็นกลุ่ม',
+    'bulk_checkin'              => 'Bulk Checkin',
     'checkin'  					=> 'เช็คอินสินทรัพย์',
     'checkout'  				=> 'ตรวจสอบสินทรัพย์',
     'clone'  					=> 'คัดลอกแบบสินทรัพย์',
@@ -27,8 +27,7 @@ return [
     'undeployable_tooltip'  	=> 'This asset has a status label that is undeployable and cannot be checked out at this time.',
     'view'  					=> 'ดูสินทรัพย์',
     'csv_error' => 'You have an error in your CSV file:',
-    'import_text' => '<p>Upload a CSV that contains asset history. The assets and users MUST already exist in the system, or they will be skipped. Matching assets for history import happens against the asset tag. We will try to find a matching user based on the user\'s name you provide, and the criteria you select below. If you do not select any criteria below, it will simply try to match on the username format you configured in the <code>Admin &gt; General Settings</code>.</p><p>Fields included in the CSV must match the headers: <strong>Asset Tag, Name, Checkout Date, Checkin Date</strong>. Any additional fields will be ignored. </p><p>Checkin Date: blank or future checkin dates will checkout items to associated user.  Excluding the Checkin Date column will create a checkin date with todays date.</p>
-    ',
+    'import_text' => '<p>Upload a CSV that contains asset history. The assets and users MUST already exist in the system, or they will be skipped. Matching assets for history import happens against the asset tag. We will try to find a matching user based on the user\'s name you provide, and the criteria you select below. If you do not select any criteria below, it will simply try to match on the username format you configured in the <code>Admin &gt; General Settings</code>.</p><p>Fields included in the CSV must match the headers: <strong>Asset Tag, Name, Checkout Date, Checkin Date</strong>. Any additional fields will be ignored. </p><p>Checkin Date: blank or future checkin dates will checkout items to associated user.  Excluding the Checkin Date column will create a checkin date with todays date.</p>    ',
     'csv_import_match_f-l' => 'Try to match users by <strong>firstname.lastname</strong> (<code>jane.smith</code>) format',
     'csv_import_match_initial_last' => 'Try to match users by <strong>first initial last name</strong> (<code>jsmith</code>) format',
     'csv_import_match_first' => 'Try to match users by <strong>first name</strong> (<code>jane</code>) format',
diff --git a/resources/lang/th-TH/admin/hardware/message.php b/resources/lang/th-TH/admin/hardware/message.php
index 3224c4966c..789a9ab51d 100644
--- a/resources/lang/th-TH/admin/hardware/message.php
+++ b/resources/lang/th-TH/admin/hardware/message.php
@@ -2,18 +2,23 @@
 
 return [
 
-    'undeployable' 		=> '<strong>คำเตือน: </strong> สินทรัพย์นี้ถูกกำหนดสถานะให้ไม่สามารถใช้งานได้ หากสถานะนี้ถูกเปลี่ยน กรุณาอัพเดทสถานะสินทรัพย์ด้วย',
-    'does_not_exist' 	=> 'ไม่มีสินทรัพย์',
-    'does_not_exist_var'=> 'Asset with tag :asset_tag not found.',
-    'no_tag' 	        => 'No asset tag provided.',
+    'undeployable' 		 => '<strong>Warning: </strong> This asset has been marked as currently undeployable. If this status has changed, please update the asset status.',
+    'does_not_exist' 	 => 'ไม่มีสินทรัพย์',
+    'does_not_exist_var' => 'Asset with tag :asset_tag not found.',
+    'no_tag' 	         => 'No asset tag provided.',
     'does_not_exist_or_not_requestable' => 'สินทรัพย์นั้นไม่มีอยู่หรือไม่สามารถร้องขอได้',
-    'assoc_users'	 	=> 'ขณะนี้มีการตรวจสอบเนื้อหานี้แก่ผู้ใช้และไม่สามารถลบออกได้ โปรดตรวจสอบเนื้อหาเป็นครั้งแรกจากนั้นลองลบอีกครั้ง',
+    'assoc_users'	 	 => 'ขณะนี้มีการตรวจสอบเนื้อหานี้แก่ผู้ใช้และไม่สามารถลบออกได้ โปรดตรวจสอบเนื้อหาเป็นครั้งแรกจากนั้นลองลบอีกครั้ง',
     'warning_audit_date_mismatch' 	=> 'This asset\'s next audit date (:next_audit_date) is before the last audit date (:last_audit_date). Please update the next audit date.',
+    'labels_generated'   => 'Labels were successfully generated.',
+    'error_generating_labels' => 'Error while generating labels.',
+    'no_assets_selected' => 'No assets selected.',
 
     'create' => [
         'error'   		=> 'ไม่ได้สร้างเนื้อหาโปรดลองอีกครั้ง :(',
         'success' 		=> 'สร้างเนื้อหาสำเร็จแล้ว :)',
         'success_linked' => 'Asset with tag :tag was created successfully. <strong><a href=":link" style="color: white;">Click here to view</a></strong>.',
+        'multi_success_linked' => 'Asset with tag :links was created successfully.|:count assets were created succesfully. :links.',
+        'partial_failure' => 'An asset was unable to be created. Reason: :failures|:count assets were unable to be created. Reasons: :failures',
     ],
 
     'update' => [
@@ -51,20 +56,24 @@ return [
     ],
 
     'import' => [
+        'import_button'         => 'Process Import',
         'error'                 => 'บางรายการไม่สามารถนำเข้าได้อย่างถูกต้อง',
         'errorDetail'           => 'รายการต่อไปนี้ไม่ได้นำเข้าเนื่องจากมีข้อผิดพลาด',
         'success'               => 'ไฟล์ของคุณถูกนำเข้าแล้ว',
         'file_delete_success'   => 'ไฟล์ของคุณถูกลบเรียบร้อยแล้ว',
         'file_delete_error'      => 'ไม่สามารถลบไฟล์ได้',
         'file_missing' => 'The file selected is missing',
+        'file_already_deleted' => 'The file selected was already deleted',
         'header_row_has_malformed_characters' => 'One or more attributes in the header row contain malformed UTF-8 characters',
         'content_row_has_malformed_characters' => 'One or more attributes in the first row of content contain malformed UTF-8 characters',
+        'transliterate_failure' => 'Transliteration from :encoding to UTF-8 failed due to invalid characters in input'
     ],
 
 
     'delete' => [
         'confirm'   	=> 'คุณแน่ใจหรือไม่ว่าต้องการลบเนื้อหานี้',
         'error'   		=> 'เกิดปัญหาในการลบเนื้อหา กรุณาลองอีกครั้ง.',
+        'assigned_to_error' => '{1}Asset Tag: :asset_tag is currently checked out. Check in this device before deletion.|[2,*]Asset Tags: :asset_tag are currently checked out. Check in these devices before deletion.',
         'nothing_updated'   => 'ไม่มีการเลือกเนื้อหาใด ๆ ดังนั้นจึงไม่มีสิ่งใดถูกลบ',
         'success' 		=> 'เนื้อหาถูกลบเรียบร้อยแล้ว',
     ],
@@ -77,6 +86,11 @@ return [
         'no_assets_selected' => 'คุณต้องเลือกอย่างน้อยหนึ่งสินทรัพย์จากรายการ',
     ],
 
+    'multi-checkout' => [
+        'error'   => 'Asset was not checked out, please try again|Assets were not checked out, please try again',
+        'success' => 'Asset checked out successfully.|Assets checked out successfully.',
+    ],
+
     'checkin' => [
         'error'   		=> 'ไม่ได้เช็คอินเนื้อหาโปรดลองอีกครั้ง',
         'success' 		=> 'ตรวจสอบเนื้อหาเรียบร้อยแล้ว',
@@ -86,9 +100,10 @@ return [
     ],
 
     'requests' => [
-        'error'   		=> 'ไม่ได้ร้องขอเนื้อหาโปรดลองอีกครั้ง',
-        'success' 		=> 'ขอรับสินทรัพย์สำเร็จแล้ว',
-        'canceled'      => 'ยกเลิกคำขอชำระเงินเรียบร้อยแล้ว',
+        'error'   		=> 'Request was not successful, please try again.',
+        'success' 		=> 'Request successfully submitted.',
+        'canceled'      => 'Request successfully canceled.',
+        'cancel'        => 'Cancel this item request',
     ],
 
 ];
diff --git a/resources/lang/th-TH/admin/hardware/table.php b/resources/lang/th-TH/admin/hardware/table.php
index 3d6d50d3b4..ba8e419c43 100644
--- a/resources/lang/th-TH/admin/hardware/table.php
+++ b/resources/lang/th-TH/admin/hardware/table.php
@@ -25,7 +25,6 @@ return [
     'image'		    => 'ภาพอุปกรณ์',
     'days_without_acceptance' => 'วันโดยปราศจากการยอมรับ',
     'monthly_depreciation' => 'ค่าเสื่อมราคารายเดือน',
-    'assigned_to'    => 'ได้รับมอบหมายให้',
     'requesting_user' => 'Requesting User',
     'requested_date' => 'วันที่ขอ',
     'changed'       => 'เปลี่ยนแปลงแล้ว',
diff --git a/resources/lang/th-TH/admin/kits/general.php b/resources/lang/th-TH/admin/kits/general.php
index f57fb645c4..2b5c2d9cd0 100644
--- a/resources/lang/th-TH/admin/kits/general.php
+++ b/resources/lang/th-TH/admin/kits/general.php
@@ -47,4 +47,5 @@ return [
     'kit_deleted'                       => 'Kit was successfully deleted',
     'kit_model_updated'                 => 'Model was successfully updated',
     'kit_model_detached'                => 'Model was successfully detached',
+    'model_already_attached'            => 'Model already attached to kit',
 ];
diff --git a/resources/lang/th-TH/admin/licenses/general.php b/resources/lang/th-TH/admin/licenses/general.php
index 65576f6c05..bb84ed1016 100644
--- a/resources/lang/th-TH/admin/licenses/general.php
+++ b/resources/lang/th-TH/admin/licenses/general.php
@@ -14,6 +14,7 @@ return array(
     'info'  					=> 'ข้อมูลใบอนุญาต',
     'license_seats'  			=> 'ที่นั่งใบอนุญาต',
     'seat'  					=> 'ที่นั่ง',
+    'seat_count'  				=> 'Seat :count',
     'seats'  					=> 'ที่นั่ง',
     'software_licenses'  		=> 'ใบอนุญาตซอฟต์แวร์',
     'user'  					=> 'ผู้ใช้งาน',
@@ -23,12 +24,12 @@ return array(
         [
             'checkin_all'           => [
                 'button'            => 'Checkin All Seats',
-                'modal'             => 'This will action checkin one seat. | This action will checkin all :checkedout_seats_count seats for this license.',
+                'modal'             => 'This action will checkin one seat. | This action will checkin all :checkedout_seats_count seats for this license.',
                 'enabled_tooltip'   => 'Checkin ALL seats for this license from both users and assets',
                 'disabled_tooltip'  => 'This is disabled because there are no seats currently checked out',
                 'disabled_tooltip_reassignable'  => 'This is disabled because the License is not reassignable',
                 'success'           => 'License successfully checked in! | All licenses were successfully checked in!',
-                'log_msg'           => 'Checked in via bulk license checkout in license GUI',
+                'log_msg'           => 'Checked in via bulk license checkin in license GUI',
             ],
 
             'checkout_all'              => [
diff --git a/resources/lang/th-TH/admin/licenses/message.php b/resources/lang/th-TH/admin/licenses/message.php
index d65ce02d9c..57892e69eb 100644
--- a/resources/lang/th-TH/admin/licenses/message.php
+++ b/resources/lang/th-TH/admin/licenses/message.php
@@ -44,10 +44,13 @@ return array(
         'error'   => 'มีปัญหาในการตรวจสอบใบอนุญาต กรุณาลองอีกครั้ง.',
         'success' => 'ออกใบอนุญาตแล้ว',
         'not_enough_seats' => 'Not enough license seats available for checkout',
+        'mismatch' => 'The license seat provided does not match the license',
+        'unavailable' => 'This seat is not available for checkout.',
     ),
 
     'checkin' => array(
         'error'   => 'เกิดปัญหาในการตรวจสอบใบอนุญาต กรุณาลองอีกครั้ง.',
+        'not_reassignable' => 'License not reassignable',
         'success' => 'ใบอนุญาตได้รับการตรวจสอบเรียบร้อยแล้ว'
     ),
 
diff --git a/resources/lang/th-TH/admin/locations/message.php b/resources/lang/th-TH/admin/locations/message.php
index f481aa2b08..b0e110fd83 100644
--- a/resources/lang/th-TH/admin/locations/message.php
+++ b/resources/lang/th-TH/admin/locations/message.php
@@ -3,11 +3,12 @@
 return array(
 
     'does_not_exist' => 'ไม่มีสถานที่นี้.',
-    'assoc_users'    => 'This location is not currently deletable because it is the location of record for at least one asset or user, has assets assigned to it, or is the parent location of another location. Please update your models to no longer reference this company and try again. ',
+    'assoc_users'    => 'This location is not currently deletable because it is the location of record for at least one asset or user, has assets assigned to it, or is the parent location of another location. Please update your records to no longer reference this location and try again ',
     'assoc_assets'	 => 'สถานที่นี้ถูกใช้งานหรือเกี่ยวข้องอยู่กับผู้ใช้งานคนใดคนหนึ่ง และไม่สามารถลบได้ กรุณาปรับปรุงผู้ใช้งานของท่านไม่ให้มีส่วนเกี่ยวข้องกับสถานที่นี้ และลองอีกครั้ง. ',
     'assoc_child_loc'	 => 'สถานที่นี้ถูกใช้งานหรือเกี่ยวข้องอยู่กับหมวดสถานที่ใดที่หนึ่ง และไม่สามารถลบได้ กรุณาปรับปรุงสถานที่ของท่านไม่ให้มีส่วนเกี่ยวข้องกับหมวดสถานที่นี้ และลองอีกครั้ง. ',
     'assigned_assets' => 'สินทรัพย์ถูกมอบหมายแล้ว',
     'current_location' => 'ตำแหน่งปัจจุบัน',
+    'open_map' => 'Open in :map_provider_icon Maps',
 
 
     'create' => array(
@@ -20,6 +21,11 @@ return array(
         'success' => 'ปรับปรุงสถานที่เรียบร้อยแล้ว.'
     ),
 
+    'restore' => array(
+        'error'   => 'Location was not restored, please try again',
+        'success' => 'Location restored successfully.'
+    ),
+
     'delete' => array(
         'confirm'   	=> 'คุณแน่ใจที่จะลบสถานที่นี้?',
         'error'   => 'มีปัญหาระหว่างการลบสถานที่ กรุณาลองใหม่อีกครั้ง.',
diff --git a/resources/lang/th-TH/admin/locations/table.php b/resources/lang/th-TH/admin/locations/table.php
index a380bc5a29..c1c5e8dd2b 100644
--- a/resources/lang/th-TH/admin/locations/table.php
+++ b/resources/lang/th-TH/admin/locations/table.php
@@ -15,7 +15,7 @@ return [
     'print_all_assigned'        => 'พิมพ์ งานที่มอบหมาย ทั้งหมด',
     'name'                      => 'ชื่อสถานที่',
     'address'                   => 'ที่อยู่',
-    'address2'                   => 'Address Line 2',
+    'address2'                   => 'ที่อยู่บรรทัดที่ 2',
     'zip'                       => 'รหัสไปรษณีย์',
     'locations'                 => 'สถานที่',
     'parent'                    => 'หมวดแม่',
@@ -34,9 +34,10 @@ return [
     'asset_checked_out'         => 'เช็คเอาท์',
     'asset_expected_checkin'    => 'วันที่เช็คอินที่คาดหวังไว้',
     'date'                      => 'วันเดือนปี',
-    'phone'                     => 'Location Phone',
+    'phone'                     => 'หมายเลขโทรศัพท์',
     'signed_by_asset_auditor'   => 'ลงชื่อ (ผู้ตรวจรายการทรัพทย์สิน)',
     'signed_by_finance_auditor' => 'ลงชื่อ (ผู้ตรวจการเงิน)',
     'signed_by_location_manager' => 'ลงชื่อ (หัวหน้าจุด)',
     'signed_by'                 => 'ลงชื่อออก',
+    'clone'  					=> 'Clone Location',
 ];
diff --git a/resources/lang/th-TH/admin/models/general.php b/resources/lang/th-TH/admin/models/general.php
index e708cc824a..ec74f4e404 100644
--- a/resources/lang/th-TH/admin/models/general.php
+++ b/resources/lang/th-TH/admin/models/general.php
@@ -3,7 +3,7 @@
 return array(
     'about_models_title'     => 'เกี่ยวกับโมเดลสินทรัพย์',
     'about_models_text'           => 'โมเดลสินทรัพย์คือวิธีการจัดกลุ่มเนื้อหาที่เหมือนกัน "MBP 2013", "IPhone 6s" ฯลฯ',
-    'deleted'  					        => 'This model has been deleted.',
+    'deleted'  					=> 'This model has been deleted.',
     'bulk_delete'               => 'การลบรายการเป็นกลุ่ม',
     'bulk_delete_help'               => 'ใช้ช่องทำเครื่องหมายด้านล่างเพื่อยืนยันการลบโมเดลเนื้อหาที่เลือก โมเดลสินทรัพย์ที่มีเนื้อหาเกี่ยวข้องกับเนื้อหาเหล่านั้นไม่สามารถลบออกได้จนกว่าสินทรัพย์จะเชื่อมโยงกับโมเดลอื่น',
     'bulk_delete_warn'          => 'You are about to delete one asset model.|You are about to delete :model_count asset models.',
diff --git a/resources/lang/th-TH/admin/models/message.php b/resources/lang/th-TH/admin/models/message.php
index 55fc9e046b..87410a9171 100644
--- a/resources/lang/th-TH/admin/models/message.php
+++ b/resources/lang/th-TH/admin/models/message.php
@@ -7,7 +7,7 @@ return array(
     'no_association' => 'WARNING! The asset model for this item is invalid or missing!',
     'no_association_fix' => 'This will break things in weird and horrible ways. Edit this asset now to assign it a model.',
     'assoc_users'	 => 'โมเดลนี้มีความสัมพันธ์กับสินทรัพย์หนึ่ง หรือมากกว่าในปัจจุบัน และจะไม่สามารถลบได้ กรุณาลบสินทรัพย์และลองอีกครั้ง ',
-
+    'invalid_category_type' => 'This category must be an asset category.',
 
     'create' => array(
         'error'   => 'ยังไม่ได้สร้างโมเดล กรุณาลองใหม่อีกครั้ง',
diff --git a/resources/lang/th-TH/admin/reports/general.php b/resources/lang/th-TH/admin/reports/general.php
index 0ed55ab285..58c260c9d2 100644
--- a/resources/lang/th-TH/admin/reports/general.php
+++ b/resources/lang/th-TH/admin/reports/general.php
@@ -4,6 +4,7 @@ return [
     'info'   => 'เลือกออฟชั่นสำหรับรายงานสินทรัพย์ที่คุณต้องการ',
     'deleted_user' => 'Deleted user',
     'send_reminder' => 'Send reminder',
+    'cannot_send_reminder' => 'User has been deleted or does not have an email address so cannot receive a reminder',
     'reminder_sent' => 'Reminder sent',
     'acceptance_deleted' => 'Acceptance request deleted',
     'acceptance_request' => 'Acceptance request',
@@ -13,5 +14,10 @@ return [
         'user_state' => 'User State',
         'user_country' => 'User Country',
         'user_zip' => 'User Zip'
-    ]
-];
\ No newline at end of file
+    ],
+    'open_saved_template' => 'Open Saved Template',
+    'save_template' =>  'Save Template',
+    'select_a_template' => 'Select a Template',
+    'template_name' => 'Template Name',
+    'update_template' => 'Update Template',
+];
diff --git a/resources/lang/th-TH/admin/reports/message.php b/resources/lang/th-TH/admin/reports/message.php
index 7fe4824834..2800bbdf0b 100644
--- a/resources/lang/th-TH/admin/reports/message.php
+++ b/resources/lang/th-TH/admin/reports/message.php
@@ -1,5 +1,16 @@
 <?php
 
-return array(
-    'error'   => 'คุณต้องเลือกอย่างน้อยหนึ่งออฟชั่น'
-);
+return [
+    'about_templates' => 'About Saved Templates',
+    'saving_templates_description' => 'Select your options, then enter the name of your template in the box above and click the \'Save Template\' button. Use the dropdown to select a previously saved template.',
+    'create'  => [
+        'success' => 'Template saved successfully',
+    ],
+    'update' => [
+        'success' => 'Template updated successfully',
+    ],
+    'delete' => [
+        'success' => 'Template deleted',
+        'no_delete_permission' => 'Template does not exist or you do not have permission to delete it.',
+    ],
+];
diff --git a/resources/lang/th-TH/admin/settings/general.php b/resources/lang/th-TH/admin/settings/general.php
index 9b3b175c8e..b2e57c7c6a 100644
--- a/resources/lang/th-TH/admin/settings/general.php
+++ b/resources/lang/th-TH/admin/settings/general.php
@@ -8,13 +8,13 @@ return [
     'ad_append_domain'          => 'Append domain name to username field',
     'ad_append_domain_help'     => 'User isn\'t required to write "username@domain.local", they can just type "username".',
     'admin_cc_email'            => 'อีเมล สำเนาถึง',
-    'admin_cc_email_help'       => 'หากคุณต้องการส่งสำเนาเช็คอิน / เช็คเอาต์อีเมลที่ส่งถึงผู้ใช้ไปยังบัญชีอีเมลอื่นให้ป้อนได้ที่นี่ มิฉะนั้นปล่อยให้ฟิลด์นี้ว่างเปล่า',
+    'admin_cc_email_help'       => 'Send a copy of checkin/checkout emails to this address.',
     'admin_settings'            => 'Admin Settings',
     'is_ad'				        => 'นี่คือเซิร์ฟเวอร์ Active Directory',
     'alerts'                	=> 'เตือน',
     'alert_title'               => 'Update Notification Settings',
     'alert_email'				=> 'ส่งแจ้งเตือนไปยัง',
-    'alert_email_help'    => 'Email addresses or distribution lists you want alerts to be sent to, comma separated',
+    'alert_email_help'          => 'Email addresses or distribution lists you want alerts to be sent to, comma separated.',
     'alerts_enabled'			=> 'การแจ้งเตือนถูกเปิดใช้งานแล้ว',
     'alert_interval'			=> 'เกณฑ์การเตือนที่หมดอายุ (เป็นวัน)',
     'alert_inv_threshold'		=> 'เกณฑ์การแจ้งเตือนพื้นที่โฆษณา',
@@ -31,15 +31,18 @@ return [
     'backups'					=> 'สำรอง',
     'backups_help'              => 'Create, download, and restore backups ',
     'backups_restoring'         => 'Restoring from Backup',
+    'backups_clean' => 'Clean the backed-up database before restore',
+    'backups_clean_helptext' => "This can be useful if you're changing between database versions",
     'backups_upload'            => 'Upload Backup',
     'backups_path'              => 'Backups on the server are stored in <code>:path</code>',
-    'backups_restore_warning'   => 'Use the restore button <small><span class="btn btn-xs btn-warning"><i class="text-white fas fa-retweet" aria-hidden="true"></i></span></small> to restore from a previous backup. (This does not currently work with S3 file storage or Docker.)<br><br>Your <strong>entire :app_name database and any uploaded files will be completely replaced</strong> by what\'s in the backup file.  ',
+    'backups_restore_warning'   => 'Use the restore button <small><span class="btn btn-xs btn-warning"><i class="text-white fas fa-retweet" aria-hidden="true"></i></span></small> to restore from a previous backup. (This does not currently work with S3 file storage or Docker.)<br><br>Your <strong>entire :app_name database and any uploaded files will be completely replaced</strong> by what\'s in the backup file  ',
     'backups_logged_out'         => 'All existing users, including you, will be logged out once your restore is complete.',
     'backups_large'             => 'Very large backups may time out on the restore attempt and may still need to be run via command line. ',
     'barcode_settings'			=> 'ตั้งค่าบาร์โค๊ด',
     'confirm_purge'			    => 'ยืนยัน Purge',
     'confirm_purge_help'		=> 'Enter the text "DELETE" in the box below to purge your deleted records. This action cannot be undone and will PERMANENTLY delete all soft-deleted items and users. (You should make a backup first, just to be safe.)',
     'custom_css'				=> 'กำหนด CSS เอง',
+    'custom_css_placeholder'	=> 'Add your custom CSS',
     'custom_css_help'			=> 'ระบุการกำหนด CSS ที่คุณต้องการใช้แทน ห้ามรวม tags นี้ &lt;style&gt;&lt;/style&gt;',
     'custom_forgot_pass_url'	=> 'URL รีเซ็ตรหัสผ่านที่กำหนดเอง',
     'custom_forgot_pass_url_help'	=> 'การทำเช่นนี้จะแทนที่ URL ของรหัสผ่านที่ลืมอยู่ภายในในหน้าจอการเข้าสู่ระบบซึ่งเป็นประโยชน์ในการแนะนำให้ผู้ใช้สามารถกำหนดรหัสผ่าน LDAP หรือใช้งานภายในได้ จะปิดการใช้งานฟังก์ชันรหัสผ่านลืมรหัสผ่านของผู้ใช้ภายในเครื่องได้อย่างมีประสิทธิภาพ',
@@ -47,34 +50,34 @@ return [
     'dashboard_message_help'	=> 'ข้อความนี้จะปรากฏในแดชบอร์ดสำหรับทุกคนที่มีสิทธิ์ดูแดชบอร์ด',
     'default_currency'  		=> 'สกุลเงินตั้งต้น',
     'default_eula_text'			=> 'ค่าเริ่มต้นข้อกำหนดการใช้งาน',
+    'default_eula_text_placeholder' => 'Add your default EULA text',
     'default_language'			=> 'ภาษาเริ่มต้น',
     'default_eula_help_text'	=> 'คุณยังสามารถปรับแต่งข้อตกลงการใช้งานสำหรับกกำหนดให้กับหมวดหมู่ทรัพย์สินได้',
     'acceptance_note'           => 'Add a note for your decision (Optional)',
     'display_asset_name'        => 'แสดงชื่อทรัพย์สิน',
     'display_checkout_date'     => 'แสดงวันที่นำออก',
     'display_eol'               => 'ดู EOL ในแบบตาราง',
-    'display_qr'                => 'รหัสสแควร์บนจอแสดงผล',
+    'display_qr'                => 'Display 2D barcode',
     'display_alt_barcode'		=> 'แสดงบาร์โค้ด 1D',
-    'email_logo'                => 'โลโก้อีเมล',
     'barcode_type'				=> 'ประเภทบาร์โค้ด 2D',
     'alt_barcode_type'			=> 'บาร์โค้ด 1D',
-    'email_logo_size'       => 'Square logos in email look best. ',
     'enabled'                   => 'Enabled',
     'eula_settings'				=> 'ตั้งค่าข้อตกลงการใช้งาน',
     'eula_markdown'				=> 'อนุญาต EULA นี้ <a href="https://help.github.com/articles/github-flavored-markdown/">Github flavored markdown</a>.',
+    'empty_row_count'           => 'Field Start Offset (Empty Rows)',
+    'empty_row_count_help'      => 'Fields will begin populating after this many empty rows are skipped at the top of the label.',
     'favicon'                   => 'Favicon',
     'favicon_format'            => 'Accepted filetypes are ico, png, and gif. Other image formats may not work in all browsers.',
     'favicon_size'          => 'Favicons should be square images, 16x16 pixels.',
     'footer_text'               => 'ข้อความส่วนท้ายเพิ่มเติม ',
     'footer_text_help'          => 'ข้อความนี้จะปรากฏในส่วนท้ายด้านขวา ลิงค์ได้รับอนุญาตให้ใช้เครื่องหมาย <a href="https://help.github.com/articles/github-flavored-markdown/">Github รส</a>การแบ่งบรรทัดส่วนหัวภาพ ฯลฯ อาจส่งผลให้ไม่อาจคาดเดาได้',
+    'footer_text_placeholder'   => 'Optional footer text',
     'general_settings'			=> 'การตั้งค่าทั่วไป',
-    'general_settings_keywords' => 'company support, signature, acceptance, email format, username format, images, per page, thumbnail, eula, gravatar, tos, dashboard, privacy',
     'general_settings_help'     => 'Default EULA and more',
     'generate_backup'			=> 'สร้างการสำรองข้อมูล',
     'google_workspaces'         => 'Google Workspaces',
     'header_color'              => 'สีส่วนหัว',
     'info'                      => 'การตั้งค่าเหล่านี้ช่วยให้คุณสามารถปรับแต่งลักษณะบางอย่าง',
-    'label_logo'                => 'โลโก้ฉลาก',
     'label_logo_size'           => 'Square logos look best - will be displayed in the top right of each asset label. ',
     'laravel'                   => 'เวอร์ชั่น Laravel',
     'ldap'                      => 'LDAP',
@@ -94,7 +97,7 @@ return [
     'ldap_login_sync_help'      => 'นี่เป็นการทดสอบว่า LDAP สามารถซิงค์ได้อย่างถูกต้อง หากแบบสอบถามการตรวจสอบสิทธิ์ LDAP ของคุณไม่ถูกต้องผู้ใช้อาจยังไม่สามารถเข้าสู่ระบบได้ คุณต้องบันทึกการตั้งค่า LDAP ที่อัปเดตก่อน',
     'ldap_manager'              => 'LDAP Manager',
     'ldap_server'               => 'เซิร์ฟเวอร์ LDAP',
-    'ldap_server_help'          => 'ซึ่งควรเริ่มต้นด้วย ldap: // (สำหรับ unencrypted หรือ TLS) หรือ ldaps: // (สำหรับ SSL)',
+    'ldap_server_help'          => 'This should start with ldap:// (for unencrypted) or ldaps:// (for TLS or SSL)',
     'ldap_server_cert'			=> 'การตรวจสอบใบรับรอง SSL LDAP',
     'ldap_server_cert_ignore'	=> 'อนุญาตใบรับรอง SSL ที่ไม่ถูกต้อง',
     'ldap_server_cert_help'		=> 'เลือกช่องทำเครื่องหมายนี้ถ้าคุณใช้ใบรับรอง SSL ที่ลงนามด้วยตนเองและต้องการยอมรับใบรับรอง SSL ที่ไม่ถูกต้อง',
@@ -108,8 +111,8 @@ return [
     'ldap_pword'                => 'รหัสผ่าน LDAP Bind',
     'ldap_basedn'               => 'ฐานผูก DN',
     'ldap_filter'               => 'ตัวกรอง LDAP',
-    'ldap_pw_sync'              => 'การซิงค์รหัสผ่าน LDAP',
-    'ldap_pw_sync_help'         => 'ยกเลิกการเลือกช่องนี้หากคุณไม่ต้องการเก็บรหัสผ่าน LDAP ที่ซิงค์กับรหัสผ่านเฉพาะที่ การปิดใช้งานนี้หมายความว่าผู้ใช้ของคุณอาจไม่สามารถเข้าสู่ระบบได้หากเซิร์ฟเวอร์ LDAP ของคุณไม่สามารถเข้าถึงได้เนื่องจากเหตุผลบางประการ',
+    'ldap_pw_sync'              => 'Cache LDAP Passwords',
+    'ldap_pw_sync_help'         => 'Uncheck this box if you do not wish to keep LDAP passwords cached as local hashed passwords. Disabling this means that your users may not be able to login if your LDAP server is unreachable for some reason.',
     'ldap_username_field'       => 'ฟิลด์ชื่อผู้ใช้',
     'ldap_lname_field'          => 'นามสกุล',
     'ldap_fname_field'          => 'ชื่อแรกของ LDAP',
@@ -117,13 +120,15 @@ return [
     'ldap_version'              => 'เวอร์ชัน LDAP',
     'ldap_active_flag'          => 'LDAP Active Flag',
     'ldap_activated_flag_help'  => 'This value is used to determine whether a synced user can login to Snipe-IT. <strong>It does not affect the ability to check items in or out to them</strong>, and should be the <strong>attribute name</strong> within your AD/LDAP, <strong>not the value</strong>. <br><br>If this field is set to a field name that does not exist in your AD/LDAP, or the value in the AD/LDAP field is set to <code>0</code> or <code>false</code>, <strong>user login will be disabled</strong>. If the value in the AD/LDAP field is set to <code>1</code> or <code>true</code> or <em>any other text</em> means the user can log in. When the field is blank in your AD, we respect the <code>userAccountControl</code> attribute, which usually allows non-suspended users to log in.',
+    'ldap_invert_active_flag'   => 'LDAP Invert Active Flag',
+    'ldap_invert_active_flag_help'     => 'If enabled: when the value returned by LDAP Active Flag is <code>0</code> or <code>false</code> the user account will be active.',
     'ldap_emp_num'              => 'หมายเลขพนักงานของ LDAP',
     'ldap_email'                => 'อีเมล LDAP',
     'ldap_test'                 => 'Test LDAP',
     'ldap_test_sync'            => 'Test LDAP Synchronization',
     'license'                   => 'ไลเซนซ์ซอฟต์แวร์',
-    'load_remote'               => 'Use Gravatar',
-    'load_remote_help_text'		=> 'Uncheck this box if your install cannot load scripts from the outside internet. This will prevent Snipe-IT from trying load images from Gravatar.',
+    'load_remote'               => 'Load Remote Avatars',
+    'load_remote_help_text'		=> 'Uncheck this box if your install cannot load scripts from the outside internet. This will prevent Snipe-IT from trying load avatars from Gravatar or other outside sources.',
     'login'                     => 'Login Attempts',
     'login_attempt'             => 'Login Attempt',
     'login_ip'                  => 'IP Address',
@@ -131,6 +136,7 @@ return [
     'login_user_agent'          => 'User Agent',
     'login_help'                => 'List of attempted logins',
     'login_note'                => 'เข้าสู่ระบบหมายเหตุ',
+    'login_note_placeholder'            => "If you do not have a login or have found a device belonging to this company, please call technical support at 888-555-1212. Thank you.",
     'login_note_help'           => 'คุณสามารถเลือกไม่กี่ประโยคในหน้าจอการเข้าสู่ระบบของคุณเช่นช่วยผู้ที่พบอุปกรณ์สูญหายหรือถูกขโมย ฟิลด์นี้ยอมรับเครื่องหมายการค้าที่มีรสปรุงรส <a href="https://help.github.com/articles/github-flavored-markdown/">Github</a>',
     'login_remote_user_text'    => 'ตัวเลือกการล็อกอินของผู้ใช้ระยะไกล',
     'login_remote_user_enabled_text' => 'เปิดใช้งานการเข้าสู่ระบบด้วย User Header ระยะไกล',
@@ -146,13 +152,16 @@ return [
     'logo_print_assets_help'    => 'ใช้ตราสินค้าบนสินทรัพย์สามารถพิมพ์รายการ ',
     'full_multiple_companies_support_help_text' => 'จำกัด ผู้ใช้ (รวมทั้งผู้ดูแลระบบ) ที่มอบหมายให้ บริษัท ไปยังสินทรัพย์ของ บริษัท',
     'full_multiple_companies_support_text' => 'การสนับสนุนหลาย บริษัท',
+    'scope_locations_fmcs_support_text'  => 'Scope Locations with Full Multiple Companies Support',
+    'scope_locations_fmcs_support_help_text'  => 'Restrict locations to their selected company.',
+    'scope_locations_fmcs_check_button' => 'Check Compatibility',
+    'scope_locations_fmcs_support_disabled_text'  => 'This option is disabled because you have conflicting locations set for :count or more items.',
     'show_in_model_list'   => 'แสดงใน Dropdown แบบจำลอง',
     'optional'					=> 'ออฟชั่นเสริม',
     'per_page'                  => 'ผลการค้นหาต่อหน้า',
     'php'                       => 'เวอร์ชัน PHP',
-    'php_info'                  => 'PHP Info',
+    'php_info'                  => 'PHP info',
     'php_overview'              => 'PHP',
-    'php_overview_keywords'     => 'phpinfo, system, info',
     'php_overview_help'         => 'PHP System info',
     'php_gd_info'               => 'คุณต้องติดตั้ง php-gd เพื่อแสดง QR codes, ดูในคู่มือการติดตั้ง',
     'php_gd_warning'            => 'ยังไม่ได้ติดตั้ง PHP imgae processing และ GD plugin',
@@ -218,6 +227,8 @@ return [
     'webhook_integration_help'    => ':app integration is optional, however the endpoint and channel are required if you wish to use it. To configure :app integration, you must first <a href=":webhook_link" target="_new" rel="noopener">create an incoming webhook</a> on your :app account. Click on the <strong>Test :app Integration</strong> button to confirm your settings are correct before saving. ',
     'webhook_integration_help_button'    => 'Once you have saved your :app information, a test button will appear.',
     'webhook_test_help'           => 'Test whether your :app integration is configured correctly. YOU MUST SAVE YOUR UPDATED :app SETTINGS FIRST.',
+    'shortcuts_enabled'         => 'Enable Shortcuts',
+    'shortcuts_help_text'       => '<strong>Windows</strong>: Alt + Access key, <strong>Mac</strong>: Control + Option + Access key',
     'snipe_version'  			=> 'Snipe-IT version',
     'support_footer'            => 'ลิงค์ในส่วนท้ายของหน้า ',
     'support_footer_help'       => 'ระบุผู้ที่เห็นลิงก์ไปยังข้อมูลสนับสนุน Snipe-IT และคู่มือผู้ใช้',
@@ -227,7 +238,6 @@ return [
     'update'                    => 'แก้ไขการตั้งค่า',
     'value'                     => 'มูลค่า',
     'brand'                     => 'การสร้างแบรนด์',
-    'brand_keywords'            => 'footer, logo, print, theme, skin, header, colors, color, css',
     'brand_help'                => 'Logo, Site Name',
     'web_brand'                 => 'Web Branding Type',
     'about_settings_title'      => 'เกี่ยวกับการตั้งค่า',
@@ -276,6 +286,8 @@ return [
     'two_factor_enrollment_text'	=> "จำเป็นต้องมีการตรวจสอบสิทธิ์สองปัจจัย แต่อุปกรณ์ของคุณยังไม่ได้ลงทะเบียน เปิดแอป Google Authenticator และสแกนโค้ด QR ด้านล่างเพื่อลงทะเบียนอุปกรณ์ของคุณ เมื่อคุณลงทะเบียนอุปกรณ์แล้วให้ป้อนรหัสด้านล่าง",
     'require_accept_signature'      => 'ต้องการลายเซ็น',
     'require_accept_signature_help_text'      => 'การเปิดใช้งานคุณลักษณะนี้จะกำหนดให้ผู้ใช้ลงชื่อเข้าใช้เพื่อยอมรับเนื้อหา',
+    'require_checkinout_notes'  => 'Require Notes on Checkin/Checkout',
+    'require_checkinout_notes_help_text'    => 'Enabling this feature will require the note fields to be populated when checking in or checking out an asset.',
     'left'        => 'ซ้าย',
     'right'        => 'ขวา',
     'top'        => 'ด้านบน',
@@ -313,24 +325,24 @@ return [
     'filter_by_keyword' => 'Filter by setting keyword',
     'security' => 'Security',
     'security_title' => 'Update Security Settings',
-    'security_keywords' => 'password, passwords, requirements, two factor, two-factor, common passwords, remote login, logout, authentication',
     'security_help' => 'Two-factor, Password Restrictions',
-    'groups_keywords' => 'permissions, permission groups, authorization',
     'groups_help' => 'Account permission groups',
     'localization' => 'Localization',
     'localization_title' => 'Update Localization Settings',
-    'localization_keywords' => 'localization, currency, local, locale, time zone, timezone, international, internatinalization, language, languages, translation',
     'localization_help' => 'Language, date display',
     'notifications' => 'Notifications',
     'notifications_help' => 'Email Alerts & Audit Settings',
     'asset_tags_help' => 'Incrementing and prefixes',
     'labels' => 'Labels',
     'labels_title' => 'Update Label Settings',
-    'labels_help' => 'Label sizes &amp; settings',
-    'purge_keywords' => 'permanently delete',
+    'labels_help' => 'Barcodes &amp; label settings',
     'purge_help' => 'ล้างข้อมูลที่ถูกลบ',
     'ldap_extension_warning' => 'It does not look like the LDAP extension is installed or enabled on this server. You can still save your settings, but you will need to enable the LDAP extension for PHP before LDAP syncing or login will work.',
     'ldap_ad' => 'LDAP/AD',
+    'ldap_test_label' => 'Test LDAP Sync',
+    'ldap_test_login' => ' Test LDAP Login',
+    'ldap_username_placeholder' => 'LDAP Username',
+    'ldap_password_placeholder' => 'LDAP Password',
     'employee_number' => 'หมายเลขพนักงาน',
     'create_admin_user' => 'Create a User ::',
     'create_admin_success' => 'Success! Your admin user has been added!',
@@ -342,6 +354,8 @@ return [
     'setup_migration_create_user' => 'Next: Create User',
     'ldap_settings_link' => 'LDAP Settings Page',
     'slack_test' => 'Test <i class="fab fa-slack"></i> Integration',
+    'status_label_name' => 'Status Label Name',
+    'super_admin_only'  => 'Super Admin Only',
     'label2_enable'           => 'New Label Engine',
     'label2_enable_help'      => 'Switch to the new label engine. <b>Note: You will need to save this setting before setting others.</b>',
     'label2_template'         => 'Template',
@@ -356,12 +370,15 @@ return [
     'label2_2d_type'          => 'ประเภทบาร์โค้ด 2D',
     'label2_2d_type_help'     => 'Format for 2D barcodes',
     'label2_2d_target'        => '2D Barcode Target',
-    'label2_2d_target_help'   => 'The URL the 2D barcode points to when scanned',
+    'label2_2d_target_help'   => 'The data that will be contained in the 2D barcode',
     'label2_fields'           => 'Field Definitions',
     'label2_fields_help'      => 'Fields can be added, removed, and reordered in the left column. For each field, multiple options for Label and DataSource can be added, removed, and reordered in the right column.',
+    'purge_barcodes' => 'Purge Barcodes',
     'help_asterisk_bold'    => 'Text entered as <code>**text**</code> will be displayed as bold',
     'help_blank_to_use'     => 'Leave blank to use the value from <code>:setting_name</code>',
     'help_default_will_use' => '<code>:default</code> will use the value from <code>:setting_name</code>. <br>Note that the value of the barcodes must comply with the respective barcode spec in order to be successfully generated. Please see <a href="https://snipe-it.readme.io/docs/barcodes">the documentation <i class="fa fa-external-link"></i></a> for more details. ',
+    'asset_id'              => 'Asset ID',
+    'data'               => 'Data',
     'default'               => 'Default',
     'none'                  => 'None',
     'google_callback_help' => 'This should be entered as the callback URL in your Google OAuth app settings in your organization&apos;s <strong><a href="https://console.cloud.google.com/" target="_blank">Google developer console <i class="fa fa-external-link" aria-hidden="true"></i></a></strong>.',
@@ -373,7 +390,100 @@ return [
     'database_driver' => 'Database Driver',
     'bs_table_storage' => 'Table Storage',
     'timezone' => 'Timezone',
+    'test_mail' => 'Test Mail',
     'profile_edit'          => 'Edit Profile',
     'profile_edit_help'          => 'Allow users to edit their own profiles.',
+    'default_avatar' => 'Custom Default Avatar',
+    'default_avatar_help' => 'This image will be displayed as a profile if a user does not have a profile photo.',
+    'restore_default_avatar' => 'Restore <a href=":default_avatar" data-toggle="lightbox" data-type="image">original system default avatar</a>',
+    'restore_default_avatar_help' => '',
+    'due_checkin_days' => 'Due For Checkin Warning',
+    'due_checkin_days_help' => 'How many days before the expected checkin of an asset should it be listed in the "Due for checkin" page?',
+    'no_groups' => 'No groups have been created yet. Visit <code>Admin Settings > Permission Groups</code> to add one.',
+    'text' => 'Text',
+
+    'username_formats' => [
+        'username_format'		=> 'รูปแบบชื่อผู้ใช้',
+        'firstname_lastname_format'	=> 'ชื่อนามสกุล (jane.smith)',
+        'first_name_format'	        => 'First Name (jane)',
+        'last_name_format'		=> 'Last Name (doe)',
+        'filastname_format'			=> 'First Initial Last Name (jsmith)',
+        'lastnamefirstinitial_format' =>  'Last Name First Initial (smithj)',
+        'firstname_lastname_underscore_format' => 'First Name Last Name (jane_smith)',
+        'firstinitial.lastname' => 'First Initial Last Name (j.smith)',
+        'lastname_firstinitial' => 'Last Name First Initial (smith_j)',
+        'lastname_dot_firstinitial_format' => 'Last Name First Initial (smith.j)',
+        'firstnamelastname'     => 'First Name Last Name (janesmith)',
+        'firstnamelastinitial'  => 'First Name Last Initial (janes)',
+        'lastnamefirstname'      => 'Last Name.First Name (smith.jane)',
+    ],
+
+    'email_formats' => [
+        'email_format'			=> 'รูปแบบอีเมล',
+        'firstname_lastname_format'	=> 'ชื่อนามสกุล (jane.smith@example.com)',
+        'first_name_format'		=> 'ชื่อ (jane@example.com)',
+        'last_name_format'		=> 'Last Name (doe@example.com)',
+        'filastname_format'			=> 'ชื่อย่อครั้งแรก (jsmith@example.com)',
+        'lastnamefirstinitial_format' =>  'นามสกุล ชื่อ Initial (smithj@example.com)',
+        'firstname_lastname_underscore_format' => 'ชื่อนามสกุล (jane.smith@example.com)',
+        'firstinitial.lastname' => 'อักษรต้นชื่อ นามสกุล (j.smith@example.com)',
+        'lastname_firstinitial' => 'นามสกุล อักษรต้นชื่อ (smith_j@example.com)',
+        'lastname_dot_firstinitial_format' => 'Last Name First Initial (smith.j@example.com)',
+        'firstnamelastname'     => 'ชื่อ นามสกุล (janesmith@example.com)',
+        'firstnamelastinitial'  => 'ชื่อ อักษรต้นนามสกุล (janes@example.com)',
+        'lastnamefirstname'      => 'Last Name.First Name (smith.jane@example.com)',
+    ],
+
+
+
+    'logo_labels' => [
+        'acceptance_pdf_logo'       => 'PDF Logo',
+        'email_logo'                => 'โลโก้อีเมล',
+        'label_logo'                => 'โลโก้ฉลาก',
+        'logo'                      => 'Site Logo',
+        'favicon'                   => 'Favicon',
+    ],
+
+    'logo_help' => [
+        'email_logo_size'       => 'Square logos in email look best. ',
+    ],
+
+    'logo_option_types' => [
+        'text' => 'Text',
+        'logo' => 'โลโก้',
+        'logo_and_text' => 'Logo and Text',
+    ],
+
+
+    'legends' => [
+        'scoping' => 'Scoping',
+        'formats' => 'Default Formats',
+        'profiles' => 'User Profiles',
+        'eula' => 'EULA & Acceptance Preferences',
+        'misc_display' => 'Miscellaneous Display Options',
+        'email' => 'Email Preferences',
+        'checkin' => 'Checkin Preferences',
+        'dashboard' => 'Login & Dashboard Preferences',
+        'misc' => 'Miscellaneous',
+        'logos' => 'Logos & Display',
+        'colors' => 'Colors & Skins',
+        'footer' => 'Footer Preferences',
+        'security' => 'Security Preferences',
+        'general' => 'General',
+        'intervals' => 'Intervals & Thresholds',
+    ],
+
+
+    /* Keywords for settings overview help */
+    'keywords' => [
+        'brand'             => 'footer, logo, print, theme, skin, header, colors, color, css',
+        'general_settings'  => 'company support, signature, acceptance, email format, username format, images, per page, thumbnail, eula, gravatar, tos, dashboard, privacy',
+        'groups'            => 'permissions, permission groups, authorization',
+        'labels'            => 'labels, barcodes, barcode, sheets, print, upc, qr, 1d, 2d',
+        'localization'      => 'localization, currency, local, locale, time zone, timezone, international, internatinalization, language, languages, translation',
+        'php_overview'      => 'phpinfo, system, info',
+        'purge'             => 'permanently delete',
+        'security'          => 'password, passwords, requirements, two factor, two-factor, common passwords, remote login, logout, authentication',
+    ],
 
 ];
diff --git a/resources/lang/th-TH/admin/settings/message.php b/resources/lang/th-TH/admin/settings/message.php
index 2c6576c8ed..0a7882981a 100644
--- a/resources/lang/th-TH/admin/settings/message.php
+++ b/resources/lang/th-TH/admin/settings/message.php
@@ -14,6 +14,9 @@ return [
         'restore_warning'       => 'Yes, restore it. I acknowledge that this will overwrite any existing data currently in the database. This will also log out all of your existing users (including you).',
         'restore_confirm'       => 'Are you sure you wish to restore your database from :filename?'
     ],
+    'restore' => [
+        'success'               => 'Your system backup has been restored. Please log in again.'
+    ],
     'purge' => [
         'error'     => 'เกิดข้อผิดพลาดขณะล้างข้อมูล',
         'validation_failed'     => 'การยืนยันการล้างข้อมูลของคุณไม่ถูกต้อง โปรดพิมพ์คำว่า "DELETE" ในช่องยืนยัน',
@@ -33,6 +36,9 @@ return [
         'testing_authentication' => 'Testing LDAP Authentication...',
         'authentication_success' => 'User authenticated against LDAP successfully!'
     ],
+    'labels' => [
+        'null_template' => 'Label template not found. Please select a template.',
+        ],
     'webhook' => [
         'sending' => 'Sending :app test message...',
         'success' => 'Your :webhook_name Integration works!',
@@ -42,5 +48,12 @@ return [
         'error' => 'Something went wrong. :app responded with: :error_message',
         'error_redirect' => 'ERROR: 301/302 :endpoint returns a redirect. For security reasons, we don’t follow redirects. Please use the actual endpoint.',
         'error_misc' => 'Something went wrong. :( ',
-    ]
+        'webhook_fail' => ' webhook notification failed: Check to make sure the URL is still valid.',
+        'webhook_channel_not_found' => ' webhook channel not found.',
+        'ms_teams_deprecation' => 'The selected Microsoft Teams webhook URL will be deprecated Dec 31st, 2025. Please use a workflow URL. Microsoft\'s documentation on creating a workflow can be found <a href="https://support.microsoft.com/en-us/office/create-incoming-webhooks-with-workflows-for-microsoft-teams-8ae491c7-0394-4861-ba59-055e33f75498" target="_blank"> here.</a>',
+    ],
+    'location_scoping' => [
+        'not_saved' => 'Your settings were not saved.',
+        'mismatch' => 'There is 1 item in the database that need your attention before you can enable location scoping.|There are :count items in the database that need your attention before you can enable location scoping.',
+    ],
 ];
diff --git a/resources/lang/th-TH/admin/statuslabels/table.php b/resources/lang/th-TH/admin/statuslabels/table.php
index e6fd4bf759..d65b0c7c43 100644
--- a/resources/lang/th-TH/admin/statuslabels/table.php
+++ b/resources/lang/th-TH/admin/statuslabels/table.php
@@ -1,14 +1,14 @@
 <?php
 
 return array(
-    'about'      	=> 'เกี่ยวกับป้ายสถานะ',
+    'about'      	=> 'About Status Types',
     'archived'      	=> 'ที่เก็บถาวร',
     'create'      	=> 'สร้างป้ายสถานะ',
     'color'      	=> 'สีแผนภูมิ',
     'default_label' => 'ป้ายกำกับเริ่มต้น',
     'default_label_help' => 'ใช้เพื่อให้แน่ใจว่าป้ายสถานะของคุณใช้บ่อยที่สุดจะปรากฏที่ด้านบนของกล่องเลือกเมื่อสร้าง / แก้ไขเนื้อหา',
     'deployable'      	=> 'สามารถใช้งานได้',
-    'info'      	=> 'ป้ายสถานะใช้สำหรับบ่งบอกสถานะของสินทรัพย์ของคุณว่าอยู่ในสถานะใด ซึ่งอาจจะอยู่สถานะ เช่น ซ่อมแซม สูญหาย ถูกขโมย เป็นต้น คุณสามารถสร้างป้ายสถานะสำหรับ สามารถใช้งานได้ หรืออยู่ในระหว่างการดำเนินการ หรือ ถูกเก็บไว้ถาวร',
+    'info'      	=> 'Status label types are used to describe the various states your assets could be in. They may be out for repair, lost/stolen, etc. You can create new status labels for your deployable, pending and archived assets according to your own workflow. For more information, <a href="https://snipe-it.readme.io/docs/overview#status-labels" target="_blank">see the documentation <i class="fa fa-external-link"></i></a>.',
     'name'      	=> 'ชื่อสถานะ',
     'pending'      	=> 'อยู่ระหว่างดำเนินการ',
     'status_type'   => 'ประเภทสถานะ',
diff --git a/resources/lang/th-TH/admin/users/general.php b/resources/lang/th-TH/admin/users/general.php
index 37ed453286..893397d879 100644
--- a/resources/lang/th-TH/admin/users/general.php
+++ b/resources/lang/th-TH/admin/users/general.php
@@ -19,6 +19,8 @@ return [
     'print_assigned'    => 'พิมพ์รายการทั้งหมดที่ได้รับมอบหมาย',
     'email_assigned'    => 'Email List of All Assigned',
     'user_notified'     => 'User has been emailed a list of their currently assigned items.',
+    'users_notified'    => 'The user has been emailed a list of their currently assigned items.|:count users have been emailed a list of their currently assigned items.',
+    'users_notified_warning' => ':count user has been emailed a list of their currently assigned items, however :no_email users did not have an email address so could not be emailed.|:count users have been emailed a list of their currently assigned items, however :no_email user(s) did not have an email address so could not be emailed.',
     'auto_assign_label' => 'Include this user when auto-assigning eligible licenses',
     'auto_assign_help'  => 'Skip this user in auto assignment of licenses',
     'software_user'     => 'ซอฟต์แวร์ที่กำหนดให้ :name',
diff --git a/resources/lang/th-TH/admin/users/message.php b/resources/lang/th-TH/admin/users/message.php
index 2426e9b969..077bd0c3ff 100644
--- a/resources/lang/th-TH/admin/users/message.php
+++ b/resources/lang/th-TH/admin/users/message.php
@@ -6,7 +6,7 @@ return array(
     'declined'                  => 'คุณปฏิเสธสินทรัพย์นี้เรียบร้อยแล้ว',
     'bulk_manager_warn'	        => 'ผู้ใช้ของคุณได้รับการอัปเดตแล้วแม้ว่ารายการผู้จัดการจะไม่ได้รับการบันทึกเนื่องจากผู้จัดการที่คุณเลือกอยู่ในรายชื่อผู้ใช้ที่จะแก้ไขและผู้ใช้ต้องไม่เป็นผู้จัดการของตัวเอง โปรดเลือกผู้ใช้ของคุณอีกครั้งโดยไม่รวมผู้จัดการ',
     'user_exists'               => 'มีผู้ใช้งานนี้แล้ว',
-    'user_not_found'            => 'ไม่มีผู้ใช้',
+    'user_not_found'            => 'User does not exist or you do not have permission view them.',
     'user_login_required'       => 'ต้องการชื่อผู้ใช้งาน',
     'user_has_no_assets_assigned' => 'No assets currently assigned to user.',
     'user_password_required'    => 'ต้องการรหัสผ่าน',
@@ -53,6 +53,7 @@ return array(
         'ldap_could_not_search' => 'ไม่สามารถค้นหา LDAP Server ได้ กรุณาตรวจสอบการตั้งค่า LDAP Server ของคุณในไฟล์ตั้งค่า LDAP <br>ผิดพลาดจาก LDAP Server:',
         'ldap_could_not_get_entries' => 'ไม่สามารถดึงข้อมูลจาก LDAP Server ได้ กรุณาตรวจสอบการตั้งค่า LDAP Server ของคุณในไฟล์ตั้งค่า LDAP <br>ผิดพลาดจาก LDAP Server:',
         'password_ldap' => 'รหัสผ่านสำหรับบัญชีนี้ได้รับการจัดการโดย LDAP / Active Directory โปรดติดต่อฝ่ายไอทีของคุณเพื่อเปลี่ยนรหัสผ่านของคุณ',
+        'multi_company_items_assigned' => 'This user has items assigned that belong to a different company. Please check them in or edit their company.'
     ),
 
     'deletefile' => array(
diff --git a/resources/lang/th-TH/admin/users/table.php b/resources/lang/th-TH/admin/users/table.php
index 75c8e16834..bc832bd7dc 100644
--- a/resources/lang/th-TH/admin/users/table.php
+++ b/resources/lang/th-TH/admin/users/table.php
@@ -22,7 +22,7 @@ return array(
     'managed_locations'     => 'สถานที่ที่มีการจัดการ',
     'managed_users'         => 'Managed Users',
     'name' 					=> 'ชื่อ',
-    'nogroup'               => 'No groups have been created yet. To add one, visit: ',
+    'nogroup'               => 'No groups have been created yet. To add one, visit:',
     'notes'                 => 'หมายเหตุ',
     'password_confirm' 		=> 'ยืนยันรหัสผ่าน',
     'password' 				=> 'รหัสผ่าน',
diff --git a/resources/lang/th-TH/auth.php b/resources/lang/th-TH/auth.php
index 5f94046f18..63f8a24a80 100644
--- a/resources/lang/th-TH/auth.php
+++ b/resources/lang/th-TH/auth.php
@@ -15,6 +15,6 @@ return array(
 
     'failed' => 'ข้อมูลที่ใช้ในการยืนยันตัวตนไม่ถูกต้อง',
     'password' => 'รหัสผ่านนี้ไม่ถูกต้อง',
-    'throttle' => 'คุณได้พยายามเข้าระบบหลายครั้งเกินไป กรุณาลองใหม่ใน :seconds วินาทีข้างหน้า.',
+    'throttle' => 'Too many login attempts. Please try again in :minutes minute(s).',
 
 );
diff --git a/resources/lang/th-TH/auth/message.php b/resources/lang/th-TH/auth/message.php
index d381e209e0..823355255c 100644
--- a/resources/lang/th-TH/auth/message.php
+++ b/resources/lang/th-TH/auth/message.php
@@ -6,8 +6,6 @@ return array(
     'account_not_found'      => 'บัญชีผู้ใช้งาน หรือรหัสผ่าน ไม่ถูกต้อง',
     'account_not_activated'  => 'ชื่อผู้ใช้นี้ยังไม่ได้ทำการเปิดใช้งาน',
     'account_suspended'      => 'บัญชีผู้ใช้นี้ถูกระงับการใช้งาน',
-    'account_banned'         => 'บัญชีผู้ใช้นี้ถูกห้ามใช้งาน',
-    'throttle'               => 'Too many failed login attempts. Please try again in :minutes minutes.',
 
     'two_factor' => array(
         'already_enrolled'      => 'Your device is already enrolled.',
diff --git a/resources/lang/th-TH/button.php b/resources/lang/th-TH/button.php
index 063b7fdcf7..37567516b1 100644
--- a/resources/lang/th-TH/button.php
+++ b/resources/lang/th-TH/button.php
@@ -7,6 +7,7 @@ return [
     'checkin_and_delete'  	    => 'เลือกทั้งหมดและลบผู้ใช้',
     'delete'  	                => 'ลบ',
     'edit'    	                => 'แก้ไข',
+    'clone'    	                => 'Clone',
     'restore' 	                => 'นำกลับ',
     'remove'                    => 'ลบออก',
     'request'                   => 'ร้องขอ',
@@ -21,4 +22,13 @@ return [
     'add_maintenance'           => 'เพิ่มรายการซ่อมบำรุง',
     'append'                    => 'เพิ่ม',
     'new'                       => 'สร้างใหม่',
+    'var' => [
+        'clone'     => 'Clone :item_type',
+        'edit'      => 'Edit :item_type',
+        'delete'    => 'Delete :item_type',
+        'restore'   => 'Restore :item_type',
+        'create'    => 'Create New :item_type',
+        'checkout'  => 'Checkout :item_type',
+        'checkin'   => 'Checkin :item_type',
+    ]
 ];
diff --git a/resources/lang/th-TH/general.php b/resources/lang/th-TH/general.php
index 9ad71af728..2b2995be61 100644
--- a/resources/lang/th-TH/general.php
+++ b/resources/lang/th-TH/general.php
@@ -10,7 +10,7 @@ return [
     'action'                => 'ดำเนินการ',
     'activity_report'		=> 'รายงานกิจกรรม',
     'address'				=> 'ที่อยู่',
-    'admin'					=> 'ผู้ดูแลระบบ',
+    'admin'					=> 'Admin Settings',
     'admin_tooltip'			=> 'This user has admin privileges',
     'superuser'				=> 'Superuser',
     'superuser_tooltip'		=> 'This user has superuser privileges',
@@ -23,13 +23,16 @@ return [
     'asset_models'			=> 'รุ่นทรัพย์สิน',
     'asset_model'			=> 'แบบ',
     'asset'					=> 'ทรัพย์สิน',
+    'asset_previous'        => 'Asset (Previously Assigned)',
     'asset_report'          => 'รายงานทรัพย์สิน',
     'asset_tag'				=> 'รหัสทรัพย์สิน',
     'asset_tags'            => 'รหัสทรัพย์สิน',
     'assets_available'		=> 'ทรัพย์สินพร้อมใช้งาน',
     'accept_assets'         => 'Accept Assets :name',
     'accept_assets_menu'    => 'ยอมรับสินทรัพย์',
+    'accept_item'           => 'Accept Item',
     'audit'				    => 'การตรวจสอบบัญชี',
+    'audits'				=> 'Audits',
     'audit_report'			=> 'บันทึกการตรวจสอบ',
     'assets'				=> 'ทรัพย์สิน',
     'assets_audited'        => 'สินทรัพย์ถูกตรวจสอแล้ว',
@@ -61,9 +64,12 @@ return [
     'changepassword'  		=> 'เปลี่ยนรหัสผ่าน',
     'checkin'  				=> 'เช็คอิน',
     'checkin_from'  		=> 'เช็คอินจาก',
+    'checkin_note'  		=> 'Checkin Note',
+    'checkout_note'  		=> 'Checkout Note',
     'checkout'  			=> 'เช็คเอาท์',
     'checkouts_count'       => 'เช็คเอาท์',
     'checkins_count'        => 'เช็คอิน',
+    'checkin_and_delete'  	=> 'Checkin and Delete',
     'user_requests_count'   => 'คำร้องขอ',
     'city'  				=> 'เมือง',
     'click_here'			=> 'คลิกที่นี่',
@@ -77,7 +83,7 @@ return [
     'consumables'			=> 'การใช้งาน',
     'country'  				=> 'ประเทศ',
     'could_not_restore'     => 'การกู้คืนผิดพลาด',
-    'not_deleted'           => 'The :item_type is not deleted so it cannot be restored',
+    'not_deleted'           => 'The :item_type was not deleted and therefore cannot be restored',
     'create'				=> 'สร้างใหม่',
     'created'               => 'สร้างรายการแล้ว',
     'created_asset'			=> 'ทรัพย์สินที่ถูกสร้าง',
@@ -86,11 +92,13 @@ return [
     'record_created' 		=> 'สร้างบันทึกแล้ว',
     'updated_at' 			=> 'อัปเดตเมื่อวันที่',
     'currency'  			=> '฿', // this is deprecated
+    'currency_text'  		=> 'Currency', //
     'current'  				=> 'ปัจจุบัน',
     'current_password'      => 'รหัสผ่านปัจจุบัน',
     'customize_report'      => 'รายงานทรัพย์สินแบบกำหนดเอง',
     'custom_report'         => 'รายงานทรัพย์สินแบบกำหนดเอง',
     'dashboard'				=> 'หน้าหลัก',
+    'data_source'           => 'Data Source',
     'days'      			=> 'วัน',
     'days_to_next_audit'    => 'วันที่จะตรวจสอบถัดไป',
     'date'					=> 'วันเดือนปี',
@@ -98,7 +106,7 @@ return [
     'debug_warning_text'    => 'แอ็พพลิเคชันนี้กำลังทำงานในโหมดการผลิตโดยเปิดใช้งานดีบัก ข้อมูลนี้สามารถเปิดเผยข้อมูลที่ละเอียดอ่อนหากแอปพลิเคชันของคุณสามารถเข้าถึงโลกภายนอกได้ ปิดใช้งานโหมดดีบั๊กโดยการตั้งค่า <code>APP_DEBUG</code> ในไฟล์ <code>.env</code> ของคุณเป็น <code>false</code>',
     'delete'  				=> 'ลบ',
     'delete_confirm'  		=> 'คุณแน่ใจหรือไม่ว่าต้องการลบ?',
-    'delete_confirm_no_undo' => 'Are you sure you wish to delete :item? This can not be undone.',
+    'delete_confirm_no_undo' => 'Are you sure, you wish to delete :item? This cannot be undone.',
     'deleted'  				=> 'ลบแล้ว',
     'delete_seats'  		=> 'ลบที่นั่งแล้ว',
     'deletion_failed'       => 'การลบล้มเหลว',
@@ -114,29 +122,13 @@ return [
     'editprofile'  			=> 'แก้ไขโปรไฟล์ของคุณ',
     'eol'					=> 'อายุการใช้งาน',
     'email_domain'			=> 'โดเมนอีเมล',
-    'email_format'			=> 'รูปแบบอีเมล',
     'employee_number'       => 'หมายเลขพนักงาน',
     'email_domain_help'		=> 'ใช้เพื่อสร้างที่อยู่อีเมลเมื่อนำเข้า',
     'error'				    => 'Error',
     'exclude_archived'      => 'Exclude Archived Assets',
     'exclude_deleted'       => 'Exclude Deleted Assets',
     'example'				=> 'ตัวอย่าง: ',
-    'filastname_format'			=> 'ชื่อย่อครั้งแรก (jsmith@example.com)',
-    'firstname_lastname_format'	=> 'ชื่อนามสกุล (jane.smith@example.com)',
-    'firstname_lastname_underscore_format' => 'ชื่อนามสกุล (jane.smith@example.com)',
-    'lastnamefirstinitial_format' =>  'นามสกุล ชื่อ Initial (smithj@example.com)',
-    'firstintial_dot_lastname_format' => 'อักษรต้นชื่อ.นามสกุล  (j.smith@example.com)',
-    'firstname_lastname_display'	=> 'First Name Last Name (Jane Smith)',
-    'lastname_firstname_display'	=> 'Last Name First Name (Smith Jane)',
-    'name_display_format'	=> 'Name Display Format',
-    'first'					=> 'เริ่ม',
-    'firstnamelastname'     => 'ชื่อ นามสกุล (janesmith@example.com)',
-    'lastname_firstinitial' => 'นามสกุล อักษรต้นชื่อ (smith_j@example.com)',
-    'firstinitial.lastname' => 'อักษรต้นชื่อ นามสกุล (j.smith@example.com)',
-    'firstnamelastinitial'  => 'ชื่อ อักษรต้นนามสกุล (janes@example.com)',
-    'lastnamefirstname'      => 'Last Name First Name (smith.jane@example.com)',
-    'first_name'			=> 'ชื่อจริง',
-    'first_name_format'		=> 'ชื่อ (jane@example.com)',
+
     'files'                 => 'ไฟล์',
     'file_name'				=> 'ไฟล์',
     'file_type'             => 'ชนิดไฟล์',
@@ -156,9 +148,9 @@ return [
     'image_delete'         	=> 'ลบรูปภาพประจำตัว',
     'include_deleted'       => 'Include Deleted Assets',
     'image_upload'         	=> 'อัพโหลดภาพ',
-    'filetypes_accepted_help'    => 'ชนิดไฟล๋ที่ยอมรับ :types ขนาดไฟล์ใหญ่สุดที่ให้อัพโหลดได้ :size |ชนิดไฟล๋ที่ยอมรับ :types ขนาดไฟล์ใหญ่สุดที่ให้อัพโหลดได้ :size',
-    'filetypes_size_help'   => 'ขนาดไฟล์ใหญ่สุดที่ให้อัพโหลดได้ :size',
-    'image_filetypes_help'  => 'Accepted filetypes are jpg, webp, png, gif, svg, and avif. Max upload size allowed is :size.',
+    'filetypes_accepted_help'    => 'Accepted filetype is :types. The maximum size allowed is :size.|Accepted filetypes are :types. The maximum upload size allowed is :size.',
+    'filetypes_size_help'   => 'The maximum upload size allowed is :size.',
+    'image_filetypes_help'  => 'Accepted Filetypes are jpg, webp, png, gif, svg, and avif. The maximum upload size allowed is :size.',
     'unaccepted_image_type'  => 'This image file was not readable. Accepted filetypes are jpg, webp, png, gif, and svg. The mimetype of this file is: :mimetype.',
     'import'         	    => 'นำเข้า',
     'import_this_file'      => 'Map fields and process this file',
@@ -178,12 +170,17 @@ return [
     'last'					=> 'สุดท้าย',
     'last_login'            => 'เข้าสู่ระบบครั้งล่าสุด',
     'last_name'             => 'นามสกุล',
+    'firstname_lastname_display'	=> 'First Name Last Name (Jane Smith)',
+    'lastname_firstname_display'	=> 'Last Name First Name (Smith Jane)',
+    'name_display_format'	=> 'Name Display Format',
+    'first'					=> 'เริ่ม',
+    'first_name'			=> 'ชื่อจริง',
     'license'				=> 'ลิขสิทธิ์',
     'license_report'        => 'รายงานลิขสิทธิ์',
     'licenses_available'	=> 'Licenses available',
     'licenses'				=> 'ลิขสิทธิ์',
     'list_all'				=> 'รายการทั้งหมด',
-    'loading'				=> 'กำลังโหลด กรุณารอสักครู่...',
+    'loading'				=> 'Loading... please wait...',
     'lock_passwords'        => 'ข้อมูลในรายการนี้จะไม่ถูกบันทึกเพราะเป็นระบบตัวอย่าง (demo installation)',
     'feature_disabled'      => 'คุณลักษณะนี้ถูกปิดใช้งานสำหรับการติดตั้งแบบสาธิต',
     'location'              => 'สถานที่',
@@ -193,7 +190,7 @@ return [
     'logout'				=> 'ออกจากระบบ',
     'lookup_by_tag'     => 'การค้นหาตามแท็กเนื้อหา',
     'maintenances'          => 'ซ่อมบำรุง',
-    'manage_api_keys'       => 'จัดการ API Keys',
+    'manage_api_keys'       => 'Manage API keys',
     'manufacturer'			=> 'ผู้ผลิต',
     'manufacturers'			=> 'ผู้ผลิต',
     'markdown'				=> 'ฟิลด์นี้ช่วยให้ <a href="https://help.github.com/articles/github-flavored-markdown/">Github markdown markdown</a>',
@@ -215,6 +212,14 @@ return [
     'no_results'			=> 'ไม่มีผลการค้นหา',
     'no'  					=> 'ไม่',
     'notes'  				=> 'หมายเหตุ',
+    'note_added'            => 'Note Added',
+    'options'				=> 'Options',
+    'preview'				=> 'Preview',
+    'add_note'              => 'Add Note',
+    'note_edited'            => 'Note Edited',
+    'edit_note'              => 'Edit Note',
+    'note_deleted'            => 'Note Deleted',
+    'delete_note'              => 'Delete Note',
     'order_number'          => 'เลขที่ใบสั่งซื้อ',
     'only_deleted'          => 'Only Deleted Assets',
     'page_menu'				=> 'กำลังแสดง_MENU_รายการ',
@@ -229,7 +234,7 @@ return [
     'purchase_date'         => 'วันที่ซื้อ',
     'qty'		            => 'จำนวน',
     'quantity'		        => 'ปริมาณ',
-    'quantity_minimum'      => 'คุณมี :count รายการ ต่ำกว่าจำนวนขั้นต่ำที่กำหนดไว้',
+    'quantity_minimum'      => 'You have one item below or almost below minimum quantity levels|You have :count items below or almost below minimum quantity levels',
     'quickscan_checkin'  	=> 'Quick Scan Checkin',
     'quickscan_checkin_status'  	=> 'สถาณะ ส่งมอบ',
     'ready_to_deploy'		=> 'พร้อมใช้งาน',
@@ -254,7 +259,7 @@ return [
     'select_all'            => 'เลือกทั้งหมด',
     'search'				=> 'ค้นหา',
     'select_category'       => 'เลือกหมวด',
-    'select_datasource' => 'Select a Datasource',
+    'select_datasource' => 'Select a data source',
     'select_department'     => 'เลือกแผนก',
     'select_depreciation'	=> 'เลือกประเภทค่าเสื่อมราคา',
     'select_location'		=> 'เลือกที่ตั้ง',
@@ -274,13 +279,15 @@ return [
     'signed_off_by'         => 'Signed Off By',
     'skin'       			=> 'รูปแบบ/เทมเพลต',
     'webhook_msg_note'        => 'A notification will be sent via webhook',
-    'webhook_test_msg'        => 'Oh hai! Looks like your :app integration with Snipe-IT is working!',
+    'webhook_test_msg'        => 'Oh hai! It looks like your :app integration with Snipe-IT is working!',
     'some_features_disabled' => 'DEMO MODE: คุณลักษณะบางอย่างถูกปิดใช้งานสำหรับการติดตั้งนี้',
     'site_name'				=> 'ชื่อไซต์',
     'state'  				=> 'รัฐ',
     'status_labels'			=> 'ป้ายสถานะ',
+    'status_label'			=> 'Status Label',
     'status'    			=> 'สถานะ',
     'accept_eula'           => 'Acceptance Agreement',
+    'show_or_hide_eulas' => 'Show/Hide EULAs',
     'supplier'              => 'ผู้ผลิต',
     'suppliers'  			=> 'ตัวแทนจำหน่าย',
     'sure_to_delete'        => 'คุณแน่ใจหรือไม่ว่าต้องการลบ',
@@ -296,9 +303,9 @@ return [
     'type'  				=> 'ประเภท',
     'undeployable'			=> 'ไม่สามารถใช้งานได้',
     'unknown_admin'			=> 'ผู้ดูแลระบบที่ไม่รู้จัก',
-    'username_format'		=> 'รูปแบบชื่อผู้ใช้',
     'username'              => 'ชื่อผู้ใช้งาน',
     'update'                => 'ปรับปรุง',
+    'updating_item' => 'Updating :item',
     'upload_filetypes_help'      => 'Allowed filetypes are png, gif, jpg, jpeg, doc, docx, pdf, xls, xlsx, txt, lic, xml, zip, rtf and rar. Max upload size allowed is :size.',
     'uploaded'              => 'อัพโหลด',
     'user'					=> 'ผู้ใช้',
@@ -323,10 +330,10 @@ return [
     'token_expired'         => 'เซสชันแบบฟอร์มของคุณหมดอายุแล้ว กรุณาลองอีกครั้ง.',
     'login_enabled'         => 'เปิด ล๊อกอิน',
     'audit_due'             => 'Due for Audit',
-    'audit_due_days'        => 'Assets Due for Audit Within :days Day|Assets Due for Audit Within :days Days',
+    'audit_due_days'        => '{}Assets Due or Overdue for Audit|[1]Assets Due or Overdue for Audit Within a Day|[2,*]Assets Due or Overdue for Audit Within :days Days',
     'checkin_due'           => 'Due for Checkin',
     'checkin_overdue'       => 'Overdue for Checkin',
-    'checkin_due_days'      => 'Assets Due for Checkin Within :days Day|Assets Due for Checkin Within :days Days',
+    'checkin_due_days'      => '{}Due for Checkin|[1]Assets Due for Checkin Within :days Day|[2,*]Assets Due for Checkin Within :days Days',
     'audit_overdue'         => 'Overdue for Audit',
     'accept'                => 'Accept :asset',
     'i_accept'              => 'ยอมรับ',
@@ -339,16 +346,16 @@ return [
     'view_all'              => 'ดูทั้งหมด',
     'hide_deleted'          => 'ซ่อนที่ถูกลบ',
     'email'                 => 'อีเมล',
-    'do_not_change'         => 'Do Not Change',
-    'bug_report'            => 'รายงานจุดบกพร่อง',
+    'do_not_change'         => 'Do not change',
+    'bug_report'            => 'Report a bug',
     'user_manual'           => 'คู่มือ',
     'setup_step_1'          => 'ขั้นตอนที่ 1',
     'setup_step_2'          => 'ขั้นตอนที่ 2',
     'setup_step_3'          => 'ขั้นตอนที่ 3',
     'setup_step_4'          => 'ขั้นตอนที่ 4',
     'setup_config_check'    => 'การตรวจสอบการตั้งค่า',
-    'setup_create_database' => 'สร้างตารางฐานข้อมูล',
-    'setup_create_admin'    => 'สร้างผู้ดูแลระบบ',
+    'setup_create_database' => 'Create database tables',
+    'setup_create_admin'    => 'Create an admin user',
     'setup_done'            => 'เสร็จสิ้น',
     'bulk_edit_about_to'    => 'You are about to edit the following: ',
     'checked_out'           => 'ส่งมอบ',
@@ -383,6 +390,8 @@ return [
     'new_license'           => 'สร้างข้อมูลลิขสิทธิ์',
     'new_accessory'         => 'สร้างข้อมูลอุปกรณ์',
     'new_consumable'        => 'สร้างข้อมูลวัสดุสิ้นเปลือง',
+    'new_component'         => 'New Component',
+    'new_user'              => 'New User',
     'collapse'              => 'ยุบ',
     'assigned'              => 'ได้มอบหมายให้',
     'asset_count'           => 'นับทรัพย์สิน',
@@ -418,19 +427,20 @@ return [
     'bulk_soft_delete'      =>'Also soft-delete these users. Their asset history will remain intact unless/until you purge deleted records in the Admin Settings.',
     'bulk_checkin_delete_success' => 'Your selected users have been deleted and their items have been checked in.',
     'bulk_checkin_success' => 'The items for the selected users have been checked in.',
-    'set_to_null'           => 'Delete values for this asset|Delete values for all :asset_count assets ',
+    'set_to_null'           => 'Delete values for this selection|Delete values for all :selection_count selections ',
     'set_users_field_to_null'  => 'Delete :field values for this user|Delete :field values for all :user_count users ',
     'na_no_purchase_date'   => 'N/A - No purchase date provided',
     'assets_by_status'      => 'Assets by Status',
     'assets_by_status_type'      => 'Assets by Status Type',
     'pie_chart_type'        => 'Dashboard Pie Chart Type',
     'hello_name'            => 'ยินดีต้อนรับ, :name!',
-    'unaccepted_profile_warning'   => 'You have :count items requiring acceptance. Click here to accept or decline them',
+    'unaccepted_profile_warning'   => 'You have one item requiring acceptance. Click here to accept or decline it | You have :count items requiring acceptance. Click here to accept or decline them',
     'start_date'            => 'วันที่เริ่มต้น',
     'end_date'            => 'วันที่สิ้นสุด',
     'alt_uploaded_image_thumbnail' => 'Uploaded thumbnail',
     'placeholder_kit'       => 'Select a kit',
     'file_not_found'        => 'ไม่พบไฟล์',
+    'log_record_not_found'  => 'No record for that log entry was found.',
     'preview_not_available' => '(ไม่แสดงภาพ)',
     'setup'                 => 'ติดตั้ง',
     'pre_flight'            => 'Pre-Flight',
@@ -512,7 +522,7 @@ return [
     'checked_out_to_fields' => 'Checked Out To Fields',
     'percent_complete' => '% complete',
     'uploading' => 'Uploading... ',
-    'upload_error' => 'Error uploading file. Please check that there are no empty rows and that no column names are duplicated.',
+    'upload_error' => 'Error uploading file. Please check that you have no empty rows or duplicated column names in your CSV, and that the server permissions allow uploads.',
     'copy_to_clipboard' => 'Copy to Clipboard',
     'copied' => 'Copied!',
     'status_compatibility' => 'If assets are already assigned, they cannot be changed to a non-deployable status type and this value change will be skipped.',
@@ -549,6 +559,71 @@ return [
         'license_seats'  => ':count License Seat|:count License Seats',
         'consumables'  => ':count Consumable|:count Consumables',
         'components'  => ':count Component|:count Components',
-    ]
+    ],
+
+    'more_info' => 'ข้อมูลเพิ่มเติม',
+    'quickscan_bulk_help' => 'Checking this box will edit the asset record to reflect this new location. Leaving it unchecked will simply note the location in the audit log. Note that if this asset is checked out, it will not change the location of the person, asset or location it is checked out to.',
+    'whoops' => 'Whoops!',
+    'something_went_wrong' => 'Something went wrong with your request.',
+    'close' => 'Close',
+    'expires' => 'วันที่หมดอายุ',
+    'map_fields'=> 'Map :item_type Fields',
+    'remaining_var' => ':count Remaining',
+    'label' => 'Label',
+    'import_asset_tag_exists' => 'An asset with the asset tag :asset_tag already exists and an update was not requested. No change was made.',
+    'countries_manually_entered_help' => 'Values with an asterisk (*) were manually entered and do not match existing ISO 3166 dropdown values',
+    'accessories_assigned' => 'Assigned Accessories',
+    'user_managed_passwords' => 'Password Management',
+    'user_managed_passwords_disallow' => 'Disallow users from managing their own passwords',
+    'user_managed_passwords_allow' => 'Allow users to manage their own passwords',
+    'from' => 'From',
+    'by' => 'โดย',
+
+// Add form placeholders here
+    'placeholders' => [
+        'notes'  => 'Add a note',
+    ],
+
+    'breadcrumb_button_actions' => [
+        'edit_item' => 'Edit :name',
+        'checkout_item' => 'Checkout :name',
+        'checkin_item' => 'Checkin :name',
+    ],
+
+    'skins' => [
+        'site_default' => 'Site Default',
+        'default_blue' => 'Default Blue',
+        'blue_dark' => 'Blue (Dark Mode)',
+        'green' => 'Green Dark',
+        'green_dark' => 'Green (Dark Mode)',
+        'red' => 'Red Dark',
+        'red_dark' => 'Red (Dark Mode)',
+        'orange' => 'Orange Dark',
+        'orange_dark' => 'Orange (Dark Mode)',
+        'black' => 'Black',
+        'black_dark' => 'Black (Dark Mode)',
+        'purple' => 'Purple',
+        'purple_dark' => 'Purple (Dark Mode)',
+        'yellow' => 'Yellow',
+        'yellow_dark' => 'Yellow (Dark Mode)',
+        'high_contrast' => 'High Contrast',
+
+    ],
+
+    'select_all_none' => 'Select/Unselect All',
+    'generic_model_not_found' => 'That :model was not found or you do not have permission to access it',
+    'deleted_models' => 'Deleted Asset Models',
+    'deleted_users' => 'Deleted Users',
+    'cost_each' => ':amount each',
+    'remove_current_image' => 'Remove current :type image',
+
+    'seeding' => [
+        'manufacturers' => [
+            'button' => 'Create Manufacturers',
+            'prompt' => 'You do not have any manufacturers yet. Would you like to seed a list of common manufacturers? (THIS WILL OVERWRITE EXISTING MANUFACTURERS, including those that have been soft-deleted.)',
+            'success' => 'Manufacturers seeded successfully',
+            'error' => 'Could not seed manufacturers. A manufacturer record already exists and seeding would overwrite it.|Could not seed manufacturers. :count manufacturer records already exist and seeding would overwrite them.',
+        ],
+    ],
 
 ];
diff --git a/resources/lang/th-TH/localizations.php b/resources/lang/th-TH/localizations.php
index 37cc2ebdf6..827ed4fca1 100644
--- a/resources/lang/th-TH/localizations.php
+++ b/resources/lang/th-TH/localizations.php
@@ -2,7 +2,7 @@
 
 return [
 
-    'select_language' => 'เลือกภาษา',
+    'select_language' => 'Select a Language',
     'languages' => [
         'en-US'=> 'English, US',
         'en-GB'=> 'English, UK',
@@ -40,7 +40,9 @@ return [
         'ms-MY'=> 'Malay',
         'mi-NZ'=> 'Maori',
         'mn-MN'=> 'Mongolian',
-        'no-NO'=> 'Norwegian',
+        'nb-NO'=> 'Norwegian Bokmål',
+        'om-ET' => 'Oromo (Ethiopian)',
+        //'nn-NO'=> 'Norwegian Nynorsk',
         'fa-IR'=> 'Persian',
         'pl-PL'=> 'Polish',
         'pt-PT'=> 'Portuguese',
@@ -66,7 +68,7 @@ return [
         'zu-ZA'=> 'Zulu',
     ],
 
-    'select_country' => 'Select a country',
+    'select_country' => 'Select a Country',
     
     'countries' => [
         'AC'=>'Ascension Island',
@@ -133,6 +135,7 @@ return [
         'EC'=>'Ecuador',
         'EE'=>'Estonia',
         'EG'=>'Egypt',
+        'GB-ENG'=>'England',
         'ER'=>'Eritrea',
         'ES'=>'Spain',
         'ET'=>'Ethiopia',
@@ -231,6 +234,7 @@ return [
         'NG'=>'Nigeria',
         'NI'=>'Nicaragua',
         'NL'=>'Netherlands',
+        'GB-NIR' => 'Northern Ireland',
         'NO'=>'Norway',
         'NP'=>'Nepal',
         'NR'=>'Nauru',
@@ -258,7 +262,7 @@ return [
         'RU'=>'Russian Federation',
         'RW'=>'Rwanda',
         'SA'=>'Saudi Arabia',
-        'UK'=>'Scotland',
+        'GB-SCT'=>'Scotland',
         'SB'=>'Solomon Islands',
         'SC'=>'Seychelles',
         'SS'=>'South Sudan',
@@ -310,6 +314,7 @@ return [
         'VI'=>'Virgin Islands (U.S.)',
         'VN'=>'Viet Nam',
         'VU'=>'Vanuatu',
+        'GB-WLS' =>'Wales',
         'WF'=>'Wallis And Futuna Islands',
         'WS'=>'Samoa',
         'YE'=>'Yemen',
diff --git a/resources/lang/th-TH/mail.php b/resources/lang/th-TH/mail.php
index 3af4071ec5..6fe3e6462d 100644
--- a/resources/lang/th-TH/mail.php
+++ b/resources/lang/th-TH/mail.php
@@ -23,24 +23,25 @@ return [
     'Item_Requested' => 'รายการที่ขอ',
     'License_Checkin_Notification' => 'เช็คอินใบอนุญาตแล้ว',
     'License_Checkout_Notification' => 'License checked out',
+    'license_for'   => 'License for',
     'Low_Inventory_Report' => 'รายงานพื้นที่โฆษณาต่ำ',
     'a_user_canceled' => 'ผู้ใช้ยกเลิกคำร้องขอสินค้าในเว็บไซต์แล้ว',
     'a_user_requested' => 'ผู้ใช้ร้องขอรายการบนเว็บไซต์',
     'acceptance_asset_accepted' => 'A user has accepted an item',
     'acceptance_asset_declined' => 'A user has declined an item',
-    'accessory_name' => 'ชื่ออุปกรณ์เสริม:',
-    'additional_notes' => 'หมายเหตุเพิ่มเติม:',
+    'accessory_name' => 'ชื่ออุปกรณ์เสริม',
+    'additional_notes' => 'หมายเหตุเพิ่มเติม',
     'admin_has_created' => 'ผู้ดูแลระบบได้สร้างบัญชีให้กับคุณบนเว็บไซต์: web',
-    'asset' => 'ทรัพย์สิน:',
-    'asset_name' => 'ชื่อสินทรัพย์:',
+    'asset' => 'สินทรัพย์',
+    'asset_name' => 'ชื่อสินทรัพย์',
     'asset_requested' => 'สินทรัพย์ที่ขอ',
     'asset_tag' => 'แท็กทรัพย์สิน',
     'assets_warrantee_alert' => 'There is :count asset with a warranty expiring in the next :threshold days.|There are :count assets with warranties expiring in the next :threshold days.',
     'assigned_to' => 'ได้รับมอบหมายให้',
     'best_regards' => 'ด้วยความเคารพ,',
-    'canceled' => 'ยกเลิก:',
-    'checkin_date' => 'วันที่เช็คอิน:',
-    'checkout_date' => 'วันที่ชำระเงิน:',
+    'canceled' => 'ยกเลิก',
+    'checkin_date' => 'วันที่เช็คอิน',
+    'checkout_date' => 'ชำระเงินวันที่',
     'checkedout_from' => 'Checked out from',
     'checkedin_from'  => 'Checked in from',
     'checked_into' => 'Checked into',
@@ -49,27 +50,30 @@ return [
     'click_to_confirm' => 'โปรดคลิกลิงก์ต่อไปนี้เพื่อยืนยันข้อมูล: บัญชีเว็บ:',
     'current_QTY' => 'QTY ปัจจุบัน',
     'days' => 'วัน',
-    'expecting_checkin_date' => 'คาดว่าวันที่เช็คอิน:',
+    'expecting_checkin_date' => 'วันที่เช็คอินที่คาดหวังไว้',
     'expires' => 'วันที่หมดอายุ',
     'hello' => 'สวัสดี',
     'hi' => 'สวัสดี',
     'i_have_read' => 'ฉันได้อ่านและยอมรับข้อกำหนดในการให้บริการแล้วและได้รับสินค้านี้แล้ว',
     'inventory_report' => 'Inventory Report',
-    'item' => 'รายการ:',
+    'item' => 'รายการ',
+    'item_checked_reminder' => 'This is a reminder that you currently have :count items checked out to you that you have not accepted or declined. Please click the link below to confirm your decision.',
     'license_expiring_alert' => 'มี: ใบอนุญาตที่จะหมดอายุในวันถัดไป: วันที่กำหนด|มี: ใบอนุญาตที่จะหมดอายุในวันถัดไป: วันที่กำหนด',
     'link_to_update_password' => 'โปรดคลิกลิงก์ต่อไปนี้เพื่ออัปเดต: รหัสผ่านเว็บ:',
-    'login' => 'เข้าสู่ระบบ:',
+    'login' => 'เข้าสู่ระบบ',
     'login_first_admin' => 'เข้าสู่ระบบการติดตั้ง Snipe-IT ใหม่ของคุณโดยใช้ข้อมูลรับรองด้านล่าง:',
     'low_inventory_alert' => 'มี: นับสินค้าที่ต่ำกว่าสินค้าคงคลังขั้นต่ำหรือเร็ว ๆ นี้จะต่ำ|มี: นับสินค้าที่ต่ำกว่าสินค้าคงคลังขั้นต่ำหรือจะเร็วเกินไป',
     'min_QTY' => 'Min QTY',
     'name' => 'ชื่อ',
     'new_item_checked' => 'รายการใหม่ได้รับการตรวจสอบภายใต้ชื่อของคุณแล้วรายละเอียดมีดังนี้',
+    'new_item_checked_with_acceptance' => 'A new item has been checked out under your name that requires acceptance, details are below.',
+    'recent_item_checked' => 'An item was recently checked out under your name that requires acceptance, details are below.',
     'notes' => 'จดบันทึก',
-    'password' => 'รหัสผ่าน:',
+    'password' => 'รหัสผ่าน',
     'password_reset' => 'รีเซ็ตรหัสผ่าน',
     'read_the_terms' => 'โปรดอ่านเงื่อนไขการใช้งานด้านล่างนี้',
     'read_the_terms_and_click' => 'Please read the terms of use below, and click on the link at the bottom to confirm that you read and agree to the terms of use, and have received the asset.',
-    'requested' => 'ขอ:',
+    'requested' => 'คำร้องขอ',
     'reset_link' => 'ลิงก์รีเซ็ตรหัสผ่านของคุณ',
     'reset_password' => 'คลิกที่นี่เพื่อรีเซ็ตรหัสผ่าน:',
     'rights_reserved' => 'All rights reserved.',
@@ -86,8 +90,10 @@ return [
     'upcoming-audits' => 'There is :count asset that is coming up for audit within :threshold days.|There are :count assets that are coming up for audit within :threshold days.',
     'user' => 'ผู้ใช้งาน',
     'username' => 'ชื่อผู้ใช้',
+    'unaccepted_asset_reminder' => 'Reminder: You have Unaccepted Assets.',
     'welcome' => 'ยินดีต้อนรับ: ชื่อ',
     'welcome_to' => 'ยินดีต้อนรับสู่: web!',
     'your_assets' => 'ดูสินทรัพย์ที่มี',
     'your_credentials' => 'ข้อมูลรับรอง Snipe-IT ของคุณ',
+    'mail_sent' => 'Mail sent successfully!',
 ];
diff --git a/resources/lang/th-TH/validation.php b/resources/lang/th-TH/validation.php
index 9b7e7c2cf4..e6d07f6f06 100644
--- a/resources/lang/th-TH/validation.php
+++ b/resources/lang/th-TH/validation.php
@@ -13,87 +13,150 @@ return [
     |
     */
 
-    'accepted'             => ':attribute ต้องได้รับการยอมรับ',
-    'active_url'           => ':attribute ไม่ใช่ URL ที่ถูกต้อง',
-    'after'                => ':attribute ต้องเป็นวันที่หลังจาก :date',
-    'after_or_equal'       => 'แอตทริบิวต์: ต้องเป็นวันที่หลังจากหรือเท่ากับ: date',
-    'alpha'                => ':attribute ต้องมีเฉพาะตัวอักษรเท่านั้น',
-    'alpha_dash'           => ':attribute ต้องมีเฉพาะตัวอักษร ตัวเลข หรือเครื่องหมายลบเท่านั้น',
-    'alpha_num'            => ':attribute ต้องมีเฉพาะตัวอักษรและตัวเลขเท่านั้น',
-    'array'                => 'แอตทริบิวต์: ต้องเป็นอาร์เรย์',
-    'before'               => ':attribute ต้องเป็นวันที่ก่อน :date',
-    'before_or_equal'      => 'แอตทริบิวต์: ต้องเป็นวันที่ก่อนหรือเท่ากับ: date',
-    'between'              => [
-        'numeric' => ':attribute ต้องอยู่ระหว่าง :min - :max',
-        'file'    => ':attribute ต้องมีขนาดระหว่าง :min - :max กิโลไบต์',
-        'string'  => ':attribute ต้องมีจำนวนระหว่าง :min - :max ตัวอักษร',
-        'array'   => 'แอตทริบิวต์: ต้องมีระหว่าง: min และ: max items',
+    'accepted' => 'The :attribute field must be accepted.',
+    'accepted_if' => 'The :attribute field must be accepted when :other is :value.',
+    'active_url' => 'The :attribute field must be a valid URL.',
+    'after' => 'The :attribute field must be a date after :date.',
+    'after_or_equal' => 'The :attribute field must be a date after or equal to :date.',
+    'alpha' => 'The :attribute field must only contain letters.',
+    'alpha_dash' => 'The :attribute field must only contain letters, numbers, dashes, and underscores.',
+    'alpha_num' => 'The :attribute field must only contain letters and numbers.',
+    'array' => 'The :attribute field must be an array.',
+    'ascii' => 'The :attribute field must only contain single-byte alphanumeric characters and symbols.',
+    'before' => 'The :attribute field must be a date before :date.',
+    'before_or_equal' => 'The :attribute field must be a date before or equal to :date.',
+    'between' => [
+        'array' => 'The :attribute field must have between :min and :max items.',
+        'file' => 'The :attribute field must be between :min and :max kilobytes.',
+        'numeric' => 'The :attribute field must be between :min and :max.',
+        'string' => 'The :attribute field must be between :min and :max characters.',
     ],
-    'boolean'              => 'ฟิลด์แอ็ตทริบิวต์: ต้องเป็น true หรือ false',
-    'confirmed'            => ':attribute ไม่ตรงกัน',
-    'date'                 => ':attribute เป็นรูปแบบวันที่ที่ไม่ถูกต้อง',
-    'date_format'          => ':attribute ไม่ตรงตามรูปแบบ :format',
-    'different'            => ':attribute และ :other ต้องไม่เหมือนกัน',
-    'digits'               => ':attribute ต้องเป็น :digits ตัวเลข',
-    'digits_between'       => ':attribute ต้องเป็นตัวเลขระหว่าง :min และ :max',
-    'dimensions'           => 'แอตทริบิวต์: มีมิติข้อมูลภาพที่ไม่ถูกต้อง',
-    'distinct'             => 'ฟิลด์แอ็ตทริบิวต์: มีค่าซ้ำกัน',
-    'email'                => 'รูปแบบของ :attribute ไม่ถูกต้อง',
-    'exists'               => ':attribute ที่เลือกไม่ถูกต้อง',
-    'file'                 => 'แอตทริบิวต์: ต้องเป็นไฟล์',
-    'filled'               => 'ฟิลด์แอ็ตทริบิวต์ต้องมีค่า',
-    'image'                => ':attribute ต้องเป็นรูปภาพเท่านั้น',
+    'boolean' => 'ฟิลด์แอ็ตทริบิวต์: ต้องเป็น true หรือ false',
+    'can' => 'The :attribute field contains an unauthorized value.',
+    'confirmed' => 'The :attribute field confirmation does not match.',
+    'contains' => 'The :attribute field is missing a required value.',
+    'current_password' => 'The password is incorrect.',
+    'date' => 'The :attribute field must be a valid date.',
+    'date_equals' => 'The :attribute field must be a date equal to :date.',
+    'date_format' => 'The :attribute field must match the format :format.',
+    'decimal' => 'The :attribute field must have :decimal decimal places.',
+    'declined' => 'The :attribute field must be declined.',
+    'declined_if' => 'The :attribute field must be declined when :other is :value.',
+    'different' => 'The :attribute field and :other must be different.',
+    'digits' => 'The :attribute field must be :digits digits.',
+    'digits_between' => 'The :attribute field must be between :min and :max digits.',
+    'dimensions' => 'The :attribute field has invalid image dimensions.',
+    'distinct' => 'ฟิลด์แอ็ตทริบิวต์: มีค่าซ้ำกัน',
+    'doesnt_end_with' => 'The :attribute field must not end with one of the following: :values.',
+    'doesnt_start_with' => 'The :attribute field must not start with one of the following: :values.',
+    'email' => 'The :attribute field must be a valid email address.',
+    'ends_with' => 'The :attribute field must end with one of the following: :values.',
+    'enum' => ':attribute ที่เลือกไม่ถูกต้อง',
+    'exists' => ':attribute ที่เลือกไม่ถูกต้อง',
+    'extensions' => 'The :attribute field must have one of the following extensions: :values.',
+    'file' => 'The :attribute field must be a file.',
+    'filled' => 'ฟิลด์แอ็ตทริบิวต์ต้องมีค่า',
+    'gt' => [
+        'array' => 'The :attribute field must have more than :value items.',
+        'file' => 'The :attribute field must be greater than :value kilobytes.',
+        'numeric' => 'The :attribute field must be greater than :value.',
+        'string' => 'The :attribute field must be greater than :value characters.',
+    ],
+    'gte' => [
+        'array' => 'The :attribute field must have :value items or more.',
+        'file' => 'The :attribute field must be greater than or equal to :value kilobytes.',
+        'numeric' => 'The :attribute field must be greater than or equal to :value.',
+        'string' => 'The :attribute field must be greater than or equal to :value characters.',
+    ],
+    'hex_color' => 'The :attribute field must be a valid hexadecimal color.',
+    'image' => 'The :attribute field must be an image.',
     'import_field_empty'    => 'The value for :fieldname cannot be null.',
-    'in'                   => ':attribute ที่เลือกไม่ถูกต้อง',
-    'in_array'             => 'ฟิลด์แอ็ตทริบิวต์: ไม่มีใน: other',
-    'integer'              => ':attribute ต้องเป็นจำนวนเต็มเท่านั้น',
-    'ip'                   => ':attribute ต้องเป็นรูปแบบไอพีแอดเดรสเท่านั้น',
-    'ipv4'                 => 'แอตทริบิวต์: ต้องเป็นที่อยู่ IPv4 ที่ถูกต้อง',
-    'ipv6'                 => 'แอตทริบิวต์: ต้องเป็นที่อยู่ IPv6 ที่ถูกต้อง',
-    'is_unique_department' => 'The :attribute must be unique to this Company Location',
-    'json'                 => 'แอตทริบิวต์: ต้องเป็นสตริง JSON ที่ถูกต้อง',
-    'max'                  => [
-        'numeric' => ':attribute ต้องไม่มากกว่า :max',
-        'file'    => ':attribute ต้องไม่มีขนาดมากกว่า :max กิโลไบต์',
-        'string'  => ':attribute ต้องไม่มีจำนวนตัวอักษรมากกว่า :max ตัวอักษร',
-        'array'   => 'แอตทริบิวต์: ไม่สามารถมีได้มากกว่า: รายการสูงสุด',
+    'in' => ':attribute ที่เลือกไม่ถูกต้อง',
+    'in_array' => 'The :attribute field must exist in :other.',
+    'integer' => 'The :attribute field must be an integer.',
+    'ip' => 'The :attribute field must be a valid IP address.',
+    'ipv4' => 'The :attribute field must be a valid IPv4 address.',
+    'ipv6' => 'The :attribute field must be a valid IPv6 address.',
+    'json' => 'The :attribute field must be a valid JSON string.',
+    'list' => 'The :attribute field must be a list.',
+    'lowercase' => 'The :attribute field must be lowercase.',
+    'lt' => [
+        'array' => 'The :attribute field must have less than :value items.',
+        'file' => 'The :attribute field must be less than :value kilobytes.',
+        'numeric' => 'The :attribute field must be less than :value.',
+        'string' => 'The :attribute field must be less than :value characters.',
     ],
-    'mimes'                => ':attribute ต้องเป็นรูปแบบไฟล์ดังนี้: :values',
-    'mimetypes'            => 'แอตทริบิวต์: ต้องเป็นไฟล์ประเภท:: values',
-    'min'                  => [
-        'numeric' => ':attribute ต้องมีอย่างน้อย :min',
-        'file'    => ':attribute ต้องมีขนาดอย่างน้อย :min กิโลไบต์',
-        'string'  => ':attribute ต้องมีจำนวนอย่างน้อย :min ตัวอักษร',
-        'array'   => 'แอตทริบิวต์: ต้องมีอย่างน้อย: รายการต่ำสุด',
+    'lte' => [
+        'array' => 'The :attribute field must not have more than :value items.',
+        'file' => 'The :attribute field must be less than or equal to :value kilobytes.',
+        'numeric' => 'The :attribute field must be less than or equal to :value.',
+        'string' => 'The :attribute field must be less than or equal to :value characters.',
     ],
-    'starts_with'          => 'The :attribute must start with one of the following: :values.',
-    'ends_with'            => 'The :attribute must end with one of the following: :values.',
+    'mac_address' => 'The :attribute field must be a valid MAC address.',
+    'max' => [
+        'array' => 'The :attribute field must not have more than :max items.',
+        'file' => 'The :attribute field must not be greater than :max kilobytes.',
+        'numeric' => 'The :attribute field must not be greater than :max.',
+        'string' => 'The :attribute field must not be greater than :max characters.',
+    ],
+    'max_digits' => 'The :attribute field must not have more than :max digits.',
+    'mimes' => 'The :attribute field must be a file of type: :values.',
+    'mimetypes' => 'The :attribute field must be a file of type: :values.',
+    'min' => [
+        'array' => 'The :attribute field must have at least :min items.',
+        'file' => 'The :attribute field must be at least :min kilobytes.',
+        'numeric' => 'The :attribute field must be at least :min.',
+        'string' => 'The :attribute field must be at least :min characters.',
+    ],
+    'min_digits' => 'The :attribute field must have at least :min digits.',
+    'missing' => 'The :attribute field must be missing.',
+    'missing_if' => 'The :attribute field must be missing when :other is :value.',
+    'missing_unless' => 'The :attribute field must be missing unless :other is :value.',
+    'missing_with' => 'The :attribute field must be missing when :values is present.',
+    'missing_with_all' => 'The :attribute field must be missing when :values are present.',
+    'multiple_of' => 'The :attribute field must be a multiple of :value.',
+    'not_in' => ':attribute ที่เลือกไม่ถูกต้อง',
+    'not_regex' => 'The :attribute field format is invalid.',
+    'numeric' => 'The :attribute field must be a number.',
+    'password' => [
+        'letters' => 'The :attribute field must contain at least one letter.',
+        'mixed' => 'The :attribute field must contain at least one uppercase and one lowercase letter.',
+        'numbers' => 'The :attribute field must contain at least one number.',
+        'symbols' => 'The :attribute field must contain at least one symbol.',
+        'uncompromised' => 'The given :attribute has appeared in a data leak. Please choose a different :attribute.',
+    ],
+    'percent'       => 'The depreciation minimum must be between 0 and 100 when depreciation type is percentage.',
 
-    'not_in'               => ':attribute ที่เลือกไม่ถูกต้อง',
-    'numeric'              => ':attribute ต้องเป็นตัวเลขเท่านั้น',
-    'present'              => 'ฟิลด์แอ็ตทริบิวต์: ต้องมีอยู่',
-    'valid_regex'          => 'นั่นไม่ใช่ regex ที่ถูกต้อง ',
-    'regex'                => 'รูปแบบของ :attribute ไม่ถูกต้อง',
-    'required'             => 'กรุณากรอกข้อมูลในฟิลด์ :attribute',
-    'required_if'          => 'ฟิลด์ :attribute จำเป็นต้องมีข้อมูล เมื่อ :other เป็น :value',
-    'required_unless'      => 'ฟิลด์แอ็ตทริบิวต์: ต้องใช้เว้นแต่กรณี: อื่น ๆ อยู่ใน: values',
-    'required_with'        => 'ฟิลด์ :attribute จำเป็นต้องมีข้อมูล เมื่อ :value มีข้อมูลอยู่ด้วย',
-    'required_with_all'    => 'ฟิลด์แอ็ตทริบิวต์: ต้องระบุเมื่อ: มีค่าอยู่',
-    'required_without'     => 'ฟิลด์ :attribute จำเป็นต้องมีข้อมูล เมื่อ :value ไม่มีข้อมูล',
+    'present' => 'ฟิลด์แอ็ตทริบิวต์: ต้องมีอยู่',
+    'present_if' => 'The :attribute field must be present when :other is :value.',
+    'present_unless' => 'The :attribute field must be present unless :other is :value.',
+    'present_with' => 'The :attribute field must be present when :values is present.',
+    'present_with_all' => 'The :attribute field must be present when :values are present.',
+    'prohibited' => 'The :attribute field is prohibited.',
+    'prohibited_if' => 'The :attribute field is prohibited when :other is :value.',
+    'prohibited_unless' => 'The :attribute field is prohibited unless :other is in :values.',
+    'prohibits' => 'The :attribute field prohibits :other from being present.',
+    'regex' => 'The :attribute field format is invalid.',
+    'required' => 'กรุณากรอกข้อมูลในฟิลด์ :attribute',
+    'required_array_keys' => 'The :attribute field must contain entries for: :values.',
+    'required_if' => 'ฟิลด์ :attribute จำเป็นต้องมีข้อมูล เมื่อ :other เป็น :value',
+    'required_if_accepted' => 'The :attribute field is required when :other is accepted.',
+    'required_if_declined' => 'The :attribute field is required when :other is declined.',
+    'required_unless' => 'ฟิลด์แอ็ตทริบิวต์: ต้องใช้เว้นแต่กรณี: อื่น ๆ อยู่ใน: values',
+    'required_with' => 'ฟิลด์ :attribute จำเป็นต้องมีข้อมูล เมื่อ :value มีข้อมูลอยู่ด้วย',
+    'required_with_all' => 'The :attribute field is required when :values are present.',
+    'required_without' => 'ฟิลด์ :attribute จำเป็นต้องมีข้อมูล เมื่อ :value ไม่มีข้อมูล',
     'required_without_all' => 'ฟิลด์แอ็ตทริบิวต์: ต้องระบุเมื่อไม่มี: มีค่าอยู่',
-    'same'                 => ':attribute และ :other ต้องตรงกัน',
-    'size'                 => [
-        'numeric' => ':attribute ต้องมีขนาด :size',
-        'file'    => ':attribute ต้องมีขนาด :size กิโลไบต์',
-        'string'  => ':attribute ต้องมีจำนวน :size ตัวอักษร',
-        'array'   => 'แอตทริบิวต์ต้องมี: รายการขนาด',
+    'same' => 'The :attribute field must match :other.',
+    'size' => [
+        'array' => 'The :attribute field must contain :size items.',
+        'file' => 'The :attribute field must be :size kilobytes.',
+        'numeric' => 'The :attribute field must be :size.',
+        'string' => 'The :attribute field must be :size characters.',
     ],
+    'starts_with' => 'The :attribute field must start with one of the following: :values.',
     'string'               => 'แอตทริบิวต์: ต้องเป็นสตริง',
-    'timezone'             => 'แอตทริบิวต์: ต้องเป็นโซนที่ถูกต้อง',
     'two_column_unique_undeleted' => 'The :attribute must be unique across :table1 and :table2. ',
-    'unique'               => ':attribute กำลังใช้งานอยู่',
-    'uploaded'             => 'แอตทริบิวต์: ล้มเหลวในการอัปโหลด',
-    'url'                  => 'รูปแบบของ :attribute ไม่ถูกต้อง',
     'unique_undeleted'     => 'แอตทริบิวต์ต้องไม่ซ้ำกัน',
     'non_circular'         => 'The :attribute must not create a circular reference.',
     'not_array'            => ':attribute cannot be an array.',
@@ -102,11 +165,14 @@ return [
     'numbers'              => 'Password must contain at least one number.',
     'case_diff'            => 'Password must use mixed case.',
     'symbols'              => 'Password must contain symbols.',
-    'gte'                  => [
-        'numeric'          => 'Value cannot be negative'
-    ],
-    'checkboxes'           => ':attribute contains invalid options.',
-    'radio_buttons'        => ':attribute is invalid.',
+    'timezone' => 'The :attribute field must be a valid timezone.',
+    'unique' => ':attribute กำลังใช้งานอยู่',
+    'uploaded' => 'แอตทริบิวต์: ล้มเหลวในการอัปโหลด',
+    'uppercase' => 'The :attribute field must be uppercase.',
+    'url' => 'The :attribute field must be a valid URL.',
+    'ulid' => 'The :attribute field must be a valid ULID.',
+    'uuid' => 'The :attribute field must be a valid UUID.',
+    'fmcs_location' => 'Full multiple company support and location scoping is enabled in the Admin Settings, and the selected location and selected company are not compatible.',
 
 
     /*
@@ -120,16 +186,22 @@ return [
     |
     */
 
+    'email_array'      => 'ที่อยู่อีเมลไม่ถูกต้อง',
+    'checkboxes'           => ':attribute contains invalid options.',
+    'radio_buttons'        => ':attribute is invalid.',
+    
     'custom' => [
         'alpha_space' => 'ฟิลด์แอ็ตทริบิวต์: มีอักขระที่ไม่ได้รับอนุญาต',
-        'email_array'      => 'ที่อยู่อีเมลไม่ถูกต้อง',
+
         'hashed_pass'      => 'รหัสผ่านปัจจุบันของคุณไม่ถูกต้อง',
         'dumbpwd'          => 'รหัสผ่านที่ใช้กันอยู่ทั่วไป',
         'statuslabel_type' => 'คุณต้องเลือกประเภทป้ายสถานะที่ถูกต้อง',
+        'custom_field_not_found'          => 'This field does not seem to exist, please double check your custom field names.',
+        'custom_field_not_found_on_model' => 'This field seems to exist, but is not available on this Asset Model\'s fieldset.',
 
         // date_format validation with slightly less stupid messages. It duplicates a lot, but it gets the job done :(
-        // We use this because the default error message for date_format is reflects php Y-m-d, which non-PHP
-        // people won't know how to format. 
+        // We use this because the default error message for date_format reflects php Y-m-d, which non-PHP
+        // people won't know how to format.
         'purchase_date.date_format'     => 'The :attribute must be a valid date in YYYY-MM-DD format',
         'last_audit_date.date_format'   =>  'The :attribute must be a valid date in YYYY-MM-DD hh:mm:ss format',
         'expiration_date.date_format'   =>  'The :attribute must be a valid date in YYYY-MM-DD format',
@@ -137,9 +209,15 @@ return [
         'expected_checkin.date_format'  =>  'The :attribute must be a valid date in YYYY-MM-DD format',
         'start_date.date_format'        =>  'The :attribute must be a valid date in YYYY-MM-DD format',
         'end_date.date_format'          =>  'The :attribute must be a valid date in YYYY-MM-DD format',
+        'invalid_value_in_field' => 'Invalid value included in this field',
 
-    ],
+        'ldap_username_field' => [
+            'not_in' =>         '<code>sAMAccountName</code> (mixed case) will likely not work. You should use <code>samaccountname</code> (lowercase) instead.'
+        ],
+        'ldap_auth_filter_query' => ['not_in' => '<code>uid=samaccountname</code> is probably not a valid auth filter. You probably want <code>uid=</code> '],
+        'ldap_filter' => ['regex' => 'This value should probably not be wrapped in parentheses.'],
 
+        ],
     /*
     |--------------------------------------------------------------------------
     | Custom Validation Attributes
@@ -155,8 +233,16 @@ return [
 
     /*
     |--------------------------------------------------------------------------
-    | Generic Validation Messages
+    | Generic Validation Messages - we use these in the jquery validation where we don't have
+    | access to the :attribute
     |--------------------------------------------------------------------------
     */
-    'invalid_value_in_field' => 'Invalid value included in this field',
+
+    'generic' => [
+        'invalid_value_in_field' => 'Invalid value included in this field',
+        'required' => 'This field is required',
+        'email' => 'Please enter a valid email address',
+    ],
+
+
 ];
diff --git a/resources/lang/tl-PH/account/general.php b/resources/lang/tl-PH/account/general.php
index 1a9e2c03b8..7f9e2f848e 100644
--- a/resources/lang/tl-PH/account/general.php
+++ b/resources/lang/tl-PH/account/general.php
@@ -2,10 +2,16 @@
 
 return array(
     'personal_api_keys' => 'Personal API Keys',
+    'personal_access_token' => 'Personal Access Token',
+    'personal_api_keys_success' => 'Personal API Key :key created sucessfully',
+    'here_is_api_key' => 'Here is your new personal access token. This is the only time it will be shown so do not lose it! You may now use this token to make API requests.',
     'api_key_warning' => 'When generating an API token, be sure to copy it down immediately as they will not be visible to you again.',
     'api_base_url' => 'Your API base url is located at:',
     'api_base_url_endpoint' => '/&lt;endpoint&gt;',
     'api_token_expiration_time' => 'API tokens are set to expire in:',
     'api_reference' => 'Please check the <a href="https://snipe-it.readme.io/reference" target="_blank">API reference</a> to find specific API endpoints and additional API documentation.',
     'profile_updated' => 'Account successfully updated',
+    'no_tokens' => 'You have not created any personal access tokens.',
+    'enable_sounds' => 'Enable sound effects',
+    'enable_confetti' => 'Enable confetti effects',
 );
diff --git a/resources/lang/tl-PH/admin/accessories/message.php b/resources/lang/tl-PH/admin/accessories/message.php
index c688d5e03d..f60d41957b 100644
--- a/resources/lang/tl-PH/admin/accessories/message.php
+++ b/resources/lang/tl-PH/admin/accessories/message.php
@@ -26,7 +26,11 @@ return array(
         'error'   		=> 'Accessory was not checked out, please try again',
         'success' 		=> 'Accessory checked out successfully.',
         'unavailable'   => 'Accessory is not available for checkout. Check quantity available',
-        'user_does_not_exist' => 'That user is invalid. Please try again.'
+        'user_does_not_exist' => 'That user is invalid. Please try again.',
+         'checkout_qty' => array(
+            'lte'  => 'There is currently only one available accessory of this type, and you are trying to check out :checkout_qty. Please adjust the checkout quantity or the total stock of this accessory and try again.|There are :number_currently_remaining total available accessories, and you are trying to check out :checkout_qty. Please adjust the checkout quantity or the total stock of this accessory and try again.',
+            ),
+           
     ),
 
     'checkin' => array(
diff --git a/resources/lang/tl-PH/admin/accessories/table.php b/resources/lang/tl-PH/admin/accessories/table.php
index 311db913fb..049a9f3c66 100644
--- a/resources/lang/tl-PH/admin/accessories/table.php
+++ b/resources/lang/tl-PH/admin/accessories/table.php
@@ -6,6 +6,4 @@ return array(
     'id'      					=> 'Ang ID',
     'require_acceptance'      	=> 'Pagtanggap',
     'title'      				=> 'Ang Pangalan ng Accessory',
-
-
 );
diff --git a/resources/lang/tl-PH/admin/components/message.php b/resources/lang/tl-PH/admin/components/message.php
index 0a7dd8d954..ec39dc4178 100644
--- a/resources/lang/tl-PH/admin/components/message.php
+++ b/resources/lang/tl-PH/admin/components/message.php
@@ -17,7 +17,8 @@ return array(
     'delete' => array(
         'confirm'   => 'Are you sure you wish to delete this component?',
         'error'   => 'There was an issue deleting the component. Please try again.',
-        'success' => 'The component was deleted successfully.'
+        'success' => 'The component was deleted successfully.',
+        'error_qty'   => 'Some components of this type are still checked out. Please check them in and try again.',
     ),
 
      'checkout' => array(
diff --git a/resources/lang/tl-PH/admin/consumables/general.php b/resources/lang/tl-PH/admin/consumables/general.php
index 7c6bb32968..29acfedc1b 100644
--- a/resources/lang/tl-PH/admin/consumables/general.php
+++ b/resources/lang/tl-PH/admin/consumables/general.php
@@ -8,4 +8,5 @@ return array(
     'remaining' 			            => 'Remaining',
     'total' 			                => 'Total',
     'update'                            => 'Update Consumable',
+    'inventory_warning'                 => 'The inventory of this consumable is below the minimum amount of :min_count',
 );
diff --git a/resources/lang/tl-PH/admin/consumables/message.php b/resources/lang/tl-PH/admin/consumables/message.php
index c0d0aa7f68..e2591503bf 100644
--- a/resources/lang/tl-PH/admin/consumables/message.php
+++ b/resources/lang/tl-PH/admin/consumables/message.php
@@ -2,6 +2,7 @@
 
 return array(
 
+    'invalid_category_type' => 'The category must be a consumable category.',
     'does_not_exist' => 'Consumable does not exist.',
 
     'create' => array(
diff --git a/resources/lang/tl-PH/admin/custom_fields/general.php b/resources/lang/tl-PH/admin/custom_fields/general.php
index e3c21d1f0c..c9ae61c963 100644
--- a/resources/lang/tl-PH/admin/custom_fields/general.php
+++ b/resources/lang/tl-PH/admin/custom_fields/general.php
@@ -35,7 +35,7 @@ return [
     'create_field_title' => 'Create a new custom field',
     'value_encrypted'      	        => 'The value of this field is encrypted in the database. Only admin users will be able to view the decrypted value',
     'show_in_email'     => 'Include the value of this field in checkout emails sent to the user? Encrypted fields cannot be included in emails',
-    'show_in_email_short'     => 'Include in emails.',
+    'show_in_email_short' => 'Include in emails',
     'help_text' => 'Help Text',
     'help_text_description' => 'This is optional text that will appear below the form elements while editing an asset to provide context on the field.',
     'about_custom_fields_title' => 'About Custom Fields',
@@ -57,5 +57,8 @@ return [
     'show_in_requestable_list_short' => 'Show in requestable assets list',
     'show_in_requestable_list' => 'Show value in requestable assets list. Encrypted fields will not be shown',
     'encrypted_options' => 'This field is encrypted, so some display options will not be available.',
+    'display_checkin' => 'Display in checkin forms',
+    'display_checkout' => 'Display in checkout forms',
+    'display_audit' => 'Display in audit forms',
 
 ];
diff --git a/resources/lang/tl-PH/admin/custom_fields/message.php b/resources/lang/tl-PH/admin/custom_fields/message.php
index 43ba821821..6442359b7f 100644
--- a/resources/lang/tl-PH/admin/custom_fields/message.php
+++ b/resources/lang/tl-PH/admin/custom_fields/message.php
@@ -5,6 +5,7 @@ return array(
     'field' => array(
         'invalid'   => 'That field does not exist.',
         'already_added'   => 'Field already added',
+        'none_selected'   => 'No field selected',
 
         'create' => array(
             'error'   => 'Field was not created, please try again.',
diff --git a/resources/lang/tl-PH/admin/depreciations/general.php b/resources/lang/tl-PH/admin/depreciations/general.php
index 1a5666f9dc..90246e9cd8 100644
--- a/resources/lang/tl-PH/admin/depreciations/general.php
+++ b/resources/lang/tl-PH/admin/depreciations/general.php
@@ -13,4 +13,8 @@ return [
     'no_depreciations_warning'               => '<strong>Warning: </strong>
                       You do not currently have any depreciations set up.
                       Please set up at least one depreciation to view the depreciation report.',
+    'depreciation_method'                   => 'Depreciation Report',
+    'linear_depreciation'                   => 'Linear (Default)',
+    'half_1'                                => 'Half-year convention, always applied',
+    'half_2'                                => 'Half-year convention, applied with condition',
 ];
diff --git a/resources/lang/tl-PH/admin/hardware/form.php b/resources/lang/tl-PH/admin/hardware/form.php
index b7ba172375..d4fd2fe945 100644
--- a/resources/lang/tl-PH/admin/hardware/form.php
+++ b/resources/lang/tl-PH/admin/hardware/form.php
@@ -55,8 +55,11 @@ return [
     'asset_location_update_default' => 'Update only default location',
     'asset_location_update_actual' => 'Update only actual location',
     'asset_not_deployable' => 'That asset status is not deployable. This asset cannot be checked out.',
-    'asset_deployable' => 'That status is deployable. This asset can be checked out.',
+    'asset_not_deployable_checkin' => 'That asset status is not deployable. Using this status label will checkin the asset.',
+    'asset_deployable' => 'This asset can be checked out.',
     'processing_spinner' => 'Processing... (This might take a bit of time on large files)',
+    'processing' => 'Processing... ',
     'optional_infos'  => 'Optional Information',
-    'order_details'   => 'Order Related Information'
+    'order_details'   => 'Order Related Information',
+    'calc_eol'    => 'If nulling the EOL date, use automatic EOL calculation based on the purchase date and EOL rate.',
 ];
diff --git a/resources/lang/tl-PH/admin/hardware/general.php b/resources/lang/tl-PH/admin/hardware/general.php
index 34ac4e63ee..6740476574 100644
--- a/resources/lang/tl-PH/admin/hardware/general.php
+++ b/resources/lang/tl-PH/admin/hardware/general.php
@@ -5,8 +5,8 @@ return [
     'about_assets_text'            => 'Assets are items tracked by serial number or asset tag.  They tend to be higher value items where identifying a specific item matters.',
     'archived'  				=> 'Archived',
     'asset'  					=> 'Asset',
-    'bulk_checkout'             => 'Checkout Assets',
-    'bulk_checkin'              => 'Checkin Assets',
+    'bulk_checkout'             => 'Bulk Checkout',
+    'bulk_checkin'              => 'Bulk Checkin',
     'checkin'  					=> 'Checkin Asset',
     'checkout'  				=> 'Checkout Asset',
     'clone'  					=> 'Clone Asset',
@@ -27,8 +27,7 @@ return [
     'undeployable_tooltip'  	=> 'This asset has a status label that is undeployable and cannot be checked out at this time.',
     'view'  					=> 'View Asset',
     'csv_error' => 'You have an error in your CSV file:',
-    'import_text' => '<p>Upload a CSV that contains asset history. The assets and users MUST already exist in the system, or they will be skipped. Matching assets for history import happens against the asset tag. We will try to find a matching user based on the user\'s name you provide, and the criteria you select below. If you do not select any criteria below, it will simply try to match on the username format you configured in the <code>Admin &gt; General Settings</code>.</p><p>Fields included in the CSV must match the headers: <strong>Asset Tag, Name, Checkout Date, Checkin Date</strong>. Any additional fields will be ignored. </p><p>Checkin Date: blank or future checkin dates will checkout items to associated user.  Excluding the Checkin Date column will create a checkin date with todays date.</p>
-    ',
+    'import_text' => '<p>Upload a CSV that contains asset history. The assets and users MUST already exist in the system, or they will be skipped. Matching assets for history import happens against the asset tag. We will try to find a matching user based on the user\'s name you provide, and the criteria you select below. If you do not select any criteria below, it will simply try to match on the username format you configured in the <code>Admin &gt; General Settings</code>.</p><p>Fields included in the CSV must match the headers: <strong>Asset Tag, Name, Checkout Date, Checkin Date</strong>. Any additional fields will be ignored. </p><p>Checkin Date: blank or future checkin dates will checkout items to associated user.  Excluding the Checkin Date column will create a checkin date with todays date.</p>    ',
     'csv_import_match_f-l' => 'Try to match users by <strong>firstname.lastname</strong> (<code>jane.smith</code>) format',
     'csv_import_match_initial_last' => 'Try to match users by <strong>first initial last name</strong> (<code>jsmith</code>) format',
     'csv_import_match_first' => 'Try to match users by <strong>first name</strong> (<code>jane</code>) format',
diff --git a/resources/lang/tl-PH/admin/hardware/message.php b/resources/lang/tl-PH/admin/hardware/message.php
index 32698b1c07..c19bc63647 100644
--- a/resources/lang/tl-PH/admin/hardware/message.php
+++ b/resources/lang/tl-PH/admin/hardware/message.php
@@ -2,19 +2,23 @@
 
 return [
 
-    'undeployable' 		=> '<strong>Warning: </strong> This asset has been marked as currently undeployable.
-                        If this status has changed, please update the asset status.',
-    'does_not_exist' 	=> 'Asset does not exist.',
-    'does_not_exist_var'=> 'Asset with tag :asset_tag not found.',
-    'no_tag' 	        => 'No asset tag provided.',
+    'undeployable' 		 => '<strong>Warning: </strong> This asset has been marked as currently undeployable. If this status has changed, please update the asset status.',
+    'does_not_exist' 	 => 'Asset does not exist.',
+    'does_not_exist_var' => 'Asset with tag :asset_tag not found.',
+    'no_tag' 	         => 'No asset tag provided.',
     'does_not_exist_or_not_requestable' => 'That asset does not exist or is not requestable.',
-    'assoc_users'	 	=> 'This asset is currently checked out to a user and cannot be deleted. Please check the asset in first, and then try deleting again. ',
+    'assoc_users'	 	 => 'This asset is currently checked out to a user and cannot be deleted. Please check the asset in first, and then try deleting again. ',
     'warning_audit_date_mismatch' 	=> 'This asset\'s next audit date (:next_audit_date) is before the last audit date (:last_audit_date). Please update the next audit date.',
+    'labels_generated'   => 'Labels were successfully generated.',
+    'error_generating_labels' => 'Error while generating labels.',
+    'no_assets_selected' => 'No assets selected.',
 
     'create' => [
         'error'   		=> 'Asset was not created, please try again. :(',
         'success' 		=> 'Asset created successfully. :)',
         'success_linked' => 'Asset with tag :tag was created successfully. <strong><a href=":link" style="color: white;">Click here to view</a></strong>.',
+        'multi_success_linked' => 'Asset with tag :links was created successfully.|:count assets were created succesfully. :links.',
+        'partial_failure' => 'An asset was unable to be created. Reason: :failures|:count assets were unable to be created. Reasons: :failures',
     ],
 
     'update' => [
@@ -52,20 +56,24 @@ return [
     ],
 
     'import' => [
+        'import_button'         => 'Process Import',
         'error'                 => 'Some items did not import correctly.',
         'errorDetail'           => 'The following Items were not imported because of errors.',
         'success'               => 'Your file has been imported',
         'file_delete_success'   => 'Your file has been been successfully deleted',
         'file_delete_error'      => 'The file was unable to be deleted',
         'file_missing' => 'The file selected is missing',
+        'file_already_deleted' => 'The file selected was already deleted',
         'header_row_has_malformed_characters' => 'One or more attributes in the header row contain malformed UTF-8 characters',
         'content_row_has_malformed_characters' => 'One or more attributes in the first row of content contain malformed UTF-8 characters',
+        'transliterate_failure' => 'Transliteration from :encoding to UTF-8 failed due to invalid characters in input'
     ],
 
 
     'delete' => [
         'confirm'   	=> 'Are you sure you wish to delete this asset?',
         'error'   		=> 'There was an issue deleting the asset. Please try again.',
+        'assigned_to_error' => '{1}Asset Tag: :asset_tag is currently checked out. Check in this device before deletion.|[2,*]Asset Tags: :asset_tag are currently checked out. Check in these devices before deletion.',
         'nothing_updated'   => 'No assets were selected, so nothing was deleted.',
         'success' 		=> 'The asset was deleted successfully.',
     ],
@@ -78,6 +86,11 @@ return [
         'no_assets_selected' => 'You must select at least one asset from the list',
     ],
 
+    'multi-checkout' => [
+        'error'   => 'Asset was not checked out, please try again|Assets were not checked out, please try again',
+        'success' => 'Asset checked out successfully.|Assets checked out successfully.',
+    ],
+
     'checkin' => [
         'error'   		=> 'Asset was not checked in, please try again',
         'success' 		=> 'Asset checked in successfully.',
@@ -87,9 +100,10 @@ return [
     ],
 
     'requests' => [
-        'error'   		=> 'Asset was not requested, please try again',
-        'success' 		=> 'Asset requested successfully.',
-        'canceled'      => 'Checkout request successfully canceled',
+        'error'   		=> 'Request was not successful, please try again.',
+        'success' 		=> 'Request successfully submitted.',
+        'canceled'      => 'Request successfully canceled.',
+        'cancel'        => 'Cancel this item request',
     ],
 
 ];
diff --git a/resources/lang/tl-PH/admin/hardware/table.php b/resources/lang/tl-PH/admin/hardware/table.php
index be66a3de92..11748a22b3 100644
--- a/resources/lang/tl-PH/admin/hardware/table.php
+++ b/resources/lang/tl-PH/admin/hardware/table.php
@@ -25,7 +25,6 @@ return [
     'image'		    => 'Device Image',
     'days_without_acceptance' => 'Days Without Acceptance',
     'monthly_depreciation' => 'Monthly Depreciation',
-    'assigned_to'    => 'Assigned To',
     'requesting_user' => 'Requesting User',
     'requested_date' => 'Requested Date',
     'changed'       => 'Changed',
diff --git a/resources/lang/tl-PH/admin/kits/general.php b/resources/lang/tl-PH/admin/kits/general.php
index f57fb645c4..2b5c2d9cd0 100644
--- a/resources/lang/tl-PH/admin/kits/general.php
+++ b/resources/lang/tl-PH/admin/kits/general.php
@@ -47,4 +47,5 @@ return [
     'kit_deleted'                       => 'Kit was successfully deleted',
     'kit_model_updated'                 => 'Model was successfully updated',
     'kit_model_detached'                => 'Model was successfully detached',
+    'model_already_attached'            => 'Model already attached to kit',
 ];
diff --git a/resources/lang/tl-PH/admin/licenses/general.php b/resources/lang/tl-PH/admin/licenses/general.php
index 79b69a3d94..b39030afd4 100644
--- a/resources/lang/tl-PH/admin/licenses/general.php
+++ b/resources/lang/tl-PH/admin/licenses/general.php
@@ -14,6 +14,7 @@ return array(
     'info'  					=> 'License Info',
     'license_seats'  			=> 'License Seats',
     'seat'  					=> 'Seat',
+    'seat_count'  				=> 'Seat :count',
     'seats'  					=> 'Seats',
     'software_licenses'  		=> 'Software Licenses',
     'user'  					=> 'User',
@@ -23,12 +24,12 @@ return array(
         [
             'checkin_all'           => [
                 'button'            => 'Checkin All Seats',
-                'modal'             => 'This will action checkin one seat. | This action will checkin all :checkedout_seats_count seats for this license.',
+                'modal'             => 'This action will checkin one seat. | This action will checkin all :checkedout_seats_count seats for this license.',
                 'enabled_tooltip'   => 'Checkin ALL seats for this license from both users and assets',
                 'disabled_tooltip'  => 'This is disabled because there are no seats currently checked out',
                 'disabled_tooltip_reassignable'  => 'This is disabled because the License is not reassignable',
                 'success'           => 'License successfully checked in! | All licenses were successfully checked in!',
-                'log_msg'           => 'Checked in via bulk license checkout in license GUI',
+                'log_msg'           => 'Checked in via bulk license checkin in license GUI',
             ],
 
             'checkout_all'              => [
diff --git a/resources/lang/tl-PH/admin/licenses/message.php b/resources/lang/tl-PH/admin/licenses/message.php
index 27fbfe38a9..74e1d7af5a 100644
--- a/resources/lang/tl-PH/admin/licenses/message.php
+++ b/resources/lang/tl-PH/admin/licenses/message.php
@@ -44,10 +44,13 @@ return array(
         'error'   => 'There was an issue checking out the license. Please try again.',
         'success' => 'The license was checked out successfully',
         'not_enough_seats' => 'Not enough license seats available for checkout',
+        'mismatch' => 'The license seat provided does not match the license',
+        'unavailable' => 'This seat is not available for checkout.',
     ),
 
     'checkin' => array(
         'error'   => 'There was an issue checking in the license. Please try again.',
+        'not_reassignable' => 'License not reassignable',
         'success' => 'The license was checked in successfully'
     ),
 
diff --git a/resources/lang/tl-PH/admin/locations/message.php b/resources/lang/tl-PH/admin/locations/message.php
index 8121b80687..b21c70ad89 100644
--- a/resources/lang/tl-PH/admin/locations/message.php
+++ b/resources/lang/tl-PH/admin/locations/message.php
@@ -3,11 +3,12 @@
 return array(
 
     'does_not_exist' => 'Location does not exist.',
-    'assoc_users'    => 'This location is not currently deletable because it is the location of record for at least one asset or user, has assets assigned to it, or is the parent location of another location. Please update your models to no longer reference this company and try again. ',
+    'assoc_users'    => 'This location is not currently deletable because it is the location of record for at least one asset or user, has assets assigned to it, or is the parent location of another location. Please update your records to no longer reference this location and try again ',
     'assoc_assets'	 => 'This location is currently associated with at least one asset and cannot be deleted. Please update your assets to no longer reference this location and try again. ',
     'assoc_child_loc'	 => 'This location is currently the parent of at least one child location and cannot be deleted. Please update your locations to no longer reference this location and try again. ',
     'assigned_assets' => 'Assigned Assets',
     'current_location' => 'Current Location',
+    'open_map' => 'Open in :map_provider_icon Maps',
 
 
     'create' => array(
@@ -20,6 +21,11 @@ return array(
         'success' => 'Location updated successfully.'
     ),
 
+    'restore' => array(
+        'error'   => 'Location was not restored, please try again',
+        'success' => 'Location restored successfully.'
+    ),
+
     'delete' => array(
         'confirm'   	=> 'Are you sure you wish to delete this location?',
         'error'   => 'There was an issue deleting the location. Please try again.',
diff --git a/resources/lang/tl-PH/admin/locations/table.php b/resources/lang/tl-PH/admin/locations/table.php
index 8aafcf0506..66a4187f35 100644
--- a/resources/lang/tl-PH/admin/locations/table.php
+++ b/resources/lang/tl-PH/admin/locations/table.php
@@ -39,4 +39,5 @@ return [
     'signed_by_finance_auditor' => 'Signed By (Finance Auditor):',
     'signed_by_location_manager' => 'Signed By (Location Manager):',
     'signed_by'                 => 'Signed Off By:',
+    'clone'  					=> 'Clone Location',
 ];
diff --git a/resources/lang/tl-PH/admin/models/general.php b/resources/lang/tl-PH/admin/models/general.php
index 7e4a77adbc..9a61b53fd0 100644
--- a/resources/lang/tl-PH/admin/models/general.php
+++ b/resources/lang/tl-PH/admin/models/general.php
@@ -3,7 +3,7 @@
 return array(
     'about_models_title'     => 'About Asset Models',
     'about_models_text'           => 'Asset Models are a way to group identical assets. "MBP 2013", "IPhone 6s", etc.',
-    'deleted'  					        => 'This model has been deleted.',
+    'deleted'  					=> 'This model has been deleted.',
     'bulk_delete'               => 'Bulk Delete Asset Models',
     'bulk_delete_help'               => 'Use the checkboxes below to confirm the deletion of the selected asset models. Asset models that have assets associated with them cannot be deleted until the assets are associated with a different model.',
     'bulk_delete_warn'          => 'You are about to delete one asset model.|You are about to delete :model_count asset models.',
diff --git a/resources/lang/tl-PH/admin/models/message.php b/resources/lang/tl-PH/admin/models/message.php
index cc38c54530..ae3bc34eed 100644
--- a/resources/lang/tl-PH/admin/models/message.php
+++ b/resources/lang/tl-PH/admin/models/message.php
@@ -7,7 +7,7 @@ return array(
     'no_association' => 'WARNING! The asset model for this item is invalid or missing!',
     'no_association_fix' => 'This will break things in weird and horrible ways. Edit this asset now to assign it a model.',
     'assoc_users'	 => 'This model is currently associated with one or more assets and cannot be deleted. Please delete the assets, and then try deleting again. ',
-
+    'invalid_category_type' => 'This category must be an asset category.',
 
     'create' => array(
         'error'   => 'Model was not created, please try again.',
diff --git a/resources/lang/tl-PH/admin/reports/general.php b/resources/lang/tl-PH/admin/reports/general.php
index 9b682f8ecd..ed8bf1a156 100644
--- a/resources/lang/tl-PH/admin/reports/general.php
+++ b/resources/lang/tl-PH/admin/reports/general.php
@@ -4,6 +4,7 @@ return [
     'info'   => 'Select the options you want for your asset report.',
     'deleted_user' => 'Deleted user',
     'send_reminder' => 'Send reminder',
+    'cannot_send_reminder' => 'User has been deleted or does not have an email address so cannot receive a reminder',
     'reminder_sent' => 'Reminder sent',
     'acceptance_deleted' => 'Acceptance request deleted',
     'acceptance_request' => 'Acceptance request',
@@ -13,5 +14,10 @@ return [
         'user_state' => 'User State',
         'user_country' => 'User Country',
         'user_zip' => 'User Zip'
-    ]
-];
\ No newline at end of file
+    ],
+    'open_saved_template' => 'Open Saved Template',
+    'save_template' =>  'Save Template',
+    'select_a_template' => 'Select a Template',
+    'template_name' => 'Template Name',
+    'update_template' => 'Update Template',
+];
diff --git a/resources/lang/tl-PH/admin/reports/message.php b/resources/lang/tl-PH/admin/reports/message.php
index d4c8f8198f..2800bbdf0b 100644
--- a/resources/lang/tl-PH/admin/reports/message.php
+++ b/resources/lang/tl-PH/admin/reports/message.php
@@ -1,5 +1,16 @@
 <?php
 
-return array(
-    'error'   => 'You must select at least ONE option.'
-);
+return [
+    'about_templates' => 'About Saved Templates',
+    'saving_templates_description' => 'Select your options, then enter the name of your template in the box above and click the \'Save Template\' button. Use the dropdown to select a previously saved template.',
+    'create'  => [
+        'success' => 'Template saved successfully',
+    ],
+    'update' => [
+        'success' => 'Template updated successfully',
+    ],
+    'delete' => [
+        'success' => 'Template deleted',
+        'no_delete_permission' => 'Template does not exist or you do not have permission to delete it.',
+    ],
+];
diff --git a/resources/lang/tl-PH/admin/settings/general.php b/resources/lang/tl-PH/admin/settings/general.php
index 44fbc83feb..2cf0e8ab55 100644
--- a/resources/lang/tl-PH/admin/settings/general.php
+++ b/resources/lang/tl-PH/admin/settings/general.php
@@ -8,13 +8,13 @@ return [
     'ad_append_domain'          => 'Append domain name to username field',
     'ad_append_domain_help'     => 'User isn\'t required to write "username@domain.local", they can just type "username".',
     'admin_cc_email'            => 'CC Email',
-    'admin_cc_email_help'       => 'If you would like to send a copy of checkin/checkout emails that are sent to users to an additional email account, enter it here. Otherwise leave this field blank.',
+    'admin_cc_email_help'       => 'Send a copy of checkin/checkout emails to this address.',
     'admin_settings'            => 'Admin Settings',
     'is_ad'				        => 'Ito ay isang Aktibong serber ng Direktorya',
     'alerts'                	=> 'Alerts',
     'alert_title'               => 'Update Notification Settings',
     'alert_email'				=> 'Magpadala ng mga alerto sa',
-    'alert_email_help'    => 'Email addresses or distribution lists you want alerts to be sent to, comma separated',
+    'alert_email_help'          => 'Email addresses or distribution lists you want alerts to be sent to, comma separated.',
     'alerts_enabled'			=> 'Punagana na ang Alerto sa Email',
     'alert_interval'			=> 'Ang pagka-expire ng Alert Threshold (sa iilang araw)',
     'alert_inv_threshold'		=> 'Ang Inventory Alert Threshold',
@@ -31,15 +31,18 @@ return [
     'backups'					=> 'Backups',
     'backups_help'              => 'Create, download, and restore backups ',
     'backups_restoring'         => 'Restoring from Backup',
+    'backups_clean' => 'Clean the backed-up database before restore',
+    'backups_clean_helptext' => "This can be useful if you're changing between database versions",
     'backups_upload'            => 'Upload Backup',
     'backups_path'              => 'Backups on the server are stored in <code>:path</code>',
-    'backups_restore_warning'   => 'Use the restore button <small><span class="btn btn-xs btn-warning"><i class="text-white fas fa-retweet" aria-hidden="true"></i></span></small> to restore from a previous backup. (This does not currently work with S3 file storage or Docker.)<br><br>Your <strong>entire :app_name database and any uploaded files will be completely replaced</strong> by what\'s in the backup file.  ',
+    'backups_restore_warning'   => 'Use the restore button <small><span class="btn btn-xs btn-warning"><i class="text-white fas fa-retweet" aria-hidden="true"></i></span></small> to restore from a previous backup. (This does not currently work with S3 file storage or Docker.)<br><br>Your <strong>entire :app_name database and any uploaded files will be completely replaced</strong> by what\'s in the backup file  ',
     'backups_logged_out'         => 'All existing users, including you, will be logged out once your restore is complete.',
     'backups_large'             => 'Very large backups may time out on the restore attempt and may still need to be run via command line. ',
     'barcode_settings'			=> 'Barcode Settings',
     'confirm_purge'			    => 'Confirm Purge',
     'confirm_purge_help'		=> 'Enter the text "DELETE" in the box below to purge your deleted records. This action cannot be undone and will PERMANENTLY delete all soft-deleted items and users. (You should make a backup first, just to be safe.)',
     'custom_css'				=> 'Custom CSS',
+    'custom_css_placeholder'	=> 'Add your custom CSS',
     'custom_css_help'			=> 'Enter any custom CSS overrides you would like to use. Do not include the &lt;style&gt;&lt;/style&gt; tags.',
     'custom_forgot_pass_url'	=> 'Custom Password Reset URL',
     'custom_forgot_pass_url_help'	=> 'This replaces the built-in forgotten password URL on the login screen, useful to direct people to internal or hosted LDAP password reset functionality. It will effectively disable local user forgotten password functionality.',
@@ -47,34 +50,34 @@ return [
     'dashboard_message_help'	=> 'This text will appear on the dashboard for anyone with permission to view the dashboard.',
     'default_currency'  		=> 'Default Currency',
     'default_eula_text'			=> 'Default EULA',
+    'default_eula_text_placeholder' => 'Add your default EULA text',
     'default_language'			=> 'Default Language',
     'default_eula_help_text'	=> 'You can also associate custom EULAs to specific asset categories.',
     'acceptance_note'           => 'Add a note for your decision (Optional)',
     'display_asset_name'        => 'Display Asset Name',
     'display_checkout_date'     => 'Display Checkout Date',
     'display_eol'               => 'Display EOL in table view',
-    'display_qr'                => 'Display Square Codes',
+    'display_qr'                => 'Display 2D barcode',
     'display_alt_barcode'		=> 'Display 1D barcode',
-    'email_logo'                => 'Email Logo',
     'barcode_type'				=> '2D Barcode Type',
     'alt_barcode_type'			=> '1D barcode type',
-    'email_logo_size'       => 'Square logos in email look best. ',
     'enabled'                   => 'Enabled',
     'eula_settings'				=> 'EULA Settings',
     'eula_markdown'				=> 'This EULA allows <a href="https://help.github.com/articles/github-flavored-markdown/">Github flavored markdown</a>.',
+    'empty_row_count'           => 'Field Start Offset (Empty Rows)',
+    'empty_row_count_help'      => 'Fields will begin populating after this many empty rows are skipped at the top of the label.',
     'favicon'                   => 'Favicon',
     'favicon_format'            => 'Accepted filetypes are ico, png, and gif. Other image formats may not work in all browsers.',
     'favicon_size'          => 'Favicons should be square images, 16x16 pixels.',
     'footer_text'               => 'Additional Footer Text ',
     'footer_text_help'          => 'This text will appear in the right-side footer. Links are allowed using <a href="https://help.github.com/articles/github-flavored-markdown/">Github flavored markdown</a>. Line breaks, headers, images, etc may result in unpredictable results.',
+    'footer_text_placeholder'   => 'Optional footer text',
     'general_settings'			=> 'General Settings',
-    'general_settings_keywords' => 'company support, signature, acceptance, email format, username format, images, per page, thumbnail, eula, gravatar, tos, dashboard, privacy',
     'general_settings_help'     => 'Default EULA and more',
     'generate_backup'			=> 'Generate Backup',
     'google_workspaces'         => 'Google Workspaces',
     'header_color'              => 'Header Color',
     'info'                      => 'These settings let you customize certain aspects of your installation.',
-    'label_logo'                => 'Label Logo',
     'label_logo_size'           => 'Square logos look best - will be displayed in the top right of each asset label. ',
     'laravel'                   => 'Laravel Version',
     'ldap'                      => 'LDAP',
@@ -94,7 +97,7 @@ return [
     'ldap_login_sync_help'      => 'This only tests that LDAP can sync correctly. If your LDAP Authentication query is not correct, users may still not be able to login. YOU MUST SAVE YOUR UPDATED LDAP SETTINGS FIRST.',
     'ldap_manager'              => 'LDAP Manager',
     'ldap_server'               => 'LDAP Server',
-    'ldap_server_help'          => 'This should start with ldap:// (for unencrypted or TLS) or ldaps:// (for SSL)',
+    'ldap_server_help'          => 'This should start with ldap:// (for unencrypted) or ldaps:// (for TLS or SSL)',
     'ldap_server_cert'			=> 'LDAP SSL certificate validation',
     'ldap_server_cert_ignore'	=> 'Allow invalid SSL Certificate',
     'ldap_server_cert_help'		=> 'Select this checkbox if you are using a self signed SSL cert and would like to accept an invalid SSL certificate.',
@@ -108,8 +111,8 @@ return [
     'ldap_pword'                => 'LDAP Bind Password',
     'ldap_basedn'               => 'Base Bind DN',
     'ldap_filter'               => 'LDAP Filter',
-    'ldap_pw_sync'              => 'LDAP Password Sync',
-    'ldap_pw_sync_help'         => 'Uncheck this box if you do not wish to keep LDAP passwords synced with local passwords. Disabling this means that your users may not be able to login if your LDAP server is unreachable for some reason.',
+    'ldap_pw_sync'              => 'Cache LDAP Passwords',
+    'ldap_pw_sync_help'         => 'Uncheck this box if you do not wish to keep LDAP passwords cached as local hashed passwords. Disabling this means that your users may not be able to login if your LDAP server is unreachable for some reason.',
     'ldap_username_field'       => 'Username Field',
     'ldap_lname_field'          => 'Last Name',
     'ldap_fname_field'          => 'LDAP First Name',
@@ -117,13 +120,15 @@ return [
     'ldap_version'              => 'LDAP Version',
     'ldap_active_flag'          => 'LDAP Active Flag',
     'ldap_activated_flag_help'  => 'This value is used to determine whether a synced user can login to Snipe-IT. <strong>It does not affect the ability to check items in or out to them</strong>, and should be the <strong>attribute name</strong> within your AD/LDAP, <strong>not the value</strong>. <br><br>If this field is set to a field name that does not exist in your AD/LDAP, or the value in the AD/LDAP field is set to <code>0</code> or <code>false</code>, <strong>user login will be disabled</strong>. If the value in the AD/LDAP field is set to <code>1</code> or <code>true</code> or <em>any other text</em> means the user can log in. When the field is blank in your AD, we respect the <code>userAccountControl</code> attribute, which usually allows non-suspended users to log in.',
+    'ldap_invert_active_flag'   => 'LDAP Invert Active Flag',
+    'ldap_invert_active_flag_help'     => 'If enabled: when the value returned by LDAP Active Flag is <code>0</code> or <code>false</code> the user account will be active.',
     'ldap_emp_num'              => 'LDAP Employee Number',
     'ldap_email'                => 'LDAP Email',
     'ldap_test'                 => 'Test LDAP',
     'ldap_test_sync'            => 'Test LDAP Synchronization',
     'license'                   => 'Software License',
-    'load_remote'               => 'Use Gravatar',
-    'load_remote_help_text'		=> 'Uncheck this box if your install cannot load scripts from the outside internet. This will prevent Snipe-IT from trying load images from Gravatar.',
+    'load_remote'               => 'Load Remote Avatars',
+    'load_remote_help_text'		=> 'Uncheck this box if your install cannot load scripts from the outside internet. This will prevent Snipe-IT from trying load avatars from Gravatar or other outside sources.',
     'login'                     => 'Login Attempts',
     'login_attempt'             => 'Login Attempt',
     'login_ip'                  => 'IP Address',
@@ -131,6 +136,7 @@ return [
     'login_user_agent'          => 'User Agent',
     'login_help'                => 'List of attempted logins',
     'login_note'                => 'Login Note',
+    'login_note_placeholder'            => "If you do not have a login or have found a device belonging to this company, please call technical support at 888-555-1212. Thank you.",
     'login_note_help'           => 'Optionally include a few sentences on your login screen, for example to assist people who have found a lost or stolen device. This field accepts <a href="https://help.github.com/articles/github-flavored-markdown/">Github flavored markdown</a>',
     'login_remote_user_text'    => 'Remote User login options',
     'login_remote_user_enabled_text' => 'Enable Login with Remote User Header',
@@ -146,13 +152,16 @@ return [
     'logo_print_assets_help'    => 'Use branding on printable asset lists ',
     'full_multiple_companies_support_help_text' => 'Restricting users (including admins) assigned to companies to their company\'s assets.',
     'full_multiple_companies_support_text' => 'Full Multiple Companies Support',
+    'scope_locations_fmcs_support_text'  => 'Scope Locations with Full Multiple Companies Support',
+    'scope_locations_fmcs_support_help_text'  => 'Restrict locations to their selected company.',
+    'scope_locations_fmcs_check_button' => 'Check Compatibility',
+    'scope_locations_fmcs_support_disabled_text'  => 'This option is disabled because you have conflicting locations set for :count or more items.',
     'show_in_model_list'   => 'Show in Model Dropdowns',
     'optional'					=> 'optional',
     'per_page'                  => 'Results Per Page',
     'php'                       => 'PHP Version',
-    'php_info'                  => 'PHP Info',
+    'php_info'                  => 'PHP info',
     'php_overview'              => 'PHP',
-    'php_overview_keywords'     => 'phpinfo, system, info',
     'php_overview_help'         => 'PHP System info',
     'php_gd_info'               => 'You must install php-gd to display QR codes, see install instructions.',
     'php_gd_warning'            => 'PHP Image Processing and GD plugin is NOT installed.',
@@ -218,6 +227,8 @@ return [
     'webhook_integration_help'    => ':app integration is optional, however the endpoint and channel are required if you wish to use it. To configure :app integration, you must first <a href=":webhook_link" target="_new" rel="noopener">create an incoming webhook</a> on your :app account. Click on the <strong>Test :app Integration</strong> button to confirm your settings are correct before saving. ',
     'webhook_integration_help_button'    => 'Once you have saved your :app information, a test button will appear.',
     'webhook_test_help'           => 'Test whether your :app integration is configured correctly. YOU MUST SAVE YOUR UPDATED :app SETTINGS FIRST.',
+    'shortcuts_enabled'         => 'Enable Shortcuts',
+    'shortcuts_help_text'       => '<strong>Windows</strong>: Alt + Access key, <strong>Mac</strong>: Control + Option + Access key',
     'snipe_version'  			=> 'Snipe-IT version',
     'support_footer'            => 'Support Footer Links ',
     'support_footer_help'       => 'Specify who sees the links to the Snipe-IT Support info and Users Manual',
@@ -227,7 +238,6 @@ return [
     'update'                    => 'Update Settings',
     'value'                     => 'Value',
     'brand'                     => 'Branding',
-    'brand_keywords'            => 'footer, logo, print, theme, skin, header, colors, color, css',
     'brand_help'                => 'Logo, Site Name',
     'web_brand'                 => 'Web Branding Type',
     'about_settings_title'      => 'About Settings',
@@ -276,6 +286,8 @@ return [
     'two_factor_enrollment_text'	=> "Two factor authentication is required, however your device has not been enrolled yet. Open your Google Authenticator app and scan the QR code below to enroll your device. Once you've enrolled your device, enter the code below",
     'require_accept_signature'      => 'Require Signature',
     'require_accept_signature_help_text'      => 'Enabling this feature will require users to physically sign off on accepting an asset.',
+    'require_checkinout_notes'  => 'Require Notes on Checkin/Checkout',
+    'require_checkinout_notes_help_text'    => 'Enabling this feature will require the note fields to be populated when checking in or checking out an asset.',
     'left'        => 'left',
     'right'        => 'right',
     'top'        => 'top',
@@ -313,24 +325,24 @@ return [
     'filter_by_keyword' => 'Filter by setting keyword',
     'security' => 'Security',
     'security_title' => 'Update Security Settings',
-    'security_keywords' => 'password, passwords, requirements, two factor, two-factor, common passwords, remote login, logout, authentication',
     'security_help' => 'Two-factor, Password Restrictions',
-    'groups_keywords' => 'permissions, permission groups, authorization',
     'groups_help' => 'Account permission groups',
     'localization' => 'Localization',
     'localization_title' => 'Update Localization Settings',
-    'localization_keywords' => 'localization, currency, local, locale, time zone, timezone, international, internatinalization, language, languages, translation',
     'localization_help' => 'Language, date display',
     'notifications' => 'Notifications',
     'notifications_help' => 'Email Alerts & Audit Settings',
     'asset_tags_help' => 'Incrementing and prefixes',
     'labels' => 'Labels',
     'labels_title' => 'Update Label Settings',
-    'labels_help' => 'Label sizes &amp; settings',
-    'purge_keywords' => 'permanently delete',
+    'labels_help' => 'Barcodes &amp; label settings',
     'purge_help' => 'Purge Deleted Records',
     'ldap_extension_warning' => 'It does not look like the LDAP extension is installed or enabled on this server. You can still save your settings, but you will need to enable the LDAP extension for PHP before LDAP syncing or login will work.',
     'ldap_ad' => 'LDAP/AD',
+    'ldap_test_label' => 'Test LDAP Sync',
+    'ldap_test_login' => ' Test LDAP Login',
+    'ldap_username_placeholder' => 'LDAP Username',
+    'ldap_password_placeholder' => 'LDAP Password',
     'employee_number' => 'Employee Number',
     'create_admin_user' => 'Create a User ::',
     'create_admin_success' => 'Success! Your admin user has been added!',
@@ -342,6 +354,8 @@ return [
     'setup_migration_create_user' => 'Next: Create User',
     'ldap_settings_link' => 'LDAP Settings Page',
     'slack_test' => 'Test <i class="fab fa-slack"></i> Integration',
+    'status_label_name' => 'Status Label Name',
+    'super_admin_only'  => 'Super Admin Only',
     'label2_enable'           => 'New Label Engine',
     'label2_enable_help'      => 'Switch to the new label engine. <b>Note: You will need to save this setting before setting others.</b>',
     'label2_template'         => 'Template',
@@ -356,12 +370,15 @@ return [
     'label2_2d_type'          => '2D Barcode Type',
     'label2_2d_type_help'     => 'Format for 2D barcodes',
     'label2_2d_target'        => '2D Barcode Target',
-    'label2_2d_target_help'   => 'The URL the 2D barcode points to when scanned',
+    'label2_2d_target_help'   => 'The data that will be contained in the 2D barcode',
     'label2_fields'           => 'Field Definitions',
     'label2_fields_help'      => 'Fields can be added, removed, and reordered in the left column. For each field, multiple options for Label and DataSource can be added, removed, and reordered in the right column.',
+    'purge_barcodes' => 'Purge Barcodes',
     'help_asterisk_bold'    => 'Text entered as <code>**text**</code> will be displayed as bold',
     'help_blank_to_use'     => 'Leave blank to use the value from <code>:setting_name</code>',
     'help_default_will_use' => '<code>:default</code> will use the value from <code>:setting_name</code>. <br>Note that the value of the barcodes must comply with the respective barcode spec in order to be successfully generated. Please see <a href="https://snipe-it.readme.io/docs/barcodes">the documentation <i class="fa fa-external-link"></i></a> for more details. ',
+    'asset_id'              => 'Asset ID',
+    'data'               => 'Data',
     'default'               => 'Default',
     'none'                  => 'None',
     'google_callback_help' => 'This should be entered as the callback URL in your Google OAuth app settings in your organization&apos;s <strong><a href="https://console.cloud.google.com/" target="_blank">Google developer console <i class="fa fa-external-link" aria-hidden="true"></i></a></strong>.',
@@ -373,7 +390,100 @@ return [
     'database_driver' => 'Database Driver',
     'bs_table_storage' => 'Table Storage',
     'timezone' => 'Timezone',
+    'test_mail' => 'Test Mail',
     'profile_edit'          => 'Edit Profile',
     'profile_edit_help'          => 'Allow users to edit their own profiles.',
+    'default_avatar' => 'Custom Default Avatar',
+    'default_avatar_help' => 'This image will be displayed as a profile if a user does not have a profile photo.',
+    'restore_default_avatar' => 'Restore <a href=":default_avatar" data-toggle="lightbox" data-type="image">original system default avatar</a>',
+    'restore_default_avatar_help' => '',
+    'due_checkin_days' => 'Due For Checkin Warning',
+    'due_checkin_days_help' => 'How many days before the expected checkin of an asset should it be listed in the "Due for checkin" page?',
+    'no_groups' => 'No groups have been created yet. Visit <code>Admin Settings > Permission Groups</code> to add one.',
+    'text' => 'Text',
+
+    'username_formats' => [
+        'username_format'		=> 'Username Format',
+        'firstname_lastname_format'	=> 'First Name Last Name (jane.smith)',
+        'first_name_format'	        => 'First Name (jane)',
+        'last_name_format'		=> 'Last Name (doe)',
+        'filastname_format'			=> 'First Initial Last Name (jsmith)',
+        'lastnamefirstinitial_format' =>  'Last Name First Initial (smithj)',
+        'firstname_lastname_underscore_format' => 'First Name Last Name (jane_smith)',
+        'firstinitial.lastname' => 'First Initial Last Name (j.smith)',
+        'lastname_firstinitial' => 'Last Name First Initial (smith_j)',
+        'lastname_dot_firstinitial_format' => 'Last Name First Initial (smith.j)',
+        'firstnamelastname'     => 'First Name Last Name (janesmith)',
+        'firstnamelastinitial'  => 'First Name Last Initial (janes)',
+        'lastnamefirstname'      => 'Last Name.First Name (smith.jane)',
+    ],
+
+    'email_formats' => [
+        'email_format'			=> 'Email Format',
+        'firstname_lastname_format'	=> 'First Name Last Name (jane.smith@example.com)',
+        'first_name_format'		=> 'First Name (jane@example.com)',
+        'last_name_format'		=> 'Last Name (doe@example.com)',
+        'filastname_format'			=> 'First Initial Last Name (jsmith@example.com)',
+        'lastnamefirstinitial_format' =>  'Last Name First Initial (smithj@example.com)',
+        'firstname_lastname_underscore_format' => 'First Name Last Name (jane_smith@example.com)',
+        'firstinitial.lastname' => 'First Initial Last Name (j.smith@example.com)',
+        'lastname_firstinitial' => 'Last Name First Initial (smith_j@example.com)',
+        'lastname_dot_firstinitial_format' => 'Last Name First Initial (smith.j@example.com)',
+        'firstnamelastname'     => 'First Name Last Name (janesmith@example.com)',
+        'firstnamelastinitial'  => 'First Name Last Initial (janes@example.com)',
+        'lastnamefirstname'      => 'Last Name.First Name (smith.jane@example.com)',
+    ],
+
+
+
+    'logo_labels' => [
+        'acceptance_pdf_logo'       => 'PDF Logo',
+        'email_logo'                => 'Email Logo',
+        'label_logo'                => 'Label Logo',
+        'logo'                      => 'Site Logo',
+        'favicon'                   => 'Favicon',
+    ],
+
+    'logo_help' => [
+        'email_logo_size'       => 'Square logos in email look best. ',
+    ],
+
+    'logo_option_types' => [
+        'text' => 'Text',
+        'logo' => 'Logo',
+        'logo_and_text' => 'Logo and Text',
+    ],
+
+
+    'legends' => [
+        'scoping' => 'Scoping',
+        'formats' => 'Default Formats',
+        'profiles' => 'User Profiles',
+        'eula' => 'EULA & Acceptance Preferences',
+        'misc_display' => 'Miscellaneous Display Options',
+        'email' => 'Email Preferences',
+        'checkin' => 'Checkin Preferences',
+        'dashboard' => 'Login & Dashboard Preferences',
+        'misc' => 'Miscellaneous',
+        'logos' => 'Logos & Display',
+        'colors' => 'Colors & Skins',
+        'footer' => 'Footer Preferences',
+        'security' => 'Security Preferences',
+        'general' => 'General',
+        'intervals' => 'Intervals & Thresholds',
+    ],
+
+
+    /* Keywords for settings overview help */
+    'keywords' => [
+        'brand'             => 'footer, logo, print, theme, skin, header, colors, color, css',
+        'general_settings'  => 'company support, signature, acceptance, email format, username format, images, per page, thumbnail, eula, gravatar, tos, dashboard, privacy',
+        'groups'            => 'permissions, permission groups, authorization',
+        'labels'            => 'labels, barcodes, barcode, sheets, print, upc, qr, 1d, 2d',
+        'localization'      => 'localization, currency, local, locale, time zone, timezone, international, internatinalization, language, languages, translation',
+        'php_overview'      => 'phpinfo, system, info',
+        'purge'             => 'permanently delete',
+        'security'          => 'password, passwords, requirements, two factor, two-factor, common passwords, remote login, logout, authentication',
+    ],
 
 ];
diff --git a/resources/lang/tl-PH/admin/settings/message.php b/resources/lang/tl-PH/admin/settings/message.php
index c9b0f34217..58abf14c5c 100644
--- a/resources/lang/tl-PH/admin/settings/message.php
+++ b/resources/lang/tl-PH/admin/settings/message.php
@@ -14,6 +14,9 @@ return [
         'restore_warning'       => 'Yes, restore it. I acknowledge that this will overwrite any existing data currently in the database. This will also log out all of your existing users (including you).',
         'restore_confirm'       => 'Are you sure you wish to restore your database from :filename?'
     ],
+    'restore' => [
+        'success'               => 'Your system backup has been restored. Please log in again.'
+    ],
     'purge' => [
         'error'     => 'An error has occurred while purging. ',
         'validation_failed'     => 'Your purge confirmation is incorrect. Please type the word "DELETE" in the confirmation box.',
@@ -33,6 +36,9 @@ return [
         'testing_authentication' => 'Testing LDAP Authentication...',
         'authentication_success' => 'User authenticated against LDAP successfully!'
     ],
+    'labels' => [
+        'null_template' => 'Label template not found. Please select a template.',
+        ],
     'webhook' => [
         'sending' => 'Sending :app test message...',
         'success' => 'Your :webhook_name Integration works!',
@@ -42,5 +48,12 @@ return [
         'error' => 'Something went wrong. :app responded with: :error_message',
         'error_redirect' => 'ERROR: 301/302 :endpoint returns a redirect. For security reasons, we don’t follow redirects. Please use the actual endpoint.',
         'error_misc' => 'Something went wrong. :( ',
-    ]
+        'webhook_fail' => ' webhook notification failed: Check to make sure the URL is still valid.',
+        'webhook_channel_not_found' => ' webhook channel not found.',
+        'ms_teams_deprecation' => 'The selected Microsoft Teams webhook URL will be deprecated Dec 31st, 2025. Please use a workflow URL. Microsoft\'s documentation on creating a workflow can be found <a href="https://support.microsoft.com/en-us/office/create-incoming-webhooks-with-workflows-for-microsoft-teams-8ae491c7-0394-4861-ba59-055e33f75498" target="_blank"> here.</a>',
+    ],
+    'location_scoping' => [
+        'not_saved' => 'Your settings were not saved.',
+        'mismatch' => 'There is 1 item in the database that need your attention before you can enable location scoping.|There are :count items in the database that need your attention before you can enable location scoping.',
+    ],
 ];
diff --git a/resources/lang/tl-PH/admin/statuslabels/table.php b/resources/lang/tl-PH/admin/statuslabels/table.php
index 27befb5ef7..1a0fab891e 100644
--- a/resources/lang/tl-PH/admin/statuslabels/table.php
+++ b/resources/lang/tl-PH/admin/statuslabels/table.php
@@ -1,14 +1,14 @@
 <?php
 
 return array(
-    'about'      	=> 'About Status Labels',
+    'about'      	=> 'About Status Types',
     'archived'      	=> 'Archived',
     'create'      	=> 'Create Status Label',
     'color'      	=> 'Chart Color',
     'default_label' => 'Default Label',
     'default_label_help' => 'This is used to ensure your most commonly used status labels appear at the top of the select box when creating/editing assets.',
     'deployable'      	=> 'Deployable',
-    'info'      	=> 'Status labels are used to describe the various states your assets could be in. They may be out for repair, lost/stolen, etc. You can create new status labels for deployable, pending and archived assets.',
+    'info'      	=> 'Status label types are used to describe the various states your assets could be in. They may be out for repair, lost/stolen, etc. You can create new status labels for your deployable, pending and archived assets according to your own workflow. For more information, <a href="https://snipe-it.readme.io/docs/overview#status-labels" target="_blank">see the documentation <i class="fa fa-external-link"></i></a>.',
     'name'      	=> 'Status Name',
     'pending'      	=> 'Pending',
     'status_type'   => 'Status Type',
diff --git a/resources/lang/tl-PH/admin/users/general.php b/resources/lang/tl-PH/admin/users/general.php
index b097ccec69..14f36cf151 100644
--- a/resources/lang/tl-PH/admin/users/general.php
+++ b/resources/lang/tl-PH/admin/users/general.php
@@ -19,6 +19,8 @@ return [
     'print_assigned'    => 'Print All Assigned',
     'email_assigned'    => 'Email List of All Assigned',
     'user_notified'     => 'User has been emailed a list of their currently assigned items.',
+    'users_notified'    => 'The user has been emailed a list of their currently assigned items.|:count users have been emailed a list of their currently assigned items.',
+    'users_notified_warning' => ':count user has been emailed a list of their currently assigned items, however :no_email users did not have an email address so could not be emailed.|:count users have been emailed a list of their currently assigned items, however :no_email user(s) did not have an email address so could not be emailed.',
     'auto_assign_label' => 'Include this user when auto-assigning eligible licenses',
     'auto_assign_help'  => 'Skip this user in auto assignment of licenses',
     'software_user'     => 'Software Checked out to :name',
diff --git a/resources/lang/tl-PH/admin/users/message.php b/resources/lang/tl-PH/admin/users/message.php
index 4d014775bd..b6ddad3aac 100644
--- a/resources/lang/tl-PH/admin/users/message.php
+++ b/resources/lang/tl-PH/admin/users/message.php
@@ -6,7 +6,7 @@ return array(
     'declined'                  => 'You have successfully declined this asset.',
     'bulk_manager_warn'	        => 'Your users have been successfully updated, however your manager entry was not saved because the manager you selected was also in the user list to be edited, and users may not be their own manager. Please select your users again, excluding the manager.',
     'user_exists'               => 'User already exists!',
-    'user_not_found'            => 'User does not exist.',
+    'user_not_found'            => 'User does not exist or you do not have permission view them.',
     'user_login_required'       => 'The login field is required',
     'user_has_no_assets_assigned' => 'No assets currently assigned to user.',
     'user_password_required'    => 'The password is required.',
@@ -53,6 +53,7 @@ return array(
         'ldap_could_not_search' => 'Could not search the LDAP server. Please check your LDAP server configuration in the LDAP config file. <br>Error from LDAP Server:',
         'ldap_could_not_get_entries' => 'Could not get entries from the LDAP server. Please check your LDAP server configuration in the LDAP config file. <br>Error from LDAP Server:',
         'password_ldap' => 'The password for this account is managed by LDAP/Active Directory. Please contact your IT department to change your password. ',
+        'multi_company_items_assigned' => 'This user has items assigned that belong to a different company. Please check them in or edit their company.'
     ),
 
     'deletefile' => array(
diff --git a/resources/lang/tl-PH/admin/users/table.php b/resources/lang/tl-PH/admin/users/table.php
index 0372b87e95..18ecb9a817 100644
--- a/resources/lang/tl-PH/admin/users/table.php
+++ b/resources/lang/tl-PH/admin/users/table.php
@@ -22,7 +22,7 @@ return array(
     'managed_locations'     => 'Managed Locations',
     'managed_users'         => 'Managed Users',
     'name' 					=> 'Ngalan',
-    'nogroup'               => 'No groups have been created yet. To add one, visit: ',
+    'nogroup'               => 'No groups have been created yet. To add one, visit:',
     'notes'                 => 'Ang mga Palatandaan',
     'password_confirm' 		=> 'Confirm Password',
     'password' 				=> 'Password',
diff --git a/resources/lang/tl-PH/auth.php b/resources/lang/tl-PH/auth.php
index db310aa1bb..14d8acfce0 100644
--- a/resources/lang/tl-PH/auth.php
+++ b/resources/lang/tl-PH/auth.php
@@ -15,6 +15,6 @@ return array(
 
     'failed' => 'These credentials do not match our records.',
     'password' => 'The provided password is incorrect.',
-    'throttle' => 'Too many login attempts. Please try again in :seconds seconds.',
+    'throttle' => 'Too many login attempts. Please try again in :minutes minute(s).',
 
 );
diff --git a/resources/lang/tl-PH/auth/message.php b/resources/lang/tl-PH/auth/message.php
index 588c9069ca..08f638d058 100644
--- a/resources/lang/tl-PH/auth/message.php
+++ b/resources/lang/tl-PH/auth/message.php
@@ -6,8 +6,6 @@ return array(
     'account_not_found'      => 'The username or password is incorrect.',
     'account_not_activated'  => 'This user account is not activated.',
     'account_suspended'      => 'This user account is suspended.',
-    'account_banned'         => 'This user account is banned.',
-    'throttle'               => 'Too many failed login attempts. Please try again in :minutes minutes.',
 
     'two_factor' => array(
         'already_enrolled'      => 'Your device is already enrolled.',
diff --git a/resources/lang/tl-PH/button.php b/resources/lang/tl-PH/button.php
index fb8ea31b10..367aac8784 100644
--- a/resources/lang/tl-PH/button.php
+++ b/resources/lang/tl-PH/button.php
@@ -7,6 +7,7 @@ return [
     'checkin_and_delete'  	    => 'Checkin All / Delete User',
     'delete'  	                => 'Delete',
     'edit'    	                => 'Edit',
+    'clone'    	                => 'Clone',
     'restore' 	                => 'Restore',
     'remove'                    => 'Remove',
     'request'                   => 'Request',
@@ -21,4 +22,13 @@ return [
     'add_maintenance'           => 'Add Maintenance',
     'append'                    => 'Append',
     'new'                       => 'New',
+    'var' => [
+        'clone'     => 'Clone :item_type',
+        'edit'      => 'Edit :item_type',
+        'delete'    => 'Delete :item_type',
+        'restore'   => 'Restore :item_type',
+        'create'    => 'Create New :item_type',
+        'checkout'  => 'Checkout :item_type',
+        'checkin'   => 'Checkin :item_type',
+    ]
 ];
diff --git a/resources/lang/tl-PH/general.php b/resources/lang/tl-PH/general.php
index 763df63862..3fbfac13d8 100644
--- a/resources/lang/tl-PH/general.php
+++ b/resources/lang/tl-PH/general.php
@@ -10,7 +10,7 @@ return [
     'action'                => 'Kilos',
     'activity_report'		=> 'Activity Report',
     'address'				=> 'Address',
-    'admin'					=> 'Admin',
+    'admin'					=> 'Admin Settings',
     'admin_tooltip'			=> 'This user has admin privileges',
     'superuser'				=> 'Superuser',
     'superuser_tooltip'		=> 'This user has superuser privileges',
@@ -23,13 +23,16 @@ return [
     'asset_models'			=> 'Asset Models',
     'asset_model'			=> 'Model',
     'asset'					=> 'Asset',
+    'asset_previous'        => 'Asset (Previously Assigned)',
     'asset_report'          => 'Asset Report',
     'asset_tag'				=> 'Asset Tag',
     'asset_tags'            => 'Asset Tags',
     'assets_available'		=> 'Assets available',
     'accept_assets'         => 'Accept Assets :name',
     'accept_assets_menu'    => 'Accept Assets',
+    'accept_item'           => 'Accept Item',
     'audit'				    => 'Audit',
+    'audits'				=> 'Audits',
     'audit_report'			=> 'Audit Log',
     'assets'				=> 'Assets',
     'assets_audited'        => 'assets audited',
@@ -61,9 +64,12 @@ return [
     'changepassword'  		=> 'Change Password',
     'checkin'  				=> 'Checkin',
     'checkin_from'  		=> 'Checkin from',
+    'checkin_note'  		=> 'Checkin Note',
+    'checkout_note'  		=> 'Checkout Note',
     'checkout'  			=> 'Checkout',
     'checkouts_count'       => 'Checkouts',
     'checkins_count'        => 'Checkins',
+    'checkin_and_delete'  	=> 'Checkin and Delete',
     'user_requests_count'   => 'Requests',
     'city'  				=> 'City',
     'click_here'			=> 'Click here',
@@ -77,7 +83,7 @@ return [
     'consumables'			=> 'Consumables',
     'country'  				=> 'Country',
     'could_not_restore'     => 'Error restoring :item_type: :error',
-    'not_deleted'           => 'The :item_type is not deleted so it cannot be restored',
+    'not_deleted'           => 'The :item_type was not deleted and therefore cannot be restored',
     'create'				=> 'Create New',
     'created'               => 'Item Created',
     'created_asset'			=> 'created asset',
@@ -86,11 +92,13 @@ return [
     'record_created' 		=> 'Record Created',
     'updated_at' 			=> 'Updated at',
     'currency'  			=> '$', // this is deprecated
+    'currency_text'  		=> 'Currency', //
     'current'  				=> 'Current',
     'current_password'      => 'Current Password',
     'customize_report'      => 'Customize Report',
     'custom_report'         => 'Custom Asset Report',
     'dashboard'				=> 'Dashboard',
+    'data_source'           => 'Data Source',
     'days'      			=> 'ang mga araw',
     'days_to_next_audit'    => 'Days to Next Audit',
     'date'					=> 'Date',
@@ -98,7 +106,7 @@ return [
     'debug_warning_text'    => 'This application is running in production mode with debugging enabled. This can expose sensitive data if your application is accessible to the outside world. Disable debug mode by setting the <code>APP_DEBUG</code> value in your <code>.env</code> file to <code>false</code>.',
     'delete'  				=> 'Delete',
     'delete_confirm'  		=> 'Are you sure you wish to delete :item?',
-    'delete_confirm_no_undo' => 'Are you sure you wish to delete :item? This can not be undone.',
+    'delete_confirm_no_undo' => 'Are you sure, you wish to delete :item? This cannot be undone.',
     'deleted'  				=> 'Deleted',
     'delete_seats'  		=> 'Deleted Seats',
     'deletion_failed'       => 'Deletion failed',
@@ -114,29 +122,13 @@ return [
     'editprofile'  			=> 'Edit Your Profile',
     'eol'					=> 'EOL',
     'email_domain'			=> 'Email Domain',
-    'email_format'			=> 'Email Format',
     'employee_number'       => 'Employee Number',
     'email_domain_help'		=> 'This is used to generate email addresses when importing',
     'error'				    => 'Error',
     'exclude_archived'      => 'Exclude Archived Assets',
     'exclude_deleted'       => 'Exclude Deleted Assets',
     'example'				=> 'Example: ',
-    'filastname_format'			=> 'First Initial Last Name (jsmith@example.com)',
-    'firstname_lastname_format'	=> 'First Name Last Name (jane.smith@example.com)',
-    'firstname_lastname_underscore_format' => 'First Name Last Name (jane_smith@example.com)',
-    'lastnamefirstinitial_format' =>  'Last Name First Initial (smithj@example.com)',
-    'firstintial_dot_lastname_format' => 'First Initial Last Name (j.smith@example.com)',
-    'firstname_lastname_display'	=> 'First Name Last Name (Jane Smith)',
-    'lastname_firstname_display'	=> 'Last Name First Name (Smith Jane)',
-    'name_display_format'	=> 'Name Display Format',
-    'first'					=> 'First',
-    'firstnamelastname'     => 'First Name Last Name (janesmith@example.com)',
-    'lastname_firstinitial' => 'Last Name First Initial (smith_j@example.com)',
-    'firstinitial.lastname' => 'First Initial Last Name (j.smith@example.com)',
-    'firstnamelastinitial'  => 'First Name Last Initial (janes@example.com)',
-    'lastnamefirstname'      => 'Last Name First Name (smith.jane@example.com)',
-    'first_name'			=> 'First Name',
-    'first_name_format'		=> 'First Name (jane@example.com)',
+
     'files'                 => 'Files',
     'file_name'				=> 'File',
     'file_type'             => 'File Type',
@@ -156,9 +148,9 @@ return [
     'image_delete'         	=> 'Delete Image',
     'include_deleted'       => 'Include Deleted Assets',
     'image_upload'         	=> 'Upload Image',
-    'filetypes_accepted_help'    => 'Accepted filetype is :types. Max upload size allowed is :size.|Accepted filetypes are :types. Max upload size allowed is :size.',
-    'filetypes_size_help'   => 'Max upload size allowed is :size.',
-    'image_filetypes_help'  => 'Accepted filetypes are jpg, webp, png, gif, svg, and avif. Max upload size allowed is :size.',
+    'filetypes_accepted_help'    => 'Accepted filetype is :types. The maximum size allowed is :size.|Accepted filetypes are :types. The maximum upload size allowed is :size.',
+    'filetypes_size_help'   => 'The maximum upload size allowed is :size.',
+    'image_filetypes_help'  => 'Accepted Filetypes are jpg, webp, png, gif, svg, and avif. The maximum upload size allowed is :size.',
     'unaccepted_image_type'  => 'This image file was not readable. Accepted filetypes are jpg, webp, png, gif, and svg. The mimetype of this file is: :mimetype.',
     'import'         	    => 'Import',
     'import_this_file'      => 'Map fields and process this file',
@@ -178,12 +170,17 @@ return [
     'last'					=> 'Last',
     'last_login'            => 'Last Login',
     'last_name'             => 'Last Name',
+    'firstname_lastname_display'	=> 'First Name Last Name (Jane Smith)',
+    'lastname_firstname_display'	=> 'Last Name First Name (Smith Jane)',
+    'name_display_format'	=> 'Name Display Format',
+    'first'					=> 'First',
+    'first_name'			=> 'First Name',
     'license'				=> 'License',
     'license_report'        => 'License Report',
     'licenses_available'	=> 'Licenses available',
     'licenses'				=> 'Licenses',
     'list_all'				=> 'List All',
-    'loading'				=> 'Loading... please wait....',
+    'loading'				=> 'Loading... please wait...',
     'lock_passwords'        => 'This field value will not be saved in a demo installation.',
     'feature_disabled'      => 'This feature has been disabled for the demo installation.',
     'location'              => 'Location',
@@ -193,7 +190,7 @@ return [
     'logout'				=> 'Logout',
     'lookup_by_tag'     => 'Lookup by Asset Tag',
     'maintenances'          => 'Maintenances',
-    'manage_api_keys'       => 'Manage API Keys',
+    'manage_api_keys'       => 'Manage API keys',
     'manufacturer'			=> 'Manufacturer',
     'manufacturers'			=> 'Manufacturers',
     'markdown'				=> 'This field allows <a href="https://help.github.com/articles/github-flavored-markdown/">Github flavored markdown</a>.',
@@ -215,6 +212,14 @@ return [
     'no_results'			=> 'No Results.',
     'no'  					=> 'No',
     'notes'  				=> 'Ang mga Palatandaan',
+    'note_added'            => 'Note Added',
+    'options'				=> 'Options',
+    'preview'				=> 'Preview',
+    'add_note'              => 'Add Note',
+    'note_edited'            => 'Note Edited',
+    'edit_note'              => 'Edit Note',
+    'note_deleted'            => 'Note Deleted',
+    'delete_note'              => 'Delete Note',
     'order_number'          => 'Order Number',
     'only_deleted'          => 'Only Deleted Assets',
     'page_menu'				=> 'Showing _MENU_ items',
@@ -229,7 +234,7 @@ return [
     'purchase_date'         => 'Purchase Date',
     'qty'		            => 'QTY',
     'quantity'		        => 'Quantity',
-    'quantity_minimum'      => 'You have :count items below or almost below minimum quantity levels',
+    'quantity_minimum'      => 'You have one item below or almost below minimum quantity levels|You have :count items below or almost below minimum quantity levels',
     'quickscan_checkin'  	=> 'Quick Scan Checkin',
     'quickscan_checkin_status'  	=> 'Checkin Status',
     'ready_to_deploy'		=> 'Ready to Deploy',
@@ -254,7 +259,7 @@ return [
     'select_all'            => 'Select All',
     'search'				=> 'Search',
     'select_category'       => 'Select a Category',
-    'select_datasource' => 'Select a Datasource',
+    'select_datasource' => 'Select a data source',
     'select_department'     => 'Select a Department',
     'select_depreciation'	=> 'Select a Depreciation Type',
     'select_location'		=> 'Select a Location',
@@ -274,13 +279,15 @@ return [
     'signed_off_by'         => 'Signed Off By',
     'skin'       			=> 'Skin',
     'webhook_msg_note'        => 'A notification will be sent via webhook',
-    'webhook_test_msg'        => 'Oh hai! Looks like your :app integration with Snipe-IT is working!',
+    'webhook_test_msg'        => 'Oh hai! It looks like your :app integration with Snipe-IT is working!',
     'some_features_disabled' => 'DEMO MODE: Some features are disabled for this installation.',
     'site_name'				=> 'Site Name',
     'state'  				=> 'State',
     'status_labels'			=> 'Status Labels',
+    'status_label'			=> 'Status Label',
     'status'    			=> 'Status',
     'accept_eula'           => 'Acceptance Agreement',
+    'show_or_hide_eulas' => 'Show/Hide EULAs',
     'supplier'              => 'Supplier',
     'suppliers'  			=> 'Suppliers',
     'sure_to_delete'        => 'Are you sure you wish to delete',
@@ -296,9 +303,9 @@ return [
     'type'  				=> 'Type',
     'undeployable'			=> 'Un-deployable',
     'unknown_admin'			=> 'Unknown Admin',
-    'username_format'		=> 'Username Format',
     'username'              => 'Username',
     'update'                => 'I-update',
+    'updating_item' => 'Updating :item',
     'upload_filetypes_help'      => 'Allowed filetypes are png, gif, jpg, jpeg, doc, docx, pdf, xls, xlsx, txt, lic, xml, zip, rtf and rar. Max upload size allowed is :size.',
     'uploaded'              => 'Uploaded',
     'user'					=> 'User',
@@ -323,10 +330,10 @@ return [
     'token_expired'         => 'Your form session has expired. Please try again.',
     'login_enabled'         => 'Login Enabled',
     'audit_due'             => 'Due for Audit',
-    'audit_due_days'        => 'Assets Due for Audit Within :days Day|Assets Due for Audit Within :days Days',
+    'audit_due_days'        => '{}Assets Due or Overdue for Audit|[1]Assets Due or Overdue for Audit Within a Day|[2,*]Assets Due or Overdue for Audit Within :days Days',
     'checkin_due'           => 'Due for Checkin',
     'checkin_overdue'       => 'Overdue for Checkin',
-    'checkin_due_days'      => 'Assets Due for Checkin Within :days Day|Assets Due for Checkin Within :days Days',
+    'checkin_due_days'      => '{}Due for Checkin|[1]Assets Due for Checkin Within :days Day|[2,*]Assets Due for Checkin Within :days Days',
     'audit_overdue'         => 'Overdue for Audit',
     'accept'                => 'Accept :asset',
     'i_accept'              => 'I accept',
@@ -339,16 +346,16 @@ return [
     'view_all'              => 'view all',
     'hide_deleted'          => 'Hide Deleted',
     'email'                 => 'Email',
-    'do_not_change'         => 'Do Not Change',
-    'bug_report'            => 'Report a Bug',
+    'do_not_change'         => 'Do not change',
+    'bug_report'            => 'Report a bug',
     'user_manual'           => 'User\'s Manual',
     'setup_step_1'          => 'Step 1',
     'setup_step_2'          => 'Step 2',
     'setup_step_3'          => 'Step 3',
     'setup_step_4'          => 'Step 4',
     'setup_config_check'    => 'Configuration Check',
-    'setup_create_database' => 'Create Database Tables',
-    'setup_create_admin'    => 'Create Admin User',
+    'setup_create_database' => 'Create database tables',
+    'setup_create_admin'    => 'Create an admin user',
     'setup_done'            => 'Finished!',
     'bulk_edit_about_to'    => 'You are about to edit the following: ',
     'checked_out'           => 'Checked Out',
@@ -383,6 +390,8 @@ return [
     'new_license'           => 'New License',
     'new_accessory'         => 'New Accessory',
     'new_consumable'        => 'New Consumable',
+    'new_component'         => 'New Component',
+    'new_user'              => 'New User',
     'collapse'              => 'Collapse',
     'assigned'              => 'Assigned',
     'asset_count'           => 'Asset Count',
@@ -418,19 +427,20 @@ return [
     'bulk_soft_delete'      =>'Also soft-delete these users. Their asset history will remain intact unless/until you purge deleted records in the Admin Settings.',
     'bulk_checkin_delete_success' => 'Your selected users have been deleted and their items have been checked in.',
     'bulk_checkin_success' => 'The items for the selected users have been checked in.',
-    'set_to_null'           => 'Delete values for this asset|Delete values for all :asset_count assets ',
+    'set_to_null'           => 'Delete values for this selection|Delete values for all :selection_count selections ',
     'set_users_field_to_null'  => 'Delete :field values for this user|Delete :field values for all :user_count users ',
     'na_no_purchase_date'   => 'N/A - No purchase date provided',
     'assets_by_status'      => 'Assets by Status',
     'assets_by_status_type'      => 'Assets by Status Type',
     'pie_chart_type'        => 'Dashboard Pie Chart Type',
     'hello_name'            => 'Hello, :name!',
-    'unaccepted_profile_warning'   => 'You have :count items requiring acceptance. Click here to accept or decline them',
+    'unaccepted_profile_warning'   => 'You have one item requiring acceptance. Click here to accept or decline it | You have :count items requiring acceptance. Click here to accept or decline them',
     'start_date'            => 'Start Date',
     'end_date'            => 'End Date',
     'alt_uploaded_image_thumbnail' => 'Uploaded thumbnail',
     'placeholder_kit'       => 'Select a kit',
     'file_not_found'        => 'File not found',
+    'log_record_not_found'  => 'No record for that log entry was found.',
     'preview_not_available' => '(no preview)',
     'setup'                 => 'Setup',
     'pre_flight'            => 'Pre-Flight',
@@ -512,7 +522,7 @@ return [
     'checked_out_to_fields' => 'Checked Out To Fields',
     'percent_complete' => '% complete',
     'uploading' => 'Uploading... ',
-    'upload_error' => 'Error uploading file. Please check that there are no empty rows and that no column names are duplicated.',
+    'upload_error' => 'Error uploading file. Please check that you have no empty rows or duplicated column names in your CSV, and that the server permissions allow uploads.',
     'copy_to_clipboard' => 'Copy to Clipboard',
     'copied' => 'Copied!',
     'status_compatibility' => 'If assets are already assigned, they cannot be changed to a non-deployable status type and this value change will be skipped.',
@@ -549,6 +559,71 @@ return [
         'license_seats'  => ':count License Seat|:count License Seats',
         'consumables'  => ':count Consumable|:count Consumables',
         'components'  => ':count Component|:count Components',
-    ]
+    ],
+
+    'more_info' => 'More Info',
+    'quickscan_bulk_help' => 'Checking this box will edit the asset record to reflect this new location. Leaving it unchecked will simply note the location in the audit log. Note that if this asset is checked out, it will not change the location of the person, asset or location it is checked out to.',
+    'whoops' => 'Whoops!',
+    'something_went_wrong' => 'Something went wrong with your request.',
+    'close' => 'Close',
+    'expires' => 'Expires',
+    'map_fields'=> 'Map :item_type Fields',
+    'remaining_var' => ':count Remaining',
+    'label' => 'Label',
+    'import_asset_tag_exists' => 'An asset with the asset tag :asset_tag already exists and an update was not requested. No change was made.',
+    'countries_manually_entered_help' => 'Values with an asterisk (*) were manually entered and do not match existing ISO 3166 dropdown values',
+    'accessories_assigned' => 'Assigned Accessories',
+    'user_managed_passwords' => 'Password Management',
+    'user_managed_passwords_disallow' => 'Disallow users from managing their own passwords',
+    'user_managed_passwords_allow' => 'Allow users to manage their own passwords',
+    'from' => 'From',
+    'by' => 'Batay sa',
+
+// Add form placeholders here
+    'placeholders' => [
+        'notes'  => 'Add a note',
+    ],
+
+    'breadcrumb_button_actions' => [
+        'edit_item' => 'Edit :name',
+        'checkout_item' => 'Checkout :name',
+        'checkin_item' => 'Checkin :name',
+    ],
+
+    'skins' => [
+        'site_default' => 'Site Default',
+        'default_blue' => 'Default Blue',
+        'blue_dark' => 'Blue (Dark Mode)',
+        'green' => 'Green Dark',
+        'green_dark' => 'Green (Dark Mode)',
+        'red' => 'Red Dark',
+        'red_dark' => 'Red (Dark Mode)',
+        'orange' => 'Orange Dark',
+        'orange_dark' => 'Orange (Dark Mode)',
+        'black' => 'Black',
+        'black_dark' => 'Black (Dark Mode)',
+        'purple' => 'Purple',
+        'purple_dark' => 'Purple (Dark Mode)',
+        'yellow' => 'Yellow',
+        'yellow_dark' => 'Yellow (Dark Mode)',
+        'high_contrast' => 'High Contrast',
+
+    ],
+
+    'select_all_none' => 'Select/Unselect All',
+    'generic_model_not_found' => 'That :model was not found or you do not have permission to access it',
+    'deleted_models' => 'Deleted Asset Models',
+    'deleted_users' => 'Deleted Users',
+    'cost_each' => ':amount each',
+    'remove_current_image' => 'Remove current :type image',
+
+    'seeding' => [
+        'manufacturers' => [
+            'button' => 'Create Manufacturers',
+            'prompt' => 'You do not have any manufacturers yet. Would you like to seed a list of common manufacturers? (THIS WILL OVERWRITE EXISTING MANUFACTURERS, including those that have been soft-deleted.)',
+            'success' => 'Manufacturers seeded successfully',
+            'error' => 'Could not seed manufacturers. A manufacturer record already exists and seeding would overwrite it.|Could not seed manufacturers. :count manufacturer records already exist and seeding would overwrite them.',
+        ],
+    ],
 
 ];
diff --git a/resources/lang/tl-PH/localizations.php b/resources/lang/tl-PH/localizations.php
index f1232dd138..827ed4fca1 100644
--- a/resources/lang/tl-PH/localizations.php
+++ b/resources/lang/tl-PH/localizations.php
@@ -2,7 +2,7 @@
 
 return [
 
-    'select_language' => 'Select a language',
+    'select_language' => 'Select a Language',
     'languages' => [
         'en-US'=> 'English, US',
         'en-GB'=> 'English, UK',
@@ -40,7 +40,9 @@ return [
         'ms-MY'=> 'Malay',
         'mi-NZ'=> 'Maori',
         'mn-MN'=> 'Mongolian',
-        'no-NO'=> 'Norwegian',
+        'nb-NO'=> 'Norwegian Bokmål',
+        'om-ET' => 'Oromo (Ethiopian)',
+        //'nn-NO'=> 'Norwegian Nynorsk',
         'fa-IR'=> 'Persian',
         'pl-PL'=> 'Polish',
         'pt-PT'=> 'Portuguese',
@@ -66,7 +68,7 @@ return [
         'zu-ZA'=> 'Zulu',
     ],
 
-    'select_country' => 'Select a country',
+    'select_country' => 'Select a Country',
     
     'countries' => [
         'AC'=>'Ascension Island',
@@ -133,6 +135,7 @@ return [
         'EC'=>'Ecuador',
         'EE'=>'Estonia',
         'EG'=>'Egypt',
+        'GB-ENG'=>'England',
         'ER'=>'Eritrea',
         'ES'=>'Spain',
         'ET'=>'Ethiopia',
@@ -231,6 +234,7 @@ return [
         'NG'=>'Nigeria',
         'NI'=>'Nicaragua',
         'NL'=>'Netherlands',
+        'GB-NIR' => 'Northern Ireland',
         'NO'=>'Norway',
         'NP'=>'Nepal',
         'NR'=>'Nauru',
@@ -258,7 +262,7 @@ return [
         'RU'=>'Russian Federation',
         'RW'=>'Rwanda',
         'SA'=>'Saudi Arabia',
-        'UK'=>'Scotland',
+        'GB-SCT'=>'Scotland',
         'SB'=>'Solomon Islands',
         'SC'=>'Seychelles',
         'SS'=>'South Sudan',
@@ -310,6 +314,7 @@ return [
         'VI'=>'Virgin Islands (U.S.)',
         'VN'=>'Viet Nam',
         'VU'=>'Vanuatu',
+        'GB-WLS' =>'Wales',
         'WF'=>'Wallis And Futuna Islands',
         'WS'=>'Samoa',
         'YE'=>'Yemen',
diff --git a/resources/lang/tl-PH/mail.php b/resources/lang/tl-PH/mail.php
index b7e7c5b895..a8ee6c3eb0 100644
--- a/resources/lang/tl-PH/mail.php
+++ b/resources/lang/tl-PH/mail.php
@@ -23,24 +23,25 @@ return [
     'Item_Requested' => 'Item Requested',
     'License_Checkin_Notification' => 'License checked in',
     'License_Checkout_Notification' => 'License checked out',
+    'license_for'   => 'License for',
     'Low_Inventory_Report' => 'Low Inventory Report',
     'a_user_canceled' => 'A user has canceled an item request on the website',
     'a_user_requested' => 'A user has requested an item on the website',
     'acceptance_asset_accepted' => 'A user has accepted an item',
     'acceptance_asset_declined' => 'A user has declined an item',
-    'accessory_name' => 'Pangalan ng accessory:',
-    'additional_notes' => 'Additional Notes:',
+    'accessory_name' => 'Pangalan ng accessory',
+    'additional_notes' => 'Additional Notes',
     'admin_has_created' => 'An administrator has created an account for you on the :web website.',
-    'asset' => 'Asset:',
-    'asset_name' => 'Sa Ngalan ng Propyedad:',
+    'asset' => 'Asset',
+    'asset_name' => 'Sa Ngalan ng Propyedad',
     'asset_requested' => 'Asset requested',
     'asset_tag' => 'Asset Tag',
     'assets_warrantee_alert' => 'There is :count asset with a warranty expiring in the next :threshold days.|There are :count assets with warranties expiring in the next :threshold days.',
     'assigned_to' => 'Assigned To',
     'best_regards' => 'Best regards,',
-    'canceled' => 'Canceled:',
-    'checkin_date' => 'Checkin Date:',
-    'checkout_date' => 'Checkout Date:',
+    'canceled' => 'Canceled',
+    'checkin_date' => 'Checkin Date',
+    'checkout_date' => 'Checkout Date',
     'checkedout_from' => 'Checked out from',
     'checkedin_from'  => 'Checked in from',
     'checked_into' => 'Checked into',
@@ -49,27 +50,30 @@ return [
     'click_to_confirm' => 'Please click on the following link to confirm your :web account:',
     'current_QTY' => 'Current QTY',
     'days' => 'Ang mga araw',
-    'expecting_checkin_date' => 'Expected Checkin Date:',
+    'expecting_checkin_date' => 'Expected Checkin Date',
     'expires' => 'Expires',
     'hello' => 'Hello',
     'hi' => 'Hi',
     'i_have_read' => 'I have read and agree to the terms of use, and have received this item.',
     'inventory_report' => 'Inventory Report',
-    'item' => 'Aytem:',
+    'item' => 'Aytem',
+    'item_checked_reminder' => 'This is a reminder that you currently have :count items checked out to you that you have not accepted or declined. Please click the link below to confirm your decision.',
     'license_expiring_alert' => 'There is :count license expiring in the next :threshold days.|There are :count licenses expiring in the next :threshold days.',
     'link_to_update_password' => 'Please click on the following link to update your :web password:',
-    'login' => 'Login:',
+    'login' => 'Login',
     'login_first_admin' => 'Login to your new Snipe-IT installation using the credentials below:',
     'low_inventory_alert' => 'There is :count item that is below minimum inventory or will soon be low.|There are :count items that are below minimum inventory or will soon be low.',
     'min_QTY' => 'Min QTY',
     'name' => 'Ngalan',
     'new_item_checked' => 'A new item has been checked out under your name, details are below.',
+    'new_item_checked_with_acceptance' => 'A new item has been checked out under your name that requires acceptance, details are below.',
+    'recent_item_checked' => 'An item was recently checked out under your name that requires acceptance, details are below.',
     'notes' => 'Ang mga Palatandaan',
-    'password' => 'Password:',
+    'password' => 'Password',
     'password_reset' => 'Password Reset',
     'read_the_terms' => 'Please read the terms of use below.',
     'read_the_terms_and_click' => 'Please read the terms of use below, and click on the link at the bottom to confirm that you read and agree to the terms of use, and have received the asset.',
-    'requested' => 'Requested:',
+    'requested' => 'Requested',
     'reset_link' => 'Your Password Reset Link',
     'reset_password' => 'Click here to reset your password:',
     'rights_reserved' => 'All rights reserved.',
@@ -86,8 +90,10 @@ return [
     'upcoming-audits' => 'There is :count asset that is coming up for audit within :threshold days.|There are :count assets that are coming up for audit within :threshold days.',
     'user' => 'User',
     'username' => 'Username',
+    'unaccepted_asset_reminder' => 'Reminder: You have Unaccepted Assets.',
     'welcome' => 'Welcome :name',
     'welcome_to' => 'Welcome to :web!',
     'your_assets' => 'View Your Assets',
     'your_credentials' => 'Your Snipe-IT credentials',
+    'mail_sent' => 'Mail sent successfully!',
 ];
diff --git a/resources/lang/tl-PH/validation.php b/resources/lang/tl-PH/validation.php
index 05374e23af..99c847f589 100644
--- a/resources/lang/tl-PH/validation.php
+++ b/resources/lang/tl-PH/validation.php
@@ -13,87 +13,150 @@ return [
     |
     */
 
-    'accepted'             => 'The :attribute must be accepted.',
-    'active_url'           => 'The :attribute is not a valid URL.',
-    'after'                => 'The :attribute must be a date after :date.',
-    'after_or_equal'       => 'The :attribute must be a date after or equal to :date.',
-    'alpha'                => 'The :attribute may only contain letters.',
-    'alpha_dash'           => 'The :attribute may only contain letters, numbers, and dashes.',
-    'alpha_num'            => 'The :attribute may only contain letters and numbers.',
-    'array'                => 'The :attribute must be an array.',
-    'before'               => 'The :attribute must be a date before :date.',
-    'before_or_equal'      => 'The :attribute must be a date before or equal to :date.',
-    'between'              => [
-        'numeric' => 'The :attribute must be between :min - :max.',
-        'file'    => 'The :attribute must be between :min - :max kilobytes.',
-        'string'  => 'The :attribute must be between :min - :max characters.',
-        'array'   => 'The :attribute must have between :min and :max items.',
+    'accepted' => 'The :attribute field must be accepted.',
+    'accepted_if' => 'The :attribute field must be accepted when :other is :value.',
+    'active_url' => 'The :attribute field must be a valid URL.',
+    'after' => 'The :attribute field must be a date after :date.',
+    'after_or_equal' => 'The :attribute field must be a date after or equal to :date.',
+    'alpha' => 'The :attribute field must only contain letters.',
+    'alpha_dash' => 'The :attribute field must only contain letters, numbers, dashes, and underscores.',
+    'alpha_num' => 'The :attribute field must only contain letters and numbers.',
+    'array' => 'The :attribute field must be an array.',
+    'ascii' => 'The :attribute field must only contain single-byte alphanumeric characters and symbols.',
+    'before' => 'The :attribute field must be a date before :date.',
+    'before_or_equal' => 'The :attribute field must be a date before or equal to :date.',
+    'between' => [
+        'array' => 'The :attribute field must have between :min and :max items.',
+        'file' => 'The :attribute field must be between :min and :max kilobytes.',
+        'numeric' => 'The :attribute field must be between :min and :max.',
+        'string' => 'The :attribute field must be between :min and :max characters.',
     ],
-    'boolean'              => 'The :attribute must be true or false.',
-    'confirmed'            => 'The :attribute confirmation does not match.',
-    'date'                 => 'The :attribute is not a valid date.',
-    'date_format'          => 'The :attribute does not match the format :format.',
-    'different'            => 'The :attribute and :other must be different.',
-    'digits'               => 'The :attribute must be :digits digits.',
-    'digits_between'       => 'The :attribute must be between :min and :max digits.',
-    'dimensions'           => 'The :attribute has invalid image dimensions.',
-    'distinct'             => 'The :attribute field has a duplicate value.',
-    'email'                => 'The :attribute format is invalid.',
-    'exists'               => 'The selected :attribute is invalid.',
-    'file'                 => 'The :attribute must be a file.',
-    'filled'               => 'The :attribute field must have a value.',
-    'image'                => 'The :attribute must be an image.',
+    'boolean' => 'The :attribute field must be true or false.',
+    'can' => 'The :attribute field contains an unauthorized value.',
+    'confirmed' => 'The :attribute field confirmation does not match.',
+    'contains' => 'The :attribute field is missing a required value.',
+    'current_password' => 'The password is incorrect.',
+    'date' => 'The :attribute field must be a valid date.',
+    'date_equals' => 'The :attribute field must be a date equal to :date.',
+    'date_format' => 'The :attribute field must match the format :format.',
+    'decimal' => 'The :attribute field must have :decimal decimal places.',
+    'declined' => 'The :attribute field must be declined.',
+    'declined_if' => 'The :attribute field must be declined when :other is :value.',
+    'different' => 'The :attribute field and :other must be different.',
+    'digits' => 'The :attribute field must be :digits digits.',
+    'digits_between' => 'The :attribute field must be between :min and :max digits.',
+    'dimensions' => 'The :attribute field has invalid image dimensions.',
+    'distinct' => 'The :attribute field has a duplicate value.',
+    'doesnt_end_with' => 'The :attribute field must not end with one of the following: :values.',
+    'doesnt_start_with' => 'The :attribute field must not start with one of the following: :values.',
+    'email' => 'The :attribute field must be a valid email address.',
+    'ends_with' => 'The :attribute field must end with one of the following: :values.',
+    'enum' => 'The selected :attribute is invalid.',
+    'exists' => 'The selected :attribute is invalid.',
+    'extensions' => 'The :attribute field must have one of the following extensions: :values.',
+    'file' => 'The :attribute field must be a file.',
+    'filled' => 'The :attribute field must have a value.',
+    'gt' => [
+        'array' => 'The :attribute field must have more than :value items.',
+        'file' => 'The :attribute field must be greater than :value kilobytes.',
+        'numeric' => 'The :attribute field must be greater than :value.',
+        'string' => 'The :attribute field must be greater than :value characters.',
+    ],
+    'gte' => [
+        'array' => 'The :attribute field must have :value items or more.',
+        'file' => 'The :attribute field must be greater than or equal to :value kilobytes.',
+        'numeric' => 'The :attribute field must be greater than or equal to :value.',
+        'string' => 'The :attribute field must be greater than or equal to :value characters.',
+    ],
+    'hex_color' => 'The :attribute field must be a valid hexadecimal color.',
+    'image' => 'The :attribute field must be an image.',
     'import_field_empty'    => 'The value for :fieldname cannot be null.',
-    'in'                   => 'The selected :attribute is invalid.',
-    'in_array'             => 'The :attribute field does not exist in :other.',
-    'integer'              => 'The :attribute must be an integer.',
-    'ip'                   => 'The :attribute must be a valid IP address.',
-    'ipv4'                 => 'The :attribute must be a valid IPv4 address.',
-    'ipv6'                 => 'The :attribute must be a valid IPv6 address.',
-    'is_unique_department' => 'The :attribute must be unique to this Company Location',
-    'json'                 => 'The :attribute must be a valid JSON string.',
-    'max'                  => [
-        'numeric' => 'The :attribute may not be greater than :max.',
-        'file'    => 'The :attribute may not be greater than :max kilobytes.',
-        'string'  => 'The :attribute may not be greater than :max characters.',
-        'array'   => 'The :attribute may not have more than :max items.',
+    'in' => 'The selected :attribute is invalid.',
+    'in_array' => 'The :attribute field must exist in :other.',
+    'integer' => 'The :attribute field must be an integer.',
+    'ip' => 'The :attribute field must be a valid IP address.',
+    'ipv4' => 'The :attribute field must be a valid IPv4 address.',
+    'ipv6' => 'The :attribute field must be a valid IPv6 address.',
+    'json' => 'The :attribute field must be a valid JSON string.',
+    'list' => 'The :attribute field must be a list.',
+    'lowercase' => 'The :attribute field must be lowercase.',
+    'lt' => [
+        'array' => 'The :attribute field must have less than :value items.',
+        'file' => 'The :attribute field must be less than :value kilobytes.',
+        'numeric' => 'The :attribute field must be less than :value.',
+        'string' => 'The :attribute field must be less than :value characters.',
     ],
-    'mimes'                => 'The :attribute must be a file of type: :values.',
-    'mimetypes'            => 'The :attribute must be a file of type: :values.',
-    'min'                  => [
-        'numeric' => 'The :attribute must be at least :min.',
-        'file'    => 'The :attribute must be at least :min kilobytes.',
-        'string'  => 'The :attribute must be at least :min characters.',
-        'array'   => 'The :attribute must have at least :min items.',
+    'lte' => [
+        'array' => 'The :attribute field must not have more than :value items.',
+        'file' => 'The :attribute field must be less than or equal to :value kilobytes.',
+        'numeric' => 'The :attribute field must be less than or equal to :value.',
+        'string' => 'The :attribute field must be less than or equal to :value characters.',
     ],
-    'starts_with'          => 'The :attribute must start with one of the following: :values.',
-    'ends_with'            => 'The :attribute must end with one of the following: :values.',
+    'mac_address' => 'The :attribute field must be a valid MAC address.',
+    'max' => [
+        'array' => 'The :attribute field must not have more than :max items.',
+        'file' => 'The :attribute field must not be greater than :max kilobytes.',
+        'numeric' => 'The :attribute field must not be greater than :max.',
+        'string' => 'The :attribute field must not be greater than :max characters.',
+    ],
+    'max_digits' => 'The :attribute field must not have more than :max digits.',
+    'mimes' => 'The :attribute field must be a file of type: :values.',
+    'mimetypes' => 'The :attribute field must be a file of type: :values.',
+    'min' => [
+        'array' => 'The :attribute field must have at least :min items.',
+        'file' => 'The :attribute field must be at least :min kilobytes.',
+        'numeric' => 'The :attribute field must be at least :min.',
+        'string' => 'The :attribute field must be at least :min characters.',
+    ],
+    'min_digits' => 'The :attribute field must have at least :min digits.',
+    'missing' => 'The :attribute field must be missing.',
+    'missing_if' => 'The :attribute field must be missing when :other is :value.',
+    'missing_unless' => 'The :attribute field must be missing unless :other is :value.',
+    'missing_with' => 'The :attribute field must be missing when :values is present.',
+    'missing_with_all' => 'The :attribute field must be missing when :values are present.',
+    'multiple_of' => 'The :attribute field must be a multiple of :value.',
+    'not_in' => 'The selected :attribute is invalid.',
+    'not_regex' => 'The :attribute field format is invalid.',
+    'numeric' => 'The :attribute field must be a number.',
+    'password' => [
+        'letters' => 'The :attribute field must contain at least one letter.',
+        'mixed' => 'The :attribute field must contain at least one uppercase and one lowercase letter.',
+        'numbers' => 'The :attribute field must contain at least one number.',
+        'symbols' => 'The :attribute field must contain at least one symbol.',
+        'uncompromised' => 'The given :attribute has appeared in a data leak. Please choose a different :attribute.',
+    ],
+    'percent'       => 'The depreciation minimum must be between 0 and 100 when depreciation type is percentage.',
 
-    'not_in'               => 'The selected :attribute is invalid.',
-    'numeric'              => 'The :attribute must be a number.',
-    'present'              => 'The :attribute field must be present.',
-    'valid_regex'          => 'That is not a valid regex. ',
-    'regex'                => 'The :attribute format is invalid.',
-    'required'             => 'The :attribute field is required.',
-    'required_if'          => 'The :attribute field is required when :other is :value.',
-    'required_unless'      => 'The :attribute field is required unless :other is in :values.',
-    'required_with'        => 'The :attribute field is required when :values is present.',
-    'required_with_all'    => 'The :attribute field is required when :values is present.',
-    'required_without'     => 'The :attribute field is required when :values is not present.',
+    'present' => 'The :attribute field must be present.',
+    'present_if' => 'The :attribute field must be present when :other is :value.',
+    'present_unless' => 'The :attribute field must be present unless :other is :value.',
+    'present_with' => 'The :attribute field must be present when :values is present.',
+    'present_with_all' => 'The :attribute field must be present when :values are present.',
+    'prohibited' => 'The :attribute field is prohibited.',
+    'prohibited_if' => 'The :attribute field is prohibited when :other is :value.',
+    'prohibited_unless' => 'The :attribute field is prohibited unless :other is in :values.',
+    'prohibits' => 'The :attribute field prohibits :other from being present.',
+    'regex' => 'The :attribute field format is invalid.',
+    'required' => 'The :attribute field is required.',
+    'required_array_keys' => 'The :attribute field must contain entries for: :values.',
+    'required_if' => 'The :attribute field is required when :other is :value.',
+    'required_if_accepted' => 'The :attribute field is required when :other is accepted.',
+    'required_if_declined' => 'The :attribute field is required when :other is declined.',
+    'required_unless' => 'The :attribute field is required unless :other is in :values.',
+    'required_with' => 'The :attribute field is required when :values is present.',
+    'required_with_all' => 'The :attribute field is required when :values are present.',
+    'required_without' => 'The :attribute field is required when :values is not present.',
     'required_without_all' => 'The :attribute field is required when none of :values are present.',
-    'same'                 => 'The :attribute and :other must match.',
-    'size'                 => [
-        'numeric' => 'The :attribute must be :size.',
-        'file'    => 'The :attribute must be :size kilobytes.',
-        'string'  => 'The :attribute must be :size characters.',
-        'array'   => 'The :attribute must contain :size items.',
+    'same' => 'The :attribute field must match :other.',
+    'size' => [
+        'array' => 'The :attribute field must contain :size items.',
+        'file' => 'The :attribute field must be :size kilobytes.',
+        'numeric' => 'The :attribute field must be :size.',
+        'string' => 'The :attribute field must be :size characters.',
     ],
+    'starts_with' => 'The :attribute field must start with one of the following: :values.',
     'string'               => 'The :attribute must be a string.',
-    'timezone'             => 'The :attribute must be a valid zone.',
     'two_column_unique_undeleted' => 'The :attribute must be unique across :table1 and :table2. ',
-    'unique'               => 'The :attribute has already been taken.',
-    'uploaded'             => 'The :attribute failed to upload.',
-    'url'                  => 'The :attribute format is invalid.',
     'unique_undeleted'     => 'The :attribute must be unique.',
     'non_circular'         => 'The :attribute must not create a circular reference.',
     'not_array'            => ':attribute cannot be an array.',
@@ -102,11 +165,14 @@ return [
     'numbers'              => 'Password must contain at least one number.',
     'case_diff'            => 'Password must use mixed case.',
     'symbols'              => 'Password must contain symbols.',
-    'gte'                  => [
-        'numeric'          => 'Value cannot be negative'
-    ],
-    'checkboxes'           => ':attribute contains invalid options.',
-    'radio_buttons'        => ':attribute is invalid.',
+    'timezone' => 'The :attribute field must be a valid timezone.',
+    'unique' => 'The :attribute has already been taken.',
+    'uploaded' => 'The :attribute failed to upload.',
+    'uppercase' => 'The :attribute field must be uppercase.',
+    'url' => 'The :attribute field must be a valid URL.',
+    'ulid' => 'The :attribute field must be a valid ULID.',
+    'uuid' => 'The :attribute field must be a valid UUID.',
+    'fmcs_location' => 'Full multiple company support and location scoping is enabled in the Admin Settings, and the selected location and selected company are not compatible.',
 
 
     /*
@@ -120,16 +186,22 @@ return [
     |
     */
 
+    'email_array'      => 'One or more email addresses is invalid.',
+    'checkboxes'           => ':attribute contains invalid options.',
+    'radio_buttons'        => ':attribute is invalid.',
+    
     'custom' => [
         'alpha_space' => 'The :attribute field contains a character that is not allowed.',
-        'email_array'      => 'One or more email addresses is invalid.',
+
         'hashed_pass'      => 'Your current password is incorrect',
         'dumbpwd'          => 'That password is too common.',
         'statuslabel_type' => 'You must select a valid status label type',
+        'custom_field_not_found'          => 'This field does not seem to exist, please double check your custom field names.',
+        'custom_field_not_found_on_model' => 'This field seems to exist, but is not available on this Asset Model\'s fieldset.',
 
         // date_format validation with slightly less stupid messages. It duplicates a lot, but it gets the job done :(
-        // We use this because the default error message for date_format is reflects php Y-m-d, which non-PHP
-        // people won't know how to format. 
+        // We use this because the default error message for date_format reflects php Y-m-d, which non-PHP
+        // people won't know how to format.
         'purchase_date.date_format'     => 'The :attribute must be a valid date in YYYY-MM-DD format',
         'last_audit_date.date_format'   =>  'The :attribute must be a valid date in YYYY-MM-DD hh:mm:ss format',
         'expiration_date.date_format'   =>  'The :attribute must be a valid date in YYYY-MM-DD format',
@@ -137,9 +209,15 @@ return [
         'expected_checkin.date_format'  =>  'The :attribute must be a valid date in YYYY-MM-DD format',
         'start_date.date_format'        =>  'The :attribute must be a valid date in YYYY-MM-DD format',
         'end_date.date_format'          =>  'The :attribute must be a valid date in YYYY-MM-DD format',
+        'invalid_value_in_field' => 'Invalid value included in this field',
 
-    ],
+        'ldap_username_field' => [
+            'not_in' =>         '<code>sAMAccountName</code> (mixed case) will likely not work. You should use <code>samaccountname</code> (lowercase) instead.'
+        ],
+        'ldap_auth_filter_query' => ['not_in' => '<code>uid=samaccountname</code> is probably not a valid auth filter. You probably want <code>uid=</code> '],
+        'ldap_filter' => ['regex' => 'This value should probably not be wrapped in parentheses.'],
 
+        ],
     /*
     |--------------------------------------------------------------------------
     | Custom Validation Attributes
@@ -155,8 +233,16 @@ return [
 
     /*
     |--------------------------------------------------------------------------
-    | Generic Validation Messages
+    | Generic Validation Messages - we use these in the jquery validation where we don't have
+    | access to the :attribute
     |--------------------------------------------------------------------------
     */
-    'invalid_value_in_field' => 'Invalid value included in this field',
+
+    'generic' => [
+        'invalid_value_in_field' => 'Invalid value included in this field',
+        'required' => 'This field is required',
+        'email' => 'Please enter a valid email address',
+    ],
+
+
 ];
diff --git a/resources/lang/tr-TR/account/general.php b/resources/lang/tr-TR/account/general.php
index f04fa04799..c6f5c11663 100644
--- a/resources/lang/tr-TR/account/general.php
+++ b/resources/lang/tr-TR/account/general.php
@@ -2,10 +2,16 @@
 
 return array(
     'personal_api_keys' => 'Kişisel API Anahtarları',
-    'api_key_warning' => 'When generating an API token, be sure to copy it down immediately as they will not be visible to you again.',
+    'personal_access_token' => 'Personal Access Token',
+    'personal_api_keys_success' => 'Personal API Key :key created sucessfully',
+    'here_is_api_key' => 'Here is your new personal access token. This is the only time it will be shown so do not lose it! You may now use this token to make API requests.',
+    'api_key_warning' => 'API token üretildiğinde hemen farklı bir yere kopyalayın. Sonra bir daha göremeyeceksiniz.',
     'api_base_url' => 'API\'nizin temel URL\'si şurada bulunur:',
     'api_base_url_endpoint' => '/&lt;uçnokta&gt;',
     'api_token_expiration_time' => 'API jetonlarınız şu süre içinde sona erecek şekilde ayarlanmıştır:',
     'api_reference' => 'Please check the <a href="https://snipe-it.readme.io/reference" target="_blank">API reference</a> to find specific API endpoints and additional API documentation.',
     'profile_updated' => 'Account successfully updated',
+    'no_tokens' => 'You have not created any personal access tokens.',
+    'enable_sounds' => 'Enable sound effects',
+    'enable_confetti' => 'Enable confetti effects',
 );
diff --git a/resources/lang/tr-TR/admin/accessories/message.php b/resources/lang/tr-TR/admin/accessories/message.php
index 538b1d03e3..3639e2ca11 100644
--- a/resources/lang/tr-TR/admin/accessories/message.php
+++ b/resources/lang/tr-TR/admin/accessories/message.php
@@ -26,7 +26,13 @@ return array(
         'error'   		=> 'Aksesuar çıkışı yapılamadı, lütfen tekrar deneyin',
         'success' 		=> 'Aksesuar çıkışı yapıldı.',
         'unavailable'   => 'Bu ürün zimmetlenemez. Ürün sayısını kontrol edin.',
-        'user_does_not_exist' => 'Bu kullanıcı geçersiz. Lütfen tekrar deneyin.'
+        'user_does_not_exist' => 'Bu kullanıcı geçersiz. Lütfen tekrar deneyin.',
+         'checkout_qty' => array(
+            'lte'  => 'Şu anda bu türden yalnızca bir adet aksesuar mevcut ve siz :checkout_qty adet almaya çalışıyorsunuz. Lütfen alma miktarını veya bu aksesuarın toplam stokunu ayarlayıp tekrar deneyin.
+
+Toplamda :number_currently_remaining adet mevcut aksesuar var ve siz :checkout_qty adet almaya çalışıyorsunuz. Lütfen alma miktarını veya bu aksesuarın toplam stokunu ayarlayıp tekrar deneyin.',
+            ),
+           
     ),
 
     'checkin' => array(
diff --git a/resources/lang/tr-TR/admin/accessories/table.php b/resources/lang/tr-TR/admin/accessories/table.php
index da1ff4a284..5c3ce7a6f6 100644
--- a/resources/lang/tr-TR/admin/accessories/table.php
+++ b/resources/lang/tr-TR/admin/accessories/table.php
@@ -6,6 +6,4 @@ return array(
     'id'      					=> 'ID',
     'require_acceptance'      	=> 'Onaylama',
     'title'      				=> 'Aksesuar Adı',
-
-
 );
diff --git a/resources/lang/tr-TR/admin/components/message.php b/resources/lang/tr-TR/admin/components/message.php
index 70f01af121..5484673111 100644
--- a/resources/lang/tr-TR/admin/components/message.php
+++ b/resources/lang/tr-TR/admin/components/message.php
@@ -17,7 +17,8 @@ return array(
     'delete' => array(
         'confirm'   => 'Bu bileşeni silmek istediğinizden emin misiniz?',
         'error'   => 'Bileşen silinirken sorun oluştu. Lütfen yeniden deneyin.',
-        'success' => 'Bileşen başarıyla silindi.'
+        'success' => 'Bileşen başarıyla silindi.',
+        'error_qty'   => 'Bu türden bazı bileşenler hala alınmış. Lütfen bunları teslim edin ve tekrar deneyin.',
     ),
 
      'checkout' => array(
diff --git a/resources/lang/tr-TR/admin/consumables/general.php b/resources/lang/tr-TR/admin/consumables/general.php
index 51e10e4caf..447b239b99 100644
--- a/resources/lang/tr-TR/admin/consumables/general.php
+++ b/resources/lang/tr-TR/admin/consumables/general.php
@@ -8,4 +8,5 @@ return array(
     'remaining' 			            => 'Kalan',
     'total' 			                => 'Toplam',
     'update'                            => 'Sarf malzemesini Güncelle',
+    'inventory_warning'                 => 'Bu tüketilebilir ürünün stoğu, minimum :min_count miktarının altındadır',
 );
diff --git a/resources/lang/tr-TR/admin/consumables/message.php b/resources/lang/tr-TR/admin/consumables/message.php
index e20aeb6931..eadeb86361 100644
--- a/resources/lang/tr-TR/admin/consumables/message.php
+++ b/resources/lang/tr-TR/admin/consumables/message.php
@@ -2,6 +2,7 @@
 
 return array(
 
+    'invalid_category_type' => 'Kategori, tüketilebilir bir kategori olmalıdır.',
     'does_not_exist' => 'Sarf malzemesi mevcut değil.',
 
     'create' => array(
diff --git a/resources/lang/tr-TR/admin/custom_fields/general.php b/resources/lang/tr-TR/admin/custom_fields/general.php
index bd71f81c1c..5440d0d796 100644
--- a/resources/lang/tr-TR/admin/custom_fields/general.php
+++ b/resources/lang/tr-TR/admin/custom_fields/general.php
@@ -35,7 +35,7 @@ return [
     'create_field_title' => 'Yeni bir özel alan oluştur',
     'value_encrypted'      	        => 'Bu alanın değeri veritabanında şifrelidir. Yalnızca yönetici kullanıcıları şifresi çözülen değeri görüntüleyebilir',
     'show_in_email'     => 'Bu hane içerisindeki bilgi "Zimmet e-postası" içerisinde kullanıcıya gönderilsinmi? Şifrelenmiş hanelerin içerisindeki bilgiler gönderilemez.',
-    'show_in_email_short'     => 'E-postalara dahil edin.',
+    'show_in_email_short' => 'E-postalara dahil edin',
     'help_text' => 'Yardım Metni',
     'help_text_description' => 'Bu isteğe bağlı metin alanı, varlık düzenleme esnasında formdaki öğelere bağlam kazandırmak amacıyla öğelerin altında gözükecektir.',
     'about_custom_fields_title' => 'Özel Alanlar Hakkında',
@@ -57,5 +57,8 @@ return [
     'show_in_requestable_list_short' => 'Talep edilebilir varlıklar listesinde göster',
     'show_in_requestable_list' => 'Değeri talep edilebilir varlıklar listesinde gösterin. Şifreli alanlar gösterilmeyecek',
     'encrypted_options' => 'Bu alan şifrelendiğinden bazı görüntüleme seçenekleri kullanılamayacaktır.',
+    'display_checkin' => 'Teslimat formlarında görüntüle',
+    'display_checkout' => 'Çıkış formlarında görüntüle',
+    'display_audit' => 'Denetim formlarında görüntüle',
 
 ];
diff --git a/resources/lang/tr-TR/admin/custom_fields/message.php b/resources/lang/tr-TR/admin/custom_fields/message.php
index f7d6ab765b..947a94eb17 100644
--- a/resources/lang/tr-TR/admin/custom_fields/message.php
+++ b/resources/lang/tr-TR/admin/custom_fields/message.php
@@ -5,6 +5,7 @@ return array(
     'field' => array(
         'invalid'   => 'Bu alan geçersiz.',
         'already_added'   => 'Alan zaten mevcut',
+        'none_selected'   => 'Hiçbir alan seçilmedi',
 
         'create' => array(
             'error'   => 'Alan oluşturulamadı. Lütfen tekrar deneyin.',
diff --git a/resources/lang/tr-TR/admin/depreciations/general.php b/resources/lang/tr-TR/admin/depreciations/general.php
index 2f89d086c6..083ac7f255 100644
--- a/resources/lang/tr-TR/admin/depreciations/general.php
+++ b/resources/lang/tr-TR/admin/depreciations/general.php
@@ -13,4 +13,8 @@ return [
     'no_depreciations_warning'               => '<strong>Uyarı: </strong>
                       Şu anda ayarlanmış herhangi bir amortismanınız yok.
                       Amortisman raporunu görüntülemek için lütfen en az bir amortisman ayarlayın.',
+    'depreciation_method'                   => 'Amortisman Raporu',
+    'linear_depreciation'                   => 'Doğrusal (Varsayılan)',
+    'half_1'                                => 'Yarıyıl yöntemi, her zaman uygulanır',
+    'half_2'                                => 'Yarıyıl yöntemi, koşullu olarak uygulanır',
 ];
diff --git a/resources/lang/tr-TR/admin/hardware/form.php b/resources/lang/tr-TR/admin/hardware/form.php
index 80479268a8..931756f8e9 100644
--- a/resources/lang/tr-TR/admin/hardware/form.php
+++ b/resources/lang/tr-TR/admin/hardware/form.php
@@ -39,9 +39,9 @@ return [
     'order'				=> 'Sipariş Numarası',
     'qr'				=> 'QR Kod',
     'requestable'		=> 'Kullanıcılar bu demirbaşı talep edebilir',
-    'redirect_to_all'   => 'Return to all :type',
-    'redirect_to_type'   => 'Go to :type',
-    'redirect_to_checked_out_to'   => 'Go to Checked Out to',
+    'redirect_to_all'   => 'Tümüne dönmek için: type',
+    'redirect_to_type'   => 'Git: type',
+    'redirect_to_checked_out_to'   => 'Tıkla Çekilmişlere Git',
     'select_statustype'	=> 'Durum Seçiniz',
     'serial'			=> 'Seri No',
     'status'			=> 'Durum',
@@ -55,8 +55,11 @@ return [
     'asset_location_update_default' => 'Sadece varsayılan konumu güncelle',
     'asset_location_update_actual' => 'Sadece geçerli konumu güncelle',
     'asset_not_deployable' => 'Bu demirbaş dağıtılabilir durumda değil. Çıkışı yapılamaz.',
-    'asset_deployable' => 'Bu demirbaş dağıtılabilir durumda. Çıkışı yapılabilir.',
+    'asset_not_deployable_checkin' => 'Varlık bu durumdayken dağıtılamaz. Bu durum etiketini kullanmak varlığı giriş yaptıracaktır.',
+    'asset_deployable' => 'Bu varlık çekilebilir.',
     'processing_spinner' => 'İşleniyor... (Büyük dosyalarda bu işlem biraz zaman alabilir)',
+    'processing' => 'İşleniyor... ',
     'optional_infos'  => 'Opsiyonel Bilgi',
-    'order_details'   => 'Sipariş Bilgileri'
+    'order_details'   => 'Sipariş Bilgileri',
+    'calc_eol'    => 'EOL tarihini null yapılırsa, satın alma tarihi ve EOL oranına göre otomatik EOL hesaplaması kullanın.',
 ];
diff --git a/resources/lang/tr-TR/admin/hardware/general.php b/resources/lang/tr-TR/admin/hardware/general.php
index 95b2c354f8..060e1d57b3 100644
--- a/resources/lang/tr-TR/admin/hardware/general.php
+++ b/resources/lang/tr-TR/admin/hardware/general.php
@@ -5,8 +5,8 @@ return [
     'about_assets_text'            => 'Varlıklar Demirbaştır seri numarası veya varlık etiketi ile takibi yapılır. Bu nedenle değerli varlıklar benzersiz varlık kimliği ile ilişkilendirilirler.',
     'archived'  				=> 'Arşivlenmiş',
     'asset'  					=> 'Demirbaş',
-    'bulk_checkout'             => 'Varlıkları Kullanıma Alma',
-    'bulk_checkin'              => 'Demirbaş Girişi Yap',
+    'bulk_checkout'             => 'Toplu Teslim Et',
+    'bulk_checkin'              => 'Toplu Teslim Al',
     'checkin'  					=> 'Demirbaş Girişi Yap',
     'checkout'  				=> 'Ödenme Öğe',
     'clone'  					=> 'Demirbaşı Kopyala',
@@ -15,8 +15,8 @@ return [
     'delete_confirm'            => 'Bu ürünü silmek istediğinize eminmisiniz?',
     'edit'  					=> 'Demirbaşı Düzenle',
     'model_deleted'  			=> 'Bu varlık modeli silindi. Varlığı geri almak için modelini geri almalısınız.',
-    'model_invalid'             => 'This model for this asset is invalid.',
-    'model_invalid_fix'         => 'The asset must be updated use a valid asset model before attempting to check it in or out, or to audit it.',
+    'model_invalid'             => 'Bu model bu varlık için değildir.',
+    'model_invalid_fix'         => 'Bu varlık, teslim alma, teslim etme veya denetleme işlemlerinden önce geçerli bir varlık modeli kullanılarak güncellenmelidir.',
     'requestable'               => 'Talep edilebilir',
     'requested'				    => 'Talep edildi',
     'not_requestable'           => 'Talep Edilemez',
@@ -27,13 +27,16 @@ return [
     'undeployable_tooltip'  	=> 'Bu varlığın konuşlandırılamayan ve şu anda teslim alınamayan bir durum etiketi var.',
     'view'  					=> 'Demirbaşı Görüntüle',
     'csv_error' => 'CSV dosyanızda bir hata var:',
-    'import_text' => '<p>Upload a CSV that contains asset history. The assets and users MUST already exist in the system, or they will be skipped. Matching assets for history import happens against the asset tag. We will try to find a matching user based on the user\'s name you provide, and the criteria you select below. If you do not select any criteria below, it will simply try to match on the username format you configured in the <code>Admin &gt; General Settings</code>.</p><p>Fields included in the CSV must match the headers: <strong>Asset Tag, Name, Checkout Date, Checkin Date</strong>. Any additional fields will be ignored. </p><p>Checkin Date: blank or future checkin dates will checkout items to associated user.  Excluding the Checkin Date column will create a checkin date with todays date.</p>
-    ',
-    'csv_import_match_f-l' => 'Try to match users by <strong>firstname.lastname</strong> (<code>jane.smith</code>) format',
-    'csv_import_match_initial_last' => 'Try to match users by <strong>first initial last name</strong> (<code>jsmith</code>) format',
-    'csv_import_match_first' => 'Try to match users by <strong>first name</strong> (<code>jane</code>) format',
-    'csv_import_match_email' => 'Try to match users by <strong>email</strong> as username',
-    'csv_import_match_username' => 'Try to match users by <strong>username</strong>',
+    'import_text' => '<p>Varlık geçmişini içeren bir CSV dosyası yükleyin. Varlıklar ve kullanıcılar sistemde HALİHAZIRDA mevcut olmalıdır, aksi takdirde atlanırlar. Geçmiş aktarımı için varlık eşleştirmesi, varlık etiketi üzerinden yapılır. Sağladığınız kullanıcı adına ve aşağıda seçeceğiniz kriterlere göre eşleşen bir kullanıcı bulmaya çalışacağız. Aşağıda herhangi bir kriter seçmezseniz, yalnızca <code>Yönetici &gt; Genel Ayarlar</code> bölümünde yapılandırdığınız kullanıcı adı biçimiyle eşleştirme yapılacaktır.</p>
+
+<p>CSV dosyasındaki alanlar şu başlıklarla eşleşmelidir: <strong>Varlık Etiketi, Ad, Teslim Alma Tarihi, Teslim Etme Tarihi</strong>. Ekstra alanlar yok sayılacaktır.</p>
+
+<p>Teslim Etme Tarihi: Boş bırakılan veya gelecekteki tarihler, ilgili kullanıcıya varlığı teslim edilmiş olarak gösterecektir. Teslim Etme Tarihi sütunu dahil edilmezse, bugünün tarihi teslim tarihi olarak kullanılır.</p>    ',
+    'csv_import_match_f-l' => 'Kullanıcıları <strong>isim.soyisim</strong> (<code>jane.smith</code>) formatına göre eşleştirmeyi dene',
+    'csv_import_match_initial_last' => 'Kullanıcıları <strong>ilk harf + soyisim</strong> (<code>jsmith</code>) formatına göre eşleştirmeyi dene',
+    'csv_import_match_first' => 'Kullanıcıları <strong>isim</strong> (<code>jane</code>) formatına göre eşleştirmeyi dene',
+    'csv_import_match_email' => 'Kullanıcıları <strong>e-posta</strong> adresini kullanıcı adı olarak kullanarak eşleştirmeyi dene',
+    'csv_import_match_username' => 'Kullanıcıları <strong>kullanıcı adı</strong> ile eşleştirmeyi dene',
     'error_messages' => 'Hata mesajı:',
     'success_messages' => 'Başarı mesajı:',
     'alert_details' => 'Detaylar için aşağıyı okuyun.',
diff --git a/resources/lang/tr-TR/admin/hardware/message.php b/resources/lang/tr-TR/admin/hardware/message.php
index 54e230aaea..450131dc54 100644
--- a/resources/lang/tr-TR/admin/hardware/message.php
+++ b/resources/lang/tr-TR/admin/hardware/message.php
@@ -2,28 +2,32 @@
 
 return [
 
-    'undeployable' 		=> '<strong>Uyarı:</strong> Bu demirbaş dağıtılamaz olarak işlaretlenmiş.
-                        Eğer durumu değişti ise, lütfen Demirbaş Durumu\'nu güncelleyiniz.',
-    'does_not_exist' 	=> 'Demirbaş mevcut değil.',
-    'does_not_exist_var'=> 'Asset with tag :asset_tag not found.',
-    'no_tag' 	        => 'No asset tag provided.',
+    'undeployable' 		 => '<strong>Uyarı: </strong> Bu demirbaş dağıtılamaz durumdadır. Eğer bu durum değişti ise demirbaş durumunu değiştiriniz.',
+    'does_not_exist' 	 => 'Demirbaş mevcut değil.',
+    'does_not_exist_var' => 'Asset with tag :asset_tag not found.',
+    'no_tag' 	         => 'No asset tag provided.',
     'does_not_exist_or_not_requestable' => 'Bu varlık mevcut değil veya talep edilebilir değil.',
-    'assoc_users'	 	=> 'Bu demirbaş kullanıcıya çıkış yapılmış olaran görülüyor ve silinemez. Lütfen önce demirbaş girişi yapınız, ardından tekrar siliniz. ',
+    'assoc_users'	 	 => 'Bu demirbaş kullanıcıya çıkış yapılmış olaran görülüyor ve silinemez. Lütfen önce demirbaş girişi yapınız, ardından tekrar siliniz. ',
     'warning_audit_date_mismatch' 	=> 'This asset\'s next audit date (:next_audit_date) is before the last audit date (:last_audit_date). Please update the next audit date.',
+    'labels_generated'   => 'Labels were successfully generated.',
+    'error_generating_labels' => 'Error while generating labels.',
+    'no_assets_selected' => 'No assets selected.',
 
     'create' => [
         'error'   		=> 'Demirbaş oluşturulamadı, lütfen tekrar deneyin. ',
         'success' 		=> 'Demirbaş oluşturuldu.',
         'success_linked' => 'Etiketli ürün :etiket oluşturuldu. <strong><a href=":link" style="color: white;">Görmek için tıklayın.</a></strong>.',
+        'multi_success_linked' => 'Asset with tag :links was created successfully.|:count assets were created succesfully. :links.',
+        'partial_failure' => 'An asset was unable to be created. Reason: :failures|:count assets were unable to be created. Reasons: :failures',
     ],
 
     'update' => [
         'error'   			=> 'Demirbaş güncellenemedi, lütfen tekrar deneyin',
         'success' 			=> 'Demirbaş güncellendi.',
-        'encrypted_warning' => 'Asset updated successfully, but encrypted custom fields were not due to permissions',
+        'encrypted_warning' => 'Varlık başarıyla güncellendi, ancak şifreli özel alanlar izin nedeniyle güncellenemedi',
         'nothing_updated'	=>  'Hiçbir alan seçilmedi, dolayısıyla hiç bir alan güncellenmedi.',
         'no_assets_selected'  =>  'Hiçbir varlık seçilmedi, bu nedenle hiçbir şey güncellenmedi.',
-        'assets_do_not_exist_or_are_invalid' => 'Selected assets cannot be updated.',
+        'assets_do_not_exist_or_are_invalid' => '',
     ],
 
     'restore' => [
@@ -52,20 +56,24 @@ return [
     ],
 
     'import' => [
+        'import_button'         => 'İçeri aktarma işlemi',
         'error'                 => 'Bazı öğeler doğru şekilde içe aktarılamadı.',
         'errorDetail'           => 'Aşağıdaki öğeler hatalar nedeniyle alınamadı.',
         'success'               => 'Dosyanızı içe aktarıldı',
         'file_delete_success'   => 'Dosyanız başarıyla silindi',
         'file_delete_error'      => 'Dosya silenemedi',
         'file_missing' => 'Seçilen dosya bulunamıyor',
+        'file_already_deleted' => 'The file selected was already deleted',
         'header_row_has_malformed_characters' => 'Başlık bilgisindeki bir veya daha fazla öznitelik, hatalı UTF-8 karakterleri içeriyor',
         'content_row_has_malformed_characters' => 'Başlıktaki ilk satırda bir veya daha fazla öznitelik, hatalı biçimlendirilmiş UTF-8 karakterleri içeriyor',
+        'transliterate_failure' => 'Transliteration from :encoding to UTF-8 failed due to invalid characters in input'
     ],
 
 
     'delete' => [
         'confirm'   	=> 'Demirbaşı silmek istediğinize emin misiniz?',
         'error'   		=> 'Demirbaş silinirken bir problem oluştu. Lütfen tekrar deneyin.',
+        'assigned_to_error' => '{1}Asset Tag: :asset_tag is currently checked out. Check in this device before deletion.|[2,*]Asset Tags: :asset_tag are currently checked out. Check in these devices before deletion.',
         'nothing_updated'   => 'Herhangi bir varlık seçilmediği için silinemedi.',
         'success' 		=> 'Demirbaş silindi.',
     ],
@@ -78,6 +86,11 @@ return [
         'no_assets_selected' => 'Listeden en az bir varlık seçmelisiniz',
     ],
 
+    'multi-checkout' => [
+        'error'   => 'Asset was not checked out, please try again|Assets were not checked out, please try again',
+        'success' => 'Asset checked out successfully.|Assets checked out successfully.',
+    ],
+
     'checkin' => [
         'error'   		=> 'Demirbaş girişi yapılamadı. Lütfen tekrar deneyin',
         'success' 		=> 'Demirbaş girişi yapıldı.',
@@ -87,9 +100,10 @@ return [
     ],
 
     'requests' => [
-        'error'   		=> 'Varlık talep edilmemiş, lütfen tekrar deneyin',
-        'success' 		=> 'Varlık talep edildi.',
-        'canceled'      => 'Varlık talebi reddedildi',
+        'error'   		=> 'Request was not successful, please try again.',
+        'success' 		=> 'Request successfully submitted.',
+        'canceled'      => 'Request successfully canceled.',
+        'cancel'        => 'İsteği iptal et',
     ],
 
 ];
diff --git a/resources/lang/tr-TR/admin/hardware/table.php b/resources/lang/tr-TR/admin/hardware/table.php
index 05d3e62e3f..7dd58068de 100644
--- a/resources/lang/tr-TR/admin/hardware/table.php
+++ b/resources/lang/tr-TR/admin/hardware/table.php
@@ -25,7 +25,6 @@ return [
     'image'		    => 'Cihaz resmi',
     'days_without_acceptance' => 'Kabul edilmeden geçen gün',
     'monthly_depreciation' => 'Aylık Amortisman',
-    'assigned_to'    => 'Atanmış',
     'requesting_user' => 'Talep Sahibi',
     'requested_date' => 'Talep Edilen Tarih',
     'changed'       => 'Değişti',
diff --git a/resources/lang/tr-TR/admin/kits/general.php b/resources/lang/tr-TR/admin/kits/general.php
index 74af52c7e9..68eac0c874 100644
--- a/resources/lang/tr-TR/admin/kits/general.php
+++ b/resources/lang/tr-TR/admin/kits/general.php
@@ -47,4 +47,5 @@ return [
     'kit_deleted'                       => 'Kit başarıyla silindi',
     'kit_model_updated'                 => 'Model başarıyla güncellendi',
     'kit_model_detached'                => 'Model başarıyla ayrıldı',
+    'model_already_attached'            => 'Model already attached to kit',
 ];
diff --git a/resources/lang/tr-TR/admin/licenses/general.php b/resources/lang/tr-TR/admin/licenses/general.php
index ae1cb5c74e..a4955bd828 100644
--- a/resources/lang/tr-TR/admin/licenses/general.php
+++ b/resources/lang/tr-TR/admin/licenses/general.php
@@ -14,6 +14,7 @@ return array(
     'info'  					=> 'Lisans Bilgisi',
     'license_seats'  			=> 'Lisans Kullanıcıları',
     'seat'  					=> 'Kullanıcı',
+    'seat_count'  				=> 'Seat :count',
     'seats'  					=> 'Kullanıcılar',
     'software_licenses'  		=> 'Yazılım Lisansları',
     'user'  					=> 'Kullanıcı',
@@ -23,12 +24,12 @@ return array(
         [
             'checkin_all'           => [
                 'button'            => 'Tüm koltukları ayır',
-                'modal'             => 'Bu, bir koltukta kontrol işlemini gerçekleştirecektir. | Bu işlem, bu lisans için tüm :checkedout_seats_count koltukları kontrol edecektir.',
+                'modal'             => 'This action will checkin one seat. | This action will checkin all :checkedout_seats_count seats for this license.',
                 'enabled_tooltip'   => 'Bu lisans için hem kullanıcılardan hem de varlıklardan TÜM lisansları kontrol edin',
                 'disabled_tooltip'  => 'Şu anda teslim alınmış koltuk olmadığından bu devre dışı bırakıldı',
                 'disabled_tooltip_reassignable'  => 'Lisans yeniden atanamadığı için bu devre dışı bırakıldı',
                 'success'           => 'Lisans başarıyla kontrol edildi! | Tüm lisanslar başarıyla kontrol edildi!',
-                'log_msg'           => 'Lisans GUI\'sinde toplu lisans ödemesi yoluyla giriş yapıldı',
+                'log_msg'           => 'Checked in via bulk license checkin in license GUI',
             ],
 
             'checkout_all'              => [
diff --git a/resources/lang/tr-TR/admin/licenses/message.php b/resources/lang/tr-TR/admin/licenses/message.php
index 2b417a85b4..74eb95aef7 100644
--- a/resources/lang/tr-TR/admin/licenses/message.php
+++ b/resources/lang/tr-TR/admin/licenses/message.php
@@ -44,10 +44,13 @@ return array(
         'error'   => 'Lisans çıkışı yapılırken hata oluştu. Lütfen tekrar deneyin.',
         'success' => 'Lisans çıkışı yapıldı.',
         'not_enough_seats' => 'Ödeme için yeterli sayıda lisans yeri yok',
+        'mismatch' => 'Girdiğiniz bu lisans türü lisans ile eşleşmiyor',
+        'unavailable' => 'Bu varlığı atayamazsınız.',
     ),
 
     'checkin' => array(
         'error'   => 'Lisans girişi yapılırken hata oluştu. Lütfen tekrar deneyin.',
+        'not_reassignable' => 'License not reassignable',
         'success' => 'Lisans girişi yapıldı'
     ),
 
diff --git a/resources/lang/tr-TR/admin/locations/message.php b/resources/lang/tr-TR/admin/locations/message.php
index ff8b6cee9a..95f4484c13 100644
--- a/resources/lang/tr-TR/admin/locations/message.php
+++ b/resources/lang/tr-TR/admin/locations/message.php
@@ -3,11 +3,12 @@
 return array(
 
     'does_not_exist' => 'Konum mevcut değil.',
-    'assoc_users'    => 'This location is not currently deletable because it is the location of record for at least one asset or user, has assets assigned to it, or is the parent location of another location. Please update your models to no longer reference this company and try again. ',
+    'assoc_users'    => 'This location is not currently deletable because it is the location of record for at least one asset or user, has assets assigned to it, or is the parent location of another location. Please update your records to no longer reference this location and try again ',
     'assoc_assets'	 => 'Bu konum şu anda en az bir varlık ile ilişkili ve silinemez. Lütfen artık bu konumu kullanabilmek için varlık konumlarını güncelleştirin.',
     'assoc_child_loc'	 => 'Bu konum şu anda en az bir alt konum üstüdür ve silinemez. Lütfen artık bu konuma ait alt konumları güncelleyin. ',
     'assigned_assets' => 'Atanan Varlıklar',
     'current_location' => 'Mevcut konum',
+    'open_map' => 'Open in :map_provider_icon Maps',
 
 
     'create' => array(
@@ -20,6 +21,11 @@ return array(
         'success' => 'Konum güncellendi.'
     ),
 
+    'restore' => array(
+        'error'   => 'Location was not restored, please try again',
+        'success' => 'Location restored successfully.'
+    ),
+
     'delete' => array(
         'confirm'   	=> 'Konumu silmek istediğinize emin misiniz?',
         'error'   => 'Konum silinirken bir hata oluştu. Lütfen tekrar deneyin.',
diff --git a/resources/lang/tr-TR/admin/locations/table.php b/resources/lang/tr-TR/admin/locations/table.php
index a936e4a5c9..21a224cb6c 100644
--- a/resources/lang/tr-TR/admin/locations/table.php
+++ b/resources/lang/tr-TR/admin/locations/table.php
@@ -39,4 +39,5 @@ return [
     'signed_by_finance_auditor' => 'İmzalayan (Maliye Denetçisi):',
     'signed_by_location_manager' => 'İmzalayan (Mekan Sorumlusu):',
     'signed_by'                 => 'İmzalayan:',
+    'clone'  					=> 'Clone Location',
 ];
diff --git a/resources/lang/tr-TR/admin/models/general.php b/resources/lang/tr-TR/admin/models/general.php
index c0019c4c7b..1242572660 100644
--- a/resources/lang/tr-TR/admin/models/general.php
+++ b/resources/lang/tr-TR/admin/models/general.php
@@ -3,7 +3,7 @@
 return array(
     'about_models_title'     => 'Varlık Modelleri Hakkında',
     'about_models_text'           => 'Varlık Modelleri, özdeş varlıkları gruplamanın bir yoludur. Örn: "Tiny M73", "Samsung A7", vb.',
-    'deleted'  					        => 'Bu model silindi.',
+    'deleted'  					=> 'Bu model silindi.',
     'bulk_delete'               => 'Varlık Modellerini Toplu Silme',
     'bulk_delete_help'               => 'Seçilen varlık modelleri silme işlemini onaylamak için aşağıdaki onay kutularını kullanın. Başka bir varlık modeli ile ilişkilendirilmiş olan varlık modelleri, başka bir varlık modeli ile ilişkilendirilmeden silinemez.',
     'bulk_delete_warn'          => 'Bir varlık modelini silmek üzeresiniz.| :model_count varlık modellerini silmek üzeresiniz.',
diff --git a/resources/lang/tr-TR/admin/models/message.php b/resources/lang/tr-TR/admin/models/message.php
index 85c12dcc29..5df9086a16 100644
--- a/resources/lang/tr-TR/admin/models/message.php
+++ b/resources/lang/tr-TR/admin/models/message.php
@@ -7,7 +7,7 @@ return array(
     'no_association' => 'UYARI! Bu öğeye ilişkin varlık modeli geçersiz veya eksik!',
     'no_association_fix' => 'Bu değişiklik bazı şeylerin garip ve tuhaf bir şekilde bozulmasına yol açabilir. Bu varlığı bir modelle ilişkilendirmek için düzeltin.',
     'assoc_users'	 => 'Model bir ya da daha çok demirbaş ile ilişkili ve silinemez. Lütfen demirbaşları silin ve tekrar deneyin. ',
-
+    'invalid_category_type' => 'This category must be an asset category.',
 
     'create' => array(
         'error'   => 'Klasör oluşturulmadı, lütfen tekrar deneyin.',
diff --git a/resources/lang/tr-TR/admin/reports/general.php b/resources/lang/tr-TR/admin/reports/general.php
index b6f991ecbf..61fac0b6ee 100644
--- a/resources/lang/tr-TR/admin/reports/general.php
+++ b/resources/lang/tr-TR/admin/reports/general.php
@@ -4,6 +4,7 @@ return [
     'info'   => 'Demirbaş Raporu için istediğiniz seçenekleri seçiniz.',
     'deleted_user' => 'Kullanıcı silindi',
     'send_reminder' => 'Hatırlatma gönder',
+    'cannot_send_reminder' => 'User has been deleted or does not have an email address so cannot receive a reminder',
     'reminder_sent' => 'Hatırlatıcı gönderildi',
     'acceptance_deleted' => 'Kabul talebi silindi',
     'acceptance_request' => 'Kabul talebi',
@@ -13,5 +14,10 @@ return [
         'user_state' => 'Kullanıcı Durumu',
         'user_country' => 'Kullanıcı Ülkesi',
         'user_zip' => 'Kullanıcı Posta Kodu'
-    ]
-];
\ No newline at end of file
+    ],
+    'open_saved_template' => 'Open Saved Template',
+    'save_template' =>  'Save Template',
+    'select_a_template' => 'Select a Template',
+    'template_name' => 'Template Name',
+    'update_template' => 'Update Template',
+];
diff --git a/resources/lang/tr-TR/admin/reports/message.php b/resources/lang/tr-TR/admin/reports/message.php
index ab916a50aa..2800bbdf0b 100644
--- a/resources/lang/tr-TR/admin/reports/message.php
+++ b/resources/lang/tr-TR/admin/reports/message.php
@@ -1,5 +1,16 @@
 <?php
 
-return array(
-    'error'   => 'En az 1 seçenek seçmeniz gerekiyor.'
-);
+return [
+    'about_templates' => 'About Saved Templates',
+    'saving_templates_description' => 'Select your options, then enter the name of your template in the box above and click the \'Save Template\' button. Use the dropdown to select a previously saved template.',
+    'create'  => [
+        'success' => 'Template saved successfully',
+    ],
+    'update' => [
+        'success' => 'Template updated successfully',
+    ],
+    'delete' => [
+        'success' => 'Template deleted',
+        'no_delete_permission' => 'Template does not exist or you do not have permission to delete it.',
+    ],
+];
diff --git a/resources/lang/tr-TR/admin/settings/general.php b/resources/lang/tr-TR/admin/settings/general.php
index a1d7d03d08..521d840e65 100644
--- a/resources/lang/tr-TR/admin/settings/general.php
+++ b/resources/lang/tr-TR/admin/settings/general.php
@@ -8,13 +8,13 @@ return [
     'ad_append_domain'          => 'Alan adını kullanıcı adının sonuna ekle',
     'ad_append_domain_help'     => 'Kullanıcı "kullanıcıadı@alan.adı" yazmak zorunda değil, bunun yerine "kullanıcıadı" yazabilir.',
     'admin_cc_email'            => 'CC e-Posta',
-    'admin_cc_email_help'       => 'Kullanıcılar bir ek e-posta hesabına gönderilen iade etme/kullanıma alma e-posta bir kopyasını göndermek isterseniz, buraya girin. Aksi takdirde bu alanı boş bırakın.',
+    'admin_cc_email_help'       => 'Bu adrese teslimat/geri alma e-postalarının bir kopyasını gönder.',
     'admin_settings'            => 'Yönetici Ayarları',
     'is_ad'				        => 'Active Directory sunucusudur',
     'alerts'                	=> 'Uyarı',
     'alert_title'               => 'Günceleme Uyarı Ayarları',
     'alert_email'				=> 'Uyarıları gönder',
-    'alert_email_help'    => 'Uyarıların gönderileceği mail adresini yazınız. Virgül ile ayırarak farklı mailler de yazabilirsiniz',
+    'alert_email_help'          => 'Uyarıların gönderileceği mail adresini yazınız. Virgül ile ayırarak farklı mailler de yazabilirsiniz.',
     'alerts_enabled'			=> 'Uyarılar etkinleştirildi',
     'alert_interval'			=> 'Uyarı bitiş zamanı (gün içinde)',
     'alert_inv_threshold'		=> 'Son uyarı zamanı',
@@ -31,15 +31,18 @@ return [
     'backups'					=> 'Yedekler',
     'backups_help'              => 'Yedekler oluşturun, indirin ve geri yükleyin ',
     'backups_restoring'         => 'Yedekten geri dön',
+    'backups_clean' => 'Clean the backed-up database before restore',
+    'backups_clean_helptext' => "This can be useful if you're changing between database versions",
     'backups_upload'            => 'Yedeği yükle',
     'backups_path'              => 'Yedeklerin sunucuda saklanacağı yer <code>:path</code>',
-    'backups_restore_warning'   => 'Geri yükleme düğmesini kullanın<small><span class="btn btn-xs btn-warning"><i class="text-white fas fa-retweet" aria-hidden="true"><i class="text-white fas fa-retweet" aria-hidden="true"></i></span></small>Önceki bir yedeklemeden geri yüklemek için. (Bu şu anda S3 dosya depolama veya Docker ile çalışmamaktadır.)<br><br>Senin<strong>:app_name veritabanının tamamı ve yüklenen dosyalar tamamen değiştirilecek</strong>Yedekleme dosyasında ne olduğuna göre.  ',
+    'backups_restore_warning'   => 'Use the restore button <small><span class="btn btn-xs btn-warning"><i class="text-white fas fa-retweet" aria-hidden="true"></i></span></small> to restore from a previous backup. (This does not currently work with S3 file storage or Docker.)<br><br>Your <strong>entire :app_name database and any uploaded files will be completely replaced</strong> by what\'s in the backup file  ',
     'backups_logged_out'         => 'Geri yüklemeniz tamamlandıktan sonra, siz de dahil olmak üzere, tüm mevcut kullanıcıların oturumu kapatılacaktır.',
     'backups_large'             => 'Çok büyük yedeklemeler, geri yükleme girişiminde zaman aşımına uğrayabilir ve komut satırı üzerinden çalıştırılması gerekebilir. ',
     'barcode_settings'			=> 'Barkod Ayarları',
     'confirm_purge'			    => 'Temizleme Onayı',
     'confirm_purge_help'		=> 'Silinmiş kayıtlarınızı temizlemek için aşağıdaki kutuya "DELETE" yazın. Bu işlem geri alınamaz ve silinmiş tüm eşya ve kullanıcılar KALICI OLARAK silinir. (Güvende olabilmek için öncelikle bir yedek almalısınız.)',
     'custom_css'				=> 'Özel CSS',
+    'custom_css_placeholder'	=> 'Add your custom CSS',
     'custom_css_help'			=> 'Kullanmak istediğiniz özel CSS geçersiz. &lt;style&gt;&lt;/style&gt; etiketlerini kullanmayın.',
     'custom_forgot_pass_url'	=> 'Özel Parola Sıfırlama URL\'si',
     'custom_forgot_pass_url_help'	=> 'Burası, oturum açma ekranında yer alan unutulmuş şifre URL\'sinin yerini alır, kullanıcıları dahili veya barındırılan LDAP parola sıfırlama fonksiyonuna yönlendirmek için kullanışlıdır. Yerel kullanıcıların unuttuğu şifre işlevselliğini etkili bir şekilde devre dışı bırakacaktır.',
@@ -47,34 +50,34 @@ return [
     'dashboard_message_help'	=> 'Bu metin kontrol panelini görme yetkisi olan herkes tarafından görüntülenir.',
     'default_currency'  		=> 'Varsayılan Para Birimi',
     'default_eula_text'			=> 'Varsayılan Sözleşme',
+    'default_eula_text_placeholder' => 'Add your default EULA text',
     'default_language'			=> 'Varsayılan Dil',
     'default_eula_help_text'	=> 'Özel Demirbaş Kategorileri için özel Son Kullanıcı Lisans Sözleşmesi ilişkilendirebilirsiniz.',
     'acceptance_note'           => 'Add a note for your decision (Optional)',
     'display_asset_name'        => 'Demirbaş Adı Göster',
     'display_checkout_date'     => 'Çıkış Tarihi Göster',
     'display_eol'               => 'Tablo görüntüsünde Sözleşmeyi görüntüle',
-    'display_qr'                => 'QR Kodu Göster',
+    'display_qr'                => 'Display 2D barcode',
     'display_alt_barcode'		=> '1D Barkodu Göster',
-    'email_logo'                => 'E-posta logosu',
     'barcode_type'				=> '2D Barkod Türü',
     'alt_barcode_type'			=> '1D Barkod Türü',
-    'email_logo_size'       => 'E-posta iletilerinde kare biçimli logolar önerilir. ',
     'enabled'                   => 'Etkin',
     'eula_settings'				=> 'Son Kullanıcı Lisans Sözleşmesi Ayarları',
     'eula_markdown'				=> 'This EULA allows <a href="https://help.github.com/articles/github-flavored-markdown/">Github flavored markdown</a>.',
+    'empty_row_count'           => 'Field Start Offset (Empty Rows)',
+    'empty_row_count_help'      => 'Alanlar, etiketin üst kısmında bu kadar boş satır atlandıktan sonra dolmaya başlayacaktır.',
     'favicon'                   => 'Favicon',
     'favicon_format'            => 'Kabul edilebilir dosya türleri ico, png ve gif uzantılı dosyalardır. Diğer türden dosyaların tarayıcı uyumluluğu kesin değildir.',
     'favicon_size'          => 'Simgesel belirtecin büyüklüğü 16x16 piksel kare şeklinde olmalıdır.',
     'footer_text'               => 'Ek Altbilgi Metni ',
     'footer_text_help'          => 'Bu metin altbilginin sağ köşesinde görünür. Linklerde <a href="https://help.github.com/articles/github-flavored-markdown/">Github flavored markdown</a> şeklinde kullanıma izin verilir. Satır sonu, satır başı, resimler vb. gibi içerikler beklenmeyen sonuçlara sebep olabilir.',
+    'footer_text_placeholder'   => 'Optional footer text',
     'general_settings'			=> 'Genel Ayarlar',
-    'general_settings_keywords' => 'company support, signature, acceptance, email format, username format, images, per page, thumbnail, eula, gravatar, tos, dashboard, privacy',
     'general_settings_help'     => 'Varsayılan EULA ve fazlası',
     'generate_backup'			=> 'Yedek Oluştur',
     'google_workspaces'         => 'Google Workspaces',
     'header_color'              => 'Başlık rengi',
     'info'                      => 'Bu ayarlardan kurulum görünüşünüzü kişiselleştirebilirsiniz.',
-    'label_logo'                => 'Etiket Logosu',
     'label_logo_size'           => 'En güzel görünen logolar kare şeklindeki logolardır - her ürün etiketinin sağ üst bölümünde görüntülenir. ',
     'laravel'                   => 'Laravel Version',
     'ldap'                      => 'LDAP',
@@ -94,7 +97,7 @@ return [
     'ldap_login_sync_help'      => 'Bu sadece LDAP\'ın doğru şekilde senkron edilebildiğini test eder. Eğer LDAP Kimlik Doğrulama sorgunuz doğru değilse, kullanıcılar giriş yapamayabilirler. ÖNCE GÜNCEL LDAP AYARLARINI KAYDETMELİSİN.',
     'ldap_manager'              => 'LDAP Yöneticisi',
     'ldap_server'               => 'LDAP Sunucu',
-    'ldap_server_help'          => 'ldap:// (şifrelenmemiş veya TLS) veya ldaps:// (SSL için) ile başlamalıdır',
+    'ldap_server_help'          => 'This should start with ldap:// (for unencrypted) or ldaps:// (for TLS or SSL)',
     'ldap_server_cert'			=> 'LDAP SSL sertifikası doğrulama',
     'ldap_server_cert_ignore'	=> 'Geçersiz SSL sertifikası kabul et',
     'ldap_server_cert_help'		=> 'Kendinden imzalı bir SSL sertifikası kullanıyorsanız ve geçersiz bir SSL sertifikası kabul etmek istiyorsanız bu onay kutusunu seçin.',
@@ -108,8 +111,8 @@ return [
     'ldap_pword'                => 'LDAP Bind Parola',
     'ldap_basedn'               => 'Base Bind DN',
     'ldap_filter'               => 'LDAP filtre',
-    'ldap_pw_sync'              => 'LDAP Parola Senkronu',
-    'ldap_pw_sync_help'         => 'LDAP şifrelerinin yerel parolalarla senkronize edilmesini istemiyorsanız, bu onay kutusunun işaretini kaldırın. Bu durumun devre dışı bırakılması, LDAP sunucunuza herhangi bir nedenle ulaşılamazsa, kullanıcılarınızın oturum açamayabileceği anlamına gelir.',
+    'ldap_pw_sync'              => 'Cache LDAP Passwords',
+    'ldap_pw_sync_help'         => 'Uncheck this box if you do not wish to keep LDAP passwords cached as local hashed passwords. Disabling this means that your users may not be able to login if your LDAP server is unreachable for some reason.',
     'ldap_username_field'       => 'Kullanıcı Adı Alanı',
     'ldap_lname_field'          => 'Soyadı',
     'ldap_fname_field'          => 'LDAP adı',
@@ -117,13 +120,15 @@ return [
     'ldap_version'              => 'LDAP versiyon',
     'ldap_active_flag'          => 'LDAP etkin bayrak',
     'ldap_activated_flag_help'  => 'Bu değer, senkronize edilmiş bir kullanıcının Snipe-IT\'de oturum açıp açamayacağını belirlemek için kullanılır. Girdiğiniz değer AD/LDAP tarafındaki Attribute ismi ile aynı olmamalı. Bu alana girdiğiniz değer AD/LDAP üzerinde yok ise veya değeri 0 ise kullanıcı girişi devre dışı kalacaktır. Eğer Attribute değeri 1, true yada başka bir metin ise kullanıcı girişine izin verilecektir. Eğer Attribute değeri boş bırakılmış ve kullanıcı askıya alınmamış ise userAccountControl ayarı esas alınacaktır.',
+    'ldap_invert_active_flag'   => 'LDAP Invert Active Flag',
+    'ldap_invert_active_flag_help'     => 'If enabled: when the value returned by LDAP Active Flag is <code>0</code> or <code>false</code> the user account will be active.',
     'ldap_emp_num'              => 'LDAP Çalışan Numarası',
     'ldap_email'                => 'LDAP Mail',
     'ldap_test'                 => 'Test LDAP',
     'ldap_test_sync'            => 'LDAP Senkronizasyonunu test et',
     'license'                   => 'Yazılım Lisansı',
-    'load_remote'               => 'Use Gravatar',
-    'load_remote_help_text'		=> 'Uncheck this box if your install cannot load scripts from the outside internet. This will prevent Snipe-IT from trying load images from Gravatar.',
+    'load_remote'               => 'Load Remote Avatars',
+    'load_remote_help_text'		=> 'Uncheck this box if your install cannot load scripts from the outside internet. This will prevent Snipe-IT from trying load avatars from Gravatar or other outside sources.',
     'login'                     => 'Giriş Denemesi',
     'login_attempt'             => 'Giriş Denemesi',
     'login_ip'                  => 'İp adresi',
@@ -131,6 +136,7 @@ return [
     'login_user_agent'          => 'Kullanıcı Aracısı',
     'login_help'                => 'Giriş Denemeleri Listesi',
     'login_note'                => 'Giriş Notu',
+    'login_note_placeholder'            => "If you do not have a login or have found a device belonging to this company, please call technical support at 888-555-1212. Thank you.",
     'login_note_help'           => 'İsteğe bağlı olarak, kaybolan veya çalınan bir cihaz bulan kişilere yardımcı olması için giriş ekranınıza birkaç cümle ekleyin. Bu alan <a href="https://help.github.com/articles/github-flavored-markdown/">Github aromalı markdown</a> kabul eder',
     'login_remote_user_text'    => 'Uzak Kullanıcı oturum açma seçenekleri',
     'login_remote_user_enabled_text' => 'Uzak Kullanıcı başlığı ile Login etkinleştirmek',
@@ -146,13 +152,16 @@ return [
     'logo_print_assets_help'    => 'Yazdırılabilir varlık listelerinde marka kullan ',
     'full_multiple_companies_support_help_text' => 'Kısıtlı kullanıcılar Firmaların varlıkları için firmalara atanmıştır.',
     'full_multiple_companies_support_text' => 'Birden Fazla Şirket Desteği',
+    'scope_locations_fmcs_support_text'  => 'Scope Locations with Full Multiple Companies Support',
+    'scope_locations_fmcs_support_help_text'  => 'Restrict locations to their selected company.',
+    'scope_locations_fmcs_check_button' => 'Check Compatibility',
+    'scope_locations_fmcs_support_disabled_text'  => 'This option is disabled because you have conflicting locations set for :count or more items.',
     'show_in_model_list'   => 'Model açılır menüsünde göster',
     'optional'					=> 'İsteğe bağlı',
     'per_page'                  => 'Sayfa başına sonuç sayısı',
     'php'                       => 'PHP Versiyonu',
-    'php_info'                  => 'PHP Bilgisi',
+    'php_info'                  => 'PHP bilgisi',
     'php_overview'              => 'PHP',
-    'php_overview_keywords'     => 'phpinfo, system, info',
     'php_overview_help'         => 'PHP System info',
     'php_gd_info'               => 'QR Kodlarını görüntülemek için php-gd yüklemelisiniz, kurulum talimatlarına bakınız.',
     'php_gd_warning'            => 'PHP Image Processing ve GD eklentileri yüklü değil.',
@@ -219,6 +228,8 @@ return [
 <a href=":webhook_link" target="_new" rel="noopener">gelen bir webhook oluştur</a>:app hesabınızda. Tıkla<strong>Test :app Entegrasyonu</strong>Kaydetmeden önce ayarlarınızın doğru olduğunu onaylamak için düğmesine basın. ',
     'webhook_integration_help_button'    => ':app bilgilerinizi kaydettikten sonra bir test düğmesi görünecektir.',
     'webhook_test_help'           => ':app entegrasyonunuzun doğru yapılandırılıp yapılandırılmadığını test edin. ÖNCE GÜNCELLENMİŞ :app AYARLARINIZI KAYDETMENİZ GEREKİR.',
+    'shortcuts_enabled'         => 'Enable Shortcuts',
+    'shortcuts_help_text'       => '<strong>Windows</strong>: Alt + Access key, <strong>Mac</strong>: Control + Option + Access key',
     'snipe_version'  			=> 'Snipe-IT version',
     'support_footer'            => 'Destek Bağlantıları Altbilgisi ',
     'support_footer_help'       => 'Snipe-IT destek, bilgi ve Kullanıcı Kılavuzu linklerini kimin göreceğini seçin',
@@ -228,7 +239,6 @@ return [
     'update'                    => 'Ayarları Güncelle',
     'value'                     => 'Değer',
     'brand'                     => 'Marka',
-    'brand_keywords'            => 'alt bilgi, logo, baskı, tema, cilt, üst bilgi, renkler, renk ve css ayarları',
     'brand_help'                => 'Logo, Site Adı',
     'web_brand'                 => 'Web Markalama Türü',
     'about_settings_title'      => 'Ayarlar Hakkında',
@@ -277,6 +287,8 @@ return [
     'two_factor_enrollment_text'	=> "Cihazınız henüz kayıtlı değil ancak iki aşamalı kimlik doğrulama gereklidir. Google kimlik doğrulayıcısı app açmak ve tarama QR kodu cihazınızı kayıt için aşağıdaki. Aygıtınız kayıtlı sonra aşağıdaki kodu girin",
     'require_accept_signature'      => 'İmza Gerekli',
     'require_accept_signature_help_text'      => 'Bu özelliği etkinleştirmek kullanıcıların fiziksel olarak bir varlık kabul evrağı imzalaması gerekir.',
+    'require_checkinout_notes'  => 'Require Notes on Checkin/Checkout',
+    'require_checkinout_notes_help_text'    => 'Enabling this feature will require the note fields to be populated when checking in or checking out an asset.',
     'left'        => 'sol',
     'right'        => 'sağ',
     'top'        => 'üst',
@@ -314,24 +326,24 @@ return [
     'filter_by_keyword' => 'Anahtar kelime ile filtreleyin',
     'security' => 'Güvenlik',
     'security_title' => 'Güvenlik ayarlarını güncelle',
-    'security_keywords' => 'parolalar, gereksinimler, iki faktörlü, iki faktörlü, ortak parolalar, uzaktan oturum açma, oturum kapatma ve kimlik doğrulama',
     'security_help' => 'İki adımlı kimlik doğrulama',
-    'groups_keywords' => 'izinler, izin grupları, yetkilendirme',
     'groups_help' => 'Hesap izin grupları',
     'localization' => 'Yerelleştirme',
     'localization_title' => 'Yerelleştirme ayarlarını güncelle',
-    'localization_keywords' => 'yerelleştirme, para birimi, yerel, yerel ayar, saat dilimi, saat dilimi, uluslararası, uluslararasılaştırma, dil, diller, çeviri',
     'localization_help' => 'Dil, Tarih biçimi',
     'notifications' => 'Bilfirimler',
     'notifications_help' => 'E-posta Uyarıları ve Denetim Ayarları',
     'asset_tags_help' => 'Artış ve örnekler',
     'labels' => 'Etiket',
     'labels_title' => 'Etiket ayarlarını güncelle',
-    'labels_help' => 'Etiket tasarımı &amp;',
-    'purge_keywords' => 'kalıcı olarak sil',
+    'labels_help' => 'Barcodes &amp; label settings',
     'purge_help' => 'Silinen kayıtları temizle',
     'ldap_extension_warning' => 'Bu sunucuda LDAP uzantısı yüklü veya etkin değil gibi görünüyor. Ayarlarınızı yine de kaydedebilirsiniz, ancak LDAP senkronizasyonu veya oturum açma işleminin çalışması için PHP için LDAP uzantısını etkinleştirmeniz gerekir.',
     'ldap_ad' => 'LDAP/AD',
+    'ldap_test_label' => 'Test LDAP Sync',
+    'ldap_test_login' => ' Test LDAP Login',
+    'ldap_username_placeholder' => 'LDAP Username',
+    'ldap_password_placeholder' => 'LDAP Password',
     'employee_number' => 'Çalışan Sayısı',
     'create_admin_user' => 'Kullanıcı Oluştur::',
     'create_admin_success' => 'Başarılı! Admin kullanıcısı eklendi!',
@@ -343,6 +355,8 @@ return [
     'setup_migration_create_user' => 'Sıradaki: Kullanıcı oluştur',
     'ldap_settings_link' => 'LDAP Ayarları Sayfası',
     'slack_test' => '<i class="fab fa-slack"> entegrasyonunu dene',
+    'status_label_name' => 'Status Label Name',
+    'super_admin_only'  => 'Super Admin Only',
     'label2_enable'           => 'Yeni etiket motoru',
     'label2_enable_help'      => 'Yeni etiket motoruna geçiş. Not: Diğerine geçmeden önce burada yaptığınız değişiklikleri kaydedin',
     'label2_template'         => 'Tema',
@@ -357,12 +371,15 @@ return [
     'label2_2d_type'          => '2D Barkod Türü',
     'label2_2d_type_help'     => '2D barkodlar için format',
     'label2_2d_target'        => '2D Barkod Hedefi',
-    'label2_2d_target_help'   => '2D barkodun tarandığında işaret ettiği URL',
+    'label2_2d_target_help'   => 'The data that will be contained in the 2D barcode',
     'label2_fields'           => 'Alan Tanımları',
     'label2_fields_help'      => 'Alanlar sol sütuna eklenebilir, kaldırılabilir ve yeniden sıralanabilir. Her alan için sağ sütunda Etiket ve Veri Kaynağı için birden fazla seçenek eklenebilir, kaldırılabilir ve yeniden sıralanabilir.',
+    'purge_barcodes' => 'Purge Barcodes',
     'help_asterisk_bold'    => 'Text entered as <code>**text**</code> will be displayed as bold',
     'help_blank_to_use'     => '<code>:setting_name</code> değerini kullanmak için boş bırakın',
-    'help_default_will_use' => '<code>:default</code>, <code>:setting_name</code>\'deki değeri kullanacaktır. <br>Başarılı bir şekilde oluşturulabilmesi için barkodların değerinin ilgili barkod spesifikasyonuna uygun olması gerektiğini unutmayın. Daha fazla ayrıntı için lütfen <a href="https://snipe-it.readme.io/docs/barcodes">belgelere <i class="fa fa-external-link"></i></a> bakın. ',
+    'help_default_will_use' => '<code>:default</code> will use the value from <code>:setting_name</code>. <br>Note that the value of the barcodes must comply with the respective barcode spec in order to be successfully generated. Please see <a href="https://snipe-it.readme.io/docs/barcodes">the documentation <i class="fa fa-external-link"></i></a> for more details. ',
+    'asset_id'              => 'Asset ID',
+    'data'               => 'Data',
     'default'               => 'Varsayılan',
     'none'                  => 'Hiçbiri',
     'google_callback_help' => 'Bu, kuruluşunuzun <strong><a href="https://console.cloud.google.com/" target="_blank">Google geliştirici konsolundaki < Google OAuth uygulama ayarlarınıza geri arama URL\'si olarak girilmelidir. i class = "fa fa-external-link" aria-hidden = "true"></i></a></strong>.',
@@ -374,7 +391,100 @@ return [
     'database_driver' => 'Veritabanı Sürücüsü',
     'bs_table_storage' => 'Tablo Depolama',
     'timezone' => 'Zaman Dilimi',
-    'profile_edit'          => 'Edit Profile',
+    'test_mail' => 'Test Postası',
+    'profile_edit'          => 'Profili Düzenle',
     'profile_edit_help'          => 'Allow users to edit their own profiles.',
+    'default_avatar' => 'Custom Default Avatar',
+    'default_avatar_help' => 'Kullanıcı profil fotoğrafı yüklememişse bu görsel profil fotoğrafı olacak.',
+    'restore_default_avatar' => 'Restore <a href=":default_avatar" data-toggle="lightbox" data-type="image">original system default avatar</a>',
+    'restore_default_avatar_help' => '',
+    'due_checkin_days' => 'Due For Checkin Warning',
+    'due_checkin_days_help' => 'How many days before the expected checkin of an asset should it be listed in the "Due for checkin" page?',
+    'no_groups' => 'No groups have been created yet. Visit <code>Admin Settings > Permission Groups</code> to add one.',
+    'text' => 'Text',
+
+    'username_formats' => [
+        'username_format'		=> 'Kullanıcı Adı Biçimi',
+        'firstname_lastname_format'	=> 'Ad Soyad (jane.smith)',
+        'first_name_format'	        => 'First Name (jane)',
+        'last_name_format'		=> 'Last Name (doe)',
+        'filastname_format'			=> 'First Initial Last Name (jsmith)',
+        'lastnamefirstinitial_format' =>  'Last Name First Initial (smithj)',
+        'firstname_lastname_underscore_format' => 'First Name Last Name (jane_smith)',
+        'firstinitial.lastname' => 'First Initial Last Name (j.smith)',
+        'lastname_firstinitial' => 'Last Name First Initial (smith_j)',
+        'lastname_dot_firstinitial_format' => 'Last Name First Initial (smith.j)',
+        'firstnamelastname'     => 'First Name Last Name (janesmith)',
+        'firstnamelastinitial'  => 'First Name Last Initial (janes)',
+        'lastnamefirstname'      => 'Last Name.First Name (smith.jane)',
+    ],
+
+    'email_formats' => [
+        'email_format'			=> 'E-posta Biçimi',
+        'firstname_lastname_format'	=> 'Ad Soyad (jane.smith@example.com)',
+        'first_name_format'		=> 'Ad (jane@example.com)',
+        'last_name_format'		=> 'Last Name (doe@example.com)',
+        'filastname_format'			=> 'Adın İlk Harfi ve Soyad (jsmith@example.com)',
+        'lastnamefirstinitial_format' =>  'Soyad ve Adın İlk Harfi (smithj@example.com)',
+        'firstname_lastname_underscore_format' => 'Ad Soyad (jane.smith@example.com)',
+        'firstinitial.lastname' => 'Adın İlk Harfi ve Soyad (j.smith@example.com)',
+        'lastname_firstinitial' => 'Soyad ve Adın İlk Harfi (smith_j@example.com)',
+        'lastname_dot_firstinitial_format' => 'Last Name First Initial (smith.j@example.com)',
+        'firstnamelastname'     => 'Ad Soyad (janesmith@example.com)',
+        'firstnamelastinitial'  => 'Ad ve Soyadın İlk Harfi (janes@example.com)',
+        'lastnamefirstname'      => 'Soyisim.isim',
+    ],
+
+
+
+    'logo_labels' => [
+        'acceptance_pdf_logo'       => 'PDF Logo',
+        'email_logo'                => 'E-posta logosu',
+        'label_logo'                => 'Etiket Logosu',
+        'logo'                      => 'Site Logo',
+        'favicon'                   => 'Favicon',
+    ],
+
+    'logo_help' => [
+        'email_logo_size'       => 'E-posta iletilerinde kare biçimli logolar önerilir. ',
+    ],
+
+    'logo_option_types' => [
+        'text' => 'Text',
+        'logo' => 'Logo',
+        'logo_and_text' => 'Logo and Text',
+    ],
+
+
+    'legends' => [
+        'scoping' => 'Scoping',
+        'formats' => 'Default Formats',
+        'profiles' => 'User Profiles',
+        'eula' => 'EULA & Acceptance Preferences',
+        'misc_display' => 'Miscellaneous Display Options',
+        'email' => 'Email Preferences',
+        'checkin' => 'Checkin Preferences',
+        'dashboard' => 'Login & Dashboard Preferences',
+        'misc' => 'Miscellaneous',
+        'logos' => 'Logos & Display',
+        'colors' => 'Colors & Skins',
+        'footer' => 'Footer Preferences',
+        'security' => 'Security Preferences',
+        'general' => 'General',
+        'intervals' => 'Intervals & Thresholds',
+    ],
+
+
+    /* Keywords for settings overview help */
+    'keywords' => [
+        'brand'             => 'alt bilgi, logo, baskı, tema, cilt, üst bilgi, renkler, renk ve css ayarları',
+        'general_settings'  => 'company support, signature, acceptance, email format, username format, images, per page, thumbnail, eula, gravatar, tos, dashboard, privacy',
+        'groups'            => 'izinler, izin grupları, yetkilendirme',
+        'labels'            => 'labels, barcodes, barcode, sheets, print, upc, qr, 1d, 2d',
+        'localization'      => 'yerelleştirme, para birimi, yerel, yerel ayar, saat dilimi, saat dilimi, uluslararası, uluslararasılaştırma, dil, diller, çeviri',
+        'php_overview'      => 'phpinfo, system, info',
+        'purge'             => 'kalıcı olarak sil',
+        'security'          => 'parolalar, gereksinimler, iki faktörlü, iki faktörlü, ortak parolalar, uzaktan oturum açma, oturum kapatma ve kimlik doğrulama',
+    ],
 
 ];
diff --git a/resources/lang/tr-TR/admin/settings/message.php b/resources/lang/tr-TR/admin/settings/message.php
index 7c922fbcde..e8d7f20eef 100644
--- a/resources/lang/tr-TR/admin/settings/message.php
+++ b/resources/lang/tr-TR/admin/settings/message.php
@@ -14,6 +14,9 @@ return [
         'restore_warning'       => 'Evet, geri yükleyin. Bunun, şu anda veritabanında bulunan mevcut verilerin üzerine yazılacağını kabul ediyorum. Bu aynı zamanda (siz dahil) tüm mevcut kullanıcılarınızın oturumunu kapatacaktır.',
         'restore_confirm'       => 'Veritabanınızı :filename\'den geri yüklemek istediğinizden emin misiniz?'
     ],
+    'restore' => [
+        'success'               => 'Your system backup has been restored. Please log in again.'
+    ],
     'purge' => [
         'error'     => 'Temizleme sırasında bir hata oluştu. ',
         'validation_failed'     => 'Temizle onay kodu yanlıştır. Lütfen onay kutusuna "DELETE" yazın.',
@@ -33,6 +36,9 @@ return [
         'testing_authentication' => 'LDAP kimlik doğrulaması deneniyor...',
         'authentication_success' => 'LDAP kullanıcı kimliği başarıyla doğrulandı!'
     ],
+    'labels' => [
+        'null_template' => 'Label template not found. Please select a template.',
+        ],
     'webhook' => [
         'sending' => ':app test mesajı gönderiliyor...',
         'success' => ':webhook_name entegrasyonunuz çalışıyor!',
@@ -42,5 +48,12 @@ return [
         'error' => 'Bir şeyler yanlış gitti. :app bu şekilde yanıt verdi: :error_message',
         'error_redirect' => 'HATA: 301/302: bağlantı başka bir yere yönlendiriyor. Güvenlik nedeniyle yönlendirmeleri takip etmiyoruz. Lütfen direk adresi kullanın.',
         'error_misc' => 'Bir şeyler yanlış gitti. :( ',
-    ]
+        'webhook_fail' => ' webhook notification failed: Check to make sure the URL is still valid.',
+        'webhook_channel_not_found' => ' webhook channel not found.',
+        'ms_teams_deprecation' => 'The selected Microsoft Teams webhook URL will be deprecated Dec 31st, 2025. Please use a workflow URL. Microsoft\'s documentation on creating a workflow can be found <a href="https://support.microsoft.com/en-us/office/create-incoming-webhooks-with-workflows-for-microsoft-teams-8ae491c7-0394-4861-ba59-055e33f75498" target="_blank"> here.</a>',
+    ],
+    'location_scoping' => [
+        'not_saved' => 'Your settings were not saved.',
+        'mismatch' => 'There is 1 item in the database that need your attention before you can enable location scoping.|There are :count items in the database that need your attention before you can enable location scoping.',
+    ],
 ];
diff --git a/resources/lang/tr-TR/admin/statuslabels/table.php b/resources/lang/tr-TR/admin/statuslabels/table.php
index e0a7f8e208..3241466fda 100644
--- a/resources/lang/tr-TR/admin/statuslabels/table.php
+++ b/resources/lang/tr-TR/admin/statuslabels/table.php
@@ -1,14 +1,14 @@
 <?php
 
 return array(
-    'about'      	=> 'Durum Etiketi Hakkında',
+    'about'      	=> 'About Status Types',
     'archived'      	=> 'Arşivlenmiş',
     'create'      	=> 'Durum Etiketi Oluştur',
     'color'      	=> 'Grafik rengi',
     'default_label' => 'Varsayılan Etiket',
     'default_label_help' => 'En sık kullanılan durum etiketlerinin varlık oluştururken / düzenlerken seçim kutusunun üstünde görünmesini sağlamak için kullanılır.',
     'deployable'      	=> 'Dağıtılabilir',
-    'info'      	=> 'Durum Etiketleri demirbaşınızın o anki durumunu tanımlamada kullanılır. Demirbaşınız o an onarımda ya da kayıp/çalınmış olabilir. Dağıtılabilir, Beklemede ve Arşivlenmiş demirbaşlarınız için yeni durum etiketleri oluşturabilirsiniz.',
+    'info'      	=> 'Status label types are used to describe the various states your assets could be in. They may be out for repair, lost/stolen, etc. You can create new status labels for your deployable, pending and archived assets according to your own workflow. For more information, <a href="https://snipe-it.readme.io/docs/overview#status-labels" target="_blank">see the documentation <i class="fa fa-external-link"></i></a>.',
     'name'      	=> 'Durum Adı',
     'pending'      	=> 'Beklemede',
     'status_type'   => 'Durum Türü',
diff --git a/resources/lang/tr-TR/admin/users/general.php b/resources/lang/tr-TR/admin/users/general.php
index d651b3ca86..cb55455da6 100644
--- a/resources/lang/tr-TR/admin/users/general.php
+++ b/resources/lang/tr-TR/admin/users/general.php
@@ -19,6 +19,8 @@ return [
     'print_assigned'    => 'Atananların Tümünü Yazdır',
     'email_assigned'    => 'Tüm Atananların E-posta Listesi',
     'user_notified'     => 'Kullanıcıya, atanmış nesnelerinin bir listesi e-posta ile gönderildi.',
+    'users_notified'    => 'The user has been emailed a list of their currently assigned items.|:count users have been emailed a list of their currently assigned items.',
+    'users_notified_warning' => ':count user has been emailed a list of their currently assigned items, however :no_email users did not have an email address so could not be emailed.|:count users have been emailed a list of their currently assigned items, however :no_email user(s) did not have an email address so could not be emailed.',
     'auto_assign_label' => 'Uygun lisansları otomatik olarak atarken bu kullanıcıyı dahil edin',
     'auto_assign_help'  => 'Lisansların otomatik atanmasında bu kullanıcıyı atla',
     'software_user'     => 'Yazılıma :name için çıkış yapılmış',
diff --git a/resources/lang/tr-TR/admin/users/message.php b/resources/lang/tr-TR/admin/users/message.php
index 3060074eca..8a76f0f4a8 100644
--- a/resources/lang/tr-TR/admin/users/message.php
+++ b/resources/lang/tr-TR/admin/users/message.php
@@ -6,7 +6,7 @@ return array(
     'declined'                  => 'Bu varlığı başarıyla reddettiniz.',
     'bulk_manager_warn'	        => 'Kullanıcılarınızın başarıyla güncelleştirildi, ancak kaydedilmedi Yöneticisi giriş Yöneticisi\'ni seçtiğiniz çünkü aynı zamanda düzenlenecek kullanıcı listesinde oldu ve kullanıcıların kendi yöneticisi olmayabilir. Yine, yönetici hariç olmak üzere, kullanıcılarınızı seçiniz.',
     'user_exists'               => 'Kullanıcı zaten var!',
-    'user_not_found'            => 'Kullanıcı yok.',
+    'user_not_found'            => 'Kullanıcı mevcut değil veya görüntüleme izniniz yok.',
     'user_login_required'       => 'Oturum açma alanı gerekli',
     'user_has_no_assets_assigned' => 'Kullanıcıya zimmetlenmiş bir şey yok.',
     'user_password_required'    => 'Şifre Gerekli.',
@@ -37,7 +37,7 @@ return array(
         'update' => 'Kullanıcı oluştururken bir sorun oluştu. Lütfen yeniden deneyin.',
         'delete' => 'Kullanıcı silinirken bir problem oluştu. Lütfen tekrar deneyin.',
         'delete_has_assets' => 'Bu kullanıcının atadığı öğeler var ve silinemiyor.',
-        'delete_has_assets_var' => 'This user still has an asset assigned. Please check it in first.|This user still has :count assets assigned. Please check their assets in first.',
+        'delete_has_assets_var' => 'Bu kullanıcının atanan bir varlığı var. Lütfen önce bunu teslim alın.|Bu kullanıcının :count adet atanan varlığı var. Lütfen önce bu varlıkları teslim alın.',
         'delete_has_licenses_var' => 'This user still has a license seats assigned. Please check it in first.|This user still has :count license seats assigned. Please check them in first.',
         'delete_has_accessories_var' => 'This user still has an accessory assigned. Please check it in first.|This user still has :count accessories assigned. Please check their assets in first.',
         'delete_has_locations_var' => 'This user still manages a location. Please select another manager first.|This user still manages :count locations. Please select another manager first.',
@@ -53,6 +53,7 @@ return array(
         'ldap_could_not_search' => 'LDAP sunucusuna bağlanamadı. LDAP yapılandırma dosyası LDAP sunucusu yapılandırmanızda gözden geçirin. <br> LDAP sunucusundan Hata:',
         'ldap_could_not_get_entries' => 'LDAP sunucusuna bağlanamadı. LDAP yapılandırma dosyası LDAP sunucusu yapılandırmanızda gözden geçirin. <br> LDAP sunucusundan Hata:',
         'password_ldap' => 'Bu hesabın parolası LDAP / Active Directory tarafından yönetilir. Lütfen şifrenizi değiştirmek için BT departmanınızla iletişime geçin.',
+        'multi_company_items_assigned' => 'This user has items assigned that belong to a different company. Please check them in or edit their company.'
     ),
 
     'deletefile' => array(
diff --git a/resources/lang/tr-TR/admin/users/table.php b/resources/lang/tr-TR/admin/users/table.php
index ec11dce6d6..d7cc0748be 100644
--- a/resources/lang/tr-TR/admin/users/table.php
+++ b/resources/lang/tr-TR/admin/users/table.php
@@ -22,7 +22,7 @@ return array(
     'managed_locations'     => 'Yönetilen Mekanlar',
     'managed_users'         => 'Yönetilen Kullanıcılar',
     'name' 					=> 'Adı',
-    'nogroup'               => 'Henüz hiçbir grup oluşturulmadı. Bir tane eklemek için şu adresi ziyaret edin:',
+    'nogroup'               => 'No groups have been created yet. To add one, visit:',
     'notes'                 => 'Notlar',
     'password_confirm' 		=> 'Şifreyi Doğrula',
     'password' 				=> 'Şifre',
diff --git a/resources/lang/tr-TR/auth.php b/resources/lang/tr-TR/auth.php
index 72d1e0c99a..3c9f0a1256 100644
--- a/resources/lang/tr-TR/auth.php
+++ b/resources/lang/tr-TR/auth.php
@@ -15,6 +15,6 @@ return array(
 
     'failed' => 'Bu kimlik bilgileri kayıtlarımızla eşleşmiyor.',
     'password' => 'Sağlanan parola yanlış.',
-    'throttle' => 'Çok fazla giriş denemesi. Lütfen :second saniye içinde tekrar deneyin.',
+    'throttle' => 'Too many login attempts. Please try again in :minutes minute(s).',
 
 );
diff --git a/resources/lang/tr-TR/auth/message.php b/resources/lang/tr-TR/auth/message.php
index 5c4acca18c..037f69892c 100644
--- a/resources/lang/tr-TR/auth/message.php
+++ b/resources/lang/tr-TR/auth/message.php
@@ -6,8 +6,6 @@ return array(
     'account_not_found'      => 'Kullanıcı adı veya şifresi yanlış.',
     'account_not_activated'  => 'Hesabınız aktif edilmemiş.',
     'account_suspended'      => 'Hesabınız durdurulmuş.',
-    'account_banned'         => 'Hesabınız engellenmiş.',
-    'throttle'               => 'Çok fazla başarısız oturum açma girişimi. Lütfen :dakika dakika sonra tekrar deneyin.',
 
     'two_factor' => array(
         'already_enrolled'      => 'Cihazınız zaten kayıtlı.',
diff --git a/resources/lang/tr-TR/button.php b/resources/lang/tr-TR/button.php
index 1b18fdfee9..3d424aabb4 100644
--- a/resources/lang/tr-TR/button.php
+++ b/resources/lang/tr-TR/button.php
@@ -7,6 +7,7 @@ return [
     'checkin_and_delete'  	    => 'Tümünü Kontrol Et / Kullanıcıyı Sil',
     'delete'  	                => 'Sil',
     'edit'    	                => 'Düzenle',
+    'clone'    	                => 'Clone',
     'restore' 	                => 'Geri yükle',
     'remove'                    => 'Kaldır',
     'request'                   => 'İstek',
@@ -21,4 +22,13 @@ return [
     'add_maintenance'           => 'Bakım ekle',
     'append'                    => 'Ekle',
     'new'                       => 'Yeni',
+    'var' => [
+        'clone'     => 'Clone :item_type',
+        'edit'      => 'Edit :item_type',
+        'delete'    => 'Delete :item_type',
+        'restore'   => 'Restore :item_type',
+        'create'    => 'Create New :item_type',
+        'checkout'  => 'Checkout :item_type',
+        'checkin'   => 'Checkin :item_type',
+    ]
 ];
diff --git a/resources/lang/tr-TR/general.php b/resources/lang/tr-TR/general.php
index d11d58cb48..fc749b57ad 100644
--- a/resources/lang/tr-TR/general.php
+++ b/resources/lang/tr-TR/general.php
@@ -10,10 +10,10 @@ return [
     'action'                => 'Hareket',
     'activity_report'		=> 'Aktivite Raporu',
     'address'				=> 'Adres',
-    'admin'					=> 'Yönetici',
-    'admin_tooltip'			=> 'This user has admin privileges',
-    'superuser'				=> 'Superuser',
-    'superuser_tooltip'		=> 'This user has superuser privileges',
+    'admin'					=> 'Yönetici Ayarları',
+    'admin_tooltip'			=> 'Kullanici admin yetkisine sahiptir',
+    'superuser'				=> 'Super Kullanici',
+    'superuser_tooltip'		=> 'Super Kullanici yetkisine sahiptir',
     'administrator'			=> 'Yönetici',
     'add_seats'             => 'Eklenen kişi sayısı',
     'age'                   => "Yaş",
@@ -23,13 +23,16 @@ return [
     'asset_models'			=> 'Demirbaş Modelleri',
     'asset_model'			=> 'model',
     'asset'					=> 'Demirbaş',
+    'asset_previous'        => 'Asset (Previously Assigned)',
     'asset_report'          => 'Demirbaş Raporu',
     'asset_tag'				=> 'Demirbaş Etiketi',
     'asset_tags'            => 'Varlık Adı',
     'assets_available'		=> 'Kullanılabilir Demirbaşlar',
     'accept_assets'         => 'Varlıkları Kabul Et :name',
     'accept_assets_menu'    => 'Demirbaş Kabul',
+    'accept_item'           => 'Accept Item',
     'audit'				    => 'Denetim',
+    'audits'				=> 'Audits',
     'audit_report'			=> 'Denetim Günlüğü',
     'assets'				=> 'Demirbaşlar',
     'assets_audited'        => 'denetlenen varlıklar',
@@ -61,9 +64,12 @@ return [
     'changepassword'  		=> 'Şifreyi Değiştir',
     'checkin'  				=> 'Giriş',
     'checkin_from'  		=> 'Geri al',
+    'checkin_note'  		=> 'Checkin Note',
+    'checkout_note'  		=> 'Checkout Note',
     'checkout'  			=> 'Atama',
     'checkouts_count'       => 'Kullanıma alma',
     'checkins_count'        => 'Girişler',
+    'checkin_and_delete'  	=> 'Teslim Al ve Sil',
     'user_requests_count'   => 'İstekler',
     'city'  				=> 'Şehir',
     'click_here'			=> 'Buraya Tıklayın',
@@ -77,7 +83,7 @@ return [
     'consumables'			=> 'Sarf Malzemeleri',
     'country'  				=> 'Ülke',
     'could_not_restore'     => ':item_type: :error geri yüklenirken hata oluştu',
-    'not_deleted'           => ':item_type silinmediği için geri yüklenemez',
+    'not_deleted'           => 'Bu oge silinmedigi icin geri alma islemi uygulanmaz',
     'create'				=> 'Yeni Oluştur',
     'created'               => 'Öğe oluşturuldu',
     'created_asset'			=> 'Oluşturulmuş Demirbaş',
@@ -86,11 +92,13 @@ return [
     'record_created' 		=> 'Kayıt Tarihi',
     'updated_at' 			=> 'Güncellendiği tarih',
     'currency'  			=> '$', // this is deprecated
+    'currency_text'  		=> 'Para Birimi', //
     'current'  				=> 'Geçerli',
     'current_password'      => 'Mevcut Şifre',
     'customize_report'      => 'Raporu Özelleştir',
     'custom_report'         => 'Özel demirbaş raporu',
     'dashboard'				=> 'Pano',
+    'data_source'           => 'Data Source',
     'days'      			=> 'günler',
     'days_to_next_audit'    => 'Sonraki Denetime Günden Gün Sayısı',
     'date'					=> 'Tarih',
@@ -101,7 +109,7 @@ Context | Request Context
 ',
     'delete'  				=> 'Sil',
     'delete_confirm'  		=> 'Öğeyi silmek istediğinizden emin misiniz?',
-    'delete_confirm_no_undo' => ':item\'i silmek istediğinizden emin misiniz? Bu işlem geri alınamaz.',
+    'delete_confirm_no_undo' => 'Bu ogeyi silmek isteginize eminmisiniz ? Bu islem geri alinamaz.',
     'deleted'  				=> 'Silinmiş',
     'delete_seats'  		=> 'Silinen Kullanıcı Lisansı Sayısı',
     'deletion_failed'       => 'Silme başarısız',
@@ -117,29 +125,13 @@ Context | Request Context
     'editprofile'  			=> 'Profil Düzenle',
     'eol'					=> 'Kullanım Ömrü',
     'email_domain'			=> 'E-posta etki alanı',
-    'email_format'			=> 'E-posta biçimi',
     'employee_number'       => 'Çalışan Numarası',
     'email_domain_help'		=> 'İçe aktarırken e-posta adresleri oluşturmak için kullanılır',
     'error'				    => 'Hata',
     'exclude_archived'      => 'Arşivlenmiş Öğeleri Hariç Tut',
     'exclude_deleted'       => 'Silinmiş Varlıkları Hariç Tut',
     'example'				=> 'Örnek: ',
-    'filastname_format'			=> 'Ad başharfi Soyad (jsmith@example.com)',
-    'firstname_lastname_format'	=> 'Adı Soyadı (jane.smith@example.com)',
-    'firstname_lastname_underscore_format' => 'Adı Soyadı (jane.smith@example.com)',
-    'lastnamefirstinitial_format' =>  'Soyadı İlk Başlangıç (smithj@example.com)',
-    'firstintial_dot_lastname_format' => 'Adın İlk Harfi ve Soyad (j.smith@example.com)',
-    'firstname_lastname_display'	=> 'İsim Soyisim (Bahri SAGIRLI)',
-    'lastname_firstname_display'	=> 'Soyisim İsim (SAGIRLI Bahri)',
-    'name_display_format'	=> 'İsim görüntüleme şekli',
-    'first'					=> 'İlk',
-    'firstnamelastname'     => 'Adı Soyadı (janesmith@example.com)',
-    'lastname_firstinitial' => 'Soyad ve Adın İlk Harfi (smith_j@example.com)',
-    'firstinitial.lastname' => 'Adın İlk Harfi ve Soyad (j.smith@example.com)',
-    'firstnamelastinitial'  => 'Ad ve Soyadın İlk Harfi (janes@example.com)',
-    'lastnamefirstname'      => 'Last Name First Name (smith.jane@example.com)',
-    'first_name'			=> 'Ad',
-    'first_name_format'		=> 'Ad (jane@example.com)',
+
     'files'                 => 'Dosyalar',
     'file_name'				=> 'Dosya',
     'file_type'             => 'Dosya Türü',
@@ -159,9 +151,9 @@ Context | Request Context
     'image_delete'         	=> 'Resmi sil',
     'include_deleted'       => 'Silinen Varlıkları Dahil Et',
     'image_upload'         	=> 'Resim yükle',
-    'filetypes_accepted_help'    => 'İzin verilen edilen dosya türü :types. İzin verilen asgari yükleme boyutu :size.|İzin verilen edilen dosya türleri:types. İzin verilen asgari yükleme boyutu :size.',
-    'filetypes_size_help'   => 'İzin verilen asgari yükleme boyutu :size.',
-    'image_filetypes_help'  => 'Accepted filetypes are jpg, webp, png, gif, svg, and avif. Max upload size allowed is :size.',
+    'filetypes_accepted_help'    => 'Accepted filetype is :types. The maximum size allowed is :size.|Accepted filetypes are :types. The maximum upload size allowed is :size.',
+    'filetypes_size_help'   => 'The maximum upload size allowed is :size.',
+    'image_filetypes_help'  => 'Accepted Filetypes are jpg, webp, png, gif, svg, and avif. The maximum upload size allowed is :size.',
     'unaccepted_image_type'  => 'Bu dosya okunamadı. Kabul edilen dosya türleri jpg, webp, png, gif ve svg\'dir. Bu dosyanın mime tipi: :mimetype.',
     'import'         	    => 'İçeri aktar',
     'import_this_file'      => 'Alanları eşleyin ve bu dosyayı işleyin',
@@ -181,12 +173,17 @@ Context | Request Context
     'last'					=> 'Son',
     'last_login'            => 'Son Giriş',
     'last_name'             => 'Soyisim',
+    'firstname_lastname_display'	=> 'İsim Soyisim (Bahri SAGIRLI)',
+    'lastname_firstname_display'	=> 'Soyisim İsim (SAGIRLI Bahri)',
+    'name_display_format'	=> 'İsim görüntüleme şekli',
+    'first'					=> 'İlk',
+    'first_name'			=> 'Ad',
     'license'				=> 'Lisans',
     'license_report'        => 'Lisans Raporu',
     'licenses_available'	=> 'Kullanılabilir Lisanslar',
     'licenses'				=> 'Lisanslar',
     'list_all'				=> 'Tümünü listele',
-    'loading'				=> 'Yükleniyor... lütfen bekleyin....',
+    'loading'				=> 'Yükleniyor... lütfen bekleyin...',
     'lock_passwords'        => 'Bu alan değeri bir demo kurulumunda kaydedilmeyecektir.',
     'feature_disabled'      => 'Bu özellik demo yükleme için devre dışı bırakıldı.',
     'location'              => 'Konum',
@@ -196,7 +193,7 @@ Context | Request Context
     'logout'				=> 'Çıkış Yap',
     'lookup_by_tag'     => 'Varlık etiketine göre arama',
     'maintenances'          => 'Bakımlar',
-    'manage_api_keys'       => 'API Anahtarlarını Yönetin',
+    'manage_api_keys'       => 'Manage API keys',
     'manufacturer'			=> 'Üretici',
     'manufacturers'			=> 'Üreticiler',
     'markdown'				=> 'Bu alan <a href="https://help.github.com/articles/github-flavored-markdown/"> Github tarafından</a> desteklenir.',
@@ -218,6 +215,14 @@ Context | Request Context
     'no_results'			=> 'Sonuç Bulunamadı.',
     'no'  					=> 'Hayır',
     'notes'  				=> 'Notlar',
+    'note_added'            => 'Note Added',
+    'options'				=> 'Options',
+    'preview'				=> 'Preview',
+    'add_note'              => 'Add Note',
+    'note_edited'            => 'Note Edited',
+    'edit_note'              => 'Edit Note',
+    'note_deleted'            => 'Note Deleted',
+    'delete_note'              => 'Delete Note',
     'order_number'          => 'Sipariş Numarası',
     'only_deleted'          => 'Yalnızca Silinen Varlıklar',
     'page_menu'				=> '_MENU_ Öğe gösteriliyor',
@@ -232,7 +237,7 @@ Context | Request Context
     'purchase_date'         => 'Satın Alma Tarihi',
     'qty'		            => 'Miktar',
     'quantity'		        => 'Miktar',
-    'quantity_minimum'      => 'Asgari :count adet miktarın altındasınız yada neredeyse asgari miktar seviyesinin altındasınız',
+    'quantity_minimum'      => 'You have one item below or almost below minimum quantity levels|You have :count items below or almost below minimum quantity levels',
     'quickscan_checkin'  	=> 'Hızlı Tarama ile Giriş',
     'quickscan_checkin_status'  	=> 'Giriş Durumu',
     'ready_to_deploy'		=> 'Atamaya Hazır',
@@ -257,7 +262,7 @@ Context | Request Context
     'select_all'            => 'Tümünü Seç',
     'search'				=> 'Ara',
     'select_category'       => 'Kategori Seç',
-    'select_datasource' => 'Select a Datasource',
+    'select_datasource' => 'Select a data source',
     'select_department'     => 'Bölüm Seç',
     'select_depreciation'	=> 'Bir Değer Kaybı Türü Seç',
     'select_location'		=> 'Konum Seç',
@@ -277,13 +282,15 @@ Context | Request Context
     'signed_off_by'         => 'İmzalayan',
     'skin'       			=> 'Tema',
     'webhook_msg_note'        => 'Webhook üzerinden bir ileti gönderilecek',
-    'webhook_test_msg'        => 'Snipe-IT ile :app entegrasyonunuz çalışıyor!',
+    'webhook_test_msg'        => 'Oh hai! It looks like your :app integration with Snipe-IT is working!',
     'some_features_disabled' => 'DEMO modu: Bu yükleme için bazı özellikleri devre dışı bırakılır.',
     'site_name'				=> 'Site Adı',
     'state'  				=> 'İlçe',
     'status_labels'			=> 'Durum Etiketleri',
+    'status_label'			=> 'Status Label',
     'status'    			=> 'Durum',
     'accept_eula'           => 'Lisans Sözleşmesi',
+    'show_or_hide_eulas' => 'Show/Hide EULAs',
     'supplier'              => 'Tedarikçi',
     'suppliers'  			=> 'Tedarikçiler',
     'sure_to_delete'        => 'Silmek istediğinize emin misiniz',
@@ -299,9 +306,9 @@ Context | Request Context
     'type'  				=> 'Tip',
     'undeployable'			=> 'Atanamaz',
     'unknown_admin'			=> 'Bilinmeyen Yönetici',
-    'username_format'		=> 'Kullanıcı Adı Biçimi',
     'username'              => 'Kullanıcı Adı',
     'update'                => 'Güncelle',
+    'updating_item' => 'Updating :item',
     'upload_filetypes_help'      => 'İzin verilen dosya türleri png, gif, jpg, jpeg, doc, docx, pdf, xls, xlsx, txt, lic, xml, zip, rtf ve rar\'dır. İzin verilen maksimum yükleme boyutu :size.',
     'uploaded'              => 'Yüklendi',
     'user'					=> 'Kullanıcı',
@@ -326,10 +333,10 @@ Context | Request Context
     'token_expired'         => 'Oturum zaman aşımına uğradı. Lütfen tekrar giriş yapın.',
     'login_enabled'         => 'Kullanıcı Aktif',
     'audit_due'             => 'Beklenen Denetimler',
-    'audit_due_days'        => 'Assets Due for Audit Within :days Day|Assets Due for Audit Within :days Days',
+    'audit_due_days'        => '{}Assets Due or Overdue for Audit|[1]Assets Due or Overdue for Audit Within a Day|[2,*]Assets Due or Overdue for Audit Within :days Days',
     'checkin_due'           => 'Due for Checkin',
     'checkin_overdue'       => 'Overdue for Checkin',
-    'checkin_due_days'      => 'Assets Due for Checkin Within :days Day|Assets Due for Checkin Within :days Days',
+    'checkin_due_days'      => '{}Due for Checkin|[1]Assets Due for Checkin Within :days Day|[2,*]Assets Due for Checkin Within :days Days',
     'audit_overdue'         => 'Zamanı Geçmiş Denetimler',
     'accept'                => 'Demirbaş Kabul',
     'i_accept'              => 'Kabul ediyorum',
@@ -342,16 +349,16 @@ Context | Request Context
     'view_all'              => 'tümünü görüntüle',
     'hide_deleted'          => 'Silinenleri Gizle',
     'email'                 => 'E-Posta',
-    'do_not_change'         => 'Değiştirmeyin',
-    'bug_report'            => 'Hata Bildir',
+    'do_not_change'         => 'Do not change',
+    'bug_report'            => 'Report a bug',
     'user_manual'           => 'Kullanım Kılavuzu',
     'setup_step_1'          => 'Adım 1',
     'setup_step_2'          => 'Adım 2',
     'setup_step_3'          => 'Adım 3',
     'setup_step_4'          => 'Adım 4',
     'setup_config_check'    => 'Yapılandırma Kontrolü',
-    'setup_create_database' => 'Veritabanı Tabloları Oluştur',
-    'setup_create_admin'    => 'Yönetici Kullanıcısını Oluştur',
+    'setup_create_database' => 'Create database tables',
+    'setup_create_admin'    => 'Create an admin user',
     'setup_done'            => 'Tamamlandı!',
     'bulk_edit_about_to'    => 'Şunları düzenlemek üzeresiniz: ',
     'checked_out'           => 'Çıkış Yapıldı',
@@ -386,6 +393,8 @@ Context | Request Context
     'new_license'           => 'Yeni Lisans',
     'new_accessory'         => 'Yeni Aksesuar',
     'new_consumable'        => 'Yeni Sarf Malzemesi',
+    'new_component'         => 'New Component',
+    'new_user'              => 'New User',
     'collapse'              => 'Daralt',
     'assigned'              => 'Atandı',
     'asset_count'           => 'Varlık Adedi',
@@ -421,19 +430,20 @@ Context | Request Context
     'bulk_soft_delete'      =>'Ayrıca bu kullanıcıları geçici olarak silin. Yönetici Ayarlarında silinen kayıtları temizlemediğiniz sürece/tasfiye edene kadar bu kişilerin varlık geçmişi olduğu gibi kalacaktır.',
     'bulk_checkin_delete_success' => 'Seçtiğiniz kullanıcılar silindi ve öğeleri teslim edildi.',
     'bulk_checkin_success' => 'Seçilen kullanıcılar için öğeler iade edildi.',
-    'set_to_null'           => 'Bu öğenin değerlerini sil|Tüm :asset_count öğelerinin değerlerini sil ',
+    'set_to_null'           => 'Delete values for this selection|Delete values for all :selection_count selections ',
     'set_users_field_to_null'  => 'Sil : Bu kullanıcının bilgileri Sil: bütün kullanıcıların bu alandaki bilgileri :user_count ',
     'na_no_purchase_date'   => 'Bulunmuyor - Satın alma tarihi belirtilmedi',
     'assets_by_status'      => 'Duruma Göre Varlıklar',
     'assets_by_status_type'      => 'Durum Türüne Göre Varlıklar',
     'pie_chart_type'        => 'Pano Pasta Grafik Türü',
     'hello_name'            => 'Merhaba, :name!',
-    'unaccepted_profile_warning'   => 'Kabul gerektiren öğeleriniz var. Kabul etmek veya reddetmek için buraya tıklayın',
+    'unaccepted_profile_warning'   => 'You have one item requiring acceptance. Click here to accept or decline it | You have :count items requiring acceptance. Click here to accept or decline them',
     'start_date'            => 'Başlangıç Tarihi',
     'end_date'            => 'Bitiş Tarihi',
     'alt_uploaded_image_thumbnail' => 'Yüklenen küçük resim',
     'placeholder_kit'       => 'Bir kit seçin',
     'file_not_found'        => 'Dosya bulunamadı',
+    'log_record_not_found'  => 'No record for that log entry was found.',
     'preview_not_available' => '(ön izleme yok)',
     'setup'                 => 'Kurulum',
     'pre_flight'            => 'Deneme',
@@ -515,7 +525,7 @@ Context | Request Context
     'checked_out_to_fields' => 'Checked Out To Fields',
     'percent_complete' => '% tamamlandı',
     'uploading' => 'Yükleniyor... ',
-    'upload_error' => 'Dosya yüklenirken hata oluştu. Lütfen boş satır olmadığından ve hiçbir sütun adının kopyalanmadığından emin olun.',
+    'upload_error' => 'Error uploading file. Please check that you have no empty rows or duplicated column names in your CSV, and that the server permissions allow uploads.',
     'copy_to_clipboard' => 'Panoya kopyala',
     'copied' => 'Kopyalandı!',
     'status_compatibility' => 'Varlıklar zaten atanmışsa konuşlandırılamayan bir durum türüne değiştirilemezler ve bu değer değişikliği atlanır.',
@@ -528,14 +538,14 @@ Context | Request Context
     'or' => 'veya',
     'url'                   => 'Link',
     'edit_fieldset' => 'Edit fieldset fields and options',
-    'permission_denied_superuser_demo' => 'Permission denied. You cannot update user information for superadmins on the demo.',
-    'pwd_reset_not_sent' => 'User is not activated, is LDAP synced, or does not have an email address',
-    'error_sending_email' => 'Error sending email',
+    'permission_denied_superuser_demo' => 'İzin reddedildi. Demo üzerinde süper yöneticilerin kullanıcı bilgilerini güncelleyemezsiniz.',
+    'pwd_reset_not_sent' => 'Kullanıcı etkinleştirilmemiş, LDAP ile senkronize edilmemiş ya da bir e-posta adresine sahip değil',
+    'error_sending_email' => 'E-posta gönderme hatası',
     'sad_panda' => 'Sad panda. You are not authorized to do the thing. Maybe <a href=":link">return to the dashboard</a>, or contact your administrator.',
     'bulk' => [
             'delete' =>
                 [
-                'header' => 'Bulk Delete :object_type',
+                'header' => 'Toplu Silme: :object_type',
                 'warn'   =>  'You are about to delete one :object_type|You are about to delete :count :object_type',
                 'success'   =>  ':object_type successfully deleted|Successfully deleted :count :object_type',
                 'error'   =>  'Could not delete :object_type',
@@ -552,6 +562,71 @@ Context | Request Context
         'license_seats'  => ':count License Seat|:count License Seats',
         'consumables'  => ':count Consumable|:count Consumables',
         'components'  => ':count Component|:count Components',
-    ]
+    ],
+
+    'more_info' => 'Daha Fazla Bilgi',
+    'quickscan_bulk_help' => 'Checking this box will edit the asset record to reflect this new location. Leaving it unchecked will simply note the location in the audit log. Note that if this asset is checked out, it will not change the location of the person, asset or location it is checked out to.',
+    'whoops' => 'Whoops!',
+    'something_went_wrong' => 'Something went wrong with your request.',
+    'close' => 'Close',
+    'expires' => 'Bitiş',
+    'map_fields'=> 'Map :item_type Fields',
+    'remaining_var' => ':count Remaining',
+    'label' => 'Label',
+    'import_asset_tag_exists' => 'An asset with the asset tag :asset_tag already exists and an update was not requested. No change was made.',
+    'countries_manually_entered_help' => 'Values with an asterisk (*) were manually entered and do not match existing ISO 3166 dropdown values',
+    'accessories_assigned' => 'Assigned Accessories',
+    'user_managed_passwords' => 'Password Management',
+    'user_managed_passwords_disallow' => 'Disallow users from managing their own passwords',
+    'user_managed_passwords_allow' => 'Allow users to manage their own passwords',
+    'from' => 'From',
+    'by' => 'Tarafından',
+
+// Add form placeholders here
+    'placeholders' => [
+        'notes'  => 'Add a note',
+    ],
+
+    'breadcrumb_button_actions' => [
+        'edit_item' => 'Edit :name',
+        'checkout_item' => 'Teslim Et :name',
+        'checkin_item' => 'Teslim Al :name',
+    ],
+
+    'skins' => [
+        'site_default' => 'Site Default',
+        'default_blue' => 'Default Blue',
+        'blue_dark' => 'Blue (Dark Mode)',
+        'green' => 'Green Dark',
+        'green_dark' => 'Green (Dark Mode)',
+        'red' => 'Red Dark',
+        'red_dark' => 'Red (Dark Mode)',
+        'orange' => 'Orange Dark',
+        'orange_dark' => 'Orange (Dark Mode)',
+        'black' => 'Black',
+        'black_dark' => 'Black (Dark Mode)',
+        'purple' => 'Purple',
+        'purple_dark' => 'Purple (Dark Mode)',
+        'yellow' => 'Yellow',
+        'yellow_dark' => 'Yellow (Dark Mode)',
+        'high_contrast' => 'High Contrast',
+
+    ],
+
+    'select_all_none' => 'Select/Unselect All',
+    'generic_model_not_found' => 'That :model was not found or you do not have permission to access it',
+    'deleted_models' => 'Deleted Asset Models',
+    'deleted_users' => 'Silinen Kullanıcılar',
+    'cost_each' => ':amount each',
+    'remove_current_image' => 'Mevcut :type görselini kaldır',
+
+    'seeding' => [
+        'manufacturers' => [
+            'button' => 'Üreticiler Oluştur',
+            'prompt' => 'You do not have any manufacturers yet. Would you like to seed a list of common manufacturers? (THIS WILL OVERWRITE EXISTING MANUFACTURERS, including those that have been soft-deleted.)',
+            'success' => 'Manufacturers seeded successfully',
+            'error' => 'Üreticiler eklenemedi. Bir üretici kaydı zaten mevcut ve ekleme işlemi üzerine yazacaktır.|Üreticiler eklenemedi. :count üretici kaydı zaten mevcut ve ekleme işlemi bunların üzerine yazacaktır.',
+        ],
+    ],
 
 ];
diff --git a/resources/lang/tr-TR/localizations.php b/resources/lang/tr-TR/localizations.php
index 3361e826be..f360ecc126 100644
--- a/resources/lang/tr-TR/localizations.php
+++ b/resources/lang/tr-TR/localizations.php
@@ -2,7 +2,7 @@
 
 return [
 
-    'select_language' => 'Bir dil seçin',
+    'select_language' => 'Select a Language',
     'languages' => [
         'en-US'=> 'İngilizce, US',
         'en-GB'=> 'İngilizce, UK',
@@ -40,7 +40,9 @@ return [
         'ms-MY'=> 'Malayca',
         'mi-NZ'=> 'Maori Dili',
         'mn-MN'=> 'Moğolca',
-        'no-NO'=> 'Norveç dili',
+        'nb-NO'=> 'Norwegian Bokmål',
+        'om-ET' => 'Oromo (Ethiopian)',
+        //'nn-NO'=> 'Norwegian Nynorsk',
         'fa-IR'=> 'Farsça',
         'pl-PL'=> 'Polonyaca',
         'pt-PT'=> 'Portekizce',
@@ -66,7 +68,7 @@ return [
         'zu-ZA'=> 'Zuluca',
     ],
 
-    'select_country' => 'Ülke seçin',
+    'select_country' => 'Select a Country',
     
     'countries' => [
         'AC'=>'Ascension Adası',
@@ -133,6 +135,7 @@ return [
         'EC'=>'Ekvador',
         'EE'=>'Estonya',
         'EG'=>'Mısır',
+        'GB-ENG'=>'England',
         'ER'=>'Eritre',
         'ES'=>'İspanya',
         'ET'=>'Etiyopya',
@@ -231,6 +234,7 @@ return [
         'NG'=>'Nijerya',
         'NI'=>'Nikaragua',
         'NL'=>'Hollanda',
+        'GB-NIR' => 'Northern Ireland',
         'NO'=>'Norveç',
         'NP'=>'Nepal',
         'NR'=>'Nauru',
@@ -258,7 +262,7 @@ return [
         'RU'=>'Rusya Federasyonu',
         'RW'=>'Ruanda',
         'SA'=>'Suudi Arabistan',
-        'UK'=>'İskoçya',
+        'GB-SCT'=>'İskoçya',
         'SB'=>'Solomon Adaları',
         'SC'=>'Seyşel Adaları',
         'SS'=>'Güney Sudan',
@@ -310,6 +314,7 @@ return [
         'VI'=>'Virgin Adaları (Abd)',
         'VN'=>'Vietnam',
         'VU'=>'Vanuatu',
+        'GB-WLS' =>'Wales',
         'WF'=>'Wallis ve Futuna Adaları',
         'WS'=>'Samoa',
         'YE'=>'Yemen',
diff --git a/resources/lang/tr-TR/mail.php b/resources/lang/tr-TR/mail.php
index a66e78bdb9..fa5b8cc8e1 100644
--- a/resources/lang/tr-TR/mail.php
+++ b/resources/lang/tr-TR/mail.php
@@ -23,24 +23,25 @@ return [
     'Item_Requested' => 'Varlık Talep Edildi',
     'License_Checkin_Notification' => 'Lisans Zimmet Kabul',
     'License_Checkout_Notification' => 'Lisans teslim alındı',
+    'license_for'   => 'License for',
     'Low_Inventory_Report' => 'Düşük Stok Raporu',
     'a_user_canceled' => 'Bir kullanıcı web sitede öğe talebinden vazgeçti',
     'a_user_requested' => 'Bir kullanıcı websitede bir öğe talebinde bulundu',
     'acceptance_asset_accepted' => 'Kullanıcı bir öğeyi kabul etti',
     'acceptance_asset_declined' => 'Kullanıcı bir öğeyi reddetti',
-    'accessory_name' => 'Aksesuar Adı:',
-    'additional_notes' => 'Ek Notlar:',
+    'accessory_name' => 'Aksesuar Adı',
+    'additional_notes' => 'Ek Notlar',
     'admin_has_created' => 'Bir yönetici sizin için :web site\'de bir hesap oluşturdu.',
-    'asset' => 'Varlık:',
-    'asset_name' => 'Varlık Adı:',
+    'asset' => 'Demirbaş',
+    'asset_name' => 'Demirbaş Adı',
     'asset_requested' => 'İstenen varlık',
     'asset_tag' => 'Varlık Adı',
     'assets_warrantee_alert' => 'Şu var: gelecek vadede garanti süresi dolmuş varlık sayımı: eşik günler. | Şunlar var: gelecek yıl sona ermesi garantili varlıklar sayılır: eşik günleri.',
     'assigned_to' => 'Atanmış',
     'best_regards' => 'En iyi dileklerimizle,',
-    'canceled' => 'İptal edildi:',
-    'checkin_date' => 'Giriş Tarihi:',
-    'checkout_date' => 'Çıkış Tarihi:',
+    'canceled' => 'İptal edildi',
+    'checkin_date' => 'Giriş Tarihi',
+    'checkout_date' => 'Çıkış Tarihi',
     'checkedout_from' => 'Teslim alınan kişi',
     'checkedin_from'  => 'Checked in from',
     'checked_into' => 'Çıkış yapılan',
@@ -49,27 +50,30 @@ return [
     'click_to_confirm' => 'Lütfen :hesabınızı: onaylamak için aşağıdaki linke tıklayınız:',
     'current_QTY' => 'Mevcut miktar',
     'days' => 'Günler',
-    'expecting_checkin_date' => 'Beklenen Giriş Tarihi:',
+    'expecting_checkin_date' => 'Beklenen geri alma tarihi',
     'expires' => 'Bitiş',
     'hello' => 'Merhaba',
     'hi' => 'Merhaba',
     'i_have_read' => 'Okudum ve kullanım şartlarını ve bu varlığı kabul ediyorum.',
     'inventory_report' => 'Envanter Raporu',
-    'item' => 'Ürün:',
+    'item' => 'Ürün',
+    'item_checked_reminder' => 'This is a reminder that you currently have :count items checked out to you that you have not accepted or declined. Please click the link below to confirm your decision.',
     'license_expiring_alert' => 'Şu var: bir sonraki günlerde süren lisans sayımı: eşik günleri. | Şunlar var: bir sonraki günlerde süren sayım lisansları: eşik günleri.',
     'link_to_update_password' => 'Şifrenizi güncellemek için aşağıdaki linke tıklayınız :web password:',
-    'login' => 'Giriş:',
+    'login' => 'Giriş',
     'login_first_admin' => 'Yeni Snipe-IT Kurulumu oturum açma kimlik bilgilerini aşağıdaki gibidir. ',
     'low_inventory_alert' => 'Şu var: Minimum envanterin altında olan veya yakında düşük olacak olan sayı maddesi. | Şunlar var: Minimum envanterin altında olan veya yakında olacak olan sayım maddeleri.',
     'min_QTY' => 'Min. Miktar',
     'name' => 'Ad',
     'new_item_checked' => 'Yeni varlık altında kullanıma alındı, ayrıntıları aşağıdadır.',
+    'new_item_checked_with_acceptance' => 'A new item has been checked out under your name that requires acceptance, details are below.',
+    'recent_item_checked' => 'An item was recently checked out under your name that requires acceptance, details are below.',
     'notes' => 'Notlar',
-    'password' => 'Parola:',
+    'password' => 'Şifre',
     'password_reset' => 'Parola Sıfırlama',
     'read_the_terms' => 'Aşağıdaki kullanım koşullarını okuyunuz.',
     'read_the_terms_and_click' => 'Lütfen aşağıdaki kullanım koşullarını okuyun ve kullanım koşullarını okuyup kabul ettiğinizi, demirbaşı teslim aldığınızı onaylamak için alttaki bağlantıya tıklayın.',
-    'requested' => 'Talep Edilen:',
+    'requested' => 'Talep Edilen',
     'reset_link' => 'Parola Sıfırlama Bağlantısı',
     'reset_password' => 'Şifrenizi sıfırlamak için burayı tıklatın:',
     'rights_reserved' => 'Her türlü hakkı saklıdır.',
@@ -86,8 +90,10 @@ return [
     'upcoming-audits' => ':count gün içinde denetime yaklaşan :count varlık var.|Eşik gün içinde denetime yaklaşan :count varlık var.',
     'user' => 'Kullanıcı',
     'username' => 'Kullanıcı Adı',
+    'unaccepted_asset_reminder' => 'Reminder: You have Unaccepted Assets.',
     'welcome' => 'Hoşgeldiniz, :name',
     'welcome_to' => 'Hoş geldiniz :web!',
     'your_assets' => 'Varlıkları Görüntüleme',
     'your_credentials' => 'Snipe-IT Bilgileriniz',
+    'mail_sent' => 'E-posta başarılı şekilde gönderildi!',
 ];
diff --git a/resources/lang/tr-TR/validation.php b/resources/lang/tr-TR/validation.php
index 7f3a648fa0..659ca76842 100644
--- a/resources/lang/tr-TR/validation.php
+++ b/resources/lang/tr-TR/validation.php
@@ -13,87 +13,150 @@ return [
     |
     */
 
-    'accepted'             => ': attribute benzersiz olması gerekir.',
-    'active_url'           => ':attribute geçersiz URL.',
-    'after'                => ':attribute :date sonra olmalı.',
-    'after_or_equal'       => ': Özniteliği, tarihten veya sonrasına ait bir tarih olmalıdır: date.',
-    'alpha'                => ':attribute sadece harf içermeli.',
-    'alpha_dash'           => ':attribute sadece harf, rakam ve noktalama işaretleri olabilir.',
-    'alpha_num'            => ':attribute sadece harf ve rakam olabilir.',
-    'array'                => ': Nitelik bir dizi olmalıdır.',
-    'before'               => ':attribute :date den önce olmalı.',
-    'before_or_equal'      => ': Özniteliği, tarihten önce veya ona eşit bir tarih olmalıdır: date.',
-    'between'              => [
-        'numeric' => ':attribute :min - :max arasında olmalı.',
-        'file'    => ':attribute :min - :max Kb arasında olmalı.',
-        'string'  => ':attribute :min - :max karakter arasında olmalı.',
-        'array'   => ': Özelliği,: min ve: max öğeleri arasında olmalıdır.',
+    'accepted' => 'Nitelik hanesi kabul edilmelidir.',
+    'accepted_if' => 'The :attribute field must be accepted when :other is :value.',
+    'active_url' => 'The :attribute field must be a valid URL.',
+    'after' => 'The :attribute field must be a date after :date.',
+    'after_or_equal' => 'The :attribute field must be a date after or equal to :date.',
+    'alpha' => 'The :attribute field must only contain letters.',
+    'alpha_dash' => 'The :attribute field must only contain letters, numbers, dashes, and underscores.',
+    'alpha_num' => 'The :attribute field must only contain letters and numbers.',
+    'array' => 'The :attribute field must be an array.',
+    'ascii' => 'The :attribute field must only contain single-byte alphanumeric characters and symbols.',
+    'before' => 'The :attribute field must be a date before :date.',
+    'before_or_equal' => 'The :attribute field must be a date before or equal to :date.',
+    'between' => [
+        'array' => 'The :attribute field must have between :min and :max items.',
+        'file' => 'The :attribute field must be between :min and :max kilobytes.',
+        'numeric' => 'The :attribute field must be between :min and :max.',
+        'string' => 'The :attribute field must be between :min and :max characters.',
     ],
-    'boolean'              => ':attribute doğru veya yanlış olabilir.',
-    'confirmed'            => ':attribute doğrulama uyuşmuyor.',
-    'date'                 => ':attribute geçerli bir tarih değil.',
-    'date_format'          => ':attribute biçim geçersiz.',
-    'different'            => ':attribute ve :other farklı olmalı.',
-    'digits'               => ':attribute :digits numara olmalı.',
-    'digits_between'       => ':attribute :min ve :max numara.',
-    'dimensions'           => ': Özniteliği geçersiz görüntü boyutlarına sahip.',
-    'distinct'             => ': Öznitelik alanı yinelenen bir değere sahip.',
-    'email'                => ':attribute biçim geçersiz.',
-    'exists'               => ':attribute seçim geçersiz.',
-    'file'                 => ': Özniteliği bir dosya olmalıdır.',
-    'filled'               => ': Attribute alanının bir değeri olmalıdır.',
-    'image'                => ':attribute bir görüntü olması gerekir.',
+    'boolean' => 'The :attribute field must be true or false.',
+    'can' => 'The :attribute field contains an unauthorized value.',
+    'confirmed' => 'The :attribute field confirmation does not match.',
+    'contains' => 'The :attribute field is missing a required value.',
+    'current_password' => 'The password is incorrect.',
+    'date' => 'The :attribute field must be a valid date.',
+    'date_equals' => 'The :attribute field must be a date equal to :date.',
+    'date_format' => 'The :attribute field must match the format :format.',
+    'decimal' => 'The :attribute field must have :decimal decimal places.',
+    'declined' => 'The :attribute field must be declined.',
+    'declined_if' => 'The :attribute field must be declined when :other is :value.',
+    'different' => 'The :attribute field and :other must be different.',
+    'digits' => 'The :attribute field must be :digits digits.',
+    'digits_between' => 'The :attribute field must be between :min and :max digits.',
+    'dimensions' => 'The :attribute field has invalid image dimensions.',
+    'distinct' => ': Öznitelik alanı yinelenen bir değere sahip.',
+    'doesnt_end_with' => 'The :attribute field must not end with one of the following: :values.',
+    'doesnt_start_with' => 'The :attribute field must not start with one of the following: :values.',
+    'email' => 'The :attribute field must be a valid email address.',
+    'ends_with' => 'The :attribute field must end with one of the following: :values.',
+    'enum' => ':attribute geçersiz.',
+    'exists' => ':attribute seçim geçersiz.',
+    'extensions' => 'The :attribute field must have one of the following extensions: :values.',
+    'file' => 'The :attribute field must be a file.',
+    'filled' => ': Attribute alanının bir değeri olmalıdır.',
+    'gt' => [
+        'array' => 'The :attribute field must have more than :value items.',
+        'file' => 'The :attribute field must be greater than :value kilobytes.',
+        'numeric' => 'The :attribute field must be greater than :value.',
+        'string' => 'The :attribute field must be greater than :value characters.',
+    ],
+    'gte' => [
+        'array' => 'The :attribute field must have :value items or more.',
+        'file' => 'The :attribute field must be greater than or equal to :value kilobytes.',
+        'numeric' => 'The :attribute field must be greater than or equal to :value.',
+        'string' => 'The :attribute field must be greater than or equal to :value characters.',
+    ],
+    'hex_color' => 'The :attribute field must be a valid hexadecimal color.',
+    'image' => 'The :attribute field must be an image.',
     'import_field_empty'    => 'Bu değer için :alan adı boş olamaz.',
-    'in'                   => ':attribute geçersiz.',
-    'in_array'             => ': Attribute alanı yok diğeri.',
-    'integer'              => ':attribute bir tamsayı olmalıdır.',
-    'ip'                   => ':attribute geçerli bir IP adresi olması gerekir.',
-    'ipv4'                 => ': Özniteliği geçerli bir IPv4 adresi olmalıdır.',
-    'ipv6'                 => ': Özniteliği geçerli bir IPv6 adresi olmalıdır.',
-    'is_unique_department' => 'Öznitelik bu Şirket Konumuna özgü olmalıdır',
-    'json'                 => ': Özniteliği geçerli bir JSON dizesi olmalıdır.',
-    'max'                  => [
-        'numeric' => ':attribute :max dan büyük olmalı.',
-        'file'    => ':attribute :max Kb tan büyük olmalı.',
-        'string'  => ':attribute :max karakterden büyük olamaz.',
-        'array'   => ': Özniteliği, maksimum öğelerden fazla olamaz.',
+    'in' => ':attribute geçersiz.',
+    'in_array' => 'The :attribute field must exist in :other.',
+    'integer' => 'The :attribute field must be an integer.',
+    'ip' => 'The :attribute field must be a valid IP address.',
+    'ipv4' => 'The :attribute field must be a valid IPv4 address.',
+    'ipv6' => 'The :attribute field must be a valid IPv6 address.',
+    'json' => 'The :attribute field must be a valid JSON string.',
+    'list' => 'The :attribute field must be a list.',
+    'lowercase' => 'The :attribute field must be lowercase.',
+    'lt' => [
+        'array' => 'The :attribute field must have less than :value items.',
+        'file' => 'The :attribute field must be less than :value kilobytes.',
+        'numeric' => 'The :attribute field must be less than :value.',
+        'string' => 'The :attribute field must be less than :value characters.',
     ],
-    'mimes'                => ':attribute :values türleri olmalı.',
-    'mimetypes'            => ': Özniteliği,:: değerleri türünde bir dosya olmalıdır.',
-    'min'                  => [
-        'numeric' => ':attribute :min den küçük olmalı.',
-        'file'    => ':attribute :min Kb tan küçük olmalı.',
-        'string'  => ':attribute :min karakterden küçük olmalı.',
-        'array'   => ': Özelliği en az: dakika öğesine sahip olmalıdır.',
+    'lte' => [
+        'array' => 'The :attribute field must not have more than :value items.',
+        'file' => 'The :attribute field must be less than or equal to :value kilobytes.',
+        'numeric' => 'The :attribute field must be less than or equal to :value.',
+        'string' => 'The :attribute field must be less than or equal to :value characters.',
     ],
-    'starts_with'          => 'Özellik aşağıdaki değerlerden biriyle başlamalıdır.',
-    'ends_with'            => ':attribute aşağıdakilerden biriyle bitmelidir: :values.',
+    'mac_address' => 'The :attribute field must be a valid MAC address.',
+    'max' => [
+        'array' => 'The :attribute field must not have more than :max items.',
+        'file' => 'The :attribute field must not be greater than :max kilobytes.',
+        'numeric' => 'The :attribute field must not be greater than :max.',
+        'string' => 'The :attribute field must not be greater than :max characters.',
+    ],
+    'max_digits' => 'The :attribute field must not have more than :max digits.',
+    'mimes' => 'The :attribute field must be a file of type: :values.',
+    'mimetypes' => 'The :attribute field must be a file of type: :values.',
+    'min' => [
+        'array' => 'The :attribute field must have at least :min items.',
+        'file' => 'The :attribute field must be at least :min kilobytes.',
+        'numeric' => 'The :attribute field must be at least :min.',
+        'string' => 'The :attribute field must be at least :min characters.',
+    ],
+    'min_digits' => 'The :attribute field must have at least :min digits.',
+    'missing' => 'The :attribute field must be missing.',
+    'missing_if' => 'The :attribute field must be missing when :other is :value.',
+    'missing_unless' => 'The :attribute field must be missing unless :other is :value.',
+    'missing_with' => 'The :attribute field must be missing when :values is present.',
+    'missing_with_all' => 'The :attribute field must be missing when :values are present.',
+    'multiple_of' => 'The :attribute field must be a multiple of :value.',
+    'not_in' => ':attribute geçersiz.',
+    'not_regex' => 'The :attribute field format is invalid.',
+    'numeric' => 'The :attribute field must be a number.',
+    'password' => [
+        'letters' => 'The :attribute field must contain at least one letter.',
+        'mixed' => 'The :attribute field must contain at least one uppercase and one lowercase letter.',
+        'numbers' => 'The :attribute field must contain at least one number.',
+        'symbols' => 'The :attribute field must contain at least one symbol.',
+        'uncompromised' => 'The given :attribute has appeared in a data leak. Please choose a different :attribute.',
+    ],
+    'percent'       => 'The depreciation minimum must be between 0 and 100 when depreciation type is percentage.',
 
-    'not_in'               => ':attribute geçersiz.',
-    'numeric'              => ':attribute sayı olmalıdır.',
-    'present'              => ': Attribute alanı bulunmalıdır.',
-    'valid_regex'          => 'Bu geçerli bir regex değildir.',
-    'regex'                => ':attribute formatı geçersiz.',
-    'required'             => ':attribute alanı zorunludur.',
-    'required_if'          => ':attribute :other :value geçersiz.',
-    'required_unless'      => ': Attribute alanı, aşağıdaki koşullar haricinde: other is in: values.',
-    'required_with'        => ':attribute :values geçersiz.',
-    'required_with_all'    => ': Öznitelik alanı, şu durumlarda gereklidir: değerler mevcut.',
-    'required_without'     => ':attribute :values geçersiz.',
+    'present' => ': Attribute alanı bulunmalıdır.',
+    'present_if' => 'The :attribute field must be present when :other is :value.',
+    'present_unless' => 'The :attribute field must be present unless :other is :value.',
+    'present_with' => 'The :attribute field must be present when :values is present.',
+    'present_with_all' => 'The :attribute field must be present when :values are present.',
+    'prohibited' => 'The :attribute field is prohibited.',
+    'prohibited_if' => 'The :attribute field is prohibited when :other is :value.',
+    'prohibited_unless' => 'The :attribute field is prohibited unless :other is in :values.',
+    'prohibits' => 'The :attribute field prohibits :other from being present.',
+    'regex' => 'The :attribute field format is invalid.',
+    'required' => ':attribute alanı zorunludur.',
+    'required_array_keys' => 'The :attribute field must contain entries for: :values.',
+    'required_if' => ':attribute :other :value geçersiz.',
+    'required_if_accepted' => 'The :attribute field is required when :other is accepted.',
+    'required_if_declined' => 'The :attribute field is required when :other is declined.',
+    'required_unless' => ': Attribute alanı, aşağıdaki koşullar haricinde: other is in: values.',
+    'required_with' => ':attribute :values geçersiz.',
+    'required_with_all' => 'The :attribute field is required when :values are present.',
+    'required_without' => ':attribute :values geçersiz.',
     'required_without_all' => ': Özellik alanının hiçbiri: değerleri mevcut değilse gereklidir.',
-    'same'                 => ':attribute ve :other aynı olmalı.',
-    'size'                 => [
-        'numeric' => ':attribute :size olmalı.',
-        'file'    => ':attribute :size Kb olmalı.',
-        'string'  => ':attribute :size karakter olmalı.',
-        'array'   => ': Özniteliği: boyut öğeleri içermelidir.',
+    'same' => 'The :attribute field must match :other.',
+    'size' => [
+        'array' => 'The :attribute field must contain :size items.',
+        'file' => 'The :attribute field must be :size kilobytes.',
+        'numeric' => 'The :attribute field must be :size.',
+        'string' => 'The :attribute field must be :size characters.',
     ],
+    'starts_with' => 'The :attribute field must start with one of the following: :values.',
     'string'               => ': Özniteliği bir dize olmalıdır.',
-    'timezone'             => ': Özniteliği geçerli bir bölge olmalıdır.',
     'two_column_unique_undeleted' => ':attribute :table1 ve :table2 genelinde benzersiz olmalıdır. ',
-    'unique'               => ':attribute zaten alınmış.',
-    'uploaded'             => ': Özniteliği yüklenemedi.',
-    'url'                  => ':attribute biçim geçersiz.',
     'unique_undeleted'     => ':attribute benzersiz olmalıdır.',
     'non_circular'         => ':attribute döngüsel bir başvuru oluşturmamalıdır.',
     'not_array'            => ':attribute bir dizi olamaz.',
@@ -102,11 +165,14 @@ return [
     'numbers'              => 'Şifre en az bir rakam içermelidir.',
     'case_diff'            => 'Şifre hem büyük hem küçük harf içermelidir.',
     'symbols'              => 'Şifre sembol içermelidir.',
-    'gte'                  => [
-        'numeric'          => 'Değer negatif olamaz'
-    ],
-    'checkboxes'           => ':attribute contains invalid options.',
-    'radio_buttons'        => ':attribute is invalid.',
+    'timezone' => 'The :attribute field must be a valid timezone.',
+    'unique' => ':attribute zaten alınmış.',
+    'uploaded' => ': Özniteliği yüklenemedi.',
+    'uppercase' => 'The :attribute field must be uppercase.',
+    'url' => 'The :attribute field must be a valid URL.',
+    'ulid' => 'The :attribute field must be a valid ULID.',
+    'uuid' => 'The :attribute field must be a valid UUID.',
+    'fmcs_location' => 'Full multiple company support and location scoping is enabled in the Admin Settings, and the selected location and selected company are not compatible.',
 
 
     /*
@@ -120,16 +186,22 @@ return [
     |
     */
 
+    'email_array'      => 'Bir veya daha fazla e-posta adresi geçersiz.',
+    'checkboxes'           => ':attribute contains invalid options.',
+    'radio_buttons'        => ':attribute is invalid.',
+    
     'custom' => [
         'alpha_space' => ': Attribute alanı, izin verilmeyen bir karakter içeriyor.',
-        'email_array'      => 'Bir veya daha fazla e-posta adresi geçersiz.',
+
         'hashed_pass'      => 'Geçerli şifre yanlış',
         'dumbpwd'          => 'Bu şifre çok yaygındır.',
         'statuslabel_type' => 'Geçerli bir durum etiketi türü seçmelisiniz',
+        'custom_field_not_found'          => 'This field does not seem to exist, please double check your custom field names.',
+        'custom_field_not_found_on_model' => 'This field seems to exist, but is not available on this Asset Model\'s fieldset.',
 
         // date_format validation with slightly less stupid messages. It duplicates a lot, but it gets the job done :(
-        // We use this because the default error message for date_format is reflects php Y-m-d, which non-PHP
-        // people won't know how to format. 
+        // We use this because the default error message for date_format reflects php Y-m-d, which non-PHP
+        // people won't know how to format.
         'purchase_date.date_format'     => ':attribute YYYY-MM-DD tarih formatında olmalıdır',
         'last_audit_date.date_format'   =>  ':attribute YYYY-MM-DD hh:mm:ss tarih formatında olmalıdır',
         'expiration_date.date_format'   =>  ':attribute YYYY-MM-DD şeklinde geçerli bir tarih formatında olmalıdır',
@@ -137,9 +209,15 @@ return [
         'expected_checkin.date_format'  =>  ':attribute YYYY-MM-DD şeklinde geçerli bir tarih formatında olmalıdır',
         'start_date.date_format'        =>  ':attribute YYYY-MM-DD şeklinde geçerli bir tarih formatında olmalıdır',
         'end_date.date_format'          =>  ':attribute YYYY-MM-DD şeklinde geçerli bir tarih formatında olmalıdır',
+        'invalid_value_in_field' => 'Invalid value included in this field',
 
-    ],
+        'ldap_username_field' => [
+            'not_in' =>         '<code>sAMAccountName</code> (mixed case) will likely not work. You should use <code>samaccountname</code> (lowercase) instead.'
+        ],
+        'ldap_auth_filter_query' => ['not_in' => '<code>uid=samaccountname</code> is probably not a valid auth filter. You probably want <code>uid=</code> '],
+        'ldap_filter' => ['regex' => 'This value should probably not be wrapped in parentheses.'],
 
+        ],
     /*
     |--------------------------------------------------------------------------
     | Custom Validation Attributes
@@ -155,8 +233,16 @@ return [
 
     /*
     |--------------------------------------------------------------------------
-    | Generic Validation Messages
+    | Generic Validation Messages - we use these in the jquery validation where we don't have
+    | access to the :attribute
     |--------------------------------------------------------------------------
     */
-    'invalid_value_in_field' => 'Invalid value included in this field',
+
+    'generic' => [
+        'invalid_value_in_field' => 'Invalid value included in this field',
+        'required' => 'This field is required',
+        'email' => 'Please enter a valid email address',
+    ],
+
+
 ];
diff --git a/resources/lang/uk-UA/account/general.php b/resources/lang/uk-UA/account/general.php
index eb5b534136..cb92c04bb5 100644
--- a/resources/lang/uk-UA/account/general.php
+++ b/resources/lang/uk-UA/account/general.php
@@ -2,10 +2,17 @@
 
 return array(
     'personal_api_keys' => 'Особисті ключі API',
-    'api_key_warning' => 'When generating an API token, be sure to copy it down immediately as they will not be visible to you again.',
+    'personal_access_token' => 'Персональний токен доступу',
+    'personal_api_keys_success' => 'Персональний ключ API :key створено успішно',
+    'here_is_api_key' => 'Це ваш новий персональний токен доступу. Це буде показано лише один раз, так що не втратте! Ви можете тепер використовувати цей токен щоб зробити API запитів.',
+    'api_key_warning' => 'Під час створення токену API, не забудьте надійно зберегти його,
+тому що він не буде вам знову показаний.',
     'api_base_url' => 'Ваша базова URL-адреса API:',
     'api_base_url_endpoint' => '/&lt;ресурс&gt;',
     'api_token_expiration_time' => 'API токени закінчуються:',
-    'api_reference' => 'Please check the <a href="https://snipe-it.readme.io/reference" target="_blank">API reference</a> to find specific API endpoints and additional API documentation.',
-    'profile_updated' => 'Account successfully updated',
+    'api_reference' => 'Будь ласка, перевірте <a href="https://snipe-it.readme.io/reference" target="_blank">довідку по API</a>, щоб дізнатись про ресурси API та додаткову документацію стосовно них.',
+    'profile_updated' => 'Обліковий запис успішно оновлено',
+    'no_tokens' => 'Ви не створили жодних особистих токенів доступу.',
+    'enable_sounds' => 'Увімкнути звукові ефекти',
+    'enable_confetti' => 'Увімкнути ефекти конфетті',
 );
diff --git a/resources/lang/uk-UA/admin/accessories/message.php b/resources/lang/uk-UA/admin/accessories/message.php
index 42f5f12f93..36ff56e734 100644
--- a/resources/lang/uk-UA/admin/accessories/message.php
+++ b/resources/lang/uk-UA/admin/accessories/message.php
@@ -26,7 +26,11 @@ return array(
         'error'   		=> 'Аксесуар не був відмічений, будь ласка, спробуйте ще раз',
         'success' 		=> 'Аксесуар успішно видано.',
         'unavailable'   => 'Аксесуар недоступний для оформлення замовлення. Перевірте кількість доступних',
-        'user_does_not_exist' => 'Невірний користувач. Спробуйте ще раз.'
+        'user_does_not_exist' => 'Невірний користувач. Спробуйте ще раз.',
+         'checkout_qty' => array(
+            'lte'  => 'Ви намагаєтеся видати :checkout_qty аксесуарів, проте на даний час доступний лише один аксесуар даного типу. Будь ласка, змініть кількість для видачі або доступний залишок для видачі і спробуйте ще раз. Ви намагаєтеся видати :checkout_qty аксесуарів, проте в наявності check out :checkout_qty. Будь ласка, змініть кількість для видачі або доступний залишок для видачі і спробуйте ще раз.',
+            ),
+           
     ),
 
     'checkin' => array(
diff --git a/resources/lang/uk-UA/admin/accessories/table.php b/resources/lang/uk-UA/admin/accessories/table.php
index 0d8b651e17..74b2891479 100644
--- a/resources/lang/uk-UA/admin/accessories/table.php
+++ b/resources/lang/uk-UA/admin/accessories/table.php
@@ -6,6 +6,4 @@ return array(
     'id'      					=> 'ID',
     'require_acceptance'      	=> 'Схвалення',
     'title'      				=> 'Назва аксесуара',
-
-
 );
diff --git a/resources/lang/uk-UA/admin/components/message.php b/resources/lang/uk-UA/admin/components/message.php
index 08c523d24a..1660fb8b64 100644
--- a/resources/lang/uk-UA/admin/components/message.php
+++ b/resources/lang/uk-UA/admin/components/message.php
@@ -17,7 +17,8 @@ return array(
     'delete' => array(
         'confirm'   => 'Ви впевнені, що хочете видалити цей компонент?',
         'error'   => 'Виникла проблема при видаленні компонента. Спробуйте ще раз.',
-        'success' => 'Компонент було успішно видалено.'
+        'success' => 'Компонент було успішно видалено.',
+        'error_qty'   => 'Деякі компоненти цього типу все ще перевіряються. Будь ласка, перевірте їх і спробуйте ще раз.',
     ),
 
      'checkout' => array(
diff --git a/resources/lang/uk-UA/admin/consumables/general.php b/resources/lang/uk-UA/admin/consumables/general.php
index 2611a9a6b6..819c88a899 100644
--- a/resources/lang/uk-UA/admin/consumables/general.php
+++ b/resources/lang/uk-UA/admin/consumables/general.php
@@ -8,4 +8,5 @@ return array(
     'remaining' 			            => 'Залишилось',
     'total' 			                => 'Загалом',
     'update'                            => 'Оновити витратний матеріал',
+    'inventory_warning'                 => 'Запас цього витратного матеріалу нижчий за мінімальну кількість :min_count',
 );
diff --git a/resources/lang/uk-UA/admin/consumables/message.php b/resources/lang/uk-UA/admin/consumables/message.php
index d875be1d66..929ce0e1c8 100644
--- a/resources/lang/uk-UA/admin/consumables/message.php
+++ b/resources/lang/uk-UA/admin/consumables/message.php
@@ -2,6 +2,7 @@
 
 return array(
 
+    'invalid_category_type' => 'Категорія має бути категорією витратних матеріалів.',
     'does_not_exist' => 'Витратний матеріал не існує.',
 
     'create' => array(
diff --git a/resources/lang/uk-UA/admin/custom_fields/general.php b/resources/lang/uk-UA/admin/custom_fields/general.php
index 931f278141..ad52c40f7a 100644
--- a/resources/lang/uk-UA/admin/custom_fields/general.php
+++ b/resources/lang/uk-UA/admin/custom_fields/general.php
@@ -35,7 +35,7 @@ return [
     'create_field_title' => 'Створіть нове спеціальне поле',
     'value_encrypted'      	        => 'Значення цього поля зашифровано в базі даних. Тільки адміністратори зможуть переглядати значення розшифрованого',
     'show_in_email'     => 'Включити значення цього поля в листа для перевірки, які відправляються користувачу? Зашифровані поля не можуть бути включені в листи',
-    'show_in_email_short'     => 'Включити до email.',
+    'show_in_email_short' => 'Включити до email',
     'help_text' => 'Текст довідки',
     'help_text_description' => 'Це необов\'язковий текст, який буде відображатися під елементами форм під час редагування медіафайла для надання контексту в полі.',
     'about_custom_fields_title' => 'Про індивідуальні поля',
@@ -57,5 +57,8 @@ return [
     'show_in_requestable_list_short' => 'Показати в списку активів',
     'show_in_requestable_list' => 'Показувати значення в списку активів, які запитуються. Зашифровані поля не будуть показані',
     'encrypted_options' => 'Це поле зашифроване, так що деякі параметри відображення не будуть доступні.',
+    'display_checkin' => 'Відображати в формах перевірки',
+    'display_checkout' => 'Відображати в формах перевірки',
+    'display_audit' => 'Відображати в формах перевірки',
 
 ];
diff --git a/resources/lang/uk-UA/admin/custom_fields/message.php b/resources/lang/uk-UA/admin/custom_fields/message.php
index e9bc38383a..0df559dba9 100644
--- a/resources/lang/uk-UA/admin/custom_fields/message.php
+++ b/resources/lang/uk-UA/admin/custom_fields/message.php
@@ -5,6 +5,7 @@ return array(
     'field' => array(
         'invalid'   => 'Це поле не існує.',
         'already_added'   => 'Поле вже додане',
+        'none_selected'   => 'Не вибрано поле',
 
         'create' => array(
             'error'   => 'Поле не створено, будь ласка, спробуйте ще раз.',
diff --git a/resources/lang/uk-UA/admin/depreciations/general.php b/resources/lang/uk-UA/admin/depreciations/general.php
index d1d5379aa7..0e32207b90 100644
--- a/resources/lang/uk-UA/admin/depreciations/general.php
+++ b/resources/lang/uk-UA/admin/depreciations/general.php
@@ -13,4 +13,8 @@ return [
     'no_depreciations_warning'               => '<strong>Попередження: </strong>
                        Наразі у вас не налаштовано амортизацію.
                        Налаштуйте принаймні одну амортизацію, щоб переглянути звіт про амортизацію.',
+    'depreciation_method'                   => 'Звіт про амортизацію',
+    'linear_depreciation'                   => 'Лінійно (типово)',
+    'half_1'                                => 'На піврічному нарисі завжди застосовано',
+    'half_2'                                => 'Півріччя для прикладу, застосований з умовою',
 ];
diff --git a/resources/lang/uk-UA/admin/hardware/form.php b/resources/lang/uk-UA/admin/hardware/form.php
index 2413f24af5..26873e544b 100644
--- a/resources/lang/uk-UA/admin/hardware/form.php
+++ b/resources/lang/uk-UA/admin/hardware/form.php
@@ -39,9 +39,9 @@ return [
     'order'				=> 'Номер замовлення',
     'qr'				=> 'QR-код',
     'requestable'		=> 'Користувачі можуть запитувати цей медіафайл',
-    'redirect_to_all'   => 'Return to all :type',
-    'redirect_to_type'   => 'Go to :type',
-    'redirect_to_checked_out_to'   => 'Go to Checked Out to',
+    'redirect_to_all'   => 'Повернутися до всіх :type',
+    'redirect_to_type'   => 'Перейти до :type',
+    'redirect_to_checked_out_to'   => 'Перейти до виданих',
     'select_statustype'	=> 'Виберіть тип статусу',
     'serial'			=> 'Серійник',
     'status'			=> 'Статус',
@@ -55,8 +55,11 @@ return [
     'asset_location_update_default' => 'Оновити тільки типове розташування',
     'asset_location_update_actual' => 'Оновити тільки фактичне місцезнаходження',
     'asset_not_deployable' => 'Стан активу не є розгортаним. Цей актив не може бути відмічений.',
-    'asset_deployable' => 'Цей статус розміщено на ньому. Цей медіафайл може бути перевірений.',
+    'asset_not_deployable_checkin' => 'Цей статус Активу не є розгортаним. За допомогою цієї мітки статусу позначте в активі.',
+    'asset_deployable' => 'Цей актив може бути перевірений.',
     'processing_spinner' => 'Обробка... (Це може зайняти деякий час для великих файлів)',
+    'processing' => 'Обробка... ',
     'optional_infos'  => 'Додаткова інформація',
-    'order_details'   => 'Пов\'язані відомості про замовлення'
+    'order_details'   => 'Пов\'язані відомості про замовлення',
+    'calc_eol'    => 'Якщо необхідно обнулити дату EOL, використовуйте автоматичний розрахунок EOL на основі дати покупки й дати EOL.',
 ];
diff --git a/resources/lang/uk-UA/admin/hardware/general.php b/resources/lang/uk-UA/admin/hardware/general.php
index 457eb6e636..71964b9a0a 100644
--- a/resources/lang/uk-UA/admin/hardware/general.php
+++ b/resources/lang/uk-UA/admin/hardware/general.php
@@ -5,8 +5,8 @@ return [
     'about_assets_text'            => 'Активи це елементи відстежувані серійним номером або тегом активів. Вони зазвичай є вищими значеннями, де визначається конкретний товар.',
     'archived'  				=> 'Архівний',
     'asset'  					=> 'Актив',
-    'bulk_checkout'             => 'Видати активи',
-    'bulk_checkin'              => 'Checkin Assets',
+    'bulk_checkout'             => 'Масово видати',
+    'bulk_checkin'              => 'Масово видати',
     'checkin'  					=> 'Прийняти актив',
     'checkout'  				=> 'Видати актив',
     'clone'  					=> 'Клонувати актив',
@@ -15,8 +15,8 @@ return [
     'delete_confirm'            => 'Ви впевнені, що хочете видалити цей медіафайл?',
     'edit'  					=> 'Редагувати актив',
     'model_deleted'  			=> 'Ця модель активів була видалена. Ви повинні відновити модель, перш ніж ви зможете відновити Ця модель.',
-    'model_invalid'             => 'This model for this asset is invalid.',
-    'model_invalid_fix'         => 'The asset must be updated use a valid asset model before attempting to check it in or out, or to audit it.',
+    'model_invalid'             => 'Модель цього Актива недійсна.',
+    'model_invalid_fix'         => 'Актив повинен бути оновлений за допомогою припустимої моделі перш ніж намагатися видати чи здати, або проведення його аудиту.',
     'requestable'               => 'Доступно для запиту',
     'requested'				    => 'Запрошено користувачем',
     'not_requestable'           => 'Ви не можете запросити',
@@ -27,13 +27,12 @@ return [
     'undeployable_tooltip'  	=> 'Цей медіафайл має марку стану, який не можна розгорнути, і цей час не може бути перевірений.',
     'view'  					=> 'Переглянути актив',
     'csv_error' => 'У вас є помилка у файлі CSV:',
-    'import_text' => '<p>Upload a CSV that contains asset history. The assets and users MUST already exist in the system, or they will be skipped. Matching assets for history import happens against the asset tag. We will try to find a matching user based on the user\'s name you provide, and the criteria you select below. If you do not select any criteria below, it will simply try to match on the username format you configured in the <code>Admin &gt; General Settings</code>.</p><p>Fields included in the CSV must match the headers: <strong>Asset Tag, Name, Checkout Date, Checkin Date</strong>. Any additional fields will be ignored. </p><p>Checkin Date: blank or future checkin dates will checkout items to associated user.  Excluding the Checkin Date column will create a checkin date with todays date.</p>
-    ',
+    'import_text' => '<p>Завантажте файл CSV, який містить історію активів. Активи та користувачі ПОВИННІ вже існувати в системі, інакше їх буде пропущено. Зіставлення активів для імпорту історії відбувається за тегом Активу. Ми спробуємо знайти відповідного користувача на основі наданого вами імені користувача та критеріїв, які ви виберете нижче. Якщо ви не виберете жодного критерію нижче, ми просто спробуємо знайти співпадіння по формату імені користувача, який ви налаштували в розділі <code> адміністратора &gt; Загальні налаштування </code>.</p><p>Поля, включені до CSV, мають відповідати заголовкам: <strong>Тег Активу, Ім\'я, Дата Видачі, Дата Повернення</strong>. Будь-які додаткові поля ігноруватимуться. </p><p>Дата Повернення: порожня або майбутня дата видачі призведе до видачі активів пов’язаному користувачеві. Якщо виключити стовпець "Дата Повернення", дата повернення буде мати сьогоднішню дату.</p>    ',
     'csv_import_match_f-l' => 'Спробуйте відповідати користувачам формату <strong>firstname.lastname</strong> (<code>jane.smith</code>)',
-    'csv_import_match_initial_last' => 'Try to match users by <strong>first initial last name</strong> (<code>jsmith</code>) format',
-    'csv_import_match_first' => 'Try to match users by <strong>first name</strong> (<code>jane</code>) format',
+    'csv_import_match_initial_last' => 'Спробуйте зіставити користувачів по <strong> з першими символами ім\'я формату </strong> (<code>jsmith</code>)',
+    'csv_import_match_first' => 'Спробуйте зіставити користувачів по формату <strong>first name</strong> (<code>jane</code>)',
     'csv_import_match_email' => 'Спробуйте відповідати користувачам з <strong>email</strong> як ім\'я користувача',
-    'csv_import_match_username' => 'Try to match users by <strong>username</strong>',
+    'csv_import_match_username' => 'Спробуйте зіставити користувачів з <strong>username</strong>',
     'error_messages' => 'Повідомлення про помилки:',
     'success_messages' => 'Повідомлення про успіх:',
     'alert_details' => 'Будь ласка, подивіться нижче для деталей.',
diff --git a/resources/lang/uk-UA/admin/hardware/message.php b/resources/lang/uk-UA/admin/hardware/message.php
index 13172a9e01..1a4d235f3e 100644
--- a/resources/lang/uk-UA/admin/hardware/message.php
+++ b/resources/lang/uk-UA/admin/hardware/message.php
@@ -2,19 +2,23 @@
 
 return [
 
-    'undeployable' 		=> '<strong>Попередження: </strong> цей актив позначено як такий, що наразі неможливо розгорнути.
-                         Якщо цей статус змінився, оновіть статус активу.',
-    'does_not_exist' 	=> 'Медіафайл не існує.',
-    'does_not_exist_var'=> 'Asset with tag :asset_tag not found.',
-    'no_tag' 	        => 'No asset tag provided.',
+    'undeployable' 		 => '<strong>Попередження: </strong> цей актив позначено як такий, що наразі неможливо розгорнути. Якщо цей статус змінився, оновіть статус активу.',
+    'does_not_exist' 	 => 'Медіафайл не існує.',
+    'does_not_exist_var' => 'Активу з тегом :asset_tag не знайдено.',
+    'no_tag' 	         => 'Тег Активу не надано.',
     'does_not_exist_or_not_requestable' => 'Цей актив не існує або його не можна запитувати.',
-    'assoc_users'	 	=> 'Цей актив в даний час відмічений користувачу і не може бути видалений. Спочатку перевірте активи, а потім спробуйте видалити знову. ',
-    'warning_audit_date_mismatch' 	=> 'This asset\'s next audit date (:next_audit_date) is before the last audit date (:last_audit_date). Please update the next audit date.',
+    'assoc_users'	 	 => 'Цей актив в даний час відмічений користувачу і не може бути видалений. Спочатку перевірте активи, а потім спробуйте видалити знову. ',
+    'warning_audit_date_mismatch' 	=> 'Ця дата наступного аудиту Активів (:next_audit_date) раніша до дати останнього аудиту (:last_audit_date). Будь ласка, оновіть дату наступного контролю.',
+    'labels_generated'   => 'Мітки були успішно створені.',
+    'error_generating_labels' => 'Помилка при формуванні міток.',
+    'no_assets_selected' => 'Не вибрано жодного Актива.',
 
     'create' => [
         'error'   		=> 'Актив не був створений, будь ласка, спробуйте ще раз :(',
         'success' 		=> 'Актив успішно створений. :)',
         'success_linked' => 'Активу з тегом :tag було успішно створено. <strong><a href=":link" style="color: white;">Натисніть тут, щоб переглянути</a></strong>.',
+        'multi_success_linked' => 'Активу з тегом :links було успішно створено.|:count активів було успішно створено. :links.',
+        'partial_failure' => 'Актив не може бути створений. Причина: :відмова створення |:count активів. Причина: :відмова',
     ],
 
     'update' => [
@@ -34,7 +38,7 @@ return [
     ],
 
     'audit' => [
-        'error'   		=> 'Asset audit unsuccessful: :error ',
+        'error'   		=> 'Помилка аудиту активів: :error ',
         'success' 		=> 'Активу успішно зараховано журнал.',
     ],
 
@@ -52,20 +56,24 @@ return [
     ],
 
     'import' => [
+        'import_button'         => 'Імпорт процесу',
         'error'                 => 'Деякі елементи не імпортовано належним чином.',
         'errorDetail'           => 'Наступні елементи не були імпортовані через помилки.',
         'success'               => 'Ваш файл імпортовано',
         'file_delete_success'   => 'Ваш файл успішно вилучено',
         'file_delete_error'      => 'Файл не може бути видалений',
         'file_missing' => 'Відсутній файл',
+        'file_already_deleted' => 'Обраний файл вже видалено',
         'header_row_has_malformed_characters' => 'Один або кілька атрибутів у рядку заголовка містять невірні символи UTF-8',
         'content_row_has_malformed_characters' => 'Один або кілька атрибутів у першому рядку вмісту містять неправильні символи UTF-8',
+        'transliterate_failure' => 'Перенесення з :encoding в UTF-8 не вдалося через неприпустимі символи в введенні'
     ],
 
 
     'delete' => [
         'confirm'   	=> 'Ви впевнені, що хочете видалити цей медіафайл?',
         'error'   		=> 'Виникла проблема при видаленні активу. Будь ласка, спробуйте ще раз.',
+        'assigned_to_error' => '{1}Asset Tag: :asset_tag в даний час відмічений. Перевірте цей пристрій перед видаленням. [2,*]Теги актива: :asset_tag наразі перевірені. Перевірте ці пристрої перед видаленням.',
         'nothing_updated'   => 'Активи не були вибрані, тому нічого не було видалено.',
         'success' 		=> 'Актив успішно видалений.',
     ],
@@ -78,6 +86,11 @@ return [
         'no_assets_selected' => 'Ви повинні вибрати хоча б один медіафайл зі списку',
     ],
 
+    'multi-checkout' => [
+        'error'   => 'Актив не був перевірений, будь ласка, спробуйте ще раз|Активи не були відмічені, будь ласка, спробуйте ще раз',
+        'success' => 'Актив успішно перевірено. | Активи успішно перевірені.',
+    ],
+
     'checkin' => [
         'error'   		=> 'Актив не був перевірений, будь ласка, спробуйте ще раз',
         'success' 		=> 'Актив успішно перевірено.',
@@ -87,9 +100,10 @@ return [
     ],
 
     'requests' => [
-        'error'   		=> 'Актив не був запитаний, будь ласка, спробуйте ще раз',
-        'success' 		=> 'Актив успішно запитаний.',
-        'canceled'      => 'Запит на оформлення замовлення успішно скасовано',
+        'error'   		=> 'Актив не був запитаний, будь ласка, спробуйте ще раз.',
+        'success' 		=> 'Запит успішно надіслано.',
+        'canceled'      => 'Запит успішно скасовано.',
+        'cancel'        => 'Відмінити цей запит на додавання',
     ],
 
 ];
diff --git a/resources/lang/uk-UA/admin/hardware/table.php b/resources/lang/uk-UA/admin/hardware/table.php
index 730984ec1b..5cfb4c1fd3 100644
--- a/resources/lang/uk-UA/admin/hardware/table.php
+++ b/resources/lang/uk-UA/admin/hardware/table.php
@@ -25,7 +25,6 @@ return [
     'image'		    => 'Зображення пристрою',
     'days_without_acceptance' => 'Днів без прийняття',
     'monthly_depreciation' => 'Місячна амортизація',
-    'assigned_to'    => 'Призначено',
     'requesting_user' => 'Запит користувача',
     'requested_date' => 'Дата запиту',
     'changed'       => 'Змінено',
diff --git a/resources/lang/uk-UA/admin/kits/general.php b/resources/lang/uk-UA/admin/kits/general.php
index 9756201b91..4959126077 100644
--- a/resources/lang/uk-UA/admin/kits/general.php
+++ b/resources/lang/uk-UA/admin/kits/general.php
@@ -47,4 +47,5 @@ return [
     'kit_deleted'                       => 'Набір було успішно видалено',
     'kit_model_updated'                 => 'Модель успішно оновлено',
     'kit_model_detached'                => 'Модель успішно від’єднано',
+    'model_already_attached'            => 'Модель вже прикріплена до комплекту',
 ];
diff --git a/resources/lang/uk-UA/admin/licenses/general.php b/resources/lang/uk-UA/admin/licenses/general.php
index 50efbeffcb..a5fed931c7 100644
--- a/resources/lang/uk-UA/admin/licenses/general.php
+++ b/resources/lang/uk-UA/admin/licenses/general.php
@@ -14,6 +14,7 @@ return array(
     'info'  					=> 'Інформація про ліцензію',
     'license_seats'  			=> 'Місця ліцензії',
     'seat'  					=> 'Місце',
+    'seat_count'  				=> 'Місце :count',
     'seats'  					=> 'Кількість місць',
     'software_licenses'  		=> 'Ліцензії на програмне забезпечення',
     'user'  					=> 'Користувач',
@@ -23,12 +24,12 @@ return array(
         [
             'checkin_all'           => [
                 'button'            => 'Прийняти всі місця',
-                'modal'             => 'Це призведе до перевірки дій в одному місці. | Ця дія буде перевіряти всі :checkedout_seats_count місць для цієї ліцензії.',
+                'modal'             => 'Ця дія перевірятиме всі місця в одному місці. | Ця дія буде перевіряти всі :checkedout_seats_count місць для цієї ліцензії.',
                 'enabled_tooltip'   => 'Прийняти ВСІ місця для цієї ліцензії від користувачів і активів',
                 'disabled_tooltip'  => 'Це вимкнено, тому що наразі немає місць',
                 'disabled_tooltip_reassignable'  => 'Це вимкнено, оскільки ліцензія не є розумною',
                 'success'           => 'Ліцензія успішно перевірена! | Всі ліцензії успішно перевірені!',
-                'log_msg'           => 'Перевірено через масову ліцензію з використанням GUI',
+                'log_msg'           => 'Зареєстровано через масове повернення ліцензій у графічному інтерфейсі ліцензій',
             ],
 
             'checkout_all'              => [
diff --git a/resources/lang/uk-UA/admin/licenses/message.php b/resources/lang/uk-UA/admin/licenses/message.php
index 97b3edcad7..7beee110a7 100644
--- a/resources/lang/uk-UA/admin/licenses/message.php
+++ b/resources/lang/uk-UA/admin/licenses/message.php
@@ -44,10 +44,13 @@ return array(
         'error'   => 'Виникла проблема з перевіркою ліцензії. Спробуйте ще раз.',
         'success' => 'Ліцензію успішно перевірено',
         'not_enough_seats' => 'Недостатньо вільних ліцензійних місць для оформлення замовлення',
+        'mismatch' => 'Надане місце ліцензії не відповідає ліцензії',
+        'unavailable' => 'Це місце недоступне для видачі.',
     ),
 
     'checkin' => array(
         'error'   => 'Виникла помилка перевірки ліцензії. Будь ласка, спробуйте ще раз.',
+        'not_reassignable' => 'Ліцензія не є допустимою',
         'success' => 'Ліцензія успішно перевірена'
     ),
 
diff --git a/resources/lang/uk-UA/admin/locations/message.php b/resources/lang/uk-UA/admin/locations/message.php
index 24ea7a9b70..dbaa6ea80f 100644
--- a/resources/lang/uk-UA/admin/locations/message.php
+++ b/resources/lang/uk-UA/admin/locations/message.php
@@ -3,11 +3,12 @@
 return array(
 
     'does_not_exist' => 'Розташування не існує.',
-    'assoc_users'    => 'This location is not currently deletable because it is the location of record for at least one asset or user, has assets assigned to it, or is the parent location of another location. Please update your models to no longer reference this company and try again. ',
+    'assoc_users'    => 'Це розташування наразі не можна видалити, оскільки воно є місцем запису принаймні для одного Активу чи користувача, йому призначено Активи або воно є батьківським місцем для іншого розташування. Оновіть свої записи, щоб більше не згадувати це місце, і повторіть спробу ',
     'assoc_assets'	 => 'Це розташування в даний час пов\'язано принаймні з одним активом і не може бути видалений. Будь ласка, оновіть ваші медіафайли, щоб більше не посилатися на це розташування і повторіть спробу. ',
     'assoc_child_loc'	 => 'Це місцезнаходження наразі батько принаймні одного дочірнього місця і не може бути видалений. Будь ласка, оновіть ваше місцеположення, щоб більше не посилатися на це місце і повторіть спробу. ',
     'assigned_assets' => 'Призначені активи',
     'current_location' => 'Поточне місцезнаходження',
+    'open_map' => 'Відкрити в картах :map_provider_icon',
 
 
     'create' => array(
@@ -20,6 +21,11 @@ return array(
         'success' => 'Розташування успішно створено.'
     ),
 
+    'restore' => array(
+        'error'   => 'Розташування не було відновлено, спробуйте ще раз',
+        'success' => 'Розташування успішно відновлено.'
+    ),
+
     'delete' => array(
         'confirm'   	=> 'Ви впевнені, що хочете видати це розташування?',
         'error'   => 'Виникла проблема з видаленням місцезнаходження. Будь ласка, спробуйте ще раз.',
diff --git a/resources/lang/uk-UA/admin/locations/table.php b/resources/lang/uk-UA/admin/locations/table.php
index 52a133372c..970ad3f981 100644
--- a/resources/lang/uk-UA/admin/locations/table.php
+++ b/resources/lang/uk-UA/admin/locations/table.php
@@ -39,4 +39,5 @@ return [
     'signed_by_finance_auditor' => 'Підписано (Фінансовий Аудитор):',
     'signed_by_location_manager' => 'Підписано (Менеджер Місцезнаходження):',
     'signed_by'                 => 'Підписався від:',
+    'clone'  					=> 'Clone Location',
 ];
diff --git a/resources/lang/uk-UA/admin/models/general.php b/resources/lang/uk-UA/admin/models/general.php
index 760fc7fb19..5b2569a0e8 100644
--- a/resources/lang/uk-UA/admin/models/general.php
+++ b/resources/lang/uk-UA/admin/models/general.php
@@ -3,7 +3,7 @@
 return array(
     'about_models_title'     => 'Про моделі активів',
     'about_models_text'           => 'Моделі активів це спосіб групування ідентичних активів. Наприклад, «Lenovo G700», «Nokia 3310», тощо.',
-    'deleted'  					        => 'Цю модель було видалено.',
+    'deleted'  					=> 'Цю модель було видалено.',
     'bulk_delete'               => 'Масове видалення моделей активів',
     'bulk_delete_help'               => 'Скористайтеся прапорцями нижче, щоб підтвердити видалення вибраних моделей активів. Моделі активу, які мають активи, пов\'язані з ними, не можуть бути видалені, поки активи не пов\'язані з іншою моделлю.',
     'bulk_delete_warn'          => 'Ви збираєтеся видалити одну модель активу. | Ви збираєтеся видалити :model_count моделей активів.',
diff --git a/resources/lang/uk-UA/admin/models/message.php b/resources/lang/uk-UA/admin/models/message.php
index a19a1d2f42..1b85c8f93a 100644
--- a/resources/lang/uk-UA/admin/models/message.php
+++ b/resources/lang/uk-UA/admin/models/message.php
@@ -7,7 +7,7 @@ return array(
     'no_association' => 'УВАГА! Модель активу для цього елемента невірна або відсутня!',
     'no_association_fix' => 'Це може порушити речі дивним і жахливим способом. Відредагуйте цей актив щоб призначити йому модель.',
     'assoc_users'	 => 'Ця модель пов\'язана в даний час з одним або більше активами і не може бути видалена. Будь ласка, видаліть активи, а потім спробуйте видалити їх. ',
-
+    'invalid_category_type' => 'Ця категорія має бути категорією активів.',
 
     'create' => array(
         'error'   => 'Модель не було створено, спробуйте ще раз.',
diff --git a/resources/lang/uk-UA/admin/reports/general.php b/resources/lang/uk-UA/admin/reports/general.php
index 3f78787ae9..87a432358b 100644
--- a/resources/lang/uk-UA/admin/reports/general.php
+++ b/resources/lang/uk-UA/admin/reports/general.php
@@ -4,6 +4,7 @@ return [
     'info'   => 'Виберіть варіанти, які Ви хочете для звіту про активи.',
     'deleted_user' => 'Видалений користувач',
     'send_reminder' => 'Надіслати нагадування',
+    'cannot_send_reminder' => 'Користувач був видалений або не має електронної пошти, тому не може отримати нагадування',
     'reminder_sent' => 'Нагадування надіслано',
     'acceptance_deleted' => 'Видалено запит на підтвердження',
     'acceptance_request' => 'Прийнятий запит',
@@ -13,5 +14,10 @@ return [
         'user_state' => 'Стан користувача',
         'user_country' => 'Країна',
         'user_zip' => 'Поштовий індекс користувача'
-    ]
-];
\ No newline at end of file
+    ],
+    'open_saved_template' => 'Відкрити збережений шаблон',
+    'save_template' =>  'Зберегти шаблон',
+    'select_a_template' => 'Виберіть шаблон',
+    'template_name' => 'Ім\'я шаблону',
+    'update_template' => 'Оновити шаблон',
+];
diff --git a/resources/lang/uk-UA/admin/reports/message.php b/resources/lang/uk-UA/admin/reports/message.php
index 9e8f1e7679..fef10a3447 100644
--- a/resources/lang/uk-UA/admin/reports/message.php
+++ b/resources/lang/uk-UA/admin/reports/message.php
@@ -1,5 +1,16 @@
 <?php
 
-return array(
-    'error'   => 'Оберіть хоча б один варіант.'
-);
+return [
+    'about_templates' => 'Про Збережені шаблони',
+    'saving_templates_description' => 'Виберіть ваші опції, потім введіть назву вашого шаблону в поле вище та натисніть кнопку «Зберегти шаблон». Використовуйте спадне меню для вибору раніше збереженого шаблону.',
+    'create'  => [
+        'success' => 'Шаблон успішно збережено',
+    ],
+    'update' => [
+        'success' => 'Шаблон успішно оновлено',
+    ],
+    'delete' => [
+        'success' => 'Шаблон видалено',
+        'no_delete_permission' => 'Шаблону не існує або ви не маєте дозволу на видалення.',
+    ],
+];
diff --git a/resources/lang/uk-UA/admin/settings/general.php b/resources/lang/uk-UA/admin/settings/general.php
index e3ccb3ef87..64ff800f51 100644
--- a/resources/lang/uk-UA/admin/settings/general.php
+++ b/resources/lang/uk-UA/admin/settings/general.php
@@ -8,13 +8,13 @@ return [
     'ad_append_domain'          => 'Додати доменне ім\'я для поля користувача',
     'ad_append_domain_help'     => 'Користувач не потрібний для запису "username@domain.local", вони можуть просто ввести "ім\'я користувача".',
     'admin_cc_email'            => 'Адреса електронної пошти CC',
-    'admin_cc_email_help'       => 'Якщо ви бажаєте відправити копію листів, що відправляються користувачам, до додаткового облікового запису, введіть його тут. В іншому випадку залиште це поле порожнім.',
+    'admin_cc_email_help'       => 'Надішліть копію листівок для перевірки чи перевірки на цю адресу.',
     'admin_settings'            => 'Адміністративні налаштування',
     'is_ad'				        => 'Це сервер Active Directory',
     'alerts'                	=> 'Попередження',
     'alert_title'               => 'Оновити налаштування сповіщень',
     'alert_email'				=> 'Надіслати сповіщення',
-    'alert_email_help'    => 'Адреси електронної пошти або списки розсилки, вам потрібно, щоб будуть відправлятися попередження, розділені комами',
+    'alert_email_help'          => 'Адреси електронної пошти або списки розсилки, вам потрібно, щоб будуть відправлятися попередження, розділені комами.',
     'alerts_enabled'			=> 'Увімкнути сповіщення по електронній пошті',
     'alert_interval'			=> 'Поріг Закінчення сповіщень (в днях)',
     'alert_inv_threshold'		=> 'Поріг сповіщення про інвентар',
@@ -31,6 +31,8 @@ return [
     'backups'					=> 'Резервні копії',
     'backups_help'              => 'Створення, завантаження і відновлення резервних копій ',
     'backups_restoring'         => 'Відновлення з резервної копії',
+    'backups_clean' => 'Очистити резервну копію бази даних перед відновленням',
+    'backups_clean_helptext' => "Це може бути корисно, якщо ви змінюєте версії бази даних",
     'backups_upload'            => 'Завантажити резервну копію',
     'backups_path'              => 'Резервні копії на сервері зберігаються в <code>:path</code>',
     'backups_restore_warning'   => 'Скористайтеся кнопкою відновлення <small><span class="btn btn-xs btn-warning"><i class="text-white fas fa-retweet" aria-hidden="true"></i></span> </small> для відновлення з попередньої резервної копії. (Наразі це не працює зі сховищем файлів S3 або Docker.)<br><br>Ваша <strong>вся база даних :app_name і всі завантажені файли будуть повністю замінені</strong> файлом резервної копії.  ',
@@ -40,6 +42,7 @@ return [
     'confirm_purge'			    => 'Очистити',
     'confirm_purge_help'		=> 'Введіть текст "ВИДАЛЕННЯ" у полі знизу, щоб очистити ваші видалені записи. Цю дію не можна буде скасувати, після чого буде застосовано PERMANENTLY видаліть усі раніше видалені вами елементи. (Спочатку ви повинні зробити резервну копію, лише щоб бути безпечним.)',
     'custom_css'				=> 'Власний CSS',
+    'custom_css_placeholder'	=> 'Додати ваш власний CSS',
     'custom_css_help'			=> 'Введіть будь-які власні зміни CSS, які ви хотіли б використовувати. Не включайте &lt;style&gt;&lt;/style&gt;.',
     'custom_forgot_pass_url'	=> 'URL для скидання пароля',
     'custom_forgot_pass_url_help'	=> 'Це замінює вбудовану URL-адресу пароля на екрані авторизації - направляти людей на внутрішні чи хостингові скидання пароля LDAP функціональності. Уникне вимкнення функціоналу пароля для імені локального користувача.',
@@ -47,34 +50,34 @@ return [
     'dashboard_message_help'	=> 'Цей текст з\'явиться на панелі керування для будь-кого, хто має дозвіл на перегляд панелі керування.',
     'default_currency'  		=> 'Валюта за замовчуванням',
     'default_eula_text'			=> 'EULA за замовчуванням',
+    'default_eula_text_placeholder' => 'Add your default EULA text',
     'default_language'			=> 'Мова за замовчуванням',
     'default_eula_help_text'	=> 'Ви також можете пов\'язати користувальницькі EULA з конкретними категоріями активів.',
-    'acceptance_note'           => 'Add a note for your decision (Optional)',
+    'acceptance_note'           => 'Додати примітку для вашого рішення (необов\'язково)',
     'display_asset_name'        => 'Відображення назви активу',
     'display_checkout_date'     => 'Показувати дату оформлення замовлення',
     'display_eol'               => 'Відображати EOL у вигляді таблиці',
-    'display_qr'                => 'Показати квадрати коди',
+    'display_qr'                => 'Показати 2D штрих-код',
     'display_alt_barcode'		=> 'Відображати 1D штрих-код',
-    'email_logo'                => 'Логотип електронної пошти',
     'barcode_type'				=> '2D тип коду',
     'alt_barcode_type'			=> '1D тип штрихкоду',
-    'email_logo_size'       => 'Квадратні логотипи в електронному листі виглядають найкращими. ',
     'enabled'                   => 'Увімкнено',
     'eula_settings'				=> 'Налаштування EULA',
     'eula_markdown'				=> 'Цей EULA дозволяє <a href="https://help.github.com/articles/github-flavored-markdown/">Github розміщений на markdown</a>.',
+    'empty_row_count'           => 'Field Start Offset (Empty Rows)',
+    'empty_row_count_help'      => 'Fields will begin populating after this many empty rows are skipped at the top of the label.',
     'favicon'                   => 'Іконка',
     'favicon_format'            => 'Допустимі типи файлів - це значок, png та gif. Інші формати зображень можуть не працювати у всіх браузерах.',
     'favicon_size'          => 'Значки вподобань мають бути квадратними зображеннями, 16х16 пікселів.',
     'footer_text'               => 'Додатковий текст у футері ',
     'footer_text_help'          => 'Цей текст з\'явиться у правому нижньому колонтитулі. Посилання дозволені використовувати <a href="https://help.github.com/articles/github-flavored-markdown/">Github flavored markdown</a>. Розриви ліній, заголовки, зображення і т. д. можуть призвести до непередбачуваних результатів.',
+    'footer_text_placeholder'   => 'Додатковий текст у футері',
     'general_settings'			=> 'Загальні налаштування',
-    'general_settings_keywords' => 'компанія підтримує, підпис, прийнятання, формат електронної пошти, формату, картинки, на одну сторінку, thumbnail, eula, gravatar, tos, dashboard, privacy',
     'general_settings_help'     => 'EULA за замовчуванням',
     'generate_backup'			=> 'Створити резервну копію',
     'google_workspaces'         => 'Робочі області Google',
     'header_color'              => 'Колір заголовку',
     'info'                      => 'Ці параметри дозволяють налаштувати деякі аспекти інсталяції.',
-    'label_logo'                => 'Логотип для Міток',
     'label_logo_size'           => 'Квадратний логотип виглядає найкраще - відображатиметься у верхньому правому куті кожної позначки активів. ',
     'laravel'                   => 'Версія Laravel',
     'ldap'                      => 'LDAP',
@@ -94,7 +97,7 @@ return [
     'ldap_login_sync_help'      => 'Це тільки тести, що LDAP може синхронізувати правильно. Якщо ваша запит автентифікації LDAP не правильна, користувачі все одно можуть увійти в систему. Ви ПОВИННІ ЗБЕРЕГТИ ВАШ ВИДАЛЕНО ДОДАТНО ДОСТУПНІ ПЕРШЕНЬ.',
     'ldap_manager'              => 'Менеджер LDAP',
     'ldap_server'               => 'Сервер LDAP',
-    'ldap_server_help'          => 'Це має починатися з ldap:// (для незашифрованих або TLS) або ldaps:// (для SSL)',
+    'ldap_server_help'          => 'Це має починатися з ldap:// (для незахищених) або ldaps:// (для TLS або SSL)',
     'ldap_server_cert'			=> 'Перевірка SSL сертифікату LDAP',
     'ldap_server_cert_ignore'	=> 'Дозволити недійсний SSL сертифікат',
     'ldap_server_cert_help'		=> 'Виберіть цей прапорець, якщо ви використовуєте самостійно підписаний SSL сертифікат і хотіли б прийняти неприпустимий SSL сертифікат.',
@@ -108,8 +111,8 @@ return [
     'ldap_pword'                => 'LDAP-зв\'язуйте пароль',
     'ldap_basedn'               => 'Base Bind DN',
     'ldap_filter'               => 'LDAP-фільтр',
-    'ldap_pw_sync'              => 'Синхронізація паролів LDAP',
-    'ldap_pw_sync_help'         => 'Зніміть цей прапорець, якщо ви не хочете зберігати паролі LDAP з локальними паролями. Відключення означає, що ваші користувачі можуть не входити в систему, якщо ваш сервер LDAP недосяжний з певних причин.',
+    'ldap_pw_sync'              => 'Кешувати LDAP паролі',
+    'ldap_pw_sync_help'         => 'Uncheck this box if you do not wish to keep LDAP passwords cached as local hashed passwords. Disabling this means that your users may not be able to login if your LDAP server is unreachable for some reason.',
     'ldap_username_field'       => 'Поле для імені користувача',
     'ldap_lname_field'          => 'Прізвище',
     'ldap_fname_field'          => 'Ім\'я в LDAP',
@@ -117,13 +120,15 @@ return [
     'ldap_version'              => 'Версія LDAP',
     'ldap_active_flag'          => 'Активний прапор LDAP',
     'ldap_activated_flag_help'  => 'Це значення використовується для визначення того, чи може синхронізований користувач увійти до Snipe-IT. <strong>Це не впливає на можливість видавати/приймати активи їм/від них</strong> і має бути <strong>назва атрибута</strong> у вашому AD/LDAP, <strong>а не значення</strong>. <br><br>Якщо в цьому полі встановлено назву поля, яка не існує у вашому AD/LDAP, або значення в полі AD/LDAP встановлено на <code>0</code> або <code>false </code>, <strong>вхід користувача буде вимкнено</strong>. Якщо значення в полі AD/LDAP встановлено на <code>1</code> або <code>true</code> або <em>будь-який інший текст</em>, це означає, що користувач може ввійти. Коли поле пусте в Вашому AD, ми дотримуємося атрибута <code>userAccountControl</code>, який зазвичай дозволяє активним користувачам входити в систему.',
+    'ldap_invert_active_flag'   => 'LDAP Invert Active Flag',
+    'ldap_invert_active_flag_help'     => 'If enabled: when the value returned by LDAP Active Flag is <code>0</code> or <code>false</code> the user account will be active.',
     'ldap_emp_num'              => 'LDAP-номер Співробітника',
     'ldap_email'                => 'Email LDAP',
     'ldap_test'                 => 'Тестувати LDAP',
     'ldap_test_sync'            => 'Тестувати синхронізацію LDAP',
     'license'                   => 'Ліцензія програмного забезпечення',
-    'load_remote'               => 'Використовувати Gravatar',
-    'load_remote_help_text'		=> 'Зніміть цей прапорець, якщо інсталяція не може завантажити скрипти з зовнішнього Інтернету. Це дозволить Snipe-IT завантажити зображення з Gravatar.',
+    'load_remote'               => 'Завантажити віддалені аватари',
+    'load_remote_help_text'		=> 'Зніміть цей прапорець, якщо інсталяція не може завантажити скрипти з зовнішнього Інтернету. Це не дозволить Snipe-IT спробувати завантажити аватари з Gravatar або інших зовнішні джерела.',
     'login'                     => 'Спроби входу в систему',
     'login_attempt'             => 'Спроби входу в систему',
     'login_ip'                  => 'IP-адреса',
@@ -131,6 +136,7 @@ return [
     'login_user_agent'          => 'Ідентифікатор браузера',
     'login_help'                => 'Список спроб входу',
     'login_note'                => 'Примітка для входу',
+    'login_note_placeholder'            => "If you do not have a login or have found a device belonging to this company, please call technical support at 888-555-1212. Thank you.",
     'login_note_help'           => 'Додайте кілька речень на екран вашого входу, наприклад для того, щоб допомогти людям, які знайшли загубленого чи вкраденого пристрою. Це поле приймає <a href="https://help.github.com/articles/github-flavored-markdown/">Github flavored markdown</a>',
     'login_remote_user_text'    => 'Опції для входу користувача',
     'login_remote_user_enabled_text' => 'Увімкнути вхід за допомогою віддаленого заголовка користувача',
@@ -146,13 +152,16 @@ return [
     'logo_print_assets_help'    => 'Використовувати брендинг у списки друкованих медіафайлів ',
     'full_multiple_companies_support_help_text' => 'Обмеження користувачів (включаючи адміністраторів), призначених для компаній своїх активів.',
     'full_multiple_companies_support_text' => 'Повна підтримка багатьох компаній',
+    'scope_locations_fmcs_support_text'  => 'Scope Locations with Full Multiple Companies Support',
+    'scope_locations_fmcs_support_help_text'  => 'Restrict locations to their selected company.',
+    'scope_locations_fmcs_check_button' => 'Check Compatibility',
+    'scope_locations_fmcs_support_disabled_text'  => 'This option is disabled because you have conflicting locations set for :count or more items.',
     'show_in_model_list'   => 'Показати в відкиданнях моделі',
     'optional'					=> 'необов\'язково',
     'per_page'                  => 'Результатів на стор',
     'php'                       => 'Версія PHP',
-    'php_info'                  => 'PHP Info',
+    'php_info'                  => 'PHP інформація',
     'php_overview'              => 'PHP',
-    'php_overview_keywords'     => 'phpinfo, система, інформація',
     'php_overview_help'         => 'Інформація про систему PHP',
     'php_gd_info'               => 'Ви повинні встановити php-gd, щоб відобразити QR-коди, дивіться інструкції встановлення.',
     'php_gd_warning'            => 'Обробка PHP зображень та GD плагін НЕ встановлені.',
@@ -218,6 +227,8 @@ return [
     'webhook_integration_help'    => 'Інтеграція :app необов’язкова, однак Endpoint та канал потрібні, якщо ви бажаєте її використовувати. Щоб налаштувати інтеграцію :app, потрібно спочатку <a href=":webhook_link" target="_new" rel="noopener">створити вхідний вебхук</a> у своєму обліковому записі :app. Натисніть кнопку <strong>Тест Інтеграції :app</strong>, щоб підтвердити правильність налаштувань перед збереженням. ',
     'webhook_integration_help_button'    => 'Як тільки ви зберегли свою інформацію :app , з\'явиться тестова кнопка.',
     'webhook_test_help'           => 'Перевірте, чи налаштована інтеграція :app коректно. ВИ ПОВИННІ ЗБЕРЕЖЕТЕ ВАШЕ ОНОВАНО :app SETTINGS FIRST.',
+    'shortcuts_enabled'         => 'Увімкнути ярлики',
+    'shortcuts_help_text'       => '<strong>Windows</strong>: Alt + клавіша доступу, <strong>Mac</strong>: Control + Option + клавіша доступу',
     'snipe_version'  			=> 'Версія Snipe-IT',
     'support_footer'            => 'Підтримка посилань в футері ',
     'support_footer_help'       => 'Вкажіть, хто бачить посилання на інформацію підтримки Snipe-IT та посібник користувача',
@@ -227,7 +238,6 @@ return [
     'update'                    => 'Оновити налаштування',
     'value'                     => 'Цінність',
     'brand'                     => 'Фірмове оформлення',
-    'brand_keywords'            => 'нижній, логотип, принтер, тема, шкіра, кольори, колір, css',
     'brand_help'                => 'Лого - Назва сайту',
     'web_brand'                 => 'Тип Веб-брендінгу',
     'about_settings_title'      => 'Про налаштування',
@@ -276,6 +286,8 @@ return [
     'two_factor_enrollment_text'	=> "Для двофакторної автентифікації необхідно, однак ваш пристрій ще не було встановлено. Відкрийте додаток Google Authenticator і відскануйте QR-код нижче, щоб закріпити ваш пристрій. Після того, як ви увійдете на своєму пристрої, введіть код нижче",
     'require_accept_signature'      => 'Вимагати підпис',
     'require_accept_signature_help_text'      => 'Увімкнення цієї функції для фізичного підписання активів потребує від користувачів.',
+    'require_checkinout_notes'  => 'Вимагати примітки при поверненні/видачі',
+    'require_checkinout_notes_help_text'    => 'Увімкнення цієї функції вимагатиме заповнення полів приміток при поверненні або видачі активу.',
     'left'        => 'ліворуч',
     'right'        => 'правий',
     'top'        => 'згори',
@@ -287,18 +299,18 @@ return [
     'zerofill_count'        => 'Довжина тегів медіафайлів, включаючи нульовий рівень',
     'username_format_help'   => 'Цей параметр буде використовуватися лише процесом імпорту, якщо ім\'я користувача не надано, а ми повинні згенерувати ім\'я користувача.',
     'oauth_title' => 'Налаштування OAuth API',
-    'oauth_clients' => 'OAuth Clients',
+    'oauth_clients' => 'Клієнти OAuth',
     'oauth' => 'OAuth',
     'oauth_help' => 'Параметри кінцевої точки Oauth',
-    'oauth_no_clients' => 'You have not created any OAuth clients yet.',
-    'oauth_secret' => 'Secret',
-    'oauth_authorized_apps' => 'Authorized Applications',
-    'oauth_redirect_url' => 'Redirect URL',
-    'oauth_name_help' => ' Something your users will recognize and trust.',
-    'oauth_scopes' => 'Scopes',
-    'oauth_callback_url' => 'Your application authorization callback URL.',
-    'create_client' => 'Create Client',
-    'no_scopes' => 'No scopes',
+    'oauth_no_clients' => 'Ви ще не створили жодних клієнтів OAuth.',
+    'oauth_secret' => 'Секрет',
+    'oauth_authorized_apps' => 'Авторизовані додатки',
+    'oauth_redirect_url' => 'Переадресація URL',
+    'oauth_name_help' => ' Щось, що ваші користувачі будуть впізнавати та довіряти.',
+    'oauth_scopes' => 'Області використання',
+    'oauth_callback_url' => 'URL зворотного виклику авторизації вашого застосунку.',
+    'create_client' => 'Створити клієнта',
+    'no_scopes' => 'Немає областей',
     'asset_tag_title' => 'Оновити налаштування тегу активу',
     'barcode_title' => 'Оновити налаштування штрих-коду',
     'barcodes' => 'Barcodes',
@@ -313,24 +325,24 @@ return [
     'filter_by_keyword' => 'Фільтрувати за налаштуванням ключового слова',
     'security' => 'Безпека',
     'security_title' => 'Оновити налаштування безпеки',
-    'security_keywords' => 'пароль, паролі, вимоги, два фактори, двофакторна аутентифікація, загальні паролі, авторизація, вхід, вхід, авторизація',
     'security_help' => 'Двофакторний, Обмеження паролю',
-    'groups_keywords' => 'дозволи, групи дозволів, авторизація',
     'groups_help' => 'Групи дозволів облікового запису',
     'localization' => 'Локалізація',
     'localization_title' => 'Оновити параметри локалізації',
-    'localization_keywords' => 'локалізація, валюта, локальна, локальна, часова зона, інтернатізація, мова, мова, переклад',
     'localization_help' => 'Мова, відображення',
     'notifications' => 'Сповіщення',
     'notifications_help' => 'Налаштування e-mail оповіщення та аудиту',
     'asset_tags_help' => 'Збільшення і префіксів',
     'labels' => 'Мітки',
     'labels_title' => 'Оновити налаштування Міток',
-    'labels_help' => 'Розміри етикеток і налаштування',
-    'purge_keywords' => 'остаточно видалити',
+    'labels_help' => 'Налаштування штрих-кодів та етикеток.',
     'purge_help' => 'Знищити вилучені записи',
     'ldap_extension_warning' => 'Схоже, що розширення LDAP встановлено або увімкнено на цьому сервері. Ви все ще можете зберігати ваші налаштування, але вам потрібно буде увімкнути розширення LDAP для PHP перед синхронізацією LDAP або можливістю входу в систему.',
     'ldap_ad' => 'LDAP/реклама',
+    'ldap_test_label' => 'Test LDAP Sync',
+    'ldap_test_login' => ' Test LDAP Login',
+    'ldap_username_placeholder' => 'LDAP Username',
+    'ldap_password_placeholder' => 'LDAP Password',
     'employee_number' => 'Номер співробітника',
     'create_admin_user' => 'Створити користувача ::',
     'create_admin_success' => 'Успіх! Ваш адміністратор був доданий!',
@@ -342,6 +354,8 @@ return [
     'setup_migration_create_user' => 'Далі: створити користувача',
     'ldap_settings_link' => 'Сторінка налаштувань LDAP',
     'slack_test' => 'Тест <i class="fab fa-slack"></i> інтеграція',
+    'status_label_name' => 'Status Label Name',
+    'super_admin_only'  => 'Super Admin Only',
     'label2_enable'           => 'Новий двигун міток',
     'label2_enable_help'      => 'Перейдіть на нове знаряддя для етикеток. <b>Примітка: вам потрібно буде зберегти це налаштування, перш ніж встановлювати інші.</b>',
     'label2_template'         => 'Шаблон',
@@ -356,12 +370,15 @@ return [
     'label2_2d_type'          => '2D тип коду',
     'label2_2d_type_help'     => 'Формат для 2D кодів',
     'label2_2d_target'        => '2D код штрих-коду ціль',
-    'label2_2d_target_help'   => 'URL точки 2D штрихування при скануванні',
+    'label2_2d_target_help'   => 'Дані, що будуть містяться у 2D штрих-коді',
     'label2_fields'           => 'Визначення полів',
     'label2_fields_help'      => 'Поля можна додавати, видаляти та впорядкувати у лівому стовпчику. Для кожного поля декілька варіантів для Мітки і DataSource можна додати, видалити і змінити порядок у правій колонці.',
+    'purge_barcodes' => 'Purge Barcodes',
     'help_asterisk_bold'    => 'Введений <code>**текст**</code> буде відображатися як жирний',
     'help_blank_to_use'     => 'Залиште порожнім, щоб використовувати значення від <code>:setting_name</code>',
-    'help_default_will_use' => '<code>:default</code> використовуватиме значення з <code>:setting_name</code>. <br>Зверніть увагу, що для успішної генерації значення штрих-кодів має відповідати відповідним специфікаціям штрих-кодів. Додаткову інформацію дивіться в <a href="https://snipe-it.readme.io/docs/barcodes">документації <i class="fa fa-external-link"></i></a>. ',
+    'help_default_will_use' => '<code>:default</code> використовуватиме значення з <code>:setting_name</code>. <br>Зверніть увагу, що значення штрих-кодів повинні відповідати відповідним стандартам штрих-кодів, щоб вони могли бути успішно згенеровані. Для отримання додаткової інформації перегляньте <a href="https://snipe-it.readme.io/docs/barcodes">документацію <i class="fa fa-external-link"></i></a>. ',
+    'asset_id'              => 'ID Активу',
+    'data'               => 'Дані',
     'default'               => 'Типово',
     'none'                  => 'Без ефекту',
     'google_callback_help' => 'Це потрібно ввести як URL-адресу зворотного виклику в налаштуваннях програми Google OAuth вашої організації на <strong><a href="https://console.cloud.google.com/" target="_blank">консолі розробника Google <i class="fa fa-external-link" aria-hidden="true"></i></a></strong>.',
@@ -373,7 +390,100 @@ return [
     'database_driver' => 'Драйвер баз даних',
     'bs_table_storage' => 'Складський стіл',
     'timezone' => 'Timezone',
-    'profile_edit'          => 'Edit Profile',
-    'profile_edit_help'          => 'Allow users to edit their own profiles.',
+    'test_mail' => 'Test Mail',
+    'profile_edit'          => 'Редагувати профіль',
+    'profile_edit_help'          => 'Дозволити користувачам редагувати свої профілі.',
+    'default_avatar' => 'Custom Default Avatar',
+    'default_avatar_help' => 'Це зображення буде показано в профіль, якщо у користувача немає профілю.',
+    'restore_default_avatar' => 'Відновити <a href=":default_avatar" data-toggle="lightbox" data-type="image">стандартний системний аватар</a>',
+    'restore_default_avatar_help' => '',
+    'due_checkin_days' => 'Попередження про повернення',
+    'due_checkin_days_help' => 'Скільки днів до очікуваного повернення активу він має з\'являтися на сторінці "Повинен бути повернутий"?',
+    'no_groups' => 'Групи ще не були створені. Перейдіть до <code>Налаштування адміністратора > Групи доступу</code>, щоб додати одну.',
+    'text' => 'Text',
+
+    'username_formats' => [
+        'username_format'		=> 'Формат імені користувача',
+        'firstname_lastname_format'	=> 'Прізвище (jane.smith)',
+        'first_name_format'	        => 'First Name (jane)',
+        'last_name_format'		=> 'Last Name (doe)',
+        'filastname_format'			=> 'First Initial Last Name (jsmith)',
+        'lastnamefirstinitial_format' =>  'Last Name First Initial (smithj)',
+        'firstname_lastname_underscore_format' => 'First Name Last Name (jane_smith)',
+        'firstinitial.lastname' => 'First Initial Last Name (j.smith)',
+        'lastname_firstinitial' => 'Last Name First Initial (smith_j)',
+        'lastname_dot_firstinitial_format' => 'Last Name First Initial (smith.j)',
+        'firstnamelastname'     => 'First Name Last Name (janesmith)',
+        'firstnamelastinitial'  => 'First Name Last Initial (janes)',
+        'lastnamefirstname'      => 'Прізвище. Ім\'я (smith.jane)',
+    ],
+
+    'email_formats' => [
+        'email_format'			=> 'Формат електронної пошти',
+        'firstname_lastname_format'	=> 'Прізвище (jane.smith@example.com)',
+        'first_name_format'		=> 'Ім\'я (jane@example.com)',
+        'last_name_format'		=> 'Last Name (doe@example.com)',
+        'filastname_format'			=> 'Перше початкове ім\'я (jsmith@example.com)',
+        'lastnamefirstinitial_format' =>  'Прізвище Першою початковою (smithj@example.com)',
+        'firstname_lastname_underscore_format' => 'Прізвище (jane_smith@example.com)',
+        'firstinitial.lastname' => 'Перше початкове ім\'я (j.smith@example.com)',
+        'lastname_firstinitial' => 'Прізвище Першою початковою (smith_j@example.com)',
+        'lastname_dot_firstinitial_format' => 'Last Name First Initial (smith.j@example.com)',
+        'firstnamelastname'     => 'Прізвище (janesmith@example.com)',
+        'firstnamelastinitial'  => 'Останнє ім\'я (janes@example.com)',
+        'lastnamefirstname'      => 'Прізвище. Ім\'я (smith.jane@example.com)',
+    ],
+
+
+
+    'logo_labels' => [
+        'acceptance_pdf_logo'       => 'PDF Logo',
+        'email_logo'                => 'Логотип електронної пошти',
+        'label_logo'                => 'Логотип для Міток',
+        'logo'                      => 'Site Logo',
+        'favicon'                   => 'Іконка',
+    ],
+
+    'logo_help' => [
+        'email_logo_size'       => 'Квадратні логотипи в електронному листі виглядають найкращими. ',
+    ],
+
+    'logo_option_types' => [
+        'text' => 'Text',
+        'logo' => 'Логотип',
+        'logo_and_text' => 'Logo and Text',
+    ],
+
+
+    'legends' => [
+        'scoping' => 'Scoping',
+        'formats' => 'Default Formats',
+        'profiles' => 'User Profiles',
+        'eula' => 'EULA & Acceptance Preferences',
+        'misc_display' => 'Miscellaneous Display Options',
+        'email' => 'Email Preferences',
+        'checkin' => 'Checkin Preferences',
+        'dashboard' => 'Login & Dashboard Preferences',
+        'misc' => 'Miscellaneous',
+        'logos' => 'Logos & Display',
+        'colors' => 'Colors & Skins',
+        'footer' => 'Footer Preferences',
+        'security' => 'Security Preferences',
+        'general' => 'General',
+        'intervals' => 'Intervals & Thresholds',
+    ],
+
+
+    /* Keywords for settings overview help */
+    'keywords' => [
+        'brand'             => 'нижній, логотип, принтер, тема, шкіра, кольори, колір, css',
+        'general_settings'  => 'компанія підтримує, підпис, прийнятання, формат електронної пошти, формату, картинки, на одну сторінку, thumbnail, eula, gravatar, tos, dashboard, privacy',
+        'groups'            => 'дозволи, групи дозволів, авторизація',
+        'labels'            => 'етикетки, штрих-коди, листи, друк, верхні, qr, 1d, 2d',
+        'localization'      => 'локалізація, валюта, локальна, локальна, часова зона, інтернатізація, мова, мова, переклад',
+        'php_overview'      => 'phpinfo, система, інформація',
+        'purge'             => 'остаточно видалити',
+        'security'          => 'пароль, паролі, вимоги, два фактори, двофакторна аутентифікація, загальні паролі, авторизація, вхід, вхід, авторизація',
+    ],
 
 ];
diff --git a/resources/lang/uk-UA/admin/settings/message.php b/resources/lang/uk-UA/admin/settings/message.php
index 2a69598e20..e0a1380fb3 100644
--- a/resources/lang/uk-UA/admin/settings/message.php
+++ b/resources/lang/uk-UA/admin/settings/message.php
@@ -14,6 +14,9 @@ return [
         'restore_warning'       => 'Так, відновити її. Я підтверджую, що це перезапише будь-які наявні дані в базі даних. Це також закриє всіх існуючих користувачів (включаючи вас).',
         'restore_confirm'       => 'Ви дійсно бажаєте відновити базу даних з :filename?'
     ],
+    'restore' => [
+        'success'               => 'Ваше резервне копіювання відновлено. Будь ласка, увійдіть в систему знову.'
+    ],
     'purge' => [
         'error'     => 'Під час очищення сталася помилка. ',
         'validation_failed'     => 'Ваша чистка підтвердження неправильна. Будь ласка, введіть слово "DELETE" у полі підтвердження.',
@@ -33,6 +36,9 @@ return [
         'testing_authentication' => 'Тестування авторизації LDAP...',
         'authentication_success' => 'Користувач успішно пройшов перевірку на зв\'язку з LDAP!'
     ],
+    'labels' => [
+        'null_template' => 'Ярличок не знайдено. Будь ласка, виберіть шаблон.',
+        ],
     'webhook' => [
         'sending' => 'Відправка :app тестове повідомлення...',
         'success' => 'Ваша функція з інтеграцією :webhook_name!',
@@ -42,5 +48,12 @@ return [
         'error' => 'Щось пішло не так. :app відповів(-ла) з: :error_message',
         'error_redirect' => 'ПОМИЛКА: 301/302 :endpoint повертає редиректор. З міркувань безпеки ми не слідуємо перенаправленням. Будь ласка, використовуйте фактичну кінцеву точку.',
         'error_misc' => 'Щось пішло не так. :( ',
-    ]
+        'webhook_fail' => 'не вдалося надіслати повідомлення webhook для перевірки: Переконайтесь, що посилання ще дійсне.',
+        'webhook_channel_not_found' => ' канал webhook не знайдено.',
+        'ms_teams_deprecation' => 'The selected Microsoft Teams webhook URL will be deprecated Dec 31st, 2025. Please use a workflow URL. Microsoft\'s documentation on creating a workflow can be found <a href="https://support.microsoft.com/en-us/office/create-incoming-webhooks-with-workflows-for-microsoft-teams-8ae491c7-0394-4861-ba59-055e33f75498" target="_blank"> here.</a>',
+    ],
+    'location_scoping' => [
+        'not_saved' => 'Ваші налаштування не були збережені.',
+        'mismatch' => 'Є 1 елемент у базі даних, який потребує вашої уваги перед тим, як ви зможете увімкнути визначення місцезнаходження. Є :count елементи в базі даних, які потребують вашої уваги перед тим, як ви зможете увімкнути визначення місцезнаходжень.',
+    ],
 ];
diff --git a/resources/lang/uk-UA/admin/statuslabels/table.php b/resources/lang/uk-UA/admin/statuslabels/table.php
index fdb2ba0ec4..e816e97477 100644
--- a/resources/lang/uk-UA/admin/statuslabels/table.php
+++ b/resources/lang/uk-UA/admin/statuslabels/table.php
@@ -1,14 +1,14 @@
 <?php
 
 return array(
-    'about'      	=> 'Про мітки статусу',
+    'about'      	=> 'About Status Types',
     'archived'      	=> 'Архівний',
     'create'      	=> 'Створити мітку статусу',
     'color'      	=> 'Колір діаграми',
     'default_label' => 'Стандартна позначка',
     'default_label_help' => 'Це використовується для забезпечення того, що найбільш часто використовувані мітки стану з\'являються в верхній частині поля під час створення або редагування активів.',
     'deployable'      	=> 'Розгортання',
-    'info'      	=> 'Мітки статусу використовуються для опису різних станів, в яких можуть бути активи, а також можуть бути присутні для ремонту, втрачені/викрадення і т.д. Ви можете створити нові мітки статусу для розгортанні, очікуючі та архівні активи.',
+    'info'      	=> 'Status label types are used to describe the various states your assets could be in. They may be out for repair, lost/stolen, etc. You can create new status labels for your deployable, pending and archived assets according to your own workflow. For more information, <a href="https://snipe-it.readme.io/docs/overview#status-labels" target="_blank">see the documentation <i class="fa fa-external-link"></i></a>.',
     'name'      	=> 'Назва статусу',
     'pending'      	=> 'Очікуєтся',
     'status_type'   => 'Тип статусу',
diff --git a/resources/lang/uk-UA/admin/users/general.php b/resources/lang/uk-UA/admin/users/general.php
index ae1245253d..be95ee9821 100644
--- a/resources/lang/uk-UA/admin/users/general.php
+++ b/resources/lang/uk-UA/admin/users/general.php
@@ -19,6 +19,8 @@ return [
     'print_assigned'    => 'Друкувати всі призначені',
     'email_assigned'    => 'Список адрес електронної пошти присвоєних',
     'user_notified'     => 'Користувач відправлений на email список призначених в даний час елементів.',
+    'users_notified'    => 'The user has been emailed a list of their currently assigned items.|:count users have been emailed a list of their currently assigned items.',
+    'users_notified_warning' => ':count user has been emailed a list of their currently assigned items, however :no_email users did not have an email address so could not be emailed.|:count users have been emailed a list of their currently assigned items, however :no_email user(s) did not have an email address so could not be emailed.',
     'auto_assign_label' => 'Включати цього користувача при автоматичному призначенні ліцензій',
     'auto_assign_help'  => 'Пропустити цього користувача в автопризначенні ліцензій',
     'software_user'     => 'Програмне забезпечення перевірено :name',
diff --git a/resources/lang/uk-UA/admin/users/message.php b/resources/lang/uk-UA/admin/users/message.php
index 541f15e33d..4d5906970c 100644
--- a/resources/lang/uk-UA/admin/users/message.php
+++ b/resources/lang/uk-UA/admin/users/message.php
@@ -6,7 +6,7 @@ return array(
     'declined'                  => 'Ви успішно відхилили цей актив.',
     'bulk_manager_warn'	        => 'Ваші користувачі успішно оновлені, однак Ваш запис менеджера не було збережено, оскільки обраний вами менеджер також був у списку користувачів, для редагування, і користувачі можуть не бути їх власним керівником. Будь ласка, оберіть ваших користувачів знову, не маючи менеджера.',
     'user_exists'               => 'Користувач вже існує!',
-    'user_not_found'            => 'Користувач не існує.',
+    'user_not_found'            => 'Користувач не існує або у вас немає дозволу на його перегляд.',
     'user_login_required'       => 'Поле авторизації є обов\'язковим',
     'user_has_no_assets_assigned' => 'Немає медіафайлів в даний час призначених користувачеві.',
     'user_password_required'    => 'Пароль є обов\'язковим.',
@@ -37,22 +37,23 @@ return array(
         'update' => 'Виникла проблема при оновленні користувача. Будь ласка, спробуйте ще раз.',
         'delete' => 'Виникла проблема при видаленні користувача. Будь ласка, спробуйте ще раз.',
         'delete_has_assets' => 'Цей користувач має призначені елементи і не може бути видалений.',
-        'delete_has_assets_var' => 'This user still has an asset assigned. Please check it in first.|This user still has :count assets assigned. Please check their assets in first.',
-        'delete_has_licenses_var' => 'This user still has a license seats assigned. Please check it in first.|This user still has :count license seats assigned. Please check them in first.',
-        'delete_has_accessories_var' => 'This user still has an accessory assigned. Please check it in first.|This user still has :count accessories assigned. Please check their assets in first.',
-        'delete_has_locations_var' => 'This user still manages a location. Please select another manager first.|This user still manages :count locations. Please select another manager first.',
-        'delete_has_users_var' => 'This user still manages another user. Please select another manager for that user first.|This user still manages :count users. Please select another manager for them first.',
+        'delete_has_assets_var' => 'Цей користувач все ще має актив. Будь ласка, перевірте його спочатку.|Цей користувач все ще має :count активів. Будь ласка, спочатку перевірте його активи.',
+        'delete_has_licenses_var' => 'Цей користувач все ще має призначені ліцензії. Будь ласка, перевірте його спочатку.|Цей користувач все ще має :count ліцензій. Будь ласка, спочатку перевірте їх.',
+        'delete_has_accessories_var' => 'Цей користувач все ще має виданий аксесуар. Будь ласка, перевірте його спочатку.|Цей користувач все ще має :count виданих аксесуарів. Будь ласка, спочатку перевірте видані активи.',
+        'delete_has_locations_var' => 'Цей користувач все ще керує розташуванням. Будь ласка, оберіть іншого менеджера.|Цей користувач все ще керує :count розташуваннями. Будь ласка, оберіть іншого менеджера.',
+        'delete_has_users_var' => 'Цей користувач все ще керує іншим користувачем. Будь ласка, виберіть іншого менеджера для цього користувача. Цей користувач все ще керує :count користувачами. Будь ласка, спочатку оберіть іншого менеджер для них.',
         'unsuspend' => 'Виникла проблема не призупинення користувача. Будь ласка, спробуйте ще раз.',
         'import'    => 'Виникла проблема з імпортом користувачів. Будь ласка, спробуйте ще раз.',
         'asset_already_accepted' => 'Цей актив уже було прийнято.',
         'accept_or_decline' => 'Ви повинні прийняти або відхилити цей актив.',
-        'cannot_delete_yourself' => 'We would feel really bad if you deleted yourself, please reconsider.',
+        'cannot_delete_yourself' => 'Нам буде дуже погано, якщо ви видалите себе, будь ласка, подумайте ще раз.',
         'incorrect_user_accepted' => 'Актив, який ви намагалися прийняти, не був перевірений для вас.',
         'ldap_could_not_connect' => 'Не вдалося підключитися до сервера LDAP. Будь ласка, перевірте конфігурацію вашого сервера LDAP у файлі конфігурації LDAP. <br>Помилка від LDAP Сервера:',
         'ldap_could_not_bind' => 'Не вдалося підключитися до сервера LDAP. Перевірте конфігурацію сервера LDAP у файлі конфігурації LDAP. <br>Помилка сервера LDAP: ',
         'ldap_could_not_search' => 'Не вдалося знайти сервер LDAP. Будь ласка, перевірте конфігурацію сервера LDAP в файлі конфігурації LDAP. <br>Помилка від LDAP Server:',
         'ldap_could_not_get_entries' => 'Не вдалося отримати записи з сервера LDAP. Перевірте конфігурацію сервера LDAP у файлі конфігурації LDAP. <br>Помилка сервера LDAP:',
         'password_ldap' => 'Пароль для цього облікового запису керується LDAP/Active Directory. Зверніться до свого ІТ-відділу, щоб змінити пароль. ',
+        'multi_company_items_assigned' => 'Цей користувач має інші активи, які належать іншій компанії. Будь ласка, перевірте їх в чи відредагуйте свою компанію.'
     ),
 
     'deletefile' => array(
diff --git a/resources/lang/uk-UA/admin/users/table.php b/resources/lang/uk-UA/admin/users/table.php
index 4cd59d73ea..dd57b1697b 100644
--- a/resources/lang/uk-UA/admin/users/table.php
+++ b/resources/lang/uk-UA/admin/users/table.php
@@ -22,7 +22,7 @@ return array(
     'managed_locations'     => 'Керовані розташування',
     'managed_users'         => 'Керовані користувачі',
     'name' 					=> 'Назва',
-    'nogroup'               => 'Жодного користувача користувача ще не було створено. Для додавання відвідувань, ',
+    'nogroup'               => 'No groups have been created yet. To add one, visit:',
     'notes'                 => 'Нотатки',
     'password_confirm' 		=> 'Підтвердьте пароль',
     'password' 				=> 'Пароль',
diff --git a/resources/lang/uk-UA/auth.php b/resources/lang/uk-UA/auth.php
index 063abc9799..2f116885fc 100644
--- a/resources/lang/uk-UA/auth.php
+++ b/resources/lang/uk-UA/auth.php
@@ -15,6 +15,6 @@ return array(
 
     'failed' => 'Ці облікові дані не збігаються з нашими записами.',
     'password' => 'Наданий пароль неправильний.',
-    'throttle' => 'Занадто багато спроб входу. Будь ласка, спробуйте ще раз, через :seconds.',
+    'throttle' => 'Занадто багато невдалих спроб входу в систему. Будь ласка, спробуйте ще раз через :minutes хвилин.',
 
 );
diff --git a/resources/lang/uk-UA/auth/message.php b/resources/lang/uk-UA/auth/message.php
index e6145e7e98..e6078769b5 100644
--- a/resources/lang/uk-UA/auth/message.php
+++ b/resources/lang/uk-UA/auth/message.php
@@ -6,16 +6,14 @@ return array(
     'account_not_found'      => 'Неправильне ім\'я користувача або пароль.',
     'account_not_activated'  => 'Цей обліковий запис не активовано.',
     'account_suspended'      => 'Дію цього аккаунта призупинено.',
-    'account_banned'         => 'Цей аккаунт заблоковано.',
-    'throttle'               => 'Занадто багато невдалих спроб входу в систему. Будь ласка, спробуйте ще раз через :minutes хвилин.',
 
     'two_factor' => array(
         'already_enrolled'      => 'Пристрій вже зареєстровано.',
         'success'               => 'Ви успішно увійшли в систему.',
         'code_required'         => 'Необхідно вказати двофакторний код.',
         'invalid_code'          => 'Двофакторний код невірний.',
-        'enter_two_factor_code' => 'Please enter your two-factor authentication code.',
-        'please_enroll'         => 'Please enroll a device in two-factor authentication.',
+        'enter_two_factor_code' => 'Будь ласка, введіть свій код двофакторної аутентифікації.',
+        'please_enroll'         => 'Будь ласка, зареєструйте пристрій для двофакторної автентифікації.',
     ),
 
     'signin' => array(
diff --git a/resources/lang/uk-UA/button.php b/resources/lang/uk-UA/button.php
index 6476240a38..5ee1a70895 100644
--- a/resources/lang/uk-UA/button.php
+++ b/resources/lang/uk-UA/button.php
@@ -7,6 +7,7 @@ return [
     'checkin_and_delete'  	    => 'Прийняти все / Видалити користувача',
     'delete'  	                => 'Видалити',
     'edit'    	                => 'Редагувати',
+    'clone'    	                => 'Клонувати',
     'restore' 	                => 'Відновити',
     'remove'                    => 'Видалити',
     'request'                   => 'Запит',
@@ -21,4 +22,13 @@ return [
     'add_maintenance'           => 'Додати тех. обслуговування',
     'append'                    => 'Додати',
     'new'                       => 'Нове',
+    'var' => [
+        'clone'     => 'Клонувати :item_type',
+        'edit'      => 'Редагувати :item_type',
+        'delete'    => 'Видалити :item',
+        'restore'   => 'Відновити :item_type',
+        'create'    => 'Створити новий :item_type',
+        'checkout'  => 'Видати :item_type',
+        'checkin'   => 'Прийняти :item_type',
+    ]
 ];
diff --git a/resources/lang/uk-UA/general.php b/resources/lang/uk-UA/general.php
index 7b4fa76d92..111e20d36f 100644
--- a/resources/lang/uk-UA/general.php
+++ b/resources/lang/uk-UA/general.php
@@ -10,10 +10,10 @@ return [
     'action'                => 'Дія',
     'activity_report'		=> 'Звіт про діяльність',
     'address'				=> 'Адреса',
-    'admin'					=> 'Адміністратор',
-    'admin_tooltip'			=> 'This user has admin privileges',
-    'superuser'				=> 'Superuser',
-    'superuser_tooltip'		=> 'This user has superuser privileges',
+    'admin'					=> 'Адміністративні налаштування',
+    'admin_tooltip'			=> 'Цей користувач має права адміністратора',
+    'superuser'				=> 'Суперкористувач',
+    'superuser_tooltip'		=> 'Цей користувач має права суперкористувача',
     'administrator'			=> 'Адміністратор',
     'add_seats'             => 'Додано місць',
     'age'                   => "Вік",
@@ -23,13 +23,16 @@ return [
     'asset_models'			=> 'Моделі активів',
     'asset_model'			=> 'Модель',
     'asset'					=> 'Актив',
+    'asset_previous'        => 'Актив (раніше призначений)',
     'asset_report'          => 'Звіт по активам',
     'asset_tag'				=> 'Тег активу',
     'asset_tags'            => 'Активу Теги',
     'assets_available'		=> 'Активів доступно',
     'accept_assets'         => 'Прийняти :name',
     'accept_assets_menu'    => 'Прийняти активи',
+    'accept_item'           => 'Прийняти запис',
     'audit'				    => 'Аудит',
+    'audits'				=> 'Аудит',
     'audit_report'			=> 'Історія активності',
     'assets'				=> 'Активи',
     'assets_audited'        => 'аудит активів',
@@ -61,9 +64,12 @@ return [
     'changepassword'  		=> 'Змінити пароль',
     'checkin'  				=> 'Прийняти',
     'checkin_from'  		=> 'Прийняти від',
+    'checkin_note'  		=> 'Checkin Note',
+    'checkout_note'  		=> 'Checkout Note',
     'checkout'  			=> 'Видати',
     'checkouts_count'       => 'Розрахунок',
     'checkins_count'        => 'Перевірки',
+    'checkin_and_delete'  	=> 'Прийняти та видалити',
     'user_requests_count'   => 'Запити',
     'city'  				=> 'Місто',
     'click_here'			=> 'Натисніть тут',
@@ -77,7 +83,7 @@ return [
     'consumables'			=> 'Витратні матеріали',
     'country'  				=> 'Країна',
     'could_not_restore'     => 'Помилка відновлення :item_type: :error',
-    'not_deleted'           => ':item_type не вилучено, тому його не можна відновити',
+    'not_deleted'           => ':item_type не був видалений і тому не може бути відновлений',
     'create'				=> 'Створити новий',
     'created'               => 'Елемент створено',
     'created_asset'			=> 'створений актив',
@@ -86,11 +92,13 @@ return [
     'record_created' 		=> 'Запис створено',
     'updated_at' 			=> 'Оновлено',
     'currency'  			=> '$', // this is deprecated
+    'currency_text'  		=> 'Валюта', //
     'current'  				=> 'Поточний',
     'current_password'      => 'Поточний пароль',
     'customize_report'      => 'Налаштувати звіт',
     'custom_report'         => 'Персоналізований звіт про активи',
     'dashboard'				=> 'Дашборд',
+    'data_source'           => 'Джерело даних',
     'days'      			=> 'днів',
     'days_to_next_audit'    => 'Дні до наступного аудиту',
     'date'					=> 'Дата',
@@ -114,29 +122,13 @@ return [
     'editprofile'  			=> 'Редагувати профіль',
     'eol'					=> 'EOL',
     'email_domain'			=> 'Домен електронної пошти',
-    'email_format'			=> 'Формат електронної пошти',
     'employee_number'       => 'Номер співробітника',
     'email_domain_help'		=> 'Це використовується для генерації адрес електронної пошти під час імпортування',
     'error'				    => 'Помилка',
     'exclude_archived'      => 'Виключити архівовані активи',
     'exclude_deleted'       => 'Виключити вилучені активи',
     'example'				=> 'Наприклад: ',
-    'filastname_format'			=> 'Перше початкове ім\'я (jsmith@example.com)',
-    'firstname_lastname_format'	=> 'Прізвище (jane.smith@example.com)',
-    'firstname_lastname_underscore_format' => 'Прізвище (jane_smith@example.com)',
-    'lastnamefirstinitial_format' =>  'Прізвище Першою початковою (smithj@example.com)',
-    'firstintial_dot_lastname_format' => 'Перше початкове ім\'я (j.smith@example.com)',
-    'firstname_lastname_display'	=> 'Прізвище (Jane Smith)',
-    'lastname_firstname_display'	=> 'Прізвище Ім\'я (Ковальська Січка)',
-    'name_display_format'	=> 'Формат відображення імені',
-    'first'					=> 'Перша',
-    'firstnamelastname'     => 'Прізвище (janesmith@example.com)',
-    'lastname_firstinitial' => 'Прізвище Першою початковою (smith_j@example.com)',
-    'firstinitial.lastname' => 'Перше початкове ім\'я (j.smith@example.com)',
-    'firstnamelastinitial'  => 'Останнє ім\'я (janes@example.com)',
-    'lastnamefirstname'      => 'Last Name First Name (smith.jane@example.com)',
-    'first_name'			=> 'Ім\'я',
-    'first_name_format'		=> 'Ім\'я (jane@example.com)',
+
     'files'                 => 'Файли',
     'file_name'				=> 'Файл',
     'file_type'             => 'Тип файлу',
@@ -156,9 +148,9 @@ return [
     'image_delete'         	=> 'Видалити зображення',
     'include_deleted'       => 'Включати видалені активи',
     'image_upload'         	=> 'Завантажити зображення',
-    'filetypes_accepted_help'    => 'Прийнятий тип файлу - :types. Максимальний розмір завантаження - :size.| Прийняті типи файлів :types. Максимальний розмір завантаження - :size.',
+    'filetypes_accepted_help'    => 'Прийнятий тип файлу - :types. Максимально дозволений розмір - :siz.|Прийнятні типи файлів :types. Максимальний розмір завантаження - :size.',
     'filetypes_size_help'   => 'Максимальний розмір завантажуваного файлу - :size.',
-    'image_filetypes_help'  => 'Accepted filetypes are jpg, webp, png, gif, svg, and avif. Max upload size allowed is :size.',
+    'image_filetypes_help'  => 'Допустимі типи файлів - jpg, webp, png, gif і svg. Максимальний дозволений розмір файлу :size.',
     'unaccepted_image_type'  => 'Цей файл зображення не був прочитаний. Допустимі типи файлів - jpg, webp, png, gif та svg. Mimetype цього файлу: :mimetype.',
     'import'         	    => 'Імпорт',
     'import_this_file'      => 'Поля карти і обробка цього файлу',
@@ -178,6 +170,11 @@ return [
     'last'					=> 'Остання',
     'last_login'            => 'Останній вхід до системи',
     'last_name'             => 'Прізвище',
+    'firstname_lastname_display'	=> 'Прізвище (Jane Smith)',
+    'lastname_firstname_display'	=> 'Прізвище Ім\'я (Ковальська Січка)',
+    'name_display_format'	=> 'Формат відображення імені',
+    'first'					=> 'Перша',
+    'first_name'			=> 'Ім\'я',
     'license'				=> 'Ліцензія',
     'license_report'        => 'Звіт про ліцензії',
     'licenses_available'	=> 'Можливі ліцензії',
@@ -206,8 +203,8 @@ return [
     'new_password'          => 'Новий пароль',
     'next'					=> 'Далі',
     'next_audit_date'		=> 'Дата наступного аудиту',
-    'next_audit_date_help'  => 'If you use auditing in your organization, this is usually automatically calculated based on the asset&apos;s last audit date and audit frequency (in <code>Admin Settings &gt; Alerts</code>) and you can leave this blank. You can manually set this date here if you need to, but it must be later than the last audit date. ',
-    'audit_images_help'     => 'You can find audit images in the asset\'s history tab.',
+    'next_audit_date_help'  => 'Якщо у вашій організації використовується аудит, ця дата зазвичай розраховується автоматично на основі останньої дати аудиту активу та частоти аудиту (в розділі <code>Налаштування адміністратора &gt; Сповіщення</code>), і ви можете залишити це поле порожнім. Якщо потрібно, ви можете вручну встановити цю дату тут, але вона має бути пізнішою за останню дату аудиту. ',
+    'audit_images_help'     => 'Ви можете знайти зображення аудиту в історії активів.',
     'no_email'              => 'Немає адреси електронної пошти, пов\'язаної з цим користувачем',
     'last_audit'		    => 'Останній аудит',
     'new'					=> 'нове!',
@@ -215,6 +212,14 @@ return [
     'no_results'			=> 'Нічого не знайдено.',
     'no'  					=> 'Ні',
     'notes'  				=> 'Примітки.',
+    'note_added'            => 'Примітку додано',
+    'options'				=> 'Опції',
+    'preview'				=> 'Попередній перегляд',
+    'add_note'              => 'Додати примітку',
+    'note_edited'            => 'Нотатку відредаговано',
+    'edit_note'              => 'Редагувати примітку',
+    'note_deleted'            => 'Нотатку видалено',
+    'delete_note'              => 'Видалити примітку',
     'order_number'          => 'Номер замовлення',
     'only_deleted'          => 'Тільки видалені активи',
     'page_menu'				=> 'Показати _елементи MENU_',
@@ -229,7 +234,7 @@ return [
     'purchase_date'         => 'Дата покупки',
     'qty'		            => 'К-КСТЬ',
     'quantity'		        => 'Кількість',
-    'quantity_minimum'      => 'У вас є :count товарів нижче або майже нижче мінімального рівня кількості',
+    'quantity_minimum'      => 'У вас є один пункт нижче або близько мінімальної кількості елементів|У вас є :count елементів нижче або близько мінімального рівня кількості',
     'quickscan_checkin'  	=> 'Швидке сканування входу',
     'quickscan_checkin_status'  	=> 'Checkin Status',
     'ready_to_deploy'		=> 'Готовий до видачі',
@@ -240,21 +245,21 @@ return [
     'restored'				=> 'відновлено',
     'restore'				=> 'Відновити',
     'requestable_models'    => 'Необхідно ввести моделі',
-    'requestable_items'     => 'Requestable Items',
+    'requestable_items'     => 'Запитувані речі',
     'requested'				=> 'Запрошено користувачем',
     'requested_date'        => 'Дата запиту',
     'requested_assets'      => 'Запитані активи',
     'requested_assets_menu' => 'Запитані активи',
     'request_canceled'      => 'Запит скасовано',
-    'request_item'          => 'Request this item',
-    'external_link_tooltip' => 'External link to',
+    'request_item'          => 'Запросити цю річ',
+    'external_link_tooltip' => 'Зовнішнє посилання на',
     'save'  				=> 'Зберегти',
     'select_var'            => 'Оберіть :thing... ', // this will eventually replace all of our other selects
     'select'				=> 'Обрати',
     'select_all'            => 'Виділити все',
     'search'				=> 'Пошук',
     'select_category'       => 'Оберіть категорію',
-    'select_datasource' => 'Вибір джерела даних',
+    'select_datasource' => 'Виберіть джерело даних',
     'select_department'     => 'Оберіть відділ',
     'select_depreciation'	=> 'Оберіть тип амортизації',
     'select_location'		=> 'Оберіть розташування',
@@ -274,13 +279,15 @@ return [
     'signed_off_by'         => 'Підписано за',
     'skin'       			=> 'Шкіра',
     'webhook_msg_note'        => 'Повідомлення буде надіслано через webhook',
-    'webhook_test_msg'        => 'О, хай! Здається ваша інтеграція з :app із Snipe-IT працює!',
+    'webhook_test_msg'        => 'О, клас! Здається, що ваша інтеграція з Snipe-IT працює!',
     'some_features_disabled' => 'РЕЖИМ ДЕМО: Деякі функції відключені.',
     'site_name'				=> 'Назва сайту',
     'state'  				=> 'Статус',
     'status_labels'			=> 'Статуси активів',
+    'status_label'			=> 'Позначка статусу',
     'status'    			=> 'Статус',
     'accept_eula'           => 'Угода про погодження',
+    'show_or_hide_eulas' => 'Показати/приховати EULA',
     'supplier'              => 'Постачальник',
     'suppliers'  			=> 'Постачальники',
     'sure_to_delete'        => 'Ви впевнені, що бажаєте видалити',
@@ -296,15 +303,15 @@ return [
     'type'  				=> 'Тип',
     'undeployable'			=> 'Не доступний для встановлення',
     'unknown_admin'			=> 'Невідомий адміністратор',
-    'username_format'		=> 'Формат імені користувача',
     'username'              => 'Ім\'я кристувача',
     'update'                => 'Оновлення',
+    'updating_item' => 'Оновлення :item',
     'upload_filetypes_help'      => 'Дозволені типи файлів - png, gif, jpg, jpeg, doc, docx, pdf, xls, xlsx, txt, lic, xml, xml, zip, rtf і rar. Максимальний розмір завантаження - :size.',
     'uploaded'              => 'Завантажено',
     'user'					=> 'Користувач',
     'accepted'			    => 'прийнято',
     'declined'			    => 'відхилено',
-    'declined_note'         => 'Declined Notes',
+    'declined_note'         => 'Відхилені примітки',
     'unassigned'            => 'Непризначений',
     'unaccepted_asset_report' => 'Неприйняті активи',
     'users'                 => 'Користувачі',
@@ -323,10 +330,10 @@ return [
     'token_expired'         => 'Ваша login-сесія закінчилась. Будь ласка, увійдіть в систему знову.',
     'login_enabled'         => 'Вхід дозволено',
     'audit_due'             => 'Належно від аудиту',
-    'audit_due_days'        => 'Збитки в призначенні для аудиту протягом :days |Активи в строку аудиту протягом :days',
+    'audit_due_days'        => '{}Assets Due or Overdue for Audit|[1]Assets Due or Overdue for Audit Within a Day|[2,*]Assets Due or Overdue for Audit Within :days Days',
     'checkin_due'           => 'Одержувач входу',
     'checkin_overdue'       => 'Прострочено для входу',
-    'checkin_due_days'      => 'Залежні Активи для оформлення протягом :days Дня|Активів в рамках :days днів',
+    'checkin_due_days'      => '{}Due for Checkin|[1]Assets Due for Checkin Within :days Day|[2,*]Assets Due for Checkin Within :days Days',
     'audit_overdue'         => 'Прострочені для аудиту',
     'accept'                => 'Прийняти :asset',
     'i_accept'              => 'Я приймаю',
@@ -339,7 +346,7 @@ return [
     'view_all'              => 'переглянути все',
     'hide_deleted'          => 'Приховати видалені',
     'email'                 => 'Email',
-    'do_not_change'         => 'Не змінювати',
+    'do_not_change'         => 'Не змінюйте',
     'bug_report'            => 'Повідомити про помилку',
     'user_manual'           => 'Керівництво користувача',
     'setup_step_1'          => 'Крок 1',
@@ -383,6 +390,8 @@ return [
     'new_license'           => 'Нова ліцензія',
     'new_accessory'         => 'Новий аксесуар',
     'new_consumable'        => 'Новий витратний матеріал',
+    'new_component'         => 'New Component',
+    'new_user'              => 'New User',
     'collapse'              => 'Згорнути',
     'assigned'              => 'Призначено',
     'asset_count'           => 'Кількість активів',
@@ -405,9 +414,9 @@ return [
     'accessory_name'       => 'Назва аксесуара:',
     'clone_item'            => 'Клонувати предмет',
     'checkout_tooltip' => 'Перевірте цей елемент',
-    'checkin_tooltip' => 'Check this item in so that it is available for re-issue, re-imaging, etc',
+    'checkin_tooltip' => 'Позначте цей пункт, щоб він був доступний для повторного зчитування, та інших операцій',
     'checkout_user_tooltip' => 'Відмітити цей елемент користувачу',
-    'checkin_to_diff_location' => 'You can choose to check this asset in to a location other than this asset\'s default location of :default_location if one is set',
+    'checkin_to_diff_location' => 'Ви можете перевірити цей медіафайл в іншому місці, відмінному від розташування цього медіафайла за замовчуванням :default_location якщо він встановлений',
     'maintenance_mode'      => 'Сервіс тимчасово недоступний для оновлення системи. Будь ласка, перевірте пізніше.',
     'maintenance_mode_title' => 'Системний тимчасово недоступний',
     'ldap_import'           => 'Не має керуватися LDAP. (Це дозволяє надіслати забуті запити на пароль.)',
@@ -418,19 +427,20 @@ return [
     'bulk_soft_delete'      =>'Також видалити цих користувачів. Їхня історія активів залишиться недоторканою/доки ви не очистите вилучені записи в Налаштуваннях адміністратора.',
     'bulk_checkin_delete_success' => 'Ваші обрані користувачі були видалені та їх елементи були відмічені.',
     'bulk_checkin_success' => 'Елементи для обраних користувачів були перевірені.',
-    'set_to_null'           => 'Видалити значення для цього медіафайлу|Видалити значення для всіх :asset_count активів ',
+    'set_to_null'           => 'Видалити значення для цього вибору|Видалити значення для всіх :selection_count виділень ',
     'set_users_field_to_null'  => 'Видалити :field значень для цього користувача|:field значення для всіх :user_count користувачів ',
     'na_no_purchase_date'   => 'N/A - Дата придбання не вказана',
     'assets_by_status'      => 'Активи за станом',
     'assets_by_status_type'      => 'Активи за типом статусу',
     'pie_chart_type'        => 'Тип діаграми в меню налаштувань',
     'hello_name'            => 'Привіт, :name!',
-    'unaccepted_profile_warning'   => 'У вас є :count предметів, які потребують прийняття. Натисніть тут, щоб прийняти або відхилити їх',
+    'unaccepted_profile_warning'   => 'У вас є один предмет, який потребує прийняття. Натисніть тут, щоб прийняти або відхилити його | У вас є :count товару, що вимагає прийняття. Натисніть тут, щоб прийняти або відхилити їх',
     'start_date'            => 'Дата початку',
     'end_date'            => 'Дата закінчення',
     'alt_uploaded_image_thumbnail' => 'Завантажений ескіз',
     'placeholder_kit'       => 'Оберіть комплект',
     'file_not_found'        => 'Файл не знайдено',
+    'log_record_not_found'  => 'Не знайдено запису для цього логу.',
     'preview_not_available' => '(без попереднього перегляду)',
     'setup'                 => 'Установка',
     'pre_flight'            => 'Польоти',
@@ -508,11 +518,11 @@ return [
         'address2' => 'Адресний рядок 2',
         'import_note' => 'Імпортовано за допомогою csv імпортера',
     ],
-    'remove_customfield_association' => 'Remove this field from the fieldset. This will not delete the custom field, only this field\'s association with this fieldset.',
-    'checked_out_to_fields' => 'Checked Out To Fields',
+    'remove_customfield_association' => 'Видалити це поле з поля. Це не призведе до видалення користувальницького поля, тільки асоціації цього поля з цим набором полів.',
+    'checked_out_to_fields' => 'Визначено полями',
     'percent_complete' => '% завершити',
     'uploading' => 'Відвантаження... ',
-    'upload_error' => 'Помилка завантаження файлу. Будь ласка, перевірте, чи немає порожніх рядків і що не дубльовані назви стовпців.',
+    'upload_error' => 'Error uploading file. Please check that you have no empty rows or duplicated column names in your CSV, and that the server permissions allow uploads.',
     'copy_to_clipboard' => 'Копіювати в буфер обміну',
     'copied' => 'Скопійовано!',
     'status_compatibility' => 'Якщо активи вже призначені, вони не можуть бути змінені на тип статусу, який не розгортається, і ця зміна значення буде пропущена.',
@@ -528,7 +538,7 @@ return [
     'permission_denied_superuser_demo' => 'У доступі відмовлено. Ви не можете оновити інформацію про користувача для суперадміністраторів на демо.',
     'pwd_reset_not_sent' => 'Користувач не активований, він синхронізується або не має електронної адреси',
     'error_sending_email' => 'Помилка при відправці електронної пошти',
-    'sad_panda' => 'Sad panda. You are not authorized to do the thing. Maybe <a href=":link">return to the dashboard</a>, or contact your administrator.',
+    'sad_panda' => 'О ні. Ви не маєте дозволу виконати цю дію. Можливо, <a href=":link">поверніться на панель керування</a> або зверніться до адміністратора.',
     'bulk' => [
             'delete' =>
                 [
@@ -549,6 +559,71 @@ return [
         'license_seats'  => ':count реалізація|:count місця для ліцензії',
         'consumables'  => ':count витратно|:count витратних товарів',
         'components'  => ':count компонент|:count компонентів',
-    ]
+    ],
+
+    'more_info' => 'Детальніше',
+    'quickscan_bulk_help' => 'Поставивши цю позначку, ви зміните запис активу, щоб він відображав нове розташування. Якщо залишити поле без позначки, розташування буде лише зафіксовано в журналі аудиту. Зверніть увагу, що якщо актив перебуває в статусі "видано", це не змінить місцеперебування особи, активу чи місця, куди його видано.',
+    'whoops' => 'Упс!',
+    'something_went_wrong' => 'Щось пішло не так з вашим запитом.',
+    'close' => 'Закрити',
+    'expires' => 'Термін закінчується',
+    'map_fields'=> 'Карта полів типу :item_type',
+    'remaining_var' => 'Залишилося: :count',
+    'label' => 'Мітка',
+    'import_asset_tag_exists' => 'Медіафайл з тегом активів :asset_tag вже існує, і оновлення не було запитано. Зміни не були зроблені.',
+    'countries_manually_entered_help' => 'Значення з зірочкою (*) були введені вручну і не збігаються з існуючими значеннями ISO 3166',
+    'accessories_assigned' => 'Призначені аксесуари',
+    'user_managed_passwords' => 'Керування паролями',
+    'user_managed_passwords_disallow' => 'Заборонити користувачам керувати власними паролями',
+    'user_managed_passwords_allow' => 'Дозволити користувачам керувати своїми паролями',
+    'from' => 'From',
+    'by' => 'Ким',
+
+// Add form placeholders here
+    'placeholders' => [
+        'notes'  => 'Додати нотатку',
+    ],
+
+    'breadcrumb_button_actions' => [
+        'edit_item' => 'Редагувати :name',
+        'checkout_item' => 'Checkout :name',
+        'checkin_item' => 'Checkin :name',
+    ],
+
+    'skins' => [
+        'site_default' => 'Стандартний сайт',
+        'default_blue' => 'Синій стандартний',
+        'blue_dark' => 'Синій (темний режим)',
+        'green' => 'Зелений темний',
+        'green_dark' => 'Зелений (темний режим)',
+        'red' => 'Темно-червона',
+        'red_dark' => 'Червоний (темний режим)',
+        'orange' => 'Оранжевий Темний',
+        'orange_dark' => 'Оранжевий (Темний режим)',
+        'black' => 'Чорний',
+        'black_dark' => 'Чорний (Темний режим)',
+        'purple' => 'Фіолетовий',
+        'purple_dark' => 'Фіолетовий (Темний режим)',
+        'yellow' => 'Жовтий',
+        'yellow_dark' => 'Жовтий (Темний режим)',
+        'high_contrast' => 'Високий контраст',
+
+    ],
+
+    'select_all_none' => 'Вибрати/відмінити все',
+    'generic_model_not_found' => 'Не знайдено :model або ви не маєте дозволу на доступ до нього',
+    'deleted_models' => 'Видалені Моделі Активів',
+    'deleted_users' => 'Видалені користувачі',
+    'cost_each' => ':amount each',
+    'remove_current_image' => 'Remove current :type image',
+
+    'seeding' => [
+        'manufacturers' => [
+            'button' => 'Create Manufacturers',
+            'prompt' => 'You do not have any manufacturers yet. Would you like to seed a list of common manufacturers? (THIS WILL OVERWRITE EXISTING MANUFACTURERS, including those that have been soft-deleted.)',
+            'success' => 'Manufacturers seeded successfully',
+            'error' => 'Could not seed manufacturers. A manufacturer record already exists and seeding would overwrite it.|Could not seed manufacturers. :count manufacturer records already exist and seeding would overwrite them.',
+        ],
+    ],
 
 ];
diff --git a/resources/lang/uk-UA/localizations.php b/resources/lang/uk-UA/localizations.php
index be71c22d9d..5bbb7b352e 100644
--- a/resources/lang/uk-UA/localizations.php
+++ b/resources/lang/uk-UA/localizations.php
@@ -2,7 +2,7 @@
 
 return [
 
-    'select_language' => 'Оберіть мову',
+    'select_language' => 'Виберіть мову',
     'languages' => [
         'en-US'=> 'Англійська, США',
         'en-GB'=> 'Англійська, Великобританія',
@@ -40,7 +40,9 @@ return [
         'ms-MY'=> 'Малайська',
         'mi-NZ'=> 'Маорійська',
         'mn-MN'=> 'Монгольська',
-        'no-NO'=> 'Норвезька',
+        'nb-NO'=> 'Norwegian Bokmål',
+        'om-ET' => 'Oromo (Ethiopian)',
+        //'nn-NO'=> 'Norwegian Nynorsk',
         'fa-IR'=> 'Перська',
         'pl-PL'=> 'Польська',
         'pt-PT'=> 'Португальська',
@@ -133,6 +135,7 @@ return [
         'EC'=>'Ecuador',
         'EE'=>'Естонія',
         'EG'=>'Египет',
+        'GB-ENG'=>'Англія',
         'ER'=>'Еритрея',
         'ES'=>'Іспанія',
         'ET'=>'Ethiopia',
@@ -231,6 +234,7 @@ return [
         'NG'=>'Nigeria',
         'NI'=>'Nicaragua',
         'NL'=>'Нідерланди',
+        'GB-NIR' => 'Північна Ірландія',
         'NO'=>'Норвегія',
         'NP'=>'Непал',
         'NR'=>'Nauru',
@@ -258,7 +262,7 @@ return [
         'RU'=>'Російська Федерація',
         'RW'=>'Rwanda',
         'SA'=>'Саудівська Аравія',
-        'UK'=>'Шотландія',
+        'GB-SCT'=>'Шотландія',
         'SB'=>'Соломонові острови',
         'SC'=>'Seychelles',
         'SS'=>'Південний Судан',
@@ -310,6 +314,7 @@ return [
         'VI'=>'Віргінські острови (США)',
         'VN'=>'Viet Nam',
         'VU'=>'Vanuatu',
+        'GB-WLS' =>'Уельс',
         'WF'=>'Уолліс і Футуна',
         'WS'=>'Samoa',
         'YE'=>'Ємен',
diff --git a/resources/lang/uk-UA/mail.php b/resources/lang/uk-UA/mail.php
index fb1de21071..01b6cbc1e6 100644
--- a/resources/lang/uk-UA/mail.php
+++ b/resources/lang/uk-UA/mail.php
@@ -23,24 +23,25 @@ return [
     'Item_Requested' => 'Запит на',
     'License_Checkin_Notification' => 'Ліцензія перевірена',
     'License_Checkout_Notification' => 'Ліцензію перевірено',
+    'license_for'   => 'Ліцензія для',
     'Low_Inventory_Report' => 'Звіт про низький рівень інвентарю',
     'a_user_canceled' => 'Користувач скасував запит на об\'єкт на веб-сайті',
     'a_user_requested' => 'Користувач надіслав запит на об\'єкт на веб-сайті',
     'acceptance_asset_accepted' => 'Користувач прийняв позицію',
     'acceptance_asset_declined' => 'Користувач відхилив елемент',
-    'accessory_name' => 'Назва аксесуара:',
-    'additional_notes' => 'Додаткові примітки:',
+    'accessory_name' => 'Назва аксесуара',
+    'additional_notes' => 'Додаткові примітки',
     'admin_has_created' => 'Адміністратор створив вам обліковий запис на веб-сайті.',
-    'asset' => 'Актив:',
-    'asset_name' => 'Найменування Активу:',
+    'asset' => 'Актив',
+    'asset_name' => 'Назва активу',
     'asset_requested' => 'Запит на актив',
     'asset_tag' => 'Тег активу',
     'assets_warrantee_alert' => 'В наступні :threshold днів є :count медіафайл з гарантією, яка закінчується в наступні :threshold днів.|В наступних :threshold медіафайлів з гарантіями, що закінчуються в наступні :threshold днів.',
     'assigned_to' => 'Відповідальний',
     'best_regards' => 'З найкращими побажаннями,',
-    'canceled' => 'Скасовано:',
-    'checkin_date' => 'Дата повернення:',
-    'checkout_date' => 'Дата видачі:',
+    'canceled' => 'Скасовано',
+    'checkin_date' => 'Дата повернення',
+    'checkout_date' => 'Дата видачі',
     'checkedout_from' => 'Перевірено з',
     'checkedin_from'  => 'Відмічено від',
     'checked_into' => 'Відмічено від',
@@ -49,27 +50,30 @@ return [
     'click_to_confirm' => 'Будь-ласка, натисніть на це посилання, щоб підтвердити свій: веб-акаунт:',
     'current_QTY' => 'Поточна к-ксть',
     'days' => 'Днів',
-    'expecting_checkin_date' => 'Очікувана дата повернення:',
+    'expecting_checkin_date' => 'Очікувана дата повернення',
     'expires' => 'Термін закінчується',
     'hello' => 'Привіт',
     'hi' => 'Привіт',
     'i_have_read' => 'Я прочитав і згоден з умовами використання даного товару.',
     'inventory_report' => 'Звіт про запаси',
-    'item' => 'Елемент:',
+    'item' => 'Елемент',
+    'item_checked_reminder' => 'Нагадуємо, що у вас є :count активів що видані вам, але не що не були підтверджені вами або відхилені. Будь ласка, натисніть на посилання нижче, щоб підтвердити своє рішення.',
     'license_expiring_alert' => 'В наступні :threshold днів закінчується :count термін дії ліцензії для наступних :threshold днів.|В наступному :threshold строк дії ліцензії.',
     'link_to_update_password' => 'Будь-ласка, натисніть на це посилання, щоб оновити свій пароль:',
-    'login' => 'Логін:',
+    'login' => 'Вхід',
     'login_first_admin' => 'Увійдіть до вашої нової установки Snipe-IT за допомогою нижче:',
     'low_inventory_alert' => 'Є :count елемент, який нижчий мінімальний інвентар або низький. Є :count предмети, які нижче мінімального інвентарю, або скоро будуть низькими.',
     'min_QTY' => 'Мін. кількість',
     'name' => 'Назва',
     'new_item_checked' => 'Новий елемент був виданий під вашим ім\'ям, докладніше про це нижче.',
+    'new_item_checked_with_acceptance' => 'A new item has been checked out under your name that requires acceptance, details are below.',
+    'recent_item_checked' => 'An item was recently checked out under your name that requires acceptance, details are below.',
     'notes' => 'Примітки.',
-    'password' => 'Пароль:',
+    'password' => 'Пароль',
     'password_reset' => 'Скидання Пароля',
     'read_the_terms' => 'Будь ласка, прочитайте умови використання нижче.',
     'read_the_terms_and_click' => 'Будь ласка, прочитайте умови використання нижче, і натисніть на посилання внизу, щоб підтвердити, що Ви прочитали та згодні з умовами користування та отримали актив.',
-    'requested' => 'Запрошено користувачем:',
+    'requested' => 'Запрошено користувачем',
     'reset_link' => 'Ваше посилання для скидання пароля',
     'reset_password' => 'Натисніть тут для скидання пароля:',
     'rights_reserved' => 'Усі права захищені.',
@@ -86,8 +90,10 @@ return [
     'upcoming-audits' => 'Знайдено :count актив, що наближається до аудиту в :threshold днів.|Є :count активів, які йдуть до аудиту в :threshold днів.',
     'user' => 'Користувач',
     'username' => 'Ім\'я кристувача',
+    'unaccepted_asset_reminder' => 'Reminder: You have Unaccepted Assets.',
     'welcome' => 'Ласкаво просимо, :name',
     'welcome_to' => 'Ласкаво просимо до :web!',
     'your_assets' => 'Переглянути Ваші Активи',
     'your_credentials' => 'Ваші облікові дані Snipe-IT',
+    'mail_sent' => 'Повідомлення успішно відправлено!',
 ];
diff --git a/resources/lang/uk-UA/table.php b/resources/lang/uk-UA/table.php
index d09a69a132..8fa2242d25 100644
--- a/resources/lang/uk-UA/table.php
+++ b/resources/lang/uk-UA/table.php
@@ -6,6 +6,6 @@ return array(
     'action' 		        => 'Дія',
     'by'      		        => 'Ким',
     'item' 			        => 'Елемент',
-    'no_matching_records'   => 'No matching records found',
+    'no_matching_records'   => 'Не знайдено відповідних записів',
 
 );
diff --git a/resources/lang/uk-UA/validation.php b/resources/lang/uk-UA/validation.php
index c758303444..b902226b90 100644
--- a/resources/lang/uk-UA/validation.php
+++ b/resources/lang/uk-UA/validation.php
@@ -13,87 +13,150 @@ return [
     |
     */
 
-    'accepted'             => 'Ви повинні прийняти :attribute.',
-    'active_url'           => 'Поле :attribute не є правильним URL.',
-    'after'                => 'Поле :attribute має містити дату не раніше :date.',
-    'after_or_equal'       => 'Поле :attribute має містити дату не раніше або дорівнювати :date.',
-    'alpha'                => 'Поле :attribute має містити лише літери.',
-    'alpha_dash'           => 'Поле :attribute має містити лише літери, цифри та тире.',
-    'alpha_num'            => 'Поле :attribute має містити лише літери та цифри.',
-    'array'                => 'Поле :attribute має бути масивом.',
-    'before'               => 'Поле :attribute має містити дату не пізніше :date.',
-    'before_or_equal'      => 'Поле :attribute має містити дату не пізніше або дорівнювати :date.',
-    'between'              => [
-        'numeric' => 'Поле :attribute має бути між :min - :max.',
-        'file'    => 'Розмір :attribute має бути в межах від :min - :max кілобайт.',
-        'string'  => 'Текст в полі :attribute має бути не менше :min - :max символів.',
-        'array'   => 'Поле :attribute має бути між :min та :max елементами.',
+    'accepted' => 'Поле :attribute повинно бути заповнене.',
+    'accepted_if' => 'Поле :attribute є обов\'язковим для заповнення, коли :other є :value.',
+    'active_url' => 'Поле :attribute має містити правильний URL.',
+    'after' => 'Поле :attribute має містити дату не раніше :date.',
+    'after_or_equal' => 'Поле :attribute має містити дату не раніше або дорівнювати :date.',
+    'alpha' => 'Поле :attribute має містити лише літери.',
+    'alpha_dash' => 'Поле :attribute має містити лише літери, цифри та тире.',
+    'alpha_num' => 'Поле :attribute має містити лише літери та цифри.',
+    'array' => 'Поле :attribute має бути масивом.',
+    'ascii' => 'Поле :attribute повинне містити лише літерно-цифрові символи та символи.',
+    'before' => 'Поле :attribute має містити дату не пізніше :date.',
+    'before_or_equal' => 'Поле :attribute має містити дату не пізніше або дорівнювати :date.',
+    'between' => [
+        'array' => 'Поле :attribute має містити від :min до :max елементів.',
+        'file' => 'Поле :attribute має бути в межах від :min до :max кілобайт.',
+        'numeric' => 'Поле :attribute має бути в межах від :min до :max.',
+        'string' => 'Поле :attribute має містити від :min до :max символів.',
     ],
-    'boolean'              => 'Поле :attribute повинне містити значення true або false.',
-    'confirmed'            => 'Підтвердження для :attribute не співпадає.',
-    'date'                 => 'Поле :attribute не є датою.',
-    'date_format'          => 'Поле :attribute не відповідає формату :format.',
-    'different'            => 'Поля :attribute та :other повинні бути різними.',
-    'digits'               => 'Довжина цифрового поля :attribute повинна дорівнювати :digits.',
-    'digits_between'       => 'Довжина цифрового поля :attribute повинна бути в межах від :min до :max.',
-    'dimensions'           => 'Поле :attribute міщує неприпустимі розміри зображення.',
-    'distinct'             => 'Значення поля :attribute вже існує.',
-    'email'                => 'Формат поля :attribute неправильний.',
-    'exists'               => 'Обрана валюта недійсна.',
-    'file'                 => 'Поле :attribute має містити файл.',
-    'filled'               => 'Поле :attribute повинно бути заповнене.',
-    'image'                => ':attribute має бути зображенням.',
+    'boolean' => 'Поле :attribute повинне містити логічний тип.',
+    'can' => 'Поле :attribute містить недозволене значення.',
+    'confirmed' => 'Поле підтвердження :attribute не збігається.',
+    'contains' => 'Поле :attribute не заповнене обов’язковим значенням.',
+    'current_password' => 'Неправильний пароль.',
+    'date' => 'Поле :attribute має містити коректну дату.',
+    'date_equals' => 'Поле :attribute має бути датою довжиною від :date.',
+    'date_format' => 'Поле :attribute має відповідати формату :format.',
+    'decimal' => 'Поле :attribute повинне мати :decimal знаків.',
+    'declined' => 'Поле :attribute має бути відхилене.',
+    'declined_if' => 'Поле :attribute повинно бути відхилено, коли :other є :value.',
+    'different' => 'Поле :attribute та :other має бути різним.',
+    'digits' => 'Поле :attribute має складатися з цифр :digits.',
+    'digits_between' => 'Довжина поля :attribute має бути в межах від :min до :max цифр.',
+    'dimensions' => 'Поле :attribute містить неприпустимі розміри зображення.',
+    'distinct' => 'Значення поля :attribute вже існує.',
+    'doesnt_end_with' => 'Поле :attribute не повинне закінчуватись одним з наступних параметрів: :values.',
+    'doesnt_start_with' => 'Поле :attribute не повинне починатися з одного з наступних: :values.',
+    'email' => 'Поле :attribute має містити коректну електронну адресу.',
+    'ends_with' => 'Поле :attribute повинне закінчуватися одним з наступних параметрів: :values.',
+    'enum' => 'Обрана валюта недійсна.',
+    'exists' => 'Обрана валюта недійсна.',
+    'extensions' => 'Поле :attribute повинне містити одне з наступних розширень: :values.',
+    'file' => 'Поле :attribute має містити файл.',
+    'filled' => 'Поле :attribute повинно бути заповнене.',
+    'gt' => [
+        'array' => 'Кількість елементів поля :attribute повинно бути більше :value.',
+        'file' => 'Поле :attribute має бути більше :value кілобайт.',
+        'numeric' => 'Поле :attribute має бути більше :value.',
+        'string' => 'Кількість символів поля :attribute повинно бути більше :value.',
+    ],
+    'gte' => [
+        'array' => 'Поле :attribute повинне містити :value або більше учасників.',
+        'file' => 'Поле :attribute має бути більше або дорівнювати :value кілобайт.',
+        'numeric' => 'Поле :attribute повинно бути більше або дорівнювати :value.',
+        'string' => 'Кількість символів поля :attribute повинно бути більше або дорівнювати :value.',
+    ],
+    'hex_color' => 'Поле :attribute має бути коректним hexadecimal кольором.',
+    'image' => 'Поле :attribute має бути зображенням.',
     'import_field_empty'    => 'Значення для :fieldname не може бути null.',
-    'in'                   => 'Обрана валюта недійсна.',
-    'in_array'             => 'Значення поля :attribute не існує в :other.',
-    'integer'              => 'Поле :attribute має містити ціле число.',
-    'ip'                   => 'Поле :attribute має містити IP адресу.',
-    'ipv4'                 => 'Поле :attribute має бути коректною адресою IPv4.',
-    'ipv6'                 => ':attribute має бути коректною адресою IPv6.',
-    'is_unique_department' => 'Поле :attribute має бути унікальним для даного розташування компанії',
-    'json'                 => 'Дані поля :attribute мають бути в форматі JSON.',
-    'max'                  => [
-        'numeric' => 'Поле :attribute має бути не більше :max.',
-        'file'    => ':attribute має бути не більше :max кілобайт.',
-        'string'  => 'Текст в полі :attribute повинен містити не більше, ніж :max символів.',
-        'array'   => 'Поле :attribute повинне містити не більше :max елементів.',
+    'in' => 'Обрана валюта недійсна.',
+    'in_array' => 'Поле :attribute повинне існувати в :other.',
+    'integer' => 'Поле :attribute має бути цілим числом.',
+    'ip' => 'Поле :attribute має бути коректною IP-адресою.',
+    'ipv4' => 'Поле :attribute має бути коректною адресою IPv4.',
+    'ipv6' => 'Поле :attribute має бути коректною адресою IPv6.',
+    'json' => 'Поле :attribute має бути коректним JSON рядком.',
+    'list' => 'Поле :attribute має містити список.',
+    'lowercase' => 'Поле :attribute має бути нижнім рядком.',
+    'lt' => [
+        'array' => 'Кількість елементів поля :attribute повинно бути менше ніж :value.',
+        'file' => 'Поле :attribute має бути менше :value кілобайт.',
+        'numeric' => 'Поле :attribute має бути менше :value.',
+        'string' => 'Кількість символів поля :attribute повинно бути менше ніж :value.',
     ],
-    'mimes'                => 'Поле :attribute повинне містити файл одного з типів: :values.',
-    'mimetypes'            => 'Поле :attribute повинне містити файл одного з типів: :values.',
-    'min'                  => [
-        'numeric' => 'Поле :attribute повинне бути не менше :min.',
-        'file'    => 'Розмір файлу в полі :attribute має бути не меншим :min кілобайт.',
-        'string'  => 'Текст в полі :attribute повинен містити не менше :min символів.',
-        'array'   => 'Поле :attribute повинне містити не менше :min елементів.',
+    'lte' => [
+        'array' => 'Поле :attribute не повинне містити більше ніж :value.',
+        'file' => 'Поле :attribute має бути менше або дорівнювати :value кілобайт.',
+        'numeric' => 'Поле :attribute повинно бути менше або дорівнювати :value.',
+        'string' => 'Кількість символів поля :attribute повинно бути менше або дорівнювати :value.',
     ],
-    'starts_with'          => 'Поле :attribute повинне починатися з одного з наступних :values.',
-    'ends_with'            => 'Поле :attribute повинне закінчуватися одним з наступних: :values.',
+    'mac_address' => ':attribute має бути коректною MAC адресою.',
+    'max' => [
+        'array' => 'Поле :attribute не повинне містити більше :max елементів.',
+        'file' => 'Поле :attribute має бути не більше :max кілобайт.',
+        'numeric' => 'Поле :attribute не має бути більше :max.',
+        'string' => 'Поле :attribute має бути не більше :max символів.',
+    ],
+    'max_digits' => 'Поле :attribute не повинне містити більше :max цифр.',
+    'mimes' => 'Поле :attribute повинне містити файл типу: :values.',
+    'mimetypes' => 'Поле :attribute повинне містити файл типу: :values.',
+    'min' => [
+        'array' => 'Поле :attribute повинне містити не менше :min елементів.',
+        'file' => 'Поле :attribute має бути не менше :min кілобайт.',
+        'numeric' => 'Поле :attribute має бути не менше :min.',
+        'string' => 'Поле :attribute повинне містити щонайменше :min символів.',
+    ],
+    'min_digits' => 'Поле :attribute повинне містити не менше :min цифр.',
+    'missing' => 'Поле :attribute має бути відсутнє.',
+    'missing_if' => 'Поле :attribute повинно бути відсутнє, якщо :other є :value.',
+    'missing_unless' => 'Поле :attribute повинно бути відсутнє, якщо :other не є :value.',
+    'missing_with' => 'Поле :attribute повинно бути відсутнім, коли :values вказано.',
+    'missing_with_all' => 'Поле :attribute має бути відсутнім, коли :values вказані.',
+    'multiple_of' => 'Поле :attribute повинне містити декілька :value.',
+    'not_in' => 'Обрана валюта недійсна.',
+    'not_regex' => 'Неприпустимий формат поля :attribute .',
+    'numeric' => 'Поле :attribute повинне містити число.',
+    'password' => [
+        'letters' => 'Поле :attribute має містити принаймні одну букву.',
+        'mixed' => 'Поле :attribute має містити принаймні одну велику й одну малу літеру.',
+        'numbers' => 'Поле :attribute повинне містити принаймні одне число.',
+        'symbols' => 'Поле :attribute має містити принаймні один символ.',
+        'uncompromised' => 'Даний :attribute з\'явився в витоку даних. Будь ласка, виберіть інший :attribute.',
+    ],
+    'percent'       => 'Мінімальна амортизація повинна бути від 0 до 100, коли тип амортизації є відсотковим.',
 
-    'not_in'               => 'Обрана валюта недійсна.',
-    'numeric'              => 'Поле :attribute має містити число.',
-    'present'              => 'Поле :attribute повинне бути присутнім.',
-    'valid_regex'          => 'Це не коректний регулярний вираз. ',
-    'regex'                => 'Формат поля :attribute неправильний.',
-    'required'             => 'Поле :attribute є обов\'язковим для заповнення.',
-    'required_if'          => 'Поле :attribute є обов\'язковим для заповнення, коли :other є :value.',
-    'required_unless'      => 'Поле :attribute обов\'язкове, якщо :other не з :values.',
-    'required_with'        => 'Поле :attribute є обов\'язковим для заповнення, коли :values вказано.',
-    'required_with_all'    => 'Поле :attribute є обов\'язковим для заповнення, коли :values вказано.',
-    'required_without'     => 'Поле :attribute є обов\'язковим для заповнення, коли :values не вказано.',
+    'present' => 'Поле :attribute повинне бути присутнім.',
+    'present_if' => 'Поле :attribute має бути присутнім коли :other є рівним :value.',
+    'present_unless' => 'Поле :attribute повинно бути присутнім тільки в :other : value.',
+    'present_with' => 'Поле :attribute має бути присутнє коли :values вказано.',
+    'present_with_all' => 'Поле :attribute має бути присутнім коли :values вказано.',
+    'prohibited' => 'Поле :attribute заборонено.',
+    'prohibited_if' => 'Поле :attribute заборонено, якщо :other є :value.',
+    'prohibited_unless' => 'Поле :attribute заборонене, якщо :other не зазначено в :values.',
+    'prohibits' => 'Поле :attribute забороняє :other бути присутнім.',
+    'regex' => 'Неприпустимий формат поля :attribute .',
+    'required' => 'Поле :attribute є обов\'язковим для заповнення.',
+    'required_array_keys' => 'Поле :attribute повинне містити записи для: :values.',
+    'required_if' => 'Поле :attribute є обов\'язковим для заповнення, коли :other є :value.',
+    'required_if_accepted' => 'Поле :attribute обов\'язкове, коли :other буде прийнято.',
+    'required_if_declined' => 'Поле :attribute є обов\'язковим для заповнення, коли :other відхилено.',
+    'required_unless' => 'Поле :attribute обов\'язкове, якщо :other не з :values.',
+    'required_with' => 'Поле :attribute є обов\'язковим для заповнення, коли :values вказано.',
+    'required_with_all' => 'Поле :attribute є обов\'язковим для заповнення, коли :values вказано.',
+    'required_without' => 'Поле :attribute є обов\'язковим для заповнення, коли :values не вказано.',
     'required_without_all' => 'Поле :attribute є обов\'язковим для заповнення, коли :values не вказано.',
-    'same'                 => 'Поля :attribute та :other мають співпадати.',
-    'size'                 => [
-        'numeric' => 'Поле :attribute має бути довжиною :size.',
-        'file'    => ':attribute має бути :size кілобайт.',
-        'string'  => ':attribute має бути довжиною :size символів.',
-        'array'   => 'Поле :attribute має містити :size елементів.',
+    'same' => 'Поле :attribute має відповідати :other.',
+    'size' => [
+        'array' => 'Поле :attribute повинне містити :size елементів.',
+        'file' => 'Поле :attribute має бути :size кілобайт.',
+        'numeric' => 'Поле :attribute має бути :size.',
+        'string' => 'Поле :attribute має містити :size символів.',
     ],
+    'starts_with' => 'Поле :attribute повинне починатися з одного з наступних :values.',
     'string'               => 'Поле :attribute повинне містити текст.',
-    'timezone'             => 'Поле :attribute повинне містити коректну часову зону.',
     'two_column_unique_undeleted' => 'Поле :attribute має бути унікальним для :table1 і :table2. ',
-    'unique'               => ':attribute вже зайнятий.',
-    'uploaded'             => 'Завантаження поля :attribute не вдалося.',
-    'url'                  => 'Формат поля :attribute неправильний.',
     'unique_undeleted'     => 'Поле :attribute має бути унікальним.',
     'non_circular'         => 'Поле :attribute не повинне створювати круглие посилання.',
     'not_array'            => ':attribute не може бути масивом.',
@@ -102,11 +165,14 @@ return [
     'numbers'              => 'Пароль має містити принаймні одну цифру.',
     'case_diff'            => 'Пароль повинен використовувати змішаний випадок.',
     'symbols'              => 'Пароль має містити символи.',
-    'gte'                  => [
-        'numeric'          => 'Значення не може бути від’ємним'
-    ],
-    'checkboxes'           => ':attribute містить неприпустимі параметри.',
-    'radio_buttons'        => ':attribute є неприпустимим.',
+    'timezone' => 'Поле :attribute має містити коректну часову зону.',
+    'unique' => ':attribute вже зайнятий.',
+    'uploaded' => 'Завантаження поля :attribute не вдалося.',
+    'uppercase' => 'Поле :attribute має бути з верхнім регістром.',
+    'url' => 'Поле :attribute має бути коректним URL.',
+    'ulid' => 'Поле :attribute має бути дійсним ULID.',
+    'uuid' => 'Поле :attribute має бути коректним UUID.',
+    'fmcs_location' => 'Full multiple company support and location scoping is enabled in the Admin Settings, and the selected location and selected company are not compatible.',
 
 
     /*
@@ -120,16 +186,22 @@ return [
     |
     */
 
+    'email_array'      => 'Одна або кілька адрес електронної пошти не правильні.',
+    'checkboxes'           => ':attribute містить неприпустимі параметри.',
+    'radio_buttons'        => ':attribute є неприпустимим.',
+    
     'custom' => [
         'alpha_space' => 'Поле :attribute містить символ, який не допускається.',
-        'email_array'      => 'Одна або кілька адрес електронної пошти не правильні.',
+
         'hashed_pass'      => 'Поточний пароль неправильний',
         'dumbpwd'          => 'Цей пароль занадто вживаний.',
         'statuslabel_type' => 'Ви повинні вибрати правильний тип статуса',
+        'custom_field_not_found'          => 'Це поле не існує, будь ласка, перевірте ваші власні імена полів.',
+        'custom_field_not_found_on_model' => 'Це поле існує, але воно не доступне в цьому наборі поля даної моделі Активу.',
 
         // date_format validation with slightly less stupid messages. It duplicates a lot, but it gets the job done :(
-        // We use this because the default error message for date_format is reflects php Y-m-d, which non-PHP
-        // people won't know how to format. 
+        // We use this because the default error message for date_format reflects php Y-m-d, which non-PHP
+        // people won't know how to format.
         'purchase_date.date_format'     => 'Поле :attribute має містити коректну дату в форматі YYYY-MM-DD',
         'last_audit_date.date_format'   =>  'Поле :attribute має містити коректну дату в форматі YYYY-MM-DD hh:mm:ss',
         'expiration_date.date_format'   =>  'Поле :attribute має містити коректну дату в форматі YYYY-MM-DD',
@@ -137,9 +209,15 @@ return [
         'expected_checkin.date_format'  =>  'Поле :attribute має містити коректну дату в форматі YYYY-MM-DD',
         'start_date.date_format'        =>  'Поле :attribute має містити коректну дату в форматі YYYY-MM-DD',
         'end_date.date_format'          =>  'Поле :attribute має містити коректну дату в форматі YYYY-MM-DD',
+        'invalid_value_in_field' => 'Невірне значення включене в це поле',
 
-    ],
+        'ldap_username_field' => [
+            'not_in' =>         '<code>sAMAccountName</code> (змішаний регістр), ймовірно, не працює. Замість цього ви повинні використовувати <code>samaccountname</code> (нижній регістр).'
+        ],
+        'ldap_auth_filter_query' => ['not_in' => '<code>uid=samaccountname</code> , можливо, не є коректним фільтром авторизації. Ви мабуть хочете, <code>uid=</code> '],
+        'ldap_filter' => ['regex' => 'Це значення, мабуть, не повинно бути в дужках.'],
 
+        ],
     /*
     |--------------------------------------------------------------------------
     | Custom Validation Attributes
@@ -155,8 +233,16 @@ return [
 
     /*
     |--------------------------------------------------------------------------
-    | Generic Validation Messages
+    | Generic Validation Messages - we use these in the jquery validation where we don't have
+    | access to the :attribute
     |--------------------------------------------------------------------------
     */
-    'invalid_value_in_field' => 'Невірне значення включене в це поле',
+
+    'generic' => [
+        'invalid_value_in_field' => 'Невірне значення включене в це поле',
+        'required' => 'Це поле обов\'язкове для заповнення',
+        'email' => 'Будь ласка, введіть коректну адресу електронної пошти',
+    ],
+
+
 ];
diff --git a/resources/lang/ur-PK/account/general.php b/resources/lang/ur-PK/account/general.php
index 1a9e2c03b8..7f9e2f848e 100644
--- a/resources/lang/ur-PK/account/general.php
+++ b/resources/lang/ur-PK/account/general.php
@@ -2,10 +2,16 @@
 
 return array(
     'personal_api_keys' => 'Personal API Keys',
+    'personal_access_token' => 'Personal Access Token',
+    'personal_api_keys_success' => 'Personal API Key :key created sucessfully',
+    'here_is_api_key' => 'Here is your new personal access token. This is the only time it will be shown so do not lose it! You may now use this token to make API requests.',
     'api_key_warning' => 'When generating an API token, be sure to copy it down immediately as they will not be visible to you again.',
     'api_base_url' => 'Your API base url is located at:',
     'api_base_url_endpoint' => '/&lt;endpoint&gt;',
     'api_token_expiration_time' => 'API tokens are set to expire in:',
     'api_reference' => 'Please check the <a href="https://snipe-it.readme.io/reference" target="_blank">API reference</a> to find specific API endpoints and additional API documentation.',
     'profile_updated' => 'Account successfully updated',
+    'no_tokens' => 'You have not created any personal access tokens.',
+    'enable_sounds' => 'Enable sound effects',
+    'enable_confetti' => 'Enable confetti effects',
 );
diff --git a/resources/lang/ur-PK/admin/accessories/message.php b/resources/lang/ur-PK/admin/accessories/message.php
index c688d5e03d..f60d41957b 100644
--- a/resources/lang/ur-PK/admin/accessories/message.php
+++ b/resources/lang/ur-PK/admin/accessories/message.php
@@ -26,7 +26,11 @@ return array(
         'error'   		=> 'Accessory was not checked out, please try again',
         'success' 		=> 'Accessory checked out successfully.',
         'unavailable'   => 'Accessory is not available for checkout. Check quantity available',
-        'user_does_not_exist' => 'That user is invalid. Please try again.'
+        'user_does_not_exist' => 'That user is invalid. Please try again.',
+         'checkout_qty' => array(
+            'lte'  => 'There is currently only one available accessory of this type, and you are trying to check out :checkout_qty. Please adjust the checkout quantity or the total stock of this accessory and try again.|There are :number_currently_remaining total available accessories, and you are trying to check out :checkout_qty. Please adjust the checkout quantity or the total stock of this accessory and try again.',
+            ),
+           
     ),
 
     'checkin' => array(
diff --git a/resources/lang/ur-PK/admin/accessories/table.php b/resources/lang/ur-PK/admin/accessories/table.php
index e02d9f22e4..80df687161 100644
--- a/resources/lang/ur-PK/admin/accessories/table.php
+++ b/resources/lang/ur-PK/admin/accessories/table.php
@@ -6,6 +6,4 @@ return array(
     'id'      					=> 'ID',
     'require_acceptance'      	=> 'Acceptance',
     'title'      				=> 'Accessory Name',
-
-
 );
diff --git a/resources/lang/ur-PK/admin/components/message.php b/resources/lang/ur-PK/admin/components/message.php
index 0a7dd8d954..ec39dc4178 100644
--- a/resources/lang/ur-PK/admin/components/message.php
+++ b/resources/lang/ur-PK/admin/components/message.php
@@ -17,7 +17,8 @@ return array(
     'delete' => array(
         'confirm'   => 'Are you sure you wish to delete this component?',
         'error'   => 'There was an issue deleting the component. Please try again.',
-        'success' => 'The component was deleted successfully.'
+        'success' => 'The component was deleted successfully.',
+        'error_qty'   => 'Some components of this type are still checked out. Please check them in and try again.',
     ),
 
      'checkout' => array(
diff --git a/resources/lang/ur-PK/admin/consumables/general.php b/resources/lang/ur-PK/admin/consumables/general.php
index 7c6bb32968..29acfedc1b 100644
--- a/resources/lang/ur-PK/admin/consumables/general.php
+++ b/resources/lang/ur-PK/admin/consumables/general.php
@@ -8,4 +8,5 @@ return array(
     'remaining' 			            => 'Remaining',
     'total' 			                => 'Total',
     'update'                            => 'Update Consumable',
+    'inventory_warning'                 => 'The inventory of this consumable is below the minimum amount of :min_count',
 );
diff --git a/resources/lang/ur-PK/admin/consumables/message.php b/resources/lang/ur-PK/admin/consumables/message.php
index c0d0aa7f68..e2591503bf 100644
--- a/resources/lang/ur-PK/admin/consumables/message.php
+++ b/resources/lang/ur-PK/admin/consumables/message.php
@@ -2,6 +2,7 @@
 
 return array(
 
+    'invalid_category_type' => 'The category must be a consumable category.',
     'does_not_exist' => 'Consumable does not exist.',
 
     'create' => array(
diff --git a/resources/lang/ur-PK/admin/custom_fields/general.php b/resources/lang/ur-PK/admin/custom_fields/general.php
index e3c21d1f0c..c9ae61c963 100644
--- a/resources/lang/ur-PK/admin/custom_fields/general.php
+++ b/resources/lang/ur-PK/admin/custom_fields/general.php
@@ -35,7 +35,7 @@ return [
     'create_field_title' => 'Create a new custom field',
     'value_encrypted'      	        => 'The value of this field is encrypted in the database. Only admin users will be able to view the decrypted value',
     'show_in_email'     => 'Include the value of this field in checkout emails sent to the user? Encrypted fields cannot be included in emails',
-    'show_in_email_short'     => 'Include in emails.',
+    'show_in_email_short' => 'Include in emails',
     'help_text' => 'Help Text',
     'help_text_description' => 'This is optional text that will appear below the form elements while editing an asset to provide context on the field.',
     'about_custom_fields_title' => 'About Custom Fields',
@@ -57,5 +57,8 @@ return [
     'show_in_requestable_list_short' => 'Show in requestable assets list',
     'show_in_requestable_list' => 'Show value in requestable assets list. Encrypted fields will not be shown',
     'encrypted_options' => 'This field is encrypted, so some display options will not be available.',
+    'display_checkin' => 'Display in checkin forms',
+    'display_checkout' => 'Display in checkout forms',
+    'display_audit' => 'Display in audit forms',
 
 ];
diff --git a/resources/lang/ur-PK/admin/custom_fields/message.php b/resources/lang/ur-PK/admin/custom_fields/message.php
index 43ba821821..6442359b7f 100644
--- a/resources/lang/ur-PK/admin/custom_fields/message.php
+++ b/resources/lang/ur-PK/admin/custom_fields/message.php
@@ -5,6 +5,7 @@ return array(
     'field' => array(
         'invalid'   => 'That field does not exist.',
         'already_added'   => 'Field already added',
+        'none_selected'   => 'No field selected',
 
         'create' => array(
             'error'   => 'Field was not created, please try again.',
diff --git a/resources/lang/ur-PK/admin/depreciations/general.php b/resources/lang/ur-PK/admin/depreciations/general.php
index 1a5666f9dc..90246e9cd8 100644
--- a/resources/lang/ur-PK/admin/depreciations/general.php
+++ b/resources/lang/ur-PK/admin/depreciations/general.php
@@ -13,4 +13,8 @@ return [
     'no_depreciations_warning'               => '<strong>Warning: </strong>
                       You do not currently have any depreciations set up.
                       Please set up at least one depreciation to view the depreciation report.',
+    'depreciation_method'                   => 'Depreciation Report',
+    'linear_depreciation'                   => 'Linear (Default)',
+    'half_1'                                => 'Half-year convention, always applied',
+    'half_2'                                => 'Half-year convention, applied with condition',
 ];
diff --git a/resources/lang/ur-PK/admin/hardware/form.php b/resources/lang/ur-PK/admin/hardware/form.php
index edec543637..8fbd0b4e87 100644
--- a/resources/lang/ur-PK/admin/hardware/form.php
+++ b/resources/lang/ur-PK/admin/hardware/form.php
@@ -55,8 +55,11 @@ return [
     'asset_location_update_default' => 'Update only default location',
     'asset_location_update_actual' => 'Update only actual location',
     'asset_not_deployable' => 'That asset status is not deployable. This asset cannot be checked out.',
-    'asset_deployable' => 'That status is deployable. This asset can be checked out.',
+    'asset_not_deployable_checkin' => 'That asset status is not deployable. Using this status label will checkin the asset.',
+    'asset_deployable' => 'This asset can be checked out.',
     'processing_spinner' => 'Processing... (This might take a bit of time on large files)',
+    'processing' => 'Processing... ',
     'optional_infos'  => 'Optional Information',
-    'order_details'   => 'Order Related Information'
+    'order_details'   => 'Order Related Information',
+    'calc_eol'    => 'If nulling the EOL date, use automatic EOL calculation based on the purchase date and EOL rate.',
 ];
diff --git a/resources/lang/ur-PK/admin/hardware/general.php b/resources/lang/ur-PK/admin/hardware/general.php
index 34ac4e63ee..6740476574 100644
--- a/resources/lang/ur-PK/admin/hardware/general.php
+++ b/resources/lang/ur-PK/admin/hardware/general.php
@@ -5,8 +5,8 @@ return [
     'about_assets_text'            => 'Assets are items tracked by serial number or asset tag.  They tend to be higher value items where identifying a specific item matters.',
     'archived'  				=> 'Archived',
     'asset'  					=> 'Asset',
-    'bulk_checkout'             => 'Checkout Assets',
-    'bulk_checkin'              => 'Checkin Assets',
+    'bulk_checkout'             => 'Bulk Checkout',
+    'bulk_checkin'              => 'Bulk Checkin',
     'checkin'  					=> 'Checkin Asset',
     'checkout'  				=> 'Checkout Asset',
     'clone'  					=> 'Clone Asset',
@@ -27,8 +27,7 @@ return [
     'undeployable_tooltip'  	=> 'This asset has a status label that is undeployable and cannot be checked out at this time.',
     'view'  					=> 'View Asset',
     'csv_error' => 'You have an error in your CSV file:',
-    'import_text' => '<p>Upload a CSV that contains asset history. The assets and users MUST already exist in the system, or they will be skipped. Matching assets for history import happens against the asset tag. We will try to find a matching user based on the user\'s name you provide, and the criteria you select below. If you do not select any criteria below, it will simply try to match on the username format you configured in the <code>Admin &gt; General Settings</code>.</p><p>Fields included in the CSV must match the headers: <strong>Asset Tag, Name, Checkout Date, Checkin Date</strong>. Any additional fields will be ignored. </p><p>Checkin Date: blank or future checkin dates will checkout items to associated user.  Excluding the Checkin Date column will create a checkin date with todays date.</p>
-    ',
+    'import_text' => '<p>Upload a CSV that contains asset history. The assets and users MUST already exist in the system, or they will be skipped. Matching assets for history import happens against the asset tag. We will try to find a matching user based on the user\'s name you provide, and the criteria you select below. If you do not select any criteria below, it will simply try to match on the username format you configured in the <code>Admin &gt; General Settings</code>.</p><p>Fields included in the CSV must match the headers: <strong>Asset Tag, Name, Checkout Date, Checkin Date</strong>. Any additional fields will be ignored. </p><p>Checkin Date: blank or future checkin dates will checkout items to associated user.  Excluding the Checkin Date column will create a checkin date with todays date.</p>    ',
     'csv_import_match_f-l' => 'Try to match users by <strong>firstname.lastname</strong> (<code>jane.smith</code>) format',
     'csv_import_match_initial_last' => 'Try to match users by <strong>first initial last name</strong> (<code>jsmith</code>) format',
     'csv_import_match_first' => 'Try to match users by <strong>first name</strong> (<code>jane</code>) format',
diff --git a/resources/lang/ur-PK/admin/hardware/message.php b/resources/lang/ur-PK/admin/hardware/message.php
index 32698b1c07..c19bc63647 100644
--- a/resources/lang/ur-PK/admin/hardware/message.php
+++ b/resources/lang/ur-PK/admin/hardware/message.php
@@ -2,19 +2,23 @@
 
 return [
 
-    'undeployable' 		=> '<strong>Warning: </strong> This asset has been marked as currently undeployable.
-                        If this status has changed, please update the asset status.',
-    'does_not_exist' 	=> 'Asset does not exist.',
-    'does_not_exist_var'=> 'Asset with tag :asset_tag not found.',
-    'no_tag' 	        => 'No asset tag provided.',
+    'undeployable' 		 => '<strong>Warning: </strong> This asset has been marked as currently undeployable. If this status has changed, please update the asset status.',
+    'does_not_exist' 	 => 'Asset does not exist.',
+    'does_not_exist_var' => 'Asset with tag :asset_tag not found.',
+    'no_tag' 	         => 'No asset tag provided.',
     'does_not_exist_or_not_requestable' => 'That asset does not exist or is not requestable.',
-    'assoc_users'	 	=> 'This asset is currently checked out to a user and cannot be deleted. Please check the asset in first, and then try deleting again. ',
+    'assoc_users'	 	 => 'This asset is currently checked out to a user and cannot be deleted. Please check the asset in first, and then try deleting again. ',
     'warning_audit_date_mismatch' 	=> 'This asset\'s next audit date (:next_audit_date) is before the last audit date (:last_audit_date). Please update the next audit date.',
+    'labels_generated'   => 'Labels were successfully generated.',
+    'error_generating_labels' => 'Error while generating labels.',
+    'no_assets_selected' => 'No assets selected.',
 
     'create' => [
         'error'   		=> 'Asset was not created, please try again. :(',
         'success' 		=> 'Asset created successfully. :)',
         'success_linked' => 'Asset with tag :tag was created successfully. <strong><a href=":link" style="color: white;">Click here to view</a></strong>.',
+        'multi_success_linked' => 'Asset with tag :links was created successfully.|:count assets were created succesfully. :links.',
+        'partial_failure' => 'An asset was unable to be created. Reason: :failures|:count assets were unable to be created. Reasons: :failures',
     ],
 
     'update' => [
@@ -52,20 +56,24 @@ return [
     ],
 
     'import' => [
+        'import_button'         => 'Process Import',
         'error'                 => 'Some items did not import correctly.',
         'errorDetail'           => 'The following Items were not imported because of errors.',
         'success'               => 'Your file has been imported',
         'file_delete_success'   => 'Your file has been been successfully deleted',
         'file_delete_error'      => 'The file was unable to be deleted',
         'file_missing' => 'The file selected is missing',
+        'file_already_deleted' => 'The file selected was already deleted',
         'header_row_has_malformed_characters' => 'One or more attributes in the header row contain malformed UTF-8 characters',
         'content_row_has_malformed_characters' => 'One or more attributes in the first row of content contain malformed UTF-8 characters',
+        'transliterate_failure' => 'Transliteration from :encoding to UTF-8 failed due to invalid characters in input'
     ],
 
 
     'delete' => [
         'confirm'   	=> 'Are you sure you wish to delete this asset?',
         'error'   		=> 'There was an issue deleting the asset. Please try again.',
+        'assigned_to_error' => '{1}Asset Tag: :asset_tag is currently checked out. Check in this device before deletion.|[2,*]Asset Tags: :asset_tag are currently checked out. Check in these devices before deletion.',
         'nothing_updated'   => 'No assets were selected, so nothing was deleted.',
         'success' 		=> 'The asset was deleted successfully.',
     ],
@@ -78,6 +86,11 @@ return [
         'no_assets_selected' => 'You must select at least one asset from the list',
     ],
 
+    'multi-checkout' => [
+        'error'   => 'Asset was not checked out, please try again|Assets were not checked out, please try again',
+        'success' => 'Asset checked out successfully.|Assets checked out successfully.',
+    ],
+
     'checkin' => [
         'error'   		=> 'Asset was not checked in, please try again',
         'success' 		=> 'Asset checked in successfully.',
@@ -87,9 +100,10 @@ return [
     ],
 
     'requests' => [
-        'error'   		=> 'Asset was not requested, please try again',
-        'success' 		=> 'Asset requested successfully.',
-        'canceled'      => 'Checkout request successfully canceled',
+        'error'   		=> 'Request was not successful, please try again.',
+        'success' 		=> 'Request successfully submitted.',
+        'canceled'      => 'Request successfully canceled.',
+        'cancel'        => 'Cancel this item request',
     ],
 
 ];
diff --git a/resources/lang/ur-PK/admin/hardware/table.php b/resources/lang/ur-PK/admin/hardware/table.php
index 92b228dccd..2d88c6c131 100644
--- a/resources/lang/ur-PK/admin/hardware/table.php
+++ b/resources/lang/ur-PK/admin/hardware/table.php
@@ -25,7 +25,6 @@ return [
     'image'		    => 'Device Image',
     'days_without_acceptance' => 'Days Without Acceptance',
     'monthly_depreciation' => 'Monthly Depreciation',
-    'assigned_to'    => 'Assigned To',
     'requesting_user' => 'Requesting User',
     'requested_date' => 'Requested Date',
     'changed'       => 'Changed',
diff --git a/resources/lang/ur-PK/admin/kits/general.php b/resources/lang/ur-PK/admin/kits/general.php
index f57fb645c4..2b5c2d9cd0 100644
--- a/resources/lang/ur-PK/admin/kits/general.php
+++ b/resources/lang/ur-PK/admin/kits/general.php
@@ -47,4 +47,5 @@ return [
     'kit_deleted'                       => 'Kit was successfully deleted',
     'kit_model_updated'                 => 'Model was successfully updated',
     'kit_model_detached'                => 'Model was successfully detached',
+    'model_already_attached'            => 'Model already attached to kit',
 ];
diff --git a/resources/lang/ur-PK/admin/licenses/general.php b/resources/lang/ur-PK/admin/licenses/general.php
index 79b69a3d94..b39030afd4 100644
--- a/resources/lang/ur-PK/admin/licenses/general.php
+++ b/resources/lang/ur-PK/admin/licenses/general.php
@@ -14,6 +14,7 @@ return array(
     'info'  					=> 'License Info',
     'license_seats'  			=> 'License Seats',
     'seat'  					=> 'Seat',
+    'seat_count'  				=> 'Seat :count',
     'seats'  					=> 'Seats',
     'software_licenses'  		=> 'Software Licenses',
     'user'  					=> 'User',
@@ -23,12 +24,12 @@ return array(
         [
             'checkin_all'           => [
                 'button'            => 'Checkin All Seats',
-                'modal'             => 'This will action checkin one seat. | This action will checkin all :checkedout_seats_count seats for this license.',
+                'modal'             => 'This action will checkin one seat. | This action will checkin all :checkedout_seats_count seats for this license.',
                 'enabled_tooltip'   => 'Checkin ALL seats for this license from both users and assets',
                 'disabled_tooltip'  => 'This is disabled because there are no seats currently checked out',
                 'disabled_tooltip_reassignable'  => 'This is disabled because the License is not reassignable',
                 'success'           => 'License successfully checked in! | All licenses were successfully checked in!',
-                'log_msg'           => 'Checked in via bulk license checkout in license GUI',
+                'log_msg'           => 'Checked in via bulk license checkin in license GUI',
             ],
 
             'checkout_all'              => [
diff --git a/resources/lang/ur-PK/admin/licenses/message.php b/resources/lang/ur-PK/admin/licenses/message.php
index 27fbfe38a9..74e1d7af5a 100644
--- a/resources/lang/ur-PK/admin/licenses/message.php
+++ b/resources/lang/ur-PK/admin/licenses/message.php
@@ -44,10 +44,13 @@ return array(
         'error'   => 'There was an issue checking out the license. Please try again.',
         'success' => 'The license was checked out successfully',
         'not_enough_seats' => 'Not enough license seats available for checkout',
+        'mismatch' => 'The license seat provided does not match the license',
+        'unavailable' => 'This seat is not available for checkout.',
     ),
 
     'checkin' => array(
         'error'   => 'There was an issue checking in the license. Please try again.',
+        'not_reassignable' => 'License not reassignable',
         'success' => 'The license was checked in successfully'
     ),
 
diff --git a/resources/lang/ur-PK/admin/locations/message.php b/resources/lang/ur-PK/admin/locations/message.php
index 8121b80687..b21c70ad89 100644
--- a/resources/lang/ur-PK/admin/locations/message.php
+++ b/resources/lang/ur-PK/admin/locations/message.php
@@ -3,11 +3,12 @@
 return array(
 
     'does_not_exist' => 'Location does not exist.',
-    'assoc_users'    => 'This location is not currently deletable because it is the location of record for at least one asset or user, has assets assigned to it, or is the parent location of another location. Please update your models to no longer reference this company and try again. ',
+    'assoc_users'    => 'This location is not currently deletable because it is the location of record for at least one asset or user, has assets assigned to it, or is the parent location of another location. Please update your records to no longer reference this location and try again ',
     'assoc_assets'	 => 'This location is currently associated with at least one asset and cannot be deleted. Please update your assets to no longer reference this location and try again. ',
     'assoc_child_loc'	 => 'This location is currently the parent of at least one child location and cannot be deleted. Please update your locations to no longer reference this location and try again. ',
     'assigned_assets' => 'Assigned Assets',
     'current_location' => 'Current Location',
+    'open_map' => 'Open in :map_provider_icon Maps',
 
 
     'create' => array(
@@ -20,6 +21,11 @@ return array(
         'success' => 'Location updated successfully.'
     ),
 
+    'restore' => array(
+        'error'   => 'Location was not restored, please try again',
+        'success' => 'Location restored successfully.'
+    ),
+
     'delete' => array(
         'confirm'   	=> 'Are you sure you wish to delete this location?',
         'error'   => 'There was an issue deleting the location. Please try again.',
diff --git a/resources/lang/ur-PK/admin/locations/table.php b/resources/lang/ur-PK/admin/locations/table.php
index ed3f96f6b4..53176d8a4e 100644
--- a/resources/lang/ur-PK/admin/locations/table.php
+++ b/resources/lang/ur-PK/admin/locations/table.php
@@ -39,4 +39,5 @@ return [
     'signed_by_finance_auditor' => 'Signed By (Finance Auditor):',
     'signed_by_location_manager' => 'Signed By (Location Manager):',
     'signed_by'                 => 'Signed Off By:',
+    'clone'  					=> 'Clone Location',
 ];
diff --git a/resources/lang/ur-PK/admin/models/general.php b/resources/lang/ur-PK/admin/models/general.php
index 7e4a77adbc..9a61b53fd0 100644
--- a/resources/lang/ur-PK/admin/models/general.php
+++ b/resources/lang/ur-PK/admin/models/general.php
@@ -3,7 +3,7 @@
 return array(
     'about_models_title'     => 'About Asset Models',
     'about_models_text'           => 'Asset Models are a way to group identical assets. "MBP 2013", "IPhone 6s", etc.',
-    'deleted'  					        => 'This model has been deleted.',
+    'deleted'  					=> 'This model has been deleted.',
     'bulk_delete'               => 'Bulk Delete Asset Models',
     'bulk_delete_help'               => 'Use the checkboxes below to confirm the deletion of the selected asset models. Asset models that have assets associated with them cannot be deleted until the assets are associated with a different model.',
     'bulk_delete_warn'          => 'You are about to delete one asset model.|You are about to delete :model_count asset models.',
diff --git a/resources/lang/ur-PK/admin/models/message.php b/resources/lang/ur-PK/admin/models/message.php
index cc38c54530..ae3bc34eed 100644
--- a/resources/lang/ur-PK/admin/models/message.php
+++ b/resources/lang/ur-PK/admin/models/message.php
@@ -7,7 +7,7 @@ return array(
     'no_association' => 'WARNING! The asset model for this item is invalid or missing!',
     'no_association_fix' => 'This will break things in weird and horrible ways. Edit this asset now to assign it a model.',
     'assoc_users'	 => 'This model is currently associated with one or more assets and cannot be deleted. Please delete the assets, and then try deleting again. ',
-
+    'invalid_category_type' => 'This category must be an asset category.',
 
     'create' => array(
         'error'   => 'Model was not created, please try again.',
diff --git a/resources/lang/ur-PK/admin/reports/general.php b/resources/lang/ur-PK/admin/reports/general.php
index 9b682f8ecd..ed8bf1a156 100644
--- a/resources/lang/ur-PK/admin/reports/general.php
+++ b/resources/lang/ur-PK/admin/reports/general.php
@@ -4,6 +4,7 @@ return [
     'info'   => 'Select the options you want for your asset report.',
     'deleted_user' => 'Deleted user',
     'send_reminder' => 'Send reminder',
+    'cannot_send_reminder' => 'User has been deleted or does not have an email address so cannot receive a reminder',
     'reminder_sent' => 'Reminder sent',
     'acceptance_deleted' => 'Acceptance request deleted',
     'acceptance_request' => 'Acceptance request',
@@ -13,5 +14,10 @@ return [
         'user_state' => 'User State',
         'user_country' => 'User Country',
         'user_zip' => 'User Zip'
-    ]
-];
\ No newline at end of file
+    ],
+    'open_saved_template' => 'Open Saved Template',
+    'save_template' =>  'Save Template',
+    'select_a_template' => 'Select a Template',
+    'template_name' => 'Template Name',
+    'update_template' => 'Update Template',
+];
diff --git a/resources/lang/ur-PK/admin/reports/message.php b/resources/lang/ur-PK/admin/reports/message.php
index d4c8f8198f..2800bbdf0b 100644
--- a/resources/lang/ur-PK/admin/reports/message.php
+++ b/resources/lang/ur-PK/admin/reports/message.php
@@ -1,5 +1,16 @@
 <?php
 
-return array(
-    'error'   => 'You must select at least ONE option.'
-);
+return [
+    'about_templates' => 'About Saved Templates',
+    'saving_templates_description' => 'Select your options, then enter the name of your template in the box above and click the \'Save Template\' button. Use the dropdown to select a previously saved template.',
+    'create'  => [
+        'success' => 'Template saved successfully',
+    ],
+    'update' => [
+        'success' => 'Template updated successfully',
+    ],
+    'delete' => [
+        'success' => 'Template deleted',
+        'no_delete_permission' => 'Template does not exist or you do not have permission to delete it.',
+    ],
+];
diff --git a/resources/lang/ur-PK/admin/settings/general.php b/resources/lang/ur-PK/admin/settings/general.php
index 8074f5082e..37cfb0de94 100644
--- a/resources/lang/ur-PK/admin/settings/general.php
+++ b/resources/lang/ur-PK/admin/settings/general.php
@@ -8,13 +8,13 @@ return [
     'ad_append_domain'          => 'Append domain name to username field',
     'ad_append_domain_help'     => 'User isn\'t required to write "username@domain.local", they can just type "username".',
     'admin_cc_email'            => 'CC Email',
-    'admin_cc_email_help'       => 'If you would like to send a copy of checkin/checkout emails that are sent to users to an additional email account, enter it here. Otherwise leave this field blank.',
+    'admin_cc_email_help'       => 'Send a copy of checkin/checkout emails to this address.',
     'admin_settings'            => 'Admin Settings',
     'is_ad'				        => 'This is an Active Directory server',
     'alerts'                	=> 'Alerts',
     'alert_title'               => 'Update Notification Settings',
     'alert_email'				=> 'Send alerts to',
-    'alert_email_help'    => 'Email addresses or distribution lists you want alerts to be sent to, comma separated',
+    'alert_email_help'          => 'Email addresses or distribution lists you want alerts to be sent to, comma separated.',
     'alerts_enabled'			=> 'Email Alerts Enabled',
     'alert_interval'			=> 'Expiring Alerts Threshold (in days)',
     'alert_inv_threshold'		=> 'Inventory Alert Threshold',
@@ -31,15 +31,18 @@ return [
     'backups'					=> 'Backups',
     'backups_help'              => 'Create, download, and restore backups ',
     'backups_restoring'         => 'Restoring from Backup',
+    'backups_clean' => 'Clean the backed-up database before restore',
+    'backups_clean_helptext' => "This can be useful if you're changing between database versions",
     'backups_upload'            => 'Upload Backup',
     'backups_path'              => 'Backups on the server are stored in <code>:path</code>',
-    'backups_restore_warning'   => 'Use the restore button <small><span class="btn btn-xs btn-warning"><i class="text-white fas fa-retweet" aria-hidden="true"></i></span></small> to restore from a previous backup. (This does not currently work with S3 file storage or Docker.)<br><br>Your <strong>entire :app_name database and any uploaded files will be completely replaced</strong> by what\'s in the backup file.  ',
+    'backups_restore_warning'   => 'Use the restore button <small><span class="btn btn-xs btn-warning"><i class="text-white fas fa-retweet" aria-hidden="true"></i></span></small> to restore from a previous backup. (This does not currently work with S3 file storage or Docker.)<br><br>Your <strong>entire :app_name database and any uploaded files will be completely replaced</strong> by what\'s in the backup file  ',
     'backups_logged_out'         => 'All existing users, including you, will be logged out once your restore is complete.',
     'backups_large'             => 'Very large backups may time out on the restore attempt and may still need to be run via command line. ',
     'barcode_settings'			=> 'Barcode Settings',
     'confirm_purge'			    => 'Confirm Purge',
     'confirm_purge_help'		=> 'Enter the text "DELETE" in the box below to purge your deleted records. This action cannot be undone and will PERMANENTLY delete all soft-deleted items and users. (You should make a backup first, just to be safe.)',
     'custom_css'				=> 'Custom CSS',
+    'custom_css_placeholder'	=> 'Add your custom CSS',
     'custom_css_help'			=> 'Enter any custom CSS overrides you would like to use. Do not include the &lt;style&gt;&lt;/style&gt; tags.',
     'custom_forgot_pass_url'	=> 'Custom Password Reset URL',
     'custom_forgot_pass_url_help'	=> 'This replaces the built-in forgotten password URL on the login screen, useful to direct people to internal or hosted LDAP password reset functionality. It will effectively disable local user forgotten password functionality.',
@@ -47,34 +50,34 @@ return [
     'dashboard_message_help'	=> 'This text will appear on the dashboard for anyone with permission to view the dashboard.',
     'default_currency'  		=> 'Default Currency',
     'default_eula_text'			=> 'Default EULA',
+    'default_eula_text_placeholder' => 'Add your default EULA text',
     'default_language'			=> 'Default Language',
     'default_eula_help_text'	=> 'You can also associate custom EULAs to specific asset categories.',
     'acceptance_note'           => 'Add a note for your decision (Optional)',
     'display_asset_name'        => 'Display Asset Name',
     'display_checkout_date'     => 'Display Checkout Date',
     'display_eol'               => 'Display EOL in table view',
-    'display_qr'                => 'Display Square Codes',
+    'display_qr'                => 'Display 2D barcode',
     'display_alt_barcode'		=> 'Display 1D barcode',
-    'email_logo'                => 'Email Logo',
     'barcode_type'				=> '2D Barcode Type',
     'alt_barcode_type'			=> '1D barcode type',
-    'email_logo_size'       => 'Square logos in email look best. ',
     'enabled'                   => 'Enabled',
     'eula_settings'				=> 'EULA Settings',
     'eula_markdown'				=> 'This EULA allows <a href="https://help.github.com/articles/github-flavored-markdown/">Github flavored markdown</a>.',
+    'empty_row_count'           => 'Field Start Offset (Empty Rows)',
+    'empty_row_count_help'      => 'Fields will begin populating after this many empty rows are skipped at the top of the label.',
     'favicon'                   => 'Favicon',
     'favicon_format'            => 'Accepted filetypes are ico, png, and gif. Other image formats may not work in all browsers.',
     'favicon_size'          => 'Favicons should be square images, 16x16 pixels.',
     'footer_text'               => 'Additional Footer Text ',
     'footer_text_help'          => 'This text will appear in the right-side footer. Links are allowed using <a href="https://help.github.com/articles/github-flavored-markdown/">Github flavored markdown</a>. Line breaks, headers, images, etc may result in unpredictable results.',
+    'footer_text_placeholder'   => 'Optional footer text',
     'general_settings'			=> 'General Settings',
-    'general_settings_keywords' => 'company support, signature, acceptance, email format, username format, images, per page, thumbnail, eula, gravatar, tos, dashboard, privacy',
     'general_settings_help'     => 'Default EULA and more',
     'generate_backup'			=> 'Generate Backup',
     'google_workspaces'         => 'Google Workspaces',
     'header_color'              => 'Header Color',
     'info'                      => 'These settings let you customize certain aspects of your installation.',
-    'label_logo'                => 'Label Logo',
     'label_logo_size'           => 'Square logos look best - will be displayed in the top right of each asset label. ',
     'laravel'                   => 'Laravel Version',
     'ldap'                      => 'LDAP',
@@ -94,7 +97,7 @@ return [
     'ldap_login_sync_help'      => 'This only tests that LDAP can sync correctly. If your LDAP Authentication query is not correct, users may still not be able to login. YOU MUST SAVE YOUR UPDATED LDAP SETTINGS FIRST.',
     'ldap_manager'              => 'LDAP Manager',
     'ldap_server'               => 'LDAP Server',
-    'ldap_server_help'          => 'This should start with ldap:// (for unencrypted or TLS) or ldaps:// (for SSL)',
+    'ldap_server_help'          => 'This should start with ldap:// (for unencrypted) or ldaps:// (for TLS or SSL)',
     'ldap_server_cert'			=> 'LDAP SSL certificate validation',
     'ldap_server_cert_ignore'	=> 'Allow invalid SSL Certificate',
     'ldap_server_cert_help'		=> 'Select this checkbox if you are using a self signed SSL cert and would like to accept an invalid SSL certificate.',
@@ -108,8 +111,8 @@ return [
     'ldap_pword'                => 'LDAP Bind Password',
     'ldap_basedn'               => 'Base Bind DN',
     'ldap_filter'               => 'LDAP Filter',
-    'ldap_pw_sync'              => 'LDAP Password Sync',
-    'ldap_pw_sync_help'         => 'Uncheck this box if you do not wish to keep LDAP passwords synced with local passwords. Disabling this means that your users may not be able to login if your LDAP server is unreachable for some reason.',
+    'ldap_pw_sync'              => 'Cache LDAP Passwords',
+    'ldap_pw_sync_help'         => 'Uncheck this box if you do not wish to keep LDAP passwords cached as local hashed passwords. Disabling this means that your users may not be able to login if your LDAP server is unreachable for some reason.',
     'ldap_username_field'       => 'Username Field',
     'ldap_lname_field'          => 'Last Name',
     'ldap_fname_field'          => 'LDAP First Name',
@@ -117,13 +120,15 @@ return [
     'ldap_version'              => 'LDAP Version',
     'ldap_active_flag'          => 'LDAP Active Flag',
     'ldap_activated_flag_help'  => 'This value is used to determine whether a synced user can login to Snipe-IT. <strong>It does not affect the ability to check items in or out to them</strong>, and should be the <strong>attribute name</strong> within your AD/LDAP, <strong>not the value</strong>. <br><br>If this field is set to a field name that does not exist in your AD/LDAP, or the value in the AD/LDAP field is set to <code>0</code> or <code>false</code>, <strong>user login will be disabled</strong>. If the value in the AD/LDAP field is set to <code>1</code> or <code>true</code> or <em>any other text</em> means the user can log in. When the field is blank in your AD, we respect the <code>userAccountControl</code> attribute, which usually allows non-suspended users to log in.',
+    'ldap_invert_active_flag'   => 'LDAP Invert Active Flag',
+    'ldap_invert_active_flag_help'     => 'If enabled: when the value returned by LDAP Active Flag is <code>0</code> or <code>false</code> the user account will be active.',
     'ldap_emp_num'              => 'LDAP Employee Number',
     'ldap_email'                => 'LDAP Email',
     'ldap_test'                 => 'Test LDAP',
     'ldap_test_sync'            => 'Test LDAP Synchronization',
     'license'                   => 'Software License',
-    'load_remote'               => 'Use Gravatar',
-    'load_remote_help_text'		=> 'Uncheck this box if your install cannot load scripts from the outside internet. This will prevent Snipe-IT from trying load images from Gravatar.',
+    'load_remote'               => 'Load Remote Avatars',
+    'load_remote_help_text'		=> 'Uncheck this box if your install cannot load scripts from the outside internet. This will prevent Snipe-IT from trying load avatars from Gravatar or other outside sources.',
     'login'                     => 'Login Attempts',
     'login_attempt'             => 'Login Attempt',
     'login_ip'                  => 'IP Address',
@@ -131,6 +136,7 @@ return [
     'login_user_agent'          => 'User Agent',
     'login_help'                => 'List of attempted logins',
     'login_note'                => 'Login Note',
+    'login_note_placeholder'            => "If you do not have a login or have found a device belonging to this company, please call technical support at 888-555-1212. Thank you.",
     'login_note_help'           => 'Optionally include a few sentences on your login screen, for example to assist people who have found a lost or stolen device. This field accepts <a href="https://help.github.com/articles/github-flavored-markdown/">Github flavored markdown</a>',
     'login_remote_user_text'    => 'Remote User login options',
     'login_remote_user_enabled_text' => 'Enable Login with Remote User Header',
@@ -146,13 +152,16 @@ return [
     'logo_print_assets_help'    => 'Use branding on printable asset lists ',
     'full_multiple_companies_support_help_text' => 'Restricting users (including admins) assigned to companies to their company\'s assets.',
     'full_multiple_companies_support_text' => 'Full Multiple Companies Support',
+    'scope_locations_fmcs_support_text'  => 'Scope Locations with Full Multiple Companies Support',
+    'scope_locations_fmcs_support_help_text'  => 'Restrict locations to their selected company.',
+    'scope_locations_fmcs_check_button' => 'Check Compatibility',
+    'scope_locations_fmcs_support_disabled_text'  => 'This option is disabled because you have conflicting locations set for :count or more items.',
     'show_in_model_list'   => 'Show in Model Dropdowns',
     'optional'					=> 'optional',
     'per_page'                  => 'Results Per Page',
     'php'                       => 'PHP Version',
-    'php_info'                  => 'PHP Info',
+    'php_info'                  => 'PHP info',
     'php_overview'              => 'PHP',
-    'php_overview_keywords'     => 'phpinfo, system, info',
     'php_overview_help'         => 'PHP System info',
     'php_gd_info'               => 'You must install php-gd to display QR codes, see install instructions.',
     'php_gd_warning'            => 'PHP Image Processing and GD plugin is NOT installed.',
@@ -218,6 +227,8 @@ return [
     'webhook_integration_help'    => ':app integration is optional, however the endpoint and channel are required if you wish to use it. To configure :app integration, you must first <a href=":webhook_link" target="_new" rel="noopener">create an incoming webhook</a> on your :app account. Click on the <strong>Test :app Integration</strong> button to confirm your settings are correct before saving. ',
     'webhook_integration_help_button'    => 'Once you have saved your :app information, a test button will appear.',
     'webhook_test_help'           => 'Test whether your :app integration is configured correctly. YOU MUST SAVE YOUR UPDATED :app SETTINGS FIRST.',
+    'shortcuts_enabled'         => 'Enable Shortcuts',
+    'shortcuts_help_text'       => '<strong>Windows</strong>: Alt + Access key, <strong>Mac</strong>: Control + Option + Access key',
     'snipe_version'  			=> 'Snipe-IT version',
     'support_footer'            => 'Support Footer Links ',
     'support_footer_help'       => 'Specify who sees the links to the Snipe-IT Support info and Users Manual',
@@ -227,7 +238,6 @@ return [
     'update'                    => 'Update Settings',
     'value'                     => 'Value',
     'brand'                     => 'Branding',
-    'brand_keywords'            => 'footer, logo, print, theme, skin, header, colors, color, css',
     'brand_help'                => 'Logo, Site Name',
     'web_brand'                 => 'Web Branding Type',
     'about_settings_title'      => 'About Settings',
@@ -276,6 +286,8 @@ return [
     'two_factor_enrollment_text'	=> "Two factor authentication is required, however your device has not been enrolled yet. Open your Google Authenticator app and scan the QR code below to enroll your device. Once you've enrolled your device, enter the code below",
     'require_accept_signature'      => 'Require Signature',
     'require_accept_signature_help_text'      => 'Enabling this feature will require users to physically sign off on accepting an asset.',
+    'require_checkinout_notes'  => 'Require Notes on Checkin/Checkout',
+    'require_checkinout_notes_help_text'    => 'Enabling this feature will require the note fields to be populated when checking in or checking out an asset.',
     'left'        => 'left',
     'right'        => 'right',
     'top'        => 'top',
@@ -313,24 +325,24 @@ return [
     'filter_by_keyword' => 'Filter by setting keyword',
     'security' => 'Security',
     'security_title' => 'Update Security Settings',
-    'security_keywords' => 'password, passwords, requirements, two factor, two-factor, common passwords, remote login, logout, authentication',
     'security_help' => 'Two-factor, Password Restrictions',
-    'groups_keywords' => 'permissions, permission groups, authorization',
     'groups_help' => 'Account permission groups',
     'localization' => 'Localization',
     'localization_title' => 'Update Localization Settings',
-    'localization_keywords' => 'localization, currency, local, locale, time zone, timezone, international, internatinalization, language, languages, translation',
     'localization_help' => 'Language, date display',
     'notifications' => 'Notifications',
     'notifications_help' => 'Email Alerts & Audit Settings',
     'asset_tags_help' => 'Incrementing and prefixes',
     'labels' => 'Labels',
     'labels_title' => 'Update Label Settings',
-    'labels_help' => 'Label sizes &amp; settings',
-    'purge_keywords' => 'permanently delete',
+    'labels_help' => 'Barcodes &amp; label settings',
     'purge_help' => 'Purge Deleted Records',
     'ldap_extension_warning' => 'It does not look like the LDAP extension is installed or enabled on this server. You can still save your settings, but you will need to enable the LDAP extension for PHP before LDAP syncing or login will work.',
     'ldap_ad' => 'LDAP/AD',
+    'ldap_test_label' => 'Test LDAP Sync',
+    'ldap_test_login' => ' Test LDAP Login',
+    'ldap_username_placeholder' => 'LDAP Username',
+    'ldap_password_placeholder' => 'LDAP Password',
     'employee_number' => 'Employee Number',
     'create_admin_user' => 'Create a User ::',
     'create_admin_success' => 'Success! Your admin user has been added!',
@@ -342,6 +354,8 @@ return [
     'setup_migration_create_user' => 'Next: Create User',
     'ldap_settings_link' => 'LDAP Settings Page',
     'slack_test' => 'Test <i class="fab fa-slack"></i> Integration',
+    'status_label_name' => 'Status Label Name',
+    'super_admin_only'  => 'Super Admin Only',
     'label2_enable'           => 'New Label Engine',
     'label2_enable_help'      => 'Switch to the new label engine. <b>Note: You will need to save this setting before setting others.</b>',
     'label2_template'         => 'Template',
@@ -356,12 +370,15 @@ return [
     'label2_2d_type'          => '2D Barcode Type',
     'label2_2d_type_help'     => 'Format for 2D barcodes',
     'label2_2d_target'        => '2D Barcode Target',
-    'label2_2d_target_help'   => 'The URL the 2D barcode points to when scanned',
+    'label2_2d_target_help'   => 'The data that will be contained in the 2D barcode',
     'label2_fields'           => 'Field Definitions',
     'label2_fields_help'      => 'Fields can be added, removed, and reordered in the left column. For each field, multiple options for Label and DataSource can be added, removed, and reordered in the right column.',
+    'purge_barcodes' => 'Purge Barcodes',
     'help_asterisk_bold'    => 'Text entered as <code>**text**</code> will be displayed as bold',
     'help_blank_to_use'     => 'Leave blank to use the value from <code>:setting_name</code>',
     'help_default_will_use' => '<code>:default</code> will use the value from <code>:setting_name</code>. <br>Note that the value of the barcodes must comply with the respective barcode spec in order to be successfully generated. Please see <a href="https://snipe-it.readme.io/docs/barcodes">the documentation <i class="fa fa-external-link"></i></a> for more details. ',
+    'asset_id'              => 'Asset ID',
+    'data'               => 'Data',
     'default'               => 'Default',
     'none'                  => 'None',
     'google_callback_help' => 'This should be entered as the callback URL in your Google OAuth app settings in your organization&apos;s <strong><a href="https://console.cloud.google.com/" target="_blank">Google developer console <i class="fa fa-external-link" aria-hidden="true"></i></a></strong>.',
@@ -373,7 +390,100 @@ return [
     'database_driver' => 'Database Driver',
     'bs_table_storage' => 'Table Storage',
     'timezone' => 'Timezone',
+    'test_mail' => 'Test Mail',
     'profile_edit'          => 'Edit Profile',
     'profile_edit_help'          => 'Allow users to edit their own profiles.',
+    'default_avatar' => 'Custom Default Avatar',
+    'default_avatar_help' => 'This image will be displayed as a profile if a user does not have a profile photo.',
+    'restore_default_avatar' => 'Restore <a href=":default_avatar" data-toggle="lightbox" data-type="image">original system default avatar</a>',
+    'restore_default_avatar_help' => '',
+    'due_checkin_days' => 'Due For Checkin Warning',
+    'due_checkin_days_help' => 'How many days before the expected checkin of an asset should it be listed in the "Due for checkin" page?',
+    'no_groups' => 'No groups have been created yet. Visit <code>Admin Settings > Permission Groups</code> to add one.',
+    'text' => 'Text',
+
+    'username_formats' => [
+        'username_format'		=> 'Username Format',
+        'firstname_lastname_format'	=> 'First Name Last Name (jane.smith)',
+        'first_name_format'	        => 'First Name (jane)',
+        'last_name_format'		=> 'Last Name (doe)',
+        'filastname_format'			=> 'First Initial Last Name (jsmith)',
+        'lastnamefirstinitial_format' =>  'Last Name First Initial (smithj)',
+        'firstname_lastname_underscore_format' => 'First Name Last Name (jane_smith)',
+        'firstinitial.lastname' => 'First Initial Last Name (j.smith)',
+        'lastname_firstinitial' => 'Last Name First Initial (smith_j)',
+        'lastname_dot_firstinitial_format' => 'Last Name First Initial (smith.j)',
+        'firstnamelastname'     => 'First Name Last Name (janesmith)',
+        'firstnamelastinitial'  => 'First Name Last Initial (janes)',
+        'lastnamefirstname'      => 'Last Name.First Name (smith.jane)',
+    ],
+
+    'email_formats' => [
+        'email_format'			=> 'Email Format',
+        'firstname_lastname_format'	=> 'First Name Last Name (jane.smith@example.com)',
+        'first_name_format'		=> 'First Name (jane@example.com)',
+        'last_name_format'		=> 'Last Name (doe@example.com)',
+        'filastname_format'			=> 'First Initial Last Name (jsmith@example.com)',
+        'lastnamefirstinitial_format' =>  'Last Name First Initial (smithj@example.com)',
+        'firstname_lastname_underscore_format' => 'First Name Last Name (jane_smith@example.com)',
+        'firstinitial.lastname' => 'First Initial Last Name (j.smith@example.com)',
+        'lastname_firstinitial' => 'Last Name First Initial (smith_j@example.com)',
+        'lastname_dot_firstinitial_format' => 'Last Name First Initial (smith.j@example.com)',
+        'firstnamelastname'     => 'First Name Last Name (janesmith@example.com)',
+        'firstnamelastinitial'  => 'First Name Last Initial (janes@example.com)',
+        'lastnamefirstname'      => 'Last Name.First Name (smith.jane@example.com)',
+    ],
+
+
+
+    'logo_labels' => [
+        'acceptance_pdf_logo'       => 'PDF Logo',
+        'email_logo'                => 'Email Logo',
+        'label_logo'                => 'Label Logo',
+        'logo'                      => 'Site Logo',
+        'favicon'                   => 'Favicon',
+    ],
+
+    'logo_help' => [
+        'email_logo_size'       => 'Square logos in email look best. ',
+    ],
+
+    'logo_option_types' => [
+        'text' => 'Text',
+        'logo' => 'Logo',
+        'logo_and_text' => 'Logo and Text',
+    ],
+
+
+    'legends' => [
+        'scoping' => 'Scoping',
+        'formats' => 'Default Formats',
+        'profiles' => 'User Profiles',
+        'eula' => 'EULA & Acceptance Preferences',
+        'misc_display' => 'Miscellaneous Display Options',
+        'email' => 'Email Preferences',
+        'checkin' => 'Checkin Preferences',
+        'dashboard' => 'Login & Dashboard Preferences',
+        'misc' => 'Miscellaneous',
+        'logos' => 'Logos & Display',
+        'colors' => 'Colors & Skins',
+        'footer' => 'Footer Preferences',
+        'security' => 'Security Preferences',
+        'general' => 'General',
+        'intervals' => 'Intervals & Thresholds',
+    ],
+
+
+    /* Keywords for settings overview help */
+    'keywords' => [
+        'brand'             => 'footer, logo, print, theme, skin, header, colors, color, css',
+        'general_settings'  => 'company support, signature, acceptance, email format, username format, images, per page, thumbnail, eula, gravatar, tos, dashboard, privacy',
+        'groups'            => 'permissions, permission groups, authorization',
+        'labels'            => 'labels, barcodes, barcode, sheets, print, upc, qr, 1d, 2d',
+        'localization'      => 'localization, currency, local, locale, time zone, timezone, international, internatinalization, language, languages, translation',
+        'php_overview'      => 'phpinfo, system, info',
+        'purge'             => 'permanently delete',
+        'security'          => 'password, passwords, requirements, two factor, two-factor, common passwords, remote login, logout, authentication',
+    ],
 
 ];
diff --git a/resources/lang/ur-PK/admin/settings/message.php b/resources/lang/ur-PK/admin/settings/message.php
index c9b0f34217..58abf14c5c 100644
--- a/resources/lang/ur-PK/admin/settings/message.php
+++ b/resources/lang/ur-PK/admin/settings/message.php
@@ -14,6 +14,9 @@ return [
         'restore_warning'       => 'Yes, restore it. I acknowledge that this will overwrite any existing data currently in the database. This will also log out all of your existing users (including you).',
         'restore_confirm'       => 'Are you sure you wish to restore your database from :filename?'
     ],
+    'restore' => [
+        'success'               => 'Your system backup has been restored. Please log in again.'
+    ],
     'purge' => [
         'error'     => 'An error has occurred while purging. ',
         'validation_failed'     => 'Your purge confirmation is incorrect. Please type the word "DELETE" in the confirmation box.',
@@ -33,6 +36,9 @@ return [
         'testing_authentication' => 'Testing LDAP Authentication...',
         'authentication_success' => 'User authenticated against LDAP successfully!'
     ],
+    'labels' => [
+        'null_template' => 'Label template not found. Please select a template.',
+        ],
     'webhook' => [
         'sending' => 'Sending :app test message...',
         'success' => 'Your :webhook_name Integration works!',
@@ -42,5 +48,12 @@ return [
         'error' => 'Something went wrong. :app responded with: :error_message',
         'error_redirect' => 'ERROR: 301/302 :endpoint returns a redirect. For security reasons, we don’t follow redirects. Please use the actual endpoint.',
         'error_misc' => 'Something went wrong. :( ',
-    ]
+        'webhook_fail' => ' webhook notification failed: Check to make sure the URL is still valid.',
+        'webhook_channel_not_found' => ' webhook channel not found.',
+        'ms_teams_deprecation' => 'The selected Microsoft Teams webhook URL will be deprecated Dec 31st, 2025. Please use a workflow URL. Microsoft\'s documentation on creating a workflow can be found <a href="https://support.microsoft.com/en-us/office/create-incoming-webhooks-with-workflows-for-microsoft-teams-8ae491c7-0394-4861-ba59-055e33f75498" target="_blank"> here.</a>',
+    ],
+    'location_scoping' => [
+        'not_saved' => 'Your settings were not saved.',
+        'mismatch' => 'There is 1 item in the database that need your attention before you can enable location scoping.|There are :count items in the database that need your attention before you can enable location scoping.',
+    ],
 ];
diff --git a/resources/lang/ur-PK/admin/statuslabels/table.php b/resources/lang/ur-PK/admin/statuslabels/table.php
index 27befb5ef7..1a0fab891e 100644
--- a/resources/lang/ur-PK/admin/statuslabels/table.php
+++ b/resources/lang/ur-PK/admin/statuslabels/table.php
@@ -1,14 +1,14 @@
 <?php
 
 return array(
-    'about'      	=> 'About Status Labels',
+    'about'      	=> 'About Status Types',
     'archived'      	=> 'Archived',
     'create'      	=> 'Create Status Label',
     'color'      	=> 'Chart Color',
     'default_label' => 'Default Label',
     'default_label_help' => 'This is used to ensure your most commonly used status labels appear at the top of the select box when creating/editing assets.',
     'deployable'      	=> 'Deployable',
-    'info'      	=> 'Status labels are used to describe the various states your assets could be in. They may be out for repair, lost/stolen, etc. You can create new status labels for deployable, pending and archived assets.',
+    'info'      	=> 'Status label types are used to describe the various states your assets could be in. They may be out for repair, lost/stolen, etc. You can create new status labels for your deployable, pending and archived assets according to your own workflow. For more information, <a href="https://snipe-it.readme.io/docs/overview#status-labels" target="_blank">see the documentation <i class="fa fa-external-link"></i></a>.',
     'name'      	=> 'Status Name',
     'pending'      	=> 'Pending',
     'status_type'   => 'Status Type',
diff --git a/resources/lang/ur-PK/admin/users/general.php b/resources/lang/ur-PK/admin/users/general.php
index b097ccec69..14f36cf151 100644
--- a/resources/lang/ur-PK/admin/users/general.php
+++ b/resources/lang/ur-PK/admin/users/general.php
@@ -19,6 +19,8 @@ return [
     'print_assigned'    => 'Print All Assigned',
     'email_assigned'    => 'Email List of All Assigned',
     'user_notified'     => 'User has been emailed a list of their currently assigned items.',
+    'users_notified'    => 'The user has been emailed a list of their currently assigned items.|:count users have been emailed a list of their currently assigned items.',
+    'users_notified_warning' => ':count user has been emailed a list of their currently assigned items, however :no_email users did not have an email address so could not be emailed.|:count users have been emailed a list of their currently assigned items, however :no_email user(s) did not have an email address so could not be emailed.',
     'auto_assign_label' => 'Include this user when auto-assigning eligible licenses',
     'auto_assign_help'  => 'Skip this user in auto assignment of licenses',
     'software_user'     => 'Software Checked out to :name',
diff --git a/resources/lang/ur-PK/admin/users/message.php b/resources/lang/ur-PK/admin/users/message.php
index 4d014775bd..b6ddad3aac 100644
--- a/resources/lang/ur-PK/admin/users/message.php
+++ b/resources/lang/ur-PK/admin/users/message.php
@@ -6,7 +6,7 @@ return array(
     'declined'                  => 'You have successfully declined this asset.',
     'bulk_manager_warn'	        => 'Your users have been successfully updated, however your manager entry was not saved because the manager you selected was also in the user list to be edited, and users may not be their own manager. Please select your users again, excluding the manager.',
     'user_exists'               => 'User already exists!',
-    'user_not_found'            => 'User does not exist.',
+    'user_not_found'            => 'User does not exist or you do not have permission view them.',
     'user_login_required'       => 'The login field is required',
     'user_has_no_assets_assigned' => 'No assets currently assigned to user.',
     'user_password_required'    => 'The password is required.',
@@ -53,6 +53,7 @@ return array(
         'ldap_could_not_search' => 'Could not search the LDAP server. Please check your LDAP server configuration in the LDAP config file. <br>Error from LDAP Server:',
         'ldap_could_not_get_entries' => 'Could not get entries from the LDAP server. Please check your LDAP server configuration in the LDAP config file. <br>Error from LDAP Server:',
         'password_ldap' => 'The password for this account is managed by LDAP/Active Directory. Please contact your IT department to change your password. ',
+        'multi_company_items_assigned' => 'This user has items assigned that belong to a different company. Please check them in or edit their company.'
     ),
 
     'deletefile' => array(
diff --git a/resources/lang/ur-PK/admin/users/table.php b/resources/lang/ur-PK/admin/users/table.php
index 7c5fb2cad5..094cdbc412 100644
--- a/resources/lang/ur-PK/admin/users/table.php
+++ b/resources/lang/ur-PK/admin/users/table.php
@@ -22,7 +22,7 @@ return array(
     'managed_locations'     => 'Managed Locations',
     'managed_users'         => 'Managed Users',
     'name' 					=> 'Name',
-    'nogroup'               => 'No groups have been created yet. To add one, visit: ',
+    'nogroup'               => 'No groups have been created yet. To add one, visit:',
     'notes'                 => 'Notes',
     'password_confirm' 		=> 'Confirm Password',
     'password' 				=> 'Password',
diff --git a/resources/lang/ur-PK/auth.php b/resources/lang/ur-PK/auth.php
index db310aa1bb..14d8acfce0 100644
--- a/resources/lang/ur-PK/auth.php
+++ b/resources/lang/ur-PK/auth.php
@@ -15,6 +15,6 @@ return array(
 
     'failed' => 'These credentials do not match our records.',
     'password' => 'The provided password is incorrect.',
-    'throttle' => 'Too many login attempts. Please try again in :seconds seconds.',
+    'throttle' => 'Too many login attempts. Please try again in :minutes minute(s).',
 
 );
diff --git a/resources/lang/ur-PK/auth/message.php b/resources/lang/ur-PK/auth/message.php
index 588c9069ca..08f638d058 100644
--- a/resources/lang/ur-PK/auth/message.php
+++ b/resources/lang/ur-PK/auth/message.php
@@ -6,8 +6,6 @@ return array(
     'account_not_found'      => 'The username or password is incorrect.',
     'account_not_activated'  => 'This user account is not activated.',
     'account_suspended'      => 'This user account is suspended.',
-    'account_banned'         => 'This user account is banned.',
-    'throttle'               => 'Too many failed login attempts. Please try again in :minutes minutes.',
 
     'two_factor' => array(
         'already_enrolled'      => 'Your device is already enrolled.',
diff --git a/resources/lang/ur-PK/button.php b/resources/lang/ur-PK/button.php
index 22821b8157..8a838e8faf 100644
--- a/resources/lang/ur-PK/button.php
+++ b/resources/lang/ur-PK/button.php
@@ -7,6 +7,7 @@ return [
     'checkin_and_delete'  	    => 'Checkin All / Delete User',
     'delete'  	                => 'Delete',
     'edit'    	                => 'Edit',
+    'clone'    	                => 'Clone',
     'restore' 	                => 'Restore',
     'remove'                    => 'Remove',
     'request'                   => 'Request',
@@ -21,4 +22,13 @@ return [
     'add_maintenance'           => 'Add Maintenance',
     'append'                    => 'Append',
     'new'                       => 'New',
+    'var' => [
+        'clone'     => 'Clone :item_type',
+        'edit'      => 'Edit :item_type',
+        'delete'    => 'Delete :item_type',
+        'restore'   => 'Restore :item_type',
+        'create'    => 'Create New :item_type',
+        'checkout'  => 'Checkout :item_type',
+        'checkin'   => 'Checkin :item_type',
+    ]
 ];
diff --git a/resources/lang/ur-PK/general.php b/resources/lang/ur-PK/general.php
index 5b1d0e9b3c..d2e16aafbb 100644
--- a/resources/lang/ur-PK/general.php
+++ b/resources/lang/ur-PK/general.php
@@ -10,7 +10,7 @@ return [
     'action'                => 'Action',
     'activity_report'		=> 'Activity Report',
     'address'				=> 'Address',
-    'admin'					=> 'Admin',
+    'admin'					=> 'Admin Settings',
     'admin_tooltip'			=> 'This user has admin privileges',
     'superuser'				=> 'Superuser',
     'superuser_tooltip'		=> 'This user has superuser privileges',
@@ -23,13 +23,16 @@ return [
     'asset_models'			=> 'Asset Models',
     'asset_model'			=> 'Model',
     'asset'					=> 'Asset',
+    'asset_previous'        => 'Asset (Previously Assigned)',
     'asset_report'          => 'Asset Report',
     'asset_tag'				=> 'Asset Tag',
     'asset_tags'            => 'Asset Tags',
     'assets_available'		=> 'Assets available',
     'accept_assets'         => 'Accept Assets :name',
     'accept_assets_menu'    => 'Accept Assets',
+    'accept_item'           => 'Accept Item',
     'audit'				    => 'Audit',
+    'audits'				=> 'Audits',
     'audit_report'			=> 'Audit Log',
     'assets'				=> 'Assets',
     'assets_audited'        => 'assets audited',
@@ -61,9 +64,12 @@ return [
     'changepassword'  		=> 'Change Password',
     'checkin'  				=> 'Checkin',
     'checkin_from'  		=> 'Checkin from',
+    'checkin_note'  		=> 'Checkin Note',
+    'checkout_note'  		=> 'Checkout Note',
     'checkout'  			=> 'Checkout',
     'checkouts_count'       => 'Checkouts',
     'checkins_count'        => 'Checkins',
+    'checkin_and_delete'  	=> 'Checkin and Delete',
     'user_requests_count'   => 'Requests',
     'city'  				=> 'City',
     'click_here'			=> 'Click here',
@@ -77,7 +83,7 @@ return [
     'consumables'			=> 'Consumables',
     'country'  				=> 'Country',
     'could_not_restore'     => 'Error restoring :item_type: :error',
-    'not_deleted'           => 'The :item_type is not deleted so it cannot be restored',
+    'not_deleted'           => 'The :item_type was not deleted and therefore cannot be restored',
     'create'				=> 'Create New',
     'created'               => 'Item Created',
     'created_asset'			=> 'created asset',
@@ -86,11 +92,13 @@ return [
     'record_created' 		=> 'Record Created',
     'updated_at' 			=> 'Updated at',
     'currency'  			=> '$', // this is deprecated
+    'currency_text'  		=> 'Currency', //
     'current'  				=> 'Current',
     'current_password'      => 'Current Password',
     'customize_report'      => 'Customize Report',
     'custom_report'         => 'Custom Asset Report',
     'dashboard'				=> 'Dashboard',
+    'data_source'           => 'Data Source',
     'days'      			=> 'days',
     'days_to_next_audit'    => 'Days to Next Audit',
     'date'					=> 'Date',
@@ -98,7 +106,7 @@ return [
     'debug_warning_text'    => 'This application is running in production mode with debugging enabled. This can expose sensitive data if your application is accessible to the outside world. Disable debug mode by setting the <code>APP_DEBUG</code> value in your <code>.env</code> file to <code>false</code>.',
     'delete'  				=> 'Delete',
     'delete_confirm'  		=> 'Are you sure you wish to delete :item?',
-    'delete_confirm_no_undo' => 'Are you sure you wish to delete :item? This can not be undone.',
+    'delete_confirm_no_undo' => 'Are you sure, you wish to delete :item? This cannot be undone.',
     'deleted'  				=> 'Deleted',
     'delete_seats'  		=> 'Deleted Seats',
     'deletion_failed'       => 'Deletion failed',
@@ -114,29 +122,13 @@ return [
     'editprofile'  			=> 'Edit Your Profile',
     'eol'					=> 'EOL',
     'email_domain'			=> 'Email Domain',
-    'email_format'			=> 'Email Format',
     'employee_number'       => 'Employee Number',
     'email_domain_help'		=> 'This is used to generate email addresses when importing',
     'error'				    => 'Error',
     'exclude_archived'      => 'Exclude Archived Assets',
     'exclude_deleted'       => 'Exclude Deleted Assets',
     'example'				=> 'Example: ',
-    'filastname_format'			=> 'First Initial Last Name (jsmith@example.com)',
-    'firstname_lastname_format'	=> 'First Name Last Name (jane.smith@example.com)',
-    'firstname_lastname_underscore_format' => 'First Name Last Name (jane_smith@example.com)',
-    'lastnamefirstinitial_format' =>  'Last Name First Initial (smithj@example.com)',
-    'firstintial_dot_lastname_format' => 'First Initial Last Name (j.smith@example.com)',
-    'firstname_lastname_display'	=> 'First Name Last Name (Jane Smith)',
-    'lastname_firstname_display'	=> 'Last Name First Name (Smith Jane)',
-    'name_display_format'	=> 'Name Display Format',
-    'first'					=> 'First',
-    'firstnamelastname'     => 'First Name Last Name (janesmith@example.com)',
-    'lastname_firstinitial' => 'Last Name First Initial (smith_j@example.com)',
-    'firstinitial.lastname' => 'First Initial Last Name (j.smith@example.com)',
-    'firstnamelastinitial'  => 'First Name Last Initial (janes@example.com)',
-    'lastnamefirstname'      => 'Last Name First Name (smith.jane@example.com)',
-    'first_name'			=> 'First Name',
-    'first_name_format'		=> 'First Name (jane@example.com)',
+
     'files'                 => 'Files',
     'file_name'				=> 'File',
     'file_type'             => 'File Type',
@@ -156,9 +148,9 @@ return [
     'image_delete'         	=> 'Delete Image',
     'include_deleted'       => 'Include Deleted Assets',
     'image_upload'         	=> 'Upload Image',
-    'filetypes_accepted_help'    => 'Accepted filetype is :types. Max upload size allowed is :size.|Accepted filetypes are :types. Max upload size allowed is :size.',
-    'filetypes_size_help'   => 'Max upload size allowed is :size.',
-    'image_filetypes_help'  => 'Accepted filetypes are jpg, webp, png, gif, svg, and avif. Max upload size allowed is :size.',
+    'filetypes_accepted_help'    => 'Accepted filetype is :types. The maximum size allowed is :size.|Accepted filetypes are :types. The maximum upload size allowed is :size.',
+    'filetypes_size_help'   => 'The maximum upload size allowed is :size.',
+    'image_filetypes_help'  => 'Accepted Filetypes are jpg, webp, png, gif, svg, and avif. The maximum upload size allowed is :size.',
     'unaccepted_image_type'  => 'This image file was not readable. Accepted filetypes are jpg, webp, png, gif, and svg. The mimetype of this file is: :mimetype.',
     'import'         	    => 'Import',
     'import_this_file'      => 'Map fields and process this file',
@@ -178,12 +170,17 @@ return [
     'last'					=> 'Last',
     'last_login'            => 'Last Login',
     'last_name'             => 'Last Name',
+    'firstname_lastname_display'	=> 'First Name Last Name (Jane Smith)',
+    'lastname_firstname_display'	=> 'Last Name First Name (Smith Jane)',
+    'name_display_format'	=> 'Name Display Format',
+    'first'					=> 'First',
+    'first_name'			=> 'First Name',
     'license'				=> 'License',
     'license_report'        => 'License Report',
     'licenses_available'	=> 'Licenses available',
     'licenses'				=> 'Licenses',
     'list_all'				=> 'List All',
-    'loading'				=> 'Loading... please wait....',
+    'loading'				=> 'Loading... please wait...',
     'lock_passwords'        => 'This field value will not be saved in a demo installation.',
     'feature_disabled'      => 'This feature has been disabled for the demo installation.',
     'location'              => 'Location',
@@ -193,7 +190,7 @@ return [
     'logout'				=> 'Logout',
     'lookup_by_tag'     => 'Lookup by Asset Tag',
     'maintenances'          => 'Maintenances',
-    'manage_api_keys'       => 'Manage API Keys',
+    'manage_api_keys'       => 'Manage API keys',
     'manufacturer'			=> 'Manufacturer',
     'manufacturers'			=> 'Manufacturers',
     'markdown'				=> 'This field allows <a href="https://help.github.com/articles/github-flavored-markdown/">Github flavored markdown</a>.',
@@ -215,6 +212,14 @@ return [
     'no_results'			=> 'No Results.',
     'no'  					=> 'No',
     'notes'  				=> 'Notes',
+    'note_added'            => 'Note Added',
+    'options'				=> 'Options',
+    'preview'				=> 'Preview',
+    'add_note'              => 'Add Note',
+    'note_edited'            => 'Note Edited',
+    'edit_note'              => 'Edit Note',
+    'note_deleted'            => 'Note Deleted',
+    'delete_note'              => 'Delete Note',
     'order_number'          => 'Order Number',
     'only_deleted'          => 'Only Deleted Assets',
     'page_menu'				=> 'Showing _MENU_ items',
@@ -229,7 +234,7 @@ return [
     'purchase_date'         => 'Purchase Date',
     'qty'		            => 'QTY',
     'quantity'		        => 'Quantity',
-    'quantity_minimum'      => 'You have :count items below or almost below minimum quantity levels',
+    'quantity_minimum'      => 'You have one item below or almost below minimum quantity levels|You have :count items below or almost below minimum quantity levels',
     'quickscan_checkin'  	=> 'Quick Scan Checkin',
     'quickscan_checkin_status'  	=> 'Checkin Status',
     'ready_to_deploy'		=> 'Ready to Deploy',
@@ -254,7 +259,7 @@ return [
     'select_all'            => 'Select All',
     'search'				=> 'Search',
     'select_category'       => 'Select a Category',
-    'select_datasource' => 'Select a Datasource',
+    'select_datasource' => 'Select a data source',
     'select_department'     => 'Select a Department',
     'select_depreciation'	=> 'Select a Depreciation Type',
     'select_location'		=> 'Select a Location',
@@ -274,13 +279,15 @@ return [
     'signed_off_by'         => 'Signed Off By',
     'skin'       			=> 'Skin',
     'webhook_msg_note'        => 'A notification will be sent via webhook',
-    'webhook_test_msg'        => 'Oh hai! Looks like your :app integration with Snipe-IT is working!',
+    'webhook_test_msg'        => 'Oh hai! It looks like your :app integration with Snipe-IT is working!',
     'some_features_disabled' => 'DEMO MODE: Some features are disabled for this installation.',
     'site_name'				=> 'Site Name',
     'state'  				=> 'State',
     'status_labels'			=> 'Status Labels',
+    'status_label'			=> 'Status Label',
     'status'    			=> 'Status',
     'accept_eula'           => 'Acceptance Agreement',
+    'show_or_hide_eulas' => 'Show/Hide EULAs',
     'supplier'              => 'Supplier',
     'suppliers'  			=> 'Suppliers',
     'sure_to_delete'        => 'Are you sure you wish to delete',
@@ -296,9 +303,9 @@ return [
     'type'  				=> 'Type',
     'undeployable'			=> 'Un-deployable',
     'unknown_admin'			=> 'Unknown Admin',
-    'username_format'		=> 'Username Format',
     'username'              => 'Username',
     'update'                => 'Update',
+    'updating_item' => 'Updating :item',
     'upload_filetypes_help'      => 'Allowed filetypes are png, gif, jpg, jpeg, doc, docx, pdf, xls, xlsx, txt, lic, xml, zip, rtf and rar. Max upload size allowed is :size.',
     'uploaded'              => 'Uploaded',
     'user'					=> 'User',
@@ -323,10 +330,10 @@ return [
     'token_expired'         => 'Your form session has expired. Please try again.',
     'login_enabled'         => 'Login Enabled',
     'audit_due'             => 'Due for Audit',
-    'audit_due_days'        => 'Assets Due for Audit Within :days Day|Assets Due for Audit Within :days Days',
+    'audit_due_days'        => '{}Assets Due or Overdue for Audit|[1]Assets Due or Overdue for Audit Within a Day|[2,*]Assets Due or Overdue for Audit Within :days Days',
     'checkin_due'           => 'Due for Checkin',
     'checkin_overdue'       => 'Overdue for Checkin',
-    'checkin_due_days'      => 'Assets Due for Checkin Within :days Day|Assets Due for Checkin Within :days Days',
+    'checkin_due_days'      => '{}Due for Checkin|[1]Assets Due for Checkin Within :days Day|[2,*]Assets Due for Checkin Within :days Days',
     'audit_overdue'         => 'Overdue for Audit',
     'accept'                => 'Accept :asset',
     'i_accept'              => 'I accept',
@@ -339,16 +346,16 @@ return [
     'view_all'              => 'view all',
     'hide_deleted'          => 'Hide Deleted',
     'email'                 => 'Email',
-    'do_not_change'         => 'Do Not Change',
-    'bug_report'            => 'Report a Bug',
+    'do_not_change'         => 'Do not change',
+    'bug_report'            => 'Report a bug',
     'user_manual'           => 'User\'s Manual',
     'setup_step_1'          => 'Step 1',
     'setup_step_2'          => 'Step 2',
     'setup_step_3'          => 'Step 3',
     'setup_step_4'          => 'Step 4',
     'setup_config_check'    => 'Configuration Check',
-    'setup_create_database' => 'Create Database Tables',
-    'setup_create_admin'    => 'Create Admin User',
+    'setup_create_database' => 'Create database tables',
+    'setup_create_admin'    => 'Create an admin user',
     'setup_done'            => 'Finished!',
     'bulk_edit_about_to'    => 'You are about to edit the following: ',
     'checked_out'           => 'Checked Out',
@@ -383,6 +390,8 @@ return [
     'new_license'           => 'New License',
     'new_accessory'         => 'New Accessory',
     'new_consumable'        => 'New Consumable',
+    'new_component'         => 'New Component',
+    'new_user'              => 'New User',
     'collapse'              => 'Collapse',
     'assigned'              => 'Assigned',
     'asset_count'           => 'Asset Count',
@@ -418,19 +427,20 @@ return [
     'bulk_soft_delete'      =>'Also soft-delete these users. Their asset history will remain intact unless/until you purge deleted records in the Admin Settings.',
     'bulk_checkin_delete_success' => 'Your selected users have been deleted and their items have been checked in.',
     'bulk_checkin_success' => 'The items for the selected users have been checked in.',
-    'set_to_null'           => 'Delete values for this asset|Delete values for all :asset_count assets ',
+    'set_to_null'           => 'Delete values for this selection|Delete values for all :selection_count selections ',
     'set_users_field_to_null'  => 'Delete :field values for this user|Delete :field values for all :user_count users ',
     'na_no_purchase_date'   => 'N/A - No purchase date provided',
     'assets_by_status'      => 'Assets by Status',
     'assets_by_status_type'      => 'Assets by Status Type',
     'pie_chart_type'        => 'Dashboard Pie Chart Type',
     'hello_name'            => 'Hello, :name!',
-    'unaccepted_profile_warning'   => 'You have :count items requiring acceptance. Click here to accept or decline them',
+    'unaccepted_profile_warning'   => 'You have one item requiring acceptance. Click here to accept or decline it | You have :count items requiring acceptance. Click here to accept or decline them',
     'start_date'            => 'Start Date',
     'end_date'            => 'End Date',
     'alt_uploaded_image_thumbnail' => 'Uploaded thumbnail',
     'placeholder_kit'       => 'Select a kit',
     'file_not_found'        => 'File not found',
+    'log_record_not_found'  => 'No record for that log entry was found.',
     'preview_not_available' => '(no preview)',
     'setup'                 => 'Setup',
     'pre_flight'            => 'Pre-Flight',
@@ -512,7 +522,7 @@ return [
     'checked_out_to_fields' => 'Checked Out To Fields',
     'percent_complete' => '% complete',
     'uploading' => 'Uploading... ',
-    'upload_error' => 'Error uploading file. Please check that there are no empty rows and that no column names are duplicated.',
+    'upload_error' => 'Error uploading file. Please check that you have no empty rows or duplicated column names in your CSV, and that the server permissions allow uploads.',
     'copy_to_clipboard' => 'Copy to Clipboard',
     'copied' => 'Copied!',
     'status_compatibility' => 'If assets are already assigned, they cannot be changed to a non-deployable status type and this value change will be skipped.',
@@ -549,6 +559,71 @@ return [
         'license_seats'  => ':count License Seat|:count License Seats',
         'consumables'  => ':count Consumable|:count Consumables',
         'components'  => ':count Component|:count Components',
-    ]
+    ],
+
+    'more_info' => 'More Info',
+    'quickscan_bulk_help' => 'Checking this box will edit the asset record to reflect this new location. Leaving it unchecked will simply note the location in the audit log. Note that if this asset is checked out, it will not change the location of the person, asset or location it is checked out to.',
+    'whoops' => 'Whoops!',
+    'something_went_wrong' => 'Something went wrong with your request.',
+    'close' => 'Close',
+    'expires' => 'Expires',
+    'map_fields'=> 'Map :item_type Fields',
+    'remaining_var' => ':count Remaining',
+    'label' => 'Label',
+    'import_asset_tag_exists' => 'An asset with the asset tag :asset_tag already exists and an update was not requested. No change was made.',
+    'countries_manually_entered_help' => 'Values with an asterisk (*) were manually entered and do not match existing ISO 3166 dropdown values',
+    'accessories_assigned' => 'Assigned Accessories',
+    'user_managed_passwords' => 'Password Management',
+    'user_managed_passwords_disallow' => 'Disallow users from managing their own passwords',
+    'user_managed_passwords_allow' => 'Allow users to manage their own passwords',
+    'from' => 'From',
+    'by' => 'By',
+
+// Add form placeholders here
+    'placeholders' => [
+        'notes'  => 'Add a note',
+    ],
+
+    'breadcrumb_button_actions' => [
+        'edit_item' => 'Edit :name',
+        'checkout_item' => 'Checkout :name',
+        'checkin_item' => 'Checkin :name',
+    ],
+
+    'skins' => [
+        'site_default' => 'Site Default',
+        'default_blue' => 'Default Blue',
+        'blue_dark' => 'Blue (Dark Mode)',
+        'green' => 'Green Dark',
+        'green_dark' => 'Green (Dark Mode)',
+        'red' => 'Red Dark',
+        'red_dark' => 'Red (Dark Mode)',
+        'orange' => 'Orange Dark',
+        'orange_dark' => 'Orange (Dark Mode)',
+        'black' => 'Black',
+        'black_dark' => 'Black (Dark Mode)',
+        'purple' => 'Purple',
+        'purple_dark' => 'Purple (Dark Mode)',
+        'yellow' => 'Yellow',
+        'yellow_dark' => 'Yellow (Dark Mode)',
+        'high_contrast' => 'High Contrast',
+
+    ],
+
+    'select_all_none' => 'Select/Unselect All',
+    'generic_model_not_found' => 'That :model was not found or you do not have permission to access it',
+    'deleted_models' => 'Deleted Asset Models',
+    'deleted_users' => 'Deleted Users',
+    'cost_each' => ':amount each',
+    'remove_current_image' => 'Remove current :type image',
+
+    'seeding' => [
+        'manufacturers' => [
+            'button' => 'Create Manufacturers',
+            'prompt' => 'You do not have any manufacturers yet. Would you like to seed a list of common manufacturers? (THIS WILL OVERWRITE EXISTING MANUFACTURERS, including those that have been soft-deleted.)',
+            'success' => 'Manufacturers seeded successfully',
+            'error' => 'Could not seed manufacturers. A manufacturer record already exists and seeding would overwrite it.|Could not seed manufacturers. :count manufacturer records already exist and seeding would overwrite them.',
+        ],
+    ],
 
 ];
diff --git a/resources/lang/ur-PK/localizations.php b/resources/lang/ur-PK/localizations.php
index f1232dd138..827ed4fca1 100644
--- a/resources/lang/ur-PK/localizations.php
+++ b/resources/lang/ur-PK/localizations.php
@@ -2,7 +2,7 @@
 
 return [
 
-    'select_language' => 'Select a language',
+    'select_language' => 'Select a Language',
     'languages' => [
         'en-US'=> 'English, US',
         'en-GB'=> 'English, UK',
@@ -40,7 +40,9 @@ return [
         'ms-MY'=> 'Malay',
         'mi-NZ'=> 'Maori',
         'mn-MN'=> 'Mongolian',
-        'no-NO'=> 'Norwegian',
+        'nb-NO'=> 'Norwegian Bokmål',
+        'om-ET' => 'Oromo (Ethiopian)',
+        //'nn-NO'=> 'Norwegian Nynorsk',
         'fa-IR'=> 'Persian',
         'pl-PL'=> 'Polish',
         'pt-PT'=> 'Portuguese',
@@ -66,7 +68,7 @@ return [
         'zu-ZA'=> 'Zulu',
     ],
 
-    'select_country' => 'Select a country',
+    'select_country' => 'Select a Country',
     
     'countries' => [
         'AC'=>'Ascension Island',
@@ -133,6 +135,7 @@ return [
         'EC'=>'Ecuador',
         'EE'=>'Estonia',
         'EG'=>'Egypt',
+        'GB-ENG'=>'England',
         'ER'=>'Eritrea',
         'ES'=>'Spain',
         'ET'=>'Ethiopia',
@@ -231,6 +234,7 @@ return [
         'NG'=>'Nigeria',
         'NI'=>'Nicaragua',
         'NL'=>'Netherlands',
+        'GB-NIR' => 'Northern Ireland',
         'NO'=>'Norway',
         'NP'=>'Nepal',
         'NR'=>'Nauru',
@@ -258,7 +262,7 @@ return [
         'RU'=>'Russian Federation',
         'RW'=>'Rwanda',
         'SA'=>'Saudi Arabia',
-        'UK'=>'Scotland',
+        'GB-SCT'=>'Scotland',
         'SB'=>'Solomon Islands',
         'SC'=>'Seychelles',
         'SS'=>'South Sudan',
@@ -310,6 +314,7 @@ return [
         'VI'=>'Virgin Islands (U.S.)',
         'VN'=>'Viet Nam',
         'VU'=>'Vanuatu',
+        'GB-WLS' =>'Wales',
         'WF'=>'Wallis And Futuna Islands',
         'WS'=>'Samoa',
         'YE'=>'Yemen',
diff --git a/resources/lang/ur-PK/mail.php b/resources/lang/ur-PK/mail.php
index 759ff0f5e8..797f735a2b 100644
--- a/resources/lang/ur-PK/mail.php
+++ b/resources/lang/ur-PK/mail.php
@@ -23,24 +23,25 @@ return [
     'Item_Requested' => 'Item Requested',
     'License_Checkin_Notification' => 'License checked in',
     'License_Checkout_Notification' => 'License checked out',
+    'license_for'   => 'License for',
     'Low_Inventory_Report' => 'Low Inventory Report',
     'a_user_canceled' => 'A user has canceled an item request on the website',
     'a_user_requested' => 'A user has requested an item on the website',
     'acceptance_asset_accepted' => 'A user has accepted an item',
     'acceptance_asset_declined' => 'A user has declined an item',
-    'accessory_name' => 'Accessory Name:',
-    'additional_notes' => 'Additional Notes:',
+    'accessory_name' => 'Accessory Name',
+    'additional_notes' => 'Additional Notes',
     'admin_has_created' => 'An administrator has created an account for you on the :web website.',
-    'asset' => 'Asset:',
-    'asset_name' => 'Asset Name:',
+    'asset' => 'Asset',
+    'asset_name' => 'Asset Name',
     'asset_requested' => 'Asset requested',
     'asset_tag' => 'Asset Tag',
     'assets_warrantee_alert' => 'There is :count asset with a warranty expiring in the next :threshold days.|There are :count assets with warranties expiring in the next :threshold days.',
     'assigned_to' => 'Assigned To',
     'best_regards' => 'Best regards,',
-    'canceled' => 'Canceled:',
-    'checkin_date' => 'Checkin Date:',
-    'checkout_date' => 'Checkout Date:',
+    'canceled' => 'Canceled',
+    'checkin_date' => 'Checkin Date',
+    'checkout_date' => 'Checkout Date',
     'checkedout_from' => 'Checked out from',
     'checkedin_from'  => 'Checked in from',
     'checked_into' => 'Checked into',
@@ -49,27 +50,30 @@ return [
     'click_to_confirm' => 'Please click on the following link to confirm your :web account:',
     'current_QTY' => 'Current QTY',
     'days' => 'Days',
-    'expecting_checkin_date' => 'Expected Checkin Date:',
+    'expecting_checkin_date' => 'Expected Checkin Date',
     'expires' => 'Expires',
     'hello' => 'Hello',
     'hi' => 'Hi',
     'i_have_read' => 'I have read and agree to the terms of use, and have received this item.',
     'inventory_report' => 'Inventory Report',
-    'item' => 'Item:',
+    'item' => 'Item',
+    'item_checked_reminder' => 'This is a reminder that you currently have :count items checked out to you that you have not accepted or declined. Please click the link below to confirm your decision.',
     'license_expiring_alert' => 'There is :count license expiring in the next :threshold days.|There are :count licenses expiring in the next :threshold days.',
     'link_to_update_password' => 'Please click on the following link to update your :web password:',
-    'login' => 'Login:',
+    'login' => 'Login',
     'login_first_admin' => 'Login to your new Snipe-IT installation using the credentials below:',
     'low_inventory_alert' => 'There is :count item that is below minimum inventory or will soon be low.|There are :count items that are below minimum inventory or will soon be low.',
     'min_QTY' => 'Min QTY',
     'name' => 'Name',
     'new_item_checked' => 'A new item has been checked out under your name, details are below.',
+    'new_item_checked_with_acceptance' => 'A new item has been checked out under your name that requires acceptance, details are below.',
+    'recent_item_checked' => 'An item was recently checked out under your name that requires acceptance, details are below.',
     'notes' => 'Notes',
-    'password' => 'Password:',
+    'password' => 'Password',
     'password_reset' => 'Password Reset',
     'read_the_terms' => 'Please read the terms of use below.',
     'read_the_terms_and_click' => 'Please read the terms of use below, and click on the link at the bottom to confirm that you read and agree to the terms of use, and have received the asset.',
-    'requested' => 'Requested:',
+    'requested' => 'Requested',
     'reset_link' => 'Your Password Reset Link',
     'reset_password' => 'Click here to reset your password:',
     'rights_reserved' => 'All rights reserved.',
@@ -86,8 +90,10 @@ return [
     'upcoming-audits' => 'There is :count asset that is coming up for audit within :threshold days.|There are :count assets that are coming up for audit within :threshold days.',
     'user' => 'User',
     'username' => 'Username',
+    'unaccepted_asset_reminder' => 'Reminder: You have Unaccepted Assets.',
     'welcome' => 'Welcome :name',
     'welcome_to' => 'Welcome to :web!',
     'your_assets' => 'View Your Assets',
     'your_credentials' => 'Your Snipe-IT credentials',
+    'mail_sent' => 'Mail sent successfully!',
 ];
diff --git a/resources/lang/ur-PK/validation.php b/resources/lang/ur-PK/validation.php
index 05374e23af..99c847f589 100644
--- a/resources/lang/ur-PK/validation.php
+++ b/resources/lang/ur-PK/validation.php
@@ -13,87 +13,150 @@ return [
     |
     */
 
-    'accepted'             => 'The :attribute must be accepted.',
-    'active_url'           => 'The :attribute is not a valid URL.',
-    'after'                => 'The :attribute must be a date after :date.',
-    'after_or_equal'       => 'The :attribute must be a date after or equal to :date.',
-    'alpha'                => 'The :attribute may only contain letters.',
-    'alpha_dash'           => 'The :attribute may only contain letters, numbers, and dashes.',
-    'alpha_num'            => 'The :attribute may only contain letters and numbers.',
-    'array'                => 'The :attribute must be an array.',
-    'before'               => 'The :attribute must be a date before :date.',
-    'before_or_equal'      => 'The :attribute must be a date before or equal to :date.',
-    'between'              => [
-        'numeric' => 'The :attribute must be between :min - :max.',
-        'file'    => 'The :attribute must be between :min - :max kilobytes.',
-        'string'  => 'The :attribute must be between :min - :max characters.',
-        'array'   => 'The :attribute must have between :min and :max items.',
+    'accepted' => 'The :attribute field must be accepted.',
+    'accepted_if' => 'The :attribute field must be accepted when :other is :value.',
+    'active_url' => 'The :attribute field must be a valid URL.',
+    'after' => 'The :attribute field must be a date after :date.',
+    'after_or_equal' => 'The :attribute field must be a date after or equal to :date.',
+    'alpha' => 'The :attribute field must only contain letters.',
+    'alpha_dash' => 'The :attribute field must only contain letters, numbers, dashes, and underscores.',
+    'alpha_num' => 'The :attribute field must only contain letters and numbers.',
+    'array' => 'The :attribute field must be an array.',
+    'ascii' => 'The :attribute field must only contain single-byte alphanumeric characters and symbols.',
+    'before' => 'The :attribute field must be a date before :date.',
+    'before_or_equal' => 'The :attribute field must be a date before or equal to :date.',
+    'between' => [
+        'array' => 'The :attribute field must have between :min and :max items.',
+        'file' => 'The :attribute field must be between :min and :max kilobytes.',
+        'numeric' => 'The :attribute field must be between :min and :max.',
+        'string' => 'The :attribute field must be between :min and :max characters.',
     ],
-    'boolean'              => 'The :attribute must be true or false.',
-    'confirmed'            => 'The :attribute confirmation does not match.',
-    'date'                 => 'The :attribute is not a valid date.',
-    'date_format'          => 'The :attribute does not match the format :format.',
-    'different'            => 'The :attribute and :other must be different.',
-    'digits'               => 'The :attribute must be :digits digits.',
-    'digits_between'       => 'The :attribute must be between :min and :max digits.',
-    'dimensions'           => 'The :attribute has invalid image dimensions.',
-    'distinct'             => 'The :attribute field has a duplicate value.',
-    'email'                => 'The :attribute format is invalid.',
-    'exists'               => 'The selected :attribute is invalid.',
-    'file'                 => 'The :attribute must be a file.',
-    'filled'               => 'The :attribute field must have a value.',
-    'image'                => 'The :attribute must be an image.',
+    'boolean' => 'The :attribute field must be true or false.',
+    'can' => 'The :attribute field contains an unauthorized value.',
+    'confirmed' => 'The :attribute field confirmation does not match.',
+    'contains' => 'The :attribute field is missing a required value.',
+    'current_password' => 'The password is incorrect.',
+    'date' => 'The :attribute field must be a valid date.',
+    'date_equals' => 'The :attribute field must be a date equal to :date.',
+    'date_format' => 'The :attribute field must match the format :format.',
+    'decimal' => 'The :attribute field must have :decimal decimal places.',
+    'declined' => 'The :attribute field must be declined.',
+    'declined_if' => 'The :attribute field must be declined when :other is :value.',
+    'different' => 'The :attribute field and :other must be different.',
+    'digits' => 'The :attribute field must be :digits digits.',
+    'digits_between' => 'The :attribute field must be between :min and :max digits.',
+    'dimensions' => 'The :attribute field has invalid image dimensions.',
+    'distinct' => 'The :attribute field has a duplicate value.',
+    'doesnt_end_with' => 'The :attribute field must not end with one of the following: :values.',
+    'doesnt_start_with' => 'The :attribute field must not start with one of the following: :values.',
+    'email' => 'The :attribute field must be a valid email address.',
+    'ends_with' => 'The :attribute field must end with one of the following: :values.',
+    'enum' => 'The selected :attribute is invalid.',
+    'exists' => 'The selected :attribute is invalid.',
+    'extensions' => 'The :attribute field must have one of the following extensions: :values.',
+    'file' => 'The :attribute field must be a file.',
+    'filled' => 'The :attribute field must have a value.',
+    'gt' => [
+        'array' => 'The :attribute field must have more than :value items.',
+        'file' => 'The :attribute field must be greater than :value kilobytes.',
+        'numeric' => 'The :attribute field must be greater than :value.',
+        'string' => 'The :attribute field must be greater than :value characters.',
+    ],
+    'gte' => [
+        'array' => 'The :attribute field must have :value items or more.',
+        'file' => 'The :attribute field must be greater than or equal to :value kilobytes.',
+        'numeric' => 'The :attribute field must be greater than or equal to :value.',
+        'string' => 'The :attribute field must be greater than or equal to :value characters.',
+    ],
+    'hex_color' => 'The :attribute field must be a valid hexadecimal color.',
+    'image' => 'The :attribute field must be an image.',
     'import_field_empty'    => 'The value for :fieldname cannot be null.',
-    'in'                   => 'The selected :attribute is invalid.',
-    'in_array'             => 'The :attribute field does not exist in :other.',
-    'integer'              => 'The :attribute must be an integer.',
-    'ip'                   => 'The :attribute must be a valid IP address.',
-    'ipv4'                 => 'The :attribute must be a valid IPv4 address.',
-    'ipv6'                 => 'The :attribute must be a valid IPv6 address.',
-    'is_unique_department' => 'The :attribute must be unique to this Company Location',
-    'json'                 => 'The :attribute must be a valid JSON string.',
-    'max'                  => [
-        'numeric' => 'The :attribute may not be greater than :max.',
-        'file'    => 'The :attribute may not be greater than :max kilobytes.',
-        'string'  => 'The :attribute may not be greater than :max characters.',
-        'array'   => 'The :attribute may not have more than :max items.',
+    'in' => 'The selected :attribute is invalid.',
+    'in_array' => 'The :attribute field must exist in :other.',
+    'integer' => 'The :attribute field must be an integer.',
+    'ip' => 'The :attribute field must be a valid IP address.',
+    'ipv4' => 'The :attribute field must be a valid IPv4 address.',
+    'ipv6' => 'The :attribute field must be a valid IPv6 address.',
+    'json' => 'The :attribute field must be a valid JSON string.',
+    'list' => 'The :attribute field must be a list.',
+    'lowercase' => 'The :attribute field must be lowercase.',
+    'lt' => [
+        'array' => 'The :attribute field must have less than :value items.',
+        'file' => 'The :attribute field must be less than :value kilobytes.',
+        'numeric' => 'The :attribute field must be less than :value.',
+        'string' => 'The :attribute field must be less than :value characters.',
     ],
-    'mimes'                => 'The :attribute must be a file of type: :values.',
-    'mimetypes'            => 'The :attribute must be a file of type: :values.',
-    'min'                  => [
-        'numeric' => 'The :attribute must be at least :min.',
-        'file'    => 'The :attribute must be at least :min kilobytes.',
-        'string'  => 'The :attribute must be at least :min characters.',
-        'array'   => 'The :attribute must have at least :min items.',
+    'lte' => [
+        'array' => 'The :attribute field must not have more than :value items.',
+        'file' => 'The :attribute field must be less than or equal to :value kilobytes.',
+        'numeric' => 'The :attribute field must be less than or equal to :value.',
+        'string' => 'The :attribute field must be less than or equal to :value characters.',
     ],
-    'starts_with'          => 'The :attribute must start with one of the following: :values.',
-    'ends_with'            => 'The :attribute must end with one of the following: :values.',
+    'mac_address' => 'The :attribute field must be a valid MAC address.',
+    'max' => [
+        'array' => 'The :attribute field must not have more than :max items.',
+        'file' => 'The :attribute field must not be greater than :max kilobytes.',
+        'numeric' => 'The :attribute field must not be greater than :max.',
+        'string' => 'The :attribute field must not be greater than :max characters.',
+    ],
+    'max_digits' => 'The :attribute field must not have more than :max digits.',
+    'mimes' => 'The :attribute field must be a file of type: :values.',
+    'mimetypes' => 'The :attribute field must be a file of type: :values.',
+    'min' => [
+        'array' => 'The :attribute field must have at least :min items.',
+        'file' => 'The :attribute field must be at least :min kilobytes.',
+        'numeric' => 'The :attribute field must be at least :min.',
+        'string' => 'The :attribute field must be at least :min characters.',
+    ],
+    'min_digits' => 'The :attribute field must have at least :min digits.',
+    'missing' => 'The :attribute field must be missing.',
+    'missing_if' => 'The :attribute field must be missing when :other is :value.',
+    'missing_unless' => 'The :attribute field must be missing unless :other is :value.',
+    'missing_with' => 'The :attribute field must be missing when :values is present.',
+    'missing_with_all' => 'The :attribute field must be missing when :values are present.',
+    'multiple_of' => 'The :attribute field must be a multiple of :value.',
+    'not_in' => 'The selected :attribute is invalid.',
+    'not_regex' => 'The :attribute field format is invalid.',
+    'numeric' => 'The :attribute field must be a number.',
+    'password' => [
+        'letters' => 'The :attribute field must contain at least one letter.',
+        'mixed' => 'The :attribute field must contain at least one uppercase and one lowercase letter.',
+        'numbers' => 'The :attribute field must contain at least one number.',
+        'symbols' => 'The :attribute field must contain at least one symbol.',
+        'uncompromised' => 'The given :attribute has appeared in a data leak. Please choose a different :attribute.',
+    ],
+    'percent'       => 'The depreciation minimum must be between 0 and 100 when depreciation type is percentage.',
 
-    'not_in'               => 'The selected :attribute is invalid.',
-    'numeric'              => 'The :attribute must be a number.',
-    'present'              => 'The :attribute field must be present.',
-    'valid_regex'          => 'That is not a valid regex. ',
-    'regex'                => 'The :attribute format is invalid.',
-    'required'             => 'The :attribute field is required.',
-    'required_if'          => 'The :attribute field is required when :other is :value.',
-    'required_unless'      => 'The :attribute field is required unless :other is in :values.',
-    'required_with'        => 'The :attribute field is required when :values is present.',
-    'required_with_all'    => 'The :attribute field is required when :values is present.',
-    'required_without'     => 'The :attribute field is required when :values is not present.',
+    'present' => 'The :attribute field must be present.',
+    'present_if' => 'The :attribute field must be present when :other is :value.',
+    'present_unless' => 'The :attribute field must be present unless :other is :value.',
+    'present_with' => 'The :attribute field must be present when :values is present.',
+    'present_with_all' => 'The :attribute field must be present when :values are present.',
+    'prohibited' => 'The :attribute field is prohibited.',
+    'prohibited_if' => 'The :attribute field is prohibited when :other is :value.',
+    'prohibited_unless' => 'The :attribute field is prohibited unless :other is in :values.',
+    'prohibits' => 'The :attribute field prohibits :other from being present.',
+    'regex' => 'The :attribute field format is invalid.',
+    'required' => 'The :attribute field is required.',
+    'required_array_keys' => 'The :attribute field must contain entries for: :values.',
+    'required_if' => 'The :attribute field is required when :other is :value.',
+    'required_if_accepted' => 'The :attribute field is required when :other is accepted.',
+    'required_if_declined' => 'The :attribute field is required when :other is declined.',
+    'required_unless' => 'The :attribute field is required unless :other is in :values.',
+    'required_with' => 'The :attribute field is required when :values is present.',
+    'required_with_all' => 'The :attribute field is required when :values are present.',
+    'required_without' => 'The :attribute field is required when :values is not present.',
     'required_without_all' => 'The :attribute field is required when none of :values are present.',
-    'same'                 => 'The :attribute and :other must match.',
-    'size'                 => [
-        'numeric' => 'The :attribute must be :size.',
-        'file'    => 'The :attribute must be :size kilobytes.',
-        'string'  => 'The :attribute must be :size characters.',
-        'array'   => 'The :attribute must contain :size items.',
+    'same' => 'The :attribute field must match :other.',
+    'size' => [
+        'array' => 'The :attribute field must contain :size items.',
+        'file' => 'The :attribute field must be :size kilobytes.',
+        'numeric' => 'The :attribute field must be :size.',
+        'string' => 'The :attribute field must be :size characters.',
     ],
+    'starts_with' => 'The :attribute field must start with one of the following: :values.',
     'string'               => 'The :attribute must be a string.',
-    'timezone'             => 'The :attribute must be a valid zone.',
     'two_column_unique_undeleted' => 'The :attribute must be unique across :table1 and :table2. ',
-    'unique'               => 'The :attribute has already been taken.',
-    'uploaded'             => 'The :attribute failed to upload.',
-    'url'                  => 'The :attribute format is invalid.',
     'unique_undeleted'     => 'The :attribute must be unique.',
     'non_circular'         => 'The :attribute must not create a circular reference.',
     'not_array'            => ':attribute cannot be an array.',
@@ -102,11 +165,14 @@ return [
     'numbers'              => 'Password must contain at least one number.',
     'case_diff'            => 'Password must use mixed case.',
     'symbols'              => 'Password must contain symbols.',
-    'gte'                  => [
-        'numeric'          => 'Value cannot be negative'
-    ],
-    'checkboxes'           => ':attribute contains invalid options.',
-    'radio_buttons'        => ':attribute is invalid.',
+    'timezone' => 'The :attribute field must be a valid timezone.',
+    'unique' => 'The :attribute has already been taken.',
+    'uploaded' => 'The :attribute failed to upload.',
+    'uppercase' => 'The :attribute field must be uppercase.',
+    'url' => 'The :attribute field must be a valid URL.',
+    'ulid' => 'The :attribute field must be a valid ULID.',
+    'uuid' => 'The :attribute field must be a valid UUID.',
+    'fmcs_location' => 'Full multiple company support and location scoping is enabled in the Admin Settings, and the selected location and selected company are not compatible.',
 
 
     /*
@@ -120,16 +186,22 @@ return [
     |
     */
 
+    'email_array'      => 'One or more email addresses is invalid.',
+    'checkboxes'           => ':attribute contains invalid options.',
+    'radio_buttons'        => ':attribute is invalid.',
+    
     'custom' => [
         'alpha_space' => 'The :attribute field contains a character that is not allowed.',
-        'email_array'      => 'One or more email addresses is invalid.',
+
         'hashed_pass'      => 'Your current password is incorrect',
         'dumbpwd'          => 'That password is too common.',
         'statuslabel_type' => 'You must select a valid status label type',
+        'custom_field_not_found'          => 'This field does not seem to exist, please double check your custom field names.',
+        'custom_field_not_found_on_model' => 'This field seems to exist, but is not available on this Asset Model\'s fieldset.',
 
         // date_format validation with slightly less stupid messages. It duplicates a lot, but it gets the job done :(
-        // We use this because the default error message for date_format is reflects php Y-m-d, which non-PHP
-        // people won't know how to format. 
+        // We use this because the default error message for date_format reflects php Y-m-d, which non-PHP
+        // people won't know how to format.
         'purchase_date.date_format'     => 'The :attribute must be a valid date in YYYY-MM-DD format',
         'last_audit_date.date_format'   =>  'The :attribute must be a valid date in YYYY-MM-DD hh:mm:ss format',
         'expiration_date.date_format'   =>  'The :attribute must be a valid date in YYYY-MM-DD format',
@@ -137,9 +209,15 @@ return [
         'expected_checkin.date_format'  =>  'The :attribute must be a valid date in YYYY-MM-DD format',
         'start_date.date_format'        =>  'The :attribute must be a valid date in YYYY-MM-DD format',
         'end_date.date_format'          =>  'The :attribute must be a valid date in YYYY-MM-DD format',
+        'invalid_value_in_field' => 'Invalid value included in this field',
 
-    ],
+        'ldap_username_field' => [
+            'not_in' =>         '<code>sAMAccountName</code> (mixed case) will likely not work. You should use <code>samaccountname</code> (lowercase) instead.'
+        ],
+        'ldap_auth_filter_query' => ['not_in' => '<code>uid=samaccountname</code> is probably not a valid auth filter. You probably want <code>uid=</code> '],
+        'ldap_filter' => ['regex' => 'This value should probably not be wrapped in parentheses.'],
 
+        ],
     /*
     |--------------------------------------------------------------------------
     | Custom Validation Attributes
@@ -155,8 +233,16 @@ return [
 
     /*
     |--------------------------------------------------------------------------
-    | Generic Validation Messages
+    | Generic Validation Messages - we use these in the jquery validation where we don't have
+    | access to the :attribute
     |--------------------------------------------------------------------------
     */
-    'invalid_value_in_field' => 'Invalid value included in this field',
+
+    'generic' => [
+        'invalid_value_in_field' => 'Invalid value included in this field',
+        'required' => 'This field is required',
+        'email' => 'Please enter a valid email address',
+    ],
+
+
 ];
diff --git a/resources/lang/vi-VN/account/general.php b/resources/lang/vi-VN/account/general.php
index 530a887f63..e4e74bbbc1 100644
--- a/resources/lang/vi-VN/account/general.php
+++ b/resources/lang/vi-VN/account/general.php
@@ -2,10 +2,16 @@
 
 return array(
     'personal_api_keys' => 'Khóa API cá nhân',
+    'personal_access_token' => 'Personal Access Token',
+    'personal_api_keys_success' => 'Personal API Key :key created sucessfully',
+    'here_is_api_key' => 'Here is your new personal access token. This is the only time it will be shown so do not lose it! You may now use this token to make API requests.',
     'api_key_warning' => 'When generating an API token, be sure to copy it down immediately as they will not be visible to you again.',
     'api_base_url' => 'Địa chỉ URL gốc API của bạn được đặt tại:',
     'api_base_url_endpoint' => '/&lt;endpoint&gt;',
     'api_token_expiration_time' => 'Khóa API được thiết lập có thời hạn đến:',
     'api_reference' => 'Please check the <a href="https://snipe-it.readme.io/reference" target="_blank">API reference</a> to find specific API endpoints and additional API documentation.',
     'profile_updated' => 'Đã cập nhật tài khoản thành công',
+    'no_tokens' => 'You have not created any personal access tokens.',
+    'enable_sounds' => 'Enable sound effects',
+    'enable_confetti' => 'Enable confetti effects',
 );
diff --git a/resources/lang/vi-VN/admin/accessories/message.php b/resources/lang/vi-VN/admin/accessories/message.php
index fb50f7feda..8498d45360 100644
--- a/resources/lang/vi-VN/admin/accessories/message.php
+++ b/resources/lang/vi-VN/admin/accessories/message.php
@@ -26,7 +26,11 @@ return array(
         'error'   		=> 'Phụ kiện chưa được xuất kho. Bạn hãy thử lại',
         'success' 		=> 'Phụ kiện được xuất kho thành công.',
         'unavailable'   => 'Không có sẵn phụ kiện để xuất. Hãy kiểm tra số lượng có sẵn',
-        'user_does_not_exist' => 'Người dùng này không tồn tại. Bạn hãy thử lại.'
+        'user_does_not_exist' => 'Người dùng này không tồn tại. Bạn hãy thử lại.',
+         'checkout_qty' => array(
+            'lte'  => 'There is currently only one available accessory of this type, and you are trying to check out :checkout_qty. Please adjust the checkout quantity or the total stock of this accessory and try again.|There are :number_currently_remaining total available accessories, and you are trying to check out :checkout_qty. Please adjust the checkout quantity or the total stock of this accessory and try again.',
+            ),
+           
     ),
 
     'checkin' => array(
diff --git a/resources/lang/vi-VN/admin/accessories/table.php b/resources/lang/vi-VN/admin/accessories/table.php
index 4c79d3bca3..6deb2d7428 100644
--- a/resources/lang/vi-VN/admin/accessories/table.php
+++ b/resources/lang/vi-VN/admin/accessories/table.php
@@ -6,6 +6,4 @@ return array(
     'id'      					=> 'Định danh',
     'require_acceptance'      	=> 'Chấp nhận',
     'title'      				=> 'Tên phụ kiện',
-
-
 );
diff --git a/resources/lang/vi-VN/admin/components/message.php b/resources/lang/vi-VN/admin/components/message.php
index 7496384174..8aeb9b3eac 100644
--- a/resources/lang/vi-VN/admin/components/message.php
+++ b/resources/lang/vi-VN/admin/components/message.php
@@ -17,7 +17,8 @@ return array(
     'delete' => array(
         'confirm'   => 'Bạn có chắc chắn muốn xoá thành phần này?',
         'error'   => 'Đã xảy ra sự cố khi xóa thành phần này. Vui lòng thử lại.',
-        'success' => 'Thành phần đã được xóa thành công.'
+        'success' => 'Thành phần đã được xóa thành công.',
+        'error_qty'   => 'Some components of this type are still checked out. Please check them in and try again.',
     ),
 
      'checkout' => array(
diff --git a/resources/lang/vi-VN/admin/consumables/general.php b/resources/lang/vi-VN/admin/consumables/general.php
index f8e4cc0d3d..1358b3d6a9 100644
--- a/resources/lang/vi-VN/admin/consumables/general.php
+++ b/resources/lang/vi-VN/admin/consumables/general.php
@@ -8,4 +8,5 @@ return array(
     'remaining' 			            => 'Còn lại',
     'total' 			                => 'Tổng số',
     'update'                            => 'Cập nhật vật tư phụ',
+    'inventory_warning'                 => 'The inventory of this consumable is below the minimum amount of :min_count',
 );
diff --git a/resources/lang/vi-VN/admin/consumables/message.php b/resources/lang/vi-VN/admin/consumables/message.php
index 722314ff49..fb6ff91208 100644
--- a/resources/lang/vi-VN/admin/consumables/message.php
+++ b/resources/lang/vi-VN/admin/consumables/message.php
@@ -2,6 +2,7 @@
 
 return array(
 
+    'invalid_category_type' => 'The category must be a consumable category.',
     'does_not_exist' => 'Vật tư phụ không tồn tại.',
 
     'create' => array(
diff --git a/resources/lang/vi-VN/admin/custom_fields/general.php b/resources/lang/vi-VN/admin/custom_fields/general.php
index 2cd9be8a88..765344dc3b 100644
--- a/resources/lang/vi-VN/admin/custom_fields/general.php
+++ b/resources/lang/vi-VN/admin/custom_fields/general.php
@@ -35,7 +35,7 @@ return [
     'create_field_title' => 'Create a new custom field',
     'value_encrypted'      	        => 'Giá trị của trường này được mã hóa trong cơ sở dữ liệu. Chỉ những người dùng quản trị mới có thể xem được giá trị được giải mã',
     'show_in_email'     => 'Bao gồm giá trị của trường này trong email thanh toán được gửi tới người dùng? Các trường được mã hóa không thể được bao gồm trong email',
-    'show_in_email_short'     => 'Include in emails.',
+    'show_in_email_short' => 'Include in emails',
     'help_text' => 'Help Text',
     'help_text_description' => 'This is optional text that will appear below the form elements while editing an asset to provide context on the field.',
     'about_custom_fields_title' => 'About Custom Fields',
@@ -57,5 +57,8 @@ return [
     'show_in_requestable_list_short' => 'Show in requestable assets list',
     'show_in_requestable_list' => 'Show value in requestable assets list. Encrypted fields will not be shown',
     'encrypted_options' => 'This field is encrypted, so some display options will not be available.',
+    'display_checkin' => 'Display in checkin forms',
+    'display_checkout' => 'Display in checkout forms',
+    'display_audit' => 'Display in audit forms',
 
 ];
diff --git a/resources/lang/vi-VN/admin/custom_fields/message.php b/resources/lang/vi-VN/admin/custom_fields/message.php
index 283cf1f754..c76ebec7ae 100644
--- a/resources/lang/vi-VN/admin/custom_fields/message.php
+++ b/resources/lang/vi-VN/admin/custom_fields/message.php
@@ -5,6 +5,7 @@ return array(
     'field' => array(
         'invalid'   => 'Lĩnh vực đó không tồn tại.',
         'already_added'   => 'Trường đã được thêm',
+        'none_selected'   => 'No field selected',
 
         'create' => array(
             'error'   => 'Trường không được tạo, vui lòng thử lại.',
diff --git a/resources/lang/vi-VN/admin/depreciations/general.php b/resources/lang/vi-VN/admin/depreciations/general.php
index c74830ba62..970652f4bc 100644
--- a/resources/lang/vi-VN/admin/depreciations/general.php
+++ b/resources/lang/vi-VN/admin/depreciations/general.php
@@ -13,4 +13,8 @@ return [
     'no_depreciations_warning'               => '<strong>Warning: </strong>
                       You do not currently have any depreciations set up.
                       Please set up at least one depreciation to view the depreciation report.',
+    'depreciation_method'                   => 'Báo cáo khấu hao',
+    'linear_depreciation'                   => 'Linear (Default)',
+    'half_1'                                => 'Half-year convention, always applied',
+    'half_2'                                => 'Half-year convention, applied with condition',
 ];
diff --git a/resources/lang/vi-VN/admin/hardware/form.php b/resources/lang/vi-VN/admin/hardware/form.php
index 6bc9084582..9515d1f897 100644
--- a/resources/lang/vi-VN/admin/hardware/form.php
+++ b/resources/lang/vi-VN/admin/hardware/form.php
@@ -55,8 +55,11 @@ return [
     'asset_location_update_default' => 'Chỉ cập nhật vị trí tài sản mặc định',
     'asset_location_update_actual' => 'Chỉ cập nhật vị trí thực tế',
     'asset_not_deployable' => 'Trạng thái tài sản là không cho phép cấp phát. Tài sản này không thể bàn giao.',
-    'asset_deployable' => 'Trạng thái tài sản là được phép cấp phát. Tài sản này có thể bàn giao.',
+    'asset_not_deployable_checkin' => 'That asset status is not deployable. Using this status label will checkin the asset.',
+    'asset_deployable' => 'This asset can be checked out.',
     'processing_spinner' => 'Đang xử lý... (Quá trình này có thể mất một chút thời gian đối với các tệp lớn)',
+    'processing' => 'Đang xử lý... ',
     'optional_infos'  => 'Thông tin bổ sung',
-    'order_details'   => 'Thông tin đơn hàng'
+    'order_details'   => 'Thông tin đơn hàng',
+    'calc_eol'    => 'If nulling the EOL date, use automatic EOL calculation based on the purchase date and EOL rate.',
 ];
diff --git a/resources/lang/vi-VN/admin/hardware/general.php b/resources/lang/vi-VN/admin/hardware/general.php
index e0191f6834..a2ebbf30fc 100644
--- a/resources/lang/vi-VN/admin/hardware/general.php
+++ b/resources/lang/vi-VN/admin/hardware/general.php
@@ -5,8 +5,8 @@ return [
     'about_assets_text'            => 'Tài sản là các mục được theo dõi bằng số sê-ri hoặc thẻ nội dung. Chúng thường có giá trị cao hơn khi xác định một mục cụ thể.',
     'archived'  				=> 'Đã lưu trữ',
     'asset'  					=> 'Tài sản',
-    'bulk_checkout'             => 'Checkout Tài sản',
-    'bulk_checkin'              => 'Thu hồi tài sản',
+    'bulk_checkout'             => 'Thanh toán hàng loạt',
+    'bulk_checkin'              => 'Bulk Checkin',
     'checkin'  					=> 'Checkin tài sản',
     'checkout'  				=> 'Tài sản thanh toán',
     'clone'  					=> 'Nhân đôi tài sản',
@@ -27,8 +27,7 @@ return [
     'undeployable_tooltip'  	=> 'Tài sản này có nhãn trạng thái không thể triển khai và không thể kiểm tra vào lúc này.',
     'view'  					=> 'Xem tài sản',
     'csv_error' => 'Có lỗi trong file CSV của bạn:',
-    'import_text' => '<p>Upload a CSV that contains asset history. The assets and users MUST already exist in the system, or they will be skipped. Matching assets for history import happens against the asset tag. We will try to find a matching user based on the user\'s name you provide, and the criteria you select below. If you do not select any criteria below, it will simply try to match on the username format you configured in the <code>Admin &gt; General Settings</code>.</p><p>Fields included in the CSV must match the headers: <strong>Asset Tag, Name, Checkout Date, Checkin Date</strong>. Any additional fields will be ignored. </p><p>Checkin Date: blank or future checkin dates will checkout items to associated user.  Excluding the Checkin Date column will create a checkin date with todays date.</p>
-    ',
+    'import_text' => '<p>Upload a CSV that contains asset history. The assets and users MUST already exist in the system, or they will be skipped. Matching assets for history import happens against the asset tag. We will try to find a matching user based on the user\'s name you provide, and the criteria you select below. If you do not select any criteria below, it will simply try to match on the username format you configured in the <code>Admin &gt; General Settings</code>.</p><p>Fields included in the CSV must match the headers: <strong>Asset Tag, Name, Checkout Date, Checkin Date</strong>. Any additional fields will be ignored. </p><p>Checkin Date: blank or future checkin dates will checkout items to associated user.  Excluding the Checkin Date column will create a checkin date with todays date.</p>    ',
     'csv_import_match_f-l' => 'Try to match users by <strong>firstname.lastname</strong> (<code>jane.smith</code>) format',
     'csv_import_match_initial_last' => 'Try to match users by <strong>first initial last name</strong> (<code>jsmith</code>) format',
     'csv_import_match_first' => 'Try to match users by <strong>first name</strong> (<code>jane</code>) format',
diff --git a/resources/lang/vi-VN/admin/hardware/message.php b/resources/lang/vi-VN/admin/hardware/message.php
index 51891c53c5..b0cf3128f3 100644
--- a/resources/lang/vi-VN/admin/hardware/message.php
+++ b/resources/lang/vi-VN/admin/hardware/message.php
@@ -2,19 +2,23 @@
 
 return [
 
-    'undeployable' 		=> '<strong>Cảnh báo: </strong> Tài sản này hiện tại đang được đánh dấu là không cho phép cấp phát.
-                        Nếu tình trạng này đã được thay đổi, xin vui lòng cập nhật tình trạng tài sản.',
-    'does_not_exist' 	=> 'Tài sản không tồn tại.',
-    'does_not_exist_var'=> 'Asset with tag :asset_tag not found.',
-    'no_tag' 	        => 'No asset tag provided.',
+    'undeployable' 		 => '<strong>Warning: </strong> This asset has been marked as currently undeployable. If this status has changed, please update the asset status.',
+    'does_not_exist' 	 => 'Tài sản không tồn tại.',
+    'does_not_exist_var' => 'Asset with tag :asset_tag not found.',
+    'no_tag' 	         => 'No asset tag provided.',
     'does_not_exist_or_not_requestable' => 'Tài sản không tồn tại hoặc không cho phép đề xuất.',
-    'assoc_users'	 	=> 'Tài sản này hiện tại đã được checkout đến một người dùng và không thể xóa. Đầu tiên xin vui lòng kiểm tra lại tài sản, và cố gắng thử lần nữa. ',
+    'assoc_users'	 	 => 'Tài sản này hiện tại đã được checkout đến một người dùng và không thể xóa. Đầu tiên xin vui lòng kiểm tra lại tài sản, và cố gắng thử lần nữa. ',
     'warning_audit_date_mismatch' 	=> 'This asset\'s next audit date (:next_audit_date) is before the last audit date (:last_audit_date). Please update the next audit date.',
+    'labels_generated'   => 'Labels were successfully generated.',
+    'error_generating_labels' => 'Error while generating labels.',
+    'no_assets_selected' => 'No assets selected.',
 
     'create' => [
         'error'   		=> 'Tài sản chưa được tạo, xin vui lòng thử lại. :(',
         'success' 		=> 'Tài sản được tạo thành công. :)',
         'success_linked' => 'Asset with tag :tag was created successfully. <strong><a href=":link" style="color: white;">Click here to view</a></strong>.',
+        'multi_success_linked' => 'Asset with tag :links was created successfully.|:count assets were created succesfully. :links.',
+        'partial_failure' => 'An asset was unable to be created. Reason: :failures|:count assets were unable to be created. Reasons: :failures',
     ],
 
     'update' => [
@@ -52,20 +56,24 @@ return [
     ],
 
     'import' => [
+        'import_button'         => 'Process Import',
         'error'                 => 'Một số mặt hàng không nhập chính xác.',
         'errorDetail'           => 'Các mục sau đây không được nhập khẩu vì lỗi.',
         'success'               => 'Tệp của bạn đã được nhập',
         'file_delete_success'   => 'Tập tin của bạn đã được xóa thành công',
         'file_delete_error'      => 'Không thể xóa tệp',
         'file_missing' => 'Tệp đã chọn bị thiếu',
+        'file_already_deleted' => 'The file selected was already deleted',
         'header_row_has_malformed_characters' => 'Một hoặc nhiều thuộc tính trong hàng tiêu đề chứa các ký tự không đúng định dạng UTF-8',
         'content_row_has_malformed_characters' => 'Một hoặc nhiều thuộc tính ở hàng đầu tiên của nội dung chứa ký tự không đúng định dạng UTF-8',
+        'transliterate_failure' => 'Transliteration from :encoding to UTF-8 failed due to invalid characters in input'
     ],
 
 
     'delete' => [
         'confirm'   	=> 'Bạn có chắc chắn muốn xoá bỏ tài sản này?',
         'error'   		=> 'Đã có vấn đề xảy ra khi xoá tài sản này. Bạn hãy thử lại xem.',
+        'assigned_to_error' => '{1}Asset Tag: :asset_tag is currently checked out. Check in this device before deletion.|[2,*]Asset Tags: :asset_tag are currently checked out. Check in these devices before deletion.',
         'nothing_updated'   => 'Không có nội dung nào được chọn, vì vậy không có gì bị xóa.',
         'success' 		=> 'Tài sản này được xoá thành công.',
     ],
@@ -78,6 +86,11 @@ return [
         'no_assets_selected' => 'Bạn phải chọn ít nhất một mục trong danh sách',
     ],
 
+    'multi-checkout' => [
+        'error'   => 'Asset was not checked out, please try again|Assets were not checked out, please try again',
+        'success' => 'Asset checked out successfully.|Assets checked out successfully.',
+    ],
+
     'checkin' => [
         'error'   		=> 'Tài sản chưa được checkin, xin vui lòng thử lại',
         'success' 		=> 'Tài sản đã checkin thành công.',
@@ -87,9 +100,10 @@ return [
     ],
 
     'requests' => [
-        'error'   		=> 'Tài sản không được yêu cầu, vui lòng thử lại',
-        'success' 		=> 'Tài sản đã yêu cầu thành công.',
-        'canceled'      => 'Yêu cầu Thanh toán đã được hủy thành công',
+        'error'   		=> 'Request was not successful, please try again.',
+        'success' 		=> 'Request successfully submitted.',
+        'canceled'      => 'Request successfully canceled.',
+        'cancel'        => 'Cancel this item request',
     ],
 
 ];
diff --git a/resources/lang/vi-VN/admin/hardware/table.php b/resources/lang/vi-VN/admin/hardware/table.php
index d3346e43be..3131a642fe 100644
--- a/resources/lang/vi-VN/admin/hardware/table.php
+++ b/resources/lang/vi-VN/admin/hardware/table.php
@@ -25,7 +25,6 @@ return [
     'image'		    => 'Hình ảnh Thiết bị',
     'days_without_acceptance' => 'Những ngày không chấp nhận',
     'monthly_depreciation' => 'Khấu hao tháng',
-    'assigned_to'    => 'Bàn giao cho',
     'requesting_user' => 'Người dùng đang yêu cầu',
     'requested_date' => 'Ngày yêu cầu',
     'changed'       => 'Đã thay đổi',
diff --git a/resources/lang/vi-VN/admin/kits/general.php b/resources/lang/vi-VN/admin/kits/general.php
index 167d152c82..3d114d8590 100644
--- a/resources/lang/vi-VN/admin/kits/general.php
+++ b/resources/lang/vi-VN/admin/kits/general.php
@@ -47,4 +47,5 @@ return [
     'kit_deleted'                       => 'Bộ kit đã xóa thành công',
     'kit_model_updated'                 => 'Model was successfully updated',
     'kit_model_detached'                => 'Model was successfully detached',
+    'model_already_attached'            => 'Model already attached to kit',
 ];
diff --git a/resources/lang/vi-VN/admin/licenses/general.php b/resources/lang/vi-VN/admin/licenses/general.php
index 56c6ea77f6..3f8d2b5a78 100644
--- a/resources/lang/vi-VN/admin/licenses/general.php
+++ b/resources/lang/vi-VN/admin/licenses/general.php
@@ -14,6 +14,7 @@ return array(
     'info'  					=> 'Thông tin bản quyền',
     'license_seats'  			=> 'Số lượng chỗ cấp phép',
     'seat'  					=> 'Seat',
+    'seat_count'  				=> 'Seat :count',
     'seats'  					=> 'Seats',
     'software_licenses'  		=> 'Bản quyền phần mềm',
     'user'  					=> 'Người dùng',
@@ -23,12 +24,12 @@ return array(
         [
             'checkin_all'           => [
                 'button'            => 'Checkin All Seats',
-                'modal'             => 'This will action checkin one seat. | This action will checkin all :checkedout_seats_count seats for this license.',
+                'modal'             => 'This action will checkin one seat. | This action will checkin all :checkedout_seats_count seats for this license.',
                 'enabled_tooltip'   => 'Checkin ALL seats for this license from both users and assets',
                 'disabled_tooltip'  => 'This is disabled because there are no seats currently checked out',
                 'disabled_tooltip_reassignable'  => 'This is disabled because the License is not reassignable',
                 'success'           => 'License successfully checked in! | All licenses were successfully checked in!',
-                'log_msg'           => 'Checked in via bulk license checkout in license GUI',
+                'log_msg'           => 'Checked in via bulk license checkin in license GUI',
             ],
 
             'checkout_all'              => [
diff --git a/resources/lang/vi-VN/admin/licenses/message.php b/resources/lang/vi-VN/admin/licenses/message.php
index 467b4c017d..3275667c08 100644
--- a/resources/lang/vi-VN/admin/licenses/message.php
+++ b/resources/lang/vi-VN/admin/licenses/message.php
@@ -44,10 +44,13 @@ return array(
         'error'   => 'Có vấn đề xảy ra khi checkout bản quyền. Xin vui lòng thử lại.',
         'success' => 'Bản quyền đã được checkout thành công',
         'not_enough_seats' => 'Not enough license seats available for checkout',
+        'mismatch' => 'The license seat provided does not match the license',
+        'unavailable' => 'This seat is not available for checkout.',
     ),
 
     'checkin' => array(
         'error'   => 'Có vấn đề xảy ra khi checkin bản quyền. Xin vui lòng thử lại.',
+        'not_reassignable' => 'License not reassignable',
         'success' => 'Bản quyền đã được checkin thành công'
     ),
 
diff --git a/resources/lang/vi-VN/admin/locations/message.php b/resources/lang/vi-VN/admin/locations/message.php
index 7b83762d99..423a744076 100644
--- a/resources/lang/vi-VN/admin/locations/message.php
+++ b/resources/lang/vi-VN/admin/locations/message.php
@@ -3,11 +3,12 @@
 return array(
 
     'does_not_exist' => 'Địa phương không tồn tại.',
-    'assoc_users'    => 'This location is not currently deletable because it is the location of record for at least one asset or user, has assets assigned to it, or is the parent location of another location. Please update your models to no longer reference this company and try again. ',
+    'assoc_users'    => 'This location is not currently deletable because it is the location of record for at least one asset or user, has assets assigned to it, or is the parent location of another location. Please update your records to no longer reference this location and try again ',
     'assoc_assets'	 => 'Địa phương này hiện tại đã được liên kết với ít nhất một tài sản và không thể xóa. Xin vui lòng cập nhật tài sản của bạn để không còn liên kết với địa phương này nữa và thử lại. ',
     'assoc_child_loc'	 => 'Địa phương này hiện tại là cấp parent của ít nhật một địa phương con và không thể xóa. Xin vui lòng cập nhật địa phương của bạn để không liên kết đến địa phương này và thử lại. ',
     'assigned_assets' => 'Tài sản được giao',
     'current_location' => 'Vị trí hiện tại',
+    'open_map' => 'Open in :map_provider_icon Maps',
 
 
     'create' => array(
@@ -20,6 +21,11 @@ return array(
         'success' => 'Địa phương đã cập nhật thành công.'
     ),
 
+    'restore' => array(
+        'error'   => 'Location was not restored, please try again',
+        'success' => 'Location restored successfully.'
+    ),
+
     'delete' => array(
         'confirm'   	=> 'Bạn có chắc muốn xóa địa phương này?',
         'error'   => 'Có vấn đề xảy ra khi xóa địa phương. Xin vui lòng thử lại.',
diff --git a/resources/lang/vi-VN/admin/locations/table.php b/resources/lang/vi-VN/admin/locations/table.php
index 2dfcc6f15f..8604a03f86 100644
--- a/resources/lang/vi-VN/admin/locations/table.php
+++ b/resources/lang/vi-VN/admin/locations/table.php
@@ -39,4 +39,5 @@ return [
     'signed_by_finance_auditor' => 'Được ký bởi (Quản lý tài chính):',
     'signed_by_location_manager' => 'Được ký bởi (Quản lý khu vực):',
     'signed_by'                 => 'Được ký bởi:',
+    'clone'  					=> '',
 ];
diff --git a/resources/lang/vi-VN/admin/models/general.php b/resources/lang/vi-VN/admin/models/general.php
index a9a9a343b4..9b011e3614 100644
--- a/resources/lang/vi-VN/admin/models/general.php
+++ b/resources/lang/vi-VN/admin/models/general.php
@@ -3,7 +3,7 @@
 return array(
     'about_models_title'     => 'Giới thiệu về Mô hình Tài sản',
     'about_models_text'           => 'Mô hình Tài sản là một cách để nhóm các tài sản giống nhau. "MBP 2013", "IPhone 6", v.v ...',
-    'deleted'  					        => 'Model này đã bị xóa.',
+    'deleted'  					=> 'Model này đã bị xóa.',
     'bulk_delete'               => 'Xóa hàng loạt Kiểu tài sản',
     'bulk_delete_help'               => 'Sử dụng hộp kiểm bên dưới để xác nhận việc sẽ xóa kiểu tài sản đã lựa chọn. Kiểu tài sản đó có liên kết với tài sản thì sẽ không thể xóa cho đến khi tài sản đó được chuyển đến kiểu tài sản khác.',
     'bulk_delete_warn'          => 'Bạn sắp xóa một model tài sản.|Bạn sắp xóa :model_count model tài sản.',
diff --git a/resources/lang/vi-VN/admin/models/message.php b/resources/lang/vi-VN/admin/models/message.php
index 1232f0363c..09f25acd9f 100644
--- a/resources/lang/vi-VN/admin/models/message.php
+++ b/resources/lang/vi-VN/admin/models/message.php
@@ -7,7 +7,7 @@ return array(
     'no_association' => 'CẢNH BÁO! Model tài sản cho cho thiết bị này không hợp lệ hoặc bị thiếu!',
     'no_association_fix' => 'Điều này sẽ phá vỡ mọi thứ theo những cách kỳ lạ và khủng khiếp. Hãy chỉnh sửa tài sản này ngay bây giờ để gán cho nó một model.',
     'assoc_users'	 => 'Tài sản này hiện tại đang liên kết với ít nhất một hoặc nhiều tài sản và không thể xóa. Xin vui lòng xóa tài sản, và cố gắng thử lại lần nữa. ',
-
+    'invalid_category_type' => 'This category must be an asset category.',
 
     'create' => array(
         'error'   => 'Kiểu tài sản chưa được tạo, xin thử lại.',
diff --git a/resources/lang/vi-VN/admin/reports/general.php b/resources/lang/vi-VN/admin/reports/general.php
index 39fd2e3195..128b666e2a 100644
--- a/resources/lang/vi-VN/admin/reports/general.php
+++ b/resources/lang/vi-VN/admin/reports/general.php
@@ -4,6 +4,7 @@ return [
     'info'   => 'Chọn các tùy chọn bạn muốn cho báo cáo tài sản.',
     'deleted_user' => 'Deleted user',
     'send_reminder' => 'Send reminder',
+    'cannot_send_reminder' => 'User has been deleted or does not have an email address so cannot receive a reminder',
     'reminder_sent' => 'Reminder sent',
     'acceptance_deleted' => 'Acceptance request deleted',
     'acceptance_request' => 'Acceptance request',
@@ -13,5 +14,10 @@ return [
         'user_state' => 'User State',
         'user_country' => 'User Country',
         'user_zip' => 'User Zip'
-    ]
-];
\ No newline at end of file
+    ],
+    'open_saved_template' => 'Open Saved Template',
+    'save_template' =>  'Save Template',
+    'select_a_template' => 'Select a Template',
+    'template_name' => 'Template Name',
+    'update_template' => 'Update Template',
+];
diff --git a/resources/lang/vi-VN/admin/reports/message.php b/resources/lang/vi-VN/admin/reports/message.php
index 43cfce05c2..2800bbdf0b 100644
--- a/resources/lang/vi-VN/admin/reports/message.php
+++ b/resources/lang/vi-VN/admin/reports/message.php
@@ -1,5 +1,16 @@
 <?php
 
-return array(
-    'error'   => 'Bạn phải lựa chọn ít nhất một tùy chọn.'
-);
+return [
+    'about_templates' => 'About Saved Templates',
+    'saving_templates_description' => 'Select your options, then enter the name of your template in the box above and click the \'Save Template\' button. Use the dropdown to select a previously saved template.',
+    'create'  => [
+        'success' => 'Template saved successfully',
+    ],
+    'update' => [
+        'success' => 'Template updated successfully',
+    ],
+    'delete' => [
+        'success' => 'Template deleted',
+        'no_delete_permission' => 'Template does not exist or you do not have permission to delete it.',
+    ],
+];
diff --git a/resources/lang/vi-VN/admin/settings/general.php b/resources/lang/vi-VN/admin/settings/general.php
index b0f174c4c7..ea92b9d415 100644
--- a/resources/lang/vi-VN/admin/settings/general.php
+++ b/resources/lang/vi-VN/admin/settings/general.php
@@ -8,13 +8,13 @@ return [
     'ad_append_domain'          => 'Nối tên miền với trường tên người dùng',
     'ad_append_domain_help'     => 'Người dùng không bắt buộc phải viết "username@domain.local", họ chỉ cần nhập "tên người dùng".',
     'admin_cc_email'            => 'Gửi thêm 1 bản email đến người khác',
-    'admin_cc_email_help'       => 'Nếu bạn muốn gửi email nhận/trả tài sản đến người dùng vào tài khoản email bổ sung, nhập nó ở đây. Nếu không thì để trống trường này.',
+    'admin_cc_email_help'       => 'Send a copy of checkin/checkout emails to this address.',
     'admin_settings'            => 'Admin Settings',
     'is_ad'				        => 'Đây là một máy chủ Active Directory',
     'alerts'                	=> 'Cảnh báo',
     'alert_title'               => 'Update Notification Settings',
     'alert_email'				=> 'Gửi cảnh báo đến',
-    'alert_email_help'    => 'Email addresses or distribution lists you want alerts to be sent to, comma separated',
+    'alert_email_help'          => 'Email addresses or distribution lists you want alerts to be sent to, comma separated.',
     'alerts_enabled'			=> 'Bật Cảnh báo',
     'alert_interval'			=> 'Ngưỡng Cảnh báo Hết hạn (theo ngày)',
     'alert_inv_threshold'		=> 'Ngưỡng thông báo khoảng không quảng cáo',
@@ -31,15 +31,18 @@ return [
     'backups'					=> 'Sao lưu',
     'backups_help'              => 'Tạo, tải xuống, và khôi phục các dữ liệu ',
     'backups_restoring'         => 'Đang khôi phục từ bản sao lưu',
+    'backups_clean' => 'Clean the backed-up database before restore',
+    'backups_clean_helptext' => "This can be useful if you're changing between database versions",
     'backups_upload'            => 'Tải lên bản sao lưu',
     'backups_path'              => 'Những bản sao lưu trên máy chủ được lưu vào <code>:path</code>',
-    'backups_restore_warning'   => 'Use the restore button <small><span class="btn btn-xs btn-warning"><i class="text-white fas fa-retweet" aria-hidden="true"></i></span></small> to restore from a previous backup. (This does not currently work with S3 file storage or Docker.)<br><br>Your <strong>entire :app_name database and any uploaded files will be completely replaced</strong> by what\'s in the backup file.  ',
+    'backups_restore_warning'   => 'Use the restore button <small><span class="btn btn-xs btn-warning"><i class="text-white fas fa-retweet" aria-hidden="true"></i></span></small> to restore from a previous backup. (This does not currently work with S3 file storage or Docker.)<br><br>Your <strong>entire :app_name database and any uploaded files will be completely replaced</strong> by what\'s in the backup file  ',
     'backups_logged_out'         => 'All existing users, including you, will be logged out once your restore is complete.',
     'backups_large'             => 'Các bản sao lưu quá lớn có thể đã hết thời gian khôi phục nhưng vẫn có thể chạy ở dạng lệnh. ',
     'barcode_settings'			=> 'Cài đặt mã vạch',
     'confirm_purge'			    => 'Xác nhận Xóa',
     'confirm_purge_help'		=> 'Nhập văn bản "DELETE" vào hộp bên dưới để xóa các bản ghi đã xóa của bạn. Không thể hoàn tác hành động này và sẽ xóa NGAY LẬP TỨC tất cả các mục và người dùng đã xóa-mềm. (Để an toàn bạn nên tạo một bản sao lưu trước)',
     'custom_css'				=> 'CSS tùy chỉnh',
+    'custom_css_placeholder'	=> 'Add your custom CSS',
     'custom_css_help'			=> 'Nhập bất kỳ CSS tùy chỉnh. Không bao gồm thẻ &lt;style&gt;&lt;/style&gt.',
     'custom_forgot_pass_url'	=> 'Tùy chọn đường dẫn (URL) đặt lại mật khẩu',
     'custom_forgot_pass_url_help'	=> 'Điều này sẽ thay thế mật khẩu bị quên được xây dựng trong URL trên màn hình đăng nhập, hữu ích để trực tiếp người nội bộ hoặc lưu trữ mật khẩu LDAP đặt lại chức năng. Nó có hiệu quả sẽ vô hiệu hóa tính năng mật khẩu người dùng cục bộ bị lãng quên.',
@@ -47,34 +50,34 @@ return [
     'dashboard_message_help'	=> 'Văn bản này sẽ xuất hiện trên các bảng điều khiển cho bất cứ ai với sự cho phép để xem các bảng điều khiển.',
     'default_currency'  		=> 'Tiền tệ mặc định',
     'default_eula_text'			=> 'EULA mặc định',
+    'default_eula_text_placeholder' => 'Add your default EULA text',
     'default_language'			=> 'Ngôn ngữ mặc định',
     'default_eula_help_text'	=> 'Bạn cũng có thể liên kế EULA tùy chỉnh đến danh mục tài sản riêng biệt.',
     'acceptance_note'           => 'Add a note for your decision (Optional)',
     'display_asset_name'        => 'Hiển thị tên tài sản',
     'display_checkout_date'     => 'Hiển thị ngày checkout',
     'display_eol'               => 'Hiển thị EOL ở bảng',
-    'display_qr'                => 'Mã quảng cáo hiển thị',
+    'display_qr'                => 'Display 2D barcode',
     'display_alt_barcode'		=> 'Hiển thị mã vạch 1D',
-    'email_logo'                => 'Email Logo',
     'barcode_type'				=> 'Loại mã vạch 2D',
     'alt_barcode_type'			=> 'Loại mã vạch 1D',
-    'email_logo_size'       => 'Biểu trưng vuông trong email ưa nhìn. ',
     'enabled'                   => 'Bật',
     'eula_settings'				=> 'Cài đặt EULA',
     'eula_markdown'				=> 'Đây là EULA cho phép <a href="https://help.github.com/articles/github-flavored-markdown/">Github flavored markdown</a>.',
+    'empty_row_count'           => 'Field Start Offset (Empty Rows)',
+    'empty_row_count_help'      => 'Fields will begin populating after this many empty rows are skipped at the top of the label.',
     'favicon'                   => 'Favicon',
     'favicon_format'            => 'Các loại tệp được chấp nhận là ico, png và gif. Các định dạng hình ảnh khác có thể không được hỗ trợ trong tất cả các trình duyệt.',
     'favicon_size'          => 'Biểu tượng yêu thích phải là hình ảnh vuông, 16x16 pixel.',
     'footer_text'               => 'Văn bản thêm chân ',
     'footer_text_help'          => 'Văn bản này sẽ xuất hiện trong chân trang bên phải. Liên kết được phép sử dụng <a href="https://help.github.com/articles/github-flavored-markdown/">Github mùi markdown</a>. Ngắt dòng, tiêu đề, hình ảnh, vv có thể dẫn đến kết quả không thể đoán trước.',
+    'footer_text_placeholder'   => 'Optional footer text',
     'general_settings'			=> 'Cài đặt thường',
-    'general_settings_keywords' => 'company support, signature, acceptance, email format, username format, images, per page, thumbnail, eula, gravatar, tos, dashboard, privacy',
     'general_settings_help'     => 'Default EULA and more',
     'generate_backup'			=> 'Tạo Sao lưu',
     'google_workspaces'         => 'Google Workspaces',
     'header_color'              => 'Màu Header',
     'info'                      => 'Các thiết lập này cho phép bạn tùy chỉnh một số khía cạnh của quá trình cài đặt.',
-    'label_logo'                => 'Nhãn Logo',
     'label_logo_size'           => 'Biểu trưng hình vuông ưa nhìn - sẽ được hiển thị ở trên cùng bên phải của mỗi nhãn nội dung. ',
     'laravel'                   => 'Phiên bản Laravel',
     'ldap'                      => 'LDAP',
@@ -94,7 +97,7 @@ return [
     'ldap_login_sync_help'      => 'Này chỉ kiểm tra LDAP có thể đồng bộ một cách chính xác. Nếu truy vấn xác thực LDAP của bạn không đúng, người sử dụng vẫn không thể đăng nhập. BẠN PHẢI LƯU THIẾT ĐẶT CẬP NHẬT LDAP CỦA BẠN ĐẦU TIÊN.',
     'ldap_manager'              => 'Quản lý LDAP',
     'ldap_server'               => 'Máy chủ LDAP',
-    'ldap_server_help'          => 'Điều này sẽ bắt đầu với ldap: // (cho không mã hóa hoặc TLS) hoặc ldaps: // (cho SSL)',
+    'ldap_server_help'          => 'This should start with ldap:// (for unencrypted) or ldaps:// (for TLS or SSL)',
     'ldap_server_cert'			=> 'Xác thực giấy chứng nhận LDAP SSL',
     'ldap_server_cert_ignore'	=> 'Cho phép Chứng chỉ SSL không hợp lệ',
     'ldap_server_cert_help'		=> 'Chọn hộp kiểm này nếu bạn đang sử dụng chứng chỉ SSL ký tự và muốn chấp nhận chứng chỉ SSL không hợp lệ.',
@@ -108,8 +111,8 @@ return [
     'ldap_pword'                => 'LDAP Bind Password',
     'ldap_basedn'               => 'Base Bind DN',
     'ldap_filter'               => 'Bộ lọc LDAP',
-    'ldap_pw_sync'              => 'Đồng bộ hóa mật khẩu LDAP',
-    'ldap_pw_sync_help'         => 'Bỏ chọn hộp này nếu bạn không muốn giữ mật khẩu LDAP được đồng bộ với mật khẩu cục bộ. Tắt tính năng này có nghĩa là người dùng của bạn không thể đăng nhập nếu máy chủ LDAP của bạn không thể truy cập được vì một số lý do.',
+    'ldap_pw_sync'              => 'Cache LDAP Passwords',
+    'ldap_pw_sync_help'         => 'Uncheck this box if you do not wish to keep LDAP passwords cached as local hashed passwords. Disabling this means that your users may not be able to login if your LDAP server is unreachable for some reason.',
     'ldap_username_field'       => 'Trường tên người dùng',
     'ldap_lname_field'          => 'Họ',
     'ldap_fname_field'          => 'Tên LDAP',
@@ -117,13 +120,15 @@ return [
     'ldap_version'              => 'Phiên bản LDAP',
     'ldap_active_flag'          => 'LDAP Active Flag',
     'ldap_activated_flag_help'  => 'This value is used to determine whether a synced user can login to Snipe-IT. <strong>It does not affect the ability to check items in or out to them</strong>, and should be the <strong>attribute name</strong> within your AD/LDAP, <strong>not the value</strong>. <br><br>If this field is set to a field name that does not exist in your AD/LDAP, or the value in the AD/LDAP field is set to <code>0</code> or <code>false</code>, <strong>user login will be disabled</strong>. If the value in the AD/LDAP field is set to <code>1</code> or <code>true</code> or <em>any other text</em> means the user can log in. When the field is blank in your AD, we respect the <code>userAccountControl</code> attribute, which usually allows non-suspended users to log in.',
+    'ldap_invert_active_flag'   => 'LDAP Invert Active Flag',
+    'ldap_invert_active_flag_help'     => 'If enabled: when the value returned by LDAP Active Flag is <code>0</code> or <code>false</code> the user account will be active.',
     'ldap_emp_num'              => 'Số nhân viên LDAP',
     'ldap_email'                => 'Email LDAP',
     'ldap_test'                 => 'Kiểm tra LDAP',
     'ldap_test_sync'            => 'Kiểm tra đồng bộ LDAP',
     'license'                   => 'Bản quyền phần mềm',
-    'load_remote'               => 'Use Gravatar',
-    'load_remote_help_text'		=> 'Uncheck this box if your install cannot load scripts from the outside internet. This will prevent Snipe-IT from trying load images from Gravatar.',
+    'load_remote'               => 'Load Remote Avatars',
+    'load_remote_help_text'		=> 'Uncheck this box if your install cannot load scripts from the outside internet. This will prevent Snipe-IT from trying load avatars from Gravatar or other outside sources.',
     'login'                     => 'Login Attempts',
     'login_attempt'             => 'Login Attempt',
     'login_ip'                  => 'Địa chỉ IP',
@@ -131,6 +136,7 @@ return [
     'login_user_agent'          => 'User Agent',
     'login_help'                => 'List of attempted logins',
     'login_note'                => 'Lưu ý đăng nhập',
+    'login_note_placeholder'            => "If you do not have a login or have found a device belonging to this company, please call technical support at 888-555-1212. Thank you.",
     'login_note_help'           => 'Tùy chọn bao gồm một vài câu trên màn hình đăng nhập của bạn, ví dụ để hỗ trợ những người đã tìm thấy thiết bị bị mất hoặc bị đánh cắp. Trường này chấp nhận <a href="https://help.github.com/articles/github-flavored-markdown/">Bài nhãn hiệu có hương vị cố định</a>',
     'login_remote_user_text'    => 'Tùy chọn đăng nhập người dùng từ xa',
     'login_remote_user_enabled_text' => 'Cho phép đăng nhập với người dùng từ xa',
@@ -146,13 +152,16 @@ return [
     'logo_print_assets_help'    => 'Sử dụng nhãn hiệu trên danh sách tài sản ',
     'full_multiple_companies_support_help_text' => 'Hạn chế người dùng (kể cả quản trị viên) được giao cho các công ty vào tài sản của công ty họ.',
     'full_multiple_companies_support_text' => 'Hỗ trợ nhiều công ty',
+    'scope_locations_fmcs_support_text'  => 'Scope Locations with Full Multiple Companies Support',
+    'scope_locations_fmcs_support_help_text'  => 'Restrict locations to their selected company.',
+    'scope_locations_fmcs_check_button' => 'Check Compatibility',
+    'scope_locations_fmcs_support_disabled_text'  => 'This option is disabled because you have conflicting locations set for :count or more items.',
     'show_in_model_list'   => 'Hiển thị kiểu thả xuống',
     'optional'					=> 'tùy ý',
     'per_page'                  => 'Kết quả trên trang',
     'php'                       => 'Phiên bản PHP',
-    'php_info'                  => 'Thông tin PHP',
+    'php_info'                  => 'PHP info',
     'php_overview'              => 'PHP',
-    'php_overview_keywords'     => 'phpinfo, system, info',
     'php_overview_help'         => 'Thông tin Hệ thống PHP',
     'php_gd_info'               => 'Bạn phải cài đặt php-gd để hiển thị QR codes, xem cấu trúc cài đặt.',
     'php_gd_warning'            => 'PHP Image Processing và GD plugin thì CHƯA cài đặt.',
@@ -218,6 +227,8 @@ return [
     'webhook_integration_help'    => ':app integration is optional, however the endpoint and channel are required if you wish to use it. To configure :app integration, you must first <a href=":webhook_link" target="_new" rel="noopener">create an incoming webhook</a> on your :app account. Click on the <strong>Test :app Integration</strong> button to confirm your settings are correct before saving. ',
     'webhook_integration_help_button'    => 'Once you have saved your :app information, a test button will appear.',
     'webhook_test_help'           => 'Test whether your :app integration is configured correctly. YOU MUST SAVE YOUR UPDATED :app SETTINGS FIRST.',
+    'shortcuts_enabled'         => 'Enable Shortcuts',
+    'shortcuts_help_text'       => '<strong>Windows</strong>: Alt + Access key, <strong>Mac</strong>: Control + Option + Access key',
     'snipe_version'  			=> 'Phiên bản Snipe-IT',
     'support_footer'            => 'Hỗ trợ liên kết ở chân trang ',
     'support_footer_help'       => 'Chỉ định ai nhìn thấy các liên kết đến Thông tin người dùng và Hướng dẫn sử dụng Snipe-IT',
@@ -227,7 +238,6 @@ return [
     'update'                    => 'Cập nhật cài đặt',
     'value'                     => 'Giá trị',
     'brand'                     => 'Xây dựng thương hiệu',
-    'brand_keywords'            => 'footer, logo, print, theme, skin, header, colors, color, css',
     'brand_help'                => 'Logo, Tên Website',
     'web_brand'                 => 'Loại Thương Hiệu Web',
     'about_settings_title'      => 'Giới thiệu Cài đặt',
@@ -276,6 +286,8 @@ return [
     'two_factor_enrollment_text'	=> "Yêu cầu xác thực hai yếu tố, tuy nhiên thiết bị của bạn chưa được đăng ký. Mở ứng dụng Google Authenticator của bạn và quét mã QR dưới đây để đăng ký thiết bị của bạn. Khi bạn đã đăng ký thiết bị của mình, hãy nhập mã dưới đây",
     'require_accept_signature'      => 'Yêu cầu Chữ ký',
     'require_accept_signature_help_text'      => 'Bật tính năng này sẽ yêu cầu người dùng đăng ký về việc chấp nhận nội dung.',
+    'require_checkinout_notes'  => 'Require Notes on Checkin/Checkout',
+    'require_checkinout_notes_help_text'    => 'Enabling this feature will require the note fields to be populated when checking in or checking out an asset.',
     'left'        => 'trái',
     'right'        => 'đúng',
     'top'        => 'hàng đầu',
@@ -313,24 +325,24 @@ return [
     'filter_by_keyword' => 'Filter by setting keyword',
     'security' => 'Security',
     'security_title' => 'Update Security Settings',
-    'security_keywords' => 'password, passwords, requirements, two factor, two-factor, common passwords, remote login, logout, authentication',
     'security_help' => 'Two-factor, Password Restrictions',
-    'groups_keywords' => 'permissions, permission groups, authorization',
     'groups_help' => 'Account permission groups',
     'localization' => 'Quốc gia',
     'localization_title' => 'Update Localization Settings',
-    'localization_keywords' => 'localization, currency, local, locale, time zone, timezone, international, internatinalization, language, languages, translation',
     'localization_help' => 'Language, date display',
     'notifications' => 'Notifications',
     'notifications_help' => 'Email Alerts & Audit Settings',
     'asset_tags_help' => 'Incrementing and prefixes',
     'labels' => 'Nhãn',
     'labels_title' => 'Update Label Settings',
-    'labels_help' => 'Label sizes &amp; settings',
-    'purge_keywords' => 'xóa vĩnh viễn',
+    'labels_help' => 'Barcodes &amp; label settings',
     'purge_help' => 'Xóa các bản ghi đã xóa',
     'ldap_extension_warning' => 'It does not look like the LDAP extension is installed or enabled on this server. You can still save your settings, but you will need to enable the LDAP extension for PHP before LDAP syncing or login will work.',
     'ldap_ad' => 'LDAP/AD',
+    'ldap_test_label' => 'Test LDAP Sync',
+    'ldap_test_login' => ' Test LDAP Login',
+    'ldap_username_placeholder' => 'LDAP Username',
+    'ldap_password_placeholder' => 'LDAP Password',
     'employee_number' => 'Mã số nhân viên',
     'create_admin_user' => 'Tạo người dùng ::',
     'create_admin_success' => 'Success! Your admin user has been added!',
@@ -342,6 +354,8 @@ return [
     'setup_migration_create_user' => 'Next: Create User',
     'ldap_settings_link' => 'LDAP Settings Page',
     'slack_test' => 'Test <i class="fab fa-slack"></i> Integration',
+    'status_label_name' => 'Status Label Name',
+    'super_admin_only'  => 'Super Admin Only',
     'label2_enable'           => 'New Label Engine',
     'label2_enable_help'      => 'Switch to the new label engine. <b>Note: You will need to save this setting before setting others.</b>',
     'label2_template'         => 'Template',
@@ -356,12 +370,15 @@ return [
     'label2_2d_type'          => 'Loại mã vạch 2D',
     'label2_2d_type_help'     => 'Format for 2D barcodes',
     'label2_2d_target'        => '2D Barcode Target',
-    'label2_2d_target_help'   => 'The URL the 2D barcode points to when scanned',
+    'label2_2d_target_help'   => 'The data that will be contained in the 2D barcode',
     'label2_fields'           => 'Field Definitions',
     'label2_fields_help'      => 'Fields can be added, removed, and reordered in the left column. For each field, multiple options for Label and DataSource can be added, removed, and reordered in the right column.',
+    'purge_barcodes' => 'Purge Barcodes',
     'help_asterisk_bold'    => 'Text entered as <code>**text**</code> will be displayed as bold',
     'help_blank_to_use'     => 'Leave blank to use the value from <code>:setting_name</code>',
     'help_default_will_use' => '<code>:default</code> will use the value from <code>:setting_name</code>. <br>Note that the value of the barcodes must comply with the respective barcode spec in order to be successfully generated. Please see <a href="https://snipe-it.readme.io/docs/barcodes">the documentation <i class="fa fa-external-link"></i></a> for more details. ',
+    'asset_id'              => 'Asset ID',
+    'data'               => 'Data',
     'default'               => 'Default',
     'none'                  => 'None',
     'google_callback_help' => 'This should be entered as the callback URL in your Google OAuth app settings in your organization&apos;s <strong><a href="https://console.cloud.google.com/" target="_blank">Google developer console <i class="fa fa-external-link" aria-hidden="true"></i></a></strong>.',
@@ -373,7 +390,100 @@ return [
     'database_driver' => 'Database Driver',
     'bs_table_storage' => 'Table Storage',
     'timezone' => 'Timezone',
+    'test_mail' => 'Test Mail',
     'profile_edit'          => 'Edit Profile',
     'profile_edit_help'          => 'Allow users to edit their own profiles.',
+    'default_avatar' => 'Custom Default Avatar',
+    'default_avatar_help' => 'This image will be displayed as a profile if a user does not have a profile photo.',
+    'restore_default_avatar' => 'Restore <a href=":default_avatar" data-toggle="lightbox" data-type="image">original system default avatar</a>',
+    'restore_default_avatar_help' => '',
+    'due_checkin_days' => 'Due For Checkin Warning',
+    'due_checkin_days_help' => 'How many days before the expected checkin of an asset should it be listed in the "Due for checkin" page?',
+    'no_groups' => 'No groups have been created yet. Visit <code>Admin Settings > Permission Groups</code> to add one.',
+    'text' => 'Text',
+
+    'username_formats' => [
+        'username_format'		=> 'Định dạng Tên người dùng',
+        'firstname_lastname_format'	=> 'Họ Tên Họ (jane.smith)',
+        'first_name_format'	        => 'First Name (jane)',
+        'last_name_format'		=> 'Last Name (doe)',
+        'filastname_format'			=> 'First Initial Last Name (jsmith)',
+        'lastnamefirstinitial_format' =>  'Last Name First Initial (smithj)',
+        'firstname_lastname_underscore_format' => 'First Name Last Name (jane_smith)',
+        'firstinitial.lastname' => 'First Initial Last Name (j.smith)',
+        'lastname_firstinitial' => 'Last Name First Initial (smith_j)',
+        'lastname_dot_firstinitial_format' => 'Last Name First Initial (smith.j)',
+        'firstnamelastname'     => 'First Name Last Name (janesmith)',
+        'firstnamelastinitial'  => 'First Name Last Initial (janes)',
+        'lastnamefirstname'      => 'Last Name.First Name (smith.jane)',
+    ],
+
+    'email_formats' => [
+        'email_format'			=> 'Định dạng Email',
+        'firstname_lastname_format'	=> 'Họ Tên Họ (jane.smith@example.com)',
+        'first_name_format'		=> 'Tên (jane@example.com)',
+        'last_name_format'		=> 'Last Name (doe@example.com)',
+        'filastname_format'			=> 'Tên Họ Tên Đầu tiên (jsmith@example.com)',
+        'lastnamefirstinitial_format' =>  'Tên của bạn (smithj@example.com)',
+        'firstname_lastname_underscore_format' => 'Tên họ (jane_smith@example.com)',
+        'firstinitial.lastname' => 'Tên trước Họ sau (j.smith@example.com)',
+        'lastname_firstinitial' => 'Họ trước Tên sau (smith_j@example.com)',
+        'lastname_dot_firstinitial_format' => 'Last Name First Initial (smith.j@example.com)',
+        'firstnamelastname'     => 'Tên Họ (jane_smith@example.com)',
+        'firstnamelastinitial'  => 'Tên Họ Viết tắt (janes@example.com)',
+        'lastnamefirstname'      => 'Last Name.First Name (smith.jane@example.com)',
+    ],
+
+
+
+    'logo_labels' => [
+        'acceptance_pdf_logo'       => 'PDF Logo',
+        'email_logo'                => 'Email Logo',
+        'label_logo'                => 'Nhãn Logo',
+        'logo'                      => 'Site Logo',
+        'favicon'                   => 'Favicon',
+    ],
+
+    'logo_help' => [
+        'email_logo_size'       => 'Biểu trưng vuông trong email ưa nhìn. ',
+    ],
+
+    'logo_option_types' => [
+        'text' => 'Text',
+        'logo' => 'Logo',
+        'logo_and_text' => 'Logo and Text',
+    ],
+
+
+    'legends' => [
+        'scoping' => 'Scoping',
+        'formats' => 'Default Formats',
+        'profiles' => 'User Profiles',
+        'eula' => 'EULA & Acceptance Preferences',
+        'misc_display' => 'Miscellaneous Display Options',
+        'email' => 'Email Preferences',
+        'checkin' => 'Checkin Preferences',
+        'dashboard' => 'Login & Dashboard Preferences',
+        'misc' => 'Miscellaneous',
+        'logos' => 'Logos & Display',
+        'colors' => 'Colors & Skins',
+        'footer' => 'Footer Preferences',
+        'security' => 'Security Preferences',
+        'general' => 'General',
+        'intervals' => 'Intervals & Thresholds',
+    ],
+
+
+    /* Keywords for settings overview help */
+    'keywords' => [
+        'brand'             => 'footer, logo, print, theme, skin, header, colors, color, css',
+        'general_settings'  => 'company support, signature, acceptance, email format, username format, images, per page, thumbnail, eula, gravatar, tos, dashboard, privacy',
+        'groups'            => 'permissions, permission groups, authorization',
+        'labels'            => 'labels, barcodes, barcode, sheets, print, upc, qr, 1d, 2d',
+        'localization'      => 'localization, currency, local, locale, time zone, timezone, international, internatinalization, language, languages, translation',
+        'php_overview'      => 'phpinfo, system, info',
+        'purge'             => 'xóa vĩnh viễn',
+        'security'          => 'password, passwords, requirements, two factor, two-factor, common passwords, remote login, logout, authentication',
+    ],
 
 ];
diff --git a/resources/lang/vi-VN/admin/settings/message.php b/resources/lang/vi-VN/admin/settings/message.php
index 4bfae166fe..1cf9c748df 100644
--- a/resources/lang/vi-VN/admin/settings/message.php
+++ b/resources/lang/vi-VN/admin/settings/message.php
@@ -14,6 +14,9 @@ return [
         'restore_warning'       => 'Yes, restore it. I acknowledge that this will overwrite any existing data currently in the database. This will also log out all of your existing users (including you).',
         'restore_confirm'       => 'Are you sure you wish to restore your database from :filename?'
     ],
+    'restore' => [
+        'success'               => 'Your system backup has been restored. Please log in again.'
+    ],
     'purge' => [
         'error'     => 'Đã xảy ra lỗi trong khi xóa.',
         'validation_failed'     => 'Xác nhận thanh lọc của bạn không chính xác. Vui lòng nhập từ "DELETE" vào hộp xác nhận.',
@@ -33,6 +36,9 @@ return [
         'testing_authentication' => 'Testing LDAP Authentication...',
         'authentication_success' => 'User authenticated against LDAP successfully!'
     ],
+    'labels' => [
+        'null_template' => 'Label template not found. Please select a template.',
+        ],
     'webhook' => [
         'sending' => 'Sending :app test message...',
         'success' => 'Your :webhook_name Integration works!',
@@ -42,5 +48,12 @@ return [
         'error' => 'Something went wrong. :app responded with: :error_message',
         'error_redirect' => 'ERROR: 301/302 :endpoint returns a redirect. For security reasons, we don’t follow redirects. Please use the actual endpoint.',
         'error_misc' => 'Đã xảy ra lỗi. :( ',
-    ]
+        'webhook_fail' => ' webhook notification failed: Check to make sure the URL is still valid.',
+        'webhook_channel_not_found' => ' webhook channel not found.',
+        'ms_teams_deprecation' => 'The selected Microsoft Teams webhook URL will be deprecated Dec 31st, 2025. Please use a workflow URL. Microsoft\'s documentation on creating a workflow can be found <a href="https://support.microsoft.com/en-us/office/create-incoming-webhooks-with-workflows-for-microsoft-teams-8ae491c7-0394-4861-ba59-055e33f75498" target="_blank"> here.</a>',
+    ],
+    'location_scoping' => [
+        'not_saved' => 'Your settings were not saved.',
+        'mismatch' => 'There is 1 item in the database that need your attention before you can enable location scoping.|There are :count items in the database that need your attention before you can enable location scoping.',
+    ],
 ];
diff --git a/resources/lang/vi-VN/admin/statuslabels/table.php b/resources/lang/vi-VN/admin/statuslabels/table.php
index 06d0ac45ab..b53b8f564c 100644
--- a/resources/lang/vi-VN/admin/statuslabels/table.php
+++ b/resources/lang/vi-VN/admin/statuslabels/table.php
@@ -1,14 +1,14 @@
 <?php
 
 return array(
-    'about'      	=> 'Về tình trạng nhãn',
+    'about'      	=> 'About Status Types',
     'archived'      	=> 'Đã lưu trữ',
     'create'      	=> 'Tạo tình trạng nhãn',
     'color'      	=> 'Màu đồ thị',
     'default_label' => 'Nhãn mặc định',
     'default_label_help' => 'Điều này được sử dụng để đảm bảo thông dụng nhất của tình trạng nhãn xuất hiện ở phía trên hộp chọn khi tạo/chỉnh sửa tài sản.',
     'deployable'      	=> 'Cho phép cấp phát',
-    'info'      	=> 'Status labels are used to describe the various states your assets could be in. They may be out for repair, lost/stolen, etc. You can create new status labels for deployable, pending and archived assets.',
+    'info'      	=> 'Status label types are used to describe the various states your assets could be in. They may be out for repair, lost/stolen, etc. You can create new status labels for your deployable, pending and archived assets according to your own workflow. For more information, <a href="https://snipe-it.readme.io/docs/overview#status-labels" target="_blank">see the documentation <i class="fa fa-external-link"></i></a>.',
     'name'      	=> 'Tên tình trạng',
     'pending'      	=> 'Đang chờ',
     'status_type'   => 'Loại tình trạng',
diff --git a/resources/lang/vi-VN/admin/users/general.php b/resources/lang/vi-VN/admin/users/general.php
index 0a29cc6a40..e4f04d931a 100644
--- a/resources/lang/vi-VN/admin/users/general.php
+++ b/resources/lang/vi-VN/admin/users/general.php
@@ -19,6 +19,8 @@ return [
     'print_assigned'    => 'In tất cả tài sản đã cấp phát',
     'email_assigned'    => 'Danh sách email của tất cả được chỉ định',
     'user_notified'     => 'Người dùng đã được gửi qua email danh sách các thiết bị hiện được chỉ định của họ.',
+    'users_notified'    => 'The user has been emailed a list of their currently assigned items.|:count users have been emailed a list of their currently assigned items.',
+    'users_notified_warning' => ':count user has been emailed a list of their currently assigned items, however :no_email users did not have an email address so could not be emailed.|:count users have been emailed a list of their currently assigned items, however :no_email user(s) did not have an email address so could not be emailed.',
     'auto_assign_label' => 'Bao gồm người dùng này khi giấy phép đủ điều kiện tự động chỉ định',
     'auto_assign_help'  => 'Bỏ qua người dùng này trong chế độ tự động chỉ định giấy phép',
     'software_user'     => 'Phần mềm đã được checkout đến :name',
diff --git a/resources/lang/vi-VN/admin/users/message.php b/resources/lang/vi-VN/admin/users/message.php
index b732fcc99e..770d4df626 100644
--- a/resources/lang/vi-VN/admin/users/message.php
+++ b/resources/lang/vi-VN/admin/users/message.php
@@ -6,7 +6,7 @@ return array(
     'declined'                  => 'Bạn đã từ chối tài sản này thành công.',
     'bulk_manager_warn'	        => 'Người dùng của bạn đã được cập nhật thành công, tuy nhiên mục nhập của người quản lý của bạn không được lưu bởi vì người quản lý bạn đã chọn cũng nằm trong danh sách người dùng cần chỉnh sửa, và người dùng không phải là người quản lý của họ. Vui lòng chọn người dùng của bạn một lần nữa, ngoại trừ người quản lý.',
     'user_exists'               => 'Người dùng thật sự tồn tại!',
-    'user_not_found'            => 'Người dùng không tồn tại.',
+    'user_not_found'            => 'User does not exist or you do not have permission view them.',
     'user_login_required'       => 'Trường đăng nhập thì bắt buộc',
     'user_has_no_assets_assigned' => 'Hiện không có tài sản nào được gán cho người dùng.',
     'user_password_required'    => 'Mật khẩu thì bắt buộc.',
@@ -53,6 +53,7 @@ return array(
         'ldap_could_not_search' => 'Không thể tìm thấy máy chủ LDAP. Xin vui lòng kiểm tra cấu hình cài đặt máy chủ LDAP của bạn ở trong tập tin cấu hình LDAP. <br>Lỗi từ máy chủ LDAP:',
         'ldap_could_not_get_entries' => 'Không thể lấy các mục từ máy chủ LDAP. Xin vui lòng kiểm tra lại cấu hình máy chủ LDAP của bạn ở trong tập tin cấu hình LDAP. <br>Lỗi từ máy chủ LDAP:',
         'password_ldap' => 'Mật khẩu cho tài khoản này được quản lý bởi LDAP / Active Directory. Vui lòng liên hệ với bộ phận CNTT của bạn để thay đổi mật khẩu.',
+        'multi_company_items_assigned' => 'This user has items assigned that belong to a different company. Please check them in or edit their company.'
     ),
 
     'deletefile' => array(
diff --git a/resources/lang/vi-VN/admin/users/table.php b/resources/lang/vi-VN/admin/users/table.php
index 53fe969008..00c0db2470 100644
--- a/resources/lang/vi-VN/admin/users/table.php
+++ b/resources/lang/vi-VN/admin/users/table.php
@@ -22,7 +22,7 @@ return array(
     'managed_locations'     => 'Vị trí Quản lý',
     'managed_users'         => 'Quản lý người dùng',
     'name' 					=> 'Tên',
-    'nogroup'               => 'No groups have been created yet. To add one, visit: ',
+    'nogroup'               => 'No groups have been created yet. To add one, visit:',
     'notes'                 => 'Ghi chú',
     'password_confirm' 		=> 'Xác nhận mật khẩu',
     'password' 				=> 'Mật khẩu',
diff --git a/resources/lang/vi-VN/auth.php b/resources/lang/vi-VN/auth.php
index 48c1e11260..71344c7886 100644
--- a/resources/lang/vi-VN/auth.php
+++ b/resources/lang/vi-VN/auth.php
@@ -15,6 +15,6 @@ return array(
 
     'failed' => 'Thông tin tài khoản không tìm thấy trong hệ thống.',
     'password' => 'Mật khẩu được cung cấp không chính xác.',
-    'throttle' => 'Quá nhiều lần thử đăng nhập. Vui lòng thử lại sau :second giây.',
+    'throttle' => 'Too many login attempts. Please try again in :minutes minute(s).',
 
 );
diff --git a/resources/lang/vi-VN/auth/message.php b/resources/lang/vi-VN/auth/message.php
index 6427a9dec2..a8e2382e31 100644
--- a/resources/lang/vi-VN/auth/message.php
+++ b/resources/lang/vi-VN/auth/message.php
@@ -6,8 +6,6 @@ return array(
     'account_not_found'      => 'Tên đăng nhập hoặc mật khẩu không đúng.',
     'account_not_activated'  => 'Tài khoản người dùng này chưa được kích hoạt.',
     'account_suspended'      => 'Tài khoản người dùng này đã bị tạm ngưng.',
-    'account_banned'         => 'Tài khoản người dùng này đã bị cấm.',
-    'throttle'               => 'Quá nhiều lần đăng nhập thất bại. Vui lòng thử lại trong khoảng :minutes phút.',
 
     'two_factor' => array(
         'already_enrolled'      => 'Thiết bị của bạn đã được ghi danh.',
diff --git a/resources/lang/vi-VN/button.php b/resources/lang/vi-VN/button.php
index 2a86c6b240..d1c6f10345 100644
--- a/resources/lang/vi-VN/button.php
+++ b/resources/lang/vi-VN/button.php
@@ -7,6 +7,7 @@ return [
     'checkin_and_delete'  	    => 'Checkin All / Delete User',
     'delete'  	                => 'Xóa',
     'edit'    	                => 'Sửa',
+    'clone'    	                => 'Clone',
     'restore' 	                => 'Khôi phục',
     'remove'                    => 'Xóa',
     'request'                   => 'Yêu cầu',
@@ -21,4 +22,13 @@ return [
     'add_maintenance'           => 'Add Maintenance',
     'append'                    => 'Append',
     'new'                       => 'Mới',
+    'var' => [
+        'clone'     => 'Clone :item_type',
+        'edit'      => 'Edit :item_type',
+        'delete'    => 'Delete :item_type',
+        'restore'   => 'Restore :item_type',
+        'create'    => 'Create New :item_type',
+        'checkout'  => 'Checkout :item_type',
+        'checkin'   => 'Checkin :item_type',
+    ]
 ];
diff --git a/resources/lang/vi-VN/general.php b/resources/lang/vi-VN/general.php
index 7385b52d95..71feca451b 100644
--- a/resources/lang/vi-VN/general.php
+++ b/resources/lang/vi-VN/general.php
@@ -10,9 +10,9 @@ return [
     'action'                => 'Tác vụ',
     'activity_report'		=> 'Activity Report',
     'address'				=> 'Địa chỉ',
-    'admin'					=> 'Quản lý',
-    'admin_tooltip'			=> 'This user has admin privileges',
-    'superuser'				=> 'Superuser',
+    'admin'					=> 'Cài đặt quản trị',
+    'admin_tooltip'			=> 'Người dùng này có quyền quản trị',
+    'superuser'				=> 'Quản trị cao cấp',
     'superuser_tooltip'		=> 'This user has superuser privileges',
     'administrator'			=> 'Quản trị viên',
     'add_seats'             => 'Thêm chỗ ngồi',
@@ -23,13 +23,16 @@ return [
     'asset_models'			=> 'Kiểu tài sản',
     'asset_model'			=> 'Mô hình',
     'asset'					=> 'Tài sản',
+    'asset_previous'        => 'Asset (Previously Assigned)',
     'asset_report'          => 'Báo cáo tài sản',
     'asset_tag'				=> 'Thẻ tài sản',
     'asset_tags'            => 'Tên tài sản',
     'assets_available'		=> 'Tài sản sẵn có',
     'accept_assets'         => 'Chấp nhận tài sản :name',
     'accept_assets_menu'    => 'Chấp nhận tài sản',
+    'accept_item'           => 'Accept Item',
     'audit'				    => 'Kiểm toán',
+    'audits'				=> 'Audits',
     'audit_report'			=> 'Sổ ghi chép đánh giá',
     'assets'				=> 'Tài sản',
     'assets_audited'        => 'tài sản đã được kiểm toán',
@@ -61,9 +64,12 @@ return [
     'changepassword'  		=> 'Đổi mật khẩu',
     'checkin'  				=> 'Checkin',
     'checkin_from'  		=> 'Checkin từ',
+    'checkin_note'  		=> 'Checkin Note',
+    'checkout_note'  		=> 'Checkout Note',
     'checkout'  			=> 'Checkout',
     'checkouts_count'       => 'Thu hồi tài sản',
     'checkins_count'        => 'Đăng ký tài sản',
+    'checkin_and_delete'  	=> 'Checkin and Delete',
     'user_requests_count'   => 'Yêu cầu',
     'city'  				=> 'Thành phố',
     'click_here'			=> 'Bấm vào đây',
@@ -77,7 +83,7 @@ return [
     'consumables'			=> 'Vật tư phụ',
     'country'  				=> 'Nước',
     'could_not_restore'     => 'Khôi phục lỗi :item_type: :Lỗi',
-    'not_deleted'           => 'Các :item_type không bị xóa nên không thể khôi phục được',
+    'not_deleted'           => '',
     'create'				=> 'Tạo mới',
     'created'               => 'Mục đã tạo',
     'created_asset'			=> 'tài sản đã tạo',
@@ -86,11 +92,13 @@ return [
     'record_created' 		=> 'Đã tạo',
     'updated_at' 			=> 'Cập nhật tại',
     'currency'  			=> '$', // this is deprecated
+    'currency_text'  		=> 'Currency', //
     'current'  				=> 'Hiện hành',
     'current_password'      => 'Mật Khẩu Hiện Tại',
     'customize_report'      => 'Điều chỉnh báo cáo',
     'custom_report'         => 'Điều chỉnh báo cáo tài sản',
     'dashboard'				=> 'Bảng điều khiển',
+    'data_source'           => 'Data Source',
     'days'      			=> 'ngày',
     'days_to_next_audit'    => 'Ngày kiểm tra tiếp theo',
     'date'					=> 'Ngày',
@@ -98,7 +106,7 @@ return [
     'debug_warning_text'    => 'Ứng dụng này đang chạy trong chế độ sản xuất với bật gỡ lỗi. Điều này có thể phơi bày dữ liệu nhạy cảm nếu ứng dụng của bạn có thể tiếp cận được với thế giới bên ngoài. Tắt chế độ gỡ lỗi bằng cách đặt giá trị <code>APP_DEBUG</code> trong tệp <code>.env</code> của bạn thành <code>false</code>.',
     'delete'  				=> 'Xóa',
     'delete_confirm'  		=> 'Bạn có chắc chắn muốn xoá trường này không?',
-    'delete_confirm_no_undo' => 'Bạn có chắc chắn muốn xoá :item? Xoá xong là không thể phục hồi nhé.',
+    'delete_confirm_no_undo' => 'Are you sure, you wish to delete :item? This cannot be undone.',
     'deleted'  				=> 'Đã xóa',
     'delete_seats'  		=> 'Ghế đã Xóa',
     'deletion_failed'       => 'Xoá không được',
@@ -114,29 +122,13 @@ return [
     'editprofile'  			=> 'Chỉnh sửa hồ sơ của bạn',
     'eol'					=> 'EOL',
     'email_domain'			=> 'Tên miền email',
-    'email_format'			=> 'Định dạng Email',
     'employee_number'       => 'Mã số nhân viên',
     'email_domain_help'		=> 'Địa chỉ này được sử dụng để tạo địa chỉ email khi nhập',
     'error'				    => 'Lỗi',
     'exclude_archived'      => 'Loại trừ tài sản đã lưu trữ',
     'exclude_deleted'       => 'Loại trừ các tài sản đã xóa',
     'example'				=> ' Ví dụ: ',
-    'filastname_format'			=> 'Tên Họ Tên Đầu tiên (jsmith@example.com)',
-    'firstname_lastname_format'	=> 'Họ Tên Họ (jane.smith@example.com)',
-    'firstname_lastname_underscore_format' => 'Tên họ (jane_smith@example.com)',
-    'lastnamefirstinitial_format' =>  'Tên của bạn (smithj@example.com)',
-    'firstintial_dot_lastname_format' => 'Ký tự đầu Tên Họ (jsmith@example.com)',
-    'firstname_lastname_display'	=> 'Tên Họ (jane_smith)',
-    'lastname_firstname_display'	=> 'Họ và tên (Smith Jane)',
-    'name_display_format'	=> 'Định dạng hiển thị tên',
-    'first'					=> 'Đầu tiên',
-    'firstnamelastname'     => 'Tên Họ (jane_smith@example.com)',
-    'lastname_firstinitial' => 'Họ trước Tên sau (smith_j@example.com)',
-    'firstinitial.lastname' => 'Tên trước Họ sau (j.smith@example.com)',
-    'firstnamelastinitial'  => 'Tên Họ Viết tắt (janes@example.com)',
-    'lastnamefirstname'      => 'Last Name First Name (smith.jane@example.com)',
-    'first_name'			=> 'Họ và tên đệm',
-    'first_name_format'		=> 'Tên (jane@example.com)',
+
     'files'                 => 'Các tập tin',
     'file_name'				=> 'Tập tin',
     'file_type'             => 'Kiểu của tập tin',
@@ -156,9 +148,9 @@ return [
     'image_delete'         	=> 'Xóa hình',
     'include_deleted'       => 'Bao gồm các tài sản đã xóa',
     'image_upload'         	=> 'Tải hình',
-    'filetypes_accepted_help'    => 'Các loại tệp được chấp nhận là :types. Kích thước tải lên tối đa được cho phép là :size.|Các loại tệp được chấp nhận là :types. Kích thước tải lên tối đa được cho phép là :size.',
-    'filetypes_size_help'   => 'Dung lượng tải lên tối đa cho phép.',
-    'image_filetypes_help'  => 'Accepted filetypes are jpg, webp, png, gif, svg, and avif. Max upload size allowed is :size.',
+    'filetypes_accepted_help'    => 'Accepted filetype is :types. The maximum size allowed is :size.|Accepted filetypes are :types. The maximum upload size allowed is :size.',
+    'filetypes_size_help'   => 'The maximum upload size allowed is :size.',
+    'image_filetypes_help'  => 'Accepted Filetypes are jpg, webp, png, gif, svg, and avif. The maximum upload size allowed is :size.',
     'unaccepted_image_type'  => 'Tập tin hình ảnh không thể đọc được. Chỉ chấp nhận các kiểu tập tin là jpg, webp, png, gif, và svg.',
     'import'         	    => 'Nhập',
     'import_this_file'      => 'Các trường bản đồ và quá trình xử lý tệp này',
@@ -178,12 +170,17 @@ return [
     'last'					=> 'Cuối',
     'last_login'            => 'Lân đăng nhập cuôi',
     'last_name'             => 'Tên',
+    'firstname_lastname_display'	=> 'Tên Họ (jane_smith)',
+    'lastname_firstname_display'	=> 'Họ và tên (Smith Jane)',
+    'name_display_format'	=> 'Định dạng hiển thị tên',
+    'first'					=> 'Đầu tiên',
+    'first_name'			=> 'Họ và tên đệm',
     'license'				=> 'Bản quyền',
     'license_report'        => 'Báo cáo bản quyền',
     'licenses_available'	=> 'Giấy phép có sẵn',
     'licenses'				=> 'Bản quyền',
     'list_all'				=> 'Tất cả',
-    'loading'				=> 'Đang tải..., vui lòng chờ....',
+    'loading'				=> 'Đang tải..., vui lòng chờ...',
     'lock_passwords'        => 'Giá trị trường này sẽ không được lưu trong cài đặt demo.',
     'feature_disabled'      => 'Tính năng này đã bị vô hiệu hóa để cài đặt bản demo.',
     'location'              => 'Địa phương',
@@ -193,7 +190,7 @@ return [
     'logout'				=> 'Thoát',
     'lookup_by_tag'     => 'Tra cứu theo Thẻ nội dung',
     'maintenances'          => 'Bảo trì',
-    'manage_api_keys'       => 'Quản lý khóa API',
+    'manage_api_keys'       => 'Quản lý API key',
     'manufacturer'			=> 'Nhà sản xuất',
     'manufacturers'			=> 'Nhà sản xuất',
     'markdown'				=> 'Trường này cho phép đánh dấu <a href="https://help.github.com/articles/github-flavored-markdown/">Github mùi vị</a>.',
@@ -206,7 +203,7 @@ return [
     'new_password'          => 'Mật khẩu mới',
     'next'					=> 'Tiếp',
     'next_audit_date'		=> 'Ngày kiểm toán tiếp theo',
-    'next_audit_date_help'  => 'If you use auditing in your organization, this is usually automatically calculated based on the asset&apos;s last audit date and audit frequency (in <code>Admin Settings &gt; Alerts</code>) and you can leave this blank. You can manually set this date here if you need to, but it must be later than the last audit date. ',
+    'next_audit_date_help'  => 'Nếu bạn sử dụng tính năng kiểm tra trong tổ chức của mình thì thông tin này thường được tính toán tự động dựa trên ngày kiểm tra gần đây nhất và tần suất kiểm tra của nội dung (trong  <code>Admin Settings &gt; Alerts</code>) và bạn có thể để trống phần này. Bạn có thể đặt ngày này theo cách thủ công tại đây nếu cần, nhưng nó phải muộn hơn ngày kiểm tra cuối cùng. ',
     'audit_images_help'     => 'You can find audit images in the asset\'s history tab.',
     'no_email'              => 'Không có địa chỉ email nào được liên kết với người dùng này',
     'last_audit'		    => 'Kiểm toán Lần cuối',
@@ -215,6 +212,14 @@ return [
     'no_results'			=> 'Không có kết quả.',
     'no'  					=> 'No',
     'notes'  				=> 'Ghi chú',
+    'note_added'            => 'Note Added',
+    'options'				=> 'Options',
+    'preview'				=> 'Preview',
+    'add_note'              => 'Add Note',
+    'note_edited'            => 'Note Edited',
+    'edit_note'              => 'Edit Note',
+    'note_deleted'            => 'Note Deleted',
+    'delete_note'              => 'Delete Note',
     'order_number'          => 'Số đơn đặt hàng',
     'only_deleted'          => 'Chỉ những tài sản đã xóa',
     'page_menu'				=> 'Showing _MENU_ items',
@@ -229,7 +234,7 @@ return [
     'purchase_date'         => 'Ngày mua',
     'qty'		            => 'Số lượng',
     'quantity'		        => 'Số lượng',
-    'quantity_minimum'      => 'Bạn có :count các thiết bị dưới hoặc gần dưới mức số lượng tối thiểu',
+    'quantity_minimum'      => 'You have one item below or almost below minimum quantity levels|You have :count items below or almost below minimum quantity levels',
     'quickscan_checkin'  	=> 'Quét nhanh kiểm tra đưa vào',
     'quickscan_checkin_status'  	=> 'Trạng thái kiểm tra đưa vào',
     'ready_to_deploy'		=> 'Sẵn sàng để cấp phát',
@@ -254,7 +259,7 @@ return [
     'select_all'            => 'Chọn tất cả',
     'search'				=> 'Tìm kiếm',
     'select_category'       => 'Chọn một danh mục',
-    'select_datasource' => 'Select a Datasource',
+    'select_datasource' => 'Select a data source',
     'select_department'     => 'Chọn một Phòng',
     'select_depreciation'	=> 'Lựa chọn một Loại Khấu hao',
     'select_location'		=> 'Lựa chọn một Địa phương',
@@ -274,13 +279,15 @@ return [
     'signed_off_by'         => 'Đã ký tắt bởi',
     'skin'       			=> 'Giao diện',
     'webhook_msg_note'        => 'Một thông báo sẽ được gửi qua webhook',
-    'webhook_test_msg'        => 'Ôi trời! Có vẻ như việc tích hợp :app với Snipe-IT của bạn đang hoạt động!',
+    'webhook_test_msg'        => 'Oh hai! It looks like your :app integration with Snipe-IT is working!',
     'some_features_disabled' => 'DEMO MODE: Một số tính năng đã bị vô hiệu cho cài đặt này.',
     'site_name'				=> 'Tên trang web',
     'state'  				=> 'Tỉnh/Thành phố',
     'status_labels'			=> 'Tình trạng nhãn',
+    'status_label'			=> 'Status Label',
     'status'    			=> 'Tình trạng',
     'accept_eula'           => 'Chấp nhận quy định',
+    'show_or_hide_eulas' => 'Show/Hide EULAs',
     'supplier'              => 'Nhà cung cấp',
     'suppliers'  			=> 'Nhà cung cấp',
     'sure_to_delete'        => 'Bạn có chắc chắn muốn xoá',
@@ -296,9 +303,9 @@ return [
     'type'  				=> 'Loại',
     'undeployable'			=> 'Không cho phép cấp phát',
     'unknown_admin'			=> 'Unknown Admin',
-    'username_format'		=> 'Định dạng Tên người dùng',
     'username'              => 'Tên đăng nhập',
     'update'                => 'Cập nhật',
+    'updating_item' => 'Updating :item',
     'upload_filetypes_help'      => 'Cho phép các định dạng png, gif, jpg, jpeg, doc, docx, pdf, xls, xlsx, txt, lic, xml, zip, rtf and rar. Dung lượng tối đa :size.',
     'uploaded'              => 'Đã tải lên',
     'user'					=> 'Người dùng',
@@ -323,10 +330,10 @@ return [
     'token_expired'         => 'Phiên họp mẫu của bạn đã hết hạn. Vui lòng thử lại.',
     'login_enabled'         => 'Cho phép đăng nhập',
     'audit_due'             => 'Hết hạn kiểm toán',
-    'audit_due_days'        => 'Assets Due for Audit Within :days Day|Assets Due for Audit Within :days Days',
+    'audit_due_days'        => '{}Assets Due or Overdue for Audit|[1]Assets Due or Overdue for Audit Within a Day|[2,*]Assets Due or Overdue for Audit Within :days Days',
     'checkin_due'           => 'Due for Checkin',
     'checkin_overdue'       => 'Overdue for Checkin',
-    'checkin_due_days'      => 'Assets Due for Checkin Within :days Day|Assets Due for Checkin Within :days Days',
+    'checkin_due_days'      => '{}Due for Checkin|[1]Assets Due for Checkin Within :days Day|[2,*]Assets Due for Checkin Within :days Days',
     'audit_overdue'         => 'Qúa hạn kiểm toán',
     'accept'                => 'Chấp nhận :asset',
     'i_accept'              => 'Tôi đồng ý',
@@ -339,16 +346,16 @@ return [
     'view_all'              => 'view all',
     'hide_deleted'          => 'Ẩn đã xóa',
     'email'                 => 'Email',
-    'do_not_change'         => 'Không được thay đổi',
-    'bug_report'            => 'Report a Bug',
+    'do_not_change'         => 'Do not change',
+    'bug_report'            => 'Report a bug',
     'user_manual'           => 'Người dùng mặc định',
     'setup_step_1'          => 'Bước 1',
     'setup_step_2'          => 'Bước 2',
     'setup_step_3'          => 'Bước 3',
     'setup_step_4'          => 'Bước 4',
     'setup_config_check'    => 'Kiểm tra cấu hình',
-    'setup_create_database' => 'Tạo bảng cơ sở dữ liệu',
-    'setup_create_admin'    => 'Tạo tài khoản quản trị',
+    'setup_create_database' => 'Create database tables',
+    'setup_create_admin'    => 'Create an admin user',
     'setup_done'            => 'Hoàn tất!',
     'bulk_edit_about_to'    => 'Bạn đang chuẩn bị chỉnh sửa nội dung sau: ',
     'checked_out'           => 'Bàn giao',
@@ -383,6 +390,8 @@ return [
     'new_license'           => 'New License',
     'new_accessory'         => 'Thêm phụ kiện',
     'new_consumable'        => 'Tạo vật tư phụ',
+    'new_component'         => 'New Component',
+    'new_user'              => 'New User',
     'collapse'              => 'Thu gọn',
     'assigned'              => 'Đã giao',
     'asset_count'           => 'Asset Count',
@@ -418,19 +427,20 @@ return [
     'bulk_soft_delete'      =>'Also soft-delete these users. Their asset history will remain intact unless/until you purge deleted records in the Admin Settings.',
     'bulk_checkin_delete_success' => 'Your selected users have been deleted and their items have been checked in.',
     'bulk_checkin_success' => 'The items for the selected users have been checked in.',
-    'set_to_null'           => 'Delete values for this asset|Delete values for all :asset_count assets ',
+    'set_to_null'           => 'Delete values for this selection|Delete values for all :selection_count selections ',
     'set_users_field_to_null'  => 'Delete :field values for this user|Delete :field values for all :user_count users ',
     'na_no_purchase_date'   => 'N/A - Không có dữ liệu ngày mua hàng',
     'assets_by_status'      => 'Tài sản theo trạng thái',
     'assets_by_status_type'      => 'Tài sản theo kiểu trạng thái',
     'pie_chart_type'        => 'Kiểu Biểu Đồ Tròn Dashboard',
     'hello_name'            => 'Xin chào, :name!',
-    'unaccepted_profile_warning'   => 'Bạn đang có :count yêu cầu chờ chấp nhận. Nhấn để chấp nhận hoặc từ chối các yêu cầu',
+    'unaccepted_profile_warning'   => 'You have one item requiring acceptance. Click here to accept or decline it | You have :count items requiring acceptance. Click here to accept or decline them',
     'start_date'            => 'Ngày Bắt Đầu',
     'end_date'            => 'Ngày Kết Thúc',
     'alt_uploaded_image_thumbnail' => 'Tải ảnh nhỏ lên',
     'placeholder_kit'       => 'Chọn công cụ',
     'file_not_found'        => 'Không tìm thấy tệp',
+    'log_record_not_found'  => 'No record for that log entry was found.',
     'preview_not_available' => '(không có bản xem trước)',
     'setup'                 => 'Cài đặt',
     'pre_flight'            => 'Pre-Flight',
@@ -512,7 +522,7 @@ return [
     'checked_out_to_fields' => 'Checked Out To Fields',
     'percent_complete' => '% hoàn thành',
     'uploading' => 'Uploading... ',
-    'upload_error' => 'Error uploading file. Please check that there are no empty rows and that no column names are duplicated.',
+    'upload_error' => 'Error uploading file. Please check that you have no empty rows or duplicated column names in your CSV, and that the server permissions allow uploads.',
     'copy_to_clipboard' => 'Copy to Clipboard',
     'copied' => 'Copied!',
     'status_compatibility' => 'If assets are already assigned, they cannot be changed to a non-deployable status type and this value change will be skipped.',
@@ -549,6 +559,71 @@ return [
         'license_seats'  => ':count License Seat|:count License Seats',
         'consumables'  => ':count Consumable|:count Consumables',
         'components'  => ':count Component|:count Components',
-    ]
+    ],
+
+    'more_info' => 'Xem thêm thông tin',
+    'quickscan_bulk_help' => 'Checking this box will edit the asset record to reflect this new location. Leaving it unchecked will simply note the location in the audit log. Note that if this asset is checked out, it will not change the location of the person, asset or location it is checked out to.',
+    'whoops' => 'Whoops!',
+    'something_went_wrong' => 'Something went wrong with your request.',
+    'close' => 'Close',
+    'expires' => 'Hết hạn',
+    'map_fields'=> 'Map :item_type Fields',
+    'remaining_var' => ':count Remaining',
+    'label' => 'Label',
+    'import_asset_tag_exists' => 'An asset with the asset tag :asset_tag already exists and an update was not requested. No change was made.',
+    'countries_manually_entered_help' => 'Values with an asterisk (*) were manually entered and do not match existing ISO 3166 dropdown values',
+    'accessories_assigned' => 'Assigned Accessories',
+    'user_managed_passwords' => 'Password Management',
+    'user_managed_passwords_disallow' => 'Disallow users from managing their own passwords',
+    'user_managed_passwords_allow' => 'Allow users to manage their own passwords',
+    'from' => 'From',
+    'by' => 'Bởi',
+
+// Add form placeholders here
+    'placeholders' => [
+        'notes'  => 'Add a note',
+    ],
+
+    'breadcrumb_button_actions' => [
+        'edit_item' => 'Edit :name',
+        'checkout_item' => 'Checkout :name',
+        'checkin_item' => 'Checkin :name',
+    ],
+
+    'skins' => [
+        'site_default' => 'Site Default',
+        'default_blue' => 'Default Blue',
+        'blue_dark' => 'Blue (Dark Mode)',
+        'green' => 'Green Dark',
+        'green_dark' => 'Green (Dark Mode)',
+        'red' => 'Red Dark',
+        'red_dark' => 'Red (Dark Mode)',
+        'orange' => 'Orange Dark',
+        'orange_dark' => 'Orange (Dark Mode)',
+        'black' => 'Black',
+        'black_dark' => 'Black (Dark Mode)',
+        'purple' => 'Purple',
+        'purple_dark' => 'Purple (Dark Mode)',
+        'yellow' => 'Yellow',
+        'yellow_dark' => 'Yellow (Dark Mode)',
+        'high_contrast' => 'High Contrast',
+
+    ],
+
+    'select_all_none' => 'Select/Unselect All',
+    'generic_model_not_found' => 'That :model was not found or you do not have permission to access it',
+    'deleted_models' => 'Deleted Asset Models',
+    'deleted_users' => 'Deleted Users',
+    'cost_each' => ':amount each',
+    'remove_current_image' => 'Remove current :type image',
+
+    'seeding' => [
+        'manufacturers' => [
+            'button' => 'Create Manufacturers',
+            'prompt' => 'You do not have any manufacturers yet. Would you like to seed a list of common manufacturers? (THIS WILL OVERWRITE EXISTING MANUFACTURERS, including those that have been soft-deleted.)',
+            'success' => 'Manufacturers seeded successfully',
+            'error' => 'Could not seed manufacturers. A manufacturer record already exists and seeding would overwrite it.|Could not seed manufacturers. :count manufacturer records already exist and seeding would overwrite them.',
+        ],
+    ],
 
 ];
diff --git a/resources/lang/vi-VN/localizations.php b/resources/lang/vi-VN/localizations.php
index e715ade55d..827ed4fca1 100644
--- a/resources/lang/vi-VN/localizations.php
+++ b/resources/lang/vi-VN/localizations.php
@@ -2,7 +2,7 @@
 
 return [
 
-    'select_language' => 'Lựa chọn ngôn ngữ',
+    'select_language' => 'Select a Language',
     'languages' => [
         'en-US'=> 'English, US',
         'en-GB'=> 'English, UK',
@@ -40,7 +40,9 @@ return [
         'ms-MY'=> 'Malay',
         'mi-NZ'=> 'Maori',
         'mn-MN'=> 'Mongolian',
-        'no-NO'=> 'Norwegian',
+        'nb-NO'=> 'Norwegian Bokmål',
+        'om-ET' => 'Oromo (Ethiopian)',
+        //'nn-NO'=> 'Norwegian Nynorsk',
         'fa-IR'=> 'Persian',
         'pl-PL'=> 'Polish',
         'pt-PT'=> 'Portuguese',
@@ -66,7 +68,7 @@ return [
         'zu-ZA'=> 'Zulu',
     ],
 
-    'select_country' => 'Select a country',
+    'select_country' => 'Select a Country',
     
     'countries' => [
         'AC'=>'Ascension Island',
@@ -133,6 +135,7 @@ return [
         'EC'=>'Ecuador',
         'EE'=>'Estonia',
         'EG'=>'Egypt',
+        'GB-ENG'=>'England',
         'ER'=>'Eritrea',
         'ES'=>'Spain',
         'ET'=>'Ethiopia',
@@ -231,6 +234,7 @@ return [
         'NG'=>'Nigeria',
         'NI'=>'Nicaragua',
         'NL'=>'Netherlands',
+        'GB-NIR' => 'Northern Ireland',
         'NO'=>'Norway',
         'NP'=>'Nepal',
         'NR'=>'Nauru',
@@ -258,7 +262,7 @@ return [
         'RU'=>'Russian Federation',
         'RW'=>'Rwanda',
         'SA'=>'Saudi Arabia',
-        'UK'=>'Scotland',
+        'GB-SCT'=>'Scotland',
         'SB'=>'Solomon Islands',
         'SC'=>'Seychelles',
         'SS'=>'South Sudan',
@@ -310,6 +314,7 @@ return [
         'VI'=>'Virgin Islands (U.S.)',
         'VN'=>'Viet Nam',
         'VU'=>'Vanuatu',
+        'GB-WLS' =>'Wales',
         'WF'=>'Wallis And Futuna Islands',
         'WS'=>'Samoa',
         'YE'=>'Yemen',
diff --git a/resources/lang/vi-VN/mail.php b/resources/lang/vi-VN/mail.php
index e27bbce021..891f2cfdfe 100644
--- a/resources/lang/vi-VN/mail.php
+++ b/resources/lang/vi-VN/mail.php
@@ -23,24 +23,25 @@ return [
     'Item_Requested' => 'Yêu cầu',
     'License_Checkin_Notification' => 'Giấy phép đã cấp phát thành công',
     'License_Checkout_Notification' => 'Giấy phép đã cấp phát thành công',
+    'license_for'   => 'License for',
     'Low_Inventory_Report' => 'Báo cáo tồn kho thấp',
     'a_user_canceled' => 'Người dùng đã hủy bỏ một khoản mục yêu cầu trên trang web',
     'a_user_requested' => 'Người dùng đã yêu cầu một mục trên trang web',
     'acceptance_asset_accepted' => 'Người dùng đã chấp nhận',
     'acceptance_asset_declined' => 'Người dùng từ chối',
-    'accessory_name' => 'Tên Phụ Kiện:',
-    'additional_notes' => 'Ghi chú bổ sung:',
+    'accessory_name' => 'Tên Phụ Kiện',
+    'additional_notes' => 'Ghi chú bổ sung',
     'admin_has_created' => 'Người quản trị đã tạo ra một tài khoản cho bạn trên trang web :web.',
-    'asset' => 'Tài sản:',
-    'asset_name' => 'Tên tài sản:',
+    'asset' => 'Tài sản',
+    'asset_name' => 'Tên tài sản',
     'asset_requested' => 'Tài sản được yêu cầu',
     'asset_tag' => 'Thẻ tài sản',
     'assets_warrantee_alert' => 'Tài sản có bảo hành sắp hết hạn vào ngày mai: threshold days. | Tài sản có bảo hành sắp hết hạn trong ngày mai: threshold days.',
     'assigned_to' => 'Cấp phát cho',
     'best_regards' => 'Trân trọng,',
-    'canceled' => 'Đã hủy bỏ:',
-    'checkin_date' => 'Ngày cấp phát:',
-    'checkout_date' => 'Ngày thu hồi:',
+    'canceled' => 'Canceled',
+    'checkin_date' => 'Ngày Checkin',
+    'checkout_date' => 'Ngày checkout',
     'checkedout_from' => 'Biểu mẫu cấp phát',
     'checkedin_from'  => 'Biểu mẫu đã kiểm tra',
     'checked_into' => 'Checked into',
@@ -49,27 +50,30 @@ return [
     'click_to_confirm' => 'Vui lòng click chuột lên liên kết bên dưới để xác nhận tài khoản :web của Anh/Chị:',
     'current_QTY' => 'QTY hiện tại',
     'days' => 'Ngày',
-    'expecting_checkin_date' => 'Dự kiến ​​ngày Checkin:',
+    'expecting_checkin_date' => 'Ngày mong muốn Checkin',
     'expires' => 'Hết hạn',
     'hello' => 'xin chào',
     'hi' => 'Chào',
     'i_have_read' => 'Tôi đã đọc và đồng ý với các điều khoản sử dụng và đã nhận được mục này.',
     'inventory_report' => 'Báo cáo kho',
-    'item' => 'Mục:',
+    'item' => 'Mục',
+    'item_checked_reminder' => 'This is a reminder that you currently have :count items checked out to you that you have not accepted or declined. Please click the link below to confirm your decision.',
     'license_expiring_alert' => 'Có: giấy phép bản quyền sắp hết hạn trong ngày mai:threshold days. | Có nhiều: giấy phép bản quyên sắp hết hạn trong lần tiếp theo: threshold days.',
     'link_to_update_password' => 'Vui lòng nhấp vào liên kết sau để cập nhật: mật khẩu web:',
-    'login' => 'Đăng nhập:',
+    'login' => 'Đăng nhập',
     'login_first_admin' => 'Đăng nhập vào hệ thống Snipe-IT mới bằng các thông tin dưới đây:',
     'low_inventory_alert' => 'Có: mặt hàng tồn dưới mức tối thiểu hoặc sẽ sớm ở mức thấp. | Có nhiều: mặt hàng tồn dưới mức tồn kho tối thiểu hoặc sẽ sớm ở mức thấp.',
     'min_QTY' => 'Min QTY',
     'name' => 'Tên',
     'new_item_checked' => 'Một mục mới đã được kiểm tra dưới tên của bạn, chi tiết dưới đây.',
+    'new_item_checked_with_acceptance' => 'A new item has been checked out under your name that requires acceptance, details are below.',
+    'recent_item_checked' => 'An item was recently checked out under your name that requires acceptance, details are below.',
     'notes' => 'Ghi chú',
-    'password' => 'Mật khẩu:',
+    'password' => 'Mật khẩu',
     'password_reset' => 'Đặt lại mật khẩu',
     'read_the_terms' => 'Vui lòng đọc các điều khoản sử dụng bên dưới.',
     'read_the_terms_and_click' => 'Please read the terms of use below, and click on the link at the bottom to confirm that you read and agree to the terms of use, and have received the asset.',
-    'requested' => 'Yêu cầu:',
+    'requested' => 'Đã yêu cầu',
     'reset_link' => 'Liên kết Đặt lại Mật khẩu của bạn',
     'reset_password' => 'Nhấn vào đây để đặt lại mật khẩu của bạn:',
     'rights_reserved' => 'Bản quyền được bảo hộ.',
@@ -86,8 +90,10 @@ return [
     'upcoming-audits' => 'Hiện có :count tài sản sẽ được xem xét trong :threshold này nữa.',
     'user' => 'Người dùng',
     'username' => 'Tên đăng nhập',
+    'unaccepted_asset_reminder' => 'Reminder: You have Unaccepted Assets.',
     'welcome' => 'Chào mừng: tên',
     'welcome_to' => 'Chào mừng đến với: web!',
     'your_assets' => 'Xen qua tài sản của bạn',
     'your_credentials' => 'Thông tin về Snipe-IT của bạn',
+    'mail_sent' => 'Mail sent successfully!',
 ];
diff --git a/resources/lang/vi-VN/validation.php b/resources/lang/vi-VN/validation.php
index c6f30d7cbf..7b82288fd7 100644
--- a/resources/lang/vi-VN/validation.php
+++ b/resources/lang/vi-VN/validation.php
@@ -13,87 +13,150 @@ return [
     |
     */
 
-    'accepted'             => ':attribute phải được chấp nhận.',
-    'active_url'           => ':attribute thì không phải URL hợp lệ.',
-    'after'                => ':attribute phải có ngày sau ngày :date.',
-    'after_or_equal'       => 'Thuộc tính: phải là một ngày sau hoặc bằng: date.',
-    'alpha'                => ':attribute có thể chỉ chứa chữ.',
-    'alpha_dash'           => ':attribute có thể chỉ chứa chữ, số và dấu phẩy.',
-    'alpha_num'            => ':attribute có thể chỉ chứa chữ và số.',
-    'array'                => 'Thuộc tính: phải là một mảng.',
-    'before'               => ':attribute phải có ngày trước ngày :date.',
-    'before_or_equal'      => 'Thuộc tính: phải là ngày trước hoặc bằng: ngày.',
-    'between'              => [
-        'numeric' => ':attribute phải nằm giữa :min - :max.',
-        'file'    => ':attribute phải nằm giữa :min - :max kilobytes.',
-        'string'  => ':attribute phải nằm :min - :max ký tự.',
-        'array'   => 'Thuộc tính: phải có từ: min và: max items.',
+    'accepted' => 'The :attribute field must be accepted.',
+    'accepted_if' => 'The :attribute field must be accepted when :other is :value.',
+    'active_url' => 'The :attribute field must be a valid URL.',
+    'after' => 'The :attribute field must be a date after :date.',
+    'after_or_equal' => 'The :attribute field must be a date after or equal to :date.',
+    'alpha' => 'The :attribute field must only contain letters.',
+    'alpha_dash' => 'The :attribute field must only contain letters, numbers, dashes, and underscores.',
+    'alpha_num' => 'The :attribute field must only contain letters and numbers.',
+    'array' => 'The :attribute field must be an array.',
+    'ascii' => 'The :attribute field must only contain single-byte alphanumeric characters and symbols.',
+    'before' => 'The :attribute field must be a date before :date.',
+    'before_or_equal' => 'The :attribute field must be a date before or equal to :date.',
+    'between' => [
+        'array' => 'The :attribute field must have between :min and :max items.',
+        'file' => 'The :attribute field must be between :min and :max kilobytes.',
+        'numeric' => 'The :attribute field must be between :min and :max.',
+        'string' => 'The :attribute field must be between :min and :max characters.',
     ],
-    'boolean'              => 'Trường thuộc tính: phải là đúng hoặc sai.',
-    'confirmed'            => ':attribute xác nhận không đúng.',
-    'date'                 => ':attribute có ngày không hợp lý.',
-    'date_format'          => ':attribute không phù hợp định dạng :format.',
-    'different'            => ':attribute và :other phải khác nhau.',
-    'digits'               => ':attribute phải có :digits số.',
-    'digits_between'       => ':attribute phải ở giữa :min và :max số.',
-    'dimensions'           => 'Thuộc tính: có kích thước hình ảnh không hợp lệ.',
-    'distinct'             => 'Trường thuộc tính: có một giá trị trùng lặp.',
-    'email'                => 'Định dạng :attribute thì không phù hợp.',
-    'exists'               => ':attribute đã chọn không phù hợp.',
-    'file'                 => 'Thuộc tính: phải là một tệp.',
-    'filled'               => 'Trường: attribute phải có giá trị.',
-    'image'                => ':attribute phải là một hình.',
+    'boolean' => 'Trường thuộc tính: phải là đúng hoặc sai.',
+    'can' => 'The :attribute field contains an unauthorized value.',
+    'confirmed' => 'The :attribute field confirmation does not match.',
+    'contains' => 'The :attribute field is missing a required value.',
+    'current_password' => 'The password is incorrect.',
+    'date' => 'The :attribute field must be a valid date.',
+    'date_equals' => 'The :attribute field must be a date equal to :date.',
+    'date_format' => 'The :attribute field must match the format :format.',
+    'decimal' => 'The :attribute field must have :decimal decimal places.',
+    'declined' => 'The :attribute field must be declined.',
+    'declined_if' => 'The :attribute field must be declined when :other is :value.',
+    'different' => 'The :attribute field and :other must be different.',
+    'digits' => 'The :attribute field must be :digits digits.',
+    'digits_between' => 'The :attribute field must be between :min and :max digits.',
+    'dimensions' => 'The :attribute field has invalid image dimensions.',
+    'distinct' => 'Trường thuộc tính: có một giá trị trùng lặp.',
+    'doesnt_end_with' => 'The :attribute field must not end with one of the following: :values.',
+    'doesnt_start_with' => 'The :attribute field must not start with one of the following: :values.',
+    'email' => 'The :attribute field must be a valid email address.',
+    'ends_with' => 'The :attribute field must end with one of the following: :values.',
+    'enum' => ':attribute đã chọn không hợp lý.',
+    'exists' => ':attribute đã chọn không phù hợp.',
+    'extensions' => 'The :attribute field must have one of the following extensions: :values.',
+    'file' => 'The :attribute field must be a file.',
+    'filled' => 'Trường: attribute phải có giá trị.',
+    'gt' => [
+        'array' => 'The :attribute field must have more than :value items.',
+        'file' => 'The :attribute field must be greater than :value kilobytes.',
+        'numeric' => 'The :attribute field must be greater than :value.',
+        'string' => 'The :attribute field must be greater than :value characters.',
+    ],
+    'gte' => [
+        'array' => 'The :attribute field must have :value items or more.',
+        'file' => 'The :attribute field must be greater than or equal to :value kilobytes.',
+        'numeric' => 'The :attribute field must be greater than or equal to :value.',
+        'string' => 'The :attribute field must be greater than or equal to :value characters.',
+    ],
+    'hex_color' => 'The :attribute field must be a valid hexadecimal color.',
+    'image' => 'The :attribute field must be an image.',
     'import_field_empty'    => 'Giá trị của :fieldname không thể trống.',
-    'in'                   => ':attribute đã lựa chọn không hợp lý.',
-    'in_array'             => 'Trường thuộc tính: không tồn tại trong: other.',
-    'integer'              => ':attribute phải là một số nguyên.',
-    'ip'                   => ':attribute phải là một địa chỉ IP.',
-    'ipv4'                 => 'Thuộc tính: phải là địa chỉ IPv4 hợp lệ',
-    'ipv6'                 => 'Thuộc tính: phải là địa chỉ IPv6 hợp lệ',
-    'is_unique_department' => 'Thuộc tính :attribute phải là duy nhất cho Địa điểm công ty này',
-    'json'                 => 'Thuộc tính: phải là một chuỗi JSON hợp lệ',
-    'max'                  => [
-        'numeric' => ':attribute có thể không lớn hơn :max.',
-        'file'    => ':attribute có thể không lớn hơn :max kilobytes.',
-        'string'  => ':attribute có thể không lớn hơn :max ký tự.',
-        'array'   => 'Thuộc tính: không có nhiều hơn: các mục tối đa.',
+    'in' => ':attribute đã lựa chọn không hợp lý.',
+    'in_array' => 'The :attribute field must exist in :other.',
+    'integer' => 'The :attribute field must be an integer.',
+    'ip' => 'The :attribute field must be a valid IP address.',
+    'ipv4' => 'The :attribute field must be a valid IPv4 address.',
+    'ipv6' => 'The :attribute field must be a valid IPv6 address.',
+    'json' => 'The :attribute field must be a valid JSON string.',
+    'list' => 'The :attribute field must be a list.',
+    'lowercase' => 'The :attribute field must be lowercase.',
+    'lt' => [
+        'array' => 'The :attribute field must have less than :value items.',
+        'file' => 'The :attribute field must be less than :value kilobytes.',
+        'numeric' => 'The :attribute field must be less than :value.',
+        'string' => 'The :attribute field must be less than :value characters.',
     ],
-    'mimes'                => ':attribute phải là một tập tin có phần mở rộng là: :values.',
-    'mimetypes'            => 'Thuộc tính: phải là tệp kiểu:: values.',
-    'min'                  => [
-        'numeric' => ':attribute phải có ít nhất :min.',
-        'file'    => ':attribute phải ít nhất :min kilobytes.',
-        'string'  => ':attribute phải ít nhất :min ký tự.',
-        'array'   => 'Thuộc tính: phải có ít nhất: min items.',
+    'lte' => [
+        'array' => 'The :attribute field must not have more than :value items.',
+        'file' => 'The :attribute field must be less than or equal to :value kilobytes.',
+        'numeric' => 'The :attribute field must be less than or equal to :value.',
+        'string' => 'The :attribute field must be less than or equal to :value characters.',
     ],
-    'starts_with'          => 'Trường :attribute phải kết thúc bằng một trong những giá trị sau: :values',
-    'ends_with'            => 'Thuộc tính :attribute phải kết thúc bằng một trong các giá trị sau: :values.',
+    'mac_address' => 'The :attribute field must be a valid MAC address.',
+    'max' => [
+        'array' => 'The :attribute field must not have more than :max items.',
+        'file' => 'The :attribute field must not be greater than :max kilobytes.',
+        'numeric' => 'The :attribute field must not be greater than :max.',
+        'string' => 'The :attribute field must not be greater than :max characters.',
+    ],
+    'max_digits' => 'The :attribute field must not have more than :max digits.',
+    'mimes' => 'The :attribute field must be a file of type: :values.',
+    'mimetypes' => 'The :attribute field must be a file of type: :values.',
+    'min' => [
+        'array' => 'The :attribute field must have at least :min items.',
+        'file' => 'The :attribute field must be at least :min kilobytes.',
+        'numeric' => 'The :attribute field must be at least :min.',
+        'string' => 'The :attribute field must be at least :min characters.',
+    ],
+    'min_digits' => 'The :attribute field must have at least :min digits.',
+    'missing' => 'The :attribute field must be missing.',
+    'missing_if' => 'The :attribute field must be missing when :other is :value.',
+    'missing_unless' => 'The :attribute field must be missing unless :other is :value.',
+    'missing_with' => 'The :attribute field must be missing when :values is present.',
+    'missing_with_all' => 'The :attribute field must be missing when :values are present.',
+    'multiple_of' => 'The :attribute field must be a multiple of :value.',
+    'not_in' => ':attribute đã chọn không hợp lý.',
+    'not_regex' => 'The :attribute field format is invalid.',
+    'numeric' => 'The :attribute field must be a number.',
+    'password' => [
+        'letters' => 'The :attribute field must contain at least one letter.',
+        'mixed' => 'The :attribute field must contain at least one uppercase and one lowercase letter.',
+        'numbers' => 'The :attribute field must contain at least one number.',
+        'symbols' => 'The :attribute field must contain at least one symbol.',
+        'uncompromised' => 'The given :attribute has appeared in a data leak. Please choose a different :attribute.',
+    ],
+    'percent'       => 'The depreciation minimum must be between 0 and 100 when depreciation type is percentage.',
 
-    'not_in'               => ':attribute đã chọn không hợp lý.',
-    'numeric'              => ':attribute phải là một số.',
-    'present'              => 'Trường thuộc tính: phải có mặt.',
-    'valid_regex'          => 'Đây không phải là một đơn hàng hợp lệ.',
-    'regex'                => 'Định dạng :attribute thì không hợp lý.',
-    'required'             => 'Trường :attribute thì bắt buộc.',
-    'required_if'          => 'Trường :attribute thì bắt buộc khi :other là :value.',
-    'required_unless'      => 'Trường thuộc tính: required required trừ khi: other is in: values.',
-    'required_with'        => 'Trường :attribute thì bắt buộc khi :values là hiện hành.',
-    'required_with_all'    => 'Lĩnh vực thuộc tính: được yêu cầu khi: các giá trị hiện diện.',
-    'required_without'     => 'Trường :attribute thì bắt buộc khi :values không hiện hành.',
+    'present' => 'Trường thuộc tính: phải có mặt.',
+    'present_if' => 'The :attribute field must be present when :other is :value.',
+    'present_unless' => 'The :attribute field must be present unless :other is :value.',
+    'present_with' => 'The :attribute field must be present when :values is present.',
+    'present_with_all' => 'The :attribute field must be present when :values are present.',
+    'prohibited' => 'The :attribute field is prohibited.',
+    'prohibited_if' => 'The :attribute field is prohibited when :other is :value.',
+    'prohibited_unless' => 'The :attribute field is prohibited unless :other is in :values.',
+    'prohibits' => 'The :attribute field prohibits :other from being present.',
+    'regex' => 'The :attribute field format is invalid.',
+    'required' => 'Trường :attribute thì bắt buộc.',
+    'required_array_keys' => 'The :attribute field must contain entries for: :values.',
+    'required_if' => 'Trường :attribute thì bắt buộc khi :other là :value.',
+    'required_if_accepted' => 'The :attribute field is required when :other is accepted.',
+    'required_if_declined' => 'The :attribute field is required when :other is declined.',
+    'required_unless' => 'Trường thuộc tính: required required trừ khi: other is in: values.',
+    'required_with' => 'Trường :attribute thì bắt buộc khi :values là hiện hành.',
+    'required_with_all' => 'The :attribute field is required when :values are present.',
+    'required_without' => 'Trường :attribute thì bắt buộc khi :values không hiện hành.',
     'required_without_all' => 'Lĩnh vực thuộc tính: được yêu cầu khi không có: giá trị hiện diện.',
-    'same'                 => ':attribute và :other phải giống nhau.',
-    'size'                 => [
-        'numeric' => ':attribute phải có cỡ :size.',
-        'file'    => ':attribute phải có cỡ :size kilobytes.',
-        'string'  => ':attribute phải có :size ký tự.',
-        'array'   => 'Thuộc tính: phải chứa: các mục kích thước.',
+    'same' => 'The :attribute field must match :other.',
+    'size' => [
+        'array' => 'The :attribute field must contain :size items.',
+        'file' => 'The :attribute field must be :size kilobytes.',
+        'numeric' => 'The :attribute field must be :size.',
+        'string' => 'The :attribute field must be :size characters.',
     ],
+    'starts_with' => 'The :attribute field must start with one of the following: :values.',
     'string'               => 'Thuộc tính: phải là một chuỗi.',
-    'timezone'             => 'Thuộc tính: phải là một vùng hợp lệ.',
     'two_column_unique_undeleted' => 'The :attribute must be unique across :table1 and :table2. ',
-    'unique'               => ':attribute đã sẵn sàng.',
-    'uploaded'             => 'Thuộc tính: không thể tải lên.',
-    'url'                  => 'Định dạng :attribute thì không hợp lý.',
     'unique_undeleted'     => 'Thuộc tính: phải là duy nhất.',
     'non_circular'         => 'The :attribute must not create a circular reference.',
     'not_array'            => ':attribute cannot be an array.',
@@ -102,11 +165,14 @@ return [
     'numbers'              => 'Mật khẩu phải chứa ít nhất một chữ số.',
     'case_diff'            => 'Mật khẩu phải sử dụng chữ hoa chữ thường.',
     'symbols'              => 'Mật khẩu phải chứa các ký tự đặc biệt.',
-    'gte'                  => [
-        'numeric'          => 'Giá trị không thể âm'
-    ],
-    'checkboxes'           => ':attribute contains invalid options.',
-    'radio_buttons'        => ':attribute is invalid.',
+    'timezone' => 'The :attribute field must be a valid timezone.',
+    'unique' => ':attribute đã sẵn sàng.',
+    'uploaded' => 'Thuộc tính: không thể tải lên.',
+    'uppercase' => 'The :attribute field must be uppercase.',
+    'url' => 'The :attribute field must be a valid URL.',
+    'ulid' => 'The :attribute field must be a valid ULID.',
+    'uuid' => 'The :attribute field must be a valid UUID.',
+    'fmcs_location' => 'Full multiple company support and location scoping is enabled in the Admin Settings, and the selected location and selected company are not compatible.',
 
 
     /*
@@ -120,16 +186,22 @@ return [
     |
     */
 
+    'email_array'      => 'Một hoặc nhiều địa chỉ email không hợp lệ.',
+    'checkboxes'           => ':attribute contains invalid options.',
+    'radio_buttons'        => ':attribute is invalid.',
+    
     'custom' => [
         'alpha_space' => 'Trường: attribute chứa một ký tự không được phép.',
-        'email_array'      => 'Một hoặc nhiều địa chỉ email không hợp lệ.',
+
         'hashed_pass'      => 'Mật khẩu hiện tại của bạn không chính xác',
         'dumbpwd'          => 'Mật khẩu đó quá phổ biến.',
         'statuslabel_type' => 'Bạn phải chọn một loại nhãn tình trạng hợp lệ',
+        'custom_field_not_found'          => 'This field does not seem to exist, please double check your custom field names.',
+        'custom_field_not_found_on_model' => 'This field seems to exist, but is not available on this Asset Model\'s fieldset.',
 
         // date_format validation with slightly less stupid messages. It duplicates a lot, but it gets the job done :(
-        // We use this because the default error message for date_format is reflects php Y-m-d, which non-PHP
-        // people won't know how to format. 
+        // We use this because the default error message for date_format reflects php Y-m-d, which non-PHP
+        // people won't know how to format.
         'purchase_date.date_format'     => ':attribute phải là ngày hợp lệ ở định dạng YYYY-MM-DD',
         'last_audit_date.date_format'   =>  ':attribute phải là ngày hợp lệ ở định dạng YYYY-MM-DD hh:mm:ss',
         'expiration_date.date_format'   =>  ':attribute phải là ngày hợp lệ ở định dạng YYYY-MM-DD',
@@ -137,9 +209,15 @@ return [
         'expected_checkin.date_format'  =>  ':attribute phải là ngày hợp lệ ở định dạng YYYY-MM-DD',
         'start_date.date_format'        =>  ':attribute phải là ngày hợp lệ ở định dạng YYYY-MM-DD',
         'end_date.date_format'          =>  ':attribute phải là ngày hợp lệ ở định dạng YYYY-MM-DD',
+        'invalid_value_in_field' => 'Invalid value included in this field',
 
-    ],
+        'ldap_username_field' => [
+            'not_in' =>         '<code>sAMAccountName</code> (mixed case) will likely not work. You should use <code>samaccountname</code> (lowercase) instead.'
+        ],
+        'ldap_auth_filter_query' => ['not_in' => '<code>uid=samaccountname</code> is probably not a valid auth filter. You probably want <code>uid=</code> '],
+        'ldap_filter' => ['regex' => 'This value should probably not be wrapped in parentheses.'],
 
+        ],
     /*
     |--------------------------------------------------------------------------
     | Custom Validation Attributes
@@ -155,8 +233,16 @@ return [
 
     /*
     |--------------------------------------------------------------------------
-    | Generic Validation Messages
+    | Generic Validation Messages - we use these in the jquery validation where we don't have
+    | access to the :attribute
     |--------------------------------------------------------------------------
     */
-    'invalid_value_in_field' => 'Invalid value included in this field',
+
+    'generic' => [
+        'invalid_value_in_field' => 'Invalid value included in this field',
+        'required' => 'This field is required',
+        'email' => 'Please enter a valid email address',
+    ],
+
+
 ];
diff --git a/resources/lang/zh-CN/account/general.php b/resources/lang/zh-CN/account/general.php
index 2000bc5414..7cff54151e 100644
--- a/resources/lang/zh-CN/account/general.php
+++ b/resources/lang/zh-CN/account/general.php
@@ -2,10 +2,16 @@
 
 return array(
     'personal_api_keys' => '个人API密钥',
+    'personal_access_token' => '个人访问令牌',
+    'personal_api_keys_success' => '个人API密钥 :key已成功创建',
+    'here_is_api_key' => '这是您新的个人访问令牌。这是唯一一次展示，所以别弄丢了！您现在可以使用此令牌进行API请求。',
     'api_key_warning' => '当生成 API 令牌时，请务必立即将其复制下来，因为它们将不会对您再次可见。',
     'api_base_url' => '您的 API 基础url 位于：',
     'api_base_url_endpoint' => '/&lt;endpoint&gt;',
     'api_token_expiration_time' => '设定 API 令牌过期时间为：',
     'api_reference' => '请检查 <a href="https://snipe-it.readme.io/reference" target="_blank">API 参考</a> 以找到特定的 API 端点和额外的 API 文档。',
     'profile_updated' => '帐户已成功更新',
+    'no_tokens' => '您还没有创建任何个人访问令牌。',
+    'enable_sounds' => '启用声音效果',
+    'enable_confetti' => '启用彩屑效果',
 );
diff --git a/resources/lang/zh-CN/admin/accessories/general.php b/resources/lang/zh-CN/admin/accessories/general.php
index fd5d981e65..1fc447e4ae 100644
--- a/resources/lang/zh-CN/admin/accessories/general.php
+++ b/resources/lang/zh-CN/admin/accessories/general.php
@@ -3,20 +3,20 @@
 return array(
     'accessory_category' 				=> '配件类别',
     'accessory_name'  					=> '配件名称',
-    'checkout'  							=> '借出配件',
-    'checkin'  							=> '借入配件',
+    'checkout'  							=> '签出配件',
+    'checkin'  							=> '归还配件',
     'create'  							=> '新增配件',
     'edit'  							=> '编辑配件',
-    'eula_text'							=> '类别的最终用户许可协议',
+    'eula_text'							=> '分类的的最终用户许可协议',
     'eula_text_help'					=> '此字段允许您自定义的EULA（最终用户许可协议）为特定类型的资产。如果您所有资产只有一个EULA（最终用户许可协议），你可以检查下面的框中使用默认设置。',
     'require_acceptance'				=> '要求用户确认接受这一类的资产。',
-    'no_default_eula'					=> '没有发现默认EULA（最终用户许可协议）。请在设置中添加一个。',
+    'no_default_eula'					=> '没有发现默认的EULA（最终用户许可协议）。请在设置中添加一个。',
     'total'  							=> '共计',
     'remaining'  						=> '可用',
     'update'  							=> '更新配件',
     'use_default_eula'					=> '用<a href="#" data-toggle="modal" data-target="#eulaModal">默认EULA（最终用户许可协议）</a>进行替换',
     'use_default_eula_disabled'			=> '<del>使用默认EULA（最终用户许可协议）.</del>没有设置默认EULA（最终用户许可协议），请在设置中增加一个。',
     'clone'                             => '克隆配件',
-    'delete_disabled'                   => '不能删除此配件，因为有些物品仍然被借出。',
+    'delete_disabled'                   => '不能删除此配件，因为有些物品仍被签出。',
 
 );
diff --git a/resources/lang/zh-CN/admin/accessories/message.php b/resources/lang/zh-CN/admin/accessories/message.php
index 2d8ab448da..88f9255e49 100644
--- a/resources/lang/zh-CN/admin/accessories/message.php
+++ b/resources/lang/zh-CN/admin/accessories/message.php
@@ -24,14 +24,18 @@ return array(
 
      'checkout' => array(
         'error'   		=> '配件不能被预订，请重试。',
-        'success' 		=> '配件成功预订。',
-        'unavailable'   => '配件不可被借出。检查可用数量',
-        'user_does_not_exist' => '无效用户，请重试。'
+        'success' 		=> '配件成功签出。',
+        'unavailable'   => '配件不可被签出。检查可用数量',
+        'user_does_not_exist' => '无效用户，请重试。',
+         'checkout_qty' => array(
+            'lte'  => '目前只有一个可用的此类型的配件，您正在试图签出 :checkout_qty 个。 请调整签出数量或该配件的总库存，然后重试。|有 :num_currently_restotal 个可用配件，您正在尝试签出 :checkout_qty 个。 请调整借出数量或该配件的总库存，然后重试。',
+            ),
+           
     ),
 
     'checkin' => array(
-        'error'   		=> '附件未成功入库，请再试一次',
-        'success' 		=> '配件入库成功。',
+        'error'   		=> '配件没有归还，请重试。',
+        'success' 		=> '配件归还成功。',
         'user_does_not_exist' => '无效用户，请重试。'
     )
 
diff --git a/resources/lang/zh-CN/admin/accessories/table.php b/resources/lang/zh-CN/admin/accessories/table.php
index 7ae841be11..469ee0e654 100644
--- a/resources/lang/zh-CN/admin/accessories/table.php
+++ b/resources/lang/zh-CN/admin/accessories/table.php
@@ -6,6 +6,4 @@ return array(
     'id'      					=> 'ID',
     'require_acceptance'      	=> '验收',
     'title'      				=> '配件名称',
-
-
 );
diff --git a/resources/lang/zh-CN/admin/asset_maintenances/form.php b/resources/lang/zh-CN/admin/asset_maintenances/form.php
index c7d81c8e51..e92893191e 100644
--- a/resources/lang/zh-CN/admin/asset_maintenances/form.php
+++ b/resources/lang/zh-CN/admin/asset_maintenances/form.php
@@ -5,7 +5,7 @@
         'title'                  => '标题',
         'start_date'             => '开始日期',
         'completion_date'        => '完成日期',
-        'cost'                   => '维护费用',
+        'cost'                   => '费用',
         'is_warranty'            => '质保升级/延期',
         'asset_maintenance_time' => '资产维护时间 (天)',
         'notes'                  => '备注',
diff --git a/resources/lang/zh-CN/admin/asset_maintenances/general.php b/resources/lang/zh-CN/admin/asset_maintenances/general.php
index 71eef8f576..1017cde79f 100644
--- a/resources/lang/zh-CN/admin/asset_maintenances/general.php
+++ b/resources/lang/zh-CN/admin/asset_maintenances/general.php
@@ -12,5 +12,5 @@
         'software_support'   => '软件支持',
         'hardware_support'   => '硬件支持',
         'configuration_change'   => '配置更改',
-        'pat_test'           => 'PAT 测试',
+        'pat_test'           => '便携式设备测试',
     ];
diff --git a/resources/lang/zh-CN/admin/categories/general.php b/resources/lang/zh-CN/admin/categories/general.php
index c43cebc784..5d9d3fc83b 100644
--- a/resources/lang/zh-CN/admin/categories/general.php
+++ b/resources/lang/zh-CN/admin/categories/general.php
@@ -3,23 +3,23 @@
 return array(
     'asset_categories' 					=> '资产分类',
     'category_name'  					=> '分类名称',
-    'checkin_email'                     => '在签入/签出时发送邮件给所有者。',
-    'checkin_email_notification'        => '在签入/签出时该用户会发送邮件。',
+    'checkin_email'                     => '在签入/签出时发送邮件给用户。',
+    'checkin_email_notification'        => '在签入/签出时该用户会收到一封邮件。',
     'clone'                             => '克隆分类',
     'create'  							=> '创建分类',
     'edit'                              => '编辑分类',
-    'email_will_be_sent_due_to_global_eula' => '将向用户发送一封电子邮件，因为正在使用全局的EULA。',
+    'email_will_be_sent_due_to_global_eula' => '将向用户发送一封电子邮件，因为正在使用全局的 EULA。',
     'email_will_be_sent_due_to_category_eula' => '将向用户发送一封电子邮件，因为已为此类别设置了一个 EULA 。',
-    'eula_text'							=> '类别的最终用户许可协议',
-    'eula_text_help'					=> '此字段允许您自定义的EULA（最终用户许可协议）为特定类型的资产。如果您所有资产只有一个EULA（最终用户许可协议），你可以检查下面的框中使用默认设置。',
+    'eula_text'							=> '分类的最终用户许可协议',
+    'eula_text_help'					=> '这个字段允许您为特定分类的资产自定义您的 EULA (最终用户许可协议)。如果您只有一个适用于所有资产的 EULA，您可以勾选下面的复选框来使用默认设置。',
     'name'                              => '分类名称',
     'require_acceptance'				=> '要求用户确认接受这一类的资产。',
     'required_acceptance'				=> '用户会收到一封邮件，邮件中包含一个确认接收的链接。',
-    'required_eula'						=> '用户将收到关于EULA（最终用户许可协议）的邮件。',
-    'no_default_eula'					=> '未找默认的EULA（最终用户许可协议），请在设置中添加一个。',
+    'required_eula'						=> '用户将会从邮件收到 EULA（最终用户许可协议）的副本',
+    'no_default_eula'					=> '未找到默认的 EULA（最终用户许可协议），请在设置中添加一个。',
     'update'  							=> '更新分类',
-    'use_default_eula'					=> '用<a href="#" data-toggle="modal" data-target="#eulaModal">默认EULA（最终用户许可协议）</a>进行替换',
-    'use_default_eula_disabled'			=> '<del>使用默认EULA（最终用户许可协议）替换.</del>没有设置默认EULA（最终用户许可协议），请在设置中增加一个。',
+    'use_default_eula'					=> '使用<a href="#" data-toggle="modal" data-target="#eulaModal">默认 EULA（最终用户许可协议）</a>进行替换。',
+    'use_default_eula_disabled'			=> '<del>使用默认的 EULA 替换。</del>没设置默认EULA（最终用户许可协议），请在设置中增加一个。',
     'use_default_eula_column'			=> '使用默认的 EULA',
 
 );
diff --git a/resources/lang/zh-CN/admin/categories/message.php b/resources/lang/zh-CN/admin/categories/message.php
index 9d9b4c0201..829761e451 100644
--- a/resources/lang/zh-CN/admin/categories/message.php
+++ b/resources/lang/zh-CN/admin/categories/message.php
@@ -2,9 +2,9 @@
 
 return array(
 
-    'does_not_exist' => '分类不存在',
+    'does_not_exist' => '分类不存在。',
     'assoc_models'	 => '此分类下至少还有一个相关资产型号，目前不能被删除，请你确定您的所有资产型号不在此分类下，然后重试。',
-    'assoc_items'	 => '此分类下至少还有一个相关资产类型，目前不能被删除，请你确定您的所有资产类型不在此分类下，然后重试。',
+    'assoc_items'	 => '此分类下至少还有一个 :asset_type ，目前不能被删除，请确定您的 :asset_type 不在此分类下，然后重试。 ',
 
     'create' => array(
         'error'   => '分类创建失败，请重试。',
diff --git a/resources/lang/zh-CN/admin/companies/general.php b/resources/lang/zh-CN/admin/companies/general.php
index d2654156e1..6a238ca7a8 100644
--- a/resources/lang/zh-CN/admin/companies/general.php
+++ b/resources/lang/zh-CN/admin/companies/general.php
@@ -3,5 +3,5 @@
 return [
     'select_company' => '选择公司',
     'about_companies' => '关于公司',
-    'about_companies_description' => '        您可以将公司用作一个简单信息字段，也可以通过在管理设置中启用全公司支持，来限制资产对特定公司用户的可见性和可用性。',
+    'about_companies_description' => '        您可以将公司用作简单的信息字段，或者您也可以通过在管理设置中启用“完整公司支持”功能，来使用公司功能限制资产对特定公司用户的可见性和可用性。',
 ];
diff --git a/resources/lang/zh-CN/admin/companies/message.php b/resources/lang/zh-CN/admin/companies/message.php
index f7ea42f5a5..8decaa26a2 100644
--- a/resources/lang/zh-CN/admin/companies/message.php
+++ b/resources/lang/zh-CN/admin/companies/message.php
@@ -1,9 +1,9 @@
 <?php
 
 return [
-    'does_not_exist' => '公司不存在',
+    'does_not_exist' => '公司不存在。',
     'deleted'        => '已删除公司',
-    'assoc_users'    => '此公司下至少关联了一个模板，目前不能被删除，请你确定您的所有资产不在此公司下，然后重试。',
+    'assoc_users'    => '此公司下至少关联了一个型号，目前不能被删除，请确定您的所有型号不在此公司下，然后重试。 ',
     'create' => [
         'error'   => '新增公司失败，请重试。',
         'success' => '新增公司成功。',
diff --git a/resources/lang/zh-CN/admin/components/general.php b/resources/lang/zh-CN/admin/components/general.php
index 65f04d7aba..71fd823ac9 100644
--- a/resources/lang/zh-CN/admin/components/general.php
+++ b/resources/lang/zh-CN/admin/components/general.php
@@ -1,9 +1,9 @@
 <?php
 
 return array(
-    'component_name'                  => '名称',
-    'checkin'                             => '借入组件',
-    'checkout'                             => '借出组件',
+    'component_name'                  => '组件名称',
+    'checkin'                             => '归还组件',
+    'checkout'                             => '签出组件',
     'cost'				=> '采购成本',
     'create'                             => '新增组件',
     'edit'                             => '编辑组件',
diff --git a/resources/lang/zh-CN/admin/components/message.php b/resources/lang/zh-CN/admin/components/message.php
index 78e22783e8..431c24f5e2 100644
--- a/resources/lang/zh-CN/admin/components/message.php
+++ b/resources/lang/zh-CN/admin/components/message.php
@@ -2,7 +2,7 @@
 
 return array(
 
-    'does_not_exist' => '组件不存在',
+    'does_not_exist' => '组件不存在。',
 
     'create' => array(
         'error'   => '新增组件失败，请重试。',
@@ -17,19 +17,20 @@ return array(
     'delete' => array(
         'confirm'   => '你确定要删除这个组件吗？',
         'error'   => '删除组件出错，请重试。',
-        'success' => '删除组件成功。'
+        'success' => '删除组件成功。',
+        'error_qty'   => '此类型的某些组件仍然被签出。请归还它们，然后重试。',
     ),
 
      'checkout' => array(
-        'error'   		=> '借出组件失败，请重试。',
-        'success' 		=> '借出组件成功。',
+        'error'   		=> '签出组件失败，请重试。',
+        'success' 		=> '签出组件成功。',
         'user_does_not_exist' => '无效用户，请重试。',
         'unavailable'      => '还没有足够的组件: :remaining 件剩余, :requested 件需求 ',
     ),
 
     'checkin' => array(
-        'error'   		=> '借入组件失败，请重试。',
-        'success' 		=> '借入组件成功。',
+        'error'   		=> '归还组件失败，请重试。',
+        'success' 		=> '归还组件成功。',
         'user_does_not_exist' => '无效用户，请重试。'
     )
 
diff --git a/resources/lang/zh-CN/admin/components/table.php b/resources/lang/zh-CN/admin/components/table.php
index 7f016591f4..3ee76b6a54 100644
--- a/resources/lang/zh-CN/admin/components/table.php
+++ b/resources/lang/zh-CN/admin/components/table.php
@@ -1,5 +1,5 @@
 <?php
 
 return array(
-    'title'      				=> '名称',
+    'title'      				=> '组件名称',
 );
diff --git a/resources/lang/zh-CN/admin/consumables/general.php b/resources/lang/zh-CN/admin/consumables/general.php
index 44c0a95ed7..5c570f0ea3 100644
--- a/resources/lang/zh-CN/admin/consumables/general.php
+++ b/resources/lang/zh-CN/admin/consumables/general.php
@@ -1,11 +1,12 @@
 <?php
 
 return array(
-    'checkout'                          => '领取耗材给使用者',
+    'checkout'                          => '签出耗材给使用者',
     'consumable_name'                   => '耗材名称',
     'create'                            => '创建耗材',
     'item_no'                           => '项目编号',
     'remaining' 			            => '剩余',
     'total' 			                => '总计',
     'update'                            => '更新耗材',
+    'inventory_warning'                 => '该耗材的库存低于最低数量 :min_count',
 );
diff --git a/resources/lang/zh-CN/admin/consumables/message.php b/resources/lang/zh-CN/admin/consumables/message.php
index 7c1e4fd6e9..0f7ac15760 100644
--- a/resources/lang/zh-CN/admin/consumables/message.php
+++ b/resources/lang/zh-CN/admin/consumables/message.php
@@ -2,6 +2,7 @@
 
 return array(
 
+    'invalid_category_type' => '该类别必须是一个耗材类别。',
     'does_not_exist' => '耗材不存在。',
 
     'create' => array(
@@ -24,12 +25,12 @@ return array(
         'error'   		=> '耗材领取失败，请重试',
         'success' 		=> '耗材领取成功',
         'user_does_not_exist' => '无效用户，请重试。',
-         'unavailable'      => '没有足够的耗材可被借出。请检查剩余数量。 ',
+         'unavailable'      => '没有足够的耗材可被签出。请检查剩余数量。 ',
     ),
 
     'checkin' => array(
-        'error'   		=> '耗材登记失败，请重试',
-        'success' 		=> '耗材登记成功',
+        'error'   		=> '耗材归还失败，请重试',
+        'success' 		=> '耗材归还成功。',
         'user_does_not_exist' => '无效用户，请重试。'
     )
 
diff --git a/resources/lang/zh-CN/admin/custom_fields/general.php b/resources/lang/zh-CN/admin/custom_fields/general.php
index 08669820af..e295713346 100644
--- a/resources/lang/zh-CN/admin/custom_fields/general.php
+++ b/resources/lang/zh-CN/admin/custom_fields/general.php
@@ -5,7 +5,7 @@ return [
     'manage'                    => '管理',
     'field'		                => '字段',
     'about_fieldsets_title'		=> '关于字段集',
-    'about_fieldsets_text'		=> '字段集允许您创建经常重复用于特定资产型号类型的自定义字段组。',
+    'about_fieldsets_text'		=> '字段集允许你为常用的资产型号定义一组可重用的字段。',
     'custom_format'             => '自定义正则表达式格式...',
     'encrypt_field'      	        => '在数据库中加密此字段',
     'encrypt_field_help'      => '警告︰ 对字段的加密将导致该字段无法用于搜索',
@@ -13,8 +13,8 @@ return [
     'fieldset'      	        => '字段集',
     'qty_fields'      	      => '字段',
     'fieldsets'      	        => '字段集',
-    'fieldset_name'           => '名称',
-    'field_name'              => '名称',
+    'fieldset_name'           => '字段集名称',
+    'field_name'              => '字段名称',
     'field_values'            => '字段值',
     'field_values_help'       => '添加可选选项，每行一个。 第一行之外的空行将被忽略。',
     'field_element'           => '表单元素',
@@ -24,7 +24,7 @@ return [
     'field_custom_format_help'     => '此字段允许您使用正则表达式进行验证，它应该以 "regex:" 开头。例如, 要验证自定义字段值是否包含有效的 IMEI (15位数字), 则应使用 <code> regex:/^[0-9]{15} $/</code>。',
     'required'   		          => '必填',
     'req'   		              => '必填',
-    'used_by_models'   		    => '引用模板',
+    'used_by_models'   		    => '引用的型号',
     'order'   		            => '排序',
     'create_fieldset'         => '新增字段集',
     'update_fieldset'         => '更新字段集',
@@ -34,8 +34,8 @@ return [
     'create_field'            => '新增字段',
     'create_field_title' => '创建一个新自定义字段',
     'value_encrypted'      	        => '此字段的值已被加密。只有管理员用户能够查看已解密的值',
-    'show_in_email'     => '是否在发送给用户的借出通知邮件中包含此字段？邮件中不包含加密字段。',
-    'show_in_email_short'     => '包含在电子邮件中。',
+    'show_in_email'     => '是否在发送给用户的签出通知邮件中包含此字段？邮件中不包含加密字段。',
+    'show_in_email_short' => '包含在电子邮件中',
     'help_text' => '帮助文本',
     'help_text_description' => '这是可选文本，在编辑一个资产以提供字段上下文时将显示在表单元素下方。',
     'about_custom_fields_title' => '关于自定义字段',
@@ -57,5 +57,8 @@ return [
     'show_in_requestable_list_short' => '在可申领资产列表中显示',
     'show_in_requestable_list' => '在可申领资产列表中显示值。加密字段将不会显示',
     'encrypted_options' => '此字段已加密，因此一些显示选项将不可用。',
+    'display_checkin' => '在归还表格中显示',
+    'display_checkout' => '在签出表格中显示',
+    'display_audit' => '在盘点表中显示',
 
 ];
diff --git a/resources/lang/zh-CN/admin/custom_fields/message.php b/resources/lang/zh-CN/admin/custom_fields/message.php
index 9ee6b7ae15..54564320de 100644
--- a/resources/lang/zh-CN/admin/custom_fields/message.php
+++ b/resources/lang/zh-CN/admin/custom_fields/message.php
@@ -4,7 +4,8 @@ return array(
 
     'field' => array(
         'invalid'   => '字段不存在',
-        'already_added'   => '已经新增字段',
+        'already_added'   => '字段已存在',
+        'none_selected'   => '未选择字段',
 
         'create' => array(
             'error'   => '新增字段失败，请重试',
diff --git a/resources/lang/zh-CN/admin/departments/message.php b/resources/lang/zh-CN/admin/departments/message.php
index 1af3cf4919..e712d802a9 100644
--- a/resources/lang/zh-CN/admin/departments/message.php
+++ b/resources/lang/zh-CN/admin/departments/message.php
@@ -3,8 +3,8 @@
 return array(
 
     'does_not_exist' => '部门不存在',
-    'department_already_exists' => '在此公司地理位置已存在同名的部门。 或许可以为该部门选择一个更特别的名称。 ',
-    'assoc_users'	 => '该位置下关联的还有其他用户，目前不能删除，请更新该用户的信息之后，再尝试删除。 ',
+    'department_already_exists' => '在此公司的位置已存在同名的部门。 或许可以为该部门选择一个更特别的名称。 ',
+    'assoc_users'	 => '该位置下关联的还有其他用户，目前不能删除，请更新该用户信息，再尝试删除。 ',
     'create' => array(
         'error'   => '部门没有创建，请重试。',
         'success' => '部门创建成功。'
@@ -15,7 +15,7 @@ return array(
     ),
     'delete' => array(
         'confirm'   	=> '你确定要删除这个部门吗？',
-        'error'   => '删除部门有一个问题。请再试一次。',
+        'error'   => '删除部门出现了问题。请再试一次。',
         'success' => '已成功删除该部门。'
     )
 
diff --git a/resources/lang/zh-CN/admin/departments/table.php b/resources/lang/zh-CN/admin/departments/table.php
index 26a3c508cd..5cd82e7bf0 100644
--- a/resources/lang/zh-CN/admin/departments/table.php
+++ b/resources/lang/zh-CN/admin/departments/table.php
@@ -4,7 +4,7 @@ return array(
 
     'id'                        => '编号',
     'name'                      => '部门名称',
-    'manager'                   => '领导',
+    'manager'                   => '负责人',
     'location'                  => '位置',
     'create'                    => '创建部门',
     'update'                    => '更新部门',
diff --git a/resources/lang/zh-CN/admin/depreciations/general.php b/resources/lang/zh-CN/admin/depreciations/general.php
index eb1022237c..9977531099 100644
--- a/resources/lang/zh-CN/admin/depreciations/general.php
+++ b/resources/lang/zh-CN/admin/depreciations/general.php
@@ -13,4 +13,8 @@ return [
     'no_depreciations_warning'               => '<strong>警告： </strong>
                       您目前没有设置任何折旧。
                       请设置至少一个折旧来查看折旧报告。',
+    'depreciation_method'                   => '折旧报告',
+    'linear_depreciation'                   => '线性(默认)',
+    'half_1'                                => '半年惯例，始终适用',
+    'half_2'                                => '半年惯例，有条件适用',
 ];
diff --git a/resources/lang/zh-CN/admin/depreciations/message.php b/resources/lang/zh-CN/admin/depreciations/message.php
index a9b99a24af..49c0591a33 100644
--- a/resources/lang/zh-CN/admin/depreciations/message.php
+++ b/resources/lang/zh-CN/admin/depreciations/message.php
@@ -3,7 +3,7 @@
 return array(
 
     'does_not_exist' => '折旧类不存在',
-    'assoc_users'	 => '此折旧类型至少有一个相关资产与其牵连，请删除牵连的资产，然后重试。',
+    'assoc_users'	 => '此折旧当前与一个或多个型号相关联，无法删除。 请删除型号，然后再次尝试删除。',
 
 
     'create' => array(
diff --git a/resources/lang/zh-CN/admin/groups/message.php b/resources/lang/zh-CN/admin/groups/message.php
index 24917b7b0f..0cbed676d8 100644
--- a/resources/lang/zh-CN/admin/groups/message.php
+++ b/resources/lang/zh-CN/admin/groups/message.php
@@ -14,7 +14,7 @@ return array(
 
     'delete' => array(
         'confirm'   => '确定删除这个分组吗？',
-        'create' => '新增分组的过程中出现了一些问题，请重试。',
+        'create' => '创建分组的过程中出现了一些问题，请重试。。',
         'update' => '更新分组过程中出现了一些问题，请重试。',
         'delete' => '删除分组的过程中出现了一些问题，请重试。',
     ),
diff --git a/resources/lang/zh-CN/admin/hardware/form.php b/resources/lang/zh-CN/admin/hardware/form.php
index e38609ebf0..097b246650 100644
--- a/resources/lang/zh-CN/admin/hardware/form.php
+++ b/resources/lang/zh-CN/admin/hardware/form.php
@@ -1,22 +1,22 @@
 <?php
 
 return [
-    'bulk_delete'		=> '批量删除确认',
+    'bulk_delete'		=> '确认批量删除资产',
     'bulk_restore'      => '确认批量恢复资产', 
-  'bulk_delete_help'	=> '请在此确认将批量删除的资产。在删除后，资产可以恢复，但一切当前的用户关联将会丢失。',
-  'bulk_restore_help'	=> '查看下面的资产进行批量恢复。一旦恢复，这些资产将不会与以前分配给的任何用户相关联。',
+  'bulk_delete_help'	=> '请审阅下方准备批量删除的资产。这些资产一旦删除，虽然可以恢复，但其当前与用户的分配关系将不再保留。',
+  'bulk_restore_help'	=> '请审阅下方准备批量恢复的资产。这些资产一旦恢复，其先前与用户的分配关系不会被一并恢复。',
   'bulk_delete_warn'	=> '即将删除 :asset_count 项资产',
   'bulk_restore_warn'	=> '您即将恢复 :asset_count 项资产。',
     'bulk_update'		=> '批量更新',
     'bulk_update_help'	=> '该表格允许你同时修改多项资产。请仅填写需要修改的字段，留空的字段不会做任何修改。 ',
     'bulk_update_warn'	=> '您将要编辑单个资产的属性。 |您将要编辑:asset_count个资产的属性。',
-    'bulk_update_with_custom_field' => '请注意，资产是 :asset_model_count 不同类型的型号。',
-    'bulk_update_model_prefix' => '', 
+    'bulk_update_with_custom_field' => '请注意，资产是 :asset_model_count 种不同类型的型号。',
+    'bulk_update_model_prefix' => '按型号', 
     'bulk_update_custom_field_unique' => '这是一个唯一的字段，不能进行批量编辑。',
-    'checkedout_to'		=> '借出至',
-    'checkout_date'		=> '借出日期',
-    'checkin_date'		=> '登记日期',
-    'checkout_to'		=> '借出至',
+    'checkedout_to'		=> '已签出至',
+    'checkout_date'		=> '签出日期',
+    'checkin_date'		=> '归还日期',
+    'checkout_to'		=> '签出至',
     'cost'				=> '采购价格',
     'create'			=> '创建资产',
     'date'				=> '购买时间',
@@ -24,16 +24,16 @@ return [
     'depreciates_on'	=> '折旧于',
     'default_location'	=> '默认位置',
     'default_location_phone' => '默认位置电话',
-    'eol_date'			=> '产品寿命日期',
-    'eol_rate'			=> '产品寿命等级',
+    'eol_date'			=> '生命周期结束日期',
+    'eol_rate'			=> '报废率',
     'expected_checkin'  => '预计归还日期',
-    'expires'			=> '到期',
-    'fully_depreciated'	=> '足折旧',
+    'expires'			=> '过期',
+    'fully_depreciated'	=> '完全折旧',
     'help_checkout'		=> '如果你希望立即分配该资产，请从上面的状态列表中选择“可部署”。 ',
     'mac_address'		=> 'MAC地址',
     'manufacturer'		=> '生产厂家',
     'model'				=> '型号',
-    'months'			=> '月数',
+    'months'			=> '个月',
     'name'				=> '资产名称',
     'notes'				=> '备注',
     'order'				=> '订单号',
@@ -41,22 +41,25 @@ return [
     'requestable'		=> '用户可能申请了该资产',
     'redirect_to_all'   => '返回到所有 :type',
     'redirect_to_type'   => '跳转到 :type',
-    'redirect_to_checked_out_to'   => '跳转到借用者',
+    'redirect_to_checked_out_to'   => '跳转到已签出者',
     'select_statustype'	=> '选择状态类型',
     'serial'			=> '序列号',
     'status'			=> '状态',
     'tag'				=> '资产标签',
     'update'			=> '更新资产',
     'warranty'			=> '质保',
-        'warranty_expires'		=> '保修期已过',
+        'warranty_expires'		=> '保修到期',
     'years'				=> '年',
     'asset_location' => '更新资产位置',
     'asset_location_update_default_current' => '更新默认位置与实际位置',
     'asset_location_update_default' => '仅更新默认位置',
     'asset_location_update_actual' => '仅更新实际位置',
     'asset_not_deployable' => '该资产状态为不可部署。无法借出此资产。',
-    'asset_deployable' => '该状态为可部署。可以借出此资产。',
+    'asset_not_deployable_checkin' => '此资产状态为不可部署。使用此状态标签将会归还资产。',
+    'asset_deployable' => '此资产可以借出。',
     'processing_spinner' => '处理中...（对于大型文件可能需要一些时间）',
+    'processing' => '正在处理... ',
     'optional_infos'  => '可选信息',
-    'order_details'   => '订单相关信息'
+    'order_details'   => '订单相关信息',
+    'calc_eol'    => '如果将 EOL 日期设为零，则根据购买日期和 报废率 自动计算 EOL。',
 ];
diff --git a/resources/lang/zh-CN/admin/hardware/general.php b/resources/lang/zh-CN/admin/hardware/general.php
index 50216f5338..b9d9371e68 100644
--- a/resources/lang/zh-CN/admin/hardware/general.php
+++ b/resources/lang/zh-CN/admin/hardware/general.php
@@ -5,18 +5,18 @@ return [
     'about_assets_text'            => '资产是按照序列号或者资产标签跟踪的物品。可以标记特殊物品为高价值资产。',
     'archived'  				=> '已存档',
     'asset'  					=> '资产',
-    'bulk_checkout'             => '分配资产',
-    'bulk_checkin'              => '归还资产',
-    'checkin'  					=> '借入资产',
-    'checkout'  				=> '借出资产',
-    'clone'  					=> '复制资产',
+    'bulk_checkout'             => '批量签出',
+    'bulk_checkin'              => '批量归还',
+    'checkin'  					=> '归还资产',
+    'checkout'  				=> '签出资产',
+    'clone'  					=> '克隆资产',
     'deployable'  				=> '可部署',
     'deleted'  					=> '此资产已被删除。',
     'delete_confirm'            => '您确定要删除此资产吗？',
     'edit'  					=> '编辑资产',
-    'model_deleted'  			=> '这个资源模型已被删除。您必须先还原模型才能还原素材。',
+    'model_deleted'  			=> '这个资产型号已被删除。您必须先恢复型号，然后才能恢复此资产。',
     'model_invalid'             => '此资产的型号无效。',
-    'model_invalid_fix'         => '在尝试借出、归还或盘点之前，必须使用有效的资产型号更新资产。',
+    'model_invalid_fix'         => '在尝试签出、归还或盘点之前，必须使用有效的资产型号更新资产。',
     'requestable'               => '可申领',
     'requested'				    => '已申请',
     'not_requestable'           => '不可申领',
@@ -27,7 +27,7 @@ return [
     'undeployable_tooltip'  	=> '此资产的状态标签为不可部署，此时无法借出。',
     'view'  					=> '查看资产',
     'csv_error' => '您的CSV文件中有一个错误：',
-    'import_text' => '<p>上传一个包含资产历史的CSV文件。“资产”和“用户”必须已存在于系统中，否则将被跳过。历史导入的匹配资产是针对资产标签进行的。我们将尝试根据您提供的用户名以及您在下面选择的条件找到匹配的用户。如果您未选择以下任何条件，它只会尝试匹配您在<code>“管理”&gt; “一般设置”</code>中配置的用户名格式。</p><p>CSV 文件中包含的字段必须与以下标题匹配：<strong>资产标签、姓名、借出日期、归还日期</strong>。任何附加字段都将被忽略。</p><p>归还日期：空白或未来的归还日期会将物品借出给关联的用户。不包含“归还日期”列，将创建一个今天日期的归还日期</p>
+    'import_text' => '<p>上传一个包含资产历史的CSV文件。“资产”和“用户”<b>必须</b>已存在于系统中，否则将被跳过。历史导入的匹配资产是针对资产标签进行的。我们将尝试根据您提供的用户名以及您在下面选择的条件找到匹配的用户。如果您未选择以下任何条件，它只会尝试匹配您在<code>“管理”&gt; “一般设置”</code>中配置的用户名格式。</p><p>CSV 文件中包含的字段必须与以下标题匹配：<strong>资产标签、姓名、签出日期、归还日期</strong>。任何附加字段都将被忽略。</p><p>归还日期：空白或未来的归还日期会将物品借出给关联的用户。不包含“归还日期”列，将创建一个今天日期的归还日期</p>
     ',
     'csv_import_match_f-l' => '尝试按<strong>名、姓</strong> (<code>jane.smith</code>)” 格式匹配用户',
     'csv_import_match_initial_last' => '尝试按<strong>名首字母、姓 </strong>(<code>jsmith</code>)” 格式匹配用户',
diff --git a/resources/lang/zh-CN/admin/hardware/message.php b/resources/lang/zh-CN/admin/hardware/message.php
index fad7a68375..c37f6c26e6 100644
--- a/resources/lang/zh-CN/admin/hardware/message.php
+++ b/resources/lang/zh-CN/admin/hardware/message.php
@@ -2,26 +2,31 @@
 
 return [
 
-    'undeployable' 		=> '<strong>警告: </strong>该资产目前已经被标记为不可被分配，如果该资产状态已经改变，请刷新。',
-    'does_not_exist' 	=> '资产不存在',
-    'does_not_exist_var'=> '找不到标签为 :asset_tag 的资产',
-    'no_tag' 	        => '未提供资产标签。',
+    'undeployable' 		 => '<strong>警告： </strong> 此资产已被标记为当前不可部署。如果此状态已经改变，请更新资产状态。',
+    'does_not_exist' 	 => '资产不存在',
+    'does_not_exist_var' => '找不到标签为 :asset_tag 的资产',
+    'no_tag' 	         => '未提供资产标签。',
     'does_not_exist_or_not_requestable' => '该资产不存在或不可申领。',
-    'assoc_users'	 	=> '这个资产目前已经借给某个用户，不能被删除，请检查资产信息，然后再尝试删除。',
-    'warning_audit_date_mismatch' 	=> '此资产的下一个盘点日期 (:next_audit_date) 早于上一个盘点日期 (:last_audit_date)。请更新下一个盘点日期',
+    'assoc_users'	 	 => '这个资产目前已经签出给某个用户，不能被删除，请检查资产信息，然后再尝试删除。 ',
+    'warning_audit_date_mismatch' 	=> '此资产的下一个盘点日期 (:next_audit_date) 早于上一个盘点日期 (:last_audit_date)。请更新下一个盘点日期。',
+    'labels_generated'   => '标签已成功生成。',
+    'error_generating_labels' => '生成标签时出错。',
+    'no_assets_selected' => '没有选择资产。',
 
     'create' => [
         'error'   		=> '资产创建失败，请重试。:(',
         'success' 		=> '资产创建成功。 :)',
         'success_linked' => '带有 :tag 标签的资产已成功创建。<strong><a href=":link" style="color: white;">点击此处查看</a></strong>。',
+        'multi_success_linked' => '带有标签 :links 的资产已成功创建。| :count 个资产已成功创建。 :links。',
+        'partial_failure' => '无法创建资产。原因：:failures|:count 个资产无法创建。原因：:failures',
     ],
 
     'update' => [
         'error'   			=> '资产更新失败，请重试。',
         'success' 			=> '资产更新成功。',
         'encrypted_warning' => '资产更新成功，但加密的自定义字段不是由于权限',
-        'nothing_updated'	=>  '一个也没有选，所以什么也不会更新。',
-        'no_assets_selected'  =>  '没有选择任何资产，因此没有更新任何内容。',
+        'nothing_updated'	=>  '一个字段也没选，所以不会更新。',
+        'no_assets_selected'  =>  '没有选择资产，所以没有任何内容被更新。',
         'assets_do_not_exist_or_are_invalid' => '无法更新选定的资产。',
     ],
 
@@ -33,7 +38,7 @@ return [
     ],
 
     'audit' => [
-        'error'   		=> '资产盘点失败 :error ',
+        'error'   		=> '资产盘点失败：:error ',
         'success' 		=> '资产审计已成功记录。',
     ],
 
@@ -51,44 +56,54 @@ return [
     ],
 
     'import' => [
-        'error'                 => '某些字段没有正确导入',
+        'import_button'         => '流程导入',
+        'error'                 => '某些项目没有正确导入。',
         'errorDetail'           => '以下项由于错误未被导入',
         'success'               => '您的文件已被导入',
         'file_delete_success'   => '您的文件已成功删除',
         'file_delete_error'      => '该文件无法被删除',
         'file_missing' => '所选文件丢失',
+        'file_already_deleted' => '选择的文件已被删除',
         'header_row_has_malformed_characters' => '标题行中的一个或多个属性包含格式错误的 UTF-8 字符',
         'content_row_has_malformed_characters' => '第一行内容中的一个或多个属性包含格式错误的 UTF-8 字符',
+        'transliterate_failure' => '从 :encoding 到 UTF-8 翻译失败，因为输入的字符无效'
     ],
 
 
     'delete' => [
         'confirm'   	=> '你确定要删除这个资产吗？',
         'error'   		=> '删除资产的过程中出现了一点儿问题，请重试。',
+        'assigned_to_error' => '{1}Asset Tag: :asset_tag 目前已签出。在删除此设备之前请先归还。 [2,*] Asset Tags: :asset_tag 目前已签出。在删除此设备之前请先归还。',
         'nothing_updated'   => '没有选择任何资产，所以没有删除任何资产。',
         'success' 		=> '资产成功被删除。',
     ],
 
     'checkout' => [
-        'error'   		=> '资产未被借出，请重试',
-        'success' 		=> '资产借出成功。',
+        'error'   		=> '资产未被签出，请重试',
+        'success' 		=> '资产签出成功。',
         'user_does_not_exist' => '无效用户，请重试。',
-        'not_available' => '此资产无法借出',
+        'not_available' => '此资产无法签出！',
         'no_assets_selected' => '您必须在这个列表中选择至少一项资产',
     ],
 
+    'multi-checkout' => [
+        'error'   => '资产未签出，请重试 |资产未签出，请重试',
+        'success' => '资产签出成功。 |资产签出成功。',
+    ],
+
     'checkin' => [
-        'error'   		=> '资产还没有借入，请重试。',
-        'success' 		=> '资产借入成功。',
+        'error'   		=> '资产还没有归还，请重试。',
+        'success' 		=> '资产归还成功。',
         'user_does_not_exist' => '无效用户，请重试。',
-        'already_checked_in'  => '资产已经被申领',
+        'already_checked_in'  => '该资产已经归还。',
 
     ],
 
     'requests' => [
-        'error'   		=> '未能成功请求分配资产，请重试。',
-        'success' 		=> '成功请求资产',
-        'canceled'      => '借出申请已取消。',
+        'error'   		=> '申请失败，请重试。',
+        'success' 		=> '申请提交成功。',
+        'canceled'      => '申请已取消。',
+        'cancel'        => '取消申请此物品',
     ],
 
 ];
diff --git a/resources/lang/zh-CN/admin/hardware/table.php b/resources/lang/zh-CN/admin/hardware/table.php
index 2724a1a89c..58c4a0fd12 100644
--- a/resources/lang/zh-CN/admin/hardware/table.php
+++ b/resources/lang/zh-CN/admin/hardware/table.php
@@ -7,13 +7,13 @@ return [
     'assigned_to'   => '已分配给',
     'book_value'  	=> '当前值',
     'change' 		=> '进/出',
-    'checkout_date' => '借出日期',
-    'checkoutto' 	=> '已借出',
+    'checkout_date' => '签出日期',
+    'checkoutto' 	=> '已签出',
     'components_cost' => '组件总成本',
     'current_value' => '当前值',
     'diff' 			=> '差价',
     'dl_csv' 		=> '下载CSV格式',
-    'eol' 			=> '寿命',
+    'eol' 			=> '生命周期',
     'id'      		=> '编号',
     'last_checkin_date' => '上次归还日期',
     'location' 		=> '位置',
@@ -25,7 +25,6 @@ return [
     'image'		    => '设备图片',
     'days_without_acceptance' => '过期天数',
     'monthly_depreciation' => '每月折旧率',
-    'assigned_to'    => '已分配给',
     'requesting_user' => '申领中的用户',
     'requested_date' => '请求日期',
     'changed'       => '已修改',
diff --git a/resources/lang/zh-CN/admin/kits/general.php b/resources/lang/zh-CN/admin/kits/general.php
index e8a496546a..97aa50d8f5 100644
--- a/resources/lang/zh-CN/admin/kits/general.php
+++ b/resources/lang/zh-CN/admin/kits/general.php
@@ -1,17 +1,17 @@
 <?php
 
 return [
-    'about_kits_title'                  => '关于预定义工具包',
-    'about_kits_text'                   => '预定义工具包让您可以快速向用户签出一系列项目（资产、许可证等）。当您的入职流程在许多用户之间是一致的，并且所有用户都会收到相同的项目时，这将会很有帮助。',
-    'checkout'                          => '签出工具 ',
-    'create_success'                    => '工具包成功创建。',
-    'create'                            => '创建预定义工具包',
-    'update'                            => '更新预定义工具包',
-    'delete_success'                    => '工具包被成功删除。',
-    'update_success'                    => '工具包被成功更新。',
+    'about_kits_title'                  => '关于预设套装',
+    'about_kits_text'                   => '预设套装让您可以快速向用户签出出一套物品（如：资产、许可证等）。如果贵司的入职流程适用于大部分用户，并且这些用户都会领取到同样的物品时，这个功能会非常好用。',
+    'checkout'                          => '签出套装 ',
+    'create_success'                    => '套装创建成功。',
+    'create'                            => '创建预设套装',
+    'update'                            => '更新预设套装',
+    'delete_success'                    => '套装删除成功。',
+    'update_success'                    => '套装更新成功。',
     'none_models'                       => '没有足够的可用资产供 :model 签出，需要 :qty 。 ',
-    'none_licenses'                     => '没有足够的可用坐席可供签出 :license。 需要 :qty。 ',
-    'none_consumables'                  => '没有足够的:consumable可用来签出，需要 :qty 。 ',
+    'none_licenses'                     => '没有足够的可用席位可供签出 :license。 需要 :qty。 ',
+    'none_consumables'                  => '没有足够的 :consumable 可用来签出，需要 :qty 。 ',
     'none_accessory'                    => '没有足够的 :accessory 可用来签出，需要 :qty。 ',
     'append_accessory'                  => '附加配件',
     'update_appended_accessory'         => '更新附加的配件',
@@ -47,4 +47,5 @@ return [
     'kit_deleted'                       => '套件已删除',
     'kit_model_updated'                 => '型号已更新',
     'kit_model_detached'                => '型号已成功分离。',
+    'model_already_attached'            => '该型号已附加到套件',
 ];
diff --git a/resources/lang/zh-CN/admin/licenses/form.php b/resources/lang/zh-CN/admin/licenses/form.php
index e3a8d583f4..cae586f506 100644
--- a/resources/lang/zh-CN/admin/licenses/form.php
+++ b/resources/lang/zh-CN/admin/licenses/form.php
@@ -3,19 +3,19 @@
 return array(
 
     'asset'             => '资产',
-    'checkin'           => '借入',
+    'checkin'           => '归还',
     'create'            => '创建许可证',
     'expiration'        => '到期日期',
     'license_key'       => '产品序列号',
-    'maintained'        => '保持',
+    'maintained'        => '维保',
     'name'              => '软件名称',
-    'no_depreciation'   => '永久',
+    'no_depreciation'   => '不折旧',
     'purchase_order'    => '采购订单号码',
     'reassignable'      => '可重新授权',
     'remaining_seats'   => '剩余次数',
     'seats'             => '允许使用次数',
     'termination_date'  => '终止日期',
-    'to_email'          => '许可电子邮件',
+    'to_email'          => '许可人电子邮件',
     'to_name'           => '许可人名字',
     'update'            => '更新许可证',
     'checkout_help'     => '请检查这个许可证是不是已经分配给了某个人或某个设备。你可以选择全部，但是资产归属人必须是相同的。'
diff --git a/resources/lang/zh-CN/admin/licenses/general.php b/resources/lang/zh-CN/admin/licenses/general.php
index 5ac9d12bca..ae419daebe 100644
--- a/resources/lang/zh-CN/admin/licenses/general.php
+++ b/resources/lang/zh-CN/admin/licenses/general.php
@@ -2,10 +2,10 @@
 
 return array(
     'about_licenses_title'      => '关于许可证',
-    'about_licenses'            => '许可证用于跟踪软件。 它们包含特殊位数的数字，可以借出给个人。',
-    'checkin'  					=> '接入许可证数量',
-    'checkout_history'  		=> '借出历史记录',
-    'checkout'  				=> '借出许可证数量',
+    'about_licenses'            => '软件许可证用于监控软件的使用情况。它们拥有一定数量的席位，可以分配给个人使用',
+    'checkin'  					=> '归还许可证席位',
+    'checkout_history'  		=> '签出历史记录',
+    'checkout'  				=> '签出许可证数量',
     'edit'  					=> '编辑许可证',
     'filetype_info'				=> '允许的文件类型有： png, gif, jpg, jpeg, doc, docx, pdf, txt, zip, rar',
     'clone'  					=> '克隆许可证',
@@ -13,39 +13,40 @@ return array(
     'in_out'  					=> '进/出',
     'info'  					=> '授权信息',
     'license_seats'  			=> '授权数量',
-    'seat'  					=> '次数',
-    'seats'  					=> '允许使用次数',
+    'seat'  					=> '席位',
+    'seat_count'  				=> '席位 :count',
+    'seats'  					=> '席位',
     'software_licenses'  		=> '软件许可证',
     'user'  					=> '用户',
     'view'  					=> '查看许可证',
-    'delete_disabled'           => '此许可证不能被删除，因为有些席位仍然被借出。',
+    'delete_disabled'           => '此许可证不能被删除，因为仍有席位被签出。',
     'bulk'                      =>
         [
             'checkin_all'           => [
                 'button'            => '归还所有席位',
-                'modal'             => '此操作将归还一个席位。| 此操作将归还此许可证的所有 :checkedout_seas_count 个座位。',
+                'modal'             => '此操作将归还一个席位。| 此操作将归还这个许可证的所有共 :checkedout_seas_count 个席位。',
                 'enabled_tooltip'   => '从用户和资产中归还此许可证的所有席位',
-                'disabled_tooltip'  => '此功能已禁用，因为当前没有借出的席位',
+                'disabled_tooltip'  => '此功能已禁用，因为当前没有签出的席位',
                 'disabled_tooltip_reassignable'  => '此功能已禁用，因为许可证不可重新分配。',
                 'success'           => '许可证归还成功！| 所有许可证都已归还成功！',
-                'log_msg'           => '通过批量许可证签出在许可证GUI中签入',
+                'log_msg'           => '通过许可证GUI中的“批量归还许可证”进行归还',
             ],
 
             'checkout_all'              => [
-                'button'                => '借出所有席位',
-                'modal'                 => '此操作将借出一个席位给第一个可用的用户。| 此操作将借出所有 :available _seas_count 个席位给第一个可用的用户。 如果此许可证尚未借出给用户，并且在该用户账户上启用了“自动分配许可证”属性，则认定该用户可以使用此席位。',
-                'enabled_tooltip'   => '向所有用户借出所有（或尽可能多）的席位',
+                'button'                => '签出所有席位',
+                'modal'                 => '此操作将签出一个席位给第一个可用的用户。| 此操作将签出所有共 :available _seas_count 个席位给第一个可用的用户。 如果此许可证尚未签出给用户，并且在该用户账户上启用了“自动分配许可证”属性，则认定该用户可以使用此席位。',
+                'enabled_tooltip'   => '向所有用户签出所有（或尽可能多）的席位',
                 'disabled_tooltip'  => '此功能已禁用，因为当前没有可用的席位',
-                'success'           => '许可证成功借出！ | :count 个许可证成功借出！',
+                'success'           => '许可证成功签出！ | :count 个许可证成功签出！',
                 'error_no_seats'    => '此许可证已无剩余席位。',
                 'warn_not_enough_seats'    => ':count 个用户被分配了此许可证，但我们没有可用的许可证席位。',
                 'warn_no_avail_users'    => '没有什么要做的。没有尚未分配此许可证的用户。',
-                'log_msg'           => '在许可证GUI中通过批量许可证结帐签出',
+                'log_msg'           => '在许可证GUI中通过“批量许可证签出”签出',
 
 
             ],
     ],
 
-    'below_threshold' => '此许可证仅剩:remaining_count个席位，且最小数量为:min_amt。你可能需要考虑购买更多座位。',
+    'below_threshold' => '此许可证仅剩:remaining_count个席位，并且最小数量为:min_amt。你可能需要考虑购买更多席位。',
     'below_threshold_short' => '该项低于最低要求数量。',
 );
diff --git a/resources/lang/zh-CN/admin/licenses/message.php b/resources/lang/zh-CN/admin/licenses/message.php
index 5d18a1d7d4..84a7d948b0 100644
--- a/resources/lang/zh-CN/admin/licenses/message.php
+++ b/resources/lang/zh-CN/admin/licenses/message.php
@@ -5,11 +5,11 @@ return array(
     'does_not_exist' => '许可证不存在或您没有查看权限。',
     'user_does_not_exist' => '用户不存在或您没有查看权限。',
     'asset_does_not_exist' 	=> '您正在授权的资产不存在。',
-    'owner_doesnt_match_asset' => '您正在授权的资产已经被占用，请选择其他人。',
+    'owner_doesnt_match_asset' => '您尝试与此许可证关联的资产不属于在“分配给”下拉菜单中选择的人。',
     'assoc_users'	 => '此许可证已经分配给某个用户，目前不能被删除，请检查资产信息，然后再尝试删除。',
     'select_asset_or_person' => '您必须选择资产或用户，但不能同时选择两者。',
     'not_found' => '找不到许可证',
-    'seats_available' => ':see_count 座位可用',
+    'seats_available' => ':see_count 个席位可用',
 
 
     'create' => array(
@@ -26,7 +26,7 @@ return array(
         'error'   => '文件上传失败，请重试。',
         'success' => '文件上传成功。',
         'nofiles' => '尚未选择要上传的文件，或上传的文件过大。',
-        'invalidfiles' => '一个或多个文件过大或文件类型不被允许。允许上传的文件类型有PNG，Gif，Jpg，Jpeg，Doc，Docx，Pdf，Txt，Zip，Rar，Rtf，Xml和LIC。',
+        'invalidfiles' => '您的一个或多个文件过大或文件类型不被允许。允许的文件类型为 png、gif、jpg、jpeg、doc、docx、pdf、txt、zip、rar、rtf、xml 和 lic。',
     ),
 
     'update' => array(
@@ -41,14 +41,17 @@ return array(
     ),
 
     'checkout' => array(
-        'error'   => '分配（借出）许可证的过程中出现了一些问题，请重试。',
-        'success' => '许可证已经成功借出',
-        'not_enough_seats' => '没有足够的许可证座位可供结账',
+        'error'   => '签出许可证的过程中出现了一些问题，请重试。',
+        'success' => '许可证已经成功签出',
+        'not_enough_seats' => '没有足够的许可证席位可供签出',
+        'mismatch' => '提供的许可证席位与许可证不匹配',
+        'unavailable' => '这个席位不能签出。',
     ),
 
     'checkin' => array(
-        'error'   => '借入许可证的过程中出现了一些问题，请重试。',
-        'success' => '许可证已经成功借入。'
+        'error'   => '归还许可证的过程中出现了一些问题，请重试。',
+        'not_reassignable' => '许可证不可重新分配',
+        'success' => '许可证已经成功归还。'
     ),
 
 );
diff --git a/resources/lang/zh-CN/admin/licenses/table.php b/resources/lang/zh-CN/admin/licenses/table.php
index cb5b87f9f3..f93ceb352c 100644
--- a/resources/lang/zh-CN/admin/licenses/table.php
+++ b/resources/lang/zh-CN/admin/licenses/table.php
@@ -10,7 +10,7 @@ return array(
     'license_name'   	=> '授权给',
     'purchase_date'   	=> '采购日期',
     'purchased'   		=> '已购买',
-    'seats'   			=> '允许使用次数',
+    'seats'   			=> '席位',
     'hardware'   		=> '硬件',
     'serial'   			=> '序列号',
     'title'      		=> '授权许可',
diff --git a/resources/lang/zh-CN/admin/locations/message.php b/resources/lang/zh-CN/admin/locations/message.php
index cec98cdf30..20c8f9e154 100644
--- a/resources/lang/zh-CN/admin/locations/message.php
+++ b/resources/lang/zh-CN/admin/locations/message.php
@@ -3,11 +3,12 @@
 return array(
 
     'does_not_exist' => '位置不存在',
-    'assoc_users'    => '此位置目前不可删除，因为它是至少一个资产或用户的记录所在位置， 资产已分配给它，或者是另一个地点的上级位置。 请更新您的型号以不再关联此公司，然后重试。 ',
+    'assoc_users'    => '由于这个地点至少为一个资产或用户的记录位置，或有资产分配给它，或是其他地点的父级地点，因此目前无法删除。请更新您的记录，移除对此地点的引用，然后重试。 ',
     'assoc_assets'	 => '删除失败，该位置已与其它资产关联。请先更新资产以取消关联，然后重试。 ',
     'assoc_child_loc'	 => '删除失败，该位置是一个或多个子位置的上层节点。请更新地理位置信息以取消关联，然后重试。 ',
     'assigned_assets' => '已分配的资产',
-    'current_location' => '当前地理位置',
+    'current_location' => '当前位置',
+    'open_map' => '在 :map_provider_icon 地图中打开',
 
 
     'create' => array(
@@ -20,6 +21,11 @@ return array(
         'success' => '位置更新成功。'
     ),
 
+    'restore' => array(
+        'error'   => '位置未恢复，请重试',
+        'success' => '位置恢复成功。'
+    ),
+
     'delete' => array(
         'confirm'   	=> '确定删除这个位置吗?',
         'error'   => '删除位置的过成中出现了一点儿问题，请重试。',
diff --git a/resources/lang/zh-CN/admin/locations/table.php b/resources/lang/zh-CN/admin/locations/table.php
index 3bc1fafb75..54234af508 100644
--- a/resources/lang/zh-CN/admin/locations/table.php
+++ b/resources/lang/zh-CN/admin/locations/table.php
@@ -1,19 +1,19 @@
 <?php
 
 return [
-    'about_locations_title'     => '管理地理位置',
-    'about_locations'           => '地理位置用来跟踪用户、资产和其他项目的位置信息。',
+    'about_locations_title'     => '关于位置',
+    'about_locations'           => '位置用来跟踪用户、资产和其他项目的信息',
     'assets_rtd'                => '资产', // This has NEVER meant Assets Retired. I don't know how it keeps getting reverted.
-    'assets_checkedout'         => '持有人',
+    'assets_checkedout'         => '已分配的资产',
     'id'                        => '编号',
     'city'                      => '城市',
     'state'                     => '省份',
     'country'                   => '国家',
-    'create'                    => '创建地理位置',
-    'update'                    => '更新地理位置',
+    'create'                    => '创建位置',
+    'update'                    => '更新位置',
     'print_assigned'            => '打印已分配资产',
     'print_all_assigned'        => '打印所有已分配资产',
-    'name'                      => '地理位置名称',
+    'name'                      => '位置名称',
     'address'                   => '地址',
     'address2'                   => '地址行2',
     'zip'                       => '邮政编码',
@@ -39,4 +39,5 @@ return [
     'signed_by_finance_auditor' => '签名(财务人员):',
     'signed_by_location_manager' => '签名(当地经理):',
     'signed_by'                 => '签名:',
+    'clone'  					=> '克隆位置',
 ];
diff --git a/resources/lang/zh-CN/admin/manufacturers/table.php b/resources/lang/zh-CN/admin/manufacturers/table.php
index 307439831b..68544df8a3 100644
--- a/resources/lang/zh-CN/admin/manufacturers/table.php
+++ b/resources/lang/zh-CN/admin/manufacturers/table.php
@@ -4,7 +4,7 @@ return array(
     'about_manufacturers_title'    => '关于制造商',
     'about_manufacturers_text'  => '制造商是您资产的生产厂家。您可以保存一些重要的客服信息，可以方便进行故障报修等操作，这些信息将显示到资产的详情页中。',
     'asset_manufacturers'	=> '资产制造商',
-    'create'				=> '创建制造厂',
+    'create'				=> '创建制造商',
     'id'   					=> '编号',
     'name'      			=> '名称',
     'support_email'   		=> '邮件客服支持',
diff --git a/resources/lang/zh-CN/admin/models/general.php b/resources/lang/zh-CN/admin/models/general.php
index 9f3c23aa65..2a9d17bb16 100644
--- a/resources/lang/zh-CN/admin/models/general.php
+++ b/resources/lang/zh-CN/admin/models/general.php
@@ -2,8 +2,8 @@
 
 return array(
     'about_models_title'     => '关于资产型号',
-    'about_models_text'           => '资产型号是将相同资产分组的一种方式。"MBP 2013"、"IPhone 6s"等。',
-    'deleted'  					        => '此模型已被删除。',
+    'about_models_text'           => '资产型号是将相同型号资产分组的方式。例如"MBP 2013"、"IPhone 6s"等。',
+    'deleted'  					=> '此型号已被删除。',
     'bulk_delete'               => '批量删除资产型号',
     'bulk_delete_help'               => '使用下面的复选框确认删除所选资产型号。若有与之关联的资产，该资产型号则不能删除，除非将关联资产关联到别的资产型号。',
     'bulk_delete_warn'          => '您即将删除一个资产型号。 |您将删除 :model_count 个资产型号。',
@@ -11,7 +11,7 @@ return array(
     'requestable'               => '用户可申请此型号',
 	'show_mac_address'			      => '在此型号资产中显示MAC地址',
     'view_deleted'              => '查看已删除',
-    'view_models'               => '查看已型号',
+    'view_models'               => '查看型号',
     'fieldset'                  => '字段集',
     'no_custom_field'           => '没有自定义字段',
     'add_default_values'        => '添加默认值',
diff --git a/resources/lang/zh-CN/admin/models/message.php b/resources/lang/zh-CN/admin/models/message.php
index a0fd169655..5280efc59b 100644
--- a/resources/lang/zh-CN/admin/models/message.php
+++ b/resources/lang/zh-CN/admin/models/message.php
@@ -3,16 +3,16 @@
 return array(
 
     'deleted' => '已删除资产型号',
-    'does_not_exist' => '模板不存在',
+    'does_not_exist' => '型号不存在。',
     'no_association' => '警告！此物品的资产型号无效或丢失！',
     'no_association_fix' => '这将以怪异且可怕的方式破坏一切。立即编辑此资产并为其指定一个型号。',
-    'assoc_users'	 => '本模板下目前还有相关的资产，不能被删除，请删除资产以后，再重试。',
-
+    'assoc_users'	 => '本型号下目前还有相关的资产，不能被删除，请删除资产以后，再重试。 ',
+    'invalid_category_type' => '此类别必须是一个资产类别。',
 
     'create' => array(
-        'error'   => '模板没有被创建，请重试。',
-        'success' => '模板创建成功。',
-        'duplicate_set' => '资产名称、制造商和编号都相同的其它资产模板已存在。',
+        'error'   => '型号没有被创建，请重试。',
+        'success' => '型号创建成功。',
+        'duplicate_set' => '资产名称、制造商和编号都相同的资产型号已存在。',
     ),
 
     'update' => array(
diff --git a/resources/lang/zh-CN/admin/models/table.php b/resources/lang/zh-CN/admin/models/table.php
index c5325c717d..8fc4f5ea96 100644
--- a/resources/lang/zh-CN/admin/models/table.php
+++ b/resources/lang/zh-CN/admin/models/table.php
@@ -2,16 +2,16 @@
 
 return array(
 
-    'create'				=> '创建资产模板',
+    'create'				=> '创建资产型号',
     'created_at' 			=> '创建于',
-    'eol'	 				=> '寿命',
-    'modelnumber'   		=> '型号',
+    'eol'	 				=> '生命周期',
+    'modelnumber'   		=> '型号编码',
     'name'      			=> '资产型号名称',
     'numassets' 			=> '资产',
-    'title'					=> '资产模板',
-    'update'				=> '更新资产模板',
-    'view'					=> '查看资产模板',
-    'update'				=> '更新资产模板',
-    'clone'				=> '克隆模板',
-    'edit'				=> '编辑模板',
+    'title'					=> '资产型号',
+    'update'				=> '更新资产型号',
+    'view'					=> '查看资产型号',
+    'update'				=> '更新资产型号',
+    'clone'				=> '克隆型号',
+    'edit'				=> '编辑型号',
 );
diff --git a/resources/lang/zh-CN/admin/reports/general.php b/resources/lang/zh-CN/admin/reports/general.php
index fe261e95d1..3d16a1cc2a 100644
--- a/resources/lang/zh-CN/admin/reports/general.php
+++ b/resources/lang/zh-CN/admin/reports/general.php
@@ -1,9 +1,10 @@
 <?php
 
 return [
-    'info'   => '请选择你要报备资产的选项。',
+    'info'   => '选择您需要的资产报告选项。',
     'deleted_user' => '已删除用户',
     'send_reminder' => '发送提醒',
+    'cannot_send_reminder' => '用户已被删除或没有电子邮件地址，因此无法接收提醒',
     'reminder_sent' => '提醒信息已发送',
     'acceptance_deleted' => '接受请求已删除',
     'acceptance_request' => '接受请求',
@@ -13,5 +14,10 @@ return [
         'user_state' => '用户州',
         'user_country' => '用户国家',
         'user_zip' => '用户邮编'
-    ]
-];
\ No newline at end of file
+    ],
+    'open_saved_template' => '打开保存的模板',
+    'save_template' =>  '保存模板',
+    'select_a_template' => '选择模板',
+    'template_name' => '模板名称',
+    'update_template' => '更新模板',
+];
diff --git a/resources/lang/zh-CN/admin/reports/message.php b/resources/lang/zh-CN/admin/reports/message.php
index cf0e4a14ad..83fd467cd4 100644
--- a/resources/lang/zh-CN/admin/reports/message.php
+++ b/resources/lang/zh-CN/admin/reports/message.php
@@ -1,5 +1,16 @@
 <?php
 
-return array(
-    'error'   => '你至少选择一个选项。'
-);
+return [
+    'about_templates' => '关于保存的模板',
+    'saving_templates_description' => '选择您的选项，然后在上面的框中输入您的模板的名称并点击“保存模板”按钮。 使用下拉菜单选择以前保存的模板。',
+    'create'  => [
+        'success' => '模板保存成功',
+    ],
+    'update' => [
+        'success' => '模板更新成功',
+    ],
+    'delete' => [
+        'success' => '模板已删除',
+        'no_delete_permission' => '模板不存在或您没有权限删除它。',
+    ],
+];
diff --git a/resources/lang/zh-CN/admin/settings/general.php b/resources/lang/zh-CN/admin/settings/general.php
index fb8387dcd6..80102b9135 100644
--- a/resources/lang/zh-CN/admin/settings/general.php
+++ b/resources/lang/zh-CN/admin/settings/general.php
@@ -1,21 +1,21 @@
 <?php
 
 return [
-    'ad'				        => 'Active Directory活动目录',
+    'ad'				        => 'Active Directory',
     'ad_domain'				    => 'AD域',
     'ad_domain_help'			=> '通常(但并非全部情况下)这与您的邮件域相同',
     'ad_append_domain_label'    => '附加域名',
     'ad_append_domain'          => '添加域名到用户名字段',
     'ad_append_domain_help'     => '不要求用户输入“"username@domain.local"，他们只需输入“username”。',
     'admin_cc_email'            => '邮件抄送',
-    'admin_cc_email_help'       => '如果你想给用户额外的邮件账户发送签入/签出副本，请在此输入邮箱地址，否则请留空。',
+    'admin_cc_email_help'       => '将归还/签出邮件的副本发送到此地址。',
     'admin_settings'            => '管理员设置',
     'is_ad'				        => '这是AD域服务器',
     'alerts'                	=> '警报',
     'alert_title'               => '更新通知设置',
-    'alert_email'				=> '发送警报',
-    'alert_email_help'    => '您希望向其发送警报的电子邮件地址或通讯组列表，以逗号分隔',
-    'alerts_enabled'			=> '警报已启用',
+    'alert_email'				=> '发送警报到',
+    'alert_email_help'          => '需要接收警报的电子邮件地址或通讯组列表，请用逗号分隔。',
+    'alerts_enabled'			=> '邮件警报已启用',
     'alert_interval'			=> '警报阈值(天)',
     'alert_inv_threshold'		=> '库存警报阈值',
     'allow_user_skin'           => '允许用户自定义皮肤',
@@ -31,6 +31,8 @@ return [
     'backups'					=> '备份',
     'backups_help'              => '创建、下载、恢复备份 ',
     'backups_restoring'         => '从备份中还原',
+    'backups_clean' => '恢复前清理备份数据库',
+    'backups_clean_helptext' => "如果您数据库版本发生变化，这可能是有用的",
     'backups_upload'            => '上传备份',
     'backups_path'              => '服务器上的备份存储在 <code>:path</code>',
     'backups_restore_warning'   => '使用恢复按钮 <small><span class="btn btn-xs btn-warning"><i class="text-white fas fa-retweet" aria-hidden="true"></i></span></small> 从上次备份恢复。 (目前无法使用 S3 文件存储或 Docker容器。)<br><br>您的 <strong>完整的 :app_name 数据库和任何上传的文件将被备份文件中的内容完全替换</strong>  ',
@@ -40,41 +42,42 @@ return [
     'confirm_purge'			    => '确认清除',
     'confirm_purge_help'		=> '在下面的框中输入文本“DELETE”以清除已删除的记录。此操作无法撤消，将永久删除所有软删除的项目和用户。（为了安全起见，你应该先做个备份。）',
     'custom_css'				=> '自定义 CSS',
+    'custom_css_placeholder'	=> '添加您的自定义 CSS',
     'custom_css_help'			=> '键入你喜欢的CSS格式覆盖。不要包括：&lt;style&gt;&lt;/style&gt; 标签。',
     'custom_forgot_pass_url'	=> '密码重置网址',
     'custom_forgot_pass_url_help'	=> '这将替换登录屏幕上的忘记密码URL，有助于将用户引导至内部或托管的LDAP密码重置服务。它将禁用本地用户密码重置功能。',
     'dashboard_message'			=> '仪表盘消息',
     'dashboard_message_help'	=> '此文本将显示在仪表盘上，供有权查看仪表盘的任何人使用。',
     'default_currency'  		=> '默认货币',
-    'default_eula_text'			=> 'Default EULA',
+    'default_eula_text'			=> '默认最终用户许可协议（EULA）',
+    'default_eula_text_placeholder' => '添加默认最终用户许可协议（EULA）文本',
     'default_language'			=> '默认语言',
-    'default_eula_help_text'	=> '你也可以将自定义的EULA与特定资产分类相关联。',
+    'default_eula_help_text'	=> '你也可以将自定义的最终用户许可协议（EULA）与特定资产分类相关联。',
     'acceptance_note'           => '为您的决定添加备注(可选)',
     'display_asset_name'        => '显示资产名称',
-    'display_checkout_date'     => '显示借出日期',
+    'display_checkout_date'     => '显示签出日期',
     'display_eol'               => '以表格形式显示寿命期限',
     'display_qr'                => '显示二维码',
     'display_alt_barcode'		=> '显示条码',
-    'email_logo'                => '电子邮件标志',
     'barcode_type'				=> '二维码类型',
     'alt_barcode_type'			=> '条码类型',
-    'email_logo_size'       => '电子邮件中最好使用方形标志。 ',
     'enabled'                   => '启用',
-    'eula_settings'				=> '最终用户许可协议(EULA)设置',
+    'eula_settings'				=> '最终用户许可协议（EULA）设置',
     'eula_markdown'				=> 'EULA中可以使用<a href="https://help.github.com/articles/github-flavored-markdown/">Github flavored markdown</a>.',
-    'favicon'                   => '收藏夹图标',
+    'empty_row_count'           => '字段偏移开始(空行)',
+    'empty_row_count_help'      => '当标签顶部的此数量空行被跳过后，字段才会开始填充。',
+    'favicon'                   => '网站图标',
     'favicon_format'            => '可接受的文件类型是ico、png和gif。其他图像格式可能无法在所有浏览器中显示。',
-    'favicon_size'          => '收藏图标 应该是方形图像，16x16像素。',
+    'favicon_size'          => '网站图标应该是方形，16x16像素。',
     'footer_text'               => '附加页脚文本 ',
     'footer_text_help'          => '此文本将显示在右侧页脚中。链接允许使用 <a href="https://help.github.com/articles/github-flavored-markdown/">Github flavored markdown</a>。换行符、页眉、图像等可能会导致不可预知的结果。',
+    'footer_text_placeholder'   => '可选页脚文本',
     'general_settings'			=> '一般设置',
-    'general_settings_keywords' => '公司支持、 签名、 接受、 电子邮件格式、 用户名格式、 图片、每页、 缩略图、 eula、 gravatar、 tos、 仪表盘、 隐私保护',
-    'general_settings_help'     => '默认的 EULA和更多',
+    'general_settings_help'     => '默认的最终用户许可协议以及更多',
     'generate_backup'			=> '生成备份',
     'google_workspaces'         => 'Google Workspaces',
     'header_color'              => '标题颜色',
     'info'                      => '这些设置允许您自定义安装的某些方面',
-    'label_logo'                => '标签标志',
     'label_logo_size'           => '方形标志看起来最好——将显示在每个资产标签的右上角。 ',
     'laravel'                   => 'Laravel版本',
     'ldap'                      => 'LDAP',
@@ -89,18 +92,18 @@ return [
     'ldap_settings'             => 'LDAP 设置',
     'ldap_client_tls_cert_help' => 'LDAP 连接的客户端TLS 证书和密钥通常仅用于谷歌工作空间配置，两者都是必需的。',
     'ldap_location'             => 'LDAP 位置',
-'ldap_location_help'             => '如果<strong>在 Base Bind DN 中没有使用OU</strong>，则LDAP 位置字段应当被使用；如果正在使用OU Search，请将此项留空。',
-    'ldap_login_test_help'      => '根据你指定的base DN，输入有效的LDAP用户名和密码，以测试您的LDAP登录是否配置正确。当然您必须先保存您更改的LDAP设置。',
+'ldap_location_help'             => '如果 <strong>Base Bind DN 未指定组织单元 (OU)</strong>，则应使用 Ldap Location 字段来指定位置。 如果正在使用组织单元 (OU) 搜索，则请将此字段留空。',
+    'ldap_login_test_help'      => '根据你指定的base DN，输入有效的LDAP用户名和密码，以测试您的LDAP登录是否配置正确。<b>当然您必须先保存您更改的LDAP设置。</b>',
     'ldap_login_sync_help'      => '这只证明了LDAP同步正确。如果您的LDAP身份验证查询设置不正确，用户可能仍然无法登录。当然您必须先保存您的LDAP设置。',
-    'ldap_manager'              => 'LDAP 领导（Manager）',
+    'ldap_manager'              => 'LDAP 管理者',
     'ldap_server'               => 'LDAP 服务器',
-    'ldap_server_help'          => '这应以ldap:// (for unencrypted or TLS)或 ldaps:// (for SSL)开头',
+    'ldap_server_help'          => '此处应该以 ldap:// (对于未加密的) 或 ldaps:// (对于TLS 或 SSL) 开始',
     'ldap_server_cert'			=> '检验LDAP的SSL证书',
     'ldap_server_cert_ignore'	=> '允许未通过校验的SSL证书',
     'ldap_server_cert_help'		=> '如果你使用了自签发证书，请勾选',
     'ldap_tls'                  => '使用TLS',
     'ldap_tls_help'             => '仅当LDAP服务器使用STARTTLS时本选项才被勾选',
-    'ldap_uname'                => 'LDAP 用户名',
+    'ldap_uname'                => 'LDAP 绑定用户名',
     'ldap_dept'                 => 'LDAP 部门',
     'ldap_phone'                => 'LDAP 电话号码',
     'ldap_jobtitle'             => 'LDAP 职位',
@@ -108,22 +111,24 @@ return [
     'ldap_pword'                => 'LDAP 密码',
     'ldap_basedn'               => 'Base Bind DN',
     'ldap_filter'               => 'LDAP 过滤器',
-    'ldap_pw_sync'              => 'LDAP 密码同步',
-    'ldap_pw_sync_help'         => '若您不想让 LDAP 密码与系统密码同步，请勿勾选此项。取消同步设置将造成当系统与 LDAP 失去连接时，用户无法登录。',
+    'ldap_pw_sync'              => '缓存 LDAP 密码',
+    'ldap_pw_sync_help'         => '如果您不希望将LDAP密码缓存为本地哈希密码，请取消选中此项。 禁用这意味着如果您的LDAP服务器因某些原因无法访问，您的用户可能无法登录。',
     'ldap_username_field'       => '用户名字段',
     'ldap_lname_field'          => '姓氏',
     'ldap_fname_field'          => 'LDAP用户名字字段',
     'ldap_auth_filter_query'    => 'LDAP认证请求',
     'ldap_version'              => 'LDAP 版本',
     'ldap_active_flag'          => 'LDAP 启用标志',
-    'ldap_activated_flag_help'  => '此值用于确定同步用户是否可以登录到 Snipe-IT。 <strong>它不会影响物品是否可以借出或归还给这些用户</strong>，此值应该是您的 AD/LDAP 中 <strong>属性名称（attribute name）</strong> ， 而<strong>不是值</strong>。 <br><br>如果此字段设置为您的 AD/LDAP 中不存在的字段名称，或 AD/LDAP 字段中的值被设置为 <code>0</code> 或 <code>false</code>, <strong>用户登录将被禁用</strong>。 如果AD/LDAP字段中的值被设置为 <code>1</code> 或 <code>true</code> 或 <em>其他文本</em> 那意味着用户可以登录。 当此字段在您的AD域控中为空时，我们会尊重 <code>userAccountControl</code> 属性，通常允许非暂停用户登录。',
+    'ldap_activated_flag_help'  => '此值用于确定同步用户是否可以登录 Snipe-IT。 <strong>它不会影响用户向其签入或签出物品</strong>，并且应该是您 AD/LDAP 中的 <strong>属性名称</strong>，<strong>而非属性值</strong>。 <br><br>如果此字段被设置为 AD/LDAP 中不存在的字段名，或者 AD/LDAP 字段中的值被设置为 <code>0</code> 或 <code>false</code>，<strong>用户登录将被禁用</strong>。 如果 AD/LDAP 字段中的值被设置为 <code>1</code> 或 <code>true</code> 或 <em>任何其他文本</em>，则意味着用户可以登录。 当您的 AD 中此字段为空时，我们将遵循 <code>userAccountControl</code> 属性，该属性通常允许未被禁用的用户登录。',
+    'ldap_invert_active_flag'   => 'LDAP 反向激活标识',
+    'ldap_invert_active_flag_help'     => '如果启用：当LDAP Active Markets 返回值为 <code>0</code> 或 <code>false</code> 用户帐户将被激活。',
     'ldap_emp_num'              => 'LDAP 员工号',
     'ldap_email'                => 'LDAP Email',
     'ldap_test'                 => '测试 LDAP',
     'ldap_test_sync'            => '测试 LDAP 同步',
     'license'                   => '软件许可证',
-    'load_remote'               => '使用 Gravatar头像',
-    'load_remote_help_text'		=> '如果您的安装不能从外部网络加载脚本，请取消选中此框。这将防止Snipe-IT尝试从 Gravatar 加载图像。',
+    'load_remote'               => '加载远程头像',
+    'load_remote_help_text'		=> '如果您的安装不能从外部网络加载脚本，请取消选中此项。 这将防止Snipe-IT 尝试从 Gravatar 或其他外部来源加载头像。',
     'login'                     => '登录尝试',
     'login_attempt'             => '登录尝试',
     'login_ip'                  => 'IP 地址',
@@ -131,6 +136,7 @@ return [
     'login_user_agent'          => '浏览器版本(User Agent)',
     'login_help'                => '尝试登录的列表',
     'login_note'                => '登陆提示',
+    'login_note_placeholder'            => "如果您没有登录名或发现属于本公司的设备，请致电 888-555-1212寻求技术支持。谢谢。",
     'login_note_help'           => '可选择性地在登陆界面显示一些信息，例如给找到丢失或者被偷设备的用户提供帮助。这里支持<a href="https://help.github.com/articles/github-flavored-markdown/">Github的markdown语法</a>。',
     'login_remote_user_text'    => '远程用户登录选项',
     'login_remote_user_enabled_text' => '启用远程用户头登录',
@@ -141,18 +147,21 @@ return [
     'login_remote_user_custom_logout_url_help' => '如果此处提供了URL，则在用户注销Snipe-IT后，用户将被重定向到此URL。这对于正确关闭身份验证提供程序的用户会话非常有用。',
     'login_remote_user_header_name_text' => '自定义用户名前缀',
     'login_remote_user_header_name_help' => '使用指定的用户前缀而不是REMOTE_USER',
-    'logo'                    	=> '徽标',
+    'logo'                    	=> 'Logo',
     'logo_print_assets'         => '在打印中使用',
     'logo_print_assets_help'    => '在打印资产列表中使用品牌 ',
     'full_multiple_companies_support_help_text' => '限制归属特定公司的用户（包括管理员）仅能访问该公司资产',
     'full_multiple_companies_support_text' => '完整多企业支持',
-    'show_in_model_list'   => '在模型下拉列表中显示',
+    'scope_locations_fmcs_support_text'  => '支持多个分公司架构的位置范围限定',
+    'scope_locations_fmcs_support_help_text'  => '将位置限制在所选公司内。',
+    'scope_locations_fmcs_check_button' => '检查兼容性',
+    'scope_locations_fmcs_support_disabled_text'  => '当前选项已禁用，原因是有至少:count个项目的位置存在冲突。',
+    'show_in_model_list'   => '在型号下拉列表中显示',
     'optional'					=> '可选',
     'per_page'                  => '每页搜索结果',
     'php'                       => 'PHP版本',
     'php_info'                  => 'PHP 信息',
     'php_overview'              => 'PHP',
-    'php_overview_keywords'     => 'phpinfo, system, info',
     'php_overview_help'         => 'PHP 系统信息',
     'php_gd_info'               => '您必须安装php-gd显示二维码，请参阅安装说明。',
     'php_gd_warning'            => 'PHP图像处理的GD[php-gd]插件没有安装',
@@ -198,7 +207,7 @@ return [
     'show_archived_in_list'     => '归档资产',
     'show_archived_in_list_text'     => '在 "所有资产" 列表中显示归档资产',
     'show_assigned_assets'      => '显示分配给资产的资产',
-    'show_assigned_assets_help' => '在 "查看用户->资产"、"查看用户->信息->打印所有已分配的资产 "和 "账户->查看已分配的资产 "中显示已分配资产。',
+    'show_assigned_assets_help' => '在 “查看用户 -> 资产”、“查看用户 -> 信息 -> 打印所有已分配” 以及 “账户 -> 查看已分配资产” 中，显示分配给其他资产的资产。',
     'show_images_in_email'     => '在电子邮件中显示图片。',
     'show_images_in_email_help'   => '如果外部用户无法在邮件中通过你安装在VPN或内网的Snipe-IT加载图片，请取消此复选框。',
     'site_name'                 => '站点名称',
@@ -218,19 +227,20 @@ return [
     'webhook_integration_help'    => ':app 集成是为可选项，但如果您想要使用它，则需要endpoint和channel。 要配置 :app 集成，您必须先<a href=":webhook_link" target="_new" rel="noopener">在您的 :app 账户上创建传入的 webhook</a> 。 在保存之前请点击 <strong>测试 :app 集成</strong> 按钮确认您的设置是否正确。 ',
     'webhook_integration_help_button'    => '一旦您保存了您的 :app 信息，测试按钮将会出现。',
     'webhook_test_help'           => '测试您的 :app 集成配置是否正确。您必须保存您更新的 :app 设置',
-    'snipe_version'  			=> 'Snipe-IT version',
+    'shortcuts_enabled'         => '启用快捷键',
+    'shortcuts_help_text'       => '<strong>Windows</strong>: Alt + Access key, <strong>Mac</strong>: Control + Option + Access key',
+    'snipe_version'  			=> 'Snipe-IT 版本',
     'support_footer'            => '支持页脚链接 ',
     'support_footer_help'       => '指定谁可以看到指向Snipe-IT支持信息和用户手册的链接',
-    'version_footer'            => '页脚版本 ',
+    'version_footer'            => '页脚中显示版本信息 ',
     'version_footer_help'       => '指定谁可以看到Snipe-IT版本和内部版本号。',
     'system'                    => '系统信息',
     'update'                    => '更新设置',
     'value'                     => '价值',
     'brand'                     => '品牌',
-    'brand_keywords'            => '页脚、 Logo、 打印、 主题、 皮肤、 页眉、 颜色、 颜色、 css',
     'brand_help'                => 'Logo，站点名称',
     'web_brand'                 => '网页品牌类型',
-    'about_settings_title'      => '设置',
+    'about_settings_title'      => '关于设置',
     'about_settings_text'       => '这些设置允许您自定义您的安装偏好',
     'labels_per_page'           => '每页显示',
     'label_dimensions'          => 'Label 尺寸（英尺）',
@@ -252,8 +262,8 @@ return [
     'inches'        => '英尺',
     'width_w'        => '宽',
     'height_h'        => '高',
-    'show_url_in_emails'                => '链接到Snipe-IT在电子邮件',
-    'show_url_in_emails_help_text'      => '如果您不希望链接回电子邮件页脚中的Snipe-IT安装，请取消选中此框。如果您的大多数用户从未登录，则很有用',
+    'show_url_in_emails'                => '在电子邮件中显示Snipe-IT链接',
+    'show_url_in_emails_help_text'      => '如果您不希望在电子邮件页脚中显示Snipe-IT链接，请取消此框。如果您的大多数用户从未登录过系统，那么这项功能会很有作用。',
     'text_pt'        => '磅',
     'thumbnail_max_h'   => '最大缩略图高度',
     'thumbnail_max_h_help'   => '以像素为单位的缩略图可能在列表视图中显示的最大高度。最小25，最高 500。',
@@ -262,20 +272,22 @@ return [
     'two_factor_enrollment'        => '加入两步验证',
     'two_factor_enabled_text'        => '启用两步验证',
     'two_factor_reset'        => '重设两步验证密钥',
-    'two_factor_reset_help'        => '这将迫使用户再次选用他们的身份验证器应用程序。 如果他们目前登记的设备丢失或被盗，这样做可能是有用的。 ',
+    'two_factor_reset_help'        => '这将将强制用户重新绑定双因素认证设备。当用户当前注册的设备丢失或被盗时，这一操作非常有用。 ',
     'two_factor_reset_success'          => '成功重设两步验证设备',
     'two_factor_reset_error'          => '两步验证设备重设失败',
-    'two_factor_enabled_warning'        => '启用两步验证将需要您立即用登记的移动设备验证身份。如您尚未设置两步验证，您现在可以登记您的设备。',
-    'two_factor_enabled_help'        => '此操作将用 Google Authenticator 启用两步验证',
+    'two_factor_enabled_warning'        => '如果尚未开启双重验证，启用后会立即要求您使用已绑定的 2FA应用（Like Google Auth）设备进行验证。 如果目前还没有设备注册的话，您可以注册设备。',
+    'two_factor_enabled_help'        => '此操作将用 2FA应用（Like Google Authenticator）启用两步验证。',
     'two_factor_optional'        => '可选项（如果允许，用户可以启用或禁用）',
     'two_factor_required'        => '强制所有用户启用',
     'two_factor_disabled'        => '已停用',
     'two_factor_enter_code'	=> '输入两步验证代码',
     'two_factor_config_complete'	=> '发送两步验证代码',
     'two_factor_enabled_edit_not_allowed' => '你的管理员不允许您编辑此设置。',
-    'two_factor_enrollment_text'	=> "本系统强制两步验证，但您尚未登记您的移动设备。请启动您的 Google Authenticator 应用并扫描下方二维码以设置两步验证。在您完成后，请在下方输入生成的认证代码。",
+    'two_factor_enrollment_text'	=> "本系统强制两步验证，但您尚未登记您的移动设备。请启动您的 2FA应用（Like Google Authenticator）并扫描下方二维码以设置两步验证。在您完成后，请在下方输入生成的认证代码。",
     'require_accept_signature'      => '需要签名',
     'require_accept_signature_help_text'      => '启用此功能将需要用户亲自签署来接受一项资产。',
+    'require_checkinout_notes'  => '归还/签出时需要备注',
+    'require_checkinout_notes_help_text'    => '启用此功能后需要在归还或借出资产时填写备注字段。',
     'left'        => '左',
     'right'        => '右',
     'top'        => '顶部',
@@ -298,7 +310,7 @@ return [
     'oauth_scopes' => 'Scopes',
     'oauth_callback_url' => '您的应用程序授权回调URL。',
     'create_client' => '创建客户端',
-    'no_scopes' => 'No scopes',
+    'no_scopes' => '没有指定范围',
     'asset_tag_title' => '更新资产标签设置',
     'barcode_title' => '更新条形码设置',
     'barcodes' => '条形码',
@@ -313,24 +325,24 @@ return [
     'filter_by_keyword' => '通过设置关键字过滤',
     'security' => '安全',
     'security_title' => '更新安全设置',
-    'security_keywords' => '密码、密码、要求、两个因素、两个因素、常用密码、远程登录、注销、验证',
     'security_help' => '双重认证，密码限制',
-    'groups_keywords' => '权限、权限组、授权',
     'groups_help' => '帐户权限组',
     'localization' => '本地化',
     'localization_title' => '更新本地化设置',
-    'localization_keywords' => '本地化、货币、本地、本地、时区、时区、国际、内部、语言、语言、翻译',
     'localization_help' => '语言，日期显示',
     'notifications' => '通知',
     'notifications_help' => '电子邮件警报和盘点设置',
     'asset_tags_help' => '递增和前缀',
     'labels' => '标签',
     'labels_title' => '更新标签设置',
-    'labels_help' => '标签大小 &amp; 设置',
-    'purge_keywords' => '永久删除',
+    'labels_help' => '条码 &amp; 标签设置',
     'purge_help' => '清除已删除的记录',
-    'ldap_extension_warning' => '它看起来不像在这个服务器上安装或启用LDAP扩展。 您仍然可以保存您的设置，但您需要启用 PHP 的 LDAP 扩展，然后LDAP 同步或登录才能正常工作。',
+    'ldap_extension_warning' => '看起来这个服务器上没有安装或启用LDAP扩展。 您仍然可以保存您的设置，但您需要启用 PHP 的 LDAP 扩展，然后LDAP 同步或登录才能正常工作。',
     'ldap_ad' => 'LDAP/AD',
+    'ldap_test_label' => '测试 LDAP 同步',
+    'ldap_test_login' => ' 测试 LDAP 登录',
+    'ldap_username_placeholder' => 'LDAP 用户名',
+    'ldap_password_placeholder' => 'LDAP 密码',
     'employee_number' => '员工号码',
     'create_admin_user' => '创建用户 ::',
     'create_admin_success' => '成功！您的管理员用户已添加！',
@@ -342,6 +354,8 @@ return [
     'setup_migration_create_user' => '下一步：创建用户',
     'ldap_settings_link' => 'LDAP 设置页面',
     'slack_test' => '测试 <i class="fab fa-slack"></i> 集成',
+    'status_label_name' => '状态标签名称',
+    'super_admin_only'  => '仅限超级管理员',
     'label2_enable'           => '新标签引擎',
     'label2_enable_help'      => '切换到新的标签引擎。<b> 注意：在设置其他设置之前，您需要保存此设置。</b>',
     'label2_template'         => '模板',
@@ -356,12 +370,15 @@ return [
     'label2_2d_type'          => '二维码类型',
     'label2_2d_type_help'     => '二维码格式',
     'label2_2d_target'        => '二维码目标',
-    'label2_2d_target_help'   => '扫描时二维码指向的 URL',
+    'label2_2d_target_help'   => '数据将被二维码所包含',
     'label2_fields'           => '字段定义',
     'label2_fields_help'      => '字段可以在左列中添加、删除和重新排序。对于每个字段，可以在右列中添加、删除和重新排序包括标签、数据源等多个选项。',
+    'purge_barcodes' => '清除条形码',
     'help_asterisk_bold'    => '输入为 <code>**text**</code> 的文本将显示为粗体。',
     'help_blank_to_use'     => '留空以使用 <code>:setting_name</code> 的值',
-    'help_default_will_use' => '<code>:default</code> 将使用 <code>:setting_name</code>的值。 <br>请注意，条码的值必须符合相应的条码规范才能成功生成。请参阅 <a href="https://snipe-it.readme.io/docs/barcodes">文档 <i class="fa fa-external-link"></i></a> 了解更多详细信息。 ',
+    'help_default_will_use' => '<code>:default</code> 将使用来自 <code>:setting_name</code>的值。 <br>请注意，条码的值必须符合各自的条码规范才能成功生成。详情请见 <a href="https://snipe-it.readme.io/docs/barcodes">文档 <i class="fa fa-external-link"></i></a> 了解更多细节。 ',
+    'asset_id'              => '资产ID',
+    'data'               => '数据',
     'default'               => '默认',
     'none'                  => '无',
     'google_callback_help' => '这应该作为回调URL输入在您的组织内的 Google OAuth 应用程序设置。&apos;s <strong><a href="https://console.cloud.google.com/" target="_blank">Google 开发者控制台 <i class="fa fa-external-link" aria-hidden="true"></i></a></strong>',
@@ -373,7 +390,100 @@ return [
     'database_driver' => '数据库驱动程序',
     'bs_table_storage' => '表存储',
     'timezone' => '时区',
+    'test_mail' => '测试邮件',
     'profile_edit'          => '编辑个人资料',
     'profile_edit_help'          => '允许用户编辑自己的个人资料。',
+    'default_avatar' => '自定义默认头像',
+    'default_avatar_help' => '如果用户没有个人资料照片，此图像将作为个人资料显示。',
+    'restore_default_avatar' => '恢复 <a href=":default_avatar" data-toggle="lightbox" data-type="image">原始系统默认头像</a>',
+    'restore_default_avatar_help' => '',
+    'due_checkin_days' => '到期归还警告',
+    'due_checkin_days_help' => '资产应在预计归还多少天前列入“到期归还”页面中？',
+    'no_groups' => '尚未创建任何群组。请访问<code>Admin Settings > Permission Groups</code>添加权限群组。',
+    'text' => '文本',
+
+    'username_formats' => [
+        'username_format'		=> '用户名格式',
+        'firstname_lastname_format'	=> '名 姓，例如(jane.smith)',
+        'first_name_format'	        => '名，例如 (jane)',
+        'last_name_format'		=> '姓氏(doe)',
+        'filastname_format'			=> '名首字母 姓，例如(jsmith)',
+        'lastnamefirstinitial_format' =>  '姓 名首字母， 例如(smithj)',
+        'firstname_lastname_underscore_format' => '名 姓，例如(jane_smith)',
+        'firstinitial.lastname' => '名首字母 姓，例如(j.smith)',
+        'lastname_firstinitial' => '姓 名首字母，例如 (smith_j)',
+        'lastname_dot_firstinitial_format' => '姓 名首字母，例如 (smith.j)',
+        'firstnamelastname'     => '名 姓，例如 (janesmith)',
+        'firstnamelastinitial'  => '名 姓首字母，例如(janes)',
+        'lastnamefirstname'      => '姓 名，例如(smith.jane)',
+    ],
+
+    'email_formats' => [
+        'email_format'			=> 'Email格式',
+        'firstname_lastname_format'	=> '名 姓，例如(jane.smith@example.com)',
+        'first_name_format'		=> '名，例如 (jane@example.com)',
+        'last_name_format'		=> '姓氏(doe@example.com)',
+        'filastname_format'			=> '名首字母 姓，例如(jsmith@example.com)',
+        'lastnamefirstinitial_format' =>  '姓 名首字母， 例如(smithj@example.com)',
+        'firstname_lastname_underscore_format' => '名 姓，例如(jane_smith@example.com)',
+        'firstinitial.lastname' => '名首字母 姓，例如(j.smith@example.com)',
+        'lastname_firstinitial' => '姓 名首字母，例如 (smith_j@example.com)',
+        'lastname_dot_firstinitial_format' => '姓氏.名字首字母（smith.j@example.com）',
+        'firstnamelastname'     => '名 姓，例如 (janesmith@example.com)',
+        'firstnamelastinitial'  => '名 姓首字母，例如(janes@example.com)',
+        'lastnamefirstname'      => '姓氏.名字 (smith.jane@example.com)',
+    ],
+
+
+
+    'logo_labels' => [
+        'acceptance_pdf_logo'       => 'PDF Logo',
+        'email_logo'                => '电子邮件Logo',
+        'label_logo'                => '标签Logo',
+        'logo'                      => '站点Logo',
+        'favicon'                   => '网站图标',
+    ],
+
+    'logo_help' => [
+        'email_logo_size'       => '电子邮件中的方形Logo看起来最好。 ',
+    ],
+
+    'logo_option_types' => [
+        'text' => '文本',
+        'logo' => 'Logo',
+        'logo_and_text' => 'Logo 和文本',
+    ],
+
+
+    'legends' => [
+        'scoping' => '范围',
+        'formats' => '默认格式',
+        'profiles' => '用户资料',
+        'eula' => 'EULA & 接受首选项',
+        'misc_display' => '杂项显示选项',
+        'email' => '电子邮件首选项',
+        'checkin' => '归还首选项',
+        'dashboard' => '登录和控制面板首选项',
+        'misc' => '杂项',
+        'logos' => '徽标和显示',
+        'colors' => '颜色和皮肤',
+        'footer' => '页脚首选项',
+        'security' => '安全首选项',
+        'general' => '通用配置',
+        'intervals' => '间隔和阈值',
+    ],
+
+
+    /* Keywords for settings overview help */
+    'keywords' => [
+        'brand'             => '页脚、 Logo、 打印、 主题、 皮肤、 页眉、 颜色、 颜色、 css',
+        'general_settings'  => '公司支持、 签名、 接受、 电子邮件格式、 用户名格式、 图片、每页、 缩略图、 eula、 gravatar、 tos、 仪表盘、 隐私保护',
+        'groups'            => '权限、权限组、授权',
+        'labels'            => '标签、 条形码、 条形码、 表格、 印章、 通用产品代码UPC、 Qr码 、 一维码、 二维码',
+        'localization'      => '本地化、货币、本地、本地、时区、时区、国际、国际化、语言、语言、翻译',
+        'php_overview'      => 'phpinfo, system, info',
+        'purge'             => '永久删除',
+        'security'          => '密码、密码、要求、双因素验证、双因素验证、共同密码、远程登录、注销、身份验证',
+    ],
 
 ];
diff --git a/resources/lang/zh-CN/admin/settings/message.php b/resources/lang/zh-CN/admin/settings/message.php
index 35d75c68dc..d83733a71c 100644
--- a/resources/lang/zh-CN/admin/settings/message.php
+++ b/resources/lang/zh-CN/admin/settings/message.php
@@ -11,12 +11,15 @@ return [
         'file_deleted'          => '备份文件已成功删除。 ',
         'generated'             => '成功地创建了一个新的备份文件。',
         'file_not_found'        => '在服务器上找不到备份文件。',
-        'restore_warning'       => '是的，还原它。我确认这将覆盖当前数据库中的任何现有数据。 这也将注销您现有的所有用户 (包括您)。',
+        'restore_warning'       => '是的，还原它。我确认这将覆盖当前数据库中的所有数据。 这也将注销所有现有用户 (包括您)。',
         'restore_confirm'       => '您确定要从 :filename还原您的数据库吗？'
     ],
+    'restore' => [
+        'success'               => '您的系统备份已恢复。请重新登录。'
+    ],
     'purge' => [
         'error'     => '清除过程中出现了错误。 ',
-        'validation_failed'     => '你的清除确认不正确，请在输入框中输入“DELETE”。',
+        'validation_failed'     => '你的清除确认信息不正确，请在输入框中输入“DELETE”。',
         'success'               => '删除记录已被成功的清除。',
     ],
     'mail' => [
@@ -33,14 +36,24 @@ return [
         'testing_authentication' => '测试 LDAP 身份验证...',
         'authentication_success' => '用户已成功通过LDAP认证！'
     ],
+    'labels' => [
+        'null_template' => '未找到标签模板。请选择一个模板。',
+        ],
     'webhook' => [
         'sending' => '正在发送 :app 测试消息...',
-        'success' => '您的 :webhook_name 集成工作！',
+        'success' => '您的 :webhook_name 集成工作正常！',
         'success_pt1' => '成功！请检查 ',
-        'success_pt2' => ' 测试消息的频道，并且一定要点击下面的“保存”来存储您的设置。',
+        'success_pt2' => ' 测试消息的频道，并且一定要点击下面的<b>保存</b>来存储您的设置。',
         '500' => '500 服务器错误。',
-        'error' => '出错了。:app响应：:error_message',
+        'error' => '出错了。:app 返回 :error_message',
         'error_redirect' => '错误：301/302 :endpoint 返回重定向。出于安全原因，我们不跟随重定向。请使用实际端点。',
         'error_misc' => '出错了:( ',
-    ]
+        'webhook_fail' => ' webhook 通知失败：请检查以确保URL仍然有效。',
+        'webhook_channel_not_found' => ' 未找到 webhook 频道。',
+        'ms_teams_deprecation' => '您当前选用的 Microsoft Teams Webhook URL 将于2025年12月31日弃用。请改用工作流 URL。有关创建工作流的微软官方文档，请见<a href="https://support.microsoft.com/en-us/office/create-incoming-webhooks-with-workflows-for-microsoft-teams-8ae491c7-0394-4861-ba59-055e33f75498" target="_blank">此处。</a>',
+    ],
+    'location_scoping' => [
+        'not_saved' => '您的设置未保存。',
+        'mismatch' => '在启用位置范围限定功能之前，数据库中有1个待处理项目需要您关注。|在启用位置范围限定功能之前，数据库中有:count个待处理项目需要您关注。',
+    ],
 ];
diff --git a/resources/lang/zh-CN/admin/statuslabels/message.php b/resources/lang/zh-CN/admin/statuslabels/message.php
index 69ef854124..547e0881b3 100644
--- a/resources/lang/zh-CN/admin/statuslabels/message.php
+++ b/resources/lang/zh-CN/admin/statuslabels/message.php
@@ -24,9 +24,9 @@ return [
 
     'help' => [
         'undeployable'   => '这些资产不能分配给任何人。',
-        'deployable'   => '这些资产可以被借出。一旦分配了它们，它们将成为状态<i class="fas fa-circle text-blue"></i> <strong>已分配</strong>。',
+        'deployable'   => '这些资产可以被签出。一旦分配了它们，它们将成为状态<i class="fas fa-circle text-blue"></i> <strong>已分配</strong>。',
         'archived'   => '这些资产无法签出，只会显示在“存档”视图中。这有助于保留有关资产的预算/历史目的信息，但将其保留在日常资产清单之外。',
-        'pending'   => '这些资产不能分配给任何人，经常用于修理的物品，但预计将重新流通。',
+        'pending'   => '这些正在维修的资产还不能分配，但预计会重新投入使用。',
     ],
 
 ];
diff --git a/resources/lang/zh-CN/admin/statuslabels/table.php b/resources/lang/zh-CN/admin/statuslabels/table.php
index 09a227e1cd..f26eec9027 100644
--- a/resources/lang/zh-CN/admin/statuslabels/table.php
+++ b/resources/lang/zh-CN/admin/statuslabels/table.php
@@ -1,14 +1,14 @@
 <?php
 
 return array(
-    'about'      	=> '关于状态标签',
+    'about'      	=> '关于状态类型',
     'archived'      	=> '已存档',
     'create'      	=> '创建状态标签',
     'color'      	=> '图标颜色',
     'default_label' => '默认标签',
     'default_label_help' => '这用于确保在创建/编辑资产时最常用的状态标签显示在选择框的顶部。',
     'deployable'      	=> '可领用',
-    'info'      	=> '状态标签用于描述资产的各种状态（例如送外维修、丢失、被窃等等）。你可以为处于可部署、待处理或已存档的资产创建新的状态标签。 ',
+    'info'      	=> '状态标签类型用于描述您的资产可能处于的各种状态，例如送修、丢失/被盗等。您可以根据您自己的工作流程，为您的可部署、待处理和已归档资产创建新的状态标签。欲了解更多信息，请<a href="https://snipe-it.readme.io/docs/overview#status-labels" target="_blank">参阅文档 <i class="fa fa-external-link"></i></a>。',
     'name'      	=> '状态名称',
     'pending'      	=> '待处理',
     'status_type'   => '状态类型',
diff --git a/resources/lang/zh-CN/admin/suppliers/message.php b/resources/lang/zh-CN/admin/suppliers/message.php
index e77fa1bfae..ba4b3e8a46 100644
--- a/resources/lang/zh-CN/admin/suppliers/message.php
+++ b/resources/lang/zh-CN/admin/suppliers/message.php
@@ -20,9 +20,9 @@ return array(
         'confirm'   => '你确定要删除这个供应商吗？',
         'error'   => '删除供应商的过程中出现了一点儿问题，请重试。',
         'success' => '供应商成功被删除。',
-        'assoc_assets'	 => '此供应商下至少还有 :asset_count 个相关模板，目前不能被删除，请你确定您的所有资 产不在此分类下，然后重试。 ',
-        'assoc_licenses'	 => '此供应商目前与 :licenses_count 个许可证相关联，不能删除。请更新您的许可证，断开与此供应商的关联，然后重试。 ',
-        'assoc_maintenances'	 => '此供应商下至少还有 :asset_count 个相关模板，目前不能被删除，请你确定您的所有资产不在此分类下，然后重试。 ',
+        'assoc_assets'	 => '此供应商目前关联着 :asset_count 个资产，无法删除。请更新您的资产，取消关联此供应商后再试。 ',
+        'assoc_licenses'	 => '此供应商目前关联着 :licenses_count 个许可证，不能删除。请更新您的许可证，取消关联此供应商，然后重试。 ',
+        'assoc_maintenances'	 => '此供应商目前与 :asset_count 项资产维护记录关联，无法删除。请更新您的资产维护记录，移除对该供应商的引用，然后重试。 ',
     )
 
 );
diff --git a/resources/lang/zh-CN/admin/users/general.php b/resources/lang/zh-CN/admin/users/general.php
index f9188963f4..b8c225309b 100644
--- a/resources/lang/zh-CN/admin/users/general.php
+++ b/resources/lang/zh-CN/admin/users/general.php
@@ -6,7 +6,7 @@ return [
     'assets_user'       => '分配给:name的资产',
     'bulk_update_warn'	=> '您即将编辑user_count用户的属性。请注意，您不能使用此表单更改您自己的用户属性，必须单独对您自己的用户信息进行编辑。',
     'bulk_update_help'	=> '此表单允许您一次更新多个用户。仅填写您需要更改的字段。留的空的任何字段将保持不变。',
-    'current_assets'    => '资产当前借出给该用户',
+    'current_assets'    => '当前签出给该用户的资产',
     'clone'             => '克隆用户',
     'contact_user'      => '联系 :name',
     'edit'              => '编辑用户',
@@ -19,9 +19,11 @@ return [
     'print_assigned'    => '打印所有已分配资产',
     'email_assigned'    => '邮件发送所有已分配的列表',
     'user_notified'     => '用户已通过电子邮件收到当前分配给他们的物品列表。',
+    'users_notified'    => '已通过电子邮件向该用户发送了其当前分配项目的列表。|:count 位用户已通过电子邮件收到其当前分配项目的列表。',
+    'users_notified_warning' => ':count 位用户已通过电子邮件收到了其当前分配项目的列表，但是 :no_email 用户没有电子邮件地址，因此无法收到电子邮件。| :count 位用户已通过电子邮件收到了其当前分配项目的列表，但是 :no_email 用户没有电子邮件地址，因此无法收到电子邮件。',
     'auto_assign_label' => '在自动分配符合条件的许可证时包括此用户',
     'auto_assign_help'  => '在自动分配许可证时跳过此用户',
-    'software_user'     => ':name 借走的软件',
+    'software_user'     => ':name 签出的软件',
     'send_email_help'   => '您必须为此用户提供电子邮件地址才能发送他们的凭据。电子邮件凭据只能在用户创建时完成。 密码存储在单向散列中，保存后无法检索。',
     'view_user'         => '查看用户： :name',
     'usercsv'           => 'CSV 档案',
diff --git a/resources/lang/zh-CN/admin/users/message.php b/resources/lang/zh-CN/admin/users/message.php
index 0f3fa37d64..80a12abd69 100644
--- a/resources/lang/zh-CN/admin/users/message.php
+++ b/resources/lang/zh-CN/admin/users/message.php
@@ -4,16 +4,16 @@ return array(
 
     'accepted'                  => '你已成功接受此项资产。',
     'declined'                  => '你已拒绝此项资产。',
-    'bulk_manager_warn'	        => '您的用户已成功更新，但是您的经理条目未保存，因为您选择的经理也在要编辑的用户列表中，用户可能不是自己的经理。请再次选择您的用户，不包括经理。',
+    'bulk_manager_warn'	        => '您的用户已成功更新，但经理信息未保存，因为您选择的经理也在本次编辑的用户列表中，用户不能是自己的经理。请重新选择您的用户，但这次请排除经理。',
     'user_exists'               => '用户已经存在!',
-    'user_not_found'            => '用户不存在。',
+    'user_not_found'            => '用户不存在或您没有权限查看。',
     'user_login_required'       => '登陆字段是必须的',
     'user_has_no_assets_assigned' => '目前没有分配给用户的资产。',
     'user_password_required'    => '密码为必填项',
     'insufficient_permissions'  => '权限不足',
-    'user_deleted_warning'      => '用户已经被删除，你需要恢复这个用户编辑他或者重新指定新资产。',
-    'ldap_not_configured'        => '安装过程中未启用LDAP集成的功能。',
-    'password_resets_sent'      => '被选中的已激活并拥有有效电子邮件地址的用户已经收到了一个密码重置链接。',
+    'user_deleted_warning'      => '用户已经被删除，您需要恢复这个用户才能对其进行编辑或者分配新资产。',
+    'ldap_not_configured'        => '本次安装过程中未启用LDAP集成。',
+    'password_resets_sent'      => '密码重置链接已发送给符合以下条件的已选用户：已激活且邮箱地址有效。',
     'password_reset_sent'       => '密码重置链接已发送至 :email!',
     'user_has_no_email'         => '此用户的个人资料中没有电子邮件地址。',
     'log_record_not_found'        => '找不到该用户匹配的日志记录。',
@@ -39,9 +39,9 @@ return array(
         'delete_has_assets' => '此用户具有分配的项目，无法删除。',
         'delete_has_assets_var' => '此用户仍然有分配的资产，请先归还。|此用户仍然有分配 :count 个资产，请先归还资产。',
         'delete_has_licenses_var' => '此用户仍然有一个已分配的许可证席位，请先归还。|此用户仍然已经分配了 :count 个许可证席位。请先归还它们。',
-        'delete_has_accessories_var' => '此用户仍分配有一件配件，请先归还。|此用户仍然分配又 :count 件配件，请先归还。',
-        'delete_has_locations_var' => '此用户仍然管理着一个位置，请先选择另一个管理员。 |此用户仍然管理着 :count 个位置。请先选择另一个管理员。',
-        'delete_has_users_var' => '此用户仍在管理另一个用户，请先为该用户选择另一个管理员。 |此用户仍然管理着 :count 个用户。请先为他们选择另一个管理员。',
+        'delete_has_accessories_var' => '此用户仍分配有一件配件，请先归还。|此用户仍然被分配有 :count 件配件，请先归还。',
+        'delete_has_locations_var' => '此用户仍然管理着一个位置，请先选择另一个经理。 |此用户仍然管理着 :count 个位置。请先选择另一个经理。',
+        'delete_has_users_var' => '此用户仍在管理另一个用户，请先为该用户选择另一个经理。 |此用户仍然管理着 :count 个用户。请先为他们选择另一个经理。',
         'unsuspend' => '恢复停用用户的过程中出现了一点儿问题，请重试。',
         'import'    => '导入用户出现问题。请再试一次。',
         'asset_already_accepted' => '资产已被接受',
@@ -53,6 +53,7 @@ return array(
         'ldap_could_not_search' => '查询LDAP服务器失败，请检查LDAP配置文件中的相关设置。<br>LDAP服务器错误信息:',
         'ldap_could_not_get_entries' => '从LDAP服务器获取信息条目失败，请检查LDAP配置文件中的相关设置。<br>LDAP服务器错误信息:',
         'password_ldap' => '此帐户的密码由LDAP / Active Directory管理。请联系您的IT部门更改您的密码。',
+        'multi_company_items_assigned' => '该用户被分配的物品属于另一家公司。请归还它们或编辑它们所在的公司。'
     ),
 
     'deletefile' => array(
diff --git a/resources/lang/zh-CN/admin/users/table.php b/resources/lang/zh-CN/admin/users/table.php
index 4867237876..7513eea09b 100644
--- a/resources/lang/zh-CN/admin/users/table.php
+++ b/resources/lang/zh-CN/admin/users/table.php
@@ -18,11 +18,11 @@ return array(
     'last_name'  			=> '姓氏',
     'location'  			=> '位置',
     'lock_passwords'		=> '不能更换登陆资料',
-    'manager' 				=> '领导',
-    'managed_locations'     => '管理位置',
-    'managed_users'         => '管理用户',
+    'manager' 				=> '管理者',
+    'managed_locations'     => '管理的位置',
+    'managed_users'         => '管理的用户',
     'name' 					=> '名字',
-    'nogroup'               => '尚未创建组。要添加一个组，请访问： ',
+    'nogroup'               => '尚未创建组。要添加一个组，请访问：',
     'notes'                 => '笔记',
     'password_confirm' 		=> '确认密码',
     'password' 				=> '密码',
@@ -35,7 +35,7 @@ return array(
     'updateuser' 			=> '更新用户',
     'username' 				=> '用户名',
 	'user_deleted_text' 	=> '此用户已被标记为已删除。',
-    'username_note' 		=> '（这个是用来活动目录「Active Directory」的绑定，非用来登录）',
+    'username_note' 		=> '（仅用于「Active Directory」绑定，不是用来登录的）',
     'cloneuser'             => '克隆用户',
     'viewusers' 			=> '查看用户',
 );
diff --git a/resources/lang/zh-CN/auth.php b/resources/lang/zh-CN/auth.php
index 6096102312..846954c328 100644
--- a/resources/lang/zh-CN/auth.php
+++ b/resources/lang/zh-CN/auth.php
@@ -15,6 +15,6 @@ return array(
 
     'failed' => '这些凭据与我们的记录不匹配。',
     'password' => '提供的密码不正确。',
-    'throttle' => '登录次数过多。请在 :seconds 秒后重试。',
+    'throttle' => '登录尝试次数太多。请在 :minutes 分钟后重试。',
 
 );
diff --git a/resources/lang/zh-CN/auth/message.php b/resources/lang/zh-CN/auth/message.php
index a844673074..8ba6657675 100644
--- a/resources/lang/zh-CN/auth/message.php
+++ b/resources/lang/zh-CN/auth/message.php
@@ -6,8 +6,6 @@ return array(
     'account_not_found'      => '用户名或密码错误',
     'account_not_activated'  => '用户还未激活',
     'account_suspended'      => '账户已经被停用',
-    'account_banned'         => '账户已经被禁用',
-    'throttle'               => '登录失败的次数太多。请在 :minutes分钟后重试。',
 
     'two_factor' => array(
         'already_enrolled'      => '您的设备已经登记了。',
diff --git a/resources/lang/zh-CN/button.php b/resources/lang/zh-CN/button.php
index 95283ba3c6..994fad2763 100644
--- a/resources/lang/zh-CN/button.php
+++ b/resources/lang/zh-CN/button.php
@@ -7,6 +7,7 @@ return [
     'checkin_and_delete'  	    => '归还全部并删除用户',
     'delete'  	                => '刪除',
     'edit'    	                => '编辑',
+    'clone'    	                => '克隆...',
     'restore' 	                => '恢复',
     'remove'                    => '移除',
     'request'                   => '申请',
@@ -16,9 +17,18 @@ return [
     'select_files'				=> '选择文件...',
     'generate_labels'           => '{1} 生成标签|[2,*] 生成标签',
     'send_password_link'        => '发送密码重置链接',
-    'go'                        => 'Go',
+    'go'                        => '开始',
     'bulk_actions'              => '批量操作',
     'add_maintenance'           => '添加维护',
     'append'                    => '追加',
     'new'                       => '新建',
+    'var' => [
+        'clone'     => '克隆 :item_type',
+        'edit'      => '编辑 :item_type',
+        'delete'    => '删除 :item_type',
+        'restore'   => '恢复 :item_type',
+        'create'    => '创建新的 :item_type',
+        'checkout'  => '签出 :item_type',
+        'checkin'   => '归还 :item_type',
+    ]
 ];
diff --git a/resources/lang/zh-CN/general.php b/resources/lang/zh-CN/general.php
index 51bf143105..6865a077bb 100644
--- a/resources/lang/zh-CN/general.php
+++ b/resources/lang/zh-CN/general.php
@@ -2,50 +2,53 @@
 
 return [
     '2FA_reset'             => '2FA(双因素认证) 重置',
-    'accessories'			=> '附属品',
+    'accessories'			=> '配件',
     'activated'			    => '已激活',
     'accepted_date'         => '接受日期',
-    'accessory'				=> '附属品',
+    'accessory'				=> '配件',
     'accessory_report'		=> '配件报告',
     'action'                => '操作',
     'activity_report'		=> '活动报告',
     'address'				=> '地址',
-    'admin'					=> '管理员',
+    'admin'					=> '管理员设置',
     'admin_tooltip'			=> '此用户拥有管理员权限',
     'superuser'				=> '超级用户',
     'superuser_tooltip'		=> '此用户拥有超级用户权限',
     'administrator'			=> '管理员',
-    'add_seats'             => '已增加空位',
+    'add_seats'             => '已增加席位',
     'age'                   => "年龄",
     'all_assets'			=> '所有资产',
     'all'       			=> '所有',
     'archived'              => '已存档',
     'asset_models'			=> '资产型号',
-    'asset_model'			=> '模型',
+    'asset_model'			=> '型号',
     'asset'					=> '资产',
-    'asset_report'          => '资产报备',
+    'asset_previous'        => '资产（前保管人）',
+    'asset_report'          => '资产报告',
     'asset_tag'				=> '资产标签',
     'asset_tags'            => '资产标签',
     'assets_available'		=> '可用资产',
-    'accept_assets'         => '接受资产：名称',
+    'accept_assets'         => '接受资产 :name',
     'accept_assets_menu'    => '接受资产',
-    'audit'				    => '审计',
-    'audit_report'			=> '审核日志',
+    'accept_item'           => '接受物品',
+    'audit'				    => '盘点',
+    'audits'				=> '盘点',
+    'audit_report'			=> '盘点日志',
     'assets'				=> '资产',
     'assets_audited'        => '已盘点资产',
     'assets_checked_in_count'     => '资产已归还',
-    'assets_checked_out_count'     => '资产已借出',
+    'assets_checked_out_count'     => '资产已签出',
     'asset_deleted_warning'     => '此资产已被删除。您必须先恢复它才能将其分配给某人。',
     'assigned_date'         => '分配日期',
-    'assigned_to'           => '借出给:name的资产',
+    'assigned_to'           => '分配给:name的资产',
     'assignee'              => '分配给',
     'avatar_delete'         => '删除头像',
     'avatar_upload'         => '上传头像',
     'back'      			=> '后退',
     'bad_data'      		=> '未发现任何东西，是否数据错误？',
-    'bulkaudit'             => '批量审核',
+    'bulkaudit'             => '批量盘点',
     'bulkaudit_status'      => '盘点状态',
-    'bulk_checkout'  		=> '批量借出',
+    'bulk_checkout'  		=> '批量签出',
     'bulk_edit'             => '批量编辑',
     'bulk_delete'           => '批量删除',
     'bulk_actions'          => '批量操作',
@@ -54,17 +57,20 @@ return [
     'byod_help'             => '此设备归用户所有',
     'bystatus'              => '按状态',
     'cancel'  				=> '取消',
-    'categories'			=> '目录',
-    'category'				=> '类别：',
-    'change' 		        => '归还/借出',
+    'categories'			=> '分类',
+    'category'				=> '分类',
+    'change' 		        => '归还/签出',
     'changeemail'  			=> '更改邮箱',
     'changepassword'  		=> '修改密码',
     'checkin'  				=> '归还',
-    'checkin_from'  		=> '输入来源',
+    'checkin_from'  		=> '归还自',
+    'checkin_note'  		=> '归还备注',
+    'checkout_note'  		=> '签出备注',
     'checkout'  			=> '借出',
     'checkouts_count'       => '签出',
     'checkins_count'        => '签入',
-    'user_requests_count'   => '请求',
+    'checkin_and_delete'  	=> '归还并删除',
+    'user_requests_count'   => '申请',
     'city'  				=> '城市',
     'click_here'			=> '点击此处',
     'clear_selection'		=> '清除选择',
@@ -73,8 +79,8 @@ return [
     'component'			    => '组件',
     'components'			=> '组件',
     'complete'				=> '完成',
-    'consumable'			=> '消耗品',
-    'consumables'			=> '消耗品',
+    'consumable'			=> '耗材',
+    'consumables'			=> '耗材',
     'country'  				=> '国家',
     'could_not_restore'     => '恢复时出错 :item_type: :error',
     'not_deleted'           => ':item_type 未被删除，因此无法恢复',
@@ -85,22 +91,24 @@ return [
     'created_by'            => '创建者',
     'record_created' 		=> '记录已创建',
     'updated_at' 			=> '更新日期',
-    'currency'  			=> 'RMB', // this is deprecated
+    'currency'  			=> '¥', // this is deprecated
+    'currency_text'  		=> '货币', //
     'current'  				=> '当前',
     'current_password'      => '当前密码',
     'customize_report'      => '自定义报告',
     'custom_report'         => '自定义资产报表',
     'dashboard'				=> '控制面板',
+    'data_source'           => '数据源',
     'days'      			=> '天数',
     'days_to_next_audit'    => '距离下一次盘点的天数',
     'date'					=> '日期',
     'debug_warning'         => '警告!',
-    'debug_warning_text'    => '此应用程序运行在生产模式下的调试状态。如果您的应用程序可以被外部访问，这会使敏感数据暴露。通过将 <code>.env</code> 文件中的<code>APP_DEBUG</code> 值设置为 <code>false</code>来 禁用调试模式。',
+    'debug_warning_text'    => '此应用程序正在生产模式下运行，但启用了调试模式。 如果您的应用程序可以从外部访问，这可能会泄露敏感数据。 请通过将 <code>APP_DEBUG</code> 值在您的 <code>.env</code> 文件中设置为 <code>false</code> 来禁用调试模式。',
     'delete'  				=> '刪除',
-    'delete_confirm'  		=> '是否确定删除此项',
-    'delete_confirm_no_undo' => '你确定要删除这条数据吗？这个数据将会无法恢复。',
+    'delete_confirm'  		=> '您确定要删除 :item？',
+    'delete_confirm_no_undo' => '您确定要删除 :item吗？此操作无法撤消。',
     'deleted'  				=> '已删除',
-    'delete_seats'  		=> '已移除空位',
+    'delete_seats'  		=> '已移除席位',
     'deletion_failed'       => '删除失败',
     'departments'           => '部门',
     'department'            => '部门',
@@ -112,31 +120,15 @@ return [
     'download'				=> '下载',
     'download_all'		    => '下载全部',
     'editprofile'  			=> '修改简介',
-    'eol'					=> '寿命',
+    'eol'					=> '生命周期',
     'email_domain'			=> '邮件域',
-    'email_format'			=> '电子邮件格式',
     'employee_number'       => '员工号码',
     'email_domain_help'		=> '这在导入时用以生成电子邮件地址',
     'error'				    => '错误',
     'exclude_archived'      => '排除归档资产',
     'exclude_deleted'       => '排除已删除的资产',
     'example'				=> '示例︰ ',
-    'filastname_format'			=> '缩写名 姓，例如(jsmith@example.com)',
-    'firstname_lastname_format'	=> '名 姓，例如 (jane.smith@example.com)',
-    'firstname_lastname_underscore_format' => '名 姓，例如(jane_smith@example.com)',
-    'lastnamefirstinitial_format' =>  '姓氏首字母（smithj@example.com）',
-    'firstintial_dot_lastname_format' => '缩写名 姓，例如(jsmith@example.com)',
-    'firstname_lastname_display'	=> '名 姓，例如 (Jane Smith)',
-    'lastname_firstname_display'	=> '姓 名，例如 (Smith Jane)',
-    'name_display_format'	=> '姓名显示格式',
-    'first'					=> '首页',
-    'firstnamelastname'     => '名 姓，例如 (jane.smith@example.com)',
-    'lastname_firstinitial' => '姓 缩写名, 例如 (smith_j@example.com)',
-    'firstinitial.lastname' => '缩写名 姓，例如(jsmith@example.com)',
-    'firstnamelastinitial'  => '名 姓，例如 (jane.smith@example.com)',
-    'lastnamefirstname'      => '姓 名，例如(smith.jane@example.com)',
-    'first_name'			=> '名字',
-    'first_name_format'		=> '名，例如 (jane@example.com)',
+
     'files'                 => '文件',
     'file_name'				=> '文件',
     'file_type'             => '文件类型',
@@ -156,18 +148,18 @@ return [
     'image_delete'         	=> '删除图片',
     'include_deleted'       => '包括已删除的资产',
     'image_upload'         	=> '上传图片',
-    'filetypes_accepted_help'    => '可接受的文件类型是 :types. 最大允许上传大小为 :size.|可接受的文件类型是 :types. 最大允许上传大小为 :size.',
-    'filetypes_size_help'   => '允许最大上传文件的大小为 :size.',
-    'image_filetypes_help'  => '可接受的文件类型是 jpg、webp、png、gif、svg和avif。最大允许上传大小为 :size.',
+    'filetypes_accepted_help'    => '可接受的文件类型是 :type 。允许的最大大小是 :size.|可接受的文件类型是 :type 。允许最大上传大小是 :size。',
+    'filetypes_size_help'   => '允许最大上传大小为 :size',
+    'image_filetypes_help'  => '可接受的文件类型是jpg, webp, png, gif, svg和avif。允许最大上传大小为 :size。',
     'unaccepted_image_type'  => '此图像文件不可读。可接受的文件类型为jpg、webp、png、gif和svg。此文件的 mimetype 类型为：:mimetype。',
     'import'         	    => '导入',
     'import_this_file'      => '映射字段并处理此文件',
     'importing'         	=> '正在导入…',
-    'importing_help'        => '您可以通过CSV文件导入资产、配件、许可证、组件、消耗品和用户。 <br><br>CSV 应以逗号分隔和格式化，并且在文档</a> 中与 <a href="https://snipe-it.readme.io/docs/importing" target="_new">样本CSV中的标头匹配。',
+    'importing_help'        => '您可以使用 CSV 文件导入资产、配件、许可证、组件、耗材以及用户等数据。<br><br>请确保 CSV 文件是逗号分隔的，并且文件格式的标题行应与<a href="https://snipe-it.readme.io/docs/importing" target="_new">文档中提供的 CSV 示例</a>中的标题完全一致。',
     'import-history'        => '导入历史记录',
-    'asset_maintenance'        => '资产维修',
-    'asset_maintenance_report' => '资产维修报表',
-    'asset_maintenances'       => '资产维修',
+    'asset_maintenance'        => '资产维护',
+    'asset_maintenance_report' => '资产维护报表',
+    'asset_maintenances'       => '资产维护',
     'item'  				=> '条目',
     'item_name'             => '物品名称',
     'import_file'  			=> '导入 CSV 文件',
@@ -176,8 +168,13 @@ return [
     'kits'       			=> '预定义的 Kits',
     'language'				=> '语言',
     'last'					=> '最后页',
-    'last_login'            => '上一次登陆：',
+    'last_login'            => '上一次登陆',
     'last_name'             => '姓氏',
+    'firstname_lastname_display'	=> '名 姓，例如 (Jane Smith)',
+    'lastname_firstname_display'	=> '姓 名，例如 (Smith Jane)',
+    'name_display_format'	=> '姓名显示格式',
+    'first'					=> '首页',
+    'first_name'			=> '名字',
     'license'				=> '授权许可',
     'license_report'        => '授权许可报告',
     'licenses_available'	=> '许可可用',
@@ -188,7 +185,7 @@ return [
     'feature_disabled'      => '演示模式下禁用此功能',
     'location'              => '位置',
     'location_plural'        => '位置',
-    'locations'				=> '地理位置',
+    'locations'				=> '位置',
     'logo_size'				=> '方形标志使用Logo + 文本看起来最好。标志最大显示尺寸为 50px 高 x 500px 宽度。  ',
     'logout'				=> '注销',
     'lookup_by_tag'     => '查找资产标签',
@@ -197,9 +194,9 @@ return [
     'manufacturer'			=> '制造商',
     'manufacturers'			=> '制造商',
     'markdown'				=> '该字段可以使用 <a href="https://help.github.com/articles/github-flavored-markdown/">Github flavored markdown</a>',
-    'min_amt'				=> 'Min. QTY',
+    'min_amt'				=> '最少数量',
     'min_amt_help'          => '在触发警报之前应该可用的最小物品数。如果您不希望收到低库存的警报，请将最小数量留空。',
-    'model_no'				=> '型号',
+    'model_no'				=> '型号编码',
     'months'				=> '月数',
     'moreinfo'				=> '更多信息',
     'name'					=> '名称',
@@ -215,10 +212,18 @@ return [
     'no_results'			=> '没有结果',
     'no'  					=> '否',
     'notes'  				=> '备注',
+    'note_added'            => '备注已添加',
+    'options'				=> '选项',
+    'preview'				=> '预览',
+    'add_note'              => '添加备注',
+    'note_edited'            => '备注已编辑',
+    'edit_note'              => '编辑备注',
+    'note_deleted'            => '备注已删除',
+    'delete_note'              => '删除备注',
     'order_number'          => '订单号',
     'only_deleted'          => '仅删除的资产',
-    'page_menu'				=> '显示菜单项',
-    'pagination_info'		=> '显示全部',
+    'page_menu'				=> '显示_MENU_项',
+    'pagination_info'		=> '显示从 _START_ 到 _END_ 总共 _TOTAL_ 项',
     'pending'				=> '待定',
     'people'				=> '组织成员',
     'per_page'				=> '每页搜索结果',
@@ -229,11 +234,11 @@ return [
     'purchase_date'         => '购买日期',
     'qty'		            => '数量',
     'quantity'		        => '数量',
-    'quantity_minimum'      => '您有 :count 件物品低于或即将低于最低数量',
+    'quantity_minimum'      => '您有一件物品低于或几乎低于最低数量水平|您有 :count件物品低于或几乎低于最低数量水平',
     'quickscan_checkin'  	=> '快速扫描归还',
     'quickscan_checkin_status'  	=> '归还状态',
     'ready_to_deploy'		=> '待分配',
-    'recent_activity'		=> '最近操作活动',
+    'recent_activity'		=> '最近活动',
     'remaining'             => '剩余',
     'remove_company'        => '移除公司关联',
     'reports'				=> '报告',
@@ -279,8 +284,10 @@ return [
     'site_name'				=> '站点名称',
     'state'  				=> '省份',
     'status_labels'			=> '状态标签',
+    'status_label'			=> '状态标签',
     'status'    			=> '状态',
     'accept_eula'           => '接受协议',
+    'show_or_hide_eulas' => '显示/隐藏 最终用户许可协议EULAs',
     'supplier'              => '供应商',
     'suppliers'  			=> '供应商',
     'sure_to_delete'        => '是否确认要删除',
@@ -296,9 +303,9 @@ return [
     'type'  				=> '类型',
     'undeployable'			=> '无法被分配',
     'unknown_admin'			=> '未知管理员',
-    'username_format'		=> '用户名格式',
     'username'              => '用户名',
     'update'                => '更新',
+    'updating_item' => '正在更新 :item',
     'upload_filetypes_help'      => '允许的文件类型是 png, gif, jpg, jpeg, doc, doc, pdf, xls, xlsx, txt, lic, xml, zip, rtf 和 rar. 允许的最大上传大小是 :size.',
     'uploaded'              => '已上传',
     'user'					=> '用户',
@@ -323,11 +330,11 @@ return [
     'token_expired'         => '表单会话已过期，请重新提交',
     'login_enabled'         => '登录已启用',
     'audit_due'             => '到期审计',
-    'audit_due_days'        => '在:天内到期的资产 |应在:天内审计的资产',
+    'audit_due_days'        => '{}到期或逾期未盘点的资产|[1]一天内到期或逾期未盘点的资产|[2,*] :days 天内到期或逾期未盘点的资产',
     'checkin_due'           => '到期签入',
     'checkin_overdue'       => '过期签入',
-    'checkin_due_days'      => '到期签入的资产在:day|到期签入的资产在:days',
-    'audit_overdue'         => '过期审计',
+    'checkin_due_days'      => '{}到期归还|[1] :days 天内应归还的资产|[2,*] :days 天内应归还的资产',
+    'audit_overdue'         => '盘点逾期',
     'accept'                => '接受 :asset',
     'i_accept'              => '我接受',
     'i_decline'             => '我拒绝',
@@ -339,7 +346,7 @@ return [
     'view_all'              => '查看全部',
     'hide_deleted'          => '隐藏已删除',
     'email'                 => '邮箱',
-    'do_not_change'         => '不要更改',
+    'do_not_change'         => '不更改',
     'bug_report'            => '报告错误',
     'user_manual'           => '用户手册',
     'setup_step_1'          => '第 1 步',
@@ -351,13 +358,13 @@ return [
     'setup_create_admin'    => '创建管理员用户',
     'setup_done'            => '完成！',
     'bulk_edit_about_to'    => '您将要编辑以下内容： ',
-    'checked_out'           => '已借出',
-    'checked_out_to'        => '借出至',
+    'checked_out'           => '已签出',
+    'checked_out_to'        => '签出至',
     'fields'                => '字段',
     'last_checkout'         => '上次借出',
     'due_to_checkin'        => '以下:count 件物品将很快归还：',
     'expected_checkin'      => '预计归还日期',
-    'reminder_checked_out_items' => '这是当前借出给您的物品的提醒。 如果你觉得这个列表不准确(有些东西缺失，或者你认为你从未收到的东西)，请给:reply_to_name发送电子邮件，邮箱地址为：:reply_to_address_address。',
+    'reminder_checked_out_items' => '这是当前分配给您的物品的提醒。如果你觉得这个列表不准确(有些东西缺失，或者此处出现了你认为从未收到的东西)，请给:reply_to_name发送电子邮件，邮箱地址为：:reply_to_address。',
     'changed'               => '已修改',
     'to'                    => '至',
     'report_fields_info'    => '<p>选择您想要在自定义报告中包含的字段，然后单击生成. 该文件(custom-asset-report-YYYY-mm-dd.csv)将自动下载，您可以使用 Excel打开它。</p>
@@ -383,6 +390,8 @@ return [
     'new_license'           => '新建许可证',
     'new_accessory'         => '新建配件',
     'new_consumable'        => '新建耗材',
+    'new_component'         => '新建组件',
+    'new_user'              => '新用户',
     'collapse'              => '收起',
     'assigned'              => '已分配',
     'asset_count'           => '资产计数',
@@ -404,9 +413,9 @@ return [
     'accessory_information' => '配件信息：',
     'accessory_name'       => '配件名称:',
     'clone_item'            => '克隆物品',
-    'checkout_tooltip' => '借出此物品',
+    'checkout_tooltip' => '签出此物品',
     'checkin_tooltip' => '选中此项，以便重新发布、重映像等。',
-    'checkout_user_tooltip' => '借出此物品给一个用户',
+    'checkout_user_tooltip' => '签出此物品给一个用户',
     'checkin_to_diff_location' => '您可以选择将此资产归还到此资产的默认位置（如果已设置）:default_location 以外的位置',
     'maintenance_mode'      => '该服务暂时无法用于系统更新。请稍后再试。',
     'maintenance_mode_title' => '系统暂时不可用',
@@ -418,19 +427,20 @@ return [
     'bulk_soft_delete'      =>'也可以“软删除”这些用户。他们的资产历史将保持不变，除非直到您清理管理设置中删除的记录。',
     'bulk_checkin_delete_success' => '您所选的用户已被删除，其名下资产已归还。',
     'bulk_checkin_success' => '选中用户的物品已归还。',
-    'set_to_null'           => '删除此资产的值|删除所有:asset_count个资产的值 ',
+    'set_to_null'           => '删除此选择的值 |删除所有 :selection_count 个选择的值 ',
     'set_users_field_to_null'  => '删除此用户的 :field 值|删除所有 :user_count 个用户的 :field 值 ',
     'na_no_purchase_date'   => 'N/A-未提供购买日期',
     'assets_by_status'      => '按状态显示的资产',
     'assets_by_status_type'      => '按状态类型显示的资产',
     'pie_chart_type'        => '仪表盘饼图类型',
     'hello_name'            => '您好，:name！',
-    'unaccepted_profile_warning'   => '您需要接受:count 件物品。点击这里接受或拒绝。',
+    'unaccepted_profile_warning'   => '你有一件物品需要接受。点击这里同意或拒绝它 | 您有 :count 件物品需要接受。点击这里同意或拒绝它们',
     'start_date'            => '开始日期',
     'end_date'            => '结束日期',
     'alt_uploaded_image_thumbnail' => '已上传缩略图',
     'placeholder_kit'       => '选择一个套件',
     'file_not_found'        => '未找到文件',
+    'log_record_not_found'  => '没有找到该日志条目的记录。',
     'preview_not_available' => '(没有预览)',
     'setup'                 => '设置',
     'pre_flight'            => '预检',
@@ -484,19 +494,19 @@ return [
     'serial_number'        => '序列号',
     'item_notes' => ':item 备注',
     'item_name_var' => ':item 名称',
-    'error_user_company' => '借出目标公司和资产所在公司不匹配',
+    'error_user_company' => '签出的公司和资产所在公司不匹配',
     'error_user_company_accept_view' => '分配给您的资产属于另一家公司，所以您不能接受或拒绝它，请与您的经理联系。',
     'importer' => [
-        'checked_out_to_fullname' => '借出给: Full Name',
-        'checked_out_to_first_name' => '借出给: First Name',
-        'checked_out_to_last_name' => '借出给: Last Name',
-        'checked_out_to_username' => '借出给: Username',
-        'checked_out_to_email' => '借出给: Email',
-        'checked_out_to_tag' => '借出给: Asset Tag',
-        'manager_first_name' => '管理员名',
-        'manager_last_name' => '管理员姓',
-        'manager_full_name' => '管理员全名',
-        'manager_username' => '管理员用户名',
+        'checked_out_to_fullname' => '签出给: 全名',
+        'checked_out_to_first_name' => '签出给: 名',
+        'checked_out_to_last_name' => '签出给: 姓',
+        'checked_out_to_username' => '签出给: 用户名',
+        'checked_out_to_email' => '签出给: 邮件',
+        'checked_out_to_tag' => '签出给: 资产标签',
+        'manager_first_name' => '管理者名字',
+        'manager_last_name' => '管理者姓',
+        'manager_full_name' => '管理者全名',
+        'manager_username' => '管理者用户名',
         'checkout_type' => '借出类型',
         'checkout_location' => '借出到位置',
         'image_filename' => '图像文件名',
@@ -509,10 +519,10 @@ return [
         'import_note' => '使用 csv 导入器导入',
     ],
     'remove_customfield_association' => '从字段集中删除此字段。这不会删除自定义字段，只会删除此字段与此字段集的关联。',
-    'checked_out_to_fields' => '借出到字段',
+    'checked_out_to_fields' => '签出到字段',
     'percent_complete' => '% 完成',
     'uploading' => '正在上传... ',
-    'upload_error' => '上传文件时出错。请检查是否没有空行，并且没有重复的列名。',
+    'upload_error' => '文件上传失败。请检查您的 CSV 文件，确保其中没有空行或重复的列名，并确认服务器权限允许上传。',
     'copy_to_clipboard' => '复制到剪贴板',
     'copied' => '已复制！',
     'status_compatibility' => '如果资产已经分配，它们不能被更改为不可部署的状态类型，并且这个值的变化将被跳过。',
@@ -526,9 +536,9 @@ return [
     'url'                   => 'URL',
     'edit_fieldset' => '编辑字段集字段和选项',
     'permission_denied_superuser_demo' => '权限被拒绝。您不能更新演示上超级管理员的用户信息。',
-    'pwd_reset_not_sent' => '用户未激活，LDAP同步，或没有电子邮件地址',
+    'pwd_reset_not_sent' => '用户未激活，可能因为LDAP同步，或没有电子邮件地址',
     'error_sending_email' => '发送邮件时出错',
-    'sad_panda' => 'Sad panda. You are not authorized to do the thing. Maybe <a href=":link">return to the dashboard</a>, or contact your administrator.',
+    'sad_panda' => '不好意思，您没有权限做这件事。或许 <a href=":link">返回到仪表板</a>或联系您的管理员。',
     'bulk' => [
             'delete' =>
                 [
@@ -543,12 +553,77 @@ return [
     'no_requestable' => '没有可申领的资产或资产型号。',
 
     'countable' => [
-        'accessories'  => ':count 配件|:count 配件',
-        'assets'  => ':count 资产|:count 资产',
-        'licenses'  => ':count 许可证|:count 许可证',
-        'license_seats'  => ':count 许可证席位|:count 许可证席位',
-        'consumables'  => ':count 耗材|:count 耗材',
+        'accessories'  => ':count 个配件|:count 个配件',
+        'assets'  => ':count 个资产|:count 个资产',
+        'licenses'  => ':count 个许可证|:count 个许可证',
+        'license_seats'  => ':count 个许可证席位|:count 许可证席位',
+        'consumables'  => ':count 个耗材|:count 个耗材',
         'components'  => ':count 组件|:count 组件',
-    ]
+    ],
+
+    'more_info' => '更多信息',
+    'quickscan_bulk_help' => '勾选此框将编辑资产记录以反映其新的位置。不勾选则只会在盘点日志中记录该位置。注意，如果此资产已被借出，则不会更改其借出到的人员、资产或位置的位置。',
+    'whoops' => '哎呀！',
+    'something_went_wrong' => '您的请求出了点问题。',
+    'close' => '关闭',
+    'expires' => '过期',
+    'map_fields'=> '映射 :item_type 字段',
+    'remaining_var' => '剩余:count个',
+    'label' => '标签',
+    'import_asset_tag_exists' => '资产标签为:asset_tag的资产已经存在，且未请求更新。没有做任何更改。',
+    'countries_manually_entered_help' => '带星号(*) 的值是手动输入的，与现有的 ISO 3166 下拉值不匹配',
+    'accessories_assigned' => '已分配的配件',
+    'user_managed_passwords' => '密码管理',
+    'user_managed_passwords_disallow' => '禁止用户管理自己的密码',
+    'user_managed_passwords_allow' => '允许用户管理自己的密码',
+    'from' => '从',
+    'by' => '经由',
+
+// Add form placeholders here
+    'placeholders' => [
+        'notes'  => '添加备注',
+    ],
+
+    'breadcrumb_button_actions' => [
+        'edit_item' => '编辑 :name',
+        'checkout_item' => '签出 :name',
+        'checkin_item' => '归还 :name',
+    ],
+
+    'skins' => [
+        'site_default' => '站点默认',
+        'default_blue' => '默认蓝色',
+        'blue_dark' => '蓝色（深色模式）',
+        'green' => '深绿色',
+        'green_dark' => '绿色（深色模式）',
+        'red' => '暗红色',
+        'red_dark' => '红色（深色模式）',
+        'orange' => '暗橙色',
+        'orange_dark' => '橙色（深色模式）',
+        'black' => '黑色',
+        'black_dark' => '黑色（深色模式）',
+        'purple' => '紫色',
+        'purple_dark' => '紫色（深色模式）',
+        'yellow' => '黄色',
+        'yellow_dark' => '黄色（深色模式）',
+        'high_contrast' => '高对比度',
+
+    ],
+
+    'select_all_none' => '选择/取消选择所有',
+    'generic_model_not_found' => ':model 未找到或您没有访问权限',
+    'deleted_models' => '已删除的资产型号',
+    'deleted_users' => '已删除的用户',
+    'cost_each' => '每项:amount',
+    'remove_current_image' => '删除当前 :type 图像',
+
+    'seeding' => [
+        'manufacturers' => [
+            'button' => '创建制造商',
+            'prompt' => '当前制造商列表为空。是否加载常用制造商清单？（<b>此操作将覆盖所有现有制造商数据</b>，含已软删除条目。）',
+            'success' => '制造商已成功加载',
+            'error' => '制造商加载失败，当前系统中已存在一条制造商记录，执行此操作将覆盖现有数据。|制造商加载失败，当前系统中已存在:count条制造商记录，执行此操作将覆盖现有数据。',
+        ],
+    ],
 
 ];
diff --git a/resources/lang/zh-CN/help.php b/resources/lang/zh-CN/help.php
index 3d6ecc6e47..9050ec87e7 100644
--- a/resources/lang/zh-CN/help.php
+++ b/resources/lang/zh-CN/help.php
@@ -15,7 +15,7 @@ return [
 
     'more_info_title' => '更多信息',
 
-    'audit_help' => '勾选此框将编辑资产记录以反映其新的位置。不勾选它将只标记盘点记录中的位置。<br><br>注意此资产已借出，它不会改变它借出至的个人、资产或位置。',
+    'audit_help' => '勾选此框将编辑资产记录以反映其新的位置。不勾选它将只标记盘点记录中的位置。<br><br>注意此资产已签出，它不会改变它借出至的个人、资产或位置。',
 
     'assets' => '资产是指按序号或资产标签跟踪的物品，往往是指识别某一具体物品的价值较高的物品。',
 
@@ -27,7 +27,7 @@ return [
 
     'components'    => '组件为资产的一部分，例如硬盘、内存等。',
 
-    'consumables'   => '所谓耗材是指从购买后会慢慢消耗并最终用尽的物品，例如打印机墨水，复印纸等等。',
+    'consumables'   => '耗材是指从购买后会慢慢消耗并最终用尽的物品，例如打印机墨水，复印纸等等。',
 
     'depreciations' => '你可以设置资产折旧时间期限',
     
diff --git a/resources/lang/zh-CN/localizations.php b/resources/lang/zh-CN/localizations.php
index 6219123977..10b28a004e 100644
--- a/resources/lang/zh-CN/localizations.php
+++ b/resources/lang/zh-CN/localizations.php
@@ -4,7 +4,7 @@ return [
 
     'select_language' => '选择一种语言',
     'languages' => [
-        'en-US'=> '中文',
+        'en-US'=> '英语（美国）',
         'en-GB'=> '英语（英国）',
         'am-ET' => 'Amharic',
         'af-ZA'=> '南非荷兰语',
@@ -40,7 +40,9 @@ return [
         'ms-MY'=> '马来文',
         'mi-NZ'=> 'Maori',
         'mn-MN'=> '蒙古语',
-        'no-NO'=> '挪威语',
+        'nb-NO'=> '挪威语 （博克马尔语）',
+        'om-ET' => '奥罗莫语(埃塞俄比亚)',
+        //'nn-NO'=> 'Norwegian Nynorsk',
         'fa-IR'=> '波斯文',
         'pl-PL'=> '波兰语',
         'pt-PT'=> '葡萄牙文',
@@ -66,7 +68,7 @@ return [
         'zu-ZA'=> 'Zulu',
     ],
 
-    'select_country' => '选择国家',
+    'select_country' => '选择一个国家或地区',
     
     'countries' => [
         'AC'=>'阿森松岛',
@@ -133,6 +135,7 @@ return [
         'EC'=>'Ecuador',
         'EE'=>'爱沙尼亚',
         'EG'=>'埃及',
+        'GB-ENG'=>'英格兰',
         'ER'=>'厄立特里亚',
         'ES'=>'西班牙',
         'ET'=>'Ethiopia',
@@ -231,6 +234,7 @@ return [
         'NG'=>'Nigeria',
         'NI'=>'Nicaragua',
         'NL'=>'荷兰',
+        'GB-NIR' => '北爱尔兰',
         'NO'=>'挪威',
         'NP'=>'尼泊尔',
         'NR'=>'Nauru',
@@ -258,7 +262,7 @@ return [
         'RU'=>'俄罗斯联邦',
         'RW'=>'Rwanda',
         'SA'=>'沙特阿拉伯',
-        'UK'=>'Scotland',
+        'GB-SCT'=>'Scotland',
         'SB'=>'所罗门群岛',
         'SC'=>'Seychelles',
         'SS'=>'南苏丹',
@@ -310,6 +314,7 @@ return [
         'VI'=>'维尔京群岛(美国)',
         'VN'=>'Viet Nam',
         'VU'=>'Vanuatu',
+        'GB-WLS' =>'威尔士',
         'WF'=>'瓦利斯群岛和富图纳群岛',
         'WS'=>'Samoa',
         'YE'=>'也门',
diff --git a/resources/lang/zh-CN/mail.php b/resources/lang/zh-CN/mail.php
index 3963d9d0e6..ad96e5053c 100644
--- a/resources/lang/zh-CN/mail.php
+++ b/resources/lang/zh-CN/mail.php
@@ -2,17 +2,17 @@
 
 return [
 
-    'Accessory_Checkin_Notification' => '配件已签入',
-    'Accessory_Checkout_Notification' => '配件已借出',
-    'Asset_Checkin_Notification' => '资产已签入',
-    'Asset_Checkout_Notification' => '资产已借出',
+    'Accessory_Checkin_Notification' => '配件已归还',
+    'Accessory_Checkout_Notification' => '配件已签出',
+    'Asset_Checkin_Notification' => '资产已归还',
+    'Asset_Checkout_Notification' => '资产已签出',
     'Confirm_Accessory_Checkin' => '配件签入确认',
     'Confirm_Asset_Checkin' => '确认资产收回',
     'Confirm_accessory_delivery' => '配件交付确认',
     'Confirm_asset_delivery' => '资产交付确认',
     'Confirm_consumable_delivery' => '耗材交付确认',
     'Confirm_license_delivery' => '许可证交付确认',
-    'Consumable_checkout_notification' => '耗材已借出',
+    'Consumable_checkout_notification' => '耗材已签出',
     'Days' => '天',
     'Expected_Checkin_Date' => '借出的资产将在 :date 重新签入',
     'Expected_Checkin_Notification' => '提醒：:name 签入截止日期已接近。',
@@ -22,48 +22,52 @@ return [
     'Item_Request_Canceled' => '已取消申领物品',
     'Item_Requested' => '已申领物品',
     'License_Checkin_Notification' => '许可证已签入',
-    'License_Checkout_Notification' => '许可证已借出',
+    'License_Checkout_Notification' => '许可证已签出',
+    'license_for'   => '授权给',
     'Low_Inventory_Report' => '低库存报告',
     'a_user_canceled' => '用户已取消物品申请',
     'a_user_requested' => '用户已申请物品',
     'acceptance_asset_accepted' => '用户已接受一件物品',
     'acceptance_asset_declined' => '用户拒绝了一件物品',
-    'accessory_name' => '配件名称：',
-    'additional_notes' => '备注：',
+    'accessory_name' => '配件名称',
+    'additional_notes' => '附加注释',
     'admin_has_created' => '管理员已在 :web 为您新增帐号。',
-    'asset' => '资产：',
-    'asset_name' => '资产名称：',
+    'asset' => '资产',
+    'asset_name' => '资产名称',
     'asset_requested' => '已申请资产',
     'asset_tag' => '资产标签',
     'assets_warrantee_alert' => '有 :count 个资产保修期将于 :threshold 天到期。|有 :count 个资产 保修期将于 :threshold 天到期。',
     'assigned_to' => '已分配给',
     'best_regards' => '此致',
-    'canceled' => '已取消：',
-    'checkin_date' => '交回日期：',
-    'checkout_date' => '借出日期：',
+    'canceled' => '已取消',
+    'checkin_date' => '归还日期',
+    'checkout_date' => '签出日期',
     'checkedout_from' => '借出自',
     'checkedin_from'  => '归还自',
     'checked_into' => '归还至',
     'click_on_the_link_accessory' => '请点击链接确认您已经收到配件。',
-    'click_on_the_link_asset' => '请点击链接确认您已经收到资产。',
+    'click_on_the_link_asset' => '请点击底部的链接确认您已经收到资产。',
     'click_to_confirm' => '请点击链接启用您在 :web 的帐号：',
     'current_QTY' => '目前数量',
     'days' => '天',
-    'expecting_checkin_date' => '预计归还日期：',
+    'expecting_checkin_date' => '预计归还日期',
     'expires' => '过期',
     'hello' => '您好',
     'hi' => '您好',
     'i_have_read' => '我同意使用条款并确认已收到物品。',
     'inventory_report' => '库存报告',
-    'item' => '项目：',
-    'license_expiring_alert' => '有：个许可将在：天后到期。|有：个许可将在：天后到期。',
+    'item' => '项目',
+    'item_checked_reminder' => '提醒，当前借出给您 :count 件物品，您还没有签收或拒绝。 请点击下面的链接以确认您的决定。',
+    'license_expiring_alert' => '有 :count 个许可将在 :threshold 天后到期。|有 :count 个许可将在 :threshold 天后到期。',
     'link_to_update_password' => '请点击以下链接以更新 :web 的密码：',
-    'login' => '登录：',
+    'login' => '登录',
     'login_first_admin' => '请使用以下凭据登录新安装的 Snipe-IT：',
     'low_inventory_alert' => '有：种物品已经低于或者接近最小库存。|有：种物品已经低于或者接近最小库存。',
     'min_QTY' => '最小数量',
     'name' => '名字',
     'new_item_checked' => '一项新物品已分配至您的名下，详细信息如下。',
+    'new_item_checked_with_acceptance' => '一件新物品已借至您的名下，需要签收，详情如下。',
+    'recent_item_checked' => '有一件物品刚刚签出到您的名下，需要签收，详情如下。',
     'notes' => '备注',
     'password' => '密码',
     'password_reset' => '密码重置',
@@ -83,11 +87,13 @@ return [
     'the_following_item' => '以下项目已交回：',
     'to_reset' => '要重置 :web 的密码，请完成此表格：',
     'type' => '类型',
-    'upcoming-audits' => '有:count 项资产将在:threshold 天内进行审计.|有:count 项资产将在:threshold 天内进行审计。',
+    'upcoming-audits' => '有:count 项资产将在:threshold 天内进行盘点.|有:count 项资产将在:threshold 天内进行盘点。',
     'user' => '用户',
     'username' => '用户名',
+    'unaccepted_asset_reminder' => '提醒：您有未接受的资产。',
     'welcome' => '欢迎您，:name',
     'welcome_to' => '欢迎来到 :web！',
     'your_assets' => '查看您的资产',
     'your_credentials' => '您的 Snipe-IT 登录凭据',
+    'mail_sent' => '邮件发送成功！',
 ];
diff --git a/resources/lang/zh-CN/validation.php b/resources/lang/zh-CN/validation.php
index a87a53ec0e..be57466059 100644
--- a/resources/lang/zh-CN/validation.php
+++ b/resources/lang/zh-CN/validation.php
@@ -13,87 +13,150 @@ return [
     |
     */
 
-    'accepted'             => ' :attribute 必须接受',
-    'active_url'           => ':attribute 不是正确的网址',
-    'after'                => ' :attribute 必须在 :date 之后',
-    'after_or_equal'       => 'the：属性必须是以下或之后的日期：date。',
-    'alpha'                => ':attribute 只能包含字母',
-    'alpha_dash'           => ':attribute 只能包含字母，数字和\'-\'',
-    'alpha_num'            => ':attribute 只允许字母和数字',
-    'array'                => '：属性必须是数组。',
-    'before'               => ':attribute 必须在 :date 之前',
-    'before_or_equal'      => '：属性必须是之前或之前的日期：date。',
-    'between'              => [
-        'numeric' => ':attribute 必须在 :min - :max 之间',
-        'file'    => ':attribute 必须在 :min - :max kb 之间',
-        'string'  => ':attribute 必须在 :min - :max 字符之间',
-        'array'   => 'the：属性必须有：min和：max items之间。',
+    'accepted' => '必须接受 :attribute 字段。',
+    'accepted_if' => '当 :other 是 :value 时必须接受 :attribute 字段。',
+    'active_url' => ':attribute 字段必须是一个有效的 URL。',
+    'after' => ':attribute 字段必须在 :date 之后。',
+    'after_or_equal' => ':attribute 字段必须是晚于或等于 :date 的日期。',
+    'alpha' => ':attribute 字段只能包含字母',
+    'alpha_dash' => ':attribute 字段只能包含字母、数字、破折号和下划线。',
+    'alpha_num' => ':attribute 字段只能包含字母和数字。',
+    'array' => ':attribute 字段必须是一个数组。',
+    'ascii' => ':attribute 字段只能包含单字节字母和符号。',
+    'before' => ':attribute 字段必须在 :date 之前。',
+    'before_or_equal' => ':attribute 字段必须早于或等于 :date 的日期。',
+    'between' => [
+        'array' => ':attribute 字段必须在 :min 与 :max 之间。',
+        'file' => ':attribute 字段必须介于 :min 到 :max kb 之间。',
+        'numeric' => ':attribute 字段必须在 :min 到 :max 之间。',
+        'string' => ':attribute 字段必须在 :min 和 :max 字符之间。',
     ],
-    'boolean'              => '：属性字段必须为true或false。',
-    'confirmed'            => ':attribute 属性不匹配',
-    'date'                 => ':attribute 不是有效日期',
-    'date_format'          => ':attribute 不符合 :format 的格式',
-    'different'            => ' :attribute 和 :other 不能相同',
-    'digits'               => ':attribute 必须是  :digits  数字',
-    'digits_between'       => ':attribute 必须在 :min 和 :max 数字之间',
-    'dimensions'           => 'the：属性具有无效的图像尺寸。',
-    'distinct'             => '：属性字段具有重复值。',
-    'email'                => ':attribute 格式不对',
-    'exists'               => '选择的 :attribute 无效',
-    'file'                 => '：属性必须是一个文件。',
-    'filled'               => '：属性字段必须有一个值。',
-    'image'                => ':attribute 必须是图片格式',
+    'boolean' => '：属性字段必须为true或false。',
+    'can' => ':attribute 字段包含一个未授权的值。',
+    'confirmed' => ':attribute 字段确认不匹配。',
+    'contains' => ':attribute 字段缺少必需的值。',
+    'current_password' => '密码不正确。',
+    'date' => ':attribute 字段必须是一个有效的日期。',
+    'date_equals' => ':attribute 字段必须等于 :date 的日期。',
+    'date_format' => ':attribute 字段必须与格式 :format 匹配。',
+    'decimal' => ':attribute 字段必须有 :decimal 十进制小数位。',
+    'declined' => ':attribute 字段必须被拒绝。',
+    'declined_if' => '当 :other 是 :value 时必须拒绝 :attribute 字段。',
+    'different' => ':attribute 字段和 :other 必须不同。',
+    'digits' => ':attribute 字段必须是 :digits 数字',
+    'digits_between' => ':attribute 字段必须介于 :min 到 :max 位数字之间。',
+    'dimensions' => ':attribute 字段的图像尺寸无效。',
+    'distinct' => ':attribute 字段有一个重复的值。',
+    'doesnt_end_with' => ':attribute 字段不能以下列之一结尾：:values 。',
+    'doesnt_start_with' => ':attribute 字段不能以下列之一开始：:values 。',
+    'email' => ':attribute 字段必须是一个有效的电子邮件地址。',
+    'ends_with' => ':attribute 字段必须以下列之一结尾：:values 。',
+    'enum' => '选择的 :attribute 无效',
+    'exists' => '选择的 :attribute 无效',
+    'extensions' => ':attribute 字段必须有以下扩展之一： :values 。',
+    'file' => ':attribute 字段必须是一个文件。',
+    'filled' => ':attribute 必须有一个值。',
+    'gt' => [
+        'array' => ':attribute 字段必须超过 :value 项。',
+        'file' => ':attribute 字段必须大于 :value kb。',
+        'numeric' => ':attribute 字段必须大于 :value 。',
+        'string' => ':attribute 字段必须大于 :value 字符。',
+    ],
+    'gte' => [
+        'array' => ':attribute 字段必须包含 :value 项或更多项。',
+        'file' => ':attribute 字段必须大于或等于 :value kb。',
+        'numeric' => ':attribute 字段必须大于或等于 :value 。',
+        'string' => ':attribute 必须大于或等于 :value 字符。',
+    ],
+    'hex_color' => ':attribute 必须是一个有效的十六进制颜色。',
+    'image' => ':attribute 字段必须是一个图像。',
     'import_field_empty'    => ':fieldname 的值不能为空。',
-    'in'                   => '选择的 :attribute 无效',
-    'in_array'             => '：属性字段不存在于：其他。',
-    'integer'              => ':attribute 必须是整数',
-    'ip'                   => ':attribute 必须是有效IP',
-    'ipv4'                 => '：属性必须是有效的IPv4地址。',
-    'ipv6'                 => '：属性必须是有效的IPv6地址。',
-    'is_unique_department' => ':attribute 必须是唯一的公司地理位置',
-    'json'                 => '：属性必须是有效的JSON字符串。',
-    'max'                  => [
-        'numeric' => ':attribute 不大于 :max',
-        'file'    => ':attribute 不大于 :max kb',
-        'string'  => ':attribute 不大于 :max 字符',
-        'array'   => '：属性可能不超过：max项。',
+    'in' => '选择的 :attribute 无效',
+    'in_array' => ':attribute 字段必须在 :other 中存在。',
+    'integer' => ':attribute 字段必须是整数。',
+    'ip' => ':attribute 字段必须是一个有效的 IP 地址。',
+    'ipv4' => ':attribute 字段必须是有效的 IPv4 地址。',
+    'ipv6' => ':attribute 字段必须是有效的 IPv6 地址。',
+    'json' => ':attribute 字段必须是有效的 JSON 字符串。',
+    'list' => ':attribute 字段必须是一个列表。',
+    'lowercase' => ':attribute 字段必须是小写。',
+    'lt' => [
+        'array' => ':attribute 字段必须小于 :value 项。',
+        'file' => ':attribute 字段必须小于 :value kb。',
+        'numeric' => ':attribute 字段必须小于 :value 。',
+        'string' => ':attribute 字段必须小于 :value 个字符。',
     ],
-    'mimes'                => ':attribute 文件类型必须是 :values',
-    'mimetypes'            => '：属性必须是一个类型为：的值的文件。',
-    'min'                  => [
-        'numeric' => ':attribute 最少  :min',
-        'file'    => ':attribute 最小 :min kb',
-        'string'  => ':attribute 最少 :min个字符',
-        'array'   => '：属性必须至少有：最小项。',
+    'lte' => [
+        'array' => ':attribute 字段不能超过 :value 项。',
+        'file' => ':attribute 字段必须小于或等于 :value kb。',
+        'numeric' => ':attribute 字段必须小于或等于 :value。',
+        'string' => ':attribute 字段必须小于或等于 :value 个字符。',
     ],
-    'starts_with'          => ':attribute 必须以以下一个开始：:values',
-    'ends_with'            => ':attribute 必须以: :values 其中一个结尾。',
+    'mac_address' => ':attribute 字段必须是一个有效的 MAC 地址。',
+    'max' => [
+        'array' => ':attribute 字段不能超过 :max 项。',
+        'file' => ':attribute 字段不能大于 :max kb。',
+        'numeric' => ':attribute 字段不能大于 :max 。',
+        'string' => ':attribute 字段不能大于 :max 个字符。',
+    ],
+    'max_digits' => ':attribute 字段不能超过 :max 位数。',
+    'mimes' => ':attribute 字段必须是类型为: :values 的文件。',
+    'mimetypes' => ':attribute 字段必须是类型为: :values 的文件。',
+    'min' => [
+        'array' => ':attribute 字段必须至少包含 :min 项。',
+        'file' => ':attribute 字段必须至少 :min kb。',
+        'numeric' => ':attribute 字段必须至少 :min。',
+        'string' => ':attribute 字段必须至少 :min 字符。',
+    ],
+    'min_digits' => ':attribute 字段必须至少有 :min 个数字。',
+    'missing' => ':attribute 字段必须缺失。',
+    'missing_if' => '当 :other 是 :value 时 :attribute 字段必须缺失。',
+    'missing_unless' => ':attribute 字段必须确实，除非 :other 是 :value 。',
+    'missing_with' => '当 :values 存在时，:attribute 字段必须缺失。',
+    'missing_with_all' => '当 :values 存在时，:attribute 字段必须缺失。',
+    'multiple_of' => ':attribute 字段必须是 :value 的倍数。',
+    'not_in' => '选择的 :attribute 无效',
+    'not_regex' => ':attribute 字段格式无效。',
+    'numeric' => ':attribute 字段必须是一个数字。',
+    'password' => [
+        'letters' => ':attribute 字段必须包含至少一个字母。',
+        'mixed' => ':attribute 字段必须至少包含一个大写字母和一个小写字母。',
+        'numbers' => ':attribute 字段必须包含至少一个数字。',
+        'symbols' => ':attribute 字段必须至少包含一个符号。',
+        'uncompromised' => '给定的 :attribute 字段出现在数据泄漏中。请选择一个不同的 :attribute 。',
+    ],
+    'percent'       => '当折旧类型为百分比时，折旧的最小值必须在0到100之间。',
 
-    'not_in'               => '选择的 :attribute 无效',
-    'numeric'              => ':attribute 必须是数字',
-    'present'              => '：属性字段必须存在。',
-    'valid_regex'          => '这不是一个有效的正则表达式。 ',
-    'regex'                => ':attribute 格式不对',
-    'required'             => ':attribute 字段必填',
-    'required_if'          => ':attribute 字段在 :other 是 :value 时是必须的',
-    'required_unless'      => '需要：属性字段，除非：other is in：values。',
-    'required_with'        => ' 当:values 是现在 :attribute 是必需的',
-    'required_with_all'    => '当：值存在时，需要：属性字段。',
-    'required_without'     => '当:values 是现在 :attribute 是必需的',
+    'present' => ':attribute 字段必填',
+    'present_if' => '当 :other 为 :value 时，:attribute 字段必须存在。',
+    'present_unless' => ':attribute 字段必须存在，除非 :other 是 :value 。',
+    'present_with' => '当 :values 存在时，:attribute 字段必须存在。',
+    'present_with_all' => '当 :values 存在时，:attribute 字段必须存在。',
+    'prohibited' => ':attribute 字段被禁止。',
+    'prohibited_if' => '当:other 是 :value 时，:attribute 字段被禁止。',
+    'prohibited_unless' => ':attribute 字段被禁止，除非 :other 在 :values 。',
+    'prohibits' => ':attribute 字段禁止 :other 出现。',
+    'regex' => ':attribute 字段格式无效。',
+    'required' => ':attribute 字段必填',
+    'required_array_keys' => ':attribute 字段必须包含：:values 。',
+    'required_if' => ':attribute 字段在 :other 是 :value 时是必须的',
+    'required_if_accepted' => '当 :other 被接受时，:attribute 字段是必需的。',
+    'required_if_declined' => '当 :other 被拒绝时，:attribute 字段是必需的。',
+    'required_unless' => '需要：属性字段，除非：other is in：values。',
+    'required_with' => ' 当:values 是现在 :attribute 是必需的',
+    'required_with_all' => '当 :values 存在时 :attribute 字段是必需的。',
+    'required_without' => '当:values 是现在 :attribute 是必需的',
     'required_without_all' => '当不存在：值时，需要：属性字段。',
-    'same'                 => ':attribute 和 :other  必需匹配',
-    'size'                 => [
-        'numeric' => ':attribute 必需是  :size',
-        'file'    => ':attribute 必需是 :size kb',
-        'string'  => ':attribute 必需是 :size 个字符',
-        'array'   => '：属性必须包含：size项。',
+    'same' => ':attribute 字段必须匹配 :other 。',
+    'size' => [
+        'array' => ':attribute 字段必须包含 :size 项。',
+        'file' => ':attribute 字段必须是 :size kb。',
+        'numeric' => ':attribute 字段必须是 :size 。',
+        'string' => ':attribute 字段必须是 :size 个字符。',
     ],
-    'string'               => '：属性必须是字符串。',
-    'timezone'             => '：属性必须是有效区域。',
+    'starts_with' => ':attribute 字段必须以下列之一开始：:values 。',
+    'string'               => ':attribute 必须是字符串。',
     'two_column_unique_undeleted' => ':attribute 在 :table1 和 :table2 中必须是唯一的。 ',
-    'unique'               => ':attribute 已经被采用',
-    'uploaded'             => '：属性无法上传。',
-    'url'                  => ':attribute 格式无效',
     'unique_undeleted'     => ':attribute 属性必须唯一。',
     'non_circular'         => ':attribute 不能创建循环引用。',
     'not_array'            => ':attribute 不能是一个数组。',
@@ -102,11 +165,14 @@ return [
     'numbers'              => '密码必须包含至少一个数字。',
     'case_diff'            => '密码必须使用混合大小写。',
     'symbols'              => '密码必须包含符号。',
-    'gte'                  => [
-        'numeric'          => '数值不能为负数'
-    ],
-    'checkboxes'           => ':attribute 包含无效的选项。',
-    'radio_buttons'        => ':attribute 无效。',
+    'timezone' => ':attribute 字段必须是一个有效的时区。',
+    'unique' => ':attribute 已经被采用',
+    'uploaded' => ':attribute 无法上传。',
+    'uppercase' => ':attribute 字段必须是大写。',
+    'url' => ':attribute 字段必须是一个有效的 URL。',
+    'ulid' => ':attribute 字段必须是个有效的 ULID。',
+    'uuid' => ':attribute 字段必须是一个有效的 UUID。',
+    'fmcs_location' => '管理设置中已启用完整的多公司支持及位置范围限定功能，但当前选择的位置与公司不兼容。',
 
 
     /*
@@ -120,16 +186,22 @@ return [
     |
     */
 
+    'email_array'      => '一个或多个电子邮件地址无效。',
+    'checkboxes'           => ':attribute 包含无效的选项。',
+    'radio_buttons'        => ':attribute 无效。',
+    
     'custom' => [
-        'alpha_space' => '：属性字段包含不允许的字符。',
-        'email_array'      => '一个或多个电子邮件地址无效。',
+        'alpha_space' => ':attribute 字段包含不允许的字符。',
+
         'hashed_pass'      => '您当前的密码不正确',
         'dumbpwd'          => '那个密码太常见了。',
         'statuslabel_type' => '您必须选择有效的状态标签类型',
+        'custom_field_not_found'          => '此字段似乎不存在，请重新检查您的自定义字段名称。',
+        'custom_field_not_found_on_model' => '此字段似乎存在，但在此资产型号的字段集上不可用。',
 
         // date_format validation with slightly less stupid messages. It duplicates a lot, but it gets the job done :(
-        // We use this because the default error message for date_format is reflects php Y-m-d, which non-PHP
-        // people won't know how to format. 
+        // We use this because the default error message for date_format reflects php Y-m-d, which non-PHP
+        // people won't know how to format.
         'purchase_date.date_format'     => ':attribute 必须是 YYYY-MM-DD 格式的有效日期',
         'last_audit_date.date_format'   =>  ':attribute 必须是 YYYY-MM-DD hh:mm:ss 格式的有效日期',
         'expiration_date.date_format'   =>  ':attribute 必须是 YYYY-MM-DD 格式的有效日期',
@@ -137,9 +209,15 @@ return [
         'expected_checkin.date_format'  =>  ':attribute 必须是 YYYY-MM-DD 格式的有效日期',
         'start_date.date_format'        =>  ':attribute 必须是 YYYY-MM-DD 格式的有效日期',
         'end_date.date_format'          =>  ':attribute 必须是 YYYY-MM-DD 格式的有效日期',
+        'invalid_value_in_field' => '此字段中包含的值无效',
 
-    ],
+        'ldap_username_field' => [
+            'not_in' =>         '<code>sAMAccountName</code>(混合大小写) 可能不起作用。您应该改用<code>samaccountname</code>(小写)。'
+        ],
+        'ldap_auth_filter_query' => ['not_in' => '<code>uid=samaccountname</code>可能不是有效的身份验证过滤器。您可能需要<code>uid=</code> '],
+        'ldap_filter' => ['regex' => '这个值可能不应该用括号括起来。'],
 
+        ],
     /*
     |--------------------------------------------------------------------------
     | Custom Validation Attributes
@@ -155,8 +233,16 @@ return [
 
     /*
     |--------------------------------------------------------------------------
-    | Generic Validation Messages
+    | Generic Validation Messages - we use these in the jquery validation where we don't have
+    | access to the :attribute
     |--------------------------------------------------------------------------
     */
-    'invalid_value_in_field' => '此字段中包含的值无效',
+
+    'generic' => [
+        'invalid_value_in_field' => '此字段中包含的值无效',
+        'required' => '此字段是必填项',
+        'email' => '请输入一个有效的电子邮件地址',
+    ],
+
+
 ];
diff --git a/resources/lang/zh-HK/account/general.php b/resources/lang/zh-HK/account/general.php
index 1a9e2c03b8..7f9e2f848e 100644
--- a/resources/lang/zh-HK/account/general.php
+++ b/resources/lang/zh-HK/account/general.php
@@ -2,10 +2,16 @@
 
 return array(
     'personal_api_keys' => 'Personal API Keys',
+    'personal_access_token' => 'Personal Access Token',
+    'personal_api_keys_success' => 'Personal API Key :key created sucessfully',
+    'here_is_api_key' => 'Here is your new personal access token. This is the only time it will be shown so do not lose it! You may now use this token to make API requests.',
     'api_key_warning' => 'When generating an API token, be sure to copy it down immediately as they will not be visible to you again.',
     'api_base_url' => 'Your API base url is located at:',
     'api_base_url_endpoint' => '/&lt;endpoint&gt;',
     'api_token_expiration_time' => 'API tokens are set to expire in:',
     'api_reference' => 'Please check the <a href="https://snipe-it.readme.io/reference" target="_blank">API reference</a> to find specific API endpoints and additional API documentation.',
     'profile_updated' => 'Account successfully updated',
+    'no_tokens' => 'You have not created any personal access tokens.',
+    'enable_sounds' => 'Enable sound effects',
+    'enable_confetti' => 'Enable confetti effects',
 );
diff --git a/resources/lang/zh-HK/admin/accessories/message.php b/resources/lang/zh-HK/admin/accessories/message.php
index c688d5e03d..f60d41957b 100644
--- a/resources/lang/zh-HK/admin/accessories/message.php
+++ b/resources/lang/zh-HK/admin/accessories/message.php
@@ -26,7 +26,11 @@ return array(
         'error'   		=> 'Accessory was not checked out, please try again',
         'success' 		=> 'Accessory checked out successfully.',
         'unavailable'   => 'Accessory is not available for checkout. Check quantity available',
-        'user_does_not_exist' => 'That user is invalid. Please try again.'
+        'user_does_not_exist' => 'That user is invalid. Please try again.',
+         'checkout_qty' => array(
+            'lte'  => 'There is currently only one available accessory of this type, and you are trying to check out :checkout_qty. Please adjust the checkout quantity or the total stock of this accessory and try again.|There are :number_currently_remaining total available accessories, and you are trying to check out :checkout_qty. Please adjust the checkout quantity or the total stock of this accessory and try again.',
+            ),
+           
     ),
 
     'checkin' => array(
diff --git a/resources/lang/zh-HK/admin/accessories/table.php b/resources/lang/zh-HK/admin/accessories/table.php
index e02d9f22e4..80df687161 100644
--- a/resources/lang/zh-HK/admin/accessories/table.php
+++ b/resources/lang/zh-HK/admin/accessories/table.php
@@ -6,6 +6,4 @@ return array(
     'id'      					=> 'ID',
     'require_acceptance'      	=> 'Acceptance',
     'title'      				=> 'Accessory Name',
-
-
 );
diff --git a/resources/lang/zh-HK/admin/components/message.php b/resources/lang/zh-HK/admin/components/message.php
index 0a7dd8d954..ec39dc4178 100644
--- a/resources/lang/zh-HK/admin/components/message.php
+++ b/resources/lang/zh-HK/admin/components/message.php
@@ -17,7 +17,8 @@ return array(
     'delete' => array(
         'confirm'   => 'Are you sure you wish to delete this component?',
         'error'   => 'There was an issue deleting the component. Please try again.',
-        'success' => 'The component was deleted successfully.'
+        'success' => 'The component was deleted successfully.',
+        'error_qty'   => 'Some components of this type are still checked out. Please check them in and try again.',
     ),
 
      'checkout' => array(
diff --git a/resources/lang/zh-HK/admin/consumables/general.php b/resources/lang/zh-HK/admin/consumables/general.php
index 7c6bb32968..29acfedc1b 100644
--- a/resources/lang/zh-HK/admin/consumables/general.php
+++ b/resources/lang/zh-HK/admin/consumables/general.php
@@ -8,4 +8,5 @@ return array(
     'remaining' 			            => 'Remaining',
     'total' 			                => 'Total',
     'update'                            => 'Update Consumable',
+    'inventory_warning'                 => 'The inventory of this consumable is below the minimum amount of :min_count',
 );
diff --git a/resources/lang/zh-HK/admin/consumables/message.php b/resources/lang/zh-HK/admin/consumables/message.php
index c0d0aa7f68..e2591503bf 100644
--- a/resources/lang/zh-HK/admin/consumables/message.php
+++ b/resources/lang/zh-HK/admin/consumables/message.php
@@ -2,6 +2,7 @@
 
 return array(
 
+    'invalid_category_type' => 'The category must be a consumable category.',
     'does_not_exist' => 'Consumable does not exist.',
 
     'create' => array(
diff --git a/resources/lang/zh-HK/admin/custom_fields/general.php b/resources/lang/zh-HK/admin/custom_fields/general.php
index e3c21d1f0c..c9ae61c963 100644
--- a/resources/lang/zh-HK/admin/custom_fields/general.php
+++ b/resources/lang/zh-HK/admin/custom_fields/general.php
@@ -35,7 +35,7 @@ return [
     'create_field_title' => 'Create a new custom field',
     'value_encrypted'      	        => 'The value of this field is encrypted in the database. Only admin users will be able to view the decrypted value',
     'show_in_email'     => 'Include the value of this field in checkout emails sent to the user? Encrypted fields cannot be included in emails',
-    'show_in_email_short'     => 'Include in emails.',
+    'show_in_email_short' => 'Include in emails',
     'help_text' => 'Help Text',
     'help_text_description' => 'This is optional text that will appear below the form elements while editing an asset to provide context on the field.',
     'about_custom_fields_title' => 'About Custom Fields',
@@ -57,5 +57,8 @@ return [
     'show_in_requestable_list_short' => 'Show in requestable assets list',
     'show_in_requestable_list' => 'Show value in requestable assets list. Encrypted fields will not be shown',
     'encrypted_options' => 'This field is encrypted, so some display options will not be available.',
+    'display_checkin' => 'Display in checkin forms',
+    'display_checkout' => 'Display in checkout forms',
+    'display_audit' => 'Display in audit forms',
 
 ];
diff --git a/resources/lang/zh-HK/admin/custom_fields/message.php b/resources/lang/zh-HK/admin/custom_fields/message.php
index 43ba821821..6442359b7f 100644
--- a/resources/lang/zh-HK/admin/custom_fields/message.php
+++ b/resources/lang/zh-HK/admin/custom_fields/message.php
@@ -5,6 +5,7 @@ return array(
     'field' => array(
         'invalid'   => 'That field does not exist.',
         'already_added'   => 'Field already added',
+        'none_selected'   => 'No field selected',
 
         'create' => array(
             'error'   => 'Field was not created, please try again.',
diff --git a/resources/lang/zh-HK/admin/depreciations/general.php b/resources/lang/zh-HK/admin/depreciations/general.php
index 1a5666f9dc..90246e9cd8 100644
--- a/resources/lang/zh-HK/admin/depreciations/general.php
+++ b/resources/lang/zh-HK/admin/depreciations/general.php
@@ -13,4 +13,8 @@ return [
     'no_depreciations_warning'               => '<strong>Warning: </strong>
                       You do not currently have any depreciations set up.
                       Please set up at least one depreciation to view the depreciation report.',
+    'depreciation_method'                   => 'Depreciation Report',
+    'linear_depreciation'                   => 'Linear (Default)',
+    'half_1'                                => 'Half-year convention, always applied',
+    'half_2'                                => 'Half-year convention, applied with condition',
 ];
diff --git a/resources/lang/zh-HK/admin/hardware/form.php b/resources/lang/zh-HK/admin/hardware/form.php
index edec543637..8fbd0b4e87 100644
--- a/resources/lang/zh-HK/admin/hardware/form.php
+++ b/resources/lang/zh-HK/admin/hardware/form.php
@@ -55,8 +55,11 @@ return [
     'asset_location_update_default' => 'Update only default location',
     'asset_location_update_actual' => 'Update only actual location',
     'asset_not_deployable' => 'That asset status is not deployable. This asset cannot be checked out.',
-    'asset_deployable' => 'That status is deployable. This asset can be checked out.',
+    'asset_not_deployable_checkin' => 'That asset status is not deployable. Using this status label will checkin the asset.',
+    'asset_deployable' => 'This asset can be checked out.',
     'processing_spinner' => 'Processing... (This might take a bit of time on large files)',
+    'processing' => 'Processing... ',
     'optional_infos'  => 'Optional Information',
-    'order_details'   => 'Order Related Information'
+    'order_details'   => 'Order Related Information',
+    'calc_eol'    => 'If nulling the EOL date, use automatic EOL calculation based on the purchase date and EOL rate.',
 ];
diff --git a/resources/lang/zh-HK/admin/hardware/general.php b/resources/lang/zh-HK/admin/hardware/general.php
index 34ac4e63ee..6740476574 100644
--- a/resources/lang/zh-HK/admin/hardware/general.php
+++ b/resources/lang/zh-HK/admin/hardware/general.php
@@ -5,8 +5,8 @@ return [
     'about_assets_text'            => 'Assets are items tracked by serial number or asset tag.  They tend to be higher value items where identifying a specific item matters.',
     'archived'  				=> 'Archived',
     'asset'  					=> 'Asset',
-    'bulk_checkout'             => 'Checkout Assets',
-    'bulk_checkin'              => 'Checkin Assets',
+    'bulk_checkout'             => 'Bulk Checkout',
+    'bulk_checkin'              => 'Bulk Checkin',
     'checkin'  					=> 'Checkin Asset',
     'checkout'  				=> 'Checkout Asset',
     'clone'  					=> 'Clone Asset',
@@ -27,8 +27,7 @@ return [
     'undeployable_tooltip'  	=> 'This asset has a status label that is undeployable and cannot be checked out at this time.',
     'view'  					=> 'View Asset',
     'csv_error' => 'You have an error in your CSV file:',
-    'import_text' => '<p>Upload a CSV that contains asset history. The assets and users MUST already exist in the system, or they will be skipped. Matching assets for history import happens against the asset tag. We will try to find a matching user based on the user\'s name you provide, and the criteria you select below. If you do not select any criteria below, it will simply try to match on the username format you configured in the <code>Admin &gt; General Settings</code>.</p><p>Fields included in the CSV must match the headers: <strong>Asset Tag, Name, Checkout Date, Checkin Date</strong>. Any additional fields will be ignored. </p><p>Checkin Date: blank or future checkin dates will checkout items to associated user.  Excluding the Checkin Date column will create a checkin date with todays date.</p>
-    ',
+    'import_text' => '<p>Upload a CSV that contains asset history. The assets and users MUST already exist in the system, or they will be skipped. Matching assets for history import happens against the asset tag. We will try to find a matching user based on the user\'s name you provide, and the criteria you select below. If you do not select any criteria below, it will simply try to match on the username format you configured in the <code>Admin &gt; General Settings</code>.</p><p>Fields included in the CSV must match the headers: <strong>Asset Tag, Name, Checkout Date, Checkin Date</strong>. Any additional fields will be ignored. </p><p>Checkin Date: blank or future checkin dates will checkout items to associated user.  Excluding the Checkin Date column will create a checkin date with todays date.</p>    ',
     'csv_import_match_f-l' => 'Try to match users by <strong>firstname.lastname</strong> (<code>jane.smith</code>) format',
     'csv_import_match_initial_last' => 'Try to match users by <strong>first initial last name</strong> (<code>jsmith</code>) format',
     'csv_import_match_first' => 'Try to match users by <strong>first name</strong> (<code>jane</code>) format',
diff --git a/resources/lang/zh-HK/admin/hardware/message.php b/resources/lang/zh-HK/admin/hardware/message.php
index 32698b1c07..c19bc63647 100644
--- a/resources/lang/zh-HK/admin/hardware/message.php
+++ b/resources/lang/zh-HK/admin/hardware/message.php
@@ -2,19 +2,23 @@
 
 return [
 
-    'undeployable' 		=> '<strong>Warning: </strong> This asset has been marked as currently undeployable.
-                        If this status has changed, please update the asset status.',
-    'does_not_exist' 	=> 'Asset does not exist.',
-    'does_not_exist_var'=> 'Asset with tag :asset_tag not found.',
-    'no_tag' 	        => 'No asset tag provided.',
+    'undeployable' 		 => '<strong>Warning: </strong> This asset has been marked as currently undeployable. If this status has changed, please update the asset status.',
+    'does_not_exist' 	 => 'Asset does not exist.',
+    'does_not_exist_var' => 'Asset with tag :asset_tag not found.',
+    'no_tag' 	         => 'No asset tag provided.',
     'does_not_exist_or_not_requestable' => 'That asset does not exist or is not requestable.',
-    'assoc_users'	 	=> 'This asset is currently checked out to a user and cannot be deleted. Please check the asset in first, and then try deleting again. ',
+    'assoc_users'	 	 => 'This asset is currently checked out to a user and cannot be deleted. Please check the asset in first, and then try deleting again. ',
     'warning_audit_date_mismatch' 	=> 'This asset\'s next audit date (:next_audit_date) is before the last audit date (:last_audit_date). Please update the next audit date.',
+    'labels_generated'   => 'Labels were successfully generated.',
+    'error_generating_labels' => 'Error while generating labels.',
+    'no_assets_selected' => 'No assets selected.',
 
     'create' => [
         'error'   		=> 'Asset was not created, please try again. :(',
         'success' 		=> 'Asset created successfully. :)',
         'success_linked' => 'Asset with tag :tag was created successfully. <strong><a href=":link" style="color: white;">Click here to view</a></strong>.',
+        'multi_success_linked' => 'Asset with tag :links was created successfully.|:count assets were created succesfully. :links.',
+        'partial_failure' => 'An asset was unable to be created. Reason: :failures|:count assets were unable to be created. Reasons: :failures',
     ],
 
     'update' => [
@@ -52,20 +56,24 @@ return [
     ],
 
     'import' => [
+        'import_button'         => 'Process Import',
         'error'                 => 'Some items did not import correctly.',
         'errorDetail'           => 'The following Items were not imported because of errors.',
         'success'               => 'Your file has been imported',
         'file_delete_success'   => 'Your file has been been successfully deleted',
         'file_delete_error'      => 'The file was unable to be deleted',
         'file_missing' => 'The file selected is missing',
+        'file_already_deleted' => 'The file selected was already deleted',
         'header_row_has_malformed_characters' => 'One or more attributes in the header row contain malformed UTF-8 characters',
         'content_row_has_malformed_characters' => 'One or more attributes in the first row of content contain malformed UTF-8 characters',
+        'transliterate_failure' => 'Transliteration from :encoding to UTF-8 failed due to invalid characters in input'
     ],
 
 
     'delete' => [
         'confirm'   	=> 'Are you sure you wish to delete this asset?',
         'error'   		=> 'There was an issue deleting the asset. Please try again.',
+        'assigned_to_error' => '{1}Asset Tag: :asset_tag is currently checked out. Check in this device before deletion.|[2,*]Asset Tags: :asset_tag are currently checked out. Check in these devices before deletion.',
         'nothing_updated'   => 'No assets were selected, so nothing was deleted.',
         'success' 		=> 'The asset was deleted successfully.',
     ],
@@ -78,6 +86,11 @@ return [
         'no_assets_selected' => 'You must select at least one asset from the list',
     ],
 
+    'multi-checkout' => [
+        'error'   => 'Asset was not checked out, please try again|Assets were not checked out, please try again',
+        'success' => 'Asset checked out successfully.|Assets checked out successfully.',
+    ],
+
     'checkin' => [
         'error'   		=> 'Asset was not checked in, please try again',
         'success' 		=> 'Asset checked in successfully.',
@@ -87,9 +100,10 @@ return [
     ],
 
     'requests' => [
-        'error'   		=> 'Asset was not requested, please try again',
-        'success' 		=> 'Asset requested successfully.',
-        'canceled'      => 'Checkout request successfully canceled',
+        'error'   		=> 'Request was not successful, please try again.',
+        'success' 		=> 'Request successfully submitted.',
+        'canceled'      => 'Request successfully canceled.',
+        'cancel'        => 'Cancel this item request',
     ],
 
 ];
diff --git a/resources/lang/zh-HK/admin/hardware/table.php b/resources/lang/zh-HK/admin/hardware/table.php
index 92b228dccd..2d88c6c131 100644
--- a/resources/lang/zh-HK/admin/hardware/table.php
+++ b/resources/lang/zh-HK/admin/hardware/table.php
@@ -25,7 +25,6 @@ return [
     'image'		    => 'Device Image',
     'days_without_acceptance' => 'Days Without Acceptance',
     'monthly_depreciation' => 'Monthly Depreciation',
-    'assigned_to'    => 'Assigned To',
     'requesting_user' => 'Requesting User',
     'requested_date' => 'Requested Date',
     'changed'       => 'Changed',
diff --git a/resources/lang/zh-HK/admin/kits/general.php b/resources/lang/zh-HK/admin/kits/general.php
index f57fb645c4..2b5c2d9cd0 100644
--- a/resources/lang/zh-HK/admin/kits/general.php
+++ b/resources/lang/zh-HK/admin/kits/general.php
@@ -47,4 +47,5 @@ return [
     'kit_deleted'                       => 'Kit was successfully deleted',
     'kit_model_updated'                 => 'Model was successfully updated',
     'kit_model_detached'                => 'Model was successfully detached',
+    'model_already_attached'            => 'Model already attached to kit',
 ];
diff --git a/resources/lang/zh-HK/admin/licenses/general.php b/resources/lang/zh-HK/admin/licenses/general.php
index 79b69a3d94..b39030afd4 100644
--- a/resources/lang/zh-HK/admin/licenses/general.php
+++ b/resources/lang/zh-HK/admin/licenses/general.php
@@ -14,6 +14,7 @@ return array(
     'info'  					=> 'License Info',
     'license_seats'  			=> 'License Seats',
     'seat'  					=> 'Seat',
+    'seat_count'  				=> 'Seat :count',
     'seats'  					=> 'Seats',
     'software_licenses'  		=> 'Software Licenses',
     'user'  					=> 'User',
@@ -23,12 +24,12 @@ return array(
         [
             'checkin_all'           => [
                 'button'            => 'Checkin All Seats',
-                'modal'             => 'This will action checkin one seat. | This action will checkin all :checkedout_seats_count seats for this license.',
+                'modal'             => 'This action will checkin one seat. | This action will checkin all :checkedout_seats_count seats for this license.',
                 'enabled_tooltip'   => 'Checkin ALL seats for this license from both users and assets',
                 'disabled_tooltip'  => 'This is disabled because there are no seats currently checked out',
                 'disabled_tooltip_reassignable'  => 'This is disabled because the License is not reassignable',
                 'success'           => 'License successfully checked in! | All licenses were successfully checked in!',
-                'log_msg'           => 'Checked in via bulk license checkout in license GUI',
+                'log_msg'           => 'Checked in via bulk license checkin in license GUI',
             ],
 
             'checkout_all'              => [
diff --git a/resources/lang/zh-HK/admin/licenses/message.php b/resources/lang/zh-HK/admin/licenses/message.php
index 27fbfe38a9..74e1d7af5a 100644
--- a/resources/lang/zh-HK/admin/licenses/message.php
+++ b/resources/lang/zh-HK/admin/licenses/message.php
@@ -44,10 +44,13 @@ return array(
         'error'   => 'There was an issue checking out the license. Please try again.',
         'success' => 'The license was checked out successfully',
         'not_enough_seats' => 'Not enough license seats available for checkout',
+        'mismatch' => 'The license seat provided does not match the license',
+        'unavailable' => 'This seat is not available for checkout.',
     ),
 
     'checkin' => array(
         'error'   => 'There was an issue checking in the license. Please try again.',
+        'not_reassignable' => 'License not reassignable',
         'success' => 'The license was checked in successfully'
     ),
 
diff --git a/resources/lang/zh-HK/admin/locations/message.php b/resources/lang/zh-HK/admin/locations/message.php
index 8121b80687..b21c70ad89 100644
--- a/resources/lang/zh-HK/admin/locations/message.php
+++ b/resources/lang/zh-HK/admin/locations/message.php
@@ -3,11 +3,12 @@
 return array(
 
     'does_not_exist' => 'Location does not exist.',
-    'assoc_users'    => 'This location is not currently deletable because it is the location of record for at least one asset or user, has assets assigned to it, or is the parent location of another location. Please update your models to no longer reference this company and try again. ',
+    'assoc_users'    => 'This location is not currently deletable because it is the location of record for at least one asset or user, has assets assigned to it, or is the parent location of another location. Please update your records to no longer reference this location and try again ',
     'assoc_assets'	 => 'This location is currently associated with at least one asset and cannot be deleted. Please update your assets to no longer reference this location and try again. ',
     'assoc_child_loc'	 => 'This location is currently the parent of at least one child location and cannot be deleted. Please update your locations to no longer reference this location and try again. ',
     'assigned_assets' => 'Assigned Assets',
     'current_location' => 'Current Location',
+    'open_map' => 'Open in :map_provider_icon Maps',
 
 
     'create' => array(
@@ -20,6 +21,11 @@ return array(
         'success' => 'Location updated successfully.'
     ),
 
+    'restore' => array(
+        'error'   => 'Location was not restored, please try again',
+        'success' => 'Location restored successfully.'
+    ),
+
     'delete' => array(
         'confirm'   	=> 'Are you sure you wish to delete this location?',
         'error'   => 'There was an issue deleting the location. Please try again.',
diff --git a/resources/lang/zh-HK/admin/locations/table.php b/resources/lang/zh-HK/admin/locations/table.php
index ed3f96f6b4..53176d8a4e 100644
--- a/resources/lang/zh-HK/admin/locations/table.php
+++ b/resources/lang/zh-HK/admin/locations/table.php
@@ -39,4 +39,5 @@ return [
     'signed_by_finance_auditor' => 'Signed By (Finance Auditor):',
     'signed_by_location_manager' => 'Signed By (Location Manager):',
     'signed_by'                 => 'Signed Off By:',
+    'clone'  					=> 'Clone Location',
 ];
diff --git a/resources/lang/zh-HK/admin/models/general.php b/resources/lang/zh-HK/admin/models/general.php
index 7e4a77adbc..9a61b53fd0 100644
--- a/resources/lang/zh-HK/admin/models/general.php
+++ b/resources/lang/zh-HK/admin/models/general.php
@@ -3,7 +3,7 @@
 return array(
     'about_models_title'     => 'About Asset Models',
     'about_models_text'           => 'Asset Models are a way to group identical assets. "MBP 2013", "IPhone 6s", etc.',
-    'deleted'  					        => 'This model has been deleted.',
+    'deleted'  					=> 'This model has been deleted.',
     'bulk_delete'               => 'Bulk Delete Asset Models',
     'bulk_delete_help'               => 'Use the checkboxes below to confirm the deletion of the selected asset models. Asset models that have assets associated with them cannot be deleted until the assets are associated with a different model.',
     'bulk_delete_warn'          => 'You are about to delete one asset model.|You are about to delete :model_count asset models.',
diff --git a/resources/lang/zh-HK/admin/models/message.php b/resources/lang/zh-HK/admin/models/message.php
index cc38c54530..ae3bc34eed 100644
--- a/resources/lang/zh-HK/admin/models/message.php
+++ b/resources/lang/zh-HK/admin/models/message.php
@@ -7,7 +7,7 @@ return array(
     'no_association' => 'WARNING! The asset model for this item is invalid or missing!',
     'no_association_fix' => 'This will break things in weird and horrible ways. Edit this asset now to assign it a model.',
     'assoc_users'	 => 'This model is currently associated with one or more assets and cannot be deleted. Please delete the assets, and then try deleting again. ',
-
+    'invalid_category_type' => 'This category must be an asset category.',
 
     'create' => array(
         'error'   => 'Model was not created, please try again.',
diff --git a/resources/lang/zh-HK/admin/reports/general.php b/resources/lang/zh-HK/admin/reports/general.php
index 9b682f8ecd..ed8bf1a156 100644
--- a/resources/lang/zh-HK/admin/reports/general.php
+++ b/resources/lang/zh-HK/admin/reports/general.php
@@ -4,6 +4,7 @@ return [
     'info'   => 'Select the options you want for your asset report.',
     'deleted_user' => 'Deleted user',
     'send_reminder' => 'Send reminder',
+    'cannot_send_reminder' => 'User has been deleted or does not have an email address so cannot receive a reminder',
     'reminder_sent' => 'Reminder sent',
     'acceptance_deleted' => 'Acceptance request deleted',
     'acceptance_request' => 'Acceptance request',
@@ -13,5 +14,10 @@ return [
         'user_state' => 'User State',
         'user_country' => 'User Country',
         'user_zip' => 'User Zip'
-    ]
-];
\ No newline at end of file
+    ],
+    'open_saved_template' => 'Open Saved Template',
+    'save_template' =>  'Save Template',
+    'select_a_template' => 'Select a Template',
+    'template_name' => 'Template Name',
+    'update_template' => 'Update Template',
+];
diff --git a/resources/lang/zh-HK/admin/reports/message.php b/resources/lang/zh-HK/admin/reports/message.php
index d4c8f8198f..2800bbdf0b 100644
--- a/resources/lang/zh-HK/admin/reports/message.php
+++ b/resources/lang/zh-HK/admin/reports/message.php
@@ -1,5 +1,16 @@
 <?php
 
-return array(
-    'error'   => 'You must select at least ONE option.'
-);
+return [
+    'about_templates' => 'About Saved Templates',
+    'saving_templates_description' => 'Select your options, then enter the name of your template in the box above and click the \'Save Template\' button. Use the dropdown to select a previously saved template.',
+    'create'  => [
+        'success' => 'Template saved successfully',
+    ],
+    'update' => [
+        'success' => 'Template updated successfully',
+    ],
+    'delete' => [
+        'success' => 'Template deleted',
+        'no_delete_permission' => 'Template does not exist or you do not have permission to delete it.',
+    ],
+];
diff --git a/resources/lang/zh-HK/admin/settings/general.php b/resources/lang/zh-HK/admin/settings/general.php
index 8074f5082e..37cfb0de94 100644
--- a/resources/lang/zh-HK/admin/settings/general.php
+++ b/resources/lang/zh-HK/admin/settings/general.php
@@ -8,13 +8,13 @@ return [
     'ad_append_domain'          => 'Append domain name to username field',
     'ad_append_domain_help'     => 'User isn\'t required to write "username@domain.local", they can just type "username".',
     'admin_cc_email'            => 'CC Email',
-    'admin_cc_email_help'       => 'If you would like to send a copy of checkin/checkout emails that are sent to users to an additional email account, enter it here. Otherwise leave this field blank.',
+    'admin_cc_email_help'       => 'Send a copy of checkin/checkout emails to this address.',
     'admin_settings'            => 'Admin Settings',
     'is_ad'				        => 'This is an Active Directory server',
     'alerts'                	=> 'Alerts',
     'alert_title'               => 'Update Notification Settings',
     'alert_email'				=> 'Send alerts to',
-    'alert_email_help'    => 'Email addresses or distribution lists you want alerts to be sent to, comma separated',
+    'alert_email_help'          => 'Email addresses or distribution lists you want alerts to be sent to, comma separated.',
     'alerts_enabled'			=> 'Email Alerts Enabled',
     'alert_interval'			=> 'Expiring Alerts Threshold (in days)',
     'alert_inv_threshold'		=> 'Inventory Alert Threshold',
@@ -31,15 +31,18 @@ return [
     'backups'					=> 'Backups',
     'backups_help'              => 'Create, download, and restore backups ',
     'backups_restoring'         => 'Restoring from Backup',
+    'backups_clean' => 'Clean the backed-up database before restore',
+    'backups_clean_helptext' => "This can be useful if you're changing between database versions",
     'backups_upload'            => 'Upload Backup',
     'backups_path'              => 'Backups on the server are stored in <code>:path</code>',
-    'backups_restore_warning'   => 'Use the restore button <small><span class="btn btn-xs btn-warning"><i class="text-white fas fa-retweet" aria-hidden="true"></i></span></small> to restore from a previous backup. (This does not currently work with S3 file storage or Docker.)<br><br>Your <strong>entire :app_name database and any uploaded files will be completely replaced</strong> by what\'s in the backup file.  ',
+    'backups_restore_warning'   => 'Use the restore button <small><span class="btn btn-xs btn-warning"><i class="text-white fas fa-retweet" aria-hidden="true"></i></span></small> to restore from a previous backup. (This does not currently work with S3 file storage or Docker.)<br><br>Your <strong>entire :app_name database and any uploaded files will be completely replaced</strong> by what\'s in the backup file  ',
     'backups_logged_out'         => 'All existing users, including you, will be logged out once your restore is complete.',
     'backups_large'             => 'Very large backups may time out on the restore attempt and may still need to be run via command line. ',
     'barcode_settings'			=> 'Barcode Settings',
     'confirm_purge'			    => 'Confirm Purge',
     'confirm_purge_help'		=> 'Enter the text "DELETE" in the box below to purge your deleted records. This action cannot be undone and will PERMANENTLY delete all soft-deleted items and users. (You should make a backup first, just to be safe.)',
     'custom_css'				=> 'Custom CSS',
+    'custom_css_placeholder'	=> 'Add your custom CSS',
     'custom_css_help'			=> 'Enter any custom CSS overrides you would like to use. Do not include the &lt;style&gt;&lt;/style&gt; tags.',
     'custom_forgot_pass_url'	=> 'Custom Password Reset URL',
     'custom_forgot_pass_url_help'	=> 'This replaces the built-in forgotten password URL on the login screen, useful to direct people to internal or hosted LDAP password reset functionality. It will effectively disable local user forgotten password functionality.',
@@ -47,34 +50,34 @@ return [
     'dashboard_message_help'	=> 'This text will appear on the dashboard for anyone with permission to view the dashboard.',
     'default_currency'  		=> 'Default Currency',
     'default_eula_text'			=> 'Default EULA',
+    'default_eula_text_placeholder' => 'Add your default EULA text',
     'default_language'			=> 'Default Language',
     'default_eula_help_text'	=> 'You can also associate custom EULAs to specific asset categories.',
     'acceptance_note'           => 'Add a note for your decision (Optional)',
     'display_asset_name'        => 'Display Asset Name',
     'display_checkout_date'     => 'Display Checkout Date',
     'display_eol'               => 'Display EOL in table view',
-    'display_qr'                => 'Display Square Codes',
+    'display_qr'                => 'Display 2D barcode',
     'display_alt_barcode'		=> 'Display 1D barcode',
-    'email_logo'                => 'Email Logo',
     'barcode_type'				=> '2D Barcode Type',
     'alt_barcode_type'			=> '1D barcode type',
-    'email_logo_size'       => 'Square logos in email look best. ',
     'enabled'                   => 'Enabled',
     'eula_settings'				=> 'EULA Settings',
     'eula_markdown'				=> 'This EULA allows <a href="https://help.github.com/articles/github-flavored-markdown/">Github flavored markdown</a>.',
+    'empty_row_count'           => 'Field Start Offset (Empty Rows)',
+    'empty_row_count_help'      => 'Fields will begin populating after this many empty rows are skipped at the top of the label.',
     'favicon'                   => 'Favicon',
     'favicon_format'            => 'Accepted filetypes are ico, png, and gif. Other image formats may not work in all browsers.',
     'favicon_size'          => 'Favicons should be square images, 16x16 pixels.',
     'footer_text'               => 'Additional Footer Text ',
     'footer_text_help'          => 'This text will appear in the right-side footer. Links are allowed using <a href="https://help.github.com/articles/github-flavored-markdown/">Github flavored markdown</a>. Line breaks, headers, images, etc may result in unpredictable results.',
+    'footer_text_placeholder'   => 'Optional footer text',
     'general_settings'			=> 'General Settings',
-    'general_settings_keywords' => 'company support, signature, acceptance, email format, username format, images, per page, thumbnail, eula, gravatar, tos, dashboard, privacy',
     'general_settings_help'     => 'Default EULA and more',
     'generate_backup'			=> 'Generate Backup',
     'google_workspaces'         => 'Google Workspaces',
     'header_color'              => 'Header Color',
     'info'                      => 'These settings let you customize certain aspects of your installation.',
-    'label_logo'                => 'Label Logo',
     'label_logo_size'           => 'Square logos look best - will be displayed in the top right of each asset label. ',
     'laravel'                   => 'Laravel Version',
     'ldap'                      => 'LDAP',
@@ -94,7 +97,7 @@ return [
     'ldap_login_sync_help'      => 'This only tests that LDAP can sync correctly. If your LDAP Authentication query is not correct, users may still not be able to login. YOU MUST SAVE YOUR UPDATED LDAP SETTINGS FIRST.',
     'ldap_manager'              => 'LDAP Manager',
     'ldap_server'               => 'LDAP Server',
-    'ldap_server_help'          => 'This should start with ldap:// (for unencrypted or TLS) or ldaps:// (for SSL)',
+    'ldap_server_help'          => 'This should start with ldap:// (for unencrypted) or ldaps:// (for TLS or SSL)',
     'ldap_server_cert'			=> 'LDAP SSL certificate validation',
     'ldap_server_cert_ignore'	=> 'Allow invalid SSL Certificate',
     'ldap_server_cert_help'		=> 'Select this checkbox if you are using a self signed SSL cert and would like to accept an invalid SSL certificate.',
@@ -108,8 +111,8 @@ return [
     'ldap_pword'                => 'LDAP Bind Password',
     'ldap_basedn'               => 'Base Bind DN',
     'ldap_filter'               => 'LDAP Filter',
-    'ldap_pw_sync'              => 'LDAP Password Sync',
-    'ldap_pw_sync_help'         => 'Uncheck this box if you do not wish to keep LDAP passwords synced with local passwords. Disabling this means that your users may not be able to login if your LDAP server is unreachable for some reason.',
+    'ldap_pw_sync'              => 'Cache LDAP Passwords',
+    'ldap_pw_sync_help'         => 'Uncheck this box if you do not wish to keep LDAP passwords cached as local hashed passwords. Disabling this means that your users may not be able to login if your LDAP server is unreachable for some reason.',
     'ldap_username_field'       => 'Username Field',
     'ldap_lname_field'          => 'Last Name',
     'ldap_fname_field'          => 'LDAP First Name',
@@ -117,13 +120,15 @@ return [
     'ldap_version'              => 'LDAP Version',
     'ldap_active_flag'          => 'LDAP Active Flag',
     'ldap_activated_flag_help'  => 'This value is used to determine whether a synced user can login to Snipe-IT. <strong>It does not affect the ability to check items in or out to them</strong>, and should be the <strong>attribute name</strong> within your AD/LDAP, <strong>not the value</strong>. <br><br>If this field is set to a field name that does not exist in your AD/LDAP, or the value in the AD/LDAP field is set to <code>0</code> or <code>false</code>, <strong>user login will be disabled</strong>. If the value in the AD/LDAP field is set to <code>1</code> or <code>true</code> or <em>any other text</em> means the user can log in. When the field is blank in your AD, we respect the <code>userAccountControl</code> attribute, which usually allows non-suspended users to log in.',
+    'ldap_invert_active_flag'   => 'LDAP Invert Active Flag',
+    'ldap_invert_active_flag_help'     => 'If enabled: when the value returned by LDAP Active Flag is <code>0</code> or <code>false</code> the user account will be active.',
     'ldap_emp_num'              => 'LDAP Employee Number',
     'ldap_email'                => 'LDAP Email',
     'ldap_test'                 => 'Test LDAP',
     'ldap_test_sync'            => 'Test LDAP Synchronization',
     'license'                   => 'Software License',
-    'load_remote'               => 'Use Gravatar',
-    'load_remote_help_text'		=> 'Uncheck this box if your install cannot load scripts from the outside internet. This will prevent Snipe-IT from trying load images from Gravatar.',
+    'load_remote'               => 'Load Remote Avatars',
+    'load_remote_help_text'		=> 'Uncheck this box if your install cannot load scripts from the outside internet. This will prevent Snipe-IT from trying load avatars from Gravatar or other outside sources.',
     'login'                     => 'Login Attempts',
     'login_attempt'             => 'Login Attempt',
     'login_ip'                  => 'IP Address',
@@ -131,6 +136,7 @@ return [
     'login_user_agent'          => 'User Agent',
     'login_help'                => 'List of attempted logins',
     'login_note'                => 'Login Note',
+    'login_note_placeholder'            => "If you do not have a login or have found a device belonging to this company, please call technical support at 888-555-1212. Thank you.",
     'login_note_help'           => 'Optionally include a few sentences on your login screen, for example to assist people who have found a lost or stolen device. This field accepts <a href="https://help.github.com/articles/github-flavored-markdown/">Github flavored markdown</a>',
     'login_remote_user_text'    => 'Remote User login options',
     'login_remote_user_enabled_text' => 'Enable Login with Remote User Header',
@@ -146,13 +152,16 @@ return [
     'logo_print_assets_help'    => 'Use branding on printable asset lists ',
     'full_multiple_companies_support_help_text' => 'Restricting users (including admins) assigned to companies to their company\'s assets.',
     'full_multiple_companies_support_text' => 'Full Multiple Companies Support',
+    'scope_locations_fmcs_support_text'  => 'Scope Locations with Full Multiple Companies Support',
+    'scope_locations_fmcs_support_help_text'  => 'Restrict locations to their selected company.',
+    'scope_locations_fmcs_check_button' => 'Check Compatibility',
+    'scope_locations_fmcs_support_disabled_text'  => 'This option is disabled because you have conflicting locations set for :count or more items.',
     'show_in_model_list'   => 'Show in Model Dropdowns',
     'optional'					=> 'optional',
     'per_page'                  => 'Results Per Page',
     'php'                       => 'PHP Version',
-    'php_info'                  => 'PHP Info',
+    'php_info'                  => 'PHP info',
     'php_overview'              => 'PHP',
-    'php_overview_keywords'     => 'phpinfo, system, info',
     'php_overview_help'         => 'PHP System info',
     'php_gd_info'               => 'You must install php-gd to display QR codes, see install instructions.',
     'php_gd_warning'            => 'PHP Image Processing and GD plugin is NOT installed.',
@@ -218,6 +227,8 @@ return [
     'webhook_integration_help'    => ':app integration is optional, however the endpoint and channel are required if you wish to use it. To configure :app integration, you must first <a href=":webhook_link" target="_new" rel="noopener">create an incoming webhook</a> on your :app account. Click on the <strong>Test :app Integration</strong> button to confirm your settings are correct before saving. ',
     'webhook_integration_help_button'    => 'Once you have saved your :app information, a test button will appear.',
     'webhook_test_help'           => 'Test whether your :app integration is configured correctly. YOU MUST SAVE YOUR UPDATED :app SETTINGS FIRST.',
+    'shortcuts_enabled'         => 'Enable Shortcuts',
+    'shortcuts_help_text'       => '<strong>Windows</strong>: Alt + Access key, <strong>Mac</strong>: Control + Option + Access key',
     'snipe_version'  			=> 'Snipe-IT version',
     'support_footer'            => 'Support Footer Links ',
     'support_footer_help'       => 'Specify who sees the links to the Snipe-IT Support info and Users Manual',
@@ -227,7 +238,6 @@ return [
     'update'                    => 'Update Settings',
     'value'                     => 'Value',
     'brand'                     => 'Branding',
-    'brand_keywords'            => 'footer, logo, print, theme, skin, header, colors, color, css',
     'brand_help'                => 'Logo, Site Name',
     'web_brand'                 => 'Web Branding Type',
     'about_settings_title'      => 'About Settings',
@@ -276,6 +286,8 @@ return [
     'two_factor_enrollment_text'	=> "Two factor authentication is required, however your device has not been enrolled yet. Open your Google Authenticator app and scan the QR code below to enroll your device. Once you've enrolled your device, enter the code below",
     'require_accept_signature'      => 'Require Signature',
     'require_accept_signature_help_text'      => 'Enabling this feature will require users to physically sign off on accepting an asset.',
+    'require_checkinout_notes'  => 'Require Notes on Checkin/Checkout',
+    'require_checkinout_notes_help_text'    => 'Enabling this feature will require the note fields to be populated when checking in or checking out an asset.',
     'left'        => 'left',
     'right'        => 'right',
     'top'        => 'top',
@@ -313,24 +325,24 @@ return [
     'filter_by_keyword' => 'Filter by setting keyword',
     'security' => 'Security',
     'security_title' => 'Update Security Settings',
-    'security_keywords' => 'password, passwords, requirements, two factor, two-factor, common passwords, remote login, logout, authentication',
     'security_help' => 'Two-factor, Password Restrictions',
-    'groups_keywords' => 'permissions, permission groups, authorization',
     'groups_help' => 'Account permission groups',
     'localization' => 'Localization',
     'localization_title' => 'Update Localization Settings',
-    'localization_keywords' => 'localization, currency, local, locale, time zone, timezone, international, internatinalization, language, languages, translation',
     'localization_help' => 'Language, date display',
     'notifications' => 'Notifications',
     'notifications_help' => 'Email Alerts & Audit Settings',
     'asset_tags_help' => 'Incrementing and prefixes',
     'labels' => 'Labels',
     'labels_title' => 'Update Label Settings',
-    'labels_help' => 'Label sizes &amp; settings',
-    'purge_keywords' => 'permanently delete',
+    'labels_help' => 'Barcodes &amp; label settings',
     'purge_help' => 'Purge Deleted Records',
     'ldap_extension_warning' => 'It does not look like the LDAP extension is installed or enabled on this server. You can still save your settings, but you will need to enable the LDAP extension for PHP before LDAP syncing or login will work.',
     'ldap_ad' => 'LDAP/AD',
+    'ldap_test_label' => 'Test LDAP Sync',
+    'ldap_test_login' => ' Test LDAP Login',
+    'ldap_username_placeholder' => 'LDAP Username',
+    'ldap_password_placeholder' => 'LDAP Password',
     'employee_number' => 'Employee Number',
     'create_admin_user' => 'Create a User ::',
     'create_admin_success' => 'Success! Your admin user has been added!',
@@ -342,6 +354,8 @@ return [
     'setup_migration_create_user' => 'Next: Create User',
     'ldap_settings_link' => 'LDAP Settings Page',
     'slack_test' => 'Test <i class="fab fa-slack"></i> Integration',
+    'status_label_name' => 'Status Label Name',
+    'super_admin_only'  => 'Super Admin Only',
     'label2_enable'           => 'New Label Engine',
     'label2_enable_help'      => 'Switch to the new label engine. <b>Note: You will need to save this setting before setting others.</b>',
     'label2_template'         => 'Template',
@@ -356,12 +370,15 @@ return [
     'label2_2d_type'          => '2D Barcode Type',
     'label2_2d_type_help'     => 'Format for 2D barcodes',
     'label2_2d_target'        => '2D Barcode Target',
-    'label2_2d_target_help'   => 'The URL the 2D barcode points to when scanned',
+    'label2_2d_target_help'   => 'The data that will be contained in the 2D barcode',
     'label2_fields'           => 'Field Definitions',
     'label2_fields_help'      => 'Fields can be added, removed, and reordered in the left column. For each field, multiple options for Label and DataSource can be added, removed, and reordered in the right column.',
+    'purge_barcodes' => 'Purge Barcodes',
     'help_asterisk_bold'    => 'Text entered as <code>**text**</code> will be displayed as bold',
     'help_blank_to_use'     => 'Leave blank to use the value from <code>:setting_name</code>',
     'help_default_will_use' => '<code>:default</code> will use the value from <code>:setting_name</code>. <br>Note that the value of the barcodes must comply with the respective barcode spec in order to be successfully generated. Please see <a href="https://snipe-it.readme.io/docs/barcodes">the documentation <i class="fa fa-external-link"></i></a> for more details. ',
+    'asset_id'              => 'Asset ID',
+    'data'               => 'Data',
     'default'               => 'Default',
     'none'                  => 'None',
     'google_callback_help' => 'This should be entered as the callback URL in your Google OAuth app settings in your organization&apos;s <strong><a href="https://console.cloud.google.com/" target="_blank">Google developer console <i class="fa fa-external-link" aria-hidden="true"></i></a></strong>.',
@@ -373,7 +390,100 @@ return [
     'database_driver' => 'Database Driver',
     'bs_table_storage' => 'Table Storage',
     'timezone' => 'Timezone',
+    'test_mail' => 'Test Mail',
     'profile_edit'          => 'Edit Profile',
     'profile_edit_help'          => 'Allow users to edit their own profiles.',
+    'default_avatar' => 'Custom Default Avatar',
+    'default_avatar_help' => 'This image will be displayed as a profile if a user does not have a profile photo.',
+    'restore_default_avatar' => 'Restore <a href=":default_avatar" data-toggle="lightbox" data-type="image">original system default avatar</a>',
+    'restore_default_avatar_help' => '',
+    'due_checkin_days' => 'Due For Checkin Warning',
+    'due_checkin_days_help' => 'How many days before the expected checkin of an asset should it be listed in the "Due for checkin" page?',
+    'no_groups' => 'No groups have been created yet. Visit <code>Admin Settings > Permission Groups</code> to add one.',
+    'text' => 'Text',
+
+    'username_formats' => [
+        'username_format'		=> 'Username Format',
+        'firstname_lastname_format'	=> 'First Name Last Name (jane.smith)',
+        'first_name_format'	        => 'First Name (jane)',
+        'last_name_format'		=> 'Last Name (doe)',
+        'filastname_format'			=> 'First Initial Last Name (jsmith)',
+        'lastnamefirstinitial_format' =>  'Last Name First Initial (smithj)',
+        'firstname_lastname_underscore_format' => 'First Name Last Name (jane_smith)',
+        'firstinitial.lastname' => 'First Initial Last Name (j.smith)',
+        'lastname_firstinitial' => 'Last Name First Initial (smith_j)',
+        'lastname_dot_firstinitial_format' => 'Last Name First Initial (smith.j)',
+        'firstnamelastname'     => 'First Name Last Name (janesmith)',
+        'firstnamelastinitial'  => 'First Name Last Initial (janes)',
+        'lastnamefirstname'      => 'Last Name.First Name (smith.jane)',
+    ],
+
+    'email_formats' => [
+        'email_format'			=> 'Email Format',
+        'firstname_lastname_format'	=> 'First Name Last Name (jane.smith@example.com)',
+        'first_name_format'		=> 'First Name (jane@example.com)',
+        'last_name_format'		=> 'Last Name (doe@example.com)',
+        'filastname_format'			=> 'First Initial Last Name (jsmith@example.com)',
+        'lastnamefirstinitial_format' =>  'Last Name First Initial (smithj@example.com)',
+        'firstname_lastname_underscore_format' => 'First Name Last Name (jane_smith@example.com)',
+        'firstinitial.lastname' => 'First Initial Last Name (j.smith@example.com)',
+        'lastname_firstinitial' => 'Last Name First Initial (smith_j@example.com)',
+        'lastname_dot_firstinitial_format' => 'Last Name First Initial (smith.j@example.com)',
+        'firstnamelastname'     => 'First Name Last Name (janesmith@example.com)',
+        'firstnamelastinitial'  => 'First Name Last Initial (janes@example.com)',
+        'lastnamefirstname'      => 'Last Name.First Name (smith.jane@example.com)',
+    ],
+
+
+
+    'logo_labels' => [
+        'acceptance_pdf_logo'       => 'PDF Logo',
+        'email_logo'                => 'Email Logo',
+        'label_logo'                => 'Label Logo',
+        'logo'                      => 'Site Logo',
+        'favicon'                   => 'Favicon',
+    ],
+
+    'logo_help' => [
+        'email_logo_size'       => 'Square logos in email look best. ',
+    ],
+
+    'logo_option_types' => [
+        'text' => 'Text',
+        'logo' => 'Logo',
+        'logo_and_text' => 'Logo and Text',
+    ],
+
+
+    'legends' => [
+        'scoping' => 'Scoping',
+        'formats' => 'Default Formats',
+        'profiles' => 'User Profiles',
+        'eula' => 'EULA & Acceptance Preferences',
+        'misc_display' => 'Miscellaneous Display Options',
+        'email' => 'Email Preferences',
+        'checkin' => 'Checkin Preferences',
+        'dashboard' => 'Login & Dashboard Preferences',
+        'misc' => 'Miscellaneous',
+        'logos' => 'Logos & Display',
+        'colors' => 'Colors & Skins',
+        'footer' => 'Footer Preferences',
+        'security' => 'Security Preferences',
+        'general' => 'General',
+        'intervals' => 'Intervals & Thresholds',
+    ],
+
+
+    /* Keywords for settings overview help */
+    'keywords' => [
+        'brand'             => 'footer, logo, print, theme, skin, header, colors, color, css',
+        'general_settings'  => 'company support, signature, acceptance, email format, username format, images, per page, thumbnail, eula, gravatar, tos, dashboard, privacy',
+        'groups'            => 'permissions, permission groups, authorization',
+        'labels'            => 'labels, barcodes, barcode, sheets, print, upc, qr, 1d, 2d',
+        'localization'      => 'localization, currency, local, locale, time zone, timezone, international, internatinalization, language, languages, translation',
+        'php_overview'      => 'phpinfo, system, info',
+        'purge'             => 'permanently delete',
+        'security'          => 'password, passwords, requirements, two factor, two-factor, common passwords, remote login, logout, authentication',
+    ],
 
 ];
diff --git a/resources/lang/zh-HK/admin/settings/message.php b/resources/lang/zh-HK/admin/settings/message.php
index c9b0f34217..58abf14c5c 100644
--- a/resources/lang/zh-HK/admin/settings/message.php
+++ b/resources/lang/zh-HK/admin/settings/message.php
@@ -14,6 +14,9 @@ return [
         'restore_warning'       => 'Yes, restore it. I acknowledge that this will overwrite any existing data currently in the database. This will also log out all of your existing users (including you).',
         'restore_confirm'       => 'Are you sure you wish to restore your database from :filename?'
     ],
+    'restore' => [
+        'success'               => 'Your system backup has been restored. Please log in again.'
+    ],
     'purge' => [
         'error'     => 'An error has occurred while purging. ',
         'validation_failed'     => 'Your purge confirmation is incorrect. Please type the word "DELETE" in the confirmation box.',
@@ -33,6 +36,9 @@ return [
         'testing_authentication' => 'Testing LDAP Authentication...',
         'authentication_success' => 'User authenticated against LDAP successfully!'
     ],
+    'labels' => [
+        'null_template' => 'Label template not found. Please select a template.',
+        ],
     'webhook' => [
         'sending' => 'Sending :app test message...',
         'success' => 'Your :webhook_name Integration works!',
@@ -42,5 +48,12 @@ return [
         'error' => 'Something went wrong. :app responded with: :error_message',
         'error_redirect' => 'ERROR: 301/302 :endpoint returns a redirect. For security reasons, we don’t follow redirects. Please use the actual endpoint.',
         'error_misc' => 'Something went wrong. :( ',
-    ]
+        'webhook_fail' => ' webhook notification failed: Check to make sure the URL is still valid.',
+        'webhook_channel_not_found' => ' webhook channel not found.',
+        'ms_teams_deprecation' => 'The selected Microsoft Teams webhook URL will be deprecated Dec 31st, 2025. Please use a workflow URL. Microsoft\'s documentation on creating a workflow can be found <a href="https://support.microsoft.com/en-us/office/create-incoming-webhooks-with-workflows-for-microsoft-teams-8ae491c7-0394-4861-ba59-055e33f75498" target="_blank"> here.</a>',
+    ],
+    'location_scoping' => [
+        'not_saved' => 'Your settings were not saved.',
+        'mismatch' => 'There is 1 item in the database that need your attention before you can enable location scoping.|There are :count items in the database that need your attention before you can enable location scoping.',
+    ],
 ];
diff --git a/resources/lang/zh-HK/admin/statuslabels/table.php b/resources/lang/zh-HK/admin/statuslabels/table.php
index 27befb5ef7..1a0fab891e 100644
--- a/resources/lang/zh-HK/admin/statuslabels/table.php
+++ b/resources/lang/zh-HK/admin/statuslabels/table.php
@@ -1,14 +1,14 @@
 <?php
 
 return array(
-    'about'      	=> 'About Status Labels',
+    'about'      	=> 'About Status Types',
     'archived'      	=> 'Archived',
     'create'      	=> 'Create Status Label',
     'color'      	=> 'Chart Color',
     'default_label' => 'Default Label',
     'default_label_help' => 'This is used to ensure your most commonly used status labels appear at the top of the select box when creating/editing assets.',
     'deployable'      	=> 'Deployable',
-    'info'      	=> 'Status labels are used to describe the various states your assets could be in. They may be out for repair, lost/stolen, etc. You can create new status labels for deployable, pending and archived assets.',
+    'info'      	=> 'Status label types are used to describe the various states your assets could be in. They may be out for repair, lost/stolen, etc. You can create new status labels for your deployable, pending and archived assets according to your own workflow. For more information, <a href="https://snipe-it.readme.io/docs/overview#status-labels" target="_blank">see the documentation <i class="fa fa-external-link"></i></a>.',
     'name'      	=> 'Status Name',
     'pending'      	=> 'Pending',
     'status_type'   => 'Status Type',
diff --git a/resources/lang/zh-HK/admin/users/general.php b/resources/lang/zh-HK/admin/users/general.php
index b097ccec69..14f36cf151 100644
--- a/resources/lang/zh-HK/admin/users/general.php
+++ b/resources/lang/zh-HK/admin/users/general.php
@@ -19,6 +19,8 @@ return [
     'print_assigned'    => 'Print All Assigned',
     'email_assigned'    => 'Email List of All Assigned',
     'user_notified'     => 'User has been emailed a list of their currently assigned items.',
+    'users_notified'    => 'The user has been emailed a list of their currently assigned items.|:count users have been emailed a list of their currently assigned items.',
+    'users_notified_warning' => ':count user has been emailed a list of their currently assigned items, however :no_email users did not have an email address so could not be emailed.|:count users have been emailed a list of their currently assigned items, however :no_email user(s) did not have an email address so could not be emailed.',
     'auto_assign_label' => 'Include this user when auto-assigning eligible licenses',
     'auto_assign_help'  => 'Skip this user in auto assignment of licenses',
     'software_user'     => 'Software Checked out to :name',
diff --git a/resources/lang/zh-HK/admin/users/message.php b/resources/lang/zh-HK/admin/users/message.php
index 4d014775bd..b6ddad3aac 100644
--- a/resources/lang/zh-HK/admin/users/message.php
+++ b/resources/lang/zh-HK/admin/users/message.php
@@ -6,7 +6,7 @@ return array(
     'declined'                  => 'You have successfully declined this asset.',
     'bulk_manager_warn'	        => 'Your users have been successfully updated, however your manager entry was not saved because the manager you selected was also in the user list to be edited, and users may not be their own manager. Please select your users again, excluding the manager.',
     'user_exists'               => 'User already exists!',
-    'user_not_found'            => 'User does not exist.',
+    'user_not_found'            => 'User does not exist or you do not have permission view them.',
     'user_login_required'       => 'The login field is required',
     'user_has_no_assets_assigned' => 'No assets currently assigned to user.',
     'user_password_required'    => 'The password is required.',
@@ -53,6 +53,7 @@ return array(
         'ldap_could_not_search' => 'Could not search the LDAP server. Please check your LDAP server configuration in the LDAP config file. <br>Error from LDAP Server:',
         'ldap_could_not_get_entries' => 'Could not get entries from the LDAP server. Please check your LDAP server configuration in the LDAP config file. <br>Error from LDAP Server:',
         'password_ldap' => 'The password for this account is managed by LDAP/Active Directory. Please contact your IT department to change your password. ',
+        'multi_company_items_assigned' => 'This user has items assigned that belong to a different company. Please check them in or edit their company.'
     ),
 
     'deletefile' => array(
diff --git a/resources/lang/zh-HK/admin/users/table.php b/resources/lang/zh-HK/admin/users/table.php
index 7c5fb2cad5..094cdbc412 100644
--- a/resources/lang/zh-HK/admin/users/table.php
+++ b/resources/lang/zh-HK/admin/users/table.php
@@ -22,7 +22,7 @@ return array(
     'managed_locations'     => 'Managed Locations',
     'managed_users'         => 'Managed Users',
     'name' 					=> 'Name',
-    'nogroup'               => 'No groups have been created yet. To add one, visit: ',
+    'nogroup'               => 'No groups have been created yet. To add one, visit:',
     'notes'                 => 'Notes',
     'password_confirm' 		=> 'Confirm Password',
     'password' 				=> 'Password',
diff --git a/resources/lang/zh-HK/auth.php b/resources/lang/zh-HK/auth.php
index db310aa1bb..14d8acfce0 100644
--- a/resources/lang/zh-HK/auth.php
+++ b/resources/lang/zh-HK/auth.php
@@ -15,6 +15,6 @@ return array(
 
     'failed' => 'These credentials do not match our records.',
     'password' => 'The provided password is incorrect.',
-    'throttle' => 'Too many login attempts. Please try again in :seconds seconds.',
+    'throttle' => 'Too many login attempts. Please try again in :minutes minute(s).',
 
 );
diff --git a/resources/lang/zh-HK/auth/message.php b/resources/lang/zh-HK/auth/message.php
index 588c9069ca..08f638d058 100644
--- a/resources/lang/zh-HK/auth/message.php
+++ b/resources/lang/zh-HK/auth/message.php
@@ -6,8 +6,6 @@ return array(
     'account_not_found'      => 'The username or password is incorrect.',
     'account_not_activated'  => 'This user account is not activated.',
     'account_suspended'      => 'This user account is suspended.',
-    'account_banned'         => 'This user account is banned.',
-    'throttle'               => 'Too many failed login attempts. Please try again in :minutes minutes.',
 
     'two_factor' => array(
         'already_enrolled'      => 'Your device is already enrolled.',
diff --git a/resources/lang/zh-HK/button.php b/resources/lang/zh-HK/button.php
index 5037d00640..8172eed8da 100644
--- a/resources/lang/zh-HK/button.php
+++ b/resources/lang/zh-HK/button.php
@@ -7,6 +7,7 @@ return [
     'checkin_and_delete'  	    => 'Checkin All / Delete User',
     'delete'  	                => 'Delete',
     'edit'    	                => 'Edit',
+    'clone'    	                => 'Clone',
     'restore' 	                => 'Restore',
     'remove'                    => 'Remove',
     'request'                   => 'Request',
@@ -21,4 +22,13 @@ return [
     'add_maintenance'           => 'Add Maintenance',
     'append'                    => 'Append',
     'new'                       => 'New',
+    'var' => [
+        'clone'     => 'Clone :item_type',
+        'edit'      => 'Edit :item_type',
+        'delete'    => 'Delete :item_type',
+        'restore'   => 'Restore :item_type',
+        'create'    => 'Create New :item_type',
+        'checkout'  => 'Checkout :item_type',
+        'checkin'   => 'Checkin :item_type',
+    ]
 ];
diff --git a/resources/lang/zh-HK/general.php b/resources/lang/zh-HK/general.php
index 47a1ba33e5..f546e6cc13 100644
--- a/resources/lang/zh-HK/general.php
+++ b/resources/lang/zh-HK/general.php
@@ -10,7 +10,7 @@ return [
     'action'                => '操作',
     'activity_report'		=> 'Activity Report',
     'address'				=> 'Address',
-    'admin'					=> 'Admin',
+    'admin'					=> 'Admin Settings',
     'admin_tooltip'			=> 'This user has admin privileges',
     'superuser'				=> 'Superuser',
     'superuser_tooltip'		=> 'This user has superuser privileges',
@@ -23,13 +23,16 @@ return [
     'asset_models'			=> 'Asset Models',
     'asset_model'			=> 'Model',
     'asset'					=> 'Asset',
+    'asset_previous'        => 'Asset (Previously Assigned)',
     'asset_report'          => 'Asset Report',
     'asset_tag'				=> 'Asset Tag',
     'asset_tags'            => 'Asset Tags',
     'assets_available'		=> 'Assets available',
     'accept_assets'         => 'Accept Assets :name',
     'accept_assets_menu'    => 'Accept Assets',
+    'accept_item'           => 'Accept Item',
     'audit'				    => 'Audit',
+    'audits'				=> 'Audits',
     'audit_report'			=> 'Audit Log',
     'assets'				=> 'Assets',
     'assets_audited'        => 'assets audited',
@@ -61,9 +64,12 @@ return [
     'changepassword'  		=> 'Change Password',
     'checkin'  				=> 'Checkin',
     'checkin_from'  		=> 'Checkin from',
+    'checkin_note'  		=> 'Checkin Note',
+    'checkout_note'  		=> 'Checkout Note',
     'checkout'  			=> 'Checkout',
     'checkouts_count'       => 'Checkouts',
     'checkins_count'        => 'Checkins',
+    'checkin_and_delete'  	=> 'Checkin and Delete',
     'user_requests_count'   => 'Requests',
     'city'  				=> 'City',
     'click_here'			=> 'Click here',
@@ -77,7 +83,7 @@ return [
     'consumables'			=> 'Consumables',
     'country'  				=> 'Country',
     'could_not_restore'     => 'Error restoring :item_type: :error',
-    'not_deleted'           => 'The :item_type is not deleted so it cannot be restored',
+    'not_deleted'           => 'The :item_type was not deleted and therefore cannot be restored',
     'create'				=> 'Create New',
     'created'               => 'Item Created',
     'created_asset'			=> 'created asset',
@@ -86,11 +92,13 @@ return [
     'record_created' 		=> 'Record Created',
     'updated_at' 			=> 'Updated at',
     'currency'  			=> '$', // this is deprecated
+    'currency_text'  		=> 'Currency', //
     'current'  				=> 'Current',
     'current_password'      => 'Current Password',
     'customize_report'      => 'Customize Report',
     'custom_report'         => 'Custom Asset Report',
     'dashboard'				=> 'Dashboard',
+    'data_source'           => 'Data Source',
     'days'      			=> 'days',
     'days_to_next_audit'    => 'Days to Next Audit',
     'date'					=> 'Date',
@@ -98,7 +106,7 @@ return [
     'debug_warning_text'    => 'This application is running in production mode with debugging enabled. This can expose sensitive data if your application is accessible to the outside world. Disable debug mode by setting the <code>APP_DEBUG</code> value in your <code>.env</code> file to <code>false</code>.',
     'delete'  				=> 'Delete',
     'delete_confirm'  		=> 'Are you sure you wish to delete :item?',
-    'delete_confirm_no_undo' => 'Are you sure you wish to delete :item? This can not be undone.',
+    'delete_confirm_no_undo' => 'Are you sure, you wish to delete :item? This cannot be undone.',
     'deleted'  				=> 'Deleted',
     'delete_seats'  		=> 'Deleted Seats',
     'deletion_failed'       => 'Deletion failed',
@@ -114,29 +122,13 @@ return [
     'editprofile'  			=> 'Edit Your Profile',
     'eol'					=> 'EOL',
     'email_domain'			=> 'Email Domain',
-    'email_format'			=> 'Email Format',
     'employee_number'       => 'Employee Number',
     'email_domain_help'		=> 'This is used to generate email addresses when importing',
     'error'				    => 'Error',
     'exclude_archived'      => 'Exclude Archived Assets',
     'exclude_deleted'       => 'Exclude Deleted Assets',
     'example'				=> 'Example: ',
-    'filastname_format'			=> 'First Initial Last Name (jsmith@example.com)',
-    'firstname_lastname_format'	=> 'First Name Last Name (jane.smith@example.com)',
-    'firstname_lastname_underscore_format' => 'First Name Last Name (jane_smith@example.com)',
-    'lastnamefirstinitial_format' =>  'Last Name First Initial (smithj@example.com)',
-    'firstintial_dot_lastname_format' => 'First Initial Last Name (j.smith@example.com)',
-    'firstname_lastname_display'	=> 'First Name Last Name (Jane Smith)',
-    'lastname_firstname_display'	=> 'Last Name First Name (Smith Jane)',
-    'name_display_format'	=> 'Name Display Format',
-    'first'					=> 'First',
-    'firstnamelastname'     => 'First Name Last Name (janesmith@example.com)',
-    'lastname_firstinitial' => 'Last Name First Initial (smith_j@example.com)',
-    'firstinitial.lastname' => 'First Initial Last Name (j.smith@example.com)',
-    'firstnamelastinitial'  => 'First Name Last Initial (janes@example.com)',
-    'lastnamefirstname'      => 'Last Name First Name (smith.jane@example.com)',
-    'first_name'			=> 'First Name',
-    'first_name_format'		=> 'First Name (jane@example.com)',
+
     'files'                 => 'Files',
     'file_name'				=> 'File',
     'file_type'             => 'File Type',
@@ -156,9 +148,9 @@ return [
     'image_delete'         	=> 'Delete Image',
     'include_deleted'       => 'Include Deleted Assets',
     'image_upload'         	=> 'Upload Image',
-    'filetypes_accepted_help'    => 'Accepted filetype is :types. Max upload size allowed is :size.|Accepted filetypes are :types. Max upload size allowed is :size.',
-    'filetypes_size_help'   => 'Max upload size allowed is :size.',
-    'image_filetypes_help'  => 'Accepted filetypes are jpg, webp, png, gif, svg, and avif. Max upload size allowed is :size.',
+    'filetypes_accepted_help'    => 'Accepted filetype is :types. The maximum size allowed is :size.|Accepted filetypes are :types. The maximum upload size allowed is :size.',
+    'filetypes_size_help'   => 'The maximum upload size allowed is :size.',
+    'image_filetypes_help'  => 'Accepted Filetypes are jpg, webp, png, gif, svg, and avif. The maximum upload size allowed is :size.',
     'unaccepted_image_type'  => 'This image file was not readable. Accepted filetypes are jpg, webp, png, gif, and svg. The mimetype of this file is: :mimetype.',
     'import'         	    => 'Import',
     'import_this_file'      => 'Map fields and process this file',
@@ -178,12 +170,17 @@ return [
     'last'					=> 'Last',
     'last_login'            => 'Last Login',
     'last_name'             => 'Last Name',
+    'firstname_lastname_display'	=> 'First Name Last Name (Jane Smith)',
+    'lastname_firstname_display'	=> 'Last Name First Name (Smith Jane)',
+    'name_display_format'	=> 'Name Display Format',
+    'first'					=> 'First',
+    'first_name'			=> 'First Name',
     'license'				=> 'License',
     'license_report'        => 'License Report',
     'licenses_available'	=> 'Licenses available',
     'licenses'				=> 'Licenses',
     'list_all'				=> 'List All',
-    'loading'				=> 'Loading... please wait....',
+    'loading'				=> 'Loading... please wait...',
     'lock_passwords'        => 'This field value will not be saved in a demo installation.',
     'feature_disabled'      => 'This feature has been disabled for the demo installation.',
     'location'              => 'Location',
@@ -193,7 +190,7 @@ return [
     'logout'				=> 'Logout',
     'lookup_by_tag'     => 'Lookup by Asset Tag',
     'maintenances'          => 'Maintenances',
-    'manage_api_keys'       => 'Manage API Keys',
+    'manage_api_keys'       => 'Manage API keys',
     'manufacturer'			=> 'Manufacturer',
     'manufacturers'			=> 'Manufacturers',
     'markdown'				=> 'This field allows <a href="https://help.github.com/articles/github-flavored-markdown/">Github flavored markdown</a>.',
@@ -215,6 +212,14 @@ return [
     'no_results'			=> 'No Results.',
     'no'  					=> 'No',
     'notes'  				=> 'Notes',
+    'note_added'            => 'Note Added',
+    'options'				=> 'Options',
+    'preview'				=> 'Preview',
+    'add_note'              => 'Add Note',
+    'note_edited'            => 'Note Edited',
+    'edit_note'              => 'Edit Note',
+    'note_deleted'            => 'Note Deleted',
+    'delete_note'              => 'Delete Note',
     'order_number'          => 'Order Number',
     'only_deleted'          => 'Only Deleted Assets',
     'page_menu'				=> 'Showing _MENU_ items',
@@ -229,7 +234,7 @@ return [
     'purchase_date'         => 'Purchase Date',
     'qty'		            => 'QTY',
     'quantity'		        => 'Quantity',
-    'quantity_minimum'      => 'You have :count items below or almost below minimum quantity levels',
+    'quantity_minimum'      => 'You have one item below or almost below minimum quantity levels|You have :count items below or almost below minimum quantity levels',
     'quickscan_checkin'  	=> 'Quick Scan Checkin',
     'quickscan_checkin_status'  	=> 'Checkin Status',
     'ready_to_deploy'		=> 'Ready to Deploy',
@@ -254,7 +259,7 @@ return [
     'select_all'            => 'Select All',
     'search'				=> 'Search',
     'select_category'       => 'Select a Category',
-    'select_datasource' => 'Select a Datasource',
+    'select_datasource' => 'Select a data source',
     'select_department'     => 'Select a Department',
     'select_depreciation'	=> 'Select a Depreciation Type',
     'select_location'		=> 'Select a Location',
@@ -274,13 +279,15 @@ return [
     'signed_off_by'         => 'Signed Off By',
     'skin'       			=> 'Skin',
     'webhook_msg_note'        => 'A notification will be sent via webhook',
-    'webhook_test_msg'        => 'Oh hai! Looks like your :app integration with Snipe-IT is working!',
+    'webhook_test_msg'        => 'Oh hai! It looks like your :app integration with Snipe-IT is working!',
     'some_features_disabled' => 'DEMO MODE: Some features are disabled for this installation.',
     'site_name'				=> 'Site Name',
     'state'  				=> 'State',
     'status_labels'			=> 'Status Labels',
+    'status_label'			=> 'Status Label',
     'status'    			=> 'Status',
     'accept_eula'           => 'Acceptance Agreement',
+    'show_or_hide_eulas' => 'Show/Hide EULAs',
     'supplier'              => 'Supplier',
     'suppliers'  			=> 'Suppliers',
     'sure_to_delete'        => 'Are you sure you wish to delete',
@@ -296,9 +303,9 @@ return [
     'type'  				=> 'Type',
     'undeployable'			=> 'Un-deployable',
     'unknown_admin'			=> 'Unknown Admin',
-    'username_format'		=> 'Username Format',
     'username'              => 'Username',
     'update'                => 'Update',
+    'updating_item' => 'Updating :item',
     'upload_filetypes_help'      => 'Allowed filetypes are png, gif, jpg, jpeg, doc, docx, pdf, xls, xlsx, txt, lic, xml, zip, rtf and rar. Max upload size allowed is :size.',
     'uploaded'              => 'Uploaded',
     'user'					=> 'User',
@@ -323,10 +330,10 @@ return [
     'token_expired'         => 'Your form session has expired. Please try again.',
     'login_enabled'         => 'Login Enabled',
     'audit_due'             => 'Due for Audit',
-    'audit_due_days'        => 'Assets Due for Audit Within :days Day|Assets Due for Audit Within :days Days',
+    'audit_due_days'        => '{}Assets Due or Overdue for Audit|[1]Assets Due or Overdue for Audit Within a Day|[2,*]Assets Due or Overdue for Audit Within :days Days',
     'checkin_due'           => 'Due for Checkin',
     'checkin_overdue'       => 'Overdue for Checkin',
-    'checkin_due_days'      => 'Assets Due for Checkin Within :days Day|Assets Due for Checkin Within :days Days',
+    'checkin_due_days'      => '{}Due for Checkin|[1]Assets Due for Checkin Within :days Day|[2,*]Assets Due for Checkin Within :days Days',
     'audit_overdue'         => 'Overdue for Audit',
     'accept'                => 'Accept :asset',
     'i_accept'              => 'I accept',
@@ -339,16 +346,16 @@ return [
     'view_all'              => 'view all',
     'hide_deleted'          => 'Hide Deleted',
     'email'                 => 'Email',
-    'do_not_change'         => 'Do Not Change',
-    'bug_report'            => 'Report a Bug',
+    'do_not_change'         => 'Do not change',
+    'bug_report'            => 'Report a bug',
     'user_manual'           => 'User\'s Manual',
     'setup_step_1'          => 'Step 1',
     'setup_step_2'          => 'Step 2',
     'setup_step_3'          => 'Step 3',
     'setup_step_4'          => 'Step 4',
     'setup_config_check'    => 'Configuration Check',
-    'setup_create_database' => 'Create Database Tables',
-    'setup_create_admin'    => 'Create Admin User',
+    'setup_create_database' => 'Create database tables',
+    'setup_create_admin'    => 'Create an admin user',
     'setup_done'            => 'Finished!',
     'bulk_edit_about_to'    => 'You are about to edit the following: ',
     'checked_out'           => 'Checked Out',
@@ -383,6 +390,8 @@ return [
     'new_license'           => 'New License',
     'new_accessory'         => 'New Accessory',
     'new_consumable'        => 'New Consumable',
+    'new_component'         => 'New Component',
+    'new_user'              => 'New User',
     'collapse'              => 'Collapse',
     'assigned'              => 'Assigned',
     'asset_count'           => 'Asset Count',
@@ -418,19 +427,20 @@ return [
     'bulk_soft_delete'      =>'Also soft-delete these users. Their asset history will remain intact unless/until you purge deleted records in the Admin Settings.',
     'bulk_checkin_delete_success' => 'Your selected users have been deleted and their items have been checked in.',
     'bulk_checkin_success' => 'The items for the selected users have been checked in.',
-    'set_to_null'           => 'Delete values for this asset|Delete values for all :asset_count assets ',
+    'set_to_null'           => 'Delete values for this selection|Delete values for all :selection_count selections ',
     'set_users_field_to_null'  => 'Delete :field values for this user|Delete :field values for all :user_count users ',
     'na_no_purchase_date'   => 'N/A - No purchase date provided',
     'assets_by_status'      => 'Assets by Status',
     'assets_by_status_type'      => 'Assets by Status Type',
     'pie_chart_type'        => 'Dashboard Pie Chart Type',
     'hello_name'            => 'Hello, :name!',
-    'unaccepted_profile_warning'   => 'You have :count items requiring acceptance. Click here to accept or decline them',
+    'unaccepted_profile_warning'   => 'You have one item requiring acceptance. Click here to accept or decline it | You have :count items requiring acceptance. Click here to accept or decline them',
     'start_date'            => 'Start Date',
     'end_date'            => 'End Date',
     'alt_uploaded_image_thumbnail' => 'Uploaded thumbnail',
     'placeholder_kit'       => 'Select a kit',
     'file_not_found'        => 'File not found',
+    'log_record_not_found'  => 'No record for that log entry was found.',
     'preview_not_available' => '(no preview)',
     'setup'                 => 'Setup',
     'pre_flight'            => 'Pre-Flight',
@@ -512,7 +522,7 @@ return [
     'checked_out_to_fields' => 'Checked Out To Fields',
     'percent_complete' => '% complete',
     'uploading' => 'Uploading... ',
-    'upload_error' => 'Error uploading file. Please check that there are no empty rows and that no column names are duplicated.',
+    'upload_error' => 'Error uploading file. Please check that you have no empty rows or duplicated column names in your CSV, and that the server permissions allow uploads.',
     'copy_to_clipboard' => 'Copy to Clipboard',
     'copied' => 'Copied!',
     'status_compatibility' => 'If assets are already assigned, they cannot be changed to a non-deployable status type and this value change will be skipped.',
@@ -549,6 +559,71 @@ return [
         'license_seats'  => ':count License Seat|:count License Seats',
         'consumables'  => ':count Consumable|:count Consumables',
         'components'  => ':count Component|:count Components',
-    ]
+    ],
+
+    'more_info' => 'More Info',
+    'quickscan_bulk_help' => 'Checking this box will edit the asset record to reflect this new location. Leaving it unchecked will simply note the location in the audit log. Note that if this asset is checked out, it will not change the location of the person, asset or location it is checked out to.',
+    'whoops' => 'Whoops!',
+    'something_went_wrong' => 'Something went wrong with your request.',
+    'close' => 'Close',
+    'expires' => 'Expires',
+    'map_fields'=> 'Map :item_type Fields',
+    'remaining_var' => ':count Remaining',
+    'label' => 'Label',
+    'import_asset_tag_exists' => 'An asset with the asset tag :asset_tag already exists and an update was not requested. No change was made.',
+    'countries_manually_entered_help' => 'Values with an asterisk (*) were manually entered and do not match existing ISO 3166 dropdown values',
+    'accessories_assigned' => 'Assigned Accessories',
+    'user_managed_passwords' => 'Password Management',
+    'user_managed_passwords_disallow' => 'Disallow users from managing their own passwords',
+    'user_managed_passwords_allow' => 'Allow users to manage their own passwords',
+    'from' => 'From',
+    'by' => '經由',
+
+// Add form placeholders here
+    'placeholders' => [
+        'notes'  => 'Add a note',
+    ],
+
+    'breadcrumb_button_actions' => [
+        'edit_item' => 'Edit :name',
+        'checkout_item' => 'Checkout :name',
+        'checkin_item' => 'Checkin :name',
+    ],
+
+    'skins' => [
+        'site_default' => 'Site Default',
+        'default_blue' => 'Default Blue',
+        'blue_dark' => 'Blue (Dark Mode)',
+        'green' => 'Green Dark',
+        'green_dark' => 'Green (Dark Mode)',
+        'red' => 'Red Dark',
+        'red_dark' => 'Red (Dark Mode)',
+        'orange' => 'Orange Dark',
+        'orange_dark' => 'Orange (Dark Mode)',
+        'black' => 'Black',
+        'black_dark' => 'Black (Dark Mode)',
+        'purple' => 'Purple',
+        'purple_dark' => 'Purple (Dark Mode)',
+        'yellow' => 'Yellow',
+        'yellow_dark' => 'Yellow (Dark Mode)',
+        'high_contrast' => 'High Contrast',
+
+    ],
+
+    'select_all_none' => 'Select/Unselect All',
+    'generic_model_not_found' => 'That :model was not found or you do not have permission to access it',
+    'deleted_models' => 'Deleted Asset Models',
+    'deleted_users' => 'Deleted Users',
+    'cost_each' => ':amount each',
+    'remove_current_image' => 'Remove current :type image',
+
+    'seeding' => [
+        'manufacturers' => [
+            'button' => 'Create Manufacturers',
+            'prompt' => 'You do not have any manufacturers yet. Would you like to seed a list of common manufacturers? (THIS WILL OVERWRITE EXISTING MANUFACTURERS, including those that have been soft-deleted.)',
+            'success' => 'Manufacturers seeded successfully',
+            'error' => 'Could not seed manufacturers. A manufacturer record already exists and seeding would overwrite it.|Could not seed manufacturers. :count manufacturer records already exist and seeding would overwrite them.',
+        ],
+    ],
 
 ];
diff --git a/resources/lang/zh-HK/localizations.php b/resources/lang/zh-HK/localizations.php
index f1232dd138..827ed4fca1 100644
--- a/resources/lang/zh-HK/localizations.php
+++ b/resources/lang/zh-HK/localizations.php
@@ -2,7 +2,7 @@
 
 return [
 
-    'select_language' => 'Select a language',
+    'select_language' => 'Select a Language',
     'languages' => [
         'en-US'=> 'English, US',
         'en-GB'=> 'English, UK',
@@ -40,7 +40,9 @@ return [
         'ms-MY'=> 'Malay',
         'mi-NZ'=> 'Maori',
         'mn-MN'=> 'Mongolian',
-        'no-NO'=> 'Norwegian',
+        'nb-NO'=> 'Norwegian Bokmål',
+        'om-ET' => 'Oromo (Ethiopian)',
+        //'nn-NO'=> 'Norwegian Nynorsk',
         'fa-IR'=> 'Persian',
         'pl-PL'=> 'Polish',
         'pt-PT'=> 'Portuguese',
@@ -66,7 +68,7 @@ return [
         'zu-ZA'=> 'Zulu',
     ],
 
-    'select_country' => 'Select a country',
+    'select_country' => 'Select a Country',
     
     'countries' => [
         'AC'=>'Ascension Island',
@@ -133,6 +135,7 @@ return [
         'EC'=>'Ecuador',
         'EE'=>'Estonia',
         'EG'=>'Egypt',
+        'GB-ENG'=>'England',
         'ER'=>'Eritrea',
         'ES'=>'Spain',
         'ET'=>'Ethiopia',
@@ -231,6 +234,7 @@ return [
         'NG'=>'Nigeria',
         'NI'=>'Nicaragua',
         'NL'=>'Netherlands',
+        'GB-NIR' => 'Northern Ireland',
         'NO'=>'Norway',
         'NP'=>'Nepal',
         'NR'=>'Nauru',
@@ -258,7 +262,7 @@ return [
         'RU'=>'Russian Federation',
         'RW'=>'Rwanda',
         'SA'=>'Saudi Arabia',
-        'UK'=>'Scotland',
+        'GB-SCT'=>'Scotland',
         'SB'=>'Solomon Islands',
         'SC'=>'Seychelles',
         'SS'=>'South Sudan',
@@ -310,6 +314,7 @@ return [
         'VI'=>'Virgin Islands (U.S.)',
         'VN'=>'Viet Nam',
         'VU'=>'Vanuatu',
+        'GB-WLS' =>'Wales',
         'WF'=>'Wallis And Futuna Islands',
         'WS'=>'Samoa',
         'YE'=>'Yemen',
diff --git a/resources/lang/zh-HK/mail.php b/resources/lang/zh-HK/mail.php
index 91fbca47db..d00162e083 100644
--- a/resources/lang/zh-HK/mail.php
+++ b/resources/lang/zh-HK/mail.php
@@ -23,24 +23,25 @@ return [
     'Item_Requested' => 'Item Requested',
     'License_Checkin_Notification' => 'License checked in',
     'License_Checkout_Notification' => 'License checked out',
+    'license_for'   => 'License for',
     'Low_Inventory_Report' => 'Low Inventory Report',
     'a_user_canceled' => 'A user has canceled an item request on the website',
     'a_user_requested' => 'A user has requested an item on the website',
     'acceptance_asset_accepted' => 'A user has accepted an item',
     'acceptance_asset_declined' => 'A user has declined an item',
-    'accessory_name' => 'Accessory Name:',
-    'additional_notes' => 'Additional Notes:',
+    'accessory_name' => 'Accessory Name',
+    'additional_notes' => 'Additional Notes',
     'admin_has_created' => 'An administrator has created an account for you on the :web website.',
-    'asset' => 'Asset:',
-    'asset_name' => 'Asset Name:',
+    'asset' => 'Asset',
+    'asset_name' => 'Asset Name',
     'asset_requested' => 'Asset requested',
     'asset_tag' => 'Asset Tag',
     'assets_warrantee_alert' => 'There is :count asset with a warranty expiring in the next :threshold days.|There are :count assets with warranties expiring in the next :threshold days.',
     'assigned_to' => 'Assigned To',
     'best_regards' => 'Best regards,',
-    'canceled' => 'Canceled:',
-    'checkin_date' => 'Checkin Date:',
-    'checkout_date' => 'Checkout Date:',
+    'canceled' => 'Canceled',
+    'checkin_date' => 'Checkin Date',
+    'checkout_date' => 'Checkout Date',
     'checkedout_from' => 'Checked out from',
     'checkedin_from'  => 'Checked in from',
     'checked_into' => 'Checked into',
@@ -49,27 +50,30 @@ return [
     'click_to_confirm' => 'Please click on the following link to confirm your :web account:',
     'current_QTY' => 'Current QTY',
     'days' => 'Days',
-    'expecting_checkin_date' => 'Expected Checkin Date:',
+    'expecting_checkin_date' => 'Expected Checkin Date',
     'expires' => 'Expires',
     'hello' => 'Hello',
     'hi' => 'Hi',
     'i_have_read' => 'I have read and agree to the terms of use, and have received this item.',
     'inventory_report' => 'Inventory Report',
-    'item' => '項目:',
+    'item' => '項目',
+    'item_checked_reminder' => 'This is a reminder that you currently have :count items checked out to you that you have not accepted or declined. Please click the link below to confirm your decision.',
     'license_expiring_alert' => 'There is :count license expiring in the next :threshold days.|There are :count licenses expiring in the next :threshold days.',
     'link_to_update_password' => 'Please click on the following link to update your :web password:',
-    'login' => 'Login:',
+    'login' => 'Login',
     'login_first_admin' => 'Login to your new Snipe-IT installation using the credentials below:',
     'low_inventory_alert' => 'There is :count item that is below minimum inventory or will soon be low.|There are :count items that are below minimum inventory or will soon be low.',
     'min_QTY' => 'Min QTY',
     'name' => 'Name',
     'new_item_checked' => 'A new item has been checked out under your name, details are below.',
+    'new_item_checked_with_acceptance' => 'A new item has been checked out under your name that requires acceptance, details are below.',
+    'recent_item_checked' => 'An item was recently checked out under your name that requires acceptance, details are below.',
     'notes' => 'Notes',
-    'password' => 'Password:',
+    'password' => 'Password',
     'password_reset' => 'Password Reset',
     'read_the_terms' => 'Please read the terms of use below.',
     'read_the_terms_and_click' => 'Please read the terms of use below, and click on the link at the bottom to confirm that you read and agree to the terms of use, and have received the asset.',
-    'requested' => 'Requested:',
+    'requested' => 'Requested',
     'reset_link' => 'Your Password Reset Link',
     'reset_password' => 'Click here to reset your password:',
     'rights_reserved' => 'All rights reserved.',
@@ -86,8 +90,10 @@ return [
     'upcoming-audits' => 'There is :count asset that is coming up for audit within :threshold days.|There are :count assets that are coming up for audit within :threshold days.',
     'user' => 'User',
     'username' => 'Username',
+    'unaccepted_asset_reminder' => 'Reminder: You have Unaccepted Assets.',
     'welcome' => 'Welcome :name',
     'welcome_to' => 'Welcome to :web!',
     'your_assets' => 'View Your Assets',
     'your_credentials' => 'Your Snipe-IT credentials',
+    'mail_sent' => 'Mail sent successfully!',
 ];
diff --git a/resources/lang/zh-HK/validation.php b/resources/lang/zh-HK/validation.php
index 05374e23af..99c847f589 100644
--- a/resources/lang/zh-HK/validation.php
+++ b/resources/lang/zh-HK/validation.php
@@ -13,87 +13,150 @@ return [
     |
     */
 
-    'accepted'             => 'The :attribute must be accepted.',
-    'active_url'           => 'The :attribute is not a valid URL.',
-    'after'                => 'The :attribute must be a date after :date.',
-    'after_or_equal'       => 'The :attribute must be a date after or equal to :date.',
-    'alpha'                => 'The :attribute may only contain letters.',
-    'alpha_dash'           => 'The :attribute may only contain letters, numbers, and dashes.',
-    'alpha_num'            => 'The :attribute may only contain letters and numbers.',
-    'array'                => 'The :attribute must be an array.',
-    'before'               => 'The :attribute must be a date before :date.',
-    'before_or_equal'      => 'The :attribute must be a date before or equal to :date.',
-    'between'              => [
-        'numeric' => 'The :attribute must be between :min - :max.',
-        'file'    => 'The :attribute must be between :min - :max kilobytes.',
-        'string'  => 'The :attribute must be between :min - :max characters.',
-        'array'   => 'The :attribute must have between :min and :max items.',
+    'accepted' => 'The :attribute field must be accepted.',
+    'accepted_if' => 'The :attribute field must be accepted when :other is :value.',
+    'active_url' => 'The :attribute field must be a valid URL.',
+    'after' => 'The :attribute field must be a date after :date.',
+    'after_or_equal' => 'The :attribute field must be a date after or equal to :date.',
+    'alpha' => 'The :attribute field must only contain letters.',
+    'alpha_dash' => 'The :attribute field must only contain letters, numbers, dashes, and underscores.',
+    'alpha_num' => 'The :attribute field must only contain letters and numbers.',
+    'array' => 'The :attribute field must be an array.',
+    'ascii' => 'The :attribute field must only contain single-byte alphanumeric characters and symbols.',
+    'before' => 'The :attribute field must be a date before :date.',
+    'before_or_equal' => 'The :attribute field must be a date before or equal to :date.',
+    'between' => [
+        'array' => 'The :attribute field must have between :min and :max items.',
+        'file' => 'The :attribute field must be between :min and :max kilobytes.',
+        'numeric' => 'The :attribute field must be between :min and :max.',
+        'string' => 'The :attribute field must be between :min and :max characters.',
     ],
-    'boolean'              => 'The :attribute must be true or false.',
-    'confirmed'            => 'The :attribute confirmation does not match.',
-    'date'                 => 'The :attribute is not a valid date.',
-    'date_format'          => 'The :attribute does not match the format :format.',
-    'different'            => 'The :attribute and :other must be different.',
-    'digits'               => 'The :attribute must be :digits digits.',
-    'digits_between'       => 'The :attribute must be between :min and :max digits.',
-    'dimensions'           => 'The :attribute has invalid image dimensions.',
-    'distinct'             => 'The :attribute field has a duplicate value.',
-    'email'                => 'The :attribute format is invalid.',
-    'exists'               => 'The selected :attribute is invalid.',
-    'file'                 => 'The :attribute must be a file.',
-    'filled'               => 'The :attribute field must have a value.',
-    'image'                => 'The :attribute must be an image.',
+    'boolean' => 'The :attribute field must be true or false.',
+    'can' => 'The :attribute field contains an unauthorized value.',
+    'confirmed' => 'The :attribute field confirmation does not match.',
+    'contains' => 'The :attribute field is missing a required value.',
+    'current_password' => 'The password is incorrect.',
+    'date' => 'The :attribute field must be a valid date.',
+    'date_equals' => 'The :attribute field must be a date equal to :date.',
+    'date_format' => 'The :attribute field must match the format :format.',
+    'decimal' => 'The :attribute field must have :decimal decimal places.',
+    'declined' => 'The :attribute field must be declined.',
+    'declined_if' => 'The :attribute field must be declined when :other is :value.',
+    'different' => 'The :attribute field and :other must be different.',
+    'digits' => 'The :attribute field must be :digits digits.',
+    'digits_between' => 'The :attribute field must be between :min and :max digits.',
+    'dimensions' => 'The :attribute field has invalid image dimensions.',
+    'distinct' => 'The :attribute field has a duplicate value.',
+    'doesnt_end_with' => 'The :attribute field must not end with one of the following: :values.',
+    'doesnt_start_with' => 'The :attribute field must not start with one of the following: :values.',
+    'email' => 'The :attribute field must be a valid email address.',
+    'ends_with' => 'The :attribute field must end with one of the following: :values.',
+    'enum' => 'The selected :attribute is invalid.',
+    'exists' => 'The selected :attribute is invalid.',
+    'extensions' => 'The :attribute field must have one of the following extensions: :values.',
+    'file' => 'The :attribute field must be a file.',
+    'filled' => 'The :attribute field must have a value.',
+    'gt' => [
+        'array' => 'The :attribute field must have more than :value items.',
+        'file' => 'The :attribute field must be greater than :value kilobytes.',
+        'numeric' => 'The :attribute field must be greater than :value.',
+        'string' => 'The :attribute field must be greater than :value characters.',
+    ],
+    'gte' => [
+        'array' => 'The :attribute field must have :value items or more.',
+        'file' => 'The :attribute field must be greater than or equal to :value kilobytes.',
+        'numeric' => 'The :attribute field must be greater than or equal to :value.',
+        'string' => 'The :attribute field must be greater than or equal to :value characters.',
+    ],
+    'hex_color' => 'The :attribute field must be a valid hexadecimal color.',
+    'image' => 'The :attribute field must be an image.',
     'import_field_empty'    => 'The value for :fieldname cannot be null.',
-    'in'                   => 'The selected :attribute is invalid.',
-    'in_array'             => 'The :attribute field does not exist in :other.',
-    'integer'              => 'The :attribute must be an integer.',
-    'ip'                   => 'The :attribute must be a valid IP address.',
-    'ipv4'                 => 'The :attribute must be a valid IPv4 address.',
-    'ipv6'                 => 'The :attribute must be a valid IPv6 address.',
-    'is_unique_department' => 'The :attribute must be unique to this Company Location',
-    'json'                 => 'The :attribute must be a valid JSON string.',
-    'max'                  => [
-        'numeric' => 'The :attribute may not be greater than :max.',
-        'file'    => 'The :attribute may not be greater than :max kilobytes.',
-        'string'  => 'The :attribute may not be greater than :max characters.',
-        'array'   => 'The :attribute may not have more than :max items.',
+    'in' => 'The selected :attribute is invalid.',
+    'in_array' => 'The :attribute field must exist in :other.',
+    'integer' => 'The :attribute field must be an integer.',
+    'ip' => 'The :attribute field must be a valid IP address.',
+    'ipv4' => 'The :attribute field must be a valid IPv4 address.',
+    'ipv6' => 'The :attribute field must be a valid IPv6 address.',
+    'json' => 'The :attribute field must be a valid JSON string.',
+    'list' => 'The :attribute field must be a list.',
+    'lowercase' => 'The :attribute field must be lowercase.',
+    'lt' => [
+        'array' => 'The :attribute field must have less than :value items.',
+        'file' => 'The :attribute field must be less than :value kilobytes.',
+        'numeric' => 'The :attribute field must be less than :value.',
+        'string' => 'The :attribute field must be less than :value characters.',
     ],
-    'mimes'                => 'The :attribute must be a file of type: :values.',
-    'mimetypes'            => 'The :attribute must be a file of type: :values.',
-    'min'                  => [
-        'numeric' => 'The :attribute must be at least :min.',
-        'file'    => 'The :attribute must be at least :min kilobytes.',
-        'string'  => 'The :attribute must be at least :min characters.',
-        'array'   => 'The :attribute must have at least :min items.',
+    'lte' => [
+        'array' => 'The :attribute field must not have more than :value items.',
+        'file' => 'The :attribute field must be less than or equal to :value kilobytes.',
+        'numeric' => 'The :attribute field must be less than or equal to :value.',
+        'string' => 'The :attribute field must be less than or equal to :value characters.',
     ],
-    'starts_with'          => 'The :attribute must start with one of the following: :values.',
-    'ends_with'            => 'The :attribute must end with one of the following: :values.',
+    'mac_address' => 'The :attribute field must be a valid MAC address.',
+    'max' => [
+        'array' => 'The :attribute field must not have more than :max items.',
+        'file' => 'The :attribute field must not be greater than :max kilobytes.',
+        'numeric' => 'The :attribute field must not be greater than :max.',
+        'string' => 'The :attribute field must not be greater than :max characters.',
+    ],
+    'max_digits' => 'The :attribute field must not have more than :max digits.',
+    'mimes' => 'The :attribute field must be a file of type: :values.',
+    'mimetypes' => 'The :attribute field must be a file of type: :values.',
+    'min' => [
+        'array' => 'The :attribute field must have at least :min items.',
+        'file' => 'The :attribute field must be at least :min kilobytes.',
+        'numeric' => 'The :attribute field must be at least :min.',
+        'string' => 'The :attribute field must be at least :min characters.',
+    ],
+    'min_digits' => 'The :attribute field must have at least :min digits.',
+    'missing' => 'The :attribute field must be missing.',
+    'missing_if' => 'The :attribute field must be missing when :other is :value.',
+    'missing_unless' => 'The :attribute field must be missing unless :other is :value.',
+    'missing_with' => 'The :attribute field must be missing when :values is present.',
+    'missing_with_all' => 'The :attribute field must be missing when :values are present.',
+    'multiple_of' => 'The :attribute field must be a multiple of :value.',
+    'not_in' => 'The selected :attribute is invalid.',
+    'not_regex' => 'The :attribute field format is invalid.',
+    'numeric' => 'The :attribute field must be a number.',
+    'password' => [
+        'letters' => 'The :attribute field must contain at least one letter.',
+        'mixed' => 'The :attribute field must contain at least one uppercase and one lowercase letter.',
+        'numbers' => 'The :attribute field must contain at least one number.',
+        'symbols' => 'The :attribute field must contain at least one symbol.',
+        'uncompromised' => 'The given :attribute has appeared in a data leak. Please choose a different :attribute.',
+    ],
+    'percent'       => 'The depreciation minimum must be between 0 and 100 when depreciation type is percentage.',
 
-    'not_in'               => 'The selected :attribute is invalid.',
-    'numeric'              => 'The :attribute must be a number.',
-    'present'              => 'The :attribute field must be present.',
-    'valid_regex'          => 'That is not a valid regex. ',
-    'regex'                => 'The :attribute format is invalid.',
-    'required'             => 'The :attribute field is required.',
-    'required_if'          => 'The :attribute field is required when :other is :value.',
-    'required_unless'      => 'The :attribute field is required unless :other is in :values.',
-    'required_with'        => 'The :attribute field is required when :values is present.',
-    'required_with_all'    => 'The :attribute field is required when :values is present.',
-    'required_without'     => 'The :attribute field is required when :values is not present.',
+    'present' => 'The :attribute field must be present.',
+    'present_if' => 'The :attribute field must be present when :other is :value.',
+    'present_unless' => 'The :attribute field must be present unless :other is :value.',
+    'present_with' => 'The :attribute field must be present when :values is present.',
+    'present_with_all' => 'The :attribute field must be present when :values are present.',
+    'prohibited' => 'The :attribute field is prohibited.',
+    'prohibited_if' => 'The :attribute field is prohibited when :other is :value.',
+    'prohibited_unless' => 'The :attribute field is prohibited unless :other is in :values.',
+    'prohibits' => 'The :attribute field prohibits :other from being present.',
+    'regex' => 'The :attribute field format is invalid.',
+    'required' => 'The :attribute field is required.',
+    'required_array_keys' => 'The :attribute field must contain entries for: :values.',
+    'required_if' => 'The :attribute field is required when :other is :value.',
+    'required_if_accepted' => 'The :attribute field is required when :other is accepted.',
+    'required_if_declined' => 'The :attribute field is required when :other is declined.',
+    'required_unless' => 'The :attribute field is required unless :other is in :values.',
+    'required_with' => 'The :attribute field is required when :values is present.',
+    'required_with_all' => 'The :attribute field is required when :values are present.',
+    'required_without' => 'The :attribute field is required when :values is not present.',
     'required_without_all' => 'The :attribute field is required when none of :values are present.',
-    'same'                 => 'The :attribute and :other must match.',
-    'size'                 => [
-        'numeric' => 'The :attribute must be :size.',
-        'file'    => 'The :attribute must be :size kilobytes.',
-        'string'  => 'The :attribute must be :size characters.',
-        'array'   => 'The :attribute must contain :size items.',
+    'same' => 'The :attribute field must match :other.',
+    'size' => [
+        'array' => 'The :attribute field must contain :size items.',
+        'file' => 'The :attribute field must be :size kilobytes.',
+        'numeric' => 'The :attribute field must be :size.',
+        'string' => 'The :attribute field must be :size characters.',
     ],
+    'starts_with' => 'The :attribute field must start with one of the following: :values.',
     'string'               => 'The :attribute must be a string.',
-    'timezone'             => 'The :attribute must be a valid zone.',
     'two_column_unique_undeleted' => 'The :attribute must be unique across :table1 and :table2. ',
-    'unique'               => 'The :attribute has already been taken.',
-    'uploaded'             => 'The :attribute failed to upload.',
-    'url'                  => 'The :attribute format is invalid.',
     'unique_undeleted'     => 'The :attribute must be unique.',
     'non_circular'         => 'The :attribute must not create a circular reference.',
     'not_array'            => ':attribute cannot be an array.',
@@ -102,11 +165,14 @@ return [
     'numbers'              => 'Password must contain at least one number.',
     'case_diff'            => 'Password must use mixed case.',
     'symbols'              => 'Password must contain symbols.',
-    'gte'                  => [
-        'numeric'          => 'Value cannot be negative'
-    ],
-    'checkboxes'           => ':attribute contains invalid options.',
-    'radio_buttons'        => ':attribute is invalid.',
+    'timezone' => 'The :attribute field must be a valid timezone.',
+    'unique' => 'The :attribute has already been taken.',
+    'uploaded' => 'The :attribute failed to upload.',
+    'uppercase' => 'The :attribute field must be uppercase.',
+    'url' => 'The :attribute field must be a valid URL.',
+    'ulid' => 'The :attribute field must be a valid ULID.',
+    'uuid' => 'The :attribute field must be a valid UUID.',
+    'fmcs_location' => 'Full multiple company support and location scoping is enabled in the Admin Settings, and the selected location and selected company are not compatible.',
 
 
     /*
@@ -120,16 +186,22 @@ return [
     |
     */
 
+    'email_array'      => 'One or more email addresses is invalid.',
+    'checkboxes'           => ':attribute contains invalid options.',
+    'radio_buttons'        => ':attribute is invalid.',
+    
     'custom' => [
         'alpha_space' => 'The :attribute field contains a character that is not allowed.',
-        'email_array'      => 'One or more email addresses is invalid.',
+
         'hashed_pass'      => 'Your current password is incorrect',
         'dumbpwd'          => 'That password is too common.',
         'statuslabel_type' => 'You must select a valid status label type',
+        'custom_field_not_found'          => 'This field does not seem to exist, please double check your custom field names.',
+        'custom_field_not_found_on_model' => 'This field seems to exist, but is not available on this Asset Model\'s fieldset.',
 
         // date_format validation with slightly less stupid messages. It duplicates a lot, but it gets the job done :(
-        // We use this because the default error message for date_format is reflects php Y-m-d, which non-PHP
-        // people won't know how to format. 
+        // We use this because the default error message for date_format reflects php Y-m-d, which non-PHP
+        // people won't know how to format.
         'purchase_date.date_format'     => 'The :attribute must be a valid date in YYYY-MM-DD format',
         'last_audit_date.date_format'   =>  'The :attribute must be a valid date in YYYY-MM-DD hh:mm:ss format',
         'expiration_date.date_format'   =>  'The :attribute must be a valid date in YYYY-MM-DD format',
@@ -137,9 +209,15 @@ return [
         'expected_checkin.date_format'  =>  'The :attribute must be a valid date in YYYY-MM-DD format',
         'start_date.date_format'        =>  'The :attribute must be a valid date in YYYY-MM-DD format',
         'end_date.date_format'          =>  'The :attribute must be a valid date in YYYY-MM-DD format',
+        'invalid_value_in_field' => 'Invalid value included in this field',
 
-    ],
+        'ldap_username_field' => [
+            'not_in' =>         '<code>sAMAccountName</code> (mixed case) will likely not work. You should use <code>samaccountname</code> (lowercase) instead.'
+        ],
+        'ldap_auth_filter_query' => ['not_in' => '<code>uid=samaccountname</code> is probably not a valid auth filter. You probably want <code>uid=</code> '],
+        'ldap_filter' => ['regex' => 'This value should probably not be wrapped in parentheses.'],
 
+        ],
     /*
     |--------------------------------------------------------------------------
     | Custom Validation Attributes
@@ -155,8 +233,16 @@ return [
 
     /*
     |--------------------------------------------------------------------------
-    | Generic Validation Messages
+    | Generic Validation Messages - we use these in the jquery validation where we don't have
+    | access to the :attribute
     |--------------------------------------------------------------------------
     */
-    'invalid_value_in_field' => 'Invalid value included in this field',
+
+    'generic' => [
+        'invalid_value_in_field' => 'Invalid value included in this field',
+        'required' => 'This field is required',
+        'email' => 'Please enter a valid email address',
+    ],
+
+
 ];
diff --git a/resources/lang/zh-TW/account/general.php b/resources/lang/zh-TW/account/general.php
index a29c8ac3a8..5f6311a0c1 100644
--- a/resources/lang/zh-TW/account/general.php
+++ b/resources/lang/zh-TW/account/general.php
@@ -2,10 +2,16 @@
 
 return array(
     'personal_api_keys' => '個人 API 金鑰',
+    'personal_access_token' => 'Personal Access Token',
+    'personal_api_keys_success' => 'Personal API Key :key created sucessfully',
+    'here_is_api_key' => 'Here is your new personal access token. This is the only time it will be shown so do not lose it! You may now use this token to make API requests.',
     'api_key_warning' => 'When generating an API token, be sure to copy it down immediately as they will not be visible to you again.',
     'api_base_url' => '您的 API 基礎 URL 位於：',
     'api_base_url_endpoint' => '/&lt;端點&gt;',
     'api_token_expiration_time' => 'API tokens 設定為在以下時間過期：',
     'api_reference' => 'Please check the <a href="https://snipe-it.readme.io/reference" target="_blank">API reference</a> to find specific API endpoints and additional API documentation.',
     'profile_updated' => 'Account successfully updated',
+    'no_tokens' => 'You have not created any personal access tokens.',
+    'enable_sounds' => 'Enable sound effects',
+    'enable_confetti' => 'Enable confetti effects',
 );
diff --git a/resources/lang/zh-TW/admin/accessories/message.php b/resources/lang/zh-TW/admin/accessories/message.php
index d00f0daee7..c9f947f0d2 100644
--- a/resources/lang/zh-TW/admin/accessories/message.php
+++ b/resources/lang/zh-TW/admin/accessories/message.php
@@ -26,7 +26,11 @@ return array(
         'error'   		=> '配件借出失敗。請再試一次。',
         'success' 		=> '借出配件成功。',
         'unavailable'   => '配件不足無法借出, 檢查可用數量.',
-        'user_does_not_exist' => '使用者不正確。請再試一次。'
+        'user_does_not_exist' => '使用者不正確。請再試一次。',
+         'checkout_qty' => array(
+            'lte'  => 'There is currently only one available accessory of this type, and you are trying to check out :checkout_qty. Please adjust the checkout quantity or the total stock of this accessory and try again.|There are :number_currently_remaining total available accessories, and you are trying to check out :checkout_qty. Please adjust the checkout quantity or the total stock of this accessory and try again.',
+            ),
+           
     ),
 
     'checkin' => array(
diff --git a/resources/lang/zh-TW/admin/accessories/table.php b/resources/lang/zh-TW/admin/accessories/table.php
index be80f30ab8..f77aadd622 100644
--- a/resources/lang/zh-TW/admin/accessories/table.php
+++ b/resources/lang/zh-TW/admin/accessories/table.php
@@ -6,6 +6,4 @@ return array(
     'id'      					=> 'ID',
     'require_acceptance'      	=> '接收',
     'title'      				=> '配件名稱',
-
-
 );
diff --git a/resources/lang/zh-TW/admin/components/message.php b/resources/lang/zh-TW/admin/components/message.php
index bfaf271dc6..787aa51c9b 100644
--- a/resources/lang/zh-TW/admin/components/message.php
+++ b/resources/lang/zh-TW/admin/components/message.php
@@ -17,7 +17,8 @@ return array(
     'delete' => array(
         'confirm'   => '您確定要刪除此組件嗎？',
         'error'   => '刪除組件時發生問題。請再試一次。',
-        'success' => '刪除組件成功。'
+        'success' => '刪除組件成功。',
+        'error_qty'   => 'Some components of this type are still checked out. Please check them in and try again.',
     ),
 
      'checkout' => array(
diff --git a/resources/lang/zh-TW/admin/consumables/general.php b/resources/lang/zh-TW/admin/consumables/general.php
index 9337216db2..e5ea635438 100644
--- a/resources/lang/zh-TW/admin/consumables/general.php
+++ b/resources/lang/zh-TW/admin/consumables/general.php
@@ -8,4 +8,5 @@ return array(
     'remaining' 			            => '剩餘',
     'total' 			                => '總計',
     'update'                            => '更新耗材',
+    'inventory_warning'                 => 'The inventory of this consumable is below the minimum amount of :min_count',
 );
diff --git a/resources/lang/zh-TW/admin/consumables/message.php b/resources/lang/zh-TW/admin/consumables/message.php
index eb48449aa2..fa333e65ac 100644
--- a/resources/lang/zh-TW/admin/consumables/message.php
+++ b/resources/lang/zh-TW/admin/consumables/message.php
@@ -2,6 +2,7 @@
 
 return array(
 
+    'invalid_category_type' => 'The category must be a consumable category.',
     'does_not_exist' => '耗材不存在。',
 
     'create' => array(
diff --git a/resources/lang/zh-TW/admin/custom_fields/general.php b/resources/lang/zh-TW/admin/custom_fields/general.php
index 674054b5b4..7f359d0b4f 100644
--- a/resources/lang/zh-TW/admin/custom_fields/general.php
+++ b/resources/lang/zh-TW/admin/custom_fields/general.php
@@ -35,7 +35,7 @@ return [
     'create_field_title' => '建立新的客製化欄位',
     'value_encrypted'      	        => '此欄位的值已被加密。只有管理員能夠查看原始資料。',
     'show_in_email'     => '在發送給用戶的借出通知信中包含此欄位的值？加密的欄位不能包含在電子郵件中。',
-    'show_in_email_short'     => '包含在電子郵件中。',
+    'show_in_email_short' => 'Include in emails',
     'help_text' => '幫助內文',
     'help_text_description' => '這是一段可選的文字，它將在編輯資產時顯示在表單元素下方，以對欄位提供上下文。',
     'about_custom_fields_title' => '關於客製化欄位',
@@ -57,5 +57,8 @@ return [
     'show_in_requestable_list_short' => '顯示在可申請資產列表中',
     'show_in_requestable_list' => '在可申請資產列表中顯示值。不顯示已加密欄位',
     'encrypted_options' => '該欄位已加密，因此某些顯示選項將無法使用',
+    'display_checkin' => 'Display in checkin forms',
+    'display_checkout' => 'Display in checkout forms',
+    'display_audit' => 'Display in audit forms',
 
 ];
diff --git a/resources/lang/zh-TW/admin/custom_fields/message.php b/resources/lang/zh-TW/admin/custom_fields/message.php
index 0d2b86aa8a..4a52aef714 100644
--- a/resources/lang/zh-TW/admin/custom_fields/message.php
+++ b/resources/lang/zh-TW/admin/custom_fields/message.php
@@ -5,6 +5,7 @@ return array(
     'field' => array(
         'invalid'   => '欄位不存在。',
         'already_added'   => '已新增欄位。',
+        'none_selected'   => 'No field selected',
 
         'create' => array(
             'error'   => '新增欄位失敗，請重試。',
diff --git a/resources/lang/zh-TW/admin/depreciations/general.php b/resources/lang/zh-TW/admin/depreciations/general.php
index e6cc34ff8d..3cc8b08c71 100644
--- a/resources/lang/zh-TW/admin/depreciations/general.php
+++ b/resources/lang/zh-TW/admin/depreciations/general.php
@@ -13,4 +13,8 @@ return [
     'no_depreciations_warning'               => '<strong>警告:</strong>
                       你目前沒有設定任何折舊。
                       請至少設定一次折舊，以查看折舊報告。',
+    'depreciation_method'                   => '折舊報告',
+    'linear_depreciation'                   => 'Linear (Default)',
+    'half_1'                                => 'Half-year convention, always applied',
+    'half_2'                                => 'Half-year convention, applied with condition',
 ];
diff --git a/resources/lang/zh-TW/admin/hardware/form.php b/resources/lang/zh-TW/admin/hardware/form.php
index 91e789f0b1..44179f8bfd 100644
--- a/resources/lang/zh-TW/admin/hardware/form.php
+++ b/resources/lang/zh-TW/admin/hardware/form.php
@@ -55,8 +55,11 @@ return [
     'asset_location_update_default' => '只更新預設位置',
     'asset_location_update_actual' => 'Update only actual location',
     'asset_not_deployable' => '該資產狀態無法部署。此資產無法被借出。',
-    'asset_deployable' => '該狀態可部署。此資產可以被借出。',
+    'asset_not_deployable_checkin' => 'That asset status is not deployable. Using this status label will checkin the asset.',
+    'asset_deployable' => 'This asset can be checked out.',
     'processing_spinner' => '處理中... (大型檔案可能需要一些時間)',
+    'processing' => '處理中... ',
     'optional_infos'  => '選填資訊',
-    'order_details'   => '訂單相關資訊'
+    'order_details'   => '訂單相關資訊',
+    'calc_eol'    => 'If nulling the EOL date, use automatic EOL calculation based on the purchase date and EOL rate.',
 ];
diff --git a/resources/lang/zh-TW/admin/hardware/general.php b/resources/lang/zh-TW/admin/hardware/general.php
index 456f4b5815..8e2e3e877c 100644
--- a/resources/lang/zh-TW/admin/hardware/general.php
+++ b/resources/lang/zh-TW/admin/hardware/general.php
@@ -5,8 +5,8 @@ return [
     'about_assets_text'            => '資產是按序號或資產標籤追蹤的物品。 他們往往是高價值並標示為重要的物品。',
     'archived'  				=> '已封存',
     'asset'  					=> '資產',
-    'bulk_checkout'             => '借出資產',
-    'bulk_checkin'              => '資產繳回',
+    'bulk_checkout'             => '批次借出',
+    'bulk_checkin'              => 'Bulk Checkin',
     'checkin'  					=> '資產繳回',
     'checkout'  				=> '借出資產',
     'clone'  					=> '複製資產',
@@ -27,8 +27,7 @@ return [
     'undeployable_tooltip'  	=> '此資產的狀態標籤為不可部署，因此目前無法借出。',
     'view'  					=> '檢視資產',
     'csv_error' => '你的 CSV 檔案有錯誤',
-    'import_text' => '<p>Upload a CSV that contains asset history. The assets and users MUST already exist in the system, or they will be skipped. Matching assets for history import happens against the asset tag. We will try to find a matching user based on the user\'s name you provide, and the criteria you select below. If you do not select any criteria below, it will simply try to match on the username format you configured in the <code>Admin &gt; General Settings</code>.</p><p>Fields included in the CSV must match the headers: <strong>Asset Tag, Name, Checkout Date, Checkin Date</strong>. Any additional fields will be ignored. </p><p>Checkin Date: blank or future checkin dates will checkout items to associated user.  Excluding the Checkin Date column will create a checkin date with todays date.</p>
-    ',
+    'import_text' => '<p>Upload a CSV that contains asset history. The assets and users MUST already exist in the system, or they will be skipped. Matching assets for history import happens against the asset tag. We will try to find a matching user based on the user\'s name you provide, and the criteria you select below. If you do not select any criteria below, it will simply try to match on the username format you configured in the <code>Admin &gt; General Settings</code>.</p><p>Fields included in the CSV must match the headers: <strong>Asset Tag, Name, Checkout Date, Checkin Date</strong>. Any additional fields will be ignored. </p><p>Checkin Date: blank or future checkin dates will checkout items to associated user.  Excluding the Checkin Date column will create a checkin date with todays date.</p>    ',
     'csv_import_match_f-l' => 'Try to match users by <strong>firstname.lastname</strong> (<code>jane.smith</code>) format',
     'csv_import_match_initial_last' => 'Try to match users by <strong>first initial last name</strong> (<code>jsmith</code>) format',
     'csv_import_match_first' => 'Try to match users by <strong>first name</strong> (<code>jane</code>) format',
diff --git a/resources/lang/zh-TW/admin/hardware/message.php b/resources/lang/zh-TW/admin/hardware/message.php
index 3671de4a3f..88783fec0a 100644
--- a/resources/lang/zh-TW/admin/hardware/message.php
+++ b/resources/lang/zh-TW/admin/hardware/message.php
@@ -2,18 +2,23 @@
 
 return [
 
-    'undeployable' 		=> '<strong>警告: </strong>此資產目前已標記為不可佈署，如果資產狀態已改變，請更新狀態。',
-    'does_not_exist' 	=> '資產不存在',
-    'does_not_exist_var'=> 'Asset with tag :asset_tag not found.',
-    'no_tag' 	        => 'No asset tag provided.',
+    'undeployable' 		 => '<strong>Warning: </strong> This asset has been marked as currently undeployable. If this status has changed, please update the asset status.',
+    'does_not_exist' 	 => '資產不存在',
+    'does_not_exist_var' => 'Asset with tag :asset_tag not found.',
+    'no_tag' 	         => 'No asset tag provided.',
     'does_not_exist_or_not_requestable' => '該資產不存在或無法申請。',
-    'assoc_users'	 	=> '此資產目前已借給某個使用者，不能被刪除，請檢查資產狀態，然後再嘗試刪除。',
+    'assoc_users'	 	 => '此資產目前已借給某個使用者，不能被刪除，請檢查資產狀態，然後再嘗試刪除。',
     'warning_audit_date_mismatch' 	=> 'This asset\'s next audit date (:next_audit_date) is before the last audit date (:last_audit_date). Please update the next audit date.',
+    'labels_generated'   => 'Labels were successfully generated.',
+    'error_generating_labels' => 'Error while generating labels.',
+    'no_assets_selected' => 'No assets selected.',
 
     'create' => [
         'error'   		=> '新增資產失敗，請重試。',
         'success' 		=> '新增資產成功。',
         'success_linked' => 'Asset with tag :tag was created successfully. <strong><a href=":link" style="color: white;">Click here to view</a></strong>.',
+        'multi_success_linked' => 'Asset with tag :links was created successfully.|:count assets were created succesfully. :links.',
+        'partial_failure' => 'An asset was unable to be created. Reason: :failures|:count assets were unable to be created. Reasons: :failures',
     ],
 
     'update' => [
@@ -51,20 +56,24 @@ return [
     ],
 
     'import' => [
+        'import_button'         => 'Process Import',
         'error'                 => '某些項目沒有被正確匯入。',
         'errorDetail'           => '以下項目由於錯誤未被匯入。',
         'success'               => '您的檔案已被匯入。',
         'file_delete_success'   => '您的檔案已成功刪除。',
         'file_delete_error'      => '您的檔案無法被刪除。',
         'file_missing' => 'The file selected is missing',
+        'file_already_deleted' => 'The file selected was already deleted',
         'header_row_has_malformed_characters' => '標頭列中的一個或多個屬性包含異常的 UTF-8 字元',
         'content_row_has_malformed_characters' => '內容的第一列中的一個或多個屬性包含異常的 UTF-8 字元',
+        'transliterate_failure' => 'Transliteration from :encoding to UTF-8 failed due to invalid characters in input'
     ],
 
 
     'delete' => [
         'confirm'   	=> '您確定要刪除此資產嗎？',
         'error'   		=> '刪除資產時發生問題，請重試。',
+        'assigned_to_error' => '{1}Asset Tag: :asset_tag is currently checked out. Check in this device before deletion.|[2,*]Asset Tags: :asset_tag are currently checked out. Check in these devices before deletion.',
         'nothing_updated'   => '沒有資產被選擇，因此沒有更新任何內容。',
         'success' 		=> '刪除資產成功。',
     ],
@@ -77,6 +86,11 @@ return [
         'no_assets_selected' => '你必須至少選擇一項資產。',
     ],
 
+    'multi-checkout' => [
+        'error'   => 'Asset was not checked out, please try again|Assets were not checked out, please try again',
+        'success' => 'Asset checked out successfully.|Assets checked out successfully.',
+    ],
+
     'checkin' => [
         'error'   		=> '繳回資產失敗，請重試。',
         'success' 		=> '繳回資產成功。',
@@ -86,9 +100,10 @@ return [
     ],
 
     'requests' => [
-        'error'   		=> '申請資產失敗，請重試。',
-        'success' 		=> '申請資產成功。',
-        'canceled'      => '借出申請已取消。',
+        'error'   		=> 'Request was not successful, please try again.',
+        'success' 		=> 'Request successfully submitted.',
+        'canceled'      => 'Request successfully canceled.',
+        'cancel'        => '取消這項物品的申請',
     ],
 
 ];
diff --git a/resources/lang/zh-TW/admin/hardware/table.php b/resources/lang/zh-TW/admin/hardware/table.php
index 4d063d2a91..14a38b1d19 100644
--- a/resources/lang/zh-TW/admin/hardware/table.php
+++ b/resources/lang/zh-TW/admin/hardware/table.php
@@ -25,7 +25,6 @@ return [
     'image'		    => '設備圖片',
     'days_without_acceptance' => '過期天數',
     'monthly_depreciation' => '每月折舊',
-    'assigned_to'    => '分配給',
     'requesting_user' => '申請使用者',
     'requested_date' => '申請日期',
     'changed'       => '已更改',
diff --git a/resources/lang/zh-TW/admin/kits/general.php b/resources/lang/zh-TW/admin/kits/general.php
index 979da571cd..c7499fb98b 100644
--- a/resources/lang/zh-TW/admin/kits/general.php
+++ b/resources/lang/zh-TW/admin/kits/general.php
@@ -47,4 +47,5 @@ return [
     'kit_deleted'                       => '套件已成功刪除',
     'kit_model_updated'                 => '型號成功更新',
     'kit_model_detached'                => '型號成功分離',
+    'model_already_attached'            => 'Model already attached to kit',
 ];
diff --git a/resources/lang/zh-TW/admin/licenses/general.php b/resources/lang/zh-TW/admin/licenses/general.php
index fb7303955f..f50955a874 100644
--- a/resources/lang/zh-TW/admin/licenses/general.php
+++ b/resources/lang/zh-TW/admin/licenses/general.php
@@ -14,6 +14,7 @@ return array(
     'info'  					=> '授權訊息',
     'license_seats'  			=> '授權數量',
     'seat'  					=> '數量',
+    'seat_count'  				=> 'Seat :count',
     'seats'  					=> '數量',
     'software_licenses'  		=> '軟體授權',
     'user'  					=> '使用者
@@ -24,12 +25,12 @@ return array(
         [
             'checkin_all'           => [
                 'button'            => '歸還所有名額',
-                'modal'             => '此操作將歸還一個名額。| 此操作將歸還所有 :checkedout_seats_count 名額的此授權。',
+                'modal'             => 'This action will checkin one seat. | This action will checkin all :checkedout_seats_count seats for this license.',
                 'enabled_tooltip'   => '從使用者和資產中歸還此授權的所有名額',
                 'disabled_tooltip'  => '此功能已停用，因為目前沒有名額在借出中',
                 'disabled_tooltip_reassignable'  => 'This is disabled because the License is not reassignable',
                 'success'           => '授權成功歸還！| 所有授權都成功歸還！',
-                'log_msg'           => '透過授權 GUI 的大量歸還功能歸還',
+                'log_msg'           => 'Checked in via bulk license checkin in license GUI',
             ],
 
             'checkout_all'              => [
diff --git a/resources/lang/zh-TW/admin/licenses/message.php b/resources/lang/zh-TW/admin/licenses/message.php
index 3bf3790c23..86debf28ef 100644
--- a/resources/lang/zh-TW/admin/licenses/message.php
+++ b/resources/lang/zh-TW/admin/licenses/message.php
@@ -44,10 +44,13 @@ return array(
         'error'   => '借出授權時發生問題，請重試。',
         'success' => '借出授權成功。',
         'not_enough_seats' => 'Not enough license seats available for checkout',
+        'mismatch' => 'The license seat provided does not match the license',
+        'unavailable' => 'This seat is not available for checkout.',
     ),
 
     'checkin' => array(
         'error'   => '繳回授權時發生問題，請重試。',
+        'not_reassignable' => 'License not reassignable',
         'success' => '繳回授權成功。'
     ),
 
diff --git a/resources/lang/zh-TW/admin/locations/message.php b/resources/lang/zh-TW/admin/locations/message.php
index ab637febba..330e21aa57 100644
--- a/resources/lang/zh-TW/admin/locations/message.php
+++ b/resources/lang/zh-TW/admin/locations/message.php
@@ -3,11 +3,12 @@
 return array(
 
     'does_not_exist' => '地點不存在.',
-    'assoc_users'    => 'This location is not currently deletable because it is the location of record for at least one asset or user, has assets assigned to it, or is the parent location of another location. Please update your models to no longer reference this company and try again. ',
+    'assoc_users'    => 'This location is not currently deletable because it is the location of record for at least one asset or user, has assets assigned to it, or is the parent location of another location. Please update your records to no longer reference this location and try again ',
     'assoc_assets'	 => '至少還有一個資產與此位置關聯，目前不能被删除，請檢查後重試。 ',
     'assoc_child_loc'	 => '至少還有一個子項目與此位置關聯，目前不能被删除，請檢查後重試。 ',
     'assigned_assets' => '已分配資產',
     'current_location' => '目前位置',
+    'open_map' => 'Open in :map_provider_icon Maps',
 
 
     'create' => array(
@@ -20,6 +21,11 @@ return array(
         'success' => '成功更新地點.'
     ),
 
+    'restore' => array(
+        'error'   => 'Location was not restored, please try again',
+        'success' => 'Location restored successfully.'
+    ),
+
     'delete' => array(
         'confirm'   	=> '您確定要刪除此位置嗎？',
         'error'   => '刪除位置時發生問題，請重試。',
diff --git a/resources/lang/zh-TW/admin/locations/table.php b/resources/lang/zh-TW/admin/locations/table.php
index 68d68fc4df..a8b3c87dc6 100644
--- a/resources/lang/zh-TW/admin/locations/table.php
+++ b/resources/lang/zh-TW/admin/locations/table.php
@@ -39,4 +39,5 @@ return [
     'signed_by_finance_auditor' => '由財務稽核員簽署：',
     'signed_by_location_manager' => '由區域負責人簽署：',
     'signed_by'                 => '由以下人員簽署：',
+    'clone'  					=> 'Clone Location',
 ];
diff --git a/resources/lang/zh-TW/admin/models/general.php b/resources/lang/zh-TW/admin/models/general.php
index 094c99af83..971b8c1ec5 100644
--- a/resources/lang/zh-TW/admin/models/general.php
+++ b/resources/lang/zh-TW/admin/models/general.php
@@ -3,7 +3,7 @@
 return array(
     'about_models_title'     => '關於資產型號',
     'about_models_text'           => '資產型號是將相同資產分組的一種方式，例如："MBP 2013"、"iPhone 6s"... 等。',
-    'deleted'  					        => '此型號已被刪除.',
+    'deleted'  					=> '此型號已被刪除.',
     'bulk_delete'               => '批次刪除資產型號',
     'bulk_delete_help'               => '使用下面的核取方塊確認刪除選定的資產型號。不能刪除具有資產與之關聯的資產模型。',
     'bulk_delete_warn'          => '您即將刪除一個資產型號。|您即將刪除 :model_count 個資產型號。',
diff --git a/resources/lang/zh-TW/admin/models/message.php b/resources/lang/zh-TW/admin/models/message.php
index cc20b76eab..5740b34f3f 100644
--- a/resources/lang/zh-TW/admin/models/message.php
+++ b/resources/lang/zh-TW/admin/models/message.php
@@ -7,7 +7,7 @@ return array(
     'no_association' => '警告！此項目的資產型號無效或遺失！',
     'no_association_fix' => '這將以奇怪和可怕的方式損壞事物。立即編輯此資產以分配型號。',
     'assoc_users'	 => '至少還有一個資產與此樣板關聯，目前不能被删除，請在刪除資產後重試。 ',
-
+    'invalid_category_type' => 'This category must be an asset category.',
 
     'create' => array(
         'error'   => '新增樣板失敗，請重試。',
diff --git a/resources/lang/zh-TW/admin/reports/general.php b/resources/lang/zh-TW/admin/reports/general.php
index 83bd70a3a2..4461b7f3da 100644
--- a/resources/lang/zh-TW/admin/reports/general.php
+++ b/resources/lang/zh-TW/admin/reports/general.php
@@ -4,6 +4,7 @@ return [
     'info'   => '請選擇資產報表選項。',
     'deleted_user' => '删除的用户',
     'send_reminder' => '傳送提醒',
+    'cannot_send_reminder' => 'User has been deleted or does not have an email address so cannot receive a reminder',
     'reminder_sent' => '已發送提醒',
     'acceptance_deleted' => '接收申請已刪除',
     'acceptance_request' => '接收申請',
@@ -13,5 +14,10 @@ return [
         'user_state' => 'User State',
         'user_country' => 'User Country',
         'user_zip' => 'User Zip'
-    ]
-];
\ No newline at end of file
+    ],
+    'open_saved_template' => 'Open Saved Template',
+    'save_template' =>  'Save Template',
+    'select_a_template' => 'Select a Template',
+    'template_name' => 'Template Name',
+    'update_template' => 'Update Template',
+];
diff --git a/resources/lang/zh-TW/admin/reports/message.php b/resources/lang/zh-TW/admin/reports/message.php
index 4c7eedb612..2800bbdf0b 100644
--- a/resources/lang/zh-TW/admin/reports/message.php
+++ b/resources/lang/zh-TW/admin/reports/message.php
@@ -1,5 +1,16 @@
 <?php
 
-return array(
-    'error'   => '您至少要選擇一個選項。'
-);
+return [
+    'about_templates' => 'About Saved Templates',
+    'saving_templates_description' => 'Select your options, then enter the name of your template in the box above and click the \'Save Template\' button. Use the dropdown to select a previously saved template.',
+    'create'  => [
+        'success' => 'Template saved successfully',
+    ],
+    'update' => [
+        'success' => 'Template updated successfully',
+    ],
+    'delete' => [
+        'success' => 'Template deleted',
+        'no_delete_permission' => 'Template does not exist or you do not have permission to delete it.',
+    ],
+];
diff --git a/resources/lang/zh-TW/admin/settings/general.php b/resources/lang/zh-TW/admin/settings/general.php
index 836c9aa4bc..eed533d7cb 100644
--- a/resources/lang/zh-TW/admin/settings/general.php
+++ b/resources/lang/zh-TW/admin/settings/general.php
@@ -8,13 +8,13 @@ return [
     'ad_append_domain'          => '在使用者名稱欄位附加網域名稱',
     'ad_append_domain_help'     => '使用者不需要輸入 "username@domain.local"，他們只需要輸入 "username"。',
     'admin_cc_email'            => '電子郵件副本',
-    'admin_cc_email_help'       => '如果您想將發送給用戶的繳回/借出電子郵件的副本發送到其他電子郵件帳戶，請在此處輸入。否則，請將此字段留空。',
+    'admin_cc_email_help'       => 'Send a copy of checkin/checkout emails to this address.',
     'admin_settings'            => 'Admin Settings',
     'is_ad'				        => '這是AD域伺服器',
     'alerts'                	=> '警告',
     'alert_title'               => '更新通知設定',
     'alert_email'				=> '發送警報',
-    'alert_email_help'    => '您希望警報傳送到的電子郵件地址或分配列表，以逗號分隔',
+    'alert_email_help'          => '您希望警報傳送到的電子郵件地址或分配列表，以逗號分隔.',
     'alerts_enabled'			=> '警報已啟用',
     'alert_interval'			=> '警報閾值(天)',
     'alert_inv_threshold'		=> '庫存警報閾值',
@@ -31,15 +31,18 @@ return [
     'backups'					=> '備份',
     'backups_help'              => '建立, 下載和還原備份 ',
     'backups_restoring'         => '從備份還原',
+    'backups_clean' => 'Clean the backed-up database before restore',
+    'backups_clean_helptext' => "This can be useful if you're changing between database versions",
     'backups_upload'            => '上傳備份',
     'backups_path'              => '伺服器上的備份儲存在 <code>:path</code>',
-    'backups_restore_warning'   => '使用還原按鈕 <small><span class="btn btn-xs btn-warning"><i class="text-white fas fa-retweet" aria-hidden="true"></i></span></small> 從之前的備份還原。 (這目前不適用於 S3 檔案儲存或 Docker。)<br><br>您的 <strong>整個 :app_name 資料庫和所有上傳的檔案將被完全取代</strong> 為備份檔案中的內容。',
+    'backups_restore_warning'   => 'Use the restore button <small><span class="btn btn-xs btn-warning"><i class="text-white fas fa-retweet" aria-hidden="true"></i></span></small> to restore from a previous backup. (This does not currently work with S3 file storage or Docker.)<br><br>Your <strong>entire :app_name database and any uploaded files will be completely replaced</strong> by what\'s in the backup file  ',
     'backups_logged_out'         => '所有現有的使用者，包括您，一旦您的還原完成將被登出。',
     'backups_large'             => '非常大的備份可能在還原嘗試時超時，可能仍需要透過命令列執行。',
     'barcode_settings'			=> '條碼設定',
     'confirm_purge'			    => '確認清除',
     'confirm_purge_help'		=> '在下面的框中輸入文字 "DELETE" 以清除您的已刪除記錄。此操作無法撤銷，並將永久刪除所有軟刪除的項目和使用者。 （在進行此操作之前，您應該先進行備份，以防萬一。）',
     'custom_css'				=> '自訂CSS',
+    'custom_css_placeholder'	=> 'Add your custom CSS',
     'custom_css_help'			=> '輸入您喜歡的CSS格式覆蓋。不要包括 &lt;style&gt;&lt;/style&gt; 標籤。',
     'custom_forgot_pass_url'	=> '自訂密碼重置網址',
     'custom_forgot_pass_url_help'	=> '這將替換登錄屏幕上的忘記密碼URL，有助於將用戶引導至內部或託管的LDAP密碼重置功能。它將禁用本地用戶遺忘密的碼功能。',
@@ -47,34 +50,34 @@ return [
     'dashboard_message_help'	=> '該段文字將顯示在儀表板上，供有權查看儀表板的任何人使用。',
     'default_currency'  		=> '預設貨幣',
     'default_eula_text'			=> '預設EULA',
+    'default_eula_text_placeholder' => 'Add your default EULA text',
     'default_language'			=> '預設語言',
     'default_eula_help_text'	=> '您也可以將自訂的EULA與特定資產類別相關聯。',
     'acceptance_note'           => 'Add a note for your decision (Optional)',
     'display_asset_name'        => '顯示資產名稱',
     'display_checkout_date'     => '顯示借出日期',
     'display_eol'               => '以表格形式顯示EOL',
-    'display_qr'                => '顯示二維條碼',
+    'display_qr'                => 'Display 2D barcode',
     'display_alt_barcode'		=> '顯示條碼',
-    'email_logo'                => 'Email Logo',
     'barcode_type'				=> '二維條碼類型',
     'alt_barcode_type'			=> '條碼類型',
-    'email_logo_size'       => '在電子郵件中看起來最好的是方形標誌。',
     'enabled'                   => '已啟用',
     'eula_settings'				=> 'EULA 設定',
     'eula_markdown'				=> 'EULA中可使用<a href="https://help.github.com/articles/github-flavored-markdown/">Github flavored markdown</a>.',
+    'empty_row_count'           => 'Field Start Offset (Empty Rows)',
+    'empty_row_count_help'      => 'Fields will begin populating after this many empty rows are skipped at the top of the label.',
     'favicon'                   => 'Favicon',
     'favicon_format'            => '接受的檔案類型是 ico、png 和 gif。其他影象格式可能無法在所有瀏覽器中正常工作。',
     'favicon_size'          => '網站圖示應該是方形影象，16x16 像素。',
     'footer_text'               => '附加頁尾文字',
     'footer_text_help'          => '此段文字將出現在右側頁尾中。鏈接允許使用 <a href="https://help.github.com/articles/github-flavored-markdown/">Github風格Markdown</a>。換行符、標題、圖像等可能會導致不可預知的結果。',
+    'footer_text_placeholder'   => 'Optional footer text',
     'general_settings'			=> '一般設定',
-    'general_settings_keywords' => 'company support, signature, acceptance, email format, username format, images, per page, thumbnail, eula, gravatar, tos, dashboard, privacy',
     'general_settings_help'     => '預設 EULA 等',
     'generate_backup'			=> '產生備份',
     'google_workspaces'         => 'Google Workspaces',
     'header_color'              => '標題顏色',
     'info'                      => '這些設定允許您自訂您的安裝選項',
-    'label_logo'                => '標籤標誌',
     'label_logo_size'           => '方形標誌看起來最好 - 將在每個資產標籤的右上角顯示。',
     'laravel'                   => 'Laravel版本',
     'ldap'                      => 'LDAP',
@@ -94,7 +97,7 @@ return [
     'ldap_login_sync_help'      => '這僅測試 LDAP 可以正確同步。如果 LDAP 身份驗證查詢不正確, 使用者可能仍無法登錄。您必須先保存更新的 LDAP 設置。',
     'ldap_manager'              => 'LDAP 管理者',
     'ldap_server'               => 'LDAP伺服器',
-    'ldap_server_help'          => '這應以 ldap:// (未加密或TLS加密) 或 ldaps:// (SSL加密) 開頭',
+    'ldap_server_help'          => 'This should start with ldap:// (for unencrypted) or ldaps:// (for TLS or SSL)',
     'ldap_server_cert'			=> '檢查LDAP的SSL憑證',
     'ldap_server_cert_ignore'	=> '允許未通過校驗旳SSL憑證',
     'ldap_server_cert_help'		=> '如果您使用了自簽署憑證，請勾選',
@@ -108,9 +111,8 @@ return [
     'ldap_pword'                => 'LDAP密碼',
     'ldap_basedn'               => 'Base Bind DN',
     'ldap_filter'               => 'LDAP篩選',
-    'ldap_pw_sync'              => 'LDAP 密碼同步',
-    'ldap_pw_sync_help'         => '如果您不想要LDAP密碼與本地端密碼同步，請取消勾選。取消同步設定將造成當本地端與LDAP失去連線時，使用者無法登入。
-',
+    'ldap_pw_sync'              => 'Cache LDAP Passwords',
+    'ldap_pw_sync_help'         => 'Uncheck this box if you do not wish to keep LDAP passwords cached as local hashed passwords. Disabling this means that your users may not be able to login if your LDAP server is unreachable for some reason.',
     'ldap_username_field'       => '使用者名稱',
     'ldap_lname_field'          => '姓',
     'ldap_fname_field'          => 'LDAP 名',
@@ -118,13 +120,15 @@ return [
     'ldap_version'              => 'LDAP 版本',
     'ldap_active_flag'          => 'LDAP 啟用標誌',
     'ldap_activated_flag_help'  => '此值用於確定同步的使用者是否可以登入 Snipe-IT。 <strong>這不會影響他們的能力檢查項目或將其借出</strong>，並應該是您的 AD/LDAP 中的<strong>屬性名稱</strong>，<strong>而不是值</strong>。<br><br>如果此欄位設定為在您的 AD/LDAP 中不存在的欄位名稱，或者 AD/LDAP 欄位中的值設定為 <code>0</code> 或 <code>false</code>，<strong>將停用使用者登入</strong>。如果 AD/LDAP 欄位中的值設定為 <code>1</code> 或 <code>true</code> 或 <em>任何其他文字</em> 則表示使用者可以登入。當您的 AD 中的欄位為空時，我們尊重 <code>userAccountControl</code> 屬性，通常允許非暫停的使用者登入。',
+    'ldap_invert_active_flag'   => 'LDAP Invert Active Flag',
+    'ldap_invert_active_flag_help'     => 'If enabled: when the value returned by LDAP Active Flag is <code>0</code> or <code>false</code> the user account will be active.',
     'ldap_emp_num'              => 'LDAP 員工編號',
     'ldap_email'                => 'LDAP Email',
     'ldap_test'                 => '測試 LDAP',
     'ldap_test_sync'            => '測試 LDAP 同步',
     'license'                   => '軟體授權',
-    'load_remote'               => 'Use Gravatar',
-    'load_remote_help_text'		=> 'Uncheck this box if your install cannot load scripts from the outside internet. This will prevent Snipe-IT from trying load images from Gravatar.',
+    'load_remote'               => 'Load Remote Avatars',
+    'load_remote_help_text'		=> 'Uncheck this box if your install cannot load scripts from the outside internet. This will prevent Snipe-IT from trying load avatars from Gravatar or other outside sources.',
     'login'                     => '登入嘗試',
     'login_attempt'             => '登入嘗試',
     'login_ip'                  => 'IP 位址',
@@ -132,6 +136,7 @@ return [
     'login_user_agent'          => '使用者代理',
     'login_help'                => '嘗試登入的列表',
     'login_note'                => '登錄說明',
+    'login_note_placeholder'            => "If you do not have a login or have found a device belonging to this company, please call technical support at 888-555-1212. Thank you.",
     'login_note_help'           => '可選地，在您的登錄屏幕上包括幾個句子，例如幫助找到丟失或被盜設備的人。此字段接受<a href="https://help.github.com/articles/github-flavored-markdown/">Github風味的markdown</a>',
     'login_remote_user_text'    => '遠端使用者登錄選項',
     'login_remote_user_enabled_text' => '啟用遠端使用者登錄',
@@ -147,13 +152,16 @@ return [
     'logo_print_assets_help'    => '在可列印資產清單上使用商標 ',
     'full_multiple_companies_support_help_text' => '限制使用者（包括管理員） 僅能存取該公司的資產',
     'full_multiple_companies_support_text' => '完整支援多公司',
+    'scope_locations_fmcs_support_text'  => 'Scope Locations with Full Multiple Companies Support',
+    'scope_locations_fmcs_support_help_text'  => 'Restrict locations to their selected company.',
+    'scope_locations_fmcs_check_button' => 'Check Compatibility',
+    'scope_locations_fmcs_support_disabled_text'  => 'This option is disabled because you have conflicting locations set for :count or more items.',
     'show_in_model_list'   => '在模型下拉選單中顯示',
     'optional'					=> '可選',
     'per_page'                  => '每頁呈現結果',
     'php'                       => 'PHP 版本',
-    'php_info'                  => 'PHP 資訊',
+    'php_info'                  => 'PHP info',
     'php_overview'              => 'PHP',
-    'php_overview_keywords'     => 'phpinfo, system, info',
     'php_overview_help'         => 'PHP 系統資訊',
     'php_gd_info'               => '您必須安裝 php-gd 顯示二維條碼，請參閱安裝說明。',
     'php_gd_warning'            => 'PHP 圖形處理及 php-gd 套件沒有安裝',
@@ -219,6 +227,8 @@ return [
     'webhook_integration_help'    => ':app 整合是選擇性的，但如果您希望使用它，則需要端點和頻道。要設定 :app 整合，您必須先在您的 :app 帳戶上<a href=":webhook_link" target="_new" rel="noopener">建立傳入的 webhook</a>。在儲存之前，點選 <strong>測試 :app 整合</strong> 按鈕確認您的設定是否正確。',
     'webhook_integration_help_button'    => '一旦您儲存了您的 :app 資訊，將會出現一個測試按鈕。',
     'webhook_test_help'           => '測試您的 :app 整合是否設定正確。您必須先儲存更新的 :app 設定。',
+    'shortcuts_enabled'         => 'Enable Shortcuts',
+    'shortcuts_help_text'       => '<strong>Windows</strong>: Alt + Access key, <strong>Mac</strong>: Control + Option + Access key',
     'snipe_version'  			=> 'Snipe-IT 版本',
     'support_footer'            => '支援頁尾連結',
     'support_footer_help'       => '指定誰可以看到指向Snipe-IT支持信息和用戶手冊的鏈接',
@@ -228,7 +238,6 @@ return [
     'update'                    => '更新設定',
     'value'                     => '價值',
     'brand'                     => '企業識別',
-    'brand_keywords'            => '頁尾、標誌、列印、主題、面板、標頭、顏色、顏色、css',
     'brand_help'                => '標誌、網站名稱',
     'web_brand'                 => 'Web 品牌識別類型',
     'about_settings_title'      => '關於設定',
@@ -277,6 +286,8 @@ return [
     'two_factor_enrollment_text'	=> "雙因素認證是必要的，無論您是否已登記行動裝置。開啟您的 Google Authenticator app 並且掃描下方的 QR Code 以登記雙因素認證。當您已登記您的裝置，請在下方輸入認證代碼",
     'require_accept_signature'      => '需要簽名',
     'require_accept_signature_help_text'      => '啟用此功能將需要使用者親自簽名來接受一項資產。',
+    'require_checkinout_notes'  => 'Require Notes on Checkin/Checkout',
+    'require_checkinout_notes_help_text'    => 'Enabling this feature will require the note fields to be populated when checking in or checking out an asset.',
     'left'        => '左',
     'right'        => '右',
     'top'        => '頂部',
@@ -314,24 +325,24 @@ return [
     'filter_by_keyword' => '按設定關鍵字篩選',
     'security' => '安全性',
     'security_title' => '更新安全性設定',
-    'security_keywords' => '密碼、密碼、要求、雙因素、雙因素、常見密碼、遠端登入、登出、身份驗證',
     'security_help' => '雙因素、密碼限制',
-    'groups_keywords' => '權限、權限群組、授權',
     'groups_help' => '帳戶權限群組',
     'localization' => '本地化',
     'localization_title' => '更新本地化設定',
-    'localization_keywords' => '本地化、貨幣、本地、地區設定、時區、時區、國際、國際化、語言、語言、翻譯',
     'localization_help' => '語言, 日期顯示',
     'notifications' => '通知',
     'notifications_help' => '電子郵件通知與稽核設定',
     'asset_tags_help' => '遞增和前綴',
     'labels' => '標籤',
     'labels_title' => '更新標籤設定',
-    'labels_help' => '標籤大小和設定',
-    'purge_keywords' => '永久刪除',
+    'labels_help' => 'Barcodes &amp; label settings',
     'purge_help' => '清除已刪除的記錄',
     'ldap_extension_warning' => '似乎此伺服器上未安裝或啟用 LDAP 擴充套件。您仍然可以儲存您的設定，但在 LDAP 同步或登入將正常工作之前，您需要啟用 LDAP 擴充套件。',
     'ldap_ad' => 'LDAP/AD',
+    'ldap_test_label' => 'Test LDAP Sync',
+    'ldap_test_login' => ' Test LDAP Login',
+    'ldap_username_placeholder' => 'LDAP Username',
+    'ldap_password_placeholder' => 'LDAP Password',
     'employee_number' => '員工編號',
     'create_admin_user' => '新增使用者 ::',
     'create_admin_success' => '成功! 您的管理員使用者已新增!',
@@ -343,6 +354,8 @@ return [
     'setup_migration_create_user' => '下一步: 建立使用者',
     'ldap_settings_link' => 'LAD 設定頁面',
     'slack_test' => '測試 <i class="fab fa-slack"></i> 整合',
+    'status_label_name' => 'Status Label Name',
+    'super_admin_only'  => 'Super Admin Only',
     'label2_enable'           => 'New Label Engine',
     'label2_enable_help'      => 'Switch to the new label engine. <b>Note: You will need to save this setting before setting others.</b>',
     'label2_template'         => '範本',
@@ -357,12 +370,15 @@ return [
     'label2_2d_type'          => '二維條碼類型',
     'label2_2d_type_help'     => 'Format for 2D barcodes',
     'label2_2d_target'        => '2D Barcode Target',
-    'label2_2d_target_help'   => 'The URL the 2D barcode points to when scanned',
+    'label2_2d_target_help'   => 'The data that will be contained in the 2D barcode',
     'label2_fields'           => 'Field Definitions',
     'label2_fields_help'      => 'Fields can be added, removed, and reordered in the left column. For each field, multiple options for Label and DataSource can be added, removed, and reordered in the right column.',
+    'purge_barcodes' => 'Purge Barcodes',
     'help_asterisk_bold'    => 'Text entered as <code>**text**</code> will be displayed as bold',
     'help_blank_to_use'     => 'Leave blank to use the value from <code>:setting_name</code>',
     'help_default_will_use' => '<code>:default</code> will use the value from <code>:setting_name</code>. <br>Note that the value of the barcodes must comply with the respective barcode spec in order to be successfully generated. Please see <a href="https://snipe-it.readme.io/docs/barcodes">the documentation <i class="fa fa-external-link"></i></a> for more details. ',
+    'asset_id'              => 'Asset ID',
+    'data'               => 'Data',
     'default'               => '開發人員選項',
     'none'                  => '無',
     'google_callback_help' => '這應該輸入為您的 Google OAuth 應用程式設定中的回呼網址，位於您組織的 <strong><a href="https://console.cloud.google.com/" target="_blank">Google 開發者控制台 <i class="fa fa-external-link" aria-hidden="true"></i></a></strong>。',
@@ -374,7 +390,100 @@ return [
     'database_driver' => 'Database Driver',
     'bs_table_storage' => 'Table Storage',
     'timezone' => 'Timezone',
+    'test_mail' => 'Test Mail',
     'profile_edit'          => 'Edit Profile',
     'profile_edit_help'          => 'Allow users to edit their own profiles.',
+    'default_avatar' => 'Custom Default Avatar',
+    'default_avatar_help' => 'This image will be displayed as a profile if a user does not have a profile photo.',
+    'restore_default_avatar' => 'Restore <a href=":default_avatar" data-toggle="lightbox" data-type="image">original system default avatar</a>',
+    'restore_default_avatar_help' => '',
+    'due_checkin_days' => 'Due For Checkin Warning',
+    'due_checkin_days_help' => 'How many days before the expected checkin of an asset should it be listed in the "Due for checkin" page?',
+    'no_groups' => 'No groups have been created yet. Visit <code>Admin Settings > Permission Groups</code> to add one.',
+    'text' => 'Text',
+
+    'username_formats' => [
+        'username_format'		=> '使用者名稱格式',
+        'firstname_lastname_format'	=> '名 姓，例如 (jane.smith)',
+        'first_name_format'	        => 'First Name (jane)',
+        'last_name_format'		=> 'Last Name (doe)',
+        'filastname_format'			=> 'First Initial Last Name (jsmith)',
+        'lastnamefirstinitial_format' =>  'Last Name First Initial (smithj)',
+        'firstname_lastname_underscore_format' => 'First Name Last Name (jane_smith)',
+        'firstinitial.lastname' => 'First Initial Last Name (j.smith)',
+        'lastname_firstinitial' => 'Last Name First Initial (smith_j)',
+        'lastname_dot_firstinitial_format' => 'Last Name First Initial (smith.j)',
+        'firstnamelastname'     => 'First Name Last Name (janesmith)',
+        'firstnamelastinitial'  => 'First Name Last Initial (janes)',
+        'lastnamefirstname'      => 'Last Name.First Name (smith.jane)',
+    ],
+
+    'email_formats' => [
+        'email_format'			=> 'Email 格式',
+        'firstname_lastname_format'	=> '名 姓，例如 (jane.smith@example.com)',
+        'first_name_format'		=> '名，例如 (jane@example.com)',
+        'last_name_format'		=> 'Last Name (doe@example.com)',
+        'filastname_format'			=> '縮寫名 姓，例如 (jsmith@example.com)',
+        'lastnamefirstinitial_format' =>  '姓氏首字母（smithj@example.com）',
+        'firstname_lastname_underscore_format' => '名字姓氏，例如（jane_smith@example.com）',
+        'firstinitial.lastname' => '姓氏與名首子母 (j.smith@example.com)',
+        'lastname_firstinitial' => '姓氏與名首字母 (smith_j@example.com)',
+        'lastname_dot_firstinitial_format' => 'Last Name First Initial (smith.j@example.com)',
+        'firstnamelastname'     => '全名 (janesmith@example.com)',
+        'firstnamelastinitial'  => '名字與姓首字母 (janes@example.com)',
+        'lastnamefirstname'      => 'Last Name.First Name (smith.jane@example.com)',
+    ],
+
+
+
+    'logo_labels' => [
+        'acceptance_pdf_logo'       => 'PDF Logo',
+        'email_logo'                => 'Email Logo',
+        'label_logo'                => '標籤標誌',
+        'logo'                      => 'Site Logo',
+        'favicon'                   => 'Favicon',
+    ],
+
+    'logo_help' => [
+        'email_logo_size'       => '在電子郵件中看起來最好的是方形標誌。',
+    ],
+
+    'logo_option_types' => [
+        'text' => 'Text',
+        'logo' => 'Logo',
+        'logo_and_text' => 'Logo and Text',
+    ],
+
+
+    'legends' => [
+        'scoping' => 'Scoping',
+        'formats' => 'Default Formats',
+        'profiles' => 'User Profiles',
+        'eula' => 'EULA & Acceptance Preferences',
+        'misc_display' => 'Miscellaneous Display Options',
+        'email' => 'Email Preferences',
+        'checkin' => 'Checkin Preferences',
+        'dashboard' => 'Login & Dashboard Preferences',
+        'misc' => 'Miscellaneous',
+        'logos' => 'Logos & Display',
+        'colors' => 'Colors & Skins',
+        'footer' => 'Footer Preferences',
+        'security' => 'Security Preferences',
+        'general' => 'General',
+        'intervals' => 'Intervals & Thresholds',
+    ],
+
+
+    /* Keywords for settings overview help */
+    'keywords' => [
+        'brand'             => '頁尾、標誌、列印、主題、面板、標頭、顏色、顏色、css',
+        'general_settings'  => 'company support, signature, acceptance, email format, username format, images, per page, thumbnail, eula, gravatar, tos, dashboard, privacy',
+        'groups'            => '權限、權限群組、授權',
+        'labels'            => 'labels, barcodes, barcode, sheets, print, upc, qr, 1d, 2d',
+        'localization'      => '本地化、貨幣、本地、地區設定、時區、時區、國際、國際化、語言、語言、翻譯',
+        'php_overview'      => 'phpinfo, system, info',
+        'purge'             => '永久刪除',
+        'security'          => '密碼、密碼、要求、雙因素、雙因素、常見密碼、遠端登入、登出、身份驗證',
+    ],
 
 ];
diff --git a/resources/lang/zh-TW/admin/settings/message.php b/resources/lang/zh-TW/admin/settings/message.php
index 4722b6a4bd..483528c42f 100644
--- a/resources/lang/zh-TW/admin/settings/message.php
+++ b/resources/lang/zh-TW/admin/settings/message.php
@@ -14,6 +14,9 @@ return [
         'restore_warning'       => '是的，還原它。我了解這將覆蓋資料庫中目前的任何現有數據。這也會登出所有目前使用者(包括您)。',
         'restore_confirm'       => '請您確認是否要從 :filename 還原資料庫？'
     ],
+    'restore' => [
+        'success'               => 'Your system backup has been restored. Please log in again.'
+    ],
     'purge' => [
         'error'     => '清除過程中發生錯誤。',
         'validation_failed'     => '你的清除確認不正確，請在文字輸入欄位輸入＂DELETE＂。',
@@ -33,6 +36,9 @@ return [
         'testing_authentication' => 'LDAP 授權測試中...',
         'authentication_success' => '用戶成功透過 LDAP 驗證'
     ],
+    'labels' => [
+        'null_template' => 'Label template not found. Please select a template.',
+        ],
     'webhook' => [
         'sending' => '正在傳送 :app 測試訊息...',
         'success' => 'Your :webhook_name Integration works!',
@@ -42,5 +48,12 @@ return [
         'error' => '發生了一些錯誤。:app 回應：:error_message',
         'error_redirect' => 'ERROR: 301/302 :endpoint returns a redirect. For security reasons, we don’t follow redirects. Please use the actual endpoint.',
         'error_misc' => '發生了一些錯誤。 :( ',
-    ]
+        'webhook_fail' => ' webhook notification failed: Check to make sure the URL is still valid.',
+        'webhook_channel_not_found' => ' webhook channel not found.',
+        'ms_teams_deprecation' => 'The selected Microsoft Teams webhook URL will be deprecated Dec 31st, 2025. Please use a workflow URL. Microsoft\'s documentation on creating a workflow can be found <a href="https://support.microsoft.com/en-us/office/create-incoming-webhooks-with-workflows-for-microsoft-teams-8ae491c7-0394-4861-ba59-055e33f75498" target="_blank"> here.</a>',
+    ],
+    'location_scoping' => [
+        'not_saved' => 'Your settings were not saved.',
+        'mismatch' => 'There is 1 item in the database that need your attention before you can enable location scoping.|There are :count items in the database that need your attention before you can enable location scoping.',
+    ],
 ];
diff --git a/resources/lang/zh-TW/admin/statuslabels/table.php b/resources/lang/zh-TW/admin/statuslabels/table.php
index 591a25a544..3b1f1fd55d 100644
--- a/resources/lang/zh-TW/admin/statuslabels/table.php
+++ b/resources/lang/zh-TW/admin/statuslabels/table.php
@@ -1,14 +1,14 @@
 <?php
 
 return array(
-    'about'      	=> '關於狀態標籤',
+    'about'      	=> 'About Status Types',
     'archived'      	=> '已封存',
     'create'      	=> '新增狀態標籤',
     'color'      	=> '圖標顏色',
     'default_label' => '預設標籤',
     'default_label_help' => '這用於確保在創建/編輯資產時, 最常用的狀態標籤出現在 "選擇" 框的頂部。',
     'deployable'      	=> '可部署',
-    'info'      	=> '狀態標籤用於描述資產的各種狀態（例如送外維修、遺失、被竊）。你可以為處於可部署、待處理或已封存的資產新增新的狀態標籤。',
+    'info'      	=> 'Status label types are used to describe the various states your assets could be in. They may be out for repair, lost/stolen, etc. You can create new status labels for your deployable, pending and archived assets according to your own workflow. For more information, <a href="https://snipe-it.readme.io/docs/overview#status-labels" target="_blank">see the documentation <i class="fa fa-external-link"></i></a>.',
     'name'      	=> '狀態名稱',
     'pending'      	=> '待處理',
     'status_type'   => '狀態類型',
diff --git a/resources/lang/zh-TW/admin/users/general.php b/resources/lang/zh-TW/admin/users/general.php
index 32a050fda9..b1182ed692 100644
--- a/resources/lang/zh-TW/admin/users/general.php
+++ b/resources/lang/zh-TW/admin/users/general.php
@@ -19,6 +19,8 @@ return [
     'print_assigned'    => '列印所有分配的',
     'email_assigned'    => '電子郵件所有分配的清單',
     'user_notified'     => '使用者已透過電子郵件接收他們目前分配的項目清單。',
+    'users_notified'    => 'The user has been emailed a list of their currently assigned items.|:count users have been emailed a list of their currently assigned items.',
+    'users_notified_warning' => ':count user has been emailed a list of their currently assigned items, however :no_email users did not have an email address so could not be emailed.|:count users have been emailed a list of their currently assigned items, however :no_email user(s) did not have an email address so could not be emailed.',
     'auto_assign_label' => '自動分配可用軟體授權時包含此使用者',
     'auto_assign_help'  => '自動分配可用軟體授權時跳過此使用者',
     'software_user'     => ':name 借出的軟體',
diff --git a/resources/lang/zh-TW/admin/users/message.php b/resources/lang/zh-TW/admin/users/message.php
index 8c503b7ec2..ff005347b7 100644
--- a/resources/lang/zh-TW/admin/users/message.php
+++ b/resources/lang/zh-TW/admin/users/message.php
@@ -6,7 +6,7 @@ return array(
     'declined'                  => '您已拒絕這項資產。',
     'bulk_manager_warn'	        => '您的使用者已成功更新，但主管條目未保存，因為您選擇的主管也在要編輯的使用者列表中，使用者不能是自己的主管。 請再次選擇您的使用者並排除主管。',
     'user_exists'               => '使用者已存在！',
-    'user_not_found'            => '找不到使用者。',
+    'user_not_found'            => 'User does not exist or you do not have permission view them.',
     'user_login_required'       => '登入欄位是必需的',
     'user_has_no_assets_assigned' => 'No assets currently assigned to user.',
     'user_password_required'    => '密碼欄位是必需的',
@@ -53,6 +53,7 @@ return array(
         'ldap_could_not_search' => '查詢 LDAP 伺服器失敗，請檢查 LDAP 設定文件中的相關設定。<br>LDAP 伺服器錯誤訊息：',
         'ldap_could_not_get_entries' => ' LDAP 伺服器取得資訊條目失敗，請檢查 LDAP 設定文件中的相關設定。<br>LDAP 伺服器錯誤訊息：',
         'password_ldap' => '此帳戶的密碼由 LDAP/AD 管理。若要更改您的密碼，請聯繫您的 IT 部門。 ',
+        'multi_company_items_assigned' => 'This user has items assigned that belong to a different company. Please check them in or edit their company.'
     ),
 
     'deletefile' => array(
diff --git a/resources/lang/zh-TW/admin/users/table.php b/resources/lang/zh-TW/admin/users/table.php
index 1286ff8cee..9370b3f7bf 100644
--- a/resources/lang/zh-TW/admin/users/table.php
+++ b/resources/lang/zh-TW/admin/users/table.php
@@ -22,7 +22,7 @@ return array(
     'managed_locations'     => '管理位置',
     'managed_users'         => 'Managed Users',
     'name' 					=> '名字',
-    'nogroup'               => '尚未建立任何群組。要新增群組，請訪問: ',
+    'nogroup'               => '尚未建立任何群組。要新增群組，請訪問:',
     'notes'                 => '備註',
     'password_confirm' 		=> '確認密碼',
     'password' 				=> '密碼',
diff --git a/resources/lang/zh-TW/auth.php b/resources/lang/zh-TW/auth.php
index d15cfdf78f..1238018166 100644
--- a/resources/lang/zh-TW/auth.php
+++ b/resources/lang/zh-TW/auth.php
@@ -15,6 +15,6 @@ return array(
 
     'failed' => '此憑證與我們的紀錄不符',
     'password' => '輸入的密碼不正確',
-    'throttle' => '登入嘗試次數過多，請在 :seconds 秒後重試',
+    'throttle' => 'Too many login attempts. Please try again in :minutes minute(s).',
 
 );
diff --git a/resources/lang/zh-TW/auth/message.php b/resources/lang/zh-TW/auth/message.php
index 2c8f111e47..adbe87222d 100644
--- a/resources/lang/zh-TW/auth/message.php
+++ b/resources/lang/zh-TW/auth/message.php
@@ -6,8 +6,6 @@ return array(
     'account_not_found'      => '使用者或密碼錯誤',
     'account_not_activated'  => '使用者尚未啟用',
     'account_suspended'      => '使用者已被停用',
-    'account_banned'         => '使用者已被禁用',
-    'throttle'               => '登入失敗次數太多。請 :minutes 分鐘後再試。',
 
     'two_factor' => array(
         'already_enrolled'      => '您的設備已經註冊',
diff --git a/resources/lang/zh-TW/button.php b/resources/lang/zh-TW/button.php
index a425c0f276..8265545253 100644
--- a/resources/lang/zh-TW/button.php
+++ b/resources/lang/zh-TW/button.php
@@ -7,6 +7,7 @@ return [
     'checkin_and_delete'  	    => '全部繳回 / 刪除使用者',
     'delete'  	                => '刪除',
     'edit'    	                => '編輯',
+    'clone'    	                => 'Clone',
     'restore' 	                => '還原',
     'remove'                    => '移除',
     'request'                   => '申請',
@@ -21,4 +22,13 @@ return [
     'add_maintenance'           => '新增維護',
     'append'                    => '追加',
     'new'                       => '新增',
+    'var' => [
+        'clone'     => 'Clone :item_type',
+        'edit'      => 'Edit :item_type',
+        'delete'    => 'Delete :item_type',
+        'restore'   => 'Restore :item_type',
+        'create'    => 'Create New :item_type',
+        'checkout'  => 'Checkout :item_type',
+        'checkin'   => 'Checkin :item_type',
+    ]
 ];
diff --git a/resources/lang/zh-TW/general.php b/resources/lang/zh-TW/general.php
index 11e36a24d8..ee4db72e41 100644
--- a/resources/lang/zh-TW/general.php
+++ b/resources/lang/zh-TW/general.php
@@ -10,9 +10,9 @@ return [
     'action'                => '操作',
     'activity_report'		=> '活動報告',
     'address'				=> '地址',
-    'admin'					=> '管理員',
+    'admin'					=> 'Admin Settings',
     'admin_tooltip'			=> 'This user has admin privileges',
-    'superuser'				=> 'Superuser',
+    'superuser'				=> '超級使用者',
     'superuser_tooltip'		=> 'This user has superuser privileges',
     'administrator'			=> '管理員',
     'add_seats'             => '新增授權',
@@ -23,13 +23,16 @@ return [
     'asset_models'			=> '資產樣板',
     'asset_model'			=> '模型',
     'asset'					=> '資產',
+    'asset_previous'        => 'Asset (Previously Assigned)',
     'asset_report'          => '資產報告',
     'asset_tag'				=> '資產標籤',
     'asset_tags'            => '資產標籤',
     'assets_available'		=> '可用資產',
     'accept_assets'         => '接受資產',
     'accept_assets_menu'    => '授權資產',
+    'accept_item'           => 'Accept Item',
     'audit'				    => '稽核',
+    'audits'				=> 'Audits',
     'audit_report'			=> '稽核記錄',
     'assets'				=> '資產',
     'assets_audited'        => '已稽核資產',
@@ -61,9 +64,12 @@ return [
     'changepassword'  		=> '更改密碼',
     'checkin'  				=> '繳回',
     'checkin_from'  		=> '繳回來源',
+    'checkin_note'  		=> 'Checkin Note',
+    'checkout_note'  		=> 'Checkout Note',
     'checkout'  			=> '借出',
     'checkouts_count'       => '借出',
     'checkins_count'        => '繳回',
+    'checkin_and_delete'  	=> 'Checkin and Delete',
     'user_requests_count'   => '申請',
     'city'  				=> '城市',
     'click_here'			=> '點擊這裡',
@@ -77,7 +83,7 @@ return [
     'consumables'			=> '耗材',
     'country'  				=> '國家',
     'could_not_restore'     => '還原錯誤 :item_type: :error',
-    'not_deleted'           => '此 :item_type 未被刪除，因此無法還原。',
+    'not_deleted'           => 'The :item_type was not deleted and therefore cannot be restored',
     'create'				=> '新增',
     'created'               => '項目已新增',
     'created_asset'			=> '新增資產',
@@ -86,11 +92,13 @@ return [
     'record_created' 		=> '記錄已建立',
     'updated_at' 			=> '更新日',
     'currency'  			=> '$', // this is deprecated
+    'currency_text'  		=> '幣別', //
     'current'  				=> '目前',
     'current_password'      => '目前的密碼',
     'customize_report'      => '自訂報告',
     'custom_report'         => '自訂資產報告',
     'dashboard'				=> '儀表板',
+    'data_source'           => 'Data Source',
     'days'      			=> '天',
     'days_to_next_audit'    => '下次稽核時間（天）',
     'date'					=> '日期',
@@ -98,7 +106,7 @@ return [
     'debug_warning_text'    => '此應用程式已開啟除錯模式， 如果開放外部存取可能造成敏感資料外洩。您可透過修改<code>.env</code>檔案中的參數<code>APP_DEBUG</code>，將值改為<code>false</code>關閉除錯模式。',
     'delete'  				=> '刪除',
     'delete_confirm'  		=> '您確定要刪除 :item 嗎？',
-    'delete_confirm_no_undo' => '您確定要刪除 :item 嗎？此操作無法復原。',
+    'delete_confirm_no_undo' => 'Are you sure, you wish to delete :item? This cannot be undone.',
     'deleted'  				=> '刪除',
     'delete_seats'  		=> '刪除授權',
     'deletion_failed'       => '刪除失敗',
@@ -114,29 +122,13 @@ return [
     'editprofile'  			=> '編輯個人資料',
     'eol'					=> 'EOL',
     'email_domain'			=> 'Email 域名',
-    'email_format'			=> 'Email 格式',
     'employee_number'       => '員工編號',
     'email_domain_help'		=> '這用在匯入時產生電子郵件地址',
     'error'				    => '錯誤',
     'exclude_archived'      => '不包括已封存的資產',
     'exclude_deleted'       => '不包括已刪除的資產',
     'example'				=> '範例: ',
-    'filastname_format'			=> '縮寫名 姓，例如 (jsmith@example.com)',
-    'firstname_lastname_format'	=> '名 姓，例如 (jane.smith@example.com)',
-    'firstname_lastname_underscore_format' => '名字姓氏，例如（jane_smith@example.com）',
-    'lastnamefirstinitial_format' =>  '姓氏首字母（smithj@example.com）',
-    'firstintial_dot_lastname_format' => '姓氏與名首子母 (j.smith@example.com)',
-    'firstname_lastname_display'	=> 'First Name Last Name (Jane Smith)',
-    'lastname_firstname_display'	=> 'Last Name First Name (Smith Jane)',
-    'name_display_format'	=> '名稱顯示格式',
-    'first'					=> '首頁',
-    'firstnamelastname'     => '全名 (janesmith@example.com)',
-    'lastname_firstinitial' => '姓氏與名首字母 (smith_j@example.com)',
-    'firstinitial.lastname' => '姓氏與名首子母 (j.smith@example.com)',
-    'firstnamelastinitial'  => '名字與姓首字母 (janes@example.com)',
-    'lastnamefirstname'      => 'Last Name First Name (smith.jane@example.com)',
-    'first_name'			=> '名字',
-    'first_name_format'		=> '名，例如 (jane@example.com)',
+
     'files'                 => '檔案',
     'file_name'				=> '檔案',
     'file_type'             => '檔案類型',
@@ -156,9 +148,9 @@ return [
     'image_delete'         	=> '刪除圖片',
     'include_deleted'       => '包含已刪除的資產',
     'image_upload'         	=> '上傳圖片',
-    'filetypes_accepted_help'    => '接受的檔案類型為 :types。允許的最大上傳大小為 :size。',
-    'filetypes_size_help'   => '上傳檔案大小上限為 :size',
-    'image_filetypes_help'  => 'Accepted filetypes are jpg, webp, png, gif, svg, and avif. Max upload size allowed is :size.',
+    'filetypes_accepted_help'    => 'Accepted filetype is :types. The maximum size allowed is :size.|Accepted filetypes are :types. The maximum upload size allowed is :size.',
+    'filetypes_size_help'   => 'The maximum upload size allowed is :size.',
+    'image_filetypes_help'  => 'Accepted Filetypes are jpg, webp, png, gif, svg, and avif. The maximum upload size allowed is :size.',
     'unaccepted_image_type'  => '此影像無法被讀取。可接受的檔案格式為 jpg, webp, png, gif 以及 svg。此影像的 mimetype 為 :mimetype。',
     'import'         	    => '匯入',
     'import_this_file'      => 'Map fields and process this file',
@@ -178,12 +170,17 @@ return [
     'last'					=> '最後頁',
     'last_login'            => '最後登入',
     'last_name'             => '姓氏',
+    'firstname_lastname_display'	=> '名稱及姓氏(小明 王)',
+    'lastname_firstname_display'	=> '姓氏及名稱(王 小明)',
+    'name_display_format'	=> '名稱顯示格式',
+    'first'					=> '首頁',
+    'first_name'			=> '名字',
     'license'				=> '授權',
     'license_report'        => '授權報告',
     'licenses_available'	=> 'Licenses available',
     'licenses'				=> '授權',
     'list_all'				=> '列出全部',
-    'loading'				=> '正在載入，請稍候....',
+    'loading'				=> '正在載入，請稍候...',
     'lock_passwords'        => '此欄位值不會儲存在 Demo 安裝.',
     'feature_disabled'      => '演示模式下禁用此功能',
     'location'              => '位置',
@@ -193,7 +190,7 @@ return [
     'logout'				=> '登出',
     'lookup_by_tag'     => '尋找資產標籤',
     'maintenances'          => '維護',
-    'manage_api_keys'       => '管理 API 金鑰',
+    'manage_api_keys'       => 'Manage API keys',
     'manufacturer'			=> '製造商',
     'manufacturers'			=> '製造商',
     'markdown'				=> '此欄位可以使用 <a href="https://help.github.com/articles/github-flavored-markdown/">Github flavored markdown</a>.',
@@ -215,6 +212,14 @@ return [
     'no_results'			=> '沒有結果',
     'no'  					=> '否',
     'notes'  				=> '備註',
+    'note_added'            => 'Note Added',
+    'options'				=> 'Options',
+    'preview'				=> 'Preview',
+    'add_note'              => 'Add Note',
+    'note_edited'            => 'Note Edited',
+    'edit_note'              => 'Edit Note',
+    'note_deleted'            => 'Note Deleted',
+    'delete_note'              => 'Delete Note',
     'order_number'          => '採購單號',
     'only_deleted'          => '只有已刪除的資產',
     'page_menu'				=> '顯示選項',
@@ -229,7 +234,7 @@ return [
     'purchase_date'         => '採購日期',
     'qty'		            => '數量',
     'quantity'		        => '數量',
-    'quantity_minimum'      => '您有 :count 項目的數量低於或接近最小數量',
+    'quantity_minimum'      => 'You have one item below or almost below minimum quantity levels|You have :count items below or almost below minimum quantity levels',
     'quickscan_checkin'  	=> '快速掃描歸還',
     'quickscan_checkin_status'  	=> '繳回狀態',
     'ready_to_deploy'		=> '準備部署',
@@ -254,7 +259,7 @@ return [
     'select_all'            => '全部選取',
     'search'				=> '搜尋',
     'select_category'       => '選擇一個類別',
-    'select_datasource' => 'Select a Datasource',
+    'select_datasource' => 'Select a data source',
     'select_department'     => '選擇部門',
     'select_depreciation'	=> '選擇折舊類型',
     'select_location'		=> '選擇位置',
@@ -274,13 +279,15 @@ return [
     'signed_off_by'         => '簽署者',
     'skin'       			=> '主題',
     'webhook_msg_note'        => '將透過 webhook 傳送通知',
-    'webhook_test_msg'        => '嗨！看起來您的 Snipe-IT 與 :app 的整合運作正常！',
+    'webhook_test_msg'        => 'Oh hai! It looks like your :app integration with Snipe-IT is working!',
     'some_features_disabled' => '演示模式︰ 此安裝禁用某些功能。',
     'site_name'				=> '網站名稱',
     'state'  				=> '省份',
     'status_labels'			=> '狀態標籤',
+    'status_label'			=> 'Status Label',
     'status'    			=> '狀態',
     'accept_eula'           => '接受 EULA',
+    'show_or_hide_eulas' => 'Show/Hide EULAs',
     'supplier'              => '供應商',
     'suppliers'  			=> '供應商',
     'sure_to_delete'        => '您確定要刪除嗎？',
@@ -296,9 +303,9 @@ return [
     'type'  				=> '類型',
     'undeployable'			=> '不可佈署',
     'unknown_admin'			=> '未知管理員',
-    'username_format'		=> '使用者名稱格式',
     'username'              => '使用者名稱',
     'update'                => '更新',
+    'updating_item' => 'Updating :item',
     'upload_filetypes_help'      => '允許的檔案類別為 png, gif, jpg, jpeg, doc, docx, pdf, xls, xlsx, txt, lic, xml, zip, rtf 與 rar. 最大允許上傳的大小是 :size.',
     'uploaded'              => '已上傳',
     'user'					=> '使用者',
@@ -323,10 +330,10 @@ return [
     'token_expired'         => '表單已過期，請重新送出',
     'login_enabled'         => '登入已啟用',
     'audit_due'             => '審核到期',
-    'audit_due_days'        => 'Assets Due for Audit Within :days Day|Assets Due for Audit Within :days Days',
+    'audit_due_days'        => '{}Assets Due or Overdue for Audit|[1]Assets Due or Overdue for Audit Within a Day|[2,*]Assets Due or Overdue for Audit Within :days Days',
     'checkin_due'           => 'Due for Checkin',
     'checkin_overdue'       => 'Overdue for Checkin',
-    'checkin_due_days'      => 'Assets Due for Checkin Within :days Day|Assets Due for Checkin Within :days Days',
+    'checkin_due_days'      => '{}Due for Checkin|[1]Assets Due for Checkin Within :days Day|[2,*]Assets Due for Checkin Within :days Days',
     'audit_overdue'         => '審核過期',
     'accept'                => '接受 :asset',
     'i_accept'              => '我接受',
@@ -339,16 +346,16 @@ return [
     'view_all'              => '檢視全部',
     'hide_deleted'          => '隱藏已刪除',
     'email'                 => '電子郵件',
-    'do_not_change'         => '請勿更動',
-    'bug_report'            => '回報問題',
+    'do_not_change'         => 'Do not change',
+    'bug_report'            => 'Report a bug',
     'user_manual'           => '使用者手冊',
     'setup_step_1'          => '步驟 1',
     'setup_step_2'          => '步驟 2',
     'setup_step_3'          => '步驟 3',
     'setup_step_4'          => '步驟 4',
     'setup_config_check'    => '檢查設定',
-    'setup_create_database' => '建立資料庫欄位',
-    'setup_create_admin'    => '建立管理員',
+    'setup_create_database' => 'Create database tables',
+    'setup_create_admin'    => 'Create an admin user',
     'setup_done'            => '完成!',
     'bulk_edit_about_to'    => '您即將編輯以下項目：',
     'checked_out'           => '已領用',
@@ -383,6 +390,8 @@ return [
     'new_license'           => '新增授權',
     'new_accessory'         => '新增配件',
     'new_consumable'        => '新增耗材',
+    'new_component'         => 'New Component',
+    'new_user'              => 'New User',
     'collapse'              => '收起',
     'assigned'              => '已分配',
     'asset_count'           => '資產數量',
@@ -418,19 +427,20 @@ return [
     'bulk_soft_delete'      =>'同時將這些使用者標記為已刪除。他們的資產歷史將保持完整，除非/直到您在管理設定中清除已刪除的記錄。',
     'bulk_checkin_delete_success' => '您選擇的使用者已被刪除，他們的項目已經歸還。',
     'bulk_checkin_success' => '已為選擇的使用者歸還項目。',
-    'set_to_null'           => '刪除此資產的值|刪除所有 :asset_count 資產的值 ',
+    'set_to_null'           => 'Delete values for this selection|Delete values for all :selection_count selections ',
     'set_users_field_to_null'  => '刪除此使用者的 :field 值|刪除所有 :user_count 使用者的 :field 值 ',
     'na_no_purchase_date'   => 'N/A - 未提供採購日期',
     'assets_by_status'      => '按狀態的資產',
     'assets_by_status_type'      => '按狀態類型的資產',
     'pie_chart_type'        => '儀表板圓餅圖類型',
     'hello_name'            => '你好, :name!',
-    'unaccepted_profile_warning'   => '您有 :count 項目需要接受。點選這裡接受或拒絕它們',
+    'unaccepted_profile_warning'   => 'You have one item requiring acceptance. Click here to accept or decline it | You have :count items requiring acceptance. Click here to accept or decline them',
     'start_date'            => '開始日期',
     'end_date'            => '結束日期',
     'alt_uploaded_image_thumbnail' => '已上傳的縮圖',
     'placeholder_kit'       => '選擇一個套件',
     'file_not_found'        => '找不到檔案',
+    'log_record_not_found'  => 'No record for that log entry was found.',
     'preview_not_available' => '(無法預覽)',
     'setup'                 => '設定',
     'pre_flight'            => '預先檢查',
@@ -512,7 +522,7 @@ return [
     'checked_out_to_fields' => 'Checked Out To Fields',
     'percent_complete' => '% 完成',
     'uploading' => '上傳中... ',
-    'upload_error' => '上傳檔案錯誤，請檢查是否有空行，列名稱是否重複。',
+    'upload_error' => 'Error uploading file. Please check that you have no empty rows or duplicated column names in your CSV, and that the server permissions allow uploads.',
     'copy_to_clipboard' => '複製到剪貼簿',
     'copied' => '已複製!',
     'status_compatibility' => 'If assets are already assigned, they cannot be changed to a non-deployable status type and this value change will be skipped.',
@@ -522,7 +532,7 @@ return [
     'action_permission_generic' => '您沒有權限做 :action this :item_type',
     'edit' => '編輯',
     'action_source' => '行動來源',
-    'or' => 'or',
+    'or' => '或',
     'url'                   => '網址',
     'edit_fieldset' => 'Edit fieldset fields and options',
     'permission_denied_superuser_demo' => 'Permission denied. You cannot update user information for superadmins on the demo.',
@@ -549,6 +559,71 @@ return [
         'license_seats'  => ':count License Seat|:count License Seats',
         'consumables'  => ':count Consumable|:count Consumables',
         'components'  => ':count Component|:count Components',
-    ]
+    ],
+
+    'more_info' => '更多資訊',
+    'quickscan_bulk_help' => 'Checking this box will edit the asset record to reflect this new location. Leaving it unchecked will simply note the location in the audit log. Note that if this asset is checked out, it will not change the location of the person, asset or location it is checked out to.',
+    'whoops' => 'Whoops!',
+    'something_went_wrong' => 'Something went wrong with your request.',
+    'close' => 'Close',
+    'expires' => '過期',
+    'map_fields'=> 'Map :item_type Fields',
+    'remaining_var' => ':count Remaining',
+    'label' => 'Label',
+    'import_asset_tag_exists' => 'An asset with the asset tag :asset_tag already exists and an update was not requested. No change was made.',
+    'countries_manually_entered_help' => 'Values with an asterisk (*) were manually entered and do not match existing ISO 3166 dropdown values',
+    'accessories_assigned' => 'Assigned Accessories',
+    'user_managed_passwords' => 'Password Management',
+    'user_managed_passwords_disallow' => 'Disallow users from managing their own passwords',
+    'user_managed_passwords_allow' => 'Allow users to manage their own passwords',
+    'from' => 'From',
+    'by' => '經由',
+
+// Add form placeholders here
+    'placeholders' => [
+        'notes'  => 'Add a note',
+    ],
+
+    'breadcrumb_button_actions' => [
+        'edit_item' => 'Edit :name',
+        'checkout_item' => 'Checkout :name',
+        'checkin_item' => 'Checkin :name',
+    ],
+
+    'skins' => [
+        'site_default' => 'Site Default',
+        'default_blue' => 'Default Blue',
+        'blue_dark' => 'Blue (Dark Mode)',
+        'green' => 'Green Dark',
+        'green_dark' => 'Green (Dark Mode)',
+        'red' => 'Red Dark',
+        'red_dark' => 'Red (Dark Mode)',
+        'orange' => 'Orange Dark',
+        'orange_dark' => 'Orange (Dark Mode)',
+        'black' => 'Black',
+        'black_dark' => 'Black (Dark Mode)',
+        'purple' => 'Purple',
+        'purple_dark' => 'Purple (Dark Mode)',
+        'yellow' => 'Yellow',
+        'yellow_dark' => 'Yellow (Dark Mode)',
+        'high_contrast' => 'High Contrast',
+
+    ],
+
+    'select_all_none' => 'Select/Unselect All',
+    'generic_model_not_found' => 'That :model was not found or you do not have permission to access it',
+    'deleted_models' => 'Deleted Asset Models',
+    'deleted_users' => 'Deleted Users',
+    'cost_each' => ':amount each',
+    'remove_current_image' => 'Remove current :type image',
+
+    'seeding' => [
+        'manufacturers' => [
+            'button' => 'Create Manufacturers',
+            'prompt' => 'You do not have any manufacturers yet. Would you like to seed a list of common manufacturers? (THIS WILL OVERWRITE EXISTING MANUFACTURERS, including those that have been soft-deleted.)',
+            'success' => 'Manufacturers seeded successfully',
+            'error' => 'Could not seed manufacturers. A manufacturer record already exists and seeding would overwrite it.|Could not seed manufacturers. :count manufacturer records already exist and seeding would overwrite them.',
+        ],
+    ],
 
 ];
diff --git a/resources/lang/zh-TW/localizations.php b/resources/lang/zh-TW/localizations.php
index ac89b30746..1e9c0561d0 100644
--- a/resources/lang/zh-TW/localizations.php
+++ b/resources/lang/zh-TW/localizations.php
@@ -2,7 +2,7 @@
 
 return [
 
-    'select_language' => '選擇語言',
+    'select_language' => 'Select a Language',
     'languages' => [
         'en-US'=> '美式英語',
         'en-GB'=> '英式英語',
@@ -40,7 +40,9 @@ return [
         'ms-MY'=> '馬來語',
         'mi-NZ'=> '毛利語',
         'mn-MN'=> '蒙古語',
-        'no-NO'=> '挪威語',
+        'nb-NO'=> 'Norwegian Bokmål',
+        'om-ET' => 'Oromo (Ethiopian)',
+        //'nn-NO'=> 'Norwegian Nynorsk',
         'fa-IR'=> '波斯語',
         'pl-PL'=> '波蘭語',
         'pt-PT'=> '葡萄牙語',
@@ -66,7 +68,7 @@ return [
         'zu-ZA'=> '祖魯語',
     ],
 
-    'select_country' => '選擇一個國家',
+    'select_country' => 'Select a Country',
     
     'countries' => [
         'AC'=>'阿森松島',
@@ -133,6 +135,7 @@ return [
         'EC'=>'厄瓜多',
         'EE'=>'愛沙尼亞',
         'EG'=>'埃及',
+        'GB-ENG'=>'England',
         'ER'=>'厄利垂亞',
         'ES'=>'西班牙',
         'ET'=>'衣索比亞',
@@ -231,6 +234,7 @@ return [
         'NG'=>'奈及利亞',
         'NI'=>'尼加拉瓜',
         'NL'=>'荷蘭',
+        'GB-NIR' => 'Northern Ireland',
         'NO'=>'挪威',
         'NP'=>'尼泊爾',
         'NR'=>'諾魯',
@@ -258,7 +262,7 @@ return [
         'RU'=>'俄羅斯',
         'RW'=>'盧安達',
         'SA'=>'沙烏地阿拉伯',
-        'UK'=>'英國',
+        'GB-SCT'=>'英國',
         'SB'=>'索羅門群島',
         'SC'=>'塞席爾',
         'SS'=>'南蘇丹',
@@ -310,6 +314,7 @@ return [
         'VI'=>'美屬維京群島',
         'VN'=>'越南',
         'VU'=>'萬那杜',
+        'GB-WLS' =>'Wales',
         'WF'=>'瓦利斯和富圖納群島',
         'WS'=>'薩摩亞',
         'YE'=>'葉門',
diff --git a/resources/lang/zh-TW/mail.php b/resources/lang/zh-TW/mail.php
index 46bf60a455..cb351eede7 100644
--- a/resources/lang/zh-TW/mail.php
+++ b/resources/lang/zh-TW/mail.php
@@ -23,24 +23,25 @@ return [
     'Item_Requested' => '已申請物品',
     'License_Checkin_Notification' => '授權繳回',
     'License_Checkout_Notification' => 'License checked out',
+    'license_for'   => 'License for',
     'Low_Inventory_Report' => '低庫存報告',
     'a_user_canceled' => '使用者已取消項目申請',
     'a_user_requested' => '使用者已申請項目',
     'acceptance_asset_accepted' => '使用者已接收一項物品',
     'acceptance_asset_declined' => '使用者已拒絕一項物品',
-    'accessory_name' => '配件名稱：',
-    'additional_notes' => '備註：',
+    'accessory_name' => '配件名稱',
+    'additional_notes' => 'Additional Notes',
     'admin_has_created' => '管理員已在 :web 為您新增帳號',
-    'asset' => '資產：',
-    'asset_name' => '資產名稱：',
+    'asset' => '資產',
+    'asset_name' => '資產名稱',
     'asset_requested' => '申請資產',
     'asset_tag' => '資產標籤',
     'assets_warrantee_alert' => '有 :count 項資產的保固將在接下來的 :threshold 天內到期。|有 :count 項資產的保固將在接下來的 :threshold 天內到期。',
     'assigned_to' => '分配給',
     'best_regards' => 'Best regards,',
-    'canceled' => '取消：',
-    'checkin_date' => '繳回日期：',
-    'checkout_date' => '借出日期：',
+    'canceled' => 'Canceled',
+    'checkin_date' => '繳回日期',
+    'checkout_date' => '借出日期',
     'checkedout_from' => 'Checked out from',
     'checkedin_from'  => 'Checked in from',
     'checked_into' => 'Checked into',
@@ -49,13 +50,14 @@ return [
     'click_to_confirm' => '請點擊鏈結啟用您 :web 的帳戶：',
     'current_QTY' => '目前數量',
     'days' => '日',
-    'expecting_checkin_date' => '預計歸還日期：',
+    'expecting_checkin_date' => '預計歸還日期',
     'expires' => '過期',
     'hello' => 'Hello',
     'hi' => 'Hi',
     'i_have_read' => '我同意使用條款，並且已經收到物品。',
     'inventory_report' => '庫存報告',
-    'item' => '項目：',
+    'item' => '項目',
+    'item_checked_reminder' => 'This is a reminder that you currently have :count items checked out to you that you have not accepted or declined. Please click the link below to confirm your decision.',
     'license_expiring_alert' => '有 :count 個授權將在 :threshold 天後到期。|有 :count 個授權將在 :threshold 天後到期。',
     'link_to_update_password' => '請點擊以下鏈結以更新 :web 的密碼：',
     'login' => '登入',
@@ -64,6 +66,8 @@ return [
     'min_QTY' => '最小數量',
     'name' => '名字',
     'new_item_checked' => '一項新物品已分配至您的名下，詳細資訊如下。',
+    'new_item_checked_with_acceptance' => 'A new item has been checked out under your name that requires acceptance, details are below.',
+    'recent_item_checked' => 'An item was recently checked out under your name that requires acceptance, details are below.',
     'notes' => '備註',
     'password' => '密碼',
     'password_reset' => '密碼重設',
@@ -86,8 +90,10 @@ return [
     'upcoming-audits' => '有 :count 項資產將在接下來的 :threshold 天內進行稽核。|有 :count 項資產將在接下來的 :threshold 天內進行稽核。',
     'user' => '使用者',
     'username' => '使用者名稱',
+    'unaccepted_asset_reminder' => 'Reminder: You have Unaccepted Assets.',
     'welcome' => '歡迎您 :name',
     'welcome_to' => '歡迎來到 :web！',
     'your_assets' => '查看您的資產',
     'your_credentials' => '您的 Snipe-IT 憑證',
+    'mail_sent' => 'Mail sent successfully!',
 ];
diff --git a/resources/lang/zh-TW/validation.php b/resources/lang/zh-TW/validation.php
index 432e9d2817..e5658cf9d1 100644
--- a/resources/lang/zh-TW/validation.php
+++ b/resources/lang/zh-TW/validation.php
@@ -13,87 +13,150 @@ return [
     |
     */
 
-    'accepted'             => ':attribute 必須接受',
-    'active_url'           => '屬性不是有效的URL',
-    'after'                => ':attribute 必須在 :date 之後',
-    'after_or_equal'       => ':attribute 必須在 :date 之後',
-    'alpha'                => ':attribute 只能包含字母',
-    'alpha_dash'           => ':attribute 只能包含字母，數字和\'-\'',
-    'alpha_num'            => ':attribute 只允許字母和數字',
-    'array'                => ':attribute 必須是陣列',
-    'before'               => ':attribute 必須在 :date 之前',
-    'before_or_equal'      => ':attribute 必須在 :date 之前',
-    'between'              => [
-        'numeric' => ':attribute 必須在 :min - :max 之間',
-        'file'    => ':attribute 必須在 :min - :max KB 之間',
-        'string'  => ':attribute 必須在 :min - :max 字元之間',
-        'array'   => ':attribute 必須在 :min 和 :max 之間',
+    'accepted' => 'The :attribute field must be accepted.',
+    'accepted_if' => 'The :attribute field must be accepted when :other is :value.',
+    'active_url' => 'The :attribute field must be a valid URL.',
+    'after' => 'The :attribute field must be a date after :date.',
+    'after_or_equal' => 'The :attribute field must be a date after or equal to :date.',
+    'alpha' => 'The :attribute field must only contain letters.',
+    'alpha_dash' => 'The :attribute field must only contain letters, numbers, dashes, and underscores.',
+    'alpha_num' => 'The :attribute field must only contain letters and numbers.',
+    'array' => 'The :attribute field must be an array.',
+    'ascii' => 'The :attribute field must only contain single-byte alphanumeric characters and symbols.',
+    'before' => 'The :attribute field must be a date before :date.',
+    'before_or_equal' => 'The :attribute field must be a date before or equal to :date.',
+    'between' => [
+        'array' => 'The :attribute field must have between :min and :max items.',
+        'file' => 'The :attribute field must be between :min and :max kilobytes.',
+        'numeric' => 'The :attribute field must be between :min and :max.',
+        'string' => 'The :attribute field must be between :min and :max characters.',
     ],
-    'boolean'              => ':attribute 必須是 true 或 false',
-    'confirmed'            => ':attribute 屬性不相符',
-    'date'                 => ':attribute 不是有效日期',
-    'date_format'          => ':attribute 不符合 :format 的格式',
-    'different'            => ':attribute 和 :other 不能相同',
-    'digits'               => ':attribute 必須是 :digits 數字',
-    'digits_between'       => ':attribute 必須在 :min 和 :max 之间',
-    'dimensions'           => ':attribute 屬性具有不正確圖像尺寸。',
-    'distinct'             => ':attribute 具有重複值',
-    'email'                => ':attribute 格式不正確',
-    'exists'               => '選擇的 :attribute 無效',
-    'file'                 => ':attribute 必須是檔案',
-    'filled'               => ':attribute 欄位必須有值。',
-    'image'                => ':attribute 必須是圖片格式',
+    'boolean' => 'The :attribute field must be true or false.',
+    'can' => 'The :attribute field contains an unauthorized value.',
+    'confirmed' => 'The :attribute field confirmation does not match.',
+    'contains' => 'The :attribute field is missing a required value.',
+    'current_password' => 'The password is incorrect.',
+    'date' => 'The :attribute field must be a valid date.',
+    'date_equals' => 'The :attribute field must be a date equal to :date.',
+    'date_format' => 'The :attribute field must match the format :format.',
+    'decimal' => 'The :attribute field must have :decimal decimal places.',
+    'declined' => 'The :attribute field must be declined.',
+    'declined_if' => 'The :attribute field must be declined when :other is :value.',
+    'different' => 'The :attribute field and :other must be different.',
+    'digits' => 'The :attribute field must be :digits digits.',
+    'digits_between' => 'The :attribute field must be between :min and :max digits.',
+    'dimensions' => 'The :attribute field has invalid image dimensions.',
+    'distinct' => ':attribute 具有重複值',
+    'doesnt_end_with' => 'The :attribute field must not end with one of the following: :values.',
+    'doesnt_start_with' => 'The :attribute field must not start with one of the following: :values.',
+    'email' => 'The :attribute field must be a valid email address.',
+    'ends_with' => 'The :attribute field must end with one of the following: :values.',
+    'enum' => '選擇的 :attribute 無效',
+    'exists' => '選擇的 :attribute 無效',
+    'extensions' => 'The :attribute field must have one of the following extensions: :values.',
+    'file' => 'The :attribute field must be a file.',
+    'filled' => ':attribute 欄位必須有值。',
+    'gt' => [
+        'array' => 'The :attribute field must have more than :value items.',
+        'file' => 'The :attribute field must be greater than :value kilobytes.',
+        'numeric' => 'The :attribute field must be greater than :value.',
+        'string' => 'The :attribute field must be greater than :value characters.',
+    ],
+    'gte' => [
+        'array' => 'The :attribute field must have :value items or more.',
+        'file' => 'The :attribute field must be greater than or equal to :value kilobytes.',
+        'numeric' => 'The :attribute field must be greater than or equal to :value.',
+        'string' => 'The :attribute field must be greater than or equal to :value characters.',
+    ],
+    'hex_color' => 'The :attribute field must be a valid hexadecimal color.',
+    'image' => 'The :attribute field must be an image.',
     'import_field_empty'    => ':fieldname 的值不能為空。',
-    'in'                   => '選擇的 :attribute 無效',
-    'in_array'             => ':attribute 屬性欄位不存在 :other。',
-    'integer'              => ':attribute 必須是整數',
-    'ip'                   => ':attribute 必須是有效 IP',
-    'ipv4'                 => ':attribute 必須是有效的 IPv4 位址',
-    'ipv6'                 => ':attribute 必須是有效的 IPv6 位址',
-    'is_unique_department' => ':attribute 必須對此公司位置具有唯一性',
-    'json'                 => ':attribute 必須是有效的 JSON 字串',
-    'max'                  => [
-        'numeric' => ':attribute 不可大於 :max',
-        'file'    => ':attribute 不可大於 :max KB',
-        'string'  => ':attribute 不可大於 :max 個字元',
-        'array'   => ':attribute 不可大於 :max 個項目',
+    'in' => '選擇的 :attribute 無效',
+    'in_array' => 'The :attribute field must exist in :other.',
+    'integer' => 'The :attribute field must be an integer.',
+    'ip' => 'The :attribute field must be a valid IP address.',
+    'ipv4' => 'The :attribute field must be a valid IPv4 address.',
+    'ipv6' => 'The :attribute field must be a valid IPv6 address.',
+    'json' => 'The :attribute field must be a valid JSON string.',
+    'list' => 'The :attribute field must be a list.',
+    'lowercase' => 'The :attribute field must be lowercase.',
+    'lt' => [
+        'array' => 'The :attribute field must have less than :value items.',
+        'file' => 'The :attribute field must be less than :value kilobytes.',
+        'numeric' => 'The :attribute field must be less than :value.',
+        'string' => 'The :attribute field must be less than :value characters.',
     ],
-    'mimes'                => ':attribute 檔案類型必須是 :values',
-    'mimetypes'            => ':attribute 檔案類型必須是 :values',
-    'min'                  => [
-        'numeric' => ':attribute 最少 :min',
-        'file'    => ':attribute 最小 :min KB',
-        'string'  => ':attribute 最少要有 :min 個字元',
-        'array'   => ':attribute 最少要有 :min 個項目',
+    'lte' => [
+        'array' => 'The :attribute field must not have more than :value items.',
+        'file' => 'The :attribute field must be less than or equal to :value kilobytes.',
+        'numeric' => 'The :attribute field must be less than or equal to :value.',
+        'string' => 'The :attribute field must be less than or equal to :value characters.',
     ],
-    'starts_with'          => ':attribute 必須以下列之一做為開頭: :values.',
-    'ends_with'            => ':attribute 必須以以下之一做為結尾: :values。',
+    'mac_address' => 'The :attribute field must be a valid MAC address.',
+    'max' => [
+        'array' => 'The :attribute field must not have more than :max items.',
+        'file' => 'The :attribute field must not be greater than :max kilobytes.',
+        'numeric' => 'The :attribute field must not be greater than :max.',
+        'string' => 'The :attribute field must not be greater than :max characters.',
+    ],
+    'max_digits' => 'The :attribute field must not have more than :max digits.',
+    'mimes' => 'The :attribute field must be a file of type: :values.',
+    'mimetypes' => 'The :attribute field must be a file of type: :values.',
+    'min' => [
+        'array' => 'The :attribute field must have at least :min items.',
+        'file' => 'The :attribute field must be at least :min kilobytes.',
+        'numeric' => 'The :attribute field must be at least :min.',
+        'string' => 'The :attribute field must be at least :min characters.',
+    ],
+    'min_digits' => 'The :attribute field must have at least :min digits.',
+    'missing' => 'The :attribute field must be missing.',
+    'missing_if' => 'The :attribute field must be missing when :other is :value.',
+    'missing_unless' => 'The :attribute field must be missing unless :other is :value.',
+    'missing_with' => 'The :attribute field must be missing when :values is present.',
+    'missing_with_all' => 'The :attribute field must be missing when :values are present.',
+    'multiple_of' => 'The :attribute field must be a multiple of :value.',
+    'not_in' => '選擇的 :attribute 無效',
+    'not_regex' => 'The :attribute field format is invalid.',
+    'numeric' => 'The :attribute field must be a number.',
+    'password' => [
+        'letters' => 'The :attribute field must contain at least one letter.',
+        'mixed' => 'The :attribute field must contain at least one uppercase and one lowercase letter.',
+        'numbers' => 'The :attribute field must contain at least one number.',
+        'symbols' => 'The :attribute field must contain at least one symbol.',
+        'uncompromised' => 'The given :attribute has appeared in a data leak. Please choose a different :attribute.',
+    ],
+    'percent'       => 'The depreciation minimum must be between 0 and 100 when depreciation type is percentage.',
 
-    'not_in'               => '選擇的 :attribute 無效',
-    'numeric'              => ':attribute 必須是數字',
-    'present'              => '：屬性字段必須存在。',
-    'valid_regex'          => '這不是一個有效的正則表達式。',
-    'regex'                => ':attribute 格式不正確',
-    'required'             => ':attribute 欄位必填',
-    'required_if'          => ':attribute 欄位在 :other 是 :value 時是必填的',
-    'required_unless'      => '需要：屬性字段，除非：other is in：values。',
-    'required_with'        => '當設定 :value 時，:attribute 欄位必填',
-    'required_with_all'    => '當：值存在時，需要：屬性字段。',
-    'required_without'     => '當設定非 :value 時，:attribute 欄位必填',
+    'present' => '：屬性字段必須存在。',
+    'present_if' => 'The :attribute field must be present when :other is :value.',
+    'present_unless' => 'The :attribute field must be present unless :other is :value.',
+    'present_with' => 'The :attribute field must be present when :values is present.',
+    'present_with_all' => 'The :attribute field must be present when :values are present.',
+    'prohibited' => 'The :attribute field is prohibited.',
+    'prohibited_if' => 'The :attribute field is prohibited when :other is :value.',
+    'prohibited_unless' => 'The :attribute field is prohibited unless :other is in :values.',
+    'prohibits' => 'The :attribute field prohibits :other from being present.',
+    'regex' => 'The :attribute field format is invalid.',
+    'required' => ':attribute 欄位必填',
+    'required_array_keys' => 'The :attribute field must contain entries for: :values.',
+    'required_if' => ':attribute 欄位在 :other 是 :value 時是必填的',
+    'required_if_accepted' => 'The :attribute field is required when :other is accepted.',
+    'required_if_declined' => 'The :attribute field is required when :other is declined.',
+    'required_unless' => '需要：屬性字段，除非：other is in：values。',
+    'required_with' => '當設定 :value 時，:attribute 欄位必填',
+    'required_with_all' => 'The :attribute field is required when :values are present.',
+    'required_without' => '當設定非 :value 時，:attribute 欄位必填',
     'required_without_all' => '當不存在：值時，需要：屬性字段。',
-    'same'                 => ':attribute 和 :other 必需相符',
-    'size'                 => [
-        'numeric' => ':attribute 必須是 :size',
-        'file'    => ':attribute 必須是 :size KB',
-        'string'  => ':attribute 必須是 :size 個字元',
-        'array'   => ':attribute 必須包含 :size 個項目',
+    'same' => 'The :attribute field must match :other.',
+    'size' => [
+        'array' => 'The :attribute field must contain :size items.',
+        'file' => 'The :attribute field must be :size kilobytes.',
+        'numeric' => 'The :attribute field must be :size.',
+        'string' => 'The :attribute field must be :size characters.',
     ],
+    'starts_with' => 'The :attribute field must start with one of the following: :values.',
     'string'               => ':attribute 必須是字串',
-    'timezone'             => '：屬性必須是有效區域。',
     'two_column_unique_undeleted' => 'The :attribute must be unique across :table1 and :table2. ',
-    'unique'               => ':attribute 已被採用',
-    'uploaded'             => ':attribute 上傳失敗',
-    'url'                  => ':attribute 格式不正確',
     'unique_undeleted'     => ':attribute 必須是唯一值',
     'non_circular'         => ':attribule 屬性不能建立一個循環參考',
     'not_array'            => ':attribute cannot be an array.',
@@ -102,11 +165,14 @@ return [
     'numbers'              => '密碼至少必須包含 1 個數字。',
     'case_diff'            => '密碼必須使用大小寫混合',
     'symbols'              => '密碼必須包含符號',
-    'gte'                  => [
-        'numeric'          => '值不能為負'
-    ],
-    'checkboxes'           => ':attribute contains invalid options.',
-    'radio_buttons'        => ':attribute is invalid.',
+    'timezone' => 'The :attribute field must be a valid timezone.',
+    'unique' => ':attribute 已被採用',
+    'uploaded' => ':attribute 上傳失敗',
+    'uppercase' => 'The :attribute field must be uppercase.',
+    'url' => 'The :attribute field must be a valid URL.',
+    'ulid' => 'The :attribute field must be a valid ULID.',
+    'uuid' => 'The :attribute field must be a valid UUID.',
+    'fmcs_location' => 'Full multiple company support and location scoping is enabled in the Admin Settings, and the selected location and selected company are not compatible.',
 
 
     /*
@@ -120,16 +186,22 @@ return [
     |
     */
 
+    'email_array'      => '一個或多個郵件地址不正確',
+    'checkboxes'           => ':attribute contains invalid options.',
+    'radio_buttons'        => ':attribute is invalid.',
+    
     'custom' => [
         'alpha_space' => ':attribute 含有無效字元',
-        'email_array'      => '一個或多個郵件地址不正確',
+
         'hashed_pass'      => '當前密碼不正確！',
         'dumbpwd'          => '該密碼太常見。',
         'statuslabel_type' => '您必須選擇一個有效的狀態標籤',
+        'custom_field_not_found'          => 'This field does not seem to exist, please double check your custom field names.',
+        'custom_field_not_found_on_model' => 'This field seems to exist, but is not available on this Asset Model\'s fieldset.',
 
         // date_format validation with slightly less stupid messages. It duplicates a lot, but it gets the job done :(
-        // We use this because the default error message for date_format is reflects php Y-m-d, which non-PHP
-        // people won't know how to format. 
+        // We use this because the default error message for date_format reflects php Y-m-d, which non-PHP
+        // people won't know how to format.
         'purchase_date.date_format'     => ':attribute 必須是 YYYY-MM-DD 格式的有效日期',
         'last_audit_date.date_format'   =>  ':attribute 必須是 YYYY-MM-DD hh:mm:ss 格式的有效日期',
         'expiration_date.date_format'   =>  ':attribute 必須是 YYYY-MM-DD 格式的有效日期',
@@ -137,9 +209,15 @@ return [
         'expected_checkin.date_format'  =>  ':attribute 必須是 YYYY-MM-DD 格式的有效日期',
         'start_date.date_format'        =>  ':attribute 必須是 YYYY-MM-DD 格式的有效日期',
         'end_date.date_format'          =>  ':attribute 必須是 YYYY-MM-DD 格式的有效日期',
+        'invalid_value_in_field' => 'Invalid value included in this field',
 
-    ],
+        'ldap_username_field' => [
+            'not_in' =>         '<code>sAMAccountName</code> (mixed case) will likely not work. You should use <code>samaccountname</code> (lowercase) instead.'
+        ],
+        'ldap_auth_filter_query' => ['not_in' => '<code>uid=samaccountname</code> is probably not a valid auth filter. You probably want <code>uid=</code> '],
+        'ldap_filter' => ['regex' => 'This value should probably not be wrapped in parentheses.'],
 
+        ],
     /*
     |--------------------------------------------------------------------------
     | Custom Validation Attributes
@@ -155,8 +233,16 @@ return [
 
     /*
     |--------------------------------------------------------------------------
-    | Generic Validation Messages
+    | Generic Validation Messages - we use these in the jquery validation where we don't have
+    | access to the :attribute
     |--------------------------------------------------------------------------
     */
-    'invalid_value_in_field' => 'Invalid value included in this field',
+
+    'generic' => [
+        'invalid_value_in_field' => 'Invalid value included in this field',
+        'required' => 'This field is required',
+        'email' => 'Please enter a valid email address',
+    ],
+
+
 ];
diff --git a/resources/lang/zu-ZA/account/general.php b/resources/lang/zu-ZA/account/general.php
index 1a9e2c03b8..7f9e2f848e 100644
--- a/resources/lang/zu-ZA/account/general.php
+++ b/resources/lang/zu-ZA/account/general.php
@@ -2,10 +2,16 @@
 
 return array(
     'personal_api_keys' => 'Personal API Keys',
+    'personal_access_token' => 'Personal Access Token',
+    'personal_api_keys_success' => 'Personal API Key :key created sucessfully',
+    'here_is_api_key' => 'Here is your new personal access token. This is the only time it will be shown so do not lose it! You may now use this token to make API requests.',
     'api_key_warning' => 'When generating an API token, be sure to copy it down immediately as they will not be visible to you again.',
     'api_base_url' => 'Your API base url is located at:',
     'api_base_url_endpoint' => '/&lt;endpoint&gt;',
     'api_token_expiration_time' => 'API tokens are set to expire in:',
     'api_reference' => 'Please check the <a href="https://snipe-it.readme.io/reference" target="_blank">API reference</a> to find specific API endpoints and additional API documentation.',
     'profile_updated' => 'Account successfully updated',
+    'no_tokens' => 'You have not created any personal access tokens.',
+    'enable_sounds' => 'Enable sound effects',
+    'enable_confetti' => 'Enable confetti effects',
 );
diff --git a/resources/lang/zu-ZA/admin/accessories/message.php b/resources/lang/zu-ZA/admin/accessories/message.php
index 02e944eaba..ad45465495 100644
--- a/resources/lang/zu-ZA/admin/accessories/message.php
+++ b/resources/lang/zu-ZA/admin/accessories/message.php
@@ -26,7 +26,11 @@ return array(
         'error'   		=> 'Ukufinyelela akuzange kuhlolwe, sicela uzame futhi',
         'success' 		=> 'Ukufinyelela kufakwe ngempumelelo.',
         'unavailable'   => 'Accessory is not available for checkout. Check quantity available',
-        'user_does_not_exist' => 'Lo msebenzisi awuvumelekile. Ngicela uzame futhi.'
+        'user_does_not_exist' => 'Lo msebenzisi awuvumelekile. Ngicela uzame futhi.',
+         'checkout_qty' => array(
+            'lte'  => 'There is currently only one available accessory of this type, and you are trying to check out :checkout_qty. Please adjust the checkout quantity or the total stock of this accessory and try again.|There are :number_currently_remaining total available accessories, and you are trying to check out :checkout_qty. Please adjust the checkout quantity or the total stock of this accessory and try again.',
+            ),
+           
     ),
 
     'checkin' => array(
diff --git a/resources/lang/zu-ZA/admin/accessories/table.php b/resources/lang/zu-ZA/admin/accessories/table.php
index a1359d6775..139c923ea1 100644
--- a/resources/lang/zu-ZA/admin/accessories/table.php
+++ b/resources/lang/zu-ZA/admin/accessories/table.php
@@ -6,6 +6,4 @@ return array(
     'id'      					=> 'ID',
     'require_acceptance'      	=> 'Ukwamukelwa',
     'title'      				=> 'Igama lokufinyelela',
-
-
 );
diff --git a/resources/lang/zu-ZA/admin/components/message.php b/resources/lang/zu-ZA/admin/components/message.php
index 893f4af6bf..e0ab893e75 100644
--- a/resources/lang/zu-ZA/admin/components/message.php
+++ b/resources/lang/zu-ZA/admin/components/message.php
@@ -17,7 +17,8 @@ return array(
     'delete' => array(
         'confirm'   => 'Uqinisekile ukuthi ufisa ukususa le ngxenye?',
         'error'   => 'Kube nenkinga yokususa ingxenye. Ngicela uzame futhi.',
-        'success' => 'Ingxenye isusiwe ngempumelelo.'
+        'success' => 'Ingxenye isusiwe ngempumelelo.',
+        'error_qty'   => 'Some components of this type are still checked out. Please check them in and try again.',
     ),
 
      'checkout' => array(
diff --git a/resources/lang/zu-ZA/admin/consumables/general.php b/resources/lang/zu-ZA/admin/consumables/general.php
index 2261d166db..18a09c2bca 100644
--- a/resources/lang/zu-ZA/admin/consumables/general.php
+++ b/resources/lang/zu-ZA/admin/consumables/general.php
@@ -8,4 +8,5 @@ return array(
     'remaining' 			            => 'Ukuhlala',
     'total' 			                => 'Inani',
     'update'                            => 'Ukuvuselelwa okudliwe',
+    'inventory_warning'                 => 'The inventory of this consumable is below the minimum amount of :min_count',
 );
diff --git a/resources/lang/zu-ZA/admin/consumables/message.php b/resources/lang/zu-ZA/admin/consumables/message.php
index 8e6d4846de..63a8c80c49 100644
--- a/resources/lang/zu-ZA/admin/consumables/message.php
+++ b/resources/lang/zu-ZA/admin/consumables/message.php
@@ -2,6 +2,7 @@
 
 return array(
 
+    'invalid_category_type' => 'The category must be a consumable category.',
     'does_not_exist' => 'Ukuthengwa akukho.',
 
     'create' => array(
diff --git a/resources/lang/zu-ZA/admin/custom_fields/general.php b/resources/lang/zu-ZA/admin/custom_fields/general.php
index a0cfa3afac..8b05e14ff5 100644
--- a/resources/lang/zu-ZA/admin/custom_fields/general.php
+++ b/resources/lang/zu-ZA/admin/custom_fields/general.php
@@ -35,7 +35,7 @@ return [
     'create_field_title' => 'Create a new custom field',
     'value_encrypted'      	        => 'Inani lale nsimu libethelwe kwi-database. Abasebenzisi kuphela abasebenzisi bazokwazi ukubuka inani elimisiwe',
     'show_in_email'     => 'Include the value of this field in checkout emails sent to the user? Encrypted fields cannot be included in emails',
-    'show_in_email_short'     => 'Include in emails.',
+    'show_in_email_short' => 'Include in emails',
     'help_text' => 'Help Text',
     'help_text_description' => 'This is optional text that will appear below the form elements while editing an asset to provide context on the field.',
     'about_custom_fields_title' => 'About Custom Fields',
@@ -57,5 +57,8 @@ return [
     'show_in_requestable_list_short' => 'Show in requestable assets list',
     'show_in_requestable_list' => 'Show value in requestable assets list. Encrypted fields will not be shown',
     'encrypted_options' => 'This field is encrypted, so some display options will not be available.',
+    'display_checkin' => 'Display in checkin forms',
+    'display_checkout' => 'Display in checkout forms',
+    'display_audit' => 'Display in audit forms',
 
 ];
diff --git a/resources/lang/zu-ZA/admin/custom_fields/message.php b/resources/lang/zu-ZA/admin/custom_fields/message.php
index 1d3080bf95..cc6f52df1a 100644
--- a/resources/lang/zu-ZA/admin/custom_fields/message.php
+++ b/resources/lang/zu-ZA/admin/custom_fields/message.php
@@ -5,6 +5,7 @@ return array(
     'field' => array(
         'invalid'   => 'Leyo nsiyo ayikho.',
         'already_added'   => 'Inkambu isivele iseziwe',
+        'none_selected'   => 'No field selected',
 
         'create' => array(
             'error'   => 'Inkundla ayidalwanga, sicela uzame futhi.',
diff --git a/resources/lang/zu-ZA/admin/depreciations/general.php b/resources/lang/zu-ZA/admin/depreciations/general.php
index c0e4b11284..c0461a815f 100644
--- a/resources/lang/zu-ZA/admin/depreciations/general.php
+++ b/resources/lang/zu-ZA/admin/depreciations/general.php
@@ -13,4 +13,8 @@ return [
     'no_depreciations_warning'               => '<strong>Warning: </strong>
                       You do not currently have any depreciations set up.
                       Please set up at least one depreciation to view the depreciation report.',
+    'depreciation_method'                   => 'Umbiko Wokunciphisa',
+    'linear_depreciation'                   => 'Linear (Default)',
+    'half_1'                                => 'Half-year convention, always applied',
+    'half_2'                                => 'Half-year convention, applied with condition',
 ];
diff --git a/resources/lang/zu-ZA/admin/hardware/form.php b/resources/lang/zu-ZA/admin/hardware/form.php
index 1cbc70f4a6..b7c9db90a0 100644
--- a/resources/lang/zu-ZA/admin/hardware/form.php
+++ b/resources/lang/zu-ZA/admin/hardware/form.php
@@ -55,8 +55,11 @@ return [
     'asset_location_update_default' => 'Update only default location',
     'asset_location_update_actual' => 'Update only actual location',
     'asset_not_deployable' => 'That asset status is not deployable. This asset cannot be checked out.',
-    'asset_deployable' => 'That status is deployable. This asset can be checked out.',
+    'asset_not_deployable_checkin' => 'That asset status is not deployable. Using this status label will checkin the asset.',
+    'asset_deployable' => 'This asset can be checked out.',
     'processing_spinner' => 'Processing... (This might take a bit of time on large files)',
+    'processing' => 'Processing... ',
     'optional_infos'  => 'Optional Information',
-    'order_details'   => 'Order Related Information'
+    'order_details'   => 'Order Related Information',
+    'calc_eol'    => 'If nulling the EOL date, use automatic EOL calculation based on the purchase date and EOL rate.',
 ];
diff --git a/resources/lang/zu-ZA/admin/hardware/general.php b/resources/lang/zu-ZA/admin/hardware/general.php
index 8b2ac0065e..df6015c105 100644
--- a/resources/lang/zu-ZA/admin/hardware/general.php
+++ b/resources/lang/zu-ZA/admin/hardware/general.php
@@ -5,8 +5,8 @@ return [
     'about_assets_text'            => 'Amafa yizinto ezilandelwa inombolo ye-série noma i-tag tag. Bavame ukuba izinto eziphakeme kakhulu lapho behlonza izinto ezithile.',
     'archived'  				=> 'I-Archived',
     'asset'  					=> 'Impahla',
-    'bulk_checkout'             => 'Checkout Assets',
-    'bulk_checkin'              => 'Checkin Assets',
+    'bulk_checkout'             => 'Ukuhlola okuningi',
+    'bulk_checkin'              => 'Bulk Checkin',
     'checkin'  					=> 'I-Checkin Asset',
     'checkout'  				=> 'I-Asset ye-Checkout',
     'clone'  					=> 'Clone Asset',
@@ -27,8 +27,7 @@ return [
     'undeployable_tooltip'  	=> 'This asset has a status label that is undeployable and cannot be checked out at this time.',
     'view'  					=> 'Buka Impahla',
     'csv_error' => 'You have an error in your CSV file:',
-    'import_text' => '<p>Upload a CSV that contains asset history. The assets and users MUST already exist in the system, or they will be skipped. Matching assets for history import happens against the asset tag. We will try to find a matching user based on the user\'s name you provide, and the criteria you select below. If you do not select any criteria below, it will simply try to match on the username format you configured in the <code>Admin &gt; General Settings</code>.</p><p>Fields included in the CSV must match the headers: <strong>Asset Tag, Name, Checkout Date, Checkin Date</strong>. Any additional fields will be ignored. </p><p>Checkin Date: blank or future checkin dates will checkout items to associated user.  Excluding the Checkin Date column will create a checkin date with todays date.</p>
-    ',
+    'import_text' => '<p>Upload a CSV that contains asset history. The assets and users MUST already exist in the system, or they will be skipped. Matching assets for history import happens against the asset tag. We will try to find a matching user based on the user\'s name you provide, and the criteria you select below. If you do not select any criteria below, it will simply try to match on the username format you configured in the <code>Admin &gt; General Settings</code>.</p><p>Fields included in the CSV must match the headers: <strong>Asset Tag, Name, Checkout Date, Checkin Date</strong>. Any additional fields will be ignored. </p><p>Checkin Date: blank or future checkin dates will checkout items to associated user.  Excluding the Checkin Date column will create a checkin date with todays date.</p>    ',
     'csv_import_match_f-l' => 'Try to match users by <strong>firstname.lastname</strong> (<code>jane.smith</code>) format',
     'csv_import_match_initial_last' => 'Try to match users by <strong>first initial last name</strong> (<code>jsmith</code>) format',
     'csv_import_match_first' => 'Try to match users by <strong>first name</strong> (<code>jane</code>) format',
diff --git a/resources/lang/zu-ZA/admin/hardware/message.php b/resources/lang/zu-ZA/admin/hardware/message.php
index a3fea93b5e..120fe8ee56 100644
--- a/resources/lang/zu-ZA/admin/hardware/message.php
+++ b/resources/lang/zu-ZA/admin/hardware/message.php
@@ -2,18 +2,23 @@
 
 return [
 
-    'undeployable' 		=> '<strong>Thola: </strong> Lelifa limakwe njengamanje elingenakutholakali. Uma lesi simo sesishintshile, sicela ubuyekeze isimo sesifa.',
-    'does_not_exist' 	=> 'Impahla ayikho.',
-    'does_not_exist_var'=> 'Asset with tag :asset_tag not found.',
-    'no_tag' 	        => 'No asset tag provided.',
+    'undeployable' 		 => '<strong>Warning: </strong> This asset has been marked as currently undeployable. If this status has changed, please update the asset status.',
+    'does_not_exist' 	 => 'Impahla ayikho.',
+    'does_not_exist_var' => 'Asset with tag :asset_tag not found.',
+    'no_tag' 	         => 'No asset tag provided.',
     'does_not_exist_or_not_requestable' => 'That asset does not exist or is not requestable.',
-    'assoc_users'	 	=> 'Leli fayela okwamanje lihlolwe kumsebenzisi futhi alikwazi ukususwa. Sicela uhlole ifa ekuqaleni, bese uzama ukususa futhi.',
+    'assoc_users'	 	 => 'Leli fayela okwamanje lihlolwe kumsebenzisi futhi alikwazi ukususwa. Sicela uhlole ifa ekuqaleni, bese uzama ukususa futhi.',
     'warning_audit_date_mismatch' 	=> 'This asset\'s next audit date (:next_audit_date) is before the last audit date (:last_audit_date). Please update the next audit date.',
+    'labels_generated'   => 'Labels were successfully generated.',
+    'error_generating_labels' => 'Error while generating labels.',
+    'no_assets_selected' => 'No assets selected.',
 
     'create' => [
         'error'   		=> 'Impahla ayidalwanga, sicela uzame futhi. :(',
         'success' 		=> 'Ifa lidalwe ngempumelelo. :)',
         'success_linked' => 'Asset with tag :tag was created successfully. <strong><a href=":link" style="color: white;">Click here to view</a></strong>.',
+        'multi_success_linked' => 'Asset with tag :links was created successfully.|:count assets were created succesfully. :links.',
+        'partial_failure' => 'An asset was unable to be created. Reason: :failures|:count assets were unable to be created. Reasons: :failures',
     ],
 
     'update' => [
@@ -51,20 +56,24 @@ return [
     ],
 
     'import' => [
+        'import_button'         => 'Process Import',
         'error'                 => 'Ezinye izinto azange zingenise ngendlela efanele.',
         'errorDetail'           => 'Izinto ezilandelayo azange zingeniswe ngenxa yamaphutha.',
         'success'               => 'Ifayela lakho lifakiwe',
         'file_delete_success'   => 'Ifayela lakho lisusiwe ngempumelelo',
         'file_delete_error'      => 'Ifayela alikwazanga ukususwa',
         'file_missing' => 'The file selected is missing',
+        'file_already_deleted' => 'The file selected was already deleted',
         'header_row_has_malformed_characters' => 'One or more attributes in the header row contain malformed UTF-8 characters',
         'content_row_has_malformed_characters' => 'One or more attributes in the first row of content contain malformed UTF-8 characters',
+        'transliterate_failure' => 'Transliteration from :encoding to UTF-8 failed due to invalid characters in input'
     ],
 
 
     'delete' => [
         'confirm'   	=> 'Uqinisekile ukuthi ufisa ukususa le mali?',
         'error'   		=> 'Kube nenkinga yokususa le mali. Ngicela uzame futhi.',
+        'assigned_to_error' => '{1}Asset Tag: :asset_tag is currently checked out. Check in this device before deletion.|[2,*]Asset Tags: :asset_tag are currently checked out. Check in these devices before deletion.',
         'nothing_updated'   => 'Azikho izimpahla ezikhethiwe, ngakho akukho lutho olususwe.',
         'success' 		=> 'Impahla isusiwe ngempumelelo.',
     ],
@@ -77,6 +86,11 @@ return [
         'no_assets_selected' => 'You must select at least one asset from the list',
     ],
 
+    'multi-checkout' => [
+        'error'   => 'Asset was not checked out, please try again|Assets were not checked out, please try again',
+        'success' => 'Asset checked out successfully.|Assets checked out successfully.',
+    ],
+
     'checkin' => [
         'error'   		=> 'Ifa alizange lihlolwe, sicela uzame futhi',
         'success' 		=> 'Ifa lihlolwe ngempumelelo.',
@@ -86,9 +100,10 @@ return [
     ],
 
     'requests' => [
-        'error'   		=> 'Ifa alizange liceliwe, sicela uzame futhi',
-        'success' 		=> 'Ifa liceliwe ngempumelelo.',
-        'canceled'      => 'Isicelo sokuhlola sikhanseliwe ngempumelelo',
+        'error'   		=> 'Request was not successful, please try again.',
+        'success' 		=> 'Request successfully submitted.',
+        'canceled'      => 'Request successfully canceled.',
+        'cancel'        => 'Cancel this item request',
     ],
 
 ];
diff --git a/resources/lang/zu-ZA/admin/hardware/table.php b/resources/lang/zu-ZA/admin/hardware/table.php
index d93d41f779..291c0c380d 100644
--- a/resources/lang/zu-ZA/admin/hardware/table.php
+++ b/resources/lang/zu-ZA/admin/hardware/table.php
@@ -25,7 +25,6 @@ return [
     'image'		    => 'Isithombe sedivayisi',
     'days_without_acceptance' => 'Izinsuku Ngaphandle Kwemukelwa',
     'monthly_depreciation' => 'Monthly Depreciation',
-    'assigned_to'    => 'Kwabiwa Ku',
     'requesting_user' => 'Requesting User',
     'requested_date' => 'Requested Date',
     'changed'       => 'Changed',
diff --git a/resources/lang/zu-ZA/admin/kits/general.php b/resources/lang/zu-ZA/admin/kits/general.php
index 862a51230b..40a1cc25c0 100644
--- a/resources/lang/zu-ZA/admin/kits/general.php
+++ b/resources/lang/zu-ZA/admin/kits/general.php
@@ -47,4 +47,5 @@ return [
     'kit_deleted'                       => 'Kit was successfully deleted',
     'kit_model_updated'                 => 'Model was successfully updated',
     'kit_model_detached'                => 'Model was successfully detached',
+    'model_already_attached'            => 'Model already attached to kit',
 ];
diff --git a/resources/lang/zu-ZA/admin/licenses/general.php b/resources/lang/zu-ZA/admin/licenses/general.php
index 8ccd36c984..8046cc6a5f 100644
--- a/resources/lang/zu-ZA/admin/licenses/general.php
+++ b/resources/lang/zu-ZA/admin/licenses/general.php
@@ -14,6 +14,7 @@ return array(
     'info'  					=> 'Ulwazi lwelayisense',
     'license_seats'  			=> 'Izihlalo zelayisense',
     'seat'  					=> 'Isihlalo',
+    'seat_count'  				=> 'Seat :count',
     'seats'  					=> 'Izihlalo',
     'software_licenses'  		=> 'Ilayisense Yezinhlelo',
     'user'  					=> 'Umsebenzisi',
@@ -23,12 +24,12 @@ return array(
         [
             'checkin_all'           => [
                 'button'            => 'Checkin All Seats',
-                'modal'             => 'This will action checkin one seat. | This action will checkin all :checkedout_seats_count seats for this license.',
+                'modal'             => 'This action will checkin one seat. | This action will checkin all :checkedout_seats_count seats for this license.',
                 'enabled_tooltip'   => 'Checkin ALL seats for this license from both users and assets',
                 'disabled_tooltip'  => 'This is disabled because there are no seats currently checked out',
                 'disabled_tooltip_reassignable'  => 'This is disabled because the License is not reassignable',
                 'success'           => 'License successfully checked in! | All licenses were successfully checked in!',
-                'log_msg'           => 'Checked in via bulk license checkout in license GUI',
+                'log_msg'           => 'Checked in via bulk license checkin in license GUI',
             ],
 
             'checkout_all'              => [
diff --git a/resources/lang/zu-ZA/admin/licenses/message.php b/resources/lang/zu-ZA/admin/licenses/message.php
index 58b3cb914b..f0a5b6497d 100644
--- a/resources/lang/zu-ZA/admin/licenses/message.php
+++ b/resources/lang/zu-ZA/admin/licenses/message.php
@@ -44,10 +44,13 @@ return array(
         'error'   => 'Kube nenkinga yokuhlola ilayisense. Ngicela uzame futhi.',
         'success' => 'Ilayisensi yahlolwa ngokuphumelelayo',
         'not_enough_seats' => 'Not enough license seats available for checkout',
+        'mismatch' => 'The license seat provided does not match the license',
+        'unavailable' => 'This seat is not available for checkout.',
     ),
 
     'checkin' => array(
         'error'   => 'Kube nenkinga ekuhloleni ilayisense. Ngicela uzame futhi.',
+        'not_reassignable' => 'License not reassignable',
         'success' => 'Ilayisensi ihlolwe ngempumelelo'
     ),
 
diff --git a/resources/lang/zu-ZA/admin/locations/message.php b/resources/lang/zu-ZA/admin/locations/message.php
index 7db24f666f..433f47fd31 100644
--- a/resources/lang/zu-ZA/admin/locations/message.php
+++ b/resources/lang/zu-ZA/admin/locations/message.php
@@ -3,11 +3,12 @@
 return array(
 
     'does_not_exist' => 'Indawo ayikho.',
-    'assoc_users'    => 'This location is not currently deletable because it is the location of record for at least one asset or user, has assets assigned to it, or is the parent location of another location. Please update your models to no longer reference this company and try again. ',
+    'assoc_users'    => 'This location is not currently deletable because it is the location of record for at least one asset or user, has assets assigned to it, or is the parent location of another location. Please update your records to no longer reference this location and try again ',
     'assoc_assets'	 => 'Le ndawo okwamanje ihlotshaniswa okungenani nefa elilodwa futhi ayikwazi ukususwa. Sicela ubuyekeze izimpahla zakho ukuze ungasaphinde ubhekise le ndawo futhi uzame futhi.',
     'assoc_child_loc'	 => 'Le ndawo okwamanje ungumzali okungenani indawo eyodwa yengane futhi ayikwazi ukususwa. Sicela ubuyekeze izindawo zakho ukuze ungasaphinde ubhekisele kule ndawo bese uyazama futhi.',
     'assigned_assets' => 'Assigned Assets',
     'current_location' => 'Current Location',
+    'open_map' => 'Open in :map_provider_icon Maps',
 
 
     'create' => array(
@@ -20,6 +21,11 @@ return array(
         'success' => 'Indawo ibuyekezwe ngempumelelo.'
     ),
 
+    'restore' => array(
+        'error'   => 'Location was not restored, please try again',
+        'success' => 'Location restored successfully.'
+    ),
+
     'delete' => array(
         'confirm'   	=> 'Uqinisekile ukuthi ufisa ukususa le ndawo?',
         'error'   => 'Kube nenkinga ekususeni indawo. Ngicela uzame futhi.',
diff --git a/resources/lang/zu-ZA/admin/locations/table.php b/resources/lang/zu-ZA/admin/locations/table.php
index cdc88aa924..3cc3d30831 100644
--- a/resources/lang/zu-ZA/admin/locations/table.php
+++ b/resources/lang/zu-ZA/admin/locations/table.php
@@ -39,4 +39,5 @@ return [
     'signed_by_finance_auditor' => 'Signed By (Finance Auditor):',
     'signed_by_location_manager' => 'Signed By (Location Manager):',
     'signed_by'                 => 'Signed Off By:',
+    'clone'  					=> 'Clone Location',
 ];
diff --git a/resources/lang/zu-ZA/admin/models/general.php b/resources/lang/zu-ZA/admin/models/general.php
index 0045a65eaf..39d010a592 100644
--- a/resources/lang/zu-ZA/admin/models/general.php
+++ b/resources/lang/zu-ZA/admin/models/general.php
@@ -3,7 +3,7 @@
 return array(
     'about_models_title'     => 'Mayelana namamodeli asefa',
     'about_models_text'           => 'Amamodeli asefa kuyindlela yokuqoqa amafa afanayo. "MBP 2013", "IPhone 6s", njll.',
-    'deleted'  					        => 'This model has been deleted.',
+    'deleted'  					=> 'This model has been deleted.',
     'bulk_delete'               => 'Bulk Delete Asset Models',
     'bulk_delete_help'               => 'Use the checkboxes below to confirm the deletion of the selected asset models. Asset models that have assets associated with them cannot be deleted until the assets are associated with a different model.',
     'bulk_delete_warn'          => 'You are about to delete one asset model.|You are about to delete :model_count asset models.',
diff --git a/resources/lang/zu-ZA/admin/models/message.php b/resources/lang/zu-ZA/admin/models/message.php
index ddaea5441b..e9b206e037 100644
--- a/resources/lang/zu-ZA/admin/models/message.php
+++ b/resources/lang/zu-ZA/admin/models/message.php
@@ -7,7 +7,7 @@ return array(
     'no_association' => 'WARNING! The asset model for this item is invalid or missing!',
     'no_association_fix' => 'This will break things in weird and horrible ways. Edit this asset now to assign it a model.',
     'assoc_users'	 => 'Lo modeli okwamanje uhlotshaniswa nefa elilodwa noma ngaphezulu futhi alinakususwa. Sicela ususe amafa, bese uzama ukususa futhi.',
-
+    'invalid_category_type' => 'This category must be an asset category.',
 
     'create' => array(
         'error'   => 'Isibonelo asizange sidalwe, sicela uzame futhi.',
diff --git a/resources/lang/zu-ZA/admin/reports/general.php b/resources/lang/zu-ZA/admin/reports/general.php
index 4c17ff4966..fc9f1644d6 100644
--- a/resources/lang/zu-ZA/admin/reports/general.php
+++ b/resources/lang/zu-ZA/admin/reports/general.php
@@ -4,6 +4,7 @@ return [
     'info'   => 'Khetha okukhethwa kukho okufunayo kumbiko wakho wefa.',
     'deleted_user' => 'Deleted user',
     'send_reminder' => 'Send reminder',
+    'cannot_send_reminder' => 'User has been deleted or does not have an email address so cannot receive a reminder',
     'reminder_sent' => 'Reminder sent',
     'acceptance_deleted' => 'Acceptance request deleted',
     'acceptance_request' => 'Acceptance request',
@@ -13,5 +14,10 @@ return [
         'user_state' => 'User State',
         'user_country' => 'User Country',
         'user_zip' => 'User Zip'
-    ]
-];
\ No newline at end of file
+    ],
+    'open_saved_template' => 'Open Saved Template',
+    'save_template' =>  'Save Template',
+    'select_a_template' => 'Select a Template',
+    'template_name' => 'Template Name',
+    'update_template' => 'Update Template',
+];
diff --git a/resources/lang/zu-ZA/admin/reports/message.php b/resources/lang/zu-ZA/admin/reports/message.php
index 24b5d7bfe2..2800bbdf0b 100644
--- a/resources/lang/zu-ZA/admin/reports/message.php
+++ b/resources/lang/zu-ZA/admin/reports/message.php
@@ -1,5 +1,16 @@
 <?php
 
-return array(
-    'error'   => 'Kumele ukhethe okungenani ukhetho olulodwa.'
-);
+return [
+    'about_templates' => 'About Saved Templates',
+    'saving_templates_description' => 'Select your options, then enter the name of your template in the box above and click the \'Save Template\' button. Use the dropdown to select a previously saved template.',
+    'create'  => [
+        'success' => 'Template saved successfully',
+    ],
+    'update' => [
+        'success' => 'Template updated successfully',
+    ],
+    'delete' => [
+        'success' => 'Template deleted',
+        'no_delete_permission' => 'Template does not exist or you do not have permission to delete it.',
+    ],
+];
diff --git a/resources/lang/zu-ZA/admin/settings/general.php b/resources/lang/zu-ZA/admin/settings/general.php
index 5acdf5a453..447c985bd7 100644
--- a/resources/lang/zu-ZA/admin/settings/general.php
+++ b/resources/lang/zu-ZA/admin/settings/general.php
@@ -8,13 +8,13 @@ return [
     'ad_append_domain'          => 'Append domain name to username field',
     'ad_append_domain_help'     => 'User isn\'t required to write "username@domain.local", they can just type "username".',
     'admin_cc_email'            => 'CC Email',
-    'admin_cc_email_help'       => 'If you would like to send a copy of checkin/checkout emails that are sent to users to an additional email account, enter it here. Otherwise leave this field blank.',
+    'admin_cc_email_help'       => 'Send a copy of checkin/checkout emails to this address.',
     'admin_settings'            => 'Admin Settings',
     'is_ad'				        => 'Lena iseva ye-Active Directory',
     'alerts'                	=> 'Alerts',
     'alert_title'               => 'Update Notification Settings',
     'alert_email'				=> 'Thumela izexwayiso ku',
-    'alert_email_help'    => 'Email addresses or distribution lists you want alerts to be sent to, comma separated',
+    'alert_email_help'          => 'Email addresses or distribution lists you want alerts to be sent to, comma separated.',
     'alerts_enabled'			=> 'Izaziso zivuliwe',
     'alert_interval'			=> 'Ukuphelelwa yisikhathi kwe-Alerts Threshold (ezinsukwini)',
     'alert_inv_threshold'		=> 'Inventory Alert Threshold',
@@ -31,15 +31,18 @@ return [
     'backups'					=> 'Izipele',
     'backups_help'              => 'Create, download, and restore backups ',
     'backups_restoring'         => 'Restoring from Backup',
+    'backups_clean' => 'Clean the backed-up database before restore',
+    'backups_clean_helptext' => "This can be useful if you're changing between database versions",
     'backups_upload'            => 'Upload Backup',
     'backups_path'              => 'Backups on the server are stored in <code>:path</code>',
-    'backups_restore_warning'   => 'Use the restore button <small><span class="btn btn-xs btn-warning"><i class="text-white fas fa-retweet" aria-hidden="true"></i></span></small> to restore from a previous backup. (This does not currently work with S3 file storage or Docker.)<br><br>Your <strong>entire :app_name database and any uploaded files will be completely replaced</strong> by what\'s in the backup file.  ',
+    'backups_restore_warning'   => 'Use the restore button <small><span class="btn btn-xs btn-warning"><i class="text-white fas fa-retweet" aria-hidden="true"></i></span></small> to restore from a previous backup. (This does not currently work with S3 file storage or Docker.)<br><br>Your <strong>entire :app_name database and any uploaded files will be completely replaced</strong> by what\'s in the backup file  ',
     'backups_logged_out'         => 'All existing users, including you, will be logged out once your restore is complete.',
     'backups_large'             => 'Very large backups may time out on the restore attempt and may still need to be run via command line. ',
     'barcode_settings'			=> 'Izilungiselelo zebhakhodi',
     'confirm_purge'			    => 'Qinisekisa i-Purge',
     'confirm_purge_help'		=> 'Enter the text "DELETE" in the box below to purge your deleted records. This action cannot be undone and will PERMANENTLY delete all soft-deleted items and users. (You should make a backup first, just to be safe.)',
     'custom_css'				=> 'I-Custom CSS',
+    'custom_css_placeholder'	=> 'Add your custom CSS',
     'custom_css_help'			=> 'Faka noma iyiphi i-CSS yangokwezifiso ongathanda ukuyisebenzisa. Ungafaki amathegi angu-&lt;style&gt;&lt;/style&gt;.',
     'custom_forgot_pass_url'	=> 'Custom Password Reset URL',
     'custom_forgot_pass_url_help'	=> 'This replaces the built-in forgotten password URL on the login screen, useful to direct people to internal or hosted LDAP password reset functionality. It will effectively disable local user forgotten password functionality.',
@@ -47,34 +50,34 @@ return [
     'dashboard_message_help'	=> 'This text will appear on the dashboard for anyone with permission to view the dashboard.',
     'default_currency'  		=> 'Imali Eyingqayizivele',
     'default_eula_text'			=> 'I-EULA ezenzakalelayo',
+    'default_eula_text_placeholder' => 'Add your default EULA text',
     'default_language'			=> 'Ulimi oluzenzakalelayo',
     'default_eula_help_text'	=> 'Ungase futhi uhlobanise ama-EULA wangokwezifiso kwizigaba ezithile zefa.',
     'acceptance_note'           => 'Add a note for your decision (Optional)',
     'display_asset_name'        => 'Bonisa igama lomhlaba',
     'display_checkout_date'     => 'Bonisa usuku lokuhlola',
     'display_eol'               => 'Bonisa i-EOL ekubukeni kwetafula',
-    'display_qr'                => 'Bonisa Amakhodi Wesikwele',
+    'display_qr'                => 'Display 2D barcode',
     'display_alt_barcode'		=> 'Bonisa ibhakhodi ye-1D',
-    'email_logo'                => 'Email Logo',
     'barcode_type'				=> 'Uhlobo lwe-Barcode ye-2D',
     'alt_barcode_type'			=> 'Uhlobo lwe-barcode lwe-1D',
-    'email_logo_size'       => 'Square logos in email look best. ',
     'enabled'                   => 'Enabled',
     'eula_settings'				=> 'Izilungiselelo ze-EULA',
     'eula_markdown'				=> 'Le-EULA ivumela i-<a href="https://help.github.com/articles/github-flavored-markdown/"> i-markdown flavored markdown</a>.',
+    'empty_row_count'           => 'Field Start Offset (Empty Rows)',
+    'empty_row_count_help'      => 'Fields will begin populating after this many empty rows are skipped at the top of the label.',
     'favicon'                   => 'Favicon',
     'favicon_format'            => 'Accepted filetypes are ico, png, and gif. Other image formats may not work in all browsers.',
     'favicon_size'          => 'Favicons should be square images, 16x16 pixels.',
     'footer_text'               => 'Additional Footer Text ',
     'footer_text_help'          => 'This text will appear in the right-side footer. Links are allowed using <a href="https://help.github.com/articles/github-flavored-markdown/">Github flavored markdown</a>. Line breaks, headers, images, etc may result in unpredictable results.',
+    'footer_text_placeholder'   => 'Optional footer text',
     'general_settings'			=> 'Izilungiselelo Ezijwayelekile',
-    'general_settings_keywords' => 'company support, signature, acceptance, email format, username format, images, per page, thumbnail, eula, gravatar, tos, dashboard, privacy',
     'general_settings_help'     => 'Default EULA and more',
     'generate_backup'			=> 'Yenza isipele',
     'google_workspaces'         => 'Google Workspaces',
     'header_color'              => 'Umbala wekhanda',
     'info'                      => 'Lezi zilungiselelo zikuvumela ukuba wenze ngezici ezithile izici zokufaka kwakho.',
-    'label_logo'                => 'Label Logo',
     'label_logo_size'           => 'Square logos look best - will be displayed in the top right of each asset label. ',
     'laravel'                   => 'Inguqulo yeLaravel',
     'ldap'                      => 'LDAP',
@@ -94,7 +97,7 @@ return [
     'ldap_login_sync_help'      => 'This only tests that LDAP can sync correctly. If your LDAP Authentication query is not correct, users may still not be able to login. YOU MUST SAVE YOUR UPDATED LDAP SETTINGS FIRST.',
     'ldap_manager'              => 'LDAP Manager',
     'ldap_server'               => 'Iseva ye-LDAP',
-    'ldap_server_help'          => 'Lokhu kufanele kuqale nge-ldap: // (for uncrypted or TLS) noma ldaps: // (for SSL)',
+    'ldap_server_help'          => 'This should start with ldap:// (for unencrypted) or ldaps:// (for TLS or SSL)',
     'ldap_server_cert'			=> 'Ukuqinisekiswa kwesitifiketi se-LDAP SSL',
     'ldap_server_cert_ignore'	=> 'Vumela isitifikedi se-SSL esingavumelekile',
     'ldap_server_cert_help'		=> 'Khetha leli bhokisi lokuhlola uma usebenzisa isitifiketi se-SSL esayiniwe futhi ungathanda ukwamukela isitifiketi esingavumelekile se-SSL.',
@@ -108,8 +111,8 @@ return [
     'ldap_pword'                => 'I-LDAP Ukubopha Iphasiwedi',
     'ldap_basedn'               => 'I-Base Bind DN',
     'ldap_filter'               => 'Isihlungi se-LDAP',
-    'ldap_pw_sync'              => 'Ukuvumelanisa kwephasiwedi ye-LDAP',
-    'ldap_pw_sync_help'         => 'Ungawukhipheli leli bhokisi uma ungafisi ukugcina amaphasiwedi e-LDAP avumelanisiwe namaphasiwedi wendawo. Ukukhubaza lokhu kusho ukuthi abasebenzisi bakho bangakwazi ukungena ngemvume uma ngabe iseva yakho ye-LDAP ayitholakali ngesizathu esithile.',
+    'ldap_pw_sync'              => 'Cache LDAP Passwords',
+    'ldap_pw_sync_help'         => 'Uncheck this box if you do not wish to keep LDAP passwords cached as local hashed passwords. Disabling this means that your users may not be able to login if your LDAP server is unreachable for some reason.',
     'ldap_username_field'       => 'Insimu yomsebenzisi',
     'ldap_lname_field'          => 'Isibongo',
     'ldap_fname_field'          => 'Igama Lokuqala LDAP',
@@ -117,13 +120,15 @@ return [
     'ldap_version'              => 'Inguqulo ye-LDAP',
     'ldap_active_flag'          => 'I-LDAP i-Flag Active',
     'ldap_activated_flag_help'  => 'This value is used to determine whether a synced user can login to Snipe-IT. <strong>It does not affect the ability to check items in or out to them</strong>, and should be the <strong>attribute name</strong> within your AD/LDAP, <strong>not the value</strong>. <br><br>If this field is set to a field name that does not exist in your AD/LDAP, or the value in the AD/LDAP field is set to <code>0</code> or <code>false</code>, <strong>user login will be disabled</strong>. If the value in the AD/LDAP field is set to <code>1</code> or <code>true</code> or <em>any other text</em> means the user can log in. When the field is blank in your AD, we respect the <code>userAccountControl</code> attribute, which usually allows non-suspended users to log in.',
+    'ldap_invert_active_flag'   => 'LDAP Invert Active Flag',
+    'ldap_invert_active_flag_help'     => 'If enabled: when the value returned by LDAP Active Flag is <code>0</code> or <code>false</code> the user account will be active.',
     'ldap_emp_num'              => 'Inombolo yabasebenzi be-LDAP',
     'ldap_email'                => 'I-imeyili ye-LDAP',
     'ldap_test'                 => 'Test LDAP',
     'ldap_test_sync'            => 'Test LDAP Synchronization',
     'license'                   => 'Software License',
-    'load_remote'               => 'Use Gravatar',
-    'load_remote_help_text'		=> 'Uncheck this box if your install cannot load scripts from the outside internet. This will prevent Snipe-IT from trying load images from Gravatar.',
+    'load_remote'               => 'Load Remote Avatars',
+    'load_remote_help_text'		=> 'Uncheck this box if your install cannot load scripts from the outside internet. This will prevent Snipe-IT from trying load avatars from Gravatar or other outside sources.',
     'login'                     => 'Login Attempts',
     'login_attempt'             => 'Login Attempt',
     'login_ip'                  => 'IP Address',
@@ -131,6 +136,7 @@ return [
     'login_user_agent'          => 'User Agent',
     'login_help'                => 'List of attempted logins',
     'login_note'                => 'Inothi lokungena ngemvume',
+    'login_note_placeholder'            => "If you do not have a login or have found a device belonging to this company, please call technical support at 888-555-1212. Thank you.",
     'login_note_help'           => 'Ngokuzikhethela faka imisho embalwa kusikrini sakho sokungena ngemvume, isibonelo ukusiza abantu abatholile idivayisi elahlekile noma eyebiwe. Le nsimu iyakwamukela <a href="https://help.github.com/articles/github-flavored-markdown/">I-markdown ekhanyisiwe</a>',
     'login_remote_user_text'    => 'Remote User login options',
     'login_remote_user_enabled_text' => 'Enable Login with Remote User Header',
@@ -146,13 +152,16 @@ return [
     'logo_print_assets_help'    => 'Use branding on printable asset lists ',
     'full_multiple_companies_support_help_text' => 'Ukukhawulela abasebenzisi (kufaka phakathi ama-admins) abelwe izinkampani kumpahla yenkampani yabo.',
     'full_multiple_companies_support_text' => 'Ama-Multiple Companies Support Support',
+    'scope_locations_fmcs_support_text'  => 'Scope Locations with Full Multiple Companies Support',
+    'scope_locations_fmcs_support_help_text'  => 'Restrict locations to their selected company.',
+    'scope_locations_fmcs_check_button' => 'Check Compatibility',
+    'scope_locations_fmcs_support_disabled_text'  => 'This option is disabled because you have conflicting locations set for :count or more items.',
     'show_in_model_list'   => 'Show in Model Dropdowns',
     'optional'					=> 'ukuzikhethela',
     'per_page'                  => 'Imiphumela Ngayo Ikhasi',
     'php'                       => 'I-PHP Version',
-    'php_info'                  => 'PHP Info',
+    'php_info'                  => 'PHP info',
     'php_overview'              => 'PHP',
-    'php_overview_keywords'     => 'phpinfo, system, info',
     'php_overview_help'         => 'PHP System info',
     'php_gd_info'               => 'Kumele ufake i-php-gd ukubonisa amakhodi we-QR, bona imiyalo yokufaka.',
     'php_gd_warning'            => 'I-PHP Image Processing ne-GD plugin ayifakiwe.',
@@ -218,6 +227,8 @@ return [
     'webhook_integration_help'    => ':app integration is optional, however the endpoint and channel are required if you wish to use it. To configure :app integration, you must first <a href=":webhook_link" target="_new" rel="noopener">create an incoming webhook</a> on your :app account. Click on the <strong>Test :app Integration</strong> button to confirm your settings are correct before saving. ',
     'webhook_integration_help_button'    => 'Once you have saved your :app information, a test button will appear.',
     'webhook_test_help'           => 'Test whether your :app integration is configured correctly. YOU MUST SAVE YOUR UPDATED :app SETTINGS FIRST.',
+    'shortcuts_enabled'         => 'Enable Shortcuts',
+    'shortcuts_help_text'       => '<strong>Windows</strong>: Alt + Access key, <strong>Mac</strong>: Control + Option + Access key',
     'snipe_version'  			=> 'Inguqulo ye-Snipe-IT',
     'support_footer'            => 'Support Footer Links ',
     'support_footer_help'       => 'Specify who sees the links to the Snipe-IT Support info and Users Manual',
@@ -227,7 +238,6 @@ return [
     'update'                    => 'Buyekeza izilungiselelo',
     'value'                     => 'Inani',
     'brand'                     => 'Ukushayela',
-    'brand_keywords'            => 'footer, logo, print, theme, skin, header, colors, color, css',
     'brand_help'                => 'Logo, Site Name',
     'web_brand'                 => 'Web Branding Type',
     'about_settings_title'      => 'Mayelana nezilungiselelo',
@@ -276,6 +286,8 @@ return [
     'two_factor_enrollment_text'	=> "Ukuqinisekiswa okubili kokubili kuyadingeka, noma ngabe idivayisi yakho ayibhalisile okwamanje. Vula uhlelo lwakho lokusebenza lwe-Google Authenticator bese uskena ikhodi ye-QR ngezansi ukuze ubhalise idivayisi yakho. Uma usubhalisile idivayisi yakho, faka ikhodi ngezansi",
     'require_accept_signature'      => 'Kudinga isignesha',
     'require_accept_signature_help_text'      => 'Ukunika amandla lesi sici kuzodinga ukuthi abasebenzisi bakwazi ukusayina ngokomzimba ngokwamukela ifa.',
+    'require_checkinout_notes'  => 'Require Notes on Checkin/Checkout',
+    'require_checkinout_notes_help_text'    => 'Enabling this feature will require the note fields to be populated when checking in or checking out an asset.',
     'left'        => 'kwesokunxele',
     'right'        => 'kwesokudla',
     'top'        => 'phezulu',
@@ -313,24 +325,24 @@ return [
     'filter_by_keyword' => 'Filter by setting keyword',
     'security' => 'Security',
     'security_title' => 'Update Security Settings',
-    'security_keywords' => 'password, passwords, requirements, two factor, two-factor, common passwords, remote login, logout, authentication',
     'security_help' => 'Two-factor, Password Restrictions',
-    'groups_keywords' => 'permissions, permission groups, authorization',
     'groups_help' => 'Account permission groups',
     'localization' => 'Localization',
     'localization_title' => 'Update Localization Settings',
-    'localization_keywords' => 'localization, currency, local, locale, time zone, timezone, international, internatinalization, language, languages, translation',
     'localization_help' => 'Language, date display',
     'notifications' => 'Notifications',
     'notifications_help' => 'Email Alerts & Audit Settings',
     'asset_tags_help' => 'Incrementing and prefixes',
     'labels' => 'Labels',
     'labels_title' => 'Update Label Settings',
-    'labels_help' => 'Label sizes &amp; settings',
-    'purge_keywords' => 'permanently delete',
+    'labels_help' => 'Barcodes &amp; label settings',
     'purge_help' => 'Phenya Amarekhodi Asusiwe',
     'ldap_extension_warning' => 'It does not look like the LDAP extension is installed or enabled on this server. You can still save your settings, but you will need to enable the LDAP extension for PHP before LDAP syncing or login will work.',
     'ldap_ad' => 'LDAP/AD',
+    'ldap_test_label' => 'Test LDAP Sync',
+    'ldap_test_login' => ' Test LDAP Login',
+    'ldap_username_placeholder' => 'LDAP Username',
+    'ldap_password_placeholder' => 'LDAP Password',
     'employee_number' => 'Employee Number',
     'create_admin_user' => 'Create a User ::',
     'create_admin_success' => 'Success! Your admin user has been added!',
@@ -342,6 +354,8 @@ return [
     'setup_migration_create_user' => 'Next: Create User',
     'ldap_settings_link' => 'LDAP Settings Page',
     'slack_test' => 'Test <i class="fab fa-slack"></i> Integration',
+    'status_label_name' => 'Status Label Name',
+    'super_admin_only'  => 'Super Admin Only',
     'label2_enable'           => 'New Label Engine',
     'label2_enable_help'      => 'Switch to the new label engine. <b>Note: You will need to save this setting before setting others.</b>',
     'label2_template'         => 'Template',
@@ -356,12 +370,15 @@ return [
     'label2_2d_type'          => 'Uhlobo lwe-Barcode ye-2D',
     'label2_2d_type_help'     => 'Format for 2D barcodes',
     'label2_2d_target'        => '2D Barcode Target',
-    'label2_2d_target_help'   => 'The URL the 2D barcode points to when scanned',
+    'label2_2d_target_help'   => 'The data that will be contained in the 2D barcode',
     'label2_fields'           => 'Field Definitions',
     'label2_fields_help'      => 'Fields can be added, removed, and reordered in the left column. For each field, multiple options for Label and DataSource can be added, removed, and reordered in the right column.',
+    'purge_barcodes' => 'Purge Barcodes',
     'help_asterisk_bold'    => 'Text entered as <code>**text**</code> will be displayed as bold',
     'help_blank_to_use'     => 'Leave blank to use the value from <code>:setting_name</code>',
     'help_default_will_use' => '<code>:default</code> will use the value from <code>:setting_name</code>. <br>Note that the value of the barcodes must comply with the respective barcode spec in order to be successfully generated. Please see <a href="https://snipe-it.readme.io/docs/barcodes">the documentation <i class="fa fa-external-link"></i></a> for more details. ',
+    'asset_id'              => 'Asset ID',
+    'data'               => 'Data',
     'default'               => 'Default',
     'none'                  => 'None',
     'google_callback_help' => 'This should be entered as the callback URL in your Google OAuth app settings in your organization&apos;s <strong><a href="https://console.cloud.google.com/" target="_blank">Google developer console <i class="fa fa-external-link" aria-hidden="true"></i></a></strong>.',
@@ -373,7 +390,100 @@ return [
     'database_driver' => 'Database Driver',
     'bs_table_storage' => 'Table Storage',
     'timezone' => 'Timezone',
+    'test_mail' => 'Test Mail',
     'profile_edit'          => 'Edit Profile',
     'profile_edit_help'          => 'Allow users to edit their own profiles.',
+    'default_avatar' => 'Custom Default Avatar',
+    'default_avatar_help' => 'This image will be displayed as a profile if a user does not have a profile photo.',
+    'restore_default_avatar' => 'Restore <a href=":default_avatar" data-toggle="lightbox" data-type="image">original system default avatar</a>',
+    'restore_default_avatar_help' => '',
+    'due_checkin_days' => 'Due For Checkin Warning',
+    'due_checkin_days_help' => 'How many days before the expected checkin of an asset should it be listed in the "Due for checkin" page?',
+    'no_groups' => 'No groups have been created yet. Visit <code>Admin Settings > Permission Groups</code> to add one.',
+    'text' => 'Text',
+
+    'username_formats' => [
+        'username_format'		=> 'Igama lomsebenzisi Ifomethi',
+        'firstname_lastname_format'	=> 'Igama Lokuqala Igama Lokugcina (jane.smith)',
+        'first_name_format'	        => 'First Name (jane)',
+        'last_name_format'		=> 'Last Name (doe)',
+        'filastname_format'			=> 'First Initial Last Name (jsmith)',
+        'lastnamefirstinitial_format' =>  'Last Name First Initial (smithj)',
+        'firstname_lastname_underscore_format' => 'First Name Last Name (jane_smith)',
+        'firstinitial.lastname' => 'First Initial Last Name (j.smith)',
+        'lastname_firstinitial' => 'Last Name First Initial (smith_j)',
+        'lastname_dot_firstinitial_format' => 'Last Name First Initial (smith.j)',
+        'firstnamelastname'     => 'First Name Last Name (janesmith)',
+        'firstnamelastinitial'  => 'First Name Last Initial (janes)',
+        'lastnamefirstname'      => 'Last Name.First Name (smith.jane)',
+    ],
+
+    'email_formats' => [
+        'email_format'			=> 'Ifomethi ye-imeyli',
+        'firstname_lastname_format'	=> 'Igama Lokuqala Igama Lokugcina (jane.smith@example.com)',
+        'first_name_format'		=> 'Igama Lokuqala (jane@example.com)',
+        'last_name_format'		=> 'Last Name (doe@example.com)',
+        'filastname_format'			=> 'Igama Lokuqala Lokuqala Lokuqala (jsmith@example.com)',
+        'lastnamefirstinitial_format' =>  'Last Name First Initial (smithj@example.com)',
+        'firstname_lastname_underscore_format' => 'First Name Last Name (jane_smith@example.com)',
+        'firstinitial.lastname' => 'First Initial Last Name (j.smith@example.com)',
+        'lastname_firstinitial' => 'Last Name First Initial (smith_j@example.com)',
+        'lastname_dot_firstinitial_format' => 'Last Name First Initial (smith.j@example.com)',
+        'firstnamelastname'     => 'First Name Last Name (janesmith@example.com)',
+        'firstnamelastinitial'  => 'First Name Last Initial (janes@example.com)',
+        'lastnamefirstname'      => 'Last Name.First Name (smith.jane@example.com)',
+    ],
+
+
+
+    'logo_labels' => [
+        'acceptance_pdf_logo'       => 'PDF Logo',
+        'email_logo'                => 'Email Logo',
+        'label_logo'                => 'Label Logo',
+        'logo'                      => 'Site Logo',
+        'favicon'                   => 'Favicon',
+    ],
+
+    'logo_help' => [
+        'email_logo_size'       => 'Square logos in email look best. ',
+    ],
+
+    'logo_option_types' => [
+        'text' => 'Text',
+        'logo' => 'Ilogo',
+        'logo_and_text' => 'Logo and Text',
+    ],
+
+
+    'legends' => [
+        'scoping' => 'Scoping',
+        'formats' => 'Default Formats',
+        'profiles' => 'User Profiles',
+        'eula' => 'EULA & Acceptance Preferences',
+        'misc_display' => 'Miscellaneous Display Options',
+        'email' => 'Email Preferences',
+        'checkin' => 'Checkin Preferences',
+        'dashboard' => 'Login & Dashboard Preferences',
+        'misc' => 'Miscellaneous',
+        'logos' => 'Logos & Display',
+        'colors' => 'Colors & Skins',
+        'footer' => 'Footer Preferences',
+        'security' => 'Security Preferences',
+        'general' => 'General',
+        'intervals' => 'Intervals & Thresholds',
+    ],
+
+
+    /* Keywords for settings overview help */
+    'keywords' => [
+        'brand'             => 'footer, logo, print, theme, skin, header, colors, color, css',
+        'general_settings'  => 'company support, signature, acceptance, email format, username format, images, per page, thumbnail, eula, gravatar, tos, dashboard, privacy',
+        'groups'            => 'permissions, permission groups, authorization',
+        'labels'            => 'labels, barcodes, barcode, sheets, print, upc, qr, 1d, 2d',
+        'localization'      => 'localization, currency, local, locale, time zone, timezone, international, internatinalization, language, languages, translation',
+        'php_overview'      => 'phpinfo, system, info',
+        'purge'             => 'permanently delete',
+        'security'          => 'password, passwords, requirements, two factor, two-factor, common passwords, remote login, logout, authentication',
+    ],
 
 ];
diff --git a/resources/lang/zu-ZA/admin/settings/message.php b/resources/lang/zu-ZA/admin/settings/message.php
index 919ec82370..5f5c9a7fc1 100644
--- a/resources/lang/zu-ZA/admin/settings/message.php
+++ b/resources/lang/zu-ZA/admin/settings/message.php
@@ -14,6 +14,9 @@ return [
         'restore_warning'       => 'Yes, restore it. I acknowledge that this will overwrite any existing data currently in the database. This will also log out all of your existing users (including you).',
         'restore_confirm'       => 'Are you sure you wish to restore your database from :filename?'
     ],
+    'restore' => [
+        'success'               => 'Your system backup has been restored. Please log in again.'
+    ],
     'purge' => [
         'error'     => 'Kuvele iphutha ngenkathi kuhlanzwa.',
         'validation_failed'     => 'Isiqinisekiso sakho sokuhlanza asilungile. Sicela uthayiphe igama elithi "SUSELA" ebhokisini lokuqinisekisa.',
@@ -33,6 +36,9 @@ return [
         'testing_authentication' => 'Testing LDAP Authentication...',
         'authentication_success' => 'User authenticated against LDAP successfully!'
     ],
+    'labels' => [
+        'null_template' => 'Label template not found. Please select a template.',
+        ],
     'webhook' => [
         'sending' => 'Sending :app test message...',
         'success' => 'Your :webhook_name Integration works!',
@@ -42,5 +48,12 @@ return [
         'error' => 'Something went wrong. :app responded with: :error_message',
         'error_redirect' => 'ERROR: 301/302 :endpoint returns a redirect. For security reasons, we don’t follow redirects. Please use the actual endpoint.',
         'error_misc' => 'Something went wrong. :( ',
-    ]
+        'webhook_fail' => ' webhook notification failed: Check to make sure the URL is still valid.',
+        'webhook_channel_not_found' => ' webhook channel not found.',
+        'ms_teams_deprecation' => 'The selected Microsoft Teams webhook URL will be deprecated Dec 31st, 2025. Please use a workflow URL. Microsoft\'s documentation on creating a workflow can be found <a href="https://support.microsoft.com/en-us/office/create-incoming-webhooks-with-workflows-for-microsoft-teams-8ae491c7-0394-4861-ba59-055e33f75498" target="_blank"> here.</a>',
+    ],
+    'location_scoping' => [
+        'not_saved' => 'Your settings were not saved.',
+        'mismatch' => 'There is 1 item in the database that need your attention before you can enable location scoping.|There are :count items in the database that need your attention before you can enable location scoping.',
+    ],
 ];
diff --git a/resources/lang/zu-ZA/admin/statuslabels/table.php b/resources/lang/zu-ZA/admin/statuslabels/table.php
index 36a3ba0f69..db585cf577 100644
--- a/resources/lang/zu-ZA/admin/statuslabels/table.php
+++ b/resources/lang/zu-ZA/admin/statuslabels/table.php
@@ -1,14 +1,14 @@
 <?php
 
 return array(
-    'about'      	=> 'Mayelana namalebula wesimo',
+    'about'      	=> 'About Status Types',
     'archived'      	=> 'I-Archived',
     'create'      	=> 'Dala Ithebula Lesimo',
     'color'      	=> 'Umbala weshadi',
     'default_label' => 'Default Label',
     'default_label_help' => 'This is used to ensure your most commonly used status labels appear at the top of the select box when creating/editing assets.',
     'deployable'      	=> 'Iyasebenza',
-    'info'      	=> 'Amalebula wesimo asetshenziselwa ukuchaza okuhlukahlukene ukuthi izimpahla zakho zingangena. Zingase zibe khona ukulungiswa, ukulahleka / ukwebiwa, njll. Ungakha amalebula wombuso amasha wezimpahla ezingasetshenziswa, ezilindile kanye nezinqolobane zomlando.',
+    'info'      	=> 'Status label types are used to describe the various states your assets could be in. They may be out for repair, lost/stolen, etc. You can create new status labels for your deployable, pending and archived assets according to your own workflow. For more information, <a href="https://snipe-it.readme.io/docs/overview#status-labels" target="_blank">see the documentation <i class="fa fa-external-link"></i></a>.',
     'name'      	=> 'Igama lesimo',
     'pending'      	=> 'Kulindile',
     'status_type'   => 'Uhlobo lomumo',
diff --git a/resources/lang/zu-ZA/admin/users/general.php b/resources/lang/zu-ZA/admin/users/general.php
index de2090723a..8753986098 100644
--- a/resources/lang/zu-ZA/admin/users/general.php
+++ b/resources/lang/zu-ZA/admin/users/general.php
@@ -19,6 +19,8 @@ return [
     'print_assigned'    => 'Print All Assigned',
     'email_assigned'    => 'Email List of All Assigned',
     'user_notified'     => 'User has been emailed a list of their currently assigned items.',
+    'users_notified'    => 'The user has been emailed a list of their currently assigned items.|:count users have been emailed a list of their currently assigned items.',
+    'users_notified_warning' => ':count user has been emailed a list of their currently assigned items, however :no_email users did not have an email address so could not be emailed.|:count users have been emailed a list of their currently assigned items, however :no_email user(s) did not have an email address so could not be emailed.',
     'auto_assign_label' => 'Include this user when auto-assigning eligible licenses',
     'auto_assign_help'  => 'Skip this user in auto assignment of licenses',
     'software_user'     => 'Isofthiwe ihlolwe ku: igama',
diff --git a/resources/lang/zu-ZA/admin/users/message.php b/resources/lang/zu-ZA/admin/users/message.php
index cf9786a5ea..3b1021ce29 100644
--- a/resources/lang/zu-ZA/admin/users/message.php
+++ b/resources/lang/zu-ZA/admin/users/message.php
@@ -6,7 +6,7 @@ return array(
     'declined'                  => 'Uye wenqaba ngempumelelo le mali.',
     'bulk_manager_warn'	        => 'Abasebenzisi bakho babuyekezwe ngempumelelo, kodwa ukungena kwakho kwemenenja akulondoloziwe ngoba umphathi oyikhethile naye ohlwini lomsebenzisi oluzohlelwa, futhi abasebenzisi bangase bangabi umphathi wabo. Sicela ukhethe abasebenzisi bakho futhi, ngaphandle kwamenenja.',
     'user_exists'               => 'Umsebenzisi usuvele ukhona!',
-    'user_not_found'            => 'Umsebenzisi akakho.',
+    'user_not_found'            => 'User does not exist or you do not have permission view them.',
     'user_login_required'       => 'Insimu yokungena ngemvume iyadingeka',
     'user_has_no_assets_assigned' => 'No assets currently assigned to user.',
     'user_password_required'    => 'Iphasiwedi iyadingeka.',
@@ -53,6 +53,7 @@ return array(
         'ldap_could_not_search' => 'Ayikwazanga ukusesha isiphakeli se-LDAP. Sicela uhlole ukumisa kweseva yakho ye-LDAP kufayili ye-LDAP config. <br>Iphutha kusuka kwiseva ye-LDAP:',
         'ldap_could_not_get_entries' => 'Ayikwazanga ukungena okuvela kuseva ye-LDAP. Sicela uhlole ukumisa kweseva yakho ye-LDAP kufayili ye-LDAP config. <br>Iphutha kusuka kwiseva ye-LDAP:',
         'password_ldap' => 'Iphasiwedi yale akhawunti ilawulwa yi-LDAP / Active Directory. Sicela uxhumane nomnyango wakho we-IT ukushintsha iphasiwedi yakho.',
+        'multi_company_items_assigned' => 'This user has items assigned that belong to a different company. Please check them in or edit their company.'
     ),
 
     'deletefile' => array(
diff --git a/resources/lang/zu-ZA/admin/users/table.php b/resources/lang/zu-ZA/admin/users/table.php
index c7962792c5..b3433d4583 100644
--- a/resources/lang/zu-ZA/admin/users/table.php
+++ b/resources/lang/zu-ZA/admin/users/table.php
@@ -22,7 +22,7 @@ return array(
     'managed_locations'     => 'Izindawo eziphethwe',
     'managed_users'         => 'Managed Users',
     'name' 					=> 'Igama',
-    'nogroup'               => 'No groups have been created yet. To add one, visit: ',
+    'nogroup'               => 'No groups have been created yet. To add one, visit:',
     'notes'                 => 'Amanothi',
     'password_confirm' 		=> 'Qinisekisa Iphasiwedi',
     'password' 				=> 'Iphasiwedi',
diff --git a/resources/lang/zu-ZA/auth.php b/resources/lang/zu-ZA/auth.php
index db310aa1bb..14d8acfce0 100644
--- a/resources/lang/zu-ZA/auth.php
+++ b/resources/lang/zu-ZA/auth.php
@@ -15,6 +15,6 @@ return array(
 
     'failed' => 'These credentials do not match our records.',
     'password' => 'The provided password is incorrect.',
-    'throttle' => 'Too many login attempts. Please try again in :seconds seconds.',
+    'throttle' => 'Too many login attempts. Please try again in :minutes minute(s).',
 
 );
diff --git a/resources/lang/zu-ZA/auth/message.php b/resources/lang/zu-ZA/auth/message.php
index 631e3abf8f..7be82f8313 100644
--- a/resources/lang/zu-ZA/auth/message.php
+++ b/resources/lang/zu-ZA/auth/message.php
@@ -6,8 +6,6 @@ return array(
     'account_not_found'      => 'Igama lomsebenzisi noma iphasiwedi alilungile.',
     'account_not_activated'  => 'Le akhawunti yomsebenzisi ayisebenzi.',
     'account_suspended'      => 'Le akhawunti yomsebenzisi imiswe okwesikhashana.',
-    'account_banned'         => 'Le akhawunti yomsebenzisi ivaliwe.',
-    'throttle'               => 'Too many failed login attempts. Please try again in :minutes minutes.',
 
     'two_factor' => array(
         'already_enrolled'      => 'Your device is already enrolled.',
diff --git a/resources/lang/zu-ZA/button.php b/resources/lang/zu-ZA/button.php
index f040bfda03..641db85fb4 100644
--- a/resources/lang/zu-ZA/button.php
+++ b/resources/lang/zu-ZA/button.php
@@ -7,6 +7,7 @@ return [
     'checkin_and_delete'  	    => 'Checkin All / Delete User',
     'delete'  	                => 'Susa',
     'edit'    	                => 'Hlela',
+    'clone'    	                => 'Clone',
     'restore' 	                => 'Buyisela',
     'remove'                    => 'Remove',
     'request'                   => 'Isicelo',
@@ -21,4 +22,13 @@ return [
     'add_maintenance'           => 'Add Maintenance',
     'append'                    => 'Append',
     'new'                       => 'Okusha',
+    'var' => [
+        'clone'     => 'Clone :item_type',
+        'edit'      => 'Edit :item_type',
+        'delete'    => 'Delete :item_type',
+        'restore'   => 'Restore :item_type',
+        'create'    => 'Create New :item_type',
+        'checkout'  => 'Checkout :item_type',
+        'checkin'   => 'Checkin :item_type',
+    ]
 ];
diff --git a/resources/lang/zu-ZA/general.php b/resources/lang/zu-ZA/general.php
index 1cae6031b9..0fae29827d 100644
--- a/resources/lang/zu-ZA/general.php
+++ b/resources/lang/zu-ZA/general.php
@@ -10,7 +10,7 @@ return [
     'action'                => 'Isenzo',
     'activity_report'		=> 'Umbiko Womsebenzi',
     'address'				=> 'Ikheli',
-    'admin'					=> 'Ukuphatha',
+    'admin'					=> 'Admin Settings',
     'admin_tooltip'			=> 'This user has admin privileges',
     'superuser'				=> 'Superuser',
     'superuser_tooltip'		=> 'This user has superuser privileges',
@@ -23,13 +23,16 @@ return [
     'asset_models'			=> 'Amamodeli asefa',
     'asset_model'			=> 'Isibonelo',
     'asset'					=> 'Impahla',
+    'asset_previous'        => 'Asset (Previously Assigned)',
     'asset_report'          => 'Umbiko wezezimali',
     'asset_tag'				=> 'Ithegi lefa',
     'asset_tags'            => 'Asset Tags',
     'assets_available'		=> 'Assets available',
     'accept_assets'         => 'Accept Assets :name',
     'accept_assets_menu'    => 'Accept Assets',
+    'accept_item'           => 'Accept Item',
     'audit'				    => 'I-Audit',
+    'audits'				=> 'Audits',
     'audit_report'			=> 'I-Audit Log',
     'assets'				=> 'Amafa',
     'assets_audited'        => 'assets audited',
@@ -61,9 +64,12 @@ return [
     'changepassword'  		=> 'SHINTSHA iphasiwedi',
     'checkin'  				=> 'Ngena',
     'checkin_from'  		=> 'Hlola kusuka',
+    'checkin_note'  		=> 'Checkin Note',
+    'checkout_note'  		=> 'Checkout Note',
     'checkout'  			=> 'Hlola',
     'checkouts_count'       => 'Checkouts',
     'checkins_count'        => 'Checkins',
+    'checkin_and_delete'  	=> 'Checkin and Delete',
     'user_requests_count'   => 'Requests',
     'city'  				=> 'Idolobha',
     'click_here'			=> 'Chofoza lapha',
@@ -77,7 +83,7 @@ return [
     'consumables'			=> 'Amakhomikhali',
     'country'  				=> 'Izwe',
     'could_not_restore'     => 'Error restoring :item_type: :error',
-    'not_deleted'           => 'The :item_type is not deleted so it cannot be restored',
+    'not_deleted'           => 'The :item_type was not deleted and therefore cannot be restored',
     'create'				=> 'Dala Okusha',
     'created'               => 'Into edalwe',
     'created_asset'			=> 'ifa elidalwe',
@@ -86,11 +92,13 @@ return [
     'record_created' 		=> 'Record Created',
     'updated_at' 			=> 'Kubuyekezwe ku',
     'currency'  			=> '$', // this is deprecated
+    'currency_text'  		=> 'Currency', //
     'current'  				=> 'Okwamanje',
     'current_password'      => 'Current Password',
     'customize_report'      => 'Customize Report',
     'custom_report'         => 'Umbiko wezezimali ngokwezifiso',
     'dashboard'				=> 'Ideshibhodi',
+    'data_source'           => 'Data Source',
     'days'      			=> 'izinsuku',
     'days_to_next_audit'    => 'Izinsuku kuya ku-Audit Elandelayo',
     'date'					=> 'Usuku',
@@ -98,7 +106,7 @@ return [
     'debug_warning_text'    => 'Lolu hlelo lokusebenza lusemodi yokukhiqiza ngokususa iphutha kunikwe amandla. Lokhu kungabonisa idatha ebucayi uma isicelo sakho sifinyeleleka ezweni langaphandle. Khubaza imodi yokulungisa iphutha ngokubeka inani le-<code>APP_DEBUG</code> kufayela lakho le-<code>.env</code> kuya ku-<code>false</code>.',
     'delete'  				=> 'Susa',
     'delete_confirm'  		=> 'Are you sure you wish to delete :item?',
-    'delete_confirm_no_undo' => 'Are you sure you wish to delete :item? This can not be undone.',
+    'delete_confirm_no_undo' => 'Are you sure, you wish to delete :item? This cannot be undone.',
     'deleted'  				=> 'Isusiwe',
     'delete_seats'  		=> 'Izihlalo ezifakiwe',
     'deletion_failed'       => 'Deletion failed',
@@ -114,29 +122,13 @@ return [
     'editprofile'  			=> 'Hlela iphrofayela yakho',
     'eol'					=> 'I-EOL',
     'email_domain'			=> 'Domain Imeyili',
-    'email_format'			=> 'Ifomethi ye-imeyli',
     'employee_number'       => 'Employee Number',
     'email_domain_help'		=> 'Lokhu kusetshenziselwa ukhiqiza amakheli e-imeyili uma ungenisa',
     'error'				    => 'Error',
     'exclude_archived'      => 'Exclude Archived Assets',
     'exclude_deleted'       => 'Exclude Deleted Assets',
     'example'				=> 'Example: ',
-    'filastname_format'			=> 'Igama Lokuqala Lokuqala Lokuqala (jsmith@example.com)',
-    'firstname_lastname_format'	=> 'Igama Lokuqala Igama Lokugcina (jane.smith@example.com)',
-    'firstname_lastname_underscore_format' => 'First Name Last Name (jane_smith@example.com)',
-    'lastnamefirstinitial_format' =>  'Last Name First Initial (smithj@example.com)',
-    'firstintial_dot_lastname_format' => 'First Initial Last Name (j.smith@example.com)',
-    'firstname_lastname_display'	=> 'First Name Last Name (Jane Smith)',
-    'lastname_firstname_display'	=> 'Last Name First Name (Smith Jane)',
-    'name_display_format'	=> 'Name Display Format',
-    'first'					=> 'Okokuqala',
-    'firstnamelastname'     => 'First Name Last Name (janesmith@example.com)',
-    'lastname_firstinitial' => 'Last Name First Initial (smith_j@example.com)',
-    'firstinitial.lastname' => 'First Initial Last Name (j.smith@example.com)',
-    'firstnamelastinitial'  => 'First Name Last Initial (janes@example.com)',
-    'lastnamefirstname'      => 'Last Name First Name (smith.jane@example.com)',
-    'first_name'			=> 'Igama',
-    'first_name_format'		=> 'Igama Lokuqala (jane@example.com)',
+
     'files'                 => 'Files',
     'file_name'				=> 'Ifayela',
     'file_type'             => 'File Type',
@@ -156,9 +148,9 @@ return [
     'image_delete'         	=> 'Susa isithombe',
     'include_deleted'       => 'Include Deleted Assets',
     'image_upload'         	=> 'Layisha isithombe',
-    'filetypes_accepted_help'    => 'Accepted filetype is :types. Max upload size allowed is :size.|Accepted filetypes are :types. Max upload size allowed is :size.',
-    'filetypes_size_help'   => 'Max upload size allowed is :size.',
-    'image_filetypes_help'  => 'Accepted filetypes are jpg, webp, png, gif, svg, and avif. Max upload size allowed is :size.',
+    'filetypes_accepted_help'    => 'Accepted filetype is :types. The maximum size allowed is :size.|Accepted filetypes are :types. The maximum upload size allowed is :size.',
+    'filetypes_size_help'   => 'The maximum upload size allowed is :size.',
+    'image_filetypes_help'  => 'Accepted Filetypes are jpg, webp, png, gif, svg, and avif. The maximum upload size allowed is :size.',
     'unaccepted_image_type'  => 'This image file was not readable. Accepted filetypes are jpg, webp, png, gif, and svg. The mimetype of this file is: :mimetype.',
     'import'         	    => 'Ngenisa',
     'import_this_file'      => 'Map fields and process this file',
@@ -178,12 +170,17 @@ return [
     'last'					=> 'Okokugcina',
     'last_login'            => 'Ukungena ngemvume kokugcina',
     'last_name'             => 'Isibongo',
+    'firstname_lastname_display'	=> 'First Name Last Name (Jane Smith)',
+    'lastname_firstname_display'	=> 'Last Name First Name (Smith Jane)',
+    'name_display_format'	=> 'Name Display Format',
+    'first'					=> 'Okokuqala',
+    'first_name'			=> 'Igama',
     'license'				=> 'Ilayisensi',
     'license_report'        => 'Umbiko Welayisense',
     'licenses_available'	=> 'Licenses available',
     'licenses'				=> 'Amalayisensi',
     'list_all'				=> 'Bhala konke',
-    'loading'				=> 'Loading... please wait....',
+    'loading'				=> 'Loading... please wait...',
     'lock_passwords'        => 'This field value will not be saved in a demo installation.',
     'feature_disabled'      => 'Lesi sici sikhutshaziwe ukufakwa kwedemo.',
     'location'              => 'Indawo',
@@ -193,7 +190,7 @@ return [
     'logout'				=> 'Phuma',
     'lookup_by_tag'     => 'Ukubheka nge-Tag Tag',
     'maintenances'          => 'Maintenances',
-    'manage_api_keys'       => 'Manage API Keys',
+    'manage_api_keys'       => 'Manage API keys',
     'manufacturer'			=> 'Umkhiqizi',
     'manufacturers'			=> 'Abakhiqizi',
     'markdown'				=> 'Le nsimu ivumela i-<a href="https://help.github.com/articles/github-flavored-markdown/">I-markdown ekhanyisiwe</a>.',
@@ -215,6 +212,14 @@ return [
     'no_results'			=> 'Ayikho imiphumela.',
     'no'  					=> 'Cha',
     'notes'  				=> 'Amanothi',
+    'note_added'            => 'Note Added',
+    'options'				=> 'Options',
+    'preview'				=> 'Preview',
+    'add_note'              => 'Add Note',
+    'note_edited'            => 'Note Edited',
+    'edit_note'              => 'Edit Note',
+    'note_deleted'            => 'Note Deleted',
+    'delete_note'              => 'Delete Note',
     'order_number'          => 'Inombolo Ye-oda',
     'only_deleted'          => 'Only Deleted Assets',
     'page_menu'				=> 'Ibonisa izinto ezingu-_MENU_',
@@ -229,7 +234,7 @@ return [
     'purchase_date'         => 'Usuku lokuthenga',
     'qty'		            => 'QTY',
     'quantity'		        => 'Inani',
-    'quantity_minimum'      => 'You have :count items below or almost below minimum quantity levels',
+    'quantity_minimum'      => 'You have one item below or almost below minimum quantity levels|You have :count items below or almost below minimum quantity levels',
     'quickscan_checkin'  	=> 'Quick Scan Checkin',
     'quickscan_checkin_status'  	=> 'Checkin Status',
     'ready_to_deploy'		=> 'Ukulungele Ukusebenzisa',
@@ -254,7 +259,7 @@ return [
     'select_all'            => 'Select All',
     'search'				=> 'Sesha',
     'select_category'       => 'Khetha Isigaba',
-    'select_datasource' => 'Select a Datasource',
+    'select_datasource' => 'Select a data source',
     'select_department'     => 'Khetha uMnyango',
     'select_depreciation'	=> 'Khetha uhlobo lokuncipha',
     'select_location'		=> 'Khetha indawo',
@@ -274,13 +279,15 @@ return [
     'signed_off_by'         => 'Signed Off By',
     'skin'       			=> 'Skin',
     'webhook_msg_note'        => 'A notification will be sent via webhook',
-    'webhook_test_msg'        => 'Oh hai! Looks like your :app integration with Snipe-IT is working!',
+    'webhook_test_msg'        => 'Oh hai! It looks like your :app integration with Snipe-IT is working!',
     'some_features_disabled' => 'I-DEMO MODE: Ezinye izici zikhutshaziwe ngalokhu kufakwa futhi idatha kule nqubo izosetha kabusha nsuku zonke.',
     'site_name'				=> 'Igama lesayithi',
     'state'  				=> 'Isimo',
     'status_labels'			=> 'Amalebula wesimo',
+    'status_label'			=> 'Status Label',
     'status'    			=> 'Isimo',
     'accept_eula'           => 'Acceptance Agreement',
+    'show_or_hide_eulas' => 'Show/Hide EULAs',
     'supplier'              => 'Umphakeli',
     'suppliers'  			=> 'Abahlinzeki',
     'sure_to_delete'        => 'Uqinisekile ukuthi ufisa ukususa',
@@ -296,9 +303,9 @@ return [
     'type'  				=> 'Thayipha',
     'undeployable'			=> 'I-non-deployable',
     'unknown_admin'			=> 'Isilawuli esingaziwa',
-    'username_format'		=> 'Igama lomsebenzisi Ifomethi',
     'username'              => 'Igama lomsebenzisi',
     'update'                => 'Ukubuyekeza',
+    'updating_item' => 'Updating :item',
     'upload_filetypes_help'      => 'Allowed filetypes are png, gif, jpg, jpeg, doc, docx, pdf, xls, xlsx, txt, lic, xml, zip, rtf and rar. Max upload size allowed is :size.',
     'uploaded'              => 'Ilayishiwe',
     'user'					=> 'Umsebenzisi',
@@ -323,10 +330,10 @@ return [
     'token_expired'         => 'Isikhathi sakho sefomu siphelelwe yisikhathi. Ngicela uzame futhi.',
     'login_enabled'         => 'Login Enabled',
     'audit_due'             => 'Due for Audit',
-    'audit_due_days'        => 'Assets Due for Audit Within :days Day|Assets Due for Audit Within :days Days',
+    'audit_due_days'        => '{}Assets Due or Overdue for Audit|[1]Assets Due or Overdue for Audit Within a Day|[2,*]Assets Due or Overdue for Audit Within :days Days',
     'checkin_due'           => 'Due for Checkin',
     'checkin_overdue'       => 'Overdue for Checkin',
-    'checkin_due_days'      => 'Assets Due for Checkin Within :days Day|Assets Due for Checkin Within :days Days',
+    'checkin_due_days'      => '{}Due for Checkin|[1]Assets Due for Checkin Within :days Day|[2,*]Assets Due for Checkin Within :days Days',
     'audit_overdue'         => 'Overdue for Audit',
     'accept'                => 'Accept :asset',
     'i_accept'              => 'I accept',
@@ -339,16 +346,16 @@ return [
     'view_all'              => 'view all',
     'hide_deleted'          => 'Hide Deleted',
     'email'                 => 'I-imeyili',
-    'do_not_change'         => 'Do Not Change',
-    'bug_report'            => 'Report a Bug',
+    'do_not_change'         => 'Do not change',
+    'bug_report'            => 'Report a bug',
     'user_manual'           => 'User\'s Manual',
     'setup_step_1'          => 'Step 1',
     'setup_step_2'          => 'Step 2',
     'setup_step_3'          => 'Step 3',
     'setup_step_4'          => 'Step 4',
     'setup_config_check'    => 'Configuration Check',
-    'setup_create_database' => 'Create Database Tables',
-    'setup_create_admin'    => 'Create Admin User',
+    'setup_create_database' => 'Create database tables',
+    'setup_create_admin'    => 'Create an admin user',
     'setup_done'            => 'Finished!',
     'bulk_edit_about_to'    => 'You are about to edit the following: ',
     'checked_out'           => 'Ikhishiwe',
@@ -383,6 +390,8 @@ return [
     'new_license'           => 'New License',
     'new_accessory'         => 'New Accessory',
     'new_consumable'        => 'New Consumable',
+    'new_component'         => 'New Component',
+    'new_user'              => 'New User',
     'collapse'              => 'Collapse',
     'assigned'              => 'Assigned',
     'asset_count'           => 'Asset Count',
@@ -418,19 +427,20 @@ return [
     'bulk_soft_delete'      =>'Also soft-delete these users. Their asset history will remain intact unless/until you purge deleted records in the Admin Settings.',
     'bulk_checkin_delete_success' => 'Your selected users have been deleted and their items have been checked in.',
     'bulk_checkin_success' => 'The items for the selected users have been checked in.',
-    'set_to_null'           => 'Delete values for this asset|Delete values for all :asset_count assets ',
+    'set_to_null'           => 'Delete values for this selection|Delete values for all :selection_count selections ',
     'set_users_field_to_null'  => 'Delete :field values for this user|Delete :field values for all :user_count users ',
     'na_no_purchase_date'   => 'N/A - No purchase date provided',
     'assets_by_status'      => 'Assets by Status',
     'assets_by_status_type'      => 'Assets by Status Type',
     'pie_chart_type'        => 'Dashboard Pie Chart Type',
     'hello_name'            => 'Hello, :name!',
-    'unaccepted_profile_warning'   => 'You have :count items requiring acceptance. Click here to accept or decline them',
+    'unaccepted_profile_warning'   => 'You have one item requiring acceptance. Click here to accept or decline it | You have :count items requiring acceptance. Click here to accept or decline them',
     'start_date'            => 'Start Date',
     'end_date'            => 'End Date',
     'alt_uploaded_image_thumbnail' => 'Uploaded thumbnail',
     'placeholder_kit'       => 'Select a kit',
     'file_not_found'        => 'File not found',
+    'log_record_not_found'  => 'No record for that log entry was found.',
     'preview_not_available' => '(no preview)',
     'setup'                 => 'Setup',
     'pre_flight'            => 'Pre-Flight',
@@ -512,7 +522,7 @@ return [
     'checked_out_to_fields' => 'Checked Out To Fields',
     'percent_complete' => '% qedela',
     'uploading' => 'Uploading... ',
-    'upload_error' => 'Error uploading file. Please check that there are no empty rows and that no column names are duplicated.',
+    'upload_error' => 'Error uploading file. Please check that you have no empty rows or duplicated column names in your CSV, and that the server permissions allow uploads.',
     'copy_to_clipboard' => 'Copy to Clipboard',
     'copied' => 'Copied!',
     'status_compatibility' => 'If assets are already assigned, they cannot be changed to a non-deployable status type and this value change will be skipped.',
@@ -549,6 +559,71 @@ return [
         'license_seats'  => ':count License Seat|:count License Seats',
         'consumables'  => ':count Consumable|:count Consumables',
         'components'  => ':count Component|:count Components',
-    ]
+    ],
+
+    'more_info' => 'Ulwazi oluningi',
+    'quickscan_bulk_help' => 'Checking this box will edit the asset record to reflect this new location. Leaving it unchecked will simply note the location in the audit log. Note that if this asset is checked out, it will not change the location of the person, asset or location it is checked out to.',
+    'whoops' => 'Whoops!',
+    'something_went_wrong' => 'Something went wrong with your request.',
+    'close' => 'Close',
+    'expires' => 'Iphelelwa yisikhathi',
+    'map_fields'=> 'Map :item_type Fields',
+    'remaining_var' => ':count Remaining',
+    'label' => 'Label',
+    'import_asset_tag_exists' => 'An asset with the asset tag :asset_tag already exists and an update was not requested. No change was made.',
+    'countries_manually_entered_help' => 'Values with an asterisk (*) were manually entered and do not match existing ISO 3166 dropdown values',
+    'accessories_assigned' => 'Assigned Accessories',
+    'user_managed_passwords' => 'Password Management',
+    'user_managed_passwords_disallow' => 'Disallow users from managing their own passwords',
+    'user_managed_passwords_allow' => 'Allow users to manage their own passwords',
+    'from' => 'From',
+    'by' => 'Ngu',
+
+// Add form placeholders here
+    'placeholders' => [
+        'notes'  => 'Add a note',
+    ],
+
+    'breadcrumb_button_actions' => [
+        'edit_item' => 'Edit :name',
+        'checkout_item' => 'Checkout :name',
+        'checkin_item' => 'Checkin :name',
+    ],
+
+    'skins' => [
+        'site_default' => 'Site Default',
+        'default_blue' => 'Default Blue',
+        'blue_dark' => 'Blue (Dark Mode)',
+        'green' => 'Green Dark',
+        'green_dark' => 'Green (Dark Mode)',
+        'red' => 'Red Dark',
+        'red_dark' => 'Red (Dark Mode)',
+        'orange' => 'Orange Dark',
+        'orange_dark' => 'Orange (Dark Mode)',
+        'black' => 'Black',
+        'black_dark' => 'Black (Dark Mode)',
+        'purple' => 'Purple',
+        'purple_dark' => 'Purple (Dark Mode)',
+        'yellow' => 'Yellow',
+        'yellow_dark' => 'Yellow (Dark Mode)',
+        'high_contrast' => 'High Contrast',
+
+    ],
+
+    'select_all_none' => 'Select/Unselect All',
+    'generic_model_not_found' => 'That :model was not found or you do not have permission to access it',
+    'deleted_models' => 'Deleted Asset Models',
+    'deleted_users' => 'Deleted Users',
+    'cost_each' => ':amount each',
+    'remove_current_image' => 'Remove current :type image',
+
+    'seeding' => [
+        'manufacturers' => [
+            'button' => 'Create Manufacturers',
+            'prompt' => 'You do not have any manufacturers yet. Would you like to seed a list of common manufacturers? (THIS WILL OVERWRITE EXISTING MANUFACTURERS, including those that have been soft-deleted.)',
+            'success' => 'Manufacturers seeded successfully',
+            'error' => 'Could not seed manufacturers. A manufacturer record already exists and seeding would overwrite it.|Could not seed manufacturers. :count manufacturer records already exist and seeding would overwrite them.',
+        ],
+    ],
 
 ];
diff --git a/resources/lang/zu-ZA/localizations.php b/resources/lang/zu-ZA/localizations.php
index f1232dd138..827ed4fca1 100644
--- a/resources/lang/zu-ZA/localizations.php
+++ b/resources/lang/zu-ZA/localizations.php
@@ -2,7 +2,7 @@
 
 return [
 
-    'select_language' => 'Select a language',
+    'select_language' => 'Select a Language',
     'languages' => [
         'en-US'=> 'English, US',
         'en-GB'=> 'English, UK',
@@ -40,7 +40,9 @@ return [
         'ms-MY'=> 'Malay',
         'mi-NZ'=> 'Maori',
         'mn-MN'=> 'Mongolian',
-        'no-NO'=> 'Norwegian',
+        'nb-NO'=> 'Norwegian Bokmål',
+        'om-ET' => 'Oromo (Ethiopian)',
+        //'nn-NO'=> 'Norwegian Nynorsk',
         'fa-IR'=> 'Persian',
         'pl-PL'=> 'Polish',
         'pt-PT'=> 'Portuguese',
@@ -66,7 +68,7 @@ return [
         'zu-ZA'=> 'Zulu',
     ],
 
-    'select_country' => 'Select a country',
+    'select_country' => 'Select a Country',
     
     'countries' => [
         'AC'=>'Ascension Island',
@@ -133,6 +135,7 @@ return [
         'EC'=>'Ecuador',
         'EE'=>'Estonia',
         'EG'=>'Egypt',
+        'GB-ENG'=>'England',
         'ER'=>'Eritrea',
         'ES'=>'Spain',
         'ET'=>'Ethiopia',
@@ -231,6 +234,7 @@ return [
         'NG'=>'Nigeria',
         'NI'=>'Nicaragua',
         'NL'=>'Netherlands',
+        'GB-NIR' => 'Northern Ireland',
         'NO'=>'Norway',
         'NP'=>'Nepal',
         'NR'=>'Nauru',
@@ -258,7 +262,7 @@ return [
         'RU'=>'Russian Federation',
         'RW'=>'Rwanda',
         'SA'=>'Saudi Arabia',
-        'UK'=>'Scotland',
+        'GB-SCT'=>'Scotland',
         'SB'=>'Solomon Islands',
         'SC'=>'Seychelles',
         'SS'=>'South Sudan',
@@ -310,6 +314,7 @@ return [
         'VI'=>'Virgin Islands (U.S.)',
         'VN'=>'Viet Nam',
         'VU'=>'Vanuatu',
+        'GB-WLS' =>'Wales',
         'WF'=>'Wallis And Futuna Islands',
         'WS'=>'Samoa',
         'YE'=>'Yemen',
diff --git a/resources/lang/zu-ZA/mail.php b/resources/lang/zu-ZA/mail.php
index 5ce920eb6f..b4a589c508 100644
--- a/resources/lang/zu-ZA/mail.php
+++ b/resources/lang/zu-ZA/mail.php
@@ -23,24 +23,25 @@ return [
     'Item_Requested' => 'Into ifunwe',
     'License_Checkin_Notification' => 'License checked in',
     'License_Checkout_Notification' => 'License checked out',
+    'license_for'   => 'License for',
     'Low_Inventory_Report' => 'Umbiko Wokungenisa Okuphansi',
     'a_user_canceled' => 'Umsebenzisi ukhanse isicelo sezinto kuwebhusayithi',
     'a_user_requested' => 'Umsebenzisi ucele into ku-website',
     'acceptance_asset_accepted' => 'A user has accepted an item',
     'acceptance_asset_declined' => 'A user has declined an item',
-    'accessory_name' => 'Igama lokufinyelela:',
-    'additional_notes' => 'Amanothi angeziwe:',
+    'accessory_name' => 'Igama lokufinyelela',
+    'additional_notes' => 'Amanothi angeziwe',
     'admin_has_created' => 'Umlawuli udale i-akhawunti kuwe: iwebhusayithi yewebhu.',
-    'asset' => 'Impahla:',
-    'asset_name' => 'Igama lomhlaba:',
+    'asset' => 'Impahla',
+    'asset_name' => 'Igama lefa',
     'asset_requested' => 'Ifa liceliwe',
     'asset_tag' => 'Ithegi lefa',
     'assets_warrantee_alert' => 'There is :count asset with a warranty expiring in the next :threshold days.|There are :count assets with warranties expiring in the next :threshold days.',
     'assigned_to' => 'Kwabiwa Ku',
     'best_regards' => 'Ozithobayo,',
-    'canceled' => 'Ikhanseliwe:',
-    'checkin_date' => 'Usuku lokuhlola:',
-    'checkout_date' => 'Usuku lokuhlola:',
+    'canceled' => 'Ikhanseliwe',
+    'checkin_date' => 'Usuku lokuhlola',
+    'checkout_date' => 'Usuku lokuhlola',
     'checkedout_from' => 'Checked out from',
     'checkedin_from'  => 'Checked in from',
     'checked_into' => 'Checked into',
@@ -49,27 +50,30 @@ return [
     'click_to_confirm' => 'Sicela uchofoze kusixhumanisi esilandelayo ukuqinisekisa i-akhawunti yakho yewebhu:',
     'current_QTY' => 'I-QTY yamanje',
     'days' => 'Izinsuku',
-    'expecting_checkin_date' => 'Ilanga le-Checkin elilindelekile:',
+    'expecting_checkin_date' => 'Ilanga le-Checkin elilindelekile',
     'expires' => 'Iphelelwa yisikhathi',
     'hello' => 'Sawubona',
     'hi' => 'Sawubona',
     'i_have_read' => 'Ngifunde futhi ngiyavumelana nemigomo yokusetshenziswa, futhi ngithole le nto.',
     'inventory_report' => 'Inventory Report',
-    'item' => 'Into:',
+    'item' => 'Into',
+    'item_checked_reminder' => 'This is a reminder that you currently have :count items checked out to you that you have not accepted or declined. Please click the link below to confirm your decision.',
     'license_expiring_alert' => 'There is :count license expiring in the next :threshold days.|There are :count licenses expiring in the next :threshold days.',
     'link_to_update_password' => 'Sicela uchofoze kusixhumanisi esilandelayo ukuze ubuyekeze: iphasiwedi yakho yewebhu:',
-    'login' => 'Ngena ngemvume:',
+    'login' => 'Ngena ngemvume',
     'login_first_admin' => 'Ngena ngemvume ekufakweni kwakho okusha kwe-Snipe-IT usebenzisa iziqinisekiso ezingezansi:',
     'low_inventory_alert' => 'There is :count item that is below minimum inventory or will soon be low.|There are :count items that are below minimum inventory or will soon be low.',
     'min_QTY' => 'I-Min QTY',
     'name' => 'Igama',
     'new_item_checked' => 'Into entsha ihloliwe ngaphansi kwegama lakho, imininingwane ingezansi.',
+    'new_item_checked_with_acceptance' => 'A new item has been checked out under your name that requires acceptance, details are below.',
+    'recent_item_checked' => 'An item was recently checked out under your name that requires acceptance, details are below.',
     'notes' => 'Amanothi',
-    'password' => 'Iphasiwedi:',
+    'password' => 'Iphasiwedi',
     'password_reset' => 'I-Password Setha kabusha',
     'read_the_terms' => 'Sicela ufunde imigomo yokusetshenziswa ngezansi.',
     'read_the_terms_and_click' => 'Please read the terms of use below, and click on the link at the bottom to confirm that you read and agree to the terms of use, and have received the asset.',
-    'requested' => 'Ucele:',
+    'requested' => 'Kuceliwe',
     'reset_link' => 'Iphasiwedi yakho Hlaziya kabusha Isixhumanisi',
     'reset_password' => 'Chofoza lapha ukuze usethe kabusha iphasiwedi yakho:',
     'rights_reserved' => 'All rights reserved.',
@@ -86,8 +90,10 @@ return [
     'upcoming-audits' => 'There is :count asset that is coming up for audit within :threshold days.|There are :count assets that are coming up for audit within :threshold days.',
     'user' => 'Umsebenzisi',
     'username' => 'Igama lomsebenzisi',
+    'unaccepted_asset_reminder' => 'Reminder: You have Unaccepted Assets.',
     'welcome' => 'Siyakwamukela: igama',
     'welcome_to' => 'Siyakwamukela ku: iwebhu!',
     'your_assets' => 'View Your Assets',
     'your_credentials' => 'Izimpawu zakho ze-Snipe-IT',
+    'mail_sent' => 'Mail sent successfully!',
 ];
diff --git a/resources/lang/zu-ZA/validation.php b/resources/lang/zu-ZA/validation.php
index 6aaea0d2a3..1c04774dc0 100644
--- a/resources/lang/zu-ZA/validation.php
+++ b/resources/lang/zu-ZA/validation.php
@@ -13,87 +13,150 @@ return [
     |
     */
 
-    'accepted'             => 'I: izimfanelo kufanele zamukelwe.',
-    'active_url'           => 'I: imfanelo ayiyona i-URL evumelekile.',
-    'after'                => 'I: imfanelo kufanele ibe usuku emva: idethi.',
-    'after_or_equal'       => 'I: imfanelo kufanele ibe usuku olulandelayo noma olulingana nalokhu: usuku.',
-    'alpha'                => 'I: imfanelo ingase ibe nezinhlamvu kuphela.',
-    'alpha_dash'           => 'I: i-attribute ingaqukatha kuphela izinhlamvu, izinombolo, kanye nokudonswa.',
-    'alpha_num'            => 'I: Imfanelo ingase ibe nezinhlamvu nezinombolo kuphela.',
-    'array'                => 'I: imfanelo kufanele ibe i-array.',
-    'before'               => 'I: Imfanelo kufanele ibe usuku ngaphambi: idethi.',
-    'before_or_equal'      => 'I: imfanelo kufanele ibe usuku ngaphambi noma elilingana nalokhu: usuku.',
-    'between'              => [
-        'numeric' => 'I: imfanelo kufanele ibe phakathi: min futhi: max.',
-        'file'    => 'I: imfanelo kufanele ibe phakathi: min futhi: max kilobyte.',
-        'string'  => 'I: imfanelo kufanele ibe phakathi: min futhi: max izinhlamvu.',
-        'array'   => 'I: imfanelo kufanele ibe phakathi kwe: min kanye: izinto eziningi.',
+    'accepted' => 'The :attribute field must be accepted.',
+    'accepted_if' => 'The :attribute field must be accepted when :other is :value.',
+    'active_url' => 'The :attribute field must be a valid URL.',
+    'after' => 'The :attribute field must be a date after :date.',
+    'after_or_equal' => 'The :attribute field must be a date after or equal to :date.',
+    'alpha' => 'The :attribute field must only contain letters.',
+    'alpha_dash' => 'The :attribute field must only contain letters, numbers, dashes, and underscores.',
+    'alpha_num' => 'The :attribute field must only contain letters and numbers.',
+    'array' => 'The :attribute field must be an array.',
+    'ascii' => 'The :attribute field must only contain single-byte alphanumeric characters and symbols.',
+    'before' => 'The :attribute field must be a date before :date.',
+    'before_or_equal' => 'The :attribute field must be a date before or equal to :date.',
+    'between' => [
+        'array' => 'The :attribute field must have between :min and :max items.',
+        'file' => 'The :attribute field must be between :min and :max kilobytes.',
+        'numeric' => 'The :attribute field must be between :min and :max.',
+        'string' => 'The :attribute field must be between :min and :max characters.',
     ],
-    'boolean'              => 'I: Insimu yemfanelo kufanele ibe yikho noma ingamanga.',
-    'confirmed'            => 'I: imfanelo yokuqinisekisa ayifani.',
-    'date'                 => 'I: imfanelo akuyona idethi evumelekile.',
-    'date_format'          => 'I: imfanelo ayihambisani nefomethi: ifomethi.',
-    'different'            => 'I: i-attribut futhi: enye kumele ihluke.',
-    'digits'               => 'I: imfanelo kufanele ibe: amadijithi amadijithali.',
-    'digits_between'       => 'I: imfanelo kufanele ibe phakathi: iminithi kanye: amadijithi amaningi.',
-    'dimensions'           => 'I: imfanelo inezinhlobo zesithombe ezingavumelekile.',
-    'distinct'             => 'I: insimu yemfanelo inenani eliphindwe kabili.',
-    'email'                => 'I: imfanelo kufanele ibe ikheli le-imeyili elivumelekile.',
-    'exists'               => 'Okukhethiwe: imfanelo ayivumelekile.',
-    'file'                 => 'I: imfanelo kufanele ibe ifayela.',
-    'filled'               => 'I: insimu yemfanelo kufanele ibe nenani.',
-    'image'                => 'I: imfanelo kufanele ibe isithombe.',
+    'boolean' => 'I: Insimu yemfanelo kufanele ibe yikho noma ingamanga.',
+    'can' => 'The :attribute field contains an unauthorized value.',
+    'confirmed' => 'The :attribute field confirmation does not match.',
+    'contains' => 'The :attribute field is missing a required value.',
+    'current_password' => 'The password is incorrect.',
+    'date' => 'The :attribute field must be a valid date.',
+    'date_equals' => 'The :attribute field must be a date equal to :date.',
+    'date_format' => 'The :attribute field must match the format :format.',
+    'decimal' => 'The :attribute field must have :decimal decimal places.',
+    'declined' => 'The :attribute field must be declined.',
+    'declined_if' => 'The :attribute field must be declined when :other is :value.',
+    'different' => 'The :attribute field and :other must be different.',
+    'digits' => 'The :attribute field must be :digits digits.',
+    'digits_between' => 'The :attribute field must be between :min and :max digits.',
+    'dimensions' => 'The :attribute field has invalid image dimensions.',
+    'distinct' => 'I: insimu yemfanelo inenani eliphindwe kabili.',
+    'doesnt_end_with' => 'The :attribute field must not end with one of the following: :values.',
+    'doesnt_start_with' => 'The :attribute field must not start with one of the following: :values.',
+    'email' => 'The :attribute field must be a valid email address.',
+    'ends_with' => 'The :attribute field must end with one of the following: :values.',
+    'enum' => 'Okukhethiwe: imfanelo ayivumelekile.',
+    'exists' => 'Okukhethiwe: imfanelo ayivumelekile.',
+    'extensions' => 'The :attribute field must have one of the following extensions: :values.',
+    'file' => 'The :attribute field must be a file.',
+    'filled' => 'I: insimu yemfanelo kufanele ibe nenani.',
+    'gt' => [
+        'array' => 'The :attribute field must have more than :value items.',
+        'file' => 'The :attribute field must be greater than :value kilobytes.',
+        'numeric' => 'The :attribute field must be greater than :value.',
+        'string' => 'The :attribute field must be greater than :value characters.',
+    ],
+    'gte' => [
+        'array' => 'The :attribute field must have :value items or more.',
+        'file' => 'The :attribute field must be greater than or equal to :value kilobytes.',
+        'numeric' => 'The :attribute field must be greater than or equal to :value.',
+        'string' => 'The :attribute field must be greater than or equal to :value characters.',
+    ],
+    'hex_color' => 'The :attribute field must be a valid hexadecimal color.',
+    'image' => 'The :attribute field must be an image.',
     'import_field_empty'    => 'The value for :fieldname cannot be null.',
-    'in'                   => 'Okukhethiwe: imfanelo ayivumelekile.',
-    'in_array'             => 'I: inkambu yokwazisa ayikho: enye.',
-    'integer'              => 'I: imfanelo kufanele ibe inamba.',
-    'ip'                   => 'I: imfanelo kufanele ibe ikheli le-IP elivumelekile.',
-    'ipv4'                 => 'I: imfanelo kufanele ibe ikheli le-IPv4 elivumelekile.',
-    'ipv6'                 => 'I: imfanelo kufanele ibe ikheli le-IPv6 elivumelekile.',
-    'is_unique_department' => 'The :attribute must be unique to this Company Location',
-    'json'                 => 'I: imfanelo kufanele ibe yocingo oluvumelekile le-JSON.',
-    'max'                  => [
-        'numeric' => 'I: umqondo kungenzeka ukuthi awukhulu kun: max.',
-        'file'    => 'I: I-attribute ingase ingabi mkhulu kune: ama-kilobytes amaningi.',
-        'string'  => 'I: I-attribute ingase ingabi mkhulu kune: izinhlamvu eziphezulu.',
-        'array'   => 'I: i-attribute ingase ingabi nalokhu: izinto eziningi.',
+    'in' => 'Okukhethiwe: imfanelo ayivumelekile.',
+    'in_array' => 'The :attribute field must exist in :other.',
+    'integer' => 'The :attribute field must be an integer.',
+    'ip' => 'The :attribute field must be a valid IP address.',
+    'ipv4' => 'The :attribute field must be a valid IPv4 address.',
+    'ipv6' => 'The :attribute field must be a valid IPv6 address.',
+    'json' => 'The :attribute field must be a valid JSON string.',
+    'list' => 'The :attribute field must be a list.',
+    'lowercase' => 'The :attribute field must be lowercase.',
+    'lt' => [
+        'array' => 'The :attribute field must have less than :value items.',
+        'file' => 'The :attribute field must be less than :value kilobytes.',
+        'numeric' => 'The :attribute field must be less than :value.',
+        'string' => 'The :attribute field must be less than :value characters.',
     ],
-    'mimes'                => 'I: imfanelo kufanele ibe ifayela lohlobo:: amanani.',
-    'mimetypes'            => 'I: imfanelo kufanele ibe ifayela lohlobo:: amanani.',
-    'min'                  => [
-        'numeric' => 'I: imfanelo kumele ibe okungenani: min.',
-        'file'    => 'I: imfanelo kufanele ibe okungenani: min kilobytes.',
-        'string'  => 'I: imfanelo kufanele ibe okungenani: izinhlamvu ezincane.',
-        'array'   => 'I: i-attribut kumele ibe okungenani: min min.',
+    'lte' => [
+        'array' => 'The :attribute field must not have more than :value items.',
+        'file' => 'The :attribute field must be less than or equal to :value kilobytes.',
+        'numeric' => 'The :attribute field must be less than or equal to :value.',
+        'string' => 'The :attribute field must be less than or equal to :value characters.',
     ],
-    'starts_with'          => 'The :attribute must start with one of the following: :values.',
-    'ends_with'            => 'The :attribute must end with one of the following: :values.',
+    'mac_address' => 'The :attribute field must be a valid MAC address.',
+    'max' => [
+        'array' => 'The :attribute field must not have more than :max items.',
+        'file' => 'The :attribute field must not be greater than :max kilobytes.',
+        'numeric' => 'The :attribute field must not be greater than :max.',
+        'string' => 'The :attribute field must not be greater than :max characters.',
+    ],
+    'max_digits' => 'The :attribute field must not have more than :max digits.',
+    'mimes' => 'The :attribute field must be a file of type: :values.',
+    'mimetypes' => 'The :attribute field must be a file of type: :values.',
+    'min' => [
+        'array' => 'The :attribute field must have at least :min items.',
+        'file' => 'The :attribute field must be at least :min kilobytes.',
+        'numeric' => 'The :attribute field must be at least :min.',
+        'string' => 'The :attribute field must be at least :min characters.',
+    ],
+    'min_digits' => 'The :attribute field must have at least :min digits.',
+    'missing' => 'The :attribute field must be missing.',
+    'missing_if' => 'The :attribute field must be missing when :other is :value.',
+    'missing_unless' => 'The :attribute field must be missing unless :other is :value.',
+    'missing_with' => 'The :attribute field must be missing when :values is present.',
+    'missing_with_all' => 'The :attribute field must be missing when :values are present.',
+    'multiple_of' => 'The :attribute field must be a multiple of :value.',
+    'not_in' => 'Okukhethiwe: imfanelo ayivumelekile.',
+    'not_regex' => 'The :attribute field format is invalid.',
+    'numeric' => 'The :attribute field must be a number.',
+    'password' => [
+        'letters' => 'The :attribute field must contain at least one letter.',
+        'mixed' => 'The :attribute field must contain at least one uppercase and one lowercase letter.',
+        'numbers' => 'The :attribute field must contain at least one number.',
+        'symbols' => 'The :attribute field must contain at least one symbol.',
+        'uncompromised' => 'The given :attribute has appeared in a data leak. Please choose a different :attribute.',
+    ],
+    'percent'       => 'The depreciation minimum must be between 0 and 100 when depreciation type is percentage.',
 
-    'not_in'               => 'Okukhethiwe: imfanelo ayivumelekile.',
-    'numeric'              => 'I: imfanelo kufanele ibe inombolo.',
-    'present'              => 'I: insimu yemfanelo kufanele ibe khona.',
-    'valid_regex'          => 'That is not a valid regex. ',
-    'regex'                => 'I: ifomethi yokwaziswa ayivumelekile.',
-    'required'             => 'I: insimu yemfanelo iyadingeka.',
-    'required_if'          => 'I: Insimu yemfanelo iyadingeka uma: enye ingukuthi: inani.',
-    'required_unless'      => 'I: insimu yemfanelo iyadingeka ngaphandle: enye ikhona: amanani.',
-    'required_with'        => 'I: Insimu yemfanelo iyadingeka lapho: amanani ekhona.',
-    'required_with_all'    => 'I: Insimu yemfanelo iyadingeka lapho: amanani ekhona.',
-    'required_without'     => 'I: Insimu yemfanelo iyadingeka lapho: amanani engekho.',
+    'present' => 'I: insimu yemfanelo kufanele ibe khona.',
+    'present_if' => 'The :attribute field must be present when :other is :value.',
+    'present_unless' => 'The :attribute field must be present unless :other is :value.',
+    'present_with' => 'The :attribute field must be present when :values is present.',
+    'present_with_all' => 'The :attribute field must be present when :values are present.',
+    'prohibited' => 'The :attribute field is prohibited.',
+    'prohibited_if' => 'The :attribute field is prohibited when :other is :value.',
+    'prohibited_unless' => 'The :attribute field is prohibited unless :other is in :values.',
+    'prohibits' => 'The :attribute field prohibits :other from being present.',
+    'regex' => 'The :attribute field format is invalid.',
+    'required' => 'I: insimu yemfanelo iyadingeka.',
+    'required_array_keys' => 'The :attribute field must contain entries for: :values.',
+    'required_if' => 'I: Insimu yemfanelo iyadingeka uma: enye ingukuthi: inani.',
+    'required_if_accepted' => 'The :attribute field is required when :other is accepted.',
+    'required_if_declined' => 'The :attribute field is required when :other is declined.',
+    'required_unless' => 'I: insimu yemfanelo iyadingeka ngaphandle: enye ikhona: amanani.',
+    'required_with' => 'I: Insimu yemfanelo iyadingeka lapho: amanani ekhona.',
+    'required_with_all' => 'The :attribute field is required when :values are present.',
+    'required_without' => 'I: Insimu yemfanelo iyadingeka lapho: amanani engekho.',
     'required_without_all' => 'I: Insimu yemfanelo iyadingeka lapho kungekho namunye: amanani akhona.',
-    'same'                 => 'I: i-attribut futhi: enye kufanele ifane.',
-    'size'                 => [
-        'numeric' => 'I: imfanelo kufanele ibe: usayizi.',
-        'file'    => 'I: imfanelo kufanele ibe: ama-kilobytes wesayizi.',
-        'string'  => 'I: imfanelo kufanele ibe: izinhlamvu zesayizi.',
-        'array'   => 'I: imfanelo kufanele ibe nalokhu: izinto ezisayizi.',
+    'same' => 'The :attribute field must match :other.',
+    'size' => [
+        'array' => 'The :attribute field must contain :size items.',
+        'file' => 'The :attribute field must be :size kilobytes.',
+        'numeric' => 'The :attribute field must be :size.',
+        'string' => 'The :attribute field must be :size characters.',
     ],
+    'starts_with' => 'The :attribute field must start with one of the following: :values.',
     'string'               => 'I: imfanelo kufanele ibe yocingo.',
-    'timezone'             => 'I: imfanelo kufanele ibe yindawo evumelekile.',
     'two_column_unique_undeleted' => 'The :attribute must be unique across :table1 and :table2. ',
-    'unique'               => 'I: imfanelo isivele ithathwe.',
-    'uploaded'             => 'I: imfanelo ayihlulekile ukulayisha.',
-    'url'                  => 'I: ifomethi yokwaziswa ayivumelekile.',
     'unique_undeleted'     => 'I: imfanelo kufanele ibe eyingqayizivele.',
     'non_circular'         => 'The :attribute must not create a circular reference.',
     'not_array'            => ':attribute cannot be an array.',
@@ -102,11 +165,14 @@ return [
     'numbers'              => 'Password must contain at least one number.',
     'case_diff'            => 'Password must use mixed case.',
     'symbols'              => 'Password must contain symbols.',
-    'gte'                  => [
-        'numeric'          => 'Value cannot be negative'
-    ],
-    'checkboxes'           => ':attribute contains invalid options.',
-    'radio_buttons'        => ':attribute is invalid.',
+    'timezone' => 'The :attribute field must be a valid timezone.',
+    'unique' => 'I: imfanelo isivele ithathwe.',
+    'uploaded' => 'I: imfanelo ayihlulekile ukulayisha.',
+    'uppercase' => 'The :attribute field must be uppercase.',
+    'url' => 'The :attribute field must be a valid URL.',
+    'ulid' => 'The :attribute field must be a valid ULID.',
+    'uuid' => 'The :attribute field must be a valid UUID.',
+    'fmcs_location' => 'Full multiple company support and location scoping is enabled in the Admin Settings, and the selected location and selected company are not compatible.',
 
 
     /*
@@ -120,16 +186,22 @@ return [
     |
     */
 
+    'email_array'      => 'Ikheli elilodwa noma ngaphezulu le-imeyili alivumelekile.',
+    'checkboxes'           => ':attribute contains invalid options.',
+    'radio_buttons'        => ':attribute is invalid.',
+    
     'custom' => [
         'alpha_space' => 'I: Insimu yemfanelo iqukethe umlingiswa ongavunyelwe.',
-        'email_array'      => 'Ikheli elilodwa noma ngaphezulu le-imeyili alivumelekile.',
+
         'hashed_pass'      => 'Iphasiwedi yakho yamanje ayilungile',
         'dumbpwd'          => 'Lelo phasiwedi livame kakhulu.',
         'statuslabel_type' => 'Kumele ukhethe uhlobo lwelebula lesimo esivumelekile',
+        'custom_field_not_found'          => 'This field does not seem to exist, please double check your custom field names.',
+        'custom_field_not_found_on_model' => 'This field seems to exist, but is not available on this Asset Model\'s fieldset.',
 
         // date_format validation with slightly less stupid messages. It duplicates a lot, but it gets the job done :(
-        // We use this because the default error message for date_format is reflects php Y-m-d, which non-PHP
-        // people won't know how to format. 
+        // We use this because the default error message for date_format reflects php Y-m-d, which non-PHP
+        // people won't know how to format.
         'purchase_date.date_format'     => 'The :attribute must be a valid date in YYYY-MM-DD format',
         'last_audit_date.date_format'   =>  'The :attribute must be a valid date in YYYY-MM-DD hh:mm:ss format',
         'expiration_date.date_format'   =>  'The :attribute must be a valid date in YYYY-MM-DD format',
@@ -137,9 +209,15 @@ return [
         'expected_checkin.date_format'  =>  'The :attribute must be a valid date in YYYY-MM-DD format',
         'start_date.date_format'        =>  'The :attribute must be a valid date in YYYY-MM-DD format',
         'end_date.date_format'          =>  'The :attribute must be a valid date in YYYY-MM-DD format',
+        'invalid_value_in_field' => 'Invalid value included in this field',
 
-    ],
+        'ldap_username_field' => [
+            'not_in' =>         '<code>sAMAccountName</code> (mixed case) will likely not work. You should use <code>samaccountname</code> (lowercase) instead.'
+        ],
+        'ldap_auth_filter_query' => ['not_in' => '<code>uid=samaccountname</code> is probably not a valid auth filter. You probably want <code>uid=</code> '],
+        'ldap_filter' => ['regex' => 'This value should probably not be wrapped in parentheses.'],
 
+        ],
     /*
     |--------------------------------------------------------------------------
     | Custom Validation Attributes
@@ -155,8 +233,16 @@ return [
 
     /*
     |--------------------------------------------------------------------------
-    | Generic Validation Messages
+    | Generic Validation Messages - we use these in the jquery validation where we don't have
+    | access to the :attribute
     |--------------------------------------------------------------------------
     */
-    'invalid_value_in_field' => 'Invalid value included in this field',
+
+    'generic' => [
+        'invalid_value_in_field' => 'Invalid value included in this field',
+        'required' => 'This field is required',
+        'email' => 'Please enter a valid email address',
+    ],
+
+
 ];
diff --git a/resources/macros/macros.php b/resources/macros/macros.php
index 584c7df845..b048c407fa 100644
--- a/resources/macros/macros.php
+++ b/resources/macros/macros.php
@@ -3,27 +3,6 @@
 * Macro helpers
 */
 
-/**
- * Locale macro
- * Generates the dropdown menu of available languages
- */
-Form::macro('locales', function ($name = 'locale', $selected = null, $class = null, $id = null) {
-
-    $idclause = (!is_null($id)) ? $id : '';
-
-    $select = '<select name="'.$name.'" class="'.$class.'" style="min-width:100%"'.$idclause.' aria-label="'.$name.'" data-placeholder="'.trans('localizations.select_language').'">';
-    $select .= '<option value=""  role="option">'.trans('localizations.select_language').'</option>';
-
-    // Pull the autoglossonym array from the localizations translation file
-    foreach (trans('localizations.languages') as $abbr => $locale) {
-        $select .= '<option value="'.$abbr.'"'.(($selected == $abbr) ? ' selected="selected" role="option" aria-selected="true"' : ' aria-selected="false"').'>'.$locale.'</option> ';
-    }
-
-    $select .= '</select>';
-
-    return $select;
-});
-
 /**
  * Country macro
  * Generates the dropdown menu of countries for the profile form
@@ -32,18 +11,27 @@ Form::macro('countries', function ($name = 'country', $selected = null, $class =
 
     $idclause = (!is_null($id)) ? $id : '';
 
-    $select = '<select name="'.$name.'" class="'.$class.'" style="width:100%" '.$idclause.' aria-label="'.$name.'" data-placeholder="'.trans('localizations.select_country').'">';
+    // Pull the autoglossonym array from the localizations translation file
+    $countries_array = trans('localizations.countries');
+
+    $select = '<select name="'.$name.'" class="'.$class.'" style="width:100%" '.$idclause.' aria-label="'.$name.'" data-placeholder="'.trans('localizations.select_country').'" data-allow-clear="true" data-tags="true">';
     $select .= '<option value=""  role="option">'.trans('localizations.select_country').'</option>';
 
-    // Pull the autoglossonym array from the localizations translation file
-    foreach (trans('localizations.countries') as $abbr => $country) {
+    foreach ($countries_array as $abbr => $country) {
 
-        // We have to handle it this way to handle deprecication warnings since you can't strtoupper on null
+        // We have to handle it this way to handle deprecation warnings since you can't strtoupper on null
         if ($abbr!='') {
             $abbr = strtoupper($abbr);
         }
 
-        $select .= '<option value="'.$abbr.'"'.(($selected == $abbr) ? ' selected="selected" role="option" aria-selected="true"' : ' aria-selected="false"').'>'.$country.'</option> ';
+        // Loop through the countries configured in the localization file
+        $select .= '<option value="' . $abbr . '" role="option" ' . (($selected == $abbr) ? ' selected="selected" aria-selected="true"' : ' aria-selected="false"') . '>' . $country . '</option> ';
+
+    }
+
+    // If the country value doesn't exist in the array, add it as a new option and select it so we don't drop that data
+    if (!array_key_exists($selected, $countries_array)) {
+        $select .= '<option value="' . $selected . '" selected="selected" role="option" aria-selected="true">' . $selected .' *</option> ';
     }
 
     $select .= '</select>';
@@ -84,8 +72,9 @@ Form::macro('time_display_format', function ($name = 'time_display_format', $sel
         'H:i',
     ];
 
+    $datetime = date("y-m-d").' 14:00:00';
     foreach ($formats as $format) {
-        $time_display_formats[$format] = Carbon::now()->format($format);
+        $time_display_formats[$format] = Carbon::parse($datetime)->format($format);
     }
     $select = '<select name="'.$name.'" class="'.$class.'" style="min-width:150px" aria-label="'.$name.'">';
     foreach ($time_display_formats as $format => $time_display_format) {
@@ -179,18 +168,46 @@ Form::macro('barcode_types', function ($name = 'barcode_type', $selected = null,
     return $select;
 });
 
+Form::macro('email_format', function ($name = 'email_format', $selected = null, $class = null) {
+    $formats = [
+        'firstname.lastname' => trans('admin/settings/general.email_formats.firstname_lastname_format'),
+        'firstname' => trans('admin/settings/general.email_formats.first_name_format'),
+        'lastname' => trans('admin/settings/general.email_formats.last_name_format'),
+        'filastname' => trans('admin/settings/general.email_formats.filastname_format'),
+        'lastnamefirstinitial' => trans('admin/settings/general.email_formats.lastnamefirstinitial_format'),
+        'firstname_lastname' => trans('admin/settings/general.email_formats.firstname_lastname_underscore_format'),
+        'firstinitial.lastname' => trans('admin/settings/general.email_formats.firstinitial_lastname'),
+        'lastname_firstinitial' => trans('admin/settings/general.email_formats.lastname_firstinitial'),
+        'lastname.firstinitial' => trans('admin/settings/general.email_formats.lastname_dot_firstinitial_format'),
+        'firstnamelastname' => trans('admin/settings/general.email_formats.firstnamelastname'),
+        'firstnamelastinitial' => trans('admin/settings/general.email_formats.firstnamelastinitial'),
+        'lastname.firstname' => trans('admin/settings/general.email_formats.lastnamefirstname'),
+    ];
+
+    $select = '<select name="'.$name.'" class="'.$class.'" style="width: 100%" aria-label="'.$name.'">';
+    foreach ($formats as $format => $label) {
+        $select .= '<option value="'.$format.'"'.($selected == $format ? ' selected="selected" role="option" aria-selected="true"' : ' aria-selected="false"').'>'.$label.'</option> '."\n";
+    }
+
+    $select .= '</select>';
+
+    return $select;
+});
+
 Form::macro('username_format', function ($name = 'username_format', $selected = null, $class = null) {
     $formats = [
-        'firstname.lastname' => trans('general.firstname_lastname_format'),
-        'firstname' => trans('general.first_name_format'),
-        'filastname' => trans('general.filastname_format'),
-        'lastnamefirstinitial' => trans('general.lastnamefirstinitial_format'),
-        'firstname_lastname' => trans('general.firstname_lastname_underscore_format'),
-        'firstinitial.lastname' => trans('general.firstinitial.lastname'),
-        'lastname_firstinitial' => trans('general.lastname_firstinitial'),
-        'firstnamelastname' => trans('general.firstnamelastname'),
-        'firstnamelastinitial' => trans('general.firstnamelastinitial'),
-        'lastname.firstname' => trans('general.lastnamefirstname'),
+        'firstname.lastname' => trans('admin/settings/general.username_formats.firstname_lastname_format'),
+        'firstname' => trans('admin/settings/general.username_formats.first_name_format'),
+        'lastname' => trans('admin/settings/general.username_formats.last_name_format'),
+        'filastname' => trans('admin/settings/general.username_formats.filastname_format'),
+        'lastnamefirstinitial' => trans('admin/settings/general.username_formats.lastnamefirstinitial_format'),
+        'firstname_lastname' => trans('admin/settings/general.username_formats.firstname_lastname_underscore_format'),
+        'firstinitial.lastname' => trans('admin/settings/general.username_formats.firstinitial_lastname'),
+        'lastname_firstinitial' => trans('admin/settings/general.username_formats.lastname_firstinitial'),
+        'lastname.firstinitial' => trans('admin/settings/general.username_formats.lastname_dot_firstinitial_format'),
+        'firstnamelastname' => trans('admin/settings/general.username_formats.firstnamelastname'),
+        'firstnamelastinitial' => trans('admin/settings/general.username_formats.firstnamelastinitial'),
+        'lastname.firstname' => trans('admin/settings/general.username_formats.lastnamefirstname'),
     ];
 
     $select = '<select name="'.$name.'" class="'.$class.'" style="width: 100%" aria-label="'.$name.'">';
@@ -202,99 +219,3 @@ Form::macro('username_format', function ($name = 'username_format', $selected =
 
     return $select;
 });
-
-Form::macro('two_factor_options', function ($name = 'two_factor_enabled', $selected = null, $class = null) {
-    $formats = [
-        '' => trans('admin/settings/general.two_factor_disabled'),
-        '1' => trans('admin/settings/general.two_factor_optional'),
-        '2' => trans('admin/settings/general.two_factor_required'),
-
-    ];
-
-    $select = '<select name="'.$name.'" class="'.$class.'" aria-label="'.$name.'">';
-    foreach ($formats as $format => $label) {
-        $select .= '<option value="'.$format.'"'.($selected == $format ? ' selected="selected" role="option" aria-selected="true"' : ' aria-selected="false"').'>'.$label.'</option> '."\n";
-    }
-
-    $select .= '</select>';
-
-    return $select;
-});
-
-Form::macro('customfield_elements', function ($name = 'customfield_elements', $selected = null, $class = null) {
-    $formats = [
-        'text' => 'Text Box',
-        'listbox' => 'List Box',
-        'textarea' => 'Textarea (multi-line) ',
-        'checkbox' => 'Checkbox',
-        'radio' => 'Radio Buttons',
-    ];
-
-    $select = '<select name="'.$name.'" class="'.$class.'" style="width: 100%" aria-label="'.$name.'">';
-    foreach ($formats as $format => $label) {
-        $select .= '<option value="'.$format.'"'.($selected == $format ? ' selected="selected" role="option" aria-selected="true"' : ' aria-selected="false"').'>'.$label.'</option> '."\n";
-    }
-
-    $select .= '</select>';
-
-    return $select;
-});
-
-Form::macro('skin', function ($name = 'skin', $selected = null, $class = null) {
-    $formats = [
-        'blue' => 'Default Blue',
-        'blue-dark' => 'Blue (Dark Mode)',
-        'green' => 'Green Dark',
-        'green-dark' => 'Green (Dark Mode)',
-        'red' => 'Red Dark',
-        'red-dark' => 'Red (Dark Mode)',
-        'orange' => 'Orange Dark',
-        'orange-dark' => 'Orange (Dark Mode)',
-        'black' => 'Black',
-        'black-dark' => 'Black (Dark Mode)',
-        'purple' => 'Purple',
-        'purple-dark' => 'Purple (Dark Mode)',
-        'yellow' => 'Yellow',
-        'yellow-dark' => 'Yellow (Dark Mode)',
-        'contrast' => 'High Contrast',
-    ];
-
-    $select = '<select name="'.$name.'" class="'.$class.'" style="width: 250px" aria-label="'.$name.'">';
-    foreach ($formats as $format => $label) {
-        $select .= '<option value="'.$format.'"'.($selected == $format ? ' selected="selected" role="option" aria-selected="true"' : ' aria-selected="false"').'>'.$label.'</option> '."\n";
-    }
-
-    $select .= '</select>';
-
-    return $select;
-});
-
-Form::macro('user_skin', function ($name = 'skin', $selected = null, $class = null) {
-    $formats = [
-        '' => 'Site Default',
-        'blue' => 'Default Blue',
-        'blue-dark' => 'Blue (Dark Mode)',
-        'green' => 'Green Dark',
-        'green-dark' => 'Green (Dark Mode)',
-        'red' => 'Red Dark',
-        'red-dark' => 'Red (Dark Mode)',
-        'orange' => 'Orange Dark',
-        'orange-dark' => 'Orange (Dark Mode)',
-        'black' => 'Black',
-        'black-dark' => 'Black (Dark Mode)',
-        'purple' => 'Purple',
-        'purple-dark' => 'Purple (Dark Mode)',
-        'yellow' => 'Yellow',
-        'yellow-dark' => 'Yellow (Dark Mode)',
-        'contrast' => 'High Contrast',
-    ];
-
-    $select = '<select name="'.$name.'" class="'.$class.'" style="width: 250px">';
-    foreach ($formats as $format => $label) {
-        $select .= '<option value="'.$format.'"'.($selected == $format ? ' selected="selected"' : '').'>'.$label.'</option> '."\n";
-    }
-
-    $select .= '</select>';
-
-    return $select;
-});
diff --git a/resources/views/accessories/checkin.blade.php b/resources/views/accessories/checkin.blade.php
index 23c7a44a06..1841156832 100755
--- a/resources/views/accessories/checkin.blade.php
+++ b/resources/views/accessories/checkin.blade.php
@@ -62,8 +62,10 @@
                                 <div class="col-md-7">
                                     <div class="input-group col-md-5 required" style="padding-left: 0px;">
                                         <div class="input-group date" data-date-clear-btn="true" data-provide="datepicker" data-date-format="yyyy-mm-dd" data-date-end-date="0d" data-autoclose="true">
-                                            <input type="text" class="form-control" placeholder="{{ trans('general.select_date') }}" name="checkin_at" id="checkin_at" value="{{ Request::old('checkin_at', date('Y-m-d')) }}">
-                                            <span class="input-group-addon"><i class="fas fa-calendar"></i></span>
+                                            <input type="text" class="form-control" placeholder="{{ trans('general.select_date') }}" name="checkin_at" id="checkin_at" value="{{ old('checkin_at', date('Y-m-d')) }}">
+                                            <span class="input-group-addon">
+                                                <x-icon type="calendar" />
+                                            </span>
                                         </div>
                                         {!! $errors->first('checkin_at', '<span class="alert-msg"><i class="fas fa-times"></i> :message</span>') !!}
                                     </div>
@@ -71,11 +73,15 @@
                             </div>
 
                               </div>
-                        <div class="box-footer">
-                            <a class="btn btn-link" href="{{ URL::previous() }}">{{ trans('button.cancel') }}</a>
-                            <button type="submit" class="btn btn-primary pull-right"><i class="fas fa-check icon-white" aria-hidden="true"></i>
-                                {{ trans('general.checkin') }}</button>
-                        </div>
+                        <x-redirect_submit_options
+                                index_route="accessories.index"
+                                :button_label="trans('general.checkin')"
+                                :options="[
+                                'index' => trans('admin/hardware/form.redirect_to_all', ['type' => trans('general.accessories')]),
+                                'item' => trans('admin/hardware/form.redirect_to_type', ['type' => trans('general.accessory')]),
+                                'target' => $target_option
+                               ]"
+                        />
 
 
                 </div> <!-- .box.box-default -->
diff --git a/resources/views/accessories/checkout.blade.php b/resources/views/accessories/checkout.blade.php
index fc69d4655b..58bc7e75db 100755
--- a/resources/views/accessories/checkout.blade.php
+++ b/resources/views/accessories/checkout.blade.php
@@ -39,7 +39,18 @@
           </div>
           @endif
 
-          @if ($accessory->category)
+         @if ($accessory->company)
+             <!-- accessory name -->
+             <div class="form-group">
+                 <label class="col-sm-3 control-label">{{ trans('general.company') }}</label>
+                 <div class="col-md-6">
+                     <p class="form-control-static">{{ $accessory->company->name }}</p>
+                 </div>
+             </div>
+         @endif
+
+
+         @if ($accessory->category)
           <!-- accessory name -->
           <div class="form-group">
             <label class="col-sm-3 control-label">{{ trans('admin/accessories/general.accessory_category') }}</label>
@@ -49,9 +60,44 @@
           </div>
           @endif
 
-          <!-- User -->
+             <!-- total -->
+             <div class="form-group">
+                 <label class="col-sm-3 control-label">{{  trans('admin/components/general.total') }}</label>
+                 <div class="col-md-6">
+                     <p class="form-control-static">{{ $accessory->qty }}</p>
+                 </div>
+             </div>
 
-          @include ('partials.forms.edit.user-select', ['translated_name' => trans('general.select_user'), 'fieldname' => 'assigned_to'])
+             <!-- remaining -->
+             <div class="form-group">
+                 <label class="col-sm-3 control-label">{{  trans('admin/components/general.remaining') }}</label>
+                 <div class="col-md-6">
+                     <p class="form-control-static">{{ $accessory->numRemaining() }}</p>
+                 </div>
+             </div>
+
+
+          <!-- checkout selector -->
+
+             @include ('partials.forms.checkout-selector', ['user_select' => 'true','asset_select' => 'true', 'location_select' => 'true'])
+             @include ('partials.forms.edit.user-select', ['translated_name' => trans('general.select_user'), 'fieldname' => 'assigned_user'])
+             <!-- We have to pass unselect here so that we don't default to the asset that's being checked out. We want that asset to be pre-selected everywhere else. -->
+
+             @include ('partials.forms.edit.asset-select', ['translated_name' => trans('general.select_asset'), 'fieldname' => 'assigned_asset', 'company_id' => $accessory->company_id, 'unselect' => 'true', 'style' => 'display:none;'])
+
+             @include ('partials.forms.edit.location-select', ['translated_name' => trans('general.location'), 'fieldname' => 'assigned_location', 'style' => 'display:none;'])
+
+
+             <!-- Checkout QTY -->
+             <div class="form-group {{ $errors->has('checkout_qty') ? 'error' : '' }} ">
+                 <label for="checkout_qty" class="col-md-3 control-label">{{ trans('general.qty') }}</label>
+                 <div class="col-md-7 col-sm-12 required">
+                     <div class="col-md-2" style="padding-left:0px">
+                         <input class="form-control" type="number" name="checkout_qty" id="checkout_qty" value="{{ old('checkout_qty', 1) }}" min="1" max="{{ $accessory->numRemaining() }}" />
+                     </div>
+                 </div>
+                 {!! $errors->first('checkout_qty', '<div class="col-md-8 col-md-offset-3"><span class="alert-msg" aria-hidden="true"><i class="fas fa-times" aria-hidden="true"></i> :message</span></div>') !!}
+             </div>
 
 
              @if ($accessory->requireAcceptance() || $accessory->getEula() || ($snipeSettings->webhook_endpoint!=''))
@@ -88,10 +134,16 @@
             </div>
           </div>
        </div>
-       <div class="box-footer">
-          <a class="btn btn-link" href="{{ URL::previous() }}">{{ trans('button.cancel') }}</a>
-          <button type="submit" id="submit_button" class="btn btn-primary pull-right"><i class="fas fa-check icon-white" aria-hidden="true"></i> {{ trans('general.checkout') }}</button>
-       </div>
+          <x-redirect_submit_options
+                  index_route="accessories.index"
+                  :button_label="trans('general.checkout')"
+                  :options="[
+                        'index' => trans('admin/hardware/form.redirect_to_all', ['type' => trans('general.accessories')]),
+                        'item' => trans('admin/hardware/form.redirect_to_type', ['type' => trans('general.accessory')]),
+                        'target' => trans('admin/hardware/form.redirect_to_checked_out_to'),
+
+                       ]"
+          />
     </div> <!-- .box.box-default -->
   </form>
   </div> <!-- .col-md-9-->
diff --git a/resources/views/accessories/edit.blade.php b/resources/views/accessories/edit.blade.php
index 068fddc266..827e117b51 100644
--- a/resources/views/accessories/edit.blade.php
+++ b/resources/views/accessories/edit.blade.php
@@ -4,6 +4,11 @@
     'helpPosition'  => 'right',
     'helpText' => trans('help.accessories'),
     'formAction' => (isset($item->id)) ? route('accessories.update', ['accessory' => $item->id]) : route('accessories.store'),
+    'index_route' => 'accessories.index',
+    'options' => [
+                'index' => trans('admin/hardware/form.redirect_to_all', ['type' => 'accessories']),
+                'item' => trans('admin/hardware/form.redirect_to_type', ['type' => trans('general.accessory')]),
+               ]
 ])
 
 {{-- Page content --}}
@@ -17,7 +22,7 @@
 @include ('partials.forms.edit.location-select', ['translated_name' => trans('general.location'), 'fieldname' => 'location_id'])
 @include ('partials.forms.edit.model_number')
 @include ('partials.forms.edit.order_number')
-@include ('partials.forms.edit.purchase_date')
+@include ('partials.forms.edit.datepicker', ['translated_name' => trans('general.purchase_date'),'fieldname' => 'purchase_date'])
 @include ('partials.forms.edit.purchase_cost', ['currency_type' => $item->location->currency ?? null])
 @include ('partials.forms.edit.quantity')
 @include ('partials.forms.edit.minimum_quantity')
diff --git a/resources/views/accessories/index.blade.php b/resources/views/accessories/index.blade.php
index 3b82bfdb63..a6ba61f616 100755
--- a/resources/views/accessories/index.blade.php
+++ b/resources/views/accessories/index.blade.php
@@ -8,7 +8,7 @@
 
 @section('header_right')
     @can('create', \App\Models\Accessory::class)
-        <a href="{{ route('accessories.create') }}" accesskey="n" class="btn btn-primary pull-right"> {{ trans('general.create') }}</a>
+        <a href="{{ route('accessories.create') }}" {{$snipeSettings->shortcuts_enabled == 1 ? "accesskey=n" : ''}} class="btn btn-primary pull-right"> {{ trans('general.create') }}</a>
     @endcan
 @stop
 
@@ -20,14 +20,15 @@
 
     <div class="box box-default">
       <div class="box-body">
-        <div class="table-responsive">
 
             <table
                 data-columns="{{ \App\Presenters\AccessoryPresenter::dataTableLayout() }}"
                 data-cookie-id-table="accessoriesTable"
                 data-pagination="true"
                 data-id-table="accessoriesTable"
+                data-search-highlight="true"
                 data-search="true"
+                data-show-print="true"
                 data-side-pagination="server"
                 data-show-columns="true"
                 data-show-fullscreen="true"
@@ -35,6 +36,7 @@
                 data-show-refresh="true"
                 data-show-footer="true"
                 data-sort-order="asc"
+                data-footer-style="footerStyle"
                 id="accessoriesTable"
                 class="table table-striped snipe-table"
                 data-url="{{route('api.accessories.index') }}"
@@ -43,7 +45,6 @@
                     "ignoreColumn": ["actions","image","change","checkbox","checkincheckout","icon"]
                     }'>
           </table>
-        </div>
       </div>
     </div>
   </div>
diff --git a/resources/views/accessories/view.blade.php b/resources/views/accessories/view.blade.php
index f1a98cf4bd..006878567b 100644
--- a/resources/views/accessories/view.blade.php
+++ b/resources/views/accessories/view.blade.php
@@ -25,7 +25,7 @@
                     <li class="active">
                         <a href="#checkedout" data-toggle="tab">
                             <span class="hidden-lg hidden-md">
-                            <i class="fas fa-info-circle fa-2x" aria-hidden="true"></i>
+                            <x-icon type="info-circle" class="fa-2x" />
                             </span>
                             <span class="hidden-xs hidden-sm">{{ trans('admin/users/general.info') }}</span>
                         </a>
@@ -34,7 +34,8 @@
                     <li>
                         <a href="#history" data-toggle="tab">
                         <span class="hidden-lg hidden-md">
-                        <i class="fas fa-history fa-2x" aria-hidden="true"></i></span>
+                            <x-icon type="history" class="fa-2x" />
+                        </span>
                         <span class="hidden-xs hidden-sm">{{ trans('general.history') }}</span>
                         </a>
                     </li>
@@ -43,11 +44,12 @@
                     @can('accessories.files', $accessory)
                         <li>
                             <a href="#files" data-toggle="tab">
-            <span class="hidden-lg hidden-md">
-            <i class="far fa-file fa-2x" aria-hidden="true"></i></span>
+                                <span class="hidden-lg hidden-md">
+                                <x-icon type="files" class="fa-2x" />
+                                </span>
                                 <span class="hidden-xs hidden-sm">{{ trans('general.file_uploads') }}
                                     {!! ($accessory->uploads->count() > 0 ) ? '<badge class="badge badge-secondary">'.number_format($accessory->uploads->count()).'</badge>' : '' !!}
-            </span>
+                                </span>
                             </a>
                         </li>
                     @endcan
@@ -55,7 +57,13 @@
                     @can('update', $accessory)
                         <li class="pull-right">
                             <a href="#" data-toggle="modal" data-target="#uploadFileModal">
-                                <i class="fas fa-paperclip" aria-hidden="true"></i> {{ trans('button.upload') }}
+                                <span class="hidden-lg hidden-xl hidden-md">
+                                    <x-icon type="paperclip" class="fa-2x" />
+                                </span>
+                                <span class="hidden-xs hidden-sm">
+                                    <x-icon type="paperclip" />
+                                    {{ trans('button.upload') }}
+                                </span>
                             </a>
                         </li>
                     @endcan
@@ -68,31 +76,26 @@
                           <div class="row">
                               <div class="col-md-12">
                                 <table
-                                    data-cookie-id-table="usersTable"
+                                    data-columns="{{ \App\Presenters\AccessoryPresenter::assignedDataTableLayout() }}"
+                                    data-cookie-id-table="checkoutsTable"
                                     data-pagination="true"
-                                    data-id-table="usersTable"
+                                    data-id-table="checkoutsTable"
+                                    data-search-highlight="true"
                                     data-search="true"
+                                    data-show-print="true"
                                     data-side-pagination="server"
                                     data-show-columns="true"
                                     data-show-fullscreen="true"
                                     data-show-export="true"
                                     data-show-refresh="true"
                                     data-sort-order="asc"
-                                    id="usersTable"
+                                    id="checkoutsTable"
                                     class="table table-striped snipe-table"
                                     data-url="{{ route('api.accessories.checkedout', $accessory->id) }}"
                                     data-export-options='{
-                                    "fileName": "export-accessories-{{ str_slug($accessory->name) }}-users-{{ date('Y-m-d') }}",
+                                    "fileName": "export-accessories-{{ str_slug($accessory->name) }}-checkouts-{{ date('Y-m-d') }}",
                                     "ignoreColumn": ["actions","image","change","checkbox","checkincheckout","icon"]
                                     }'>
-                                <thead>
-                                    <tr>
-                                    <th data-searchable="false" data-formatter="usersLinkFormatter" data-sortable="false" data-field="name">{{ trans('general.user') }}</th>
-                                    <th data-searchable="false" data-sortable="false" data-field="checkout_notes">{{ trans('general.notes') }}</th>
-                                    <th data-searchable="false" data-formatter="dateDisplayFormatter" data-sortable="false" data-field="last_checkout">{{ trans('admin/hardware/table.checkout_date') }}</th>
-                                    <th data-searchable="false" data-sortable="false" data-field="actions" data-formatter="accessoriesInOutFormatter">{{ trans('table.actions') }}</th>
-                                    </tr>
-                                </thead>
                                 </table>
                             </div><!--col-md-9-->
                           </div> <!-- close tab-pane div -->
@@ -101,10 +104,11 @@
 
                     <!-- history tab pane -->
                      <div class="tab-pane fade" id="history">
-                         <div class="table table-responsive">
+                         <div class="table-responsive">
                              <div class="row">
                                  <div class="col-md-12">
                                 <table
+                                        data-columns="{{ \App\Presenters\HistoryPresenter::dataTableLayout() }}"
                                         class="table table-striped snipe-table"
                                         data-cookie-id-table="AccessoryHistoryTable"
                                         data-id-table="AccessoryHistoryTable"
@@ -115,27 +119,14 @@
                                         data-show-refresh="true"
                                         data-show-export="true"
                                         data-sort-order="desc"
+                                        data-search-highlight="true"
+                                        data-search="true"
+                                        data-show-print="true"
                                         data-export-options='{
                        "fileName": "export-{{ str_slug($accessory->name) }}-history-{{ date('Y-m-d') }}",
                        "ignoreColumn": ["actions","image","change","checkbox","checkincheckout","icon"]
                      }'
-                                                data-url="{{ route('api.activity.index', ['item_id' => $accessory->id, 'item_type' => 'accessory']) }}">
-
-                                            <thead>
-                                            <tr>
-                                                <th class="col-sm-2" data-visible="false" data-sortable="true" data-field="created_at" data-formatter="dateDisplayFormatter">{{ trans('general.record_created') }}</th>
-                                                <th class="col-sm-2"data-visible="true" data-sortable="true" data-field="admin" data-formatter="usersLinkObjFormatter">{{ trans('general.admin') }}</th>
-                                                <th class="col-sm-2" data-sortable="true"  data-visible="true" data-field="action_type">{{ trans('general.action') }}</th>
-                                                <th class="col-sm-2" data-field="file" data-visible="false" data-formatter="fileUploadNameFormatter">{{ trans('general.file_name') }}</th>
-                                                <th class="col-sm-2" data-sortable="true"  data-visible="true" data-field="item" data-formatter="polymorphicItemFormatter">{{ trans('general.item') }}</th>
-                                                <th class="col-sm-2" data-visible="true" data-field="target" data-formatter="polymorphicItemFormatter">{{ trans('general.target') }}</th>
-                                                <th class="col-sm-2" data-sortable="true" data-visible="true" data-field="note">{{ trans('general.notes') }}</th>
-                                                <th class="col-sm-2" data-visible="true" data-field="action_date" data-formatter="dateDisplayFormatter">{{ trans('general.date') }}</th>
-                                                @if  ($snipeSettings->require_accept_signature=='1')
-                                                    <th class="col-md-3" data-field="signature_file" data-visible="false"  data-formatter="imageFormatter">{{ trans('general.signature') }}</th>
-                                                @endif
-                                            </tr>
-                                            </thead>
+                                        data-url="{{ route('api.activity.index', ['item_id' => $accessory->id, 'item_type' => 'accessory']) }}">
                                         </table>
                                     </div> <!-- /.col-md-12-->
                                 </div> <!-- /.row-->
@@ -147,101 +138,16 @@
                     @can('accessories.files', $accessory)
                         <div class="tab-pane" id="files">
 
-                            <div class="table table-responsive">
-                                <div class="row">
-                                    <div class="col-md-12">
-                                <table
-                                        data-cookie-id-table="accessoryUploadsTable"
-                                        data-id-table="accessoryUploadsTable"
-                                        id="accessoryUploadsTable"
-                                        data-search="true"
-                                        data-pagination="true"
-                                        data-side-pagination="client"
-                                        data-show-columns="true"
-                                        data-show-export="true"
-                                        data-show-footer="true"
-                                        data-toolbar="#upload-toolbar"
-                                        data-show-refresh="true"
-                                        data-sort-order="asc"
-                                        data-sort-name="name"
-                                        class="table table-striped snipe-table"
-                                        data-export-options='{
-            "fileName": "export-accessories-uploads-{{ str_slug($accessory->name) }}-{{ date('Y-m-d') }}",
-            "ignoreColumn": ["actions","image","change","checkbox","checkincheckout","delete","download","icon"]
-            }'>
-                                    <thead>
-                                    <tr>
-                                        <th data-visible="true" data-field="icon" data-sortable="true">{{trans('general.file_type')}}</th>
-                                        <th class="col-md-2" data-searchable="true" data-visible="true" data-field="image">{{ trans('general.image') }}</th>
-                                        <th class="col-md-2" data-searchable="true" data-visible="true" data-field="filename" data-sortable="true">{{ trans('general.file_name') }}</th>
-                                        <th class="col-md-1" data-searchable="true" data-visible="true" data-field="filesize">{{ trans('general.filesize') }}</th>
-                                        <th class="col-md-2" data-searchable="true" data-visible="true" data-field="notes" data-sortable="true">{{ trans('general.notes') }}</th>
-                                        <th class="col-md-1" data-searchable="true" data-visible="true" data-field="download">{{ trans('general.download') }}</th>
-                                        <th class="col-md-2" data-searchable="true" data-visible="true" data-field="created_at" data-sortable="true">{{ trans('general.created_at') }}</th>
-                                        <th class="col-md-1" data-searchable="true" data-visible="true" data-field="actions">{{ trans('table.actions') }}</th>
-                                    </tr>
-                                    </thead>
-                                    <tbody>
-                                    @if ($accessory->uploads->count() > 0)
-                                        @foreach ($accessory->uploads as $file)
-                                            <tr>
-                                                <td>
-                                                    <i class="{{ Helper::filetype_icon($file->filename) }} icon-med" aria-hidden="true"></i>
-                                                    <span class="sr-only">{{ Helper::filetype_icon($file->filename) }}</span>
-
-                                                </td>
-                                                <td>
-                                                    @if ($file->filename)
-                                                        @if ( Helper::checkUploadIsImage($file->get_src('accessories')))
-                                                            <a href="{{ route('show.accessoryfile', ['accessoryId' => $accessory->id, 'fileId' => $file->id, 'download' => 'false']) }}" data-toggle="lightbox" data-type="image"><img src="{{ route('show.accessoryfile', ['accessoryId' => $accessory->id, 'fileId' => $file->id]) }}" class="img-thumbnail" style="max-width: 50px;"></a>
-                                                        @endif
-                                                    @endif
-                                                </td>
-                                                <td>
-                                                    {{ $file->filename }}
-                                                </td>
-                                                <td data-value="{{ (Storage::exists('private_uploads/accessories/'.$file->filename) ? Storage::size('private_uploads/accessories/'.$file->filename) : '') }}">
-                                                    {{ @Helper::formatFilesizeUnits(Storage::exists('private_uploads/accessories/'.$file->filename) ? Storage::size('private_uploads/accessories/'.$file->filename) : '') }}
-                                                </td>
-
-                                                <td>
-                                                    @if ($file->note)
-                                                        {{ $file->note }}
-                                                    @endif
-                                                </td>
-                                                <td>
-                                                    @if ($file->filename)
-                                                        <a href="{{ route('show.accessoryfile', [$accessory->id, $file->id]) }}" class="btn btn-sm btn-default">
-                                                            <i class="fas fa-download" aria-hidden="true"></i>
-                                                            <span class="sr-only">{{ trans('general.download') }}</span>
-                                                        </a>
-
-                                                        <a href="{{ route('show.accessoryfile', [$accessory->id, $file->id, 'inline' => 'true']) }}" class="btn btn-sm btn-default" target="_blank">
-                                                            <i class="fa fa-external-link" aria-hidden="true"></i>
-                                                        </a>
-
-                                                    @endif
-                                                </td>
-                                                <td>{{ $file->created_at }}</td>
-                                                <td>
-                                                    <a class="btn delete-asset btn-danger btn-sm" href="{{ route('delete/accessoryfile', [$accessory->id, $file->id]) }}" data-content="{{ trans('general.delete_confirm', ['item' => $file->filename]) }}" data-title="{{ trans('general.delete') }}">
-                                                        <i class="fas fa-trash icon-white" aria-hidden="true"></i>
-                                                        <span class="sr-only">{{ trans('general.delete') }}</span>
-                                                    </a>
-                                                </td>
-                                            </tr>
-                                        @endforeach
-                                    @else
-                                        <tr>
-                                            <td colspan="8">{{ trans('general.no_results') }}</td>
-                                        </tr>
-                                    @endif
-                                    </tbody>
-                                </table>
+                            <div class="row">
+                                <div class="col-md-12">
+                                    <x-filestable
+                                        filepath="private_uploads/accessories/"
+                                        showfile_routename="show.accessoryfile"
+                                        deletefile_routename="delete/accessoryfile"
+                                        :object="$accessory" />
+                                </div>
                             </div>
-                        </div>
-                    </div>
-                </div> <!-- /.tab-pane -->
+                        </div> <!-- /.tab-pane -->
                 @endcan
             </div>
         </div>
@@ -256,11 +162,23 @@
       @if ($accessory->image!='')
           <div class="row">
               <div class="col-md-12 text-center" style="padding-bottom: 15px;">
-                  <a href="{{ Storage::disk('public')->url('accessories/'.e($accessory->image)) }}" data-toggle="lightbox"><img src="{{ Storage::disk('public')->url('accessories/'.e($accessory->image)) }}" class="img-responsive img-thumbnail" alt="{{ $accessory->name }}"></a>
+                  <a href="{{ Storage::disk('public')->url('accessories/'.e($accessory->image)) }}" data-toggle="lightbox" data-type="image">
+                      <img src="{{ Storage::disk('public')->url('accessories/'.e($accessory->image)) }}" class="img-responsive img-thumbnail" alt="{{ $accessory->name }}"></a>
               </div>
           </div>
       @endif
 
+          @if ($accessory->model_number)
+              <div class="row">
+                  <div class="col-md-3" style="padding-bottom: 10px;">
+                      <strong>{{ trans('general.model_no')}}</strong>
+                  </div>
+                  <div class="col-md-9">
+                      {{ $accessory->model_number }}
+                  </div>
+              </div>
+          @endif
+
       @if ($accessory->company)
           <div class="row">
               <div class="col-md-3" style="padding-bottom: 15px;">
@@ -272,6 +190,16 @@
           </div>
       @endif
 
+          @if ($accessory->location)
+              <div class="row">
+                  <div class="col-md-3" style="padding-bottom: 10px;">
+                      <strong>{{ trans('general.location')}}</strong>
+                  </div>
+                  <div class="col-md-9">
+                      <a href="{{ route('locations.show', $accessory->location->id) }}">{{ $accessory->location->name }} </a>
+                  </div>
+              </div>
+          @endif
 
       @if ($accessory->category)
           <div class="row">
@@ -284,6 +212,18 @@
           </div>
       @endif
 
+          @if ($accessory->manufacturer)
+              <div class="row">
+                  <div class="col-md-3" style="padding-bottom: 10px;">
+                      <strong>{{ trans('general.manufacturer')}}</strong>
+                  </div>
+                  <div class="col-md-9">
+                      <a href="{{ route('manufacturers.show', $accessory->manufacturer->id) }}">{{ $accessory->manufacturer->name }} </a>
+                  </div>
+              </div>
+          @endif
+
+
 
       @if ($accessory->notes)
         <div class="row">
@@ -292,13 +232,37 @@
                   {{ trans('general.notes') }}
               </strong>
           </div>
-          <div class="col-md-9">
+          <div class="col-md-9" style="word-wrap: break-word;">
               {!! nl2br(Helper::parseEscapedMarkedownInline($accessory->notes)) !!}
           </div>
        </div>
-
      @endif
 
+      @if ($accessory->purchase_date)
+          <div class="row">
+              <div class="col-md-3" style="padding-bottom: 10px;">
+                  <strong>
+                      {{ trans('general.purchase_date') }}
+                  </strong>
+              </div>
+              <div class="col-md-9" style="word-wrap: break-word;">
+                  {{ \App\Helpers\Helper::getFormattedDateObject($accessory->purchase_date, 'date')['formatted']}}
+              </div>
+          </div>
+      @endif
+
+          @if ($accessory->purchase_cost)
+              <div class="row">
+                  <div class="col-md-3" style="padding-bottom: 10px;">
+                      <strong>
+                          {{ trans('general.purchase_cost') }}
+                      </strong>
+                  </div>
+                  <div class="col-md-9" style="word-wrap: break-word;">
+                      {{ Helper::formatCurrencyOutput($accessory->purchase_cost) }}
+                  </div>
+              </div>
+          @endif
 
       <div class="row">
           <div class="col-md-3" style="padding-bottom: 10px;">
@@ -314,39 +278,91 @@
               <strong>{{ trans('general.checked_out') }}</strong>
           </div>
           <div class="col-md-9">
-              {{ $accessory->users_count }}
+              {{ $accessory->checkouts_count }}
           </div>
       </div>
+
+          <div class="row">
+              <div class="col-md-3" style="padding-bottom: 10px;">
+                  <strong>
+                      {{ trans('general.created_at') }}
+                  </strong>
+              </div>
+              <div class="col-md-9" style="word-wrap: break-word;">
+                  {{ \App\Helpers\Helper::getFormattedDateObject($accessory->created_at, 'datetime')['formatted']}}
+              </div>
+          </div>
+
+          @if ($accessory->created_at!=$accessory->updated_at)
+          <div class="row">
+              <div class="col-md-3" style="padding-bottom: 10px;">
+                  <strong>
+                      {{ trans('general.updated_at') }}
+                  </strong>
+              </div>
+              <div class="col-md-9" style="word-wrap: break-word;">
+                  {{ \App\Helpers\Helper::getFormattedDateObject($accessory->updated_at, 'datetime')['formatted']}}
+              </div>
+          </div>
+
+          @endif
+
+          @if ($accessory->adminuser)
+              <div class="row">
+                  <div class="col-md-3" style="padding-bottom: 10px;">
+                      <strong>
+                          {{ trans('general.created_by') }}
+                      </strong>
+                  </div>
+                  <div class="col-md-9" style="word-wrap: break-word;">
+                      <x-full-user-name :user="$accessory->adminuser" />
+                  </div>
+              </div>
+          @endif
+
 </div>
 
     <div class="col-md-3 pull-right">
+
+        @can('update', \App\Models\Accessory::class)
+            <div class="text-center" style="padding-top:5px;">
+                <a href="{{ route('accessories.edit', $accessory->id) }}" style="margin-right:5px;" class="btn btn-warning btn-sm btn-social btn-block hidden-print">
+                    <x-icon type="edit" />
+                    {{ trans('admin/accessories/general.edit') }}
+                </a>
+            </div>
+        @endcan
+
         @can('checkout', \App\Models\Accessory::class)
                 <div class="text-center" style="padding-top:5px;">
-                    <a href="{{ route('accessories.checkout.show', $accessory->id) }}" style="margin-right:5px; width:100%" class="btn btn-primary btn-sm" {{ (($accessory->numRemaining() > 0 ) ? '' : ' disabled') }}>{{ trans('general.checkout') }}</a>
+                    <a href="{{ route('accessories.checkout.show', $accessory->id) }}" style="margin-right:5px; width:100%" class="btn bg-maroon btn-sm btn-social btn-block hidden-print {{ (($accessory->numRemaining() > 0 ) ? '' : ' disabled') }}">
+                        <x-icon type="checkout" />
+                        {{ trans('general.checkout') }}
+                    </a>
                 </div>
         @endcan
-        @can('update', \App\Models\Accessory::class)
-               <div class="text-center" style="padding-top:5px;">
-                  <a href="{{ route('accessories.edit', $accessory->id) }}" style="margin-right:5px; width:100%" class="btn btn-primary btn-sm">{{ trans('admin/accessories/general.edit') }}</a>
-               </div>
-        @endcan
-        @can('update', \App\Models\Accessory::class)
+
+        @can('create', \App\Models\Accessory::class)
                 <div class="text-center" style="padding-top:5px;">
-                    <a href="{{ route('clone/accessories', $accessory->id) }}" style="margin-right:5px; width:100%" class="btn btn-primary btn-sm">{{ trans('admin/accessories/general.clone') }}</a>
+                    <a href="{{ route('clone/accessories', $accessory->id) }}" style="margin-right:5px; width:100%"  class="btn btn-info btn-block btn-sm btn-social hidden-print">
+                        <x-icon type="clone" />
+                        {{ trans('admin/accessories/general.clone') }}</a>
                 </div>
         @endcan
 
         @can('delete', $accessory)
-            @if ($accessory->users_count == 0)
+            @if ($accessory->checkouts_count == 0)
                 <div class="text-center" style="padding-top:5px;">
-                    <button class="btn btn-block btn-danger delete-asset" style="padding-top:5px;" data-toggle="modal" data-title="{{ trans('general.delete') }}" data-content="{{ trans('general.delete_confirm_no_undo', ['item' => $accessory->name]) }}" data-target="#dataConfirmModal">
+                    <button class="btn btn-block btn-danger btn-sm btn-social delete-asset" style="padding-top:5px;" data-toggle="modal" data-title="{{ trans('general.delete') }}" data-content="{{ trans('general.delete_confirm_no_undo', ['item' => $accessory->name]) }}" data-target="#dataConfirmModal">
+                        <x-icon type="delete" />
                     {{ trans('general.delete') }}
                     </button>
                 </div>
             @else
                 <div class="text-center" style="padding-top:5px;">
                     <span data-tooltip="true" title=" {{ trans('admin/accessories/general.delete_disabled') }}">
-                        <a href="#" class="btn btn-block btn-danger disabled">
+                        <a href="#" class="btn btn-block btn-danger btn-sm btn-social delete-asset disabled">
+                            <x-icon type="delete" />
                         {{ trans('general.delete') }}
                         </a>
                     </span>
diff --git a/resources/views/account/accept/create.blade.php b/resources/views/account/accept/create.blade.php
index b9843cd47b..e811d48105 100644
--- a/resources/views/account/accept/create.blade.php
+++ b/resources/views/account/accept/create.blade.php
@@ -110,25 +110,25 @@
             canvas = wrapper.querySelector("canvas"),
             signaturePad;
 
-        // Adjust canvas coordinate space taking into account pixel ratio,
-        // to make it look crisp on mobile devices.
-        // This also causes canvas to be cleared.
-        if (window.matchMedia("(min-width: 768px)").matches) {
-            function resizeCanvas() {
-                // When zoomed out to less than 100%, for some very strange reason,
-                // some browsers report devicePixelRatio as less than 1
-                // and only part of the canvas is cleared then.
-                var ratio = Math.max(window.devicePixelRatio || 1, 1);
-                canvas.width = canvas.offsetWidth * ratio;
-                canvas.height = canvas.offsetHeight * ratio;
-                canvas.getContext("2d").scale(ratio, ratio);
-            }
-            window.onresize = resizeCanvas;
-            resizeCanvas();
-        }
-
         signaturePad = new SignaturePad(canvas);
 
+        // Adjust canvas coordinate space taking into account pixel ratio,
+        // to make it look crisp on smaller screens.
+        // https://github.com/szimek/signature_pad#handling-high-dpi-screens
+        // (This also causes canvas to be cleared.)
+        function resizeCanvas() {
+            // When zoomed out to less than 100%, for some very strange reason,
+            // some browsers report devicePixelRatio as less than 1
+            // and only part of the canvas is cleared then.
+            var ratio = Math.max(window.devicePixelRatio || 1, 1);
+            canvas.width = canvas.offsetWidth * ratio;
+            canvas.height = canvas.offsetHeight * ratio;
+            canvas.getContext("2d").scale(ratio, ratio);
+            signaturePad.clear(); // otherwise isEmpty() might return incorrect value
+        }
+        window.onresize = resizeCanvas;
+        resizeCanvas();
+
         $('#clear_button').on("click", function (event) {
             signaturePad.clear();
         });
@@ -144,4 +144,4 @@
 
 
     </script>
-@stop
\ No newline at end of file
+@stop
diff --git a/resources/views/account/change-password.blade.php b/resources/views/account/change-password.blade.php
index 9899a9734e..18ad77650d 100755
--- a/resources/views/account/change-password.blade.php
+++ b/resources/views/account/change-password.blade.php
@@ -11,7 +11,7 @@
 
 <div class="row">
     <div class="col-md-9">
-    {{ Form::open(['method' => 'POST', 'files' => true, 'class' => 'form-horizontal', 'autocomplete' => 'off']) }}
+    <form method="POST" action="{{ route('account.password.update') }}" accept-charset="UTF-8" class="form-horizontal" autocomplete="off">
     <!-- CSRF Token -->
         <input type="hidden" name="_token" value="{{ csrf_token() }}" />
         <div class="box box-default">
@@ -23,7 +23,7 @@
         <label for="current_password" class="col-md-3 control-label"> {{ trans('general.current_password') }} </label>
         </label>
         <div class="col-md-5 required">
-            <input class="form-control" type="password" name="current_password" id="current_password" {{ (config('app.lock_passwords') ? ' disabled' : '') }}>
+            <input class="form-control" type="password" name="current_password" id="current_password" required {{ (config('app.lock_passwords') ? ' disabled' : '') }}>
             {!! $errors->first('current_password', '<span class="alert-msg" aria-hidden="true"><i class="fas fa-times" aria-hidden="true"></i> :message</span>') !!}
             @if (config('app.lock_passwords')===true)
                 <p class="text-warning"><i class="fas fa-lock"></i> {{ trans('general.feature_disabled') }}</p>
@@ -34,7 +34,7 @@
     <div class="form-group {{ $errors->has('password') ? ' has-error' : '' }}">
         <label for="password" class="col-md-3 control-label">{{ trans('general.new_password') }}</label>
         <div class="col-md-5 required">
-            <input class="form-control" type="password" name="password" id="password" {{ (config('app.lock_passwords') ? ' disabled' : '') }}>
+            <input class="form-control" type="password" name="password" id="password" required {{ (config('app.lock_passwords') ? ' disabled' : '') }}>
             {!! $errors->first('password', '<span class="alert-msg" aria-hidden="true"><i class="fas fa-times" aria-hidden="true"></i> :message</span>') !!}
             @if (config('app.lock_passwords')===true)
                 <p class="text-warning"><i class="fas fa-lock"></i> {{ trans('general.feature_disabled') }}</p>
@@ -59,11 +59,11 @@
             </div> <!-- .box-body -->
             <div class="box-footer text-right">
                 <a class="btn btn-link" href="{{ URL::previous() }}">{{ trans('button.cancel') }}</a>
-                <button type="submit" class="btn btn-primary"><i class="fas fa-check icon-white" aria-hidden="true"></i> {{ trans('general.save') }}</button>
+                <button type="submit" class="btn btn-primary"><x-icon type="checkmark" /> {{ trans('general.save') }}</button>
             </div>
 
         </div> <!-- .box-default -->
-        {{ Form::close() }}
+        </form>
     </div> <!-- .col-md-9 -->
 </div> <!-- .row-->
 @stop
diff --git a/resources/views/account/profile.blade.php b/resources/views/account/profile.blade.php
index 96ea7cc43d..cb8769b663 100755
--- a/resources/views/account/profile.blade.php
+++ b/resources/views/account/profile.blade.php
@@ -10,7 +10,7 @@
 
 <div class="row">
   <div class="col-md-9">
-  {{ Form::open(['method' => 'POST', 'files' => true, 'class' => 'form-horizontal', 'autocomplete' => 'off']) }}
+  <form method="POST" action="{{ route('profile.update') }}" accept-charset="UTF-8" class="form-horizontal" autocomplete="off" enctype="multipart/form-data">
   <!-- CSRF Token -->
     <input type="hidden" name="_token" value="{{ csrf_token() }}" />
     <div class="box box-default">
@@ -20,7 +20,7 @@
           <label for="first_name" class="col-md-3 control-label">{{ trans('general.first_name') }}
           </label>
           <div class="col-md-8 required">
-            <input class="form-control" type="text" name="first_name" id="first_name" value="{{ old('first_name', $user->first_name) }}" />
+            <input class="form-control" type="text" name="first_name" id="first_name" value="{{ old('first_name', $user->first_name) }}" required />
             {!! $errors->first('first_name', '<span class="alert-msg" aria-hidden="true"><i class="fas fa-times" aria-hidden="true"></i> :message</span>') !!}
           </div>
         </div>
@@ -49,7 +49,7 @@
           <div class="col-md-7">
 
             @if (!config('app.lock_passwords'))
-              {!! Form::locales('locale', old('locale', $user->locale), 'select2') !!}
+              <x-input.locale-select name="locale" :selected="old('locale', $user->locale)"/>
               {!! $errors->first('locale', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
             @else
               <p class="help-block">{{ trans('general.feature_disabled') }}</p>
@@ -65,7 +65,7 @@
             {{ trans('general.skin') }}
           </label>
           <div class="col-md-8">
-            {!! Form::user_skin('skin', old('skin', $user->skin), 'select2') !!}
+            <x-input.skin name="skin" :selected="old('skin', $user->skin)" :include-blank-option="true"/>
             {!! $errors->first('skin', '<span class="alert-msg">:message</span>') !!}
           </div>
         </div>
@@ -89,6 +89,24 @@
           </div>
         </div>
 
+        <div class="form-group">
+          <div class="col-md-9 col-md-offset-3">
+            <label class="form-control">
+              <input type="checkbox" name="enable_sounds" value="1" {{ old('enable_sounds', $user->enable_sounds) ? 'checked' : '' }}>
+              {{ trans('account/general.enable_sounds') }}
+            </label>
+          </div>
+        </div>
+
+        <div class="form-group">
+          <div class="col-md-9 col-md-offset-3">
+            <label class="form-control">
+              <input type="checkbox" name="enable_confetti" value="1" {{ old('enable_confetti', $user->enable_confetti) ? 'checked' : '' }}>
+              {{ trans('account/general.enable_confetti') }}
+            </label>
+          </div>
+        </div>
+
         <!-- Gravatar Email -->
         <div class="form-group {{ $errors->has('gravatar') ? ' has-error' : '' }}">
           <label for="gravatar" class="col-md-3 control-label">{{ trans('general.gravatar_email') }}
@@ -97,7 +115,7 @@
           <div class="col-md-8">
             <input class="form-control" type="text" name="gravatar" id="gravatar" value="{{ old('gravatar', $user->gravatar) }}" />
             {!! $errors->first('gravatar', '<span class="alert-msg" aria-hidden="true"><i class="fas fa-times" aria-hidden="true"></i> :message</span>') !!}
-            <p>
+            <p style="padding-top: 3px;">
               <img src="//secure.gravatar.com/avatar/{{ md5(strtolower(trim($user->gravatar))) }}" width="30" height="30" alt="{{ $user->present()->fullName() }} avatar image">
               {!! trans('general.gravatar_url') !!}
             </p>
@@ -110,7 +128,7 @@
           <div class="form-group{{ $errors->has('image_delete') ? ' has-error' : '' }}">
             <div class="col-md-9 col-md-offset-3">
               <label for="image_delete" class="form-control">
-                {{ Form::checkbox('image_delete', '1', old('image_delete'), ['id' => 'image_delete', 'aria-label'=>'image_delete']) }}
+                <input type="checkbox" name="image_delete" id="image_delete" value="1" @checked(old('image_delete')) aria-label="image_delete">
                 {{ trans('general.image_delete') }}
               </label>
               {!! $errors->first('image_delete', '<span class="alert-msg">:message</span>') !!}
@@ -132,13 +150,23 @@
         @if ($snipeSettings->two_factor_enabled=='1')
         <div class="form-group {{ $errors->has('two_factor_optin') ? 'has-error' : '' }}">
           <div class="col-md-7 col-md-offset-3">
-            @can('self.two_factor')
-              <label class="form-control">{{ Form::checkbox('two_factor_optin', '1', old('two_factor_optin', $user->two_factor_optin)) }}
-            @else
-                <label class="form-control form-control--disabled">{{ Form::checkbox('two_factor_optin', '1', old('two_factor_optin', $user->two_factor_optin),['disabled' => 'disabled']) }}
-            @endcan
-
-            {{ trans('admin/settings/general.two_factor_enabled_text') }}</label>
+              <label
+                  for="two_factor_optin"
+                  @class([
+                    'form-control',
+                    'form-control--disabled' => auth()->user()->cannot('self.two_factor'),
+                  ])
+              >
+                <input
+                    type="checkbox"
+                    name="two_factor_optin"
+                    id="two_factor_optin"
+                    value="1"
+                    @checked(old('two_factor_optin', $user->two_factor_optin))
+                    @disabled(auth()->user()->cannot('self.two_factor'))
+                >
+                {{ trans('admin/settings/general.two_factor_enabled_text') }}
+              </label>
             @can('self.two_factor')
               <p class="help-block">{{ trans('admin/settings/general.two_factor_enabled_warning') }}</p>
             @else
@@ -152,13 +180,14 @@
         @endif
 
 
+
       </div> <!-- .box-body -->
       <div class="text-right box-footer">
         <a class="btn btn-link" href="{{ URL::previous() }}">{{ trans('button.cancel') }}</a>
-        <button type="submit" class="btn btn-primary"><i class="fas fa-check icon-white" aria-hidden="true"></i> {{ trans('general.save') }}</button>
+        <button type="submit" class="btn btn-primary"><x-icon type="checkmark" /> {{ trans('general.save') }}</button>
       </div>
     </div> <!-- .box-default -->
-    {{ Form::close() }}
+    </form>
   </div> <!-- .col-md-9 -->
 </div> <!-- .row-->
 
diff --git a/resources/views/account/requestable-assets.blade.php b/resources/views/account/requestable-assets.blade.php
index dfabd45556..a23bf1737b 100644
--- a/resources/views/account/requestable-assets.blade.php
+++ b/resources/views/account/requestable-assets.blade.php
@@ -56,6 +56,8 @@
                                         data-pagination="true"
                                         data-id-table="requestableAssetsListingTable"
                                         data-search="true"
+                                        data-search-highlight="true"
+                                        data-show-print="true"
                                         data-side-pagination="server"
                                         data-show-columns="true"
                                         data-show-export="false"
@@ -106,6 +108,9 @@
                                         data-toolbar="#toolbar"
                                         class="table table-striped snipe-table"
                                         id="table"
+                                        data-search="true"
+                                        data-search-highlight="true"
+                                        data-show-print="true"
                                         data-advanced-search="true"
                                         data-id-table="advancedTable"
                                         data-cookie-id-table="requestableAssets">
@@ -148,9 +153,9 @@
                                                         {{ csrf_field() }}
                                                     <input type="text" style="width: 70px; margin-right: 10px;" class="form-control pull-left" name="request-quantity" value="" placeholder="{{ trans('general.qty') }}">
                                                     @if ($requestableModel->isRequestedBy(Auth::user()))
-                                                        {{ Form::submit(trans('button.cancel'), ['class' => 'btn btn-danger btn-sm'])}}
+                                                        <input class="btn btn-danger btn-sm" type="submit" value="{{ trans('button.cancel') }}">
                                                     @else
-                                                        {{ Form::submit(trans('button.request'), ['class' => 'btn btn-primary btn-sm'])}}
+                                                        <input class="btn btn-primary btn-sm" type="submit" value="{{ trans('button.request') }}">
                                                     @endif
                                                     </form>
                                                 </td>
diff --git a/resources/views/account/requested.blade.php b/resources/views/account/requested.blade.php
index e2e1db2e51..9d03a7bcfb 100644
--- a/resources/views/account/requested.blade.php
+++ b/resources/views/account/requested.blade.php
@@ -15,6 +15,7 @@
                 <div class="box-body">
 
                     <table
+                            data-show-print="true"
                             data-cookie-id-table="userRequests"
                             data-pagination="true"
                             data-id-table="userRequests"
diff --git a/resources/views/account/view-assets.blade.php b/resources/views/account/view-assets.blade.php
index 48c94f6833..6ad355e04c 100755
--- a/resources/views/account/view-assets.blade.php
+++ b/resources/views/account/view-assets.blade.php
@@ -9,6 +9,7 @@
 {{-- Account page content --}}
 @section('content')
 
+
 @if ($acceptances = \App\Models\CheckoutAcceptance::forUser(Auth::user())->pending()->count())
   <div class="row">
     <div class="col-md-12">
@@ -17,7 +18,7 @@
 
         <strong>
           <a href="{{ route('account.accept') }}" style="color: white;">
-            {{ trans('general.unaccepted_profile_warning', array('count' => $acceptances)) }}
+            {{ trans_choice('general.unaccepted_profile_warning', $acceptances, ['count' => $acceptances]) }}
           </a>
           </strong>
       </div>
@@ -32,20 +33,23 @@
 
           <li class="active">
             <a href="#details" data-toggle="tab">
-            <span class="hidden-lg hidden-md">
-            <i class="fas fa-info-circle fa-2x"></i>
-            </span>
-              <span class="hidden-xs hidden-sm">{{ trans('admin/users/general.info') }}</span>
+              <span class="hidden-lg hidden-md" aria-hidden="true">
+              <i class="fas fa-info-circle fa-2x"></i>
+              </span>
+              <span class="hidden-xs hidden-sm">
+                {{ trans('admin/users/general.info') }}
+              </span>
             </a>
           </li>
 
           <li>
-            <a href="#asset" data-toggle="tab">
-            <span class="hidden-lg hidden-md">
-            <i class="fas fa-barcode fa-2x" aria-hidden="true"></i>
-            </span>
-              <span class="hidden-xs hidden-sm">{{ trans('general.assets') }}
-                {!! ($user->assets()->AssetsForShow()->count() > 0 ) ? '<badge class="badge badge-secondary">'.number_format($user->assets()->AssetsForShow()->count()).'</badge>' : '' !!}
+            <a href="#assets" data-toggle="tab">
+              <span class="hidden-lg hidden-md" aria-hidden="true">
+                <x-icon type="assets" class="fa-2x" />
+              </span>
+              <span class="hidden-xs hidden-sm">
+                {{ trans('general.assets') }}
+                {!! ($user->assets()->AssetsForShow()->count() > 0 ) ? '<span class="badge badge-secondary">'.number_format($user->assets()->AssetsForShow()->count()).'</span>' : '' !!}
             </span>
             </a>
           </li>
@@ -56,7 +60,7 @@
             <i class="far fa-save fa-2x"></i>
             </span>
               <span class="hidden-xs hidden-sm">{{ trans('general.licenses') }}
-                {!! ($user->licenses->count() > 0 ) ? '<badge class="badge badge-secondary">'.number_format($user->licenses->count()).'</badge>' : '' !!}
+                {!! ($user->licenses->count() > 0 ) ? '<span class="badge badge-secondary">'.number_format($user->licenses->count()).'</span>' : '' !!}
             </span>
             </a>
           </li>
@@ -64,21 +68,32 @@
           <li>
             <a href="#accessories" data-toggle="tab">
             <span class="hidden-lg hidden-md">
-            <i class="far fa-keyboard fa-2x"></i>
+            <x-icon type="accessories" class="fa-2x" />
             </span>
               <span class="hidden-xs hidden-sm">{{ trans('general.accessories') }}
-                {!! ($user->accessories->count() > 0 ) ? '<badge class="badge badge-secondary">'.number_format($user->accessories->count()).'</badge>' : '' !!}
+                {!! ($user->accessories->count() > 0 ) ? '<span class="badge badge-secondary">'.number_format($user->accessories->count()).'</span>' : '' !!}
             </span>
             </a>
           </li>
 
           <li>
             <a href="#consumables" data-toggle="tab">
-            <span class="hidden-lg hidden-md">
-                <i class="fas fa-tint fa-2x"></i>
-            </span>
+            <span class="hidden-lg hidden-md" aria-hidden="true">
+                <x-icon type="consumables" class="fa-2x" />
+              </span>
               <span class="hidden-xs hidden-sm">{{ trans('general.consumables') }}
-                {!! ($user->consumables->count() > 0 ) ? '<badge class="badge badge-secondary">'.number_format($user->consumables->count()).'</badge>' : '' !!}
+                {!! ($user->consumables->count() > 0 ) ? '<span class="badge badge-secondary">'.number_format($user->consumables->count()).'</span>' : '' !!}
+            </span>
+            </a>
+          </li>
+
+          <li>
+            <a href="#eulas" data-toggle="tab">
+            <span class="hidden-lg hidden-md" aria-hidden="true">
+                <x-icon type="files" class="fa-2x" />
+              </span>
+              <span class="hidden-xs hidden-sm">{{ trans('general.eula') }}
+                {!! ($user->eulas->count() > 0 ) ? '<span class="badge badge-secondary">'.number_format($user->eulas->count()).'</span>' : '' !!}
             </span>
             </a>
           </li>
@@ -93,30 +108,31 @@
               <!-- Start button column -->
               <div class="col-md-3 col-xs-12 col-sm-push-9">
 
-
-
                 <div class="col-md-12 text-center">
-
+                  <img src="{{ $user->present()->gravatar() }}"  class=" img-thumbnail hidden-print" style="margin-bottom: 20px;" alt="{{ $user->present()->fullName() }}" alt="User avatar">
                 </div>
-                <div class="col-md-12 text-center">
-                  <img src="{{ $user->present()->gravatar() }}"  class=" img-thumbnail hidden-print" style="margin-bottom: 20px;" alt="{{ $user->present()->fullName() }}">
-                </div>
-
+                @can('self.profile')
                   <div class="col-md-12">
-                    <a href="{{ route('profile') }}" style="width: 100%;" class="btn btn-sm btn-primary hidden-print">
+                    <a href="{{ route('profile') }}" style="width: 100%;" class="btn btn-sm btn-warning btn-social btn-block hidden-print">
+                      <x-icon type="edit" />
                       {{ trans('general.editprofile') }}
                     </a>
                   </div>
+                @endcan
 
+                @if ($user->ldap_import!='1')
                 <div class="col-md-12" style="padding-top: 5px;">
-                  <a href="{{ route('account.password.index') }}" style="width: 100%;" class="btn btn-sm btn-primary hidden-print" target="_blank" rel="noopener">
+                  <a href="{{ route('account.password.index') }}" style="width: 100%;" class="btn btn-sm btn-primary btn-social btn-block hidden-print" target="_blank" rel="noopener">
+                    <x-icon type="password" class="fa-fw" />
                     {{ trans('general.changepassword') }}
                   </a>
                 </div>
+                @endif
 
                 @can('self.api')
                 <div class="col-md-12" style="padding-top: 5px;">
-                  <a href="{{ route('user.api') }}" style="width: 100%;" class="btn btn-sm btn-primary hidden-print" target="_blank" rel="noopener">
+                  <a href="{{ route('user.api') }}" style="width: 100%;" class="btn btn-sm btn-primary btn-social btn-block hidden-print" target="_blank" rel="noopener">
+                    <x-icon type="api-key" class="fa-fw" />
                     {{ trans('general.manage_api_keys') }}
                   </a>
                 </div>
@@ -124,7 +140,8 @@
 
 
                   <div class="col-md-12" style="padding-top: 5px;">
-                    <a href="{{ route('profile.print') }}" style="width: 100%;" class="btn btn-sm btn-primary hidden-print" target="_blank" rel="noopener">
+                    <a href="{{ route('profile.print') }}" style="width: 100%;" class="btn btn-sm btn-primary btn-social btn-block hidden-print" target="_blank" rel="noopener">
+                      <x-icon type="print" class="fa-fw" />
                       {{ trans('admin/users/general.print_assigned') }}
                     </a>
                   </div>
@@ -134,10 +151,16 @@
                     @if (!empty($user->email))
                       <form action="{{ route('profile.email_assets') }}" method="POST">
                         {{ csrf_field() }}
-                        <button style="width: 100%;" class="btn btn-sm btn-primary hidden-print" rel="noopener">{{ trans('admin/users/general.email_assigned') }}</button>
+                        <button style="width: 100%;" class="btn btn-sm btn-primary btn-social btn-block hidden-print" rel="noopener">
+                          <x-icon type="email" class="fa-fw" />
+                          {{ trans('admin/users/general.email_assigned') }}
+                        </button>
                       </form>
                     @else
-                      <button style="width: 100%;" class="btn btn-sm btn-primary hidden-print" rel="noopener" disabled title="{{ trans('admin/users/message.user_has_no_email') }}">{{ trans('admin/users/general.email_assigned') }}</button>
+                      <button style="width: 100%;" class="btn btn-sm btn-primary btn-social btn-block hidden-print disabled" rel="noopener" disabled title="{{ trans('admin/users/message.user_has_no_email') }}">
+                        <x-icon type="email" class="fa-fw" />
+                        {{ trans('admin/users/general.email_assigned') }}
+                      </button>
                     @endif
                   </div>
 
@@ -363,53 +386,81 @@
             </div> <!--/.row-->
           </div><!-- /.tab-pane -->
 
-          <div class="tab-pane" id="asset">
+          <div class="tab-pane" id="assets">
             <!-- checked out assets table -->
 
-
-            <div class="table table-responsive">
-              @if ($user->id)
-                <div class="box-header with-border">
-                  <div class="box-heading">
-                    <h2 class="box-title"> {{ trans('admin/users/general.assets_user', array('name' => $user->first_name)) }}</h2>
-                  </div>
-                </div><!-- /.box-header -->
-              @endif
-
-              <div class="box-body">
-                <!-- checked out assets table -->
-                <div class="table-responsive">
-
-                  <table
-                          data-cookie="true"
-                          data-cookie-id-table="userAssets"
-                          data-pagination="true"
-                          data-id-table="userAssets"
-                          data-search="true"
-                          data-side-pagination="client"
-                          data-show-columns="true"
-                          data-show-export="true"
-                          data-show-footer="true"
-                          data-sort-order="asc"
-                          id="userAssets"
-                          class="table table-striped snipe-table"
-                          data-export-options='{
+            <table
+                  data-cookie-id-table="userAssignedAssets"
+                  data-toolbar="#userAssetToolbar"
+                  data-pagination="true"
+                  data-id-table="userAssets"
+                  data-search="true"
+                  data-search-highlight="true"
+                  data-show-print="true"
+                  data-side-pagination="client"
+                  data-show-columns="true"
+                  data-show-export="true"
+                  data-show-footer="true"
+                  data-sort-order="asc"
+                  id="userAssets"
+                  class="table table-striped snipe-table"
+                  data-show-fullscreen="true"
+                  data-export-options='{
                   "fileName": "my-assets-{{ date('Y-m-d') }}",
                   "ignoreColumn": ["actions","image","change","checkbox","checkincheckout","icon"]
                   }'>
+
+                    <caption id="userAssetToolbar" class="tableCaption">
+                      {{ trans('general.assets') }}
+                    </caption>
+
                     <thead>
                     <tr>
-                      <th class="col-md-1">#</th>
-                      <th class="col-md-1">{{ trans('general.image') }}</th>
-                      <th class="col-md-2" data-switchable="true" data-visible="true">{{ trans('general.category') }}</th>
-                      <th class="col-md-2" data-switchable="true" data-visible="true">{{ trans('admin/hardware/table.asset_tag') }}</th>
-                      <th class="col-md-2" data-switchable="true" data-visible="true">{{ trans('general.name') }}</th>
-                      <th class="col-md-2" data-switchable="true" data-visible="true">{{ trans('admin/hardware/table.asset_model') }}</th>
-                      <th class="col-md-3" data-switchable="true" data-visible="true">{{ trans('admin/hardware/table.serial') }}</th>
-                      <th class="col-md-2" data-switchable="true" data-visible="false">{{ trans('admin/hardware/form.default_location') }}</th>
+                      <th class="col-md-1">
+                        #
+                      </th>
+                      <th class="col-md-1">
+                        {{ trans('general.image') }}
+                      </th>
+                      <th class="col-md-2" data-switchable="true" data-visible="true">
+                        {{ trans('general.category') }}
+                      </th>
+                      <th class="col-md-2" data-switchable="true" data-visible="true">
+                        {{ trans('admin/hardware/table.asset_tag') }}
+                      </th>
+                      <th class="col-md-2" data-switchable="true" data-visible="false">
+                        {{ trans('general.name') }}
+                      </th>
+                      <th class="col-md-2" data-switchable="true" data-visible="true">
+                        {{ trans('admin/hardware/table.asset_model') }}
+                      </th>
+                      <th class="col-md-2" data-switchable="true" data-visible="false">
+                        {{ trans('general.model_no') }}
+                      </th>
+                      <th class="col-md-3" data-switchable="true" data-visible="true">
+                        {{ trans('admin/hardware/table.serial') }}
+                      </th>
+                      <th class="col-md-2" data-switchable="true" data-visible="false">
+                        {{ trans('admin/hardware/form.default_location') }}
+                      </th>
+                      <th class="col-md-2" data-switchable="true" data-visible="false">
+                        {{ trans('general.location') }}
+                      </th>
+
                       @can('self.view_purchase_cost')
-                        <th class="col-md-6" data-footer-formatter="sumFormatter" data-fieldname="purchase_cost">{{ trans('general.purchase_cost') }}</th>
+                        <th class="col-md-6" data-footer-formatter="sumFormatter" data-fieldname="purchase_cost">
+                          {{ trans('general.purchase_cost') }}
+                        </th>
                       @endcan
+                      <th class="col-md-2" data-switchable="true" data-visible="true">
+                        {{ trans('admin/hardware/form.eol_date') }}
+                      </th>
+                      <th class="col-md-2" data-switchable="true" data-visible="false">
+                        {{ trans('general.last_audit') }}
+                      </th>
+                      <th class="col-md-2" data-switchable="true" data-visible="false">
+                        {{ trans('general.next_audit_date') }}
+                      </th>
                       @foreach ($field_array as $db_column => $field_name)
                         <th class="col-md-1" data-switchable="true" data-visible="true">{{ $field_name }}</th>
                       @endforeach
@@ -426,9 +477,9 @@
                         <td>{{ $counter }}</td>
                         <td>
                           @if (($asset->image) && ($asset->image!=''))
-                            <img src="{{ Storage::disk('public')->url(app('assets_upload_path').e($asset->image)) }}" style="max-height: 30px; width: auto" class="img-responsive">
+                            <img src="{{ Storage::disk('public')->url(app('assets_upload_path').e($asset->image)) }}" style="max-height: 30px; width: auto" class="img-responsive" alt="">
                           @elseif (($asset->model) && ($asset->model->image!=''))
-                            <img src="{{ Storage::disk('public')->url(app('models_upload_path').e($asset->model->image)) }}" style="max-height: 30px; width: auto" class="img-responsive">
+                            <img src="{{ Storage::disk('public')->url(app('models_upload_path').e($asset->model->image)) }}" style="max-height: 30px; width: auto" class="img-responsive" alt="">
                           @endif
                         </td>
                         <td>
@@ -436,21 +487,44 @@
                           {{ $asset->model->category->name }}
                           @endif
                         </td>
-                        <td>{{ $asset->asset_tag }}</td>
-                        <td>{{ $asset->name }}</td>
                         <td>
-                          @if ($asset->physical=='1')
-                            {{ $asset->model->name }}
-                          @endif
+                          {{ $asset->asset_tag }}
+                        </td>
+                        <td>
+                          {{ $asset->name }}
+                        </td>
+                        <td>
+                            {{ $asset->model->name }}
+                        </td>
+                        <td>
+                          {{ $asset->model->model_number }}
+                        </td>
+                        <td>
+                          {{ $asset->serial }}
+                        </td>
+                        <td>
+                          {{ ($asset->defaultLoc) ? $asset->defaultLoc->name : '' }}
+                        </td>
+                        <td>
+                          {{ ($asset->location) ? $asset->location->name : '' }}
                         </td>
-                        <td>{{ $asset->serial }}</td>
-                        <td>{{ ($asset->defaultLoc) ? $asset->defaultLoc->name : '' }}</td>
                         @can('self.view_purchase_cost')
                         <td>
                           {!! Helper::formatCurrencyOutput($asset->purchase_cost) !!}
                         </td>
                         @endcan
 
+                        <td>
+                          {{ ($asset->asset_eol_date != '') ? Helper::getFormattedDateObject($asset->asset_eol_date, 'date', false) : null }}
+                        </td>
+
+                        <td>
+                          {{ Helper::getFormattedDateObject($asset->last_audit_date, 'datetime', false) }}
+                        </td>
+                        <td>
+                          {{ Helper::getFormattedDateObject($asset->next_audit_date, 'date', false) }}
+                        </td>
+
                         @foreach ($field_array as $db_column => $field_value)
                           <td>
                             {{ $asset->{$db_column} }}
@@ -465,46 +539,54 @@
                     @endforeach
                     </tbody>
                   </table>
-                </div>
-                </div> <!-- .table-responsive-->
-            </div>
           </div><!-- /asset -->
           <div class="tab-pane" id="licenses">
 
-            <div class="table-responsive">
               <table
+                      data-toolbar="#userLicensesToolbar"
                       data-cookie-id-table="userLicenses"
                       data-pagination="true"
                       data-id-table="userLicenses"
                       data-search="true"
+                      data-search-highlight="true"
+                      data-show-print="true"
                       data-side-pagination="client"
                       data-show-columns="true"
                       data-show-export="true"
                       data-show-refresh="false"
                       data-sort-order="asc"
                       id="userLicenses"
+                      data-show-fullscreen="true"
                       class="table table-striped snipe-table"
                       data-export-options='{
                     "fileName": "my-licenses-{{ date('Y-m-d') }}",
                     "ignoreColumn": ["actions","image","change","checkbox","checkincheckout","icon"]
                     }'>
+
+                <caption id="userLicensesToolbar" class="tableCaption">
+                  {{ trans('general.licenses') }}
+                </caption>
+
                 <thead>
                 <tr>
-                  <th>{{ trans('general.name') }}</th>
-                  <th>{{ trans('admin/licenses/form.license_key') }}</th>
-                  <th>{{ trans('admin/licenses/form.to_name') }}</th>
-                  <th>{{ trans('admin/licenses/form.to_email') }}</th>
-                  <th>{{ trans('general.category') }}</th>
+                  <th class="col-md-2">{{ trans('general.name') }}</th>
+                  <th class="col-md-4">{{ trans('admin/licenses/form.license_key') }}</th>
+                  <th class="col-md-2">{{ trans('admin/licenses/form.to_name') }}</th>
+                  <th class="col-md-2">{{ trans('admin/licenses/form.to_email') }}</th>
+                  <th class="col-md-2">{{ trans('general.category') }}</th>
 
                 </tr>
                 </thead>
                 <tbody>
                 @foreach ($user->licenses as $license)
                   <tr>
-                    <td>{{ $license->name }}</td>
+                    <td>
+                      {{ $license->name }}
+                    </td>
                     <td>
                       @can('viewKeys', $license)
-                        {{ $license->serial }}
+                        <code class="single-line"><span class="js-copy-link" data-clipboard-target=".js-copy-key-{{ $license->id }}" aria-hidden="true" data-tooltip="true" data-placement="top" title="{{ trans('general.copy_to_clipboard') }}"><span class="js-copy-key-{{ $license->id }}">{{ $license->serial }}</span></span></code>
+
                       @else
                         ------------
                       @endcan
@@ -526,16 +608,17 @@
                 @endforeach
                 </tbody>
               </table>
-            </div> <!-- .table-responsive-->
           </div>
 
           <div class="tab-pane" id="accessories">
-            <div class="table-responsive">
               <table
+                      data-toolbar="#userAccessoryToolbar"
                       data-cookie-id-table="userAccessoryTable"
                       data-id-table="userAccessoryTable"
                       id="userAccessoryTable"
                       data-search="true"
+                      data-search-highlight="true"
+                      data-show-print="true"
                       data-pagination="true"
                       data-side-pagination="client"
                       data-show-columns="true"
@@ -550,6 +633,12 @@
                     "fileName": "export-accessory-{{ str_slug($user->username) }}-{{ date('Y-m-d') }}",
                     "ignoreColumn": ["actions","image","change","checkbox","checkincheckout","delete","download","icon"]
                     }'>
+
+                <caption id="userAccessoryToolbar" class="tableCaption">
+                  {{ trans('general.accessories') }}
+                </caption>
+
+
                 <thead>
                 <tr>
                   <th class="col-md-5">{{ trans('general.name') }}</th>
@@ -577,16 +666,17 @@
                 @endforeach
                 </tbody>
               </table>
-            </div>
           </div><!-- /accessories-tab -->
 
           <div class="tab-pane" id="consumables">
-            <div class="table-responsive">
               <table
+                      data-toolbar="#userConsumableToolbar"
                       data-cookie-id-table="userConsumableTable"
                       data-id-table="userConsumableTable"
                       id="userConsumableTable"
                       data-search="true"
+                      data-search-highlight="true"
+                      data-show-print="true"
                       data-pagination="true"
                       data-side-pagination="client"
                       data-show-columns="true"
@@ -601,6 +691,11 @@
                     "fileName": "export-consumable-{{ str_slug($user->username) }}-{{ date('Y-m-d') }}",
                     "ignoreColumn": ["actions","image","change","checkbox","checkincheckout","delete","download","icon"]
                     }'>
+
+                <caption id="userConsumableToolbar" class="tableCaption">
+                  {{ trans('general.consumables') }}
+                </caption>
+
                 <thead>
                 <tr>
                   <th class="col-md-3">{{ trans('general.name') }}</th>
@@ -626,9 +721,46 @@
                 @endforeach
                 </tbody>
               </table>
-            </div>
           </div><!-- /consumables-tab -->
+          <div class="tab-pane" id="eulas">
+            <table
+                    data-toolbar="#userEULAToolbar"
+                    data-cookie-id-table="userEULATable"
+                    data-id-table="userEULATable"
+                    id="userEULATable"
+                    data-search="true"
+                    data-pagination="true"
+                    data-side-pagination="client"
+                    data-show-columns="true"
+                    data-show-fullscreen="true"
+                    data-show-export="true"
+                    data-show-footer="true"
+                    data-show-refresh="false"
+                    data-sort-order="asc"
+                    data-sort-name="name"
+                    class="table table-striped snipe-table table-hover"
+                    data-url="{{route('api.user.eulas', $user->id)}}"
+                    data-export-options='{
+                    "fileName": "export-eula-{{ str_slug($user->username) }}-{{ date('Y-m-d') }}",
+                    "ignoreColumn": ["actions","image","change","checkbox","checkincheckout","delete","purchasecost", "icon"]
+                    }'>
 
+              <caption id="userEulaToolbar" class="tableCaption">
+                {{ trans('general.eula_long') }}
+              </caption>
+
+              <thead>
+              <tr>
+                <th data-visible="true" data-field="icon" style="width: 40px;" class="hidden-xs" data-formatter="iconFormatter">{{ trans('admin/hardware/table.icon') }}</th>
+                <th data-visible="true" data-field="item.name">{{ trans('general.item') }}</th>
+                <th data-visible="true" data-field="created_at" data-sortable="true" data-formatter="dateDisplayFormatter">{{ trans('general.accepted_date') }}</th>
+                <th data-field="note">{{ trans('general.notes') }}</th>
+                <th data-field="signature_file" data-visible="false"  data-formatter="imageFormatter">{{ trans('general.signature') }}</th>
+                <th data-field="file" data-formatter="fileUploadFormatter">{{ trans('general.download') }}</th>
+              </tr>
+              </thead>
+            </table>
+          </div><!-- /eulas-tab -->
         </div><!-- /.tab-content -->
       </div><!-- nav-tabs-custom -->
     </div>
diff --git a/resources/views/asset_maintenances/edit.blade.php b/resources/views/asset_maintenances/edit.blade.php
index 5c2cd1fa2d..6ff7d7001b 100644
--- a/resources/views/asset_maintenances/edit.blade.php
+++ b/resources/views/asset_maintenances/edit.blade.php
@@ -32,39 +32,104 @@
     {{ csrf_field() }}
 
     <div class="box box-default">
-      <div class="box-header with-border">
-        <h2 class="box-title">
-          @if ($item)
-          {{ $item->name }}
-          @endif
-        </h2>
-      </div><!-- /.box-header -->
+
+        @if ($item->id)
+          <div class="box-header with-border">
+            <h2 class="box-title">
+              {{ $item->title }}
+            </h2>
+          </div><!-- /.box-header -->
+        @endif
 
       <div class="box-body">
-        @include ('partials.forms.edit.asset-select', ['translated_name' => trans('admin/hardware/table.asset_tag'), 'fieldname' => 'asset_id', 'required' => 'true'])
-        @include ('partials.forms.edit.supplier-select', ['translated_name' => trans('general.supplier'), 'fieldname' => 'supplier_id', 'required' => 'true'])
-        @include ('partials.forms.edit.maintenance_type')
 
         <!-- Title -->
         <div class="form-group {{ $errors->has('title') ? ' has-error' : '' }}">
           <label for="title" class="col-md-3 control-label">
             {{ trans('admin/asset_maintenances/form.title') }}
           </label>
-          <div class="col-md-7{{  (Helper::checkIfRequired($item, 'title')) ? ' required' : '' }}">
-            <input class="form-control" type="text" name="title" id="title" value="{{ old('title', $item->title) }}" />
+          <div class="col-md-7">
+            <input class="form-control" type="text" name="title" id="title" value="{{ old('title', $item->title) }}"{{  (Helper::checkIfRequired($item, 'title')) ? ' required' : '' }} />
             {!! $errors->first('title', '<span class="alert-msg" aria-hidden="true"><i class="fas fa-times" aria-hidden="true"></i> :message</span>') !!}
           </div>
         </div>
 
+        <!-- This is a new maintenance -->
+        @if (!$item->id)
+
+
+          @include ('partials.forms.edit.asset-select', [
+            'translated_name' => trans('general.assets'),
+            'fieldname' => 'selected_assets[]',
+            'multiple' => true,
+            'required' => true,
+            'select_id' => 'assigned_assets_select',
+            'asset_selector_div_id' => 'assets_for_maintenance_div',
+            'asset_ids' => $item->id ? $item->asset()->pluck('id')->toArray() : old('selected_assets'),
+            'asset_id' => $item->id ? $item->asset()->pluck('id')->toArray() : null
+          ])
+        @else
+
+          @if ($item->asset->company)
+            <div class="form-group">
+              <label for="company" class="control-label col-md-3">
+                {{ trans('general.company') }}
+              </label>
+
+              <div class="col-md-9">
+                <p class="form-control-static">
+                  {{  $item->asset->company->name }}
+                </p>
+              </div>
+            </div>
+          @endif
+
+            <div class="form-group">
+              <label for="asset" class="control-label col-md-3">
+                {{ trans('general.asset') }}
+              </label>
+
+              <div class="col-md-9">
+                <p class="form-control-static">
+                  {{ $item->asset ? $item->asset->present()->fullName : '' }}
+                </p>
+              </div>
+            </div>
+
+            @if ($item->asset->location)
+              <div class="form-group">
+                <label for="location" class="control-label col-md-3">
+                  {{ trans('general.location') }}
+                </label>
+
+                <div class="col-md-9">
+                  <p class="form-control-static">
+                    {{ $item->asset->location->name }}
+                  </p>
+                </div>
+              </div>
+            @endif
+
+        @endif
+
+
+        @include ('partials.forms.edit.maintenance_type')
+        @include ('partials.forms.edit.supplier-select', ['translated_name' => trans('general.supplier'), 'fieldname' => 'supplier_id'])
+
+
         <!-- Start Date -->
         <div class="form-group {{ $errors->has('start_date') ? ' has-error' : '' }}">
-          <label for="start_date" class="col-md-3 control-label">{{ trans('admin/asset_maintenances/form.start_date') }}</label>
+          <label for="start_date" class="col-md-3 control-label">
+            {{ trans('admin/asset_maintenances/form.start_date') }}
+          </label>
 
-          <div class="input-group col-md-3{{  (Helper::checkIfRequired($item, 'start_date')) ? ' required' : '' }}">
-            <div class="input-group date" data-provide="datepicker" data-date-format="yyyy-mm-dd"  data-autoclose="true" data-date-clear-btn="true">
-              <input type="text" class="form-control" placeholder="{{ trans('general.select_date') }}" name="start_date" id="start_date" value="{{ old('start_date', $item->start_date) }}">
-              <span class="input-group-addon"><i class="fas fa-calendar" aria-hidden="true"></i></span>
-            </div>
+          <div class="col-md-4">
+            <x-input.datepicker
+                    name="start_date"
+                    :value="old('start_date', $item->start_date)"
+                    placeholder="{{ trans('general.select_date') }}"
+                    required="{{ Helper::checkIfRequired($item, 'start_date') }}"
+            />
             {!! $errors->first('start_date', '<span class="alert-msg" aria-hidden="true"><i class="fas fa-times" aria-hidden="true"></i> :message</span>') !!}
           </div>
         </div>
@@ -75,11 +140,13 @@
         <div class="form-group {{ $errors->has('completion_date') ? ' has-error' : '' }}">
           <label for="start_date" class="col-md-3 control-label">{{ trans('admin/asset_maintenances/form.completion_date') }}</label>
 
-          <div class="input-group col-md-3{{  (Helper::checkIfRequired($item, 'completion_date')) ? ' required' : '' }}">
-            <div class="input-group date" data-date-clear-btn="true" data-provide="datepicker" data-date-format="yyyy-mm-dd"  data-autoclose="true">
-              <input type="text" class="form-control" placeholder="{{ trans('general.select_date') }}" name="completion_date" id="completion_date" value="{{ old('completion_date', $item->completion_date) }}">
-              <span class="input-group-addon"><i class="fas fa-calendar" aria-hidden="true"></i></span>
-            </div>
+          <div class="input-group col-md-4">
+            <x-input.datepicker
+                    name="completion_date"
+                    :value="old('start_date', $item->completion_date)"
+                    placeholder="{{ trans('general.select_date') }}"
+                    required="Helper::checkIfRequired($item, 'completion_date')"
+            />
             {!! $errors->first('completion_date', '<span class="alert-msg" aria-hidden="true"><i class="fas fa-times" aria-hidden="true"></i> :message</span>') !!}
           </div>
         </div>
@@ -123,7 +190,7 @@
       </div> <!-- .box-body -->
 
       <div class="box-footer text-right">
-        <button type="submit" class="btn btn-success"><i class="fas fa-check icon-white" aria-hidden="true"></i> {{ trans('general.save') }}</button>
+        <button type="submit" class="btn btn-success"><x-icon type="checkmark" /> {{ trans('general.save') }}</button>
       </div>
     </div> <!-- .box-default -->
     </form>
diff --git a/resources/views/asset_maintenances/index.blade.php b/resources/views/asset_maintenances/index.blade.php
index f5deb48b61..872e2a710c 100644
--- a/resources/views/asset_maintenances/index.blade.php
+++ b/resources/views/asset_maintenances/index.blade.php
@@ -25,7 +25,9 @@
               data-columns="{{ \App\Presenters\AssetMaintenancesPresenter::dataTableLayout() }}"
               data-cookie-id-table="maintenancesTable"
               data-pagination="true"
+              data-search-highlight="true"
               data-search="true"
+              data-show-print="true"
               data-side-pagination="server"
               data-show-columns="true"
               data-show-fullscreen="true"
diff --git a/resources/views/asset_maintenances/view.blade.php b/resources/views/asset_maintenances/view.blade.php
index 58abdbc7f5..231e2bde16 100644
--- a/resources/views/asset_maintenances/view.blade.php
+++ b/resources/views/asset_maintenances/view.blade.php
@@ -9,95 +9,154 @@ use Carbon\Carbon;
 @parent
 @stop
 
+@section('header_right')
+  <div class="pull-right">
+    <a href="{{ route('maintenances.edit', $assetMaintenance) }}" class="btn btn-default pull-right">
+      {{ trans('general.update') }}</a>
+
+    <a href="{{ route('maintenances.index') }}" class="btn btn-primary text-right" style="margin-right: 10px;">{{ trans('general.back') }}</a>
+  </div>
+@stop
+
+
 {{-- Page content --}}
 @section('content')
-<div class="row header">
-  <div class="col-md-12">
-    <h2 class="title">
-      {{ trans('admin/asset_maintenances/general.view') }}
-      {{ " - " . $assetMaintenance->title }}
-    </h2>
+  <div class="row">
+    <div class="col-md-9">
 
-    <div class="btn-group pull-right">
-      <div class="dropdown">
-        <button class="btn btn-default dropdown-toggle" data-toggle="dropdown">{{ trans('button.actions') }}
-          <span class="caret"></span>
-        </button>
-        <ul class="dropdown-menu pull-right" role="menu" aria-labelledby="dropdownMenu1">
-          <li role="presentation"><a href="{{ route('maintenances.update', $assetMaintenance->id) }}">{{ trans('admin/asset_maintenances/general.edit') }}</a></li>
-        </ul>
-      </div>
-    </div>
-  </div>
-</div>
+      <div class="box box-default">
+        <div class="box-body">
+          <div class="row-new-striped">
+            <div class="row">
 
-<div class="user-profile ">
-  <div class="row profile">
-    <div class="col-md-9 bio">
-      <!-- 1st Row Begin -->
-      <div class="row">
-        <div class="col-md-12 col-sm-12" style="padding-bottom: 10px; margin-left: 15px; word-wrap: break-word;">
-          <strong>{{ trans('admin/asset_maintenances/form.asset_maintenance_type') }}: </strong>
-          {{ $assetMaintenance->asset_maintenance_type }}
-        </div>
-      </div>
-      <!-- 1st Row End -->
+                <div class="col-md-3">
+                  {{ trans('admin/asset_maintenances/form.asset_maintenance_type') }}
+                </div>
+                <div class="col-md-9">
+                  {{ $assetMaintenance->asset_maintenance_type }}
+                </div>
+
+            </div> <!-- /row -->
+
+            <div class="row">
+              <div class="col-md-3">
+                {{ trans('general.asset') }}
+              </div>
+              <div class="col-md-9">
+                <a href="{{ route('hardware.show', $assetMaintenance->asset_id) }}">
+                  {{ $assetMaintenance->asset->present()->fullName }}
+                </a>
+              </div>
+            </div> <!-- /row -->
+
+            @if ($assetMaintenance->asset->model)
+              <div class="row">
+                <div class="col-md-3">
+                  {{ trans('general.asset_model') }}
+                </div>
+                <div class="col-md-9">
+                  <a href="{{ route('models.show', $assetMaintenance->asset->model_id) }}">
+                    {{ $assetMaintenance->asset->model->name }}
+                  </a>
+                </div>
+              </div> <!-- /row -->
+            @endif
+
+            @if ($assetMaintenance->asset->company)
+              <div class="row">
+                <div class="col-md-3">
+                  {{ trans('general.company') }}
+                </div>
+                <div class="col-md-9">
+                  <a href="{{ route('companies.show', $assetMaintenance->asset->company_id) }}">
+                    {{ $assetMaintenance->asset->company->name }}
+                  </a>
+                </div>
+              </div> <!-- /row -->
+            @endif
+
+
+            @if ($assetMaintenance->supplier)
+            <div class="row">
+              <div class="col-md-3">
+                {{ trans('general.supplier') }}
+              </div>
+              <div class="col-md-9">
+                <a href="{{ route('suppliers.show', $assetMaintenance->supplier_id) }}">
+                  {{ $assetMaintenance->supplier->name }}
+                </a>
+              </div>
+            </div> <!-- /row -->
+            @endif
+
+            <div class="row">
+              <div class="col-md-3">
+                {{ trans('admin/asset_maintenances/form.start_date') }}
+              </div>
+              <div class="col-md-9">
+                {{ Helper::getFormattedDateObject($assetMaintenance->start_date, 'date', false) }}
+              </div>
+            </div> <!-- /row -->
+
+            <div class="row">
+              <div class="col-md-3">
+                {{ trans('admin/asset_maintenances/form.completion_date') }}
+              </div>
+              <div class="col-md-9">
+                @if ($assetMaintenance->completion_date)
+                  {{ Helper::getFormattedDateObject($assetMaintenance->completion_date, 'date', false) }}
+                @else
+                  {{ trans('admin/asset_maintenances/message.asset_maintenance_incomplete') }}
+                @endif
+              </div>
+            </div> <!-- /row -->
+
+            <div class="row">
+              <div class="col-md-3">
+                {{ trans('admin/asset_maintenances/form.asset_maintenance_time') }}
+              </div>
+              <div class="col-md-9">
+                {{ $assetMaintenance->asset_maintenance_time }}
+              </div>
+            </div> <!-- /row -->
+
+            @if ($assetMaintenance->cost > 0)
+            <div class="row">
+              <div class="col-md-3">
+                {{ trans('admin/asset_maintenances/form.cost') }}
+              </div>
+              <div class="col-md-9">
+                {{ \App\Models\Setting::getSettings()->default_currency .' '. Helper::formatCurrencyOutput($assetMaintenance->cost) }}
+              </div>
+            </div> <!-- /row -->
+            @endif
+
+            <div class="row">
+              <div class="col-md-3">
+                {{ trans('admin/asset_maintenances/form.is_warranty') }}
+              </div>
+              <div class="col-md-9">
+                {{ $assetMaintenance->is_warranty ? trans('admin/asset_maintenances/message.warranty') : trans('admin/asset_maintenances/message.not_warranty') }}
+              </div>
+            </div> <!-- /row -->
+
+            @if ($assetMaintenance->notes)
+            <div class="row">
+              <div class="col-md-3">
+                {{ trans('admin/asset_maintenances/form.notes') }}
+              </div>
+              <div class="col-md-9">
+                {!! nl2br(Helper::parseEscapedMarkedownInline($assetMaintenance->notes)) !!}
+              </div>
+            </div> <!-- /row -->
+            @endif
+
+
+          </div><!-- /row-new-striped -->
+      </div><!-- /box-body -->
+    </div><!-- /box -->
+
+    </div> <!-- col-md-9  end -->
+  </div> <!-- row  end -->
 
-      <!-- 2nd Row Begin -->
-      <div class="row">
-        <div class="col-md-3 col-sm-3" style="padding-bottom: 10px; margin-left: 15px; word-wrap: break-word;">
-          <strong>{{ trans('admin/asset_maintenances/table.asset_name') }}: </strong>
-          <a href="{{ route('hardware.show', $assetMaintenance->asset_id) }}">
-            {{ $assetMaintenance->asset->name }}
-          </a>
-        </div>
-        <div class="col-md-3 col-sm-3" style="padding-bottom: 10px; margin-left: 15px; word-wrap: break-word;">
-          <strong>{{ trans('general.supplier') }}: </strong>
-          <a href="{{ route('suppliers.show', $assetMaintenance->supplier_id) }}">
-            {{ $assetMaintenance->supplier->name }}
-          </a>
-        </div>
-      </div>
-      <!-- 2nd Row End -->
-      <!-- 3rd Row Begin -->
-      <div class="row">
-        <div class="col-md-3 col-sm-3" style="padding-bottom: 10px; margin-left: 15px; word-wrap: break-word;">
-          <strong>{{ trans('admin/asset_maintenances/form.start_date') }}: </strong>
-            <?php $startDate = Carbon::parse($assetMaintenance->start_date); ?>
-          {{ $startDate->toDateString() }}
-        </div>
-        <div class="col-md-3 col-sm-3" style="padding-bottom: 10px; margin-left: 15px; word-wrap: break-word;">
-          <strong>{{ trans('admin/asset_maintenances/form.completion_date') }}: </strong>
-          {{ $completionDate = $assetMaintenance->completion_date }}
-          {{ $completionDate ? $completionDate : trans('admin/asset_maintenances/message.asset_maintenance_incomplete') }}
-        </div>
-        <div class="col-md-3 col-sm-3" style="padding-bottom: 10px; margin-left: 15px; word-wrap: break-word;">
-          <strong>{{ trans('admin/asset_maintenances/form.asset_maintenance_time') }}: </strong>
-          {{ $assetMaintenance->asset_maintenance_time }}
-        </div>
-      </div>
-      <!-- 3rd Row End -->
-      <!-- 4th Row Begin -->
-      <div class="row">
-        <div class="col-md-3 col-sm-3" style="padding-bottom: 10px; margin-left: 15px; word-wrap: break-word;">
-          <strong>{{ trans('admin/asset_maintenances/form.cost') }}: </strong>
-          {{ trans( 'general.currency' ) . Helper::formatCurrencyOutput($assetMaintenance->cost) }}
-        </div>
-        <div class="col-md-3 col-sm-3" style="padding-bottom: 10px; margin-left: 15px; word-wrap: break-word;">
-          <strong>{{ trans('admin/asset_maintenances/form.is_warranty') }}: </strong>
-          {{ $assetMaintenance->is_warranty ? trans('admin/asset_maintenances/message.warranty') : trans('admin/asset_maintenances/message.not_warranty') }}
-        </div>
-      </div>
-      <!-- 4th Row End -->
-      <!-- 5th Row Begin -->
-      <div class="row">
-        <div class="col-md-12 col-sm-12" style="padding-bottom: 10px; margin-left: 15px; word-wrap: break-word;">
-          <strong>{{ trans('admin/asset_maintenances/form.notes') }}: </strong>
-          {!! nl2br(Helper::parseEscapedMarkedownInline($assetMaintenance->notes)) !!}
-        </div>
-      </div>
-      <!-- 5th Row End -->
-    </div> <!-- col-md-9 bio end -->
-  </div> <!-- row profile end -->
-</div> <!-- user-profile end -->
 @stop
diff --git a/resources/views/auth/login.blade.php b/resources/views/auth/login.blade.php
index 16c67ff2b9..69cc23e44d 100755
--- a/resources/views/auth/login.blade.php
+++ b/resources/views/auth/login.blade.php
@@ -54,21 +54,28 @@
                                     <!-- CSRF Token -->
 
 
-                                    <fieldset>
+                                    <fieldset name="login" aria-label="login">
+                                        <legend></legend>
 
                                         <div class="form-group{{ $errors->has('username') ? ' has-error' : '' }}">
-                                            <label for="username"><i class="fas fa-user" aria-hidden="true"></i> {{ trans('admin/users/table.username')  }}</label>
+                                            <label for="username">
+                                                <x-icon type="user" />
+                                                {{ trans('admin/users/table.username')  }}
+                                            </label>
                                             <input class="form-control" placeholder="{{ trans('admin/users/table.username')  }}" name="username" type="text" id="username" autocomplete="{{ (config('auth.login_autocomplete') === true) ? 'on' : 'off'  }}" autofocus>
                                             {!! $errors->first('username', '<span class="alert-msg" aria-hidden="true"><i class="fas fa-times" aria-hidden="true"></i> :message</span>') !!}
                                         </div>
                                         <div class="form-group{{ $errors->has('password') ? ' has-error' : '' }}">
-                                            <label for="password"><i class="fa fa-key" aria-hidden="true"></i> {{ trans('admin/users/table.password')  }}</label>
+                                            <label for="password">
+                                                <x-icon type="password" />
+                                                {{ trans('admin/users/table.password')  }}
+                                            </label>
                                             <input class="form-control" placeholder="{{ trans('admin/users/table.password')  }}" name="password" type="password" id="password" autocomplete="{{ (config('auth.login_autocomplete') === true) ? 'on' : 'off'  }}">
                                             {!! $errors->first('password', '<span class="alert-msg" aria-hidden="true"><i class="fas fa-times" aria-hidden="true"></i> :message</span>') !!}
                                         </div>
-                                        <div class="form-group{{ $errors->has('password') ? ' has-error' : '' }}">
+                                        <div class="form-group">
                                             <label class="form-control">
-                                                <input name="remember" type="checkbox" value="1"> {{ trans('auth/general.remember_me')  }}
+                                                <input name="remember" type="checkbox" value="1" id="remember"> {{ trans('auth/general.remember_me')  }}
                                             </label>
                                         </div>
                                     </fieldset>
@@ -88,7 +95,9 @@
                             @if (config('app.require_saml'))
                                 <a class="btn btn-primary btn-block" href="{{ route('saml.login')  }}">{{ trans('auth/general.saml_login')  }}</a>
                             @else
-                                <button class="btn btn-primary btn-block">{{ trans('auth/general.login')  }}</button>
+                                <button class="btn btn-primary btn-block" type="submit" id="submit">
+                                    {{ trans('auth/general.login')  }}
+                                </button>
                             @endif
 
                             @if ($snipeSettings->custom_forgot_pass_url)
diff --git a/resources/views/auth/passwords/email.blade.php b/resources/views/auth/passwords/email.blade.php
index 5077b36f9a..0328058184 100644
--- a/resources/views/auth/passwords/email.blade.php
+++ b/resources/views/auth/passwords/email.blade.php
@@ -37,7 +37,7 @@
                             <div class="row">
                                 <div class="col-md-12">
                                     <div class="alert alert-info">
-                                        <i class="fas fa-info-circle" aria-hidden="true"></i>
+                                        <x-icon type="info-circle" />
                                         {!! trans('auth/general.username_help_top') !!}
                                     </div>
                                 </div>
@@ -55,7 +55,7 @@
                                     <div class="form-group{{ $errors->has('username') ? ' has-error' : '' }}">
 
                                         <div class="col-md-12">
-                                            <label for="username"><i class="fas fa-user" aria-hidden="true"></i> {{ trans('admin/users/table.username') }} </label>
+                                            <label for="username"><x-icon type="user" /> {{ trans('admin/users/table.username') }} </label>
                                             <input type="text" class="form-control" name="username" value="{{ old('username') }}" placeholder="{{ trans('admin/users/table.username') }}" aria-label="username">
                                             {!! $errors->first('username', '<span class="alert-msg"><i class="fas fa-times"></i> :message</span>') !!}
                                         </div>
@@ -67,13 +67,13 @@
                                     <br>
                                     <!-- show help text toggle -->
                                     <a href="#" id="show">
-                                        <i class="fa fa-caret-right"></i>
+                                        <x-icon type="caret-right" />
                                         {{ trans('general.show_help') }}
                                     </a>
 
                                     <!-- hide help text toggle -->
                                     <a href="#" id="hide" style="display:none">
-                                        <i class="fa fa-caret-up"></i>
+                                        <x-icon type="caret-up" />
                                         {{ trans('general.hide_help') }}
                                     </a>
 
diff --git a/resources/views/auth/passwords/reset.blade.php b/resources/views/auth/passwords/reset.blade.php
index 1be653fe0a..0e529d3f52 100644
--- a/resources/views/auth/passwords/reset.blade.php
+++ b/resources/views/auth/passwords/reset.blade.php
@@ -11,8 +11,6 @@
         <div class="container">
             <div class="row">
 
-
-
                 <div class="col-md-6 col-md-offset-3">
 
                     <div class="box login-box" style="width: 100%">
@@ -32,7 +30,7 @@
                                     <input type="hidden" name="token" value="{{ $token }}">
 
                                     <div class="form-group{{ $errors->has('username') ? ' has-error' : '' }}">
-                                        <label class="col-md-4 control-label"><i class="fas fa-user" aria-hidden="true"></i> {{ trans('admin/users/table.username')  }}</label>
+                                        <label class="col-md-4 control-label"><x-icon type="user" /> {{ trans('admin/users/table.username')  }}</label>
 
                                         <div class="col-md-6">
                                             <input type="text" class="form-control" name="username" value="{{ old('username', $username) }}">
@@ -42,7 +40,10 @@
                         </div>
 
                         <div class="form-group{{ $errors->has('password') ? ' has-error' : '' }}">
-                            <label class="col-md-4 control-label" for="password"><i class="fa fa-key" aria-hidden="true"></i> {{ trans('admin/users/table.password')  }}</label>
+                            <label class="col-md-4 control-label" for="password">
+                                <x-icon type="password" />
+                                {{ trans('admin/users/table.password')  }}
+                            </label>
 
                             <div class="col-md-6">
                                 <input type="password" class="form-control" name="password" aria-label="password">
@@ -51,7 +52,9 @@
                         </div>
 
                         <div class="form-group{{ $errors->has('password_confirmation') ? ' has-error' : '' }}">
-                            <label class="col-md-4 control-label" for="password_confirmation"><i class="fa fa-key" aria-hidden="true"></i> {{ trans('admin/users/table.password_confirm')  }}</label>
+                            <label class="col-md-4 control-label" for="password_confirmation">
+                                <x-icon type="password" />
+                                {{ trans('admin/users/table.password_confirm')  }}</label>
                             <div class="col-md-6">
                                 <input type="password" class="form-control" name="password_confirmation" aria-label="password_confirmation">
                                 {!! $errors->first('password_confirmation', '<span class="alert-msg" aria-hidden="true"><i class="fas fa-times" aria-hidden="true"></i> :message</span>') !!}
diff --git a/resources/views/blade/example.blade.php b/resources/views/blade/example.blade.php
new file mode 100644
index 0000000000..d1cbb4dee1
--- /dev/null
+++ b/resources/views/blade/example.blade.php
@@ -0,0 +1,3 @@
+<p>
+    Hi.
+</p>
diff --git a/resources/views/blade/filestable.blade.php b/resources/views/blade/filestable.blade.php
new file mode 100644
index 0000000000..84d28b485a
--- /dev/null
+++ b/resources/views/blade/filestable.blade.php
@@ -0,0 +1,144 @@
+<!-- begin redirect submit options -->
+@props([
+    'filepath',
+    'object',
+    'showfile_routename',
+    'deletefile_routename',
+])
+
+<!-- begin non-ajaxed file listing table -->
+<div class="table-responsive">
+    <table
+            data-cookie-id-table="{{ str_slug($object->name ?? $object->id) }}UploadsTable"
+            data-id-table="{{ str_slug($object->name ?? $object->id) }}UploadsTable"
+            id="{{ str_slug($object->name ?? $object->id) }}UploadsTable"
+            data-search="true"
+            data-search-highlight="true"
+            data-show-print="true"
+            data-pagination="true"
+            data-side-pagination="client"
+            data-show-columns="true"
+            data-show-fullscreen="true"
+            data-show-export="true"
+            data-show-footer="true"
+            data-toolbar="#upload-toolbar"
+            data-show-refresh="true"
+            data-sort-order="asc"
+            data-sort-name="name"
+            class="table table-striped snipe-table"
+            data-export-options='{
+                    "fileName": "export-license-uploads-{{ str_slug($object->name) }}-{{ date('Y-m-d') }}",
+                    "ignoreColumn": ["actions","image","change","checkbox","checkincheckout","delete","download","icon"]
+                    }'>
+
+        <thead>
+        <tr>
+            <th data-visible="false" data-field="id" data-sortable="true">
+                {{trans('general.id')}}
+            </th>
+            <th data-visible="true" data-field="type" data-sortable="true">
+                {{trans('general.file_type')}}
+            </th>
+            <th class="col-md-2" data-searchable="true" data-visible="true" data-field="image">
+                {{ trans('general.image') }}
+            </th>
+            <th class="col-md-2" data-searchable="true" data-visible="true" data-field="filename" data-sortable="true">
+                {{ trans('general.file_name') }}
+            </th>
+            <th class="col-md-1" data-searchable="true" data-visible="true" data-field="filesize">
+                {{ trans('general.filesize') }}
+            </th>
+            <th class="col-md-2" data-searchable="true" data-visible="true" data-field="notes" data-sortable="true">
+                {{ trans('general.notes') }}
+            </th>
+            <th class="col-md-1" data-searchable="true" data-visible="true" data-field="download">
+                {{ trans('general.download') }}
+            </th>
+            <th class="col-md-2" data-searchable="true" data-visible="true" data-field="created_at" data-sortable="true">
+                {{ trans('general.created_at') }}
+            </th>
+            <th class="col-md-2" data-searchable="true" data-visible="true" data-field="created_by" data-sortable="true">
+                {{ trans('general.created_by') }}
+            </th>
+            <th class="col-md-1" data-searchable="true" data-visible="true" data-field="actions">
+                {{ trans('table.actions') }}
+            </th>
+        </tr>
+        </thead>
+        <tbody>
+        @foreach ($object->uploads as $file)
+            <tr>
+                <td>
+                    {{ $file->id }}
+                </td>
+                <td data-sort-value="{{ pathinfo($filepath.$file->filename, PATHINFO_EXTENSION) }}">
+                    @if (Storage::exists($filepath.$file->filename))
+                        <span class="sr-only">{{ pathinfo($filepath.$file->filename, PATHINFO_EXTENSION) }}</span>
+                        <i class="{{ Helper::filetype_icon($file->filename) }} icon-med" aria-hidden="true" data-tooltip="true" data-title="{{ pathinfo($filepath.$file->filename, PATHINFO_EXTENSION) }}"></i>
+                    @endif
+                </td>
+                <td>
+
+                    @if (($file->filename) && (Storage::exists($filepath.$file->filename)))
+                        @if (Helper::checkUploadIsImage($file->get_src(str_plural(strtolower(class_basename(get_class($object)))))))
+                            <a href="{{ route($showfile_routename, [$object->id, $file->id, 'inline' => 'true']) }}" data-toggle="lightbox" data-type="image">
+                                <img src="{{ route($showfile_routename, [$object->id, $file->id, 'inline' => 'true']) }}" class="img-thumbnail" style="max-width: 50px;">
+                            </a>
+                        @else
+                            {{ trans('general.preview_not_available') }}
+                        @endif
+                    @else
+                        <x-icon type="x" class="text-danger" />
+                        {{ trans('general.file_not_found') }}
+                    @endif
+
+                </td>
+                <td>
+                    {{ $file->filename }}
+                </td>
+                <td data-value="{{ (Storage::exists($filepath.$file->filename)) ? Storage::size($filepath.$file->filename) : '' }}">
+                    {{ (Storage::exists($filepath.$file->filename)) ? Helper::formatFilesizeUnits(Storage::size($filepath.$file->filename)) : '' }}
+                </td>
+
+                <td>
+                    @if ($file->note)
+                        {{ $file->note }}
+                    @endif
+                </td>
+                <td style="white-space: nowrap;">
+                    @if ($file->filename)
+                        @if (Storage::exists($filepath.$file->filename))
+                            <a href="{{ route($showfile_routename, [$object->id, $file->id]) }}" class="btn btn-sm btn-default">
+                                <x-icon type="download" />
+                                <span class="sr-only">
+                                    {{ trans('general.download') }}
+                                </span>
+                            </a>
+
+                            <a href="{{ StorageHelper::allowSafeInline($filepath.$file->filename) ? route($showfile_routename, [$object->id, $file->id, 'inline' => 'true']) : '#' }}" class="btn btn-sm btn-default{{ StorageHelper::allowSafeInline($filepath.$file->filename) ? '' : ' disabled' }}" target="_blank">
+                                <x-icon type="external-link" />
+                            </a>
+                        @endif
+                    @endif
+                </td>
+                <td>
+                    {{ $file->created_at ? Helper::getFormattedDateObject($file->created_at, 'datetime', false) : '' }}
+                </td>
+                <td>
+                    {{ ($file->adminuser) ? $file->adminuser->present()->getFullNameAttribute() : '' }}
+                </td>
+                <td>
+                    <a class="btn delete-asset btn-danger btn-sm hidden-print" href="{{ route($deletefile_routename, [$object->id, $file->id]) }}" data-content="Are you sure you wish to delete this file?" data-title="{{ trans('general.delete') }} {{ $file->filename }}?">
+                        <x-icon type="delete" />
+                        <span class="sr-only">{{ trans('general.delete') }}</span>
+                    </a>
+                </td>
+
+
+            </tr>
+        @endforeach
+
+        </tbody>
+    </table>
+</div>
+<!-- end non-ajaxed file listing table -->
\ No newline at end of file
diff --git a/resources/views/blade/full-user-name.blade.php b/resources/views/blade/full-user-name.blade.php
new file mode 100644
index 0000000000..2e072236a7
--- /dev/null
+++ b/resources/views/blade/full-user-name.blade.php
@@ -0,0 +1,27 @@
+@props([
+    'user'
+])
+
+@if($user)
+    @php
+        $fullName = $user->present()->fullName();
+    @endphp
+
+    @can('view', $user)
+        @if(! $user->trashed())
+            {{-- if the user is in database but soft-deleted --}}
+            <a href="{{ route('users.show', $user->id) }}">{{ $fullName }}</a>
+        @else
+            {{-- if the user exists --}}
+            <s><a href="{{ route('users.show', $user->id) }}">{{ $fullName }}</a></s>
+        @endif
+    @else
+        @if(! $user->trashed())
+            {{-- if the user is in database but soft-deleted --}}
+            <span>{{ $fullName }}</span>
+        @else
+            {{-- if the user exists --}}
+            <s><span>{{ $fullName }}</span></s>
+        @endif
+    @endcan
+@endif
diff --git a/resources/views/blade/icon.blade.php b/resources/views/blade/icon.blade.php
new file mode 100644
index 0000000000..f2a430f4b7
--- /dev/null
+++ b/resources/views/blade/icon.blade.php
@@ -0,0 +1,6 @@
+{{-- IMPORTANT!!! Make sure there is no newline at the end of this file, or it will break the loaders for the tables --}}
+
+@props([
+    'type' => '',
+])
+<i {{ $attributes->merge(['class' => Icon::icon($type)]) }} aria-hidden="true"></i>
\ No newline at end of file
diff --git a/resources/views/blade/input/datepicker.blade.php b/resources/views/blade/input/datepicker.blade.php
new file mode 100644
index 0000000000..111aa8dbf7
--- /dev/null
+++ b/resources/views/blade/input/datepicker.blade.php
@@ -0,0 +1,13 @@
+@props([
+    'value' => '',
+    'required' => '',
+    'end_date' => null,
+    'col_size_class' => null,
+])
+
+<!-- Datepicker -->
+<div class="input-group date {{ $col_size_class }}" data-provide="datepicker" data-date-today-highlight="true" data-date-language="{{ auth()->user()->locale }}" data-date-locale="{{ auth()->user()->locale }}" data-date-format="yyyy-mm-dd" data-date-autoclose="true" data-date-clear-btn="true"{{ $end_date ? ' data-date-end-date=' . $end_date : '' }}>
+    <input type="text" placeholder="{{ trans('general.select_date') }}" value="{{ $value }}" maxlength="10" {{ $attributes->merge(['class' => 'form-control']) }} {{ $required=='1' ? 'required' : '' }}>
+    <span class="input-group-addon"><x-icon type="calendar" /></span>
+
+</div>
\ No newline at end of file
diff --git a/resources/views/blade/input/locale-select.blade.php b/resources/views/blade/input/locale-select.blade.php
new file mode 100644
index 0000000000..8dc07e94e2
--- /dev/null
+++ b/resources/views/blade/input/locale-select.blade.php
@@ -0,0 +1,22 @@
+@props([
+    'name' => 'locale',
+    'selected' => null,
+])
+<select
+    name="{{ $name }}"
+    {{ $attributes->merge(['class' => 'select2', 'style' => 'width:100%']) }}
+    aria-label="{{ $name }}"
+    data-placeholder="{{ trans('localizations.select_language') }}"
+>
+    <option value=""  role="option">{{ trans('localizations.select_language') }}</option>'
+    @foreach (trans('localizations.languages') as $abbr => $locale)
+        <option
+            value="{{ $abbr }}"
+            role="option"
+            @selected($abbr == $selected)
+            aria-selected="{{ $abbr == $selected ? 'true' : 'false' }}"
+        >
+            {{ $locale }}
+        </option>
+    @endforeach
+</select>
diff --git a/resources/views/blade/input/location-select.blade.php b/resources/views/blade/input/location-select.blade.php
new file mode 100644
index 0000000000..c3c1e50b99
--- /dev/null
+++ b/resources/views/blade/input/location-select.blade.php
@@ -0,0 +1,62 @@
+@use('App\Models\Location', 'Location')
+@use('Illuminate\Support\Arr', 'Arr')
+
+@props([
+    'label',
+    'name',
+    'selected',
+    'required' => false,
+    'multiple' => false,
+    'helpText' => null,
+    'hideNewButton' => false,
+])
+
+<div
+    @class([
+       'form-group',
+       'has-error' => $errors->has($name),
+    ])
+>
+
+    <label for="{{ $name }}" class="col-md-3 control-label">{{ $label }}</label>
+    <div class="col-md-7">
+        <select
+            class="js-data-ajax"
+            data-endpoint="locations"
+            data-placeholder="{{ trans('general.select_location') }}"
+            name="{{ $name }}"
+            style="width: 100%"
+            id="{{ $name }}_location_select"
+            aria-label="{{ $name }}"
+            @required($required)
+            @if ($multiple)
+                multiple
+            @endif
+        >
+            @if ($selected)
+                @foreach(Arr::wrap($selected) as $id)
+                    <option value="{{ $id }}" selected="selected" role="option" aria-selected="true"  role="option">
+                        {{ optional(Location::find($id))->name }}
+                    </option>
+                @endforeach
+            @endif
+        </select>
+    </div>
+
+    <div class="col-md-1 col-sm-1 text-left">
+        @unless($hideNewButton)
+            @can('create', Location::class)
+                <a href='{{ route('modal.show', 'location') }}' data-toggle="modal" data-target="#createModal" data-select='{{ $name }}_location_select' class="btn btn-sm btn-primary">{{ trans('button.new') }}</a>
+            @endcan
+        @endunless
+    </div>
+
+    {!! $errors->first($name, '<div class="col-md-8 col-md-offset-3"><span class="alert-msg" aria-hidden="true"><i class="fas fa-times" aria-hidden="true"></i> :message</span></div>') !!}
+
+    @if ($helpText)
+        <div class="col-md-7 col-sm-11 col-md-offset-3">
+            <p class="help-block">{{ $helpText }}</p>
+        </div>
+    @endif
+
+</div>
diff --git a/resources/views/blade/input/select.blade.php b/resources/views/blade/input/select.blade.php
new file mode 100644
index 0000000000..9ddbbd6d7c
--- /dev/null
+++ b/resources/views/blade/input/select.blade.php
@@ -0,0 +1,25 @@
+@props([
+    // <options> can either be provided as key => value pairs
+    // or passed in via the default $slot
+    'options',
+    'selected' => null,
+    'includeEmpty' => false,
+    'forLivewire' => false,
+])
+
+<select
+    {{ $attributes->class(['select2', 'livewire-select2' => $forLivewire]) }}
+    @if($forLivewire) data-livewire-component="{{ $this->getId() }}" @endif
+>
+    @if($includeEmpty)
+        <option value=""></option>
+    @endif
+    {{-- map the simple key => value pairs when nothing is passed in via the slot --}}
+    @if($slot->isEmpty())
+        @foreach($options as $key => $value)
+            <option value="{{ $key }}" @selected($selected == $key)>{{ $value }}</option>
+        @endforeach
+    @else
+        {{ $slot }}
+    @endif
+</select>
diff --git a/resources/views/blade/input/skin.blade.php b/resources/views/blade/input/skin.blade.php
new file mode 100644
index 0000000000..7098119a31
--- /dev/null
+++ b/resources/views/blade/input/skin.blade.php
@@ -0,0 +1,47 @@
+@props([
+    'name',
+    'selected',
+    // Whether to include a blank option with the label "Site Default"
+    'includeBlankOption' => false,
+])
+
+@php
+    $formats = [
+        'blue' => trans('general.skins.default_blue'),
+        'blue-dark' => trans('general.skins.blue_dark'),
+        'green' => trans('general.skins.green'),
+        'green-dark' => trans('general.skins.green_dark'),
+        'red' => trans('general.skins.red'),
+        'red-dark' => trans('general.skins.red_dark'),
+        'orange' => trans('general.skins.orange'),
+        'orange-dark' => trans('general.skins.orange_dark'),
+        'black' => trans('general.skins.black'),
+        'black-dark' => trans('general.skins.black_dark'),
+        'purple' => trans('general.skins.purple'),
+        'purple-dark' => trans('general.skins.purple_dark'),
+        'yellow' => trans('general.skins.yellow'),
+        'yellow-dark' => trans('general.skins.yellow_dark'),
+        'contrast' => trans('general.skins.high_contrast'),
+    ];
+
+    if ($includeBlankOption) {
+        $formats = ['' => trans('general.skins.site_default')] + $formats;
+    }
+@endphp
+
+<select
+    name="{{ $name }}"
+    {{ $attributes->merge([
+        'class' => 'select2',
+        'style' => 'width: 250px;',
+    ]) }}
+>
+    @foreach ($formats as $value => $label)
+        <option
+            value="{{ $value }}"
+            @selected($value == $selected)
+        >
+            {{ $label }}
+        </option>
+    @endforeach
+</select>
diff --git a/resources/views/blade/input/textarea.blade.php b/resources/views/blade/input/textarea.blade.php
new file mode 100644
index 0000000000..f75d58f067
--- /dev/null
+++ b/resources/views/blade/input/textarea.blade.php
@@ -0,0 +1,9 @@
+@props([
+    'value' => '',
+    'rows' => 10,
+])
+
+<textarea
+    {{ $attributes->merge(['class' => 'form-control']) }}
+    rows="{{ $rows }}"
+>{{ $value }}</textarea>
diff --git a/resources/views/blade/redirect_submit_options.blade.php b/resources/views/blade/redirect_submit_options.blade.php
new file mode 100644
index 0000000000..eb0619b520
--- /dev/null
+++ b/resources/views/blade/redirect_submit_options.blade.php
@@ -0,0 +1,38 @@
+<!-- begin redirect submit options -->
+@props([
+    'index_route',
+    'button_label',
+    'disabled_select' => false,
+    'options' => [],
+])
+
+<div class="box-footer">
+    <div class="row">
+
+        <div class="col-md-3">
+            <a class="btn btn-link" href="{{ $index_route ? route($index_route) : url()->previous() }}">{{ trans('button.cancel') }}</a>
+        </div>
+
+        <div class="col-md-9 text-right">
+            <div class="btn-group text-left">
+
+                @if (($options) && (count($options) > 0))
+                <select class="redirect-options form-control select2" data-minimum-results-for-search="Infinity" name="redirect_option" style="min-width: 250px"{{ ($disabled_select ? ' disabled' : '') }}>
+                    @foreach ($options as $key => $value)
+                        <option value="{{ $key }}"{{ Session::get('redirect_option') == $key ? ' selected' : ''}}>
+                            {{ $value }}
+                        </option>
+                    @endforeach
+                </select>
+                @endif
+
+                <button type="submit" class="btn btn-primary pull-right{{ ($disabled_select ? ' disabled' : '') }}" style="margin-left:5px; border-radius: 3px;"{!! ($disabled_select ? ' data-tooltip="true" title="'.trans('admin/hardware/general.edit').'" disabled' : '') !!}>
+                    <x-icon type="checkmark" />
+                    {{ $button_label }}
+                </button>
+
+            </div><!-- /.btn-group -->
+        </div><!-- /.col-md-9 -->
+    </div><!-- /.row -->
+</div> <!-- /.box-footer -->
+<!-- end redirect submit options -->
\ No newline at end of file
diff --git a/resources/views/categories/edit.blade.php b/resources/views/categories/edit.blade.php
index 1ef3b7aa6a..7c12f677fa 100755
--- a/resources/views/categories/edit.blade.php
+++ b/resources/views/categories/edit.blade.php
@@ -15,7 +15,14 @@
 <div class="form-group {{ $errors->has('category_type') ? ' has-error' : '' }}">
     <label for="category_type" class="col-md-3 control-label">{{ trans('general.type') }}</label>
     <div class="col-md-7 required">
-        {{ Form::select('category_type', $category_types , old('category_type', $item->category_type), array('class'=>'select2', 'style'=>'min-width:350px', 'aria-label'=>'category_type', ($item->category_type!='') || ($item->itemCount() > 0) ? 'disabled' : '')) }}
+        <x-input.select
+            name="category_type"
+            :options="$category_types"
+            :selected="old('category_type', $item->category_type)"
+            :disabled="$item->category_type!='' || $item->itemCount() > 0"
+            style="min-width:350px"
+            aria-label="category_type"
+        />
         {!! $errors->first('category_type', '<span class="alert-msg" aria-hidden="true"><i class="fas fa-times" aria-hidden="true"></i> :message</span>') !!}
     </div>
     <div class="col-md-7 col-md-offset-3">
@@ -26,13 +33,28 @@
 <livewire:category-edit-form
     :default-eula-text="$snipeSettings->default_eula_text"
     :eula-text="old('eula_text', $item->eula_text)"
-    :require-acceptance="old('require_acceptance', $item->require_acceptance)"
-    :send-check-in-email="old('checkin_email', $item->checkin_email)"
-    :use-default-eula="old('use_default_eula', $item->use_default_eula)"
+    :require-acceptance="(bool) old('require_acceptance', $item->require_acceptance)"
+    :send-check-in-email="(bool) old('checkin_email', $item->checkin_email)"
+    :use-default-eula="(bool) old('use_default_eula', $item->use_default_eula)"
 />
 
 @include ('partials.forms.edit.image-upload', ['image_path' => app('categories_upload_path')])
 
+<div class="form-group{!! $errors->has('notes') ? ' has-error' : '' !!}">
+    <label for="notes" class="col-md-3 control-label">{{ trans('general.notes') }}</label>
+    <div class="col-md-8">
+        <x-input.textarea
+                name="notes"
+                id="notes"
+                :value="old('notes', $item->notes)"
+                placeholder="{{ trans('general.placeholders.notes') }}"
+                aria-label="notes"
+                rows="5"
+        />
+        {!! $errors->first('notes', '<span class="alert-msg" aria-hidden="true"><i class="fas fa-times" aria-hidden="true"></i> :message</span>') !!}
+    </div>
+</div>
+
 
 @stop
 
diff --git a/resources/views/categories/index.blade.php b/resources/views/categories/index.blade.php
index 6469a2d149..51448def9b 100755
--- a/resources/views/categories/index.blade.php
+++ b/resources/views/categories/index.blade.php
@@ -19,14 +19,14 @@
   <div class="col-md-12">
     <div class="box box-default">
       <div class="box-body">
-        <div class="table-responsive">
-
         <table
             data-columns="{{ \App\Presenters\CategoryPresenter::dataTableLayout() }}"
             data-cookie-id-table="categoryTable"
             data-pagination="true"
             data-id-table="categoryTable"
             data-search="true"
+            data-search-highlight="true"
+            data-show-print="true"
             data-side-pagination="server"
             data-show-columns="true"
             data-show-fullscreen="true"
@@ -41,7 +41,6 @@
               "ignoreColumn": ["actions","image","change","checkbox","checkincheckout","icon"]
               }'>
           </table>
-        </div>
       </div><!-- /.box-body -->
     </div><!-- /.box -->
   </div>
diff --git a/resources/views/categories/view.blade.php b/resources/views/categories/view.blade.php
index 9b361c46c7..523485708d 100644
--- a/resources/views/categories/view.blade.php
+++ b/resources/views/categories/view.blade.php
@@ -3,8 +3,7 @@
 {{-- Page title --}}
 @section('title')
 
- {{ $category->name }}
- {{ ucwords($category_type_route) }}
+{{ $category->name }}
 
 @parent
 @stop
@@ -37,7 +36,19 @@
             <div class="nav-tabs-custom">
                 <ul class="nav nav-tabs">
                     <li class="active">
-                        <a href="#items" data-toggle="tab" title="{{ trans('general.items') }}"> {{ ucwords($category_type_route) }}
+                        <a href="#items" data-toggle="tab" title="{{ trans('general.items') }}">
+                            @if ($category->category_type=='asset')
+                                {{ trans('general.assets') }}
+                            @elseif ($category->category_type=='accessory')
+                                {{ trans('general.accessories') }}
+                            @elseif ($category->category_type=='license')
+                                {{ trans('general.licenses') }}
+                            @elseif ($category->category_type=='consumable')
+                                {{ trans('general.consumables') }}
+                            @elseif ($category->category_type=='component')
+                                {{ trans('general.components') }}
+                            @endif
+
                             @if ($category->category_type=='asset')
                             <badge class="badge badge-secondary"> {{ $category->showableAssets()->count() }}</badge>
                             @endif
@@ -45,7 +56,8 @@
                     </li>
                     @if ($category->category_type=='asset')
                     <li>
-                        <a href="#models" data-toggle="tab" title="{{ trans('general.asset_models') }}">{{ trans('general.asset_models') }}
+                        <a href="#models" data-toggle="tab" title="{{ trans('general.asset_models') }}">
+                            {{ trans('general.asset_models') }}
                             <badge class="badge badge-secondary"> {{ $category->models->count()}}</badge>
                         </a>
                     </li>
@@ -116,6 +128,8 @@
 
                                             data-pagination="true"
                                             data-search="true"
+                                            data-search-highlight="true"
+                                            data-show-print="true"
                                             data-show-footer="true"
                                             data-side-pagination="server"
                                             data-show-columns="true"
diff --git a/resources/views/companies/edit.blade.php b/resources/views/companies/edit.blade.php
index 60d5f74ccb..d6b9cf9afd 100644
--- a/resources/views/companies/edit.blade.php
+++ b/resources/views/companies/edit.blade.php
@@ -14,4 +14,20 @@
 @include ('partials.forms.edit.email')
 @include ('partials.forms.edit.image-upload', ['image_path' => app('companies_upload_path')])
 
+<div class="form-group{!! $errors->has('notes') ? ' has-error' : '' !!}">
+    <label for="notes" class="col-md-3 control-label">{{ trans('general.notes') }}</label>
+    <div class="col-md-8">
+
+        <x-input.textarea
+                name="notes"
+                id="notes"
+                :value="old('notes', $item->notes)"
+                placeholder="{{ trans('general.placeholders.notes') }}"
+                aria-label="notes"
+                rows="5"
+        />
+
+    </div>
+</div>
+
 @stop
diff --git a/resources/views/companies/index.blade.php b/resources/views/companies/index.blade.php
index fd5cb9c657..dd1e58400a 100644
--- a/resources/views/companies/index.blade.php
+++ b/resources/views/companies/index.blade.php
@@ -16,14 +16,14 @@
     <div class="col-md-9">
       <div class="box box-default">
         <div class="box-body">
-          <div class="table-responsive">
-
             <table
               data-columns="{{ \App\Presenters\CompanyPresenter::dataTableLayout() }}"
               data-cookie-id-table="companiesTable"
               data-pagination="true"
               data-id-table="companiesTable"
               data-search="true"
+              data-search-highlight="true"
+              data-show-print="true"
               data-side-pagination="server"
               data-show-columns="true"
               data-show-export="true"
@@ -37,9 +37,7 @@
                         "fileName": "export-companies-{{ date('Y-m-d') }}",
                         "ignoreColumn": ["actions","image","change","checkbox","checkincheckout","icon"]
                         }'>
-
             </table>
-          </div>
         </div>
       </div>
     </div>
diff --git a/resources/views/companies/view.blade.php b/resources/views/companies/view.blade.php
index 0b94446b2b..b7e5c2404d 100644
--- a/resources/views/companies/view.blade.php
+++ b/resources/views/companies/view.blade.php
@@ -71,7 +71,7 @@
                     <li>
                         <a href="#users_tab" data-toggle="tab">
                             <span class="hidden-lg hidden-md">
-                            <i class="fas fa-users"></i></span>
+                            <x-icon type="users" /></span>
                             <span class="hidden-xs hidden-sm">{{ trans('general.people') }}
                                 {!! (($company->users) && ($company->users->count() > 0 )) ? '<badge class="badge badge-secondary">'.number_format($company->users->count()).'</badge>' : '' !!}
                             </span>
@@ -95,6 +95,8 @@
                                     data-pagination="true"
                                     data-id-table="assetsListingTable"
                                     data-search="true"
+                                    data-search-highlight="true"
+                                    data-show-print="true"
                                     data-side-pagination="server"
                                     data-show-columns="true"
                                     data-show-export="true"
@@ -124,6 +126,7 @@
                                     data-pagination="true"
                                     data-id-table="licensesTable"
                                     data-search="true"
+                                    data-search-highlight="true"
                                     data-side-pagination="server"
                                     data-show-columns="true"
                                     data-show-export="true"
@@ -150,6 +153,7 @@
                                     data-pagination="true"
                                     data-id-table="accessoriesTable"
                                     data-search="true"
+                                    data-search-highlight="true"
                                     data-side-pagination="server"
                                     data-show-columns="true"
                                     data-show-export="true"
@@ -176,6 +180,7 @@
                                     data-pagination="true"
                                     data-id-table="consumablesTable"
                                     data-search="true"
+                                    data-search-highlight="true"
                                     data-side-pagination="server"
                                     data-show-columns="true"
                                     data-show-export="true"
@@ -202,6 +207,7 @@
                                     data-pagination="true"
                                     data-id-table="componentsTable"
                                     data-search="true"
+                                    data-search-highlight="true"
                                     data-side-pagination="server"
                                     data-show-columns="true"
                                     data-show-export="true"
@@ -228,6 +234,7 @@
                                     data-pagination="true"
                                     data-id-table="usersTable"
                                     data-search="true"
+                                    data-search-highlight="true"
                                     data-side-pagination="server"
                                     data-show-columns="true"
                                     data-show-export="true"
diff --git a/resources/views/components/checkin.blade.php b/resources/views/components/checkin.blade.php
index e195685d2a..d838744ffb 100644
--- a/resources/views/components/checkin.blade.php
+++ b/resources/views/components/checkin.blade.php
@@ -56,10 +56,14 @@
                                 {!! $errors->first('note', '<span class="alert-msg" aria-hidden="true"><i class="fas fa-times" aria-hidden="true"></i> :message</span>') !!}
                             </div>
                         </div>
-                        <div class="box-footer">
-                            <a class="btn btn-link" href="{{ route('components.index') }}">{{ trans('button.cancel') }}</a>
-                            <button type="submit" class="btn btn-primary pull-right"><i class="fas fa-check icon-white" aria-hidden="true"></i> {{ trans('general.checkin') }}</button>
-                        </div>
+                        <x-redirect_submit_options
+                                index_route="components.index"
+                                :button_label="trans('general.checkin')"
+                                :options="[
+                                'index' => trans('admin/hardware/form.redirect_to_all', ['type' => trans('general.components')]),
+                                'item' => trans('admin/hardware/form.redirect_to_type', ['type' => trans('general.component')]),
+                               ]"
+                        />
                     </div> <!-- /.box-->
             </form>
         </div> <!-- /.col-md-7-->
diff --git a/resources/views/components/checkout.blade.php b/resources/views/components/checkout.blade.php
index f6befa2736..a55ca4b21e 100644
--- a/resources/views/components/checkout.blade.php
+++ b/resources/views/components/checkout.blade.php
@@ -26,14 +26,14 @@
 
         <div class="box-body">
           <!-- Asset -->
-            @include ('partials.forms.edit.asset-select', ['translated_name' => trans('general.select_asset'), 'fieldname' => 'asset_id'])
+            @include ('partials.forms.edit.asset-select', ['translated_name' => trans('general.select_asset'), 'fieldname' => 'asset_id', 'company_id' => $component->company_id])
 
             <div class="form-group {{ $errors->has('assigned_qty') ? ' has-error' : '' }}">
               <label for="assigned_qty" class="col-md-3 control-label">
                 {{ trans('general.qty') }}
               </label>
               <div class="col-md-2 col-sm-5 col-xs-5">
-                <input class="form-control required col-md-12" type="text" name="assigned_qty" id="assigned_qty" value="{{ old('assigned_qty') ?? 1 }}" />
+                <input class="form-control required col-md-12" type="text" name="assigned_qty" id="assigned_qty" value="{{ old('assigned_qty') ?? 1 }}" maxlength="99999" />
               </div>
               @if ($errors->first('assigned_qty'))
                 <div class="col-md-9 col-md-offset-3">
@@ -54,10 +54,16 @@
 
 
         </div> <!-- .BOX-BODY-->
-        <div class="box-footer">
-          <a class="btn btn-link" href="{{ URL::previous() }}">{{ trans('button.cancel') }}</a>
-          <button type="submit" id="submit_button" class="btn btn-primary pull-right"><i class="fas fa-check icon-white" aria-hidden="true"></i> {{ trans('general.checkout') }}</button>
-       </div>
+          <x-redirect_submit_options
+                  index_route="components.index"
+                  :button_label="trans('general.checkout')"
+                  :options="[
+                                'index' => trans('admin/hardware/form.redirect_to_all', ['type' => trans('general.components')]),
+                                'item' => trans('admin/hardware/form.redirect_to_type', ['type' => trans('general.component')]),
+                                'target' => trans('admin/hardware/form.redirect_to_checked_out_to'),
+
+                               ]"
+          />
       </div> <!-- .box-default-->
     </form>
   </div> <!-- .col-md-9-->
diff --git a/resources/views/components/edit.blade.php b/resources/views/components/edit.blade.php
index 5279f03990..979d68248c 100644
--- a/resources/views/components/edit.blade.php
+++ b/resources/views/components/edit.blade.php
@@ -4,6 +4,11 @@
     'helpPosition'  => 'right',
     'helpText' => trans('help.components'),
     'formAction' => (isset($item->id)) ? route('components.update', ['component' => $item->id]) : route('components.store'),
+    'index_route' => 'components.index',
+    'options' => [
+                'index' => trans('admin/hardware/form.redirect_to_all', ['type' => 'components']),
+                'item' => trans('admin/hardware/form.redirect_to_type', ['type' => trans('general.component')]),
+               ]
 
 ])
 
@@ -15,11 +20,13 @@
 @include ('partials.forms.edit.quantity')
 @include ('partials.forms.edit.minimum_quantity')
 @include ('partials.forms.edit.serial', ['fieldname' => 'serial'])
+@include ('partials.forms.edit.manufacturer-select', ['translated_name' => trans('general.manufacturer'), 'fieldname' => 'manufacturer_id'])
+@include ('partials.forms.edit.model_number')
 @include ('partials.forms.edit.company-select', ['translated_name' => trans('general.company'), 'fieldname' => 'company_id'])
 @include ('partials.forms.edit.location-select', ['translated_name' => trans('general.location'), 'fieldname' => 'location_id'])
 @include ('partials.forms.edit.supplier-select', ['translated_name' => trans('general.supplier'), 'fieldname' => 'supplier_id'])
 @include ('partials.forms.edit.order_number')
-@include ('partials.forms.edit.purchase_date')
+@include ('partials.forms.edit.datepicker', ['translated_name' => trans('general.purchase_date'),'fieldname' => 'purchase_date'])
 @include ('partials.forms.edit.purchase_cost')
 @include ('partials.forms.edit.notes')
 @include ('partials.forms.edit.image-upload', ['image_path' => app('components_upload_path')])
diff --git a/resources/views/components/index.blade.php b/resources/views/components/index.blade.php
index 0442b5de06..d8113d4a85 100644
--- a/resources/views/components/index.blade.php
+++ b/resources/views/components/index.blade.php
@@ -8,7 +8,7 @@
 
 @section('header_right')
   @can('create', \App\Models\Component::class)
-    <a href="{{ route('components.create') }}" accesskey="n" class="btn btn-primary pull-right"> {{ trans('general.create') }}</a>
+    <a href="{{ route('components.create') }}" {{$snipeSettings->shortcuts_enabled == 1 ? "accesskey=n" : ''}} class="btn btn-primary pull-right"> {{ trans('general.create') }}</a>
   @endcan
 @stop
 
@@ -24,7 +24,10 @@
                 data-pagination="true"
                 data-id-table="componentsTable"
                 data-search="true"
+                data-search-highlight="true"
+                data-show-print="true"
                 data-side-pagination="server"
+                data-footer-style="footerStyle"
                 data-show-columns="true"
                 data-show-fullscreen="true"
                 data-show-export="true"
diff --git a/resources/views/components/view.blade.php b/resources/views/components/view.blade.php
index bbb9b67097..a73cfeed51 100644
--- a/resources/views/components/view.blade.php
+++ b/resources/views/components/view.blade.php
@@ -61,12 +61,22 @@
         <li class="active">
           <a href="#checkedout" data-toggle="tab">
             <span class="hidden-lg hidden-md">
-            <i class="fas fa-info-circle fa-2x" aria-hidden="true"></i>
+            <x-icon type="info-circle" class="fa-2x" />
             </span>
             <span class="hidden-xs hidden-sm">{{ trans('admin/users/general.info') }}</span>
           </a>
         </li>
 
+        <li>
+          <a href="#history" data-toggle="tab">
+                <span class="hidden-lg hidden-md">
+                  <i class="fas fa-history fa-2x" aria-hidden="true"></i>
+                </span>
+            <span class="hidden-xs hidden-sm">
+                  {{ trans('general.history') }}
+                </span>
+          </a>
+        </li>
 
         @can('components.files', $component)
           <li>
@@ -83,7 +93,7 @@
         @can('components.files', $component)
           <li class="pull-right">
             <a href="#" data-toggle="modal" data-target="#uploadFileModal">
-              <i class="fas fa-paperclip" aria-hidden="true"></i> {{ trans('button.upload') }}
+              <x-icon type="paperclip" /> {{ trans('button.upload') }}
             </a>
           </li>
         @endcan
@@ -99,6 +109,8 @@
                     data-pagination="true"
                     data-id-table="componentsCheckedoutTable"
                     data-search="true"
+                    data-search-highlight="true"
+                    data-show-print="true"
                     data-side-pagination="server"
                     data-show-columns="true"
                     data-show-export="true"
@@ -137,99 +149,46 @@
           </div>
         </div> <!-- close tab-pane div -->
 
+        <div class="tab-pane" id="history">
+          <div class="table-responsive">
+
+            <table
+                    data-columns="{{ \App\Presenters\HistoryPresenter::dataTableLayout() }}"
+                    class="table table-striped snipe-table"
+                    id="componentHistory"
+                    data-pagination="true"
+                    data-id-table="componentHistory"
+                    data-search="true"
+                    data-side-pagination="server"
+                    data-show-columns="true"
+                    data-show-fullscreen="true"
+                    data-show-refresh="true"
+                    data-sort-order="desc"
+                    data-sort-name="created_at"
+                    data-show-export="true"
+                    data-export-options='{
+                         "fileName": "export-component-{{  $component->id }}-history",
+                         "ignoreColumn": ["actions","image","change","checkbox","checkincheckout","icon"]
+                       }'
+
+                    data-url="{{ route('api.activity.index', ['item_id' => $component->id, 'item_type' => 'component']) }}"
+                    data-cookie-id-table="componentHistory"
+                    data-cookie="true">
+            </table>
+          </div>
+        </div><!-- /.tab-pane -->
+
 
         @can('components.files', $component)
           <div class="tab-pane" id="files">
-
-            <div class="table-responsive">
-              <table
-                      data-cookie-id-table="componentUploadsTable"
-                      data-id-table="componentUploadsTable"
-                      id="componentUploadsTable"
-                      data-search="true"
-                      data-pagination="true"
-                      data-side-pagination="client"
-                      data-show-columns="true"
-                      data-show-export="true"
-                      data-show-footer="true"
-                      data-toolbar="#upload-toolbar"
-                      data-show-refresh="true"
-                      data-sort-order="asc"
-                      data-sort-name="name"
-                      class="table table-striped snipe-table"
-                      data-export-options='{
-                    "fileName": "export-components-uploads-{{ str_slug($component->name) }}-{{ date('Y-m-d') }}",
-                    "ignoreColumn": ["actions","image","change","checkbox","checkincheckout","delete","download","icon"]
-                    }'>
-                <thead>
-                <tr>
-                  <th data-visible="true" data-field="icon" data-sortable="true">{{trans('general.file_type')}}</th>
-                  <th class="col-md-2" data-searchable="true" data-visible="true" data-field="image">{{ trans('general.image') }}</th>
-                  <th class="col-md-2" data-searchable="true" data-visible="true" data-field="filename" data-sortable="true">{{ trans('general.file_name') }}</th>
-                  <th class="col-md-1" data-searchable="true" data-visible="true" data-field="filesize">{{ trans('general.filesize') }}</th>
-                  <th class="col-md-2" data-searchable="true" data-visible="true" data-field="notes" data-sortable="true">{{ trans('general.notes') }}</th>
-                  <th class="col-md-1" data-searchable="true" data-visible="true" data-field="download">{{ trans('general.download') }}</th>
-                  <th class="col-md-2" data-searchable="true" data-visible="true" data-field="created_at" data-sortable="true">{{ trans('general.created_at') }}</th>
-                  <th class="col-md-1" data-searchable="true" data-visible="true" data-field="actions">{{ trans('table.actions') }}</th>
-                </tr>
-                </thead>
-                <tbody>
-                @if ($component->uploads->count() > 0)
-                  @foreach ($component->uploads as $file)
-                    <tr>
-                      <td>
-                        <i class="{{ Helper::filetype_icon($file->filename) }} icon-med" aria-hidden="true"></i>
-                        <span class="sr-only">{{ Helper::filetype_icon($file->filename) }}</span>
-
-                      </td>
-                      <td>
-                        @if ($file->filename)
-                          @if ( Helper::checkUploadIsImage($file->get_src('components')))
-                            <a href="{{ route('show.componentfile', ['componentId' => $component->id, 'fileId' => $file->id, 'download' => 'false']) }}" data-toggle="lightbox" data-type="image"><img src="{{ route('show.componentfile', ['componentId' => $component->id, 'fileId' => $file->id]) }}" class="img-thumbnail" style="max-width: 50px;"></a>
-                          @endif
-                        @endif
-                      </td>
-                      <td>
-                        {{ $file->filename }}
-                      </td>
-                      <td data-value="{{ (Storage::exists('private_uploads/components/'.$file->filename) ? Storage::size('private_uploads/components/'.$file->filename) : '') }}">
-                        {{ @Helper::formatFilesizeUnits(Storage::exists('private_uploads/components/'.$file->filename) ? Storage::size('private_uploads/components/'.$file->filename) : '') }}
-                      </td>
-
-                      <td>
-                        @if ($file->note)
-                          {{ $file->note }}
-                        @endif
-                      </td>
-                      <td>
-                        @if ($file->filename)
-                          <a href="{{ route('show.componentfile', [$component->id, $file->id]) }}" class="btn btn-sm btn-default">
-                            <i class="fas fa-download" aria-hidden="true"></i>
-                            <span class="sr-only">{{ trans('general.download') }}</span>
-                          </a>
-
-                          <a href="{{ route('show.componentfile', [$component->id, $file->id, 'inline' => 'true']) }}" class="btn btn-sm btn-default" target="_blank">
-                            <i class="fa fa-external-link" aria-hidden="true"></i>
-                          </a>
-
-                        @endif
-                      </td>
-                      <td>{{ $file->created_at }}</td>
-                      <td>
-                        <a class="btn delete-asset btn-danger btn-sm" href="{{ route('delete/componentfile', [$component->id, $file->id]) }}" data-content="{{ trans('general.delete_confirm', ['item' => $file->filename]) }}" data-title="{{ trans('general.delete') }}">
-                          <i class="fas fa-trash icon-white" aria-hidden="true"></i>
-                          <span class="sr-only">{{ trans('general.delete') }}</span>
-                        </a>
-                      </td>
-                    </tr>
-                  @endforeach
-                @else
-                  <tr>
-                    <td colspan="8">{{ trans('general.no_results') }}</td>
-                  </tr>
-                @endif
-                </tbody>
-              </table>
+            <div class="row">
+              <div class="col-md-12">
+                <x-filestable
+                        filepath="private_uploads/components/"
+                        showfile_routename="show.componentfile"
+                        deletefile_routename="delete/componentfile"
+                        :object="$component" />
+              </div>
             </div>
           </div> <!-- /.tab-pane -->
         @endcan
@@ -243,7 +202,7 @@
   <div class="col-md-3">
     @if ($component->image!='')
       <div class="col-md-12 text-center" style="padding-bottom: 15px;">
-        <a href="{{ Storage::disk('public')->url('components/'.e($component->image)) }}" data-toggle="lightbox">
+        <a href="{{ Storage::disk('public')->url('components/'.e($component->image)) }}" data-toggle="lightbox" data-type="image">
           <img src="{{ Storage::disk('public')->url('components/'.e($component->image)) }}" class="img-responsive img-thumbnail" alt="{{ $component->name }}"></a>
       </div>
 
@@ -281,10 +240,29 @@
       <div class="col-md-12">
         {!! nl2br(Helper::parseEscapedMarkedownInline($component->notes)) !!}
       </div>
-    </div>
+
     @endif
 
-  </div>
+  @can('update', $component)
+    <div class="col-md-12 hidden-print" style="padding-top: 5px;">
+      <a href="{{ route('components.edit', $component->id) }}" class="btn btn-sm btn-warning btn-social btn-block hidden-print">
+        <x-icon type="edit" />
+        {{ trans('admin/components/general.edit') }}
+      </a>
+    </div>
+  @endcan
+
+  @can('checkout', $component)
+    <div class="col-md-12 hidden-print" style="padding-top: 5px;">
+            <a href="{{ route('components.checkout.show', $component->id)  }}" class="btn btn-sm bg-maroon btn-social btn-block hidden-print">
+                 <x-icon type="checkout" />
+              {{ trans('admin/components/general.checkout') }}
+            </a>
+    </div>
+  @endcan
+
+
+</div>
 </div> <!-- .row-->
 
 @can('components.files', Component::class)
diff --git a/resources/views/consumables/checkout.blade.php b/resources/views/consumables/checkout.blade.php
index bde94bc6f4..1245497a7e 100644
--- a/resources/views/consumables/checkout.blade.php
+++ b/resources/views/consumables/checkout.blade.php
@@ -36,6 +36,34 @@
             </div>
           </div>
           @endif
+          @if ($consumable->category)
+              <!-- consumable name -->
+              <div class="form-group">
+                  <label class="col-sm-3 control-label">{{ trans('general.category') }}</label>
+                  <div class="col-md-6">
+                      <p class="form-control-static">{{ $consumable->category->name }}</p>
+                  </div>
+              </div>
+          @endif
+
+          <!-- total -->
+          <div class="form-group">
+              <label class="col-sm-3 control-label">{{  trans('admin/components/general.total') }}</label>
+              <div class="col-md-6">
+                  <p class="form-control-static">{{ $consumable->qty }}</p>
+              </div>
+          </div>
+
+          <!-- remaining -->
+          <div class="form-group">
+              <label class="col-sm-3 control-label">{{  trans('admin/components/general.remaining') }}</label>
+              <div class="col-md-6">
+                  <p class="form-control-static">{{ $consumable->numRemaining() }}</p>
+              </div>
+          </div>
+
+
+
 
           <!-- User -->
             @include ('partials.forms.edit.user-select', ['translated_name' => trans('general.select_user'), 'fieldname' => 'assigned_to', 'required'=> 'true'])
@@ -72,7 +100,7 @@
               <label for="qty" class="col-md-3 control-label">{{ trans('general.qty') }}</label>
               <div class="col-md-7 col-sm-12 required">
                   <div class="col-md-2" style="padding-left:0px">
-                    <input class="form-control" type="number" name="qty" id="qty" value="1" min="1" max="{{$consumable->numRemaining()}}" />
+                    <input class="form-control" type="number" name="checkout_qty" id="checkout_qty" value="1" min="1" max="{{$consumable->numRemaining()}}" maxlength="999999"  />
                   </div>
               </div>
               {!! $errors->first('qty', '<div class="col-md-8 col-md-offset-3"><span class="alert-msg" aria-hidden="true"><i class="fas fa-times" aria-hidden="true"></i> :message</span></div>') !!}
@@ -87,10 +115,14 @@
             </div>
           </div>
         </div> <!-- .box-body -->
-        <div class="box-footer">
-          <a class="btn btn-link" href="{{ route('consumables.show', ['consumable'=> $consumable->id]) }}">{{ trans('button.cancel') }}</a>
-          <button type="submit" id="submit_button" class="btn btn-primary pull-right"><i class="fas fa-check icon-white" aria-hidden="true"></i> {{ trans('general.checkout') }}</button>
-       </div>
+            <x-redirect_submit_options
+                    index_route="consumables.index"
+                    :button_label="trans('general.checkout')"
+                    :options="[
+                                'index' => trans('admin/hardware/form.redirect_to_all', ['type' => trans('general.consumables')]),
+                                'item' => trans('admin/hardware/form.redirect_to_type', ['type' => trans('general.consumable')]),
+                                'target' => trans('admin/hardware/form.redirect_to_checked_out_to'),
+                                ]"/>
       </div>
     </form>
 
diff --git a/resources/views/consumables/edit.blade.php b/resources/views/consumables/edit.blade.php
index f32e74b196..e844338fa7 100644
--- a/resources/views/consumables/edit.blade.php
+++ b/resources/views/consumables/edit.blade.php
@@ -4,6 +4,11 @@
     'helpPosition'  => 'right',
     'helpText' => trans('help.consumables'),
     'formAction' => (isset($item->id)) ? route('consumables.update', ['consumable' => $item->id]) : route('consumables.store'),
+    'index_route' => 'consumables.index',
+    'options' => [
+                'index' => trans('admin/hardware/form.redirect_to_all', ['type' => 'consumables']),
+                'item' => trans('admin/hardware/form.redirect_to_type', ['type' => trans('general.consumable')]),
+               ]
 ])
 {{-- Page content --}}
 @section('inputFields')
@@ -17,7 +22,7 @@
 @include ('partials.forms.edit.model_number')
 @include ('partials.forms.edit.item_number')
 @include ('partials.forms.edit.order_number')
-@include ('partials.forms.edit.purchase_date')
+@include ('partials.forms.edit.datepicker', ['translated_name' => trans('general.purchase_date'),'fieldname' => 'purchase_date'])
 @include ('partials.forms.edit.purchase_cost')
 @include ('partials.forms.edit.quantity')
 @include ('partials.forms.edit.minimum_quantity')
diff --git a/resources/views/consumables/index.blade.php b/resources/views/consumables/index.blade.php
index b654aa884d..392542b5cc 100644
--- a/resources/views/consumables/index.blade.php
+++ b/resources/views/consumables/index.blade.php
@@ -8,7 +8,7 @@
 
 @section('header_right')
   @can('create', \App\Models\Consumable::class)
-  <a href="{{ route('consumables.create') }}" accesskey="n" class="btn btn-primary pull-right"> {{ trans('general.create') }}</a>
+  <a href="{{ route('consumables.create') }}" {{$snipeSettings->shortcuts_enabled == 1 ? "accesskey=n" : ''}} class="btn btn-primary pull-right"> {{ trans('general.create') }}</a>
   @endcan
 @stop
 
@@ -26,7 +26,10 @@
                 data-pagination="true"
                 data-id-table="consumablesTable"
                 data-search="true"
+                data-search-highlight="true"
+                data-show-print="true"
                 data-side-pagination="server"
+                data-footer-style="footerStyle"
                 data-show-columns="true"
                 data-show-export="true"
                 data-show-fullscreen="true"
diff --git a/resources/views/consumables/view.blade.php b/resources/views/consumables/view.blade.php
index 80987335ff..74ba9851f8 100644
--- a/resources/views/consumables/view.blade.php
+++ b/resources/views/consumables/view.blade.php
@@ -2,300 +2,515 @@
 
 {{-- Page title --}}
 @section('title')
- {{ $consumable->name }}
- {{ trans('general.consumable') }}
-@parent
-@stop
+  {{ $consumable->name }}
+  {{ trans('general.consumable') }} -
+  ({{ trans('general.remaining_var', ['count' => $consumable->numRemaining()])  }})
+  @parent
+@endsection
 
 @section('header_right')
-<a href="{{ URL::previous() }}" class="btn btn-primary pull-right">
-  {{ trans('general.back') }}</a>
-@stop
-
+  <a href="{{ URL::previous() }}" class="btn btn-primary pull-right">
+    {{ trans('general.back') }}</a>
+@endsection
 
 {{-- Page content --}}
 @section('content')
 
-<div class="row">
-  <div class="col-md-9">
 
-    <!-- Custom Tabs -->
-    <div class="nav-tabs-custom">
-      <ul class="nav nav-tabs hidden-print">
 
-        <li class="active">
-          <a href="#checkedout" data-toggle="tab">
+
+  <div class="row">
+    <div class="col-md-12">
+      <div class="nav-tabs-custom">
+        <!-- Custom Tabs -->
+        <div class="nav-tabs-custom">
+          <ul class="nav nav-tabs hidden-print">
+
+            <li class="active">
+              <a href="#details" data-toggle="tab">
             <span class="hidden-lg hidden-md">
-            <i class="fas fa-info-circle fa-2x" aria-hidden="true"></i>
+            <i class="fas fa-info-circle fa-2x"></i>
             </span>
-            <span class="hidden-xs hidden-sm">{{ trans('admin/users/general.info') }}</span>
-          </a>
-        </li>
+                <span class="hidden-xs hidden-sm">{{ trans('admin/users/general.info') }}</span>
+              </a>
+            </li>
+
+            <li>
+              <a href="#checkedout" data-toggle="tab">
+                <span class="hidden-lg hidden-md">
+                <x-icon type="users" class="fa-2x" />
+                </span>
+                    <span class="hidden-xs hidden-sm">{{ trans('general.assigned') }}
+                      {!! ($consumable->users_consumables > 0 ) ? '<badge class="badge badge-secondary">'.number_format($consumable->users_consumables).'</badge>' : '' !!}
+                    </span>
+                  </a>
+            </li>
 
 
-        @can('consumables.files', $consumable)
-          <li>
-            <a href="#files" data-toggle="tab">
-            <span class="hidden-lg hidden-md">
-            <i class="far fa-file fa-2x" aria-hidden="true"></i></span>
-              <span class="hidden-xs hidden-sm">{{ trans('general.file_uploads') }}
-                {!! ($consumable->uploads->count() > 0 ) ? '<badge class="badge badge-secondary">'.number_format($consumable->uploads->count()).'</badge>' : '' !!}
-            </span>
-            </a>
-          </li>
-        @endcan
+            @can('consumables.files', $consumable)
+              <li>
+                <a href="#files" data-toggle="tab">
+                <span class="hidden-lg hidden-md">
+                  <i class="far fa-file fa-2x" aria-hidden="true"></i>
+                </span>
+                <span class="hidden-xs hidden-sm">{{ trans('general.file_uploads') }}
+                    {!! ($consumable->uploads->count() > 0 ) ? '<badge class="badge badge-secondary">'.number_format($consumable->uploads->count()).'</badge>' : '' !!}
+                  </span>
+                </a>
+              </li>
+            @endcan
 
-        @can('update', $consumable)
-          <li class="pull-right">
-            <a href="#" data-toggle="modal" data-target="#uploadFileModal">
-              <i class="fas fa-paperclip" aria-hidden="true"></i> {{ trans('button.upload') }}
-            </a>
-          </li>
-        @endcan
+            <li>
+              <a href="#history" data-toggle="tab">
+                <span class="hidden-lg hidden-md">
+                  <i class="fas fa-history fa-2x" aria-hidden="true"></i>
+                </span>
+                <span class="hidden-xs hidden-sm">
+                  {{ trans('general.history') }}
+                </span>
+              </a>
+            </li>
 
-      </ul>
+            @can('update', $consumable)
+              <li class="pull-right">
+                <a href="#" data-toggle="modal" data-target="#uploadFileModal">
+                  <x-icon type="paperclip" /> {{ trans('button.upload') }}
+                </a>
+              </li>
+            @endcan
 
-      <div class="tab-content">
+          </ul>
+        <div class="tab-content">
+          <div class="tab-pane active" id="details">
+            <div class="row">
+              <div class="info-stack-container">
+              <!-- Start button column -->
+              <div class="col-md-3 col-xs-12 col-sm-push-9 info-stack">
 
-        <div class="tab-pane active" id="checkedout">
-              <div class="table-responsive">
+                @if ($consumable->image!='')
+                  <div class="col-md-12 text-center" style="padding-bottom: 20px;">
+                    <a href="{{ Storage::disk('public')->url('consumables/'.e($consumable->image)) }}" data-toggle="lightbox" data-type="image">
+                      <img src="{{ Storage::disk('public')->url('consumables/'.e($consumable->image)) }}" class="img-responsive img-thumbnail" alt="{{ $consumable->name }}"></a>
+                  </div>
+                @endif
 
-                <table
-                        data-cookie-id-table="consumablesCheckedoutTable"
-                        data-pagination="true"
-                        data-id-table="consumablesCheckedoutTable"
-                        data-search="false"
-                        data-side-pagination="server"
-                        data-show-columns="true"
-                        data-show-export="true"
-                        data-show-footer="true"
-                        data-show-refresh="true"
-                        data-sort-order="asc"
-                        data-sort-name="name"
-                        id="consumablesCheckedoutTable"
-                        class="table table-striped snipe-table"
-                        data-url="{{route('api.consumables.show.users', $consumable->id)}}"
-                        data-export-options='{
+                
+                @can('update', $consumable)
+                  <div class="col-md-12">
+                    <a href="{{ route('consumables.edit', $consumable->id) }}" style="margin-bottom:5px;"  class="btn btn-sm btn-block btn-social btn-warning hidden-print">
+                      <x-icon type="edit" />
+                      {{ trans('button.edit') }}
+                    </a>
+                  </div>
+                @endcan
+
+                  @can('checkout', $consumable)
+                    @if ($consumable->numRemaining() > 0)
+                      <div class="col-md-12">
+                        <a href="{{ route('consumables.checkout.show', $consumable->id) }}" style="margin-bottom:5px;" class="btn btn-sm btn-block bg-maroon btn-social hidden-print">
+                          <x-icon type="checkout" />
+                          {{ trans('general.checkout') }}
+                        </a>
+                      </div>
+                    @else
+                      <div class="col-md-12">
+                        <button style="margin-bottom:10px;" class="btn btn-block bg-maroon btn-sm btn-social hidden-print disabled">
+                          <x-icon type="checkout" />
+                          {{ trans('general.checkout') }}
+                        </button>
+                      </div>
+                    @endif
+                  @endif
+
+
+                @can('create', Consumable::class)
+
+                    <div class="col-md-12">
+                      <a href="{{ route('consumables.clone.create', $consumable->id) }}" style="margin-bottom:5px;"  class="btn btn-sm btn-block btn-info btn-social hidden-print">
+                        <x-icon type="clone" />
+                        {{ trans('button.var.clone', ['item_type' => trans('general.consumable')]) }}
+                      </a>
+                    </div>
+
+                  @endcan
+
+
+
+                  @can('delete', $consumable)
+                    <div class="col-md-12" style="padding-top: 10px; padding-bottom: 20px">
+                      @if ($consumable->deleted_at=='')
+                        <button class="btn btn-sm btn-block btn-danger btn-social hidden-print delete-asset" data-toggle="modal" data-title="{{ trans('general.delete') }}" data-content="{{ trans('general.sure_to_delete_var', ['item' => $consumable->name]) }}" data-target="#dataConfirmModal">
+                          <x-icon type="delete" />
+                          {{ trans('general.delete') }}
+                        </button>
+                        <span class="sr-only">{{ trans('general.delete') }}</span>
+                      @endif
+                    </div>
+                  @endcan
+              </div>
+
+              <!-- End button column -->
+
+              <div class="col-md-9 col-xs-12 col-sm-pull-3 info-stack">
+
+                <div class="row-new-striped" style="margin: 0px;">
+
+                  <div class="row row-new-striped">
+                    <!-- name -->
+                    <div class="col-md-3 col-sm-2">
+                      {{ trans('admin/users/table.name') }}
+                    </div>
+                    <div class="col-md-9 col-sm-2">
+                      {{ $consumable->name }}
+                    </div>
+                  </div>
+
+                  <!-- company -->
+                  @if ($consumable->company)
+                    <div class="row">
+                      <div class="col-md-3">
+                        {{ trans('general.company') }}
+                      </div>
+                      <div class="col-md-9">
+                        {{ $consumable->company->name }}
+                      </div>
+                    </div>
+                  @endif
+
+                  <!-- category -->
+                  @if ($consumable->category)
+                    <div class="row">
+                      <div class="col-md-3">
+                        {{ trans('general.category') }}
+                      </div>
+                      <div class="col-md-9">
+                        {{ $consumable->category->name }}
+                      </div>
+                    </div>
+                  @endif
+
+                  <!-- total -->
+                  @if ($consumable->qty)
+                    <div class="row">
+                      <div class="col-md-3">
+                        {{ trans('admin/components/general.total') }}
+                      </div>
+                      <div class="col-md-9">
+                        {{ $consumable->qty }}
+                      </div>
+                    </div>
+                  @endif
+
+                  <!-- remaining -->
+                  @if ($consumable->numRemaining())
+                    <div class="row">
+                      <div class="col-md-3">
+                        {{ trans('general.remaining') }}
+                      </div>
+                      <div class="col-md-9">
+                        @if ($consumable->numRemaining() < (int) $consumable->min_amt)
+                          <i class="fas fa-exclamation-triangle text-orange"
+                             aria-hidden="true"
+                             data-tooltip="true"
+                             data-placement="top"
+                             title="{{ trans('admin/consumables/general.inventory_warning', ['min_count' => (int) $consumable->min_amt]) }}">
+                          </i>
+                        @endif
+                        {{ $consumable->numRemaining() }}
+                      </div>
+                    </div>
+                  @endif
+
+                  <!-- min amt -->
+                  @if ($consumable->min_amt)
+                    <div class="row">
+                      <div class="col-md-3">
+                        {{ trans('general.min_amt') }}
+                      </div>
+                      <div class="col-md-9">
+                        {{ $consumable->min_amt }}
+                      </div>
+                    </div>
+                  @endif
+
+                  <!-- locationm -->
+                  @if ($consumable->location)
+                    <div class="row">
+                      <div class="col-md-3">
+                        {{ trans('general.location') }}
+                      </div>
+                      <div class="col-md-9">
+                        {{ $consumable->location->name }}
+                      </div>
+                    </div>
+                  @endif
+
+                  <!-- supplier -->
+                  @if ($consumable->supplier)
+                    <div class="row">
+                      <div class="col-md-3">
+                        {{ trans('general.supplier') }}
+                      </div>
+                      <div class="col-md-9">
+                        {{ $consumable->supplier->name }}
+                      </div>
+                    </div>
+                  @endif
+
+                  <!-- supplier -->
+                  @if ($consumable->manufacturer)
+                    <div class="row">
+                      <div class="col-md-3">
+                        {{ trans('general.manufacturer') }}
+                      </div>
+                      <div class="col-md-9">
+                        {{ $consumable->manufacturer->name }}
+                      </div>
+                    </div>
+                  @endif
+
+                  @if ($consumable->purchase_cost)
+                    <div class="row">
+                      <div class="col-md-3">
+                        {{ trans('general.purchase_cost') }}
+                      </div>
+                      <div class="col-md-9">
+                        {{ $snipeSettings->default_currency }}
+                        {{ Helper::formatCurrencyOutput($consumable->purchase_cost) }}
+                      </div>
+                    </div>
+                  @endif
+
+                  @if ($consumable->order_number)
+                    <div class="row">
+                      <div class="col-md-3">
+                        {{ trans('general.order_number') }}
+                      </div>
+                      <div class="col-md-9">
+                        <span class="js-copy">{{ $consumable->order_number  }}</span>
+                        <i class="fa-regular fa-clipboard js-copy-link" data-clipboard-target=".js-copy" aria-hidden="true" data-tooltip="true" data-placement="top" title="{{ trans('general.copy_to_clipboard') }}">
+                          <span class="sr-only">{{ trans('general.copy_to_clipboard') }}</span>
+                        </i>
+
+                      </div>
+                    </div>
+                  @endif
+
+                  @if ($consumable->item_no)
+                    <div class="row">
+                      <div class="col-md-3">
+                        {{ trans('admin/consumables/general.item_no') }}
+                      </div>
+                      <div class="col-md-9">
+
+                        <span class="js-copy-item_no">{{ $consumable->item_no  }}</span>
+                        <i class="fa-regular fa-clipboard js-copy-link" data-clipboard-target=".js-copy-item_no"
+                           aria-hidden="true" data-tooltip="true" data-placement="top"
+                           title="{{ trans('general.copy_to_clipboard') }}">
+                          <span class="sr-only">{{ trans('general.copy_to_clipboard') }}</span>
+                        </i>
+
+                      </div>
+                    </div>
+                  @endif
+
+                  @if ($consumable->model_number)
+                    <div class="row">
+                      <div class="col-md-3">
+                        {{ trans('general.model_no') }}
+                      </div>
+                      <div class="col-md-9">
+
+                        <span class="js-copy-model_no">{{ $consumable->model_number  }}</span>
+                        <i class="fa-regular fa-clipboard js-copy-link" data-clipboard-target=".js-copy-model_no"
+                           aria-hidden="true" data-tooltip="true" data-placement="top"
+                           title="{{ trans('general.copy_to_clipboard') }}">
+                          <span class="sr-only">{{ trans('general.copy_to_clipboard') }}</span>
+                        </i>
+
+                      </div>
+                    </div>
+                  @endif
+
+                  <!-- purchase date -->
+                  @if ($consumable->purchase_date)
+                    <div class="row">
+                      <div class="col-md-3">
+                        {{ trans('general.purchase_date') }}
+                      </div>
+                      <div class="col-md-9">
+                        {{ \App\Helpers\Helper::getFormattedDateObject($consumable->purchase_date, 'datetime', false) }}
+                      </div>
+                    </div>
+                  @endif
+
+                  @if ($consumable->adminuser)
+                    <!-- created at -->
+                    <div class="row">
+                      <div class="col-md-3">
+                        {{ trans('general.created_by') }}
+                      </div>
+                      <div class="col-md-9">
+                        @if ($consumable->adminuser->deleted_at == '')
+                          <a href="{{ route('users.show', ['user' => $consumable->adminuser]) }}">{{ $consumable->adminuser->present()->fullName }}</a>
+                        @else
+                          <del>{{ $consumable->adminuser->present()->fullName }}</del>
+                        @endif
+                      </div>
+                    </div>
+                  @endif
+
+                  @if ($consumable->created_at)
+                    <!-- created at -->
+                    <div class="row">
+                      <div class="col-md-3">
+                        {{ trans('general.created_at') }}
+                      </div>
+                      <div class="col-md-9">
+                        {{ \App\Helpers\Helper::getFormattedDateObject($consumable->created_at, 'datetime')['formatted']}}
+                      </div>
+                    </div>
+                  @endif
+
+                  @if ($consumable->updated_at)
+                    <!-- created at -->
+                    <div class="row">
+                      <div class="col-md-3">
+                        {{ trans('general.updated_at') }}
+                      </div>
+                      <div class="col-md-9">
+                        {{ \App\Helpers\Helper::getFormattedDateObject($consumable->updated_at, 'datetime')['formatted']}}
+                      </div>
+                    </div>
+                  @endif
+
+                  @if ($consumable->notes)
+                    <!-- empty -->
+                    <div class="row">
+
+                      <div class="col-md-3">
+                        {{ trans('admin/users/table.notes') }}
+                      </div>
+                      <div class="col-md-9">
+                        {!! nl2br(Helper::parseEscapedMarkedownInline($consumable->notes)) !!}
+                      </div>
+
+                    </div>
+                  @endif
+                </div> <!--/end striped container-->
+              </div> <!-- end col-md-9 -->
+              </div><!-- end info-stack-container -->
+            </div> <!--/.row-->
+          </div><!-- /.tab-pane -->
+
+          <div class="tab-pane" id="checkedout">
+
+            <table
+                    data-cookie-id-table="consumablesCheckedoutTable"
+                    data-pagination="true"
+                    data-id-table="consumablesCheckedoutTable"
+                    data-search="false"
+                    data-show-print="true"
+                    data-side-pagination="server"
+                    data-show-columns="true"
+                    data-show-export="true"
+                    data-show-footer="true"
+                    data-show-refresh="true"
+                    data-sort-order="asc"
+                    data-sort-name="name"
+                    id="consumablesCheckedoutTable"
+                    class="table table-striped snipe-table"
+                    data-url="{{route('api.consumables.show.users', $consumable->id)}}"
+                    data-export-options='{
                 "fileName": "export-consumables-{{ str_slug($consumable->name) }}-checkedout-{{ date('Y-m-d') }}",
                 "ignoreColumn": ["actions","image","change","checkbox","checkincheckout","icon"]
                 }'>
-                  <thead>
-                  <tr>
-                    <th data-searchable="false" data-sortable="false" data-field="avatar" data-formatter="imageFormatter">{{ trans('general.image') }}</th>
-                    <th data-searchable="false" data-sortable="false" data-field="name" formatter="usersLinkFormatter">{{ trans('general.user') }}</th>
-                    <th data-searchable="false" data-sortable="false" data-field="created_at" data-formatter="dateDisplayFormatter">
-                      {{ trans('general.date') }}
-                    </th>
-                    <th data-searchable="false" data-sortable="false" data-field="note">{{ trans('general.notes') }}</th>
-                    <th data-searchable="false" data-sortable="false" data-field="admin">{{ trans('general.admin') }}</th>
-                  </tr>
-                  </thead>
-                </table>
-          </div>
-        </div> <!-- close tab-pane div -->
+              <thead>
+              <tr>
+                <th data-searchable="false" data-sortable="false" data-field="avatar" data-formatter="imageFormatter">{{ trans('general.image') }}</th>
+                <th data-searchable="false" data-sortable="false" data-field="name" formatter="usersLinkFormatter">{{ trans('general.user') }}</th>
+                <th data-searchable="false" data-sortable="false" data-field="created_at" data-formatter="dateDisplayFormatter">
+                  {{ trans('general.date') }}
+                </th>
+                <th data-searchable="false" data-sortable="false" data-field="note">{{ trans('general.notes') }}</th>
+                <th data-searchable="false" data-sortable="false" data-field="admin">{{ trans('general.created_by') }}</th>
+              </tr>
+              </thead>
+            </table>
+
+          </div><!-- /checkedout -->
 
 
-        @can('consumables.files', $consumable)
           <div class="tab-pane" id="files">
 
-            <div class="table-responsive">
-              <table
-                      data-cookie-id-table="consumableUploadsTable"
-                      data-id-table="consumableUploadsTable"
-                      id="consumableUploadsTable"
-                      data-search="true"
-                      data-pagination="true"
-                      data-side-pagination="client"
-                      data-show-columns="true"
-                      data-show-export="true"
-                      data-show-footer="true"
-                      data-toolbar="#upload-toolbar"
-                      data-show-refresh="true"
-                      data-sort-order="asc"
-                      data-sort-name="name"
-                      class="table table-striped snipe-table"
-                      data-export-options='{
-                    "fileName": "export-consumables-uploads-{{ str_slug($consumable->name) }}-{{ date('Y-m-d') }}",
-                    "ignoreColumn": ["actions","image","change","checkbox","checkincheckout","delete","download","icon"]
-                    }'>
-                <thead>
-                <tr>
-                  <th data-visible="true" data-field="icon" data-sortable="true">{{trans('general.file_type')}}</th>
-                  <th class="col-md-2" data-searchable="true" data-visible="true" data-field="image">{{ trans('general.image') }}</th>
-                  <th class="col-md-2" data-searchable="true" data-visible="true" data-field="filename" data-sortable="true">{{ trans('general.file_name') }}</th>
-                  <th class="col-md-1" data-searchable="true" data-visible="true" data-field="filesize">{{ trans('general.filesize') }}</th>
-                  <th class="col-md-2" data-searchable="true" data-visible="true" data-field="notes" data-sortable="true">{{ trans('general.notes') }}</th>
-                  <th class="col-md-1" data-searchable="true" data-visible="true" data-field="download">{{ trans('general.download') }}</th>
-                  <th class="col-md-2" data-searchable="true" data-visible="true" data-field="created_at" data-sortable="true">{{ trans('general.created_at') }}</th>
-                  <th class="col-md-1" data-searchable="true" data-visible="true" data-field="actions">{{ trans('table.actions') }}</th>
-                </tr>
-                </thead>
-                <tbody>
-                @if ($consumable->uploads->count() > 0)
-                  @foreach ($consumable->uploads as $file)
-                    <tr>
-                      <td>
-                        <i class="{{ Helper::filetype_icon($file->filename) }} icon-med" aria-hidden="true"></i>
-                        <span class="sr-only">{{ Helper::filetype_icon($file->filename) }}</span>
-
-                      </td>
-                      <td>
-                        @if ($file->filename)
-                          @if ( Helper::checkUploadIsImage($file->get_src('consumables')))
-                            <a href="{{ route('show.consumablefile', ['consumableId' => $consumable->id, 'fileId' => $file->id, 'download' => 'false']) }}" data-toggle="lightbox" data-type="image"><img src="{{ route('show.consumablefile', ['consumableId' => $consumable->id, 'fileId' => $file->id]) }}" class="img-thumbnail" style="max-width: 50px;"></a>
-                          @endif
-                        @endif
-                      </td>
-                      <td>
-                        {{ $file->filename }}
-                      </td>
-                      <td data-value="{{ (Storage::exists('private_uploads/consumables/'.$file->filename) ? Storage::size('private_uploads/consumables/'.$file->filename) : '') }}">
-                        {{ @Helper::formatFilesizeUnits(Storage::exists('private_uploads/consumables/'.$file->filename) ? Storage::size('private_uploads/consumables/'.$file->filename) : '') }}
-                      </td>
-
-                      <td>
-                        @if ($file->note)
-                          {!! nl2br(Helper::parseEscapedMarkedownInline($file->note)) !!}
-                        @endif
-                      </td>
-                      <td>
-                        @if ($file->filename)
-                          <a href="{{ route('show.consumablefile', [$consumable->id, $file->id]) }}" class="btn btn-sm btn-default">
-                            <i class="fas fa-download" aria-hidden="true"></i>
-                            <span class="sr-only">{{ trans('general.download') }}</span>
-                          </a>
-
-                          <a href="{{ route('show.consumablefile', [$consumable->id, $file->id, 'inline' => 'true']) }}" class="btn btn-sm btn-default" target="_blank">
-                            <i class="fa fa-external-link" aria-hidden="true"></i>
-                          </a>
-                        @endif
-                      </td>
-                      <td>{{ $file->created_at }}</td>
-                      <td>
-                        <a class="btn delete-asset btn-danger btn-sm" href="{{ route('delete/consumablefile', [$consumable->id, $file->id]) }}" data-content="{{ trans('general.delete_confirm', ['item' => $file->filename]) }}" data-title="{{ trans('general.delete') }}">
-                          <i class="fas fa-trash icon-white" aria-hidden="true"></i>
-                          <span class="sr-only">{{ trans('general.delete') }}</span>
-                        </a>
-                      </td>
-                    </tr>
-                  @endforeach
-                @else
-                  <tr>
-                    <td colspan="8">{{ trans('general.no_results') }}</td>
-                  </tr>
-                @endif
-                </tbody>
-              </table>
-            </div>
-          </div> <!-- /.tab-pane -->
-        @endcan
-
-      </div>
-    </div>
-
-  </div>
-
-
-  <div class="col-md-3">
-
-        <div class="box box-default">
-          <div class="box-body">
             <div class="row">
               <div class="col-md-12">
+                <x-filestable
+                        filepath="private_uploads/consumables/"
+                        showfile_routename="show.consumablefile"
+                        deletefile_routename="delete/consumablefile"
+                        :object="$consumable" />
 
-
-                @if ($consumable->image!='')
-                <div class="col-md-12 text-center">
-                  <a href="{{ Storage::disk('public')->url('consumables/'.e($consumable->image)) }}" data-toggle="lightbox">
-                      <img src="{{ Storage::disk('public')->url('consumables/'.e($consumable->image)) }}" class="img-responsive img-thumbnail" alt="{{ $consumable->name }}"></a>
-                </div>
-                @endif
-
-                @if ($consumable->purchase_date)
-                  <div class="col-md-12">
-                    <strong>{{ trans('general.purchase_date') }}: </strong>
-                    {{ Helper::getFormattedDateObject($consumable->purchase_date, 'date', false) }}
-                  </div>
-                @endif
-
-                @if ($consumable->purchase_cost)
-                  <div class="col-md-12">
-                    <strong>{{ trans('general.purchase_cost') }}:</strong>
-                    {{ $snipeSettings->default_currency }}
-                    {{ Helper::formatCurrencyOutput($consumable->purchase_cost) }}
-                  </div>
-                @endif
-
-                @if ($consumable->item_no)
-                  <div class="col-md-12">
-                    <strong>{{ trans('admin/consumables/general.item_no') }}:</strong>
-                    {{ $consumable->item_no }}
-                  </div>
-                @endif
-
-                @if ($consumable->model_number)
-                  <div class="col-md-12">
-                    <strong>{{ trans('general.model_no') }}:</strong>
-                    {{ $consumable->model_number }}
-                  </div>
-                @endif
-
-                @if ($consumable->manufacturer)
-                  <div class="col-md-12">
-                    <strong>{{ trans('general.manufacturer') }}:</strong>
-                    <a href="{{ route('manufacturers.show', $consumable->manufacturer->id) }}">{{ $consumable->manufacturer->name }}</a>
-                  </div>
-                @endif
-
-                @if ($consumable->order_number)
-                  <div class="col-md-12">
-                    <strong>{{ trans('general.order_number') }}:</strong>
-                    {{ $consumable->order_number }}
-                  </div>
-                @endif
-
-    @can('checkout', \App\Models\Consumable::class)
-
-      <div class="col-md-12">
-        <br><br>
-        @if ($consumable->numRemaining() > 0)
-          <a href="{{ route('consumables.checkout.show', $consumable->id) }}" style="margin-bottom:10px; width:100%" class="btn btn-primary btn-sm">
-            {{ trans('general.checkout') }}
-          </a>
-        @else
-          <button style="margin-bottom:10px; width:100%" class="btn btn-primary btn-sm disabled">
-            {{ trans('general.checkout') }}
-          </button>
-        @endif
-      </div>
-
-    @endcan
-
-    @if ($consumable->notes)
-
-    <div class="col-md-12">
-      <strong>
-        {{ trans('general.notes') }}:
-      </strong>
               </div>
-    <div class="col-md-12">
-      {!! nl2br(Helper::parseEscapedMarkedownInline($consumable->notes)) !!}
             </div>
-          </div>
-  @endif
 
-    </div>
+          </div><!--/FILES-->
 
-  </div> <!-- /.col-md-3-->
-</div> <!-- /.row-->
+          <div class="tab-pane" id="history">
+            <div class="table-responsive">
+
+              <table
+                      data-columns="{{ \App\Presenters\HistoryPresenter::dataTableLayout() }}"
+                      class="table table-striped snipe-table"
+                      id="consumableHistory"
+                      data-pagination="true"
+                      data-id-table="consumableHistory"
+                      data-search="true"
+                      data-search-highlight="true"
+                      data-show-print="true"
+                      data-side-pagination="server"
+                      data-show-columns="true"
+                      data-show-fullscreen="true"
+                      data-show-refresh="true"
+                      data-sort-order="desc"
+                      data-sort-name="created_at"
+                      data-show-export="true"
+                      data-export-options='{
+                         "fileName": "export-consumable-{{  $consumable->id }}-history",
+                         "ignoreColumn": ["actions","image","change","checkbox","checkincheckout","icon"]
+                       }'
+
+                      data-url="{{ route('api.activity.index', ['item_id' => $consumable->id, 'item_type' => 'consumable']) }}"
+                      data-cookie-id-table="consumableHistory"
+                      data-cookie="true">
+              </table>
+            </div>
+          </div><!-- /.tab-pane -->
+      </div><!-- /.tab-content -->
+    </div><!-- nav-tabs-custom -->
+  </div>
+
+  @can('update', \App\Models\User::class)
+    @include ('modals.upload-file', ['item_type' => 'consumable', 'item_id' => $consumable->id])
+  @endcan
 
 
 
-@can('consumables.files', \App\Models\Consumable::class)
-  @include ('modals.upload-file', ['item_type' => 'consumable', 'item_id' => $consumable->id])
-@endcan
 @stop
 
 @section('moar_scripts')
-@include ('partials.bootstrap-table', ['exportFile' => 'consumable' . $consumable->name . '-export', 'search' => false])
-@stop
+
+        <script>
+
+          $('#dataConfirmModal').on('show.bs.modal', function (event) {
+            var content = $(event.relatedTarget).data('content');
+            var title = $(event.relatedTarget).data('title');
+            $(this).find(".modal-body").text(content);
+            $(this).find(".modal-header").text(title);
+          });
+
+        </script>
+
+
+  @include ('partials.bootstrap-table', ['simple_view' => true])
+@endsection
\ No newline at end of file
diff --git a/resources/views/custom_fields/fields/edit.blade.php b/resources/views/custom_fields/fields/edit.blade.php
index e21e9fba48..07a21b089f 100644
--- a/resources/views/custom_fields/fields/edit.blade.php
+++ b/resources/views/custom_fields/fields/edit.blade.php
@@ -23,10 +23,10 @@
 
     <!-- Horizontal Form -->
     @if ($field->id)
-        {{ Form::open(['route' => ['fields.update', $field->id], 'class'=>'form-horizontal']) }}
+        <form method="POST" action="{{ route('fields.update', $field->id) }}" accept-charset="UTF-8" class="form-horizontal">
         {{ method_field('PUT') }}
     @else
-        {{ Form::open(['route' => 'fields.store', 'class'=>'form-horizontal']) }}
+        <form method="POST" action="{{ route('fields.store') }}" accept-charset="UTF-8" class="form-horizontal">
     @endif
 
     @csrf
@@ -46,7 +46,7 @@
               {{ trans('admin/custom_fields/general.field_name') }}
             </label>
             <div class="col-md-8 required">
-                {{ Form::text('name', old('name', $field->name), array('class' => 'form-control', 'aria-label'=>'name')) }}
+                <input class="form-control" aria-label="name" name="name" type="text" required value="{{ old('name', $field->name) }}">
                 {!! $errors->first('name', '<span class="alert-msg" aria-hidden="true"><i class="fas fa-times" aria-hidden="true"></i> :message</span>') !!}
             </div>
           </div>
@@ -58,7 +58,19 @@
             </label>
             <div class="col-md-8 required">
 
-            {!! Form::customfield_elements('element', old('element', $field->element), 'field_element select2 form-control') !!}
+            <x-input.select
+                name="element"
+                :selected="old('element', $field->element)"
+                class="field_element"
+                style="width: 100%;"
+                :options="[
+                    'text' => trans('admin/custom_fields/general.types.text'),
+                    'listbox' => trans('admin/custom_fields/general.types.listbox'),
+                    'textarea' => trans('admin/custom_fields/general.types.textarea'),
+                    'checkbox' => trans('admin/custom_fields/general.types.checkbox'),
+                    'radio' => trans('admin/custom_fields/general.types.radio'),
+                ]"
+            />
             {!! $errors->first('element', '<span class="alert-msg" aria-hidden="true"><i class="fas fa-times" aria-hidden="true"></i> :message</span>') !!}
 
             </div>
@@ -70,7 +82,13 @@
               {{ trans('admin/custom_fields/general.field_values') }}
             </label>
             <div class="col-md-8 required">
-              {!! Form::textarea('field_values', old('name', $field->field_values), ['style' => 'width: 100%', 'rows' => 4, 'class' => 'form-control', 'aria-label'=>'field_values']) !!}
+                <x-input.textarea
+                    name="field_values"
+                    :value="old('field_values', $field->field_values)"
+                    style="width: 100%"
+                    rows="4"
+                    aria-label="field_values"
+                />
               {!! $errors->first('field_values', '<span class="alert-msg" aria-hidden="true"><i class="fas fa-times" aria-hidden="true"></i> :message</span>') !!}
               <p class="help-block">{{ trans('admin/custom_fields/general.field_values_help') }}</p>
             </div>
@@ -88,7 +106,14 @@
               }
               @endphp
             <div class="col-md-8 required">
-              {{ Form::select("format",Helper::predefined_formats(), ($field_format == '') ? $field->format : $field_format, array('class'=>'format select2 form-control', 'aria-label'=>'format', 'style' => 'width:100%;')) }}
+                <x-input.select
+                    name="format"
+                    :options="Helper::predefined_formats()"
+                    :selected="($field_format == '') ? $field->format : $field_format"
+                    class="format form-control"
+                    style="width:100%"
+                    aria-label="format"
+                />
               {!! $errors->first('format', '<span class="alert-msg" aria-hidden="true"><i class="fas fa-times" aria-hidden="true"></i> :message</span>') !!}
             </div>
           </div>
@@ -98,7 +123,7 @@
               {{ trans('admin/custom_fields/general.field_custom_format') }}
             </label>
             <div class="col-md-8 required">
-                {{ Form::text('custom_format', old('custom_format', (($field->format!='') && (stripos($field->format,'regex')===0)) ? $field->format : ''), array('class' => 'form-control', 'id' => 'custom_format','aria-label'=>'custom_format', 'placeholder'=>'regex:/^[0-9]{15}$/')) }}
+                <input class="form-control" id="custom_format" aria-label="custom_format" placeholder="regex:/^[0-9]{15}$/" name="custom_format" type="text" value="{{ old('custom_format', (($field->format!='') && (stripos($field->format,'regex')===0)) ? $field->format : '') }}">
                 <p class="help-block">{!! trans('admin/custom_fields/general.field_custom_format_help') !!}</p>
 
               {!! $errors->first('custom_format', '<span class="alert-msg" aria-hidden="true"><i class="fas fa-times" aria-hidden="true"></i> :message</span>') !!}
@@ -112,7 +137,7 @@
                   {{ trans('admin/custom_fields/general.help_text') }}
               </label>
               <div class="col-md-8">
-                  {{ Form::text('help_text', old('help_text', $field->help_text), array('class' => 'form-control', 'aria-label'=>'help_text')) }}
+                  <input class="form-control" aria-label="help_text" name="help_text" type="text" value=" {{ old('help_text', $field->help_text) }}">
                   <p class="help-block">{{ trans('admin/custom_fields/general.help_text_description') }}</p>
                   {!! $errors->first('help_text', '<span class="alert-msg" aria-hidden="true"><i class="fas fa-times" aria-hidden="true"></i> :message</span>') !!}
               </div>
@@ -137,13 +162,13 @@
               <!-- Encrypted  -->
               <div class="col-md-9 col-md-offset-3" id="encryption_section">
                   <label class="form-control">
-                      <input type="checkbox" value="1" name="field_encrypted" id="field_encrypted"{{ (Request::old('field_encrypted') || $field->field_encrypted) ? ' checked="checked"' : '' }}>
+                      <input type="checkbox" value="1" name="field_encrypted" id="field_encrypted"{{ (old('field_encrypted') || $field->field_encrypted) ? ' checked="checked"' : '' }}>
                       {{ trans('admin/custom_fields/general.encrypt_field') }}
                   </label>
               </div>
               <div class="col-md-9 col-md-offset-3" id="encrypt_warning" style="display:none;">
                   <div class="callout callout-danger">
-                      <p><i class="fas fa-exclamation-triangle" aria-hidden="true"></i> {{ trans('admin/custom_fields/general.encrypt_field_help') }}</p>
+                      <p><x-icon type="warning" /> {{ trans('admin/custom_fields/general.encrypt_field_help') }}</p>
                   </div>
               </div>
           @endif
@@ -151,7 +176,7 @@
 
 
               <!-- Auto-Add to Future Fieldsets  -->
-              <div class="col-md-9 col-md-offset-3">
+              <div class="col-md-9 col-md-offset-3" style="padding-bottom: 10px;">
                   <label class="form-control">
                       <input type="checkbox" name="auto_add_to_fieldsets" aria-label="auto_add_to_fieldsets" value="1"{{ (old('auto_add_to_fieldsets') || $field->auto_add_to_fieldsets) ? ' checked="checked"' : '' }}>
                       {{ trans('admin/custom_fields/general.auto_add_to_fieldsets') }}
@@ -159,7 +184,7 @@
               </div>
 
               <!-- Show in list view -->
-              <div class="col-md-9 col-md-offset-3">
+              <div class="col-md-9 col-md-offset-3" style="padding-bottom: 10px;">
                   <label class="form-control">
                       <input type="checkbox" name="show_in_listview" aria-label="show_in_listview" value="1"{{ (old('show_in_listview') || $field->show_in_listview) ? ' checked="checked"' : '' }}>
                       {{ trans('admin/custom_fields/general.show_in_listview') }}
@@ -170,7 +195,7 @@
               @if ((!$field->id) || ($field->field_encrypted=='0'))
 
               <!-- Show in requestable list view -->
-              <div class="col-md-9 col-md-offset-3" id="show_in_requestable_list">
+              <div class="col-md-9 col-md-offset-3" id="show_in_requestable_list" style="padding-bottom: 10px;">
                   <label class="form-control">
                       <input type="checkbox" name="show_in_requestable_list" aria-label="show_in_requestable_list" value="1"{{ (old('show_in_requestable_list') || $field->show_in_requestable_list) ? ' checked="checked"' : '' }}>
                       {{ trans('admin/custom_fields/general.show_in_requestable_list') }}
@@ -178,7 +203,7 @@
               </div>
 
               <!-- Show in Email  -->
-              <div class="col-md-9 col-md-offset-3" id="show_in_email">
+              <div class="col-md-9 col-md-offset-3" id="show_in_email" style="padding-bottom: 10px;">
                   <label class="form-control">
                       <input type="checkbox" name="show_in_email" aria-label="show_in_email" value="1"{{ (old('show_in_email') || $field->show_in_email) ? ' checked="checked"' : '' }}>
                       {{ trans('admin/custom_fields/general.show_in_email') }}
@@ -186,7 +211,7 @@
               </div>
 
               <!-- Value Must be Unique -->
-              <div class="col-md-9 col-md-offset-3" id="is_unique">
+              <div class="col-md-9 col-md-offset-3" id="is_unique" style="padding-bottom: 10px;">
                   <label class="form-control">
                       <input type="checkbox" name="is_unique" aria-label="is_unique" value="1"{{ (old('is_unique') || $field->is_unique) ? ' checked="checked"' : '' }}>
                       {{ trans('admin/custom_fields/general.is_unique') }}
@@ -194,7 +219,33 @@
               </div>
               @endif
 
-              <!-- Show in View All Assets profile view  -->
+
+             <!-- Show in Checkout Form  -->
+             <div class="col-md-9 col-md-offset-3" id="display_checkout" style="padding-bottom: 10px;">
+                 <label class="form-control">
+                     <input type="checkbox" name="display_checkout" aria-label="display_checkout" value="1" {{ (old('display_checkout') || $field->display_checkout) ? ' checked="checked"' : '' }}>
+                     {{ trans('admin/custom_fields/general.display_checkout') }}
+                 </label>
+             </div>
+
+             <!-- Show in Checkin Form  -->
+             <div class="col-md-9 col-md-offset-3" id="display_checkin" style="padding-bottom: 10px;">
+                 <label class="form-control">
+                     <input type="checkbox" name="display_checkin" aria-label="display_checkin" value="1" {{ (old('display_checkin') || $field->display_checkin) ? ' checked="checked"' : '' }}>
+                     {{ trans('admin/custom_fields/general.display_checkin') }}
+                 </label>
+             </div>
+
+             <!-- Show in Audit Form  -->
+             <div class="col-md-9 col-md-offset-3" id="display_audit" style="padding-bottom: 10px;">
+                 <label class="form-control">
+                     <input type="checkbox" name="display_audit" aria-label="display_audit" value="1" {{ (old('display_audit') || $field->display_audit) ? ' checked="checked"' : '' }}>
+                     {{ trans('admin/custom_fields/general.display_audit') }}
+                 </label>
+             </div>
+
+
+             <!-- Show in View All Assets profile view  -->
               <div class="col-md-9 col-md-offset-3" id="display_in_user_view">
                   <label class="form-control">
                       <input type="checkbox" name="display_in_user_view" aria-label="display_in_user_view" value="1" {{ (old('display_in_user_view') || $field->display_in_user_view) ? ' checked="checked"' : '' }}>
@@ -263,7 +314,7 @@
 
 
 </div>
-{{ Form::close() }}
+</form>
 @stop
 
 @section('moar_scripts')
diff --git a/resources/views/custom_fields/fieldsets/view.blade.php b/resources/views/custom_fields/fieldsets/view.blade.php
index b73ae708c6..feef5566aa 100644
--- a/resources/views/custom_fields/fieldsets/view.blade.php
+++ b/resources/views/custom_fields/fieldsets/view.blade.php
@@ -88,28 +88,29 @@
           <tfoot>
             <tr>
               <td colspan="8">
-                {{ Form::open(['route' =>
-                ["fieldsets.associate",$custom_fieldset->id],
-                'class'=>'form-inline',
-                'id' => 'ordering']) }}
-
+                <form method="POST" action="{{ route('fieldsets.associate', $custom_fieldset->id) }}" accept-charset="UTF-8" class="form-inline" id="ordering">
+                  @csrf
 
                 <div class="form-group">
                   <label for="field_id" class="sr-only">
                     {{ trans('admin/custom-field/general.add_field_to_fieldset')}}
                   </label>
-                  {{ Form::select("field_id",$custom_fields_list,"",['aria-label'=>'field_id', 'class'=>'select2', 'style' => 'min-width:400px;']) }}
-
+                  <x-input.select
+                      name="field_id"
+                      :options="$custom_fields_list"
+                      style="min-width:400px"
+                      aria-label="field_id"
+                  />
                 </div>
 
                 <div class="form-group" style="display: none;">
-                  {{ Form::text('order', $maxid, array('aria-label'=>'order', 'maxlength'=>'3', 'size'=>'3')) }}
+                  <input aria-label="order" maxlength="3" size="3" name="order" type="text" value="{{ $maxid }}">
                   <label for="order">{{ trans('admin/custom_fields/general.order') }}</label>
                 </div>
 
                 <div class="checkbox-inline">
                     <label>
-                    {{ Form::checkbox('required', 'on', old('required')) }}
+                      <input type="checkbox" name="required" value="on" @checked(old('required'))>
                       <span style="padding-left: 10px;">{{ trans('admin/custom_fields/general.required') }}</span>
                     </label>
                 </div>
@@ -118,7 +119,7 @@
                   <button type="submit" class="btn btn-primary"> {{ trans('general.save') }}</button>
                 </span>
 
-                {{ Form::close() }}
+                </form>
 
               </td>
             </tr>
diff --git a/resources/views/custom_fields/index.blade.php b/resources/views/custom_fields/index.blade.php
index d8eeae1d56..108fe25000 100644
--- a/resources/views/custom_fields/index.blade.php
+++ b/resources/views/custom_fields/index.blade.php
@@ -31,6 +31,8 @@
                 data-cookie-id-table="customFieldsetsTable"
                 data-id-table="customFieldsetsTable"
                 data-search="true"
+                data-search-highlight="true"
+                data-show-print="true"
                 data-side-pagination="client"
                 data-show-columns="true"
                 data-show-export="true"
@@ -87,13 +89,15 @@
                 @endcan
 
                 @can('delete', $fieldset)
-                {{ Form::open(['route' => array('fieldsets.destroy', $fieldset->id), 'method' => 'delete','style' => 'display:inline-block']) }}
+                <form method="POST" action="{{ route('fieldsets.destroy', $fieldset->id) }}" accept-charset="UTF-8" style="display:inline-block">
+                  {{ method_field('DELETE') }}
+                  @csrf
                   @if($fieldset->models->count() > 0)
                   <button type="submit" class="btn btn-danger btn-sm disabled" data-tooltip="true" title="{{ trans('general.cannot_be_deleted') }}" disabled><i class="fas fa-trash"></i></button>
                   @else
                   <button type="submit" class="btn btn-danger btn-sm" data-tooltip="true" title="{{ trans('general.delete') }}"><i class="fas fa-trash"></i></button>
                   @endif
-                {{ Form::close() }}
+                </form>
                 @endcan
                   </nobr>
               </td>
@@ -125,11 +129,12 @@
       </div><!-- /.box-header -->
       <div class="box-body">
 
-        <div class="table-responsive">
         <table
                 data-cookie-id-table="customFieldsTable"
                 data-id-table="customFieldsTable"
                 data-search="true"
+                data-search-highlight="true"
+                data-show-print="true"
                 data-side-pagination="client"
                 data-show-columns="true"
                 data-show-export="true"
@@ -146,20 +151,68 @@
             <tr>
               <th data-sortable="true" data-searchable="true">{{ trans('general.name') }}</th>
               <th data-sortable="true" data-searchable="true">{{ trans('admin/custom_fields/general.help_text')}}</th>
-              <th data-sortable="true" data-searchable="true">{{ trans('admin/custom_fields/general.unique') }}</th>
               <th data-sortable="true" data-visible="false">{{ trans('admin/custom_fields/general.db_field') }}</th>
               <th data-sortable="true" data-searchable="true">{{ trans('admin/custom_fields/general.field_format') }}</th>
-              <th data-sortable="true"><i class="fa fa-lock" aria-hidden="true"></i>
+              <th data-sortable="true" data-tooltip="{{ trans('admin/custom_fields/general.encrypted') }}"><i
+                        class="fa fa-lock" aria-hidden="true"></i>
                 <span class="hidden-xs hidden-sm hidden-md hidden-lg">{{ trans('admin/custom_fields/general.encrypted') }}</span>
               </th>
-              <th data-sortable="true" class="text-center"><i class="fa fa-list" aria-hidden="true"></i>
+              <th data-sortable="true" class="text-center"
+                  data-tooltip="{{ trans('admin/custom_fields/general.show_in_listview_short') }}"><i class="fa fa-list"
+                                                                                                      aria-hidden="true"></i>
                 <span class="hidden-xs hidden-sm hidden-md hidden-lg">{{ trans('admin/custom_fields/general.show_in_listview_short') }}</span>
               </th>
-              <th data-visible="false" data-sortable="true" class="text-center"><i class="fa fa-eye" aria-hidden="true"><span class="sr-only">Visible to User</span></i></th>
-              <th data-sortable="true" data-searchable="true" class="text-center"><i class="fa fa-envelope" aria-hidden="true"><span class="sr-only">{{ trans('admin/custom_fields/general.show_in_email_short') }}</span></i></th>
-              <th data-sortable="true" data-searchable="true" class="text-center"><i class="fa fa-laptop fa-fw" aria-hidden="true"><span class="sr-only">{{ trans('admin/custom_fields/general.show_in_requestable_list_short') }}</span></i></th>
-              <th data-sortable="true" data-searchable="true" class="text-center"><i class="fa-solid fa-fingerprint"><span class="sr-only">{{ trans('admin/custom_fields/general.unique') }}</span></i></th>
+              <th data-visible="false" data-sortable="true" class="text-center"
+                  data-tooltip="{{ trans('admin/custom_fields/general.display_in_user_view_table') }}"><i
+                        class="fa fa-eye"
+                        aria-hidden="true"><span
+                          class="sr-only">{{ trans('admin/custom_fields/general.display_in_user_view_table') }}</span></i>
+              </th>
+              <th data-sortable="true" data-searchable="false" class="text-center"
+                  data-tooltip="{{ trans('admin/custom_fields/general.show_in_email_short') }}"><i
+                        class="fa fa-envelope" aria-hidden="true"><span
+                          class="sr-only">{{ trans('admin/custom_fields/general.show_in_email_short') }}</span></i></th>
+
+              <th data-sortable="true" data-searchable="false" class="text-center"
+                  data-tooltip="{{ trans('admin/custom_fields/general.show_in_requestable_list_short') }}"><i
+                        class="fa fa-laptop fa-fw" aria-hidden="true"><span
+                          class="sr-only">{{ trans('admin/custom_fields/general.show_in_requestable_list_short') }}</span></i>
+              </th>
+
+              <th data-sortable="true" data-searchable="false" class="text-center"
+                  data-tooltip="{{ trans('admin/custom_fields/general.unique') }}"><i
+                        class="fa-solid fa-fingerprint"><span
+                          class="sr-only">{{ trans('admin/custom_fields/general.unique') }}</span></i></th>
+
+
+              <th data-sortable="true" data-visible="false" data-searchable="false" class="text-center"
+                  data-tooltip="{{ trans('admin/custom_fields/general.display_checkin') }}">
+                <x-icon type="checkin" />
+                <span class="sr-only">
+                    {{ trans('admin/custom_fields/general.display_checkin') }}
+                  </span>
+              </th>
+
+              <th data-sortable="true" data-visible="false" data-searchable="false" class="text-center"
+                  data-tooltip="{{ trans('admin/custom_fields/general.display_checkout') }}">
+                <x-icon type="checkout" />
+                <span class="sr-only">
+                    {{ trans('admin/custom_fields/general.display_checkout') }}
+                  </span>
+              </th>
+
+              <th data-sortable="true" data-visible="false" data-searchable="false" class="text-center"
+                  data-tooltip="{{ trans('admin/custom_fields/general.display_audit') }}">
+                <x-icon type="audit" />
+                <span class="sr-only">
+                    {{ trans('admin/custom_fields/general.display_audit') }}
+                  </span>
+              </th>
+
+
               <th data-sortable="true" data-searchable="true" class="text-center">{{ trans('admin/custom_fields/general.field_element_short') }}</th>
+
+
               <th data-searchable="true">{{ trans('admin/custom_fields/general.fieldsets') }}</th>
               <th>{{ trans('button.actions') }}</th>
             </tr>
@@ -169,8 +222,6 @@
             <tr>
               <td>{{ $field->name }}</td>
               <td>{{ $field->help_text }}</td>
-
-              <td class="text-center">{!! ($field->is_unique=='1') ? '<i class="fas fa-check text-success" aria-hidden="true"><span class="sr-only">'.trans('general.yes').'</span></i>' : '<i class="fas fa-times text-danger" aria-hidden="true"><span class="sr-only">'.trans('general.no').'</span></i>'  !!}</td>
               <td>
                  <code>{{ $field->convertUnicodeDbSlug() }}</code>
                 @if ($field->convertUnicodeDbSlug()!=$field->db_column)
@@ -185,6 +236,9 @@
               <td class="text-center">{!! ($field->show_in_email=='1') ? '<i class="fas fa-check text-success" aria-hidden="true"><span class="sr-only">'.trans('general.yes').'</span></i>' : '<i class="fas fa-times text-danger" aria-hidden="true"><span class="sr-only">'.trans('general.no').'</span></i>'  !!}</td>
               <td class="text-center">{!! ($field->show_in_requestable_list=='1') ? '<i class="fas fa-check text-success" aria-hidden="true"><span class="sr-only">'.trans('general.yes').'</span></i>' : '<i class="fas fa-times text-danger" aria-hidden="true"><span class="sr-only">'.trans('general.no').'</span></i>'  !!}</td>
               <td class="text-center">{!! ($field->is_unique=='1') ? '<i class="fas fa-check text-success" aria-hidden="true"><span class="sr-only">'.trans('general.yes').'</span></i>' : '<i class="fas fa-times text-danger" aria-hidden="true"><span class="sr-only">'.trans('general.no').'</span></i>'  !!}</td>
+              <td class="text-center">{!! ($field->display_checkin=='1') ? '<i class="fas fa-check text-success" aria-hidden="true"><span class="sr-only">'.trans('general.yes').'</span></i>' : '<i class="fas fa-times text-danger" aria-hidden="true"><span class="sr-only">'.trans('general.no').'</span></i>'  !!}</td>
+              <td class="text-center">{!! ($field->display_checkout=='1') ? '<i class="fas fa-check text-success" aria-hidden="true"><span class="sr-only">'.trans('general.yes').'</span></i>' : '<i class="fas fa-times text-danger" aria-hidden="true"><span class="sr-only">'.trans('general.no').'</span></i>'  !!}</td>
+              <td class="text-center">{!! ($field->display_audit=='1') ? '<i class="fas fa-check text-success" aria-hidden="true"><span class="sr-only">'.trans('general.yes').'</span></i>' : '<i class="fas fa-times text-danger" aria-hidden="true"><span class="sr-only">'.trans('general.no').'</span></i>'  !!}</td>
               <td>{{ $field->element }}</td>
               <td>
                 @foreach($field->fieldset as $fieldset)
@@ -193,7 +247,9 @@
               </td>
               <td>
                 <nobr>
-                  {{ Form::open(array('route' => array('fields.destroy', $field->id), 'method' => 'delete', 'style' => 'display:inline-block')) }}
+                  <form method="POST" action="{{ route('fields.destroy', $field->id) }}" accept-charset="UTF-8" style="display:inline-block">
+                    {{ method_field('DELETE') }}
+                    @csrf
                   @can('update', $field)
                     <a href="{{ route('fields.edit', $field->id) }}" class="btn btn-warning btn-sm" data-tooltip="true" title="{{ trans('general.update') }}">
                       <i class="fas fa-pencil-alt" aria-hidden="true"></i>
@@ -215,14 +271,13 @@
                   @endif
 
                 @endcan
-                  {{ Form::close() }}
+                  </form>
                 </nobr>
               </td>
             </tr>
             @endforeach
           </tbody>
         </table>
-        </div>
       </div><!-- /.box-body -->
     </div><!-- /.box -->
   </div> <!-- /.col-md-9-->
@@ -232,4 +287,14 @@
 @stop
 @section('moar_scripts')
   @include ('partials.bootstrap-table')
+  <script>
+    $(function () {
+      $('th').each(function (index, raw_element) {
+        var element = $(raw_element);
+        if (element.data('tooltip')) {
+          element.tooltip({container: 'body', title: element.data('tooltip')})
+        }
+      });
+    })
+  </script>
 @stop
diff --git a/resources/views/dashboard.blade.php b/resources/views/dashboard.blade.php
index 40255f88b2..d0fa06cf51 100755
--- a/resources/views/dashboard.blade.php
+++ b/resources/views/dashboard.blade.php
@@ -27,115 +27,122 @@
 @endif
 
 <div class="row">
-  <!-- panel -->
-  <div class="col-lg-2 col-xs-6">
-      <a href="{{ route('hardware.index') }}">
-    <!-- small box -->
-    <div class="small-box bg-teal">
-      <div class="inner">
-        <h3>{{ number_format(\App\Models\Asset::AssetsForShow()->count()) }}</h3>
-        <p>{{ strtolower(trans('general.assets')) }}</p>
-      </div>
-      <div class="icon" aria-hidden="true">
-        <i class="fas fa-barcode" aria-hidden="true"></i>
-      </div>
-      @can('index', \App\Models\Asset::class)
-        <a href="{{ route('hardware.index') }}" class="small-box-footer">{{ trans('general.view_all') }} <i class="fa fa-arrow-circle-right" aria-hidden="true"></i></a>
-      @endcan
-    </div>
-      </a>
-  </div><!-- ./col -->
 
-  <div class="col-lg-2 col-xs-6">
-     <a href="{{ route('licenses.index') }}">
-    <!-- small box -->
-    <div class="small-box bg-maroon">
-      <div class="inner">
-        <h3>{{ number_format($counts['license']) }}</h3>
-        <p>{{ strtolower(trans('general.licenses')) }}</p>
-      </div>
-      <div class="icon" aria-hidden="true">
-        <i class="far fa-save"></i>
-      </div>
-        @can('view', \App\Models\License::class)
-          <a href="{{ route('licenses.index') }}" class="small-box-footer">{{ trans('general.view_all') }} <i class="fa fa-arrow-circle-right" aria-hidden="true"></i></a>
-        @endcan
-    </div>
-     </a>
-  </div><!-- ./col -->
+    <!-- panel -->
+    <div class="col-lg-2 col-xs-6">
+        <a href="{{ route('hardware.index') }}">
+            <!-- small hardware box -->
+            <div class="dashboard small-box bg-teal">
+                <div class="inner">
+                    <h3>{{ number_format(\App\Models\Asset::AssetsForShow()->count()) }}</h3>
+                    <p>{{ trans('general.assets') }}</p>
+                </div>
+                <div class="icon" aria-hidden="true">
+                    <x-icon type="assets" />
+                </div>
+                <span class="small-box-footer">
+                    {{ trans('general.view_all') }}
+                    <x-icon type="arrow-circle-right" />
+                </span>
+            </div>
+        </a>
+    </div><!-- ./col -->
+
+    <div class="col-lg-2 col-xs-6">
+        <a href="{{ route('licenses.index') }}" aria-hidden="true">
+            <!-- small license box -->
+            <div class="dashboard small-box bg-maroon">
+                <div class="inner">
+                    <h3>{{ number_format($counts['license']) }}</h3>
+                    <p>{{ trans('general.licenses') }}</p>
+                </div>
+                <div class="icon" aria-hidden="true">
+                    <x-icon type="licenses" />
+                </div>
+                <span class="small-box-footer">
+                    {{ trans('general.view_all') }}
+                    <x-icon type="arrow-circle-right" />
+                </span>
+            </div>
+        </a>
+    </div><!-- ./col -->
 
 
-  <div class="col-lg-2 col-xs-6">
-    <!-- small box -->
-      <a href="{{ route('accessories.index') }}">
-    <div class="small-box bg-orange">
-      <div class="inner">
-        <h3> {{ number_format($counts['accessory']) }}</h3>
-        <p>{{ strtolower(trans('general.accessories')) }}</p>
-      </div>
-      <div class="icon" aria-hidden="true">
-        <i class="far fa-keyboard"></i>
-      </div>
-      @can('index', \App\Models\Accessory::class)
-          <a href="{{ route('accessories.index') }}" class="small-box-footer">{{ trans('general.view_all') }} <i class="fa fa-arrow-circle-right" aria-hidden="true"></i></a>
-      @endcan
-    </div>
-      </a>
-  </div><!-- ./col -->
+    <div class="col-lg-2 col-xs-6">
+    <!-- small accessories box -->
+        <a href="{{ route('accessories.index') }}">
+            <div class="dashboard small-box bg-orange">
+                <div class="inner">
+                    <h3> {{ number_format($counts['accessory']) }}</h3>
+                    <p>{{ trans('general.accessories') }}</p>
+                </div>
+                <div class="icon" aria-hidden="true">
+                    <x-icon type="accessories" />
+                </div>
+                <span class="small-box-footer">
+                    {{ trans('general.view_all') }}
+                <x-icon type="arrow-circle-right" />
+                </span>
+            </div>
+        </a>
+    </div><!-- ./col -->
 
-  <div class="col-lg-2 col-xs-6">
-    <!-- small box -->
+    <div class="col-lg-2 col-xs-6">
+    <!-- small consumables box -->
+        <a href="{{ route('consumables.index') }}">
+            <div class="dashboard small-box bg-purple">
+                <div class="inner">
+                    <h3> {{ number_format($counts['consumable']) }}</h3>
+                    <p>{{ trans('general.consumables') }}</p>
+                </div>
+                <div class="icon" aria-hidden="true">
+                    <x-icon type="consumables" />
+                </div>
+                <span class="small-box-footer">
+                    {{ trans('general.view_all') }}
+                    <x-icon type="arrow-circle-right" />
+                </span>
+            </div>
+        </a>
+    </div><!-- ./col -->
 
-      <a href="{{ route('consumables.index') }}">
-    <div class="small-box bg-purple">
-      <div class="inner">
-        <h3> {{ number_format($counts['consumable']) }}</h3>
-        <p>{{ strtolower(trans('general.consumables')) }}</p>
-      </div>
-      <div class="icon" aria-hidden="true">
-        <i class="fas fa-tint"></i>
-      </div>
-      @can('index', \App\Models\Consumable::class)
-        <a href="{{ route('consumables.index') }}" class="small-box-footer">{{ trans('general.view_all') }} <i class="fa fa-arrow-circle-right" aria-hidden="true"></i></a>
-      @endcan
-    </div>
-  </div><!-- ./col -->
+    <div class="col-lg-2 col-xs-6">
+        <!-- small components box -->
+        <a href="{{ route('components.index') }}">
+            <div class="dashboard small-box bg-yellow">
+                <div class="inner">
+                    <h3>{{ number_format($counts['component']) }}</h3>
+                    <p>{{ trans('general.components') }}</p>
+                </div>
+                <div class="icon" aria-hidden="true">
+                    <x-icon type="components" />
+                </div>
+                <span class="small-box-footer">
+                    {{ trans('general.view_all') }}
+                    <x-icon type="arrow-circle-right" />
+                </span>
+            </div>
+        </a>
+    </div><!-- ./col -->
 
-  <div class="col-lg-2 col-xs-6">
-    <a href="{{ route('components.index') }}">
-   <!-- small box -->
-   <div class="small-box bg-yellow">
-     <div class="inner">
-       <h3>{{ number_format($counts['component']) }}</h3>
-       <p>{{ strtolower(trans('general.components')) }}</p>
-     </div>
-     <div class="icon" aria-hidden="true">
-       <i class="far fa-hdd"></i>
-     </div>
-       @can('view', \App\Models\License::class)
-         <a href="{{ route('components.index') }}" class="small-box-footer">{{ trans('general.view_all') }} <i class="fa fa-arrow-circle-right" aria-hidden="true"></i></a>
-       @endcan
-   </div>
-    </a>
- </div><!-- ./col -->
-
- <div class="col-lg-2 col-xs-6">
-    <a href="{{ route('users.index') }}">
-   <!-- small box -->
-   <div class="small-box bg-light-blue">
-     <div class="inner">
-       <h3>{{ number_format($counts['user']) }}</h3>
-       <p>{{ strtolower(trans('general.people')) }}</p>
-     </div>
-     <div class="icon" aria-hidden="true">
-       <i class="fas fa-users"></i>
-     </div>
-       @can('view', \App\Models\License::class)
-         <a href="{{ route('users.index') }}" class="small-box-footer">{{ trans('general.view_all') }} <i class="fa fa-arrow-circle-right" aria-hidden="true"></i></a>
-       @endcan
-   </div>
-    </a>
- </div><!-- ./col -->
+    <div class="col-lg-2 col-xs-6">
+        <!-- small users box -->
+        <a href="{{ route('users.index') }}">
+            <div class="dashboard small-box bg-light-blue">
+                <div class="inner">
+                    <h3>{{ number_format($counts['user']) }}</h3>
+                    <p>{{ trans('general.people') }}</p>
+                </div>
+                <div class="icon" aria-hidden="true">
+                    <x-icon type="users" />
+                </div>
+                <span class="small-box-footer">
+                    {{ trans('general.view_all') }}
+                    <x-icon type="arrow-circle-right" />
+                </span>
+            </div>
+        </a>
+    </div><!-- ./col -->
 
 </div>
 </div>
@@ -165,26 +172,36 @@
                         </div>
                     </div>
                     <div class="row">
-                        <div class="col-md-3">
+                        <div class="col-md-2">
                             @can('create', \App\Models\Asset::class)
                             <a class="btn bg-teal" style="width: 100%" href="{{ route('hardware.create') }}">{{ trans('general.new_asset') }}</a>
                             @endcan
                         </div>
-                        <div class="col-md-3">
+                        <div class="col-md-2">
                             @can('create', \App\Models\License::class)
                                 <a class="btn bg-maroon" style="width: 100%" href="{{ route('licenses.create') }}">{{ trans('general.new_license') }}</a>
                             @endcan
                         </div>
-                        <div class="col-md-3">
+                        <div class="col-md-2">
                             @can('create', \App\Models\Accessory::class)
                                 <a class="btn bg-orange" style="width: 100%" href="{{ route('accessories.create') }}">{{ trans('general.new_accessory') }}</a>
                             @endcan
                         </div>
-                        <div class="col-md-3">
+                        <div class="col-md-2">
                             @can('create', \App\Models\Consumable::class)
                                 <a class="btn bg-purple" style="width: 100%" href="{{ route('consumables.create') }}">{{ trans('general.new_consumable') }}</a>
                             @endcan
                         </div>
+                        <div class="col-md-2">
+                            @can('create', \App\Models\Component::class)
+                                <a class="btn bg-yellow" style="width: 100%" href="{{ route('components.create') }}">{{ trans('general.new_component') }}</a>
+                            @endcan
+                        </div>
+                        <div class="col-md-2">
+                            @can('create', \App\Models\User::class)
+                                <a class="btn bg-light-blue" style="width: 100%" href="{{ route('users.create') }}">{{ trans('general.new_user') }}</a>
+                            @endcan
+                        </div>
                     </div>
                 </div>
             </div>
@@ -201,7 +218,7 @@
         <h2 class="box-title">{{ trans('general.recent_activity') }}</h2>
         <div class="box-tools pull-right">
             <button type="button" class="btn btn-box-tool" data-widget="collapse" aria-hidden="true">
-                <i class="fas fa-minus" aria-hidden="true"></i>
+                <x-icon type="minus" />
                 <span class="sr-only">{{ trans('general.collapse') }}</span>
             </button>
         </div>
@@ -226,7 +243,7 @@
                     <tr>
                         <th data-field="icon" data-visible="true" style="width: 40px;" class="hidden-xs" data-formatter="iconFormatter"><span  class="sr-only">{{ trans('admin/hardware/table.icon') }}</span></th>
                         <th class="col-sm-3" data-visible="true" data-field="created_at" data-formatter="dateDisplayFormatter">{{ trans('general.date') }}</th>
-                        <th class="col-sm-2" data-visible="true" data-field="admin" data-formatter="usersLinkObjFormatter">{{ trans('general.admin') }}</th>
+                        <th class="col-sm-2" data-visible="true" data-field="admin" data-formatter="usersLinkObjFormatter">{{ trans('general.created_by') }}</th>
                         <th class="col-sm-2" data-visible="true" data-field="action_type">{{ trans('general.action') }}</th>
                         <th class="col-sm-3" data-visible="true" data-field="item" data-formatter="polymorphicItemFormatter">{{ trans('general.item') }}</th>
                         <th class="col-sm-2" data-visible="true" data-field="target" data-formatter="polymorphicItemFormatter">{{ trans('general.target') }}</th>
@@ -253,7 +270,7 @@
                 </h2>
                 <div class="box-tools pull-right">
                     <button type="button" class="btn btn-box-tool" data-widget="collapse" aria-hidden="true">
-                        <i class="fas fa-minus" aria-hidden="true"></i>
+                        <x-icon type="minus" />
                         <span class="sr-only">{{ trans('general.collapse') }}</span>
                     </button>
                 </div>
@@ -275,14 +292,14 @@
 <div class="row">
     <div class="col-md-6">
 
-		@if ($snipeSettings->full_multiple_companies_support=='1')
+		@if ((($snipeSettings->scope_locations_fmcs!='1') && ($snipeSettings->full_multiple_companies_support=='1')))
 			 <!-- Companies -->	
 			<div class="box box-default">
 				<div class="box-header with-border">
 					<h2 class="box-title">{{ trans('general.companies') }}</h2>
 					<div class="box-tools pull-right">
 						<button type="button" class="btn btn-box-tool" data-widget="collapse">
-							<i class="fas fa-minus" aria-hidden="true"></i>
+                            <x-icon type="minus" />
 							<span class="sr-only">{{ trans('general.collapse') }}</span>
 						</button>
 					</div>
@@ -307,27 +324,27 @@
 								<tr>
 									<th class="col-sm-3" data-visible="true" data-field="name" data-formatter="companiesLinkFormatter" data-sortable="true">{{ trans('general.name') }}</th>
 									<th class="col-sm-1" data-visible="true" data-field="users_count" data-sortable="true">
-										<i class="fas fa-users" aria-hidden="true"></i>
+                                        <x-icon type="users" />
 										<span class="sr-only">{{ trans('general.people') }}</span>
 									</th>
 									<th class="col-sm-1" data-visible="true" data-field="assets_count" data-sortable="true">
-										<i class="fas fa-barcode" aria-hidden="true"></i>
+                                        <x-icon type="assets" />
 										<span class="sr-only">{{ trans('general.asset_count') }}</span>
 									</th>
 									<th class="col-sm-1" data-visible="true" data-field="accessories_count" data-sortable="true">
-										<i class="far fa-keyboard" aria-hidden="true"></i>
+                                        <x-icon type="accessories" />
 										<span class="sr-only">{{ trans('general.accessories_count') }}</span>
 									</th>
 									<th class="col-sm-1" data-visible="true" data-field="consumables_count" data-sortable="true">
-										<i class="fas fa-tint" aria-hidden="true"></i>
+                                        <x-icon type="consumables" />
 										<span class="sr-only">{{ trans('general.consumables_count') }}</span>
 									</th>
 									<th class="col-sm-1" data-visible="true" data-field="components_count" data-sortable="true">
-										<i class="far fa-hdd" aria-hidden="true"></i>
+                                        <x-icon type="components" />
 										<span class="sr-only">{{ trans('general.components_count') }}</span>
 									</th>
 									<th class="col-sm-1" data-visible="true" data-field="licenses_count" data-sortable="true">
-										<i class="far fa-save" aria-hidden="true"></i>
+                                        <x-icon type="licenses" />
 										<span class="sr-only">{{ trans('general.licenses_count') }}</span>
 									</th>
 								</tr>
@@ -350,7 +367,7 @@
 					<h2 class="box-title">{{ trans('general.locations') }}</h2>
 					<div class="box-tools pull-right">
 						<button type="button" class="btn btn-box-tool" data-widget="collapse">
-							<i class="fas fa-minus" aria-hidden="true"></i>
+                            <x-icon type="minus" />
 							<span class="sr-only">{{ trans('general.collapse') }}</span>
 						</button>
 					</div>
@@ -376,7 +393,7 @@
 									<th class="col-sm-3" data-visible="true" data-field="name" data-formatter="locationsLinkFormatter" data-sortable="true">{{ trans('general.name') }}</th>
 									
 									<th class="col-sm-1" data-visible="true" data-field="assets_count" data-sortable="true">
-										<i class="fas fa-barcode" aria-hidden="true"></i>
+                                        <x-icon type="assets" />
 										<span class="sr-only">{{ trans('general.asset_count') }}</span>
 									</th>
 									<th class="col-sm-1" data-visible="true" data-field="assigned_assets_count" data-sortable="true">
@@ -384,7 +401,7 @@
 										{{ trans('general.assigned') }}
 									</th>
 									<th class="col-sm-1" data-visible="true" data-field="users_count" data-sortable="true">
-										<i class="fas fa-users" aria-hidden="true"></i>
+                                        <x-icon type="users" />
 										<span class="sr-only">{{ trans('general.people') }}</span>
 										
 									</th>
@@ -413,7 +430,7 @@
                 <h2 class="box-title">{{ trans('general.asset') }} {{ trans('general.categories') }}</h2>
                 <div class="box-tools pull-right">
                     <button type="button" class="btn btn-box-tool" data-widget="collapse">
-                        <i class="fas fa-minus" aria-hidden="true"></i>
+                        <x-icon type="minus" />
                         <span class="sr-only">{{ trans('general.collapse') }}</span>
                     </button>
                 </div>
@@ -441,23 +458,23 @@
                                     {{ trans('general.type') }}
                                 </th>
                                 <th class="col-sm-1" data-visible="true" data-field="assets_count" data-sortable="true">
-                                    <i class="fas fa-barcode" aria-hidden="true"></i>
+                                    <x-icon type="assets" />
                                     <span class="sr-only">{{ trans('general.asset_count') }}</span>
                                 </th>
                                 <th class="col-sm-1" data-visible="true" data-field="accessories_count" data-sortable="true">
-                                    <i class="far fa-keyboard" aria-hidden="true"></i>
+                                    <x-icon type="licenses" />
                                     <span class="sr-only">{{ trans('general.accessories_count') }}</span>
                                 </th>
                                 <th class="col-sm-1" data-visible="true" data-field="consumables_count" data-sortable="true">
-                                    <i class="fas fa-tint" aria-hidden="true"></i>
+                                    <x-icon type="consumables" />
                                     <span class="sr-only">{{ trans('general.consumables_count') }}</span>
                                 </th>
                                 <th class="col-sm-1" data-visible="true" data-field="components_count" data-sortable="true">
-                                    <i class="far fa-hdd" aria-hidden="true"></i>
+                                    <x-icon type="components" />
                                     <span class="sr-only">{{ trans('general.components_count') }}</span>
                                 </th>
                                 <th class="col-sm-1" data-visible="true" data-field="licenses_count" data-sortable="true">
-                                    <i class="far fa-save" aria-hidden="true"></i>
+                                    <x-icon type="licenses" />
                                     <span class="sr-only">{{ trans('general.licenses_count') }}</span>
                                 </th>
                             </tr>
diff --git a/resources/views/departments/edit.blade.php b/resources/views/departments/edit.blade.php
index c1a2b38d56..05d9b49e4c 100644
--- a/resources/views/departments/edit.blade.php
+++ b/resources/views/departments/edit.blade.php
@@ -26,6 +26,20 @@
     @include ('partials.forms.edit.location-select', ['translated_name' => trans('general.location'), 'fieldname' => 'location_id'])
     @include ('partials.forms.edit.image-upload', ['image_path' => app('departments_upload_path')])
 
+    <div class="form-group{!! $errors->has('notes') ? ' has-error' : '' !!}">
+        <label for="notes" class="col-md-3 control-label">{{ trans('general.notes') }}</label>
+        <div class="col-md-8">
+            <x-input.textarea
+                    name="notes"
+                    id="notes"
+                    :value="old('notes', $item->notes)"
+                    placeholder="{{ trans('general.placeholders.notes') }}"
+                    aria-label="notes"
+                    rows="5"
+            />
+            {!! $errors->first('notes', '<span class="alert-msg" aria-hidden="true"><i class="fas fa-times" aria-hidden="true"></i> :message</span>') !!}
+        </div>
+    </div>
 
 @stop
 
diff --git a/resources/views/departments/index.blade.php b/resources/views/departments/index.blade.php
index fcdd236004..2dbeaa7bbc 100644
--- a/resources/views/departments/index.blade.php
+++ b/resources/views/departments/index.blade.php
@@ -16,13 +16,13 @@
         <div class="col-md-12">
             <div class="box box-default">
                 <div class="box-body">
-                    <div class="table-responsive">
-
                         <table
                                 data-cookie-id-table="departmentsTable"
                                 data-pagination="true"
                                 data-id-table="departmentsTable"
                                 data-search="true"
+                                data-search-highlight="true"
+                                data-show-print="true"
                                 data-side-pagination="server"
                                 data-show-columns="true"
                                 data-show-fullscreen="true"
@@ -45,12 +45,12 @@
                                 <th data-sortable="true" data-formatter="usersLinkObjFormatter" data-field="manager" data-searchable="false">{{ trans('admin/departments/table.manager') }}</th>
                                 <th data-sortable="true" data-field="users_count" data-searchable="false">{{ trans('general.users') }}</th>
                                 <th data-sortable="true" data-formatter="locationsLinkObjFormatter" data-field="location" data-searchable="false">{{ trans('admin/departments/table.location') }}</th>
+                                <th data-sortable="true" data-field="notes" data-searchable="true">{{ trans('general.notes') }}</th>
                                 <th data-sortable="false" data-formatter="departmentsActionsFormatter" data-field="actions" data-searchable="false">{{ trans('table.actions') }}</th>
 
                             </tr>
                             </thead>
                         </table>
-                    </div>
                 </div>
             </div>
         </div>
diff --git a/resources/views/departments/view.blade.php b/resources/views/departments/view.blade.php
index 9848f9e4c8..3bf91e9d0d 100644
--- a/resources/views/departments/view.blade.php
+++ b/resources/views/departments/view.blade.php
@@ -29,6 +29,8 @@
                                         data-pagination="true"
                                         data-id-table="departmentsUsersTable"
                                         data-search="true"
+                                        data-search-highlight="true"
+                                        data-show-print="true"
                                         data-show-footer="true"
                                         data-side-pagination="server"
                                         data-show-columns="true"
diff --git a/resources/views/depreciations/edit.blade.php b/resources/views/depreciations/edit.blade.php
index a3f5b339b1..f86e484f81 100755
--- a/resources/views/depreciations/edit.blade.php
+++ b/resources/views/depreciations/edit.blade.php
@@ -15,9 +15,9 @@
     <label for="months" class="col-md-3 control-label">
         {{ trans('admin/depreciations/general.number_of_months') }}
     </label>
-    <div class="col-md-7 col-sm-12 {{  (Helper::checkIfRequired($item, 'months')) ? ' required' : '' }}">
+    <div class="col-md-7 col-sm-12">
         <div class="col-md-7" style="padding-left:0px">
-            <input class="form-control" type="text" name="months" id="months" value="{{ Request::old('months', $item->months) }}" style="width: 80px;"{!!  (\App\Helpers\Helper::checkIfRequired($item, 'months')) ? ' required' : '' !!} />
+            <input class="form-control" type="number" min="0" max="3600" name="months" id="months" value="{{ old('months', $item->months) }}" style="width: 80px;"{!!  (\App\Helpers\Helper::checkIfRequired($item, 'months')) ? ' required' : '' !!} />
             {!! $errors->first('months', '<span class="alert-msg" aria-hidden="true"><i class="fa fa-times" aria-hidden="true"></i> :message</span>') !!}
         </div>
     </div>
@@ -28,9 +28,13 @@
     <label for="depreciation_min" class="col-md-3 control-label">
         {{ trans('admin/depreciations/general.depreciation_min') }}
     </label>
-    <div class="col-md-2" style="padding-left:0px">
-        <input class="form-control"  name="depreciation_min" id="depreciation_min" value="{{ Request::old('depreciation_min', $item->depreciation_min) }}" style="width: 80px; margin-left:15px" />
+    <div class="col-md-2" style="display: flex;">
+        <input class="form-control" name="depreciation_min" id="depreciation_min" required type="number" value="{{ old('depreciation_min', $item->depreciation_min) }}" style="width: 80px; margin-right: 15px; display: inline-block;" />
+        <select class="form-control select2" name="depreciation_type" id="depreciation_type" data-minimum-results-for-search="Infinity" style="width: 150px; display: inline-block;">
+            <option value="amount" {{ old('depreciation_type', $item->depreciation_type) == 'amount' ? 'selected' : '' }}>Amount</option>
+            <option value="percent" {{ old('depreciation_type', $item->depreciation_type) == 'percent' ? 'selected' : '' }}>Percentage</option>
+        </select>
     </div>
-    {!! $errors->first('depreciation_min', '<span class="alert-msg" aria-hidden="true"><i class="fas fa-times" aria-hidden="true"></i> :message</span>') !!}
+    {!! $errors->first('depreciation_min', '<span class="col-md-7 col-md-offset-3 alert-msg" aria-hidden="true"><i class="fas fa-times" aria-hidden="true"></i> :message</span>') !!}
 </div>
 @stop
diff --git a/resources/views/depreciations/index.blade.php b/resources/views/depreciations/index.blade.php
index e71063771f..b8967f915f 100755
--- a/resources/views/depreciations/index.blade.php
+++ b/resources/views/depreciations/index.blade.php
@@ -19,14 +19,14 @@
   <div class="col-md-9">
     <div class="box box-default">
       <div class="box-body">
-        <div class="table-responsive">
-
           <table
                   data-columns="{{ \App\Presenters\DepreciationPresenter::dataTableLayout() }}"
                   data-cookie-id-table="depreciationsTable"
                   data-pagination="true"
                   data-id-table="depreciationsTable"
                   data-search="true"
+                  data-search-highlight="true"
+                  data-show-print="true"
                   data-side-pagination="server"
                   data-show-columns="true"
                   data-show-export="true"
@@ -39,9 +39,7 @@
                     "fileName": "export-depreciations-{{ date('Y-m-d') }}",
                     "ignoreColumn": ["actions","image","change","checkbox","checkincheckout","icon"]
                     }'>
-
           </table>
-        </div>
       </div>
     </div>
   </div> <!-- /.col-md-9-->
diff --git a/resources/views/depreciations/view.blade.php b/resources/views/depreciations/view.blade.php
index d075a31e95..cac74f0318 100644
--- a/resources/views/depreciations/view.blade.php
+++ b/resources/views/depreciations/view.blade.php
@@ -30,15 +30,38 @@
             <!-- Custom Tabs -->
             <div class="nav-tabs-custom">
                 <ul class="nav nav-tabs">
-                    <li class="active"><a href="#assets" data-toggle="tab">{{ trans('general.assets') }}</a></li>
-                    <li><a href="#licenses" data-toggle="tab">{{ trans('general.licenses') }}</a></li>
-                    <li><a href="#models" data-toggle="tab">{{ trans('general.asset_models') }}</a></li>
-                    </ul>
+                    <li class="active">
+                        <a href="#assets" data-toggle="tab">
+                            {{ trans('general.assets') }}
+
+                            {!! ($depreciation->assets()->AssetsForShow()->count() > 0 ) ? '<badge class="badge badge-secondary">'.number_format($depreciation->assets()->AssetsForShow()->count()).'</badge>' : '' !!}
+                        </a>
+                    </li>
+                    <li>
+                        <a href="#licenses" data-toggle="tab">
+                            {{ trans('general.licenses') }}
+
+                            {!! ($depreciation->licenses_count > 0 ) ? '<badge class="badge badge-secondary">'.number_format($depreciation->licenses_count).'</badge>' : '' !!}
+                        </a>
+                    </li>
+                    <li>
+                        <a href="#models" data-toggle="tab">
+                            {{ trans('general.asset_models') }}
+
+                            {!! ($depreciation->models_count > 0 ) ? '<badge class="badge badge-secondary">'.number_format($depreciation->models_count).'</badge>' : '' !!}
+                        </a>
+                    </li>
+                </ul>
 
                 <div class="tab-content">
 
                     <div class="tab-pane active" id="assets">
 
+                        @include('partials.asset-bulk-actions', [
+                                'id_divname' => 'assetsBulkEditToolbar',
+                                'id_formname' => 'assetsBulkForm',
+                                'id_button' => 'assetEditButton'
+                                ])
 
                         <table
                                 data-columns="{{ \App\Presenters\AssetPresenter::dataTableLayout() }}"
@@ -47,12 +70,18 @@
                                 id="depreciationsAssetTable"
                                 data-pagination="true"
                                 data-search="true"
+                                data-search-highlight="true"
+                                data-show-print="true"
                                 data-side-pagination="server"
                                 data-show-columns="true"
                                 data-show-export="true"
                                 data-show-refresh="true"
                                 data-sort-order="asc"
                                 data-sort-name="name"
+                                data-toolbar="#assetsBulkEditToolbar"
+                                data-bulk-button-id="#assetEditButton"
+                                data-bulk-form-id="#assetsBulkForm"
+                                data-click-to-select="true"
                                 class="table table-striped snipe-table"
                                 data-url="{{ route('api.assets.index',['depreciation_id'=> $depreciation->id]) }}"
                                 data-export-options='{
@@ -77,6 +106,8 @@
                                             id="depreciationsLicenseTable"
                                             data-pagination="true"
                                             data-search="true"
+                                            data-search-highlight="true"
+                                            data-show-print="true"
                                             data-side-pagination="server"
                                             data-show-columns="true"
                                             data-show-export="true"
@@ -102,13 +133,8 @@
                     <div class="tab-pane" id="models">
 
                         <div class="row">
-                            {{ Form::open(
-                                      [
-                                     'method' => 'POST',
-                                     'route' => ['models.bulkedit.index'],
-                                     'class' => 'form-inline',
-                                      'id' => 'bulkForm']
-                                      ) }}
+                            <form method="POST" action="{{ route('models.bulkedit.index') }}" accept-charset="UTF-8" class="form-inline" id="bulkForm">
+                            @csrf
                             <div class="col-md-12">
                                 <div id="toolbar">
                                     <label for="bulk_actions" class="sr-only">{{ trans('general.bulk_actions') }}</label>
@@ -116,7 +142,7 @@
                                         <option value="edit">{{ trans('general.bulk_edit') }}</option>
                                         <option value="delete">{{ trans('general.bulk_delete') }}</option>
                                     </select>
-                                    <button class="btn btn-primary" id="bulkEdit" disabled>{{ trans('button.go') }}</button>
+                                    <button class="btn btn-primary" id="AssetModelsBulkEditButton" disabled>{{ trans('button.go') }}</button>
                                 </div>
 
                                 <div class="table-responsive">
@@ -127,6 +153,8 @@
                                             id="depreciationsModelsTable"
                                             data-pagination="true"
                                             data-search="true"
+                                            data-search-highlight="true"
+                                            data-show-print="true"
                                             data-toolbar="#toolbar"
                                             data-side-pagination="server"
                                             data-show-columns="true"
@@ -134,6 +162,9 @@
                                             data-show-refresh="true"
                                             data-sort-order="asc"
                                             data-sort-name="name"
+                                            data-bulk-button-id="#AssetModelsBulkEditButton"
+                                            data-bulk-form-id="#bulkForm"
+                                            data-click-to-select="true"
                                             class="table table-striped snipe-table"
                                             data-url="{{ route('api.models.index',['depreciation_id'=> $depreciation->id]) }}"
                                             data-export-options='{
@@ -146,7 +177,7 @@
                                 </div>
 
                             </div>
-                            {{ Form::close() }}
+                            </form>
 
                         </div> <!--/.row-->
                     </div> <!-- /.tab-pane -->
diff --git a/resources/views/errors/403.blade.php b/resources/views/errors/403.blade.php
index e2a8642ca6..1196f69994 100644
--- a/resources/views/errors/403.blade.php
+++ b/resources/views/errors/403.blade.php
@@ -18,7 +18,7 @@
     <div style="padding-top: 200px">
       <img src="{{ config('app.url') }}/img/sad-panda.png" style="width: 200px; height: 200px;" class="pull-left">
             <div class="error-content">
-              <h2><i class="fas fa-exclamation-triangle text-yellow"></i> 403 Forbidden.</h2>
+              <h2><x-icon type="warning" class="text-yellow" /> 403 Forbidden.</h2>
               <p>
                 {!! trans('general.sad_panda', ['link' => config('app.url')]) !!}
               </p>
diff --git a/resources/views/errors/404.blade.php b/resources/views/errors/404.blade.php
index 77d7c32521..d0406aaea5 100644
--- a/resources/views/errors/404.blade.php
+++ b/resources/views/errors/404.blade.php
@@ -16,9 +16,9 @@
   <div class="col-md-8 col-md-offset-2">
 
     <div style="padding-top: 200px">
-      <img src="{{ config('app.url') }}/img/sad-panda.png" style="width: 200px; height: 200px;" class="pull-left">
+      <img src="{{ config('app.url') }}/img/sad-panda.png" style="width: 200px; height: 200px;" class="pull-left" alt="Sad Panda cartoon" />
             <div class="error-content">
-              <h2><i class="fas fa-exclamation-triangle text-yellow"></i> 404 Page not found.</h2>
+              <h2><x-icon type="warning" class="text-yellow" /> 404 Page not found.</h2>
               <p>
                 Sad panda. We could not find the page you were looking for.
                 You should maybe <a href="{{ config('app.url') }}">return to the dashboard</a>.
diff --git a/resources/views/errors/503.blade.php b/resources/views/errors/503.blade.php
index 4adb020d4e..c3af4644a2 100644
--- a/resources/views/errors/503.blade.php
+++ b/resources/views/errors/503.blade.php
@@ -20,7 +20,7 @@
 
       <div class="box-header with-border">
         <h1 class="box-title">
-          <i class="fas fa-exclamation-triangle text-orange" aria-hidden="true"></i>
+          <x-icon type="warning" class="text-orange" />
           {{ trans('general.maintenance_mode_title') }}
         </h1>
       </div><!-- /.box-header -->
diff --git a/resources/views/groups/edit.blade.php b/resources/views/groups/edit.blade.php
index cb95b3762a..4c387f73ef 100755
--- a/resources/views/groups/edit.blade.php
+++ b/resources/views/groups/edit.blade.php
@@ -54,12 +54,29 @@
 @section('inputFields')
 <!-- Name -->
 <div class="form-group {{ $errors->has('name') ? ' has-error' : '' }}">
-    <label for="name" class="col-md-3 control-label">{{ trans('admin/groups/titles.group_name') }}</label>
-    <div class="col-md-6 required">
-        <input class="form-control" type="text" name="name" id="name" value="{{ old('name', $group->name) }}" />
+    <label for="name" class="col-md-2 control-label">{{ trans('admin/groups/titles.group_name') }}</label>
+    <div class="col-md-9 required">
+        <input class="form-control" type="text" name="name" id="name" value="{{ old('name', $group->name) }}" required />
         {!! $errors->first('name', '<span class="alert-msg" aria-hidden="true"><i class="fas fa-times" aria-hidden="true"></i> :message</span>') !!}
     </div>
 </div>
+
+<div class="form-group{!! $errors->has('notes') ? ' has-error' : '' !!}">
+    <label for="notes" class="col-md-2 control-label">{{ trans('general.notes') }}</label>
+    <div class="col-md-9">
+        <x-input.textarea
+                name="notes"
+                id="notes"
+                :value="old('notes', $group->notes)"
+                placeholder="{{ trans('general.placeholders.notes') }}"
+                aria-label="notes"
+                rows="2"
+        />
+
+        {!! $errors->first('notes', '<span class="alert-msg" aria-hidden="true"><i class="fas fa-times" aria-hidden="true"></i> :message</span>') !!}
+    </div>
+</div>
+
 <div class="col-md-12">
 
     <table class="table table-striped permissions">
@@ -88,11 +105,23 @@
                     </td>
                     <td class="col-md-1 permissions-item">
                         <label for="{{ 'permission['.$localPermission['permission'].']' }}" style="form-control"><span class="sr-only">{{ trans('admin/groups/titles.allow')}} {{ 'permission['.$localPermission['permission'].']' }}</span></label>
-                        {{ Form::radio('permission['.$localPermission['permission'].']', '1',(array_key_exists($localPermission['permission'], $groupPermissions) ? $groupPermissions[$localPermission['permission'] ] == '1' : null),['value'=>"grant", 'aria-label'=> 'permission['.$localPermission['permission'].']']) }}
+                        <input
+                            value="1"
+                            aria-label="permission[{{ $localPermission['permission'] }}]"
+                            @checked(array_key_exists($localPermission['permission'], $groupPermissions) && $groupPermissions[$localPermission['permission']] == '1')
+                            name="permission[{{ $localPermission['permission'] }}]"
+                            type="radio"
+                        >
                     </td>
                     <td class="col-md-1 permissions-item">
                         <label for="{{ 'permission['.$localPermission['permission'].']' }}"><span class="sr-only">{{ trans('admin/groups/titles.deny')}} {{ 'permission['.$localPermission['permission'].']' }}</span></label>
-                        {{ Form::radio('permission['.$localPermission['permission'].']', '0',(array_key_exists($localPermission['permission'], $groupPermissions) ? $groupPermissions[$localPermission['permission'] ] == '0' : null),['value'=>"grant", 'aria-label'=> 'permission['.$localPermission['permission'].']']) }}
+                        <input
+                            value="0"
+                            aria-label="permission[{{ $localPermission['permission'] }}]"
+                            @checked(array_key_exists($localPermission['permission'], $groupPermissions) && $groupPermissions[$localPermission['permission']] == '0')
+                            name="permission[{{ $localPermission['permission'] }}]"
+                            type="radio"
+                        >
                     </td>
                 </tr>
             </tbody>
@@ -109,11 +138,23 @@
                     </td>
                     <td class="col-md-1 permissions-item" style="vertical-align: bottom">
                         <label for="{{ $area }}"><span class="sr-only">{{ trans('admin/groups/titles.allow')}} {{ $area }}</span></label>
-                        {{ Form::radio("$area", '1',false,['value'=>"grant",  'data-checker-group' => str_slug($area), 'aria-label'=> $area]) }}
+                        <input
+                            value="1"
+                            data-checker-group="{{ str_slug($area) }}"
+                            aria-label="{{ $area }}"
+                            name="{{ $area }}"
+                            type="radio"
+                        >
                     </td>
                     <td class="col-md-1 permissions-item">
                         <label for="{{ $area }}"><span class="sr-only">{{ trans('admin/groups/titles.deny')}} {{ $area }}</span></label>
-                        {{ Form::radio("$area", '0',false,['value'=>"deny", 'data-checker-group' => str_slug($area), 'aria-label'=> $area]) }}
+                        <input
+                            value="0"
+                            data-checker-group="{{ str_slug($area) }}"
+                            aria-label="{{ $area }}"
+                            name="{{ $area }}"
+                            type="radio"
+                        >
                     </td>
                 </tr>
 
@@ -129,11 +170,25 @@
                         </td>
                         <td class="col-md-1 permissions-item">
                             <label for="{{ 'permission['.$this_permission['permission'].']' }}"><span class="sr-only">{{ trans('admin/groups/titles.allow')}} {{ 'permission['.$this_permission['permission'].']' }}</span></label>
-                            {{ Form::radio('permission['.$this_permission['permission'].']', '1',(array_key_exists($this_permission['permission'], $groupPermissions) ? $groupPermissions[$this_permission['permission'] ] == '1' : null),['class'=>'radiochecker-'.str_slug($area), 'aria-label'=>'permission['.$this_permission['permission'].']']) }}
+                            <input
+                                class="radiochecker-{{ str_slug($area) }}"
+                                aria-label="permission[{{ $this_permission['permission'] }}]"
+                                @checked(array_key_exists($this_permission['permission'], $groupPermissions) && $groupPermissions[$this_permission['permission']] == '1')
+                                name="permission[{{ $this_permission['permission'] }}]"
+                                type="radio"
+                                value="1"
+                            >
                         </td>
                         <td class="col-md-1 permissions-item">
                             <label for="{{ 'permission['.$this_permission['permission'].']' }}"><span class="sr-only">{{ trans('admin/groups/titles.deny')}} {{ 'permission['.$this_permission['permission'].']' }}</span></label>
-                            {{ Form::radio('permission['.$this_permission['permission'].']', '0',(array_key_exists($this_permission['permission'], $groupPermissions) ? $groupPermissions[$this_permission['permission'] ] == '0' : null),['class'=>'radiochecker-'.str_slug($area), 'aria-label'=>'permission['.$this_permission['permission'].']']) }}
+                            <input
+                                class="radiochecker-{{ str_slug($area) }}"
+                                aria-label="permission[{{ $this_permission['permission'] }}]"
+                                @checked(array_key_exists($this_permission['permission'], $groupPermissions) && $groupPermissions[$this_permission['permission']] == '0')
+                                name="permission[{{ $this_permission['permission'] }}]"
+                                type="radio"
+                                value="0"
+                            >
                         </td>
 
                     </tr>
diff --git a/resources/views/groups/index.blade.php b/resources/views/groups/index.blade.php
index 49d7d768b9..dd78b4dbb5 100755
--- a/resources/views/groups/index.blade.php
+++ b/resources/views/groups/index.blade.php
@@ -24,6 +24,8 @@
                 data-cookie-id-table="groupsTable"
                 data-pagination="true"
                 data-search="true"
+                data-search-highlight="true"
+                data-show-print="true"
                 data-side-pagination="server"
                 data-show-columns="true"
                 data-show-export="true"
@@ -43,9 +45,10 @@
               <tr>
                <th data-switchable="true" data-sortable="true" data-field="id" data-visible="false">{{ trans('general.id') }}</th>
                <th data-switchable="true" data-sortable="true" data-field="name" data-formatter="groupsAdminLinkFormatter" data-visible="true">{{ trans('admin/groups/table.name') }}</th>
-                  <th data-switchable="true" data-sortable="true" data-field="users_count" data-visible="true"><i class="fas fa-user" aria-hidden="true"></i><span class="sr-only">{{ trans('admin/groups/table.users') }}</span></th>
-               <th data-switchable="true" data-sortable="true" data-field="created_at" data-visible="true" data-formatter="dateDisplayFormatter">{{ trans('general.created_at') }}</th>
-               <th data-switchable="false" data-searchable="false" data-sortable="false" data-field="created_by"  data-formatter="usersLinkFormatter">{{ trans('general.created_by') }}</th>
+                  <th data-switchable="true" data-sortable="true" data-field="users_count" data-visible="true"><x-icon type="user" /><span class="sr-only">{{ trans('admin/groups/table.users') }}</span></th>
+                  <th data-switchable="true" data-sortable="true" data-field="notes" data-visible="true">{{ trans('general.notes') }}</th>
+                  <th data-switchable="true" data-sortable="true" data-field="created_at" data-visible="true" data-formatter="dateDisplayFormatter">{{ trans('general.created_at') }}</th>
+               <th data-switchable="false" data-searchable="false" data-sortable="true" data-field="created_by"  data-formatter="usersLinkObjFormatter">{{ trans('general.created_by') }}</th>
                <th data-switchable="false" data-searchable="false" data-sortable="false" data-field="actions"   data-formatter="groupsActionsFormatter">{{ trans('table.actions') }}</th>
 
               </tr>
diff --git a/resources/views/groups/view.blade.php b/resources/views/groups/view.blade.php
index 421865ac94..19026e3395 100644
--- a/resources/views/groups/view.blade.php
+++ b/resources/views/groups/view.blade.php
@@ -22,13 +22,15 @@
                 <div class="box-body">
                     <div class="row">
                         <div class="col-md-12">
-                            <div class="table table-responsive">
+
 
                                 <table
                                     data-columns="{{  \App\Presenters\UserPresenter::dataTableLayout() }}"
                                     data-cookie-id-table="groupsUsersTable"
                                     data-pagination="true"
                                     data-search="true"
+                                    data-search-highlight="true"
+                                    data-show-print="true"
                                     data-side-pagination="server"
                                     data-show-columns="true"
                                     data-show-export="true"
@@ -41,7 +43,7 @@
                                         "ignoreColumn": ["actions","image","change","checkbox","checkincheckout","icon"]
                                         }'>
                                 </table>
-                            </div>
+
                         </div>
                     </div>
                 </div>
diff --git a/resources/views/hardware/audit-due.blade.php b/resources/views/hardware/audit-due.blade.php
index 0ee17ec23d..c81453a2da 100644
--- a/resources/views/hardware/audit-due.blade.php
+++ b/resources/views/hardware/audit-due.blade.php
@@ -51,10 +51,12 @@
                             <table
                                     data-click-to-select="true"
                                     data-columns="{{ \App\Presenters\AssetAuditPresenter::dataTableLayout() }}"
-                                            data-cookie-id-table="dueAssetAuditListing"
+                                    data-cookie-id-table="dueAssetAuditListing"
                                     data-pagination="true"
-                                            data-id-table="dueAssetAuditListing"
+                                    data-id-table="dueAssetAuditListing"
                                     data-search="true"
+                                    data-search-highlight="true"
+                                    data-show-print="true"
                                     data-side-pagination="server"
                                     data-show-columns="true"
                                     data-show-fullscreen="true"
diff --git a/resources/views/hardware/audit.blade.php b/resources/views/hardware/audit.blade.php
index 990995edb4..ea8b1673ea 100644
--- a/resources/views/hardware/audit.blade.php
+++ b/resources/views/hardware/audit.blade.php
@@ -21,11 +21,7 @@
         <div class="col-md-8 col-md-offset-2">
             <div class="box box-default">
 
-                {{ Form::open([
-                  'method' => 'POST',
-                  'route' => ['asset.audit.store', $asset->id],
-                  'files' => true,
-                  'class' => 'form-horizontal' ]) }}
+                <form method="POST" action="{{ route('asset.audit.store', $asset) }}" accept-charset="UTF-8" class="form-horizontal" enctype="multipart/form-data">
 
                     <div class="box-header with-border">
                         <h2 class="box-title"> {{ trans('admin/hardware/form.tag') }} {{ $asset->asset_tag }}</h2>
@@ -44,7 +40,7 @@
                                             {{ $asset->model->name }}
                                         @else
                                             <span class="text-danger text-bold">
-                                              <i class="fas fa-exclamation-triangle" aria-hidden="true"></i>
+                                              <x-icon type="warning" />
                                               {{ trans('admin/hardware/general.model_invalid')}}
                                             </span>
                                             {{ trans('admin/hardware/general.model_invalid_fix')}}
@@ -58,6 +54,8 @@
 
 
                     <!-- Asset Name -->
+
+                        @if ($asset->name)
                         <div class="form-group{{ $errors->has('name') ? ' has-error' : '' }}">
                             <label for="name" class="col-sm-3 control-label">
                                 {{ trans('general.name') }}
@@ -66,6 +64,7 @@
                                 <p class="form-control-static">{{ $asset->name }}</p>
                             </div>
                         </div>
+                        @endif
 
                         <!-- Locations -->
                     @include ('partials.forms.edit.location-select', ['translated_name' => trans('general.location'), 'fieldname' => 'location_id'])
@@ -75,7 +74,7 @@
 
                             <div class="col-md-8 col-md-offset-3">
                                 <label class="form-control">
-                                    <input type="checkbox" value="1" name="update_location" {{ Request::old('update_location') == '1' ? ' checked="checked"' : '' }}> {{ trans('admin/hardware/form.asset_location') }}
+                                    <input type="checkbox" value="1" name="update_location" {{ old('update_location') == '1' ? ' checked="checked"' : '' }}> {{ trans('admin/hardware/form.asset_location') }}
                                 </label>
                                 <p class="help-block">{!! trans('help.audit_help') !!}</p>
                             </div>
@@ -109,7 +108,7 @@
                             <div class="col-md-8">
                                 <div class="input-group date col-md-5" data-provide="datepicker" data-date-format="yyyy-mm-dd" data-date-clear-btn="true">
                                     <input type="text" class="form-control" placeholder="{{ trans('general.next_audit_date') }}" name="next_audit_date" id="next_audit_date" value="{{ old('next_audit_date', $next_audit_date) }}">
-                                    <span class="input-group-addon"><i class="fas fa-calendar" aria-hidden="true"></i></span>
+                                    <span class="input-group-addon"><x-icon type="calendar" /></span>
                                 </div>
                                 {!! $errors->first('next_audit_date', '<span class="alert-msg" aria-hidden="true"><i class="fas fa-times" aria-hidden="true"></i> :message</span>') !!}
                                  <p class="help-block">{!! trans('general.next_audit_date_help') !!}</p>
@@ -131,15 +130,26 @@
                         <!-- Audit Image -->
                         @include ('partials.forms.edit.image-upload', ['help_text' => trans('general.audit_images_help')])
 
+                        <!-- Custom fields -->
+                        @include("models/custom_fields_form", [
+                                'model' => $asset->model,
+                                'show_custom_fields_type' => 'audit'
+                        ])
+
 
                     </div> <!--/.box-body-->
-                    <div class="box-footer">
-                        <a class="btn btn-link" href="{{ URL::previous() }}"> {{ trans('button.cancel') }}</a>
-                        <button type="submit" class="btn btn-success pull-right{{ (!$asset->model ? ' disabled' : '') }}"{!! (!$asset->model ? ' data-tooltip="true" title="'.trans('admin/hardware/general.model_invalid_fix').'" disabled' : '') !!}>
-                            <i class="fas fa-check icon-white" aria-hidden="true"></i>
-                            {{ trans('general.audit') }}
-                        </button>
-                    </div>
+
+                    <x-redirect_submit_options
+                            index_route="hardware.index"
+                            :button_label="trans('general.audit')"
+                            :disabled_select="!$asset->model"
+                            :options="[
+                                'index' => trans('admin/hardware/form.redirect_to_all', ['type' => trans('general.assets')]),
+                                'item' => trans('admin/hardware/form.redirect_to_type', ['type' => trans('general.asset')]),
+                                'other_redirect' => trans('general.audit_due')
+                               ]"
+                    />
+
                 </form>
             </div>
         </div> <!--/.col-md-7-->
diff --git a/resources/views/hardware/bulk-checkout.blade.php b/resources/views/hardware/bulk-checkout.blade.php
index 562a27154e..69be1f3b61 100644
--- a/resources/views/hardware/bulk-checkout.blade.php
+++ b/resources/views/hardware/bulk-checkout.blade.php
@@ -27,12 +27,42 @@
         <form class="form-horizontal" method="post" action="" autocomplete="off">
           {{ csrf_field() }}
 
-          <!-- Checkout selector -->
+            @include ('partials.forms.edit.asset-select', [
+           'translated_name' => trans('general.assets'),
+           'fieldname' => 'selected_assets[]',
+           'multiple' => true,
+           'required' => true,
+           'asset_status_type' => 'RTD',
+           'select_id' => 'assigned_assets_select',
+           'asset_selector_div_id' => 'assets_to_checkout_div',
+           'asset_ids' => old('selected_assets')
+         ])
+
+
+            <!-- Status -->
+            <div class="form-group {{ $errors->has('status_id') ? 'error' : '' }}">
+                <label for="status_id" class="col-md-3 control-label">
+                    {{ trans('admin/hardware/form.status') }}
+                </label>
+                <div class="col-md-7 required">
+                    <x-input.select
+                            name="status_id"
+                            :options="$statusLabel_list"
+                            :selected="old('status_id', $status_id ?? null)"
+                            style="width: 100%;"
+                            aria-label="status_id"
+                    />
+                    {!! $errors->first('status_id', '<span class="alert-msg" aria-hidden="true"><i class="fas fa-times" aria-hidden="true"></i> :message</span>') !!}
+                </div>
+            </div>
+
+
+            <!-- Checkout selector -->
           @include ('partials.forms.checkout-selector', ['user_select' => 'true','asset_select' => 'true', 'location_select' => 'true'])
 
-          @include ('partials.forms.edit.user-select', ['translated_name' => trans('general.user'), 'fieldname' => 'assigned_user', 'required'=>'true'])
-          @include ('partials.forms.edit.asset-select', ['translated_name' => trans('general.asset'), 'fieldname' => 'assigned_asset', 'unselect' => 'true', 'style' => 'display:none;', 'required'=>'true'])
-          @include ('partials.forms.edit.location-select', ['translated_name' => trans('general.location'), 'fieldname' => 'assigned_location', 'style' => 'display:none;', 'required'=>'true'])
+          @include ('partials.forms.edit.user-select', ['translated_name' => trans('general.user'), 'fieldname' => 'assigned_user'])
+            @include ('partials.forms.edit.asset-select', ['translated_name' => trans('general.asset'), 'asset_selector_div_id' => 'assigned_asset', 'fieldname' => 'assigned_asset', 'unselect' => 'true', 'style' => 'display:none;'])
+          @include ('partials.forms.edit.location-select', ['translated_name' => trans('general.location'), 'fieldname' => 'assigned_location', 'style' => 'display:none;'])
 
           <!-- Checkout/Checkin Date -->
               <div class="form-group {{ $errors->has('checkout_at') ? 'error' : '' }}">
@@ -42,7 +72,7 @@
                   <div class="col-md-8">
                       <div class="input-group date col-md-5" data-provide="datepicker" data-date-format="yyyy-mm-dd" data-date-end-date="0d" data-date-clear-btn="true">
                           <input type="text" class="form-control" placeholder="{{ trans('general.select_date') }}" name="checkout_at" id="checkout_at" value="{{ old('checkout_at') }}">
-                          <span class="input-group-addon"><i class="fas fa-calendar" aria-hidden="true"></i></span>
+                          <span class="input-group-addon"><x-icon type="calendar" /></span>
                       </div>
                       {!! $errors->first('checkout_at', '<span class="alert-msg" aria-hidden="true"><i class="fas fa-times" aria-hidden="true"></i> :message</span>') !!}
                   </div>
@@ -56,7 +86,7 @@
                   <div class="col-md-8">
                       <div class="input-group date col-md-5" data-provide="datepicker" data-date-format="yyyy-mm-dd" data-date-start-date="0d" data-date-clear-btn="true">
                           <input type="text" class="form-control" placeholder="{{ trans('general.select_date') }}" name="expected_checkin" id="expected_checkin" value="{{ old('expected_checkin') }}">
-                          <span class="input-group-addon"><i class="fas fa-calendar" aria-hidden="true"></i></span>
+                          <span class="input-group-addon"><x-icon type="calendar" /></span>
                       </div>
                       {!! $errors->first('expected_checkin', '<span class="alert-msg" aria-hidden="true"><i class="fas fa-times" aria-hidden="true"></i> :message</span>') !!}
                   </div>
@@ -74,19 +104,12 @@
             </div>
           </div>
 
-          @include ('partials.forms.edit.asset-select', [
-            'translated_name' => trans('general.assets'),
-            'fieldname' => 'selected_assets[]',
-            'multiple' => true,
-            'asset_status_type' => 'RTD',
-            'select_id' => 'assigned_assets_select',
-          ])
 
 
       </div> <!--./box-body-->
       <div class="box-footer">
         <a class="btn btn-link" href="{{ URL::previous() }}"> {{ trans('button.cancel') }}</a>
-        <button type="submit" class="btn btn-primary pull-right"><i class="fas fa-check icon-white" aria-hidden="true"></i> {{ trans('general.checkout') }}</button>
+        <button type="submit" class="btn btn-primary pull-right"><x-icon type="checkmark" /> {{ trans('general.checkout') }}</button>
       </div>
     </div>
       </form>
@@ -109,5 +132,20 @@
 
 @section('moar_scripts')
 @include('partials/assets-assigned')
+<script nonce="{{ csrf_token() }}">
+    $(function () {
+        //if there's already a user selected, make sure their checked-out assets show up
+        // (if there isn't one, it won't do anything)
+        $('#assigned_user').change();
+
+        // Add the disabled attribute to empty inputs on submit to handle the case where someone does not pick a status ID
+        // and the form is submitted with an empty status ID which will fail validation via the form request
+        $("form").submit(function() {
+            $(this).find(":input").filter(function(){ return !this.value; }).attr("disabled", "disabled");
+            return true; // ensure form still submits
+        });
+
+    });
+</script>
 
 @stop
diff --git a/resources/views/hardware/bulk-delete.blade.php b/resources/views/hardware/bulk-delete.blade.php
index df19c9005f..96c931ae2b 100644
--- a/resources/views/hardware/bulk-delete.blade.php
+++ b/resources/views/hardware/bulk-delete.blade.php
@@ -28,11 +28,11 @@
           <table class="table table-striped table-condensed">
             <thead>
               <tr>
-                <td></td>
-                <td>{{ trans('admin/hardware/table.id') }}</td>
-                <td>{{ trans('admin/hardware/table.name') }}</td>
-                <td>{{ trans('admin/hardware/table.location')}}</td>
-                <td>{{ trans('admin/hardware/table.assigned_to') }}</td>
+                <th></th>
+                <th>{{ trans('admin/hardware/table.id') }}</th>
+                <th>{{ trans('general.asset_name') }}</th>
+                <th>{{ trans('admin/hardware/table.location')}}</th>
+                <th>{{ trans('admin/hardware/table.assigned_to') }}</th>
               </tr>
             </thead>
             <tbody>
@@ -43,12 +43,14 @@
                 <td>{{ $asset->present()->name() }}</td>
                 <td>
                   @if ($asset->location)
-                  {{ $asset->location->name }}
+                  {{ $asset->location->present()->name() }}
+                  @elseif($asset->rtd_location)
+                  {{ $asset->defaultLoc->present()->name() }}
                   @endif
                 </td>
                 <td>
-                  @if ($asset->assignedTo)
-                  {{ $asset->assignedTo->present()->name()}}
+                  @if ($asset->assigned)
+                    {{ $asset->assigned->present()->name() }}
                   @endif
                 </td>
               </tr>
@@ -58,8 +60,12 @@
         </div><!-- /.box-body -->
 
         <div class="box-footer text-right">
-          <a class="btn btn-link" href="{{ URL::previous() }}" method="post" enctype="multipart/form-data">{{ trans('button.cancel') }}</a>
-          <button type="submit" class="btn btn-success" id="submit-button"><i class="fas fa-check icon-white" aria-hidden="true"></i> {{ trans('button.delete') }}</button>
+          <a class="btn btn-link" href="{{ URL::previous() }}">
+            {{ trans('button.cancel') }}
+          </a>
+          <button type="submit" class="btn btn-success" id="submit-button">
+            <x-icon type="checkmark" /> {{ trans('button.delete') }}
+          </button>
         </div><!-- /.box-footer -->
       </div><!-- /.box -->
     </form>
diff --git a/resources/views/hardware/bulk-restore.blade.php b/resources/views/hardware/bulk-restore.blade.php
index e4bfb6e4dd..a998642685 100644
--- a/resources/views/hardware/bulk-restore.blade.php
+++ b/resources/views/hardware/bulk-restore.blade.php
@@ -53,7 +53,7 @@
 
         <div class="box-footer text-right">
           <a class="btn btn-link" href="{{ URL::previous() }}" method="post" enctype="multipart/form-data">{{ trans('button.cancel') }}</a>
-          <button type="submit" class="btn btn-success" id="submit-button"><i class="fas fa-check icon-white" aria-hidden="true"></i> {{ trans('button.restore') }}</button>
+          <button type="submit" class="btn btn-success" id="submit-button"><x-icon type="checkmark" /> {{ trans('button.restore') }}</button>
         </div><!-- /.box-footer -->
       </div><!-- /.box -->
     </form>
diff --git a/resources/views/hardware/bulk.blade.php b/resources/views/hardware/bulk.blade.php
index 371f0c2549..77c3173f5a 100755
--- a/resources/views/hardware/bulk.blade.php
+++ b/resources/views/hardware/bulk.blade.php
@@ -35,43 +35,89 @@
             @endif
           </div>
 
+          <!-- Name -->
+          <div class="form-group {{ $errors->has('name') ? ' has-error' : '' }}">
+            <label for="name" class="col-md-3 control-label">
+              {{ trans('admin/hardware/form.name') }}
+            </label>
+            <div class="col-md-4">
+                <input type="text" class="form-control" name="name" id="name" value="{{ old('name') }}" maxlength="100" style="width:100%">
+              {!! $errors->first('name', '<span class="alert-msg" aria-hidden="true">
+                <i class="fas fa-times" aria-hidden="true"></i> :message</span>') !!}
+            </div>
+            <div class="col-md-5">
+              <label class="form-control">
+                <input type="checkbox" name="null_name" value="1">
+                {{ trans_choice('general.set_to_null', count($assets), ['selection_count' => count($assets)]) }}
+              </label>
+            </div>
+          </div>
+
+
           <!-- Purchase Date -->
           <div class="form-group {{ $errors->has('purchase_date') ? ' has-error' : '' }}">
             <label for="purchase_date" class="col-md-3 control-label">{{ trans('admin/hardware/form.date') }}</label>
             <div class="col-md-4">
               <div class="input-group date" data-provide="datepicker" data-date-format="yyyy-mm-dd"  data-autoclose="true">
                 <input type="text" class="form-control" placeholder="{{ trans('general.select_date') }}" name="purchase_date" id="purchase_date" value="{{ old('purchase_date') }}">
-                <span class="input-group-addon"><i class="fas fa-calendar" aria-hidden="true"></i></span>
+                <span class="input-group-addon"><x-icon type="calendar" /></span>
               </div>
               {!! $errors->first('purchase_date', '<span class="alert-msg"><i class="fas fa-times"></i> :message</span>') !!}
             </div>
             <div class="col-md-5">
               <label class="form-control">
-                {{ Form::checkbox('null_purchase_date', '1', false) }}
-                {{ trans_choice('general.set_to_null', count($assets),['asset_count' => count($assets)]) }}
+                <input type="checkbox" name="null_purchase_date" value="1">
+                {{ trans_choice('general.set_to_null', count($assets),['selection_count' => count($assets)]) }}
               </label>
             </div>
-
           </div>
+
           <!-- Expected Checkin Date -->
           <div class="form-group {{ $errors->has('expected_checkin') ? ' has-error' : '' }}">
              <label for="expected_checkin" class="col-md-3 control-label">{{ trans('admin/hardware/form.expected_checkin') }}</label>
              <div class="col-md-4">
                   <div class="input-group date" data-provide="datepicker" data-date-format="yyyy-mm-dd"  data-autoclose="true">
                       <input type="text" class="form-control" placeholder="{{ trans('general.select_date') }}" name="expected_checkin" id="expected_checkin" value="{{ old('expected_checkin') }}">
-                      <span class="input-group-addon"><i class="fas fa-calendar" aria-hidden="true"></i></span>
+                      <span class="input-group-addon"><x-icon type="calendar" /></span>
                  </div>
 
                  {!! $errors->first('expected_checkin', '<span class="alert-msg" aria-hidden="true"><i class="fas fa-times" aria-hidden="true"></i> :message</span>') !!}
              </div>
               <div class="col-md-5">
                 <label class="form-control">
-                  {{ Form::checkbox('null_expected_checkin_date', '1', false) }}
-                  {{ trans_choice('general.set_to_null', count($assets), ['asset_count' => count($assets)]) }}
+                  <input type="checkbox" name="null_expected_checkin_date" value="1">
+                  {{ trans_choice('general.set_to_null', count($assets), ['selection_count' => count($assets)]) }}
                 </label>
               </div>
           </div>
 
+          <!-- EOL Date -->
+          <div class="form-group {{ $errors->has('asset_eol_date') ? ' has-error' : '' }}">
+            <label for="eol_date" class="col-md-3 control-label">{{ trans('admin/hardware/form.eol_date') }}</label>
+            <div class="col-md-4">
+              <div class="input-group date" data-provide="datepicker" data-date-format="yyyy-mm-dd"  data-autoclose="true">
+                <input type="text" class="form-control" placeholder="{{ trans('general.select_date') }}" name="asset_eol_date" id="asset_eol_date" value="{{ old('asset_eol_date') }}">
+                <span class="input-group-addon"><x-icon type="calendar" /></span>
+              </div>
+              {!! $errors->first('asset_eol_date', '<span class="alert-msg"><i class="fas fa-times"></i> :message</span>') !!}
+            </div>
+            <div class="col-md-5">
+              <label class="form-control">
+                <input type="checkbox" name="null_asset_eol_date" value="1">
+                {{ trans_choice('general.set_to_null', count($assets),['selection_count' => count($assets)]) }}
+              </label>
+            </div>
+          </div>
+
+          <div class="form-group">
+            <div class="col-md-9 col-md-offset-3">
+              <label class="form-control">
+                <input type="checkbox" name="calc_eol" value="1">
+                {{ trans('admin/hardware/form.calc_eol') }}
+              </label>
+            </div>
+          </div>
+
 
           <!-- Status -->
           <div class="form-group {{ $errors->has('status_id') ? ' has-error' : '' }}">
@@ -79,7 +125,13 @@
               {{ trans('admin/hardware/form.status') }}
             </label>
             <div class="col-md-7">
-              {{ Form::select('status_id', $statuslabel_list , old('status_id'), array('class'=>'select2', 'style'=>'width:100%', 'aria-label'=>'status_id')) }}
+              <x-input.select
+                  name="status_id"
+                  :options="$statuslabel_list"
+                  :selected="old('status_id')"
+                  style="width: 100%"
+                  aria-label="status_id"
+              />
               <p class="help-block">{{ trans('general.status_compatibility') }}</p>
               {!! $errors->first('status_id', '<span class="alert-msg" aria-hidden="true"><i class="fas fa-times" aria-hidden="true"></i> :message</span>') !!}
             </div>
@@ -94,15 +146,15 @@
           <div class="form-group">
             <div class="col-md-9 col-md-offset-3">
                 <label class="form-control">
-                  {{ Form::radio('update_real_loc', '1', old('update_real_loc'), ['checked'=> 'checked', 'aria-label'=>'update_real_loc']) }}
+                  <input type="radio" name="update_real_loc" value="1" checked aria-label="update_real_loc">
                   {{ trans('admin/hardware/form.asset_location_update_default_current') }}
                 </label>
               <label class="form-control">
-                {{ Form::radio('update_real_loc', '0', old('update_real_loc'), ['aria-label'=>'update_default_loc']) }}
+                <input type="radio" name="update_real_loc" value="0" aria-label="update_default_loc">
                 {{ trans('admin/hardware/form.asset_location_update_default') }}
               </label>
                 <label class="form-control">
-                  {{ Form::radio('update_real_loc', '2', old('update_real_loc'), ['aria-label'=>'update_default_loc']) }}
+                  <input type="radio" name="update_real_loc" value="2" aria-label="update_default_loc">
                   {{ trans('admin/hardware/form.asset_location_update_actual') }}
                 </label>
 
@@ -159,7 +211,7 @@
             <div class="col-md-4">
               <div class="input-group date" data-provide="datepicker" data-date-format="yyyy-mm-dd"  data-autoclose="true">
                 <input type="text" class="form-control" placeholder="{{ trans('general.select_date') }}" name="next_audit_date" id="next_audit_date" value="{{ old('next_audit_date') }}">
-                <span class="input-group-addon"><i class="fas fa-calendar" aria-hidden="true"></i></span>
+                <span class="input-group-addon"><x-icon type="calendar" /></span>
               </div>
 
               {!! $errors->first('next_audit_date', '<span class="alert-msg" aria-hidden="true">
@@ -169,8 +221,8 @@
             </div>
             <div class="col-md-5">
               <label class="form-control">
-                {{ Form::checkbox('null_next_audit_date', '1', false) }}
-                {{ trans_choice('general.set_to_null', count($assets), ['asset_count' => count($assets)]) }}
+                <input type="checkbox" name="null_next_audit_date" value="1">
+                {{ trans_choice('general.set_to_null', count($assets), ['selection_count' => count($assets)]) }}
               </label>
             </div>
             <div class="col-md-8 col-md-offset-3">
@@ -207,10 +259,23 @@
         </div> <!--/.box-body-->
 
         <div class="text-right box-footer">
-          <button type="submit" class="btn btn-success"><i class="fas fa-check icon-white" aria-hidden="true"></i> {{ trans('general.save') }}</button>
+          <button type="submit" class="btn btn-success"><x-icon type="checkmark" /> {{ trans('general.save') }}</button>
         </div>
       </div> <!--/.box.box-default-->
     </form>
   </div> <!--/.col-md-8-->
 </div>
 @stop
+@section('moar_scripts')
+  <script>
+    document.addEventListener('DOMContentLoaded', function () {
+      document.querySelectorAll('.clear-radio').forEach(function (button) {
+        button.addEventListener('click', function () {
+          const name = this.dataset.targetName;
+          const radios = document.querySelectorAll('input[type="radio"][name="' + name + '"]');
+          radios.forEach(radio => radio.checked = false);
+        });
+      });
+    });
+  </script>
+@endsection
diff --git a/resources/views/hardware/checkin-due.blade.php b/resources/views/hardware/checkin-due.blade.php
index 6ed7cf42c5..130832307d 100644
--- a/resources/views/hardware/checkin-due.blade.php
+++ b/resources/views/hardware/checkin-due.blade.php
@@ -2,7 +2,7 @@
 
 {{-- Page title --}}
 @section('title')
-    {{ trans_choice('general.checkin_due_days', $settings->audit_warning_days, ['days' => $settings->audit_warning_days]) }}
+    {{ trans_choice('general.checkin_due_days', $settings->due_checkin_days, ['days' => $settings->due_checkin_days]) }}
 @stop
 
 {{-- Page content --}}
@@ -53,6 +53,8 @@
                                             data-pagination="true"
                                             data-id-table="dueAssetcheckinListing"
                                             data-search="true"
+                                            data-search-highlight="true"
+                                            data-show-print="true"
                                             data-side-pagination="server"
                                             data-show-columns="true"
                                             data-show-fullscreen="true"
diff --git a/resources/views/hardware/checkin.blade.php b/resources/views/hardware/checkin.blade.php
index 7b52cf8614..287f47c074 100755
--- a/resources/views/hardware/checkin.blade.php
+++ b/resources/views/hardware/checkin.blade.php
@@ -2,132 +2,180 @@
 
 {{-- Page title --}}
 @section('title')
-  {{ trans('admin/hardware/general.checkin') }}
-  @parent
+    {{ trans('admin/hardware/general.checkin') }}
+    @parent
 @stop
 
 {{-- Page content --}}
 @section('content')
-  <style>
+    <style>
 
-    .input-group {
-      padding-left: 0px !important;
-    }
-  </style>
+        .input-group {
+            padding-left: 0px !important;
+        }
+    </style>
 
 
-  <div class="row"><!-- .row -->
-    <!-- left column -->
-    <div class="col-md-7 col-sm-11 col-xs-12 col-md-offset-2">
-      <div class="box box-default"><!-- .box-default -->
-        <div class="box-header with-border"><!-- .box-header -->
-            <h2 class="box-title">
-              {{ trans('admin/hardware/form.tag') }}
-              {{ $asset->asset_tag }}
-            </h2>
-        </div><!-- /.box-header -->
+    <div class="row"><!-- .row -->
+        <!-- left column -->
+        <div class="col-md-7 col-sm-11 col-xs-12 col-md-offset-2">
+            <div class="box box-default"><!-- .box-default -->
+                <div class="box-header with-border"><!-- .box-header -->
+                    <h2 class="box-title">
+                        {{ trans('admin/hardware/form.tag') }}
+                        {{ $asset->asset_tag }}
+                    </h2>
+                </div><!-- /.box-header -->
 
-        <div class="box-body"><!-- .box-body -->
-          <div class="col-md-12"><!-- .col-md-12 -->
+                <div class="box-body"><!-- .box-body -->
+                    <div class="col-md-12"><!-- .col-md-12 -->
 
-            @if ($backto == 'user')
-              <form class="form-horizontal" method="post" action="{{ route('hardware.checkin.store', array('assetId'=> $asset->id, 'backto'=>'user')) }}"  autocomplete="off">
-            @else
-              <form class="form-horizontal" method="post"  action="{{ route('hardware.checkin.store', array('assetId'=> $asset->id)) }}" autocomplete="off">
-            @endif
-                  {{csrf_field()}}
+                        @if ($backto == 'user')
+                            <form class="form-horizontal" method="post"
+                                  action="{{ route('hardware.checkin.store', array('assetId'=> $asset->id, 'backto'=>'user')) }}"
+                                  autocomplete="off">
+                                @else
+                                    <form class="form-horizontal" method="post"
+                                          action="{{ route('hardware.checkin.store', array('assetId'=> $asset->id)) }}"
+                                          autocomplete="off">
+                                        @endif
+                                        {{csrf_field()}}
 
-                  <!-- AssetModel name -->
-                    <div class="form-group">
-                        <label for="model" class="col-sm-3 control-label">
-                            {{ trans('admin/hardware/form.model') }}
-                        </label>
-                        <div class="col-md-8">
+                                        <!-- AssetModel name -->
+                                        <div class="form-group">
+                                            <label for="model" class="col-sm-3 control-label">
+                                                {{ trans('admin/hardware/form.model') }}
+                                            </label>
+                                            <div class="col-md-8">
 
-                        <p class="form-control-static">
-                          @if (($asset->model) && ($asset->model->name))
-                            {{ $asset->model->name }}
-                          @else
-                            <span class="text-danger text-bold">
-                              <i class="fas fa-exclamation-triangle" aria-hidden="true"></i>
-                              {{ trans('admin/hardware/general.model_invalid')}}
-                            </span>
-                            {{ trans('admin/hardware/general.model_invalid_fix')}}
-                            <a href="{{ route('hardware.edit', $asset->id) }}">
-                              <strong>{{ trans('admin/hardware/general.edit') }}</strong>
-                            </a>
-                          @endif
-                        </p>
+                                                <p class="form-control-static">
+                                                    @if (($asset->model) && ($asset->model->name))
+                                                        {{ $asset->model->name }}
+                                                    @else
+                                                        <span class="text-danger text-bold">
+                                                          <x-icon type="warning" />
+                                                          {{ trans('admin/hardware/general.model_invalid')}}
+                                                        </span>
+                                                        {{ trans('admin/hardware/general.model_invalid_fix')}}
+                                                        <a href="{{ route('hardware.edit', $asset->id) }}">
+                                                            <strong>{{ trans('admin/hardware/general.edit') }}</strong>
+                                                        </a>
+                                                    @endif
+                                                </p>
 
-                      </div>
-                    </div>
+                                            </div>
+                                        </div>
 
-                    <!-- Asset Name -->
-                    <div class="form-group {{ $errors->has('name') ? 'error' : '' }}">
-                        <label for="name" class="col-sm-3 control-label">
-                            {{ trans('general.name') }}
-                        </label>
-                          <div class="col-md-8">
-                            <input class="form-control" type="text" name="name" aria-label="name" id="name" value="{{ old('name', $asset->name) }}"/>
-                            {!! $errors->first('name', '<span class="alert-msg" aria-hidden="true"><i class="fas fa-times" aria-hidden="true"></i> :message</span>') !!}
-                          </div>
-                    </div>
+                                        <!-- Asset Name -->
+                                        <div class="form-group {{ $errors->has('name') ? 'error' : '' }}">
+                                            <label for="name" class="col-sm-3 control-label">
+                                                {{ trans('general.name') }}
+                                            </label>
+                                            <div class="col-md-8">
+                                                <input class="form-control" type="text" name="name" aria-label="name"
+                                                       id="name" value="{{ old('name', $asset->name) }}"/>
+                                                {!! $errors->first('name', '<span class="alert-msg" aria-hidden="true"><i class="fas fa-times" aria-hidden="true"></i> :message</span>') !!}
+                                            </div>
+                                        </div>
 
-                    <!-- Status -->
-                    <div class="form-group {{ $errors->has('status_id') ? 'error' : '' }}">
-                        <label for="status_id" class="col-sm-3 control-label">
-                            {{ trans('admin/hardware/form.status') }}
-                        </label>
-                      <div class="col-md-8 required">
-                        {{ Form::select('status_id', $statusLabel_list, '', array('class'=>'select2', 'style'=>'width:100%','id' =>'modal-statuslabel_types', 'aria-label'=>'status_id')) }}
-                        {!! $errors->first('status_id', '<span class="alert-msg" aria-hidden="true"><i class="fas fa-times" aria-hidden="true"></i> :message</span>') !!}
-                      </div>
-                    </div>
+                                        <!-- Status -->
+                                        <div class="form-group {{ $errors->has('status_id') ? 'error' : '' }}">
+                                            <label for="status_id" class="col-sm-3 control-label">
+                                                {{ trans('admin/hardware/form.status') }}
+                                            </label>
+                                            <div class="col-md-8 required">
+                                                <x-input.select
+                                                    name="status_id"
+                                                    id="modal-statuslabel_types"
+                                                    :options="$statusLabel_list"
+                                                    style="width: 100%"
+                                                    aria-label="status_id"
+                                                />
+                                                {!! $errors->first('status_id', '<span class="alert-msg" aria-hidden="true"><i class="fas fa-times" aria-hidden="true"></i> :message</span>') !!}
+                                            </div>
+                                        </div>
 
-                  @include ('partials.forms.edit.location-select', ['translated_name' => trans('general.location'), 'fieldname' => 'location_id', 'help_text' => ($asset->defaultLoc) ? trans('general.checkin_to_diff_location', ['default_location' => $asset->defaultLoc->name]) : null, 'hide_location_radio' => true])
+                                        <x-input.location-select
+                                            :label="trans('general.location')"
+                                            name="location_id"
+                                            :help_text="($asset->defaultLoc) ? trans('general.checkin_to_diff_location', ['default_location' => $asset->defaultLoc->name]) : null"
+                                            :selected="old('location_id')"
+                                        />
 
-                  <!-- Checkout/Checkin Date -->
-                    <div class="form-group{{ $errors->has('checkin_at') ? ' has-error' : '' }}">
-                        <label for="checkin_at" class="col-sm-3 control-label">
-                            {{ trans('admin/hardware/form.checkin_date') }}
-                        </label>
+                                        <!-- Update actual location  -->
+                                        <div class="form-group">
+                                            <div class="col-md-9 col-md-offset-3">
+                                                <label class="form-control">
+                                                    <input name="update_default_location" type="radio" value="1" checked="checked" aria-label="update_default_location" />
+                                                    {{ trans('admin/hardware/form.asset_location') }}
+                                                </label>
+                                                <label class="form-control">
+                                                    <input name="update_default_location" type="radio" value="0" aria-label="update_default_location" />
+                                                    {{ trans('admin/hardware/form.asset_location_update_default_current') }}
+                                                </label>
+                                            </div>
+                                        </div> <!--/form-group-->
+
+                                        <!-- Checkout/Checkin Date -->
+                                        <div class="form-group{{ $errors->has('checkin_at') ? ' has-error' : '' }}">
+                                            <label for="checkin_at" class="col-sm-3 col-xs-12 col-sm-12 control-label">
+                                                {{ trans('admin/hardware/form.checkin_date') }}
+                                            </label>
+
+                                            <div class="col-md-8 col-xs-12 col-sm-12">
+                                                <div class="input-group col-xl-5 col-lg-5 col-md-7 col-sm-9 col-xs-12 required">
+                                                    <div class="input-group date" data-provide="datepicker"
+                                                         data-date-format="yyyy-mm-dd" data-autoclose="true">
+                                                        <input type="text" class="form-control"
+                                                               placeholder="{{ trans('general.select_date') }}"
+                                                               name="checkin_at" id="checkin_at"
+                                                               value="{{ old('checkin_at', date('Y-m-d')) }}">
+                                                        <span class="input-group-addon">
+                                                            <x-icon type="calendar" />
+                                                        </span>
+                                                    </div>
+                                                    {!! $errors->first('checkin_at', '<span class="alert-msg" aria-hidden="true"><i class="fas fa-times" aria-hidden="true"></i> :message</span>') !!}
+                                                </div>
+                                            </div>
+                                        </div>
+
+                                        <!-- Note -->
+                                        <div class="form-group {{ $errors->has('note') ? 'error' : '' }}">
+                                            <label for="note" class="col-md-3 control-label">
+                                                {{ trans('general.notes') }}
+                                            </label>
+                                            <div class="col-md-8">
+                                                <textarea class="col-md-6 form-control" id="note" @required($snipeSettings->require_checkinout_notes)
+                                                name="note">{{ old('note', $asset->note) }}</textarea>
+                                                {!! $errors->first('note', '<span class="alert-msg" aria-hidden="true"><i class="fas fa-times" aria-hidden="true"></i> :message</span>') !!}
+                                            </div>
+                                        </div>
+
+
+                                        <!-- Custom fields -->
+                                        @include("models/custom_fields_form", [
+                                                'model' => $asset->model,
+                                                'show_custom_fields_type' => 'checkin'
+                                        ])
 
-                      <div class="col-md-8">
-                        <div class="input-group col-md-5 required">
-                          <div class="input-group date" data-provide="datepicker" data-date-format="yyyy-mm-dd"  data-autoclose="true">
-                            <input type="text" class="form-control" placeholder="{{ trans('general.select_date') }}" name="checkin_at" id="checkin_at" value="{{ old('checkin_at', date('Y-m-d')) }}">
-                            <span class="input-group-addon"><i class="fas fa-calendar" aria-hidden="true"></i></span>
-                          </div>
-                          {!! $errors->first('checkin_at', '<span class="alert-msg" aria-hidden="true"><i class="fas fa-times" aria-hidden="true"></i> :message</span>') !!}
-                        </div>
-                      </div>
-                    </div>
 
-                    <!-- Note -->
-                    <div class="form-group {{ $errors->has('note') ? 'error' : '' }}">
-                        <label for="note" class="col-sm-3 control-label">
-                            {{ trans('general.notes') }}
-                        </label>
-                      <div class="col-md-8">
-                        <textarea class="col-md-6 form-control" id="note" name="note">{{ old('note', $asset->note) }}</textarea>
-                        {!! $errors->first('note', '<span class="alert-msg" aria-hidden="true"><i class="fas fa-times" aria-hidden="true"></i> :message</span>') !!}
-                      </div>
-                    </div>
                     </div> <!--/.box-body-->
                 </div> <!--/.box-body-->
 
-                      @include ('partials.forms.redirect_submit_options',
-                                [
-                                'route' => 'hardware.index',
-                                'table_name' => $table_name,
-                                'type'=> ($asset->model ? $asset->model->name : trans('general.asset_model')),
-                                'checkin' => true
-                      ])
-                  </form>
+                <x-redirect_submit_options
+                        index_route="hardware.index"
+                        :button_label="trans('general.checkin')"
+                        :disabled_select="!$asset->model"
+                        :options="[
+                                'index' => trans('admin/hardware/form.redirect_to_all', ['type' => trans('general.assets')]),
+                                'item' => trans('admin/hardware/form.redirect_to_type', ['type' => trans('general.asset')]),
+                                'target' => $target_option,
+                               ]"
+                />
+                </form>
 
-      </div>
+            </div>
+        </div>
     </div>
-  </div>
 
-
-@stop
\ No newline at end of file
+@stop
diff --git a/resources/views/hardware/checkout.blade.php b/resources/views/hardware/checkout.blade.php
index 2abe47b860..60d64221e2 100755
--- a/resources/views/hardware/checkout.blade.php
+++ b/resources/views/hardware/checkout.blade.php
@@ -25,7 +25,7 @@
                         <h2 class="box-title"> {{ trans('admin/hardware/form.tag') }} {{ $asset->asset_tag }}</h2>
                     </div>
                     <div class="box-body">
-                    {{csrf_field()}}
+                        {{csrf_field()}}
                         @if ($asset->company && $asset->company->name)
                             <div class="form-group">
                                 <label for="company" class="col-md-3 control-label">
@@ -42,7 +42,7 @@
                         <!-- AssetModel name -->
                         <div class="form-group">
                             <label for="model" class="col-md-3 control-label">
-                                {{ trans('general.company') }}
+                                {{ trans('admin/hardware/form.model') }}
                             </label>
                             <div class="col-md-8">
                                 <p class="form-control-static">
@@ -50,7 +50,7 @@
                                         {{ $asset->model->name }}
                                     @else
                                         <span class="text-danger text-bold">
-                                              <i class="fas fa-exclamation-triangle" aria-hidden="true"></i>
+                                              <x-icon type="warning" />
                                               {{ trans('admin/hardware/general.model_invalid')}}
                                         </span>
 
@@ -70,7 +70,8 @@
                             </label>
 
                             <div class="col-md-8">
-                                <input class="form-control" type="text" name="name" id="name" value="{{ old('name', $asset->name) }}" tabindex="1">
+                                <input class="form-control" type="text" name="name" id="name"
+                                       value="{{ old('name', $asset->name) }}" tabindex="1">
                                 {!! $errors->first('name', '<span class="alert-msg" aria-hidden="true"><i class="fas fa-times" aria-hidden="true"></i> :message</span>') !!}
                             </div>
                         </div>
@@ -81,32 +82,43 @@
                                 {{ trans('admin/hardware/form.status') }}
                             </label>
                             <div class="col-md-7 required">
-                                {{ Form::select('status_id', $statusLabel_list, $asset->status_id, array('class'=>'select2', 'style'=>'width:100%','', 'aria-label'=>'status_id')) }}
+                                <x-input.select
+                                    name="status_id"
+                                    :options="$statusLabel_list"
+                                    :selected="$asset->status_id"
+                                    style="width: 100%;"
+                                    aria-label="status_id"
+                                />
                                 {!! $errors->first('status_id', '<span class="alert-msg" aria-hidden="true"><i class="fas fa-times" aria-hidden="true"></i> :message</span>') !!}
                             </div>
                         </div>
 
-                    @include ('partials.forms.checkout-selector', ['user_select' => 'true','asset_select' => 'true', 'location_select' => 'true'])
+                        @include ('partials.forms.checkout-selector', ['user_select' => 'true','asset_select' => 'true', 'location_select' => 'true'])
 
-                    @include ('partials.forms.edit.user-select', ['translated_name' => trans('general.user'), 'fieldname' => 'assigned_user', 'required'=>'true'])
+                        @include ('partials.forms.edit.user-select', ['translated_name' => trans('general.user'), 'fieldname' => 'assigned_user'])
 
-                    <!-- We have to pass unselect here so that we don't default to the asset that's being checked out. We want that asset to be pre-selected everywhere else. -->
-                    @include ('partials.forms.edit.asset-select', ['translated_name' => trans('general.asset'), 'fieldname' => 'assigned_asset', 'unselect' => 'true', 'style' => 'display:none;', 'required'=>'true'])
+                        <!-- We have to pass unselect here so that we don't default to the asset that's being checked out. We want that asset to be pre-selected everywhere else. -->
+                        @include ('partials.forms.edit.asset-select', ['translated_name' => trans('general.asset'), 'fieldname' => 'assigned_asset', 'unselect' => 'true', 'style' => 'display:none;'])
 
-                    @include ('partials.forms.edit.location-select', ['translated_name' => trans('general.location'), 'fieldname' => 'assigned_location', 'style' => 'display:none;', 'required'=>'true'])
+                        @include ('partials.forms.edit.location-select', ['translated_name' => trans('general.location'), 'fieldname' => 'assigned_location', 'style' => 'display:none;'])
 
 
 
-                    <!-- Checkout/Checkin Date -->
+                        <!-- Checkout/Checkin Date -->
                         <div class="form-group {{ $errors->has('checkout_at') ? 'error' : '' }}">
                             <label for="checkout_at" class="col-md-3 control-label">
                                 {{ trans('admin/hardware/form.checkout_date') }}
                             </label>
                             <div class="col-md-8">
-                                <div class="input-group date col-md-7" data-provide="datepicker" data-date-format="yyyy-mm-dd" data-date-end-date="0d" data-date-clear-btn="true">
-                                    <input type="text" class="form-control" placeholder="{{ trans('general.select_date') }}" name="checkout_at" id="checkout_at" value="{{ old('checkout_at', date('Y-m-d')) }}">
-                                    <span class="input-group-addon"><i class="fas fa-calendar" aria-hidden="true"></i></span>
-                                </div>
+
+                                <x-input.datepicker
+                                        name="checkout_at"
+                                        end_date="0d"
+                                        col_size_class="col-md-7"
+                                        :value="old('expected_checkin', date('Y-m-d'))"
+                                        placeholder="{{ trans('general.select_date') }}"
+                                        required="{{ Helper::checkIfRequired($item, 'checkout_at') }}"
+                                />
                                 {!! $errors->first('checkout_at', '<span class="alert-msg" aria-hidden="true"><i class="fas fa-times" aria-hidden="true"></i> :message</span>') !!}
                             </div>
                         </div>
@@ -118,10 +130,12 @@
                             </label>
 
                             <div class="col-md-8">
-                                <div class="input-group date col-md-7" data-provide="datepicker" data-date-format="yyyy-mm-dd" data-date-start-date="0d" data-date-clear-btn="true">
-                                    <input type="text" class="form-control" placeholder="{{ trans('general.select_date') }}" name="expected_checkin" id="expected_checkin" value="{{ old('expected_checkin') }}">
-                                    <span class="input-group-addon"><i class="fas fa-calendar" aria-hidden="true"></i></span>
-                                </div>
+                                <x-input.datepicker
+                                        name="expected_checkin"
+                                        :value="old('expected_checkin', $item->expected_checkin)"
+                                        placeholder="{{ trans('general.select_date') }}"
+                                        required="{{ Helper::checkIfRequired($item, 'expected_checkin') }}"
+                                />
                                 {!! $errors->first('expected_checkin', '<span class="alert-msg" aria-hidden="true"><i class="fas fa-times" aria-hidden="true"></i> :message</span>') !!}
                             </div>
                         </div>
@@ -131,11 +145,21 @@
                             <label for="note" class="col-md-3 control-label">
                                 {{ trans('general.notes') }}
                             </label>
+
                             <div class="col-md-8">
-                                <textarea class="col-md-6 form-control" id="note" name="note">{{ old('note', $asset->note) }}</textarea>
+                                <textarea class="col-md-6 form-control" id="note" @required($snipeSettings->require_checkinout_notes)
+                                name="note">{{ old('note', $asset->note) }}</textarea>
                                 {!! $errors->first('note', '<span class="alert-msg" aria-hidden="true"><i class="fas fa-times" aria-hidden="true"></i> :message</span>') !!}
                             </div>
                         </div>
+                        
+                        <!-- Custom fields -->
+                        @include("models/custom_fields_form", [
+                                'model' => $asset->model,
+                                'show_custom_fields_type' => 'checkout'
+                        ])
+
+
 
                         @if ($asset->requireAcceptance() || $asset->getEula() || ($snipeSettings->webhook_endpoint!=''))
                             <div class="form-group notification-callout">
@@ -143,13 +167,13 @@
                                     <div class="callout callout-info">
 
                                         @if ($asset->requireAcceptance())
-                                            <i class="far fa-envelope" aria-hidden="true"></i>
+                                            <x-icon type="email" />
                                             {{ trans('admin/categories/general.required_acceptance') }}
                                             <br>
                                         @endif
 
                                         @if ($asset->getEula())
-                                            <i class="far fa-envelope" aria-hidden="true"></i>
+                                            <x-icon type="email" />
                                             {{ trans('admin/categories/general.required_eula') }}
                                             <br>
                                         @endif
@@ -164,13 +188,19 @@
                         @endif
 
                     </div> <!--/.box-body-->
-                    @include ('partials.forms.redirect_submit_options',
-                                 [
-                                 'route' => 'hardware.index',
-                                 'table_name' => $table_name,
-                                 'type'=> ($asset->model ? $asset->model->name : trans('general.asset_model')),
-                                 'checkin' => false
-                           ])
+
+                    <x-redirect_submit_options
+                            index_route="hardware.index"
+                            :button_label="trans('general.checkout')"
+                            :disabled_select="!$asset->model"
+                            :options="[
+                                'index' => trans('admin/hardware/form.redirect_to_all', ['type' => trans('general.assets')]),
+                                'item' => trans('admin/hardware/form.redirect_to_type', ['type' => trans('general.asset')]),
+                                'target' => trans('admin/hardware/form.redirect_to_checked_out_to'),
+
+                               ]"
+                    />
+
                 </form>
             </div>
         </div> <!--/.col-md-7-->
@@ -192,15 +222,4 @@
 
 @section('moar_scripts')
     @include('partials/assets-assigned')
-
-    <script>
-        //        $('#checkout_at').datepicker({
-        //            clearBtn: true,
-        //            todayHighlight: true,
-        //            endDate: '0d',
-        //            format: 'yyyy-mm-dd'
-        //        });
-
-
-    </script>
 @stop
diff --git a/resources/views/hardware/edit.blade.php b/resources/views/hardware/edit.blade.php
index a83197763e..921a4542fd 100755
--- a/resources/views/hardware/edit.blade.php
+++ b/resources/views/hardware/edit.blade.php
@@ -5,7 +5,12 @@
     'topSubmit' => true,
     'helpText' => trans('help.assets'),
     'helpPosition' => 'right',
-    'formAction' => ($item->id) ? route('hardware.update', ['hardware' => $item->id]) : route('hardware.store'),
+    'formAction' => ($item->id) ? route('hardware.update', $item) : route('hardware.store'),
+    'index_route' => 'hardware.index',
+    'options' => [
+                'index' => trans('admin/hardware/form.redirect_to_all', ['type' => 'assets']),
+                'item' => trans('admin/hardware/form.redirect_to_type', ['type' => trans('general.asset')]),
+               ]
 ])
 
 
@@ -23,8 +28,7 @@
 
       @if  ($item->id)
           <!-- we are editing an existing asset,  there will be only one asset tag -->
-          <div class="col-md-7 col-sm-12{{  (Helper::checkIfRequired($item, 'asset_tag')) ? ' required' : '' }}">
-
+          <div class="col-md-7 col-sm-12">
 
           <input class="form-control" type="text" name="asset_tags[1]" id="asset_tag" value="{{ old('asset_tag', $item->asset_tag) }}" required>
               {!! $errors->first('asset_tags', '<span class="alert-msg"><i class="fas fa-times"></i> :message</span>') !!}
@@ -32,14 +36,17 @@
           </div>
       @else
           <!-- we are creating a new asset - let people use more than one asset tag -->
-          <div class="col-md-7 col-sm-12{{  (Helper::checkIfRequired($item, 'asset_tag')) ? ' required' : '' }}">
+          <div class="col-md-7 col-sm-12">
               <input class="form-control" type="text" name="asset_tags[1]" id="asset_tag" value="{{ old('asset_tags.1', \App\Models\Asset::autoincrement_asset()) }}" required>
               {!! $errors->first('asset_tags', '<span class="alert-msg"><i class="fas fa-times"></i> :message</span>') !!}
               {!! $errors->first('asset_tag', '<span class="alert-msg"><i class="fas fa-times"></i> :message</span>') !!}
           </div>
           <div class="col-md-2 col-sm-12">
-              <button class="add_field_button btn btn-default btn-sm">
-                  <i class="fas fa-plus"></i>
+              <button class="add_field_button btn btn-default btn-sm" name="add_field_button">
+                  <x-icon type="plus" />
+                  <span class="sr-only">
+                      {{ trans('general.new') }}
+                  </span>
               </button>
           </div>
       @endif
@@ -78,7 +85,7 @@
         @if ($item->model && $item->model->fieldset)
         <?php $model = $item->model; ?>
         @endif
-        @if (Request::old('model_id'))
+        @if (old('model_id'))
             @php
                 $model = \App\Models\AssetModel::find(old('model_id'));
             @endphp
@@ -92,88 +99,72 @@
         @endif
     </div>
 
-    <div class="form-group">
-    <label class="col-md-3 control-label"></label>
 
-        <div class="col-md-9 col-sm-9 col-md-offset-3">
+        <div class="col-md-12 col-sm-12">
 
-        <a id="optional_info" class="text-primary">
-            <i class="fa fa-caret-right fa-2x" id="optional_info_icon"></i>
-            <strong>{{ trans('admin/hardware/form.optional_infos') }}</strong>
-        </a>
+        <fieldset name="optional-details">
 
-        </div>
-        
-        <div id="optional_details" class="col-md-12" style="display:none">
-        <br>
-            @include ('partials.forms.edit.name', ['translated_name' => trans('admin/hardware/form.name')])
-            @include ('partials.forms.edit.warranty')
+            <legend class="highlight">
+                <a id="optional_info">
+                    <x-icon type="caret-right" id="optional_info_icon" />
+                    {{ trans('admin/hardware/form.optional_infos') }}
+                </a>
+            </legend>
 
-            <!-- Datepicker -->
-            <div class="form-group{{ $errors->has('next_audit_date') ? ' has-error' : '' }}">
-
-                <label class="col-md-3 control-label">
-                    {{ trans('general.next_audit_date') }}
-                </label>
-
-                <div class="input-group col-md-4">
-                    <div class="input-group date" data-provide="datepicker" data-date-clear-btn="true" data-date-format="yyyy-mm-dd"  data-autoclose="true">
-                        <input type="text" class="form-control" placeholder="{{ trans('general.select_date') }}" name="next_audit_date" id="next_audit_date" value="{{ old('next_audit_date', $item->next_audit_date) }}" readonly style="background-color:inherit" maxlength="10">
-                        <span class="input-group-addon"><i class="fas fa-calendar" aria-hidden="true"></i></span>
+            <div id="optional_details" class="col-md-12" style="display:none">
+                @include ('partials.forms.edit.name', ['translated_name' => trans('admin/hardware/form.name')])
+                @include ('partials.forms.edit.warranty')
+                @include ('partials.forms.edit.datepicker', ['translated_name' => trans('admin/hardware/form.expected_checkin'),'fieldname' => 'expected_checkin'])
+                @include ('partials.forms.edit.datepicker', ['translated_name' => trans('general.next_audit_date'),'fieldname' => 'next_audit_date', 'help_text' => trans('general.next_audit_date_help')])
+                <!-- byod checkbox -->
+                <div class="form-group byod">
+                    <div class="col-md-7 col-md-offset-3">
+                        <label class="form-control">
+                            <input type="checkbox" value="1" name="byod" {{ (old('remote', $item->byod)) == '1' ? ' checked="checked"' : '' }} aria-label="byod">
+                            {{ trans('general.byod') }}
+                        </label>
+                        <p class="help-block">
+                            {{ trans('general.byod_help') }}
+                        </p>
                     </div>
                 </div>
-                <div class="col-md-8 col-md-offset-3">
-                    {!! $errors->first('next_audit_date', '<span class="alert-msg" aria-hidden="true"><i class="fas fa-times" aria-hidden="true"></i> :message</span>') !!}
-                    <p class="help-block">{!! trans('general.next_audit_date_help') !!}</p>
-                </div>
 
-            </div>
+            </div> <!-- end optional details -->
+        </fieldset>
+
+        </div><!-- end col-md-12 col-sm-12-->
 
 
 
+        <div class="col-md-12 col-sm-12">
+            <fieldset name="order-info">
+                <legend class="highlight">
+                    <a id="order_info">
+                        <x-icon type="caret-right" id="order_info_icon" />
+                        {{ trans('admin/hardware/form.order_details') }}
+                    </a>
+                </legend>
 
-            <!-- byod checkbox -->
-            <div class="form-group">
-                <div class="col-md-7 col-md-offset-3">
-                    <label for="byod" class="form-control">
-                        <input type="checkbox" value="1" name="byod" {{ (old('remote', $item->byod)) == '1' ? ' checked="checked"' : '' }} aria-label="byod">
-                        {{ trans('general.byod') }}
+                <div id='order_details' class="col-md-12" style="display:none">
+                    @include ('partials.forms.edit.order_number')
+                    @include ('partials.forms.edit.datepicker', ['translated_name' => trans('general.purchase_date'),'fieldname' => 'purchase_date'])
+                    @include ('partials.forms.edit.datepicker', ['translated_name' => trans('admin/hardware/form.eol_date'),'fieldname' => 'asset_eol_date'])
+                    @include ('partials.forms.edit.supplier-select', ['translated_name' => trans('general.supplier'), 'fieldname' => 'supplier_id'])
 
-                    </label>
-                    <p class="help-block">{{ trans('general.byod_help') }}
-                    </p>
-                </div>
-            </div>
-        </div>
-    </div>
+                    @php
+                        $currency_type = null;
+                        if ($item->id && $item->location) {
+                            $currency_type = $item->location->currency;
+                        }
+                    @endphp
 
-    <div class="form-group">
-        <div class="col-md-9 col-sm-9 col-md-offset-3">
-            <a id="order_info" class="text-primary">
-                <i class="fa fa-caret-right fa-2x" id="order_info_icon"></i>
-                <strong>{{ trans('admin/hardware/form.order_details') }}</strong>
-            </a>
+                    @include ('partials.forms.edit.purchase_cost', ['currency_type' => $currency_type])
 
-        </div>
-
-        <div id='order_details' class="col-md-12" style="display:none">
-            <br>
-            @include ('partials.forms.edit.order_number')
-            @include ('partials.forms.edit.purchase_date')
-            @include ('partials.forms.edit.eol_date')
-            @include ('partials.forms.edit.supplier-select', ['translated_name' => trans('general.supplier'), 'fieldname' => 'supplier_id'])
-
-                @php
-                $currency_type = null;
-                if ($item->id && $item->location) {
-                    $currency_type = $item->location->currency;
-                }
-                @endphp
-
-            @include ('partials.forms.edit.purchase_cost', ['currency_type' => $currency_type])
-
-        </div>
-    </div>
+                </div> <!-- end order details -->
+            </fieldset>
+        </div><!-- end col-md-12 col-sm-12-->
+    </div><!-- end col-md-12 col-sm-12-->
+    </div><!-- end col-md-12 col-sm-12-->
    
 @stop
 
@@ -219,6 +210,17 @@
                     //now re-populate the custom fields based on the previously saved values
                     $('#custom_fields_content').find('input,select').each(function (index,elem) {
                         if(transformed_oldvals[elem.name]) {
+                            if (elem.type === 'checkbox' || elem.type === 'radio'){
+                                let shouldBeChecked = oldvals.find(oldValElement => {
+                                    return oldValElement.name === elem.name && oldValElement.value === $(elem).val();
+                                });
+
+                                if (shouldBeChecked){
+                                    $(elem).prop('checked', true);
+                                }
+
+                                return;
+                            }
                              {{-- If there already *is* is a previously-input 'transformed_oldvals' handy,
                                   overwrite with that previously-input value *IF* this is an edit of an existing item *OR*
                                   if there is no new default custom field value coming from the model --}}
@@ -252,17 +254,15 @@
                         $("#assigned_user").show();
 
                         $("#selected_status_status").removeClass('text-danger');
-                        $("#selected_status_status").removeClass('text-warning');
                         $("#selected_status_status").addClass('text-success');
-                        $("#selected_status_status").html('<i class="fas fa-check"></i> {{ trans('admin/hardware/form.asset_deployable')}}');
+                        $("#selected_status_status").html('<x-icon type="checkmark" /> {{ trans('admin/hardware/form.asset_deployable')}}');
 
 
                     } else {
                         $("#assignto_selector").hide();
-                        $("#selected_status_status").removeClass('text-danger');
                         $("#selected_status_status").removeClass('text-success');
-                        $("#selected_status_status").addClass('text-warning');
-                        $("#selected_status_status").html('<i class="fas fa-exclamation-triangle"></i> {{ trans('admin/hardware/form.asset_not_deployable')}} ');
+                        $("#selected_status_status").addClass('text-danger');
+                        $("#selected_status_status").html('<x-icon type="warning" /> {{ (($item->assigned_to!='') && ($item->assigned_type!='') && ($item->deleted_at == '')) ? trans('admin/hardware/form.asset_not_deployable_checkin') : trans('admin/hardware/form.asset_not_deployable')  }} ');
                     }
                 }
             });
@@ -300,7 +300,7 @@
 
             e.preventDefault();
 
-            var auto_tag        = $("#asset_tag").val().replace(/[^\d]/g, '');
+            var auto_tag = $("#asset_tag").val().replace(/^{{ preg_quote(App\Models\Setting::getSettings()->auto_increment_prefix, '/') }}/g, '');
             var box_html        = '';
 			const zeroPad 		= (num, places) => String(num).padStart(places, '0');
 
@@ -321,7 +321,7 @@
                 box_html += '<input type="text"  class="form-control" name="asset_tags[' + x + ']" value="{{ (($snipeSettings->auto_increment_prefix!='') && ($snipeSettings->auto_increment_assets=='1')) ? $snipeSettings->auto_increment_prefix : '' }}'+ auto_tag +'" required>';
                 box_html += '</div>';
                 box_html += '<div class="col-md-2 col-sm-12">';
-                box_html += '<a href="#" class="remove_field btn btn-default btn-sm"><i class="fas fa-minus"></i></a>';
+                box_html += '<a href="#" class="remove_field btn btn-default btn-sm"><x-icon type="minus" /></a>';
                 box_html += '</div>';
                 box_html += '</div>';
                 box_html += '</div>';
diff --git a/resources/views/hardware/history.blade.php b/resources/views/hardware/history.blade.php
index a6c0df20f3..1bb1e80136 100644
--- a/resources/views/hardware/history.blade.php
+++ b/resources/views/hardware/history.blade.php
@@ -87,7 +87,7 @@
                             <div class="form-group">
                                 <div class="col-sm-10 col-md-offset-2">
                                     <label class="form-control">
-                                        {{ Form::checkbox('match_firstnamelastname', '1', Request::old('match_firstnamelastname')) }}
+                                        <input type="checkbox" name="match_firstnamelastname" value="1" @checked(old('match_firstnamelastname'))>
                                         <!-- enclosing span needed for the checkbox CSS to work properly, since there's HTML in the label text -->
                                         <span>
                                             {!!  trans('admin/hardware/general.csv_import_match_f-l') !!}
@@ -100,7 +100,7 @@
                             <div class="form-group">
                                 <div class="col-sm-10 col-md-offset-2">
                                     <label class="form-control">
-                                        {{ Form::checkbox('match_flastname', '1', Request::old('match_flastname')) }}
+                                        <input type="checkbox" name="match_flastname" value="1" @checked(old('match_flastname'))>
                                         <!-- enclosing span needed for the checkbox CSS to work properly, since there's HTML in the label text -->
                                         <span>
                                         {!!  trans('admin/hardware/general.csv_import_match_initial_last') !!}
@@ -113,7 +113,7 @@
                             <div class="form-group">
                                 <div class="col-sm-10 col-md-offset-2">
                                     <label class="form-control">
-                                    {{ Form::checkbox('match_firstname', '1', Request::old('match_firstname')) }}
+                                        <input type="checkbox" name="match_firstname" value="1" @checked(old('match_firstname'))>
                                         <!-- enclosing span needed for the checkbox CSS to work properly, since there's HTML in the label text -->
                                         <span>
                                             {!! trans('admin/hardware/general.csv_import_match_first') !!}
@@ -126,7 +126,7 @@
                             <div class="form-group">
                                 <div class="col-sm-10 col-md-offset-2">
                                     <label class="form-control">
-                                        {{ Form::checkbox('match_email', '1', Request::old('match_email')) }}
+                                        <input type="checkbox" name="match_email" value="1" @checked(old('match_email'))>
                                         <!-- enclosing span needed for the checkbox CSS to work properly, since there's HTML in the label text -->
                                         <span>
                                         {!!  trans('admin/hardware/general.csv_import_match_email') !!}
@@ -139,7 +139,7 @@
                             <div class="form-group">
                                 <div class="col-sm-10 col-md-offset-2">
                                     <label class="form-control">
-                                        {{ Form::checkbox('match_username', '1', Request::old('match_username')) }}
+                                        <input type="checkbox" name="match_username" value="1" @checked(old('match_username'))>
                                         <!-- enclosing span needed for the checkbox CSS to work properly, since there's HTML in the label text -->
                                         <span>
                                             {!!  trans('admin/hardware/general.csv_import_match_username') !!}
diff --git a/resources/views/hardware/index.blade.php b/resources/views/hardware/index.blade.php
index d30a1c012a..62cdd35a78 100755
--- a/resources/views/hardware/index.blade.php
+++ b/resources/views/hardware/index.blade.php
@@ -47,7 +47,7 @@
   <a href="{{ route('reports/custom') }}" style="margin-right: 5px;" class="btn btn-default">
     {{ trans('admin/hardware/general.custom_export') }}</a>
   @can('create', \App\Models\Asset::class)
-  <a href="{{ route('hardware.create') }}" accesskey="n" class="btn btn-primary pull-right"></i> {{ trans('general.create') }}</a>
+  <a href="{{ route('hardware.create') }}" {{$snipeSettings->shortcuts_enabled == 1 ? "n" : ''}} class="btn btn-primary pull-right"></i> {{ trans('general.create') }}</a>
   @endcan
 
 @stop
@@ -73,6 +73,9 @@
                 data-pagination="true"
                 data-id-table="assetsListingTable"
                 data-search="true"
+                data-search-highlight="true"
+                data-show-print="true"
+                data-search-text="{{ e(Session::get('search')) }}"
                 data-side-pagination="server"
                 data-show-columns="true"
                 data-show-export="true"
diff --git a/resources/views/hardware/labels.blade.php b/resources/views/hardware/labels.blade.php
index ab4cb5e339..0d675d3beb 100644
--- a/resources/views/hardware/labels.blade.php
+++ b/resources/views/hardware/labels.blade.php
@@ -11,7 +11,7 @@
 $settings->labels_width = $settings->labels_width - $settings->labels_display_sgutter;
 $settings->labels_height = $settings->labels_height - $settings->labels_display_bgutter;
 // Leave space on bottom for 1D barcode if necessary
-$qr_size = ($settings->alt_barcode_enabled=='1') && ($settings->alt_barcode!='') ? $settings->labels_height - .3 : $settings->labels_height - 0.1;
+$qr_size = ($settings->alt_barcode_enabled=='1') && ($settings->label2_1d_type!='') ? $settings->labels_height - .3 : $settings->labels_height - 0.1;
 ?>
 
 <style>
@@ -156,7 +156,7 @@ $qr_size = ($settings->alt_barcode_enabled=='1') && ($settings->alt_barcode!='')
 
         </div>
 
-        @if ((($settings->alt_barcode_enabled=='1') && $settings->alt_barcode!=''))
+        @if ((($settings->alt_barcode_enabled=='1') && $settings->label2_1d_type!=''))
             <div class="barcode_container">
                 <img src="{{ config('app.url') }}/hardware/{{ $asset->id }}/barcode" class="barcode">
             </div>
diff --git a/resources/views/hardware/quickscan-checkin.blade.php b/resources/views/hardware/quickscan-checkin.blade.php
index 5ab273bffd..3e4d11ec22 100644
--- a/resources/views/hardware/quickscan-checkin.blade.php
+++ b/resources/views/hardware/quickscan-checkin.blade.php
@@ -16,10 +16,10 @@
         }
     </style>
 
-    
+
 
     <div class="row">
-    {{ Form::open(['method' => 'POST', 'class' => 'form-horizontal', 'role' => 'form', 'id' => 'checkin-form' ]) }}
+    <form method="POST" action="{{ route('hardware/quickscancheckin') }}" accept-charset="UTF-8" class="form-horizontal" role="form" id="checkin-form">
         <!-- left column -->
         <div class="col-md-6">
             <div class="box box-default">
@@ -31,34 +31,51 @@
 
                     <!-- Asset Tag -->
                     <div class="form-group {{ $errors->has('asset_tag') ? 'error' : '' }}">
-                        {{ Form::label('asset_tag', trans('general.asset_tag'), array('class' => 'col-md-3 control-label', 'id' => 'checkin_tag')) }}
+                        <label for="asset_tag" class="col-md-3 control-label" id="checkin_tag">{{ trans('general.asset_tag') }}</label>
                         <div class="col-md-9">
-                            <div class="input-group date col-md-5" data-date-format="yyyy-mm-dd">
-                                <input type="text" class="form-control" name="asset_tag" id="asset_tag" value="{{ Request::old('asset_tag') }}">
+                            <div class="input-group col-md-11 required">
+                                <input type="text" class="form-control" name="asset_tag" id="asset_tag" value="{{ old('asset_tag') }}" required>
 
                             </div>
                             {!! $errors->first('asset_tag', '<span class="alert-msg" aria-hidden="true"><i class="fas fa-times" aria-hidden="true"></i> :message</span>') !!}
                         </div>
                     </div>
-    
+
+                    <!-- Status -->
+                    <div class="form-group {{ $errors->has('status_id') ? 'error' : '' }}">
+                        <label for="status_id" class="col-md-3 control-label">
+                            {{ trans('admin/hardware/form.status') }}
+                        </label>
+                        <div class="col-md-7">
+                            <x-input.select
+                                name="status_id"
+                                id="status_id"
+                                :options="$statusLabel_list"
+                                style="width:100%"
+                                aria-label="status_id"
+                            />
+                            {!! $errors->first('status_id', '<span class="alert-msg" aria-hidden="true"><i class="fas fa-times" aria-hidden="true"></i> :message</span>') !!}
+                        </div>
+                    </div>
+
                     <!-- Locations -->
                     @include ('partials.forms.edit.location-select', ['translated_name' => trans('general.location'), 'fieldname' => 'location_id'])
 
                     <!-- Note -->
                         <div class="form-group {{ $errors->has('note') ? 'error' : '' }}">
-                            {{ Form::label('note', trans('admin/hardware/form.notes'), array('class' => 'col-md-3 control-label')) }}
+                            <label for="note" class="col-md-3 control-label">{{ trans('admin/hardware/form.notes') }}</label>
                             <div class="col-md-8">
                                 <textarea class="col-md-6 form-control" id="note" name="note">{{ old('note') }}</textarea>
                                 {!! $errors->first('note', '<span class="alert-msg" aria-hidden="true"><i class="fas fa-times" aria-hidden="true"></i> :message</span>') !!}
                             </div>
                         </div>
-    
-    
+
+
 
                 </div> <!--/.box-body-->
                 <div class="box-footer">
                     <a class="btn btn-link" href="{{ route('hardware.index') }}"> {{ trans('button.cancel') }}</a>
-                    <button type="submit" id="checkin_button" class="btn btn-success pull-right"><i class="fas fa-check icon-white" aria-hidden="true"></i> {{ trans('general.checkin') }}</button>
+                    <button type="submit" id="checkin_button" class="btn btn-success pull-right"><x-icon type="checkmark" /> {{ trans('general.checkin') }}</button>
                 </div>
 
 
@@ -67,7 +84,7 @@
 
 
 
-            {{Form::close()}}
+            </form>
         </div> <!--/.col-md-6-->
 
         <div class="col-md-6">
@@ -76,7 +93,7 @@
                     <h2 class="box-title"> {{ trans('general.quickscan_checkin_status') }} (<span id="checkin-counter">0</span> {{ trans('general.assets_checked_in_count') }}) </h2>
                 </div>
                 <div class="box-body">
-    
+
                     <table id="checkedin" class="table table-striped snipe-table">
                         <thead>
                         <tr>
@@ -88,7 +105,7 @@
                         </tr>
                         <tr id="checkin-loader" style="display: none;">
                             <td colspan="3">
-                                <i class="fas fa-spinner spin" aria-hidden="true"></i> {{ trans('general.processing') }}...
+                                <x-icon type="spinner" />  {{ trans('general.processing') }}...
                             </td>
                         </tr>
                         </thead>
@@ -129,6 +146,12 @@
                 success : function (data) {
                     if (data.status == 'success') {
                         $('#checkedin tbody').prepend("<tr class='success'><td>" + data.payload.asset_tag + "</td><td>" + data.payload.model + "</td><td>" + data.payload.model_number + "</td><td>" + data.messages + "</td><td><i class='fas fa-check text-success'></i></td></tr>");
+
+                        @if ($user?->enable_sounds)
+                        var audio = new Audio('{{ config('app.url') }}/sounds/success.mp3');
+                        audio.play()
+                        @endif
+
                         incrementOnSuccess();
                     } else {
                         handlecheckinFail(data);
@@ -148,6 +171,12 @@
         });
 
         function handlecheckinFail (data) {
+
+            @if ($user?->enable_sounds)
+            var audio = new Audio('{{ config('app.url') }}/sounds/error.mp3');
+            audio.play()
+            @endif
+
             if (data.payload.asset_tag) {
                 var asset_tag = data.payload.asset_tag;
                 var model = data.payload.model;
diff --git a/resources/views/hardware/quickscan.blade.php b/resources/views/hardware/quickscan.blade.php
index 4ba4321c63..efad784eb8 100644
--- a/resources/views/hardware/quickscan.blade.php
+++ b/resources/views/hardware/quickscan.blade.php
@@ -16,10 +16,10 @@
         }
     </style>
 
-    
+
 
     <div class="row">
-    {{ Form::open(['method' => 'POST', 'class' => 'form-horizontal', 'role' => 'form', 'id' => 'audit-form' ]) }}
+    <form method="POST" accept-charset="UTF-8" class="form-horizontal" role="form" id="audit-form">
         <!-- left column -->
         <div class="col-md-6">
             <div class="box box-default">
@@ -29,10 +29,10 @@
 
                     <!-- Next Audit -->
                         <div class="form-group {{ $errors->has('asset_tag') ? 'error' : '' }}">
-                            {{ Form::label('asset_tag', trans('general.asset_tag'), array('class' => 'col-md-3 control-label', 'id' => 'audit_tag')) }}
+                            <label for="asset_tag" class="col-md-3 control-label" id="audit_tag">{{ trans('general.asset_tag') }}</label>
                             <div class="col-md-9">
-                                <div class="input-group date col-md-5" data-date-format="yyyy-mm-dd">
-                                    <input type="text" class="form-control" name="asset_tag" id="asset_tag" value="{{ Request::old('asset_tag') }}">
+                                <div class="input-group date col-md-11 required" data-date-format="yyyy-mm-dd">
+                                    <input type="text" class="form-control" name="asset_tag" id="asset_tag" required value="{{ old('asset_tag') }}">
 
                                 </div>
                                 {!! $errors->first('asset_tag', '<span class="alert-msg" aria-hidden="true"><i class="fas fa-times" aria-hidden="true"></i> :message</span>') !!}
@@ -49,22 +49,22 @@
                         <div class="form-group">
                             <div class="col-sm-offset-3 col-md-9">
                                 <label class="form-control">
-                                    <input type="checkbox" value="1" name="update_location" {{ old('update_location') == '1' ? ' checked="checked"' : '' }}> {{ trans('admin/hardware/form.asset_location') }}
+                                    <input type="checkbox" value="1" name="update_location" {{ old('update_location') == '1' ? ' checked="checked"' : '' }}>
+                                    <span>{{ trans('admin/hardware/form.asset_location') }}
+                                    <a href="#" class="text-dark-gray" tabindex="0" role="button" data-toggle="popover" data-trigger="focus" title="<i class='far fa-life-ring'></i> {{ trans('general.more_info') }}" data-html="true" data-content="{{ trans('general.quickscan_bulk_help') }}">
+                                        <x-icon type="more-info" /></a></span>
                                 </label>
-
-                                <a href="#" class="text-dark-gray" tabindex="0" role="button" data-toggle="popover" data-trigger="focus" title="<i class='far fa-life-ring'></i> More Info" data-html="true" data-content="Checking this box will edit the asset record to reflect this new location. Leaving it unchecked will simply note the location in the audit log.<br><br>Note that if this asset is checked out, it will not change the location of the person, asset or location it is checked out to."><i class="far fa-life-ring"></i></a>
-
                             </div>
                         </div>
 
 
                         <!-- Next Audit -->
                         <div class="form-group {{ $errors->has('next_audit_date') ? 'error' : '' }}">
-                            {{ Form::label('next_audit_date', trans('general.next_audit_date'), array('class' => 'col-md-3 control-label')) }}
+                            <label for="next_audit_date" class="col-md-3 control-label">{{ trans('general.next_audit_date') }}</label>
                             <div class="col-md-9">
                                 <div class="input-group date col-md-5" data-provide="datepicker" data-date-format="yyyy-mm-dd" data-date-clear-btn="true">
                                     <input type="text" class="form-control" placeholder="{{ trans('general.next_audit_date') }}" name="next_audit_date" id="next_audit_date" value="{{ old('next_audit_date', $next_audit_date) }}">
-                                    <span class="input-group-addon"><i class="fas fa-calendar" aria-hidden="true"></i></span>
+                                    <span class="input-group-addon"><x-icon type="calendar" /></span>
                                 </div>
                                 {!! $errors->first('next_audit_date', '<span class="alert-msg" aria-hidden="true"><i class="fas fa-times" aria-hidden="true"></i> :message</span>') !!}
                             </div>
@@ -73,28 +73,26 @@
 
                         <!-- Note -->
                         <div class="form-group {{ $errors->has('note') ? 'error' : '' }}">
-                            {{ Form::label('note', trans('admin/hardware/form.notes'), array('class' => 'col-md-3 control-label')) }}
+                            <label for="note" class="col-md-3 control-label">{{ trans('admin/hardware/form.notes') }}</label>
                             <div class="col-md-8">
                                 <textarea class="col-md-6 form-control" id="note" name="note">{{ old('note') }}</textarea>
                                 {!! $errors->first('note', '<span class="alert-msg" aria-hidden="true"><i class="fas fa-times" aria-hidden="true"></i> :message</span>') !!}
                             </div>
                         </div>
 
-
-
                     </div> <!--/.box-body-->
                     <div class="box-footer">
                         <a class="btn btn-link" href="{{ route('hardware.index') }}"> {{ trans('button.cancel') }}</a>
-                        <button type="submit" id="audit_button" class="btn btn-success pull-right"><i class="fas fa-check icon-white" aria-hidden="true"></i> {{ trans('general.audit') }}</button>
+                        <button type="submit" id="audit_button" class="btn btn-success pull-right">
+                            <x-icon type="checkmark" />
+                            {{ trans('general.audit') }}
+                        </button>
                     </div>
-
-
-
             </div>
 
 
 
-            {{Form::close()}}
+            </form>
         </div> <!--/.col-md-6-->
 
         <div class="col-md-6">
@@ -103,7 +101,7 @@
                     <h2 class="box-title"> {{ trans('general.bulkaudit_status') }} (<span id="audit-counter">0</span> {{ trans('general.assets_audited') }}) </h2>
                 </div>
                 <div class="box-body">
-    
+
                     <table id="audited" class="table table-striped snipe-table">
                         <thead>
                         <tr>
@@ -113,7 +111,8 @@
                         </tr>
                         <tr id="audit-loader" style="display: none;">
                             <td colspan="3">
-                                <i class="fas fa-spinner spin" aria-hidden="true"></i> {{ trans('admin/hardware/form.processing_spinner') }}
+                                <x-icon type="spinner" />
+                                {{ trans('admin/hardware/form.processing') }}
                             </td>
                         </tr>
                         </thead>
@@ -141,9 +140,10 @@
 
             var form = $("#audit-form").get(0);
             var formData = $('#audit-form').serializeArray();
+            var asset_tag = $('#asset_tag').val();
 
             $.ajax({
-                url: "{{ route('api.asset.audit') }}",
+                url: "{{ route('api.asset.audit.legacy') }}",
                 type : 'POST',
                 headers: {
                     "X-Requested-With": 'XMLHttpRequest',
@@ -152,16 +152,23 @@
                 dataType : 'json',
                 data : formData,
                 success : function (data) {
+
                     if (data.status == 'success') {
-                        $('#audited tbody').prepend("<tr class='success'><td>" + data.payload.asset_tag + "</td><td>" + data.messages + "</td><td><i class='fas fa-check text-success'></i></td></tr>");
+                        $('#audited tbody').prepend("<tr class='success'><td>" + data.payload.asset_tag + "</td><td>" + data.messages + "</td><td><i class='fas fa-check text-success' style='font-size:18px;'></i></td></tr>");
+
+                        @if ($user->enable_sounds)
+                        var audio = new Audio('{{ config('app.url') }}/sounds/success.mp3');
+                        audio.play()
+                        @endif
+
                         incrementOnSuccess();
                     } else {
-                        handleAuditFail(data);
+                        handleAuditFail(data, asset_tag);
                     }
                     $('input#asset_tag').val('');
                 },
                 error: function (data) {
-                    handleAuditFail(data);
+                    handleAuditFail(data, asset_tag);
                 },
                 complete: function() {
                     $('#audit-loader').hide();
@@ -172,18 +179,29 @@
             return false;
         });
 
-        function handleAuditFail (data) {
-            if (data.asset_tag) {
-                var asset_tag = data.asset_tag;
-            } else {
-                var asset_tag = '';
+        function handleAuditFail (data, asset_tag) {
+            @if ($user->enable_sounds)
+            var audio = new Audio('{{ config('app.url') }}/sounds/error.mp3');
+            audio.play()
+            @endif
+
+
+            if ((!asset_tag) && (data.payload)  && (data.payload.asset_tag)) {
+                asset_tag = data.payload.asset_tag;
             }
-            if (data.messages) {
-                var messages = data.messages;
-            } else {
-                var messages = '';
+
+            asset_tag = jQuery('<span>' + asset_tag + '</span>').text();
+
+            let messages = "";
+
+            // Loop through the error messages
+            if ((data.messages)  && (data.messages)) {
+                for (let x in data.messages) {
+                    messages += data.messages[x];
+                }
             }
-            $('#audited tbody').prepend("<tr class='danger'><td>" + data.payload.asset_tag + "</td><td>" + messages + "</td><td><i class='fas fa-times text-danger'></i></td></tr>");
+
+            $('#audited tbody').prepend("<tr class='danger'><td>" + asset_tag + "</td><td>" + messages + "</td><td><i class='fas fa-times text-danger' style='font-size:18px;'></i></td></tr>");
         }
 
         function incrementOnSuccess() {
diff --git a/resources/views/hardware/requested.blade.php b/resources/views/hardware/requested.blade.php
index 83ea30090f..7a167ec244 100644
--- a/resources/views/hardware/requested.blade.php
+++ b/resources/views/hardware/requested.blade.php
@@ -20,7 +20,6 @@
                     <div class="row">
                         <div class="col-md-12">
 
-        @if ($requestedItems->count() > 0)
         <div class="table-responsive">
             <table
                     name="requestedAssets"
@@ -29,6 +28,8 @@
                     id="requestedAssets"
                     data-advanced-search="true"
                     data-search="true"
+                    data-search-highlight="true"
+                    data-show-print="true"
                     data-show-columns="true"
                     data-show-export="true"
                     data-pagination="true"
@@ -40,8 +41,8 @@
                     }'>
                 <thead>
                     <tr role="row">
-                        <th class="col-md-1">Image</th>
-                        <th class="col-md-2">Item Name</th>
+                        <th class="col-md-1">{{ trans('general.image') }}</th>
+                        <th class="col-md-2">{{ trans('general.name') }}</th>
                         <th class="col-md-2" data-sortable="true">{{ trans('admin/hardware/table.location') }}</th>
                         <th class="col-md-2" data-sortable="true">{{ trans('admin/hardware/form.expected_checkin') }}</th>
                         <th class="col-md-3" data-sortable="true">{{ trans('admin/hardware/table.requesting_user') }}</th>
@@ -100,12 +101,19 @@
                             </td>
                             <td>{{ App\Helpers\Helper::getFormattedDateObject($request->created_at, 'datetime', false) }}</td>
                             <td>
-                                {{ Form::open([
-                                    'method' => 'POST',
-                                    'route' => ['account/request-item', $request->itemType(), $request->requestable->id, true, $request->requestingUser()->id],
-                                    ]) }}
+                                <form
+                                    method="POST"
+                                    action="{{ route('account/request-item', [
+                                        $request->itemType(),
+                                        $request->requestable->id,
+                                         true,
+                                         $request->requestingUser()->id
+                                    ]) }}"
+                                    accept-charset="UTF-8"
+                                >
+                                    @csrf
                                     <button class="btn btn-warning btn-sm" data-tooltip="true" title="{{ trans('general.cancel_request') }}">{{ trans('button.cancel') }}</button>
-                                {{ Form::close() }}
+                                </form>
                             </td>
                             <td>
                                 @if ($request->itemType() == "asset")
@@ -126,14 +134,7 @@
             </table>
         </div>
 
-        @else
-        <div class="col-md-12">
-            <div class="alert alert-info alert-block">
-                <i class="fas fa-info-circle"></i>
-                {{ trans('general.no_results') }}
-            </div>
-        </div>
-        @endif
+
                         </div>
                     </div>
                 </div>
diff --git a/resources/views/hardware/view.blade.php b/resources/views/hardware/view.blade.php
index 179db4a0b1..4ec8c36234 100755
--- a/resources/views/hardware/view.blade.php
+++ b/resources/views/hardware/view.blade.php
@@ -9,12 +9,13 @@
 {{-- Page content --}}
 @section('content')
 
+
     <div class="row">
 
         @if (!$asset->model)
             <div class="col-md-12">
                 <div class="callout callout-danger">
-                      <p><strong>{{ trans('admin/models/message.no_association') }}</strong> {{ trans('admin/models/message.no_association_fix') }}</p>
+                    <p><strong>{{ trans('admin/models/message.no_association') }}</strong> {{ trans('admin/models/message.no_association_fix') }}</p>
                 </div>
             </div>
         @endif
@@ -26,7 +27,7 @@
                         [
                             'warning' => trans('admin/hardware/message.warning_audit_date_mismatch',
                                     [
-                                        'last_audit_date' => Helper::getFormattedDateObject($asset->last_audit_date, 'date', false),
+                                        'last_audit_date' => Helper::getFormattedDateObject($asset->last_audit_date, 'datetime', false),
                                         'next_audit_date' => Helper::getFormattedDateObject($asset->next_audit_date, 'date', false)
                                     ]
                                     )
@@ -38,37 +39,33 @@
 
         @if ($asset->deleted_at!='')
             <div class="col-md-12">
-                <div class="alert alert-danger">
-                    <i class="fas fa-exclamation-triangle faa-pulse animated" aria-hidden="true"></i>
-                    <strong>{{ trans('general.notification_warning') }} </strong>
+                <div class="callout callout-warning">
+                    <x-icon type="warning" />
                     {{ trans('general.asset_deleted_warning') }}
                 </div>
             </div>
         @endif
 
         <div class="col-md-12">
-
-
-            <!-- Custom Tabs -->
             <div class="nav-tabs-custom">
-                <ul class="nav nav-tabs">
+                <ul class="nav nav-tabs hidden-print">
 
                     <li class="active">
                         <a href="#details" data-toggle="tab">
                           <span class="hidden-lg hidden-md">
-                          <i class="fas fa-info-circle fa-2x"></i>
+                            <x-icon type="info-circle" class="fa-2x" />
                           </span>
-                          <span class="hidden-xs hidden-sm">{{ trans('admin/users/general.info') }}</span>
+                            <span class="hidden-xs hidden-sm">{{ trans('admin/users/general.info') }}</span>
                         </a>
                     </li>
 
                     <li>
                         <a href="#software" data-toggle="tab">
                           <span class="hidden-lg hidden-md">
-                            <i class="far fa-save fa-2x" aria-hidden="true"></i>
+                           <x-icon type="licenses" class="fa-2x" />
                           </span>
-                          <span class="hidden-xs hidden-sm">{{ trans('general.licenses') }}
-                            {!! ($asset->licenses->count() > 0 ) ? '<span class="badge badge-secondary">'.number_format($asset->licenses->count()).'</span>' : '' !!}
+                            <span class="hidden-xs hidden-sm">{{ trans('general.licenses') }}
+                                {!! ($asset->licenses->count() > 0 ) ? '<span class="badge badge-secondary">'.number_format($asset->licenses->count()).'</span>' : '' !!}
                           </span>
                         </a>
                     </li>
@@ -76,10 +73,10 @@
                     <li>
                         <a href="#components" data-toggle="tab">
                           <span class="hidden-lg hidden-md">
-                            <i class="far fa-hdd fa-2x" aria-hidden="true"></i>
+                            <x-icon type="components" class="fa-2x" />
                           </span>
-                          <span class="hidden-xs hidden-sm">{{ trans('general.components') }}
-                            {!! ($asset->components->count() > 0 ) ? '<span class="badge badge-secondary">'.number_format($asset->components->count()).'</span>' : '' !!}
+                            <span class="hidden-xs hidden-sm">{{ trans('general.components') }}
+                                {!! ($asset->components->count() > 0 ) ? '<span class="badge badge-secondary">'.number_format($asset->components->count()).'</span>' : '' !!}
                           </span>
                         </a>
                     </li>
@@ -87,22 +84,55 @@
                     <li>
                         <a href="#assets" data-toggle="tab">
                           <span class="hidden-lg hidden-md">
-                            <i class="fas fa-barcode fa-2x" aria-hidden="true"></i>
+                            <x-icon type="assets" class="fa-2x" />
                           </span>
-                          <span class="hidden-xs hidden-sm">{{ trans('general.assets') }}
-                            {!! ($asset->assignedAssets()->count() > 0 ) ? '<span class="badge badge-secondary">'.number_format($asset->assignedAssets()->count()).'</span>' : '' !!}
+                            <span class="hidden-xs hidden-sm">
+                                {{ trans('general.assets') }}
+                                {!! ($asset->assignedAssets()->count() > 0 ) ? '<span class="badge badge-secondary">'.number_format($asset->assignedAssets()->count()).'</span>' : '' !!}
 
                           </span>
                         </a>
                     </li>
 
+                    @if ($asset->assignedAccessories->count() > 0)
+                        <li>
+                            <a href="#accessories_assigned" data-toggle="tab" data-tooltip="true">
+
+                                <span class="hidden-lg hidden-md">
+                                    <i class="fas fa-keyboard fa-2x"></i>
+                                </span>
+                                <span class="hidden-xs hidden-sm">
+                                    {{ trans('general.accessories_assigned') }}
+                                    {!! ($asset->assignedAccessories()->count() > 0 ) ? '<span class="badge badge-secondary">'.number_format($asset->assignedAccessories()->count()).'</span>' : '' !!}
+
+                                </span>
+                            </a>
+                        </li>
+                    @endif
+
+
+                    @if ($asset->audits->count() > 0)
+                        <li>
+                            <a href="#audits" data-toggle="tab" data-tooltip="true">
+
+                                <span class="hidden-lg hidden-md">
+                                    <i class="fas fa-clipboard-check fa-2x"></i>
+                                </span>
+                                <span class="hidden-xs hidden-sm">
+                                    {{ trans('general.audits') }}
+                                    {!! ($asset->audits()->count() > 0 ) ? '<span class="badge badge-secondary">'.number_format($asset->audits()->count()).'</span>' : '' !!}
+
+                                </span>
+                            </a>
+                        </li>
+                    @endif
 
                     <li>
                         <a href="#history" data-toggle="tab">
                           <span class="hidden-lg hidden-md">
-                            <i class="fas fa-history fa-2x" aria-hidden="true"></i>
+                              <x-icon type="history" class="fa-2x "/>
                           </span>
-                          <span class="hidden-xs hidden-sm">{{ trans('general.history') }}
+                            <span class="hidden-xs hidden-sm">{{ trans('general.history') }}
                           </span>
                         </a>
                     </li>
@@ -110,10 +140,10 @@
                     <li>
                         <a href="#maintenances" data-toggle="tab">
                           <span class="hidden-lg hidden-md">
-                            <i class="fas fa-wrench fa-2x" aria-hidden="true"></i>
+                              <x-icon type="maintenances" class="fa-2x" />
                           </span>
-                          <span class="hidden-xs hidden-sm">{{ trans('general.maintenances') }}
-                            {!! ($asset->assetmaintenances()->count() > 0 ) ? '<span class="badge badge-secondary">'.number_format($asset->assetmaintenances()->count()).'</span>' : '' !!}
+                            <span class="hidden-xs hidden-sm">{{ trans('general.maintenances') }}
+                                {!! ($asset->assetmaintenances()->count() > 0 ) ? '<span class="badge badge-secondary">'.number_format($asset->assetmaintenances()->count()).'</span>' : '' !!}
                           </span>
                         </a>
                     </li>
@@ -121,54 +151,297 @@
                     <li>
                         <a href="#files" data-toggle="tab">
                           <span class="hidden-lg hidden-md">
-                            <i class="far fa-file fa-2x" aria-hidden="true"></i>
+                            <x-icon type="files" class="fa-2x" />
                           </span>
-                          <span class="hidden-xs hidden-sm">{{ trans('general.files') }}
-                            {!! ($asset->uploads->count() > 0 ) ? '<span class="badge badge-secondary">'.number_format($asset->uploads->count()).'</span>' : '' !!}
+                            <span class="hidden-xs hidden-sm">{{ trans('general.files') }}
+                                {!! ($asset->uploads->count() > 0 ) ? '<span class="badge badge-secondary">'.number_format($asset->uploads->count()).'</span>' : '' !!}
                           </span>
                         </a>
                     </li>
 
+                    @can('view', $asset->model)
                     <li>
-                    <a href="#modelfiles" data-toggle="tab">
+                        <a href="#modelfiles" data-toggle="tab">
                           <span class="hidden-lg hidden-md">
-                              <i class="fa-solid fa-laptop-file fa-2x" aria-hidden="true"></i>
+                              <x-icon type="more-files" class="fa-2x" />
                           </span>
-                        <span class="hidden-xs hidden-sm">
+                            <span class="hidden-xs hidden-sm">
                             {{ trans('general.additional_files') }}
-                            {!! ($asset->model) && ($asset->model->uploads->count() > 0 ) ? '<span class="badge badge-secondary">'.number_format($asset->model->uploads->count()).'</span>' : '' !!}
+                                {!! ($asset->model) && ($asset->model->uploads->count() > 0 ) ? '<span class="badge badge-secondary">'.number_format($asset->model->uploads->count()).'</span>' : '' !!}
                           </span>
-                    </a>
+                        </a>
                     </li>
+                    @endcan
 
 
                     @can('update', \App\Models\Asset::class)
                         <li class="pull-right">
                             <a href="#" data-toggle="modal" data-target="#uploadFileModal">
-                                <i class="fas fa-paperclip" aria-hidden="true"></i>
-                                {{ trans('button.upload') }}
+                                <span class="hidden-lg hidden-xl hidden-md">
+                                    <x-icon type="paperclip" class="fa-2x" />
+                                </span>
+                                <span class="hidden-xs hidden-sm">
+                                    <x-icon type="paperclip" />
+                                    {{ trans('button.upload') }}
+                                </span>
                             </a>
                         </li>
                     @endcan
 
-
                 </ul>
 
                 <div class="tab-content">
-
                     <div class="tab-pane fade in active" id="details">
-                        <div class="row">
-                            <div class="col-md-8">
+                    <div class="row">
+
+                        <div class="info-stack-container">
+                            <!-- Start button column -->
+                            <div class="col-md-3 col-xs-12 col-sm-push-9 info-stack">
+
+                                <div class="col-md-12 text-center">
+                                    @if (($asset->image) || (($asset->model) && ($asset->model->image!='')))
+                                        <div class="text-center col-md-12" style="padding-bottom: 15px;">
+                                            <a href="{{ ($asset->getImageUrl()) ? $asset->getImageUrl() : null }}" data-toggle="lightbox" data-type="image">
+                                                <img src="{{ ($asset->getImageUrl()) ? $asset->getImageUrl() : null }}" class="assetimg img-responsive" alt="{{ $asset->getDisplayNameAttribute() }}">
+                                            </a>
+                                        </div>
+                                    @else
+                                        <!-- generic image goes here -->
+                                    @endif
+                                </div>
+
+
+                                @if ($asset->deleted_at=='')
+                                    @can('update', $asset)
+                                        <div class="col-md-12 hidden-print" style="padding-top: 5px;">
+                                            <a href="{{ route('hardware.edit', $asset) }}" class="btn btn-sm btn-warning btn-social btn-block hidden-print">
+                                                <x-icon type="edit" />
+                                                {{ trans('admin/hardware/general.edit') }}
+                                            </a>
+                                        </div>
+                                    @endcan
+
+
+                                @if (($asset->assetstatus) && ($asset->assetstatus->deployable=='1'))
+                                    @if (($asset->assigned_to != '') && ($asset->deleted_at==''))
+                                        @can('checkin', $asset)
+                                            <div class="col-md-12 hidden-print" style="padding-top: 5px;">
+                                                    <span class="tooltip-wrapper"{!! (!$asset->model ? ' data-tooltip="true" title="'.trans('admin/hardware/general.model_invalid_fix').'"' : '') !!}>
+                                                        <a role="button" href="{{ route('hardware.checkin.create', $asset->id) }}" class="btn btn-sm btn-primary bg-purple btn-social btn-block hidden-print{{ (!$asset->model ? ' disabled' : '') }}">
+                                                            <x-icon type="checkin" />
+                                                            {{ trans('admin/hardware/general.checkin') }}
+                                                        </a>
+                                                    </span>
+                                            </div>
+                                        @endcan
+                                    @elseif (($asset->assigned_to == '') && ($asset->deleted_at==''))
+                                        @can('checkout', $asset)
+                                            <div class="col-md-12 hidden-print" style="padding-top: 5px;">
+                                                    <span class="tooltip-wrapper"{!! (!$asset->model ? ' data-tooltip="true" title="'.trans('admin/hardware/general.model_invalid_fix').'"' : '') !!}>
+                                                        <a href="{{ route('hardware.checkout.create', $asset->id)  }}" class="btn btn-sm bg-maroon btn-social btn-block hidden-print{{ (!$asset->model ? ' disabled' : '') }}">
+                                                             <x-icon type="checkout" />
+                                                            {{ trans('admin/hardware/general.checkout') }}
+                                                    </a>
+                                                    </span>
+                                            </div>
+                                        @endcan
+                                    @endif
+                                @endif
+
+                                        <!-- Add notes -->
+                                        @can('update', \App\Models\Asset::class)
+                                            <div class="col-md-12 hidden-print" style="padding-top: 5px;">
+                                                <a href="#" style="width: 100%" data-toggle="modal" data-target="#createNoteModal" class="btn btn-sm btn-primary btn-block btn-social hidden-print">
+                                                    <x-icon type="note" />
+                                                    {{ trans('general.add_note') }}
+                                                </a>
+                                                @include ('modals.add-note', ['type' => 'asset', 'id' => $asset->id])
+                                            </div>
+                                        @endcan
+
+
+
+
+                                    @can('audit', \App\Models\Asset::class)
+                                        <div class="col-md-12 hidden-print" style="padding-top: 5px;">
+                                        <span class="tooltip-wrapper"{!! (!$asset->model ? ' data-tooltip="true" title="'.trans('admin/hardware/general.model_invalid_fix').'"' : '') !!}>
+                                            <a href="{{ route('asset.audit.create', $asset->id)  }}" class="btn btn-sm btn-primary btn-block btn-social hidden-print{{ (!$asset->model ? ' disabled' : '') }}">
+                                                 <x-icon type="audit" />
+                                             {{ trans('general.audit') }}
+                                            </a>
+                                        </span>
+                                        </div>
+                                    @endcan
+                                @endif
+
+                                @can('create', $asset)
+                                    <div class="col-md-12 hidden-print" style="padding-top: 5px;">
+                                        <a href="{{ route('clone/hardware', $asset->id) }}" class="btn btn-sm btn-info btn-block btn-social hidden-print">
+                                            <x-icon type="clone" />
+                                            {{ trans('admin/hardware/general.clone') }}
+                                        </a>
+                                    </div>
+                                @endcan
+
+                                <div class="col-md-12 hidden-print" style="padding-top: 5px;">
+                                    <form
+                                        method="POST"
+                                        action="{{ route('hardware/bulkedit') }}"
+                                        accept-charset="UTF-8"
+                                        class="form-inline"
+                                        target="_blank"
+                                        id="bulkForm"
+                                    >
+                                    @csrf
+                                    <input type="hidden" name="bulk_actions" value="labels" />
+                                    <input type="hidden" name="ids[{{$asset->id}}]" value="{{ $asset->id }}" />
+                                    <button class="btn btn-block btn-social btn-sm btn-default" id="bulkEdit"{{ (!$asset->model ? ' disabled' : '') }}{!! (!$asset->model ? ' data-tooltip="true" title="'.trans('admin/hardware/general.model_invalid').'"' : '') !!}>
+                                        <x-icon type="assets" />
+                                        {{ trans_choice('button.generate_labels', 1) }}</button>
+                                    </form>
+                                </div>
+
+                                @can('delete', $asset)
+                                    <div class="col-md-12 hidden-print" style="padding-top: 30px; padding-bottom: 30px;">
+
+                                        @if ($asset->deleted_at=='')
+                                            <button class="btn btn-sm btn-block btn-danger btn-social delete-asset" data-toggle="modal" data-title="{{ trans('general.delete') }}" data-content="{{ trans('general.sure_to_delete_var', ['item' => $asset->asset_tag]) }}" data-target="#dataConfirmModal">
+
+                                                <x-icon type="delete" />
+                                                @if ($asset->assignedTo)
+                                                    {{ trans('general.checkin_and_delete') }}
+                                                @else
+                                                    {{ trans('general.delete') }}
+                                                @endif
+                                            </button>
+                                            <span class="sr-only">{{ trans('general.delete') }}</span>
+                                        @else
+                                            <form method="POST" action="{{ route('restore/hardware', [$asset]) }}">
+                                                @csrf
+                                                <button class="btn btn-sm btn-block btn-warning btn-social delete-asset">
+                                                    <x-icon type="restore" />
+                                                    {{ trans('general.restore') }}
+                                                </button>
+                                            </form>
+                                        @endif
+                                    </div>
+                                @endcan
+
+                                @if (($asset->assignedTo) && ($asset->deleted_at==''))
+                                    <div class="col-md-12" style="text-align: left">
+                                        <h2>
+                                            {{ trans('admin/hardware/form.checkedout_to') }}
+                                            <x-icon type="long-arrow-right" />
+                                        </h2>
+
+                                        <ul class="list-unstyled" style="line-height: 25px; font-size: 14px">
+
+                                            @if (($asset->checkedOutToUser()) && ($asset->assignedTo->present()->gravatar()))
+                                                <li>
+                                                    <img src="{{ $asset->assignedTo->present()->gravatar() }}" class="user-image-inline hidden-print" alt="{{ $asset->assignedTo->present()->fullName() }}">
+                                                    {!! $asset->assignedTo->present()->nameUrl() !!}
+                                                </li>
+                                            @else
+                                                <li>
+                                                    <x-icon type="{{ $asset->assignedType() }}" class="fa-fw" />
+                                                    {!! $asset->assignedTo->present()->nameUrl() !!}
+                                                </li>
+                                            @endif
+
+
+                                            @if ((isset($asset->assignedTo->employee_num)) && ($asset->assignedTo->employee_num!=''))
+                                                <li>
+                                                    <x-icon type="employee_num" class="fa-fw"/>
+                                                    {{ $asset->assignedTo->employee_num }}
+                                                </li>
+                                            @endif
+                                            @if ((isset($asset->assignedTo->email)) && ($asset->assignedTo->email!=''))
+                                                <li>
+                                                    <x-icon type="email" class="fa-fw" />
+                                                    <a href="mailto:{{ $asset->assignedTo->email }}">{{ $asset->assignedTo->email }}</a>
+                                                </li>
+                                            @endif
+
+                                            @if ((isset($asset->assignedTo)) && ($asset->assignedTo->phone!=''))
+                                                <li>
+                                                    <x-icon type="phone" class="fa-fw" />
+                                                    <a href="tel:{{ $asset->assignedTo->phone }}">{{ $asset->assignedTo->phone }}</a>
+                                                </li>
+                                            @endif
+
+                                            @if((isset($asset->assignedTo)) && ($asset->assignedTo->department))
+                                                <li>
+                                                    <x-icon type="department" class="fa-fw" />
+                                                    {{ $asset->assignedTo->department->name}}</li>
+                                            @endif
+
+                                            @if (isset($asset->location))
+                                                <li>
+                                                    <x-icon type="locations" class="fa-fw" />
+                                                     {{ $asset->location->name }}</li>
+                                                <li>{{ $asset->location->address }}
+                                                    @if ($asset->location->address2!='')
+                                                        {{ $asset->location->address2 }}
+                                                    @endif
+                                                </li>
+
+                                                <li>{{ $asset->location->city }}
+                                                    @if (($asset->location->city!='') && ($asset->location->state!=''))
+                                                        ,
+                                                    @endif
+                                                    {{ $asset->location->state }} {{ $asset->location->zip }}
+                                                </li>
+                                            @endif
+                                            <li>
+                                                <x-icon type="calendar" class="fa-fw" />
+                                                {{ trans('admin/hardware/form.checkout_date') }}: {{ Helper::getFormattedDateObject($asset->last_checkout, 'date', false) }}
+                                            </li>
+                                            @if (isset($asset->expected_checkin))
+                                                <li>
+                                                    <x-icon type="calendar" class="fa-fw" />
+                                                    {{ trans('admin/hardware/form.expected_checkin') }}: {{ Helper::getFormattedDateObject($asset->expected_checkin, 'date', false) }}
+                                                </li>
+                                            @endif
+                                        </ul>
+                                    </div>
+                                @endif
+                                    <div class="col-md-12 text-center" style="padding-top: 15px;">
+                                        <img src="{{ config('app.url') }}/hardware/{{ $asset->id }}/qr_code" class="img-thumbnail" style="height: 150px; width: 150px; margin-right: 10px;" alt="QR code for {{ $asset->getDisplayNameAttribute() }}">
+                                    </div>
+                                <br><br>
+                            </div>
+
+
+
+
+                            <!-- End button column -->
+
+                            <div class="col-md-9 col-xs-12 col-sm-pull-3 info-stack">
+
+                                <div class="row-new-striped">
+
+                                    @if ($asset->asset_tag)
+                                        <div class="row">
+                                            <div class="col-md-3">
+                                                <strong>{{ trans('admin/hardware/form.tag') }}</strong>
+                                            </div>
+                                            <div class="col-md-9">
+                                                <span class="js-copy-assettag">{{ $asset->asset_tag  }}</span>
+
+                                                <i class="fa-regular fa-clipboard js-copy-link hidden-print" data-clipboard-target=".js-copy-assettag" aria-hidden="true" data-tooltip="true" data-placement="top" title="{{ trans('general.copy_to_clipboard') }}">
+                                                    <span class="sr-only">{{ trans('general.copy_to_clipboard') }}</span>
+                                                </i>
+                                            </div>
+                                        </div>
+                                    @endif
 
-                                <!-- start striped rows -->
-                                <div class="container row-striped">
 
                                     @if ($asset->deleted_at!='')
                                         <div class="row">
-                                            <div class="col-md-2">
+                                            <div class="col-md-3">
                                                 <span class="text-danger"><strong>{{ trans('general.deleted') }}</strong></span>
                                             </div>
-                                            <div class="col-md-6">
+                                            <div class="col-md-9">
                                                 {{ \App\Helpers\Helper::getFormattedDateObject($asset->deleted_at, 'date', false) }}
 
                                             </div>
@@ -180,25 +453,26 @@
                                     @if ($asset->assetstatus)
 
                                         <div class="row">
-                                            <div class="col-md-2">
+                                            <div class="col-md-3">
                                                 <strong>{{ trans('general.status') }}</strong>
                                             </div>
-                                            <div class="col-md-6">
+                                            <div class="col-md-9">
                                                 @if (($asset->assignedTo) && ($asset->deleted_at==''))
-                                                    <i class="fas fa-circle text-blue"></i>
+                                                    <x-icon type="circle-solid" class="text-blue" />
                                                     {{ $asset->assetstatus->name }}
                                                     <label class="label label-default">{{ trans('general.deployed') }}</label>
 
-                                                    <i class="fas fa-long-arrow-alt-right" aria-hidden="true"></i>
-                                                    {!!  $asset->assignedTo->present()->glyph()  !!}
+
+                                                    <x-icon type="long-arrow-right" />
+                                                    <x-icon type="{{ $asset->assignedType() }}" class="fa-fw" />
                                                     {!!  $asset->assignedTo->present()->nameUrl() !!}
                                                 @else
                                                     @if (($asset->assetstatus) && ($asset->assetstatus->deployable=='1'))
-                                                        <i class="fas fa-circle text-green"></i>
+                                                        <x-icon type="circle-solid" class="text-green" />
                                                     @elseif (($asset->assetstatus) && ($asset->assetstatus->pending=='1'))
-                                                        <i class="fas fa-circle text-orange"></i>
+                                                        <x-icon type="circle-solid" class="text-orange" />
                                                     @else
-                                                        <i class="fas fa-times text-red"></i>
+                                                        <x-icon type="x" class="text-red" />
                                                     @endif
                                                     <a href="{{ route('statuslabels.show', $asset->assetstatus->id) }}">
                                                         {{ $asset->assetstatus->name }}</a>
@@ -209,12 +483,13 @@
                                         </div>
                                     @endif
 
+
                                     @if ($asset->company)
                                         <div class="row">
-                                            <div class="col-md-2">
+                                            <div class="col-md-3">
                                                 <strong>{{ trans('general.company') }}</strong>
                                             </div>
-                                            <div class="col-md-6">
+                                            <div class="col-md-9">
                                                 <a href="{{ url('/companies/' . $asset->company->id) }}">{{ $asset->company->name }}</a>
                                             </div>
                                         </div>
@@ -222,10 +497,10 @@
 
                                     @if ($asset->name)
                                         <div class="row">
-                                            <div class="col-md-2">
+                                            <div class="col-md-3">
                                                 <strong>{{ trans('admin/hardware/form.name') }}</strong>
                                             </div>
-                                            <div class="col-md-6">
+                                            <div class="col-md-9">
                                                 {{ $asset->name }}
                                             </div>
                                         </div>
@@ -233,29 +508,42 @@
 
                                     @if ($asset->serial)
                                         <div class="row">
-                                            <div class="col-md-2">
+                                            <div class="col-md-3">
                                                 <strong>{{ trans('admin/hardware/form.serial') }}</strong>
                                             </div>
-                                            <div class="col-md-6">
-                                                <span class="js-copy">{{ $asset->serial  }}</span>
+                                            <div class="col-md-9">
+                                                <span class="js-copy-serial">{{ $asset->serial  }}</span>
 
-                                                <i class="fa-regular fa-clipboard js-copy-link" data-clipboard-target=".js-copy" aria-hidden="true" data-tooltip="true" data-placement="top" title="{{ trans('general.copy_to_clipboard') }}">
+                                                <i class="fa-regular fa-clipboard js-copy-link hidden-print" data-clipboard-target=".js-copy-serial" aria-hidden="true" data-tooltip="true" data-placement="top" title="{{ trans('general.copy_to_clipboard') }}">
                                                     <span class="sr-only">{{ trans('general.copy_to_clipboard') }}</span>
                                                 </i>
                                             </div>
                                         </div>
                                     @endif
 
+                                    @if ($asset->last_checkout!='')
+                                        <div class="row">
+                                            <div class="col-md-3">
+                                                <strong>
+                                                    {{ trans('admin/hardware/table.checkout_date') }}
+                                                </strong>
+                                            </div>
+                                            <div class="col-md-9">
+                                                {{ Helper::getFormattedDateObject($asset->last_checkout, 'datetime', false) }}
+                                            </div>
+                                        </div>
+                                    @endif
+
                                     @if ((isset($audit_log)) && ($audit_log->created_at))
                                         <div class="row">
-                                            <div class="col-md-2">
+                                            <div class="col-md-3">
                                                 <strong>
                                                     {{ trans('general.last_audit') }}
                                                 </strong>
                                             </div>
-                                            <div class="col-md-6">
+                                            <div class="col-md-9">
                                                 {!! $asset->checkInvalidNextAuditDate() ? '<i class="fas fa-exclamation-triangle text-orange" aria-hidden="true"></i>' : '' !!}
-                                                {{ Helper::getFormattedDateObject($audit_log->created_at, 'date', false) }}
+                                                {{ Helper::getFormattedDateObject($audit_log->created_at, 'datetime', false) }}
                                                 @if ($audit_log->user)
                                                     (by {{ link_to_route('users.show', $audit_log->user->present()->fullname(), [$audit_log->user->id]) }})
                                                 @endif
@@ -266,12 +554,12 @@
 
                                     @if ($asset->next_audit_date)
                                         <div class="row">
-                                            <div class="col-md-2">
+                                            <div class="col-md-3">
                                                 <strong>
                                                     {{ trans('general.next_audit_date') }}
                                                 </strong>
                                             </div>
-                                            <div class="col-md-6">
+                                            <div class="col-md-9">
                                                 {!! $asset->checkInvalidNextAuditDate() ? '<i class="fas fa-exclamation-triangle text-orange" aria-hidden="true"></i>' : '' !!}
                                                 {{ Helper::getFormattedDateObject($asset->next_audit_date, 'date', false) }}
                                             </div>
@@ -280,12 +568,12 @@
 
                                     @if (($asset->model) && ($asset->model->manufacturer))
                                         <div class="row">
-                                            <div class="col-md-2">
+                                            <div class="col-md-3">
                                                 <strong>
                                                     {{ trans('admin/hardware/form.manufacturer') }}
                                                 </strong>
                                             </div>
-                                            <div class="col-md-6">
+                                            <div class="col-md-9">
                                                 <ul class="list-unstyled">
                                                     @can('view', \App\Models\Manufacturer::class)
 
@@ -299,39 +587,41 @@
                                                         <li> {{ $asset->model->manufacturer->name }}</li>
                                                     @endcan
 
-                                                    @if (($asset->model) && ($asset->model->manufacturer->url))
+                                                    @if (($asset->model) && ($asset->model->manufacturer) &&  ($asset->model->manufacturer->url!=''))
                                                         <li>
-                                                            <i class="fas fa-globe-americas" aria-hidden="true"></i>
-                                                            <a href="{{ $asset->model->manufacturer->url }}" target="_blank">
-                                                                {{ $asset->model->manufacturer->url }}
-                                                                <i class="fa fa-external-link" aria-hidden="true"></i>
+                                                            <x-icon type="globe-us" />
+                                                            <a href="{{ $asset->present()->dynamicUrl($asset->model->manufacturer->url) }}" target="_blank">
+                                                                {{ $asset->present()->dynamicUrl($asset->model->manufacturer->url) }}
+                                                                <x-icon type="external-link" />
                                                             </a>
                                                         </li>
                                                     @endif
 
-                                                    @if (($asset->model) && ($asset->model->manufacturer->support_url))
+                                                    @if (($asset->model) && ($asset->model->manufacturer) &&  ($asset->model->manufacturer->support_url!=''))
                                                         <li>
-                                                            <i class="far fa-life-ring" aria-hidden="true"></i>
-                                                            <a href="{{ $asset->model->manufacturer->support_url }}" target="_blank">
-                                                                {{ $asset->model->manufacturer->support_url }}
-                                                                <i class="fa fa-external-link" aria-hidden="true"></i>
+                                                            <x-icon type="more-info" />
+                                                            <a href="{{ $asset->present()->dynamicUrl($asset->model->manufacturer->support_url) }}" target="_blank">
+                                                                {{ $asset->present()->dynamicUrl($asset->model->manufacturer->support_url) }}
+                                                                <x-icon type="external-link" />
                                                             </a>
                                                         </li>
                                                     @endif
 
-                                                    @if (($asset->model->manufacturer) && ($asset->model->manufacturer->warranty_lookup_url!=''))
+                                                    @if (($asset->model) && ($asset->model->manufacturer) &&  ($asset->model->manufacturer->warranty_lookup_url!=''))
                                                         <li>
-                                                            <i class="fa-solid fa-wrench" aria-hidden="true"></i>
-                                                            <a href="{{ $asset->present()->dynamicWarrantyUrl() }}" target="_blank">
-                                                                {{ $asset->present()->dynamicWarrantyUrl() }}
-                                                                <i class="fa fa-external-link" aria-hidden="true"><span class="sr-only">{{ trans('admin/hardware/general.mfg_warranty_lookup', ['manufacturer' => $asset->model->manufacturer->name]) }}</span></i>
+                                                            <x-icon type="maintenances" />
+                                                            <a href="{{ $asset->present()->dynamicUrl($asset->model->manufacturer->warranty_lookup_url) }}" target="_blank">
+                                                                {{ $asset->present()->dynamicUrl($asset->model->manufacturer->warranty_lookup_url) }}
+
+                                                                <x-icon type="external-link" />
+                                                                    <span class="sr-only">{{ trans('admin/hardware/general.mfg_warranty_lookup', ['manufacturer' => $asset->model->manufacturer->name]) }}</span></i>
                                                             </a>
                                                         </li>
                                                     @endif
 
                                                     @if (($asset->model) && ($asset->model->manufacturer->support_phone))
                                                         <li>
-                                                            <i class="fas fa-phone" aria-hidden="true"></i>
+                                                            <x-icon type="phone" />
                                                             <a href="tel:{{ $asset->model->manufacturer->support_phone }}">
                                                                 {{ $asset->model->manufacturer->support_phone }}
                                                             </a>
@@ -340,7 +630,7 @@
 
                                                     @if (($asset->model) && ($asset->model->manufacturer->support_email))
                                                         <li>
-                                                            <i class="far fa-envelope" aria-hidden="true"></i>
+                                                            <x-icon type="email" />
                                                             <a href="mailto:{{ $asset->model->manufacturer->support_email }}">
                                                                 {{ $asset->model->manufacturer->support_email }}
                                                             </a>
@@ -352,12 +642,12 @@
                                     @endif
 
                                     <div class="row">
-                                        <div class="col-md-2">
+                                        <div class="col-md-3">
                                             <strong>
                                                 {{ trans('general.category') }}
                                             </strong>
                                         </div>
-                                        <div class="col-md-6">
+                                        <div class="col-md-9">
                                             @if (($asset->model) && ($asset->model->category))
 
                                                 @can('view', \App\Models\Category::class)
@@ -376,12 +666,12 @@
 
                                     @if ($asset->model)
                                         <div class="row">
-                                            <div class="col-md-2">
+                                            <div class="col-md-3">
                                                 <strong>
                                                     {{ trans('admin/hardware/form.model') }}
                                                 </strong>
                                             </div>
-                                            <div class="col-md-6">
+                                            <div class="col-md-9">
                                                 @if ($asset->model)
 
                                                     @can('view', \App\Models\AssetModel::class)
@@ -398,59 +688,76 @@
                                     @endif
 
                                     <div class="row">
-                                        <div class="col-md-2">
+                                        <div class="col-md-3">
                                             <strong>
                                                 {{ trans('admin/models/table.modelnumber') }}
                                             </strong>
                                         </div>
-                                        <div class="col-md-6">
+                                        <div class="col-md-9">
                                             {{ ($asset->model) ? $asset->model->model_number : ''}}
                                         </div>
                                     </div>
 
                                     <!-- byod -->
-                                    <div class="row">
-                                        <div class="col-md-2">
+                                    <div class="row byod">
+                                        <div class="col-md-3">
                                             <strong>{{ trans('general.byod') }}</strong>
                                         </div>
-                                        <div class="col-md-6">
+                                        <div class="col-md-9">
                                             {!! ($asset->byod=='1') ? '<i class="fas fa-check text-success" aria-hidden="true"></i> '.trans('general.yes') : '<i class="fas fa-times text-danger" aria-hidden="true"></i> '.trans('general.no')  !!}
                                         </div>
                                     </div>
 
+                                    <!-- requestable -->
+                                    <div class="row">
+                                        <div class="col-md-3">
+                                            <strong>{{ trans('admin/hardware/general.requestable') }}</strong>
+                                        </div>
+                                        <div class="col-md-9">
+                                            {!! ($asset->requestable=='1') ? '<i class="fas fa-check text-success" aria-hidden="true"></i> '.trans('general.yes') : '<i class="fas fa-times text-danger" aria-hidden="true"></i> '.trans('general.no')  !!}
+                                        </div>
+                                    </div>
+
                                     @if (($asset->model) && ($asset->model->fieldset))
                                         @foreach($asset->model->fieldset->fields as $field)
                                             <div class="row">
-                                                <div class="col-md-2">
+                                                <div class="col-md-3">
                                                     <strong>
                                                         {{ $field->name }}
                                                     </strong>
                                                 </div>
-                                                <div class="col-md-6{{ (($field->format=='URL') && ($asset->{$field->db_column_name()}!='')) ? ' ellipsis': '' }}">
+                                                <div class="col-md-9{{ (($field->format=='URL') && ($asset->{$field->db_column_name()}!='')) ? ' ellipsis': '' }}">
                                                     @if (($field->field_encrypted=='1') && ($asset->{$field->db_column_name()}!=''))
+
                                                         <i class="fas fa-lock" data-tooltip="true" data-placement="top" title="{{ trans('admin/custom_fields/general.value_encrypted') }}" onclick="showHideEncValue(this)" id="text-{{ $field->id }}"></i>
                                                     @endif
 
                                                     @if ($field->isFieldDecryptable($asset->{$field->db_column_name()} ))
                                                         @can('assets.view.encrypted_custom_fields')
                                                             @php
-                                                                $fieldSize=strlen(Helper::gracefulDecrypt($field, $asset->{$field->db_column_name()})) 
+                                                                $fieldSize=strlen(Helper::gracefulDecrypt($field, $asset->{$field->db_column_name()}))
                                                             @endphp
                                                             @if ($fieldSize>0)
                                                                 <span id="text-{{ $field->id }}-to-hide">{{ str_repeat('*', $fieldSize) }}</span>
-                                                                <span class="js-copy-{{ $field->id }}" id="text-{{ $field->id }}-to-show" style="font-size: 0px;">
-                                                                @if (($field->format=='URL') && ($asset->{$field->db_column_name()}!=''))
-                                                                    <a href="{{ Helper::gracefulDecrypt($field, $asset->{$field->db_column_name()}) }}" target="_new">{{ Helper::gracefulDecrypt($field, $asset->{$field->db_column_name()}) }}</a>
-                                                                @elseif (($field->format=='DATE') && ($asset->{$field->db_column_name()}!=''))
-                                                                    {{ \App\Helpers\Helper::gracefulDecrypt($field, \App\Helpers\Helper::getFormattedDateObject($asset->{$field->db_column_name()}, 'date', false)) }}
-                                                                @else
-                                                                    {{ Helper::gracefulDecrypt($field, $asset->{$field->db_column_name()}) }}
-                                                                @endif
-                                                                </span>
-                                                                <i class="fa-regular fa-clipboard js-copy-link" data-clipboard-target=".js-copy-{{ $field->id }}" aria-hidden="true" data-tooltip="true" data-placement="top" title="{{ trans('general.copy_to_clipboard') }}">
+                                                                    @if (($field->format=='URL') && ($asset->{$field->db_column_name()}!=''))
+                                                                        <span class="js-copy-{{ $field->id }} hidden-print"
+                                                                              id="text-{{ $field->id }}-to-show"
+                                                                              style="font-size: 0px;"><a
+                                                                                    href="{{ Helper::gracefulDecrypt($field, $asset->{$field->db_column_name()}) }}"
+                                                                                    target="_new">{{ Helper::gracefulDecrypt($field, $asset->{$field->db_column_name()}) }}</a></span>
+                                                                    @elseif (($field->format=='DATE') && ($asset->{$field->db_column_name()}!=''))
+                                                                        <span class="js-copy-{{ $field->id }} hidden-print"
+                                                                              id="text-{{ $field->id }}-to-show"
+                                                                              style="font-size: 0px;">{{ \App\Helpers\Helper::gracefulDecrypt($field, \App\Helpers\Helper::getFormattedDateObject($asset->{$field->db_column_name()}, 'date', false)) }}</span>
+                                                                    @else
+                                                                        <span class="js-copy-{{ $field->id }} hidden-print"
+                                                                              id="text-{{ $field->id }}-to-show"
+                                                                              style="font-size: 0px;">{{ Helper::gracefulDecrypt($field, $asset->{$field->db_column_name()}) }}</span>
+                                                                    @endif
+                                                                <i class="fa-regular fa-clipboard js-copy-link hidden-print" data-clipboard-target=".js-copy-{{ $field->id }}" aria-hidden="true" data-tooltip="true" data-placement="top" title="{{ trans('general.copy_to_clipboard') }}">
                                                                     <span class="sr-only">{{ trans('general.copy_to_clipboard') }}</span>
                                                                 </i>
-							    @endif
+                                                            @endif
                                                         @else
                                                             {{ strtoupper(trans('admin/custom_fields/general.encrypted')) }}
                                                         @endcan
@@ -479,12 +786,12 @@
 
                                     @if ($asset->purchase_date)
                                         <div class="row">
-                                            <div class="col-md-2">
+                                            <div class="col-md-3">
                                                 <strong>
                                                     {{ trans('admin/hardware/form.date') }}
                                                 </strong>
                                             </div>
-                                            <div class="col-md-6">
+                                            <div class="col-md-9">
                                                 {{ Helper::getFormattedDateObject($asset->purchase_date, 'date', false) }}
                                                 -
                                                 {{ Carbon::parse($asset->purchase_date)->diff(Carbon::now())->format('%y years, %m months and %d days')}}
@@ -495,12 +802,12 @@
 
                                     @if ($asset->purchase_cost)
                                         <div class="row">
-                                            <div class="col-md-2">
+                                            <div class="col-md-3">
                                                 <strong>
                                                     {{ trans('admin/hardware/form.cost') }}
                                                 </strong>
                                             </div>
-                                            <div class="col-md-6">
+                                            <div class="col-md-9">
                                                 @if (($asset->id) && ($asset->location))
                                                     {{ $asset->location->currency }}
                                                 @elseif (($asset->id) && ($asset->location))
@@ -515,12 +822,12 @@
                                     @endif
                                     @if(($asset->components->count() > 0) && ($asset->purchase_cost))
                                         <div class="row">
-                                            <div class="col-md-2">
+                                            <div class="col-md-3">
                                                 <strong>
                                                     {{ trans('admin/hardware/table.components_cost') }}
                                                 </strong>
                                             </div>
-                                            <div class="col-md-6">
+                                            <div class="col-md-9">
                                                 @if (($asset->id) && ($asset->location))
                                                     {{ $asset->location->currency }}
                                                 @elseif (($asset->id) && ($asset->location))
@@ -534,20 +841,20 @@
                                     @endif
                                     @if (($asset->model) && ($asset->depreciation) && ($asset->purchase_date))
                                         <div class="row">
-                                            <div class="col-md-2">
+                                            <div class="col-md-3">
                                                 <strong>
                                                     {{ trans('admin/hardware/table.current_value') }}
                                                 </strong>
                                             </div>
-                                            <div class="col-md-6">
-                                                    @if (($asset->id) && ($asset->location))
-                                                        {{ $asset->location->currency }}
-                                                    @elseif (($asset->id) && ($asset->location))
-                                                        {{ $asset->location->currency }}
-                                                    @else
-                                                        {{ $snipeSettings->default_currency }}
-                                                    @endif
-                                                    {{ Helper::formatCurrencyOutput($asset->getDepreciatedValue() )}}
+                                            <div class="col-md-9">
+                                                @if (($asset->id) && ($asset->location))
+                                                    {{ $asset->location->currency }}
+                                                @elseif (($asset->id) && ($asset->location))
+                                                    {{ $asset->location->currency }}
+                                                @else
+                                                    {{ $snipeSettings->default_currency }}
+                                                @endif
+                                                {{ Helper::formatCurrencyOutput($asset->getDepreciatedValue() )}}
 
 
                                             </div>
@@ -555,25 +862,25 @@
                                     @endif
                                     @if ($asset->order_number)
                                         <div class="row">
-                                            <div class="col-md-2">
+                                            <div class="col-md-3">
                                                 <strong>
                                                     {{ trans('general.order_number') }}
                                                 </strong>
                                             </div>
-                                            <div class="col-md-6">
-                                                <a href="{{ route('hardware.index', ['order_number' => $asset->order_number]) }}">#{{ $asset->order_number }}</a>
+                                            <div class="col-md-9">
+                                                <a href="{{ route('hardware.index', ['order_number' => $asset->order_number]) }}">{{ $asset->order_number }}</a>
                                             </div>
                                         </div>
                                     @endif
 
                                     @if ($asset->supplier)
                                         <div class="row">
-                                            <div class="col-md-2">
+                                            <div class="col-md-3">
                                                 <strong>
                                                     {{ trans('general.supplier') }}
                                                 </strong>
                                             </div>
-                                            <div class="col-md-6">
+                                            <div class="col-md-9">
                                                 @can ('superuser')
                                                     <a href="{{ route('suppliers.show', $asset->supplier_id) }}">
                                                         {{ $asset->supplier->name }}
@@ -588,70 +895,71 @@
 
                                     @if ($asset->warranty_months)
                                         <div class="row">
-                                            <div class="col-md-2">
+                                            <div class="col-md-3">
                                                 <strong>
                                                     {{ trans('admin/hardware/form.warranty') }}
                                                 </strong>
                                             </div>
-                                            <div class="col-md-6">
+                                            <div class="col-md-9">
                                                 {{ $asset->warranty_months }}
                                                 {{ trans('admin/hardware/form.months') }}
 
                                                 @if (($asset->model) && ($asset->model->manufacturer) && ($asset->model->manufacturer->warranty_lookup_url!=''))
-                                                    <a href="{{ $asset->present()->dynamicWarrantyUrl() }}" target="_blank">
-                                                        <i class="fa fa-external-link" aria-hidden="true"><span class="sr-only">{{ trans('admin/hardware/general.mfg_warranty_lookup', ['manufacturer' => $asset->model->manufacturer->name]) }}</span></i>
+                                                    <a href="{{ $asset->present()->dynamicUrl($asset->model->manufacturer->warranty_lookup_url) }}" target="_blank">
+                                                        <x-icon type="external-link" />
+                                                        <span class="sr-only">{{ trans('admin/hardware/general.mfg_warranty_lookup', ['manufacturer' => $asset->model->manufacturer->name]) }}</span></i>
                                                     </a>
                                                 @endif
                                             </div>
                                         </div>
 
-                                            <div class="row">
-                                                <div class="col-md-2">
-                                                    <strong>
-                                                        {{ trans('admin/hardware/form.warranty_expires') }}
-                                                        @if ($asset->purchase_date)
-                                                        {!! $asset->present()->warranty_expires() < date("Y-m-d") ? '<i class="fas fa-exclamation-triangle text-orange" aria-hidden="true"></i>' : '' !!}
-                                                        @endif
-
-                                                    </strong>
-                                                </div>
-                                                <div class="col-md-6">
+                                        <div class="row">
+                                            <div class="col-md-3">
+                                                <strong>
+                                                    {{ trans('admin/hardware/form.warranty_expires') }}
                                                     @if ($asset->purchase_date)
+                                                        {!! $asset->present()->warranty_expires() < date("Y-m-d") ? '<i class="fas fa-exclamation-triangle text-orange" aria-hidden="true"></i>' : '' !!}
+                                                    @endif
+
+                                                </strong>
+                                            </div>
+                                            <div class="col-md-9">
+                                                @if ($asset->purchase_date)
                                                     {{ Helper::getFormattedDateObject($asset->present()->warranty_expires(), 'date', false) }}
                                                     -
                                                     {{ Carbon::parse($asset->present()->warranty_expires())->diffForHumans(['parts' => 2]) }}
-                                                    @else
-                                                        {{ trans('general.na_no_purchase_date') }}
-                                                    @endif
-                                                </div>
+                                                @else
+                                                    {{ trans('general.na_no_purchase_date') }}
+                                                @endif
                                             </div>
+                                        </div>
 
                                     @endif
 
                                     @if (($asset->model) && ($asset->depreciation))
                                         <div class="row">
-                                            <div class="col-md-2">
+                                            <div class="col-md-3">
                                                 <strong>
                                                     {{ trans('general.depreciation') }}
                                                 </strong>
                                             </div>
-                                            <div class="col-md-6">
+                                            <div class="col-md-9">
                                                 {{ $asset->depreciation->name }}
                                                 ({{ $asset->depreciation->months }}
                                                 {{ trans('admin/hardware/form.months') }})
                                             </div>
                                         </div>
                                         <div class="row">
-                                            <div class="col-md-2">
+                                            <div class="col-md-3">
                                                 <strong>
                                                     {{ trans('admin/hardware/form.fully_depreciated') }}
                                                 </strong>
                                             </div>
-                                            <div class="col-md-6">
+                                            <div class="col-md-9">
                                                 @if ($asset->purchase_date)
-                                                {{ Helper::getFormattedDateObject($asset->depreciated_date()->format('Y-m-d'), 'date', false) }}
-                                                -
-                                                {{ Carbon::parse($asset->depreciated_date())->diffForHumans(['parts' => 2]) }}
+                                                    {{ Helper::getFormattedDateObject($asset->depreciated_date()->format('Y-m-d'), 'date', false) }}
+                                                    -
+                                                    {{ Carbon::parse($asset->depreciated_date())->diffForHumans(['parts' => 2]) }}
                                                 @else
                                                     {{ trans('general.na_no_purchase_date') }}
                                                 @endif
@@ -662,13 +970,13 @@
 
                                     @if (($asset->asset_eol_date) && ($asset->purchase_date))
                                         <div class="row">
-                                            <div class="col-md-2">
+                                            <div class="col-md-3">
                                                 <strong>
                                                     {{ trans('admin/hardware/form.eol_rate') }}
                                                 </strong>
                                             </div>
-                                            <div class="col-md-6">
-                                                {{ Carbon::parse($asset->asset_eol_date)->diffInMonths($asset->purchase_date) }}
+                                            <div class="col-md-9">
+                                                {{ (int) Carbon::parse($asset->asset_eol_date)->diffInMonths($asset->purchase_date, true) }}
                                                 {{ trans('admin/hardware/form.months') }}
 
                                             </div>
@@ -676,30 +984,29 @@
                                     @endif
                                     @if ($asset->asset_eol_date)
                                         <div class="row">
-                                            <div class="col-md-2">
+                                            <div class="col-md-3">
                                                 <strong>
                                                     {{ trans('admin/hardware/form.eol_date') }}
                                                     @if ($asset->purchase_date)
-							{!! $asset->asset_eol_date < date("Y-m-d") ? '<i class="fas fa-exclamation-triangle text-orange" aria-hidden="true"></i>' : '' !!}
+                                                        {!! $asset->asset_eol_date < date("Y-m-d") ? '<i class="fas fa-exclamation-triangle text-orange" aria-hidden="true"></i>' : '' !!}
                                                     @endif
                                                 </strong>
                                             </div>
-                                            <div class="col-md-6">
+                                            <div class="col-md-9">
                                                 @if ($asset->asset_eol_date)
-                                                {{ Helper::getFormattedDateObject($asset->asset_eol_date, 'date', false) }}
-                                                -
-                                                {{ Carbon::parse($asset->asset_eol_date)->diffForHumans(['parts' => 2]) }}
+                                                    {{ Helper::getFormattedDateObject($asset->asset_eol_date, 'date', false) }}
+                                                    -
+                                                    {{ Carbon::parse($asset->asset_eol_date)->diffForHumans(['parts' => 2]) }}
                                                 @else
                                                     {{ trans('general.na_no_purchase_date') }}
                                                 @endif
-                                                @if ($asset->eol_explicit)
-                                                    <i class="fas fa-exclamation-triangle text-orange"
-                                                       aria-hidden="true"
-                                                       data-tooltip="true"
-                                                       data-placement="top"
-                                                       data-title="Explicit EOL"
-                                                       title="Explicit EOL">
-                                                    </i>
+                                                @if ($asset->eol_explicit =='1')
+                                                        <span data-tooltip="true"
+                                                                data-placement="top"
+                                                                data-title="Explicit EOL"
+                                                                title="Explicit EOL">
+                                                                <x-icon type="warning" class="text-orange" />
+                                                        </span>
                                                 @endif
                                             </div>
                                         </div>
@@ -707,24 +1014,24 @@
 
 
                                     <div class="row">
-                                        <div class="col-md-2">
+                                        <div class="col-md-3">
                                             <strong>
                                                 {{ trans('admin/hardware/form.notes') }}
                                             </strong>
                                         </div>
-                                        <div class="col-md-6">
+                                        <div class="col-md-9">
                                             {!! nl2br(Helper::parseEscapedMarkedownInline($asset->notes)) !!}
                                         </div>
                                     </div>
 
                                     @if ($asset->location)
                                         <div class="row">
-                                            <div class="col-md-2">
+                                            <div class="col-md-3">
                                                 <strong>
                                                     {{ trans('general.location') }}
                                                 </strong>
                                             </div>
-                                            <div class="col-md-6">
+                                            <div class="col-md-9">
                                                 @can('superuser')
                                                     <a href="{{ route('locations.show', ['location' => $asset->location->id]) }}">
                                                         {{ $asset->location->name }}
@@ -738,12 +1045,12 @@
 
                                     @if ($asset->defaultLoc)
                                         <div class="row">
-                                            <div class="col-md-2">
+                                            <div class="col-md-3">
                                                 <strong>
                                                     {{ trans('admin/hardware/form.default_location') }}
                                                 </strong>
                                             </div>
-                                            <div class="col-md-6">
+                                            <div class="col-md-9">
                                                 @can('superuser')
                                                     <a href="{{ route('locations.show', ['location' => $asset->defaultLoc->id]) }}">
                                                         {{ $asset->defaultLoc->name }}
@@ -757,12 +1064,12 @@
 
                                     @if ($asset->created_at!='')
                                         <div class="row">
-                                            <div class="col-md-2">
+                                            <div class="col-md-3">
                                                 <strong>
                                                     {{ trans('general.created_at') }}
                                                 </strong>
                                             </div>
-                                            <div class="col-md-6">
+                                            <div class="col-md-9">
                                                 {{ Helper::getFormattedDateObject($asset->created_at, 'datetime', false) }}
                                             </div>
                                         </div>
@@ -770,277 +1077,97 @@
 
                                     @if ($asset->updated_at!='')
                                         <div class="row">
-                                            <div class="col-md-2">
+                                            <div class="col-md-3">
                                                 <strong>
                                                     {{ trans('general.updated_at') }}
                                                 </strong>
                                             </div>
-                                            <div class="col-md-6">
+                                            <div class="col-md-9">
                                                 {{ Helper::getFormattedDateObject($asset->updated_at, 'datetime', false) }}
                                             </div>
                                         </div>
                                     @endif
-                                     @if ($asset->last_checkout!='')
+
+                                    @if ($asset->expected_checkin!='')
                                         <div class="row">
-                                            <div class="col-md-2">
-                                                <strong>
-                                                    {{ trans('admin/hardware/table.checkout_date') }}
-                                                </strong>
-                                            </div>
-                                            <div class="col-md-6">
-                                                {{ Helper::getFormattedDateObject($asset->last_checkout, 'datetime', false) }}
-                                            </div>
-                                        </div>
-                                     @endif
-                                     @if ($asset->expected_checkin!='')
-                                        <div class="row">
-                                            <div class="col-md-2">
+                                            <div class="col-md-3">
                                                 <strong>
                                                     {{ trans('admin/hardware/form.expected_checkin') }}
                                                 </strong>
                                             </div>
-                                            <div class="col-md-6">
+                                            <div class="col-md-9">
                                                 {{ Helper::getFormattedDateObject($asset->expected_checkin, 'date', false) }}
                                             </div>
                                         </div>
-                                     @endif
+                                    @endif
 
-                                     @if ($asset->last_checkin!='')
-                                            <div class="row">
-                                                <div class="col-md-2">
-                                                    <strong>
-                                                        {{ trans('admin/hardware/table.last_checkin_date') }}
-                                                    </strong>
-                                                </div>
-                                                <div class="col-md-6">
-                                                    {{ Helper::getFormattedDateObject($asset->last_checkin, 'datetime', false) }}
-                                                </div>
+                                    @if ($asset->last_checkin!='')
+                                        <div class="row">
+                                            <div class="col-md-3">
+                                                <strong>
+                                                    {{ trans('admin/hardware/table.last_checkin_date') }}
+                                                </strong>
                                             </div>
-                                     @endif
+                                            <div class="col-md-9">
+                                                {{ Helper::getFormattedDateObject($asset->last_checkin, 'datetime', false) }}
+                                            </div>
+                                        </div>
+                                    @endif
 
 
 
                                     <div class="row">
-                                        <div class="col-md-2">
+                                        <div class="col-md-3">
                                             <strong>
                                                 {{ trans('general.checkouts_count') }}
                                             </strong>
                                         </div>
-                                        <div class="col-md-6">
+                                        <div class="col-md-9">
                                             {{ ($asset->checkouts) ? (int) $asset->checkouts->count() : '0' }}
                                         </div>
                                     </div>
 
 
                                     <div class="row">
-                                        <div class="col-md-2">
+                                        <div class="col-md-3">
                                             <strong>
                                                 {{ trans('general.checkins_count') }}
                                             </strong>
                                         </div>
-                                        <div class="col-md-6">
+                                        <div class="col-md-9">
                                             {{ ($asset->checkins) ? (int) $asset->checkins->count() : '0' }}
                                         </div>
                                     </div>
 
 
                                     <div class="row">
-                                        <div class="col-md-2">
+                                        <div class="col-md-3">
                                             <strong>
                                                 {{ trans('general.user_requests_count') }}
                                             </strong>
                                         </div>
-                                        <div class="col-md-6">
+                                        <div class="col-md-9">
                                             {{ ($asset->userRequests) ? (int) $asset->userRequests->count() : '0' }}
                                         </div>
                                     </div>
-                                    <div class="row">
-                                        <div class="col-md-2">
-                                            <strong>
-                                               Labels
-                                            </strong>
-                                        </div>
-                                        <div class="col-md-6">
-                                            {{ Form::open([
-                                                      'method' => 'POST',
-                                                      'route' => ['hardware/bulkedit'],
-                                                      'class' => 'form-inline',
-                                                       'id' => 'bulkForm']) }}
-                                                <input type="hidden" name="bulk_actions" value="labels" />
-                                                <input type="hidden" name="ids[{{$asset->id}}]" value="{{ $asset->id }}" />
-                                                <button class="btn btn-sm btn-default" id="bulkEdit"{{ (!$asset->model ? ' disabled' : '') }}{!! (!$asset->model ? ' data-tooltip="true" title="'.trans('admin/hardware/general.model_invalid').'"' : '') !!}><i class="fas fa-barcode" aria-hidden="true"></i> {{ trans_choice('button.generate_labels', 1) }}</button>
 
-                                            {{ Form::close() }}
-
-                                        </div>
-                                    </div>
-                                </div> <!-- end row-striped -->
-
-                            </div><!-- /col-md-8 -->
-
-                            <div class="col-md-4">
-
-                                @if (($asset->image) || (($asset->model) && ($asset->model->image!='')))
-                                    <div class="text-center col-md-12" style="padding-bottom: 15px;">
-                                        <a href="{{ ($asset->getImageUrl()) ? $asset->getImageUrl() : null }}" data-toggle="lightbox">
-                                            <img src="{{ ($asset->getImageUrl()) ? $asset->getImageUrl() : null }}" class="assetimg img-responsive" alt="{{ $asset->getDisplayNameAttribute() }}">
-                                        </a>
-                                    </div>
-                                @else
-                                    <!-- generic image goes here -->
-                                @endif
-
-                                    <!-- Start side button column -->
-
-                                    @if (($asset->assetstatus) && ($asset->assetstatus->deployable=='1'))
-                                        @if (($asset->assigned_to != '') && ($asset->deleted_at==''))
-                                            @can('checkin', \App\Models\Asset::class)
-                                                <div class="col-md-12">
-                                                    <span class="tooltip-wrapper"{!! (!$asset->model ? ' data-tooltip="true" title="'.trans('admin/hardware/general.model_invalid_fix').'"' : '') !!}>
-                                                        <a role="button" href="{{ route('hardware.checkin.create', $asset->id) }}" class="btn btn-sm btn-primary btn-block hidden-print{{ (!$asset->model ? ' disabled' : '') }}">
-                                                        {{ trans('admin/hardware/general.checkin') }}
-                                                    </a>
-                                                    </span>
-                                                </div>
-                                            @endcan
-                                        @elseif (($asset->assigned_to == '') && ($asset->deleted_at==''))
-                                            @can('checkout', \App\Models\Asset::class)
-                                                <div class="col-md-12" style="padding-top: 5px;">
-                                                    <span class="tooltip-wrapper"{!! (!$asset->model ? ' data-tooltip="true" title="'.trans('admin/hardware/general.model_invalid_fix').'"' : '') !!}>
-                                                        <a href="{{ route('hardware.checkout.create', $asset->id)  }}" class="btn btn-sm btn-primary btn-block hidden-print{{ (!$asset->model ? ' disabled' : '') }}">
-                                                        {{ trans('admin/hardware/general.checkout') }}
-                                                    </a>
-                                                    </span>
-                                                </div>
-                                            @endcan
-                                        @endif
-                                    @endif
-
-
-                                    @can('update', $asset)
-                                        @if ($asset->deleted_at=='')
-                                        <div class="col-md-12" style="padding-top: 5px;">
-                                            <a href="{{ route('hardware.edit', $asset->id) }}" class="btn btn-sm btn-primary btn-block hidden-print">
-                                                {{ trans('admin/hardware/general.edit') }}
-                                            </a>
-                                        </div>
-                                        @endif
-                                    @endcan
-
-                                    @can('create', $asset)
-                                        <div class="col-md-12" style="padding-top: 5px;">
-                                            <a href="{{ route('clone/hardware', $asset->id) }}" class="btn btn-sm btn-primary btn-block hidden-print">
-                                                {{ trans('admin/hardware/general.clone') }}
-                                            </a>
-                                        </div>
-                                    @endcan
-
-                                    @can('audit', \App\Models\Asset::class)
-                                        <div class="col-md-12" style="padding-top: 5px;">
-                                            <span class="tooltip-wrapper"{!! (!$asset->model ? ' data-tooltip="true" title="'.trans('admin/hardware/general.model_invalid_fix').'"' : '') !!}>
-                                                <a href="{{ route('asset.audit.create', $asset->id)  }}" class="btn btn-sm btn-primary btn-block hidden-print{{ (!$asset->model ? ' disabled' : '') }}">
-                                                 {{ trans('general.audit') }}
-                                            </a>
-                                            </span>
-                                        </div>
-                                    @endcan
-
-                                    @can('delete', $asset)
-                                        <div class="col-md-12" style="padding-top: 30px; padding-bottom: 30px;">
-                                            @if ($asset->deleted_at=='')
-                                                <button class="btn btn-sm btn-block btn-danger delete-asset" data-toggle="modal" data-title="{{ trans('general.delete') }}" data-content="{{ trans('general.sure_to_delete_var', ['item' => $asset->asset_tag]) }}" data-target="#dataConfirmModal">{{ trans('general.delete') }}
-                                                </button>
-                                                <span class="sr-only">{{ trans('general.delete') }}</span>
-                                            @else
-                                                <form method="POST" action="{{ route('restore/hardware', ['assetId' => $asset->id]) }}">
-                                                    @csrf
-                                                    <button class="btn btn-sm btn-warning btn-block">{{ trans('general.restore') }}</button>
-                                                </form>
-                                           @endif
-                                        </div>
-                                    @endcan
-
-                                @if (($asset->assignedTo) && ($asset->deleted_at==''))
-                                    <div style="text-align: left">
-                                        <h2>{{ trans('admin/hardware/form.checkedout_to') }}</h2>
-                                        <p>
-                                        @if($asset->checkedOutToUser()) <!-- Only users have avatars currently-->
-                                            <img src="{{ $asset->assignedTo->present()->gravatar() }}" class="user-image-inline" alt="{{ $asset->assignedTo->present()->fullName() }}">
-                                            @endif
-                                        </p>
-                                            {!! $asset->assignedTo->present()->glyph() . ' ' .$asset->assignedTo->present()->nameUrl() !!}
-                                        </p>
-
-                                        <ul class="list-unstyled" style="line-height: 25px;">
-                                            @if ((isset($asset->assignedTo->email)) && ($asset->assignedTo->email!=''))
-                                                <li>
-                                                    <i class="far fa-envelope" aria-hidden="true"></i>
-                                                    <a href="mailto:{{ $asset->assignedTo->email }}">{{ $asset->assignedTo->email }}</a>
-                                                </li>
-                                            @endif
-
-                                            @if ((isset($asset->assignedTo)) && ($asset->assignedTo->phone!=''))
-                                                <li>
-                                                    <i class="fas fa-phone" aria-hidden="true"></i>
-                                                    <a href="tel:{{ $asset->assignedTo->phone }}">{{ $asset->assignedTo->phone }}</a>
-                                                </li>
-                                            @endif
-
-                                            @if((isset($asset->assignedTo)) && ($asset->assignedTo->department))
-                                                <li>{{ trans('admin/hardware/general.user_department') }}: {{ $asset->assignedTo->department->name}}</li>
-                                            @endif
-
-                                            @if (isset($asset->location))
-                                                <li><i class="fas fa-map-marker-alt" aria-hidden="true"></i> {{ $asset->location->name }}</li>
-                                                <li>{{ $asset->location->address }}
-                                                    @if ($asset->location->address2!='')
-                                                        {{ $asset->location->address2 }}
-                                                    @endif
-                                                </li>
-
-                                                <li>{{ $asset->location->city }}
-                                                    @if (($asset->location->city!='') && ($asset->location->state!=''))
-                                                        ,
-                                                    @endif
-                                                    {{ $asset->location->state }} {{ $asset->location->zip }}
-                                                </li>
-                                            @endif
-                                                <li>
-                                                    <i class="fas fa-calendar"></i> {{ trans('admin/hardware/form.checkout_date') }}: {{ Helper::getFormattedDateObject($asset->last_checkout, 'date', false) }}
-                                                </li>
-                                            @if (isset($asset->expected_checkin))
-                                                <li>
-                                                    <i class="fas fa-calendar"></i> {{ trans('admin/hardware/form.expected_checkin') }}: {{ Helper::getFormattedDateObject($asset->expected_checkin, 'date', false) }}
-                                                </li>
-                                            @endif
-                                        </ul>
-                                    </div>
-
-                                @endif
-
-                                @if  ($snipeSettings->qr_code=='1')
-                                    <div class="col-md-12" style="padding-top: 15px;">
-                                        <img src="{{ config('app.url') }}/hardware/{{ $asset->id }}/qr_code" class="img-thumbnail pull-right" style="height: 100px; width: 100px; margin-right: 10px;" alt="QR code for {{ $asset->getDisplayNameAttribute() }}">
-                                    </div>
-                                @endif
-
-                            </div> <!-- div.col-md-4 -->
-                        </div><!-- /row -->
-                    </div><!-- /.tab-pane asset details -->
-                 
+                                </div> <!--/end striped container-->
+                            </div> <!-- end col-md-9 -->
+                        </div><!-- end info-stack-container -->
+                        </div> <!--/.row-->
+                    </div><!-- /.tab-pane -->
 
                     <div class="tab-pane fade" id="software">
-                        <div class="row">
+                        <div class="row{{($asset->licenses->count() > 0 ) ? '' : ' hidden-print'}}">
                             <div class="col-md-12">
                                 <!-- Licenses assets table -->
-                                @if ($asset->licenses->count() > 0)
                                     <table class="table">
                                         <thead>
                                         <tr>
-                                            <th class="col-md-4">{{ trans('general.name') }}</th>
-                                            <th class="col-md-4"><span class="line"></span>{{ trans('admin/licenses/form.license_key') }}</th>
-                                            <th class="col-md-4"><span class="line"></span>{{ trans('admin/licenses/form.expiration') }}</th>
-                                            <th class="col-md-1"><span class="line"></span>{{ trans('table.actions') }}</th>
+                                            <th>{{ trans('general.name') }}</th>
+                                            <th><span class="line"></span>{{ trans('admin/licenses/form.license_key') }}</th>
+                                            <th><span class="line"></span>{{ trans('admin/licenses/form.expiration') }}</th>
+                                            <th><span class="line"></span>{{ trans('table.actions') }}</th>
                                         </tr>
                                         </thead>
                                         <tbody>
@@ -1050,7 +1177,7 @@
                                                     <td><a href="{{ route('licenses.show', $seat->license->id) }}">{{ $seat->license->name }}</a></td>
                                                     <td>
                                                         @can('viewKeys', $seat->license)
-                                                            {!! nl2br(e($seat->license->serial)) !!}
+                                                            <code class="single-line"><span class="js-copy-link" data-clipboard-target=".js-copy-key-{{ $seat->id }}" aria-hidden="true" data-tooltip="true" data-placement="top" title="{{ trans('general.copy_to_clipboard') }}"><span class="js-copy-key-{{ $seat->id }}">{{ $seat->license->serial }}</span></span></code>
                                                         @else
                                                             ------------
                                                         @endcan
@@ -1059,29 +1186,22 @@
                                                         {{ Helper::getFormattedDateObject($seat->license->expiration_date, 'date', false) }}
                                                     </td>
                                                     <td>
-                                                        <a href="{{ route('licenses.checkin', $seat->id) }}" class="btn btn-sm bg-purple" data-tooltip="true">{{ trans('general.checkin') }}</a>
+                                                        <a href="{{ route('licenses.checkin', $seat->id) }}" class="btn btn-sm bg-purple hidden-print" data-tooltip="true">{{ trans('general.checkin') }}</a>
                                                     </td>
                                                 </tr>
                                             @endif
                                         @endforeach
                                         </tbody>
                                     </table>
-                                @else
-
-                                    <div class="alert alert-info alert-block">
-                                        <i class="fas fa-info-circle"></i>
-                                        {{ trans('general.no_results') }}
-                                    </div>
-                                @endif
                             </div><!-- /col -->
                         </div> <!-- row -->
                     </div> <!-- /.tab-pane software -->
 
                     <div class="tab-pane fade" id="components">
                         <!-- checked out assets table -->
-                        <div class="row">
+                        <div class="row{{($asset->components->count() > 0 ) ? '' : ' hidden-print'}}">
                             <div class="col-md-12">
-                                @if($asset->components->count() > 0)
+
                                     <table class="table table-striped">
                                         <thead>
                                         <th>{{ trans('general.name') }}</th>
@@ -1092,7 +1212,7 @@
                                         <th></th>
                                         </thead>
                                         <tbody>
-                                        <?php $totalCost = 0; ?>
+                                            <?php $totalCost = 0; ?>
                                         @foreach ($asset->components as $component)
 
 
@@ -1102,13 +1222,17 @@
                                                         <a href="{{ route('components.show', $component->id) }}">{{ $component->name }}</a>
                                                     </td>
                                                     <td>{{ $component->pivot->assigned_qty }}</td>
-                                                    <td>{{ Helper::formatCurrencyOutput($component->purchase_cost) }} each</td>
+                                                    <td>
+                                                        @if ($component->purchase_cost!='')
+                                                            {{ trans('general.cost_each', ['amount' => Helper::formatCurrencyOutput($component->purchase_cost)])  }}
+                                                        @endif
+                                                    </td>
                                                     <td>{{ $component->serial }}</td>
                                                     <td>
-                                                        <a href="{{ route('components.checkin.show', $component->pivot->id) }}" class="btn btn-sm bg-purple" data-tooltip="true">{{ trans('general.checkin') }}</a>
+                                                        <a href="{{ route('components.checkin.show', $component->pivot->id) }}" class="btn btn-sm bg-purple hidden-print" data-tooltip="true">{{ trans('general.checkin') }}</a>
                                                     </td>
 
-                                                    <?php $totalCost = $totalCost + ($component->purchase_cost *$component->pivot->assigned_qty) ?>
+                                                        <?php $totalCost = $totalCost + ($component->purchase_cost *$component->pivot->assigned_qty) ?>
                                                 </tr>
                                             @endif
                                         @endforeach
@@ -1122,29 +1246,23 @@
                                         </tr>
                                         </tfoot>
                                     </table>
-                                @else
-                                    <div class="alert alert-info alert-block">
-                                        <i class="fas fa-info-circle"></i>
-                                        {{ trans('general.no_results') }}
-                                    </div>
-                                @endif
                             </div>
                         </div>
                     </div> <!-- /.tab-pane components -->
 
 
                     <div class="tab-pane fade" id="assets">
-                        <div class="row">
+                        <div class="row{{($asset->assignedAssets->count() > 0 ) ? '' : ' hidden-print'}}">
                             <div class="col-md-12">
 
-                                @if ($asset->assignedAssets->count() > 0)
-
-
-                                    {{ Form::open([
-                                              'method' => 'POST',
-                                              'route' => ['hardware/bulkedit'],
-                                              'class' => 'form-inline',
-                                               'id' => 'bulkForm']) }}
+                                    <form
+                                        method="POST"
+                                        action="{{ route('hardware/bulkedit') }}"
+                                        accept-charset="UTF-8"
+                                        class="form-inline"
+                                        id="bulkForm"
+                                    >
+                                    @csrf
                                     <div id="toolbar">
                                         <label for="bulk_actions"><span class="sr-only">{{ trans('general.bulk_actions')}}</span></label>
                                         <select name="bulk_actions" class="form-control select2" style="width: 150px;" aria-label="bulk_actions">
@@ -1164,6 +1282,8 @@
                                                 data-pagination="true"
                                                 data-id-table="assetsTable"
                                                 data-search="true"
+                                                data-search-highlight="true"
+                                                data-show-print="true"
                                                 data-side-pagination="server"
                                                 data-show-columns="true"
                                                 data-show-fullscreen="true"
@@ -1182,33 +1302,61 @@
                                         </table>
 
 
-                                        {{ Form::close() }}
+                                        </form>
                                     </div>
 
-                                @else
-
-                                    <div class="alert alert-info alert-block">
-                                        <i class="fas fa-info-circle"></i>
-                                        {{ trans('general.no_results') }}
-                                    </div>
-                                @endif
-
 
                             </div><!-- /col -->
                         </div> <!-- row -->
                     </div> <!-- /.tab-pane software -->
 
 
+                <div class="tab-pane" id="accessories_assigned">
+
+
+                    <div class="table table-responsive">
+
+                        <h2 class="box-title" style="float:left">
+                            {{ trans('general.accessories_assigned') }}
+                        </h2>
+
+                        <table
+                                data-columns="{{ \App\Presenters\AssetPresenter::assignedAccessoriesDataTableLayout() }}"
+                                data-cookie-id-table="accessoriesAssignedListingTable"
+                                data-pagination="true"
+                                data-id-table="accessoriesAssignedListingTable"
+                                data-search="true"
+                                data-search-highlight="true"
+                                data-show-print="true"
+                                data-side-pagination="server"
+                                data-show-columns="true"
+                                data-show-export="true"
+                                data-show-refresh="true"
+                                data-sort-order="asc"
+                                data-click-to-select="true"
+                                id="accessoriesAssignedListingTable"
+                                class="table table-striped snipe-table"
+                                data-url="{{ route('api.assets.assigned_accessories', ['asset' => $asset]) }}"
+                                data-export-options='{
+                              "fileName": "export-locations-{{ str_slug($asset->name) }}-accessories-{{ date('Y-m-d') }}",
+                              "ignoreColumn": ["actions","image","change","checkbox","checkincheckout","icon"]
+                              }'>
+                        </table>
+
+                    </div><!-- /.table-responsive -->
+                </div><!-- /.tab-pane -->
+
+
                     <div class="tab-pane fade" id="maintenances">
-                        <div class="row">
+                        <div class="row{{($asset->assetmaintenances->count() > 0 ) ? '' : ' hidden-print'}}">
                             <div class="col-md-12">
                                 @can('update', \App\Models\Asset::class)
                                     <div id="maintenance-toolbar">
                                         <a href="{{ route('maintenances.create', ['asset_id' => $asset->id]) }}" class="btn btn-primary">{{ trans('button.add_maintenance') }}</a>
                                     </div>
-                            @endcan
+                                @endcan
 
-                            <!-- Asset Maintenance table -->
+                                <!-- Asset Maintenance table -->
                                 <table
                                         data-columns="{{ \App\Presenters\AssetMaintenancesPresenter::dataTableLayout() }}"
                                         class="table table-striped snipe-table"
@@ -1216,6 +1364,8 @@
                                         data-pagination="true"
                                         data-id-table="assetMaintenancesTable"
                                         data-search="true"
+                                        data-search-highlight="true"
+                                        data-show-print="true"
                                         data-side-pagination="server"
                                         data-toolbar="#maintenance-toolbar"
                                         data-show-columns="true"
@@ -1234,16 +1384,68 @@
                         </div> <!-- /.row -->
                     </div> <!-- /.tab-pane maintenances -->
 
-                    <div class="tab-pane fade" id="history">
+
+                <div class="tab-pane fade" id="audits">
+                    <!-- checked out assets table -->
+                    <div class="row">
+                        <div class="col-md-12">
+                            <table
+                                    class="table table-striped snipe-table"
+                                    id="asseAuditHistory"
+                                    data-pagination="true"
+                                    data-id-table="asseAuditHistory"
+                                    data-search="true"
+                                    data-search-highlight="true"
+                                    data-show-print="true"
+                                    data-show-print="true"
+                                    data-side-pagination="server"
+                                    data-show-columns="true"
+                                    data-show-fullscreen="true"
+                                    data-show-refresh="true"
+                                    data-sort-order="desc"
+                                    data-sort-name="created_at"
+                                    data-show-export="true"
+                                    data-export-options='{
+                         "fileName": "export-asset-{{  $asset->id }}-audits",
+                         "ignoreColumn": ["actions","image","change","checkbox","checkincheckout","icon"]
+                       }'
+
+                                    data-url="{{ route('api.activity.index', ['item_id' => $asset->id, 'item_type' => 'asset', 'action_type' => 'audit']) }}"
+                                    data-cookie-id-table="assetHistory"
+                                    data-cookie="true">
+                                <thead>
+                                <tr>
+                                    <th data-visible="true" data-field="icon" style="width: 40px;" class="hidden-xs" data-formatter="iconFormatter">{{ trans('admin/hardware/table.icon') }}</th>
+                                    <th data-visible="true" data-field="created_at" data-sortable="true" data-formatter="dateDisplayFormatter">{{ trans('general.date') }}</th>
+                                    <th data-visible="true" data-field="admin" data-formatter="usersLinkObjFormatter">{{ trans('general.created_by') }}</th>
+                                    <th class="col-sm-2" data-field="file" data-sortable="true" data-visible="false" data-formatter="fileUploadNameFormatter">{{ trans('general.file_name') }}</th>
+                                    <th data-field="note">{{ trans('general.notes') }}</th>
+                                    <th data-visible="false" data-field="file" data-visible="false"  data-formatter="fileUploadFormatter">{{ trans('general.download') }}</th>
+                                    <th data-field="log_meta" data-visible="true" data-formatter="changeLogFormatter">{{ trans('admin/hardware/table.changed')}}</th>
+                                    <th data-field="remote_ip" data-visible="false" data-sortable="true">{{ trans('admin/settings/general.login_ip') }}</th>
+                                    <th data-field="user_agent" data-visible="false" data-sortable="true">{{ trans('admin/settings/general.login_user_agent') }}</th>
+                                    <th data-field="action_source" data-visible="false" data-sortable="true">{{ trans('general.action_source') }}</th>
+                                </tr>
+                                </thead>
+                            </table>
+                        </div>
+                    </div> <!-- /.row -->
+                </div> <!-- /.tab-pane history -->
+
+
+                <div class="tab-pane fade" id="history">
                         <!-- checked out assets table -->
                         <div class="row">
                             <div class="col-md-12">
                                 <table
+                                        data-columns="{{ \App\Presenters\HistoryPresenter::dataTableLayout() }}"
                                         class="table table-striped snipe-table"
                                         id="assetHistory"
                                         data-pagination="true"
                                         data-id-table="assetHistory"
                                         data-search="true"
+                                        data-search-highlight="true"
+                                        data-show-print="true"
                                         data-side-pagination="server"
                                         data-show-columns="true"
                                         data-show-fullscreen="true"
@@ -1256,256 +1458,62 @@
                          "ignoreColumn": ["actions","image","change","checkbox","checkincheckout","icon"]
                        }'
 
-                      data-url="{{ route('api.activity.index', ['item_id' => $asset->id, 'item_type' => 'asset']) }}"
-                      data-cookie-id-table="assetHistory"
-                      data-cookie="true">
-                <thead>
-                <tr>
-                  <th data-visible="true" data-field="icon" style="width: 40px;" class="hidden-xs" data-formatter="iconFormatter">{{ trans('admin/hardware/table.icon') }}</th>
-                  <th data-visible="true" data-field="action_date" data-sortable="true" data-formatter="dateDisplayFormatter">{{ trans('general.date') }}</th>
-                  <th data-visible="true" data-field="admin" data-formatter="usersLinkObjFormatter">{{ trans('general.admin') }}</th>
-                  <th data-visible="true" data-field="action_type">{{ trans('general.action') }}</th>
-                  <th class="col-sm-2" data-field="file" data-visible="false" data-formatter="fileUploadNameFormatter">{{ trans('general.file_name') }}</th>
-                  <th data-visible="true" data-field="item" data-formatter="polymorphicItemFormatter">{{ trans('general.item') }}</th>
-                  <th data-visible="true" data-field="target" data-formatter="polymorphicItemFormatter">{{ trans('general.target') }}</th>
-                  <th data-field="note">{{ trans('general.notes') }}</th>
-                  <th data-field="signature_file" data-visible="false"  data-formatter="imageFormatter">{{ trans('general.signature') }}</th>
-                  <th data-visible="false" data-field="file" data-visible="false"  data-formatter="fileUploadFormatter">{{ trans('general.download') }}</th>
-                   <th data-field="log_meta" data-visible="true" data-formatter="changeLogFormatter">{{ trans('admin/hardware/table.changed')}}</th>
-                   <th data-field="remote_ip" data-visible="false" data-sortable="true">{{ trans('admin/settings/general.login_ip') }}</th>
-                   <th data-field="user_agent" data-visible="false" data-sortable="true">{{ trans('admin/settings/general.login_user_agent') }}</th>
-                   <th data-field="action_source" data-visible="false" data-sortable="true">{{ trans('general.action_source') }}</th>
-                </tr>
-                </thead>
-              </table>
-            </div>
-          </div> <!-- /.row -->
-        </div> <!-- /.tab-pane history -->
-
-        <div class="tab-pane fade" id="files">
-          <div class="row">
-            <div class="col-md-12">
-
-              @if ($asset->uploads->count() > 0)
-              <table
-                      class="table table-striped snipe-table"
-                      id="assetFileHistory"
-                      data-pagination="true"
-                      data-id-table="assetFileHistory"
-                      data-search="true"
-                      data-side-pagination="client"
-                      data-sortable="true"
-                      data-show-columns="true"
-                      data-show-fullscreen="true"
-                      data-show-refresh="true"
-                      data-sort-order="desc"
-                      data-sort-name="created_at"
-                      data-show-export="true"
-                      data-export-options='{
-                         "fileName": "export-asset-{{ $asset->id }}-files",
-                         "ignoreColumn": ["actions","image","change","checkbox","checkincheckout","icon"]
-                       }'
-                                            data-cookie-id-table="assetFileHistory">
-                                        <thead>
-                                        <tr>
-                                            <th data-visible="true" data-field="icon" data-sortable="true">{{trans('general.file_type')}}</th>
-                                            <th class="col-md-2" data-searchable="true" data-visible="true" data-field="image">{{ trans('general.image') }}</th>
-                                            <th class="col-md-2" data-searchable="true" data-visible="true" data-field="filename" data-sortable="true">{{ trans('general.file_name') }}</th>
-                                            <th class="col-md-1" data-searchable="true" data-visible="true" data-field="filesize">{{ trans('general.filesize') }}</th>
-                                            <th class="col-md-2" data-searchable="true" data-visible="true" data-field="notes" data-sortable="true">{{ trans('general.notes') }}</th>
-                                            <th class="col-md-1" data-searchable="true" data-visible="true" data-field="download">{{ trans('general.download') }}</th>
-                                            <th class="col-md-2" data-searchable="true" data-visible="true" data-field="created_at" data-sortable="true">{{ trans('general.created_at') }}</th>
-                                            <th class="col-md-1" data-searchable="true" data-visible="true" data-field="actions">{{ trans('table.actions') }}</th>
-                                        </tr>
-                                        </thead>
-                                        <tbody>
-
-                                        @foreach ($asset->uploads as $file)
-                                            <tr>
-                                                <td><i class="{{ Helper::filetype_icon($file->filename) }} icon-med" aria-hidden="true"></i></td>
-                                                <td>
-                                                    @if ( Helper::checkUploadIsImage($file->get_src('assets')))
-                                                        <a href="{{ route('show/assetfile', ['assetId' => $asset->id, 'fileId' =>$file->id]) }}" data-toggle="lightbox" data-type="image" data-title="{{ $file->filename }}" data-footer="{{ Helper::getFormattedDateObject($asset->last_checkout, 'datetime', false) }}">
-                                                            <img src="{{ route('show/assetfile', ['assetId' => $asset->id, 'fileId' =>$file->id]) }}" style="max-width: 50px;">
-                                                        </a>
-                                                    @endif
-                                                </td>
-                                                <td>
-                                                    @if (Storage::exists('private_uploads/assets/'.$file->filename))
-                                                    {{ $file->filename }}
-                                                    @else
-                                                    <del>{{ $file->filename }}</del>
-                                                    @endif
-                                                </td>
-                                                <td data-value="{{ (Storage::exists('private_uploads/assets/'.$file->filename) ? Storage::size('private_uploads/assets/'.$file->filename) : '') }}">
-                                                    {{ @Helper::formatFilesizeUnits(Storage::exists('private_uploads/assets/'.$file->filename) ? Storage::size('private_uploads/assets/'.$file->filename) : '') }}
-                                                </td>
-                                                <td>
-                                                    @if ($file->note)
-                                                        {{ $file->note }}
-                                                    @endif
-                                                </td>
-                                                <td>
-                                                    @if (($file->filename) && (Storage::exists('private_uploads/assets/'.$file->filename)))
-                                                        <a href="{{ route('show/assetfile', [$asset->id, $file->id, 'download'=>'true']) }}" class="btn btn-sm btn-default">
-                                                            <i class="fas fa-download" aria-hidden="true"></i>
-                                                        </a>
-
-                                                        <a href="{{ route('show/assetfile', [$asset->id, $file->id, 'inline'=>'true']) }}" class="btn btn-sm btn-default" target="_blank">
-                                                            <i class="fa fa-external-link" aria-hidden="true"></i>
-                                                        </a>
-                                                    @endif
-                                                </td>
-                                                <td>
-                                                    @if ($file->created_at)
-                                                        {{ Helper::getFormattedDateObject($file->created_at, 'datetime', false) }}
-                                                    @endif
-                                                </td>
-                                                <td>
-                                                    @can('update', \App\Models\Asset::class)
-                                                        <a class="btn delete-asset btn-sm btn-danger btn-sm" href="{{ route('delete/assetfile', [$asset->id, $file->id]) }}" data-tooltip="true" data-title="Delete" data-content="{{ trans('general.delete_confirm', ['item' => $file->filename]) }}"><i class="fas fa-trash icon-white" aria-hidden="true"></i></a>
-                                                    @endcan
-                                                </td>
-                                            </tr>
-                                        @endforeach
-                                        </tbody>
-                                    </table>
-
-                                @else
-
-                                    <div class="alert alert-info alert-block">
-                                        <i class="fas fa-info-circle"></i>
-                                        {{ trans('general.no_results') }}
-                                    </div>
-                                @endif
-
-                            </div> <!-- /.col-md-12 -->
+                                        data-url="{{ route('api.activity.index', ['item_id' => $asset->id, 'item_type' => 'asset']) }}"
+                                        data-cookie-id-table="assetHistory"
+                                        data-cookie="true">
+                                </table>
+                            </div>
                         </div> <!-- /.row -->
-                    </div> <!-- /.tab-pane files -->
+                    </div> <!-- /.tab-pane history -->
 
-                    <div class="tab-pane fade" id="modelfiles">
-                        <div class="row">
+                    <div class="tab-pane fade" id="files">
+                        <div class="row{{ ($asset->uploads->count() > 0 ) ? '' : ' hidden-print' }}">
                             <div class="col-md-12">
-
-                                @if (($asset->model) && ($asset->model->uploads->count() > 0))
-                                    <table
-                                            class="table table-striped snipe-table"
-                                            id="assetModelFileHistory"
-                                            data-pagination="true"
-                                            data-id-table="assetModelFileHistory"
-                                            data-search="true"
-                                            data-side-pagination="client"
-                                            data-sortable="true"
-                                            data-show-columns="true"
-                                            data-show-fullscreen="true"
-                                            data-show-refresh="true"
-                                            data-sort-order="desc"
-                                            data-sort-name="created_at"
-                                            data-show-export="true"
-                                            data-export-options='{
-                         "fileName": "export-assetmodel-{{ $asset->model->id }}-files",
-                         "ignoreColumn": ["actions","image","change","checkbox","checkincheckout","icon"]
-                       }'
-                                            data-cookie-id-table="assetFileHistory">
-                                        <thead>
-                                        <tr>
-                                            <th data-visible="true" data-field="icon" data-sortable="true">{{trans('general.file_type')}}</th>
-                                            <th class="col-md-2" data-searchable="true" data-visible="true" data-field="image">{{ trans('general.image') }}</th>
-                                            <th class="col-md-2" data-searchable="true" data-visible="true" data-field="filename" data-sortable="true">{{ trans('general.file_name') }}</th>
-                                            <th class="col-md-1" data-searchable="true" data-visible="true" data-field="filesize">{{ trans('general.filesize') }}</th>
-                                            <th class="col-md-2" data-searchable="true" data-visible="true" data-field="notes" data-sortable="true">{{ trans('general.notes') }}</th>
-                                            <th class="col-md-1" data-searchable="true" data-visible="true" data-field="download">{{ trans('general.download') }}</th>
-                                            <th class="col-md-2" data-searchable="true" data-visible="true" data-field="created_at" data-sortable="true">{{ trans('general.created_at') }}</th>
-                                            <th class="col-md-1" data-searchable="true" data-visible="true" data-field="actions">{{ trans('table.actions') }}</th>
-                                        </tr>
-                                        </thead>
-                                        <tbody>
-
-                                        @foreach ($asset->model->uploads as $file)
-                                            <tr>
-                                                <td><i class="{{ Helper::filetype_icon($file->filename) }} icon-med" aria-hidden="true"></i></td>
-                                                <td>
-                                                    @if ( Helper::checkUploadIsImage($file->get_src('assetmodels')))
-                                                        <a href="{{ route('show/modelfile', ['modelID' => $asset->model->id, 'fileId' =>$file->id]) }}" data-toggle="lightbox" data-type="image" data-title="{{ $file->filename }}" data-footer="{{ Helper::getFormattedDateObject($asset->last_checkout, 'datetime', false) }}">
-                                                            <img src="{{ route('show/modelfile', ['modelID' => $asset->model->id, 'fileId' =>$file->id]) }}" style="max-width: 50px;">
-                                                        </a>
-                                                    @endif
-                                                </td>
-                                                <td>
-                                                    @if (Storage::exists('private_uploads/assetmodels/'.$file->filename))
-                                                        {{ $file->filename }}
-                                                    @else
-                                                        <del>{{ $file->filename }}</del>
-                                                    @endif
-                                                </td>
-                                                <td data-value="{{ (Storage::exists('private_uploads/assetmodels/'.$file->filename)) ? Storage::size('private_uploads/assetmodels/'.$file->filename) : '' }}">
-                                                    {{ (Storage::exists('private_uploads/assetmodels/'.$file->filename)) ? Helper::formatFilesizeUnits(Storage::size('private_uploads/assetmodels/'.$file->filename)) : '' }}
-                                                </td>
-                                                <td>
-                                                    @if ($file->note)
-                                                        {{ $file->note }}
-                                                    @endif
-                                                </td>
-                                                <td>
-                                                    @if (($file->filename) && (Storage::exists('private_uploads/assetmodels/'.$file->filename)))
-                                                        <a href="{{ route('show/modelfile', [$asset->model->id, $file->id]) }}" class="btn btn-sm btn-default">
-                                                            <i class="fas fa-download" aria-hidden="true"></i>
-                                                        </a>
-
-                                                        <a href="{{ route('show/modelfile', [$asset->model->id, $file->id, 'inline'=>'true']) }}" class="btn btn-sm btn-default" target="_blank">
-                                                            <i class="fa fa-external-link" aria-hidden="true"></i>
-                                                        </a>
-
-                                                    @endif
-                                                </td>
-                                                <td>
-                                                    @if ($file->created_at)
-                                                        {{ Helper::getFormattedDateObject($file->created_at, 'datetime', false) }}
-                                                    @endif
-                                                </td>
-                                                <td>
-                                                    @can('update', \App\Models\AssetModel::class)
-                                                        <a class="btn delete-asset btn-sm btn-danger btn-sm" href="{{ route('delete/modelfile', [$asset->model->id, $file->id]) }}" data-tooltip="true" data-title="Delete" data-content="{{ trans('general.delete_confirm', ['item' => $file->filename]) }}"><i class="fas fa-trash icon-white" aria-hidden="true"></i></a>
-                                                    @endcan
-                                                </td>
-                                            </tr>
-                                        @endforeach
-                                        </tbody>
-                                    </table>
-
-                                @else
-
-                                    <div class="alert alert-info alert-block">
-                                        <i class="fas fa-info-circle"></i>
-                                        {{ trans('general.no_results') }}
-                                    </div>
-                                @endif
-
+                                <x-filestable
+                                        filepath="private_uploads/assets/"
+                                        showfile_routename="show/assetfile"
+                                        deletefile_routename="delete/assetfile"
+                                        :object="$asset" />
                             </div> <!-- /.col-md-12 -->
                         </div> <!-- /.row -->
                     </div> <!-- /.tab-pane files -->
-                </div> <!-- /. tab-content -->
-            </div> <!-- /.nav-tabs-custom -->
-        </div> <!-- /. col-md-12 -->
-    </div> <!-- /. row -->
+
+                    @if ($asset->model)
+                        @can('view', $asset->model)
+                            <div class="tab-pane fade" id="modelfiles">
+                                <div class="row{{ (($asset->model) && ($asset->model->uploads->count() > 0)) ? '' : ' hidden-print' }}">
+                                    <div class="col-md-12">
+
+                                        <x-filestable
+                                                filepath="private_uploads/assetmodels/"
+                                                showfile_routename="show/modelfile"
+                                                deletefile_routename="delete/modelfile"
+                                                :object="$asset->model" />
+
+                                    </div> <!-- /.col-md-12 -->
+                                </div> <!-- /.row -->
+                            </div> <!-- /.tab-pane files -->
+                        @endcan
+                    @endif
+            </div><!-- /.tab-content -->
+        </div><!-- nav-tabs-custom -->
+    </div>
 
     @can('update', \App\Models\Asset::class)
         @include ('modals.upload-file', ['item_type' => 'asset', 'item_id' => $asset->id])
     @endcan
-
 @stop
+            @section('moar_scripts')
+                <script>
 
-@section('moar_scripts')
-    <script>
+                    $('#dataConfirmModal').on('show.bs.modal', function (event) {
+                        var content = $(event.relatedTarget).data('content');
+                        var title = $(event.relatedTarget).data('title');
+                        $(this).find(".modal-body").text(content);
+                        $(this).find(".modal-header").text(title);
+                    });
 
-        $('#dataConfirmModal').on('show.bs.modal', function (event) {
-            var content = $(event.relatedTarget).data('content');
-            var title = $(event.relatedTarget).data('title');
-            $(this).find(".modal-body").text(content);
-            $(this).find(".modal-header").text(title);
-        });
-
-    </script>
+                </script>
     @include ('partials.bootstrap-table')
 
 @stop
diff --git a/resources/views/kits/accessory-edit.blade.php b/resources/views/kits/accessory-edit.blade.php
index 6270ae2f6e..549316116c 100644
--- a/resources/views/kits/accessory-edit.blade.php
+++ b/resources/views/kits/accessory-edit.blade.php
@@ -11,13 +11,13 @@
     <label for="quantity" class="col-md-3 control-label">{{ trans('general.quantity') }}</label>
     <div class="col-md-7 required">
         <div class="col-md-2" style="padding-left:0px">
-            <input class="form-control" type="text" name="quantity" id="quantity" value="{{ Request::old('quantity', $item->quantity) }}" />
+            <input class="form-control" type="text" name="quantity" id="quantity" value="{{ old('quantity', $item->quantity) }}" />
         </div>
         {!! $errors->first('quantity', '<span class="alert-msg"><i class="fas fa-times"></i> :message</span>') !!}
     </div>
 </div>
 
 <input type="hidden" name="pivot_id" value="{{$item->id}}">
-{{-- <input class="form-control" type="text" name="quantity" id="quantity" value="{{ Request::old('quantity', $item->quantity) }}" /> --}}
+{{-- <input class="form-control" type="text" name="quantity" id="quantity" value="{{ old('quantity', $item->quantity) }}" /> --}}
 
 @stop
diff --git a/resources/views/kits/checkout.blade.php b/resources/views/kits/checkout.blade.php
index 5dbbe03458..212f72c118 100644
--- a/resources/views/kits/checkout.blade.php
+++ b/resources/views/kits/checkout.blade.php
@@ -32,8 +32,8 @@
                   </label>
                   <div class="col-md-8">
                       <div class="input-group date col-md-5" data-provide="datepicker" data-date-format="yyyy-mm-dd" data-date-end-date="0d" data-date-clear-btn="true">
-                          <input type="text" class="form-control" placeholder="{{ trans('general.select_date') }}" name="checkout_at" id="checkout_at" value="{{ Request::old('checkout_at') }}">
-                          <span class="input-group-addon"><i class="fas fa-calendar"></i></span>
+                          <input type="text" class="form-control" placeholder="{{ trans('general.select_date') }}" name="checkout_at" id="checkout_at" value="{{ old('checkout_at') }}">
+                          <span class="input-group-addon"><x-icon type="calendar" /></span>
                       </div>
                       {!! $errors->first('checkout_at', '<span class="alert-msg"><i class="fas fa-times"></i> :message</span>') !!}
                   </div>
@@ -46,8 +46,8 @@
                   </label>
                   <div class="col-md-8">
                       <div class="input-group date col-md-5" data-provide="datepicker" data-date-format="yyyy-mm-dd" data-date-start-date="0d">
-                          <input type="text" class="form-control" placeholder="{{ trans('general.select_date') }}" name="expected_checkin" id="expected_checkin" value="{{ Request::old('expected_checkin') }}">
-                          <span class="input-group-addon"><i class="fas fa-calendar"></i></span>
+                          <input type="text" class="form-control" placeholder="{{ trans('general.select_date') }}" name="expected_checkin" id="expected_checkin" value="{{ old('expected_checkin') }}">
+                          <span class="input-group-addon"><x-icon type="calendar" /></span>
                       </div>
                       {!! $errors->first('expected_checkin', '<span class="alert-msg"><i class="fas fa-times"></i> :message</span>') !!}
                   </div>
@@ -60,7 +60,7 @@
                   {{ trans('general.notes') }}
               </label>
             <div class="col-md-8">
-              <textarea class="col-md-6 form-control" id="note" name="note">{{ Request::old('note') }}</textarea>
+              <textarea class="col-md-6 form-control" id="note" name="note">{{ old('note') }}</textarea>
               {!! $errors->first('note', '<span class="alert-msg"><i class="fas fa-times"></i> :message</span>') !!}
             </div>
           </div>
@@ -68,7 +68,7 @@
       </div> <!--./box-body-->
       <div class="box-footer">
         <a class="btn btn-link" href="{{ route('kits.index') }}"> {{ trans('button.cancel') }}</a>
-        <button type="submit" class="btn btn-success pull-right"><i class="fas fa-check icon-white"></i> {{ trans('general.checkout') }}</button>
+        <button type="submit" class="btn btn-success pull-right"><x-icon type="checkmark" /> {{ trans('general.checkout') }}</button>
       </div>
     </div>
       </form>
diff --git a/resources/views/kits/consumable-edit.blade.php b/resources/views/kits/consumable-edit.blade.php
index fdac02023b..3e40611d17 100644
--- a/resources/views/kits/consumable-edit.blade.php
+++ b/resources/views/kits/consumable-edit.blade.php
@@ -12,13 +12,13 @@
     <label for="quantity" class="col-md-3 control-label">{{ trans('general.quantity') }}</label>
     <div class="col-md-7 required">
         <div class="col-md-2" style="padding-left:0px">
-            <input class="form-control" type="text" name="quantity" id="quantity" value="{{ Request::old('quantity', $item->quantity) }}" />
+            <input class="form-control" type="text" name="quantity" id="quantity" value="{{ old('quantity', $item->quantity) }}" />
         </div>
         {!! $errors->first('quantity', '<span class="alert-msg"><i class="fas fa-times"></i> :message</span>') !!}
     </div>
 </div>
 
 <input type="hidden" name="pivot_id" value="{{$item->id}}">
-{{-- <input class="form-control" type="text" name="quantity" id="quantity" value="{{ Request::old('quantity', $item->quantity) }}" /> --}}
+{{-- <input class="form-control" type="text" name="quantity" id="quantity" value="{{ old('quantity', $item->quantity) }}" /> --}}
 
 @stop
diff --git a/resources/views/kits/index.blade.php b/resources/views/kits/index.blade.php
index d72d319280..4f2431a0df 100644
--- a/resources/views/kits/index.blade.php
+++ b/resources/views/kits/index.blade.php
@@ -19,12 +19,13 @@
   <div class="col-md-12">
     <div class="box box-default">
       <div class="box-body">
-        <div class="table-responsive">
             <table
                 data-cookie-id-table="kitsTable"
                 data-columns="{{ \App\Presenters\PredefinedKitPresenter::dataTableLayout() }}"
                 data-pagination="true"
                 data-search="true"
+                data-search-highlight="true"
+                data-show-print="true"
                 data-side-pagination="server"
                 data-show-columns="true"
                 data-show-fullscreen="true"
@@ -40,7 +41,6 @@
             "ignoreColumn": ["actions","image","change","checkbox","checkincheckout","icon"]
             }'>
           </table>
-        </div>
       </div> <!--.box-body-->
     </div> <!-- /.box.box-default-->
   </div> <!-- .col-md-12-->
diff --git a/resources/views/kits/license-edit.blade.php b/resources/views/kits/license-edit.blade.php
index 43463ab434..a7d44d6f08 100644
--- a/resources/views/kits/license-edit.blade.php
+++ b/resources/views/kits/license-edit.blade.php
@@ -11,13 +11,13 @@
     <label for="quantity" class="col-md-3 control-label">{{ trans('general.quantity') }}</label>
     <div class="col-md-7 required">
         <div class="col-md-2" style="padding-left:0px">
-            <input class="form-control" type="text" name="quantity" id="quantity" value="{{ Request::old('quantity', $item->quantity) }}" />
+            <input class="form-control" type="text" name="quantity" id="quantity" value="{{ old('quantity', $item->quantity) }}" />
         </div>
         {!! $errors->first('quantity', '<span class="alert-msg"><i class="fas fa-times"></i> :message</span>') !!}
     </div>
 </div>
 
 <input type="hidden" name="pivot_id" value="{{$item->id}}">
-{{-- <input class="form-control" type="text" name="quantity" id="quantity" value="{{ Request::old('quantity', $item->quantity) }}" /> --}}
+{{-- <input class="form-control" type="text" name="quantity" id="quantity" value="{{ old('quantity', $item->quantity) }}" /> --}}
 
 @stop
diff --git a/resources/views/kits/model-edit.blade.php b/resources/views/kits/model-edit.blade.php
index c16efa8464..4372265b9f 100644
--- a/resources/views/kits/model-edit.blade.php
+++ b/resources/views/kits/model-edit.blade.php
@@ -1,23 +1,24 @@
 @extends('layouts/edit-form', [
     'createText' => trans('admin/kits/general.append_model'),
     'updateText' => trans('admin/kits/general.update_appended_model'),
-    'formAction' => (isset($item->id)) ? route('kits.models.update', ['kit_id' => $kit->id, 'model_id' => $item->model_id]) : route('kits.models.store', ['kit_id' => $kit->id]),
+    'formAction' => (isset($item->id)) ? route('kits.models.update', ['kit' => $kit->id, 'model_id' => $item->model_id]) : route('kits.models.store', ['kit_id' => $kit->id]),
 ])
 
 {{-- Page content --}}
 @section('inputFields')
 @include ('partials.forms.edit.model-select', ['translated_name' => trans('admin/hardware/form.model'), 'fieldname' => 'model_id', 'required' => 'true'])
+
 <div class="form-group {{ $errors->has('quantity') ? ' has-error' : '' }}">
     <label for="quantity" class="col-md-3 control-label">{{ trans('general.quantity') }}</label>
     <div class="col-md-7 required">
         <div class="col-md-2" style="padding-left:0px">
-            <input class="form-control" type="text" name="quantity" id="quantity" value="{{ Request::old('quantity', $item->quantity) }}" />
+            <input class="form-control" type="text" name="quantity" id="quantity" value="{{ old('quantity', $item->quantity) }}" />
         </div>
         {!! $errors->first('quantity', '<span class="alert-msg"><i class="fas fa-times"></i> :message</span>') !!}
     </div>
 </div>
 
 <input type="hidden" name="pivot_id" value="{{$item->id}}">
-{{-- <input class="form-control" type="text" name="quantity" id="quantity" value="{{ Request::old('quantity', $item->quantity) }}" /> --}}
+{{-- <input class="form-control" type="text" name="quantity" id="quantity" value="{{ old('quantity', $item->quantity) }}" /> --}}
 
 @stop
diff --git a/resources/views/layouts/basic.blade.php b/resources/views/layouts/basic.blade.php
index db9e60e5de..bea80ff77c 100644
--- a/resources/views/layouts/basic.blade.php
+++ b/resources/views/layouts/basic.blade.php
@@ -32,13 +32,6 @@
         .skin-blue .sidebar-menu > li:hover > a, .skin-blue .sidebar-menu > li.active > a {
         border-left-color: {{ $snipeSettings->header_color }};
         }
-
-        .btn-primary {
-        background-color: {{ $snipeSettings->header_color }};
-        border-color: {{ $snipeSettings->header_color }};
-        }
-
-
         </style>
     @endif
 
@@ -53,15 +46,15 @@
 <body class="hold-transition login-page">
 
     @if (($snipeSettings) && ($snipeSettings->logo!=''))
-        <center>
-            <a href="{{ config('app.url') }}"><img id="login-logo" src="{{ Storage::disk('public')->url('').e($snipeSettings->logo) }}"></a>
-        </center>
+        <div class="text-center">
+            <a href="{{ config('app.url') }}">
+                <img id="login-logo" src="{{ Storage::disk('public')->url('').e($snipeSettings->logo) }}" alt="{{ $snipeSettings->site_name }}">
+            </a>
+        </div>
     @endif
   <!-- Content -->
   @yield('content')
 
-
-
     <div class="text-center" style="padding-top: 100px;">
         @if (($snipeSettings) && ($snipeSettings->privacy_policy_link!=''))
         <a target="_blank" rel="noopener" href="{{  $snipeSettings->privacy_policy_link }}" target="_new">{{ trans('admin/settings/general.privacy_policy') }}</a>
diff --git a/resources/views/layouts/default.blade.php b/resources/views/layouts/default.blade.php
index 5b23db7b80..69adec5ef4 100644
--- a/resources/views/layouts/default.blade.php
+++ b/resources/views/layouts/default.blade.php
@@ -1,6 +1,6 @@
 <!DOCTYPE html>
 <html lang="{{ str_replace('_', '-', app()->getLocale()) }}"
-dir="{{ in_array(app()->getLocale(),['ar-SA','fa-IR', 'he-IL']) ? 'rtl' : 'ltr' }}">
+dir="{{ Helper::determineLanguageDirection() }}">
 <head>
     <meta charset="utf-8">
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
@@ -24,6 +24,8 @@ dir="{{ in_array(app()->getLocale(),['ar-SA','fa-IR', 'he-IL']) ? 'rtl' : 'ltr'
 
 
     <meta name="csrf-token" content="{{ csrf_token() }}">
+    <meta name="language" content="{{ Helper::mapBackToLegacyLocale(app()->getLocale()) }}">
+    <meta name="language-direction" content="{{ Helper::determineLanguageDirection() }}">
     <meta name="baseUrl" content="{{ config('app.url') }}/">
 
     <script nonce="{{ csrf_token() }}">
@@ -142,40 +144,40 @@ dir="{{ in_array(app()->getLocale(),['ar-SA','fa-IR', 'he-IL']) ? 'rtl' : 'ltr'
                         <ul class="nav navbar-nav">
                             @can('index', \App\Models\Asset::class)
                                 <li aria-hidden="true"{!! (Request::is('hardware*') ? ' class="active"' : '') !!}>
-                                    <a href="{{ url('hardware') }}" accesskey="1" tabindex="-1">
-                                        <i class="fas fa-barcode fa-fw"></i>
+                                    <a href="{{ url('hardware') }}" {{$snipeSettings->shortcuts_enabled == 1 ? "accesskey=1" : ''}} tabindex="-1" data-tooltip="true" data-placement="bottom" data-title="{{ trans('general.assets') }}">
+                                        <x-icon type="assets" class="fa-fw" />
                                         <span class="sr-only">{{ trans('general.assets') }}</span>
                                     </a>
                                 </li>
                             @endcan
                             @can('view', \App\Models\License::class)
                                 <li aria-hidden="true"{!! (Request::is('licenses*') ? ' class="active"' : '') !!}>
-                                    <a href="{{ route('licenses.index') }}" accesskey="2" tabindex="-1">
-                                        <i class="far fa-save fa-fw"></i>
+                                    <a href="{{ route('licenses.index') }}" {{$snipeSettings->shortcuts_enabled == 1 ? "accesskey=2" : ''}} tabindex="-1" data-tooltip="true" data-placement="bottom" data-title="{{ trans('general.licenses') }}">
+                                        <x-icon type="licenses" class="fa-fw" />
                                         <span class="sr-only">{{ trans('general.licenses') }}</span>
                                     </a>
                                 </li>
                             @endcan
                             @can('index', \App\Models\Accessory::class)
                                 <li aria-hidden="true"{!! (Request::is('accessories*') ? ' class="active"' : '') !!}>
-                                    <a href="{{ route('accessories.index') }}" accesskey="3" tabindex="-1">
-                                        <i class="far fa-keyboard fa-fw"></i>
+                                    <a href="{{ route('accessories.index') }}" {{$snipeSettings->shortcuts_enabled == 1 ? "accesskey=3" : ''}} tabindex="-1" data-tooltip="true" data-placement="bottom" data-title="{{ trans('general.accessories') }}">
+                                        <x-icon type="accessories" class="fa-fw" />
                                         <span class="sr-only">{{ trans('general.accessories') }}</span>
                                     </a>
                                 </li>
                             @endcan
                             @can('index', \App\Models\Consumable::class)
                                 <li aria-hidden="true"{!! (Request::is('consumables*') ? ' class="active"' : '') !!}>
-                                    <a href="{{ url('consumables') }}" accesskey="4" tabindex="-1">
-                                        <i class="fas fa-tint fa-fw"></i>
+                                    <a href="{{ url('consumables') }}" {{$snipeSettings->shortcuts_enabled == 1 ? "accesskey=4" : ''}} tabindex="-1" data-tooltip="true" data-placement="bottom" data-title="{{ trans('general.consumables') }}">
+                                        <x-icon type="consumables" class="fa-fw" />
                                         <span class="sr-only">{{ trans('general.consumables') }}</span>
                                     </a>
                                 </li>
                             @endcan
                             @can('view', \App\Models\Component::class)
                                 <li aria-hidden="true"{!! (Request::is('components*') ? ' class="active"' : '') !!}>
-                                    <a href="{{ route('components.index') }}" accesskey="5" tabindex="-1">
-                                        <i class="far fa-hdd fa-fw"></i>
+                                    <a href="{{ route('components.index') }}" {{$snipeSettings->shortcuts_enabled == 1 ? "accesskey=5" : ''}} tabindex="-1" data-tooltip="true" data-placement="bottom" data-title="{{ trans('general.components') }}">
+                                        <x-icon type="components" class="fa-fw" />
                                         <span class="sr-only">{{ trans('general.components') }}</span>
                                     </a>
                                 </li>
@@ -187,15 +189,15 @@ dir="{{ in_array(app()->getLocale(),['ar-SA','fa-IR', 'he-IL']) ? 'rtl' : 'ltr'
                                           action="{{ route('findbytag/hardware') }}" method="get">
                                         <div class="col-xs-12 col-md-12">
                                             <div class="col-xs-12 form-group">
-                                                <label class="sr-only"
-                                                       for="tagSearch">{{ trans('general.lookup_by_tag') }}</label>
-                                                <input type="text" class="form-control" id="tagSearch" name="assetTag"
-                                                       placeholder="{{ trans('general.lookup_by_tag') }}">
+                                                <label class="sr-only" for="tagSearch">
+                                                    {{ trans('general.lookup_by_tag') }}
+                                                </label>
+                                                <input type="text" class="form-control" id="tagSearch" name="assetTag" placeholder="{{ trans('general.lookup_by_tag') }}">
                                                 <input type="hidden" name="topsearch" value="true" id="search">
                                             </div>
                                             <div class="col-xs-1">
-                                                <button type="submit" class="btn btn-primary pull-right">
-                                                    <i class="fas fa-search" aria-hidden="true"></i>
+                                                <button type="submit" id="topSearchButton" class="btn btn-primary pull-right">
+                                                    <x-icon type="search" />
                                                     <span class="sr-only">{{ trans('general.search') }}</span>
                                                 </button>
                                             </div>
@@ -212,17 +214,17 @@ dir="{{ in_array(app()->getLocale(),['ar-SA','fa-IR', 'he-IL']) ? 'rtl' : 'ltr'
                                     </a>
                                     <ul class="dropdown-menu">
                                         @can('create', \App\Models\Asset::class)
-                                            <li {!! (Request::is('hardware/create') ? 'class="active>"' : '') !!}>
+                                            <li{!! (Request::is('hardware/create') ? ' class="active"' : '') !!}>
                                                 <a href="{{ route('hardware.create') }}" tabindex="-1">
-                                                    <i class="fas fa-barcode fa-fw" aria-hidden="true"></i>
+                                                    <x-icon type="assets" />
                                                     {{ trans('general.asset') }}
                                                 </a>
                                             </li>
                                         @endcan
                                         @can('create', \App\Models\License::class)
-                                            <li {!! (Request::is('licenses/create') ? 'class="active"' : '') !!}>
+                                            <li{!! (Request::is('licenses/create') ? ' class="active"' : '') !!}>
                                                 <a href="{{ route('licenses.create') }}" tabindex="-1">
-                                                    <i class="far fa-save fa-fw" aria-hidden="true"></i>
+                                                    <x-icon type="licenses" />
                                                     {{ trans('general.license') }}
                                                 </a>
                                             </li>
@@ -230,7 +232,7 @@ dir="{{ in_array(app()->getLocale(),['ar-SA','fa-IR', 'he-IL']) ? 'rtl' : 'ltr'
                                         @can('create', \App\Models\Accessory::class)
                                             <li {!! (Request::is('accessories/create') ? 'class="active"' : '') !!}>
                                                 <a href="{{ route('accessories.create') }}" tabindex="-1">
-                                                    <i class="far fa-keyboard fa-fw" aria-hidden="true"></i>
+                                                    <x-icon type="accessories" />
                                                     {{ trans('general.accessory') }}
                                                 </a>
                                             </li>
@@ -238,7 +240,7 @@ dir="{{ in_array(app()->getLocale(),['ar-SA','fa-IR', 'he-IL']) ? 'rtl' : 'ltr'
                                         @can('create', \App\Models\Consumable::class)
                                             <li {!! (Request::is('consunmables/create') ? 'class="active"' : '') !!}>
                                                 <a href="{{ route('consumables.create') }}" tabindex="-1">
-                                                    <i class="fas fa-tint fa-fw" aria-hidden="true"></i>
+                                                    <x-icon type="consumables" />
                                                     {{ trans('general.consumable') }}
                                                 </a>
                                             </li>
@@ -246,7 +248,7 @@ dir="{{ in_array(app()->getLocale(),['ar-SA','fa-IR', 'he-IL']) ? 'rtl' : 'ltr'
                                         @can('create', \App\Models\Component::class)
                                             <li {!! (Request::is('components/create') ? 'class="active"' : '') !!}>
                                                 <a href="{{ route('components.create') }}" tabindex="-1">
-                                                    <i class="far fa-hdd fa-fw" aria-hidden="true"></i>
+                                                    <x-icon type="components" />
                                                     {{ trans('general.component') }}
                                                 </a>
                                             </li>
@@ -254,7 +256,7 @@ dir="{{ in_array(app()->getLocale(),['ar-SA','fa-IR', 'he-IL']) ? 'rtl' : 'ltr'
                                         @can('create', \App\Models\User::class)
                                             <li {!! (Request::is('users/create') ? 'class="active"' : '') !!}>
                                                 <a href="{{ route('users.create') }}" tabindex="-1">
-                                                    <i class="fas fa-user fa-fw" aria-hidden="true"></i>
+                                                    <x-icon type="users" />
                                                     {{ trans('general.user') }}
                                                 </a>
                                             </li>
@@ -264,28 +266,38 @@ dir="{{ in_array(app()->getLocale(),['ar-SA','fa-IR', 'he-IL']) ? 'rtl' : 'ltr'
                             @endcan
 
                             @can('admin')
-                                @if ($snipeSettings->show_alerts_in_menu=='1')
-                                    <!-- Tasks: style can be found in dropdown.less -->
-                                    <?php $alert_items = Helper::checkLowInventory(); ?>
+                                <!-- Tasks: style can be found in dropdown.less -->
+                                <?php $alert_items = ($snipeSettings->show_alerts_in_menu=='1') ? Helper::checkLowInventory() : [];
+                                      $deprecations = Helper::deprecationCheck()
+                                        ?>
 
-                                    <li class="dropdown tasks-menu">
-                                        <a href="#" class="dropdown-toggle" data-toggle="dropdown">
-                                            <i class="far fa-flag" aria-hidden="true"></i>
-                                            <span class="sr-only">{{ trans('general.alerts') }}</span>
-                                            @if (count($alert_items))
-                                                <span class="label label-danger">{{ count($alert_items) }}</span>
+                                <li class="dropdown tasks-menu">
+                                    <a href="#" class="dropdown-toggle" data-toggle="dropdown">
+                                        <x-icon type="alerts" />
+                                        <span class="sr-only">{{ trans('general.alerts') }}</span>
+                                        @if(count($alert_items) + count($deprecations))
+                                            <span class="label label-danger">{{ count($alert_items) + count($deprecations)}}</span>
+                                        @endif
+                                    </a>
+                                    <ul class="dropdown-menu">
+                                        @can('superadmin')
+                                            @if($deprecations)
+                                                @foreach ($deprecations as $key => $deprecation)
+                                                    @if ($deprecation['check'])
+                                                        <li class="header alert-warning">{!! $deprecation['message'] !!}</li>
+                                                    @endif
+                                                @endforeach
                                             @endif
-                                        </a>
-                                        <ul class="dropdown-menu">
-                                            <li class="header">{{ trans('general.quantity_minimum', array('count' => count($alert_items))) }}</li>
+                                        @endcan
+                                        @if($alert_items)
+                                        <li class="header">{{ trans_choice('general.quantity_minimum', count($alert_items)) }}</li>
                                             <li>
-                                                <!-- inner menu: contains the actual data -->
+                                            <!-- inner menu: contains the actual data -->
                                                 <ul class="menu">
-
                                                     @for($i = 0; count($alert_items) > $i; $i++)
 
                                                         <li><!-- Task item -->
-                                                            <a href="{{route($alert_items[$i]['type'].'.show', $alert_items[$i]['id'])}}">
+                                                            <a href="{{ route($alert_items[$i]['type'].'.show', $alert_items[$i]['id'])}}">
                                                                 <h2 class="task_menu">{{ $alert_items[$i]['name'] }}
                                                                     <small class="pull-right">
                                                                         {{ $alert_items[$i]['remaining'] }} {{ trans('general.remaining') }}
@@ -306,13 +318,13 @@ dir="{{ in_array(app()->getLocale(),['ar-SA','fa-IR', 'he-IL']) ? 'rtl' : 'ltr'
                                                     @endfor
                                                 </ul>
                                             </li>
-                                            {{-- <li class="footer">
-                                              <a href="#">{{ trans('general.tasks_view_all') }}</a>
-                                            </li> --}}
-                                        </ul>
-                                    </li>
-                                @endcan
-                            @endif
+                                        @endif
+                                        {{-- <li class="footer">
+                                          <a href="#">{{ trans('general.tasks_view_all') }}</a>
+                                        </li> --}}
+                                    </ul>
+                                </li>
+                            @endcan
 
 
 
@@ -324,31 +336,33 @@ dir="{{ in_array(app()->getLocale(),['ar-SA','fa-IR', 'he-IL']) ? 'rtl' : 'ltr'
                                             <img src="{{ Auth::user()->present()->gravatar() }}" class="user-image"
                                                  alt="">
                                         @else
-                                            <i class="fas fa-users" aria-hidden="true"></i>
+                                            <x-icon type="user" />
                                         @endif
 
-                                        <span class="hidden-xs">{{ Auth::user()->getFullNameAttribute() }} <strong
-                                                    class="caret"></strong></span>
+                                        <span class="hidden-xs">
+                                            {{ Auth::user()->getFullNameAttribute() }}
+                                            <strong class="caret"></strong>
+                                        </span>
                                     </a>
                                     <ul class="dropdown-menu">
                                         <!-- User image -->
                                         <li {!! (Request::is('account/profile') ? ' class="active"' : '') !!}>
                                             <a href="{{ route('view-assets') }}">
-                                                <i class="fas fa-check fa-fw" aria-hidden="true"></i>
+                                                <x-icon type="checkmark" class="fa-fw" />
                                                 {{ trans('general.viewassets') }}
                                             </a></li>
 
                                         @can('viewRequestable', \App\Models\Asset::class)
                                             <li {!! (Request::is('account/requested') ? ' class="active"' : '') !!}>
                                                 <a href="{{ route('account.requested') }}">
-                                                    <i class="fas fa-check fa-disk fa-fw" aria-hidden="true"></i>
+                                                    <x-icon type="checkmark" class="fa-fw" />
                                                     {{ trans('general.requested_assets_menu') }}
                                                 </a></li>
                                         @endcan
 
                                         <li {!! (Request::is('account/accept') ? ' class="active"' : '') !!}>
                                             <a href="{{ route('account.accept') }}">
-                                                <i class="fas fa-check fa-disk fa-fw"></i>
+                                                <x-icon type="checkmark" class="fa-fw" />
                                                 {{ trans('general.accept_assets_menu') }}
                                             </a></li>
 
@@ -356,25 +370,27 @@ dir="{{ in_array(app()->getLocale(),['ar-SA','fa-IR', 'he-IL']) ? 'rtl' : 'ltr'
                                         @can('self.profile')
                                         <li>
                                             <a href="{{ route('profile') }}">
-                                                <i class="fas fa-user fa-fw" aria-hidden="true"></i>
+                                                <x-icon type="user" class="fa-fw" />
                                                 {{ trans('general.editprofile') }}
                                             </a>
                                         </li>
                                         @endcan
 
+                                        @if (Auth::user()->ldap_import!='1')
                                         <li>
                                             <a href="{{ route('account.password.index') }}">
-                                                <i class="fa-solid fa-asterisk fa-fw" aria-hidden="true"></i>
+                                                <x-icon type="password" class="fa-fw" />
                                                 {{ trans('general.changepassword') }}
                                             </a>
                                         </li>
+                                        @endif
 
 
                                         @can('self.api')
                                             <li>
                                                 <a href="{{ route('user.api') }}">
-                                                    <i class="fa-solid fa-user-secret fa-fw"
-                                                       aria-hidden="true"></i></i> {{ trans('general.manage_api_keys') }}
+                                                    <x-icon type="api-key" class="fa-fw" />
+                                                     {{ trans('general.manage_api_keys') }}
                                                 </a>
                                             </li>
                                         @endcan
@@ -383,11 +399,12 @@ dir="{{ in_array(app()->getLocale(),['ar-SA','fa-IR', 'he-IL']) ? 'rtl' : 'ltr'
 
                                             <a href="{{ route('logout.get') }}"
                                                onclick="event.preventDefault(); document.getElementById('logout-form').submit();">
-                                                <i class="fa fa-sign-out fa-fw"></i> {{ trans('general.logout') }}
+                                                <x-icon type="logout" class="fa-fw" />
+                                                 {{ trans('general.logout') }}
                                             </a>
 
-                                            <form id="logout-form" action="{{ route('logout.post') }}" method="POST"
-                                                  style="display: none;">
+                                            <form id="logout-form" action="{{ route('logout.post') }}" method="POST" style="display: none;">
+                                                <button type="submit" style="display: none;" title="logout"></button>
                                                 {{ csrf_field() }}
                                             </form>
 
@@ -400,7 +417,7 @@ dir="{{ in_array(app()->getLocale(),['ar-SA','fa-IR', 'he-IL']) ? 'rtl' : 'ltr'
                             @can('superadmin')
                                 <li>
                                     <a href="{{ route('settings.index') }}">
-                                        <i class="fa fa-cogs fa-fw" aria-hidden="true"></i>
+                                        <x-icon type="admin-settings" />
                                         <span class="sr-only">{{ trans('general.admin') }}</span>
                                     </a>
                                 </li>
@@ -411,7 +428,7 @@ dir="{{ in_array(app()->getLocale(),['ar-SA','fa-IR', 'he-IL']) ? 'rtl' : 'ltr'
                 <a href="#" style="float:left" class="sidebar-toggle-mobile visible-xs btn" data-toggle="push-menu"
                    role="button">
                     <span class="sr-only">{{ trans('general.toggle_navigation') }}</span>
-                    <i class="fas fa-bars"></i>
+                    <x-icon type="nav-toggle" />
                 </a>
                 <!-- Sidebar toggle button-->
             </header>
@@ -421,25 +438,26 @@ dir="{{ in_array(app()->getLocale(),['ar-SA','fa-IR', 'he-IL']) ? 'rtl' : 'ltr'
                 <!-- sidebar: style can be found in sidebar.less -->
                 <section class="sidebar">
                     <!-- sidebar menu: : style can be found in sidebar.less -->
-                    <ul class="sidebar-menu" data-widget="tree">
+                    <ul class="sidebar-menu" data-widget="tree" {{ \App\Helpers\Helper::determineLanguageDirection() == 'rtl' ? 'style="margin-right:12px' : '' }}>
                         @can('admin')
                             <li {!! (\Request::route()->getName()=='home' ? ' class="active"' : '') !!} class="firstnav">
                                 <a href="{{ route('home') }}">
-                                    <i class="fas fa-tachometer-alt fa-fw" aria-hidden="true"></i>
+                                    <x-icon type="dashboard" class="fa-fw" />
                                     <span>{{ trans('general.dashboard') }}</span>
                                 </a>
                             </li>
                         @endcan
                         @can('index', \App\Models\Asset::class)
                             <li class="treeview{{ ((Request::is('statuslabels/*') || Request::is('hardware*')) ? ' active' : '') }}">
-                                <a href="#"><i class="fas fa-barcode fa-fw" aria-hidden="true"></i>
+                                <a href="#">
+                                    <x-icon type="assets" class="fa-fw" />
                                     <span>{{ trans('general.assets') }}</span>
-                                    <i class="fa fa-angle-left pull-right"></i>
+                                    <x-icon type="angle-left" class="pull-right fa-fw"/>
                                 </a>
                                 <ul class="treeview-menu">
                                     <li>
                                         <a href="{{ url('hardware') }}">
-                                            <i class="far fa-circle text-grey fa-fw" aria-hidden="true"></i>
+                                            <x-icon type="circle" class="text-grey fa-fw"/>
                                             {{ trans('general.list_all') }}
                                             <span class="badge">
                                                 {{ (isset($total_assets)) ? $total_assets : '' }}
@@ -460,68 +478,69 @@ dir="{{ in_array(app()->getLocale(),['ar-SA','fa-IR', 'he-IL']) ? 'rtl' : 'ltr'
                                     @endif
 
 
-                                    <li{!! (Request::query('status') == 'Deployed' ? ' class="active"' : '') !!}>
+                                    <li id="deployed-sidenav-option" {!! (Request::query('status') == 'Deployed' ? ' class="active"' : '') !!}>
                                         <a href="{{ url('hardware?status=Deployed') }}">
-                                            <i class="far fa-circle text-blue fa-fw"></i>
+                                            <x-icon type="circle" class="text-blue fa-fw" />
                                             {{ trans('general.deployed') }}
                                             <span class="badge">{{ (isset($total_deployed_sidebar)) ? $total_deployed_sidebar : '' }}</span>
                                         </a>
                                     </li>
-                                    <li{!! (Request::query('status') == 'RTD' ? ' class="active"' : '') !!}>
+                                    <li id="rtd-sidenav-option"{!! (Request::query('status') == 'RTD' ? ' class="active"' : '') !!}>
                                         <a href="{{ url('hardware?status=RTD') }}">
-                                            <i class="far fa-circle text-green fa-fw"></i>
+                                            <x-icon type="circle" class="text-green fa-fw" />
                                             {{ trans('general.ready_to_deploy') }}
                                             <span class="badge">{{ (isset($total_rtd_sidebar)) ? $total_rtd_sidebar : '' }}</span>
                                         </a>
                                     </li>
-                                    <li{!! (Request::query('status') == 'Pending' ? ' class="active"' : '') !!}><a
-                                                href="{{ url('hardware?status=Pending') }}"><i
-                                                    class="far fa-circle text-orange fa-fw"></i>
+                                    <li id="pending-sidenav-option"{!! (Request::query('status') == 'Pending' ? ' class="active"' : '') !!}><a href="{{ url('hardware?status=Pending') }}">
+                                            <x-icon type="circle" class="text-orange fa-fw" />
                                             {{ trans('general.pending') }}
                                             <span class="badge">{{ (isset($total_pending_sidebar)) ? $total_pending_sidebar : '' }}</span>
                                         </a>
                                     </li>
-                                    <li{!! (Request::query('status') == 'Undeployable' ? ' class="active"' : '') !!} ><a
-                                                href="{{ url('hardware?status=Undeployable') }}"><i
-                                                    class="fas fa-times text-red fa-fw"></i>
+                                    <li id="undeployable-sidenav-option"{!! (Request::query('status') == 'Undeployable' ? ' class="active"' : '') !!} ><a
+                                                href="{{ url('hardware?status=Undeployable') }}">
+                                            <x-icon type="x" class="text-red fa-fw" />
                                             {{ trans('general.undeployable') }}
                                             <span class="badge">{{ (isset($total_undeployable_sidebar)) ? $total_undeployable_sidebar : '' }}</span>
                                         </a>
                                     </li>
-                                    <li{!! (Request::query('status') == 'byod' ? ' class="active"' : '') !!}><a
-                                                href="{{ url('hardware?status=byod') }}"><i
-                                                    class="fas fa-times text-red fa-fw"></i>
+                                    <li id="byod-sidenav-option"{!! (Request::query('status') == 'byod' ? ' class="active"' : '') !!}><a
+                                                href="{{ url('hardware?status=byod') }}">
+                                            <x-icon type="x" class="text-red fa-fw" />
                                             {{ trans('general.byod') }}
                                             <span class="badge">{{ (isset($total_byod_sidebar)) ? $total_byod_sidebar : '' }}</span>
                                         </a>
                                     </li>
-                                    <li{!! (Request::query('status') == 'Archived' ? ' class="active"' : '') !!}><a
-                                                href="{{ url('hardware?status=Archived') }}"><i
-                                                    class="fas fa-times text-red fa-fw"></i>
+                                    <li id="archived-sidenav-option"{!! (Request::query('status') == 'Archived' ? ' class="active"' : '') !!}><a
+                                                href="{{ url('hardware?status=Archived') }}">
+                                            <x-icon type="x" class="text-red fa-fw" />
                                             {{ trans('admin/hardware/general.archived') }}
                                             <span class="badge">{{ (isset($total_archived_sidebar)) ? $total_archived_sidebar : '' }}</span>
                                         </a>
                                     </li>
-                                    <li{!! (Request::query('status') == 'Requestable' ? ' class="active"' : '') !!}><a
-                                                href="{{ url('hardware?status=Requestable') }}"><i
-                                                    class="fas fa-check text-blue fa-fw"></i>
+                                    <li id="requestable-sidenav-option"{!! (Request::query('status') == 'Requestable' ? ' class="active"' : '') !!}><a
+                                                href="{{ url('hardware?status=Requestable') }}">
+                                            <x-icon type="checkmark" class="text-blue fa-fw" />
                                             {{ trans('admin/hardware/general.requestable') }}
                                         </a>
                                     </li>
 
                                     @can('audit', \App\Models\Asset::class)
-                                        <li{!! (Request::is('hardware/audit/due') ? ' class="active"' : '') !!}>
+                                        <li id="audit-due-sidenav-option"{!! (Request::is('hardware/audit/due') ? ' class="active"' : '') !!}>
                                             <a href="{{ route('assets.audit.due') }}">
-                                                <i class="fas fa-history text-yellow fa-fw"></i> {{ trans('general.audit_due') }}
+                                                <x-icon type="audit" class="text-yellow fa-fw"/>
+                                                {{ trans('general.audit_due') }}
                                                 <span class="badge">{{ (isset($total_due_and_overdue_for_audit)) ? $total_due_and_overdue_for_audit : '' }}</span>
                                             </a>
                                         </li>
                                     @endcan
 
                                     @can('checkin', \App\Models\Asset::class)
-                                    <li{!! (Request::is('hardware/checkins/due') ? ' class="active"' : '') !!}>
+                                    <li id="checkin-due-sidenav-option"{!! (Request::is('hardware/checkins/due') ? ' class="active"' : '') !!}>
                                         <a href="{{ route('assets.checkins.due') }}">
-                                            <i class="fas fa-history text-yellow fa-fw"></i> {{ trans('general.checkin_due') }}
+                                            <x-icon type="due" class="text-orange fa-fw"/>
+                                            {{ trans('general.checkin_due') }}
                                             <span class="badge">{{ (isset($total_due_and_overdue_for_checkin)) ? $total_due_and_overdue_for_checkin : '' }}</span>
                                         </a>
                                     </li>
@@ -561,14 +580,14 @@ dir="{{ in_array(app()->getLocale(),['ar-SA','fa-IR', 'he-IL']) ? 'rtl' : 'ltr'
                                         </li>
                                     @endcan
                                     @can('admin')
-                                        <li>
+                                        <li id="import-history-sidenav-option">
                                             <a href="{{ url('hardware/history') }}">
                                                 {{ trans('general.import-history') }}
                                             </a>
                                         </li>
                                     @endcan
                                     @can('audit', \App\Models\Asset::class)
-                                        <li>
+                                        <li id="bulk-audit-sidenav-option">
                                             <a href="{{ route('assets.bulkaudit') }}">
                                                 {{ trans('general.bulkaudit') }}
                                             </a>
@@ -580,67 +599,67 @@ dir="{{ in_array(app()->getLocale(),['ar-SA','fa-IR', 'he-IL']) ? 'rtl' : 'ltr'
                         @can('view', \App\Models\License::class)
                             <li{!! (Request::is('licenses*') ? ' class="active"' : '') !!}>
                                 <a href="{{ route('licenses.index') }}">
-                                    <i class="far fa-save fa-fw"></i>
+                                    <x-icon type="licenses" class="fa-fw"/>
                                     <span>{{ trans('general.licenses') }}</span>
                                 </a>
                             </li>
                         @endcan
                         @can('index', \App\Models\Accessory::class)
-                            <li{!! (Request::is('accessories*') ? ' class="active"' : '') !!}>
+                            <li id="accessories-sidenav-option"{!! (Request::is('accessories*') ? ' class="active"' : '') !!}>
                                 <a href="{{ route('accessories.index') }}">
-                                    <i class="far fa-keyboard fa-fw"></i>
+                                    <x-icon type="accessories" class="fa-fw" />
                                     <span>{{ trans('general.accessories') }}</span>
                                 </a>
                             </li>
                         @endcan
                         @can('view', \App\Models\Consumable::class)
-                            <li{!! (Request::is('consumables*') ? ' class="active"' : '') !!}>
+                            <li id="consumables-sidenav-option"{!! (Request::is('consumables*') ? ' class="active"' : '') !!}>
                                 <a href="{{ url('consumables') }}">
-                                    <i class="fas fa-tint fa-fw"></i>
+                                    <x-icon type="consumables" class="fa-fw" />
                                     <span>{{ trans('general.consumables') }}</span>
                                 </a>
                             </li>
                         @endcan
                         @can('view', \App\Models\Component::class)
-                            <li{!! (Request::is('components*') ? ' class="active"' : '') !!}>
+                            <li id="components-sidenav-option"{!! (Request::is('components*') ? ' class="active"' : '') !!}>
                                 <a href="{{ route('components.index') }}">
-                                    <i class="far fa-hdd fa-fw"></i>
+                                    <x-icon type="components" class="fa-fw" />
                                     <span>{{ trans('general.components') }}</span>
                                 </a>
                             </li>
                         @endcan
                         @can('view', \App\Models\PredefinedKit::class)
-                            <li{!! (Request::is('kits') ? ' class="active"' : '') !!}>
+                            <li id="kits-sidenav-option"{!! (Request::is('kits') ? ' class="active"' : '') !!}>
                                 <a href="{{ route('kits.index') }}">
-                                    <i class="fa fa-object-group fa-fw"></i>
+                                    <x-icon type="kits" class="fa-fw" />
                                     <span>{{ trans('general.kits') }}</span>
                                 </a>
                             </li>
                         @endcan
 
                         @can('view', \App\Models\User::class)
-                            <li{!! (Request::is('users*') ? ' class="active"' : '') !!}>
-                                <a href="{{ route('users.index') }}" accesskey="6">
-                                    <i class="fas fa-users fa-fw"></i>
+                            <li id="users-sidenav-option"{!! (Request::is('users*') ? ' class="active"' : '') !!}>
+                                <a href="{{ route('users.index') }}" {{$snipeSettings->shortcuts_enabled == 1 ? "accesskey=6" : ''}}>
+                                    <x-icon type="users" class="fa-fw" />
                                     <span>{{ trans('general.people') }}</span>
                                 </a>
                             </li>
                         @endcan
                         @can('import')
-                            <li{!! (Request::is('import/*') ? ' class="active"' : '') !!}>
+                            <li id="import-sidenav-option"{!! (Request::is('import/*') ? ' class="active"' : '') !!}>
                                 <a href="{{ route('imports.index') }}">
-                                    <i class="fas fa-cloud-upload-alt fa-fw" aria-hidden="true"></i>
+                                    <x-icon type="import" class="fa-fw" />
                                     <span>{{ trans('general.import') }}</span>
                                 </a>
                             </li>
                         @endcan
 
                         @can('backend.interact')
-                            <li class="treeview {!! in_array(Request::route()->getName(),App\Helpers\Helper::SettingUrls()) ? ' active': '' !!}">
+                            <li id="settings-sidenav-option" class="treeview {!! in_array(Request::route()->getName(),App\Helpers\Helper::SettingUrls()) ? ' active': '' !!}">
                                 <a href="#" id="settings">
-                                    <i class="fas fa-cog" aria-hidden="true"></i>
+                                    <x-icon type="settings" class="fa-fw" />
                                     <span>{{ trans('general.settings') }}</span>
-                                    <i class="fa fa-angle-left pull-right"></i>
+                                    <x-icon type="angle-left" class="pull-right fa-fw"/>
                                 </a>
 
                                 <ul class="treeview-menu">
@@ -730,9 +749,9 @@ dir="{{ in_array(app()->getLocale(),['ar-SA','fa-IR', 'he-IL']) ? 'rtl' : 'ltr'
                         @can('reports.view')
                             <li class="treeview{{ (Request::is('reports*') ? ' active' : '') }}">
                                 <a href="#" class="dropdown-toggle">
-                                    <i class="fas fa-chart-bar fa-fw"></i>
+                                    <x-icon type="reports" class="fa-fw" />
                                     <span>{{ trans('general.reports') }}</span>
-                                    <i class="fa fa-angle-left pull-right"></i>
+                                    <x-icon type="angle-left" class="pull-right"/>
                                 </a>
 
                                 <ul class="treeview-menu">
@@ -782,7 +801,7 @@ dir="{{ in_array(app()->getLocale(),['ar-SA','fa-IR', 'he-IL']) ? 'rtl' : 'ltr'
                         @can('viewRequestable', \App\Models\Asset::class)
                             <li{!! (Request::is('account/requestable-assets') ? ' class="active"' : '') !!}>
                                 <a href="{{ route('requestable-assets') }}">
-                                    <i class="fa fa-laptop fa-fw"></i>
+                                    <x-icon type="requestable" class="fa-fw" />
                                     <span>{{ trans('general.requestable_items') }}</span>
                                 </a>
                             </li>
@@ -797,13 +816,12 @@ dir="{{ in_array(app()->getLocale(),['ar-SA','fa-IR', 'he-IL']) ? 'rtl' : 'ltr'
             <!-- Content Wrapper. Contains page content -->
 
             <div class="content-wrapper" role="main" id="setting-list">
-                <barepay></barepay>
 
                 @if ($debug_in_production)
                     <div class="row" style="margin-bottom: 0px; background-color: red; color: white; font-size: 15px;">
                         <div class="col-md-12"
                              style="margin-bottom: 0px; background-color: #b50408 ; color: white; padding: 10px 20px 10px 30px; font-size: 16px;">
-                            <i class="fas fa-exclamation-triangle fa-3x pull-left"></i>
+                            <x-icon type="warning" class="fa-3x pull-left"/>
                             <strong>{{ strtoupper(trans('general.debug_warning')) }}:</strong>
                             {!! trans('general.debug_warning_text') !!}
                         </div>
@@ -811,25 +829,72 @@ dir="{{ in_array(app()->getLocale(),['ar-SA','fa-IR', 'he-IL']) ? 'rtl' : 'ltr'
                 @endif
 
                 <!-- Content Header (Page header) -->
-                <section class="content-header" style="padding-bottom: 30px;">
-                    <h1 class="pull-left pagetitle">@yield('title') </h1>
+                <section class="content-header">
 
-                    @if (isset($helpText))
-                        @include ('partials.more-info',
-                                               [
-                                                   'helpText' => $helpText,
-                                                   'helpPosition' => (isset($helpPosition)) ? $helpPosition : 'left'
-                                               ])
-                    @endif
-                    <div class="pull-right">
-                        @yield('header_right')
+
+                    <div class="row">
+                        <div class="col-md-12" style="margin-bottom: 0px;">
+
+                        <style>
+                            .breadcrumb-item {
+                                display: inline;
+                                list-style: none;
+                            }
+                        </style>
+
+                            <h1 class="pull-left pagetitle" style="font-size: 22px; margin-top: 5px;">
+
+                                @if (Breadcrumbs::has() && (Breadcrumbs::current()->count() > 1))
+                                    <ul style="padding-left: 0;">
+
+                                    @foreach (Breadcrumbs::current() as $crumbs)
+                                        @if ($crumbs->url() && !$loop->last)
+                                            <li class="breadcrumb-item">
+                                                <a href="{{ $crumbs->url() }}">
+                                                    @if ($loop->first)
+                                                        <x-icon type="home" />
+                                                    @else
+                                                        {{ $crumbs->title() }}
+                                                    @endif
+                                                </a>
+                                                <x-icon type="angle-right" />
+                                            </li>
+                                        @elseif (is_null($crumbs->url()) && !$loop->last)
+                                            <li class="breadcrumb-item active">
+                                                {{ $crumbs->title() }}
+                                                <x-icon type="angle-right" />
+                                            </li>
+                                       @else
+                                            <li class="breadcrumb-item active">
+                                                {{ $crumbs->title() }}
+                                            </li>
+                                        @endif
+                                    @endforeach
+
+                                    </ul>
+                                @else
+                                    @yield('title')
+                                @endif
+
+                            </h1>
+
+                                @if (isset($helpText))
+                                    @include ('partials.more-info',
+                                                           [
+                                                               'helpText' => $helpText,
+                                                               'helpPosition' => (isset($helpPosition)) ? $helpPosition : 'left'
+                                                           ])
+                                @endif
+                                <div class="pull-right">
+                                    @yield('header_right')
+                                </div>
+
+                        </div>
                     </div>
-
-
                 </section>
 
 
-                <section class="content" id="main" tabindex="-1">
+                <section class="content" id="main" tabindex="-1" style="padding-top: 0px;">
 
                     <!-- Notifications -->
                     <div class="row">
@@ -856,16 +921,14 @@ dir="{{ in_array(app()->getLocale(),['ar-SA','fa-IR', 'he-IL']) ? 'rtl' : 'ltr'
             <footer class="main-footer hidden-print" style="display:grid;flex-direction:column;">
 
                 <div class="1hidden-xs pull-left">
-                    <div class="pull-left" >
-                        <a target="_blank" href="https://snipeitapp.com" rel="noopener">Snipe-IT</a> is open source software,
-                        made with <i class="fas fa-heart" style="color: #a94442; font-size: 10px" aria-hidden="true"></i><span
-                                class="sr-only">love</span> by <a href="https://twitter.com/snipeitapp" rel="noopener">@snipeitapp</a>.
+                    <div class="pull-left">
+                         {!! trans('general.footer_credit') !!}
                     </div>
                     <div class="pull-right">
                     @if ($snipeSettings->version_footer!='off')
                         @if (($snipeSettings->version_footer=='on') || (($snipeSettings->version_footer=='admin') && (Auth::user()->isSuperUser()=='1')))
-                            &nbsp; <strong>Version</strong> {{ config('version.app_version') }} -
-                            build {{ config('version.build_version') }} ({{ config('version.branch') }})
+                            &nbsp; <strong>{{ trans('general.version') }}</strong> {{ config('version.app_version') }} -
+                            {{ trans('general.build') }} {{ config('version.build_version') }} ({{ config('version.branch') }})
                         @endif
                     @endif
 
@@ -947,8 +1010,11 @@ dir="{{ in_array(app()->getLocale(),['ar-SA','fa-IR', 'he-IL']) ? 'rtl' : 'ltr'
             </div>
         </div>
 
+
+
         {{-- Javascript files --}}
         <script src="{{ url(mix('js/dist/all.js')) }}" nonce="{{ csrf_token() }}"></script>
+        <script src="{{ url('js/select2/i18n/'.Helper::mapBackToLegacyLocale(app()->getLocale()).'.js') }}"></script>
 
         <!-- v5-beta: This pGenerator call must remain here for v5 - until fixed - so that the JS password generator works for the user create modal. -->
         <script src="{{ url('js/pGenerator.jquery.js') }}"></script>
@@ -962,6 +1028,68 @@ dir="{{ in_array(app()->getLocale(),['ar-SA','fa-IR', 'he-IL']) ? 'rtl' : 'ltr'
 
         <script nonce="{{ csrf_token() }}">
 
+            $.fn.datepicker.dates['{{ app()->getLocale() }}'] = {
+                days: [
+                    "{{ trans('datepicker.days.sunday') }}",
+                    "{{ trans('datepicker.days.monday') }}",
+                    "{{ trans('datepicker.days.tuesday') }}",
+                    "{{ trans('datepicker.days.wednesday') }}",
+                    "{{ trans('datepicker.days.thursday') }}",
+                    "{{ trans('datepicker.days.friday') }}",
+                    "{{ trans('datepicker.days.saturday') }}"
+                ],
+                daysShort: [
+                    "{{ trans('datepicker.short_days.sunday') }}",
+                    "{{ trans('datepicker.short_days.monday') }}",
+                    "{{ trans('datepicker.short_days.tuesday') }}",
+                    "{{ trans('datepicker.short_days.wednesday') }}",
+                    "{{ trans('datepicker.short_days.thursday') }}",
+                    "{{ trans('datepicker.short_days.friday') }}",
+                    "{{ trans('datepicker.short_days.saturday') }}"
+                ],
+                daysMin: [
+                    "{{ trans('datepicker.min_days.sunday') }}",
+                    "{{ trans('datepicker.min_days.monday') }}",
+                    "{{ trans('datepicker.min_days.tuesday') }}",
+                    "{{ trans('datepicker.min_days.wednesday') }}",
+                    "{{ trans('datepicker.min_days.thursday') }}",
+                    "{{ trans('datepicker.min_days.friday') }}",
+                    "{{ trans('datepicker.min_days.saturday') }}"
+                ],
+                months: [
+                    "{{ trans('datepicker.months.january') }}",
+                    "{{ trans('datepicker.months.february') }}",
+                    "{{ trans('datepicker.months.march') }}",
+                    "{{ trans('datepicker.months.april') }}",
+                    "{{ trans('datepicker.months.may') }}",
+                    "{{ trans('datepicker.months.june') }}",
+                    "{{ trans('datepicker.months.july') }}",
+                    "{{ trans('datepicker.months.august') }}",
+                    "{{ trans('datepicker.months.september') }}",
+                    "{{ trans('datepicker.months.october') }}",
+                    "{{ trans('datepicker.months.november') }}",
+                    "{{ trans('datepicker.months.december') }}",
+                ],
+                monthsShort:  [
+                    "{{ trans('datepicker.months_short.january') }}",
+                    "{{ trans('datepicker.months_short.february') }}",
+                    "{{ trans('datepicker.months_short.march') }}",
+                    "{{ trans('datepicker.months_short.april') }}",
+                    "{{ trans('datepicker.months_short.may') }}",
+                    "{{ trans('datepicker.months_short.june') }}",
+                    "{{ trans('datepicker.months_short.july') }}",
+                    "{{ trans('datepicker.months_short.august') }}",
+                    "{{ trans('datepicker.months_short.september') }}",
+                    "{{ trans('datepicker.months_short.october') }}",
+                    "{{ trans('datepicker.months_short.november') }}",
+                    "{{ trans('datepicker.months_short.december') }}",
+                ],
+                today: "{{ trans('datepicker.today') }}",
+                clear: "{{ trans('datepicker.clear') }}",
+                format: "yyyy-mm-dd",
+                weekStart: 0
+            };
+
             var clipboard = new ClipboardJS('.js-copy-link');
 
             clipboard.on('success', function(e) {
@@ -974,14 +1102,14 @@ dir="{{ in_array(app()->getLocale(),['ar-SA','fa-IR', 'he-IL']) ? 'rtl' : 'ltr'
             });
 
             // Reference: https://jqueryvalidation.org/validate/
-            $('#create-form').validate({
+            var validator = $('#create-form').validate({
                 ignore: 'input[type=hidden]',
-                errorClass: 'help-block form-error',
+                errorClass: 'alert-msg',
                 errorElement: 'span',
                 errorPlacement: function(error, element) {
                     $(element).hasClass('select2') || $(element).hasClass('js-data-ajax')
-                        // If the element is a select2 then place the error above the input
-                        ? element.parents('.required').append(error)
+                        // If the element is a select2 then append the error to the parent div
+                        ? element.parent('div').append(error)
                         // Otherwise place it after
                         : error.insertAfter(element);
                 },
@@ -992,6 +1120,12 @@ dir="{{ in_array(app()->getLocale(),['ar-SA','fa-IR', 'he-IL']) ? 'rtl' : 'ltr'
                 onfocusout: function(element) {
                     return $(element).valid();
                 },
+
+            });
+
+            $.extend($.validator.messages, {
+                required: "{{ trans('validation.generic.required') }}",
+                email: "{{ trans('validation.generic.email') }}"
             });
 
 
@@ -999,16 +1133,25 @@ dir="{{ in_array(app()->getLocale(),['ar-SA','fa-IR', 'he-IL']) ? 'rtl' : 'ltr'
                 // Use element id to find the text element to hide / show
                 var targetElement = e.id+"-to-show";
                 var hiddenElement = e.id+"-to-hide";
+                var audio = new Audio('{{ config('app.url') }}/sounds/lock.mp3');
                 if($(e).hasClass('fa-lock')) {
+                    @if ((isset($user)) && ($user->enable_sounds))
+                        audio.play()
+                    @endif
                     $(e).removeClass('fa-lock').addClass('fa-unlock');
                     // Show the encrypted custom value and hide the element with asterisks
                     document.getElementById(targetElement).style.fontSize = "100%";
                     document.getElementById(hiddenElement).style.display = "none";
+
                 } else {
+                    @if ((isset($user)) && ($user->enable_sounds))
+                        audio.play()
+                    @endif
                     $(e).removeClass('fa-unlock').addClass('fa-lock');
                     // ClipboardJS can't copy display:none elements so use a trick to hide the value
                     document.getElementById(targetElement).style.fontSize = "0px";
                     document.getElementById(hiddenElement).style.display = "";
+
                  }
              }
 
@@ -1125,8 +1268,5 @@ dir="{{ in_array(app()->getLocale(),['ar-SA','fa-IR', 'he-IL']) ? 'rtl' : 'ltr'
             </script>
         @endif
 
-        @include('partials.bpay')
-
-
         </body>
 </html>
diff --git a/resources/views/layouts/edit-form.blade.php b/resources/views/layouts/edit-form.blade.php
index 791590141c..4f1ffc002e 100644
--- a/resources/views/layouts/edit-form.blade.php
+++ b/resources/views/layouts/edit-form.blade.php
@@ -45,8 +45,8 @@
                         </div>
                         @if (isset($topSubmit) && ($topSubmit=='true'))
                         <div class="col-md-3 text-right" style="padding-right: 10px;">
-                            <button type="submit" class="btn btn-primary pull-right">
-                                <i class="fas fa-check icon-white" aria-hidden="true"></i>
+                            <button type="submit" class="btn btn-primary pull-right" name="submit">
+                                <x-icon type="checkmark" />
                                 {{ trans('general.save') }}
                             </button>
                         </div>
@@ -66,7 +66,11 @@
                     <!-- CSRF Token -->
                     {{ csrf_field() }}
                     @yield('inputFields')
-                    @include('partials.forms.edit.submit')
+                        <x-redirect_submit_options
+                                :index_route="$index_route ?? null"
+                                :button_label="trans('general.save')"
+                                :options="$options ?? []"
+                        />
                 </div>
 
             </div> <!-- ./box-body -->
diff --git a/resources/views/licenses/checkin.blade.php b/resources/views/licenses/checkin.blade.php
index 8eeea6f9c4..eaec762d92 100755
--- a/resources/views/licenses/checkin.blade.php
+++ b/resources/views/licenses/checkin.blade.php
@@ -16,7 +16,7 @@
 @section('content')
     <div class="row">
         <!-- left column -->
-        <div class="col-md-7">
+        <div class="col-md-8">
             <form class="form-horizontal" method="post" action="{{ route('licenses.checkin.save', ['licenseId'=>$licenseSeat->id, 'backTo'=>$backto] ) }}" autocomplete="off">
                 {{csrf_field()}}
 
@@ -28,38 +28,53 @@
 
             <!-- license name -->
             <div class="form-group">
-                <label class="col-sm-2 control-label">{{ trans('admin/hardware/form.name') }}</label>
-                <div class="col-md-6">
+                <label class="col-sm-3 control-label">{{ trans('admin/hardware/form.name') }}</label>
+                <div class="col-md-8">
                     <p class="form-control-static">{{ $licenseSeat->license->name }}</p>
                 </div>
             </div>
 
-            <!-- Serial -->
+            <!-- Category -->
             <div class="form-group">
-                <label class="col-sm-2 control-label">{{ trans('admin/licenses/form.license_key') }}</label>
-                <div class="col-md-6">
-                    <p class="form-control-static">
-                        @can('viewKeys', $licenseSeat->license)
-                            {{ $licenseSeat->license->serial }}
-                        @else
-                            ------------
-                        @endcan
-                        </p>
+                <label class="col-sm-3 control-label">{{ trans('general.category') }}</label>
+                <div class="col-md-9">
+                    <p class="form-control-static">{{ $licenseSeat->license->category->name }}</p>
                 </div>
             </div>
 
+            <!-- Serial -->
+            @can('viewKeys', $licenseSeat->license)
+            <div class="form-group">
+                <label class="col-sm-3 control-label">{{ trans('admin/licenses/form.license_key') }}
+                    <i class="fa-regular fa-clipboard js-copy-link hidden-print" data-clipboard-target=".js-copy-key" aria-hidden="true" data-tooltip="true" data-placement="top" title="{{ trans('general.copy_to_clipboard') }}">
+                        <span class="sr-only">{{ trans('general.copy_to_clipboard') }}</span>
+                    </i>
+                </label>
+                <div class="col-md-8">
+                    <p class="form-control-static">
+                       <code style="white-space: pre-wrap"><span class="js-copy-key">{{ $licenseSeat->license->serial }}</span></code>
+                    </p>
+                </div>
+            </div>
+            @endcan
+
             <!-- Note -->
             <div class="form-group {{ $errors->has('notes') ? 'error' : '' }}">
-                <label for="note" class="col-md-2 control-label">{{ trans('admin/hardware/form.notes') }}</label>
-                <div class="col-md-7">
-                    <textarea class="col-md-6 form-control" id="notes" name="notes"></textarea>
+                <label for="note" class="col-md-3 control-label">{{ trans('general.checkin_note') }}</label>
+                <div class="col-md-8">
+                    <textarea class="form-control" id="notes" name="notes" rows="5"></textarea>
                     {!! $errors->first('notes', '<span class="alert-msg" aria-hidden="true"><i class="fas fa-times" aria-hidden="true"></i> :message</span>') !!}
                 </div>
             </div>
-                        <div class="box-footer">
-                            <a class="btn btn-link" href="{{ route('licenses.index') }}">{{ trans('button.cancel') }}</a>
-                            <button type="submit" class="btn btn-primary pull-right"><i class="fas fa-check icon-white" aria-hidden="true"></i> {{ trans('general.checkin') }}</button>
-                        </div>
+                        <x-redirect_submit_options
+                                index_route="licenses.index"
+                                :button_label="trans('general.checkin')"
+                                :options="[
+                                'index' => trans('admin/hardware/form.redirect_to_all', ['type' => trans('general.licenses')]),
+                                'item' => trans('admin/hardware/form.redirect_to_type', ['type' => trans('general.license')]),
+                                'target' => trans('admin/hardware/form.redirect_to_type', ['type' => trans('general.user')]),
+                               ]"
+                        />
                     </div> <!-- /.box-->
             </form>
         </div> <!-- /.col-md-7-->
diff --git a/resources/views/licenses/checkout.blade.php b/resources/views/licenses/checkout.blade.php
index e85c677420..af090a7c47 100755
--- a/resources/views/licenses/checkout.blade.php
+++ b/resources/views/licenses/checkout.blade.php
@@ -15,7 +15,7 @@
 @section('content')
 <div class="row">
         <!-- left column -->
-    <div class="col-md-7">
+    <div class="col-md-8">
         <form class="form-horizontal" method="post" action="" autocomplete="off">
             {{csrf_field()}}
 
@@ -26,7 +26,7 @@
                 <div class="box-body">
 
 
-                    <!-- Asset name -->
+                    <!-- License name -->
                     <div class="form-group">
                         <label class="col-sm-3 control-label">{{ trans('admin/hardware/form.name') }}</label>
                         <div class="col-md-9">
@@ -42,31 +42,32 @@
                     </div>
 
                     <!-- Serial -->
+                    @can('viewKeys', $license)
                     <div class="form-group">
-                        <label class="col-sm-3 control-label">{{ trans('admin/licenses/form.license_key') }}</label>
+                        <label class="col-sm-3 control-label">{{ trans('admin/licenses/form.license_key') }}
+                            <i class="fa-regular fa-clipboard js-copy-link hidden-print" data-clipboard-target=".js-copy-key" aria-hidden="true" data-tooltip="true" data-placement="top" title="{{ trans('general.copy_to_clipboard') }}">
+                                <span class="sr-only">{{ trans('general.copy_to_clipboard') }}</span>
+                            </i>
+                        </label>
                         <div class="col-md-9">
-                            <p class="form-control-static" style="word-wrap: break-word;">
-                                @can('viewKeys', $license)
-                                    {{ $license->serial }}
-                                @else
-                                    ------------
-                                @endcan
+                            <p class="form-control-static"><code style="white-space: pre-wrap"><span class="js-copy-key">{{ $license->serial }}</span></code>
                             </p>
                         </div>
                     </div>
+                    @endcan
 
-                    @include ('partials.forms.checkout-selector', ['user_select' => 'true','asset_select' => 'true', 'location_select' => 'false'])
+                    @include ('partials.forms.checkout-selector', ['user_select' => 'true','asset_select' => 'true'])
 
-                    @include ('partials.forms.edit.user-select', ['translated_name' => trans('general.user'), 'fieldname' => 'assigned_to', 'required'=>'true'])
+                    @include ('partials.forms.edit.user-select', ['translated_name' => trans('general.user'), 'fieldname' => 'assigned_to'])
 
                     @include ('partials.forms.edit.asset-select', ['translated_name' => trans('admin/licenses/form.asset'), 'fieldname' => 'asset_id', 'style' => 'display:none;'])
 
 
                     <!-- Note -->
                     <div class="form-group {{ $errors->has('notes') ? 'error' : '' }}">
-                        <label for="note" class="col-md-3 control-label">{{ trans('admin/hardware/form.notes') }}</label>
+                        <label for="note" class="col-md-3 control-label">{{ trans('general.checkout_note') }}</label>
                         <div class="col-md-8">
-                            <textarea class="col-md-6 form-control" id="notes" name="notes" style="width: 100%">{{ old('note') }}</textarea>
+                            <textarea class="col-md-6 form-control" id="notes" name="notes" rows="5">{{ old('note') }}</textarea>
                             {!! $errors->first('note', '<span class="alert-msg" aria-hidden="true"><i class="fas fa-times" aria-hidden="true"></i> :message</span>') !!}
                         </div>
                     </div>
@@ -105,10 +106,15 @@
                     </div>
                 @endif
 
-                <div class="box-footer">
-                    <a class="btn btn-link" href="{{ route('licenses.index') }}">{{ trans('button.cancel') }}</a>
-                    <button type="submit" class="btn btn-primary pull-right"><i class="fas fa-check icon-white" aria-hidden="true"></i> {{ trans('general.checkout') }}</button>
-                </div>
+                <x-redirect_submit_options
+                        index_route="licenses.index"
+                        :button_label="trans('general.checkout')"
+                        :options="[
+                                'index' => trans('admin/hardware/form.redirect_to_all', ['type' => trans('general.licenses')]),
+                                'item' => trans('admin/hardware/form.redirect_to_type', ['type' => trans('general.license')]),
+                                'target' => trans('admin/hardware/form.redirect_to_checked_out_to'),
+                               ]"
+                />
             </div> <!-- /.box-->
         </form>
     </div> <!-- /.col-md-7-->
diff --git a/resources/views/licenses/edit.blade.php b/resources/views/licenses/edit.blade.php
index 34afa4b5c5..7bb12728bc 100755
--- a/resources/views/licenses/edit.blade.php
+++ b/resources/views/licenses/edit.blade.php
@@ -3,6 +3,11 @@
     'updateText' => trans('admin/licenses/form.update'),
     'topSubmit' => true,
     'formAction' => ($item->id) ? route('licenses.update', ['license' => $item->id]) : route('licenses.store'),
+     'index_route' => 'licenses.index',
+    'options' => [
+                'index' => trans('admin/hardware/form.redirect_to_all', ['type' => 'licenses']),
+                'item' => trans('admin/hardware/form.redirect_to_type', ['type' => trans('general.license')]),
+               ]
 ])
 
 {{-- Page content --}}
@@ -11,30 +16,30 @@
 @include ('partials.forms.edit.category-select', ['translated_name' => trans('admin/categories/general.category_name'), 'fieldname' => 'category_id', 'required' => 'true', 'category_type' => 'license'])
 
 
-<!-- Serial-->
-@can('viewKeys', $item)
-<div class="form-group {{ $errors->has('serial') ? ' has-error' : '' }}">
-    <label for="serial" class="col-md-3 control-label">{{ trans('admin/licenses/form.license_key') }}</label>
-    <div class="col-md-7{{  (Helper::checkIfRequired($item, 'serial')) ? ' required' : '' }}">
-        <textarea class="form-control" type="text" name="serial" id="serial">{{ old('serial', $item->serial) }}</textarea>
-        {!! $errors->first('serial', '<span class="alert-msg" aria-hidden="true"><i class="fas fa-times" aria-hidden="true"></i> :message</span>') !!}
-    </div>
-</div>
-@endcan
-
 
 <!-- Seats -->
 <div class="form-group {{ $errors->has('seats') ? ' has-error' : '' }}">
     <label for="seats" class="col-md-3 control-label">{{ trans('admin/licenses/form.seats') }}</label>
-    <div class="col-md-7 col-sm-12 required">
-        <div class="col-md-2" style="padding-left:0px">
-            <input class="form-control" type="text" name="seats" id="seats" value="{{ Request::old('seats', $item->seats) }}" />
+    <div class="col-md-7 col-sm-12">
+        <div class="col-md-12" style="padding-left:0px">
+            <input class="form-control" type="text" name="seats" id="seats" value="{{ old('seats', $item->seats) }}" minlength="1" required style="width: 97px;">
         </div>
     </div>
     {!! $errors->first('seats', '<div class="col-md-8 col-md-offset-3"><span class="alert-msg" aria-hidden="true"><i class="fas fa-times" aria-hidden="true"></i> :message</span></div>') !!}
 </div>
 @include ('partials.forms.edit.minimum_quantity')
 
+<!-- Serial-->
+@can('viewKeys', $item)
+    <div class="form-group {{ $errors->has('serial') ? ' has-error' : '' }}">
+        <label for="serial" class="col-md-3 control-label">{{ trans('admin/licenses/form.license_key') }}</label>
+        <div class="col-md-7">
+            <textarea class="form-control" type="text" name="serial" id="serial" rows="5"{{  (Helper::checkIfRequired($item, 'serial')) ? ' required' : '' }}>{{ old('serial', $item->serial) }}</textarea>
+            {!! $errors->first('serial', '<span class="alert-msg" aria-hidden="true"><i class="fas fa-times" aria-hidden="true"></i> :message</span>') !!}
+        </div>
+    </div>
+@endcan
+
 @include ('partials.forms.edit.company-select', ['translated_name' => trans('general.company'), 'fieldname' => 'company_id'])
 @include ('partials.forms.edit.manufacturer-select', ['translated_name' => trans('general.manufacturer'), 'fieldname' => 'manufacturer_id',])
 
@@ -51,7 +56,7 @@
 <div class="form-group {{ $errors->has('license_email') ? ' has-error' : '' }}">
     <label for="license_email" class="col-md-3 control-label">{{ trans('admin/licenses/form.to_email') }}</label>
     <div class="col-md-7">
-        <input class="form-control" type="text" name="license_email" id="license_email" value="{{ old('license_email', $item->license_email) }}" />
+        <input class="form-control" type="email" name="license_email" id="license_email" value="{{ old('license_email', $item->license_email) }}" />
         {!! $errors->first('license_email', '<span class="alert-msg" aria-hidden="true"><i class="fas fa-times" aria-hidden="true"></i> :message</span>') !!}
     </div>
 </div>
@@ -63,7 +68,7 @@
     </div>
     <div class="col-md-7">
         <label class="form-control">
-        {{ Form::Checkbox('reassignable', '1', old('reassignable', $item->id ? $item->reassignable : '1'),array('aria-label'=>'reassignable')) }}
+            <input type="checkbox" name="reassignable" value="1" aria-label="reassignable" @checked(old('reassignable', $item->id ? $item->reassignable : '1'))>
         {{ trans('general.yes') }}
         </label>
     </div>
@@ -73,7 +78,7 @@
 @include ('partials.forms.edit.supplier-select', ['translated_name' => trans('general.supplier'), 'fieldname' => 'supplier_id'])
 @include ('partials.forms.edit.order_number')
 @include ('partials.forms.edit.purchase_cost')
-@include ('partials.forms.edit.purchase_date')
+@include ('partials.forms.edit.datepicker', ['translated_name' => trans('general.purchase_date'),'fieldname' => 'purchase_date'])
 
 <!-- Expiration Date -->
 <div class="form-group {{ $errors->has('expiration_date') ? ' has-error' : '' }}">
@@ -82,7 +87,7 @@
     <div class="input-group col-md-4">
         <div class="input-group date" data-provide="datepicker" data-date-format="yyyy-mm-dd"  data-autoclose="true" data-date-clear-btn="true">
             <input type="text" class="form-control" placeholder="{{ trans('general.select_date') }}" name="expiration_date" id="expiration_date" value="{{ old('expiration_date', ($item->expiration_date) ? $item->expiration_date->format('Y-m-d') : '') }}" maxlength="10">
-            <span class="input-group-addon"><i class="fas fa-calendar" aria-hidden="true"></i></span>
+            <span class="input-group-addon"><x-icon type="calendar" /></span>
         </div>
         {!! $errors->first('expiration_date', '<span class="alert-msg" aria-hidden="true"><i class="fas fa-times" aria-hidden="true"></i> :message</span>') !!}
     </div>
@@ -96,7 +101,7 @@
     <div class="input-group col-md-4">
         <div class="input-group date" data-provide="datepicker" data-date-format="yyyy-mm-dd" data-autoclose="true" data-date-clear-btn="true">
             <input type="text" class="form-control" placeholder="{{ trans('general.select_date') }}" name="termination_date" id="termination_date" value="{{ old('termination_date', ($item->termination_date) ? $item->termination_date->format('Y-m-d') : '') }}" maxlength="10">
-            <span class="input-group-addon"><i class="fas fa-calendar" aria-hidden="true"></i></span>
+            <span class="input-group-addon"><x-icon type="calendar" /></span>
         </div>
         {!! $errors->first('termination_date', '<span class="alert-msg" aria-hidden="true"><i class="fas fa-times" aria-hidden="true"></i> :message</span>') !!}
     </div>
@@ -107,7 +112,7 @@
 <div class="form-group {{ $errors->has('purchase_order') ? ' has-error' : '' }}">
     <label for="purchase_order" class="col-md-3 control-label">{{ trans('admin/licenses/form.purchase_order') }}</label>
     <div class="col-md-3">
-        <input class="form-control" type="text" name="purchase_order" id="purchase_order" value="{{ old('purchase_order', $item->purchase_order) }}" />
+        <input class="form-control" type="text" name="purchase_order" id="purchase_order" value="{{ old('purchase_order', $item->purchase_order) }}" maxlength="191" />
         {!! $errors->first('purchase_order', '<span class="alert-msg" aria-hidden="true"><i class="fas fa-times" aria-hidden="true"></i> :message</span>') !!}
     </div>
 </div>
@@ -119,7 +124,7 @@
     <div class="col-md-3 control-label"><strong>{{ trans('admin/licenses/form.maintained') }}</strong></div>
     <div class="col-md-7">
         <label class="form-control">
-        {{ Form::Checkbox('maintained', '1', old('maintained', $item->maintained),array('aria-label'=>'maintained')) }}
+            <input type="checkbox" name="maintained" value="1" aria-label="maintained" @checked(old('maintained', $item->maintained))>
         {{ trans('general.yes') }}
         </label>
     </div>
diff --git a/resources/views/licenses/index.blade.php b/resources/views/licenses/index.blade.php
index 82e34b1909..568548ca28 100755
--- a/resources/views/licenses/index.blade.php
+++ b/resources/views/licenses/index.blade.php
@@ -32,7 +32,10 @@
               data-cookie-id-table="licensesTable"
               data-pagination="true"
               data-search="true"
+              data-search-highlight="true"
+              data-show-print="true"
               data-side-pagination="server"
+              data-footer-style="footerStyle"
               data-show-columns="true"
               data-show-fullscreen="true"
               data-show-export="true"
diff --git a/resources/views/licenses/view.blade.php b/resources/views/licenses/view.blade.php
index 4f47055c27..59ba80fecc 100755
--- a/resources/views/licenses/view.blade.php
+++ b/resources/views/licenses/view.blade.php
@@ -20,7 +20,7 @@
         <li class="active">
           <a href="#details" data-toggle="tab">
             <span class="hidden-lg hidden-md">
-            <i class="fas fa-info-circle fa-2x" aria-hidden="true"></i>
+            <x-icon type="info-circle" class="fa-2x" />
             </span>
             <span class="hidden-xs hidden-sm">{{ trans('admin/users/general.info') }}</span>
           </a>
@@ -29,7 +29,7 @@
         <li>
           <a href="#seats" data-toggle="tab">
             <span class="hidden-lg hidden-md">
-              <i class="far fa-list-alt fa-2x" aria-hidden="true"></i>
+              <x-icon type="seats" class="fa-2x" />
               </span>
               <span class="hidden-xs hidden-sm">{{ trans('admin/licenses/form.seats') }}</span>
               <span class="badge badge-secondary">{{ number_format($license->availCount()->count()) }} / {{ number_format($license->seats) }}</span>
@@ -41,7 +41,8 @@
         <li>
           <a href="#files" data-toggle="tab">
             <span class="hidden-lg hidden-md">
-            <i class="far fa-file fa-2x" aria-hidden="true"></i></span>
+            <x-icon type="files" class="fa-2x" />
+            </span>
             <span class="hidden-xs hidden-sm">{{ trans('general.file_uploads') }}
               {!! ($license->uploads->count() > 0 ) ? '<badge class="badge badge-secondary">'.number_format($license->uploads->count()).'</badge>' : '' !!}
             </span>
@@ -52,14 +53,15 @@
         <li>
           <a href="#history" data-toggle="tab">
             <span class="hidden-lg hidden-md">
-            <i class="fas fa-history fa-2x" aria-hidden="true"></i></span>
+            <x-icon type="history" class="fa-2x" />
+            </span>
             <span class="hidden-xs hidden-sm">{{ trans('general.history') }}</span>
           </a>
         </li>
         
         @can('update', \App\Models\License::class)
           <li class="pull-right"><a href="#" data-toggle="modal" data-target="#uploadFileModal">
-              <i class="fas fa-paperclip" aria-hidden="true"></i> {{ trans('button.upload') }}</a>
+              <x-icon type="paperclip" /> {{ trans('button.upload') }}</a>
           </li>
         @endcan
       </ul>
@@ -97,21 +99,21 @@
                       @endcan
 
                       @if ($license->manufacturer->url)
-                        <br><i class="fas fa-globe-americas" aria-hidden="true"></i> <a href="{{ $license->manufacturer->url }}" rel="noopener">{{ $license->manufacturer->url }}</a>
+                        <br><x-icon type="globe-us" /> <a href="{{ $license->manufacturer->url }}" rel="noopener">{{ $license->manufacturer->url }}</a>
                       @endif
 
                       @if ($license->manufacturer->support_url)
-                        <br><i class="far fa-life-ring" aria-hidden="true"></i>
+                        <br><x-icon type="more-info" />
                         <a href="{{ $license->manufacturer->support_url }}"  rel="noopener">{{ $license->manufacturer->support_url }}</a>
                       @endif
 
                       @if ($license->manufacturer->support_phone)
-                        <br><i class="fas fa-phone" aria-hidden="true"></i>
+                        <br><x-icon type="phone" />
                         <a href="tel:{{ $license->manufacturer->support_phone }}">{{ $license->manufacturer->support_phone }}</a>
                       @endif
 
                       @if ($license->manufacturer->support_email)
-                        <br><i class="far fa-envelope" aria-hidden="true"></i> <a href="mailto:{{ $license->manufacturer->support_email }}">{{ $license->manufacturer->support_email }}</a>
+                        <br><x-icon type="email" /> <a href="mailto:{{ $license->manufacturer->support_email }}">{{ $license->manufacturer->support_email }}</a>
                       @endif
                     </div>
                   </div>
@@ -122,13 +124,13 @@
                   <div class="row">
                     <div class="col-md-3">
                       <strong>{{ trans('admin/licenses/form.license_key') }}</strong>
+                      <i class="fa-regular fa-clipboard js-copy-link" data-clipboard-target=".js-copy" aria-hidden="true" data-tooltip="true" data-placement="top" title="{{ trans('general.copy_to_clipboard') }}">
+                        <span class="sr-only">{{ trans('general.copy_to_clipboard') }}</span>
+                      </i>
                     </div>
                     <div class="col-md-9">
                       @can('viewKeys', $license)
-                        <span class="js-copy">{!! nl2br(e($license->serial)) !!}</span>
-                          <i class="fa-regular fa-clipboard js-copy-link" data-clipboard-target=".js-copy" aria-hidden="true" data-tooltip="true" data-placement="top" title="{{ trans('general.copy_to_clipboard') }}">
-                            <span class="sr-only">{{ trans('general.copy_to_clipboard') }}</span>
-                          </i>
+                        <code><span class="js-copy">{!! nl2br(e($license->serial)) !!}</span></code>
                       @else
                         ------------
                       @endcan
@@ -175,11 +177,13 @@
 
 
                 @if ($license->supplier)
+
                     <div class="row">
                       <div class="col-md-3">
                         <strong>{{ trans('general.supplier') }}</strong>
                       </div>
                       <div class="col-md-9">
+                        @if ($license->supplier->deleted_at=='')
                         @can('view', \App\Models\Supplier::class)
                           <a href="{{ route('suppliers.show', $license->supplier->id) }}">
                             {{ $license->supplier->name }}
@@ -189,16 +193,16 @@
                         @endcan
 
                           @if ($license->supplier->url)
-                            <br><i class="fas fa-globe-americas" aria-hidden="true"></i> <a href="{{ $license->supplier->url }}" rel="noopener">{{ $license->supplier->url }}</a>
+                            <br><x-icon type="globe-us" /> <a href="{{ $license->supplier->url }}" rel="noopener">{{ $license->supplier->url }}</a>
                           @endif
 
                           @if ($license->supplier->phone)
-                            <br><i class="fas fa-phone" aria-hidden="true"></i>
+                            <br><x-icon type="phone" />
                             <a href="tel:{{ $license->supplier->phone }}">{{ $license->supplier->phone }}</a>
                           @endif
 
                           @if ($license->supplier->email)
-                            <br><i class="far fa-envelope" aria-hidden="true"></i> <a href="mailto:{{ $license->supplier->email }}">{{ $license->supplier->email }}</a>
+                            <br><x-icon type="email" /> <a href="mailto:{{ $license->supplier->email }}">{{ $license->supplier->email }}</a>
                           @endif
 
                           @if ($license->supplier->address)
@@ -219,11 +223,11 @@
                           @if ($license->supplier->zip)
                             {{ $license->supplier->zip }}
                           @endif
-                        
+                        @else
+                          {{ trans('general.deleted') }}
+                        @endif
                       </div>
                     </div>
-                @else
-                    {{ trans('general.deleted') }}
                 @endif
 
 
@@ -288,12 +292,14 @@
                     </strong>
                   </div>
                   <div class="col-md-9">
-                    @if ($license->time_until_depreciated()->y > 0)
-                      {{ $license->time_until_depreciated()->y }}
-                      {{ trans('admin/hardware/form.years') }},
-                    @endif
-                    {{ $license->time_until_depreciated()->m }}
-                    {{ trans('admin/hardware/form.months') }}
+                    @if ($license->time_until_depreciated())
+                      @if ($license->time_until_depreciated()->y > 0)
+                        {{ $license->time_until_depreciated()->y }}
+                        {{ trans('admin/hardware/form.years') }},
+                      @endif
+                      {{ $license->time_until_depreciated()->m }}
+                      {{ trans('admin/hardware/form.months') }}
+                   @endif
                   </div>
                 </div>
                 @endif
@@ -434,6 +440,7 @@
                         id="seatsTable"
                         data-pagination="true"
                         data-search="false"
+                        data-show-print="true"
                         data-side-pagination="server"
                         data-show-columns="true"
                         data-show-fullscreen="true"
@@ -458,100 +465,13 @@
 
         @can('licenses.files', $license)
         <div class="tab-pane" id="files">
-          <div class="table-responsive">
-            <table
-                data-cookie-id-table="licenseUploadsTable"
-                data-id-table="licenseUploadsTable"
-                id="licenseUploadsTable"
-                data-search="true"
-                data-pagination="true"
-                data-side-pagination="client"
-                data-show-columns="true"
-                data-show-export="true"
-                data-show-footer="true"
-                data-toolbar="#upload-toolbar"
-                data-show-refresh="true"
-                data-sort-order="asc"
-                data-sort-name="name"
-                class="table table-striped snipe-table"
-                data-export-options='{
-                    "fileName": "export-license-uploads-{{ str_slug($license->name) }}-{{ date('Y-m-d') }}",
-                    "ignoreColumn": ["actions","image","change","checkbox","checkincheckout","delete","download","icon"]
-                    }'>
-            <thead>
-              <tr>
-                <th data-visible="true" data-field="icon" data-sortable="true">{{trans('general.file_type')}}</th>
-                <th class="col-md-2" data-searchable="true" data-visible="true" data-field="image">{{ trans('general.image') }}</th>
-                <th class="col-md-2" data-searchable="true" data-visible="true" data-field="filename" data-sortable="true">{{ trans('general.file_name') }}</th>
-                <th class="col-md-1" data-searchable="true" data-visible="true" data-field="filesize">{{ trans('general.filesize') }}</th>
-                <th class="col-md-2" data-searchable="true" data-visible="true" data-field="notes" data-sortable="true">{{ trans('general.notes') }}</th>
-                <th class="col-md-1" data-searchable="true" data-visible="true" data-field="download">{{ trans('general.download') }}</th>
-                <th class="col-md-2" data-searchable="true" data-visible="true" data-field="created_at" data-sortable="true">{{ trans('general.created_at') }}</th>
-                <th class="col-md-1" data-searchable="true" data-visible="true" data-field="actions">{{ trans('table.actions') }}</th>
-              </tr>
-            </thead>
-            <tbody>
-            @if ($license->uploads->count() > 0)
-              @foreach ($license->uploads as $file)
-              <tr>
-                <td>
-                  <i class="{{ Helper::filetype_icon($file->filename) }} icon-med" aria-hidden="true"></i>
-                  <span class="sr-only">{{ Helper::filetype_icon($file->filename) }}</span>
 
-                </td>
-                <td>
-                  @if ($file->filename)
-                    @if ((Storage::exists('private_uploads/licenses/'.$file->filename)) && ( Helper::checkUploadIsImage($file->get_src('licenses'))))
-                      <a href="{{ route('show.licensefile', ['licenseId' => $license->id, 'fileId' => $file->id, 'download' => 'false']) }}" data-toggle="lightbox" data-type="image"><img src="{{ route('show.licensefile', ['licenseId' => $license->id, 'fileId' => $file->id]) }}" class="img-thumbnail" style="max-width: 50px;"></a>
-                    @endif
-                  @endif
-                </td>
-                <td>
-                  @if (Storage::exists('private_uploads/licenses/'.$file->filename))
-                    {{ $file->filename }}
-                  @else
-                    <del>{{ $file->filename }}</del>
-                  @endif
-                </td>
-                <td data-value="{{ (Storage::exists('private_uploads/licenses/'.$file->filename)) ? Storage::size('private_uploads/licenses/'.$file->filename) : '' }}">
-                  {{ (Storage::exists('private_uploads/licenses/'.$file->filename)) ? Helper::formatFilesizeUnits(Storage::size('private_uploads/licenses/'.$file->filename)) : '' }}
-                </td>
+          <x-filestable
+                  filepath="private_uploads/licenses/"
+                  showfile_routename="show.licensefile"
+                  deletefile_routename="delete/licensefile"
+                  :object="$license" />
 
-                <td>
-                  @if ($file->note)
-                    {{ $file->note }}
-                  @endif
-                </td>
-                <td>
-                  @if ($file->filename)
-                    <a href="{{ route('show.licensefile', [$license->id, $file->id]) }}" class="btn btn-sm btn-default">
-                      <i class="fas fa-download" aria-hidden="true"></i>
-                      <span class="sr-only">{{ trans('general.download') }}</span>
-                    </a>
-
-                    <a href="{{ route('show.licensefile', [$license->id, $file->id, 'inline' => 'true']) }}" class="btn btn-sm btn-default" target="_blank">
-                      <i class="fa fa-external-link" aria-hidden="true"></i>
-                    </a>
-
-                  @endif
-                </td>
-                <td>{{ $file->created_at }}</td>
-                <td>
-                  <a class="btn delete-asset btn-danger btn-sm" href="{{ route('delete/licensefile', [$license->id, $file->id]) }}" data-content="{{ trans('general.delete_confirm', ['item' => $file->filename]) }}" data-title="{{ trans('general.delete') }}">
-                    <i class="fas fa-trash icon-white" aria-hidden="true"></i>
-                    <span class="sr-only">{{ trans('general.delete') }}</span>
-                  </a>
-                </td>
-              </tr>
-              @endforeach
-            @else
-              <tr>
-              <td colspan="8">{{ trans('general.no_results') }}</td>
-              </tr>
-            @endif
-            </tbody>
-          </table>
-          </div>
         </div> <!-- /.tab-pane -->
         @endcan
 
@@ -560,6 +480,7 @@
             <div class="col-md-12">
               <div class="table-responsive">
               <table
+                      data-columns="{{ \App\Presenters\HistoryPresenter::dataTableLayout() }}"
                       class="table table-striped snipe-table"
                       data-cookie-id-table="licenseHistoryTable"
                       data-id-table="licenseHistoryTable"
@@ -570,27 +491,14 @@
                       data-show-refresh="true"
                       data-show-export="true"
                       data-sort-order="desc"
+                      data-search="true"
+                      data-search-highlight="true"
+                      data-show-print="true"
                       data-export-options='{
                        "fileName": "export-{{ str_slug($license->name) }}-history-{{ date('Y-m-d') }}",
                        "ignoreColumn": ["actions","image","change","checkbox","checkincheckout","icon"]
                      }'
                       data-url="{{ route('api.activity.index', ['item_id' => $license->id, 'item_type' => 'license']) }}">
-
-                <thead>
-                <tr>
-                  <th class="col-sm-2" data-visible="false" data-sortable="true" data-field="created_at" data-formatter="dateDisplayFormatter">{{ trans('general.record_created') }}</th>
-                  <th class="col-sm-2"data-visible="true" data-sortable="true" data-field="admin" data-formatter="usersLinkObjFormatter">{{ trans('general.admin') }}</th>
-                  <th class="col-sm-2" data-sortable="true"  data-visible="true" data-field="action_type">{{ trans('general.action') }}</th>
-                  <th class="col-sm-2" data-field="file" data-visible="false" data-formatter="fileUploadNameFormatter">{{ trans('general.file_name') }}</th>
-                  <th class="col-sm-2" data-sortable="true"  data-visible="true" data-field="item" data-formatter="polymorphicItemFormatter">{{ trans('general.item') }}</th>
-                  <th class="col-sm-2" data-visible="true" data-field="target" data-formatter="polymorphicItemFormatter">{{ trans('general.target') }}</th>
-                  <th class="col-sm-2" data-sortable="true" data-visible="true" data-field="note">{{ trans('general.notes') }}</th>
-                  <th class="col-sm-2" data-visible="true" data-field="action_date" data-formatter="dateDisplayFormatter">{{ trans('general.date') }}</th>
-                  @if  ($snipeSettings->require_accept_signature=='1')
-                    <th class="col-md-3" data-field="signature_file" data-visible="false"  data-formatter="imageFormatter">{{ trans('general.signature') }}</th>
-                  @endif
-                </tr>
-                </thead>
               </table>
               </div>
             </div> <!-- /.col-md-12-->
@@ -606,48 +514,64 @@
   <div class="col-md-3">
 
     @can('update', $license)
-      <a href="{{ route('licenses.edit', $license->id) }}" class="btn btn-block btn-primary" style="margin-bottom: 10px;">{{ trans('admin/licenses/general.edit') }}</a>
-      <a href="{{ route('clone/license', $license->id) }}" class="btn btn-block btn-primary" style="margin-bottom: 10px;">{{ trans('admin/licenses/general.clone') }}</a>
+      <a href="{{ route('licenses.edit', $license->id) }}" class="btn btn-warning btn-sm btn-social btn-block hidden-print" style="margin-bottom: 5px;">
+        <x-icon type="edit" />
+        {{ trans('admin/licenses/general.edit') }}
+      </a>
+      <a href="{{ route('clone/license', $license->id) }}" class="btn btn-info btn-block btn-sm btn-social hidden-print" style="margin-bottom: 5px;">
+        <x-icon type="clone" />
+        {{ trans('admin/licenses/general.clone') }}</a>
     @endcan
 
     @can('checkout', $license)
 
       @if ($license->availCount()->count() > 0)
-        <a href="{{ route('licenses.checkout', $license->id) }}" class="btn-block btn bg-maroon" style="margin-bottom: 10px;">
+
+        <a href="{{ route('licenses.checkout', $license->id) }}" class="btn bg-maroon btn-sm btn-social btn-block hidden-print" style="margin-bottom: 5px;">
+          <x-icon type="checkout" />
           {{ trans('general.checkout') }}
         </a>
-        <a href="#" class="btn-block btn bg-maroon" style="margin-bottom: 10px;" data-toggle="modal" data-tooltip="true" title="{{ trans('admin/licenses/general.bulk.checkout_all.enabled_tooltip') }}" data-target="#checkoutFromAllModal">
+
+        <a href="#" class="btn bg-maroon btn-sm btn-social btn-block hidden-print" style="margin-bottom: 5px;" data-toggle="modal" data-tooltip="true" title="{{ trans('admin/licenses/general.bulk.checkout_all.enabled_tooltip') }}" data-target="#checkoutFromAllModal">
+          <x-icon type="checkout" />
           {{ trans('admin/licenses/general.bulk.checkout_all.button') }}
         </a>
 
       @else
-        <a href="{{ route('licenses.checkout', $license->id) }}" class="btn btn-block bg-maroon disabled" style="margin-bottom: 10px;">
-          {{ trans('general.checkout') }}
-        </a>
+          <span data-tooltip="true" title=" {{ trans('admin/licenses/general.bulk.checkout_all.disabled_tooltip') }}">
+          <a href="#" class="btn bg-maroon btn-sm btn-social btn-block hidden-print disabled" style="margin-bottom: 5px;" data-tooltip="true" title="{{ trans('general.checkout') }}">
+            <x-icon type="checkout" />
+            {{ trans('general.checkout') }}
+          </a>
+          </span>
         <span data-tooltip="true" title=" {{ trans('admin/licenses/general.bulk.checkout_all.disabled_tooltip') }}">
-                    <a href="#" class="btn btn-block bg-maroon disabled" style="margin-bottom: 10px;" data-tooltip="true" title="{{ trans('general.checkout') }}">
-                      {{ trans('admin/licenses/general.bulk.checkout_all.button') }}
-                    </a>
-                  </span>
+            <a href="#" class="btn bg-maroon btn-sm btn-social btn-block hidden-print disabled" style="margin-bottom: 5px;" data-tooltip="true" title="{{ trans('general.checkout') }}">
+              <x-icon type="checkout" />
+              {{ trans('admin/licenses/general.bulk.checkout_all.button') }}
+            </a>
+          </span>
       @endif
     @endcan
 
     @can('checkin', $license)
-  
+
       @if (($license->seats - $license->availCount()->count()) <= 0 )
         <span data-tooltip="true" title=" {{ trans('admin/licenses/general.bulk.checkin_all.disabled_tooltip') }}">
-            <a href="#" class="btn btn-block bg-purple disabled" style="margin-bottom: 25px;">
+            <a href="#"  class="btn btn-primary bg-purple btn-sm btn-social btn-block hidden-print disabled"  style="margin-bottom: 25px;">
+              <x-icon type="checkin" />
              {{ trans('admin/licenses/general.bulk.checkin_all.button') }}
             </a>
         </span>
       @elseif (! $license->reassignable)
         <span data-tooltip="true" title=" {{ trans('admin/licenses/general.bulk.checkin_all.disabled_tooltip_reassignable') }}">
-            <a href="#" class="btn btn-block bg-purple disabled" style="margin-bottom: 25px;">
+            <a href="#"  class="btn btn-primary bg-purple btn-sm btn-social btn-block hidden-print disabled"  style="margin-bottom: 25px;">
+              <x-icon type="checkin" />
              {{ trans('admin/licenses/general.bulk.checkin_all.button') }}
             </a>
         </span>
       @else
-        <a href="#" class="btn btn-block bg-purple" style="margin-bottom: 25px;" data-toggle="modal" data-tooltip="true"  data-target="#checkinFromAllModal" data-content="{{ trans('general.sure_to_delete') }} data-title="{{  trans('general.delete') }}" onClick="return false;">
+        <a href="#"  class="btn btn-primary bg-purple btn-sm btn-social btn-block hidden-print" style="margin-bottom: 25px;" data-toggle="modal" data-tooltip="true"  data-target="#checkinFromAllModal" data-content="{{ trans('general.sure_to_delete') }} data-title="{{  trans('general.delete') }}" onClick="return false;">
+          <x-icon type="checkin" />
           {{ trans('admin/licenses/general.bulk.checkin_all.button') }}
         </a>
       @endif
@@ -656,12 +580,14 @@
     @can('delete', $license)
 
       @if ($license->availCount()->count() == $license->seats)
-        <button class="btn btn-block btn-danger delete-asset" data-toggle="modal" data-title="{{ trans('general.delete') }}" data-content="{{ trans('general.delete_confirm', ['item' => $license->name]) }}" data-target="#dataConfirmModal">
+        <button class="btn btn-block btn-danger btn-sm btn-social delete-license" data-toggle="modal" data-title="{{ trans('general.delete') }}" data-content="{{ trans('general.delete_confirm', ['item' => $license->name]) }}" data-target="#dataConfirmModal">
+          <x-icon type="delete" />
           {{ trans('general.delete') }}
         </button>
       @else
           <span data-tooltip="true" title=" {{ trans('admin/licenses/general.delete_disabled') }}">
-            <a href="#" class="btn btn-block btn-danger disabled">
+            <a href="#" class="btn btn-block btn-danger btn-sm btn-social delete-license disabled">
+              <x-icon type="delete" />
               {{ trans('general.delete') }}
             </a>
           </span>
diff --git a/resources/views/livewire/category-edit-form.blade.php b/resources/views/livewire/category-edit-form.blade.php
index cb80eb45d3..91cb26da51 100644
--- a/resources/views/livewire/category-edit-form.blade.php
+++ b/resources/views/livewire/category-edit-form.blade.php
@@ -3,7 +3,12 @@
     <div class="form-group {{ $errors->has('eula_text') ? 'error' : '' }}">
         <label for="eula_text" class="col-md-3 control-label">{{ trans('admin/categories/general.eula_text') }}</label>
         <div class="col-md-7">
-            {{ Form::textarea('eula_text', null, ['wire:model.live' => 'eulaText', 'class' => 'form-control', 'aria-label'=>'eula_text', 'disabled' => $this->eulaTextDisabled]) }}
+            <x-input.textarea
+                name="eula_text"
+                wire:model.live="eulaText"
+                aria-label="eula_text"
+                :disabled="$this->eulaTextDisabled"
+            />
             <p class="help-block">{!! trans('admin/categories/general.eula_text_help') !!} </p>
             <p class="help-block">{!! trans('admin/settings/general.eula_markdown') !!} </p>
             {!! $errors->first('eula_text', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
@@ -18,12 +23,25 @@
         <div class="col-md-9 col-md-offset-3">
             @if ($defaultEulaText!='')
                 <label class="form-control">
-                    {{ Form::checkbox('use_default_eula', '1', $useDefaultEula, ['wire:model.live' => 'useDefaultEula', 'aria-label'=>'use_default_eula']) }}
+                    <input
+                        type="checkbox"
+                        name="use_default_eula"
+                        value="1"
+                        wire:model.live="useDefaultEula"
+                        aria-label="use_default_eula"
+                    />
                     <span>{!! trans('admin/categories/general.use_default_eula') !!}</span>
                 </label>
             @else
                 <label class="form-control form-control--disabled">
-                    {{ Form::checkbox('use_default_eula', '0', $useDefaultEula, ['wire:model.live' => 'useDefaultEula', 'class'=>'disabled','disabled' => 'disabled', 'aria-label'=>'use_default_eula']) }}
+                    <input
+                        type="checkbox"
+                        name="use_default_eula"
+                        value="0"
+                        wire:model.live="useDefaultEula"
+                        aria-label="use_default_eula"
+                        disabled
+                    />
                     <span>{!! trans('admin/categories/general.use_default_eula_disabled') !!}</span>
                 </label>
             @endif
@@ -34,7 +52,13 @@
     <div class="form-group">
         <div class="col-md-9 col-md-offset-3">
             <label class="form-control">
-                {{ Form::checkbox('require_acceptance', '1', $requireAcceptance, ['wire:model.live' => 'requireAcceptance', 'aria-label'=>'require_acceptance']) }}
+                <input
+                    type="checkbox"
+                    name="require_acceptance"
+                    value="1"
+                    wire:model.live="requireAcceptance"
+                    aria-label="require_acceptance"
+                />
                 {{ trans('admin/categories/general.require_acceptance') }}
             </label>
         </div>
@@ -44,7 +68,14 @@
     <div class="form-group">
         <div class="col-md-9 col-md-offset-3">
             <label class="form-control">
-                {{ Form::checkbox('checkin_email', '1', $sendCheckInEmail, ['wire:model.live' => 'sendCheckInEmail', 'aria-label'=>'checkin_email', 'disabled' => $this->sendCheckInEmailDisabled]) }}
+                <input
+                    type="checkbox"
+                    name="checkin_email"
+                    value="1"
+                    wire:model.live="sendCheckInEmail"
+                    aria-label="checkin_email"
+                    @disabled($this->sendCheckInEmailDisabled)
+                />
                 {{ trans('admin/categories/general.checkin_email') }}
             </label>
             @if ($this->shouldDisplayEmailMessage)
diff --git a/resources/views/livewire/custom-field-set-default-values-for-model.blade.php b/resources/views/livewire/custom-field-set-default-values-for-model.blade.php
index 7f61db8cea..aee5f38888 100644
--- a/resources/views/livewire/custom-field-set-default-values-for-model.blade.php
+++ b/resources/views/livewire/custom-field-set-default-values-for-model.blade.php
@@ -1,28 +1,47 @@
 <span>
-
     <div class="form-group{{ $errors->has('custom_fieldset') ? ' has-error' : '' }}">
         <label for="custom_fieldset" class="col-md-3 control-label">
             {{ trans('admin/models/general.fieldset') }}
         </label>
         <div class="col-md-5">
-            {{ Form::select('fieldset_id', Helper::customFieldsetList(), old('fieldset_id', $fieldset_id), array('class'=>'select2 js-fieldset-field livewire-select2', 'style'=>'width:100%; min-width:350px', 'aria-label'=>'custom_fieldset', 'data-livewire-component' => $this->getId())) }}
+             <x-input.select
+                 name="fieldset_id"
+                 id="fieldset_id"
+                 :options="Helper::customFieldsetList()"
+                 :selected="old('fieldset_id', $fieldset_id)"
+                 :for-livewire="true"
+                 class="js-fieldset-field"
+                 style="width:100%; min-width:350px;"
+                 aria-label="custom_fieldset"
+             />
             {!! $errors->first('custom_fieldset', '<span class="alert-msg" aria-hidden="true"><br><i class="fas fa-times"></i> :message</span>') !!}
         </div>
         <div class="col-md-3">
+            @if ($fieldset_id)
                 <label class="form-control">
-                {{ Form::checkbox('add_default_values', 1, old('add_default_values', $add_default_values), ['data-livewire-component' => $this->getId(), 'id' => 'add_default_values', 'wire:model.live' => 'add_default_values']) }}
-                {{ trans('admin/models/general.add_default_values') }}
-            </label>
+                    <input
+                        type="checkbox"
+                        name="add_default_values"
+                        value="1"
+                        id="add_default_values"
+                        wire:model.live="add_default_values"
+                        data-livewire-component="{{ $this->getId() }}"
+                        @disabled($this->fields->isEmpty())
+                    />
+                    {{ trans('admin/models/general.add_default_values') }}
+                </label>
+            @endif
         </div>
     </div>
 
-    @if ($this->add_default_values ) {{-- 'if the checkbox is enabled *AND* there are more than 0 fields in the fieldsset' --}}
-            @if ($fields)
+    @if ($add_default_values)
 
-                @foreach ($fields as $field)
-                    <div class="form-group">
+        @if ($this->fields)
 
-                        <label class="col-md-3 control-label{{ $errors->has($field->name) ? ' has-error' : '' }}">{{ $field->name }}</label>
+                @foreach ($this->fields as $field)
+                    <div class="form-group" wire:key="field-{{ $field->id }}">
+
+                        <label class="col-md-3 control-label{{ $errors->has($field->db_column_name()) ? ' has-error' : '' }}">{{ $field->name }}</label>
 
                         <div class="col-md-7">
 
@@ -30,30 +49,57 @@
 
                                     <div class="input-group col-md-4" style="padding-left: 0px;">
                                         <div class="input-group date" data-provide="datepicker" data-date-format="yyyy-mm-dd"  data-autoclose="true">
-                                            <input type="text" class="form-control" placeholder="{{ trans('general.select_date') }}" name="default_values[{{ $field->id }}]" id="default-value{{ $field->id }}" value="{{ $field->defaultValue($model_id) }}">
-                                            <span class="input-group-addon"><i class="fas fa-calendar" aria-hidden="true"></i></span>
+                                            <input
+                                                type="text"
+                                                class="form-control"
+                                                placeholder="{{ trans('general.select_date') }}"
+                                                name="default_values[{{ $field->id }}]"
+                                                id="default-value{{ $field->id }}"
+                                                wire:model="selectedValues.{{ $field->db_column }}"
+                                                {{-- catch the onchange event and dispatch an InputEvent ourselves so Livewire can react to it... --}}
+                                                {{-- https://laracasts.com/discuss/channels/livewire/livewire-and-bootstrap-datepicker?page=1&replyId=623122--}}
+                                                onchange="this.dispatchEvent(new InputEvent('input'))"
+                                            >
+                                            <span class="input-group-addon"><x-icon type="calendar" /></span>
                                         </div>
                                     </div>
 
                                 @elseif ($field->element == "text")
 
 
-                                        <input class="form-control" type="text" value="{{ $field->defaultValue($model_id) }}" id="default-value{{ $field->id }}" name="default_values[{{ $field->id }}]">
+                                    <input
+                                        class="form-control"
+                                        type="text"
+                                        id="default-value{{ $field->id }}"
+                                        name="default_values[{{ $field->id }}]"
+                                        wire:model="selectedValues.{{ $field->db_column }}"
+                                    />
 
 
                                 @elseif($field->element == "textarea")
 
 
-                                        <textarea class="form-control" style="width: 100%;" id="default-value{{ $field->id }}" name="default_values[{{ $field->id }}]">{{ $field->defaultValue($model_id) }}</textarea>
+                                        <textarea
+                                            class="form-control"
+                                            style="width: 100%;"
+                                            id="default-value{{ $field->id }}"
+                                            name="default_values[{{ $field->id }}]"
+                                            wire:model="selectedValues.{{ $field->db_column }}"
+                                        ></textarea>
 
 
                                 @elseif($field->element == "listbox")
 
 
-                                        <select class="form-control" name="default_values[{{ $field->id }}]">
+                                        <select class="form-control" name="default_values[{{ $field->id }}]" wire:model="selectedValues.{{ $field->db_column }}">
                                             <option value=""></option>
                                             @foreach(explode("\r\n", $field->field_values) as $field_value)
-                                                <option value="{{$field_value}}" {{ $field->defaultValue($model_id) == $field_value ? 'selected="selected"': '' }}>{{ $field_value }}</option>
+                                                <option
+                                                    value="{{$field_value}}"
+                                                    wire:key="listbox-{{ $field_value }}"
+                                                >
+                                                    {{ $field_value }}
+                                                </option>
                                             @endforeach
                                         </select>
 
@@ -61,16 +107,30 @@
                                 @elseif($field->element == "radio")
 
                                     @foreach(explode("\r\n", $field->field_values) as $field_value)
-                                    <label class="col-md-3 form-control" for="{{ str_slug($field_value) }}">
-                                        <input id="{{ str_slug($field_value) }}" aria-label="{{ str_slug($field->name) }}"  type='radio' name="default_values[{{ $field->id }}]" value="{{$field_value}}" {{ $field->defaultValue($model_id) == $field_value ? 'checked="checked"': '' }} />{{ $field_value }}
-                                    </label>
+                                        <label class="col-md-3 form-control" for="{{ $field->db_column }}_{{ str_slug($field_value) }}" wire:key="radio-{{ $field_value }}">
+                                            <input
+                                                id="{{ $field->db_column }}_{{ str_slug($field_value) }}"
+                                                aria-label="{{ str_slug($field->name) }}"
+                                                type="radio"
+                                                name="default_values[{{ $field->id }}]"
+                                                value="{{$field_value}}"
+                                                wire:model="selectedValues.{{ $field->db_column }}"
+                                            />{{ $field_value }}
+                                        </label>
                                     @endforeach
 
                                 @elseif($field->element == "checkbox")
 
                                      @foreach(explode("\r\n", $field->field_values) as $field_value)
-                                        <label class="col-md-3 form-control" for="{{ str_slug($field_value) }}">
-                                            <input id="{{ str_slug($field_value) }}" type="checkbox" aria-label="{{ str_slug($field->name) }}" name="default_values[{{ $field->id }}][]" value="{{ $field_value }}"{{ in_array($field_value, explode(', ',$field->defaultValue($model_id))) ? ' checked="checked"': '' }}> {{ $field_value }}
+                                        <label class="col-md-3 form-control" for="{{ $field->db_column }}_{{ str_slug($field_value) }}" wire:key="checkbox-{{ $field_value }}">
+                                            <input
+                                                id="{{ $field->db_column }}_{{ str_slug($field_value) }}"
+                                                type="checkbox"
+                                                aria-label="{{ str_slug($field->name) }}"
+                                                name="default_values[{{ $field->id }}][]"
+                                                value="{{ $field_value }}"
+                                                wire:model="selectedValues.{{ $field->db_column }}"
+                                            > {{ $field_value }}
                                         </label>
                                     @endforeach
 
@@ -80,12 +140,18 @@
                                         Unknown field element: {{ $field->element }}
                                     </span>
                                 @endif
-                            </div>
+                                        <?php
+                                        $errormessage = $errors->first($field->db_column_name());
+                                        if ($errormessage) {
+                                            print('<span class="alert-msg" aria-hidden="true"><i class="fas fa-times" aria-hidden="true"></i> '.$errormessage.'</span>');
+                                        }
+                                        ?>
                         </div>
+                    </div>
 
-                @endforeach
-                </div>
-                @endif
+            @endforeach
+
+            @endif
 
     @endif
 </span>
diff --git a/resources/views/livewire/importer.blade.php b/resources/views/livewire/importer.blade.php
index b1164990be..8756bd4462 100644
--- a/resources/views/livewire/importer.blade.php
+++ b/resources/views/livewire/importer.blade.php
@@ -33,6 +33,7 @@
                         <table class="table table-striped table-bordered" id="errors-table">
                             <thead>
                             <th>{{ trans('general.item') }}</th>
+                            <th>Field</th>
                             <th>{{ trans('general.error') }}</th>
                             </thead>
                             <tbody>
@@ -41,8 +42,8 @@
                                     @foreach($error_bag as $field => $error_list)
                                         <tr>
                                             <td><b>{{ $key }}</b></td>
+                                            <td><b>{{ $field }}</b></td>
                                             <td>
-                                                <b>{{ $field }}:</b>
                                                 <span>{{ implode(", ",$error_list) }}</span>
                                                 <br />
                                             </td>
@@ -75,7 +76,7 @@
                                     </div>
                                 @endif
 
-                                <div class="col-md-2 col-sm-5 col-xs-12 text-right pull-right">
+                                <div class="col-md-4 col-sm-5 col-xs-12 text-right pull-right">
 
                                     <!-- The fileinput-button span is used to style the file input field as button -->
                                     @if (!config('app.lock_passwords'))
@@ -104,13 +105,17 @@
                                         class="col-md-12 table table-striped snipe-table">
 
                                     <tr>
-                                        <th class="col-md-6">
+                                        <th>
                                             {{ trans('general.file_name') }}
                                         </th>
-                                        <th class="col-md-3">
+                                        <th>
                                             {{ trans('general.created_at') }}
                                         </th>
-                                        <th class="col-md-1">
+                                        <th>
+                                            {{ trans('general.created_by') }}
+                                        </th>
+
+                                        <th>
                                             {{ trans('general.filesize') }}
                                         </th>
                                         <th class="col-md-1 text-right">
@@ -118,45 +123,53 @@
                                         </th>
                                     </tr>
 
-                                    @foreach($files as $currentFile)
+                                    @foreach($this->files as $currentFile)
 
-                                    		<tr style="{{ ($activeFile && ($currentFile->id == $activeFile->id)) ? 'font-weight: bold' : '' }}" class="{{ ($activeFile && ($currentFile->id == $activeFile->id)) ? 'warning' : '' }}">
-                                    			<td class="col-md-6">{{ $currentFile->file_path }}</td>
-                                    			<td class="col-md-3">{{ Helper::getFormattedDateObject($currentFile->created_at, 'datetime', false) }}</td>
-                                    			<td class="col-md-1">{{ Helper::formatFilesizeUnits($currentFile->filesize) }}</td>
+                                    		<tr style="{{ ($this->activeFile && ($currentFile->id == $this->activeFile->id)) ? 'font-weight: bold' : '' }}" class="{{ ($this->activeFile && ($currentFile->id == $this->activeFile->id)) ? 'warning' : '' }}">
+                                    			<td>{{ $currentFile->file_path }}</td>
+                                    			<td>{{ Helper::getFormattedDateObject($currentFile->created_at, 'datetime', false) }}</td>
+                                                <td>{{ ($currentFile->adminuser) ? $currentFile->adminuser->present()->fullName : '--'}}</td>
+                                    			<td>{{ Helper::formatFilesizeUnits($currentFile->filesize) }}</td>
                                                 <td class="col-md-1 text-right" style="white-space: nowrap;">
                                                     <button class="btn btn-sm btn-info" wire:click="selectFile({{ $currentFile->id }})" data-tooltip="true" title="{{ trans('general.import_this_file') }}">
                                                         <i class="fa-solid fa-list-check" aria-hidden="true"></i>
                                                         <span class="sr-only">{{ trans('general.import') }}</span>
                                                     </button>
-                                                    <a href="#" wire:click.prevent="$set('activeFile',null)">
+                                                    <a href="#" wire:click.prevent="$set('activeFileId',null)">
                                                     <button class="btn btn-sm btn-danger" wire:click="destroy({{ $currentFile->id }})">
-                                                        <i class="fas fa-trash icon-white" aria-hidden="true"></i><span class="sr-only"></span></button>
+                                                        <i class="fas fa-trash icon-white" aria-hidden="true"></i>
+                                                        <span class="sr-only">{{ trans('general.delete') }}</span>
+                                                    </button>
                                                     </a>
                                     			</td>
                                     		</tr>
 
-                                            @if( $currentFile && $activeFile && ($currentFile->id == $activeFile->id))
+                                            @if( $currentFile && $this->activeFile && ($currentFile->id == $this->activeFile->id))
                                                 <tr class="warning">
-                                                    <td colspan="4">
+                                                    <td colspan="5">
 
                                                         <div class="form-group">
 
-                                                                <label for="activeFile.import_type" class="col-md-3 col-xs-12">
+                                                                <label for="typeOfImport" class="col-md-3 col-xs-12">
                                                                     {{ trans('general.import_type') }}
                                                                 </label>
 
-                                                            <div class="col-md-9 col-xs-12" wire:ignore>
-                                                                    {{ Form::select('activeFile.import_type', $importTypes, $activeFile->import_type, [
-                                                                        'id' => 'import_type',
-                                                                        'class' => 'livewire-select2',
-                                                                        'style' => 'min-width: 350px',
-                                                                        'data-placeholder' => trans('general.select_var', ['thing' => trans('general.import_type')]),
-                                                                        'placeholder' => '', //needed so that the form-helper will put an empty option first
-                                                                        'data-minimum-results-for-search' => '-1', // Remove this if the list gets long enough that we need to search
-                                                                        'data-livewire-component' => $this->getId()
-                                                                    ]) }}
-                                                                    @if ($activeFile->import_type === 'asset' && $snipeSettings->auto_increment_assets == 0)
+                                                            <div class="col-md-9 col-xs-12">
+                                                                <x-input.select
+                                                                    name="typeOfImport"
+                                                                    id="import_type"
+                                                                    :options="$importTypes"
+                                                                    :selected="$typeOfImport"
+                                                                    :for-livewire="true"
+                                                                    :include-empty="true"
+                                                                    :data-placeholder="trans('general.select_var', ['thing' => trans('general.import_type')])"
+                                                                    {{--placeholder needed so that the form-helper will put an empty option first--}}
+                                                                    placeholder=""
+                                                                    {{--Remove this if the list gets long enough that we need to search--}}
+                                                                    data-minimum-results-for-search="-1"
+                                                                    style="min-width: 350px;"
+                                                                />
+                                                                    @if ($typeOfImport === 'asset' && $snipeSettings->auto_increment_assets == 0)
                                                                         <p class="help-block">
                                                                             {{ trans('general.auto_incrementing_asset_tags_disabled_so_tags_required') }}
                                                                         </p>
@@ -169,20 +182,25 @@
                                                                     <input type="checkbox" name="update" data-livewire-component="{{ $this->getId() }}" wire:model.live="update">
                                                                     {{ trans('general.update_existing_values') }}
                                                                 </label>
-                                                                @if ($activeFile->import_type === 'asset' && $snipeSettings->auto_increment_assets == 1 && $update)
+
+                                                                @if ($typeOfImport === 'asset' && $snipeSettings->auto_increment_assets == 1 && $update)
                                                                     <p class="help-block">
                                                                         {{ trans('general.auto_incrementing_asset_tags_enabled_so_now_assets_will_be_created') }}
                                                                     </p>
                                                                 @endif
 
+
+
+                                                                @if (($typeOfImport != 'location' && $typeOfImport!= 'assetModel' && $typeOfImport!= 'component' && $typeOfImport!= 'supplier') && $typeOfImport!= 'manufacturer' && $typeOfImport!= 'category' && ($typeOfImport!=''))
                                                                 <label class="form-control">
                                                                     <input type="checkbox" name="send_welcome" data-livewire-component="{{ $this->getId() }}" wire:model.live="send_welcome">
                                                                     {{ trans('general.send_welcome_email_to_users') }}
                                                                 </label>
+                                                                @endif
 
                                                                 <label class="form-control">
                                                                     <input type="checkbox" name="run_backup" data-livewire-component="{{ $this->getId() }}" wire:model.live="run_backup">
-                                                                    {{ trans('general.back_before_importing') }}
+                                                                   {{ trans('general.back_before_importing') }}
                                                                 </label>
 
                                                             </div>
@@ -195,10 +213,14 @@
                                                             @endif
 
 
-                                                            @if ($activeFile->import_type)
+                                                            @if ($typeOfImport)
                                                                 <div class="form-group col-md-12">
                                                                     <hr style="border-top: 1px solid lightgray">
-                                                                    <h3><i class="{{ Helper::iconTypeByItem($activeFile->import_type) }}"></i> Map {{ ucwords($activeFile->import_type) }} Import Fields</h3>
+                                                                    <h3>
+                                                                        <i class="{{ Helper::iconTypeByItem($typeOfImport) }}">
+                                                                        </i>
+                                                                        {{ trans('general.map_fields', ['item_type' => ucwords($typeOfImport)]) }}
+                                                                       </h3>
                                                                     <hr style="border-top: 1px solid lightgray">
                                                                 </div>
                                                                 <div class="form-group col-md-12">
@@ -213,29 +235,34 @@
                                                                     </div>
                                                                 </div><!-- /div row -->
 
-                                                                @if($activeFile->header_row)
+                                                                @if(! empty($headerRow))
 
-                                                                    @foreach($activeFile->header_row as $index => $header)
+                                                                    @foreach($headerRow as $index => $header)
 
                                                                         <div class="form-group col-md-12" wire:key="header-row-{{ $index }}">
 
                                                                             <label for="field_map.{{ $index }}" class="col-md-3 control-label text-right">{{ $header }}</label>
-                                                                            <div class="col-md-4" wire:ignore>
-
-                                                                                {{ Form::select('field_map.'.$index, $columnOptions[$activeFile->import_type], @$field_map[$index],
-                                                                                    [
-                                                                                        'class' => 'mappings livewire-select2',
-                                                                                        'placeholder' => trans('general.importer.do_not_import'),
-                                                                                        'style' => 'min-width: 100%',
-                                                                                        'data-livewire-component' => $this->getId()
-                                                                                    ],[
-                                                                                        '-' => ['disabled' => true] // this makes the "-----" line unclickable
-                                                                                    ])
-                                                                                }}
+                                                                            <div class="col-md-4">
+                                                                                <x-input.select
+                                                                                    :name="'field_map.'.$index"
+                                                                                    :for-livewire="true"
+                                                                                    :placeholder="trans('general.importer.do_not_import')"
+                                                                                    class="mappings"
+                                                                                    style="min-width: 100%;"
+                                                                                >
+                                                                                    <option selected="selected" value="">Do Not Import</option>
+                                                                                    @foreach($columnOptions[$typeOfImport] as $key => $value)
+                                                                                        <option
+                                                                                            value="{{ $key }}"
+                                                                                            @selected(@$field_map[$index] === $key)
+                                                                                            @disabled($key === '-')
+                                                                                        >{{ $value }}</option>
+                                                                                    @endforeach
+                                                                                </x-input.select>
                                                                             </div>
-									                                    @if (($activeFile->first_row) && (array_key_exists($index, $activeFile->first_row)))
+									                                    @if (($this->activeFile->first_row) && (array_key_exists($index, $this->activeFile->first_row)))
                                                                             <div class="col-md-5">
-                                                                                <p class="form-control-static">{{ str_limit($activeFile->first_row[$index], 50, '...') }}</p>
+                                                                                <p class="form-control-static">{{ str_limit($this->activeFile->first_row[$index], 50, '...') }}</p>
                                                                             </div>
                                                                         @else
                                                                             @php
@@ -251,10 +278,10 @@
 
                                                                 <div class="form-group col-md-12">
                                                                     <div class="col-md-3 text-left">
-                                                                        <a href="#" wire:click.prevent="$set('activeFile',null)">{{ trans('general.cancel') }}</a>
+                                                                        <a href="#" wire:click.prevent="$set('activeFileId',null)">{{ trans('general.cancel') }}</a>
                                                                     </div>
                                                                     <div class="col-md-9">
-                                                                        <button type="submit" class="btn btn-primary col-md-5" id="import">Import</button>
+                                                                        <button type="submit" class="btn btn-primary col-md-5" id="import">{{ trans('admin/hardware/message.import.import_button') }}</button>
                                                                         <br><br>
                                                                     </div>
                                                                 </div>
@@ -267,10 +294,10 @@
                                                             @else
                                                                 <div class="form-group col-md-10">
                                                                     <div class="col-md-3 text-left">
-                                                                        <a href="#" wire:click.prevent="$set('activeFile',null)">{{ trans('general.cancel') }}</a>
+                                                                        <a href="#" wire:click.prevent="$set('activeFileId',null)">{{ trans('general.cancel') }}</a>
                                                                     </div>
                                                                 </div>
-                                                            @endif {{-- end of if ... activeFile->import_type --}}
+                                                            @endif {{-- end of if ... $typeOfImport --}}
 
                                                         </div><!-- /div v-show -->                                                    </td>
                                                 </tr>
@@ -328,7 +355,7 @@
             // we have to hook up to the `<tr id='importer-file'>` at the root of this display,
             // because the #import button isn't visible until you click an import_type
             $('#upload-table').on('click', '#import', function () {
-                if (!$wire.$get('activeFile.import_type')) {
+                if (!$wire.$get('typeOfImport')) {
                     $wire.$set('statusType', 'error');
                     $wire.$set('statusText', "An import type is required... "); //TODO: translate?
                     return;
@@ -340,15 +367,15 @@
                     // console.warn("Here is the mappings:")
                     // console.dir(mappings)
                     // console.warn("Uh, active file id is, I guess: "+$wire.$get('activeFile.id'))
-                    var this_file = $wire.$get('file_id'); // okay, I actually don't know what I'm doing here.
+                    var file_id = $wire.$get('activeFileId');
                     $.post({
                         {{-- I want to do something like: route('api.imports.importFile', $activeFile->id) }} --}}
-                        url: "api/v1/imports/process/"+this_file, // maybe? Good a guess as any..FIXME. HARDCODED DUMB FILE
+                        url: "api/v1/imports/process/"+file_id, // maybe? Good a guess as any..FIXME. HARDCODED DUMB FILE
                         contentType: 'application/json',
                         data: JSON.stringify({
                             'import-update': !!$wire.$get('update'),
                             'send-welcome': !!$wire.$get('send_welcome'),
-                            'import-type': $wire.$get('activeFile.import_type'),
+                            'import-type': $wire.$get('typeOfImport'),
                             'run-backup': !!$wire.$get('run_backup'),
                             'column-mappings': mappings
                         }),
@@ -388,7 +415,7 @@
                             }
 
                         }
-                        $wire.$set('activeFile', null); //$wire.$set('hideDetails')
+                        $wire.$set('activeFileId', null); //$wire.$set('hideDetails')
                     });
                 })
                 return false;
diff --git a/resources/views/livewire/location-scope-check.blade.php b/resources/views/livewire/location-scope-check.blade.php
new file mode 100644
index 0000000000..8feb8ea25f
--- /dev/null
+++ b/resources/views/livewire/location-scope-check.blade.php
@@ -0,0 +1,11 @@
+<div>
+    <label class="form-control{{ (count($mismatched) > 0) ? ' form-control--disabled' : '' }}">
+        <input type="checkbox" name="scope_locations_fmcs" value="1" @checked(old('scope_locations_fmcs', $setting->scope_locations_fmcs)) aria-label="scope_locations_fmcs" {{ (count($mismatched) > 0) ? ' disabled' : '' }}/>
+        {{ trans('admin/settings/general.scope_locations_fmcs_support_text') }}
+    </label>
+    <p class="help-block">
+        {{ trans('admin/settings/general.scope_locations_fmcs_support_help_text') }}
+        <strong>{{ (count($mismatched) > 0) ? trans('admin/settings/general.scope_locations_fmcs_support_disabled_text', ['count' => count($mismatched)]) : '' }}</strong>
+    </p>
+    <button class="btn btn-sm btn-default" wire:click.prevent="check_locations">{{ trans('admin/settings/general.scope_locations_fmcs_check_button') }}</button>
+</div>
\ No newline at end of file
diff --git a/resources/views/livewire/oauth-clients.blade.php b/resources/views/livewire/oauth-clients.blade.php
index 27a76b623f..121c29c3cb 100644
--- a/resources/views/livewire/oauth-clients.blade.php
+++ b/resources/views/livewire/oauth-clients.blade.php
@@ -3,6 +3,7 @@
 
         <div class="box-header">
                 <h2 class="box-title">
+                    <x-icon type="oauth"/>
                     {{ trans('admin/settings/general.oauth_clients') }}
                 </h2>
                 @if ($authorizationError)
@@ -32,14 +33,27 @@
                 @endif
 
             @if ($clients->count() > 0)
-                <table class="table table-striped snipe-table">
+                    <table data-cookie-id-table="OAuthClientsTable"
+                           data-pagination="true"
+                           data-id-table="OAuthClientsTable"
+                           data-side-pagination="client"
+                           data-sort-order="desc"
+                           data-sort-name="created_at"
+                           id="OAuthClientsTable"
+                           class="table table-striped snipe-table">
                     <thead>
                         <tr>
                             <th>{{ trans('general.id') }}</th>
-                            <th>{{ trans('general.name') }}</th>
-                            <th>{{ trans('admin/settings/general.oauth_redirect_url') }}</th>
-                            <th>{{ trans('admin/settings/general.oauth_secret') }}</th>
-                            <th><span class="sr-only">{{ trans('general.actions') }}</span></th>
+                            <th data-sortable="true">{{ trans('general.name') }}</th>
+                            <th data-sortable="true">{{ trans('admin/settings/general.oauth_redirect_url') }}</th>
+                            <th data-sortable="true">{{ trans('admin/settings/general.oauth_secret') }}</th>
+                            <th data-sortable="true">{{ trans('general.created_at')  }}</th>
+                            <th data-sortable="true">{{ trans('general.updated_at')  }}</th>
+                            <th>
+                                <span class="sr-only">
+                                    {{ trans('general.actions') }}
+                                </span>
+                            </th>
                         </tr>
                     </thead>
                     <tbody>
@@ -57,7 +71,7 @@
 
                                 <!-- Redirect -->
                                 <td>
-                                    {{ $client->redirect }}
+                                    <code>{{ $client->redirect }}</code>
                                 </td>
 
                                 <!-- Secret -->
@@ -65,20 +79,33 @@
                                     <code>{{ $client->secret }}</code>
                                 </td>
 
+                                <td>
+                                    {{ $client->created_at ? Helper::getFormattedDateObject($client->created_at, 'datetime', false) : '' }}
+                                </td>
+
+                                <td>
+                                    @if ($client->created_at != $client->updated_at)
+                                        {{ $client->updated_at ? Helper::getFormattedDateObject($client->updated_at, 'datetime', false) : '' }}
+                                    @endif
+                                </td>
+
                                 <!-- Edit / Delete Button -->
                                 <td class="text-right">
 
                                     <a class="action-link btn btn-sm btn-warning"
                                        wire:click="editClient('{{ $client->id }}')"
                                        onclick="$('#modal-edit-client').modal('show');">
-                                        <i class="fas fa-pencil-alt" aria-hidden="true"></i><span class="sr-only">{{ trans('general.update') }}</span>
+                                        <i class="fas fa-pencil-alt" aria-hidden="true"></i>
+                                        <span class="sr-only">
+                                            {{ trans('general.update') }}
+                                        </span>
                                     </a>
 
                                     <a class="action-link btn btn-danger btn-sm" wire:click="deleteClient('{{ $client->id }}')">
                                         <i class="fas fa-trash" aria-hidden="true"></i>
                                         <span class="sr-only">
-                                                    {{ trans('general.delete') }}
-                                                </span>
+                                            {{ trans('general.delete') }}
+                                        </span>
                                     </a>
                                 </td>
                             </tr>
@@ -96,19 +123,34 @@
                 <div>
                     <div class="box box-default">
                         <div class="box-header">
-                            <h2>
+                            <h2 class="box-title">
                                 {{ trans('admin/settings/general.oauth_authorized_apps') }}
                             </h2>
                         </div>
 
                         <div class="box-body">
                             <!-- Authorized Tokens -->
-                            <table class="table table-striped snipe-table">
+                            <table data-cookie-id-table="AuthorizedAppsTable"
+                                   data-pagination="true"
+                                   data-id-table="AuthorizedAppsTable"
+                                   data-toolbar="#AuthorizedAppsToolbar"
+                                   data-side-pagination="client"
+                                   data-sort-order="desc"
+                                   data-sort-name="created_at"
+                                   id="AuthorizedAppsTable"
+                                   class="table table-striped snipe-table">
                                 <thead>
                                 <tr>
-                                    <th>{{ trans('general.name') }}</th>
-                                    <th>{{ trans('admin/settings/general.oauth_scopes')  }}</th>
-                                    <th></th>
+                                    <th data-sortable="true">{{ trans('general.name') }}</th>
+                                    <th data-sortable="true"> {{ trans('account/general.personal_access_token') }}</th>
+                                    <th data-sortable="true">{{ trans('admin/settings/general.oauth_scopes')  }}</th>
+                                    <th data-sortable="true">{{ trans('general.created_at')  }}</th>
+                                    <th data-sortable="true">{{ trans('general.expires') }}</th>
+                                    <th>
+                                        <span class="sr-only">
+                                            {{ trans('general.actions') }}
+                                        </span>
+                                    </th>
                                 </tr>
                                 </thead>
 
@@ -120,6 +162,10 @@
                                             {{ $token->client->name }}
                                         </td>
 
+                                        <td>
+                                            {{ $token->name }}
+                                        </td>
+
                                         <!-- Scopes -->
                                         <td>
                                             @if(!$token->scopes)
@@ -129,6 +175,13 @@
                                             @endif
                                         </td>
 
+                                        <td>
+                                            {{ $token->created_at ? Helper::getFormattedDateObject($token->created_at, 'datetime', false) : '' }}
+                                        </td>
+
+                                        <td>
+                                            {{ $token->expires_at ? Helper::getFormattedDateObject($token->expires_at, 'datetime', false) : '' }}
+                                        </td>
                                         <!-- Revoke Button -->
                                         <td>
                                             <a class="btn btn-sm btn-danger pull-right"
@@ -197,6 +250,7 @@
                                        class="form-control"
                                        wire:model="name"
                                        wire:keydown.enter="createClient"
+                                       required
                                        autofocus>
 
                                 <span class="help-block">
@@ -210,12 +264,13 @@
                             <label class="col-md-3 control-label" for="redirect">{{ trans('admin/settings/general.oauth_redirect_url') }}</label>
 
                             <div class="col-md-7">
-                                <input type="text"
+                                <input type="url"
                                        class="form-control"
                                        aria-label="redirect"
                                        name="redirect"
                                        wire:model="redirect"
                                        wire:keydown.enter="createClient"
+                                       required
                                 >
 
                                 <span class="help-block">
@@ -354,4 +409,8 @@
     </script>
 </div>
 
+@section('moar_scripts')
+    @include ('partials.bootstrap-table')
+@endsection
+
 
diff --git a/resources/views/livewire/personal-access-tokens.blade.php b/resources/views/livewire/personal-access-tokens.blade.php
index 848e4ca499..b4bcc64d6c 100644
--- a/resources/views/livewire/personal-access-tokens.blade.php
+++ b/resources/views/livewire/personal-access-tokens.blade.php
@@ -1,61 +1,65 @@
 <div>
-    <div class="panel panel-default">
-        <div class="panel-heading">
-            <div class="text-right" style="display: flex; justify-content: space-between; align-items: center;">
-                <a class="btn btn-info btn-sm action-link pull-right"
+    <div class="box box-default">
+        <div class="box-header with-border">
+            <div class="text-right">
+                <a class="btn btn-info btn-sm pull-right"
                    onclick="$('#modal-create-token').modal('show');"
-                   wire:click="$dispatch('openModal')"
-                >
-                    Create New Token
+                   wire:click="$dispatch('openModal')">
+                    {{ trans('general.create') }}
                 </a>
             </div>
         </div>
-        <div class="panel-body">
+        <div class="box-body">
             <!-- No Tokens Notice -->
             @if($tokens->count() === 0)
-                <p class="m-b-none"
-                >
-                    You have not created any personal access tokens.
+                <p>
+                    {{ trans('account/general.no_tokens') }}
                 </p>
             @endif
 
             <!-- Personal Access Tokens -->
-            <table class="table table-borderless m-b-none">
+            <div class="table table-responsive">
+            <table class="table table-striped snipe-table">
                 @if($tokens->count() > 0)
                     <thead>
                     <tr>
-                        <th class="col-md-3">Name</th>
-                        <th class="col-md-2">Created</th>
-                        <th class="col-md-2">Expires</th>
-                        <th class="col-md-2"><span class="sr-only">Delete</span></th>
+                        <th class="col-md-3">{{ trans('general.name') }}</th>
+                        <th class="col-md-2">{{ trans('general.created_at') }}</th>
+                        <th class="col-md-2">{{ trans('general.expires') }}</th>
+                        <th class="col-md-2"><span class="sr-only">{{ trans('general.delete') }}</span></th>
                     </tr>
                     </thead>
+                    <tbody>
                 @endif
                 @foreach($tokens as $token)
-                    <tbody>
+
                     <tr>
-                        <!-- Client Name -->
-                        <td style="vertical-align: middle;">
+                        <td>
                             {{ $token->name }}
                         </td>
 
-                        <td style="vertical-align: middle;">
+                        <td>
                             {{ $token->created_at }}
                         </td>
 
-                        <td style="vertical-align: middle;">
+                        <td>
                             {{ $token->expires_at }}
                         </td>
-                        <!-- Delete Button -->
-                        <td style="vertical-align: middle;" class="text-right">
-                            <a class="action-link btn btn-danger btn-sm" wire:click="deleteToken('{{ $token->id }}')">
-                                <i class="fas fa-trash"></i>
+                        <td class="text-right">
+                            <a class="action-link btn btn-danger btn-sm" wire:click="deleteToken('{{ $token->id }}')"
+                               wire:loading.attr="disabled" data-tooltip="true" title="{{ trans('general.delete') }}">
+                                <i class="fas fa-trash" aria-hidden="true"></i>
+                                <span class="sr-only">
+                                    {{ trans('general.delete') }}
+                                </span>
                             </a>
                         </td>
                     </tr>
-                    </tbody>
+
                 @endforeach
+                    </tbody>
             </table>
+            </div>
         </div>
     </div>
     <!-- Create Token Modal -->
@@ -73,22 +77,23 @@
                 <div class="modal-body">
                     <!-- Form Errors -->
                     @if($errors->has('name'))
-                        <div class="alert alert-danger"
-                        >
-                            <p><strong>Whoops!</strong> Something went wrong!</p>
+                        <div class="alert alert-danger">
+                            <p><strong>{{ trans('general.whoops') }}</strong> {{ trans('general.something_went_wrong') }}</p>
                             <br>
                             <ul>
-                                <li
-                                >
-                                    @error('name') <span class="error">{{ $message }}</span> @enderror
+                                <li>
+                                    @error('name')
+                                    <span class="error">
+                                        {{ $message }}
+                                    </span>
+                                    @enderror
                                 </li>
                             </ul>
                         </div>
                     @endif
 
                     <!-- Create Token Form -->
-                    <form class="form-horizontal" role="form"
-                    >
+                    <form class="form-horizontal" role="form">
                         <!-- Name -->
                         <div class="form-group">
                             <label class="col-md-4 control-label" for="name">Name</label>
@@ -97,9 +102,9 @@
                                 <input id="create-token-name" type="text" aria-label="name" class="form-control"
                                        name="name"
                                        wire:keydown.enter="createToken(name)"
-                                       {{-- defer because it's submitting as i type if i don't --}}
                                        wire:model="name"
                                        autofocus
+                                       required
                                 >
                             </div>
                         </div>
@@ -109,12 +114,10 @@
 
                 <!-- Modal Actions -->
                 <div class="modal-footer">
-                    <button type="button" class="btn primary" data-dismiss="modal">Close</button>
+                    <button type="button" class="btn primary" data-dismiss="modal">{{ trans('general.close') }}</button>
 
-                    <button type="button" class="btn btn-primary"
-                            wire:click="createToken(name)"
-                    >
-                        Create
+                    <button type="button" class="btn btn-primary" wire:click="createToken(name)">
+                        {{ trans('general.create') }}
                     </button>
                 </div>
             </div>
@@ -129,14 +132,13 @@
                     <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
 
                     <h4 class="modal-title">
-                        Personal Access Token
+                        {{ trans('account/general.personal_access_token') }}
                     </h4>
                 </div>
 
                 <div class="modal-body">
                     <p>
-                        Here is your new personal access token. This is the only time it will be shown so don't lose it!
-                        You may now use this token to make API requests.
+                        {{ trans('account/general.here_is_api_key') }}
                     </p>
 
                     <pre><code>{{ $newTokenString }}</code></pre>
@@ -144,7 +146,7 @@
 
                 <!-- Modal Actions -->
                 <div class="modal-footer">
-                    <button type="button" class="btn btn-default" data-dismiss="modal">Close</button>
+                    <button type="button" class="btn btn-default" data-dismiss="modal">{{ trans('general.close') }}</button>
                 </div>
             </div>
         </div>
diff --git a/resources/views/livewire/slack-settings-form.blade.php b/resources/views/livewire/slack-settings-form.blade.php
index a5de8585e3..abb776bcea 100644
--- a/resources/views/livewire/slack-settings-form.blade.php
+++ b/resources/views/livewire/slack-settings-form.blade.php
@@ -15,7 +15,14 @@
 <div><!-- livewire div - do not remove -->
     <form class="form-horizontal" role="form" wire:submit="submit">
         {{csrf_field()}}
-
+        @if (session()->has('warning'))
+            <div class="alert alert-warning">
+                {!! session('warning') !!}
+                @php
+                    session()->forget('warning'); // Clear the session flash immediately
+                @endphp
+            </div>
+        @endif
         <div class="row">
 
             <div class="col-sm-10 col-sm-offset-1 col-md-8 col-md-offset-2">
@@ -59,13 +66,18 @@
 								</label>
                             </div>
                             <div class="col-md-9 required" wire:ignore>
-
-                            @if (Helper::isDemoMode())
-								{{ Form::select('webhook_selected', array('slack' => trans('admin/settings/general.slack'), 'general' => trans('admin/settings/general.general_webhook'),'google' => trans('admin/settings/general.google_workspaces'), 'microsoft' => trans('admin/settings/general.ms_teams')), old('webhook_selected', $webhook_selected), array('class'=>'select2 form-control', 'aria-label' => 'webhook_selected', 'id' => 'select2', 'style'=>'width:100%', 'disabled')) }}
-                            @else
-                                {{ Form::select('webhook_selected', array('slack' => trans('admin/settings/general.slack'), 'general' => trans('admin/settings/general.general_webhook'),'google' => trans('admin/settings/general.google_workspaces'), 'microsoft' => trans('admin/settings/general.ms_teams')), old('webhook_selected', $webhook_selected), array('class'=>'select2 form-control', 'aria-label' => 'webhook_selected', 'id' => 'select2', 'data-minimum-results-for-search' => '-1', 'style'=>'width:100%')) }}
-                            @endif
-
+                                <x-input.select
+                                    name="webhook_selected"
+                                    id="select2"
+                                    :options="['slack' => trans('admin/settings/general.slack'), 'general' => trans('admin/settings/general.general_webhook'),'google' => trans('admin/settings/general.google_workspaces'), 'microsoft' => trans('admin/settings/general.ms_teams')]"
+                                    :selected="old('webhook_selected', $webhook_selected)"
+                                    :disabled="Helper::isDemoMode()"
+                                    :for-livewire="true"
+                                    data-minimum-results-for-search="-1"
+                                    class="form-control"
+                                    style="width:100%"
+                                    aria-label="webhook_selected"
+                                />
                             </div>
                         </div>
 
@@ -76,10 +88,10 @@
                         <!--Webhook endpoint-->
                         <div class="form-group{{ $errors->has('webhook_endpoint') ? ' error' : '' }}">
                             <div class="col-md-2">
-                                {{ Form::label('webhook_endpoint', trans('admin/settings/general.webhook_endpoint',['app' => $webhook_name ])) }}
+                                <label for="webhook_endpoint">{{ trans('admin/settings/general.webhook_endpoint',['app' => $webhook_name ]) }}</label>
                             </div>
                             <div class="col-md-9 required">
-                                    <input type="text" wire:model.blur="webhook_endpoint" class="form-control" placeholder="{{$webhook_placeholder}}" value="{{old('webhook_endpoint', $webhook_endpoint)}}"{{ Helper::isDemoMode() ? ' disabled' : ''}}>
+                                    <input type="url" wire:model.blur="webhook_endpoint" class="form-control" placeholder="{{$webhook_placeholder}}" value="{{old('webhook_endpoint', $webhook_endpoint)}}"{{ Helper::isDemoMode() ? ' disabled' : ''}}>
                                 {!! $errors->first('webhook_endpoint', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
                             </div>
                         </div>
@@ -93,7 +105,7 @@
                         @if($webhook_selected != 'microsoft' && $webhook_selected!= 'google')
                             <div class="form-group{{ $errors->has('webhook_channel') ? ' error' : '' }}">
                                 <div class="col-md-2">
-                                    {{ Form::label('webhook_channel', trans('admin/settings/general.webhook_channel',['app' => $webhook_name ])) }}
+                                    <label for="webhook_channel">{{ trans('admin/settings/general.webhook_channel',['app' => $webhook_name ]) }}</label>
                                 </div>
                                 <div class="col-md-9 required">
                                         <input type="text" wire:model.blur="webhook_channel" class="form-control" placeholder="#IT-Ops" value="{{ old('webhook_channel', $webhook_channel) }}"{{ Helper::isDemoMode() ? ' disabled' : ''}}>
@@ -111,7 +123,7 @@
                         @if($webhook_selected != 'microsoft' && $webhook_selected != 'google')
                             <div class="form-group{{ $errors->has('webhook_botname') ? ' error' : '' }}">
                                 <div class="col-md-2">
-                                    {{ Form::label('webhook_botname', trans('admin/settings/general.webhook_botname',['app' => $webhook_name ])) }}
+                                    <label for="webhook_botname">{{ trans('admin/settings/general.webhook_botname',['app' => $webhook_name ]) }}</label>
                                 </div>
                                 <div class="col-md-9">
                                         <input type="text" wire:model.blur="webhook_botname" class='form-control' placeholder="Snipe-Bot" {{ old('webhook_botname', $webhook_botname)}}{{ Helper::isDemoMode() ? ' disabled' : ''}}>
@@ -153,7 +165,7 @@
 
 
                         <button type="submit" {{$isDisabled}} class="btn btn-primary"{{ Helper::isDemoMode() ? ' disabled' : ''}}>
-                        <i class="fas fa-check icon-white" aria-hidden="true"></i> {{ $save_button }}</button>
+                        <x-icon type="checkmark" /> {{ $save_button }}</button>
 
                     </div> <!-- /.col-md-12 -->
                 </div><!--box-footer-->
@@ -163,22 +175,3 @@
     </div> <!-- /.row -->
 </form>
 </div>  <!-- /livewire div -->
-
-
-
-
-@section('moar_scripts')
-<script>
-    $(document).ready(function () {
-        $('#select2').select2();
-        $('#select2').on('change', function (e) {
-            var data = $('#select2').select2("val");
-            @this.set('webhook_selected', data);
-        });
-    });
-
-
-</script>
-@endsection
-
-
diff --git a/resources/views/locations/bulk-delete.blade.php b/resources/views/locations/bulk-delete.blade.php
index deab1e7fbd..e75d5f5f73 100644
--- a/resources/views/locations/bulk-delete.blade.php
+++ b/resources/views/locations/bulk-delete.blade.php
@@ -51,7 +51,7 @@
 
                     <div class="box-footer text-right">
                         <a class="btn btn-link pull-left" href="{{ URL::previous() }}">{{ trans('button.cancel') }}</a>
-                        <button type="submit" class="btn btn-success" id="submit-button"><i class="fas fa-check icon-white" aria-hidden="true"></i> {{ trans('general.delete') }}</button>
+                        <button type="submit" class="btn btn-success" id="submit-button"><x-icon type="checkmark" /> {{ trans('general.delete') }}</button>
                     </div><!-- /.box-footer -->
                 </div><!-- /.box -->
             </form>
diff --git a/resources/views/locations/edit.blade.php b/resources/views/locations/edit.blade.php
index 95ba245359..5b83b36ad5 100755
--- a/resources/views/locations/edit.blade.php
+++ b/resources/views/locations/edit.blade.php
@@ -17,6 +17,9 @@
 <!-- Manager-->
 @include ('partials.forms.edit.user-select', ['translated_name' => trans('admin/users/table.manager'), 'fieldname' => 'manager_id'])
 
+<!-- Company -->
+@include ('partials.forms.edit.company-select', ['translated_name' => trans('general.company'), 'fieldname' => 'company_id'])
+
 @include ('partials.forms.edit.phone')
 @include ('partials.forms.edit.fax')
 
@@ -25,9 +28,15 @@
     <label for="currency" class="col-md-3 control-label">
         {{ trans('admin/locations/table.currency') }}
     </label>
-    <div class="col-md-9{{  (Helper::checkIfRequired($item, 'currency')) ? ' required' : '' }}">
-        {{ Form::text('currency', old('currency', $item->currency), array('class' => 'form-control','placeholder' => 'USD', 'maxlength'=>'3', 'style'=>'width: 60px;', 'aria-label'=>'currency')) }}
-        {!! $errors->first('currency', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
+    <div class="col-md-7">
+        <input class="form-control" style="width:100px" type="text" name="currency" aria-label="currency" id="currency" value="{{ old('currency', $item->currency) }}"{!!  (Helper::checkIfRequired($item, 'currency')) ? ' required' : '' !!} maxlength="3" />
+        @error('currency')
+        <span class="alert-msg">
+            <x-icon type="x" />
+            {{ $message }}
+        </span>
+        @enderror
+
     </div>
 </div>
 
@@ -39,13 +48,35 @@
         <label for="ldap_ou" class="col-md-3 control-label">
             {{ trans('admin/locations/table.ldap_ou') }}
         </label>
-        <div class="col-md-7{{  (Helper::checkIfRequired($item, 'ldap_ou')) ? ' required' : '' }}">
-            {{ Form::text('ldap_ou', old('ldap_ou', $item->ldap_ou), array('class' => 'form-control')) }}
-            {!! $errors->first('ldap_ou', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
+        <div class="col-md-7">
+            <input class="form-control" type="text" name="ldap_ou" aria-label="ldap_ou" id="ldap_ou" value="{{ old('ldap_ou', $item->ldap_ou) }}"{!!  (Helper::checkIfRequired($item, 'ldap_ou')) ? ' required' : '' !!} maxlength="191" />
+            @error('ldap_ou')
+            <span class="alert-msg">
+                <x-icon type="x" />
+                {{ $message }}
+        </span>
+            @enderror
         </div>
     </div>
 @endif
 
+
 @include ('partials.forms.edit.image-upload', ['image_path' => app('locations_upload_path')])
+
+<div class="form-group{!! $errors->has('notes') ? ' has-error' : '' !!}">
+    <label for="notes" class="col-md-3 control-label">{{ trans('general.notes') }}</label>
+    <div class="col-md-8">
+        <x-input.textarea
+                name="notes"
+                id="notes"
+                :value="old('notes', $item->notes)"
+                placeholder="{{ trans('general.placeholders.notes') }}"
+                aria-label="notes"
+                rows="5"
+        />
+        {!! $errors->first('notes', '<span class="alert-msg" aria-hidden="true"><i class="fas fa-times" aria-hidden="true"></i> :message</span>') !!}
+    </div>
+</div>
+
 @stop
 
diff --git a/resources/views/locations/index.blade.php b/resources/views/locations/index.blade.php
index 2d020cb026..8914a892a1 100755
--- a/resources/views/locations/index.blade.php
+++ b/resources/views/locations/index.blade.php
@@ -18,8 +18,6 @@
   <div class="col-md-12">
     <div class="box box-default">
       <div class="box-body">
-        <div class="table-responsive">
-
           @include('partials.locations-bulk-actions')
 
           <table
@@ -32,7 +30,8 @@
                   data-bulk-button-id="#bulkLocationsEditButton"
                   data-bulk-form-id="#locationsBulkForm"
                   data-search="true"
-                  data-show-footer="true"
+                  data-search-highlight="true"
+                  data-show-print="true"
                   data-side-pagination="server"
                   data-show-columns="true"
                   data-show-fullscreen="true"
@@ -41,13 +40,12 @@
                   data-sort-order="asc"
                   id="locationTable"
                   class="table table-striped snipe-table"
-                  data-url="{{ route('api.locations.index') }}"
+                  data-url="{{ route('api.locations.index', array('company_id'=>e(Request::get('company_id')))) }}"
                   data-export-options='{
               "fileName": "export-locations-{{ date('Y-m-d') }}",
               "ignoreColumn": ["actions","image","change","checkbox","checkincheckout","icon"]
               }'>
           </table>
-        </div>
       </div>
     </div>
   </div>
diff --git a/resources/views/locations/print.blade.php b/resources/views/locations/print.blade.php
index 9f54978ff5..4265a54c5d 100644
--- a/resources/views/locations/print.blade.php
+++ b/resources/views/locations/print.blade.php
@@ -14,7 +14,7 @@
         }
 
         @page {
-            size: A4;
+            size: auto;
         }
         table.inventory th, table.inventory td {
             border: solid #000;
@@ -36,13 +36,13 @@
 
         <h3>
         @if ($snipeSettings->logo!='')
-            <img class="print-logo" src="{{ config('app.url') }}/uploads/{{ $snipeSettings->logo }}">
+            <img class="print-logo" src="{{ config('app.url') }}/uploads/{{ $snipeSettings->acceptance_pdf_logo }}">
         @endif
         {{ $snipeSettings->site_name }}
         </h3>
     @elseif ($snipeSettings->brand == '2')
         @if ($snipeSettings->logo!='')
-            <img class="print-logo" src="{{ config('app.url') }}/uploads/{{ $snipeSettings->logo }}">
+            <img class="print-logo" src="{{ config('app.url') }}/uploads/{{ $snipeSettings->acceptance_pdf_logo }}">
         @endif
     @else
       <h3>{{ $snipeSettings->site_name }}</h3>
@@ -53,7 +53,11 @@
     @if ($parent)
         {{ $parent->present()->fullName() }}
     @endif
-
+<br>
+@if ($company)
+    <b>{{ trans('admin/companies/table.name') }}:</b> {{ $company->present()->Name() }}</b>
+<br>
+@endif
 @if ($manager)
     <b>{{ trans('general.manager') }}</b> {{ $manager->present()->fullName() }}<br>
 @endif
@@ -126,7 +130,7 @@
     	
     	@foreach ($assets as $asset)
             @php
-                if($snipeSettings->show_archived_in_list != 1 && $asset->assetstatus->archived == 1){
+                if($snipeSettings->show_archived_in_list != 1 && $asset->assetstatus?->archived == 1){
                     continue;
                 }
             @endphp
diff --git a/resources/views/locations/view.blade.php b/resources/views/locations/view.blade.php
index c6aa083bf5..ba2de6791f 100644
--- a/resources/views/locations/view.blade.php
+++ b/resources/views/locations/view.blade.php
@@ -9,6 +9,10 @@
 @parent
 @stop
 
+@section('header_right')
+<a href="{{ route('locations.index') }}" class="btn btn-primary" style="margin-right: 10px;">
+    {{ trans('general.back') }}</a>
+@endsection
 {{-- Page content --}}
 @section('content')
 
@@ -18,168 +22,226 @@
       <div class="nav-tabs-custom">
           <ul class="nav nav-tabs hidden-print">
 
-              <li class="active">
-                  <a href="#users" data-toggle="tab">
-                        <span class="hidden-lg hidden-md">
-                            <i class="fas fa-users fa-2x"></i>
-                        </span>
-                      <span class="hidden-xs hidden-sm">
-                          {{ trans('general.users') }}
-                          {!! ($location->users->count() > 0 ) ? '<badge class="badge badge-secondary">'.number_format($location->users->count()).'</badge>' : '' !!}
+              @can('view', \App\Models\User::class)
+                  @if ($location->users->count() > 0)
+                      <li class="active">
+                          <a href="#users" data-toggle="tab">
+                              <i class="fa-solid fa-house-user" style="font-size: 17px" aria-hidden="true"></i>
+                              <span class="sr-only">
+                            {{ trans('general.users') }}
+                              </span>
+                              <span class="badge">
+                                {{ number_format($location->users->count()) }}
+                              </span>
+                          </a>
+                      </li>
+                  @endif
+              @endcan
 
+              @can('view', \App\Models\Asset::class)
+                  @if ($location->assets()->AssetsForShow()->count() > 0)
+                      <li>
+                          <a href="#assets" data-toggle="tab" data-tooltip="true" title="{{ trans('admin/locations/message.current_location') }}">
+                              <i class="fa-solid fa-house-laptop" style="font-size: 17px" aria-hidden="true"></i>
+                              <span class="badge">
+                          {{ number_format($location->assets()->AssetsForShow()->count()) }}
+                      </span>
+                              <span class="sr-only">
+                          {{ trans('admin/locations/message.current_location') }}
+                      </span>
+                          </a>
+                      </li>
+                  @endif
+
+                  @if ($location->rtd_assets()->AssetsForShow()->count() > 0)
+                      <li>
+                          <a href="#rtd_assets" data-toggle="tab" data-tooltip="true" title="{{ trans('admin/hardware/form.default_location') }}">
+                              <i class="fa-solid fa-house-flag" style="font-size: 17px" aria-hidden="true"></i>
+                              <span class="badge">
+                          {{ number_format($location->rtd_assets()->AssetsForShow()->count()) }}
+                      </span>
+                              <span class="sr-only">
+                          {{ trans('admin/hardware/form.default_location') }}
+                      </span>
+                          </a>
+                      </li>
+                  @endif
+
+                  @if ($location->assignedAssets()->AssetsForShow()->count() > 0)
+                      <li>
+                          <a href="#assets_assigned" data-toggle="tab" data-tooltip="true" title="{{ trans('admin/locations/message.assigned_assets') }}">
+                              <i class="fas fa-barcode" style="font-size: 17px" aria-hidden="true"></i>
+                              <span class="badge">
+                          {{ number_format($location->assignedAssets()->AssetsForShow()->count()) }}
+                      </span>
+                              <span class="sr-only">
+                          {{ trans('admin/locations/message.assigned_assets') }}
+                      </span>
+                          </a>
+                      </li>
+                  @endif
+              @endcan
+
+                  @can('view', \App\Models\Accessory::class)
+                      @if ($location->accessories->count() > 0)
+                          <li>
+                              <a href="#accessories" data-toggle="tab" data-tooltip="true" title="{{ trans('general.accessories') }}">
+                                  <i class="far fa-keyboard" style="font-size: 17px" aria-hidden="true"></i>
+                                  <span class="badge">
+                                    {{ number_format($location->accessories->count()) }}
+                                  </span>
+                                  <span class="sr-only">
+                                    {{ trans('general.accessories') }}
+                                  </span>
+                              </a>
+                          </li>
+                      @endif
+
+                      @if ($location->assignedAccessories->count() > 0)
+                          <li>
+                              <a href="#accessories_assigned" data-toggle="tab" data-tooltip="true" title="{{ trans('general.accessories_assigned') }}">
+                                  <i class="fas fa-keyboard" style="font-size: 17px" aria-hidden="true"></i>
+                                  <span class="badge">
+                                      {{ number_format($location->assignedAccessories->count()) }}
+                                  </span>
+                                  <span class="sr-only">
+                                      {{ trans('general.accessories_assigned') }}
+                                  </span>
+                              </a>
+                          </li>
+                      @endif
+                  @endcan
+
+
+              @can('view', \App\Models\Consumable::class)
+                      @if ($location->consumables->count() > 0)
+                          <li>
+                              <a href="#consumables" data-toggle="tab" data-tooltip="true" title="{{ trans('general.consumables') }}">
+                                  <i class="fas fa-tint" style="font-size: 17px" aria-hidden="true"></i>
+                                  <span class="badge">
+                              {{ number_format($location->consumables->count()) }}
+                          </span>
+                                  <span class="sr-only">
+                              {{ trans('general.consumables') }}
+                          </span>
+                              </a>
+                          </li>
+                      @endif
+                  @endcan
+
+                  @can('view', \App\Models\Component::class)
+                      @if ($location->components->count() > 0)
+                          <li>
+                              <a href="#components" data-toggle="tab" data-tooltip="true" title="{{ trans('general.components') }}">
+                                  <i class="fas fa-hdd" style="font-size: 17px" aria-hidden="true"></i>
+                                  <span class="badge">
+                                    {{ number_format($location->components->count()) }}
+                                  </span>
+                                  <span class="sr-only">
+                                    {{ trans('general.components') }}
+                                  </span>
+                              </a>
+                          </li>
+                      @endif
+                  @endcan
+
+              @if ($location->uploads->count() > 0 )
+              <li>
+                  <a href="#files" data-toggle="tab">
+
+                    <span class="hidden-lg hidden-md">
+                      <i class="fas fa-barcode fa-2x"></i>
+                    </span>
+                      <span class="hidden-xs hidden-sm">
+                        {{ trans('general.files') }}
+                          {!! ($location->uploads->count() > 0 ) ? '<badge class="badge badge-secondary">'.number_format($location->uploads->count()).'</badge>' : '' !!}
                       </span>
                   </a>
               </li>
+              @endif
 
               <li>
-                  <a href="#assets" data-toggle="tab">
-                    <span class="hidden-lg hidden-md">
-                        <i class="fas fa-barcode fa-2x" aria-hidden="true"></i>
-                    </span>
-                    <span class="hidden-xs hidden-sm">
-                          {{ trans('admin/locations/message.current_location') }}
-                          {!! ($location->assets()->AssetsForShow()->count() > 0 ) ? '<badge class="badge badge-secondary">'.number_format($location->assets()->AssetsForShow()->count()).'</badge>' : '' !!}
-                    </span>
-                  </a>
-              </li>
-
-
-              <li>
-                  <a href="#rtd_assets" data-toggle="tab">
-                    <span class="hidden-lg hidden-md">
-                        <i class="fas fa-barcode fa-2x" aria-hidden="true"></i>
-                    </span>
-                      <span class="hidden-xs hidden-sm">
-                          {{ trans('admin/hardware/form.default_location') }}
-                          {!! ($location->rtd_assets()->AssetsForShow()->count() > 0 ) ? '<badge class="badge badge-secondary">'.number_format($location->rtd_assets()->AssetsForShow()->count()).'</badge>' : '' !!}
-                    </span>
-                  </a>
-              </li>
-
-              <li>
-                  <a href="#assets_assigned" data-toggle="tab">
-                    <span class="hidden-lg hidden-md">
-                        <i class="fas fa-barcode fa-2x" aria-hidden="true"></i>
-                    </span>
-                      <span class="hidden-xs hidden-sm">
-                          {{ trans('admin/locations/message.assigned_assets') }}
-                          {!! ($location->assignedAssets()->AssetsForShow()->count() > 0 ) ? '<badge class="badge badge-secondary">'.number_format($location->assignedAssets()->AssetsForShow()->count()).'</badge>' : '' !!}
-                    </span>
-                  </a>
-              </li>
-
-
-              <li>
-                  <a href="#accessories" data-toggle="tab">
-                    <span class="hidden-lg hidden-md">
-                        <i class="fas fa-keyboard fa-2x" aria-hidden="true"></i>
-                    </span>
-                      <span class="hidden-xs hidden-sm">
-                          {{ trans('general.accessories') }}
-                          {!! ($location->accessories->count() > 0 ) ? '<badge class="badge badge-secondary">'.number_format($location->accessories->count()).'</badge>' : '' !!}
-                    </span>
-                  </a>
-              </li>
-
-              <li>
-                  <a href="#consumables" data-toggle="tab">
-                    <span class="hidden-lg hidden-md">
-                        <i class="fas fa-tint fa-2x" aria-hidden="true"></i>
-                    </span>
-                      <span class="hidden-xs hidden-sm">
-                          {{ trans('general.consumables') }}
-                          {!! ($location->consumables->count() > 0 ) ? '<badge class="badge badge-secondary">'.number_format($location->consumables->count()).'</badge>' : '' !!}
-                    </span>
-                  </a>
-              </li>
-
-              <li>
-                  <a href="#components" data-toggle="tab">
-                    <span class="hidden-lg hidden-md">
-                        <i class="fas fa-hdd fa-2x" aria-hidden="true"></i>
-                    </span>
-                      <span class="hidden-xs hidden-sm">
-                          {{ trans('general.components') }}
-                          {!! ($location->components->count() > 0 ) ? '<badge class="badge badge-secondary">'.number_format($location->components->count()).'</badge>' : '' !!}
-                    </span>
-                  </a>
-              </li>
-              
-              <li>
-                  <a href="#history" data-toggle="tab">
-                    <span class="hidden-lg hidden-md">
-                        <i class="fas fa-hdd fa-2x" aria-hidden="true"></i>
-                    </span>
-                      <span class="hidden-xs hidden-sm">
+                  <a href="#history" data-toggle="tab" data-toggle="tab" data-tooltip="true" title="{{ trans('general.history') }}">
+                      <i class="fa-solid fa-clock-rotate-left" style="font-size: 17px" aria-hidden="true"></i>
+                      <span class="sr-only">
                           {{ trans('general.history') }}
                     </span>
                   </a>
               </li>
+
+              @can('update', $location)
+              <li class="pull-right">
+                  <a href="#" data-toggle="modal" data-target="#uploadFileModal">
+                      <x-icon type="paperclip" />
+                      {{ trans('button.upload') }}
+                  </a>
+              </li>
+              @endcan
           </ul>
 
 
           <div class="tab-content">
-              <div class="tab-pane active" id="users">
-                    <h2 class="box-title">{{ trans('general.users') }}</h2>
-                      <div class="table table-responsive">
-                          @include('partials.users-bulk-actions')
-                          <table
-                                  data-columns="{{ \App\Presenters\UserPresenter::dataTableLayout() }}"
-                                  data-cookie-id-table="usersTable"
-                                  data-pagination="true"
-                                  data-id-table="usersTable"
-                                  data-search="true"
-                                  data-side-pagination="server"
-                                  data-show-columns="true"
-                                  data-show-export="true"
-                                  data-show-refresh="true"
-                                  data-sort-order="asc"
-                                  data-toolbar="#userBulkEditToolbar"
-                                  data-bulk-button-id="#bulkUserEditButton"
-                                  data-bulk-form-id="#usersBulkForm"
-                                  data-click-to-select="true"
-                                  id="usersTable"
-                                  class="table table-striped snipe-table"
-                                  data-url="{{route('api.users.index', ['location_id' => $location->id])}}"
-                                  data-export-options='{
+              @can('view', \App\Models\User::class)
+                    <div id="users" @class(['tab-pane','active' => $location->users->count() > 0 ]) >
+              @endcan
+                  <h2 class="box-title">{{ trans('general.users') }}</h2>
+                      @include('partials.users-bulk-actions')
+                      <table
+                              data-columns="{{ \App\Presenters\UserPresenter::dataTableLayout() }}"
+                              data-cookie-id-table="usersTable"
+                              data-pagination="true"
+                              data-id-table="usersTable"
+                              data-search="true"
+                              data-search-highlight="true"
+                              data-show-print="true"
+                              data-side-pagination="server"
+                              data-show-columns="true"
+                              data-show-export="true"
+                              data-show-refresh="true"
+                              data-sort-order="asc"
+                              data-toolbar="#userBulkEditToolbar"
+                              data-bulk-button-id="#bulkUserEditButton"
+                              data-bulk-form-id="#usersBulkForm"
+                              data-click-to-select="true"
+                              id="usersTable"
+                              class="table table-striped snipe-table"
+                              data-url="{{route('api.users.index', ['location_id' => $location->id])}}"
+                              data-export-options='{
                               "fileName": "export-locations-{{ str_slug($location->name) }}-users-{{ date('Y-m-d') }}",
                               "ignoreColumn": ["actions","image","change","checkbox","checkincheckout","icon"]
                               }'>
+                      </table>
+                    </div><!-- /.tab-pane -->
+                <div id="assets" @class(['tab-pane', 'active' => $location->users->count() == 0]) >
 
-                          </table>
-                      </div><!-- /.table-responsive -->
-              </div><!-- /.tab-pane -->
+                  <h2 class="box-title">{{ trans('admin/locations/message.current_location') }}</h2>
 
-              <div class="tab-pane" id="assets">
-                      <h2 class="box-title">{{ trans('admin/locations/message.current_location') }}</h2>
-
-                      <div class="table table-responsive">
-                          @include('partials.asset-bulk-actions')
-                          <table
-                                  data-columns="{{ \App\Presenters\AssetPresenter::dataTableLayout() }}"
-                                  data-cookie-id-table="assetsListingTable"
-                                  data-pagination="true"
-                                  data-id-table="assetsListingTable"
-                                  data-search="true"
-                                  data-side-pagination="server"
-                                  data-show-columns="true"
-                                  data-show-export="true"
-                                  data-show-refresh="true"
-                                  data-sort-order="asc"
-                                  data-toolbar="#assetsBulkEditToolbar"
-                                  data-bulk-button-id="#bulkAssetEditButton"
-                                  data-bulk-form-id="#assetsBulkForm"
-                                  data-click-to-select="true"
-                                  id="assetsListingTable"
-                                  class="table table-striped snipe-table"
-                                  data-url="{{route('api.assets.index', ['location_id' => $location->id]) }}"
-                                  data-export-options='{
+                      @include('partials.asset-bulk-actions')
+                      <table
+                              data-columns="{{ \App\Presenters\AssetPresenter::dataTableLayout() }}"
+                              data-cookie-id-table="assetsListingTable"
+                              data-pagination="true"
+                              data-id-table="assetsListingTable"
+                              data-search="true"
+                              data-search-highlight="true"
+                              data-show-print="true"
+                              data-side-pagination="server"
+                              data-show-columns="true"
+                              data-show-export="true"
+                              data-show-refresh="true"
+                              data-sort-order="asc"
+                              data-toolbar="#assetsBulkEditToolbar"
+                              data-bulk-button-id="#bulkAssetEditButton"
+                              data-bulk-form-id="#assetsBulkForm"
+                              data-click-to-select="true"
+                              id="assetsListingTable"
+                              class="table table-striped snipe-table"
+                              data-url="{{route('api.assets.index', ['location_id' => $location->id]) }}"
+                              data-export-options='{
                               "fileName": "export-locations-{{ str_slug($location->name) }}-assets-{{ date('Y-m-d') }}",
                               "ignoreColumn": ["actions","image","change","checkbox","checkincheckout","icon"]
                               }'>
-                          </table>
-
-                      </div><!-- /.table-responsive -->
+                      </table>
               </div><!-- /.tab-pane -->
 
               <div class="tab-pane" id="assets_assigned">
@@ -187,14 +249,16 @@
                       {{ trans('admin/locations/message.assigned_assets') }}
                   </h2>
 
-                  <div class="table table-responsive">
                       @include('partials.asset-bulk-actions', ['id_divname' => 'AssignedAssetsBulkEditToolbar', 'id_formname' => 'assignedAssetsBulkForm', 'id_button' => 'AssignedbulkAssetEditButton'])
                       <table
+                              role="table"
                               data-columns="{{ \App\Presenters\AssetPresenter::dataTableLayout() }}"
                               data-cookie-id-table="assetsAssignedListingTable"
                               data-pagination="true"
                               data-id-table="assetsAssignedListingTable"
                               data-search="true"
+                              data-search-highlight="true"
+                              data-show-print="true"
                               data-side-pagination="server"
                               data-show-columns="true"
                               data-show-export="true"
@@ -204,29 +268,29 @@
                               data-bulk-button-id="#AssignedbulkAssetEditButton"
                               data-bulk-form-id="#assignedAssetsBulkForm"
                               data-click-to-select="true"
-                              id="assetsListingTable"
+                              id="assetsAssignedListingTable"
                               class="table table-striped snipe-table"
-                              data-url="{{route('api.assets.index', ['assigned_to' => $location->id, 'assigned_type' => \App\Models\Location::class]) }}"
+                              data-url="{{route('api.assets.index', ['assigned_to' => $location->id, 'assigned_type' => 'App\Models\Location']) }}"
                               data-export-options='{
                               "fileName": "export-locations-{{ str_slug($location->name) }}-assets-{{ date('Y-m-d') }}",
                               "ignoreColumn": ["actions","image","change","checkbox","checkincheckout","icon"]
                               }'>
                       </table>
-
-                  </div><!-- /.table-responsive -->
               </div><!-- /.tab-pane -->
 
               <div class="tab-pane" id="rtd_assets">
                   <h2 class="box-title">{{ trans('admin/hardware/form.default_location') }}</h2>
 
-                  <div class="table table-responsive">
                       @include('partials.asset-bulk-actions', ['id_divname' => 'RTDassetsBulkEditToolbar', 'id_formname' => 'RTDassets', 'id_button' => 'RTDbulkAssetEditButton'])
                       <table
+                              role="table"
                               data-columns="{{ \App\Presenters\AssetPresenter::dataTableLayout() }}"
                               data-cookie-id-table="RTDassetsListingTable"
                               data-pagination="true"
                               data-id-table="RTDassetsListingTable"
                               data-search="true"
+                              data-search-highlight="true"
+                              data-show-print="true"
                               data-side-pagination="server"
                               data-show-columns="true"
                               data-show-export="true"
@@ -244,21 +308,21 @@
                               "ignoreColumn": ["actions","image","change","checkbox","checkincheckout","icon"]
                               }'>
                       </table>
-
-                  </div><!-- /.table-responsive -->
               </div><!-- /.tab-pane -->
               
 
 
               <div class="tab-pane" id="accessories">
                   <h2 class="box-title">{{ trans('general.accessories') }}</h2>
-                  <div class="table table-responsive">
                       <table
+                              role="table"
                               data-columns="{{ \App\Presenters\AccessoryPresenter::dataTableLayout() }}"
                               data-cookie-id-table="accessoriesListingTable"
                               data-pagination="true"
                               data-id-table="accessoriesListingTable"
                               data-search="true"
+                              data-search-highlight="true"
+                              data-show-print="true"
                               data-side-pagination="server"
                               data-show-columns="true"
                               data-show-export="true"
@@ -272,20 +336,50 @@
                               "ignoreColumn": ["actions","image","change","checkbox","checkincheckout","icon"]
                               }'>
                       </table>
-                  </div><!-- /.table-responsive -->
+              </div><!-- /.tab-pane -->
+
+              <div class="tab-pane" id="accessories_assigned">
+                      <h2 class="box-title" style="float:left">
+                          {{ trans('general.accessories_assigned') }}
+                      </h2>
+
+                      <table
+                              role="table"
+                              data-columns="{{ \App\Presenters\LocationPresenter::assignedAccessoriesDataTableLayout() }}"
+                              data-cookie-id-table="accessoriesAssignedListingTable"
+                              data-pagination="true"
+                              data-id-table="accessoriesAssignedListingTable"
+                              data-search="true"
+                              data-search-highlight="true"
+                              data-show-print="true"
+                              data-side-pagination="server"
+                              data-show-columns="true"
+                              data-show-export="true"
+                              data-show-refresh="true"
+                              data-sort-order="asc"
+                              data-click-to-select="true"
+                              id="accessoriesAssignedListingTable"
+                              class="table table-striped snipe-table"
+                              data-url="{{ route('api.locations.assigned_accessories', ['location' => $location]) }}"
+                              data-export-options='{
+                              "fileName": "export-locations-{{ str_slug($location->name) }}-accessories-{{ date('Y-m-d') }}",
+                              "ignoreColumn": ["actions","image","change","checkbox","checkincheckout","icon"]
+                              }'>
+                      </table>
               </div><!-- /.tab-pane -->
 
 
               <div class="tab-pane" id="consumables">
                   <h2 class="box-title">{{ trans('general.consumables') }}</h2>
-
-                      <div class="table table-responsive">
                           <table
+                                  role="table"
                                   data-columns="{{ \App\Presenters\ConsumablePresenter::dataTableLayout() }}"
                                   data-cookie-id-table="consumablesListingTable"
                                   data-pagination="true"
                                   data-id-table="consumablesListingTable"
                                   data-search="true"
+                                  data-search-highlight="true"
+                                  data-show-print="true"
                                   data-side-pagination="server"
                                   data-show-columns="true"
                                   data-show-export="true"
@@ -299,20 +393,19 @@
                               "ignoreColumn": ["actions","image","change","checkbox","checkincheckout","icon"]
                               }'>
                           </table>
-
-                      </div><!-- /.table-responsive -->
               </div><!-- /.tab-pane -->
 
               <div class="tab-pane" id="components">
                   <h2 class="box-title">{{ trans('general.components') }}</h2>
-                      <div class="table table-responsive">
-
                           <table
+                                  role="table"
                                   data-columns="{{ \App\Presenters\ComponentPresenter::dataTableLayout() }}"
                                   data-cookie-id-table="componentsTable"
                                   data-pagination="true"
                                   data-id-table="componentsTable"
                                   data-search="true"
+                                  data-search-highlight="true"
+                                  data-show-print="true"
                                   data-side-pagination="server"
                                   data-show-columns="true"
                                   data-show-export="true"
@@ -325,11 +418,25 @@
                               "fileName": "export-locations-{{ str_slug($location->name) }}-components-{{ date('Y-m-d') }}",
                               "ignoreColumn": ["actions","image","change","checkbox","checkincheckout","icon"]
                               }'>
-
                           </table>
-                      </div><!-- /.table-responsive -->
               </div><!-- /.tab-pane -->
 
+                  <div class="tab-pane fade" id="files">
+
+                      <div class="row">
+                          <div class="col-md-12">
+
+                              <x-filestable
+                                      filepath="private_uploads/locations/"
+                                      showfile_routename="show/locationsfile"
+                                      deletefile_routename="delete/locationsfile"
+                                      :object="$location" />
+
+                          </div> <!-- /.col-md-12 -->
+                      </div> <!-- /.row -->
+
+                  </div>
+
                 <div class="tab-pane" id="history">
                     <h2 class="box-title">{{ trans('general.history') }}</h2>
                     <!-- checked out assets table -->
@@ -341,6 +448,8 @@
                                     data-pagination="true"
                                     data-id-table="assetHistory"
                                     data-search="true"
+                                    data-search-highlight="true"
+                                    data-show-print="true"
                                     data-side-pagination="server"
                                     data-show-columns="true"
                                     data-show-fullscreen="true"
@@ -360,7 +469,7 @@
                                     <tr>
                                         <th data-visible="true" data-field="icon" style="width: 40px;" class="hidden-xs" data-formatter="iconFormatter">{{ trans('admin/hardware/table.icon') }}</th>
                                         <th class="col-sm-2" data-visible="true" data-field="action_date" data-formatter="dateDisplayFormatter">{{ trans('general.date') }}</th>
-                                        <th class="col-sm-1" data-visible="true" data-field="admin" data-formatter="usersLinkObjFormatter">{{ trans('general.admin') }}</th>
+                                        <th class="col-sm-1" data-visible="true" data-field="admin" data-formatter="usersLinkObjFormatter">{{ trans('general.created_by') }}</th>
                                         <th class="col-sm-1" data-visible="true" data-field="action_type">{{ trans('general.action') }}</th>
                                         <th class="col-sm-2" data-visible="true" data-field="item" data-formatter="polymorphicItemFormatter">{{ trans('general.item') }}</th>
                                         <th class="col-sm-2" data-visible="true" data-field="target" data-formatter="polymorphicItemFormatter">{{ trans('general.target') }}</th>
@@ -381,65 +490,146 @@
 
   <div class="col-md-3">
 
-      <div class="col-md-12">
-          <a href="{{ route('locations.edit', ['location' => $location->id]) }}" style="width: 100%;" class="btn btn-sm btn-primary pull-left">{{ trans('admin/locations/table.update') }} </a>
-      </div>
-      <div class="col-md-12" style="padding-top: 5px;">
-          <a href="{{ route('locations.print_assigned', ['locationId' => $location->id]) }}" style="width: 100%;" class="btn btn-sm btn-default pull-left">{{ trans('admin/locations/table.print_assigned') }} </a>
-      </div>
-      <div class="col-md-12" style="padding-top: 5px; padding-bottom: 20px;">
-          <a href="{{ route('locations.print_all_assigned', ['locationId' => $location->id]) }}" style="width: 100%;" class="btn btn-sm btn-default pull-left">{{ trans('admin/locations/table.print_all_assigned') }} </a>
-      </div>
+      @if ($location->image!='')
+          <div class="col-md-12 text-center" style="padding-bottom: 17px;">
+              <img src="{{ Storage::disk('public')->url('locations/'.e($location->image)) }}" class="img-responsive img-thumbnail" style="width:100%" alt="{{ $location->name }}">
+          </div>
+      @endif
 
+      @if (($location->state!='') && ($location->country!='') && (config('services.google.maps_api_key')))
+          <div class="col-md-12 text-center" style="padding-bottom: 10px;">
+              <img src="https://maps.googleapis.com/maps/api/staticmap?markers={{ urlencode($location->address.','.$location->city.' '.$location->state.' '.$location->country.' '.$location->zip) }}&size=700x500&maptype=roadmap&key={{ config('services.google.maps_api_key') }}" class="img-thumbnail" style="width:100%" alt="Map">
+          </div>
+      @endif
 
-    @if ($location->image!='')
-      <div class="col-md-12 text-center" style="padding-bottom: 20px;">
-        <img src="{{ Storage::disk('public')->url('locations/'.e($location->image)) }}" class="img-responsive img-thumbnail" style="width:100%" alt="{{ $location->name }}">
-      </div>
-    @endif
       <div class="col-md-12">
-        <ul class="list-unstyled" style="line-height: 25px; padding-bottom: 20px;">
-          @if ($location->address!='')
-            <li>{{ $location->address }}</li>
-           @endif
-            @if ($location->address2!='')
-              <li>{{ $location->address2 }}</li>
-            @endif
-            @if (($location->city!='') || ($location->state!='') || ($location->zip!=''))
-              <li>{{ $location->city }} {{ $location->state }} {{ $location->zip }}</li>
-            @endif
-            @if ($location->manager)
-              <li>{{ trans('admin/users/table.manager') }}: {!! $location->manager->present()->nameUrl() !!}</li>
-            @endif
-            @if ($location->parent)
-              <li>{{ trans('admin/locations/table.parent') }}: {!! $location->parent->present()->nameUrl() !!}</li>
-            @endif
+
+          <ul class="list-unstyled" style="line-height: 22px; padding-bottom: 20px;">
+
+              @if ($location->notes)
+                  <li>
+                      <strong>{{ trans('general.notes') }}</strong>:
+                      {!! nl2br(Helper::parseEscapedMarkedownInline($location->notes)) !!}
+                  </li>
+              @endif
+
+              @if ($location->address!='')
+                  <li>{{ $location->address }}</li>
+              @endif
+              @if ($location->address2!='')
+                  <li>{{ $location->address2 }}</li>
+              @endif
+              @if (($location->city!='') || ($location->state!='') || ($location->zip!=''))
+                  <li>{{ $location->city }} {{ $location->state }} {{ $location->zip }}</li>
+              @endif
+              @if ($location->manager)
+                  <li>{{ trans('admin/users/table.manager') }}: {!! $location->manager->present()->nameUrl() !!}</li>
+              @endif
+              @if ($location->company)
+                  <li>{{ trans('admin/companies/table.name') }}: {!! $location->company->present()->nameUrl() !!}</li>
+              @endif
+              @if ($location->parent)
+                  <li>{{ trans('admin/locations/table.parent') }}: {!! $location->parent->present()->nameUrl() !!}</li>
+              @endif
               @if ($location->ldap_ou)
                   <li>{{ trans('admin/locations/table.ldap_ou') }}: {{ $location->ldap_ou }}</li>
               @endif
-        </ul>
 
-        @if (($location->state!='') && ($location->country!='') && (config('services.google.maps_api_key')))
-          <div class="col-md-12 text-center">
-            <img src="https://maps.googleapis.com/maps/api/staticmap?markers={{ urlencode($location->address.','.$location->city.' '.$location->state.' '.$location->country.' '.$location->zip) }}&size=700x500&maptype=roadmap&key={{ config('services.google.maps_api_key') }}" class="img-thumbnail" style="width:100%" alt="Map">
-          </div>
-        @endif
 
+              @if ((($location->address!='') && ($location->city!='')) || ($location->state!='') || ($location->country!=''))
+                      <li>
+                        <a href="https://maps.google.com/?q={{ urlencode($location->address.','. $location->city.','.$location->state.','.$location->country.','.$location->zip) }}" target="_blank">
+                            {!! trans('admin/locations/message.open_map', ['map_provider_icon' => '<i class="fa-brands fa-google" aria-hidden="true"></i>']) !!}
+                            <x-icon type="external-link"/>
+                        </a>
+                      </li>
+                      <li>
+                        <a href="https://maps.apple.com/?q={{ urlencode($location->address.','. $location->city.','.$location->state.','.$location->country.','.$location->zip) }}" target="_blank">
+                            {!! trans('admin/locations/message.open_map', ['map_provider_icon' => '<i class="fa-brands fa-apple" aria-hidden="true" style="font-size: 18px"></i>']) !!}
+                            <x-icon type="external-link"/></a>
+                  </li>
+              @endif
+
+          </ul>
       </div>
 
+      @can('update', $location)
+      <div class="col-md-12">
+          <a href="{{ route('locations.edit', ['location' => $location->id]) }}" style="width: 100%;" class="btn btn-sm btn-warning btn-social">
+              <x-icon type="edit" />
+              {{ trans('admin/locations/table.update') }}
+          </a>
+      </div>
+      @endcan
+
+      <div class="col-md-12" style="padding-top: 5px;">
+          <a href="{{ route('locations.print_assigned', ['locationId' => $location->id]) }}" style="width: 100%;" class="btn btn-sm btn-primary btn-social hidden-print">
+              <x-icon type="print" />
+              {{ trans('admin/locations/table.print_assigned') }}
+          </a>
+      </div>
+      <div class="col-md-12" style="padding-top: 5px;">
+          <a href="{{ route('locations.print_all_assigned', ['locationId' => $location->id]) }}" style="width: 100%;" class="btn btn-sm btn-primary btn-social hidden-print">
+              <x-icon type="print" />
+              {{ trans('admin/locations/table.print_all_assigned') }}
+          </a>
+      </div>
+
+          @can('delete', $location)
+              <div class="col-md-12 hidden-print" style="padding-top: 10px;">
+
+            @if ($location->deleted_at=='')
+
+                @if ($location->isDeletable())
+                      <button class="btn btn-sm btn-block btn-danger btn-social delete-location" data-toggle="modal" data-title="{{ trans('general.delete') }}" data-content="{{ trans('general.sure_to_delete_var', ['item' => $location->name]) }}" data-target="#dataConfirmModal">
+                          <x-icon type="delete" />
+                          {{ trans('general.delete') }}
+                      </button>
+                @else
+                      <a href="#" class="btn btn-block btn-sm btn-danger btn-social hidden-print disabled" data-tooltip="true"  data-placement="top" data-title="{{ trans('general.cannot_be_deleted') }}">
+                          <x-icon type="delete" />
+                          {{ trans('general.delete') }}
+                      </a>
+                @endif
+
+            @else
+                  <form method="POST" action="{{ route('locations.restore', ['location' => $location->id]) }}">
+                      @csrf
+                      <button class="btn btn-sm btn-block btn-warning btn-social delete-asset">
+                          <x-icon type="restore" />
+                          {{ trans('general.restore') }}
+                      </button>
+                  </form>
+            @endif
+              </div>
+    @endcan
+
 
-		
-  </div>
 
-  </div>
 </div>
+</div>
+
 
 @stop
 
 @section('moar_scripts')
+
+    @can('update', Location::class)
+        @include ('modals.upload-file', ['item_type' => 'locations', 'item_id' => $location->id])
+    @endcan
+
+    <script>
+        $('#dataConfirmModal').on('show.bs.modal', function (event) {
+            var content = $(event.relatedTarget).data('content');
+            var title = $(event.relatedTarget).data('title');
+            $(this).find(".modal-body").text(content);
+            $(this).find(".modal-header").text(title);
+        });
+    </script>
+
 @include ('partials.bootstrap-table', [
-    'exportFile' => 'locations-export',
-    'search' => true
- ])
+'exportFile' => 'locations-export',
+'search' => true
+])
 
 @stop
diff --git a/resources/views/notifications/markdown/checkin-accessory.blade.php b/resources/views/mail/markdown/checkin-accessory.blade.php
similarity index 100%
rename from resources/views/notifications/markdown/checkin-accessory.blade.php
rename to resources/views/mail/markdown/checkin-accessory.blade.php
diff --git a/resources/views/notifications/markdown/checkin-asset.blade.php b/resources/views/mail/markdown/checkin-asset.blade.php
similarity index 89%
rename from resources/views/notifications/markdown/checkin-asset.blade.php
rename to resources/views/mail/markdown/checkin-asset.blade.php
index 74a4381707..82e0137914 100644
--- a/resources/views/notifications/markdown/checkin-asset.blade.php
+++ b/resources/views/mail/markdown/checkin-asset.blade.php
@@ -16,6 +16,9 @@
 @if (($item->name!=$item->asset_tag))
 | **{{ trans('mail.asset_tag') }}** | {{ $item->asset_tag }} |
 @endif
+@if (isset($item->model->category))
+| **{{ trans('general.category') }}** | {{ $item->model->category->name }} |
+@endif
 @if (isset($item->manufacturer))
 | **{{ trans('general.manufacturer') }}** | {{ $item->manufacturer->name }} |
 @endif
@@ -31,6 +34,9 @@
 @if (isset($last_checkout))
 | **{{ trans('mail.checkout_date') }}** | {{ $last_checkout }} |
 @endif
+@if (isset($status))
+| **{{ trans('general.status') }}** | {{ $status }} |
+@endif
 @foreach($fields as $field)
 @if (($item->{ $field->db_column_name() }!='') && ($field->show_in_email) && ($field->field_encrypted=='0'))
 | **{{ $field->name }}** | {{ $item->{ $field->db_column_name() } }} |
diff --git a/resources/views/notifications/markdown/checkin-license.blade.php b/resources/views/mail/markdown/checkin-license.blade.php
similarity index 54%
rename from resources/views/notifications/markdown/checkin-license.blade.php
rename to resources/views/mail/markdown/checkin-license.blade.php
index 0f14c4bfda..75573cf31d 100644
--- a/resources/views/notifications/markdown/checkin-license.blade.php
+++ b/resources/views/mail/markdown/checkin-license.blade.php
@@ -6,15 +6,15 @@
 @component('mail::table')
 |        |          |
 | ------------- | ------------- |
-| **{{ trans('mail.asset_name') }}** | {{ $item->name }} |
-@if (isset($item->manufacturer))
-| **{{ trans('general.manufacturer') }}** | {{ $item->manufacturer->name }} |
+| **{{ trans('mail.asset_name') }}** | {{ $license->name }} |
+@if (isset($license->manufacturer))
+| **{{ trans('general.manufacturer') }}** | {{ $license->manufacturer->name }} |
 @endif
-@if ($target->can('update', $item))
-| **Key** | {{ $item->serial }} |
+@if (($target instanceof \App\Models\User && $target->can('view', $license)) ||($target instanceof \App\Models\Asset && $license_seat->user?->can('view', $license)))
+| **Key** | {{ $license->serial }} |
 @endif
 @if (isset($item->category))
-| **{{ trans('general.category') }}** | {{ $item->category->name }} |
+| **{{ trans('general.category') }}** | {{ $license->category->name }} |
 @endif
 @if ($admin)
 | **{{ trans('general.administrator') }}** | {{ $admin->present()->fullName() }} |
diff --git a/resources/views/notifications/markdown/checkout-accessory.blade.php b/resources/views/mail/markdown/checkout-accessory.blade.php
similarity index 94%
rename from resources/views/notifications/markdown/checkout-accessory.blade.php
rename to resources/views/mail/markdown/checkout-accessory.blade.php
index a3126f7aae..836f574133 100644
--- a/resources/views/notifications/markdown/checkout-accessory.blade.php
+++ b/resources/views/mail/markdown/checkout-accessory.blade.php
@@ -20,6 +20,9 @@
 @if (isset($item->model_no))
 | **{{ trans('general.model_no') }}** | {{ $item->model_no }} |
 @endif
+@if (isset($checkout_qty))
+| **{{ trans('general.qty') }}** | {{ $checkout_qty }} |
+@endif
 @if ($note)
 | **{{ trans('mail.additional_notes') }}** | {{ $note }} |
 @endif
diff --git a/resources/views/notifications/markdown/checkout-asset.blade.php b/resources/views/mail/markdown/checkout-asset.blade.php
similarity index 90%
rename from resources/views/notifications/markdown/checkout-asset.blade.php
rename to resources/views/mail/markdown/checkout-asset.blade.php
index 4646cef482..1bcbe462ba 100644
--- a/resources/views/notifications/markdown/checkout-asset.blade.php
+++ b/resources/views/mail/markdown/checkout-asset.blade.php
@@ -1,7 +1,7 @@
 @component('mail::message')
 # {{ trans('mail.hello') }} {{ $target->present()->fullName() }},
 
-{{ trans('mail.new_item_checked') }}
+{{ $introduction_line }}
 
 @if (($snipeSettings->show_images_in_email =='1') && $item->getImageUrl())
 <center><img src="{{ $item->getImageUrl() }}" alt="Asset" style="max-width: 570px;"></center>
@@ -16,6 +16,9 @@
 @if (($item->name!=$item->asset_tag))
 | **{{ trans('mail.asset_tag') }}** | {{ $item->asset_tag }} |
 @endif
+@if (isset($item->model->category))
+| **{{ trans('general.category') }}** | {{ $item->model->category->name }} |
+@endif
 @if (isset($item->manufacturer))
 | **{{ trans('general.manufacturer') }}** | {{ $item->manufacturer->name }} |
 @endif
@@ -31,6 +34,9 @@
 @if (isset($last_checkout))
 | **{{ trans('mail.checkout_date') }}** | {{ $last_checkout }} |
 @endif
+@if (isset($status))
+| **{{ trans('general.status') }}** | {{ $status }} |
+@endif
 @if ((isset($expected_checkin)) && ($expected_checkin!=''))
 | **{{ trans('mail.expecting_checkin_date') }}** | {{ $expected_checkin }} |
 @endif
diff --git a/resources/views/notifications/markdown/checkout-consumable.blade.php b/resources/views/mail/markdown/checkout-consumable.blade.php
similarity index 89%
rename from resources/views/notifications/markdown/checkout-consumable.blade.php
rename to resources/views/mail/markdown/checkout-consumable.blade.php
index 06e73243ca..0c8571acf5 100644
--- a/resources/views/notifications/markdown/checkout-consumable.blade.php
+++ b/resources/views/mail/markdown/checkout-consumable.blade.php
@@ -11,9 +11,15 @@
 | **{{ trans('mail.checkout_date') }}** | {{ $checkout_date }} |
 @endif
 | **{{ trans('general.consumable') }}** | {{ $item->name }} |
+@if (isset($qty))
+| **{{ trans('general.qty') }}** | {{ $qty }} |
+@endif
 @if (isset($item->manufacturer))
 | **{{ trans('general.manufacturer') }}** | {{ $item->manufacturer->name }} |
 @endif
+@if (isset($qty))
+| **{{ trans('general.qty') }}** | {{ $qty }} |
+@endif
 @if (isset($item->model_no))
 | **{{ trans('general.model_no') }}** | {{ $item->model_no }} |
 @endif
diff --git a/resources/views/notifications/markdown/checkout-license.blade.php b/resources/views/mail/markdown/checkout-license.blade.php
similarity index 68%
rename from resources/views/notifications/markdown/checkout-license.blade.php
rename to resources/views/mail/markdown/checkout-license.blade.php
index 08e1e5c763..5d982d1b1b 100644
--- a/resources/views/notifications/markdown/checkout-license.blade.php
+++ b/resources/views/mail/markdown/checkout-license.blade.php
@@ -9,15 +9,15 @@
 @if (isset($checkout_date))
 | **{{ trans('mail.checkout_date') }}** | {{ $checkout_date }} |
 @endif
-| **{{ trans('general.license') }}** | {{ $item->name }} |
-@if (isset($item->manufacturer))
-| **{{ trans('general.manufacturer') }}** | {{ $item->manufacturer->name }} |
+| **{{ trans('general.license') }}** | {{ $license->name}} |
+@if (isset($license->manufacturer))
+| **{{ trans('general.manufacturer') }}** | {{ $license->manufacturer->name }} |
 @endif
-@if (isset($item->category))
-| **{{ trans('general.category') }}** | {{ $item->category->name }} |
+@if (isset($license->category))
+| **{{ trans('general.category') }}** | {{ $license->category->name }} |
 @endif
-@if ($target->can('view', $item))
-| **Key** | {{ $item->serial }} |
+@if (($target instanceof \App\Models\User && $target->can('view', $license)) || ($target instanceof \App\Models\Asset && $license_seat->user?->can('view', $license)))
+| **Key** | {{ $license->serial }} |
 @endif
 @if ($note)
 | **{{ trans('mail.additional_notes') }}** | {{ $note }} |
diff --git a/resources/views/manufacturers/edit.blade.php b/resources/views/manufacturers/edit.blade.php
index b5429e5f34..1c9b807776 100755
--- a/resources/views/manufacturers/edit.blade.php
+++ b/resources/views/manufacturers/edit.blade.php
@@ -25,7 +25,7 @@
         <label for="support_url" class="col-md-3 control-label">{{ trans('admin/manufacturers/table.support_url') }}
         </label>
         <div class="col-md-6">
-            <input class="form-control" type="text" name="support_url" id="support_url" value="{{ old('support_url', $item->support_url) }}" />
+            <input class="form-control" type="url" name="support_url" id="support_url" value="{{ old('support_url', $item->support_url) }}" />
             {!! $errors->first('support_url', '<span class="alert-msg" aria-hidden="true"><i class="fas fa-times" aria-hidden="true"></i> :message</span>') !!}
         </div>
     </div>
@@ -35,7 +35,7 @@
         <label for="support_url" class="col-md-3 control-label">{{ trans('admin/manufacturers/table.warranty_lookup_url') }}
         </label>
         <div class="col-md-6">
-            <input class="form-control" type="text" name="warranty_lookup_url" id="warranty_lookup_url" value="{{ old('warranty_lookup_url', $item->warranty_lookup_url) }}" />
+            <input class="form-control" type="url" name="warranty_lookup_url" id="warranty_lookup_url" value="{{ old('warranty_lookup_url', $item->warranty_lookup_url) }}" />
             <p class="help-block">{!! trans('admin/manufacturers/message.support_url_help') !!}</p>
             {!! $errors->first('warranty_lookup_url', '<span class="alert-msg" aria-hidden="true"><i class="fas fa-times" aria-hidden="true"></i> :message</span>') !!}
         </div>
@@ -63,6 +63,21 @@
 
 @include ('partials.forms.edit.image-upload', ['image_path' => app('manufacturers_upload_path')])
 
+<div class="form-group{!! $errors->has('notes') ? ' has-error' : '' !!}">
+    <label for="notes" class="col-md-3 control-label">{{ trans('general.notes') }}</label>
+    <div class="col-md-8">
+        <x-input.textarea
+                name="notes"
+                id="notes"
+                :value="old('notes', $item->notes)"
+                placeholder="{{ trans('general.placeholders.notes') }}"
+                aria-label="notes"
+                rows="5"
+        />
+        {!! $errors->first('notes', '<span class="alert-msg" aria-hidden="true"><i class="fas fa-times" aria-hidden="true"></i> :message</span>') !!}
+    </div>
+</div>
+
 
 
 @stop
diff --git a/resources/views/manufacturers/index.blade.php b/resources/views/manufacturers/index.blade.php
index e7afd91ddf..25663a5990 100755
--- a/resources/views/manufacturers/index.blade.php
+++ b/resources/views/manufacturers/index.blade.php
@@ -25,42 +25,62 @@
 {{-- Page content --}}
 @section('content')
 
-<div class="row">
-  <div class="col-md-12">
-    <div class="box box-default">
-      <div class="box-body">
-        <div class="table-responsive">
+  <div class="row">
+    <div class="col-md-12">
 
-          <table
-            data-columns="{{ \App\Presenters\ManufacturerPresenter::dataTableLayout() }}"
-            data-cookie-id-table="manufacturersTable"
-            data-pagination="true"
-            data-id-table="manufacturersTable"
-            data-search="true"
-            data-show-footer="true"
-            data-side-pagination="server"
-            data-show-columns="true"
-            data-show-fullscreen="true"
-            data-show-export="true"
-            data-show-refresh="true"
-            data-sort-order="asc"
-            id="manufacturersTable"
-            class="table table-striped snipe-table"
-            data-url="{{route('api.manufacturers.index', ['deleted' => (request('deleted')=='true') ? 'true' : 'false' ]) }}"
-            data-export-options='{
-              "fileName": "export-manufacturers-{{ date('Y-m-d') }}",
-              "ignoreColumn": ["actions","image","change","checkbox","checkincheckout","icon"]
-              }'>
+      <div class="box box-default">
+        <div class="box-body">
 
-          </table>
-        </div>
-      </div><!-- /.box-body -->
-    </div><!-- /.box -->
+    @if ($manufacturer_count == 0)
+
+            <form action="{{ route('manufacturers.seed') }}" method="POST">
+              {{ csrf_field() }}
+            <div class="callout callout-info">
+              <p>
+                  {{ trans('general.seeding.manufacturers.prompt') }}
+                <button class="btn btn-sm btn-primary hidden-print" rel="noopener">
+                  {{ trans('general.seeding.manufacturers.button') }}
+                </button>
+              </p>
+            </div>
+            </form>
+
+      @else
+
+
+            <table
+              data-columns="{{ \App\Presenters\ManufacturerPresenter::dataTableLayout() }}"
+              data-cookie-id-table="manufacturersTable"
+              data-pagination="true"
+              data-id-table="manufacturersTable"
+              data-search="true"
+              data-search-highlight="true"
+              data-show-print="true"
+              data-side-pagination="server"
+              data-show-columns="true"
+              data-show-fullscreen="true"
+              data-show-export="true"
+              data-show-refresh="true"
+              data-sort-order="asc"
+              id="manufacturersTable"
+              class="table table-striped snipe-table"
+              data-url="{{route('api.manufacturers.index', ['deleted' => (request('deleted')=='true') ? 'true' : 'false' ]) }}"
+              data-export-options='{
+                "fileName": "export-manufacturers-{{ date('Y-m-d') }}",
+                "ignoreColumn": ["actions","image","change","checkbox","checkincheckout","icon"]
+                }'>
+            </table>
+
+
+  @endif
+        </div><!-- /.box-body -->
+      </div><!-- /.box -->
+    </div>
   </div>
-</div>
-
 @stop
 
 @section('moar_scripts')
+
+
   @include ('partials.bootstrap-table')
 @stop
diff --git a/resources/views/manufacturers/view.blade.php b/resources/views/manufacturers/view.blade.php
index 5e7bccc633..9a4b8abb18 100644
--- a/resources/views/manufacturers/view.blade.php
+++ b/resources/views/manufacturers/view.blade.php
@@ -35,7 +35,6 @@
         <li class="active">
 
           <a href="#assets" data-toggle="tab">
-
             <span class="hidden-lg hidden-md">
               <i class="fas fa-barcode fa-2x"></i>
             </span>
@@ -43,15 +42,13 @@
                 {{ trans('general.assets') }}
                 {!! ($manufacturer->assets()->AssetsForShow()->count() > 0 ) ? '<badge class="badge badge-secondary">'.number_format($manufacturer->assets()->AssetsForShow()->count()).'</badge>' : '' !!}
             </span>
-
           </a>
 
         </li>
         <li>
           <a href="#licenses" data-toggle="tab">
-
             <span class="hidden-lg hidden-md">
-              <i class="far fa-save fa-2x"></i>
+               <x-icon type="licenses" class="fa-2x" />
             </span>
             <span class="hidden-xs hidden-sm">
               {{ trans('general.licenses') }}
@@ -64,25 +61,37 @@
           <a href="#accessories" data-toggle="tab">
 
              <span class="hidden-lg hidden-md">
-              <i class="far fa-keyboard fa-2x"></i>
+              <x-icon type="accessories" class="fa-2x" />
             </span>
             <span class="hidden-xs hidden-sm">
               {{ trans('general.accessories') }}
               {!! ($manufacturer->accessories->count() > 0 ) ? '<badge class="badge badge-secondary">'.number_format($manufacturer->accessories->count()).'</badge>' : '' !!}
             </span>
-
           </a>
         </li>
         <li>
           <a href="#consumables" data-toggle="tab">
 
              <span class="hidden-lg hidden-md">
-              <i class="fas fa-tint fa-2x"></i>
+               <x-icon type="consumables" class="fa-2x" />
             </span>
             <span class="hidden-xs hidden-sm">
               {{ trans('general.consumables') }}
               {!! ($manufacturer->consumables->count() > 0 ) ? '<badge class="badge badge-secondary">'.number_format($manufacturer->consumables->count()).'</badge>' : '' !!}
             </span>
+          </a>
+        </li>
+
+        <li>
+          <a href="#components" data-toggle="tab">
+
+             <span class="hidden-lg hidden-md">
+               <x-icon type="components" class="fa-2x" />
+            </span>
+            <span class="hidden-xs hidden-sm">
+              {{ trans('general.components') }}
+              {!! ($manufacturer->components->count() > 0 ) ? '<badge class="badge badge-secondary">'.number_format($manufacturer->components->count()).'</badge>' : '' !!}
+            </span>
 
           </a>
         </li>
@@ -102,6 +111,8 @@
                   data-bulk-button-id="#bulkAssetEditButton"
                   data-bulk-form-id="#assetsBulkForm"
                   data-search="true"
+                  data-search-highlight="true"
+                  data-show-print="true"
                   data-show-fullscreen="true"
                   data-side-pagination="server"
                   data-show-columns="true"
@@ -128,6 +139,8 @@
                   data-pagination="true"
                   data-id-table="licensesTable"
                   data-search="true"
+                  data-search-highlight="true"
+                  data-show-print="true"
                   data-show-footer="true"
                   data-side-pagination="server"
                   data-show-columns="true"
@@ -154,6 +167,8 @@
                   data-pagination="true"
                   data-id-table="accessoriesTable"
                   data-search="true"
+                  data-search-highlight="true"
+                  data-show-print="true"
                   data-show-footer="true"
                   data-side-pagination="server"
                   data-show-columns="true"
@@ -180,6 +195,8 @@
                   data-pagination="true"
                   data-id-table="consumablesTable"
                   data-search="true"
+                  data-search-highlight="true"
+                  data-show-print="true"
                   data-show-footer="true"
                   data-side-pagination="server"
                   data-show-columns="true"
@@ -190,12 +207,37 @@
                   class="table table-striped snipe-table"
                   data-url="{{ route('api.consumables.index', ['manufacturer_id' => $manufacturer->id]) }}"
                   data-export-options='{
-              "fileName": "export-manufacturers-{{ str_slug($manufacturer->name) }}-consumabled-{{ date('Y-m-d') }}",
+              "fileName": "export-manufacturers-{{ str_slug($manufacturer->name) }}-consumables-{{ date('Y-m-d') }}",
               "ignoreColumn": ["actions","image","change","checkbox","checkincheckout","icon"]
               }'>
           </table>
 
+        </div> <!-- /.tab-pan consumables-->
 
+        <div class="tab-pane fade" id="components">
+
+          <table
+                  data-columns="{{ \App\Presenters\ComponentPresenter::dataTableLayout() }}"
+                  data-cookie-id-table="componentsTable"
+                  data-pagination="true"
+                  data-id-table="componentsTable"
+                  data-search="true"
+                  data-search-highlight="true"
+                  data-show-print="true"
+                  data-show-footer="true"
+                  data-side-pagination="server"
+                  data-show-columns="true"
+                  data-show-export="true"
+                  data-show-refresh="true"
+                  data-sort-order="asc"
+                  id="componentsTable"
+                  class="table table-striped snipe-table"
+                  data-url="{{ route('api.components.index', ['manufacturer_id' => $manufacturer->id]) }}"
+                  data-export-options='{
+              "fileName": "export-manufacturers-{{ str_slug($manufacturer->name) }}-components-{{ date('Y-m-d') }}",
+              "ignoreColumn": ["actions","image","change","checkbox","checkincheckout","icon"]
+              }'>
+          </table>
 
         </div> <!-- /.tab-pan consumables-->
 
diff --git a/resources/views/modals/add-note.blade.php b/resources/views/modals/add-note.blade.php
new file mode 100644
index 0000000000..8208fc36a9
--- /dev/null
+++ b/resources/views/modals/add-note.blade.php
@@ -0,0 +1,35 @@
+{{-- See snipeit_modals.js for what powers this --}}
+<div class="modal fade" id="createNoteModal" tabindex="-1" role="dialog" aria-labelledby="createNoteModalLabel" aria-hidden="true">
+    <div class="modal-dialog">
+        <div class="modal-content">
+            <div class="modal-header">
+                <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
+                <h2 class="modal-title" id="createNoteModalLabel">{{ trans('general.add_note')  }}</h2>
+            </div>
+            <form
+                method="POST"
+                action="{{ route('notes.store') }}"
+                accept-charset="UTF-8"
+            >
+                @csrf
+                <input type="hidden" name="type" value="{{$type}}"/>
+                <input type="hidden" name="id" value="{{$id}}"/>
+
+                <div class="modal-body">
+                    <div class="alert alert-danger" id="modal_error_msg" style="display:none"></div>
+
+                    <div class="row">
+                        <div class="col-md-12">
+                            <textarea class="form-control" id="note" name="note" required>{{ old('note') }}</textarea>
+                            {!! $errors->first('note', '<span class="alert-msg" aria-hidden="true"><i class="fas fa-times" aria-hidden="true"></i> :message</span>') !!}
+                        </div>
+                    </div>
+                </div>
+                <div class="modal-footer">
+                    <button type="button" class="btn btn-default pull-left" data-dismiss="modal">{{ trans('button.cancel') }}</button>
+                    <button type="submit" class="btn btn-primary pull-right" id="modal-save">{{ trans('general.save') }}</button>
+                </div>
+            </form>
+        </div><!-- /.modal-content -->
+    </div><!-- /.modal-dialog -->
+</div>
diff --git a/resources/views/modals/category.blade.php b/resources/views/modals/category.blade.php
index c07b092ace..c49f44ee5c 100644
--- a/resources/views/modals/category.blade.php
+++ b/resources/views/modals/category.blade.php
@@ -11,19 +11,10 @@
                 {{ csrf_field() }}
                 <div class="alert alert-danger" id="modal_error_msg" style="display:none">
                 </div>
-                <div class="dynamic-form-row">
-                    <div class="col-md-4 col-xs-12"><label for="modal-name">{{ trans('general.name') }}:
-                        </label></div>
-                    <div class="col-md-8 col-xs-12 required">
-                        <input type='text' name='name' id='modal-name' class="form-control">
-                    </div>
-                </div>
+                @include('modals.partials.name', ['required' => 'true'])
                 <input type="hidden" name='category_type' id="modal-category_type" value="{{ request('category_type') }}" />
             </form>
         </div>
-        <div class="modal-footer">
-            <button type="button" class="btn btn-default" data-dismiss="modal">{{ trans('button.cancel') }}</button>
-            <button type="button" class="btn btn-primary" id="modal-save">{{ trans('general.save') }}</button>
-        </div>
+       @include('modals.partials.footer')
     </div><!-- /.modal-content -->
 </div><!-- /.modal-dialog -->
diff --git a/resources/views/modals/location.blade.php b/resources/views/modals/location.blade.php
index 0b5424b294..6816f32869 100644
--- a/resources/views/modals/location.blade.php
+++ b/resources/views/modals/location.blade.php
@@ -9,11 +9,17 @@
             <form action="{{ route('api.locations.store') }}" onsubmit="return false">
                     <div class="alert alert-danger" id="modal_error_msg" style="display:none">
                 </div>
-                <div class="dynamic-form-row">
-                    <div class="col-md-4 col-xs-12"><label for="modal-name">{{ trans('general.name') }}:
-                        </label></div>
-                    <div class="col-md-8 col-xs-12 required"><input type='text' name="name" id='modal-name' class="form-control"></div>
-                </div>
+                @include('modals.partials.name', ['item' => new \App\Models\Location(), 'required' => 'true'])
+
+                <!-- Setup of default company, taken from asset creator if scoped locations are activated in the settings -->
+				@if (($snipeSettings->scope_locations_fmcs == '1') && ($user->company))
+					<input type="hidden" name="company_id" id='modal-company' value='{{ $user->company->id }}' class="form-control">
+				@endif
+
+				<!-- Select company, only for users with multicompany access - replace default company -->
+				<div class="dynamic-form-row">
+					@include ('partials.forms.edit.company-select', ['translated_name' => trans('general.company'), 'fieldname' => 'company_id'])
+				</div>
 
                 <div class="dynamic-form-row">
                     <div class="col-md-4 col-xs-12"><label for="modal-city">{{ trans('general.city') }}:</label></div>
@@ -22,14 +28,10 @@
 
                 <div class="dynamic-form-row">
                     <div class="col-md-4 col-xs-12 country"><label for="modal-country">{{ trans('general.country') }}:</label></div>
-                    <div class="col-md-8 col-xs-12">{!! Form::countries('country', Request::old('country'), 'select2 country',"modal-country") !!}</div>
+                    <div class="col-md-8 col-xs-12">{!! Form::countries('country', old('country'), 'select2 country',"modal-country") !!}</div>
                 </div>
             </form>
         </div>
-
-        <div class="modal-footer">
-            <button type="button" class="btn btn-default" data-dismiss="modal">{{ trans('button.cancel') }}</button>
-            <button type="button" class="btn btn-primary" id="modal-save">{{ trans('general.save') }}</button>
-        </div>
+        @include('modals.partials.footer')
     </div><!-- /.modal-content -->
 </div><!-- /.modal-dialog -->
diff --git a/resources/views/modals/manufacturer.blade.php b/resources/views/modals/manufacturer.blade.php
index 60cf8363e4..38c6e32af8 100644
--- a/resources/views/modals/manufacturer.blade.php
+++ b/resources/views/modals/manufacturer.blade.php
@@ -8,20 +8,13 @@
         </div>
         <div class="modal-body">
             <form action="{{ route('api.manufacturers.store') }}" onsubmit="return false">
-                <div class="alert alert-danger" id="modal_error_msg" style="display:none">
-                </div>
                 <div class="dynamic-form-row">
-                    <div class="col-md-4 col-xs-12"><label for="modal-name">{{ trans('general.name') }}:
-                        </label></div>
-                    <div class="col-md-8 col-xs-12 required">
-                        <input type='text' name="name" id='modal-name' class="form-control">
-                    </div>
+                    @include('partials.forms.edit.name', ['item' => new \App\Models\Manufacturer(), 'translated_name' => trans('admin/manufacturers/table.name')])
                 </div>
             </form>
         </div>
-        <div class="modal-footer">
-            <button type="button" class="btn btn-default" data-dismiss="modal">{{ trans('button.cancel') }}</button>
-            <button type="button" class="btn btn-primary" id="modal-save">{{ trans('general.save') }}</button>
+        <div class="dynamic-form-row">
+            @include('modals.partials.footer')
         </div>
     </div><!-- /.modal-content -->
 </div><!-- /.modal-dialog -->
diff --git a/resources/views/modals/model.blade.php b/resources/views/modals/model.blade.php
index 360d14ce32..fb1650eee7 100644
--- a/resources/views/modals/model.blade.php
+++ b/resources/views/modals/model.blade.php
@@ -9,40 +9,13 @@
             <form action="{{ route('api.models.store') }}" onsubmit="return false">
                 <div class="alert alert-danger" id="modal_error_msg" style="display:none">
                 </div>
-                <div class="dynamic-form-row">
-                    <div class="col-md-4 col-xs-12"><label for="modal-name">{{ trans('general.name') }}:
-                        </label></div>
-                    <div class="col-md-8 col-xs-12 required"><input type='text' name="name" id='modal-name' class="form-control"></div>
-                </div>
-
-                <div class="dynamic-form-row">
-                    <div class="col-md-4 col-xs-12"><label for="modal-category_id">{{ trans('general.category') }}:</label></div>
-                    <div class="col-md-8 col-xs-12 required">
-                        <select class="js-data-ajax" data-endpoint="categories/asset" name="category_id" style="width: 100%" id="modal-category_id"></select>
-                    </div>
-                </div>
-
-                <div class="dynamic-form-row">
-                    <div class="col-md-4 col-xs-12"><label for="modal-manufacturer_id">{{ trans('general.manufacturer') }}:
-                        </label></div>
-                    <div class="col-md-8 col-xs-12">
-                        <select class="js-data-ajax" data-endpoint="manufacturers" name="manufacturer_id" style="width: 100%" id="modal-manufacturer_id"></select>
-                    </div>
-                </div>
-
-                <div class="dynamic-form-row">
-                    <div class="col-md-4 col-xs-12"><label for="modal-modelno">{{ trans('general.model_no') }}:</label></div>
-                    <div class="col-md-8 col-xs-12"><input type='text' name="model_number" id='modal-model_number' class="form-control"></div>
-                </div>
-
-                <div class="dynamic-form-row">
-                    <div class="col-md-4 col-xs-12"><label for="modal-fieldset_id">{{ trans('admin/models/general.fieldset') }}:</label></div>
-                    <div class="col-md-8 col-xs-12">{{ Form::select('fieldset_id', Helper::customFieldsetList(),Request::old('fieldset_id'), array('class'=>'select2', 'id'=>'modal-fieldset_id', 'style'=>'width:350px')) }}</div>
-                </div>
-        </div>
-        <div class="modal-footer">
-            <button type="button" class="btn btn-default" data-dismiss="modal">{{ trans('button.cancel') }}</button>
-            <button type="button" class="btn btn-primary" id="modal-save">{{ trans('general.save') }}</button>
+                @include('modals.partials.name', ['required' => 'true'])
+                @include('modals.partials.categories-select', ['required' => 'true'])
+                @include('modals.partials.manufacturer-select')
+                @include('modals.partials.model-number')
+                @include('modals.partials.fieldset-select')
+            </form>
         </div>
+       @include('modals.partials.footer')
     </div><!-- /.modal-content -->
 </div><!-- /.modal-dialog -->
diff --git a/resources/views/modals/partials/categories-select.blade.php b/resources/views/modals/partials/categories-select.blade.php
new file mode 100644
index 0000000000..116a0808e9
--- /dev/null
+++ b/resources/views/modals/partials/categories-select.blade.php
@@ -0,0 +1,11 @@
+<!-- modals/partials/categories-select.blade.php -->
+@php
+    $required = $required ?? '';
+@endphp
+<div class="dynamic-form-row">
+    <div class="col-md-4 col-xs-12"><label for="modal-category_id">{{ trans('general.category') }}:</label></div>
+    <div class="col-md-8 col-xs-12 required">
+        <select class="js-data-ajax" data-endpoint="categories/asset" name="category_id" style="width: 100%" id="modal-category_id" {{$required ? 'required' : ''}}></select>
+    </div>
+</div>
+<!-- modals/partials/categories-select.blade.php -->
\ No newline at end of file
diff --git a/resources/views/modals/partials/fieldset-select.blade.php b/resources/views/modals/partials/fieldset-select.blade.php
new file mode 100644
index 0000000000..ec1e178f22
--- /dev/null
+++ b/resources/views/modals/partials/fieldset-select.blade.php
@@ -0,0 +1,14 @@
+<!-- partials/modals/partials/fieldset-select.blade.php -->
+<div class="dynamic-form-row">
+    <div class="col-md-4 col-xs-12"><label for="modal-fieldset_id">{{ trans('admin/models/general.fieldset') }}:</label></div>
+    <div class="col-md-8 col-xs-12">
+        <x-input.select
+            name="fieldset_id"
+            id="modal-fieldset_id"
+            :options="Helper::customFieldsetList()"
+            :selected="old('fieldset_id')"
+            style="width:100%;"
+        />
+    </div>
+</div>
+<!-- partials/modals/partials/fieldset-select.blade.php -->
diff --git a/resources/views/modals/partials/footer.blade.php b/resources/views/modals/partials/footer.blade.php
new file mode 100644
index 0000000000..354d189b9e
--- /dev/null
+++ b/resources/views/modals/partials/footer.blade.php
@@ -0,0 +1,6 @@
+<!-- partials/modals/partials/footer.blade.php -->
+<div class="modal-footer">
+    <button type="button" class="btn btn-default pull-left" data-dismiss="modal">{{ trans('button.cancel') }}</button>
+    <button type="button" class="btn btn-primary pull-right" id="modal-save">{{ trans('general.save') }}</button>
+</div>
+<!-- partials/modals/partials/footer.blade.php -->
\ No newline at end of file
diff --git a/resources/views/modals/partials/manufacturer-select.blade.php b/resources/views/modals/partials/manufacturer-select.blade.php
new file mode 100644
index 0000000000..810292067e
--- /dev/null
+++ b/resources/views/modals/partials/manufacturer-select.blade.php
@@ -0,0 +1,8 @@
+<!-- partials/modals/partials/model-number.blade.php -->
+<div class="dynamic-form-row">
+    <div class="col-md-4 col-xs-12"><label for="modal-manufacturer_id">{{ trans('general.manufacturer') }}:</label></div>
+    <div class="col-md-8 col-xs-12">
+        <select class="js-data-ajax" data-endpoint="manufacturers" name="manufacturer_id" style="width: 100%" id="modal-manufacturer_id"></select>
+    </div>
+</div>
+<!-- partials/modals/partials/model-number.blade.php -->
\ No newline at end of file
diff --git a/resources/views/modals/partials/model-number.blade.php b/resources/views/modals/partials/model-number.blade.php
new file mode 100644
index 0000000000..2691f30d48
--- /dev/null
+++ b/resources/views/modals/partials/model-number.blade.php
@@ -0,0 +1,6 @@
+<!-- partials/modals/partials/model-number.blade.php -->
+<div class="dynamic-form-row">
+    <div class="col-md-4 col-xs-12"><label for="modal-modelno">{{ trans('general.model_no') }}:</label></div>
+    <div class="col-md-8 col-xs-12"><input type='text' name="model_number" id='modal-model_number' class="form-control"></div>
+</div>
+<!-- partials/modals/partials/model-number.blade.php -->
\ No newline at end of file
diff --git a/resources/views/modals/partials/name.blade.php b/resources/views/modals/partials/name.blade.php
new file mode 100644
index 0000000000..6a64ed525f
--- /dev/null
+++ b/resources/views/modals/partials/name.blade.php
@@ -0,0 +1,10 @@
+<!-- modals/partials/name.blade.php -->
+@php
+    $required = $required ?? '';
+@endphp
+<div class="dynamic-form-row">
+    <div class="col-md-4 col-xs-12"><label for="modal-name">{{ trans('general.name') }}:
+        </label></div>
+    <div class="col-md-8 col-xs-12"><input type='text' name="name" id='modal-name' class="form-control" {{$required ? 'required' : ''}}></div>
+</div>
+<!-- modals/partials/name.blade.php -->
\ No newline at end of file
diff --git a/resources/views/modals/statuslabel.blade.php b/resources/views/modals/statuslabel.blade.php
index 7e07854197..a6676c9292 100644
--- a/resources/views/modals/statuslabel.blade.php
+++ b/resources/views/modals/statuslabel.blade.php
@@ -10,21 +10,26 @@
                 <div class="alert alert-danger" id="modal_error_msg" style="display:none">
                 </div>
                 <div class="dynamic-form-row">
-                    <div class="col-md-4 col-xs-12"><label for="modal-name">{{ trans('general.name') }}:
-                        </label></div>
-                    <div class="col-md-8 col-xs-12 required"><input type='text' name="name" id='modal-name' class="form-control"></div>
+                    @include('partials.forms.edit.name', ['required' => 'true', 'item' => new \App\Models\Statuslabel(),'translated_name' => trans('admin/statuslabels/table.name')  ])
                 </div>
 
                 <div class="dynamic-form-row">
-                    <div class="col-md-4 col-xs-12"><label for="modal-type">{{ trans('admin/statuslabels/table.status_type') }}:
+                    <div class="col-md-3 col-xs-12"><label for="modal-type">{{ trans('admin/statuslabels/table.status_type') }}:
                         </label></div>
-                    <div class="col-md-8 col-xs-12 required">{{ Form::select('type', $statuslabel_types, '', array('class'=>'select2', 'style'=>'width:90%','id' =>'modal-type')) }}</div>
+                    <div class="col-md-8 col-xs-12">
+                        <x-input.select
+                            name="type"
+                            id="modal-type"
+                            :options="$statuslabel_types"
+                            required
+                            style="width:100%;"
+                        />
+                    </div>
                 </div>
             </form>
         </div>
-        <div class="modal-footer">
-            <button type="button" class="btn btn-default" data-dismiss="modal">{{ trans('button.cancel') }}</button>
-            <button type="button" class="btn btn-primary" id="modal-save">{{ trans('general.save') }}</button>
+        <div class="dynamic-form-row">
+            @include('modals.partials.footer')
         </div>
     </div><!-- /.modal-content -->
 </div><!-- /.modal-dialog -->
diff --git a/resources/views/modals/supplier.blade.php b/resources/views/modals/supplier.blade.php
index 0dd10595bf..806b57c1de 100644
--- a/resources/views/modals/supplier.blade.php
+++ b/resources/views/modals/supplier.blade.php
@@ -10,15 +10,12 @@
                 <div class="alert alert-danger" id="modal_error_msg" style="display:none">
                 </div>
                 <div class="dynamic-form-row">
-                    <div class="col-md-4 col-xs-12"><label for="modal-name">{{ trans('general.name') }}:
-                        </label></div>
-                    <div class="col-md-8 col-xs-12 required"><input type='text' name="name" id='modal-name' class="form-control"></div>
+                   @include('partials.forms.edit.name', [ 'item' => new \App\Models\Supplier(), 'translated_name' => trans('admin/suppliers/table.name')])
                 </div>
             </form>
         </div>
-        <div class="modal-footer">
-            <button type="button" class="btn btn-default" data-dismiss="modal">{{ trans('button.cancel') }}</button>
-            <button type="button" class="btn btn-primary" id="modal-save">{{ trans('general.save') }}</button>
+        <div class="dynamic-form-row">
+            @include('modals.partials.footer')
         </div>
     </div><!-- /.modal-content -->
 </div><!-- /.modal-dialog -->
diff --git a/resources/views/modals/upload-file.blade.php b/resources/views/modals/upload-file.blade.php
index c5816bf175..caeac9a761 100644
--- a/resources/views/modals/upload-file.blade.php
+++ b/resources/views/modals/upload-file.blade.php
@@ -6,11 +6,13 @@
                 <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
                 <h4 class="modal-title" id="uploadFileModalLabel">{{ trans('general.file_upload') }}</h4>
             </div>
-            {{ Form::open([
-            'method' => 'POST',
-            'route' => ['upload/'.$item_type, $item_id],
-            'files' => true,
-            'class' => 'form-horizontal' ]) }}
+            <form
+                method="POST"
+                action="{{ route('upload/' . $item_type, $item_id) }}"
+                accept-charset="UTF-8"
+                class="form-horizontal"
+                enctype="multipart/form-data"
+            >
             <input type="hidden" name="_token" value="{{ csrf_token() }}" />
             <div class="modal-body">
 
@@ -31,7 +33,13 @@
                     </div>
 
                     <div class="col-md-12">
-                        {{ Form::textarea('notes', old('notes', old('notes')), ['class' => 'form-control','placeholder' => 'Notes (Optional)', 'rows'=>3, 'aria-label' => 'file']) }}
+                        <x-input.textarea
+                            name="notes"
+                            :value="old('notes')"
+                            placeholder="Notes (Optional)"
+                            rows="3"
+                            aria-label="file"
+                        />
                     </div>
                 </div>
 
@@ -40,7 +48,7 @@
                 <a href="#" class="pull-left" data-dismiss="modal">{{ trans('button.cancel') }}</a>
                 <button type="submit" class="btn btn-primary">{{ trans('button.upload') }}</button>
             </div>
-            {{ Form::close() }}
+            </form>
         </div>
     </div>
 </div>
diff --git a/resources/views/modals/user.blade.php b/resources/views/modals/user.blade.php
index 4e428f35f7..04d0c82357 100644
--- a/resources/views/modals/user.blade.php
+++ b/resources/views/modals/user.blade.php
@@ -25,11 +25,10 @@
             <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
             <h2 class="modal-title">{{ trans('admin/users/table.createuser') }}</h2>
         </div>
-            <div class="modal-body">
+            <div class="modal-body" style="width:100%; display:block;">
                 <form action="{{ route('api.users.store') }}" onsubmit="return false">
                     <div class="alert alert-danger" id="modal_error_msg" style="display:none">
                     </div>
-                    
                     <!-- Setup of default company, taken from asset creator -->
 					@if ($user->company)
 						<input type="hidden" name="company_id" id='modal-company' value='{{ $user->company->id }}' class="form-control">
@@ -39,63 +38,63 @@
 					<div class="dynamic-form-row">
 						@include ('partials.forms.edit.company-select', ['translated_name' => trans('general.company'), 'fieldname' => 'company_id'])
 					</div>
-                    
                     <div class="dynamic-form-row">
-                        <div class="col-md-3 col-xs-12"><label for="modal-first_name">{{ trans('general.first_name') }}:</label></div>
-                        <div class="col-md-8 col-xs-12 required"><input type='text' name="first_name" id='modal-first_name' class="form-control"></div>
+                        @include ('partials.forms.edit.location-profile-select', ['translated_name' => trans('general.location'), 'fieldname' => 'location_id'])
+                    </div>
+                    <div class="dynamic-form-row">
+                        @include('partials.forms.edit.name-first', ['value' => '', 'required' => 'true', 'class' => 'col-md-8 col-xs-12-pull', 'style' => 'width:67%;'])
+                    </div>
+                    <div class="dynamic-form-row">
+                    @include('partials.forms.edit.name-last', ['value' => '', 'required' => 'true', 'class' => 'col-md-8 col-xs-12-pull', 'style' => 'width:67%;'])
+                    </div>
+                    <div class="dynamic-form-row">
+                        @include('partials.forms.edit.email')
+                    </div>
+                    <div class="dynamic-form-row">
+                        @include('partials.forms.edit.username', [ 'required' => 'true'])
                     </div>
 
                     <div class="dynamic-form-row">
-                        <div class="col-md-3 col-xs-12"><label for="modal-last_name">{{ trans('general.last_name') }}:</label></div>
-                        <div class="col-md-8 col-xs-12"><input type='text' name="last_name" id='modal-last_name' class="form-control"> </div>
-                    </div>
-
-                    <div class="dynamic-form-row">
-                        <div class="col-md-3 col-xs-12"><label for="modal-username">{{ trans('admin/users/table.username') }}:</label></div>
-                        <div class="col-md-8 col-xs-12 required"><input type='text' name="username" id='modal-username' class="form-control"></div>
-                    </div>
-
-					<!-- User email address -->		
-					<div class="dynamic-form-row">
-                        <div class="col-md-3 col-xs-12"><label for="modal-email">{{ trans('admin/users/table.email') }}:</label></div>
-                        <div class="col-md-8 col-xs-12">
-						<input class="form-control" type="text" name="email" id="modal-email" autocomplete="off">
-						{!! $errors->first('email', '<span class="alert-msg" aria-hidden="true">:message</span>') !!} 
-						</div>
-                    </div>
-
-                    <div class="dynamic-form-row">
-                        <div class="col-md-3 col-xs-12"><label for="modal-password">{{ trans('admin/users/table.password') }}:</label></div>
-                        <div class="col-md-8 col-xs-12 required"><input type='password' name="password" id='modal-password' class="form-control">
-                            <a href="#" class="left" id="modal-genPassword">Generate</a>
+                        <div class="form-group">
+                            <div class="col-md-3 col-xs-12">
+                                <label class="control-label" for="modal-password">{{ trans('admin/users/table.password') }}:</label>
+                            </div>
+                            <div class="col-md-8 col-xs-12 " style="margin-bottom:5px;">
+                                <input type='password' name="password" id='modal-password' class="form-control" required>
+                                <a href="#" class="left" id="modal-genPassword">Generate</a>
+                                <div id="modal-generated-password"></div>
+                            </div>
                         </div>
                     </div>
 
                     <div class="dynamic-form-row">
-                        <div class="col-md-3 col-xs-12"><label for="modal-password_confirmation">{{ trans('admin/users/table.password_confirm') }}:</label></div>
-                        <div class="col-md-8 col-xs-12 required"><input type='password' name="password_confirmation" id='modal-password_confirmation' class="form-control">
-                            <div id="modal-generated-password"></div>
-                        </div>
-                    </div>
-                    
+                        <div class="form-group">
+                            <div class="col-md-3 col-xs-12 ">
+                                <label class="control-label" for="modal-password_confirmation">{{ trans('admin/users/table.password_confirm') }}:</label>
+                            </div>
+                            <div class="col-md-8 col-xs-12">
+                                <input class="form-control" type='password' name="password_confirmation" id='modal-password_confirmation' required>
+
+                            </div>
+                         </div>
+                    </div>
 
-                    
 					<!-- Checkbox for activation new user, by default set for activated -->
 					<div class="dynamic-form-row">
-						<div class="col-md-offset-3 col-md-8 col-xs-12">
-                            <label class="form-control">
-						        <input type="checkbox" value="1" name="activated" id="modal-activated" {{ (old('activated', $user->activated)) == '1' ? ' checked="checked"' : '' }} aria-label="activated">
-                                {{ trans('general.login_enabled') }}
-                            </label>
-						</div>
-                    </div>                    
-                    
+                        <div class="form-group">
+                            <div class="col-md-offset-3 col-md-8 col-xs-12">
+                                <label class="form-control">
+                                    <input type="checkbox" value="1" name="activated" id="modal-activated" {{ (old('activated', $user->activated)) == '1' ? ' checked="checked"' : '' }} aria-label="activated">
+                                    {{ trans('general.login_enabled') }}
+                                </label>
+                            </div>
+                        </div>
+                    </div>
+                    <div class="dynamic-form-row">
+                        @include('modals.partials.footer')
+                    </div>
                 </form>
             </div>
-        <div class="modal-footer">
-            <button type="button" class="btn btn-default" data-dismiss="modal">{{ trans('button.cancel') }}</button>
-            <button type="button" class="btn btn-primary" id="modal-save">{{ trans('general.save') }}</button>
-        </div>
     </div><!-- /.modal-content -->
 </div><!-- /.modal-dialog -->
 
diff --git a/resources/views/models/bulk-delete.blade.php b/resources/views/models/bulk-delete.blade.php
index 570be2bce8..79b41b2064 100644
--- a/resources/views/models/bulk-delete.blade.php
+++ b/resources/views/models/bulk-delete.blade.php
@@ -55,7 +55,7 @@
 
                     <div class="box-footer text-right">
                         <a class="btn btn-link pull-left" href="{{ URL::previous() }}" method="post" enctype="multipart/form-data">{{ trans('button.cancel') }}</a>
-                        <button type="submit" class="btn btn-success" id="submit-button"><i class="fas fa-check icon-white" aria-hidden="true"></i> {{ trans('general.delete') }}</button>
+                        <button type="submit" class="btn btn-success" id="submit-button"><x-icon type="checkmark" /> {{ trans('general.delete') }}</button>
                     </div><!-- /.box-footer -->
                 </div><!-- /.box -->
             </form>
diff --git a/resources/views/models/bulk-edit.blade.php b/resources/views/models/bulk-edit.blade.php
index 91b9e5f882..8131a470bc 100644
--- a/resources/views/models/bulk-edit.blade.php
+++ b/resources/views/models/bulk-edit.blade.php
@@ -62,7 +62,13 @@
                                     {{ trans('admin/models/general.fieldset') }}
                                 </label>
                                 <div class="col-md-7">
-                                    {{ Form::select('fieldset_id', $fieldset_list , old('fieldset_id', 'NC'), array('class'=>'select2 js-fieldset-field', 'style'=>'width:350px')) }}
+                                    <x-input.select
+                                        name="fieldset_id"
+                                        :options="$fieldset_list"
+                                        :selected="old('fieldset_id', 'NC')"
+                                        class="js-fieldset-field"
+                                        style="width:350px"
+                                    />
                                     {!! $errors->first('fieldset_id', '<span class="alert-msg" aria-hidden="true"><br><i class="fas fa-times"></i> :message</span>') !!}
                                 </div>
                             </div>
@@ -74,25 +80,33 @@
                                     {{ trans('general.depreciation') }}
                                 </label>
                                 <div class="col-md-7">
-                                    {{ Form::select('depreciation_id', $depreciation_list , old('depreciation_id', 'NC'), array('class'=>'select2', 'style'=>'width:350px')) }}
+                                    <x-input.select
+                                        name="depreciation_id"
+                                        :options="$depreciation_list"
+                                        :selected="old('depreciation_id', 'NC')"
+                                        style="width:350px"
+                                    />
                                     {!! $errors->first('depreciation_id', '<span class="alert-msg" aria-hidden="true"><i class="fas fa-times" aria-hidden="true"></i> :message</span>') !!}
                                 </div>
                             </div>
 
+                            @include ('partials.forms.edit.minimum_quantity')
+
+
                             <!-- requestable -->
                                 <div class="form-group{{ $errors->has('requestable') ? ' has-error' : '' }}">
                                     <div class="col-md-7 col-md-offset-3">
 
                                         <label for="requestable_nochange" class="form-control">
-                                            {{ Form::radio('requestable', '', true, ['id' => 'requestable_nochange', 'aria-label'=>'requestable_nochange']) }}
+                                            <input type="radio" name="requestable" id="requestable_nochange" value="" aria-label="requestable_nochange" checked>
                                             {{  trans('admin/hardware/general.requestable_status_warning')}}
                                         </label>
                                         <label for="requestable" class="form-control">
-                                            {{ Form::radio('requestable', '1', old('requestable'), ['id' => 'requestable', 'aria-label'=>'requestable']) }}
+                                            <input type="radio" name="requestable" id="requestable" value="1" aria-label="requestable">
                                             {{  trans('admin/hardware/general.requestable')}}
                                         </label>
                                         <label for="not_requestable" class="form-control">
-                                            {{ Form::radio('requestable', '0', old('requestable'), ['id' => 'not_requestable','aria-label'=>'not_requestable']) }}
+                                            <input type="radio" name="requestable" id="not_requestable" value="0" aria-label="not_requestable">
                                             {{  trans('admin/hardware/general.not_requestable')}}
                                         </label>
 
@@ -108,7 +122,7 @@
 
                     <div class="box-footer text-right">
                         <a class="btn btn-link pull-left" href="{{ URL::previous() }}" method="post" enctype="multipart/form-data">{{ trans('button.cancel') }}</a>
-                        <button type="submit" class="btn btn-success" id="submit-button"><i class="fas fa-check icon-white" aria-hidden="true"></i> {{ trans('general.update') }}</button>
+                        <button type="submit" class="btn btn-success" id="submit-button"><x-icon type="checkmark" /> {{ trans('general.update') }}</button>
                     </div><!-- /.box-footer -->
                 </div> <!--/.box.box-default-->
             </form>
diff --git a/resources/views/models/custom_fields_form.blade.php b/resources/views/models/custom_fields_form.blade.php
index 3c49ef8f7e..929c5fbea4 100644
--- a/resources/views/models/custom_fields_form.blade.php
+++ b/resources/views/models/custom_fields_form.blade.php
@@ -1,60 +1,80 @@
-@if (($model) && ($model->fieldset))
-  @foreach($model->fieldset->fields AS $field)
-    <div class="form-group{{ $errors->has($field->db_column_name()) ? ' has-error' : '' }}">
-      <label for="{{ $field->db_column_name() }}" class="col-md-3 control-label">{{ $field->name }} </label>
-      <div class="col-md-7 col-sm-12{{ ($field->pivot->required=='1') ? ' required' : '' }}">
+@if (($model) && ($model->fieldset) && $model->fieldset->displayAnyFieldsInForm($show_custom_fields_type ?? ''))
+    <div class="col-md-12 col-sm-12">
 
+    <fieldset name="custom-fields" class="bottom-padded">
+        <legend class="highlight">
+            {{ trans('admin/custom_fields/general.custom_fields') }}
+        </legend>
+
+  @foreach($model->fieldset->fields as $field)
+    @if (!isset($show_custom_fields_type) || ($field->displayFieldInCurrentForm($show_custom_fields_type)))
+
+
+    <div class="form-group{{ $errors->has($field->db_column_name()) ? ' has-error' : '' }}">
+
+
+      <label for="{{ $field->db_column_name() }}" class="col-md-3 control-label">
+          {{ $field->name }}
+
+      </label>
+
+      <div class="col-md-7 col-sm-12">
 
           @if ($field->element!='text')
-              <!-- Listbox -->
+
               @if ($field->element=='listbox')
-                   {{ Form::select($field->db_column_name(), $field->formatFieldValuesAsArray(),
-                  Request::old($field->db_column_name(),(isset($item) ? Helper::gracefulDecrypt($field, $item->{$field->db_column_name()}) : $field->defaultValue($model->id))), ['class'=>'format select2 form-control']) }}
+                  <!-- Listbox -->
+                  <x-input.select
+                      :name="$field->db_column_name()"
+                      :options="$field->formatFieldValuesAsArray()"
+                      :selected="old($field->db_column_name(), (isset($item) ? Helper::gracefulDecrypt($field, $item->{$field->db_column_name()}) : $field->defaultValue($model->id)))"
+                      :required="$field->pivot->required == '1'"
+                      class="format form-control"
+                  />
 
               @elseif ($field->element=='textarea')
-                  <textarea class="col-md-6 form-control" id="{{ $field->db_column_name() }}" name="{{ $field->db_column_name() }}">{{ Request::old($field->db_column_name(),(isset($item) ? Helper::gracefulDecrypt($field, $item->{$field->db_column_name()}) : $field->defaultValue($model->id))) }}</textarea>
+                  <!-- Textarea -->
+                  <textarea class="col-md-6 form-control" id="{{ $field->db_column_name() }}" name="{{ $field->db_column_name() }}"{{ ($field->pivot->required=='1') ? ' required' : '' }}>{{ old($field->db_column_name(),(isset($item) ? Helper::gracefulDecrypt($field, $item->{$field->db_column_name()}) : $field->defaultValue($model->id))) }}</textarea>
 
               @elseif ($field->element=='checkbox')
-                    <!-- Checkboxes -->
+                  <!-- Checkbox -->
                   @foreach ($field->formatFieldValuesAsArray() as $key => $value)
                       <div>
                           <label class="form-control">
-                              <input type="checkbox" value="{{ $value }}" name="{{ $field->db_column_name() }}[]" {{  isset($item) ? (in_array($value, array_map('trim', explode(',', $item->{$field->db_column_name()}))) ? ' checked="checked"' : '') : (Request::old($field->db_column_name()) != '' ? ' checked="checked"' : (in_array($key, array_map('trim', explode(',', $field->defaultValue($model->id)))) ? ' checked="checked"' : '')) }}>
+                              <input type="checkbox" value="{{ $value }}" name="{{ $field->db_column_name() }}[]" {{  isset($item) ? (in_array($value, array_map('trim', explode(',', $item->{$field->db_column_name()}))) ? ' checked="checked"' : '') : (old($field->db_column_name()) != '' ? ' checked="checked"' : (in_array($key, array_map('trim', explode(',', $field->defaultValue($model->id)))) ? ' checked="checked"' : '')) }}>
                               {{ $value }}
                           </label>
                       </div>
                   @endforeach
 
               @elseif ($field->element=='radio')
-              @foreach ($field->formatFieldValuesAsArray() as $value)
-
-              <div>
-                  <label class="form-control">
-                      <input type="radio" value="{{ $value }}" name="{{ $field->db_column_name() }}" {{ isset($item) ? ($item->{$field->db_column_name()} == $value ? ' checked="checked"' : '') : (Request::old($field->db_column_name()) != '' ? ' checked="checked"' : (in_array($value, explode(', ', $field->defaultValue($model->id))) ? ' checked="checked"' : '')) }}>
-                      {{ $value }}
-                  </label>
-              </div>
-          @endforeach
-
+                  <!-- Radio -->
+                  @foreach ($field->formatFieldValuesAsArray() as $value)
+                      <div>
+                          <label class="form-control">
+                              <input type="radio" value="{{ $value }}" name="{{ $field->db_column_name() }}" {{ isset($item) ? ($item->{$field->db_column_name()} == $value ? ' checked="checked"' : '') : (old($field->db_column_name()) != '' ? ' checked="checked"' : (in_array($value, explode(', ', $field->defaultValue($model->id))) ? ' checked="checked"' : '')) }}>
+                              {{ $value }}
+                          </label>
+                      </div>
+                  @endforeach
               @endif
 
 
           @else
             <!-- Date field -->
-
                 @if ($field->format=='DATE')
 
                         <div class="input-group col-md-5" style="padding-left: 0px;">
                             <div class="input-group date" data-provide="datepicker" data-date-format="yyyy-mm-dd" data-autoclose="true" data-date-clear-btn="true">
-                                <input type="text" class="form-control" placeholder="{{ trans('general.select_date') }}" name="{{ $field->db_column_name() }}" id="{{ $field->db_column_name() }}" readonly value="{{ old($field->db_column_name(),(isset($item) ? Helper::gracefulDecrypt($field, $item->{$field->db_column_name()}) : $field->defaultValue($model->id))) }}"  style="background-color:inherit">
-                                <span class="input-group-addon"><i class="fas fa-calendar" aria-hidden="true"></i></span>
+                                <input type="text" class="form-control" placeholder="{{ trans('general.select_date') }}" name="{{ $field->db_column_name() }}" id="{{ $field->db_column_name() }}" readonly value="{{ old($field->db_column_name(),(isset($item) ? Helper::gracefulDecrypt($field, $item->{$field->db_column_name()}) : $field->defaultValue($model->id))) }}"  style="background-color:inherit"{{ ($field->pivot->required=='1') ? ' required' : '' }}>
+                                <span class="input-group-addon"><x-icon type="calendar" /></span>
                             </div>
                         </div>
 
 
                 @else
                     @if (($field->field_encrypted=='0') || (Gate::allows('assets.view.encrypted_custom_fields')))
-                    <input type="text" value="{{ Request::old($field->db_column_name(),(isset($item) ? Helper::gracefulDecrypt($field, $item->{$field->db_column_name()}) : $field->defaultValue($model->id))) }}" id="{{ $field->db_column_name() }}" class="form-control" name="{{ $field->db_column_name() }}" placeholder="Enter {{ strtolower($field->format) }} text">
+                    <input type="text" value="{{ old($field->db_column_name(),(isset($item) ? Helper::gracefulDecrypt($field, $item->{$field->db_column_name()}) : $field->defaultValue($model->id))) }}" id="{{ $field->db_column_name() }}" class="form-control" name="{{ $field->db_column_name() }}" placeholder="Enter {{ strtolower($field->format) }} text"{{ ($field->pivot->required=='1') ? ' required' : '' }}>
                         @else
                             <input type="text" value="{{ strtoupper(trans('admin/custom_fields/general.encrypted')) }}" class="form-control disabled" disabled>
                     @endif
@@ -66,13 +86,13 @@
               <p class="help-block">{{ $field->help_text }}</p>
               @endif
 
-          <?php
-          $errormessage=$errors->first($field->db_column_name());
-          if ($errormessage) {
-              $errormessage=preg_replace('/ snipeit /', '', $errormessage);
-              print('<span class="alert-msg" aria-hidden="true"><i class="fas fa-times" aria-hidden="true"></i> '.$errormessage.'</span>');
-          }
-            ?>
+                  <?php
+                  $errormessage = $errors->first($field->db_column_name());
+                  if ($errormessage) {
+                      $errormessage = preg_replace('/ snipeit /', '', $errormessage);
+                      print('<span class="alert-msg" aria-hidden="true"><i class="fas fa-times" aria-hidden="true"></i> '.$errormessage.'</span>');
+                  }
+                  ?>
       </div>
 
         @if ($field->field_encrypted)
@@ -81,16 +101,12 @@
         </div>
         @endif
 
-
     </div>
+            @endif
   @endforeach
+    </fieldset>
+    </div>
 @endif
 
 
-<script nonce="{{ csrf_token() }}">
-    // We have to re-call the tooltip since this is pulled in after the DOM has loaded
-    $('[data-tooltip="true"]').tooltip({
-        container: 'body',
-        animation: true,
-    });
-</script>
+
diff --git a/resources/views/models/custom_fields_form_bulk_edit.blade.php b/resources/views/models/custom_fields_form_bulk_edit.blade.php
index dc0ad1f88a..30b26b4ae0 100644
--- a/resources/views/models/custom_fields_form_bulk_edit.blade.php
+++ b/resources/views/models/custom_fields_form_bulk_edit.blade.php
@@ -24,35 +24,48 @@
           @if ($field->element!='text')
               <!-- Listbox -->
               @if ($field->element=='listbox')
-                  {{ Form::select($field->db_column_name(), $field->formatFieldValuesAsArray(),
-                  Request::old($field->db_column_name(),(isset($item) ? Helper::gracefulDecrypt($field, $item->{$field->db_column_name()}) : $field->defaultValue($model->id))), ['class'=>'format select2 form-control']) }}
+                  <x-input.select
+                      :name="$field->db_column_name()"
+                      :options="$field->formatFieldValuesAsArray()"
+                      :selected="old($field->db_column_name(),(isset($item) ? Helper::gracefulDecrypt($field, $item->{$field->db_column_name()}) : $field->defaultValue($model->id)))"
+                      class="format form-control"
+                  />
+                  <div class="col-md-5">
+                      <label class="form-control">
+                          <input type="checkbox" name="null_asset_eol_date" value="1">
+                          {{ trans_choice('general.set_to_null', count($assets),['selection_count' => count($assets)]) }}
+                      </label>
+                  </div>
 
               @elseif ($field->element=='textarea')
                 @if($field->is_unique)
                     <input type="text" class="form-control" disabled value="{{ trans('/admin/hardware/form.bulk_update_custom_field_unique') }}">
                 @endif
-                @if(!$field->is_unique) 
-                    <textarea class="col-md-6 form-control" id="{{ $field->db_column_name() }}" name="{{ $field->db_column_name() }}">{{ Request::old($field->db_column_name(),(isset($item) ? Helper::gracefulDecrypt($field, $item->{$field->db_column_name()}) : $field->defaultValue($model->id))) }}</textarea>
-                @endif 
+                @if(!$field->is_unique)
+                    <textarea class="col-md-6 form-control" id="{{ $field->db_column_name() }}" name="{{ $field->db_column_name() }}">{{ old($field->db_column_name(),(isset($item) ? Helper::gracefulDecrypt($field, $item->{$field->db_column_name()}) : $field->defaultValue($model->id))) }}</textarea>
+                @endif
               @elseif ($field->element=='checkbox')
                     <!-- Checkboxes -->
                   @foreach ($field->formatFieldValuesAsArray() as $key => $value)
                       <label class="form-control">
-                          <input type="checkbox" value="{{ $value }}" name="{{ $field->db_column_name() }}[]" {{  isset($item) ? (in_array($value, array_map('trim', explode(',', $item->{$field->db_column_name()}))) ? ' checked="checked"' : '') : (Request::old($field->db_column_name()) != '' ? ' checked="checked"' : (in_array($key, array_map('trim', explode(',', $field->defaultValue($model->id)))) ? ' checked="checked"' : '')) }}>
+                          <input type="checkbox" value="{{ $value }}" name="{{ $field->db_column_name() }}[]" {{  isset($item) ? (in_array($value, array_map('trim', explode(',', $item->{$field->db_column_name()}))) ? ' checked="checked"' : '') : (old($field->db_column_name()) != '' ? ' checked="checked"' : (in_array($key, array_map('trim', explode(',', $field->defaultValue($model->id)))) ? ' checked="checked"' : '')) }}>
                           {{ $value }}
                       </label>
-
                   @endforeach
             @elseif ($field->element=='radio')
             @foreach ($field->formatFieldValuesAsArray() as $value)
 
                   <label class="form-control">
-                      <input type="radio" value="{{ $value }}" name="{{ $field->db_column_name() }}" {{ isset($item) ? ($item->{$field->db_column_name()} == $value ? ' checked="checked"' : '') : (Request::old($field->db_column_name()) != '' ? ' checked="checked"' : (in_array($value, explode(', ', $field->defaultValue($model->id))) ? ' checked="checked"' : '')) }}>
+                      <input type="radio" value="{{ $value }}" name="{{ $field->db_column_name() }}" {{ isset($item) ? ($item->{$field->db_column_name()} == $value ? ' checked="checked"' : '') : (old($field->db_column_name()) != '' ? ' checked="checked"' : (in_array($value, explode(', ', $field->defaultValue($model->id))) ? ' checked="checked"' : '')) }}>
                       {{ $value }}
                   </label>
 
             @endforeach
-
+                <button type="button"
+                        class="btn btn-default btn-xs clear-radio"
+                        data-target-name="{{ $field->db_column_name() }}">
+                    {{ trans('/admin/hardware/general.clear') }}
+                </button>
             @endif
 
             @else
@@ -63,7 +76,7 @@
             <div class="input-group col-md-5" style="padding-left: 0px;">
                 <div class="input-group date" data-provide="datepicker" data-date-format="yyyy-mm-dd" data-autoclose="true" data-date-clear-btn="true">
                     <input type="text" class="form-control" placeholder="{{ trans('general.select_date') }}" name="{{ $field->db_column_name() }}" id="{{ $field->db_column_name() }}" readonly value="{{ old($field->db_column_name(),(isset($item) ? Helper::gracefulDecrypt($field, $item->{$field->db_column_name()}) : $field->defaultValue($model->id))) }}"  style="background-color:inherit">
-                    <span class="input-group-addon"><i class="fas fa-calendar" aria-hidden="true"></i></span>
+                    <span class="input-group-addon"><x-icon type="calendar" /></span>
                 </div>
             </div>
 
@@ -75,7 +88,7 @@
                                 <input type="text" class="form-control" disabled value="{{trans('/admin/hardware/form.bulk_update_custom_field_unique')}}">
                             @endif  
                         @if(!$field->is_unique) 
-                                <input type="text" value="{{ Request::old($field->db_column_name(),(isset($item) ? Helper::gracefulDecrypt($field, $item->{$field->db_column_name()}) : $field->defaultValue($model->id))) }}" id="{{ $field->db_column_name() }}" class="form-control" name="{{ $field->db_column_name() }}" placeholder="Enter {{ strtolower($field->format) }} text">
+                                <input type="text" value="{{ old($field->db_column_name(),(isset($item) ? Helper::gracefulDecrypt($field, $item->{$field->db_column_name()}) : $field->defaultValue($model->id))) }}" id="{{ $field->db_column_name() }}" class="form-control" name="{{ $field->db_column_name() }}" placeholder="Enter {{ strtolower($field->format) }} text">
                         @endif 
                             @else
                                 <input type="text" value="{{ strtoupper(trans('admin/custom_fields/general.encrypted')) }}" class="form-control disabled" disabled>
@@ -111,8 +124,14 @@
         </div>
         @endif
 
-
+        <div class="col-md-5">
+            <label class="form-control">
+                <input type="checkbox" name="{{ 'null'.$field->db_column_name() }}" value="1">
+                {{ trans_choice('general.set_to_null', count($assets),['selection_count' => count($assets)]) }}
+            </label>
+        </div>
     </div>
-  @endforeach
+
+    @endforeach
 @endif
- @endforeach 
+ @endforeach
diff --git a/resources/views/models/edit.blade.php b/resources/views/models/edit.blade.php
index 14a7e839e1..9c72107ef8 100755
--- a/resources/views/models/edit.blade.php
+++ b/resources/views/models/edit.blade.php
@@ -23,7 +23,7 @@
     <label for="eol" class="col-md-3 control-label">{{ trans('general.eol') }}</label>
     <div class="col-md-3 col-sm-4 col-xs-7">
         <div class="input-group">
-            <input class="form-control" type="text" name="eol" id="eol" value="{{ Request::old('eol', isset($item->eol)) ? $item->eol : ''  }}" />
+            <input class="form-control" type="text" name="eol" id="eol" value="{{ old('eol', isset($item->eol)) ? $item->eol : ''  }}" />
             <span class="input-group-addon">
                 {{ trans('general.months') }}
             </span>
@@ -36,7 +36,7 @@
 
 <!-- Custom Fieldset -->
 <!-- If $item->id is null we are cloning the model and we need the $model_id variable -->
-@livewire('custom-field-set-default-values-for-model',["model_id" => $item->id ?? $model_id ?? null  ])
+@livewire('custom-field-set-default-values-for-model', ["model_id" => $item->id ?? $model_id ?? null])
 
 @include ('partials.forms.edit.notes')
 @include ('partials.forms.edit.requestable', ['requestable_text' => trans('admin/models/general.requestable')])
diff --git a/resources/views/models/index.blade.php b/resources/views/models/index.blade.php
index eff6a5dfe5..77fcac8a9a 100755
--- a/resources/views/models/index.blade.php
+++ b/resources/views/models/index.blade.php
@@ -37,15 +37,17 @@
       <div class="box-body">
 
         @include('partials.models-bulk-actions')
-              <div class="table-responsive">
                 <table
                         data-columns="{{ \App\Presenters\AssetModelPresenter::dataTableLayout() }}"
                         data-cookie-id-table="asssetModelsTable"
                         data-pagination="true"
                         data-id-table="asssetModelsTable"
                         data-search="true"
+                        data-search-highlight="true"
+                        data-show-print="true"
                         data-show-footer="true"
                         data-side-pagination="server"
+                        data-footer-style="footerStyle"
                         data-show-columns="true"
                         data-toolbar="#modelsBulkEditToolbar"
                         data-bulk-button-id="#bulkModelsEditButton"
@@ -61,11 +63,8 @@
               "ignoreColumn": ["actions","image","change","checkbox","checkincheckout","icon"]
               }'>
               </table>
-
-          </div>
         </div>
         </div>
-        {{ Form::close() }}
       </div><!-- /.box-body -->
     </div><!-- /.box -->
   </div>
diff --git a/resources/views/models/view.blade.php b/resources/views/models/view.blade.php
index 7192e1edae..10c98d0768 100755
--- a/resources/views/models/view.blade.php
+++ b/resources/views/models/view.blade.php
@@ -31,7 +31,18 @@
 
 
 <div class="row">
+
+    @if ($model->deleted_at!='')
+        <div class="col-md-12">
+            <div class="callout callout-warning">
+                <x-icon type="warning" />
+                {{ trans('admin/models/general.deleted') }}
+            </div>
+        </div>
+    @endif
+
     <div class="col-md-9">
+
         <div class="nav-tabs-custom">
 
             <ul class="nav nav-tabs">
@@ -41,15 +52,15 @@
                         <span class="hidden-lg hidden-md">
                           <i class="fas fa-barcode fa-2x"></i>
                         </span>
-                                    <span class="hidden-xs hidden-sm">
-                                        {{ trans('general.assets') }}
-                                        {!! ($model->assets()->AssetsForShow()->count() > 0 ) ? '<badge class="badge badge-secondary">'.number_format($model->assets()->AssetsForShow()->count()).'</badge>' : '' !!}
+                        <span class="hidden-xs hidden-sm">
+                            {{ trans('general.assets') }}
+                            {!! ($model->assets()->AssetsForShow()->count() > 0 ) ? '<badge class="badge badge-secondary">'.number_format($model->assets()->AssetsForShow()->count()).'</badge>' : '' !!}
                         </span>
                     </a>
                 </li>
 
                 <li>
-                    <a href="#uploads" data-toggle="tab">
+                    <a href="#files" data-toggle="tab">
 
                         <span class="hidden-lg hidden-md">
                           <i class="fas fa-barcode fa-2x"></i>
@@ -62,7 +73,7 @@
                 </li>
                 <li class="pull-right">
                     <a href="#" data-toggle="modal" data-target="#uploadFileModal">
-                        <i class="fas fa-paperclip" aria-hidden="true"></i>
+                        <x-icon type="paperclip" />
                         {{ trans('button.upload') }}
                     </a>
                 </li>
@@ -80,6 +91,8 @@
                             data-pagination="true"
                             data-id-table="assetListingTable"
                             data-search="true"
+                            data-search-highlight="true"
+                            data-show-print="true"
                             data-side-pagination="server"
                             data-show-columns="true"
                             data-show-fullscreen="true"
@@ -98,108 +111,19 @@
                 "ignoreColumn": ["actions","image","change","checkbox","checkincheckout","icon"]
                 }'>
                     </table>
-                    {{ Form::close() }}
                 </div> <!-- /.tab-pane assets -->
 
 
-                <div class="tab-pane fade" id="uploads">
+                <div class="tab-pane fade" id="files">
 
                     <div class="row">
                         <div class="col-md-12">
 
-                            @if ($model->uploads->count() > 0)
-                                <table
-                                        class="table table-striped snipe-table"
-                                        id="modelFileHistory"
-                                        data-pagination="true"
-                                        data-id-table="modelFileHistory"
-                                        data-search="true"
-                                        data-side-pagination="client"
-                                        data-sortable="true"
-                                        data-show-columns="true"
-                                        data-show-fullscreen="true"
-                                        data-show-refresh="true"
-                                        data-sort-order="desc"
-                                        data-sort-name="created_at"
-                                        data-show-export="true"
-                                        data-export-options='{
-                         "fileName": "export-asset-{{ $model->id }}-files",
-                         "ignoreColumn": ["actions","image","change","checkbox","checkincheckout","icon"]
-                       }'
-                                        data-cookie-id-table="assetFileHistory">
-                                    <thead>
-                                    <tr>
-                                        <th data-visible="true" data-field="icon" data-sortable="true">{{trans('general.file_type')}}</th>
-                                        <th class="col-md-2" data-searchable="true" data-visible="true" data-field="image">{{ trans('general.image') }}</th>
-                                        <th class="col-md-2" data-searchable="true" data-visible="true" data-field="filename" data-sortable="true">{{ trans('general.file_name') }}</th>
-                                        <th class="col-md-1" data-searchable="true" data-visible="true" data-field="filesize">{{ trans('general.filesize') }}</th>
-                                        <th class="col-md-2" data-searchable="true" data-visible="true" data-field="notes" data-sortable="true">{{ trans('general.notes') }}</th>
-                                        <th class="col-md-1" data-searchable="true" data-visible="true" data-field="download">{{ trans('general.download') }}</th>
-                                        <th class="col-md-2" data-searchable="true" data-visible="true" data-field="created_at" data-sortable="true">{{ trans('general.created_at') }}</th>
-                                        <th class="col-md-1" data-searchable="true" data-visible="true" data-field="actions">{{ trans('table.actions') }}</th>
-                                    </tr>
-                                    </thead>
-                                    <tbody>
-
-                                    @foreach ($model->uploads as $file)
-                                        <tr>
-                                            <td><i class="{{ Helper::filetype_icon($file->filename) }} icon-med" aria-hidden="true"></i></td>
-                                            <td>
-                                                @if ((Storage::exists('private_uploads/assetmodels/'.$file->filename)) && ( Helper::checkUploadIsImage($file->get_src('assetmodels'))))
-                                                    <a href="{{ route('show/modelfile', ['modelID' => $model->id, 'fileId' => $file->id]) }}" data-toggle="lightbox" data-type="image" data-title="{{ $file->filename }}">
-                                                        <img src="{{ route('show/modelfile', ['modelID' => $model->id, 'fileId' =>$file->id]) }}" style="max-width: 50px;">
-                                                    </a>
-                                                @endif
-                                            </td>
-                                            <td>
-                                                @if (Storage::exists('private_uploads/assetmodels/'.$file->filename))
-                                                    {{ $file->filename }}
-                                                @else
-                                                    <del>{{ $file->filename }}</del>
-                                                @endif
-                                            </td>
-                                            <td data-value="{{ (Storage::exists('private_uploads/assetmodels/'.$file->filename)) ? Storage::size('private_uploads/assetmodels/'.$file->filename) : '' }}">
-                                                {{ (Storage::exists('private_uploads/assetmodels/'.$file->filename)) ? Helper::formatFilesizeUnits(Storage::size('private_uploads/assetmodels/'.$file->filename)) : '' }}
-                                            </td>
-                                            <td>
-                                                @if ($file->note)
-                                                    {{ $file->note }}
-                                                @endif
-                                            </td>
-                                            <td>
-                                                @if (($file->filename) && (Storage::exists('private_uploads/assetmodels/'.$file->filename)))
-                                                    <a href="{{ route('show/modelfile', [$model->id, $file->id]) }}" class="btn btn-sm btn-default">
-                                                        <i class="fas fa-download" aria-hidden="true"></i>
-                                                    </a>
-
-                                                    <a href="{{ route('show/modelfile', [$model->id, $file->id, 'inline'=>'true']) }}" class="btn btn-sm btn-default" target="_blank">
-                                                        <i class="fa fa-external-link" aria-hidden="true"></i>
-                                                    </a>
-
-                                                @endif
-                                            </td>
-                                            <td>
-                                                @if ($file->created_at)
-                                                    {{ Helper::getFormattedDateObject($file->created_at, 'datetime', false) }}
-                                                @endif
-                                            </td>
-                                            <td>
-                                                @can('update', \App\Models\AssetModel::class)
-                                                    <a class="btn delete-asset btn-sm btn-danger btn-sm" href="{{ route('delete/assetfile', [$model->id, $file->id]) }}" data-tooltip="true" data-title="Delete" data-content="{{ trans('general.delete_confirm', ['item' => $file->filename]) }}"><i class="fas fa-trash icon-white" aria-hidden="true"></i></a>
-                                                @endcan
-                                            </td>
-                                        </tr>
-                                    @endforeach
-                                    </tbody>
-                                </table>
-
-                            @else
-
-                                <div class="alert alert-info alert-block">
-                                    <i class="fas fa-info-circle"></i>
-                                    {{ trans('general.no_results') }}
-                                </div>
-                            @endif
+                            <x-filestable
+                                    filepath="private_uploads/assetmodels/"
+                                    showfile_routename="show/modelfile"
+                                    deletefile_routename="delete/modelfile"
+                                    :object="$model" />
 
                         </div> <!-- /.col-md-12 -->
                     </div> <!-- /.row -->
@@ -231,26 +155,33 @@
 
                 <ul class="list-unstyled" style="line-height: 25px;">
                     @if ($model->category)
-                        <li>{{ trans('general.category') }}:
+                        <li>
+                            <strong>{{ trans('general.category') }}</strong>:
                             <a href="{{ route('categories.show', $model->category->id) }}">{{ $model->category->name }}</a>
                         </li>
                     @endif
+                    @if ($model->deleted_at)
+                        <li>
+                            <strong>
+                                <span class="text-danger">
+                                {{ trans('general.deleted') }}:
+                                {{ Helper::getFormattedDateObject($model->deleted_at, 'datetime', false) }}
+                                </span>
+                            </strong>
 
-                    @if ($model->created_at)
-                        <li>{{ trans('general.created_at') }}:
-                            {{ Helper::getFormattedDateObject($model->created_at, 'datetime', false) }}
                         </li>
                     @endif
 
                     @if ($model->min_amt)
-                        <li>{{ trans('general.min_amt') }}:
+                        <li>
+                            <strong>{{ trans('general.min_amt') }}</strong>:
                            {{$model->min_amt }}
                         </li>
                     @endif
 
                     @if ($model->manufacturer)
                         <li>
-                            {{ trans('general.manufacturer') }}:
+                            <strong>{{ trans('general.manufacturer') }}</strong>:
                             @can('view', \App\Models\Manufacturer::class)
                                 <a href="{{ route('manufacturers.show', $model->manufacturer->id) }}">
                                     {{ $model->manufacturer->name }}
@@ -268,7 +199,7 @@
 
                         @if ($model->manufacturer->support_url)
                             <li>
-                                <i class="far fa-life-ring"></i> <a href="{{ $model->manufacturer->support_url }}">{{ $model->manufacturer->support_url }}</a>
+                                <x-icon type="more-info" /> <a href="{{ $model->manufacturer->support_url }}">{{ $model->manufacturer->support_url }}</a>
                             </li>
                         @endif
 
@@ -288,83 +219,101 @@
                     @endif
                     @if ($model->model_number)
                         <li>
-                            {{ trans('general.model_no') }}:
+                            <strong>{{ trans('general.model_no') }}</strong>:
                             {{ $model->model_number }}
                         </li>
                     @endif
 
                     @if ($model->depreciation)
                         <li>
-                            {{ trans('general.depreciation') }}:
+                            <strong>{{ trans('general.depreciation') }}</strong>:
                             {{ $model->depreciation->name }} ({{ $model->depreciation->months.' '.trans('general.months')}})
                         </li>
                     @endif
 
                     @if ($model->eol)
-                        <li>{{ trans('general.eol') }}:
+                        <li>
+                            <strong>{{ trans('general.eol') }}</strong>:
                             {{ $model->eol .' '. trans('general.months') }}
                         </li>
                     @endif
 
                     @if ($model->fieldset)
-                        <li>{{ trans('admin/models/general.fieldset') }}:
+                        <li>
+                            <strong>{{ trans('admin/models/general.fieldset') }}</strong>:
                             <a href="{{ route('fieldsets.show', $model->fieldset->id) }}">{{ $model->fieldset->name }}</a>
                         </li>
                     @endif
 
                     @if ($model->notes)
                         <li>
-                            {{ trans('general.notes') }}:
+                            <strong>{{ trans('general.notes') }}</strong>:
                             {!! nl2br(Helper::parseEscapedMarkedownInline($model->notes)) !!}
                         </li>
                     @endif
 
-                </ul>
+                        @if ($model->created_at)
+                            <li>
+                                <strong>{{ trans('general.created_at') }}</strong>:
+                                {{ Helper::getFormattedDateObject($model->created_at, 'datetime', false) }}
+                            </li>
+                        @endif
 
-                @if ($model->note)
-                    Notes:
-                    <p>
-                        {!! $model->present()->note() !!}
-                    </p>
-                @endif
-            </div>
+                        @if ($model->adminuser)
+                            <li>
+                                <strong>{{ trans('general.created_by') }}</strong>:
+                                {{ $model->adminuser->present()->name() }}
+                            </li>
+                        @endif
+
+
+                </ul>
+                </div>
         </div>
         </div>
             @can('update', \App\Models\AssetModel::class)
             <div class="col-md-12" style="padding-bottom: 5px;">
-                <a href="{{ route('models.edit', $model->id) }}" style="width: 100%;" class="btn btn-sm btn-primary hidden-print">{{ trans('admin/models/table.edit') }}</a>
+                <a href="{{ ($model->deleted_at=='') ? route('models.edit', $model->id) : '#' }}" style="width: 100%;" class="btn btn-sm btn-warning btn-social hidden-print{{ ($model->deleted_at!='') ? ' disabled' : '' }}">
+                    <x-icon type="edit" />
+                    {{ trans('admin/models/table.edit') }}
+                </a>
             </div>
             @endcan
 
             @can('create', \App\Models\AssetModel::class)
             <div class="col-md-12" style="padding-bottom: 5px;">
-                <a href="{{ route('models.clone.create', $model->id) }}" style="width: 100%;" class="btn btn-sm btn-primary hidden-print">{{ trans('admin/models/table.clone') }}</a>
+                <a href="{{ route('models.clone.create', $model->id) }}" style="width: 100%;" class="btn btn-sm btn-info btn-social hidden-print">
+                    <x-icon type="clone" />
+                    {{ trans('admin/models/table.clone') }}
+                </a>
             </div>
             @endcan
 
             @can('delete', \App\Models\AssetModel::class)
-                @if ($model->assets_count > 0)
-                    <div class="col-md-12" style="padding-bottom: 5px;">
-                        <button class="btn btn-block btn-sm btn-primary hidden-print disabled" data-tooltip="true"  data-placement="top" data-title="{{ trans('general.cannot_be_deleted') }}">{{ trans('general.delete') }}</button>
-                    </div>
-                @else
+                <div class="col-md-12" style="padding-top: 10px;">
 
+                    @if ($model->deleted_at!='')
+                        <form method="POST" action="{{ route('models.restore.store', $model->id) }}">
+                            @csrf
+                            <button style="width: 100%;" class="btn btn-sm btn-warning btn-social hidden-print">
+                                <x-icon type="restore" />
+                                {{ trans('button.restore') }}
+                            </button>
+                        </form>
+                    @elseif ($model->assets()->count() > 0)
+                        <button class="btn btn-block btn-sm btn-danger btn-social hidden-print disabled" data-tooltip="true"  data-placement="top" data-title="{{ trans('general.cannot_be_deleted') }}">
+                            <x-icon type="delete" />
+                            {{ trans('general.delete') }}
+                        </button>
+                    @else
+                        <button class="btn btn-block btn-sm btn-danger btn-social delete-asset" data-toggle="modal" title="{{ trans('general.delete_what', ['item'=> trans('general.asset_model')]) }}" data-content="{{ trans('general.sure_to_delete_var', ['item' => $model->name]) }}" data-target="#dataConfirmModal" data-tooltip="true"  data-placement="top" data-title="{{ trans('general.delete_what', ['item'=> trans('general.asset_model')]) }}">
+                            <x-icon type="delete" />
+                            {{ trans('general.delete') }}
+                        </button>
+                </div>
                 @endif
-
-
-               <div class="text-center col-md-12" style="padding-top: 30px; padding-bottom: 30px;">
-                @if  ($model->deleted_at!='')
-                    <form method="POST" action="{{ route('models.restore.store', $model->id) }}">
-                        @csrf
-                        <button style="width: 100%;" class="btn btn-sm btn-warning hidden-print">{{ trans('button.restore') }}</button>
-                    </form>
-                @else
-                    <button class="btn btn-block btn-sm btn-danger delete-asset" data-toggle="modal" title="{{ trans('general.delete_what', ['item'=> trans('general.asset_model')]) }}" data-content="{{ trans('general.sure_to_delete_var', ['item' => $model->name]) }}" data-target="#dataConfirmModal" data-tooltip="true"  data-placement="top" data-title="{{ trans('general.delete_what', ['item'=> trans('general.asset_model')]) }}">{{ trans('general.delete') }} </button>
-                    <span class="sr-only">{{ trans('general.delete') }}</span>
-                @endif
-               </div>
-
            @endcan
+
         </div>
 </div> <!-- /.row -->
 
diff --git a/resources/views/notifications.blade.php b/resources/views/notifications.blade.php
index a64436f68d..f14a2f351c 100755
--- a/resources/views/notifications.blade.php
+++ b/resources/views/notifications.blade.php
@@ -1,5 +1,5 @@
 @if ($errors->any())
-<div class="col-md-12">
+<div class="col-md-12" id="error-notification">
     <div class="alert alert-danger fade in">
         <button type="button" class="close" data-dismiss="alert">&times;</button>
         <i class="fas fa-exclamation-triangle faa-pulse animated"></i>
@@ -12,7 +12,7 @@
 
 
 @if ($message = session()->get('status'))
-    <div class="col-md-12">
+    <div class="col-md-12" id="success-notification">
         <div class="alert alert-success fade in">
             <button type="button" class="close" data-dismiss="alert">&times;</button>
             <i class="fas fa-check faa-pulse animated"></i>
@@ -24,7 +24,7 @@
 
 
 @if ($message = session()->get('success'))
-<div class="col-md-12">
+<div class="col-md-12" id="success-notification">
     <div class="alert alert-success fade in">
         <button type="button" class="close" data-dismiss="alert">&times;</button>
         <i class="fas fa-check faa-pulse animated"></i>
@@ -32,11 +32,12 @@
         {{ $message }}
     </div>
 </div>
+@include ('partials.confetti-js')
 @endif
 
 
 @if ($message = session()->get('success-unescaped'))
-    <div class="col-md-12">
+    <div class="col-md-12" id="success-notification">
         <div class="alert alert-success fade in">
             <button type="button" class="close" data-dismiss="alert">&times;</button>
             <i class="fas fa-check faa-pulse animated"></i>
@@ -44,12 +45,13 @@
             {!!  $message !!}
         </div>
     </div>
+    @include ('partials.confetti-js')
 @endif
 
 
 @if ($assets = session()->get('assets'))
     @foreach ($assets as $asset)
-        <div class="col-md-12">
+        <div class="col-md-12" id="multi-error-notification">
             <div class="alert alert-info fade in">
                 <button type="button" class="close" data-dismiss="alert">&times;</button>
                 <i class="fas fa-info-circle faa-pulse animated"></i>
@@ -75,7 +77,7 @@
 
 @if ($consumables = session()->get('consumables'))
     @foreach ($consumables as $consumable)
-        <div class="col-md-12">
+        <div class="col-md-12" id="success-notification">
             <div class="alert alert-info fade in">
                 <button type="button" class="close" data-dismiss="alert">&times;</button>
                 <i class="fas fa-info-circle faa-pulse animated"></i>
diff --git a/resources/views/notifications/FirstAdmin.blade.php b/resources/views/notifications/FirstAdmin.blade.php
index b6d8e89db2..83a5c8bf04 100644
--- a/resources/views/notifications/FirstAdmin.blade.php
+++ b/resources/views/notifications/FirstAdmin.blade.php
@@ -1,8 +1,8 @@
 @component('mail::message')
 {{ trans('mail.hello') }} {{ $first_name }} {{$last_name}},
 
-{{ trans('mail.login') }} {{ $username }} <br>
-{{ trans('mail.password') }} {{ $password }}
+{{ trans('mail.login') }}: {{ $username }} <br>
+{{ trans('mail.password') }}: {{ $password }}
 
 @component('mail::button', ['url' => $url])
 Go To {{$snipeSettings->site_name}}
diff --git a/resources/views/notifications/Welcome.blade.php b/resources/views/notifications/Welcome.blade.php
index 82dcd3e155..e6e72ad2cd 100644
--- a/resources/views/notifications/Welcome.blade.php
+++ b/resources/views/notifications/Welcome.blade.php
@@ -3,8 +3,8 @@
 
 {{ trans('mail.admin_has_created', ['web' => $snipeSettings->site_name]) }}
 
-{{ trans('mail.login') }} {{ $username }} <br>
-{{ trans('mail.password') }} {{ $password }}
+{{ trans('mail.login') }}: {{ $username }} <br>
+{{ trans('mail.password') }}: {{ $password }}
 
 @component('mail::button', ['url' => $url])
 Go To {{$snipeSettings->site_name}}
diff --git a/resources/views/notifications/markdown/asset-acceptance.blade.php b/resources/views/notifications/markdown/asset-acceptance.blade.php
index 93292375a5..1a9569609e 100644
--- a/resources/views/notifications/markdown/asset-acceptance.blade.php
+++ b/resources/views/notifications/markdown/asset-acceptance.blade.php
@@ -7,6 +7,9 @@
 |        |          |
 | ------------- | ------------- |
 | **{{ trans('mail.user') }}** | {{ $assigned_to }} |
+@if (isset($user->location))
+| **{{ trans('general.location') }}** | {{ $user->location->name }} |
+@endif
 @if (isset($accepted_date))
 | **{{ ucfirst(trans('general.accepted')) }}** | {{ $accepted_date }} |
 @endif
@@ -16,9 +19,15 @@
 @if (isset($note))
 | **{{ trans('general.notes') }}** | {{ $note }} |
 @endif
+@if (isset($item_status))
+| **{{ trans('general.status') }}** | {{ $item_status }} |
+@endif
 @if ((isset($item_tag)) && ($item_tag!=''))
 | **{{ trans('mail.asset_tag') }}** | {{ $item_tag }} |
 @endif
+@if (isset($item->model->category))
+| **{{ trans('general.category') }}** | {{ $item->model->category->name }} |
+@endif
 @if ((isset($item_model)) && ($item_model!=''))
 | **{{ trans('mail.asset_name') }}** | {{ $item_model }} |
 @endif
diff --git a/resources/views/notifications/markdown/asset-reminder.blade.php b/resources/views/notifications/markdown/asset-reminder.blade.php
new file mode 100644
index 0000000000..691f454a36
--- /dev/null
+++ b/resources/views/notifications/markdown/asset-reminder.blade.php
@@ -0,0 +1,11 @@
+@component('mail::message')
+# {{ trans('mail.hello') }} {{ $assigned_to}},
+
+{{trans('mail.item_checked_reminder', ['count' => $count])}}
+[{{ trans('general.click_here')}}]({{$accept_url}})
+
+{{ trans('mail.best_regards') }}
+
+{{ $snipeSettings->site_name }}
+
+@endcomponent
diff --git a/resources/views/notifications/markdown/asset-requested.blade.php b/resources/views/notifications/markdown/asset-requested.blade.php
index 56ceefb4a7..a634993f99 100644
--- a/resources/views/notifications/markdown/asset-requested.blade.php
+++ b/resources/views/notifications/markdown/asset-requested.blade.php
@@ -18,6 +18,9 @@
 @if ((isset($item->asset_tag)) && ($item->asset_tag!=''))
 | **{{ trans('mail.asset_tag') }}** | {{ $item->asset_tag }} |
 @endif
+@if (isset($item->model->category))
+| **{{ trans('general.category') }}** | {{ $item->model->category->name }} |
+@endif
 @if ((isset($item->name)) && ($item->name!=''))
 | **{{ trans('mail.asset_name') }}** | {{ $item->name }} |
 @endif
diff --git a/resources/views/notifications/markdown/report-expected-checkins.blade.php b/resources/views/notifications/markdown/report-expected-checkins.blade.php
index 08b81350e4..be50e07a98 100644
--- a/resources/views/notifications/markdown/report-expected-checkins.blade.php
+++ b/resources/views/notifications/markdown/report-expected-checkins.blade.php
@@ -9,8 +9,11 @@
 @foreach ($assets as $asset)
 @php
 $checkin = Helper::getFormattedDateObject($asset->expected_checkin, 'date');
+
+$assignedToName = $asset->assignedTo ? $asset->assignedTo->present()->fullName : trans('general.unknown_user');
+$assignedToRoute = $asset->assignedTo ? route($asset->targetShowRoute().'.show', [$asset->assignedTo->id]) : '';
 @endphp
-| [{{ $asset->present()->name }}]({{ route('hardware.show', ['hardware' => $asset->id]) }}) | [{{ $asset->assignedTo->present()->fullName }}]({{ route($asset->targetShowRoute().'.show', [$asset->assignedTo->id]) }})  | {{ $checkin['formatted'] }}
+| [{{ $asset->present()->name }}]({{ route('hardware.show', $asset) }}) | @if ($asset->assignedTo) [{{ $assignedToName }}]({{ $assignedToRoute }}) @else {{ $assignedToName }} @endif  | {{ $checkin['formatted'] }}
 @endforeach
 @endcomponent
 
diff --git a/resources/views/notifications/markdown/upcoming-audits.blade.php b/resources/views/notifications/markdown/upcoming-audits.blade.php
index e623941d25..c6b9bf445b 100644
--- a/resources/views/notifications/markdown/upcoming-audits.blade.php
+++ b/resources/views/notifications/markdown/upcoming-audits.blade.php
@@ -9,7 +9,7 @@
 @php
 $next_audit_date = Helper::getFormattedDateObject($asset->next_audit_date, 'date', false);
 $last_audit_date = Helper::getFormattedDateObject($asset->last_audit_date, 'date', false);
-$diff = Carbon::parse(Carbon::now())->diffInDays($asset->next_audit_date, false);
+$diff = (int) Carbon::parse(Carbon::now())->diffInDays($asset->next_audit_date, true);
 $icon = ($diff <= 7) ? '🚨' : (($diff <= 14) ? '⚠️' : ' ');
 @endphp
 |{{ $icon }}| [{{ $asset->present()->name }}]({{ route('hardware.show', $asset->id) }}) | {{ $last_audit_date }}| {{ $next_audit_date }} | {{ $diff }}  | {{ ($asset->supplier ? e($asset->supplier->name) : '') }}|{{ ($asset->assignedTo ? $asset->assignedTo->present()->name() : '') }}|{{ $asset->notes }}
diff --git a/resources/views/notifications/markdown/user-inventory.blade.php b/resources/views/notifications/markdown/user-inventory.blade.php
index f1b329ec8d..6c062b4a0a 100644
--- a/resources/views/notifications/markdown/user-inventory.blade.php
+++ b/resources/views/notifications/markdown/user-inventory.blade.php
@@ -9,12 +9,15 @@
 ## {{ $assets->count() }} {{ trans('general.assets') }}
 
 <table width="100%">
-    <tr><th align="left">{{ trans('mail.name') }} </th><th align="left">{{ trans('mail.asset_tag') }}</th><th align="left">{{ trans('admin/hardware/table.serial') }}</th> <th></th> </tr>
+    <tr><th align="left">{{ trans('mail.name') }} </th><th align="left">{{ trans('mail.asset_tag') }}</th><th align="left">{{ trans('admin/hardware/table.serial') }}</th><th align="left">{{ trans('general.category') }}</th> <th></th> </tr>
+
+
 @foreach($assets as $asset)
 <tr>
     <td>{{ $asset->present()->name }}</td>
     <td> {{ $asset->asset_tag }} </td>
     <td> {{ $asset->serial }} </td>
+    <td> {{ $asset->model->category->name }}</td>
     @if (($snipeSettings->show_images_in_email =='1') && $asset->getImageUrl())
     <td>
         <img src="{{ asset($asset->getImageUrl()) }}" alt="Asset" style="max-width: 64px;">
diff --git a/resources/views/partials/asset-bulk-actions.blade.php b/resources/views/partials/asset-bulk-actions.blade.php
index d46b4e525b..45c409285a 100644
--- a/resources/views/partials/asset-bulk-actions.blade.php
+++ b/resources/views/partials/asset-bulk-actions.blade.php
@@ -1,10 +1,12 @@
 <div id="{{ (isset($id_divname)) ? $id_divname : 'assetsBulkEditToolbar' }}" style="min-width:400px">
-{{ Form::open([
-      'method' => 'POST',
-      'route' => ['hardware/bulkedit'],
-      'class' => 'form-inline',
-      'id' => (isset($id_formname)) ? $id_formname : 'assetsBulkForm',
- ]) }}
+    <form
+    method="POST"
+    action="{{ route('hardware/bulkedit') }}"
+    accept-charset="UTF-8"
+    class="form-inline"
+    id="{{ (isset($id_formname)) ? $id_formname : 'assetsBulkForm' }}"
+>
+    @csrf
 
     {{-- The sort and order will only be used if the cookie is actually empty (like on first-use) --}}
     <input name="sort" type="hidden" value="assets.id">
@@ -15,21 +17,31 @@
         </span>
     </label>
     <select name="bulk_actions" class="form-control select2" aria-label="bulk_actions" style="min-width: 350px;">
-        @if((isset($status)) && ($status == 'Deleted'))
-        @can('delete', \App\Models\Asset::class)
-            <option value="restore">{{trans('button.restore')}}</option> 
-        @endcan
+        @if ((isset($status)) && ($status == 'Deleted'))
+            @can('delete', \App\Models\Asset::class)
+                <option value="restore">{{trans('button.restore')}}</option>
+            @endcan
         @else
-        @can('update', \App\Models\Asset::class)
-            <option value="edit">{{ trans('button.edit') }}</option>
-        @endcan
-        @can('delete', \App\Models\Asset::class)
-            <option value="delete">{{ trans('button.delete') }}</option>
-        @endcan
-        <option value="labels" accesskey="l">{{ trans_choice('button.generate_labels', 2) }}</option>
+
+            @can('update', \App\Models\Asset::class)
+                <option value="edit">{{ trans('button.edit') }}</option>
+                <option value="maintenance">{{ trans('button.add_maintenance') }}</option>
+            @endcan
+
+            @if((!isset($status)) || (($status != 'Deployed') && ($status != 'Archived')))
+                @can('checkout', \App\Models\Asset::class)
+                    <option value="checkout">{{ trans('general.bulk_checkout') }}</option>
+                @endcan
+            @endif
+
+            @can('delete', \App\Models\Asset::class)
+                <option value="delete">{{ trans('button.delete') }}</option>
+            @endcan
+
+            <option value="labels" {{$snipeSettings->shortcuts_enabled == 1 ? "accesskey=l" : ''}}>{{ trans_choice('button.generate_labels', 2) }}</option>
         @endif
     </select>
 
     <button class="btn btn-primary" id="{{ (isset($id_button)) ? $id_button : 'bulkAssetEditButton' }}" disabled>{{ trans('button.go') }}</button>
-    {{ Form::close() }}
+    </form>
 </div>
diff --git a/resources/views/partials/bootstrap-table.blade.php b/resources/views/partials/bootstrap-table.blade.php
index fc1f0bedcc..74704a00e0 100644
--- a/resources/views/partials/bootstrap-table.blade.php
+++ b/resources/views/partials/bootstrap-table.blade.php
@@ -5,11 +5,15 @@
 @push('js')
 
 <script src="{{ url(mix('js/dist/bootstrap-table.js')) }}"></script>
+<script src="{{ url(mix('js/dist/bootstrap-table-locale-all.min.js')) }}"></script>
+
+<!-- load english again here, even though it's in the all.js file, because if BS table doesn't have the translation, it otherwise defaults to chinese. See https://bootstrap-table.com/docs/api/table-options/#locale -->
+<script src="{{ url(mix('js/dist/bootstrap-table-en-US.min.js')) }}"></script>
 
 <script nonce="{{ csrf_token() }}">
     $(function () {
 
-        var locale = '{{ config('app.locale') }}';
+
         var blockedFields = "searchable,sortable,switchable,title,visible,formatter,class".split(",");
 
         var keyBlocked = function(key) {
@@ -26,7 +30,16 @@
             data_export_options = $(this).attr('data-export-options');
             export_options = data_export_options ? JSON.parse(data_export_options) : {};
             export_options['htmlContent'] = false; // this is already the default; but let's be explicit about it
-            export_options['jspdf']= {"orientation": "l"};
+            export_options['jspdf'] = {
+                "orientation": "l",
+                "autotable": {
+                        "styles": {
+                            overflow: 'linebreak'
+                        },
+                        tableWidth: 'wrap'
+                }
+            };
+            // tableWidth: 'wrap',
             // the following callback method is necessary to prevent XSS vulnerabilities
             // (this is taken from Bootstrap Tables's default wrapper around jQuery Table Export)
             export_options['onCellHtmlData'] = function (cell, rowIndex, colIndex, htmlData) {
@@ -36,66 +49,93 @@
                 return htmlData
             }
             $(this).bootstrapTable({
-            classes: 'table table-responsive table-no-bordered',
-            ajaxOptions: {
-                headers: {
-                    'X-CSRF-TOKEN': $('meta[name="csrf-token"]').attr('content')
-                }
-            },
-            // reorderableColumns: true,
-            stickyHeader: true,
-            stickyHeaderOffsetLeft: parseInt($('body').css('padding-left'), 10),
-            stickyHeaderOffsetRight: parseInt($('body').css('padding-right'), 10),
-            locale: '{{ app()->getLocale() }}',
-            undefinedText: '',
-            iconsPrefix: 'fa',
-            cookieStorage: '{{ config('session.bs_table_storage') }}',
-            cookie: true,
-            cookieExpire: '2y',
-            showColumnsToggleAll: true,
-            minimumCountColumns: 2,
-            mobileResponsive: true,
-            maintainSelected: true,
-            trimOnSearch: false,
-            showSearchClearButton: true,
-            addrbar: {{ (config('session.bs_table_addrbar') == 'true') ? 'true' : 'false'}}, // deeplink search phrases, sorting, etc
-            paginationFirstText: "{{ trans('general.first') }}",
-            paginationLastText: "{{ trans('general.last') }}",
-            paginationPreText: "{{ trans('general.previous') }}",
-            paginationNextText: "{{ trans('general.next') }}",
-            pageList: ['10','20', '30','50','100','150','200'{!! ((config('app.max_results') > 200) ? ",'500'" : '') !!}{!! ((config('app.max_results') > 500) ? ",'".config('app.max_results')."'" : '') !!}],
-            pageSize: {{  (($snipeSettings->per_page!='') && ($snipeSettings->per_page > 0)) ? $snipeSettings->per_page : 20 }},
-            paginationVAlign: 'both',
-            queryParams: function (params) {
-                var newParams = {};
-                for(var i in params) {
-                    if(!keyBlocked(i)) { // only send the field if it's not in blockedFields
-                        newParams[i] = params[i];
+                classes: 'table table-responsive table-no-bordered',
+                ajaxOptions: {
+                    headers: {
+                        'X-CSRF-TOKEN': $('meta[name="csrf-token"]').attr('content')
                     }
+                },
+                // reorderableColumns: true,
+                stickyHeader: true,
+                stickyHeaderOffsetLeft: parseInt($('body').css('padding-left'), 10),
+                stickyHeaderOffsetRight: parseInt($('body').css('padding-right'), 10),
+                undefinedText: '',
+                iconsPrefix: 'fa',
+                cookieStorage: '{{ config('session.bs_table_storage') }}',
+                cookie: true,
+                cookieExpire: '2y',
+                showColumnsToggleAll: true,
+                minimumCountColumns: 2,
+                mobileResponsive: true,
+                maintainSelected: true,
+                trimOnSearch: false,
+                showSearchClearButton: true,
+                addrbar: {{ (config('session.bs_table_addrbar') == 'true') ? 'true' : 'false'}}, // deeplink search phrases, sorting, etc
+                paginationFirstText: "{{ trans('general.first') }}",
+                paginationLastText: "{{ trans('general.last') }}",
+                paginationPreText: "{{ trans('general.previous') }}",
+                paginationNextText: "{{ trans('general.next') }}",
+                pageList: ['10', '20', '30', '50', '100', '150', '200'{!! ((config('app.max_results') > 200) ? ",'500'" : '') !!}{!! ((config('app.max_results') > 500) ? ",'".config('app.max_results')."'" : '') !!}],
+                pageSize: {{  (($snipeSettings->per_page!='') && ($snipeSettings->per_page > 0)) ? $snipeSettings->per_page : 20 }},
+                paginationVAlign: 'both',
+                queryParams: function (params) {
+                    var newParams = {};
+                    for (var i in params) {
+                        if (!keyBlocked(i)) { // only send the field if it's not in blockedFields
+                            newParams[i] = params[i];
+                        }
+                    }
+                    return newParams;
+                },
+                formatLoadingMessage: function () {
+                    return '<h2><x-icon type="spinner" /> {{ trans('general.loading') }} </h2>';
+                },
+                icons: {
+                    advancedSearchIcon: 'fas fa-search-plus',
+                    paginationSwitchDown: 'fa-caret-square-o-down',
+                    paginationSwitchUp: 'fa-caret-square-o-up',
+                    fullscreen: 'fa-expand',
+                    columns: 'fa-columns',
+                    refresh: 'fas fa-sync-alt',
+                    export: 'fa-download',
+                    clearSearch: 'fa-times'
+                },
+                locale: '{{ app()->getLocale() }}',
+                exportOptions: export_options,
+                exportTypes: ['xlsx', 'excel', 'csv', 'pdf', 'json', 'xml', 'txt', 'sql', 'doc'],
+                onLoadSuccess: function () { // possible 'fixme'? this might be for contents, not for headers?
+                    $('[data-tooltip="true"]').tooltip(); // Needed to attach tooltips after ajax call
+                },
+                onPostHeader: function () {
+                    var lookup = {};
+                    var lookup_initialized = false;
+                    var ths = $('th');
+                    ths.each(function (index, element) {
+                        th = $(element);
+                        //only populate the lookup table once; don't need to keep doing it.
+                        if (!lookup_initialized) {
+                            // th -> tr -> thead -> table
+                            var table = th.parent().parent().parent()
+                            var column_data = table.data('columns')
+                            for (var column in column_data) {
+                                lookup[column_data[column].field] = column_data[column].titleTooltip;
+                            }
+                            lookup_initialized = true
+                        }
+
+                        field = th.data('field'); // find fieldname this column refers to
+                        title = lookup[field];
+                        if (title) {
+                            th.attr('data-toggle', 'tooltip');
+                            th.attr('data-placement', 'top');
+                            // th.attr('title', title) //this causes 'double-titles' which looks gross
+                            th.tooltip({container: 'body', title: title});
+                        }
+                    })
+                },
+                formatNoMatches: function () {
+                    return '{{ trans('table.no_matching_records') }}';
                 }
-                return newParams;
-            },
-            formatLoadingMessage: function () {
-                return '<h2><i class="fas fa-spinner fa-spin" aria-hidden="true"></i> {{ trans('general.loading') }} </h2>';
-            },
-            icons: {
-                advancedSearchIcon: 'fas fa-search-plus',
-                paginationSwitchDown: 'fa-caret-square-o-down',
-                paginationSwitchUp: 'fa-caret-square-o-up',
-                fullscreen: 'fa-expand',
-                columns: 'fa-columns',
-                refresh: 'fas fa-sync-alt',
-                export: 'fa-download',
-                clearSearch: 'fa-times'
-            },
-            exportOptions: export_options,
-            exportTypes: ['xlsx', 'excel', 'csv', 'pdf','json', 'xml', 'txt', 'sql', 'doc' ],
-            onLoadSuccess: function () {
-                $('[data-tooltip="true"]').tooltip(); // Needed to attach tooltips after ajax call
-            },
-            formatNoMatches: function () {
-                return '{{ trans('table.no_matching_records') }}';
-            }
 
             });
 
@@ -202,7 +242,35 @@
     });
 
 
-    
+
+    // This specifies the footer columns that should have special styles associated
+    // (usually numbers)
+    window.footerStyle = column => ({
+        remaining: {
+            classes: 'text-padding-number-footer-cell'
+        },
+        qty: {
+            classes: 'text-padding-number-footer-cell',
+        },
+        purchase_cost: {
+            classes: 'text-padding-number-footer-cell'
+        },
+        checkouts_count: {
+            classes: 'text-padding-number-footer-cell'
+        },
+        assets_count: {
+            classes: 'text-padding-number-footer-cell'
+        },
+        seats: {
+            classes: 'text-padding-number-footer-cell'
+        },
+        free_seats_count: {
+            classes: 'text-padding-number-footer-cell'
+        },
+    }[column.field]);
+
+
+
 
     // This only works for model index pages because it uses the row's model ID
     function genericRowLinkFormatter(destination) {
@@ -265,8 +333,15 @@
         };
     }
 
+
+    function licenseKeyFormatter(value, row) {
+        return '<code class="single-line"><span class="js-copy-link" data-clipboard-target=".js-copy-key-' + row.id + '" aria-hidden="true" data-tooltip="true" data-placement="top" title="{{ trans('general.copy_to_clipboard') }}"><span class="js-copy-key-' + row.id + '">' + value + '</span></span></code>';
+    }
+
+
+
     function hardwareAuditFormatter(value, row) {
-        return '<a href="{{ config('app.url') }}/hardware/audit/' + row.id + '/" class="btn btn-sm bg-yellow" data-tooltip="true" title="Audit this item">{{ trans('general.audit') }}</a>';
+        return '<a href="{{ config('app.url') }}/hardware/' + row.id + '/audit" class="actions btn btn-sm btn-primary" data-tooltip="true" title="{{ trans('general.audit') }}"><x-icon type="audit" /><span class="sr-only">{{ trans('general.audit') }}</span></a>&nbsp;';
     }
 
 
@@ -276,8 +351,8 @@
             element_name = '';
         }
 
-        return function (value,row) {
 
+        return function (value,row) {
             var actions = '<nobr>';
 
             // Add some overrides for any funny urls we have
@@ -287,44 +362,51 @@
                 var dest = 'admin/groups';
             }
 
-            if (dest =='maintenances') {
-                var dest = 'hardware/maintenances';
-            }
 
             if(element_name != '') {
                 dest = dest + '/' + row.owner_id + '/' + element_name;
             }
 
             if ((row.available_actions) && (row.available_actions.clone === true)) {
-                actions += '<a href="{{ config('app.url') }}/' + dest + '/' + row.id + '/clone" class="actions btn btn-sm btn-info" data-tooltip="true" title="{{ trans('general.clone_item') }}"><i class="far fa-clone" aria-hidden="true"></i><span class="sr-only">Clone</span></a>&nbsp;';
+                actions += '<a href="{{ config('app.url') }}/' + dest + '/' + row.id + '/clone" class="actions btn btn-sm btn-info" data-tooltip="true" title="{{ trans('general.clone_item') }}"><x-icon type="clone" /><span class="sr-only">{{ trans('general.clone_item') }}</span></a>&nbsp;';
+            }
+
+            if ((row.available_actions) && (row.available_actions.audit === true)) {
+                actions += '<a href="{{ config('app.url') }}/' + dest + '/' + row.id + '/audit" class="actions btn btn-sm btn-primary" data-tooltip="true" title="{{ trans('general.audit') }}"><x-icon type="audit" /><span class="sr-only">{{ trans('general.audit') }}</span></a>&nbsp;';
             }
 
             if ((row.available_actions) && (row.available_actions.update === true)) {
-                actions += '<a href="{{ config('app.url') }}/' + dest + '/' + row.id + '/edit" class="actions btn btn-sm btn-warning" data-tooltip="true" title="{{ trans('general.update') }}"><i class="fas fa-pencil-alt" aria-hidden="true"></i><span class="sr-only">{{ trans('general.update') }}</span></a>&nbsp;';
+                actions += '<a href="{{ config('app.url') }}/' + dest + '/' + row.id + '/edit" class="actions btn btn-sm btn-warning" data-tooltip="true" title="{{ trans('general.update') }}"><x-icon type="edit" /><span class="sr-only">{{ trans('general.update') }}</span></a>&nbsp;';
             } else {
                 if ((row.available_actions) && (row.available_actions.update != true)) {
-                    actions += '<span data-tooltip="true" title="{{ trans('general.cannot_be_edited') }}"><a class="btn btn-warning btn-sm disabled" onClick="return false;"><i class="fas fa-pencil-alt"></i></a></span>&nbsp;';
+                    actions += '<span data-tooltip="true" title="{{ trans('general.cannot_be_edited') }}"><a class="btn btn-warning btn-sm disabled" onClick="return false;"><x-icon type="edit" /></a></span>&nbsp;';
                 }
             }
 
             if ((row.available_actions) && (row.available_actions.delete === true)) {
 
                 // use the asset tag if no name is provided
-                var name_for_box = row.name
-                if (row.name=='') {
+
+                if (row.name) {
+                    var name_for_box = row.name
+                } else if (row.title) {
+                    var name_for_box = row.title
+                } else if (row.asset_tag) {
                     var name_for_box = row.asset_tag
                 }
+
+
                 
                 actions += '<a href="{{ config('app.url') }}/' + dest + '/' + row.id + '" '
                     + ' class="actions btn btn-danger btn-sm delete-asset" data-tooltip="true"  '
                     + ' data-toggle="modal" '
-                    + ' data-content="{{ trans('general.sure_to_delete') }} ' + name_for_box + '?" '
+                    + ' data-content="{{ trans('general.sure_to_delete') }}: ' + name_for_box + '?" '
                     + ' data-title="{{  trans('general.delete') }}" onClick="return false;">'
-                    + '<i class="fas fa-trash" aria-hidden="true"></i><span class="sr-only">{{ trans('general.delete') }}</span></a>&nbsp;';
+                    + '<x-icon type="delete" /><span class="sr-only">{{ trans('general.delete') }}</span></a>&nbsp;';
             } else {
                 // Do not show the delete button on things that are already deleted
                 if ((row.available_actions) && (row.available_actions.restore != true)) {
-                    actions += '<span data-tooltip="true" title="{{ trans('general.cannot_be_deleted') }}"><a class="btn btn-danger btn-sm delete-asset disabled" onClick="return false;"><i class="fas fa-trash"></i></a></span>&nbsp;';
+                    actions += '<span data-tooltip="true" title="{{ trans('general.cannot_be_deleted') }}"><a class="btn btn-danger btn-sm delete-asset disabled" onClick="return false;"><x-icon type="delete" /><span class="sr-only">{{ trans('general.cannot_be_deleted') }}</span></a></span>&nbsp;';
                 }
 
             }
@@ -333,7 +415,7 @@
             if ((row.available_actions) && (row.available_actions.restore === true)) {
                 actions += '<form style="display: inline;" method="POST" action="{{ config('app.url') }}/' + dest + '/' + row.id + '/restore"> ';
                 actions += '@csrf';
-                actions += '<button class="btn btn-sm btn-warning" data-tooltip="true" title="{{ trans('general.restore') }}"><i class="fas fa-retweet"></i></button>&nbsp;';
+                actions += '<button class="btn btn-sm btn-warning" data-tooltip="true" title="{{ trans('general.restore') }}"><x-icon type="restore" /><span class="sr-only">{{ trans('general.restore') }}</span></button>&nbsp;';
             }
 
             actions +='</nobr>';
@@ -432,13 +514,13 @@
         if ((row.available_actions.checkout === true) && (row.user_can_checkout === true) && ((!row.asset_id) && (!row.assigned_to))) {
             return '<a href="{{ config('app.url') }}/licenses/' + row.license_id + '/checkout/'+row.id+'" class="btn btn-sm bg-maroon" data-tooltip="true" title="{{ trans('general.checkout_tooltip') }}">{{ trans('general.checkout') }}</a>';
         } else {
-            return '<a href="{{ config('app.url') }}/licenses/' + row.id + '/checkin" class="btn btn-sm bg-purple" data-tooltip="true" title="Check in this license seat.">{{ trans('general.checkin') }}</a>';
+            return '<a href="{{ config('app.url') }}/licenses/' + row.id + '/checkin" class="btn btn-sm bg-purple" data-tooltip="true" title="{{ trans('general.checkin_tooltip') }}">{{ trans('general.checkin') }}</a>';
         }
 
     }
 
     function genericCheckinCheckoutFormatter(destination) {
-        return function (value,row) {
+        return function (value, row) {
 
             // The user is allowed to check items out, AND the item is deployable
             if ((row.available_actions.checkout == true) && (row.user_can_checkout == true) && ((!row.asset_id) && (!row.assigned_to))) {
@@ -475,11 +557,11 @@
     // This is only used by the requestable assets section
     function assetRequestActionsFormatter (row, value) {
         if (value.assigned_to_self == true){
-            return '<button class="btn btn-danger btn-sm disabled" data-tooltip="true" title="Cancel this item request">{{ trans('button.cancel') }}</button>';
+            return '<button class="btn btn-danger btn-sm btn-block disabled" data-tooltip="true" title="{{ trans('admin/hardware/message.requests.cancel') }}">{{ trans('button.cancel') }}</button>';
         } else if (value.available_actions.cancel == true)  {
-            return '<form action="{{ config('app.url') }}/account/request-asset/'+ value.id + '" method="POST">@csrf<button class="btn btn-danger btn-sm" data-tooltip="true" title="Cancel this item request">{{ trans('button.cancel') }}</button></form>';
+            return '<form action="{{ config('app.url') }}/account/request-asset/' + value.id + '/cancel" method="POST">@csrf<button class="btn btn-danger btn-block btn-sm" data-tooltip="true" title="{{ trans('admin/hardware/message.requests.cancel') }}">{{ trans('button.cancel') }}</button></form>';
         } else if (value.available_actions.request == true)  {
-            return '<form action="{{ config('app.url') }}/account/request-asset/'+ value.id + '" method="POST">@csrf<button class="btn btn-primary btn-sm" data-tooltip="true" title="{{ trans('general.request_item') }}">{{ trans('button.request') }}</button></form>';
+            return '<form action="{{ config('app.url') }}/account/request-asset/'+ value.id + '" method="POST">@csrf<button class="btn btn-block btn-primary btn-sm" data-tooltip="true" title="{{ trans('general.request_item') }}">{{ trans('button.request') }}</button></form>';
         }
 
     }
@@ -553,7 +635,7 @@
                     } else if (row.custom_fields[field_column_plain].field_format=='BOOLEAN') {
                         return (row.custom_fields[field_column_plain].value == 1) ? "<span class='fas fa-check-circle' style='color:green'>" : "<span class='fas fa-times-circle' style='color:red' />";
                     } else if (row.custom_fields[field_column_plain].field_format=='EMAIL') {
-                        return '<a href="mailto:' + row.custom_fields[field_column_plain].value + '" style="white-space: nowrap" data-tooltip="true" title="{{ trans('general.send_email') }}"><i class="fa-regular fa-envelope" aria-hidden="true"></i> ' + row.custom_fields[field_column_plain].value + '</a>';
+                        return '<a href="mailto:' + row.custom_fields[field_column_plain].value + '" style="white-space: nowrap" data-tooltip="true" title="{{ trans('general.send_email') }}"><x-icon type="email" /> ' + row.custom_fields[field_column_plain].value + '</a>';
                     }
                 }
                 return row.custom_fields[field_column_plain].value;
@@ -573,7 +655,7 @@
 
         if (value) {
             if ((value.indexOf("{") === -1) || (value.indexOf("}") ===-1)) {
-                return '<nobr><a href="' + value + '" target="_blank" title="{{ trans('general.external_link_tooltip') }} ' + value + '" data-tooltip="true"><i class="fa fa-external-link"></i> ' + value + '</a></nobr>';
+                return '<nobr><a href="' + value + '" target="_blank" title="{{ trans('general.external_link_tooltip') }} ' + value + '" data-tooltip="true"><x-icon type="external-link" /> ' + value + '</a></nobr>';
             }
             return value;
         }
@@ -609,7 +691,7 @@
 
                 extra_pretty_index = prettyLog(pretty_index);
 
-                result += extra_pretty_index + ': <del>' + value[index].old + '</del>  <i class="fas fa-long-arrow-alt-right" aria-hidden="true"></i> ' + value[index].new + '<br>'
+                result += extra_pretty_index + ': <del>' + value[index].old + '</del>  <x-icon type="long-arrow-right" /> ' + value[index].new + '<br>'
             }
 
         return result;
@@ -628,19 +710,21 @@
     function minAmtFormatter(row, value) {
 
         if ((row) && (row!=undefined)) {
-            if (value.free_seats_count <= value.min_amt) {
-                return  '<span class="text-danger text-bold" data-tooltip="true" title="{{ trans('admin/licenses/general.below_threshold_short') }}">' + value.min_amt + '</span>';
+            
+            if (value.remaining <= value.min_amt) {
+                return  '<span class="text-danger text-bold" data-tooltip="true" title="{{ trans('admin/licenses/general.below_threshold_short') }}"><x-icon type="warning" class="text-yellow" /> ' + value.min_amt + '</span>';
             }
             return value.min_amt
         }
-
+        return '--';
     }
 
+    
 
     // Create a linked phone number in the table list
     function phoneFormatter(value) {
         if (value) {
-            return  '<span style="white-space: nowrap;"><a href="tel:' + value + '" data-tooltip="true" title="{{ trans('general.call') }}"><i class="fa-solid fa-phone" aria-hidden="true"></i> ' + value + '</a></span>';
+            return  '<span style="white-space: nowrap;"><a href="tel:' + value + '" data-tooltip="true" title="{{ trans('general.call') }}"><x-icon type="phone" /> ' + value + '</a></span>';
         }
     }
 
@@ -660,8 +744,8 @@
 
     function assetTagLinkFormatter(value, row) {
         if ((row.asset) && (row.asset.id)) {
-            if (row.asset.deleted_at!='') {
-                return '<span style="white-space: nowrap;"><i class="fas fa-times text-danger"></i><span class="sr-only">{{ trans('admin/hardware/general.deleted') }}</span> <del><a href="{{ config('app.url') }}/hardware/' + row.asset.id + '" data-tooltip="true" title="{{ trans('admin/hardware/general.deleted') }}">' + row.asset.asset_tag + '</a></del></span>';
+            if (row.asset.deleted_at) {
+                return '<span style="white-space: nowrap;"><x-icon type="x" class="text-danger" /><span class="sr-only">{{ trans('admin/hardware/general.deleted') }}</span> <del><a href="{{ config('app.url') }}/hardware/' + row.asset.id + '" data-tooltip="true" title="{{ trans('admin/hardware/general.deleted') }}">' + row.asset.asset_tag + '</a></del></span>';
             }
             return '<a href="{{ config('app.url') }}/hardware/' + row.asset.id + '">' + row.asset.asset_tag + '</a>';
         }
@@ -685,8 +769,8 @@
     function assetSerialLinkFormatter(value, row) {
 
         if ((row.asset) && (row.asset.serial)) {
-            if (row.asset.deleted_at!='') {
-                return '<span style="white-space: nowrap;"><i class="fas fa-times text-danger"></i><span class="sr-only">deleted</span> <del><a href="{{ config('app.url') }}/hardware/' + row.asset.id + '" data-tooltip="true" title="{{ trans('admin/hardware/general.deleted') }}">' + row.asset.serial + '</a></del></span>';
+            if (row.asset.deleted_at) {
+                return '<span style="white-space: nowrap;"><x-icon type="x" class="text-danger" /><span class="sr-only">deleted</span> <del><a href="{{ config('app.url') }}/hardware/' + row.asset.id + '" data-tooltip="true" title="{{ trans('admin/hardware/general.deleted') }}">' + row.asset.serial + '</a></del></span>';
             }
             return '<a href="{{ config('app.url') }}/hardware/' + row.asset.id + '">' + row.asset.serial + '</a>';
         }
@@ -695,9 +779,9 @@
 
     function trueFalseFormatter(value) {
         if ((value) && ((value == 'true') || (value == '1'))) {
-            return '<i class="fas fa-check text-success"></i><span class="sr-only">{{ trans('general.true') }}</span>';
+            return '<x-icon type="checkmark" class="text-success" /><span class="sr-only">{{ trans('general.true') }}</span>';
         } else {
-            return '<i class="fas fa-times text-danger"></i><span class="sr-only">{{ trans('general.false') }}</span>';
+            return '<x-icon type="x" class="text-danger" /><span class="sr-only">{{ trans('general.false') }}</span>';
         }
     }
 
@@ -715,7 +799,7 @@
 
     function emailFormatter(value) {
         if (value) {
-            return '<a href="mailto:' + value + '" style="white-space: nowrap" data-tooltip="true" title="{{ trans('general.send_email') }}"><i class="fa-regular fa-envelope" aria-hidden="true"></i> ' + value + '</a>';
+            return '<a href="mailto:' + value + '" style="white-space: nowrap" data-tooltip="true" title="{{ trans('general.send_email') }}"><x-icon type="email" /> ' + value + '</a>';
         }
     }
 
@@ -745,6 +829,14 @@
         }
     }
 
+    function locationCompanyObjFilterFormatter(value, row) {
+        if (value) {
+            return '<a href="{{ url('/') }}/locations/?company_id=' + row.company.id + '">' + row.company.name + '</a>';
+        } else {
+            return value;
+        }
+    }
+
     function employeeNumFormatter(value, row) {
 
         if ((row) && (row.assigned_to) && ((row.assigned_to.employee_number))) {
@@ -760,7 +852,7 @@
 
     function auditImageFormatter(value){
         if (value){
-            return '<a href="' + value.url + '" data-toggle="lightbox" data-type="image"><img src="' + value.url + '" style="max-height: {{ $snipeSettings->thumbnail_max_h }}px; width: auto;" class="img-responsive"></a>'
+            return '<a href="' + value.url + '" data-toggle="lightbox" data-type="image"><img src="' + value.url + '" style="max-height: {{ $snipeSettings->thumbnail_max_h }}px; width: auto;" class="img-responsive" alt=""></a>'
         }
     }
 
@@ -784,15 +876,15 @@
     }
     function downloadFormatter(value) {
         if (value) {
-            return '<a href="' + value + '" target="_blank"><i class="fas fa-download"></i></a>';
+            return '<a href="' + value + '" target="_blank"><x-icon type="download" /></a>';
         }
     }
 
     function fileUploadFormatter(value) {
         if ((value) && (value.url) && (value.inlineable)) {
-            return '<a href="' + value.url + '" data-toggle="lightbox" data-type="image"><img src="' + value.url + '" style="max-height: {{ $snipeSettings->thumbnail_max_h }}px; width: auto;" class="img-responsive"></a>';
+            return '<a href="' + value.url + '" data-toggle="lightbox" data-type="image"><img src="' + value.url + '" style="max-height: {{ $snipeSettings->thumbnail_max_h }}px; width: auto;" class="img-responsive" alt=""></a>';
         } else if ((value) && (value.url)) {
-            return '<a href="' + value.url + '" class="btn btn-default"><i class="fas fa-download"></i></a>';
+            return '<a href="' + value.url + '" class="btn btn-default"><x-icon type="download" /></a>';
         }
     }
 
@@ -804,6 +896,38 @@
         }
     }
 
+    function linkToUserSectionBasedOnCount (count, id, section) {
+        if (count) {
+            return '<a href="{{ config('app.url') }}/users/' + id + '#' + section +'">' + count + '</a>';
+        }
+
+        return count;
+    }
+
+    function linkNumberToUserAssetsFormatter(value, row) {
+        return linkToUserSectionBasedOnCount(value, row.id, 'asset');
+    }
+
+    function linkNumberToUserLicensesFormatter(value, row) {
+        return linkToUserSectionBasedOnCount(value, row.id, 'licenses');
+    }
+
+    function linkNumberToUserConsumablesFormatter(value, row) {
+        return linkToUserSectionBasedOnCount(value, row.id, 'consumables');
+    }
+
+    function linkNumberToUserAccessoriesFormatter(value, row) {
+        return linkToUserSectionBasedOnCount(value, row.id, 'accessories');
+    }
+
+    function linkNumberToUserManagedUsersFormatter(value, row) {
+        return linkToUserSectionBasedOnCount(value, row.id, 'managed-users');
+    }
+
+    function linkNumberToUserManagedLocationsFormatter(value, row) {
+        return linkToUserSectionBasedOnCount(value, row.id, 'managed-locations');
+    }
+
     function labelPerPageFormatter(value, row, index, field) {
         if (row) {
             if (!row.hasOwnProperty('sheet_info')) { return 1; }
@@ -838,6 +962,19 @@
         return parseFloat(decimalfixed);
     }
 
+
+    function qtySumFormatter(data) {
+        var currentField = this.field;
+        var total = 0;
+        var fieldname = this.field;
+
+        $.each(data, function() {
+            var r = this;
+            total += this[currentField];
+        });
+        return total;
+    }
+
     function sumFormatter(data) {
         if (Array.isArray(data)) {
             var field = this.field;
@@ -937,4 +1074,4 @@
 
 </script>
     
-@endpush
\ No newline at end of file
+@endpush
diff --git a/resources/views/partials/bpay.blade.php b/resources/views/partials/bpay.blade.php
deleted file mode 100644
index 0cf0be5403..0000000000
--- a/resources/views/partials/bpay.blade.php
+++ /dev/null
@@ -1,15 +0,0 @@
-@can('admin')
-    @if ((config('services.baremetrics.enabled')=='true') && (config('services.baremetrics.app_key')) && (config('services.baremetrics.stripe_id')))
-        <script>
-            !function(){if(window.barepay&&window.barepay.created)window.console&&console.error&&console.error("Barepay snippet included twice.");else{window.barepay={created:!0};var a=document.createElement("script");a.src="https://baremetrics-dunning.baremetrics.com/js/application.js",a.async=!0;var b=document.getElementsByTagName("script")[0];b.parentNode.insertBefore(a,b),
-
-                window.barepay.params = {
-                    access_token_id: "{{ config('services.baremetrics.app_key') }}", // Your Recover API public key
-                    customer_oid: "{{ config('services.baremetrics.stripe_id') }}" // Customer ID whose card you're looking to update
-                }
-
-            }}();
-        </script>
-        @else
-    @endif
-@endcan
diff --git a/resources/views/partials/confetti-js.blade.php b/resources/views/partials/confetti-js.blade.php
new file mode 100644
index 0000000000..733d96d1b4
--- /dev/null
+++ b/resources/views/partials/confetti-js.blade.php
@@ -0,0 +1,25 @@
+@if (auth()->user() && auth()->user()->enable_confetti=='1')
+<script>
+    var duration = 1500;
+    var animationEnd = Date.now() + duration;
+    var defaults = { startVelocity: 30, spread: 360, ticks: 60, zIndex: 0 };
+
+    function randomInRange(min, max) {
+        return Math.random() * (max - min) + min;
+    }
+
+    var interval = setInterval(function() {
+        var timeLeft = animationEnd - Date.now();
+
+        if (timeLeft <= 0) {
+            return clearInterval(interval);
+        }
+
+        var particleCount = 50 * (timeLeft / duration);
+        // since particles fall down, start a bit higher than random
+        confetti({ ...defaults, particleCount, origin: { x: randomInRange(0.1, 0.3), y: Math.random() - 0.2 } });
+        confetti({ ...defaults, particleCount, origin: { x: randomInRange(0.7, 0.9), y: Math.random() - 0.2 } });
+    }, 250);
+
+</script>
+@endif
\ No newline at end of file
diff --git a/resources/views/partials/forms/checkout-selector.blade.php b/resources/views/partials/forms/checkout-selector.blade.php
index c24c90d25e..4fb4ccbd8c 100644
--- a/resources/views/partials/forms/checkout-selector.blade.php
+++ b/resources/views/partials/forms/checkout-selector.blade.php
@@ -1,10 +1,10 @@
 <div class="form-group" id="assignto_selector"{!!  (isset($style)) ? ' style="'.e($style).'"' : ''  !!}>
-    {{ Form::label('checkout_to_type', trans('admin/hardware/form.checkout_to'), array('class' => 'col-md-3 control-label')) }}
+    <label for="checkout_to_type" class="col-md-3 control-label">{{ trans('admin/hardware/form.checkout_to') }}</label>
     <div class="col-md-8">
         <div class="btn-group" data-toggle="buttons">
             @if ((isset($user_select)) && ($user_select!='false'))
             <label class="btn btn-default active">
-                <input name="checkout_to_type" value="user" aria-label="checkout_to_type" type="radio" checked="checked"><i class="fas fa-user" aria-hidden="true"></i> {{ trans('general.user') }}
+                <input name="checkout_to_type" value="user" aria-label="checkout_to_type" type="radio" checked="checked"><x-icon type="user" /> {{ trans('general.user') }}
             </label>
             @endif
             @if ((isset($asset_select)) && ($asset_select!='false'))
diff --git a/resources/views/partials/forms/edit/accessory-select.blade.php b/resources/views/partials/forms/edit/accessory-select.blade.php
index a19f6c1f43..e047d16d2f 100644
--- a/resources/views/partials/forms/edit/accessory-select.blade.php
+++ b/resources/views/partials/forms/edit/accessory-select.blade.php
@@ -1,10 +1,10 @@
 <!-- Accessory -->
 <div id="assigned_accessory" class="form-group{{ $errors->has($fieldname) ? ' has-error' : '' }}"{!!  (isset($style)) ? ' style="'.e($style).'"' : ''  !!}>
-    {{ Form::label($fieldname, $translated_name, array('class' => 'col-md-3 control-label')) }}
-    <div class="col-md-7{{  ((isset($required) && ($required =='true'))) ?  ' required' : '' }}">
-        <select class="js-data-ajax select2" data-endpoint="accessories" data-placeholder="{{ trans('general.select_accessory') }}" name="{{ $fieldname }}" style="width: 100%" id="{{ (isset($select_id)) ? $select_id : 'assigned_accessory_select' }}"{{ (isset($multiple)) ? ' multiple' : '' }}>
+    <label for="{{ $fieldname }}" class="col-md-3 control-label">{{ $translated_name }}</label>
+    <div class="col-md-7">
+        <select class="js-data-ajax select2" data-endpoint="accessories" data-placeholder="{{ trans('general.select_accessory') }}" name="{{ $fieldname }}" style="width: 100%" id="{{ (isset($select_id)) ? $select_id : 'assigned_accessory_select' }}"{{ (isset($multiple)) ? ' multiple' : '' }}{{  ((isset($required) && ($required =='true'))) ?  ' required' : '' }}>
 
-            @if ((!isset($unselect)) && ($accessory_id = Request::old($fieldname, (isset($accessory) ? $accessory->id  : (isset($item) ? $item->{$fieldname} : '')))))
+            @if ((!isset($unselect)) && ($accessory_id = old($fieldname, (isset($accessory) ? $accessory->id  : (isset($item) ? $item->{$fieldname} : '')))))
                 <option value="{{ $accessory_id }}" selected="selected">
                     {{ (\App\Models\Accessory::find($accessory_id)) ? \App\Models\Accessory::find($accessory_id)->present()->name : '' }}
                 </option>
diff --git a/resources/views/partials/forms/edit/address.blade.php b/resources/views/partials/forms/edit/address.blade.php
index c68ecaa8c2..12214b956b 100644
--- a/resources/views/partials/forms/edit/address.blade.php
+++ b/resources/views/partials/forms/edit/address.blade.php
@@ -1,7 +1,7 @@
 <div class="form-group {{ $errors->has('address') ? ' has-error' : '' }}">
-    {{ Form::label('address', trans('general.address'), array('class' => 'col-md-3 control-label')) }}
+    <label for="address" class="col-md-3 control-label">{{ trans('general.address') }}</label>
     <div class="col-md-7">
-        {{Form::text('address', old('address', $item->address), array('class' => 'form-control', 'aria-label'=>'address', 'maxlength'=>'191')) }}
+        <input class="form-control" aria-label="address" maxlength="191" name="address" type="text" id="address" value="{{ old('address', $item->address) }}">
         {!! $errors->first('address', '<span class="alert-msg" aria-hidden="true"><i class="fas fa-times" aria-hidden="true"></i> :message</span>') !!}
     </div>
 </div>
@@ -9,40 +9,41 @@
 <div class="form-group {{ $errors->has('address2') ? ' has-error' : '' }}">
     <label class="sr-only " for="address2">{{  trans('general.address')  }}</label>
     <div class="col-md-7 col-md-offset-3">
-        {{Form::text('address2', old('address2', $item->address2), array('class' => 'form-control', 'aria-label'=>'address2', 'maxlength'=>'191')) }}
+        <input class="form-control" aria-label="address2" maxlength="191" name="address2" type="text" value="{{ old('address2', $item->address2) }}">
         {!! $errors->first('address2', '<span class="alert-msg" aria-hidden="true"><i class="fas fa-times" aria-hidden="true"></i> :message</span>') !!}
     </div>
 </div>
 
 <div class="form-group {{ $errors->has('city') ? ' has-error' : '' }}">
-    {{ Form::label('city', trans('general.city'), array('class' => 'col-md-3 control-label', 'maxlength'=>'191')) }}
+    <label for="city" class="col-md-3 control-label">{{ trans('general.city') }}</label>
     <div class="col-md-7">
-    {{Form::text('city', old('city', $item->city), array('class' => 'form-control', 'aria-label'=>'city')) }}
+        <input class="form-control" aria-label="city" maxlength="191" name="city" type="text" id="city" value="{{ old('city', $item->city) }}">
         {!! $errors->first('city', '<span class="alert-msg" aria-hidden="true"><i class="fas fa-times" aria-hidden="true"></i> :message</span>') !!}
     </div>
 </div>
 
 <div class="form-group {{ $errors->has('state') ? ' has-error' : '' }}">
-    {{ Form::label('state', trans('general.state'), array('class' => 'col-md-3 control-label', 'maxlength'=>'191')) }}
+    <label for="state" class="col-md-3 control-label">{{ trans('general.state') }}</label>
     <div class="col-md-7">
-    {{Form::text('state', old('state', $item->state), array('class' => 'form-control', 'aria-label'=>'state')) }}
+        <input class="form-control" aria-label="state" maxlength="191" name="state" type="text" id="state" value="{{ old('state', $item->state) }}">
         {!! $errors->first('state', '<span class="alert-msg" aria-hidden="true"><i class="fas fa-times" aria-hidden="true"></i> :message</span>') !!}
 
     </div>
 </div>
 
 <div class="form-group {{ $errors->has('country') ? ' has-error' : '' }}">
-    {{ Form::label('country', trans('general.country'), array('class' => 'col-md-3 control-label')) }}
+    <label for="country" class="col-md-3 control-label">{{ trans('general.country') }}</label>
     <div class="col-md-7">
     {!! Form::countries('country', old('country', $item->country), 'select2') !!}
+        <p class="help-block">{{ trans('general.countries_manually_entered_help') }}</p>
         {!! $errors->first('country', '<span class="alert-msg" aria-hidden="true"><i class="fas fa-times" aria-hidden="true"></i> :message</span>') !!}
     </div>
 </div>
 
 <div class="form-group {{ $errors->has('zip') ? ' has-error' : '' }}">
-    {{ Form::label('zip', trans('general.zip'), array('class' => 'col-md-3 control-label', 'maxlength'=>'10')) }}
+    <label for="zip" class="col-md-3 control-label" maxlength="10">{{ trans('general.zip') }}</label>
     <div class="col-md-7">
-    {{Form::text('zip', old('zip', $item->zip), array('class' => 'form-control')) }}
+        <input class="form-control" name="zip" type="text" id="zip" value="{{ old('zip', $item->zip) }}">
         {!! $errors->first('zip', '<span class="alert-msg" aria-hidden="true"><i class="fas fa-times" aria-hidden="true"></i> :message</span>') !!}
     </div>
 </div>
diff --git a/resources/views/partials/forms/edit/asset-select.blade.php b/resources/views/partials/forms/edit/asset-select.blade.php
index 86dba8206f..9b7caa85f1 100644
--- a/resources/views/partials/forms/edit/asset-select.blade.php
+++ b/resources/views/partials/forms/edit/asset-select.blade.php
@@ -1,8 +1,20 @@
 <!-- Asset -->
-<div id="assigned_asset" class="form-group{{ $errors->has($fieldname) ? ' has-error' : '' }}"{!!  (isset($style)) ? ' style="'.e($style).'"' : ''  !!}>
-    {{ Form::label($fieldname, $translated_name, array('class' => 'col-md-3 control-label')) }}
-    <div class="col-md-8{{  ((isset($required) && ($required =='true'))) ?  ' required' : '' }}">
-        <select class="js-data-ajax select2" data-endpoint="hardware" data-placeholder="{{ trans('general.select_asset') }}" aria-label="{{ $fieldname }}" name="{{ $fieldname }}" style="width: 100%" id="{{ (isset($select_id)) ? $select_id : 'assigned_asset_select' }}"{{ (isset($multiple)) ? ' multiple' : '' }}{!! (!empty($asset_status_type)) ? ' data-asset-status-type="' . $asset_status_type . '"' : '' !!}>
+<div id="{{ $asset_selector_div_id ?? "assigned_asset" }}"
+     class="form-group{{ $errors->has($fieldname) ? ' has-error' : '' }}"{!!  (isset($style)) ? ' style="'.e($style).'"' : ''  !!}>
+    <label for="{{ $fieldname }}" class="col-md-3 control-label">{{ $translated_name }}</label>
+    <div class="col-md-7">
+        <select class="js-data-ajax select2"
+                data-endpoint="hardware"
+                data-placeholder="{{ trans('general.select_asset') }}"
+                aria-label="{{ $fieldname }}"
+                name="{{ $fieldname }}"
+                style="width: 100%"
+                id="{{ (isset($select_id)) ? $select_id : 'assigned_asset_select' }}"
+                {{ ((isset($multiple)) && ($multiple === true)) ? ' multiple' : '' }}
+                {!! (!empty($asset_status_type)) ? ' data-asset-status-type="' . $asset_status_type . '"' : '' !!}
+                {!! (!empty($company_id)) ? ' data-company-id="' .$company_id.'"'  : '' !!}
+                {{  ((isset($required) && ($required =='true'))) ?  ' required' : '' }}
+        >
 
             @if ((!isset($unselect)) && ($asset_id = old($fieldname, (isset($asset) ? $asset->id  : (isset($item) ? $item->{$fieldname} : '')))))
                 <option value="{{ $asset_id }}" selected="selected" role="option" aria-selected="true"  role="option">
@@ -11,6 +23,15 @@
             @else
                 @if(!isset($multiple))
                     <option value=""  role="option">{{ trans('general.select_asset') }}</option>
+                @else
+                    @if(isset($asset_ids))
+                        @foreach($asset_ids as $asset_id)
+                            <option value="{{ $asset_id }}" selected="selected" role="option" aria-selected="true"
+                                    role="option">
+                                {{ (\App\Models\Asset::find($asset_id)) ? \App\Models\Asset::find($asset_id)->present()->fullName : '' }}
+                            </option>
+                        @endforeach
+                    @endif
                 @endif
             @endif
         </select>
diff --git a/resources/views/partials/forms/edit/category-select.blade.php b/resources/views/partials/forms/edit/category-select.blade.php
index f555c6240b..51a5c81a66 100644
--- a/resources/views/partials/forms/edit/category-select.blade.php
+++ b/resources/views/partials/forms/edit/category-select.blade.php
@@ -1,16 +1,26 @@
 <!-- Asset Model -->
 <div id="{{ $fieldname }}" class="form-group{{ $errors->has($fieldname) ? ' has-error' : '' }}">
 
-    {{ Form::label($fieldname, $translated_name, array('class' => 'col-md-3 control-label')) }}
+    <label for="{{ $fieldname }}" class="col-md-3 control-label">{{ $translated_name }}</label>
 
-    <div class="col-md-7{{  (isset($item) && (Helper::checkIfRequired($item, $fieldname))) ? ' required' : '' }}">
+    <div class="col-md-7">
         <select class="js-data-ajax" data-endpoint="categories/{{ (isset($category_type)) ? $category_type : 'assets' }}" data-placeholder="{{ trans('general.select_category') }}" name="{{ $fieldname }}" style="width: 100%" id="category_select_id" aria-label="{{ $fieldname }}" {!!  ((isset($item)) && (Helper::checkIfRequired($item, $fieldname))) ? ' required ' : '' !!}{{ (isset($multiple) && ($multiple=='true')) ? " multiple='multiple'" : '' }}>
+            @isset ($selected)
+                @if (!is_iterable($selected))
+                    @php
+                        $selected = [$selected];
+                    @endphp
+                @endif
+                @foreach ($selected as $category_id)
+                    <option value="{{ $category_id }}" selected="selected" role="option" aria-selected="true"  role="option">
+                        {{ \App\Models\Category::find($category_id)->name }}
+                    </option>
+                @endforeach
+            @endisset
             @if ($category_id = old($fieldname, (isset($item)) ? $item->{$fieldname} : ''))
                 <option value="{{ $category_id }}" selected="selected" role="option" aria-selected="true"  role="option">
                     {{ (\App\Models\Category::find($category_id)) ? \App\Models\Category::find($category_id)->name : '' }}
                 </option>
-            @else
-                <option value=""  role="option">{{ trans('general.select_category') }}</option>
             @endif
 
         </select>
@@ -25,4 +35,6 @@
 
 
     {!! $errors->first($fieldname, '<div class="col-md-8 col-md-offset-3"><span class="alert-msg" aria-hidden="true"><i class="fas fa-times" aria-hidden="true"></i> :message</span></div>') !!}
+
+    {!! $errors->first('category_type', '<div class="col-md-8 col-md-offset-3"><span class="alert-msg" aria-hidden="true"><i class="fas fa-times" aria-hidden="true"></i> :message</span></div>') !!}
 </div>
diff --git a/resources/views/partials/forms/edit/category.blade.php b/resources/views/partials/forms/edit/category.blade.php
deleted file mode 100644
index 715c54184e..0000000000
--- a/resources/views/partials/forms/edit/category.blade.php
+++ /dev/null
@@ -1,8 +0,0 @@
-<!-- Category -->
-<div class="form-group {{ $errors->has('category_id') ? ' has-error' : '' }}">
-    <label for="category_id" class="col-md-3 control-label">{{ trans('general.category') }}</label>
-    <div class="col-md-7 col-sm-12{{  (Helper::checkIfRequired($item, 'category_id')) ? ' required' : '' }}">
-        {{ Form::select('category_id', $category_list , old('category_id', $item->category_id), array('class'=>'select2', 'style'=>'width:100%')) }}
-        {!! $errors->first('category_id', '<span class="alert-msg" aria-hidden="true"><i class="fas fa-times" aria-hidden="true"></i> :message</span>') !!}
-    </div>
-</div>
diff --git a/resources/views/partials/forms/edit/company-select.blade.php b/resources/views/partials/forms/edit/company-select.blade.php
index 722e1cf088..d4ce87b06e 100644
--- a/resources/views/partials/forms/edit/company-select.blade.php
+++ b/resources/views/partials/forms/edit/company-select.blade.php
@@ -2,7 +2,7 @@
 @if (($snipeSettings->full_multiple_companies_support=='1') && (!Auth::user()->isSuperUser()))
     <!-- full company support is enabled and this user isn't a superadmin -->
     <div class="form-group">
-    {{ Form::label($fieldname, $translated_name, array('class' => 'col-md-3 control-label')) }}
+        <label for="{{ $fieldname }}" class="col-md-3 control-label">{{ $translated_name }}</label>
         <div class="col-md-6">
             <select class="js-data-ajax" disabled="true" data-endpoint="companies" data-placeholder="{{ trans('general.select_company') }}" name="{{ $fieldname }}" style="width: 100%" id="company_select" aria-label="{{ $fieldname }}"{{ (isset($multiple) && ($multiple=='true')) ? " multiple='multiple'" : '' }}>
                 @if ($company_id = old($fieldname, (isset($item)) ? $item->{$fieldname} : ''))
@@ -10,7 +10,7 @@
                         {{ (\App\Models\Company::find($company_id)) ? \App\Models\Company::find($company_id)->name : '' }}
                     </option>
                 @else
-                    <option value="" role="option">{{ trans('general.select_company') }}</option>
+                    {!! (!isset($multiple) || ($multiple=='false')) ? '<option value="" role="option">'.trans('general.select_company').'</option>' : ''  !!}
                 @endif
             </select>
         </div>
@@ -19,21 +19,27 @@
 @else
     <!-- full company support is enabled or this user is a superadmin -->
     <div id="{{ $fieldname }}" class="form-group{{ $errors->has($fieldname) ? ' has-error' : '' }}">
-        {{ Form::label($fieldname, $translated_name, array('class' => 'col-md-3 control-label')) }}
-        <div class="col-md-6">
+        <label for="{{ $fieldname }}" class="col-md-3 control-label">{{ $translated_name }}</label>
+        <div class="col-md-8">
             <select class="js-data-ajax" data-endpoint="companies" data-placeholder="{{ trans('general.select_company') }}" name="{{ $fieldname }}" style="width: 100%" id="company_select"{{ (isset($multiple) && ($multiple=='true')) ? " multiple='multiple'" : '' }}>
-                @if ($company_id = Request::old($fieldname, (isset($item)) ? $item->{$fieldname} : ''))
+                @isset ($selected)
+                    @foreach ($selected as $company_id)
+                        <option value="{{ $company_id }}" selected="selected" role="option" aria-selected="true">
+                            {{ \App\Models\Company::find($company_id)->name }}
+                        </option>
+                    @endforeach
+                @endisset
+                @if ($company_id = old($fieldname, (isset($item)) ? $item->{$fieldname} : ''))
                     <option value="{{ $company_id }}" selected="selected">
                         {{ (\App\Models\Company::find($company_id)) ? \App\Models\Company::find($company_id)->name : '' }}
                     </option>
                 @else
-                    <option value="">{{ trans('general.select_company') }}</option>
+                    {!! (!isset($multiple) || ($multiple=='false')) ? '<option value="" role="option">'.trans('general.select_company').'</option>' : ''  !!}
                 @endif
             </select>
         </div>
-        {!! $errors->first($fieldname, '<div class="col-md-8 col-md-offset-3"><span class="alert-msg"><i class="fas fa-times"></i> :message</span></div>') !!}
+        {!! $errors->first($fieldname, '<div class="col-md-8 col-md-offset-3"><span class="alert-msg"><i class="fas fa-times" aria-hidden="true"></i> :message</span></div>') !!}
 
-    {!! $errors->first($fieldname, '<div class="col-md-8 col-md-offset-3"><span class="alert-msg" aria-hidden="true"><i class="fas fa-times" aria-hidden="true"></i> :message</span></div>') !!}
     </div>
 
 @endif
diff --git a/resources/views/partials/forms/edit/company.blade.php b/resources/views/partials/forms/edit/company.blade.php
deleted file mode 100644
index 4e64dbd1a8..0000000000
--- a/resources/views/partials/forms/edit/company.blade.php
+++ /dev/null
@@ -1,11 +0,0 @@
-@if (\App\Models\Company::isCurrentUserAuthorized())
-<div class="form-group {{ $errors->has('company_id') ? ' has-error' : '' }}">
-   <div class="col-md-3 control-label">
-       {{ Form::label('company_id', trans('general.company'), array('class' => 'col-md-3 control-label', 'for' => 'company_id')) }}
-   </div>
-    <div class="col-md-7 col-sm-12{{  (Helper::checkIfRequired($item, 'company_id')) ? ' required' : '' }}">
-       {{ Form::select('company_id', $company_list , old('company_id', $item->company_id), array('class'=>'select2', 'style'=>'width:100%')) }}
-       {!! $errors->first('company_id', '<span class="alert-msg" aria-hidden="true"><i class="fas fa-times" aria-hidden="true"></i> :message</span>') !!}
-   </div>
-</div>
-@endif
diff --git a/resources/views/partials/forms/edit/consumable-select.blade.php b/resources/views/partials/forms/edit/consumable-select.blade.php
index be2eb538b9..ccc8030a77 100644
--- a/resources/views/partials/forms/edit/consumable-select.blade.php
+++ b/resources/views/partials/forms/edit/consumable-select.blade.php
@@ -1,10 +1,10 @@
 <!-- Consumable -->
 <div id="assigned_consumable" class="form-group{{ $errors->has($fieldname) ? ' has-error' : '' }}"{!!  (isset($style)) ? ' style="'.e($style).'"' : ''  !!}>
-    {{ Form::label($fieldname, $translated_name, array('class' => 'col-md-3 control-label')) }}
+    <label for="{{ $fieldname }}" class="col-md-3 control-label">{{ $translated_name }}</label>
     <div class="col-md-7{{  ((isset($required) && ($required =='true'))) ?  ' required' : '' }}">
         <select class="js-data-ajax select2" data-endpoint="consumables" data-placeholder="{{ trans('general.select_consumable') }}" name="{{ $fieldname }}" style="width: 100%" id="{{ (isset($select_id)) ? $select_id : 'assigned_consumable_select' }}"{{ (isset($multiple)) ? ' multiple' : '' }}>
         
-            @if ((!isset($unselect)) && ($consumable_id = Request::old($fieldname, (isset($consumable) ? $consumable->id  : (isset($item) ? $item->{$fieldname} : '')))))
+            @if ((!isset($unselect)) && ($consumable_id = old($fieldname, (isset($consumable) ? $consumable->id  : (isset($item) ? $item->{$fieldname} : '')))))
                 <option value="{{ $consumable_id }}" selected="selected">
                     {{ (\App\Models\Consumable::find($consumable_id)) ? \App\Models\Consumable::find($consumable_id)->present()->name : '' }}
                 </option>
diff --git a/resources/views/partials/forms/edit/datepicker.blade.php b/resources/views/partials/forms/edit/datepicker.blade.php
index 9d2a714bb7..74ec021e4b 100644
--- a/resources/views/partials/forms/edit/datepicker.blade.php
+++ b/resources/views/partials/forms/edit/datepicker.blade.php
@@ -1,12 +1,22 @@
 <!-- Datepicker -->
 <div class="form-group{{ $errors->has($fieldname) ? ' has-error' : '' }}">
-    {{ Form::label($fieldname, $translated_name, array('class' => 'col-md-3 control-label')) }}
+    <label for="{{ $fieldname }}" class="col-md-3 control-label">{{ $translated_name }}</label>
     <div class="input-group col-md-4">
-        <div class="input-group date" data-provide="datepicker" data-date-clear-btn="true" data-date-format="yyyy-mm-dd"  data-autoclose="true">
-            <input type="text" class="form-control" placeholder="{{ trans('general.select_date') }}" name="{{ $fieldname }}" id="{{ $fieldname }}" value="{{ old($fieldname, ($item->{$fieldname}) ? date('Y-m-d', strtotime($item->{$fieldname})) : '') }}" readonly style="background-color:inherit" maxlength="10">
-            <span class="input-group-addon"><i class="fas fa-calendar" aria-hidden="true"></i></span>
-        </div>
+        <x-input.datepicker
+                name="{{ $fieldname }}"
+                value="{{ old($fieldname, ($item->{$fieldname}) ? date('Y-m-d', strtotime($item->{$fieldname})) : '') }}"
+                placeholder="{{ trans('general.select_date') }}"
+                required="{{ Helper::checkIfRequired($item, 'start_date') }}"
+        />
         {!! $errors->first($fieldname, '<span class="alert-msg" aria-hidden="true"><i class="fas fa-times" aria-hidden="true"></i> :message</span>') !!}
     </div>
+    @if  (isset($help_text))
+        <div class="col-md-8 col-md-offset-3">
+            <p class="help-block">
+                {!!  $help_text !!}
+            </p>
+        </div>
+    @endif
 </div>
 
+<!-- /Datepicker -->
\ No newline at end of file
diff --git a/resources/views/partials/forms/edit/department-select.blade.php b/resources/views/partials/forms/edit/department-select.blade.php
index c695d04ef4..0648f991da 100644
--- a/resources/views/partials/forms/edit/department-select.blade.php
+++ b/resources/views/partials/forms/edit/department-select.blade.php
@@ -1,15 +1,25 @@
 <div id="assigned_user" class="form-group{{ $errors->has($fieldname) ? ' has-error' : '' }}">
 
-    {{ Form::label($fieldname, $translated_name, array('class' => 'col-md-3 control-label')) }}
+    <label for="{{ $fieldname }}" class="col-md-3 control-label">{{ $translated_name }}</label>
 
     <div class="col-md-6">
         <select class="js-data-ajax" data-endpoint="departments" data-placeholder="{{ trans('general.select_department') }}" name="{{ $fieldname }}" style="width: 100%" id="department_select" aria-label="{{ $fieldname }}"{{ (isset($multiple) && ($multiple=='true')) ? " multiple='multiple'" : '' }}>
+            @isset ($selected)
+                @if (!is_iterable($selected))
+                    @php
+                        $selected = [$selected];
+                    @endphp
+                @endif
+                @foreach ($selected as $department_id)
+                    <option value="{{ $department_id }}" selected="selected" role="option" aria-selected="true">
+                        {{ \App\Models\Department::find($department_id)->name }}
+                    </option>
+                @endforeach
+            @endisset
             @if ($department_id = old($fieldname, (isset($item)) ? $item->{$fieldname} : ''))
                 <option value="{{ $department_id }}" selected="selected" role="option" aria-selected="true"  role="option">
                     {{ (\App\Models\Department::find($department_id)) ? \App\Models\Department::find($department_id)->name : '' }}
                 </option>
-            @else
-                <option value=""  role="option">{{ trans('general.select_department') }}</option>
             @endif
         </select>
     </div>
diff --git a/resources/views/partials/forms/edit/depreciation.blade.php b/resources/views/partials/forms/edit/depreciation.blade.php
index 4478a9c05f..8195ac394e 100644
--- a/resources/views/partials/forms/edit/depreciation.blade.php
+++ b/resources/views/partials/forms/edit/depreciation.blade.php
@@ -2,7 +2,14 @@
 <div class="form-group {{ $errors->has('depreciation_id') ? ' has-error' : '' }}">
     <label for="depreciation_id" class="col-md-3 control-label">{{ trans('general.depreciation') }}</label>
     <div class="col-md-7">
-        {{ Form::select('depreciation_id', $depreciation_list , old('depreciation_id', $item->depreciation_id), array('class'=>'select2', 'style'=>'width:350px', 'aria-label'=>'depreciation_id')) }}
+        <x-input.select
+            name="depreciation_id"
+            id="depreciation_id"
+            :options="$depreciation_list"
+            :selected="old('depreciation_id', $item->depreciation_id)"
+            style="width:350px;"
+            aria-label="depreciation_id"
+        />
         {!! $errors->first('depreciation_id', '<span class="alert-msg" aria-hidden="true"><i class="fas fa-times" aria-hidden="true"></i> :message</span>') !!}
     </div>
 </div>
diff --git a/resources/views/partials/forms/edit/email.blade.php b/resources/views/partials/forms/edit/email.blade.php
index 0e10b7d766..edaea99216 100644
--- a/resources/views/partials/forms/edit/email.blade.php
+++ b/resources/views/partials/forms/edit/email.blade.php
@@ -1,7 +1,7 @@
 <div class="form-group {{ $errors->has('email') ? ' has-error' : '' }}">
-    {{ Form::label('email', trans('admin/suppliers/table.email'), array('class' => 'col-md-3 control-label')) }}
-    <div class="col-md-7">
-    {{Form::text('email', old('email', $item->email), array('class' => 'form-control')) }}
+    <label for="email" class="col-md-3 col-xs-12 control-label">{{ trans('admin/suppliers/table.email') }}</label>
+    <div class="col-md-8 col-xs-12">
+        <input type="email" name="email" id="email" value="{{ old('email', $item->email ?? null) }}" class="form-control"  maxlength="191" style="width:100%; display:flex;">
         {!! $errors->first('email', '<span class="alert-msg" aria-hidden="true"><i class="fas fa-times" aria-hidden="true"></i> :message</span>') !!}
     </div>
 </div>
diff --git a/resources/views/partials/forms/edit/eol_date.blade.php b/resources/views/partials/forms/edit/eol_date.blade.php
deleted file mode 100644
index fb461cf44e..0000000000
--- a/resources/views/partials/forms/edit/eol_date.blade.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<!-- EOL Date -->
-<div class="form-group {{ $errors->has('asset_eol_date') ? ' has-error' : '' }}">
-    <label for="asset_eol_date" class="col-md-3 control-label">{{ trans('admin/hardware/form.eol_date') }}</label>
-    <div class="input-group col-md-4">
-        <div class="input-group date" data-provide="datepicker" data-date-clear-btn="true" data-date-format="yyyy-mm-dd"  data-autoclose="true">
-            <input type="text" class="form-control" placeholder="{{ trans('general.select_date') }}" name="asset_eol_date" id="asset_eol_date" readonly value="{{  old('asset_eol_date', optional($item->asset_eol_date)->format('Y-m-d') ?? $item->asset_eol_date ?? '')  }}"  style="background-color:inherit" />
-            <span class="input-group-addon"><i class="fas fa-calendar" aria-hidden="true"></i></span>
-        </div>
-        {!! $errors->first('asset_eol_date', '<span class="alert-msg" aria-hidden="true"><i class="fas fa-times" aria-hidden="true"></i> :message</span>') !!}
-    </div>
-</div>
diff --git a/resources/views/partials/forms/edit/fax.blade.php b/resources/views/partials/forms/edit/fax.blade.php
index 6e8a1d7fd4..19cf6ecef2 100644
--- a/resources/views/partials/forms/edit/fax.blade.php
+++ b/resources/views/partials/forms/edit/fax.blade.php
@@ -1,7 +1,7 @@
 <div class="form-group {{ $errors->has('fax') ? ' has-error' : '' }}">
-    {{ Form::label('fax', trans('admin/suppliers/table.fax'), array('class' => 'col-md-3 control-label')) }}
+    <label for="fax" class="col-md-3 control-label">{{ trans('admin/suppliers/table.fax') }}</label>
     <div class="col-md-7">
-        {{Form::text('fax', old('fax', $item->fax), array('class' => 'form-control')) }}
+        <input class="form-control" type="text" name="fax" aria-label="fax" id="fax" value="{{ old('fax', $item->fax) }}"  maxlength="34"  />
         {!! $errors->first('fax', '<span class="alert-msg" aria-hidden="true"><i class="fas fa-times" aria-hidden="true"></i> :message</span>') !!}
     </div>
-</div>
\ No newline at end of file
+</div>
diff --git a/resources/views/partials/forms/edit/image-upload.blade.php b/resources/views/partials/forms/edit/image-upload.blade.php
index fca1068844..0accf2f59d 100644
--- a/resources/views/partials/forms/edit/image-upload.blade.php
+++ b/resources/views/partials/forms/edit/image-upload.blade.php
@@ -1,28 +1,29 @@
 <!-- Image stuff - kept in /resources/views/partials/forms/edit/image-upload.blade.php -->
 <!-- Image Delete -->
-@if (isset($item) && ($item->image) && ($item->image!=''))
-    <div class="form-group{{ $errors->has('image_delete') ? ' has-error' : '' }}">
-        <div class="col-md-9 col-md-offset-3">
-            <label class="form-control">
-                {{ Form::checkbox('image_delete', '1', old('image_delete'), ['aria-label'=>'image_delete']) }}
-                {{ trans('general.image_delete') }}
+@if (isset($image_path))
+    @if (isset($item) && ($item->{($fieldname ?? 'image')}))
+        <div class="form-group{{ $errors->has('image_delete') ? ' has-error' : '' }}">
+            <div class="col-md-9 col-md-offset-3">
+                <label class="form-control">
+                    <input type="checkbox" name="image_delete" value="1" @checked(old('image_delete')) aria-label="image_delete">
+                    {{ trans('general.image_delete') }}
+                    {!! $errors->first('image_delete', '<span class="alert-msg">:message</span>') !!}
+                </label>
+            </div>
+        </div>
+        <div class="form-group">
+            <div class="col-md-8 col-md-offset-3">
+                <img src="{{ Storage::disk('public')->url($image_path.e($item->{($fieldname ?? 'image')})) }}" class="img-responsive">
                 {!! $errors->first('image_delete', '<span class="alert-msg">:message</span>') !!}
-            </label>
+            </div>
         </div>
-    </div>
-    <div class="form-group">
-        <div class="col-md-9 col-md-offset-3">
-            <img src="{{ Storage::disk('public')->url($image_path.e($item->image)) }}" class="img-responsive">
-            {!! $errors->first('image_delete', '<span class="alert-msg">:message</span>') !!}
-        </div>
-    </div>
+    @endif
 @endif
-
 <!-- Image Upload and preview -->
 
 <div class="form-group {{ $errors->has((isset($fieldname) ? $fieldname : 'image')) ? 'has-error' : '' }}">
     <label class="col-md-3 control-label" for="{{ (isset($fieldname) ? $fieldname : 'image') }}">{{ trans('general.image_upload') }}</label>
-    <div class="col-md-9">
+    <div class="col-md-8">
 
         <input type="file" id="{{ (isset($fieldname) ? $fieldname : 'image') }}" name="{{ (isset($fieldname) ? $fieldname : 'image') }}" aria-label="{{ (isset($fieldname) ? $fieldname : 'image') }}" class="sr-only">
 
diff --git a/resources/views/partials/forms/edit/item_number.blade.php b/resources/views/partials/forms/edit/item_number.blade.php
index 1c9654cb45..1adeb89be4 100644
--- a/resources/views/partials/forms/edit/item_number.blade.php
+++ b/resources/views/partials/forms/edit/item_number.blade.php
@@ -1,8 +1,8 @@
 <!-- Item Number -->
 <div class="form-group {{ $errors->has('item_no') ? ' has-error' : '' }}">
    <label for="item_no" class="col-md-3 control-label">{{ trans('admin/consumables/general.item_no') }}</label>
-   <div class="col-md-7 col-sm-12{{  (Helper::checkIfRequired($item, 'item_no')) ? ' required' : '' }}">
-       <input class="form-control" type="text" name="item_no" id="item_no" value="{{ old('item_no', $item->item_no) }}" />
+   <div class="col-md-7 col-sm-12">
+       <input class="form-control" type="text" name="item_no" id="item_no" value="{{ old('item_no', $item->item_no) }}"{{  (Helper::checkIfRequired($item, 'item_no')) ? ' required' : '' }}/>
        {!! $errors->first('item_no', '<span class="alert-msg" aria-hidden="true"><i class="fas fa-times" aria-hidden="true"></i> :message</span>') !!}
    </div>
 </div>
diff --git a/resources/views/partials/forms/edit/kit-select.blade.php b/resources/views/partials/forms/edit/kit-select.blade.php
index 9db93eebb5..cd1801f163 100644
--- a/resources/views/partials/forms/edit/kit-select.blade.php
+++ b/resources/views/partials/forms/edit/kit-select.blade.php
@@ -1,10 +1,10 @@
 <div id="kit_id" class="form-group{{ $errors->has($fieldname) ? ' has-error' : '' }}"{!!  (isset($style)) ? ' style="'.e($style).'"' : ''  !!}>
 
-    {{ Form::label($fieldname, $translated_name, array('class' => 'col-md-3 control-label')) }}
+    <label for="{{ $fieldname }}" class="col-md-3 control-label">{{ $translated_name }}</label>
 
-    <div class="col-md-7{{  ((isset($required)) && ($required=='true')) ? ' required' : '' }}">
-        <select class="js-data-ajax" data-endpoint="kits" data-placeholder="{{ trans('partials/forms/general.placeholder_kit') }}" name="{{ $fieldname }}" style="width: 100%" id="kit_id_select">
-            @if ($kit_id = Request::old($fieldname, (isset($item)) ? $item->{$fieldname} : ''))
+    <div class="col-md-7">
+        <select class="js-data-ajax" data-endpoint="kits" data-placeholder="{{ trans('partials/forms/general.placeholder_kit') }}" name="{{ $fieldname }}" style="width: 100%" id="kit_id_select"{{  ((isset($required)) && ($required=='true')) ? ' required' : '' }}>
+            @if ($kit_id = old($fieldname, (isset($item)) ? $item->{$fieldname} : ''))
                 <option value="{{ $kit_id }}" selected="selected">
                     {{ (\App\Models\User::find($kit_id)) ? \App\Models\User::find($kit_id)->present()->fullName : '' }}
                 </option>
diff --git a/resources/views/partials/forms/edit/license-select.blade.php b/resources/views/partials/forms/edit/license-select.blade.php
index 887421eda3..e6b8a8d7c2 100644
--- a/resources/views/partials/forms/edit/license-select.blade.php
+++ b/resources/views/partials/forms/edit/license-select.blade.php
@@ -1,10 +1,10 @@
 <!-- License -->
 <div id="assigned_license" class="form-group{{ $errors->has($fieldname) ? ' has-error' : '' }}"{!!  (isset($style)) ? ' style="'.e($style).'"' : ''  !!}>
-    {{ Form::label($fieldname, $translated_name, array('class' => 'col-md-3 control-label')) }}
-    <div class="col-md-7{{  ((isset($required) && ($required =='true'))) ?  ' required' : '' }}">
-        <select class="js-data-ajax select2" data-endpoint="licenses" data-placeholder="{{ trans('general.select_license') }}" name="{{ $fieldname }}" style="width: 100%" id="{{ (isset($select_id)) ? $select_id : 'assigned_license_select' }}"{{ (isset($multiple)) ? ' multiple' : '' }}>
+    <label for="{{ $fieldname }}" class="col-md-3 control-label">{{ $translated_name }}</label>
+    <div class="col-md-7">
+        <select class="js-data-ajax select2" data-endpoint="licenses" data-placeholder="{{ trans('general.select_license') }}" name="{{ $fieldname }}" style="width: 100%" id="{{ (isset($select_id)) ? $select_id : 'assigned_license_select' }}"{{ (isset($multiple)) ? ' multiple' : '' }}{{  ((isset($required) && ($required =='true'))) ?  ' required' : '' }}>
 
-            @if ((!isset($unselect)) && ($license_id = Request::old($fieldname, (isset($license) ? $license->id  : (isset($item) ? $item->{$fieldname} : '')))))
+            @if ((!isset($unselect)) && ($license_id = old($fieldname, (isset($license) ? $license->id  : (isset($item) ? $item->{$fieldname} : '')))))
                 <option value="{{ $license_id }}" selected="selected">
                     {{ (\App\Models\License::find($license_id)) ? \App\Models\License::find($license_id)->present()->fullName : '' }}
                 </option>
diff --git a/resources/views/partials/forms/edit/location-profile-select.blade.php b/resources/views/partials/forms/edit/location-profile-select.blade.php
index e0e222aa99..f3db9ad9b7 100644
--- a/resources/views/partials/forms/edit/location-profile-select.blade.php
+++ b/resources/views/partials/forms/edit/location-profile-select.blade.php
@@ -1,8 +1,8 @@
 <!-- Location -->
 <div id="location_id" class="form-group{{ $errors->has('location_id') ? ' has-error' : '' }}"{!!  (isset($style)) ? ' style="'.e($style).'"' : ''  !!}>
 
-    {{ Form::label('location_id', $translated_name, array('class' => 'col-md-3 control-label')) }}
-    <div class="col-md-7">
+    <label for="location_id" class="col-md-3 control-label">{{ $translated_name }}</label>
+    <div class="col-md-8">
         <select class="js-data-ajax" data-endpoint="locations" data-placeholder="{{ trans('general.select_location') }}" name="location_id" style="width: 100%" id="location_id_location_select" aria-label="location_id">
             @if ($location_id = old('location_id', (isset($user)) ? $user->location_id : ''))
                 <option value="{{ $location_id }}" selected="selected" role="option" aria-selected="true"  role="option">
diff --git a/resources/views/partials/forms/edit/location-select.blade.php b/resources/views/partials/forms/edit/location-select.blade.php
index 6752657cb5..0f88e14204 100644
--- a/resources/views/partials/forms/edit/location-select.blade.php
+++ b/resources/views/partials/forms/edit/location-select.blade.php
@@ -1,15 +1,20 @@
 <!-- Location -->
 <div id="{{ $fieldname }}" class="form-group{{ $errors->has($fieldname) ? ' has-error' : '' }}"{!!  (isset($style)) ? ' style="'.e($style).'"' : ''  !!}>
 
-    {{ Form::label($fieldname, $translated_name, array('class' => 'col-md-3 control-label')) }}
-    <div class="col-md-7{{  ((isset($required) && ($required =='true'))) ?  ' required' : '' }}">
-        <select class="js-data-ajax" data-endpoint="locations" data-placeholder="{{ trans('general.select_location') }}" name="{{ $fieldname }}" style="width: 100%" id="{{ $fieldname }}_location_select" aria-label="{{ $fieldname }}" {!!  ((isset($item)) && (Helper::checkIfRequired($item, $fieldname))) ? ' required ' : '' !!}{{ (isset($multiple) && ($multiple=='true')) ? " multiple='multiple'" : '' }}>
+    <label for="{{ $fieldname }}" class="col-md-3 control-label">{{ $translated_name }}</label>
+    <div class="col-md-7">
+        <select class="js-data-ajax" data-endpoint="locations" data-placeholder="{{ trans('general.select_location') }}" name="{{ $fieldname }}" style="width: 100%" id="{{ $fieldname }}_location_select" aria-label="{{ $fieldname }}"{{ (isset($multiple) && ($multiple=='true')) ? " multiple='multiple'" : '' }}{!!  ((isset($item)) && (Helper::checkIfRequired($item, $fieldname))) ? ' required ' : '' !!}>
+            @isset($selected)
+                @foreach($selected as $location_id)
+                    <option value="{{ $location_id }}" selected="selected" role="option" aria-selected="true"  role="option">
+                        {{ (\App\Models\Location::find($location_id))->name }}
+                    </option>
+                @endforeach
+            @endisset
             @if ($location_id = old($fieldname, (isset($item)) ? $item->{$fieldname} : ''))
                 <option value="{{ $location_id }}" selected="selected" role="option" aria-selected="true"  role="option">
                     {{ (\App\Models\Location::find($location_id)) ? \App\Models\Location::find($location_id)->name : '' }}
                 </option>
-            @else
-                <option value=""  role="option">{{ trans('general.select_location') }}</option>
             @endif
         </select>
     </div>
@@ -35,11 +40,11 @@
     <div class="form-group">
         <div class="col-md-9 col-md-offset-3">
             <label class="form-control">
-                {{ Form::radio('update_default_location', '1', old('update_default_location'), ['checked'=> 'checked', 'aria-label'=>'update_default_location']) }}
+                <input name="update_default_location" type="radio" value="1" checked="checked" aria-label="update_default_location" />
                 {{ trans('admin/hardware/form.asset_location') }}
             </label>
             <label class="form-control">
-                {{ Form::radio('update_default_location', '0', old('update_default_location'), ['aria-label'=>'update_default_location']) }}
+                <input name="update_default_location" type="radio" value="0" aria-label="update_default_location" />
                 {{ trans('admin/hardware/form.asset_location_update_default_current') }}
             </label>
         </div>
diff --git a/resources/views/partials/forms/edit/location.blade.php b/resources/views/partials/forms/edit/location.blade.php
deleted file mode 100644
index 906420493b..0000000000
--- a/resources/views/partials/forms/edit/location.blade.php
+++ /dev/null
@@ -1,8 +0,0 @@
-<!--  Location -->
-<div class="form-group {{ $errors->has('location_id') ? ' has-error' : '' }}">
-    <label for="location_id" class="col-md-3 control-label">{{ trans('general.location') }}</label>
-    <div class="col-md-7 col-sm-12{{  (Helper::checkIfRequired($item, 'location_id')) ? ' required' : '' }}">
-        {{ Form::select('location_id', $location_list , old('location_id', $item->location_id), array('class'=>'select2', 'style'=>'width:350px')) }}
-        {!! $errors->first('location_id', '<span class="alert-msg" aria-hidden="true"><i class="fas fa-times" aria-hidden="true"></i> :message</span>') !!}
-    </div>
-</div>
diff --git a/resources/views/partials/forms/edit/maintenance_type.blade.php b/resources/views/partials/forms/edit/maintenance_type.blade.php
index ba03d6b905..c11756a73d 100644
--- a/resources/views/partials/forms/edit/maintenance_type.blade.php
+++ b/resources/views/partials/forms/edit/maintenance_type.blade.php
@@ -2,8 +2,17 @@
           <div class="form-group {{ $errors->has('asset_maintenance_type') ? ' has-error' : '' }}">
               <label for="asset_maintenance_type" class="col-md-3 control-label">{{ trans('admin/asset_maintenances/form.asset_maintenance_type') }}
               </label>
-              <div class="col-md-7{{  (Helper::checkIfRequired($item, 'asset_maintenance_type')) ? ' required' : '' }}">
-                  {{ Form::select('asset_maintenance_type', $assetMaintenanceType , old('asset_maintenance_type', $item->asset_maintenance_type), ['class'=>'select2', 'style'=>'min-width:350px', 'aria-label'=>'asset_maintenance_type']) }}
+              <div class="col-md-7">
+                  <x-input.select
+                      name="asset_maintenance_type"
+                      :options="$assetMaintenanceType"
+                      :selected="old('asset_maintenance_type', $item->asset_maintenance_type)"
+                      :required="Helper::checkIfRequired($item, 'asset_maintenance_type')"
+                      data-placeholder="{{ trans('admin/asset_maintenances/form.select_type')}}"
+                      includeEmpty="true"
+                      style="width:100%;"
+                      aria-label="asset_maintenance_type"
+                  />
                   {!! $errors->first('asset_maintenance_type', '<span class="alert-msg" aria-hidden="true"><i class="fas fa-times" aria-hidden="true"></i> :message</span>') !!}
               </div>
           </div>
diff --git a/resources/views/partials/forms/edit/manufacturer-select.blade.php b/resources/views/partials/forms/edit/manufacturer-select.blade.php
index ba7d4e59d6..44e831fd51 100644
--- a/resources/views/partials/forms/edit/manufacturer-select.blade.php
+++ b/resources/views/partials/forms/edit/manufacturer-select.blade.php
@@ -1,16 +1,28 @@
 <!-- Asset Model -->
 <div id="{{ $fieldname }}" class="form-group{{ $errors->has($fieldname) ? ' has-error' : '' }}">
 
-    {{ Form::label($fieldname, $translated_name, array('class' => 'col-md-3 control-label')) }}
+    <label for="{{ $fieldname }}" class="col-md-3 control-label">{{ $translated_name }}</label>
 
-    <div class="col-md-7{{  ((isset($required)) && ($required=='true')) ? ' required' : '' }}">
+    <div class="col-md-7">
         <select class="js-data-ajax" data-endpoint="manufacturers" data-placeholder="{{ trans('general.select_manufacturer') }}" name="{{ $fieldname }}" style="width: 100%" id="manufacturer_select_id" aria-label="{{ $fieldname }}" {!!  ((isset($item)) && (Helper::checkIfRequired($item, $fieldname))) ? ' required ' : '' !!}{{ (isset($multiple) && ($multiple=='true')) ? " multiple='multiple'" : '' }}>
+            @isset ($selected)
+                @if (!is_iterable($selected))
+                    @php
+                        $selected = [$selected];
+                    @endphp
+                @endif
+                @foreach ($selected as $manufacturer_id)
+                    <option value="{{ $manufacturer_id }}" selected="selected" role="option" aria-selected="true"  role="option">
+                        {{ \App\Models\Manufacturer::find($manufacturer_id)->name }}
+                    </option>
+                @endforeach
+            @endisset
             @if ($manufacturer_id = old($fieldname,  (isset($item)) ? $item->{$fieldname} : ''))
                 <option value="{{ $manufacturer_id }}" selected="selected" role="option" aria-selected="true"  role="option">
                     {{ (\App\Models\Manufacturer::find($manufacturer_id)) ? \App\Models\Manufacturer::find($manufacturer_id)->name : '' }}
                 </option>
             @else
-                <option value=""  role="option">{{ trans('general.select_manufacturer') }}</option>
+                {!! (!isset($multiple) || ($multiple=='false')) ? '<option value="" role="option">'.trans('general.select_manufacturer').'</option>' : ''  !!}
             @endif
 
         </select>
diff --git a/resources/views/partials/forms/edit/manufacturer.blade.php b/resources/views/partials/forms/edit/manufacturer.blade.php
deleted file mode 100644
index 59cd20d680..0000000000
--- a/resources/views/partials/forms/edit/manufacturer.blade.php
+++ /dev/null
@@ -1,8 +0,0 @@
-<!-- Manufacturer -->
-<div class="form-group {{ $errors->has('manufacturer_id') ? ' has-error' : '' }}">
-    <label for="manufacturer_id" class="col-md-3 control-label">{{ trans('general.manufacturer') }}</label>
-    <div class="col-md-7{{  (Helper::checkIfRequired($item, 'manufacturer_id')) ? ' required' : '' }}">
-        {{ Form::select('manufacturer_id', $manufacturer_list , old('manufacturer_id', $item->manufacturer_id), array('class'=>'select2', 'style'=>'width:100%')) }}
-        {!! $errors->first('manufacturer_id', '<span class="alert-msg" aria-hidden="true"><i class="fas fa-times" aria-hidden="true"></i> :message</span>') !!}
-    </div>
-</div>
diff --git a/resources/views/partials/forms/edit/minimum_quantity.blade.php b/resources/views/partials/forms/edit/minimum_quantity.blade.php
index 1566ab2e9c..26c032116c 100644
--- a/resources/views/partials/forms/edit/minimum_quantity.blade.php
+++ b/resources/views/partials/forms/edit/minimum_quantity.blade.php
@@ -1,15 +1,19 @@
 <!-- Min QTY -->
 <div class="form-group{{ $errors->has('min_amt') ? ' has-error' : '' }}">
     <label for="min_amt" class="col-md-3 control-label">{{ trans('general.min_amt') }}</label>
-    <div class="col-md-9{{  (Helper::checkIfRequired($item, 'min_amt')) ? ' required' : '' }}">
+    <div class="col-md-9">
        <div class="col-md-2" style="padding-left:0px">
-            <input class="form-control col-md-3" type="text" name="min_amt" id="min_amt" aria-label="min_amt" value="{{ old('min_amt', $item->min_amt) }}" />
+           <input class="form-control col-md-3" maxlength="5" type="text" name="min_amt" id="min_amt"
+                  aria-label="min_amt"
+                  value="{{ old('min_amt', ($item->min_amt ?? '')) }}"
+                   {{   (isset($item) && (Helper::checkIfRequired($item, 'min_amt')) ? ' required' : '') }}/>
         </div>
             <div class="col-md-7" style="margin-left: -15px;">
-                <a href="#" data-tooltip="true" title="{{ trans('general.min_amt_help') }}"><i class="fas fa-info-circle" aria-hidden="true"></i>
+
+                <a href="#" data-tooltip="true" title="{{ trans('general.min_amt_help') }}">
+                    <x-icon type="info-circle" />
                 <span class="sr-only">{{ trans('general.min_amt_help') }}</span>
             </a>
-
         </div>
         <div class="col-md-12">
            {!! $errors->first('min_amt', '<span class="alert-msg" aria-hidden="true"><i class="fas fa-times" aria-hidden="true"></i> :message</span>') !!}
diff --git a/resources/views/partials/forms/edit/model-select.blade.php b/resources/views/partials/forms/edit/model-select.blade.php
index 78073c9a66..7a846a7a1d 100644
--- a/resources/views/partials/forms/edit/model-select.blade.php
+++ b/resources/views/partials/forms/edit/model-select.blade.php
@@ -1,16 +1,26 @@
 <!-- Asset Model -->
 <div id="{{ $fieldname }}" class="form-group{{ $errors->has($fieldname) ? ' has-error' : '' }}">
 
-    {{ Form::label($fieldname, $translated_name, array('class' => 'col-md-3 control-label')) }}
+    <label for="{{ $fieldname }}" class="col-md-3 control-label">{{ $translated_name }}</label>
 
-    <div class="col-md-7{{  ((isset($field_req)) || ((isset($required) && ($required =='true')))) ?  ' required' : '' }}">
-        <select class="js-data-ajax" data-endpoint="models" data-placeholder="{{ trans('general.select_model') }}" name="{{ $fieldname }}" style="width: 100%" id="model_select_id" aria-label="{{ $fieldname }}"{!!  (isset($field_req) ? ' required ' : '') !!}{{ (isset($multiple) && ($multiple=='true')) ? " multiple='multiple'" : '' }}>
+    <div class="col-md-7">
+        <select class="js-data-ajax" data-endpoint="models" data-placeholder="{{ trans('general.select_model') }}" name="{{ $fieldname }}" style="width: 100%" id="model_select_id" aria-label="{{ $fieldname }}"{{  ((isset($field_req)) || ((isset($required) && ($required =='true')))) ?  ' required' : '' }}{{ (isset($multiple) && ($multiple=='true')) ? " multiple='multiple'" : '' }}>
+            @isset ($selected)
+                @if (!is_iterable($selected))
+                    @php
+                        $selected = [$selected];
+                    @endphp
+                @endif
+                @foreach ($selected as $model_id)
+                    <option value="{{ $model_id }}" selected="selected" role="option" aria-selected="true">
+                        {{ \App\Models\AssetModel::find($model_id)->name }}
+                    </option>
+                @endforeach
+            @endisset
             @if ($model_id = old($fieldname, ($item->{$fieldname} ?? request($fieldname) ?? '')))
                 <option value="{{ $model_id }}" selected="selected">
                     {{ (\App\Models\AssetModel::find($model_id)) ? \App\Models\AssetModel::find($model_id)->name : '' }}
                 </option>
-            @else
-                <option value=""  role="option">{{ trans('general.select_model') }}</option>
             @endif
 
         </select>
diff --git a/resources/views/partials/forms/edit/name-first.blade.php b/resources/views/partials/forms/edit/name-first.blade.php
new file mode 100644
index 0000000000..bc95b4edd1
--- /dev/null
+++ b/resources/views/partials/forms/edit/name-first.blade.php
@@ -0,0 +1,15 @@
+<!-- partials/forms/edit/name-first.blade.php -->
+@php
+    $class = $class ?? 'col-md-6';
+    $style = $style ?? '';
+    $required = $required ?? '';
+    $value = $value ?? $user->first_name;
+@endphp
+<div class="form-group {{ $errors->has('first_name') ? 'has-error' : '' }}">
+    <label class="col-md-3 control-label" for="first_name">{{ trans('general.first_name') }}</label>
+    <div class="{{$class ? $class : 'col-md-6'}}" style= "{{$style}}">
+        <input class="form-control" type="text" name="first_name" id="first_name" value="{{ old('first_name', ($value ?? $user->first_name)) }}" {{$required ? 'required' : ''}} maxlength="191" {{  (Helper::checkIfRequired($user, 'first_name')) ? ' required' : '' }}/>
+        {!! $errors->first('first_name', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
+    </div>
+</div>
+<!-- partials/forms/edit/name-first.blade.php -->
\ No newline at end of file
diff --git a/resources/views/partials/forms/edit/name-last.blade.php b/resources/views/partials/forms/edit/name-last.blade.php
new file mode 100644
index 0000000000..354142a78a
--- /dev/null
+++ b/resources/views/partials/forms/edit/name-last.blade.php
@@ -0,0 +1,15 @@
+<!-- partials/forms/edit/name-last.blade.php -->
+@php
+    $class = $class ?? 'col-md-6';
+    $style = $style ?? '';
+    $required = $required ?? '';
+    $value = $value ?? $user->last_name;
+@endphp
+<div class="form-group {{ $errors->has('last_name') ? 'has-error' : '' }}">
+    <label class="col-md-3 control-label" for="last_name">{{ trans('general.last_name') }} </label>
+    <div class="{{$class}}" style= "{{$style ? $style : ''}}">
+        <input class="form-control" type="text" name="last_name" id="last_name"  value="{{ old('last_name', ($value ?? $user->last_name)) }}" maxlength="191"{{  (Helper::checkIfRequired($user, 'last_name')) ? ' required' : '' }} />
+        {!! $errors->first('last_name', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
+    </div>
+</div>
+<!-- partials/forms/edit/name-last.blade.php -->
\ No newline at end of file
diff --git a/resources/views/partials/forms/edit/name.blade.php b/resources/views/partials/forms/edit/name.blade.php
index f4d29e606c..e192d7d511 100644
--- a/resources/views/partials/forms/edit/name.blade.php
+++ b/resources/views/partials/forms/edit/name.blade.php
@@ -1,8 +1,8 @@
 <!-- Name -->
 <div class="form-group {{ $errors->has('name') ? ' has-error' : '' }}">
     <label for="name" class="col-md-3 control-label">{{ $translated_name }}</label>
-    <div class="col-md-7 col-sm-12{{  (Helper::checkIfRequired($item, 'name')) ? ' required' : '' }}">
-        <input class="form-control" type="text" name="name" aria-label="name" id="name" value="{{ old('name', $item->name) }}"{!!  (Helper::checkIfRequired($item, 'name')) ? ' required' : '' !!} />
+    <div class="col-md-8 col-sm-12">
+        <input class="form-control" style="width:100%;" type="text" name="name" aria-label="name" id="name" value="{{ old('name', $item->name) }}"{!!  (Helper::checkIfRequired($item, 'name')) ? ' required' : '' !!} maxlength="191" />
         {!! $errors->first('name', '<span class="alert-msg" aria-hidden="true"><i class="fas fa-times" aria-hidden="true"></i> :message</span>') !!}
     </div>
 </div>
diff --git a/resources/views/partials/forms/edit/notes.blade.php b/resources/views/partials/forms/edit/notes.blade.php
index f6b08ea1aa..5f82616c2c 100644
--- a/resources/views/partials/forms/edit/notes.blade.php
+++ b/resources/views/partials/forms/edit/notes.blade.php
@@ -1,6 +1,6 @@
 <!-- Notes -->
 <div class="form-group{{ $errors->has('notes') ? ' has-error' : '' }}">
-    <label for="notes" class="col-md-3 control-label">{{ trans('admin/hardware/form.notes') }}</label>
+    <label for="notes" class="col-md-3 control-label">{{ trans('general.notes') }}</label>
     <div class="col-md-7 col-sm-12">
         <textarea class="col-md-6 form-control" id="notes" aria-label="notes" name="notes" style="min-width:100%;">{{ old('notes', $item->notes) }}</textarea>
         {!! $errors->first('notes', '<span class="alert-msg" aria-hidden="true"><i class="fas fa-times" aria-hidden="true"></i> :message</span>') !!}
diff --git a/resources/views/partials/forms/edit/order_number.blade.php b/resources/views/partials/forms/edit/order_number.blade.php
index 1f61aa68ed..86bea1fdb5 100644
--- a/resources/views/partials/forms/edit/order_number.blade.php
+++ b/resources/views/partials/forms/edit/order_number.blade.php
@@ -2,7 +2,7 @@
 <div class="form-group {{ $errors->has('order_number') ? ' has-error' : '' }}">
    <label for="order_number" class="col-md-3 control-label">{{ trans('general.order_number') }}</label>
    <div class="col-md-7 col-sm-12">
-       <input class="form-control" type="text" name="order_number" aria-label="order_number" id="order_number" value="{{ old('order_number', $item->order_number) }}" />
+       <input class="form-control" type="text" name="order_number" aria-label="order_number" id="order_number" value="{{ old('order_number', $item->order_number) }}"  maxlength="191"  />
        {!! $errors->first('order_number', '<span class="alert-msg" aria-hidden="true"><i class="fas fa-times" aria-hidden="true"></i> :message</span>') !!}
    </div>
 </div>
diff --git a/resources/views/partials/forms/edit/permissions-base.blade.php b/resources/views/partials/forms/edit/permissions-base.blade.php
index a6a6abf9e0..ad166888c7 100644
--- a/resources/views/partials/forms/edit/permissions-base.blade.php
+++ b/resources/views/partials/forms/edit/permissions-base.blade.php
@@ -18,11 +18,31 @@
       <td class="col-md-1 permissions-item">
         <label class="sr-only" for="{{ 'permission['.$localPermission['permission'].']' }}">{{ 'permission['.$localPermission['permission'].']' }}</label>
         @if (($localPermission['permission'] == 'superuser') && (!Auth::user()->isSuperUser()))
-          {{ Form::radio('permission['.$localPermission['permission'].']', '1',$userPermissions[$localPermission['permission'] ] == '1',['disabled'=>"disabled", 'aria-label'=> 'permission['.$localPermission['permission'].']']) }}
+          <input
+              disabled="disabled"
+              aria-label="permission[{{ $localPermission['permission'] }}]"
+              @checked($userPermissions[$localPermission['permission']] == '1')
+              name="permission[{{ $localPermission['permission'] }}]"
+              type="radio"
+              value="1"
+          />
         @elseif (($localPermission['permission'] == 'admin') && (!Auth::user()->hasAccess('admin')))
-          {{ Form::radio('permission['.$localPermission['permission'].']', '1',$userPermissions[$localPermission['permission'] ] == '1',['disabled'=>"disabled", 'aria-label'=> 'permission['.$localPermission['permission'].']']) }}
+          <input
+              disabled="disabled"
+              aria-label="permission[{{ $localPermission['permission'] }}]"
+              @checked($userPermissions[$localPermission['permission']] == '1')
+              name="permission[{{ $localPermission['permission'] }}]"
+              type="radio"
+              value="1"
+          />
         @else
-          {{ Form::radio('permission['.$localPermission['permission'].']', '1',$userPermissions[$localPermission['permission'] ] == '1',['value'=>"grant",  'aria-label'=> 'permission['.$localPermission['permission'].']']) }}
+          <input
+              aria-label="permission[{{ $localPermission['permission'] }}]"
+              @checked($userPermissions[$localPermission['permission']] == '1')
+              name="permission[{{ $localPermission['permission'] }}]"
+              type="radio"
+              value="1"
+          />
         @endif
 
         
@@ -30,22 +50,62 @@
       <td class="col-md-1 permissions-item">
         <label class="sr-only" for="{{ 'permission['.$localPermission['permission'].']' }}">{{ 'permission['.$localPermission['permission'].']' }}</label>
         @if (($localPermission['permission'] == 'superuser') && (!Auth::user()->isSuperUser()))
-          {{ Form::radio('permission['.$localPermission['permission'].']', '-1',$userPermissions[$localPermission['permission'] ] == '-1',['disabled'=>"disabled", 'aria-label'=> 'permission['.$localPermission['permission'].']']) }}
+          <input
+              disabled="disabled"
+              aria-label="permission[{{ $localPermission['permission'] }}]"
+              @checked($userPermissions[$localPermission['permission']] == '-1')
+              name="permission[{{ $localPermission['permission'] }}]"
+              type="radio"
+              value="-1"
+          />
         @elseif (($localPermission['permission'] == 'admin') && (!Auth::user()->hasAccess('admin')))
-          {{ Form::radio('permission['.$localPermission['permission'].']', '-1',$userPermissions[$localPermission['permission'] ] == '-1',['disabled'=>"disabled", 'aria-label'=> 'permission['.$localPermission['permission'].']']) }}
+          <input
+              disabled="disabled"
+              aria-label="permission[{{ $localPermission['permission'] }}]"
+              @checked($userPermissions[$localPermission['permission']] == '-1')
+              name="permission[{{ $localPermission['permission'] }}]"
+              type="radio"
+              value="-1"
+          />
         @else
-          {{ Form::radio('permission['.$localPermission['permission'].']', '-1',$userPermissions[$localPermission['permission'] ] == '-1',['value'=>"deny",   'aria-label'=> 'permission['.$localPermission['permission'].']']) }}
+          <input
+              aria-label="permission[{{ $localPermission['permission'] }}]"
+              @checked($userPermissions[$localPermission['permission']] == '-1')
+              name="permission[{{ $localPermission['permission'] }}]"
+              type="radio"
+              value="-1"
+          />
         @endif
       </td>
       <td class="col-md-1 permissions-item">
         <label class="sr-only" for="{{ 'permission['.$localPermission['permission'].']' }}">
            {{ 'permission['.$localPermission['permission'].']' }}</label>
         @if (($localPermission['permission'] == 'superuser') && (!Auth::user()->isSuperUser()))
-          {{ Form::radio('permission['.$localPermission['permission'].']','0',$userPermissions[$localPermission['permission'] ] == '0',['disabled'=>"disabled", 'aria-label'=> 'permission['.$localPermission['permission'].']'] ) }}
+          <input
+              disabled="disabled"
+              aria-label="permission[{{ $localPermission['permission'] }}]"
+              @checked($userPermissions[$localPermission['permission']] == '0')
+              name="permission[{{ $localPermission['permission'] }}]"
+              type="radio"
+              value="0"
+          />
         @elseif (($localPermission['permission'] == 'admin') && (!Auth::user()->hasAccess('admin')))
-          {{ Form::radio('permission['.$localPermission['permission'].']','0',$userPermissions[$localPermission['permission'] ] == '0',['disabled'=>"disabled", 'aria-label'=> 'permission['.$localPermission['permission'].']'] ) }}
+          <input
+              disabled="disabled"
+              aria-label="permission[{{ $localPermission['permission'] }}]"
+              @checked($userPermissions[$localPermission['permission']] == '0')
+              name="permission[{{ $localPermission['permission'] }}]"
+              type="radio"
+              value="0"
+          />
         @else
-          {{ Form::radio('permission['.$localPermission['permission'].']','0',$userPermissions[$localPermission['permission'] ] == '0',['value'=>"inherit",   'aria-label'=> 'permission['.$localPermission['permission'].']'] ) }}
+          <input
+              aria-label="permission[{{ $localPermission['permission'] }}]"
+              @checked($userPermissions[$localPermission['permission']] == '0')
+              name="permission[{{ $localPermission['permission'] }}]"
+              type="radio"
+              value="0"
+          />
         @endif
       </td>
     </tr>
@@ -59,15 +119,33 @@
       </td>
       <td class="col-md-1 permissions-item">
         <label for="{{ $area }}" class="sr-only">{{ $area }}</label>
-        {{ Form::radio("$area", '1',false,['value'=>"grant", 'data-checker-group' => str_slug($area), 'aria-label' => $area]) }}
+        <input
+            value="1"
+            data-checker-group="{{ str_slug($area) }}"
+            aria-label="{{ $area }}"
+            name="{{ $area }}"
+            type="radio"
+        />
       </td>
       <td class="col-md-1 permissions-item">
         <label for="{{ $area }}" class="sr-only">{{ $area }}</label>
-        {{ Form::radio("$area", '-1',false,['value'=>"deny", 'data-checker-group' => str_slug($area), 'aria-label' => $area]) }}
+        <input
+            value="-1"
+            data-checker-group="{{ str_slug($area) }}"
+            aria-label="{{ $area }}"
+            name="{{ $area }}"
+            type="radio"
+        />
       </td>
       <td class="col-md-1 permissions-item">
         <label for="{{ $area }}" class="sr-only">{{ $area }}</label>
-        {{ Form::radio("$area", '0',false,['value'=>"inherit", 'data-checker-group' => str_slug($area), 'aria-label' => $area] ) }}
+        <input
+            value="0"
+            data-checker-group="{{ str_slug($area) }}"
+            aria-label="{{ $area }}"
+            name="{{ $area }}"
+            type="radio"
+        />
       </td>
     </tr>
 
@@ -84,26 +162,37 @@
           </td>
           <td class="col-md-1 permissions-item">
             <label class="sr-only" for="{{ 'permission['.$permission['permission'].']' }}">{{ 'permission['.$permission['permission'].']' }}</label>
-
-            @if (($permission['permission'] == 'superuser') && (!Auth::user()->isSuperUser()))
-              {{ Form::radio('permission['.$permission['permission'].']', '1', $userPermissions[$permission['permission'] ] == '1', ["value"=>"grant", 'disabled'=>'disabled', 'class'=>'radiochecker-'.str_slug($area), 'aria-label'=>'permission['.$permission['permission'].']']) }}
-            @else
-              {{ Form::radio('permission['.$permission['permission'].']', '1', $userPermissions[ $permission['permission'] ] == '1', ["value"=>"grant",'class'=>'radiochecker-'.str_slug($area), 'aria-label' =>'permission['.$permission['permission'].']']) }}
-            @endif
+            <input
+                value="1"
+                class="radiochecker-{{ str_slug($area) }}"
+                aria-label="permission[{{ $permission['permission'] }}]"
+                @checked($userPermissions[$permission['permission']] == '1')
+                @disabled(($permission['permission'] == 'superuser') && (!Auth::user()->isSuperUser()))
+                name="permission[{{ $permission['permission'] }}]"
+                type="radio"
+            />
           </td>
           <td class="col-md-1 permissions-item">
-            @if (($permission['permission'] == 'superuser') && (!Auth::user()->isSuperUser()))
-              {{ Form::radio('permission['.$permission['permission'].']', '-1', $userPermissions[$permission['permission'] ] == '-1', ["value"=>"deny", 'disabled'=>'disabled', 'class'=>'radiochecker-'.str_slug($area), 'aria-label'=>'permission['.$permission['permission'].']']) }}
-            @else
-              {{ Form::radio('permission['.$permission['permission'].']', '-1', $userPermissions[$permission['permission'] ] == '-1', ["value"=>"deny",'class'=>'radiochecker-'.str_slug($area), 'aria-label'=>'permission['.$permission['permission'].']']) }}
-            @endif
+            <input
+                value="-1"
+                class="radiochecker-{{ str_slug($area) }}"
+                aria-label="permission[{{ $permission['permission'] }}]"
+                @checked($userPermissions[$permission['permission']] == '-1')
+                @disabled(($permission['permission'] == 'superuser') && (!Auth::user()->isSuperUser()))
+                name="permission[{{ $permission['permission'] }}]"
+                type="radio"
+            />
           </td>
           <td class="col-md-1 permissions-item">
-            @if (($permission['permission'] == 'superuser') && (!Auth::user()->isSuperUser()))
-              {{ Form::radio('permission['.$permission['permission'].']', '0', $userPermissions[$permission['permission']] =='0', ["value"=>"inherit", 'disabled'=>'disabled', 'class'=>'radiochecker-'.str_slug($area), 'aria-label'=>'permission['.$permission['permission'].']']) }}
-            @else
-              {{ Form::radio('permission['.$permission['permission'].']', '0', $userPermissions[$permission['permission']] =='0', ["value"=>"inherit", 'class'=>'radiochecker-'.str_slug($area), 'aria-label'=>'permission['.$permission['permission'].']']) }}
-            @endif
+            <input
+                value="0"
+                class="radiochecker-{{ str_slug($area) }}"
+                aria-label="permission[{{ $permission['permission'] }}]"
+                @checked($userPermissions[$permission['permission']] =='0')
+                @disabled(($permission['permission'] == 'superuser') && (!Auth::user()->isSuperUser()))
+                name="permission[{{ $permission['permission'] }}]"
+                type="radio"
+            />
           </td>
         @endif
       </tr>
diff --git a/resources/views/partials/forms/edit/phone.blade.php b/resources/views/partials/forms/edit/phone.blade.php
index 0a21450f31..af6ad8388e 100644
--- a/resources/views/partials/forms/edit/phone.blade.php
+++ b/resources/views/partials/forms/edit/phone.blade.php
@@ -1,7 +1,7 @@
 <div class="form-group {{ $errors->has('phone') ? ' has-error' : '' }}">
-    {{ Form::label('phone', trans('admin/suppliers/table.phone'), array('class' => 'col-md-3 control-label')) }}
+    <label for="phone" class="col-md-3 control-label">{{ trans('admin/suppliers/table.phone') }}</label>
     <div class="col-md-7">
-    {{Form::text('phone', old('phone', $item->phone), array('class' => 'form-control', 'aria-label'=>'phone')) }}
+        <input class="form-control" aria-label="phone" maxlength="191" name="phone" type="text" id="phone" value="{{ old('phone', $item->phone) }}">
         {!! $errors->first('phone', '<span class="alert-msg" aria-hidden="true"><i class="fas fa-times" aria-hidden="true"></i> :message</span>') !!}
     </div>
 </div>
diff --git a/resources/views/partials/forms/edit/purchase_cost.blade.php b/resources/views/partials/forms/edit/purchase_cost.blade.php
index 59be15f061..a99f96d585 100644
--- a/resources/views/partials/forms/edit/purchase_cost.blade.php
+++ b/resources/views/partials/forms/edit/purchase_cost.blade.php
@@ -3,7 +3,7 @@
     <label for="purchase_cost" class="col-md-3 control-label">{{ trans('general.purchase_cost') }}</label>
     <div class="col-md-9">
         <div class="input-group col-md-4" style="padding-left: 0px;">
-            <input class="form-control" type="text" name="purchase_cost" aria-label="purchase_cost" id="purchase_cost" value="{{ old('purchase_cost', Helper::formatCurrencyOutput($item->purchase_cost)) }}" />
+            <input class="form-control" type="text" name="purchase_cost" aria-label="purchase_cost" id="purchase_cost" value="{{ old('purchase_cost', Helper::formatCurrencyOutput($item->purchase_cost)) }}" maxlength="24" />
             <span class="input-group-addon">
                 @if (isset($currency_type))
                     {{ $currency_type }}
diff --git a/resources/views/partials/forms/edit/purchase_date.blade.php b/resources/views/partials/forms/edit/purchase_date.blade.php
deleted file mode 100644
index 97f81719be..0000000000
--- a/resources/views/partials/forms/edit/purchase_date.blade.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<!-- Purchase Date -->
-<div class="form-group {{ $errors->has('purchase_date') ? ' has-error' : '' }}">
-   <label for="purchase_date" class="col-md-3 control-label">{{ trans('general.purchase_date') }}</label>
-   <div class="input-group col-md-4">
-        <div class="input-group date" data-provide="datepicker" data-date-clear-btn="true" data-date-format="yyyy-mm-dd"  data-autoclose="true">
-            <input type="text" class="form-control" placeholder="{{ trans('general.select_date') }}" name="purchase_date" id="purchase_date" readonly value="{{  old('purchase_date', ($item->purchase_date) ? $item->purchase_date->format('Y-m-d') : '') }}" style="background-color:inherit">
-            <span class="input-group-addon"><i class="fas fa-calendar" aria-hidden="true"></i></span>
-       </div>
-       {!! $errors->first('purchase_date', '<span class="alert-msg" aria-hidden="true"><i class="fas fa-times" aria-hidden="true"></i> :message</span>') !!}
-   </div>
-</div>
diff --git a/resources/views/partials/forms/edit/quantity.blade.php b/resources/views/partials/forms/edit/quantity.blade.php
index f8a421adcd..0ddf6cebae 100644
--- a/resources/views/partials/forms/edit/quantity.blade.php
+++ b/resources/views/partials/forms/edit/quantity.blade.php
@@ -2,10 +2,12 @@
 <!-- QTY -->
 <div class="form-group {{ $errors->has('qty') ? ' has-error' : '' }}">
     <label for="qty" class="col-md-3 control-label">{{ trans('general.quantity') }}</label>
-    <div class="col-md-7{{  (Helper::checkIfRequired($item, 'qty')) ? ' required' : '' }}">
+    <div class="col-md-7">
        <div class="col-md-3" style="padding-left:0px">
-           <input class="form-control" type="text" name="qty" aria-label="qty" id="qty" value="{{ old('qty', $item->qty) }}" {!!  (Helper::checkIfRequired($item, 'qty')) ? ' required ' : '' !!}/>
+           <input class="form-control" maxlength="5" type="text" name="qty" aria-label="qty" id="qty" value="{{ old('qty', $item->qty) }}" {!!  (Helper::checkIfRequired($item, 'qty')) ? ' required ' : '' !!}/>
        </div>
+        <div class="col-md-12" style="padding-left:0px">
        {!! $errors->first('qty', '<span class="alert-msg" aria-hidden="true"><i class="fas fa-times" aria-hidden="true"></i> :message</span>') !!}
+        </div>
    </div>
 </div>
diff --git a/resources/views/partials/forms/edit/serial.blade.php b/resources/views/partials/forms/edit/serial.blade.php
index 483b425846..636204a564 100644
--- a/resources/views/partials/forms/edit/serial.blade.php
+++ b/resources/views/partials/forms/edit/serial.blade.php
@@ -1,8 +1,8 @@
 <!-- Serial -->
 <div class="form-group {{ $errors->has('serial') ? ' has-error' : '' }}">
     <label for="{{ $fieldname }}" class="col-md-3 control-label">{{ trans('admin/hardware/form.serial') }} </label>
-    <div class="col-md-7 col-sm-12{{  (Helper::checkIfRequired($item, 'serial')) ? ' required' : '' }}">
-        <input class="form-control" type="text" name="{{ $fieldname }}" id="{{ $fieldname }}" value="{{ old((isset($old_val_name) ? $old_val_name : $fieldname), $item->serial) }}" />
+    <div class="col-md-7 col-sm-12">
+        <input class="form-control" type="text" name="{{ $fieldname }}" id="{{ $fieldname }}" value="{{ old((isset($old_val_name) ? $old_val_name : $fieldname), $item->serial) }}"{{  (Helper::checkIfRequired($item, 'serial')) ? ' required' : '' }} maxlength="191" />
         {!! $errors->first('serial', '<span class="alert-msg" aria-hidden="true"><i class="fas fa-times" aria-hidden="true"></i> :message</span>') !!}
     </div>
 </div>
diff --git a/resources/views/partials/forms/edit/status-select.blade.php b/resources/views/partials/forms/edit/status-select.blade.php
index bd3c8dec2c..bd1fb50140 100644
--- a/resources/views/partials/forms/edit/status-select.blade.php
+++ b/resources/views/partials/forms/edit/status-select.blade.php
@@ -1,16 +1,21 @@
 <!-- Asset Model -->
 <div id="{{ $fieldname }}" class="form-group{{ $errors->has($fieldname) ? ' has-error' : '' }}">
 
-    {{ Form::label($fieldname, $translated_name, array('class' => 'col-md-3 control-label')) }}
+    <label for="{{ $fieldname }}" class="col-md-3 control-label">{{ $translated_name }}</label>
 
-    <div class="col-md-7{{  ((isset($required)) && ($required=='true')) ? ' required' : '' }}">
+    <div class="col-md-7">
         <select class="js-data-ajax" data-endpoint="statuslabels" data-placeholder="{{ trans('general.select_statuslabel') }}" name="{{ $fieldname }}" style="width: 100%" id="status_select_id" aria-label="{{ $fieldname }}" {!!  ((isset($item)) && (Helper::checkIfRequired($item, $fieldname))) ? ' required ' : '' !!}{{ (isset($multiple) && ($multiple=='true')) ? " multiple='multiple'" : '' }}>
+            @isset ($selected)
+                @foreach ($selected as $status_id)
+                    <option value="{{ $status_id }}" selected="selected" role="option" aria-selected="true">
+                        {{ \App\Models\Statuslabel::find($status_id)->name }}
+                    </option>
+                @endforeach
+            @endisset
             @if ($status_id = old($fieldname,  (isset($item)) ? $item->{$fieldname} : ''))
                 <option value="{{ $status_id }}" selected="selected" role="option" aria-selected="true"  role="option">
                     {{ (\App\Models\Statuslabel::find($status_id)) ? \App\Models\Statuslabel::find($status_id)->name : '' }}
                 </option>
-            @else
-                <option value=""  role="option">{{ trans('general.select_status') }}</option>
             @endif
 
         </select>
diff --git a/resources/views/partials/forms/edit/status.blade.php b/resources/views/partials/forms/edit/status.blade.php
index 291d28a3c5..01dd14612e 100644
--- a/resources/views/partials/forms/edit/status.blade.php
+++ b/resources/views/partials/forms/edit/status.blade.php
@@ -1,8 +1,17 @@
 <!-- Status -->
 <div class="form-group {{ $errors->has('status_id') ? ' has-error' : '' }}">
     <label for="status_id" class="col-md-3 control-label">{{ trans('admin/hardware/form.status') }}</label>
-    <div class="col-md-7 col-sm-11{{  (Helper::checkIfRequired($item, 'status_id')) ? ' required' : '' }}">
-        {{ Form::select('status_id', $statuslabel_list , old('status_id', $item->status_id), array('class'=>'select2 status_id', 'style'=>'width:100%','id'=>'status_select_id', 'aria-label'=>'status_id', 'required' => 'required')) }}
+    <div class="col-md-7 col-sm-11">
+        <x-input.select
+            name="status_id"
+            id="status_select_id"
+            :options="$statuslabel_list"
+            :selected="old('status_id', $item->status_id)"
+            :required="$required"
+            class="status_id"
+            style="width:100%;"
+            aria-label="status_id"
+        />
         {!! $errors->first('status_id', '<span class="alert-msg" aria-hidden="true"><i class="fas fa-times" aria-hidden="true"></i> :message</span>') !!}
     </div>
     <div class="col-md-2 col-sm-2 text-left">
diff --git a/resources/views/partials/forms/edit/submit-button.blade.php b/resources/views/partials/forms/edit/submit-button.blade.php
index f0b18073d2..7f2a99bfa8 100644
--- a/resources/views/partials/forms/edit/submit-button.blade.php
+++ b/resources/views/partials/forms/edit/submit-button.blade.php
@@ -1,5 +1,5 @@
 <button type="submit" class="btn btn-primary pull-right">
-    <i class="fas fa-check icon-white"></i>
+    <x-icon type="checkmark" />
     {{ trans('general.save') }}
 </button>
 
diff --git a/resources/views/partials/forms/edit/submit.blade.php b/resources/views/partials/forms/edit/submit.blade.php
index 4c87c7bb21..ba63f79581 100644
--- a/resources/views/partials/forms/edit/submit.blade.php
+++ b/resources/views/partials/forms/edit/submit.blade.php
@@ -2,6 +2,6 @@
 
 <div class="box-footer text-right" style="padding-bottom: 0px;">
     <a class="btn btn-link pull-left" href="{{ URL::previous() }}">{{ trans('button.cancel') }}</a>
-    <button type="submit" accesskey="s" class="btn btn-primary"><i class="fas fa-check icon-white" aria-hidden="true"></i> {{ trans('general.save') }}</button>
+    <button type="submit" {{$snipeSettings->shortcuts_enabled == 1 ? "accesskey=s" : ''}} class="btn btn-primary"><x-icon type="checkmark" /> {{ trans('general.save') }}</button>
 </div>
 <!-- / partials/forms/edit/submit.blade.php -->
diff --git a/resources/views/partials/forms/edit/supplier-select.blade.php b/resources/views/partials/forms/edit/supplier-select.blade.php
index 35c5165e59..c5f0264a16 100644
--- a/resources/views/partials/forms/edit/supplier-select.blade.php
+++ b/resources/views/partials/forms/edit/supplier-select.blade.php
@@ -1,15 +1,20 @@
 <div id="assigned_user" class="form-group{{ $errors->has($fieldname) ? ' has-error' : '' }}">
 
-    {{ Form::label($fieldname, $translated_name, array('class' => 'col-md-3 control-label')) }}
+    <label for="{{ $fieldname }}" class="col-md-3 control-label">{{ $translated_name }}</label>
 
-    <div class="col-md-7{{ (isset($item) && (Helper::checkIfRequired($item, $fieldname))) ? ' required' : '' }}">
-        <select class="js-data-ajax" data-endpoint="suppliers" data-placeholder="{{ trans('general.select_supplier') }}" name="{{ $fieldname }}" style="width: 100%" id="supplier_select" aria-label="{{ $fieldname }}"{{ (isset($multiple) && ($multiple=='true')) ? " multiple='multiple'" : '' }}>
+    <div class="col-md-7">
+        <select class="js-data-ajax" data-endpoint="suppliers" data-placeholder="{{ trans('general.select_supplier') }}" name="{{ $fieldname }}" style="width: 100%" id="supplier_select" aria-label="{{ $fieldname }}"{{ (isset($multiple) && ($multiple=='true')) ? " multiple='multiple'" : '' }}{{ (isset($item) && (Helper::checkIfRequired($item, $fieldname))) ? ' required' : '' }}>
+            @isset ($selected)
+                @foreach ($selected as $supplier_id)
+                    <option value="{{ $supplier_id }}" selected="selected" role="option" aria-selected="true">
+                        {{ \App\Models\Supplier::find($supplier_id)->name }}
+                    </option>
+                @endforeach
+            @endisset
             @if ($supplier_id = old($fieldname, (isset($item)) ? $item->{$fieldname} : ''))
                 <option value="{{ $supplier_id }}" selected="selected" role="option" aria-selected="true" role="option">
                     {{ (\App\Models\Supplier::find($supplier_id)) ? \App\Models\Supplier::find($supplier_id)->name : '' }}
                 </option>
-            @else
-                <option value="" role="option">{{ trans('general.select_supplier') }}</option>
             @endif
         </select>
     </div>
diff --git a/resources/views/partials/forms/edit/supplier.blade.php b/resources/views/partials/forms/edit/supplier.blade.php
deleted file mode 100644
index 9883dc5c11..0000000000
--- a/resources/views/partials/forms/edit/supplier.blade.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<!-- Supplier -->
-<div class="form-group {{ $errors->has('supplier_id') ? ' has-error' : '' }}">
-    <label for="supplier_id" class="col-md-3 control-label">{{ trans('general.supplier') }}</label>
-    <div class="col-md-7{{  (Helper::checkIfRequired($item, 'supplier_id')) ? ' required' : '' }}">
-        {{ Form::select('supplier_id', $supplier_list , old('supplier_id', $item->supplier_id), ['class'=>'select2', 'style'=>'min-width:350px', 'id' => 'supplier_select_id']) }}
-        {!! $errors->first('supplier_id', '<span class="alert-msg" aria-hidden="true"><i class="fas fa-times" aria-hidden="true"></i> :message</span>') !!}
-    </div>
-    <div class="col-md-1 col-sm-1 text-left">
-             <a href='{{ route('modal.show', 'supplier') }}' data-toggle="modal"  data-target="#createModal" data-dependency="supplier" data-select='supplier_select_id' class="btn btn-sm btn-primary">{{  trans('button.new') }}</a>
-    </div>
-</div>
diff --git a/resources/views/partials/forms/edit/uploadLogo.blade.php b/resources/views/partials/forms/edit/uploadLogo.blade.php
index 38bfa31bf1..07c4d7984a 100644
--- a/resources/views/partials/forms/edit/uploadLogo.blade.php
+++ b/resources/views/partials/forms/edit/uploadLogo.blade.php
@@ -3,13 +3,15 @@
 <div class="form-group">
     <div class="col-md-3">
         <label {!! $errors->has($logoVariable) ? 'class="alert-msg"' : '' !!} for="{{ $logoVariable }}">
-        {{ ucwords(str_replace('_', ' ', $logoVariable)) }}
+        {{ trans($logoLabel) }}
         </label>
     </div>
     <div class="col-md-9">
         <label class="btn btn-default{{ (config('app.lock_passwords')) ? ' disabled' : '' }}">
             {{ trans('button.select_file')  }}
-            <input type="file" name="{{ $logoVariable }}" class="js-uploadFile" id="{{ $logoId }}" accept="{{ (isset($allowedTypes) ? $allowedTypes : "image/gif,image/jpeg,image/webp,image/png,image/svg,image/svg+xml") }}" data-maxsize="{{ $maxSize ?? Helper::file_upload_max_size() }}"
+            <input type="file" name="{{ $logoVariable }}" class="js-uploadFile" id="{{ $logoId }}"
+                   accept="{{  $allowedTypes ?? "image/gif,image/jpeg,image/webp,image/png,image/svg,image/svg+xml,image/avif" }}"
+                   data-maxsize="{{ $maxSize ?? Helper::file_upload_max_size() }}"
                    style="display:none; max-width: 90%"{{ (config('app.lock_passwords')) ? ' disabled' : '' }}>
         </label>
 
@@ -23,33 +25,35 @@
         </p>
 
         @if (config('app.lock_passwords')===true)
-            <p class="text-warning"><i class="fas fa-lock"></i> {{ trans('general.feature_disabled') }}</p>
+            <p class="text-warning">
+                <x-icon type="locked" />
+                {{ trans('general.feature_disabled') }}</p>
         @endif
     </div>
 
     <div class="col-md-9 col-md-offset-3">
 
-            @if (($setting->$logoVariable!='') && (Storage::disk('public')->exists(e($snipeSettings->$logoVariable))))
-            <div class="pull-left" style="padding-right: 20px;">
-                <a href="{{ Storage::disk('public')->url(e($snipeSettings->$logoVariable)) }}"{!! ($logoVariable!='favicon') ? ' data-toggle="lightbox"' : '' !!}>
-                    <img id="{{ $logoId }}-imagePreview" style="height: 80px; padding-bottom: 5px;" alt="" src="{{ Storage::disk('public')->url(e($snipeSettings->$logoVariable)) }}">
-                </a>
-            </div>
+            @if (($setting->$logoVariable!='') && (Storage::disk('public')->exists(($logoPath ?? ''). $snipeSettings->$logoVariable)))
+                <div class="pull-left" style="padding-right: 20px;">
+                    <a href="{{ Storage::disk('public')->url(e(($logoPath ?? '').$snipeSettings->$logoVariable)) }}"{!! ($logoVariable!='favicon') ? ' data-toggle="lightbox"' : '' !!} title="Existing logo">
+                        <img style="height: 80px; padding-bottom: 5px;" alt="Current logo" src="{{ Storage::disk('public')->url(e(($logoPath ?? ''). $snipeSettings->$logoVariable)) }}">
+                    </a>
+                </div>
             @endif
 
             <div id="{{ $logoId }}-previewContainer" style="display: none;">
-                <img id="{{ $logoId }}-imagePreview" style="height: 80px;">
+                <img id="{{ $logoId }}-imagePreview" style="height: 80px;" alt="Logo upload preview">
             </div>
 
 
 
     </div>
-    @if (($setting->$logoVariable!='') && (Storage::disk('public')->exists(e($snipeSettings->$logoVariable))))
+    @if (($setting->$logoVariable!='') && (Storage::disk('public')->exists(($logoPath ?? '').$snipeSettings->$logoVariable)))
 
     <div class="col-md-9 col-md-offset-3">
         <label id="{{ $logoId }}-deleteCheckbox" for="{{ $logoClearVariable }}" style="font-weight: normal" class="form-control">
-            {{ Form::checkbox($logoClearVariable, '1', Request::old($logoClearVariable)) }}
-            Remove current {{ ucwords(str_replace('_', ' ', $logoVariable)) }} image
+            <input type="checkbox" name="{{ $logoClearVariable }}" value="1" @checked(old($logoClearVariable))>
+            {{ trans('general.remove_current_image', ['type' => $logoLabel]) }}
         </label>
     </div>
     @endif
diff --git a/resources/views/partials/forms/edit/user-select.blade.php b/resources/views/partials/forms/edit/user-select.blade.php
index d9cba4b75f..e73d09def5 100644
--- a/resources/views/partials/forms/edit/user-select.blade.php
+++ b/resources/views/partials/forms/edit/user-select.blade.php
@@ -1,9 +1,9 @@
 <div id="assigned_user" class="form-group{{ $errors->has($fieldname) ? ' has-error' : '' }}"{!!  (isset($style)) ? ' style="'.e($style).'"' : ''  !!}>
 
-    {{ Form::label($fieldname, $translated_name, array('class' => 'col-md-3 control-label')) }}
+    <label for="{{ $fieldname }}" class="col-md-3 control-label">{{ $translated_name }}</label>
 
-    <div class="col-md-7{{  ((isset($required)) && ($required=='true')) ? ' required' : '' }}">
-        <select class="js-data-ajax" data-endpoint="users" data-placeholder="{{ trans('general.select_user') }}" name="{{ $fieldname }}" style="width: 100%" id="assigned_user_select" aria-label="{{ $fieldname }}">
+    <div class="col-md-7">
+        <select class="js-data-ajax" data-endpoint="users" data-placeholder="{{ trans('general.select_user') }}" name="{{ $fieldname }}" style="width: 100%" id="assigned_user_select" aria-label="{{ $fieldname }}"{{  ((isset($required)) && ($required=='true')) ? ' required' : '' }}>
             @if ($user_id = old($fieldname, (isset($item)) ? $item->{$fieldname} : ''))
                 <option value="{{ $user_id }}" selected="selected" role="option" aria-selected="true"  role="option">
                     {{ (\App\Models\User::find($user_id)) ? \App\Models\User::find($user_id)->present()->fullName : '' }}
diff --git a/resources/views/partials/forms/edit/username.blade.php b/resources/views/partials/forms/edit/username.blade.php
new file mode 100644
index 0000000000..98bcf67c07
--- /dev/null
+++ b/resources/views/partials/forms/edit/username.blade.php
@@ -0,0 +1,14 @@
+<!-- partials/forms/edit/username.blade.php -->
+@php
+    $required = $required ?? '';
+@endphp
+<div class="form-group">
+    <div class="col-md-3 col-xs-12">
+        <label for="modal-username">{{ trans('admin/users/table.username') }}:
+        </label>
+    </div>
+    <div class="col-md-8 col-xs-12">
+        <input type='text' name="username" id='modal-username' class="form-control" maxlength="191" {{ $required ? ' required' : ''}}>
+    </div>
+</div>
+<!-- partials/forms/edit/username.blade.php -->
\ No newline at end of file
diff --git a/resources/views/partials/forms/edit/warranty.blade.php b/resources/views/partials/forms/edit/warranty.blade.php
index 3961c8e691..de4beaf2fa 100644
--- a/resources/views/partials/forms/edit/warranty.blade.php
+++ b/resources/views/partials/forms/edit/warranty.blade.php
@@ -2,8 +2,8 @@
 <div class="form-group {{ $errors->has('warranty_months') ? ' has-error' : '' }}">
     <label for="warranty_months" class="col-md-3 control-label">{{ trans('admin/hardware/form.warranty') }}</label>
     <div class="col-md-9">
-        <div class="input-group col-md-3" style="padding-left: 0px;">
-            <input class="form-control" type="text" name="warranty_months" id="warranty_months" value="{{ Request::old('warranty_months', $item->warranty_months) }}" maxlength="3" />
+        <div class="input-group col-md-4 col-sm-6" style="padding-left: 0px;">
+            <input class="form-control" type="text" name="warranty_months" id="warranty_months" value="{{ old('warranty_months', $item->warranty_months) }}" maxlength="3" />
             <span class="input-group-addon">{{ trans('admin/hardware/form.months') }}</span>
         </div>
         <div class="col-md-9" style="padding-left: 0px;">
diff --git a/resources/views/partials/forms/redirect_submit_options.blade.php b/resources/views/partials/forms/redirect_submit_options.blade.php
deleted file mode 100644
index c960dbb860..0000000000
--- a/resources/views/partials/forms/redirect_submit_options.blade.php
+++ /dev/null
@@ -1,36 +0,0 @@
-<!-- begin redirect submit options -->
-
-<div class="box-footer">
-    <div class="row">
-
-        <div class="col-md-3">
-            <a class="btn btn-link" href="{{ route($route) }}">{{ trans('button.cancel') }}</a>
-        </div>
-
-        <div class="col-md-9 text-right">
-            <div class="btn-group text-left">
-
-                <select class="redirect-options form-control select2" data-minimum-results-for-search="Infinity" name="redirect_option" style="min-width: 200px"{{ (!$asset->model ? ' disabled' : '') }}>
-
-                    <option {{ (Session::get('redirect_option')=="0" || (Session::get('redirect_option')=="2" && $checkin)) ? 'selected' : '' }} value="0">
-                        {{ trans('admin/hardware/form.redirect_to_all', ['type' => $table_name]) }}
-                    </option>
-                    <option {{ Session::get('redirect_option')=="1" ? 'selected' : ''}} value="1">
-                        {{ trans('admin/hardware/form.redirect_to_type', ['type' => $type]) }}
-                    </option>
-                    <option {{ Session::get('redirect_option')=="2" && !$checkin ? 'selected' : ''}}{{ $checkin ? 'hidden disabled' : '' }} value="2" >
-                        {{ !$checkin ? trans('admin/hardware/form.redirect_to_checked_out_to') : '' }}
-                    </option>
-
-                </select>
-
-                <button type="submit" class="btn btn-primary pull-right{{ (!$asset->model ? ' disabled' : '') }}" style="margin-left:5px; border-radius: 3px;"{!! (!$asset->model ? ' data-tooltip="true" title="'.trans('admin/hardware/general.edit').'" disabled' : '') !!}>
-                    <i class="fas fa-check icon-white" aria-hidden="true"></i>
-                    {{ $checkin ? trans('general.checkin') : trans('general.checkout') }}
-                </button>
-
-            </div><!-- /.btn-group -->
-        </div><!-- /.col-md-9 -->
-    </div><!-- /.row -->
-</div> <!-- /.box-footer -->
-<!-- end redirect submit options -->
\ No newline at end of file
diff --git a/resources/views/partials/label2-field-definitions.blade.php b/resources/views/partials/label2-field-definitions.blade.php
index efae291d2e..bcb979d01e 100644
--- a/resources/views/partials/label2-field-definitions.blade.php
+++ b/resources/views/partials/label2-field-definitions.blade.php
@@ -258,7 +258,7 @@
 <div x-data="{{ $name }}" x-init="_init" class="l2fd-root">
     <input type="hidden" name="{{ $name }}" x-model="valueString" x-ref="input" />
     <div class="l2fd-main">
-        <h1 class="l2fd-title" style="grid-area: fields-title">Fields</h1>
+        <h1 class="l2fd-title" style="grid-area: fields-title">{{trans('general.fields')}}</h1>
         <div class="l2fd-list" style="grid-area: fields-list">
             <template x-for="(field, index) in fields">
                 <div
@@ -296,7 +296,7 @@
                 ><i class="fa-solid fa-trash"></i></button>
         </div>
 
-        <h1 class="l2fd-title" style="grid-area: options-title">Options</h1>
+        <h1 class="l2fd-title" style="grid-area: options-title">{{trans('general.options')}}</h1>
         <div class="l2fd-list" style="grid-area: options-list">
             <template x-if="selectedField">
                 <template x-for="(option, index) in selectedField.options">
@@ -308,11 +308,11 @@
                             'selected': selectedOption == option 
                         }"
                         x-on:click="selectedOption = option" >
-                        <label style="grid-area: label-title">Label</label>
+                        <label style="grid-area: label-title">{{trans('general.label')}}</label>
                         <input style="grid-area: label-field" x-model="option.label" />
-                        <label style="grid-area: source-title">DataSource</label>
+                        <label style="grid-area: source-title">{{trans('general.data_source')}}</label>
                         <select style="grid-area: source-field" x-model="option.datasource">
-                            <optgroup label="Asset">
+                            <optgroup label="{{trans('general.asset')}}">
                                 <option value="" disabled>{{ trans('general.select_datasource') }}</option>
                                 <option value="asset_tag">{{trans('admin/hardware/table.asset_tag')}}</option>
                                 <option value="name">{{trans('admin/hardware/form.name')}}</option>
@@ -324,34 +324,34 @@
                                 <option value="last_audit_date">{{trans('general.last_audit')}}</option>
                                 <option value="next_audit_date">{{trans('general.next_audit_date')}}</option>
                             </optgroup>
-                            <optgroup label="Asset Model">
+                            <optgroup label="{{trans('general.asset')." ".trans('general.asset_model')}}">
                                 <option value="model.name">{{trans('admin/models/table.name')}}</option>
                                 <option value="model.model_number">{{trans('admin/models/table.modelnumber')}}</option>
                             </optgroup>
-                            <optgroup label="Manufacturer">
+                            <optgroup label="{{trans('general.manufacturer')}}">
                                 <option value="model.manufacturer.name">{{trans('admin/hardware/form.manufacturer')}}</option>
                                 <option value="model.manufacturer.support_email">{{trans('admin/manufacturers/table.support_email')}}</option>
                                 <option value="model.manufacturer.support_phone">{{trans('admin/manufacturers/table.support_phone')}}</option>
                                 <option value="model.manufacturer.support_url">{{trans('general.url')}}</option>
                             </optgroup>
-                            <optgroup label="Category">
+                            <optgroup label="{{trans('general.category')}}">
                                 <option value="model.category.name">{{trans('admin/categories/general.category_name')}}</option>
                             </optgroup>
-                            <optgroup label="Status">
+                            <optgroup label="{{trans('general.status')}}">
                                 <option value="assetstatus.name">{{trans('admin/statuslabels/table.name')}}</option>
                             </optgroup>
-                            <optgroup label="Supplier">
+                            <optgroup label="{{trans('general.supplier')}}">
                                 <option value="supplier.name">{{trans('admin/suppliers/table.name')}}</option>
                             </optgroup>
-                            <optgroup label="Default Location">
+                            <optgroup label=" {{trans('admin/hardware/form.default_location')}}">
                                 <option value="defaultLoc.name">{{trans('admin/hardware/form.default_location')}}</option>
                                 <option value="defaultLoc.phone">{{trans('admin/hardware/form.default_location_phone')}}</option>
                             </optgroup>
-                            <optgroup label="Location">
+                            <optgroup label="{{trans('general.location')}}">
                                 <option value="location.name">{{trans('admin/locations/table.name')}}</option>
                                 <option value="location.phone">{{trans('admin/locations/table.phone')}}</option>
                             </optgroup>
-                            <optgroup label="Company">
+                            <optgroup label="{{trans('general.company')}}">
                                 <option value="company.email">{{trans('admin/companies/table.email')}}</option>
                                 <option value="company.name">{{trans('admin/companies/table.name')}}</option>
                                 <option value="company.phone">{{trans('admin/companies/table.phone')}}</option>
diff --git a/resources/views/partials/label2-preview.blade.php b/resources/views/partials/label2-preview.blade.php
index 78518f103c..084104aebe 100644
--- a/resources/views/partials/label2-preview.blade.php
+++ b/resources/views/partials/label2-preview.blade.php
@@ -91,7 +91,7 @@
 
 <div x-data="label2_preview" x-init="_init" class="l2p-root">
     <div class="l2p-top">
-        <label for="label2-preview">Preview</label>
+        <label for="label2-preview">{{trans('general.preview')}}</label>
         <button class="l2p-pop-button btn btn-default" x-on:click.prevent="popout" title="Pop Out"><i class="fa-solid fa-maximize"></i></button>
     </div>
     <iframe id="label2-preview" x-bind:src="previewURL"></iframe>
diff --git a/resources/views/partials/locations-bulk-actions.blade.php b/resources/views/partials/locations-bulk-actions.blade.php
index 228a68dfba..b19f4d3299 100644
--- a/resources/views/partials/locations-bulk-actions.blade.php
+++ b/resources/views/partials/locations-bulk-actions.blade.php
@@ -1,11 +1,13 @@
 @can('delete', \App\Models\Location::class)
     <div id="locationsBulkEditToolbar">
-    {{ Form::open([
-              'method' => 'POST',
-              'route' => ['locations.bulkdelete.show'],
-              'class' => 'form-inline',
-              'id' => 'locationsBulkForm']) }}
-
+    <form
+        method="POST"
+        action="{{ route('locations.bulkdelete.show') }}"
+        accept-charset="UTF-8"
+        class="form-inline"
+        id="locationsBulkForm"
+    >
+            @csrf
             <div id="locations-toolbar">
                 <label for="bulk_actions" class="sr-only">{{ trans('general.bulk_actions') }}</label>
                 <select name="bulk_actions" class="form-control select2" style="width: 200px;" aria-label="bulk_actions">
@@ -14,7 +16,7 @@
                 <button class="btn btn-primary" id="bulkLocationsEditButton" disabled>{{ trans('button.go') }}</button>
             </div>
 
-    {{ Form::close() }}
+    </form>
     </div>
 @endcan
 
diff --git a/resources/views/partials/models-bulk-actions.blade.php b/resources/views/partials/models-bulk-actions.blade.php
index 8fca921ae1..57eaf2febd 100644
--- a/resources/views/partials/models-bulk-actions.blade.php
+++ b/resources/views/partials/models-bulk-actions.blade.php
@@ -1,10 +1,12 @@
 <div id="modelsBulkEditToolbar">
-    {{ Form::open([
-              'method' => 'POST',
-              'route' => ['models.bulkedit.index'],
-              'class' => 'form-inline',
-              'id' => 'modelsBulkForm']) }}
-
+    <form
+        method="POST"
+        action="{{route('models.bulkedit.index')}}"
+        accept-charset="UTF-8"
+        class="form-inline"
+        id="modelsBulkForm"
+    >
+    @csrf
     @if (request('status')!='deleted')
         @can('delete', \App\Models\AssetModel::class)
             <div id="models-toolbar">
@@ -17,7 +19,7 @@
             </div>
         @endcan
     @endif
-    {{ Form::close() }}
+    </form>
 </div>
 
 
diff --git a/resources/views/partials/more-info.blade.php b/resources/views/partials/more-info.blade.php
index 2f6c08b058..ee01f58fb2 100644
--- a/resources/views/partials/more-info.blade.php
+++ b/resources/views/partials/more-info.blade.php
@@ -1,3 +1,4 @@
-<a style="padding-left: 10px; font-size: 18px;" class="text-dark-gray" data-trigger="focus" tabindex="0" role="button" data-toggle="popover" title="More Info" data-placement="right" data-html="true" data-content="{{ (isset($helpText)) ? $helpText : 'Help Info Missing'  }}">
-    <i class="far fa-life-ring" aria-hidden="true"><span class="sr-only">{{ trans('general.moreinfo') }}</span></i>
+<a style="padding-left: 5px; font-size: 15px;" class="text-dark-gray hidden-print" data-trigger="focus" tabindex="0" role="button" data-toggle="popover" title="{{ trans('general.more_info') }}" data-placement="right" data-html="true" data-content="{{ (isset($helpText)) ? $helpText : 'Help Info Missing'  }}">
+    <x-icon type="more-info" style="padding-top: 9px;" />
+    <span class="sr-only">{{ trans('general.moreinfo') }}</span>
 </a>
diff --git a/resources/views/partials/users-bulk-actions.blade.php b/resources/views/partials/users-bulk-actions.blade.php
index cf22fde03d..4b610c187d 100644
--- a/resources/views/partials/users-bulk-actions.blade.php
+++ b/resources/views/partials/users-bulk-actions.blade.php
@@ -1,23 +1,38 @@
-<div id="userBulkEditToolbar">
-    {{ Form::open([
-              'method' => 'POST',
-              'route' => ['users/bulkedit'],
-              'class' => 'form-inline',
-              'id' => 'usersBulkForm']) }}
+@can('view', \App\Models\User::class)
+    <div id="userBulkEditToolbar" class="pull-left" style="min-width:500px !important; padding-top: 10px;">
 
-@if (request('status')!='deleted')
-    @can('delete', \App\Models\User::class)
-        <div id="users-toolbar">
-            <label for="bulk_actions" class="sr-only">{{ trans('general.bulk_actions') }}</label>
-            <select name="bulk_actions" class="form-control select2" style="min-width:300px;" aria-label="bulk_actions">
-                <option value="edit">{{ trans('general.bulk_edit') }}</option>
-                <option value="delete">{!! trans('general.bulk_checkin_delete') !!}</option>
-                <option value="merge">{!! trans('general.merge_users') !!}</option>
-                <option value="bulkpasswordreset">{{ trans('button.send_password_link') }}</option>
-            </select>
-            <button class="btn btn-primary" id="bulkUserEditButton" disabled>{{ trans('button.go') }}</button>
-        </div>
-    @endcan
-@endif
-    {{ Form::close() }}
-</div>
\ No newline at end of file
+        @if (request('status')!='deleted')
+
+            <form
+                method="POST"
+                action="{{ route('users/bulkedit') }}"
+                accept-charset="UTF-8"
+                class="form-inline"
+                id="usersBulkForm"
+            >
+            @csrf
+
+            <div id="users-toolbar" style="width:100% !important;">
+                <label for="bulk_actions" class="sr-only">{{ trans('general.bulk_actions') }}</label>
+                <select name="bulk_actions" class="form-control select2" style="width: 50% !important;" aria-label="bulk_actions">
+
+                    @can('update', \App\Models\User::class)
+                        <option value="edit">{{ trans('general.bulk_edit') }}</option>
+                        <option value="send_assigned">{{ trans('admin/users/general.email_assigned') }}</option>
+                    @endcan
+
+                    @can('delete', \App\Models\User::class)
+                        <option value="delete">{!! trans('general.bulk_checkin_delete') !!}</option>
+                        <option value="merge">{!! trans('general.merge_users') !!}</option>
+                    @endcan
+
+                    <option value="bulkpasswordreset">{{ trans('button.send_password_link') }}</option>
+                    <option value="print">{{ trans('admin/users/general.print_assigned') }}</option>
+                </select>
+                <button class="btn btn-primary" id="bulkUserEditButton" disabled>{{ trans('button.go') }}</button>
+            </div>
+            </form>
+        @endif
+
+    </div>
+@endcan
diff --git a/resources/views/reports/accessories.blade.php b/resources/views/reports/accessories.blade.php
index 997e5fedff..9f6fd0e1a4 100644
--- a/resources/views/reports/accessories.blade.php
+++ b/resources/views/reports/accessories.blade.php
@@ -13,13 +13,13 @@
         <div class="col-md-12">
             <div class="box box-default">
                 <div class="box-body">
-                    <div class="table-responsive">
-
                         <table
                                 data-cookie-id-table="accessoriesReport"
                                 data-pagination="true"
                                 data-id-table="accessoriesReport"
                                 data-search="true"
+                                data-search-highlight="true"
+                                data-show-print="true"
                                 data-side-pagination="server"
                                 data-show-columns="true"
                                 data-show-export="true"
@@ -45,8 +45,6 @@
                             <tbody>
                             </tbody>
                         </table>
-
-                    </div>
                 </div>
             </div>
         </div>
diff --git a/resources/views/reports/activity.blade.php b/resources/views/reports/activity.blade.php
index a7e6f9f15b..b9687beca5 100644
--- a/resources/views/reports/activity.blade.php
+++ b/resources/views/reports/activity.blade.php
@@ -7,10 +7,13 @@
 @stop
 
 @section('header_right')
-    {{ Form::open(['method' => 'post', 'class' => 'form-horizontal']) }}
+    <form method="POST" action="{{ route('reports.activity.post') }}" accept-charset="UTF-8" class="form-horizontal">
     {{csrf_field()}}
-    <button type="submit" class="btn btn-default"><i class="fas fa-download icon-white" aria-hidden="true"></i> {{ trans('general.download_all') }}</button>
-    {{ Form::close() }}
+    <button type="submit" class="btn btn-default">
+        <x-icon type="download" />
+        {{ trans('general.download_all') }}
+    </button>
+    </form>
 @stop
 
 {{-- Page content --}}
@@ -22,10 +25,13 @@
             <div class="box-body">
 
                 <table
+                        data-columns="{{ \App\Presenters\HistoryPresenter::dataTableLayout($serial = true) }}"
                         data-cookie-id-table="activityReport"
                         data-pagination="true"
                         data-id-table="activityReport"
                         data-search="true"
+                        data-search-highlight="true"
+                        data-show-print="true"
                         data-side-pagination="server"
                         data-show-columns="true"
                         data-show-export="true"
@@ -40,25 +46,6 @@
                         "fileName": "activity-report-{{ date('Y-m-d') }}",
                         "ignoreColumn": ["actions","image","change","checkbox","checkincheckout","icon"]
                         }'>
-
-                    <thead>
-                        <tr>
-                            <th data-field="icon" style="width: 40px;" class="hidden-xs" data-formatter="iconFormatter">Icon</th>
-                            <th class="col-sm-3" data-searchable="false" data-sortable="true" data-field="action_date" data-formatter="dateDisplayFormatter">{{ trans('general.date') }}</th>
-                            <th class="col-sm-2" data-searchable="true" data-sortable="true" data-field="admin" data-formatter="usersLinkObjFormatter">{{ trans('general.admin') }}</th>
-                            <th class="col-sm-2" data-field="action_type">{{ trans('general.action') }}</th>
-                            <th class="col-sm-2" data-field="file" data-visible="false" data-formatter="fileUploadNameFormatter">{{ trans('general.file_name') }}</th>
-                            <th class="col-sm-1" data-field="type" data-formatter="itemTypeFormatter">{{ trans('general.type') }}</th>
-                            <th class="col-sm-3" data-field="item.serial" data-visible="false">{{ trans('admin/hardware/table.serial') }}</th>
-                            <th class="col-sm-3" data-field="item" data-formatter="polymorphicItemFormatter">{{ trans('general.item') }}</th>
-                            <th class="col-sm-2" data-field="target" data-formatter="polymorphicItemFormatter">{{ trans('general.to') }}</th>
-                            <th class="col-sm-1" data-field="note">{{ trans('general.notes') }}</th>
-                            <th class="col-sm-2" data-field="log_meta" data-visible="false" data-formatter="changeLogFormatter">{{ trans('general.changed') }}</th>
-                            <th data-field="remote_ip" data-visible="false" data-sortable="true">{{ trans('admin/settings/general.login_ip') }}</th>
-                            <th data-field="user_agent" data-visible="false" data-sortable="true">{{ trans('admin/settings/general.login_user_agent') }}</th>
-                            <th data-field="action_source" data-visible="false" data-sortable="true">{{ trans('general.action_source') }}</th>
-                        </tr>
-                    </thead>
                 </table>
             </div>
         </div>
diff --git a/resources/views/reports/asset.blade.php b/resources/views/reports/asset.blade.php
index b70d69efe9..90ef276cfc 100644
--- a/resources/views/reports/asset.blade.php
+++ b/resources/views/reports/asset.blade.php
@@ -22,6 +22,9 @@
 
                     <table
                     name="assetsReport"
+                    data-search="true"
+                    data-search-highlight="true"
+                    data-show-print="true"
                     class="table table-striped snipe-table"
                     id="table"
                     data-url="{{route('api.assets.index', array(''=>e(Request::get('status')),'order_number'=>e(Request::get('order_number')), 'status_id'=>e(Request::get('status_id')), 'report'=>'true'))}}"
diff --git a/resources/views/reports/asset_maintenances.blade.php b/resources/views/reports/asset_maintenances.blade.php
index ea12df34d1..a51c21bc89 100644
--- a/resources/views/reports/asset_maintenances.blade.php
+++ b/resources/views/reports/asset_maintenances.blade.php
@@ -12,15 +12,14 @@
   <div class="col-md-12">
     <div class="box box-default">
       <div class="box-body">
-
-        <div class="table-responsive">
-
             <table
                     data-cookie-id-table="maintenancesReport"
                     data-pagination="true"
                     data-show-footer="true"
                     data-id-table="maintenancesReport"
                     data-search="true"
+                    data-search-highlight="true"
+                    data-show-print="true"
                     data-side-pagination="server"
                     data-show-columns="true"
                     data-show-export="true"
@@ -49,13 +48,11 @@
                     <th data-sortable="true" data-field="location" data-formatter="deployedLocationFormatter" data-visible="false">{{ trans('general.location') }}</th>
                     <th data-sortable="true" data-field="rtd_location" data-formatter="deployedLocationFormatter" data-visible="false">{{ trans('admin/hardware/form.default_location') }}</th>
                     <th data-searchable="true" data-sortable="true" data-field="is_warranty" data-formatter="trueFalseFormatter">{{ trans('admin/asset_maintenances/table.is_warranty') }}</th>
-                    <th data-searchable="true" data-sortable="true" data-field="user_id" data-formatter="usersLinkObjFormatter">{{ trans('general.admin') }}</th>
+                    <th data-searchable="true" data-sortable="true" data-field="user_id" data-formatter="usersLinkObjFormatter">{{ trans('general.created_by') }}</th>
                     <th data-searchable="true" data-sortable="true" data-field="notes" data-visible="false">{{ trans('admin/asset_maintenances/form.notes') }}</th>
                 </tr>
                 </thead>
             </table>
-
-        </div>
       </div>
     </div>
   </div>
diff --git a/resources/views/reports/audit.blade.php b/resources/views/reports/audit.blade.php
index 3d16b0714b..93d9f86a0a 100644
--- a/resources/views/reports/audit.blade.php
+++ b/resources/views/reports/audit.blade.php
@@ -19,6 +19,8 @@
                             data-pagination="true"
                             data-id-table="auditReport"
                             data-search="true"
+                            data-search-highlight="true"
+                            data-show-print="true"
                             data-side-pagination="server"
                             data-show-columns="true"
                             data-show-export="true"
@@ -35,14 +37,13 @@
                         <thead>
                         <tr>
                             <th class="col-sm-1" data-field="file" data-visible="false" data-formatter="auditImageFormatter">{{ trans('admin/hardware/table.image') }}</th>
-                            <th class="col-sm-2" data-field="created_at" data-formatter="dateDisplayFormatter">{{ trans('general.audit') }}</th>
-                            <th class="col-sm-2" data-field="admin" data-formatter="usersLinkObjFormatter">{{ trans('general.admin') }}</th>
-                            <th class="col-sm-2" data-field="item" data-formatter="polymorphicItemFormatter">{{ trans('general.item') }}</th>
-                            <th class="col-sm-1" data-field="location" data-formatter="locationsLinkObjFormatter">{{ trans('general.location') }}</th>
+                            <th class="col-sm-2" data-field="created_by" data-sortable="true" data-searchable="true" data-formatter="usersLinkObjFormatter">{{ trans('general.created_by') }}</th>
+                            <th class="col-sm-2" data-field="item" data-sortable="true" data-searchable="true" data-formatter="polymorphicItemFormatter">{{ trans('general.item') }}</th>
+                            <th class="col-sm-1" data-field="location" data-sortable="true" data-searchable="true" data-formatter="locationsLinkObjFormatter">{{ trans('general.location') }}</th>
+                            <th class="col-sm-2" data-field="created_at" data-formatter="dateDisplayFormatter" data-sortable="true" data-searchable="true">{{ trans('general.last_audit') }}</th>
                             <th class="col-sm-2" data-field="next_audit_date" data-formatter="dateDisplayFormatter">{{ trans('general.next_audit_date') }}</th>
                             <th class="col-sm-1" data-field="days_to_next_audit">{{ trans('general.days_to_next_audit') }}</th>
-
-                            <th class="col-sm-2" data-field="note">{{ trans('general.notes') }}</th>
+                            <th class="col-sm-2" data-field="note" data-sortable="true" data-searchable="true">{{ trans('general.notes') }}</th>
                         </tr>
                         </thead>
                     </table>
diff --git a/resources/views/reports/custom.blade.php b/resources/views/reports/custom.blade.php
index ebc212b5c7..28d8ab0318 100644
--- a/resources/views/reports/custom.blade.php
+++ b/resources/views/reports/custom.blade.php
@@ -2,13 +2,30 @@
 
 {{-- Page Title --}}
 @section('title')
-{{ trans('general.custom_report') }}
+    @if (request()->routeIs('report-templates.edit'))
+        {{ trans('general.update') }} {{ $template->name }}
+    @elseif(request()->routeIs('report-templates.show'))
+        {{ trans('general.custom_report') }}: {{ $template->name }}
+    @else
+        {{ trans('general.custom_report') }}
+    @endif
 @parent
 @stop
 
 @section('header_right')
-<a href="{{ URL::previous() }}" class="btn btn-primary pull-right">
-  {{ trans('general.back') }}</a>
+    @if (request()->routeIs('report-templates.edit'))
+        <a href="{{ route('report-templates.show', $template) }}" class="btn btn-primary pull-right">
+            {{ trans('general.back') }}
+        </a>
+    @elseif (request()->routeIs('report-templates.show'))
+        <a href="{{ route('reports/custom') }}" class="btn btn-primary pull-right">
+            {{ trans('general.back') }}
+        </a>
+    @else
+        <a href="{{ URL::previous() }}" class="btn btn-primary pull-right">
+            {{ trans('general.back') }}
+        </a>
+    @endif
 @stop
 
 
@@ -16,174 +33,213 @@
 @section('content')
 
 <div class="row">
-  <div class="col-md-8 col-md-offset-2">
+    <div class="col-md-9">
 
-    {{ Form::open(['method' => 'post', 'class' => 'form-horizontal']) }}
-    {{csrf_field()}}
+        <form
+            method="POST"
+            action="{{ request()->routeIs('report-templates.edit') ? route('report-templates.update', $template) : route('reports.post-custom') }}"
+            accept-charset="UTF-8"
+            class="form-horizontal"
+            id="custom-report-form"
+        >
+        {{csrf_field()}}
 
     <!-- Horizontal Form -->
-      <div class="box box-default">
-        <div class="box-header with-border">
-          <h2 class="box-title">{{  trans('general.customize_report') }}</h2>
+        <div class="box box-default">
+            <div class="box-header with-border">
+                @if (request()->routeIs('reports/custom') || request()->routeIs('report-templates.show'))
+                    <h2 class="box-title" style="padding-top: 7px;">
+                        {{ trans('general.customize_report') }}
+                    </h2>
+
+                @endif
+
+                @if (request()->routeIs('report-templates.edit'))
+                    <div class="row">
+                        <div class="col-md-7 col-md-offset-4">
+                            <div class="{{ $errors->has('name') ? ' has-error' : '' }}">
+                                <label
+                                    for="name"
+                                    class="col-md-4 control-label"
+                                >
+                                    {{ trans('admin/reports/general.template_name') }}
+                                </label>
+                                <div class="col-md-8">
+                                    <input
+                                        class="form-control"
+                                        placeholder=""
+                                        name="name"
+                                        type="text"
+                                        id="name"
+                                        value="{{ $template->name }}"
+                                        required
+                                    >
+                                </div>
+                                {!! $errors->first('name', '<span class="alert-msg" aria-hidden="true"><i class="fas fa-times" aria-hidden="true"></i> :message</span>') !!}
+                            </div>
+                        </div>
+                    </div>
+                @endif
+
         </div><!-- /.box-header -->
 
         <div class="box-body">
 
-            <div class="col-md-4">
+            <div class="col-md-4" id="included_fields_wrapper">
 
-              <label class="form-control">
-                <input type="checkbox" id="checkAll" checked="checked">
-               {{ trans('general.select_all') }}
+                <label class="form-control">
+                    <input type="checkbox" id="checkAll" checked="checked">
+                    {{ trans('general.select_all') }}
+                </label>
+
+                <label class="form-control">
+                    <input type="checkbox" name="id" value="1" @checked($template->checkmarkValue('id')) />
+                    {{ trans('general.id') }}
+                </label>
+
+                <label class="form-control">
+                    <input type="checkbox" name="company" value="1" @checked($template->checkmarkValue('company')) />
+                    {{ trans('general.company') }}
+                </label>
+
+                <label class="form-control">
+                    <input type="checkbox" name="asset_tag" value="1" @checked($template->checkmarkValue('asset_tag')) />
+                    {{ trans('general.asset_tag') }}
+                </label>
+
+                <label class="form-control">
+                    <input type="checkbox" name="asset_name" value="1" @checked($template->checkmarkValue('asset_name')) />
+                    {{ trans('admin/hardware/form.name') }}
+                </label>
+
+                <label class="form-control">
+                    <input type="checkbox" name="manufacturer" value="1" @checked($template->checkmarkValue('manufacturer')) />
+                    {{ trans('general.manufacturer') }}
+                </label>
+
+                <label class="form-control">
+                    <input type="checkbox" name="model" value="1" @checked($template->checkmarkValue('model')) />
+                    {{ trans('general.asset_model') }}
+                </label>
+
+                <label class="form-control">
+                    <input type="checkbox" name="category" value="1" @checked($template->checkmarkValue('category')) />
+                    {{ trans('general.category') }}
+                </label>
+
+                <label class="form-control">
+                    <input type="checkbox" name="serial" value="1" @checked($template->checkmarkValue('serial')) />
+                    {{ trans('admin/hardware/table.serial') }}
+                </label>
+
+                <label class="form-control">
+                    <input type="checkbox" name="purchase_date" value="1" @checked($template->checkmarkValue('purchase_date')) />
+                    {{ trans('admin/licenses/table.purchase_date') }}
+                </label>
+
+                <label class="form-control">
+                    <input type="checkbox" name="purchase_cost" value="1" @checked($template->checkmarkValue('purchase_cost')) />
+                    {{ trans('admin/hardware/form.cost') }}
+                </label>
+
+                <label class="form-control">
+                    <input type="checkbox" name="eol" value="1" @checked($template->checkmarkValue('eol')) />
+                    {{ trans('admin/hardware/form.eol_date') }}
+                </label>
+
+                <label class="form-control">
+                    <input type="checkbox" name="warranty" value="1" @checked($template->checkmarkValue('warranty')) />
+                    {{ trans('admin/hardware/form.warranty') }}
+                </label>
+
+                <label class="form-control">
+                    <input type="checkbox" name="depreciation" value="1" @checked($template->checkmarkValue('depreciation')) />
+                    {{ trans('general.depreciation') }}
+                </label>
+
+                <label class="form-control">
+                    <input type="checkbox" name="order" value="1" @checked($template->checkmarkValue('order')) />
+                    {{ trans('admin/hardware/form.order') }}
+                </label>
+
+                <label class="form-control">
+                    <input type="checkbox" name="supplier" value="1" @checked($template->checkmarkValue('supplier')) />
+                    {{ trans('general.suppliers') }}
+                </label>
+
+                <label class="form-control">
+                    <input type="checkbox" name="location" value="1" @checked($template->checkmarkValue('location')) />
+                    {{ trans('general.location') }}
+                </label>
+
+              <label class="form-control" style="margin-left: 25px;">
+                  <input type="checkbox" name="location_address" value="1" @checked($template->checkmarkValue('location_address')) />
+                  {{ trans('general.address') }}
               </label>
 
-              <label class="form-control">
-                {{ Form::checkbox('id', '1', '1') }}
-                {{ trans('general.id') }}
+                <label class="form-control">
+                    <input type="checkbox" name="rtd_location" value="1" @checked($template->checkmarkValue('rtd_location')) />
+                    {{ trans('admin/hardware/form.default_location') }}
+                </label>
+
+              <label class="form-control" style="margin-left: 25px;">
+                  <input type="checkbox" name="rtd_location_address" value="1" @checked($template->checkmarkValue('rtd_location_address')) />
+                {{ trans('general.address') }}
               </label>
 
-              <label class="form-control">
-                {{ Form::checkbox('company', '1', '1') }}
-                {{ trans('general.company') }}
-              </label>
+                <label class="form-control">
+                    <input type="checkbox" name="status" value="1" @checked($template->checkmarkValue('status')) />
+                    {{ trans('general.status') }}
+                </label>
+
+                <label class="form-control">
+                    <input type="checkbox" name="checkout_date" value="1" @checked($template->checkmarkValue('checkout_date')) />
+                    {{ trans('admin/hardware/table.checkout_date') }}
+                </label>
 
               <label class="form-control">
-              {{ Form::checkbox('asset_tag', '1', '1') }}
-                {{ trans('general.asset_tag') }}
-              </label>
-
-              <label class="form-control">
-                {{ Form::checkbox('asset_name', '1', '1') }}
-                {{ trans('admin/hardware/form.name') }}
-              </label>
-
-              <label class="form-control">
-                {{ Form::checkbox('manufacturer', '1', '1') }}
-                {{ trans('general.manufacturer') }}
-              </label>
-
-              <label class="form-control">
-                {{ Form::checkbox('model', '1', '1') }}
-                {{ trans('general.asset_models') }}
-              </label>
-
-              <label class="form-control">
-                {{ Form::checkbox('category', '1', '1') }}
-                {{ trans('general.category') }}
-              </label>
-
-              <label class="form-control">
-                {{ Form::checkbox('serial', '1', '1') }}
-                {{ trans('admin/hardware/table.serial') }}
-              </label>
-
-              <label class="form-control">
-                {{ Form::checkbox('purchase_date', '1', '1') }}
-                {{ trans('admin/licenses/table.purchase_date') }}
-              </label>
-
-              <label class="form-control">
-                {{ Form::checkbox('purchase_cost', '1', '1') }}
-                {{ trans('admin/hardware/form.cost') }}
-              </label>
-
-              <label class="form-control">
-                {{ Form::checkbox('eol', '1', '1') }}
-                {{ trans('admin/hardware/table.eol') }}
-              </label>
-
-              <label class="form-control">
-                {{ Form::checkbox('order', '1', '1') }}
-                {{ trans('admin/hardware/form.order') }}
-              </label>
-
-              <label class="form-control">
-                {{ Form::checkbox('supplier', '1', '1') }}
-                {{ trans('general.suppliers') }}
-              </label>
-
-              <label class="form-control">
-                {{ Form::checkbox('location', '1', '1') }}
-                {{ trans('general.location') }}
-              </label>
-
-              <label class="form-control">
-                {{ Form::checkbox('location_address', '1', '1') }}
-                - {{ trans('general.address') }}
-              </label>
-
-              <label class="form-control">
-                {{ Form::checkbox('rtd_location', '1', '1') }}
-                {{ trans('admin/hardware/form.default_location') }}
-              </label>
-
-              <label class="form-control">
-                {{ Form::checkbox('rtd_location_address', '1', '1') }}
-                - {{ trans('general.address') }}
-              </label>
-
-              <label class="form-control">
-                {{ Form::checkbox('status', '1', '1') }}
-                {{ trans('general.status') }}
-              </label>
-
-              <label class="form-control">
-                {{ Form::checkbox('warranty', '1', '1') }}
-                {{ trans('admin/hardware/form.warranty') }}
-              </label>
-
-              <label class="form-control">
-                {{ Form::checkbox('depreciation', '1', '1') }}
-                {{ trans('general.depreciation') }}
-              </label>
-
-              <label class="form-control">
-                {{ Form::checkbox('checkout_date', '1', '1') }}
-                {{ trans('admin/hardware/table.checkout_date') }}
-              </label>
-
-              <label class="form-control">
-                {{ Form::checkbox('checkin_date', '1', '1') }}
+                  <input type="checkbox" name="checkin_date" value="1" @checked($template->checkmarkValue('checkin_date')) />
                 {{ trans('admin/hardware/table.last_checkin_date') }}
               </label>
 
               <label class="form-control">
-                {{ Form::checkbox('expected_checkin', '1', '1') }}
+                  <input type="checkbox" name="expected_checkin" value="1" @checked($template->checkmarkValue('expected_checkin')) />
                 {{ trans('admin/hardware/form.expected_checkin') }}
               </label>
 
-              <label class="form-control">
-                {{ Form::checkbox('created_at', '1', '1') }}
-                {{ trans('general.created_at') }}
-              </label>
+                <label class="form-control">
+                    <input type="checkbox" name="created_at" value="1" @checked($template->checkmarkValue('created_at')) />
+                    {{ trans('general.created_at') }}
+                </label>
 
-              <label class="form-control">
-                {{ Form::checkbox('updated_at', '1', '1') }}
-                {{ trans('general.updated_at') }}
-              </label>
+                <label class="form-control">
+                    <input type="checkbox" name="updated_at" value="1" @checked($template->checkmarkValue('updated_at')) />
+                    {{ trans('general.updated_at') }}
+                </label>
 
-              <label class="form-control">
-                {{ Form::checkbox('deleted_at', '1', '1') }}
-                {{ trans('general.deleted') }}
-              </label>
+                <label class="form-control">
+                    <input type="checkbox" name="deleted_at" value="1" @checked($template->checkmarkValue('deleted_at')) />
+                    {{ trans('general.deleted') }}
+                </label>
 
-              <label class="form-control">
-                {{ Form::checkbox('last_audit_date', '1', '1') }}
-                {{ trans('general.last_audit') }}
-              </label>
+                <label class="form-control">
+                    <input type="checkbox" name="last_audit_date" value="1" @checked($template->checkmarkValue('last_audit_date')) />
+                    {{ trans('general.last_audit') }}
+                </label>
 
-              <label class="form-control">
-                {{ Form::checkbox('next_audit_date', '1', '1') }}
-                {{ trans('general.next_audit_date') }}
-              </label>
+                <label class="form-control">
+                    <input type="checkbox" name="next_audit_date" value="1" @checked($template->checkmarkValue('next_audit_date')) />
+                    {{ trans('general.next_audit_date') }}
+                </label>
 
-              <label class="form-control">
-                {{ Form::checkbox('notes', '1', '1') }}
-                {{ trans('general.notes') }}
-              </label>
+                <label class="form-control">
+                    <input type="checkbox" name="notes" value="1" @checked($template->checkmarkValue('notes')) />
+                    {{ trans('general.notes') }}
+                </label>
 
-              <label class="form-control">
-                {{ Form::checkbox('url', '1', '1') }}
-                - {{ trans('general.url') }}
+              <label class="form-control" style="margin-left: 25px;">
+                  <input type="checkbox" name="url" value="1" @checked($template->checkmarkValue('url')) />
+                {{ trans('general.url') }}
               </label>
 
 
@@ -192,64 +248,64 @@
               <h2>{{ trans('general.checked_out_to_fields') }}: </h2>
 
               <label class="form-control">
-                {{ Form::checkbox('assigned_to', '1', '1') }}
+                  <input type="checkbox" name="assigned_to" value="1" @checked($template->checkmarkValue('assigned_to')) />
                 {{ trans('admin/licenses/table.assigned_to') }}
               </label>
 
               <label class="form-control">
-                {{ Form::checkbox('username', '1', '1') }}
+                  <input type="checkbox" name="username" value="1" @checked($template->checkmarkValue('username')) />
                 {{ trans('admin/users/table.username') }}
               </label>
 
               <label class="form-control">
-                {{ Form::checkbox('employee_num', '1', '1') }}
+                  <input type="checkbox" name="employee_num" value="1" @checked($template->checkmarkValue('employee_num')) />
                 {{ trans('general.employee_number') }}
               </label>
 
               <label class="form-control">
-                {{ Form::checkbox('manager', '1', '1') }}
+                  <input type="checkbox" name="manager" value="1" @checked($template->checkmarkValue('manager')) />
                 {{ trans('admin/users/table.manager') }}
               </label>
 
               <label class="form-control">
-                {{ Form::checkbox('department', '1', '1') }}
+                  <input type="checkbox" name="department" value="1" @checked($template->checkmarkValue('department')) />
                 {{ trans('general.department') }}
               </label>
 
               <label class="form-control">
-                {{ Form::checkbox('title', '1', '1') }}
+                  <input type="checkbox" name="title" value="1" @checked($template->checkmarkValue('title')) />
                 {{ trans('admin/users/table.title') }}
               </label>
 
                 <!-- new -->
 
               <label class="form-control">
-                  {{ Form::checkbox('phone', '1', '1') }}
+                  <input type="checkbox" name="phone" value="1" @checked($template->checkmarkValue('phone')) />
                   {{ trans('admin/users/table.phone') }}
               </label>
 
               <label class="form-control">
-                  {{ Form::checkbox('user_address', '1', '1') }}
+                  <input type="checkbox" name="user_address" value="1" @checked($template->checkmarkValue('user_address')) />
                   {{ trans('general.address') }}
               </label>
 
               <label class="form-control">
-                  {{Form::checkbox('user_city', '1', '1')}}
+                  <input type="checkbox" name="user_city" value="1" @checked($template->checkmarkValue('user_city')) />
                   {{ trans('general.city') }}
               </label>
 
               <label class="form-control">
-                  {{Form::checkbox('user_state', '1', '1')}}
+                  <input type="checkbox" name="user_state" value="1" @checked($template->checkmarkValue('user_state')) />
                   {{ trans('general.state') }}
               </label>
 
               <label class="form-control">
-                  {{Form::checkbox('user_country', '1', '1')}}
+                  <input type="checkbox" name="user_country" value="1" @checked($template->checkmarkValue('user_country')) />
                   {{ trans('general.country') }}
               </label>
 
               <label class="form-control">
-                  {{Form::checkbox('user_zip', '1', '1')}}
+                  <input type="checkbox" name="user_zip" value="1" @checked($template->checkmarkValue('user_zip')) />
                   {{ trans('general.zip') }}
               </label>
 
@@ -262,7 +318,7 @@
               @foreach ($customfields as $customfield)
 
                   <label class="form-control">
-                    {{ Form::checkbox($customfield->db_column_name(), '1', '1') }}
+                      <input type="checkbox" name="{{ $customfield->db_column_name() }}" value="1" @checked($template->checkmarkValue($customfield->db_column_name())) />
                     {{ $customfield->name }}
                   </label>
 
@@ -278,31 +334,87 @@
 
               <br>
 
-            @include ('partials.forms.edit.company-select', ['translated_name' => trans('general.company'),'multiple' => 'true', 'fieldname' => 'by_company_id[]', 'hide_new' => 'true'])
-            @include ('partials.forms.edit.location-select', ['translated_name' => trans('general.location'), 'multiple' => 'true', 'fieldname' => 'by_location_id[]', 'hide_new' => 'true'])
-            @include ('partials.forms.edit.location-select', ['translated_name' => trans('admin/hardware/form.default_location'), 'multiple' => 'true', 'fieldname' => 'by_rtd_location_id[]', 'hide_new' => 'true'])
-            @include ('partials.forms.edit.department-select', ['translated_name' => trans('general.department'), 'fieldname' => 'by_dept_id', 'hide_new' => 'true'])
-            @include ('partials.forms.edit.supplier-select', ['translated_name' => trans('general.supplier'), 'fieldname' => 'by_supplier_id[]', 'multiple' => 'true', 'hide_new' => 'true'])
-            @include ('partials.forms.edit.model-select', ['translated_name' => trans('general.asset_model'), 'fieldname' => 'by_model_id[]', 'multiple' => 'true', 'hide_new' => 'true'])
-            @include ('partials.forms.edit.manufacturer-select', ['translated_name' => trans('general.manufacturer'), 'fieldname' => 'by_manufacturer_id', 'hide_new' => 'true'])
-            @include ('partials.forms.edit.category-select', ['translated_name' => trans('general.category'), 'fieldname' => 'by_category_id', 'hide_new' => 'true', 'category_type' => 'asset'])
-              @include ('partials.forms.edit.status-select', ['translated_name' => trans('admin/hardware/form.status'), 'fieldname' => 'by_status_id[]', 'multiple' => 'true', 'hide_new' => 'true'])
+            @include ('partials.forms.edit.company-select', [
+                    'translated_name' => trans('general.company'),
+                    'fieldname' =>
+                    'by_company_id[]',
+                    'multiple' => 'true',
+                    'hide_new' => 'true',
+                    'selected' => $template->selectValues('by_company_id', \App\Models\Company::class),
+            ])
+            @include ('partials.forms.edit.location-select', [
+                    'translated_name' => trans('general.location'),
+                    'fieldname' => 'by_location_id[]',
+                    'multiple' => 'true',
+                    'hide_new' => 'true',
+                    'selected' => $template->selectValues('by_location_id', \App\Models\Location::class),
+            ])
+            @include ('partials.forms.edit.location-select', [
+                    'translated_name' => trans('admin/hardware/form.default_location'),
+                    'fieldname' => 'by_rtd_location_id[]',
+                    'multiple' => 'true',
+                    'hide_new' => 'true',
+                    'selected' => $template->selectValues('by_rtd_location_id', \App\Models\Location::class),
+            ])
+            @include ('partials.forms.edit.department-select',[
+                    'translated_name' => trans('general.department'),
+                    'fieldname' => 'by_dept_id[]',
+                    'multiple' => 'true',
+                    'hide_new' => 'true',
+                    'selected' => $template->selectValues('by_dept_id', \App\Models\Department::class),
+            ])
+            @include ('partials.forms.edit.supplier-select', [
+                    'translated_name' => trans('general.supplier'),
+                    'fieldname' => 'by_supplier_id[]',
+                    'multiple' => 'true',
+                    'hide_new' => 'true',
+                    'selected' => $template->selectValues('by_supplier_id', \App\Models\Supplier::class),
+            ])
+            @include ('partials.forms.edit.model-select', [
+                    'translated_name' => trans('general.asset_model'),
+                    'fieldname' => 'by_model_id[]',
+                    'multiple' => 'true',
+                    'hide_new' => 'true',
+                    'selected' => $template->selectValues('by_model_id', \App\Models\AssetModel::class),
+            ])
+            @include ('partials.forms.edit.manufacturer-select', [
+                    'translated_name' => trans('general.manufacturer'),
+                    'fieldname' => 'by_manufacturer_id[]',
+                    'multiple' => 'true',
+                    'hide_new' => 'true',
+                    'selected' => $template->selectValues('by_manufacturer_id', \App\Models\Manufacturer::class),
+            ])
+            @include ('partials.forms.edit.category-select', [
+                    'translated_name' => trans('general.category'),
+                    'fieldname' => 'by_category_id[]',
+                    'multiple' => 'true',
+                    'hide_new' => 'true',
+                    'category_type' => 'asset',
+                    'selected' => $template->selectValues('by_category_id', \App\Models\Category::class),
+            ])
+            @include ('partials.forms.edit.status-select', [
+                    'translated_name' => trans('admin/hardware/form.status'),
+                    'fieldname' => 'by_status_id[]',
+                    'multiple' => 'true',
+                    'hide_new' => 'true',
+                    'selected' => $template->selectValues('by_status_id', \App\Models\Statuslabel::class),
+            ])
 
             <!-- Order Number -->
             <div class="form-group">
               <label for="by_order_number" class="col-md-3 control-label">{{ trans('general.order_number') }}</label>
               <div class="col-md-7">
-                <input class="form-control" type="text" name="by_order_number" value="" aria-label="by_order_number">
+                <input class="form-control" type="text" name="by_order_number" value="{{ $template->textValue('by_order_number', old('by_order_number')) }}" aria-label="by_order_number">
               </div>
             </div>
 
           <!-- Purchase Date -->
             <div class="form-group purchase-range{{ ($errors->has('purchase_start') || $errors->has('purchase_end')) ? ' has-error' : '' }}">
-              <label for="purchase_start" class="col-md-3 control-label">{{ trans('general.purchase_date') }} {{  trans('general.range') }}</label>
-              <div class="input-daterange input-group col-md-7" id="datepicker">
-                <input type="text" class="form-control" name="purchase_start" aria-label="purchase_start" value="{{ old('purchase_start') }}">
-                <span class="input-group-addon">to</span>
-                <input type="text" class="form-control" name="purchase_end" aria-label="purchase_end" value="{{ old('purchase_end') }}">
+              <label for="purchase_start" class="col-md-3 control-label">{{ trans('general.purchase_date') }}</label>
+              <div class="input-daterange input-group col-md-7" id="purchase-range-datepicker">
+                  <input type="text" class="form-control" name="purchase_start" aria-label="purchase_start" value="{{ $template->textValue('purchase_start', old('purchase_start')) }}">
+                  <span class="input-group-addon">{{ strtolower(trans('general.to')) }}</span>
+                  <input type="text" class="form-control" name="purchase_end" aria-label="purchase_end" value="{{ $template->textValue('purchase_end', old('purchase_end')) }}">
               </div>
 
                 @if ($errors->has('purchase_start') || $errors->has('purchase_end'))
@@ -315,12 +427,12 @@
             </div>
 
             <!-- Created Date -->
-            <div class="form-group purchase-range{{ ($errors->has('created_start') || $errors->has('created_end')) ? ' has-error' : '' }}">
-              <label for="created_start" class="col-md-3 control-label">{{ trans('general.created_at') }} {{  trans('general.range') }}</label>
-              <div class="input-daterange input-group col-md-7" id="datepicker">
-                <input type="text" class="form-control" name="created_start" aria-label="created_start" value="{{ old('created_start') }}">
-                <span class="input-group-addon">to</span>
-                <input type="text" class="form-control" name="created_end" aria-label="created_end" value="{{ old('created_end') }}">
+            <div class="form-group created-range{{ ($errors->has('created_start') || $errors->has('created_end')) ? ' has-error' : '' }}">
+              <label for="created_start" class="col-md-3 control-label">{{ trans('general.created_at') }} </label>
+              <div class="input-daterange input-group col-md-7" id="created-range-datepicker">
+                  <input type="text" class="form-control" name="created_start" aria-label="created_start" value="{{ $template->textValue('created_start', old('created_start')) }}">
+                  <span class="input-group-addon">{{ strtolower(trans('general.to')) }}</span>
+                  <input type="text" class="form-control" name="created_end" aria-label="created_end" value="{{ $template->textValue('created_end', old('created_end')) }}">
               </div>
 
                 @if ($errors->has('created_start') || $errors->has('created_end'))
@@ -333,11 +445,11 @@
 
           <!-- Checkout Date -->
           <div class="form-group checkout-range{{ ($errors->has('checkout_date_start') || $errors->has('checkout_date_end')) ? ' has-error' : '' }}">
-              <label for="checkout_date" class="col-md-3 control-label">{{ trans('general.checkout') }} {{  trans('general.range') }}</label>
-              <div class="input-daterange input-group col-md-7" id="datepicker">
-                  <input type="text" class="form-control" name="checkout_date_start" aria-label="checkout_date_start" value="{{ old('checkout_date_start') }}">
-                  <span class="input-group-addon">to</span>
-                  <input type="text" class="form-control" name="checkout_date_end" aria-label="checkout_date_end" value="{{ old('checkout_date_end') }}">
+              <label for="checkout_date" class="col-md-3 control-label">{{ trans('general.checkout') }} </label>
+              <div class="input-daterange input-group col-md-7" id="checkout-range-datepicker">
+                  <input type="text" class="form-control" name="checkout_date_start" aria-label="checkout_date_start" value="{{ $template->textValue('checkout_date_start', old('checkout_date_start')) }}">
+                  <span class="input-group-addon">{{ strtolower(trans('general.to')) }}</span>
+                  <input type="text" class="form-control" name="checkout_date_end" aria-label="checkout_date_end" value="{{ $template->textValue('checkout_date_end', old('checkout_date_end')) }}">
               </div>
 
               @if ($errors->has('checkout_date_start') || $errors->has('checkout_date_end'))
@@ -352,10 +464,10 @@
           <!-- Last Checkin Date -->
           <div class="form-group checkin-range{{ ($errors->has('checkin_date_start') || $errors->has('checkin_date_end')) ? ' has-error' : '' }}">
               <label for="checkin_date" class="col-md-3 control-label">{{ trans('admin/hardware/table.last_checkin_date') }}</label>
-              <div class="input-daterange input-group col-md-7" id="datepicker">
-                  <input type="text" class="form-control" name="checkin_date_start" aria-label="checkin_date_start" value="{{ old('checkin_date_start') }}">
+              <div class="input-daterange input-group col-md-7" id="checkin-range-datepicker">
+                  <input type="text" class="form-control" name="checkin_date_start" aria-label="checkin_date_start" value="{{ $template->textValue('checkin_date_start', old('checkin_date_start')) }}">
                   <span class="input-group-addon">{{ strtolower(trans('general.to')) }}</span>
-                  <input type="text" class="form-control" name="checkin_date_end" aria-label="checkin_date_end" value="{{ old('checkin_date_end') }}">
+                  <input type="text" class="form-control" name="checkin_date_end" aria-label="checkin_date_end" value="{{ $template->textValue('checkin_date_end', old('checkin_date_end')) }}">
               </div>
 
               @if ($errors->has('checkin_date_start') || $errors->has('checkin_date_end'))
@@ -369,10 +481,10 @@
             <!-- Expected Checkin Date -->
             <div class="form-group expected_checkin-range{{ ($errors->has('expected_checkin_start') || $errors->has('expected_checkin_end')) ? ' has-error' : '' }}">
               <label for="expected_checkin_start" class="col-md-3 control-label">{{ trans('admin/hardware/form.expected_checkin') }}</label>
-              <div class="input-daterange input-group col-md-7" id="datepicker">
-                <input type="text" class="form-control" name="expected_checkin_start" aria-label="expected_checkin_start" value="{{ old('expected_checkin_start') }}">
-                <span class="input-group-addon">to</span>
-                <input type="text" class="form-control" name="expected_checkin_end" aria-label="expected_checkin_end" value="{{ old('expected_checkin_end') }}">
+              <div class="input-daterange input-group col-md-7" id="expected_checkin-range-datepicker">
+                  <input type="text" class="form-control" name="expected_checkin_start" aria-label="expected_checkin_start" value="{{ $template->textValue('expected_checkin_start', old('expected_checkin_start')) }}">
+                  <span class="input-group-addon">{{ strtolower(trans('general.to')) }}</span>
+                  <input type="text" class="form-control" name="expected_checkin_end" aria-label="expected_checkin_end" value="{{ $template->textValue('expected_checkin_end', old('expected_checkin_end')) }}">
               </div>
 
                 @if ($errors->has('expected_checkin_start') || $errors->has('expected_checkin_end'))
@@ -384,13 +496,30 @@
 
             </div>
 
+              <!-- EoL Date -->
+              <div class="form-group asset_eol_date-range {{ ($errors->has('asset_eol_date_start') || $errors->has('asset_eol_date_end')) ? ' has-error' : '' }}">
+                  <label for="asset_eol_date" class="col-md-3 control-label">{{ trans('admin/hardware/form.eol_date') }}</label>
+                  <div class="input-daterange input-group col-md-7" id="asset_eol_date-range-datepicker">
+                      <input type="text" class="form-control" name="asset_eol_date_start" aria-label="asset_eol_date_start" value="{{ $template->textValue('asset_eol_date_start', old('asset_eol_date_start')) }}">
+                      <span class="input-group-addon">to</span>
+                      <input type="text" class="form-control" name="asset_eol_date_end" aria-label="asset_eol_date_end" value="{{ $template->textValue('asset_eol_date_end', old('asset_eol_date_end')) }}">
+                  </div>
+
+                  @if ($errors->has('asset_eol_date_start') || $errors->has('asset_eol_date_end'))
+                      <div class="col-md-9 col-lg-offset-3">
+                          {!! $errors->first('asset_eol_date_start', '<span class="alert-msg" aria-hidden="true"><i class="fas fa-times" aria-hidden="true"></i> :message</span>') !!}
+                          {!! $errors->first('asset_eol_date_end', '<span class="alert-msg" aria-hidden="true"><i class="fas fa-times" aria-hidden="true"></i> :message</span>') !!}
+                      </div>
+                  @endif
+              </div>
+
               <!-- Last Audit Date -->
               <div class="form-group last_audit-range{{ ($errors->has('last_audit_start') || $errors->has('last_audit_end')) ? ' has-error' : '' }}">
                   <label for="last_audit_start" class="col-md-3 control-label">{{ trans('general.last_audit') }}</label>
-                  <div class="input-daterange input-group col-md-7" id="datepicker">
-                      <input type="text" class="form-control" name="last_audit_start" aria-label="last_audit_start" value="{{ old('last_audit_start') }}">
-                      <span class="input-group-addon">to</span>
-                      <input type="text" class="form-control" name="last_audit_end" aria-label="last_audit_end" value="{{ old('last_audit_end') }}">
+                  <div class="input-daterange input-group col-md-7" id="last_audit-range-datepicker">
+                      <input type="text" class="form-control" name="last_audit_start" aria-label="last_audit_start" value="{{ $template->textValue('last_audit_start', old('last_audit_start')) }}">
+                      <span class="input-group-addon">{{ strtolower(trans('general.to')) }}</span>
+                      <input type="text" class="form-control" name="last_audit_end" aria-label="last_audit_end" value="{{ $template->textValue('last_audit_end', old('last_audit_end')) }}">
                   </div>
 
                   @if ($errors->has('last_audit_start') || $errors->has('last_audit_end'))
@@ -404,10 +533,10 @@
               <!-- Next Audit Date -->
               <div class="form-group next_audit-range{{ ($errors->has('next_audit_start') || $errors->has('next_audit_end')) ? ' has-error' : '' }}">
                   <label for="next_audit_start" class="col-md-3 control-label">{{ trans('general.next_audit_date') }}</label>
-                  <div class="input-daterange input-group col-md-7" id="datepicker">
-                      <input type="text" class="form-control" name="next_audit_start" aria-label="next_audit_start" value="{{ old('next_audit_start') }}">
-                      <span class="input-group-addon">to</span>
-                      <input type="text" class="form-control" name="next_audit_end" aria-label="next_audit_end" value="{{ old('next_audit_end') }}">
+                  <div class="input-daterange input-group col-md-7" id="next_audit-range-datepicker">
+                      <input type="text" class="form-control" name="next_audit_start" aria-label="next_audit_start" value="{{ $template->textValue('next_audit_start', old('next_audit_start')) }}">
+                      <span class="input-group-addon">{{ strtolower(trans('general.to')) }}</span>
+                      <input type="text" class="form-control" name="next_audit_end" aria-label="next_audit_end" value="{{ $template->textValue('next_audit_end', old('next_audit_end')) }}">
                   </div>
 
                   @if ($errors->has('next_audit_start') || $errors->has('next_audit_end'))
@@ -418,48 +547,184 @@
                   @endif
               </div>
 
+              <!-- Last updated Date -->
+              <div class="form-group last_updated-range{{ ($errors->has('last_updated_start') || $errors->has('last_updated_end')) ? ' has-error' : '' }}">
+                  <label for="last_updated_start" class="col-md-3 control-label">{{ trans('general.updated_at') }}</label>
+                  <div class="input-daterange input-group col-md-7" id="last_updated-range-datepicker">
+                      <input type="text" class="form-control" name="last_updated_start" aria-label="last_updated_start" value="{{ $template->textValue('last_updated_start', old('last_updated_start')) }}">
+                      <span class="input-group-addon">{{ strtolower(trans('general.to')) }}</span>
+                      <input type="text" class="form-control" name="last_updated_end" aria-label="last_updated_end" value="{{ $template->textValue('last_updated_end', old('last_updated_end')) }}">
+                  </div>
+
+                  @if ($errors->has('last_updated_start') || $errors->has('last_updated_end'))
+                      <div class="col-md-9 col-lg-offset-3">
+                          {!! $errors->first('last_updated_start', '<span class="alert-msg" aria-hidden="true"><i class="fas fa-times" aria-hidden="true"></i> :message</span>') !!}
+                          {!! $errors->first('last_updated_end', '<span class="alert-msg" aria-hidden="true"><i class="fas fa-times" aria-hidden="true"></i> :message</span>') !!}
+                      </div>
+                  @endif
+
+              </div>
+
             <div class="col-md-9 col-md-offset-3">
             <label class="form-control">
-              {{ Form::checkbox('exclude_archived', '1', old('exclude_archived')) }}
+                <input type="checkbox" name="exclude_archived" value="1" @checked($template->checkmarkValue('exclude_archived', '0')) />
               {{ trans('general.exclude_archived') }}
             </label>
             </div>
             <div class="col-md-9 col-md-offset-3">
               <label class="form-control">
-                {{ Form::checkbox('use_bom', '1', old('use_bom')) }}
+                  <input type="checkbox" name="use_bom" value="1" @checked($template->checkmarkValue('use_bom', '0')) />
                 {{ trans('general.bom_remark') }}
               </label>
             </div>
 
               <div class="col-md-9 col-md-offset-3">
-
                   <label class="form-control">
-                    {{ Form::radio('deleted_assets', 'exclude_deleted', true, ['aria-label'=>'deleted_assets', 'id'=>'deleted_assets_exclude_deleted'])}}
-                    {{ trans('general.exclude_deleted') }}
+                      <input
+                          name="deleted_assets"
+                          id="deleted_assets_exclude_deleted"
+                          type="radio"
+                          value="exclude_deleted"
+                          @checked($template->radioValue('deleted_assets', 'exclude_deleted', true))
+                          aria-label="deleted_assets"
+                      >
+                      {{ trans('general.exclude_deleted') }}
                   </label>
                   <label class="form-control">
-                    {{ Form::radio('deleted_assets', 'include_deleted', old('deleted_assets'), ['aria-label'=>'deleted_assets', 'id'=>'deleted_assets_include_deleted']) }}
+                      <input
+                          name="deleted_assets"
+                          id="deleted_assets_include_deleted"
+                          type="radio"
+                          value="include_deleted"
+                          @checked($template->radioValue('deleted_assets', 'include_deleted'))
+                          aria-label="deleted_assets"
+                      >
                     {{ trans('general.include_deleted') }}
                   </label>
                   <label class="form-control">
-                  {{ Form::radio('deleted_assets', 'only_deleted', old('deleted_assets'), ['aria-label'=>'deleted_assets','id'=>'deleted_assets_only_deleted']) }}
+                      <input
+                          name="deleted_assets"
+                          type="radio"
+                          id="deleted_assets_only_deleted"
+                          value="only_deleted"
+                          @checked($template->radioValue('deleted_assets', 'only_deleted'))
+                          aria-label="deleted_assets"
+                      >
                     {{ trans('general.only_deleted') }}
                   </label>
               </div>
           </div>
 
-
-
         </div> <!-- /.box-body-->
-        <div class="box-footer text-right">
-          <button type="submit" class="btn btn-success">
-            <i class="fas fa-download icon-white" aria-hidden="true"></i>
-            {{ trans('general.generate') }}
-          </button>
-        </div>
-      </div> <!--/.box.box-default-->
-    {{ Form::close() }}
-  </div>
+            <div class="box-footer text-right">
+                @if (request()->routeIs('report-templates.edit'))
+                    <button type="submit" class="btn btn-primary">
+                        <i class="fas fa-check icon-white" aria-hidden="true"></i>
+                        {{ trans('general.save') }}
+                    </button>
+                @else
+                    <button type="submit" class="btn btn-success">
+                        <i class="fas fa-download icon-white" aria-hidden="true"></i>
+                        {{ trans('general.generate') }}
+                    </button>
+                @endif
+            </div>
+        </div> <!--/.box.box-default-->
+        </form>
+    </div>
+
+    <!-- Saved Reports right column -->
+    <div class="col-md-3">
+        @if (! request()->routeIs('report-templates.edit'))
+            <div class="form-group">
+                <label for="saved_report_select">{{ trans('admin/reports/general.open_saved_template') }}</label>
+                <select
+                    id="saved_report_select"
+                    class="form-control select2"
+                    data-placeholder="{{ trans('admin/reports/general.select_a_template') }}"
+                >
+                    <option></option>
+                    @foreach($report_templates as $savedTemplate)
+                        <option
+                            value="{{ $savedTemplate->id }}"
+                            data-route="{{ route('report-templates.show', $savedTemplate->id) }}"
+                            @selected($savedTemplate->is(request()->route()->parameter('reportTemplate')))
+                        >
+                            {{ $savedTemplate->name }}
+                        </option>
+                    @endforeach
+                </select>
+            </div>
+
+            <div class="row">
+                <div class="col-md-12">
+                @if (request()->routeIs('report-templates.show'))
+                        <a
+                                href="{{ route('report-templates.edit', $template) }}"
+                                class="btn btn-sm btn-warning btn-social btn-block"
+                                data-tooltip="true"
+                                title="{{ trans('admin/reports/general.update_template') }}"
+                                style="margin-bottom: 5px;"
+                        >
+                            <x-icon type="edit" />
+                            {{ trans('general.update') }}
+                        </a>
+
+                    <span data-tooltip="true" title="{{ trans('general.delete') }}">
+                        <a href="#"
+                                class="btn btn-sm btn-danger btn-social btn-block"
+                                data-toggle="modal"
+                                data-title="{{ trans('general.delete') }}"
+                                data-content="{{ trans('general.delete_confirm', ['item' => $template->name]) }}"
+                                data-target="#dataConfirmModal"
+                                type="button"
+                        >
+
+                                <x-icon type="delete" />
+                                {{ trans('general.delete') }}
+
+                        </a>
+                    </span>
+
+
+                @endif
+                </div>
+            </div>
+        @endif
+        @if (request()->routeIs('reports/custom'))
+            <hr>
+            <div class="form-group">
+                <form method="post" id="savetemplateform" action="{{ route("report-templates.store") }}">
+                    @csrf
+                    <input type="hidden" id="savetemplateform" name="options">
+                    <div class="form-group{{ $errors->has('name') ? ' has-error' : '' }}">
+                        <label for="name">{{ trans('admin/reports/general.template_name') }}</label>
+                        <input
+                            class="form-control"
+                            placeholder=""
+                            name="name"
+                            type="text"
+                            id="name"
+                            value="{{ $template->name }}"
+                            required
+                        >
+                        {!! $errors->first('name', '<span class="alert-msg" aria-hidden="true"><i class="fas fa-times" aria-hidden="true"></i> :message</span>') !!}
+                    </div>
+                    <button class="btn btn-primary" style="width: 100%">
+                        {{ trans('admin/reports/general.save_template') }}
+                    </button>
+                </form>
+            </div>
+            <div class="box box-success">
+                <div class="box-header with-border">
+                    <h4>{{ trans('admin/reports/message.about_templates') }}</h4>
+                </div>
+                <div class="box-body">
+                    <p>{!!  trans('admin/reports/message.saving_templates_description')  !!}</p>
+                </div>
+            </div>
+        @endif
+    </div>
 </div>
 
 @stop
@@ -471,44 +736,99 @@
           clearBtn: true,
           todayHighlight: true,
           endDate: '0d',
-          format: 'yyyy-mm-dd'
+          format: 'yyyy-mm-dd',
+          keepEmptyValues: true,
       });
+
+      $('.created-range .input-daterange').datepicker({
+          clearBtn: true,
+          todayHighlight: true,
+          endDate: '0d',
+          format: 'yyyy-mm-dd',
+          keepEmptyValues: true,
+      });
+
       $('.checkout-range .input-daterange').datepicker({
           clearBtn: true,
           todayHighlight: true,
           endDate: '0d',
-          format: 'yyyy-mm-dd'
+          format: 'yyyy-mm-dd',
+          keepEmptyValues: true,
       });
 
       $('.checkin-range .input-daterange').datepicker({
           clearBtn: true,
           todayHighlight: true,
           endDate: '0d',
-          format: 'yyyy-mm-dd'
+          format: 'yyyy-mm-dd',
+          keepEmptyValues: true,
       });
 
       $('.expected_checkin-range .input-daterange').datepicker({
           clearBtn: true,
           todayHighlight: true,
-          format: 'yyyy-mm-dd'
+          format: 'yyyy-mm-dd',
+          keepEmptyValues: true,
+      });
+
+      $('.asset_eol_date-range .input-daterange').datepicker({
+          clearBtn: true,
+          todayHighlight: true,
+          format: 'yyyy-mm-dd',
+          keepEmptyValues: true,
       });
 
       $('.last_audit-range .input-daterange').datepicker({
           clearBtn: true,
           todayHighlight: true,
           endDate:'0d',
-          format: 'yyyy-mm-dd'
+          format: 'yyyy-mm-dd',
+          keepEmptyValues: true,
       });
 
       $('.next_audit-range .input-daterange').datepicker({
           clearBtn: true,
           todayHighlight: true,
-          format: 'yyyy-mm-dd'
+          format: 'yyyy-mm-dd',
+          keepEmptyValues: true,
       });
 
+      $('.last_updated-range .input-daterange').datepicker({
+          clearBtn: true,
+          todayHighlight: true,
+          endDate:'0d',
+          format: 'yyyy-mm-dd',
+          keepEmptyValues: true,
+      });
+
+
       $("#checkAll").change(function () {
-        $("input:checkbox").prop('checked', $(this).prop("checked"));
+        $("#included_fields_wrapper input:checkbox").prop('checked', $(this).prop("checked"));
       });
 
+      $("#savetemplateform").submit(function(e) {
+          e.preventDefault(e);
+
+          let form = $('#custom-report-form');
+          $('<input>').attr({
+              type: 'hidden',
+              name: 'name',
+              value: $('#name').val(),
+          }).appendTo(form);
+
+          form.attr('action', '{{ route('report-templates.store') }}').submit();
+      });
+
+      $('#saved_report_select')
+          .on('select2:select', function (event) {
+              window.location.href = event.params.data.element.dataset.route;
+          });
+
+      $('#dataConfirmModal').on('show.bs.modal', function (event) {
+          var content = $(event.relatedTarget).data('content');
+          var title = $(event.relatedTarget).data('title');
+          $(this).find(".modal-body").text(content);
+          $(this).find(".modal-header").text(title);
+      });
   </script>
 @stop
diff --git a/resources/views/reports/depreciation.blade.php b/resources/views/reports/depreciation.blade.php
index efaacc16bf..9f7a82a2dd 100644
--- a/resources/views/reports/depreciation.blade.php
+++ b/resources/views/reports/depreciation.blade.php
@@ -16,13 +16,13 @@
 
 
           @if (($depreciations) && ($depreciations->count() > 0))
-          <div class="table-responsive">
-
                   <table
                         data-cookie-id-table="depreciationReport"
                         data-pagination="true"
                         data-id-table="depreciationReport"
                         data-search="true"
+                        data-search-highlight="true"
+                        data-show-print="true"
                         data-side-pagination="server"
                         data-show-columns="true"
                         data-show-export="true"
@@ -40,9 +40,7 @@
                           "fileName": "depreciation-report-{{ date('Y-m-d') }}",
                           "ignoreColumn": ["actions","image","change","checkbox","checkincheckout","icon"]
                           }'>
-
           </table>
-        </div> <!-- /.table-responsive-->
               @else
               <div class="col-md-12">
                   <div class="alert alert-warning fade in">
diff --git a/resources/views/reports/licenses.blade.php b/resources/views/reports/licenses.blade.php
index 7493cc3d84..7f3073e406 100644
--- a/resources/views/reports/licenses.blade.php
+++ b/resources/views/reports/licenses.blade.php
@@ -12,13 +12,13 @@
     <div class="col-md-12">
         <div class="box box-default">
             <div class="box-body">
-                <div class="table-responsive">
-
                     <table
                             data-cookie-id-table="licensesReport"
                             data-pagination="true"
                             data-id-table="licensesReport"
                             data-search="true"
+                            data-search-highlight="true"
+                            data-show-print="true"
                             data-side-pagination="client"
                             data-show-columns="true"
                             data-show-export="true"
@@ -78,7 +78,6 @@
                             @endforeach
                         </tbody>
                     </table>
-                </div> <!-- /.table-responsive-->
             </div>
         </div>
     </div>
diff --git a/resources/views/reports/unaccepted_assets.blade.php b/resources/views/reports/unaccepted_assets.blade.php
index 80d151fd42..f9bc5f58be 100644
--- a/resources/views/reports/unaccepted_assets.blade.php
+++ b/resources/views/reports/unaccepted_assets.blade.php
@@ -19,10 +19,10 @@
             @endif
         </div>
         <div class="btn-group mr-2" role="group">
-            {{ Form::open(['method' => 'post', 'class' => 'form-horizontal']) }}
+            <form method="POST" action="{{ route('reports/export/unaccepted_assets') }}" accept-charset="UTF-8" class="form-horizontal">
             {{csrf_field()}}
             <button type="submit" class="btn btn-default"><i class="fa fa-download icon-white" aria-hidden="true"></i> {{ trans('general.download_all') }}</button>
-            {{ Form::close() }}
+            </form>
         </div>
     </div>
 @stop
@@ -34,13 +34,13 @@
   <div class="col-md-12">
     <div class="box box-default">
       <div class="box-body">
-        <div class="table-responsive">
-
             <table
                 data-cookie-id-table="unacceptedAssetsReport"
                 data-pagination="true"
                 data-id-table="unacceptedAssetsReport"
                 data-search="true"
+                data-search-highlight="true"
+                data-show-print="true"
                 data-side-pagination="client"
                 data-show-columns="true"
                 data-show-export="true"
@@ -70,7 +70,7 @@
               @foreach ($assetsForReport as $item)
                   @if ($item['assetItem'])
                   <tr @if($item['acceptance']->trashed()) style="text-decoration: line-through" @endif>
-                    <td>{{ $item['acceptance']->created_at }}</td>
+                    <td>{{ Helper::getFormattedDateObject($item['acceptance']->created_at, 'datetime', false) }}</td>
                     <td>{{ ($item['assetItem']->company) ? $item['assetItem']->company->name : '' }}</td>
                     <td>{!! $item['assetItem']->model->category->present()->nameUrl() !!}</td>
                     <td>{!! $item['assetItem']->present()->modelUrl() !!}</td>
@@ -81,13 +81,18 @@
                         <nobr>
                         @if(!$item['acceptance']->trashed())
                            <form method="post" class="white-space: nowrap;" action="{{ route('reports/unaccepted_assets_sent_reminder') }}">
-                            @if ($item['acceptance']->assignedTo)
+                            @if (($item['acceptance']->assignedTo) && ($item['acceptance']->assignedTo->email))
                                 @csrf
                                <input type="hidden" name="acceptance_id" value="{{ $item['acceptance']->id }}">
                                 <button class="btn btn-sm btn-warning" data-tooltip="true" data-title="{{ trans('admin/reports/general.send_reminder') }}">
                                     <i class="fa fa-repeat" aria-hidden="true"></i>
                                 </button>
-
+                            @else
+                                   <span data-tooltip="true" data-title="{{ trans('admin/reports/general.cannot_send_reminder') }}">
+                                       <a class="btn btn-sm btn-warning disabled" href="#">
+                                           <i class="fa fa-repeat" aria-hidden="true"></i>
+                                       </a>
+                                  </span>
                             @endif
                             <a href="{{ route('reports/unaccepted_assets_delete', ['acceptanceId' => $item['acceptance']->id]) }}" class="btn btn-sm btn-danger delete-asset" data-tooltip="true" data-toggle="modal" data-content="{{ trans('general.delete_confirm', ['item' =>trans('admin/reports/general.acceptance_request')]) }}" data-title="{{  trans('general.delete') }}" onClick="return false;"><i class="fa fa-trash"></i></a>
                            </form>
@@ -105,7 +110,6 @@
               </tr>
             </tfoot>
           </table>
-        </div>
       </div>
     </div>
   </div>
diff --git a/resources/views/settings/alerts.blade.php b/resources/views/settings/alerts.blade.php
index 9b2f57a1c6..c861cc63bf 100644
--- a/resources/views/settings/alerts.blade.php
+++ b/resources/views/settings/alerts.blade.php
@@ -21,9 +21,10 @@
     </style>
 
 
-    {{ Form::open(['method' => 'POST', 'files' => false, 'autocomplete' => 'off', 'class' => 'form-horizontal', 'role' => 'form' ]) }}
+    <form method="POST" action="{{ route('settings.alerts.save') }}" autocomplete="off" class="form-horizontal" role="form" id="create-form">
+
     <!-- CSRF Token -->
-    {{csrf_field()}}
+   {{ csrf_field() }}
 
     <div class="row">
         <div class="col-sm-10 col-sm-offset-1 col-md-8 col-md-offset-2">
@@ -32,125 +33,172 @@
             <div class="panel box box-default">
                 <div class="box-header with-border">
                     <h2 class="box-title">
-                        <i class="fas fa-bell"></i> {{ trans('admin/settings/general.alerts') }}
+                        <x-icon type="bell"/> {{ trans('admin/settings/general.alerts') }}
                     </h2>
                 </div>
                 <div class="box-body">
 
+                    <div class="col-md-12">
 
-                    <div class="col-md-11 col-md-offset-1">
 
-                        <!-- Alerts Enabled -->
-                        <div class="form-group {{ $errors->has('alerts_enabled') ? 'error' : '' }}">
-                            <div class="col-md-9 col-md-offset-3">
-                                <label class="form-control">
-                                    {{ Form::checkbox('alerts_enabled', '1', Request::old('alerts_enabled', $setting->alerts_enabled)) }}
-                                    {{  trans('admin/settings/general.alerts_enabled') }}
-                                </label>
+                        <fieldset name="remote-login" class="bottom-padded">
+                            <legend class="highlight">
+                                {{ trans('admin/settings/general.legends.general') }}
+                            </legend>
+
+                            <!-- Menu Alerts Enabled -->
+                            <div class="form-group {{ $errors->has('show_alerts_in_menu') ? 'error' : '' }}">
+                                <div class="col-md-9 col-md-offset-3">
+                                    <label class="form-control">
+                                        <input type="checkbox" name="show_alerts_in_menu" value="1" @checked(old('show_alerts_in_menu', $setting->show_alerts_in_menu))>
+                                        {{ trans('admin/settings/general.show_alerts_in_menu') }}
+                                    </label>
+                                </div>
                             </div>
+
+                            <!-- Alerts Enabled -->
+                            <div class="form-group {{ $errors->has('alerts_enabled') ? 'error' : '' }}">
+                                <div class="col-md-9 col-md-offset-3">
+                                    <label class="form-control">
+                                        <input type="checkbox" name="alerts_enabled" value="1" @checked(old('alerts_enabled', $setting->alerts_enabled))>
+                                        {{  trans('admin/settings/general.alerts_enabled') }}
+                                    </label>
+                                </div>
+                            </div>
+
+                        </fieldset>
+
+                        <fieldset name="remote-login" class="bottom-padded">
+                            <legend class="highlight">
+                                {{ trans('admin/settings/general.legends.email') }}
+                            </legend>
+
+                            <!-- Alert Email -->
+                            <div class="form-group {{ $errors->has('alert_email') ? 'error' : '' }}">
+                                <div class="col-md-3">
+                                    <label for="alert_email">{{ trans('admin/settings/general.alert_email') }}</label>
+                                </div>
+                                <div class="col-md-7">
+                                    <input type="text" name="alert_email" value="{{ old('alert_email', $setting->alert_email) }}" class="form-control" placeholder="admin@yourcompany.com,it@yourcompany.com" maxlength="191">
+                                    {!! $errors->first('alert_email', '<span class="alert-msg" aria-hidden="true">:message</span><br>') !!}
+                                    <p class="help-block">{{ trans('admin/settings/general.alert_email_help') }}</p>
+
+                                </div>
+                            </div>
+
+
+                            <!-- Admin CC Email -->
+                            <div class="form-group {{ $errors->has('admin_cc_email') ? 'error' : '' }}">
+                                <div class="col-md-3">
+                                    <label for="admin_cc_email">{{ trans('admin/settings/general.admin_cc_email') }}</label>
+                                </div>
+                                <div class="col-md-7">
+                                    <input type="email" name="admin_cc_email" value="{{ old('admin_cc_email', $setting->admin_cc_email) }}" class="form-control" placeholder="admin@yourcompany.com" maxlength="191">
+                                    {!! $errors->first('admin_cc_email', '<span class="alert-msg" aria-hidden="true">:message</span><br>') !!}
+                                    <p class="help-block">{{ trans('admin/settings/general.admin_cc_email_help') }}</p>
+                                </div>
+                            </div>
+                            <div class="form-group">
+                                <div class="col-md-9 col-md-offset-3">
+                                    <label class="form-control">
+                                        <input
+                                            type="radio"
+                                            name="admin_cc_always"
+                                            value="1"
+                                            @checked($setting->admin_cc_always == 1)
+                                        >
+                                        {{ trans('admin/settings/general.admin_cc_always') }}
+                                    </label>
+                                    <label class="form-control">
+                                        <input
+                                            type="radio"
+                                            name="admin_cc_always"
+                                            value="0"
+                                            @checked($setting->admin_cc_always == 0)
+                                        >
+                                        {{ trans('admin/settings/general.admin_cc_when_acceptance_required') }}
+                                    </label>
+                                </div>
+                            </div>
+                        </fieldset>
+
+                        <fieldset name="remote-login" class="bottom-padded">
+                            <legend class="highlight">
+                                {{ trans('admin/settings/general.legends.intervals') }}
+                            </legend>
+
+
+                            <!-- Alert interval -->
+                            <div class="form-group {{ $errors->has('alert_interval') ? 'error' : '' }}">
+                                <div class="col-md-3">
+                                    <label for="alert_interval">{{ trans('admin/settings/general.alert_interval') }}</label>
+                                </div>
+                                <div class="col-md-9">
+                                    <input class="form-control" placeholder="30" maxlength="3" style="width: 70px;" name="alert_interval" type="number" value="{{ old('alert_interval', $setting->alert_interval) }}" id="alert_interval">
+                                    {!! $errors->first('alert_interval', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
+                                </div>
+                            </div>
+
+                            <!-- Alert threshold -->
+                            <div class="form-group {{ $errors->has('alert_threshold') ? 'error' : '' }}">
+                                <div class="col-md-3">
+                                    <label for="alert_threshold">{{ trans('admin/settings/general.alert_inv_threshold') }}</label>
+                                </div>
+                                <div class="col-md-8">
+                                    <input class="form-control" placeholder="5" maxlength="3" style="width: 70px;" name="alert_threshold" type="number" value="{{ old('alert_threshold', $setting->alert_threshold) }}" id="alert_threshold">
+                                    {!! $errors->first('alert_threshold', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
+                                </div>
+                            </div>
+
+
+                            <!-- Audit interval -->
+                            <div class="form-group {{ $errors->has('audit_interval') ? 'error' : '' }}">
+                                <div class="col-md-3">
+                                    <label for="audit_interval">{{ trans('admin/settings/general.audit_interval') }}</label>
+                                </div>
+                                <div class="input-group col-xs-10 col-sm-6 col-md-6 col-lg-3 col-xl-3">
+                                    <input class="form-control" placeholder="12" maxlength="3" name="audit_interval" type="number" id="audit_interval" value="{{ old('audit_interval', $setting->audit_interval) }}">
+                                    <span class="input-group-addon">{{ trans('general.months') }}</span>
+                                </div>
+                                <div class="col-md-8 col-md-offset-3">
+                                    {!! $errors->first('audit_interval', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
+                                    <p class="help-block">{{ trans('admin/settings/general.audit_interval_help') }}</p>
+                                </div>
+                            </div>
+
+                            <!-- Alert threshold -->
+                            <div class="form-group {{ $errors->has('audit_warning_days') ? 'error' : '' }}">
+                                <div class="col-md-3">
+                                    <label for="audit_warning_days">{{ trans('admin/settings/general.audit_warning_days') }}</label>
+                                </div>
+                                <div class="input-group col-xs-10 col-sm-6 col-md-4 col-lg-3 col-xl-3">
+                                    <input class="form-control" placeholder="14" maxlength="3" name="audit_warning_days" type="number" id="audit_warning_days" value="{{ old('audit_warning_days', $setting->audit_warning_days) }}">
+                                    <span class="input-group-addon">{{ trans('general.days') }}</span>
+                                </div>
+                                <div class="col-md-8 col-md-offset-3">
+                                    {!! $errors->first('audit_warning_days', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
+                                    <p class="help-block">{{ trans('admin/settings/general.audit_warning_days_help') }}</p>
+                                </div>
+                            </div>
+
+                            <!-- Due for checkin days -->
+                            <div class="form-group {{ $errors->has('due_checkin_days') ? 'error' : '' }}">
+                                <div class="col-md-3">
+                                    <label for="due_checkin_days">{{ trans('admin/settings/general.due_checkin_days') }}</label>
+                                </div>
+                                <div class="input-group col-xs-10 col-sm-6 col-md-4 col-lg-3 col-xl-3">
+                                    <input class="form-control" placeholder="14" maxlength="3" name="due_checkin_days" type="number" id="due_checkin_days" value="{{ old('due_checkin_days', $setting->due_checkin_days) }}">
+                                    <span class="input-group-addon">{{ trans('general.days') }}</span>
+                                </div>
+                                <div class="col-md-8 col-md-offset-3">
+                                    {!! $errors->first('due_checkin_days', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
+                                    <p class="help-block">{{ trans('admin/settings/general.due_checkin_days_help') }}</p>
+                                </div>
+                            </div>
+                        </fieldset>
+
                         </div>
 
-                        <!-- Menu Alerts Enabled -->
-                        <div class="form-group {{ $errors->has('show_alerts_in_menu') ? 'error' : '' }}">
-                            <div class="col-md-9 col-md-offset-3">
-                                <label class="form-control">
-                                    {{ Form::checkbox('show_alerts_in_menu', '1', Request::old('show_alerts_in_menu', $setting->show_alerts_in_menu)) }}
-                                    {{ trans('admin/settings/general.show_alerts_in_menu') }}
-                                </label>
-                            </div>
-                        </div>
-
-
-
-                        <!-- Alert Email -->
-                        <div class="form-group {{ $errors->has('alert_email') ? 'error' : '' }}">
-                            <div class="col-md-3">
-                                {{ Form::label('alert_email', trans('admin/settings/general.alert_email')) }}
-                            </div>
-                            <div class="col-md-7">
-                                {{ Form::text('alert_email', old('alert_email', $setting->alert_email), array('class' => 'form-control','placeholder' => 'admin@yourcompany.com')) }}
-                                {!! $errors->first('alert_email', '<span class="alert-msg" aria-hidden="true">:message</span><br>') !!}
-
-                                <p class="help-block">{{ trans('admin/settings/general.alert_email_help') }}</p>
-
-
-                            </div>
-                        </div>
-
-
-                        <!-- Admin CC Email -->
-                        <div class="form-group {{ $errors->has('admin_cc_email') ? 'error' : '' }}">
-                            <div class="col-md-3">
-                                {{ Form::label('admin_cc_email', trans('admin/settings/general.admin_cc_email')) }}
-                            </div>
-                            <div class="col-md-7">
-                                {{ Form::text('admin_cc_email', old('admin_cc_email', $setting->admin_cc_email), array('class' => 'form-control','placeholder' => 'admin@yourcompany.com')) }}
-                                {!! $errors->first('admin_cc_email', '<span class="alert-msg" aria-hidden="true">:message</span><br>') !!}
-
-                                <p class="help-block">{{ trans('admin/settings/general.admin_cc_email_help') }}</p>
-
-
-                            </div>
-                        </div>
-
-                        <!-- Alert interval -->
-                        <div class="form-group {{ $errors->has('alert_interval') ? 'error' : '' }}">
-                            <div class="col-md-3">
-                                {{ Form::label('alert_interval', trans('admin/settings/general.alert_interval')) }}
-                            </div>
-                            <div class="col-md-9">
-                                {{ Form::text('alert_interval', old('alert_interval', $setting->alert_interval), array('class' => 'form-control','placeholder' => '30', 'maxlength'=>'3', 'style'=>'width: 60px;')) }}
-                                {!! $errors->first('alert_interval', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
-                            </div>
-                        </div>
-
-                        <!-- Alert threshold -->
-                        <div class="form-group {{ $errors->has('alert_threshold') ? 'error' : '' }}">
-                            <div class="col-md-3">
-                                {{ Form::label('alert_threshold', trans('admin/settings/general.alert_inv_threshold')) }}
-                            </div>
-                            <div class="col-md-9">
-                                {{ Form::text('alert_threshold', old('alert_threshold', $setting->alert_threshold), array('class' => 'form-control','placeholder' => '5', 'maxlength'=>'3', 'style'=>'width: 60px;')) }}
-                                {!! $errors->first('alert_threshold', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
-                            </div>
-                        </div>
-
-
-                        <!-- Alert interval -->
-                        <div class="form-group {{ $errors->has('audit_interval') ? 'error' : '' }}">
-                            <div class="col-md-3">
-                                {{ Form::label('audit_interval', trans('admin/settings/general.audit_interval')) }}
-                            </div>
-                            <div class="input-group col-md-2">
-                                {{ Form::text('audit_interval', Request::old('audit_interval', $setting->audit_interval), array('class' => 'form-control','placeholder' => '12', 'maxlength'=>'3', 'style'=>'width: 60px;')) }}
-                                <span class="input-group-addon">{{ trans('general.months') }}</span>
-                            </div>
-                            <div class="col-md-9 col-md-offset-3">
-                                {!! $errors->first('audit_interval', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
-                                <p class="help-block">{{ trans('admin/settings/general.audit_interval_help') }}</p>
-                            </div>
-                        </div>
-
-                        <!-- Alert threshold -->
-                        <div class="form-group {{ $errors->has('audit_warning_days') ? 'error' : '' }}">
-                            <div class="col-md-3">
-                                {{ Form::label('audit_warning_days', trans('admin/settings/general.audit_warning_days')) }}
-                            </div>
-                            <div class="input-group col-md-2">
-                                {{ Form::text('audit_warning_days', Request::old('audit_warning_days', $setting->audit_warning_days), array('class' => 'form-control','placeholder' => '14', 'maxlength'=>'3', 'style'=>'width: 60px;')) }}
-                                <span class="input-group-addon">{{ trans('general.days') }}</span>
-
-
-
-
-                            </div>
-                            <div class="col-md-9 col-md-offset-3">
-                                {!! $errors->first('audit_warning_days', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
-                                <p class="help-block">{{ trans('admin/settings/general.audit_warning_days_help') }}</p>
-                            </div>
-                        </div>
-
-                    </div>
 
                 </div> <!--/.box-body-->
                 <div class="box-footer">
@@ -158,7 +206,7 @@
                         <a class="btn btn-link text-left" href="{{ route('settings.index') }}">{{ trans('button.cancel') }}</a>
                     </div>
                     <div class="text-right col-md-6">
-                        <button type="submit" class="btn btn-primary"><i class="fas fa-check icon-white" aria-hidden="true"></i> {{ trans('general.save') }}</button>
+                        <button type="submit" class="btn btn-primary"><x-icon type="checkmark" /> {{ trans('general.save') }}</button>
                     </div>
 
                 </div>
@@ -166,7 +214,7 @@
         </div> <!-- /.col-md-8-->
     </div> <!-- /.row-->
 
-    {{Form::close()}}
+    </form>
 
 @stop
 
diff --git a/resources/views/settings/asset_tags.blade.php b/resources/views/settings/asset_tags.blade.php
index 858ad718cb..4ac001b96b 100644
--- a/resources/views/settings/asset_tags.blade.php
+++ b/resources/views/settings/asset_tags.blade.php
@@ -21,7 +21,7 @@
     </style>
 
 
-    {{ Form::open(['method' => 'POST', 'files' => false, 'autocomplete' => 'off', 'class' => 'form-horizontal', 'role' => 'form' ]) }}
+    <form method="POST" action="{{ route('settings.asset_tags.save') }}" accept-charset="UTF-8" autocomplete="off" class="form-horizontal" role="form">
     <!-- CSRF Token -->
     {{csrf_field()}}
 
@@ -32,8 +32,8 @@
             <div class="panel box box-default">
                 <div class="box-header with-border">
                     <h2 class="box-title">
-                        <i class="fas fa-list-ol"></i> {{ trans('general.asset_tags') }}
-                    </h4>
+                        <x-icon type="asset-tags"/> {{ trans('general.asset_tags') }}
+                    </h2>
                 </div>
                 <div class="box-body">
 
@@ -47,7 +47,7 @@
                             </div>
                             <div class="col-md-7">
                                 <label class="form-control">
-                                    {{ Form::checkbox('auto_increment_assets', '1', old('auto_increment_assets', $setting->auto_increment_assets),array('aria-label'=>'auto_increment_assets')) }}
+                                    <input type="checkbox" name="auto_increment_assets" value="1" @checked(old('auto_increment_assets', $setting->auto_increment_assets)) aria-label="auto_increment_assets">
                                     {{ trans('admin/settings/general.enabled') }}
                                 </label>
                             </div>
@@ -55,10 +55,10 @@
 
                         <div class="form-group">
                             <div class="col-md-5">
-                                {{ Form::label('next_auto_tag_base', trans('admin/settings/general.next_auto_tag_base')) }}
+                                <label for="next_auto_tag_base">{{ trans('admin/settings/general.next_auto_tag_base') }}</label>
                             </div>
                             <div class="col-md-7">
-                                {{ Form::text('next_auto_tag_base', old('next_auto_tag_base', $setting->next_auto_tag_base), array('class' => 'form-control', 'style'=>'width: 150px;', 'aria-label'=>'next_auto_tag_base')) }}
+                                <input class="form-control" style="width: 150px;" aria-label="next_auto_tag_base" name="next_auto_tag_base" type="text" value="{{ old('next_auto_tag_base', $setting->next_auto_tag_base) }}" id="next_auto_tag_base">
                                 {!! $errors->first('next_auto_tag_base', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
                             </div>
                         </div>
@@ -67,14 +67,14 @@
                         <!-- auto prefix -->
                         <div class="form-group {{ $errors->has('auto_increment_prefix') ? 'error' : '' }}">
                             <div class="col-md-5">
-                                {{ Form::label('auto_increment_prefix', trans('admin/settings/general.auto_increment_prefix')) }}
+                                <label for="auto_increment_prefix">{{ trans('admin/settings/general.auto_increment_prefix') }}</label>
                             </div>
                             <div class="col-md-7">
                                 @if ($setting->auto_increment_assets == 1)
-                                    {{ Form::text('auto_increment_prefix', old('auto_increment_prefix', $setting->auto_increment_prefix), array('class' => 'form-control', 'style'=>'width: 150px;', 'aria-label'=>'auto_increment_prefix')) }}
+                                    <input class="form-control" style="width: 150px;" aria-label="auto_increment_prefix" name="auto_increment_prefix" type="text" id="auto_increment_prefix" value="{{ old('auto_increment_prefix', $setting->auto_increment_prefix) }}">
                                     {!! $errors->first('auto_increment_prefix', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
                                 @else
-                                    {{ Form::text('auto_increment_prefix', old('auto_increment_prefix', $setting->auto_increment_prefix), array('class' => 'form-control', 'disabled'=>'disabled', 'style'=>'width: 150px;', 'aria-label'=>'auto_increment_prefix')) }}
+                                    <input class="form-control" disabled="disabled" style="width: 150px;" aria-label="auto_increment_prefix" name="auto_increment_prefix" type="text" id="auto_increment_prefix" value="{{ old('auto_increment_prefix', $setting->auto_increment_prefix) }}">
                                 @endif
                             </div>
                         </div>
@@ -82,10 +82,10 @@
                         <!-- auto zerofill -->
                         <div class="form-group {{ $errors->has('zerofill_count') ? 'error' : '' }}">
                             <div class="col-md-5">
-                                {{ Form::label('zerofill_count', trans('admin/settings/general.zerofill_count')) }}
+                                <label for="zerofill_count">{{ trans('admin/settings/general.zerofill_count') }}</label>
                             </div>
                             <div class="col-md-7">
-                                {{ Form::text('zerofill_count', old('zerofill_count', $setting->zerofill_count), array('class' => 'form-control', 'style'=>'width: 150px;', 'aria-label'=>'zerofill_count')) }}
+                                <input class="form-control" style="width: 150px;" aria-label="zerofill_count" name="zerofill_count" type="text" value="{{ old('zerofill_count', $setting->zerofill_count) }}" id="zerofill_count">
                                 {!! $errors->first('zerofill_count', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
                             </div>
                         </div>
@@ -98,7 +98,7 @@
                         <a class="btn btn-link text-left" href="{{ route('settings.index') }}">{{ trans('button.cancel') }}</a>
                     </div>
                     <div class="text-right col-md-6">
-                        <button type="submit" class="btn btn-primary"><i class="fas fa-check icon-white" aria-hidden="true"></i> {{ trans('general.save') }}</button>
+                        <button type="submit" class="btn btn-primary"><x-icon type="checkmark" /> {{ trans('general.save') }}</button>
                     </div>
 
                 </div>
@@ -106,6 +106,6 @@
         </div> <!-- /.col-md-8-->
     </div> <!-- /.row-->
 
-    {{Form::close()}}
+    </form>
 
 @stop
diff --git a/resources/views/settings/backups.blade.php b/resources/views/settings/backups.blade.php
index d090daf3bb..300c8c9dab 100644
--- a/resources/views/settings/backups.blade.php
+++ b/resources/views/settings/backups.blade.php
@@ -7,12 +7,12 @@
 @stop
 
 @section('header_right')
-    <a href="{{ route('settings.index') }}" class="btn btn-default pull-right" style="margin-left: 5px;"> 
+    <a href="{{ route('settings.index') }}" class="btn btn-default pull-right" style="margin-left: 5px;">
       {{ trans('general.back') }}
     </a>
 
     <form method="POST" style="display: inline">
-      {{ Form::hidden('_token', csrf_token()) }}
+            @csrf
             <button class="btn btn-primary {{ (config('app.lock_passwords')) ? ' disabled': '' }}">{{ trans('admin/settings/general.generate_backup') }}</button>
       </form>
 
@@ -21,8 +21,38 @@
 {{-- Page content --}}
 @section('content')
 
+    <div class="modal modal-warning fade" tabindex="-1" role="dialog" id="backupRestoreModal">
+        <div class="modal-dialog" role="document">
+            <div class="modal-content">
+                <form method="post" role="form">
+                    <div class="modal-header">
+                        <h4 class="modal-title">Modal title</h4>
+                        <button type="button" class="close" data-dismiss="modal" aria-label="Close">
+                            <span aria-hidden="true">&times;</span>
+                        </button>
+                    </div>
+                    <div class="modal-body">
+                        <p>{{ trans('admin/settings/message.backup.restore_warning') }}</p>
+                        <div class="form-group">
+                            <label class="form-control">
+                                <input type="checkbox" name="clean" {{ config('backup.sanitize_by_default') ? "checked='checked'" : "" }}>{{ trans('admin/settings/general.backups_clean') }}
+                            </label>
+                            <p class="help-block modal-help">{{ trans('admin/settings/general.backups_clean_helptext') }}</p>
+                        </div>
+                    </div>
+                    <div class="modal-footer">
+                        {{ csrf_field() }}
+                        {{ method_field('POST') }}
+                        <button type="button" class="btn btn-default pull-left"
+                                data-dismiss="modal">{{ trans('general.cancel') }}</button>
+                        <button type="submit" class="btn btn-outline">{{ trans('general.yes') }}</button>
+                    </div>
+                </form>
+            </div>
+        </div>
+    </div>
 
-<div class="row">
+    <div class="row">
 
   <div class="col-md-8">
     
@@ -85,13 +115,12 @@
                           </a>
                       @endif
 
-                     <a data-html="true" 
-                     href="{{ route('settings.backups.restore', $file['filename']) }}" 
-                     class="btn btn-warning btn-sm restore-asset {{ (config('app.lock_passwords')) ? ' disabled': '' }}" 
-                     data-toggle="modal" 
-                     data-content="{{ trans('admin/settings/message.backup.restore_warning') }}" 
-                     data-title="{{ trans('admin/settings/message.backup.restore_confirm', array('filename' => e($file['filename']))) }}"
-                     onClick="return false;">
+                          <a data-html="true"
+                             href="{{ route('settings.backups.restore', $file['filename']) }}"
+                             class="btn btn-warning btn-sm restore-backup {{ (config('app.lock_passwords')) ? ' disabled': '' }}"
+                             data-target="#backupRestoreModal"
+                             data-title="{{ trans('admin/settings/message.backup.restore_confirm', array('filename' => e($file['filename']))) }}"
+                             onClick="return false;">
                       <i class="fas fa-retweet" aria-hidden="true"></i>
                       <span class="sr-only">{{ trans('general.restore') }}</span>
                     </a>
@@ -113,7 +142,7 @@
     <div class="box box-default">
       <div class="box-header with-border">
         <h2 class="box-title">
-          <i class="far fa-file-archive" aria-hidden="true"></i>
+            <x-icon type="backups"/>
           {{ trans('admin/settings/general.backups_upload') }}
         </h2>
         <div class="box-tools pull-right">
@@ -129,12 +158,8 @@
         @if (config('app.lock_passwords')===true)
         <p class="alert alert-warning"><i class="fas fa-lock"></i> {{ trans('general.feature_disabled') }}</p>
           @else
-              
-      {{ Form::open([
-        'method' => 'POST',
-        'route' => 'settings.backups.upload',
-        'files' => true,
-        'class' => 'form-horizontal' ]) }}
+
+      <form method="POST" action="{{ route('settings.backups.upload') }}" accept-charset="UTF-8" class="form-horizontal" enctype="multipart/form-data">
         @csrf
 
         
@@ -144,13 +169,16 @@
           
              <!-- displayed on screen -->
             <label class="btn btn-default col-md-12 col-xs-12" aria-hidden="true">
-              <i class="fas fa-paperclip" aria-hidden="true"></i>
+              <x-icon type="paperclip" />
                 {{ trans('button.select_file')  }}
                 <input type="file" name="file" class="js-uploadFile" id="uploadFile" data-maxsize="{{ Helper::file_upload_max_size() }}" accept="application/zip" style="display:none;" aria-label="file" aria-hidden="true">
             </label>
         </div>
         <div class="col-md-4 col-xs-4">
-            <button class="btn btn-primary col-md-12 col-xs-12" id="uploadButton" disabled>{{ trans('button.upload') }} <span id="uploadIcon"></span></button>
+            <button class="btn btn-primary col-md-12 col-xs-12" id="uploadButton" disabled>
+                {{ trans('button.upload') }}
+                <span id="uploadIcon"></span>
+            </button>
         </div>
         <div class="col-md-12">
           
@@ -162,7 +190,7 @@
             
     </div>
     
-    {{ Form::close() }}
+    </form>
     @endif  
       </div>
     </div>
@@ -170,7 +198,8 @@
     <div class="box box-warning">
       <div class="box-header with-border">
         <h2 class="box-title">
-          <i class="fas fa-exclamation-triangle text-orange" aria-hidden="true"></i> {{ trans('admin/settings/general.backups_restoring') }}</h2>
+            <x-icon type="warning" class="text-orange"/> {{ trans('admin/settings/general.backups_restoring') }}
+        </h2>
         <div class="box-tools pull-right">
         </div>
       </div><!-- /.box-header -->
@@ -226,11 +255,21 @@
                 });
             }
 
-
-
-
         });
       });
+
+      // due to dynamic loading, we have to use the below 'weird' way of adding event handlers instead of just saying
+      // $('.restore-backup').on( .....
+      $('table').on('click', '.restore-backup', function (event) {
+          event.preventDefault();
+          var modal = $('#backupRestoreModal');
+          modal.find('.modal-title').text($(this).data('title'));
+          modal.find('form').attr('action', $(this).attr('href'));
+          modal.modal({
+              show: true
+          });
+          return false;
+      })
   </script>
 @stop
 
diff --git a/resources/views/settings/barcodes.blade.php b/resources/views/settings/barcodes.blade.php
deleted file mode 100644
index 2d79ef484d..0000000000
--- a/resources/views/settings/barcodes.blade.php
+++ /dev/null
@@ -1,212 +0,0 @@
-@extends('layouts/default')
-
-{{-- Page title --}}
-@section('title')
-    {{  trans('admin/settings/general.barcode_title') }}
-    @parent
-@stop
-
-@section('header_right')
-    <a href="{{ route('settings.index') }}" class="btn btn-primary"> {{ trans('general.back') }}</a>
-@stop
-
-
-{{-- Page content --}}
-@section('content')
-
-    <style>
-        .checkbox label {
-            padding-right: 40px;
-        }
-    </style>
-
-
-    {{ Form::open(['method' => 'POST', 'files' => false, 'autocomplete' => 'off', 'class' => 'form-horizontal', 'role' => 'form' ]) }}
-    <!-- CSRF Token -->
-    {{csrf_field()}}
-
-    <div class="row">
-        <div class="col-sm-10 col-sm-offset-1 col-md-8 col-md-offset-2">
-
-
-            <div class="panel box box-default">
-                <div class="box-header with-border">
-                    <h2 class="box-title">
-                        <i class="fas fa-barcode" aria-hidden="true"></i> {{ trans('admin/settings/general.barcodes') }}
-                    </h2>
-                </div>
-                <div class="box-body">
-
-
-                    <div class="col-md-11 col-md-offset-1">
-
-                    @if ($is_gd_installed)
-                        <!-- qr code -->
-                            <div class="form-group">
-                                <div class="col-md-9 col-md-offset-3">
-                                    <label class="form-control">
-                                        {{ Form::checkbox('qr_code', '1', old('qr_code', $setting->qr_code),array('aria-label'=>'qr_code')) }}
-                                        {{ trans('admin/settings/general.display_qr') }}
-                                    </label>
-                                </div>
-                            </div>
-
-                            <!-- square barcode type -->
-                            <div class="form-group{{ $errors->has('barcode_type') ? ' has-error' : '' }}">
-                                <div class="col-md-3">
-                                    {{ Form::label('barcode_type', trans('admin/settings/general.barcode_type')) }}
-                                </div>
-                                <div class="col-md-9">
-                                    {!! Form::barcode_types('barcode_type', old('barcode_type', $setting->barcode_type), 'select2 col-md-4') !!}
-                                    {!! $errors->first('barcode_type', '<span class="alert-msg" aria-hidden="true"><i class="fas fa-times" aria-hidden="true"></i> :message</span>') !!}
-                                </div>
-                            </div>
-
-                            <!-- barcode -->
-                            <div class="form-group">
-
-                                <div class="col-md-9 col-md-offset-3">
-                                    <label class="form-control">
-                                        {{ Form::checkbox('alt_barcode_enabled', '1', old('alt_barcode_enabled', $setting->alt_barcode_enabled),array( 'aria-label'=>'alt_barcode_enabled')) }}
-                                        {{ trans('admin/settings/general.display_alt_barcode') }}
-                                    </label>
-                                </div>
-                            </div>
-
-                            <!-- barcode type -->
-                            <div class="form-group{{ $errors->has('alt_barcode') ? ' has-error' : '' }}">
-                                <div class="col-md-3">
-                                    {{ Form::label('alt_barcode', trans('admin/settings/general.alt_barcode_type')) }}
-                                </div>
-                                <div class="col-md-9">
-                                    {!! Form::alt_barcode_types('alt_barcode', old('alt_barcode', $setting->alt_barcode), 'select2 col-md-4') !!}
-                                    {!! $errors->first('barcode_type', '<span class="alert-msg" aria-hidden="true"><i class="fas fa-times" aria-hidden="true"></i> :message</span>') !!}
-                                </div>
-                            </div>
-                        @else
-                            <span class="help-block col-md-offset-3 col-md-12">
-                                {{ trans('admin/settings/general.php_gd_warning') }}
-                                <br>
-                                {{ trans('admin/settings/general.php_gd_info') }}
-                  </span>
-                    @endif
-
-                    <!-- qr text -->
-                        <div class="form-group {{ $errors->has('qr_text') ? 'error' : '' }}">
-                            <div class="col-md-3">
-                                {{ Form::label('qr_text', trans('admin/settings/general.qr_text')) }}
-                            </div>
-                            <div class="col-md-9">
-                                @if ($setting->qr_code == 1)
-                                    {{ Form::text('qr_text', Request::old('qr_text', $setting->qr_text), array('class' => 'form-control','placeholder' => 'Property of Your Company',
-                                    'rel' => 'txtTooltip',
-                                    'title' =>'Extra text that you would like to display on your labels. ',
-                                    'data-toggle' =>'tooltip',
-                                    'data-placement'=>'top')) }}
-                                    {!! $errors->first('qr_text', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
-                                @else
-                                    {{ Form::text('qr_text', Request::old('qr_text', $setting->qr_text), array('class' => 'form-control', 'disabled'=>'disabled','placeholder' => 'Property of Your Company')) }}
-                                    <p class="help-block">{{ trans('admin/settings/general.qr_help') }}</p>
-                                @endif
-                            </div>
-                        </div>
-
-                        <!-- Nuke barcode cache -->
-                        <div class="form-group">
-                            <div class="col-md-3">
-                                {{ Form::label('purge_barcodes', 'Purge Barcodes') }}
-                            </div>
-                            <div class="col-md-9" id="purgebarcodesrow">
-                                <a class="btn btn-default btn-sm pull-left" id="purgebarcodes" style="margin-right: 10px;">
-                                    {{ trans('admin/settings/general.barcode_delete_cache') }}</a>
-                                <span id="purgebarcodesicon"></span>
-                                <span id="purgebarcodesresult"></span>
-                                <span id="purgebarcodesstatus"></span>
-                            </div>
-                            <div class="col-md-9 col-md-offset-3">
-                                <div id="purgebarcodesstatus-error" class="text-danger"></div>
-                            </div>
-                            <div class="col-md-9 col-md-offset-3">
-                                <p class="help-block">{{ trans('admin/settings/general.barcodes_help') }}</p>
-                            </div>
-
-                        </div>
-
-
-                    </div>
-
-                </div> <!--/.box-body-->
-                <div class="box-footer">
-                    <div class="text-left col-md-6">
-                        <a class="btn btn-link text-left" href="{{ route('settings.index') }}">{{ trans('button.cancel') }}</a>
-                    </div>
-                    <div class="text-right col-md-6">
-                        <button type="submit" class="btn btn-success"><i class="fas fa-check icon-white" aria-hidden="true"></i> {{ trans('general.save') }}</button>
-                    </div>
-
-                </div>
-            </div> <!-- /box -->
-        </div> <!-- /.col-md-8-->
-    </div> <!-- /.row-->
-
-    {{Form::close()}}
-
-@stop
-
-@push('js')
-
-    <script nonce="{{ csrf_token() }}">
-        // Delete barcodes
-        $("#purgebarcodes").click(function(){
-            $("#purgebarcodesrow").removeClass('text-success');
-            $("#purgebarcodesrow").removeClass('text-danger');
-            $("#purgebarcodesicon").html('');
-            $("#purgebarcodesstatus").html('');
-            $('#purgebarcodesstatus-error').html('');
-            $("#purgebarcodesicon").html('<i class="fas fa-spinner spin"></i> {{ trans('admin/settings/general.barcodes_spinner') }}');
-            $.ajax({
-                url: '{{ route('api.settings.purgebarcodes') }}',
-                type: 'POST',
-                headers: {
-                    "X-Requested-With": 'XMLHttpRequest',
-                    "X-CSRF-TOKEN": $('meta[name="csrf-token"]').attr('content')
-                },
-                data: {},
-                dataType: 'json',
-
-                success: function (data) {
-                    console.dir(data);
-                    $("#purgebarcodesicon").html('');
-                    $("#purgebarcodesstatus").html('');
-                    $('#purgebarcodesstatus-error').html('');
-                    $("#purgebarcodesstatus").removeClass('text-danger');
-                    $("#purgebarcodesstatus").addClass('text-success');
-                    if (data.message) {
-                        $("#purgebarcodesstatus").html('<i class="fas fa-check text-success"></i> ' + data.message);
-                    }
-                },
-
-                error: function (data) {
-
-                    $("#purgebarcodesicon").html('');
-                    $("#purgebarcodesstatus").html('');
-                    $('#purgebarcodesstatus-error').html('');
-                    $("#purgebarcodesstatus").removeClass('text-success');
-                    $("#purgebarcodesstatus").addClass('text-danger');
-                    $("#purgebarcodesicon").html('<i class="fas fa-exclamation-triangle text-danger"></i>');
-                    $('#purgebarcodesstatus').html('Files could not be deleted.');
-                    if (data.responseJSON) {
-                        $('#purgebarcodesstatus-error').html('Error: ' + data.responseJSON.messages);
-                    } else {
-                        console.dir(data);
-                    }
-
-                }
-
-
-            });
-        });
-
-    </script>
-
-@endpush
diff --git a/resources/views/settings/branding.blade.php b/resources/views/settings/branding.blade.php
index e468551f6d..6b45254b72 100644
--- a/resources/views/settings/branding.blade.php
+++ b/resources/views/settings/branding.blade.php
@@ -21,7 +21,17 @@
     </style>
 
 
-    {{ Form::open(['method' => 'POST', 'files' => true, 'autocomplete' => 'off', 'class' => 'form-horizontal', 'role' => 'form', 'id' => 'create-form' ]) }}
+    <form
+        method="POST"
+        action="{{ route('settings.branding.save') }}"
+        accept-charset="UTF-8"
+        autocomplete="off"
+        class="form-horizontal"
+        role="form"
+        id="create-form"
+        enctype="multipart/form-data"
+        novalidate="novalidate"
+    >
     <!-- CSRF Token -->
     {{csrf_field()}}
 
@@ -32,7 +42,8 @@
             <div class="panel box box-default">
                 <div class="box-header with-border">
                     <h2 class="box-title">
-                        <i class="fas fa-copyright"></i> {{ trans('admin/settings/general.brand') }}
+                        <x-icon type="branding"/>
+                         {{ trans('admin/settings/general.brand') }}
                     </h2>
                 </div>
                 <div class="box-body">
@@ -40,219 +51,359 @@
 
                     <div class="col-md-12">
 
-                        <!-- Site name -->
-                        <div class="form-group {{ $errors->has('site_name') ? 'error' : '' }}">
+                        <fieldset name="logo-preferences" class="bottom-padded">
+                            <legend class="highlight">
+                                {{ trans('admin/settings/general.legends.logos') }}
+                            </legend>
 
-                            <div class="col-md-3">
-                                {{ Form::label('site_name', trans('admin/settings/general.site_name')) }}
+                            <!-- Site name -->
+                            <div class="form-group {{ $errors->has('site_name') ? 'error' : '' }}">
+
+                                <div class="col-md-3">
+                                    <label for="site_name">{{ trans('admin/settings/general.site_name') }}</label>
+                                </div>
+                                <div class="col-md-7 required">
+                                    @if (config('app.lock_passwords')===true)
+                                        <input class="form-control" disabled="disabled" placeholder="Snipe-IT Asset Management" name="site_name" type="text" value="{{ old('site_name', $setting->site_name) }}" id="site_name">
+                                        <p class="text-warning">
+                                            <x-icon type="locked" />
+                                            {{ trans('general.feature_disabled') }}</p>
+                                    @else
+                                        <input class="form-control" placeholder="Snipe-IT Asset Management" required="required" name="site_name" type="text" value="{{ old('site_name', $setting->site_name) }}" id="site_name">
+                                    @endif
+                                    {!! $errors->first('site_name', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
+                                </div>
                             </div>
-                            <div class="col-md-7 required">
-                                @if (config('app.lock_passwords')===true)
-                                    {{ Form::text('site_name', Request::old('site_name', $setting->site_name), array('class' => 'form-control', 'disabled'=>'disabled','placeholder' => 'Snipe-IT Asset Management')) }}
-                                    <p class="text-warning"><i class="fas fa-lock"></i> {{ trans('general.feature_disabled') }}</p>
-                                @else
-                                    {{ Form::text('site_name',
-                                        Request::old('site_name', $setting->site_name), array('class' => 'form-control','placeholder' => 'Snipe-IT Asset Management', 'required' => 'required')) }}
-                                @endif
-                                {!! $errors->first('site_name', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
+
+                            @php
+                                $optionTypes = trans('admin/settings/general.logo_option_types');
+                            @endphp
+
+                            <!-- Branding -->
+                            <div class="form-group {{ $errors->has('brand') ? 'error' : '' }}">
+                                <div class="col-md-3">
+                                    <label for="brand">{{ trans('admin/settings/general.web_brand') }}</label>
+                                </div>
+                                <div class="col-md-9">
+                                    <x-input.select
+                                        name="brand"
+                                        id="brand"
+                                        :options="[
+                                            '1' => trans('admin/settings/general.logo_option_types.text'),
+                                            '2' => trans('admin/settings/general.logo_option_types.logo'),
+                                            '3' => trans('admin/settings/general.logo_option_types.logo_and_text'),
+                                        ]"
+                                        :selected="old('brand', $setting->brand)"
+                                        class="form-control"
+                                        style="width: 150px"
+                                    />
+                                    {!! $errors->first('brand', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
+                                </div>
                             </div>
-                        </div>
 
+                            <!-- Logo -->
+                        @include('partials/forms/edit/uploadLogo', [
+                            "logoVariable" => "logo",
+                            "logoId" => "uploadLogo",
+                            "logoLabel" => trans('admin/settings/general.logo_labels.logo'),
+                            "logoClearVariable" => "clear_logo",
+                            "helpBlock" => trans('general.logo_size') . trans('general.image_filetypes_help', ['size' => Helper::file_upload_max_size_readable()]),
+                        ])
 
+                        <!-- Email Logo -->
+                        @include('partials/forms/edit/uploadLogo', [
+                            "logoVariable" => "email_logo",
+                            "logoId" => "uploadEmailLogo",
+                            "logoLabel" => trans('admin/settings/general.logo_labels.email_logo'),
+                            "logoClearVariable" => "clear_email_logo",
+                            "helpBlock" => trans('general.image_filetypes_help', ['size' => Helper::file_upload_max_size_readable()]),
+                        ])
 
-                        <!-- Branding -->
-                        <div class="form-group {{ $errors->has('brand') ? 'error' : '' }}">
-                            <div class="col-md-3">
-                                 {{ Form::label('brand', trans('admin/settings/general.web_brand')) }}
+                        <!-- Label Logo -->
+                        @include('partials/forms/edit/uploadLogo', [
+                            "logoVariable" => "label_logo",
+                            "logoId" => "uploadLabelLogo",
+                            "logoLabel" => trans('admin/settings/general.logo_labels.label_logo'),
+                            "logoClearVariable" => "clear_label_logo",
+                            "helpBlock" => trans('general.image_filetypes_help', ['size' => Helper::file_upload_max_size_readable()]),
+                        ])
+
+                        <!-- PDF Logo -->
+                        @include('partials/forms/edit/uploadLogo', [
+                            "logoVariable" => "acceptance_pdf_logo",
+                            "logoId" => "acceptancePdfEmailLogo",
+                            "logoLabel" => trans('admin/settings/general.logo_labels.acceptance_pdf_logo'),
+                            "logoClearVariable" => "clear_acceptance_pdf_logo",
+                            "helpBlock" => trans('general.image_filetypes_help', ['size' => Helper::file_upload_max_size_readable()]),
+                        ])
+
+                        <!-- Favicon -->
+                        @include('partials/forms/edit/uploadLogo', [
+                            "logoVariable" => "favicon",
+                            "logoId" => "uploadFavicon",
+                            "logoLabel" => trans('admin/settings/general.logo_labels.favicon'),
+                            "logoClearVariable" => "clear_favicon",
+                            "helpBlock" => trans('admin/settings/general.favicon_size') .' '. trans('admin/settings/general.favicon_format'),
+                            "allowedTypes" => "image/x-icon,image/gif,image/jpeg,image/png,image/svg,image/svg+xml,image/vnd.microsoft.icon",
+                            "maxSize" => 20000
+                        ])
+
+                        <!-- Default Avatar -->
+                        @include('partials/forms/edit/uploadLogo', [
+                            "logoVariable" => "default_avatar",
+                            "logoId" => "defaultAvatar",
+                            "logoLabel" => trans('admin/settings/general.default_avatar'),
+                            "logoClearVariable" => "clear_default_avatar",
+                            "logoPath" => "avatars/",
+                            "helpBlock" => trans('admin/settings/general.default_avatar_help').' '.trans('general.image_filetypes_help', ['size' => Helper::file_upload_max_size_readable()]),
+                        ])
+
+                            @if (($setting->default_avatar == '') || (($setting->default_avatar == 'default.png') && (Storage::disk('public')->missing('default.png'))))
+                            <!-- Restore Default Avatar -->
+                            <div class="form-group">
+
+                                <div class="col-md-9 col-md-offset-3">
+                                    <label class="form-control">
+                                        <input type="checkbox" name="restore_default_avatar" value="1" @checked(old('restore_default_avatar', $setting->restore_default_avatar)) />
+                                        <span>{!! trans('admin/settings/general.restore_default_avatar', ['default_avatar'=> Storage::disk('public')->url('default.png')]) !!}</span>
+                                    </label>
+                                    <p class="help-block">
+                                        {{ trans('admin/settings/general.restore_default_avatar_help') }}
+                                    </p>
+                                </div>
                             </div>
-                            <div class="col-md-9">
-                                {!! Form::select('brand', array('1'=>'Text','2'=>'Logo','3'=>'Logo + Text'), old('brand', $setting->brand), array('class' => 'form-control select2', 'style'=>'width: 150px ;')) !!}
-                                {!! $errors->first('brand', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
+                            @endif
+
+                            <!-- Load gravatar -->
+                            <div class="form-group {{ $errors->has('load_remote') ? 'error' : '' }}">
+                                <div class="col-md-3">
+                                    <strong>{{ trans('admin/settings/general.load_remote') }}</strong>
+                                </div>
+                                <div class="col-md-9">
+                                    <label class="form-control">
+                                        <input type="checkbox" name="load_remote" value="1" @checked(old('load_remote', $setting->load_remote)) />
+                                        {{ trans('general.yes') }}
+                                        {!! $errors->first('load_remote', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
+                                    </label>
+
+                                    <p class="help-block">
+                                        {{ trans('admin/settings/general.load_remote_help_text') }}
+                                    </p>
+
+                                </div>
                             </div>
-                        </div>
 
-                        <!-- Logo -->
-                    @include('partials/forms/edit/uploadLogo', [
-                        "logoVariable" => "logo",
-                        "logoId" => "uploadLogo",
-                        "logoLabel" => trans('admin/settings/general.logo'),
-                        "logoClearVariable" => "clear_logo",
-                        "helpBlock" => trans('general.logo_size') . trans('general.image_filetypes_help', ['size' => Helper::file_upload_max_size_readable()]),
-                    ])
 
-                    <!-- Email Logo -->
-                    @include('partials/forms/edit/uploadLogo', [
-                        "logoVariable" => "email_logo",
-                        "logoId" => "uploadEmailLogo",
-                        "logoLabel" => trans('admin/settings/general.email_logo'),
-                        "logoClearVariable" => "clear_email_logo",
-                        "helpBlock" => trans('admin/settings/general.email_logo_size') . trans('general.image_filetypes_help', ['size' => Helper::file_upload_max_size_readable()]),
-                    ])
+                            <!-- Include logo in print assets -->
+                            <div class="form-group">
+                                <div class="col-md-3">
+                                    <strong>{{ trans('admin/settings/general.logo_print_assets') }}</strong>
+                                </div>
+                                <div class="col-md-9">
+                                    <label class="form-control">
+                                        <input type="checkbox" name="logo_print_assets" value="1" @checked(old('logo_print_assets', $setting->logo_print_assets)) aria-label="logo_print_assets"/>
+                                    {{ trans('admin/settings/general.logo_print_assets_help') }}
+                                    </label>
 
-                    <!-- Label Logo -->
-                    @include('partials/forms/edit/uploadLogo', [
-                        "logoVariable" => "label_logo",
-                        "logoId" => "uploadLabelLogo",
-                        "logoLabel" => trans('admin/settings/general.label_logo'),
-                        "logoClearVariable" => "clear_label_logo",
-                        "helpBlock" => trans('admin/settings/general.label_logo_size') . trans('general.image_filetypes_help', ['size' => Helper::file_upload_max_size_readable()]),
-                    ])
-
-                    <!-- Favicon -->
-                    @include('partials/forms/edit/uploadLogo', [
-                        "logoVariable" => "favicon",
-                        "logoId" => "uploadFavicon",
-                        "logoLabel" => trans('admin/settings/general.favicon'),
-                        "logoClearVariable" => "clear_favicon",
-                        "helpBlock" => trans('admin/settings/general.favicon_size') .' '. trans('admin/settings/general.favicon_format'),
-                        "allowedTypes" => "image/x-icon,image/gif,image/jpeg,image/png,image/svg,image/svg+xml,image/vnd.microsoft.icon",
-                        "maxSize" => 20000
-                    ])
-
-                    <!-- Include logo in print assets -->
-                        <div class="form-group">
-                            <div class="col-md-3">
-                                <strong>{{ trans('admin/settings/general.logo_print_assets') }}</strong>
+                                </div>
                             </div>
-                            <div class="col-md-9">
-                                <label class="form-control">
-                                {{ Form::checkbox('logo_print_assets', '1', old('logo_print_assets', $setting->logo_print_assets),array('aria-label'=>'logo_print_assets')) }}
-                                {{ trans('admin/settings/general.logo_print_assets_help') }}
-                                </label>
-
-                            </div>
-                        </div>
 
 
-                        <!-- show urls in emails-->
-                        <div class="form-group">
-                            <div class="col-md-3">
-                                <strong>{{ trans('admin/settings/general.show_url_in_emails') }}</strong>
+                            <!-- show urls in emails-->
+                            <div class="form-group">
+                                <div class="col-md-3">
+                                    <strong>{{ trans('admin/settings/general.show_url_in_emails') }}</strong>
+                                </div>
+                                <div class="col-md-9">
+                                    <label class="form-control">
+                                        <input type="checkbox" name="show_url_in_emails" value="1" @checked(old('show_url_in_emails', $setting->show_url_in_emails)) aria-label="show_url_in_emails" />
+                                        {{ trans('general.yes') }}
+                                    </label>
+                                    <p class="help-block">{{ trans('admin/settings/general.show_url_in_emails_help_text') }}</p>
+                                </div>
                             </div>
-                            <div class="col-md-9">
-                                <label class="form-control">
-                                    {{ Form::checkbox('show_url_in_emails', '1', old('show_url_in_emails', $setting->show_url_in_emails),array('aria-label'=>'show_url_in_emails')) }}
-                                    {{ trans('general.yes') }}
-                                </label>
-                                <p class="help-block">{{ trans('admin/settings/general.show_url_in_emails_help_text') }}</p>
-                            </div>
-                        </div>
+                        </fieldset>
+                        <!-- colors and skins -->
 
-                        <!-- Header color -->
-                        <div class="form-group {{ $errors->has('header_color') ? 'error' : '' }}">
-                            <div class="col-md-3">
-                                {{ Form::label('header_color', trans('admin/settings/general.header_color')) }}
+                        <fieldset name="color-preferences" class="bottom-padded">
+                            <legend class="highlight">
+                                {{ trans('admin/settings/general.legends.colors') }}
+                            </legend>
+
+                            <!-- Header color -->
+                            <div class="form-group {{ $errors->has('header_color') ? 'error' : '' }}">
+                                <div class="col-md-3">
+                                    <label for="header_color">{{ trans('admin/settings/general.header_color') }}</label>
+                                </div>
+                                <div class="col-md-5 col-xs-5 col-sm-3 col-md-4 col-lg-3 col-xl-3">
+                                    <div class="input-group header-color">
+                                        <input class="form-control" placeholder="#FF0000" aria-label="header_color" name="header_color" type="text" id="header_color" value="{{ old('header_color', ($setting->header_color ?? '#3c8dbc')) }}">
+                                        <div class="input-group-addon">
+                                            <i class="fa-solid fa-square" style="color: {{ old('header_color', ($setting->header_color ?? '#3c8dbc')) }}"></i>
+                                        </div>
+                                    </div><!-- /.input group -->
+                                    {!! $errors->first('header_color', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
+                                </div>
                             </div>
-                            <div class="col-md-2">
-                                <div class="input-group header-color">
-                                    {{ Form::text('header_color', old('header_color', $setting->header_color), array('class' => 'form-control', 'style' => 'width: 100px;','placeholder' => '#FF0000', 'aria-label'=>'header_color')) }}
-                                    <div class="input-group-addon">
-                                        <i></i>
+
+                            <!-- Skin -->
+                            <div class="form-group {{ $errors->has('skin') ? 'error' : '' }}">
+                                <div class="col-md-3">
+                                    <label for="skin">{{ trans('general.skin') }}</label>
+                                </div>
+                                <div class="col-md-9">
+                                    <x-input.skin name="skin" :selected="old('skin', $setting->skin)" />
+                                    {!! $errors->first('skin', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
+                                </div>
+                            </div>
+
+                            <!-- Custom css -->
+                            <div class="form-group {{ $errors->has('custom_css') ? 'error' : '' }}">
+                                <div class="col-md-3">
+                                    <label for="custom_css">{{ trans('admin/settings/general.custom_css') }}</label>
+                                </div>
+                                <div class="col-md-9">
+                                    @if (config('app.lock_passwords')===true)
+                                        <x-input.textarea
+                                            name="custom_css"
+                                            :value="old('custom_css', $setting->custom_css)"
+                                            placeholder="{{ trans('admin/settings/general.custom_css_placeholder') }}"
+                                            aria-label="custom_css"
+                                            disabled
+                                        />
+                                        {!! $errors->first('custom_css', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
+                                        <p class="text-warning"><i class="fas fa-lock"></i> {{ trans('general.feature_disabled') }}</p>
+                                    @else
+                                        <x-input.textarea
+                                            name="custom_css"
+                                            :value="old('custom_css', $setting->custom_css)"
+                                            placeholder="{{ trans('admin/settings/general.custom_css_placeholder') }}"
+                                            aria-label="custom_css"
+                                        />
+                                        {!! $errors->first('custom_css', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
+                                    @endif
+                                    <p class="help-block">{!! trans('admin/settings/general.custom_css_help') !!}</p>
+                                </div>
+                            </div>
+
+                            <!-- Allow User Skin -->
+                            <div class="form-group">
+                                <div class="col-md-9 col-md-offset-3">
+                                    <label class="form-control">
+                                        <input type="checkbox" name="allow_user_skin" value="1" @checked(old('allow_user_skin', $setting->allow_user_skin))/>
+                                        {{ trans('admin/settings/general.allow_user_skin') }}
+                                    </label>
+                                    <p class="help-block">{{ trans('admin/settings/general.allow_user_skin_help_text') }}</p>
+                                </div>
+                            </div>
+
+                        </fieldset>
+
+
+                            <!-- colors and skins -->
+
+                            <fieldset name="footer-preferences" class="bottom-padded">
+                                <legend class="highlight">
+                                    {{ trans('admin/settings/general.legends.footer') }}
+                                </legend>
+
+                                <!-- Support Footer -->
+                                <div class="form-group {{ $errors->has('support_footer') ? 'error' : '' }}">
+                                    <div class="col-md-3">
+                                        <label for="support_footer">{{ trans('admin/settings/general.support_footer') }}</label>
                                     </div>
-                                </div><!-- /.input group -->
-                                {!! $errors->first('header_color', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
-                            </div>
-                        </div>
-
-                        <!-- Skin -->
-                        <div class="form-group {{ $errors->has('skin') ? 'error' : '' }}">
-                            <div class="col-md-3">
-                                {{ Form::label('skin', trans('general.skin')) }}
-                            </div>
-                            <div class="col-md-9">
-                                {!! Form::skin('skin', old('skin', $setting->skin), 'select2') !!}
-                                {!! $errors->first('skin', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
-                            </div>
-                        </div>
-
-                        <!-- Allow User Skin -->
-                        <div class="form-group">
-                            <div class="col-md-3">
-                                <strong>{{ trans('admin/settings/general.allow_user_skin') }}</strong>
-                            </div>
-                            <div class="col-md-9">
-                                <label class="form-control">
-                                    {{ Form::checkbox('allow_user_skin', '1', old('allow_user_skin', $setting->allow_user_skin)) }}
-                                    {{ trans('general.yes') }}
-                                </label>
-                                <p class="help-block">{{ trans('admin/settings/general.allow_user_skin_help_text') }}</p>
-                            </div>
-                        </div>
-
-                        <!-- Custom css -->
-                        <div class="form-group {{ $errors->has('custom_css') ? 'error' : '' }}">
-                            <div class="col-md-3">
-                                {{ Form::label('custom_css', trans('admin/settings/general.custom_css')) }}
-                            </div>
-                            <div class="col-md-9">
-                                @if (config('app.lock_passwords')===true)
-                                    {{ Form::textarea('custom_css', old('custom_css', $setting->custom_css), array('class' => 'form-control','placeholder' => 'Add your custom CSS','disabled'=>'disabled', 'aria-label'=>'custom_css')) }}
-                                    {!! $errors->first('custom_css', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
-                                    <p class="text-warning"><i class="fas fa-lock"></i> {{ trans('general.feature_disabled') }}</p>
-                                @else
-                                    {{ Form::textarea('custom_css', old('custom_css', $setting->custom_css), array('class' => 'form-control','placeholder' => 'Add your custom CSS', 'aria-label'=>'custom_css')) }}
-                                    {!! $errors->first('custom_css', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
-                                @endif
-                                <p class="help-block">{!! trans('admin/settings/general.custom_css_help') !!}</p>
-                            </div>
-                        </div>
+                                    <div class="col-md-9">
+                                        @if (config('app.lock_passwords')===true)
+                                            <x-input.select
+                                                name="support_footer"
+                                                id="support_footer"
+                                                :options="['on' => trans('admin/settings/general.enabled'), 'off' => trans('admin/settings/general.two_factor_disabled'), 'admin' => trans('admin/settings/general.super_admin_only')]"
+                                                :selected="old('support_footer', $setting->support_footer)"
+                                                disabled
+                                                class="form-control disabled"
+                                                style="width: 150px"
+                                            />
+                                            <p class="text-warning"><i class="fas fa-lock"></i> {{ trans('general.feature_disabled') }}</p>
+                                        @else
+                                            <x-input.select
+                                                name="support_footer"
+                                                id="support_footer"
+                                                :options="['on' => trans('admin/settings/general.enabled'), 'off' => trans('admin/settings/general.two_factor_disabled'), 'admin' => trans('admin/settings/general.super_admin_only')]"
+                                                :selected="old('support_footer', $setting->support_footer)"
+                                                class="form-control"
+                                                style="width: 150px"
+                                            />
+                                        @endif
 
 
-                        <!-- Support Footer -->
-                        <div class="form-group {{ $errors->has('support_footer') ? 'error' : '' }}">
-                            <div class="col-md-3">
-                                {{ Form::label('support_footer', trans('admin/settings/general.support_footer')) }}
-                            </div>
-                            <div class="col-md-9">
-                                @if (config('app.lock_passwords')===true)
-                                    {!! Form::select('support_footer', array('on'=>'Enabled','off'=>'Disabled','admin'=>'Superadmin Only'), Request::old('support_footer', $setting->support_footer), ['class' => 'form-control select2 disabled', 'style'=>'width: 150px ;', 'disabled' => 'disabled']) !!}
-                                    <p class="text-warning"><i class="fas fa-lock"></i> {{ trans('general.feature_disabled') }}</p>
-                                @else
-                                    {!! Form::select('support_footer', array('on'=>'Enabled','off'=>'Disabled','admin'=>'Superadmin Only'), Request::old('support_footer', $setting->support_footer), array('class' => 'form-control select2', 'style'=>'width: 150px ;')) !!}
-                                @endif
+                                        {!! $errors->first('support_footer', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
+                                    </div>
+                                </div>
 
 
-                                {!! $errors->first('support_footer', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
-                            </div>
-                        </div>
+                                <!-- Version Footer -->
+                                <div class="form-group {{ $errors->has('version_footer') ? 'error' : '' }}">
+                                    <div class="col-md-3">
+                                        <label for="version_footer">{{ trans('admin/settings/general.version_footer') }}</label>
+                                    </div>
+                                    <div class="col-md-9">
+                                        @if (config('app.lock_passwords')===true)
+                                            <x-input.select
+                                                name="version_footer"
+                                                id="version_footer"
+                                                :options="['on' => trans('admin/settings/general.enabled'), 'off' => trans('admin/settings/general.two_factor_disabled'), 'admin' => trans('admin/settings/general.super_admin_only')]"
+                                                :selected="old('version_footer', $setting->version_footer)"
+                                                disabled
+                                                class="form-control disabled"
+                                                style="width: 150px"
+                                            />
+                                            <p class="text-warning"><i class="fas fa-lock"></i> {{ trans('general.feature_disabled') }}</p>
+                                        @else
+                                            <x-input.select
+                                                name="version_footer"
+                                                id="version_footer"
+                                                :options="['on' => trans('admin/settings/general.enabled'), 'off' => trans('admin/settings/general.two_factor_disabled'), 'admin' => trans('admin/settings/general.super_admin_only')]"
+                                                :selected="old('version_footer', $setting->version_footer)"
+                                                class="form-control"
+                                                style="width: 150px"
+                                            />
+                                        @endif
 
+                                        <p class="help-block">{{ trans('admin/settings/general.version_footer_help') }}</p>
+                                        {!! $errors->first('version_footer', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
+                                    </div>
+                                </div>
 
-                        <!-- Version Footer -->
-                        <div class="form-group {{ $errors->has('version_footer') ? 'error' : '' }}">
-                            <div class="col-md-3">
-                                {{ Form::label('version_footer', trans('admin/settings/general.version_footer')) }}
-                            </div>
-                            <div class="col-md-9">
-                                @if (config('app.lock_passwords')===true)
-                                    {!! Form::select('version_footer', array('on'=>'Enabled','off'=>'Disabled','admin'=>'Superadmin Only'), Request::old('version_footer', $setting->version_footer), ['class' => 'form-control select2 disabled', 'style'=>'width: 150px ;', 'disabled' => 'disabled']) !!}
-                                    <p class="text-warning"><i class="fas fa-lock"></i> {{ trans('general.feature_disabled') }}</p>
-                                @else
-                                    {!! Form::select('version_footer', array('on'=>'Enabled','off'=>'Disabled','admin'=>'Superadmin Only'), Request::old('version_footer', $setting->version_footer), array('class' => 'form-control select2', 'style'=>'width: 150px ;')) !!}
-                                @endif
-
-                                <p class="help-block">{{ trans('admin/settings/general.version_footer_help') }}</p>
-                                {!! $errors->first('version_footer', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
-                            </div>
-                        </div>
-
-                        <!-- Additional footer -->
-                        <div class="form-group {{ $errors->has('footer_text') ? 'error' : '' }}">
-                            <div class="col-md-3">
-                                {{ Form::label('footer_text', trans('admin/settings/general.footer_text')) }}
-                            </div>
-                            <div class="col-md-9">
-                                @if (config('app.lock_passwords')===true)
-                                    {{ Form::textarea('footer_text', Request::old('footer_text', $setting->footer_text), array('class' => 'form-control', 'rows' => '4', 'placeholder' => 'Optional footer text','disabled'=>'disabled')) }}
-                                    <p class="text-warning"><i class="fas fa-lock"></i> {{ trans('general.feature_disabled') }}</p>
-                                @else
-                                    {{ Form::textarea('footer_text', Request::old('footer_text', $setting->footer_text), array('class' => 'form-control','rows' => '4','placeholder' => 'Optional footer text')) }}
-                                @endif
-                                <p class="help-block">{!! trans('admin/settings/general.footer_text_help') !!}</p>
-                                {!! $errors->first('footer_text', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
-
-                            </div>
-                        </div>
+                                <!-- Additional footer -->
+                                <div class="form-group {{ $errors->has('footer_text') ? 'error' : '' }}">
+                                    <div class="col-md-3">
+                                        <label for="footer_text">{{ trans('admin/settings/general.footer_text') }}</label>
+                                    </div>
+                                    <div class="col-md-9">
+                                        @if (config('app.lock_passwords')===true)
+                                            <x-input.textarea
+                                                name="footer_text"
+                                                :value="old('footer_text', $setting->footer_text)"
+                                                rows="4"
+                                                aria-labelledby="footer_text"
+                                                placeholder="{{ trans('admin/settings/general.footer_text_placeholder') }}"
+                                                disabled
+                                            />
+                                            <p class="text-warning"><i class="fas fa-lock"></i> {{ trans('general.feature_disabled') }}</p>
+                                        @else
+                                            <x-input.textarea
+                                                name="footer_text"
+                                                :value="old('footer_text', $setting->footer_text)"
+                                                rows="4"
+                                                placeholder="{{ trans('admin/settings/general.footer_text_placeholder') }}"
+                                            />
+                                        @endif
+                                        <p class="help-block">{!! trans('admin/settings/general.footer_text_help') !!}</p>
+                                        {!! $errors->first('footer_text', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
 
+                                    </div>
+                                </div>
+                            </fieldset>
 
 
 
@@ -264,7 +415,7 @@
                         <a class="btn btn-link text-left" href="{{ route('settings.index') }}">{{ trans('button.cancel') }}</a>
                     </div>
                     <div class="text-right col-md-6">
-                        <button type="submit" class="btn btn-primary"><i class="fas fa-check icon-white" aria-hidden="true"></i> {{ trans('general.save') }}</button>
+                        <button type="submit" class="btn btn-primary"><x-icon type="checkmark" /> {{ trans('general.save') }}</button>
                     </div>
 
                 </div>
@@ -272,7 +423,7 @@
         </div> <!-- /.col-md-8-->
     </div> <!-- /.row-->
 
-    {{Form::close()}}
+    </form>
 
 @stop
 
diff --git a/resources/views/settings/general.blade.php b/resources/views/settings/general.blade.php
index b432b6544e..931fa47bcc 100644
--- a/resources/views/settings/general.blade.php
+++ b/resources/views/settings/general.blade.php
@@ -14,11 +14,7 @@
 {{-- Page content --}}
 @section('content')
 
-
-
-
-
-    {{ Form::open(['method' => 'POST', 'files' => false, 'autocomplete' => 'off', 'class' => 'form-horizontal', 'role' => 'form' ]) }}
+    <form method="POST" autocomplete="off" class="form-horizontal" role="form" id="create-form">
     <!-- CSRF Token -->
     {{csrf_field()}}
 
@@ -29,7 +25,7 @@
             <div class="panel box box-default">
                 <div class="box-header with-border">
                     <h2 class="box-title">
-                        <i class="fas fa-wrench" aria-hidden="true"></i>
+                        <x-icon type="general-settings"/>
                         {{ trans('admin/settings/general.general_settings') }}
                     </h2>
                 </div>
@@ -38,367 +34,412 @@
 
                    <div class="col-md-12">
 
-                    <!-- Full Multiple Companies Support -->
-                    <div class="form-group {{ $errors->has('full_multiple_companies_support') ? 'error' : '' }}">
-                        <div class="col-md-3">
-                            <strong>{{ trans('admin/settings/general.full_multiple_companies_support_text') }}</strong>
-                        </div>
-                        <div class="col-md-9">
-                            <label class="form-control">
-                                {{ Form::checkbox('full_multiple_companies_support', '1', old('full_multiple_companies_support', $setting->full_multiple_companies_support),array('aria-label'=>'full_multiple_companies_support')) }}
-                                {{ trans('admin/settings/general.full_multiple_companies_support_text') }}
-                            </label>
-                            {!! $errors->first('full_multiple_companies_support', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
-                            <p class="help-block">
-                                {{ trans('admin/settings/general.full_multiple_companies_support_help_text') }}
-                            </p>
-                        </div>
-                    </div>
+                       <fieldset class="bottom-padded">
+                           <legend class="highlight">
+                               {{ trans('admin/settings/general.legends.scoping') }}
+                           </legend>
+                            <!-- Full Multiple Companies Support -->
+                            <div class="form-group {{ $errors->has('full_multiple_companies_support') ? 'error' : '' }}">
+                                <div class="col-md-8 col-md-offset-3">
+                                    <label class="form-control">
+                                        <input type="checkbox" name="full_multiple_companies_support" value="1" @checked(old('full_multiple_companies_support', $setting->full_multiple_companies_support)) aria-label="full_multiple_companies_support" />
+                                        {{ trans('admin/settings/general.full_multiple_companies_support_text') }}
+                                    </label>
+                                    {!! $errors->first('full_multiple_companies_support', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
+                                    <p class="help-block">
+                                        {{ trans('admin/settings/general.full_multiple_companies_support_help_text') }}
+                                    </p>
+                                </div>
+                            </div>
+                            <!-- /.form-group -->
 
-                    <!-- /.form-group -->
+                            <!-- Scope Locations with Full Multiple Companies Support -->
+                            <div class="form-group {{ $errors->has('scope_locations_fmcs') ? 'error' : '' }}">
+                                <div class="col-md-8 col-md-offset-3">
+                                    <livewire:location-scope-check />
+                                </div>
+                            </div>
+                            <!-- /.form-group -->
 
-                    <!-- Require signature for acceptance -->
-                    <div class="form-group {{ $errors->has('require_accept_signature') ? 'error' : '' }}">
-                        <div class="col-md-3">
-                           <strong> {{ trans('admin/settings/general.require_accept_signature') }}</strong>
-                        </div>
-                        <div class="col-md-9">
-                            <label class="form-control">
-                                {{ Form::checkbox('require_accept_signature', '1', Request::old('require_accept_signature', $setting->require_accept_signature)) }}
-                                {{ trans('general.yes') }}
-                            </label>
-                            {!! $errors->first('require_accept_signature', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
-                            <p class="help-block">{{ trans('admin/settings/general.require_accept_signature_help_text') }}</p>
-                        </div>
-                    </div>
-                    <!-- /.form-group -->
+                       </fieldset>
 
+                       <fieldset class="bottom-padded">
+                           <legend class="highlight">
+                               {{ trans('admin/settings/general.legends.formats') }}
+                           </legend>
 
-                    <!-- Email domain -->
-                    <div class="form-group {{ $errors->has('email_domain') ? 'error' : '' }}">
-                        <div class="col-md-3">
-                            {{ Form::label('email_domain', trans('general.email_domain')) }}
-                        </div>
-                        <div class="col-md-9">
-                            {{ Form::text('email_domain', Request::old('email_domain', $setting->email_domain), array('class' => 'form-control','placeholder' => 'example.com')) }}
-                            <span class="help-block">{{ trans('general.email_domain_help')  }}</span>
-                            {!! $errors->first('email_domain', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
-                        </div>
-                    </div>
-
-
-                    <!-- Email format -->
-                    <div class="form-group {{ $errors->has('email_format') ? 'error' : '' }}">
-                        <div class="col-md-3">
-                            {{ Form::label('email_format', trans('general.email_format')) }}
-                        </div>
-                        <div class="col-md-9">
-                            {!! Form::username_format('email_format', old('email_format', $setting->email_format), 'select2') !!}
-                            {!! $errors->first('email_format', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
-                        </div>
-                    </div>
-
-                    <!-- Username format -->
-                    <div class="form-group {{ $errors->has('username_format') ? 'error' : '' }}">
-                        <div class="col-md-3">
-                            {{ Form::label('username_format', trans('general.username_format')) }}
-                        </div>
-                        <div class="col-md-9">
-                            {!! Form::username_format('username_format', old('username_format', $setting->username_format), 'select2') !!}
-                            {!! $errors->first('username_format', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
-
-                            <p class="help-block">
-                                {{ trans('admin/settings/general.username_format_help') }}
-                            </p>
-                        </div>
-                    </div>
-
-                       <!-- user profile edit checkbox -->
-                       <div class="form-group">
-                           <div class="col-md-3">
-                               <label>
-                                   {{ trans('admin/settings/general.profile_edit') }}
-                               </label>
-                           </div>
-                           <div class="col-md-8">
-                               <label class="form-control">
-                                   <input type="checkbox" value="1" name="profile_edit" {{ (old('profile_edit', $setting->profile_edit)) == '1' ? ' checked="checked"' : '' }} aria-label="profile_edit">
-                                   {{ trans('admin/settings/general.profile_edit_help') }}
-                               </label>
-
-                           </div>
-                       </div>
-
-                       <!-- Load images in emails -->
-                       <div class="form-group {{ $errors->has('show_images_in_email') ? 'error' : '' }}">
-                           <div class="col-md-3">
-                               <strong>{{ trans('admin/settings/general.show_images_in_email') }}</strong>
-                           </div>
-                           <div class="col-md-9">
-                               <label class="form-control">
-                                   {{ Form::checkbox('show_images_in_email', '1', old('show_images_in_email', $setting->show_images_in_email)) }}
-                                   {{ trans('general.yes') }}
-                                   {!! $errors->first('show_images_in_email', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
-                               </label>
-
-                           </div>
-                       </div>
-
-                       <!-- Load gravatar -->
-                       <div class="form-group {{ $errors->has('load_remote') ? 'error' : '' }}">
-                           <div class="col-md-3">
-                               <strong>{{ trans('admin/settings/general.load_remote') }}</strong>
-                           </div>
-                           <div class="col-md-9">
-                               <label class="form-control">
-                                   {{ Form::checkbox('load_remote', '1', old('load_remote', $setting->load_remote)) }}
-                                   {{ trans('general.yes') }}
-                                   {!! $errors->first('load_remote', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
-                               </label>
-
-                               <p class="help-block">
-                                   {{ trans('admin/settings/general.load_remote_help_text') }}
-                               </p>
-
-                           </div>
-                       </div>
-
-                       <!-- unique serial -->
-                       <div class="form-group">
-                           <div class="col-md-3">
-                               <strong>{{ trans('admin/settings/general.unique_serial') }}</strong>
-                           </div>
-                           <div class="col-md-9">
-                               <label class="form-control">
-                                   {{ Form::checkbox('unique_serial', '1', Request::old('unique_serial', $setting->unique_serial),array('class' => 'minimal')) }}
-                                   {{ trans('general.yes') }}
-                                   {!! $errors->first('unique_serial', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
-                               </label>
-
-                               <p class="help-block">
-                               {{ trans('admin/settings/general.unique_serial_help_text') }}
-                               </p>
-                           </div>
-                       </div>
-
-
-                       <!-- Per Page -->
-                    <div class="form-group {{ $errors->has('per_page') ? 'error' : '' }}">
-                        <div class="col-md-3">
-                            {{ Form::label('per_page', trans('admin/settings/general.per_page')) }}
-                        </div>
-                        <div class="col-md-9">
-                            {{ Form::text('per_page', old('per_page', $setting->per_page), array('class' => 'form-control','placeholder' => '5', 'maxlength'=>'3', 'style'=>'width: 60px;')) }}
-                            {!! $errors->first('per_page', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
-                        </div>
-                    </div>
-
-                   <!-- Thumb Size -->
-                   <div class="form-group {{ $errors->has('thumbnail_max_h') ? 'error' : '' }}">
-                       <div class="col-md-3">
-                           {{ Form::label('thumbnail_max_h', trans('admin/settings/general.thumbnail_max_h')) }}
-                       </div>
-                       <div class="col-md-9">
-                           {{ Form::text('thumbnail_max_h', Request::old('thumbnail_max_h', $setting->thumbnail_max_h), array('class' => 'form-control','placeholder' => '50', 'maxlength'=>'3', 'style'=>'width: 60px;')) }}
-                           <p class="help-block">{{ trans('admin/settings/general.thumbnail_max_h_help') }}</p>
-                           {!! $errors->first('thumbnail_max_h', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
-                       </div>
-                   </div>
-
-                    <!-- Default EULA -->
-                   <div class="form-group {{ $errors->has('default_eula_text') ? 'error' : '' }}">
-                       <div class="col-md-3">
-                           {{ Form::label('default_eula_text', trans('admin/settings/general.default_eula_text')) }}
-                       </div>
-                       <div class="col-md-9">
-                           {{ Form::textarea('default_eula_text', old('default_eula_text', $setting->default_eula_text), array('class' => 'form-control','placeholder' => 'Add your default EULA text')) }}
-                           {!! $errors->first('default_eula_text', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
-                           <p class="help-block">{{ trans('admin/settings/general.default_eula_help_text') }}</p>
-                           <p class="help-block">{!! trans('admin/settings/general.eula_markdown') !!}</p>
-                       </div>
-                   </div>
-
-
-                    <!-- login text -->
-                    <div class="form-group {{ $errors->has('login_note') ? 'error' : '' }}">
-                        <div class="col-md-3">
-                            {{ Form::label('login_note', trans('admin/settings/general.login_note')) }}
-                        </div>
-                        <div class="col-md-9">
-                            @if (config('app.lock_passwords'))
-
-                                <textarea class="form-control disabled" name="login_note" placeholder="If you do not have a login or have found a device belonging to this company, please call technical support at 888-555-1212. Thank you." rows="2" aria-label="login_note" readonly>{{ old('login_note', $setting->login_note) }}</textarea>
-                                {!! $errors->first('login_note', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
-                                <p class="text-warning"><i class="fas fa-lock"></i> {{ trans('general.feature_disabled') }}</p>
-                            @else
-                                <textarea class="form-control" name="login_note" aria-label="login_note" placeholder="If you do not have a login or have found a device belonging to this company, please call technical support at 888-555-1212. Thank you." rows="2">{{ old('login_note', $setting->login_note) }}</textarea>
-                                {!! $errors->first('login_note', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
-                            @endif
-                            <p class="help-block">{!!  trans('admin/settings/general.login_note_help') !!}</p>
-                        </div>
-                    </div>
-
-                       <!-- Mail test -->
-                       <div class="form-group">
-                           <div class="col-md-3">
-                               {{ Form::label('login_note', 'Test Mail') }}
-                           </div>
-                           <div class="col-md-9" id="mailtestrow">
-                               <a class="btn btn-default btn-sm pull-left" id="mailtest" style="margin-right: 10px;">
-                                   {{ trans('admin/settings/general.mail_test') }}</a>
-                               <span id="mailtesticon"></span>
-                               <span id="mailtestresult"></span>
-                               <span id="mailteststatus"></span>
-                           </div>
-                           <div class="col-md-9 col-md-offset-3">
-                               <div id="mailteststatus-error" class="text-danger"></div>
-                           </div>
-                           <div class="col-md-9 col-md-offset-3">
-                               <div class="help-block">
-                                   <p>{{ trans('admin/settings/general.mail_test_help', array('replyto' => config('mail.reply_to.address'))) }}</p>
+                           <!-- Email domain -->
+                           <div class="form-group {{ $errors->has('email_domain') ? 'error' : '' }}">
+                               <div class="col-md-3">
+                                   <label for="email_domain">{{ trans('general.email_domain') }}</label>
+                               </div>
+                               <div class="col-md-8">
+                                   <input class="form-control" placeholder="example.com" name="email_domain" type="text" value="{{ old('email_domain', $setting->email_domain) }}" id="email_domain">
+                                   <span class="help-block">{{ trans('general.email_domain_help')  }}</span>
+                                   {!! $errors->first('email_domain', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
                                </div>
                            </div>
 
-                       </div>
 
-                       <!-- dashboard text -->
-                       <div class="form-group {{ $errors->has('dashboard_message') ? 'error' : '' }}">
-                           <div class="col-md-3">
-                               {{ Form::label('dashboard_message', trans('admin/settings/general.dashboard_message')) }}
+                           <!-- Email format -->
+                           <div class="form-group {{ $errors->has('email_format') ? 'error' : '' }}">
+                               <div class="col-md-3">
+                                   <label for="email_format">{{ trans('admin/settings/general.email_formats.email_format') }}</label>
+                               </div>
+                               <div class="col-md-8">
+                                   {!! Form::email_format('email_format', old('email_format', $setting->email_format), 'select2') !!}
+                                   {!! $errors->first('email_format', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
+                               </div>
                            </div>
-                           <div class="col-md-9">
-                               @if (config('app.lock_passwords'))
 
-                                   <textarea class="form-control disabled" name="login_note" placeholder="If you do not have a login or have found a device belonging to this company, please call technical support at 888-555-1212. Thank you." rows="2" aria-label="dashboard_message" readonly>{{ old('dashboard_message', $setting->login_note) }}</textarea>
-                                   {!! $errors->first('dashboard_message', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
-                                   <p class="text-warning"><i class="fas fa-lock"></i> {{ trans('general.feature_disabled') }}</p>
-                               @else
-                                   <textarea class="form-control" aria-label="dashboard_message" name="dashboard_message" rows="2">{{ old('login_note', $setting->dashboard_message) }}</textarea>
-                                   {!! $errors->first('dashboard_message', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
-                               @endif
-                               <p class="help-block">
-                                   {{ trans('admin/settings/general.dashboard_message_help') }}
-                                   {!!  trans('general.github_markdown') !!}</p>
+                           <!-- Username format -->
+                           <div class="form-group {{ $errors->has('username_format') ? 'error' : '' }}">
+                               <div class="col-md-3">
+                                   <label for="username_format">{{ trans('admin/settings/general.username_formats.username_format') }}</label>
+                               </div>
+                               <div class="col-md-8">
+                                   {!! Form::username_format('username_format', old('username_format', $setting->username_format), 'select2') !!}
+                                   {!! $errors->first('username_format', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
+
+                                   <p class="help-block">
+                                       {{ trans('admin/settings/general.username_format_help') }}
+                                   </p>
+                               </div>
                            </div>
-                       </div>
+
+                       </fieldset>
 
 
-
-
-                       <!-- Archived in List -->
-                       <div class="form-group {{ $errors->has('show_archived_in_list') ? 'error' : '' }}">
-                           <div class="col-md-3">
-                               {{ Form::label('show_archived_in_list',
-                                              trans('admin/settings/general.show_archived_in_list')) }}
-                           </div>
-                           <div class="col-md-9">
-
+                       <fieldset class="bottom-padded">
+                           <legend class="highlight">
+                               {{ trans('admin/settings/general.legends.profiles') }}
+                           </legend>
+                           <!-- user profile edit checkbox -->
+                           <div class="form-group">
+                               <div class="col-md-8 col-md-offset-3">
                                    <label class="form-control">
-                                       {{ Form::checkbox('show_archived_in_list', '1', old('show_archived_in_list', $setting->show_archived_in_list),array('aria-label'=>'show_archived_in_list')) }}
+                                       <input type="checkbox" value="1" name="profile_edit" {{ (old('profile_edit', $setting->profile_edit)) == '1' ? ' checked="checked"' : '' }} aria-label="profile_edit">
+                                       {{ trans('admin/settings/general.profile_edit_help') }}
+                                   </label>
+
+                               </div>
+                           </div>
+                       </fieldset>
+
+                       <fieldset class="bottom-padded">
+                           <legend class="highlight">
+                               {{ trans('admin/settings/general.legends.eula') }}
+                           </legend>
+
+                           <!-- Require signature for acceptance -->
+                           <div class="form-group {{ $errors->has('require_accept_signature') ? 'error' : '' }}">
+                               <div class="col-md-8 col-md-offset-3">
+                                   <label class="form-control">
+                                       <input type="checkbox" name="require_accept_signature" value="1" @checked(old('require_accept_signature', $setting->require_accept_signature)) />
+                                       {{ trans('admin/settings/general.require_accept_signature') }}
+                                   </label>
+                                   {!! $errors->first('require_accept_signature', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
+                                   <p class="help-block">{{ trans('admin/settings/general.require_accept_signature_help_text') }}</p>
+                               </div>
+                           </div>
+                           <!-- /.form-group -->
+
+                           <!-- Default EULA -->
+                           <div class="form-group {{ $errors->has('default_eula_text') ? 'error' : '' }}">
+                               <div class="col-md-3">
+                                   <label for="default_eula_text">{{ trans('admin/settings/general.default_eula_text') }}</label>
+                               </div>
+                               <div class="col-md-8">
+                                   <x-input.textarea
+                                           name="default_eula_text"
+                                           :value="old('default_eula_text', $setting->default_eula_text)"
+                                           placeholder="{{ trans('admin/settings/general.default_eula_text_placeholder') }}"
+                                   />
+                                   {!! $errors->first('default_eula_text', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
+                                   <p class="help-block">{{ trans('admin/settings/general.default_eula_help_text') }}</p>
+                                   <p class="help-block">{!! trans('admin/settings/general.eula_markdown') !!}</p>
+                               </div>
+                           </div>
+
+                       </fieldset>
+
+                       <fieldset class="bottom-padded">
+                           <legend class="highlight">{{ trans('admin/settings/general.legends.misc_display') }}</legend>
+
+                           <!-- Thumb Size -->
+                           <div class="form-group {{ $errors->has('thumbnail_max_h') ? 'error' : '' }}">
+                               <div class="col-md-3">
+                                   <label for="thumbnail_max_h">{{ trans('admin/settings/general.thumbnail_max_h') }}</label>
+                               </div>
+                               <div class="col-md-8">
+                                   <input class="form-control" style="max-width: 100px;" placeholder="50" maxlength="3" name="thumbnail_max_h" type="number" value="{{ old('thumbnail_max_h', ($setting->thumbnail_max_h ?? '25')) }}" id="thumbnail_max_h">
+                                   <p class="help-block">{{ trans('admin/settings/general.thumbnail_max_h_help') }}</p>
+                                   {!! $errors->first('thumbnail_max_h', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
+                               </div>
+                           </div>
+
+                           <!-- Model List prefs -->
+                           <div class="form-group {{ $errors->has('show_in_model_list') ? 'error' : '' }}">
+                               <div class="col-md-3">
+                                   <strong>{{ trans('admin/settings/general.show_in_model_list') }}</strong>
+                               </div>
+                               <div class="col-md-8">
+                                   <label class="form-control">
+                                       <input type="checkbox" name="show_in_model_list[]" value="image" @checked(old('show_in_model_list', $snipeSettings->modellistCheckedValue('image'))) aria-label="show_in_model_list"/>
+                                       {{ trans('general.image') }}
+                                   </label>
+                                   <label class="form-control">
+                                       <input type="checkbox" name="show_in_model_list[]" value="category" @checked(old('show_in_model_list', $snipeSettings->modellistCheckedValue('category'))) aria-label="show_in_model_list"/>
+                                       {{ trans('general.category') }}
+                                   </label>
+                                   <label class="form-control">
+                                       <input type="checkbox" name="show_in_model_list[]" value="manufacturer" @checked(old('show_in_model_list', $snipeSettings->modellistCheckedValue('manufacturer'))) aria-label="show_in_model_list"/>
+                                       {{ trans('general.manufacturer') }} </label>
+                                   <label class="form-control">
+                                       <input type="checkbox" name="show_in_model_list[]" value="model_number" @checked(old('show_in_model_list', $snipeSettings->modellistCheckedValue('model_number'))) aria-label="show_in_model_list"/>
+                                       {{ trans('general.model_no') }}
+                                   </label>
+                               </div>
+                           </div>
+
+
+                           <!-- Shortcuts enable -->
+                           <div class="form-group {{ $errors->has('shortcuts_enabled') ? 'error' : '' }}">
+                               <div class="col-md-8 col-md-offset-3">
+                                   <label class="form-control">
+                                       <input type="checkbox" name="shortcuts_enabled" value="1" {{ old('shortcuts_enabled', $setting->shortcuts_enabled) ? 'checked' : '' }}>
+                                       {{ trans('admin/settings/general.shortcuts_enabled') }}
+                                   </label>
+                                   {!! $errors->first('shortcuts_enabled', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
+                                   <p class="help-block">{!!trans('admin/settings/general.shortcuts_help_text') !!}</p>
+                               </div>
+                           </div>
+
+
+                           <!-- Archived in List -->
+                           <div class="form-group {{ $errors->has('show_archived_in_list') ? 'error' : '' }}">
+                               <div class="col-md-8 col-md-offset-3">
+                                   <label class="form-control">
+                                       <input type="checkbox" name="show_archived_in_list" value="1" @checked(old('show_archived_in_list', $setting->show_archived_in_list)) aria-label="show_archived_in_list" />
                                        {{ trans('admin/settings/general.show_archived_in_list_text') }}
                                    </label>
                                    {!! $errors->first('show_archived_in_list', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
-                          </div>
-                       </div>
-
-                       <!-- Show assets assigned to user's assets -->
-                       <div class="form-group {{ $errors->has('show_assigned_assets') ? 'error' : '' }}">
-                           <div class="col-md-3">
-                               {{ Form::label('show_assigned_assets',
-                                              trans('admin/settings/general.show_assigned_assets')) }}
+                               </div>
                            </div>
-                           <div class="col-md-9">
-                               <label class="form-control">
-                               {{ Form::checkbox('show_assigned_assets', '1', Request::old('show_assigned_assets', $setting->show_assigned_assets),array('class' => 'minimal')) }}
-                               {{ trans('general.yes') }}
-                               </label>
-                               <p class="help-block">{{ trans('admin/settings/general.show_assigned_assets_help') }}</p>
-                               {!! $errors->first('show_assigned_assets', '<span class="alert-msg">:message</span>') !!}
+
+                           <!-- Show assets assigned to user's assets -->
+                           <div class="form-group {{ $errors->has('show_assigned_assets') ? 'error' : '' }}">
+                               <div class="col-md-8 col-md-offset-3">
+                                   <label class="form-control">
+                                       <input type="checkbox" name="show_assigned_assets" value="1" @checked(old('show_assigned_assets', $setting->show_assigned_assets)) />
+                                       {{ trans('admin/settings/general.show_assigned_assets') }}
+                                   </label>
+                                   <p class="help-block">{{ trans('admin/settings/general.show_assigned_assets_help') }}</p>
+                                   {!! $errors->first('show_assigned_assets', '<span class="alert-msg">:message</span>') !!}
+                               </div>
                            </div>
-                       </div>
 
-                       <!-- Model List prefs -->
-                       <div class="form-group {{ $errors->has('show_in_model_list') ? 'error' : '' }}">
-                           <div class="col-md-3">
-                               <strong>{{ trans('admin/settings/general.show_in_model_list') }}</strong>
-                           </div>
-                           <div class="col-md-9">
-                               <label class="form-control">
-                               {{ Form::checkbox('show_in_model_list[]', 'image', old('show_in_model_list', $snipeSettings->modellistCheckedValue('image')),array('class' => 'minimal', 'aria-label'=>'show_in_model_list' )) }} {{ trans('general.image') }}
-                               </label>
-                               <label class="form-control">
-                               {{ Form::checkbox('show_in_model_list[]', 'category', old('show_in_model_list', $snipeSettings->modellistCheckedValue('category')),array('class' => 'minimal', 'aria-label'=>'show_in_model_list' )) }} {{ trans('general.category') }}
-                               </label>
-                               <label class="form-control">
-                               {{ Form::checkbox('show_in_model_list[]', 'manufacturer', old('show_in_model_list', $snipeSettings->modellistCheckedValue('manufacturer')),array('class' => 'minimal', 'aria-label'=>'show_in_model_list' )) }}  {{ trans('general.manufacturer') }} </label>
-                               <label class="form-control">
-                               {{ Form::checkbox('show_in_model_list[]', 'model_number', old('show_in_model_list', $snipeSettings->modellistCheckedValue('model_number')),array('class' => 'minimal', 'aria-label'=>'show_in_model_list' )) }} {{ trans('general.model_no') }}
-                               </label>
-                           </div>
-                       </div>
+                       </fieldset>
 
 
-                       <!-- dash chart -->
-                       <div class="form-group {{ $errors->has('dash_chart_type') ? 'error' : '' }}">
-                           <div class="col-md-3">
-                               {{ Form::label('show_in_model_list',
-                                              trans('general.pie_chart_type')) }}
-                           </div>
-                           <div class="col-md-9">
-                               {{ Form::select('dash_chart_type', array(
-                                   'name' => 'Status Label Name',
-                                   'type' => 'Status Label Type'), Request::old('dash_chart_type', $setting->dash_chart_type), ['class' =>'select2', 'style' => 'width: 80%']) }}
-                           </div>
-                       </div>
+                       <fieldset class="bottom-padded">
+                           <legend class="highlight">
+                               {{ trans('general.email') }}
+                           </legend>
 
-                       
-                       <!-- Depreciation method -->
-                       <div class="form-group {{ $errors->has('depreciation_method') ? 'error' : '' }}">
-                           <div class="col-md-3">
-                                {{ Form::label('depreciation_method', trans('Depreciation method')) }}
-                           </div>
-                           <div class="col-md-9">
-                               {{ Form::select('depreciation_method', array(
-                                    'default' => 'Linear (default)', 
-                                    'half_1' => 'Half-year convention, always applied', 
-                                    'half_2' => 'Half-year convention, applied with condition', 
-                                ), Request::old('username_format', $setting->depreciation_method), ['class' =>'select2', 'style' => 'width: 80%']) }}
-                           </div>
-                       </div>
-                       <!-- /.form-group -->
-
-                       <!-- Privacy Policy Footer-->
-                       <div class="form-group {{ $errors->has('privacy_policy_link') ? 'error' : '' }}">
-                           <div class="col-md-3">
-                               {{ Form::label('privacy_policy_link', trans('admin/settings/general.privacy_policy_link')) }}
-                           </div>
-                           <div class="col-md-9">
-                               @if (config('app.lock_passwords'))
-                                   {{ Form::text('privacy_policy_link', Request::old('privacy_policy_link', $setting->privacy_policy_link), array('class' => 'form-control disabled', 'disabled' => 'disabled')) }}
-                               @else
-                                   {{ Form::text('privacy_policy_link', Request::old('privacy_policy_link', $setting->privacy_policy_link), array('class' => 'form-control')) }}
-
-                               @endif
-
-
-                               <span class="help-block">{{ trans('admin/settings/general.privacy_policy_link_help')  }}</span>
-                               {!! $errors->first('privacy_policy_link', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
-
-                               @if (config('app.lock_passwords')===true)
-                                   <p class="text-warning"><i class="fas fa-lock"></i> {{ trans('general.feature_disabled') }}</p>
-                               @endif
+                           <!-- Mail test -->
+                           <div class="form-group">
+                               <div class="col-md-3">
+                                   <label for="login_note">{{trans('admin/settings/general.test_mail')}}</label>
+                               </div>
+                               <div class="col-md-8" id="mailtestrow">
+                                   <a class="btn btn-default btn-sm pull-left" id="mailtest" style="margin-right: 10px;">
+                                       {{ trans('admin/settings/general.mail_test') }}</a>
+                                   <span id="mailtesticon"></span>
+                                   <span id="mailtestresult"></span>
+                                   <span id="mailteststatus"></span>
+                               </div>
+                               <div class="col-md-8 col-md-offset-3">
+                                   <div id="mailteststatus-error" class="text-danger"></div>
+                               </div>
+                               <div class="col-md-8 col-md-offset-3">
+                                   <div class="help-block">
+                                       <p>{{ trans('admin/settings/general.mail_test_help', array('replyto' => config('mail.reply_to.address'))) }}</p>
+                                   </div>
+                               </div>
 
                            </div>
-                       </div>
-                   </div>
 
+                           <!-- Privacy Policy Footer-->
+                           <div class="form-group {{ $errors->has('privacy_policy_link') ? 'error' : '' }}">
+                               <div class="col-md-3">
+                                   <label for="privacy_policy_link">{{ trans('admin/settings/general.privacy_policy_link') }}</label>
+                               </div>
+                               <div class="col-md-8">
+
+                                   @if (config('app.lock_passwords'))
+                                       <input class="form-control disabled" disabled="disabled" name="privacy_policy_link" type="text" id="privacy_policy_link" value="{{ old('privacy_policy_link', $setting->privacy_policy_link) }}">
+                                   @else
+                                       <input class="form-control" name="privacy_policy_link" type="text" id="privacy_policy_link" value="{{ old('privacy_policy_link', $setting->privacy_policy_link) }}">
+
+                                   @endif
+
+                                   <span class="help-block">{{ trans('admin/settings/general.privacy_policy_link_help')  }}</span>
+                                   {!! $errors->first('privacy_policy_link', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
+
+                                   @if (config('app.lock_passwords')===true)
+                                       <p class="text-warning"><i class="fas fa-lock"></i> {{ trans('general.feature_disabled') }}</p>
+                                   @endif
+
+                               </div>
+                           </div>
+
+
+                           <!-- Load images in emails -->
+                           <div class="form-group {{ $errors->has('show_images_in_email') ? 'error' : '' }}">
+                               <div class="col-md-8 col-md-offset-3">
+                                   <label class="form-control">
+                                       <input type="checkbox" name="show_images_in_email" value="1" @checked(old('show_images_in_email', $setting->show_images_in_email)) />
+                                       {{ trans('admin/settings/general.show_images_in_email') }}
+                                       {!! $errors->first('show_images_in_email', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
+                                   </label>
+
+                               </div>
+                           </div>
+
+                       </fieldset>
+
+
+                       <fieldset name="checkin-preferences" class="bottom-padded">
+                           <legend class="highlight">
+                               {{ trans('admin/settings/general.legends.checkin') }}
+                           </legend>
+
+                           <!-- Require Notes on checkin/checkout checkbox -->
+                               <div class="form-group">
+                                   <div class="col-md-8 col-md-offset-3">
+                                       <label class="form-control">
+                                           <input type="checkbox" value="1" name="require_checkinout_notes" {{ (old('require_checkinout_notes', $setting->require_checkinout_notes)) == '1' ? ' checked="checked"' : '' }} aria-label="require_checkinout_notes">
+                                           {{ trans('admin/settings/general.require_checkinout_notes') }}
+                                       </label>
+                                           <p class="help-block">{{ trans('admin/settings/general.require_checkinout_notes_help_text') }}</p>
+                                   </div>
+                               </div>
+                               <!-- /.form-group -->
+                       </fieldset>
+
+
+
+                       <fieldset name="dashboard" class="bottom-padded">
+                           <legend class="highlight">
+                               {{ trans('admin/settings/general.legends.dashboard') }}
+                           </legend>
+
+                           <!-- login text -->
+                           <div class="form-group {{ $errors->has('login_note') ? 'error' : '' }}">
+                               <div class="col-md-3">
+                                   <label for="login_note">{{ trans('admin/settings/general.login_note') }}</label>
+                               </div>
+                               <div class="col-md-8">
+                                   @if (config('app.lock_passwords'))
+
+                                       <textarea class="form-control disabled" name="login_note" placeholder="{{trans('admin/settings/general.login_note_placeholder')}}" rows="2" aria-label="login_note" readonly>{{ old('login_note', $setting->login_note) }}</textarea>
+                                       {!! $errors->first('login_note', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
+                                       <p class="text-warning"><i class="fas fa-lock"></i> {{ trans('general.feature_disabled') }}</p>
+                                   @else
+                                       <textarea class="form-control" name="login_note" aria-label="login_note" placeholder="{{trans('admin/settings/general.login_note_placeholder')}}" rows="2">{{ old('login_note', $setting->login_note) }}</textarea>
+                                       {!! $errors->first('login_note', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
+                                   @endif
+                                   <p class="help-block">{!!  trans('admin/settings/general.login_note_help') !!}</p>
+                               </div>
+                           </div>
+
+                               <!-- dash chart -->
+                               <div class="form-group {{ $errors->has('dash_chart_type') ? 'error' : '' }}">
+                                   <div class="col-md-3">
+                                       <label for="show_in_model_list">{{ trans('general.pie_chart_type') }}</label>
+                                   </div>
+                                   <div class="col-md-8">
+                                       <x-input.select
+                                           name="dash_chart_type"
+                                           :options="['name' => 'Status Label Name', 'type' => 'Status Label Type']"
+                                           :selected="old('dash_chart_type', $setting->dash_chart_type)"
+                                           style="width: 80%"
+                                       />
+                                   </div>
+                               </div>
+
+                               <!-- dashboard text -->
+                               <div class="form-group {{ $errors->has('dashboard_message') ? 'error' : '' }}">
+                                   <div class="col-md-3">
+                                       <label for="dashboard_message">{{ trans('admin/settings/general.dashboard_message') }}</label>
+                                   </div>
+                                   <div class="col-md-8">
+                                       @if (config('app.lock_passwords'))
+
+                                           <textarea class="form-control disabled" name="login_note" placeholder="{{ trans('admin/settings/general.login_note_placeholder') }}" rows="2" aria-label="dashboard_message" readonly>{{ old('dashboard_message', $setting->login_note) }}</textarea>
+                                           {!! $errors->first('dashboard_message', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
+                                           <p class="text-warning"><i class="fas fa-lock"></i> {{ trans('general.feature_disabled') }}</p>
+                                       @else
+                                           <textarea class="form-control" aria-label="dashboard_message" name="dashboard_message" rows="2">{{ old('login_note', $setting->dashboard_message) }}</textarea>
+                                           {!! $errors->first('dashboard_message', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
+                                       @endif
+                                       <p class="help-block">
+                                           {{ trans('admin/settings/general.dashboard_message_help') }}
+                                           {!!  trans('general.github_markdown') !!}</p>
+                                   </div>
+                               </div>
+                       </fieldset>
+
+
+                       <fieldset class="bottom-padded">
+                           <legend class="highlight">
+                               {{ trans('admin/settings/general.legends.misc') }}
+                           </legend>
+
+                               <!-- Depreciation method -->
+                               <div class="form-group {{ $errors->has('depreciation_method') ? 'error' : '' }}">
+                                   <div class="col-md-3">
+                                       <label for="depreciation_method">{{ trans('admin/depreciations/general.depreciation_method') }}</label>
+                                   </div>
+                                   <div class="col-md-8">
+                                       <x-input.select
+                                           name="depreciation_method"
+                                           id="depreciation_method"
+                                           :options="['default' => trans('admin/depreciations/general.linear_depreciation'), 'half_1' => trans('admin/depreciations/general.half_1'), 'half_2' => trans('admin/depreciations/general.half_2')]"
+                                           :selected="old('depreciation_method', $setting->depreciation_method)"
+                                           style="width: 80%"
+                                       />
+                                   </div>
+                               </div>
+                               <!-- /.form-group -->
+
+                               <!-- unique serial -->
+                               <div class="form-group">
+                                   <div class="col-md-8 col-md-offset-3">
+                                       <label class="form-control">
+                                           <input type="checkbox" name="unique_serial" value="1" @checked(old('unique_serial', $setting->unique_serial)) />
+                                           {{ trans('admin/settings/general.unique_serial') }}
+                                           {!! $errors->first('unique_serial', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
+                                       </label>
+
+                                       <p class="help-block">
+                                           {{ trans('admin/settings/general.unique_serial_help_text') }}
+                                       </p>
+                                   </div>
+                               </div>
+
+                       </fieldset>
+
+
+                   </div> <!--/.box-body-->
             </div> <!--/.box-body-->
             <div class="box-footer">
                 <div class="text-left col-md-6">
                     <a class="btn btn-link text-left" href="{{ route('settings.index') }}">{{ trans('button.cancel') }}</a>
                 </div>
                 <div class="text-right col-md-6">
-                    <button type="submit" class="btn btn-primary"><i class="fas fa-check icon-white" aria-hidden="true"></i> {{ trans('general.save') }}</button>
+                    <button type="submit" class="btn btn-primary"><x-icon type="checkmark" /> {{ trans('general.save') }}</button>
                 </div>
 
             </div>
@@ -408,7 +449,7 @@
     </div> <!-- /.col-md-8-->
 
 
-    {{ Form::close() }}
+    </form>
 
 @stop
 
@@ -482,6 +523,5 @@
             });
         });
 
-
     </script>
 @stop
diff --git a/resources/views/settings/google.blade.php b/resources/views/settings/google.blade.php
index d9a4c4c622..a1391ea031 100644
--- a/resources/views/settings/google.blade.php
+++ b/resources/views/settings/google.blade.php
@@ -16,7 +16,7 @@
 
 
 
-    {{ Form::open(['method' => 'POST', 'files' => false, 'autocomplete' => 'off', 'class' => 'form-horizontal', 'role' => 'form' ]) }}
+    <form method="POST" action="{{ route('settings.google.save') }}" accept-charset="UTF-8" autocomplete="off" class="form-horizontal" role="form">
     <!-- CSRF Token -->
     {{csrf_field()}}
 
@@ -27,7 +27,8 @@
             <div class="panel box box-default">
                 <div class="box-header with-border">
                     <h2 class="box-title">
-                        <i class="fa-brands fa-google"></i> {{ trans('admin/settings/general.google_login') }}
+                        <x-icon type="google"/>
+                        {{ trans('admin/settings/general.google_login') }}
                     </h2>
                 </div>
                 <div class="box-body">
@@ -53,7 +54,7 @@
                             <div class="col-md-8 col-md-offset-3">
                                 <label class="form-control{{ (config('app.lock_passwords')===true) ? ' form-control--disabled': '' }}">
                                     <span class="sr-only">{{ trans('admin/settings/general.pwd_secure_uncommon') }}</span>
-                                    {{ Form::checkbox('google_login', '1', old('google_login', $setting->google_login),array('aria-label'=>'google_login', (config('app.lock_passwords')===true) ? 'disabled': '')) }}
+                                    <input type="checkbox" name="google_login" value="1" @checked(old('google_login', $setting->google_login)) @disabled(config('app.lock_passwords')) aria-label="google_login">
                                     {{ trans('admin/settings/general.enable_google_login') }}
                                 </label>
                                 <p class="help-block">{{ trans('admin/settings/general.enable_google_login_help') }}</p>
@@ -64,10 +65,18 @@
                         <!-- Google Client ID -->
                         <div class="form-group {{ $errors->has('google_client_id') ? 'error' : '' }}">
                             <div class="col-md-3 text-right">
-                                {{ Form::label('google_client_id', 'Client ID') }}
+                                <label for="google_client_id">Client ID</label>
                             </div>
                             <div class="col-md-8">
-                                {{ Form::text('google_client_id', old('google_client_id', $setting->google_client_id), ['class' => 'form-control','placeholder' => trans('general.example') .'000000000000-XXXXXXXXXXX.apps.googleusercontent.com', (config('app.lock_passwords')===true) ? 'disabled': '']) }}
+                                <input
+                                    class="form-control"
+                                    placeholder="{{ trans('general.example') .'000000000000-XXXXXXXXXXX.apps.googleusercontent.com' }}"
+                                    name="google_client_id"
+                                    type="text"
+                                    id="google_client_id"
+                                    value="{{ old('google_client_id', $setting->google_client_id) }}"
+                                    @disabled(config('app.lock_passwords')===true)
+                                >
                                 {!! $errors->first('google_client_id', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
                                 @if (config('app.lock_passwords')===true)
                                     <p class="text-warning"><i class="fas fa-lock" aria-hidden="true"></i> {{ trans('general.feature_disabled') }}</p>
@@ -78,14 +87,14 @@
                         <!-- Google Client Secret -->
                         <div class="form-group {{ $errors->has('google_client_secret') ? 'error' : '' }}">
                             <div class="col-md-3 text-right">
-                                {{ Form::label('google_client_secret', 'Client Secret') }}
+                                <label for="google_client_secret">Client Secret</label>
                             </div>
                             <div class="col-md-8">
 
                                 @if (config('app.lock_passwords')===true)
-                                    {{ Form::text('google_client_secret', 'XXXXXXXXXXXXXXXXXXXXXXX', ['class' => 'form-control', 'disabled']) }}
+                                    <input class="form-control" disabled="" name="google_client_secret" type="text" value="XXXXXXXXXXXXXXXXXXXXXXX" id="google_client_secret">
                                 @else
-                                    {{ Form::text('google_client_secret', old('google_client_secret', $setting->google_client_secret), ['class' => 'form-control','placeholder' => trans('general.example') .'XXXXXXXXXXXX']) }}
+                                    <input class="form-control" placeholder="{{ trans('general.example') .'XXXXXXXXXXXX' }}" name="google_client_secret" type="text" id="google_client_secret" value="{{ old('google_client_secret', $setting->google_client_secret) }}">
                                 @endif
 
                                 {!! $errors->first('google_client_secret', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
@@ -104,7 +113,7 @@
                         <a class="btn btn-link text-left" href="{{ route('settings.index') }}">{{ trans('button.cancel') }}</a>
                     </div>
                     <div class="text-right col-md-6">
-                        <button type="submit" class="btn btn-success"{{ (config('app.lock_passwords')===true) ? ' disabled': '' }}><i class="fas fa-check icon-white" aria-hidden="true"></i> {{ trans('general.save') }}</button>
+                        <button type="submit" class="btn btn-success"{{ (config('app.lock_passwords')===true) ? ' disabled': '' }}><x-icon type="checkmark" /> {{ trans('general.save') }}</button>
                     </div>
 
                 </div>
@@ -112,6 +121,6 @@
         </div> <!-- /.col-md-8-->
     </div> <!-- /.row-->
 
-    {{Form::close()}}
+    </form>
 
 @stop
diff --git a/resources/views/settings/index.blade.php b/resources/views/settings/index.blade.php
index 3b805f9215..c73df97f7a 100755
--- a/resources/views/settings/index.blade.php
+++ b/resources/views/settings/index.blade.php
@@ -14,9 +14,9 @@
   <div class="pull-right">
 
 
-    <form onsubmit="return false;">
+    <form onsubmit="return false;" role="search" aria-label="Admin Options" id="setting-search">
       <div class="btn-group">
-        <input id="searchinput" name="search" type="search" class="search form-control" placeholder="{{ trans('admin/settings/general.filter_by_keyword') }}">
+        <input id="searchinput" name="search" type="search" class="search form-control" placeholder="{{ trans('admin/settings/general.filter_by_keyword') }}" aria-label="keyword search">
         <span id="searchclear" class="fas fa-times" aria-hidden="true"></span>
         <button type="submit" disabled style="display: none" aria-hidden="true"></button>
       </div>
@@ -57,84 +57,84 @@
     <div class="list clearfix">
 
         <div class="col-md-4 col-lg-3 col-sm-6 col-xl-1">
-          <div class="box box-default">
+          <div class="admin box box-default">
             <div class="box-body text-center">
               <h5>
               <a href="{{ route('settings.branding.index') }}" class="settings_button">
-                <i class="fas fa-copyright fa-4x" aria-hidden="true"></i>
+                <x-icon type="branding" class="fa-4x"/>
                 <br><br>
                 <span class="name">{{ trans('admin/settings/general.brand') }}</span>
-                <span class="keywords" aria-hidden="true" style="display:none">{{ trans('admin/settings/general.brand_keywords') }}</span>
+                <span class="keywords" aria-hidden="true" style="display:none">{{ trans('admin/settings/general.keywords.brand') }}</span>
               </a>
               </h5>
-              <p class="help-block">{{ trans('admin/settings/general.brand_help') }}</p>
+              <p class="index-block">{{ trans('admin/settings/general.brand_help') }}</p>
             </div>
           </div>
         </div>
 
 
         <div class="col-md-4 col-lg-3 col-sm-6 col-xl-1">
-          <div class="box box-default">
+          <div class="admin box box-default">
             <div class="box-body text-center">
               <h5>
                 <a href="{{ route('settings.general.index') }}" class="settings_button">
-                  <i class="fas fa-wrench fa-4x" aria-hidden="true"></i>
+                  <x-icon type="general-settings" class="fa-4x"/>
                   <br><br>
                   <span class="name"> {{ trans('admin/settings/general.general_settings') }}</span>
-                  <span class="keywords" aria-hidden="true" style="display:none">{{ trans('admin/settings/general.general_settings_keywords') }}</span>
+                  <span class="keywords" aria-hidden="true" style="display:none">{{ trans('admin/settings/general.keywords.general_settings') }}</span>
                 </a>
               </h5>
-              <p class="help-block">{{ trans('admin/settings/general.general_settings_help') }}</p>
+              <p class="index-block">{{ trans('admin/settings/general.general_settings_help') }}</p>
             </div>
           </div>
         </div>
 
 
         <div class="col-md-4 col-lg-3 col-sm-6 col-xl-1">
-          <div class="box box-default">
+          <div class="admin box box-default">
             <div class="box-body text-center">
               <h5>
                 <a href="{{ route('settings.security.index') }}" class="settings_button">
-                  <i class="fas fa-lock fa-4x" aria-hidden="true"></i>
+                  <x-icon type="locked" class="fa-4x"/>
                   <br><br>
                   <span class="name">{{ trans('admin/settings/general.security') }}</span>
-                  <span class="keywords" aria-hidden="true" style="display:none">{{ trans('admin/settings/general.security_keywords') }}</span>
+                  <span class="keywords" aria-hidden="true" style="display:none">{{ trans('admin/settings/general.keywords.security') }}</span>
                 </a>
               </h5>
-              <p class="help-block">{{ trans('admin/settings/general.security_help') }}</p>
+              <p class="index-block">{{ trans('admin/settings/general.security_help') }}</p>
             </div>
           </div>
         </div>
 
         <div class="col-md-4 col-lg-3 col-sm-6 col-xl-1">
-          <div class="box box-default">
+          <div class="admin box box-default">
             <div class="box-body text-center">
               <h5>
                 <a href="{{ route('groups.index') }}" class="settings_button">
-                  <i class="fas fa-user-friends fa-4x" aria-hidden="true"></i>
+                  <x-icon type="groups" class="fa-4x"/>
                   <br><br>
                   <span class="name">{{ trans('general.groups') }}</span>
-                  <span class="keywords" aria-hidden="true" style="display:none"> {{ trans('admin/settings/general.groups_keywords') }}</span>
+                  <span class="keywords" aria-hidden="true" style="display:none"> {{ trans('admin/settings/general.keywords.groups') }}</span>
                   </a>
               </h5>
-              <p class="help-block">{{ trans('admin/settings/general.groups_help') }}</p>
+              <p class="index-block">{{ trans('admin/settings/general.groups_help') }}</p>
             </div>
           </div>
         </div>
 
 
         <div class="col-md-4 col-lg-3 col-sm-6 col-xl-1">
-          <div class="box box-default">
+          <div class="admin box box-default">
             <div class="box-body text-center">
               <h5>
                 <a href="{{ route('settings.localization.index') }}" class="settings_button">
-                  <i class="fas fa-globe-americas fa-4x" aria-hidden="true"></i>
+                  <x-icon type="globe-us" class="fa-4x"/>
                   <br><br>
                   <span class="name">{{ trans('admin/settings/general.localization') }}</span>
-                  <span class="keywords" aria-hidden="true" style="display:none"> {{ trans('admin/settings/general.localization_keywords') }}</span>
+                  <span class="keywords" aria-hidden="true" style="display:none"> {{ trans('admin/settings/general.keywords.localization') }}</span>
                 </a>
               </h5>
-              <p class="help-block">{{ trans('admin/settings/general.localization_help') }}</p>
+              <p class="index-block">{{ trans('admin/settings/general.localization_help') }}</p>
 
             </div>
           </div>
@@ -142,186 +142,173 @@
 
 
         <div class="col-md-4 col-lg-3 col-sm-6 col-xl-1">
-          <div class="box box-default">
+          <div class="admin box box-default">
             <div class="box-body text-center">
               <h5>
                 <a href="{{ route('settings.alerts.index') }}" class="settings_button">
-                  <i class="fas fa-bell fa-4x" aria-hidden="true"></i>
+                  <x-icon type="bell" class="fa-4x"/>
                   <br><br>
                   <span class="name">{{ trans('admin/settings/general.notifications') }}</span>
+                  <span class="keywords" aria-hidden="true" style="display:none"> {{ trans('admin/settings/general.keywords.notifications') }}</span>
 
                 </a>
               </h5>
-              <p class="help-block">{{ trans('admin/settings/general.notifications_help') }}</p>
+              <p class="index-block">{{ trans('admin/settings/general.notifications_help') }}</p>
             </div>
           </div>
         </div>
 
         <div class="col-md-4 col-lg-3 col-sm-6 col-xl-1">
-          <div class="box box-default">
+          <div class="admin box box-default">
             <div class="box-body text-center">
               <h5>
                 <a href="{{ route('settings.slack.index') }}" class="settings_button">
-                  <i class="fa-solid fa-hashtag fa-4x" aria-hidden="true"></i>
+                  <x-icon type="hashtag" class="fa-4x"/>
                   <br><br>
                   <span class="name">{{ trans('admin/settings/general.integrations') }}</span>
                 </a>
               </h5>
-              <p class="help-block">{{ trans('admin/settings/general.webhook_help') }}</p>
+              <p class="index-block">{{ trans('admin/settings/general.webhook_help') }}</p>
             </div>
           </div>
         </div>
 
         <div class="col-md-4 col-lg-3 col-sm-6 col-xl-1">
-          <div class="box box-default">
+          <div class="admin box box-default">
             <div class="box-body text-center">
               <h5>
                 <a href="{{ route('settings.asset_tags.index') }}" class="settings_button">
-                  <i class="fas fa-list-ol fa-4x" aria-hidden="true"></i>
+                  <x-icon type="asset-tags" class="fa-4x"/>
                   <br><br>
                   <span class="name">{{ trans('general.asset_tags') }}</span>
                 </a>
               </h5>
-              <p class="help-block">{{ trans('admin/settings/general.asset_tags_help') }}</p>
+              <p class="index-block">{{ trans('admin/settings/general.asset_tags_help') }}</p>
             </div>
           </div>
         </div>
 
         <div class="col-md-4 col-lg-3 col-sm-6 col-xl-1">
-          <div class="box box-default">
-            <div class="box-body text-center">
-              <h5>
-                <a href="{{ route('settings.barcodes.index') }}" class="settings_button">
-                  <i class="fas fa-barcode fa-4x" aria-hidden="true"></i>
-                  <br><br>
-                  <span class="name">{{ trans('admin/settings/general.barcodes') }}</span>
-                </a>
-              </h5>
-              <p class="help-block">{!! trans('admin/settings/general.barcodes_help_overview') !!}</p>
-            </div>
-          </div>
-        </div>
-
-        <div class="col-md-4 col-lg-3 col-sm-6 col-xl-1">
-          <div class="box box-default">
+          <div class="admin box box-default">
             <div class="box-body text-center">
               <h5>
                 <a href="{{ route('settings.labels.index') }}" class="settings_button">
-                  <i class="fas fa-tags fa-4x" aria-hidden="true"></i>
+                  <x-icon type="labels" class="fa-4x"/>
                   <br><br>
                   <span class="name">{{ trans('admin/settings/general.labels') }}</span>
+                  <span class="keywords" aria-hidden="true" style="display:none"> {{ trans('admin/settings/general.keywords.labels') }}</span>
                 </a>
               </h5>
-              <p class="help-block">{!! trans('admin/settings/general.labels_help') !!}</p>
+              <p class="index-block">{!! trans('admin/settings/general.labels_help') !!}</p>
             </div>
           </div>
         </div>
 
 
         <div class="col-md-4 col-lg-3 col-sm-6 col-xl-1">
-          <div class="box box-default">
+          <div class="admin box box-default">
             <div class="box-body text-center">
               <h5>
                 <a href="{{ route('settings.ldap.index') }}" class="settings_button">
-                  <i class="fas fa-sitemap fa-4x" aria-hidden="true"></i>
+                  <x-icon type="ldap" class="fa-4x"/>
                   <br><br>
                   <span class="name">{{ trans('admin/settings/general.ldap') }}</span>
                 </a>
               </h5>
-              <p class="help-block">{{ trans('admin/settings/general.ldap_help') }}</p>
+              <p class="index-block">{{ trans('admin/settings/general.ldap_help') }}</p>
             </div>
           </div>
         </div>
 
       <div class="col-md-4 col-lg-3 col-sm-6 col-xl-1">
-        <div class="box box-default">
+        <div class="admin box box-default">
           <div class="box-body text-center">
             <h5>
               <a href="{{ route('settings.google.index') }}" class="settings_button">
-                <i class="fa-brands fa-google fa-4x" aria-hidden="true"></i>
+                <x-icon type="google" class="fa-4x"/>
                 <br><br>
                 <span class="name">Google</span>
               </a>
             </h5>
-            <p class="help-block">{{ trans('admin/settings/general.google_login') }}</p>
+            <p class="index-block">{{ trans('admin/settings/general.google_login') }}</p>
           </div>
         </div>
       </div>
 
       <div class="col-md-4 col-lg-3 col-sm-6 col-xl-1">
-        <div class="box box-default">
+        <div class="admin box box-default">
           <div class="box-body text-center">
             <h5>
               <a href="{{ route('settings.saml.index') }}" class="settings_button">
-                <i class="fas fa-sign-in-alt fa-4x" aria-hidden="true"></i>
+                <x-icon type="saml" class="fa-4x"/>
                 <br><br>
                 <span class="name">{{ trans('admin/settings/general.saml') }}</span>
               </a>
             </h5>
-            <p class="help-block">{{ trans('admin/settings/general.saml_help') }}</p>
+            <p class="index-block">{{ trans('admin/settings/general.saml_help') }}</p>
           </div>
         </div>
       </div>
 
         <div class="col-md-4 col-lg-3 col-sm-6 col-xl-1">
-          <div class="box box-default">
+          <div class="admin box box-default">
             <div class="box-body text-center">
               <h5>
                 <a href="{{ route('settings.backups.index') }}" class="settings_button">
-                  <i class="fas fa-file-archive fa-4x" aria-hidden="true"></i>
+                  <x-icon type="backups" class="fa-4x"/>
                   <br><br>
                   <span class="name">{{ trans('admin/settings/general.backups') }}</span>
                 </a>
               </h5>
-              <p class="help-block">{!! trans('admin/settings/general.backups_help') !!}</p>
+              <p class="index-block">{!! trans('admin/settings/general.backups_help') !!}</p>
             </div>
           </div>
         </div>
 
 
       <div class="col-md-4 col-lg-3 col-sm-6 col-xl-1">
-        <div class="box box-default">
+        <div class="admin box box-default">
           <div class="box-body text-center">
             <h5>
               <a href="{{ route('settings.logins.index') }}" class="settings_button">
-                <i class="fas fa-crosshairs fa-4x" aria-hidden="true"></i>
+                <x-icon type="logins" class="fa-4x"/>
                 <br><br>
                 <span class="name">{{ trans('admin/settings/general.login') }}</span>
               </a>
             </h5>
-            <p class="help-block">{{ trans('admin/settings/general.login_help') }} </p>
+            <p class="index-block">{{ trans('admin/settings/general.login_help') }} </p>
           </div>
         </div>
       </div>
 
         <div class="col-md-4 col-lg-3 col-sm-6 col-xl-1">
-          <div class="box box-default">
+          <div class="admin box box-default">
             <div class="box-body text-center">
               <h5>
               <a href="{{ route('settings.oauth.index') }}" class="settings_button">
-                <i class="fas fa-user-secret fa-4x" aria-hidden="true"></i>
+                <x-icon type="oauth" class="fa-4x"/>
                 <br><br>
                 <span class="name">{{  trans('admin/settings/general.oauth') }}</span>
               </a>
               </h5>
-              <p class="help-block">{{  trans('admin/settings/general.oauth_help') }}</p>
+              <p class="index-block">{{  trans('admin/settings/general.oauth_help') }}</p>
             </div>
           </div>
         </div>
 
         @if (config('app.debug')=== true)
           <div class="col-md-4 col-lg-3 col-sm-6 col-xl-1">
-            <div class="box box-default">
+            <div class="admin box box-default">
               <div class="box-body text-center">
                 <h5>
                   <a href="{{ route('settings.phpinfo.index') }}" class="settings_button">
                     <i class="fab fa-php fa-4x" aria-hidden="true"></i>
                     <br><br>
                     <span class="name">{{ trans('admin/settings/general.php_overview') }}</span>
-                    <span class="keywords" aria-hidden="true" style="display:none">{{ trans('admin/settings/general.php_overview_keywords') }}</span>
+                    <span class="keywords" aria-hidden="true" style="display:none">{{ trans('admin/settings/general.keywords.php_overview') }}</span>
                   </a>
                 </h5>
-                <p class="help-block">{{ trans('admin/settings/general.php_overview_help') }}</p>
+                <p class="index-block">{{ trans('admin/settings/general.php_overview_help') }}</p>
               </div>
             </div>
           </div>
@@ -329,17 +316,17 @@
 
 
     <div class="col-md-4 col-lg-3 col-sm-6 col-xl-1">
-      <div class="box box-danger">
+      <div class="admin box box-danger">
         <div class="box-body text-center">
           <h5>
             <a href="{{ route('settings.purge.index') }}" class="link-danger">
               <i class="fas fa-trash fa-4x" aria-hidden="true"></i>
               <br><br>
               <span class="name">{{ trans('admin/settings/general.purge') }}</span>
-              <span class="keywords" aria-hidden="true" style="display:none">{{ trans('admin/settings/general.purge_keywords') }}</span>
+              <span class="keywords" aria-hidden="true" style="display:none">{{ trans('admin/settings/general.keywords.purge') }}</span>
             </a>
           </h5>
-          <p class="help-block">{{ trans('admin/settings/general.purge_help') }}</p>
+          <p class="index-block">{{ trans('admin/settings/general.purge_help') }}</p>
         </div>
       </div>
     </div>
@@ -356,21 +343,22 @@
         <h2 class="box-title">{{ trans('admin/settings/general.system') }}</h2>
       </div>
       <div class="box-body">
-        <div class="container row row-striped" style="width:97%">
+        <div class="col-md-12" style="margin-right:4px;">
+        <div class="row row-new-striped" style="line-height: 23px;">
 
           <!-- row -->
           <div class="row">
-            <div class="col-md-2">
+            <div class="col-md-2" style="padding-top: 3px; padding-bottom: 3px;">
               <strong>{{ trans('admin/settings/general.snipe_version') }}:</strong>
             </div>
-            <div class="col-md-4">
-            {{ config('version.app_version') }}  build {{ config('version.build_version') }} ({{ config('version.hash_version') }})
+            <div class="col-md-4" style="padding-top: 3px; padding-bottom: 3px;">
+              {{ config('version.app_version') }}  build {{ config('version.build_version') }} ({{ config('version.hash_version') }})
             </div>
 
-            <div class="col-md-2">
+            <div class="col-md-2" style="padding-top: 3px; padding-bottom: 3px;">
               <strong>{{ trans('admin/settings/general.license') }}:</strong>
             </div>
-          <div class="col-md-4">
+            <div class="col-md-4" style="padding-top: 3px; padding-bottom: 3px;">
               <a href="https://www.gnu.org/licenses/agpl-3.0.en.html" rel="noopener">AGPL3</a>
            </div>
           </div>
@@ -378,52 +366,52 @@
 
           <!-- row -->
           <div class="row">
-            <div class="col-md-2">
+            <div class="col-md-2" style="padding-top: 3px; padding-bottom: 3px;">
               <strong>{{ trans('admin/settings/general.php') }}:</strong>
             </div>
-            <div class="col-md-4">
+            <div class="col-md-4" style="padding-top: 3px; padding-bottom: 3px;">
               {{ phpversion() }}
             </div>
 
-            <div class="col-md-2">
+            <div class="col-md-2" style="padding-top: 3px; padding-bottom: 3px;">
               <strong>{{ trans('admin/settings/general.laravel') }}:</strong>
             </div>
-            <div class="col-md-4">
+            <div class="col-md-4" style="padding-top: 3px; padding-bottom: 3px;">
               {{ $snipeSettings->lar_ver() }}
             </div>
           </div>
 
           <!-- row -->
           <div class="row">
-              <div class="col-md-2">
+              <div class="col-md-2" style="padding-top: 3px; padding-bottom: 3px;">
                 <strong>{{ trans('admin/settings/general.timezone') }}:</strong>
               </div>
-              <div class="col-md-4">
+              <div class="col-md-4" style="padding-top: 3px; padding-bottom: 3px;">
                 {{ config('app.timezone') }}
               </div>
 
-              <div class="col-md-2">
+              <div class="col-md-2" style="padding-top: 3px; padding-bottom: 3px;">
                 <strong>{{ trans('admin/settings/general.database_driver') }}:</strong>
               </div>
-              <div class="col-md-4">
+              <div class="col-md-4" style="padding-top: 3px; padding-bottom: 3px;">
                 {{ config('database.default') }}
               </div>
           </div>
 
           <!-- row -->
           <div class="row">
-            <div class="col-md-2">
+            <div class="col-md-2" style="padding-top: 3px; padding-bottom: 3px;">
               <strong>{{ trans('admin/settings/general.mail_from') }}:</strong>
             </div>
-            <div class="col-md-4">
+            <div class="col-md-4" style="padding-top: 3px; padding-bottom: 3px;">
               {{ config('mail.from.name') }}
               <code>&lt;{{ config('mail.from.address') }}&gt;</code>
             </div>
 
-            <div class="col-md-2">
+            <div class="col-md-2" style="padding-top: 3px; padding-bottom: 3px;">
               <strong>{{ trans('admin/settings/general.mail_reply_to') }}:</strong>
             </div>
-            <div class="col-md-4">
+            <div class="col-md-4" style="padding-top: 3px; padding-bottom: 3px;">
               {{ config('mail.reply_to.name') }}
               <code>&lt;{{ config('mail.reply_to.address') }}&gt;</code>
             </div>
@@ -431,15 +419,18 @@
 
           <!-- row -->
           <div class="row">
-            <div class="col-md-2">
+            <div class="col-md-2" style="padding-top: 3px; padding-bottom: 3px;">
               <strong>{{ trans('admin/settings/general.bs_table_storage') }}:</strong>
             </div>
-            <div class="col-md-10">
+            <div class="col-md-4" style="padding-top: 3px; padding-bottom: 3px;">
               {{ config('session.bs_table_storage') }}
             </div>
-
+            <div class="col-md-2">
+            </div>
+            <div class="col-md-4">
+            </div>
           </div>
-
+        </div>
         </div>
           </div>
           <!--/ row -->
@@ -458,7 +449,7 @@
 
 
   var options = {
-    valueNames: [ 'name', 'keywords', 'summary', 'help-block']
+    valueNames: [ 'name', 'keywords', 'summary', 'index-block']
   };
 
   var settingList = new List('setting-list', options);
diff --git a/resources/views/settings/labels.blade.php b/resources/views/settings/labels.blade.php
index 65d7e6c842..8af236d625 100644
--- a/resources/views/settings/labels.blade.php
+++ b/resources/views/settings/labels.blade.php
@@ -20,23 +20,22 @@
         }
     </style>
 
-    {{ Form::open(['id' => 'settingsForm', 'method' => 'POST', 'files' => false, 'autocomplete' => 'off', 'class' => 'form-horizontal', 'role' => 'form' ]) }}
+    <form method="POST" action="{{ route('settings.labels.save') }}" accept-charset="UTF-8" id="settingsForm" autocomplete="off" class="form-horizontal" role="form">
     <!-- CSRF Token -->
     {{csrf_field()}}
 
     <div class="row">
         <div class="col-sm-10 col-sm-offset-1 col-md-10">
 
-
             <div class="panel box box-default">
                 <div class="box-header with-border">
                     <h2 class="box-title">
-                        <i class="fas fa-tags"></i> {{ trans('admin/settings/general.labels') }}
+                        <x-icon type="labels"/>
+                        {{ trans('admin/settings/general.labels') }}
                     </h2>
                 </div>
                 <div class="box-body">
 
-
                     <div class="col-md-12">
 
                         <!-- New Label Engine -->
@@ -46,7 +45,7 @@
 
                                 <label class="form-control">
                                     <input type="checkbox" value="1" name="label2_enable"{{ ((old('label2_enable') == '1') || ($setting->label2_enable) == '1') ? ' checked="checked"' : '' }} aria-label="label2_enable">
-                                    {{ Form::label('label2_enable', trans('admin/settings/general.label2_enable')) }}
+                                    <label for="label2_enable">{{ trans('admin/settings/general.label2_enable') }}</label>
                                 </label>
 
                                 {!! $errors->first('label2_enable', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
@@ -106,10 +105,10 @@
                             <!-- Title -->
                             <div class="form-group{{ $errors->has('label2_title') ? ' has-error' : '' }}">
                                 <div class="col-md-3 text-right">
-                                    {{ Form::label('label2_title', trans('admin/settings/general.label2_title'), ['class'=>'control-label']) }}
+                                    <label for="label2_title" class="control-label">{{trans('admin/settings/general.label2_title')}}</label>
                                 </div>
                                 <div class="col-md-7">
-                                    {{ Form::text('label2_title', old('label2_title', $setting->label2_title), [ 'class'=>'form-control', 'placeholder'=>$setting->qr_text, 'aria-label'=>'label2_title' ]) }}
+                                    <input class="form-control" aria-label="label2_title" name="label2_title" type="text" id="label2_title" value="{{ old('label2_title', $setting->label2_title) }}">
                                     {!! $errors->first('label2_title', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
                                     <p class="help-block">{!! trans('admin/settings/general.label2_title_help') !!}</p>
                                     <p class="help-block">
@@ -130,7 +129,7 @@
 
                                     <label class="form-control">
                                         <input type="checkbox" value="1" name="label2_asset_logo"{{ ((old('label2_asset_logo') == '1') || ($setting->label2_asset_logo) == '1') ? ' checked="checked"' : '' }} aria-label="label2_asset_logo">
-                                        {{ Form::label('label2_asset_logo', trans('admin/settings/general.label2_asset_logo')) }}
+                                        <label for="label2_asset_logo">{{ trans('admin/settings/general.label2_asset_logo') }}</label>
                                     </label>
                                     <p class="help-block">
                                         {!! trans('admin/settings/general.label2_asset_logo_help', ['setting_name' => trans('admin/settings/general.brand').' &gt; '.trans('admin/settings/general.label_logo')]) !!}
@@ -138,26 +137,46 @@
 
                                 </div>
                             </div>
-
+                        @endif
+                        @if($setting->label2_enable == 0)
+                            @if ($is_gd_installed)
+                            <!-- barcode -->
+                            <div class="form-group">
+                                <div class="col-md-9 col-md-offset-3">
+                                    <label class="form-control">
+                                        <input type="checkbox" name="alt_barcode_enabled" value="1" @checked(old('alt_barcode_enabled', $setting->alt_barcode_enabled)) aria-label="alt_barcode_enabled"/>
+                                        {{ trans('admin/settings/general.display_alt_barcode') }}
+                                    </label>
+                                </div>
+                            </div>
+                            @endif
+                        @endif
+                        
                             <!-- 1D Barcode Type -->
                             <div class="form-group{{ $errors->has('label2_1d_type') ? ' has-error' : '' }}">
                                 <div class="col-md-3 text-right">
-                                    {{ Form::label('label2_1d_type', trans('admin/settings/general.label2_1d_type'), ['class'=>'control-label']) }}
+                                    <label for="label2_1d_type" class="control-label">{{ trans('admin/settings/general.label2_1d_type') }}</label>
                                 </div>
                                 <div class="col-md-7">
                                     @php
                                         $select1DValues = [
-                                            'default' => trans('admin/settings/general.default').' [ '.$setting->alt_barcode.' ]',
-                                            'none'    => trans('admin/settings/general.none'),
                                             'C128'    => 'C128',
                                             'C39'     => 'C39',
                                             'EAN5'    => 'EAN5',
                                             'EAN13'   => 'EAN13',
                                             'UPCA'    => 'UPCA',
-                                            'UPCE'    => 'UPCE'
+                                            'UPCE'    => 'UPCE',
+                                            'none'    => trans('admin/settings/general.none'),
                                         ];
                                     @endphp
-                                    {{ Form::select('label2_1d_type', $select1DValues, old('label2_1d_type', $setting->label2_1d_type), [ 'class'=>'select2 col-md-4', 'aria-label'=>'label2_1d_type' ]) }}
+                                    <x-input.select
+                                        name="label2_1d_type"
+                                        id="label2_1d_type"
+                                        :options="$select1DValues"
+                                        :selected="old('label2_1d_type', $setting->label2_1d_type)"
+                                        class="col-md-4"
+                                        aria-label="label2_1d_type"
+                                    />
                                     {!! $errors->first('label2_1d_type', '<span class="alert-msg" aria-hidden="true"><i class="fas fa-times" aria-hidden="true"></i> :message</span>') !!}
                                     <p class="help-block">
                                         {{ trans('admin/settings/general.label2_1d_type_help') }}.
@@ -170,54 +189,160 @@
                                     </p>
                                 </div>
                             </div>
+                                
+                @if($setting->label2_enable == 0)
 
-                            <!-- 2D Barcode Type -->
-                            <div class="form-group{{ $errors->has('label2_2d_type') ? ' has-error' : '' }}">
-                                <div class="col-md-3 text-right">
-                                    {{ Form::label('label2_2d_type', trans('admin/settings/general.label2_2d_type'), ['class'=>'control-label']) }}
-                                </div>
-                                <div class="col-md-7">
-                                    @php
-                                        $select2DValues = [
-                                            'default'    => trans('admin/settings/general.default').' [ '.$setting->barcode_type.' ]',
-                                            'none'       => trans('admin/settings/general.none'),
-                                            'QRCODE'     => 'QRCODE',
-                                            'DATAMATRIX' => 'DATAMATRIX',
-                                            'PDF417'     => 'PDF417',
-                                        ];
-                                    @endphp
-                                    {{ Form::select('label2_2d_type', $select2DValues, old('label2_2d_type', $setting->label2_2d_type), [ 'class'=>'select2 col-md-4', 'aria-label'=>'label2_2d_type' ]) }}
-                                    {!! $errors->first('label2_2d_type', '<span class="alert-msg" aria-hidden="true"><i class="fas fa-times" aria-hidden="true"></i> :message</span>') !!}
-                                    <p class="help-block">
-                                        {{ trans('admin/settings/general.label2_2d_type_help', ['current' => $setting->barcode_type]) }}.
-                                        {!!
-                                            trans('admin/settings/general.help_default_will_use', [
-                                                'default' => trans('admin/settings/general.default'),
-                                                'setting_name' => trans('admin/settings/general.barcodes').' &gt; '.trans('admin/settings/general.barcode_type'),
-                                            ])
-                                        !!}
-                                    </p>
-                                </div>
+                        <!-- qr code -->
+                        <div class="form-group">
+                            <div class="col-md-9 col-md-offset-3">
+                                <label class="form-control">
+                                    <input type="checkbox" name="qr_code" value="1" @checked(old('qr_code', $setting->qr_code)) aria-label="qr_code" />
+                                    {{ trans('admin/settings/general.display_qr') }}
+                                </label>
                             </div>
+                        </div>
+                    @endif
+                                <!-- 2D Barcode Type -->
+                                <div class="form-group{{ $errors->has('label2_2d_type') ? ' has-error' : '' }}">
+                                    <div class="col-md-3 text-right">
+                                        <label for="label2_2d_type" class="control-label">{{ trans('admin/settings/general.label2_2d_type') }}</label>
+                                    </div>
+                                    <div class="col-md-7">
+                                        @php
+                                            $select2DValues = [
+                                                'QRCODE'     => 'QRCODE',
+                                            ];
+                                            if ($setting->label2_enable == 1) {
+                                                $select2DValues['PDF417'] = 'PDF417';
+                                            }
+                                             $select2DValues = array_merge($select2DValues, [
+                                                'DATAMATRIX' => 'DATAMATRIX',
+                                                'none'       => trans('admin/settings/general.none'),
+                                            ]);
+                                        @endphp
+                                        <x-input.select
+                                            name="label2_2d_type"
+                                            id="label2_2d_type"
+                                            :options="$select2DValues"
+                                            :selected="old('label2_2d_type', $setting->label2_2d_type)"
+                                            class="col-md-4"
+                                            aria-label="label2_2d_type"
+                                        />
+                                        {!! $errors->first('label2_2d_type', '<span class="alert-msg" aria-hidden="true"><i class="fas fa-times" aria-hidden="true"></i> :message</span>') !!}
+                                        <p class="help-block">
+                                            {{ trans('admin/settings/general.label2_2d_type_help', ['current' => $setting->barcode_type]) }}.
+                                            {!!
+                                                trans('admin/settings/general.help_default_will_use')
+                                            !!}
+                                        </p>
+                                    </div>
+                                </div>
 
+                    @if($setting->label2_enable == 0)
+                                <!-- QR Text -->
+                                <div class="form-group{{ $errors->has('qr_text') ? ' has-error' : '' }}">
+                                    <div class="col-md-3 text-right">
+                                        <label for="qr_text" class="control-label">{{ trans('admin/settings/general.qr_text') }}</label>
+                                    </div>
+                                    <div class="col-md-7">
+                                        @if ($setting->qr_code == 1)
+                                            <input
+                                                class="form-control"
+                                                placeholder="Property of Your Company"
+                                                rel="txtTooltip"
+                                                title="Extra text that you would like to display on your labels."
+                                                data-toggle="tooltip"
+                                                data-placement="top"
+                                                name="qr_text"
+                                                type="text"
+                                                id="qr_text"
+                                                value="{{ old('qr_text', $setting->qr_text) }}"
+                                            >
+                                        @else
+                                            <input
+                                                class="form-control"
+                                                disabled="disabled"
+                                                placeholder="Property of Your Company"
+                                                name="qr_text"
+                                                type="text"
+                                                id="qr_text"
+                                                value="{{ old('qr_text', $setting->qr_text) }}"
+                                            >
+                                            <p class="help-block">{{ trans('admin/settings/general.qr_help') }}</p>
+                                        @endif
+                                        {!! $errors->first('qr_text', '<span class="alert-msg" aria-hidden="true"><i class="fas fa-times" aria-hidden="true"></i> :message</span>') !!}
+                                    </div>
+                                </div>
+
+                                <!-- Nuke barcode cache -->
+                                <div class="form-group">
+                                    <div class="col-md-3 text-right">
+                                        <label for="purge_barcodes" class="control-label">{{ trans('admin/settings/general.purge_barcodes') }}</label>
+                                    </div>
+                                    <div class="col-md-7">
+                                        <a class="btn btn-default btn-sm pull-left" id="purgebarcodes" style="margin-right: 10px;">
+                                            {{ trans('admin/settings/general.barcode_delete_cache') }}
+                                        </a>
+                                        <span id="purgebarcodesicon"></span>
+                                        <span id="purgebarcodesresult"></span>
+                                        <span id="purgebarcodesstatus"></span>
+                                        {!! $errors->first('purgebarcodes', '<span class="alert-msg" aria-hidden="true"><i class="fas fa-times" aria-hidden="true"></i> :message</span>') !!}
+                                        <p class="help-block">{{ trans('admin/settings/general.barcodes_help') }}</p>
+                                    </div>
+                                </div>
+                       @endif
+                        @if ($setting->label2_enable)
                             <!-- 2D Barcode Target -->
                             <div class="form-group{{ $errors->has('label2_2d_target') ? ' has-error' : '' }}">
                                 <div class="col-md-3 text-right">
-                                    {{ Form::label('label2_2d_target', trans('admin/settings/general.label2_2d_target'), ['class'=>'control-label']) }}
+                                    <label for="label2_2d_target" class="control-label">{{ trans('admin/settings/general.label2_2d_target') }}</label>
                                 </div>
                                 <div class="col-md-9">
-                                    {{ Form::select('label2_2d_target', ['hardware_id'=>'/hardware/{id} ('.trans('admin/settings/general.default').')', 'ht_tag'=>'/ht/{asset_tag}'], old('label2_2d_target', $setting->label2_2d_target), [ 'class'=>'select2 col-md-4', 'aria-label'=>'label2_2d_target' ]) }}
+                                    <x-input.select
+                                        name="label2_2d_target"
+                                        id="label2_2d_target"
+                                        :options="['hardware_id'=>'/hardware/{id} ('.trans('admin/settings/general.default').')',
+                                                   'ht_tag'=>'/ht/{asset_tag}',
+                                                   'location' => '/location/{location_id}',
+                                                   ]"
+                                        :selected="old('label2_2d_target', $setting->label2_2d_target)"
+                                        class="col-md-4"
+                                        aria-label="label2_2d_target"
+                                    />
                                     {!! $errors->first('label2_2d_target', '<span class="alert-msg" aria-hidden="true"><i class="fas fa-times" aria-hidden="true"></i> :message</span>') !!}
                                     <p class="help-block">{{ trans('admin/settings/general.label2_2d_target_help') }}</p>
                                 </div>
                             </div>
+                            <!-- Field offset -->
+                            <div class="form-group{{ $errors->has('label2_empty_row_count') ? ' has-error' : '' }}">
+                                <div class="col-md-3 text-right">
+                                    <label for="label2_empty_row_count" class="control-label">{{ trans('admin/settings/general.empty_row_count') }}</label>
+                                </div>
+                                <div class="col-md-9 col-xl-2 col-lg-2">
+                                        <input
+                                                class="form-control"
+                                                aria-label="Empty Row Count"
+                                                name="label2_empty_row_count"
+                                                type="number"
+                                                id="label2_empty_row_count"
+                                                min="0"
+                                                max="5"
+                                                value="{{ old('label2_empty_row_count', $setting->label2_empty_row_count) }}"
+                                        >
+                                </div>
+
+                                <div class="col-md-9 col-md-offset-3">
+                                    <p class="help-block">{!! trans('admin/settings/general.empty_row_count_help') !!}</p>
+                                    {!! $errors->first('label2_empty_row_count', '<span class="alert-msg" aria-hidden="true"><i class="fas fa-times" aria-hidden="true"></i> :message</span>') !!}
+                                </div>
+                            </div>
                             <div class="col-md-9 col-md-offset-3" style="margin-bottom: 10px;">
                                 @include('partials.label2-preview')
                             </div>
                             <!-- Fields -->
                             <div class="form-group {{ $errors->has('label2_fields') ? 'error' : '' }}">
                                 <div class="col-md-3 text-right">
-                                    {{ Form::label('label2_fields', trans('admin/settings/general.label2_fields')) }}
+                                    <label for="label2_fields">{{ trans('admin/settings/general.label2_fields') }}</label>
                                 </div>
                                 <div class="col-md-9">
                                     @include('partials.label2-field-definitions', [ 'name' => 'label2_fields', 'value' => old('label2_fields', $setting->label2_fields), 'customFields' => $customFields, 'template' => $setting->label2_template])
@@ -229,54 +354,61 @@
                             @include('partials.bootstrap-table')
 
                         @else
+
                             <!-- Hidden version of new settings -->
-                            {{ Form::hidden('label2_template', old('label2_template', $setting->label2_template)) }}
-                            {{ Form::hidden('label2_title', old('label2_title', $setting->label2_title)) }}
-                            {{ Form::hidden('label2_asset_logo', old('label2_asset_logo', $setting->label2_asset_logo)) }}
-                            {{ Form::hidden('label2_1d_type', old('label2_1d_type', $setting->label2_1d_type)) }}
-                            {{ Form::hidden('label2_2d_type', old('label2_2d_type', $setting->label2_2d_type)) }}
-                            {{ Form::hidden('label2_2d_target', old('label2_2d_target', $setting->label2_2d_target)) }}
-                            {{ Form::hidden('label2_fields', old('label2_fields', $setting->label2_fields)) }}
+                            <input name="label2_template" type="hidden" value="{{ old('label2_template', $setting->label2_template) }}" />
+                            <input name="label2_title" type="hidden" value="{{ old('label2_title', $setting->label2_title) }}" />
+                            <input name="label2_asset_logo" type="hidden" value="{{ old('label2_asset_logo', $setting->label2_asset_logo) }}" />
+                            <input name="label2_fields" type="hidden" value="{{ old('label2_fields', $setting->label2_fields) }}" />
                         @endif
 
                         @if ($setting->label2_enable && ($setting->label2_template != 'DefaultLabel'))
                             <!-- Hidden version of legacy settings -->
-                            {{ Form::hidden('labels_per_page', old('labels_per_page', $setting->labels_per_page)) }}
-                            {{ Form::hidden('labels_fontsize', old('labels_fontsize', $setting->labels_fontsize)) }}
-                            {{ Form::hidden('labels_width', old('labels_width', $setting->labels_width)) }}
-                            {{ Form::hidden('labels_height', old('labels_height', $setting->labels_height)) }}
-                            {{ Form::hidden('labels_display_sgutter', old('labels_display_sgutter', $setting->labels_display_sgutter)) }}
-                            {{ Form::hidden('labels_display_bgutter', old('labels_display_bgutter', $setting->labels_display_bgutter)) }}
-                            {{ Form::hidden('labels_pmargin_top', old('labels_pmargin_top', $setting->labels_pmargin_top)) }}
-                            {{ Form::hidden('labels_pmargin_bottom', old('labels_pmargin_bottom', $setting->labels_pmargin_bottom)) }}
-                            {{ Form::hidden('labels_pmargin_left', old('labels_pmargin_left', $setting->labels_pmargin_left)) }}
-                            {{ Form::hidden('labels_pmargin_right', old('labels_pmargin_right', $setting->labels_pmargin_right)) }}
-                            {{ Form::hidden('labels_pagewidth', old('labels_pagewidth', $setting->labels_pagewidth)) }}
-                            {{ Form::hidden('labels_pageheight', old('labels_pageheight', $setting->labels_pageheight)) }}
-                            {{ Form::hidden('labels_display_name', old('labels_display_name', $setting->labels_display_name)) }}
-                            {{ Form::hidden('labels_display_serial', old('labels_display_serial', $setting->labels_display_serial)) }}
-                            {{ Form::hidden('labels_display_tag', old('labels_display_tag', $setting->labels_display_tag)) }}
-                            {{ Form::hidden('labels_display_model', old('labels_display_model', $setting->labels_display_model)) }}
-                            {{ Form::hidden('labels_display_company_name', old('labels_display_company_name', $setting->labels_display_company_name)) }}
+                            <input name="labels_per_page" type="hidden" value="{{ old('labels_per_page', $setting->labels_per_page) }}" />
+                            <input name="labels_fontsize" type="hidden" value="{{ old('labels_fontsize', $setting->labels_fontsize) }}" />
+                            <input name="labels_width" type="hidden" value="{{ old('labels_width', $setting->labels_width) }}" />
+                            <input name="labels_height" type="hidden" value="{{ old('labels_height', $setting->labels_height) }}" />
+                            <input name="labels_display_sgutter" type="hidden" value="{{ old('labels_display_sgutter', $setting->labels_display_sgutter) }}" />
+                            <input name="labels_display_bgutter" type="hidden" value="{{ old('labels_display_bgutter', $setting->labels_display_bgutter) }}" />
+                            <input name="labels_pmargin_top" type="hidden" value="{{ old('labels_pmargin_top', $setting->labels_pmargin_top) }}" />
+                            <input name="labels_pmargin_bottom" type="hidden" value="{{ old('labels_pmargin_bottom', $setting->labels_pmargin_bottom) }}" />
+                            <input name="labels_pmargin_left" type="hidden" value="{{ old('labels_pmargin_left', $setting->labels_pmargin_left) }}" />
+                            <input name="labels_pmargin_right" type="hidden" value="{{ old('labels_pmargin_right', $setting->labels_pmargin_right) }}" />
+                            <input name="labels_pagewidth" type="hidden" value="{{ old('labels_pagewidth', $setting->labels_pagewidth) }}" />
+                            <input name="labels_pageheight" type="hidden" value="{{ old('labels_pageheight', $setting->labels_pageheight) }}" />
+                            <input name="labels_display_name" type="hidden" value="{{ old('labels_display_name', $setting->labels_display_name) }}" />
+                            <input name="labels_display_serial" type="hidden" value="{{ old('labels_display_serial', $setting->labels_display_serial) }}" />
+                            <input name="labels_display_tag" type="hidden" value="{{ old('labels_display_tag', $setting->labels_display_tag) }}" />
+                            <input name="labels_display_model" type="hidden" value="{{ old('labels_display_model', $setting->labels_display_model) }}" />
+                            <input name="labels_display_company_name" type="hidden" value="{{ old('labels_display_company_name', $setting->labels_display_company_name) }}" />
                         @else
                             <!-- Legacy settings -->
+                    <style>
+                        .checkbox label {
+                            padding-right: 40px;
+                        }
+                    </style>
+
+                    <!-- CSRF Token -->
+                    {{csrf_field()}}
+
                             <div class="form-group{{ $errors->has('labels_per_page') ? ' has-error' : '' }}">
                                 <div class="col-md-3 text-right">
-                                    {{ Form::label('labels_per_page', trans('admin/settings/general.labels_per_page'), ['class'=>'control-label']) }}
+                                    <label for="labels_per_page" class="control-label">{{ trans('admin/settings/general.labels_per_page') }}</label>
                                 </div>
                                 <div class="col-md-9">
-                                    {{ Form::text('labels_per_page', old('labels_per_page', $setting->labels_per_page), ['class' => 'form-control','style' => 'width: 100px;', 'aria-label'=>'labels_per_page']) }}
+                                    <input class="form-control" style="width: 100px;" aria-label="labels_per_page" name="labels_per_page" type="text" value="{{ old('labels_per_page', $setting->labels_per_page) }}" id="labels_per_page">
                                     {!! $errors->first('labels_per_page', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
                                 </div>
                             </div>
 
                             <div class="form-group{{ $errors->has('labels_fontsize') ? ' has-error' : '' }}">
                                 <div class="col-md-3 text-right">
-                                    {{ Form::label('labels_fontsize', trans('admin/settings/general.labels_fontsize'), ['class'=>'control-label']) }}
+                                    <label for="labels_fontsize" class="control-label">{{ trans('admin/settings/general.labels_fontsize') }}</label>
                                 </div>
                                 <div class="col-md-2">
                                     <div class="input-group">
-                                        {{ Form::text('labels_fontsize', old('labels_fontsize', $setting->labels_fontsize), ['class' => 'form-control', 'aria-label'=>'labels_fontsize']) }}
+                                        <input class="form-control" aria-label="labels_fontsize" name="labels_fontsize" type="text" value="{{ old('labels_fontsize', $setting->labels_fontsize) }}" id="labels_fontsize">
                                         <div class="input-group-addon">{{ trans('admin/settings/general.text_pt') }}</div>
                                     </div>
                                 </div>
@@ -287,39 +419,37 @@
 
                             <div class="form-group{{ $errors->has('labels_width') ? ' has-error' : '' }}">
                                 <div class="col-md-3 text-right">
-                                    {{ Form::label('labels_width', trans('admin/settings/general.label_dimensions'), ['class'=>'control-label']) }}
+                                    <label for="labels_width" class="control-label">{{ trans('admin/settings/general.label_dimensions') }}</label>
                                 </div>
                                 <div class="col-md-3">
                                     <div class="input-group">
-                                        {{ Form::text('labels_width', old('labels_width', $setting->labels_width), ['class' => 'form-control', 'aria-label'=>'labels_width']) }}
+                                        <input class="form-control" aria-label="labels_width" name="labels_width" type="text" value="{{ old('labels_width', $setting->labels_width) }}" id="labels_width">
                                         <div class="input-group-addon">{{ trans('admin/settings/general.width_w') }}</div>
                                     </div>
+                                    {!! $errors->first('labels_width', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
                                 </div>
                                 <div class="col-md-3">
                                     <div class="input-group">
-                                        {{ Form::text('labels_height', old('labels_height', $setting->labels_height), ['class' => 'form-control', 'aria-label'=>'labels_height']) }}
+                                        <input class="form-control" aria-label="labels_height" name="labels_height" type="text" value="{{ old('labels_height', $setting->labels_height) }}">
                                         <div class="input-group-addon">{{ trans('admin/settings/general.height_h') }}</div>
                                     </div>
-                                </div>
-                                <div class="col-md-9 col-md-offset-3">
-                                    {!! $errors->first('labels_width', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
                                     {!! $errors->first('labels_height', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
                                 </div>
                             </div>
 
                             <div class="form-group{{ $errors->has('labels_display_sgutter') ? ' has-error' : '' }}">
                                 <div class="col-md-3 text-right">
-                                    {{ Form::label('labels_display_sgutter', trans('admin/settings/general.label_gutters')) }}
+                                    <label for="labels_display_sgutter">{{ trans('admin/settings/general.label_gutters') }}</label>
                                 </div>
                                 <div class="col-md-3">
                                     <div class="input-group">
-                                        {{ Form::text('labels_display_sgutter', old('labels_display_sgutter', $setting->labels_display_sgutter), ['class' => 'form-control', 'aria-label'=>'labels_display_sgutter']) }}
+                                        <input class="form-control" aria-label="labels_display_sgutter" name="labels_display_sgutter" type="text" value="{{ old('labels_display_sgutter', $setting->labels_display_sgutter) }}" id="labels_display_sgutter">
                                         <div class="input-group-addon">{{ trans('admin/settings/general.horizontal') }}</div>
                                     </div>
                                 </div>
                                 <div class="col-md-3">
                                     <div class="input-group">
-                                        {{ Form::text('labels_display_bgutter', old('labels_display_bgutter', $setting->labels_display_bgutter), ['class' => 'form-control', 'aria-label'=>'labels_display_bgutter']) }}
+                                        <input class="form-control" aria-label="labels_display_bgutter" name="labels_display_bgutter" type="text" value="{{ old('labels_display_bgutter', $setting->labels_display_bgutter) }}">
                                         <div class="input-group-addon">{{ trans('admin/settings/general.vertical') }}</div>
                                     </div>
                                 </div>
@@ -331,48 +461,44 @@
 
                             <div class="form-group{{ $errors->has('labels_pmargin_top') ? ' has-error' : '' }}">
                                 <div class="col-md-3 text-right">
-                                    {{ Form::label('labels_pmargin_top', trans('admin/settings/general.page_padding')) }}
+                                    <label for="labels_pmargin_top">{{ trans('admin/settings/general.page_padding') }}</label>
                                 </div>
                                 <div class="col-md-3">
                                     <div class="input-group" style="margin-bottom: 15px;">
-                                        {{ Form::text('labels_pmargin_top', old('labels_pmargin_top', $setting->labels_pmargin_top), ['class' => 'form-control', 'aria-label'=>'labels_pmargin_top']) }}
+                                        <input class="form-control" aria-label="labels_pmargin_top" name="labels_pmargin_top" type="text" value="{{ old('labels_pmargin_top', $setting->labels_pmargin_top) }}" id="labels_pmargin_top">
                                         <div class="input-group-addon">{{ trans('admin/settings/general.top') }}</div>
                                     </div>
                                     <div class="input-group">
-                                        {{ Form::text('labels_pmargin_right', old('labels_pmargin_right', $setting->labels_pmargin_right), ['class' => 'form-control', 'aria-label'=>'labels_pmargin_right']) }}
+                                        <input class="form-control" aria-label="labels_pmargin_right" name="labels_pmargin_right" type="text" value="{{ old('labels_pmargin_right', $setting->labels_pmargin_right) }}">
                                         <div class="input-group-addon">{{ trans('admin/settings/general.right') }}</div>
                                     </div>
                                 </div>
                                 <div class="col-md-3" style="margin-left: 10px; ">
                                     <div class="input-group" style="margin-bottom: 15px;">
-                                        {{ Form::text('labels_pmargin_bottom', old('labels_pmargin_bottom', $setting->labels_pmargin_bottom), ['class' => 'form-control', 'aria-label'=>'labels_pmargin_bottom']) }}
+                                        <input class="form-control" aria-label="labels_pmargin_bottom" name="labels_pmargin_bottom" type="text" value="{{ old('labels_pmargin_bottom', $setting->labels_pmargin_bottom) }}">
                                         <div class="input-group-addon">{{ trans('admin/settings/general.bottom') }}</div>
                                     </div>
                                     <div class="input-group">
-                                        {{ Form::text('labels_pmargin_left', old('labels_pmargin_left', $setting->labels_pmargin_left), ['class' => 'form-control', 'aria-label'=>'labels_pmargin_left']) }}
+                                        <input class="form-control" aria-label="labels_pmargin_left" name="labels_pmargin_left" type="text" value="{{ old('labels_pmargin_left', $setting->labels_pmargin_left) }}">
                                         <div class="input-group-addon">{{ trans('admin/settings/general.left') }}</div>
                                     </div>
 
                                 </div>
-                                <div class="col-md-9 col-md-offset-3">
-                                    {!! $errors->first('labels_width', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
-                                    {!! $errors->first('labels_height', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
-                                </div>
                             </div>
 
                             <div class="form-group{{ (($errors->has('labels_pageheight')) || $errors->has('labels_pagewidth')) ? ' has-error' : '' }}">
                                 <div class="col-md-3 text-right">
-                                    {{ Form::label('labels_pagewidth', trans('admin/settings/general.page_dimensions'), ['class'=>'control-label']) }}
+                                    <label for="labels_pagewidth" class="control-label">{{ trans('admin/settings/general.page_dimensions') }}</label>
                                 </div>
                                 <div class="col-md-3">
                                     <div class="input-group">
-                                        {{ Form::text('labels_pagewidth', old('labels_pagewidth', $setting->labels_pagewidth), ['class' => 'form-control', 'aria-label'=>'labels_pagewidth']) }}
+                                        <input class="form-control" aria-label="labels_pagewidth" name="labels_pagewidth" type="text" value="{{ old('labels_pagewidth', $setting->labels_pagewidth) }}" id="labels_pagewidth">
                                         <div class="input-group-addon">{{ trans('admin/settings/general.width_w') }}</div>
                                     </div>
                                 </div>
                                 <div class="col-md-3 form-group" style="margin-left: 10px">
                                     <div class="input-group">
-                                        {{ Form::text('labels_pageheight', old('labels_pageheight', $setting->labels_pageheight), ['class' => 'form-control', 'aria-label'=>'labels_pageheight']) }}
+                                        <input class="form-control" aria-label="labels_pageheight" name="labels_pageheight" type="text" value="{{ old('labels_pageheight', $setting->labels_pageheight) }}">
                                         <div class="input-group-addon">{{ trans('admin/settings/general.height_h') }}</div>
                                     </div>
                                 </div>
@@ -385,27 +511,27 @@
                         @if(!$setting->label2_enable)
                             <div class="form-group">
                                 <div class="col-md-3 text-right">
-                                {{ Form::label('labels_display', trans('admin/settings/general.label_fields'), ['class' => 'control-label']) }}
+                                    <label for="labels_display" class="control-label">{{ trans('admin/settings/general.label_fields') }}</label>
                                 </div>
                                 <div class="col-md-9">
                                         <label class="form-control">
-                                            {{ Form::checkbox('labels_display_name', '1', old('labels_display_name',   $setting->labels_display_name),['class' => 'minimal', 'aria-label'=>'labels_display_name']) }}
+                                            <input type="checkbox" name="labels_display_name" value="1" @checked(old('labels_display_name',   $setting->labels_display_name)) aria-label="labels_display_name" />
                                             {{ trans('admin/hardware/form.name') }}
                                         </label>
                                         <label class="form-control">
-                                            {{ Form::checkbox('labels_display_serial', '1', old('labels_display_serial',   $setting->labels_display_serial),['class' => 'minimal', 'aria-label'=>'labels_display_serial']) }}
+                                            <input type="checkbox" name="labels_display_serial" value="1" @checked(old('labels_display_serial',   $setting->labels_display_serial)) aria-label="labels_display_serial" />
                                             {{ trans('admin/hardware/form.serial') }}
                                         </label>
                                         <label class="form-control">
-                                            {{ Form::checkbox('labels_display_tag', '1', old('labels_display_tag',   $setting->labels_display_tag),['class' => 'minimal', 'aria-label'=>'labels_display_tag']) }}
+                                            <input type="checkbox" name="labels_display_tag" value="1" @checked(old('labels_display_tag',   $setting->labels_display_tag)) aria-label="labels_display_tag" />
                                             {{ trans('admin/hardware/form.tag') }}
                                         </label>
                                         <label class="form-control">
-                                            {{ Form::checkbox('labels_display_model', '1', old('labels_display_model',   $setting->labels_display_model),['class' => 'minimal', 'aria-label'=>'labels_display_model']) }}
+                                            <input type="checkbox" name="labels_display_model" value="1" @checked(old('labels_display_model',   $setting->labels_display_model)) aria-label="labels_display_model" />
                                             {{ trans('admin/hardware/form.model') }}
                                         </label>
                                         <label class="form-control">
-                                            {{ Form::checkbox('labels_display_company_name', '1', old('labels_display_company_name',   $setting->labels_display_company_name),['class' => 'minimal', 'aria-label'=>'labels_display_company_name']) }}
+                                            <input type="checkbox" name="labels_display_company_name" value="1" @checked(old('labels_display_company_name',   $setting->labels_display_company_name)) aria-label="labels_display_company_name"/>
                                             {{ trans('admin/companies/table.name') }}
                                         </label>
                                 </div> <!--/.col-md-9-->
@@ -419,7 +545,7 @@
                         <a class="btn btn-link text-left" href="{{ route('settings.index') }}">{{ trans('button.cancel') }}</a>
                     </div>
                     <div class="text-right col-md-6">
-                        <button type="submit" class="btn btn-primary"><i class="fas fa-check icon-white" aria-hidden="true"></i> {{ trans('general.save') }}</button>
+                        <button type="submit" class="btn btn-primary"><x-icon type="checkmark" /> {{ trans('general.save') }}</button>
                     </div>
 
                 </div>
@@ -427,11 +553,64 @@
         </div> <!-- /.col-md-8-->
     </div> <!-- /.row-->
 
-    {{Form::close()}}
+    </form>
 
 @stop
 
 @push('js')
+    <script nonce="{{ csrf_token() }}">
+        // Delete barcodes
+        $("#purgebarcodes").click(function(){
+            $("#purgebarcodesrow").removeClass('text-success');
+            $("#purgebarcodesrow").removeClass('text-danger');
+            $("#purgebarcodesicon").html('');
+            $("#purgebarcodesstatus").html('');
+            $('#purgebarcodesstatus-error').html('');
+            $("#purgebarcodesicon").html('<i class="fas fa-spinner spin"></i> {{ trans('admin/settings/general.barcodes_spinner') }}');
+            $.ajax({
+                url: '{{ route('api.settings.purgebarcodes') }}',
+                type: 'POST',
+                headers: {
+                    "X-Requested-With": 'XMLHttpRequest',
+                    "X-CSRF-TOKEN": $('meta[name="csrf-token"]').attr('content')
+                },
+                data: {},
+                dataType: 'json',
+
+                success: function (data) {
+                    console.dir(data);
+                    $("#purgebarcodesicon").html('');
+                    $("#purgebarcodesstatus").html('');
+                    $('#purgebarcodesstatus-error').html('');
+                    $("#purgebarcodesstatus").removeClass('text-danger');
+                    $("#purgebarcodesstatus").addClass('text-success');
+                    if (data.message) {
+                        $("#purgebarcodesstatus").html('<i class="fas fa-check text-success"></i> ' + data.message);
+                    }
+                },
+
+                error: function (data) {
+
+                    $("#purgebarcodesicon").html('');
+                    $("#purgebarcodesstatus").html('');
+                    $('#purgebarcodesstatus-error').html('');
+                    $("#purgebarcodesstatus").removeClass('text-success');
+                    $("#purgebarcodesstatus").addClass('text-danger');
+                    $("#purgebarcodesicon").html('<i class="fas fa-exclamation-triangle text-danger"></i>');
+                    $('#purgebarcodesstatus').html('Files could not be deleted.');
+                    if (data.responseJSON) {
+                        $('#purgebarcodesstatus-error').html('Error: ' + data.responseJSON.messages);
+                    } else {
+                        console.dir(data);
+                    }
+
+                }
+
+
+            });
+        });
+
+    </script>
     {{-- Can't use @script here because we're not in a livewire component so let's manually load --}}
     @livewireScripts
 @endpush
diff --git a/resources/views/settings/ldap.blade.php b/resources/views/settings/ldap.blade.php
index 60a54a1ed1..27e6a20dea 100644
--- a/resources/views/settings/ldap.blade.php
+++ b/resources/views/settings/ldap.blade.php
@@ -2,7 +2,7 @@
 
 {{-- Page title --}}
 @section('title')
-    Update LDAP/AD Settings
+    {{ trans('admin/settings/general.ldap_ad') }}
     @parent
 @stop
 
@@ -42,12 +42,11 @@
 
     @endif
 
-
-    {{ Form::open(['method' => 'POST', 'files' => false, 'autocomplete' => 'off', 'class' => 'form-horizontal', 'role' => 'form']) }}
+    <form method="POST"  action="{{ route('settings.ldap.save') }}" autocomplete="off" class="form-horizontal" role="form" id="create-form">
     <!-- CSRF Token -->
     {{csrf_field()}}
 
-    <input type="hidden" name="username" value="{{ Request::old('username', $user->username) }}">
+    <input type="hidden" name="username" value="{{ old('username', $user->username) }}">
 
     <!-- this is a hack to prevent Chrome from trying to autocomplete fields -->
     <input type="text" name="prevent_autofill" id="prevent_autofill" value="" style="display:none;" />
@@ -60,8 +59,9 @@
             <div class="panel box box-default">
                 <div class="box-header with-border">
                     <h2 class="box-title">
-                        <i class="fas fa-sitemap"></i> {{ trans('admin/settings/general.ldap_ad') }}
-                    </h4>
+                        <x-icon type="ldap"/>
+                        {{ trans('admin/settings/general.ldap_ad') }}
+                    </h2>
                 </div>
                 <div class="box-body">
 
@@ -70,16 +70,20 @@
                         <!-- Enable LDAP -->
                         <div class="form-group {{ $errors->has('ldap_integration') ? 'error' : '' }}">
                             <div class="col-md-3">
-                                {{ Form::label('ldap_enabled', trans('admin/settings/general.ldap_integration')) }}
+                                <label for="ldap_enabled">{{ trans('admin/settings/general.ldap_integration') }}</label>
                             </div>
                             <div class="col-md-8">
 
                                 <label class="form-control">
-                                    {{ Form::checkbox('ldap_enabled', '1', old('ldap_enabled', $setting->ldap_enabled), [((config('app.lock_passwords')===true)) ? 'disabled ': '', 'class' => 'form-control '. $setting->demoMode, $setting->demoMode]) }}
+                                    <input type="checkbox" name="ldap_enabled" value="1" id="ldap_enabled" @checked(old('ldap_enabled', $setting->ldap_enabled)) />
                                 {{ trans('admin/settings/general.ldap_enabled') }}
                                 </label>
+
                                 @if (config('app.lock_passwords')===true)
-                                    <p class="text-warning"><i class="fas fa-lock" aria-hidden="true"></i> {{ trans('general.feature_disabled') }}</p>
+                                    <p class="text-warning">
+                                        <x-icon type="locked" />
+                                        {{ trans('general.feature_disabled') }}
+                                    </p>
                                 @endif
                             </div>
                         </div>
@@ -88,17 +92,25 @@
                         <!-- AD Flag -->
                         <div class="form-group">
                             <div class="col-md-3">
-                                {{ Form::label('is_ad', trans('admin/settings/general.ad')) }}
+                                <label for="is_ad">{{ trans('admin/settings/general.ad') }}</label>
                             </div>
                             <div class="col-md-8">
                                 <label class="form-control">
-                                {{ Form::checkbox('is_ad', '1', Request::old('is_ad', $setting->is_ad), [((config('app.lock_passwords')===true)) ? 'disabled ': '', 'class' => 'minimal '. $setting->demoMode, $setting->demoMode]) }}
+                                    <input type="checkbox" name="is_ad" value="1" id="is_ad" @checked(old('is_ad', $setting->is_ad))/>
                                 {{ trans('admin/settings/general.is_ad') }}
                                 </label>
-                                {!! $errors->first('is_ad', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
+                                @error('is_ad')
+                                    <span class="alert-msg">
+                                         <x-icon type="x" />
+                                        {{ $message }}
+                                    </span>
+                                @enderror
 
                                 @if (config('app.lock_passwords')===true)
-                                    <p class="text-warning"><i class="fas fa-lock" aria-hidden="true"></i> {{ trans('general.feature_disabled') }}</p>
+                                    <p class="text-warning">
+                                        <x-icon type="locked" />
+                                        {{ trans('general.feature_disabled') }}
+                                    </p>
                                 @endif
                             </div>
                         </div>
@@ -106,18 +118,27 @@
                         <!-- LDAP Password Sync -->
                         <div class="form-group">
                             <div class="col-md-3">
-                                {{ Form::label('ldap_pw_sync', trans('admin/settings/general.ldap_pw_sync')) }}
+                                <label for="ldap_pw_sync">{{ trans('admin/settings/general.ldap_pw_sync') }}</label>
                             </div>
                             <div class="col-md-8">
                                 <label class="form-control">
-                                {{ Form::checkbox('ldap_pw_sync', '1', Request::old('ldap_pw_sync', $setting->ldap_pw_sync), [((config('app.lock_passwords')===true)) ? 'disabled ': '', 'class' => 'minimal '. $setting->demoMode, $setting->demoMode]) }}
+                                    <input type="checkbox" name="ldap_pw_sync" value="1" id="ldap_pw_sync" @checked(old('ldap_pw_sync', $setting->ldap_pw_sync)) />
                                 {{ trans('general.yes') }}
                                 </label>
 
                                 <p class="help-block">{{ trans('admin/settings/general.ldap_pw_sync_help') }}</p>
-                                {!! $errors->first('ldap_pw_sync_help', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
+                                @error('ldap_pw_sync')
+                                    <span class="alert-msg">
+                                         <x-icon type="x" />
+                                        {{ $message }}
+                                    </span>
+                                @enderror
+
                                 @if (config('app.lock_passwords')===true)
-                                    <p class="text-warning"><i class="fas fa-lock" aria-hidden="true"></i> {{ trans('general.feature_disabled') }}</p>
+                                    <p class="text-warning">
+                                        <x-icon type="locked" />
+                                        {{ trans('general.feature_disabled') }}
+                                    </p>
                                 @endif
 
                             </div>
@@ -126,45 +147,52 @@
                         <!-- AD Domain -->
                         <div class="form-group {{ $errors->has('ad_domain') ? 'error' : '' }}">
                             <div class="col-md-3">
-                                {{ Form::label('ad_domain', trans('admin/settings/general.ad_domain')) }}
+                                <label for="ad_domain">{{ trans('admin/settings/general.ad_domain') }}</label>
                             </div>
                             <div class="col-md-8">
-                                {{ Form::text('ad_domain', Request::old('ad_domain', $setting->ad_domain), ['class' => 'form-control','placeholder' => trans('general.example') .'example.com', $setting->demoMode]) }}
+                                <input class="form-control" placeholder="{{ trans('general.example') .'example.com' }}" name="ad_domain" type="text" id="ad_domain" value="{{ old('ad_domain', $setting->ad_domain) }}">
                                 <p class="help-block">{{ trans('admin/settings/general.ad_domain_help') }}</p>
-                                {!! $errors->first('ad_domain', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
+                                @error('ad_domain')
+                                    <span class="alert-msg">
+                                         <x-icon type="x" />
+                                        {{ $message }}
+                                    </span>
+                                @enderror
+
                                 @if (config('app.lock_passwords')===true)
-                                    <p class="text-warning"><i class="fas fa-lock" aria-hidden="true"></i> {{ trans('general.feature_disabled') }}</p>
+                                    <p class="text-warning">
+                                        <x-icon type="locked" />
+                                        {{ trans('general.feature_disabled') }}
+                                    </p>
                                 @endif
                             </div>
                         </div><!-- AD Domain -->
 
-                        {{-- NOTICE - this was a feature for AdLdap2-based LDAP syncing, and is already handled in 'classic' LDAP, so we now hide the checkbox (but haven't deleted the field) <!-- AD Append Domain -->
-                        <div class="form-group">
-                            <div class="col-md-3">
-                                {{ Form::label('ad_append_domain', trans('admin/settings/general.ad_append_domain_label')) }}
-                            </div>
-                            <div class="col-md-8">
-                                {{ Form::checkbox('ad_append_domain', '1', Request::old('ad_append_domain', $setting->ad_append_domain),['class' => 'minimal '. $setting->demoMode, $setting->demoMode]) }}
-                                {{ trans('admin/settings/general.ad_append_domain') }}
-                                <p class="help-block">{{ trans('admin/settings/general.ad_append_domain_help') }}</p>
-                                {!! $errors->first('ad_append_domain', '<span class="alert-msg">:message</span>') !!}
-                                @if (config('app.lock_passwords')===true)
-                                    <p class="text-warning"><i class="fas fa-lock" aria-hidden="true"></i> {{ trans('general.feature_disabled') }}</p>
-                                @endif
-                            </div>
-                        </div> --}}
-
                         <!-- LDAP Client-Side TLS key -->
                         <div class="form-group {{ $errors->has('ldap_client_tls_key') ? 'error' : '' }}">
                             <div class="col-md-3">
-                                {{ Form::label('ldap_client_tls_key', trans('admin/settings/general.ldap_client_tls_key')) }}
+                                <label for="ldap_client_tls_key">
+                                    {{ trans('admin/settings/general.ldap_client_tls_key') }}
+                                </label>
                             </div>
                             <div class="col-md-8">
-                                {{ Form::textarea('ldap_client_tls_key', Request::old('ldap_client_tls_key', $setting->ldap_client_tls_key), ['class' => 'form-control','placeholder' =>  trans('general.example') .'-----BEGIN RSA PRIVATE KEY-----'."\r\n1234567890\r\n-----END RSA PRIVATE KEY-----
-", $setting->demoMode]) }}
-                                {!! $errors->first('ldap_client_tls_key', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
+                                <x-input.textarea
+                                    name="ldap_client_tls_key"
+                                    value="{{ old('ldap_client_tls_key', $setting->ldap_client_tls_key) }}"
+                                    :placeholder="sprintf('%s-----BEGIN RSA PRIVATE KEY-----%s1234567890%s-----END RSA PRIVATE KEY-----', trans('general.example'), PHP_EOL, PHP_EOL)"
+                                />
+                                @error('ldap_client_tls_key')
+                                    <span class="alert-msg">
+                                         <x-icon type="x" />
+                                        {{ $message }}
+                                    </span>
+                                @enderror
+
                                 @if (config('app.lock_passwords')===true)
-                                    <p class="text-warning"><i class="fas fa-lock" aria-hidden="true"></i> {{ trans('general.feature_disabled') }}</p>
+                                    <p class="text-warning">
+                                        <x-icon type="locked" />
+                                        {{ trans('general.feature_disabled') }}
+                                    </p>
                                 @endif
                             </div>
                         </div><!-- LDAP Client-Side TLS key -->
@@ -172,14 +200,27 @@
                         <!-- LDAP Client-Side TLS certificate -->
                         <div class="form-group {{ $errors->has('ldap_client_tls_cert') ? 'error' : '' }}">
                             <div class="col-md-3">
-                                {{ Form::label('ldap_client_tls_cert', trans('admin/settings/general.ldap_client_tls_cert')) }}
+                                <label for="ldap_client_tls_cert">{{ trans('admin/settings/general.ldap_client_tls_cert') }}</label>
                             </div>
                             <div class="col-md-8">
-                                {{ Form::textarea('ldap_client_tls_cert', Request::old('ldap_client_tls_cert', $setting->ldap_client_tls_cert), ['class' => 'form-control','placeholder' =>  trans('general.example') .'-----BEGIN CERTIFICATE-----'."\r\n1234567890\r\n-----END CERTIFICATE-----", $setting->demoMode]) }}
+                                <x-input.textarea
+                                    name="ldap_client_tls_cert"
+                                    value="{{ old('ldap_client_tls_cert', $setting->ldap_client_tls_cert) }}"
+                                    :placeholder="sprintf('%s-----BEGIN CERTIFICATE-----%s1234567890%s-----END CERTIFICATE-----', trans('general.example'), PHP_EOL, PHP_EOL)"
+                                />
                                 <p class="help-block">{{ trans('admin/settings/general.ldap_client_tls_cert_help') }}</p>
-                                {!! $errors->first('ldap_client_tls_cert', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
+                                @error('ldap_client_tls_cert')
+                                    <span class="alert-msg">
+                                       <x-icon type="x" />
+                                        {{ $message }}
+                                    </span>
+                                @enderror
+
                                 @if (config('app.lock_passwords')===true)
-                                    <p class="text-warning"><i class="fas fa-lock" aria-hidden="true"></i> {{ trans('general.feature_disabled') }}</p>
+                                    <p class="text-warning">
+                                        <x-icon type="locked" />
+                                        {{ trans('general.feature_disabled') }}
+                                    </p>
                                 @endif
                             </div>
                         </div><!-- LDAP Client-Side TLS certificate -->
@@ -187,14 +228,24 @@
                         <!-- LDAP Server -->
                         <div class="form-group {{ $errors->has('ldap_server') ? 'error' : '' }}">
                             <div class="col-md-3">
-                                {{ Form::label('ldap_server', trans('admin/settings/general.ldap_server')) }}
+                                <label for="ldap_server">{{ trans('admin/settings/general.ldap_server') }}</label>
                             </div>
                             <div class="col-md-8">
-                                {{ Form::text('ldap_server', Request::old('ldap_server', $setting->ldap_server), ['class' => 'form-control','placeholder' =>  trans('general.example') .'ldap://ldap.example.com', $setting->demoMode]) }}
+                                <input class="form-control" placeholder="{{ trans('general.example') .'ldap://ldap.example.com' }}" name="ldap_server" type="text" id="ldap_server" value="{{ old('ldap_server', $setting->ldap_server) }}">
+                                @error('ldap_server')
+                                    <span class="alert-msg">
+                                        <x-icon type="x" />
+                                        {{ $message }}
+                                    </span>
+                                @enderror
+
                                 <p class="help-block">{{ trans('admin/settings/general.ldap_server_help') }}</p>
-                                {!! $errors->first('ldap_server', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
+
                                 @if (config('app.lock_passwords')===true)
-                                    <p class="text-warning"><i class="fas fa-lock" aria-hidden="true"></i> {{ trans('general.feature_disabled') }}</p>
+                                    <p class="text-warning">
+                                        <x-icon type="locked" />
+                                        {{ trans('general.feature_disabled') }}
+                                    </p>
                                 @endif
                             </div>
                         </div><!-- LDAP Server -->
@@ -202,16 +253,25 @@
                         <!-- Start TLS -->
                         <div class="form-group">
                             <div class="col-md-3">
-                                {{ Form::label('ldap_tls', trans('admin/settings/general.ldap_tls')) }}
+                                <label for="ldap_tls">{{ trans('admin/settings/general.ldap_tls') }}</label>
                             </div>
                             <div class="col-md-8">
                                 <label class="form-control">
-                                    {{ Form::checkbox('ldap_tls', '1', Request::old('ldap_tls', $setting->ldap_tls),['class' => 'minimal '. $setting->demoMode, $setting->demoMode]) }}
+                                    <input type="checkbox" name="ldap_tls" value="1" id="ldap_tls" @checked(old('ldap_tls', $setting->ldap_tls)) />
                                     {{ trans('admin/settings/general.ldap_tls_help') }}
                                 </label>
-                                {!! $errors->first('ldap_tls', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
+                                @error('ldap_tls')
+                                    <span class="alert-msg">
+                                         <x-icon type="x" />
+                                        {{ $message }}
+                                    </span>
+                                @enderror
+
                                 @if (config('app.lock_passwords')===true)
-                                    <p class="text-warning"><i class="fas fa-lock" aria-hidden="true"></i> {{ trans('general.feature_disabled') }}</p>
+                                    <p class="text-warning">
+                                        <x-icon type="locked" />
+                                        {{ trans('general.feature_disabled') }}
+                                    </p>
                                 @endif
                             </div>
                         </div>
@@ -219,17 +279,28 @@
                         <!-- Ignore LDAP Certificate -->
                         <div class="form-group {{ $errors->has('ldap_server_cert_ignore') ? 'error' : '' }}">
                             <div class="col-md-3">
-                                {{ Form::label('ldap_server_cert_ignore', trans('admin/settings/general.ldap_server_cert')) }}
+                                <label for="ldap_server_cert_ignore">{{ trans('admin/settings/general.ldap_server_cert') }}</label>
                             </div>
                             <div class="col-md-8">
                                 <label class="form-control">
-                                    {{ Form::checkbox('ldap_server_cert_ignore', '1', Request::old('ldap_server_cert_ignore', $setting->ldap_server_cert_ignore),['class' => 'minimal '. $setting->demoMode, $setting->demoMode]) }}
+                                    <input type="checkbox" name="ldap_server_cert_ignore" value="1" id="ldap_server_cert_ignore" @checked(old('ldap_server_cert_ignore', $setting->ldap_server_cert_ignore)) />
                                     {{ trans('admin/settings/general.ldap_server_cert_ignore') }}
                                 </label>
-                                {!! $errors->first('ldap_server_cert_ignore', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
-                                <p class="help-block">{{ trans('admin/settings/general.ldap_server_cert_help') }}</p>
+                                @error('ldap_server_cert_ignore')
+                                    <span class="alert-msg">
+                                         <x-icon type="x" />
+                                        {{ $message }}
+                                    </span>
+                                @enderror
+
+                                <p class="help-block">
+                                    {{ trans('admin/settings/general.ldap_server_cert_help') }}
+                                </p>
                                 @if (config('app.lock_passwords')===true)
-                                    <p class="text-warning"><i class="fas fa-lock" aria-hidden="true"></i> {{ trans('general.feature_disabled') }}</p>
+                                    <p class="text-warning">
+                                        <x-icon type="locked" />
+                                        {{ trans('general.feature_disabled') }}
+                                    </p>
                                 @endif
                             </div>
                         </div>
@@ -237,13 +308,22 @@
                         <!-- LDAP Username -->
                         <div class="form-group {{ $errors->has('ldap_uname') ? 'error' : '' }}">
                             <div class="col-md-3">
-                                {{ Form::label('ldap_uname', trans('admin/settings/general.ldap_uname')) }}
+                                <label for="ldap_uname">{{ trans('admin/settings/general.ldap_uname') }}</label>
                             </div>
                             <div class="col-md-8">
-                                {{ Form::text('ldap_uname', Request::old('ldap_uname', $setting->ldap_uname), ['class' => 'form-control','autocomplete' => 'off', 'placeholder' => trans('general.example') .'binduser@example.com', $setting->demoMode]) }}
-                                {!! $errors->first('ldap_uname', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
+                                <input class="form-control" autocomplete="off" placeholder="{{ trans('general.example') .'binduser@example.com' }}" name="ldap_uname" type="text" id="ldap_uname" value="{{ old('ldap_uname', $setting->ldap_uname) }}">
+                                @error('ldap_uname')
+                                    <span class="alert-msg">
+                                         <x-icon type="x" />
+                                        {{ $message }}
+                                    </span>
+                                @enderror
+
                                 @if (config('app.lock_passwords')===true)
-                                    <p class="text-warning"><i class="fas fa-lock" aria-hidden="true"></i> {{ trans('general.feature_disabled') }}</p>
+                                    <p class="text-warning">
+                                        <x-icon type="locked" />
+                                        {{ trans('general.feature_disabled') }}
+                                    </p>
                                 @endif
                             </div>
                         </div>
@@ -251,13 +331,22 @@
                         <!-- LDAP pword -->
                         <div class="form-group {{ $errors->has('ldap_pword') ? 'error' : '' }}">
                             <div class="col-md-3">
-                                {{ Form::label('ldap_pword', trans('admin/settings/general.ldap_pword')) }}
+                                <label for="ldap_pword">{{ trans('admin/settings/general.ldap_pword') }}</label>
                             </div>
                             <div class="col-md-8">
-                                {{ Form::password('ldap_pword', ['class' => 'form-control', 'autocomplete' => 'off', 'onfocus' => "this.removeAttribute('readonly');", $setting->demoMode, ' readonly']) }}
-                                {!! $errors->first('ldap_pword', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
+                                <input class="form-control" type="password" name="ldap_pword" id="ldap_pword" value="" autocomplete="off" onfocus="this.removeAttribute('readonly');" readonly>
+                                @error('ldap_pword')
+                                    <span class="alert-msg">
+                                         <x-icon type="x" />
+                                        {{ $message }}
+                                    </span>
+                                @enderror
+
                                 @if (config('app.lock_passwords')===true)
-                                    <p class="text-warning"><i class="fas fa-lock" aria-hidden="true"></i> {{ trans('general.feature_disabled') }}</p>
+                                    <p class="text-warning">
+                                        <x-icon type="locked" />
+                                        {{ trans('general.feature_disabled') }}
+                                    </p>
                                 @endif
                             </div>
                         </div>
@@ -265,13 +354,22 @@
                         <!-- LDAP basedn -->
                         <div class="form-group {{ $errors->has('ldap_basedn') ? 'error' : '' }}">
                             <div class="col-md-3">
-                                {{ Form::label('ldap_basedn', trans('admin/settings/general.ldap_basedn')) }}
+                                <label for="ldap_basedn">{{ trans('admin/settings/general.ldap_basedn') }}</label>
                             </div>
                             <div class="col-md-8">
-                                {{ Form::text('ldap_basedn', Request::old('ldap_basedn', $setting->ldap_basedn), ['class' => 'form-control', 'placeholder' => trans('general.example') .'cn=users/authorized,dc=example,dc=com', $setting->demoMode]) }}
-                                {!! $errors->first('ldap_basedn', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
+                                <input class="form-control" placeholder="{{ trans('general.example') .'cn=users/authorized,dc=example,dc=com' }}" name="ldap_basedn" type="text" id="ldap_basedn" value="{{ old('ldap_basedn', $setting->ldap_basedn) }}">
+                                @error('ldap_basedn')
+                                    <span class="alert-msg">
+                                        <x-icon type="x" />
+                                        {{ $message }}
+                                    </span>
+                                @enderror
+
                                 @if (config('app.lock_passwords')===true)
-                                    <p class="text-warning"><i class="fas fa-lock" aria-hidden="true"></i> {{ trans('general.feature_disabled') }}</p>
+                                    <p class="text-warning">
+                                        <x-icon type="locked" />
+                                        {{ trans('general.feature_disabled') }}
+                                    </p>
                                 @endif
                             </div>
                         </div>
@@ -279,13 +377,22 @@
                         <!-- LDAP filter -->
                         <div class="form-group {{ $errors->has('ldap_filter') ? 'error' : '' }}">
                             <div class="col-md-3">
-                                {{ Form::label('ldap_filter', trans('admin/settings/general.ldap_filter')) }}
+                                <label for="ldap_filter">{{ trans('admin/settings/general.ldap_filter') }}</label>
                             </div>
                             <div class="col-md-8">
-                                {{ Form::text('ldap_filter', Request::old('ldap_filter', $setting->ldap_filter), ['class' => 'form-control','placeholder' => trans('general.example') .'&(cn=*)', $setting->demoMode]) }}
-                                {!! $errors->first('ldap_filter', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
+                                <input type="text" name="ldap_filter" id="ldap_filter" value="{{  old('ldap_filter', $setting->ldap_filter) }}" class="form-control" placeholder="{{  trans('general.example') .'&(cn=*)' }}">
+                                @error('ldap_filter')
+                                    <span class="alert-msg">
+                                        <x-icon type="x" />
+                                        {{ $message }}
+                                    </span>
+                                @enderror
+
                                 @if (config('app.lock_passwords')===true)
-                                    <p class="text-warning"><i class="fas fa-lock" aria-hidden="true"></i> {{ trans('general.feature_disabled') }}</p>
+                                    <p class="text-warning">
+                                        <x-icon type="locked" />
+                                        {{ trans('general.feature_disabled') }}
+                                    </p>
                                 @endif
                             </div>
                         </div>
@@ -293,13 +400,22 @@
                         <!-- LDAP  username field-->
                         <div class="form-group {{ $errors->has('ldap_username_field') ? 'error' : '' }}">
                             <div class="col-md-3">
-                                {{ Form::label('ldap_username_field', trans('admin/settings/general.ldap_username_field')) }}
+                                <label for="ldap_username_field">{{ trans('admin/settings/general.ldap_username_field') }}</label>
                             </div>
                             <div class="col-md-8">
-                                {{ Form::text('ldap_username_field', Request::old('ldap_username_field', $setting->ldap_username_field), ['class' => 'form-control','placeholder' => trans('general.example') .'samaccountname', $setting->demoMode]) }}
-                                {!! $errors->first('ldap_username_field', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
+                                <input type="text" name="ldap_username_field" id="ldap_username_field" value="{{  old('ldap_username_field', $setting->ldap_username_field) }}" class="form-control" placeholder="{{  trans('general.example') .'samaccountname' }}">
+                                @error('ldap_username_field')
+                                    <span class="alert-msg">
+                                        <x-icon type="x" />
+                                        {!! $message !!}
+                                    </span>
+                                @enderror
+
                                 @if (config('app.lock_passwords')===true)
-                                    <p class="text-warning"><i class="fas fa-lock" aria-hidden="true"></i> {{ trans('general.feature_disabled') }}</p>
+                                    <p class="text-warning">
+                                        <x-icon type="locked" />
+                                        {{ trans('general.feature_disabled') }}
+                                    </p>
                                 @endif
                             </div>
                         </div>
@@ -307,13 +423,22 @@
                         <!-- LDAP Last Name Field -->
                         <div class="form-group {{ $errors->has('ldap_lname_field') ? 'error' : '' }}">
                             <div class="col-md-3">
-                                {{ Form::label('ldap_lname_field', trans('admin/settings/general.ldap_lname_field')) }}
+                                <label for="ldap_lname_field">{{ trans('admin/settings/general.ldap_lname_field') }}</label>
                             </div>
                             <div class="col-md-8">
-                                {{ Form::text('ldap_lname_field', Request::old('ldap_lname_field', $setting->ldap_lname_field), ['class' => 'form-control','placeholder' => trans('general.example') .'sn', $setting->demoMode]) }}
-                                {!! $errors->first('ldap_lname_field', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
+                                <input type="text" name="ldap_lname_field" id="ldap_lname_field" value="{{  old('ldap_lname_field', $setting->ldap_lname_field) }}" class="form-control" placeholder="{{  trans('general.example') .'sn' }}">
+                                @error('ldap_lname_field')
+                                    <span class="alert-msg">
+                                        <x-icon type="x" />
+                                        {{ $message }}
+                                    </span>
+                                @enderror
+
                                 @if (config('app.lock_passwords')===true)
-                                    <p class="text-warning"><i class="fas fa-lock" aria-hidden="true"></i> {{ trans('general.feature_disabled') }}</p>
+                                    <p class="text-warning">
+                                        <x-icon type="locked" />
+                                        {{ trans('general.feature_disabled') }}
+                                    </p>
                                 @endif
                             </div>
                         </div>
@@ -321,13 +446,22 @@
                         <!-- LDAP First Name field -->
                         <div class="form-group {{ $errors->has('ldap_fname_field') ? 'error' : '' }}">
                             <div class="col-md-3">
-                                {{ Form::label('ldap_fname_field', trans('admin/settings/general.ldap_fname_field')) }}
+                                <label for="ldap_fname_field">{{ trans('admin/settings/general.ldap_fname_field') }}</label>
                             </div>
                             <div class="col-md-8">
-                                {{ Form::text('ldap_fname_field', Request::old('ldap_fname_field', $setting->ldap_fname_field), ['class' => 'form-control', 'placeholder' => trans('general.example') .'givenname', $setting->demoMode]) }}
-                                {!! $errors->first('ldap_fname_field', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
+                                <input type="text" name="ldap_fname_field" id="ldap_fname_field" value="{{  old('ldap_fname_field', $setting->ldap_fname_field) }}" class="form-control" placeholder="{{ trans('general.example') .'givenname'  }}">
+                                @error('ldap_fname_field')
+                                    <span class="alert-msg">
+                                        <x-icon type="x" />
+                                        {{ $message }}
+                                    </span>
+                                @enderror
+
                                 @if (config('app.lock_passwords')===true)
-                                    <p class="text-warning"><i class="fas fa-lock" aria-hidden="true"></i> {{ trans('general.feature_disabled') }}</p>
+                                    <p class="text-warning">
+                                        <x-icon type="locked" />
+                                        {{ trans('general.feature_disabled') }}
+                                    </p>
                                 @endif
                             </div>
                         </div>
@@ -335,13 +469,23 @@
                         <!-- LDAP Auth Filter Query -->
                         <div class="form-group {{ $errors->has('ldap_auth_filter_query') ? 'error' : '' }}">
                             <div class="col-md-3">
-                                {{ Form::label('ldap_auth_filter_query', trans('admin/settings/general.ldap_auth_filter_query')) }}
+                                <label for="ldap_auth_filter_query">{{ trans('admin/settings/general.ldap_auth_filter_query') }}</label>
                             </div>
                             <div class="col-md-8">
-                                {{ Form::text('ldap_auth_filter_query', Request::old('ldap_auth_filter_query', $setting->ldap_auth_filter_query), ['class' => 'form-control','placeholder' => trans('general.example') .'uid=', $setting->demoMode]) }}
-                                {!! $errors->first('ldap_auth_filter_query', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
+
+                                <input type="text" name="ldap_auth_filter_query" id="ldap_auth_filter_query" value="{{  old('ldap_auth_filter_query', $setting->ldap_auth_filter_query) }}" class="form-control" placeholder="{{ trans('general.example') .'uid='  }}">
+                                @error('ldap_auth_filter_query')
+                                    <span class="alert-msg">
+                                        <x-icon type="x" />
+                                        {!! $message !!}
+                                    </span>
+                                @enderror
+
                                 @if (config('app.lock_passwords')===true)
-                                    <p class="text-warning"><i class="fas fa-lock" aria-hidden="true"></i> {{ trans('general.feature_disabled') }}</p>
+                                    <p class="text-warning">
+                                        <x-icon type="locked" />
+                                        {{ trans('general.feature_disabled') }}
+                                    </p>
                                 @endif
                             </div>
                         </div>
@@ -350,7 +494,7 @@
 
                         <div class="form-group{{ $errors->has('group') ? ' has-error' : '' }}">
                             <div class="col-md-3">
-                                {{ Form::label('ldap_default_group', trans('admin/settings/general.ldap_default_group')) }}
+                                <label for="ldap_default_group">{{ trans('admin/settings/general.ldap_default_group') }}</label>
                             </div>
 
                             <div class="col-md-8">
@@ -363,7 +507,6 @@
                                             @endforeach
                                         </ul>
 
-
                                         <span class="help-block">{{ trans('admin/users/general.group_memberships_helpblock') }}</span>
                                     @else
                                         <div class="controls">
@@ -382,7 +525,7 @@
                                         </div>
                                     @endif
                                 @else
-                                    <p>No groups have been created yet. Visit <code>Admin Settings > Permission Groups</code> to add one.</p>
+                                    <p>{!! trans('admin/settings/general.no_groups') !!}</p>
                                 @endif
 
                             </div>
@@ -391,56 +534,125 @@
                         <!-- LDAP active flag -->
                         <div class="form-group {{ $errors->has('ldap_active_flag') ? 'error' : '' }}">
                             <div class="col-md-3">
-                                {{ Form::label('ldap_active_flag', trans('admin/settings/general.ldap_active_flag')) }}
+                                <label for="ldap_active_flag">{{ trans('admin/settings/general.ldap_active_flag') }}</label>
                             </div>
                             <div class="col-md-8">
-                                {{ Form::text('ldap_active_flag', Request::old('ldap_active_flag', $setting->ldap_active_flag), ['class' => 'form-control', $setting->demoMode]) }}
-
+                                <input type="text" name="ldap_active_flag" id="ldap_active_flag" value="{{  old('ldap_active_flag', $setting->ldap_active_flag) }}" class="form-control">
                                 <p class="help-block">{!! trans('admin/settings/general.ldap_activated_flag_help') !!}</p>
 
-                                {!! $errors->first('ldap_active_flag', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
+                                @error('ldap_active_flag')
+                                    <span class="alert-msg">
+                                        <x-icon type="x" />
+                                        {{ $message }}
+                                    </span>
+                                @enderror
+
                                 @if (config('app.lock_passwords')===true)
-                                    <p class="text-warning"><i class="fas fa-lock" aria-hidden="true"></i> {{ trans('general.feature_disabled') }}</p>
+                                    <p class="text-warning">
+                                        <x-icon type="locked" />
+                                        {{ trans('general.feature_disabled') }}
+                                    </p>
                                 @endif
                             </div>
                         </div>
 
+                        <!-- LDAP invert active flag -->
+                        <div class="form-group">
+                            <div class="col-md-3">
+                                <label for="ldap_invert_active_flag">
+                                    {{ trans('admin/settings/general.ldap_invert_active_flag') }}
+                                </label>
+                            </div>
+                            <div class="col-md-8">
+                                <label class="form-control">
+                                    <input type="checkbox" name="ldap_invert_active_flag" value="1" id="ldap_invert_active_flag" @checked(old('ldap_invert_active_flag', $setting->ldap_invert_active_flag)) />
+                                    {{ trans('general.yes') }}
+                                </label>
+                                @error('ldap_invert_active_flag')
+                                <span class="alert-msg">
+                                         <x-icon type="x" />
+                                        {{ $message }}
+                                    </span>
+                                @enderror
+
+                                <p class="help-block">
+                                    {!! trans('admin/settings/general.ldap_invert_active_flag_help') !!}
+                                </p>
+
+                                @if (config('app.lock_passwords')===true)
+                                    <p class="text-warning">
+                                        <x-icon type="locked" />
+                                        {!! trans('general.feature_disabled') !!}
+                                    </p>
+                                @endif
+                            </div>
+
+                        </div>
+
                         <!-- LDAP emp number -->
                         <div class="form-group {{ $errors->has('ldap_emp_num') ? 'error' : '' }}">
                             <div class="col-md-3">
-                                {{ Form::label('ldap_emp_num', trans('admin/settings/general.ldap_emp_num')) }}
+                                <label for="ldap_emp_num">{{ trans('admin/settings/general.ldap_emp_num') }}</label>
                             </div>
                             <div class="col-md-8">
-                                {{ Form::text('ldap_emp_num', Request::old('ldap_emp_num', $setting->ldap_emp_num), ['class' => 'form-control','placeholder' => trans('general.example') .'employeenumber/employeeid', $setting->demoMode]) }}
-                                {!! $errors->first('ldap_emp_num', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
+                                <input class="form-control" placeholder="{{ trans('general.example') .'employeenumber/employeeid' }}" name="ldap_emp_num" type="text" id="ldap_emp_num" value="{{ old('ldap_emp_num', $setting->ldap_emp_num) }}">
+                                @error('ldap_emp_num')
+                                    <span class="alert-msg">
+                                        <x-icon type="x" />
+                                        {{ $message }}
+                                    </span>
+                                @enderror
+
                                 @if (config('app.lock_passwords')===true)
-                                    <p class="text-warning"><i class="fas fa-lock" aria-hidden="true"></i> {{ trans('general.feature_disabled') }}</p>
+                                    <p class="text-warning">
+                                        <x-icon type="locked" />
+                                        {{ trans('general.feature_disabled') }}
+                                    </p>
                                 @endif
                             </div>
                         </div>
                         <!-- LDAP department -->
                         <div class="form-group {{ $errors->has('ldap_dept') ? 'error' : '' }}">
                             <div class="col-md-3">
-                                {{ Form::label('ldap_dept', trans('admin/settings/general.ldap_dept')) }}
+                                <label for="ldap_dept">{{ trans('admin/settings/general.ldap_dept') }}</label>
                             </div>
                             <div class="col-md-8">
-                                {{ Form::text('ldap_dept', Request::old('ldap_dept', $setting->ldap_dept), ['class' => 'form-control','placeholder' => trans('general.example') .'department', $setting->demoMode]) }}
-                                {!! $errors->first('ldap_dept', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
+                                <input class="form-control" placeholder="{{ trans('general.example') .'department' }}" name="ldap_dept" type="text" id="ldap_dept" value="{{ old('ldap_dept', $setting->ldap_dept) }}">
+
+                                @error('ldap_dept')
+                                    <span class="alert-msg">
+                                        <x-icon type="x" />
+                                        {{ $message }}
+                                    </span>
+                                @enderror
+
                                 @if (config('app.lock_passwords')===true)
-                                    <p class="text-warning"><i class="fas fa-lock" aria-hidden="true"></i> {{ trans('general.feature_disabled') }}</p>
+                                    <p class="text-warning">
+                                        <x-icon type="locked" />
+                                        {{ trans('general.feature_disabled') }}
+                                    </p>
                                 @endif
                             </div>
                         </div>
                         <!-- LDAP Manager -->
                         <div class="form-group {{ $errors->has('ldap_dept') ? 'error' : '' }}">
                             <div class="col-md-3">
-                                {{ Form::label('ldap_dept', trans('admin/settings/general.ldap_manager')) }}
+                                <label for="ldap_manager">{{ trans('admin/settings/general.ldap_manager') }}</label>
                             </div>
                             <div class="col-md-8">
-                                {{ Form::text('ldap_manager', Request::old('ldap_manager', $setting->ldap_manager), ['class' => 'form-control','placeholder' => trans('general.example') .'manager', $setting->demoMode]) }}
-                                {!! $errors->first('ldap_manager', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
+                                <input class="form-control" placeholder=" {{ trans('general.example') .'manager' }}" name="ldap_manager" type="text" value="{{ old('ldap_manager', $setting->ldap_manager) }}">
+                                @error('ldap_manager')
+                                    <span class="alert-msg">
+                                        <x-icon type="x" />
+                                        {{ $message }}
+                                    </span>
+                                @enderror
+
                                 @if (config('app.lock_passwords')===true)
-                                    <p class="text-warning"><i class="fas fa-lock" aria-hidden="true"></i> {{ trans('general.feature_disabled') }}</p>
+                                    <p class="text-warning">
+                                        <x-icon type="locked" />
+                                        {{ trans('general.feature_disabled') }}
+                                    </p>
                                 @endif
                             </div>
                         </div>
@@ -448,13 +660,22 @@
                         <!-- LDAP email -->
                         <div class="form-group {{ $errors->has('ldap_email') ? 'error' : '' }}">
                             <div class="col-md-3">
-                                {{ Form::label('ldap_email', trans('admin/settings/general.ldap_email')) }}
+                                <label for="ldap_email">{{ trans('admin/settings/general.ldap_email') }}</label>
                             </div>
                             <div class="col-md-8">
-                                {{ Form::text('ldap_email', Request::old('ldap_email', $setting->ldap_email), ['class' => 'form-control','placeholder' => trans('general.example') .'mail', $setting->demoMode]) }}
-                                {!! $errors->first('ldap_email', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
+                                <input class="form-control" placeholder="{{ trans('general.example') .'mail' }}" name="ldap_email" type="text" id="ldap_email" value="{{ old('ldap_email', $setting->ldap_email) }}">
+                                @error('ldap_email')
+                                    <span class="alert-msg">
+                                        <x-icon type="x" />
+                                        {{ $message }}
+                                    </span>
+                                @enderror
+
                                 @if (config('app.lock_passwords')===true)
-                                    <p class="text-warning"><i class="fas fa-lock" aria-hidden="true"></i> {{ trans('general.feature_disabled') }}</p>
+                                    <p class="text-warning">
+                                        <x-icon type="locked" />
+                                        {{ trans('general.feature_disabled') }}
+                                    </p>
                                 @endif
                             </div>
                         </div>
@@ -462,13 +683,22 @@
                         <!-- LDAP Phone -->
                         <div class="form-group {{ $errors->has('ldap_phone') ? 'error' : '' }}">
                             <div class="col-md-3">
-                                {{ Form::label('ldap_phone', trans('admin/settings/general.ldap_phone')) }}
+                                <label for="ldap_phone">{{ trans('admin/settings/general.ldap_phone') }}</label>
                             </div>
                             <div class="col-md-8">
-                                {{ Form::text('ldap_phone', Request::old('ldap_phone', $setting->ldap_phone_field), ['class' => 'form-control','placeholder' => trans('general.example') .'telephonenumber', $setting->demoMode]) }}
-                                {!! $errors->first('ldap_phone', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
+                                <input class="form-control" placeholder="{{ trans('general.example') .'telephonenumber' }}" name="ldap_phone" type="text" id="ldap_phone" value="{{ old('ldap_phone', $setting->ldap_phone_field) }}">
+                                @error('ldap_phone')
+                                    <span class="alert-msg">
+                                        <x-icon type="x" />
+                                        {{ $message }}
+                                    </span>
+                                @enderror
+
                                 @if (config('app.lock_passwords')===true)
-                                    <p class="text-warning"><i class="fas fa-lock" aria-hidden="true"></i> {{ trans('general.feature_disabled') }}</p>
+                                    <p class="text-warning">
+                                        <x-icon type="locked" />
+                                        {{ trans('general.feature_disabled') }}
+                                    </p>
                                 @endif
                             </div>
                         </div>
@@ -476,13 +706,22 @@
                         <!-- LDAP Job title -->
                         <div class="form-group {{ $errors->has('ldap_jobtitle') ? 'error' : '' }}">
                             <div class="col-md-3">
-                                {{ Form::label('ldap_jobtitle', trans('admin/settings/general.ldap_jobtitle')) }}
+                                <label for="ldap_jobtitle">{{ trans('admin/settings/general.ldap_jobtitle') }}</label>
                             </div>
                             <div class="col-md-8">
-                                {{ Form::text('ldap_jobtitle', Request::old('ldap_jobtitle', $setting->ldap_jobtitle), ['class' => 'form-control','placeholder' => trans('general.example') .'title', $setting->demoMode]) }}
-                                {!! $errors->first('ldap_jobtitle', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
+                                <input class="form-control" placeholder="{{ trans('general.example') .'title' }}" name="ldap_jobtitle" type="text" id="ldap_jobtitle" value="{{ old('ldap_jobtitle', $setting->ldap_jobtitle) }}">
+                                @error('ldap_jobtitle')
+                                    <span class="alert-msg">
+                                        <x-icon type="x" />
+                                        {{ $message }}
+                                    </span>
+                                @enderror
+
                                 @if (config('app.lock_passwords')===true)
-                                    <p class="text-warning"><i class="fas fa-lock" aria-hidden="true"></i> {{ trans('general.feature_disabled') }}</p>
+                                    <p class="text-warning">
+                                        <x-icon type="locked" />
+                                        {{ trans('general.feature_disabled') }}
+                                    </p>
                                 @endif
                             </div>
                         </div>
@@ -490,27 +729,45 @@
                         <!-- LDAP Country -->
                         <div class="form-group {{ $errors->has('ldap_country') ? 'error' : '' }}">
                             <div class="col-md-3">
-                                {{ Form::label('ldap_country', trans('admin/settings/general.ldap_country')) }}
+                                <label for="ldap_country">{{ trans('admin/settings/general.ldap_country') }}</label>
                             </div>
                             <div class="col-md-8">
-                                {{ Form::text('ldap_country', Request::old('ldap_country', $setting->ldap_country), ['class' => 'form-control','placeholder' => trans('general.example') .'c', $setting->demoMode]) }}
-                                {!! $errors->first('ldap_country', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
+                                <input class="form-control" placeholder="{{ trans('general.example') .'c' }}" name="ldap_country" type="text" id="ldap_country" value="{{ old('ldap_country', $setting->ldap_country) }}">
+                                @error('ldap_country')
+                                    <span class="alert-msg">
+                                        <x-icon type="x" />
+                                        {{ $message }}
+                                    </span>
+                                @enderror
+
                                 @if (config('app.lock_passwords')===true)
-                                    <p class="text-warning"><i class="fas fa-lock" aria-hidden="true"></i> {{ trans('general.feature_disabled') }}</p>
+                                    <p class="text-warning">
+                                        <x-icon type="locked" />
+                                        {{ trans('general.feature_disabled') }}
+                                    </p>
                                 @endif
                             </div>
                         </div>
                         <!-- LDAP Location -->
                         <div class="form-group {{ $errors->has('ldap_location') ? 'error' : '' }}">
                             <div class="col-md-3">
-                                {{ Form::label('ldap_location', trans('admin/settings/general.ldap_location')) }}
+                                <label for="ldap_location">{{ trans('admin/settings/general.ldap_location') }}</label>
                             </div>
                             <div class="col-md-8">
-                                {{ Form::text('ldap_location', Request::old('ldap_location', $setting->ldap_location), ['class' => 'form-control','placeholder' => trans('general.example') .'physicaldeliveryofficename', $setting->demoMode]) }}
+                                <input class="form-control" placeholder="{{ trans('general.example') .'physicaldeliveryofficename' }}" name="ldap_location" type="text" id="ldap_location" value="{{ old('ldap_location', $setting->ldap_location) }}">
                                 <p class="help-block">{!! trans('admin/settings/general.ldap_location_help') !!}</p>
-                                {!! $errors->first('ldap_location', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
+                                @error('ldap_location')
+                                    <span class="alert-msg">
+                                         <x-icon type="x" />
+                                        {{ $message }}
+                                    </span>
+                                @enderror
+
                                 @if (config('app.lock_passwords')===true)
-                                    <p class="text-warning"><i class="fas fa-lock" aria-hidden="true"></i> {{ trans('general.feature_disabled') }}</p>
+                                    <p class="text-warning">
+                                        <x-icon type="locked" />
+                                        {{ trans('general.feature_disabled') }}
+                                    </p>
                                 @endif
                             </div>
                         </div>
@@ -519,10 +776,10 @@
                             <!-- LDAP test -->
                             <div class="form-group">
                                 <div class="col-md-3">
-                                    {{ Form::label('test_ldap_sync', 'Test LDAP Sync') }}
+                                    <label for="test_ldap_sync"> {{trans('admin/settings/general.ldap_test_label')}} </label>
                                 </div>
                                 <div class="col-md-8" id="ldaptestrow">
-                                    <a {{ $setting->demoMode }} class="btn btn-default btn-sm" id="ldaptest" style="margin-right: 10px;">{{ trans('admin/settings/general.ldap_test_sync') }}</a>
+                                    <a class="btn btn-default btn-sm" id="ldaptest" style="margin-right: 10px;">{{ trans('admin/settings/general.ldap_test_sync') }}</a>
                                 </div>
                                 <div class="col-md-8 col-md-offset-3">
                                     <br />
@@ -531,7 +788,10 @@
                                 <div class="col-md-8 col-md-offset-3">
                                     <p class="help-block">{{ trans('admin/settings/general.ldap_login_sync_help') }}</p>
                                     @if (config('app.lock_passwords')===true)
-                                        <p class="text-warning"><i class="fas fa-lock" aria-hidden="true"></i> {{ trans('general.feature_disabled') }}</p>
+                                        <p class="text-warning">
+                                            <x-icon type="locked" />
+                                            {{ trans('general.feature_disabled') }}
+                                        </p>
                                     @endif
                                 </div>
 
@@ -540,15 +800,15 @@
                             <!-- LDAP Login test -->
                             <div class="form-group">
                                 <div class="col-md-3">
-                                    {{ Form::label('test_ldap_login', 'Test LDAP Login') }}
+                                    <label for="test_ldap_login"> {{trans('admin/settings/general.ldap_test_login')}} </label>
                                 </div>
                                 <div class="col-md-8">
                                     <div class="row">
                                     <div class="col-md-4">
-                                        <input type="text" name="ldaptest_user" id="ldaptest_user"  class="form-control" placeholder="LDAP username">
+                                        <input type="text" name="ldaptest_user" id="ldaptest_user"  class="form-control" placeholder="{{trans('admin/settings/general.ldap_username_placeholder')}}">
                                     </div>
                                     <div class="col-md-4">
-                                    <input type="password" name="ldaptest_password" id="ldaptest_password" class="form-control" placeholder="LDAP password" autocomplete="off" readonly onfocus="this.removeAttribute('readonly');">
+                                    <input type="password" name="ldaptest_password" id="ldaptest_password" class="form-control" placeholder="{{trans('admin/settings/general.ldap_password_placeholder')}}" autocomplete="off" readonly onfocus="this.removeAttribute('readonly');">
                                     </div>
                                     <div class="col-md-3">
                                         <a class="btn btn-default btn-sm" id="ldaptestlogin" style="margin-right: 10px;">{{ trans('admin/settings/general.ldap_test') }}</a>
@@ -574,14 +834,23 @@
                         <!-- LDAP Forgotten password -->
                         <div class="form-group {{ $errors->has('custom_forgot_pass_url') ? 'error' : '' }}">
                             <div class="col-md-3">
-                                {{ Form::label('custom_forgot_pass_url', trans('admin/settings/general.custom_forgot_pass_url')) }}
+                                <label for="custom_forgot_pass_url">{{ trans('admin/settings/general.custom_forgot_pass_url') }}</label>
                             </div>
                             <div class="col-md-8">
-                                {{ Form::text('custom_forgot_pass_url', Request::old('custom_forgot_pass_url', $setting->custom_forgot_pass_url), ['class' => 'form-control','placeholder' => trans('general.example') .'https://my.ldapserver-forgotpass.com', $setting->demoMode]) }}
+                                <input class="form-control" placeholder="{{ trans('general.example') .'https://my.ldapserver-forgotpass.com' }}" name="custom_forgot_pass_url" type="url" id="custom_forgot_pass_url" value="{{ old('custom_forgot_pass_url', $setting->custom_forgot_pass_url) }}">
                                 <p class="help-block">{{ trans('admin/settings/general.custom_forgot_pass_url_help') }}</p>
-                                {!! $errors->first('custom_forgot_pass_url', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
+                                @error('custom_forgot_pass_url')
+                                    <span class="alert-msg">
+                                        <x-icon type="x" />
+                                        {{ $message }}
+                                    </span>
+                                @enderror
+
                                 @if (config('app.lock_passwords')===true)
-                                    <p class="text-warning"><i class="fas fa-lock" aria-hidden="true"></i> {{ trans('general.feature_disabled') }}</p>
+                                    <p class="text-warning">
+                                        <x-icon type="locked" />
+                                        {{ trans('general.feature_disabled') }}
+                                    </p>
                                 @endif
                             </div>
                         </div><!-- LDAP Server -->
@@ -594,7 +863,7 @@
                         <a class="btn btn-link text-left" href="{{ route('settings.index') }}">{{ trans('button.cancel') }}</a>
                     </div>
                     <div class="text-right col-md-6">
-                        <button type="submit" class="btn btn-primary"><i class="fas fa-check icon-white" aria-hidden="true"></i> {{ trans('general.save') }}</button>
+                        <button type="submit" class="btn btn-primary"><x-icon type="checkmark" /> {{ trans('general.save') }}</button>
                     </div>
 
                 </div>
@@ -603,12 +872,13 @@
         </div> <!-- /.col-md-8-->
     </div> <!-- /.row-->
 
-    {{Form::close()}}
+    </form>
 
 
-@stop
+@endsection
 
 @push('js')
+
     <script nonce="{{ csrf_token() }}">
 
 
@@ -617,11 +887,58 @@
          * Check to see if is_ad is checked, if not disable the ad_domain field
          */
         $(function() {
-            if( $('#is_ad').prop('checked') === false) {
+
+            // If the app is locked, disable all fields except the top search fields
+            @if (config('app.lock_passwords') === true)
+                $("input").prop('disabled', 'disabled');
+                $("textarea").prop('disabled', 'disabled');
+                $("button").prop('disabled', 'disabled');
+                $("#tagSearch").removeAttr("disabled");
+                $("#search").removeAttr("disabled");
+                $("#topSearchButton").removeAttr("disabled");
+            @endif
+
+
+
+            if ($('#is_ad').prop('checked') === false) {
                 $('#ad_domain').prop('disabled', 'disabled');
-            } else {
-                //$('#ldap_server').prop('disabled', 'disabled');
+                $("#ad_domain").prop('required',false);
             }
+
+
+            // Mark fields as required if LDAP is enabled
+            if ($('#ldap_enabled').prop('checked') === false) {
+                $("#ldap_server").prop('required',false);
+                $("#ldap_auth_filter_query").prop('required',false);
+                $("#ldap_filter").prop('required',false);
+                $("#ldap_username_field").prop('required',false);
+                $("#ldap_uname").prop('required',false);
+                $("#ldap_pword").prop('required',false);
+                $("#ldap_basedn").prop('required',false);
+                $("#ldap_fname_field").prop('required',false);
+            }
+
+            $("#ldap_enabled").change(function() {
+
+                if (this.checked) {
+                    $("#ldap_server").prop('required',true);
+                    $("#ldap_auth_filter_query").prop('required',true);
+                    $("#ldap_filter").prop('required',true);
+                    $("#ldap_uname").prop('required',true);
+                    $("#ldap_username_field").prop('required',true);
+                    $("#ldap_pword").prop('required',true);
+                    $("#ldap_basedn").prop('required',true);
+                } else {
+                    $("#ldap_server").prop('required',false);
+                    $("#ldap_auth_filter_query").prop('required',false);
+                    $("#ldap_filter").prop('required',false);
+                    $("#ldap_username_field").prop('required',false);
+                    $("#ldap_pword").prop('required',false);
+                    $("#ldap_basedn").prop('required',false);
+                    $("#ldap_fname_field").prop('required',false);
+                }
+
+            });
         });
 
         $("#is_ad").change(function() {
@@ -648,7 +965,7 @@
         $("#ldaptest").click(function () {
             $("#ldapad_test_results").removeClass('hidden text-success text-danger');
             $("#ldapad_test_results").html('');
-            $("#ldapad_test_results").html('<i class="fas fa-spinner spin"></i> {{ trans('admin/settings/message.ldap.testing') }}');
+            $("#ldapad_test_results").html('<x-icon type="spinner" /> {{ trans('admin/settings/message.ldap.testing') }}');
             $.ajax({
                 url: '{{ route('api.settings.ldaptest') }}',
                 type: 'GET',
@@ -697,8 +1014,8 @@
          */
         function buildLdapTestResults(results) {
             let html = '<ul style="list-style: none;padding-left: 5px;">'
-            html += '<li class="text-success"><i class="fas fa-check" aria-hidden="true"></i> ' + results.login.message + ' </li>'
-            html += '<li class="text-success"><i class="fas fa-check" aria-hidden="true"></i> ' + results.bind.message + ' </li>'
+            html += '<li class="text-success"><i class="fas fa-check""></i> ' + results.login.message + ' </li>'
+            html += '<li class="text-success"><i class="fas fa-check""></i> ' + results.bind.message + ' </li>'
             html += '</ul>'
             html += '<div style="overflow:auto;">'
             html += '<div>{{ trans('admin/settings/message.ldap.sync_success') }}</div>'
@@ -737,12 +1054,13 @@
             return body;
         }
 
+
         $("#ldaptestlogin").click(function(){
             $("#ldaptestloginrow").removeClass('text-success');
             $("#ldaptestloginrow").removeClass('text-danger');
             $("#ldaptestloginstatus").removeClass('text-danger');
             $("#ldaptestloginstatus").html('');
-            $("#ldaptestloginicon").html('<i class="fas fa-spinner spin"></i> {{ trans('admin/settings/message.ldap.testing_authentication') }}');
+            $("#ldaptestloginicon").html('<x-icon type="spinner" /> {{ trans('admin/settings/message.ldap.testing_authentication') }}');
             $.ajax({
                 url: '{{ route('api.settings.ldaptestlogin') }}',
                 type: 'POST',
@@ -802,9 +1120,6 @@
                     }
                 }
 
-
-
-
             });
         });
     </script>
diff --git a/resources/views/settings/localization.blade.php b/resources/views/settings/localization.blade.php
index 4f800511f1..c358350cd6 100644
--- a/resources/views/settings/localization.blade.php
+++ b/resources/views/settings/localization.blade.php
@@ -21,7 +21,7 @@
     </style>
 
 
-    {{ Form::open(['method' => 'POST', 'files' => false, 'autocomplete' => 'off', 'class' => 'form-horizontal', 'role' => 'form' ]) }}
+    <form method="POST" action="{{ route('settings.localization.save') }}" accept-charset="UTF-8" autocomplete="off" class="form-horizontal" role="form">
     <!-- CSRF Token -->
     {{csrf_field()}}
 
@@ -32,7 +32,7 @@
             <div class="panel box box-default">
                 <div class="box-header with-border">
                     <h2 class="box-title">
-                        <i class="fas fa-globe-americas" aria-hidden="true"></i> {{ trans('admin/settings/general.localization') }}
+                        <x-icon type="globe-us" /> {{ trans('admin/settings/general.localization') }}
                     </h2>
                 </div>
                 <div class="box-body">
@@ -43,10 +43,10 @@
                         <!-- Language -->
                         <div class="form-group {{ $errors->has('site_name') ? 'error' : '' }}">
                             <div class="col-md-3 col-xs-12">
-                                {{ Form::label('site_name', trans('admin/settings/general.default_language')) }}
+                                <label for="site_name">{{ trans('admin/settings/general.default_language') }}</label>
                             </div>
                             <div class="col-md-5 col-xs-12">
-                                {!! Form::locales('locale', Request::old('locale', $setting->locale), 'select2') !!}
+                                <x-input.locale-select name="locale" :selected="old('locale', $setting->locale)" />
 
                                 {!! $errors->first('locale', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
                             </div>
@@ -55,10 +55,10 @@
                         <!-- name display format -->
                         <div class="form-group {{ $errors->has('name_display_format') ? 'error' : '' }}">
                             <div class="col-md-3 col-xs-12">
-                                {{ Form::label('name_display_format', trans('general.name_display_format')) }}
+                                <label for="name_display_format">{{ trans('general.name_display_format') }}</label>
                             </div>
                             <div class="col-md-5 col-xs-12">
-                                {!! Form::name_display_format('name_display_format', Request::old('name_display_format', $setting->name_display_format), 'select2') !!}
+                                {!! Form::name_display_format('name_display_format', old('name_display_format', $setting->name_display_format), 'select2') !!}
 
                                 {!! $errors->first('name_display_format', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
                             </div>
@@ -69,13 +69,13 @@
                         <!-- Date format -->
                         <div class="form-group {{ $errors->has('time_display_format') ? 'error' : '' }}">
                             <div class="col-md-3 col-xs-12">
-                                {{ Form::label('time_display_format', trans('general.time_and_date_display')) }}
+                                <label for="time_display_format">{{ trans('general.time_and_date_display') }}</label>
                             </div>
                             <div class="col-md-5 col-xs-12">
-                                {!! Form::date_display_format('date_display_format', Request::old('date_display_format', $setting->date_display_format), 'select2') !!}
+                                {!! Form::date_display_format('date_display_format', old('date_display_format', $setting->date_display_format), 'select2') !!}
                             </div>
                             <div class="col-md-3 col-xs-12">
-                                {!! Form::time_display_format('time_display_format', Request::old('time_display_format', $setting->time_display_format), 'select2') !!}
+                                {!! Form::time_display_format('time_display_format', old('time_display_format', $setting->time_display_format), 'select2') !!}
                             </div>
                             
                             {!! $errors->first('time_display_format', '<div class="col-md-9 col-md-offset-3"><span class="alert-msg" aria-hidden="true">:message</span> </div>') !!}
@@ -85,10 +85,19 @@
                         <!-- Currency -->
                         <div class="form-group {{ $errors->has('default_currency') ? 'error' : '' }}">
                             <div class="col-md-3 col-xs-12">
-                                {{ Form::label('default_currency', trans('admin/settings/general.default_currency')) }}
+                                <label for="default_currency">{{ trans('admin/settings/general.default_currency') }}</label>
                             </div>
                             <div class="col-md-9 col-xs-12">
-                                {{ Form::text('default_currency', old('default_currency', $setting->default_currency), array('class' => 'form-control select2-container','placeholder' => 'USD', 'maxlength'=>'3', 'style'=>'width: 60px; display: inline-block; ')) }}
+                                <input
+                                    class="form-control select2-container"
+                                    placeholder="USD"
+                                    maxlength="3"
+                                    style="width: 60px; display: inline-block; "
+                                    name="default_currency"
+                                    type="text"
+                                    value="{{ old('default_currency', $setting->default_currency) }}"
+                                    id="default_currency"
+                                >
 
                                 {!! Form::digit_separator('digit_separator', old('digit_separator', $setting->digit_separator), 'select2') !!}
 
@@ -105,7 +114,7 @@
                         <a class="btn btn-link text-left" href="{{ route('settings.index') }}">{{ trans('button.cancel') }}</a>
                     </div>
                     <div class="text-right col-md-6">
-                        <button type="submit" class="btn btn-primary"><i class="fas fa-check icon-white" aria-hidden="true"></i> {{ trans('general.save') }}</button>
+                        <button type="submit" class="btn btn-primary"><x-icon type="checkmark" /> {{ trans('general.save') }}</button>
                     </div>
 
                 </div>
@@ -113,7 +122,7 @@
         </div> <!-- /.col-md-8-->
     </div> <!-- /.row-->
 
-    {{Form::close()}}
+    </form>
 
 @stop
 
diff --git a/resources/views/settings/logins.blade.php b/resources/views/settings/logins.blade.php
index aedef4f84e..959392b638 100644
--- a/resources/views/settings/logins.blade.php
+++ b/resources/views/settings/logins.blade.php
@@ -2,7 +2,7 @@
 
 {{-- Page title --}}
 @section('title')
-    Attempted Logins
+    {{ trans('admin/settings/general.login') }}
     @parent
 @stop
 
diff --git a/resources/views/settings/purge-form.blade.php b/resources/views/settings/purge-form.blade.php
index f8e53dbde8..489d39112b 100644
--- a/resources/views/settings/purge-form.blade.php
+++ b/resources/views/settings/purge-form.blade.php
@@ -18,21 +18,23 @@
         <div class="col-md-8 col-md-offset-2">
             <div class="box box-solid box-danger">
                 <div class="box-header with-border">
-                    <h2 class="box-title"><i class="fas fa-exclamation-triangle"></i> {{ trans('admin/settings/general.purge') }}</h2>
+                    <h2 class="box-title">
+                        <x-icon type="warning"/>
+                        {{ trans('admin/settings/general.purge') }}</h2>
                 </div>
-            {{ Form::open(['method' => 'POST', 'files' => false, 'autocomplete' => 'off', 'class' => 'form-horizontal', 'role' => 'form' ]) }}
+                <form method="POST" action="{{ route('settings.purge.save') }}" accept-charset="UTF-8" autocomplete="off" class="form-horizontal" role="form">
             <!-- CSRF Token -->
                 {{csrf_field()}}
                 <div class="box-body">
                     <p>{{ trans('admin/settings/general.confirm_purge_help') }}</p>
                     <div class="col-md-3{{ $errors->has('confirm_purge') ? 'error' : '' }}">
-                        {{ Form::label('confirm_purge', trans('admin/settings/general.confirm_purge')) }}
+                        <label for="confirm_purge">{{ trans('admin/settings/general.confirm_purge') }}</label>
                     </div>
                     <div class="col-md-9{{ $errors->has('confirm_purge') ? 'error' : '' }}">
                         @if (config('app.lock_passwords')===true)
-                            {{ Form::text('confirm_purge', Request::old('confirm_purge'), array('class' => 'form-control', 'disabled'=>'true')) }}
+                            <input class="form-control" disabled="true" name="confirm_purge" type="text" id="confirm_purge" value="{{ old('confirm_purge') }}">
                         @else
-                            {{ Form::text('confirm_purge', Request::old('confirm_purge'), array('class' => 'form-control')) }}
+                            <input class="form-control" name="confirm_purge" type="text" id="confirm_purge" value="{{ old('confirm_purge') }}">
                         @endif
 
                         @if (config('app.lock_passwords')===true)
@@ -43,11 +45,9 @@
                 <div class="box-footer text-right">
                     <button type="submit" class="btn btn-danger" {{ (config('app.lock_passwords')===true) ? ' disabled' : '' }}>{{ trans('admin/settings/general.purge') }}</button>
                 </div> <!--/box-footer-->
-                {{ Form::close() }}
+                </form>
             </div> <!--/.box-solid-->
         </div><!-- /.col-md-8-->
     </div><!--/.row-->
 
-    {{Form::close()}}
-
 @stop
diff --git a/resources/views/settings/saml.blade.php b/resources/views/settings/saml.blade.php
index 020124af56..63625e5749 100644
--- a/resources/views/settings/saml.blade.php
+++ b/resources/views/settings/saml.blade.php
@@ -21,7 +21,7 @@
     </style>
 
 
-    {{ Form::open(['method' => 'POST', 'files' => false, 'autocomplete' => 'false', 'class' => 'form-horizontal', 'role' => 'form']) }}
+    <form method="POST" action="{{ route('settings.saml.save') }}" accept-charset="UTF-8" autocomplete="false" class="form-horizontal" role="form">
     <!-- CSRF Token -->
     {{csrf_field()}}
 
@@ -38,7 +38,8 @@
             <div class="panel box box-default">
                 <div class="box-header with-border">
                     <h2 class="box-title">
-                        <i class="fas fa-sign-in-alt"></i> {{ trans('admin/settings/general.saml') }}
+                        <x-icon type="saml"/>
+                         {{ trans('admin/settings/general.saml') }}
                     </h2>
                 </div>
                 <div class="box-body">
@@ -51,7 +52,7 @@
                             <div class="col-md-9">
 
                                 <label class="form-control{{ config('app.lock_passwords') === true ? ' form-control--disabled': '' }}">
-                                    {{ Form::checkbox('saml_enabled', '1', old('saml_enabled', $setting->saml_enabled), ['class' => config('app.lock_passwords') === true ? 'disabled ': '',  config('app.lock_passwords') === true ? 'disabled ': '', ]) }}
+                                    <input type="checkbox" name="saml_enabled" value="1" @checked(old('saml_enabled', $setting->saml_enabled)) @disabled(config('app.lock_passwords')) @class(['disabled' => config('app.lock_passwords')])/>
                                     {{ trans('admin/settings/general.saml_enabled') }}
                                 </label>
 
@@ -68,26 +69,31 @@
                                     <div class="col-md-9 col-md-offset-3">
                                     <!-- SAML SP Details -->
                                     <!-- SAML SP Entity ID -->
-                                    {{ Form::label('saml_sp_entitiyid', trans('admin/settings/general.saml_sp_entityid')) }}
-                                    {{ Form::text('saml_sp_entitiyid', config('app.url'), ['class' => 'form-control', 'readonly']) }}
+                                    <label for="saml_sp_entitiyid">{{ trans('admin/settings/general.saml_sp_entityid') }}</label>
+                                    <input class="form-control" readonly="" name="saml_sp_entitiyid" type="text" value="{{ config('app.url') }}" id="saml_sp_entitiyid">
                                     <br>
                                     <!-- SAML SP ACS -->
-                                    {{ Form::label('saml_sp_acs_url', trans('admin/settings/general.saml_sp_acs_url')) }}
-                                    {{ Form::text('saml_sp_acs_url', route('saml.acs'), ['class' => 'form-control', 'readonly']) }}
+                                    <label for="saml_sp_acs_url">{{ trans('admin/settings/general.saml_sp_acs_url') }}</label>
+                                    <input class="form-control" readonly="" name="saml_sp_acs_url" type="text" value="{{ route('saml.acs') }}" id="saml_sp_acs_url">
                                     <br>
                                     <!-- SAML SP SLS -->
-                                    {{ Form::label('saml_sp_sls_url', trans('admin/settings/general.saml_sp_sls_url')) }}
-                                    {{ Form::text('saml_sp_sls_url', route('saml.sls'), ['class' => 'form-control', 'readonly']) }}
+                                    <label for="saml_sp_sls_url">{{ trans('admin/settings/general.saml_sp_sls_url') }}</label>
+                                    <input class="form-control" readonly="" name="saml_sp_sls_url" type="text" value="{{ route('saml.sls') }}" id="saml_sp_sls_url">
                                     <br>
                                     <!-- SAML SP Certificate -->
                                     @if (!empty($setting->saml_sp_x509cert))
-                                        {{ Form::label('saml_sp_x509cert', trans('admin/settings/general.saml_sp_x509cert')) }}
-                                        {{ Form::textarea('saml_sp_x509cert', $setting->saml_sp_x509cert, ['class' => 'form-control', 'wrap' => 'off', 'readonly']) }}
+                                         <label for="saml_sp_x509cert">{{ trans('admin/settings/general.saml_sp_x509cert') }}</label>
+                                            <x-input.textarea
+                                                name="saml_sp_x509cert"
+                                                :value="$setting->saml_sp_x509cert"
+                                                wrap="off"
+                                                readonly
+                                            />
                                         <br>
                                     @endif
                                     <!-- SAML SP Metadata URL -->
-                                    {{ Form::label('saml_sp_metadata_url', trans('admin/settings/general.saml_sp_metadata_url')) }}
-                                    {{ Form::text('saml_sp_metadata_url', route('saml.metadata'), ['class' => 'form-control', 'readonly']) }}
+                                    <label for="saml_sp_metadata_url">{{ trans('admin/settings/general.saml_sp_metadata_url') }}</label>
+                                    <input class="form-control" readonly="" name="saml_sp_metadata_url" type="text" value="{{ route('saml.metadata') }}" id="saml_sp_metadata_url">
                                     <br>
                                     <p class="help-block">
                                         <a href="{{ route('saml.metadata') }}" target="_blank" class="btn btn-default" style="margin-right: 5px;">{{ trans('admin/settings/general.saml_download') }}</a>
@@ -102,10 +108,15 @@
                         <!-- SAML IdP Metadata -->
                         <div class="form-group {{ $errors->has('saml_idp_metadata') ? 'error' : '' }}">
                         <div class="col-md-3">
-                            {{ Form::label('saml_idp_metadata', trans('admin/settings/general.saml_idp_metadata')) }}
+                            <label for="saml_idp_metadata">{{ trans('admin/settings/general.saml_idp_metadata') }}</label>
                         </div>
                         <div class="col-md-9">
-                            {{ Form::textarea('saml_idp_metadata', old('saml_idp_metadata', $setting->saml_idp_metadata), ['class' => 'form-control','placeholder' => 'https://example.com/idp/metadata', 'wrap' => 'off', $setting->demoMode]) }}
+                            <x-input.textarea
+                                name="saml_idp_metadata"
+                                :value="old('saml_idp_metadata', $setting->saml_idp_metadata)"
+                                placeholder="https://example.com/idp/metadata"
+                                wrap="off"
+                            />
                             {!! $errors->first('saml_idp_metadata', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}<br>
                             <button type="button" class="btn btn-default" id="saml_idp_metadata_upload_btn" {{ $setting->demoMode }}>{{ trans('button.select_file') }}</button>
                             <input type="file" class="js-uploadFile" id="saml_idp_metadata_upload"
@@ -119,10 +130,10 @@
                         <!-- SAML Attribute Mapping Username -->
                         <div class="form-group {{ $errors->has('saml_attr_mapping_username') ? 'error' : '' }}">
                             <div class="col-md-3">
-                                {{ Form::label('saml_attr_mapping_username', trans('admin/settings/general.saml_attr_mapping_username')) }}
+                                <label for="saml_attr_mapping_username">{{ trans('admin/settings/general.saml_attr_mapping_username') }}</label>
                             </div>
                             <div class="col-md-9">
-                                {{ Form::text('saml_attr_mapping_username', old('saml_attr_mapping_username', $setting->saml_attr_mapping_username), ['class' => 'form-control','placeholder' => '', $setting->demoMode]) }}
+                                <input class="form-control" name="saml_attr_mapping_username" type="text" id="saml_attr_mapping_username" value="{{ old('saml_attr_mapping_username', $setting->saml_attr_mapping_username) }}">
                                 <p class="help-block">{{ trans('admin/settings/general.saml_attr_mapping_username_help') }}</p>
                                 {!! $errors->first('saml_attr_mapping_username', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
                             </div>
@@ -135,7 +146,7 @@
                             </div>
                             <div class="col-md-9">
                                 <label class="form-control{{ config('app.lock_passwords') === true ? ' form-control--disabled': '' }}">
-                                    {{ Form::checkbox('saml_forcelogin', '1', old('saml_forcelogin', $setting->saml_forcelogin),['class' =>  $setting->demoMode, $setting->demoMode]) }}
+                                    <input type="checkbox" name="saml_forcelogin" value="1" @checked(old('saml_forcelogin', $setting->saml_forcelogin)) @disabled(config('app.lock_passwords')) @class(['disabled' => config('app.lock_passwords')]) />
                                     {{ trans('admin/settings/general.saml_forcelogin') }}
                                 </label>
                                 <p class="help-block">{{ trans('admin/settings/general.saml_forcelogin_help') }}</p>
@@ -151,7 +162,7 @@
                             </div>
                             <div class="col-md-9">
                                 <label class="form-control{{ config('app.lock_passwords') === true ? ' form-control--disabled': '' }}">
-                                    {{ Form::checkbox('saml_slo', '1', old('saml_slo', $setting->saml_slo),['class' => 'minimal '. $setting->demoMode, $setting->demoMode]) }}
+                                    <input type="checkbox" name="saml_slo" value="1" @checked(old('saml_slo', $setting->saml_slo)) @disabled(config('app.lock_passwords')) @class(['minimal', 'disabled' => config('app.lock_passwords')])/>
                                     {{ trans('admin/settings/general.saml_slo') }}
                                 </label>
                                 <p class="help-block">{{ trans('admin/settings/general.saml_slo_help') }}</p>
@@ -162,10 +173,15 @@
                         <!-- SAML Custom Options -->
                         <div class="form-group {{ $errors->has('saml_custom_settings') ? 'error' : '' }}">
                         <div class="col-md-3">
-                            {{ Form::label('saml_custom_settings', trans('admin/settings/general.saml_custom_settings')) }}
+                            <label for="saml_custom_settings">{{ trans('admin/settings/general.saml_custom_settings') }}</label>
                         </div>
                         <div class="col-md-9">
-                            {{ Form::textarea('saml_custom_settings', old('saml_custom_settings', $setting->saml_custom_settings), ['class' => 'form-control','placeholder' => 'example.option=false&#13;&#10;sp_x509cert=file:///...&#13;&#10;sp_private_key=file:///', 'wrap' => 'off', $setting->demoMode]) }}
+                            <x-input.textarea
+                                name="saml_custom_settings"
+                                :value="old('saml_custom_settings', $setting->saml_custom_settings)"
+                                placeholder="example.option=false&#13;&#10;sp_x509cert=file:///...&#13;&#10;sp_private_key=file:///"
+                                wrap="off"
+                            />
                             <p class="help-block">{{ trans('admin/settings/general.saml_custom_settings_help') }}</p>
                             {!! $errors->first('saml_custom_settings', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
                         </div>
@@ -177,7 +193,7 @@
                         <a class="btn btn-link text-left" href="{{ route('settings.index') }}">{{ trans('button.cancel') }}</a>
                     </div>
                     <div class="text-right col-md-6">
-                        <button type="submit" class="btn btn-primary"{{ config('app.lock_passwords') === true ? ' disabled': '' }}><i class="fas fa-check icon-white" aria-hidden="true"></i> {{ trans('general.save') }}</button>
+                        <button type="submit" class="btn btn-primary"{{ config('app.lock_passwords') === true ? ' disabled': '' }}><x-icon type="checkmark" /> {{ trans('general.save') }}</button>
                     </div>
 
                 </div>
@@ -186,7 +202,7 @@
         </div> <!-- /.col-md-8-->
     </div> <!-- /.row-->
 
-    {{Form::close()}}
+    </form>
 
 
 @stop
diff --git a/resources/views/settings/security.blade.php b/resources/views/settings/security.blade.php
index f108683dc3..6c1b1ea69c 100644
--- a/resources/views/settings/security.blade.php
+++ b/resources/views/settings/security.blade.php
@@ -16,154 +16,177 @@
 
 
 
-    {{ Form::open(['method' => 'POST', 'files' => false, 'autocomplete' => 'off', 'class' => 'form-horizontal', 'role' => 'form' ]) }}
+    <form method="POST" autocomplete="off" class="form-horizontal" role="form" id="create-form">
+
     <!-- CSRF Token -->
-    {{csrf_field()}}
+    {{ csrf_field() }}
 
     <div class="row">
-        <div class="col-sm-10 col-sm-offset-1 col-md-8 col-md-offset-2">
+        <div class="col-sm-9 col-sm-offset-1 col-md-9 col-md-offset-2">
 
 
             <div class="panel box box-default">
                 <div class="box-header with-border">
                     <h2 class="box-title">
-                        <i class="fas fa-lock" aria-hidden="true"></i> {{ trans('admin/settings/general.security') }}
+                        <x-icon type="locked"/>
+                        {{ trans('admin/settings/general.security') }}
                     </h2>
                 </div>
                 <div class="box-body">
 
 
-                    <div class="col-md-11 col-md-offset-1">
+                    <div class="col-md-12">
 
+                        <fieldset name="password-preferences" class="bottom-padded">
+                            <legend class="highlight">
+                                {{ trans('admin/settings/general.legends.security') }}
+                            </legend>
 
-                        <!-- Two Factor -->
-                        <div class="form-group {{ $errors->has('brand') ? 'error' : '' }}">
-                            <div class="col-md-3">
-                                {{ Form::label('two_factor_enabled', trans('admin/settings/general.two_factor_enabled_text')) }}
+                            <!-- Two Factor -->
+                            <div class="form-group {{ $errors->has('brand') ? 'error' : '' }}">
+                                <div class="col-md-3">
+                                    <label for="two_factor_enabled">{{ trans('admin/settings/general.two_factor_enabled_text') }}</label>
+                                </div>
+                                <div class="col-md-9">
+                                    <x-input.select
+                                        name="two_factor_enabled"
+                                        :selected="old('two_factor_enabled', $setting->two_factor_enabled)"
+                                        :options="[
+                                            '' => trans('admin/settings/general.two_factor_disabled'),
+                                            '1' => trans('admin/settings/general.two_factor_optional'),
+                                            '2' => trans('admin/settings/general.two_factor_required'),
+                                        ]"
+                                    />
+                                    <p class="help-block">{{ trans('admin/settings/general.two_factor_enabled_warning') }}</p>
+
+                                    @if (config('app.lock_passwords'))
+                                        <p class="text-warning"><i class="fas fa-lock"></i> {{ trans('general.feature_disabled') }}</p>
+                                    @endif
+
+                                    {!! $errors->first('two_factor_enabled', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
+                                </div>
                             </div>
-                            <div class="col-md-9">
 
-                                {!! Form::two_factor_options('two_factor_enabled', Request::old('two_factor_enabled', $setting->two_factor_enabled), 'select2') !!}
-                                <p class="help-block">{{ trans('admin/settings/general.two_factor_enabled_warning') }}</p>
-
-                                @if (config('app.lock_passwords'))
-                                    <p class="text-warning"><i class="fas fa-lock"></i> {{ trans('general.feature_disabled') }}</p>
-                                @endif
-
-                                {!! $errors->first('two_factor_enabled', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
+                            <!-- Min characters -->
+                            <div class="form-group {{ $errors->has('pwd_secure_min') ? 'error' : '' }}">
+                                <div class="col-md-3">
+                                    <label for="pwd_secure_min">{{ trans('admin/settings/general.pwd_secure_min') }}</label>
+                                </div>
+                                <div class="col-md-9">
+                                    <input class="form-control" style="width: 60px;" name="pwd_secure_min" type="number" value="{{ old('pwd_secure_min', $setting->pwd_secure_min) }}" id="pwd_secure_min" maxlength="2" min="8">
+                                    {!! $errors->first('pwd_secure_min', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
+                                    <p class="help-block">
+                                        {{ trans('admin/settings/general.pwd_secure_min_help') }}
+                                    </p>
+                                </div>
                             </div>
-                        </div>
-
-                        <!-- Min characters -->
-                        <div class="form-group {{ $errors->has('pwd_secure_min') ? 'error' : '' }}">
-                            <div class="col-md-3">
-                                {{ Form::label('pwd_secure_min', trans('admin/settings/general.pwd_secure_min')) }}
-                            </div>
-                            <div class="col-md-9">
-                                {{ Form::text('pwd_secure_min', Request::old('pwd_secure_min', $setting->pwd_secure_min), array('class' => 'form-control',  'style'=>'width: 50px;')) }}
-
-                                {!! $errors->first('pwd_secure_min', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
-                                <p class="help-block">
-                                    {{ trans('admin/settings/general.pwd_secure_min_help') }}
-                                </p>
-
-
-                            </div>
-                        </div>
 
 
 
-                        <!-- Common Passwords -->
-                        <div class="form-group {{ $errors->has('pwd_secure_complexity.*') ? 'error' : '' }}">
-                            <div class="col-md-3">
-                                {{ Form::label('pwd_secure_complexity', trans('admin/settings/general.pwd_secure_complexity')) }}
-                            </div>
-                            <div class="col-md-9">
-                                <label class="form-control">
-                                    <span class="sr-only">{{ trans('admin/settings/general.pwd_secure_uncommon') }}</span>
-                                    {{ Form::checkbox('pwd_secure_uncommon', '1', old('pwd_secure_uncommon', $setting->pwd_secure_uncommon),array( 'aria-label'=>'pwd_secure_uncommon')) }}
-                                    {{ trans('admin/settings/general.pwd_secure_uncommon') }}
-                                </label>
-                                <label class="form-control">
-                                    {{ Form::checkbox("pwd_secure_complexity['disallow_same_pwd_as_user_fields']", 'disallow_same_pwd_as_user_fields', old('disallow_same_pwd_as_user_fields', strpos($setting->pwd_secure_complexity, 'disallow_same_pwd_as_user_fields')!==false), array('aria-label'=>'pwd_secure_complexity')) }}
-                                    {{ trans('admin/settings/general.pwd_secure_complexity_disallow_same_pwd_as_user_fields') }}
-                                </label>
-                                <label class="form-control">
-                                    {{ Form::checkbox("pwd_secure_complexity['letters']", 'letters', old('pwd_secure_uncommon', strpos($setting->pwd_secure_complexity, 'letters')!==false), array('aria-label'=>'pwd_secure_complexity')) }}
-                                    {{ trans('admin/settings/general.pwd_secure_complexity_letters') }}
-                                </label>
-                                <label class="form-control">
-                                    {{ Form::checkbox("pwd_secure_complexity['numbers']", 'numbers', old('pwd_secure_uncommon', strpos($setting->pwd_secure_complexity, 'numbers')!==false), array('aria-label'=>'pwd_secure_complexity')) }}
-                                    {{ trans('admin/settings/general.pwd_secure_complexity_numbers') }}
-                                </label>
-                                <label class="form-control">
-                                    {{ Form::checkbox("pwd_secure_complexity['symbols']", 'symbols', old('pwd_secure_uncommon', strpos($setting->pwd_secure_complexity, 'symbols')!==false), array('aria-label'=>'pwd_secure_complexity')) }}
-                                    {{ trans('admin/settings/general.pwd_secure_complexity_symbols') }}
-                                </label>
-                                <label class="form-control">
-                                    {{ Form::checkbox("pwd_secure_complexity['case_diff']", 'case_diff', old('pwd_secure_uncommon', strpos($setting->pwd_secure_complexity, 'case_diff')!==false), array('aria-label'=>'pwd_secure_complexity')) }}
-                                    {{ trans('admin/settings/general.pwd_secure_complexity_case_diff') }}
-                                </label>
-
-                                @if ($errors->has('pwd_secure_complexity.*'))
-                                    <span class="alert-msg">{{ trans('validation.invalid_value_in_field') }}</span>
-                                @endif
-                                <p class="help-block">
-                                    {{ trans('admin/settings/general.pwd_secure_complexity_help') }}
-                                </p>
-                            </div>
-                        </div>
-                        <!-- /.form-group -->
-                        <hr>
-                        <!-- Remote User Authentication -->
-                        <div class="form-group {{ $errors->has('login_remote_user') ? 'error' : '' }}">
-                            <div class="col-md-3">
-                                <strong>{{ trans('admin/settings/general.login_remote_user_text') }}</strong>
-                            </div>
-                            <div class="col-md-9">
-                                <!--  Enable Remote User Login -->
-
-                                @if (config('app.lock_passwords'))
-                                    <p class="text-warning"><i class="fas fa-lock"></i> {{ trans('general.feature_disabled') }}</p>
-                                @else
+                            <!-- Common Passwords -->
+                            <div class="form-group {{ $errors->has('pwd_secure_complexity.*') ? 'error' : '' }}">
+                                <div class="col-md-3">
+                                    <label for="pwd_secure_complexity">{{ trans('admin/settings/general.pwd_secure_complexity') }}</label>
+                                </div>
+                                <div class="col-md-9">
                                     <label class="form-control">
-                                        {{ Form::checkbox('login_remote_user_enabled', '1', old('login_remote_user_enabled', $setting->login_remote_user_enabled),array('aria-label'=>'login_remote_user')) }}
-                                        {{ Form::label('login_remote_user_enabled',  trans('admin/settings/general.login_remote_user_enabled_text')) }}
+                                        <input type="checkbox" name="pwd_secure_uncommon" value="1" @checked(old('pwd_secure_uncommon', $setting->pwd_secure_uncommon)) aria-label="pwd_secure_uncommon"/>
+                                        {{ trans('admin/settings/general.pwd_secure_uncommon') }}
+                                    </label>
+                                    <label class="form-control">
+                                        <input type="checkbox" name="pwd_secure_complexity['disallow_same_pwd_as_user_fields']" value="disallow_same_pwd_as_user_fields" @checked(old('disallow_same_pwd_as_user_fields', strpos($setting->pwd_secure_complexity, 'disallow_same_pwd_as_user_fields')!==false)) aria-label="pwd_secure_complexity"/>
+                                        {{ trans('admin/settings/general.pwd_secure_complexity_disallow_same_pwd_as_user_fields') }}
+                                    </label>
+                                    <label class="form-control">
+                                        <input type="checkbox" name="pwd_secure_complexity['letters']" value="letters" @checked(old('pwd_secure_uncommon', strpos($setting->pwd_secure_complexity, 'letters')!==false)) aria-label="pwd_secure_complexity"/>
+                                        {{ trans('admin/settings/general.pwd_secure_complexity_letters') }}
+                                    </label>
+                                    <label class="form-control">
+                                        <input type="checkbox" name="pwd_secure_complexity['numbers']" value="numbers" @checked(old('pwd_secure_uncommon', strpos($setting->pwd_secure_complexity, 'numbers')!==false)) aria-label="pwd_secure_complexity"/>
+                                        {{ trans('admin/settings/general.pwd_secure_complexity_numbers') }}
+                                    </label>
+                                    <label class="form-control">
+                                        <input type="checkbox" name="pwd_secure_complexity['symbols']" value="symbols" @checked(old('pwd_secure_uncommon', strpos($setting->pwd_secure_complexity, 'symbols')!==false)) aria-label="pwd_secure_complexity"/>
+                                        {{ trans('admin/settings/general.pwd_secure_complexity_symbols') }}
+                                    </label>
+                                    <label class="form-control">
+                                        <input type="checkbox" name="pwd_secure_complexity['case_diff']" value="case_diff" @checked(old('pwd_secure_uncommon', strpos($setting->pwd_secure_complexity, 'case_diff')!==false)) aria-label="pwd_secure_complexity"/>
+                                        {{ trans('admin/settings/general.pwd_secure_complexity_case_diff') }}
                                     </label>
 
-                                    {!! $errors->first('login_remote_user_enabled', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
+                                    @if ($errors->has('pwd_secure_complexity.*'))
+                                        <span class="alert-msg">{{ trans('validation.generic.invalid_value_in_field') }}</span>
+                                    @endif
                                     <p class="help-block">
-                                        {{ trans('admin/settings/general.login_remote_user_enabled_help') }}
+                                        {{ trans('admin/settings/general.pwd_secure_complexity_help') }}
                                     </p>
-                                    <!-- Use custom remote user header name -->
-                                    {{ Form::label('login_remote_user_header_name',  trans('admin/settings/general.login_remote_user_header_name_text')) }}
-                                    {{ Form::text('login_remote_user_header_name', Request::old('login_remote_user_header_name', $setting->login_remote_user_header_name),array('class' => 'form-control')) }}
-                                    {!! $errors->first('login_remote_user_header_name', '<span class="alert-msg">:message</span>') !!}
-                                    <p class="help-block">
-                                        {{ trans('admin/settings/general.login_remote_user_header_name_help') }}
-                                    </p>
-                                    <!-- Custom logout url to redirect to authentication provider -->
-                                    {{ Form::label('login_remote_user_custom_logout_url',  trans('admin/settings/general.login_remote_user_custom_logout_url_text')) }}
-                                    {{ Form::text('login_remote_user_custom_logout_url', old('login_remote_user_custom_logout_url', $setting->login_remote_user_custom_logout_url),array('class' => 'form-control', 'aria-label'=>'login_remote_user_custom_logout_url')) }}
-
-                                    {!! $errors->first('login_remote_user_custom_logout_url', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
-                                    <p class="help-block">
-                                        {{ trans('admin/settings/general.login_remote_user_custom_logout_url_help') }}
-                                    </p>
-                                    <!--  Disable other logins mechanism -->
-                                    <label class="form-control">
-
-                                        {{ Form::checkbox('login_common_disabled', '1', old('login_common_disabled', $setting->login_common_disabled),array('aria-label'=>'login_common_disabled')) }}
-                                        {{ trans('admin/settings/general.login_common_disabled_text') }}
-                                    </label>
-                                    {!! $errors->first('login_common_disabled', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
-                                    <p class="help-block">
-                                        {{ trans('admin/settings/general.login_common_disabled_help') }}
-                                    </p>
-                                @endif
-
+                                </div>
                             </div>
-                        </div>
+                        </fieldset>
+
+                        <fieldset name="remote-login" class="bottom-padded">
+                            <legend class="highlight">
+                                {{ trans('admin/settings/general.login_remote_user_text') }}
+                            </legend>
+                            <!-- Remote User Authentication -->
+                            <div class="form-group {{ $errors->has('login_remote_user') ? 'error' : '' }}">
+
+                                <div class="col-md-9 col-md-offset-3">
+                                    <!--  Enable Remote User Login -->
+
+                                    @if (config('app.lock_passwords'))
+                                        <p class="text-warning"><i class="fas fa-lock"></i> {{ trans('general.feature_disabled') }}</p>
+                                    @else
+                                        <label class="form-control">
+                                            <input type="checkbox" name="login_remote_user_enabled" value="1" @checked(old('login_remote_user_enabled', $setting->login_remote_user_enabled)) aria-label="login_remote_user"/>
+                                            <label for="login_remote_user_enabled">{{ trans('admin/settings/general.login_remote_user_enabled_text') }}</label>
+                                        </label>
+
+                                        {!! $errors->first('login_remote_user_enabled', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
+                                        <p class="help-block">
+                                            {{ trans('admin/settings/general.login_remote_user_enabled_help') }}
+                                        </p>
+                                </div>
+                                <div class="col-md-3">
+                                        <!-- Use custom remote user header name -->
+                                        <label for="login_remote_user_header_name">{{ trans('admin/settings/general.login_remote_user_header_name_text') }}</label>
+                                </div>
+                                <div class="col-md-9">
+                                        <input class="form-control" name="login_remote_user_header_name" type="text" value="{{ old('login_remote_user_header_name', $setting->login_remote_user_header_name) }}" id="login_remote_user_header_name">
+                                        {!! $errors->first('login_remote_user_header_name', '<span class="alert-msg">:message</span>') !!}
+                                        <p class="help-block">
+                                            {{ trans('admin/settings/general.login_remote_user_header_name_help') }}
+                                        </p>
+                                </div>
+                                <div class="col-md-3">
+                                        <!-- Custom logout url to redirect to authentication provider -->
+                                        <label for="login_remote_user_custom_logout_url">{{ trans('admin/settings/general.login_remote_user_custom_logout_url_text') }}</label>
+                                </div>
+                                <div class="col-md-9">
+                                        <input class="form-control" aria-label="login_remote_user_custom_logout_url" name="login_remote_user_custom_logout_url" type="url" value="{{ old('login_remote_user_custom_logout_url', $setting->login_remote_user_custom_logout_url) }}" id="login_remote_user_custom_logout_url">
+                                        {!! $errors->first('login_remote_user_custom_logout_url', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
+                                        <p class="help-block">
+                                            {{ trans('admin/settings/general.login_remote_user_custom_logout_url_help') }}
+                                        </p>
+                                </div>
+                                @if ($setting->login_remote_user_enabled == '1')
+                                    <div class="col-md-3">
+                                        <!--  Disable other logins mechanism -->
+                                        <label class="form-control">
+                                            <input type="checkbox" name="login_common_disabled" value="1" @checked(old('login_common_disabled', $setting->login_common_disabled)) aria-label="login_common_disabled"/>
+                                            {{ trans('admin/settings/general.login_common_disabled_text') }}
+                                        </label>
+                                    </div>
+                                    <div class="col-md-9">
+                                        {!! $errors->first('login_common_disabled', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
+                                        <p class="help-block">
+                                            {{ trans('admin/settings/general.login_common_disabled_help') }}
+                                        </p>
+                                        @endif
+                                    </div>
+
+                                @endif
+                        </fieldset>
 
 
 
@@ -175,7 +198,7 @@
                         <a class="btn btn-link text-left" href="{{ route('settings.index') }}">{{ trans('button.cancel') }}</a>
                     </div>
                     <div class="text-right col-md-6">
-                        <button type="submit" class="btn btn-success"><i class="fas fa-check icon-white" aria-hidden="true"></i> {{ trans('general.save') }}</button>
+                        <button type="submit" class="btn btn-success"><x-icon type="checkmark" /> {{ trans('general.save') }}</button>
                     </div>
 
                 </div>
@@ -183,6 +206,6 @@
         </div> <!-- /.col-md-8-->
     </div> <!-- /.row-->
 
-    {{Form::close()}}
+    </form>
 
 @stop
diff --git a/resources/views/setup/user.blade.php b/resources/views/setup/user.blade.php
index e9d3b18832..4f6531668d 100644
--- a/resources/views/setup/user.blade.php
+++ b/resources/views/setup/user.blade.php
@@ -21,7 +21,7 @@
         <label for="site_name">
           {{ trans('general.site_name') }}
         </label>
-        {{ Form::text('site_name', Request::old('site_name'), array('class' => 'form-control','placeholder' => 'Snipe-IT Asset Management')) }}
+        <input class="form-control" placeholder="Snipe-IT Asset Management" required="" name="site_name" type="text" value="{{ old('site_name') }}">
 
         {!! $errors->first('site_name', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
       </div>
@@ -30,18 +30,18 @@
   <div class="row">
 
     <!-- Language -->
-    <div class="form-group col-lg-6{{  (Helper::checkIfRequired(\App\Models\User::class, 'default_language')) ? ' required' : '' }} {{$errors->has('default_language') ? 'error' : ''}}">
+    <div class="form-group col-lg-6{{$errors->has('default_language') ? ' error' : ''}}">
       <label for="locale">
         {{ trans('admin/settings/general.default_language') }}
       </label>
-      {!! Form::locales('locale', Request::old('locale', "en-US"), 'select2') !!}
+      <x-input.locale-select name="locale" :selected="old('locale', 'en-US')" />
       {!! $errors->first('locale', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
     </div>
 
     <!-- Currency -->
-    <div class="form-group col-lg-6{{  (Helper::checkIfRequired(\App\Models\Setting::class, 'default_currency')) ? ' required' : '' }} {{$errors->has('default_currency') ? 'error' : ''}}">
-      {{ Form::label('default_currency', trans('admin/settings/general.default_currency')) }}
-      {{ Form::text('default_currency', Request::old('default_currency'), array('class' => 'form-control','placeholder' => 'USD', 'maxlength'=>'3', 'style'=>'width: 60px;')) }}
+    <div class="form-group col-lg-6{{$errors->has('default_currency') ? ' error' : ''}}">
+      <label for="default_currency">{{ trans('admin/settings/general.default_currency') }}</label>
+      <input class="form-control" placeholder="USD" maxlength="3" style="width: 60px;" name="default_currency" type="text" id="default_currency" value="{{ old('default_currency') }}">
 
       {!! $errors->first('default_currency', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
     </div>
@@ -70,16 +70,16 @@
 
   <div class="row">
 
-    <div class="form-group col-lg-6{{  (Helper::checkIfRequired(\App\Models\User::class, 'auto_increment_prefix')) ? ' required' : '' }} {{ $errors->has('auto_increment_prefix') ? 'error' : '' }}">
-      {{ Form::label('auto_increment_prefix', trans('admin/settings/general.auto_increment_prefix')) }}
-      {{ Form::text('auto_increment_prefix', Request::old('auto_increment_prefix'), array('class' => 'form-control')) }}
+    <div class="form-group col-lg-6{{ $errors->has('auto_increment_prefix') ? ' error' : '' }}">
+      <label for="auto_increment_prefix">{{ trans('admin/settings/general.auto_increment_prefix') }}</label>
+      <input class="form-control" name="auto_increment_prefix" type="text" id="auto_increment_prefix" value="{{ old('auto_increment_prefix') }}">
 
       {!! $errors->first('auto_increment_prefix', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
     </div>
 
-    <div class="form-group col-lg-6{{  (Helper::checkIfRequired(\App\Models\User::class, 'zerofill_count')) ? ' required' : '' }} {{ $errors->has('zerofill_count') ? 'error' : '' }}">
-      {{ Form::label('zerofill_count', trans('admin/settings/general.zerofill_count')) }}
-      {{ Form::text('zerofill_count', Request::old('zerofill_count', 5), array('class' => 'form-control')) }}
+    <div class="form-group col-lg-6{{ $errors->has('zerofill_count') ? ' error' : '' }}">
+      <label for="zerofill_count">{{ trans('admin/settings/general.zerofill_count') }}</label>
+      <input class="form-control" name="zerofill_count" type="text" value="{{ old('zerofill_count', 5) }}" id="zerofill_count">
 
       {!! $errors->first('zerofill_count', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
     </div>
@@ -89,16 +89,16 @@
     <!-- email domain -->
     <div class="row">
       <div class="form-group col-lg-6 required {{ $errors->has('email_domain') ? 'error' : '' }}">
-        {{ Form::label('email_domain', trans('general.email_domain')) }}
-        {{ Form::text('email_domain', Request::old('email_domain'), array('class' => 'form-control','placeholder' => 'example.com')) }}
+        <label for="email_domain">{{ trans('general.email_domain') }}</label>
+        <input class="form-control" placeholder="example.com" required="" name="email_domain" type="text" id="email_domain" value="{{ old('email_domain') }}">
         <span class="help-block">{{ trans('general.email_domain_help')  }}</span>
 
         {!! $errors->first('email_domain', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
       </div>
 
       <!-- email format  -->
-      <div class="form-group col-lg-6{{  (Helper::checkIfRequired(\App\Models\User::class, 'email_format')) ? ' required' : '' }} {{ $errors->has('email_format') ? 'error' : '' }}">
-        {{ Form::label('email_format', trans('general.email_format')) }}
+      <div class="form-group col-lg-6 {{ $errors->has('email_format') ? 'error' : '' }}">
+        <label for="email_format">{{ trans('admin/settings/general.email_formats.email_format') }}</label>
         {!! Form::username_format('email_format', old('email_format', 'filastname'), 'select2') !!}
         {!! $errors->first('email_format', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
       </div>
@@ -107,32 +107,32 @@
     <!-- Name -->
     <div class="row">
       <!-- first name -->
-      <div class="form-group col-lg-6{{  (Helper::checkIfRequired(\App\Models\User::class, 'first_name')) ? ' required' : '' }} {{ $errors->has('first_name') ? 'error' : '' }}">
-        {{ Form::label('first_name', trans('general.first_name')) }}
-        {{ Form::text('first_name', old('first_name'), array('class' => 'form-control','placeholder' => 'Jane')) }}
+      <div class="form-group col-lg-6">
+        <label for="first_name">{{ trans('general.first_name') }}</label>
+        <input class="form-control" placeholder="Jane" required="" name="first_name" type="text" id="first_name" value="{{ old('first_name') }}">
         {!! $errors->first('first_name', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
       </div>
 
       <!-- last name -->
       <div class="form-group col-lg-6 required {{ $errors->has('last_name') ? 'error' : '' }}">
-        {{ Form::label('last_name', trans('general.last_name')) }}
-        {{ Form::text('last_name', old('last_name'), array('class' => 'form-control','placeholder' => 'Smith')) }}
+        <label for="last_name">{{ trans('general.last_name') }}</label>
+        <input class="form-control" placeholder="Smith" required="" name="last_name" type="text" id="last_name" value="{{ old('last_name') }}">
         {!! $errors->first('last_name', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
       </div>
     </div>
 
     <div class="row">
       <!-- email-->
-      <div class="form-group col-lg-6{{  (Helper::checkIfRequired(\App\Models\User::class, 'email')) ? ' required' : '' }} {{ $errors->has('email') ? 'error' : '' }}">
-        {{ Form::label('email', trans('admin/users/table.email')) }}
-        {{ Form::email('email', config('mail.from.address'), array('class' => 'form-control','placeholder' => 'you@example.com')) }}
+      <div class="form-group col-lg-6{{ $errors->has('email') ? 'error' : '' }}">
+        <label for="email">{{ trans('admin/users/table.email') }}</label>
+        <input class="form-control" type="email" name="email" id="email" value="{{ old('email', config('mail.from.address')) }}" placeholder="you@example.com" required>
         {!! $errors->first('email', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
       </div>
 
       <!-- username -->
       <div class="form-group col-lg-6{{  (Helper::checkIfRequired(\App\Models\User::class, 'username')) ? ' required' : '' }} {{ $errors->has('username') ? 'error' : '' }}">
-        {{ Form::label('username', trans('admin/users/table.username')) }}
-        {{ Form::text('username', old('username'), array('class' => 'form-control','placeholder' => 'jsmith')) }}
+        <label for="username">{{ trans('admin/users/table.username') }}</label>
+        <input class="form-control" placeholder="jsmith" required="" name="username" type="text" id="username" value="{{ old('username') }}">
         {!! $errors->first('username', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
       </div>
     </div>
@@ -140,15 +140,15 @@
     <div class="row">
       <!-- password -->
       <div class="form-group col-lg-6{{  (Helper::checkIfRequired(\App\Models\User::class, 'password')) ? ' required' : '' }} {{ $errors->has('password') ? 'error' : '' }}">
-        {{ Form::label('password', trans('admin/users/table.password')) }}
-        {{ Form::password('password', array('class' => 'form-control')) }}
+        <label for="password">{{ trans('admin/users/table.password') }}</label>
+        <input class="form-control" type="password" name="password" id="password" value="" required>
         {!! $errors->first('password', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
       </div>
 
       <!-- password confirm -->
       <div class="form-group col-lg-6{{  (Helper::checkIfRequired(\App\Models\User::class, 'password')) ? ' required' : '' }} {{ $errors->has('password_confirm') ? 'error' : '' }}">
-        {{ Form::label('password_confirmation', trans('admin/users/table.password_confirm')) }}
-        {{ Form::password('password_confirmation', array('class' => 'form-control')) }}
+        <label for="password_confirmation">{{ trans('admin/users/table.password_confirm') }}</label>
+        <input class="form-control" type="password" name="password_confirmation" id="password_confirmation" value="" required>
         {!! $errors->first('password_confirmation', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
       </div>
     </div>
diff --git a/resources/views/statuslabels/edit.blade.php b/resources/views/statuslabels/edit.blade.php
index 363409ce3b..138f0cb7b5 100755
--- a/resources/views/statuslabels/edit.blade.php
+++ b/resources/views/statuslabels/edit.blade.php
@@ -27,17 +27,23 @@
         {{ trans('admin/statuslabels/table.status_type') }}
     </label>
     <div class="col-md-7 required">
-        {{ Form::select('statuslabel_types', $statuslabel_types, $item->getStatuslabelType(), array('class'=>'select2', 'style'=>'width: 100%; min-width:400px', 'aria-label'=>'statuslabel_types')) }}
+        <x-input.select
+            name="statuslabel_types"
+            :options="$statuslabel_types"
+            :selected="$item->getStatuslabelType()"
+            style="width: 100%; min-width:400px"
+            aria-label="statuslabel_types"
+        />
         {!! $errors->first('statuslabel_types', '<span class="alert-msg" aria-hidden="true"><i class="fas fa-times" aria-hidden="true"></i> :message</span>') !!}
     </div>
 </div>
 
 <!-- Chart color -->
 <div class="form-group{{ $errors->has('color') ? ' has-error' : '' }}">
-    {{ Form::label('color', trans('admin/statuslabels/table.color'), ['class' => 'col-md-3 control-label']) }}
+    <label for="color" class="col-md-3 control-label">{{ trans('admin/statuslabels/table.color') }}</label>
     <div class="col-md-9">
         <div class="input-group color">
-            {{ Form::text('color', Request::old('color', $item->color), array('class' => 'form-control col-md-10', 'maxlength'=>'20')) }}
+            <input class="form-control col-md-10" maxlength="20" name="color" type="text" id="color" value="{{ old('color', $item->color) }}">
             <div class="input-group-addon"><i></i></div>
         </div><!-- /.input group -->
         {!! $errors->first('color', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
@@ -50,7 +56,7 @@
 <div class="form-group{{ $errors->has('notes') ? ' has-error' : '' }}">
     <div class="col-md-9 col-md-offset-3">
         <label class="form-control">
-            <input type="checkbox" value="1" name="show_in_nav" id="show_in_nav" {{ Request::old('show_in_nav', $item->show_in_nav) == '1' ? ' checked="checked"' : '' }}> {{ trans('admin/statuslabels/table.show_in_nav') }}
+            <input type="checkbox" value="1" name="show_in_nav" id="show_in_nav" {{ old('show_in_nav', $item->show_in_nav) == '1' ? ' checked="checked"' : '' }}> {{ trans('admin/statuslabels/table.show_in_nav') }}
         </label>
     </div>
 </div>
@@ -60,7 +66,7 @@
 
     <div class="col-md-9 col-md-offset-3">
         <label class="form-control">
-            <input type="checkbox" value="1" name="default_label" id="default_label" {{ Request::old('default_label', $item->default_label) == '1' ? ' checked="checked"' : '' }}>
+            <input type="checkbox" value="1" name="default_label" id="default_label" {{ old('default_label', $item->default_label) == '1' ? ' checked="checked"' : '' }}>
              {{ trans('admin/statuslabels/table.default_label') }}
         </label>
         <p class="help-block"> {{ trans('admin/statuslabels/table.default_label_help') }}</p>
diff --git a/resources/views/statuslabels/index.blade.php b/resources/views/statuslabels/index.blade.php
index 7fdf4fc9a5..f08ac77609 100755
--- a/resources/views/statuslabels/index.blade.php
+++ b/resources/views/statuslabels/index.blade.php
@@ -1,7 +1,4 @@
-@extends('layouts/default', [
-    'helpText' => trans('admin/statuslabels/table.info') ,
-    'helpPosition' => 'right',
-])
+@extends('layouts/default')
 
 {{-- Page title --}}
 @section('title')
@@ -22,13 +19,14 @@
   <div class="col-md-9">
     <div class="box box-default">
       <div class="box-body">
-        <div class="table-responsive">
-
             <table
+                    data-columns="{{ \App\Presenters\StatusLabelPresenter::dataTableLayout() }}"
                     data-cookie-id-table="statuslabelsTable"
                     data-pagination="true"
                     data-id-table="statuslabelsTable"
                     data-search="true"
+                    data-search-highlight="true"
+                    data-show-print="true"
                     data-show-footer="false"
                     data-side-pagination="server"
                     data-show-columns="true"
@@ -44,21 +42,7 @@
                 "fileName": "export-statuslabels-{{ date('Y-m-d') }}",
                 "ignoreColumn": ["actions","image","change","checkbox","checkincheckout","icon"]
                 }'>
-            <thead>
-              <tr>
-                <th data-sortable="true" data-field="id" data-visible="false">{{ trans('general.id') }}</th>
-                <th data-sortable="true" data-field="name" data-formatter="statuslabelsAssetLinkFormatter">{{ trans('admin/statuslabels/table.name') }}</th>
-                <th data-sortable="false" data-field="type" data-formatter="statusLabelTypeFormatter">{{ trans('admin/statuslabels/table.status_type') }}</th>
-                  <th data-sortable="true" data-field="assets_count">{{ trans('general.assets') }}</th>
-                <th data-sortable="true" data-field="color" data-formatter="colorSqFormatter">{{ trans('admin/statuslabels/table.color') }}</th>
-                <th class="text-center" data-sortable="true" data-field="show_in_nav" data-formatter="trueFalseFormatter">{{ trans('admin/statuslabels/table.show_in_nav') }}</th>
-                  <th class="text-center" data-sortable="true" data-field="default_label" data-formatter="trueFalseFormatter">{{ trans('admin/statuslabels/table.default_label') }}</th>
-                  <th data-sortable="true" data-field="notes" data-visible="false">{{ trans('general.notes') }}</th>
-                <th data-formatter="statuslabelsActionsFormatter" data-searchable="false" data-sortable="false" data-field="actions">{{ trans('table.actions') }}</th>
-              </tr>
-            </thead>
           </table>
-        </div>
       </div>
     </div>
   </div>
@@ -66,6 +50,13 @@
   <div class="col-md-3">
     <h2>{{ trans('admin/statuslabels/table.about') }}</h2>
 
+      <div class="box">
+          <div class="box-body">
+              <p>{!!  trans('admin/statuslabels/table.info') !!}</p>
+          </div>
+      </div>
+
+
       <div class="box box-success">
           <div class="box-body">
           <p><i class="fas fa-circle text-green"></i> <strong>{{ trans('admin/statuslabels/table.deployable') }}</strong>: {!!  trans('admin/statuslabels/message.help.deployable')  !!}</p>
@@ -140,7 +131,7 @@
 
           var typename_lower = trans;
           var typename = typename_lower.charAt(0).toUpperCase() + typename_lower.slice(1);
-          return '<i class="fa ' + icon_style + ' text-' + text_color + '"></i> ' + typename;
+          return '<nobr><i class="fa ' + icon_style + ' text-' + text_color + '"></i> ' + typename + '</nobr>';
 
 
       }
diff --git a/resources/views/statuslabels/view.blade.php b/resources/views/statuslabels/view.blade.php
index a15fc8edd1..481d3ee599 100644
--- a/resources/views/statuslabels/view.blade.php
+++ b/resources/views/statuslabels/view.blade.php
@@ -20,6 +20,8 @@
                                         data-pagination="true"
                                         data-id-table="assetsListingTable"
                                         data-search="true"
+                                        data-search-highlight="true"
+                                        data-show-print="true"
                                         data-side-pagination="server"
                                         data-show-columns="true"
                                         data-show-fullscreen="true"
@@ -40,7 +42,6 @@
                                 </table>
                         </div><!-- /.col -->
                     </div><!-- /.row -->
-                    {{ Form::close() }}
                 </div><!-- ./box-body -->
             </div><!-- /.box -->
         </div>
diff --git a/resources/views/suppliers/edit.blade.php b/resources/views/suppliers/edit.blade.php
index 50341be926..9fc21a37f8 100755
--- a/resources/views/suppliers/edit.blade.php
+++ b/resources/views/suppliers/edit.blade.php
@@ -14,9 +14,9 @@
 @include ('partials.forms.edit.address')
 
 <div class="form-group {{ $errors->has('contact') ? ' has-error' : '' }}">
-    {{ Form::label('contact', trans('admin/suppliers/table.contact'), array('class' => 'col-md-3 control-label')) }}
+    <label for="contact" class="col-md-3 control-label">{{ trans('admin/suppliers/table.contact') }}</label>
     <div class="col-md-7">
-        {{Form::text('contact', old('contact', $item->contact), array('class' => 'form-control')) }}
+        <input class="form-control" name="contact" type="text" id="contact" value="{{ old('contact', $item->contact) }}">
         {!! $errors->first('contact', '<span class="alert-msg" aria-hidden="true"><i class="fas fa-times" aria-hidden="true"></i> :message</span>') !!}
     </div>
 </div>
@@ -26,9 +26,9 @@
 @include ('partials.forms.edit.email')
 
 <div class="form-group {{ $errors->has('url') ? ' has-error' : '' }}">
-    {{ Form::label('url', trans('general.url'), array('class' => 'col-md-3 control-label')) }}
+    <label for="url" class="col-md-3 control-label">{{ trans('general.url') }}</label>
     <div class="col-md-7">
-        {{Form::text('url', old('url', $item->url), array('class' => 'form-control')) }}
+        <input class="form-control" name="url" type="url" id="url" value="{{ old('url', $item->url) }}">
         {!! $errors->first('url', '<span class="alert-msg" aria-hidden="true"><i class="fas fa-times" aria-hidden="true"></i> :message</span>') !!}
     </div>
 </div>
diff --git a/resources/views/suppliers/index.blade.php b/resources/views/suppliers/index.blade.php
index 1b88aae38b..c41249454d 100755
--- a/resources/views/suppliers/index.blade.php
+++ b/resources/views/suppliers/index.blade.php
@@ -20,13 +20,14 @@
   <div class="col-md-12">
     <div class="box box-default">
       <div class="box-body">
-      <div class="table-responsive">
-
         <table
+            data-columns="{{ \App\Presenters\SupplierPresenter::dataTableLayout() }}"
             data-cookie-id-table="suppliersTable"
             data-pagination="true"
             data-id-table="suppliersTable"
             data-search="true"
+            data-search-highlight="true"
+            data-show-print="true"
             data-side-pagination="server"
             data-show-columns="true"
             data-show-fullscreen="true"
@@ -40,27 +41,7 @@
             "fileName": "export-suppliers-{{ date('Y-m-d') }}",
             "ignoreColumn": ["actions","image","change","checkbox","checkincheckout","icon"]
             }'>
-        <thead>
-          <tr>
-            <th data-sortable="true" data-field="id" data-visible="false">{{ trans('admin/suppliers/table.id') }}</th>
-            <th data-formatter="imageFormatter" data-sortable="true" data-field="image" data-visible="false"  data-searchable="false">{{ trans('general.image') }}</th>
-            <th data-sortable="true" data-field="name" data-formatter="suppliersLinkFormatter">{{ trans('admin/suppliers/table.name') }}</th>
-            <th data-sortable="true" data-field="address">{{ trans('admin/suppliers/table.address') }}</th>
-            <th data-searchable="true" data-sortable="true" data-field="contact">{{ trans('admin/suppliers/table.contact') }}</th>
-            <th data-searchable="true" data-sortable="true" data-field="email" data-formatter="emailFormatter">{{ trans('admin/suppliers/table.email') }}</th>
-            <th data-searchable="true" data-sortable="true" data-field="phone" data-formatter="phoneFormatter">{{ trans('admin/suppliers/table.phone') }}</th>
-            <th data-searchable="true" data-sortable="true" data-field="fax" data-visible="false">{{ trans('admin/suppliers/table.fax') }}</th>
-            <th data-sortable="true" data-field="url" data-visible="false" data-formatter="externalLinkFormatter">{{ trans('general.url') }}</th>
-            <th data-searchable="false" data-sortable="true" data-field="assets_count">{{ trans('admin/suppliers/table.assets') }}</th>
-            <th data-searchable="false" data-sortable="true" data-field="accessories_count">{{ trans('general.accessories') }}</th>
-            <th data-searchable="false" data-sortable="true" data-field="licenses_count">{{ trans('admin/suppliers/table.licenses') }}</th>
-            <th data-searchable="false" data-sortable="true" data-field="components_count">{{ trans('general.components') }}</th>
-            <th data-searchable="false" data-sortable="true" data-field="consumables_count">{{ trans('general.consumables') }}</th>
-            <th data-switchable="false" data-formatter="suppliersActionsFormatter" data-searchable="false" data-sortable="false" data-field="actions">{{ trans('table.actions') }}</th>
-          </tr>
-        </thead>
       </table>
-      </div>
     </div>
   </div>
   </div>
diff --git a/resources/views/suppliers/view.blade.php b/resources/views/suppliers/view.blade.php
index a0dea958e6..0c66e3659a 100755
--- a/resources/views/suppliers/view.blade.php
+++ b/resources/views/suppliers/view.blade.php
@@ -31,7 +31,7 @@
             <a href="#assets" data-toggle="tab">
 
                 <span class="hidden-lg hidden-md">
-                    <i class="fas fa-barcode fa-2x" aria-hidden="true"></i>
+                    <x-icon type="assets" class="fa-2x" />
                 </span>
                 <span class="hidden-xs hidden-sm">
                     {{ trans('general.assets') }}
@@ -44,7 +44,7 @@
           <li>
             <a href="#accessories" data-toggle="tab">
                     <span class="hidden-lg hidden-md">
-                        <i class="far fa-keyboard fa-2x" aria-hidden="true"></i>
+                        <x-icon type="accessories" class="fa-2x" />
                     </span>
               <span class="hidden-xs hidden-sm">
                           {{ trans('general.accessories') }}
@@ -56,7 +56,7 @@
           <li>
             <a href="#licenses" data-toggle="tab">
                     <span class="hidden-lg hidden-md">
-                        <i class="far fa-save fa-2x" aria-hidden="true"></i>
+                        <x-icon type="licenses" class="fa-2x" />
                     </span>
               <span class="hidden-xs hidden-sm">
                           {{ trans('general.licenses') }}
@@ -68,7 +68,7 @@
             <li>
                 <a href="#components" data-toggle="tab">
                     <span class="hidden-lg hidden-md">
-                        <i class="far fa-save fa-2x" aria-hidden="true"></i>
+                        <x-icon type="components" class="fa-2x" />
                     </span>
                     <span class="hidden-xs hidden-sm">
                           {{ trans('general.components') }}
@@ -80,7 +80,7 @@
             <li>
                 <a href="#consumables" data-toggle="tab">
                     <span class="hidden-lg hidden-md">
-                        <i class="far fa-save fa-2x" aria-hidden="true"></i>
+                        <x-icon type="consumables" class="fa-2x" />
                     </span>
                     <span class="hidden-xs hidden-sm">
                           {{ trans('general.consumables') }}
@@ -92,7 +92,7 @@
           <li>
             <a href="#maintenances" data-toggle="tab">
                     <span class="hidden-lg hidden-md">
-                        <i class="fas fa-wrench fa-2x"></i>
+                        <x-icon type="maintenances" class="fa-2x" />
                     </span>
               <span class="hidden-xs hidden-sm">
                         {{ trans('admin/asset_maintenances/general.asset_maintenances') }}
@@ -117,6 +117,8 @@
                       data-pagination="true"
                       data-id-table="suppliersAssetsTable"
                       data-search="true"
+                      data-search-highlight="true"
+                      data-show-print="true"
                       data-show-footer="true"
                       data-side-pagination="server"
                       data-show-columns="true"
@@ -151,6 +153,8 @@
                       data-pagination="true"
                       data-id-table="accessoriesListingTable"
                       data-search="true"
+                      data-search-highlight="true"
+                      data-show-print="true"
                       data-side-pagination="server"
                       data-show-columns="true"
                       data-show-fullscreen="true"
@@ -179,6 +183,8 @@
                       data-pagination="true"
                       data-id-table="licensesListingTable"
                       data-search="true"
+                      data-search-highlight="true"
+                      data-show-print="true"
                       data-side-pagination="server"
                       data-show-columns="true"
                       data-show-fullscreen="true"
@@ -206,6 +212,8 @@
                             data-pagination="true"
                             data-id-table="componentsListingTable"
                             data-search="true"
+                            data-search-highlight="true"
+                            data-show-print="true"
                             data-side-pagination="server"
                             data-show-columns="true"
                             data-show-fullscreen="true"
@@ -232,6 +240,8 @@
                         data-pagination="true"
                         data-id-table="consumablesListingTable"
                         data-search="true"
+                        data-search-highlight="true"
+                        data-show-print="true"
                         data-side-pagination="server"
                         data-show-columns="true"
                         data-show-fullscreen="true"
@@ -260,6 +270,8 @@
                       data-pagination="true"
                       data-id-table="maintenancesTable"
                       data-search="true"
+                      data-search-highlight="true"
+                      data-show-print="true"
                       data-side-pagination="server"
                       data-show-columns="true"
                       data-show-fullscreen="true"
@@ -295,7 +307,7 @@
 
           <ul class="list-unstyled" style="line-height: 25px; padding-bottom: 20px; padding-top: 20px;">
               @if ($supplier->contact!='')
-                  <li><i class="fas fa-user" aria-hidden="true"></i> {{ $supplier->contact }}</li>
+                  <li><x-icon type="user" /> {{ $supplier->contact }}</li>
               @endif
               @if ($supplier->phone!='')
                   <li><i class="fas fa-phone"></i>
diff --git a/resources/views/users/bulk-edit.blade.php b/resources/views/users/bulk-edit.blade.php
index b28eb602d2..3d3031d5e0 100644
--- a/resources/views/users/bulk-edit.blade.php
+++ b/resources/views/users/bulk-edit.blade.php
@@ -42,7 +42,7 @@
                         <div class="form-group">
                             <div class=" col-md-9 col-md-offset-3">
                                 <label class="form-control">
-                                    {{ Form::checkbox('null_department_id', '1', false) }}
+                                    <input type="checkbox" name="null_department_id" value="1" />
                                     {{ trans_choice('general.set_users_field_to_null', count($users), ['field' => trans('general.department'), 'user_count' => count($users)]) }}
                                 </label>
                             </div>
@@ -55,7 +55,7 @@
                         <div class="form-group">
                             <div class=" col-md-9 col-md-offset-3">
                                 <label class="form-control">
-                                    {{ Form::checkbox('null_location_id', '1', false) }}
+                                    <input type="checkbox" name="null_location_id" value="1" />
                                     {{ trans_choice('general.set_users_field_to_null', count($users), ['field' => trans('general.location'), 'user_count' => count($users)]) }}
                                 </label>
                             </div>
@@ -69,7 +69,7 @@
                             <div class="form-group">
                                 <div class=" col-md-9 col-md-offset-3">
                                     <label class="form-control">
-                                        {{ Form::checkbox('null_company_id', '1', false) }}
+                                        <input type="checkbox" name="null_company_id" value="1" />
                                         {{ trans_choice('general.set_users_field_to_null', count($users), ['field' => trans('general.company'), 'user_count' => count($users)]) }}
                                     </label>
                                 </div>
@@ -83,22 +83,31 @@
                         <div class="form-group">
                             <div class=" col-md-9 col-md-offset-3">
                                 <label class="form-control">
-                                    {{ Form::checkbox('null_manager_id', '1', false) }}
+                                    <input type="checkbox" name="null_manager_id" value="1" />
                                     {{ trans_choice('general.set_users_field_to_null', count($users), ['field' => trans('admin/users/table.manager'), 'user_count' => count($users)]) }}
                                 </label>
                             </div>
                         </div>
 
 
-                        <!-- language -->
+                        <!-- Language -->
                         <div class="form-group {{ $errors->has('locale') ? 'has-error' : '' }}">
                             <label class="col-md-3 control-label" for="locale">{{ trans('general.language') }}</label>
                             <div class="col-md-8">
-                                {!! Form::locales('locale', old('locale', $user->locale), 'select2') !!}
+                                <x-input.locale-select name="locale" :selected="old('locale', '')"/>
                                 {!! $errors->first('locale', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
                             </div>
                         </div>
 
+                        <div class="form-group">
+                            <div class=" col-md-9 col-md-offset-3">
+                                <label class="form-control">
+                                    <input type="checkbox" name="null_locale" value="1" />
+                                    {{ trans_choice('general.set_users_field_to_null', count($users), ['field' => trans('general.language'), 'user_count' => count($users)]) }}
+                                </label>
+                            </div>
+                        </div>
+
                         <!-- City -->
                         <div class="form-group{{ $errors->has('city') ? ' has-error' : '' }}">
                             <label class="col-md-3 control-label" for="city">{{ trans('general.city') }}</label>
@@ -115,16 +124,16 @@
                             </div>
                             <div class="col-sm-9">
 
-                                    <label for="no_change" class="form-control">
-                                        {{ Form::radio('remote', '', true, ['id' => 'no_change', 'aria-label'=>'no_change']) }}
+                                    <label for="no_change_remote" class="form-control">
+                                        <input type="radio" name="remote" id="no_change_remote" value="" checked aria-label="no_change_remote">
                                         {{  trans('general.do_not_change') }}
                                     </label>
                                     <label for="remote" class="form-control">
-                                        {{ Form::radio('remote', '1', old('remote'), ['id' => 'remote', 'aria-label'=>'remote']) }}
+                                        <input type="radio" name="remote" id="remote" value="1" aria-label="remote">
                                         {{ trans('admin/users/general.remote_label') }}
                                     </label>
                                     <label for="not_remote" class="form-control">
-                                        {{ Form::radio('remote', '0', old('remote'), ['id' => 'not_remote', 'aria-label'=>'not_remote']) }}
+                                        <input type="radio" name="remote" id="not_remote" value="0" aria-label="not_remote">
                                         {{ trans('admin/users/general.not_remote_label') }}
                                     </label>
 
@@ -135,16 +144,20 @@
                         <!-- ldap_sync -->
                         <div class="form-group">
                             <div class="col-sm-3 control-label">
-                                {{ trans('general.ldap_sync') }}
+                                {{ trans('general.user_managed_passwords') }}
                             </div>
                             <div class="col-sm-9">
-                                    <label for="no_change" class="form-control">
-                                        {{ Form::radio('ldap_import', '', true, ['id' => 'no_change', 'aria-label'=>'ldap_import']) }}
+                                    <label for="no_change_ldap_import" class="form-control">
+                                        <input type="radio" name="ldap_import" id="no_change_ldap_import" value="" checked aria-label="no_change_ldap_import">
                                         {{  trans('general.do_not_change') }}
                                     </label>
+                                    <label for="no_ldap_import" class="form-control">
+                                        <input type="radio" name="ldap_import" id="no_ldap_import" value="0" aria-label="no_ldap_import">
+                                        {{ trans('general.user_managed_passwords_allow') }}
+                                    </label>
                                     <label for="ldap_import" class="form-control">
-                                        {{ Form::radio('ldap_import', '0', old('ldap_import'), ['id' => 'ldap_import', 'aria-label'=>'ldap_import']) }}
-                                        {{ trans('general.ldap_import') }}
+                                        <input type="radio" name="ldap_import" id="ldap_import" value="1" aria-label="ldap_import">
+                                        {{ trans('general.user_managed_passwords_disallow') }}
                                     </label>
                             </div>
                         </div> <!--/form-group-->
@@ -157,15 +170,15 @@
                             <div class="col-sm-9">
 
                                 <label for="no_change_autoassign_licenses" class="form-control">
-                                    {{ Form::radio('autoassign_licenses', '', true, ['id' => 'no_change_autoassign_licenses', 'aria-label'=>'no_change_autoassign_licenses']) }}
+                                    <input type="radio" name="autoassign_licenses" id="no_change_autoassign_licenses" value="" checked aria-label="no_change_autoassign_licenses">
                                     {{  trans('general.do_not_change') }}
                                 </label>
                                 <label for="autoassign_licenses" class="form-control">
-                                    {{ Form::radio('autoassign_licenses', '1', old('autoassign_licenses'), ['id' => 'autoassign_licenses', 'aria-label'=>'autoassign_licenses']) }}
+                                    <input type="radio" name="autoassign_licenses" id="autoassign_licenses" value="1" aria-label="autoassign_licenses">
                                     {{  trans('general.autoassign_licenses_help')}}
                                 </label>
                                 <label for="dont_autoassign_licenses" class="form-control">
-                                    {{ Form::radio('autoassign_licenses', '0', old('autoassign_licenses'), ['id' => 'dont_autoassign_licenses', 'aria-label'=>'dont_autoassign_licenses']) }}
+                                    <input type="radio" name="autoassign_licenses" id="dont_autoassign_licenses" value="0" aria-label="dont_autoassign_licenses">
                                     {{  trans('general.no_autoassign_licenses_help')}}
                                 </label>
 
@@ -179,16 +192,16 @@
                             </div>
                             <div class="col-sm-9">
 
-                                    <label for="no_change" class="form-control">
-                                        {{ Form::radio('activated', '', true, ['id' => 'no_change', 'aria-label'=>'no_change']) }}
+                                    <label for="no_change_activated" class="form-control">
+                                        <input type="radio" name="activated" id="no_change_activated" value="" checked aria-label="no_change_activated">
                                         {{  trans('general.do_not_change') }}
                                     </label>
                                     <label for="activated" class="form-control">
-                                        {{ Form::radio('activated', '1', old('activated'), ['id' => 'activated', 'aria-label'=>'activated']) }}
+                                        <input type="radio" name="activated" id="activated" value="1" aria-label="activated">
                                         {{  trans('admin/users/general.user_activated')}}
                                     </label>
                                     <label for="deactivated" class="form-control">
-                                        {{ Form::radio('activated', '0', old('activated'), ['id' => 'deactivated', 'aria-label'=>'deactivated']) }}
+                                        <input type="radio" name="activated" id="deactivated" value="0" aria-label="deactivated">
                                         {{  trans('admin/users/general.user_deactivated')}}
                                     </label>
 
@@ -218,6 +231,43 @@
                       </div> <!--/controls-->
                         @endif
                     </div> <!--/col-md-5-->
+                    </div>
+
+
+                        <!-- Start Date -->
+                        <div class="form-group {{ $errors->has('start_date') ? ' has-error' : '' }}">
+                            <label for="start_date" class="col-md-3 control-label">{{ trans('general.start_date') }}</label>
+                            <div class="col-md-4">
+                                <div class="input-group date" data-provide="datepicker" data-date-format="yyyy-mm-dd"  data-autoclose="true">
+                                    <input type="text" class="form-control" placeholder="{{ trans('general.start_date') }}" name="start_date" id="start_date" value="{{ old('start_date') }}">
+                                    <span class="input-group-addon"><x-icon type="calendar" /></span>
+                                </div>
+                                {!! $errors->first('start_date', '<span class="alert-msg"><i class="fas fa-times"></i> :message</span>') !!}
+                            </div>
+                            <div class="col-md-5">
+                                <label class="form-control">
+                                    <input type="checkbox" name="null_start_date" value="1" />
+                                    {{ trans_choice('general.set_to_null', count($users),['selection_count' => count($users)]) }}
+                                </label>
+                            </div>
+                        </div>
+
+                        <!-- End Date -->
+                        <div class="form-group {{ $errors->has('end_date') ? ' has-error' : '' }}">
+                            <label for="end_date" class="col-md-3 control-label">{{ trans('general.end_date') }}</label>
+                            <div class="col-md-4">
+                                <div class="input-group date" data-provide="datepicker" data-date-format="yyyy-mm-dd"  data-autoclose="true">
+                                    <input type="text" class="form-control" placeholder="{{ trans('general.end_date') }}" name="end_date" id="end_date" value="{{ old('end_date') }}">
+                                    <span class="input-group-addon"><x-icon type="calendar" /></span>
+                                </div>
+                                {!! $errors->first('end_date', '<span class="alert-msg"><i class="fas fa-times"></i> :message</span>') !!}
+                            </div>
+                            <div class="col-md-5">
+                                <label class="form-control">
+                                    <input type="checkbox" name="null_end_date" value="1" />
+                                    {{ trans_choice('general.set_to_null', count($users),['selection_count' => count($users)]) }}
+                                </label>
+                            </div>
                         </div>
 
 
@@ -230,7 +280,7 @@
                         <a class="btn btn-link pull-left" href="{{ URL::previous() }}">{{ trans('button.cancel') }}</a>
 
                         <button type="submit" class="btn btn-success"{{ (config('app.lock_passwords') ? ' disabled' : '') }}>
-                            <i class="fas fa-check icon-white" aria-hidden="true"></i>
+                            <x-icon type="checkmark" />
                             {{ trans('general.update') }}
                         </button>
 
diff --git a/resources/views/users/confirm-bulk-delete.blade.php b/resources/views/users/confirm-bulk-delete.blade.php
index 210f1420a8..0234ce576b 100644
--- a/resources/views/users/confirm-bulk-delete.blade.php
+++ b/resources/views/users/confirm-bulk-delete.blade.php
@@ -39,12 +39,28 @@
                     <th class="col-md-1">
                       <!-- <input type="checkbox" id="checkAll"> -->
                       </th>
-                    <th class="col-md-6">{{ trans('general.name') }}</th>
-                    <th class="col-md-5">{{ trans('general.groups') }}</th>
-                    <th class="col-md-5">{{ trans('general.assets') }}</th>
-                    <th class="col-md-5">{{ trans('general.accessories') }}</th>
-                    <th class="col-md-5">{{ trans('general.licenses') }}</th>
-                    <th class="col-md-5">{{ trans('general.consumables') }}</th>
+                    <th class="col-md-3">{{ trans('general.name') }}</th>
+                    <th class="col-md-3">{{ trans('general.groups') }}</th>
+                    <th class="text-right">
+                      <i class="fas fa-barcode fa-fw" aria-hidden="true" style="font-size: 17px;"></i>
+                      <span class="sr-only">{{ trans('general.assets') }}</span>
+                    </th>
+                    <th class="text-right">
+                      <i class="far fa-keyboard fa-fw" aria-hidden="true" style="font-size: 17px;"></i>
+                      <span class="sr-only">{{ trans('general.accessories') }}</span>
+                    </th>
+                    <th class="text-right">
+                      <i class="far fa-save fa-fw" aria-hidden="true" style="font-size: 17px;"></i>
+                      <span class="sr-only">{{ trans('general.licenses') }}</span>
+                    </th>
+                    <th class="text-right">
+                      <i class="fas fa-tint fa-fw" aria-hidden="true" style="font-size: 17px;"></i>
+                      <span class="sr-only">{{ trans('general.consumables') }}</span>
+                    </th>
+                    <th class="text-right">
+                      <i class="fas fa-paperclip fa-fw" aria-hidden="true" style="font-size: 17px;"></i>
+                      <span class="sr-only">{{ trans('general.files') }}</span>
+                    </th>
                   </tr>
                 </thead>
                 <tbody>
@@ -71,17 +87,20 @@
                       </a>&nbsp;
                       @endforeach
                     </td>
-                    <td>
-                      {{ number_format($user->assets()->count())  }}
+                    <td class="text-right">
+                      {{ number_format($user->assets->count())  }}
                     </td>
-                    <td>
-                      {{ number_format($user->accessories()->count())  }}
+                    <td class="text-right">
+                      {{ number_format($user->accessories->count())  }}
                     </td>
-                    <td>
-                      {{ number_format($user->licenses()->count())  }}
+                    <td class="text-right">
+                      {{ number_format($user->licenses->count())  }}
                     </td>
-                    <td>
-                      {{ number_format($user->consumables()->count())  }}
+                    <td class="text-right">
+                      {{ number_format($user->consumables->count())  }}
+                    </td>
+                    <td class="text-right">
+                      {{ number_format($user->uploads->count())  }}
                     </td>
                   </tr>
                   @endforeach
@@ -89,13 +108,21 @@
                 <tfoot>
 
                   <tr>
-                    <td colspan="7">
-                      {{ Form::select('status_id', $statuslabel_list , Request::old('status_id'), array('class'=>'select2', 'style'=>'width:250px')) }}
+                    <td colspan="8">
+                      <x-input.select
+                          name="status_id"
+                          id="status_id"
+                          :options="$statuslabel_list"
+                          :selected="old('status_id')"
+                          required
+                          style="width:250px"
+                          aria-label="status_id"
+                      />
                       <label>{{ trans('admin/users/general.update_user_assets_status') }}</label>
                     </td>
                   </tr>
                   <tr>
-                    <td colspan="7" class="col-md-12 alert-danger">
+                    <td colspan="8" class="col-md-12 alert-danger">
                       <label class="form-control">
                         <input type="checkbox" name="delete_user" value="1">
                         <span><i class="fa fa-warning fa-2x"></i> {{ trans('general.bulk_soft_delete') }}</span>
@@ -110,7 +137,7 @@
         <div class="box-footer text-right">
           <a class="btn btn-link pull-left" href="{{ URL::previous() }}">{{ trans('button.cancel') }}</a>
 
-          <button type="submit" class="btn btn-success"{{ (config('app.lock_passwords') ? ' disabled' : '') }} disabled="disabled"><i class="fas fa-check icon-white" aria-hidden="true"></i> {{ trans('button.submit') }}</button>
+          <button type="submit" class="btn btn-success"{{ (config('app.lock_passwords') ? ' disabled' : '') }} disabled="disabled"><x-icon type="checkmark" /> {{ trans('button.submit') }}</button>
 
         </div><!-- /.box-footer -->
       </form>
@@ -140,4 +167,4 @@
      }
    });
 </script>
-@stop
\ No newline at end of file
+@stop
diff --git a/resources/views/users/confirm-merge.blade.php b/resources/views/users/confirm-merge.blade.php
index 45635dc4f4..8a26311344 100644
--- a/resources/views/users/confirm-merge.blade.php
+++ b/resources/views/users/confirm-merge.blade.php
@@ -66,6 +66,10 @@
                                             <i class="fas fa-tint fa-fw" aria-hidden="true" style="font-size: 17px;"></i>
                                             <span class="sr-only">{{ trans('general.consumables') }}</span>
                                         </th>
+                                        <th class="col-md-1 text-right">
+                                            <i class="fas fa-paperclip fa-fw" aria-hidden="true" style="font-size: 17px;"></i>
+                                            <span class="sr-only">{{ trans('general.files') }}</span>
+                                        </th>
                                     </tr>
                                     </thead>
                                     <tbody>
@@ -93,16 +97,19 @@
                                                 @endforeach
                                             </td>
                                             <td class="text-right">
-                                                {{ number_format($user->assets()->count())  }}
+                                                {{ number_format($user->assets->count())  }}
                                             </td>
                                             <td class="text-right">
-                                                {{ number_format($user->accessories()->count())  }}
+                                                {{ number_format($user->accessories->count())  }}
                                             </td>
                                             <td class="text-right">
-                                                {{ number_format($user->licenses()->count())  }}
+                                                {{ number_format($user->licenses->count())  }}
                                             </td>
                                             <td class="text-right">
-                                                {{ number_format($user->consumables()->count())  }}
+                                                {{ number_format($user->consumables->count())  }}
+                                            </td>
+                                            <td class="text-right">
+                                                {{ number_format($user->uploads->count())  }}
                                             </td>
                                         </tr>
                                     @endforeach
@@ -114,7 +121,7 @@
                     </div> <!--/box-body-->
                     <div class="box-footer text-right">
                         <a class="btn btn-link pull-left" href="{{ URL::previous() }}">{{ trans('button.cancel') }}</a>
-                        <button type="submit" class="btn btn-success"{{ (config('app.lock_passwords') ? ' disabled' : '') }} disabled><i class="fas fa-check icon-white" aria-hidden="true"></i> {{ trans('button.submit') }}</button>
+                        <button type="submit" class="btn btn-success"{{ (config('app.lock_passwords') ? ' disabled' : '') }} disabled><x-icon type="checkmark" /> {{ trans('button.submit') }}</button>
                     </div><!-- /.box-footer -->
 
                     @foreach ($users as $user)
diff --git a/resources/views/users/edit.blade.php b/resources/views/users/edit.blade.php
index 9a2a039af7..78344f5b3f 100755
--- a/resources/views/users/edit.blade.php
+++ b/resources/views/users/edit.blade.php
@@ -66,7 +66,9 @@
 
 <div class="row">
   <div class="col-md-8 col-md-offset-2">
-    <form class="form-horizontal" method="post" autocomplete="off" action="{{ (isset($user->id)) ? route('users.update', ['user' => $user->id]) : route('users.store') }}" enctype="multipart/form-data" id="userForm">
+      <form class="form-horizontal" method="post" autocomplete="off"
+            action="{{ (isset($user->id)) ? route('users.update', ['user' => $user->id]) : route('users.store') }}"
+            enctype="multipart/form-data" id="userForm">
       {{csrf_field()}}
 
       @if($user->id)
@@ -84,28 +86,16 @@
             <div class="row">
               <div class="col-md-12">
                 <!-- First Name -->
-                <div class="form-group {{ $errors->has('first_name') ? 'has-error' : '' }}">
-                  <label class="col-md-3 control-label" for="first_name">{{ trans('general.first_name') }}</label>
-                  <div class="col-md-6{{  (Helper::checkIfRequired($user, 'first_name')) ? ' required' : '' }}">
-                    <input class="form-control" type="text" name="first_name" id="first_name" value="{{ old('first_name', $user->first_name) }}" maxlength="191" />
-                    {!! $errors->first('first_name', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
-                  </div>
-                </div>
+                 @include('partials.forms.edit.name-first')
 
                 <!-- Last Name -->
-                <div class="form-group {{ $errors->has('last_name') ? 'has-error' : '' }}">
-                  <label class="col-md-3 control-label" for="last_name">{{ trans('general.last_name') }} </label>
-                  <div class="col-md-6{{  (Helper::checkIfRequired($user, 'last_name')) ? ' required' : '' }}">
-                    <input class="form-control" type="text" name="last_name" id="last_name" value="{{ old('last_name', $user->last_name) }}" maxlength="191" />
-                    {!! $errors->first('last_name', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
-                  </div>
-                </div>
+                @include('partials.forms.edit.name-last')
 
                 <!-- Username -->
                 <div class="form-group {{ $errors->has('username') ? 'has-error' : '' }}">
                   <label class="col-md-3 control-label" for="username">{{ trans('admin/users/table.username') }}</label>
 
-                  <div class="col-md-6{{  (Helper::checkIfRequired($user, 'username')) ? ' required' : '' }}">
+                  <div class="col-md-6">
                     @if ($user->ldap_import!='1' || str_contains(Route::currentRouteName(), 'clone'))
                       <input
                         class="form-control"
@@ -116,6 +106,7 @@
                         autocomplete="off"
                         maxlength="191"
                         readonly
+                        {{  (Helper::checkIfRequired($user, 'username')) ? ' required' : '' }}
                         onfocus="this.removeAttribute('readonly');"
                         {{ ((config('app.lock_passwords') && ($user->id)) ? ' disabled' : '') }}
                       >
@@ -123,7 +114,7 @@
                     @else
                         <!-- insert the old username so we don't break validation -->
                          {{ trans('general.managed_ldap') }}
-                          <input type="hidden" name="username" value="{{ Request::old('username', $user->username) }}">
+                          <input type="hidden" name="username" value="{{ old('username', $user->username) }}">
                     @endif
                   </div>
 
@@ -131,7 +122,7 @@
                     @if (config('app.lock_passwords') && ($user->id))
                         <!-- disallow changing existing usernames on the demo -->
                         <div class="col-md-8 col-md-offset-3">
-                            <p class="text-warning"><i class="fas fa-lock"></i> {{ trans('general.feature_disabled') }}</p>
+                            <p class="text-warning"><x-icon type="lock" /> {{ trans('general.feature_disabled') }}</p>
                         </div>
                     @endif
 
@@ -148,7 +139,7 @@
                   <label class="col-md-3 control-label" for="password">
                     {{ trans('admin/users/table.password') }}
                   </label>
-                  <div class="col-md-6{{  (Helper::checkIfRequired($user, 'password')) ? ' required' : '' }}">
+                  <div class="col-md-6">
                     @if ($user->ldap_import!='1' || str_contains(Route::currentRouteName(), 'clone') )
                       <input
                         type="password"
@@ -159,6 +150,7 @@
                         maxlength="500"
                         autocomplete="off"
                         readonly
+                        {{  ((Helper::checkIfRequired($user, 'password')) && (!$user->id)) ? ' required' : '' }}
                         onfocus="this.removeAttribute('readonly');"
                         {{ ((config('app.lock_passwords') && ($user->id)) ? ' disabled' : '') }}>
                     @else
@@ -181,7 +173,7 @@
                   <label class="col-md-3 control-label" for="password_confirmation">
                     {{ trans('admin/users/table.password_confirm') }}
                   </label>
-                  <div class="col-md-6{{  ((Helper::checkIfRequired($user, 'password_confirmation')) && (!$user->id)) ? ' required' : '' }}">
+                  <div class="col-md-6">
                     <input
                     type="password"
                     name="password_confirmation"
@@ -192,6 +184,7 @@
                     autocomplete="off"
                     aria-label="password_confirmation"
                     readonly
+                    {{  (!$user->id) ? ' required' : '' }}
                     onfocus="this.removeAttribute('readonly');"
                     {{ ((config('app.lock_passwords') && ($user->id)) ? ' disabled' : '') }}
                     >
@@ -215,12 +208,12 @@
                                       {{ trans('admin/users/general.activated_help_text') }}
 
                                   </label>
-                                  <p class="text-warning"><i class="fas fa-lock"></i> {{ trans('general.feature_disabled') }}</p>
+                                  <p class="text-warning"><x-icon type="lock" /> {{ trans('general.feature_disabled') }}</p>
 
                               @elseif ($user->id === Auth::user()->id)
                                   <!-- disallow the user from editing their own login status -->
                                   <label class="form-control form-control--disabled">
-                                      {{ Form::checkbox('activated', '1', old('activated', $user->activated), ['disabled' => true, 'checked'=> 'checked', 'aria-label'=>'update_real_loc']) }}
+                                      <input type="checkbox" name="activated" value="1" checked disabled aria-label="activated">
                                       {{ trans('admin/users/general.activated_help_text') }}
                                   </label>
                                   <p class="text-warning">{{ trans('admin/users/general.activated_disabled_help_text') }}</p>
@@ -235,21 +228,21 @@
                           </div>
                   </div>
 
-
                   <!-- Email -->
                 <div class="form-group {{ $errors->has('email') ? 'has-error' : '' }}">
                   <label class="col-md-3 control-label" for="email">{{ trans('admin/users/table.email') }} </label>
-                  <div class="col-md-6{{  (Helper::checkIfRequired($user, 'email')) ? ' required' : '' }}">
+                  <div class="col-md-6">
                     <input
                       class="form-control"
                       type="text"
                       name="email"
                       id="email"
                       maxlength="191"
-                      value="{{ Request::old('email', $user->email) }}"
+                      value="{{ old('email', $user->email) }}"
                       {{ ((config('app.lock_passwords') && ($user->id)) ? ' disabled' : '') }}
                       autocomplete="off"
                       readonly
+                      {{  (Helper::checkIfRequired($user, 'email')) ? ' required' : '' }}
                       onfocus="this.removeAttribute('readonly');">
                     @if (config('app.lock_passwords') && ($user->id))
                     <p class="help-block">{{ trans('admin/users/table.lock_passwords') }}</p>
@@ -266,7 +259,7 @@
                           <div class="col-md-8 col-md-offset-3">
                               <label class="form-control form-control--disabled">
 
-                                  {{ Form::checkbox('email_user', '1', old('email_user'), ['id' => "email_user_checkbox", 'aria-label'=>'email_user']) }}
+                                  <input type="checkbox" name="email_user" value="1" id="email_user_checkbox" @checked(old('email_user')) aria-label="email_user">
 
                                   {{ trans('admin/users/general.email_user_creds_on_create') }}
                               </label>
@@ -281,289 +274,295 @@
 
 
                   <!-- begin optional disclosure arrow stuff -->
-                  <div class="form-group">
-                      <label class="col-md-3 control-label"></label>
 
-                      <div class="col-md-9 col-sm-9 col-md-offset-3">
+                      <div class="col-md-12">
 
-                          <a id="optional_user_info" class="text-primary">
-                              <i class="fa fa-caret-right fa-2x" id="optional_user_info_icon"></i>
-                              <strong>{{ trans('admin/hardware/form.optional_infos') }}</strong>
-                          </a>
+                      <fieldset name="optional-details">
 
-                      </div>
+                          <legend class="highlight">
+                              <a id="optional_user_info">
+                                  <x-icon type="caret-right" id="optional_user_info_icon" />
+                                  {{ trans('admin/hardware/form.optional_infos') }}
+                              </a>
+                          </legend>
 
-                      <div id="optional_user_details" class="col-md-12" style="display:none">
-                          <!-- everything here should be what is considered optional -->
-                          <br>
-                          <!-- Company -->
-                          @if (\App\Models\Company::canManageUsersCompanies())
-                              @include ('partials.forms.edit.company-select', ['translated_name' => trans('general.select_company'), 'fieldname' => 'company_id'])
-                          @endif
+                          <div id="optional_user_details" class="col-md-12" style="display:none">
 
 
-                          <!-- language -->
-                          <div class="form-group {{ $errors->has('locale') ? 'has-error' : '' }}">
-                              <label class="col-md-3 control-label" for="locale">{{ trans('general.language') }}</label>
-                              <div class="col-md-9">
-                                  {!! Form::locales('locale', old('locale', $user->locale), 'select2') !!}
-                                  {!! $errors->first('locale', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
-                              </div>
-                          </div>
 
-                          <!-- Employee Number -->
-                          <div class="form-group {{ $errors->has('employee_num') ? 'has-error' : '' }}">
-                              <label class="col-md-3 control-label" for="employee_num">{{ trans('general.employee_number') }}</label>
-                              <div class="col-md-6">
-                                  <input
-                                          class="form-control"
-                                          type="text"
-                                          aria-label="employee_num"
-                                          name="employee_num"
-                                          maxlength="191"
-                                          id="employee_num"
-                                          value="{{ Request::old('employee_num', $user->employee_num) }}"
-                                  />
-                                  {!! $errors->first('employee_num', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
-                              </div>
-                          </div>
-
-
-                          <!-- Jobtitle -->
-                          <div class="form-group {{ $errors->has('jobtitle') ? 'has-error' : '' }}">
-                              <label class="col-md-3 control-label" for="jobtitle">{{ trans('admin/users/table.title') }}</label>
-                              <div class="col-md-6">
-                                  <input
-                                          class="form-control"
-                                          type="text"
-                                          maxlength="191"
-                                          name="jobtitle"
-                                          id="jobtitle"
-                                          value="{{ Request::old('jobtitle', $user->jobtitle) }}"
-                                  />
-                                  {!! $errors->first('jobtitle', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
-                              </div>
-                          </div>
-
-
-                          <!-- Manager -->
-                          @include ('partials.forms.edit.user-select', ['translated_name' => trans('admin/users/table.manager'), 'fieldname' => 'manager_id'])
-
-                          <!--  Department -->
-                          @include ('partials.forms.edit.department-select', ['translated_name' => trans('general.department'), 'fieldname' => 'department_id'])
-
-                          @include ('partials.forms.edit.datepicker', ['translated_name' => trans('general.start_date'), 'fieldname' => 'start_date', 'item' => $user])
-
-                          @include ('partials.forms.edit.datepicker', ['translated_name' => trans('general.end_date'), 'fieldname' => 'end_date', 'item' => $user])
-
-                          <!-- VIP checkbox -->
-
-                          <div class="form-group">
-                              <div class="col-md-7 col-md-offset-3">
-
-                                  <label class="form-control" for="vip">
-                                      <input type="checkbox" value="1" name="vip" {{ (old('vip', $user->vip)) == '1' ? ' checked="checked"' : '' }} aria-label="vip">
-                                      {{ trans('admin/users/general.vip_label') }}
-                                  </label>
-
-                                  <p class="help-block">{{ trans('admin/users/general.vip_help') }}</p>
-                              </div>
-                          </div>
-
-                          <!-- Auto assign checkbox -->
-
-                          <div class="form-group">
-                              <div class="col-md-7 col-md-offset-3">
-
-                                  <label class="form-control" for="autoassign_licenses">
-                                      <input type="checkbox" value="1" name="autoassign_licenses" {{ (old('autoassign_licenses', $user->autoassign_licenses)) == '1' ? " checked='checked'" : '' }} aria-label="autoassign_licenses">
-                                      {{ trans('general.autoassign_licenses') }}
-                                  </label>
-
-                                  <p class="help-block">{{ trans('general.autoassign_licenses_help_long') }}</p>
-                              </div>
-                          </div>
-
-
-                          <!-- remote checkbox -->
-                          <div class="form-group">
-                              <div class="col-md-7 col-md-offset-3">
-                                  <label for="remote" class="form-control">
-                                      <input type="checkbox" value="1" name="remote" {{ (old('remote', $user->remote)) == '1' ? ' checked="checked"' : '' }} aria-label="remote">
-                                      {{ trans('admin/users/general.remote_label') }}
-                                  </label>
-                                  <p class="help-block">{{ trans('admin/users/general.remote_help') }}
-                                  </p>
-                              </div>
-                          </div>
-
-
-                          <!-- Location -->
-                          @include ('partials.forms.edit.location-select', ['translated_name' => trans('general.location'), 'fieldname' => 'location_id'])
-
-                          <!-- Phone -->
-                          <div class="form-group {{ $errors->has('phone') ? 'has-error' : '' }}">
-                              <label class="col-md-3 control-label" for="phone">{{ trans('admin/users/table.phone') }}</label>
-                              <div class="col-md-6">
-                                  <input class="form-control" type="text" name="phone" id="phone" value="{{ old('phone', $user->phone) }}" maxlength="191" />
-                                  {!! $errors->first('phone', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
-                              </div>
-                          </div>
-
-                          <!-- Website URL -->
-                          <div class="form-group {{ $errors->has('website') ? ' has-error' : '' }}">
-                              <label for="website" class="col-md-3 control-label">{{ trans('general.website') }}</label>
-                              <div class="col-md-6">
-                                  <input class="form-control" type="text" name="website" id="website" value="{{ old('website', $user->website) }}" maxlength="191" />
-                                  {!! $errors->first('website', '<span class="alert-msg" aria-hidden="true"><i class="fas fa-times" aria-hidden="true"></i> :message</span>') !!}
-                              </div>
-                          </div>
-
-                          <!-- Address -->
-                          <div class="form-group{{ $errors->has('address') ? ' has-error' : '' }}">
-                              <label class="col-md-3 control-label" for="address">{{ trans('general.address') }}</label>
-                              <div class="col-md-6">
-                                  <input class="form-control" type="text" name="address" id="address" value="{{ old('address', $user->address) }}" maxlength="191" />
-                                  {!! $errors->first('address', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
-                              </div>
-                          </div>
-
-                          <!-- City -->
-                          <div class="form-group{{ $errors->has('city') ? ' has-error' : '' }}">
-                              <label class="col-md-3 control-label" for="city">{{ trans('general.city') }}</label>
-                              <div class="col-md-6">
-                                  <input class="form-control" type="text" name="city" id="city" aria-label="city" value="{{ old('city', $user->city) }}" maxlength="191" />
-                                  {!! $errors->first('city', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
-                              </div>
-                          </div>
-
-                          <!-- State -->
-                          <div class="form-group{{ $errors->has('state') ? ' has-error' : '' }}">
-                              <label class="col-md-3 control-label" for="state">{{ trans('general.state') }}</label>
-                              <div class="col-md-6">
-                                  <input class="form-control" type="text" name="state" id="state" value="{{ old('state', $user->state) }}" maxlength="191" />
-                                  {!! $errors->first('state', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
-                              </div>
-                          </div>
-
-                          <!-- Country -->
-                          <div class="form-group{{ $errors->has('country') ? ' has-error' : '' }}">
-                              <label class="col-md-3 control-label" for="country">{{ trans('general.country') }}</label>
-                              <div class="col-md-6">
-                                  {!! Form::countries('country', old('country', $user->country), 'col-md-12 select2') !!}
-                                  {!! $errors->first('country', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
-                              </div>
-                          </div>
-
-                          <!-- Zip -->
-                          <div class="form-group{{ $errors->has('zip') ? ' has-error' : '' }}">
-                              <label class="col-md-3 control-label" for="zip">{{ trans('general.zip') }}</label>
-                              <div class="col-md-3">
-                                  <input class="form-control" type="text" name="zip" id="zip" value="{{ old('zip', $user->zip) }}" maxlength="10" />
-                                  {!! $errors->first('zip', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
-                              </div>
-                          </div>
-
-                          <!-- Notes -->
-                          <div class="form-group{!! $errors->has('notes') ? ' has-error' : '' !!}">
-                              <label for="notes" class="col-md-3 control-label">{{ trans('admin/users/table.notes') }}</label>
-                              <div class="col-md-6">
-                                  <textarea class="form-control" rows="5" id="notes" name="notes">{{ old('notes', $user->notes) }}</textarea>
-                                  {!! $errors->first('notes', '<span class="alert-msg" aria-hidden="true"><i class="fas fa-times" aria-hidden="true"></i> :message</span>') !!}
-                              </div>
-                          </div>
-
-                          @if ($snipeSettings->two_factor_enabled!='')
-                              @if ($snipeSettings->two_factor_enabled=='1')
-                                  <div class="form-group">
-                                      <div class="col-md-9 col-md-offset-3">
-
-                                          @if (config('app.lock_passwords'))
-
-                                              <label class="form-control form-control--disabled" for="two_factor_optin">
-                                                  <input type="checkbox" value="1" name="two_factor_optin" {{ (old('two_factor_optin', $user->two_factor_optin)) == '1' ? ' checked="checked"' : '' }} aria-label="two_factor_optin" disabled>
-                                                  {{ trans('admin/settings/general.two_factor') }}
-                                              </label>
-
-                                          @else
-
-                                              <label class="form-control" for="two_factor_optin">
-                                                  <input type="checkbox" value="1" name="two_factor_optin" {{ (old('two_factor_optin', $user->two_factor_optin)) == '1' ? ' checked="checked"' : '' }} aria-label="two_factor_optin">
-                                                  {{ trans('admin/settings/general.two_factor') }}
-                                              </label>
-                                              <p class="help-block">{{ trans('admin/users/general.two_factor_admin_optin_help') }}</p>
-
-                                          @endif
-
-                                      </div>
-                                  </div>
+                              <!-- everything here should be what is considered optional -->
+                              <br>
+                              <!-- Company -->
+                              @if (\App\Models\Company::canManageUsersCompanies())
+                                  @include ('partials.forms.edit.company-select', ['translated_name' => trans('general.select_company'), 'fieldname' => 'company_id'])
                               @endif
 
-                              @if ((Auth::user()->isSuperUser()) && ($user->two_factor_active_and_enrolled()) && ($snipeSettings->two_factor_enabled!='0') && ($snipeSettings->two_factor_enabled!=''))
-                                  <!-- Reset Two Factor -->
-                                  <div class="form-group">
-                                      <div class="col-md-8 col-md-offset-3 two_factor_resetrow">
-                                          <a class="btn btn-default btn-sm pull-left" id="two_factor_reset" style="margin-right: 10px;"> {{ trans('admin/settings/general.two_factor_reset') }}</a>
-                                          <span id="two_factor_reseticon"></span>
-                                          <span id="two_factor_resetresult"></span>
-                                          <span id="two_factor_resetstatus"></span>
-                                      </div>
-                                      <div class="col-md-8 col-md-offset-3 two_factor_resetrow">
-                                          <p class="help-block">{{ trans('admin/settings/general.two_factor_reset_help') }}</p>
-                                      </div>
+
+                              <!-- language -->
+                              <div class="form-group {{ $errors->has('locale') ? 'has-error' : '' }}">
+                                  <label class="col-md-3 control-label" for="locale">{{ trans('general.language') }}</label>
+                                  <div class="col-md-6">
+                                      <x-input.locale-select name="locale" :selected="old('locale', $user->locale)" />
+                                      {!! $errors->first('locale', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
                                   </div>
+                              </div>
+
+                              <!-- Employee Number -->
+                              <div class="form-group {{ $errors->has('employee_num') ? 'has-error' : '' }}">
+                                  <label class="col-md-3 control-label" for="employee_num">{{ trans('general.employee_number') }}</label>
+                                  <div class="col-md-6">
+                                      <input
+                                              class="form-control"
+                                              type="text"
+                                              aria-label="employee_num"
+                                              name="employee_num"
+                                              maxlength="191"
+                                              id="employee_num"
+                                              value="{{ old('employee_num', $user->employee_num) }}"
+                                      />
+                                      {!! $errors->first('employee_num', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
+                                  </div>
+                              </div>
+
+
+                              <!-- Jobtitle -->
+                              <div class="form-group {{ $errors->has('jobtitle') ? 'has-error' : '' }}">
+                                  <label class="col-md-3 control-label" for="jobtitle">{{ trans('admin/users/table.title') }}</label>
+                                  <div class="col-md-6">
+                                      <input
+                                              class="form-control"
+                                              type="text"
+                                              maxlength="191"
+                                              name="jobtitle"
+                                              id="jobtitle"
+                                              value="{{ old('jobtitle', $user->jobtitle) }}"
+                                      />
+                                      {!! $errors->first('jobtitle', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
+                                  </div>
+                              </div>
+
+
+                              <!-- Manager -->
+                              @include ('partials.forms.edit.user-select', ['translated_name' => trans('admin/users/table.manager'), 'fieldname' => 'manager_id'])
+
+                              <!--  Department -->
+                              @include ('partials.forms.edit.department-select', ['translated_name' => trans('general.department'), 'fieldname' => 'department_id'])
+
+                              @include ('partials.forms.edit.datepicker', ['translated_name' => trans('general.start_date'), 'fieldname' => 'start_date', 'item' => $user])
+
+                              @include ('partials.forms.edit.datepicker', ['translated_name' => trans('general.end_date'), 'fieldname' => 'end_date', 'item' => $user])
+
+                              <!-- VIP checkbox -->
+
+                              <div class="form-group">
+                                  <div class="col-md-7 col-md-offset-3">
+
+                                      <label class="form-control" for="vip">
+                                          <input type="checkbox" value="1" name="vip" {{ (old('vip', $user->vip)) == '1' ? ' checked="checked"' : '' }} aria-label="vip">
+                                          {{ trans('admin/users/general.vip_label') }}
+                                      </label>
+
+                                      <p class="help-block">{{ trans('admin/users/general.vip_help') }}</p>
+                                  </div>
+                              </div>
+
+                              <!-- Auto assign checkbox -->
+
+                              <div class="form-group">
+                                  <div class="col-md-7 col-md-offset-3">
+
+                                      <label class="form-control" for="autoassign_licenses">
+                                          <input type="checkbox" value="1" name="autoassign_licenses" {{ (old('autoassign_licenses', $user->autoassign_licenses)) == '1' ? " checked='checked'" : '' }} aria-label="autoassign_licenses">
+                                          {{ trans('general.autoassign_licenses') }}
+                                      </label>
+
+                                      <p class="help-block">{{ trans('general.autoassign_licenses_help_long') }}</p>
+                                  </div>
+                              </div>
+
+
+                              <!-- remote checkbox -->
+                              <div class="form-group">
+                                  <div class="col-md-7 col-md-offset-3">
+                                      <label for="remote" class="form-control">
+                                          <input type="checkbox" value="1" name="remote" {{ (old('remote', $user->remote)) == '1' ? ' checked="checked"' : '' }} aria-label="remote">
+                                          {{ trans('admin/users/general.remote_label') }}
+                                      </label>
+                                      <p class="help-block">{{ trans('admin/users/general.remote_help') }}
+                                      </p>
+                                  </div>
+                              </div>
+
+
+                              <!-- Location -->
+                              @include ('partials.forms.edit.location-select', ['translated_name' => trans('general.location'), 'fieldname' => 'location_id'])
+
+                              <!-- Phone -->
+                              <div class="form-group {{ $errors->has('phone') ? 'has-error' : '' }}">
+                                  <label class="col-md-3 control-label" for="phone">{{ trans('admin/users/table.phone') }}</label>
+                                  <div class="col-md-6">
+                                      <input class="form-control" type="text" name="phone" id="phone" value="{{ old('phone', $user->phone) }}" maxlength="191" />
+                                      {!! $errors->first('phone', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
+                                  </div>
+                              </div>
+
+                              <!-- Website URL -->
+                              <div class="form-group {{ $errors->has('website') ? ' has-error' : '' }}">
+                                  <label for="website" class="col-md-3 control-label">{{ trans('general.website') }}</label>
+                                  <div class="col-md-6">
+                                      <input class="form-control" type="url" name="website" id="website" value="{{ old('website', $user->website) }}" maxlength="191" />
+                                      {!! $errors->first('website', '<span class="alert-msg" aria-hidden="true"><i class="fas fa-times" aria-hidden="true"></i> :message</span>') !!}
+                                  </div>
+                              </div>
+
+                              <!-- Address -->
+                              <div class="form-group{{ $errors->has('address') ? ' has-error' : '' }}">
+                                  <label class="col-md-3 control-label" for="address">{{ trans('general.address') }}</label>
+                                  <div class="col-md-6">
+                                      <input class="form-control" type="text" name="address" id="address" value="{{ old('address', $user->address) }}" maxlength="191" />
+                                      {!! $errors->first('address', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
+                                  </div>
+                              </div>
+
+                              <!-- City -->
+                              <div class="form-group{{ $errors->has('city') ? ' has-error' : '' }}">
+                                  <label class="col-md-3 control-label" for="city">{{ trans('general.city') }}</label>
+                                  <div class="col-md-6">
+                                      <input class="form-control" type="text" name="city" id="city" aria-label="city" value="{{ old('city', $user->city) }}" maxlength="191" />
+                                      {!! $errors->first('city', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
+                                  </div>
+                              </div>
+
+                              <!-- State -->
+                              <div class="form-group{{ $errors->has('state') ? ' has-error' : '' }}">
+                                  <label class="col-md-3 control-label" for="state">{{ trans('general.state') }}</label>
+                                  <div class="col-md-6">
+                                      <input class="form-control" type="text" name="state" id="state" value="{{ old('state', $user->state) }}" maxlength="191" />
+                                      {!! $errors->first('state', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
+                                  </div>
+                              </div>
+
+                              <!-- Country -->
+                              <div class="form-group{{ $errors->has('country') ? ' has-error' : '' }}">
+                                  <label class="col-md-3 control-label" for="country">{{ trans('general.country') }}</label>
+                                  <div class="col-md-6">
+                                      {!! Form::countries('country', old('country', $user->country), 'col-md-12 select2') !!}
+
+                                      <p class="help-block">{{ trans('general.countries_manually_entered_help') }}</p>
+                                      {!! $errors->first('country', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
+                                  </div>
+                              </div>
+
+                              <!-- Zip -->
+                              <div class="form-group{{ $errors->has('zip') ? ' has-error' : '' }}">
+                                  <label class="col-md-3 control-label" for="zip">{{ trans('general.zip') }}</label>
+                                  <div class="col-md-3">
+                                      <input class="form-control" type="text" name="zip" id="zip" value="{{ old('zip', $user->zip) }}" maxlength="10" />
+                                      {!! $errors->first('zip', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
+                                  </div>
+                              </div>
+
+                              <!-- Notes -->
+                              <div class="form-group{!! $errors->has('notes') ? ' has-error' : '' !!}">
+                                  <label for="notes" class="col-md-3 control-label">{{ trans('admin/users/table.notes') }}</label>
+                                  <div class="col-md-6">
+                                      <textarea class="form-control" rows="5" id="notes" name="notes">{{ old('notes', $user->notes) }}</textarea>
+                                      {!! $errors->first('notes', '<span class="alert-msg" aria-hidden="true"><i class="fas fa-times" aria-hidden="true"></i> :message</span>') !!}
+                                  </div>
+                              </div>
+
+                              @if ($snipeSettings->two_factor_enabled!='')
+                                  @if ($snipeSettings->two_factor_enabled=='1')
+                                      <div class="form-group">
+                                          <div class="col-md-9 col-md-offset-3">
+
+                                              @if (config('app.lock_passwords'))
+
+                                                  <label class="form-control form-control--disabled" for="two_factor_optin">
+                                                      <input type="checkbox" value="1" name="two_factor_optin" {{ (old('two_factor_optin', $user->two_factor_optin)) == '1' ? ' checked="checked"' : '' }} aria-label="two_factor_optin" disabled>
+                                                      {{ trans('admin/settings/general.two_factor') }}
+                                                  </label>
+
+                                              @else
+
+                                                  <label class="form-control" for="two_factor_optin">
+                                                      <input type="checkbox" value="1" name="two_factor_optin" {{ (old('two_factor_optin', $user->two_factor_optin)) == '1' ? ' checked="checked"' : '' }} aria-label="two_factor_optin">
+                                                      {{ trans('admin/settings/general.two_factor') }}
+                                                  </label>
+                                                  <p class="help-block">{{ trans('admin/users/general.two_factor_admin_optin_help') }}</p>
+
+                                              @endif
+
+                                          </div>
+                                      </div>
+                                  @endif
+
+                                  @if ((Auth::user()->isSuperUser()) && ($user->two_factor_active_and_enrolled()) && ($snipeSettings->two_factor_enabled!='0') && ($snipeSettings->two_factor_enabled!=''))
+                                      <!-- Reset Two Factor -->
+                                      <div class="form-group">
+                                          <div class="col-md-8 col-md-offset-3 two_factor_resetrow">
+                                              <a class="btn btn-default btn-sm pull-left" id="two_factor_reset" style="margin-right: 10px;"> {{ trans('admin/settings/general.two_factor_reset') }}</a>
+                                              <span id="two_factor_reseticon"></span>
+                                              <span id="two_factor_resetresult"></span>
+                                              <span id="two_factor_resetstatus"></span>
+                                          </div>
+                                          <div class="col-md-8 col-md-offset-3 two_factor_resetrow">
+                                              <p class="help-block">{{ trans('admin/settings/general.two_factor_reset_help') }}</p>
+                                          </div>
+                                      </div>
+                                  @endif
+
                               @endif
 
-                          @endif
+                              <!-- Groups -->
+                              <div class="form-group{{ $errors->has('groups') ? ' has-error' : '' }}">
+                                  <label class="col-md-3 control-label" for="groups[]"> {{ trans('general.groups') }}</label>
+                                  <div class="col-md-6">
 
-                          <!-- Groups -->
-                          <div class="form-group{{ $errors->has('groups') ? ' has-error' : '' }}">
-                              <label class="col-md-3 control-label" for="groups[]"> {{ trans('general.groups') }}</label>
-                              <div class="col-md-6">
+                                      @if ($groups->count())
+                                          @if ((Config::get('app.lock_passwords') || (!Auth::user()->isSuperUser())))
 
-                                  @if ($groups->count())
-                                      @if ((Config::get('app.lock_passwords') || (!Auth::user()->isSuperUser())))
+                                              @if (count($userGroups->keys()) > 0)
+                                                  <ul>
+                                                      @foreach ($groups as $id => $group)
+                                                          {!! ($userGroups->keys()->contains($id) ? '<li>'.e($group).'</li>' : '') !!}
+                                                      @endforeach
+                                                  </ul>
+                                              @endif
 
-                                          @if (count($userGroups->keys()) > 0)
-                                              <ul>
-                                                  @foreach ($groups as $id => $group)
-                                                      {!! ($userGroups->keys()->contains($id) ? '<li>'.e($group).'</li>' : '') !!}
-                                                  @endforeach
-                                              </ul>
-                                          @endif
+                                              <span class="help-block">{{ trans('admin/users/general.group_memberships_helpblock') }}</span>
+                                      @else
+                                       <div class="controls">
+                                        <select
+                                                name="groups[]"
+                                                aria-label="groups[]"
+                                                id="groups[]"
+                                                multiple="multiple"
+                                                class="form-control">
 
-                                          <span class="help-block">{{ trans('admin/users/general.group_memberships_helpblock') }}</span>
-                                  @else
-                                   <div class="controls">
-                                    <select
-                                            name="groups[]"
-                                            aria-label="groups[]"
-                                            id="groups[]"
-                                            multiple="multiple"
-                                            class="form-control">
+                                            @foreach ($groups as $id => $group)
+                                                <option value="{{ $id }}"
+                                                        {{ ($userGroups->keys()->contains($id) ? ' selected="selected"' : '') }}>
+                                                    {{ $group }}
+                                                </option>
+                                            @endforeach
+                                        </select>
 
-                                        @foreach ($groups as $id => $group)
-                                            <option value="{{ $id }}"
-                                                    {{ ($userGroups->keys()->contains($id) ? ' selected="selected"' : '') }}>
-                                                {{ $group }}
-                                            </option>
-                                        @endforeach
-                                    </select>
-
-                                    <span class="help-block">
-                                      {{ trans('admin/users/table.groupnotes') }}
-                                    </span>
-                            </div>
-                                 @endif
-                           @else
-                                      <p>{{ trans('admin/users/table.nogroup') }} <code>{{ trans('admin/settings/general.admin_settings') }} <i class="fa fa-cogs"></i> > {{ trans('general.groups') }} <i class="fas fa-user-friends"></i></code> </p>
-                           @endif
+                                        <span class="help-block">
+                                          {{ trans('admin/users/table.groupnotes') }}
+                                        </span>
+                                </div>
+                                     @endif
+                               @else
+                                          <p>{{ trans('admin/users/table.nogroup') }} <code>{{ trans('admin/settings/general.admin_settings') }} <i class="fa fa-cogs"></i> > {{ trans('general.groups') }} <i class="fas fa-user-friends"></i></code> </p>
+                               @endif
 
+                                  </div>
                               </div>
                           </div>
-                      </div>
-                  </div>
 
+                    </fieldset>
+                      </div>
 
 
 
@@ -596,9 +595,14 @@
             </table>
           </div><!-- /.tab-pane -->
         </div><!-- /.tab-content -->
-        <div class="box-footer text-right">
-          <button type="submit" accesskey="s" class="btn btn-primary"><i class="fas fa-check icon-white" aria-hidden="true"></i> {{ trans('general.save') }}</button>
-        </div>
+          <x-redirect_submit_options
+                  index_route="users.index"
+                  :button_label="trans('general.save')"
+                  :options="[
+                        'index' => trans('admin/hardware/form.redirect_to_all', ['type' => 'users']),
+                        'item' => trans('admin/hardware/form.redirect_to_type', ['type' => trans('general.user')]),
+                        ]"
+          />
       </div><!-- nav-tabs-custom -->
     </form>
   </div> <!--/col-md-8-->
@@ -673,7 +677,7 @@ $(document).ready(function() {
         'bind': 'click',
         'passwordElement': '#password',
         'displayElement': '#generated-password',
-        'passwordLength': 16,
+        'passwordLength': {{ ($settings->pwd_secure_min + 5) }},
         'uppercase': true,
         'lowercase': true,
         'numbers':   true,
diff --git a/resources/views/users/index.blade.php b/resources/views/users/index.blade.php
index 91b9a2a318..44c401381f 100755
--- a/resources/views/users/index.blade.php
+++ b/resources/views/users/index.blade.php
@@ -18,7 +18,7 @@
         @if ($snipeSettings->ldap_enabled == 1)
             <a href="{{ route('ldap/user') }}" class="btn btn-default pull-right"><span class="fas fa-sitemap"></span>{{trans('general.ldap_sync')}}</a>
         @endif
-        <a href="{{ route('users.create') }}" accesskey="n" class="btn btn-primary pull-right" style="margin-right: 5px;">  {{ trans('general.create') }}</a>
+        <a href="{{ route('users.create') }}" {{$snipeSettings->shortcuts_enabled == 1 ? "n" : ''}} class="btn btn-primary pull-right" style="margin-right: 5px;">  {{ trans('general.create') }}</a>
     @endcan
 
     @if (request('status')=='deleted')
@@ -42,12 +42,15 @@
             @include('partials.users-bulk-actions')
 
             <table
+                    data-advanced-search="true"
                     data-click-to-select="true"
                     data-columns="{{ \App\Presenters\UserPresenter::dataTableLayout() }}"
                     data-cookie-id-table="usersTable"
                     data-pagination="true"
                     data-id-table="usersTable"
                     data-search="true"
+                    data-search-highlight="true"
+                    data-show-print="true"
                     data-side-pagination="server"
                     data-show-columns="true"
                     data-show-fullscreen="true"
@@ -66,9 +69,6 @@
                 "ignoreColumn": ["actions","image","change","checkbox","checkincheckout","icon"]
                 }'>
                     </table>
-
-
-                    {{ Form::close() }}
                 </div><!-- /.box-body -->
             </div><!-- /.box -->
         </div>
@@ -82,4 +82,4 @@
 @include ('partials.bootstrap-table')
 
 
-@stop
\ No newline at end of file
+@stop
diff --git a/resources/views/users/print.blade.php b/resources/views/users/print.blade.php
index 5d2cf4f5f8..f767228cb2 100644
--- a/resources/views/users/print.blade.php
+++ b/resources/views/users/print.blade.php
@@ -2,10 +2,16 @@
 <html lang="{{ str_replace('_', '-', app()->getLocale()) }}">
 <head>
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
-    <title>{{ trans('general.assigned_to', ['name' => $show_user->present()->fullName()]) }} - {{ date('Y-m-d H:i', time()) }}</title>
+    @if ((isset($users) && count($users) === 1))
+        <title>{{ trans('general.assigned_to', ['name' => $users[0]->present()->fullName()]) }} - {{ date('Y-m-d H:i', time()) }}</title>
+    @else
+        <title>{{ trans('admin/users/general.print_assigned') }} - {{ date('Y-m-d H:i', time()) }}</title>
+    @endisset
 
     <link rel="shortcut icon" type="image/ico" href="{{ ($snipeSettings) && ($snipeSettings->favicon!='') ?  Storage::disk('public')->url(e($snipeSettings->favicon)) : config('app.url').'/favicon.ico' }}">
 
+    <link rel="stylesheet" href="{{ url(mix('css/dist/bootstrap-table.css')) }}">
+
     {{-- stylesheets --}}
     <link rel="stylesheet" href="{{ url(mix('css/dist/all.css')) }}">
 
@@ -28,10 +34,9 @@
         }
 
         @page {
-            size: A4;
+            size: auto;
         }
-
-
+        
         .print-logo {
             max-height: 40px;
         }
@@ -40,69 +45,73 @@
             margin-top: 20px;
             margin-bottom: 10px;
         }
-
-
     </style>
 
-    <script nonce="{{ csrf_token() }}">
-        window.snipeit = {
-            settings: {
-                "per_page": 50
-            }
-        };
-    </script>
 
 </head>
 <body>
 
+{{-- If we are rendering multiple users we'll add the ability to show/hide EULAs for all of them at once via this button --}}
+@if (count($users) > 1)
+    <div class="pull-right hidden-print">
+        <span>{{ trans('general.show_or_hide_eulas') }}</span>
+        <button class="btn btn-default" type="button" data-toggle="collapse" data-target=".eula-row" aria-expanded="false" aria-controls="eula-row" title="EULAs">
+            <i class="fa fa-eye-slash"></i>
+        </button>
+    </div>
+@endif
+
 @if ($snipeSettings->logo_print_assets=='1')
     @if ($snipeSettings->brand == '3')
 
         <h2>
             @if ($snipeSettings->logo!='')
-                <img class="print-logo" src="{{ config('app.url') }}/uploads/{{ $snipeSettings->logo }}">
+                <img class="print-logo" src="{{ config('app.url') }}/uploads/{{ $snipeSettings->acceptance_pdf_logo }}">
             @endif
             {{ $snipeSettings->site_name }}
         </h2>
     @elseif ($snipeSettings->brand == '2')
         @if ($snipeSettings->logo!='')
-            <img class="print-logo" src="{{ config('app.url') }}/uploads/{{ $snipeSettings->logo }}">
+            <img class="print-logo" src="{{ config('app.url') }}/uploads/{{ $snipeSettings->acceptance_pdf_logo }}">
         @endif
     @else
         <h2>{{ $snipeSettings->site_name }}</h2>
     @endif
 @endif
 
-<h3>
-    {{ trans('general.assigned_to', ['name' => $show_user->present()->fullName()]) }}
-    {{ ($show_user->employee_num!='') ? ' (#'.$show_user->employee_num.') ' : '' }}
-    {{ ($show_user->jobtitle!='' ? ' - '.$show_user->jobtitle : '') }}
-</h3>
-<p></p>{{ trans('admin/users/general.all_assigned_list_generation')}} {{ Helper::getFormattedDateObject(now(), 'datetime', false) }}</body>
-    @if ($assets->count() > 0)
+@foreach ($users as $show_user)
+    <div id="start_of_user_section"> {{-- used for page breaks when printing --}}</div>
+    <h3>
+        {{ trans('general.assigned_to', ['name' => $show_user->present()->fullName()]) }}
+        {{ ($show_user->employee_num!='') ? ' (#'.$show_user->employee_num.') ' : '' }}
+        {{ ($show_user->jobtitle!='' ? ' - '.$show_user->jobtitle : '') }}
+    </h3>
+    <p></p>{{ trans('admin/users/general.all_assigned_list_generation')}} {{ Helper::getFormattedDateObject(now(), 'datetime', false) }}
+
+    @if ($show_user->assets->count() > 0)
         @php
             $counter = 1;
         @endphp
 
         <div id="assets-toolbar">
-            <h4>{{ trans_choice('general.countable.assets', $assets->count(), ['count' => $assets->count()]) }}
+            <h4>{{ trans_choice('general.countable.assets', $show_user->assets->count(), ['count' => $show_user->assets->count()]) }}
             </h4>
         </div>
 
         <table
-                class="snipe-table table table-striped inventory"
-                id="AssetsAssigned"
-                data-pagination="false"
-                data-id-table="AssetsAssigned"
-                data-search="false"
-                data-side-pagination="client"
-                data-sortable="true"
-                data-toolbar="#assets-toolbar"
-                data-show-columns="true"
-                data-sort-order="desc"
-                data-sort-name="created_at"
-                data-show-columns-toggle-all="true"
-                data-cookie-id-table="AssetsAssigned">
+            class="snipe-table table table-striped inventory"
+            id="AssetsAssigned"
+            data-pagination="false"
+            data-id-table="AssetsAssigned"
+            data-search="false"
+            data-side-pagination="client"
+            data-sortable="true"
+            data-toolbar="#assets-toolbar"
+            data-show-columns="true"
+            data-sort-order="desc"
+            data-sort-name="created_at"
+            data-show-columns-toggle-all="true"
+            data-cookie-id-table="AssetsAssigned">
             <thead>
                 <th data-field="asset_id" data-sortable="false" data-visible="true" data-switchable="false">#</th>
                 <th data-field="asset_image" data-sortable="true" data-visible="false" data-switchable="true">{{ trans('general.image') }}</th>
@@ -114,11 +123,13 @@
                 <th data-field="asset_location" data-sortable="true" data-visible="false">{{ trans('general.location') }}</th>
                 <th data-field="asset_serial" data-sortable="true" data-visible="true">{{ trans('admin/hardware/form.serial') }}</th>
                 <th data-field="asset_checkout_date" data-sortable="true" data-visible="true">{{ trans('admin/hardware/table.checkout_date') }}</th>
-                <th data-field="signature" data-sortable="true" data-visible="true">{{ trans('general.signature') }}</th>
+                <th data-field="signature" data-sortable="false" data-visible="true">{{ trans('general.signature') }}</th>
             </thead>
             <tbody>
-            @foreach ($assets as $asset)
-
+            @foreach ($show_user->assets as $asset)
+                @php
+                    if (($asset->model->category) && ($asset->model->category->getEula())) $eulas[] = $asset->model->category->getEula()
+                @endphp
                 <tr>
                     <td>{{ $counter }}</td>
                     <td>
@@ -136,8 +147,8 @@
                     <td>
                         {{ Helper::getFormattedDateObject($asset->last_checkout, 'datetime', false) }}</td>
                     <td>
-                        @if (($asset->assetlog->first()) && ($asset->assetlog->first()->accept_signature!=''))
-                            <img style="width:auto;height:100px;" src="{{ asset('/') }}display-sig/{{ $asset->assetlog->first()->accept_signature }}">
+                        @if ($asset->getLatestSignedAcceptance($show_user))
+                            <img style="width:auto;height:100px;" src="{{ asset('/') }}display-sig/{{ $asset->getLatestSignedAcceptance($show_user)->accept_signature }}">
                         @endif
                     </td>
                 </tr>
@@ -146,23 +157,28 @@
                         $assignedCounter = 1;
                     @endphp
                     @foreach ($asset->assignedAssets as $asset)
-
                         <tr>
                             <td>{{ $counter }}.{{ $assignedCounter }}</td>
-                            <td data-formatter="imageFormatter">
+                            <td>
                                 @if ($asset->getImageUrl())
                                     <img src="{{ $asset->getImageUrl() }}" class="thumbnail" style="max-height: 50px;">
                                 @endif
                             </td>
                             <td>{{ $asset->asset_tag }}</td>
                             <td>{{ $asset->name }}</td>
-                            <td>{{ $asset->model->category->name }}</td>
+                            <td>{{ (($asset->model) && ($asset->model->category)) ? $asset->model->category->name : trans('general.invalid_category') }}</td>
+                            <td>{{ ($asset->model) ? $asset->model->name : trans('general.invalid_model') }}</td>
                             <td>{{ ($asset->defaultLoc) ? $asset->defaultLoc->name : '' }}</td>
                             <td>{{ ($asset->location) ? $asset->location->name : '' }}</td>
-                            <td>{{ $asset->model->name }}</td>
                             <td>{{ $asset->serial }}</td>
-                            <td>{{ $asset->last_checkout }}</td>
-                            <td><img style="width:auto;height:100px;" src="{{ asset('/') }}display-sig/{{ $asset->assetlog->first()->accept_signature }}"></td>
+                            <td>
+                                {{ Helper::getFormattedDateObject($asset->last_checkout, 'datetime', false) }}
+                            </td>
+                            <td>
+                                @if ($asset->getLatestSignedAcceptance($show_user))
+                                    <img style="width:auto;height:100px;" src="{{ asset('/') }}display-sig/{{ $asset->getLatestSignedAcceptance($show_user)->accept_signature }}">
+                                @endif
+                            </td>
                         </tr>
                         @php
                             $assignedCounter++
@@ -177,50 +193,60 @@
         </table>
     @endif
 
-    @if ($licenses->count() > 0)
+    @if ($show_user->licenses->count() > 0)
         <div id="licenses-toolbar">
-            <h4>{{ trans_choice('general.countable.licenses', $licenses->count(), ['count' => $licenses->count()]) }}</h4>
+            <h4>{{ trans_choice('general.countable.licenses', $show_user->licenses->count(), ['count' => $show_user->licenses->count()]) }}</h4>
         </div>
 
         <table
-                class="snipe-table table table-striped inventory"
-                id="licensessAssigned"
-                data-toolbar="#licenses-toolbar"
-                data-pagination="false"
-                data-id-table="licensessAssigned"
-                data-search="false"
-                data-side-pagination="client"
-                data-sortable="true"
-                data-show-columns="true"
-                data-sort-order="desc"
-                data-sort-name="created_at"
-                data-show-columns-toggle-all="true"
-                data-cookie-id-table="licensessAssigned">
+            class="snipe-table table table-striped inventory"
+            id="licensessAssigned"
+            data-toolbar="#licenses-toolbar"
+            data-pagination="false"
+            data-id-table="licensessAssigned"
+            data-search="false"
+            data-side-pagination="client"
+            data-sortable="true"
+            data-show-columns="true"
+            data-sort-order="desc"
+            data-sort-name="created_at"
+            data-show-columns-toggle-all="true"
+            data-cookie-id-table="licensessAssigned">
             <thead>
             <tr>
-                <th style="width: 20px;" data-sortable="false" data-switchable="false">#</th>
-                <th style="width: 40%;" data-sortable="true" data-switchable="false">{{ trans('general.name') }}</th>
-                <th style="width: 50%;" data-sortable="true">{{ trans('admin/licenses/form.license_key') }}</th>
-                <th style="width: 10%;" data-sortable="true">{{ trans('admin/hardware/table.checkout_date') }}</th>
+                <th data-sortable="false" data-switchable="false">#</th>
+                <th data-sortable="true" data-switchable="false">{{ trans('general.name') }}</th>
+                <th data-sortable="true">{{ trans('admin/licenses/form.license_key') }}</th>
+                <th data-sortable="true">{{ trans('admin/hardware/table.checkout_date') }}</th>
+                <th data-field="signature" data-sortable="false" data-visible="true">{{ trans('general.signature') }}</th>
             </tr>
             </thead>
             @php
                 $lcounter = 1;
             @endphp
 
-            @foreach ($licenses as $license)
-
+            @foreach ($show_user->licenses as $license)
+                @php
+                    if (($license->category) && ($license->category->getEula())) $eulas[] = $license->category->getEula()
+                @endphp
                 <tr>
                     <td>{{ $lcounter }}</td>
                     <td>{{ $license->name }}</td>
                     <td>
                         @can('viewKeys', $license)
-                            {{ $license->serial }}
+                            <p class="monospace">{{ $license->serial }}</p>
                         @else
                             <i class="fa-lock" aria-hidden="true"></i> {{ str_repeat('x', 15) }}
                         @endcan
                     </td>
-                    <td>{{  $license->pivot->updated_at }}</td>
+                    <td>
+                        {{ Helper::getFormattedDateObject($license->pivot->updated_at, 'datetime', false) }}
+                    </td>
+                    <td>
+                        @if ($license->getLatestSignedAcceptance($show_user))
+                            <img style="width:auto;height:100px;" src="{{ asset('/') }}display-sig/{{ $license->getLatestSignedAcceptance($show_user)->accept_signature }}">
+                        @endif
+                    </td>
                 </tr>
                 @php
                     $lcounter++
@@ -230,25 +256,25 @@
     @endif
 
 
-    @if ($accessories->count() > 0)
+    @if ($show_user->accessories->count() > 0)
         <div id="accessories-toolbar">
-            <h4>{{ trans_choice('general.countable.accessories', $accessories->count(), ['count' => $accessories->count()]) }}</h4>
+            <h4>{{ trans_choice('general.countable.accessories', $show_user->accessories->count(), ['count' => $show_user->accessories->count()]) }}</h4>
         </div>
 
         <table
-                class="snipe-table table table-striped inventory"
-                id="accessoriesAssigned"
-                data-toolbar="#accessories-toolbar"
-                data-pagination="false"
-                data-id-table="accessoriesAssigned"
-                data-search="false"
-                data-side-pagination="client"
-                data-sortable="true"
-                data-show-columns="true"
-                data-sort-order="desc"
-                data-sort-name="created_at"
-                data-show-columns-toggle-all="true"
-                data-cookie-id-table="accessoriesAssigned">
+            class="snipe-table table table-striped inventory"
+            id="accessoriesAssigned"
+            data-toolbar="#accessories-toolbar"
+            data-pagination="false"
+            data-id-table="accessoriesAssigned"
+            data-search="false"
+            data-side-pagination="client"
+            data-sortable="true"
+            data-show-columns="true"
+            data-sort-order="desc"
+            data-sort-name="created_at"
+            data-show-columns-toggle-all="true"
+            data-cookie-id-table="accessoriesAssigned">
             <thead>
             <tr>
                 <th style="width: 20px;" data-sortable="false" data-switchable="false">#</th>
@@ -263,8 +289,11 @@
                 $acounter = 1;
             @endphp
 
-            @foreach ($accessories as $accessory)
+            @foreach ($show_user->accessories as $accessory)
                 @if ($accessory)
+                    @php
+                        if (($accessory->category) && ($accessory->category->getEula())) $eulas[] = $accessory->category->getEula()
+                    @endphp
                     <tr>
                         <td>{{ $acounter }}</td>
                         <td>
@@ -274,11 +303,13 @@
                         </td>
                         <td>{{ ($accessory->manufacturer) ? $accessory->manufacturer->name : '' }} {{ $accessory->name }} {{ $accessory->model_number }}</td>
                         <td>{{ $accessory->category->name }}</td>
-                        <td>{{ $accessory->pivot->created_at }}</td>
+                        <td>
+                            {{ Helper::getFormattedDateObject($accessory->pivot->created_at, 'datetime', false) }}
+                        </td>
 
                         <td>
-                            @if (($accessory->assetlog->first()) && ($accessory->assetlog->first()->accept_signature!=''))
-                            <img style="width:auto;height:100px;" src="{{ asset('/') }}display-sig/{{ $accessory->assetlog->first()->accept_signature }}">
+                            @if ($accessory->getLatestSignedAcceptance($show_user))
+                                <img style="width:auto;height:100px;" src="{{ asset('/') }}display-sig/{{ $accessory->getLatestSignedAcceptance($show_user)->accept_signature }}">
                             @endif
                         </td>
                     </tr>
@@ -290,25 +321,25 @@
         </table>
     @endif
 
-    @if ($consumables->count() > 0)
+    @if ($show_user->consumables->count() > 0)
         <div id="consumables-toolbar">
-            <h4>{{ trans_choice('general.countable.consumables', $consumables->count(), ['count' => $consumables->count()]) }}</h4>
+            <h4>{{ trans_choice('general.countable.consumables', $show_user->consumables->count(), ['count' => $show_user->consumables->count()]) }}</h4>
         </div>
 
         <table
-                class="snipe-table table table-striped inventory"
-                id="consumablesAssigned"
-                data-pagination="false"
-                data-toolbar="#consumables-toolbar"
-                data-id-table="consumablesAssigned"
-                data-search="false"
-                data-side-pagination="client"
-                data-sortable="true"
-                data-show-columns="true"
-                data-sort-order="desc"
-                data-sort-name="created_at"
-                data-show-columns-toggle-all="true"
-                data-cookie-id-table="consumablesAssigned">
+            class="snipe-table table table-striped inventory"
+            id="consumablesAssigned"
+            data-pagination="false"
+            data-toolbar="#consumables-toolbar"
+            data-id-table="consumablesAssigned"
+            data-search="false"
+            data-side-pagination="client"
+            data-sortable="true"
+            data-show-columns="true"
+            data-sort-order="desc"
+            data-sort-name="created_at"
+            data-show-columns-toggle-all="true"
+            data-cookie-id-table="consumablesAssigned">
             <thead>
             <tr>
                 <th style="width: 20px;" data-sortable="false" data-switchable="false"></th>
@@ -323,24 +354,27 @@
                 $ccounter = 1;
             @endphp
 
-            @foreach ($consumables as $consumable)
+            @foreach ($show_user->consumables as $consumable)
                 @if ($consumable)
+                    @php
+                        if (($consumable->category) && ($consumable->category->getEula())) $eulas[] = $consumable->category->getEula()
+                    @endphp
                     <tr>
                         <td>{{ $ccounter }}</td>
-
-
                         <td>
                         @if ($consumable->deleted_at!='')
                             <td>{{ ($consumable->manufacturer) ? $consumable->manufacturer->name : '' }}  {{ $consumable->name }} {{ $consumable->model_number }}</td>
                             @else
-                            {{ ($consumable->manufacturer) ? $consumable->manufacturer->name : '' }}  {{ $consumable->name }} {{ $consumable->model_number }}
+                                {{ ($consumable->manufacturer) ? $consumable->manufacturer->name : '' }}  {{ $consumable->name }} {{ $consumable->model_number }}
                             @endif
                             </td>
                             <td>{{ ($consumable->category) ? $consumable->category->name : ' invalid/deleted category' }} </td>
-                            <td>{{  $consumable->pivot->created_at }}</td>
                             <td>
-                                @if (($consumable->assetlog->first()) && ($consumable->assetlog->first()->accept_signature!=''))
-                                    <img style="width:auto;height:100px;" src="{{ asset('/') }}display-sig/{{ $consumable->assetlog->first()->accept_signature }}">
+                                {{ Helper::getFormattedDateObject($consumable->pivot->created_at, 'datetime', false) }}
+                            </td>
+                            <td>
+                                @if ($consumable->getLatestSignedAcceptance($show_user))
+                                    <img style="width:auto;height:100px;" src="{{ asset('/') }}display-sig/{{ $consumable->getLatestSignedAcceptance($show_user)->accept_signature }}">
                                 @endif
                             </td>
                     </tr>
@@ -352,52 +386,72 @@
         </table>
     @endif
 
+    @php
+        if (!empty($eulas)) $eulas = array_unique($eulas);
+    @endphp
+    {{-- This may have been render at the top of the page if we're rendering more than one user... --}}
+    @if (count($users) === 1 && !empty($eulas))
+        <p></p>
+        <div class="pull-right">
+            <button class="btn btn-default hidden-print" type="button" data-toggle="collapse" data-target=".eula-row" aria-expanded="false" aria-controls="eula-row" title="EULAs">
+                <i class="fa fa-eye-slash"></i>
+            </button>
+        </div>
+    @endif
+
     <table style="margin-top: 80px;">
+        @if (!empty($eulas))
+        <tr class="collapse eula-row">
+            <td style="padding-right: 10px; vertical-align: top; font-weight: bold;">EULA</td>
+            <td style="padding-right: 10px; vertical-align: top; padding-bottom: 80px;" colspan="3">
+                @foreach ($eulas as $key => $eula)
+                    {!! $eula !!}
+                @endforeach
+            </td>
+        </tr>
+        @endif
         <tr>
             <td style="padding-right: 10px; vertical-align: top; font-weight: bold;">{{ trans('general.signed_off_by') }}:</td>
-            <td style="padding-right: 10px; vertical-align: top;">________________________________________________________</td>
-            <td style="padding-right: 10px; vertical-align: top;">________________________________________________________</td>
-            <td>_____________________</td>
+            <td style="padding-right: 10px; vertical-align: top;">______________________________________</td>
+            <td style="padding-right: 10px; vertical-align: top;">______________________________________</td>
+            <td>_____________</td>
         </tr>
         <tr style="height: 80px;">
             <td></td>
-            <td style="padding-right: 10px; vertical-align: top;">Name</td>
-            <td style="padding-right: 10px; vertical-align: top;">Signature</td>
+            <td style="padding-right: 10px; vertical-align: top;">{{ trans('general.name') }}</td>
+            <td style="padding-right: 10px; vertical-align: top;">{{ trans('general.signature') }}</td>
             <td style="padding-right: 10px; vertical-align: top;">{{ trans('general.date') }}</td>
         </tr>
-
         <tr>
             <td style="padding-right: 10px; vertical-align: top; font-weight: bold;">{{ trans('admin/users/table.manager') }}:</td>
-            <td style="padding-right: 10px; vertical-align: top;">________________________________________________________</td>
-            <td style="padding-right: 10px; vertical-align: top;">________________________________________________________</td>
-            <td>_____________________</td>
+            <td style="padding-right: 10px; vertical-align: top;">______________________________________</td>
+            <td style="padding-right: 10px; vertical-align: top;">______________________________________</td>
+            <td>_____________</td>
         </tr>
         <tr>
             <td></td>
-            <td style="padding-right: 10px; vertical-align: top;">Name</td>
-            <td style="padding-right: 10px; vertical-align: top;">Signature</td>
+            <td style="padding-right: 10px; vertical-align: top;">{{ trans('general.name') }}</td>
+            <td style="padding-right: 10px; vertical-align: top;">{{ trans('general.signature') }}</td>
             <td style="padding-right: 10px; vertical-align: top;">{{ trans('general.date') }}</td>
             <td></td>
         </tr>
 
     </table>
+@endforeach
 
 {{-- Javascript files --}}
 <script src="{{ url(mix('js/dist/all.js')) }}" nonce="{{ csrf_token() }}"></script>
 
-
-@push('css')
-    <link rel="stylesheet" href="{{ url(mix('css/dist/bootstrap-table.css')) }}">
-@endpush
-
-@push('js')
-
 <script src="{{ url(mix('js/dist/bootstrap-table.js')) }}"></script>
+<script src="{{ url(mix('js/dist/bootstrap-table-locale-all.min.js')) }}"></script>
+
+<!-- load english again here, even though it's in the all.js file, because if BS table doesn't have the translation, it otherwise defaults to chinese. See https://bootstrap-table.com/docs/api/table-options/#locale -->
+<script src="{{ url(mix('js/dist/bootstrap-table-en-US.min.js')) }}"></script>
 
 <script>
     $('.snipe-table').bootstrapTable('destroy').each(function () {
-
         console.log('BS table loaded');
+
         data_export_options = $(this).attr('data-export-options');
         export_options = data_export_options ? JSON.parse(data_export_options) : {};
         export_options['htmlContent'] = false; // this is already the default; but let's be explicit about it
@@ -469,8 +523,6 @@
         });
     });
 </script>
-@endpush
-
 
 </body>
 </html>
diff --git a/resources/views/users/view.blade.php b/resources/views/users/view.blade.php
index b090ca3dd8..58b0cd3402 100755
--- a/resources/views/users/view.blade.php
+++ b/resources/views/users/view.blade.php
@@ -12,14 +12,28 @@
 
 
 <div class="row">
+
+    @if ($user->deleted_at!='')
+        <div class="col-md-12">
+            <div class="callout callout-warning">
+                <x-icon type="warning" />
+                {{ trans('admin/users/message.user_deleted_warning') }}
+            </div>
+        </div>
+    @endif
+
   <div class="col-md-12">
+
+
+
+
     <div class="nav-tabs-custom">
       <ul class="nav nav-tabs hidden-print">
 
         <li class="active">
           <a href="#details" data-toggle="tab">
             <span class="hidden-lg hidden-md">
-            <i class="fas fa-info-circle fa-2x"></i>
+                <x-icon type="info-circle" class="fa-2x" />
             </span>
             <span class="hidden-xs hidden-sm">{{ trans('admin/users/general.info') }}</span>
           </a>
@@ -28,10 +42,10 @@
         <li>
           <a href="#asset" data-toggle="tab">
             <span class="hidden-lg hidden-md">
-            <i class="fas fa-barcode fa-2x" aria-hidden="true"></i>
+            <x-icon type="assets" class="fa-2x" />
             </span>
             <span class="hidden-xs hidden-sm">{{ trans('general.assets') }}
-              {!! ($user->assets()->AssetsForShow()->count() > 0 ) ? '<badge class="badge badge-secondary">'.number_format($user->assets()->AssetsForShow()->count()).'</badge>' : '' !!}
+              {!! ($user->assets()->AssetsForShow()->count() > 0 ) ? '<badge class="badge badge-secondary">'.number_format($user->assets()->AssetsForShow()->withoutTrashed()->count()).'</badge>' : '' !!}
             </span>
           </a>
         </li>
@@ -39,7 +53,7 @@
         <li>
           <a href="#licenses" data-toggle="tab">
             <span class="hidden-lg hidden-md">
-            <i class="far fa-save fa-2x"></i>
+            <x-icon type="licenses" class="fa-2x" />
             </span>
             <span class="hidden-xs hidden-sm">{{ trans('general.licenses') }}
               {!! ($user->licenses->count() > 0 ) ? '<badge class="badge badge-secondary">'.number_format($user->licenses->count()).'</badge>' : '' !!}
@@ -50,8 +64,8 @@
         <li>
           <a href="#accessories" data-toggle="tab">
             <span class="hidden-lg hidden-md">
-            <i class="far fa-keyboard fa-2x"></i>
-            </span>
+            <x-icon type="accessories" class="fa-2x" />
+            </span> 
             <span class="hidden-xs hidden-sm">{{ trans('general.accessories') }}
               {!! ($user->accessories->count() > 0 ) ? '<badge class="badge badge-secondary">'.number_format($user->accessories->count()).'</badge>' : '' !!}
             </span>
@@ -61,7 +75,7 @@
         <li>
           <a href="#consumables" data-toggle="tab">
             <span class="hidden-lg hidden-md">
-                <i class="fas fa-tint fa-2x"></i>
+                <x-icon type="consumables" class="fa-2x" />
             </span>
             <span class="hidden-xs hidden-sm">{{ trans('general.consumables') }}
               {!! ($user->consumables->count() > 0 ) ? '<badge class="badge badge-secondary">'.number_format($user->consumables->count()).'</badge>' : '' !!}
@@ -72,7 +86,7 @@
         <li>
           <a href="#files" data-toggle="tab">
             <span class="hidden-lg hidden-md">
-                <i class="far fa-file fa-2x"></i>
+                <x-icon type="files" class="fa-2x" />
             </span>
             <span class="hidden-xs hidden-sm">{{ trans('general.file_uploads') }}
               {!! ($user->uploads->count() > 0 ) ? '<badge class="badge badge-secondary">'.number_format($user->uploads->count()).'</badge>' : '' !!}
@@ -83,7 +97,7 @@
         <li>
           <a href="#history" data-toggle="tab">
             <span class="hidden-lg hidden-md">
-                <i class="fas fa-history fa-2x"></i>
+                <x-icon type="history" class="fa-2x" />
             </span>
             <span class="hidden-xs hidden-sm">{{ trans('general.history') }}</span>
           </a>
@@ -93,7 +107,8 @@
         <li>
           <a href="#managed-locations" data-toggle="tab">
             <span class="hidden-lg hidden-md">
-              <i class="fas fa-map-marker-alt fa-2x"></i></span>
+                <x-icon type="locations" class="fa-2x" />
+            </span>
             <span class="hidden-xs hidden-sm">{{ trans('admin/users/table.managed_locations') }}
               {!! ($user->managedLocations->count() > 0 ) ? '<badge class="badge badge-secondary">'.number_format($user->managedLocations->count()).'</badge>' : '' !!}
           </a>
@@ -103,8 +118,9 @@
           @if ($user->managesUsers->count() >= 0 )
               <li>
                   <a href="#managed-users" data-toggle="tab">
-            <span class="hidden-lg hidden-md">
-              <i class="fa-solid fa-users fa-2x"></i></span>
+                    <span class="hidden-lg hidden-md">
+                      <x-icon type="users" class="fa-2x" />
+                    </span>
                       <span class="hidden-xs hidden-sm">{{ trans('admin/users/table.managed_users') }}
                       {!! ($user->managesUsers->count() > 0 ) ? '<badge class="badge badge-secondary">'.number_format($user->managesUsers->count()).'</badge>' : '' !!}
                   </a>
@@ -136,8 +152,8 @@
         @can('update', \App\Models\User::class)
           <li class="pull-right">
               <a href="#" data-toggle="modal" data-target="#uploadFileModal">
-              <span class="hidden-xs"><i class="fas fa-paperclip" aria-hidden="true"></i></span>
-              <span class="hidden-lg hidden-md hidden-xl"><i class="fas fa-paperclip fa-2x" aria-hidden="true"></i></span>
+              <span class="hidden-xs"><x-icon type="paperclip" /></span>
+              <span class="hidden-lg hidden-md hidden-xl"><x-icon type="paperclip" class="fa-2x" /></span>
               <span class="hidden-xs hidden-sm">{{ trans('button.upload') }}</span>
               </a>
           </li>
@@ -148,7 +164,6 @@
         <div class="tab-pane active" id="details">
           <div class="row">
 
-
             @if ($user->deleted_at!='')
               <div class="col-md-12">
                 <div class="callout callout-warning">
@@ -158,16 +173,16 @@
               </div>
             @endif
 
+        <div class="info-stack-container">
             <!-- Start button column -->
-            <div class="col-md-3 col-xs-12 col-sm-push-9">
-
+            <div class="col-md-3 col-xs-12 col-sm-push-9 info-stack">
 
 
               <div class="col-md-12 text-center">
 
                  @if (($user->isSuperUser()) || ($user->hasAccess('admin')))
-                    <i class="fas fa-crown fa-2x{{  ($user->isSuperUser()) ? ' text-danger' : ' text-orange'}}"></i>
-                    <div class="{{  ($user->isSuperUser()) ? 'text-danger' : ' text-orange'}}" style="font-weight: bold">{{  ($user->isSuperUser()) ? strtolower(trans('general.superuser')) : strtolower(trans('general.admin')) }}</div>
+                      <x-icon type="superadmin" class="fa-2x {{  ($user->isSuperUser()) ? 'text-danger' : 'text-orange'}}" />
+                        <div class="{{  ($user->isSuperUser()) ? 'text-danger' : ' text-orange'}}" style="font-weight: bold">{{  ($user->isSuperUser()) ? strtolower(trans('general.superuser')) : strtolower(trans('general.admin_user')) }}</div>
                   @endif
 
 
@@ -176,26 +191,27 @@
                 <img src="{{ $user->present()->gravatar() }}"  class=" img-thumbnail hidden-print" style="margin-bottom: 20px;" alt="{{ $user->present()->fullName() }}">
                </div>
 
-
-
               @can('update', $user)
                 <div class="col-md-12">
-                  <a href="{{ route('users.edit', $user->id) }}" style="width: 100%;" class="btn btn-sm btn-primary hidden-print">{{ trans('admin/users/general.edit') }}</a>
+                  <a href="{{ ($user->deleted_at=='') ? route('users.edit', $user->id) : '#' }}" style="width: 100%;" class="btn btn-sm btn-warning btn-social hidden-print{{ ($user->deleted_at!='') ? ' disabled' : '' }}">
+                      <x-icon type="edit" />
+                      {{ trans('admin/users/general.edit') }}
+                  </a>
                 </div>
               @endcan
 
-              @can('create', $user)
-                <div class="col-md-12" style="padding-top: 5px;">
-                  <a href="{{ route('users.clone.show', $user->id) }}" style="width: 100%;" class="btn btn-sm btn-primary hidden-print">{{ trans('admin/users/general.clone') }}</a>
-                </div>
-               @endcan
-
                 @can('view', $user)
                 <div class="col-md-12" style="padding-top: 5px;">
-                @if($user->allAssignedCount() != '0')
-                  <a href="{{ route('users.print', $user->id) }}" style="width: 100%;" class="btn btn-sm btn-primary hidden-print" target="_blank" rel="noopener">{{ trans('admin/users/general.print_assigned') }}</a>
+
+                @if($user->allAssignedCount() != '0') 
+                  <a href="{{ route('users.print', $user->id) }}" style="width: 100%;" class="btn btn-sm btn-primary btn-social hidden-print" target="_blank" rel="noopener">
+                      <x-icon type="print" />
+                      {{ trans('admin/users/general.print_assigned') }}
+                  </a>
                   @else
-                  <button style="width: 100%;" class="btn btn-sm btn-primary hidden-print" rel="noopener" disabled title="{{ trans('admin/users/message.user_has_no_assets_assigned') }}">{{ trans('admin/users/general.print_assigned') }}</button>
+                  <button style="width: 100%;" class="btn btn-sm btn-primary btn-social hidden-print" rel="noopener" disabled title="{{ trans('admin/users/message.user_has_no_assets_assigned') }}">
+                      <x-icon type="print" />
+                      {{ trans('admin/users/general.print_assigned') }}</button>
                 @endif
                 </div>
                 @endcan
@@ -205,12 +221,21 @@
                   @if(!empty($user->email) && ($user->allAssignedCount() != '0'))
                     <form action="{{ route('users.email',['userId'=> $user->id]) }}" method="POST">
                       {{ csrf_field() }}
-                      <button style="width: 100%;" class="btn btn-sm btn-primary hidden-print" rel="noopener">{{ trans('admin/users/general.email_assigned') }}</button>
+                      <button class="btn-block btn btn-sm btn-primary btn-social hidden-print" rel="noopener">
+                          <x-icon type="email" />
+                          {{ trans('admin/users/general.email_assigned') }}
+                      </button>
                     </form>
                   @elseif(!empty($user->email) && ($user->allAssignedCount() == '0'))
-                      <button style="width: 100%;" class="btn btn-sm btn-primary hidden-print" rel="noopener" disabled title="{{ trans('admin/users/message.user_has_no_assets_assigned') }}">{{ trans('admin/users/general.email_assigned') }}</button>
+                      <button class="btn btn-block btn-sm btn-primary btn-social hidden-print" rel="noopener" disabled title="{{ trans('admin/users/message.user_has_no_assets_assigned') }}">
+                          <x-icon type="email" />
+                          {{ trans('admin/users/general.email_assigned') }}
+                      </button>
                   @else
-                      <button style="width: 100%;" class="btn btn-sm btn-primary hidden-print" rel="noopener" disabled title="{{ trans('admin/users/message.user_has_no_email') }}">{{ trans('admin/users/general.email_assigned') }}</button>
+                      <button class="btn btn-block btn-sm btn-primary btn-social hidden-print" rel="noopener" disabled title="{{ trans('admin/users/message.user_has_no_email') }}">
+                          <x-icon type="email" />
+                          {{ trans('admin/users/general.email_assigned') }}
+                      </button>
                   @endif
                   </div>
                 @endcan
@@ -218,29 +243,47 @@
                 @can('update', $user)
                   @if (($user->activated == '1') && ($user->ldap_import == '0'))
                   <div class="col-md-12" style="padding-top: 5px;">
-                    @if($user->email != '')
+                    @if (($user->email != '') && ($user->activated=='1'))
                       <form action="{{ route('users.password',['userId'=> $user->id]) }}" method="POST">
                           {{ csrf_field() }}
-                      <button style="width: 100%;" class="btn btn-sm btn-primary hidden-print">{{ trans('button.send_password_link') }}</button>
+                      <button class="btn btn-block btn-sm btn-primary btn-social hidden-print">
+                          <x-icon type="password" />
+                          {{ trans('button.send_password_link') }}
+                      </button>
                       </form>
                     @else
-                      <button style="width: 100%;" class="btn btn-sm btn-primary hidden-print" rel="noopener" disabled title="{{ trans('admin/users/message.user_has_no_email') }}">{{ trans('button.send_password_link') }}</button>
+                      <button class="btn btn-block btn-sm btn-primary btn-social hidden-print" rel="noopener" disabled title="{{ trans('admin/users/message.user_has_no_email') }}">
+                          <x-icon type="email" />
+                          {{ trans('button.send_password_link') }}
+                      </button>
                     @endif
                   </div>
                   @endif
                 @endcan
 
-                @can('delete', $user)
+                @can('create', $user)
+                    <div class="col-md-12" style="padding-top: 5px;">
+                        <a href="{{ route('users.clone.show', $user->id) }}" class="btn btn-block btn-sm btn-info btn-social hidden-print">
+                            <x-icon type="clone" />
+                            {{ trans('admin/users/general.clone') }}
+                        </a>
+                    </div>
+                @endcan
+
+
+            @can('delete', $user)
                   @if ($user->deleted_at=='')
                     <div class="col-md-12" style="padding-top: 30px;">
                         @if ($user->isDeletable())
-                          <form action="{{route('users.destroy',$user->id)}}" method="POST">
-                            {{csrf_field()}}
-                            {{ method_field("DELETE")}}
-                            <button style="width: 100%;" class="btn btn-sm btn-warning hidden-print">{{ trans('button.delete')}}</button>
-                          </form>
+                            <a href="#" class="btn-block delete-asset btn btn-sm btn-danger btn-social hidden-print" data-toggle="modal" data-title="{{ trans('general.delete') }}" data-content="{{ trans('general.sure_to_delete_var', ['item' => $user->present()->fullName]) }}" data-target="#dataConfirmModal">
+                                <x-icon type="delete" />
+                                {{ trans('button.delete')}}
+                            </a>
                             @else
-                            <button style="width: 100%;" class="btn btn-sm btn-warning hidden-print disabled">{{ trans('button.delete')}}</button>
+                            <button class="btn-block btn btn-sm btn-danger btn-social hidden-print disabled">
+                                <x-icon type="delete" />
+                                {{ trans('button.delete')}}
+                            </button>
                         @endif
                     </div>
                     <div class="col-md-12" style="padding-top: 5px;">
@@ -250,14 +293,20 @@
                         <input type="hidden" name="bulk_actions" value="delete" />
 
                         <input type="hidden" name="ids[{{ $user->id }}]" value="{{ $user->id }}" />
-                        <button style="width: 100%;" class="btn btn-sm btn-danger hidden-print">{{ trans('button.checkin_and_delete') }}</button>
+                        <button class="btn btn-block btn-sm btn-danger btn-social hidden-print">
+                            <x-icon type="checkin-and-delete" />
+                            {{ trans('button.checkin_and_delete') }}
+                        </button>
                       </form>
                     </div>
                   @else
                     <div class="col-md-12" style="padding-top: 5px;">
                         <form method="POST" action="{{ route('users.restore.store', $user->id) }}">
                             @csrf
-                            <button style="width: 100%;" class="btn btn-sm btn-warning hidden-print">{{ trans('button.restore') }}</button>
+                            <button class="btn btn-block btn-sm btn-warning btn-social hidden-print">
+                                <x-icon type="restore" />
+                                {{ trans('button.restore') }}
+                            </button>
                         </form>
                     </div>
                   @endif
@@ -266,18 +315,19 @@
             </div>
 
             <!-- End button column -->
-
-            <div class="col-md-9 col-xs-12 col-sm-pull-3">
+          
+            <div class="col-md-9 col-xs-12 col-sm-pull-3 info-stack">
 
                <div class="row-new-striped">
 
                   <div class="row">
                     <!-- name -->
 
-                      <div class="col-md-3 col-sm-2">
+    
+                      <div class="col-md-3">
                         {{ trans('admin/users/table.name') }}
                       </div>
-                      <div class="col-md-9 col-sm-2">
+                      <div class="col-md-9">
                         {{ $user->present()->fullName() }}
                       </div>
 
@@ -293,7 +343,13 @@
                         {{ trans('general.company') }}
                       </div>
                       <div class="col-md-9">
-                        {{ $user->company->name }}
+                          @can('view', 'App\Models\Company')
+                            <a href="{{ route('companies.show', $user->company->id) }}">
+                                {{ $user->company->name }}
+                            </a>
+                              @else
+                              {{ $user->company->name }}
+                            @endcan
                       </div>
 
                     </div>
@@ -309,9 +365,9 @@
                       <div class="col-md-9">
 
                         @if ($user->isSuperUser())
-                          <label class="label label-danger" data-tooltip="true" title="{{ trans('general.superuser_tooltip') }}"><i class="fas fa-crown" title="{{ trans('general.superuser') }}"></i></label>&nbsp;
+                          <span class="label label-danger" data-tooltip="true" title="{{ trans('general.superuser_tooltip') }}"><x-icon type="superadmin" title="{{ trans('general.superuser') }}" /></span>&nbsp;
                         @elseif ($user->hasAccess('admin'))
-                          <label class="label label-warning" data-tooltip="true" title="{{ trans('general.admin_tooltip') }}"><i class="fas fa-crown" title="{{ trans('general.admin') }}"></i></label>&nbsp;
+                          <span class="label label-warning" data-tooltip="true" title="{{ trans('general.admin_tooltip') }}"><x-icon type="superadmin" title="{{ trans('general.admin_user') }}" /></span>&nbsp;
                         @endif
                          {{ $user->username }}
 
@@ -447,7 +503,9 @@
                         {{ trans('admin/users/table.email') }}
                       </div>
                       <div class="col-md-9">
-                        <a href="mailto:{{ $user->email }}" data-tooltip="true" title="{{ trans('general.send_email') }}"><i class="fa-regular fa-envelope" aria-hidden="true"></i> {{ $user->email }}</a>
+                        <a href="mailto:{{ $user->email }}" data-tooltip="true" title="{{ trans('general.send_email') }}">
+                            <x-icon type="email" />
+                            {{ $user->email }}</a>
                       </div>
                     </div>
                     @endif
@@ -459,7 +517,7 @@
                         {{ trans('general.website') }}
                       </div>
                       <div class="col-md-9">
-                          <a href="{{ $user->website }}" target="_blank"><i class="fa fa-external-link" aria-hidden="true"></i> {{ $user->website }}</a>
+                          <a href="{{ $user->website }}" target="_blank"><x-icon type="external-link" /> {{ $user->website }}</a>
                       </div>
                     </div>
                     @endif
@@ -471,7 +529,9 @@
                           {{ trans('admin/users/table.phone') }}
                         </div>
                         <div class="col-md-9">
-                          <a href="tel:{{ $user->phone }}" data-tooltip="true" title="{{ trans('general.call') }}"><i class="fa-solid fa-phone" aria-hidden="true"></i> {{ $user->phone }}</a>
+                          <a href="tel:{{ $user->phone }}" data-tooltip="true" title="{{ trans('general.call') }}">
+                              <x-icon type="phone" />
+                              {{ $user->phone }}</a>
                         </div>
                       </div>
                     @endif
@@ -554,7 +614,13 @@
                         {{ trans('admin/users/general.vip_label') }}
                       </div>
                       <div class="col-md-9">
-                        {!! ($user->vip=='1') ? '<i class="fas fa-check fa-fw fa-fw text-success" aria-hidden="true"></i> '.trans('general.yes') : '<i class="fas fa-times fa-fw text-danger" aria-hidden="true"></i> '.trans('general.no')  !!}
+                          @if ($user->vip=='1')
+                              <x-icon type="checkmark" class="fa-fw text-success" />
+                              {{ trans('general.yes') }}
+                          @else
+                              <x-icon type="x" class="fa-fw text-danger" />
+                              {{ trans('general.no') }}
+                          @endif
                       </div>
                     </div>
 
@@ -564,7 +630,13 @@
                         {{ trans('admin/users/general.remote') }}
                       </div>
                       <div class="col-md-9">
-                        {!! ($user->remote=='1') ? '<i class="fas fa-check fa-fw text-success" aria-hidden="true"></i> '.trans('general.yes') : '<i class="fas fa-times fa-fw text-danger" aria-hidden="true"></i> '.trans('general.no')  !!}
+                          @if ($user->remote == '1')
+                              <x-icon type="checkmark" class="fa-fw text-success" />
+                              {{ trans('general.yes') }}
+                          @else
+                              <x-icon type="x" class="fa-fw text-danger" />
+                              {{ trans('general.no') }}
+                          @endif
                       </div>
                     </div>
 
@@ -574,7 +646,13 @@
                         {{ trans('general.login_enabled') }}
                       </div>
                       <div class="col-md-9">
-                        {!! ($user->activated=='1') ? '<i class="fas fa-check fa-fw text-success" aria-hidden="true"></i> '.trans('general.yes') : '<i class="fas fa-times fa-fw text-danger" aria-hidden="true"></i> '.trans('general.no')  !!}
+                          @if ($user->activated == '1')
+                              <x-icon type="checkmark" class="fa-fw text-success" />
+                              {{ trans('general.yes') }}
+                          @else
+                              <x-icon type="x" class="fa-fw text-danger" />
+                              {{ trans('general.no') }}
+                          @endif
                       </div>
                     </div>
 
@@ -584,7 +662,13 @@
                            {{ trans('general.autoassign_licenses') }}
                        </div>
                        <div class="col-md-9">
-                           {!! ($user->autoassign_licenses=='1') ? '<i class="fas fa-check fa-fw text-success" aria-hidden="true"></i> '.trans('general.yes') : '<i class="fas fa-times fa-fw text-danger" aria-hidden="true"></i> '.trans('general.no')  !!}
+                           @if ($user->autoassign_licenses == '1')
+                               <x-icon type="checkmark" class="fa-fw text-success" />
+                               {{ trans('general.yes') }}
+                           @else
+                               <x-icon type="x" class="fa-fw text-danger" />
+                               {{ trans('general.no') }}
+                           @endif
                        </div>
                    </div>
 
@@ -595,7 +679,13 @@
                           LDAP
                       </div>
                       <div class="col-md-9">
-                        {!! ($user->ldap_import=='1') ? '<i class="fas fa-check fa-fw text-success" aria-hidden="true"></i> '.trans('general.yes') : '<i class="fas fa-times fa-fw text-danger" aria-hidden="true"></i> '.trans('general.no')  !!}
+                          @if ($user->ldap_import == '1')
+                              <x-icon type="checkmark" class="fa-fw text-success" />
+                              {{ trans('general.yes') }}
+                          @else
+                              <x-icon type="x" class="fa-fw text-danger" />
+                              {{ trans('general.no') }}
+                          @endif
 
                       </div>
                     </div>
@@ -609,8 +699,14 @@
                             </div>
                             <div class="col-md-9">
 
-                              {!! ($user->two_factor_active()) ? '<i class="fas fa-check fa-fw text-success" aria-hidden="true"></i> '.trans('general.yes') : '<i class="fas fa-times fa-fw text-danger" aria-hidden="true"></i> '.trans('general.no')  !!}
-
+                                @if ($user->two_factor_active())
+                                    <x-icon type="checkmark" class="fa-fw text-success" />
+                                    {{ trans('general.yes') }}
+                                @else
+                                    <x-icon type="x" class="fa-fw text-danger" />
+                                    {{ trans('general.no') }}
+                                @endif
+                                
                             </div>
                           </div>
 
@@ -620,7 +716,13 @@
                               {{ trans('admin/users/general.two_factor_enrolled') }}
                             </div>
                             <div class="col-md-9" id="two_factor_reset_toggle">
-                              {!! ($user->two_factor_active_and_enrolled()) ? '<i class="fas fa-check fa-fw text-success" aria-hidden="true"></i> '.trans('general.yes') : '<i class="fas fa-times fa-fw text-danger" aria-hidden="true"></i> '.trans('general.no')  !!}
+                                @if ($user->two_factor_active_and_enrolled())
+                                <x-icon type="checkmark" class="fa-fw text-success" />
+                                {{ trans('general.yes') }}
+                                @else
+                                    <x-icon type="x" class="fa-fw text-danger" />
+                                    {{ trans('general.no') }}
+                                @endif
 
                             </div>
                           </div>
@@ -644,9 +746,12 @@
                                 <span id="two_factor_resetstatus">
                                 </span>
                                 <br>
-                                <p class="help-block" style="line-height: 1.6;">{{ trans('admin/settings/general.two_factor_reset_help') }}</p>
-
 
+                                <p class="help-block" style="line-height: 1.6;">
+                                    {{ trans('admin/settings/general.two_factor_reset_help') }}
+                                </p>
+                          
+                                
                               </div>
                             </div>
                             @endif
@@ -675,7 +780,7 @@
                            {{Helper::formatCurrencyOutput($user->getUserTotalCost()->total_user_cost)}}
 
                            <a id="optional_info" class="text-primary">
-                               <i class="fa fa-caret-right fa-2x" id="optional_info_icon"></i>
+                               <x-icon type="caret-right" id="optional_info_icon" />
                                <strong>{{ trans('admin/hardware/form.optional_infos') }}</strong>
                            </a>
                        </div>
@@ -691,6 +796,7 @@
                    @endif
                   </div> <!--/end striped container-->
                 </div> <!-- end col-md-9 -->
+             </div><!-- end info-stack-container-->
           </div> <!--/.row-->
         </div><!-- /.tab-pane -->
 
@@ -708,6 +814,8 @@
                     data-pagination="true"
                     data-id-table="userAssetsListingTable"
                     data-search="true"
+                    data-search-highlight="true"
+                    data-show-print="true"
                     data-side-pagination="server"
                     data-show-columns="true"
                     data-show-fullscreen="true"
@@ -731,12 +839,16 @@
         </div><!-- /asset -->
 
         <div class="tab-pane" id="licenses">
+
+
           <div class="table-responsive">
             <table
                     data-cookie-id-table="userLicenseTable"
                     data-id-table="userLicenseTable"
                     id="userLicenseTable"
                     data-search="true"
+                    data-search-highlight="true"
+                    data-show-print="true"
                     data-pagination="true"
                     data-side-pagination="client"
                     data-show-columns="true"
@@ -754,7 +866,7 @@
 
               <thead>
                 <tr>
-                  <th class="col-md-5">{{ trans('general.name') }}</th>
+                  <th>{{ trans('general.name') }}</th>
                   <th>{{ trans('admin/licenses/form.license_key') }}</th>
                   <th data-footer-formatter="sumFormatter" data-fieldname="purchase_cost">{{ trans('general.purchase_cost') }}</th>
                   <th>{{ trans('admin/licenses/form.purchase_order') }}</th>
@@ -770,7 +882,7 @@
                   </td>
                   <td class="col-md-4">
                     @can('viewKeys', $license)
-                    {!! $license->present()->serialUrl() !!}
+                          <code class="single-line"><span class="js-copy-link" data-clipboard-target=".js-copy-key-{{ $license->id }}" aria-hidden="true" data-tooltip="true" data-placement="top" title="{{ trans('general.copy_to_clipboard') }}"><span class="js-copy-key-{{ $license->id }}">{{ $license->serial }}</span></span></code>
                     @else
                       ------------
                     @endcan
@@ -786,7 +898,7 @@
                   </td>
                   <td class="hidden-print col-md-2">
                     @can('update', $license)
-                      <a href="{{ route('licenses.checkin', array('licenseSeatId'=> $license->pivot->id, 'backto'=>'user')) }}" class="btn btn-primary btn-sm hidden-print">{{ trans('general.checkin') }}</a>
+                      <a href="{{ route('licenses.checkin', $license->pivot->id, ['backto'=>'user']) }}" class="btn btn-primary btn-sm hidden-print">{{ trans('general.checkin') }}</a>
                      @endcan
                   </td>
                 </tr>
@@ -803,6 +915,8 @@
                     data-id-table="userAccessoryTable"
                     id="userAccessoryTable"
                     data-search="true"
+                    data-search-highlight="true"
+                    data-show-print="true"
                     data-pagination="true"
                     data-side-pagination="client"
                     data-show-columns="true"
@@ -819,7 +933,8 @@
                     }'>
               <thead>
                 <tr>
-                    <th class="col-md-5">{{ trans('general.name') }}</th>
+                    <th class="col-md-1">{{ trans('general.id') }}</th>
+                    <th class="col-md-4">{{ trans('general.name') }}</th>
                     <th class-="col-md-5" data-fieldname="note">{{ trans('general.notes') }}</th>
                     <th class="col-md-1" data-footer-formatter="sumFormatter" data-fieldname="purchase_cost">{{ trans('general.purchase_cost') }}</th>
                     <th class="col-md-1 hidden-print">{{ trans('general.action') }}</th>
@@ -828,7 +943,8 @@
               <tbody>
                   @foreach ($user->accessories as $accessory)
                   <tr>
-                    <td>{!!$accessory->present()->nameUrl()!!}</td>
+                      <td>{{ $accessory->pivot->id }}</td>
+                      <td>{!!$accessory->present()->nameUrl()!!}</td>
                       <td>{!! $accessory->pivot->note !!}</td>
                       <td>
                       {!! Helper::formatCurrencyOutput($accessory->purchase_cost) !!}
@@ -852,6 +968,8 @@
                     data-id-table="userConsumableTable"
                     id="userConsumableTable"
                     data-search="true"
+                    data-search-highlight="true"
+                    data-show-print="true"
                     data-pagination="true"
                     data-side-pagination="client"
                     data-show-columns="true"
@@ -894,103 +1012,11 @@
           <div class="row">
 
             <div class="col-md-12 col-sm-12">
-              <div class="table-responsive">
-                  <table
-                          data-cookie-id-table="userUploadsTable"
-                          data-id-table="userUploadsTable"
-                          id="userUploadsTable"
-                          data-search="true"
-                          data-pagination="true"
-                          data-side-pagination="client"
-                          data-show-columns="true"
-                          data-show-fullscreen="true"
-                          data-show-export="true"
-                          data-show-footer="true"
-                          data-toolbar="#upload-toolbar"
-                          data-show-refresh="true"
-                          data-sort-order="asc"
-                          data-sort-name="name"
-                          class="table table-striped snipe-table"
-                          data-export-options='{
-                    "fileName": "export-license-uploads-{{ str_slug($user->name) }}-{{ date('Y-m-d') }}",
-                    "ignoreColumn": ["actions","image","change","checkbox","checkincheckout","delete","download","icon"]
-                    }'>
-
-                  <thead>
-                    <tr>
-                        <th data-visible="true" data-field="icon" data-sortable="true">{{trans('general.file_type')}}</th>
-                        <th class="col-md-2" data-searchable="true" data-visible="true" data-field="image">{{ trans('general.image') }}</th>
-                        <th class="col-md-2" data-searchable="true" data-visible="true" data-field="filename" data-sortable="true">{{ trans('general.file_name') }}</th>
-                        <th class="col-md-1" data-searchable="true" data-visible="true" data-field="filesize">{{ trans('general.filesize') }}</th>
-                        <th class="col-md-2" data-searchable="true" data-visible="true" data-field="notes" data-sortable="true">{{ trans('general.notes') }}</th>
-                        <th class="col-md-1" data-searchable="true" data-visible="true" data-field="download">{{ trans('general.download') }}</th>
-                        <th class="col-md-2" data-searchable="true" data-visible="true" data-field="created_at" data-sortable="true">{{ trans('general.created_at') }}</th>
-                        <th class="col-md-1" data-searchable="true" data-visible="true" data-field="actions">{{ trans('table.actions') }}</th>
-                    </tr>
-                  </thead>
-                  <tbody>
-                    @foreach ($user->uploads as $file)
-                        <tr>
-                            <td>
-                                <i class="{{ Helper::filetype_icon($file->filename) }} icon-med" aria-hidden="true"></i>
-                                <span class="sr-only">{{ Helper::filetype_icon($file->filename) }}</span>
-
-                            </td>
-                            <td>
-                                @if (($file->filename) && (Storage::exists('private_uploads/users/'.$file->filename)))
-                                   @if (Helper::checkUploadIsImage($file->get_src('users')))
-                                        <a href="{{ route('show/userfile', [$user->id, $file->id, 'inline' => 'true']) }}" data-toggle="lightbox" data-type="image"><img src="{{ route('show/userfile', [$user->id, $file->id, 'inline' => 'true']) }}" class="img-thumbnail" style="max-width: 50px;"></a>
-                                    @else
-                                        {{ trans('general.preview_not_available') }}
-                                    @endif
-                                @else
-                                    <i class="fa fa-times text-danger" aria-hidden="true"></i>
-                                        {{ trans('general.file_not_found') }}
-                                @endif
-                            </td>
-                            <td>
-                                {{ $file->filename }}
-                            </td>
-                            <td data-value="{{ (Storage::exists('private_uploads/users/'.$file->filename)) ? Storage::size('private_uploads/users/'.$file->filename) : '' }}">
-                                {{ (Storage::exists('private_uploads/users/'.$file->filename)) ? Helper::formatFilesizeUnits(Storage::size('private_uploads/users/'.$file->filename)) : '' }}
-                            </td>
-
-                            <td>
-                                @if ($file->note)
-                                    {{ $file->note }}
-                                @endif
-                            </td>
-                            <td>
-                                @if ($file->filename)
-                                    @if (Storage::exists('private_uploads/users/'.$file->filename))
-                                        <a href="{{ route('show/userfile', [$user->id, $file->id]) }}" class="btn btn-sm btn-default">
-                                            <i class="fas fa-download" aria-hidden="true"></i>
-                                            <span class="sr-only">{{ trans('general.download') }}</span>
-                                        </a>
-
-                                        <a href="{{ route('show/userfile', [$user->id, $file->id, 'inline' => 'true']) }}" class="btn btn-sm btn-default" target="_blank">
-                                            <i class="fa fa-external-link" aria-hidden="true"></i>
-                                        </a>
-                                    @endif
-                                @endif
-                            </td>
-                            <td>{{ $file->created_at }}</td>
-
-                            <td>
-                                <a class="btn delete-asset btn-danger btn-sm hidden-print" href="{{ route('userfile.destroy', [$user->id, $file->id]) }}" data-content="Are you sure you wish to delete this file?" data-title="Delete {{ $file->filename }}?">
-                                    <i class="fa fa-trash icon-white" aria-hidden="true"></i>
-                                    <span class="sr-only">{{ trans('general.delete') }}</span>
-                                </a>
-                            </td>
-
-
-
-                        </tr>
-                    @endforeach
-
-                  </tbody>
-                </table>
-              </div>
+                <x-filestable
+                        filepath="private_uploads/users/"
+                        showfile_routename="show/userfile"
+                        deletefile_routename="userfile.destroy"
+                        :object="$user" />
             </div>
           </div> <!--/ROW-->
         </div><!--/FILES-->
@@ -1005,6 +1031,8 @@
                     data-pagination="true"
                     data-id-table="usersHistoryTable"
                     data-search="true"
+                    data-search-highlight="true"
+                    data-show-print="true"
                     data-side-pagination="server"
                     data-show-columns="true"
                     data-show-fullscreen="true"
@@ -1030,7 +1058,7 @@
                       <th data-field="signature_file" data-visible="false"  data-formatter="imageFormatter">{{ trans('general.signature') }}</th>
                   @endif
                   <th data-field="item.serial" data-visible="false">{{ trans('admin/hardware/table.serial') }}</th>
-                  <th data-field="admin" data-formatter="usersLinkObjFormatter">{{ trans('general.admin') }}</th>
+                  <th data-field="admin" data-formatter="usersLinkObjFormatter">{{ trans('general.created_by') }}</th>
                   <th data-field="remote_ip" data-visible="false" data-sortable="true">{{ trans('admin/settings/general.login_ip') }}</th>
                   <th data-field="user_agent" data-visible="false" data-sortable="true">{{ trans('admin/settings/general.login_user_agent') }}</th>
                   <th data-field="action_source" data-visible="false" data-sortable="true">{{ trans('general.action_source') }}</th>
@@ -1057,7 +1085,8 @@
                     data-bulk-button-id="#bulkLocationsEditButton"
                     data-bulk-form-id="#locationsBulkForm"
                     data-search="true"
-                    data-show-footer="true"
+                    data-search-highlight="true"
+                    data-show-print="true"
                     data-side-pagination="server"
                     data-show-columns="true"
                     data-show-fullscreen="true"
@@ -1077,7 +1106,7 @@
 
           <div class="tab-pane" id="managed-users">
 
-              @include('partials.locations-bulk-actions')
+              @include('partials.users-bulk-actions')
 
 
               <table
@@ -1087,10 +1116,11 @@
                       data-pagination="true"
                       data-id-table="managedUsersTable"
                       data-toolbar="#usersBulkEditToolbar"
-                      data-bulk-button-id="#bulkUsersEditButton"
+                      data-bulk-button-id="#bulkUserEditButton"
                       data-bulk-form-id="#usersBulkForm"
                       data-search="true"
-                      data-show-footer="true"
+                      data-search-highlight="true"
+                      data-show-print="true"
                       data-side-pagination="server"
                       data-show-columns="true"
                       data-show-fullscreen="true"
@@ -1125,11 +1155,19 @@
 <script nonce="{{ csrf_token() }}">
 $(function () {
 
+$('#dataConfirmModal').on('show.bs.modal', function (event) {
+    var content = $(event.relatedTarget).data('content');
+    var title = $(event.relatedTarget).data('title');
+    $(this).find(".modal-body").text(content);
+    $(this).find(".modal-header").text(title);
+ });
+
+
   $("#two_factor_reset").click(function(){
     $("#two_factor_resetrow").removeClass('success');
     $("#two_factor_resetrow").removeClass('danger');
     $("#two_factor_resetstatus").html('');
-    $("#two_factor_reseticon").html('<i class="fas fa-spinner spin"></i>');
+    $("#two_factor_reseticon").html('<x-icon type="spinner" />');
     $.ajax({
       url: '{{ route('api.users.two_factor_reset', ['id'=> $user->id]) }}',
       type: 'POST',
@@ -1141,15 +1179,15 @@ $(function () {
       dataType: 'json',
 
       success: function (data) {
-        $("#two_factor_reset_toggle").html('').html('<span class="text-danger"><i class="fas fa-times" aria-hidden="true"></i> {{ trans('general.no') }}</span>');
+        $("#two_factor_reset_toggle").html('').html('<span class="text-danger"><x-icon type="x" /> {{ trans('general.no') }}</span>');
         $("#two_factor_reseticon").html('');
-        $("#two_factor_resetstatus").html('<span class="text-success"><i class="fas fa-check"></i> ' + data.message + '</span>');
+        $("#two_factor_resetstatus").html('<span class="text-success"><x-icon type="checkmark" class="fa-2x" /> ' + data.message + '</span>');
 
       },
 
       error: function (data) {
         $("#two_factor_reseticon").html('');
-        $("#two_factor_reseticon").html('<i class="fas fa-exclamation-triangle text-danger"></i>');
+        $("#two_factor_reseticon").html('<x-icon type="warning" class="text-danger" />');
         $('#two_factor_resetstatus').text(data.message);
       }
 
@@ -1158,7 +1196,7 @@ $(function () {
   });
 
 
-    //binds to onchange event of your input field
+    // binds to onchange event of your input field
     var uploadedFileSize = 0;
     $('#fileupload').bind('change', function() {
       uploadedFileSize = this.files[0].size;
@@ -1191,15 +1229,15 @@ $(function () {
                 var errorMessage = data.jqXHR.responseJSON.messages["file.0"];
                 $('#progress-bar-text').html(errorMessage[0]);
                 $('.progress-bar').removeClass('progress-bar-warning').addClass('progress-bar-danger').css('width','100%');
-                $('.progress-checkmark').fadeIn('fast').html('<i class="fas fa-times fa-3x icon-white" style="color: #d9534f"></i>');
+                $('.progress-checkmark').fadeIn('fast').html('<x-icon type="xt" class="fa-3x text-danger" />');
             } else {
                 $('.progress-bar').removeClass('progress-bar-warning').addClass('progress-bar-success').css('width','100%');
                 $('.progress-checkmark').fadeIn('fast');
                 $('#progress-container').delay(950).css('visibility', 'visible');
                 $('.progress-bar-text').html('Finished!');
-                $('.progress-checkmark').fadeIn('fast').html('<i class="fas fa-check fa-3x icon-white" style="color: green"></i>');
+                $('.progress-checkmark').fadeIn('fast').html('<x-icon type="checkmark" class="fa-3x text-success" />');
                 $.each(data.result, function (index, file) {
-                    $('<tr><td>' + file.note + '</td><<td>' + file.filename + '</td></tr>').prependTo("#files-table > tbody");
+                    $('<tr><td>' + file.note + '</td><td>' + file.filename + '</td></tr>').prependTo("#files-table > tbody");
                 });
             }
             $('#progress').removeClass('active');
diff --git a/resources/views/vendor/mail/html/message.blade.php b/resources/views/vendor/mail/html/message.blade.php
index dc9c4ce3b2..e958eca627 100644
--- a/resources/views/vendor/mail/html/message.blade.php
+++ b/resources/views/vendor/mail/html/message.blade.php
@@ -14,40 +14,28 @@
     @endif
 
     {{-- Show images in email!  --}}
-    @if (($snipeSettings->show_images_in_email=='1' ) && (($snipeSettings->brand == '3') || ($snipeSettings->brand == '2')))
+    @if (($snipeSettings->show_images_in_email=='1') && ($snipeSettings->email_logo!='') && ($snipeSettings->brand != '1'))
 
         {{-- $snipeSettings->brand = 1 = Text  --}}
         {{-- $snipeSettings->brand = 2 = Logo  --}}
         {{-- $snipeSettings->brand = 3 = Logo + Text  --}}
         @if ($snipeSettings->brand == '3')
 
-            @if ($snipeSettings->email_logo!='')
             <img style="max-height: 100px; vertical-align:middle;" src="{{ \Storage::disk('public')->url(e($snipeSettings->email_logo)) }}">
-            @elseif ($snipeSettings->logo!='')
-            <img style="max-height: 100px; vertical-align:middle;" src="{{ \Storage::disk('public')->url(e($snipeSettings->logo)) }}">
-            @endif
-
             <br><br>
             {{ $snipeSettings->site_name }}
             <br><br>
+
         {{-- else if branding type is just logo --}}
         @elseif ($snipeSettings->brand == '2')
-            @if ($snipeSettings->email_logo!='')
-
-            <img style="max-width: 100px; vertical-align:middle;" src="{{ \Storage::disk('public')->url(e($snipeSettings->email_logo)) }}">
-            @elseif ($snipeSettings->logo!='')
-            <img style="max-width: 100px; vertical-align:middle;" src="{{ \Storage::disk('public')->url(e($snipeSettings->logo)) }}">
-            @endif
+           <img style="max-height: 100px; vertical-align:middle;" src="{{ \Storage::disk('public')->url(e($snipeSettings->email_logo)) }}">
         @endif
+
     @else
-        {{ $snipeSettings->site_name }}
+        {{ $snipeSettings->site_name ?? config('app.name') }}
     @endif
 
-{{-- Either the $snipeSettings variable isn't set or setup is not complete --}}
-@else
-{{ config('app.name') }}
 @endif
-
 @endcomponent
 @endslot
 
diff --git a/routes/api.php b/routes/api.php
index 1f43af7431..2088dbe41b 100644
--- a/routes/api.php
+++ b/routes/api.php
@@ -1,7 +1,6 @@
 <?php
 
 use App\Http\Controllers\Api;
-// use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Route;
 
 
@@ -16,7 +15,7 @@ use Illuminate\Support\Facades\Route;
 |
 */
 
-Route::group(['prefix' => 'v1', 'middleware' => ['api', 'throttle:api']], function () {
+Route::group(['prefix' => 'v1', 'middleware' => ['api', 'api-throttle:api']], function () {
 
 
     Route::get('/', function () {
@@ -41,6 +40,9 @@ Route::group(['prefix' => 'v1', 'middleware' => ['api', 'throttle:api']], functi
             ]
         )->name('api.assets.requested');
 
+        Route::post('request/{asset}', [Api\CheckoutRequest::class, 'store'])->name('api.assets.requests.store');
+        Route::post('request/{asset}/cancel', [Api\CheckoutRequest::class, 'destroy'])->name('api.assets.requests.destroy');
+
         Route::get('requestable/hardware',
             [
                 Api\AssetsController::class, 
@@ -431,13 +433,13 @@ Route::group(['prefix' => 'v1', 'middleware' => ['api', 'throttle:api']], functi
             'parameters' => ['group' => 'group_id'],
             ]
         ); // end groups API routes
-        
+
 
      /**
       * Assets API routes
       */
       Route::group(['prefix' => 'hardware'], function () {
-        
+
         Route::get('selectlist',
             [
                 Api\AssetsController::class, 
@@ -496,28 +498,30 @@ Route::group(['prefix' => 'v1', 'middleware' => ['api', 'throttle:api']], functi
         )->name('api.assets.show.byserial')
         ->where('any', '.*');
 
-        // LEGACY URL - Get assets that are due or overdue for audit
-        Route::get('audit/{status}',
-        [
-            Api\AssetsController::class, 
-            'index'
-        ]
-        )->name('api.asset.to-audit');
 
 
 
-        // This gets the "due or overdue" API endpoints for audits and checkins
+        // This gets the "due or overdue" API endpoints for audit/audits and checkins
         Route::get('{action}/{upcoming_status}',
               [
                   Api\AssetsController::class,
                   'index'
               ]
         )->name('api.assets.list-upcoming')
-        ->where(['action' => 'audits|checkins', 'upcoming_status' => 'due|overdue|due-or-overdue']);
+        ->where(['action' => 'audit|audits|checkins', 'upcoming_status' => 'due|overdue|due-or-overdue']);
 
 
+        // Legacy URL for audit
+          Route::post('audit',
+              [
+                  Api\AssetsController::class,
+                  'audit'
+              ]
+          )->name('api.asset.audit.legacy');
 
-        Route::post('audit',
+
+          // Newer url for audit
+        Route::post('{asset}/audit',
         [
             Api\AssetsController::class, 
             'audit'
@@ -532,58 +536,87 @@ Route::group(['prefix' => 'v1', 'middleware' => ['api', 'throttle:api']], functi
         )->name('api.asset.checkin');
 
         Route::post('{id}/checkout',
-        [
+          [
             Api\AssetsController::class, 
             'checkout'
-        ]
+          ]
         )->name('api.asset.checkout');
 
-      Route::post('{asset_id}/restore',
+        Route::post('{asset_id}/restore',
           [
               Api\AssetsController::class,
               'restore'
           ]
-      )->name('api.assets.restore');
-        Route::post('{asset_id}/files',
+        )->name('api.assets.restore');
+
+        Route::post('{asset}/files',
           [
               Api\AssetFilesController::class,
               'store'
           ]
-        )->name('api.assets.files');
+        )->name('api.assets.files.store');
 
-        Route::get('{asset_id}/files',
+        Route::get('{asset}/files',
           [
               Api\AssetFilesController::class,
               'list'
           ]
-        )->name('api.assets.files');
+        )->name('api.assets.files.index');
 
         Route::get('{asset_id}/file/{file_id}',
           [
               Api\AssetFilesController::class,
               'show'
           ]
-        )->name('api.assets.file');
+        )->name('api.assets.files.show');
 
         Route::delete('{asset_id}/file/{file_id}',
           [
               Api\AssetFilesController::class,
               'destroy'
           ]
-        )->name('api.assets.file');
+        )->name('api.assets.files.destroy');
+
+
+
+          /** Begin assigned routes */
+          Route::get('{asset}/assigned/assets',
+              [
+                  Api\AssetsController::class,
+                  'assignedAssets'
+              ]
+          )->name('api.assets.assigned_assets');
+
+          Route::get('{asset}/assigned/accessories',
+              [
+                  Api\AssetsController::class,
+                  'assignedAccessories'
+              ]
+          )->name('api.assets.assigned_accessories');
+          /** End assigned routes */
 
       });
 
-        Route::resource('hardware', 
+
+
+
+    // pulling this out of resource route group to begin normalizing for route-model binding.
+    // this would probably keep working with the resource route group, but the general practice is for
+    // the model name to be the parameter - and i think it's a good differentiation in the code while we convert the others.
+    Route::patch('/hardware/{asset}', [Api\AssetsController::class, 'update'])->name('api.assets.update');
+    Route::put('/hardware/{asset}', [Api\AssetsController::class, 'update'])->name('api.assets.put-update');
+
+    Route::put('/hardware/{asset}', [Api\AssetsController::class, 'update'])->name('api.assets.put-update');
+
+    Route::resource('hardware',
         Api\AssetsController::class,
         ['names' => [
                 'index' => 'api.assets.index',
                 'show' => 'api.assets.show',
-                'update' => 'api.assets.update',
                 'store' => 'api.assets.store',
                 'destroy' => 'api.assets.destroy',
             ],
-        'except' => ['create', 'edit'],
+            'except' => ['create', 'edit', 'update'],
         'parameters' => ['asset' => 'asset_id'],
         ]
         ); // end assets API routes
@@ -700,6 +733,7 @@ Route::group(['prefix' => 'v1', 'middleware' => ['api', 'throttle:api']], functi
                 ]
             )->name('api.locations.selectlist');
 
+            // Users within a location
             Route::get('{location}/users',
                 [
                     Api\LocationsController::class, 
@@ -707,13 +741,32 @@ Route::group(['prefix' => 'v1', 'middleware' => ['api', 'throttle:api']], functi
                 ]
             )->name('api.locations.viewusers');
 
+
+            // Get list of assets with a default location
             Route::get('{location}/assets',
             [
                 Api\LocationsController::class, 
-                'getDataViewAssets'
+                'assets'
             ]
             )->name('api.locations.viewassets');
-    
+
+
+            // Add a comment here, you moron
+            /** Begin assigned routes */
+            Route::get('{location}/assigned/assets',
+                [
+                    Api\LocationsController::class,
+                    'assignedAssets'
+                ]
+            )->name('api.locations.assigned_assets');
+
+            Route::get('{location}/assigned/accessories',
+                [
+                    Api\LocationsController::class,
+                    'assignedAccessories'
+                ]
+            )->name('api.locations.assigned_accessories');
+            /** End assigned routes */
         }); 
     
         Route::resource('locations', 
@@ -793,6 +846,33 @@ Route::group(['prefix' => 'v1', 'middleware' => ['api', 'throttle:api']], functi
                 ]
             )->name('api.models.restore');
 
+            Route::post('{model_id}/files',
+            [
+                Api\AssetModelFilesController::class,
+                'store'
+            ]
+            )->name('api.models.files.store');
+
+            Route::get('{model_id}/files',
+            [
+                Api\AssetModelFilesController::class,
+                'list'
+            ]
+            )->name('api.models.files.index');
+
+            Route::get('{model_id}/file/{file_id}',
+            [
+                Api\AssetModelFilesController::class,
+                'show'
+            ]
+            )->name('api.models.files.show');
+
+            Route::delete('{model_id}/file/{file_id}',
+            [
+                Api\AssetModelFilesController::class,
+                'destroy'
+            ]
+            )->name('api.models.files.destroy');
         }); 
     
         Route::resource('models', 
@@ -884,13 +964,11 @@ Route::group(['prefix' => 'v1', 'middleware' => ['api', 'throttle:api']], functi
         Route::resource('settings', 
         Api\SettingsController::class,
         ['names' => [
-                'index' => 'api.settings.index',
                 'show' => 'api.settings.show',
                 'update' => 'api.settings.update',
                 'store' => 'api.settings.store',
-                'destroy' => 'api.settings.destroy',
             ],
-        'except' => ['create', 'edit'],
+        'except' => ['create', 'edit', 'index', 'destroy'],
         'parameters' => ['setting' => 'setting_id'],
         ]
         ); // end settings API
@@ -1016,6 +1094,14 @@ Route::group(['prefix' => 'v1', 'middleware' => ['api', 'throttle:api']], functi
                 ]
             )->name('api.users.me');
 
+            Route::get('{user}/eulas',
+                [
+                    Api\UsersController::class,
+                    'eulas'
+                ]
+            )->name('api.user.eulas');
+
+
             Route::get('list/{status?}',
             [
                 Api\UsersController::class, 
@@ -1065,18 +1151,18 @@ Route::group(['prefix' => 'v1', 'middleware' => ['api', 'throttle:api']], functi
                 ]
             )->name('api.users.restore');
 
-        }); 
-    
+        });
+
         Route::resource('users', 
         Api\UsersController::class,
         ['names' => [
                 'index' => 'api.users.index',
                 'show' => 'api.users.show',
-                'update' => 'api.users.update',
                 'store' => 'api.users.store',
+                'update' => 'api.users.update',
                 'destroy' => 'api.users.destroy',
             ],
-        'except' => ['create', 'edit'],
+         'except' => ['create', 'edit'],
         'parameters' => ['user' => 'user_id'],
         ]
         ); // end users API routes
@@ -1236,7 +1322,9 @@ Route::group(['prefix' => 'v1', 'middleware' => ['api', 'throttle:api']], functi
             )->name('api.activity.index');
         }); // end reports api routes
 
-        /**
+
+
+    /**
          * Version API routes
          */
 
@@ -1244,7 +1332,11 @@ Route::group(['prefix' => 'v1', 'middleware' => ['api', 'throttle:api']], functi
             return response()->json(
                 [
                     'version' => config('version.app_version'),
-                ], 200);
+                    'build_version' => config('version.build_version'),
+                    'hash_version' => config('version.hash_version'),
+                    'full_version' => config('version.full_app_version')
+                ]
+            );
         }); // end version api routes
 
 
@@ -1257,4 +1349,14 @@ Route::group(['prefix' => 'v1', 'middleware' => ['api', 'throttle:api']], functi
                 ], 404);
         }); // end fallback routes
 
+        /**
+         * Generate label routes
+         */
+        Route::post('hardware/labels', [
+            Api\AssetsController::class,
+            'getLabels'
+        ])->name('api.assets.labels');
+        // end generate label routes
+
+
 }); // end API routes
diff --git a/routes/web.php b/routes/web.php
index f2534c5062..add1e62354 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -2,6 +2,9 @@
 
 use App\Http\Controllers\Account;
 use App\Http\Controllers\ActionlogController;
+use App\Http\Controllers\Auth\ForgotPasswordController;
+use App\Http\Controllers\Auth\LoginController;
+use App\Http\Controllers\Auth\ResetPasswordController;
 use App\Http\Controllers\CategoriesController;
 use App\Http\Controllers\CompaniesController;
 use App\Http\Controllers\DashboardController;
@@ -9,23 +12,22 @@ use App\Http\Controllers\DepartmentsController;
 use App\Http\Controllers\DepreciationsController;
 use App\Http\Controllers\GroupsController;
 use App\Http\Controllers\HealthController;
-use App\Http\Controllers\ImportsController;
 use App\Http\Controllers\LabelsController;
 use App\Http\Controllers\LocationsController;
 use App\Http\Controllers\ManufacturersController;
 use App\Http\Controllers\ModalController;
+use App\Http\Controllers\NotesController;
 use App\Http\Controllers\ProfileController;
+use App\Http\Controllers\ReportTemplatesController;
 use App\Http\Controllers\ReportsController;
 use App\Http\Controllers\SettingsController;
 use App\Http\Controllers\StatuslabelsController;
 use App\Http\Controllers\SuppliersController;
 use App\Http\Controllers\ViewAssetsController;
-use App\Http\Controllers\Auth\LoginController;
-use App\Http\Controllers\Auth\ForgotPasswordController;
-use App\Http\Controllers\Auth\ResetPasswordController;
 use App\Livewire\Importer;
+use App\Models\ReportTemplate;
 use Illuminate\Support\Facades\Route;
-use Illuminate\Support\Facades\Auth;
+use Tabuna\Breadcrumbs\Trail;
 
 Route::group(['middleware' => 'auth'], function () {
     /*
@@ -50,43 +52,6 @@ Route::group(['middleware' => 'auth'], function () {
         [LabelsController::class, 'show']
     )->where('labelName', '.*')->name('labels.show');
 
-    /*
-     * Locations
-     */
-
-    Route::group(['prefix' => 'locations', 'middleware' => ['auth']], function () {
-
-        Route::post(
-            'bulkdelete',
-            [LocationsController::class, 'postBulkDelete']
-        )->name('locations.bulkdelete.show');
-
-        Route::post(
-            'bulkedit',
-            [LocationsController::class, 'postBulkDeleteStore']
-        )->name('locations.bulkdelete.store');
-
-
-        Route::get('{locationId}/clone',
-            [LocationsController::class, 'getClone']
-        )->name('clone/location');
-
-        Route::get(
-            '{locationId}/printassigned',
-            [LocationsController::class, 'print_assigned']
-        )->name('locations.print_assigned');
-
-        Route::get(
-            '{locationId}/printallassigned',
-            [LocationsController::class, 'print_all_assigned']
-        )->name('locations.print_all_assigned');
-
-    });
-
-    Route::resource('locations', LocationsController::class, [
-        'parameters' => ['location' => 'location_id'],
-    ]);
-
 
     /*
     * Manufacturers
@@ -94,39 +59,32 @@ Route::group(['middleware' => 'auth'], function () {
 
     Route::group(['prefix' => 'manufacturers', 'middleware' => ['auth']], function () {
         Route::post('{manufacturers_id}/restore', [ManufacturersController::class, 'restore'] )->name('restore/manufacturer');
+        Route::post('seed', [ManufacturersController::class, 'seed'] )->name('manufacturers.seed');
+
+
     });
 
-    Route::resource('manufacturers', ManufacturersController::class, [
-        'parameters' => ['manufacturer' => 'manufacturers_id'],
-    ]);
+    Route::resource('manufacturers', ManufacturersController::class);
 
     /*
     * Suppliers
     */
-    Route::resource('suppliers', SuppliersController::class, [
-        'parameters' => ['supplier' => 'supplier_id'],
-    ]);
+    Route::resource('suppliers', SuppliersController::class);
 
     /*
     * Depreciations
      */
-    Route::resource('depreciations', DepreciationsController::class, [
-         'parameters' => ['depreciation' => 'depreciation_id'],
-     ]);
+    Route::resource('depreciations', DepreciationsController::class);
 
     /*
     * Status Labels
      */
-    Route::resource('statuslabels', StatuslabelsController::class, [
-          'parameters' => ['statuslabel' => 'statuslabel_id'],
-      ]);
+    Route::resource('statuslabels', StatuslabelsController::class);
 
     /*
     * Departments
     */
-    Route::resource('departments', DepartmentsController::class, [
-        'parameters' => ['department' => 'department_id'],
-    ]);
+    Route::resource('departments', DepartmentsController::class);
 });
 
 /*
@@ -173,49 +131,137 @@ Route::group(['middleware' => 'auth'], function () {
 */
 
 Route::group(['prefix' => 'admin', 'middleware' => ['auth', 'authorize:superuser']], function () {
-    Route::get('settings', [SettingsController::class, 'getSettings'])->name('settings.general.index');
-    Route::post('settings', [SettingsController::class, 'postSettings'])->name('settings.general.save');
 
-    Route::get('branding', [SettingsController::class, 'getBranding'])->name('settings.branding.index');
-    Route::post('branding', [SettingsController::class, 'postBranding'])->name('settings.branding.save');
+    Route::get('settings', [SettingsController::class, 'getSettings'])
+        ->name('settings.general.index')
+        ->breadcrumbs(fn (Trail $trail) =>
+        $trail->parent('settings.index')
+            ->push(trans('admin/settings/general.general_title'), route('settings.general.index')));
 
-    Route::get('security', [SettingsController::class, 'getSecurity'])->name('settings.security.index');
-    Route::post('security', [SettingsController::class, 'postSecurity'])->name('settings.security.save');
+    Route::post('settings', [SettingsController::class, 'postSettings'])
+        ->name('settings.general.save');
 
-    Route::get('groups', [GroupsController::class, 'index'])->name('settings.groups.index');
+    Route::get('branding', [SettingsController::class, 'getBranding'])
+        ->name('settings.branding.index')
+        ->breadcrumbs(fn (Trail $trail) =>
+        $trail->parent('settings.index')
+            ->push(trans('admin/settings/general.branding_title'), route('settings.branding.index')));
 
-    Route::get('localization', [SettingsController::class, 'getLocalization'])->name('settings.localization.index');
-    Route::post('localization', [SettingsController::class, 'postLocalization'])->name('settings.localization.save');
+    Route::post('branding', [SettingsController::class, 'postBranding'])
+        ->name('settings.branding.save');
 
-    Route::get('notifications', [SettingsController::class, 'getAlerts'])->name('settings.alerts.index');
-    Route::post('notifications', [SettingsController::class, 'postAlerts'])->name('settings.alerts.save');
+    Route::get('security', [SettingsController::class, 'getSecurity'])
+        ->name('settings.security.index')
+        ->breadcrumbs(fn (Trail $trail) =>
+        $trail->parent('settings.index')
+            ->push(trans('admin/settings/general.security_title'), route('settings.security.index')));
 
-    Route::get('slack', [SettingsController::class, 'getSlack'])->name('settings.slack.index');
-    Route::post('slack', [SettingsController::class, 'postSlack'])->name('settings.slack.save');
+    Route::post('security', [SettingsController::class, 'postSecurity'])
+        ->name('settings.security.save');
 
-    Route::get('asset_tags', [SettingsController::class, 'getAssetTags'])->name('settings.asset_tags.index');
-    Route::post('asset_tags', [SettingsController::class, 'postAssetTags'])->name('settings.asset_tags.save');
+    Route::get('localization', [SettingsController::class, 'getLocalization'])
+        ->name('settings.localization.index')
+        ->breadcrumbs(fn (Trail $trail) =>
+        $trail->parent('settings.index')
+            ->push(trans('admin/settings/general.localization_title'), route('settings.localization.index')));
 
-    Route::get('barcodes', [SettingsController::class, 'getBarcodes'])->name('settings.barcodes.index');
-    Route::post('barcodes', [SettingsController::class, 'postBarcodes'])->name('settings.barcodes.save');
+    Route::post('localization', [SettingsController::class, 'postLocalization'])
+        ->name('settings.localization.save');
 
-    Route::get('labels', [SettingsController::class, 'getLabels'])->name('settings.labels.index');
-    Route::post('labels', [SettingsController::class, 'postLabels'])->name('settings.labels.save');
+    Route::get('notifications', [SettingsController::class, 'getAlerts'])
+        ->name('settings.alerts.index')
+        ->breadcrumbs(fn (Trail $trail) =>
+        $trail->parent('settings.index')
+            ->push(trans('admin/settings/general.alert_title'), route('settings.alerts.index')));
 
-    Route::get('ldap', [SettingsController::class, 'getLdapSettings'])->name('settings.ldap.index');
-    Route::post('ldap', [SettingsController::class, 'postLdapSettings'])->name('settings.ldap.save');
+    Route::post('notifications', [SettingsController::class, 'postAlerts'])
+        ->name('settings.alerts.save');
 
-    Route::get('phpinfo', [SettingsController::class, 'getPhpInfo'])->name('settings.phpinfo.index');
+    Route::get('slack', [SettingsController::class, 'getSlack'])
+        ->name('settings.slack.index')
+        ->breadcrumbs(fn (Trail $trail) =>
+        $trail->parent('settings.index')
+            ->push(trans('admin/settings/general.webhook_title'), route('settings.slack.index')));
 
-    Route::get('oauth', [SettingsController::class, 'api'])->name('settings.oauth.index');
+    Route::post('slack', [SettingsController::class, 'postSlack'])
+        ->name('settings.slack.save');
+
+    Route::get('asset_tags', [SettingsController::class, 'getAssetTags'])
+        ->name('settings.asset_tags.index')
+        ->breadcrumbs(fn (Trail $trail) =>
+        $trail->parent('settings.index')
+            ->push(trans('admin/settings/general.asset_tag_title'), route('settings.asset_tags.index')));
+
+    Route::post('asset_tags', [SettingsController::class, 'postAssetTags'])
+        ->name('settings.asset_tags.save');
+
+    Route::get('labels', [SettingsController::class, 'getLabels'])
+        ->name('settings.labels.index')
+        ->breadcrumbs(fn (Trail $trail) =>
+        $trail->parent('settings.index')
+            ->push(trans('admin/settings/general.labels_title'), route('settings.labels.index')));
+
+    Route::post('labels', [SettingsController::class, 'postLabels'])
+        ->name('settings.labels.save');
+
+    Route::get('ldap', [SettingsController::class, 'getLdapSettings'])
+        ->name('settings.ldap.index')
+        ->breadcrumbs(fn (Trail $trail) =>
+        $trail->parent('settings.index')
+            ->push(trans('admin/settings/general.ldap_ad'), route('settings.ldap.index')));
+
+    Route::post('ldap', [SettingsController::class, 'postLdapSettings'])
+        ->name('settings.ldap.save');
+
+    Route::get('phpinfo', [SettingsController::class, 'getPhpInfo'])
+        ->name('settings.phpinfo.index')
+        ->breadcrumbs(fn (Trail $trail) =>
+        $trail->parent('settings.index')
+            ->push(trans('admin/settings/general.php_info'), route('settings.phpinfo.index')));
+
+    Route::get('oauth', [SettingsController::class, 'api'])
+        ->name('settings.oauth.index')
+        ->breadcrumbs(fn (Trail $trail) =>
+        $trail->parent('settings.index')
+            ->push(trans('admin/settings/general.oauth'), route('settings.oauth.index')));
+
+    Route::get('google', [SettingsController::class, 'getGoogleLoginSettings'])
+        ->name('settings.google.index')
+        ->breadcrumbs(fn (Trail $trail) =>
+        $trail->parent('settings.index')
+            ->push(trans('admin/settings/general.google_login'), route('settings.google.index')));
+
+    Route::post('google', [SettingsController::class, 'postGoogleLoginSettings'])
+        ->name('settings.google.save');
+
+    Route::get('purge', [SettingsController::class, 'getPurge'])
+        ->name('settings.purge.index')
+        ->breadcrumbs(fn (Trail $trail) =>
+        $trail->parent('settings.index')
+            ->push(trans('admin/settings/general.purge'), route('settings.purge.index')));
+
+    Route::post('purge', [SettingsController::class, 'postPurge'])
+        ->name('settings.purge.save');
+
+    Route::get('login-attempts', [SettingsController::class, 'getLoginAttempts'])
+        ->name('settings.logins.index')
+        ->breadcrumbs(fn (Trail $trail) =>
+        $trail->parent('settings.index')
+            ->push(trans('admin/settings/general.login'), route('settings.logins.index')));
+
+
+    // SAML
+    Route::get('/saml', [SettingsController::class, 'getSamlSettings'])
+        ->name('settings.saml.index')
+        ->breadcrumbs(fn (Trail $trail) =>
+        $trail->parent('settings.index')
+            ->push(trans('admin/settings/general.saml_title'), route('settings.saml.index')));
+
+    Route::post('/saml', [SettingsController::class, 'postSamlSettings'])
+        ->name('settings.saml.save');
 
-    Route::get('google', [SettingsController::class, 'getGoogleLoginSettings'])->name('settings.google.index');
-    Route::post('google', [SettingsController::class, 'postGoogleLoginSettings'])->name('settings.google.save');
 
-    Route::get('purge', [SettingsController::class, 'getPurge'])->name('settings.purge.index');
-    Route::post('purge', [SettingsController::class, 'postPurge'])->name('settings.purge.save');
 
-    Route::get('login-attempts', [SettingsController::class, 'getLoginAttempts'])->name('settings.logins.index');
 
     // Backups
     Route::group(['prefix' => 'backups', 'middleware' => 'auth'], function () {
@@ -242,15 +288,25 @@ Route::group(['prefix' => 'admin', 'middleware' => ['auth', 'authorize:superuser
             return redirect(route('settings.backups.index'));
         });
 
-        Route::get('/', [SettingsController::class, 'getBackups'])->name('settings.backups.index');
+        Route::get('/', [SettingsController::class, 'getBackups'])
+            ->name('settings.backups.index')
+            ->breadcrumbs(fn (Trail $trail) =>
+            $trail->parent('settings.index')
+                ->push(trans('admin/settings/general.backups'), route('settings.backups.index')));
     });
 
-    Route::resource('groups', GroupsController::class, [
-        'middleware' => ['auth'],
-        'parameters' => ['group' => 'group_id'],
-    ]);
+    Route::resource('groups', GroupsController::class);
 
-    Route::get('/', [SettingsController::class, 'index'])->name('settings.index');
+
+    /**
+     * This breadcrumb is repeated for groups in the BreadcrumbServiceProvider, since groups uses resource routes
+     * and that servcie provider cannot see the breadcrumbs defined below
+     */
+    Route::get('/', [SettingsController::class, 'index'])
+        ->name('settings.index')
+        ->breadcrumbs(fn (Trail $trail) =>
+        $trail->parent('home')
+            ->push(trans('general.admin'), route('settings.index')));
 });
 
 /*
@@ -262,9 +318,12 @@ Route::group(['prefix' => 'admin', 'middleware' => ['auth', 'authorize:superuser
 |
 */
 
-Route::get('/import',
-    Importer::class
-)->middleware('auth')->name('imports.index');
+Route::get('/import', Importer::class)
+    ->middleware('auth')
+    ->name('imports.index')
+    ->breadcrumbs(fn (Trail $trail) =>
+    $trail->parent('home')
+        ->push(trans('general.import'), route('imports.index')));
 
 /*
 |--------------------------------------------------------------------------
@@ -277,44 +336,79 @@ Route::get('/import',
 Route::group(['prefix' => 'account', 'middleware' => ['auth']], function () {
 
     // Profile
-    Route::get('profile', [ProfileController::class, 'getIndex'])->name('profile');
-    Route::post('profile', [ProfileController::class, 'postIndex']);
+    Route::get('profile', [ProfileController::class, 'getIndex'])
+        ->name('profile')
+        ->breadcrumbs(fn (Trail $trail) =>
+                $trail->parent('home')
+            ->push(trans('general.editprofile'), route('profile')));
 
-    Route::get('menu', [ProfileController::class, 'getMenuState'])->name('account.menuprefs');
+    Route::post('profile', [ProfileController::class, 'postIndex'])
+        ->name('profile.update');
 
-    Route::get('password', [ProfileController::class, 'password'])->name('account.password.index');
-    Route::post('password', [ProfileController::class, 'passwordSave']);
+    Route::get('menu', [ProfileController::class, 'getMenuState'])
+        ->name('account.menuprefs');
 
-    Route::get('api', [ProfileController::class, 'api'])->name('user.api');
+    Route::get('password', [ProfileController::class, 'password'])
+        ->name('account.password.index')
+        ->breadcrumbs(fn (Trail $trail) =>
+        $trail->parent('home')
+            ->push(trans('general.changepassword'), route('account.password.index')));
+
+    Route::post('password', [ProfileController::class, 'passwordSave'])
+        ->name('account.password.update');
+
+    Route::get('api', [ProfileController::class, 'api'])
+        ->name('user.api')
+        ->breadcrumbs(fn (Trail $trail) =>
+        $trail->parent('home')
+            ->push(trans('general.manage_api_keys'), route('user.api')));
 
     // View Assets
-    Route::get('view-assets', [ViewAssetsController::class, 'getIndex'])->name('view-assets');
+    Route::get('view-assets', [ViewAssetsController::class, 'getIndex'])
+        ->name('view-assets')
+        ->breadcrumbs(fn (Trail $trail) =>
+        $trail->parent('home')
+            ->push(trans('general.viewassets'), route('view-assets')));
 
-    Route::get('requested', [ViewAssetsController::class, 'getRequestedAssets'])->name('account.requested');
+    Route::get('requested', [ViewAssetsController::class, 'getRequestedAssets'])
+        ->name('account.requested')
+        ->breadcrumbs(fn (Trail $trail) =>
+        $trail->parent('home')
+            ->push(trans('general.requested_assets_menu'), route('account.requested')));
 
     // Profile
     Route::get(
-        'requestable-assets',
-        [ViewAssetsController::class, 'getRequestableIndex']
-    )->name('requestable-assets');
-    Route::post(
-        'request-asset/{assetId}',
-        [ViewAssetsController::class, 'getRequestAsset']
-    )->name('account/request-asset');
+        'requestable-assets', [ViewAssetsController::class, 'getRequestableIndex'])
+        ->name('requestable-assets')
+        ->breadcrumbs(fn (Trail $trail) =>
+        $trail->parent('home')
+            ->push(trans('general.requestable_items'), route('requestable-assets')));
 
-    Route::post(
-        'request/{itemType}/{itemId}/{cancel_by_admin?}/{requestingUser?}',
-        [ViewAssetsController::class, 'getRequestItem']
-    )->name('account/request-item');
+
+    Route::post('request-asset/{asset}', [ViewAssetsController::class, 'store'])
+        ->name('account.request-asset');
+
+    Route::post('request-asset/{asset}/cancel', [ViewAssetsController::class, 'destroy'])
+        ->name('account.request-asset.cancel');
+
+    Route::post('request/{itemType}/{itemId}/{cancel_by_admin?}/{requestingUser?}', [ViewAssetsController::class, 'getRequestItem'])
+        ->name('account/request-item');
 
     // Account Dashboard
-    Route::get('/', [ViewAssetsController::class, 'getIndex'])->name('account');
+    Route::get('/', [ViewAssetsController::class, 'getIndex'])
+        ->name('account');
 
     Route::get('accept', [Account\AcceptanceController::class, 'index'])
-        ->name('account.accept');
+        ->name('account.accept')
+        ->breadcrumbs(fn (Trail $trail) =>
+        $trail->parent('home')
+            ->push(trans('general.accept_assets_menu'), route('account.accept')));
 
     Route::get('accept/{id}', [Account\AcceptanceController::class, 'create'])
-        ->name('account.accept.item');
+        ->name('account.accept.item')
+        ->breadcrumbs(fn (Trail $trail, $id) =>
+        $trail->parent('account.accept')
+            ->push(trans('general.accept_item'), route('account.accept.item', $id)));
 
     Route::post('accept/{id}', [Account\AcceptanceController::class, 'store'])
         ->name('account.store-acceptance');
@@ -338,68 +432,132 @@ Route::group(['prefix' => 'account', 'middleware' => ['auth']], function () {
 });
 
 Route::group(['middleware' => ['auth']], function () {
-    Route::get('reports/audit', 
-        [ReportsController::class, 'audit']
-    )->name('reports.audit');
-
-    Route::get(
-        'reports/depreciation',
-        [ReportsController::class, 'getDeprecationReport']
-    )->name('reports/depreciation');
-    Route::get(
-        'reports/export/depreciation',
-        [ReportsController::class, 'exportDeprecationReport']
-    )->name('reports/export/depreciation');
-    Route::get(
-        'reports/asset_maintenances',
-        [ReportsController::class, 'getAssetMaintenancesReport']
-    )->name('reports/asset_maintenances');
-    Route::get(
-        'reports/export/asset_maintenances',
-        [ReportsController::class, 'exportAssetMaintenancesReport']
-    )->name('reports/export/asset_maintenances');
-    Route::get(
-        'reports/licenses',
-        [ReportsController::class, 'getLicenseReport']
-    )->name('reports/licenses');
-    Route::get(
-        'reports/export/licenses',
-        [ReportsController::class, 'exportLicenseReport']
-    )->name('reports/export/licenses');
-
-    Route::get('reports/accessories', [ReportsController::class, 'getAccessoryReport'])->name('reports/accessories');
-    Route::get(
-        'reports/export/accessories',
-        [ReportsController::class, 'exportAccessoryReport']
-    )->name('reports/export/accessories');
-    Route::get('reports/custom', [ReportsController::class, 'getCustomReport'])->name('reports/custom');
-    Route::post('reports/custom', [ReportsController::class, 'postCustom']);
-
-    Route::get(
-        'reports/activity',
-        [ReportsController::class, 'getActivityReport']
-    )->name('reports.activity');
-
-    Route::post('reports/activity', [ReportsController::class, 'postActivityReport']);
-
-    Route::get(
-        'reports/unaccepted_assets/{deleted?}',
-        [ReportsController::class, 'getAssetAcceptanceReport']
-    )->name('reports/unaccepted_assets');
-    Route::post(
-        'reports/unaccepted_assets/sent_reminder',
-        [ReportsController::class, 'sentAssetAcceptanceReminder']
-    )->name('reports/unaccepted_assets_sent_reminder');
-    Route::delete(
-        'reports/unaccepted_assets/{acceptanceId}/delete',
-        [ReportsController::class, 'deleteAssetAcceptance']
-    )->name('reports/unaccepted_assets_delete');
-    Route::post(
-        'reports/unaccepted_assets/{deleted?}',
-        [ReportsController::class, 'postAssetAcceptanceReport']
-    )->name('reports/export/unaccepted_assets');
+    Route::post('notes', [NotesController::class, 'store'])->name('notes.store');
 });
 
+Route::group(['prefix' => 'reports', 'middleware' => ['auth']], function () {
+
+    Route::get('audit', [ReportsController::class, 'audit'])
+        ->name('reports.audit')
+        ->breadcrumbs(fn (Trail $trail) =>
+        $trail->parent('home')
+            ->push(trans('general.audit_report'), route('reports.audit')));
+
+    Route::get(
+        'depreciation', [ReportsController::class, 'getDeprecationReport'])
+        ->name('reports/depreciation')
+        ->breadcrumbs(fn (Trail $trail) =>
+        $trail->parent('home')
+            ->push(trans('general.depreciation_report'), route('reports/depreciation')));
+
+
+    // Is this still used??
+    Route::get(
+        'export/depreciation', [ReportsController::class, 'exportDeprecationReport'])
+        ->name('reports/export/depreciation')
+        ->breadcrumbs(fn (Trail $trail) =>
+        $trail->parent('home')
+            ->push(trans('general.depreciation_report'), route('reports.audit')));
+
+    Route::get(
+        'asset_maintenances', [ReportsController::class, 'getAssetMaintenancesReport'])
+        ->name('reports/asset_maintenances')
+        ->breadcrumbs(fn (Trail $trail) =>
+        $trail->parent('home')
+            ->push(trans('general.asset_maintenance_report'), route('reports/asset_maintenances')));
+
+    // Is this still used?
+    Route::get('export/asset_maintenances', [ReportsController::class, 'exportAssetMaintenancesReport'])
+        ->name('reports/export/asset_maintenances')
+        ->breadcrumbs(fn (Trail $trail) =>
+        $trail->parent('home')
+            ->push(trans('general.asset_maintenance_report'), route('reports/export/asset_maintenances')));
+
+    Route::get('licenses', [ReportsController::class, 'getLicenseReport'])
+        ->name('reports/licenses')
+        ->breadcrumbs(fn (Trail $trail) =>
+        $trail->parent('home')
+            ->push(trans('general.license_report'), route('reports/licenses')));
+
+    Route::get('export/licenses', [ReportsController::class, 'exportLicenseReport'])
+        ->name('reports/export/licenses');
+
+    Route::get('accessories', [ReportsController::class, 'getAccessoryReport'])
+        ->name('reports/accessories');
+
+    Route::get('export/accessories', [ReportsController::class, 'exportAccessoryReport'])
+        ->name('reports/export/accessories');
+
+    Route::get('custom', [ReportsController::class, 'getCustomReport'])
+        ->name('reports/custom')
+        ->breadcrumbs(fn (Trail $trail) =>
+        $trail->parent('home')
+            ->push(trans('general.custom_report'), route('reports/custom')));
+
+    Route::post('custom', [ReportsController::class, 'postCustom'])
+        ->name('reports.post-custom');
+
+
+    Route::prefix('templates')
+        ->group(function () {
+
+            Route::post('/', [ReportTemplatesController::class, 'store'])
+                ->name('report-templates.store');
+
+            // The breadcrumb on this is a little odd for now since we don't have a template index
+            Route::get('/{reportTemplate}', [ReportTemplatesController::class, 'show'])
+                ->name('report-templates.show')
+                ->breadcrumbs(fn (Trail $trail, ReportTemplate $reportTemplate) =>
+                $trail->parent('reports/custom')
+                    ->push($reportTemplate->name, null)
+                    ->push(trans('general.customize_report'), ''));
+
+            Route::get('/{reportTemplate}/edit', [ReportTemplatesController::class, 'edit'])
+                ->name('report-templates.edit')
+                ->breadcrumbs(fn (Trail $trail, ReportTemplate $reportTemplate) =>
+                $trail->parent('reports/custom')
+                    ->push($reportTemplate->name, route('report-templates.show', $reportTemplate))
+                    ->push(trans('general.customize_report'), ''));
+
+
+            Route::post('/{reportTemplate}', [ReportTemplatesController::class, 'update'])
+                ->name('report-templates.update');
+
+            Route::delete('/{reportTemplate}', [ReportTemplatesController::class, 'destroy'])
+                ->name('report-templates.destroy');
+    });
+
+
+
+    Route::get(
+        'activity', [ReportsController::class, 'getActivityReport'])
+        ->name('reports.activity')
+        ->breadcrumbs(fn (Trail $trail) =>
+        $trail->parent('home')
+            ->push(trans('general.activity_report'), route('reports.activity')));
+
+    Route::post('activity', [ReportsController::class, 'postActivityReport'])
+        ->name('reports.activity.post');
+
+    Route::get('unaccepted_assets/{deleted?}', [ReportsController::class, 'getAssetAcceptanceReport'])
+        ->name('reports/unaccepted_assets')
+        ->breadcrumbs(fn (Trail $trail) =>
+        $trail->parent('home')
+            ->push(trans('general.unaccepted_asset_report'), route('reports/unaccepted_assets')));
+
+    Route::post('unaccepted_assets/sent_reminder', [ReportsController::class, 'sentAssetAcceptanceReminder'])
+        ->name('reports/unaccepted_assets_sent_reminder');
+
+    Route::delete('unaccepted_assets/{acceptanceId}/delete', [ReportsController::class, 'deleteAssetAcceptance'])
+        ->name('reports/unaccepted_assets_delete');
+
+    Route::post(
+        'unaccepted_assets/{deleted?}', [ReportsController::class, 'postAssetAcceptanceReport'])
+        ->name('reports/export/unaccepted_assets');
+
+});
+
+
 Route::get(
     'auth/signin',
     [LoginController::class, 'legacyAuthRedirect']
@@ -511,14 +669,6 @@ Route::group(['middleware' => 'web'], function () {
     Route::get('google/callback', 'App\Http\Controllers\GoogleAuthController@handleGoogleCallback')->name('google.callback');
 
 
-    Route::get(
-        '/',
-        [
-            'as' => 'home',
-            'middleware' => ['auth'],
-            'uses' => 'DashboardController@getIndex' ]
-    );
-
     // need to keep GET /logout for SAML SLO
     Route::get(
         'logout',
@@ -531,14 +681,20 @@ Route::group(['middleware' => 'web'], function () {
     )->name('logout.post');
 });
 
-//Auth::routes();
 
-Route::get(
-    '/health', 
+/**
+ * Health check route - skip middleware
+ */
+Route::withoutMiddleware(['web'])->get(
+    '/health',
     [HealthController::class, 'get']
 )->name('health');
 
+
 Route::middleware(['auth'])->get(
     '/',
     [DashboardController::class, 'index']
-)->name('home');
+)->name('home')
+    ->breadcrumbs(fn (Trail $trail) =>
+    $trail->push('Home', route('home'))
+    );
diff --git a/routes/web/accessories.php b/routes/web/accessories.php
index 35ec73e7df..3955db71bf 100644
--- a/routes/web/accessories.php
+++ b/routes/web/accessories.php
@@ -13,7 +13,7 @@ Route::group(['prefix' => 'accessories', 'middleware' => ['auth']], function ()
     )->name('accessories.checkout.show');
 
     Route::post(
-        '{accessoryID}/checkout',
+        '{accessory}/checkout',
         [Accessories\AccessoryCheckoutController::class, 'store']
     )->name('accessories.checkout.store');
 
@@ -42,7 +42,7 @@ Route::group(['prefix' => 'accessories', 'middleware' => ['auth']], function ()
         [Accessories\AccessoriesFilesController::class, 'show']
     )->name('show.accessoryfile');
 
-    Route::get('{accessoryId}/clone',
+    Route::get('{accessory}/clone',
             [Accessories\AccessoriesController::class, 'getClone']
         )->name('clone/accessories');
 
@@ -53,6 +53,5 @@ Route::group(['prefix' => 'accessories', 'middleware' => ['auth']], function ()
 });
 
 Route::resource('accessories', Accessories\AccessoriesController::class, [
-    'middleware' => ['auth'],
-    'parameters' => ['accessory' => 'accessory_id'],
+    'middleware' => ['auth']
 ]);
diff --git a/routes/web/consumables.php b/routes/web/consumables.php
index 4e2472d30c..8e6c94d863 100644
--- a/routes/web/consumables.php
+++ b/routes/web/consumables.php
@@ -31,6 +31,10 @@ Route::group(['prefix' => 'consumables', 'middleware' => ['auth']], function ()
         [Consumables\ConsumablesFilesController::class, 'show']
     )->name('show.consumablefile');
 
+    Route::get('{consumable}/clone',
+        [Consumables\ConsumablesController::class, 'clone']
+    )->name('consumables.clone.create');
+    
 
 });
     
diff --git a/routes/web/fields.php b/routes/web/fields.php
index cdd8fda5d7..7500053c76 100644
--- a/routes/web/fields.php
+++ b/routes/web/fields.php
@@ -33,14 +33,17 @@ Route::group([ 'prefix' => 'fields','middleware' => ['auth'] ], function () {
     )->name('fieldsets.associate');
 
     Route::resource('fieldsets', CustomFieldsetsController::class, [
-    'parameters' => ['fieldset' => 'field_id', 'field' => 'field_id']
+        'parameters' => [
+            'fieldset' => 'fieldset',
+            'field' => 'field_id'
+        ]
     ]);
 
 
 });
 
-Route::resource('fields', CustomFieldsController::class, [
-    'middleware' => ['auth'],
-    'parameters' => ['field' => 'field_id', 'fieldset' => 'fieldset_id'],
-]);
+Route::resource('fields', CustomFieldsController::class,
+    ['middleware' => ['auth'],
+        'except' => ['show']
+    ]);
 
diff --git a/routes/web/hardware.php b/routes/web/hardware.php
index 7833f0fdaa..21f4f40d41 100644
--- a/routes/web/hardware.php
+++ b/routes/web/hardware.php
@@ -6,7 +6,10 @@ use App\Http\Controllers\Assets\BulkAssetsController;
 use App\Http\Controllers\Assets\AssetCheckoutController;
 use App\Http\Controllers\Assets\AssetCheckinController;
 use App\Http\Controllers\Assets\AssetFilesController;
+use App\Models\Setting;
+use Tabuna\Breadcrumbs\Trail;
 use Illuminate\Support\Facades\Route;
+use App\Models\Asset;
 
 /*
 |--------------------------------------------------------------------------
@@ -24,47 +27,59 @@ Route::group(
     
     function () {
         
-        Route::get('bulkaudit',
-            [AssetsController::class, 'quickScan']
-        )->name('assets.bulkaudit');
+        Route::get('bulkaudit', [AssetsController::class, 'quickScan'])
+            ->name('assets.bulkaudit')
+            ->breadcrumbs(fn (Trail $trail) =>
+            $trail->parent('hardware.index')
+                ->push(trans('general.bulkaudit'), route('asset.import-history'))
+            );
 
-        Route::get('quickscancheckin',
-            [AssetsController::class, 'quickScanCheckin']
-        )->name('hardware/quickscancheckin');
+        Route::get('quickscancheckin', [AssetsController::class, 'quickScanCheckin'])
+            ->name('hardware/quickscancheckin')
+            ->breadcrumbs(fn (Trail $trail) =>
+            $trail->parent('hardware.index')
+                ->push('Quickscan Checkin', route('hardware/quickscancheckin'))
+            );
 
-        // Asset Maintenances
-        Route::resource('maintenances', 
-            AssetMaintenancesController::class, [
-            'parameters' => ['maintenance' => 'maintenance_id', 'asset' => 'asset_id'],
-        ]);
+        Route::get('requested', [AssetsController::class, 'getRequestedIndex'])
+            ->name('assets.requested')
+            ->breadcrumbs(fn (Trail $trail) =>
+            $trail->parent('hardware.index')
+                ->push(trans('admin/hardware/general.requested'), route('assets.requested'))
+            );
 
-        Route::get('requested', [
-            AssetsController::class, 'getRequestedIndex']
-        )->name('assets.requested');
-
-        Route::get('scan',
-            [AssetsController::class, 'scan']
-        )->name('asset.scan');
-
-        Route::get('audit/due',
-            [AssetsController::class, 'dueForAudit']
-        )->name('assets.audit.due');
+        Route::get('audit/due', [AssetsController::class, 'dueForAudit'])
+            ->name('assets.audit.due')
+            ->breadcrumbs(fn (Trail $trail) =>
+            $trail->parent('hardware.index')
+                ->push(trans_choice('general.audit_due_days', Setting::getSettings()->audit_warning_days, ['days' => Setting::getSettings()->audit_warning_days]), route('assets.audit.due'))
+            );
 
         Route::get('checkins/due',
             [AssetsController::class, 'dueForCheckin']
-        )->name('assets.checkins.due');
+        )->name('assets.checkins.due')
+            ->breadcrumbs(fn (Trail $trail) =>
+            $trail->parent('hardware.index')
+                ->push(trans_choice('general.checkin_due_days', Setting::getSettings()->due_checkin_days, ['days' => Setting::getSettings()->due_checkin_days]), route('assets.audit.due'))
+            );
         
-        Route::get('audit/{id}',
-            [AssetsController::class, 'audit']
-        )->name('asset.audit.create');
+        Route::get('{asset}/audit', [AssetsController::class, 'audit'])
+            ->name('asset.audit.create')
+            ->breadcrumbs(fn (Trail $trail, Asset $asset) =>
+            $trail->parent('hardware.show', $asset)
+                ->push(trans('general.audit'))
+            );
 
-        Route::post('audit/{id}',
+        Route::post('{asset}/audit',
             [AssetsController::class, 'auditStore']
         )->name('asset.audit.store');
 
-        Route::get('history',
-            [AssetsController::class, 'getImportHistory']
-        )->name('asset.import-history');
+        Route::get('history', [AssetsController::class, 'getImportHistory'])
+            ->name('asset.import-history')
+            ->breadcrumbs(fn (Trail $trail) =>
+                $trail->parent('hardware.index')
+                ->push(trans('general.import-history'), route('asset.import-history'))
+            );
 
         Route::post('history',
             [AssetsController::class, 'postImportHistory']
@@ -78,29 +93,32 @@ Route::group(
             [AssetsController::class, 'getAssetBySerial']
         )->where('any', '.*')->name('findbyserial/hardware');
 
-        Route::get('{assetId}/clone',
+        Route::get('{asset}/clone',
             [AssetsController::class, 'getClone']
-        )->name('clone/hardware');
+        )->name('clone/hardware')->withTrashed();
 
         Route::get('{assetId}/label',
             [AssetsController::class, 'getLabel']
         )->name('label/hardware');
 
-        Route::post('{assetId}/clone', 
-            [AssetsController::class, 'postCreate']
-        );
-
-        Route::get('{assetId}/checkout',
-            [AssetCheckoutController::class, 'create']
-        )->name('hardware.checkout.create');
+        Route::get('{asset}/checkout', [AssetCheckoutController::class, 'create'])
+            ->name('hardware.checkout.create')
+            ->breadcrumbs(fn (Trail $trail, Asset $asset) =>
+            $trail->parent('hardware.show', $asset)
+                ->push(trans('admin/hardware/general.checkout'), route('hardware.index'))
+            );
 
         Route::post('{assetId}/checkout',
             [AssetCheckoutController::class, 'store']
         )->name('hardware.checkout.store');
 
-        Route::get('{assetId}/checkin/{backto?}',
+        Route::get('{asset}/checkin/{backto?}',
             [AssetCheckinController::class, 'create']
-        )->name('hardware.checkin.create');
+        )->name('hardware.checkin.create')
+        ->breadcrumbs(fn (Trail $trail, Asset $asset) =>
+        $trail->parent('hardware.show', $asset)
+            ->push(trans('admin/hardware/general.checkin'), route('hardware.index'))
+        );
 
         Route::post('{assetId}/checkin/{backto?}',
             [AssetCheckinController::class, 'store']
@@ -108,32 +126,32 @@ Route::group(
 
         // Redirect old legacy /asset_id/view urls to the resource route version
         Route::get('{assetId}/view', function ($assetId) {
-            return redirect()->route('hardware.show', ['hardware' => $assetId]);
+            return redirect()->route('hardware.show', $assetId);
         });
 
-        Route::get('{assetId}/qr_code', 
+        Route::get('{asset}/qr_code',
             [AssetsController::class, 'getQrCode']
-        )->name('qr_code/hardware');
+        )->name('qr_code/hardware')->withTrashed();
 
-        Route::get('{assetId}/barcode', 
+        Route::get('{asset}/barcode',
             [AssetsController::class, 'getBarCode']
-        )->name('barcode/hardware');
+        )->name('barcode/hardware')->withTrashed();
 
-        Route::post('{assetId}/restore',
+        Route::post('{asset}/restore',
             [AssetsController::class, 'getRestore']
-        )->name('restore/hardware');
+        )->name('restore/hardware')->withTrashed();
 
-        Route::post('{assetId}/upload',
+        Route::post('{asset}/upload',
             [AssetFilesController::class, 'store']
-        )->name('upload/asset');
+        )->name('upload/asset')->withTrashed();
 
-        Route::get('{assetId}/showfile/{fileId}/{download?}',
+        Route::get('{asset}/showfile/{fileId}/{download?}',
             [AssetFilesController::class, 'show']
-        )->name('show/assetfile');
+        )->name('show/assetfile')->withTrashed();
 
-        Route::delete('{assetId}/showfile/{fileId}/delete',
+        Route::delete('{asset}/showfile/{fileId}/delete',
             [AssetFilesController::class, 'destroy']
-        )->name('delete/assetfile');
+        )->name('delete/assetfile')->withTrashed();
 
         Route::post(
             'bulkedit',
@@ -156,9 +174,12 @@ Route::group(
         )->name('hardware/bulksave');
 
         // Bulk checkout / checkin
-        Route::get('bulkcheckout',
-            [BulkAssetsController::class, 'showCheckout']
-        )->name('hardware.bulkcheckout.show');
+        Route::get('bulkcheckout', [BulkAssetsController::class, 'showCheckout'])
+            ->name('hardware.bulkcheckout.show')
+            ->breadcrumbs(fn (Trail $trail) =>
+            $trail->parent('hardware.index')
+                ->push(trans('admin/hardware/general.bulk_checkout'), route('hardware.index'))
+            );
 
         Route::post('bulkcheckout',
             [BulkAssetsController::class, 'storeCheckout']
@@ -166,16 +187,17 @@ Route::group(
 
     });
 
-Route::resource('hardware', 
-        AssetsController::class, 
-        [
-            'middleware' => ['auth'],
-            'parameters' => ['asset' => 'asset_id',
-                'names' => [
-                    'show' => 'view',
-                ],
-        ],
-]);
+Route::resource('hardware',
+        AssetsController::class,
+        ['middleware' => ['auth']
+])->parameters(['hardware' => 'asset'])->withTrashed();
+
+
+// Asset Maintenances
+Route::resource('maintenances',
+    AssetMaintenancesController::class, [
+        'parameters' => ['maintenance' => 'maintenance', 'asset' => 'asset_id'],
+    ]);
 
 Route::get('ht/{any?}',
     [AssetsController::class, 'getAssetByTag']
diff --git a/routes/web/kits.php b/routes/web/kits.php
index 6b687f0bff..abd2d75266 100644
--- a/routes/web/kits.php
+++ b/routes/web/kits.php
@@ -1,21 +1,17 @@
 <?php
 
 use App\Http\Controllers\Kits;
+use App\Models\PredefinedKit;
 use Illuminate\Support\Facades\Route;
+use Tabuna\Breadcrumbs\Trail;
 
-// Predefined Kit Management
-Route::resource('kits', Kits\PredefinedKitsController::class, [
-    'middleware' => ['auth'],
-    'parameters' => ['kit' => 'kit_id'],
-]);
-
-Route::group(['prefix' => 'kits/{kit_id}', 'middleware' => ['auth']], function () {
+Route::group(['prefix' => 'kits/{kit}', 'middleware' => ['auth']], function () {
 
     // Route::get('licenses',
     //     [Kits\PredefinedKitsController::class, 'indexLicenses']
     // )->name('kits.licenses.index');
 
-    Route::post('licenses',
+    Route::put('licenses',
         [Kits\PredefinedKitsController::class, 'storeLicense']
     )->name('kits.licenses.store');
 
@@ -23,9 +19,11 @@ Route::group(['prefix' => 'kits/{kit_id}', 'middleware' => ['auth']], function (
         [Kits\PredefinedKitsController::class, 'updateLicense']
     )->name('kits.licenses.update');
 
-    Route::get('licenses/{license_id}/edit',
-        [Kits\PredefinedKitsController::class, 'editLicense']
-    )->name('kits.licenses.edit');
+    Route::get('licenses/{license_id}/edit', [Kits\PredefinedKitsController::class, 'editLicense'])
+        ->name('kits.licenses.edit')
+        ->breadcrumbs(fn (Trail $trail) =>
+        $trail->parent('settings.index')
+            ->push(trans('admin/settings/general.backups'), route('kits.licenses.edit')));
 
     Route::delete('licenses/{license_id}',
         [Kits\PredefinedKitsController::class, 'detachLicense']
@@ -35,7 +33,7 @@ Route::group(['prefix' => 'kits/{kit_id}', 'middleware' => ['auth']], function (
 
     Route::put('models/{model_id}',
         [Kits\PredefinedKitsController::class, 'updateModel']
-    )/* ->parameters([2 => 'kit_id', 1 => 'model_id'])*/->name('kits.models.update');
+    )->name('kits.models.update');
 
     Route::get('models/{model_id}/edit',
         [Kits\PredefinedKitsController::class, 'editModel']
@@ -63,18 +61,24 @@ Route::group(['prefix' => 'kits/{kit_id}', 'middleware' => ['auth']], function (
         [Kits\PredefinedKitsController::class, 'updateAccessory']
     )/*->parameters([2 => 'kit_id', 1 => 'accessory_id'])*/->name('kits.accessories.update');
 
-    Route::get('accessories/{accessory_id}/edit',
-        [Kits\PredefinedKitsController::class, 'editAccessory']
-    )->name('kits.accessories.edit');
+    Route::get('accessories/{accessory_id}/edit', [Kits\PredefinedKitsController::class, 'editAccessory'])
+        ->name('kits.accessories.edit');
 
-    Route::delete('accessories/{accessory_id}',
-        [Kits\PredefinedKitsController::class, 'detachAccessory']
-    )->name('kits.accessories.detach');
-    Route::get('checkout',
-        [Kits\CheckoutKitController::class, 'showCheckout']
-    )->name('kits.checkout.show');
+    Route::delete('accessories/{accessory_id}', [Kits\PredefinedKitsController::class, 'detachAccessory'])
+        ->name('kits.accessories.detach');
 
-    Route::post('checkout',
-        [Kits\CheckoutKitController::class, 'store']
-    )->name('kits.checkout.store');
+    Route::get('checkout', [Kits\CheckoutKitController::class, 'showCheckout'])
+        ->name('kits.checkout.show')
+        ->breadcrumbs(fn (Trail $trail, PredefinedKit $kit) =>
+        $trail->parent('kits.show', $kit)
+            ->push(trans('general.checkout'), route('kits.checkout.show', $kit)));
+
+    Route::post('checkout', [Kits\CheckoutKitController::class, 'store'])
+        ->name('kits.checkout.store');
 }); // kits
+
+// Predefined Kit Management
+Route::resource('kits', Kits\PredefinedKitsController::class, [
+    'middleware' => ['auth'],
+]);
+
diff --git a/routes/web/licenses.php b/routes/web/licenses.php
index 7212a47648..39762c95c5 100644
--- a/routes/web/licenses.php
+++ b/routes/web/licenses.php
@@ -2,6 +2,9 @@
 
 use App\Http\Controllers\Licenses;
 use Illuminate\Support\Facades\Route;
+use App\Models\License;
+use App\Models\LicenseSeat;
+use Tabuna\Breadcrumbs\Trail;
 
 // Licenses
 Route::group(['prefix' => 'licenses', 'middleware' => ['auth']], function () {
@@ -10,16 +13,25 @@ Route::group(['prefix' => 'licenses', 'middleware' => ['auth']], function () {
     Route::get('{licenseId}/freecheckout',
         [Licenses\LicensesController::class, 'getFreeLicense']
     )->name('licenses.freecheckout');
-    Route::get('{licenseId}/checkout/{seatId?}', 
-        [Licenses\LicenseCheckoutController::class, 'create']
-    )->name('licenses.checkout');
+
+    Route::get('{license}/checkout/{seatId?}', [Licenses\LicenseCheckoutController::class, 'create'])
+        ->name('licenses.checkout')
+        ->breadcrumbs(fn (Trail $trail, License $license) =>
+        $trail->parent('licenses.show', $license)
+            ->push(trans('general.checkout'), route('licenses.checkout', $license))
+        );
+
     Route::post(
         '{licenseId}/checkout/{seatId?}',
         [Licenses\LicenseCheckoutController::class, 'store']
     ); //name() would duplicate here, so we skip it.
-    Route::get('{licenseSeatId}/checkin/{backto?}',
-        [Licenses\LicenseCheckinController::class, 'create']
-    )->name('licenses.checkin');
+
+    Route::get('{licenseSeat}/checkin/{backto?}', [Licenses\LicenseCheckinController::class, 'create'])
+        ->name('licenses.checkin')
+        ->breadcrumbs(fn (Trail $trail, LicenseSeat $licenseSeat) =>
+        $trail->parent('licenses.show', $licenseSeat->license)
+            ->push(trans('general.checkin'), route('licenses.checkin', $licenseSeat))
+        );
 
     Route::post('{licenseId}/checkin/{backto?}',
         [Licenses\LicenseCheckinController::class, 'store']
@@ -59,5 +71,4 @@ Route::group(['prefix' => 'licenses', 'middleware' => ['auth']], function () {
 
 Route::resource('licenses', Licenses\LicensesController::class, [
     'middleware' => ['auth'],
-    'parameters' => ['license' => 'license_id'],
 ]);
diff --git a/routes/web/locations.php b/routes/web/locations.php
new file mode 100644
index 0000000000..ff2218f5be
--- /dev/null
+++ b/routes/web/locations.php
@@ -0,0 +1,56 @@
+<?php
+
+use App\Http\Controllers\LocationsController;
+use App\Http\Controllers\LocationsFilesController;
+use Illuminate\Support\Facades\Route;
+
+Route::group(['prefix' => 'locations', 'middleware' => ['auth']], function () {
+
+    Route::post('{location}/upload',
+        [LocationsFilesController::class, 'store']
+    )->name('upload/locations')->withTrashed();
+
+    Route::get('{location}/showfile/{fileId}/{download?}',
+        [LocationsFilesController::class, 'show']
+    )->name('show/locationsfile')->withTrashed();
+
+    Route::delete('{location}/showfile/{fileId}/delete',
+        [LocationsFilesController::class, 'destroy']
+    )->name('delete/locationsfile')->withTrashed();
+
+
+    Route::post(
+    'bulkdelete',
+    [LocationsController::class, 'postBulkDelete']
+    )->name('locations.bulkdelete.show');
+
+    Route::post(
+    'bulkedit',
+    [LocationsController::class, 'postBulkDeleteStore']
+    )->name('locations.bulkdelete.store');
+
+    Route::post(
+    '{location}/restore',
+    [LocationsController::class, 'postRestore']
+    )->name('locations.restore');
+
+
+    Route::get('{locationId}/clone',
+    [LocationsController::class, 'getClone']
+    )->name('clone/location');
+
+    Route::get(
+    '{locationId}/printassigned',
+    [LocationsController::class, 'print_assigned']
+    )->name('locations.print_assigned');
+
+    Route::get(
+    '{locationId}/printallassigned',
+    [LocationsController::class, 'print_all_assigned']
+    )->name('locations.print_all_assigned');
+
+});
+
+Route::resource('locations', LocationsController::class, [
+    'middleware' => ['auth'],
+])->withTrashed();
diff --git a/routes/web/models.php b/routes/web/models.php
index 37e54995b8..8c003ba662 100644
--- a/routes/web/models.php
+++ b/routes/web/models.php
@@ -4,39 +4,43 @@ use App\Http\Controllers\AssetModelsController;
 use App\Http\Controllers\AssetModelsFilesController;
 use App\Http\Controllers\BulkAssetModelsController;
 use Illuminate\Support\Facades\Route;
+use Tabuna\Breadcrumbs\Trail;
 
 // Asset Model Management
 
 
 Route::group(['prefix' => 'models', 'middleware' => ['auth']], function () {
 
-    Route::post('{modelID}/upload',
+    Route::post('{model}/upload',
         [AssetModelsFilesController::class, 'store']
-    )->name('upload/models');
+    )->name('upload/models')->withTrashed();
 
-    Route::get('{modelID}/showfile/{fileId}/{download?}',
+    Route::get('{model}/showfile/{fileId}/{download?}',
         [AssetModelsFilesController::class, 'show']
-    )->name('show/modelfile');
+    )->name('show/modelfile')->withTrashed();
 
-    Route::delete('{modelID}/showfile/{fileId}/delete',
+    Route::delete('{model}/showfile/{fileId}/delete',
         [AssetModelsFilesController::class, 'destroy']
-    )->name('delete/modelfile');
+    )->name('delete/modelfile')->withTrashed();
 
     Route::get(
-        '{modelId}/clone',
+        '{model}/clone',
         [
             AssetModelsController::class, 
             'getClone'
         ]
-    )->name('models.clone.create');
+    )->name('models.clone.create')->withTrashed()
+        ->breadcrumbs(fn (Trail $trail) =>
+        $trail->parent('models.index')
+            ->push(trans('admin/models/table.clone'), route('models.index')));
 
     Route::post(
-        '{modelId}/clone',
+        '{model}/clone',
         [
             AssetModelsController::class, 
             'postCreate'
         ]
-    )->name('models.clone.store');
+    )->name('models.clone.store')->withTrashed();
 
     Route::get(
         '{modelId}/view',
@@ -92,5 +96,4 @@ Route::group(['prefix' => 'models', 'middleware' => ['auth']], function () {
 
 Route::resource('models', AssetModelsController::class, [
     'middleware' => ['auth'],
-    'parameters' => ['model' => 'model_id'],
-]);
+])->withTrashed();
diff --git a/routes/web/users.php b/routes/web/users.php
index 95de200638..ced9c379a9 100644
--- a/routes/web/users.php
+++ b/routes/web/users.php
@@ -33,20 +33,20 @@ Route::group(['prefix' => 'users', 'middleware' => ['auth']], function () {
     )->name('users.export');
 
     Route::get(
-        '{userId}/clone',
+        '{user}/clone',
         [
             Users\UsersController::class, 
             'getClone'
         ]
-    )->name('users.clone.show');
+    )->name('users.clone.show')->withTrashed();
 
     Route::post(
-        '{userId}/clone',
+        '{user}/clone',
         [
             Users\UsersController::class, 
             'postCreate'
         ]
-    )->name('users.clone.store');
+    )->name('users.clone.store')->withTrashed();
 
     Route::post(
         '{userId}/restore',
@@ -65,12 +65,12 @@ Route::group(['prefix' => 'users', 'middleware' => ['auth']], function () {
     )->name('unsuspend/user');
 
     Route::post(
-        '{userId}/upload',
+        '{user}/upload',
         [
             Users\UserFilesController::class, 
             'store'
         ]
-    )->name('upload/user');
+    )->name('upload/user')->withTrashed();
 
     Route::delete(
         '{userId}/deletefile/{fileId}',
@@ -81,12 +81,12 @@ Route::group(['prefix' => 'users', 'middleware' => ['auth']], function () {
     )->name('userfile.destroy');
 
     Route::get(
-        '{userId}/showfile/{fileId}',
+        '{user}/showfile/{fileId}',
         [
             Users\UserFilesController::class, 
             'show'
         ]
-    )->name('show/userfile');
+    )->name('show/userfile')->withTrashed();
 
     Route::post(
         '{userId}/password',
@@ -145,10 +145,8 @@ Route::group(['prefix' => 'users', 'middleware' => ['auth']], function () {
         ]
     )->name('users/bulkeditsave');
 
-
 });
 
 Route::resource('users', Users\UsersController::class, [
-    'middleware' => ['auth'],
-    'parameters' => ['user' => 'user_id'],
-]);
\ No newline at end of file
+    'middleware' => ['auth']
+])->withTrashed();
diff --git a/sample_csvs/accessories-sample.csv b/sample_csvs/accessories-sample.csv
index 6c203ec5a0..d884cc0cff 100644
--- a/sample_csvs/accessories-sample.csv
+++ b/sample_csvs/accessories-sample.csv
@@ -1,51 +1,4 @@
 Company,Name,Category,Supplier,Manufacturer,QTY,Location,Order Number,Min Amount,Model Number,Notes,Purchase Date,Purchase Cost
-Kovacek and Sons,Dragline,Roofing (Metal),Runte-Corwin,Cremin Inc,61,Artashat,017019279-2,59,3558344370409403,sit amet diam in magna bibendum imperdiet nullam orci pede venenatis non sodales sed tincidunt eu felis,2022-08-24,73.96
-"Russel, Marquardt and Frami",Skid-Steer,Drywall & Acoustical (MOB),Bins-Gerhold,Breitenberg Inc,17,Dugcal,801930572-6,10,30104302249895,diam cras pellentesque volutpat dui maecenas tristique est et tempus semper est quam pharetra magna ac,2022-06-24,5.27
-Nicolas Group,Dragline,Structural & Misc Steel Erection,"Glover, Kovacek and Bechtelar",Kulas-Powlowski,36,Zafarwāl,963844173-9,30,3577672351043826,vulputate ut ultrices vel augue vestibulum ante ipsum primis in,2023-03-16,87.89
-Roob-Mante,Dump Truck,Electrical and Fire Alarm,"Rath, Mueller and Halvorson","Bogisich, Schaefer and Goldner",14,Askiz,778878918-6,58,3578492711349816,donec ut mauris eget massa tempor convallis nulla neque libero convallis eget eleifend luctus,2023-03-30,57.51
-"Marquardt, Blanda and Heaney",Crawler,RF Shielding,Bode-Armstrong,Rosenbaum LLC,54,Arjona,414053159-2,82,201552275235023,augue luctus tincidunt nulla mollis molestie lorem quisque ut erat curabitur gravida nisi at nibh,2022-06-27,76.18
-Herman and Sons,Skid-Steer,"Doors, Frames & Hardware","Volkman, Pagac and Tillman",McKenzie-Hand,12,Višnjevac,064912598-3,29,3530080559523225,dolor morbi vel lectus in quam fringilla rhoncus mauris enim leo rhoncus sed vestibulum sit amet cursus id turpis,2022-08-14,97.9
-Morar Inc,Crawler,Exterior Signage,Bergstrom-Ullrich,"Mann, Ondricka and Fadel",69,Birni N Konni,770515508-7,11,3529943453252733,sapien in sapien iaculis congue vivamus metus arcu adipiscing molestie,2022-10-28,73.62
-Jerde-Bogisich,Compactor,Drilled Shafts,Fadel-Sporer,"Bode, Gutkowski and Schamberger",58,Galižana,188679996-2,95,4041376614376,gravida nisi at nibh in hac habitasse platea dictumst aliquam augue quam sollicitudin,2023-03-09,3.83
-"Dibbert, Roberts and Orn",Dragline,EIFS,Waters LLC,"Pollich, Treutel and Homenick",93,Tongyangdao,303831002-6,53,5602237646576545,donec ut mauris eget massa tempor convallis nulla neque libero convallis eget eleifend luctus,2022-12-07,67.91
-Schmidt-Jones,Compactor,Site Furnishings,"Monahan, Dooley and Rowe",Gorczany and Sons,5,Chunghwa,054966680-X,8,3548920584271979,enim sit amet nunc viverra dapibus nulla suscipit ligula in lacus curabitur at,2022-08-23,91.79
-"Lemke, Nicolas and Jaskolski",Trencher,Drilled Shafts,Nienow-Moen,Kuhn-Sawayn,40,Mkushi,921741957-5,94,3566485930049161,arcu libero rutrum ac lobortis vel dapibus at diam nam tristique,2022-09-16,37.6
-Hills-Sipes,Compactor,Roofing (Asphalt),"Kulas, Bogisich and Mante","Grimes, Ziemann and Jacobs",99,Orahovica,794640267-8,69,490344354231467621,eu nibh quisque id justo sit amet sapien dignissim vestibulum,2023-02-11,91.86
-Block and Sons,Bulldozer,Prefabricated Aluminum Metal Canopies,Jakubowski LLC,Feest-King,32,Al Jubayhah,459697074-2,27,5010129157541263,nec sem duis aliquam convallis nunc proin at turpis a pede posuere nonummy integer non velit donec diam,2022-11-17,82.9
-Denesik-Champlin,Compactor,Retaining Wall and Brick Pavers,"Barrows, Bradtke and Kertzmann","Ledner, Hodkiewicz and McLaughlin",28,Talalayivka,301762319-X,81,4575609485591,nullam orci pede venenatis non sodales sed tincidunt eu felis fusce posuere felis sed lacus morbi sem,2023-04-20,78.21
-Towne Inc,Trencher,Rebar & Wire Mesh Install,Runolfsdottir-Klein,"Hilll, Herman and Roberts",76,Cunén,739224317-9,56,3529871501469720,luctus rutrum nulla tellus in sagittis dui vel nisl duis ac nibh fusce lacus,2022-08-31,87.49
-Cummerata LLC,Dragline,Fire Sprinkler System,O'Kon-Conn,"Schmeler, Reichel and Jakubowski",11,Boju,674114839-6,61,3580499860326855,lacus curabitur at ipsum ac tellus semper interdum mauris ullamcorper purus sit amet nulla quisque arcu libero rutrum ac,2022-10-15,56.48
-Brekke LLC,Backhoe,"Temp Fencing, Decorative Fencing and Gates",Fisher LLC,Graham-Kshlerin,83,Lolak,496879420-7,51,56022279121238808,scelerisque quam turpis adipiscing lorem vitae mattis nibh ligula nec sem,2023-02-22,97.21
-"King, Homenick and Conn",Dump Truck,EIFS,"Reilly, Windler and Cremin",Langworth-Ortiz,28,Bugo,546264257-1,48,4905157085342998398,cubilia curae duis faucibus accumsan odio curabitur convallis duis consequat dui nec nisi volutpat eleifend,2023-02-02,54.04
-"Koelpin, Dooley and Kuvalis",Excavator,Structural & Misc Steel Erection,Shields-Senger,McLaughlin-Koepp,48,Livadiya,470334065-8,69,0604372523721069615,mattis pulvinar nulla pede ullamcorper augue a suscipit nulla elit ac nulla,2023-04-08,67.44
-Donnelly and Sons,Crawler,Plumbing & Medical Gas,Maggio LLC,Hahn-Flatley,17,Alibago,314425716-8,83,337941169979548,enim leo rhoncus sed vestibulum sit amet cursus id turpis integer,2023-04-07,53.56
-Boyer-Medhurst,Grader,Prefabricated Aluminum Metal Canopies,"Howell, Huel and Nicolas","Deckow, Jenkins and Bartell",54,Picungbera,323060315-X,15,6706951103338750,felis fusce posuere felis sed lacus morbi sem mauris laoreet ut rhoncus aliquet pulvinar sed nisl nunc rhoncus dui vel,2022-09-19,5.46
-"Wolff, Dietrich and Kshlerin",Dragline,Masonry & Precast,"Spencer, Dooley and Ullrich","Zieme, Kuvalis and Leannon",13,Santisimo Rosario,946650016-3,65,5018417463180740,erat nulla tempus vivamus in felis eu sapien cursus vestibulum proin eu mi nulla ac enim,2023-04-17,63.98
-"Hansen, McLaughlin and Bernhard",Excavator,Drilled Shafts,"Gislason, Heaney and O'Connell",Wiegand Group,84,San Jose,445247479-9,5,201910973168492,velit nec nisi vulputate nonummy maecenas tincidunt lacus at velit vivamus vel nulla eget,2022-11-01,58.75
-Daniel LLC,Crawler,Rebar & Wire Mesh Install,"Mitchell, Barrows and Hamill",Weber-Kemmer,88,Sinjil,145272905-0,95,3537378655700793,gravida nisi at nibh in hac habitasse platea dictumst aliquam augue,2023-04-04,33.02
-"Casper, Muller and Macejkovic",Dragline,Marlite Panels (FED),"Spencer, Shields and McDermott",Rutherford and Sons,21,Pocsi,758023521-8,93,3563461502339028,pede justo lacinia eget tincidunt eget tempus vel pede morbi porttitor lorem id,2022-12-26,63.67
-Beahan-Beatty,Backhoe,Framing (Steel),Johns-Reinger,Stamm-Bergstrom,4,Buarcos,483986544-2,14,3572461996231391,vehicula condimentum curabitur in libero ut massa volutpat convallis morbi odio odio elementum eu interdum eu tincidunt in,2023-05-13,12.03
-"Schowalter, Green and Ankunding",Trencher,Soft Flooring and Base,Kreiger-Hoppe,Reynolds-Cummerata,18,San Pedro Pinula,131062548-4,15,3568617180162173,elit ac nulla sed vel enim sit amet nunc viverra dapibus nulla suscipit ligula in lacus curabitur,2022-09-27,77.12
-"Prohaska, Bosco and Abshire",Bulldozer,EIFS,Larson LLC,"Hammes, Fadel and Legros",57,Golopau,194463835-0,3,5002359023338541,vivamus vestibulum sagittis sapien cum sociis natoque penatibus et magnis dis,2022-06-30,67.31
-"Bauch, Rodriguez and Jenkins",Crawler,Masonry & Precast,"Rosenbaum, Stokes and Rau","Ferry, Huels and Sipes",86,Xiangyang,454529838-9,29,6767656690937643,est et tempus semper est quam pharetra magna ac consequat metus sapien ut nunc vestibulum ante ipsum,2022-08-22,17.81
-"Schmeler, Lockman and Stiedemann",Excavator,Framing (Steel),Kihn LLC,"Lubowitz, Roberts and Marquardt",13,Makanya,647395719-7,15,3556460198629428,quam suspendisse potenti nullam porttitor lacus at turpis donec posuere metus,2023-04-29,7.58
-Lubowitz Group,Scraper,Ornamental Railings,"Fisher, Haag and Schmidt",West LLC,10,Mabunga,787506589-5,64,3560289848556143,nam congue risus semper porta volutpat quam pede lobortis ligula sit amet eleifend pede libero quis,2022-08-01,71.58
-Hansen-Beatty,Excavator,Epoxy Flooring,Hauck-Rempel,West Inc,48,Payxambabazar,518250572-8,82,337941555646784,vivamus vel nulla eget eros elementum pellentesque quisque porta volutpat erat quisque,2022-08-19,1.48
-Herzog and Sons,Dragline,Elevator,Crist Inc,"Dooley, Wyman and Rempel",14,Kranuan,490046086-9,22,3556364929607085,arcu libero rutrum ac lobortis vel dapibus at diam nam tristique tortor eu,2023-02-04,45.0
-Lebsack-Romaguera,Dragline,Wall Protection,Hamill-Abbott,Haley-Labadie,6,Ruzayevka,731594232-7,63,3564668857002550,nunc purus phasellus in felis donec semper sapien a libero nam dui proin leo odio porttitor id consequat in,2023-03-08,13.62
-"Kirlin, Wyman and Wehner",Crawler,Structural & Misc Steel Erection,Beier LLC,Schuppe Inc,25,Shuanghe,343694285-5,67,3568605663689317,duis aliquam convallis nunc proin at turpis a pede posuere nonummy integer non velit donec,2023-03-10,34.31
-"Nader, Fadel and Bode",Bulldozer,RF Shielding,Williamson and Sons,Schmidt-Towne,68,Mölndal,607118553-X,3,340880868925813,donec ut dolor morbi vel lectus in quam fringilla rhoncus mauris,2022-06-09,28.76
-"Rohan, Wisoky and Gerhold",Dump Truck,Electrical and Fire Alarm,"Ward, Sauer and Harber",Shields-Zieme,17,Vsevolozhsk,100246862-0,39,5578993697112313,lacinia aenean sit amet justo morbi ut odio cras mi pede malesuada in imperdiet et commodo vulputate,2022-12-28,34.43
-"Goldner, Metz and Prohaska",Crawler,Roofing (Asphalt),Schamberger Inc,Reilly-Bernhard,32,Saraktash,815422723-1,98,3568940927447214,volutpat in congue etiam justo etiam pretium iaculis justo in hac habitasse platea dictumst etiam faucibus,2023-02-28,82.16
-Thompson and Sons,Dump Truck,Plumbing & Medical Gas,Russel and Sons,"Nolan, Cartwright and Ebert",31,Lívingston,617917766-X,19,3564430382302611,habitasse platea dictumst morbi vestibulum velit id pretium iaculis diam erat fermentum justo nec condimentum neque sapien placerat,2023-04-23,41.52
-"Nitzsche, Schaden and Strosin",Crawler,Electrical and Fire Alarm,Hahn and Sons,"Lehner, Hayes and Grant",22,Gennevilliers,860027339-0,13,5641827092783026,libero rutrum ac lobortis vel dapibus at diam nam tristique tortor eu,2023-05-08,19.4
-Larkin LLC,Dragline,Roofing (Metal),Fay-Erdman,Nolan and Sons,20,San Agustin,906705311-2,82,3531330383605949,felis ut at dolor quis odio consequat varius integer ac leo pellentesque ultrices mattis odio donec vitae,2022-11-30,58.55
-Feest Group,Compactor,Ornamental Railings,"Rowe, Bins and Torp",Romaguera-Greenholt,27,Ribeira Seca,842784499-9,88,3580033745274830,nisi nam ultrices libero non mattis pulvinar nulla pede ullamcorper augue a suscipit nulla elit,2023-01-22,54.88
-Osinski Inc,Bulldozer,Epoxy Flooring,"Abernathy, Huels and Greenfelder","Jaskolski, Sporer and Corwin",54,Mae Sai,627022315-6,71,5594694799398897,ipsum dolor sit amet consectetuer adipiscing elit proin interdum mauris non ligula pellentesque ultrices phasellus id sapien in sapien iaculis,2022-09-30,44.05
-Bauch Inc,Backhoe,Prefabricated Aluminum Metal Canopies,Howell-Rogahn,Hessel-Nienow,50,Mayisad,619216443-6,90,3557488995743232,in purus eu magna vulputate luctus cum sociis natoque penatibus et magnis dis parturient montes nascetur ridiculus mus vivamus vestibulum,2023-02-23,37.19
-Welch Inc,Skid-Steer,Casework,"Grant, Fadel and Macejkovic","Towne, Johnston and Rice",1,Huarong,533477095-X,93,345254385886483,placerat ante nulla justo aliquam quis turpis eget elit sodales scelerisque,2022-12-27,18.46
-"Boehm, Windler and Konopelski",Compactor,"Doors, Frames & Hardware",Hansen-Turcotte,Beier-Hermiston,94,Buyunshan,149301071-9,50,5380142384134598,eleifend pede libero quis orci nullam molestie nibh in lectus pellentesque at nulla suspendisse,2023-04-14,62.31
-"McGlynn, Zulauf and Hauck",Trencher,Retaining Wall and Brick Pavers,Beahan-Bernhard,Gutmann LLC,44,Nanjie,647091867-0,71,5641826426694164,dapibus augue vel accumsan tellus nisi eu orci mauris lacinia sapien quis libero nullam sit amet turpis,2022-07-25,31.94
-Howe-Powlowski,Skid-Steer,Drilled Shafts,Toy Group,Medhurst LLC,81,Saramech,156653384-8,64,3538154733411268,ut dolor morbi vel lectus in quam fringilla rhoncus mauris enim leo rhoncus sed vestibulum sit amet,2022-07-31,16.01
-"Dach, Trantow and Larson",Excavator,Structural and Misc Steel (Fabrication),"Hagenes, Stamm and Wisoky",Bosco-Anderson,9,Patos,471131697-3,92,4017957124324,curabitur convallis duis consequat dui nec nisi volutpat eleifend donec ut dolor,2023-02-16,46.16
-"Weber, McCullough and Champlin",Scraper,Casework,"D'Amore, Lebsack and Stoltenberg","Herman, Beahan and Willms",65,Chaloem Phra Kiat,703706719-9,82,56022380102896588,turpis enim blandit mi in porttitor pede justo eu massa donec dapibus duis at velit,2022-06-12,48.58
+Kovacek and Sons,Dragline,Roofing (Metal),Runte-Corwin,Cremin Inc,61,Artashat,017019279-2,59,3558344370409403,sit amet diam in magna bibendum imperdiet nullam orci pede venenatis non sodales sed tincidunt eu felis,8/24/22,73.96
+"Russel, Marquardt and Frami",Skid-Steer,Drywall & Acoustical (MOB),Bins-Gerhold,Breitenberg Inc,17,Dugcal,801930572-6,10,3.01043E+13,diam cras pellentesque volutpat dui maecenas tristique est et tempus semper est quam pharetra magna ac,6/24/22,5.27
+Roob-Mante,Dump Truck,Electrical and Fire Alarm,"Rath, Mueller and Halvorson","Bogisich, Schaefer and Goldner",14,Askiz,778878918-6,58,3578492711349816,donec ut mauris eget massa tempor convallis nulla neque libero convallis eget eleifend luctus,3/30/23,57.51
\ No newline at end of file
diff --git a/sample_csvs/assets-sample.csv b/sample_csvs/assets-sample.csv
index c17cac3bc8..6594bc690e 100644
--- a/sample_csvs/assets-sample.csv
+++ b/sample_csvs/assets-sample.csv
@@ -1,151 +1,23 @@
 Company,Name,Asset Tag,Category,Supplier,Manufacturer,Location,Order Number,Model,Model Notes,Model Number,Asset Notes,Purchase Date,Purchase Cost,Checkout Type,Checked Out To: Username,Checked Out To: First Name,Checked Out To: Last Name,Checked Out To: Email,Checked Out To: Location,Asset EOL Date
-Abshire and Sons,Backhoe,ICC-2065556,Ornamental Railings,"Kunde, Doyle and Kozey",Berge Inc,"Wilkinson, Waters and Kerluke",3271901481,"Macbook Pro 13""",,1786VM80X07,at nulla suspendisse potenti cras in purus eu magna vulputate luctus cum sociis natoque penatibus et magnis dis,2023-01-23,2266.13,,,,,,,2028-10-27
-"Quitzon, Oberbrunner and Dibbert",Dragline,WBH-2841795,Structural and Misc Steel (Fabrication),Krajcik LLC,"Botsford, Boyle and Herzog",Lindgren-Marquardt,5504512275,"Macbook Pro 13""",ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia curae mauris viverra diam vitae quam suspendisse potenti nullam,9351IS25A51,aliquam convallis nunc proin at turpis a pede posuere nonummy integer,2022-11-14,1292.94,User,gmccrackem2a,Gage,McCrackem,gmccrackem2a@bing.com,,2028-10-27
-Boyer and Sons,Excavator,NNH-3656031,Soft Flooring and Base,"Heaney, Altenwerth and Emmerich",Pollich LLC,Pacocha-Kiehn,4861125177,"Macbook Pro 13""",,9929FR08W85,,2023-03-01,2300.71,Location,,,,,Pacocha-Kiehn,2028-10-27
-Hayes-Rippin,Trencher,BOL-0305383,Prefabricated Aluminum Metal Canopies,"Botsford, Boyle and Herzog",Walker-Towne,Fritsch-Abernathy,2416994639,"Macbook Pro 13""",neque vestibulum eget vulputate ut ultrices vel augue vestibulum ante ipsum primis in faucibus orci luctus,9139KQ78G81,,2022-10-26,1777.56,User,ksennett6,Katerina,Sennett,ksennett6@ibm.com,,2028-10-27
-Romaguera-Flatley,Compactor,YVN-3440973,"Temp Fencing, Decorative Fencing and Gates",Ankunding-Ledner,Berge Inc,Roberts-Anderson,6080904229,"Macbook Pro 13""",turpis adipiscing lorem vitae mattis nibh ligula nec sem duis aliquam convallis nunc proin at turpis a pede,0910VB28Q61,,2022-07-24,2967.97,,,,,,,2028-10-27
-Auer LLC,Bulldozer,YOO-5936907,Electrical,Berge Inc,"Heaney, Altenwerth and Emmerich",Roberts-Anderson,8204459090,"Macbook Pro 13""",,7375EM02N97,proin eu mi nulla ac enim in tempor turpis nec euismod scelerisque quam turpis adipiscing lorem,2022-10-01,3819.73,,,,,,,2028-10-27
-Olson Group,Skid-Steer,EJS-7488052,Roofing (Metal),"Fritsch, Sauer and Conn","Romaguera, Goldner and Crooks",Lindgren-Marquardt,1252634576,"Macbook Pro 13""",blandit non interdum in ante vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia curae,,rhoncus sed vestibulum sit amet cursus id turpis integer aliquet massa id lobortis convallis,2022-06-25,2711.89,Location,,,,,"McGlynn, Hagenes and Bruen",2028-10-27
-"Powlowski, Monahan and Reichel",Bulldozer,HNY-7340937,Ornamental Railings,"Botsford, Boyle and Herzog",Watsica LLC,Roberts-Anderson,7294510907,"Macbook Pro 13""",sapien urna pretium nisl ut volutpat sapien arcu sed augue aliquam erat volutpat in,"",erat fermentum justo nec condimentum neque sapien placerat ante nulla justo aliquam quis turpis eget elit sodales,2022-07-24,1833.42,User,mhasley21,Marion,Hasley,mhasley21@clickbank.net,,2028-10-27
-Harris LLC,Grader,JHN-0598394,Curb & Gutter,"Heaney, Altenwerth and Emmerich","Fritsch, Sauer and Conn",Waters LLC,0709494209,"Macbook Pro 13""",orci luctus et ultrices posuere cubilia curae duis faucibus accumsan odio curabitur,"",vestibulum vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere,2023-04-11,3263.79,User,mbaudy2b,Mickie,Baudy,mbaudy2b@intel.com,,2028-10-27
-Boyer-Okuneva,Backhoe,GEX-7216431,Prefabricated Aluminum Metal Canopies,Pollich LLC,"Upton, Feil and Jast","Jenkins, Goldner and Cruickshank",4030738107,"Macbook Pro 13""",velit vivamus vel nulla eget eros elementum pellentesque quisque porta volutpat,"",,2022-08-25,2448.17,Location,,,,,Lynch and Sons,2028-10-27
-Ebert-Reilly,Scraper,DWM-3752227,Construction Clean and Final Clean,Watsica LLC,Berge Inc,"Mills, Gleichner and Schamberger",9381884673,"Macbook Pro 13""",sed nisl nunc rhoncus dui vel sem sed sagittis nam congue risus semper porta volutpat quam pede lobortis ligula sit,"",rhoncus aliquet pulvinar sed nisl nunc rhoncus dui vel sem sed sagittis nam congue risus semper,2022-12-23,2721.12,User,sbucknall28,Saidee,Bucknall,sbucknall28@cbsnews.com,,""
-"Mitchell, Ward and Hettinger",Dragline,OLM-0226994,Structural and Misc Steel (Fabrication),Walker-Towne,"Kutch, Johnson and Olson",Frami and Sons,7504201033,"Macbook Pro 13""",curae mauris viverra diam vitae quam suspendisse potenti nullam porttitor lacus at turpis donec posuere metus vitae ipsum aliquam non,"",amet nulla quisque arcu libero rutrum ac lobortis vel dapibus at diam nam tristique,2023-05-14,3178.59,Location,,,,,"O'Conner, Nitzsche and Aufderhar",""
-Prosacco-Ledner,Scraper,LYO-8134459,Roofing (Asphalt),Mosciski Inc,Mosciski Inc,Waters LLC,9994825740,"Macbook Pro 13""",molestie hendrerit at vulputate vitae nisl aenean lectus pellentesque eget nunc donec quis orci,"",,2023-05-07,3322.34,,,,,,,""
-Harvey and Sons,Compactor,HLK-1645158,Structural and Misc Steel (Fabrication),"Romaguera, Goldner and Crooks",Mosciski Inc,Treutel Inc,8322817966,"Macbook Pro 13""",egestas metus aenean fermentum donec ut mauris eget massa tempor convallis nulla neque libero convallis eget eleifend,"",,2022-09-03,1823.95,User,flewins10,Filip,Lewins,flewins10@amazonaws.com,,""
-"Lebsack, Roob and Streich",Scraper,AZT-4280937,Marlite Panels (FED),Okuneva Group,"Upton, Feil and Jast",Lynch and Sons,8146943004,"Macbook Pro 13""",,"",,2022-12-17,1614.68,Location,,,,,Roberts-Anderson,""
-Abbott-Nikolaus,Dump Truck,IAB-5332824,Structural & Misc Steel Erection,"Upton, Feil and Jast","Romaguera, Goldner and Crooks",Lynch and Sons,3906729636,"Macbook Pro 13""",dui luctus rutrum nulla tellus in sagittis dui vel nisl duis ac nibh fusce,2315CN41G71,,2022-11-02,1444.69,Location,,,,,Fritsch-Abernathy,""
-Nolan-Wisoky,Trencher,OID-4455781,HVAC,Ankunding-Ledner,Abernathy-Stamm,Schinner Group,8981616853,"Macbook Pro 13""",maecenas pulvinar lobortis est phasellus sit amet erat nulla tempus,6080UE59E09,,2022-09-07,3637.94,User,bmctrustrie1c,Balduin,McTrustrie,bmctrustrie1c@free.fr,,""
-"Miller, Morissette and Kihn",Trencher,UQY-2172679,Curb & Gutter,"Legros, Paucek and Collier",Mosciski Inc,"O'Conner, Nitzsche and Aufderhar",3983411009,"Macbook Pro 13""",,5505YF23M46,,2023-02-10,4253.88,User,kkubanek1t,Kalinda,Kubanek,kkubanek1t@umich.edu,,""
-Erdman and Sons,Grader,HRI-2262410,Granite Surfaces,Berge Inc,Walker-Towne,Ledner-Barrows,9311141848,"Macbook Pro 13""",,8673QP30R80,,2022-06-20,1784.66,Location,,,,,Lynch and Sons,""
-"Rogahn, Cormier and Ruecker",Bulldozer,BBK-5960598,Drywall & Acoustical (MOB),Abernathy-Stamm,"Heaney, Altenwerth and Emmerich",Frami and Sons,5157837617,"Macbook Pro 13""",nisl ut volutpat sapien arcu sed augue aliquam erat volutpat in congue etiam justo etiam pretium,9088XV67Q94,,2022-12-15,668.43,Location,,,,,Russel Group,""
-Pagac-Feeney,Compactor,RRO-8557470,Structural and Misc Steel (Fabrication),Mosciski Inc,Okuneva Group,Russel Group,2776102414,"Macbook Pro 13""",quis libero nullam sit amet turpis elementum ligula vehicula consequat morbi a ipsum integer a nibh in quis,,,2022-12-27,3391.42,,,,,,,""
-Toy-Daniel,Compactor,SUQ-5159067,Fire Protection,"Botsford, Boyle and Herzog",Berge Inc,"Jenkins, Goldner and Cruickshank",0313117719,Robby,,2830MI42B80,,2022-06-24,4402.74,User,hbucknall29,Hillie,Bucknall,hbucknall29@webnode.com,,2028-10-27
-"Rau, O'Kon and Predovic",Grader,KUW-8075173,Hard Tile & Stone,"Kunde, Doyle and Kozey",Abernathy-Stamm,"Torp, Kautzer and Rodriguez",3235657209,Tommy,,8752PQ41C20,,2023-04-16,2428.95,User,wtomblin2r,Waiter,Tomblin,wtomblin2r@cisco.com,,2028-10-27
-"Rodriguez, Rippin and Maggio",Backhoe,KGD-2478881,Epoxy Flooring,"Upton, Feil and Jast",Krajcik LLC,Roberts-Anderson,9968615213,Sumner,,,interdum mauris ullamcorper purus sit amet nulla quisque arcu libero rutrum ac lobortis vel dapibus at diam nam tristique tortor,2022-11-14,2353.49,,,,,,,2028-10-27
-Collins-Langworth,Backhoe,NLM-1912680,Glass & Glazing,Walker-Towne,"Kunde, Doyle and Kozey","Nitzsche, Gislason and Douglas",2439578863,Paloma,quam pharetra magna ac consequat metus sapien ut nunc vestibulum ante ipsum,4241FY30X65,aenean sit amet justo morbi ut odio cras mi pede malesuada in imperdiet et commodo vulputate justo,2022-05-29,413.99,User,esargersonc,El,Sargerson,esargersonc@moonfruit.com,,2028-10-27
-"Tillman, Rippin and Robel",Backhoe,HKF-2889015,Framing (Steel),Rippin-Schiller,"Upton, Feil and Jast","Nitzsche, Gislason and Douglas",1249482779,Mabelle,,7737HG97C81,nibh in hac habitasse platea dictumst aliquam augue quam sollicitudin vitae consectetuer eget rutrum at lorem integer tincidunt ante,2022-09-27,174.79,User,lloosely2i,Leia,Loosely,lloosely2i@ebay.co.uk,,2028-10-27
-Bogisich-Gerhold,Excavator,HIN-5577764,HVAC,Ankunding-Ledner,"Kutch, Johnson and Olson",Treutel Inc,5300366684,Robby,,,vestibulum rutrum rutrum neque aenean auctor gravida sem praesent id massa id nisl venenatis lacinia,2023-04-09,4662.35,User,bogg1s,Blakeley,Ogg,bogg1s@examiner.com,,2028-10-27
-DuBuque-Jones,Excavator,RSF-1042461,Roofing (Asphalt),Abernathy-Stamm,"Stokes, Daniel and Johnson",Frami and Sons,8526994711,Jere,vestibulum rutrum rutrum neque aenean auctor gravida sem praesent id massa id nisl venenatis lacinia aenean,,,2022-11-25,2356.93,,,,,,,2028-10-27
-Runolfsson-McCullough,Scraper,DAK-0644656,Framing (Wood),Mosciski Inc,"Legros, Paucek and Collier",Lynch and Sons,5644034134,Mabelle,,3664GP06B10,molestie nibh in lectus pellentesque at nulla suspendisse potenti cras in purus eu,2022-10-05,3912.18,User,mnollet1,Maury,Nollet,mnollet1@ow.ly,,2028-10-27
-Hilpert-Vandervort,Crawler,XWJ-0341580,Roofing (Asphalt),Ankunding-Ledner,Abernathy-Stamm,"Mills, Gleichner and Schamberger",0635168064,Chase,,9438FZ85N89,dolor sit amet consectetuer adipiscing elit proin interdum mauris non ligula pellentesque ultrices phasellus id sapien,2022-08-28,4426.46,User,nhumburton1m,Noelle,Humburton,nhumburton1m@ow.ly,,2028-10-27
-"Schmitt, Kuhlman and Gusikowski",Excavator,UQF-6263661,Electrical,"Upton, Feil and Jast","Kunde, Doyle and Kozey",Fritsch-Abernathy,6394370767,Ward,,0642OF31I56,adipiscing elit proin risus praesent lectus vestibulum quam sapien varius ut blandit non interdum in ante vestibulum ante ipsum primis,2022-12-04,3182.1,Location,,,,,Powlowski LLC,2028-10-27
-Klein Inc,Excavator,IOC-4424021,Elevator,Watsica LLC,Pacocha-Goodwin,Treutel Inc,9408196701,Beverly,,4124VH09F17,,2022-09-12,3321.66,,,,,,,2028-10-27
-"Runte, Feeney and Lueilwitz",Compactor,TBU-9704770,Drilled Shafts,"Kunde, Doyle and Kozey",Rippin-Schiller,"Nitzsche, Gislason and Douglas",5300662174,Jere,consectetuer adipiscing elit proin interdum mauris non ligula pellentesque ultrices phasellus id sapien in,,,2022-07-19,1573.26,User,tdoumerquef,Tobe,Doumerque,tdoumerquef@twitpic.com,,2028-10-27
-Reinger LLC,Dump Truck,TTW-1274810,Masonry,"Heaney, Altenwerth and Emmerich",Abernathy-Stamm,"Torp, Kautzer and Rodriguez",6161734867,Karry,,,,2023-03-05,2677.79,User,rtitterrell0,Rora,Titterrell,rtitterrell0@prnewswire.com,,2028-10-27
-"Breitenberg, Crooks and Goldner",Grader,RIU-2781610,Drilled Shafts,Pollich LLC,"Kunde, Doyle and Kozey","Nitzsche, Gislason and Douglas",1424455064,Nial,,6982GT82L84,,2023-03-22,4085.21,User,otaverner7,Odey,Taverner,otaverner7@discuz.net,,2028-10-27
-"Rolfson, Pollich and Kertzmann",Compactor,BFO-5970934,"Doors, Frames & Hardware","Romaguera, Goldner and Crooks",Pacocha-Goodwin,Pacocha-Kiehn,9193131620,Robby,donec dapibus duis at velit eu est congue elementum in hac habitasse platea dictumst morbi vestibulum velit id pretium,3185PP20K43,gravida sem praesent id massa id nisl venenatis lacinia aenean sit amet justo morbi ut odio cras,2022-05-31,1819.48,,,,,,,2028-10-27
-Luettgen Inc,Grader,QEY-4583797,Painting & Vinyl Wall Covering,"Upton, Feil and Jast","Kunde, Doyle and Kozey","O'Conner, Nitzsche and Aufderhar",6610625137,Debbi,,4971UO73K02,,2022-07-07,4635.63,User,glippitt22,Gregorius,Lippitt,glippitt22@yandex.ru,,2028-10-27
-"Hermann, Cremin and Crona",Dragline,OPB-2390560,Ornamental Railings,"Fritsch, Sauer and Conn",Ankunding-Ledner,Treutel Inc,7358467570,Beverly,,7467PI87D35,nisi vulputate nonummy maecenas tincidunt lacus at velit vivamus vel nulla eget eros,2023-04-09,2089.47,User,dhailwood18,Duffy,Hailwood,dhailwood18@ask.com,,2028-10-27
-Cruickshank-Blanda,Grader,CUD-4868409,Electrical and Fire Alarm,Watsica LLC,Ankunding-Ledner,Treutel Inc,7859007380,Kizzee,,0709PI47U54,,2023-01-19,484.12,,,,,,,2028-10-27
-"Reilly, Yundt and Keeling",Bulldozer,ORL-2640580,RF Shielding,"Legros, Paucek and Collier",Berge Inc,Schinner Group,8731356307,Bondon,,6643DS43O77,,2023-03-29,254.99,,,,,,,2028-10-27
-"Franecki, Nolan and Swift",Trencher,GFV-9868944,RF Shielding,"Kunde, Doyle and Kozey","Kunde, Doyle and Kozey",Lynch and Sons,8841110804,Karry,,1465WJ98O96,,2022-08-27,1191.44,User,acharplinge,Andreana,Charpling,acharplinge@dell.com,,2028-10-27
-"Lind, Reinger and Grant",Dump Truck,KFR-9464842,Epoxy Flooring,"Botsford, Boyle and Herzog","Upton, Feil and Jast",Erdman-West,5382312507,Nial,,7440CN27Q04,amet turpis elementum ligula vehicula consequat morbi a ipsum integer a nibh in,2022-08-19,430.07,,,,,,,2028-10-27
-Quigley Inc,Dragline,XQS-0788077,Casework,Ankunding-Ledner,"Fritsch, Sauer and Conn",Lynch and Sons,5163086523,Rolland,ac tellus semper interdum mauris ullamcorper purus sit amet nulla quisque arcu libero rutrum ac lobortis vel,1663OK46D26,,2022-12-25,1308.3,User,ahugonnet1f,Alvis,Hugonnet,ahugonnet1f@vinaora.com,,2028-10-27
-Hudson-Graham,Dragline,APW-0602098,Waterproofing & Caulking,"Romaguera, Goldner and Crooks",Berge Inc,Waters LLC,1473905199,Mabelle,urna pretium nisl ut volutpat sapien arcu sed augue aliquam erat,,,2022-08-18,2037.76,Location,,,,,"Mills, Gleichner and Schamberger",2028-10-27
-"Schmeler, Dietrich and Buckridge",Crawler,RFX-9706298,Drilled Shafts,Krajcik LLC,Krajcik LLC,Roberts-Anderson,2238031407,Robby,ornare consequat lectus in est risus auctor sed tristique in,7387DP63Q90,tempor turpis nec euismod scelerisque quam turpis adipiscing lorem vitae mattis nibh,2023-02-13,3395.33,Location,,,,,Erdman-West,2028-10-27
-"Jast, Cassin and Hane",Grader,EQQ-2912281,Wall Protection,"Fritsch, Sauer and Conn",Krajcik LLC,Lynch and Sons,6313951394,Mabelle,sagittis sapien cum sociis natoque penatibus et magnis dis parturient montes nascetur ridiculus mus etiam vel augue vestibulum,4541TF76I78,tempus semper est quam pharetra magna ac consequat metus sapien ut nunc vestibulum ante ipsum primis,2022-05-25,4787.17,Location,,,,,Schinner Group,2028-10-27
-Bergstrom-Block,Excavator,IEG-8406586,Masonry,Mosciski Inc,Mosciski Inc,Roberts-Anderson,6040029438,Bondon,cubilia curae donec pharetra magna vestibulum aliquet ultrices erat tortor sollicitudin mi sit,4324BJ82Z56,,2022-09-09,2371.3,Location,,,,,Powlowski LLC,2028-10-27
-"Powlowski, Lowe and Streich",Dragline,ZCB-5287486,Roofing (Asphalt),Watsica LLC,Watsica LLC,"McGlynn, Hagenes and Bruen",6324836270,Debbi,,7369JZ83X28,pede ullamcorper augue a suscipit nulla elit ac nulla sed vel enim,2022-05-30,3261.46,User,ohynson1y,Olivia,Hynson,ohynson1y@ask.com,,2028-10-27
-"Purdy, Leannon and Boyer",Crawler,VVZ-9417930,Retaining Wall and Brick Pavers,"Botsford, Boyle and Herzog","Legros, Paucek and Collier",Schinner Group,1391767652,Bale,,,nulla eget eros elementum pellentesque quisque porta volutpat erat quisque erat eros viverra eget congue eget semper rutrum nulla,2022-06-22,807.74,User,vgunning1z,Vince,Gunning,vgunning1z@arstechnica.com,,2028-10-27
-"Schowalter, Grady and Stracke",Backhoe,LHC-9749327,Fire Protection,Walker-Towne,Ankunding-Ledner,Schinner Group,3460146131,Flo,,4031MX62O09,aenean lectus pellentesque eget nunc donec quis orci eget orci vehicula condimentum curabitur in,2023-02-14,2051.25,User,akneath13,Arron,Kneath,akneath13@sphinn.com,,2028-10-27
-Schulist-Marks,Dragline,HUM-7311338,Sitework & Site Utilities,Berge Inc,Okuneva Group,Roberts-Anderson,4146242985,Bondon,,0468AG53C12,,2022-05-20,2788.78,Location,,,,,"O'Conner, Nitzsche and Aufderhar",2028-10-27
-Cole-Feeney,Trencher,LHK-1308041,"Temp Fencing, Decorative Fencing and Gates","Upton, Feil and Jast","Stokes, Daniel and Johnson",Lindgren-Marquardt,7648736489,Robby,,,massa donec dapibus duis at velit eu est congue elementum in hac habitasse,2022-11-02,2755.2,User,dkent23,Debbi,Kent,dkent23@mtv.com,,2028-10-27
-O'Hara Inc,Backhoe,CIC-1996687,"Temp Fencing, Decorative Fencing and Gates","Romaguera, Goldner and Crooks","Romaguera, Goldner and Crooks",Frami and Sons,5059462108,Bale,,5053ZY27R14,placerat praesent blandit nam nulla integer pede justo lacinia eget tincidunt eget tempus vel pede morbi,2023-01-17,2100.84,User,kephson2f,Kimberly,Ephson,kephson2f@sina.com.cn,,2028-10-27
-Rolfson-Kulas,Dump Truck,YBW-8150273,EIFS,Krajcik LLC,"Upton, Feil and Jast","Wilkinson, Waters and Kerluke",5490351215,Mabelle,,9162YL93W88,ullamcorper augue a suscipit nulla elit ac nulla sed vel enim,2023-01-14,877.57,Location,,,,,Fritsch-Abernathy,2028-10-27
-Lehner-Effertz,Excavator,OFB-4987804,Casework,"Stokes, Daniel and Johnson","Kutch, Johnson and Olson",Waters LLC,2712763720,Robby,,0270YA01J87,sit amet sapien dignissim vestibulum vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia curae nulla dapibus,2022-09-03,3428.56,User,acansdell14,Adela,Cansdell,acansdell14@cbc.ca,,2028-10-27
-"Dietrich, Von and Mante",Excavator,RXG-3730482,Elevator,Rippin-Schiller,"Botsford, Boyle and Herzog",Lindgren-Marquardt,0868073143,Jere,,8281VU07P52,,2023-01-25,713.89,User,pwippers,Peirce,Wipper,pwippers@liveinternet.ru,,2028-10-27
-Predovic-Roob,Bulldozer,ATA-2489950,EIFS,"Botsford, Boyle and Herzog","Romaguera, Goldner and Crooks",Frami and Sons,8905034852,Chase,platea dictumst maecenas ut massa quis augue luctus tincidunt nulla mollis molestie lorem quisque ut,,,2023-02-07,1138.85,User,odella1g,Osgood,Della,odella1g@hc360.com,,2028-10-27
-Adams-Larkin,Grader,SFI-7496689,"Doors, Frames & Hardware","Kutch, Johnson and Olson",Abernathy-Stamm,Lynch and Sons,3092970929,Flo,id ornare imperdiet sapien urna pretium nisl ut volutpat sapien arcu sed augue aliquam erat volutpat in congue etiam justo,0649BJ66S09,at feugiat non pretium quis lectus suspendisse potenti in eleifend quam a odio in hac,2022-09-10,278.59,,,,,,,2028-10-27
-"Beier, Grant and Thiel",Grader,GSX-1706311,Masonry,"Heaney, Altenwerth and Emmerich",Mosciski Inc,Ledner-Barrows,5141273631,Mabelle,convallis nunc proin at turpis a pede posuere nonummy integer non velit donec diam neque vestibulum eget,6967FJ73D06,sem mauris laoreet ut rhoncus aliquet pulvinar sed nisl nunc rhoncus dui vel sem sed sagittis nam,2022-07-18,1732.28,Location,,,,,Fritsch-Abernathy,2028-10-27
-Armstrong Group,Dump Truck,LXV-5626274,Plumbing & Medical Gas,Rippin-Schiller,Ankunding-Ledner,"Wilkinson, Waters and Kerluke",3202695143,Jeana,,5970GY37L93,purus eu magna vulputate luctus cum sociis natoque penatibus et magnis dis parturient montes nascetur ridiculus mus vivamus,2022-10-11,1981.53,User,cwinfreyl,Casper,Winfrey,cwinfreyl@adobe.com,,2028-10-27
-Rodriguez-Schultz,Excavator,BRF-0336967,Structural and Misc Steel (Fabrication),Abernathy-Stamm,"Botsford, Boyle and Herzog","Torp, Kautzer and Rodriguez",8211664431,Nial,nec nisi volutpat eleifend donec ut dolor morbi vel lectus in quam fringilla rhoncus mauris enim leo rhoncus sed vestibulum,,ultrices erat tortor sollicitudin mi sit amet lobortis sapien sapien non mi integer ac neque duis bibendum morbi,2022-12-30,4924.25,User,mgooday1q,Mariellen,Gooday,mgooday1q@alexa.com,,2028-10-27
-"Huels, Satterfield and Kautzer",Backhoe,CVH-2946076,Painting & Vinyl Wall Covering,Ankunding-Ledner,"Upton, Feil and Jast",Frami and Sons,0835287084,Paloma,justo pellentesque viverra pede ac diam cras pellentesque volutpat dui maecenas tristique est et tempus,,,2022-07-15,2406.57,,,,,,,2028-10-27
-"Lueilwitz, Herzog and Runte",Skid-Steer,OTH-2531332,HVAC,Mosciski Inc,Ankunding-Ledner,Ledner-Barrows,7517530461,Paloma,,1256WA18C94,,2023-01-14,531.46,,,,,,,2028-10-27
-Funk LLC,Grader,ZMB-4808007,Fire Sprinkler System,"Upton, Feil and Jast",Ankunding-Ledner,"Wilkinson, Waters and Kerluke",4467089765,Jeana,,0663SC93W29,quis orci eget orci vehicula condimentum curabitur in libero ut massa volutpat convallis morbi odio odio elementum eu interdum eu,2022-07-19,4741.85,,,,,,,2028-10-27
-"Doyle, Kulas and Mosciski",Dump Truck,XES-9665196,Masonry & Precast,"Botsford, Boyle and Herzog",Pacocha-Goodwin,Ledner-Barrows,4220776022,Sumner,,0099EC66L98,in hac habitasse platea dictumst morbi vestibulum velit id pretium iaculis,2022-08-06,276.15,,,,,,,2028-10-27
-"Robel, Johnston and Crist",Excavator,KUJ-7232314,Construction Clean and Final Clean,Ankunding-Ledner,"Romaguera, Goldner and Crooks",Fritsch-Abernathy,5757955088,Paloma,,4270AX61I99,,2022-09-21,3749.65,Location,,,,,"Wilkinson, Waters and Kerluke",2028-10-27
-Wiza-Mante,Grader,UNN-0016298,Roofing (Metal),Watsica LLC,Ankunding-Ledner,Frami and Sons,6746036070,Tommy,interdum mauris non ligula pellentesque ultrices phasellus id sapien in sapien iaculis congue vivamus metus arcu adipiscing molestie,9540RE21E79,est congue elementum in hac habitasse platea dictumst morbi vestibulum velit id pretium iaculis diam erat,2022-08-08,4600.22,Location,,,,,Roberts-Anderson,2028-10-27
-Jacobi Group,Bulldozer,JRP-9799959,Roofing (Metal),Rippin-Schiller,"Stokes, Daniel and Johnson",Russel Group,1090875903,Nobe,,5159PT28N59,,2023-05-02,3255.63,Location,,,,,Pacocha-Kiehn,2028-10-27
-Murazik-Cormier,Crawler,GTI-0627775,Marlite Panels (FED),"Kutch, Johnson and Olson","Fritsch, Sauer and Conn",Powlowski LLC,7650476155,Jeana,,9055CM63Z89,,2022-06-24,1295.04,Location,,,,,"Jenkins, Goldner and Cruickshank",2028-10-27
-"Simonis, Schulist and Volkman",Compactor,WEL-4481760,RF Shielding,Mosciski Inc,Rippin-Schiller,Powlowski LLC,6908782578,Bale,curae nulla dapibus dolor vel est donec odio justo sollicitudin ut suscipit a feugiat,3712NE31P89,,2022-08-02,2038.79,User,ksennett6,Katerina,Sennett,ksennett6@ibm.com,,2028-10-27
-Conroy-Abshire,Grader,VKB-3777629,Masonry & Precast,Krajcik LLC,Pollich LLC,Erdman-West,6651233484,Illa,duis aliquam convallis nunc proin at turpis a pede posuere nonummy integer non velit donec,,in hac habitasse platea dictumst etiam faucibus cursus urna ut tellus nulla ut erat id mauris,2023-04-28,4988.38,,,,,,,2028-10-27
-Mueller and Sons,Bulldozer,YFK-3812221,Waterproofing & Caulking,Rippin-Schiller,Berge Inc,"Mills, Gleichner and Schamberger",3679743009,Illa,sed vel enim sit amet nunc viverra dapibus nulla suscipit ligula in lacus curabitur at ipsum ac tellus semper interdum,2077OM84Z52,,2022-09-18,3085.39,User,moscullya,Maurice,O'Scully,moscullya@engadget.com,,2028-10-27
-"Turner, Schulist and Hodkiewicz",Compactor,ENN-1432777,Ornamental Railings,"Romaguera, Goldner and Crooks","Kunde, Doyle and Kozey","Mills, Gleichner and Schamberger",7184133416,Robby,,6321OY95W96,,2022-09-25,4517.54,User,lloosely2i,Leia,Loosely,lloosely2i@ebay.co.uk,,2028-10-27
-Dicki-Hartmann,Skid-Steer,JNS-3537485,Epoxy Flooring,Pacocha-Goodwin,Mosciski Inc,Pacocha-Kiehn,2137927703,Mabelle,erat fermentum justo nec condimentum neque sapien placerat ante nulla justo aliquam,2809IW22A70,consectetuer adipiscing elit proin interdum mauris non ligula pellentesque ultrices phasellus id sapien in,2022-09-12,4293.51,,,,,,,2028-10-27
-Schoen and Sons,Dump Truck,RAA-2200532,Soft Flooring and Base,Walker-Towne,"Upton, Feil and Jast",Waters LLC,5479047972,Beverly,maecenas leo odio condimentum id luctus nec molestie sed justo pellentesque viverra,,,2023-01-19,1760.88,User,rsapeyb,Raquela,Sapey,rsapeyb@furl.net,,2028-10-27
-"Rolfson, Champlin and Cole",Bulldozer,GDB-9523081,EIFS,"Heaney, Altenwerth and Emmerich","Upton, Feil and Jast",Frami and Sons,6544577007,Rolland,,,,2022-11-29,2769.18,,,,,,,2028-10-27
-"Maggio, Wolff and Friesen",Excavator,IOH-2003935,Structural and Misc Steel (Fabrication),Okuneva Group,Abernathy-Stamm,Lindgren-Marquardt,1508089431,Flo,vehicula condimentum curabitur in libero ut massa volutpat convallis morbi odio odio elementum eu interdum eu,2753UJ02X37,porttitor lorem id ligula suspendisse ornare consequat lectus in est risus auctor sed tristique in tempus,2022-08-05,3709.55,,,,,,,2028-10-27
-Brekke-Hoeger,Backhoe,UPX-0286727,Plumbing & Medical Gas,"Upton, Feil and Jast",Rippin-Schiller,Lynch and Sons,6217027186,Bondon,,6387KP57B15,vivamus metus arcu adipiscing molestie hendrerit at vulputate vitae nisl aenean lectus pellentesque eget nunc donec,2023-03-21,4138.24,,,,,,,2028-10-27
-Konopelski Inc,Dump Truck,NZE-5809675,Casework,"Stokes, Daniel and Johnson","Kutch, Johnson and Olson",Erdman-West,8486277027,Mabelle,dui luctus rutrum nulla tellus in sagittis dui vel nisl duis ac nibh fusce lacus purus,4732FS58G78,,2023-05-11,114.69,,,,,,,2028-10-27
-"Nolan, Kertzmann and Rippin",Bulldozer,YXY-3875893,RF Shielding,"Romaguera, Goldner and Crooks",Abernathy-Stamm,Frami and Sons,7979699903,Bondon,habitasse platea dictumst maecenas ut massa quis augue luctus tincidunt,4378XF72E06,,2023-04-29,1781.53,,,,,,,2028-10-27
-Stroman and Sons,Skid-Steer,BDD-0117730,"Temp Fencing, Decorative Fencing and Gates",Okuneva Group,Mosciski Inc,Frami and Sons,1053653041,Karry,,0484GG78J91,odio elementum eu interdum eu tincidunt in leo maecenas pulvinar lobortis est phasellus sit amet erat,2022-09-12,4854.6,User,mbaudy2b,Mickie,Baudy,mbaudy2b@intel.com,,2028-10-27
-Howe-Volkman,Crawler,YMB-2902862,Masonry & Precast,"Kutch, Johnson and Olson",Krajcik LLC,Roberts-Anderson,0269899359,Nial,,2685ZN23G49,,2022-08-27,133.33,User,jdriffill2,Jeanne,Driffill,jdriffill2@google.fr,,2028-10-27
-Heathcote and Sons,Skid-Steer,LWA-2897309,Exterior Signage,"Heaney, Altenwerth and Emmerich",Okuneva Group,Schinner Group,1268560442,Paloma,,8414GM02P21,,2022-12-27,4524.09,,,,,,,2028-10-27
-Borer-Aufderhar,Scraper,OOY-9898294,Electrical,Pacocha-Goodwin,Berge Inc,"Nitzsche, Gislason and Douglas",4556315148,Karry,,0187NT56E91,,2022-08-21,390.85,,,,,,,2028-10-27
-"Hauck, Bogisich and King",Dragline,XHB-6046299,Sitework & Site Utilities,"Fritsch, Sauer and Conn","Romaguera, Goldner and Crooks","Jenkins, Goldner and Cruickshank",9343736607,Debbi,aliquam erat volutpat in congue etiam justo etiam pretium iaculis,8559BT54S22,in lectus pellentesque at nulla suspendisse potenti cras in purus eu magna vulputate,2022-05-25,1439.23,Location,,,,,Ledner-Barrows,
-"Upton, Luettgen and Mayer",Grader,JVB-8844609,Structural & Misc Steel Erection,Pollich LLC,"Kunde, Doyle and Kozey",Treutel Inc,6715000024,Karry,nulla eget eros elementum pellentesque quisque porta volutpat erat quisque erat eros viverra eget congue eget semper,0088HF56H55,,2022-12-17,4849.95,Location,,,,,"McGlynn, Hagenes and Bruen",
-Fadel Inc,Skid-Steer,VAA-1096481,Hard Tile & Stone,Mosciski Inc,Krajcik LLC,Schinner Group,2384395201,Nobe,parturient montes nascetur ridiculus mus etiam vel augue vestibulum rutrum rutrum neque aenean auctor gravida sem praesent id,,tortor duis mattis egestas metus aenean fermentum donec ut mauris,2022-07-15,1190.44,User,tphysick3,Tiphanie,Physick,tphysick3@umn.edu,,
-Dickens and Sons,Skid-Steer,OAC-1765208,Ornamental Railings,Ankunding-Ledner,Rippin-Schiller,Lindgren-Marquardt,2119388227,Ward,non velit nec nisi vulputate nonummy maecenas tincidunt lacus at velit vivamus vel nulla eget eros elementum pellentesque quisque porta,9895LS02S32,,2022-09-03,1868.26,Location,,,,,"Jenkins, Goldner and Cruickshank",
-Cassin Group,Bulldozer,CPK-3286546,Structural & Misc Steel Erection,Berge Inc,"Botsford, Boyle and Herzog",Frami and Sons,6044719518,Chase,,5420GG86P87,,2022-07-22,1463.24,,,,,,,
-"Wolf, Wiza and Pacocha",Excavator,ZHU-6798344,Electrical,"Kutch, Johnson and Olson",Abernathy-Stamm,Frami and Sons,6111751517,Tommy,odio in hac habitasse platea dictumst maecenas ut massa quis augue luctus tincidunt nulla mollis molestie lorem quisque ut erat,5462TF70C36,amet erat nulla tempus vivamus in felis eu sapien cursus vestibulum proin eu mi nulla ac enim,2023-02-26,1268.92,User,pshirleyi,Pen,Shirley,pshirleyi@theguardian.com,,
-"Davis, Klein and Kiehn",Backhoe,WHR-8533403,Plumbing & Medical Gas,"Botsford, Boyle and Herzog",Mosciski Inc,Treutel Inc,7632050235,Tommy,,5478JY13D60,,2022-09-11,4908.48,Location,,,,,Pacocha-Kiehn,
-"Gorczany, Lindgren and Hand",Compactor,FAC-2072179,Framing (Steel),Berge Inc,"Legros, Paucek and Collier",Ledner-Barrows,8755015421,Rolland,,2138TK23O47,massa id nisl venenatis lacinia aenean sit amet justo morbi ut odio cras mi pede,2022-09-19,2249.9,User,kgrealish16,Krystalle,Grealish,kgrealish16@sciencedirect.com,,
-Romaguera-Ondricka,Grader,KON-1821691,Curb & Gutter,"Kutch, Johnson and Olson",Okuneva Group,"O'Conner, Nitzsche and Aufderhar",4908345668,Chase,,5414US21B26,pede libero quis orci nullam molestie nibh in lectus pellentesque at nulla suspendisse potenti,2022-11-14,1545.41,User,ewarriner2o,Ellene,Warriner,ewarriner2o@wikimedia.org,,
-"Anderson, Goldner and Bailey",Compactor,NDF-4324420,Roofing (Metal),Mosciski Inc,"Kunde, Doyle and Kozey","McGlynn, Hagenes and Bruen",3212882737,Nial,,0754DG10B38,dui nec nisi volutpat eleifend donec ut dolor morbi vel lectus in quam fringilla rhoncus mauris enim leo,2023-05-15,4423.19,,,,,,,
-Mraz-Windler,Trencher,DLM-4710838,Plumbing & Medical Gas,"Kunde, Doyle and Kozey",Walker-Towne,"Jenkins, Goldner and Cruickshank",1315337182,Debbi,,2430PB13D95,,2022-07-11,2708.18,User,fmcguiness1k,Fredrika,McGuiness,fmcguiness1k@woothemes.com,,
-Volkman Group,Compactor,MLJ-9313486,Electrical and Fire Alarm,"Romaguera, Goldner and Crooks","Botsford, Boyle and Herzog",Fritsch-Abernathy,2738670737,Illa,,,,2022-10-09,1404.85,Location,,,,,Pacocha-Kiehn,
-Schulist-Kulas,Compactor,XBE-4236649,Drywall & Acoustical (MOB),Abernathy-Stamm,Berge Inc,"Nitzsche, Gislason and Douglas",7811285882,Kizzee,,2875KP71D22,,2022-11-21,271.5,Location,,,,,"Wilkinson, Waters and Kerluke",
-Hammes Inc,Crawler,NRV-3022526,Epoxy Flooring,Pollich LLC,"Upton, Feil and Jast",Powlowski LLC,8015369811,Ward,,6485BK61G70,facilisi cras non velit nec nisi vulputate nonummy maecenas tincidunt lacus at velit vivamus vel nulla eget eros,2023-01-25,1757.26,,,,,,,
-"Kemmer, Beier and Hegmann",Skid-Steer,EXG-6125653,Glass & Glazing,"Upton, Feil and Jast",Pacocha-Goodwin,Erdman-West,9025824302,Rolland,,8500KT88G80,,2022-09-27,3697.22,User,aweemsj,Antoinette,Weems,aweemsj@who.int,,
-"Padberg, Kozey and Morar",Compactor,XYK-7848357,RF Shielding,Berge Inc,Abernathy-Stamm,Russel Group,2116700211,Robby,,,,2022-11-05,4059.57,Location,,,,,Lindgren-Marquardt,
-Pfannerstill and Sons,Skid-Steer,GZW-6229249,Waterproofing & Caulking,Pollich LLC,"Kutch, Johnson and Olson","Torp, Kautzer and Rodriguez",4909263041,Debbi,,,lectus pellentesque eget nunc donec quis orci eget orci vehicula condimentum curabitur in,2022-08-11,1697.74,,,,,,,
-Kunde-Hermiston,Compactor,VZD-7424699,Marlite Panels (FED),Mosciski Inc,"Upton, Feil and Jast","Jenkins, Goldner and Cruickshank",5611381559,Nial,,8991VD43T11,cras mi pede malesuada in imperdiet et commodo vulputate justo in blandit,2022-09-17,4957.55,Location,,,,,Powlowski LLC,
-"Treutel, Schmidt and Koss",Compactor,RZO-4616134,Retaining Wall and Brick Pavers,"Stokes, Daniel and Johnson","Kutch, Johnson and Olson","O'Conner, Nitzsche and Aufderhar",0833202169,Nial,,6036SV40U93,,2023-04-18,3218.61,User,bvandalen5,Barbabas,Van Dalen,bvandalen5@smugmug.com,,
-Nader Inc,Scraper,NXG-1697279,RF Shielding,"Botsford, Boyle and Herzog","Fritsch, Sauer and Conn",Waters LLC,7094568704,Robby,,7964JY42Z54,,2022-08-26,3628.55,Location,,,,,"McGlynn, Hagenes and Bruen",
-"Cremin, Conroy and Kuphal",Crawler,OGN-4843235,Glass & Glazing,Okuneva Group,"Heaney, Altenwerth and Emmerich",Pacocha-Kiehn,6424257173,Beverly,,2880LU86I74,sagittis nam congue risus semper porta volutpat quam pede lobortis ligula sit amet eleifend pede libero quis orci,2022-09-22,4163.07,,,,,,,
-"Douglas, Considine and Gerhold",Backhoe,BXI-1028705,Structural and Misc Steel (Fabrication),"Romaguera, Goldner and Crooks",Ankunding-Ledner,Roberts-Anderson,5388101251,Karry,,,,2023-02-20,976.02,,,,,,,
-Emard Group,Scraper,MWK-5482358,Ornamental Railings,Mosciski Inc,"Heaney, Altenwerth and Emmerich","Mills, Gleichner and Schamberger",5509346090,Nobe,,8183RH74P65,donec dapibus duis at velit eu est congue elementum in hac habitasse platea dictumst morbi vestibulum,2022-06-28,1441.26,Location,,,,,Fritsch-Abernathy,
-Runolfsdottir-Schulist,Compactor,ZSS-2076422,EIFS,Rippin-Schiller,"Upton, Feil and Jast",Ledner-Barrows,4163465013,Karry,dui luctus rutrum nulla tellus in sagittis dui vel nisl,,,2022-11-11,3688.09,User,rrappa27,Rabi,Rappa,rrappa27@cyberchimps.com,,
-Stoltenberg-Cormier,Trencher,XNO-4048888,Roofing (Metal),Watsica LLC,Pollich LLC,Russel Group,3593822457,Robby,morbi quis tortor id nulla ultrices aliquet maecenas leo odio condimentum id luctus nec molestie sed,1583JR98T50,,2022-12-04,1780.96,,,,,,,
-"Hand, Bogan and Cassin",Skid-Steer,SWP-7721219,Roofing (Metal),"Kunde, Doyle and Kozey",Krajcik LLC,Lindgren-Marquardt,1185234640,Nial,,4091TS60T07,,2023-05-09,1528.53,User,mskellingtonu,Marrilee,Skellington,mskellingtonu@abc.net.au,,
-Kling-Homenick,Dragline,HGX-6549969,Asphalt Paving,Walker-Towne,"Fritsch, Sauer and Conn","Jenkins, Goldner and Cruickshank",2726185990,Bale,,9573TJ14G71,,2023-01-31,4930.43,User,asyne1a,Angela,Syne,asyne1a@icio.us,,
-"Kilback, Towne and Stehr",Skid-Steer,ZTD-2850379,Drilled Shafts,Krajcik LLC,"Stokes, Daniel and Johnson","O'Conner, Nitzsche and Aufderhar",7192145952,Paloma,,,ipsum aliquam non mauris morbi non lectus aliquam sit amet diam in magna bibendum imperdiet nullam orci,2022-12-25,2947.93,,,,,,,
-Harvey-Moore,Dump Truck,QKC-1710236,Fire Protection,Berge Inc,Okuneva Group,Lynch and Sons,7337073255,Kizzee,,7010OW07S33,,2023-02-01,1617.55,Location,,,,,Ledner-Barrows,
-Maggio-Hoppe,Excavator,LHL-3384861,Termite Control,Pacocha-Goodwin,Abernathy-Stamm,Lindgren-Marquardt,5642326493,Ward,amet sem fusce consequat nulla nisl nunc nisl duis bibendum felis sed interdum,0489GD18P85,,2022-07-29,4682.12,User,nscroggs2d,Naoma,Scroggs,nscroggs2d@yelp.com,,
-Muller LLC,Skid-Steer,VYY-4278214,Rebar & Wire Mesh Install,"Kunde, Doyle and Kozey",Okuneva Group,Schinner Group,0946092591,Paloma,,,felis sed lacus morbi sem mauris laoreet ut rhoncus aliquet pulvinar sed nisl nunc rhoncus dui vel sem sed sagittis,2022-09-07,4400.17,Location,,,,,Lynch and Sons,
-Kerluke Inc,Backhoe,HRP-6178185,Retaining Wall and Brick Pavers,Mosciski Inc,Berge Inc,Treutel Inc,6532044804,Nial,,,,2022-09-07,1345.45,Location,,,,,Lindgren-Marquardt,
-"Harvey, Schulist and Kemmer",Trencher,QND-9017996,Painting & Vinyl Wall Covering,Abernathy-Stamm,Pollich LLC,Fritsch-Abernathy,4977996097,Paloma,est donec odio justo sollicitudin ut suscipit a feugiat et eros vestibulum ac est lacinia nisi venenatis tristique fusce,2497DB20W09,habitasse platea dictumst morbi vestibulum velit id pretium iaculis diam erat fermentum justo,2023-01-27,317.08,,,,,,,
-Schimmel and Sons,Dragline,DAX-0085828,Drywall & Acoustical (MOB),Okuneva Group,Watsica LLC,"Jenkins, Goldner and Cruickshank",7739403397,Flo,,,,2022-12-28,4521.28,User,pwippers,Peirce,Wipper,pwippers@liveinternet.ru,,
-Grimes-Lowe,Dragline,VED-7099927,Masonry,Rippin-Schiller,"Stokes, Daniel and Johnson",Lynch and Sons,3351670325,Karry,,,ullamcorper purus sit amet nulla quisque arcu libero rutrum ac lobortis vel dapibus at,2023-02-04,2620.69,,,,,,,
-Krajcik-Cruickshank,Bulldozer,ZHU-0211288,Painting & Vinyl Wall Covering,"Fritsch, Sauer and Conn",Pacocha-Goodwin,Lindgren-Marquardt,5042401893,Paloma,vestibulum rutrum rutrum neque aenean auctor gravida sem praesent id massa id nisl venenatis lacinia aenean sit amet justo,0511VF33D78,proin eu mi nulla ac enim in tempor turpis nec euismod scelerisque quam turpis adipiscing lorem,2022-09-27,923.99,,,,,,,
-Donnelly-Maggio,Compactor,HFG-7624506,Electrical and Fire Alarm,Pollich LLC,"Fritsch, Sauer and Conn","Torp, Kautzer and Rodriguez",3157087051,Illa,libero convallis eget eleifend luctus ultricies eu nibh quisque id justo sit amet sapien dignissim,5980WY24F50,tortor sollicitudin mi sit amet lobortis sapien sapien non mi integer ac neque duis bibendum morbi non,2022-12-05,4670.18,Location,,,,,"Jenkins, Goldner and Cruickshank",
-Pfeffer-Zieme,Trencher,AZY-1682920,Wall Protection,Abernathy-Stamm,Mosciski Inc,"Torp, Kautzer and Rodriguez",5186444169,Beverly,consequat nulla nisl nunc nisl duis bibendum felis sed interdum venenatis turpis enim,6620HZ14T83,aliquam convallis nunc proin at turpis a pede posuere nonummy,2022-06-27,1674.34,User,cstamper1h,Celie,Stamper,cstamper1h@usda.gov,,
-"Cormier, Glover and Hickle",Compactor,EYP-3561396,Termite Control,Rippin-Schiller,"Kunde, Doyle and Kozey","Torp, Kautzer and Rodriguez",4964027369,Paloma,quam suspendisse potenti nullam porttitor lacus at turpis donec posuere metus,4352FH58S52,,2022-11-21,136.12,,,,,,,
-Rau Group,Skid-Steer,DYU-7769483,Marlite Panels (FED),Krajcik LLC,Krajcik LLC,Fritsch-Abernathy,2457705388,Sumner,,2286KF82X10,,2023-05-14,1147.8,User,flewins10,Filip,Lewins,flewins10@amazonaws.com,,
-"Shanahan, Bradtke and Rowe",Backhoe,JYC-0713874,Hard Tile & Stone,"Upton, Feil and Jast",Ankunding-Ledner,Waters LLC,0372144769,Rolland,porta volutpat quam pede lobortis ligula sit amet eleifend pede libero quis orci nullam molestie nibh in,7775EM65V29,phasellus sit amet erat nulla tempus vivamus in felis eu sapien cursus vestibulum proin eu,2022-05-27,1691.36,,,,,,,
-Bogisich LLC,Bulldozer,MIQ-6169091,Soft Flooring and Base,"Romaguera, Goldner and Crooks",Mosciski Inc,Powlowski LLC,8984702329,Ward,,,justo eu massa donec dapibus duis at velit eu est,2022-10-15,1578.57,User,ndubery1e,Neda,Dubery,ndubery1e@fotki.com,,
-Ondricka-Schuster,Dump Truck,KEN-1184794,"Doors, Frames & Hardware",Walker-Towne,Watsica LLC,Pacocha-Kiehn,4745674969,Mabelle,ultrices posuere cubilia curae nulla dapibus dolor vel est donec odio justo sollicitudin ut suscipit a feugiat,,,2022-12-10,4298.98,,,,,,,
-Mayer-Abernathy,Scraper,ZMD-6316371,Rebar & Wire Mesh Install,"Stokes, Daniel and Johnson",Abernathy-Stamm,Powlowski LLC,2526471701,Flo,,1918JS43H32,,2023-03-24,1171.9,User,gbassingdenm,Godwin,Bassingden,gbassingdenm@dedecms.com,,
-Towne-Adams,Scraper,QCU-6826093,Prefabricated Aluminum Metal Canopies,Abernathy-Stamm,Rippin-Schiller,Waters LLC,4899233400,Debbi,arcu sed augue aliquam erat volutpat in congue etiam justo etiam pretium iaculis justo in hac habitasse platea dictumst,6487ZI24B86,nec molestie sed justo pellentesque viverra pede ac diam cras pellentesque volutpat dui maecenas,2023-02-22,602.41,Location,,,,,"McGlynn, Hagenes and Bruen",
-Kunde Group,Compactor,ITE-9907827,Sitework & Site Utilities,Mosciski Inc,"Romaguera, Goldner and Crooks",Treutel Inc,4671828697,Kizzee,,3508XP22O98,sed interdum venenatis turpis enim blandit mi in porttitor pede justo eu massa donec dapibus duis at velit eu est,2023-02-18,3119.76,Location,,,,,Fritsch-Abernathy,
-Welch Group,Compactor,GXW-3680693,Drywall & Acoustical (MOB),Okuneva Group,Watsica LLC,"Nitzsche, Gislason and Douglas",4413339149,Karry,mi integer ac neque duis bibendum morbi non quam nec,,,2023-02-16,1570.25,User,ewhitebrook1r,Emmalyn,Whitebrook,ewhitebrook1r@webnode.com,,
-"Zieme, Metz and Schamberger",Grader,GDQ-7108837,Masonry,"Heaney, Altenwerth and Emmerich","Upton, Feil and Jast","Jenkins, Goldner and Cruickshank",8560447476,Chase,,4743VU30T06,nibh ligula nec sem duis aliquam convallis nunc proin at turpis a pede posuere nonummy integer non,2022-08-09,1530.46,User,pwoollons2q,Pyotr,Woollons,pwoollons2q@nps.gov,,
-"Kuhlman, Walker and Denesik",Dragline,QZO-1370026,Asphalt Paving,Krajcik LLC,"Botsford, Boyle and Herzog",Erdman-West,5748443707,Mabelle,,2693SH27I09,accumsan felis ut at dolor quis odio consequat varius integer ac leo pellentesque ultrices mattis,2022-08-23,2694.26,,,,,,,
-Cormier Inc,Bulldozer,AQW-7617737,RF Shielding,"Heaney, Altenwerth and Emmerich",Watsica LLC,"Mills, Gleichner and Schamberger",1502376915,Rolland,,8461WN86M04,sed sagittis nam congue risus semper porta volutpat quam pede lobortis ligula sit amet eleifend pede libero quis,2023-03-04,1055.33,,,,,,,
-Beier LLC,Dragline,NDV-6470913,Masonry,Mosciski Inc,"Kutch, Johnson and Olson",Lynch and Sons,3437983455,Ward,volutpat quam pede lobortis ligula sit amet eleifend pede libero quis orci nullam molestie nibh in lectus,9621QF22B21,,2022-07-27,1251.77,User,rrappa27,Rabi,Rappa,rrappa27@cyberchimps.com,,
-Skiles and Sons,Compactor,FOR-0865018,Exterior Signage,"Stokes, Daniel and Johnson","Kutch, Johnson and Olson","Torp, Kautzer and Rodriguez",3955766875,Tommy,,6385GQ84X66,quisque id justo sit amet sapien dignissim vestibulum vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere,2023-04-26,1109.44,Location,,,,,Frami and Sons,
-"Corkery, Kunde and Schulist",Crawler,SCK-0860481,Rebar & Wire Mesh Install,"Fritsch, Sauer and Conn",Walker-Towne,Lynch and Sons,5146662358,Karry,amet nulla quisque arcu libero rutrum ac lobortis vel dapibus at diam nam tristique tortor eu,,,2022-10-05,2029.54,Location,,,,,"Torp, Kautzer and Rodriguez",
-Brakus LLC,Backhoe,DAI-7864625,Casework,Pollich LLC,"Kunde, Doyle and Kozey","Jenkins, Goldner and Cruickshank",3421666270,Mabelle,,3209SC49Y83,vitae mattis nibh ligula nec sem duis aliquam convallis nunc proin at turpis,2022-06-01,3611.16,User,tcicutto1l,Thornie,Cicutto,tcicutto1l@irs.gov,,
-"Donnelly, Daniel and Kuhn",Skid-Steer,AXA-8500000,Glass & Glazing,Pacocha-Goodwin,"Upton, Feil and Jast",Powlowski LLC,5545256559,Chase,,5792EV06A79,,2023-01-19,3029.64,,,,,,,
-Wehner-Wyman,Compactor,MGX-6732943,Fire Sprinkler System,Berge Inc,Mosciski Inc,Ledner-Barrows,3758714940,Jeana,ut massa quis augue luctus tincidunt nulla mollis molestie lorem quisque ut erat curabitur,,,2023-01-09,2587.65,User,dhailwood18,Duffy,Hailwood,dhailwood18@ask.com,,
-Hauck-Bosco,Bulldozer,NIS-2897343,Electrical,"Kunde, Doyle and Kozey","Botsford, Boyle and Herzog","Jenkins, Goldner and Cruickshank",8342227248,Illa,,0783AR26Y44,,2023-01-11,904.38,Location,,,,,Pacocha-Kiehn,
-Shields Inc,Bulldozer,QZL-7700638,Construction Clean and Final Clean,Okuneva Group,Ankunding-Ledner,Pacocha-Kiehn,3955442162,Mabelle,et ultrices posuere cubilia curae duis faucibus accumsan odio curabitur convallis duis consequat dui nec nisi,2293HV69Q96,,2022-05-30,2920.56,Location,,,,,Erdman-West,
-"Willms, O'Connell and Cormier",Grader,RJS-7752630,Fire Sprinkler System,Ankunding-Ledner,Ankunding-Ledner,Treutel Inc,1717119122,Bondon,,2846FL33H31,mauris laoreet ut rhoncus aliquet pulvinar sed nisl nunc rhoncus dui,2022-11-12,3998.15,,,,,,,
-Schinner-Price,Compactor,MDX-2483852,Construction Clean and Final Clean,Abernathy-Stamm,"Kutch, Johnson and Olson",Lindgren-Marquardt,9849455784,Bondon,,8475JD14T05,in faucibus orci luctus et ultrices posuere cubilia curae nulla dapibus dolor vel,2023-04-21,2625.55,Location,,,,,"Wilkinson, Waters and Kerluke",
-"Treutel, Berge and Batz",Grader,FZI-9158744,Marlite Panels (FED),"Kutch, Johnson and Olson","Kutch, Johnson and Olson",Russel Group,7516475364,Nial,,2620DL01N52,,2023-02-02,4272.01,Location,,,,,"Jenkins, Goldner and Cruickshank",
-"McDermott, Koch and Skiles",Skid-Steer,RDJ-1659181,Marlite Panels (FED),Walker-Towne,"Romaguera, Goldner and Crooks","Jenkins, Goldner and Cruickshank",2002850756,Robby,congue eget semper rutrum nulla nunc purus phasellus in felis donec semper sapien a libero nam dui proin leo,4676YV46O78,,2022-07-24,3087.45,User,kharbage1w,Kinny,Harbage,kharbage1w@wordpress.org,,
-Tremblay-Collier,Compactor,XCQ-5970453,Drilled Shafts,"Legros, Paucek and Collier",Mosciski Inc,Roberts-Anderson,7468627157,Kizzee,turpis nec euismod scelerisque quam turpis adipiscing lorem vitae mattis nibh ligula nec sem duis,2895CV95N88,velit eu est congue elementum in hac habitasse platea dictumst morbi vestibulum velit id pretium iaculis diam,2022-10-23,2726.04,,,,,,,
-"Shanahan, Bergnaum and Buckridge",Trencher,IRM-4172620,Drywall & Acoustical (MOB),"Romaguera, Goldner and Crooks","Fritsch, Sauer and Conn","Mills, Gleichner and Schamberger",8440065950,Debbi,habitasse platea dictumst morbi vestibulum velit id pretium iaculis diam erat fermentum justo nec condimentum neque sapien placerat ante,4296XD75M64,,2023-05-18,2627.55,User,pwoollons2q,Pyotr,Woollons,pwoollons2q@nps.gov,,
-"Dickens, Huel and Reilly",Compactor,DPP-2739545,Sitework & Site Utilities,"Botsford, Boyle and Herzog",Okuneva Group,Russel Group,1933518954,Debbi,sit amet nulla quisque arcu libero rutrum ac lobortis vel dapibus,4147HN29Y26,,2023-02-01,4571.33,,,,,,,
-Shields Inc,Scraper,EBH-1609775,Roofing (Asphalt),Watsica LLC,Pollich LLC,"Nitzsche, Gislason and Douglas",3751836527,Debbi,,,,2023-01-16,3195.45,User,ahugonnet1f,Alvis,Hugonnet,ahugonnet1f@vinaora.com,,
+Abshire and Sons,Backhoe,ICC-2065556,Ornamental Railings,"Kunde, Doyle and Kozey",Berge Inc,"Wilkinson, Waters and Kerluke",3271901481,"Macbook Pro 13""",,1786VM80X07,at nulla suspendisse potenti cras in purus eu magna vulputate luctus cum sociis natoque penatibus et magnis dis,1/23/23,2266.13,,,,,,,10/27/28
+"Quitzon, Oberbrunner and Dibbert",Dragline,WBH-2841795,Structural and Misc Steel (Fabrication),Krajcik LLC,"Botsford, Boyle and Herzog",Lindgren-Marquardt,5504512275,"Macbook Pro 13""",ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia curae mauris viverra diam vitae quam suspendisse potenti nullam,9351IS25A51,aliquam convallis nunc proin at turpis a pede posuere nonummy integer,11/14/22,1292.94,User,gmccrackem2a,Gage,McCrackem,gmccrackem2a@bing.com,,10/27/28
+Boyer and Sons,Excavator,NNH-3656031,Soft Flooring and Base,"Heaney, Altenwerth and Emmerich",Pollich LLC,Pacocha-Kiehn,4861125177,"Macbook Pro 13""",,9929FR08W85,,3/1/23,2300.71,Location,,,,,Pacocha-Kiehn,10/27/28
+Hayes-Rippin,Trencher,BOL-0305383,Prefabricated Aluminum Metal Canopies,"Botsford, Boyle and Herzog",Walker-Towne,Fritsch-Abernathy,2416994639,"Macbook Pro 13""",neque vestibulum eget vulputate ut ultrices vel augue vestibulum ante ipsum primis in faucibus orci luctus,9139KQ78G81,,10/26/22,1777.56,User,ksennett6,Katerina,Sennett,ksennett6@ibm.com,,10/27/28
+Romaguera-Flatley,Compactor,YVN-3440973,"Temp Fencing, Decorative Fencing and Gates",Ankunding-Ledner,Berge Inc,Roberts-Anderson,6080904229,"Macbook Pro 13""",turpis adipiscing lorem vitae mattis nibh ligula nec sem duis aliquam convallis nunc proin at turpis a pede,0910VB28Q61,,7/24/22,2967.97,,,,,,,10/27/28
+Auer LLC,Bulldozer,YOO-5936907,Electrical,Berge Inc,"Heaney, Altenwerth and Emmerich",Roberts-Anderson,8204459090,"Macbook Pro 13""",,7375EM02N97,proin eu mi nulla ac enim in tempor turpis nec euismod scelerisque quam turpis adipiscing lorem,10/1/22,3819.73,,,,,,,10/27/28
+Olson Group,Skid-Steer,EJS-7488052,Roofing (Metal),"Fritsch, Sauer and Conn","Romaguera, Goldner and Crooks",Lindgren-Marquardt,1252634576,"Macbook Pro 13""",blandit non interdum in ante vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia curae,,rhoncus sed vestibulum sit amet cursus id turpis integer aliquet massa id lobortis convallis,6/25/22,2711.89,Location,,,,,"McGlynn, Hagenes and Bruen",10/27/28
+"Powlowski, Monahan and Reichel",Bulldozer,HNY-7340937,Ornamental Railings,"Botsford, Boyle and Herzog",Watsica LLC,Roberts-Anderson,7294510907,"Macbook Pro 13""",sapien urna pretium nisl ut volutpat sapien arcu sed augue aliquam erat volutpat in,,erat fermentum justo nec condimentum neque sapien placerat ante nulla justo aliquam quis turpis eget elit sodales,7/24/22,1833.42,User,mhasley21,Marion,Hasley,mhasley21@clickbank.net,,10/27/28
+Harris LLC,Grader,JHN-0598394,Curb & Gutter,"Heaney, Altenwerth and Emmerich","Fritsch, Sauer and Conn",Waters LLC,0709494209,"Macbook Pro 13""",orci luctus et ultrices posuere cubilia curae duis faucibus accumsan odio curabitur,,vestibulum vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere,4/11/23,3263.79,User,mbaudy2b,Mickie,Baudy,mbaudy2b@intel.com,,10/27/28
+Boyer-Okuneva,Backhoe,GEX-7216431,Prefabricated Aluminum Metal Canopies,Pollich LLC,"Upton, Feil and Jast","Jenkins, Goldner and Cruickshank",4030738107,"Macbook Pro 13""",velit vivamus vel nulla eget eros elementum pellentesque quisque porta volutpat,,,8/25/22,2448.17,Location,,,,,Lynch and Sons,10/27/28
+Ebert-Reilly,Scraper,DWM-3752227,Construction Clean and Final Clean,Watsica LLC,Berge Inc,"Mills, Gleichner and Schamberger",9381884673,"Macbook Pro 13""",sed nisl nunc rhoncus dui vel sem sed sagittis nam congue risus semper porta volutpat quam pede lobortis ligula sit,,rhoncus aliquet pulvinar sed nisl nunc rhoncus dui vel sem sed sagittis nam congue risus semper,12/23/22,2721.12,User,sbucknall28,Saidee,Bucknall,sbucknall28@cbsnews.com,,
+"Mitchell, Ward and Hettinger",Dragline,OLM-0226994,Structural and Misc Steel (Fabrication),Walker-Towne,"Kutch, Johnson and Olson",Frami and Sons,7504201033,"Macbook Pro 13""",curae mauris viverra diam vitae quam suspendisse potenti nullam porttitor lacus at turpis donec posuere metus vitae ipsum aliquam non,,amet nulla quisque arcu libero rutrum ac lobortis vel dapibus at diam nam tristique,5/14/23,3178.59,Location,,,,,"O'Conner, Nitzsche and Aufderhar",
+Prosacco-Ledner,Scraper,LYO-8134459,Roofing (Asphalt),Mosciski Inc,Mosciski Inc,Waters LLC,9994825740,"Macbook Pro 13""",molestie hendrerit at vulputate vitae nisl aenean lectus pellentesque eget nunc donec quis orci,,,5/7/23,3322.34,,,,,,,
+Harvey and Sons,Compactor,HLK-1645158,Structural and Misc Steel (Fabrication),"Romaguera, Goldner and Crooks",Mosciski Inc,Treutel Inc,8322817966,"Macbook Pro 13""",egestas metus aenean fermentum donec ut mauris eget massa tempor convallis nulla neque libero convallis eget eleifend,,,9/3/22,1823.95,User,flewins10,Filip,Lewins,flewins10@amazonaws.com,,
+"Lebsack, Roob and Streich",Scraper,AZT-4280937,Marlite Panels (FED),Okuneva Group,"Upton, Feil and Jast",Lynch and Sons,8146943004,"Macbook Pro 13""",,,,12/17/22,1614.68,Location,,,,,Roberts-Anderson,
+Abbott-Nikolaus,Dump Truck,IAB-5332824,Structural & Misc Steel Erection,"Upton, Feil and Jast","Romaguera, Goldner and Crooks",Lynch and Sons,3906729636,"Macbook Pro 13""",dui luctus rutrum nulla tellus in sagittis dui vel nisl duis ac nibh fusce,2315CN41G71,,11/2/22,1444.69,Location,,,,,Fritsch-Abernathy,
+Nolan-Wisoky,Trencher,OID-4455781,HVAC,Ankunding-Ledner,Abernathy-Stamm,Schinner Group,8981616853,"Macbook Pro 13""",maecenas pulvinar lobortis est phasellus sit amet erat nulla tempus,6080UE59E09,,9/7/22,3637.94,User,bmctrustrie1c,Balduin,McTrustrie,bmctrustrie1c@free.fr,,
+"Miller, Morissette and Kihn",Trencher,UQY-2172679,Curb & Gutter,"Legros, Paucek and Collier",Mosciski Inc,"O'Conner, Nitzsche and Aufderhar",3983411009,"Macbook Pro 13""",,5505YF23M46,,2/10/23,4253.88,User,kkubanek1t,Kalinda,Kubanek,kkubanek1t@umich.edu,,
+Erdman and Sons,Grader,HRI-2262410,Granite Surfaces,Berge Inc,Walker-Towne,Ledner-Barrows,9311141848,"Macbook Pro 13""",,8673QP30R80,,6/20/22,1784.66,Location,,,,,Lynch and Sons,
+"Rogahn, Cormier and Ruecker",Bulldozer,BBK-5960598,Drywall & Acoustical (MOB),Abernathy-Stamm,"Heaney, Altenwerth and Emmerich",Frami and Sons,5157837617,"Macbook Pro 13""",nisl ut volutpat sapien arcu sed augue aliquam erat volutpat in congue etiam justo etiam pretium,9088XV67Q94,,12/15/22,668.43,Location,,,,,Russel Group,
+Pagac-Feeney,Compactor,RRO-8557470,Structural and Misc Steel (Fabrication),Mosciski Inc,Okuneva Group,Russel Group,2776102414,"Macbook Pro 13""",quis libero nullam sit amet turpis elementum ligula vehicula consequat morbi a ipsum integer a nibh in quis,,,12/27/22,3391.42,,,,,,,
+Toy-Daniel,Compactor,SUQ-5159067,Fire Protection,"Botsford, Boyle and Herzog",Berge Inc,"Jenkins, Goldner and Cruickshank",0313117719,Robby,,2830MI42B80,,6/24/22,4402.74,User,hbucknall29,Hillie,Bucknall,hbucknall29@webnode.com,,10/27/28
\ No newline at end of file
diff --git a/sample_csvs/categories-sample.csv b/sample_csvs/categories-sample.csv
new file mode 100644
index 0000000000..b60b0e32ec
--- /dev/null
+++ b/sample_csvs/categories-sample.csv
@@ -0,0 +1,16 @@
+name,category type,notes,require acceptance,checkin email,use default eula,eula text
+Liquid Aminios Acid - Braggs,accessory,Duis bibendum.,0,1,1,"Mauris enim leo, rhoncus sed, vestibulum sit amet, cursus id, turpis. Integer aliquet, massa id lobortis convallis, tortor risus dapibus augue, vel accumsan tellus nisi eu orci. Mauris lacinia sapien quis libero. Nullam sit amet turpis elementum ligula vehicula consequat. Morbi a ipsum."
+Tea - Camomele,consumable,In quis justo. Maecenas rhoncus aliquam lacus.,0,1,1,Ut tellus. Nulla ut erat id mauris vulputate elementum. Nullam varius. Nulla facilisi. Cras non velit nec nisi vulputate nonummy. Maecenas tincidunt lacus at velit.
+Honey - Lavender,consumable,Etiam vel augue. Vestibulum rutrum rutrum neque.,1,1,0,"Curabitur convallis. Duis consequat dui nec nisi volutpat eleifend. Donec ut dolor. Morbi vel lectus in quam fringilla rhoncus. Mauris enim leo, rhoncus sed, vestibulum sit amet, cursus id, turpis."
+Apple - Royal Gala,asset,Curabitur at ipsum ac tellus semper interdum. Mauris ullamcorper purus sit amet nulla.,0,1,1,"Nulla neque libero, convallis eget, eleifend luctus, ultricies eu, nibh. Quisque id justo sit amet sapien dignissim vestibulum. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Nulla dapibus dolor vel est. Donec odio justo, sollicitudin ut, suscipit a, feugiat et, eros. Vestibulum ac est lacinia nisi venenatis tristique. Fusce congue, diam id ornare imperdiet, sapien urna pretium nisl, ut volutpat sapien arcu sed augue. Aliquam erat volutpat. In congue."
+Isomalt,component,"Quisque porta volutpat erat. Quisque erat eros, viverra eget, congue eget, semper rutrum, nulla.",1,0,1,"In quis justo. Maecenas rhoncus aliquam lacus. Morbi quis tortor id nulla ultrices aliquet. Maecenas leo odio, condimentum id, luctus nec, molestie sed, justo. Pellentesque viverra pede ac diam. Cras pellentesque volutpat dui. Maecenas tristique, est et tempus semper, est quam pharetra magna, ac consequat metus sapien ut nunc."
+Muffin Mix - Oatmeal,component,"In est risus, auctor sed, tristique in, tempus sit amet, sem.",1,1,1,Nulla facilisi. Cras non velit nec nisi vulputate nonummy. Maecenas tincidunt lacus at velit. Vivamus vel nulla eget eros elementum pellentesque. Quisque porta volutpat erat.
+"Seedlings - Buckwheat, Organic",asset,"In hac habitasse platea dictumst. Morbi vestibulum, velit id pretium iaculis, diam erat fermentum justo, nec condimentum neque sapien placerat ante.",1,1,0,"Duis bibendum. Morbi non quam nec dui luctus rutrum. Nulla tellus. In sagittis dui vel nisl. Duis ac nibh. Fusce lacus purus, aliquet at, feugiat non, pretium quis, lectus. Suspendisse potenti."
+Vinegar - Rice,license,Duis mattis egestas metus.,1,1,1,"Nam dui. Proin leo odio, porttitor id, consequat in, consequat ut, nulla. Sed accumsan felis. Ut at dolor quis odio consequat varius. Integer ac leo. Pellentesque ultrices mattis odio."
+Banana - Green,asset,Curabitur convallis.,1,1,1,"Morbi a ipsum. Integer a nibh. In quis justo. Maecenas rhoncus aliquam lacus. Morbi quis tortor id nulla ultrices aliquet. Maecenas leo odio, condimentum id, luctus nec, molestie sed, justo. Pellentesque viverra pede ac diam. Cras pellentesque volutpat dui."
+Wine - Zinfandel California 2002,license,Duis aliquam convallis nunc. Proin at turpis a pede posuere nonummy.,0,1,1,Nulla ut erat id mauris vulputate elementum. Nullam varius. Nulla facilisi. Cras non velit nec nisi vulputate nonummy. Maecenas tincidunt lacus at velit. Vivamus vel nulla eget eros elementum pellentesque. Quisque porta volutpat erat.
+Tuna - Salad Premix,asset,"Phasellus id sapien in sapien iaculis congue. Vivamus metus arcu, adipiscing molestie, hendrerit at, vulputate vitae, nisl.",1,1,1,"Pellentesque viverra pede ac diam. Cras pellentesque volutpat dui. Maecenas tristique, est et tempus semper, est quam pharetra magna, ac consequat metus sapien ut nunc. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Mauris viverra diam vitae quam. Suspendisse potenti. Nullam porttitor lacus at turpis. Donec posuere metus vitae ipsum. Aliquam non mauris. Morbi non lectus."
+Cheese - Goat With Herbs,consumable,Nulla ut erat id mauris vulputate elementum. Nullam varius.,1,1,1,Aliquam quis turpis eget elit sodales scelerisque. Mauris sit amet eros. Suspendisse accumsan tortor quis turpis. Sed ante. Vivamus tortor. Duis mattis egestas metus.
+Veal - Insides Provini,asset,"Nam congue, risus semper porta volutpat, quam pede lobortis ligula, sit amet eleifend pede libero quis orci. Nullam molestie nibh in lectus.",1,1,1,"Proin risus. Praesent lectus. Vestibulum quam sapien, varius ut, blandit non, interdum in, ante. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Duis faucibus accumsan odio. Curabitur convallis. Duis consequat dui nec nisi volutpat eleifend. Donec ut dolor. Morbi vel lectus in quam fringilla rhoncus."
+Island Oasis - Peach Daiquiri,component,"Nulla neque libero, convallis eget, eleifend luctus, ultricies eu, nibh. Quisque id justo sit amet sapien dignissim vestibulum.",1,1,1,"Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Duis faucibus accumsan odio. Curabitur convallis. Duis consequat dui nec nisi volutpat eleifend. Donec ut dolor. Morbi vel lectus in quam fringilla rhoncus. Mauris enim leo, rhoncus sed, vestibulum sit amet, cursus id, turpis. Integer aliquet, massa id lobortis convallis, tortor risus dapibus augue, vel accumsan tellus nisi eu orci. Mauris lacinia sapien quis libero. Nullam sit amet turpis elementum ligula vehicula consequat. Morbi a ipsum."
+Beer - Camerons Cream Ale,accessory,Vivamus vestibulum sagittis sapien.,1,1,1,"Duis aliquam convallis nunc. Proin at turpis a pede posuere nonummy. Integer non velit. Donec diam neque, vestibulum eget, vulputate ut, ultrices vel, augue. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Donec pharetra, magna vestibulum aliquet ultrices, erat tortor sollicitudin mi, sit amet lobortis sapien sapien non mi. Integer ac neque. Duis bibendum."
\ No newline at end of file
diff --git a/sample_csvs/consumables-sample.csv b/sample_csvs/consumables-sample.csv
index 962f55ebdd..dd9c8df0ad 100644
--- a/sample_csvs/consumables-sample.csv
+++ b/sample_csvs/consumables-sample.csv
@@ -1,51 +1,4 @@
 Company,Name,Category,Supplier,Manufacturer,QTY,Location,Order Number,Min Amount,Model Number,Item Number,Notes,Purchase Date,Purchase Cost
-Simonis and Sons,Dragline,Soft Flooring and Base,Towne Group,McLaughlin-Wisozk,50,Cherven Bryag,529027385-9,51,3533069599460644,6381392801995066,tortor sollicitudin mi sit amet lobortis sapien sapien non mi integer ac neque duis bibendum morbi non quam nec,2022-11-05,35.2
-Bruen-Hagenes,Trencher,Sitework & Site Utilities,Hoeger and Sons,"Davis, Koelpin and Lockman",54,Pampas,009135228-2,92,5602248408566255894,3563525570373877,fusce lacus purus aliquet at feugiat non pretium quis lectus suspendisse potenti in eleifend quam a odio in hac habitasse,2022-09-17,53.1
-Tremblay Inc,Crawler,Drywall & Acoustical (FED),"Cormier, Ryan and Cummerata","Morar, Stracke and Gusikowski",97,Penteado,492530513-1,20,201715355999350,3555797000872238,massa tempor convallis nulla neque libero convallis eget eleifend luctus ultricies eu,2023-02-05,25.08
-Franecki-Mitchell,Crawler,Soft Flooring and Base,"Bahringer, Hessel and Lynch",Mann Inc,11,Junliangcheng,006782510-9,13,201638625742873,3585582428645232,orci luctus et ultrices posuere cubilia curae nulla dapibus dolor vel est donec,2023-01-25,47.44
-Morar Group,Trencher,Masonry,Metz-Runte,Batz and Sons,35,Migori,410276787-8,2,201574561109571,4041593804503,sit amet consectetuer adipiscing elit proin risus praesent lectus vestibulum quam sapien varius,2022-08-24,29.06
-Rau and Sons,Crawler,Exterior Signage,"Metz, Reynolds and Pagac",Roberts-Haley,36,Lužani,251681998-6,37,6389706621209402,67627057199235112,mauris ullamcorper purus sit amet nulla quisque arcu libero rutrum ac lobortis vel dapibus,2022-09-25,70.5
-"Parisian, Feil and Brown",Dragline,Site Furnishings,"Wisozk, Rowe and Runolfsson",Marks-Lindgren,24,Carvalho,783104099-4,96,4132814261323213,5460576255071343,justo sollicitudin ut suscipit a feugiat et eros vestibulum ac,2022-06-06,23.48
-Upton Group,Skid-Steer,Wall Protection,Sawayn-Predovic,Padberg-Schaefer,86,Drumcondra,691167736-X,20,6709802030161855,5100134953726119,luctus et ultrices posuere cubilia curae mauris viverra diam vitae,2022-09-13,24.6
-Olson-Bradtke,Skid-Steer,Structural and Misc Steel (Fabrication),Dietrich Group,"Doyle, Yost and Kerluke",52,Piława Górna,993878516-6,99,6380721061950737,201534062027276,sed sagittis nam congue risus semper porta volutpat quam pede lobortis ligula sit amet eleifend,2023-03-09,64.2
-Pouros-Veum,Backhoe,Elevator,Gulgowski-Bahringer,Legros-Morissette,85,Tawangsari,863628920-3,27,5100136112680129,5602259943208580,aliquet ultrices erat tortor sollicitudin mi sit amet lobortis sapien sapien non mi integer ac neque duis bibendum morbi non,2022-09-10,73.65
-Purdy-Rice,Grader,Drywall & Acoustical (MOB),Bernhard-Cummings,Price and Sons,81,Trzebinia,184211928-1,43,5602251551839830,56022542102331797,mauris laoreet ut rhoncus aliquet pulvinar sed nisl nunc rhoncus dui,2022-08-20,12.11
-Kihn and Sons,Trencher,EIFS,"Auer, Kutch and Kutch","Murazik, Crooks and Pollich",73,Duru,843046019-5,32,3570560403003822,3544501358533481,tincidunt in leo maecenas pulvinar lobortis est phasellus sit amet erat nulla tempus,2023-04-03,26.73
-Hessel-Yundt,Bulldozer,Wall Protection,O'Reilly Inc,Volkman LLC,40,Yelizavetino,358328061-X,50,5108759813450674,5602215719381357,nulla dapibus dolor vel est donec odio justo sollicitudin ut suscipit a feugiat et eros,2023-05-14,83.76
-Kunze and Sons,Bulldozer,Drywall & Acoustical (MOB),Pollich-Mertz,Kertzmann-Leffler,91,Hoeryŏng,676937901-5,50,5602259559696912,3536485956609903,eget massa tempor convallis nulla neque libero convallis eget eleifend luctus ultricies eu nibh quisque id justo sit amet sapien,2023-02-06,14.1
-"Satterfield, Kutch and Bartell",Crawler,Construction Clean and Final Clean,Prohaska-Rosenbaum,O'Conner and Sons,8,Verenchanka,822285715-0,59,36675923976242,3555834547028303,nec dui luctus rutrum nulla tellus in sagittis dui vel nisl duis ac nibh fusce lacus purus aliquet,2023-03-22,36.15
-Stanton-Olson,Dump Truck,Marlite Panels (FED),"Stiedemann, Jones and Heathcote",Bartoletti Inc,17,Mórrope,230874108-2,70,3573310923840155,5602252823412497,tellus in sagittis dui vel nisl duis ac nibh fusce lacus purus aliquet at feugiat non pretium,2022-11-03,14.22
-Kshlerin-Hane,Trencher,Curb & Gutter,Goodwin and Sons,Bechtelar-Gleason,45,Shūsh,451367111-4,46,3536005374229934,5438118681407699,eleifend quam a odio in hac habitasse platea dictumst maecenas ut massa quis augue luctus tincidunt nulla mollis molestie lorem,2023-05-03,15.14
-"Mills, Greenfelder and Spinka",Crawler,HVAC,Reichel Inc,"Kuhic, Marquardt and Beier",10,Arcena Pequena,779807440-6,13,3552031889209913,5018365634108542731,pellentesque ultrices mattis odio donec vitae nisi nam ultrices libero non mattis pulvinar nulla pede ullamcorper augue a suscipit,2022-11-09,57.04
-Buckridge Inc,Skid-Steer,Asphalt Paving,Abernathy-Doyle,Hirthe-Gislason,23,Cardal,152277775-X,65,5602239497538228,6304534980889636,et commodo vulputate justo in blandit ultrices enim lorem ipsum dolor sit amet consectetuer adipiscing elit,2023-05-02,48.68
-Boehm Inc,Skid-Steer,Electrical and Fire Alarm,O'Kon Group,Schuster-Kunze,63,Tafraout,072198056-2,67,3536207535355414,5602242007322746026,donec ut mauris eget massa tempor convallis nulla neque libero convallis eget eleifend luctus ultricies eu nibh quisque id,2022-07-20,28.04
-Maggio Inc,Crawler,Curb & Gutter,West-Batz,Homenick-Schamberger,45,Boa Vista,779589028-8,16,3544589458568846,374622740975098,dolor vel est donec odio justo sollicitudin ut suscipit a,2023-05-14,32.86
-Koelpin Inc,Skid-Steer,"Doors, Frames & Hardware",VonRueden Group,Dickinson Group,6,Cachoeirinha,474127645-7,3,633110118810265152,4936757035760145,ante vel ipsum praesent blandit lacinia erat vestibulum sed magna at nunc commodo placerat praesent blandit nam nulla integer,2022-08-13,5.24
-Shields-Mohr,Bulldozer,Overhead Doors,Lesch-Daniel,Kunde-Dickens,11,Požarevac,658756723-1,19,3574428328762235,3582676636622299,semper sapien a libero nam dui proin leo odio porttitor id consequat in consequat ut nulla sed accumsan felis,2023-03-10,73.7
-Bechtelar-Littel,Skid-Steer,RF Shielding,Smitham-Yost,Cormier Inc,44,Cikendi,650173691-9,30,630469977163834077,4917512293781355,condimentum id luctus nec molestie sed justo pellentesque viverra pede ac diam cras,2022-05-23,99.17
-"Botsford, Rogahn and Heathcote",Compactor,Termite Control,Marquardt-Fadel,Klein-Kohler,71,Kučevo,792535885-8,51,4903441380678636477,5602259771893871162,lorem vitae mattis nibh ligula nec sem duis aliquam convallis nunc proin,2023-04-20,70.22
-"Fadel, Abbott and Renner",Grader,Curb & Gutter,Collier-Halvorson,Heidenreich-Wisozk,34,Siparia,344682803-6,19,3558289528892176,5341222466132468,dui luctus rutrum nulla tellus in sagittis dui vel nisl duis ac nibh fusce lacus purus aliquet,2022-12-01,68.35
-"Klein, Stehr and Hansen",Bulldozer,Electrical,Heathcote-Hegmann,"Schoen, Schinner and Bashirian",70,Kobyzhcha,747563100-1,3,67615918374813979,3552267916495436,iaculis justo in hac habitasse platea dictumst etiam faucibus cursus urna ut tellus,2022-11-23,36.02
-Dibbert-Sawayn,Excavator,Epoxy Flooring,Purdy Inc,Jacobs LLC,90,Fukumitsu,684367116-0,89,3575124426928351,675940744647511521,vulputate ut ultrices vel augue vestibulum ante ipsum primis in faucibus orci luctus et ultrices,2022-08-25,11.9
-Smith-Greenholt,Skid-Steer,Roofing (Metal),Leannon-Swaniawski,Brown-O'Connell,48,Nanwai,182125694-8,21,3549394673501796,3534352097481265,vestibulum sed magna at nunc commodo placerat praesent blandit nam nulla integer pede justo lacinia eget,2022-09-29,74.89
-Ratke and Sons,Trencher,Painting & Vinyl Wall Covering,Pfannerstill LLC,Williamson and Sons,62,Shūkat aş Şūfī,894744686-6,63,67627557381842583,3575485459195667,elit ac nulla sed vel enim sit amet nunc viverra dapibus nulla suscipit ligula in,2023-02-09,58.2
-Hammes Group,Compactor,Elevator,Hammes-Ortiz,Gusikowski Group,49,Norton,142503650-3,16,4041373495456,3567365631500028,morbi vel lectus in quam fringilla rhoncus mauris enim leo,2023-02-04,77.95
-Bednar-Tillman,Grader,Structural & Misc Steel Erection,Hackett-Rice,"Roberts, Grimes and Feest",48,Aengceleng,027615376-6,77,5038353282556401349,379827830457023,venenatis lacinia aenean sit amet justo morbi ut odio cras mi pede malesuada in imperdiet,2022-06-14,66.55
-Conn Inc,Backhoe,Elevator,"Satterfield, Dietrich and Dibbert","Gislason, Turner and Weissnat",49,Dajianchang,012542390-X,22,4175009765287943,633422970094073881,eleifend luctus ultricies eu nibh quisque id justo sit amet sapien dignissim vestibulum vestibulum ante ipsum primis,2023-04-24,39.65
-Baumbach-Hayes,Scraper,HVAC,Larkin-Stamm,Romaguera Group,60,Pshada,975951565-2,17,3558709467530792,201740170261422,mattis odio donec vitae nisi nam ultrices libero non mattis pulvinar nulla pede,2023-03-28,2.13
-Johnson-Hamill,Bulldozer,Electrical and Fire Alarm,Brekke-Rau,"Doyle, Crist and Kulas",87,Kwikila,420068378-4,44,3572846952864955,5610350660093584,maecenas pulvinar lobortis est phasellus sit amet erat nulla tempus,2022-11-13,55.16
-Weber-Spencer,Trencher,Structural & Misc Steel Erection,Jenkins-Nienow,Crona Group,17,Shiojiri,607345620-4,88,6387217570136176,6371741739648696,est phasellus sit amet erat nulla tempus vivamus in felis eu sapien cursus,2022-12-05,91.78
-Bartell-Wisozk,Dump Truck,Framing (Steel),Robel LLC,Bartell Inc,60,Bourg-en-Bresse,285063128-0,65,348798971763230,3529839890242313,in congue etiam justo etiam pretium iaculis justo in hac habitasse,2022-09-10,15.19
-"Blick, Wunsch and Kreiger",Backhoe,Electrical,Conn and Sons,Lockman and Sons,14,Falāvarjān,141897809-4,15,3559869406780764,5602254605681417512,adipiscing elit proin interdum mauris non ligula pellentesque ultrices phasellus,2022-06-14,72.14
-Cassin and Sons,Trencher,Curb & Gutter,Weimann Inc,"Schumm, Smith and Ortiz",83,Caramuca,054429347-9,39,3584248684102141,3533548146815194,quis turpis sed ante vivamus tortor duis mattis egestas metus aenean fermentum donec ut mauris eget massa tempor,2022-06-22,34.35
-"Miller, Boehm and Kovacek",Grader,Structural & Misc Steel Erection,Heller-Simonis,"Harvey, Schiller and Schultz",60,Puerto Alto,463560912-X,99,3540539014169112,6304647611299330905,tristique in tempus sit amet sem fusce consequat nulla nisl nunc,2023-04-25,56.23
-Gulgowski Inc,Dump Truck,Prefabricated Aluminum Metal Canopies,Watsica-Bogan,"Toy, Fahey and McKenzie",77,Petrikov,662823771-0,41,3532416020888375,201871804426022,orci luctus et ultrices posuere cubilia curae duis faucibus accumsan,2023-01-07,28.79
-Beahan-Boyer,Bulldozer,Fire Protection,"Mayer, Stark and Blanda","Grant, Huel and O'Connell",40,Los Angeles,388651272-X,7,3540719793054384,3565693812607524,mauris viverra diam vitae quam suspendisse potenti nullam porttitor lacus at turpis donec posuere metus,2023-03-11,94.98
-"Rau, Sanford and Dach",Compactor,Fire Protection,"Ziemann, Hudson and Berge",Rempel Inc,32,Dapdap,257178615-6,100,3567797431604172,36788101946745,vel enim sit amet nunc viverra dapibus nulla suscipit ligula in lacus curabitur at ipsum,2022-10-22,62.54
-"Hettinger, Pollich and Gleason",Dump Truck,Drywall & Acoustical (MOB),Huel Group,Friesen LLC,26,Lodhrān,942559838-X,53,375713644821956,4913216453197543,tristique fusce congue diam id ornare imperdiet sapien urna pretium nisl ut volutpat sapien arcu,2023-01-01,96.74
-Schultz and Sons,Crawler,Masonry & Precast,"Dach, Doyle and Dickens","Skiles, Fisher and Koepp",44,Xinxing,003878835-7,20,676195016446613968,6304826401904593789,nisl ut volutpat sapien arcu sed augue aliquam erat volutpat in congue etiam justo etiam pretium iaculis justo in hac,2023-02-04,33.83
-McLaughlin-Ratke,Backhoe,Electrical and Fire Alarm,Berge-Wilkinson,Maggio and Sons,36,Bantar,651286142-6,47,5100130235429332,6706505880344645,sociis natoque penatibus et magnis dis parturient montes nascetur ridiculus mus etiam vel augue vestibulum rutrum rutrum neque aenean,2022-11-22,3.68
-Wehner-Kuhlman,Excavator,Construction Clean and Final Clean,"Thiel, Roob and Corwin","McGlynn, Padberg and Bogan",83,Kirgili,561724673-9,31,374288950680370,3580557960145994,amet turpis elementum ligula vehicula consequat morbi a ipsum integer,2023-02-28,7.54
-Koelpin-Dicki,Grader,Ornamental Railings,Herzog LLC,"Marquardt, Berge and Corkery",19,Srubec,758267626-2,12,6396431946998362,4175005352440697,semper rutrum nulla nunc purus phasellus in felis donec semper sapien a libero nam dui proin leo odio porttitor id,2023-03-12,18.2
-Adams and Sons,Backhoe,Roofing (Asphalt),"Will, Paucek and Luettgen",Hane-Heaney,81,Huifeng,925057692-7,51,5350965259826013,5381044667065516,sed lacus morbi sem mauris laoreet ut rhoncus aliquet pulvinar sed nisl,2022-07-24,80.03
-Greenholt and Sons,Crawler,Ornamental Railings,Grant-Stroman,Gottlieb-Lebsack,27,Trondheim,344790479-8,39,5100143050486022,67715312291635427,velit vivamus vel nulla eget eros elementum pellentesque quisque porta,2023-04-18,12.77
+Simonis and Sons,Dragline,Soft Flooring and Base,Towne Group Two,McLaughlin-Wisozk,50,Cherven Bryag,529027385-9,100,3533069599460644,6381392801995066,tortor sollicitudin mi sit amet lobortis sapien sapien non mi integer ac neque duis bibendum morbi non quam nec,11/5/22,35.2
+Bruen-Hagenes,Trencher,Sitework & Site Utilities,Hoeger and Sons,"Davis, Koelpin and Lockman",54,Pampas,009135228-2,92,5602248408566255894,3563525570373877,fusce lacus purus aliquet at feugiat non pretium quis lectus suspendisse potenti in eleifend quam a odio in hac habitasse,9/17/22,53.1
+Tremblay Inc,Crawler,Drywall & Acoustical (FED),"Cormier, Ryan and Cummerata","Morar, Stracke and Gusikowski",97,Penteado,492530513-1,20,56022484085662558554,3555797000872238,massa tempor convallis nulla neque libero convallis eget eleifend luctus ultricies eu,2/5/23,25.08
\ No newline at end of file
diff --git a/sample_csvs/locations-sample.csv b/sample_csvs/locations-sample.csv
index 42285f2168..707e2830d5 100644
--- a/sample_csvs/locations-sample.csv
+++ b/sample_csvs/locations-sample.csv
@@ -1,20 +1,11 @@
-name,address,address2,city,state,country,zip,manager,manager username,currency
-Peace River,8 Brentwood Court,,Birendranagar,AB,CA,T8S,Danika Mostyn,dmostyn0,CAD
-Airdrie,14 Summer Ridge Court,306 Buhler Parkway,Poniatowa,AB,CA,T4B,Clementina Van Halen,cvan1,CAD
-Calgary,3 Fieldstone Drive,,Iwanai,AB,CA,,Harwilll Heffernan,hheffernan2,CAD
-High Prairie,1906 Weeping Birch Park,,Lopar,AB,CA,,Christian Pache,cpache3,CAD
-Sundre,20 Summer Ridge Court,,Burujul,AB,CA,,,,
-Athabasca,22 Browning Drive,424 Rieder Court,Itambacuri,AB,CA,,Alphonso Ashbridge,aashbridge5,CAD
-Drayton Valley,56064 Onsgard Center,,Bahía Honda,AB,CA,,,,
-Crossfield,0 Lighthouse Bay Place,,Bengras,AB,CA,,Vania Dufton,vdufton7,CAD
-Beaverlodge,6 Katie Terrace,,Zhajin,AB,CA,,Papageno Baldi,pbaldi8,CAD
-Grande Prairie,0 Ridgeview Parkway,,Yunxi,AB,CA,R3J,Selia Biggadike,sbiggadike9,CAD
-Sherwood Park,263 Aberg Alley,,El Paso,AB,CA,,,,
-Vegreville,9039 Shoshone Parkway,,Huazhou,AB,CA,,Georgy Eversfield,geversfieldb,CAD
-Rocky Mountain House,8617 Arapahoe Parkway,,Paraipaba,AB,CA,,Mara Gilfoyle,mgilfoylec,CAD
-Calmar,14 Green Ridge Circle,,Medveditskiy,AB,CA,S0G,Paulette Rylatt,prylattd,CAD
-Rocky Mountain House,517 Bowman Terrace,,Viana,AB,CA,,Neal Gabitis,ngabitise,CAD
-Pincher Creek,6054 Anzinger Hill,,Chlumec,AB,CA,,Bonnee Fowle,bfowlef,CAD
-Airdrie,8 Lien Drive,,Reims,AB,CA,,Kerry Aherne,kaherneg,CAD
-Camrose,4 Summit Parkway,,Xinqiao,AB,CA,T4V,Sherlock Stobbart,sstobbarth,CAD
-Lamont,12 Ilene Park,,Huangtang,AB,CA,N2E,Karlotta Pinckstone,kpinckstonei,CAD
+name,address,address2,city,state,country,zip,notes,phone,fax,currency
+Shizi,811 Algoma Center,1690,Shimen,,CN,,ipsum ac tellus semper interdum mauris ullamcorper purus sit amet nulla quisque arcu libero rutrum ac lobortis vel dapibus,280-997-3795,673-737-7438,CNY
+Takum,354 Sugar Way,88222,Old Shinyanga,,NG,,proin risus praesent lectus vestibulum quam sapien varius ut blandit non interdum in ante vestibulum ante,810-325-0609,746-868-1843,NGN
+Unaizah,56243 Lawn Drive,14,Irecê,,SA,,in blandit ultrices enim lorem ipsum dolor sit amet consectetuer adipiscing elit proin interdum mauris,841-568-9664,419-246-9966,SAR
+Pontarlier,80411 Lyons Alley,0,Colinas,Franche-Comté,FR,25304 CEDEX,enim in tempor turpis nec euismod scelerisque quam turpis adipiscing lorem vitae,927-638-2175,683-361-5521,EUR
+Inongo,377 Nancy Lane,236,Placencia,,CD,,nam dui proin leo odio porttitor id consequat in consequat ut nulla sed accumsan felis ut at dolor quis,278-277-8326,744-879-3383,CDF
+San Diego,294 Spohn Center,04,Yanmen,,CO,202038,quis orci eget orci vehicula condimentum curabitur in libero ut,255-785-7948,874-491-7898,COP
+Lewotola,22308 Oriole Way,505,Celso Ramos,,ID,,nam nulla integer pede justo lacinia eget tincidunt eget tempus vel pede morbi porttitor lorem id ligula suspendisse ornare,431-503-0615,960-849-7404,IDR
+Pieńsk,7 Maryland Junction,77656,Cela,,PL,59-930,ut blandit non interdum in ante vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia curae,723-739-7799,431-889-4342,PLN
+Mataguži,5 Mayfield Drive,0,Zhaogezhuang,,ME,,nulla neque libero convallis eget eleifend luctus ultricies eu nibh quisque id justo sit amet sapien dignissim vestibulum vestibulum,356-728-4662,689-866-7531,EUR
+Xixiang,2540 Rockefeller Place,2,Alegria,,CN,,vivamus metus arcu adipiscing molestie hendrerit at vulputate vitae nisl aenean lectus,388-760-0441,110-938-9032,CNY
diff --git a/sample_csvs/manufacturers-sample.csv b/sample_csvs/manufacturers-sample.csv
new file mode 100644
index 0000000000..67c8f539ee
--- /dev/null
+++ b/sample_csvs/manufacturers-sample.csv
@@ -0,0 +1,11 @@
+name,notes,support phone,support email,warranty lookup url,url
+Mybuzz,et tempus semper est quam pharetra magna ac consequat metus sapien,347-266-3178,,,http://snipeitapp.com
+Jabbersphere,neque vestibulum eget vulputate ut ultrices vel augue vestibulum ante ipsum primis in faucibus orci luctus et ultrices,197-981-5379,,,
+Topicblab,aliquam convallis nunc proin at turpis a pede posuere nonummy integer,958-422-9615,,,
+Trupe,vulputate nonummy maecenas tincidunt lacus at velit vivamus vel nulla eget eros elementum pellentesque quisque porta,387-755-4972,,,https://microsoft.com
+Yotz,in tempus sit amet sem fusce consequat nulla nisl nunc nisl,656-536-9835,foo@example.org,,
+Fatz,metus sapien ut nunc vestibulum ante ipsum primis in faucibus orci luctus et ultrices,985-361-5597,,,
+Mycat,velit nec nisi vulputate nonummy maecenas tincidunt lacus at velit vivamus vel nulla eget eros,954-596-9805,,,
+Livefish,suspendisse ornare consequat lectus in est risus auctor sed tristique in tempus sit amet sem,102-873-3656,,,
+Roomm,nonummy maecenas tincidunt lacus at velit vivamus vel nulla eget eros elementum pellentesque quisque porta volutpat,247-353-7043,,,
+Yodel,turpis a pede posuere nonummy integer non velit donec diam neque,499-847-6224,,,
\ No newline at end of file
diff --git a/sample_csvs/models-sample.csv b/sample_csvs/models-sample.csv
new file mode 100644
index 0000000000..f6c92e2199
--- /dev/null
+++ b/sample_csvs/models-sample.csv
@@ -0,0 +1,21 @@
+Name,Category,Manufacturer,Model Notes,Model Number,Fieldset,Requestable,EOL,Min Qty
+Test Model 2,Laptops,"Botsford, Boyle and Herzog",ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia curae mauris viverra diam vitae quam suspendisse potenti nullam,9351IS25A51,Laptops and Desktops,Y,36,50
+Test Model 3,Laptops,Pollich LLC,,9929FR08W85,Laptops and Desktops,Y,36,30
+Test Model 5,Laptops,Berge Inc,turpis adipiscing lorem vitae mattis nibh ligula nec sem duis aliquam convallis nunc proin at turpis a pede,0910VB28Q61,Laptops and Desktops,Y,36,0
+Test Model 6,Laptops,"Heaney, Altenwerth and Emmerich",,7375EM02N97,Laptops and Desktops,Y,36,100
+Test Model 7,Desktops,"Romaguera, Goldner and Crooks",Test Updated Text,,Laptops and Desktops,Y,36,100
+Test Model 8,Laptops,Watsica LLC,sapien urna pretium nisl ut volutpat sapien arcu sed augue aliquam erat volutpat in,,Laptops and Desktops,Y,36,100
+Test Model 9,Laptops,"Fritsch, Sauer and Conn",orci luctus et ultrices posuere cubilia curae duis faucibus accumsan odio curabitur,,Laptops and Desktops,Y,36,100
+Test Model 10,Laptops,"Upton, Feil and Jast",velit vivamus vel nulla eget eros elementum pellentesque quisque porta volutpat,,Laptops and Desktops,Y,36,100
+Test Model 11,Laptops,Berge Inc,sed nisl nunc rhoncus dui vel sem sed sagittis nam congue risus semper porta volutpat quam pede lobortis ligula sit,,Laptops and Desktops,Y,36,100
+Test Model 12,Laptops,"Kutch, Johnson and Olson",curae mauris viverra diam vitae quam suspendisse potenti nullam porttitor lacus at turpis donec posuere metus vitae ipsum aliquam non,,Laptops and Desktops,Y,36,100
+Test Model 13,Laptops,Mosciski Inc,molestie hendrerit at vulputate vitae nisl aenean lectus pellentesque eget nunc donec quis orci,,Laptops and Desktops,Y,36,100
+Test Model 14,Laptops,Mosciski Inc,egestas metus aenean fermentum donec ut mauris eget massa tempor convallis nulla neque libero convallis eget eleifend,,Laptops and Desktops,N,36,100
+Test Model 15,Laptops,"Upton, Feil and Jast",,,Laptops and Desktops,N,36,100
+Test Model 16,Laptops,"Romaguera, Goldner and Crooks",dui luctus rutrum nulla tellus in sagittis dui vel nisl duis ac nibh fusce,2315CN41G71,Laptops and Desktops,N,36,100
+Test Model 17,Laptops,Abernathy-Stamm,maecenas pulvinar lobortis est phasellus sit amet erat nulla tempus,6080UE59E09,Laptops and Desktops,N,36,100
+Test Model 18,Laptops,Mosciski Inc,,5505YF23M46,Laptops and Desktops,N,36,100
+Test Model 19,Laptops,Walker-Towne,,8673QP30R80,Laptops and Desktops,Y,36,100
+Test Model 20,Mobile Phones,"Heaney, Altenwerth and Emmerich",nisl ut volutpat sapien arcu sed augue aliquam erat volutpat in congue etiam justo etiam pretium,9088XV67Q94,Mobile Devices,Y,12,100
+Test One,Mobile Phones,Okuneva Group,quis libero nullam sit amet turpis elementum ligula vehicula consequat morbi a ipsum integer a nibh in quis,,Mobile Devices,Y,12,100
+Final Test,Mobile Phones,Walker-Towne,"Sphinx of black quartz, judge my vow",,Mobile Devices,Y,36,15
\ No newline at end of file
diff --git a/sample_csvs/suppliers-sample.csv b/sample_csvs/suppliers-sample.csv
new file mode 100644
index 0000000000..4383a5f703
--- /dev/null
+++ b/sample_csvs/suppliers-sample.csv
@@ -0,0 +1,11 @@
+name,address,address2,city,state,country,zip,notes,contact,phone,fax
+Mybuzz,1 Hoffman Circle,55,New York City,New York,US,10045,et tempus semper est quam pharetra magna ac consequat metus sapien,Debee Gouldstone,347-266-3178,995-892-7579
+Jabbersphere,0 Coolidge Circle,20357,Mapalad,,PH,3132,neque vestibulum eget vulputate ut ultrices vel augue vestibulum ante ipsum primis in faucibus orci luctus et ultrices,Malia Weatherdon,197-981-5379,488-325-1715
+Topicblab,88612 Fair Oaks Way,7989,Cogon,,PH,1686,aliquam convallis nunc proin at turpis a pede posuere nonummy integer,Wiley Brigdale,958-422-9615,899-962-6225
+Trupe,4861 Sheridan Pass,8,San Pedro,,PH,4023,vulputate nonummy maecenas tincidunt lacus at velit vivamus vel nulla eget eros elementum pellentesque quisque porta,Tobin Madill,387-755-4972,784-700-7390
+Yotz,40370 Stang Road,8,Kairouan,,TN,,in tempus sit amet sem fusce consequat nulla nisl nunc nisl,Obadiah Sample,656-536-9835,682-787-3779
+Fatz,5 Scoville Court,75043,Krasiczyn,,PL,37-741,metus sapien ut nunc vestibulum ante ipsum primis in faucibus orci luctus et ultrices,Caprice Cadagan,985-361-5597,543-332-3487
+Mycat,66 Sugar Parkway,4946,Andalucía,,CO,763008,velit nec nisi vulputate nonummy maecenas tincidunt lacus at velit vivamus vel nulla eget eros,Jody Veasey,954-596-9805,404-452-3171
+Livefish,24 Artisan Street,0,Brest,Bretagne,FR,29213 CEDEX 1,suspendisse ornare consequat lectus in est risus auctor sed tristique in tempus sit amet sem,Eddie Decayette,102-873-3656,558-233-6215
+Roomm,292 Crest Line Drive,10,Gribanovskiy,,RU,397243,nonummy maecenas tincidunt lacus at velit vivamus vel nulla eget eros elementum pellentesque quisque porta volutpat,Cesare Fosten,247-353-7043,248-710-4887
+Yodel,29457 Eastlawn Crossing,019,Divnomorskoye,,RU,353490,turpis a pede posuere nonummy integer non velit donec diam neque,Delmer Milton,499-847-6224,868-912-6630
diff --git a/snipeit.sh b/snipeit.sh
index 0f379b90bc..2fd78c9daa 100755
--- a/snipeit.sh
+++ b/snipeit.sh
@@ -18,8 +18,11 @@
 #         Updated Snipe-IT Install Script            #
 #          Update created by Aaron Myers             #
 # Change log                                         #
+# * verify support for Ubuntu 24.04 -> 25.04         #
+# * add support for linux Mint 21 -> 22 inclusive    #
+# * add support for linux mint 22.1                  #
 # * add support for php8.2, awslinux2, alma 8/9      #
-# * fix rocky8/9 support
+# * fix rocky8/9 support                             #
 # * remove Fedora support because short timelines    #
 # * Added support for CentOS/Rocky 9                 #
 # * Fixed CentOS 7 repository for PHP 7.4            #
@@ -87,6 +90,7 @@ readonly APP_NAME="snipeit"
 readonly APP_PATH="/var/www/html/$APP_NAME"
 readonly APP_LOG="/var/log/snipeit-install.log"
 readonly COMPOSER_PATH="/home/$APP_USER"
+is_mint=false
 
 progress () {
   spin[0]="-"
@@ -175,11 +179,22 @@ create_user () {
 
   if [[ "$distro" == "Ubuntu" ]] || [[ "$distro" == "Debian" ]] || [[ "$distro" == "Raspbian" ]] ; then
     /usr/sbin/adduser --quiet --disabled-password --gecos 'Snipe-IT User' "$APP_USER"
-    su -c "/usr/sbin/usermod -a -G "$apache_group" "$APP_USER""
   else
-    adduser "$APP_USER"
-    usermod -a -G "$apache_group" "$APP_USER"
+    adduser -c "Snipe-IT User" "$APP_USER"
   fi
+
+  # Add the user to the apache group so the app can write to any files apache
+  # creates (eg, if apache process creates the log, but then a an app-user-owned
+  # cron also tries writing
+  usermod -a -G "$apache_group" "$APP_USER"
+
+  # Now do the reverse -- so apache can write to the log that the user may
+  # have created. This was actively a problem on new installs, hobbling
+  # imports
+  # redefining these variables just for clarity
+  apache_user="$apache_group"
+  app_group="$APP_USER"
+  usermod -a -G "$app_group" "$apache_user"
 }
 
 run_as_app_user () {
@@ -203,7 +218,7 @@ install_composer () {
   fi
 
   if [ "$EXPECTED_SIGNATURE" != "$ACTUAL_SIGNATURE" ]; then
-    >?&2 echo 'ERROR: Invalid composer installer signature'
+    >&2 echo 'ERROR: Invalid composer installer signature'
     exit 1
   fi
 
@@ -224,7 +239,7 @@ install_snipeit () {
   mysql -u root --execute="CREATE DATABASE snipeit;CREATE USER snipeit_dbuser@localhost IDENTIFIED BY '$mysqluserpw'; GRANT ALL PRIVILEGES ON snipeit.* TO snipeit_dbuser@localhost;"
 
   echo -e "\n\n* Cloning Snipe-IT from github to the web directory."
-  log "git clone https://github.com/snipe/snipe-it $APP_PATH" & pid=$!
+  log "git clone https://github.com/grokability/snipe-it $APP_PATH" & pid=$!
   progress
   pushd $APP_PATH
   git checkout master
@@ -347,6 +362,13 @@ case $distro in
     apache_group=www-data
     apachefile=/etc/apache2/sites-available/$APP_NAME.conf
     ;;
+  *linuxmint*)
+    echo "  The installer has detected $distro version $version codename $codename."
+    distro=Ubuntu
+    is_mint=true
+    apache_group=www-data
+    apachefile=/etc/apache2/sites-available/$APP_NAME.conf
+    ;;
   *raspbian*)
     echo "  The installer has detected $distro version $version codename $codename."
     distro=Raspbian
@@ -359,7 +381,7 @@ case $distro in
     apache_group=www-data
     apachefile=/etc/apache2/sites-available/$APP_NAME.conf
     ;;
-  *amzn*|*redhat*|*alma*|*rhel*|*rocky*)
+  *amzn*|*redhat*|*alma*|*rhel*|*rocky*|*centos*)
     echo "  The installer has detected $distro version $version."
     distro=Centos
     apache_group=apache
@@ -428,7 +450,7 @@ case $distro in
         progress
 
         echo "* Installing Apache httpd, PHP, MariaDB and other requirements."
-        PACKAGES="mariadb-server mariadb-client apache2 libapache2-mod-php8.2 php8.2 php8.2-mcrypt php8.2-curl php8.2-mysql php8.2-gd php8.2-ldap php8.2-zip php8.2-mbstring php8.2-xml php8.2-bcmath curl git unzip"
+        PACKAGES="mariadb-server mariadb-client apache2 libapache2-mod-php8.2 php8.2  php8.2-curl php8.2-mysql php8.2-gd php8.2-ldap php8.2-zip php8.2-mbstring php8.2-xml php8.2-bcmath curl git unzip"
         install_packages
 
         echo "* Configuring Apache."
@@ -465,7 +487,7 @@ case $distro in
         progress
 
         echo "* Installing Apache httpd, PHP, MariaDB and other requirements."
-        PACKAGES="mariadb-server mariadb-client apache2 libapache2-mod-php8.2 php8.2 php8.2-mcrypt php8.2-curl php8.2-mysql php8.2-gd php8.2-ldap php8.2-zip php8.2-mbstring php8.2-xml php8.2-bcmath curl git unzip"
+        PACKAGES="mariadb-server mariadb-client apache2 libapache2-mod-php8.2 php8.2  php8.2-curl php8.2-mysql php8.2-gd php8.2-ldap php8.2-zip php8.2-mbstring php8.2-xml php8.2-bcmath curl git unzip"
         install_packages
 
         echo "* Configuring Apache."
@@ -502,7 +524,7 @@ case $distro in
         progress
 
         echo "* Installing Apache httpd, PHP, MariaDB and other requirements."
-        PACKAGES="mariadb-server mariadb-client apache2 libapache2-mod-php8.2 php8.2 php8.2-mcrypt php8.2-curl php8.2-mysql php8.2-gd php8.2-ldap php8.2-zip php8.2-mbstring php8.2-xml php8.2-bcmath curl git unzip"
+        PACKAGES="mariadb-server mariadb-client apache2 libapache2-mod-php8.2 php8.2  php8.2-curl php8.2-mysql php8.2-gd php8.2-ldap php8.2-zip php8.2-mbstring php8.2-xml php8.2-bcmath curl git unzip"
         install_packages
 
         echo "* Configuring Apache."
@@ -533,7 +555,7 @@ case $distro in
   ;;
   Ubuntu)
     if [ "${version//./}" -ge "2304" ]; then
-        # Install for Ubuntu 23.04 and 23.10
+        # Install for Ubuntu 23.04 and above
         set_fqdn
         set_dbpass
         tzone=$(cat /etc/timezone)
@@ -543,7 +565,58 @@ case $distro in
         progress
 
         echo "* Installing Apache httpd, PHP, MariaDB and other requirements."
-        PACKAGES="cron mariadb-server mariadb-client apache2 libapache2-mod-php php php-mcrypt php-curl php-mysql php-gd php-ldap php-zip php-mbstring php-xml php-bcmath curl git unzip"
+        PACKAGES="cron mariadb-server mariadb-client apache2 libapache2-mod-php php php-curl php-mysql php-gd php-ldap php-zip php-mbstring php-xml php-bcmath curl git unzip wget"
+        install_packages
+
+        echo "* Configuring Apache."
+        create_virtualhost
+        log "phpenmod mcrypt"
+        log "phpenmod mbstring"
+        log "a2enmod rewrite"
+        log "a2ensite $APP_NAME.conf"
+        rename_default_vhost
+
+        set_hosts
+
+        echo "* Starting MariaDB."
+        log "systemctl start mariadb.service"
+
+        install_snipeit
+
+        echo "* Restarting Apache httpd."
+        log "systemctl restart apache2"
+
+        echo "* Clearing cache and setting final permissions."
+        chmod 777 -R $APP_PATH/storage/framework/cache/
+        log "run_as_app_user php $APP_PATH/artisan cache:clear"
+        chmod 775 -R $APP_PATH/storage/
+    elif [[ "${is_mint}" == "true" ]]; then
+        # Install for Linux Mint 21.2 - 22.1
+
+        if [[ "${version//.*/}" -eq "22" ]] ; then
+            ubuntu_codename=noble
+        elif [[ "${version//.*/}" -eq "21" ]]; then
+            ubuntu_codename=jammy
+        else
+            echo "Unsupported Linux Mint version. Version found: $version"
+            exit 1
+        fi
+
+        set_fqdn
+        set_dbpass
+        tzone=$(cat /etc/timezone)
+
+        echo "* Set up Ondrej PHP repository"
+        echo "# Odrej PHP repo for ability to choose non-distro PHP versions" > /etc/apt/sources.list.d/ppa_ondrej_php_$ubuntu_codename.list
+        echo "deb http://ppa.launchpad.net/ondrej/php/ubuntu $ubuntu_codename main" >> /etc/apt/sources.list.d/ppa_ondrej_php_$ubuntu_codename.list
+        sudo apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 4F4EA0AAE5267A6C
+
+        echo -n "* Updating installed packages."
+        log "apt-get update && DEBIAN_FRONTEND=noninteractive apt-get -y upgrade" & pid=$!
+        progress
+
+        echo "* Installing Apache httpd, PHP, MariaDB and other requirements."
+        PACKAGES="cron mariadb-server mariadb-client apache2 libapache2-mod-php8.3 php8.3  php8.3-curl php8.3-mysql php8.3-gd php8.3-ldap php8.3-zip php8.3-mbstring php8.3-xml php8.3-bcmath php8.3-cli curl git unzip"
         install_packages
 
         echo "* Configuring Apache."
@@ -584,7 +657,7 @@ case $distro in
         progress
 
         echo "* Installing Apache httpd, PHP, MariaDB and other requirements."
-        PACKAGES="cron mariadb-server mariadb-client apache2 libapache2-mod-php8.2 php8.2 php8.2-mcrypt php8.2-curl php8.2-mysql php8.2-gd php8.2-ldap php8.2-zip php8.2-mbstring php8.2-xml php8.2-bcmath curl git unzip"
+        PACKAGES="cron mariadb-server mariadb-client apache2 libapache2-mod-php8.2 php8.2  php8.2-curl php8.2-mysql php8.2-gd php8.2-ldap php8.2-zip php8.2-mbstring php8.2-xml php8.2-bcmath curl git unzip"
         install_packages
 
         echo "* Configuring Apache."
@@ -628,7 +701,7 @@ case $distro in
         progress
 
         echo "* Installing Apache httpd, PHP, MariaDB and other requirements."
-        PACKAGES="cron mariadb-server mariadb-client apache2 libapache2-mod-php8.28.2 php8.2 php8.2-mcrypt php8.2-curl php8.2-mysql php8.2-gd php8.2-ldap php8.2-zip php8.2-mbstring php8.2-xml php8.2-bcmath curl git unzip"
+        PACKAGES="cron mariadb-server mariadb-client apache2 libapache2-mod-php8.28.2 php8.2  php8.2-curl php8.2-mysql php8.2-gd php8.2-ldap php8.2-zip php8.2-mbstring php8.2-xml php8.2-bcmath curl git unzip"
         install_packages
 
         echo "* Configuring Apache."
@@ -688,12 +761,11 @@ EOL
         progress
 
         echo "* Installing Apache httpd, PHP, MariaDB and other requirements."
-        PACKAGES="mariadb-server mariadb-client apache2 libapache2-mod-php8.2 php8.2 php8.2-mcrypt php8.2-curl php8.2-mysql php8.2-gd php8.2-ldap php8.2-zip php8.2-mbstring php8.2-xml php8.2-bcmath curl git unzip"
+        PACKAGES="mariadb-server mariadb-client apache2 libapache2-mod-php8.2 php8.2  php8.2-curl php8.2-mysql php8.2-gd php8.2-ldap php8.2-zip php8.2-mbstring php8.2-xml php8.2-bcmath curl git unzip"
         install_packages
 
         echo "* Configuring Apache."
         create_virtualhost
-        log "phpenmod mcrypt"
         log "phpenmod mbstring"
         log "a2enmod rewrite"
         log "a2ensite $APP_NAME.conf"
@@ -728,7 +800,7 @@ EOL
         amazon-linux-extras install -y php8.2
 
         echo "* Installing Apache httpd, PHP, MariaDB and other requirements."
-        PACKAGES="httpd mariadb-server git unzip php php-mysqlnd php-bcmath php-embedded php-gd php-mbstring php-mcrypt php-ldap php-json php-simplexml php-process php-zip  php-sodium"
+        PACKAGES="httpd mariadb-server git unzip php php-mysqlnd php-bcmath php-embedded php-gd php-mbstring php-ldap php-json php-simplexml php-process php-zip  php-sodium"
         install_packages
 
         echo "* Configuring Apache."
@@ -769,7 +841,7 @@ EOL
         log "yum-config-manager --enable remi-php82"
 
         echo "* Installing Apache httpd, PHP, MariaDB and other requirements."
-        PACKAGES="httpd mariadb-server git unzip php php-mysqlnd php-bcmath php-embedded php-gd php-mbstring php-mcrypt php-ldap php-json php-simplexml php-process php-zip"
+        PACKAGES="httpd mariadb-server git unzip php php-mysqlnd php-bcmath php-embedded php-gd php-mbstring php-ldap php-json php-simplexml php-process php-zip"
         install_packages
 
         echo "* Configuring Apache."
@@ -812,7 +884,7 @@ EOL
         progress
 
         echo "* Installing Apache httpd, PHP, MariaDB and other requirements."
-        PACKAGES="httpd mariadb-server git unzip php php-mysqlnd php-bcmath php-embedded php-gd php-mbstring php-mcrypt php-ldap php-json php-simplexml php-process php-zip"
+        PACKAGES="httpd mariadb-server git unzip php php-mysqlnd php-bcmath php-embedded php-gd php-mbstring php-ldap php-json php-simplexml php-process php-zip"
         install_packages
 
         echo "* Configuring Apache."
@@ -932,7 +1004,7 @@ case $setupmail in
 
     echo -n "  From name:"
     read -r mailfromname
-    sed -i "s|^\\(MAIL_FROM_NAME=\\).*|\\1$mailfromname|" "$APP_PATH/.env"
+    sed -i  "s|^\\(MAIL_FROM_NAME=\\).*|\\1\\'$mailfromname\\'|" "$APP_PATH/.env"
 
     echo -n "  Reply to address:"
     read -r mailreplytoaddr
@@ -940,7 +1012,7 @@ case $setupmail in
 
     echo -n "  Reply to name:"
     read -r mailreplytoname
-    sed -i "s|^\\(MAIL_REPLYTO_NAME=\\).*|\\1$mailreplytoname|" "$APP_PATH/.env"
+    sed -i "s|^\\(MAIL_REPLYTO_NAME=\\).*|\\1\\'$mailreplytoname\\'|" "$APP_PATH/.env"
     setupmail="yes"
     ;;
   [nN] | [n|N][O|o] )
diff --git a/storage/private_uploads/locations/.gitignore b/storage/private_uploads/locations/.gitignore
new file mode 100644
index 0000000000..c96a04f008
--- /dev/null
+++ b/storage/private_uploads/locations/.gitignore
@@ -0,0 +1,2 @@
+*
+!.gitignore
\ No newline at end of file
diff --git a/tests/Concerns/TestsFullMultipleCompaniesSupport.php b/tests/Concerns/TestsFullMultipleCompaniesSupport.php
new file mode 100644
index 0000000000..a52d27bd22
--- /dev/null
+++ b/tests/Concerns/TestsFullMultipleCompaniesSupport.php
@@ -0,0 +1,8 @@
+<?php
+
+namespace Tests\Concerns;
+
+interface TestsFullMultipleCompaniesSupport
+{
+    public function testAdheresToFullMultipleCompaniesSupportScoping();
+}
diff --git a/tests/Concerns/TestsPermissionsRequirement.php b/tests/Concerns/TestsPermissionsRequirement.php
new file mode 100644
index 0000000000..2066abf651
--- /dev/null
+++ b/tests/Concerns/TestsPermissionsRequirement.php
@@ -0,0 +1,8 @@
+<?php
+
+namespace Tests\Concerns;
+
+interface TestsPermissionsRequirement
+{
+    public function testRequiresPermission();
+}
diff --git a/tests/Feature/Accessories/Api/AccessoriesForSelectListTest.php b/tests/Feature/Accessories/Api/AccessoriesForSelectListTest.php
new file mode 100644
index 0000000000..f2c2185edc
--- /dev/null
+++ b/tests/Feature/Accessories/Api/AccessoriesForSelectListTest.php
@@ -0,0 +1,59 @@
+<?php
+
+namespace Tests\Feature\Accessories\Api;
+
+use App\Models\Accessory;
+use App\Models\Company;
+use App\Models\User;
+use Tests\Concerns\TestsFullMultipleCompaniesSupport;
+use Tests\TestCase;
+
+class AccessoriesForSelectListTest extends TestCase implements TestsFullMultipleCompaniesSupport
+{
+    public function testAdheresToFullMultipleCompaniesSupportScoping()
+    {
+        [$companyA, $companyB] = Company::factory()->count(2)->create();
+
+        $accessoryA = Accessory::factory()->for($companyA)->create();
+        $accessoryB = Accessory::factory()->for($companyB)->create();
+
+        $superuser = User::factory()->superuser()->create();
+        $userInCompanyA = $companyA->users()->save(User::factory()->viewAccessories()->make());
+        $userInCompanyB = $companyB->users()->save(User::factory()->viewAccessories()->make());
+
+        $this->settings->enableMultipleFullCompanySupport();
+
+        $this->actingAsForApi($userInCompanyA)
+            ->getJson(route('api.accessories.selectlist'))
+            ->assertOk()
+            ->assertJsonPath('total_count', 1)
+            ->assertResponseContainsInResults($accessoryA)
+            ->assertResponseDoesNotContainInResults($accessoryB);
+
+        $this->actingAsForApi($userInCompanyB)
+            ->getJson(route('api.accessories.selectlist'))
+            ->assertOk()
+            ->assertJsonPath('total_count', 1)
+            ->assertResponseDoesNotContainInResults($accessoryA)
+            ->assertResponseContainsInResults($accessoryB);
+
+        $this->actingAsForApi($superuser)
+            ->getJson(route('api.accessories.selectlist'))
+            ->assertOk()
+            ->assertJsonPath('total_count', 2)
+            ->assertResponseContainsInResults($accessoryA)
+            ->assertResponseContainsInResults($accessoryB);
+    }
+
+    public function testCanGetAccessoriesForSelectList()
+    {
+        [$accessoryA, $accessoryB] = Accessory::factory()->count(2)->create();
+
+        $this->actingAsForApi(User::factory()->viewAccessories()->create())
+            ->getJson(route('api.accessories.selectlist'))
+            ->assertOk()
+            ->assertJsonPath('total_count', 2)
+            ->assertResponseContainsInResults($accessoryA)
+            ->assertResponseContainsInResults($accessoryB);
+    }
+}
diff --git a/tests/Feature/Accessories/Api/DeleteAccessoriesTest.php b/tests/Feature/Accessories/Api/DeleteAccessoriesTest.php
new file mode 100644
index 0000000000..e82d0de488
--- /dev/null
+++ b/tests/Feature/Accessories/Api/DeleteAccessoriesTest.php
@@ -0,0 +1,86 @@
+<?php
+
+namespace Tests\Feature\Accessories\Api;
+
+use App\Models\Accessory;
+use App\Models\Company;
+use App\Models\User;
+use PHPUnit\Framework\Attributes\DataProvider;
+use Tests\Concerns\TestsFullMultipleCompaniesSupport;
+use Tests\Concerns\TestsPermissionsRequirement;
+use Tests\TestCase;
+
+class DeleteAccessoriesTest extends TestCase implements TestsFullMultipleCompaniesSupport, TestsPermissionsRequirement
+{
+    public function testRequiresPermission()
+    {
+        $accessory = Accessory::factory()->create();
+
+        $this->actingAsForApi(User::factory()->create())
+            ->deleteJson(route('api.accessories.destroy', $accessory))
+            ->assertForbidden();
+
+        $this->assertNotSoftDeleted($accessory);
+    }
+
+    public function testAdheresToFullMultipleCompaniesSupportScoping()
+    {
+        [$companyA, $companyB] = Company::factory()->count(2)->create();
+
+        $accessoryA = Accessory::factory()->for($companyA)->create();
+        $accessoryB = Accessory::factory()->for($companyB)->create();
+        $accessoryC = Accessory::factory()->for($companyB)->create();
+
+        $superUser = $companyA->users()->save(User::factory()->superuser()->make());
+        $userInCompanyA = $companyA->users()->save(User::factory()->deleteAccessories()->make());
+        $userInCompanyB = $companyB->users()->save(User::factory()->deleteAccessories()->make());
+
+        $this->settings->enableMultipleFullCompanySupport();
+
+        $this->actingAsForApi($userInCompanyA)
+            ->deleteJson(route('api.accessories.destroy', $accessoryB))
+            ->assertStatusMessageIs('error');
+
+        $this->actingAsForApi($userInCompanyB)
+            ->deleteJson(route('api.accessories.destroy', $accessoryA))
+            ->assertStatusMessageIs('error');
+
+        $this->actingAsForApi($superUser)
+            ->deleteJson(route('api.accessories.destroy', $accessoryC))
+            ->assertStatusMessageIs('success');
+
+        $this->assertNotSoftDeleted($accessoryA);
+        $this->assertNotSoftDeleted($accessoryB);
+        $this->assertSoftDeleted($accessoryC);
+    }
+
+    public static function checkedOutAccessories()
+    {
+        yield 'checked out to user' => [fn() => Accessory::factory()->checkedOutToUser()->create()];
+        yield 'checked out to asset' => [fn() => Accessory::factory()->checkedOutToAsset()->create()];
+        yield 'checked out to location' => [fn() => Accessory::factory()->checkedOutToLocation()->create()];
+    }
+
+    #[DataProvider('checkedOutAccessories')]
+    public function testCannotDeleteAccessoryThatHasCheckouts($data)
+    {
+        $accessory = $data();
+
+        $this->actingAsForApi(User::factory()->deleteAccessories()->create())
+            ->deleteJson(route('api.accessories.destroy', $accessory))
+            ->assertStatusMessageIs('error');
+
+        $this->assertNotSoftDeleted($accessory);
+    }
+
+    public function testCanDeleteAccessory()
+    {
+        $accessory = Accessory::factory()->create();
+
+        $this->actingAsForApi(User::factory()->deleteAccessories()->create())
+            ->deleteJson(route('api.accessories.destroy', $accessory))
+            ->assertStatusMessageIs('success');
+
+        $this->assertSoftDeleted($accessory);
+    }
+}
diff --git a/tests/Feature/Accessories/Api/IndexAccessoryCheckoutsTest.php b/tests/Feature/Accessories/Api/IndexAccessoryCheckoutsTest.php
new file mode 100644
index 0000000000..38f1e99e5d
--- /dev/null
+++ b/tests/Feature/Accessories/Api/IndexAccessoryCheckoutsTest.php
@@ -0,0 +1,84 @@
+<?php
+
+namespace Tests\Feature\Accessories\Api;
+
+use App\Models\Accessory;
+use App\Models\Company;
+use App\Models\User;
+use Tests\Concerns\TestsFullMultipleCompaniesSupport;
+use Tests\Concerns\TestsPermissionsRequirement;
+use Tests\TestCase;
+
+class IndexAccessoryCheckoutsTest extends TestCase implements TestsFullMultipleCompaniesSupport, TestsPermissionsRequirement
+{
+    public function testRequiresPermission()
+    {
+        $accessory = Accessory::factory()->create();
+
+        $this->actingAsForApi(User::factory()->create())
+            ->getJson(route('api.accessories.checkedout', $accessory))
+            ->assertForbidden();
+    }
+
+    public function testAdheresToFullMultipleCompaniesSupportScoping()
+    {
+        [$companyA, $companyB] = Company::factory()->count(2)->create();
+
+        $accessoryA = Accessory::factory()->for($companyA)->create();
+        $accessoryB = Accessory::factory()->for($companyB)->create();
+
+        $superuser = User::factory()->superuser()->create();
+        $userInCompanyA = $companyA->users()->save(User::factory()->viewAccessories()->make());
+        $userInCompanyB = $companyB->users()->save(User::factory()->viewAccessories()->make());
+
+        $this->settings->enableMultipleFullCompanySupport();
+
+        $this->actingAsForApi($userInCompanyA)
+            ->getJson(route('api.accessories.checkedout', $accessoryB))
+            ->assertStatusMessageIs('error');
+
+        $this->actingAsForApi($userInCompanyB)
+            ->getJson(route('api.accessories.checkedout', $accessoryA))
+            ->assertStatusMessageIs('error');
+
+        $this->actingAsForApi($superuser)
+            ->getJson(route('api.accessories.checkedout', $accessoryA))
+            ->assertOk();
+    }
+
+    public function testCanGetAccessoryCheckouts()
+    {
+        [$userA, $userB] = User::factory()->count(2)->create();
+
+        $accessory = Accessory::factory()->checkedOutToUsers([$userA, $userB])->create();
+
+        $this->assertEquals(2, $accessory->checkouts()->count());
+
+        $this->actingAsForApi(User::factory()->viewAccessories()->create())
+            ->getJson(route('api.accessories.checkedout', $accessory))
+            ->assertOk()
+            ->assertJsonPath('total', 2)
+            ->assertJsonPath('rows.0.assigned_to.id', $userA->id)
+            ->assertJsonPath('rows.1.assigned_to.id', $userB->id);
+    }
+
+    public function testCanGetAccessoryCheckoutsWithOffsetAndLimitInQueryString()
+    {
+        [$userA, $userB, $userC] = User::factory()->count(3)->create();
+
+        $accessory = Accessory::factory()->checkedOutToUsers([$userA, $userB, $userC])->create();
+
+        $actor = $this->actingAsForApi(User::factory()->viewAccessories()->create());
+
+        $actor->getJson(route('api.accessories.checkedout', ['accessory' => $accessory->id, 'limit' => 1]))
+            ->assertOk()
+            ->assertJsonPath('total', 3)
+            ->assertJsonPath('rows.0.assigned_to.id', $userA->id);
+
+        $actor->getJson(route('api.accessories.checkedout', ['accessory' => $accessory->id, 'limit' => 2, 'offset' => 1]))
+            ->assertOk()
+            ->assertJsonPath('total', 3)
+            ->assertJsonPath('rows.0.assigned_to.id', $userB->id)
+            ->assertJsonPath('rows.1.assigned_to.id', $userC->id);
+    }
+}
diff --git a/tests/Feature/Accessories/Api/IndexAccessoryTest.php b/tests/Feature/Accessories/Api/IndexAccessoryTest.php
new file mode 100644
index 0000000000..96263f5380
--- /dev/null
+++ b/tests/Feature/Accessories/Api/IndexAccessoryTest.php
@@ -0,0 +1,70 @@
+<?php
+
+namespace Tests\Feature\Accessories\Api;
+
+use App\Models\Accessory;
+use App\Models\Company;
+use App\Models\User;
+use Tests\Concerns\TestsFullMultipleCompaniesSupport;
+use Tests\Concerns\TestsPermissionsRequirement;
+use Tests\TestCase;
+
+class IndexAccessoryTest extends TestCase implements TestsFullMultipleCompaniesSupport, TestsPermissionsRequirement
+{
+    public function testRequiresPermission()
+    {
+        $this->actingAsForApi(User::factory()->create())
+            ->getJson(route('api.accessories.index'))
+            ->assertForbidden();
+    }
+
+    public function testAdheresToFullMultipleCompaniesSupportScoping()
+    {
+        [$companyA, $companyB] = Company::factory()->count(2)->create();
+
+        $accessoryA = Accessory::factory()->for($companyA)->create(['name' => 'Accessory A']);
+        $accessoryB = Accessory::factory()->for($companyB)->create(['name' => 'Accessory B']);
+        $accessoryC = Accessory::factory()->for($companyB)->create(['name' => 'Accessory C']);
+
+        $superUser = $companyA->users()->save(User::factory()->superuser()->make());
+        $userInCompanyA = $companyA->users()->save(User::factory()->viewAccessories()->make());
+        $userInCompanyB = $companyB->users()->save(User::factory()->viewAccessories()->make());
+
+        $this->settings->enableMultipleFullCompanySupport();
+
+        $this->actingAsForApi($userInCompanyA)
+            ->getJson(route('api.accessories.index'))
+            ->assertOk()
+            ->assertResponseContainsInRows($accessoryA)
+            ->assertResponseDoesNotContainInRows($accessoryB)
+            ->assertResponseDoesNotContainInRows($accessoryC);
+
+        $this->actingAsForApi($userInCompanyB)
+            ->getJson(route('api.accessories.index'))
+            ->assertOk()
+            ->assertResponseDoesNotContainInRows($accessoryA)
+            ->assertResponseContainsInRows($accessoryB)
+            ->assertResponseContainsInRows($accessoryC);
+
+        $this->actingAsForApi($superUser)
+            ->getJson(route('api.accessories.index'))
+            ->assertOk()
+            ->assertResponseContainsInRows($accessoryA)
+            ->assertResponseContainsInRows($accessoryB)
+            ->assertResponseContainsInRows($accessoryC);
+    }
+
+    public function testCanGetAccessories()
+    {
+        $user = User::factory()->viewAccessories()->create();
+
+        $accessoryA = Accessory::factory()->create(['name' => 'Accessory A']);
+        $accessoryB = Accessory::factory()->create(['name' => 'Accessory B']);
+
+        $this->actingAsForApi($user)
+            ->getJson(route('api.accessories.index'))
+            ->assertOk()
+            ->assertResponseContainsInRows($accessoryA)
+            ->assertResponseContainsInRows($accessoryB);
+    }
+}
diff --git a/tests/Feature/Accessories/Api/ShowAccessoryTest.php b/tests/Feature/Accessories/Api/ShowAccessoryTest.php
new file mode 100644
index 0000000000..117d725007
--- /dev/null
+++ b/tests/Feature/Accessories/Api/ShowAccessoryTest.php
@@ -0,0 +1,61 @@
+<?php
+
+namespace Tests\Feature\Accessories\Api;
+
+use App\Models\Accessory;
+use App\Models\Company;
+use App\Models\User;
+use Tests\Concerns\TestsFullMultipleCompaniesSupport;
+use Tests\Concerns\TestsPermissionsRequirement;
+use Tests\TestCase;
+
+class ShowAccessoryTest extends TestCase implements TestsFullMultipleCompaniesSupport, TestsPermissionsRequirement
+{
+    public function testRequiresPermission()
+    {
+        $accessory = Accessory::factory()->create();
+
+        $this->actingAsForApi(User::factory()->create())
+            ->getJson(route('api.accessories.show', $accessory))
+            ->assertForbidden();
+    }
+
+    public function testAdheresToFullMultipleCompaniesSupportScoping()
+    {
+        [$companyA, $companyB] = Company::factory()->count(2)->create();
+
+        $accessoryForCompanyA = Accessory::factory()->for($companyA)->create();
+
+        $superuser = User::factory()->superuser()->create();
+        $userForCompanyB = User::factory()->for($companyB)->viewAccessories()->create();
+
+        $this->settings->enableMultipleFullCompanySupport();
+
+        $this->actingAsForApi($userForCompanyB)
+            ->getJson(route('api.accessories.show', $accessoryForCompanyA))
+            ->assertOk()
+            ->assertStatusMessageIs('error');
+
+        $this->actingAsForApi($superuser)
+            ->getJson(route('api.accessories.show', $accessoryForCompanyA))
+            ->assertOk()
+            ->assertJsonFragment([
+                'id' => $accessoryForCompanyA->id,
+            ]);
+    }
+
+    public function testCanGetSingleAccessory()
+    {
+        $accessory = Accessory::factory()->checkedOutToUser()->create(['name' => 'My Accessory']);
+
+        $this->actingAsForApi(User::factory()->viewAccessories()->create())
+            ->getJson(route('api.accessories.show', $accessory))
+            ->assertOk()
+            ->assertJsonFragment([
+                'id' => $accessory->id,
+                'name' => 'My Accessory',
+                'checkouts_count' => 1,
+            ]);
+
+    }
+}
diff --git a/tests/Feature/Accessories/Api/StoreAccessoryTest.php b/tests/Feature/Accessories/Api/StoreAccessoryTest.php
new file mode 100644
index 0000000000..22ba715519
--- /dev/null
+++ b/tests/Feature/Accessories/Api/StoreAccessoryTest.php
@@ -0,0 +1,98 @@
+<?php
+
+namespace Tests\Feature\Accessories\Api;
+
+use App\Models\Category;
+use App\Models\Company;
+use App\Models\Location;
+use App\Models\Manufacturer;
+use App\Models\Supplier;
+use App\Models\User;
+use Tests\Concerns\TestsFullMultipleCompaniesSupport;
+use Tests\Concerns\TestsPermissionsRequirement;
+use Tests\TestCase;
+
+class StoreAccessoryTest extends TestCase implements TestsFullMultipleCompaniesSupport, TestsPermissionsRequirement
+{
+    public function testRequiresPermission()
+    {
+        $this->actingAsForApi(User::factory()->create())
+            ->postJson(route('api.accessories.store'))
+            ->assertForbidden();
+    }
+
+    public function testAdheresToFullMultipleCompaniesSupportScoping()
+    {
+        $this->markTestSkipped('This behavior is not implemented');
+
+        [$companyA, $companyB] = Company::factory()->count(2)->create();
+        $userInCompanyA = User::factory()->for($companyA)->createAccessories()->create();
+
+        $this->settings->enableMultipleFullCompanySupport();
+
+        // attempt to store an accessory for company B
+        $this->actingAsForApi($userInCompanyA)
+            ->postJson(route('api.accessories.store'), [
+                'category_id' => Category::factory()->forAccessories()->create()->id,
+                'name' => 'My Awesome Accessory',
+                'qty' => 1,
+                'company_id' => $companyB->id,
+            ])->assertStatusMessageIs('error');
+
+        $this->assertDatabaseMissing('accessories', [
+            'name' => 'My Awesome Accessory',
+        ]);
+    }
+
+    public function testValidation()
+    {
+        $this->actingAsForApi(User::factory()->createAccessories()->create())
+            ->postJson(route('api.accessories.store'), [
+                //
+            ])
+            ->assertStatusMessageIs('error')
+            ->assertMessagesContains([
+                'category_id',
+                'name',
+                'qty',
+            ]);
+    }
+
+    public function testCanStoreAccessory()
+    {
+        $category = Category::factory()->forAccessories()->create();
+        $company = Company::factory()->create();
+        $location = Location::factory()->create();
+        $manufacturer = Manufacturer::factory()->create();
+        $supplier = Supplier::factory()->create();
+
+        $this->actingAsForApi(User::factory()->createAccessories()->create())
+            ->postJson(route('api.accessories.store'), [
+                'name' => 'My Awesome Accessory',
+                'qty' => 2,
+                'order_number' => '12345',
+                'purchase_cost' => 100.00,
+                'purchase_date' => '2024-09-18',
+                'model_number' => '98765',
+                'category_id' => $category->id,
+                'company_id' => $company->id,
+                'location_id' => $location->id,
+                'manufacturer_id' => $manufacturer->id,
+                'supplier_id' => $supplier->id,
+            ])->assertStatusMessageIs('success');
+
+        $this->assertDatabaseHas('accessories', [
+            'name' => 'My Awesome Accessory',
+            'qty' => 2,
+            'order_number' => '12345',
+            'purchase_cost' => 100.00,
+            'purchase_date' => '2024-09-18',
+            'model_number' => '98765',
+            'category_id' => $category->id,
+            'company_id' => $company->id,
+            'location_id' => $location->id,
+            'manufacturer_id' => $manufacturer->id,
+            'supplier_id' => $supplier->id,
+        ]);
+    }
+}
diff --git a/tests/Feature/Accessories/Api/UpdateAccessoryTest.php b/tests/Feature/Accessories/Api/UpdateAccessoryTest.php
new file mode 100644
index 0000000000..a0009a732a
--- /dev/null
+++ b/tests/Feature/Accessories/Api/UpdateAccessoryTest.php
@@ -0,0 +1,106 @@
+<?php
+
+namespace Tests\Feature\Accessories\Api;
+
+use App\Models\Accessory;
+use App\Models\Category;
+use App\Models\Company;
+use App\Models\Location;
+use App\Models\Manufacturer;
+use App\Models\Supplier;
+use App\Models\User;
+use Tests\Concerns\TestsFullMultipleCompaniesSupport;
+use Tests\Concerns\TestsPermissionsRequirement;
+use Tests\TestCase;
+
+class UpdateAccessoryTest extends TestCase implements TestsFullMultipleCompaniesSupport, TestsPermissionsRequirement
+{
+    public function testRequiresPermission()
+    {
+        $accessory = Accessory::factory()->create();
+
+        $this->actingAsForApi(User::factory()->create())
+            ->patchJson(route('api.accessories.update', $accessory))
+            ->assertForbidden();
+    }
+
+    public function testAdheresToFullMultipleCompaniesSupportScoping()
+    {
+        [$companyA, $companyB] = Company::factory()->count(2)->create();
+
+        $accessoryA = Accessory::factory()->for($companyA)->create(['name' => 'A Name to Change']);
+        $accessoryB = Accessory::factory()->for($companyB)->create(['name' => 'A Name to Change']);
+        $accessoryC = Accessory::factory()->for($companyB)->create(['name' => 'A Name to Change']);
+
+        $superuser = User::factory()->superuser()->create();
+        $userInCompanyA = $companyA->users()->save(User::factory()->editAccessories()->make());
+        $userInCompanyB = $companyB->users()->save(User::factory()->editAccessories()->make());
+
+        $this->settings->enableMultipleFullCompanySupport();
+
+        $this->actingAsForApi($userInCompanyA)
+            ->patchJson(route('api.accessories.update', $accessoryB), ['name' => 'New Name'])
+            ->assertStatusMessageIs('error');
+
+        $this->actingAsForApi($userInCompanyB)
+            ->patchJson(route('api.accessories.update', $accessoryA), ['name' => 'New Name'])
+            ->assertStatusMessageIs('error');
+
+        $this->actingAsForApi($superuser)
+            ->patchJson(route('api.accessories.update', $accessoryC), ['name' => 'New Name'])
+            ->assertOk();
+
+        $this->assertEquals('A Name to Change', $accessoryA->fresh()->name);
+        $this->assertEquals('A Name to Change', $accessoryB->fresh()->name);
+        $this->assertEquals('New Name', $accessoryC->fresh()->name);
+    }
+
+    public function testCanUpdateAccessoryViaPatch()
+    {
+        [$categoryA, $categoryB] = Category::factory()->count(2)->create();
+        [$companyA, $companyB] = Company::factory()->count(2)->create();
+        [$locationA, $locationB] = Location::factory()->count(2)->create();
+        [$manufacturerA, $manufacturerB] = Manufacturer::factory()->count(2)->create();
+        [$supplierA, $supplierB] = Supplier::factory()->count(2)->create();
+
+        $accessory = Accessory::factory()->create([
+            'name' => 'A Name to Change',
+            'qty' => 5,
+            'order_number' => 'A12345',
+            'purchase_cost' => 99.99,
+            'model_number' => 'ABC098',
+            'category_id' => $categoryA->id,
+            'company_id' => $companyA->id,
+            'location_id' => $locationA->id,
+            'manufacturer_id' => $manufacturerA->id,
+            'supplier_id' => $supplierA->id,
+        ]);
+
+        $this->actingAsForApi(User::factory()->editAccessories()->create())
+            ->patchJson(route('api.accessories.update', $accessory), [
+                'name' => 'A New Name',
+                'qty' => 10,
+                'order_number' => 'B54321',
+                'purchase_cost' => 199.99,
+                'model_number' => 'XYZ123',
+                'category_id' => $categoryB->id,
+                'company_id' => $companyB->id,
+                'location_id' => $locationB->id,
+                'manufacturer_id' => $manufacturerB->id,
+                'supplier_id' => $supplierB->id,
+            ])
+            ->assertOk();
+
+        $accessory = $accessory->fresh();
+        $this->assertEquals('A New Name', $accessory->name);
+        $this->assertEquals(10, $accessory->qty);
+        $this->assertEquals('B54321', $accessory->order_number);
+        $this->assertEquals(199.99, $accessory->purchase_cost);
+        $this->assertEquals('XYZ123', $accessory->model_number);
+        $this->assertEquals($categoryB->id, $accessory->category_id);
+        $this->assertEquals($companyB->id, $accessory->company_id);
+        $this->assertEquals($locationB->id, $accessory->location_id);
+        $this->assertEquals($manufacturerB->id, $accessory->manufacturer_id);
+        $this->assertEquals($supplierB->id, $accessory->supplier_id);
+    }
+}
diff --git a/tests/Feature/Accessories/Ui/AccessoriesIndexTest.php b/tests/Feature/Accessories/Ui/AccessoriesIndexTest.php
new file mode 100644
index 0000000000..7ab7f130a9
--- /dev/null
+++ b/tests/Feature/Accessories/Ui/AccessoriesIndexTest.php
@@ -0,0 +1,33 @@
+<?php
+
+namespace Tests\Feature\Accessories\Ui;
+
+use App\Models\User;
+use Tests\Concerns\TestsPermissionsRequirement;
+use Tests\TestCase;
+
+class AccessoriesIndexTest extends TestCase implements TestsPermissionsRequirement
+{
+    public function testRequiresPermission()
+    {
+        $this->actingAs(User::factory()->create())
+            ->get(route('accessories.index'))
+            ->assertForbidden();
+    }
+
+
+    public function testRendersAccessoriesIndexPage()
+    {
+        $this->actingAs(User::factory()->viewAccessories()->create())
+            ->get(route('accessories.index'))
+            ->assertOk()
+            ->assertViewIs('accessories.index');
+    }
+  
+    public function testPageRenders()
+    {
+        $this->actingAs(User::factory()->superuser()->create())
+            ->get(route('accessories.index'))
+            ->assertOk();
+    }
+}
diff --git a/tests/Feature/Accessories/Ui/CreateAccessoriesTest.php b/tests/Feature/Accessories/Ui/CreateAccessoriesTest.php
new file mode 100644
index 0000000000..f5cffd1be2
--- /dev/null
+++ b/tests/Feature/Accessories/Ui/CreateAccessoriesTest.php
@@ -0,0 +1,82 @@
+<?php
+
+namespace Tests\Feature\Accessories\Ui;
+
+use App\Models\Category;
+use App\Models\Company;
+use App\Models\Location;
+use App\Models\Manufacturer;
+use App\Models\Supplier;
+use App\Models\User;
+use Tests\TestCase;
+
+class CreateAccessoriesTest extends TestCase
+{
+    public function testRequiresPermissionToViewCreateAccessoryPage()
+    {
+        $this->actingAs(User::factory()->create())
+            ->get(route('accessories.create'))
+            ->assertForbidden();
+    }
+
+    public function testCreateAccessoryPageRenders()
+    {
+        $this->actingAs(User::factory()->createAccessories()->create())
+            ->get(route('accessories.create'))
+            ->assertOk()
+            ->assertViewIs('accessories.edit');
+    }
+
+    public function testRequiresPermissionToCreateAccessory()
+    {
+        $this->actingAs(User::factory()->create())
+            ->post(route('accessories.store'))
+            ->assertForbidden();
+    }
+
+    public function testValidDataRequiredToCreateAccessory()
+    {
+        $this->actingAs(User::factory()->createAccessories()->create())
+            ->post(route('accessories.store'), [
+                //
+            ])
+            ->assertSessionHasErrors([
+                'name',
+                'qty',
+                'category_id',
+            ]);
+    }
+
+    public function testCanCreateAccessory()
+    {
+        $category = Category::factory()->create();
+        $company = Company::factory()->create();
+        $location = Location::factory()->create();
+        $manufacturer = Manufacturer::factory()->create();
+        $supplier = Supplier::factory()->create();
+
+        $data = [
+            'category_id' => $category->id,
+            'company_id' => $company->id,
+            'location_id' => $location->id,
+            'manufacturer_id' => $manufacturer->id,
+            'min_amt' => '1',
+            'model_number' => '12345',
+            'name' => 'My Accessory Name',
+            'notes' => 'Some notes here',
+            'order_number' => '9876',
+            'purchase_cost' => '99.98',
+            'purchase_date' => '2024-09-04',
+            'qty' => '3',
+            'supplier_id' => $supplier->id,
+        ];
+
+        $user = User::factory()->createAccessories()->create();
+
+        $this->actingAs($user)
+            ->post(route('accessories.store'), array_merge($data, ['redirect_option' => 'index']))
+            ->assertRedirect(route('accessories.index'));
+
+        $this->assertDatabaseHas('accessories', array_merge($data, ['created_by' => $user->id]));
+    }
+}
diff --git a/tests/Feature/Accessories/Ui/CreateAccessoryWithFullMultipleCompanySupportTest.php b/tests/Feature/Accessories/Ui/CreateAccessoryWithFullMultipleCompanySupportTest.php
new file mode 100644
index 0000000000..a606db3fe2
--- /dev/null
+++ b/tests/Feature/Accessories/Ui/CreateAccessoryWithFullMultipleCompanySupportTest.php
@@ -0,0 +1,37 @@
+<?php
+
+namespace Tests\Feature\Accessories\Ui;
+
+use App\Models\Accessory;
+use App\Models\Category;
+use PHPUnit\Framework\Attributes\DataProvider;
+use Tests\Support\ProvidesDataForFullMultipleCompanySupportTesting;
+use Tests\TestCase;
+
+class CreateAccessoryWithFullMultipleCompanySupportTest extends TestCase
+{
+    use ProvidesDataForFullMultipleCompanySupportTesting;
+
+    #[DataProvider('dataForFullMultipleCompanySupportTesting')]
+    public function testAdheresToFullMultipleCompaniesSupportScoping($data)
+    {
+        ['actor' => $actor, 'company_attempting_to_associate' => $company, 'assertions' => $assertions] = $data();
+
+        $this->settings->enableMultipleFullCompanySupport();
+
+        $this->actingAs($actor)
+            ->post(route('accessories.store'), [
+                'redirect_option' => 'index',
+                'name' => 'My Cool Accessory',
+                'qty' => '1',
+                'category_id' => Category::factory()->create()->id,
+                'company_id' => $company->id,
+            ]);
+
+        $accessory = Accessory::withoutGlobalScopes()->where([
+            'name' => 'My Cool Accessory',
+        ])->sole();
+
+        $assertions($accessory);
+    }
+}
diff --git a/tests/Feature/Accessories/Ui/DeleteAccessoryTest.php b/tests/Feature/Accessories/Ui/DeleteAccessoryTest.php
new file mode 100644
index 0000000000..45ebbf71f7
--- /dev/null
+++ b/tests/Feature/Accessories/Ui/DeleteAccessoryTest.php
@@ -0,0 +1,64 @@
+<?php
+
+namespace Tests\Feature\Accessories\Ui;
+
+use App\Models\Accessory;
+use App\Models\Company;
+use App\Models\User;
+use PHPUnit\Framework\Attributes\DataProvider;
+use Tests\TestCase;
+
+class DeleteAccessoryTest extends TestCase
+{
+    public function testRequiresPermissionToDeleteAccessory()
+    {
+        $this->actingAs(User::factory()->create())
+            ->delete(route('accessories.destroy', Accessory::factory()->create()->id))
+            ->assertForbidden();
+    }
+
+    public function testCannotDeleteAccessoryFromAnotherCompany()
+    {
+        $this->settings->enableMultipleFullCompanySupport();
+
+        [$companyA, $companyB] = Company::factory()->count(2)->create();
+        $accessoryForCompanyA = Accessory::factory()->for($companyA)->create();
+        $userForCompanyB = User::factory()->for($companyB)->deleteAccessories()->create();
+
+        $this->actingAs($userForCompanyB)->delete(route('accessories.destroy', $accessoryForCompanyA->id));
+
+        $this->assertFalse($accessoryForCompanyA->refresh()->trashed(), 'Accessory should not be deleted');
+    }
+
+    public static function checkedOutAccessories()
+    {
+        yield 'checked out to user' => [fn() => Accessory::factory()->checkedOutToUser()->create()];
+        yield 'checked out to asset' => [fn() => Accessory::factory()->checkedOutToAsset()->create()];
+        yield 'checked out to location' => [fn() => Accessory::factory()->checkedOutToLocation()->create()];
+    }
+
+    #[DataProvider('checkedOutAccessories')]
+    public function testCannotDeleteAccessoryThatHasCheckouts($data)
+    {
+        $accessory = $data();
+
+        $this->actingAs(User::factory()->deleteAccessories()->create())
+            ->delete(route('accessories.destroy', $accessory->id))
+            ->assertSessionHas('error')
+            ->assertRedirect(route('accessories.index'));
+
+        $this->assertFalse($accessory->refresh()->trashed(), 'Accessory should not be deleted');
+    }
+
+    public function testCanDeleteAccessory()
+    {
+
+        $accessory = Accessory::factory()->create();
+
+        $this->actingAs(User::factory()->deleteAccessories()->create())
+            ->delete(route('accessories.destroy', $accessory->id))
+            ->assertRedirect(route('accessories.index'));
+
+        $this->assertTrue($accessory->refresh()->trashed(), 'Accessory should be deleted');
+    }
+}
diff --git a/tests/Feature/Accessories/Ui/EditAccessoryTest.php b/tests/Feature/Accessories/Ui/EditAccessoryTest.php
new file mode 100644
index 0000000000..ce880602e9
--- /dev/null
+++ b/tests/Feature/Accessories/Ui/EditAccessoryTest.php
@@ -0,0 +1,17 @@
+<?php
+
+namespace Tests\Feature\Accessories\Ui;
+
+use App\Models\Accessory;
+use App\Models\User;
+use Tests\TestCase;
+
+class EditAccessoryTest extends TestCase
+{
+    public function testPageRenders()
+    {
+        $this->actingAs(User::factory()->superuser()->create())
+            ->get(route('accessories.edit', Accessory::factory()->create()->id))
+            ->assertOk();
+    }
+}
diff --git a/tests/Feature/Accessories/Ui/ShowAccessoryTest.php b/tests/Feature/Accessories/Ui/ShowAccessoryTest.php
new file mode 100644
index 0000000000..0247b8846b
--- /dev/null
+++ b/tests/Feature/Accessories/Ui/ShowAccessoryTest.php
@@ -0,0 +1,59 @@
+<?php
+
+namespace Tests\Feature\Accessories\Ui;
+
+use App\Models\Accessory;
+use App\Models\Company;
+use App\Models\User;
+use Tests\TestCase;
+
+class ShowAccessoryTest extends TestCase
+{
+    public function testRequiresPermissionToViewAccessory()
+    {
+        $this->actingAs(User::factory()->create())
+            ->get(route('accessories.show', Accessory::factory()->create()))
+            ->assertForbidden();
+    }
+
+    public function testCannotViewAccessoryFromAnotherCompany()
+    {
+        $this->settings->enableMultipleFullCompanySupport();
+
+        [$companyA, $companyB] = Company::factory()->count(2)->create();
+        $accessoryForCompanyA = Accessory::factory()->for($companyA)->create();
+        $userForCompanyB = User::factory()->for($companyB)->viewAccessories()->create();
+
+        $this->actingAs($userForCompanyB)
+            ->get(route('accessories.show', $accessoryForCompanyA))
+            ->assertStatus(302);
+    }
+
+    public function testCanViewAccessory()
+    {
+        $accessory = Accessory::factory()->create();
+
+        $this->actingAs(User::factory()->viewAccessories()->create())
+            ->get(route('accessories.show', $accessory))
+            ->assertOk()
+            ->assertViewIs('accessories.view')
+            ->assertViewHas(['accessory' => $accessory]);
+    }
+  
+    public function testPageRenders()
+    {
+        $this->actingAs(User::factory()->superuser()->create())
+            ->get(route('accessories.show', Accessory::factory()->create()))
+            ->assertOk();
+
+    }
+
+    public function testHandlesAccessoryCreatorNotExisting()
+    {
+        $accessory = Accessory::factory()->create(['created_by' => 999999]);
+
+        $this->actingAs(User::factory()->superuser()->create())
+            ->get(route('accessories.show', $accessory))
+            ->assertOk();
+    }
+}
diff --git a/tests/Feature/Accessories/Ui/UpdateAccessoryTest.php b/tests/Feature/Accessories/Ui/UpdateAccessoryTest.php
new file mode 100644
index 0000000000..8c482b4f14
--- /dev/null
+++ b/tests/Feature/Accessories/Ui/UpdateAccessoryTest.php
@@ -0,0 +1,127 @@
+<?php
+
+namespace Tests\Feature\Accessories\Ui;
+
+use App\Models\Accessory;
+use App\Models\Category;
+use App\Models\Company;
+use App\Models\Location;
+use App\Models\Manufacturer;
+use App\Models\Supplier;
+use App\Models\User;
+use Tests\TestCase;
+
+class UpdateAccessoryTest extends TestCase
+{
+    public function testRequiresPermissionToSeeEditAccessoryPage()
+    {
+        $this->actingAs(User::factory()->create())
+            ->get(route('accessories.edit', Accessory::factory()->create()))
+            ->assertForbidden();
+    }
+
+    public function testEditAccessoryPageRenders()
+    {
+        $this->actingAs(User::factory()->editAccessories()->create())
+            ->get(route('accessories.edit', Accessory::factory()->create()->id))
+            ->assertOk()
+            ->assertViewIs('accessories.edit');
+    }
+
+    public function testDoesNotShowEditAccessoryPageFromAnotherCompany()
+    {
+        $this->settings->enableMultipleFullCompanySupport();
+
+        [$companyA, $companyB] = Company::factory()->count(2)->create();
+        $accessoryForCompanyA = Accessory::factory()->for($companyA)->create();
+        $userForCompanyB = User::factory()->for($companyB)->editAccessories()->create();
+
+        $this->actingAs($userForCompanyB)
+            ->get(route('accessories.edit', $accessoryForCompanyA->id))
+            ->assertRedirect(route('accessories.index'));
+    }
+
+    public function testCannotSetQuantityToAmountLowerThanWhatIsCheckedOut()
+    {
+        $accessory = Accessory::factory()->create(['qty' => 2]);
+        $accessory->checkouts()->create(['assigned_to' => User::factory()->create()->id, 'qty' => 1]);
+        $accessory->checkouts()->create(['assigned_to' => User::factory()->create()->id, 'qty' => 1]);
+
+        $this->assertEquals(2, $accessory->checkouts->count());
+
+        $this->actingAs(User::factory()->editAccessories()->create())
+            ->put(route('accessories.update', $accessory), [
+                'redirect_option' => 'index',
+                'company_id' => (string) $accessory->company_id,
+                'name' => $accessory->name,
+                'category_id' => (string) $accessory->category_id,
+                'supplier_id' => (string) $accessory->supplier_id,
+                'manufacturer_id' => (string) $accessory->manufacturer_id,
+                'location_id' => (string) $accessory->location_id,
+                'model_number' => $accessory->model_number,
+                'order_number' => $accessory->order_number,
+                'purchase_date' => $accessory->purchase_date,
+                'purchase_cost' => $accessory->purchase_cost,
+                'min_amt' => $accessory->min_amt,
+                'notes' => $accessory->notes,
+                // the important part...
+                // try to lower the qty to 1 when there are 2 checked out
+                'qty' => '1',
+            ]);
+    }
+
+    public function testCanUpdateAccessory()
+    {
+        [$companyA, $companyB] = Company::factory()->count(2)->create();
+        [$categoryA, $categoryB] = Category::factory()->count(2)->create();
+        [$supplierA, $supplierB] = Supplier::factory()->count(2)->create();
+        [$manufacturerA, $manufacturerB] = Manufacturer::factory()->count(2)->create();
+        [$locationA, $locationB] = Location::factory()->count(2)->create();
+
+        $accessory = Accessory::factory()
+            ->for($companyA)
+            ->for($categoryA)
+            ->for($supplierA)
+            ->for($manufacturerA)
+            ->for($locationA)
+            ->create([
+                'min_amt' => 1,
+                'qty' => 5
+            ]);
+
+        $this->actingAs(User::factory()->editAccessories()->create())
+            ->put(route('accessories.update', $accessory), [
+                'redirect_option' => 'index',
+                'company_id' => (string) $companyB->id,
+                'name' => 'Changed Name',
+                'category_id' => (string) $categoryB->id,
+                'supplier_id' => (string) $supplierB->id,
+                'manufacturer_id' => (string) $manufacturerB->id,
+                'location_id' => (string) $locationB->id,
+                'model_number' => 'changed 1234',
+                'order_number' => 'changed 5678',
+                'purchase_date' => '2024-10-11',
+                'purchase_cost' => '83.52',
+                'qty' => '7',
+                'min_amt' => '10',
+                'notes' => 'A new note',
+            ])
+            ->assertRedirect(route('accessories.index'));
+
+        $this->assertDatabaseHas('accessories', [
+            'company_id' => $companyB->id,
+            'name' => 'Changed Name',
+            'category_id' => $categoryB->id,
+            'supplier_id' => $supplierB->id,
+            'manufacturer_id' => $manufacturerB->id,
+            'location_id' => $locationB->id,
+            'model_number' => 'changed 1234',
+            'order_number' => 'changed 5678',
+            'purchase_date' => '2024-10-11',
+            'purchase_cost' => '83.52',
+            'qty' => '7',
+            'min_amt' => '10',
+            'notes' => 'A new note',
+        ]);
+    }
+}
diff --git a/tests/Feature/ApiRateLimitTest.php b/tests/Feature/ApiRateLimitTest.php
new file mode 100644
index 0000000000..b8bfdb40ae
--- /dev/null
+++ b/tests/Feature/ApiRateLimitTest.php
@@ -0,0 +1,63 @@
+<?php
+
+namespace Tests\Feature;
+
+use App\Models\User;
+use Tests\TestCase;
+
+class ApiRateLimitTest extends TestCase
+{
+
+    public function testRateLimit()
+    {
+        config(['app.api_throttle_per_minute' => 10]);
+        $this->actingAsForApi(User::factory()->create())
+            ->getJson(route('api.users.me'))
+            ->assertOk()
+            ->assertHeader('X-Ratelimit-Limit', config('app.api_throttle_per_minute'))
+            ->assertHeader('X-Ratelimit-Remaining', 9);
+    }
+
+    public function testRateLimitDecreasesRemaining()
+    {
+        config(['app.api_throttle_per_minute' => 5]);
+        $expected_remaining = (config('app.api_throttle_per_minute') - 1);
+        $admin = User::factory()->create();
+
+        for ($x = 0; $x < 5; $x++) {
+
+            $this->actingAsForApi($admin)
+                ->getJson(route('api.users.me'))
+                ->assertOk()
+                ->assertHeader('X-Ratelimit-Remaining', $expected_remaining--);
+
+        }
+
+        $this->actingAsForApi($admin)
+            ->getJson(route('api.users.me'))
+            ->assertStatus(429)
+            ->assertHeader('Retry-After', 60);
+    }
+
+    public function testRateLimitDecreasesRemainingOverSixty()
+    {
+        config(['app.api_throttle_per_minute' => 80]);
+        $expected_remaining = (config('app.api_throttle_per_minute') - 1);
+        $admin = User::factory()->create();
+
+        for ($x = 0; $x < 5; $x++) {
+
+            $this->actingAsForApi($admin)
+                ->getJson(route('api.users.me'))
+                ->assertOk()
+                ->assertHeader('X-Ratelimit-Remaining', $expected_remaining--);
+
+        }
+
+        $this->actingAsForApi($admin)
+            ->getJson(route('api.users.me'))
+            ->assertStatus(200)
+            ->assertHeader('Retry-After', 60);
+    }
+
+}
diff --git a/tests/Feature/AssetMaintenances/Api/DeleteAssetMaintenancesTest.php b/tests/Feature/AssetMaintenances/Api/DeleteAssetMaintenancesTest.php
new file mode 100644
index 0000000000..8a0189bc5b
--- /dev/null
+++ b/tests/Feature/AssetMaintenances/Api/DeleteAssetMaintenancesTest.php
@@ -0,0 +1,70 @@
+<?php
+
+namespace Tests\Feature\AssetMaintenances\Api;
+
+use App\Models\AssetMaintenance;
+use App\Models\Company;
+use App\Models\User;
+use Tests\Concerns\TestsFullMultipleCompaniesSupport;
+use Tests\Concerns\TestsPermissionsRequirement;
+use Tests\TestCase;
+
+class DeleteAssetMaintenancesTest extends TestCase implements TestsFullMultipleCompaniesSupport, TestsPermissionsRequirement
+{
+    public function testRequiresPermission()
+    {
+        $assetMaintenance = AssetMaintenance::factory()->create();
+
+        $this->actingAsForApi(User::factory()->create())
+            ->deleteJson(route('api.maintenances.destroy', $assetMaintenance))
+            ->assertForbidden();
+
+        $this->assertNotSoftDeleted($assetMaintenance);
+    }
+
+    public function testAdheresToFullMultipleCompaniesSupportScoping()
+    {
+        [$companyA, $companyB] = Company::factory()->count(2)->create();
+
+        $assetMaintenanceA = AssetMaintenance::factory()->create();
+        $assetMaintenanceB = AssetMaintenance::factory()->create();
+        $assetMaintenanceC = AssetMaintenance::factory()->create();
+
+        $assetMaintenanceA->asset->update(['company_id' => $companyA->id]);
+        $assetMaintenanceB->asset->update(['company_id' => $companyB->id]);
+        $assetMaintenanceC->asset->update(['company_id' => $companyB->id]);
+
+        $superUser = $companyA->users()->save(User::factory()->superuser()->make());
+        $userInCompanyA = $companyA->users()->save(User::factory()->editAssets()->make());
+        $userInCompanyB = $companyB->users()->save(User::factory()->editAssets()->make());
+
+        $this->settings->enableMultipleFullCompanySupport();
+
+        $this->actingAsForApi($userInCompanyA)
+            ->deleteJson(route('api.maintenances.destroy', $assetMaintenanceB))
+            ->assertStatusMessageIs('error');
+
+        $this->actingAsForApi($userInCompanyB)
+            ->deleteJson(route('api.maintenances.destroy', $assetMaintenanceA))
+            ->assertStatusMessageIs('error');
+
+        $this->actingAsForApi($superUser)
+            ->deleteJson(route('api.maintenances.destroy', $assetMaintenanceC))
+            ->assertStatusMessageIs('success');
+
+        $this->assertNotSoftDeleted($assetMaintenanceA);
+        $this->assertNotSoftDeleted($assetMaintenanceB);
+        $this->assertSoftDeleted($assetMaintenanceC);
+    }
+
+    public function testCanDeleteAssetMaintenance()
+    {
+        $assetMaintenance = AssetMaintenance::factory()->create();
+
+        $this->actingAsForApi(User::factory()->editAssets()->create())
+            ->deleteJson(route('api.maintenances.destroy', $assetMaintenance))
+            ->assertStatusMessageIs('success');
+
+        $this->assertSoftDeleted($assetMaintenance);
+    }
+}
diff --git a/tests/Feature/AssetMaintenances/Ui/AssetMaintenanceIndexTest.php b/tests/Feature/AssetMaintenances/Ui/AssetMaintenanceIndexTest.php
new file mode 100644
index 0000000000..4f87690008
--- /dev/null
+++ b/tests/Feature/AssetMaintenances/Ui/AssetMaintenanceIndexTest.php
@@ -0,0 +1,16 @@
+<?php
+
+namespace Tests\Feature\AssetMaintenances\Ui;
+
+use App\Models\User;
+use Tests\TestCase;
+
+class AssetMaintenanceIndexTest extends TestCase
+{
+    public function testPageRenders()
+    {
+        $this->actingAs(User::factory()->superuser()->create())
+            ->get(route('maintenances.index'))
+            ->assertOk();
+    }
+}
diff --git a/tests/Feature/AssetMaintenances/Ui/CreateAssetMaintenanceTest.php b/tests/Feature/AssetMaintenances/Ui/CreateAssetMaintenanceTest.php
new file mode 100644
index 0000000000..23227c7e6a
--- /dev/null
+++ b/tests/Feature/AssetMaintenances/Ui/CreateAssetMaintenanceTest.php
@@ -0,0 +1,56 @@
+<?php
+
+namespace Tests\Feature\AssetMaintenances\Ui;
+
+use App\Models\Asset;
+use App\Models\Supplier;
+use App\Models\User;
+use Tests\TestCase;
+
+class CreateAssetMaintenanceTest extends TestCase
+{
+    public function testPageRenders()
+    {
+        $this->actingAs(User::factory()->superuser()->create())
+            ->get(route('maintenances.create'))
+            ->assertOk();
+    }
+
+
+    public function testCanCreateAssetMaintenance()
+    {
+        $actor = User::factory()->superuser()->create();
+
+        $asset = Asset::factory()->create();
+        $supplier = Supplier::factory()->create();
+
+        $this->actingAs($actor)
+            ->followingRedirects()
+            ->post(route('maintenances.store'), [
+                'title' => 'Test Maintenance',
+                'selected_assets' => [$asset->id],
+                'supplier_id' => $supplier->id,
+                'asset_maintenance_type' => 'Maintenance',
+                'start_date' => '2021-01-01',
+                'completion_date' => '2021-01-10',
+                'is_warranty' => '1',
+                'cost' => '100.00',
+                'notes' => 'A note',
+            ])
+            ->assertOk();
+
+        $this->assertDatabaseHas('asset_maintenances', [
+            'asset_id' => $asset->id,
+            'supplier_id' => $supplier->id,
+            'asset_maintenance_type' => 'Maintenance',
+            'title' => 'Test Maintenance',
+            'is_warranty' => 1,
+            'start_date' => '2021-01-01',
+            'completion_date' => '2021-01-10',
+            'asset_maintenance_time' => '9',
+            'notes' => 'A note',
+            'cost' => '100.00',
+            'created_by' => $actor->id,
+        ]);
+    }
+}
diff --git a/tests/Feature/AssetMaintenances/Ui/EditAssetMaintenanceTest.php b/tests/Feature/AssetMaintenances/Ui/EditAssetMaintenanceTest.php
new file mode 100644
index 0000000000..a622a5dec7
--- /dev/null
+++ b/tests/Feature/AssetMaintenances/Ui/EditAssetMaintenanceTest.php
@@ -0,0 +1,57 @@
+<?php
+
+namespace Tests\Feature\AssetMaintenances\Ui;
+
+use App\Models\Asset;
+use App\Models\AssetMaintenance;
+use App\Models\Supplier;
+use App\Models\User;
+use Tests\TestCase;
+
+class EditAssetMaintenanceTest extends TestCase
+{
+    public function testPageRenders()
+    {
+        $this->actingAs(User::factory()->superuser()->create())
+            ->get(route('maintenances.edit', AssetMaintenance::factory()->create()->id))
+            ->assertOk();
+    }
+
+    public function testCanUpdateAssetMaintenance()
+    {
+        $actor = User::factory()->superuser()->create();
+        $asset = Asset::factory()->create();
+        $assetMaintenance = AssetMaintenance::factory()->create(['asset_id' => $asset]);
+        $supplier = Supplier::factory()->create();
+
+        $this->actingAs($actor)
+            ->followingRedirects()
+            ->put(route('maintenances.update', $assetMaintenance), [
+                'title' => 'Test Maintenance',
+                'asset_id' => $asset->id,
+                'supplier_id' => $supplier->id,
+                'asset_maintenance_type' => 'Maintenance',
+                'start_date' => '2021-01-01',
+                'completion_date' => '2021-01-10',
+                'is_warranty' => 1,
+                'cost' => '100.99',
+                'notes' => 'A note',
+            ])
+            ->assertOk();
+
+
+        $this->assertDatabaseHas('asset_maintenances', [
+            'asset_id' => $asset->id,
+            'supplier_id' => $supplier->id,
+            'asset_maintenance_type' => 'Maintenance',
+            'title' => 'Test Maintenance',
+            'is_warranty' => 1,
+            'start_date' => '2021-01-01',
+            'completion_date' => '2021-01-10',
+            'asset_maintenance_time' => '9',
+            'notes' => 'A note',
+            'cost' => '100.99',
+        ]);
+    }
+
+}
diff --git a/tests/Feature/AssetMaintenances/Ui/ShowAssetMaintenanceTest.php b/tests/Feature/AssetMaintenances/Ui/ShowAssetMaintenanceTest.php
new file mode 100644
index 0000000000..da9ef8fa40
--- /dev/null
+++ b/tests/Feature/AssetMaintenances/Ui/ShowAssetMaintenanceTest.php
@@ -0,0 +1,17 @@
+<?php
+
+namespace Tests\Feature\AssetMaintenances\Ui;
+
+use App\Models\AssetMaintenance;
+use App\Models\User;
+use Tests\TestCase;
+
+class ShowAssetMaintenanceTest extends TestCase
+{
+    public function testPageRenders()
+    {
+        $this->actingAs(User::factory()->superuser()->create())
+            ->get(route('maintenances.show', AssetMaintenance::factory()->create()->id))
+            ->assertOk();
+    }
+}
diff --git a/tests/Feature/AssetModels/Api/AssetModelFilesTest.php b/tests/Feature/AssetModels/Api/AssetModelFilesTest.php
new file mode 100644
index 0000000000..d29ea4f002
--- /dev/null
+++ b/tests/Feature/AssetModels/Api/AssetModelFilesTest.php
@@ -0,0 +1,160 @@
+<?php
+
+namespace Tests\Feature\AssetModels\Api;
+
+use App\Models\AssetModel;
+use App\Models\User;
+use Illuminate\Http\UploadedFile;
+use Tests\TestCase;
+
+class AssetModelFilesTest extends TestCase
+{
+    public function testAssetModelApiAcceptsFileUpload()
+    {
+        // Upload a file to a model
+
+        // Create a model to work with
+        $model = AssetModel::factory()->count(1)->create();
+
+	// Create a superuser to run this as
+	$user = User::factory()->superuser()->create();
+
+	//Upload a file
+	$this->actingAsForApi($user)
+            ->post(
+               route('api.models.files.store', ['model_id' => $model[0]["id"]]), [
+		       'file' => [UploadedFile::fake()->create("test.jpg", 100)]
+	       ])
+	       ->assertOk();
+    }
+
+    public function testAssetModelApiListsFiles()
+    {
+        // List all files on a model
+        
+        // Create an model to work with
+        $model = AssetModel::factory()->count(1)->create();
+
+	// Create a superuser to run this as
+	$user = User::factory()->superuser()->create();
+
+	// List the files
+	$this->actingAsForApi($user)
+            ->getJson(
+		    route('api.models.files.index', ['model_id' => $model[0]["id"]]))
+                ->assertOk()
+                ->assertJsonStructure([
+                    'rows',
+                    'total',
+                ]);
+    }
+
+    public function testAssetModelApiDownloadsFile()
+    {
+        // Download a file from a model
+
+        // Create a model to work with
+        $model = AssetModel::factory()->count(1)->create();
+
+	// Create a superuser to run this as
+	$user = User::factory()->superuser()->create();
+
+	// Upload a file
+	$this->actingAsForApi($user)
+            ->post(
+               route('api.models.files.store', ['model_id' => $model[0]["id"]]), [
+		       'file' => [UploadedFile::fake()->create("test.jpg", 100)],
+	       ])
+            ->assertOk()
+            ->assertJsonStructure([
+                'status',
+                'messages',
+            ]);
+
+    // Upload a file with notes
+    $this->actingAsForApi($user)
+            ->post(
+                route('api.models.files.store', ['model_id' => $model[0]["id"]]), [
+                'file' => [UploadedFile::fake()->create("test.jpg", 100)],
+                'notes' => 'manual'
+	       ])
+            ->assertOk()
+            ->assertJsonStructure([
+                'status',
+                'messages',
+            ]);
+
+	// List the files to get the file ID
+	$result = $this->actingAsForApi($user)
+            ->getJson(
+		    route('api.models.files.index', ['model_id' => $model[0]["id"]]))
+            ->assertOk()
+            ->assertJsonStructure([
+                'total',
+                'rows'=>[
+                    '*' => [
+                        'id',
+                        'filename',
+                        'url',
+                        'created_by',
+                        'created_at',
+                        'updated_at',
+                        'deleted_at',
+                        'note',
+                        'available_actions'
+                    ]
+                ]
+            ])
+            ->assertJsonPath('rows.0.note','')
+            ->assertJsonPath('rows.1.note','manual');
+
+
+
+	// Get the file
+	$this->actingAsForApi($user)
+            ->get(
+               route('api.models.files.show', [
+                   'model_id' => $model[0]["id"],
+                   'file_id' => $result->decodeResponseJson()->json()["rows"][0]["id"],
+	       ]))
+	       ->assertOk();
+    }
+
+    public function testAssetModelApiDeletesFile()
+    {
+        // Delete a file from a model
+
+        // Create a model to work with
+        $model = AssetModel::factory()->count(1)->create();
+
+	// Create a superuser to run this as
+	$user = User::factory()->superuser()->create();
+
+	//Upload a file
+	$this->actingAsForApi($user)
+            ->post(
+               route('api.models.files.store', ['model_id' => $model[0]["id"]]), [
+		       'file' => [UploadedFile::fake()->create("test.jpg", 100)]
+	       ])
+	       ->assertOk();
+
+	// List the files to get the file ID
+	$result = $this->actingAsForApi($user)
+            ->getJson(
+		    route('api.models.files.index', ['model_id' => $model[0]["id"]]))
+                ->assertOk();
+
+	// Delete the file
+	$this->actingAsForApi($user)
+            ->delete(
+               route('api.models.files.destroy', [
+                   'model_id' => $model[0]["id"],
+                   'file_id' => $result->decodeResponseJson()->json()["rows"][0]["id"],
+	       ]))
+	       ->assertOk()
+            ->assertJsonStructure([
+            'status',
+            'messages',
+        ]);
+    }
+}
diff --git a/tests/Feature/AssetModels/Api/CreateAssetModelsTest.php b/tests/Feature/AssetModels/Api/CreateAssetModelsTest.php
new file mode 100644
index 0000000000..2928d926f6
--- /dev/null
+++ b/tests/Feature/AssetModels/Api/CreateAssetModelsTest.php
@@ -0,0 +1,104 @@
+<?php
+
+namespace Tests\Feature\AssetModels\Api;
+
+use App\Models\AssetModel;
+use App\Models\Category;
+use App\Models\User;
+use Illuminate\Testing\Fluent\AssertableJson;
+use Tests\TestCase;
+
+class CreateAssetModelsTest extends TestCase
+{
+
+
+    public function testRequiresPermissionToCreateAssetModel()
+    {
+        $this->actingAsForApi(User::factory()->create())
+            ->postJson(route('api.models.store'))
+            ->assertForbidden();
+    }
+
+    public function testCanCreateAssetModelWithAssetModelType()
+    {
+        $response = $this->actingAsForApi(User::factory()->superuser()->create())
+            ->postJson(route('api.models.store'), [
+                'name' => 'Test AssetModel',
+                'category_id' => Category::factory()->assetLaptopCategory()->create()->id
+            ])
+            ->assertOk()
+            ->assertStatusMessageIs('success')
+            ->assertStatus(200)
+            ->json();
+
+        $this->assertTrue(AssetModel::where('name', 'Test AssetModel')->exists());
+
+        $model = AssetModel::find($response['payload']['id']);
+        $this->assertEquals('Test AssetModel', $model->name);
+    }
+
+    public function testCannotCreateAssetModelWithoutCategory()
+    {
+        $response = $this->actingAsForApi(User::factory()->superuser()->create())
+            ->postJson(route('api.models.store'), [
+                'name' => 'Test AssetModel',
+            ])
+            ->assertStatus(200)
+            ->assertOk()
+            ->assertStatusMessageIs('error')
+            ->assertJson([
+                'messages' => [
+                    'category_id'    => ['The category id field is required.'],
+                ],
+            ])
+            ->json();
+
+        $this->assertFalse(AssetModel::where('name', 'Test AssetModel')->exists());
+
+    }
+
+    public function testUniquenessAcrossModelNameAndModelNumber()
+    {
+        AssetModel::factory()->create(['name' => 'Test Model', 'model_number'=>'1234']);
+
+        $this->actingAsForApi(User::factory()->superuser()->create())
+            ->postJson(route('api.models.store'), [
+                'name' => 'Test Model',
+                'model_number' => '1234',
+                'category_id' => Category::factory()->assetLaptopCategory()->create()->id
+            ])
+            ->assertStatus(200)
+            ->assertOk()
+            ->assertStatusMessageIs('error')
+            ->assertJson([
+                'messages' => [
+                    'name'    => ['The name must be unique across models and model number. '],
+                    'model_number'    => ['The model number must be unique across models and name. '],
+                ],
+            ])
+            ->json();
+
+    }
+
+    public function testUniquenessAcrossModelNameAndModelNumberWithBlankModelNumber()
+    {
+        AssetModel::factory()->create(['name' => 'Test Model']);
+
+        $this->actingAsForApi(User::factory()->superuser()->create())
+            ->postJson(route('api.models.store'), [
+                'name' => 'Test Model',
+                'category_id' => Category::factory()->assetLaptopCategory()->create()->id
+            ])
+            ->assertStatus(200)
+            ->assertOk()
+            ->assertStatusMessageIs('error')
+            ->assertJson([
+                'messages' => [
+                    'name'    => ['The name must be unique across models and model number. '],
+                ],
+            ])
+            ->json();
+
+    }
+
+}
diff --git a/tests/Feature/AssetModels/Api/DeleteAssetModelsTest.php b/tests/Feature/AssetModels/Api/DeleteAssetModelsTest.php
new file mode 100644
index 0000000000..a079788651
--- /dev/null
+++ b/tests/Feature/AssetModels/Api/DeleteAssetModelsTest.php
@@ -0,0 +1,45 @@
+<?php
+
+namespace Tests\Feature\AssetModels\Api;
+
+use App\Models\Asset;
+use App\Models\AssetModel;
+use App\Models\User;
+use Tests\Concerns\TestsPermissionsRequirement;
+use Tests\TestCase;
+
+class DeleteAssetModelsTest extends TestCase implements TestsPermissionsRequirement
+{
+    public function testRequiresPermission()
+    {
+        $assetModel = AssetModel::factory()->create();
+
+        $this->actingAsForApi(User::factory()->create())
+            ->deleteJson(route('api.models.destroy', $assetModel))
+            ->assertForbidden();
+
+        $this->assertNotSoftDeleted($assetModel);
+    }
+
+    public function testCannotDeleteAssetModelThatStillHasAssociatedAssets()
+    {
+        $assetModel = Asset::factory()->create()->model;
+
+        $this->actingAsForApi(User::factory()->deleteAssetModels()->create())
+            ->deleteJson(route('api.models.destroy', $assetModel))
+            ->assertStatusMessageIs('error');
+
+        $this->assertNotSoftDeleted($assetModel);
+    }
+
+    public function testCanDeleteAssetModel()
+    {
+        $assetModel = AssetModel::factory()->create();
+
+        $this->actingAsForApi(User::factory()->deleteAssetModels()->create())
+            ->deleteJson(route('api.models.destroy', $assetModel))
+            ->assertStatusMessageIs('success');
+
+        $this->assertSoftDeleted($assetModel);
+    }
+}
diff --git a/tests/Feature/AssetModels/Api/IndexAssetModelsTest.php b/tests/Feature/AssetModels/Api/IndexAssetModelsTest.php
new file mode 100644
index 0000000000..26e4dd75b1
--- /dev/null
+++ b/tests/Feature/AssetModels/Api/IndexAssetModelsTest.php
@@ -0,0 +1,67 @@
+<?php
+
+namespace Tests\Feature\AssetModels\Api;
+
+use App\Models\Company;
+use App\Models\AssetModel;
+use App\Models\User;
+use Illuminate\Testing\Fluent\AssertableJson;
+use Tests\TestCase;
+
+class IndexAssetModelsTest extends TestCase
+{
+    public function testViewingAssetModelIndexRequiresAuthentication()
+    {
+        $this->getJson(route('api.models.index'))->assertRedirect();
+    }
+
+    public function testViewingAssetModelIndexRequiresPermission()
+    {
+        $this->actingAsForApi(User::factory()->create())
+            ->getJson(route('api.models.index'))
+            ->assertForbidden();
+    }
+
+    public function testAssetModelIndexReturnsExpectedAssetModels()
+    {
+        AssetModel::factory()->count(3)->create();
+
+        $this->actingAsForApi(User::factory()->superuser()->create())
+            ->getJson(
+                route('api.models.index', [
+                    'sort' => 'name',
+                    'order' => 'asc',
+                    'offset' => '0',
+                    'limit' => '20',
+                ]))
+            ->assertOk()
+            ->assertJsonStructure([
+                'total',
+                'rows',
+            ])
+            ->assertJson(fn(AssertableJson $json) => $json->has('rows', 3)->etc());
+    }
+
+    public function testAssetModelIndexSearchReturnsExpectedAssetModels()
+    {
+        AssetModel::factory()->count(3)->create();
+        AssetModel::factory()->count(1)->create(['name' => 'Test Model']);
+
+        $this->actingAsForApi(User::factory()->superuser()->create())
+            ->getJson(
+                route('api.models.index', [
+                    'search' => 'Test Model',
+                    'sort' => 'id',
+                    'order' => 'asc',
+                    'offset' => '0',
+                    'limit' => '20',
+                ]))
+            ->assertOk()
+            ->assertJsonStructure([
+                'total',
+                'rows',
+            ])
+            ->assertJson(fn(AssertableJson $json) => $json->has('rows', 1)->etc());
+    }
+
+}
diff --git a/tests/Feature/AssetModels/Api/UpdateAssetModelsTest.php b/tests/Feature/AssetModels/Api/UpdateAssetModelsTest.php
new file mode 100644
index 0000000000..c5ec212650
--- /dev/null
+++ b/tests/Feature/AssetModels/Api/UpdateAssetModelsTest.php
@@ -0,0 +1,120 @@
+<?php
+
+namespace Tests\Feature\AssetModels\Api;
+
+use App\Models\AssetModel;
+use App\Models\Category;
+use App\Models\User;
+use Tests\TestCase;
+
+class UpdateAssetModelsTest extends TestCase
+{
+
+    public function testRequiresPermissionToEditAssetModel()
+    {
+        $model = AssetModel::factory()->create();
+        $this->actingAsForApi(User::factory()->create())
+            ->patchJson(route('api.models.update', $model))
+            ->assertForbidden();
+    }
+
+    public function testCanUpdateAssetModelViaPatch()
+    {
+        $model = AssetModel::factory()->create();
+
+        $this->actingAsForApi(User::factory()->superuser()->create())
+            ->patchJson(route('api.models.update', $model), [
+                'name' => 'Test Model',
+                'category_id' => Category::factory()->forAssets()->create()->id,
+            ])
+            ->assertOk()
+            ->assertStatusMessageIs('success')
+            ->assertStatus(200)
+            ->json();
+
+        $model->refresh();
+        $this->assertEquals('Test Model', $model->name, 'Name was not updated');
+
+    }
+
+    public function testCannotUpdateAssetModelViaPatchWithAccessoryCategory()
+    {
+        $category = Category::factory()->forAccessories()->create();
+        $model = AssetModel::factory()->create();
+
+        $this->actingAsForApi(User::factory()->superuser()->create())
+            ->patchJson(route('api.models.update', $model), [
+                'name' => 'Test Model',
+                'category_id' => $category->id,
+            ])
+            ->assertOk()
+            ->assertStatusMessageIs('error')
+            ->assertStatus(200)
+            ->json();
+
+        $category->refresh();
+        $this->assertNotEquals('Test Model', $model->name, 'Name was not updated');
+        $this->assertNotEquals('category_id', $category->id, 'Category ID was not updated');
+    }
+
+    public function testCannotUpdateAssetModelViaPatchWithLicenseCategory()
+    {
+        $category = Category::factory()->forLicenses()->create();
+        $model = AssetModel::factory()->create();
+
+        $this->actingAsForApi(User::factory()->superuser()->create())
+            ->patchJson(route('api.models.update', $model), [
+                'name' => 'Test Model',
+                'category_id' => $category->id,
+            ])
+            ->assertOk()
+            ->assertStatusMessageIs('error')
+            ->assertStatus(200)
+            ->json();
+
+        $category->refresh();
+        $this->assertNotEquals('Test Model', $model->name, 'Name was not updated');
+        $this->assertNotEquals('category_id', $category->id, 'Category ID was not updated');
+    }
+
+    public function testCannotUpdateAssetModelViaPatchWithConsumableCategory()
+    {
+        $category = Category::factory()->forConsumables()->create();
+        $model = AssetModel::factory()->create();
+
+        $this->actingAsForApi(User::factory()->superuser()->create())
+            ->patchJson(route('api.models.update', $model), [
+                'name' => 'Test Model',
+                'category_id' => $category->id,
+            ])
+            ->assertOk()
+            ->assertStatusMessageIs('error')
+            ->assertStatus(200)
+            ->json();
+
+        $category->refresh();
+        $this->assertNotEquals('Test Model', $model->name, 'Name was not updated');
+        $this->assertNotEquals('category_id', $category->id, 'Category ID was not updated');
+    }
+
+    public function testCannotUpdateAssetModelViaPatchWithComponentCategory()
+    {
+        $category = Category::factory()->forComponents()->create();
+        $model = AssetModel::factory()->create();
+
+        $this->actingAsForApi(User::factory()->superuser()->create())
+            ->patchJson(route('api.models.update', $model), [
+                'name' => 'Test Model',
+                'category_id' => $category->id,
+            ])
+            ->assertOk()
+            ->assertStatusMessageIs('error')
+            ->assertStatus(200)
+            ->json();
+
+        $category->refresh();
+        $this->assertNotEquals('Test Model', $model->name, 'Name was not updated');
+        $this->assertNotEquals('category_id', $category->id, 'Category ID was not updated');
+    }
+
+}
diff --git a/tests/Feature/AssetModels/Ui/AssetModelStoreTest.php b/tests/Feature/AssetModels/Ui/AssetModelStoreTest.php
deleted file mode 100644
index 81b07237c0..0000000000
--- a/tests/Feature/AssetModels/Ui/AssetModelStoreTest.php
+++ /dev/null
@@ -1,35 +0,0 @@
-<?php
-
-namespace Tests\Feature\AssetModels\Ui;
-
-use App\Models\AssetModel;
-use App\Models\Category;
-use App\Models\User;
-use Tests\TestCase;
-
-class AssetModelStoreTest extends TestCase
-{
-    public function testPermissionRequiredToStoreAssetModel()
-    {
-        $this->actingAs(User::factory()->create())
-            ->post(route('models.store'), [
-                'name' => 'Test Model',
-                'category_id' => Category::factory()->create()->id
-            ])
-            ->assertForbidden();
-    }
-
-    public function testUserCanCreateAssetModels()
-    {
-        $this->assertFalse(AssetModel::where('name', 'Test Model')->exists());
-
-        $this->actingAs(User::factory()->superuser()->create())
-            ->post(route('models.store'), [
-                'name' => 'Test Model',
-                'category_id' => Category::factory()->create()->id
-            ])
-            ->assertRedirect(route('models.index'));
-
-        $this->assertTrue(AssetModel::where('name', 'Test Model')->exists());
-    }
-}
diff --git a/tests/Feature/AssetModels/Ui/CreateAssetModelsTest.php b/tests/Feature/AssetModels/Ui/CreateAssetModelsTest.php
new file mode 100644
index 0000000000..20772253a8
--- /dev/null
+++ b/tests/Feature/AssetModels/Ui/CreateAssetModelsTest.php
@@ -0,0 +1,104 @@
+<?php
+
+namespace Tests\Feature\AssetModels\Ui;
+
+use App\Models\AssetModel;
+use App\Models\Category;
+use App\Models\User;
+use Tests\TestCase;
+
+class CreateAssetModelsTest extends TestCase
+{
+    public function testPermissionRequiredToCreateAssetModel()
+    {
+        $this->actingAs(User::factory()->create())
+            ->post(route('models.store'), [
+                'name' => 'Test Model',
+                'category_id' => Category::factory()->create()->id
+            ])
+            ->assertForbidden();
+    }
+
+    public function testPageRenders()
+    {
+        $this->actingAs(User::factory()->superuser()->create())
+            ->get(route('models.create'))
+            ->assertOk();
+    }
+
+    public function testUserCanCreateAssetModels()
+    {
+        $this->assertFalse(AssetModel::where('name', 'Test Model')->exists());
+
+        $this->actingAs(User::factory()->superuser()->create())
+            ->from(route('models.create'))
+            ->post(route('models.store'), [
+                'name' => 'Test Model',
+                'category_id' => Category::factory()->create()->id
+            ])
+            ->assertRedirect(route('models.index'));
+
+        $this->assertTrue(AssetModel::where('name', 'Test Model')->exists());
+    }
+
+    public function testUserCannotUseAccessoryCategoryTypeAsAssetModelCategoryType()
+    {
+
+        $response = $this->actingAs(User::factory()->superuser()->create())
+            ->from(route('models.create'))
+            ->post(route('models.store'), [
+                'name' => 'Test Invalid Model Category',
+                'category_id' => Category::factory()->forAccessories()->create()->id
+            ]);
+        $response->assertStatus(302);
+        $response->assertRedirect(route('models.create'));
+        $response->assertInvalid(['category_type']);
+        $response->assertSessionHasErrors(['category_type']);
+        $this->followRedirects($response)->assertSee(trans('general.error'));
+        $this->assertFalse(AssetModel::where('name', 'Test Invalid Model Category')->exists());
+
+    }
+
+    public function testUniquenessAcrossModelNameAndModelNumber()
+    {
+
+        AssetModel::factory()->create(['name' => 'Test Model', 'model_number'=>'1234']);
+
+        $response = $this->actingAs(User::factory()->superuser()->create())
+            ->from(route('models.create'))
+            ->post(route('models.store'), [
+                'name' => 'Test Model',
+                'model_number' => '1234',
+                'category_id' => Category::factory()->create()->id
+            ])
+            ->assertStatus(302)
+            ->assertSessionHasErrors(['name','model_number'])
+            ->assertRedirect(route('models.create'))
+            ->assertInvalid(['name','model_number']);
+
+        $this->followRedirects($response)->assertSee(trans('general.error'));
+
+    }
+
+    public function testUniquenessAcrossModelNameAndModelNumberWithoutModelNumber()
+    {
+
+        AssetModel::factory()->create(['name' => 'Test Model', 'model_number'=> null]);
+
+        $response = $this->actingAs(User::factory()->superuser()->create())
+            ->from(route('models.create'))
+            ->post(route('models.store'), [
+                'name' => 'Test Model',
+                'model_number' => null,
+                'category_id' => Category::factory()->create()->id
+            ])
+            ->assertStatus(302)
+            ->assertSessionHasErrors(['name'])
+            ->assertRedirect(route('models.create'))
+            ->assertInvalid(['name']);
+
+        $this->followRedirects($response)->assertSee(trans('general.error'));
+
+    }
+
+}
diff --git a/tests/Feature/AssetModels/Ui/AssetModelIndexTest.php b/tests/Feature/AssetModels/Ui/IndexAssetModelsTest.php
similarity index 91%
rename from tests/Feature/AssetModels/Ui/AssetModelIndexTest.php
rename to tests/Feature/AssetModels/Ui/IndexAssetModelsTest.php
index a73d425723..495de30f0a 100644
--- a/tests/Feature/AssetModels/Ui/AssetModelIndexTest.php
+++ b/tests/Feature/AssetModels/Ui/IndexAssetModelsTest.php
@@ -5,7 +5,7 @@ namespace Tests\Feature\AssetModels\Ui;
 use App\Models\User;
 use Tests\TestCase;
 
-class AssetModelIndexTest extends TestCase
+class IndexAssetModelsTest extends TestCase
 {
     public function testPermissionRequiredToViewAssetModelList()
     {
diff --git a/tests/Feature/AssetModels/Ui/ShowAssetModelsTest.php b/tests/Feature/AssetModels/Ui/ShowAssetModelsTest.php
new file mode 100644
index 0000000000..739112f59e
--- /dev/null
+++ b/tests/Feature/AssetModels/Ui/ShowAssetModelsTest.php
@@ -0,0 +1,17 @@
+<?php
+
+namespace Tests\Feature\AssetModels\Ui;
+
+use App\Models\AssetModel;
+use App\Models\User;
+use Tests\TestCase;
+
+class ShowAssetModelsTest extends TestCase
+{
+    public function testPageRenders()
+    {
+        $this->actingAs(User::factory()->superuser()->create())
+            ->get(route('models.show', AssetModel::factory()->create()))
+            ->assertOk();
+    }
+}
diff --git a/tests/Feature/AssetModels/Ui/UpdateAssetModelsTest.php b/tests/Feature/AssetModels/Ui/UpdateAssetModelsTest.php
new file mode 100644
index 0000000000..6fdd1bbcfc
--- /dev/null
+++ b/tests/Feature/AssetModels/Ui/UpdateAssetModelsTest.php
@@ -0,0 +1,140 @@
+<?php
+
+namespace Tests\Feature\AssetModels\Ui;
+
+use App\Models\AssetModel;
+use App\Models\Category;
+use App\Models\CustomField;
+use App\Models\CustomFieldset;
+use App\Models\User;
+use Tests\TestCase;
+
+class UpdateAssetModelsTest extends TestCase
+{
+    public function testPermissionRequiredToStoreAssetModel()
+    {
+        $this->actingAs(User::factory()->create())
+            ->put(route('models.update', ['model' => AssetModel::factory()->create()]), [
+                'name' => 'Changed Name',
+                'category_id' => Category::factory()->create()->id,
+            ])
+            ->assertForbidden();
+    }
+
+    public function testPageRenders()
+    {
+        $this->actingAs(User::factory()->superuser()->create())
+            ->get(route('models.edit', AssetModel::factory()->create()))
+            ->assertOk();
+    }
+
+    public function testUserCanEditAssetModels()
+    {
+        $category = Category::factory()->forAssets()->create();
+        $model = AssetModel::factory()->create(['name' => 'Test Model', 'category_id' => $category->id]);
+        $this->assertTrue(AssetModel::where('name', 'Test Model')->exists());
+
+        $response = $this->actingAs(User::factory()->superuser()->create())
+            ->put(route('models.update', ['model' => $model]), [
+                'name' => 'Test Model Edited',
+                'category_id' => $model->category_id,
+            ])
+            ->assertStatus(302)
+            ->assertSessionHasNoErrors()
+            ->assertRedirect(route('models.index'));
+
+        $this->followRedirects($response)->assertSee('Success');
+        $this->assertTrue(AssetModel::where('name', 'Test Model Edited')->exists());
+
+    }
+
+    public function testUserCannotChangeAssetModelCategoryType()
+    {
+        $category = Category::factory()->forAssets()->create();
+        $model = AssetModel::factory()->create(['name' => 'Test Model', 'category_id' => $category->id]);
+        $this->assertTrue(AssetModel::where('name', 'Test Model')->exists());
+
+        $response = $this->actingAs(User::factory()->superuser()->create())
+            ->from(route('models.edit', $model))
+            ->put(route('models.update', $model), [
+                'name' => 'Test Model Edited',
+                'category_id' => Category::factory()->forAccessories()->create()->id,
+            ])
+            ->assertSessionHasErrors(['category_type'])
+            ->assertInvalid(['category_type'])
+            ->assertStatus(302)
+            ->assertRedirect(route('models.edit', $model));
+
+        $this->followRedirects($response)->assertSee(trans('general.error'));
+        $this->assertFalse(AssetModel::where('name', 'Test Model Edited')->exists());
+
+    }
+
+    public function test_default_values_remain_unchanged_after_validation_error_occurs()
+    {
+        $this->markIncompleteIfMySQL('Custom Field Tests do not work in MySQL');
+
+        $assetModel = AssetModel::factory()->create();
+        $customFieldset = CustomFieldset::factory()->create();
+        [$customFieldOne, $customFieldTwo] = CustomField::factory()->count(2)->create();
+
+        $customFieldset->fields()->attach($customFieldOne, ['order' => 1, 'required' => false]);
+        $customFieldset->fields()->attach($customFieldTwo, ['order' => 2, 'required' => false]);
+
+        $assetModel->fieldset()->associate($customFieldset);
+
+        $assetModel->defaultValues()->attach($customFieldOne, ['default_value' => 'first default value']);
+        $assetModel->defaultValues()->attach($customFieldTwo, ['default_value' => 'second default value']);
+
+        $this->actingAs(User::factory()->superuser()->create())
+            ->put(route('models.update', ['model' => $assetModel]), [
+                // should trigger validation error without name, etc, and NOT remove or change default values
+                'add_default_values' => '1',
+                'fieldset_id' => $customFieldset->id,
+                'default_values' => [
+                    $customFieldOne->id => 'first changed value',
+                    $customFieldTwo->id => 'second changed value',
+                ],
+            ]);
+
+        $potentiallyChangedDefaultValues = $assetModel->defaultValues->pluck('pivot.default_value');
+        $this->assertCount(2, $potentiallyChangedDefaultValues);
+        $this->assertContains('first default value', $potentiallyChangedDefaultValues);
+        $this->assertContains('second default value', $potentiallyChangedDefaultValues);
+    }
+
+    public function test_default_values_can_be_updated()
+    {
+        $this->markIncompleteIfMySQL('Custom Field Tests do not work in MySQL');
+
+        $assetModel = AssetModel::factory()->create();
+        $customFieldset = CustomFieldset::factory()->create();
+        [$customFieldOne, $customFieldTwo] = CustomField::factory()->count(2)->create();
+
+        $customFieldset->fields()->attach($customFieldOne, ['order' => 1, 'required' => false]);
+        $customFieldset->fields()->attach($customFieldTwo, ['order' => 2, 'required' => false]);
+
+        $assetModel->fieldset()->associate($customFieldset);
+
+        $assetModel->defaultValues()->attach($customFieldOne, ['default_value' => 'first default value']);
+        $assetModel->defaultValues()->attach($customFieldTwo, ['default_value' => 'second default value']);
+
+        $this->actingAs(User::factory()->superuser()->create())
+            ->put(route('models.update', ['model' => $assetModel]), [
+                // should trigger validation error without name, etc, and NOT remove or change default values
+                'name' => 'Test Model Edited',
+                'category_id' => $assetModel->category_id,
+                'add_default_values' => '1',
+                'fieldset_id' => $customFieldset->id,
+                'default_values' => [
+                    $customFieldOne->id => 'first changed value',
+                    $customFieldTwo->id => 'second changed value',
+                ],
+            ]);
+
+        $potentiallyChangedDefaultValues = $assetModel->defaultValues->pluck('pivot.default_value');
+        $this->assertCount(2, $potentiallyChangedDefaultValues);
+        $this->assertContains('first changed value', $potentiallyChangedDefaultValues);
+        $this->assertContains('second changed value', $potentiallyChangedDefaultValues);
+    }
+}
diff --git a/tests/Feature/Assets/Api/AssetFilesTest.php b/tests/Feature/Assets/Api/AssetFilesTest.php
index 199c67e118..3e3e576c25 100644
--- a/tests/Feature/Assets/Api/AssetFilesTest.php
+++ b/tests/Feature/Assets/Api/AssetFilesTest.php
@@ -16,13 +16,13 @@ class AssetFilesTest extends TestCase
         // Create an asset to work with
         $asset = Asset::factory()->count(1)->create();
 
-	// Create a superuser to run this as
-	$user = User::factory()->superuser()->create();
+        // Create a superuser to run this as
+        $user = User::factory()->superuser()->create();
 
-	//Upload a file
-	$this->actingAsForApi($user)
+        //Upload a file
+        $this->actingAsForApi($user)
             ->post(
-               route('api.assets.files', ['asset_id' => $asset[0]["id"]]), [
+               route('api.assets.files.store', $asset), [
 		       'file' => [UploadedFile::fake()->create("test.jpg", 100)]
 	       ])
 	       ->assertOk();
@@ -35,19 +35,17 @@ class AssetFilesTest extends TestCase
         // Create an asset to work with
         $asset = Asset::factory()->count(1)->create();
 
-	// Create a superuser to run this as
-	$user = User::factory()->superuser()->create();
+        // Create a superuser to run this as
+        $user = User::factory()->superuser()->create();
 
-	// List the files
-	$this->actingAsForApi($user)
-            ->getJson(
-		    route('api.assets.files', ['asset_id' => $asset[0]["id"]]))
+        // List the files
+        $this->actingAsForApi($user)
+            ->getJson(route('api.assets.files.index', $asset))
                 ->assertOk()
-		->assertJsonStructure([
-                    'status',
-		    'messages',
-		    'payload',
-		]);
+		        ->assertJsonStructure([
+                    'rows',
+                    'total',
+		    ]);
     }
 
     public function testAssetApiDownloadsFile()
@@ -57,31 +55,20 @@ class AssetFilesTest extends TestCase
         // Create an asset to work with
         $asset = Asset::factory()->count(1)->create();
 
-	// Create a superuser to run this as
-	$user = User::factory()->superuser()->create();
+        // Create a superuser to run this as
+        $user = User::factory()->superuser()->create();
 
-	//Upload a file
-	$this->actingAsForApi($user)
-            ->post(
-               route('api.assets.files', ['asset_id' => $asset[0]["id"]]), [
+        //Upload a file
+        $this->actingAsForApi($user)
+            ->post(route('api.assets.files.store', $asset), [
 		       'file' => [UploadedFile::fake()->create("test.jpg", 100)]
-	       ])
-	       ->assertOk();
+	         ])
+            ->assertOk();
 
-	// List the files to get the file ID
-	$result = $this->actingAsForApi($user)
-            ->getJson(
-		    route('api.assets.files', ['asset_id' => $asset[0]["id"]]))
-                ->assertOk();
-
-	// Get the file
-	$this->actingAsForApi($user)
-            ->get(
-               route('api.assets.file', [
-                   'asset_id' => $asset[0]["id"],
-                   'file_id' => $result->decodeResponseJson()->json()["payload"][0]["id"],
-	       ]))
-	       ->assertOk();
+        // List the files to get the file ID
+        $result = $this->actingAsForApi($user)
+            ->getJson(route('api.assets.files.index', $asset))
+            ->assertOk();
     }
 
     public function testAssetApiDeletesFile()
@@ -91,30 +78,22 @@ class AssetFilesTest extends TestCase
         // Create an asset to work with
         $asset = Asset::factory()->count(1)->create();
 
-	// Create a superuser to run this as
-	$user = User::factory()->superuser()->create();
+        // Create a superuser to run this as
+        $user = User::factory()->superuser()->create();
 
-	//Upload a file
-	$this->actingAsForApi($user)
+        //Upload a file
+        $this->actingAsForApi($user)
             ->post(
-               route('api.assets.files', ['asset_id' => $asset[0]["id"]]), [
+               route('api.assets.files.store', $asset), [
 		       'file' => [UploadedFile::fake()->create("test.jpg", 100)]
 	       ])
 	       ->assertOk();
 
-	// List the files to get the file ID
-	$result = $this->actingAsForApi($user)
+        // List the files to get the file ID
+        $result = $this->actingAsForApi($user)
             ->getJson(
-		    route('api.assets.files', ['asset_id' => $asset[0]["id"]]))
+		    route('api.assets.files.index', $asset))
                 ->assertOk();
-
-	// Delete the file
-	$this->actingAsForApi($user)
-            ->delete(
-               route('api.assets.file', [
-                   'asset_id' => $asset[0]["id"],
-                   'file_id' => $result->decodeResponseJson()->json()["payload"][0]["id"],
-	       ]))
-	       ->assertOk();
+        
     }
 }
diff --git a/tests/Feature/Assets/Api/AssetIndexTest.php b/tests/Feature/Assets/Api/AssetIndexTest.php
index c4a362d28b..8554edb3d4 100644
--- a/tests/Feature/Assets/Api/AssetIndexTest.php
+++ b/tests/Feature/Assets/Api/AssetIndexTest.php
@@ -83,7 +83,7 @@ class AssetIndexTest extends TestCase
 
     public function testAssetApiIndexReturnsDueForExpectedCheckin()
     {
-        Asset::factory()->count(3)->create(['assigned_to' => '1', 'expected_checkin' => Carbon::now()->format('Y-m-d')]);
+        Asset::factory()->count(3)->create(['assigned_to' => '1', 'assigned_type' => User::class, 'expected_checkin' => Carbon::now()->format('Y-m-d')]);
         
         $this->actingAsForApi(User::factory()->superuser()->create())
             ->getJson(
@@ -99,7 +99,7 @@ class AssetIndexTest extends TestCase
 
     public function testAssetApiIndexReturnsOverdueForExpectedCheckin()
     {
-        Asset::factory()->count(3)->create(['assigned_to' => '1', 'expected_checkin' => Carbon::now()->subDays(1)->format('Y-m-d')]);
+        Asset::factory()->count(3)->create(['assigned_to' => '1', 'assigned_type' => User::class, 'expected_checkin' => Carbon::now()->subDays(1)->format('Y-m-d')]);
         
         $this->actingAsForApi(User::factory()->superuser()->create())
             ->getJson(route('api.assets.list-upcoming', ['action' => 'checkins', 'upcoming_status' => 'overdue']))
@@ -113,8 +113,8 @@ class AssetIndexTest extends TestCase
 
     public function testAssetApiIndexReturnsDueOrOverdueForExpectedCheckin()
     {
-        Asset::factory()->count(3)->create(['assigned_to' => '1', 'expected_checkin' => Carbon::now()->subDays(1)->format('Y-m-d')]);
-        Asset::factory()->count(2)->create(['assigned_to' => '1', 'expected_checkin' => Carbon::now()->format('Y-m-d')]);
+        Asset::factory()->count(3)->create(['assigned_to' => '1', 'assigned_type' => User::class, 'expected_checkin' => Carbon::now()->subDays(1)->format('Y-m-d')]);
+        Asset::factory()->count(2)->create(['assigned_to' => '1', 'assigned_type' => User::class, 'expected_checkin' => Carbon::now()->format('Y-m-d')]);
         
         $this->actingAsForApi(User::factory()->superuser()->create())
             ->getJson(route('api.assets.list-upcoming', ['action' => 'checkins', 'upcoming_status' => 'due-or-overdue']))
diff --git a/tests/Feature/Assets/Api/AuditAssetTest.php b/tests/Feature/Assets/Api/AuditAssetTest.php
new file mode 100644
index 0000000000..f93a65ae6d
--- /dev/null
+++ b/tests/Feature/Assets/Api/AuditAssetTest.php
@@ -0,0 +1,78 @@
+<?php
+
+namespace Tests\Feature\Assets\Api;
+
+use App\Models\Asset;
+use App\Models\AssetModel;
+use App\Models\Company;
+use App\Models\Location;
+use App\Models\Statuslabel;
+use App\Models\Supplier;
+use App\Models\User;
+use App\Models\CustomField;
+use Illuminate\Support\Facades\Crypt;
+use Tests\TestCase;
+
+class AuditAssetTest extends TestCase
+{
+    public function testThatANonExistentAssetIdReturnsError()
+    {
+        $this->actingAsForApi(User::factory()->auditAssets()->create())
+            ->postJson(route('api.asset.audit', 123456789))
+            ->assertStatusMessageIs('error');
+    }
+
+    public function testRequiresPermissionToAuditAsset()
+    {
+        $asset = Asset::factory()->create();
+        $this->actingAsForApi(User::factory()->create())
+            ->postJson(route('api.asset.audit', $asset))
+            ->assertForbidden();
+    }
+
+    public function testLegacyAssetAuditIsSaved()
+    {
+        $asset = Asset::factory()->create();
+        $this->actingAsForApi(User::factory()->auditAssets()->create())
+            ->postJson(route('api.asset.audit.legacy'), [
+                'asset_tag' => $asset->asset_tag,
+                'note' => 'test',
+            ])
+            ->assertStatusMessageIs('success')
+            ->assertJson(
+                [
+                    'messages' =>trans('admin/hardware/message.audit.success'),
+                    'payload' => [
+                        'id' => $asset->id,
+                        'asset_tag' => $asset->asset_tag,
+                        'note' => 'test'
+                    ],
+                ])
+            ->assertStatus(200);
+
+    }
+
+
+    public function testAssetAuditIsSaved()
+    {
+        $asset = Asset::factory()->create();
+        $this->actingAsForApi(User::factory()->auditAssets()->create())
+            ->postJson(route('api.asset.audit', $asset), [
+                'note' => 'test'
+            ])
+            ->assertStatusMessageIs('success')
+            ->assertJson(
+                [
+                    'messages' =>trans('admin/hardware/message.audit.success'),
+                    'payload' => [
+                        'id' => $asset->id,
+                        'asset_tag' => $asset->asset_tag,
+                        'note' => 'test'
+                    ],
+                ])
+            ->assertStatus(200);
+
+    }
+
+
+}
diff --git a/tests/Feature/Assets/Api/CheckinCheckoutCounters.php b/tests/Feature/Assets/Api/CheckinCheckoutCounters.php
new file mode 100644
index 0000000000..82309586e0
--- /dev/null
+++ b/tests/Feature/Assets/Api/CheckinCheckoutCounters.php
@@ -0,0 +1,81 @@
+<?php
+
+namespace Tests\Feature\Assets\Api;
+
+use App\Models\Asset;
+use App\Models\AssetModel;
+use App\Models\Statuslabel;
+use App\Models\User;
+use PHPUnit\Framework\Attributes\Test;
+use Tests\TestCase;
+
+/**
+ * You could argue that this should go somewhere else - that'd be fair.
+ * But, as of now, the only way to properly ensure that the counters are set properly
+ * is to directly hit the app. So that's what this does - via API.
+ */
+class CheckinCheckoutCounters extends TestCase
+{
+    #[Test]
+    function counters()
+    {
+        //make an admin who can check in and out stuff
+        $admin = User::factory()->superuser()->create();
+
+        //make a user
+        $user = User::factory()->create();
+
+        //need a model for the asset
+        $model = AssetModel::factory()->create();
+
+        //need a status for the asset, too
+        $status = Statuslabel::factory()->readyToDeploy()->create();
+
+
+        //make an asset using the API (this is for the API after all!)
+        $response = $this->actingAsForApi($admin)
+            ->postJson(route('api.assets.store'), [
+                'asset_tag' => 'random_string',
+                'model_id' => $model->id,
+                'status_id' => $status->id,
+            ])->assertOk()
+            ->assertStatusMessageIs('success')
+            ->json();
+        \Log::error(print_r($response, true));
+
+        //check the counters
+        $asset = Asset::find($response['payload']['id']);
+        $this->assertEquals(0, $asset->checkin_counter);
+        $this->assertEquals(0, $asset->checkout_counter);
+
+        //do a checkout
+        $this->actingAsForApi($admin)
+            ->postJson(route('api.asset.checkout', $asset), [
+                'checkout_to_type' => 'user',
+                'assigned_user' => $user->id,
+                'checkout_at' => '2024-04-01',
+                'expected_checkin' => '2024-04-08',
+                'name' => 'Changed Name',
+                'note' => 'Here is a cool note!',
+            ])
+            ->assertOk();
+
+        $asset->refresh();
+        //check the counters. both.
+        $this->assertEquals(0, $asset->checkin_counter);
+        $this->assertEquals(1, $asset->checkout_counter); //why does _this_ fail?!
+
+        //do a checkin
+        $this->actingAsForApi(User::factory()->checkinAssets()->create())
+            ->postJson(route('api.asset.checkin', $asset), [
+                'name' => 'Changed Name',
+                'status_id' => $status->id,
+            ])
+            ->assertOk();
+
+        //check the counters, again.
+        $asset->refresh();
+        $this->assertEquals(1, $asset->checkin_counter); //wait, _this_ fails too?! WTH?
+        $this->assertEquals(1, $asset->checkout_counter); //okay, _nothing_ works. Now I'm confused.
+    }
+}
diff --git a/tests/Feature/Assets/Api/DeleteAssetsTest.php b/tests/Feature/Assets/Api/DeleteAssetsTest.php
new file mode 100644
index 0000000000..5a017e0f5d
--- /dev/null
+++ b/tests/Feature/Assets/Api/DeleteAssetsTest.php
@@ -0,0 +1,71 @@
+<?php
+
+namespace Tests\Feature\Assets\Api;
+
+use App\Models\Asset;
+use App\Models\Company;
+use App\Models\User;
+use Tests\Concerns\TestsFullMultipleCompaniesSupport;
+use Tests\Concerns\TestsPermissionsRequirement;
+use Tests\TestCase;
+
+class DeleteAssetsTest extends TestCase implements TestsFullMultipleCompaniesSupport, TestsPermissionsRequirement
+{
+    public function testRequiresPermission()
+    {
+        $asset = Asset::factory()->create();
+
+        $this->actingAsForApi(User::factory()->create())
+            ->deleteJson(route('api.assets.destroy', $asset))
+            ->assertForbidden();
+
+        $this->assertNotSoftDeleted($asset);
+    }
+
+    public function testAdheresToFullMultipleCompaniesSupportScoping()
+    {
+        [$companyA, $companyB] = Company::factory()->count(2)->create();
+
+        $assetA = Asset::factory()->for($companyA)->create();
+        $assetB = Asset::factory()->for($companyB)->create();
+        $assetC = Asset::factory()->for($companyB)->create();
+
+        $superUser = $companyA->users()->save(User::factory()->superuser()->make());
+        $userInCompanyA = $companyA->users()->save(User::factory()->deleteAssets()->make());
+        $userInCompanyB = $companyB->users()->save(User::factory()->deleteAssets()->make());
+
+        $this->settings->enableMultipleFullCompanySupport();
+
+        $this->actingAsForApi($userInCompanyA)
+            ->deleteJson(route('api.assets.destroy', $assetB))
+            ->assertStatusMessageIs('error');
+
+        $this->actingAsForApi($userInCompanyB)
+            ->deleteJson(route('api.assets.destroy', $assetA))
+            ->assertStatusMessageIs('error');
+
+        $this->actingAsForApi($superUser)
+            ->deleteJson(route('api.assets.destroy', $assetC))
+            ->assertStatusMessageIs('success');
+
+        $this->assertNotSoftDeleted($assetA);
+        $this->assertNotSoftDeleted($assetB);
+        $this->assertSoftDeleted($assetC);
+    }
+
+    public function testCannotDeleteAssetThatIsCheckedOut()
+    {
+        $this->markTestSkipped('This behavior is not functioning yet.');
+    }
+
+    public function testCanDeleteAsset()
+    {
+        $asset = Asset::factory()->create();
+
+        $this->actingAsForApi(User::factory()->deleteAssets()->create())
+            ->deleteJson(route('api.assets.destroy', $asset))
+            ->assertStatusMessageIs('success');
+
+        $this->assertSoftDeleted($asset);
+    }
+}
diff --git a/tests/Feature/Assets/Api/StoreAssetTest.php b/tests/Feature/Assets/Api/StoreAssetTest.php
index a3f5981635..1af3569f75 100644
--- a/tests/Feature/Assets/Api/StoreAssetTest.php
+++ b/tests/Feature/Assets/Api/StoreAssetTest.php
@@ -12,6 +12,7 @@ use App\Models\Supplier;
 use App\Models\User;
 use Illuminate\Support\Facades\Crypt;
 use Illuminate\Testing\Fluent\AssertableJson;
+use PHPUnit\Framework\Attributes\DataProvider;
 use Tests\TestCase;
 
 class StoreAssetTest extends TestCase
@@ -29,7 +30,7 @@ class StoreAssetTest extends TestCase
         $location = Location::factory()->create();
         $model = AssetModel::factory()->create();
         $rtdLocation = Location::factory()->create();
-        $status = Statuslabel::factory()->create();
+        $status = Statuslabel::factory()->readyToDeploy()->create();
         $supplier = Supplier::factory()->create();
         $user = User::factory()->createAssets()->create();
         $userAssigned = User::factory()->create();
@@ -90,7 +91,7 @@ class StoreAssetTest extends TestCase
                 'last_audit_date' => '2023-09-03',
                 'asset_tag' => '1234',
                 'model_id' => AssetModel::factory()->create()->id,
-                'status_id' => Statuslabel::factory()->create()->id,
+                'status_id' => Statuslabel::factory()->readyToDeploy()->create()->id,
             ])
             ->assertOk()
             ->assertStatusMessageIs('success');
@@ -106,7 +107,7 @@ class StoreAssetTest extends TestCase
                 // 'last_audit_date' => '2023-09-03 12:23:45',
                 'asset_tag' => '1234',
                 'model_id' => AssetModel::factory()->create()->id,
-                'status_id' => Statuslabel::factory()->create()->id,
+                'status_id' => Statuslabel::factory()->readyToDeploy()->create()->id,
             ])
             ->assertOk()
             ->assertStatusMessageIs('success');
@@ -122,17 +123,128 @@ class StoreAssetTest extends TestCase
                 'last_audit_date' => 'this-is-not-valid',
                 'asset_tag' => '1234',
                 'model_id' => AssetModel::factory()->create()->id,
-                'status_id' => Statuslabel::factory()->create()->id,
+                'status_id' => Statuslabel::factory()->readyToDeploy()->create()->id,
             ])
+            ->assertOk()
             ->assertStatusMessageIs('error');
 
         $this->assertNotNull($response->json('messages.last_audit_date'));
     }
 
+    public function testSaveWithArchivedStatusAndUserReturnsValidationError()
+    {
+        $response = $this->actingAsForApi(User::factory()->superuser()->create())
+            ->postJson(route('api.assets.store'), [
+                'assigned_to' => '1',
+                'assigned_type' => User::class,
+                'model_id' => AssetModel::factory()->create()->id,
+                'status_id' => Statuslabel::factory()->archived()->create()->id,
+            ])
+            ->assertOk()
+            ->assertStatusMessageIs('error');
+
+        $this->assertNotNull($response->json('messages.status_id'));
+    }
+
+    public function testSaveWithPendingStatusAndUserReturnsValidationError()
+    {
+        $response = $this->actingAsForApi(User::factory()->superuser()->create())
+            ->postJson(route('api.assets.store'), [
+                'assigned_to' => '1',
+                'assigned_type' => User::class,
+                'model_id' => AssetModel::factory()->create()->id,
+                'status_id' => Statuslabel::factory()->pending()->create()->id,
+            ])
+            ->assertOk()
+            ->assertJson([
+                'messages' =>  ['status_id' => [trans('admin/hardware/form.asset_not_deployable')]]
+            ]);
+
+        $this->assertNotNull($response->json('messages.status_id'));
+    }
+
+    public function testSaveWithAssignedToChecksOut()
+    {
+        $user = User::factory()->create();
+        $response = $this->actingAsForApi(User::factory()->superuser()->create())
+            ->postJson(route('api.assets.store'), [
+                'asset_tag' => '1235',
+                'assigned_to' => $user->id,
+                'assigned_type' => User::class,
+                'model_id' => AssetModel::factory()->create()->id,
+                'status_id' => Statuslabel::factory()->readyToDeploy()->create()->id,
+            ])
+            ->assertOk()
+            ->assertStatusMessageIs('success');
+
+        $asset = Asset::find($response->json()['payload']['id']);
+        $this->assertEquals($user->id, $asset->assigned_to);
+        $this->assertEquals('Asset created successfully. :)', $response->json('messages'));
+    }
+
+
+    public function testSaveWithNoAssignedTypeReturnsValidationError()
+    {
+        $response = $this->actingAsForApi(User::factory()->superuser()->create())
+            ->postJson(route('api.assets.store'), [
+                'asset_tag' => '1235',
+                'assigned_to' => '1',
+//                'assigned_type' => User::class, //deliberately omit assigned_type
+                'model_id' => AssetModel::factory()->create()->id,
+                'status_id' => Statuslabel::factory()->readyToDeploy()->create()->id,
+            ])
+            ->assertOk()
+            ->assertStatusMessageIs('error');
+        $this->assertNotNull($response->json('messages.assigned_type'));
+    }
+
+    public function testSaveWithBadAssignedTypeReturnsValidationError()
+    {
+        $response = $this->actingAsForApi(User::factory()->superuser()->create())
+            ->postJson(route('api.assets.store'), [
+                'asset_tag'     => '1235',
+                'assigned_to'   => '1',
+                'assigned_type' => 'nonsense_string', //deliberately bad assigned_type
+                'model_id'      => AssetModel::factory()->create()->id,
+                'status_id'     => Statuslabel::factory()->readyToDeploy()->create()->id,
+            ])
+            ->assertOk()
+            ->assertStatusMessageIs('error');
+        $this->assertNotNull($response->json('messages.assigned_type'));
+    }
+
+    public function testSaveWithAssignedTypeAndNoAssignedToReturnsValidationError()
+    {
+        $response = $this->actingAsForApi(User::factory()->superuser()->create())
+            ->postJson(route('api.assets.store'), [
+                'asset_tag'     => '1235',
+                //'assigned_to'   => '1', //deliberately omit assigned_to
+                'assigned_type' => User::class,
+                'model_id'      => AssetModel::factory()->create()->id,
+                'status_id'     => Statuslabel::factory()->readyToDeploy()->create()->id,
+            ])
+            ->assertOk()
+            ->assertStatusMessageIs('error');
+        $this->assertNotNull($response->json('messages.assigned_to'));
+    }
+
+    public function testSaveWithPendingStatusWithoutUserIsSuccessful()
+    {
+        $response = $this->actingAsForApi(User::factory()->superuser()->create())
+            ->postJson(route('api.assets.store'), [
+                'asset_tag' => '1234',
+                'model_id' => AssetModel::factory()->create()->id,
+                'status_id' => Statuslabel::factory()->pending()->create()->id,
+            ])
+            ->assertOk()
+            ->assertStatusMessageIs('success');
+    }
+
+
     public function testArchivedDepreciateAndPhysicalCanBeNull()
     {
         $model = AssetModel::factory()->ipadModel()->create();
-        $status = Statuslabel::factory()->create();
+        $status = Statuslabel::factory()->readyToDeploy()->create();
 
         $this->settings->enableAutoIncrement();
 
@@ -157,7 +269,7 @@ class StoreAssetTest extends TestCase
     public function testArchivedDepreciateAndPhysicalCanBeEmpty()
     {
         $model = AssetModel::factory()->ipadModel()->create();
-        $status = Statuslabel::factory()->create();
+        $status = Statuslabel::factory()->readyToDeploy()->create();
 
         $this->settings->enableAutoIncrement();
 
@@ -182,7 +294,7 @@ class StoreAssetTest extends TestCase
     public function testAssetEolDateIsCalculatedIfPurchaseDateSet()
     {
         $model = AssetModel::factory()->mbp13Model()->create();
-        $status = Statuslabel::factory()->create();
+        $status = Statuslabel::factory()->readyToDeploy()->create();
 
         $this->settings->enableAutoIncrement();
 
@@ -203,7 +315,7 @@ class StoreAssetTest extends TestCase
     public function testAssetEolDateIsNotCalculatedIfPurchaseDateNotSet()
     {
         $model = AssetModel::factory()->mbp13Model()->create();
-        $status = Statuslabel::factory()->create();
+        $status = Statuslabel::factory()->readyToDeploy()->create();
 
         $this->settings->enableAutoIncrement();
 
@@ -223,7 +335,7 @@ class StoreAssetTest extends TestCase
     public function testAssetEolExplicitIsSetIfAssetEolDateIsExplicitlySet()
     {
         $model = AssetModel::factory()->mbp13Model()->create();
-        $status = Statuslabel::factory()->create();
+        $status = Statuslabel::factory()->readyToDeploy()->create();
 
         $this->settings->enableAutoIncrement();
 
@@ -245,7 +357,7 @@ class StoreAssetTest extends TestCase
     public function testAssetGetsAssetTagWithAutoIncrement()
     {
         $model = AssetModel::factory()->create();
-        $status = Statuslabel::factory()->create();
+        $status = Statuslabel::factory()->readyToDeploy()->create();
 
         $this->settings->enableAutoIncrement();
 
@@ -265,7 +377,7 @@ class StoreAssetTest extends TestCase
     public function testAssetCreationFailsWithNoAssetTagOrAutoIncrement()
     {
         $model = AssetModel::factory()->create();
-        $status = Statuslabel::factory()->create();
+        $status = Statuslabel::factory()->readyToDeploy()->create();
 
         $this->settings->disableAutoIncrement();
 
@@ -289,7 +401,7 @@ class StoreAssetTest extends TestCase
             ->postJson(route('api.assets.store'), [
                 'asset_tag' => 'random-string',
                 'model_id' => AssetModel::factory()->create()->id,
-                'status_id' => Statuslabel::factory()->create()->id,
+                'status_id' => Statuslabel::factory()->readyToDeploy()->create()->id,
                 // API accepts float
                 'purchase_cost' => 12.34,
             ])
@@ -311,7 +423,7 @@ class StoreAssetTest extends TestCase
             ->postJson(route('api.assets.store'), [
                 'asset_tag' => 'random-string',
                 'model_id' => AssetModel::factory()->create()->id,
-                'status_id' => Statuslabel::factory()->create()->id,
+                'status_id' => Statuslabel::factory()->readyToDeploy()->create()->id,
                 // API also accepts string for comma separated values
                 'purchase_cost' => '12,34',
             ])
@@ -325,7 +437,7 @@ class StoreAssetTest extends TestCase
     public function testUniqueSerialNumbersIsEnforcedWhenEnabled()
     {
         $model = AssetModel::factory()->create();
-        $status = Statuslabel::factory()->create();
+        $status = Statuslabel::factory()->readyToDeploy()->create();
         $serial = '1234567890';
 
         $this->settings->enableAutoIncrement();
@@ -353,7 +465,7 @@ class StoreAssetTest extends TestCase
     public function testUniqueSerialNumbersIsNotEnforcedWhenDisabled()
     {
         $model = AssetModel::factory()->create();
-        $status = Statuslabel::factory()->create();
+        $status = Statuslabel::factory()->readyToDeploy()->create();
         $serial = '1234567890';
 
         $this->settings->enableAutoIncrement();
@@ -381,7 +493,7 @@ class StoreAssetTest extends TestCase
     public function testAssetTagsMustBeUniqueWhenUndeleted()
     {
         $model = AssetModel::factory()->create();
-        $status = Statuslabel::factory()->create();
+        $status = Statuslabel::factory()->readyToDeploy()->create();
         $asset_tag = '1234567890';
 
         $this->settings->disableAutoIncrement();
@@ -408,7 +520,7 @@ class StoreAssetTest extends TestCase
     public function testAssetTagsCanBeDuplicatedIfDeleted()
     {
         $model = AssetModel::factory()->create();
-        $status = Statuslabel::factory()->create();
+        $status = Statuslabel::factory()->readyToDeploy()->create();
         $asset_tag = '1234567890';
 
         $this->settings->disableAutoIncrement();
@@ -438,7 +550,7 @@ class StoreAssetTest extends TestCase
     public function testAnAssetCanBeCheckedOutToUserOnStore()
     {
         $model = AssetModel::factory()->create();
-        $status = Statuslabel::factory()->create();
+        $status = Statuslabel::factory()->readyToDeploy()->create();
         $user = User::factory()->createAssets()->create();
         $userAssigned = User::factory()->create();
 
@@ -461,10 +573,68 @@ class StoreAssetTest extends TestCase
         $this->assertTrue($asset->assignedTo->is($userAssigned));
     }
 
+    public static function checkoutTargets()
+    {
+        yield 'Users' => [
+            function () {
+                return [
+                    'key' => 'assigned_user',
+                    'value' => [
+                        User::factory()->create()->id,
+                        User::factory()->create()->id,
+                    ],
+                ];
+            },
+        ];
+
+        yield 'Locations' => [
+            function () {
+                return [
+                    'key' => 'assigned_location',
+                    'value' => [
+                        Location::factory()->create()->id,
+                        Location::factory()->create()->id,
+                    ],
+                ];
+            },
+        ];
+
+        yield 'Assets' => [
+            function () {
+                return [
+                    'key' => 'assigned_asset',
+                    'value' => [
+                        Asset::factory()->create()->id,
+                        Asset::factory()->create()->id,
+                    ],
+                ];
+            },
+        ];
+    }
+
+    /** @link https://app.shortcut.com/grokability/story/29181 */
+    #[DataProvider('checkoutTargets')]
+    public function testAssignedFieldValidationCannotBeArray($data)
+    {
+        ['key' => $key, 'value' => $value] = $data();
+
+        $this->actingAsForApi(User::factory()->createAssets()->create())
+            ->postJson(route('api.assets.store'), [
+                'asset_tag' => '123456',
+                'model_id' => AssetModel::factory()->create()->id,
+                'status_id' => Statuslabel::factory()->readyToDeploy()->create()->id,
+                $key => $value,
+            ])
+            ->assertStatusMessageIs('error')
+            ->assertJson(function (AssertableJson $json) use ($key) {
+                $json->has("messages.{$key}")->etc();
+            });
+    }
+
     public function testAnAssetCanBeCheckedOutToLocationOnStore()
     {
         $model = AssetModel::factory()->create();
-        $status = Statuslabel::factory()->create();
+        $status = Statuslabel::factory()->readyToDeploy()->create();
         $location = Location::factory()->create();
         $user = User::factory()->createAssets()->create();
 
@@ -490,7 +660,7 @@ class StoreAssetTest extends TestCase
     public function testAnAssetCanBeCheckedOutToAssetOnStore()
     {
         $model = AssetModel::factory()->create();
-        $status = Statuslabel::factory()->create();
+        $status = Statuslabel::factory()->readyToDeploy()->create();
         $asset = Asset::factory()->create();
         $user = User::factory()->createAssets()->create();
 
@@ -514,6 +684,9 @@ class StoreAssetTest extends TestCase
         $this->assertTrue($asset->assignedAssets()->find($response['payload']['id'])->is($apiAsset));
     }
 
+    /**
+     * @link https://app.shortcut.com/grokability/story/24475
+     */
     public function testCompanyIdNeedsToBeInteger()
     {
         $this->actingAsForApi(User::factory()->createAssets()->create())
@@ -530,7 +703,7 @@ class StoreAssetTest extends TestCase
     {
         $this->markIncompleteIfMySQL('Custom Fields tests do not work on MySQL');
 
-        $status = Statuslabel::factory()->create();
+        $status = Statuslabel::factory()->readyToDeploy()->create();
         $field = CustomField::factory()->testEncrypted()->create();
         $superuser = User::factory()->superuser()->create();
         $assetData = Asset::factory()->hasEncryptedCustomField($field)->make();
@@ -555,7 +728,7 @@ class StoreAssetTest extends TestCase
         // @todo:
         $this->markTestIncomplete();
 
-        $status = Statuslabel::factory()->create();
+        $status = Statuslabel::factory()->readyToDeploy()->create();
         $field = CustomField::factory()->testEncrypted()->create();
         $normal_user = User::factory()->editAssets()->create();
         $assetData = Asset::factory()->hasEncryptedCustomField($field)->make();
diff --git a/tests/Feature/Assets/Api/StoreAssetWithFullMultipleCompanySupportTest.php b/tests/Feature/Assets/Api/StoreAssetWithFullMultipleCompanySupportTest.php
new file mode 100644
index 0000000000..3cfaea1572
--- /dev/null
+++ b/tests/Feature/Assets/Api/StoreAssetWithFullMultipleCompanySupportTest.php
@@ -0,0 +1,58 @@
+<?php
+
+namespace Tests\Feature\Assets\Api;
+
+use App\Models\Asset;
+use App\Models\AssetModel;
+use App\Models\Statuslabel;
+use PHPUnit\Framework\Attributes\DataProvider;
+use Tests\Support\ProvidesDataForFullMultipleCompanySupportTesting;
+use Tests\TestCase;
+
+class StoreAssetWithFullMultipleCompanySupportTest extends TestCase
+{
+    use ProvidesDataForFullMultipleCompanySupportTesting;
+
+    /**
+     * @link https://github.com/grokability/snipe-it/issues/15654
+     */
+    #[DataProvider('dataForFullMultipleCompanySupportTesting')]
+    public function testAdheresToFullMultipleCompaniesSupportScoping($data)
+    {
+        ['actor' => $actor, 'company_attempting_to_associate' => $company, 'assertions' => $assertions] = $data();
+
+        $this->settings->enableMultipleFullCompanySupport();
+
+        $response = $this->actingAsForApi($actor)
+            ->postJson(route('api.assets.store'), [
+                'asset_tag' => 'random_string',
+                'company_id' => $company->id,
+                'model_id' => AssetModel::factory()->create()->id,
+                'status_id' => Statuslabel::factory()->readyToDeploy()->create()->id,
+            ]);
+
+        $asset = Asset::withoutGlobalScopes()->findOrFail($response['payload']['id']);
+
+        $assertions($asset);
+    }
+
+    #[DataProvider('dataForFullMultipleCompanySupportTesting')]
+    public function testHandlesCompanyIdBeingString($data)
+    {
+        ['actor' => $actor, 'company_attempting_to_associate' => $company, 'assertions' => $assertions] = $data();
+
+        $this->settings->enableMultipleFullCompanySupport();
+
+        $response = $this->actingAsForApi($actor)
+            ->postJson(route('api.assets.store'), [
+                'asset_tag' => 'random_string',
+                'company_id' => (string) $company->id,
+                'model_id' => AssetModel::factory()->create()->id,
+                'status_id' => Statuslabel::factory()->readyToDeploy()->create()->id,
+            ]);
+
+        $asset = Asset::withoutGlobalScopes()->findOrFail($response['payload']['id']);
+
+        $assertions($asset);
+    }
+}
diff --git a/tests/Feature/Assets/Api/UpdateAssetTest.php b/tests/Feature/Assets/Api/UpdateAssetTest.php
index 70ad3aa5b3..e04f3f6811 100644
--- a/tests/Feature/Assets/Api/UpdateAssetTest.php
+++ b/tests/Feature/Assets/Api/UpdateAssetTest.php
@@ -3,13 +3,364 @@
 namespace Tests\Feature\Assets\Api;
 
 use App\Models\Asset;
-use App\Models\CustomField;
+use App\Models\AssetModel;
+use App\Models\Company;
+use App\Models\Location;
+use App\Models\Statuslabel;
+use App\Models\Supplier;
 use App\Models\User;
+use App\Models\CustomField;
 use Illuminate\Support\Facades\Crypt;
 use Tests\TestCase;
 
 class UpdateAssetTest extends TestCase
 {
+    public function testThatANonExistentAssetIdReturnsError()
+    {
+        $this->actingAsForApi(User::factory()->editAssets()->createAssets()->create())
+            ->patchJson(route('api.assets.update', 123456789))
+            ->assertStatusMessageIs('error');
+    }
+
+    public function testRequiresPermissionToUpdateAsset()
+    {
+        $asset = Asset::factory()->create();
+
+        $this->actingAsForApi(User::factory()->create())
+            ->patchJson(route('api.assets.update', $asset->id))
+            ->assertForbidden();
+    }
+
+    public function testGivenPermissionUpdateAssetIsAllowed()
+
+    {
+        $asset = Asset::factory()->create();
+
+        $this->actingAsForApi(User::factory()->editAssets()->create())
+            ->patchJson(route('api.assets.update', $asset->id), [
+                'name' => 'test'
+            ])
+            ->assertOk();
+    }
+
+    public function testAllAssetAttributesAreStored()
+    {
+        $asset = Asset::factory()->create();
+        $user = User::factory()->editAssets()->create();
+        $userAssigned = User::factory()->create();
+        $company = Company::factory()->create();
+        $location = Location::factory()->create();
+        $model = AssetModel::factory()->create();
+        $rtdLocation = Location::factory()->create();
+        $status = Statuslabel::factory()->create();
+        $supplier = Supplier::factory()->create();
+
+        $response = $this->actingAsForApi($user)
+            ->patchJson(route('api.assets.update', $asset->id), [
+                'asset_eol_date' => '2024-06-02',
+                'asset_tag' => 'random_string',
+                'assigned_user' => $userAssigned->id,
+                'company_id' => $company->id,
+                'last_audit_date' => '2023-09-03 12:23:45',
+                'location_id' => $location->id,
+                'model_id' => $model->id,
+                'name' => 'A New Asset',
+                'notes' => 'Some notes',
+                'order_number' => '5678',
+                'purchase_cost' => '123.45',
+                'purchase_date' => '2023-09-02',
+                'requestable' => true,
+                'rtd_location_id' => $rtdLocation->id,
+                'serial' => '1234567890',
+                'status_id' => $status->id,
+                'supplier_id' => $supplier->id,
+                'warranty_months' => 10,
+            ])
+            ->assertOk()
+            ->assertStatusMessageIs('success')
+            ->json();
+
+        $updatedAsset = Asset::find($response['payload']['id']);
+
+        $this->assertEquals('2024-06-02', $updatedAsset->asset_eol_date);
+        $this->assertEquals('random_string', $updatedAsset->asset_tag);
+        $this->assertEquals($userAssigned->id, $updatedAsset->assigned_to);
+        $this->assertTrue($updatedAsset->company->is($company));
+        $this->assertTrue($updatedAsset->location->is($location));
+        $this->assertTrue($updatedAsset->model->is($model));
+        $this->assertEquals('A New Asset', $updatedAsset->name);
+        $this->assertEquals('Some notes', $updatedAsset->notes);
+        $this->assertEquals('5678', $updatedAsset->order_number);
+        $this->assertEquals('123.45', $updatedAsset->purchase_cost);
+        $this->assertTrue($updatedAsset->purchase_date->is('2023-09-02'));
+        $this->assertEquals('1', $updatedAsset->requestable);
+        $this->assertTrue($updatedAsset->defaultLoc->is($rtdLocation));
+        $this->assertEquals('1234567890', $updatedAsset->serial);
+        $this->assertTrue($updatedAsset->assetstatus->is($status));
+        $this->assertTrue($updatedAsset->supplier->is($supplier));
+        $this->assertEquals(10, $updatedAsset->warranty_months);
+        //$this->assertEquals('2023-09-03 00:00:00', $updatedAsset->last_audit_date->format('Y-m-d H:i:s'));
+        $this->assertEquals('2023-09-03 00:00:00', $updatedAsset->last_audit_date);
+    }
+
+    public function testUpdatesPeriodAsCommaSeparatorForPurchaseCost()
+    {
+        $this->settings->set([
+            'default_currency' => 'EUR',
+            'digit_separator' => '1.234,56',
+        ]);
+
+        $original_asset = Asset::factory()->create();
+
+        $response = $this->actingAsForApi(User::factory()->superuser()->create())
+            ->patchJson(route('api.assets.update', $original_asset->id), [
+                'asset_tag' => 'random-string',
+                'model_id' => AssetModel::factory()->create()->id,
+                'status_id' => Statuslabel::factory()->create()->id,
+                // API also accepts string for comma separated values
+                'purchase_cost' => '1.112,34',
+            ])
+            ->assertStatusMessageIs('success');
+
+        $asset = Asset::find($response['payload']['id']);
+
+        $this->assertEquals(1112.34, $asset->purchase_cost);
+    }
+
+    public function testUpdatesFloatForPurchaseCost()
+    {
+        $this->settings->set([
+            'default_currency' => 'EUR',
+            'digit_separator' => '1.234,56',
+        ]);
+
+        $original_asset = Asset::factory()->create();
+
+        $response = $this->actingAsForApi(User::factory()->superuser()->create())
+            ->patchJson(route('api.assets.update', $original_asset->id), [
+                'asset_tag' => 'random-string',
+                'model_id' => AssetModel::factory()->create()->id,
+                'status_id' => Statuslabel::factory()->create()->id,
+                // API also accepts string for comma separated values
+                'purchase_cost' => 12.34,
+            ])
+            ->assertStatusMessageIs('success');
+
+        $asset = Asset::find($response['payload']['id']);
+
+        $this->assertEquals(12.34, $asset->purchase_cost);
+    }
+
+    public function testUpdatesUSDecimalForPurchaseCost()
+    {
+        $this->settings->set([
+            'default_currency' => 'EUR',
+            'digit_separator' => '1,234.56',
+        ]);
+
+        $original_asset = Asset::factory()->create();
+
+        $response = $this->actingAsForApi(User::factory()->superuser()->create())
+            ->patchJson(route('api.assets.update', $original_asset->id), [
+                'asset_tag' => 'random-string',
+                'model_id' => AssetModel::factory()->create()->id,
+                'status_id' => Statuslabel::factory()->create()->id,
+                // API also accepts string for comma separated values
+                'purchase_cost' => '5412.34', //NOTE - you cannot use thousands-separator here!!!!
+            ])
+            ->assertStatusMessageIs('success');
+
+        $asset = Asset::find($response['payload']['id']);
+
+        $this->assertEquals(5412.34, $asset->purchase_cost);
+    }
+
+    public function testUpdatesFloatUSDecimalForPurchaseCost()
+    {
+        $this->settings->set([
+            'default_currency' => 'EUR',
+            'digit_separator' => '1,234.56',
+        ]);
+
+        $original_asset = Asset::factory()->create();
+
+        $response = $this->actingAsForApi(User::factory()->superuser()->create())
+            ->patchJson(route('api.assets.update', $original_asset->id), [
+                'asset_tag' => 'random-string',
+                'model_id' => AssetModel::factory()->create()->id,
+                'status_id' => Statuslabel::factory()->create()->id,
+                // API also accepts string for comma separated values
+                'purchase_cost' => 12.34,
+            ])
+            ->assertStatusMessageIs('success');
+
+        $asset = Asset::find($response['payload']['id']);
+
+        $this->assertEquals(12.34, $asset->purchase_cost);
+    }
+
+    public function testAssetEolDateIsCalculatedIfPurchaseDateUpdated()
+    {
+        $asset = Asset::factory()->laptopMbp()->noPurchaseOrEolDate()->create();
+
+        $this->actingAsForApi(User::factory()->editAssets()->create())
+            ->patchJson((route('api.assets.update', $asset->id)), [
+                'purchase_date' => '2021-01-01',
+            ])
+            ->assertOk()
+            ->assertStatusMessageIs('success')
+            ->json();
+
+        $asset->refresh();
+
+        $this->assertEquals('2024-01-01', $asset->asset_eol_date);
+    }
+
+    public function testAssetEolDateIsNotCalculatedIfPurchaseDateNotSet()
+    {
+        $asset = Asset::factory()->laptopMbp()->noPurchaseOrEolDate()->create();
+
+        $this->actingAsForApi(User::factory()->editAssets()->create())
+            ->patchJson(route('api.assets.update', $asset->id), [
+                'name' => 'test asset',
+                'asset_eol_date' => '2022-01-01'
+            ])
+            ->assertOk()
+            ->assertStatusMessageIs('success')
+            ->json();
+
+        $asset->refresh();
+
+        $this->assertEquals('2022-01-01', $asset->asset_eol_date);
+    }
+
+    public function testAssetEolExplicitIsSetIfAssetEolDateIsExplicitlySet()
+    {
+        $asset = Asset::factory()->laptopMbp()->create();
+
+        $this->actingAsForApi(User::factory()->editAssets()->create())
+            ->patchJson(route('api.assets.update', $asset->id), [
+                'asset_eol_date' => '2025-01-01',
+            ])
+            ->assertOk()
+            ->assertStatusMessageIs('success')
+            ->json();
+
+        $asset->refresh();
+
+        $this->assertEquals('2025-01-01', $asset->asset_eol_date);
+        $this->assertTrue($asset->eol_explicit);
+    }
+
+    public function testAssetTagCannotUpdateToNullValue()
+    {
+        $asset = Asset::factory()->laptopMbp()->create();
+
+        $this->actingAsForApi(User::factory()->editAssets()->create())
+            ->patchJson(route('api.assets.update', $asset->id), [
+                'asset_tag' => null,
+            ])
+            ->assertOk()
+            ->assertStatusMessageIs('error');
+    }
+
+    public function testAssetTagCannotUpdateToEmptyStringValue()
+    {
+        $asset = Asset::factory()->laptopMbp()->create();
+
+        $this->actingAsForApi(User::factory()->editAssets()->create())
+            ->patchJson(route('api.assets.update', $asset->id), [
+                'asset_tag' => "",
+            ])
+            ->assertOk()
+            ->assertStatusMessageIs('error');
+    }
+
+    public function testModelIdCannotUpdateToNullValue()
+    {
+        $asset = Asset::factory()->laptopMbp()->create();
+
+        $this->actingAsForApi(User::factory()->editAssets()->create())
+            ->patchJson(route('api.assets.update', $asset->id), [
+                'model_id' => null
+            ])
+            ->assertOk()
+            ->assertStatusMessageIs('error');
+    }
+
+    public function testModelIdCannotUpdateToEmptyStringValue()
+    {
+        $asset = Asset::factory()->laptopMbp()->create();
+
+        $this->actingAsForApi(User::factory()->editAssets()->create())
+            ->patchJson(route('api.assets.update', $asset->id), [
+                'model_id' => ""
+            ])
+            ->assertOk()
+            ->assertStatusMessageIs('error');
+    }
+
+    public function testStatusIdCannotUpdateToNullValue()
+    {
+        $asset = Asset::factory()->laptopMbp()->create();
+
+        $this->actingAsForApi(User::factory()->editAssets()->create())
+            ->patchJson(route('api.assets.update', $asset->id), [
+                'status_id' => null
+            ])
+            ->assertOk()
+            ->assertStatusMessageIs('error');
+    }
+
+    public function testStatusIdCannotUpdateToEmptyStringValue()
+    {
+        $asset = Asset::factory()->laptopMbp()->create();
+
+        $this->actingAsForApi(User::factory()->editAssets()->create())
+            ->patchJson(route('api.assets.update', $asset->id), [
+                'status_id' => ""
+            ])
+            ->assertOk()
+            ->assertStatusMessageIs('error');
+    }
+
+    public function testIfRtdLocationIdIsSetWithoutLocationIdAssetReturnsToDefault()
+    {
+        $location = Location::factory()->create();
+        $asset = Asset::factory()->laptopMbp()->create([
+            'location_id' => $location->id
+        ]);
+        $rtdLocation = Location::factory()->create();
+
+        $this->actingAsForApi(User::factory()->editAssets()->create())
+            ->patchJson(route('api.assets.update', $asset->id), [
+                'rtd_location_id' => $rtdLocation->id
+            ]);
+
+        $asset->refresh();
+
+        $this->assertTrue($asset->defaultLoc->is($rtdLocation));
+        $this->assertTrue($asset->location->is($rtdLocation));
+    }
+
+    public function testIfLocationAndRtdLocationAreSetLocationIdIsLocation()
+    {
+        $location = Location::factory()->create();
+        $asset = Asset::factory()->laptopMbp()->create();
+        $rtdLocation = Location::factory()->create();
+
+        $this->actingAsForApi(User::factory()->editAssets()->create())
+            ->patchJson(route('api.assets.update', $asset->id), [
+                'rtd_location_id' => $rtdLocation->id,
+                'location_id' => $location->id
+            ]);
+
+        $asset->refresh();
+
+        $this->assertTrue($asset->defaultLoc->is($rtdLocation));
+        $this->assertTrue($asset->location->is($location));
+    }
+
     public function testEncryptedCustomFieldCanBeUpdated()
     {
         $this->markIncompleteIfMySQL('Custom Fields tests do not work on MySQL');
@@ -52,4 +403,256 @@ class UpdateAssetTest extends TestCase
         $asset->refresh();
         $this->assertEquals("encrypted value should not change", Crypt::decrypt($asset->{$field->db_column_name()}));
     }
+
+    public function testCheckoutToUserOnAssetUpdate()
+    {
+        $asset = Asset::factory()->create();
+        $user = User::factory()->editAssets()->create();
+        $assigned_user = User::factory()->create();
+
+        $response = $this->actingAsForApi($user)
+            ->patchJson(route('api.assets.update', $asset->id), [
+                'assigned_user' => $assigned_user->id,
+            ])
+            ->assertOk()
+            ->assertStatusMessageIs('success')
+            ->json();
+
+        $asset->refresh();
+        $this->assertEquals($assigned_user->id, $asset->assigned_to);
+        $this->assertEquals($asset->assigned_type, 'App\Models\User');
+    }
+
+    public function testCheckoutToUserWithAssignedToAndAssignedType()
+    {
+        $asset = Asset::factory()->create();
+        $user = User::factory()->editAssets()->create();
+        $assigned_user = User::factory()->create();
+
+        $response = $this->actingAsForApi($user)
+            ->patchJson(route('api.assets.update', $asset->id), [
+                'assigned_to' => $assigned_user->id,
+                'assigned_type' => User::class
+            ])
+            ->assertOk()
+            ->assertStatusMessageIs('success')
+            ->json();
+
+        $asset->refresh();
+        $this->assertEquals($assigned_user->id, $asset->assigned_to);
+        $this->assertEquals($asset->assigned_type, 'App\Models\User');
+    }
+
+    public function testCheckoutToUserWithAssignedToWithoutAssignedType()
+    {
+        $asset = Asset::factory()->create();
+        $user = User::factory()->editAssets()->create();
+        $assigned_user = User::factory()->create();
+
+        $response = $this->actingAsForApi($user)
+            ->patchJson(route('api.assets.update', $asset->id), [
+                'assigned_to' => $assigned_user->id,
+//                'assigned_type' => User::class //deliberately omit assigned_type
+            ])
+            ->assertOk()
+            ->assertStatusMessageIs('error');
+
+        $asset->refresh();
+        $this->assertNotEquals($assigned_user->id, $asset->assigned_to);
+        $this->assertNotEquals($asset->assigned_type, 'App\Models\User');
+        $this->assertNotNull($response->json('messages.assigned_type'));
+    }
+
+    public function testCheckoutToUserWithAssignedToWithBadAssignedType()
+    {
+        $asset = Asset::factory()->create();
+        $user = User::factory()->editAssets()->create();
+        $assigned_user = User::factory()->create();
+
+        $response = $this->actingAsForApi($user)
+            ->patchJson(route('api.assets.update', $asset->id), [
+                'assigned_to'   => $assigned_user->id,
+                'assigned_type' => 'more_deliberate_nonsense' //deliberately bad assigned_type
+            ])
+            ->assertOk()
+            ->assertStatusMessageIs('error');
+
+        $asset->refresh();
+        $this->assertNotEquals($assigned_user->id, $asset->assigned_to);
+        $this->assertNotEquals($asset->assigned_type, 'App\Models\User');
+        $this->assertNotNull($response->json('messages.assigned_type'));
+    }
+
+    public function testCheckoutToUserWithoutAssignedToWithAssignedType()
+    {
+        $asset = Asset::factory()->create();
+        $user = User::factory()->editAssets()->create();
+        $assigned_user = User::factory()->create();
+
+        $response = $this->actingAsForApi($user)
+            ->patchJson(route('api.assets.update', $asset->id), [
+                //'assigned_to'   => $assigned_user->id, // deliberately omit assigned_to
+                'assigned_type' => User::class
+            ])
+            ->assertOk()
+            ->assertStatusMessageIs('error');
+
+        $asset->refresh();
+        $this->assertNotEquals($assigned_user->id, $asset->assigned_to);
+        $this->assertNotEquals($asset->assigned_type, 'App\Models\User');
+        $this->assertNotNull($response->json('messages.assigned_to'));
+    }
+
+    public function testCheckoutToDeletedUserFailsOnAssetUpdate()
+    {
+        $asset = Asset::factory()->create();
+        $user = User::factory()->editAssets()->create();
+        $assigned_user = User::factory()->deleted()->create();
+
+        $this->actingAsForApi($user)
+            ->patchJson(route('api.assets.update', $asset->id), [
+                'assigned_user' => $assigned_user->id,
+            ])
+            ->assertOk()
+            ->assertStatusMessageIs('error')
+            ->json();
+
+        $asset->refresh();
+        $this->assertNull($asset->assigned_to);
+        $this->assertNull($asset->assigned_type);
+    }
+
+    public function testCheckoutToLocationOnAssetUpdate()
+    {
+        $asset = Asset::factory()->create();
+        $user = User::factory()->editAssets()->create();
+        $assigned_location = Location::factory()->create();
+
+        $this->actingAsForApi($user)
+            ->patchJson(route('api.assets.update', $asset->id), [
+                'assigned_location' => $assigned_location->id,
+            ])
+            ->assertOk()
+            ->assertStatusMessageIs('success')
+            ->json();
+
+        $asset->refresh();
+        $this->assertEquals($assigned_location->id, $asset->assigned_to);
+        $this->assertEquals($asset->assigned_type, 'App\Models\Location');
+
+    }
+
+    public function testCheckoutToDeletedLocationFailsOnAssetUpdate()
+    {
+        $asset = Asset::factory()->create();
+        $user = User::factory()->editAssets()->create();
+        $assigned_location = Location::factory()->deleted()->create();
+
+        $this->actingAsForApi($user)
+            ->patchJson(route('api.assets.update', $asset->id), [
+                'assigned_location' => $assigned_location->id,
+            ])
+            ->assertOk()
+            ->assertStatusMessageIs('error')
+            ->json();
+
+        $asset->refresh();
+        $this->assertNull($asset->assigned_to);
+        $this->assertNull($asset->assigned_type);
+    }
+
+    public function testCheckoutAssetOnAssetUpdate()
+    {
+        $asset = Asset::factory()->create();
+        $user = User::factory()->editAssets()->create();
+        $assigned_asset = Asset::factory()->create();
+
+        $this->actingAsForApi($user)
+            ->patchJson(route('api.assets.update', $asset->id), [
+                'assigned_asset'   => $assigned_asset->id,
+                'checkout_to_type' => 'user',
+            ])
+            ->assertOk()
+            ->assertStatusMessageIs('success')
+            ->json();
+
+        $asset->refresh();
+        $this->assertEquals($assigned_asset->id, $asset->assigned_to);
+        $this->assertEquals($asset->assigned_type, 'App\Models\Asset');
+
+    }
+
+    public function testCheckoutToDeletedAssetFailsOnAssetUpdate()
+    {
+        $asset = Asset::factory()->create();
+        $user = User::factory()->editAssets()->create();
+        $assigned_asset = Asset::factory()->deleted()->create();
+
+        $this->actingAsForApi($user)
+            ->patchJson(route('api.assets.update', $asset->id), [
+                'assigned_asset' => $assigned_asset->id,
+            ])
+            ->assertOk()
+            ->assertStatusMessageIs('error')
+            ->json();
+
+        $asset->refresh();
+        $this->assertNull($asset->assigned_to);
+        $this->assertNull($asset->assigned_type);
+    }
+
+    public function testAssetCannotBeUpdatedByUserInSeparateCompany()
+    {
+        $this->settings->enableMultipleFullCompanySupport();
+
+        $companyA = Company::factory()->create();
+        $companyB = Company::factory()->create();
+        $userA = User::factory()->editAssets()->create([
+            'company_id' => $companyA->id,
+        ]);
+        $userB = User::factory()->editAssets()->create([
+            'company_id' => $companyB->id,
+        ]);
+        $asset = Asset::factory()->create([
+            'created_by'    => $userA->id,
+            'company_id' => $companyA->id,
+        ]);
+
+        $this->actingAsForApi($userB)
+            ->patchJson(route('api.assets.update', $asset->id), [
+                'name' => 'test name'
+            ])
+            ->assertStatusMessageIs('error');
+
+        $this->actingAsForApi($userA)
+            ->patchJson(route('api.assets.update', $asset->id), [
+                'name' => 'test name'
+            ])
+            ->assertStatusMessageIs('success');
+    }
+
+    public function testCustomFieldCannotBeUpdatedIfNotOnCurrentAssetModel()
+    {
+        $this->markIncompleteIfMySQL('Custom Field Tests do not work in MySQL');
+
+        $customField = CustomField::factory()->create();
+        $customField2 = CustomField::factory()->create();
+        $asset = Asset::factory()->hasMultipleCustomFields([$customField])->create();
+        $user = User::factory()->editAssets()->create();
+
+        // successful
+        $this->actingAsForApi($user)->patchJson(route('api.assets.update', $asset->id), [
+            $customField->db_column_name() => 'test attribute',
+        ])->assertStatusMessageIs('success');
+
+        // custom field exists, but not on this asset model
+        $this->actingAsForApi($user)->patchJson(route('api.assets.update', $asset->id), [
+            $customField2->db_column_name() => 'test attribute',
+        ])->assertStatusMessageIs('error');
+
+        // custom field does not exist
+        $this->actingAsForApi($user)->patchJson(route('api.assets.update', $asset->id), [
+            '_snipeit_non_existent_custom_field_50' => 'test attribute',
+        ])->assertStatusMessageIs('error');
+    }
 }
diff --git a/tests/Feature/Assets/Ui/AssetIndexTest.php b/tests/Feature/Assets/Ui/AssetIndexTest.php
new file mode 100644
index 0000000000..6963caf28f
--- /dev/null
+++ b/tests/Feature/Assets/Ui/AssetIndexTest.php
@@ -0,0 +1,16 @@
+<?php
+
+namespace Tests\Feature\Assets\Ui;
+
+use App\Models\User;
+use Tests\TestCase;
+
+class AssetIndexTest extends TestCase
+{
+    public function testPageRenders()
+    {
+        $this->actingAs(User::factory()->superuser()->create())
+            ->get(route('hardware.index'))
+            ->assertOk();
+    }
+}
diff --git a/tests/Feature/Assets/Ui/AssetLabelTest.php b/tests/Feature/Assets/Ui/AssetLabelTest.php
new file mode 100644
index 0000000000..ddf57828bf
--- /dev/null
+++ b/tests/Feature/Assets/Ui/AssetLabelTest.php
@@ -0,0 +1,36 @@
+<?php
+
+namespace Tests\Feature\Assets\Ui;
+
+use App\Models\Accessory;
+use App\Models\Actionlog;
+use App\Models\Asset;
+use App\Models\User;
+use Tests\TestCase;
+
+class AssetLabelTest extends TestCase
+{
+    public function testUserWithPermissionsCanAccessPage()
+    {
+        $assets = Asset::factory()->count(20)->create();
+        $id_array = $assets->pluck('id')->toArray();
+
+        $this->actingAs(User::factory()->viewAssets()->create())->post('/hardware/bulkedit', [
+            'ids'          => $id_array,
+            'bulk_actions'        => 'labels',
+        ])->assertStatus(200);
+    }
+
+    public function testRedirectOfNoAssetsSelected()
+    {
+        $id_array = [];
+        $this->actingAs(User::factory()->viewAssets()->create())
+            ->from(route('hardware.index'))
+            ->post('/hardware/bulkedit', [
+            'ids'          => $id_array,
+            'bulk_actions'        => 'Labels',
+        ])->assertStatus(302)
+       ->assertRedirect(route('hardware.index'));
+    }
+
+}
diff --git a/tests/Feature/Assets/Ui/AuditAssetTest.php b/tests/Feature/Assets/Ui/AuditAssetTest.php
new file mode 100644
index 0000000000..f25ea5e2be
--- /dev/null
+++ b/tests/Feature/Assets/Ui/AuditAssetTest.php
@@ -0,0 +1,71 @@
+<?php
+
+namespace Tests\Feature\Assets\Ui;
+
+use App\Models\Asset;
+use App\Models\User;
+use Tests\TestCase;
+
+class AuditAssetTest extends TestCase
+{
+    public function testPermissionRequiredToCreateAssetModel()
+    {
+        $this->actingAs(User::factory()->create())
+            ->get(route('clone/hardware', Asset::factory()->create()))
+            ->assertForbidden();
+    }
+
+    public function testPageCanBeAccessed(): void
+    {
+        $this->actingAs(User::factory()->auditAssets()->create())
+            ->get(route('asset.audit.create', Asset::factory()->create()))
+            ->assertStatus(200);
+    }
+
+    public function testAssetAuditPostIsRedirectedToAssetIndexIfRedirectSelectionIsIndex()
+    {
+        $asset = Asset::factory()->create();
+
+        $response = $this->actingAs(User::factory()->viewAssets()->editAssets()->auditAssets()->create())
+            ->from(route('asset.audit.create', $asset))
+            ->post(route('asset.audit.store', $asset),
+                [
+                    'redirect_option' => 'index',
+                ])
+            ->assertStatus(302)
+            ->assertRedirect(route('hardware.index'));
+        $this->followRedirects($response)->assertSee('success');
+
+    }
+
+    public function testAssetAuditPostIsRedirectedToAssetPageIfRedirectSelectionIsAsset()
+    {
+        $asset = Asset::factory()->create();
+
+        $response = $this->actingAs(User::factory()->viewAssets()->editAssets()->auditAssets()->create())
+            ->from(route('asset.audit.create', $asset))
+            ->post(route('asset.audit.store', $asset),
+                [
+                    'redirect_option' => 'item',
+                ])
+            ->assertStatus(302)
+            ->assertRedirect(route('hardware.show', $asset));
+        $this->followRedirects($response)->assertSee('success');
+    }
+
+    public function testAssetAuditPostIsRedirectedToAuditDuePageIfRedirectSelectionIsList()
+    {
+        $asset = Asset::factory()->create();
+
+        $response = $this->actingAs(User::factory()->viewAssets()->editAssets()->auditAssets()->create())
+            ->from(route('asset.audit.create', $asset))
+            ->post(route('asset.audit.store', $asset),
+                [
+                    'redirect_option' => 'other_redirect',
+                ])
+            ->assertStatus(302)
+            ->assertRedirect(route('assets.audit.due'));
+        $this->followRedirects($response)->assertSee('success');
+    }
+
+}
diff --git a/tests/Feature/Assets/Ui/BulkDeleteAssetsTest.php b/tests/Feature/Assets/Ui/BulkDeleteAssetsTest.php
new file mode 100644
index 0000000000..ec8ed33ba8
--- /dev/null
+++ b/tests/Feature/Assets/Ui/BulkDeleteAssetsTest.php
@@ -0,0 +1,194 @@
+<?php
+
+namespace Tests\Feature\Assets\Ui;
+
+use App\Models\Accessory;
+use App\Models\Actionlog;
+use App\Models\Asset;
+use App\Models\User;
+use Tests\TestCase;
+
+class BulkDeleteAssetsTest extends TestCase
+{
+    public function testUserWithPermissionsCanAccessPage()
+    {
+        $user = User::factory()->viewAssets()->deleteAssets()->editAssets()->create();
+        $assets = Asset::factory()->count(2)->create();
+
+        $id_array = $assets->pluck('id')->toArray();
+
+        $this->actingAs($user)->post('/hardware/bulkedit', [
+            'ids'          => $id_array,
+            'order'        => 'asc',
+            'bulk_actions' => 'delete',
+            'sort'         => 'id'
+        ])->assertStatus(200);
+    }
+
+    public function testStandardUserCannotAccessPage()
+    {
+        $user = User::factory()->create();
+        $assets = Asset::factory()->count(2)->create();
+
+        $id_array = $assets->pluck('id')->toArray();
+
+        $this->actingAs($user)->post('/hardware/bulkdelete', [
+            'ids'          => $id_array,
+            'bulk_actions' => 'delete',
+        ])->assertStatus(403);
+    }
+
+    public function testPageRedirectFromInterstitialIfNoAssetsSelectedToDelete()
+    {
+        $user = User::factory()->viewAssets()->deleteAssets()->editAssets()->create();
+        $response = $this->actingAs($user)
+            ->post('/hardware/bulkdelete', [
+                'ids'          => null,
+                'bulk_actions' => 'delete',
+        ])
+        ->assertStatus(302)
+        ->assertRedirect(route('hardware.index'));
+
+       $this->followRedirects($response)->assertSee('alert-danger');
+    }
+
+    public function testPageRedirectFromInterstitialIfNoAssetsSelectedToRestore()
+    {
+        $user = User::factory()->viewAssets()->deleteAssets()->editAssets()->create();
+        $response = $this->actingAs($user)
+            ->from(route('hardware.index'))
+            ->post('/hardware/bulkrestore', [
+                'ids'          => null,
+                'bulk_actions' => 'delete',
+            ])
+            ->assertStatus(302)
+            ->assertRedirect(route('hardware.index'));
+
+        $this->followRedirects($response)->assertSee('alert-danger');
+    }
+
+
+    public function testBulkDeleteSelectedAssetsFromInterstitial()
+    {
+        $user = User::factory()->viewAssets()->deleteAssets()->editAssets()->create();
+        $assets = Asset::factory()->count(2)->create();
+
+        $id_array = $assets->pluck('id')->toArray();
+
+        $response = $this->actingAs($user)
+            ->from(route('hardware/bulkedit'))
+            ->post('/hardware/bulkdelete', [
+            'ids'          => $id_array,
+            'bulk_actions' => 'delete',
+        ])->assertStatus(302);
+
+        Asset::findMany($id_array)->each(function (Asset $asset)  {
+            $this->assertNotNull($asset->deleted_at);
+        });
+
+        $this->followRedirects($response)->assertSee('alert-success');
+    }
+
+    public function testBulkRestoreSelectedAssetsFromInterstitial()
+    {
+        $user = User::factory()->viewAssets()->deleteAssets()->editAssets()->create();
+        $asset = Asset::factory()->deleted()->create();
+
+        $asset->refresh();
+        $id_array = $asset->pluck('id')->toArray();
+
+        // Check that the assets are deleted
+        Asset::findMany($id_array)->each(function (Asset $asset)  {
+            $this->assertNull($asset->deleted_at);
+        });
+
+        $response = $this->actingAs($user)
+            ->from(route('hardware/bulkedit'))
+            ->post(route('hardware/bulkrestore'), [
+                'ids'          => [$asset->id],
+            ])->assertStatus(302);
+
+        $this->followRedirects($response)->assertSee('alert-success');
+
+        Asset::findMany($id_array)->each(function (Asset $asset)  {
+            $this->assertNull($asset->deleted_at);
+        });
+    }
+
+
+    public function testActionLogCreatedUponBulkDelete()
+    {
+        $user = User::factory()->viewAssets()->deleteAssets()->editAssets()->create();
+        $asset = Asset::factory()->create();
+
+        $this->actingAs($user)
+            ->from(route('hardware/bulkedit'))
+            ->post('/hardware/bulkdelete', [
+                'ids'          => [$asset->id],
+                'bulk_actions' => 'delete',
+            ]);
+
+        $this->assertDatabaseHas('action_logs',
+            [
+                'action_type' => 'delete',
+                'target_id' => null,
+                'target_type' => null,
+                'item_id' => $asset->id,
+                'item_type' => Asset::class,
+            ]
+        );
+
+        $asset->refresh();
+        $this->assertNull($asset->assigned_to);
+        $this->assertNull($asset->assigned_type);
+    }
+
+    public function testActionLogCreatedUponBulkRestore()
+    {
+        $user = User::factory()->viewAssets()->deleteAssets()->editAssets()->create();
+        $asset = Asset::factory()->deleted()->create();
+
+        $this->actingAs($user)
+            ->from(route('hardware/bulkedit'))
+            ->post(route('hardware/bulkrestore'), [
+                'ids'          => [$asset->id],
+                'bulk_actions' => 'restore',
+            ]);
+
+        $this->assertDatabaseHas('action_logs',
+            [
+                'action_type' => 'restore',
+                'target_id' => null,
+                'target_type' => null,
+                'item_id' => $asset->id,
+                'item_type' => Asset::class,
+            ]
+        );
+    }
+
+     public function testBulkDeleteAssignedAssetTriggersError(){
+        $user = User::factory()->viewAssets()->deleteAssets()->editAssets()->create();
+        $asset = Asset::factory()->create([
+            'id' => 5,
+            'assigned_to' => $user->id,
+            'assigned_type' => User::class,
+            'asset_tag' => '12345',
+        ]);
+
+        $response = $this->actingAs($user)
+                ->from(route('hardware/bulkedit'))
+                ->post('/hardware/bulkdelete', [
+                    'ids'          => [$asset->id],
+                    'bulk_actions' => 'delete',
+                ]);
+
+        $this->assertEquals(302, $response->getStatusCode());
+        $this->assertEquals(route('hardware.index'), $response->headers->get('Location'));
+
+
+        $errorMessage = session('error');
+        $expectedMessage = trans_choice('admin/hardware/message.delete.assigned_to_error',1, ['asset_tag' => $asset->asset_tag]);
+        $this->assertEquals($expectedMessage, $errorMessage);
+     }
+
+}
diff --git a/tests/Feature/Assets/Ui/BulkEditAssetsTest.php b/tests/Feature/Assets/Ui/BulkEditAssetsTest.php
index 02d39a7b45..58f7a11598 100644
--- a/tests/Feature/Assets/Ui/BulkEditAssetsTest.php
+++ b/tests/Feature/Assets/Ui/BulkEditAssetsTest.php
@@ -57,6 +57,7 @@ class BulkEditAssetsTest extends TestCase
         $company1 = Company::factory()->create();
         $company2 = Company::factory()->create();
         $assets = Asset::factory()->count(10)->create([
+            'name'             => 'Old Asset Name',
             'purchase_date'    => '2023-01-01',
             'expected_checkin' => '2023-01-01',
             'status_id'        => $status1->id,
@@ -77,6 +78,7 @@ class BulkEditAssetsTest extends TestCase
         // submits the ids and new values for each attribute
         $this->actingAs(User::factory()->editAssets()->create())->post(route('hardware/bulksave'), [
             'ids'              => $id_array,
+            'name'             => 'New Asset Name',
             'purchase_date'    => '2024-01-01',
             'expected_checkin' => '2024-01-01',
             'status_id'        => $status2->id,
@@ -97,6 +99,7 @@ class BulkEditAssetsTest extends TestCase
             $this->assertEquals('2024-01-01', $asset->purchase_date->format('Y-m-d'));
             $this->assertEquals('2024-01-01', $asset->expected_checkin->format('Y-m-d'));
             $this->assertEquals($status2->id, $asset->status_id);
+            $this->assertEquals('New Asset Name', $asset->name);
             $this->assertEquals($model2->id, $asset->model_id);
             $this->assertEquals(5678.92, $asset->purchase_cost);
             $this->assertEquals($supplier2->id, $asset->supplier_id);
@@ -109,6 +112,59 @@ class BulkEditAssetsTest extends TestCase
         });
     }
 
+    public function testBulkEditAssetsNullsOutFieldsIfSelected()
+    {
+        // sets up all needed models and attributes on the assets
+        // this test does not deal with custom fields - will be dealt with in separate cases
+        $status1 = Statuslabel::factory()->create();
+        $status2 = Statuslabel::factory()->create();
+        $model1 = AssetModel::factory()->create();
+        $model2 = AssetModel::factory()->create();
+        $supplier1 = Supplier::factory()->create();
+        $supplier2 = Supplier::factory()->create();
+        $company1 = Company::factory()->create();
+        $company2 = Company::factory()->create();
+        $assets = Asset::factory()->count(10)->create([
+            'name'             => 'Old Asset Name',
+            'purchase_date'    => '2023-01-01',
+            'expected_checkin' => '2023-01-01',
+            'status_id'        => $status1->id,
+            'model_id'         => $model1->id,
+            // skipping locations on this test, it deserves it's own test
+            'purchase_cost'    => 1234.90,
+            'supplier_id'      => $supplier1->id,
+            'company_id'       => $company1->id,
+            'order_number'     => '123456',
+            'warranty_months'  => 24,
+            'next_audit_date'  => '2024-06-01',
+            'requestable'      => false
+        ]);
+
+        // gets the ids together to submit to the endpoint
+        $id_array = $assets->pluck('id')->toArray();
+
+        // submits the ids and new values for each attribute
+        $this->actingAs(User::factory()->editAssets()->create())->post(route('hardware/bulksave'), [
+            'ids'              => $id_array,
+            'null_name'        => '1',
+            'null_purchase_date'    => '1',
+            'null_expected_checkin_date' => '1',
+            'null_next_audit_date'        => '1',
+            'status_id'        => $status2->id,
+            'model_id'         => $model2->id,
+        ])
+            ->assertStatus(302)
+            ->assertSessionHasNoErrors();
+
+        // asserts that each asset has the updated values
+        Asset::findMany($id_array)->each(function (Asset $asset) use ($status2, $model2, $supplier2, $company2) {
+            $this->assertNull($asset->name);
+            $this->assertNull($asset->purchase_date);
+            $this->assertNull($asset->expected_checkin);
+            $this->assertNull($asset->next_audit_date);
+        });
+    }
+
     public function testBulkEditAssetsAcceptsAndUpdatesUnencryptedCustomFields()
     {
         $this->markIncompleteIfMySQL('Custom Fields tests do not work on MySQL');
@@ -141,6 +197,47 @@ class BulkEditAssetsTest extends TestCase
         });
     }
 
+    public function testBulkEditAssetsNullsCustomFieldsIfSelected()
+    {
+        $this->markIncompleteIfMySQL('Custom Fields tests do not work on MySQL');
+
+        CustomField::factory()->ram()->create();
+        CustomField::factory()->cpu()->create();
+        CustomField::factory()->phone()->create();
+
+        // when getting the custom field directly from the factory the field has not been fully created yet
+        // so we have to do a query afterwards to get the actual model :shrug:
+
+        $ram = CustomField::where('name', 'RAM')->first();
+        $cpu = CustomField::where('name', 'CPU')->first();
+        $phone = CustomField::where('name', 'Phone Number')->first();
+
+        $assets = Asset::factory()->count(10)->hasMultipleCustomFields([$ram, $cpu])->create([
+            $ram->db_column => 8,
+            $cpu->db_column => '2.1',
+        ]);
+
+        $id_array = $assets->pluck('id')->toArray();
+
+        $this->actingAs(User::factory()->editAssets()->create())->post(route('hardware/bulksave'), [
+            'ids'                    => $id_array,
+            $ram->db_column          => 16,
+            $cpu->db_column          => '4.1',
+            'null'.$phone->db_column => '8304997586',
+        ])->assertStatus(302);
+
+        $this->actingAs(User::factory()->editAssets()->create())->post(route('hardware/bulksave'), [
+            'ids'                  => $id_array,
+            null.$phone->db_column => 1,
+        ]);
+
+        Asset::findMany($id_array)->each(function (Asset $asset) use ($ram, $cpu, $phone) {
+            $this->assertEquals(16, $asset->{$ram->db_column});
+            $this->assertEquals('4.1', $asset->{$cpu->db_column});
+            $this->assertEquals(null, $asset->{$phone->db_column});
+        });
+    }
+
     public function testBulkEditAssetsAcceptsAndUpdatesEncryptedCustomFields()
     {
         $this->markIncompleteIfMySQL('Custom Fields tests do not work on MySQL');
@@ -165,7 +262,7 @@ class BulkEditAssetsTest extends TestCase
         });
     }
 
-    public function testBulkEditAssetsRequiresAdminUserToUpdateEncryptedCustomFields()
+    public function testBulkEditAssetsRequiresadminToUpdateEncryptedCustomFields()
     {
         $this->markIncompleteIfMySQL('Custom Fields tests do not work on mysql');
         $edit_user = User::factory()->editAssets()->create();
diff --git a/tests/Feature/Assets/Ui/CheckinCheckoutCounters.php b/tests/Feature/Assets/Ui/CheckinCheckoutCounters.php
new file mode 100644
index 0000000000..cd4faeaad9
--- /dev/null
+++ b/tests/Feature/Assets/Ui/CheckinCheckoutCounters.php
@@ -0,0 +1,65 @@
+<?php
+
+namespace Tests\Feature\Assets\Ui;
+
+use App\Models\Asset;
+use App\Models\AssetModel;
+use App\Models\Statuslabel;
+use App\Models\User;
+use PHPUnit\Framework\Attributes\Test;
+use Tests\TestCase;
+
+class CheckinCheckoutCounters extends TestCase
+{
+    #[Test]
+    function counters()
+    {
+        $admin = User::factory()->admin()->create();
+        $user = User::factory()->create();
+
+        // create an asset using the GUI
+        $this->actingAs($admin)
+            ->post(route('hardware.store'), [
+                'asset_tags' => ['1' => '1234'],
+                'model_id' => AssetModel::factory()->create()->id,
+                'status_id' => Statuslabel::factory()->readyToDeploy()->create()->id,
+            ])->assertRedirect();
+
+        $asset = Asset::where('asset_tag', '1234')->sole();
+
+        //ensure counters are initialized properly
+        $this->assertEquals(0,$asset->checkout_counter);
+        $this->assertEquals(0,$asset->checkin_counter);
+
+        //perform a checkout
+        $this->actingAs($admin)
+            ->post(route('hardware.checkout.store', $asset), [
+                'checkout_to_type' => 'user',
+                // overwrite the value from the default fields set above
+                'assigned_user' => (string) $user->id,
+                'name' => 'Changed Name',
+                'checkout_at' => '2024-03-18',
+                'expected_checkin' => '2024-03-28',
+                'note' => 'An awesome note',
+            ])->assertRedirect()->assertSessionHasNoErrors();
+
+        $asset->refresh();
+//        dump($asset);
+        $this->assertEquals(1,$asset->checkout_counter);
+        $this->assertEquals(0,$asset->checkin_counter);
+
+        //perform a check-in
+        $this->actingAs($admin)
+            ->post(
+                route('hardware.checkin.store', [$asset]),
+                [
+                    'name' => 'Changed Name Again',
+                ],
+            )->assertRedirect()->assertSessionHasNoErrors();
+
+        $asset->refresh();
+//        dump($asset);
+        $this->assertEquals(1,$asset->checkout_counter);
+        $this->assertEquals(1,$asset->checkin_counter);
+    }
+}
\ No newline at end of file
diff --git a/tests/Feature/Assets/Ui/CloneAssetTest.php b/tests/Feature/Assets/Ui/CloneAssetTest.php
new file mode 100644
index 0000000000..7989d008b5
--- /dev/null
+++ b/tests/Feature/Assets/Ui/CloneAssetTest.php
@@ -0,0 +1,37 @@
+<?php
+
+namespace Tests\Feature\Assets\Ui;
+
+use App\Models\Asset;
+use App\Models\User;
+use Tests\TestCase;
+
+class CloneAssetTest extends TestCase
+{
+    public function testPermissionRequiredToCreateAssetModel()
+    {
+        $asset = Asset::factory()->create();
+        $this->actingAs(User::factory()->create())
+            ->get(route('clone/hardware', $asset))
+            ->assertForbidden();
+    }
+
+    public function testPageCanBeAccessed(): void
+    {
+        $asset = Asset::factory()->create();
+        $response = $this->actingAs(User::factory()->createAssets()->create())
+            ->get(route('clone/hardware', $asset));
+        $response->assertStatus(200);
+    }
+
+    public function testAssetCanBeCloned()
+    {
+        $asset_to_clone = Asset::factory()->create(['name'=>'Asset to clone']);
+        $this->actingAs(User::factory()->createAssets()->create())
+            ->get(route('clone/hardware', $asset_to_clone))
+            ->assertOk()
+            ->assertSee([
+                'Asset to clone'
+            ], false);
+    }
+}
diff --git a/tests/Feature/Assets/Ui/DeleteAssetTest.php b/tests/Feature/Assets/Ui/DeleteAssetTest.php
new file mode 100644
index 0000000000..799643929b
--- /dev/null
+++ b/tests/Feature/Assets/Ui/DeleteAssetTest.php
@@ -0,0 +1,113 @@
+<?php
+
+namespace Tests\Feature\Assets\Ui;
+
+use App\Events\CheckoutableCheckedIn;
+use App\Models\Asset;
+use App\Models\User;
+use Illuminate\Support\Facades\Event;
+use Illuminate\Support\Facades\Storage;
+use Tests\TestCase;
+
+class DeleteAssetTest extends TestCase
+{
+    public function testPermissionNeededToDeleteAsset()
+    {
+        $this->actingAs(User::factory()->create())
+            ->delete(route('hardware.destroy', Asset::factory()->create()))
+            ->assertForbidden();
+    }
+
+    public function testCanDeleteAsset()
+    {
+        $asset = Asset::factory()->create();
+
+        $this->actingAs(User::factory()->deleteAssets()->create())
+            ->delete(route('hardware.destroy', $asset))
+            ->assertRedirectToRoute('hardware.index')
+            ->assertSessionHas('success');
+
+        $this->assertSoftDeleted($asset);
+    }
+
+    public function testActionLogEntryMadeWhenAssetDeleted()
+    {
+        $actor = User::factory()->deleteAssets()->create();
+
+        $asset = Asset::factory()->create();
+
+        $this->actingAs($actor)->delete(route('hardware.destroy', $asset));
+
+        $this->assertDatabaseHas('action_logs', [
+            'created_by' => $actor->id,
+            'action_type' => 'delete',
+            'target_id' => null,
+            'target_type' => null,
+            'item_type' => Asset::class,
+            'item_id' => $asset->id,
+        ]);
+    }
+
+    public function testActionLogsActionDateIsPopulatedWhenAssetDeleted()
+    {
+        $actor = User::factory()->deleteAssets()->create();
+
+        $asset = Asset::factory()->create();
+
+        $this->actingAs($actor)->delete(route('hardware.destroy', $asset));
+
+        $asset->refresh();
+
+        $this->assertDatabaseHas('action_logs', [
+            'action_date' => $asset->updated_at,
+            'created_at' => $asset->updated_at,
+            'created_by' => $actor->id,
+            'action_type' => 'delete',
+            'target_id' => null,
+            'target_type' => null,
+            'item_type' => Asset::class,
+            'item_id' => $asset->id,
+        ]);
+
+    }
+
+    public function testAssetIsCheckedInWhenDeleted()
+    {
+        Event::fake();
+
+        $assignedUser = User::factory()->create();
+        $asset = Asset::factory()->assignedToUser($assignedUser)->create();
+
+        $this->assertTrue($assignedUser->assets->contains($asset));
+
+        $this->actingAs(User::factory()->deleteAssets()->create())
+            ->delete(route('hardware.destroy', $asset));
+
+        $this->assertFalse(
+            $assignedUser->fresh()->assets->contains($asset),
+            'Asset still assigned to user after deletion'
+        );
+
+        $asset->refresh();
+        $this->assertNull($asset->assigned_to);
+        $this->assertNull($asset->assigned_type);
+
+        Event::assertDispatched(CheckoutableCheckedIn::class);
+    }
+
+    public function testImageIsDeletedWhenAssetDeleted()
+    {
+        Storage::fake('public');
+
+        $asset = Asset::factory()->create(['image' => 'image.jpg']);
+
+        Storage::disk('public')->put('assets/image.jpg', 'content');
+
+        Storage::disk('public')->assertExists('assets/image.jpg');
+
+        $this->actingAs(User::factory()->deleteAssets()->create())
+            ->delete(route('hardware.destroy', $asset));
+
+        Storage::disk('public')->assertMissing('assets/image.jpg');
+    }
+}
diff --git a/tests/Feature/Assets/Ui/EditAssetTest.php b/tests/Feature/Assets/Ui/EditAssetTest.php
new file mode 100644
index 0000000000..a2645f7320
--- /dev/null
+++ b/tests/Feature/Assets/Ui/EditAssetTest.php
@@ -0,0 +1,128 @@
+<?php
+
+namespace Tests\Feature\Assets\Ui;
+
+use App\Events\CheckoutableCheckedIn;
+use App\Models\Asset;
+use App\Models\AssetModel;
+use App\Models\Location;
+use App\Models\StatusLabel;
+use App\Models\User;
+use Illuminate\Support\Carbon;
+use Illuminate\Support\Facades\Event;
+use Tests\TestCase;
+
+class EditAssetTest extends TestCase
+{
+
+    public function testPermissionRequiredToViewAsset()
+    {
+        $asset = Asset::factory()->create();
+        $this->actingAs(User::factory()->create())
+            ->get(route('hardware.edit', $asset))
+            ->assertForbidden();
+    }
+
+    public function testPageCanBeAccessed(): void
+    {
+        $asset = Asset::factory()->create();
+        $user = User::factory()->editAssets()->create();
+        $response = $this->actingAs($user)->get(route('hardware.edit', $asset));
+        $response->assertStatus(200);
+    }
+
+    public function testAssetEditPostIsRedirectedIfRedirectSelectionIsIndex()
+    {
+        $asset = Asset::factory()->assignedToUser()->create();
+
+        $this->actingAs(User::factory()->viewAssets()->editAssets()->create())
+            ->from(route('hardware.edit', $asset))
+            ->put(route('hardware.update', $asset),
+                [
+                    'redirect_option' => 'index',
+                    'name' => 'New name',
+                    'asset_tags' => 'New Asset Tag',
+                    'status_id' => StatusLabel::factory()->create()->id,
+                    'model_id' => AssetModel::factory()->create()->id,
+                ])
+            ->assertStatus(302)
+            ->assertRedirect(route('hardware.index'));
+        $this->assertDatabaseHas('assets', ['asset_tag' => 'New Asset Tag']);
+    }
+    public function testAssetEditPostIsRedirectedIfRedirectSelectionIsItem()
+    {
+        $asset = Asset::factory()->create();
+
+        $this->actingAs(User::factory()->viewAssets()->editAssets()->create())
+            ->from(route('hardware.edit', $asset))
+            ->put(route('hardware.update', $asset), [
+                'redirect_option' => 'item',
+                'name' => 'New name',
+                'asset_tags' => 'New Asset Tag',
+                'status_id' => StatusLabel::factory()->create()->id,
+                'model_id' => AssetModel::factory()->create()->id,
+            ])
+            ->assertStatus(302)
+            ->assertRedirect(route('hardware.show', $asset));
+
+        $this->assertDatabaseHas('assets', ['asset_tag' => 'New Asset Tag']);
+    }
+
+    public function testNewCheckinIsLoggedIfStatusChangedToUndeployable()
+    {
+        Event::fake([CheckoutableCheckedIn::class]);
+
+        $user = User::factory()->create();
+        $deployable_status = Statuslabel::factory()->rtd()->create();
+        $achived_status = Statuslabel::factory()->archived()->create();
+        $asset = Asset::factory()->assignedToUser($user)->create(['status_id' => $deployable_status->id]);
+        $this->assertTrue($asset->assignedTo->is($user));
+
+        $currentTimestamp = now();
+
+        $this->actingAs(User::factory()->viewAssets()->editAssets()->create())
+            ->from(route('hardware.edit', $asset))
+            ->put(route('hardware.update', $asset), [
+                    'status_id' => $achived_status->id,
+                    'model_id' => $asset->model_id,
+                    'asset_tags' => $asset->asset_tag,
+                ],
+            )
+            ->assertStatus(302);
+            //->assertRedirect(route('hardware.show', ['hardware' => $asset->id]));;
+
+        // $asset->refresh();
+        $asset = Asset::find($asset->id);
+        $this->assertNull($asset->assigned_to);
+        $this->assertNull($asset->assigned_type);
+        $this->assertEquals($achived_status->id, $asset->status_id);
+
+        Event::assertDispatched(function (CheckoutableCheckedIn $event) use ($currentTimestamp) {
+            return (int) Carbon::parse($event->action_date)->diffInSeconds($currentTimestamp, true) < 2;
+        }, 1);
+    }
+
+    public function testCurrentLocationIsNotUpdatedOnEdit()
+    {
+        $defaultLocation = Location::factory()->create();
+        $currentLocation = Location::factory()->create();
+        $asset = Asset::factory()->create([
+            'location_id' => $currentLocation->id,
+            'rtd_location_id' => $defaultLocation->id
+        ]);
+
+        $this->actingAs(User::factory()->viewAssets()->editAssets()->create())
+            ->put(route('hardware.update', $asset), [
+                'redirect_option' => 'item',
+                'name' => 'New name',
+                'asset_tags' => 'New Asset Tag',
+                'status_id' => $asset->status_id,
+                'model_id' => $asset->model_id,
+            ]);
+
+        $asset->refresh();
+        $this->assertEquals('New name', $asset->name);
+        $this->assertEquals($currentLocation->id, $asset->location_id);
+    }
+
+}
diff --git a/tests/Feature/Assets/Ui/ShowAssetTest.php b/tests/Feature/Assets/Ui/ShowAssetTest.php
new file mode 100644
index 0000000000..23b6c8f31e
--- /dev/null
+++ b/tests/Feature/Assets/Ui/ShowAssetTest.php
@@ -0,0 +1,26 @@
+<?php
+
+namespace Tests\Feature\Assets\Ui;
+
+use App\Models\Asset;
+use App\Models\User;
+use Tests\TestCase;
+
+class ShowAssetTest extends TestCase
+{
+    public function testPageForAssetWithMissingModelStillRenders()
+    {
+        $asset = Asset::factory()->create();
+
+        $asset->model_id = null;
+        $asset->forceSave();
+
+        $asset->refresh();
+
+        $this->assertNull($asset->fresh()->model_id, 'This test needs model_id to be null to be helpful.');
+
+        $this->actingAs(User::factory()->superuser()->create())
+            ->get(route('hardware.show', $asset))
+            ->assertOk();
+    }
+}
diff --git a/tests/Feature/Assets/Ui/StoreAssetWithFullMultipleCompanySupportTest.php b/tests/Feature/Assets/Ui/StoreAssetWithFullMultipleCompanySupportTest.php
new file mode 100644
index 0000000000..3443256030
--- /dev/null
+++ b/tests/Feature/Assets/Ui/StoreAssetWithFullMultipleCompanySupportTest.php
@@ -0,0 +1,35 @@
+<?php
+
+namespace Tests\Feature\Assets\Ui;
+
+use App\Models\Asset;
+use App\Models\AssetModel;
+use App\Models\Statuslabel;
+use PHPUnit\Framework\Attributes\DataProvider;
+use Tests\Support\ProvidesDataForFullMultipleCompanySupportTesting;
+use Tests\TestCase;
+
+class StoreAssetWithFullMultipleCompanySupportTest extends TestCase
+{
+    use ProvidesDataForFullMultipleCompanySupportTesting;
+
+    #[DataProvider('dataForFullMultipleCompanySupportTesting')]
+    public function testAdheresToFullMultipleCompaniesSupportScoping($data)
+    {
+        ['actor' => $actor, 'company_attempting_to_associate' => $company, 'assertions' => $assertions] = $data();
+
+        $this->settings->enableMultipleFullCompanySupport();
+
+        $this->actingAs($actor)
+            ->post(route('hardware.store'), [
+                'asset_tags' => ['1' => '1234'],
+                'model_id' => AssetModel::factory()->create()->id,
+                'status_id' => Statuslabel::factory()->create()->id,
+                'company_id' => $company->id,
+            ]);
+
+        $asset = Asset::where('asset_tag', '1234')->sole();
+
+        $assertions($asset);
+    }
+}
diff --git a/tests/Feature/Assets/Ui/StoreAssetsTest.php b/tests/Feature/Assets/Ui/StoreAssetsTest.php
new file mode 100644
index 0000000000..8abea545cf
--- /dev/null
+++ b/tests/Feature/Assets/Ui/StoreAssetsTest.php
@@ -0,0 +1,16 @@
+<?php
+
+namespace Tests\Feature\Assets\Ui;
+
+use App\Models\User;
+use Tests\TestCase;
+
+class StoreAssetsTest extends TestCase
+{
+    public function testPageRenders()
+    {
+        $this->actingAs(User::factory()->superuser()->create())
+            ->get(route('hardware.create'))
+            ->assertOk();
+    }
+}
diff --git a/tests/Feature/Authentication/LoginTest.php b/tests/Feature/Authentication/LoginTest.php
new file mode 100644
index 0000000000..98f84527db
--- /dev/null
+++ b/tests/Feature/Authentication/LoginTest.php
@@ -0,0 +1,84 @@
+<?php
+
+namespace Tests\Feature\Authentication;
+
+use App\Models\User;
+use Tests\TestCase;
+
+class LoginTest extends TestCase
+{
+    public function testLogsFailedLoginAttempt()
+    {
+
+        User::factory()->create(['username' => 'username_here']);
+
+        $this->withServerVariables(['REMOTE_ADDR' => '127.0.0.100'])
+            ->post('/login', [
+                'username' => 'username_here',
+                'password' => 'not a real password',
+            ], [
+                'User-Agent' => 'Some Custom User Agent',
+            ]);
+
+        $this->assertDatabaseHas('login_attempts', [
+            'username' => 'username_here',
+            'remote_ip' => '127.0.0.100',
+            'user_agent' => 'Some Custom User Agent',
+            'successful' => 0,
+        ]);
+    }
+
+
+    public function testLoginThrottleConfigIsRespected()
+    {
+
+       $this->markTestIncomplete("This test is flaky and needs to be fixed. Passes and fails seemingly at random.");
+       User::factory()->create(['username' => 'username_here']);
+
+       config(['auth.passwords.users.throttle.max_attempts' => 1]);
+       config(['auth.passwords.users.throttle.lockout_duration' => 1]);
+
+        for ($i = 0; $i < 2; ++$i) {
+            $this->from('/login')
+                ->withServerVariables(['REMOTE_ADDR' => '127.0.0.100'])
+                ->post('/login', [
+                    'username' => 'invalid username',
+                    'password' => 'invalid password',
+                ]);
+        }
+
+
+        $response = $this->from('/login')
+            ->withServerVariables(['REMOTE_ADDR' => '127.0.0.100'])
+            ->post('/login', [
+                'username' => 'invalid username',
+                'password' => 'invalid password',
+            ])
+            ->assertSessionHasErrors(['username'])
+            ->assertStatus(302)
+            ->assertRedirect('/login');
+
+        $this->followRedirects($response)->assertSee(trans('auth.throttle', ['minutes' => 1]));
+    }
+
+    public function testLogsSuccessfulLogin()
+    {
+        $this->markTestIncomplete("This test is flaky and needs to be fixed. Passes and fails seemingly at random.");
+        User::factory()->create(['username' => 'username_here']);
+
+        $this->withServerVariables(['REMOTE_ADDR' => '127.0.0.100'])
+            ->post('/login', [
+                'username' => 'username_here',
+                'password' => 'password',
+            ], [
+                'User-Agent' => 'Some Custom User Agent',
+            ]);
+
+        $this->assertDatabaseHas('login_attempts', [
+            'username' => 'username_here',
+            'remote_ip' => '127.0.0.100',
+            'user_agent' => 'Some Custom User Agent',
+            'successful' => 1,
+        ]);
+    }
+}
diff --git a/tests/Feature/Categories/Api/CreateCategoriesTest.php b/tests/Feature/Categories/Api/CreateCategoriesTest.php
new file mode 100644
index 0000000000..2a4a0661a6
--- /dev/null
+++ b/tests/Feature/Categories/Api/CreateCategoriesTest.php
@@ -0,0 +1,85 @@
+<?php
+
+namespace Tests\Feature\Categories\Api;
+
+use App\Models\Asset;
+use App\Models\AssetModel;
+use App\Models\Category;
+use App\Models\User;
+use Illuminate\Testing\Fluent\AssertableJson;
+use Tests\TestCase;
+
+class CreateCategoriesTest extends TestCase
+{
+
+
+    public function testRequiresPermissionToCreateCategory()
+    {
+        $this->actingAsForApi(User::factory()->create())
+            ->postJson(route('api.categories.store'))
+            ->assertForbidden();
+    }
+
+    public function testCanCreateCategoryWithValidCategoryType()
+    {
+        $response = $this->actingAsForApi(User::factory()->superuser()->create())
+            ->postJson(route('api.categories.store'), [
+                'name' => 'Test Category',
+                'eula_text' => 'Test EULA',
+                'category_type' => 'accessory',
+                'notes' => 'Test Note',
+            ])
+            ->assertOk()
+            ->assertStatusMessageIs('success')
+            ->assertStatus(200)
+            ->json();
+
+        $this->assertTrue(Category::where('name', 'Test Category')->exists());
+
+        $category = Category::find($response['payload']['id']);
+        $this->assertEquals('Test Category', $category->name);
+        $this->assertEquals('Test EULA', $category->eula_text);
+        $this->assertEquals('Test Note', $category->notes);
+        $this->assertEquals('accessory', $category->category_type);
+    }
+
+    public function testCannotCreateCategoryWithoutCategoryType()
+    {
+        $response = $this->actingAsForApi(User::factory()->superuser()->create())
+            ->postJson(route('api.categories.store'), [
+                'name' => 'Test Category',
+            ])
+            ->assertOk()
+            ->assertStatus(200)
+            ->assertStatusMessageIs('error')
+            ->assertJson([
+                'messages' => [
+                    'category_type'    => ['The category type field is required.'],
+                ],
+            ]);
+        $this->assertFalse(Category::where('name', 'Test Category')->exists());
+
+    }
+
+    public function testCannotCreateCategoryWithInvalidCategoryType()
+    {
+        $this->actingAsForApi(User::factory()->superuser()->create())
+            ->postJson(route('api.categories.store'), [
+                'name' => 'Test Category',
+                'eula_text' => 'Test EULA',
+                'category_type' => 'invalid',
+            ])
+            ->assertOk()
+            ->assertStatus(200)
+            ->assertStatusMessageIs('error')
+            ->assertJson([
+                'messages' => [
+                    'category_type'    => ['The selected category type is invalid.'],
+                ],
+            ]);
+        
+        $this->assertFalse(Category::where('name', 'Test Category')->exists());
+
+    }
+
+}
diff --git a/tests/Feature/Categories/Api/DeleteCategoriesTest.php b/tests/Feature/Categories/Api/DeleteCategoriesTest.php
new file mode 100644
index 0000000000..22aeb7d424
--- /dev/null
+++ b/tests/Feature/Categories/Api/DeleteCategoriesTest.php
@@ -0,0 +1,59 @@
+<?php
+
+namespace Tests\Feature\Categories\Api;
+
+use App\Models\Asset;
+use App\Models\AssetModel;
+use App\Models\Category;
+use App\Models\User;
+use Tests\Concerns\TestsPermissionsRequirement;
+use Tests\TestCase;
+
+class DeleteCategoriesTest extends TestCase implements TestsPermissionsRequirement
+{
+    public function testRequiresPermission()
+    {
+        $category = Category::factory()->create();
+
+        $this->actingAsForApi(User::factory()->create())
+            ->deleteJson(route('api.categories.destroy', $category))
+            ->assertForbidden();
+
+        $this->assertNotSoftDeleted($category);
+    }
+
+    public function testCannotDeleteCategoryThatStillHasAssociatedAssets()
+    {
+        $asset = Asset::factory()->create();
+        $category = $asset->model->category;
+
+        $this->actingAsForApi(User::factory()->deleteCategories()->create())
+            ->deleteJson(route('api.categories.destroy', $category))
+            ->assertStatusMessageIs('error');
+
+        $this->assertNotSoftDeleted($category);
+    }
+
+    public function testCannotDeleteCategoryThatStillHasAssociatedModels()
+    {
+        $model = AssetModel::factory()->create();
+        $category = $model->category;
+
+        $this->actingAsForApi(User::factory()->deleteCategories()->create())
+            ->deleteJson(route('api.categories.destroy', $category))
+            ->assertStatusMessageIs('error');
+
+        $this->assertNotSoftDeleted($category);
+    }
+
+    public function testCanDeleteCategory()
+    {
+        $category = Category::factory()->create();
+
+        $this->actingAsForApi(User::factory()->deleteCategories()->create())
+            ->deleteJson(route('api.categories.destroy', $category))
+            ->assertStatusMessageIs('success');
+
+        $this->assertSoftDeleted($category);
+    }
+}
diff --git a/tests/Feature/Categories/Api/IndexCategoriesTest.php b/tests/Feature/Categories/Api/IndexCategoriesTest.php
new file mode 100644
index 0000000000..d27bfbb068
--- /dev/null
+++ b/tests/Feature/Categories/Api/IndexCategoriesTest.php
@@ -0,0 +1,70 @@
+<?php
+
+namespace Tests\Feature\Categories\Api;
+
+use App\Models\Category;
+use App\Models\User;
+use Illuminate\Testing\Fluent\AssertableJson;
+use Tests\TestCase;
+
+class IndexCategoriesTest extends TestCase
+{
+
+    public function testViewingCategoryIndexRequiresPermission()
+    {
+        $this->actingAsForApi(User::factory()->create())
+            ->getJson(route('api.departments.index'))
+            ->assertForbidden();
+    }
+
+    public function testCategoryIndexReturnsExpectedSearchResults()
+    {
+        Category::factory()->count(10)->create();
+        Category::factory()->count(1)->forAssets()->create(['name' => 'My Test Category']);
+
+        $this->actingAsForApi(User::factory()->superuser()->create())
+            ->getJson(
+                route('api.categories.index', [
+                    'search' => 'My Test Category',
+                    'sort' => 'name',
+                    'order' => 'asc',
+                    'offset' => '0',
+                    'limit' => '20',
+                ]))
+            ->assertOk()
+            ->assertJsonStructure([
+                'total',
+                'rows',
+            ])
+            ->assertJson([
+                'total' => 1,
+            ]);
+
+    }
+
+
+    public function testCategoryIndexReturnsExpectedCategories()
+    {
+        $this->markTestIncomplete('Not sure why the category factory is generating one more than expected here.');
+        Category::factory()->count(3)->create();
+
+        $this->actingAsForApi(User::factory()->superuser()->create())
+            ->getJson(
+                route('api.categories.index', [
+                    'sort' => 'id',
+                    'order' => 'asc',
+                    'offset' => '0',
+                    'limit' => '20',
+                ]))
+            ->assertOk()
+            ->assertJsonStructure([
+                'total',
+                'rows',
+            ])
+            ->assertJson([
+                'total' => 3,
+            ]);
+
+    }
+
+}
diff --git a/tests/Feature/Categories/Api/UpdateCategoriesTest.php b/tests/Feature/Categories/Api/UpdateCategoriesTest.php
new file mode 100644
index 0000000000..6d6bc8da10
--- /dev/null
+++ b/tests/Feature/Categories/Api/UpdateCategoriesTest.php
@@ -0,0 +1,59 @@
+<?php
+
+namespace Tests\Feature\Categories\Api;
+
+use App\Models\Category;
+use App\Models\User;
+use Tests\TestCase;
+
+class UpdateCategoriesTest extends TestCase
+{
+
+    public function testCanUpdateCategoryViaPatchWithoutCategoryType()
+    {
+        $category = Category::factory()->create();
+
+        $this->actingAsForApi(User::factory()->superuser()->create())
+            ->patchJson(route('api.categories.update', $category), [
+                'name' => 'Test Category',
+                'eula_text' => 'Test EULA',
+                'notes' => 'Test Note',
+            ])
+            ->assertOk()
+            ->assertStatusMessageIs('success')
+            ->assertStatus(200)
+            ->json();
+
+        //dd($response);
+        $category->refresh();
+        $this->assertEquals('Test Category', $category->name, 'Name was not updated');
+        $this->assertEquals('Test EULA', $category->eula_text, 'EULA was not updated');
+        $this->assertEquals('Test Note', $category->notes, 'Note was not updated');
+
+    }
+
+    public function testCannotUpdateCategoryViaPatchWithCategoryType()
+    {
+        $category = Category::factory()->create();
+
+        $this->actingAsForApi(User::factory()->superuser()->create())
+            ->patchJson(route('api.categories.update', $category), [
+                'name' => 'Test Category',
+                'eula_text' => 'Test EULA',
+                'category_type' => 'accessory',
+                'note' => 'Test Note',
+            ])
+            ->assertOk()
+            ->assertStatusMessageIs('error')
+            ->assertStatus(200)
+            ->json();
+        
+        $category->refresh();
+        $this->assertNotEquals('Test Category', $category->name, 'Name was not updated');
+        $this->assertNotEquals('Test EULA', $category->eula_text, 'EULA was not updated');
+        $this->assertNotEquals('Test Note', $category->notes, 'Note was not updated');
+        $this->assertNotEquals('accessory', $category->category_type, 'EULA was not updated');
+
+    }
+
+}
diff --git a/tests/Feature/Categories/Ui/CreateCategoriesTest.php b/tests/Feature/Categories/Ui/CreateCategoriesTest.php
new file mode 100644
index 0000000000..694b61c613
--- /dev/null
+++ b/tests/Feature/Categories/Ui/CreateCategoriesTest.php
@@ -0,0 +1,59 @@
+<?php
+
+namespace Tests\Feature\Categories\Ui;
+
+use App\Models\AssetModel;
+use App\Models\Category;
+use App\Models\User;
+use Tests\TestCase;
+
+class CreateCategoriesTest extends TestCase
+{
+    public function testPermissionRequiredToCreateCategories()
+    {
+        $this->actingAs(User::factory()->create())
+            ->post(route('categories.store'), [
+                'name' => 'Test Category',
+                'category_type' => 'asset',
+            ])
+            ->assertForbidden();
+    }
+
+    public function testPageRenders()
+    {
+        $this->actingAs(User::factory()->superuser()->create())
+            ->get(route('categories.create'))
+            ->assertOk();
+    }
+
+    public function testUserCanCreateCategories()
+    {
+        $this->assertFalse(Category::where('name', 'Test Category')->exists());
+
+        $this->actingAs(User::factory()->superuser()->create())
+            ->post(route('categories.store'), [
+                'name' => 'Test Category',
+                'category_type' => 'asset',
+                'notes' => 'Test Note',
+            ])
+            ->assertRedirect(route('categories.index'));
+
+        $this->assertTrue(Category::where('name', 'Test Category')->where('notes', 'Test Note')->exists());
+    }
+
+    public function testUserCannotCreateCategoriesWithInvalidType()
+    {
+        $this->assertFalse(Category::where('name', 'Test Category')->exists());
+
+        $this->actingAs(User::factory()->superuser()->create())
+            ->from(route('categories.create'))
+            ->post(route('categories.store'), [
+                'name' => 'Test Category',
+                'category_type' => 'invalid',
+            ])
+            ->assertRedirect(route('categories.create'));
+
+        $this->assertFalse(Category::where('name', 'Test Category')->exists());
+    }
+
+}
diff --git a/tests/Feature/Categories/Ui/DeleteCategoriesTest.php b/tests/Feature/Categories/Ui/DeleteCategoriesTest.php
new file mode 100644
index 0000000000..3cd342a78a
--- /dev/null
+++ b/tests/Feature/Categories/Ui/DeleteCategoriesTest.php
@@ -0,0 +1,60 @@
+<?php
+
+namespace Tests\Feature\Categories\Ui;
+
+use App\Events\CheckoutableCheckedIn;
+use App\Models\Asset;
+use App\Models\AssetModel;
+use App\Models\User;
+use App\Models\Category;
+use Illuminate\Support\Facades\Event;
+use Illuminate\Support\Facades\Storage;
+use Tests\TestCase;
+
+class DeleteCategoriesTest extends TestCase
+{
+    public function testPermissionNeededToDeleteCategory()
+    {
+        $this->actingAs(User::factory()->create())
+            ->delete(route('categories.destroy', Category::factory()->create()))
+            ->assertForbidden();
+    }
+
+    public function testCanDeleteCategory()
+    {
+        $category = Category::factory()->create();
+
+        $this->actingAs(User::factory()->deleteCategories()->create())
+            ->delete(route('categories.destroy', $category))
+            ->assertRedirectToRoute('categories.index')
+            ->assertSessionHas('success');
+
+        $this->assertSoftDeleted($category);
+    }
+
+    public function testCannotDeleteCategoryThatStillHasAssociatedModels()
+    {
+        $model = AssetModel::factory()->create();
+        $category = $model->category;
+
+        $this->actingAs(User::factory()->deleteCategories()->create())
+            ->delete(route('categories.destroy', $category))
+            ->assertRedirectToRoute('categories.index')
+            ->assertSessionHas('error');
+        $this->assertNotSoftDeleted($category);
+    }
+
+    public function testCannotDeleteCategoryThatStillHasAssociatedAssets()
+    {
+        $asset = Asset::factory()->create();
+        $category = $asset->model->category;
+
+        $this->actingAs(User::factory()->deleteCategories()->create())
+            ->delete(route('categories.destroy', $category))
+            ->assertRedirectToRoute('categories.index')
+            ->assertSessionHas('error');
+
+        $this->assertNotSoftDeleted($category);
+    }
+
+}
diff --git a/tests/Feature/Categories/Ui/IndexCategoriesTest.php b/tests/Feature/Categories/Ui/IndexCategoriesTest.php
new file mode 100644
index 0000000000..caacba99a9
--- /dev/null
+++ b/tests/Feature/Categories/Ui/IndexCategoriesTest.php
@@ -0,0 +1,23 @@
+<?php
+
+namespace Tests\Feature\Categories\Ui;
+
+use App\Models\User;
+use Tests\TestCase;
+
+class IndexCategoriesTest extends TestCase
+{
+    public function testPermissionRequiredToViewCategoryList()
+    {
+        $this->actingAs(User::factory()->create())
+            ->get(route('categories.index'))
+            ->assertForbidden();
+    }
+
+    public function testUserCanListCategories()
+    {
+        $this->actingAs(User::factory()->superuser()->create())
+            ->get(route('categories.index'))
+            ->assertOk();
+    }
+}
diff --git a/tests/Feature/Categories/Ui/ShowCategoryTest.php b/tests/Feature/Categories/Ui/ShowCategoryTest.php
new file mode 100644
index 0000000000..93a9cc0af2
--- /dev/null
+++ b/tests/Feature/Categories/Ui/ShowCategoryTest.php
@@ -0,0 +1,17 @@
+<?php
+
+namespace Tests\Feature\Categories\Ui;
+
+use App\Models\Category;
+use App\Models\User;
+use Tests\TestCase;
+
+class ShowCategoryTest extends TestCase
+{
+    public function testPageRenders()
+    {
+        $this->actingAs(User::factory()->superuser()->create())
+            ->get(route('categories.show', Category::factory()->create()))
+            ->assertOk();
+    }
+}
diff --git a/tests/Feature/Categories/Ui/UpdateCategoriesTest.php b/tests/Feature/Categories/Ui/UpdateCategoriesTest.php
new file mode 100644
index 0000000000..ea5cc63388
--- /dev/null
+++ b/tests/Feature/Categories/Ui/UpdateCategoriesTest.php
@@ -0,0 +1,106 @@
+<?php
+
+namespace Tests\Feature\Categories\Ui;
+
+use App\Models\Category;
+use App\Models\Asset;
+use App\Models\User;
+use Tests\TestCase;
+
+class UpdateCategoriesTest extends TestCase
+{
+    public function testPermissionRequiredToStoreCategory()
+    {
+        $this->actingAs(User::factory()->create())
+            ->post(route('categories.store'), [
+                'name' => 'Test Category',
+                'category_type' => 'asset'
+            ])
+            ->assertStatus(403)
+            ->assertForbidden();
+    }
+
+    public function testPageRenders()
+    {
+        $this->actingAs(User::factory()->superuser()->create())
+            ->get(route('categories.edit', Category::factory()->create()))
+            ->assertOk();
+    }
+
+    public function testUserCanCreateCategories()
+    {
+        $this->actingAs(User::factory()->superuser()->create())
+            ->post(route('categories.store'), [
+                'name' => 'Test Category',
+                'category_type' => 'asset',
+            ])
+            ->assertStatus(302)
+            ->assertSessionHasNoErrors()
+            ->assertRedirect(route('categories.index'));
+
+        $this->assertTrue(Category::where('name', 'Test Category')->exists());
+    }
+
+    public function testUserCanEditAssetCategory()
+    {
+        $category = Category::factory()->forAssets()->create(['name' => 'Test Category']);
+        $this->assertTrue(Category::where('name', 'Test Category')->exists());
+
+        $response = $this->actingAs(User::factory()->superuser()->create())
+            ->put(route('categories.update', $category), [
+                'name' => 'Test Category Edited',
+                'notes' => 'Test Note Edited',
+            ])
+            ->assertStatus(302)
+            ->assertSessionHasNoErrors()
+            ->assertRedirect(route('categories.index'));
+
+        $this->followRedirects($response)->assertSee('Success');
+        $this->assertTrue(Category::where('name', 'Test Category Edited')->where('notes', 'Test Note Edited')->exists());
+
+    }
+
+    public function testUserCanChangeCategoryTypeIfNoAssetsAssociated()
+    {
+        $category = Category::factory()->forAssets()->create(['name' => 'Test Category']);
+        $this->assertTrue(Category::where('name', 'Test Category')->exists());
+
+        $response = $this->actingAs(User::factory()->superuser()->create())
+            ->from(route('categories.edit', $category->id))
+            ->put(route('categories.update', $category), [
+                'name' => 'Test Category Edited',
+                'category_type' => 'accessory',
+                'notes' => 'Test Note Edited',
+            ])
+            ->assertSessionHasNoErrors()
+            ->assertStatus(302)
+            ->assertRedirect(route('categories.index'));
+
+        $this->followRedirects($response)->assertSee('Success');
+        $this->assertTrue(Category::where('name', 'Test Category Edited')->where('notes', 'Test Note Edited')->exists());
+
+    }
+
+    public function testUserCannotChangeCategoryTypeIfAssetsAreAssociated()
+    {
+        Asset::factory()->count(5)->laptopMbp()->create();
+        $category = Category::where('name', 'Laptops')->first();
+
+        $response = $this->actingAs(User::factory()->superuser()->create())
+            ->from(route('categories.edit', $category))
+            ->put(route('categories.update', $category), [
+                'name' => 'Test Category Edited',
+                'category_type' => 'accessory',
+                'notes' => 'Test Note Edited',
+            ])
+            ->assertSessionHasErrors(['category_type'])
+            ->assertInvalid(['category_type'])
+            ->assertStatus(302)
+            ->assertRedirect(route('categories.edit', $category));
+
+        $this->followRedirects($response)->assertSee(trans('general.error'));
+        $this->assertFalse(Category::where('name', 'Test Category Edited')->where('notes', 'Test Note Edited')->exists());
+
+    }
+
+}
diff --git a/tests/Feature/Checkins/Api/AccessoryCheckinTest.php b/tests/Feature/Checkins/Api/AccessoryCheckinTest.php
new file mode 100644
index 0000000000..d5f45f22ae
--- /dev/null
+++ b/tests/Feature/Checkins/Api/AccessoryCheckinTest.php
@@ -0,0 +1,86 @@
+<?php
+
+namespace Tests\Feature\Checkins\Api;
+
+use App\Models\Accessory;
+use App\Models\Company;
+use App\Models\User;
+use Tests\Concerns\TestsFullMultipleCompaniesSupport;
+use Tests\Concerns\TestsPermissionsRequirement;
+use Tests\TestCase;
+
+class AccessoryCheckinTest extends TestCase implements TestsFullMultipleCompaniesSupport, TestsPermissionsRequirement
+{
+    public function testRequiresPermission()
+    {
+        $accessory = Accessory::factory()->checkedOutToUser()->create();
+        $accessoryCheckout = $accessory->checkouts->first();
+
+        $this->actingAsForApi(User::factory()->create())
+            ->postJson(route('api.accessories.checkin', $accessoryCheckout))
+            ->assertForbidden();
+    }
+
+    public function testAdheresToFullMultipleCompaniesSupportScoping()
+    {
+        [$companyA, $companyB] = Company::factory()->count(2)->create();
+
+        $superUser = $companyA->users()->save(User::factory()->superuser()->make());
+        $userInCompanyA = User::factory()->for($companyA)->checkinAccessories()->create();
+        $accessoryForCompanyB = Accessory::factory()->for($companyB)->checkedOutToUser()->create();
+        $anotherAccessoryForCompanyB = Accessory::factory()->for($companyB)->checkedOutToUser()->create();
+
+        $this->assertEquals(1, $accessoryForCompanyB->checkouts->count());
+        $this->assertEquals(1, $anotherAccessoryForCompanyB->checkouts->count());
+
+        $this->settings->enableMultipleFullCompanySupport();
+
+        $this->actingAsForApi($userInCompanyA)
+            ->postJson(route('api.accessories.checkin', $accessoryForCompanyB->checkouts->first()))
+            ->assertForbidden();
+
+        $this->actingAsForApi($superUser)
+            ->postJson(route('api.accessories.checkin', $anotherAccessoryForCompanyB->checkouts->first()))
+            ->assertStatusMessageIs('success');
+
+        $this->assertEquals(1, $accessoryForCompanyB->fresh()->checkouts->count(), 'Accessory should not be checked in');
+        $this->assertEquals(0, $anotherAccessoryForCompanyB->fresh()->checkouts->count(), 'Accessory should be checked in');
+    }
+
+    public function testCanCheckinAccessory()
+    {
+        $accessory = Accessory::factory()->checkedOutToUser()->create();
+
+        $this->assertEquals(1, $accessory->checkouts->count());
+
+        $accessoryCheckout = $accessory->checkouts->first();
+
+        $this->actingAsForApi(User::factory()->checkinAccessories()->create())
+            ->postJson(route('api.accessories.checkin', $accessoryCheckout))
+            ->assertStatusMessageIs('success');
+
+        $this->assertEquals(0, $accessory->fresh()->checkouts->count(), 'Accessory should be checked in');
+    }
+
+    public function testCheckinIsLogged()
+    {
+        $user = User::factory()->create();
+        $actor = User::factory()->checkinAccessories()->create();
+
+        $accessory = Accessory::factory()->checkedOutToUser($user)->create();
+        $accessoryCheckout = $accessory->checkouts->first();
+
+        $this->actingAsForApi($actor)
+            ->postJson(route('api.accessories.checkin', $accessoryCheckout))
+            ->assertStatusMessageIs('success');
+
+        $this->assertDatabaseHas('action_logs', [
+            'created_by' => $actor->id,
+            'action_type' => 'checkin from',
+            'target_id' => $user->id,
+            'target_type' => User::class,
+            'item_id' => $accessory->id,
+            'item_type' => Accessory::class,
+        ]);
+    }
+}
diff --git a/tests/Feature/Checkins/Api/AssetCheckinTest.php b/tests/Feature/Checkins/Api/AssetCheckinTest.php
index 0e041fc73a..7ce3d05619 100644
--- a/tests/Feature/Checkins/Api/AssetCheckinTest.php
+++ b/tests/Feature/Checkins/Api/AssetCheckinTest.php
@@ -72,7 +72,7 @@ class AssetCheckinTest extends TestCase
 
         Event::assertDispatched(function (CheckoutableCheckedIn $event) use ($currentTimestamp) {
             // this could be better mocked but is ok for now.
-            return Carbon::parse($event->action_date)->diffInSeconds($currentTimestamp) < 2;
+            return (int) Carbon::parse($event->action_date)->diffInSeconds($currentTimestamp, true) < 2;
         }, 1);
     }
 
diff --git a/tests/Feature/Checkins/Api/ComponentCheckinTest.php b/tests/Feature/Checkins/Api/ComponentCheckinTest.php
new file mode 100644
index 0000000000..0497a8135c
--- /dev/null
+++ b/tests/Feature/Checkins/Api/ComponentCheckinTest.php
@@ -0,0 +1,164 @@
+<?php
+
+namespace Tests\Feature\Checkins\Api;
+
+use App\Events\CheckoutableCheckedIn;
+use App\Models\Asset;
+use App\Models\Company;
+use App\Models\Component;
+use App\Models\User;
+use Illuminate\Support\Facades\Event;
+use Tests\Concerns\TestsFullMultipleCompaniesSupport;
+use Tests\Concerns\TestsPermissionsRequirement;
+use Tests\TestCase;
+
+class ComponentCheckinTest extends TestCase implements TestsFullMultipleCompaniesSupport, TestsPermissionsRequirement
+{
+    public function testRequiresPermission()
+    {
+        $component = Component::factory()->checkedOutToAsset()->create();
+
+        $this->actingAsForApi(User::factory()->create())
+            ->postJson(route('api.components.checkin', $component->assets->first()->pivot->id))
+            ->assertForbidden();
+    }
+
+    public function testHandlesNonExistentPivotId()
+    {
+        $this->actingAsForApi(User::factory()->checkinComponents()->create())
+            ->postJson(route('api.components.checkin', 1000), [
+                'checkin_qty' => 1,
+            ])
+            ->assertOk()
+            ->assertStatusMessageIs('error');
+    }
+
+    public function testHandlesNonExistentComponent()
+    {
+        $component = Component::factory()->checkedOutToAsset()->create();
+        $pivotId = $component->assets->first()->pivot->id;
+        $component->delete();
+
+        $this->actingAsForApi(User::factory()->checkinComponents()->create())
+            ->postJson(route('api.components.checkin', $pivotId), [
+                'checkin_qty' => 1,
+            ])
+            ->assertOk()
+            ->assertStatusMessageIs('error');
+    }
+
+    public function testCannotCheckinMoreThanCheckedOut()
+    {
+        $component = Component::factory()->checkedOutToAsset()->create();
+
+        $pivot = $component->assets->first()->pivot;
+        $pivot->update(['assigned_qty' => 1]);
+
+        $this->actingAsForApi(User::factory()->checkinComponents()->create())
+            ->postJson(route('api.components.checkin', $component->assets->first()->pivot->id), [
+                'checkin_qty' => 3,
+            ])
+            ->assertOk()
+            ->assertStatusMessageIs('error');
+    }
+
+    public function testCanCheckinComponent()
+    {
+        Event::fake([CheckoutableCheckedIn::class]);
+
+        $user = User::factory()->checkinComponents()->create();
+
+        $component = Component::factory()->checkedOutToAsset()->create();
+        $pivot = $component->assets->first()->pivot;
+        $pivot->update(['assigned_qty' => 3]);
+
+
+        $this->actingAsForApi($user)
+            ->postJson(route('api.components.checkin', $component->assets->first()->pivot->id), [
+                'checkin_qty' => 2,
+                'note' => 'my note',
+            ])
+            ->assertOk()
+            ->assertStatusMessageIs('success');
+
+        $this->assertEquals(1, $component->fresh()->assets->first()->pivot->assigned_qty);
+
+        Event::assertDispatched(function (CheckoutableCheckedIn $event) use ($user, $component) {
+            return $event->checkoutable->is($component)
+                && $event->checkedOutTo->is($component->assets->first())
+                && $event->checkedInBy->is($user)
+                && $event->note === 'my note';
+        });
+    }
+
+    public function testCheckingInEntireAssignedQuantityClearsThePivotRecordFromTheDatabase()
+    {
+        Event::fake([CheckoutableCheckedIn::class]);
+
+        $user = User::factory()->checkinComponents()->create();
+
+        $component = Component::factory()->checkedOutToAsset()->create();
+        $pivot = $component->assets->first()->pivot;
+        $pivot->update(['assigned_qty' => 3]);
+
+        $this->actingAsForApi($user)
+            ->postJson(route('api.components.checkin', $component->assets->first()->pivot->id), [
+                'checkin_qty' => 3,
+                'note' => 'my note',
+            ])
+            ->assertOk()
+            ->assertStatusMessageIs('success');
+
+        $this->assertEmpty($component->fresh()->assets);
+
+        Event::assertDispatched(function (CheckoutableCheckedIn $event) use ($user, $component) {
+            return $event->checkoutable->is($component)
+                && $event->checkedOutTo->is($component->assets->first())
+                && $event->checkedInBy->is($user)
+                && $event->note === 'my note';
+        });
+    }
+
+    public function testAdheresToFullMultipleCompaniesSupportScoping()
+    {
+        $this->settings->enableMultipleFullCompanySupport();
+
+        [$companyA, $companyB] = Company::factory()->count(2)->create();
+
+        $componentInCompanyA = Component::factory()->for($companyA)->checkedOutToAsset()->create();
+        $userInCompanyB = User::factory()->for($companyB)->create();
+        $pivotId = $componentInCompanyA->assets->first()->pivot->id;
+
+        $this->actingAsForApi($userInCompanyB)
+            ->postJson(route('api.components.checkin', $pivotId), [
+                'checkin_qty' => 1,
+            ])
+            ->assertOk()
+            ->assertStatusMessageIs('error');
+    }
+
+    public function testCheckinIsLogged()
+    {
+        $user = User::factory()->checkinComponents()->create();
+
+        $component = Component::factory()->checkedOutToAsset()->create();
+        $pivot = $component->assets->first()->pivot;
+        $pivot->update(['assigned_qty' => 3]);
+
+        $this->actingAsForApi($user)
+            ->postJson(route('api.components.checkin', $component->assets->first()->pivot->id), [
+                'checkin_qty' => 3,
+                'note' => 'my note',
+            ]);
+
+        $this->assertDatabaseHas('action_logs', [
+            'created_by' => $user->id,
+            'action_type' => 'checkin from',
+            'target_id' => $component->assets->first()->id,
+            'target_type' => Asset::class,
+            'note' => 'my note',
+            'item_id' => $component->id,
+            'item_type' => Component::class,
+        ]);
+    }
+}
diff --git a/tests/Feature/Checkins/Api/LicenseCheckInTest.php b/tests/Feature/Checkins/Api/LicenseCheckInTest.php
new file mode 100644
index 0000000000..385933655c
--- /dev/null
+++ b/tests/Feature/Checkins/Api/LicenseCheckInTest.php
@@ -0,0 +1,45 @@
+<?php
+namespace Tests\Feature\Checkins\Api;
+
+use App\Models\License;
+use App\Models\LicenseSeat;
+use App\Models\User;
+use Tests\TestCase;
+
+class LicenseCheckInTest extends TestCase {
+    public function testLicenseCheckin()
+    {
+        $authUser = User::factory()->superuser()->create();
+        $this->actingAsForApi($authUser);
+
+        $license = License::factory()->create();
+        $oldUser = User::factory()->create();
+
+        $licenseSeat = LicenseSeat::factory()->for($license)->create([
+            'assigned_to' => $oldUser->id,
+            'notes'       => 'Previously checked out',
+        ]);
+
+        $payload = [
+            'assigned_to' => null,
+            'asset_id'  => null,
+            'notes' => 'Checking in the seat',
+        ];
+
+        $response = $this->patchJson(
+            route('api.licenses.seats.update', [$license->id, $licenseSeat->id]),
+            $payload);
+
+        $response->assertStatus(200)
+            ->assertJsonFragment([
+                'status' => 'success',
+            ]);
+
+        $licenseSeat->refresh();
+
+        $this->assertNull($licenseSeat->assigned_to);
+        $this->assertNull($licenseSeat->asset_id);
+
+        $this->assertEquals('Checking in the seat', $licenseSeat->notes);
+    }
+}
\ No newline at end of file
diff --git a/tests/Feature/Checkins/Ui/AccessoryCheckinTest.php b/tests/Feature/Checkins/Ui/AccessoryCheckinTest.php
index 1213741bcc..a8572c6186 100644
--- a/tests/Feature/Checkins/Ui/AccessoryCheckinTest.php
+++ b/tests/Feature/Checkins/Ui/AccessoryCheckinTest.php
@@ -3,10 +3,12 @@
 namespace Tests\Feature\Checkins\Ui;
 
 use App\Events\CheckoutableCheckedIn;
+use App\Mail\CheckinAccessoryMail;
 use App\Models\Accessory;
 use App\Models\User;
 use App\Notifications\CheckinAccessoryNotification;
 use Illuminate\Support\Facades\Event;
+use Illuminate\Support\Facades\Mail;
 use Illuminate\Support\Facades\Notification;
 use Tests\TestCase;
 
@@ -17,10 +19,19 @@ class AccessoryCheckinTest extends TestCase
         $accessory = Accessory::factory()->checkedOutToUser()->create();
 
         $this->actingAs(User::factory()->create())
-            ->post(route('accessories.checkin.store', $accessory->users->first()->pivot->id))
+            ->post(route('accessories.checkin.store', $accessory->checkouts->first()->id))
             ->assertForbidden();
     }
 
+    public function testPageRenders()
+    {
+        $accessory = Accessory::factory()->checkedOutToUser()->create();
+
+        $this->actingAs(User::factory()->superuser()->create())
+            ->get(route('accessories.checkin.show', $accessory->checkouts->first()->id))
+            ->assertOk();
+    }
+
     public function testAccessoryCanBeCheckedIn()
     {
         Event::fake([CheckoutableCheckedIn::class]);
@@ -28,19 +39,19 @@ class AccessoryCheckinTest extends TestCase
         $user = User::factory()->create();
         $accessory = Accessory::factory()->checkedOutToUser($user)->create();
 
-        $this->assertTrue($accessory->users->contains($user));
+        $this->assertTrue($accessory->checkouts()->where('assigned_type', User::class)->where('assigned_to', $user->id)->count() > 0);
 
         $this->actingAs(User::factory()->checkinAccessories()->create())
-            ->post(route('accessories.checkin.store', $accessory->users->first()->pivot->id));
+            ->post(route('accessories.checkin.store', $accessory->checkouts->first()->id));
 
-        $this->assertFalse($accessory->fresh()->users->contains($user));
+        $this->assertFalse($accessory->fresh()->checkouts()->where('assigned_type', User::class)->where('assigned_to', $user->id)->count() > 0);
 
         Event::assertDispatched(CheckoutableCheckedIn::class, 1);
     }
 
     public function testEmailSentToUserIfSettingEnabled()
     {
-        Notification::fake();
+        Mail::fake();
 
         $user = User::factory()->create();
         $accessory = Accessory::factory()->checkedOutToUser($user)->create();
@@ -53,23 +64,24 @@ class AccessoryCheckinTest extends TestCase
             User::factory()->checkinAccessories()->create(),
             '',
         ));
+        Mail::assertSent(CheckinAccessoryMail::class, function (CheckinAccessoryMail $mail) use ( $accessory, $user) {
+            return $mail->hasTo($user->email);
 
-        Notification::assertSentTo(
-            [$user],
-            function (CheckinAccessoryNotification $notification, $channels) {
-                return in_array('mail', $channels);
-            },
-        );
+        });
     }
 
     public function testEmailNotSentToUserIfSettingDisabled()
     {
-        Notification::fake();
+        Mail::fake();
 
         $user = User::factory()->create();
         $accessory = Accessory::factory()->checkedOutToUser($user)->create();
 
-        $accessory->category->update(['checkin_email' => false]);
+        $accessory->category->update([
+             'checkin_email' => false,
+             'require_acceptance' => false,
+             'eula_text' => null
+        ]);
 
         event(new CheckoutableCheckedIn(
             $accessory,
@@ -78,11 +90,8 @@ class AccessoryCheckinTest extends TestCase
             '',
         ));
 
-        Notification::assertNotSentTo(
-            [$user],
-            function (CheckinAccessoryNotification $notification, $channels) {
-                return in_array('mail', $channels);
-            },
-        );
+        Mail::assertNotSent(CheckinAccessoryMail::class, function ($mail) use ($user) {
+            return $mail->hasTo($user->email);
+        });
     }
 }
diff --git a/tests/Feature/Checkins/Ui/AssetCheckinTest.php b/tests/Feature/Checkins/Ui/AssetCheckinTest.php
index cebd5010f1..4f1c62cf2c 100644
--- a/tests/Feature/Checkins/Ui/AssetCheckinTest.php
+++ b/tests/Feature/Checkins/Ui/AssetCheckinTest.php
@@ -18,16 +18,14 @@ class AssetCheckinTest extends TestCase
     public function testCheckingInAssetRequiresCorrectPermission()
     {
         $this->actingAs(User::factory()->create())
-            ->post(route('hardware.checkin.store', [
-                'assetId' => Asset::factory()->assignedToUser()->create()->id,
-            ]))
+            ->post(route('hardware.checkin.store', [Asset::factory()->assignedToUser()->create()]))
             ->assertForbidden();
     }
 
     public function testCannotCheckInAssetThatIsNotCheckedOut()
     {
         $this->actingAs(User::factory()->checkinAssets()->create())
-            ->post(route('hardware.checkin.store', ['assetId' => Asset::factory()->create()->id]))
+            ->post(route('hardware.checkin.store', [Asset::factory()->create()]))
             ->assertStatus(302)
             ->assertSessionHas('error')
             ->assertRedirect(route('hardware.index'));
@@ -36,12 +34,19 @@ class AssetCheckinTest extends TestCase
     public function testCannotStoreAssetCheckinThatIsNotCheckedOut()
     {
         $this->actingAs(User::factory()->checkinAssets()->create())
-            ->get(route('hardware.checkin.store', ['assetId' => Asset::factory()->create()->id]))
+            ->get(route('hardware.checkin.store', [Asset::factory()->create()]))
             ->assertStatus(302)
             ->assertSessionHas('error')
             ->assertRedirect(route('hardware.index'));
     }
 
+    public function testPageRenders()
+    {
+        $this->actingAs(User::factory()->superuser()->create())
+            ->get(route('hardware.checkin.create', Asset::factory()->assignedToUser()->create()))
+            ->assertOk();
+    }
+
     public function testAssetCanBeCheckedIn()
     {
         Event::fake([CheckoutableCheckedIn::class]);
@@ -61,7 +66,7 @@ class AssetCheckinTest extends TestCase
 
         $this->actingAs(User::factory()->checkinAssets()->create())
             ->post(
-                route('hardware.checkin.store', ['assetId' => $asset->id]),
+                route('hardware.checkin.store', [$asset]),
                 [
                     'name' => 'Changed Name',
                     'status_id' => $status->id,
@@ -81,7 +86,7 @@ class AssetCheckinTest extends TestCase
 
         Event::assertDispatched(function (CheckoutableCheckedIn $event) use ($currentTimestamp) {
             // this could be better mocked but is ok for now.
-            return Carbon::parse($event->action_date)->diffInSeconds($currentTimestamp) < 2;
+            return (int) Carbon::parse($event->action_date)->diffInSeconds($currentTimestamp, true) < 2;
         }, 1);
     }
 
@@ -94,7 +99,7 @@ class AssetCheckinTest extends TestCase
         ]);
 
         $this->actingAs(User::factory()->checkinAssets()->create())
-            ->post(route('hardware.checkin.store', ['assetId' => $asset->id]));
+            ->post(route('hardware.checkin.store', [$asset]));
 
         $this->assertTrue($asset->refresh()->location()->is($rtdLocation));
     }
@@ -105,7 +110,7 @@ class AssetCheckinTest extends TestCase
         $asset = Asset::factory()->assignedToUser()->create();
 
         $this->actingAs(User::factory()->checkinAssets()->create())
-            ->post(route('hardware.checkin.store', ['assetId' => $asset->id]), [
+            ->post(route('hardware.checkin.store', [$asset]), [
                 'location_id' => $location->id,
                 'update_default_location' => 0
             ]);
@@ -121,7 +126,7 @@ class AssetCheckinTest extends TestCase
         $this->assertNotNull($asset->licenseseats->first()->assigned_to);
 
         $this->actingAs(User::factory()->checkinAssets()->create())
-            ->post(route('hardware.checkin.store', ['assetId' => $asset->id]));
+            ->post(route('hardware.checkin.store', [$asset]));
 
         $this->assertNull($asset->refresh()->licenseseats->first()->assigned_to);
     }
@@ -134,7 +139,7 @@ class AssetCheckinTest extends TestCase
         ]);
 
         $this->actingAs(User::factory()->checkinAssets()->create())
-            ->post(route('hardware.checkin.store', ['assetId' => $asset->id]));
+            ->post(route('hardware.checkin.store', [$asset]));
 
         $this->assertNull($asset->refresh()->rtd_location_id);
         $this->assertEquals($asset->location_id, $asset->rtd_location_id);
@@ -147,7 +152,7 @@ class AssetCheckinTest extends TestCase
         $acceptance = CheckoutAcceptance::factory()->for($asset, 'checkoutable')->pending()->create();
 
         $this->actingAs(User::factory()->checkinAssets()->create())
-            ->post(route('hardware.checkin.store', ['assetId' => $asset->id]));
+            ->post(route('hardware.checkin.store', [$asset]));
 
         $this->assertFalse($acceptance->exists(), 'Acceptance was not deleted');
     }
@@ -158,8 +163,7 @@ class AssetCheckinTest extends TestCase
 
         $this->actingAs(User::factory()->checkinAssets()->create())
             ->post(route(
-                'hardware.checkin.store',
-                ['assetId' => Asset::factory()->assignedToUser()->create()->id]
+                'hardware.checkin.store', [Asset::factory()->assignedToUser()->create()]
             ), [
                 'checkin_at' => '2023-01-02',
                 'note' => 'hello'
@@ -178,10 +182,10 @@ class AssetCheckinTest extends TestCase
         $asset->forceSave();
 
         $this->actingAs(User::factory()->admin()->create())
-            ->get(route('hardware.checkin.create', ['assetId' => $asset->id]))
+            ->get(route('hardware.checkin.create', [$asset]))
             ->assertStatus(302)
             ->assertSessionHas('error')
-            ->assertRedirect(route('hardware.show',['hardware' => $asset->id]));
+            ->assertRedirect(route('hardware.show', $asset));
     }
 
     public function testAssetCheckinPagePostIsRedirectedIfModelIsInvalid()
@@ -191,9 +195,36 @@ class AssetCheckinTest extends TestCase
         $asset->forceSave();
 
         $this->actingAs(User::factory()->admin()->create())
-            ->post(route('hardware.checkin.store', ['assetId' => $asset->id]))
+            ->post(route('hardware.checkin.store', $asset))
             ->assertStatus(302)
             ->assertSessionHas('error')
-            ->assertRedirect(route('hardware.show', ['hardware' => $asset->id]));
+            ->assertRedirect(route('hardware.show', $asset));
+    }
+
+    public function testAssetCheckinPagePostIsRedirectedIfRedirectSelectionIsIndex()
+    {
+        $asset = Asset::factory()->assignedToUser()->create();
+
+        $this->actingAs(User::factory()->admin()->create())
+            ->from(route('hardware.index'))
+            ->post(route('hardware.checkin.store', $asset), [
+                'redirect_option' => 'index',
+            ])
+            ->assertStatus(302)
+            ->assertRedirect(route('hardware.index'));
+    }
+
+    public function testAssetCheckinPagePostIsRedirectedIfRedirectSelectionIsItem()
+    {
+        $asset = Asset::factory()->assignedToUser()->create();
+
+        $this->actingAs(User::factory()->admin()->create())
+            ->from(route('hardware.index'))
+            ->post(route('hardware.checkin.store', $asset), [
+                'redirect_option' => 'item',
+            ])
+            ->assertStatus(302)
+            ->assertSessionHasNoErrors()
+            ->assertRedirect(route('hardware.show', $asset));
     }
 }
diff --git a/tests/Feature/Checkins/Ui/ComponentCheckinTest.php b/tests/Feature/Checkins/Ui/ComponentCheckinTest.php
new file mode 100644
index 0000000000..7da3879ea7
--- /dev/null
+++ b/tests/Feature/Checkins/Ui/ComponentCheckinTest.php
@@ -0,0 +1,70 @@
+<?php
+
+namespace Tests\Feature\Checkins\Ui;
+
+use App\Models\Component;
+use App\Models\User;
+use Illuminate\Support\Facades\DB;
+use Tests\TestCase;
+
+class ComponentCheckinTest extends TestCase
+{
+    public function testCheckingInComponentRequiresCorrectPermission()
+    {
+        $component = Component::factory()->checkedOutToAsset()->create();
+
+        $componentAsset = DB::table('components_assets')->where('component_id', $component->id)->first();
+
+        $this->actingAs(User::factory()->create())
+            ->post(route('components.checkin.store', $componentAsset->id))
+            ->assertForbidden();
+    }
+
+    public function testPageRenders()
+    {
+        $component = Component::factory()->checkedOutToAsset()->create();
+
+        $componentAsset = DB::table('components_assets')->where('component_id', $component->id)->first();
+
+        $this->actingAs(User::factory()->superuser()->create())
+            ->get(route('components.checkin.show', $componentAsset->id))
+            ->assertOk();
+    }
+
+    public function testComponentCheckinPagePostIsRedirectedIfRedirectSelectionIsIndex()
+    {
+        $component = Component::factory()->checkedOutToAsset()->create();
+
+        $componentAsset = DB::table('components_assets')->where('component_id', $component->id)->first();
+
+        $this->actingAs(User::factory()->admin()->create())
+            ->from(route('components.index'))
+            ->post(route('components.checkin.store', [
+                'componentID' => $componentAsset->id,
+            ]), [
+                'redirect_option' => 'index',
+                'checkin_qty' => 1,
+            ])
+            ->assertStatus(302)
+            ->assertRedirect(route('components.index'));
+    }
+
+    public function testComponentCheckinPagePostIsRedirectedIfRedirectSelectionIsItem()
+    {
+        $component = Component::factory()->checkedOutToAsset()->create();
+
+        $componentAsset = DB::table('components_assets')->where('component_id', $component->id)->first();
+
+        $this->actingAs(User::factory()->admin()->create())
+            ->from(route('components.index'))
+            ->post(route('components.checkin.store', [
+                'componentID' => $componentAsset->id,
+            ]), [
+                'redirect_option' => 'item',
+                'checkin_qty' => 1,
+            ])
+            ->assertStatus(302)
+            ->assertSessionHasNoErrors()
+            ->assertRedirect(route('components.show', $component));
+    }
+}
diff --git a/tests/Feature/Checkins/Ui/LicenseCheckinTest.php b/tests/Feature/Checkins/Ui/LicenseCheckinTest.php
new file mode 100644
index 0000000000..7a6553d8ba
--- /dev/null
+++ b/tests/Feature/Checkins/Ui/LicenseCheckinTest.php
@@ -0,0 +1,131 @@
+<?php
+
+namespace Tests\Feature\Checkins\Ui;
+
+use App\Events\CheckoutableCheckedIn;
+use App\Models\Asset;
+use App\Models\LicenseSeat;
+use App\Models\User;
+use Illuminate\Support\Facades\Event;
+use Tests\TestCase;
+
+class LicenseCheckinTest extends TestCase
+{
+    public function testCheckingInLicenseRequiresCorrectPermission()
+    {
+        $this->actingAs(User::factory()->create())
+            ->post(route('licenses.checkin.save', [
+                'licenseId' => LicenseSeat::factory()->assignedToUser()->create()->id,
+            ]))
+            ->assertForbidden();
+    }
+
+    public function testCannotCheckinNonReassignableLicense()
+    {
+        $licenseSeat = LicenseSeat::factory()
+            ->notReassignable()
+            ->assignedToUser()
+            ->create();
+
+        $this->actingAs(User::factory()->checkoutLicenses()->create())
+            ->post(route('licenses.checkin.save', $licenseSeat), [
+                'notes' => 'my note',
+                'redirect_option' => 'index',
+            ])
+            ->assertSessionHas('error', trans('admin/licenses/message.checkin.not_reassignable') . '.');
+
+        $this->assertNotNull($licenseSeat->fresh()->assigned_to);
+    }
+
+    public function testCannotCheckinLicenseThatIsNotAssigned()
+    {
+        $licenseSeat = LicenseSeat::factory()
+            ->reassignable()
+            ->create();
+
+        $this->assertNull($licenseSeat->assigned_to);
+        $this->assertNull($licenseSeat->asset_id);
+
+        $this->actingAs(User::factory()->checkoutLicenses()->create())
+            ->post(route('licenses.checkin.save', $licenseSeat), [
+                'notes' => 'my note',
+                'redirect_option' => 'index',
+            ])
+            ->assertSessionHas('error', trans('admin/licenses/message.checkin.error'));
+    }
+
+    public function testCanCheckInLicenseAssignedToAsset()
+    {
+        Event::fake([CheckoutableCheckedIn::class]);
+
+        $asset = Asset::factory()->create();
+
+        $licenseSeat = LicenseSeat::factory()
+            ->reassignable()
+            ->assignedToAsset($asset)
+            ->create();
+
+        $actor = User::factory()->checkoutLicenses()->create();
+
+        $this->actingAs($actor)
+            ->post(route('licenses.checkin.save', $licenseSeat), [
+                'notes' => 'my note',
+                'redirect_option' => 'index',
+            ])
+            ->assertRedirect(route('licenses.index'));
+
+        $this->assertNull($licenseSeat->fresh()->asset_id);
+        $this->assertNull($licenseSeat->fresh()->assigned_to);
+        $this->assertEquals('my note', $licenseSeat->fresh()->notes);
+
+        Event::assertDispatchedTimes(CheckoutableCheckedIn::class, 1);
+        Event::assertDispatched(CheckoutableCheckedIn::class, function (CheckoutableCheckedIn $event) use ($actor, $asset, $licenseSeat) {
+            return $event->checkoutable->is($licenseSeat)
+                && $event->checkedOutTo->is($asset)
+                && $event->checkedInBy->is($actor)
+                && $event->note === 'my note';
+        });
+    }
+
+    public function testCanCheckInLicenseAssignedToUser()
+    {
+        Event::fake([CheckoutableCheckedIn::class]);
+
+        $user = User::factory()->create();
+
+        $licenseSeat = LicenseSeat::factory()
+            ->reassignable()
+            ->assignedToUser($user)
+            ->create();
+
+        $actor = User::factory()->checkoutLicenses()->create();
+
+        $this->actingAs($actor)
+            ->post(route('licenses.checkin.save', $licenseSeat), [
+                'notes' => 'my note',
+                'redirect_option' => 'index',
+            ])
+            ->assertRedirect(route('licenses.index'));
+
+        $this->assertNull($licenseSeat->fresh()->asset_id);
+        $this->assertNull($licenseSeat->fresh()->assigned_to);
+        $this->assertEquals('my note', $licenseSeat->fresh()->notes);
+
+        Event::assertDispatchedTimes(CheckoutableCheckedIn::class, 1);
+        Event::assertDispatched(CheckoutableCheckedIn::class, function (CheckoutableCheckedIn $event) use ($actor, $licenseSeat, $user) {
+            return $event->checkoutable->is($licenseSeat)
+                && $event->checkedOutTo->is($user)
+                && $event->checkedInBy->is($actor)
+                && $event->note === 'my note';
+        });
+
+    }
+  
+    public function testPageRenders()
+    {
+        $this->actingAs(User::factory()->superuser()->create())
+            ->get(route('licenses.checkin', LicenseSeat::factory()->assignedToUser()->create()->id))
+            ->assertOk();
+
+    }
+}
diff --git a/tests/Feature/CheckoutAcceptances/Ui/AccessoryAcceptanceTest.php b/tests/Feature/CheckoutAcceptances/Ui/AccessoryAcceptanceTest.php
index 83ec916cb4..fef38623f8 100644
--- a/tests/Feature/CheckoutAcceptances/Ui/AccessoryAcceptanceTest.php
+++ b/tests/Feature/CheckoutAcceptances/Ui/AccessoryAcceptanceTest.php
@@ -3,10 +3,12 @@
 namespace Tests\Feature\CheckoutAcceptances\Ui;
 
 use App\Models\Accessory;
+use App\Models\Asset;
 use App\Models\CheckoutAcceptance;
+use App\Models\User;
 use App\Notifications\AcceptanceAssetAcceptedNotification;
 use App\Notifications\AcceptanceAssetDeclinedNotification;
-use Notification;
+use Illuminate\Support\Facades\Notification;
 use Tests\TestCase;
 
 class AccessoryAcceptanceTest extends TestCase
@@ -76,4 +78,22 @@ class AccessoryAcceptanceTest extends TestCase
             }
         );
     }
+
+    public function testUserIsNotAbleToAcceptAnAssetAssignedToADifferentUser()
+    {
+        Notification::fake();
+
+        $otherUser = User::factory()->create();
+
+        $acceptance = CheckoutAcceptance::factory()
+            ->pending()
+            ->for(Asset::factory()->laptopMbp(), 'checkoutable')
+            ->create();
+
+        $this->actingAs($otherUser)
+            ->post(route('account.store-acceptance', $acceptance), ['asset_acceptance' => 'accepted'])
+            ->assertSessionHas(['error' => trans('admin/users/message.error.incorrect_user_accepted')]);
+
+        $this->assertNull($acceptance->fresh()->accepted_at);
+    }
 }
diff --git a/tests/Feature/CheckoutAcceptances/Ui/AssetAcceptanceTest.php b/tests/Feature/CheckoutAcceptances/Ui/AssetAcceptanceTest.php
new file mode 100644
index 0000000000..4a3ee4001a
--- /dev/null
+++ b/tests/Feature/CheckoutAcceptances/Ui/AssetAcceptanceTest.php
@@ -0,0 +1,163 @@
+<?php
+
+namespace Tests\Feature\CheckoutAcceptances\Ui;
+
+use App\Events\CheckoutAccepted;
+use App\Models\Actionlog;
+use App\Models\Asset;
+use App\Models\CheckoutAcceptance;
+use App\Models\User;
+use Illuminate\Support\Facades\Event;
+use Tests\TestCase;
+
+class AssetAcceptanceTest extends TestCase
+{
+    public function testAssetCheckoutAcceptPageRenders()
+    {
+        $checkoutAcceptance = CheckoutAcceptance::factory()->pending()->create();
+
+        $this->actingAs($checkoutAcceptance->assignedTo)
+            ->get(route('account.accept.item', $checkoutAcceptance))
+            ->assertViewIs('account.accept.create');
+    }
+
+    public function testCannotAcceptAssetAlreadyAccepted()
+    {
+        Event::fake([CheckoutAccepted::class]);
+
+        $checkoutAcceptance = CheckoutAcceptance::factory()->accepted()->create();
+
+        $this->assertFalse($checkoutAcceptance->isPending());
+
+        $this->actingAs($checkoutAcceptance->assignedTo)
+            ->post(route('account.store-acceptance', $checkoutAcceptance), [
+                'asset_acceptance' => 'accepted',
+                'note' => 'my note',
+            ])
+            ->assertRedirectToRoute('account.accept')
+            ->assertSessionHas('error');
+
+        Event::assertNotDispatched(CheckoutAccepted::class);
+    }
+
+    public function testCannotAcceptAssetForAnotherUser()
+    {
+        Event::fake([CheckoutAccepted::class]);
+
+        $checkoutAcceptance = CheckoutAcceptance::factory()->pending()->create();
+
+        $this->assertTrue($checkoutAcceptance->isPending());
+
+        $anotherUser = User::factory()->create();
+
+        $this->actingAs($anotherUser)
+            ->post(route('account.store-acceptance', $checkoutAcceptance), [
+                'asset_acceptance' => 'accepted',
+                'note' => 'my note',
+            ])
+            ->assertRedirectToRoute('account.accept')
+            ->assertSessionHas('error');
+
+        $this->assertTrue($checkoutAcceptance->fresh()->isPending());
+
+        Event::assertNotDispatched(CheckoutAccepted::class);
+    }
+
+    public function testUserCanAcceptAsset()
+    {
+        Event::fake([CheckoutAccepted::class]);
+
+        $checkoutAcceptance = CheckoutAcceptance::factory()->pending()->create();
+
+        $this->assertTrue($checkoutAcceptance->isPending());
+
+        $this->actingAs($checkoutAcceptance->assignedTo)
+            ->post(route('account.store-acceptance', $checkoutAcceptance), [
+                'asset_acceptance' => 'accepted',
+                'note' => 'my note',
+            ])
+            ->assertRedirectToRoute('account.accept')
+            ->assertSessionHas('success');
+
+        $checkoutAcceptance->refresh();
+
+        $this->assertFalse($checkoutAcceptance->isPending());
+        $this->assertNotNull($checkoutAcceptance->accepted_at);
+        $this->assertNull($checkoutAcceptance->declined_at);
+
+        Event::assertDispatched(CheckoutAccepted::class);
+    }
+
+    public function testUserCanDeclineAsset()
+    {
+        Event::fake([CheckoutAccepted::class]);
+
+        $checkoutAcceptance = CheckoutAcceptance::factory()->pending()->create();
+
+        $this->assertTrue($checkoutAcceptance->isPending());
+
+        $this->actingAs($checkoutAcceptance->assignedTo)
+            ->post(route('account.store-acceptance', $checkoutAcceptance), [
+                'asset_acceptance' => 'declined',
+                'note' => 'my note',
+            ])
+            ->assertRedirectToRoute('account.accept')
+            ->assertSessionHas('success');
+
+        $checkoutAcceptance->refresh();
+
+        $this->assertFalse($checkoutAcceptance->isPending());
+        $this->assertNull($checkoutAcceptance->accepted_at);
+        $this->assertNotNull($checkoutAcceptance->declined_at);
+
+        Event::assertNotDispatched(CheckoutAccepted::class);
+    }
+
+    public function testActionLoggedWhenAcceptingAsset()
+    {
+        $checkoutAcceptance = CheckoutAcceptance::factory()->pending()->create();
+
+        $this->actingAs($checkoutAcceptance->assignedTo)
+            ->post(route('account.store-acceptance', $checkoutAcceptance), [
+                'asset_acceptance' => 'accepted',
+                'note' => 'my note',
+            ]);
+
+        $this->assertTrue(Actionlog::query()
+            ->where([
+                'action_type' => 'accepted',
+                'target_id' => $checkoutAcceptance->assignedTo->id,
+                'target_type' => User::class,
+                'note' => 'my note',
+                'item_type' => Asset::class,
+                'item_id' => $checkoutAcceptance->checkoutable->id,
+            ])
+            ->whereNotNull('action_date')
+            ->exists()
+        );
+    }
+
+    public function testActionLoggedWhenDecliningAsset()
+    {
+        $checkoutAcceptance = CheckoutAcceptance::factory()->pending()->create();
+
+        $this->actingAs($checkoutAcceptance->assignedTo)
+            ->post(route('account.store-acceptance', $checkoutAcceptance), [
+                'asset_acceptance' => 'declined',
+                'note' => 'my note',
+            ]);
+
+        $this->assertTrue(Actionlog::query()
+            ->where([
+                'action_type' => 'declined',
+                'target_id' => $checkoutAcceptance->assignedTo->id,
+                'target_type' => User::class,
+                'note' => 'my note',
+                'item_type' => Asset::class,
+                'item_id' => $checkoutAcceptance->checkoutable->id,
+            ])
+            ->whereNotNull('action_date')
+            ->exists()
+        );
+    }
+}
diff --git a/tests/Feature/Checkouts/Api/AccessoryCheckoutTest.php b/tests/Feature/Checkouts/Api/AccessoryCheckoutTest.php
index e6128aa78c..7adab09c03 100644
--- a/tests/Feature/Checkouts/Api/AccessoryCheckoutTest.php
+++ b/tests/Feature/Checkouts/Api/AccessoryCheckoutTest.php
@@ -2,16 +2,19 @@
 
 namespace Tests\Feature\Checkouts\Api;
 
+use App\Mail\CheckoutAccessoryMail;
 use App\Models\Accessory;
 use App\Models\Actionlog;
 use App\Models\User;
 use App\Notifications\CheckoutAccessoryNotification;
+use Illuminate\Support\Facades\Mail;
 use Illuminate\Support\Facades\Notification;
+use Tests\Concerns\TestsPermissionsRequirement;
 use Tests\TestCase;
 
-class AccessoryCheckoutTest extends TestCase
+class AccessoryCheckoutTest extends TestCase implements TestsPermissionsRequirement
 {
-    public function testCheckingOutAccessoryRequiresCorrectPermission()
+    public function testRequiresPermission()
     {
         $this->actingAsForApi(User::factory()->create())
             ->postJson(route('api.accessories.checkout', Accessory::factory()->create()))
@@ -22,7 +25,7 @@ class AccessoryCheckoutTest extends TestCase
     {
         $this->actingAsForApi(User::factory()->checkoutAccessories()->create())
             ->postJson(route('api.accessories.checkout', Accessory::factory()->create()), [
-                // missing assigned_to
+                // missing assigned_user, assigned_location, assigned_asset
             ])
             ->assertStatusMessageIs('error');
     }
@@ -31,37 +34,134 @@ class AccessoryCheckoutTest extends TestCase
     {
         $this->actingAsForApi(User::factory()->checkoutAccessories()->create())
             ->postJson(route('api.accessories.checkout', Accessory::factory()->withoutItemsRemaining()->create()), [
-                'assigned_to' => User::factory()->create()->id,
+                'assigned_user' => User::factory()->create()->id,
+                'checkout_to_type' => 'user'
             ])
-            ->assertStatusMessageIs('error');
+            ->assertOk()
+            ->assertStatusMessageIs('error')
+            ->assertJson(
+                [
+                'status' => 'error',
+                'messages' =>
+                    [
+                        'checkout_qty' =>
+                            [
+                                trans_choice('admin/accessories/message.checkout.checkout_qty.lte', 0,
+                                    [
+                                        'number_currently_remaining' => 0,
+                                        'checkout_qty' => 1,
+                                        'number_remaining_after_checkout' => 0
+                                    ])
+                            ],
+
+                    ],
+                    'payload' => null,
+                ])
+            ->assertStatus(200)
+            ->json();
     }
 
-    public function testAccessoryCanBeCheckedOut()
+    public function testAccessoryCanBeCheckedOutWithoutQty()
+    {
+        $accessory = Accessory::factory()->create();
+        $user = User::factory()->create();
+        $admin = User::factory()->checkoutAccessories()->create();
+
+        $this->actingAsForApi($admin)
+            ->postJson(route('api.accessories.checkout', $accessory), [
+                'assigned_user' => $user->id,
+                'checkout_to_type' => 'user'
+            ])
+            ->assertOk()
+            ->assertStatusMessageIs('success')
+            ->assertStatus(200)
+            ->assertJson(['messages' =>  trans('admin/accessories/message.checkout.success')])
+            ->json();
+
+        $this->assertTrue($accessory->checkouts()->where('assigned_type', User::class)->where('assigned_to', $user->id)->count() > 0);
+
+        $this->assertEquals(
+            1,
+            Actionlog::where([
+                'action_type' => 'checkout',
+                'target_id' => $user->id,
+                'target_type' => User::class,
+                'item_id' => $accessory->id,
+                'item_type' => Accessory::class,
+                'created_by' => $admin->id,
+            ])->count(),'Log entry either does not exist or there are more than expected'
+        );
+    }
+
+    public function testAccessoryCanBeCheckedOutWithQty()
+    {
+        $accessory = Accessory::factory()->create(['qty' => 20]);
+        $user = User::factory()->create();
+        $admin = User::factory()->checkoutAccessories()->create();
+
+        $this->actingAsForApi($admin)
+            ->postJson(route('api.accessories.checkout', $accessory), [
+                'assigned_user' => $user->id,
+                'checkout_to_type' => 'user',
+                'checkout_qty' => 2,
+            ])
+            ->assertOk()
+            ->assertStatusMessageIs('success')
+            ->assertStatus(200)
+            ->assertJson(['messages' =>  trans('admin/accessories/message.checkout.success')])
+            ->json();
+
+        $this->assertTrue($accessory->checkouts()->where('assigned_type', User::class)->where('assigned_to', $user->id)->count() > 0);
+
+        $this->assertEquals(
+            1,
+            Actionlog::where([
+                'action_type' => 'checkout',
+                'target_id' => $user->id,
+                'target_type' => User::class,
+                'item_id' => $accessory->id,
+                'item_type' => Accessory::class,
+                'created_by' => $admin->id,
+            ])->count(),
+            'Log entry either does not exist or there are more than expected'
+        );
+    }
+
+    public function testAccessoryCannotBeCheckedOutToInvalidUser()
     {
         $accessory = Accessory::factory()->create();
         $user = User::factory()->create();
 
         $this->actingAsForApi(User::factory()->checkoutAccessories()->create())
             ->postJson(route('api.accessories.checkout', $accessory), [
-                'assigned_to' => $user->id,
-            ]);
+                'assigned_user' => 'invalid-user-id',
+                'checkout_to_type' => 'user',
+                'note' => 'oh hi there',
+            ])
+            ->assertOk()
+            ->assertStatusMessageIs('error')
+            ->assertStatus(200)
+            ->json();
 
-        $this->assertTrue($accessory->users->contains($user));
+            $this->assertFalse($accessory->checkouts()->where('assigned_type', User::class)->where('assigned_to', $user->id)->count() > 0);
     }
 
     public function testUserSentNotificationUponCheckout()
     {
-        Notification::fake();
+        Mail::fake();
 
         $accessory = Accessory::factory()->requiringAcceptance()->create();
         $user = User::factory()->create();
 
         $this->actingAsForApi(User::factory()->checkoutAccessories()->create())
             ->postJson(route('api.accessories.checkout', $accessory), [
-                'assigned_to' => $user->id,
+                'assigned_user' => $user->id,
+                'checkout_to_type' => 'user',
             ]);
 
-        Notification::assertSentTo($user, CheckoutAccessoryNotification::class);
+        Mail::assertSent(CheckoutAccessoryMail::class, function ($mail) use ($user) {
+            return $mail->hasTo($user->email);
+        });
     }
 
     public function testActionLogCreatedUponCheckout()
@@ -72,7 +172,8 @@ class AccessoryCheckoutTest extends TestCase
 
         $this->actingAsForApi($actor)
             ->postJson(route('api.accessories.checkout', $accessory), [
-                'assigned_to' => $user->id,
+                'assigned_user' => $user->id,
+                'checkout_to_type' => 'user',
                 'note' => 'oh hi there',
             ]);
 
@@ -84,7 +185,7 @@ class AccessoryCheckoutTest extends TestCase
                 'target_type' => User::class,
                 'item_id' => $accessory->id,
                 'item_type' => Accessory::class,
-                'user_id' => $actor->id,
+                'created_by' => $actor->id,
                 'note' => 'oh hi there',
             ])->count(),
             'Log entry either does not exist or there are more than expected'
diff --git a/tests/Feature/Checkouts/Api/AssetCheckoutTest.php b/tests/Feature/Checkouts/Api/AssetCheckoutTest.php
index f85af9035a..e83ad7d30d 100644
--- a/tests/Feature/Checkouts/Api/AssetCheckoutTest.php
+++ b/tests/Feature/Checkouts/Api/AssetCheckoutTest.php
@@ -2,6 +2,9 @@
 
 namespace Tests\Feature\Checkouts\Api;
 
+use Illuminate\Support\Facades\Mail;
+use Notification;
+use PHPUnit\Framework\Attributes\DataProvider;
 use App\Events\CheckoutableCheckedOut;
 use App\Models\Asset;
 use App\Models\Location;
@@ -20,6 +23,22 @@ class AssetCheckoutTest extends TestCase
         Event::fake([CheckoutableCheckedOut::class]);
     }
 
+    public function testCheckoutRequest()
+    {
+        Notification::fake();
+        $requestable = Asset::factory()->requestable()->create();
+        $nonRequestable = Asset::factory()->nonrequestable()->create();
+
+        $this->actingAsForApi(User::factory()->create())
+            ->post(route('api.assets.requests.store', $requestable->id))
+            ->assertStatusMessageIs('success');
+
+        $this->actingAsForApi(User::factory()->create())
+            ->post(route('api.assets.requests.store', $nonRequestable->id))
+            ->assertStatusMessageIs('error');
+
+    }
+
     public function testCheckingOutAssetRequiresCorrectPermission()
     {
         $this->actingAsForApi(User::factory()->create())
@@ -82,7 +101,7 @@ class AssetCheckoutTest extends TestCase
      * This data provider contains checkout targets along with the
      * asset's expected location after the checkout process.
      */
-    public function checkoutTargets(): array
+    public static function checkoutTargets(): array
     {
         return [
             'Checkout to User' => [
@@ -148,7 +167,7 @@ class AssetCheckoutTest extends TestCase
         ];
     }
 
-    /** @dataProvider checkoutTargets */
+    #[DataProvider('checkoutTargets')]
     public function testAssetCanBeCheckedOut($data)
     {
         ['checkout_type' => $type, 'target' => $target, 'expected_location' => $expectedLocation] = $data();
@@ -208,6 +227,6 @@ class AssetCheckoutTest extends TestCase
 
         $asset->refresh();
 
-        $this->assertTrue(Carbon::parse($asset->last_checkout)->diffInSeconds(now()) < 2);
+        $this->assertTrue((int) Carbon::parse($asset->last_checkout)->diffInSeconds(now(), true) < 2);
     }
 }
diff --git a/tests/Feature/Checkouts/Api/ComponentCheckoutTest.php b/tests/Feature/Checkouts/Api/ComponentCheckoutTest.php
new file mode 100644
index 0000000000..179e9329e2
--- /dev/null
+++ b/tests/Feature/Checkouts/Api/ComponentCheckoutTest.php
@@ -0,0 +1,140 @@
+<?php
+
+namespace Tests\Feature\Checkouts\Api;
+
+use App\Models\Asset;
+use App\Models\Company;
+use App\Models\Component;
+use App\Models\Location;
+use App\Models\User;
+use Carbon\Carbon;
+use Tests\Concerns\TestsFullMultipleCompaniesSupport;
+use Tests\Concerns\TestsPermissionsRequirement;
+use Tests\TestCase;
+
+class ComponentCheckoutTest extends TestCase implements TestsFullMultipleCompaniesSupport, TestsPermissionsRequirement
+{
+    public function testRequiresPermission()
+    {
+        $component = Component::factory()->create();
+
+        $this->actingAsForApi(User::factory()->create())
+            ->postJson(route('api.components.checkout', $component->id))
+            ->assertForbidden();
+    }
+
+    public function testCannotCheckoutNonExistentComponent()
+    {
+        $this->actingAsForApi(User::factory()->checkoutComponents()->create())
+            ->postJson(route('api.components.checkout', 1000))
+            ->assertOk()
+            ->assertStatusMessageIs('error')
+            ->assertMessagesAre('Component does not exist.');
+    }
+
+    public function testCheckingOutComponentRequiresValidFields()
+    {
+        $component = Component::factory()->create();
+
+        $this->actingAsForApi(User::factory()->checkoutComponents()->create())
+            ->postJson(route('api.components.checkout', $component->id), [
+                //
+            ])
+            ->assertOk()
+            ->assertStatusMessageIs('error')
+            ->assertPayloadContains('assigned_to')
+            ->assertPayloadContains('assigned_qty');
+    }
+
+    public function testCannotCheckoutComponentIfRequestedAmountIsMoreThanComponentQuantity()
+    {
+        $asset = Asset::factory()->create();
+        $component = Component::factory()->create(['qty' => 2]);
+
+        $this->actingAsForApi(User::factory()->checkoutComponents()->create())
+            ->postJson(route('api.components.checkout', $component->id), [
+                'assigned_to' => $asset->id,
+                'assigned_qty' => 3,
+            ])
+            ->assertOk()
+            ->assertStatusMessageIs('error')
+            ->assertMessagesAre(trans('admin/components/message.checkout.unavailable', ['remaining' => 2, 'requested' => 3]));
+    }
+
+    public function testCannotCheckoutComponentIfRequestedAmountIsMoreThanWhatIsRemaining()
+    {
+        $asset = Asset::factory()->create();
+        $component = Component::factory()->create(['qty' => 2]);
+        $component->assets()->attach($component->id, [
+            'component_id' => $component->id,
+            'created_at' => Carbon::now(),
+            'assigned_qty' => 1,
+            'asset_id' => $asset->id,
+        ]);
+
+        $this->actingAsForApi(User::factory()->checkoutComponents()->create())
+            ->postJson(route('api.components.checkout', $component->id), [
+                'assigned_to' => $asset->id,
+                'assigned_qty' => 3,
+            ])
+            ->assertOk()
+            ->assertStatusMessageIs('error');
+    }
+
+    public function testCanCheckoutComponent()
+    {
+        $user = User::factory()->checkoutComponents()->create();
+        $asset = Asset::factory()->create();
+        $component = Component::factory()->create();
+
+        $this->actingAsForApi($user)
+            ->postJson(route('api.components.checkout', $component->id), [
+                'assigned_to' => $asset->id,
+                'assigned_qty' => 1,
+            ])
+            ->assertOk()
+            ->assertStatusMessageIs('success');
+
+        $this->assertTrue($component->assets->first()->is($asset));
+    }
+
+    public function testComponentCheckoutIsLogged()
+    {
+        $user = User::factory()->checkoutComponents()->create();
+        $location = Location::factory()->create();
+        $asset = Asset::factory()->create(['location_id' => $location->id]);
+        $component = Component::factory()->create();
+
+        $this->actingAsForApi($user)
+            ->postJson(route('api.components.checkout', $component->id), [
+                'assigned_to' => $asset->id,
+                'assigned_qty' => 1,
+            ]);
+
+        $this->assertDatabaseHas('action_logs', [
+            'created_by' => $user->id,
+            'action_type' => 'checkout',
+            'target_id' => $asset->id,
+            'target_type' => Asset::class,
+            'location_id' => $location->id,
+            'item_type' => Component::class,
+            'item_id' => $component->id,
+        ]);
+    }
+
+    public function testAdheresToFullMultipleCompaniesSupportScoping()
+    {
+        [$companyA, $companyB] = Company::factory()->count(2)->create();
+
+        $userForCompanyA = User::factory()->for($companyA)->create();
+        $assetForCompanyB = Asset::factory()->for($companyB)->create();
+        $componentForCompanyB = Component::factory()->for($companyB)->create();
+
+        $this->actingAsForApi($userForCompanyA)
+            ->postJson(route('api.components.checkout', $componentForCompanyB->id), [
+                'assigned_to' => $assetForCompanyB->id,
+                'assigned_qty' => 1,
+            ])
+            ->assertForbidden();
+    }
+}
diff --git a/tests/Feature/Checkouts/Api/ConsumableCheckoutTest.php b/tests/Feature/Checkouts/Api/ConsumableCheckoutTest.php
index 3bd0212fda..fba2c50df3 100644
--- a/tests/Feature/Checkouts/Api/ConsumableCheckoutTest.php
+++ b/tests/Feature/Checkouts/Api/ConsumableCheckoutTest.php
@@ -2,10 +2,12 @@
 
 namespace Tests\Feature\Checkouts\Api;
 
+use App\Mail\CheckoutConsumableMail;
 use App\Models\Actionlog;
 use App\Models\Consumable;
 use App\Models\User;
 use App\Notifications\CheckoutConsumableNotification;
+use Illuminate\Support\Facades\Mail;
 use Illuminate\Support\Facades\Notification;
 use Tests\TestCase;
 
@@ -51,7 +53,7 @@ class ConsumableCheckoutTest extends TestCase
 
     public function testUserSentNotificationUponCheckout()
     {
-        Notification::fake();
+        Mail::fake();
 
         $consumable = Consumable::factory()->requiringAcceptance()->create();
 
@@ -62,7 +64,9 @@ class ConsumableCheckoutTest extends TestCase
                 'assigned_to' => $user->id,
             ]);
 
-        Notification::assertSentTo($user, CheckoutConsumableNotification::class);
+        Mail::assertSent(CheckoutConsumableMail::class, function ($mail) use ($consumable, $user) {
+            return $mail->hasTo($user->email);
+        });
     }
 
     public function testActionLogCreatedUponCheckout()
@@ -84,7 +88,7 @@ class ConsumableCheckoutTest extends TestCase
                 'target_type' => User::class,
                 'item_id' => $consumable->id,
                 'item_type' => Consumable::class,
-                'user_id' => $actor->id,
+                'created_by' => $actor->id,
                 'note' => 'oh hi there',
             ])->count(),
             'Log entry either does not exist or there are more than expected'
diff --git a/tests/Feature/Checkouts/Api/LicenseCheckOutTest.php b/tests/Feature/Checkouts/Api/LicenseCheckOutTest.php
new file mode 100644
index 0000000000..7a069b7d28
--- /dev/null
+++ b/tests/Feature/Checkouts/Api/LicenseCheckOutTest.php
@@ -0,0 +1,41 @@
+<?php
+namespace Tests\Feature\Checkouts\Api;
+
+use App\Models\License;
+use App\Models\LicenseSeat;
+use App\Models\User;
+use Tests\TestCase;
+
+class LicenseCheckOutTest extends TestCase {
+    public function testLicenseCheckout()
+    {
+        $authUser = User::factory()->superuser()->create();
+        $this->actingAsForApi($authUser);
+
+        $license = License::factory()->create();
+        $licenseSeat = LicenseSeat::factory()->for($license)->create([
+            'assigned_to' => null,
+        ]);
+
+        $targetUser = User::factory()->create();
+
+        $payload = [
+            'assigned_to' => $targetUser->id,
+            'notes' => 'Checking out the seat to a user',
+        ];
+
+        $response = $this->patchJson(
+            route('api.licenses.seats.update', [$license->id, $licenseSeat->id]),
+            $payload);
+
+        $response->assertStatus(200)
+            ->assertJsonFragment([
+                'status' => 'success',
+            ]);
+
+        $licenseSeat->refresh();
+
+        $this->assertEquals($targetUser->id, $licenseSeat->assigned_to);
+        $this->assertEquals('Checking out the seat to a user', $licenseSeat->notes);
+    }
+}
\ No newline at end of file
diff --git a/tests/Feature/Checkouts/Ui/AccessoryCheckoutTest.php b/tests/Feature/Checkouts/Ui/AccessoryCheckoutTest.php
index 8f97a48315..19b0d1ce72 100644
--- a/tests/Feature/Checkouts/Ui/AccessoryCheckoutTest.php
+++ b/tests/Feature/Checkouts/Ui/AccessoryCheckoutTest.php
@@ -2,10 +2,14 @@
 
 namespace Tests\Feature\Checkouts\Ui;
 
+use App\Mail\CheckoutAccessoryMail;
 use App\Models\Accessory;
 use App\Models\Actionlog;
+use App\Models\Asset;
+use App\Models\Location;
 use App\Models\User;
 use App\Notifications\CheckoutAccessoryNotification;
+use Illuminate\Support\Facades\Mail;
 use Illuminate\Support\Facades\Notification;
 use Tests\TestCase;
 
@@ -18,50 +22,164 @@ class AccessoryCheckoutTest extends TestCase
             ->assertForbidden();
     }
 
+    public function testPageRenders()
+    {
+        $this->actingAs(User::factory()->superuser()->create())
+            ->get(route('accessories.checkout.show', Accessory::factory()->create()))
+            ->assertOk();
+    }
+
     public function testValidationWhenCheckingOutAccessory()
     {
-        $this->actingAs(User::factory()->checkoutAccessories()->create())
-            ->post(route('accessories.checkout.store', Accessory::factory()->create()), [
+        $accessory = Accessory::factory()->create();
+        $response = $this->actingAs(User::factory()->superuser()->create())
+            ->from(route('accessories.checkout.show', $accessory))
+            ->post(route('accessories.checkout.store', $accessory), [
                 // missing assigned_to
             ])
-            ->assertSessionHas('error');
+            ->assertStatus(302)
+            ->assertSessionHas('errors')
+            ->assertRedirect(route('accessories.checkout.store', $accessory));
+
+        $this->followRedirects($response)->assertSee(trans('general.error'));
     }
 
-    public function testAccessoryMustBeAvailableWhenCheckingOut()
+    public function testAccessoryMustHaveAvailableItemsForCheckoutWhenCheckingOut()
     {
-        $this->actingAs(User::factory()->checkoutAccessories()->create())
-            ->post(route('accessories.checkout.store', Accessory::factory()->withoutItemsRemaining()->create()), [
-                'assigned_to' => User::factory()->create()->id,
+
+        $accessory = Accessory::factory()->withoutItemsRemaining()->create();
+        $response = $this->actingAs(User::factory()->viewAccessories()->checkoutAccessories()->create())
+            ->from(route('accessories.checkout.show', $accessory))
+            ->post(route('accessories.checkout.store', $accessory), [
+                'assigned_user' => User::factory()->create()->id,
+                'checkout_to_type' => 'user',
             ])
-            ->assertSessionHas('error');
+            ->assertStatus(302)
+            ->assertSessionHas('errors')
+            ->assertRedirect(route('accessories.checkout.store', $accessory));
+        $response->assertInvalid(['checkout_qty']);
+        $this->followRedirects($response)->assertSee(trans('general.error'));
     }
 
-    public function testAccessoryCanBeCheckedOut()
+    public function testAccessoryCanBeCheckedOutWithoutQuantity()
     {
         $accessory = Accessory::factory()->create();
         $user = User::factory()->create();
 
         $this->actingAs(User::factory()->checkoutAccessories()->create())
             ->post(route('accessories.checkout.store', $accessory), [
-                'assigned_to' => $user->id,
+                'assigned_user' => $user->id,
+                'checkout_to_type' => 'user',
+                'note' => 'oh hi there',
             ]);
 
-        $this->assertTrue($accessory->users->contains($user));
+        $this->assertTrue($accessory->checkouts()->where('assigned_type', User::class)->where('assigned_to', $user->id)->count() > 0);
+
+        $this->assertDatabaseHas('action_logs', [
+            'action_type' => 'checkout',
+            'target_id' => $user->id,
+            'target_type' => User::class,
+            'item_id' => $accessory->id,
+            'item_type' => Accessory::class,
+            'note' => 'oh hi there',
+        ]);
+    }
+
+    public function testAccessoryCanBeCheckedOutWithQuantity()
+    {
+        $accessory = Accessory::factory()->create(['qty'=>5]);
+        $user = User::factory()->create();
+
+        $this->actingAs(User::factory()->checkoutAccessories()->create())
+            ->from(route('accessories.checkout.show', $accessory))
+            ->post(route('accessories.checkout.store', $accessory), [
+                'assigned_user' => $user->id,
+                'checkout_to_type' => 'user',
+                'checkout_qty' => 3,
+                'note' => 'oh hi there',
+            ]);
+
+        $this->assertTrue($accessory->checkouts()->where('assigned_type', User::class)->where('assigned_to', $user->id)->count() > 0);
+
+        $this->assertDatabaseHas('action_logs', [
+            'action_type' => 'checkout',
+            'target_id' => $user->id,
+            'target_type' => User::class,
+            'item_id' => $accessory->id,
+            'item_type' => Accessory::class,
+            'note' => 'oh hi there',
+        ]);
+    }
+
+    public function testAccessoryCanBeCheckedOutToLocationWithQuantity()
+    {
+        $accessory = Accessory::factory()->create(['qty'=>5]);
+        $location = Location::factory()->create();
+
+        $this->actingAs(User::factory()->checkoutAccessories()->create())
+            ->from(route('accessories.checkout.show', $accessory))
+            ->post(route('accessories.checkout.store', $accessory), [
+                'assigned_location' => $location->id,
+                'checkout_to_type' => 'location',
+                'checkout_qty' => 3,
+                'note' => 'oh hi there',
+            ]);
+
+        $this->assertTrue($accessory->checkouts()->where('assigned_type', Location::class)->where('assigned_to', $location->id)->count() > 0);
+
+        $this->assertDatabaseHas('action_logs', [
+            'action_type' => 'checkout',
+            'target_id' => $location->id,
+            'target_type' => Location::class,
+            'item_id' => $accessory->id,
+            'item_type' => Accessory::class,
+            'note' => 'oh hi there',
+        ]);
+    }
+
+    public function testAccessoryCanBeCheckedOutToAssetWithQuantity()
+    {
+        $accessory = Accessory::factory()->create(['qty'=>5]);
+        $asset = Asset::factory()->create();
+
+        $this->actingAs(User::factory()->checkoutAccessories()->create())
+            ->from(route('accessories.checkout.show', $accessory))
+            ->post(route('accessories.checkout.store', $accessory), [
+                'assigned_asset' => $asset->id,
+                'checkout_to_type' => 'asset',
+                'checkout_qty' => 3,
+                'note' => 'oh hi there',
+            ]);
+
+        $this->assertTrue($accessory->checkouts()->where('assigned_type', Asset::class)->where('assigned_to', $asset->id)->count() > 0);
+
+        $this->assertDatabaseHas('action_logs', [
+            'action_type' => 'checkout',
+            'target_id' => $asset->id,
+            'target_type' => Asset::class,
+            'item_id' => $accessory->id,
+            'item_type' => Accessory::class,
+            'note' => 'oh hi there',
+        ]);
     }
 
     public function testUserSentNotificationUponCheckout()
     {
-        Notification::fake();
+        Mail::fake();
 
         $accessory = Accessory::factory()->requiringAcceptance()->create();
         $user = User::factory()->create();
 
         $this->actingAs(User::factory()->checkoutAccessories()->create())
+            ->from(route('accessories.checkout.show', $accessory))
             ->post(route('accessories.checkout.store', $accessory), [
-                'assigned_to' => $user->id,
+                'assigned_user' => $user->id,
+                'checkout_to_type' => 'user',
             ]);
 
-        Notification::assertSentTo($user, CheckoutAccessoryNotification::class);
+        Mail::assertSent(CheckoutAccessoryMail::class, function ($mail) use ($user) {
+            return $mail->hasTo($user->email);
+        });
     }
 
     public function testActionLogCreatedUponCheckout()
@@ -71,8 +189,10 @@ class AccessoryCheckoutTest extends TestCase
         $user = User::factory()->create();
 
         $this->actingAs($actor)
+            ->from(route('accessories.checkout.show', $accessory))
             ->post(route('accessories.checkout.store', $accessory), [
-                'assigned_to' => $user->id,
+                'assigned_user' => $user->id,
+                'checkout_to_type' => 'user',
                 'note' => 'oh hi there',
             ]);
 
@@ -84,10 +204,60 @@ class AccessoryCheckoutTest extends TestCase
                 'target_type' => User::class,
                 'item_id' => $accessory->id,
                 'item_type' => Accessory::class,
-                'user_id' => $actor->id,
+                'created_by' => $actor->id,
                 'note' => 'oh hi there',
             ])->count(),
             'Log entry either does not exist or there are more than expected'
         );
     }
+
+    public function testAccessoryCheckoutPagePostIsRedirectedIfRedirectSelectionIsIndex()
+    {
+        $accessory = Accessory::factory()->create();
+
+        $this->actingAs(User::factory()->admin()->create())
+            ->from(route('accessories.index'))
+            ->post(route('accessories.checkout.store', $accessory), [
+                'assigned_user' => User::factory()->create()->id,
+                'checkout_to_type' => 'user',
+                'redirect_option' => 'index',
+                'assigned_qty' => 1,
+            ])
+            ->assertStatus(302)
+            ->assertRedirect(route('accessories.index'));
+    }
+
+    public function testAccessoryCheckoutPagePostIsRedirectedIfRedirectSelectionIsItem()
+    {
+        $accessory = Accessory::factory()->create();
+
+        $this->actingAs(User::factory()->admin()->create())
+            ->from(route('accessories.index'))
+            ->post(route('accessories.checkout.store' , $accessory), [
+                'assigned_user' => User::factory()->create()->id,
+                'checkout_to_type' => 'user',
+                'redirect_option' => 'item',
+                'assigned_qty' => 1,
+            ])
+            ->assertStatus(302)
+            ->assertSessionHasNoErrors()
+            ->assertRedirect(route('accessories.show', $accessory));
+    }
+
+    public function testAccessoryCheckoutPagePostIsRedirectedIfRedirectSelectionIsTarget()
+    {
+        $user = User::factory()->create();
+        $accessory = Accessory::factory()->create();
+
+        $this->actingAs(User::factory()->admin()->create())
+            ->from(route('accessories.index'))
+            ->post(route('accessories.checkout.store' , $accessory), [
+                'assigned_user' => $user->id,
+                'checkout_to_type' => 'user',
+                'redirect_option' => 'target',
+                'assigned_qty' => 1,
+            ])
+            ->assertStatus(302)
+            ->assertRedirect(route('users.show', $user));
+    }
 }
diff --git a/tests/Feature/Checkouts/Ui/AssetCheckoutTest.php b/tests/Feature/Checkouts/Ui/AssetCheckoutTest.php
index eed0908c1d..0019791752 100644
--- a/tests/Feature/Checkouts/Ui/AssetCheckoutTest.php
+++ b/tests/Feature/Checkouts/Ui/AssetCheckoutTest.php
@@ -2,7 +2,9 @@
 
 namespace Tests\Feature\Checkouts\Ui;
 
+use PHPUnit\Framework\Attributes\DataProvider;
 use App\Events\CheckoutableCheckedOut;
+use App\Models\Accessory;
 use App\Models\Asset;
 use App\Models\Company;
 use App\Models\LicenseSeat;
@@ -116,11 +118,17 @@ class AssetCheckoutTest extends TestCase
         Event::assertNotDispatched(CheckoutableCheckedOut::class);
     }
 
+    public function testPageRenders()
+    {
+        $this->actingAs(User::factory()->superuser()->create())
+            ->get(route('hardware.checkout.create', Asset::factory()->create()))
+            ->assertOk();
+    }
     /**
      * This data provider contains checkout targets along with the
      * asset's expected location after the checkout process.
      */
-    public function checkoutTargets(): array
+    public static function checkoutTargets(): array
     {
         return [
             'User' => [function () {
@@ -166,7 +174,7 @@ class AssetCheckoutTest extends TestCase
         ];
     }
 
-    /** @dataProvider checkoutTargets */
+    #[DataProvider('checkoutTargets')]
     public function testAssetCanBeCheckedOut($data)
     {
         ['checkout_type' => $type, 'target' => $target, 'expected_location' => $expectedLocation] = $data();
@@ -175,16 +183,23 @@ class AssetCheckoutTest extends TestCase
         $asset = Asset::factory()->create();
         $admin = User::factory()->checkoutAssets()->create();
 
+        $defaultFieldsAlwaysIncludedInUIFormSubmission = [
+            'assigned_user' => null,
+            'assigned_asset' => null,
+            'assigned_location' => null,
+        ];
+
         $this->actingAs($admin)
-            ->post(route('hardware.checkout.store', $asset), [
+            ->post(route('hardware.checkout.store', $asset), array_merge($defaultFieldsAlwaysIncludedInUIFormSubmission, [
                 'checkout_to_type' => $type,
-                'assigned_' . $type => $target->id,
+                // overwrite the value from the default fields set above
+                'assigned_' . $type => (string) $target->id,
                 'name' => 'Changed Name',
-                'status_id' => $newStatus->id,
+                'status_id' => (string) $newStatus->id,
                 'checkout_at' => '2024-03-18',
                 'expected_checkin' => '2024-03-28',
                 'note' => 'An awesome note',
-            ]);
+            ]));
 
         $asset->refresh();
         $this->assertTrue($asset->assignedTo()->is($target));
@@ -234,7 +249,7 @@ class AssetCheckoutTest extends TestCase
 
         $asset->refresh();
 
-        $this->assertTrue(Carbon::parse($asset->last_checkout)->diffInSeconds(now()) < 2);
+        $this->assertTrue((int) Carbon::parse($asset->last_checkout)->diffInSeconds(now(), true) < 2);
     }
 
     public function testAssetCheckoutPageIsRedirectedIfModelIsInvalid()
@@ -245,26 +260,91 @@ class AssetCheckoutTest extends TestCase
         $asset->forceSave();
 
         $this->actingAs(User::factory()->admin()->create())
-            ->get(route('hardware.checkout.create', ['assetId' => $asset->id]))
+            ->get(route('hardware.checkout.create', $asset))
             ->assertStatus(302)
             ->assertSessionHas('error')
-            ->assertRedirect(route('hardware.show',['hardware' => $asset->id]));
+            ->assertRedirect(route('hardware.show', $asset));
     }
 
-    public function testAssetCheckoutPagePostIsRedirectedIfModelIsInvalid()
+    public function testAssetCheckoutPagePostIsRedirectedIfRedirectSelectionIsIndex()
     {
         $asset = Asset::factory()->create();
-        $asset->model_id = 0;
-        $asset->forceSave();
-        $user = User::factory()->create();
-        
+
         $this->actingAs(User::factory()->admin()->create())
+            ->from(route('hardware.checkout.create', $asset))
             ->post(route('hardware.checkout.store', $asset), [
                 'checkout_to_type' => 'user',
-                'assigned_user' => $user->id,
+                'assigned_user' =>  User::factory()->create()->id,
+                'redirect_option' => 'index',
             ])
             ->assertStatus(302)
-            ->assertSessionHas('error')
-            ->assertRedirect(route('hardware.show', ['hardware' => $asset->id]));
+            ->assertRedirect(route('hardware.index'));
+    }
+
+    public function testAssetCheckoutPagePostIsRedirectedIfRedirectSelectionIsItem()
+    {
+        $asset = Asset::factory()->create();
+
+        $this->actingAs(User::factory()->admin()->create())
+            ->from(route('hardware.checkout.create', $asset))
+            ->post(route('hardware.checkout.store' , $asset), [
+                'checkout_to_type' => 'user',
+                'assigned_user' =>  User::factory()->create()->id,
+                'redirect_option' => 'item',
+            ])
+            ->assertStatus(302)
+            ->assertSessionHasNoErrors()
+            ->assertRedirect(route('hardware.show', $asset));
+    }
+
+    public function testAssetCheckoutPagePostIsRedirectedIfRedirectSelectionIsUserTarget()
+    {
+        $user = User::factory()->create();
+        $asset = Asset::factory()->create();
+
+        $this->actingAs(User::factory()->admin()->create())
+            ->from(route('hardware.checkout.create', $asset))
+            ->post(route('hardware.checkout.store' , $asset), [
+                'checkout_to_type' => 'user',
+                'assigned_user' =>  $user->id,
+                'redirect_option' => 'target',
+                'assigned_qty' => 1,
+            ])
+            ->assertStatus(302)
+            ->assertRedirect(route('users.show', ['user' => $user]));
+    }
+
+    public function testAssetCheckoutPagePostIsRedirectedIfRedirectSelectionIsAssetTarget()
+    {
+        $target = Asset::factory()->create();
+        $asset = Asset::factory()->create();
+
+        $this->actingAs(User::factory()->admin()->create())
+            ->from(route('hardware.checkout.create', $asset))
+            ->post(route('hardware.checkout.store' , $asset), [
+                'checkout_to_type' => 'asset',
+                'assigned_asset' =>  $target->id,
+                'redirect_option' => 'target',
+                'assigned_qty' => 1,
+            ])
+            ->assertStatus(302)
+            ->assertRedirect(route('hardware.show', $target));
+    }
+
+    public function testAssetCheckoutPagePostIsRedirectedIfRedirectSelectionIsLocationTarget()
+    {
+        $target = Location::factory()->create();
+        $asset = Asset::factory()->create();
+
+        $this->actingAs(User::factory()->admin()->create())
+            ->from(route('hardware.checkout.create', $asset))
+            ->post(route('hardware.checkout.store' , $asset), [
+                'checkout_to_type' => 'location',
+                'assigned_location' =>  $target->id,
+                'redirect_option' => 'target',
+                'assigned_qty' => 1,
+            ])
+            ->assertStatus(302)
+            ->assertRedirect(route('locations.show', ['location' => $target]));
     }
 }
diff --git a/tests/Feature/Checkouts/Ui/BulkAssetCheckoutTest.php b/tests/Feature/Checkouts/Ui/BulkAssetCheckoutTest.php
new file mode 100644
index 0000000000..08d6cf6841
--- /dev/null
+++ b/tests/Feature/Checkouts/Ui/BulkAssetCheckoutTest.php
@@ -0,0 +1,91 @@
+<?php
+
+namespace Tests\Feature\Checkouts\Ui;
+
+use App\Mail\CheckoutAssetMail;
+use App\Models\Asset;
+use App\Models\User;
+use Illuminate\Support\Facades\Mail;
+use PHPUnit\Framework\ExpectationFailedException;
+use Tests\TestCase;
+
+class BulkAssetCheckoutTest extends TestCase
+{
+    public function testRequiresPermission()
+    {
+        $this->actingAs(User::factory()->create())
+            ->post(route('hardware.bulkcheckout.store'), [
+                'selected_assets' => [1],
+                'checkout_to_type' => 'user',
+                'assigned_user' => 1,
+                'assigned_asset' => null,
+                'checkout_at' => null,
+                'expected_checkin' => null,
+                'note' => null,
+            ])
+            ->assertForbidden();
+    }
+
+    public function testCanBulkCheckoutAssets()
+    {
+        Mail::fake();
+
+        $assets = Asset::factory()->requiresAcceptance()->count(2)->create();
+        $user = User::factory()->create(['email' => 'someone@example.com']);
+
+        $checkoutAt = now()->subWeek()->format('Y-m-d');
+        $expectedCheckin = now()->addWeek()->format('Y-m-d');
+
+        $this->actingAs(User::factory()->checkoutAssets()->viewAssets()->create())
+            ->followingRedirects()
+            ->post(route('hardware.bulkcheckout.store'), [
+                'selected_assets' => $assets->pluck('id')->toArray(),
+                'checkout_to_type' => 'user',
+                'assigned_user' => $user->id,
+                'assigned_asset' => null,
+                'checkout_at' => $checkoutAt,
+                'expected_checkin' => $expectedCheckin,
+                'note' => null,
+            ])
+            ->assertOk();
+
+        $assets = $assets->fresh();
+
+        $assets->each(function ($asset) use ($expectedCheckin, $checkoutAt, $user) {
+            $asset->assignedTo()->is($user);
+            $asset->last_checkout = $checkoutAt;
+            $asset->expected_checkin = $expectedCheckin;
+        });
+
+        Mail::assertSent(CheckoutAssetMail::class, 2);
+        Mail::assertSent(CheckoutAssetMail::class, function (CheckoutAssetMail $mail) {
+            return $mail->hasTo('someone@example.com');
+        });
+    }
+
+    public function testHandleMissingModelBeingIncluded()
+    {
+        Mail::fake();
+
+        $this->actingAs(User::factory()->checkoutAssets()->create())
+            ->post(route('hardware.bulkcheckout.store'), [
+                'selected_assets' => [
+                    Asset::factory()->requiresAcceptance()->create()->id,
+                    9999999,
+                ],
+                'checkout_to_type' => 'user',
+                'assigned_user' => User::factory()->create(['email' => 'someone@example.com'])->id,
+                'assigned_asset' => null,
+                'checkout_at' => null,
+                'expected_checkin' => null,
+                'note' => null,
+            ])
+            ->assertSessionHas('error', trans_choice('admin/hardware/message.multi-checkout.error', 2));
+
+        try {
+            Mail::assertNotSent(CheckoutAssetMail::class);
+        } catch (ExpectationFailedException $e) {
+            $this->fail('Asset checkout email was sent when the entire checkout failed.');
+        }
+    }
+}
diff --git a/tests/Feature/Checkouts/Ui/ComponentsCheckoutTest.php b/tests/Feature/Checkouts/Ui/ComponentsCheckoutTest.php
new file mode 100644
index 0000000000..18568d1985
--- /dev/null
+++ b/tests/Feature/Checkouts/Ui/ComponentsCheckoutTest.php
@@ -0,0 +1,97 @@
+<?php
+
+namespace Tests\Feature\Checkouts\Ui;
+
+use App\Events\CheckoutableCheckedOut;
+use App\Models\Asset;
+use App\Models\Company;
+use App\Models\Component;
+use App\Models\User;
+use Illuminate\Support\Facades\Event;
+use Tests\TestCase;
+
+class ComponentsCheckoutTest extends TestCase
+{
+    public function testCheckingOutComponentRequiresCorrectPermission()
+    {
+        $this->actingAs(User::factory()->create())
+            ->post(route('components.checkout.store', [
+                'componentID' => Component::factory()->checkedOutToAsset()->create()->id,
+            ]))
+            ->assertForbidden();
+    }
+
+    public function testPageRenders()
+    {
+        $this->actingAs(User::factory()->superuser()->create())
+            ->get(route('components.checkout.show', Component::factory()->create()->id))
+            ->assertOk();
+    }
+
+    public function test_cannot_checkout_across_companies_when_full_company_support_enabled()
+    {
+        Event::fake([CheckoutableCheckedOut::class]);
+
+        $this->settings->enableMultipleFullCompanySupport();
+
+        [$assetCompany, $componentCompany] = Company::factory()->count(2)->create();
+
+        $asset = Asset::factory()->for($assetCompany)->create();
+        $component = Component::factory()->for($componentCompany)->create();
+
+        $this->actingAs(User::factory()->superuser()->create())
+            ->post(route('components.checkout.store', $component), [
+                'asset_id' => $asset->id,
+                'assigned_qty' => '1',
+                'redirect_option' => 'index',
+            ]);
+
+        Event::assertNotDispatched(CheckoutableCheckedOut::class);
+    }
+
+    public function testComponentCheckoutPagePostIsRedirectedIfRedirectSelectionIsIndex()
+    {
+        $component = Component::factory()->create();
+
+        $this->actingAs(User::factory()->admin()->create())
+            ->from(route('components.index'))
+            ->post(route('components.checkout.store', $component), [
+                'asset_id' => Asset::factory()->create()->id,
+                'redirect_option' => 'index',
+                'assigned_qty' => 1,
+            ])
+            ->assertStatus(302)
+            ->assertRedirect(route('components.index'));
+    }
+
+    public function testComponentCheckoutPagePostIsRedirectedIfRedirectSelectionIsItem()
+    {
+        $component = Component::factory()->create();
+
+        $this->actingAs(User::factory()->admin()->create())
+            ->from(route('components.index'))
+            ->post(route('components.checkout.store' , $component), [
+                'asset_id' =>  Asset::factory()->create()->id,
+                'redirect_option' => 'item',
+                'assigned_qty' => 1,
+            ])
+            ->assertStatus(302)
+            ->assertRedirect(route('components.show', $component));
+    }
+
+    public function testComponentCheckoutPagePostIsRedirectedIfRedirectSelectionIsTarget()
+    {
+        $asset = Asset::factory()->create();
+        $component = Component::factory()->create();
+
+        $this->actingAs(User::factory()->admin()->create())
+            ->from(route('components.index'))
+            ->post(route('components.checkout.store' , $component), [
+                'asset_id' => $asset->id,
+                'redirect_option' => 'target',
+                'assigned_qty' => 1,
+            ])
+            ->assertStatus(302)
+            ->assertRedirect(route('hardware.show', $asset));
+    }
+}
diff --git a/tests/Feature/Checkouts/Ui/ConsumableCheckoutTest.php b/tests/Feature/Checkouts/Ui/ConsumableCheckoutTest.php
index b595640493..2c74e4d0cb 100644
--- a/tests/Feature/Checkouts/Ui/ConsumableCheckoutTest.php
+++ b/tests/Feature/Checkouts/Ui/ConsumableCheckoutTest.php
@@ -2,10 +2,14 @@
 
 namespace Tests\Feature\Checkouts\Ui;
 
+use App\Mail\CheckoutConsumableMail;
 use App\Models\Actionlog;
+use App\Models\Asset;
+use App\Models\Component;
 use App\Models\Consumable;
 use App\Models\User;
 use App\Notifications\CheckoutConsumableNotification;
+use Illuminate\Support\Facades\Mail;
 use Illuminate\Support\Facades\Notification;
 use Tests\TestCase;
 
@@ -18,6 +22,12 @@ class ConsumableCheckoutTest extends TestCase
             ->assertForbidden();
     }
 
+    public function testPageRenders()
+    {
+        $this->actingAs(User::factory()->superuser()->create())
+            ->get(route('consumables.checkout.show', Consumable::factory()->create()->id))
+            ->assertOk();
+    }
     public function testValidationWhenCheckingOutConsumable()
     {
         $this->actingAs(User::factory()->checkoutConsumables()->create())
@@ -51,7 +61,7 @@ class ConsumableCheckoutTest extends TestCase
 
     public function testUserSentNotificationUponCheckout()
     {
-        Notification::fake();
+        Mail::fake();
 
         $consumable = Consumable::factory()->create();
         $user = User::factory()->create();
@@ -61,7 +71,9 @@ class ConsumableCheckoutTest extends TestCase
                 'assigned_to' => $user->id,
             ]);
 
-        Notification::assertSentTo($user, CheckoutConsumableNotification::class);
+        Mail::assertSent(CheckoutConsumableMail::class, function ($mail) use ($user) {
+            return $mail->hasTo($user->email);
+        });
     }
 
     public function testActionLogCreatedUponCheckout()
@@ -84,10 +96,57 @@ class ConsumableCheckoutTest extends TestCase
                 'target_type' => User::class,
                 'item_id' => $consumable->id,
                 'item_type' => Consumable::class,
-                'user_id' => $actor->id,
+                'created_by' => $actor->id,
                 'note' => 'oh hi there',
             ])->count(),
             'Log entry either does not exist or there are more than expected'
         );
     }
+
+    public function testConsumableCheckoutPagePostIsRedirectedIfRedirectSelectionIsIndex()
+    {
+        $consumable = Consumable::factory()->create();
+
+        $this->actingAs(User::factory()->admin()->create())
+            ->from(route('consumables.index'))
+            ->post(route('consumables.checkout.store', $consumable), [
+                'assigned_to' =>  User::factory()->create()->id,
+                'redirect_option' => 'index',
+                'assigned_qty' => 1,
+            ])
+            ->assertStatus(302)
+            ->assertRedirect(route('consumables.index'));
+    }
+
+    public function testConsumableCheckoutPagePostIsRedirectedIfRedirectSelectionIsItem()
+    {
+        $consumable = Consumable::factory()->create();
+
+        $this->actingAs(User::factory()->admin()->create())
+            ->from(route('consumables.index'))
+            ->post(route('consumables.checkout.store' , $consumable), [
+                'assigned_to' =>  User::factory()->create()->id,
+                'redirect_option' => 'item',
+                'assigned_qty' => 1,
+            ])
+            ->assertStatus(302)
+            ->assertRedirect(route('consumables.show', $consumable));
+    }
+
+    public function testConsumableCheckoutPagePostIsRedirectedIfRedirectSelectionIsTarget()
+    {
+        $user = User::factory()->create();
+        $consumable = Consumable::factory()->create();
+
+        $this->actingAs(User::factory()->admin()->create())
+            ->from(route('components.index'))
+            ->post(route('consumables.checkout.store' , $consumable), [
+                'assigned_to' =>  $user->id,
+                'redirect_option' => 'target',
+                'assigned_qty' => 1,
+            ])
+            ->assertStatus(302)
+            ->assertRedirect(route('users.show', $user));
+    }
+
 }
diff --git a/tests/Feature/Checkouts/Ui/LicenseCheckoutTest.php b/tests/Feature/Checkouts/Ui/LicenseCheckoutTest.php
index 8e5cd83061..1750b75647 100644
--- a/tests/Feature/Checkouts/Ui/LicenseCheckoutTest.php
+++ b/tests/Feature/Checkouts/Ui/LicenseCheckoutTest.php
@@ -10,6 +10,13 @@ use Tests\TestCase;
 
 class LicenseCheckoutTest extends TestCase
 {
+    public function testPageRenders()
+    {
+        $this->actingAs(User::factory()->superuser()->create())
+            ->get(route('licenses.checkout', License::factory()->create()->id))
+            ->assertOk();
+    }
+
     public function testNotesAreStoredInActionLogOnCheckoutToAsset()
     {
         $admin = User::factory()->superuser()->create();
@@ -17,7 +24,7 @@ class LicenseCheckoutTest extends TestCase
         $licenseSeat = LicenseSeat::factory()->create();
 
         $this->actingAs($admin)
-            ->post("/licenses/{$licenseSeat->license->id}/checkout", [
+            ->post(route('licenses.checkout', $licenseSeat->license), [
                 'checkout_to_type' => 'asset',
                 'assigned_to' => null,
                 'asset_id' => $asset->id,
@@ -40,7 +47,7 @@ class LicenseCheckoutTest extends TestCase
         $licenseSeat = LicenseSeat::factory()->create();
 
         $this->actingAs($admin)
-            ->post("/licenses/{$licenseSeat->license->id}/checkout", [
+            ->post(route('licenses.checkout', $licenseSeat->license), [
                 'checkout_to_type' => 'user',
                 'assigned_to' => $admin->id,
                 'asset_id' => null,
@@ -56,4 +63,62 @@ class LicenseCheckoutTest extends TestCase
             'note' => 'oh hi there',
         ]);
     }
+
+    public function testLicenseCheckoutPagePostIsRedirectedIfRedirectSelectionIsIndex()
+    {
+        $license = License::factory()->create();
+
+        $this->actingAs(User::factory()->admin()->create())
+            ->from(route('licenses.checkout', $license))
+            ->post(route('licenses.checkout', $license), [
+                'assigned_to' =>  User::factory()->create()->id,
+                'redirect_option' => 'index',
+                'assigned_qty' => 1,
+            ])
+            ->assertStatus(302)
+            ->assertRedirect(route('licenses.index'));
+    }
+
+    public function testLicenseCheckoutPagePostIsRedirectedIfRedirectSelectionIsItem()
+    {
+        $license = License::factory()->create();
+
+        $this->actingAs(User::factory()->admin()->create())
+            ->from(route('licenses.checkout', $license))
+            ->post(route('licenses.checkout', $license), [
+                'assigned_to' =>  User::factory()->create()->id,
+                'redirect_option' => 'item',
+            ])
+            ->assertStatus(302)
+            ->assertRedirect(route('licenses.show', $license));
+    }
+
+    public function testLicenseCheckoutPagePostIsRedirectedIfRedirectSelectionIsUserTarget()
+    {
+        $user = User::factory()->create();
+        $license = License::factory()->create();
+
+        $this->actingAs(User::factory()->admin()->create())
+            ->from(route('licenses.checkout', $license))
+            ->post(route('licenses.checkout' , $license), [
+                'assigned_to' =>  $user->id,
+                'redirect_option' => 'target',
+            ])
+            ->assertStatus(302)
+            ->assertRedirect(route('users.show', $user));
+    }
+    public function testLicenseCheckoutPagePostIsRedirectedIfRedirectSelectionIsAssetTarget()
+    {
+        $asset = Asset::factory()->create();
+        $license = License::factory()->create();
+
+        $this->actingAs(User::factory()->admin()->create())
+            ->from(route('licenses.checkout', $license))
+            ->post(route('licenses.checkout' , $license), [
+                'asset_id' =>  $asset->id,
+                'redirect_option' => 'target',
+            ])
+            ->assertStatus(302)
+            ->assertRedirect(route('hardware.show', $asset));
+    }
 }
diff --git a/tests/Feature/Companies/Api/CreateCompaniesTest.php b/tests/Feature/Companies/Api/CreateCompaniesTest.php
new file mode 100644
index 0000000000..3c7c1f4e06
--- /dev/null
+++ b/tests/Feature/Companies/Api/CreateCompaniesTest.php
@@ -0,0 +1,46 @@
+<?php
+
+namespace Tests\Feature\Companies\Api;
+
+use App\Models\User;
+use Tests\Concerns\TestsPermissionsRequirement;
+use Tests\TestCase;
+
+class CreateCompaniesTest extends TestCase implements TestsPermissionsRequirement
+{
+    public function testRequiresPermission()
+    {
+        $this->actingAsForApi(User::factory()->create())
+            ->postJson(route('api.companies.store'))
+            ->assertForbidden();
+    }
+
+    public function testValidationForCreatingCompany()
+    {
+        $this->actingAsForApi(User::factory()->createCompanies()->create())
+            ->postJson(route('api.companies.store'))
+            ->assertStatus(200)
+            ->assertStatusMessageIs('error')
+            ->assertJsonStructure([
+                'messages' => [
+                    'name',
+                ],
+            ]);
+    }
+
+    public function testCanCreateCompany()
+    {
+        $this->actingAsForApi(User::factory()->createCompanies()->create())
+            ->postJson(route('api.companies.store'), [
+                'name' => 'My Cool Company',
+                'notes' => 'A Cool Note',
+            ])
+            ->assertStatus(200)
+            ->assertStatusMessageIs('success');
+
+        $this->assertDatabaseHas('companies', [
+            'name' => 'My Cool Company',
+            'notes' => 'A Cool Note',
+        ]);
+    }
+}
diff --git a/tests/Feature/Companies/Api/DeleteCompaniesTest.php b/tests/Feature/Companies/Api/DeleteCompaniesTest.php
new file mode 100644
index 0000000000..3dcdb4fd21
--- /dev/null
+++ b/tests/Feature/Companies/Api/DeleteCompaniesTest.php
@@ -0,0 +1,56 @@
+<?php
+
+namespace Tests\Feature\Companies\Api;
+
+use App\Models\Company;
+use App\Models\User;
+use Tests\Concerns\TestsPermissionsRequirement;
+use Tests\TestCase;
+
+class DeleteCompaniesTest extends TestCase implements TestsPermissionsRequirement
+{
+    public function testRequiresPermission()
+    {
+        $company = Company::factory()->create();
+
+        $this->actingAsForApi(User::factory()->create())
+            ->deleteJson(route('api.companies.destroy', $company))
+            ->assertForbidden();
+
+        $this->assertDatabaseHas('companies', ['id' => $company->id]);
+    }
+
+    public function testCannotDeleteCompanyThatHasAssociatedItems()
+    {
+        $companyWithAssets = Company::factory()->hasAssets()->create();
+        $companyWithAccessories = Company::factory()->hasAccessories()->create();
+        $companyWithConsumables = Company::factory()->hasConsumables()->create();
+        $companyWithComponents = Company::factory()->hasComponents()->create();
+        $companyWithUsers = Company::factory()->hasUsers()->create();
+
+        $actor = $this->actingAsForApi(User::factory()->deleteCompanies()->create());
+
+        $actor->deleteJson(route('api.companies.destroy', $companyWithAssets))->assertStatusMessageIs('error');
+        $actor->deleteJson(route('api.companies.destroy', $companyWithAccessories))->assertStatusMessageIs('error');
+        $actor->deleteJson(route('api.companies.destroy', $companyWithConsumables))->assertStatusMessageIs('error');
+        $actor->deleteJson(route('api.companies.destroy', $companyWithComponents))->assertStatusMessageIs('error');
+        $actor->deleteJson(route('api.companies.destroy', $companyWithUsers))->assertStatusMessageIs('error');
+
+        $this->assertDatabaseHas('companies', ['id' => $companyWithAssets->id]);
+        $this->assertDatabaseHas('companies', ['id' => $companyWithAccessories->id]);
+        $this->assertDatabaseHas('companies', ['id' => $companyWithConsumables->id]);
+        $this->assertDatabaseHas('companies', ['id' => $companyWithComponents->id]);
+        $this->assertDatabaseHas('companies', ['id' => $companyWithUsers->id]);
+    }
+
+    public function testCanDeleteCompany()
+    {
+        $company = Company::factory()->create();
+
+        $this->actingAsForApi(User::factory()->deleteCompanies()->create())
+            ->deleteJson(route('api.companies.destroy', $company))
+            ->assertStatusMessageIs('success');
+
+        $this->assertDatabaseMissing('companies', ['id' => $company->id]);
+    }
+}
diff --git a/tests/Feature/Companies/Api/UpdateCompaniesTest.php b/tests/Feature/Companies/Api/UpdateCompaniesTest.php
new file mode 100644
index 0000000000..07a7e42117
--- /dev/null
+++ b/tests/Feature/Companies/Api/UpdateCompaniesTest.php
@@ -0,0 +1,53 @@
+<?php
+
+namespace Tests\Feature\Companies\Api;
+
+use App\Models\Company;
+use App\Models\User;
+use Tests\TestCase;
+
+class UpdateCompaniesTest extends TestCase
+{
+    public function testRequiresPermissionToPatchCompany()
+    {
+        $company = Company::factory()->create();
+
+        $this->actingAsForApi(User::factory()->create())
+            ->patchJson(route('api.companies.update', $company))
+            ->assertForbidden();
+    }
+
+    public function testValidationForPatchingCompany()
+    {
+        $company = Company::factory()->create();
+
+        $this->actingAsForApi(User::factory()->editCompanies()->create())
+            ->patchJson(route('api.companies.update', ['company' => $company->id]), [
+                'name' => '',
+            ])
+            ->assertStatus(200)
+            ->assertStatusMessageIs('error')
+            ->assertJsonStructure([
+                'messages' => [
+                    'name',
+                ],
+            ]);
+    }
+
+    public function testCanPatchCompany()
+    {
+        $company = Company::factory()->create();
+
+        $this->actingAsForApi(User::factory()->editCompanies()->create())
+            ->patchJson(route('api.companies.update', ['company' => $company->id]), [
+                'name' => 'A Changed Name',
+                'notes' => 'A Changed Note',
+            ])
+            ->assertStatus(200)
+            ->assertStatusMessageIs('success');
+
+        $company->refresh();
+        $this->assertEquals('A Changed Name', $company->name);
+        $this->assertEquals('A Changed Note', $company->notes);
+    }
+}
diff --git a/tests/Feature/Companies/Ui/CompanyIndexTest.php b/tests/Feature/Companies/Ui/CompanyIndexTest.php
new file mode 100644
index 0000000000..5e768f41b4
--- /dev/null
+++ b/tests/Feature/Companies/Ui/CompanyIndexTest.php
@@ -0,0 +1,16 @@
+<?php
+
+namespace Tests\Feature\Companies\Ui;
+
+use App\Models\User;
+use Tests\TestCase;
+
+class CompanyIndexTest extends TestCase
+{
+    public function testPageRenders()
+    {
+        $this->actingAs(User::factory()->superuser()->create())
+            ->get(route('companies.index'))
+            ->assertOk();
+    }
+}
diff --git a/tests/Feature/Companies/Ui/CreateCompaniesTest.php b/tests/Feature/Companies/Ui/CreateCompaniesTest.php
new file mode 100644
index 0000000000..18d95d401a
--- /dev/null
+++ b/tests/Feature/Companies/Ui/CreateCompaniesTest.php
@@ -0,0 +1,60 @@
+<?php
+
+namespace Tests\Feature\Companies\Ui;
+
+use App\Models\User;
+use Tests\TestCase;
+
+class CreateCompaniesTest extends TestCase
+{
+    public function testRequiresPermissionToViewCreateCompanyPage()
+    {
+        $this->actingAs(User::factory()->create())
+            ->get(route('companies.create'))
+            ->assertForbidden();
+    }
+
+    public function testCreateCompanyPageRenders()
+    {
+        $this->actingAs(User::factory()->createCompanies()->create())
+            ->get(route('companies.create'))
+            ->assertOk()
+            ->assertViewIs('companies.edit');
+    }
+
+    public function testRequiresPermissionToCreateCompany()
+    {
+        $this->actingAs(User::factory()->create())
+            ->post(route('companies.store'))
+            ->assertForbidden();
+    }
+
+    public function testValidDataRequiredToCreateCompany()
+    {
+        $this->actingAs(User::factory()->createCompanies()->create())
+            ->post(route('companies.store'), [
+                //
+            ])
+            ->assertSessionHasErrors([
+                'name',
+            ]);
+    }
+
+    public function testCanCreateCompany()
+    {
+        $data = [
+            'email' => 'email@example.com',
+            'fax' => '619-666-6666',
+            'name' => 'My New Company',
+            'phone' => '619-555-5555',
+        ];
+
+        $user = User::factory()->createCompanies()->create();
+
+        $this->actingAs($user)
+            ->post(route('companies.store'), array_merge($data, ['redirect_option' => 'index']))
+            ->assertRedirect(route('companies.index'));
+
+        $this->assertDatabaseHas('companies', array_merge($data));
+    }
+}
diff --git a/tests/Feature/Companies/Ui/EditCompanyTest.php b/tests/Feature/Companies/Ui/EditCompanyTest.php
new file mode 100644
index 0000000000..febc717045
--- /dev/null
+++ b/tests/Feature/Companies/Ui/EditCompanyTest.php
@@ -0,0 +1,17 @@
+<?php
+
+namespace Tests\Feature\Companies\Ui;
+
+use App\Models\Company;
+use App\Models\User;
+use Tests\TestCase;
+
+class EditCompanyTest extends TestCase
+{
+    public function testPageRenders()
+    {
+        $this->actingAs(User::factory()->superuser()->create())
+            ->get(route('companies.edit', Company::factory()->create()))
+            ->assertOk();
+    }
+}
diff --git a/tests/Feature/Companies/Ui/ShowCompanyTest.php b/tests/Feature/Companies/Ui/ShowCompanyTest.php
new file mode 100644
index 0000000000..de7429d40e
--- /dev/null
+++ b/tests/Feature/Companies/Ui/ShowCompanyTest.php
@@ -0,0 +1,17 @@
+<?php
+
+namespace Tests\Feature\Companies\Ui;
+
+use App\Models\Company;
+use App\Models\User;
+use Tests\TestCase;
+
+class ShowCompanyTest extends TestCase
+{
+    public function testPageRenders()
+    {
+        $this->actingAs(User::factory()->superuser()->create())
+            ->get(route('companies.show', Company::factory()->create()))
+            ->assertOk();
+    }
+}
diff --git a/tests/Feature/Components/Api/DeleteComponentTest.php b/tests/Feature/Components/Api/DeleteComponentTest.php
new file mode 100644
index 0000000000..80d22d389e
--- /dev/null
+++ b/tests/Feature/Components/Api/DeleteComponentTest.php
@@ -0,0 +1,75 @@
+<?php
+
+namespace Tests\Feature\Components\Api;
+
+use App\Models\Company;
+use App\Models\Component;
+use App\Models\User;
+use Tests\Concerns\TestsFullMultipleCompaniesSupport;
+use Tests\Concerns\TestsPermissionsRequirement;
+use Tests\TestCase;
+
+class DeleteComponentTest extends TestCase implements TestsFullMultipleCompaniesSupport, TestsPermissionsRequirement
+{
+    public function testRequiresPermission()
+    {
+        $component = Component::factory()->create();
+
+        $this->actingAsForApi(User::factory()->create())
+            ->deleteJson(route('api.components.destroy', $component))
+            ->assertForbidden();
+
+        $this->assertNotSoftDeleted($component);
+    }
+
+    public function testAdheresToFullMultipleCompaniesSupportScoping()
+    {
+        [$companyA, $companyB] = Company::factory()->count(2)->create();
+
+        $componentA = Component::factory()->for($companyA)->create();
+        $componentB = Component::factory()->for($companyB)->create();
+        $componentC = Component::factory()->for($companyB)->create();
+
+        $superUser = $companyA->users()->save(User::factory()->superuser()->make());
+        $userInCompanyA = $companyA->users()->save(User::factory()->deleteComponents()->make());
+        $userInCompanyB = $companyB->users()->save(User::factory()->deleteComponents()->make());
+
+        $this->settings->enableMultipleFullCompanySupport();
+
+        $this->actingAsForApi($userInCompanyA)
+            ->deleteJson(route('api.components.destroy', $componentB))
+            ->assertStatusMessageIs('error');
+
+        $this->actingAsForApi($userInCompanyB)
+            ->deleteJson(route('api.components.destroy', $componentA))
+            ->assertStatusMessageIs('error');
+
+        $this->actingAsForApi($superUser)
+            ->deleteJson(route('api.components.destroy', $componentC))
+            ->assertStatusMessageIs('success');
+
+        $this->assertNotSoftDeleted($componentA);
+        $this->assertNotSoftDeleted($componentB);
+        $this->assertSoftDeleted($componentC);
+    }
+
+    public function testCanDeleteComponents()
+    {
+        $component = Component::factory()->create();
+
+        $this->actingAsForApi(User::factory()->deleteComponents()->create())
+            ->deleteJson(route('api.components.destroy', $component))
+            ->assertStatusMessageIs('success');
+
+        $this->assertSoftDeleted($component);
+    }
+
+    public function testCannotDeleteComponentIfCheckedOut()
+    {
+        $component = Component::factory()->checkedOutToAsset()->create();
+
+        $this->actingAsForApi(User::factory()->deleteComponents()->create())
+            ->deleteJson(route('api.components.destroy', $component))
+            ->assertStatusMessageIs('error');
+    }
+}
diff --git a/tests/Feature/Components/Ui/ComponentIndexTest.php b/tests/Feature/Components/Ui/ComponentIndexTest.php
new file mode 100644
index 0000000000..41b733e046
--- /dev/null
+++ b/tests/Feature/Components/Ui/ComponentIndexTest.php
@@ -0,0 +1,23 @@
+<?php
+
+namespace Tests\Feature\Components\Ui;
+
+use App\Models\User;
+use Tests\TestCase;
+
+class ComponentIndexTest extends TestCase
+{
+    public function testPermissionRequiredToViewComponentsList()
+    {
+        $this->actingAs(User::factory()->create())
+            ->get(route('components.index'))
+            ->assertForbidden();
+    }
+
+    public function testUserCanListComponents()
+    {
+        $this->actingAs(User::factory()->superuser()->create())
+            ->get(route('components.index'))
+            ->assertOk();
+    }
+}
diff --git a/tests/Feature/Components/Ui/DeleteComponentTest.php b/tests/Feature/Components/Ui/DeleteComponentTest.php
new file mode 100644
index 0000000000..31d62f65dd
--- /dev/null
+++ b/tests/Feature/Components/Ui/DeleteComponentTest.php
@@ -0,0 +1,98 @@
+<?php
+
+namespace Tests\Feature\Components\Ui;
+
+use App\Models\Company;
+use App\Models\Component;
+use App\Models\User;
+use Illuminate\Support\Facades\Storage;
+use Tests\Concerns\TestsFullMultipleCompaniesSupport;
+use Tests\Concerns\TestsPermissionsRequirement;
+use Tests\TestCase;
+
+class DeleteComponentTest extends TestCase implements TestsFullMultipleCompaniesSupport, TestsPermissionsRequirement
+{
+    public function testRequiresPermission()
+    {
+        $component = Component::factory()->create();
+
+        $this->actingAs(User::factory()->create())
+            ->delete(route('components.destroy', $component->id))
+            ->assertForbidden();
+    }
+
+    public function testHandlesNonExistentComponent()
+    {
+        $this->actingAs(User::factory()->deleteComponents()->create())
+            ->delete(route('components.destroy', 10000))
+            ->assertSessionHas('error');
+    }
+
+    public function testCanDeleteComponent()
+    {
+        $component = Component::factory()->create();
+
+        $this->actingAs(User::factory()->deleteComponents()->create())
+            ->delete(route('components.destroy', $component->id))
+            ->assertSessionHas('success')
+            ->assertRedirect(route('components.index'));
+
+        $this->assertSoftDeleted($component);
+    }
+
+    public function testCannotDeleteComponentIfCheckedOut()
+    {
+        $component = Component::factory()->checkedOutToAsset()->create();
+
+        $this->actingAs(User::factory()->deleteComponents()->create())
+            ->delete(route('components.destroy', $component->id))
+            ->assertSessionHas('error')
+            ->assertRedirect(route('components.index'));
+    }
+
+    public function testDeletingComponentRemovesComponentImage()
+    {
+        Storage::fake('public');
+
+        $component = Component::factory()->create(['image' => 'component-image.jpg']);
+
+        Storage::disk('public')->put('components/component-image.jpg', 'content');
+
+        Storage::disk('public')->assertExists('components/component-image.jpg');
+
+        $this->actingAs(User::factory()->deleteComponents()->create())->delete(route('components.destroy', $component->id));
+
+        Storage::disk('public')->assertMissing('components/component-image.jpg');
+    }
+
+    public function testDeletingComponentIsLogged()
+    {
+        $user = User::factory()->deleteComponents()->create();
+        $component = Component::factory()->create();
+
+        $this->actingAs($user)->delete(route('components.destroy', $component->id));
+
+        $this->assertDatabaseHas('action_logs', [
+            'created_by' => $user->id,
+            'action_type' => 'delete',
+            'item_type' => Component::class,
+            'item_id' => $component->id,
+        ]);
+    }
+
+    public function testAdheresToFullMultipleCompaniesSupportScoping()
+    {
+        $this->settings->enableMultipleFullCompanySupport();
+
+        [$companyA, $companyB] = Company::factory()->count(2)->create();
+
+        $userInCompanyA = User::factory()->for($companyA)->create();
+        $componentForCompanyB = Component::factory()->for($companyB)->create();
+
+        $this->actingAs($userInCompanyA)
+            ->delete(route('components.destroy', $componentForCompanyB->id))
+            ->assertSessionHas('error');
+
+        $this->assertNotSoftDeleted($componentForCompanyB);
+    }
+}
diff --git a/tests/Feature/Components/Ui/EditComponentTest.php b/tests/Feature/Components/Ui/EditComponentTest.php
new file mode 100644
index 0000000000..4e4b992330
--- /dev/null
+++ b/tests/Feature/Components/Ui/EditComponentTest.php
@@ -0,0 +1,17 @@
+<?php
+
+namespace Tests\Feature\Components\Ui;
+
+use App\Models\Component;
+use App\Models\User;
+use Tests\TestCase;
+
+class EditComponentTest extends TestCase
+{
+    public function testPageRenders()
+    {
+        $this->actingAs(User::factory()->superuser()->create())
+            ->get(route('components.edit', Component::factory()->create()))
+            ->assertOk();
+    }
+}
diff --git a/tests/Feature/Components/Ui/ShowComponentTest.php b/tests/Feature/Components/Ui/ShowComponentTest.php
new file mode 100644
index 0000000000..6ee2ca2863
--- /dev/null
+++ b/tests/Feature/Components/Ui/ShowComponentTest.php
@@ -0,0 +1,17 @@
+<?php
+
+namespace Tests\Feature\Components\Ui;
+
+use App\Models\Component;
+use App\Models\User;
+use Tests\TestCase;
+
+class ShowComponentTest extends TestCase
+{
+    public function testPageRenders()
+    {
+        $this->actingAs(User::factory()->superuser()->create())
+            ->get(route('components.show', Component::factory()->create()))
+            ->assertOk();
+    }
+}
diff --git a/tests/Feature/Components/Ui/StoreComponentWithFullMultipleCompanySupportTest.php b/tests/Feature/Components/Ui/StoreComponentWithFullMultipleCompanySupportTest.php
new file mode 100644
index 0000000000..bb36a6fa82
--- /dev/null
+++ b/tests/Feature/Components/Ui/StoreComponentWithFullMultipleCompanySupportTest.php
@@ -0,0 +1,34 @@
+<?php
+
+namespace Tests\Feature\Components\Ui;
+
+use App\Models\Category;
+use App\Models\Component;
+use PHPUnit\Framework\Attributes\DataProvider;
+use Tests\Support\ProvidesDataForFullMultipleCompanySupportTesting;
+use Tests\TestCase;
+
+class StoreComponentWithFullMultipleCompanySupportTest extends TestCase
+{
+    use ProvidesDataForFullMultipleCompanySupportTesting;
+
+    #[DataProvider('dataForFullMultipleCompanySupportTesting')]
+    public function testAdheresToFullMultipleCompaniesSupportScoping($data)
+    {
+        ['actor' => $actor, 'company_attempting_to_associate' => $company, 'assertions' => $assertions] = $data();
+
+        $this->settings->enableMultipleFullCompanySupport();
+
+        $this->actingAs($actor)
+            ->post(route('components.store'), [
+                'name' => 'My Cool Component',
+                'qty' => '1',
+                'category_id' => Category::factory()->create()->id,
+                'company_id' => $company->id,
+            ]);
+
+        $component = Component::where('name', 'My Cool Component')->sole();
+
+        $assertions($component);
+    }
+}
diff --git a/tests/Feature/Console/FixupAssignedToAssignedTypeTest.php b/tests/Feature/Console/FixupAssignedToAssignedTypeTest.php
new file mode 100644
index 0000000000..2b5f9b415d
--- /dev/null
+++ b/tests/Feature/Console/FixupAssignedToAssignedTypeTest.php
@@ -0,0 +1,45 @@
+<?php
+
+namespace Tests\Feature\Console;
+
+use App\Models\Asset;
+use App\Models\User;
+use Tests\TestCase;
+
+class FixupAssignedToAssignedTypeTest extends TestCase
+{
+    public function testEmptyAssignedType()
+    {
+        $asset = Asset::factory()->create();
+        $user = User::factory()->create();
+        $admin = User::factory()->admin()->create();
+
+        $asset->checkOut($user, $admin);
+        $asset->assigned_type=null; //blank out the assigned type
+        $asset->save();
+
+        $this->artisan('snipeit:assigned-to-fixup --debug')->assertExitCode(0);
+
+        $this->assertEquals(User::class, $asset->fresh()->assigned_type);
+    }
+
+    public function testInvalidAssignedTo()
+    {
+        $this->markTestIncomplete();
+        $asset = Asset::factory()->create();
+        $user = User::factory()->create();
+        $admin = User::factory()->admin()->create();
+
+        $asset->checkOut($user, $admin);
+        $asset->assigned_type=null;
+        $asset->assigned_to=null;
+        $asset->saveOrFail(); //*should* generate a 'checkin'?
+
+        $asset->assigned_to=$user->id; //incorrectly mark asset as partially checked-out
+        $asset->saveOrFail();
+
+        $this->artisan('snipeit:assigned-to-fixup --debug')->assertExitCode(0);
+
+        $this->assertNull($asset->fresh()->assigned_to);
+    }
+}
diff --git a/tests/Feature/Console/MergeUsersTest.php b/tests/Feature/Console/MergeUsersTest.php
new file mode 100644
index 0000000000..4c43e6293d
--- /dev/null
+++ b/tests/Feature/Console/MergeUsersTest.php
@@ -0,0 +1,135 @@
+<?php
+
+namespace Tests\Feature\Console;
+
+use App\Models\Accessory;
+use App\Models\Asset;
+use App\Models\Consumable;
+use App\Models\LicenseSeat;
+use App\Models\User;
+use App\Models\Actionlog;
+use Tests\TestCase;
+
+
+class MergeUsersTest extends TestCase
+{
+    public function testAssetsAreTransferredOnUserMerge()
+    {
+        $user1 = User::factory()->create(['username' => 'user1']);
+        $user_to_merge_into = User::factory()->create(['username' => 'user1@example.com']);
+
+        Asset::factory()->count(3)->assignedToUser($user1)->create();
+        Asset::factory()->count(3)->assignedToUser($user_to_merge_into)->create();
+
+        $this->artisan('snipeit:merge-users')->assertExitCode(0);
+
+        $this->assertEquals(6, $user_to_merge_into->refresh()->assets->count());
+        $this->assertEquals(0, $user1->refresh()->assets->count());
+
+    }
+
+    public function testLicensesAreTransferredOnUserMerge(): void
+    {
+        $user1 = User::factory()->create(['username' => 'user1']);
+        $user_to_merge_into = User::factory()->create(['username' => 'user1@example.com']);
+
+        LicenseSeat::factory()->count(3)->create(['assigned_to' => $user1->id]);
+        LicenseSeat::factory()->count(3)->create(['assigned_to' => $user_to_merge_into->id]);
+
+        $this->assertEquals(3, $user_to_merge_into->refresh()->licenses->count());
+
+        $this->artisan('snipeit:merge-users')->assertExitCode(0);
+
+        $this->assertEquals(6, $user_to_merge_into->refresh()->licenses->count());
+        $this->assertEquals(0, $user1->refresh()->licenses->count());
+
+    }
+
+    public function testAccessoriesTransferredOnUserMerge(): void
+    {
+        $user1 = User::factory()->create(['username' => 'user1']);
+        $user_to_merge_into = User::factory()->create(['username' => 'user1@example.com']);
+
+        Accessory::factory()->count(3)->checkedOutToUser($user1)->create();
+        Accessory::factory()->count(3)->checkedOutToUser($user_to_merge_into)->create();
+
+        $this->assertEquals(3, $user_to_merge_into->refresh()->accessories->count());
+
+        $this->artisan('snipeit:merge-users')->assertExitCode(0);
+
+        $this->assertEquals(6, $user_to_merge_into->refresh()->accessories->count());
+        $this->assertEquals(0, $user1->refresh()->accessories->count());
+
+    }
+
+    public function testConsumablesTransferredOnUserMerge(): void
+    {
+        $user1 = User::factory()->create(['username' => 'user1']);
+        $user_to_merge_into = User::factory()->create(['username' => 'user1@example.com']);
+
+        Consumable::factory()->count(3)->checkedOutToUser($user1)->create();
+        Consumable::factory()->count(3)->checkedOutToUser($user_to_merge_into)->create();
+
+        $this->assertEquals(3, $user_to_merge_into->refresh()->consumables->count());
+
+        $this->artisan('snipeit:merge-users')->assertExitCode(0);
+
+        $this->assertEquals(6, $user_to_merge_into->refresh()->consumables->count());
+        $this->assertEquals(0, $user1->refresh()->consumables->count());
+
+    }
+
+    public function testFilesAreTransferredOnUserMerge(): void
+    {
+        $user1 = User::factory()->create(['username' => 'user1']);
+        $user_to_merge_into = User::factory()->create(['username' => 'user1@example.com']);
+
+        Actionlog::factory()->count(3)->filesUploaded()->create(['item_id' => $user1->id]);
+        Actionlog::factory()->count(3)->filesUploaded()->create(['item_id' => $user_to_merge_into->id]);
+
+        $this->assertEquals(3, $user_to_merge_into->refresh()->uploads->count());
+
+        $this->artisan('snipeit:merge-users')->assertExitCode(0);
+
+        $this->assertEquals(6, $user_to_merge_into->refresh()->uploads->count());
+        $this->assertEquals(0, $user1->refresh()->uploads->count());
+
+    }
+
+    public function testAcceptancesAreTransferredOnUserMerge(): void
+    {
+        $user1 = User::factory()->create(['username' => 'user1']);
+        $user_to_merge_into = User::factory()->create(['username' => 'user1@example.com']);
+
+        Actionlog::factory()->count(3)->acceptedSignature()->create(['target_id' => $user1->id]);
+        Actionlog::factory()->count(3)->acceptedSignature()->create(['target_id' => $user_to_merge_into->id]);
+
+        $this->assertEquals(3, $user_to_merge_into->refresh()->acceptances->count());
+
+        $this->artisan('snipeit:merge-users')->assertExitCode(0);
+
+        $this->assertEquals(6, $user_to_merge_into->refresh()->acceptances->count());
+        $this->assertEquals(0, $user1->refresh()->acceptances->count());
+
+    }
+
+    public function testUserUpdateHistoryIsTransferredOnUserMerge(): void
+    {
+        $user1 = User::factory()->create(['username' => 'user1']);
+        $user_to_merge_into = User::factory()->create(['username' => 'user1@example.com']);
+
+        Actionlog::factory()->count(3)->userUpdated()->create(['target_id' => $user1->id, 'item_id' => $user1->id]);
+        Actionlog::factory()->count(3)->userUpdated()->create(['target_id' => $user_to_merge_into->id, 'item_id' => $user_to_merge_into->id]);
+
+        $this->assertEquals(3, $user_to_merge_into->refresh()->userlog->count());
+
+        $this->artisan('snipeit:merge-users')->assertExitCode(0);
+
+        // This needs to be more than the otherwise expected because the merge action itself is logged for the two merging users
+        $this->assertEquals(7, $user_to_merge_into->refresh()->userlog->count());
+        $this->assertEquals(1, $user1->refresh()->userlog->count());
+
+    }
+
+
+}
diff --git a/tests/Feature/Console/OptimizeTest.php b/tests/Feature/Console/OptimizeTest.php
new file mode 100644
index 0000000000..8dd6f270f9
--- /dev/null
+++ b/tests/Feature/Console/OptimizeTest.php
@@ -0,0 +1,18 @@
+<?php
+
+namespace Tests\Feature\Console;
+
+use Tests\TestCase;
+
+class OptimizeTest extends TestCase
+{
+    public function testOptimizeSucceeds()
+    {
+        $this->beforeApplicationDestroyed(function () {
+            $this->artisan('config:clear');
+            $this->artisan('route:clear');
+        });
+
+        $this->artisan('optimize')->assertSuccessful();
+    }
+}
diff --git a/tests/Feature/Console/SendAcceptanceReminderTest.php b/tests/Feature/Console/SendAcceptanceReminderTest.php
new file mode 100644
index 0000000000..ee28e09355
--- /dev/null
+++ b/tests/Feature/Console/SendAcceptanceReminderTest.php
@@ -0,0 +1,57 @@
+<?php
+
+namespace Tests\Feature\Console;
+
+use App\Mail\UnacceptedAssetReminderMail;
+use App\Models\CheckoutAcceptance;
+use App\Models\User;
+use Illuminate\Support\Facades\Mail;
+use Tests\TestCase;
+class SendAcceptanceReminderTest extends TestCase
+{
+    public function testAcceptanceReminderCommand()
+    {
+        Mail::fake();
+       $userA = User::factory()->create(['email' => 'userA@test.com']);
+       $userB = User::factory()->create(['email' => 'userB@test.com']);
+
+       CheckoutAcceptance::factory()->pending()->count(2)->create([
+           'assigned_to_id' => $userA->id,
+       ]);
+        CheckoutAcceptance::factory()->pending()->create([
+            'assigned_to_id' => $userB->id,
+        ]);
+
+        $this->artisan('snipeit:acceptance-reminder')->assertExitCode(0);
+
+        Mail::assertSent(UnacceptedAssetReminderMail::class, function ($mail) {
+            return $mail->hasTo('userA@test.com');
+        });
+
+        Mail::assertSent(UnacceptedAssetReminderMail::class, function ($mail) {
+            return $mail->hasTo('userB@test.com');
+        });
+
+        Mail::assertSent(UnacceptedAssetReminderMail::class,2);
+    }
+
+    public function testAcceptanceReminderCommandHandlesUserWithoutEmail()
+    {
+        Mail::fake();
+        $userA = User::factory()->create(['email' => '']);
+
+        CheckoutAcceptance::factory()->pending()->create([
+            'assigned_to_id' => $userA->id,
+        ]);
+        $headers = ['ID', 'Name'];
+        $rows = [
+            [$userA->id, $userA->present()->fullName()],
+        ];
+        $this->artisan('snipeit:acceptance-reminder')
+            ->expectsOutput("The following users do not have an email address:")
+            ->expectsTable($headers, $rows)
+            ->assertExitCode(0);
+
+        Mail::assertNotSent(UnacceptedAssetReminderMail::class);
+    }
+}
diff --git a/tests/Feature/Consumables/Api/ConsumableIndexTest.php b/tests/Feature/Consumables/Api/ConsumableIndexTest.php
index b16dfdfa53..f1d3ad7f0b 100644
--- a/tests/Feature/Consumables/Api/ConsumableIndexTest.php
+++ b/tests/Feature/Consumables/Api/ConsumableIndexTest.php
@@ -54,4 +54,29 @@ class ConsumableIndexTest extends TestCase
             ->assertResponseDoesNotContainInRows($consumableA)
             ->assertResponseContainsInRows($consumableB);
     }
+
+    public function testConsumableIndexReturnsExpectedSearchResults()
+    {
+        Consumable::factory()->count(10)->create();
+        Consumable::factory()->count(1)->create(['name' => 'My Test Consumable']);
+
+        $this->actingAsForApi(User::factory()->superuser()->create())
+            ->getJson(
+                route('api.consumables.index', [
+                    'search' => 'My Test Consumable',
+                    'sort' => 'name',
+                    'order' => 'asc',
+                    'offset' => '0',
+                    'limit' => '20',
+                ]))
+            ->assertOk()
+            ->assertJsonStructure([
+                'total',
+                'rows',
+            ])
+            ->assertJson([
+                'total' => 1,
+            ]);
+
+    }
 }
diff --git a/tests/Feature/Consumables/Api/ConsumableUpdateTest.php b/tests/Feature/Consumables/Api/ConsumableUpdateTest.php
new file mode 100644
index 0000000000..1c1e05d4d4
--- /dev/null
+++ b/tests/Feature/Consumables/Api/ConsumableUpdateTest.php
@@ -0,0 +1,52 @@
+<?php
+
+namespace Tests\Feature\Consumables\Api;
+
+use App\Models\Consumable;
+use App\Models\Category;
+use App\Models\User;
+use Tests\TestCase;
+
+class ConsumableUpdateTest extends TestCase
+{
+
+    public function testCanUpdateConsumableViaPatchWithoutCategoryType()
+    {
+        $consumable = Consumable::factory()->create();
+
+        $this->actingAsForApi(User::factory()->superuser()->create())
+            ->patchJson(route('api.consumables.update', $consumable), [
+                'name' => 'Test Consumable',
+            ])
+            ->assertOk()
+            ->assertStatusMessageIs('success')
+            ->assertStatus(200)
+            ->json();
+
+        $consumable->refresh();
+        $this->assertEquals('Test Consumable', $consumable->name, 'Name was not updated');
+
+    }
+
+    public function testCannotUpdateConsumableViaPatchWithInvalidCategoryType()
+    {
+        $category = Category::factory()->create(['category_type' => 'asset']);
+        $consumable = Consumable::factory()->create();
+
+        $this->actingAsForApi(User::factory()->superuser()->create())
+            ->patchJson(route('api.consumables.update', $consumable), [
+                'name' => 'Test Consumable',
+                'category_id' => $category->id,
+            ])
+            ->assertOk()
+            ->assertStatusMessageIs('error')
+            ->assertStatus(200)
+            ->json();
+
+        $category->refresh();
+        $this->assertNotEquals('Test Consumable', $consumable->name, 'Name was not updated');
+        $this->assertNotEquals('consumable', $consumable->category_id, 'Category was not updated');
+
+    }
+
+}
diff --git a/tests/Feature/Consumables/Api/ConsumableViewTest.php b/tests/Feature/Consumables/Api/ConsumableViewTest.php
new file mode 100644
index 0000000000..c6410216e1
--- /dev/null
+++ b/tests/Feature/Consumables/Api/ConsumableViewTest.php
@@ -0,0 +1,51 @@
+<?php
+
+namespace Tests\Feature\Consumables\Api;
+
+use App\Models\Company;
+use App\Models\Consumable;
+use App\Models\User;
+use Tests\TestCase;
+
+class ConsumableViewTest extends TestCase
+{
+    public function testConsumableViewAdheresToCompanyScoping()
+    {
+        [$companyA, $companyB] = Company::factory()->count(2)->create();
+
+        $consumableA = Consumable::factory()->for($companyA)->create();
+        $consumableB = Consumable::factory()->for($companyB)->create();
+
+        $superUser = $companyA->users()->save(User::factory()->superuser()->make());
+        $userInCompanyA = $companyA->users()->save(User::factory()->viewConsumables()->make());
+        $userInCompanyB = $companyB->users()->save(User::factory()->viewConsumables()->make());
+
+        $this->settings->disableMultipleFullCompanySupport();
+
+        $this->actingAsForApi($superUser)
+            ->getJson(route('api.consumables.show', $consumableA))
+            ->assertOk();
+
+        $this->actingAsForApi($userInCompanyA)
+            ->getJson(route('api.consumables.show', $consumableA))
+            ->assertOk();
+
+        $this->actingAsForApi($userInCompanyB)
+            ->getJson(route('api.consumables.show', $consumableB))
+            ->assertOk();
+
+        $this->settings->enableMultipleFullCompanySupport();
+
+        $this->actingAsForApi($superUser)
+            ->getJson(route('api.consumables.show', $consumableA))
+            ->assertOk();
+
+        $this->actingAsForApi($userInCompanyA)
+            ->getJson(route('api.consumables.index'))
+            ->assertOk();
+
+        $this->actingAsForApi($userInCompanyB)
+            ->getJson(route('api.consumables.index'))
+            ->assertOk();
+    }
+}
diff --git a/tests/Feature/Consumables/Api/DeleteConsumablesTest.php b/tests/Feature/Consumables/Api/DeleteConsumablesTest.php
new file mode 100644
index 0000000000..1ab91e07a0
--- /dev/null
+++ b/tests/Feature/Consumables/Api/DeleteConsumablesTest.php
@@ -0,0 +1,66 @@
+<?php
+
+namespace Tests\Feature\Consumables\Api;
+
+use App\Models\Company;
+use App\Models\Consumable;
+use App\Models\User;
+use Tests\Concerns\TestsFullMultipleCompaniesSupport;
+use Tests\Concerns\TestsPermissionsRequirement;
+use Tests\TestCase;
+
+class DeleteConsumablesTest extends TestCase implements TestsFullMultipleCompaniesSupport, TestsPermissionsRequirement
+{
+    public function testRequiresPermission()
+    {
+        $consumable = Consumable::factory()->create();
+
+        $this->actingAsForApi(User::factory()->create())
+            ->deleteJson(route('api.consumables.destroy', $consumable))
+            ->assertForbidden();
+
+        $this->assertNotSoftDeleted($consumable);
+    }
+
+    public function testAdheresToFullMultipleCompaniesSupportScoping()
+    {
+        [$companyA, $companyB] = Company::factory()->count(2)->create();
+
+        $consumableA = Consumable::factory()->for($companyA)->create();
+        $consumableB = Consumable::factory()->for($companyB)->create();
+        $consumableC = Consumable::factory()->for($companyB)->create();
+
+        $superUser = $companyA->users()->save(User::factory()->superuser()->make());
+        $userInCompanyA = $companyA->users()->save(User::factory()->deleteConsumables()->make());
+        $userInCompanyB = $companyB->users()->save(User::factory()->deleteConsumables()->make());
+
+        $this->settings->enableMultipleFullCompanySupport();
+
+        $this->actingAsForApi($userInCompanyA)
+            ->deleteJson(route('api.consumables.destroy', $consumableB))
+            ->assertStatusMessageIs('error');
+
+        $this->actingAsForApi($userInCompanyB)
+            ->deleteJson(route('api.consumables.destroy', $consumableA))
+            ->assertStatusMessageIs('error');
+
+        $this->actingAsForApi($superUser)
+            ->deleteJson(route('api.consumables.destroy', $consumableC))
+            ->assertStatusMessageIs('success');
+
+        $this->assertNotSoftDeleted($consumableA);
+        $this->assertNotSoftDeleted($consumableB);
+        $this->assertSoftDeleted($consumableC);
+    }
+
+    public function testCanDeleteConsumables()
+    {
+        $consumable = Consumable::factory()->create();
+
+        $this->actingAsForApi(User::factory()->deleteConsumables()->create())
+            ->deleteJson(route('api.consumables.destroy', $consumable))
+            ->assertStatusMessageIs('success');
+
+        $this->assertSoftDeleted($consumable);
+    }
+}
diff --git a/tests/Feature/Consumables/Ui/ConsumableIndexTest.php b/tests/Feature/Consumables/Ui/ConsumableIndexTest.php
new file mode 100644
index 0000000000..3c438187ca
--- /dev/null
+++ b/tests/Feature/Consumables/Ui/ConsumableIndexTest.php
@@ -0,0 +1,23 @@
+<?php
+
+namespace Tests\Feature\Consumables\Ui;
+
+use App\Models\User;
+use Tests\TestCase;
+
+class ConsumableIndexTest extends TestCase
+{
+    public function testPermissionRequiredToViewConsumablesList()
+    {
+        $this->actingAs(User::factory()->create())
+            ->get(route('consumables.index'))
+            ->assertForbidden();
+    }
+
+    public function testUserCanListConsumables()
+    {
+        $this->actingAs(User::factory()->superuser()->create())
+            ->get(route('consumables.index'))
+            ->assertOk();
+    }
+}
diff --git a/tests/Feature/Consumables/Ui/ConsumableViewTest.php b/tests/Feature/Consumables/Ui/ConsumableViewTest.php
new file mode 100644
index 0000000000..42c98a1859
--- /dev/null
+++ b/tests/Feature/Consumables/Ui/ConsumableViewTest.php
@@ -0,0 +1,26 @@
+<?php
+
+namespace Tests\Feature\Consumables\Ui;
+
+use App\Models\Consumable;
+use App\Models\User;
+use Tests\TestCase;
+
+class ConsumableViewTest extends TestCase
+{
+    public function testPermissionRequiredToViewConsumable()
+    {
+        $consumable = Consumable::factory()->create();
+        $this->actingAs(User::factory()->create())
+            ->get(route('consumables.show', $consumable))
+            ->assertForbidden();
+    }
+
+    public function testUserCanViewAConsumable()
+    {
+        $consumable = Consumable::factory()->create();
+        $this->actingAs(User::factory()->superuser()->create())
+            ->get(route('consumables.show', $consumable))
+            ->assertOk();
+    }
+}
diff --git a/tests/Feature/Consumables/Ui/CreateConsumableTest.php b/tests/Feature/Consumables/Ui/CreateConsumableTest.php
new file mode 100644
index 0000000000..83f0c89552
--- /dev/null
+++ b/tests/Feature/Consumables/Ui/CreateConsumableTest.php
@@ -0,0 +1,67 @@
+<?php
+
+namespace Tests\Feature\Consumables\Ui;
+
+use App\Models\Category;
+use App\Models\Company;
+use App\Models\Location;
+use App\Models\Manufacturer;
+use App\Models\Supplier;
+use App\Models\User;
+use Tests\Concerns\TestsPermissionsRequirement;
+use Tests\TestCase;
+
+class CreateConsumableTest extends TestCase implements TestsPermissionsRequirement
+{
+    public function testRequiresPermission()
+    {
+        $this->actingAs(User::factory()->create())
+            ->get(route('consumables.create'))
+            ->assertForbidden();
+    }
+
+    public function testCanRenderCreateConsumablePage()
+    {
+        $this->actingAs(User::factory()->createConsumables()->create())
+            ->get(route('consumables.create'))
+            ->assertOk()
+            ->assertViewIs('consumables.edit');
+    }
+
+    public function testCanCreateConsumable()
+    {
+        $data = [
+            'company_id' => Company::factory()->create()->id,
+            'name' => 'My Consumable',
+            'category_id' => Category::factory()->consumableInkCategory()->create()->id,
+            'supplier_id' => Supplier::factory()->create()->id,
+            'manufacturer_id' => Manufacturer::factory()->create()->id,
+            'location_id' => Location::factory()->create()->id,
+            'model_number' => '1234',
+            'item_no' => '5678',
+            'order_number' => '908',
+            'purchase_date' => '2024-12-05',
+            'purchase_cost' => '89.45',
+            'qty' => '10',
+            'min_amt' => '1',
+            'notes' => 'Some Notes',
+        ];
+
+        $this->actingAs(User::factory()->createConsumables()->create())
+            ->post(route('consumables.store'), $data + [
+                    'redirect_option' => 'index',
+                    'category_type' => 'consumable',
+                ])
+            ->assertRedirect(route('consumables.index'));
+
+        $this->assertDatabaseHas('consumables', $data);
+    }
+
+    public function testPageRenders()
+    {
+        $this->actingAs(User::factory()->superuser()->create())
+            ->get(route('consumables.create'))
+            ->assertOk();
+
+    }
+}
diff --git a/tests/Feature/Consumables/Ui/DeleteConsumableTest.php b/tests/Feature/Consumables/Ui/DeleteConsumableTest.php
new file mode 100644
index 0000000000..4406ed530a
--- /dev/null
+++ b/tests/Feature/Consumables/Ui/DeleteConsumableTest.php
@@ -0,0 +1,45 @@
+<?php
+
+namespace Tests\Feature\Consumables\Ui;
+
+use App\Models\Company;
+use App\Models\Consumable;
+use App\Models\User;
+use Tests\TestCase;
+
+class DeleteConsumableTest extends TestCase
+{
+    public function testRequiresPermissionToDeleteConsumable()
+    {
+        $this->actingAs(User::factory()->create())
+            ->delete(route('consumables.destroy', Consumable::factory()->create()->id))
+            ->assertForbidden();
+    }
+
+    public function testCannotDeleteConsumableFromAnotherCompany()
+    {
+        $this->settings->enableMultipleFullCompanySupport();
+
+        [$companyA, $companyB] = Company::factory()->count(2)->create();
+
+        $consumableForCompanyA = Consumable::factory()->for($companyA)->create();
+        $userForCompanyB = User::factory()->deleteConsumables()->for($companyB)->create();
+
+        $this->actingAs($userForCompanyB)
+            ->delete(route('consumables.destroy', $consumableForCompanyA->id))
+            ->assertRedirect(route('consumables.index'));
+
+        $this->assertNotSoftDeleted($consumableForCompanyA);
+    }
+
+    public function testCanDeleteConsumable()
+    {
+        $consumable = Consumable::factory()->create();
+
+        $this->actingAs(User::factory()->deleteConsumables()->create())
+            ->delete(route('consumables.destroy', $consumable->id))
+            ->assertRedirect(route('consumables.index'));
+
+        $this->assertSoftDeleted($consumable);
+    }
+}
diff --git a/tests/Feature/Consumables/Ui/EditConsumableTest.php b/tests/Feature/Consumables/Ui/EditConsumableTest.php
new file mode 100644
index 0000000000..308b7647b6
--- /dev/null
+++ b/tests/Feature/Consumables/Ui/EditConsumableTest.php
@@ -0,0 +1,17 @@
+<?php
+
+namespace Tests\Feature\Consumables\Ui;
+
+use App\Models\Consumable;
+use App\Models\User;
+use Tests\TestCase;
+
+class EditConsumableTest extends TestCase
+{
+    public function testPageRenders()
+    {
+        $this->actingAs(User::factory()->superuser()->create())
+            ->get(route('consumables.show', Consumable::factory()->create()))
+            ->assertOk();
+    }
+}
diff --git a/tests/Feature/Consumables/Ui/StoreConsumableWithFullMultipleCompanySupportTest.php b/tests/Feature/Consumables/Ui/StoreConsumableWithFullMultipleCompanySupportTest.php
new file mode 100644
index 0000000000..6f53d2298c
--- /dev/null
+++ b/tests/Feature/Consumables/Ui/StoreConsumableWithFullMultipleCompanySupportTest.php
@@ -0,0 +1,33 @@
+<?php
+
+namespace Tests\Feature\Consumables\Ui;
+
+use App\Models\Category;
+use App\Models\Consumable;
+use PHPUnit\Framework\Attributes\DataProvider;
+use Tests\Support\ProvidesDataForFullMultipleCompanySupportTesting;
+use Tests\TestCase;
+
+class StoreConsumableWithFullMultipleCompanySupportTest extends TestCase
+{
+    use ProvidesDataForFullMultipleCompanySupportTesting;
+
+    #[DataProvider('dataForFullMultipleCompanySupportTesting')]
+    public function testAdheresToFullMultipleCompaniesSupportScoping($data)
+    {
+        ['actor' => $actor, 'company_attempting_to_associate' => $company, 'assertions' => $assertions] = $data();
+
+        $this->settings->enableMultipleFullCompanySupport();
+
+        $this->actingAs($actor)
+            ->post(route('consumables.store'), [
+                'name' => 'My Cool Consumable',
+                'category_id' => Category::factory()->forConsumables()->create()->id,
+                'company_id' => $company->id,
+            ]);
+
+        $consumable = Consumable::where('name', 'My Cool Consumable')->sole();
+
+        $assertions($consumable);
+    }
+}
diff --git a/tests/Feature/Consumables/Ui/UpdateConsumableTest.php b/tests/Feature/Consumables/Ui/UpdateConsumableTest.php
new file mode 100644
index 0000000000..dbb13b9ce7
--- /dev/null
+++ b/tests/Feature/Consumables/Ui/UpdateConsumableTest.php
@@ -0,0 +1,110 @@
+<?php
+
+namespace Tests\Feature\Consumables\Ui;
+
+use App\Models\Category;
+use App\Models\Company;
+use App\Models\Consumable;
+use App\Models\Location;
+use App\Models\Manufacturer;
+use App\Models\Supplier;
+use App\Models\User;
+use Tests\TestCase;
+
+class UpdateConsumableTest extends TestCase
+{
+    public function testRequiresPermissionToSeeEditConsumablePage()
+    {
+        $this->actingAs(User::factory()->create())
+            ->get(route('consumables.edit', Consumable::factory()->create()))
+            ->assertForbidden();
+    }
+
+    public function testDoesNotShowEditConsumablePageFromAnotherCompany()
+    {
+        $this->settings->enableMultipleFullCompanySupport();
+
+        [$companyA, $companyB] = Company::factory()->count(2)->create();
+        $consumableForCompanyA = Consumable::factory()->for($companyA)->create();
+        $userForCompanyB = User::factory()->editConsumables()->for($companyB)->create();
+
+        $this->actingAs($userForCompanyB)
+            ->get(route('consumables.edit', $consumableForCompanyA))
+            ->assertRedirect(route('consumables.index'));
+    }
+
+    public function testEditConsumablePageRenders()
+    {
+        $this->actingAs(User::factory()->editConsumables()->create())
+            ->get(route('consumables.edit', Consumable::factory()->create()))
+            ->assertOk()
+            ->assertViewIs('consumables.edit');
+    }
+
+    public function testCannotUpdateConsumableBelongingToAnotherCompany()
+    {
+        $this->settings->enableMultipleFullCompanySupport();
+
+        [$companyA, $companyB] = Company::factory()->count(2)->create();
+
+        $consumableForCompanyA = Consumable::factory()->for($companyA)->create();
+        $userForCompanyB = User::factory()->editConsumables()->for($companyB)->create();
+
+        $this->actingAs($userForCompanyB)
+            ->put(route('consumables.update', $consumableForCompanyA), [
+                //
+            ])
+            ->assertStatus(302);
+    }
+
+    public function testCannotSetQuantityToAmountLowerThanWhatIsCheckedOut()
+    {
+        $user = User::factory()->createConsumables()->editConsumables()->create();
+        $consumable = Consumable::factory()->create(['qty' => 2]);
+
+        $consumable->users()->attach($consumable->id, ['consumable_id' => $consumable->id, 'assigned_to' => $user->id]);
+        $consumable->users()->attach($consumable->id, ['consumable_id' => $consumable->id, 'assigned_to' => $user->id]);
+
+        $this->assertEquals(2, $consumable->numCheckedOut());
+
+        $this->actingAs($user)
+            ->put(route('consumables.update', $consumable->id), [
+                'qty' => 1,
+                'redirect_option' => 'index',
+                'category_type' => 'consumable',
+            ])
+            ->assertSessionHasErrors('qty');
+
+    }
+
+    public function testCanUpdateConsumable()
+    {
+        $consumable = Consumable::factory()->create();
+
+        $data = [
+            'company_id' => Company::factory()->create()->id,
+            'name' => 'My Consumable',
+            'category_id' => Category::factory()->consumableInkCategory()->create()->id,
+            'supplier_id' => Supplier::factory()->create()->id,
+            'manufacturer_id' => Manufacturer::factory()->create()->id,
+            'location_id' => Location::factory()->create()->id,
+            'model_number' => '8765',
+            'item_no' => '5678',
+            'order_number' => '908',
+            'purchase_date' => '2024-12-05',
+            'purchase_cost' => '89.45',
+            'qty' => '9',
+            'min_amt' => '7',
+            'notes' => 'Some Notes',
+        ];
+
+        $this->actingAs(User::factory()->createConsumables()->editConsumables()->create())
+            ->put(route('consumables.update', $consumable), $data + [
+                    'redirect_option' => 'index',
+                    'category_type' => 'consumable',
+                ])
+            ->assertRedirect(route('consumables.index'));
+
+        $this->assertDatabaseHas('consumables', $data);
+    }
+}
diff --git a/tests/Feature/CustomFields/Api/DeleteCustomFieldsTest.php b/tests/Feature/CustomFields/Api/DeleteCustomFieldsTest.php
new file mode 100644
index 0000000000..ab40591e90
--- /dev/null
+++ b/tests/Feature/CustomFields/Api/DeleteCustomFieldsTest.php
@@ -0,0 +1,54 @@
+<?php
+
+namespace Tests\Feature\CustomFields\Api;
+
+use App\Models\CustomField;
+use App\Models\CustomFieldset;
+use App\Models\User;
+use Tests\Concerns\TestsPermissionsRequirement;
+use Tests\TestCase;
+
+class DeleteCustomFieldsTest extends TestCase implements TestsPermissionsRequirement
+{
+    public function testRequiresPermission()
+    {
+        $this->markIncompleteIfMySQL('Custom Fields tests do not work on MySQL');
+
+        $customField = CustomField::factory()->create();
+
+        $this->actingAsForApi(User::factory()->create())
+            ->deleteJson(route('api.customfields.destroy', $customField))
+            ->assertForbidden();
+
+        $this->assertDatabaseHas('custom_fields', ['id' => $customField->id]);
+    }
+
+    public function testCustomFieldsCannotBeDeletedIfTheyHaveAssociatedFieldsets()
+    {
+        $this->markIncompleteIfMySQL('Custom Fields tests do not work on MySQL');
+
+        $customField = CustomField::factory()->create();
+        $customFieldset = CustomFieldset::factory()->create();
+
+        $customField->fieldset()->attach($customFieldset, ['order' => 1, 'required' => 'false']);
+
+        $this->actingAsForApi(User::factory()->deleteCustomFields()->create())
+            ->deleteJson(route('api.customfields.destroy', $customField))
+            ->assertStatusMessageIs('error');
+
+        $this->assertDatabaseHas('custom_fields', ['id' => $customField->id]);
+    }
+
+    public function testCustomFieldsCanBeDeleted()
+    {
+        $this->markIncompleteIfMySQL('Custom Fields tests do not work on MySQL');
+
+        $customField = CustomField::factory()->create();
+
+        $this->actingAsForApi(User::factory()->deleteCustomFields()->create())
+            ->deleteJson(route('api.customfields.destroy', $customField))
+            ->assertStatusMessageIs('success');
+
+        $this->assertDatabaseMissing('custom_fields', ['id' => $customField->id]);
+    }
+}
diff --git a/tests/Feature/CustomFieldsets/Api/DeleteCustomFieldsetsTest.php b/tests/Feature/CustomFieldsets/Api/DeleteCustomFieldsetsTest.php
new file mode 100644
index 0000000000..c464323653
--- /dev/null
+++ b/tests/Feature/CustomFieldsets/Api/DeleteCustomFieldsetsTest.php
@@ -0,0 +1,67 @@
+<?php
+
+namespace Tests\Feature\CustomFieldsets\Api;
+
+use App\Models\CustomField;
+use App\Models\CustomFieldset;
+use App\Models\User;
+use Tests\Concerns\TestsPermissionsRequirement;
+use Tests\TestCase;
+
+class DeleteCustomFieldsetsTest extends TestCase implements TestsPermissionsRequirement
+{
+    public function testRequiresPermission()
+    {
+        $this->markIncompleteIfMySQL('Custom Fields tests do not work on MySQL');
+
+        $customFieldset = CustomFieldset::factory()->create();
+
+        $this->actingAsForApi(User::factory()->create())
+            ->deleteJson(route('api.fieldsets.destroy', $customFieldset))
+            ->assertForbidden();
+
+        $this->assertDatabaseHas('custom_fieldsets', ['id' => $customFieldset->id]);
+    }
+
+    public function testCannotDeleteCustomFieldsetWithAssociatedFields()
+    {
+        $this->markIncompleteIfMySQL('Custom Fields tests do not work on MySQL');
+
+        $customField = CustomField::factory()->create();
+        $customFieldset = CustomFieldset::factory()->create();
+
+        $customField->fieldset()->attach($customFieldset, ['order' => 1, 'required' => 'false']);
+
+        $this->actingAsForApi(User::factory()->deleteCustomFieldsets()->create())
+            ->deleteJson(route('api.fieldsets.destroy', $customFieldset))
+            ->assertStatusMessageIs('error');
+
+        $this->assertDatabaseHas('custom_fieldsets', ['id' => $customFieldset->id]);
+    }
+
+    public function testCannotDeleteCustomFieldsetWithAssociatedModels()
+    {
+        $this->markIncompleteIfMySQL('Custom Fields tests do not work on MySQL');
+
+        $customFieldset = CustomFieldset::factory()->hasModels()->create();
+
+        $this->actingAsForApi(User::factory()->deleteCustomFieldsets()->create())
+            ->deleteJson(route('api.fieldsets.destroy', $customFieldset))
+            ->assertStatusMessageIs('error');
+
+        $this->assertDatabaseHas('custom_fieldsets', ['id' => $customFieldset->id]);
+    }
+
+    public function testCanDeleteCustomFieldsets()
+    {
+        $this->markIncompleteIfMySQL('Custom Fields tests do not work on MySQL');
+
+        $customFieldset = CustomFieldset::factory()->create();
+
+        $this->actingAsForApi(User::factory()->deleteCustomFieldsets()->create())
+            ->deleteJson(route('api.fieldsets.destroy', $customFieldset))
+            ->assertStatusMessageIs('success');
+
+        $this->assertDatabaseMissing('custom_fieldsets', ['id' => $customFieldset->id]);
+    }
+}
diff --git a/tests/Feature/DashboardTest.php b/tests/Feature/DashboardTest.php
index 4690a13901..73413c5038 100644
--- a/tests/Feature/DashboardTest.php
+++ b/tests/Feature/DashboardTest.php
@@ -2,6 +2,11 @@
 
 namespace Tests\Feature;
 
+use App\Models\Accessory;
+use App\Models\Asset;
+use App\Models\Component;
+use App\Models\Consumable;
+use App\Models\License;
 use App\Models\User;
 use Tests\TestCase;
 
@@ -13,4 +18,39 @@ class DashboardTest extends TestCase
             ->get(route('home'))
             ->assertRedirect(route('view-assets'));
     }
+
+    public function testCountsAreLoadedCorrectlyForAdmins()
+    {
+        Asset::factory()->count(2)->create();
+        Accessory::factory()->count(2)->create();
+        License::factory()->count(2)->create();
+        Consumable::factory()->count(2)->create();
+        Component::factory()->count(2)->create();
+
+        $this->actingAs(User::factory()->admin()->create())
+            ->get(route('home'))
+            ->assertViewIs('dashboard')
+            ->assertViewHas('counts', function ($value) {
+                $accessoryCount = Accessory::count();
+                $assetCount = Asset::count();
+                $componentCount = Component::count();
+                $consumableCount = Consumable::count();
+                $licenseCount = License::assetcount();
+                $userCount = User::count();
+
+                $this->assertEquals($value['accessory'], $accessoryCount, 'Accessory count incorrect.');
+                $this->assertEquals($value['asset'], $assetCount, 'Asset count incorrect.');
+                $this->assertEquals($value['license'], $licenseCount, 'License count incorrect.');
+                $this->assertEquals($value['consumable'], $consumableCount, 'Consumable count incorrect.');
+                $this->assertEquals($value['component'], $componentCount, 'Component count incorrect.');
+                $this->assertEquals($value['user'], $userCount, 'User count incorrect.');
+                $this->assertEquals(
+                    $value['grand_total'],
+                    $accessoryCount + $assetCount + $consumableCount + $licenseCount,
+                    'Grand total count incorrect.'
+                );
+
+                return true;
+            });
+    }
 }
diff --git a/tests/Feature/Departments/Api/CreateDepartmentsTest.php b/tests/Feature/Departments/Api/CreateDepartmentsTest.php
new file mode 100644
index 0000000000..e0f975dd7f
--- /dev/null
+++ b/tests/Feature/Departments/Api/CreateDepartmentsTest.php
@@ -0,0 +1,42 @@
+<?php
+
+namespace Tests\Feature\Departments\Api;
+
+use App\Models\AssetModel;
+use App\Models\Department;
+use App\Models\Category;
+use App\Models\User;
+use Illuminate\Testing\Fluent\AssertableJson;
+use Tests\TestCase;
+
+class CreateDepartmentsTest extends TestCase
+{
+
+
+    public function testRequiresPermissionToCreateDepartment()
+    {
+        $this->actingAsForApi(User::factory()->create())
+            ->postJson(route('api.departments.store'))
+            ->assertForbidden();
+    }
+
+    public function testCanCreateDepartment()
+    {
+        $response = $this->actingAsForApi(User::factory()->superuser()->create())
+            ->postJson(route('api.departments.store'), [
+                'name' => 'Test Department',
+                'notes' => 'Test Note',
+            ])
+            ->assertOk()
+            ->assertStatusMessageIs('success')
+            ->assertStatus(200)
+            ->json();
+
+        $this->assertTrue(Department::where('name', 'Test Department')->exists());
+
+        $department = Department::find($response['payload']['id']);
+        $this->assertEquals('Test Department', $department->name);
+        $this->assertEquals('Test Note', $department->notes);
+    }
+
+}
diff --git a/tests/Feature/Departments/Api/DeleteDepartmentsTest.php b/tests/Feature/Departments/Api/DeleteDepartmentsTest.php
new file mode 100644
index 0000000000..cf59b81510
--- /dev/null
+++ b/tests/Feature/Departments/Api/DeleteDepartmentsTest.php
@@ -0,0 +1,77 @@
+<?php
+
+namespace Tests\Feature\Departments\Api;
+
+use App\Models\Company;
+use App\Models\Department;
+use App\Models\User;
+use Tests\Concerns\TestsFullMultipleCompaniesSupport;
+use Tests\Concerns\TestsPermissionsRequirement;
+use Tests\TestCase;
+
+class DeleteDepartmentsTest extends TestCase implements TestsFullMultipleCompaniesSupport, TestsPermissionsRequirement
+{
+    public function testRequiresPermission()
+    {
+        $department = Department::factory()->create();
+
+        $this->actingAsForApi(User::factory()->create())
+            ->deleteJson(route('api.departments.destroy', $department))
+            ->assertForbidden();
+
+        $this->assertDatabaseHas('departments', ['id' => $department->id]);
+    }
+
+    public function testAdheresToFullMultipleCompaniesSupportScoping()
+    {
+        [$companyA, $companyB] = Company::factory()->count(2)->create();
+
+        $departmentA = Department::factory()->for($companyA)->create();
+        $departmentB = Department::factory()->for($companyB)->create();
+        $departmentC = Department::factory()->for($companyB)->create();
+
+        $superUser = $companyA->users()->save(User::factory()->superuser()->make());
+        $userInCompanyA = $companyA->users()->save(User::factory()->deleteDepartments()->make());
+        $userInCompanyB = $companyB->users()->save(User::factory()->deleteDepartments()->make());
+
+        $this->settings->enableMultipleFullCompanySupport();
+
+        $this->actingAsForApi($userInCompanyA)
+            ->deleteJson(route('api.departments.destroy', $departmentB))
+            ->assertStatusMessageIs('error');
+
+        $this->actingAsForApi($userInCompanyB)
+            ->deleteJson(route('api.departments.destroy', $departmentA))
+            ->assertStatusMessageIs('error');
+
+        $this->actingAsForApi($superUser)
+            ->deleteJson(route('api.departments.destroy', $departmentC))
+            ->assertStatusMessageIs('success');
+
+        $this->assertDatabaseHas('departments', ['id' => $departmentA->id]);
+        $this->assertDatabaseHas('departments', ['id' => $departmentB->id]);
+        $this->assertDatabaseMissing('departments', ['id' => $departmentC->id]);
+    }
+
+    public function testCannotDeleteDepartmentThatStillHasUsers()
+    {
+        $department = Department::factory()->hasUsers()->create();
+
+        $this->actingAsForApi(User::factory()->deleteDepartments()->create())
+            ->deleteJson(route('api.departments.destroy', $department))
+            ->assertStatusMessageIs('error');
+
+        $this->assertDatabaseHas('departments', ['id' => $department->id]);
+    }
+
+    public function testCanDeleteDepartment()
+    {
+        $department = Department::factory()->create();
+
+        $this->actingAsForApi(User::factory()->deleteDepartments()->create())
+            ->deleteJson(route('api.departments.destroy', $department))
+            ->assertStatusMessageIs('success');
+
+        $this->assertDatabaseMissing('departments', ['id' => $department->id]);
+    }
+}
diff --git a/tests/Feature/Departments/Api/DepartmentIndexTest.php b/tests/Feature/Departments/Api/DepartmentsIndexTest.php
similarity index 98%
rename from tests/Feature/Departments/Api/DepartmentIndexTest.php
rename to tests/Feature/Departments/Api/DepartmentsIndexTest.php
index 462c0dc8e8..e3616e2491 100644
--- a/tests/Feature/Departments/Api/DepartmentIndexTest.php
+++ b/tests/Feature/Departments/Api/DepartmentsIndexTest.php
@@ -8,7 +8,7 @@ use App\Models\User;
 use Illuminate\Testing\Fluent\AssertableJson;
 use Tests\TestCase;
 
-class DepartmentIndexTest extends TestCase
+class DepartmentsIndexTest extends TestCase
 {
     public function testViewingDepartmentIndexRequiresAuthentication()
     {
diff --git a/tests/Feature/Departments/Api/UpdateDepartmentsTest.php b/tests/Feature/Departments/Api/UpdateDepartmentsTest.php
new file mode 100644
index 0000000000..b4eb38301a
--- /dev/null
+++ b/tests/Feature/Departments/Api/UpdateDepartmentsTest.php
@@ -0,0 +1,43 @@
+<?php
+
+namespace Tests\Feature\Departments\Api;
+
+use App\Models\Department;
+use App\Models\Category;
+use App\Models\User;
+use Tests\TestCase;
+
+class UpdateDepartmentsTest extends TestCase
+{
+
+    public function testRequiresPermissionToEditDepartment()
+    {
+        $department = Department::factory()->create();
+        $this->actingAsForApi(User::factory()->create())
+            ->patchJson(route('api.departments.update', $department))
+            ->assertForbidden();
+    }
+
+    public function testCanUpdateDepartmentViaPatch()
+    {
+        $department = Department::factory()->create();
+
+        $this->actingAsForApi(User::factory()->superuser()->create())
+            ->patchJson(route('api.departments.update', $department), [
+                'name' => 'Test Department',
+                'notes' => 'Test Note',
+            ])
+            ->assertOk()
+            ->assertStatusMessageIs('success')
+            ->assertStatus(200)
+            ->json();
+
+        $department->refresh();
+        $this->assertEquals('Test Department', $department->name, 'Name was not updated');
+        $this->assertEquals('Test Note', $department->notes, 'Note was not updated');
+
+    }
+
+
+
+}
diff --git a/tests/Feature/Departments/Ui/CreateDepartmentsTest.php b/tests/Feature/Departments/Ui/CreateDepartmentsTest.php
new file mode 100644
index 0000000000..f20a2c7b6a
--- /dev/null
+++ b/tests/Feature/Departments/Ui/CreateDepartmentsTest.php
@@ -0,0 +1,46 @@
+<?php
+
+namespace Tests\Feature\Departments\Ui;
+
+use App\Models\Component;
+use App\Models\Department;
+use App\Models\Company;
+use App\Models\User;
+use Tests\TestCase;
+
+class CreateDepartmentsTest extends TestCase
+{
+    public function testPageRenders()
+    {
+        $this->actingAs(User::factory()->superuser()->create())
+            ->get(route('departments.create'))
+            ->assertOk();
+    }
+
+    public function testPermissionRequiredToCreateDepartment()
+    {
+        $this->actingAs(User::factory()->create())
+            ->post(route('departments.store'), [
+                'name' => 'Test Department',
+                'company_id' => Company::factory()->create()->id
+            ])
+            ->assertForbidden();
+    }
+
+    public function testUserCanCreateDepartments()
+    {
+        $this->assertFalse(Department::where('name', 'Test Department')->exists());
+
+        $this->actingAs(User::factory()->superuser()->create())
+            ->post(route('departments.store'), [
+                'name' => 'Test Department',
+                'company_id' => Company::factory()->create()->id,
+                'notes' => 'Test Note',
+            ])
+            ->assertRedirect(route('departments.index'));
+
+        $this->assertTrue(Department::where('name', 'Test Department')->where('notes', 'Test Note')->exists());
+    }
+
+
+}
diff --git a/tests/Feature/Departments/Ui/IndexDepartmentsTest.php b/tests/Feature/Departments/Ui/IndexDepartmentsTest.php
new file mode 100644
index 0000000000..68caa29b23
--- /dev/null
+++ b/tests/Feature/Departments/Ui/IndexDepartmentsTest.php
@@ -0,0 +1,31 @@
+<?php
+
+namespace Tests\Feature\Departments\Ui;
+
+use App\Models\Component;
+use App\Models\User;
+use Tests\TestCase;
+
+class IndexDepartmentsTest extends TestCase
+{
+    public function testPermissionRequiredToViewDepartmentsList()
+    {
+        $this->actingAs(User::factory()->create())
+            ->get(route('departments.index'))
+            ->assertForbidden();
+    }
+
+    public function testPageRenders()
+    {
+        $this->actingAs(User::factory()->superuser()->create())
+            ->get(route('components.index'))
+            ->assertOk();
+    }
+
+    public function testUserCanListDepartments()
+    {
+        $this->actingAs(User::factory()->superuser()->create())
+            ->get(route('departments.index'))
+            ->assertOk();
+    }
+}
diff --git a/tests/Feature/Departments/Ui/ShowDepartmentTest.php b/tests/Feature/Departments/Ui/ShowDepartmentTest.php
new file mode 100644
index 0000000000..f1373ccc2a
--- /dev/null
+++ b/tests/Feature/Departments/Ui/ShowDepartmentTest.php
@@ -0,0 +1,17 @@
+<?php
+
+namespace Tests\Feature\Departments\Ui;
+
+use App\Models\Department;
+use App\Models\User;
+use Tests\TestCase;
+
+class ShowDepartmentTest extends TestCase
+{
+    public function testPageRenders()
+    {
+        $this->actingAs(User::factory()->superuser()->create())
+            ->get(route('departments.show', Department::factory()->create()))
+            ->assertOk();
+    }
+}
diff --git a/tests/Feature/Departments/Ui/UpdateDepartmentsTest.php b/tests/Feature/Departments/Ui/UpdateDepartmentsTest.php
new file mode 100644
index 0000000000..83e52bf7c0
--- /dev/null
+++ b/tests/Feature/Departments/Ui/UpdateDepartmentsTest.php
@@ -0,0 +1,50 @@
+<?php
+
+namespace Tests\Feature\Departments\Ui;
+
+use App\Models\Department;
+use App\Models\Category;
+use App\Models\User;
+use Tests\TestCase;
+
+class UpdateDepartmentsTest extends TestCase
+{
+    public function testPermissionRequiredToStoreDepartment()
+    {
+        $this->actingAs(User::factory()->create())
+            ->post(route('departments.store'), [
+                'name' => 'Test Department',
+            ])
+            ->assertStatus(403)
+            ->assertForbidden();
+    }
+
+    public function testPageRenders()
+    {
+        $this->actingAs(User::factory()->superuser()->create())
+            ->get(route('departments.edit', Department::factory()->create()))
+            ->assertOk();
+    }
+
+    public function testUserCanEditDepartments()
+    {
+        $department = Department::factory()->create(['name' => 'Test Department']);
+        $this->assertTrue(Department::where('name', 'Test Department')->exists());
+
+        $response = $this->actingAs(User::factory()->superuser()->create())
+            ->put(route('departments.update', $department), [
+                'name' => 'Test Department Edited',
+                'notes' => 'Test Note Edited',
+            ])
+            ->assertStatus(302)
+            ->assertSessionHasNoErrors()
+            ->assertRedirect(route('departments.index'));
+
+        $this->followRedirects($response)->assertSee('Success');
+        $this->assertTrue(Department::where('name', 'Test Department Edited')->where('notes', 'Test Note Edited')->exists());
+
+    }
+
+
+
+}
diff --git a/tests/Feature/Depreciations/Api/DeleteDepreciationsTest.php b/tests/Feature/Depreciations/Api/DeleteDepreciationsTest.php
new file mode 100644
index 0000000000..d1b32079cc
--- /dev/null
+++ b/tests/Feature/Depreciations/Api/DeleteDepreciationsTest.php
@@ -0,0 +1,44 @@
+<?php
+
+namespace Tests\Feature\Depreciations\Api;
+
+use App\Models\Depreciation;
+use App\Models\User;
+use Tests\Concerns\TestsPermissionsRequirement;
+use Tests\TestCase;
+
+class DeleteDepreciationsTest extends TestCase implements TestsPermissionsRequirement
+{
+    public function testRequiresPermission()
+    {
+        $depreciation = Depreciation::factory()->create();
+
+        $this->actingAsForApi(User::factory()->create())
+            ->deleteJson(route('api.depreciations.destroy', $depreciation))
+            ->assertForbidden();
+
+        $this->assertDatabaseHas('depreciations', ['id' => $depreciation->id]);
+    }
+
+    public function testCannotDeleteDepreciationThatHasAssociatedModels()
+    {
+        $depreciation = Depreciation::factory()->hasModels()->create();
+
+        $this->actingAsForApi(User::factory()->deleteDepreciations()->create())
+            ->deleteJson(route('api.depreciations.destroy', $depreciation))
+            ->assertStatusMessageIs('error');
+
+        $this->assertDatabaseHas('depreciations', ['id' => $depreciation->id]);
+    }
+
+    public function testCanDeleteDepreciation()
+    {
+        $depreciation = Depreciation::factory()->create();
+
+        $this->actingAsForApi(User::factory()->deleteDepreciations()->create())
+            ->deleteJson(route('api.depreciations.destroy', $depreciation))
+            ->assertStatusMessageIs('success');
+
+        $this->assertDatabaseMissing('depreciations', ['id' => $depreciation->id]);
+    }
+}
diff --git a/tests/Feature/Depreciations/Api/DepreciationsIndexTest.php b/tests/Feature/Depreciations/Api/DepreciationsIndexTest.php
new file mode 100644
index 0000000000..29583001ab
--- /dev/null
+++ b/tests/Feature/Depreciations/Api/DepreciationsIndexTest.php
@@ -0,0 +1,17 @@
+<?php
+
+namespace Tests\Feature\Depreciations\Api;
+
+use App\Models\User;
+use Tests\TestCase;
+
+class DepreciationsIndexTest extends TestCase
+{
+    public function testViewingDepreciationIndexRequiresPermission()
+    {
+        $this->actingAsForApi(User::factory()->create())
+            ->getJson(route('api.departments.index'))
+            ->assertForbidden();
+    }
+
+}
diff --git a/tests/Feature/Depreciations/Ui/CreateDepreciationTest.php b/tests/Feature/Depreciations/Ui/CreateDepreciationTest.php
new file mode 100644
index 0000000000..608194971a
--- /dev/null
+++ b/tests/Feature/Depreciations/Ui/CreateDepreciationTest.php
@@ -0,0 +1,16 @@
+<?php
+
+namespace Tests\Feature\Depreciations\Ui;
+
+use App\Models\User;
+use Tests\TestCase;
+
+class CreateDepreciationTest extends TestCase
+{
+    public function testPageRenders()
+    {
+        $this->actingAs(User::factory()->superuser()->create())
+            ->get(route('depreciations.create'))
+            ->assertOk();
+    }
+}
diff --git a/tests/Feature/Depreciations/Ui/DepreciationsIndexTest.php b/tests/Feature/Depreciations/Ui/DepreciationsIndexTest.php
new file mode 100644
index 0000000000..85ca2e55dd
--- /dev/null
+++ b/tests/Feature/Depreciations/Ui/DepreciationsIndexTest.php
@@ -0,0 +1,23 @@
+<?php
+
+namespace Tests\Feature\Depreciations\Ui;
+
+use App\Models\User;
+use Tests\TestCase;
+
+class DepreciationsIndexTest extends TestCase
+{
+    public function testPermissionRequiredToViewDepreciationsList()
+    {
+        $this->actingAs(User::factory()->create())
+            ->get(route('depreciations.index'))
+            ->assertForbidden();
+    }
+
+    public function testUserCanListDepreciations()
+    {
+        $this->actingAs(User::factory()->admin()->create())
+            ->get(route('depreciations.index'))
+            ->assertOk();
+    }
+}
diff --git a/tests/Feature/Depreciations/Ui/ShowDepreciationTest.php b/tests/Feature/Depreciations/Ui/ShowDepreciationTest.php
new file mode 100644
index 0000000000..0799e78ff3
--- /dev/null
+++ b/tests/Feature/Depreciations/Ui/ShowDepreciationTest.php
@@ -0,0 +1,17 @@
+<?php
+
+namespace Tests\Feature\Depreciations\Ui;
+
+use App\Models\Depreciation;
+use App\Models\User;
+use Tests\TestCase;
+
+class ShowDepreciationTest extends TestCase
+{
+    public function testPageRenders()
+    {
+        $this->actingAs(User::factory()->superuser()->create())
+            ->get(route('depreciations.show', Depreciation::factory()->create()->id))
+            ->assertOk();
+    }
+}
diff --git a/tests/Feature/Depreciations/Ui/UpdateDepreciationTest.php b/tests/Feature/Depreciations/Ui/UpdateDepreciationTest.php
new file mode 100644
index 0000000000..66fbb6f741
--- /dev/null
+++ b/tests/Feature/Depreciations/Ui/UpdateDepreciationTest.php
@@ -0,0 +1,17 @@
+<?php
+
+namespace Tests\Feature\Depreciations\Ui;
+
+use App\Models\Depreciation;
+use App\Models\User;
+use Tests\TestCase;
+
+class UpdateDepreciationTest extends TestCase
+{
+    public function testPageRenders()
+    {
+        $this->actingAs(User::factory()->superuser()->create())
+            ->get(route('depreciations.edit', Depreciation::factory()->create()->id))
+            ->assertOk();
+    }
+}
diff --git a/tests/Feature/Groups/Api/DeleteGroupsTest.php b/tests/Feature/Groups/Api/DeleteGroupsTest.php
new file mode 100644
index 0000000000..8259cec84c
--- /dev/null
+++ b/tests/Feature/Groups/Api/DeleteGroupsTest.php
@@ -0,0 +1,34 @@
+<?php
+
+namespace Tests\Feature\Groups\Api;
+
+use App\Models\Group;
+use App\Models\User;
+use Tests\Concerns\TestsPermissionsRequirement;
+use Tests\TestCase;
+
+class DeleteGroupsTest extends TestCase implements TestsPermissionsRequirement
+{
+    public function testRequiresPermission()
+    {
+        $group = Group::factory()->create();
+
+        $this->actingAsForApi(User::factory()->create())
+            ->deleteJson(route('api.groups.destroy', $group))
+            ->assertForbidden();
+
+        $this->assertDatabaseHas('permission_groups', ['id' => $group->id]);
+    }
+
+    public function testCanDeleteGroup()
+    {
+        $group = Group::factory()->create();
+
+        // only super admins can delete groups
+        $this->actingAsForApi(User::factory()->superuser()->create())
+            ->deleteJson(route('api.groups.destroy', $group))
+            ->assertStatusMessageIs('success');
+
+        $this->assertDatabaseMissing('permission_groups', ['id' => $group->id]);
+    }
+}
diff --git a/tests/Feature/Groups/Api/StoreGroupTest.php b/tests/Feature/Groups/Api/StoreGroupTest.php
index ebcbff71c5..484c921a6c 100644
--- a/tests/Feature/Groups/Api/StoreGroupTest.php
+++ b/tests/Feature/Groups/Api/StoreGroupTest.php
@@ -21,6 +21,7 @@ class StoreGroupTest extends TestCase
         $this->actingAsForApi(User::factory()->superuser()->create())
             ->postJson(route('api.groups.store'), [
                 'name' => 'My Awesome Group',
+                'notes' => 'My Awesome Note',
                 'permissions' => [
                     'admin' => '1',
                     'import' => '1',
@@ -29,7 +30,7 @@ class StoreGroupTest extends TestCase
             ])
             ->assertOk();
 
-        $group = Group::where('name', 'My Awesome Group')->first();
+        $group = Group::where('name', 'My Awesome Group')->where('notes', 'My Awesome Note')->first();
 
         $this->assertNotNull($group);
         $this->assertEquals('1', $group->decodePermissions()['admin']);
diff --git a/tests/Feature/Groups/Ui/CreateGroupTest.php b/tests/Feature/Groups/Ui/CreateGroupTest.php
new file mode 100644
index 0000000000..796905c50f
--- /dev/null
+++ b/tests/Feature/Groups/Ui/CreateGroupTest.php
@@ -0,0 +1,31 @@
+<?php
+
+namespace Tests\Feature\Groups\Ui;
+
+use App\Models\Group;
+use App\Models\User;
+use Tests\TestCase;
+
+class CreateGroupTest extends TestCase
+{
+    public function testPageRenders()
+    {
+        $this->actingAs(User::factory()->superuser()->create())
+            ->get(route('groups.create'))
+            ->assertOk();
+    }
+
+    public function testUserCanCreateGroup()
+    {
+        $this->assertFalse(Group::where('name', 'Test Group')->exists());
+
+        $this->actingAs(User::factory()->superuser()->create())
+            ->post(route('groups.store'), [
+                'name' => 'Test Group',
+                'notes' => 'Test Note',
+            ])
+            ->assertRedirect(route('groups.index'));
+
+        $this->assertTrue(Group::where('name', 'Test Group')->where('notes', 'Test Note')->exists());
+    }
+}
diff --git a/tests/Feature/Groups/Ui/IndexGroupTest.php b/tests/Feature/Groups/Ui/IndexGroupTest.php
new file mode 100644
index 0000000000..a2d67f903c
--- /dev/null
+++ b/tests/Feature/Groups/Ui/IndexGroupTest.php
@@ -0,0 +1,25 @@
+<?php
+
+namespace Tests\Feature\Groups\Ui;
+
+use App\Models\User;
+use Tests\TestCase;
+
+class IndexGroupTest extends TestCase
+{
+    public function testPermissionRequiredToViewGroupList()
+    {
+        $this->actingAs(User::factory()->create())
+            ->get(route('groups.index'))
+            ->assertForbidden();
+
+        //$this->followRedirects($response)->assertSee('sad-panda.png');
+    }
+
+    public function testUserCanListGroups()
+    {
+        $this->actingAs(User::factory()->superuser()->create())
+            ->get(route('groups.index'))
+            ->assertOk();
+    }
+}
diff --git a/tests/Feature/Groups/Ui/ShowGroupTest.php b/tests/Feature/Groups/Ui/ShowGroupTest.php
new file mode 100644
index 0000000000..e0106c12ef
--- /dev/null
+++ b/tests/Feature/Groups/Ui/ShowGroupTest.php
@@ -0,0 +1,17 @@
+<?php
+
+namespace Tests\Feature\Groups\Ui;
+
+use App\Models\Group;
+use App\Models\User;
+use Tests\TestCase;
+
+class ShowGroupTest extends TestCase
+{
+    public function testPageRenders()
+    {
+        $this->actingAs(User::factory()->superuser()->create())
+            ->get(route('groups.show', Group::factory()->create()->id))
+            ->assertOk();
+    }
+}
diff --git a/tests/Feature/Groups/Ui/UpdateGroupTest.php b/tests/Feature/Groups/Ui/UpdateGroupTest.php
new file mode 100644
index 0000000000..edb2368726
--- /dev/null
+++ b/tests/Feature/Groups/Ui/UpdateGroupTest.php
@@ -0,0 +1,35 @@
+<?php
+
+namespace Tests\Feature\Groups\Ui;
+
+use App\Models\Group;
+use App\Models\User;
+use Tests\TestCase;
+
+class UpdateGroupTest extends TestCase
+{
+    public function testPageRenders()
+    {
+        $this->actingAs(User::factory()->superuser()->create())
+            ->get(route('groups.edit', Group::factory()->create()->id))
+            ->assertOk();
+    }
+
+    public function testUserCanEditGroups()
+    {
+        $group = Group::factory()->create(['name' => 'Test Group']);
+        $this->assertTrue(Group::where('name', 'Test Group')->exists());
+
+        $response = $this->actingAs(User::factory()->superuser()->create())
+            ->put(route('groups.update', ['group' => $group]), [
+                'name' => 'Test Group Edited',
+                'notes' => 'Test Note Edited',
+            ])
+            ->assertStatus(302)
+            ->assertSessionHasNoErrors()
+            ->assertRedirect(route('groups.index'));
+
+        $this->followRedirects($response)->assertSee('Success');
+        $this->assertTrue(Group::where('name', 'Test Group Edited')->where('notes', 'Test Note Edited')->exists());
+    }
+}
diff --git a/tests/Feature/Importing/Api/GeneralImportTest.php b/tests/Feature/Importing/Api/GeneralImportTest.php
new file mode 100644
index 0000000000..5c38dab7f3
--- /dev/null
+++ b/tests/Feature/Importing/Api/GeneralImportTest.php
@@ -0,0 +1,16 @@
+<?php
+
+namespace Tests\Feature\Importing\Api;
+
+use App\Models\User;
+
+class GeneralImportTest extends ImportDataTestCase
+{
+    public function testRequiresExistingImport()
+    {
+        $this->actingAsForApi(User::factory()->canImport()->create());
+
+        $this->importFileResponse(['import' => 9999, 'import-type' => 'accessory'])
+            ->assertStatusMessageIs('import-errors');
+    }
+}
diff --git a/tests/Feature/Importing/Api/ImportAccessoriesTest.php b/tests/Feature/Importing/Api/ImportAccessoriesTest.php
new file mode 100644
index 0000000000..aac9dabb1d
--- /dev/null
+++ b/tests/Feature/Importing/Api/ImportAccessoriesTest.php
@@ -0,0 +1,420 @@
+<?php
+
+namespace Tests\Feature\Importing\Api;
+
+use App\Models\Accessory;
+use App\Models\Actionlog;
+use App\Models\Import;
+use App\Models\User;
+use Illuminate\Support\Str;
+use PHPUnit\Framework\Attributes\Test;
+use Illuminate\Foundation\Testing\WithFaker;
+use Illuminate\Support\Arr;
+use Illuminate\Testing\TestResponse;
+use Tests\Concerns\TestsPermissionsRequirement;
+use Tests\Support\Importing\AccessoriesImportFileBuilder as ImportFileBuilder;
+use Tests\Support\Importing\CleansUpImportFiles;
+
+class ImportAccessoriesTest extends ImportDataTestCase implements TestsPermissionsRequirement
+{
+    use CleansUpImportFiles;
+    use WithFaker;
+
+    protected function importFileResponse(array $parameters = []): TestResponse
+    {
+        if (!array_key_exists('import-type', $parameters)) {
+            $parameters['import-type'] = 'accessory';
+        }
+
+        return parent::importFileResponse($parameters);
+    }
+
+    #[Test]
+    public function testRequiresPermission()
+    {
+        $this->actingAsForApi(User::factory()->create());
+
+        $this->importFileResponse(['import' => 44])->assertForbidden();
+    }
+
+    #[Test]
+    public function userWithImportAccessoryPermissionCanImportAccessories(): void
+    {
+        $this->actingAsForApi(User::factory()->canImport()->create());
+
+        $import = Import::factory()->accessory()->create();
+
+        $this->importFileResponse(['import' => $import->id])->assertOk();
+    }
+
+    #[Test]
+    public function importAccessory(): void
+    {
+        $importFileBuilder = ImportFileBuilder::new();
+        $row = $importFileBuilder->firstRow();
+        $import = Import::factory()->accessory()->create(['file_path' => $importFileBuilder->saveToImportsDirectory()]);
+
+        $this->actingAsForApi(User::factory()->superuser()->create());
+        $this->importFileResponse(['import' => $import->id])
+            ->assertOk()
+            ->assertExactJson([
+                'payload'  => null,
+                'status'   => 'success',
+                'messages' => [
+                    'redirect_url' => route('accessories.index')
+                ]
+            ]);
+
+        $newAccessory = Accessory::query()
+            ->with(['location', 'category', 'manufacturer', 'supplier', 'company'])
+            ->where('name', $row['itemName'])
+            ->sole();
+
+        $activityLog = Actionlog::query()
+            ->where('item_type', Accessory::class)
+            ->where('item_id', $newAccessory->id)
+            ->sole();
+
+        $this->assertEquals('create', $activityLog->action_type);
+        $this->assertEquals('importer', $activityLog->action_source);
+        $this->assertEquals($newAccessory->company->id, $activityLog->company_id);
+
+        $this->assertEquals($row['itemName'], $newAccessory->name);
+        $this->assertEquals($row['quantity'], $newAccessory->qty);
+        $this->assertEquals($row['purchaseDate'], $newAccessory->purchase_date->toDateString());
+        $this->assertEquals($row['purchaseCost'], $newAccessory->purchase_cost);
+        $this->assertEquals($row['orderNumber'], $newAccessory->order_number);
+        $this->assertEquals($row['notes'], $newAccessory->notes);
+        $this->assertEquals($row['category'], $newAccessory->category->name);
+        $this->assertEquals('accessory', $newAccessory->category->category_type);
+        $this->assertEquals($row['manufacturerName'], $newAccessory->manufacturer->name);
+        $this->assertEquals($row['supplierName'], $newAccessory->supplier->name);
+        $this->assertEquals($row['location'], $newAccessory->location->name);
+        $this->assertEquals($row['companyName'], $newAccessory->company->name);
+        $this->assertEquals($row['modelNumber'], $newAccessory->model_number);
+        $this->assertFalse($newAccessory->requestable);
+        $this->assertNull($newAccessory->min_amt);
+        $this->assertNull($newAccessory->user_id);
+    }
+
+    #[Test]
+    public function whenImportFileContainsUnknownColumns(): void
+    {
+        $row = ImportFileBuilder::new()->definition();
+        $row['unknownColumn'] = $this->faker->word;
+
+        $importFileBuilder = new ImportFileBuilder([$row]);
+
+        $this->actingAsForApi(User::factory()->superuser()->create());
+
+        $import = Import::factory()->accessory()->create(['file_path' => $importFileBuilder->saveToImportsDirectory()]);
+
+        $this->importFileResponse(['import' => $import->id])->assertOk();
+    }
+
+    #[Test]
+    public function willFormatDate(): void
+    {
+        $importFileBuilder = ImportFileBuilder::new(['purchaseDate' => '2022/10/10']);
+        $import = Import::factory()->accessory()->create(['file_path' => $importFileBuilder->saveToImportsDirectory()]);
+
+        $this->actingAsForApi(User::factory()->superuser()->create());
+        $this->importFileResponse(['import' => $import->id])->assertOk();
+
+        $accessory = Accessory::query()
+            ->where('name', $importFileBuilder->firstRow()['itemName'])
+            ->sole(['purchase_date']);
+
+        $this->assertEquals('2022-10-10', $accessory->purchase_date->toDateString());
+    }
+
+    #[Test]
+    public function willNotCreateNewCategoryWhenCategoryExists(): void
+    {
+        $importFileBuilder = ImportFileBuilder::times(4)->replace(['category' => Str::random()]);
+        $import = Import::factory()->accessory()->create(['file_path' => $importFileBuilder->saveToImportsDirectory()]);
+
+        $this->actingAsForApi(User::factory()->superuser()->create());
+        $this->importFileResponse(['import' => $import->id])->assertOk();
+
+        $newAccessories = Accessory::query()
+            ->whereIn('name', $importFileBuilder->pluck('itemName'))
+            ->get();
+
+        $this->assertCount(1, $newAccessories->pluck('category_id')->unique()->all());
+    }
+
+    #[Test]
+    public function willNotCreateNewAccessoryWhenAccessoryWithNameExists(): void
+    {
+        $accessory = Accessory::factory()->create(['name' => Str::random()]);
+        $importFileBuilder = ImportFileBuilder::times(2)->replace(['itemName' => $accessory->name]);
+        $import = Import::factory()->accessory()->create(['file_path' => $importFileBuilder->saveToImportsDirectory()]);
+
+        $this->actingAsForApi(User::factory()->superuser()->create());
+        $this->importFileResponse(['import' => $import->id])->assertOk();
+
+        $probablyNewAccessories = Accessory::query()
+            ->where('name', $importFileBuilder->pluck('itemName'))
+            ->get(['name']);
+
+        $this->assertCount(1, $probablyNewAccessories);
+        $this->assertEquals($accessory->name, $probablyNewAccessories->first()->name);
+    }
+
+    #[Test]
+    public function willNotCreateNewCompanyWhenCompanyAlreadyExists(): void
+    {
+        $importFileBuilder = ImportFileBuilder::times(4)->replace(['companyName' => Str::random()]);
+        $import = Import::factory()->accessory()->create(['file_path' => $importFileBuilder->saveToImportsDirectory()]);
+
+        $this->actingAsForApi(User::factory()->superuser()->create());
+        $this->importFileResponse(['import' => $import->id])->assertOk();
+
+        $newAccessories = Accessory::query()
+            ->where('name', $importFileBuilder->pluck('itemName'))
+            ->get(['company_id']);
+
+        $this->assertCount(1, $newAccessories->pluck('company_id')->unique()->all());
+    }
+
+    #[Test]
+    public function willNotCreateNewLocationWhenLocationAlreadyExists(): void
+    {
+        $importFileBuilder = ImportFileBuilder::times(4)->replace(['location' => Str::random()]);
+        $import = Import::factory()->accessory()->create(['file_path' => $importFileBuilder->saveToImportsDirectory()]);
+
+        $this->actingAsForApi(User::factory()->superuser()->create());
+        $this->importFileResponse(['import' => $import->id])->assertOk();
+
+        $newAccessories = Accessory::query()
+            ->where('name', $importFileBuilder->pluck('itemName'))
+            ->get(['location_id']);
+
+        $this->assertCount(1, $newAccessories->pluck('location_id')->unique()->all());
+    }
+
+    #[Test]
+    public function willNotCreateNewManufacturerWhenManufacturerAlreadyExists(): void
+    {
+        $importFileBuilder = ImportFileBuilder::times(4)->replace(['manufacturerName' => $this->faker->company]);
+        $import = Import::factory()->accessory()->create(['file_path' => $importFileBuilder->saveToImportsDirectory()]);
+
+        $this->actingAsForApi(User::factory()->superuser()->create());
+        $this->importFileResponse(['import' => $import->id])->assertOk();
+
+        $newAccessories = Accessory::query()
+            ->where('name', $importFileBuilder->pluck('itemName'))
+            ->get(['manufacturer_id']);
+
+        $this->assertCount(1, $newAccessories->pluck('manufacturer_id')->unique()->all());
+    }
+
+    #[Test]
+    public function willNotCreateNewSupplierWhenSupplierAlreadyExists(): void
+    {
+        $importFileBuilder = ImportFileBuilder::times(4)->replace(['supplierName' => $this->faker->company]);
+        $import = Import::factory()->accessory()->create(['file_path' => $importFileBuilder->saveToImportsDirectory()]);
+
+        $this->actingAsForApi(User::factory()->superuser()->create());
+        $this->importFileResponse(['import' => $import->id])->assertOk();
+
+        $newAccessories = Accessory::query()
+            ->where('name', $importFileBuilder->pluck('itemName'))
+            ->get(['supplier_id']);
+
+        $this->assertCount(1, $newAccessories->pluck('supplier_id')->unique()->all());
+    }
+
+    #[Test]
+    public function whenColumnsAreMissingInImportFile(): void
+    {
+        $importFileBuilder = ImportFileBuilder::new()->forget(['minimumAmount', 'purchaseCost', 'purchaseDate']);
+        $import = Import::factory()->accessory()->create(['file_path' => $importFileBuilder->saveToImportsDirectory()]);
+
+        $this->actingAsForApi(User::factory()->superuser()->create());
+        $this->importFileResponse(['import' => $import->id])->assertOk();
+
+        $newAccessory = Accessory::query()
+            ->where('name', $importFileBuilder->firstRow()['itemName'])
+            ->sole();
+
+        $this->assertNull($newAccessory->min_amt);
+        $this->assertNull($newAccessory->purchase_date);
+        $this->assertNull($newAccessory->purchase_cost);
+    }
+
+    #[Test]
+    public function whenRequiredColumnsAreMissingInImportFile(): void
+    {
+        $importFileBuilder = ImportFileBuilder::new()->forget(['itemName', 'quantity', 'category']);
+        $import = Import::factory()->accessory()->create(['file_path' => $importFileBuilder->saveToImportsDirectory()]);
+
+        $this->actingAsForApi(User::factory()->superuser()->create());
+        $this->importFileResponse(['import' => $import->id])
+            ->assertInternalServerError()
+            ->assertExactJson([
+                'status' => 'import-errors',
+                'payload' => null,
+                'messages' => [
+                    '' => [
+                        'Accessory' => [
+                            'name' => ['The name field is required.'],
+                            'qty' => ['The qty field must be at least 1.'],
+                            'category_id' => ['The category id field is required.']
+                        ]
+                    ]
+                ]
+            ]);
+    }
+
+    #[Test]
+    public function updateAccessoryFromImport(): void
+    {
+        $accessory = Accessory::factory()->create(['name' => Str::random()])->refresh();
+        $importFileBuilder = ImportFileBuilder::new(['itemName' => $accessory->name]);
+        $row = $importFileBuilder->firstRow();
+        $import = Import::factory()->accessory()->create(['file_path' => $importFileBuilder->saveToImportsDirectory()]);
+
+        $this->actingAsForApi(User::factory()->superuser()->create());
+        $this->importFileResponse(['import' => $import->id, 'import-update' => true])->assertOk();
+
+        $updatedAccessory = Accessory::query()->find($accessory->id);
+        $updatedAttributes = [
+            'name', 'company_id', 'qty', 'purchase_date', 'purchase_cost',
+            'order_number', 'notes', 'category_id', 'manufacturer_id', 'supplier_id',
+            'location_id', 'model_number', 'updated_at'
+        ];
+
+        $this->assertEquals($row['itemName'], $updatedAccessory->name);
+        $this->assertEquals($row['companyName'], $updatedAccessory->company->name);
+        $this->assertEquals($row['quantity'], $updatedAccessory->qty);
+        $this->assertEquals($row['purchaseDate'], $updatedAccessory->purchase_date->toDateString());
+        $this->assertEquals($row['purchaseCost'], $updatedAccessory->purchase_cost);
+        $this->assertEquals($row['orderNumber'], $updatedAccessory->order_number);
+        $this->assertEquals($row['notes'], $updatedAccessory->notes);
+        $this->assertEquals($row['category'], $updatedAccessory->category->name);
+        $this->assertEquals('accessory', $updatedAccessory->category->category_type);
+        $this->assertEquals($row['manufacturerName'], $updatedAccessory->manufacturer->name);
+        $this->assertEquals($row['supplierName'], $updatedAccessory->supplier->name);
+        $this->assertEquals($row['location'], $updatedAccessory->location->name);
+        $this->assertEquals($row['modelNumber'], $updatedAccessory->model_number);
+
+        $this->assertEquals(
+            Arr::except($accessory->attributesToArray(), $updatedAttributes),
+            Arr::except($updatedAccessory->attributesToArray(), $updatedAttributes),
+        );
+    }
+
+    #[Test]
+    public function whenImportFileContainsEmptyValues(): void
+    {
+        $accessory = Accessory::factory()->create(['name' => Str::random()]);
+        $accessory->refresh();
+
+        $importFileBuilder = ImportFileBuilder::new([
+            'companyName'      => ' ',
+            'purchaseDate'     => '  ',
+            'purchaseCost'     => '',
+            'location'         => '',
+            'companyName'      => '',
+            'orderNumber'      => '',
+            'category'         => '',
+            'quantity'         => '',
+            'manufacturerName' => '',
+            'supplierName'     => '',
+            'notes'            => '',
+            'requestAble'      => '',
+            'minimumAmount'    => '',
+            'modelNumber'      => ''
+        ]);
+
+        $import = Import::factory()->accessory()->create(['file_path' => $importFileBuilder->saveToImportsDirectory()]);
+
+        $this->actingAsForApi(User::factory()->superuser()->create());
+        $this->importFileResponse(['import' => $import->id])
+            ->assertInternalServerError()
+            ->assertExactJson([
+                'status' => 'import-errors',
+                'payload' => null,
+                'messages' => [
+                    $importFileBuilder->firstRow()['itemName'] => [
+                        'Accessory' => [
+                            'qty' => ['The qty field must be at least 1.'],
+                            'category_id' => ['The category id field is required.']
+                        ]
+                    ]
+                ]
+            ]);
+
+        $importFileBuilder->replace(['itemName' => $accessory->name]);
+
+        $import = Import::factory()->accessory()->create(['file_path' => $importFileBuilder->saveToImportsDirectory()]);
+
+        $this->importFileResponse(['import' => $import->id, 'import-update' => true])->assertOk();
+
+        $updatedAccessory = clone $accessory;
+        $updatedAccessory->refresh();
+
+        $this->assertEquals($accessory->toArray(), $updatedAccessory->toArray());
+    }
+
+    #[Test]
+    public function customColumnMapping(): void
+    {
+        $faker = ImportFileBuilder::new()->definition();
+        $row = [
+            'itemName'         => $faker['modelNumber'],
+            'purchaseDate'     => $faker['notes'],
+            'purchaseCost'     => $faker['location'],
+            'location'         => $faker['purchaseCost'],
+            'companyName'      => $faker['orderNumber'],
+            'orderNumber'      => $faker['companyName'],
+            'category'         => $faker['manufacturerName'],
+            'manufacturerName' => $faker['category'],
+            'notes'            => $faker['purchaseDate'],
+            'minimumAmount'    => $faker['supplierName'],
+            'modelNumber'      => $faker['itemName'],
+            'quantity'         => $faker['quantity']
+        ];
+
+        $importFileBuilder = new ImportFileBuilder([$row]);
+        $import = Import::factory()->accessory()->create(['file_path' => $importFileBuilder->saveToImportsDirectory()]);
+
+        $this->actingAsForApi(User::factory()->superuser()->create());
+        $this->importFileResponse([
+            'import' => $import->id,
+            'column-mappings' => [
+                'Item Name'     => 'model_number',
+                'Purchase Date' => 'notes',
+                'Purchase Cost' => 'location',
+                'Location'      => 'purchase_cost',
+                'Company'       => 'order_number',
+                'Order Number'  => 'company',
+                'Category'      => 'manufacturer',
+                'Manufacturer'  => 'category',
+                'Supplier'      => 'min_amt',
+                'Notes'         => 'purchase_date',
+                'Min QTY'       => 'supplier',
+                'Model Number'  => 'item_name',
+                'Quantity'      => 'quantity'
+            ]
+        ])->assertOk();
+
+        $newAccessory = Accessory::query()
+            ->with(['location', 'category', 'manufacturer', 'supplier'])
+            ->where('name', $row['modelNumber'])
+            ->sole();
+
+        $this->assertEquals($row['modelNumber'], $newAccessory->name);
+        $this->assertEquals($row['itemName'], $newAccessory->model_number);
+        $this->assertEquals($row['quantity'], $newAccessory->qty);
+        $this->assertEquals($row['notes'], $newAccessory->purchase_date->toDateString());
+        $this->assertEquals($row['location'], $newAccessory->purchase_cost);
+        $this->assertEquals($row['companyName'], $newAccessory->order_number);
+        $this->assertEquals($row['purchaseDate'], $newAccessory->notes);
+        $this->assertEquals($row['manufacturerName'], $newAccessory->category->name);
+        $this->assertEquals($row['category'], $newAccessory->manufacturer->name);
+        $this->assertEquals($row['purchaseCost'], $newAccessory->location->name);
+    }
+}
diff --git a/tests/Feature/Importing/Api/ImportAssetModelsTest.php b/tests/Feature/Importing/Api/ImportAssetModelsTest.php
new file mode 100644
index 0000000000..a3a0a9ca4d
--- /dev/null
+++ b/tests/Feature/Importing/Api/ImportAssetModelsTest.php
@@ -0,0 +1,140 @@
+<?php
+
+namespace Tests\Feature\Importing\Api;
+
+use App\Models\Category;
+use App\Models\AssetModel;
+use App\Models\User;
+use App\Models\Import;
+use Illuminate\Foundation\Testing\WithFaker;
+use Illuminate\Support\Arr;
+use Illuminate\Support\Str;
+use Illuminate\Testing\TestResponse;
+use PHPUnit\Framework\Attributes\Test;
+use Tests\Concerns\TestsPermissionsRequirement;
+use Tests\Support\Importing\CleansUpImportFiles;
+use Tests\Support\Importing\AssetModelsImportFileBuilder as ImportFileBuilder;
+
+class ImportAssetModelsTest extends ImportDataTestCase implements TestsPermissionsRequirement
+{
+    use CleansUpImportFiles;
+    use WithFaker;
+
+    protected function importFileResponse(array $parameters = []): TestResponse
+    {
+        if (!array_key_exists('import-type', $parameters)) {
+            $parameters['import-type'] = 'assetModel';
+        }
+
+        return parent::importFileResponse($parameters);
+    }
+
+    #[Test]
+    public function testRequiresPermission()
+    {
+        $this->actingAsForApi(User::factory()->create());
+
+        $this->importFileResponse(['import' => 44])->assertForbidden();
+    }
+    
+    #[Test]
+    public function importAssetModels(): void
+    {
+        $importFileBuilder = ImportFileBuilder::new();
+        $row = $importFileBuilder->firstRow();
+        $import = Import::factory()->assetmodel()->create(['file_path' => $importFileBuilder->saveToImportsDirectory()]);
+
+        $this->actingAsForApi(User::factory()->superuser()->create());
+        $this->importFileResponse(['import' => $import->id, 'send-welcome' => 0])
+            ->assertOk()
+            ->assertExactJson([
+                'payload'  => null,
+                'status'   => 'success',
+                'messages' => ['redirect_url' => route('models.index')]
+            ]);
+
+        $newAssetModel = AssetModel::query()
+            ->with(['category'])
+            ->where('name', $row['name'])
+            ->sole();
+
+        $this->assertEquals($row['name'], $newAssetModel->name);
+        $this->assertEquals($row['model_number'], $newAssetModel->model_number);
+
+    }
+
+    #[Test]
+    public function willIgnoreUnknownColumnsWhenFileContainsUnknownColumns(): void
+    {
+        $row = ImportFileBuilder::new()->definition();
+        $row['unknownColumnInCsvFile'] = 'foo';
+
+        $importFileBuilder = new ImportFileBuilder([$row]);
+
+        $this->actingAsForApi(User::factory()->superuser()->create());
+
+        $import = Import::factory()->assetmodel()->create(['file_path' => $importFileBuilder->saveToImportsDirectory()]);
+
+        $this->importFileResponse(['import' => $import->id])->assertOk();
+    }
+
+
+    #[Test]
+    public function whenRequiredColumnsAreMissingInImportFile(): void
+    {
+        $importFileBuilder = ImportFileBuilder::new(['name' => '']);
+        $import = Import::factory()->assetmodel()->create(['file_path' => $importFileBuilder->saveToImportsDirectory()]);
+
+        $this->actingAsForApi(User::factory()->superuser()->create());
+
+        $this->importFileResponse(['import' => $import->id])
+            ->assertInternalServerError()
+            ->assertExactJson([
+                'status'   => 'import-errors',
+                'payload'  => null,
+                'messages' => [
+                    '' => [
+                        'name' => [
+                            'name' =>
+                                ['The name field is required.'],
+                        ],
+                    ]
+                ]
+            ]);
+
+        $newAssetModels = AssetModel::query()
+            ->where('name', $importFileBuilder->firstRow()['name'])
+            ->get();
+
+        $this->assertCount(0, $newAssetModels);
+    }
+
+
+    #[Test]
+    public function updateAssetModelFromImport(): void
+    {
+        $assetmodel = AssetModel::factory()->create()->refresh();
+        $category = Category::find($assetmodel->category->name);
+        $importFileBuilder = ImportFileBuilder::new(['name' => $assetmodel->name, 'model_number' => Str::random(), 'category' => $category]);
+
+        $row = $importFileBuilder->firstRow();
+        $import = Import::factory()->assetmodel()->create(['file_path' => $importFileBuilder->saveToImportsDirectory()]);
+
+        $this->actingAsForApi(User::factory()->superuser()->create());
+        $this->importFileResponse(['import' => $import->id, 'import-update' => true])->assertOk();
+
+        $updatedAssetmodel = AssetModel::query()->find($assetmodel->id);
+        $updatedAttributes = [
+            'name',
+            'model_number'
+        ];
+
+        $this->assertEquals($row['model_number'], $updatedAssetmodel->model_number);
+
+        $this->assertEquals(
+            Arr::except($assetmodel->attributesToArray(), array_merge($updatedAttributes, $assetmodel->getDates())),
+            Arr::except($updatedAssetmodel->attributesToArray(), array_merge($updatedAttributes, $assetmodel->getDates())),
+        );
+    }
+
+}
diff --git a/tests/Feature/Importing/Api/ImportAssetsTest.php b/tests/Feature/Importing/Api/ImportAssetsTest.php
new file mode 100644
index 0000000000..0f54b22e92
--- /dev/null
+++ b/tests/Feature/Importing/Api/ImportAssetsTest.php
@@ -0,0 +1,595 @@
+<?php
+
+namespace Tests\Feature\Importing\Api;
+
+use App\Mail\CheckoutAssetMail;
+use App\Models\Actionlog as ActionLog;
+use App\Models\Asset;
+use App\Models\CustomField;
+use App\Models\Import;
+use App\Models\User;
+use App\Notifications\CheckoutAssetNotification;
+use Carbon\Carbon;
+use Illuminate\Foundation\Testing\WithFaker;
+use Illuminate\Support\Arr;
+use Illuminate\Support\Facades\Mail;
+use Illuminate\Support\Facades\Notification;
+use Illuminate\Support\Str;
+use Illuminate\Testing\TestResponse;
+use PHPUnit\Framework\Attributes\Test;
+use Tests\Concerns\TestsPermissionsRequirement;
+use Tests\Support\Importing\AssetsImportFileBuilder as ImportFileBuilder;
+use Tests\Support\Importing\CleansUpImportFiles;
+
+class ImportAssetsTest extends ImportDataTestCase implements TestsPermissionsRequirement
+{
+    use CleansUpImportFiles;
+    use WithFaker;
+
+    protected function importFileResponse(array $parameters = []): TestResponse
+    {
+        if (!array_key_exists('import-type', $parameters)) {
+            $parameters['import-type'] = 'asset';
+        }
+
+        return parent::importFileResponse($parameters);
+    }
+
+    #[Test]
+    public function testRequiresPermission()
+    {
+        $this->actingAsForApi(User::factory()->create());
+
+        $this->importFileResponse(['import' => 44])->assertForbidden();
+    }
+
+    #[Test]
+    public function userWithImportAssetsPermissionCanImportAssets(): void
+    {
+        $this->actingAsForApi(User::factory()->canImport()->create());
+
+        $import = Import::factory()->asset()->create();
+
+        $this->importFileResponse(['import' => $import->id])->assertOk();
+    }
+
+    #[Test]
+    public function importAsset(): void
+    {
+
+        $importFileBuilder = ImportFileBuilder::new();
+        $row = $importFileBuilder->firstRow();
+        $import = Import::factory()->asset()->create(['file_path' => $importFileBuilder->saveToImportsDirectory()]);
+
+        $this->actingAsForApi(User::factory()->superuser()->create());
+        $this->importFileResponse(['import' => $import->id])
+            ->assertOk()
+            ->assertExactJson([
+                'payload'  => null,
+                'status'   => 'success',
+                'messages' => ['redirect_url' => route('hardware.index')]
+            ]);
+
+        $newAsset = Asset::query()
+            ->with(['location', 'supplier', 'company', 'assignedAssets', 'defaultLoc', 'assetStatus', 'model.category', 'model.manufacturer'])
+            ->where('serial', $row['serialNumber'])
+            ->sole();
+
+        $assignee = User::query()->find($newAsset->assigned_to, ['id', 'first_name', 'last_name', 'email', 'username']);
+
+        $activityLogs = ActionLog::query()
+            ->where('item_type', Asset::class)
+            ->where('item_id', $newAsset->id)
+            ->get();
+
+        $this->assertCount(2, $activityLogs);
+
+        $this->assertEquals('checkout', $activityLogs[0]->action_type);
+        $this->assertEquals(Asset::class, $activityLogs[0]->item_type);
+        $this->assertEquals($assignee->id, $activityLogs[0]->target_id);
+        $this->assertEquals(User::class, $activityLogs[0]->target_type);
+        $this->assertEquals('Checkout from CSV Importer', $activityLogs[0]->note);
+
+        $this->assertEquals('create', $activityLogs[1]->action_type);
+        $this->assertNull($activityLogs[1]->target_id);
+        $this->assertEquals(Asset::class, $activityLogs[1]->item_type);
+        $this->assertNull($activityLogs[1]->note);
+        $this->assertNull($activityLogs[1]->target_type);
+
+        $this->assertEquals($row['assigneeFullName'], "{$assignee->first_name} {$assignee->last_name}");
+        $this->assertEquals($row['assigneeEmail'], $assignee->email);
+        $this->assertEquals($row['assigneeUsername'], $assignee->username);
+
+        $this->assertEquals($row['category'], $newAsset->model->category->name);
+        $this->assertEquals($row['manufacturerName'], $newAsset->model->manufacturer->name);
+        $this->assertEquals($row['itemName'], $newAsset->name);
+        $this->assertEquals($row['tag'], $newAsset->asset_tag);
+        $this->assertEquals($row['model'], $newAsset->model->name);
+        $this->assertEquals($row['modelNumber'], $newAsset->model->model_number);
+        $this->assertEquals($row['purchaseDate'], $newAsset->purchase_date->toDateString());
+        $this->assertNull($newAsset->asset_eol_date);
+        $this->assertEquals(0, $newAsset->eol_explicit);
+        $this->assertEquals($newAsset->location_id, $newAsset->rtd_location_id);
+        $this->assertEquals($row['purchaseCost'], $newAsset->purchase_cost);
+        $this->assertNull($newAsset->order_number);
+        $this->assertEquals('', $newAsset->image);
+        $this->assertNull($newAsset->user_id);
+        $this->assertEquals(1, $newAsset->physical);
+        $this->assertEquals($row['status'], $newAsset->assetStatus->name);
+        $this->assertEquals(0, $newAsset->archived);
+        $this->assertEquals($row['warrantyInMonths'], $newAsset->warranty_months);
+        $this->assertNull($newAsset->deprecate);
+        $this->assertEquals($row['supplierName'], $newAsset->supplier->name);
+        $this->assertEquals(0, $newAsset->requestable);
+        $this->assertEquals($row['location'], $newAsset->defaultLoc->name);
+        $this->assertEquals(null, $newAsset->accepted);
+        $this->assertEquals(now()->toDateString(), Carbon::parse($newAsset->last_checkout)->toDateString());
+        $this->assertEquals(0, $newAsset->last_checkin);
+        $this->assertEquals(0, $newAsset->expected_checkin);
+        $this->assertEquals($row['companyName'], $newAsset->company->name);
+        $this->assertEquals(User::class, $newAsset->assigned_type);
+        $this->assertNull($newAsset->last_audit_date);
+        $this->assertNull($newAsset->next_audit_date);
+        $this->assertEquals($row['location'], $newAsset->location->name);
+        $this->assertEquals(0, $newAsset->checkin_counter);
+        $this->assertEquals(1, $newAsset->checkout_counter);
+        $this->assertEquals(0, $newAsset->requests_counter);
+        $this->assertEquals(0, $newAsset->byod);
+
+        //Notes is never read.
+        // $this->assertEquals($row['notes'], $newAsset->notes);
+
+    }
+
+    #[Test]
+    public function willIgnoreUnknownColumnsWhenFileContainsUnknownColumns(): void
+    {
+        $row = ImportFileBuilder::new()->definition();
+        $row['unknownColumnInCsvFile'] = 'foo';
+
+        $importFileBuilder = new ImportFileBuilder([$row]);
+
+        $this->actingAsForApi(User::factory()->superuser()->create());
+
+        $import = Import::factory()->asset()->create(['file_path' => $importFileBuilder->saveToImportsDirectory()]);
+
+        $this->importFileResponse(['import' => $import->id])->assertOk();
+    }
+
+    #[Test]
+    public function willNotCreateNewAssetWhenAssetWithSameTagAlreadyExists(): void
+    {
+        $asset = Asset::factory()->create(['asset_tag' => $this->faker->uuid]);
+        $importFileBuilder = ImportFileBuilder::times(4)->replace(['tag' => $asset->asset_tag]);
+        $import = Import::factory()->asset()->create(['file_path' => $importFileBuilder->saveToImportsDirectory()]);
+
+        $this->actingAsForApi(User::factory()->superuser()->create());
+        $this->importFileResponse(['import' => $import->id])
+            ->assertInternalServerError()
+            ->assertExactJson([
+                'status' => 'import-errors',
+                'payload' => null,
+                'messages' => [
+                    '' => [
+                        'asset_tag' => [
+                            'asset_tag' => [
+                                "An asset with the asset tag {$asset->asset_tag} already exists and an update was not requested. No change was made."
+                            ]
+                        ]
+                    ]
+                ]
+            ]);
+
+        $assetsWithSameTag = Asset::query()->where('asset_tag', $asset->asset_tag)->get();
+
+        $this->assertCount(1, $assetsWithSameTag);
+    }
+
+    #[Test]
+    public function willNotCreateNewCompanyWhenCompanyExists(): void
+    {
+        $importFileBuilder = ImportFileBuilder::times(4)->replace(['companyName' => Str::random()]);
+        $import = Import::factory()->asset()->create(['file_path' => $importFileBuilder->saveToImportsDirectory()]);
+
+        $this->actingAsForApi(User::factory()->superuser()->create());
+        $this->importFileResponse(['import' => $import->id])->assertOk();
+
+        $newAssets = Asset::query()
+            ->whereIn('serial', $importFileBuilder->pluck('serialNumber'))
+            ->get();
+
+        $this->assertCount(1, $newAssets->pluck('company_id')->unique()->all());
+    }
+
+    #[Test]
+    public function willNotCreateNewLocationWhenLocationExists(): void
+    {
+        $importFileBuilder = ImportFileBuilder::times(4)->replace(['location' => Str::random()]);
+        $import = Import::factory()->asset()->create(['file_path' => $importFileBuilder->saveToImportsDirectory()]);
+
+        $this->actingAsForApi(User::factory()->superuser()->create());
+        $this->importFileResponse(['import' => $import->id])->assertOk();
+
+        $newAssets = Asset::query()
+            ->whereIn('serial', $importFileBuilder->pluck('serialNumber'))
+            ->get();
+
+        $this->assertCount(1, $newAssets->pluck('location_id')->unique()->all());
+    }
+
+    #[Test]
+    public function willNotCreateNewSupplierWhenSupplierExists(): void
+    {
+        $importFileBuilder = ImportFileBuilder::times(4)->replace(['supplierName' => $this->faker->company]);
+        $import = Import::factory()->asset()->create(['file_path' => $importFileBuilder->saveToImportsDirectory()]);
+
+        $this->actingAsForApi(User::factory()->superuser()->create());
+        $this->importFileResponse(['import' => $import->id])->assertOk();
+
+        $newAssets = Asset::query()
+            ->whereIn('serial', $importFileBuilder->pluck('serialNumber'))
+            ->get(['supplier_id']);
+
+        $this->assertCount(1, $newAssets->pluck('supplier_id')->unique()->all());
+    }
+
+    #[Test]
+    public function willNotCreateNewManufacturerWhenManufacturerExists(): void
+    {
+        $importFileBuilder = ImportFileBuilder::times(4)->replace(['manufacturerName' => $this->faker->company]);
+        $import = Import::factory()->asset()->create(['file_path' => $importFileBuilder->saveToImportsDirectory()]);
+
+        $this->actingAsForApi(User::factory()->superuser()->create());
+        $this->importFileResponse(['import' => $import->id])->assertOk();
+
+        $newAssets = Asset::query()
+            ->with('model.manufacturer')
+            ->whereIn('serial', $importFileBuilder->pluck('serialNumber'))
+            ->get();
+
+        $this->assertCount(1, $newAssets->pluck('model.manufacturer_id')->unique()->all());
+    }
+
+    #[Test]
+    public function willNotCreateCategoryWhenCategoryExists(): void
+    {
+        $importFileBuilder = ImportFileBuilder::times(4)->replace(['category' => $this->faker->company]);
+        $import = Import::factory()->asset()->create(['file_path' => $importFileBuilder->saveToImportsDirectory()]);
+
+        $this->actingAsForApi(User::factory()->superuser()->create());
+        $this->importFileResponse(['import' => $import->id])->assertOk();
+
+        $newAssets = Asset::query()
+            ->with('model.category')
+            ->whereIn('serial', $importFileBuilder->pluck('serialNumber'))
+            ->get();
+
+        $this->assertCount(1, $newAssets->pluck('model.category_id')->unique()->all());
+    }
+
+    #[Test]
+    public function willNotCreateNewAssetModelWhenAssetModelExists(): void
+    {
+        $importFileBuilder = ImportFileBuilder::times(4)->replace(['model' => Str::random()]);
+        $import = Import::factory()->asset()->create(['file_path' => $importFileBuilder->saveToImportsDirectory()]);
+
+        $this->actingAsForApi(User::factory()->superuser()->create());
+        $this->importFileResponse(['import' => $import->id])->assertOk();
+
+        $newAssets = Asset::query()
+            ->with('model')
+            ->whereIn('serial', $importFileBuilder->pluck('serialNumber'))
+            ->get();
+
+        $this->assertCount(1, $newAssets->pluck('model.name')->unique()->all());
+    }
+
+    #[Test]
+    public function whenColumnsAreMissingInImportFile(): void
+    {
+        $importFileBuilder = ImportFileBuilder::times()->forget([
+            'purchaseCost',
+            'purchaseDate',
+            'status'
+        ]);
+
+        $import = Import::factory()->asset()->create(['file_path' => $importFileBuilder->saveToImportsDirectory()]);
+
+        $this->actingAsForApi(User::factory()->superuser()->create());
+        $this->importFileResponse(['import' => $import->id])->assertOk();
+
+        $newAsset = Asset::query()
+            ->with(['assetStatus'])
+            ->where('serial', $importFileBuilder->firstRow()['serialNumber'])
+            ->sole();
+
+        $this->assertEquals('Ready to Deploy', $newAsset->assetStatus->name);
+        $this->assertNull($newAsset->purchase_date);
+        $this->assertNull($newAsset->purchase_cost);
+    }
+
+    #[Test]
+    public function willFormatValues(): void
+    {
+        $importFileBuilder = ImportFileBuilder::new([
+            'warrantyInMonths' => '3 months',
+            'purchaseDate'    => '2022/10/10'
+        ]);
+
+        $import = Import::factory()->asset()->create(['file_path' => $importFileBuilder->saveToImportsDirectory()]);
+
+        $this->actingAsForApi(User::factory()->superuser()->create());
+        $this->importFileResponse(['import' => $import->id])->assertOk();
+
+        $newAsset = Asset::query()
+            ->where('serial', $importFileBuilder->firstRow()['serialNumber'])
+            ->sole();
+
+        $this->assertEquals(3, $newAsset->warranty_months);
+        $this->assertEquals('2022-10-10', $newAsset->purchase_date->toDateString());
+    }
+
+    #[Test]
+    public function whenRequiredColumnsAreMissingInImportFile(): void
+    {
+        $importFileBuilder = ImportFileBuilder::times(2)
+            ->forget(['tag'])
+            ->replace(['model' => '']);
+
+        $rows = $importFileBuilder->all();
+        $import = Import::factory()->asset()->create(['file_path' => $importFileBuilder->saveToImportsDirectory()]);
+
+        $this->actingAsForApi(User::factory()->superuser()->create());
+        $this->importFileResponse(['import' => $import->id])
+            ->assertInternalServerError()
+            ->assertJson([
+                'status' => 'import-errors',
+                'payload' => null,
+                'messages' => [
+                    $rows[0]['itemName'] => [
+                        "Asset \"{$rows[0]['itemName']}\"" => [
+                            'asset_tag' => [
+                                'The asset tag field must be at least 1 characters.',
+                            ],
+                            'model_id' => [
+                                'The model id field is required.'
+                            ]
+                        ]
+                    ],
+                    $rows[1]['itemName'] => [
+                        "Asset \"{$rows[1]['itemName']}\"" => [
+                            'asset_tag' => [
+                                'The asset tag field must be at least 1 characters.',
+                            ],
+                            'model_id' => [
+                                'The model id field is required.'
+                            ]
+                        ]
+                    ]
+                ]
+            ]);
+
+        $newAssets = Asset::query()
+            ->whereIn('serial', Arr::pluck($rows, 'serialNumber'))
+            ->get();
+
+        $this->assertCount(0, $newAssets);
+    }
+
+    #[Test]
+    public function updateAssetFromImport(): void
+    {
+        $asset = Asset::factory()->create()->refresh();
+        $importFileBuilder = ImportFileBuilder::times(1)->replace(['tag' => $asset->asset_tag]);
+        $row = $importFileBuilder->firstRow();
+        $import = Import::factory()->asset()->create(['file_path' => $importFileBuilder->saveToImportsDirectory()]);
+
+        $this->actingAsForApi(User::factory()->superuser()->create());
+        $this->importFileResponse(['import' => $import->id, 'import-update' => true])->assertOk();
+
+        $updatedAsset = Asset::query()
+            ->with(['location', 'supplier', 'company', 'defaultLoc', 'assetStatus', 'model.category', 'model.manufacturer'])
+            ->find($asset->id);
+
+        $assignee = User::query()->find($updatedAsset->assigned_to, ['id', 'first_name', 'last_name', 'email', 'username']);
+
+        $updatedAttributes = [
+            'category', 'manufacturer_id', 'name', 'tag', 'model_id',
+            'model_number', 'purchase_date', 'purchase_cost', 'warranty_months', 'supplier_id',
+            'location_id', 'company_id', 'serial', 'assigned_to', 'status_id', 'rtd_location_id',
+            'last_checkout', 'requestable', 'updated_at', 'checkout_counter', 'assigned_type'
+        ];
+
+        $this->assertEquals($row['assigneeFullName'], "{$assignee->first_name} {$assignee->last_name}");
+        $this->assertEquals($row['assigneeEmail'], $assignee->email);
+        $this->assertEquals($row['assigneeUsername'], $assignee->username);
+
+        $this->assertEquals($row['category'], $updatedAsset->model->category->name);
+        $this->assertEquals($row['manufacturerName'], $updatedAsset->model->manufacturer->name);
+        $this->assertEquals($row['itemName'], $updatedAsset->name);
+        $this->assertEquals($row['tag'], $updatedAsset->asset_tag);
+        $this->assertEquals($row['model'], $updatedAsset->model->name);
+        $this->assertEquals($row['modelNumber'], $updatedAsset->model->model_number);
+        $this->assertEquals($row['purchaseDate'], $updatedAsset->purchase_date->toDateString());
+        $this->assertEquals($row['purchaseCost'], $updatedAsset->purchase_cost);
+        $this->assertEquals($row['status'], $updatedAsset->assetStatus->name);
+        $this->assertEquals($row['warrantyInMonths'], $updatedAsset->warranty_months);
+        $this->assertEquals($row['supplierName'], $updatedAsset->supplier->name);
+        $this->assertEquals($row['location'], $updatedAsset->defaultLoc->name);
+        $this->assertEquals($row['companyName'], $updatedAsset->company->name);
+        $this->assertEquals($row['location'], $updatedAsset->location->name);
+        $this->assertEquals(1, $updatedAsset->checkout_counter);
+        $this->assertEquals(user::class, $updatedAsset->assigned_type);
+
+        //RequestAble is always updated regardless of initial value.
+        // $this->assertEquals($asset->requestable, $updatedAsset->requestable);
+
+        $this->assertEquals(
+            Arr::except($asset->attributesToArray(), $updatedAttributes),
+            Arr::except($updatedAsset->attributesToArray(), $updatedAttributes),
+        );
+    }
+
+    #[Test]
+    public function customColumnMapping(): void
+    {
+        $faker = ImportFileBuilder::new()->definition();
+        $row = [
+            'assigneeFullName'    => $faker['supplierName'],
+            'assigneeEmail'       => $faker['manufacturerName'],
+            'assigneeUsername'    => $faker['serialNumber'],
+            'category'            => $faker['location'],
+            'companyName'         => $faker['purchaseCost'],
+            'itemName'            => $faker['modelNumber'],
+            'location'            => $faker['assigneeUsername'],
+            'manufacturerName'    => $faker['status'],
+            'model'               => $faker['itemName'],
+            'modelNumber'         => $faker['category'],
+            'notes'               => $faker['notes'],
+            'purchaseCost'        => $faker['model'],
+            'purchaseDate'        => $faker['companyName'],
+            'serialNumber'        => $faker['tag'],
+            'supplierName'        => $faker['purchaseDate'],
+            'status'              => $faker['warrantyInMonths'],
+            'tag'                 => $faker['assigneeEmail'],
+            'warrantyInMonths'    => $faker['assigneeFullName'],
+        ];
+
+        $importFileBuilder = new ImportFileBuilder([$row]);
+        $import = Import::factory()->asset()->create(['file_path' => $importFileBuilder->saveToImportsDirectory()]);
+
+        $this->actingAsForApi(User::factory()->superuser()->create());
+
+        $this->importFileResponse([
+            'import' => $import->id,
+            'column-mappings' => [
+                'Asset Tag'     => 'email',
+                'Category'      => 'location',
+                'Company'       => 'purchase_cost',
+                'Email'         => 'manufacturer',
+                'Full Name'     => 'supplier',
+                'Item Name'     => 'model_number',
+                'Location'      => 'username',
+                'Manufacturer'  => 'status',
+                'Model name'    => 'item_name',
+                'Model Number'  => 'category',
+                'Notes'         => 'asset_notes',
+                'Purchase Cost' => 'asset_model',
+                'Purchase Date' => 'company',
+                'Serial number' => 'asset_tag',
+                'Status'        => 'warranty_months',
+                'Supplier'      => 'purchase_date',
+                'Username'      => 'serial',
+                'Warranty'      => 'full_name',
+            ]
+        ])->assertOk();
+
+        $asset = Asset::query()
+            ->with(['location', 'supplier', 'company', 'assignedAssets', 'defaultLoc', 'assetStatus', 'model.category', 'model.manufacturer'])
+            ->where('serial', $row['assigneeUsername'])
+            ->sole();
+
+        $assignee = User::query()->find($asset->assigned_to, ['id', 'first_name', 'last_name', 'email', 'username']);
+
+        $this->assertEquals($row['warrantyInMonths'], "{$assignee->first_name} {$assignee->last_name}");
+        $this->assertEquals($row['tag'], $assignee->email);
+        $this->assertEquals($row['location'], $assignee->username);
+
+        $this->assertEquals($row['modelNumber'], $asset->model->category->name);
+        $this->assertEquals($row['assigneeEmail'], $asset->model->manufacturer->name);
+        $this->assertEquals($row['model'], $asset->name);
+        $this->assertEquals($row['serialNumber'], $asset->asset_tag);
+        $this->assertEquals($row['purchaseCost'], $asset->model->name);
+        $this->assertEquals($row['itemName'], $asset->model->model_number);
+        $this->assertEquals($row['supplierName'], $asset->purchase_date->toDateString());
+        $this->assertEquals($row['companyName'], $asset->purchase_cost);
+        $this->assertEquals($row['manufacturerName'], $asset->assetStatus->name);
+        $this->assertEquals($row['status'], $asset->warranty_months);
+        $this->assertEquals($row['assigneeFullName'], $asset->supplier->name);
+        $this->assertEquals($row['category'], $asset->defaultLoc->name);
+        $this->assertEquals($row['purchaseDate'], $asset->company->name);
+        $this->assertEquals($row['category'], $asset->location->name);
+        $this->assertEquals($row['notes'], $asset->notes);
+        $this->assertNull($asset->asset_eol_date);
+        $this->assertEquals(0, $asset->eol_explicit);
+        $this->assertNull($asset->order_number);
+        $this->assertEquals('', $asset->image);
+        $this->assertNull($asset->user_id);
+        $this->assertEquals(1, $asset->physical);
+        $this->assertEquals(0, $asset->archived);
+        $this->assertNull($asset->deprecate);
+        $this->assertEquals(0, $asset->requestable);
+        $this->assertEquals(null, $asset->accepted);
+        $this->assertEquals(now()->toDateString(), Carbon::parse($asset->last_checkout)->toDateString());
+        $this->assertEquals(0, $asset->last_checkin);
+        $this->assertEquals(0, $asset->expected_checkin);
+        $this->assertEquals(User::class, $asset->assigned_type);
+        $this->assertNull($asset->last_audit_date);
+        $this->assertNull($asset->next_audit_date);
+        $this->assertEquals(0, $asset->checkin_counter);
+        $this->assertEquals(1, $asset->checkout_counter);
+        $this->assertEquals(0, $asset->requests_counter);
+        $this->assertEquals(0, $asset->byod);
+    }
+
+    #[Test]
+    public function customFields(): void
+    {
+        $macAddress = $this->faker->macAddress;
+
+        $row = ImportFileBuilder::new()->definition();
+        $row['Mac Address'] = $macAddress;
+
+        $importFileBuilder = new ImportFileBuilder([$row]);
+        $customField = CustomField::query()->where('name', 'Mac Address')->firstOrNew();
+
+        if (!$customField->exists) {
+            $customField = CustomField::factory()->macAddress()->create(['db_column' => '_snipeit_mac_address_1']);
+        }
+
+        if ($customField->field_encrypted) {
+            $customField->field_encrypted = 0;
+            $customField->save();
+        }
+
+        $import = Import::factory()->asset()->create(['file_path' => $importFileBuilder->saveToImportsDirectory()]);
+
+        $this->actingAsForApi(User::factory()->superuser()->create());
+        $this->importFileResponse(['import' => $import->id])->assertOk();
+
+        $newAsset = Asset::query()->where('serial', $importFileBuilder->firstRow()['serialNumber'])->sole();
+
+        $this->assertEquals($macAddress, $newAsset->getAttribute($customField->db_column));
+    }
+
+    #[Test]
+    public function willEncryptCustomFields(): void
+    {
+        $macAddress = $this->faker->macAddress;
+        $row = ImportFileBuilder::new()->definition();
+
+        $row['Mac Address'] = $macAddress;
+
+        $importFileBuilder = new ImportFileBuilder([$row]);
+        $customField = CustomField::query()->where('name', 'Mac Address')->firstOrNew();
+
+        if (!$customField->exists) {
+            $customField = CustomField::factory()->macAddress()->create();
+        }
+
+        if (!$customField->field_encrypted) {
+            $customField->field_encrypted = 1;
+            $customField->save();
+        }
+
+        $import = Import::factory()->asset()->create(['file_path' => $importFileBuilder->saveToImportsDirectory()]);
+
+        $this->actingAsForApi(User::factory()->superuser()->create());
+        $this->importFileResponse(['import' => $import->id])->assertOk();
+
+        $asset = Asset::query()->where('serial', $importFileBuilder->firstRow()['serialNumber'])->sole();
+        $encryptedMacAddress = $asset->getAttribute($customField->db_column);
+
+        $this->assertNotEquals($encryptedMacAddress, $macAddress);
+    }
+}
diff --git a/tests/Feature/Importing/Api/ImportCategoriesTest.php b/tests/Feature/Importing/Api/ImportCategoriesTest.php
new file mode 100644
index 0000000000..4b968d9d12
--- /dev/null
+++ b/tests/Feature/Importing/Api/ImportCategoriesTest.php
@@ -0,0 +1,135 @@
+<?php
+
+namespace Tests\Feature\Importing\Api;
+
+use App\Models\Category;
+use App\Models\User;
+use App\Models\Import;
+use Illuminate\Foundation\Testing\WithFaker;
+use Illuminate\Support\Arr;
+use Illuminate\Testing\TestResponse;
+use PHPUnit\Framework\Attributes\Test;
+use Tests\Concerns\TestsPermissionsRequirement;
+use Tests\Support\Importing\CleansUpImportFiles;
+use Tests\Support\Importing\CategoriesImportFileBuilder as ImportFileBuilder;
+
+class ImportCategoriesTest extends ImportDataTestCase implements TestsPermissionsRequirement
+{
+    use CleansUpImportFiles;
+    use WithFaker;
+
+    protected function importFileResponse(array $parameters = []): TestResponse
+    {
+        if (!array_key_exists('import-type', $parameters)) {
+            $parameters['import-type'] = 'category';
+        }
+
+        return parent::importFileResponse($parameters);
+    }
+
+    #[Test]
+    public function testRequiresPermission()
+    {
+        $this->actingAsForApi(User::factory()->create());
+
+        $this->importFileResponse(['import' => 44])->assertForbidden();
+    }
+
+    #[Test]
+    public function importCategory(): void
+    {
+        $importFileBuilder = ImportFileBuilder::new();
+        $row = $importFileBuilder->firstRow();
+        $import = Import::factory()->categories()->create(['file_path' => $importFileBuilder->saveToImportsDirectory()]);
+
+        $this->actingAsForApi(User::factory()->superuser()->create());
+        $this->importFileResponse(['import' => $import->id, 'send-welcome' => 0])
+            ->assertOk()
+            ->assertExactJson([
+                'payload'  => null,
+                'status'   => 'success',
+                'messages' => ['redirect_url' => route('categories.index')]
+            ]);
+
+        $newCategory = Category::query()
+            ->where('name', $row['name'])
+            ->sole();
+
+        $this->assertEquals($row['name'], $newCategory->name);
+
+    }
+
+    #[Test]
+    public function willIgnoreUnknownColumnsWhenFileContainsUnknownColumns(): void
+    {
+        $row = ImportFileBuilder::new()->definition();
+        $row['unknownColumnInCsvFile'] = 'foo';
+
+        $importFileBuilder = new ImportFileBuilder([$row]);
+
+        $this->actingAsForApi(User::factory()->superuser()->create());
+
+        $import = Import::factory()->categories()->create(['file_path' => $importFileBuilder->saveToImportsDirectory()]);
+
+        $this->importFileResponse(['import' => $import->id])->assertOk();
+    }
+
+
+    #[Test]
+    public function whenRequiredColumnsAreMissingInImportFile(): void
+    {
+        $importFileBuilder = ImportFileBuilder::new(['name' => '']);
+        $import = Import::factory()->categories()->create(['file_path' => $importFileBuilder->saveToImportsDirectory()]);
+
+        $this->actingAsForApi(User::factory()->superuser()->create());
+
+        $this->importFileResponse(['import' => $import->id])
+            ->assertInternalServerError()
+            ->assertExactJson([
+                'status'   => 'import-errors',
+                'payload'  => null,
+                'messages' => [
+                    '' => [
+                        'Category ""' => [
+                            'name' =>
+                                ['The name field is required.'],
+                        ],
+                    ]
+
+                ]
+            ]);
+
+        $newCategory = Category::query()
+            ->where('name', $importFileBuilder->firstRow()['name'])
+            ->get();
+
+        $this->assertCount(0, $newCategory);
+    }
+
+
+    #[Test]
+    public function updateCategoryFromImport(): void
+    {
+        $category = Category::factory()->create()->refresh();
+        $importFileBuilder = ImportFileBuilder::new(['name' => $category->name, 'category_type' => 'asset', 'notes' => $category->notes, 'use_default_eula' => 0, 'require_acceptance' => 0, 'checkin_email' => 0]);
+
+        $row = $importFileBuilder->firstRow();
+        $import = Import::factory()->categories()->create(['file_path' => $importFileBuilder->saveToImportsDirectory()]);
+
+        $this->actingAsForApi(User::factory()->superuser()->create());
+        $this->importFileResponse(['import' => $import->id, 'import-update' => true])->assertOk();
+
+        $updatedCategory = Category::query()->find($category->id);
+        $updatedAttributes = [
+            'name',
+        ];
+
+        $this->assertEquals($row['name'], $updatedCategory->name);
+
+        $this->assertEquals(
+            Arr::except($category->attributesToArray(), array_merge($updatedAttributes, $category->getDates())),
+            Arr::except($updatedCategory->attributesToArray(), array_merge($updatedAttributes, $category->getDates())),
+        );
+    }
+
+}
diff --git a/tests/Feature/Importing/Api/ImportComponentsTest.php b/tests/Feature/Importing/Api/ImportComponentsTest.php
new file mode 100644
index 0000000000..376b5b32eb
--- /dev/null
+++ b/tests/Feature/Importing/Api/ImportComponentsTest.php
@@ -0,0 +1,305 @@
+<?php
+
+namespace Tests\Feature\Importing\Api;
+
+use App\Models\Actionlog as ActionLog;
+use App\Models\Component;
+use App\Models\Import;
+use App\Models\User;
+use Illuminate\Foundation\Testing\WithFaker;
+use Illuminate\Support\Facades\Notification;
+use Illuminate\Support\Str;
+use Illuminate\Testing\TestResponse;
+use PHPUnit\Framework\Attributes\Test;
+use Tests\Concerns\TestsPermissionsRequirement;
+use Tests\Support\Importing\CleansUpImportFiles;
+use Tests\Support\Importing\ComponentsImportFileBuilder as ImportFileBuilder;
+
+class ImportComponentsTest extends ImportDataTestCase implements TestsPermissionsRequirement
+{
+    use CleansUpImportFiles;
+    use WithFaker;
+
+    protected function importFileResponse(array $parameters = []): TestResponse
+    {
+        if (!array_key_exists('import-type', $parameters)) {
+            $parameters['import-type'] = 'component';
+        }
+
+        return parent::importFileResponse($parameters);
+    }
+
+    #[Test]
+    public function testRequiresPermission()
+    {
+        $this->actingAsForApi(User::factory()->create());
+
+        $this->importFileResponse(['import' => 44])->assertForbidden();
+    }
+
+    #[Test]
+    public function userWithImportAssetsPermissionCanImportComponents(): void
+    {
+        $this->actingAsForApi(User::factory()->canImport()->create());
+
+        $import = Import::factory()->component()->create();
+
+        $this->importFileResponse(['import' => $import->id])->assertOk();
+    }
+
+    #[Test]
+    public function importComponents(): void
+    {
+        Notification::fake();
+
+        $importFileBuilder = ImportFileBuilder::new();
+        $row = $importFileBuilder->firstRow();
+        $import = Import::factory()->component()->create(['file_path' => $importFileBuilder->saveToImportsDirectory()]);
+
+        $this->actingAsForApi(User::factory()->superuser()->create());
+        $this->importFileResponse(['import' => $import->id])
+            ->assertOk()
+            ->assertExactJson([
+                'payload'  => null,
+                'status'   => 'success',
+                'messages' => ['redirect_url' => route('components.index')]
+            ]);
+
+        $newComponent = Component::query()
+            ->with(['location', 'category', 'company'])
+            ->where('name', $row['itemName'])
+            ->sole();
+
+        $activityLog = ActionLog::query()
+            ->where('item_type', Component::class)
+            ->where('item_id', $newComponent->id)
+            ->sole();
+
+        $this->assertEquals('create', $activityLog->action_type);
+        $this->assertEquals('importer', $activityLog->action_source);
+        $this->assertEquals($newComponent->company->id, $activityLog->company_id);
+
+        $this->assertEquals($row['itemName'], $newComponent->name);
+        $this->assertEquals($row['companyName'], $newComponent->company->name);
+        $this->assertEquals($row['category'], $newComponent->category->name);
+        $this->assertEquals($row['location'], $newComponent->location->name);
+        $this->assertNull($newComponent->supplier_id);
+        $this->assertEquals($row['quantity'], $newComponent->qty);
+        $this->assertEquals($row['orderNumber'], $newComponent->order_number);
+        $this->assertEquals($row['purchaseDate'], $newComponent->purchase_date->toDateString());
+        $this->assertEquals($row['purchaseCost'], $newComponent->purchase_cost);
+        $this->assertNull($newComponent->min_amt);
+        $this->assertEquals($row['serialNumber'], $newComponent->serial);
+        $this->assertNull($newComponent->image);
+        $this->assertNull($newComponent->notes);
+    }
+
+    #[Test]
+    public function willIgnoreUnknownColumnsWhenFileContainsUnknownColumns(): void
+    {
+        $row = ImportFileBuilder::new()->firstRow();
+        $row['unknownColumnInCsvFile'] = 'foo';
+
+        $importFileBuilder = new ImportFileBuilder([$row]);
+
+        $this->actingAsForApi(User::factory()->superuser()->create());
+
+        $import = Import::factory()->component()->create(['file_path' => $importFileBuilder->saveToImportsDirectory()]);
+
+        $this->importFileResponse(['import' => $import->id])->assertOk();
+    }
+
+    #[Test]
+    public function willNotCreateNewComponentWhenComponentWithNameAndSerialNumberExists(): void
+    {
+        $component = Component::factory()->create();
+
+        $importFileBuilder = ImportFileBuilder::times(4)->replace([
+            'itemName'     => $component->name,
+            'serialNumber' => $component->serial
+        ]);
+
+        $import = Import::factory()->component()->create(['file_path' => $importFileBuilder->saveToImportsDirectory()]);
+
+        $this->actingAsForApi(User::factory()->superuser()->create());
+        $this->importFileResponse(['import' => $import->id])->assertOk();
+
+        $probablyNewComponents = Component::query()
+            ->where('name', $component->name)
+            ->where('serial', $component->serial)
+            ->get(['id']);
+
+        $this->assertCount(1, $probablyNewComponents);
+        $this->assertEquals($component->id, $probablyNewComponents->sole()->id);
+    }
+
+    #[Test]
+    public function willNotCreateNewCompanyWhenCompanyExists(): void
+    {
+        $importFileBuilder = ImportFileBuilder::times(4)->replace(['companyName' => Str::random()]);
+        $import = Import::factory()->component()->create(['file_path' => $importFileBuilder->saveToImportsDirectory()]);
+
+        $this->actingAsForApi(User::factory()->superuser()->create());
+        $this->importFileResponse(['import' => $import->id])->assertOk();
+
+        $newComponents = Component::query()
+            ->whereIn('serial', $importFileBuilder->pluck('serialNumber'))
+            ->get(['company_id']);
+
+        $this->assertCount(1, $newComponents->pluck('company_id')->unique()->all());
+    }
+
+    #[Test]
+    public function willNotCreateNewLocationWhenLocationExists(): void
+    {
+        $importFileBuilder = ImportFileBuilder::times(4)->replace(['location' => Str::random()]);
+        $import = Import::factory()->component()->create(['file_path' => $importFileBuilder->saveToImportsDirectory()]);
+
+        $this->actingAsForApi(User::factory()->superuser()->create());
+        $this->importFileResponse(['import' => $import->id])->assertOk();
+
+        $newComponents = Component::query()
+            ->whereIn('serial', $importFileBuilder->pluck('serialNumber'))
+            ->get(['location_id']);
+
+        $this->assertCount(1, $newComponents->pluck('location_id')->unique()->all());
+    }
+
+    #[Test]
+    public function willNotCreateNewCategoryWhenCategoryExists(): void
+    {
+        $importFileBuilder = ImportFileBuilder::times(4)->replace(['category' => $this->faker->company]);
+        $import = Import::factory()->component()->create(['file_path' => $importFileBuilder->saveToImportsDirectory()]);
+
+        $this->actingAsForApi(User::factory()->superuser()->create());
+        $this->importFileResponse(['import' => $import->id])->assertOk();
+
+        $newComponents = Component::query()
+            ->whereIn('serial', $importFileBuilder->pluck('serialNumber'))
+            ->get(['category_id']);
+
+        $this->assertCount(1, $newComponents->pluck('category_id')->unique()->all());
+    }
+
+    #[Test]
+    public function whenRequiredColumnsAreMissingInImportFile(): void
+    {
+        $importFileBuilder = ImportFileBuilder::new()
+            ->replace(['category' => ''])
+            ->forget(['quantity']);
+
+        $row = $importFileBuilder->firstRow();
+        $import = Import::factory()->component()->create(['file_path' => $importFileBuilder->saveToImportsDirectory()]);
+
+        $this->actingAsForApi(User::factory()->superuser()->create());
+
+        $this->importFileResponse(['import' => $import->id])
+            ->assertInternalServerError()
+            ->assertExactJson([
+                'status'   => 'import-errors',
+                'payload'  => null,
+                'messages' => [
+                    $row['itemName'] => [
+                        'Component' => [
+                            'qty' => ['The qty field must be at least 1.'],
+                            'category_id' => ['The category id field is required.']
+                        ]
+                    ]
+                ]
+            ]);
+
+        $newComponents = Component::query()
+            ->whereIn('serial', $importFileBuilder->pluck('serialNumber'))
+            ->get();
+
+        $this->assertCount(0, $newComponents);
+    }
+
+    #[Test]
+    public function updateComponentFromImport(): void
+    {
+        $component = Component::factory()->create();
+        $importFileBuilder = ImportFileBuilder::new([
+            'itemName'     => $component->name,
+            'serialNumber' => $component->serial
+        ]);
+
+        $row = $importFileBuilder->firstRow();
+        $import = Import::factory()->component()->create(['file_path' => $importFileBuilder->saveToImportsDirectory()]);
+
+        $this->actingAsForApi(User::factory()->superuser()->create());
+        $this->importFileResponse(['import' => $import->id, 'import-update' => true])->assertOk();
+
+        $updatedComponent = Component::query()
+            ->with(['location', 'category'])
+            ->where('serial', $row['serialNumber'])
+            ->sole();
+
+        $this->assertEquals($row['itemName'], $updatedComponent->name);
+        $this->assertEquals($row['category'], $updatedComponent->category->name);
+        $this->assertEquals($row['location'], $updatedComponent->location->name);
+        $this->assertEquals($component->supplier_id, $updatedComponent->supplier_id);
+        $this->assertEquals($row['quantity'], $updatedComponent->qty);
+        $this->assertEquals($row['orderNumber'], $updatedComponent->order_number);
+        $this->assertEquals($row['purchaseDate'], $updatedComponent->purchase_date->toDateString());
+        $this->assertEquals($row['purchaseCost'], $updatedComponent->purchase_cost);
+        $this->assertEquals($component->min_amt, $updatedComponent->min_amt);
+        $this->assertEquals($row['serialNumber'], $updatedComponent->serial);
+        $this->assertEquals($component->image, $updatedComponent->image);
+        $this->assertEquals($component->notes, $updatedComponent->notes);
+    }
+
+    #[Test]
+    public function customColumnMapping(): void
+    {
+        $faker = ImportFileBuilder::new()->definition();
+        $row = [
+            'category'     => $faker['serialNumber'],
+            'companyName'  => $faker['quantity'],
+            'itemName'     => $faker['purchaseDate'],
+            'location'     => $faker['purchaseCost'],
+            'orderNumber'  => $faker['orderNumber'],
+            'purchaseCost' => $faker['category'],
+            'purchaseDate' => $faker['companyName'],
+            'quantity'     => $faker['itemName'],
+            'serialNumber' => $faker['location']
+        ];
+
+        $importFileBuilder = new ImportFileBuilder([$row]);
+        $import = Import::factory()->component()->create(['file_path' => $importFileBuilder->saveToImportsDirectory()]);
+
+        $this->actingAsForApi(User::factory()->superuser()->create());
+
+        $this->importFileResponse([
+            'import' => $import->id,
+            'column-mappings' => [
+                'Category'      => 'serial',
+                'Company'       => 'quantity',
+                'item Name'     => 'purchase_date',
+                'Location'      => 'purchase_cost',
+                'Order Number'  => 'order_number',
+                'Purchase Cost' => 'category',
+                'Purchase Date' => 'company',
+                'Quantity'      => 'item_name',
+                'Serial number' => 'location',
+            ]
+        ])->assertOk();
+
+        $newComponent = Component::query()
+            ->with(['location', 'category'])
+            ->where('serial', $importFileBuilder->firstRow()['category'])
+            ->sole();
+
+        $this->assertEquals($row['quantity'], $newComponent->name);
+        $this->assertEquals($row['purchaseCost'], $newComponent->category->name);
+        $this->assertEquals($row['serialNumber'], $newComponent->location->name);
+        $this->assertNull($newComponent->supplier_id);
+        $this->assertEquals($row['companyName'], $newComponent->qty);
+        $this->assertEquals($row['orderNumber'], $newComponent->order_number);
+        $this->assertEquals($row['itemName'], $newComponent->purchase_date->toDateString());
+        $this->assertEquals($row['location'], $newComponent->purchase_cost);
+        $this->assertNull($newComponent->min_amt);
+        $this->assertNull($newComponent->image);
+        $this->assertNull($newComponent->notes);
+    }
+}
diff --git a/tests/Feature/Importing/Api/ImportConsumablesTest.php b/tests/Feature/Importing/Api/ImportConsumablesTest.php
new file mode 100644
index 0000000000..cbc8627f5d
--- /dev/null
+++ b/tests/Feature/Importing/Api/ImportConsumablesTest.php
@@ -0,0 +1,307 @@
+<?php
+
+namespace Tests\Feature\Importing\Api;
+
+use App\Models\Actionlog as ActivityLog;
+use App\Models\Consumable;
+use App\Models\Import;
+use App\Models\User;
+use Illuminate\Foundation\Testing\WithFaker;
+use Illuminate\Support\Facades\Notification;
+use Illuminate\Support\Str;
+use Illuminate\Testing\TestResponse;
+use PHPUnit\Framework\Attributes\Test;
+use Tests\Concerns\TestsPermissionsRequirement;
+use Tests\Support\Importing\CleansUpImportFiles;
+use Tests\Support\Importing\ConsumablesImportFileBuilder as ImportFileBuilder;
+
+class ImportConsumablesTest extends ImportDataTestCase implements TestsPermissionsRequirement
+{
+    use CleansUpImportFiles;
+    use WithFaker;
+
+    protected function importFileResponse(array $parameters = []): TestResponse
+    {
+        if (!array_key_exists('import-type', $parameters)) {
+            $parameters['import-type'] = 'consumable';
+        }
+
+        return parent::importFileResponse($parameters);
+    }
+
+    #[Test]
+    public function testRequiresPermission()
+    {
+        $this->actingAsForApi(User::factory()->create());
+
+        $this->importFileResponse(['import' => 44])->assertForbidden();
+    }
+
+    #[Test]
+    public function userWithImportAssetsPermissionCanImportConsumables(): void
+    {
+        $this->actingAsForApi(User::factory()->canImport()->create());
+
+        $import = Import::factory()->consumable()->create();
+
+        $this->importFileResponse(['import' => $import->id])->assertOk();
+    }
+
+    #[Test]
+    public function importConsumables(): void
+    {
+        Notification::fake();
+
+        $importFileBuilder = ImportFileBuilder::new();
+        $row = $importFileBuilder->firstRow();
+        $import = Import::factory()->consumable()->create(['file_path' => $importFileBuilder->saveToImportsDirectory()]);
+
+        $this->actingAsForApi(User::factory()->superuser()->create());
+        $this->importFileResponse(['import' => $import->id])
+            ->assertOk()
+            ->assertExactJson([
+                'payload'  => null,
+                'status'   => 'success',
+                'messages' => ['redirect_url' => route('consumables.index')]
+            ]);
+
+        $newConsumable = Consumable::query()
+            ->with(['location', 'category', 'company'])
+            ->where('name', $row['itemName'])
+            ->sole();
+
+        $activityLog = ActivityLog::query()
+            ->where('item_type', Consumable::class)
+            ->where('item_id', $newConsumable->id)
+            ->sole();
+
+        $this->assertEquals('create', $activityLog->action_type);
+        $this->assertEquals('importer', $activityLog->action_source);
+        $this->assertEquals($newConsumable->company->id, $activityLog->company_id);
+
+        $this->assertEquals($row['itemName'], $newConsumable->name);
+        $this->assertEquals($row['category'], $newConsumable->category->name);
+        $this->assertEquals($row['location'], $newConsumable->location->name);
+        $this->assertEquals($row['companyName'], $newConsumable->company->name);
+        $this->assertNotNull($newConsumable->supplier_id);
+        $this->assertFalse($newConsumable->requestable);
+        $this->assertNull($newConsumable->image);
+        $this->assertEquals($row['orderNumber'], $newConsumable->order_number);
+        $this->assertEquals($row['purchaseDate'], $newConsumable->purchase_date->toDateString());
+        $this->assertEquals($row['purchaseCost'], $newConsumable->purchase_cost);
+        $this->assertNull($newConsumable->min_amt);
+        $this->assertEquals('', $newConsumable->model_number);
+        $this->assertNull($newConsumable->item_number);
+        $this->assertNull($newConsumable->manufacturer_id);
+        $this->assertNull($newConsumable->notes);
+    }
+
+    #[Test]
+    public function willIgnoreUnknownColumnsWhenFileContainsUnknownColumns(): void
+    {
+        $row = ImportFileBuilder::new()->definition();
+        $row['unknownColumnInCsvFile'] = 'foo';
+
+        $importFileBuilder = new ImportFileBuilder([$row]);
+
+        $this->actingAsForApi(User::factory()->superuser()->create());
+
+        $import = Import::factory()->consumable()->create(['file_path' => $importFileBuilder->saveToImportsDirectory()]);
+
+        $this->importFileResponse(['import' => $import->id])->assertOk();
+    }
+
+    #[Test]
+    public function willNotCreateNewConsumableWhenConsumableNameAlreadyExist(): void
+    {
+        $consumable = Consumable::factory()->create(['name' => Str::random()]);
+        $importFileBuilder = ImportFileBuilder::new(['itemName' => $consumable->name]);
+        $import = Import::factory()->consumable()->create(['file_path' => $importFileBuilder->saveToImportsDirectory()]);
+
+        $this->actingAsForApi(User::factory()->superuser()->create());
+        $this->importFileResponse(['import' => $import->id])->assertOk();
+
+        $probablyNewConsumables = Consumable::query()
+            ->where('name', $consumable->name)
+            ->get();
+
+        $this->assertCount(1, $probablyNewConsumables);
+        $this->assertEquals($consumable->id, $probablyNewConsumables->sole()->id);
+    }
+
+    #[Test]
+    public function willNotCreateNewCompanyWhenCompanyExists(): void
+    {
+        $importFileBuilder = ImportFileBuilder::times(4)->replace(['companyName' => Str::random()]);
+        $import = Import::factory()->consumable()->create(['file_path' => $importFileBuilder->saveToImportsDirectory()]);
+
+        $this->actingAsForApi(User::factory()->superuser()->create());
+        $this->importFileResponse(['import' => $import->id])->assertOk();
+
+        $newConsumables = Consumable::query()
+            ->whereIn('name', $importFileBuilder->pluck('itemName'))
+            ->get(['company_id']);
+
+        $this->assertCount(1, $newConsumables->pluck('company_id')->unique()->all());
+    }
+
+    #[Test]
+    public function willNotCreateNewLocationWhenLocationExists(): void
+    {
+        $importFileBuilder = ImportFileBuilder::times(4)->replace(['location' => Str::random()]);
+        $import = Import::factory()->consumable()->create(['file_path' => $importFileBuilder->saveToImportsDirectory()]);
+
+        $this->actingAsForApi(User::factory()->superuser()->create());
+        $this->importFileResponse(['import' => $import->id])->assertOk();
+
+        $newConsumables = Consumable::query()
+            ->whereIn('name', $importFileBuilder->pluck('itemName'))
+            ->get(['location_id']);
+
+        $this->assertCount(1, $newConsumables->pluck('location_id')->unique()->all());
+    }
+
+    #[Test]
+    public function willNotCreateNewCategoryWhenCategoryExists(): void
+    {
+        $importFileBuilder = ImportFileBuilder::times(4)->replace(['category' => Str::random()]);
+        $import = Import::factory()->consumable()->create(['file_path' => $importFileBuilder->saveToImportsDirectory()]);
+
+        $this->actingAsForApi(User::factory()->superuser()->create());
+        $this->importFileResponse(['import' => $import->id])->assertOk();
+
+        $newConsumables = Consumable::query()
+            ->whereIn('name', $importFileBuilder->pluck('itemName'))
+            ->get(['category_id']);
+
+        $this->assertCount(1, $newConsumables->pluck('category_id')->unique()->all());
+    }
+
+    #[Test]
+    public function whenRequiredColumnsAreMissingInImportFile(): void
+    {
+        $importFileBuilder = ImportFileBuilder::new(['category' => ''])->forget(['quantity', 'name']);
+
+        $row = $importFileBuilder->firstRow();
+        $import = Import::factory()->consumable()->create(['file_path' => $importFileBuilder->saveToImportsDirectory()]);
+
+        $this->actingAsForApi(User::factory()->superuser()->create());
+
+        $this->importFileResponse(['import' => $import->id])
+            ->assertInternalServerError()
+            ->assertExactJson([
+                'status'   => 'import-errors',
+                'payload'  => null,
+                'messages' => [
+                    $row['itemName'] => [
+                        'Consumable' => [
+                            'category_id' => ['The category id field is required.']
+                        ]
+                    ]
+                ]
+            ]);
+
+        $newConsumables = Consumable::query()
+            ->whereIn('name', $importFileBuilder->pluck('itemName'))
+            ->get(['id']);
+
+        $this->assertCount(0, $newConsumables);
+    }
+
+    #[Test]
+    public function updateConsumableFromImport(): void
+    {
+        $consumable = Consumable::factory()->create(['name' => Str::random()]);
+        $importFileBuilder = ImportFileBuilder::new(['itemName' => $consumable->name]);
+
+        $row = $importFileBuilder->firstRow();
+        $import = Import::factory()->consumable()->create(['file_path' => $importFileBuilder->saveToImportsDirectory()]);
+
+        $this->actingAsForApi(User::factory()->superuser()->create());
+        $this->importFileResponse(['import' => $import->id, 'import-update' => true])->assertOk();
+
+        $updatedConsumable = Consumable::query()
+            ->with(['location', 'category', 'company'])
+            ->where('name', $importFileBuilder->firstRow()['itemName'])
+            ->sole();
+
+        $this->assertEquals($row['itemName'], $updatedConsumable->name);
+        $this->assertEquals($row['category'], $updatedConsumable->category->name);
+        $this->assertEquals($row['location'], $updatedConsumable->location->name);
+        $this->assertEquals($row['companyName'], $updatedConsumable->company->name);
+        $this->assertEquals($row['orderNumber'], $updatedConsumable->order_number);
+        $this->assertEquals($row['purchaseDate'], $updatedConsumable->purchase_date->toDateString());
+        $this->assertEquals($row['purchaseCost'], $updatedConsumable->purchase_cost);
+
+        $this->assertEquals($row['supplier'], $updatedConsumable->supplier->name);
+        $this->assertEquals($consumable->requestable, $updatedConsumable->requestable);
+        $this->assertEquals($consumable->min_amt, $updatedConsumable->min_amt);
+        $this->assertEquals($consumable->model_number, $updatedConsumable->model_number);
+        $this->assertEquals($consumable->item_number, $updatedConsumable->item_number);
+        $this->assertEquals($consumable->manufacturer_id, $updatedConsumable->manufacturer_id);
+        $this->assertEquals($consumable->notes, $updatedConsumable->notes);
+        $this->assertEquals($consumable->item_number, $updatedConsumable->item_number);
+    }
+
+    #[Test]
+    public function customColumnMapping(): void
+    {
+        $faker = ImportFileBuilder::new()->definition();
+        $row = [
+            'category'     => $faker['supplier'],
+            'companyName'  => $faker['quantity'],
+            'itemName'     => $faker['purchaseDate'],
+            'location'     => $faker['purchaseCost'],
+            'orderNumber'  => $faker['orderNumber'],
+            'purchaseCost' => $faker['location'],
+            'purchaseDate' => $faker['companyName'],
+            'quantity'     => $faker['itemName'],
+            'supplier'     => $faker['category']
+        ];
+
+        $importFileBuilder = new ImportFileBuilder([$row]);
+
+        $import = Import::factory()->consumable()->create(['file_path' => $importFileBuilder->saveToImportsDirectory()]);
+
+        $this->actingAsForApi(User::factory()->superuser()->create());
+
+
+        // This mapping is incorrect on purpose
+        $this->importFileResponse([
+            'import' => $import->id,
+            'column-mappings' => [
+                'Category'      => 'supplier',
+                'Company'       => 'quantity',
+                'item Name'     => 'purchase_date',
+                'Location'      => 'purchase_cost',
+                'Order Number'  => 'order_number',
+                'Purchase Cost' => 'location',
+                'Purchase Date' => 'company',
+                'Quantity'      => 'item_name',
+                'Supplier'      => 'category',
+            ]
+        ])->assertOk();
+
+        $newConsumable = Consumable::query()
+            ->with(['location', 'category', 'company'])
+            ->where('name', $importFileBuilder->firstRow()['quantity'])
+            ->sole();
+
+        $this->assertEquals($row['supplier'], $newConsumable->category->name);
+        $this->assertEquals($row['purchaseCost'], $newConsumable->location->name);
+        $this->assertEquals($row['purchaseDate'], $newConsumable->company->name);
+        $this->assertEquals($row['companyName'], $newConsumable->qty);
+        $this->assertEquals($row['quantity'], $newConsumable->name);
+        $this->assertNotNull($newConsumable->supplier_id);
+        $this->assertFalse($newConsumable->requestable);
+        $this->assertNull($newConsumable->image);
+        $this->assertEquals($row['orderNumber'], $newConsumable->order_number);
+        $this->assertEquals($row['itemName'], $newConsumable->purchase_date->toDateString());
+        $this->assertEquals($row['location'], $newConsumable->purchase_cost);
+        $this->assertNull($newConsumable->min_amt);
+        $this->assertEquals('', $newConsumable->model_number);
+        $this->assertNull($newConsumable->item_number);
+        $this->assertNull($newConsumable->manufacturer_id);
+        $this->assertNull($newConsumable->notes);
+    }
+}
diff --git a/tests/Feature/Importing/Api/ImportDataTestCase.php b/tests/Feature/Importing/Api/ImportDataTestCase.php
new file mode 100644
index 0000000000..eaa2a8f03b
--- /dev/null
+++ b/tests/Feature/Importing/Api/ImportDataTestCase.php
@@ -0,0 +1,14 @@
+<?php
+
+namespace Tests\Feature\Importing\Api;
+
+use Illuminate\Testing\TestResponse;
+use Tests\TestCase;
+
+abstract class ImportDataTestCase extends TestCase
+{
+    protected function importFileResponse(array $parameters = []): TestResponse
+    {
+        return $this->postJson(route('api.imports.importFile', $parameters), $parameters);
+    }
+}
diff --git a/tests/Feature/Importing/Api/ImportLicenseTest.php b/tests/Feature/Importing/Api/ImportLicenseTest.php
new file mode 100644
index 0000000000..0cd5fe447c
--- /dev/null
+++ b/tests/Feature/Importing/Api/ImportLicenseTest.php
@@ -0,0 +1,356 @@
+<?php
+
+namespace Tests\Feature\Importing\Api;
+
+use App\Models\Actionlog as ActivityLog;
+use App\Models\Import;
+use App\Models\License;
+use App\Models\User;
+use Illuminate\Foundation\Testing\WithFaker;
+use Illuminate\Support\Str;
+use Illuminate\Testing\TestResponse;
+use PHPUnit\Framework\Attributes\Test;
+use Tests\Concerns\TestsPermissionsRequirement;
+use Tests\Support\Importing\CleansUpImportFiles;
+use Tests\Support\Importing\LicensesImportFileBuilder as ImportFileBuilder;
+
+class ImportLicenseTest extends ImportDataTestCase implements TestsPermissionsRequirement
+{
+    use CleansUpImportFiles;
+    use WithFaker;
+
+    protected function importFileResponse(array $parameters = []): TestResponse
+    {
+        if (!array_key_exists('import-type', $parameters)) {
+            $parameters['import-type'] = 'license';
+        }
+
+        return parent::importFileResponse($parameters);
+    }
+
+    #[Test]
+    public function testRequiresPermission()
+    {
+        $this->actingAsForApi(User::factory()->create());
+
+        $this->importFileResponse(['import' => 44])->assertForbidden();
+    }
+
+    #[Test]
+    public function userWithImportAssetsPermissionCanImportLicenses(): void
+    {
+        $this->actingAsForApi(User::factory()->canImport()->create());
+
+        $import = Import::factory()->license()->create();
+
+        $this->importFileResponse(['import' => $import->id])->assertOk();
+    }
+
+    #[Test]
+    public function importLicenses(): void
+    {
+        $importFileBuilder = ImportFileBuilder::new();
+        $row = $importFileBuilder->firstRow();
+        $import = Import::factory()->license()->create(['file_path' => $importFileBuilder->saveToImportsDirectory()]);
+
+        $this->actingAsForApi(User::factory()->superuser()->create());
+        $this->importFileResponse(['import' => $import->id])
+            ->assertOk()
+            ->assertExactJson([
+                'payload'  => null,
+                'status'   => 'success',
+                'messages' => ['redirect_url' => route('licenses.index')]
+            ]);
+
+        $newLicense = License::query()
+            ->withCasts(['reassignable' => 'bool'])
+            ->with(['category', 'company', 'manufacturer', 'supplier'])
+            ->where('serial', $row['serialNumber'])
+            ->sole();
+
+        $activityLogs = ActivityLog::query()
+            ->where('item_type', License::class)
+            ->where('item_id', $newLicense->id)
+            ->get();
+
+        $this->assertCount(2, $activityLogs);
+
+        $this->assertEquals($row['licenseName'], $newLicense->name);
+        $this->assertEquals($row['serialNumber'], $newLicense->serial);
+        $this->assertEquals($row['purchaseDate'], $newLicense->purchase_date->toDateString());
+        $this->assertEquals($row['purchaseCost'], $newLicense->purchase_cost);
+        $this->assertEquals($row['orderNumber'], $newLicense->order_number);
+        $this->assertEquals($row['seats'], $newLicense->seats);
+        $this->assertEquals($row['notes'], $newLicense->notes);
+        $this->assertEquals($row['licensedToName'], $newLicense->license_name);
+        $this->assertEquals($row['licensedToEmail'], $newLicense->license_email);
+        $this->assertEquals($row['supplierName'], $newLicense->supplier->name);
+        $this->assertEquals($row['companyName'], $newLicense->company->name);
+        $this->assertEquals($row['category'], $newLicense->category->name);
+        $this->assertEquals($row['expirationDate'], $newLicense->expiration_date->toDateString());
+        $this->assertEquals($row['isMaintained'] === 'TRUE', $newLicense->maintained);
+        $this->assertEquals($row['isReassignAble'] === 'TRUE', $newLicense->reassignable);
+        $this->assertEquals('', $newLicense->purchase_order);
+        $this->assertNull($newLicense->depreciation_id);
+        $this->assertNull($newLicense->termination_date);
+        $this->assertNull($newLicense->deprecate);
+        $this->assertNull($newLicense->min_amt);
+    }
+
+    #[Test]
+    public function willIgnoreUnknownColumnsWhenFileContainsUnknownColumns(): void
+    {
+        $row = ImportFileBuilder::new()->definition();
+        $row['unknownColumnInCsvFile'] = 'foo';
+
+        $importFileBuilder = new ImportFileBuilder([$row]);
+
+        $this->actingAsForApi(User::factory()->superuser()->create());
+
+        $import = Import::factory()->license()->create(['file_path' => $importFileBuilder->saveToImportsDirectory()]);
+
+        $this->importFileResponse(['import' => $import->id])->assertOk();
+    }
+
+    #[Test]
+    public function willNotCreateNewLicenseWhenNameAndSerialNumberAlreadyExist(): void
+    {
+        $license = License::factory()->create();
+
+        $importFileBuilder = ImportFileBuilder::times(4)->replace([
+            'itemName'     => $license->name,
+            'serialNumber' => $license->serial
+        ]);
+
+        $import = Import::factory()->license()->create(['file_path' => $importFileBuilder->saveToImportsDirectory()]);
+
+        $this->actingAsForApi(User::factory()->superuser()->create());
+        $this->importFileResponse(['import' => $import->id])->assertOk();
+
+        $probablyNewLicenses = License::query()
+            ->where('name', $license->name)
+            ->where('serial', $license->serial)
+            ->get();
+
+        $this->assertCount(1, $probablyNewLicenses);
+    }
+
+    #[Test]
+    public function formatAttributes(): void
+    {
+        $importFileBuilder = ImportFileBuilder::new([
+            'expirationDate' => '2022/10/10'
+        ]);
+
+        $import = Import::factory()->license()->create(['file_path' => $importFileBuilder->saveToImportsDirectory()]);
+
+        $this->actingAsForApi(User::factory()->superuser()->create());
+        $this->importFileResponse(['import' => $import->id])->assertOk();
+
+        $newLicense = License::query()
+            ->where('serial', $importFileBuilder->firstRow()['serialNumber'])
+            ->sole();
+
+        $this->assertEquals('2022-10-10', $newLicense->expiration_date->toDateString());
+    }
+
+    #[Test]
+    public function willNotCreateNewCompanyWhenCompanyExists(): void
+    {
+        $importFileBuilder = ImportFileBuilder::times(4)->replace(['companyName' => Str::random()]);
+        $import = Import::factory()->license()->create(['file_path' => $importFileBuilder->saveToImportsDirectory()]);
+
+        $this->actingAsForApi(User::factory()->superuser()->create());
+        $this->importFileResponse(['import' => $import->id])->assertOk();
+
+        $newLicenses = License::query()
+            ->whereIn('serial', $importFileBuilder->pluck('serialNumber'))
+            ->get(['company_id']);
+
+        $this->assertCount(1, $newLicenses->pluck('company_id')->unique()->all());
+    }
+
+    #[Test]
+    public function willNotCreateNewManufacturerWhenManufacturerExists(): void
+    {
+        $importFileBuilder = ImportFileBuilder::times(4)->replace(['manufacturerName' => Str::random()]);
+        $import = Import::factory()->license()->create(['file_path' => $importFileBuilder->saveToImportsDirectory()]);
+
+        $this->actingAsForApi(User::factory()->superuser()->create());
+        $this->importFileResponse(['import' => $import->id])->assertOk();
+
+        $newLicenses = License::query()
+            ->whereIn('serial', $importFileBuilder->pluck('serialNumber'))
+            ->get(['manufacturer_id']);
+
+        $this->assertCount(1, $newLicenses->pluck('manufacturer_id')->unique()->all());
+    }
+
+    #[Test]
+    public function willNotCreateNewCategoryWhenCategoryExists(): void
+    {
+        $importFileBuilder = ImportFileBuilder::times(4)->replace(['category' => $this->faker->company]);
+        $import = Import::factory()->license()->create(['file_path' => $importFileBuilder->saveToImportsDirectory()]);
+
+        $this->actingAsForApi(User::factory()->superuser()->create());
+        $this->importFileResponse(['import' => $import->id])->assertOk();
+
+        $newLicenses = License::query()
+            ->whereIn('serial', $importFileBuilder->pluck('serialNumber'))
+            ->get(['category_id']);
+
+        $this->assertCount(1, $newLicenses->pluck('category_id')->unique()->all());
+    }
+
+    #[Test]
+    public function whenRequiredColumnsAreMissingInImportFile(): void
+    {
+        $importFileBuilder = ImportFileBuilder::times()
+            ->replace(['name' => ''])
+            ->forget(['seats']);
+
+        $row = $importFileBuilder->firstRow();
+        $import = Import::factory()->license()->create(['file_path' => $importFileBuilder->saveToImportsDirectory()]);
+
+        $this->actingAsForApi(User::factory()->superuser()->create());
+
+        $this->importFileResponse(['import' => $import->id])
+            ->assertInternalServerError()
+            ->assertExactJson([
+                'status'   => 'import-errors',
+                'payload'  => null,
+                'messages' => [
+                    $row['licenseName'] => [
+                        "License \"{$row['licenseName']}\"" => [
+                            'seats' => ['The seats field is required.'],
+                        ]
+                    ]
+                ]
+            ]);
+
+        $newLicenses = License::query()
+            ->where('serial', $row['serialNumber'])
+            ->get();
+
+        $this->assertCount(0, $newLicenses);
+    }
+
+    #[Test]
+    public function updateLicenseFromImport(): void
+    {
+        $license = License::factory()->create();
+        $importFileBuilder = ImportFileBuilder::new([
+            'licenseName'  => $license->name,
+            'serialNumber' => $license->serial
+        ]);
+
+        $row = $importFileBuilder->firstRow();
+        $import = Import::factory()->license()->create(['file_path' => $importFileBuilder->saveToImportsDirectory()]);
+
+        $this->actingAsForApi(User::factory()->superuser()->create());
+        $this->importFileResponse(['import' => $import->id, 'import-update' => true])->assertOk();
+
+        $updatedLicense = License::query()
+            ->with(['manufacturer', 'category', 'supplier'])
+            ->where('serial', $row['serialNumber'])
+            ->sole();
+
+        $this->assertEquals($row['licenseName'], $updatedLicense->name);
+        $this->assertEquals($row['serialNumber'], $updatedLicense->serial);
+        $this->assertEquals($row['purchaseDate'], $updatedLicense->purchase_date->toDateString());
+        $this->assertEquals($row['purchaseCost'], $updatedLicense->purchase_cost);
+        $this->assertEquals($row['orderNumber'], $updatedLicense->order_number);
+        $this->assertEquals($row['seats'], $updatedLicense->seats);
+        $this->assertEquals($row['notes'], $updatedLicense->notes);
+        $this->assertEquals($row['licensedToName'], $updatedLicense->license_name);
+        $this->assertEquals($row['licensedToEmail'], $updatedLicense->license_email);
+        $this->assertEquals($row['supplierName'], $updatedLicense->supplier->name);
+        $this->assertEquals($row['companyName'], $updatedLicense->company->name);
+        $this->assertEquals($row['category'], $updatedLicense->category->name);
+        $this->assertEquals($row['expirationDate'], $updatedLicense->expiration_date->toDateString());
+        $this->assertEquals($row['isMaintained'] === 'TRUE', $updatedLicense->maintained);
+        $this->assertEquals($row['isReassignAble'] === 'TRUE', $updatedLicense->reassignable);
+        $this->assertEquals($license->purchase_order, $updatedLicense->purchase_order);
+        $this->assertEquals($license->depreciation_id, $updatedLicense->depreciation_id);
+        $this->assertEquals($license->termination_date, $updatedLicense->termination_date);
+        $this->assertEquals($license->deprecate, $updatedLicense->deprecate);
+        $this->assertEquals($license->min_amt, $updatedLicense->min_amt);
+    }
+
+    #[Test]
+    public function customColumnMapping(): void
+    {
+        $faker = ImportFileBuilder::times()->definition();
+        $row = [
+            'category'         => $faker['supplierName'],
+            'companyName'      => $faker['serialNumber'],
+            'expirationDate'   => $faker['seats'],
+            'isMaintained'     => $faker['purchaseDate'],
+            'isReassignAble'   => $faker['purchaseCost'],
+            'licensedToName'   => $faker['orderNumber'],
+            'licensedToEmail'  => $faker['notes'],
+            'licenseName'      => $faker['licenseName'],
+            'manufacturerName' => $faker['category'],
+            'notes'            => $faker['companyName'],
+            'orderNumber'      => $faker['expirationDate'],
+            'purchaseCost'     => $faker['isMaintained'],
+            'purchaseDate'     => $faker['isReassignAble'],
+            'seats'            => $faker['licensedToName'],
+            'serialNumber'     => $faker['licensedToEmail'],
+            'supplierName'     => $faker['manufacturerName']
+        ];
+
+        $importFileBuilder = new ImportFileBuilder([$row]);
+        $import = Import::factory()->license()->create(['file_path' => $importFileBuilder->saveToImportsDirectory()]);
+
+        $this->actingAsForApi(User::factory()->superuser()->create());
+
+        $this->importFileResponse([
+            'import' => $import->id,
+            'column-mappings' => [
+                'Category'         => 'supplier',
+                'Company'          => 'serial',
+                'expiration date'  => 'seats',
+                'maintained'       => 'purchase_date',
+                'reassignable'     => 'purchase_cost',
+                'Licensed To Name' => 'order_number',
+                'Licensed To Email' => 'notes',
+                'licenseName'      => 'name',
+                'manufacturer'     => 'category',
+                'Notes'            => 'company',
+                'Serial number'    => 'license_email',
+                'Order Number'     => 'expiration_date',
+                'purchase Cost'    => 'maintained',
+                'purchase Date'    => 'reassignable',
+                'seats'            => 'license_name',
+                'supplier'         => 'manufacturer'
+            ]
+        ])->assertOk();
+
+        $newLicense = License::query()
+            ->with(['category', 'company', 'manufacturer', 'supplier'])
+            ->where('serial', $row['companyName'])
+            ->sole();
+
+        $this->assertEquals($row['licenseName'], $newLicense->name);
+        $this->assertEquals($row['companyName'], $newLicense->serial);
+        $this->assertEquals($row['isMaintained'], $newLicense->purchase_date->toDateString());
+        $this->assertEquals($row['isReassignAble'], $newLicense->purchase_cost);
+        $this->assertEquals($row['licensedToName'], $newLicense->order_number);
+        $this->assertEquals($row['expirationDate'], $newLicense->seats);
+        $this->assertEquals($row['licensedToEmail'], $newLicense->notes);
+        $this->assertEquals($row['seats'], $newLicense->license_name);
+        $this->assertEquals($row['serialNumber'], $newLicense->license_email);
+        $this->assertEquals($row['category'], $newLicense->supplier->name);
+        $this->assertEquals($row['notes'], $newLicense->company->name);
+        $this->assertEquals($row['manufacturerName'], $newLicense->category->name);
+        $this->assertEquals($row['orderNumber'], $newLicense->expiration_date->toDateString());
+        $this->assertEquals($row['purchaseCost'] === 'TRUE', $newLicense->maintained);
+        $this->assertEquals($row['purchaseDate'] === 'TRUE', $newLicense->reassignable);
+        $this->assertEquals('', $newLicense->purchase_order);
+        $this->assertNull($newLicense->depreciation_id);
+        $this->assertNull($newLicense->termination_date);
+        $this->assertNull($newLicense->deprecate);
+        $this->assertNull($newLicense->min_amt);
+    }
+}
diff --git a/tests/Feature/Importing/Api/ImportLocationsTest.php b/tests/Feature/Importing/Api/ImportLocationsTest.php
new file mode 100644
index 0000000000..88eeb5fa18
--- /dev/null
+++ b/tests/Feature/Importing/Api/ImportLocationsTest.php
@@ -0,0 +1,136 @@
+<?php
+
+namespace Tests\Feature\Importing\Api;
+
+use App\Models\Location;
+use App\Models\User;
+use App\Models\Import;
+use Illuminate\Foundation\Testing\WithFaker;
+use Illuminate\Support\Arr;
+use Illuminate\Testing\TestResponse;
+use PHPUnit\Framework\Attributes\Test;
+use Tests\Concerns\TestsPermissionsRequirement;
+use Tests\Support\Importing\CleansUpImportFiles;
+use Tests\Support\Importing\LocationsImportFileBuilder as ImportFileBuilder;
+
+class ImportLocationsTest extends ImportDataTestCase implements TestsPermissionsRequirement
+{
+    use CleansUpImportFiles;
+    use WithFaker;
+
+    protected function importFileResponse(array $parameters = []): TestResponse
+    {
+        if (!array_key_exists('import-type', $parameters)) {
+            $parameters['import-type'] = 'location';
+        }
+
+        return parent::importFileResponse($parameters);
+    }
+
+    #[Test]
+    public function testRequiresPermission()
+    {
+        $this->actingAsForApi(User::factory()->create());
+
+        $this->importFileResponse(['import' => 44])->assertForbidden();
+    }
+
+    #[Test]
+    public function importLocation(): void
+    {
+        $importFileBuilder = ImportFileBuilder::new();
+        $row = $importFileBuilder->firstRow();
+        $import = Import::factory()->locations()->create(['file_path' => $importFileBuilder->saveToImportsDirectory()]);
+
+        $this->actingAsForApi(User::factory()->superuser()->create());
+        $this->importFileResponse(['import' => $import->id, 'send-welcome' => 0])
+            ->assertOk()
+            ->assertExactJson([
+                'payload'  => null,
+                'status'   => 'success',
+                'messages' => ['redirect_url' => route('locations.index')]
+            ]);
+
+        $newLocation = Location::query()
+            ->where('name', $row['name'])
+            ->sole();
+
+        $this->assertEquals($row['name'], $newLocation->name);
+
+    }
+
+    #[Test]
+    public function willIgnoreUnknownColumnsWhenFileContainsUnknownColumns(): void
+    {
+        $row = ImportFileBuilder::new()->definition();
+        $row['unknownColumnInCsvFile'] = 'foo';
+
+        $importFileBuilder = new ImportFileBuilder([$row]);
+
+        $this->actingAsForApi(User::factory()->superuser()->create());
+
+        $import = Import::factory()->locations()->create(['file_path' => $importFileBuilder->saveToImportsDirectory()]);
+
+        $this->importFileResponse(['import' => $import->id])->assertOk();
+    }
+
+
+    #[Test]
+    public function whenRequiredColumnsAreMissingInImportFile(): void
+    {
+        $importFileBuilder = ImportFileBuilder::new(['name' => '']);
+        $import = Import::factory()->locations()->create(['file_path' => $importFileBuilder->saveToImportsDirectory()]);
+
+        $this->actingAsForApi(User::factory()->superuser()->create());
+
+        $this->importFileResponse(['import' => $import->id])
+            ->assertInternalServerError()
+            ->assertExactJson([
+                'status'   => 'import-errors',
+                'payload'  => null,
+                'messages' => [
+                    '' => [
+                        'Location ""' => [
+                            'name' =>
+                                ['The name field is required.'],
+                        ],
+                    ]
+
+                ]
+            ]);
+
+        $newLocation = Location::query()
+            ->where('name', $importFileBuilder->firstRow()['name'])
+            ->get();
+
+        $this->assertCount(0, $newLocation);
+    }
+
+
+    #[Test]
+    public function updateLocationFromImport(): void
+    {
+        $location = Location::factory()->create()->refresh();
+        $importFileBuilder = ImportFileBuilder::new(['name' => $location->name, 'phone' => $location->phone]);
+
+        $row = $importFileBuilder->firstRow();
+        $import = Import::factory()->locations()->create(['file_path' => $importFileBuilder->saveToImportsDirectory()]);
+
+        $this->actingAsForApi(User::factory()->superuser()->create());
+        $this->importFileResponse(['import' => $import->id, 'import-update' => true])->assertOk();
+
+        $updatedLocation = Location::query()->find($location->id);
+        $updatedAttributes = [
+            'name',
+            'phone',
+        ];
+
+        $this->assertEquals($row['name'], $updatedLocation->name);
+
+        $this->assertEquals(
+            Arr::except($location->attributesToArray(), array_merge($updatedAttributes, $location->getDates())),
+            Arr::except($updatedLocation->attributesToArray(), array_merge($updatedAttributes, $location->getDates())),
+        );
+    }
+
+}
diff --git a/tests/Feature/Importing/Api/ImportManufacturersTest.php b/tests/Feature/Importing/Api/ImportManufacturersTest.php
new file mode 100644
index 0000000000..c5afd990e1
--- /dev/null
+++ b/tests/Feature/Importing/Api/ImportManufacturersTest.php
@@ -0,0 +1,138 @@
+<?php
+
+namespace Tests\Feature\Importing\Api;
+
+use App\Models\Manufacturer;
+use App\Models\User;
+use App\Models\Import;
+use Illuminate\Foundation\Testing\WithFaker;
+use Illuminate\Support\Arr;
+use Illuminate\Testing\TestResponse;
+use PHPUnit\Framework\Attributes\Test;
+use Tests\Concerns\TestsPermissionsRequirement;
+use Tests\Support\Importing\CleansUpImportFiles;
+use Tests\Support\Importing\ManufacturersImportFileBuilder as ImportFileBuilder;
+
+class ImportManufacturersTest extends ImportDataTestCase implements TestsPermissionsRequirement
+{
+    use CleansUpImportFiles;
+    use WithFaker;
+
+    protected function importFileResponse(array $parameters = []): TestResponse
+    {
+        if (!array_key_exists('import-type', $parameters)) {
+            $parameters['import-type'] = 'manufacturer';
+        }
+
+        return parent::importFileResponse($parameters);
+    }
+
+    #[Test]
+    public function testRequiresPermission()
+    {
+        $this->actingAsForApi(User::factory()->create());
+
+        $this->importFileResponse(['import' => 44])->assertForbidden();
+    }
+
+    #[Test]
+    public function importManufacturer(): void
+    {
+        $importFileBuilder = ImportFileBuilder::new();
+        $row = $importFileBuilder->firstRow();
+        $import = Import::factory()->manufacturers()->create(['file_path' => $importFileBuilder->saveToImportsDirectory()]);
+
+        $this->actingAsForApi(User::factory()->superuser()->create());
+        $this->importFileResponse(['import' => $import->id, 'send-welcome' => 0])
+            ->assertOk()
+            ->assertExactJson([
+                'payload'  => null,
+                'status'   => 'success',
+                'messages' => ['redirect_url' => route('manufacturers.index')]
+            ]);
+
+        $newManufacturer = Manufacturer::query()
+            ->where('name', $row['name'])
+            ->sole();
+
+        $this->assertEquals($row['name'], $newManufacturer->name);
+
+    }
+
+    #[Test]
+    public function willIgnoreUnknownColumnsWhenFileContainsUnknownColumns(): void
+    {
+        $row = ImportFileBuilder::new()->definition();
+        $row['unknownColumnInCsvFile'] = 'foo';
+
+        $importFileBuilder = new ImportFileBuilder([$row]);
+
+        $this->actingAsForApi(User::factory()->superuser()->create());
+
+        $import = Import::factory()->manufacturers()->create(['file_path' => $importFileBuilder->saveToImportsDirectory()]);
+
+        $this->importFileResponse(['import' => $import->id])->assertOk();
+    }
+
+
+    #[Test]
+    public function whenRequiredColumnsAreMissingInImportFile(): void
+    {
+        $importFileBuilder = ImportFileBuilder::new(['name' => '']);
+        $import = Import::factory()->manufacturers()->create(['file_path' => $importFileBuilder->saveToImportsDirectory()]);
+
+        $this->actingAsForApi(User::factory()->superuser()->create());
+
+        $this->importFileResponse(['import' => $import->id])
+            ->assertInternalServerError()
+            ->assertExactJson([
+                'status'   => 'import-errors',
+                'payload'  => null,
+                'messages' => [
+                    '' => [
+                        'Manufacturer ""' => [
+                            'name' =>
+                                ['The name field is required.'],
+                        ],
+                    ]
+
+                ]
+            ]);
+
+        $newManufacturer = Manufacturer::query()
+            ->where('name', $importFileBuilder->firstRow()['name'])
+            ->get();
+
+        $this->assertCount(0, $newManufacturer);
+    }
+
+
+    #[Test]
+    public function updateManufacturerFromImport(): void
+    {
+        $manufacturer = Manufacturer::factory()->create()->refresh();
+        $importFileBuilder = ImportFileBuilder::new(['name' => $manufacturer->name, 'support_url' => $manufacturer->support_url, 'support_phone' => $manufacturer->support_phone, 'support_email' => $manufacturer->support_email]);
+
+        $row = $importFileBuilder->firstRow();
+        $import = Import::factory()->manufacturers()->create(['file_path' => $importFileBuilder->saveToImportsDirectory()]);
+
+        $this->actingAsForApi(User::factory()->superuser()->create());
+        $this->importFileResponse(['import' => $import->id, 'import-update' => true])->assertOk();
+
+        $updatedManufacturer = Manufacturer::query()->find($manufacturer->id);
+        $updatedAttributes = [
+            'name',
+            'support_url',
+            'support_phone',
+            'support_email',
+        ];
+
+        $this->assertEquals($row['name'], $updatedManufacturer->name);
+
+        $this->assertEquals(
+            Arr::except($manufacturer->attributesToArray(), array_merge($updatedAttributes, $manufacturer->getDates())),
+            Arr::except($updatedManufacturer->attributesToArray(), array_merge($updatedAttributes, $manufacturer->getDates())),
+        );
+    }
+
+}
diff --git a/tests/Feature/Importing/Api/ImportSuppliersTest.php b/tests/Feature/Importing/Api/ImportSuppliersTest.php
new file mode 100644
index 0000000000..c9d0b9c72e
--- /dev/null
+++ b/tests/Feature/Importing/Api/ImportSuppliersTest.php
@@ -0,0 +1,141 @@
+<?php
+
+namespace Tests\Feature\Importing\Api;
+
+use App\Models\Supplier;
+use App\Models\User;
+use App\Models\Import;
+use Illuminate\Foundation\Testing\WithFaker;
+use Illuminate\Support\Arr;
+use Illuminate\Support\Str;
+use Illuminate\Testing\TestResponse;
+use PHPUnit\Framework\Attributes\Test;
+use Tests\Concerns\TestsPermissionsRequirement;
+use Tests\Support\Importing\CleansUpImportFiles;
+use Tests\Support\Importing\SuppliersImportFileBuilder as ImportFileBuilder;
+
+class ImportSuppliersTest extends ImportDataTestCase implements TestsPermissionsRequirement
+{
+    use CleansUpImportFiles;
+    use WithFaker;
+
+    protected function importFileResponse(array $parameters = []): TestResponse
+    {
+        if (!array_key_exists('import-type', $parameters)) {
+            $parameters['import-type'] = 'supplier';
+        }
+
+        return parent::importFileResponse($parameters);
+    }
+
+    #[Test]
+    public function testRequiresPermission()
+    {
+        $this->actingAsForApi(User::factory()->create());
+
+        $this->importFileResponse(['import' => 44])->assertForbidden();
+    }
+
+    #[Test]
+    public function importSupplier(): void
+    {
+        $importFileBuilder = ImportFileBuilder::new();
+        $row = $importFileBuilder->firstRow();
+        $import = Import::factory()->suppliers()->create(['file_path' => $importFileBuilder->saveToImportsDirectory()]);
+
+        $this->actingAsForApi(User::factory()->superuser()->create());
+        $this->importFileResponse(['import' => $import->id, 'send-welcome' => 0])
+            ->assertOk()
+            ->assertExactJson([
+                'payload'  => null,
+                'status'   => 'success',
+                'messages' => ['redirect_url' => route('suppliers.index')]
+            ]);
+
+        $newSupplier = Supplier::query()
+            ->where('name', $row['name'])
+            ->sole();
+
+        $this->assertEquals($row['name'], $newSupplier->name);
+
+    }
+
+    #[Test]
+    public function willIgnoreUnknownColumnsWhenFileContainsUnknownColumns(): void
+    {
+        $row = ImportFileBuilder::new()->definition();
+        $row['unknownColumnInCsvFile'] = 'foo';
+
+        $importFileBuilder = new ImportFileBuilder([$row]);
+
+        $this->actingAsForApi(User::factory()->superuser()->create());
+
+        $import = Import::factory()->suppliers()->create(['file_path' => $importFileBuilder->saveToImportsDirectory()]);
+
+        $this->importFileResponse(['import' => $import->id])->assertOk();
+    }
+
+
+    #[Test]
+    public function whenRequiredColumnsAreMissingInImportFile(): void
+    {
+        $importFileBuilder = ImportFileBuilder::new(['name' => '']);
+        $import = Import::factory()->suppliers()->create(['file_path' => $importFileBuilder->saveToImportsDirectory()]);
+
+        $this->actingAsForApi(User::factory()->superuser()->create());
+
+        $this->importFileResponse(['import' => $import->id])
+            ->assertInternalServerError()
+            ->assertExactJson([
+                'status'   => 'import-errors',
+                'payload'  => null,
+                'messages' => [
+                    '' => [
+                        'Supplier ""' => [
+                            'name' =>
+                                ['The name field is required.'],
+                        ],
+                    ]
+
+                ]
+            ]);
+
+        $newSupplier = Supplier::query()
+            ->where('name', $importFileBuilder->firstRow()['name'])
+            ->get();
+
+        $this->assertCount(0, $newSupplier);
+    }
+
+
+    #[Test]
+    public function updateSupplierFromImport(): void
+    {
+        $supplier = Supplier::factory()->create()->refresh();
+        $importFileBuilder = ImportFileBuilder::new(['name' => $supplier->name, 'url' => $supplier->url, 'phone' => $supplier->phone, 'fax' => $supplier->fax, 'contact' => $supplier->contact, 'email' => $supplier->email]);
+
+        $row = $importFileBuilder->firstRow();
+        $import = Import::factory()->suppliers()->create(['file_path' => $importFileBuilder->saveToImportsDirectory()]);
+
+        $this->actingAsForApi(User::factory()->superuser()->create());
+        $this->importFileResponse(['import' => $import->id, 'import-update' => true])->assertOk();
+
+        $updatedSupplier = Supplier::query()->find($supplier->id);
+        $updatedAttributes = [
+            'name',
+            'url',
+            'phone',
+            'fax',
+            'contact',
+            'email',
+        ];
+
+        $this->assertEquals($row['name'], $updatedSupplier->name);
+
+        $this->assertEquals(
+            Arr::except($supplier->attributesToArray(), array_merge($updatedAttributes, $supplier->getDates())),
+            Arr::except($updatedSupplier->attributesToArray(), array_merge($updatedAttributes, $supplier->getDates())),
+        );
+    }
+
+}
diff --git a/tests/Feature/Importing/Api/ImportUsersTest.php b/tests/Feature/Importing/Api/ImportUsersTest.php
new file mode 100644
index 0000000000..8dcf2b2d1a
--- /dev/null
+++ b/tests/Feature/Importing/Api/ImportUsersTest.php
@@ -0,0 +1,334 @@
+<?php
+
+namespace Tests\Feature\Importing\Api;
+
+use App\Models\Asset;
+use App\Models\Import;
+use App\Models\Location;
+use App\Models\User;
+use Illuminate\Foundation\Testing\WithFaker;
+use Illuminate\Support\Arr;
+use Illuminate\Support\Facades\Hash;
+use Illuminate\Support\Facades\Notification;
+use Illuminate\Support\Str;
+use Illuminate\Testing\TestResponse;
+use PHPUnit\Framework\Attributes\Test;
+use Tests\Concerns\TestsPermissionsRequirement;
+use Tests\Support\Importing\CleansUpImportFiles;
+use Tests\Support\Importing\UsersImportFileBuilder as ImportFileBuilder;
+
+class ImportUsersTest extends ImportDataTestCase implements TestsPermissionsRequirement
+{
+    use CleansUpImportFiles;
+    use WithFaker;
+
+    protected function importFileResponse(array $parameters = []): TestResponse
+    {
+        if (!array_key_exists('import-type', $parameters)) {
+            $parameters['import-type'] = 'user';
+        }
+
+        return parent::importFileResponse($parameters);
+    }
+
+    #[Test]
+    public function testRequiresPermission()
+    {
+        $this->actingAsForApi(User::factory()->create());
+
+        $this->importFileResponse(['import' => 44])->assertForbidden();
+    }
+
+    #[Test]
+    public function userWithImportAssetsPermissionCanImportUsers(): void
+    {
+        $this->actingAsForApi(User::factory()->canImport()->create());
+
+        $import = Import::factory()->users()->create();
+
+        $this->importFileResponse(['import' => $import->id])->assertOk();
+    }
+
+    #[Test]
+    public function importUsers(): void
+    {
+        Notification::fake();
+
+        $importFileBuilder = ImportFileBuilder::new();
+        $row = $importFileBuilder->firstRow();
+        $import = Import::factory()->users()->create(['file_path' => $importFileBuilder->saveToImportsDirectory()]);
+
+        $this->actingAsForApi(User::factory()->superuser()->create());
+        $this->importFileResponse(['import' => $import->id, 'send-welcome' => 1])
+            ->assertOk()
+            ->assertExactJson([
+                'payload'  => null,
+                'status'   => 'success',
+                'messages' => ['redirect_url' => route('users.index')]
+            ]);
+
+        $newUser = User::query()
+            ->with(['company', 'location'])
+            ->where('username', $row['username'])
+            ->sole();
+
+        Notification::assertNothingSent();
+
+        $this->assertEquals($row['email'], $newUser->email);
+        $this->assertEquals($row['firstName'], $newUser->first_name);
+        $this->assertEquals($row['lastName'], $newUser->last_name);
+        $this->assertEquals($row['employeeNumber'], $newUser->employee_num);
+        $this->assertEquals($row['companyName'], $newUser->company->name);
+        $this->assertEquals($row['location'], $newUser->location->name);
+        $this->assertEquals($row['phoneNumber'], $newUser->phone);
+        $this->assertEquals($row['position'], $newUser->jobtitle);
+        $this->assertTrue(Hash::isHashed($newUser->password));
+        $this->assertEquals('', $newUser->website);
+        $this->assertEquals('', $newUser->country);
+        $this->assertEquals('', $newUser->address);
+        $this->assertEquals('', $newUser->city);
+        $this->assertEquals('', $newUser->state);
+        $this->assertEquals('', $newUser->zip);
+        $this->assertNull($newUser->permissions);
+        $this->assertNull($newUser->avatar);
+        $this->assertNull($newUser->notes);
+        $this->assertNull($newUser->skin);
+        $this->assertNull($newUser->department_id);
+        $this->assertNull($newUser->two_factor_secret);
+        $this->assertNull($newUser->idap_import);
+        $this->assertEquals('en-US', $newUser->locale);
+        $this->assertEquals(1, $newUser->show_in_list);
+        $this->assertEquals(0, $newUser->two_factor_enrolled);
+        $this->assertEquals(0, $newUser->two_factor_optin);
+        $this->assertEquals(0, $newUser->remote);
+        $this->assertEquals(0, $newUser->autoassign_licenses);
+        $this->assertEquals(0, $newUser->vip);
+        $this->assertEquals(0, $newUser->enable_sounds);
+        $this->assertEquals(0, $newUser->enable_confetti);
+        $this->assertNull($newUser->start_date);
+        $this->assertNull($newUser->end_date);
+        $this->assertNull($newUser->scim_externalid);
+        $this->assertNull($newUser->manager_id);
+        $this->assertNull($newUser->activation_code);
+        $this->assertNull($newUser->last_login);
+        $this->assertNull($newUser->persist_code);
+        $this->assertNull($newUser->reset_password_code);
+        $this->assertEquals(0, $newUser->activated);
+    }
+
+    #[Test]
+    public function willIgnoreUnknownColumnsWhenFileContainsUnknownColumns(): void
+    {
+        $row = ImportFileBuilder::new()->definition();
+        $row['unknownColumnInCsvFile'] = 'foo';
+
+        $importFileBuilder = new ImportFileBuilder([$row]);
+
+        $this->actingAsForApi(User::factory()->superuser()->create());
+
+        $import = Import::factory()->users()->create(['file_path' => $importFileBuilder->saveToImportsDirectory()]);
+
+        $this->importFileResponse(['import' => $import->id])->assertOk();
+    }
+
+    #[Test]
+    public function willNotCreateNewUserWhenUserWithUserNameAlreadyExist(): void
+    {
+        $user = User::factory()->create(['username' => Str::random()]);
+        $importFileBuilder = ImportFileBuilder::times(4)->replace(['username' => $user->username]);
+        $import = Import::factory()->users()->create(['file_path' => $importFileBuilder->saveToImportsDirectory()]);
+
+        $this->actingAsForApi(User::factory()->superuser()->create());
+        $this->importFileResponse(['import' => $import->id])->assertOk();
+
+        $probablyNewUsers = User::query()
+            ->where('username', $user->username)
+            ->get();
+
+        $this->assertCount(1, $probablyNewUsers);
+    }
+
+    #[Test]
+    public function willGenerateUsernameWhenUsernameFieldIsMissing(): void
+    {
+        $importFileBuilder = ImportFileBuilder::new()->forget('username');
+        $row = $importFileBuilder->firstRow();
+        $import = Import::factory()->users()->create(['file_path' => $importFileBuilder->saveToImportsDirectory()]);
+
+        $this->actingAsForApi(User::factory()->superuser()->create());
+        $this->importFileResponse(['import' => $import->id])->assertOk();
+
+        $newUser = User::query()
+            ->where('email', $row['email'])
+            ->sole();
+
+        $generatedUsername = User::generateFormattedNameFromFullName("{$row['firstName']} {$row['lastName']}")['username'];
+
+        $this->assertEquals($generatedUsername, $newUser->username);
+    }
+
+    #[Test]
+    public function willUpdateLocationOfAllAssetsAssignedToUser(): void
+    {
+        $user = User::factory()->create(['username' => Str::random()]);
+        $assetsAssignedToUser = Asset::factory()->create(['assigned_to' => $user->id, 'assigned_type' => User::class]);
+        $importFileBuilder = ImportFileBuilder::new(['username' => $user->username]);
+        $import = Import::factory()->users()->create(['file_path' => $importFileBuilder->saveToImportsDirectory()]);
+
+        $this->actingAsForApi(User::factory()->superuser()->create());
+        $this->importFileResponse(['import' => $import->id, 'import-update' => true])->assertOk();
+
+        $userLocation = Location::query()->where('name', $importFileBuilder->firstRow()['location'])->sole(['id']);
+
+        $this->assertEquals(
+            $userLocation->id,
+            $assetsAssignedToUser->refresh()->location_id
+        );
+    }
+
+    #[Test]
+    public function whenRequiredColumnsAreMissingInImportFile(): void
+    {
+        $importFileBuilder = ImportFileBuilder::new(['firstName' => ''])->forget(['username']);
+        $import = Import::factory()->users()->create(['file_path' => $importFileBuilder->saveToImportsDirectory()]);
+
+        $this->actingAsForApi(User::factory()->superuser()->create());
+
+        $this->importFileResponse(['import' => $import->id])
+            ->assertInternalServerError()
+            ->assertExactJson([
+                'status'   => 'import-errors',
+                'payload'  => null,
+                'messages' => [
+                    '' => [
+                        'User' => [
+                            'first_name' => ['The first name field is required.'],
+                        ]
+                    ]
+                ]
+            ]);
+
+        $newUsers = User::query()
+            ->where('email', $importFileBuilder->firstRow()['email'])
+            ->get();
+
+        $this->assertCount(0, $newUsers);
+    }
+
+    #[Test]
+    public function updateUserFromImport(): void
+    {
+        $user = User::factory()->create(['username' => Str::random()])->refresh();
+        $importFileBuilder = ImportFileBuilder::new(['username'  => $user->username]);
+
+        $row = $importFileBuilder->firstRow();
+        $import = Import::factory()->users()->create(['file_path' => $importFileBuilder->saveToImportsDirectory()]);
+
+        $this->actingAsForApi(User::factory()->superuser()->create());
+        $this->importFileResponse(['import' => $import->id, 'import-update' => true])->assertOk();
+
+        $updatedUser = User::query()->with(['company', 'location'])->find($user->id);
+        $updatedAttributes = [
+            'first_name', 'email', 'last_name', 'employee_num', 'company',
+            'location_id', 'company_id', 'updated_at', 'phone', 'jobtitle'
+        ];
+
+        $this->assertEquals($row['email'], $updatedUser->email);
+        $this->assertEquals($row['firstName'], $updatedUser->first_name);
+        $this->assertEquals($row['lastName'], $updatedUser->last_name);
+        $this->assertEquals($row['employeeNumber'], $updatedUser->employee_num);
+        $this->assertEquals($row['companyName'], $updatedUser->company->name);
+        $this->assertEquals($row['location'], $updatedUser->location->name);
+        $this->assertEquals($row['phoneNumber'], $updatedUser->phone);
+        $this->assertEquals($row['position'], $updatedUser->jobtitle);
+        $this->assertTrue(Hash::isHashed($updatedUser->password));
+
+        $this->assertEquals(
+            Arr::except($user->attributesToArray(), $updatedAttributes),
+            Arr::except($updatedUser->attributesToArray(), $updatedAttributes),
+        );
+    }
+
+    #[Test]
+    public function customColumnMapping(): void
+    {
+        $faker = ImportFileBuilder::new()->definition();
+        $row = [
+            'companyName'    => $faker['username'],
+            'email'          => $faker['position'],
+            'employeeNumber' => $faker['phoneNumber'],
+            'firstName'       => $faker['location'],
+            'lastName'       => $faker['lastName'],
+            'location'       => $faker['firstName'],
+            'phoneNumber'    => $faker['employeeNumber'],
+            'position'       => $faker['email'],
+            'username'       => $faker['companyName'],
+        ];
+
+        $importFileBuilder = new ImportFileBuilder([$row]);
+        $import = Import::factory()->users()->create(['file_path' => $importFileBuilder->saveToImportsDirectory()]);
+
+        $this->actingAsForApi(User::factory()->superuser()->create());
+
+        $this->importFileResponse([
+            'import' => $import->id,
+            'column-mappings' => [
+                'Company'         => 'username',
+                'email'           => 'jobtitle',
+                'Employee Number' => 'phone_number',
+                'First Name'      => 'location',
+                'Last Name'       => 'last_name',
+                'Location'        => 'first_name',
+                'Phone Number'    => 'employee_num',
+                'Job Title'       => 'email',
+                'Username'        => 'company',
+            ]
+        ])->assertOk();
+
+        $newUser = User::query()
+            ->with(['company', 'location'])
+            ->where('username', $row['companyName'])
+            ->sole();
+
+        $this->assertEquals($row['position'], $newUser->email);
+        $this->assertEquals($row['location'], $newUser->first_name);
+        $this->assertEquals($row['lastName'], $newUser->last_name);
+        $this->assertEquals($row['email'], $newUser->jobtitle);
+        $this->assertEquals($row['phoneNumber'], $newUser->employee_num);
+        $this->assertEquals($row['username'], $newUser->company->name);
+        $this->assertEquals($row['firstName'], $newUser->location->name);
+        $this->assertEquals($row['employeeNumber'], $newUser->phone);
+        $this->assertTrue(Hash::isHashed($newUser->password));
+        $this->assertEquals('', $newUser->website);
+        $this->assertEquals('', $newUser->country);
+        $this->assertEquals('', $newUser->address);
+        $this->assertEquals('', $newUser->city);
+        $this->assertEquals('', $newUser->state);
+        $this->assertEquals('', $newUser->zip);
+        $this->assertNull($newUser->permissions);
+        $this->assertNull($newUser->avatar);
+        $this->assertNull($newUser->notes);
+        $this->assertNull($newUser->skin);
+        $this->assertNull($newUser->department_id);
+        $this->assertNull($newUser->two_factor_secret);
+        $this->assertNull($newUser->idap_import);
+        $this->assertEquals('en-US', $newUser->locale);
+        $this->assertEquals(1, $newUser->show_in_list);
+        $this->assertEquals(0, $newUser->two_factor_enrolled);
+        $this->assertEquals(0, $newUser->two_factor_optin);
+        $this->assertEquals(0, $newUser->remote);
+        $this->assertEquals(0, $newUser->autoassign_licenses);
+        $this->assertEquals(0, $newUser->vip);
+        $this->assertEquals(0, $newUser->enable_sounds);
+        $this->assertEquals(0, $newUser->enable_confetti);
+        $this->assertNull($newUser->start_date);
+        $this->assertNull($newUser->end_date);
+        $this->assertNull($newUser->scim_externalid);
+        $this->assertNull($newUser->manager_id);
+        $this->assertNull($newUser->activation_code);
+        $this->assertNull($newUser->last_login);
+        $this->assertNull($newUser->persist_code);
+        $this->assertNull($newUser->reset_password_code);
+        $this->assertEquals(0, $newUser->activated);
+    }
+}
diff --git a/tests/Feature/Importing/Ui/ImportTest.php b/tests/Feature/Importing/Ui/ImportTest.php
new file mode 100644
index 0000000000..b549dc415d
--- /dev/null
+++ b/tests/Feature/Importing/Ui/ImportTest.php
@@ -0,0 +1,68 @@
+<?php
+
+namespace Tests\Feature\Importing\Ui;
+
+use App\Models\User;
+use Illuminate\Http\UploadedFile;
+use PHPUnit\Framework\Attributes\Test;
+use Tests\TestCase;
+
+class ImportTest extends TestCase
+{
+    public function testPageRenders()
+    {
+        $this->actingAs(User::factory()->superuser()->create())
+            ->get(route('imports.index'))
+            ->assertOk();
+    }
+
+    public function testStoreInternationalAsset(): void
+    {
+        $evil_string = 'це'; //cyrillic - windows-1251 (ONE)
+        $csv_contents = "a,b,c\n$evil_string,$evil_string,$evil_string\n";
+
+        // now, deliberately transform our UTF-8 into Windows-1251 so we can test out the character-set detection
+        $transliterated_contents = iconv('UTF-8', 'WINDOWS-1251', $csv_contents);
+        //\Log::error("RAW TRANSLITERATED CONTENTS: $transliterated_contents"); // should show 'unicode missing glyph' symbol in logs.
+
+        $this->actingAsForApi(User::factory()->superuser()->create());
+        $results = $this->post(route('api.imports.store'), ['files' => [UploadedFile::fake()->createWithContent("myname.csv", $transliterated_contents)]])
+            ->assertOk()
+            ->assertJsonStructure([
+                "files" => [
+                    [
+                        "created_at",
+                        "field_map",
+                        "file_path",
+                        "filesize",
+                        "first_row",
+                        "header_row",
+                        "id",
+                        "import_type",
+                        "name",
+                    ]
+                ]
+            ]);
+        $this->assertEquals($evil_string, $results->json()['files'][0]['first_row'][0]);
+    }
+
+    public function testStoreInternationalAssetMisparse(): void
+    {
+        $evil_maker = function ($arr) {
+            $results = '';
+            foreach ($arr as $thing) {
+                $results .= chr($thing);
+            }
+            return $results;
+        };
+
+        // 0xC0 makes it 'not unicode', and 0xFF makes it 'likely WINDOWS-1251', and 0x98 at the end makes it 'not-valid-Windows-1251'
+        $evil_content = $evil_maker([0xC0, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x00, 0x01, 0x02, 0x03, 0x98]);
+
+        $this->actingAsForApi(User::factory()->superuser()->create());
+        $results = $this->post(route('api.imports.store'), ['files' => [UploadedFile::fake()->createWithContent("myname.csv", $evil_content)]])
+            ->assertStatus(422)
+            ->assertStatusMessageIs('error')
+            ->assertMessagesAre(trans('admin/hardware/message.import.transliterate_failure', ["encoding" => "windows-1251"]));
+    }
+}
diff --git a/tests/Feature/Licenses/Api/DeleteLicensesTest.php b/tests/Feature/Licenses/Api/DeleteLicensesTest.php
new file mode 100644
index 0000000000..7db8e588d3
--- /dev/null
+++ b/tests/Feature/Licenses/Api/DeleteLicensesTest.php
@@ -0,0 +1,90 @@
+<?php
+
+namespace Tests\Feature\Licenses\Api;
+
+use App\Models\Company;
+use App\Models\License;
+use App\Models\User;
+use Tests\Concerns\TestsFullMultipleCompaniesSupport;
+use Tests\Concerns\TestsPermissionsRequirement;
+use Tests\TestCase;
+
+class DeleteLicensesTest extends TestCase implements TestsFullMultipleCompaniesSupport, TestsPermissionsRequirement
+{
+    public function testRequiresPermission()
+    {
+        $license = License::factory()->create();
+
+        $this->actingAsForApi(User::factory()->create())
+            ->deleteJson(route('api.licenses.destroy', $license))
+            ->assertForbidden();
+
+        $this->assertNotSoftDeleted($license);
+    }
+
+    public function testAdheresToFullMultipleCompaniesSupportScoping()
+    {
+        [$companyA, $companyB] = Company::factory()->count(2)->create();
+
+        $licenseA = License::factory()->for($companyA)->create();
+        $licenseB = License::factory()->for($companyB)->create();
+        $licenseC = License::factory()->for($companyB)->create();
+
+        $superUser = $companyA->users()->save(User::factory()->superuser()->make());
+        $userInCompanyA = $companyA->users()->save(User::factory()->deleteLicenses()->make());
+        $userInCompanyB = $companyB->users()->save(User::factory()->deleteLicenses()->make());
+
+        $this->settings->enableMultipleFullCompanySupport();
+
+        $this->actingAsForApi($userInCompanyA)
+            ->deleteJson(route('api.licenses.destroy', $licenseB))
+            ->assertStatusMessageIs('error');
+
+        $this->actingAsForApi($userInCompanyB)
+            ->deleteJson(route('api.licenses.destroy', $licenseA))
+            ->assertStatusMessageIs('error');
+
+        $this->actingAsForApi($superUser)
+            ->deleteJson(route('api.licenses.destroy', $licenseC))
+            ->assertStatusMessageIs('success');
+
+        $this->assertNotSoftDeleted($licenseA);
+        $this->assertNotSoftDeleted($licenseB);
+        $this->assertSoftDeleted($licenseC);
+    }
+
+    public function testLicenseCannotBeDeletedIfStillAssigned()
+    {
+        $license = License::factory()->create(['seats' => 2]);
+        $license->freeSeat()->update(['assigned_to' => User::factory()->create()->id]);
+
+        $this->actingAsForApi(User::factory()->deleteLicenses()->create())
+            ->deleteJson(route('api.licenses.destroy', $license))
+            ->assertStatusMessageIs('error');
+
+        $this->assertNotSoftDeleted($license);
+    }
+
+    public function testCanDeleteLicense()
+    {
+        $license = License::factory()->create();
+
+        $this->actingAsForApi(User::factory()->deleteLicenses()->create())
+            ->deleteJson(route('api.licenses.destroy', $license))
+            ->assertStatusMessageIs('success');
+
+        $this->assertSoftDeleted($license);
+    }
+
+    public function testLicenseSeatsAreDeletedWhenLicenseIsDeleted()
+    {
+        $license = License::factory()->create(['seats' => 2]);
+
+        $this->assertTrue($license->fresh()->licenseseats->isNotEmpty(), 'License seats not created like expected');
+
+        $this->actingAsForApi(User::factory()->deleteLicenses()->create())
+            ->deleteJson(route('api.licenses.destroy', $license));
+
+        $this->assertTrue($license->fresh()->licenseseats->isEmpty());
+    }
+}
diff --git a/tests/Feature/Licenses/Ui/CreateLicenseTest.php b/tests/Feature/Licenses/Ui/CreateLicenseTest.php
new file mode 100644
index 0000000000..33f825bf95
--- /dev/null
+++ b/tests/Feature/Licenses/Ui/CreateLicenseTest.php
@@ -0,0 +1,47 @@
+<?php
+
+namespace Tests\Feature\Licenses\Ui;
+
+use App\Models\AssetModel;
+use App\Models\Category;
+use App\Models\License;
+use App\Models\Depreciation;
+use App\Models\User;
+use Tests\TestCase;
+
+class CreateLicenseTest extends TestCase
+{
+    public function testPermissionRequiredToViewLicense()
+    {
+        $license = License::factory()->create();
+        $this->actingAs(User::factory()->create())
+            ->get(route('licenses.create', $license))
+            ->assertForbidden();
+    }
+
+    public function testPageRenders()
+    {
+        $this->actingAs(User::factory()->superuser()->create())
+            ->get(route('licenses.create'))
+            ->assertOk();
+    }
+
+    public function testLicenseWithoutPurchaseDateFailsValidation()
+    {
+        $response = $this->actingAs(User::factory()->superuser()->create())
+            ->from(route('licenses.create'))
+            ->post(route('licenses.store'), [
+                'name' => 'Test Invalid License',
+                'seats' => '10',
+                'category_id' => Category::factory()->forLicenses()->create()->id,
+                'depreciation_id' => Depreciation::factory()->create()->id
+            ]);
+        $response->assertStatus(302);
+        $response->assertRedirect(route('licenses.create'));
+        $response->assertInvalid(['purchase_date']);
+        $response->assertSessionHasErrors(['purchase_date']);
+        $this->followRedirects($response)->assertSee(trans('general.error'));
+        $this->assertFalse(AssetModel::where('name', 'Test Invalid License')->exists());
+
+    }
+}
diff --git a/tests/Feature/Licenses/Ui/LicenseIndexTest.php b/tests/Feature/Licenses/Ui/LicenseIndexTest.php
new file mode 100644
index 0000000000..3eb33e5ee4
--- /dev/null
+++ b/tests/Feature/Licenses/Ui/LicenseIndexTest.php
@@ -0,0 +1,23 @@
+<?php
+
+namespace Tests\Feature\Licenses\Ui;
+
+use App\Models\User;
+use Tests\TestCase;
+
+class LicenseIndexTest extends TestCase
+{
+    public function testPermissionRequiredToViewLicenseList()
+    {
+        $this->actingAs(User::factory()->create())
+            ->get(route('licenses.index'))
+            ->assertForbidden();
+    }
+
+    public function testUserCanListLicenses()
+    {
+        $this->actingAs(User::factory()->superuser()->create())
+            ->get(route('licenses.index'))
+            ->assertOk();
+    }
+}
diff --git a/tests/Feature/Licenses/Ui/LicenseViewTest.php b/tests/Feature/Licenses/Ui/LicenseViewTest.php
new file mode 100644
index 0000000000..8bf5bf77fa
--- /dev/null
+++ b/tests/Feature/Licenses/Ui/LicenseViewTest.php
@@ -0,0 +1,38 @@
+<?php
+
+namespace Tests\Feature\Licenses\Ui;
+
+use App\Models\License;
+use App\Models\Depreciation;
+use App\Models\User;
+use Tests\TestCase;
+
+class LicenseViewTest extends TestCase
+{
+    public function testPermissionRequiredToViewLicense()
+    {
+        $license = License::factory()->create();
+        $this->actingAs(User::factory()->create())
+            ->get(route('licenses.show', $license))
+            ->assertForbidden();
+    }
+
+    public function testPageRenders()
+    {
+        $this->actingAs(User::factory()->superuser()->create())
+            ->get(route('licenses.show', License::factory()->create()->id))
+            ->assertOk();
+    }
+    
+    public function testLicenseWithPurchaseDateDepreciatesCorrectly()
+    {
+        $depreciation = Depreciation::factory()->create(['months' => 12]);
+        $license = License::factory()->create(['depreciation_id' => $depreciation->id, 'purchase_date' => '2020-01-01']);
+        $this->actingAs(User::factory()->superuser()->create())
+            ->get(route('licenses.show', $license))
+            ->assertOk()
+            ->assertSee([
+                '2021-01-01'
+            ], false);
+    }
+}
diff --git a/tests/Feature/Licenses/Ui/StoreLicenseWithFullMultipleCompanySupportTest.php b/tests/Feature/Licenses/Ui/StoreLicenseWithFullMultipleCompanySupportTest.php
new file mode 100644
index 0000000000..de6ffbaaee
--- /dev/null
+++ b/tests/Feature/Licenses/Ui/StoreLicenseWithFullMultipleCompanySupportTest.php
@@ -0,0 +1,34 @@
+<?php
+
+namespace Tests\Feature\Licenses\Ui;
+
+use App\Models\Category;
+use App\Models\License;
+use PHPUnit\Framework\Attributes\DataProvider;
+use Tests\Support\ProvidesDataForFullMultipleCompanySupportTesting;
+use Tests\TestCase;
+
+class StoreLicenseWithFullMultipleCompanySupportTest extends TestCase
+{
+    use ProvidesDataForFullMultipleCompanySupportTesting;
+
+    #[DataProvider('dataForFullMultipleCompanySupportTesting')]
+    public function testAdheresToFullMultipleCompaniesSupportScoping($data)
+    {
+        ['actor' => $actor, 'company_attempting_to_associate' => $company, 'assertions' => $assertions] = $data();
+
+        $this->settings->enableMultipleFullCompanySupport();
+
+        $this->actingAs($actor)
+            ->post(route('licenses.store'), [
+                'name' => 'My Cool License',
+                'seats' => '1',
+                'category_id' => Category::factory()->forLicenses()->create()->id,
+                'company_id' => $company->id,
+            ]);
+
+        $license = License::where('name', 'My Cool License')->sole();
+
+        $assertions($license);
+    }
+}
diff --git a/tests/Feature/Licenses/Ui/UpdateLicenseTest.php b/tests/Feature/Licenses/Ui/UpdateLicenseTest.php
new file mode 100644
index 0000000000..7b1b5b29e3
--- /dev/null
+++ b/tests/Feature/Licenses/Ui/UpdateLicenseTest.php
@@ -0,0 +1,17 @@
+<?php
+
+namespace Tests\Feature\Licenses\Ui;
+
+use App\Models\License;
+use App\Models\User;
+use Tests\TestCase;
+
+class UpdateLicenseTest extends TestCase
+{
+    public function testPageRenders()
+    {
+        $this->actingAs(User::factory()->superuser()->create())
+            ->get(route('licenses.edit', License::factory()->create()->id))
+            ->assertOk();
+    }
+}
diff --git a/tests/Feature/Livewire/CategoryEditFormTest.php b/tests/Feature/Livewire/CategoryEditFormTest.php
index a439f544ac..4596af120a 100644
--- a/tests/Feature/Livewire/CategoryEditFormTest.php
+++ b/tests/Feature/Livewire/CategoryEditFormTest.php
@@ -10,7 +10,10 @@ class CategoryEditFormTest extends TestCase
 {
     public function testTheComponentCanRender()
     {
-        Livewire::test(CategoryEditForm::class)->assertStatus(200);
+        Livewire::test(CategoryEditForm::class, [
+            'sendCheckInEmail' => true,
+            'useDefaultEula' => true,
+        ])->assertStatus(200);
     }
 
     public function testSendEmailCheckboxIsCheckedOnLoadWhenSendEmailIsExistingSetting()
diff --git a/tests/Feature/Livewire/ImporterTest.php b/tests/Feature/Livewire/ImporterTest.php
new file mode 100644
index 0000000000..b8af8f9bc0
--- /dev/null
+++ b/tests/Feature/Livewire/ImporterTest.php
@@ -0,0 +1,25 @@
+<?php
+
+namespace Tests\Feature\Livewire;
+
+use App\Livewire\Importer;
+use App\Models\User;
+use Livewire\Livewire;
+use Tests\TestCase;
+
+class ImporterTest extends TestCase
+{
+    public function testRendersSuccessfully()
+    {
+        Livewire::actingAs(User::factory()->canImport()->create())
+            ->test(Importer::class)
+            ->assertStatus(200);
+    }
+
+    public function testRequiresPermission()
+    {
+        Livewire::actingAs(User::factory()->create())
+            ->test(Importer::class)
+            ->assertStatus(403);
+    }
+}
diff --git a/tests/Feature/Locations/Api/CreateLocationsTest.php b/tests/Feature/Locations/Api/CreateLocationsTest.php
new file mode 100644
index 0000000000..0a75517f31
--- /dev/null
+++ b/tests/Feature/Locations/Api/CreateLocationsTest.php
@@ -0,0 +1,76 @@
+<?php
+
+namespace Tests\Feature\Locations\Api;
+
+use App\Models\Location;
+use App\Models\User;
+use Tests\TestCase;
+
+class CreateLocationsTest extends TestCase
+{
+
+    public function testRequiresPermissionToCreateLocation()
+    {
+        $this->actingAsForApi(User::factory()->create())
+            ->postJson(route('api.departments.store'))
+            ->assertForbidden();
+    }
+
+
+    public function testCanCreateLocation()
+    {
+        $response = $this->actingAsForApi(User::factory()->superuser()->create())
+            ->postJson(route('api.locations.store'), [
+                'name' => 'Test Location',
+                'notes' => 'Test Note',
+            ])
+            ->assertOk()
+            ->assertStatusMessageIs('success')
+            ->assertStatus(200)
+            ->json();
+
+        $this->assertTrue(Location::where('name', 'Test Location')->exists());
+
+        $department = Location::find($response['payload']['id']);
+        $this->assertEquals('Test Location', $department->name);
+        $this->assertEquals('Test Note', $department->notes);
+    }
+
+    public function testCannotCreateNewLocationsWithTheSameName()
+    {
+        $location = Location::factory()->create();
+        $location2 = Location::factory()->create();
+
+        $this->actingAsForApi(User::factory()->superuser()->create())
+            ->patchJson(route('api.locations.update', $location2), [
+                'name' => $location->name,
+            ])
+            ->assertOk()
+            ->assertStatusMessageIs('error')
+            ->assertStatus(200)
+            ->json();
+
+
+    }
+
+    public function testUserCannotCreateLocationsThatAreTheirOwnParent()
+    {
+        $location = Location::factory()->create();
+
+        $this->actingAsForApi(User::factory()->superuser()->create())
+            ->patchJson(route('api.locations.update', $location), [
+                'parent_id' => $location->id,
+            ])
+            ->assertOk()
+            ->assertStatusMessageIs('error')
+            ->assertJson([
+                'messages' => [
+                    'parent_id'    => ['The parent id must not create a circular reference.'],
+                ],
+            ])
+            ->json();
+
+
+    }
+
+}
diff --git a/tests/Feature/Locations/Api/DeleteLocationsTest.php b/tests/Feature/Locations/Api/DeleteLocationsTest.php
new file mode 100644
index 0000000000..796b9a1977
--- /dev/null
+++ b/tests/Feature/Locations/Api/DeleteLocationsTest.php
@@ -0,0 +1,115 @@
+<?php
+
+namespace Tests\Feature\Locations\Api;
+
+use App\Models\Asset;
+use App\Models\Location;
+use App\Models\User;
+use Tests\Concerns\TestsPermissionsRequirement;
+use Tests\TestCase;
+
+class DeleteLocationsTest extends TestCase implements TestsPermissionsRequirement
+{
+    public function testRequiresPermission()
+    {
+        $location = Location::factory()->create();
+
+        $this->actingAsForApi(User::factory()->create())
+            ->deleteJson(route('api.locations.destroy', $location))
+            ->assertForbidden();
+
+        $this->assertNotSoftDeleted($location);
+    }
+
+    public function testErrorReturnedViaApiIfLocationDoesNotExist()
+    {
+        $this->actingAsForApi(User::factory()->superuser()->create())
+            ->deleteJson(route('api.users.destroy', 'invalid-id'))
+            ->assertOk()
+            ->assertStatus(200)
+            ->assertStatusMessageIs('error')
+            ->json();
+    }
+
+    public function testErrorReturnedViaApiIfLocationIsAlreadyDeleted()
+    {
+        $location = Location::factory()->deletedLocation()->create();
+        $this->actingAsForApi(User::factory()->superuser()->create())
+            ->deleteJson(route('api.locations.destroy', $location->id))
+            ->assertOk()
+            ->assertStatus(200)
+            ->assertStatusMessageIs('error')
+            ->json();
+    }
+
+    public function testDisallowLocationDeletionViaApiIfStillHasPeople()
+    {
+        $location = Location::factory()->create();
+        User::factory()->count(5)->create(['location_id' => $location->id]);
+
+        $this->assertFalse($location->isDeletable());
+
+        $this->actingAsForApi(User::factory()->superuser()->create())
+            ->deleteJson(route('api.locations.destroy', $location->id))
+            ->assertOk()
+            ->assertStatus(200)
+            ->assertStatusMessageIs('error')
+            ->json();
+    }
+
+    public function testDisallowUserDeletionViaApiIfStillHasChildLocations()
+    {
+        $parent = Location::factory()->create();
+        Location::factory()->count(5)->create(['parent_id' => $parent->id]);
+        $this->assertFalse($parent->isDeletable());
+
+        $this->actingAsForApi(User::factory()->superuser()->create())
+            ->deleteJson(route('api.locations.destroy', $parent->id))
+            ->assertOk()
+            ->assertStatus(200)
+            ->assertStatusMessageIs('error')
+            ->json();
+    }
+
+    public function testDisallowUserDeletionViaApiIfStillHasAssetsAssigned()
+    {
+        $location = Location::factory()->create();
+        Asset::factory()->count(5)->assignedToLocation($location)->create();
+
+        $this->assertFalse($location->isDeletable());
+
+        $this->actingAsForApi(User::factory()->superuser()->create())
+            ->deleteJson(route('api.locations.destroy', $location->id))
+            ->assertOk()
+            ->assertStatus(200)
+            ->assertStatusMessageIs('error')
+            ->json();
+    }
+
+    public function testDisallowUserDeletionViaApiIfStillHasAssetsAsLocation()
+    {
+        $location = Location::factory()->create();
+        Asset::factory()->count(5)->create(['location_id' => $location->id]);
+
+        $this->assertFalse($location->isDeletable());
+
+        $this->actingAsForApi(User::factory()->superuser()->create())
+            ->deleteJson(route('api.locations.destroy', $location->id))
+            ->assertOk()
+            ->assertStatus(200)
+            ->assertStatusMessageIs('error')
+            ->json();
+    }
+
+    public function testCanDeleteLocation()
+    {
+        $location = Location::factory()->create();
+
+        $this->actingAsForApi(User::factory()->deleteLocations()->create())
+            ->deleteJson(route('api.locations.destroy', $location->id))
+            ->assertOk()
+            ->assertStatusMessageIs('success');
+
+        $this->assertSoftDeleted($location);
+    }
+}
diff --git a/tests/Feature/Locations/Api/IndexLocationsTest.php b/tests/Feature/Locations/Api/IndexLocationsTest.php
new file mode 100644
index 0000000000..7b3b104638
--- /dev/null
+++ b/tests/Feature/Locations/Api/IndexLocationsTest.php
@@ -0,0 +1,45 @@
+<?php
+
+namespace Tests\Feature\Locations\Api;
+
+use App\Models\Company;
+use App\Models\Location;
+use App\Models\User;
+use Illuminate\Testing\Fluent\AssertableJson;
+use Tests\TestCase;
+
+class IndexLocationsTest extends TestCase
+{
+    public function testViewingLocationIndexRequiresAuthentication()
+    {
+        $this->getJson(route('api.locations.index'))->assertRedirect();
+    }
+
+    public function testViewingLocationIndexRequiresPermission()
+    {
+        $this->actingAsForApi(User::factory()->create())
+            ->getJson(route('api.locations.index'))
+            ->assertForbidden();
+    }
+
+    public function testLocationIndexReturnsExpectedLocations()
+    {
+        Location::factory()->count(3)->create();
+
+        $this->actingAsForApi(User::factory()->superuser()->create())
+            ->getJson(
+                route('api.locations.index', [
+                    'sort' => 'name',
+                    'order' => 'asc',
+                    'offset' => '0',
+                    'limit' => '20',
+                ]))
+            ->assertOk()
+            ->assertJsonStructure([
+                'total',
+                'rows',
+            ])
+            ->assertJson(fn(AssertableJson $json) => $json->has('rows', 3)->etc());
+    }
+
+}
diff --git a/tests/Feature/Locations/Api/LocationsViewTest.php b/tests/Feature/Locations/Api/LocationsViewTest.php
new file mode 100644
index 0000000000..cec020d1ca
--- /dev/null
+++ b/tests/Feature/Locations/Api/LocationsViewTest.php
@@ -0,0 +1,61 @@
+<?php
+
+namespace Tests\Feature\Locations\Api;
+
+use App\Models\Location;
+use App\Models\Asset;
+use App\Models\User;
+use Tests\TestCase;
+
+class LocationsViewTest extends TestCase
+{
+    public function testViewingLocationRequiresPermission()
+    {
+        $location = Location::factory()->create();
+        $this->actingAsForApi(User::factory()->create())
+            ->getJson(route('api.locations.show', $location->id))
+            ->assertForbidden();
+    }
+
+    public function testViewingLocationAssetIndexRequiresPermission()
+    {
+        $location = Location::factory()->create();
+        $this->actingAsForApi(User::factory()->create())
+            ->getJson(route('api.locations.viewassets', $location->id))
+            ->assertForbidden();
+    }
+
+    public function testViewingLocationAssetIndex()
+    {
+        $location = Location::factory()->create();
+        Asset::factory()->count(3)->create(['location_id' => $location->id]);
+
+        $this->actingAsForApi(User::factory()->superuser()->create())
+            ->getJson(route('api.locations.viewassets', $location->id))
+            ->assertOk()
+            ->assertJsonStructure([
+                'total',
+                'rows',
+            ])
+            ->assertJson([
+                'total' => 3,
+            ]);
+    }
+
+    public function testViewingAssignedLocationAssetIndex()
+    {
+        $location = Location::factory()->create();
+        Asset::factory()->count(3)->assignedToLocation($location)->create();
+
+        $this->actingAsForApi(User::factory()->superuser()->create())
+            ->getJson(route('api.locations.assigned_assets', $location->id))
+            ->assertOk()
+            ->assertJsonStructure([
+                'total',
+                'rows',
+            ])
+            ->assertJson([
+                'total' => 3,
+            ]);
+    }
+}
diff --git a/tests/Feature/Locations/Api/UpdateLocationsTest.php b/tests/Feature/Locations/Api/UpdateLocationsTest.php
new file mode 100644
index 0000000000..a169ba87bf
--- /dev/null
+++ b/tests/Feature/Locations/Api/UpdateLocationsTest.php
@@ -0,0 +1,40 @@
+<?php
+
+namespace Tests\Feature\Locations\Api;
+
+use App\Models\Location;
+use App\Models\User;
+use Tests\TestCase;
+
+class UpdateLocationsTest extends TestCase
+{
+
+    public function testRequiresPermissionToEditLocation()
+    {
+        $this->actingAsForApi(User::factory()->create())
+            ->postJson(route('api.locations.store', Location::factory()->create()))
+            ->assertForbidden();
+    }
+
+    public function testCanUpdateLocationViaPatch()
+    {
+        $location = Location::factory()->create();
+
+        $this->actingAsForApi(User::factory()->superuser()->create())
+            ->patchJson(route('api.locations.update', $location), [
+                'name' => 'Test Updated Location',
+                'notes' => 'Test Updated Note',
+            ])
+            ->assertOk()
+            ->assertStatusMessageIs('success')
+            ->assertStatus(200)
+            ->json();
+
+        $location->refresh();
+        $this->assertEquals('Test Updated Location', $location->name, 'Name was not updated');
+        $this->assertEquals('Test Updated Note', $location->notes, 'Note was not updated');
+
+    }
+
+    
+}
diff --git a/tests/Feature/Locations/Ui/CreateLocationsTest.php b/tests/Feature/Locations/Ui/CreateLocationsTest.php
new file mode 100644
index 0000000000..794ee06c67
--- /dev/null
+++ b/tests/Feature/Locations/Ui/CreateLocationsTest.php
@@ -0,0 +1,58 @@
+<?php
+
+namespace Tests\Feature\Locations\Ui;
+
+use App\Models\Location;
+use App\Models\Company;
+use App\Models\User;
+use Tests\TestCase;
+
+class CreateLocationsTest extends TestCase
+{
+    public function testPermissionRequiredToCreateLocation()
+    {
+        $this->actingAs(User::factory()->create())
+            ->post(route('locations.store'), [
+                'name' => 'Test Location',
+                'company_id' => Company::factory()->create()->id
+            ])
+            ->assertForbidden();
+    }
+
+    public function testPageRenders()
+    {
+        $this->actingAs(User::factory()->superuser()->create())
+            ->get(route('locations.create'))
+            ->assertOk();
+    }
+
+    public function testUserCanCreateLocations()
+    {
+        $this->assertFalse(Location::where('name', 'Test Location')->exists());
+
+        $this->actingAs(User::factory()->superuser()->create())
+            ->post(route('locations.store'), [
+                'name' => 'Test Location',
+                'notes' => 'Test Note',
+            ])
+            ->assertRedirect(route('locations.index'));
+
+        $this->assertTrue(Location::where('name', 'Test Location')->where('notes', 'Test Note')->exists());
+    }
+
+    public function testUserCannotCreateLocationsWithInvalidParent()
+    {
+        $this->assertFalse(Location::where('name', 'Test Location')->exists());
+
+        $this->actingAs(User::factory()->superuser()->create())
+            ->from(route('locations.create'))
+            ->post(route('locations.store'), [
+                'name' => 'Test Location',
+                'parent_id' => '100000000'
+            ])
+            ->assertRedirect(route('locations.create'));
+
+        $this->assertFalse(Location::where('name', 'Test Location')->exists());
+    }
+
+}
diff --git a/tests/Feature/Locations/Ui/IndexLocationsTest.php b/tests/Feature/Locations/Ui/IndexLocationsTest.php
new file mode 100644
index 0000000000..43f117cb64
--- /dev/null
+++ b/tests/Feature/Locations/Ui/IndexLocationsTest.php
@@ -0,0 +1,23 @@
+<?php
+
+namespace Tests\Feature\Locations\Ui;
+
+use App\Models\User;
+use Tests\TestCase;
+
+class IndexLocationsTest extends TestCase
+{
+    public function testPermissionRequiredToViewLocationsList()
+    {
+        $this->actingAs(User::factory()->create())
+            ->get(route('locations.index'))
+            ->assertForbidden();
+    }
+
+    public function testUserCanListLocations()
+    {
+        $this->actingAs(User::factory()->superuser()->create())
+            ->get(route('locations.index'))
+            ->assertOk();
+    }
+}
diff --git a/tests/Feature/Locations/Ui/ShowLocationTest.php b/tests/Feature/Locations/Ui/ShowLocationTest.php
new file mode 100644
index 0000000000..023ba06dff
--- /dev/null
+++ b/tests/Feature/Locations/Ui/ShowLocationTest.php
@@ -0,0 +1,40 @@
+<?php
+
+namespace Tests\Feature\Locations\Ui;
+
+use App\Models\Location;
+use App\Models\User;
+use Tests\TestCase;
+
+class ShowLocationTest extends TestCase
+{
+    public function testPageRenders()
+    {
+        $this->actingAs(User::factory()->superuser()->create())
+            ->get(route('locations.show', Location::factory()->create()))
+            ->assertOk();
+    }
+
+    public function testDeniesAccessToRegularUser()
+    {
+        $this->actingAs(User::factory()->create())
+            ->get(route('locations.show', Location::factory()->create()))
+            ->assertStatus(403)
+            ->assertForbidden();
+    }
+
+    public function testDeniesPrintAccessToRegularUser()
+    {
+        $this->actingAs(User::factory()->create())
+            ->get(route('locations.print_all_assigned', Location::factory()->create()))
+            ->assertStatus(403)
+            ->assertForbidden();
+    }
+
+    public function testPageRendersForSuperAdmin()
+    {
+        $this->actingAs(User::factory()->superuser()->create())
+            ->get(route('locations.print_all_assigned', Location::factory()->create()))
+            ->assertOk();
+    }
+}
diff --git a/tests/Feature/Locations/Ui/UpdateLocationsTest.php b/tests/Feature/Locations/Ui/UpdateLocationsTest.php
new file mode 100644
index 0000000000..a4c6e9c6b0
--- /dev/null
+++ b/tests/Feature/Locations/Ui/UpdateLocationsTest.php
@@ -0,0 +1,113 @@
+<?php
+
+namespace Tests\Feature\Locations\Ui;
+
+use App\Models\Location;
+use App\Models\User;
+use App\Models\Actionlog;
+use Tests\TestCase;
+use Illuminate\Http\UploadedFile;
+use Illuminate\Support\Facades\Storage;
+
+class UpdateLocationsTest extends TestCase
+{
+    public function testPermissionRequiredToStoreLocation()
+    {
+        $this->actingAs(User::factory()->create())
+            ->post(route('locations.store'), [
+                'name' => 'Test Location',
+            ])
+            ->assertStatus(403)
+            ->assertForbidden();
+    }
+
+    public function testPageRenders()
+    {
+        $this->actingAs(User::factory()->superuser()->create())
+            ->get(route('locations.edit', Location::factory()->create()))
+            ->assertOk();
+    }
+
+    public function testUserCanEditLocations()
+    {
+        $location = Location::factory()->create(['name' => 'Test Location']);
+        $this->assertTrue(Location::where('name', 'Test Location')->exists());
+
+        $response = $this->actingAs(User::factory()->superuser()->create())
+            ->put(route('locations.update', ['location' => $location]), [
+                'name' => 'Test Location Edited',
+                'notes' => 'Test Note Edited',
+            ])
+            ->assertStatus(302)
+            ->assertSessionHasNoErrors()
+            ->assertRedirect(route('locations.index'));
+
+        $this->followRedirects($response)->assertSee('Success');
+        $this->assertTrue(Location::where('name', 'Test Location Edited')->where('notes', 'Test Note Edited')->exists());
+    }
+
+    public function testUserCannotEditLocationsToMakeThemTheirOwnParent()
+    {
+        $location = Location::factory()->create();
+
+        $response = $this->actingAs(User::factory()->superuser()->create())
+            ->from(route('locations.edit', $location))
+            ->put(route('locations.update', $location), [
+                'name' => 'Test Location',
+                'parent_id' => $location->id,
+            ])
+            ->assertRedirect(route('locations.edit', ['location' => $location]));
+
+        $this->followRedirects($response)->assertSee(trans('general.error'));
+        $this->assertFalse(Location::where('name', 'Test Location')->exists());
+    }
+
+    public function testUserCannotEditLocationsWithInvalidParent()
+    {
+        $location = Location::factory()->create();
+        $response = $this->actingAs(User::factory()->superuser()->create())
+            ->from(route('locations.edit', $location))
+            ->put(route('locations.update', ['location' => $location]), [
+                'name' => 'Test Location',
+                'parent_id' => '100000000'
+            ])
+            ->assertRedirect(route('locations.edit', ['location' => $location->id]));
+
+        $this->followRedirects($response)->assertSee(trans('general.error'));
+        $this->assertFalse(Location::where('name', 'Test Location')->exists());
+    }
+
+
+    public function testFileIsUploadedAndLogged()
+    {
+        $location = Location::factory()->create();
+        Storage::fake('local');
+        $file = UploadedFile::fake()->image('file.jpg', 100, 100)->size(100);
+
+        $this->actingAs(User::factory()->superuser()->create())
+            ->post(route('upload/locations', $location), [
+            'file' => [$file],
+            'notes' => 'Test Upload',
+        ])
+            ->assertStatus(302)
+            ->assertSessionHasNoErrors();
+
+
+        $location->refresh();
+
+        $logentry = Actionlog::where('item_type', Location::class)
+            ->where('item_id', $location->id)
+            ->where('action_type', 'uploaded')
+            ->first();
+
+        $this->assertTrue(Actionlog::where('item_type', Location:: class)->where('item_id', $location->id)->where('filename', $logentry->filename)->exists());
+
+
+        // Assert the file was stored...
+        // This doesn't work with the way we handle files :( Should try to fix this.
+        // Storage::disk('local')->assertExists($logentry->filename);
+
+    }
+
+
+}
diff --git a/tests/Feature/Manufacturers/Api/CreateManufacturersTest.php b/tests/Feature/Manufacturers/Api/CreateManufacturersTest.php
new file mode 100644
index 0000000000..9dc953148e
--- /dev/null
+++ b/tests/Feature/Manufacturers/Api/CreateManufacturersTest.php
@@ -0,0 +1,39 @@
+<?php
+
+namespace Tests\Feature\Manufacturers\Api;
+
+use App\Models\Manufacturer;
+use App\Models\User;
+use Tests\TestCase;
+
+class CreateManufacturersTest extends TestCase
+{
+
+
+    public function testRequiresPermissionToCreateDepartment()
+    {
+        $this->actingAsForApi(User::factory()->create())
+            ->postJson(route('api.departments.store'))
+            ->assertForbidden();
+    }
+
+    public function testCanCreateManufacturer()
+    {
+        $response = $this->actingAsForApi(User::factory()->superuser()->create())
+            ->postJson(route('api.manufacturers.store'), [
+                'name' => 'Test Manufacturer',
+                'notes' => 'Test Note',
+            ])
+            ->assertOk()
+            ->assertStatusMessageIs('success')
+            ->assertStatus(200)
+            ->json();
+
+        $this->assertTrue(Manufacturer::where('name', 'Test Manufacturer')->where('notes', 'Test Note')->exists());
+
+        $manufacturer = Manufacturer::find($response['payload']['id']);
+        $this->assertEquals('Test Manufacturer', $manufacturer->name);
+        $this->assertEquals('Test Note', $manufacturer->notes);
+    }
+
+}
diff --git a/tests/Feature/Manufacturers/Api/DeleteManufacturersTest.php b/tests/Feature/Manufacturers/Api/DeleteManufacturersTest.php
new file mode 100644
index 0000000000..a5fbb5ee0a
--- /dev/null
+++ b/tests/Feature/Manufacturers/Api/DeleteManufacturersTest.php
@@ -0,0 +1,64 @@
+<?php
+
+namespace Tests\Feature\Manufacturers\Api;
+
+use App\Models\Asset;
+use App\Models\AssetModel;
+use App\Models\Manufacturer;
+use App\Models\User;
+use Tests\Concerns\TestsPermissionsRequirement;
+use Tests\TestCase;
+
+class DeleteManufacturersTest extends TestCase implements TestsPermissionsRequirement
+{
+    public function testRequiresPermission()
+    {
+        $manufacturer = Manufacturer::factory()->create();
+
+        $this->actingAsForApi(User::factory()->create())
+            ->deleteJson(route('api.manufacturers.destroy', $manufacturer))
+            ->assertForbidden();
+
+        $this->assertNotSoftDeleted($manufacturer);
+    }
+
+    public function testCannotDeleteManufacturerWithAssociatedData()
+    {
+        $manufacturerWithAccessories = Manufacturer::factory()->hasAccessories()->create();
+        $manufacturerWithConsumables = Manufacturer::factory()->hasConsumables()->create();
+        $manufacturerWithLicenses = Manufacturer::factory()->hasLicenses()->create();
+
+        $manufacturerWithAssets = Manufacturer::factory()->hasAssets()->create();
+        $model = AssetModel::factory()->create(['manufacturer_id' => $manufacturerWithAssets->id]);
+        Asset::factory()->create(['model_id' => $model->id]);
+
+        $this->assertGreaterThan(0, $manufacturerWithAccessories->accessories->count(), 'Precondition failed: Manufacturer has no accessories');
+        $this->assertGreaterThan(0, $manufacturerWithAssets->assets->count(), 'Precondition failed: Manufacturer has no assets');
+        $this->assertGreaterThan(0, $manufacturerWithConsumables->consumables->count(), 'Precondition failed: Manufacturer has no consumables');
+        $this->assertGreaterThan(0, $manufacturerWithLicenses->licenses->count(), 'Precondition failed: Manufacturer has no licenses');
+
+        $actor = $this->actingAsForApi(User::factory()->deleteManufacturers()->create());
+
+        $actor->deleteJson(route('api.manufacturers.destroy', $manufacturerWithAccessories))->assertStatusMessageIs('error');
+        $actor->deleteJson(route('api.manufacturers.destroy', $manufacturerWithAssets))->assertStatusMessageIs('error');
+        $actor->deleteJson(route('api.manufacturers.destroy', $manufacturerWithConsumables))->assertStatusMessageIs('error');
+        $actor->deleteJson(route('api.manufacturers.destroy', $manufacturerWithLicenses))->assertStatusMessageIs('error');
+
+        $this->assertNotSoftDeleted($manufacturerWithAssets);
+        $this->assertNotSoftDeleted($manufacturerWithAccessories);
+        $this->assertNotSoftDeleted($manufacturerWithConsumables);
+        $this->assertNotSoftDeleted($manufacturerWithLicenses);
+    }
+
+    public function testCanDeleteManufacturer()
+    {
+        $manufacturer = Manufacturer::factory()->create();
+
+        $this->actingAsForApi(User::factory()->deleteManufacturers()->create())
+            ->deleteJson(route('api.manufacturers.destroy', $manufacturer))
+            ->assertOk()
+            ->assertStatusMessageIs('success');
+
+        $this->assertSoftDeleted($manufacturer);
+    }
+}
diff --git a/tests/Feature/Manufacturers/Api/UpdateManufacturersTest.php b/tests/Feature/Manufacturers/Api/UpdateManufacturersTest.php
new file mode 100644
index 0000000000..f40052f2b2
--- /dev/null
+++ b/tests/Feature/Manufacturers/Api/UpdateManufacturersTest.php
@@ -0,0 +1,50 @@
+<?php
+
+namespace Tests\Feature\Manufacturers\Api;
+
+use App\Models\Manufacturer;
+use App\Models\Category;
+use App\Models\User;
+use Tests\TestCase;
+
+class UpdateManufacturersTest extends TestCase
+{
+    public function testPermissionRequiredToStoreManufacturer()
+    {
+        $this->actingAs(User::factory()->create())
+            ->post(route('manufacturers.store'), [
+                'name' => 'Test Manufacturer',
+            ])
+            ->assertStatus(403)
+            ->assertForbidden();
+    }
+
+    public function testPageRenders()
+    {
+        $this->actingAs(User::factory()->superuser()->create())
+            ->get(route('manufacturers.edit', Manufacturer::factory()->create()->id))
+            ->assertOk();
+    }
+
+    public function testUserCanEditManufacturers()
+    {
+        $department = Manufacturer::factory()->create(['name' => 'Test Manufacturer']);
+        $this->assertTrue(Manufacturer::where('name', 'Test Manufacturer')->exists());
+
+        $response = $this->actingAs(User::factory()->superuser()->create())
+            ->put(route('manufacturers.update', ['manufacturer' => $department]), [
+                'name' => 'Test Manufacturer Edited',
+                'notes' => 'Test Note Edited',
+            ])
+            ->assertStatus(302)
+            ->assertSessionHasNoErrors()
+            ->assertRedirect(route('manufacturers.index'));
+
+        $this->followRedirects($response)->assertSee('Success');
+        $this->assertTrue(Manufacturer::where('name', 'Test Manufacturer Edited')->where('notes', 'Test Note Edited')->exists());
+
+    }
+
+
+
+}
diff --git a/tests/Feature/Manufacturers/Ui/CreateManufacturerTest.php b/tests/Feature/Manufacturers/Ui/CreateManufacturerTest.php
new file mode 100644
index 0000000000..4eb9d4fb7e
--- /dev/null
+++ b/tests/Feature/Manufacturers/Ui/CreateManufacturerTest.php
@@ -0,0 +1,32 @@
+<?php
+
+namespace Tests\Feature\Manufacturers\Ui;
+
+use App\Models\User;
+use App\Models\Manufacturer;
+use Tests\TestCase;
+
+class CreateManufacturerTest extends TestCase
+{
+    public function testPageRenders()
+    {
+        $this->actingAs(User::factory()->superuser()->create())
+            ->get(route('manufacturers.create'))
+            ->assertOk();
+    }
+
+    public function testUserCanCreateManufacturer()
+    {
+        $this->assertFalse(Manufacturer::where('name', 'Test Manufacturer')->exists());
+
+        $this->actingAs(User::factory()->superuser()->create())
+            ->post(route('manufacturers.store'), [
+                'name' => 'Test Manufacturer',
+                'notes' => 'Test Note',
+            ])
+            ->assertRedirect(route('manufacturers.index'));
+
+        $this->assertTrue(Manufacturer::where('name', 'Test Manufacturer')->where('notes', 'Test Note')->exists());
+    }
+
+}
diff --git a/tests/Feature/Manufacturers/Ui/IndexManufacturersTest.php b/tests/Feature/Manufacturers/Ui/IndexManufacturersTest.php
new file mode 100644
index 0000000000..675063ec8d
--- /dev/null
+++ b/tests/Feature/Manufacturers/Ui/IndexManufacturersTest.php
@@ -0,0 +1,28 @@
+<?php
+
+namespace Tests\Feature\Manufacturers\Ui;
+
+use App\Models\Manufacturer;
+use App\Models\User;
+use Tests\TestCase;
+
+class IndexManufacturersTest extends TestCase
+{
+    public function testPageRenders()
+    {
+        $this->actingAs(User::factory()->superuser()->create())
+            ->get(route('manufacturers.index'))
+            ->assertOk();
+    }
+
+    public function testCannotSeedIfManufacturersExist()
+    {
+        Manufacturer::factory()->create();
+
+        $this->actingAs(User::factory()->superuser()->create())
+            ->post(route('manufacturers.seed'))
+            ->assertStatus(302)
+            ->assertSessionHas('error')
+            ->assertRedirect(route('manufacturers.index'));
+    }
+}
diff --git a/tests/Feature/Manufacturers/Ui/ShowManufacturerTest.php b/tests/Feature/Manufacturers/Ui/ShowManufacturerTest.php
new file mode 100644
index 0000000000..9a40819a10
--- /dev/null
+++ b/tests/Feature/Manufacturers/Ui/ShowManufacturerTest.php
@@ -0,0 +1,17 @@
+<?php
+
+namespace Tests\Feature\Manufacturers\Ui;
+
+use App\Models\Manufacturer;
+use App\Models\User;
+use Tests\TestCase;
+
+class ShowManufacturerTest extends TestCase
+{
+    public function testPageRenders()
+    {
+        $this->actingAs(User::factory()->superuser()->create())
+            ->get(route('manufacturers.show', Manufacturer::factory()->create()))
+            ->assertOk();
+    }
+}
diff --git a/tests/Feature/Manufacturers/Ui/UpdateManufacturerTest.php b/tests/Feature/Manufacturers/Ui/UpdateManufacturerTest.php
new file mode 100644
index 0000000000..9d5861300f
--- /dev/null
+++ b/tests/Feature/Manufacturers/Ui/UpdateManufacturerTest.php
@@ -0,0 +1,36 @@
+<?php
+
+namespace Tests\Feature\Manufacturers\Ui;
+
+use App\Models\Manufacturer;
+use App\Models\User;
+use Tests\TestCase;
+
+class UpdateManufacturerTest extends TestCase
+{
+    public function testPageRenders()
+    {
+        $this->actingAs(User::factory()->superuser()->create())
+            ->get(route('manufacturers.edit', Manufacturer::factory()->create()))
+            ->assertOk();
+    }
+
+    public function testUserCanEditManufacturers()
+    {
+        $manufacturer = Manufacturer::factory()->create(['name' => 'Test Manufacturer']);
+        $this->assertTrue(Manufacturer::where('name', 'Test Manufacturer')->exists());
+
+        $response = $this->actingAs(User::factory()->superuser()->create())
+            ->put(route('manufacturers.update', $manufacturer), [
+                'name' => 'Test Manufacturer Edited',
+                'notes' => 'Test Note Edited',
+            ])
+            ->assertStatus(302)
+            ->assertSessionHasNoErrors()
+            ->assertRedirect(route('manufacturers.index'));
+
+        $this->followRedirects($response)->assertSee('Success');
+        $this->assertTrue(Manufacturer::where('name', 'Test Manufacturer Edited')->where('notes', 'Test Note Edited')->exists());
+    }
+
+}
diff --git a/tests/Feature/Modals/Ui/ShowModalsTest.php b/tests/Feature/Modals/Ui/ShowModalsTest.php
new file mode 100644
index 0000000000..6da781d319
--- /dev/null
+++ b/tests/Feature/Modals/Ui/ShowModalsTest.php
@@ -0,0 +1,66 @@
+<?php
+
+namespace Tests\Feature\Modals\Ui;
+
+use App\Models\User;
+use Tests\TestCase;
+
+class ShowModalsTest extends TestCase
+{
+    public function testUserModalRenders()
+    {
+        $admin = User::factory()->createUsers()->create();
+        $response = $this->actingAs($admin)
+            ->get('modals/user')
+            ->assertOk();
+
+        $response->assertStatus(200);
+        $response->assertDontSee($admin->first_name);
+        $response->assertDontSee($admin->last_name);
+        $response->assertDontSee($admin->email);
+    }
+
+    public function testDepartmentModalRenders()
+    {
+        $this->actingAs(User::factory()->superuser()->create())
+            ->get('modals/model')
+            ->assertOk();
+    }
+
+    public function testStatusLabelModalRenders()
+    {
+        $this->actingAs(User::factory()->superuser()->create())
+            ->get('modals/statuslabel')
+            ->assertOk();
+    }
+
+    public function testLocationModalRenders()
+    {
+        $this->actingAs(User::factory()->superuser()->create())
+            ->get('modals/location')
+            ->assertOk();
+    }
+
+    public function testCategoryModalRenders()
+    {
+        $this->actingAs(User::factory()->superuser()->create())
+            ->get('modals/category')
+            ->assertOk();
+    }
+
+    public function testManufacturerModalRenders()
+    {
+        $this->actingAs(User::factory()->superuser()->create())
+            ->get('modals/manufacturer')
+            ->assertOk();
+    }
+
+    public function testSupplierModalRenders()
+    {
+        $this->actingAs(User::factory()->superuser()->create())
+            ->get('modals/supplier')
+            ->assertOk();
+    }
+
+
+}
diff --git a/tests/Feature/Notes/CreateNotesTest.php b/tests/Feature/Notes/CreateNotesTest.php
new file mode 100644
index 0000000000..a2caae6459
--- /dev/null
+++ b/tests/Feature/Notes/CreateNotesTest.php
@@ -0,0 +1,70 @@
+<?php
+
+namespace Tests\Feature\Notes;
+
+use App\Models\Asset;
+use App\Models\User;
+use Tests\TestCase;
+
+class CreateNotesTest extends TestCase
+{
+    public function testRequiresPermission()
+    {
+        $this->actingAs(User::factory()->create())
+            ->post(route('notes.store'))
+            ->assertForbidden();
+    }
+
+    public function testValidation()
+    {
+        $asset = Asset::factory()->create();
+
+        $this->actingAs(User::factory()->editAssets()->create())
+            ->post(route('notes.store'), [
+                'id' => $asset->id,
+                // should be more...
+            ])
+            ->assertSessionHas('errors');
+    }
+
+    public function testAssetMustExist()
+    {
+        $this->actingAs(User::factory()->editAssets()->create())
+            ->post(route('notes.store'), [
+                'id' => 999_999,
+                'type' => 'asset',
+                'note' => 'my note',
+            ])
+            ->assertStatus(302);
+    }
+
+    public function testCanCreateNoteForAsset()
+    {
+        $actor = User::factory()->editAssets()->create();
+
+        $asset = Asset::factory()->create();
+
+        $this->actingAs($actor)
+            ->withHeader('User-Agent', 'Custom User Agent For Test')
+            ->post(route('notes.store'), [
+                '_token' => '_token-to-simulate-request-from-gui',
+                'id' => $asset->id,
+                'type' => 'asset',
+                'note' => 'my special note',
+            ])
+            ->assertRedirect(route('hardware.show', $asset->id) . '#history')
+            ->assertSessionHas('success', trans('general.note_added'));
+
+        $this->assertDatabaseHas('action_logs', [
+            'created_by' => $actor->id,
+            'action_type' => 'note added',
+            'target_id' => null,
+            'target_type' => null,
+            'note' => 'my special note',
+            'item_type' => Asset::class,
+            'item_id' => $asset->id,
+            'action_source' => 'gui',
+            'user_agent' => 'Custom User Agent For Test',
+        ]);
+    }
+}
diff --git a/tests/Feature/Notifications/Email/AssetAcceptanceReminderTest.php b/tests/Feature/Notifications/Email/AssetAcceptanceReminderTest.php
new file mode 100644
index 0000000000..deb3e07d2c
--- /dev/null
+++ b/tests/Feature/Notifications/Email/AssetAcceptanceReminderTest.php
@@ -0,0 +1,108 @@
+<?php
+
+namespace Tests\Feature\Notifications\Email;
+
+use App\Mail\CheckoutAssetMail;
+use App\Models\CheckoutAcceptance;
+use App\Models\User;
+use Illuminate\Support\Facades\Mail;
+use PHPUnit\Framework\Attributes\DataProvider;
+use Tests\TestCase;
+
+class AssetAcceptanceReminderTest extends TestCase
+{
+    protected function setUp(): void
+    {
+        parent::setUp();
+
+        Mail::fake();
+    }
+
+    public function testMustHavePermissionToSendReminder()
+    {
+        $checkoutAcceptance = CheckoutAcceptance::factory()->pending()->create();
+        $userWithoutPermission = User::factory()->create();
+
+        $this->actingAs($userWithoutPermission)
+            ->post($this->routeFor($checkoutAcceptance))
+            ->assertForbidden();
+
+        Mail::assertNotSent(CheckoutAssetMail::class);
+    }
+
+    public function testReminderNotSentIfAcceptanceDoesNotExist()
+    {
+        $this->actingAs(User::factory()->canViewReports()->create())
+            ->post(route('reports/unaccepted_assets_sent_reminder', [
+                'acceptance_id' => 999999,
+            ]));
+
+        Mail::assertNotSent(CheckoutAssetMail::class);
+    }
+
+    public function testReminderNotSentIfAcceptanceAlreadyAccepted()
+    {
+        $checkoutAcceptanceAlreadyAccepted = CheckoutAcceptance::factory()->accepted()->create();
+
+        $this->actingAs(User::factory()->canViewReports()->create())
+            ->post($this->routeFor($checkoutAcceptanceAlreadyAccepted));
+
+        Mail::assertNotSent(CheckoutAssetMail::class);
+    }
+
+    public static function CheckoutAcceptancesToUsersWithoutEmailAddresses()
+    {
+        yield 'User with null email address' => [
+            function () {
+                return CheckoutAcceptance::factory()
+                    ->pending()
+                    ->forAssignedTo(['email' => null])
+                    ->create();
+            }
+        ];
+
+        yield 'User with empty string email address' => [
+            function () {
+                return CheckoutAcceptance::factory()
+                    ->pending()
+                    ->forAssignedTo(['email' => ''])
+                    ->create();
+            }
+        ];
+    }
+
+    #[DataProvider('CheckoutAcceptancesToUsersWithoutEmailAddresses')]
+    public function testUserWithoutEmailAddressHandledGracefully($callback)
+    {
+        $checkoutAcceptance = $callback();
+
+        $this->actingAs(User::factory()->canViewReports()->create())
+            ->post($this->routeFor($checkoutAcceptance))
+            // check we didn't crash...
+            ->assertRedirect();
+
+        Mail::assertNotSent(CheckoutAssetMail::class);
+    }
+
+    public function testReminderIsSentToUser()
+    {
+        $checkoutAcceptance = CheckoutAcceptance::factory()->pending()->create();
+
+        $this->actingAs(User::factory()->canViewReports()->create())
+            ->post($this->routeFor($checkoutAcceptance))
+            ->assertRedirect(route('reports/unaccepted_assets'));
+
+        Mail::assertSent(CheckoutAssetMail::class, 1);
+        Mail::assertSent(CheckoutAssetMail::class, function (CheckoutAssetMail $mail) use ($checkoutAcceptance) {
+            return $mail->hasTo($checkoutAcceptance->assignedTo->email)
+                && $mail->hasSubject(trans('mail.unaccepted_asset_reminder'));
+        });
+    }
+
+    private function routeFor(CheckoutAcceptance $checkoutAcceptance): string
+    {
+        return route('reports/unaccepted_assets_sent_reminder', [
+            'acceptance_id' => $checkoutAcceptance->id,
+        ]);
+    }
+}
diff --git a/tests/Feature/Notifications/Email/EmailNotificationsToAdminAlertEmailUponCheckinTest.php b/tests/Feature/Notifications/Email/EmailNotificationsToAdminAlertEmailUponCheckinTest.php
new file mode 100644
index 0000000000..1bdbf0b673
--- /dev/null
+++ b/tests/Feature/Notifications/Email/EmailNotificationsToAdminAlertEmailUponCheckinTest.php
@@ -0,0 +1,126 @@
+<?php
+
+namespace Tests\Feature\Notifications\Email;
+
+use App\Events\CheckoutableCheckedIn;
+use App\Mail\CheckinAssetMail;
+use App\Models\Asset;
+use App\Models\AssetModel;
+use App\Models\Category;
+use App\Models\User;
+use Illuminate\Support\Facades\Mail;
+use PHPUnit\Framework\Attributes\Group;
+use Tests\TestCase;
+
+#[Group('notifications')]
+class EmailNotificationsToAdminAlertEmailUponCheckinTest extends TestCase
+{
+    private Asset $asset;
+    private AssetModel $assetModel;
+    private Category $category;
+    private User $user;
+
+    protected function setUp(): void
+    {
+        parent::setUp();
+
+        Mail::fake();
+
+        $this->user = User::factory()->create();
+
+        $this->category = Category::factory()->create([
+            'checkin_email' => false,
+            'eula_text' => null,
+            'require_acceptance' => false,
+            'use_default_eula' => false,
+        ]);
+
+        $this->assetModel = AssetModel::factory()->for($this->category)->create();
+
+        $this->asset = Asset::factory()
+            ->for($this->assetModel, 'model')
+            ->assignedToUser($this->user)
+            ->create();
+    }
+
+    public function test_admin_alert_email_sends()
+    {
+        $this->settings->enableAdminCC('cc@example.com');
+
+        $this->category->update(['checkin_email' => true]);
+
+        $this->fireCheckInEvent($this->asset, $this->user);
+
+        Mail::assertSent(CheckinAssetMail::class, function ($mail) {
+            return $mail->hasTo($this->user->email) && $mail->hasCc('cc@example.com');
+        });
+    }
+
+    public function test_admin_alert_email_still_sent_when_category_email_is_not_set_to_send_email_to_user()
+    {
+        $this->settings->enableAdminCC('cc@example.com');
+
+        $this->category->update(['checkin_email' => false]);
+
+        $this->fireCheckInEvent($this->asset, $this->user);
+
+        Mail::assertSent(CheckinAssetMail::class, function ($mail) {
+            return $mail->hasTo('cc@example.com');
+        });
+    }
+
+    public function test_admin_alert_email_still_sent_when_user_has_no_email_address()
+    {
+        $this->settings->enableAdminCC('cc@example.com');
+
+        $this->user->update(['email' => null]);
+
+        $this->category->update(['checkin_email' => true]);
+
+        $this->fireCheckInEvent($this->asset, $this->user);
+
+        Mail::assertSent(CheckinAssetMail::class, function ($mail) {
+            return $mail->hasTo('cc@example.com');
+        });
+    }
+
+    public function test_admin_alert_email_sent_when_always_send_is_true_and_asset_does_not_require_acceptance()
+    {
+        $this->settings
+            ->enableAdminCC('cc@example.com')
+            ->enableAdminCCAlways();
+
+        $this->category->update(['checkin_email' => false]);
+
+        $this->fireCheckInEvent($this->asset, $this->user);
+
+        Mail::assertSent(CheckinAssetMail::class, function ($mail) {
+            return $mail->hasTo('cc@example.com') || $mail->hasCc('cc@example.com');
+        });
+    }
+
+    public function test_admin_alert_email_not_sent_when_always_send_is_false_and_asset_does_not_require_acceptance()
+    {
+        $this->settings
+            ->enableAdminCC('cc@example.com')
+            ->disableAdminCCAlways();
+
+        $this->category->update(['checkin_email' => false]);
+
+        $this->fireCheckInEvent($this->asset, $this->user);
+
+        Mail::assertNotSent(CheckinAssetMail::class, function ($mail) {
+            return $mail->hasTo('cc@example.com') || $mail->hasCc('cc@example.com');
+        });
+    }
+
+    private function fireCheckInEvent($asset, $user): void
+    {
+        event(new CheckoutableCheckedIn(
+            $asset,
+            $user,
+            User::factory()->checkinAssets()->create(),
+            ''
+        ));
+    }
+}
diff --git a/tests/Feature/Notifications/Email/EmailNotificationsToAdminAlertEmailUponCheckoutTest.php b/tests/Feature/Notifications/Email/EmailNotificationsToAdminAlertEmailUponCheckoutTest.php
new file mode 100644
index 0000000000..d881ae7dab
--- /dev/null
+++ b/tests/Feature/Notifications/Email/EmailNotificationsToAdminAlertEmailUponCheckoutTest.php
@@ -0,0 +1,119 @@
+<?php
+
+namespace Tests\Feature\Notifications\Email;
+
+use App\Events\CheckoutableCheckedOut;
+use App\Mail\CheckoutAssetMail;
+use App\Models\Asset;
+use App\Models\AssetModel;
+use App\Models\Category;
+use App\Models\User;
+use Illuminate\Support\Facades\Mail;
+use PHPUnit\Framework\Attributes\Group;
+use Tests\TestCase;
+
+#[Group('notifications')]
+class EmailNotificationsToAdminAlertEmailUponCheckoutTest extends TestCase
+{
+    private Asset $asset;
+    private AssetModel $assetModel;
+    private Category $category;
+    private User $user;
+
+    protected function setUp(): void
+    {
+        parent::setUp();
+
+        Mail::fake();
+
+        $this->category = Category::factory()->create([
+            'checkin_email' => false,
+            'eula_text' => null,
+            'require_acceptance' => false,
+            'use_default_eula' => false,
+        ]);
+
+        $this->assetModel = AssetModel::factory()->for($this->category)->create();
+        $this->asset = Asset::factory()->for($this->assetModel, 'model')->create();
+
+        $this->user = User::factory()->create();
+    }
+
+    public function test_admin_alert_email_sends()
+    {
+        $this->settings->enableAdminCC('cc@example.com');
+
+        $this->category->update(['checkin_email' => true]);
+
+        $this->fireCheckoutEvent();
+
+        Mail::assertSent(CheckoutAssetMail::class, function (CheckoutAssetMail $mail) {
+            return $mail->hasCc('cc@example.com');
+        });
+    }
+
+    public function test_admin_alert_email_still_sent_when_category_is_not_set_to_send_email_to_user()
+    {
+        $this->settings->enableAdminCC('cc@example.com');
+
+        $this->fireCheckoutEvent();
+
+        Mail::assertSent(CheckoutAssetMail::class, function ($mail) {
+            return $mail->hasTo('cc@example.com');
+        });
+    }
+
+    public function test_admin_alert_email_still_sent_when_user_has_no_email_address()
+    {
+        $this->settings->enableAdminCC('cc@example.com');
+
+        $this->category->update(['checkin_email' => true]);
+        $this->user->update(['email' => null]);
+
+        $this->fireCheckoutEvent();
+
+        Mail::assertSent(CheckoutAssetMail::class, function ($mail) {
+            return $mail->hasTo('cc@example.com');
+        });
+    }
+
+    public function test_admin_alert_email_sent_when_always_send_is_true_and_asset_does_not_require_acceptance()
+    {
+        $this->settings
+            ->enableAdminCC('cc@example.com')
+            ->enableAdminCCAlways();
+
+        $this->category->update(['checkin_email' => false]);
+
+        $this->fireCheckoutEvent();
+
+        Mail::assertSent(CheckoutAssetMail::class, function (CheckoutAssetMail $mail) {
+            return $mail->hasTo('cc@example.com') || $mail->hasCc('cc@example.com');
+        });
+    }
+
+    public function test_admin_alert_email_not_sent_when_always_send_is_false_and_asset_does_not_require_acceptance()
+    {
+        $this->settings
+            ->enableAdminCC('cc@example.com')
+            ->disableAdminCCAlways();
+
+        $this->category->update(['checkin_email' => false]);
+
+        $this->fireCheckoutEvent();
+
+        Mail::assertNotSent(CheckoutAssetMail::class, function (CheckoutAssetMail $mail) {
+            return $mail->hasTo('cc@example.com') || $mail->hasCc('cc@example.com');
+        });
+    }
+
+    private function fireCheckoutEvent(): void
+    {
+        event(new CheckoutableCheckedOut(
+            $this->asset,
+            $this->user,
+            User::factory()->superuser()->create(),
+            '',
+        ));
+    }
+}
diff --git a/tests/Feature/Notifications/Email/EmailNotificationsToUserUponCheckinTest.php b/tests/Feature/Notifications/Email/EmailNotificationsToUserUponCheckinTest.php
new file mode 100644
index 0000000000..432ce88b4b
--- /dev/null
+++ b/tests/Feature/Notifications/Email/EmailNotificationsToUserUponCheckinTest.php
@@ -0,0 +1,111 @@
+<?php
+
+namespace Tests\Feature\Notifications\Email;
+
+use App\Mail\CheckinAssetMail;
+use App\Models\Accessory;
+use App\Models\Consumable;
+use App\Models\LicenseSeat;
+use Illuminate\Support\Facades\Mail;
+use PHPUnit\Framework\Attributes\Group;
+use App\Events\CheckoutableCheckedIn;
+use App\Models\Asset;
+use App\Models\User;
+use Tests\TestCase;
+
+#[Group('notifications')]
+class EmailNotificationsToUserUponCheckinTest extends TestCase
+{
+    protected function setUp(): void
+    {
+        parent::setUp();
+
+        Mail::fake();
+    }
+
+    public function test_check_in_email_sent_to_user_if_setting_enabled()
+    {
+        $user = User::factory()->create();
+        $asset = Asset::factory()->assignedToUser($user)->create();
+
+        $asset->model->category->update(['checkin_email' => true]);
+
+        $this->fireCheckInEvent($asset, $user);
+
+        Mail::assertSent(CheckinAssetMail::class, function($mail) use ($user) {
+                return $mail->hasTo($user->email);
+        });
+    }
+
+    public function test_check_in_email_not_sent_to_user_if_setting_disabled()
+    {
+        $this->settings->disableAdminCC();
+
+        $user = User::factory()->create();
+        $checkoutables = collect([
+            Asset::factory()->assignedToUser($user)->create(),
+            LicenseSeat::factory()->assignedToUser($user)->create(),
+            Accessory::factory()->checkedOutToUser($user)->create(),
+            Consumable::factory()->checkedOutToUser($user)->create(),
+        ]);
+
+        foreach ($checkoutables as $checkoutable) {
+
+            if ($checkoutable instanceof Asset) {
+                $checkoutable->model->category->update([
+                    'checkin_email' => false,
+                    'eula_text' => null,
+                    'require_acceptance' => false,
+                ]);
+                $checkoutable = $checkoutable->fresh(['model.category']);
+            }
+
+            if ($checkoutable instanceof Accessory || $checkoutable instanceof Consumable) {
+                $checkoutable->category->update([
+                    'checkin_email' => false,
+                    'eula_text' => null,
+                    'require_acceptance' => false,
+                ]);
+                $checkoutable = $checkoutable->fresh(['category']);
+            }
+
+            if ($checkoutable instanceof LicenseSeat) {
+                $checkoutable->license->category->update([
+                    'checkin_email' => false,
+                    'eula_text' => null,
+                    'require_acceptance' => false,
+                ]);
+                $checkoutable = $checkoutable->fresh(['license.category']);
+            }
+
+            // Fire event manually
+            $this->fireCheckInEvent($checkoutable, $user);
+        }
+
+        Mail::assertNotSent(CheckinAssetMail::class, function ($mail) use ($user) {
+            return $mail->hasTo($user->email);
+        });
+    }
+
+    public function test_handles_user_not_having_email_address_set()
+    {
+        $user = User::factory()->create(['email' => null]);
+        $asset = Asset::factory()->assignedToUser($user)->create();
+
+        $asset->model->category->update(['checkin_email' => true]);
+
+        $this->fireCheckInEvent($asset, $user);
+
+        Mail::assertNothingSent();
+    }
+
+    private function fireCheckInEvent($asset, $user): void
+    {
+        event(new CheckoutableCheckedIn(
+            $asset,
+            $user,
+            User::factory()->checkinAssets()->create(),
+            ''
+        ));
+    }
+}
diff --git a/tests/Feature/Notifications/Email/EmailNotificationsToUserUponCheckoutTest.php b/tests/Feature/Notifications/Email/EmailNotificationsToUserUponCheckoutTest.php
new file mode 100644
index 0000000000..e5741da8ec
--- /dev/null
+++ b/tests/Feature/Notifications/Email/EmailNotificationsToUserUponCheckoutTest.php
@@ -0,0 +1,106 @@
+<?php
+
+namespace Tests\Feature\Notifications\Email;
+
+use App\Events\CheckoutableCheckedOut;
+use App\Mail\CheckoutAssetMail;
+use App\Models\Asset;
+use App\Models\AssetModel;
+use App\Models\Category;
+use App\Models\User;
+use Illuminate\Support\Facades\Mail;
+use PHPUnit\Framework\Attributes\Group;
+use Tests\TestCase;
+
+#[Group('notifications')]
+class EmailNotificationsToUserUponCheckoutTest extends TestCase
+{
+    private Asset $asset;
+    private AssetModel $assetModel;
+    private Category $category;
+    private User $user;
+
+    protected function setUp(): void
+    {
+        parent::setUp();
+
+        Mail::fake();
+
+        $this->category = Category::factory()->create([
+            'checkin_email' => false,
+            'eula_text' => null,
+            'require_acceptance' => false,
+            'use_default_eula' => false,
+        ]);
+
+        $this->assetModel = AssetModel::factory()->for($this->category)->create();
+        $this->asset = Asset::factory()->for($this->assetModel, 'model')->create();
+
+        $this->user = User::factory()->create();
+    }
+
+    public function test_email_sent_to_user_when_category_requires_acceptance()
+    {
+        $this->category->update(['require_acceptance' => true]);
+
+        $this->fireCheckoutEvent();
+
+        $this->assertUserSentEmail();
+    }
+
+    public function test_email_sent_to_user_when_category_using_default_eula()
+    {
+        $this->settings->setEula();
+
+        $this->category->update(['use_default_eula' => true]);
+
+        $this->fireCheckoutEvent();
+
+        $this->assertUserSentEmail();
+    }
+
+    public function test_email_sent_to_user_when_category_using_local_eula()
+    {
+        $this->category->update(['eula_text' => 'Some EULA text']);
+
+        $this->fireCheckoutEvent();
+
+        $this->assertUserSentEmail();
+    }
+
+    public function test_email_sent_to_user_when_category_set_to_explicitly_send_email()
+    {
+        $this->category->update(['checkin_email' => true]);
+
+        $this->fireCheckoutEvent();
+
+        $this->assertUserSentEmail();
+    }
+
+    public function test_handles_user_not_having_email_address_set()
+    {
+        $this->category->update(['checkin_email' => true]);
+        $this->user->update(['email' => null]);
+
+        $this->fireCheckoutEvent();
+
+        Mail::assertNothingSent();
+    }
+
+    private function fireCheckoutEvent(): void
+    {
+        event(new CheckoutableCheckedOut(
+            $this->asset,
+            $this->user,
+            User::factory()->superuser()->create(),
+            '',
+        ));
+    }
+
+    private function assertUserSentEmail(): void
+    {
+        Mail::assertSent(CheckoutAssetMail::class, function (CheckoutAssetMail $mail) {
+            return $mail->hasTo($this->user->email);
+        });
+    }
+}
diff --git a/tests/Feature/Notifications/Email/EmailNotificationsUponCheckinTest.php b/tests/Feature/Notifications/Email/EmailNotificationsUponCheckinTest.php
deleted file mode 100644
index 4ae415f1ee..0000000000
--- a/tests/Feature/Notifications/Email/EmailNotificationsUponCheckinTest.php
+++ /dev/null
@@ -1,67 +0,0 @@
-<?php
-
-namespace Tests\Feature\Notifications\Email;
-
-use App\Events\CheckoutableCheckedIn;
-use App\Models\Asset;
-use App\Models\User;
-use App\Notifications\CheckinAssetNotification;
-use Illuminate\Support\Facades\Notification;
-use Tests\TestCase;
-
-/**
- * @group notifications
- */
-class EmailNotificationsUponCheckinTest extends TestCase
-{
-    protected function setUp(): void
-    {
-        parent::setUp();
-
-        Notification::fake();
-    }
-
-    public function testCheckInEmailSentToUserIfSettingEnabled()
-    {
-        $user = User::factory()->create();
-        $asset = Asset::factory()->assignedToUser($user)->create();
-
-        $asset->model->category->update(['checkin_email' => true]);
-
-        $this->fireCheckInEvent($asset, $user);
-
-        Notification::assertSentTo(
-            $user,
-            function (CheckinAssetNotification $notification, $channels) {
-                return in_array('mail', $channels);
-            },
-        );
-    }
-
-    public function testCheckInEmailNotSentToUserIfSettingDisabled()
-    {
-        $user = User::factory()->create();
-        $asset = Asset::factory()->assignedToUser($user)->create();
-
-        $asset->model->category->update(['checkin_email' => false]);
-
-        $this->fireCheckInEvent($asset, $user);
-
-        Notification::assertNotSentTo(
-            $user,
-            function (CheckinAssetNotification $notification, $channels) {
-                return in_array('mail', $channels);
-            }
-        );
-    }
-
-    private function fireCheckInEvent($asset, $user): void
-    {
-        event(new CheckoutableCheckedIn(
-            $asset,
-            $user,
-            User::factory()->checkinAssets()->create(),
-            ''
-        ));
-    }
-}
diff --git a/tests/Feature/Notifications/Email/ExpiringAlertsNotificationTest.php b/tests/Feature/Notifications/Email/ExpiringAlertsNotificationTest.php
new file mode 100644
index 0000000000..1d91cf2557
--- /dev/null
+++ b/tests/Feature/Notifications/Email/ExpiringAlertsNotificationTest.php
@@ -0,0 +1,127 @@
+<?php
+
+namespace Tests\Feature\Notifications\Email;
+
+use App\Mail\ExpiringAssetsMail;
+use App\Mail\ExpiringLicenseMail;
+use App\Mail\SendUpcomingAuditMail;
+use App\Models\Asset;
+use App\Models\License;
+use App\Models\Setting;
+use App\Models\User;
+use Illuminate\Support\Facades\Mail;
+use Tests\TestCase;
+
+
+class ExpiringAlertsNotificationTest extends TestCase
+{
+     public function testExpiringAssetsEmailNotification()
+     {
+         $this->markIncompleteIfSqlite();
+         Mail::fake();
+
+         $this->settings->enableAlertEmail('admin@example.com');
+         $this->settings->setAlertInterval(30);
+
+         $alert_email = Setting::first()->alert_email;
+
+         $expiringAsset = Asset::factory()->create([
+             'purchase_date' => now()->subDays(350)->format('Y-m-d'),
+             'warranty_months' => 12,
+             'archived' => 0,
+             'deleted_at' => null,
+         ]);
+
+         $expiredAsset = Asset::factory()->create([
+             'purchase_date' => now()->subDays(370)->format('Y-m-d'),
+             'warranty_months' => 12,
+             'archived' => 0,
+             'deleted_at' => null,
+         ]);
+
+         $notExpiringAsset = Asset::factory()->create([
+             'purchase_date' => now()->subDays(330)->format('Y-m-d'),
+             'warranty_months' => 12,
+             'archived' => 0,
+             'deleted_at' => null,
+         ]);
+
+         $this->artisan('snipeit:expiring-alerts')->assertExitCode(0);
+
+         Mail::assertSent(ExpiringAssetsMail::class, function($mail) use ($alert_email, $expiringAsset) {
+             return $mail->hasTo($alert_email) && $mail->assets->contains($expiringAsset);
+         });
+
+         Mail::assertNotSent(ExpiringAssetsMail::class, function($mail) use ($expiredAsset, $notExpiringAsset) {
+             return $mail->assets->contains($expiredAsset) || $mail->assets->contains($notExpiringAsset);
+         });
+     }
+
+     public function testExpiringLicensesEmailNotification()
+     {
+         $this->markIncompleteIfSqlite();
+         Mail::fake();
+         $this->settings->enableAlertEmail('admin@example.com');
+         $this->settings->setAlertInterval(60);
+
+         $alert_email = Setting::first()->alert_email;
+
+         $expiringLicense = License::factory()->create([
+             'expiration_date' => now()->addDays(30)->format('Y-m-d'),
+             'deleted_at' => null,
+         ]);
+
+         $expiredLicense = License::factory()->create([
+             'expiration_date' => now()->subDays(10)->format('Y-m-d'),
+             'deleted_at' => null,
+         ]);
+         $notExpiringLicense = License::factory()->create([
+             'expiration_date' => now()->addMonths(3)->format('Y-m-d'),
+             'deleted_at' => null,
+         ]);
+
+         $this->artisan('snipeit:expiring-alerts')->assertExitCode(0);
+
+         Mail::assertSent(ExpiringLicenseMail::class, function($mail) use ($alert_email, $expiringLicense) {
+             return $mail->hasTo($alert_email) && $mail->licenses->contains($expiringLicense);
+         });
+
+         Mail::assertNotSent(ExpiringLicenseMail::class, function($mail) use ($expiredLicense, $notExpiringLicense) {
+             return $mail->licenses->contains($expiredLicense) || $mail->licenses->contains($notExpiringLicense);
+         });
+     }
+
+     public function testAuditWarningThresholdEmailNotification()
+     {
+         $this->markIncompleteIfSqlite();
+         Mail::fake();
+         $this->settings->enableAlertEmail('admin@example.com');
+         $this->settings->setAuditWarningDays(15);
+
+         $alert_email = Setting::first()->alert_email;
+
+         $upcomingAuditableAsset = Asset::factory()->create([
+             'next_audit_date' => now()->addDays(14)->format('Y-m-d'),
+             'deleted_at' => null,
+         ]);
+
+         $overDueForAuditableAsset = Asset::factory()->create([
+             'next_audit_date' => now()->subDays(1)->format('Y-m-d'),
+             'deleted_at' => null,
+         ]);
+
+         $notAuditableAsset = Asset::factory()->create([
+             'next_audit_date' => now()->addDays(30)->format('Y-m-d'),
+             'deleted_at' => null,
+         ]);
+
+         $this->artisan('snipeit:upcoming-audits')->assertExitCode(0);
+
+         Mail::assertSent(SendUpcomingAuditMail::class, function($mail) use ($alert_email, $upcomingAuditableAsset, $overDueForAuditableAsset) {
+             return $mail->hasTo($alert_email) && ($mail->assets->contains($upcomingAuditableAsset) && $mail->assets->contains($overDueForAuditableAsset));
+         });
+         Mail::assertNotSent(SendUpcomingAuditMail::class, function($mail) use ($alert_email, $notAuditableAsset) {
+             return $mail->hasTo($alert_email) && $mail->assets->contains($notAuditableAsset);
+         });
+     }
+}
\ No newline at end of file
diff --git a/tests/Feature/Notifications/Webhooks/SlackNotificationsUponCheckinTest.php b/tests/Feature/Notifications/Webhooks/SlackNotificationsUponCheckinTest.php
index 29bf06d9dc..e2a97c1603 100644
--- a/tests/Feature/Notifications/Webhooks/SlackNotificationsUponCheckinTest.php
+++ b/tests/Feature/Notifications/Webhooks/SlackNotificationsUponCheckinTest.php
@@ -2,6 +2,10 @@
 
 namespace Tests\Feature\Notifications\Webhooks;
 
+use App\Models\AssetModel;
+use App\Models\Category;
+use PHPUnit\Framework\Attributes\DataProvider;
+use PHPUnit\Framework\Attributes\Group;
 use App\Events\CheckoutableCheckedIn;
 use App\Models\Accessory;
 use App\Models\Asset;
@@ -16,9 +20,7 @@ use Illuminate\Database\Eloquent\Model;
 use Illuminate\Support\Facades\Notification;
 use Tests\TestCase;
 
-/**
- * @group notifications
- */
+#[Group('notifications')]
 class SlackNotificationsUponCheckinTest extends TestCase
 {
     protected function setUp(): void
@@ -28,7 +30,7 @@ class SlackNotificationsUponCheckinTest extends TestCase
         Notification::fake();
     }
 
-    public function assetCheckInTargets(): array
+    public static function assetCheckInTargets(): array
     {
         return [
             'Asset checked out to user' => [fn() => User::factory()->create()],
@@ -37,7 +39,7 @@ class SlackNotificationsUponCheckinTest extends TestCase
         ];
     }
 
-    public function licenseCheckInTargets(): array
+    public static function licenseCheckInTargets(): array
     {
         return [
             'License checked out to user' => [fn() => User::factory()->create()],
@@ -69,7 +71,7 @@ class SlackNotificationsUponCheckinTest extends TestCase
         $this->assertNoSlackNotificationSent(CheckinAccessoryNotification::class);
     }
 
-    /** @dataProvider assetCheckInTargets */
+    #[DataProvider('assetCheckInTargets')]
     public function testAssetCheckinSendsSlackNotificationWhenSettingEnabled($checkoutTarget)
     {
         $this->settings->enableSlackWebhook();
@@ -82,7 +84,7 @@ class SlackNotificationsUponCheckinTest extends TestCase
         $this->assertSlackNotificationSent(CheckinAssetNotification::class);
     }
 
-    /** @dataProvider assetCheckInTargets */
+    #[DataProvider('assetCheckInTargets')]
     public function testAssetCheckinDoesNotSendSlackNotificationWhenSettingDisabled($checkoutTarget)
     {
         $this->settings->disableSlackWebhook();
@@ -95,6 +97,27 @@ class SlackNotificationsUponCheckinTest extends TestCase
         $this->assertNoSlackNotificationSent(CheckinAssetNotification::class);
     }
 
+    public function testSlackNotificationIsStillSentWhenCategoryEmailIsNotSetToSendEmails()
+    {
+        $this->settings->enableSlackWebhook();
+
+        $category = Category::factory()->create([
+            'checkin_email' => false,
+            'eula_text' => null,
+            'require_acceptance' => false,
+            'use_default_eula' => false,
+        ]);
+        $assetModel = AssetModel::factory()->for($category)->create();
+        $asset = Asset::factory()->for($assetModel, 'model')->assignedToUser()->create();
+
+        $this->fireCheckInEvent(
+            $asset,
+            User::factory()->create(),
+        );
+
+        $this->assertSlackNotificationSent(CheckinAssetNotification::class);
+    }
+
     public function testComponentCheckinDoesNotSendSlackNotification()
     {
         $this->settings->enableSlackWebhook();
@@ -107,7 +130,7 @@ class SlackNotificationsUponCheckinTest extends TestCase
         Notification::assertNothingSent();
     }
 
-    /** @dataProvider licenseCheckInTargets */
+    #[DataProvider('licenseCheckInTargets')]
     public function testLicenseCheckinSendsSlackNotificationWhenSettingEnabled($checkoutTarget)
     {
         $this->settings->enableSlackWebhook();
@@ -120,7 +143,7 @@ class SlackNotificationsUponCheckinTest extends TestCase
         $this->assertSlackNotificationSent(CheckinLicenseSeatNotification::class);
     }
 
-    /** @dataProvider licenseCheckInTargets */
+    #[DataProvider('licenseCheckInTargets')]
     public function testLicenseCheckinDoesNotSendSlackNotificationWhenSettingDisabled($checkoutTarget)
     {
         $this->settings->disableSlackWebhook();
diff --git a/tests/Feature/Notifications/Webhooks/SlackNotificationsUponCheckoutTest.php b/tests/Feature/Notifications/Webhooks/SlackNotificationsUponCheckoutTest.php
index 048448cad7..c9f426dd30 100644
--- a/tests/Feature/Notifications/Webhooks/SlackNotificationsUponCheckoutTest.php
+++ b/tests/Feature/Notifications/Webhooks/SlackNotificationsUponCheckoutTest.php
@@ -2,6 +2,10 @@
 
 namespace Tests\Feature\Notifications\Webhooks;
 
+use App\Models\AssetModel;
+use App\Models\Category;
+use PHPUnit\Framework\Attributes\DataProvider;
+use PHPUnit\Framework\Attributes\Group;
 use App\Events\CheckoutableCheckedOut;
 use App\Models\Accessory;
 use App\Models\Asset;
@@ -18,9 +22,7 @@ use Illuminate\Database\Eloquent\Model;
 use Illuminate\Support\Facades\Notification;
 use Tests\TestCase;
 
-/**
- * @group notifications
- */
+#[Group('notifications')]
 class SlackNotificationsUponCheckoutTest extends TestCase
 {
     protected function setUp(): void
@@ -30,7 +32,7 @@ class SlackNotificationsUponCheckoutTest extends TestCase
         Notification::fake();
     }
 
-    public function assetCheckoutTargets(): array
+    public static function assetCheckoutTargets(): array
     {
         return [
             'Asset checked out to user' => [fn() => User::factory()->create()],
@@ -39,7 +41,7 @@ class SlackNotificationsUponCheckoutTest extends TestCase
         ];
     }
 
-    public function licenseCheckoutTargets(): array
+    public static function licenseCheckoutTargets(): array
     {
         return [
             'License checked out to user' => [fn() => User::factory()->create()],
@@ -71,7 +73,7 @@ class SlackNotificationsUponCheckoutTest extends TestCase
         $this->assertNoSlackNotificationSent(CheckoutAccessoryNotification::class);
     }
 
-    /** @dataProvider assetCheckoutTargets */
+    #[DataProvider('assetCheckoutTargets')]
     public function testAssetCheckoutSendsSlackNotificationWhenSettingEnabled($checkoutTarget)
     {
         $this->settings->enableSlackWebhook();
@@ -84,7 +86,7 @@ class SlackNotificationsUponCheckoutTest extends TestCase
         $this->assertSlackNotificationSent(CheckoutAssetNotification::class);
     }
 
-    /** @dataProvider assetCheckoutTargets */
+    #[DataProvider('assetCheckoutTargets')]
     public function testAssetCheckoutDoesNotSendSlackNotificationWhenSettingDisabled($checkoutTarget)
     {
         $this->settings->disableSlackWebhook();
@@ -97,6 +99,27 @@ class SlackNotificationsUponCheckoutTest extends TestCase
         $this->assertNoSlackNotificationSent(CheckoutAssetNotification::class);
     }
 
+    public function testSlackNotificationIsStillSentWhenCategoryEmailIsNotSetToSendEmails()
+    {
+        $this->settings->enableSlackWebhook();
+
+        $category = Category::factory()->create([
+            'checkin_email' => false,
+            'eula_text' => null,
+            'require_acceptance' => false,
+            'use_default_eula' => false,
+        ]);
+        $assetModel = AssetModel::factory()->for($category)->create();
+        $asset = Asset::factory()->for($assetModel, 'model')->create();
+
+        $this->fireCheckOutEvent(
+            $asset,
+            User::factory()->create(),
+        );
+
+        $this->assertSlackNotificationSent(CheckoutAssetNotification::class);
+    }
+
     public function testComponentCheckoutDoesNotSendSlackNotification()
     {
         $this->settings->enableSlackWebhook();
@@ -133,7 +156,7 @@ class SlackNotificationsUponCheckoutTest extends TestCase
         $this->assertNoSlackNotificationSent(CheckoutConsumableNotification::class);
     }
 
-    /** @dataProvider licenseCheckoutTargets */
+    #[DataProvider('licenseCheckoutTargets')]
     public function testLicenseCheckoutSendsSlackNotificationWhenSettingEnabled($checkoutTarget)
     {
         $this->settings->enableSlackWebhook();
@@ -146,7 +169,7 @@ class SlackNotificationsUponCheckoutTest extends TestCase
         $this->assertSlackNotificationSent(CheckoutLicenseSeatNotification::class);
     }
 
-    /** @dataProvider licenseCheckoutTargets */
+    #[DataProvider('licenseCheckoutTargets')]
     public function testLicenseCheckoutDoesNotSendSlackNotificationWhenSettingDisabled($checkoutTarget)
     {
         $this->settings->disableSlackWebhook();
diff --git a/tests/Feature/PredefinedKits/Api/DeletePredefinedKitsTest.php b/tests/Feature/PredefinedKits/Api/DeletePredefinedKitsTest.php
new file mode 100644
index 0000000000..b9ff6164a7
--- /dev/null
+++ b/tests/Feature/PredefinedKits/Api/DeletePredefinedKitsTest.php
@@ -0,0 +1,59 @@
+<?php
+
+namespace Tests\Feature\PredefinedKits\Api;
+
+use App\Models\PredefinedKit;
+use App\Models\User;
+use Illuminate\Support\Facades\DB;
+use Tests\Concerns\TestsPermissionsRequirement;
+use Tests\TestCase;
+
+class DeletePredefinedKitsTest extends TestCase implements TestsPermissionsRequirement
+{
+    public function testRequiresPermission()
+    {
+        $predefinedKit = PredefinedKit::factory()->create();
+
+        $this->actingAsForApi(User::factory()->create())
+            ->deleteJson(route('api.kits.destroy', $predefinedKit))
+            ->assertForbidden();
+
+        $this->assertDatabaseHas('kits', ['id' => $predefinedKit->id]);
+    }
+
+    public function testCanDeletePredefinedKits()
+    {
+        $predefinedKit = PredefinedKit::factory()->create();
+
+        $this->actingAsForApi(User::factory()->deletePredefinedKits()->create())
+            ->deleteJson(route('api.kits.destroy', $predefinedKit))
+            ->assertOk()
+            ->assertStatusMessageIs('success');
+
+        $this->assertDatabaseMissing('kits', ['id' => $predefinedKit->id]);
+    }
+
+    public function testAssociatedDataDetachedWhenPredefinedKitDeleted()
+    {
+        $predefinedKit = PredefinedKit::factory()
+            ->hasAccessories()
+            ->hasConsumables()
+            ->hasLicenses()
+            ->hasModels()
+            ->create();
+
+        $this->assertGreaterThan(0, $predefinedKit->accessories->count(), 'Precondition failed: PredefinedKit has no accessories');
+        $this->assertGreaterThan(0, $predefinedKit->consumables->count(), 'Precondition failed: PredefinedKit has no consumables');
+        $this->assertGreaterThan(0, $predefinedKit->licenses->count(), 'Precondition failed: PredefinedKit has no licenses');
+        $this->assertGreaterThan(0, $predefinedKit->models->count(), 'Precondition failed: PredefinedKit has no models');
+
+        $this->actingAsForApi(User::factory()->deletePredefinedKits()->create())
+            ->deleteJson(route('api.kits.destroy', $predefinedKit))
+            ->assertStatusMessageIs('success');
+
+        $this->assertEquals(0, DB::table('kits_accessories')->where('kit_id', $predefinedKit->id)->count());
+        $this->assertEquals(0, DB::table('kits_consumables')->where('kit_id', $predefinedKit->id)->count());
+        $this->assertEquals(0, DB::table('kits_licenses')->where('kit_id', $predefinedKit->id)->count());
+        $this->assertEquals(0, DB::table('kits_models')->where('kit_id', $predefinedKit->id)->count());
+    }
+}
diff --git a/tests/Feature/PredefinedKits/Ui/CreatePredefinedKitTest.php b/tests/Feature/PredefinedKits/Ui/CreatePredefinedKitTest.php
new file mode 100644
index 0000000000..0f958f66f8
--- /dev/null
+++ b/tests/Feature/PredefinedKits/Ui/CreatePredefinedKitTest.php
@@ -0,0 +1,16 @@
+<?php
+
+namespace Tests\Feature\PredefinedKits\Ui;
+
+use App\Models\User;
+use Tests\TestCase;
+
+class CreatePredefinedKitTest extends TestCase
+{
+    public function testPageRenders()
+    {
+        $this->actingAs(User::factory()->superuser()->create())
+            ->get(route('kits.create'))
+            ->assertOk();
+    }
+}
diff --git a/tests/Feature/PredefinedKits/Ui/IndexPredefinedKitsTest.php b/tests/Feature/PredefinedKits/Ui/IndexPredefinedKitsTest.php
new file mode 100644
index 0000000000..844e804f68
--- /dev/null
+++ b/tests/Feature/PredefinedKits/Ui/IndexPredefinedKitsTest.php
@@ -0,0 +1,16 @@
+<?php
+
+namespace Tests\Feature\PredefinedKits\Ui;
+
+use App\Models\User;
+use Tests\TestCase;
+
+class IndexPredefinedKitsTest extends TestCase
+{
+    public function testPageRenders()
+    {
+        $this->actingAs(User::factory()->superuser()->create())
+            ->get(route('kits.index'))
+            ->assertOk();
+    }
+}
diff --git a/tests/Feature/PredefinedKits/Ui/ShowPredefinedKitTest.php b/tests/Feature/PredefinedKits/Ui/ShowPredefinedKitTest.php
new file mode 100644
index 0000000000..16d730831c
--- /dev/null
+++ b/tests/Feature/PredefinedKits/Ui/ShowPredefinedKitTest.php
@@ -0,0 +1,17 @@
+<?php
+
+namespace Tests\Feature\PredefinedKits\Ui;
+
+use App\Models\PredefinedKit;
+use App\Models\User;
+use Tests\TestCase;
+
+class ShowPredefinedKitTest extends TestCase
+{
+    public function testPageRenders()
+    {
+        $this->actingAs(User::factory()->superuser()->create())
+            ->get(route('kits.show', PredefinedKit::factory()->create()->id))
+            ->assertOk();
+    }
+}
diff --git a/tests/Feature/PredefinedKits/Ui/UpdatePredefinedKitTest.php b/tests/Feature/PredefinedKits/Ui/UpdatePredefinedKitTest.php
new file mode 100644
index 0000000000..6eb97471fb
--- /dev/null
+++ b/tests/Feature/PredefinedKits/Ui/UpdatePredefinedKitTest.php
@@ -0,0 +1,17 @@
+<?php
+
+namespace Tests\Feature\PredefinedKits\Ui;
+
+use App\Models\PredefinedKit;
+use App\Models\User;
+use Tests\TestCase;
+
+class UpdatePredefinedKitTest extends TestCase
+{
+    public function testPageRenders()
+    {
+        $this->actingAs(User::factory()->superuser()->create())
+            ->get(route('kits.edit', PredefinedKit::factory()->create()->id))
+            ->assertOk();
+    }
+}
diff --git a/tests/Feature/Redirects/ModelNotFoundRedirectTest.php b/tests/Feature/Redirects/ModelNotFoundRedirectTest.php
new file mode 100644
index 0000000000..26401e9607
--- /dev/null
+++ b/tests/Feature/Redirects/ModelNotFoundRedirectTest.php
@@ -0,0 +1,51 @@
+<?php
+
+namespace Tests\Feature\Redirects;
+
+use App\Models\User;
+use Tests\TestCase;
+
+class ModelNotFoundRedirectTest extends TestCase
+{
+    public function testHandlesAsset404()
+    {
+        $this->actingAs(User::factory()->viewAssets()->create())
+            ->get(route('hardware.checkout.create', 9999))
+            ->assertRedirectToRoute('hardware.index');
+    }
+
+    public function testHandlesAssetMaintenance404()
+    {
+        $this->actingAs(User::factory()->viewAssets()->create())
+            ->get(route('maintenances.show', 9999))
+            ->assertRedirectToRoute('maintenances.index');
+    }
+
+    public function testHandlesAssetModel404()
+    {
+        $this->actingAs(User::factory()->viewAssetModels()->create())
+            ->get(route('models.show', 9999))
+            ->assertRedirectToRoute('models.index');
+    }
+
+    public function testHandlesLicenseSeat404()
+    {
+        $this->actingAs(User::factory()->viewLicenses()->create())
+            ->get(route('licenses.checkin', 9999))
+            ->assertRedirectToRoute('licenses.index');
+    }
+
+    public function testHandlesPredefinedKit404()
+    {
+        $this->actingAs(User::factory()->viewPredefinedKits()->create())
+            ->get(route('kits.show', 9999))
+            ->assertRedirectToRoute('kits.index');
+    }
+
+    public function testHandlesReportTemplate404()
+    {
+        $this->actingAs(User::factory()->canViewReports()->create())
+            ->get(route('report-templates.show', 9999))
+            ->assertRedirectToRoute('reports/custom');
+    }
+}
diff --git a/tests/Feature/ReportTemplates/DeleteReportTemplateTest.php b/tests/Feature/ReportTemplates/DeleteReportTemplateTest.php
new file mode 100644
index 0000000000..cebc8156ad
--- /dev/null
+++ b/tests/Feature/ReportTemplates/DeleteReportTemplateTest.php
@@ -0,0 +1,47 @@
+<?php
+
+namespace Tests\Feature\ReportTemplates;
+
+use App\Models\ReportTemplate;
+use App\Models\User;
+use PHPUnit\Framework\Attributes\Group;
+use Tests\Concerns\TestsPermissionsRequirement;
+use Tests\TestCase;
+
+#[Group('custom-reporting')]
+class DeleteReportTemplateTest extends TestCase implements TestsPermissionsRequirement
+{
+    public function testRequiresPermission()
+    {
+        $reportTemplate = ReportTemplate::factory()->create();
+
+        $this->actingAs(User::factory()->create())
+            ->post(route('report-templates.destroy', $reportTemplate->id))
+            ->assertStatus(302);
+
+        $this->assertModelExists($reportTemplate);
+    }
+
+    public function testCannotDeleteAnotherUsersReportTemplate()
+    {
+        $reportTemplate = ReportTemplate::factory()->create();
+
+        $this->actingAs(User::factory()->canViewReports()->create())
+            ->delete(route('report-templates.destroy', $reportTemplate->id))
+            ->assertStatus(302);
+
+        $this->assertModelExists($reportTemplate);
+    }
+
+    public function testCanDeleteAReportTemplate()
+    {
+        $user = User::factory()->canViewReports()->create();
+        $reportTemplate = ReportTemplate::factory()->for($user, 'creator')->create();
+
+        $this->actingAs($user)
+            ->delete(route('report-templates.destroy', $reportTemplate->id))
+            ->assertRedirect(route('reports/custom'));
+
+        $this->assertSoftDeleted($reportTemplate);
+    }
+}
diff --git a/tests/Feature/ReportTemplates/EditReportTemplateTest.php b/tests/Feature/ReportTemplates/EditReportTemplateTest.php
new file mode 100644
index 0000000000..d359baddde
--- /dev/null
+++ b/tests/Feature/ReportTemplates/EditReportTemplateTest.php
@@ -0,0 +1,40 @@
+<?php
+
+namespace Tests\Feature\ReportTemplates;
+
+use App\Models\ReportTemplate;
+use App\Models\User;
+use PHPUnit\Framework\Attributes\Group;
+use Tests\Concerns\TestsPermissionsRequirement;
+use Tests\TestCase;
+
+#[Group('custom-reporting')]
+class EditReportTemplateTest extends TestCase implements TestsPermissionsRequirement
+{
+    public function testRequiresPermission()
+    {
+        $this->actingAs(User::factory()->create())
+            ->get(route('report-templates.edit', ReportTemplate::factory()->create()))
+            ->assertStatus(302);
+    }
+
+    public function testCannotLoadEditPageForAnotherUsersReportTemplate()
+    {
+        $user = User::factory()->canViewReports()->create();
+        $reportTemplate = ReportTemplate::factory()->create();
+
+        $this->actingAs($user)
+            ->get(route('report-templates.edit', $reportTemplate))
+            ->assertStatus(302);
+    }
+
+    public function testCanLoadEditReportTemplatePage()
+    {
+        $user = User::factory()->canViewReports()->create();
+        $reportTemplate = ReportTemplate::factory()->for($user, 'creator')->create();
+
+        $this->actingAs($user)
+            ->get(route('report-templates.edit', $reportTemplate))
+            ->assertOk();
+    }
+}
diff --git a/tests/Feature/ReportTemplates/ShowReportTemplateTest.php b/tests/Feature/ReportTemplates/ShowReportTemplateTest.php
new file mode 100644
index 0000000000..748df288b5
--- /dev/null
+++ b/tests/Feature/ReportTemplates/ShowReportTemplateTest.php
@@ -0,0 +1,43 @@
+<?php
+
+namespace Tests\Feature\ReportTemplates;
+
+use App\Models\ReportTemplate;
+use App\Models\User;
+use PHPUnit\Framework\Attributes\Group;
+use Tests\Concerns\TestsPermissionsRequirement;
+use Tests\TestCase;
+
+#[Group('custom-reporting')]
+class ShowReportTemplateTest extends TestCase implements TestsPermissionsRequirement
+{
+    public function testRequiresPermission()
+    {
+        $this->actingAs(User::factory()->create())
+            ->get(route('report-templates.show', ReportTemplate::factory()->create()))
+            ->assertStatus(302);
+    }
+
+    public function testCanLoadASavedReportTemplate()
+    {
+        $user = User::factory()->canViewReports()->create();
+        $reportTemplate = ReportTemplate::factory()->make(['name' => 'My Awesome Template']);
+        $user->reportTemplates()->save($reportTemplate);
+
+        $this->actingAs($user)
+            ->get(route('report-templates.show', $reportTemplate))
+            ->assertOk()
+            ->assertViewHas(['template' => function (ReportTemplate $templatePassedToView) use ($reportTemplate) {
+                return $templatePassedToView->is($reportTemplate);
+            }]);
+    }
+
+    public function testCannotLoadAnotherUsersSavedReportTemplate()
+    {
+        $reportTemplate = ReportTemplate::factory()->create();
+
+        $this->actingAs(User::factory()->canViewReports()->create())
+            ->get(route('report-templates.show', $reportTemplate))
+            ->assertStatus(302);
+    }
+}
diff --git a/tests/Feature/ReportTemplates/StoreReportTemplateTest.php b/tests/Feature/ReportTemplates/StoreReportTemplateTest.php
new file mode 100644
index 0000000000..06121711e8
--- /dev/null
+++ b/tests/Feature/ReportTemplates/StoreReportTemplateTest.php
@@ -0,0 +1,66 @@
+<?php
+
+namespace Tests\Feature\ReportTemplates;
+
+use App\Models\ReportTemplate;
+use App\Models\User;
+use PHPUnit\Framework\Attributes\Group;
+use Tests\Concerns\TestsPermissionsRequirement;
+use Tests\TestCase;
+
+#[Group('custom-reporting')]
+class StoreReportTemplateTest extends TestCase implements TestsPermissionsRequirement
+{
+    public function testRequiresPermission()
+    {
+        $this->actingAs(User::factory()->create())
+            ->post(route('report-templates.store'))
+            ->assertForbidden();
+    }
+
+    public function testSavingReportTemplateRequiresValidFields()
+    {
+        $this->actingAs(User::factory()->canViewReports()->create())
+            ->post(route('report-templates.store'), [
+                'name' => '',
+            ])
+            ->assertSessionHasErrors('name');
+    }
+
+    public function testRedirectingAfterValidationErrorRestoresInputs()
+    {
+        $this->actingAs(User::factory()->canViewReports()->create())
+            // start on the custom report page
+            ->from(route('reports/custom'))
+            ->followingRedirects()
+            ->post(route('report-templates.store'), [
+                'name' => '',
+                // set some values to ensure they are still present
+                // when returning to the custom report page.
+                'by_company_id' => [2, 3]
+            ])->assertViewHas(['template' => function (ReportTemplate $reportTemplate) {
+                return data_get($reportTemplate, 'options.by_company_id') === [2, 3];
+            }]);
+    }
+
+    public function testCanSaveAReportTemplate()
+    {
+        $user = User::factory()->canViewReports()->create();
+
+        $this->actingAs($user)
+            ->post(route('report-templates.store'), [
+                'name' => 'My Awesome Template',
+                'company' => '1',
+                'by_company_id' => ['1', '2'],
+            ])
+            ->assertRedirect();
+
+        $template = $user->reportTemplates->first(function ($report) {
+            return $report->name === 'My Awesome Template';
+        });
+
+        $this->assertNotNull($template);
+        $this->assertEquals('1', $template->options['company']);
+        $this->assertEquals(['1', '2'], $template->options['by_company_id']);
+    }
+}
diff --git a/tests/Feature/ReportTemplates/UpdateReportTemplateTest.php b/tests/Feature/ReportTemplates/UpdateReportTemplateTest.php
new file mode 100644
index 0000000000..09c168b27e
--- /dev/null
+++ b/tests/Feature/ReportTemplates/UpdateReportTemplateTest.php
@@ -0,0 +1,74 @@
+<?php
+
+namespace Tests\Feature\ReportTemplates;
+
+use App\Models\ReportTemplate;
+use App\Models\User;
+use PHPUnit\Framework\Attributes\Group;
+use Tests\Concerns\TestsPermissionsRequirement;
+use Tests\TestCase;
+
+#[Group('custom-reporting')]
+class UpdateReportTemplateTest extends TestCase implements TestsPermissionsRequirement
+{
+    public function testRequiresPermission()
+    {
+        $this->actingAs(User::factory()->create())
+            ->post(route('report-templates.update', ReportTemplate::factory()->create()))
+            ->assertStatus(302);
+    }
+
+    public function testCannotUpdateAnotherUsersReportTemplate()
+    {
+        $this->actingAs(User::factory()->canViewReports()->create())
+            ->post(route('report-templates.update', ReportTemplate::factory()->create()))
+            ->assertStatus(302);
+    }
+
+    public function testUpdatingReportTemplateRequiresValidFields()
+    {
+        $user = User::factory()->canViewReports()->create();
+
+        $reportTemplate = ReportTemplate::factory()->for($user, 'creator')->create();
+
+        $this->actingAs($user)
+            ->post(route('report-templates.update', $reportTemplate), [
+                //
+            ])
+            ->assertSessionHasErrors([
+                'name' => 'The name field is required.',
+            ]);
+    }
+
+    public function testCanUpdateAReportTemplate()
+    {
+        $user = User::factory()->canViewReports()->create();
+
+        $reportTemplate = ReportTemplate::factory()->for($user, 'creator')->create([
+            'name' => 'Original Name',
+            'options' => [
+                'id' => 1,
+                'category' => 1,
+                'by_category_id' => 2,
+                'company' => 1,
+                'by_company_id' => [1, 2],
+            ],
+        ]);
+
+        $this->actingAs($user)
+            ->post(route('report-templates.update', $reportTemplate), [
+                'name' => 'Updated Name',
+                'id' => 1,
+                'company' => 1,
+                'by_company_id' => [3],
+            ]);
+
+        $reportTemplate->refresh();
+        $this->assertEquals('Updated Name', $reportTemplate->name);
+        $this->assertEquals(1, $reportTemplate->checkmarkValue('id'));
+        $this->assertEquals(0, $reportTemplate->checkmarkValue('category'));
+        $this->assertEquals([], $reportTemplate->selectValues('by_category_id'));
+        $this->assertEquals(1, $reportTemplate->checkmarkValue('company'));
+        $this->assertEquals([3], $reportTemplate->selectValues('by_company_id'));
+    }
+}
diff --git a/tests/Feature/Reporting/ActivityReportTest.php b/tests/Feature/Reporting/ActivityReportTest.php
new file mode 100644
index 0000000000..e094f86b6e
--- /dev/null
+++ b/tests/Feature/Reporting/ActivityReportTest.php
@@ -0,0 +1,81 @@
+<?php
+
+namespace Tests\Feature\Reporting;
+
+use App\Models\Asset;
+use App\Models\Company;
+use App\Models\User;
+use App\Models\Actionlog;
+use Database\Factories\ActionlogFactory;
+use Illuminate\Testing\Fluent\AssertableJson;
+use Illuminate\Testing\TestResponse;
+use League\Csv\Reader;
+use PHPUnit\Framework\Assert;
+use Tests\TestCase;
+
+class ActivityReportTest extends TestCase
+{
+    public function testRequiresPermissionToViewActivity()
+    {
+        $this->actingAsForApi(User::factory()->create())
+            ->getJson(route('api.activity.index'))
+            ->assertForbidden();
+    }
+
+    public function testRecordsAreScopedToCompanyWhenMultipleCompanySupportEnabled()
+    {
+        $this->markTestIncomplete('This test returns strange results. Need to figure out why.');
+        $this->settings->enableMultipleFullCompanySupport();
+
+        $companyA = Company::factory()->create();
+        $companyB = Company::factory()->create();
+
+        $superUser = User::factory()->superuser()->make();
+
+        $userInCompanyA = User::factory()
+            ->viewUsers()
+            ->viewAssets()
+            ->canViewReports()
+            ->create(['company_id' => $companyA->id]);
+
+        $userInCompanyB = User::factory()
+            ->viewUsers()
+            ->viewAssets()
+            ->canViewReports()
+            ->create(['company_id' => $companyB->id]);
+
+        Asset::factory()->count(5)->create(['company_id' => $companyA->id]);
+        Asset::factory()->count(4)->create(['company_id' => $companyB->id]);
+        Asset::factory()->count(3)->create();
+
+        Actionlog::factory()->userUpdated()->count(5)->create(['company_id' => $companyA->id]);
+        Actionlog::factory()->userUpdated()->count(4)->create(['company_id' => $companyB->id]);
+        Actionlog::factory()->userUpdated()->count(3)->create(['company_id' => $companyB->id]);
+
+        // I don't love this, since it doesn't test that we're actually storing the company ID appropriately
+        // but it's better than what we had
+        $response = $this->actingAsForApi($userInCompanyA)
+            ->getJson(route('api.activity.index'))
+            ->assertOk()
+            ->assertJsonStructure([
+                'rows',
+            ])
+            ->assertJson(fn(AssertableJson $json) => $json->has('rows', 5)->etc());
+
+
+        $this->actingAsForApi($userInCompanyB)
+            ->getJson(
+                route('api.activity.index'))
+            ->assertOk()
+            ->assertJsonStructure([
+                'rows',
+            ])
+            ->assertJson(fn(AssertableJson $json) => $json->has('rows', 7)->etc());
+
+
+
+
+
+    }
+
+}
diff --git a/tests/Feature/Reporting/CustomReportTest.php b/tests/Feature/Reporting/CustomReportTest.php
index 4d11cb23c8..0f53bd4efc 100644
--- a/tests/Feature/Reporting/CustomReportTest.php
+++ b/tests/Feature/Reporting/CustomReportTest.php
@@ -4,13 +4,18 @@ namespace Tests\Feature\Reporting;
 
 use App\Models\Asset;
 use App\Models\Company;
+use App\Models\ReportTemplate;
 use App\Models\User;
+use Illuminate\Database\Eloquent\Collection;
 use Illuminate\Testing\TestResponse;
 use League\Csv\Reader;
 use PHPUnit\Framework\Assert;
+use PHPUnit\Framework\Attributes\Group;
+use Tests\Concerns\TestsPermissionsRequirement;
 use Tests\TestCase;
 
-class CustomReportTest extends TestCase
+#[Group('custom-reporting')]
+class CustomReportTest extends TestCase implements TestsPermissionsRequirement
 {
     protected function setUp(): void
     {
@@ -43,6 +48,47 @@ class CustomReportTest extends TestCase
         );
     }
 
+    public function testRequiresPermission()
+    {
+        $this->actingAs(User::factory()->create())
+            ->get(route('reports/custom'))
+            ->assertForbidden();
+    }
+
+    public function testCanLoadCustomReportPage()
+    {
+        $this->actingAs(User::factory()->canViewReports()->create())
+            ->get(route('reports/custom'))
+            ->assertOk()
+            ->assertViewHas([
+                'template' => function (ReportTemplate $template) {
+                    // the view should have an empty report by default
+                    return $template->exists() === false;
+                }
+            ]);
+    }
+
+    public function testSavedTemplatesOnPageAreScopedToTheUser()
+    {
+        // Given there is a saved template for one user
+        ReportTemplate::factory()->create(['name' => 'Report A']);
+
+        // When loading reports/custom while acting as another user that also has a saved template
+        $user = User::factory()->canViewReports()
+            ->has(ReportTemplate::factory(['name' => 'Report B']))
+            ->create();
+
+        // The user should not see the other user's template (in view as 'report_templates')
+        $this->actingAs($user)
+            ->get(route('reports/custom'))
+            ->assertViewHas([
+                'report_templates' => function (Collection $reports) {
+                    return $reports->pluck('name')->doesntContain('Report A');
+                }
+            ]);
+    }
+
+
     public function testCustomAssetReport()
     {
         Asset::factory()->create(['name' => 'Asset A']);
diff --git a/tests/Feature/Reporting/UnacceptedAssetReportTest.php b/tests/Feature/Reporting/UnacceptedAssetReportTest.php
new file mode 100644
index 0000000000..b3ec0b2e0b
--- /dev/null
+++ b/tests/Feature/Reporting/UnacceptedAssetReportTest.php
@@ -0,0 +1,61 @@
+<?php
+
+namespace Tests\Feature\Reporting;
+
+use App\Models\Asset;
+use App\Models\Company;
+use App\Models\User;
+use Illuminate\Testing\TestResponse;
+use League\Csv\Reader;
+use PHPUnit\Framework\Assert;
+use Tests\TestCase;
+
+class UnacceptedAssetReportTest extends TestCase
+{
+    protected function setUp(): void
+    {
+        parent::setUp();
+
+        TestResponse::macro(
+            'assertSeeTextInStreamedResponse',
+            function (string $needle) {
+                Assert::assertTrue(
+                    collect(Reader::createFromString($this->streamedContent())->getRecords())
+                        ->pluck(0)
+                        ->contains($needle)
+                );
+
+                return $this;
+            }
+        );
+
+        TestResponse::macro(
+            'assertDontSeeTextInStreamedResponse',
+            function (string $needle) {
+                Assert::assertFalse(
+                    collect(Reader::createFromString($this->streamedContent())->getRecords())
+                        ->pluck(0)
+                        ->contains($needle)
+                );
+
+                return $this;
+            }
+        );
+    }
+
+
+    public function testPermissionRequiredToViewUnacceptedAssetReport()
+    {
+        $this->actingAs(User::factory()->create())
+            ->get(route('reports/unaccepted_assets'))
+            ->assertForbidden();
+    }
+
+    public function testUserCanListUnacceptedAssets()
+    {
+        $this->actingAs(User::factory()->superuser()->create())
+            ->get(route('reports/unaccepted_assets'))
+            ->assertOk();
+    }
+    
+}
diff --git a/tests/Feature/Settings/AlertsSettingTest.php b/tests/Feature/Settings/AlertsSettingTest.php
new file mode 100644
index 0000000000..f8829d3825
--- /dev/null
+++ b/tests/Feature/Settings/AlertsSettingTest.php
@@ -0,0 +1,51 @@
+<?php
+
+namespace Tests\Feature\Settings;
+
+use Tests\TestCase;
+use App\Models\User;
+
+
+class AlertsSettingTest extends TestCase
+{
+    public function testPermissionRequiredToViewAlertSettings()
+    {
+        $this->actingAs(User::factory()->create())
+            ->get(route('settings.alerts.index'))
+            ->assertForbidden();
+    }
+
+    public function testAdminCCEmailArrayCanBeSaved()
+    {
+        $response = $this->actingAs(User::factory()->superuser()->create())
+            ->post(route('settings.alerts.save', [
+                'alert_email' => 'me@example.com,you@example.com',
+                'admin_cc_always' => '1',
+            ]))
+            ->assertStatus(302)
+            ->assertValid('alert_email')
+            ->assertRedirect(route('settings.index'))
+            ->assertSessionHasNoErrors();
+        $this->followRedirects($response)->assertSee('alert-success');
+    }
+
+    public function test_can_update_admin_cc_always_to_true()
+    {
+        $this->settings->disableAdminCCAlways();
+
+        $this->actingAs(User::factory()->superuser()->create())
+            ->post(route('settings.alerts.save', ['admin_cc_always' => '1']));
+
+        $this->assertDatabaseHas('settings', ['admin_cc_always' => '1']);
+    }
+
+    public function test_can_update_admin_cc_always_to_false()
+    {
+        $this->settings->enableAdminCC()->enableAdminCCAlways();
+
+        $this->actingAs(User::factory()->superuser()->create())
+            ->post(route('settings.alerts.save', ['admin_cc_always' => '0']));
+
+        $this->assertDatabaseHas('settings', ['admin_cc_always' => '0']);
+    }
+}
diff --git a/tests/Feature/Settings/BrandingSettingsTest.php b/tests/Feature/Settings/BrandingSettingsTest.php
index a27a5d1ef8..d751a1ab47 100644
--- a/tests/Feature/Settings/BrandingSettingsTest.php
+++ b/tests/Feature/Settings/BrandingSettingsTest.php
@@ -2,15 +2,314 @@
 
 namespace Tests\Feature\Settings;
 
-use App\Models\User;
 use Tests\TestCase;
+use Illuminate\Http\UploadedFile;
+use Illuminate\Support\Facades\Storage;
+use App\Models\User;
+use App\Models\Setting;
+
 
 class BrandingSettingsTest extends TestCase
 {
     public function testSiteNameIsRequired()
     {
-        $this->actingAs(User::factory()->superuser()->create())
+        $response = $this->actingAs(User::factory()->superuser()->create())
+            ->from(route('settings.branding.index'))
             ->post(route('settings.branding.save', ['site_name' => '']))
-            ->assertInvalid('site_name');
+            ->assertSessionHasErrors(['site_name'])
+            ->assertInvalid(['site_name'])
+            ->assertStatus(302)
+            ->assertRedirect(route('settings.branding.index'));
+
+        $this->followRedirects($response)->assertSee(trans('general.error'));
     }
+
+    public function testSiteNameCanBeSaved()
+    {
+        $response = $this->actingAs(User::factory()->superuser()->create())
+            ->post(route('settings.branding.save', ['site_name' => 'My Awesome Site']))
+            ->assertStatus(302)
+            ->assertValid('site_name')
+            ->assertRedirect(route('settings.index'))
+            ->assertSessionHasNoErrors();
+
+        $this->followRedirects($response)->assertSee('alert-success');
+    }
+
+
+    public function testLogoCanBeUploaded()
+    {
+        Storage::fake('public');
+        $setting = Setting::factory()->create(['logo' => null]);
+
+        $response = $this->actingAs(User::factory()->superuser()->create())
+            ->post(route('settings.branding.save',
+                ['logo' => UploadedFile::fake()->image('test_logo.png')->storeAs('', 'test_logo.png', 'public')]
+            ))
+            ->assertValid('logo')
+            ->assertStatus(302)
+            ->assertRedirect(route('settings.index'))
+            ->assertSessionHasNoErrors();
+
+        $this->followRedirects($response)->assertSee('alert-success');
+
+        $setting->refresh();
+        Storage::disk('public')->assertExists($setting->logo);
+    }
+
+    public function testLogoCanBeDeleted()
+    {
+        Storage::fake('public');
+
+        $setting = Setting::factory()->create(['logo' => 'new_test_logo.png']);
+        $original_file = UploadedFile::fake()->image('new_test_logo.png')->storeAs('uploads', 'new_test_logo.png', 'public');
+        Storage::disk('public')->assertExists($original_file);
+
+        $this->assertNotNull($setting->logo);
+
+        $response = $this->actingAs(User::factory()->superuser()->create())
+            ->from(route('settings.branding.index'))
+            ->post(route('settings.branding.save',
+                ['clear_logo' => '1']
+            ))
+            ->assertValid('logo')
+            ->assertStatus(302)
+            ->assertRedirect(route('settings.index'));
+
+        $this->followRedirects($response)->assertSee(trans('alert-success'));
+        $this->assertDatabaseHas('settings', ['logo' => null]);
+        //Storage::disk('public')->assertMissing($original_file);
+    }
+
+    public function testEmailLogoCanBeUploaded()
+    {
+        Storage::fake('public');
+
+        $original_file = UploadedFile::fake()->image('before_test_email_logo.png')->storeAs('', 'before_test_email_logo.png', 'public');
+
+        Storage::disk('public')->assertExists($original_file);
+        Setting::factory()->create(['email_logo' => $original_file]);
+
+        $response = $this->actingAs(User::factory()->superuser()->create())
+            ->from(route('settings.branding.index'))
+            ->post(route('settings.branding.save',
+                [
+                    'email_logo' => UploadedFile::fake()->image('new_test_email_logo.png')->storeAs('', 'new_test_email_logo.png', 'public')
+                ]
+            ))
+            ->assertValid('email_logo')
+            ->assertStatus(302)
+            ->assertRedirect(route('settings.index'));
+
+        $this->followRedirects($response)->assertSee(trans('alert-success'));
+
+        Storage::disk('public')->assertExists('new_test_email_logo.png');
+        // Storage::disk('public')->assertMissing($original_file);
+    }
+
+    public function testEmailLogoCanBeDeleted()
+    {
+        Storage::fake('public');
+
+        $setting = Setting::factory()->create(['email_logo' => 'new_test_email_logo.png']);
+        $original_file = UploadedFile::fake()->image('new_test_email_logo.png')->storeAs('', 'new_test_email_logo.png', 'public');
+        Storage::disk('public')->assertExists($original_file);
+
+        $this->assertNotNull($setting->email_logo);
+
+        $response = $this->actingAs(User::factory()->superuser()->create())
+            ->from(route('settings.branding.index'))
+            ->post(route('settings.branding.save',
+                ['clear_email_logo' => '1']
+            ))
+            ->assertValid('email_logo')
+            ->assertStatus(302)
+            ->assertRedirect(route('settings.index'));
+        $setting->refresh();
+        $this->followRedirects($response)->assertSee(trans('alert-success'));
+        $this->assertDatabaseHas('settings', ['email_logo' => null]);
+
+        //Storage::disk('public')->assertMissing('new_test_email_logo.png');
+
+    }
+
+
+    public function testLabelLogoCanBeUploaded()
+    {
+
+        Storage::fake('public');
+
+        $original_file = UploadedFile::fake()->image('before_test_label_logo.png')->storeAs('', 'before_test_label_logo.png', 'public');
+
+        Storage::disk('public')->assertExists($original_file);
+        Setting::factory()->create(['label_logo' => $original_file]);
+
+        $response = $this->actingAs(User::factory()->superuser()->create())
+            ->from(route('settings.branding.index'))
+            ->post(route('settings.branding.save',
+                [
+                    'label_logo' => UploadedFile::fake()->image('new_test_label_logo.png')->storeAs('', 'new_test_label_logo.png', 'public')
+                ]
+            ))
+            ->assertValid('label_logo')
+            ->assertStatus(302)
+            ->assertRedirect(route('settings.index'));
+
+        $this->followRedirects($response)->assertSee(trans('alert-success'));
+
+        Storage::disk('public')->assertExists('new_test_label_logo.png');
+        // Storage::disk('public')->assertMissing($original_file);
+
+
+    }
+
+    public function testLabelLogoCanBeDeleted()
+    {
+
+        Storage::fake('public');
+
+        $setting = Setting::factory()->create(['label_logo' => 'new_test_label_logo.png']);
+        $original_file = UploadedFile::fake()->image('new_test_label_logo.png')->storeAs('', 'new_test_label_logo.png', 'public');
+        Storage::disk('public')->assertExists($original_file);
+
+        $this->assertNotNull($setting->label_logo);
+
+        $response = $this->actingAs(User::factory()->superuser()->create())
+            ->from(route('settings.branding.index'))
+            ->post(route('settings.branding.save',
+                ['label_logo' => '1']
+            ))
+            ->assertValid('label_logo')
+            ->assertStatus(302)
+            ->assertRedirect(route('settings.index'));
+
+        $setting->refresh();
+        $this->followRedirects($response)->assertSee(trans('alert-success'));
+        // $this->assertNull($setting->refresh()->logo);
+        // Storage::disk('public')->assertMissing($original_file);
+
+    }
+
+    public function testDefaultAvatarCanBeUploaded()
+    {
+        Storage::fake('public');
+
+        $response = $this->actingAs(User::factory()->superuser()->create())
+            ->from(route('settings.branding.index'))
+            ->post(route('settings.branding.save',
+                [
+                    'default_avatar' => UploadedFile::fake()->image('default_avatar.png')->storeAs('', 'default_avatar.png', 'public')
+                ]
+            ))
+            ->assertValid('default_avatar')
+            ->assertStatus(302)
+            ->assertRedirect(route('settings.index'))
+            ->assertSessionHasNoErrors();
+
+        $this->followRedirects($response)->assertSee(trans('alert-success'));
+
+        Storage::disk('public')->assertExists('default_avatar.png');
+        // Storage::disk('public')->assertMissing($original_file);
+    }
+
+    public function testDefaultAvatarCanBeDeleted()
+    {
+        Storage::fake('public');
+
+        $setting = Setting::factory()->create(['default_avatar' => 'new_test_label_logo.png']);
+        $original_file = UploadedFile::fake()->image('default_avatar.png')->storeAs('', 'default_avatar.png', 'public');
+        Storage::disk('public')->assertExists($original_file);
+
+        $this->assertNotNull($setting->default_avatar);
+
+        $response = $this->actingAs(User::factory()->superuser()->create())
+            ->from(route('settings.branding.index'))
+            ->post(route('settings.branding.save',
+                ['clear_default_avatar' => '1']
+            ))
+            ->assertValid('default_avatar')
+            ->assertStatus(302)
+            ->assertRedirect(route('settings.index'));
+
+        $setting->refresh();
+        $this->followRedirects($response)->assertSee(trans('alert-success'));
+         // $this->assertNull($setting->refresh()->default_avatar);
+        // Storage::disk('public')->assertMissing($original_file);
+    }
+
+    public function testSnipeDefaultAvatarCanBeDeleted()
+    {
+
+        $setting = Setting::getSettings()->first();
+        Storage::fake('public');
+
+        $this->actingAs(User::factory()->superuser()->create())
+            ->post(route('settings.branding.save',
+                ['default_avatar' => UploadedFile::fake()->image('default.png')->storeAs('avatars', 'default.png', 'public')]
+            ));
+
+        Storage::disk('public')->assertExists('avatars/default.png');
+
+
+        $this->actingAs(User::factory()->superuser()->create())
+            ->post(route('settings.branding.save',
+                ['clear_default_avatar' => '1']
+            ));
+
+        $this->assertNull($setting->refresh()->default_avatar);
+        $this->assertDatabaseHas('settings', ['default_avatar' => null]);
+        Storage::disk('public')->assertExists('avatars/default.png');
+
+    }
+
+    public function testFaviconCanBeUploaded()
+    {
+        $this->markTestIncomplete('This fails mimetype validation on the mock');
+        Storage::fake('public');
+
+        $response = $this->actingAs(User::factory()->superuser()->create())
+            ->from(route('settings.branding.index'))
+            ->post(route('settings.branding.save',
+                [
+                    'favicon' =>UploadedFile::fake()->image('favicon.svg')->storeAs('', 'favicon.svg', 'public')
+                ]
+            ))
+            ->assertValid('favicon')
+            ->assertStatus(302)
+            ->assertRedirect(route('settings.index'));
+
+        $this->followRedirects($response)->assertSee(trans('alert-success'));
+
+        Storage::disk('public')->assertExists('favicon.png');
+    }
+
+    public function testFaviconCanBeDeleted()
+    {
+        $this->markTestIncomplete('This fails mimetype validation on the mock');
+        Storage::fake('public');
+
+        $setting = Setting::factory()->create(['favicon' => 'favicon.png']);
+        $original_file = UploadedFile::fake()->image('favicon.png')->storeAs('', 'favicon.png', 'public');
+        Storage::disk('public')->assertExists($original_file);
+
+        $this->assertNotNull($setting->favicon);
+
+        $response = $this->actingAs(User::factory()->superuser()->create())
+            ->from(route('settings.branding.index'))
+            ->post(route('settings.branding.save',
+                ['clear_favicon' => '1']
+            ))
+            ->assertValid('favicon')
+            ->assertStatus(302)
+            ->assertRedirect(route('settings.index'));
+        $setting->refresh();
+        $this->followRedirects($response)->assertSee(trans('alert-success'));
+        $this->assertDatabaseHas('settings', ['favicon' => null]);
+
+        // This fails for some reason - the file is not being deleted, or at least the test doesn't think it is
+        // Storage::disk('public')->assertMissing('favicon.png');
+    }
+
+
+
 }
diff --git a/tests/Feature/Settings/LabelSettingTest.php b/tests/Feature/Settings/LabelSettingTest.php
new file mode 100644
index 0000000000..e96c684a89
--- /dev/null
+++ b/tests/Feature/Settings/LabelSettingTest.php
@@ -0,0 +1,18 @@
+<?php
+
+namespace Tests\Feature\Settings;
+
+use Tests\TestCase;
+use App\Models\User;
+
+
+class LabelSettingTest extends TestCase
+{
+    public function testPermissionRequiredToViewLabelSettings()
+    {
+        $this->actingAs(User::factory()->create())
+            ->get(route('settings.labels.index'))
+            ->assertForbidden();
+    }
+
+}
diff --git a/tests/Feature/Settings/LdapSettingsTest.php b/tests/Feature/Settings/LdapSettingsTest.php
new file mode 100644
index 0000000000..6d690fd89b
--- /dev/null
+++ b/tests/Feature/Settings/LdapSettingsTest.php
@@ -0,0 +1,61 @@
+<?php
+
+namespace Tests\Feature\Settings;
+
+use Tests\TestCase;
+use App\Models\User;
+
+
+class LdapSettingsTest extends TestCase
+{
+    public function testPermissionRequiredToViewLdapSettings()
+    {
+        $this->actingAs(User::factory()->create())
+            ->get(route('settings.ldap.index'))
+            ->assertForbidden();
+    }
+
+    public function testLdapSettingsCanBeSaved()
+    {
+        $response = $this->actingAs(User::factory()->superuser()->create())
+            ->post(route('settings.ldap.save', [
+                'ldap_enabled' => 1,
+                'ldap_username_field' => 'samaccountname',
+                'ldap_filter' => 'uid=',
+                'ldap_auth_filter_query' => 'uid=',
+                'ldap_uname' => 'SomeUserField',
+                'ldap_pword' => 'MyAwesomePassword',
+                'ldap_basedn' => 'uid=',
+                'ldap_fname_field' => 'SomeFirstnameField',
+                'ldap_server' => 'ldaps://ldap.example.com',
+                'ldap_invert_active_flag' => 0,
+            ]))
+            ->assertStatus(302)
+            ->assertValid('ldap_enabled')
+            ->assertRedirect(route('settings.ldap.index'))
+            ->assertSessionHasNoErrors();
+        $this->followRedirects($response)->assertSee('alert-success');
+    }
+
+    public function testLdapSettingsAreValidatedCorrectly()
+    {
+        $response = $this->actingAs(User::factory()->superuser()->create())
+            ->from(route('settings.ldap.index'))
+            ->post(route('settings.ldap.save', [
+                'ldap_enabled' => 1,
+                'ldap_username_field' => 'sAMAccountName',
+                'ldap_filter' => '(uid=)',
+            ]))
+            ->assertStatus(302)
+            ->assertRedirect(route('settings.ldap.index'))
+            ->assertSessionHasErrors([
+                'ldap_username_field',
+                'ldap_auth_filter_query',
+                'ldap_basedn',
+                'ldap_fname_field',
+                'ldap_server',
+            ]);
+        $this->followRedirects($response)->assertSee('alert-danger');
+    }
+
+}
diff --git a/tests/Feature/Settings/SecuritySettingTest.php b/tests/Feature/Settings/SecuritySettingTest.php
new file mode 100644
index 0000000000..6edeee673b
--- /dev/null
+++ b/tests/Feature/Settings/SecuritySettingTest.php
@@ -0,0 +1,18 @@
+<?php
+
+namespace Tests\Feature\Settings;
+
+use Tests\TestCase;
+use App\Models\User;
+
+
+class SecuritySettingTest extends TestCase
+{
+    public function testPermissionRequiredToViewSecuritySettings()
+    {
+        $this->actingAs(User::factory()->create())
+            ->get(route('settings.security.index'))
+            ->assertForbidden();
+    }
+
+}
diff --git a/tests/Feature/Settings/ShowSetUpPageTest.php b/tests/Feature/Settings/ShowSetUpPageTest.php
index 7f40768db7..fe071491e8 100644
--- a/tests/Feature/Settings/ShowSetUpPageTest.php
+++ b/tests/Feature/Settings/ShowSetUpPageTest.php
@@ -2,6 +2,8 @@
 
 namespace Tests\Feature\Settings;
 
+use PHPUnit\Framework\Attributes\DataProvider;
+use App\Http\Controllers\SettingsController;
 use Illuminate\Database\Events\QueryExecuted;
 use Illuminate\Http\Client\ConnectionException;
 use Illuminate\Http\Client\Request;
@@ -19,6 +21,8 @@ use Tests\TestCase;
 
 class ShowSetUpPageTest extends TestCase
 {
+
+    static ?TestResponse $latestResponse;
     /**
      * We do not want to make actual http request on every test to check .env file
      * visibility because that can be really slow especially in some cases where an
@@ -32,7 +36,8 @@ class ShowSetUpPageTest extends TestCase
             Http::fake([URL::to('.env') => Http::response(null, 404)]);
         }
 
-        return $this->get('/setup');
+        self::$latestResponse = $this->get('/setup');
+        return self::$latestResponse;
     }
 
     public function testView(): void
@@ -162,9 +167,7 @@ class ShowSetUpPageTest extends TestCase
         });
     }
 
-    /**
-     * @dataProvider willShowErrorWhenDotEnvFileIsAccessibleViaHttpData
-     */
+    #[DataProvider('willShowErrorWhenDotEnvFileIsAccessibleViaHttpData')]
     public function testWillShowErrorWhenDotEnvFileIsAccessibleViaHttp(int $statusCode): void
     {
         $this->preventStrayRequest = false;
@@ -301,4 +304,11 @@ class ShowSetUpPageTest extends TestCase
 
         $this->assertSeeDirectoryPermissionError(false);
     }
+
+    public function testInvalidTLSCertsOkWhenCheckingForEnvFile()
+    {
+        //set the weird bad SSL cert place - https://self-signed.badssl.com
+        $this->markTestIncomplete("Not yet sure how to write this test, it requires messing with .env ...");
+        $this->assertTrue((new SettingsController())->dotEnvFileIsExposed());
+    }
 }
diff --git a/tests/Feature/StatusLabels/Api/DeleteStatusLabelsTest.php b/tests/Feature/StatusLabels/Api/DeleteStatusLabelsTest.php
new file mode 100644
index 0000000000..04728c7c41
--- /dev/null
+++ b/tests/Feature/StatusLabels/Api/DeleteStatusLabelsTest.php
@@ -0,0 +1,47 @@
+<?php
+
+namespace Tests\Feature\StatusLabels\Api;
+
+use App\Models\Statuslabel;
+use App\Models\User;
+use Tests\Concerns\TestsPermissionsRequirement;
+use Tests\TestCase;
+
+class DeleteStatusLabelsTest extends TestCase implements TestsPermissionsRequirement
+{
+    public function testRequiresPermission()
+    {
+        $statusLabel = Statuslabel::factory()->create();
+
+        $this->actingAsForApi(User::factory()->create())
+            ->deleteJson(route('api.statuslabels.destroy', $statusLabel))
+            ->assertForbidden();
+
+        $this->assertNotSoftDeleted($statusLabel);
+    }
+
+    public function testCannotDeleteStatusLabelWhileStillAssociatedToAssets()
+    {
+        $statusLabel = Statuslabel::factory()->hasAssets()->create();
+
+        $this->assertGreaterThan(0, $statusLabel->assets->count(), 'Precondition failed: StatusLabel has no assets');
+
+        $this->actingAsForApi(User::factory()->deleteStatusLabels()->create())
+            ->deleteJson(route('api.statuslabels.destroy', $statusLabel))
+            ->assertStatusMessageIs('error');
+
+        $this->assertNotSoftDeleted($statusLabel);
+    }
+
+    public function testCanDeleteStatusLabel()
+    {
+        $statusLabel = Statuslabel::factory()->create();
+
+        $this->actingAsForApi(User::factory()->deleteStatusLabels()->create())
+            ->deleteJson(route('api.statuslabels.destroy', $statusLabel))
+            ->assertOk()
+            ->assertStatusMessageIs('success');
+
+        $this->assertSoftDeleted($statusLabel);
+    }
+}
diff --git a/tests/Feature/StatusLabels/Ui/CreateStatusLabelTest.php b/tests/Feature/StatusLabels/Ui/CreateStatusLabelTest.php
new file mode 100644
index 0000000000..6312ea4e33
--- /dev/null
+++ b/tests/Feature/StatusLabels/Ui/CreateStatusLabelTest.php
@@ -0,0 +1,16 @@
+<?php
+
+namespace Tests\Feature\StatusLabels\Ui;
+
+use App\Models\User;
+use Tests\TestCase;
+
+class CreateStatusLabelTest extends TestCase
+{
+    public function testPageRenders()
+    {
+        $this->actingAs(User::factory()->superuser()->create())
+            ->get(route('statuslabels.create'))
+            ->assertOk();
+    }
+}
diff --git a/tests/Feature/StatusLabels/Ui/IndexStatusLabelsTest.php b/tests/Feature/StatusLabels/Ui/IndexStatusLabelsTest.php
new file mode 100644
index 0000000000..97451666d0
--- /dev/null
+++ b/tests/Feature/StatusLabels/Ui/IndexStatusLabelsTest.php
@@ -0,0 +1,16 @@
+<?php
+
+namespace Tests\Feature\StatusLabels\Ui;
+
+use App\Models\User;
+use Tests\TestCase;
+
+class IndexStatusLabelsTest extends TestCase
+{
+    public function testPageRenders()
+    {
+        $this->actingAs(User::factory()->superuser()->create())
+            ->get(route('statuslabels.index'))
+            ->assertOk();
+    }
+}
diff --git a/tests/Feature/StatusLabels/Ui/ShowStatusLabelTest.php b/tests/Feature/StatusLabels/Ui/ShowStatusLabelTest.php
new file mode 100644
index 0000000000..96e8d75528
--- /dev/null
+++ b/tests/Feature/StatusLabels/Ui/ShowStatusLabelTest.php
@@ -0,0 +1,17 @@
+<?php
+
+namespace Tests\Feature\StatusLabels\Ui;
+
+use App\Models\Statuslabel;
+use App\Models\User;
+use Tests\TestCase;
+
+class ShowStatusLabelTest extends TestCase
+{
+    public function testPageRenders()
+    {
+        $this->actingAs(User::factory()->superuser()->create())
+            ->get(route('statuslabels.show', Statuslabel::factory()->create()))
+            ->assertOk();
+    }
+}
diff --git a/tests/Feature/StatusLabels/Ui/UpdateStatusLabelTest.php b/tests/Feature/StatusLabels/Ui/UpdateStatusLabelTest.php
new file mode 100644
index 0000000000..6726637ea9
--- /dev/null
+++ b/tests/Feature/StatusLabels/Ui/UpdateStatusLabelTest.php
@@ -0,0 +1,17 @@
+<?php
+
+namespace Tests\Feature\StatusLabels\Ui;
+
+use App\Models\Statuslabel;
+use App\Models\User;
+use Tests\TestCase;
+
+class UpdateStatusLabelTest extends TestCase
+{
+    public function testPageRenders()
+    {
+        $this->actingAs(User::factory()->superuser()->create())
+            ->get(route('statuslabels.edit', Statuslabel::factory()->create()->id))
+            ->assertOk();
+    }
+}
diff --git a/tests/Feature/Suppliers/Api/DeleteSuppliersTest.php b/tests/Feature/Suppliers/Api/DeleteSuppliersTest.php
new file mode 100644
index 0000000000..7da8197bde
--- /dev/null
+++ b/tests/Feature/Suppliers/Api/DeleteSuppliersTest.php
@@ -0,0 +1,52 @@
+<?php
+
+namespace Tests\Feature\Suppliers\Api;
+
+use App\Models\AssetMaintenance;
+use App\Models\Supplier;
+use App\Models\User;
+use Tests\Concerns\TestsPermissionsRequirement;
+use Tests\TestCase;
+
+class DeleteSuppliersTest extends TestCase implements TestsPermissionsRequirement
+{
+    public function testRequiresPermission()
+    {
+        $supplier = Supplier::factory()->create();
+
+        $this->actingAsForApi(User::factory()->create())
+            ->deleteJson(route('api.suppliers.destroy', $supplier))
+            ->assertForbidden();
+
+        $this->assertNotSoftDeleted($supplier);
+    }
+
+    public function testCannotDeleteSupplierWithDataStillAssociated()
+    {
+        $supplierWithAsset = Supplier::factory()->hasAssets()->create();
+        $supplierWithAssetMaintenance = Supplier::factory()->has(AssetMaintenance::factory(), 'asset_maintenances')->create();
+        $supplierWithLicense = Supplier::factory()->hasLicenses()->create();
+
+        $actor = $this->actingAsForApi(User::factory()->deleteSuppliers()->create());
+
+        $actor->deleteJson(route('api.suppliers.destroy', $supplierWithAsset))->assertStatusMessageIs('error');
+        $actor->deleteJson(route('api.suppliers.destroy', $supplierWithAssetMaintenance))->assertStatusMessageIs('error');
+        $actor->deleteJson(route('api.suppliers.destroy', $supplierWithLicense))->assertStatusMessageIs('error');
+
+        $this->assertNotSoftDeleted($supplierWithAsset);
+        $this->assertNotSoftDeleted($supplierWithAssetMaintenance);
+        $this->assertNotSoftDeleted($supplierWithLicense);
+    }
+
+    public function testCanDeleteSupplier()
+    {
+        $supplier = Supplier::factory()->create();
+
+        $this->actingAsForApi(User::factory()->deleteSuppliers()->create())
+            ->deleteJson(route('api.suppliers.destroy', $supplier))
+            ->assertOk()
+            ->assertStatusMessageIs('success');
+
+        $this->assertSoftDeleted($supplier);
+    }
+}
diff --git a/tests/Feature/Suppliers/Ui/CreateSupplierTest.php b/tests/Feature/Suppliers/Ui/CreateSupplierTest.php
new file mode 100644
index 0000000000..ec0765a796
--- /dev/null
+++ b/tests/Feature/Suppliers/Ui/CreateSupplierTest.php
@@ -0,0 +1,16 @@
+<?php
+
+namespace Tests\Feature\Suppliers\Ui;
+
+use App\Models\User;
+use Tests\TestCase;
+
+class CreateSupplierTest extends TestCase
+{
+    public function testPageRenders()
+    {
+        $this->actingAs(User::factory()->superuser()->create())
+            ->get(route('suppliers.create'))
+            ->assertOk();
+    }
+}
diff --git a/tests/Feature/Suppliers/Ui/IndexSuppliersTest.php b/tests/Feature/Suppliers/Ui/IndexSuppliersTest.php
new file mode 100644
index 0000000000..e04941f6ea
--- /dev/null
+++ b/tests/Feature/Suppliers/Ui/IndexSuppliersTest.php
@@ -0,0 +1,16 @@
+<?php
+
+namespace Tests\Feature\Suppliers\Ui;
+
+use App\Models\User;
+use Tests\TestCase;
+
+class IndexSuppliersTest extends TestCase
+{
+    public function testPageRenders()
+    {
+        $this->actingAs(User::factory()->superuser()->create())
+            ->get(route('suppliers.index'))
+            ->assertOk();
+    }
+}
diff --git a/tests/Feature/Suppliers/Ui/ShowSupplierTest.php b/tests/Feature/Suppliers/Ui/ShowSupplierTest.php
new file mode 100644
index 0000000000..d041e179f1
--- /dev/null
+++ b/tests/Feature/Suppliers/Ui/ShowSupplierTest.php
@@ -0,0 +1,17 @@
+<?php
+
+namespace Tests\Feature\Suppliers\Ui;
+
+use App\Models\Supplier;
+use App\Models\User;
+use Tests\TestCase;
+
+class ShowSupplierTest extends TestCase
+{
+    public function testPageRenders()
+    {
+        $this->actingAs(User::factory()->superuser()->create())
+            ->get(route('suppliers.show', Supplier::factory()->create()->id))
+            ->assertOk();
+    }
+}
diff --git a/tests/Feature/Suppliers/Ui/UpdateSupplierTest.php b/tests/Feature/Suppliers/Ui/UpdateSupplierTest.php
new file mode 100644
index 0000000000..f3be726319
--- /dev/null
+++ b/tests/Feature/Suppliers/Ui/UpdateSupplierTest.php
@@ -0,0 +1,17 @@
+<?php
+
+namespace Tests\Feature\Suppliers\Ui;
+
+use App\Models\Supplier;
+use App\Models\User;
+use Tests\TestCase;
+
+class UpdateSupplierTest extends TestCase
+{
+    public function testPageRenders()
+    {
+        $this->actingAs(User::factory()->superuser()->create())
+            ->get(route('suppliers.edit', Supplier::factory()->create()->id))
+            ->assertOk();
+    }
+}
diff --git a/tests/Feature/Users/Api/DeleteUserTest.php b/tests/Feature/Users/Api/DeleteUsersTest.php
similarity index 76%
rename from tests/Feature/Users/Api/DeleteUserTest.php
rename to tests/Feature/Users/Api/DeleteUsersTest.php
index e8da98fe31..a2e43f04bc 100644
--- a/tests/Feature/Users/Api/DeleteUserTest.php
+++ b/tests/Feature/Users/Api/DeleteUsersTest.php
@@ -6,11 +6,22 @@ use App\Models\Company;
 use App\Models\LicenseSeat;
 use App\Models\Location;
 use App\Models\User;
+use Tests\Concerns\TestsFullMultipleCompaniesSupport;
+use Tests\Concerns\TestsPermissionsRequirement;
 use Tests\TestCase;
 
-class DeleteUserTest extends TestCase
+class DeleteUsersTest extends TestCase implements TestsFullMultipleCompaniesSupport, TestsPermissionsRequirement
 {
+    public function testRequiresPermission()
+    {
+        $user = User::factory()->create();
 
+        $this->actingAsForApi(User::factory()->create())
+            ->deleteJson(route('api.users.destroy', $user))
+            ->assertForbidden();
+
+        $this->assertNotSoftDeleted($user);
+    }
 
     public function testErrorReturnedViaApiIfUserDoesNotExist()
     {
@@ -26,14 +37,13 @@ class DeleteUserTest extends TestCase
     {
         $user = User::factory()->deletedUser()->create();
         $this->actingAsForApi(User::factory()->deleteUsers()->create())
-            ->deleteJson(route('api.users.destroy', $user->id))
+            ->deleteJson(route('api.users.destroy', $user))
             ->assertOk()
             ->assertStatus(200)
             ->assertStatusMessageIs('error')
             ->json();
     }
 
-
     public function testDisallowUserDeletionViaApiIfStillManagingPeople()
     {
         $manager = User::factory()->create();
@@ -41,7 +51,7 @@ class DeleteUserTest extends TestCase
         $this->assertFalse($manager->isDeletable());
 
         $this->actingAsForApi(User::factory()->deleteUsers()->create())
-            ->deleteJson(route('api.users.destroy', $manager->id))
+            ->deleteJson(route('api.users.destroy', $manager))
             ->assertOk()
             ->assertStatus(200)
             ->assertStatusMessageIs('error')
@@ -56,7 +66,7 @@ class DeleteUserTest extends TestCase
         $this->assertFalse($manager->isDeletable());
 
         $this->actingAsForApi(User::factory()->deleteUsers()->create())
-            ->deleteJson(route('api.users.destroy', $manager->id))
+            ->deleteJson(route('api.users.destroy', $manager))
             ->assertOk()
             ->assertStatus(200)
             ->assertStatusMessageIs('error')
@@ -71,74 +81,13 @@ class DeleteUserTest extends TestCase
         $this->assertFalse($manager->isDeletable());
 
         $this->actingAsForApi(User::factory()->deleteUsers()->create())
-            ->deleteJson(route('api.users.destroy', $manager->id))
+            ->deleteJson(route('api.users.destroy', $manager))
             ->assertOk()
             ->assertStatus(200)
             ->assertStatusMessageIs('error')
             ->json();
     }
 
-    public function testDeniedPermissionsForDeletingUserViaApi()
-    {
-        $this->actingAsForApi(User::factory()->create())
-            ->deleteJson(route('api.users.destroy', User::factory()->create()))
-            ->assertStatus(403)
-            ->json();
-    }
-
-    public function testSuccessPermissionsForDeletingUserViaApi()
-    {
-        $this->actingAsForApi(User::factory()->deleteUsers()->create())
-            ->deleteJson(route('api.users.destroy', User::factory()->create()))
-            ->assertOk()
-            ->assertStatus(200)
-            ->assertStatusMessageIs('success')
-            ->json();
-    }
-
-    
-    public function testPermissionsForDeletingIfNotInSameCompanyAndNotSuperadmin()
-    {
-        $this->settings->enableMultipleFullCompanySupport();
-
-        [$companyA, $companyB] = Company::factory()->count(2)->create();
-
-        $superuser = User::factory()->superuser()->create();
-        $userFromA = User::factory()->deleteUsers()->for($companyA)->create();
-        $userFromB = User::factory()->deleteUsers()->for($companyB)->create();
-
-        $this->actingAsForApi($userFromA)
-            ->deleteJson(route('api.users.destroy', ['user' => $userFromB->id]))
-            ->assertOk()
-            ->assertStatus(200)
-            ->assertStatusMessageIs('error')
-            ->json();
-
-        $userFromB->refresh();
-        $this->assertNull($userFromB->deleted_at);
-
-        $this->actingAsForApi($userFromB)
-            ->deleteJson(route('api.users.destroy', ['user' => $userFromA->id]))
-            ->assertOk()
-            ->assertStatus(200)
-            ->assertStatusMessageIs('error')
-            ->json();
-
-        $userFromA->refresh();
-        $this->assertNull($userFromA->deleted_at);
-
-        $this->actingAsForApi($superuser)
-            ->deleteJson(route('api.users.destroy', ['user' => $userFromA->id]))
-            ->assertOk()
-            ->assertStatus(200)
-            ->assertStatusMessageIs('success')
-            ->json();
-
-        $userFromA->refresh();
-        $this->assertNotNull($userFromA->deleted_at);
-
-    }
-
     public function testUsersCannotDeleteThemselves()
     {
         $user = User::factory()->deleteUsers()->create();
@@ -151,10 +100,56 @@ class DeleteUserTest extends TestCase
 
     }
 
+    public function testAdheresToFullMultipleCompaniesSupportScoping()
+    {
+        $this->settings->enableMultipleFullCompanySupport();
 
+        [$companyA, $companyB] = Company::factory()->count(2)->create();
 
+        $superuser = User::factory()->superuser()->create();
+        $userFromA = User::factory()->deleteUsers()->for($companyA)->create();
+        $userFromB = User::factory()->deleteUsers()->for($companyB)->create();
 
+        $this->actingAsForApi($userFromA)
+            ->deleteJson(route('api.users.destroy',  $userFromB))
+            ->assertOk()
+            ->assertStatus(200)
+            ->assertStatusMessageIs('error')
+            ->json();
 
+        $userFromB->refresh();
+        $this->assertNull($userFromB->deleted_at);
 
+        $this->actingAsForApi($userFromB)
+            ->deleteJson(route('api.users.destroy', $userFromA))
+            ->assertOk()
+            ->assertStatus(200)
+            ->assertStatusMessageIs('error')
+            ->json();
 
+        $userFromA->refresh();
+        $this->assertNull($userFromA->deleted_at);
+
+        $this->actingAsForApi($superuser)
+            ->deleteJson(route('api.users.destroy', $userFromA))
+            ->assertOk()
+            ->assertStatus(200)
+            ->assertStatusMessageIs('success')
+            ->json();
+
+        $userFromA->refresh();
+        $this->assertNotNull($userFromA->deleted_at);
+    }
+
+    public function testCanDeleteUser()
+    {
+        $user = User::factory()->create();
+
+        $this->actingAsForApi(User::factory()->deleteUsers()->create())
+            ->deleteJson(route('api.users.destroy', $user))
+            ->assertOk()
+            ->assertStatusMessageIs('success');
+
+        $this->assertSoftDeleted($user);
+    }
 }
diff --git a/tests/Feature/Users/Api/IndexUsersTest.php b/tests/Feature/Users/Api/IndexUsersTest.php
new file mode 100644
index 0000000000..6400469e41
--- /dev/null
+++ b/tests/Feature/Users/Api/IndexUsersTest.php
@@ -0,0 +1,60 @@
+<?php
+
+namespace Tests\Feature\Users\Api;
+
+use App\Models\Location;
+use App\Models\User;
+use Illuminate\Testing\Fluent\AssertableJson;
+use Tests\TestCase;
+
+class IndexUsersTest extends TestCase
+{
+    public function testRequiresPermission()
+    {
+        $this->actingAsForApi(User::factory()->create())
+            ->getJson(route('api.users.index'))
+            ->assertForbidden();
+    }
+
+    public function testReturnsManagedUsersCountCorrectly()
+    {
+        $manager = User::factory()->create(['first_name' => 'Manages Users']);
+        User::factory()->create(['first_name' => 'Does Not Manage Users']);
+
+        User::factory()->create(['manager_id' => $manager->id]);
+        User::factory()->create(['manager_id' => $manager->id]);
+
+        $response = $this->actingAsForApi(User::factory()->viewUsers()->create())
+            ->getJson(route('api.users.index', [
+                'manages_users_count' => 2,
+            ]))
+            ->assertOk();
+
+        $response->assertJson(function (AssertableJson $json) {
+            $json->has('rows', 1)
+                ->where('rows.0.first_name', 'Manages Users')
+                ->etc();
+        });
+    }
+
+    public function testReturnsManagedLocationsCountCorrectly()
+    {
+        $manager = User::factory()->create(['first_name' => 'Manages Locations']);
+        User::factory()->create(['first_name' => 'Does Not Manage Locations']);
+
+        Location::factory()->create(['manager_id' => $manager->id]);
+        Location::factory()->create(['manager_id' => $manager->id]);
+
+        $response = $this->actingAsForApi(User::factory()->viewUsers()->create())
+            ->getJson(route('api.users.index', [
+                'manages_locations_count' => 2,
+            ]))
+            ->assertOk();
+
+        $response->assertJson(function (AssertableJson $json) {
+            $json->has('rows', 1)
+                ->where('rows.0.first_name', 'Manages Locations')
+                ->etc();
+        });
+    }
+}
diff --git a/tests/Feature/Users/Api/StoreUsersTest.php b/tests/Feature/Users/Api/StoreUsersTest.php
new file mode 100644
index 0000000000..41cb04e3c4
--- /dev/null
+++ b/tests/Feature/Users/Api/StoreUsersTest.php
@@ -0,0 +1,78 @@
+<?php
+
+namespace Tests\Feature\Users\Api;
+
+use App\Models\Company;
+use App\Models\Department;
+use App\Models\User;
+use Illuminate\Testing\Fluent\AssertableJson;
+use Tests\TestCase;
+
+class StoreUsersTest extends TestCase
+{
+    public function testRequiresPermission()
+    {
+        $this->actingAsForApi(User::factory()->create())
+            ->postJson(route('api.users.store'), [
+                'first_name' => 'Joe',
+                'username' => 'joe',
+                'password' => 'joe_password',
+                'password_confirmation' => 'joe_password',
+            ])
+            ->assertForbidden();
+    }
+
+    public function testCompanyIdNeedsToBeInteger()
+    {
+        $company = Company::factory()->create();
+
+        $this->actingAsForApi(User::factory()->createUsers()->create())
+            ->postJson(route('api.users.store'), [
+                'company_id' => [$company->id],
+                'first_name' => 'Joe',
+                'username' => 'joe',
+                'password' => 'joe_password',
+                'password_confirmation' => 'joe_password',
+            ])
+            ->assertStatusMessageIs('error')
+            ->assertJson(function (AssertableJson $json) {
+                $json->has('messages.company_id')->etc();
+            });
+    }
+
+    public function testDepartmentIdNeedsToBeInteger()
+    {
+        $department = Department::factory()->create();
+
+        $this->actingAsForApi(User::factory()->createUsers()->create())
+            ->postJson(route('api.users.store'), [
+                'department_id' => [$department->id],
+                'first_name' => 'Joe',
+                'username' => 'joe',
+                'password' => 'joe_password',
+                'password_confirmation' => 'joe_password',
+            ])
+            ->assertStatusMessageIs('error')
+            ->assertJson(function (AssertableJson $json) {
+                $json->has('messages.department_id')->etc();
+            });
+    }
+
+    public function testCanStoreUser()
+    {
+        $this->actingAsForApi(User::factory()->createUsers()->create())
+            ->postJson(route('api.users.store'), [
+                'first_name' => 'Darth',
+                'username' => 'darthvader',
+                'password' => 'darth_password',
+                'password_confirmation' => 'darth_password',
+            ])
+            ->assertStatusMessageIs('success')
+            ->assertOk();
+
+        $this->assertDatabaseHas('users', [
+            'first_name' => 'Darth',
+            'username' => 'darthvader',
+        ]);
+    }
+}
diff --git a/tests/Feature/Users/Api/UpdateUserTest.php b/tests/Feature/Users/Api/UpdateUserTest.php
index 1c66bbdda9..e70471770f 100644
--- a/tests/Feature/Users/Api/UpdateUserTest.php
+++ b/tests/Feature/Users/Api/UpdateUserTest.php
@@ -2,6 +2,7 @@
 
 namespace Tests\Feature\Users\Api;
 
+use App\Models\Asset;
 use App\Models\Company;
 use App\Models\Department;
 use App\Models\Group;
@@ -50,7 +51,84 @@ class UpdateUserTest extends TestCase
                 'start_date' => '2021-08-01',
                 'end_date' => '2025-12-31',
             ])
-            ->assertOk();
+            ->assertOk()
+            ->assertStatus(200)
+            ->assertStatusMessageIs('success')
+            ->json();
+
+        $user->refresh();
+        $this->assertEquals('Mabel', $user->first_name, 'First name was not updated');
+        $this->assertEquals('Mora', $user->last_name, 'Last name was not updated');
+        $this->assertEquals('mabel', $user->username, 'Username was not updated');
+        $this->assertTrue(Hash::check('super-secret', $user->password), 'Password was not updated');
+        $this->assertEquals('mabel@onlymurderspod.com', $user->email, 'Email was not updated');
+        $this->assertArrayHasKey('a.new.permission', $user->decodePermissions(), 'Permissions were not updated');
+        $this->assertTrue((bool) $user->activated, 'User not marked as activated');
+        $this->assertEquals('619-555-5555', $user->phone, 'Phone was not updated');
+        $this->assertEquals('Host', $user->jobtitle, 'Job title was not updated');
+        $this->assertTrue($user->manager->is($manager), 'Manager was not updated');
+        $this->assertEquals('1111', $user->employee_num, 'Employee number was not updated');
+        $this->assertEquals('Pretty good artist', $user->notes, 'Notes was not updated');
+        $this->assertTrue($user->company->is($company), 'Company was not updated');
+        $this->assertTrue($user->department->is($department), 'Department was not updated');
+        $this->assertTrue($user->location->is($location), 'Location was not updated');
+        $this->assertEquals(1, $user->remote, 'Remote was not updated');
+        $this->assertTrue($user->groups->contains($groupA), 'Groups were not updated');
+        $this->assertEquals(1, $user->vip, 'VIP was not updated');
+        $this->assertEquals('2021-08-01', $user->start_date, 'Start date was not updated');
+        $this->assertEquals('2025-12-31', $user->end_date, 'End date was not updated');
+
+        // `groups` can be an id or array or ids
+        $this->patch(route('api.users.update', $user), ['groups' => [$groupA->id, $groupB->id]]);
+
+        $user->refresh();
+        $this->assertTrue($user->groups->contains($groupA), 'Not part of expected group');
+        $this->assertTrue($user->groups->contains($groupB), 'Not part of expected group');
+    }
+
+    public function testCanUpdateUserViaPut()
+    {
+        $admin = User::factory()->superuser()->create();
+        $manager = User::factory()->create();
+        $company = Company::factory()->create();
+        $department = Department::factory()->create();
+        $location = Location::factory()->create();
+        [$groupA, $groupB] = Group::factory()->count(2)->create();
+
+        $user = User::factory()->create([
+            'activated' => false,
+            'remote' => false,
+            'vip' => false,
+        ]);
+
+        $response = $this->actingAsForApi($admin)
+            ->putJson(route('api.users.update', $user), [
+                'first_name' => 'Mabel',
+                'last_name' => 'Mora',
+                'username' => 'mabel',
+                'password' => 'super-secret',
+                'password_confirmation' => 'super-secret',
+                'email' => 'mabel@onlymurderspod.com',
+                'permissions' => '{"a.new.permission":"1"}',
+                'activated' => true,
+                'phone' => '619-555-5555',
+                'jobtitle' => 'Host',
+                'manager_id' => $manager->id,
+                'employee_num' => '1111',
+                'notes' => 'Pretty good artist',
+                'company_id' => $company->id,
+                'department_id' => $department->id,
+                'location_id' => $location->id,
+                'remote' => true,
+                'groups' => $groupA->id,
+                'vip' => true,
+                'start_date' => '2021-08-01',
+                'end_date' => '2025-12-31',
+            ])
+            ->assertOk()
+            ->assertStatus(200)
+            ->assertStatusMessageIs('success')
+            ->json();
 
         $user->refresh();
         $this->assertEquals('Mabel', $user->first_name, 'First name was not updated');
@@ -344,4 +422,94 @@ class UpdateUserTest extends TestCase
         $this->assertTrue($user->refresh()->groups->contains($groupB));
     }
 
+    public function testMultiCompanyUserCannotBeMovedIfHasAssetInDifferentCompany()
+    {
+        $this->settings->enableMultipleFullCompanySupport();
+
+        $companyA = Company::factory()->create();
+        $companyB = Company::factory()->create();
+
+        $user = User::factory()->create([
+            'company_id' => $companyA->id,
+        ]);
+        $superUser = User::factory()->superuser()->create();
+
+        $asset = Asset::factory()->create([
+            'company_id' => $companyA->id,
+        ]);
+
+        // no assets assigned, therefore success
+        $this->actingAsForApi($superUser)->patchJson(route('api.users.update', $user), [
+            'username'   => 'test',
+            'company_id' => $companyB->id,
+        ])->assertStatusMessageIs('success');
+
+        // same test but PUT
+        $this->actingAsForApi($superUser)->putJson(route('api.users.update', $user), [
+            'username'   => 'test',
+            'first_name' => 'Test',
+            'company_id' => $companyB->id,
+        ])->assertStatusMessageIs('success');
+
+        $asset->checkOut($user, $superUser);
+
+        // asset assigned, therefore error
+        $this->actingAsForApi($superUser)->patchJson(route('api.users.update', $user), [
+            'username'   => 'test',
+            'company_id' => $companyB->id,
+        ])->assertStatusMessageIs('error');
+
+        // same test but PUT
+        $this->actingAsForApi($superUser)->putJson(route('api.users.update', $user), [
+            'username'   => 'test',
+            'first_name' => 'Test',
+            'company_id' => $companyB->id,
+        ])->assertStatusMessageIs('error');
+    }
+
+    public function testMultiCompanyUserCanBeUpdatedIfHasAssetInSameCompany()
+    {
+        $this->settings->enableMultipleFullCompanySupport();
+
+        $companyA = Company::factory()->create();
+        $companyB = Company::factory()->create();
+
+        $user = User::factory()->create([
+            'company_id' => $companyA->id,
+        ]);
+        $superUser = User::factory()->superuser()->create();
+
+        $asset = Asset::factory()->create([
+            'company_id' => $companyA->id,
+        ]);
+
+        // no assets assigned from other company, therefore success
+        $this->actingAsForApi($superUser)->patchJson(route('api.users.update', $user), [
+            'username'   => 'test',
+            'company_id' => $companyB->id,
+        ])->assertStatusMessageIs('success');
+
+        // same test but PUT
+        $this->actingAsForApi($superUser)->putJson(route('api.users.update', $user), [
+            'username'   => 'test',
+            'first_name' => 'Test',
+            'company_id' => $companyB->id,
+        ])->assertStatusMessageIs('success');
+
+        $asset->checkOut($user, $superUser);
+
+        // asset assigned from other company, therefore error
+        $this->actingAsForApi($superUser)->patchJson(route('api.users.update', $user), [
+            'username'   => 'test',
+            'company_id' => $companyB->id,
+        ])->assertStatusMessageIs('error');
+
+        // same test but PUT
+        $this->actingAsForApi($superUser)->putJson(route('api.users.update', $user), [
+            'username'   => 'test',
+            'first_name' => 'Test',
+            'company_id' => $companyB->id,
+        ])->assertStatusMessageIs('error');
+    }
+
 }
diff --git a/tests/Feature/Users/Api/UserSearchTest.php b/tests/Feature/Users/Api/UserSearchTest.php
index 2b1d557970..dc0ffdc803 100644
--- a/tests/Feature/Users/Api/UserSearchTest.php
+++ b/tests/Feature/Users/Api/UserSearchTest.php
@@ -144,4 +144,17 @@ class UserSearchTest extends TestCase
             'User index contains unexpected user from another company'
         );
     }
+
+    public function testUsersIndexWhenInvalidSortFieldIsPassed()
+    {
+        $this->markIncompleteIfSqlite('This test is not compatible with SQLite');
+
+        $this->actingAsForApi(User::factory()->viewUsers()->create())
+            ->getJson(route('api.users.index', [
+                'sort' => 'assets',
+            ]))
+            ->assertOk()
+            ->assertStatus(200)
+            ->json();
+    }
 }
diff --git a/tests/Feature/Users/Api/UsersForSelectListTest.php b/tests/Feature/Users/Api/UsersForSelectListTest.php
index 1367f408d4..33ff402d9b 100644
--- a/tests/Feature/Users/Api/UsersForSelectListTest.php
+++ b/tests/Feature/Users/Api/UsersForSelectListTest.php
@@ -40,6 +40,19 @@ class UsersForSelectListTest extends TestCase
         $this->assertTrue($results->pluck('text')->contains(fn($text) => str_contains($text, 'Luke')));
     }
 
+    public function testUsersCanBeSearchedByEmail()
+    {
+        User::factory()->create(['first_name' => 'Luke', 'last_name' => 'Skywalker', 'email' => 'luke@jedis.org']);
+
+        Passport::actingAs(User::factory()->create());
+        $response = $this->getJson(route('api.users.selectlist', ['search' => 'luke@jedis']))->assertOk();
+
+        $results = collect($response->json('results'));
+
+        $this->assertEquals(1, $results->count());
+        $this->assertTrue($results->pluck('text')->contains(fn($text) => str_contains($text, 'Luke')));
+    }
+
     public function testUsersScopedToCompanyWhenMultipleFullCompanySupportEnabled()
     {
         $this->settings->enableMultipleFullCompanySupport();
@@ -73,13 +86,13 @@ class UsersForSelectListTest extends TestCase
         $this->settings->enableMultipleFullCompanySupport();
 
         $jedi = Company::factory()->has(User::factory()->count(3)->sequence(
-            ['first_name' => 'Luke', 'last_name' => 'Skywalker', 'username' => 'lskywalker'],
-            ['first_name' => 'Obi-Wan', 'last_name' => 'Kenobi', 'username' => 'okenobi'],
-            ['first_name' => 'Anakin', 'last_name' => 'Skywalker', 'username' => 'askywalker'],
+            ['first_name' => 'Luke', 'last_name' => 'Skywalker', 'username' => 'lskywalker', 'email' => 'lskywalker@jedis.org'],
+            ['first_name' => 'Obi-Wan', 'last_name' => 'Kenobi', 'username' => 'okenobi', 'email' => 'okenobi@jedis.org'],
+            ['first_name' => 'Anakin', 'last_name' => 'Skywalker', 'username' => 'askywalker', 'email' => 'askywalker@alliance.org'],
         ))->create();
 
         Company::factory()
-            ->has(User::factory()->state(['first_name' => 'Darth', 'last_name' => 'Vader', 'username' => 'dvader']))
+            ->has(User::factory()->state(['first_name' => 'Darth', 'last_name' => 'Vader', 'username' => 'dvader', 'email' => 'dvader@empire.jerks']))
             ->create();
 
         Passport::actingAs($jedi->users->first());
@@ -91,7 +104,7 @@ class UsersForSelectListTest extends TestCase
         $this->assertTrue($results->pluck('text')->contains(fn($text) => str_contains($text, 'Luke')));
         $this->assertTrue($results->pluck('text')->contains(fn($text) => str_contains($text, 'Anakin')));
 
-        $response = $this->getJson(route('api.users.selectlist', ['search' => 'v']))->assertOk();
+        $response = $this->getJson(route('api.users.selectlist', ['search' => 'dvader']))->assertOk();
         $this->assertEquals(0, collect($response->json('results'))->count());
     }
 }
diff --git a/tests/Feature/Users/Ui/BulkActions/BulkDeleteUsersTest.php b/tests/Feature/Users/Ui/BulkActions/BulkDeleteUsersTest.php
new file mode 100644
index 0000000000..60b41ce613
--- /dev/null
+++ b/tests/Feature/Users/Ui/BulkActions/BulkDeleteUsersTest.php
@@ -0,0 +1,271 @@
+<?php
+
+namespace Tests\Feature\Users\Ui\BulkActions;
+
+use App\Models\Accessory;
+use App\Models\Asset;
+use App\Models\Consumable;
+use App\Models\License;
+use App\Models\LicenseSeat;
+use App\Models\Statuslabel;
+use App\Models\User;
+use Illuminate\Database\Eloquent\Model;
+use Tests\TestCase;
+
+class BulkDeleteUsersTest extends TestCase
+{
+    public function test_requires_correct_permission()
+    {
+        $this->actingAs(User::factory()->create())
+            ->post(route('users/bulksave'), [
+                'ids' => [
+                    User::factory()->create()->id,
+                ],
+                'status_id' => Statuslabel::factory()->create()->id,
+            ])
+            ->assertForbidden();
+    }
+
+    public function test_validation()
+    {
+        $user = User::factory()->create();
+        Asset::factory()->assignedToUser($user)->create();
+
+        $actor = $this->actingAs(User::factory()->editUsers()->create());
+
+        // "ids" required
+        $actor->post(route('users/bulksave'), [
+            // 'ids' => [
+            //     $user->id,
+            // ],
+            'status_id' => Statuslabel::factory()->create()->id,
+        ])->assertSessionHas('error')->assertRedirect();
+
+        // "status_id" needed when provided users have assets associated
+        $actor->post(route('users/bulksave'), [
+            'ids' => [
+                $user->id,
+            ],
+            // 'status_id' => Statuslabel::factory()->create()->id,
+        ])->assertSessionHas('error')->assertRedirect();
+    }
+
+    public function test_cannot_perform_bulk_actions_on_self()
+    {
+        $actor = User::factory()->editUsers()->create();
+
+        $this->actingAs($actor)
+            ->post(route('users/bulksave'), [
+                'ids' => [
+                    $actor->id,
+                ],
+                'delete_user' => '1',
+            ])
+            ->assertRedirect(route('users.index'))
+            ->assertSessionHas('success', trans('general.bulk_checkin_delete_success'));
+
+        $this->assertNotSoftDeleted($actor);
+    }
+
+    public function test_accessories_can_be_bulk_checked_in()
+    {
+        [$accessoryA, $accessoryB] = Accessory::factory()->count(2)->create();
+        [$userA, $userB, $userC] = User::factory()->count(3)->create();
+
+        // Add checkouts for multiple accessories to multiple users to get different ids in the mix
+        $this->attachAccessoryToUsers($accessoryA, [$userA, $userB, $userC]);
+        $this->attachAccessoryToUsers($accessoryB, [$userA, $userB]);
+
+        $this->actingAs(User::factory()->editUsers()->create())
+            ->post(route('users/bulksave'), [
+                'ids' => [
+                    $userA->id,
+                    $userC->id,
+                ],
+                'status_id' => Statuslabel::factory()->create()->id,
+            ])
+            ->assertRedirect(route('users.index'));
+
+        $this->assertTrue($userA->fresh()->accessories->isEmpty());
+        $this->assertTrue($userB->fresh()->accessories->isNotEmpty());
+        $this->assertTrue($userC->fresh()->accessories->isEmpty());
+
+        // These assertions check against a bug where the wrong value from
+        // accessories_users was being populated in action_logs.item_id.
+        $this->assertActionLogCheckInEntryFor($userA, $accessoryA);
+        $this->assertActionLogCheckInEntryFor($userA, $accessoryB);
+        $this->assertActionLogCheckInEntryFor($userC, $accessoryA);
+    }
+
+    public function test_assets_can_be_bulk_checked_in()
+    {
+        [$userA, $userB, $userC] = User::factory()->count(3)->create();
+
+        $assetForUserA = $this->assignAssetToUser($userA);
+        $lonelyAsset = $this->assignAssetToUser($userB);
+        $assetForUserC = $this->assignAssetToUser($userC);
+
+        $this->actingAs(User::factory()->editUsers()->create())
+            ->post(route('users/bulksave'), [
+                'ids' => [
+                    $userA->id,
+                    $userC->id,
+                ],
+                'status_id' => Statuslabel::factory()->create()->id,
+            ])
+            ->assertRedirect(route('users.index'));
+
+        $this->assertTrue($userA->fresh()->assets->isEmpty());
+        $this->assertTrue($userB->fresh()->assets->isNotEmpty());
+        $this->assertTrue($userC->fresh()->assets->isEmpty());
+
+        $this->assertActionLogCheckInEntryFor($userA, $assetForUserA);
+        $this->assertActionLogCheckInEntryFor($userC, $assetForUserC);
+    }
+
+    public function test_consumables_can_be_bulk_checked_in()
+    {
+        [$consumableA, $consumableB] = Consumable::factory()->count(2)->create();
+        [$userA, $userB, $userC] = User::factory()->count(3)->create();
+
+        // Add checkouts for multiple consumables to multiple users to get different ids in the mix
+        $this->attachConsumableToUsers($consumableA, [$userA, $userB, $userC]);
+        $this->attachConsumableToUsers($consumableB, [$userA, $userB]);
+
+        $this->actingAs(User::factory()->editUsers()->create())
+            ->post(route('users/bulksave'), [
+                'ids' => [
+                    $userA->id,
+                    $userC->id,
+                ],
+                'status_id' => Statuslabel::factory()->create()->id,
+            ])
+            ->assertRedirect(route('users.index'));
+
+        $this->assertTrue($userA->fresh()->consumables->isEmpty());
+        $this->assertTrue($userB->fresh()->consumables->isNotEmpty());
+        $this->assertTrue($userC->fresh()->consumables->isEmpty());
+
+        // Consumable checkin should not be logged.
+        $this->assertNoActionLogCheckInEntryFor($userA, $consumableA);
+        $this->assertNoActionLogCheckInEntryFor($userA, $consumableB);
+        $this->assertNoActionLogCheckInEntryFor($userC, $consumableA);
+    }
+
+    public function test_license_seats_can_be_bulk_checked_in()
+    {
+        [$userA, $userB, $userC] = User::factory()->count(3)->create();
+
+        $licenseSeatForUserA = LicenseSeat::factory()->assignedToUser($userA)->create();
+        $lonelyLicenseSeat = LicenseSeat::factory()->assignedToUser($userB)->create();
+        $licenseSeatForUserC = LicenseSeat::factory()->assignedToUser($userC)->create();
+
+        $this->actingAs(User::factory()->editUsers()->create())
+            ->post(route('users/bulksave'), [
+                'ids' => [
+                    $userA->id,
+                    $userC->id,
+                ],
+            ])
+            ->assertRedirect(route('users.index'))
+            ->assertSessionHas('success', trans('general.bulk_checkin_success'));
+
+        $this->assertDatabaseMissing('license_seats', [
+            'license_id' => $licenseSeatForUserA->license->id,
+            'assigned_to' => $userA->id,
+        ]);
+
+        $this->assertDatabaseMissing('license_seats', [
+            'license_id' => $licenseSeatForUserC->license->id,
+            'assigned_to' => $userC->id,
+        ]);
+
+        // Slightly different from the other assertions since we use
+        // the license and not the license seat in this case.
+        $this->assertDatabaseHas('action_logs', [
+            'action_type' => 'checkin from',
+            'target_id' => $userA->id,
+            'target_type' => User::class,
+            'note' => 'Bulk checkin items',
+            'item_type' => License::class,
+            'item_id' => $licenseSeatForUserA->license->id,
+        ]);
+
+        $this->assertDatabaseHas('action_logs', [
+            'action_type' => 'checkin from',
+            'target_id' => $userC->id,
+            'target_type' => User::class,
+            'note' => 'Bulk checkin items',
+            'item_type' => License::class,
+            'item_id' => $licenseSeatForUserC->license->id,
+        ]);
+    }
+
+    public function test_users_can_be_deleted_in_bulk()
+    {
+        [$userA, $userB, $userC] = User::factory()->count(3)->create();
+
+        $this->actingAs(User::factory()->editUsers()->create())
+            ->post(route('users/bulksave'), [
+                'ids' => [
+                    $userA->id,
+                    $userC->id,
+                ],
+                'delete_user' => '1',
+            ])
+            ->assertRedirect(route('users.index'))
+            ->assertSessionHas('success', trans('general.bulk_checkin_delete_success'));
+
+        $this->assertSoftDeleted($userA);
+        $this->assertNotSoftDeleted($userB);
+        $this->assertSoftDeleted($userC);
+    }
+
+    private function assignAssetToUser(User $user): Asset
+    {
+        return Asset::factory()->assignedToUser($user)->create();
+    }
+
+    private function attachAccessoryToUsers(Accessory $accessory, array $users): void
+    {
+        foreach ($users as $user) {
+            $accessoryCheckout = $accessory->checkouts()->make();
+            $accessoryCheckout->assignedTo()->associate($user);
+            $accessoryCheckout->save();
+        }
+    }
+
+    private function attachConsumableToUsers(Consumable $consumable, array $users): void
+    {
+        foreach ($users as $user) {
+            $consumable->users()->attach($consumable->id, [
+                'consumable_id' => $consumable->id,
+                'assigned_to' => $user->id,
+            ]);
+        }
+    }
+
+    private function assertActionLogCheckInEntryFor(User $user, Model $model): void
+    {
+        $this->assertDatabaseHas('action_logs', [
+            'action_type' => 'checkin from',
+            'target_id' => $user->id,
+            'target_type' => User::class,
+            'note' => 'Bulk checkin items',
+            'item_type' => get_class($model),
+            'item_id' => $model->id,
+        ]);
+    }
+
+    private function assertNoActionLogCheckInEntryFor(User $user, Model $model): void
+    {
+        $this->assertDatabaseMissing('action_logs', [
+            'action_type' => 'checkin from',
+            'target_id' => $user->id,
+            'target_type' => User::class,
+            'note' => 'Bulk checkin items',
+            'item_type' => get_class($model),
+            'item_id' => $model->id,
+        ]);
+    }
+}
diff --git a/tests/Feature/Users/Ui/CloneUserTest.php b/tests/Feature/Users/Ui/CloneUserTest.php
new file mode 100644
index 0000000000..97b4babd7b
--- /dev/null
+++ b/tests/Feature/Users/Ui/CloneUserTest.php
@@ -0,0 +1,18 @@
+<?php
+
+namespace Tests\Feature\Users\Ui;
+
+use App\Models\User;
+use Tests\TestCase;
+
+class CloneUserTest extends TestCase
+{
+    public function testPageRenders()
+    {
+        $this->actingAs(User::factory()->superuser()->create())
+            ->get(route('users.clone.show', User::factory()->create()))
+            ->assertOk();
+    }
+
+
+}
diff --git a/tests/Feature/Users/Ui/CreateUserTest.php b/tests/Feature/Users/Ui/CreateUserTest.php
new file mode 100644
index 0000000000..d63dc40f9e
--- /dev/null
+++ b/tests/Feature/Users/Ui/CreateUserTest.php
@@ -0,0 +1,44 @@
+<?php
+
+namespace Tests\Feature\Users\Ui;
+
+use App\Models\User;
+use Tests\TestCase;
+
+class CreateUserTest extends TestCase
+{
+
+    public function testPermissionRequiredToCreateUser()
+    {
+        $this->actingAs(User::factory()->create())
+            ->get(route('users.create'))
+            ->assertForbidden();
+    }
+
+    public function testPageRenders()
+    {
+        $this->actingAs(User::factory()->createUsers()->create())
+            ->get(route('users.create'))
+            ->assertOk();
+
+    }
+
+    public function testCanCreateUser()
+    {
+
+        $response = $this->actingAs(User::factory()->createUsers()->viewUsers()->create())
+            ->from(route('users.index'))
+            ->post(route('users.store'), [
+                'first_name' => 'Test First Name',
+                'last_name' => 'Test Last Name',
+                'username' => 'testuser',
+                'password' => 'testpassword1235!!',
+                //'notes' => 'Test Note',
+            ])
+            ->assertStatus(302)
+            ->assertRedirect(route('users.index'));
+
+        $this->followRedirects($response)->assertSee('Success');
+
+    }
+}
diff --git a/tests/Feature/Users/Ui/DeleteUserTest.php b/tests/Feature/Users/Ui/DeleteUserTest.php
index da4c5a37ee..6d687ed0f8 100644
--- a/tests/Feature/Users/Ui/DeleteUserTest.php
+++ b/tests/Feature/Users/Ui/DeleteUserTest.php
@@ -48,6 +48,14 @@ class DeleteUserTest extends TestCase
           $this->followRedirects($response)->assertSee(trans('general.error'));
     }
 
+    public function testCanViewSoftDeletedUser()
+    {
+        $user = User::factory()->deletedUser()->viewUsers()->create();
+        $response = $this->actingAs(User::factory()->deleteUsers()->viewUsers()->create())
+            ->get(route('users.show', $user->id))
+            ->assertStatus(200);
+    }
+
 
     public function testFmcsPermissionsToDeleteUser()
     {
diff --git a/tests/Feature/Users/Ui/EmailAssignedToUserTest.php b/tests/Feature/Users/Ui/EmailAssignedToUserTest.php
new file mode 100644
index 0000000000..a6403679c0
--- /dev/null
+++ b/tests/Feature/Users/Ui/EmailAssignedToUserTest.php
@@ -0,0 +1,40 @@
+<?php
+
+namespace Tests\Feature\Users\Ui;
+
+use App\Models\Company;
+use App\Models\User;
+use App\Notifications\CurrentInventory;
+use Illuminate\Support\Facades\Notification;
+use Tests\TestCase;
+
+class EmailAssignedToUserTest extends TestCase
+{
+    public function testUserWithoutCompanyPermissionsCannotSendInventory()
+    {
+        Notification::fake();
+
+        $this->settings->enableMultipleFullCompanySupport();
+
+        [$companyA, $companyB] = Company::factory()->count(2)->create();
+
+        $superuser = User::factory()->superuser()->create();
+        $user = User::factory()->for($companyB)->create();
+
+        $this->actingAs(User::factory()->viewUsers()->for($companyA)->create())
+            ->post(route('users.email', ['userId' => $user->id]))
+            ->assertStatus(403);
+
+        $this->actingAs(User::factory()->viewUsers()->for($companyB)->create())
+            ->post(route('users.email', ['userId' => $user->id]))
+            ->assertStatus(302);
+
+        $this->actingAs($superuser)
+            ->post(route('users.email', ['userId' => $user->id]))
+            ->assertStatus(302);
+
+        Notification::assertSentTo(
+            [$user], CurrentInventory::class
+        );
+    }
+}
diff --git a/tests/Feature/Users/Ui/IndexUsersTest.php b/tests/Feature/Users/Ui/IndexUsersTest.php
new file mode 100644
index 0000000000..020abdbcd9
--- /dev/null
+++ b/tests/Feature/Users/Ui/IndexUsersTest.php
@@ -0,0 +1,16 @@
+<?php
+
+namespace Tests\Feature\Users\Ui;
+
+use App\Models\User;
+use Tests\TestCase;
+
+class IndexUsersTest extends TestCase
+{
+    public function testPageRenders()
+    {
+        $this->actingAs(User::factory()->viewUsers()->create())
+            ->get(route('users.index'))
+            ->assertOk();
+    }
+}
diff --git a/tests/Feature/Users/Ui/MergeUsersTest.php b/tests/Feature/Users/Ui/MergeUsersTest.php
new file mode 100644
index 0000000000..a9ae11171b
--- /dev/null
+++ b/tests/Feature/Users/Ui/MergeUsersTest.php
@@ -0,0 +1,213 @@
+<?php
+
+namespace Tests\Feature\Users\Ui;
+
+use App\Models\Accessory;
+use App\Models\Asset;
+use App\Models\Consumable;
+use App\Models\LicenseSeat;
+use App\Models\User;
+use App\Models\Actionlog;
+use Tests\TestCase;
+
+
+class MergeUsersTest extends TestCase
+{
+    public function testAssetsAreTransferredOnUserMerge()
+    {
+        $user1 = User::factory()->create();
+        $user2 = User::factory()->create();
+        $user_to_merge_into = User::factory()->create();
+
+        Asset::factory()->count(3)->assignedToUser($user1)->create();
+        Asset::factory()->count(3)->assignedToUser($user2)->create();
+        Asset::factory()->count(3)->assignedToUser($user_to_merge_into)->create();
+
+        $response = $this->actingAs(User::factory()->editUsers()->viewUsers()->create())
+            ->post(route('users.merge.save', $user1->id),
+                [
+                    'ids_to_merge' => [$user1->id, $user2->id],
+                    'merge_into_id' => $user_to_merge_into->id
+                ])
+            ->assertStatus(302)
+            ->assertRedirect(route('users.index'));
+
+        $this->followRedirects($response)->assertSee('Success');
+        $this->assertEquals(9, $user_to_merge_into->refresh()->assets->count());
+        $this->assertEquals(0, $user1->refresh()->assets->count());
+        $this->assertEquals(0, $user2->refresh()->assets->count());
+
+    }
+
+    public function testLicensesAreTransferredOnUserMerge()
+    {
+        $user1 = User::factory()->create();
+        $user2 = User::factory()->create();
+        $user_to_merge_into = User::factory()->create();
+
+        LicenseSeat::factory()->count(3)->create(['assigned_to' => $user1->id]);
+        LicenseSeat::factory()->count(3)->create(['assigned_to' => $user2->id]);
+        LicenseSeat::factory()->count(3)->create(['assigned_to' => $user_to_merge_into->id]);
+
+        $this->assertEquals(3, $user_to_merge_into->refresh()->licenses->count());
+
+        $response = $this->actingAs(User::factory()->editUsers()->viewUsers()->create())
+            ->post(route('users.merge.save', $user1->id),
+                [
+                    'ids_to_merge' => [$user1->id, $user2->id],
+                    'merge_into_id' => $user_to_merge_into->id
+                ])
+            ->assertStatus(302)
+            ->assertRedirect(route('users.index'));
+
+        $this->followRedirects($response)->assertSee('Success');
+        $this->assertEquals(9, $user_to_merge_into->refresh()->licenses->count());
+        $this->assertEquals(0, $user1->refresh()->licenses->count());
+        $this->assertEquals(0, $user2->refresh()->licenses->count());
+
+    }
+
+    public function testAccessoriesTransferredOnUserMerge()
+    {
+        $user1 = User::factory()->create();
+        $user2 = User::factory()->create();
+        $user_to_merge_into = User::factory()->create();
+
+        Accessory::factory()->count(3)->checkedOutToUser($user1)->create();
+        Accessory::factory()->count(3)->checkedOutToUser($user2)->create();
+        Accessory::factory()->count(3)->checkedOutToUser($user_to_merge_into)->create();
+
+        $this->assertEquals(3, $user_to_merge_into->refresh()->accessories->count());
+
+        $response = $this->actingAs(User::factory()->editUsers()->viewUsers()->create())
+            ->post(route('users.merge.save', $user1->id),
+                [
+                    'ids_to_merge' => [$user1->id, $user2->id],
+                    'merge_into_id' => $user_to_merge_into->id
+                ])
+            ->assertStatus(302)
+            ->assertRedirect(route('users.index'));
+
+        $this->followRedirects($response)->assertSee('Success');
+        $this->assertEquals(9, $user_to_merge_into->refresh()->accessories->count());
+        $this->assertEquals(0, $user1->refresh()->accessories->count());
+        $this->assertEquals(0, $user2->refresh()->accessories->count());
+
+    }
+
+    public function testConsumablesTransferredOnUserMerge()
+    {
+        $user1 = User::factory()->create();
+        $user2 = User::factory()->create();
+        $user_to_merge_into = User::factory()->create();
+
+        Consumable::factory()->count(3)->checkedOutToUser($user1)->create();
+        Consumable::factory()->count(3)->checkedOutToUser($user2)->create();
+        Consumable::factory()->count(3)->checkedOutToUser($user_to_merge_into)->create();
+
+        $this->assertEquals(3, $user_to_merge_into->refresh()->consumables->count());
+
+        $response = $this->actingAs(User::factory()->editUsers()->viewUsers()->create())
+            ->post(route('users.merge.save', $user1->id),
+                [
+                    'ids_to_merge' => [$user1->id, $user2->id],
+                    'merge_into_id' => $user_to_merge_into->id
+                ])
+            ->assertStatus(302)
+            ->assertRedirect(route('users.index'));
+
+        $this->followRedirects($response)->assertSee('Success');
+        $this->assertEquals(9, $user_to_merge_into->refresh()->consumables->count());
+        $this->assertEquals(0, $user1->refresh()->consumables->count());
+        $this->assertEquals(0, $user2->refresh()->consumables->count());
+
+    }
+
+    public function testFilesAreTransferredOnUserMerge()
+    {
+        $user1 = User::factory()->create();
+        $user2 = User::factory()->create();
+        $user_to_merge_into = User::factory()->create();
+
+        Actionlog::factory()->count(3)->filesUploaded()->create(['item_id' => $user1->id]);
+        Actionlog::factory()->count(3)->filesUploaded()->create(['item_id' => $user2->id]);
+        Actionlog::factory()->count(3)->filesUploaded()->create(['item_id' => $user_to_merge_into->id]);
+
+        $this->assertEquals(3, $user_to_merge_into->refresh()->uploads->count());
+
+        $response = $this->actingAs(User::factory()->editUsers()->viewUsers()->create())
+            ->post(route('users.merge.save', $user1->id),
+                [
+                    'ids_to_merge' => [$user1->id, $user2->id],
+                    'merge_into_id' => $user_to_merge_into->id
+                ])
+            ->assertStatus(302)
+            ->assertRedirect(route('users.index'));
+
+        $this->followRedirects($response)->assertSee('Success');
+        $this->assertEquals(9, $user_to_merge_into->refresh()->uploads->count());
+        $this->assertEquals(0, $user1->refresh()->uploads->count());
+        $this->assertEquals(0, $user2->refresh()->uploads->count());
+
+    }
+
+    public function testAcceptancesAreTransferredOnUserMerge()
+    {
+        $user1 = User::factory()->create();
+        $user2 = User::factory()->create();
+        $user_to_merge_into = User::factory()->create();
+
+        Actionlog::factory()->count(3)->acceptedSignature()->create(['target_id' => $user1->id]);
+        Actionlog::factory()->count(3)->acceptedSignature()->create(['target_id' => $user2->id]);
+        Actionlog::factory()->count(3)->acceptedSignature()->create(['target_id' => $user_to_merge_into->id]);
+
+        $this->assertEquals(3, $user_to_merge_into->refresh()->acceptances->count());
+
+        $response = $this->actingAs(User::factory()->editUsers()->viewUsers()->create())
+            ->post(route('users.merge.save', $user1->id),
+                [
+                    'ids_to_merge' => [$user1->id, $user2->id],
+                    'merge_into_id' => $user_to_merge_into->id
+                ])
+            ->assertStatus(302)
+            ->assertRedirect(route('users.index'));
+
+        $this->followRedirects($response)->assertSee('Success');
+        $this->assertEquals(9, $user_to_merge_into->refresh()->acceptances->count());
+        $this->assertEquals(0, $user1->refresh()->acceptances->count());
+        $this->assertEquals(0, $user2->refresh()->acceptances->count());
+
+    }
+
+    public function testUserUpdateHistoryIsTransferredOnUserMerge()
+    {
+        $user1 = User::factory()->create();
+        $user2 = User::factory()->create();
+        $user_to_merge_into = User::factory()->create();
+
+        Actionlog::factory()->count(3)->userUpdated()->create(['target_id' => $user1->id, 'item_id' => $user1->id]);
+        Actionlog::factory()->count(3)->userUpdated()->create(['target_id' => $user2->id, 'item_id' => $user2->id]);
+        Actionlog::factory()->count(3)->userUpdated()->create(['target_id' => $user_to_merge_into->id, 'item_id' => $user_to_merge_into->id]);
+
+        $this->assertEquals(3, $user_to_merge_into->refresh()->userlog->count());
+
+        $response = $this->actingAs(User::factory()->editUsers()->viewUsers()->create())
+            ->post(route('users.merge.save', $user1->id),
+                [
+                    'ids_to_merge' => [$user1->id, $user2->id],
+                    'merge_into_id' => $user_to_merge_into->id
+                ])
+            ->assertStatus(302)
+            ->assertRedirect(route('users.index'));
+
+        $this->followRedirects($response)->assertSee('Success');
+
+        // This needs to be 2 more than the otherwise expected because the merge action itself is logged for the two merging users
+        $this->assertEquals(11, $user_to_merge_into->refresh()->userlog->count());
+        $this->assertEquals(2, $user1->refresh()->userlog->count());
+        $this->assertEquals(2, $user2->refresh()->userlog->count());
+
+    }
+
+
+}
diff --git a/tests/Feature/Users/Ui/PrintUserInventoryTest.php b/tests/Feature/Users/Ui/PrintUserInventoryTest.php
new file mode 100644
index 0000000000..4de7c7cddd
--- /dev/null
+++ b/tests/Feature/Users/Ui/PrintUserInventoryTest.php
@@ -0,0 +1,41 @@
+<?php
+
+namespace Tests\Feature\Users\Ui;
+
+use App\Models\Company;
+use App\Models\User;
+use Tests\TestCase;
+
+class PrintUserInventoryTest extends TestCase
+{
+    public function testPermissionRequiredToPrintUserInventory()
+    {
+        $this->actingAs(User::factory()->create())
+            ->get(route('users.print', User::factory()->create()))
+            ->assertStatus(403);
+    }
+
+    public function testCanPrintUserInventory()
+    {
+        $actor = User::factory()->viewUsers()->create();
+
+        $this->actingAs($actor)
+            ->get(route('users.print', User::factory()->create()))
+            ->assertOk()
+            ->assertStatus(200);
+    }
+
+    public function testCannotPrintUserInventoryFromAnotherCompany()
+    {
+        $this->settings->enableMultipleFullCompanySupport();
+
+        [$companyA, $companyB] = Company::factory()->count(2)->create();
+
+        $actor = User::factory()->for($companyA)->viewUsers()->create();
+        $user = User::factory()->for($companyB)->create();
+
+        $this->actingAs($actor)
+            ->get(route('users.print', $user))
+            ->assertStatus(302);
+    }
+}
diff --git a/tests/Feature/Users/Ui/UpdateUserTest.php b/tests/Feature/Users/Ui/UpdateUserTest.php
index bef1d59a06..4728531be6 100644
--- a/tests/Feature/Users/Ui/UpdateUserTest.php
+++ b/tests/Feature/Users/Ui/UpdateUserTest.php
@@ -2,11 +2,30 @@
 
 namespace Tests\Feature\Users\Ui;
 
+use App\Models\Asset;
+use App\Models\Company;
 use App\Models\User;
+use Error;
 use Tests\TestCase;
 
 class UpdateUserTest extends TestCase
 {
+    public function testPageRenders()
+    {
+        $this->actingAs(User::factory()->superuser()->create())
+            ->get(route('users.edit', User::factory()->create()->id))
+            ->assertOk();
+    }
+
+    public function testCannotViewEditPageForSoftDeletedUser()
+    {
+        $user = User::factory()->trashed()->create();
+
+        $this->actingAs(User::factory()->superuser()->create())
+            ->get(route('users.edit', $user->id))
+            ->assertRedirectToRoute('users.show', $user->id);
+    }
+
     public function testUsersCanBeActivatedWithNumber()
     {
         $admin = User::factory()->superuser()->create();
@@ -79,4 +98,113 @@ class UpdateUserTest extends TestCase
 
         $this->assertEquals(1, $admin->refresh()->activated);
     }
+
+    public function testMultiCompanyUserCannotBeMovedIfHasAssetInDifferentCompany()
+    {
+        $this->settings->enableMultipleFullCompanySupport();
+
+        $companyA = Company::factory()->create();
+        $companyB = Company::factory()->create();
+
+        $user = User::factory()->create([
+            'company_id' => $companyA->id,
+        ]);
+        $superUser = User::factory()->superuser()->create();
+
+        $asset = Asset::factory()->create([
+            'company_id' => $companyA->id,
+        ]);
+
+        // no assets assigned, therefore success
+        $this->actingAs($superUser)->put(route('users.update', $user), [
+            'first_name'      => 'test',
+            'username'        => 'test',
+            'company_id'      => $companyB->id,
+            'redirect_option' => 'index'
+        ])->assertRedirect(route('users.index'));
+
+        $asset->checkOut($user, $superUser);
+
+        // asset assigned, therefore error
+        $response = $this->actingAs($superUser)->patchJson(route('users.update', $user), [
+            'first_name'      => 'test',
+            'username'        => 'test',
+            'company_id'      => $companyB->id,
+            'redirect_option' => 'index'
+        ]);
+
+        $this->followRedirects($response)->assertSee('error');
+    }
+
+    public function testMultiCompanyUserCanBeUpdatedIfHasAssetInSameCompany()
+    {
+        $this->settings->enableMultipleFullCompanySupport();
+
+        $companyA = Company::factory()->create();
+
+        $user = User::factory()->create([
+            'company_id' => $companyA->id,
+        ]);
+        $superUser = User::factory()->superuser()->create();
+
+        $asset = Asset::factory()->create([
+            'company_id' => $companyA->id,
+        ]);
+
+        // no assets assigned, therefore success
+        $this->actingAs($superUser)->put(route('users.update', $user), [
+            'first_name'      => 'test',
+            'username'        => 'test',
+            'company_id'      => $companyA->id,
+            'redirect_option' => 'index'
+        ])->assertRedirect(route('users.index'));
+
+        $asset->checkOut($user, $superUser);
+
+        // asset assigned, therefore error
+        $response = $this->actingAs($superUser)->patchJson(route('users.update', $user), [
+            'first_name'      => 'test',
+            'username'        => 'test',
+            'company_id'      => $companyA->id,
+            'redirect_option' => 'index'
+        ]);
+
+        $this->followRedirects($response)->assertSee('success');
+    }
+
+    /**
+     * This can occur if the user edit screen is open in one tab and
+     * the user is deleted in another before the edit form is submitted.
+     * @link https://app.shortcut.com/grokability/story/29166
+     */
+    public function testAttemptingToUpdateDeletedUserIsHandledGracefully()
+    {
+        [$companyA, $companyB] = Company::factory()->count(2)->create();
+        $user = User::factory()->for($companyA)->create();
+        Asset::factory()->assignedToUser($user)->create();
+
+        $id = $user->id;
+
+        $user->delete();
+
+        $response = $this->actingAs(User::factory()->editUsers()->create())
+            ->put(route('users.update', $id), [
+                'first_name' => 'test',
+                'username' => 'test',
+                'company_id' => $companyB->id,
+            ]);
+
+        $this->assertFalse($response->exceptions->contains(function ($exception) {
+            // Avoid hard 500
+            return $exception instanceof Error;
+        }));
+
+        // As of now, the user will be updated but not be restored
+        $this->assertDatabaseHas('users', [
+            'id' => $id,
+            'first_name' => 'test',
+            'username' => 'test',
+            'company_id' => $companyB->id,
+        ]);
+    }
 }
diff --git a/tests/Feature/Users/Ui/ViewUserTest.php b/tests/Feature/Users/Ui/ViewUserTest.php
index c412e9e789..ca45601ffb 100644
--- a/tests/Feature/Users/Ui/ViewUserTest.php
+++ b/tests/Feature/Users/Ui/ViewUserTest.php
@@ -4,80 +4,38 @@ namespace Tests\Feature\Users\Ui;
 
 use App\Models\Company;
 use App\Models\User;
-use App\Notifications\CurrentInventory;
-use Illuminate\Support\Facades\Notification;
 use Tests\TestCase;
 
 class ViewUserTest extends TestCase
 {
-    public function testPermissionsForUserDetailPage()
+    public function testRequiresPermissionToViewUser()
     {
-        $this->settings->enableMultipleFullCompanySupport();
-
-        [$companyA, $companyB] = Company::factory()->count(2)->create();
-
-        $superuser = User::factory()->superuser()->create();
-        $user = User::factory()->for($companyB)->create();
-
-        $this->actingAs(User::factory()->editUsers()->for($companyA)->create())
-            ->get(route('users.show', ['user' => $user->id]))
+        $this->actingAs(User::factory()->create())
+            ->get(route('users.show', User::factory()->create()))
             ->assertStatus(403);
+    }
 
-        $this->actingAs($superuser)
-            ->get(route('users.show', ['user' => $user->id]))
+    public function testCanViewUser()
+    {
+        $actor = User::factory()->viewUsers()->create();
+
+        $this->actingAs($actor)
+            ->get(route('users.show', User::factory()->create()))
             ->assertOk()
             ->assertStatus(200);
     }
 
-    public function testPermissionsForPrintAllInventoryPage()
+    public function testCannotViewUserFromAnotherCompany()
     {
         $this->settings->enableMultipleFullCompanySupport();
 
         [$companyA, $companyB] = Company::factory()->count(2)->create();
 
-        $superuser = User::factory()->superuser()->create();
+        $actor = User::factory()->for($companyA)->viewUsers()->create();
         $user = User::factory()->for($companyB)->create();
 
-        $this->actingAs(User::factory()->viewUsers()->for($companyA)->create())
-            ->get(route('users.print', ['userId' => $user->id]))
-            ->assertStatus(403);
-
-        $this->actingAs(User::factory()->viewUsers()->for($companyB)->create())
-            ->get(route('users.print', ['userId' => $user->id]))
-            ->assertStatus(200);
-
-        $this->actingAs($superuser)
-            ->get(route('users.print', ['userId' => $user->id]))
-            ->assertOk()
-            ->assertStatus(200);
-    }
-
-    public function testUserWithoutCompanyPermissionsCannotSendInventory()
-    {
-
-        Notification::fake();
-
-        $this->settings->enableMultipleFullCompanySupport();
-
-        [$companyA, $companyB] = Company::factory()->count(2)->create();
-
-        $superuser = User::factory()->superuser()->create();
-        $user = User::factory()->for($companyB)->create();
-
-        $this->actingAs(User::factory()->viewUsers()->for($companyA)->create())
-            ->post(route('users.email', ['userId' => $user->id]))
-            ->assertStatus(403);
-
-        $this->actingAs(User::factory()->viewUsers()->for($companyB)->create())
-            ->post(route('users.email', ['userId' => $user->id]))
+        $this->actingAs($actor)
+            ->get(route('users.show', $user))
             ->assertStatus(302);
-
-        $this->actingAs($superuser)
-            ->post(route('users.email', ['userId' => $user->id]))
-            ->assertStatus(302);
-
-        Notification::assertSentTo(
-            [$user], CurrentInventory::class
-        );
     }
 }
diff --git a/tests/Support/CanSkipTests.php b/tests/Support/CanSkipTests.php
index 2a1eec10fc..b29fdf88cd 100644
--- a/tests/Support/CanSkipTests.php
+++ b/tests/Support/CanSkipTests.php
@@ -10,4 +10,11 @@ trait CanSkipTests
             $this->markTestIncomplete($message);
         }
     }
+
+    public function markIncompleteIfSqlite($message = 'Test skipped due to database driver being sqlite.')
+    {
+        if (config('database.default') === 'sqlite') {
+            $this->markTestIncomplete($message);
+        }
+    }
 }
diff --git a/tests/Support/CustomTestMacros.php b/tests/Support/CustomTestMacros.php
index 993f449021..956235f461 100644
--- a/tests/Support/CustomTestMacros.php
+++ b/tests/Support/CustomTestMacros.php
@@ -100,5 +100,47 @@ trait CustomTestMacros
                 return $this;
             }
         );
+
+        TestResponse::macro(
+            'assertMessagesContains',
+            function (array|string $keys) {
+                Assert::assertArrayHasKey('messages', $this, 'Response did not contain any messages');
+
+                if (is_string($keys)) {
+                    $keys = [$keys];
+                }
+
+                foreach ($keys as $key) {
+                    Assert::assertArrayHasKey(
+                        $key,
+                        $this['messages'],
+                        "Response messages did not contain the key: {$key}"
+                    );
+                }
+
+                return $this;
+            }
+        );
+
+        TestResponse::macro(
+            'assertPayloadContains',
+            function (array|string $keys) {
+                Assert::assertArrayHasKey('payload', $this, 'Response did not contain a payload');
+
+                if (is_string($keys)) {
+                    $keys = [$keys];
+                }
+
+                foreach ($keys as $key) {
+                    Assert::assertArrayHasKey(
+                        $key,
+                        $this['payload'],
+                        "Response messages did not contain the key: {$key}"
+                    );
+                }
+
+                return $this;
+            }
+        );
     }
 }
diff --git a/tests/Support/Importing/AccessoriesImportFileBuilder.php b/tests/Support/Importing/AccessoriesImportFileBuilder.php
new file mode 100644
index 0000000000..488c91fdc4
--- /dev/null
+++ b/tests/Support/Importing/AccessoriesImportFileBuilder.php
@@ -0,0 +1,74 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Tests\Support\Importing;
+
+use Illuminate\Support\Str;
+
+/**
+ * Build an accessories import file at runtime for testing.
+ *
+ * @template Row of array{
+ * category?: string,
+ * companyName?: string,
+ * itemName?: string,
+ * location?: string,
+ * manufacturerName?: string,
+ * modelNumber?: string,
+ * notes?: string,
+ * orderNumber?: string,
+ * purchaseCost?: int,
+ * purchaseDate?: string,
+ * quantity?: int,
+ * supplierName?: string
+ * }
+ *
+ * @extends FileBuilder<Row>
+ */
+class AccessoriesImportFileBuilder extends FileBuilder
+{
+    /**
+     * @inheritdoc
+     */
+    protected function getDictionary(): array
+    {
+        return [
+            'category'         => 'Category',
+            'companyName'      => 'Company',
+            'itemName'         => 'Item Name',
+            'location'         => 'Location',
+            'manufacturerName' => 'Manufacturer',
+            'modelNumber'      => 'Model Number',
+            'notes'            => 'Notes',
+            'orderNumber'      => 'Order Number',
+            'purchaseCost'     => 'Purchase Cost',
+            'purchaseDate'     => 'Purchase Date',
+            'quantity'         => 'Quantity',
+            'supplierName'     => 'Supplier',
+        ];
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function definition(): array
+    {
+        $faker = fake();
+
+        return [
+            'category'         => Str::random(),
+            'companyName'      => Str::random(),
+            'itemName'         => Str::random(),
+            'location'         => "{$faker->city}, {$faker->country}",
+            'manufacturerName' => $faker->company,
+            'modelNumber'      => Str::random(),
+            'notes'            => $faker->sentence,
+            'orderNumber'      => Str::random(),
+            'purchaseDate'     => $faker->date(),
+            'purchaseCost'     => rand(1, 100),
+            'quantity'         => rand(1, 100),
+            'supplierName'     => $faker->company,
+        ];
+    }
+}
diff --git a/tests/Support/Importing/AssetModelsImportFileBuilder.php b/tests/Support/Importing/AssetModelsImportFileBuilder.php
new file mode 100644
index 0000000000..615e329e47
--- /dev/null
+++ b/tests/Support/Importing/AssetModelsImportFileBuilder.php
@@ -0,0 +1,57 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Tests\Support\Importing;
+
+use Illuminate\Support\Str;
+
+/**
+ * Build a users import file at runtime for testing.
+ *
+ * @template Row of array{
+ *  name?: string,
+ *  manufacturer?: string,
+ *  category?: string,
+ *  model_number?: string,
+ *  requestable?: int,
+ * }
+ *
+ * @extends FileBuilder<Row>
+ */
+class AssetModelsImportFileBuilder extends FileBuilder
+{
+    /**
+     * @inheritdoc
+     */
+    protected function getDictionary(): array
+    {
+        return [
+            'name'           => 'Name',
+            'category'       => 'Category',
+            'manufacturer'   => 'Manufacturer',
+            'model_number'   => 'Model Number',
+            'fieldset'       => 'Fieldset',
+            'eol'            => 'EOL',
+            'min_amt'        => 'Min Amount',
+            'notes'          => 'Notes',
+            'requestable'    => 'Requestable',
+
+        ];
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function definition(): array
+    {
+        $faker = fake();
+
+        return [
+            'name'            => $faker->catchPhrase,
+            'category'        => Str::random(),
+            'model_number'    => $faker->creditCardNumber(),
+            'notes'           => 'Created by demo seeder',
+        ];
+    }
+}
diff --git a/tests/Support/Importing/AssetsImportFileBuilder.php b/tests/Support/Importing/AssetsImportFileBuilder.php
new file mode 100644
index 0000000000..381cf5dffc
--- /dev/null
+++ b/tests/Support/Importing/AssetsImportFileBuilder.php
@@ -0,0 +1,94 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Tests\Support\Importing;
+
+use Illuminate\Support\Str;
+
+/**
+ * Build an assets import file at runtime for testing.
+ *
+ * @template Row of array{
+ *  assigneeFullName?: string,
+ *  assigneeEmail?: string,
+ *  assigneeUsername?: string,
+ *  category?: string,
+ *  companyName?: string,
+ *  itemName?: string,
+ *  location?: string,
+ *  manufacturerName?: int,
+ *  model?: string,
+ *  modelNumber?: string,
+ *  notes?: string,
+ *  purchaseCost?: int,
+ *  purchaseDate?: string,
+ *  serialNumber?: string,
+ *  supplierName?: string,
+ *  status?: string,
+ *  tag?: string,
+ *  warrantyInMonths?: int,
+ * }
+ *
+ * @extends FileBuilder<Row>
+ */
+class AssetsImportFileBuilder extends FileBuilder
+{
+    /**
+     * @inheritdoc
+     */
+    protected function getDictionary(): array
+    {
+        return [
+            'id'                  => 'ID',
+            'assigneeFullName'    => 'Full Name',
+            'assigneeEmail'       => 'Email',
+            'assigneeUsername'    => 'Username',
+            'category'            => 'Category',
+            'companyName'         => 'Company',
+            'itemName'            => 'item Name',
+            'location'            => 'Location',
+            'manufacturerName'    => 'Manufacturer',
+            'model'               => 'Model name',
+            'modelNumber'         => 'Model Number',
+            'notes'               => 'Notes',
+            'purchaseCost'        => 'Purchase Cost',
+            'purchaseDate'        => 'Purchase Date',
+            'serialNumber'        => 'Serial number',
+            'supplierName'        => 'Supplier',
+            'status'              => 'Status',
+            'tag'                 => 'Asset Tag',
+            'warrantyInMonths'    => 'Warranty',
+        ];
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function definition(): array
+    {
+        $faker = fake();
+
+        return [
+            'asset_tag'           => Str::random(),
+            'assigneeFullName'    => $faker->name,
+            'assigneeEmail'       => $faker->email,
+            'assigneeUsername'    => $faker->userName,
+            'category'            => Str::random(),
+            'companyName'         => Str::random() . " {$faker->companySuffix}",
+            'itemName'            => Str::random(),
+            'location'            => "{$faker->country},{$faker->city}",
+            'manufacturerName'    => $faker->company,
+            'model'               => Str::random(),
+            'modelNumber'         => Str::random(),
+            'notes'               => $faker->sentence(5),
+            'purchaseCost'        => rand(1, 100_000),
+            'purchaseDate'        => $faker->date,
+            'serialNumber'        => $faker->uuid,
+            'supplierName'        => $faker->company,
+            'status'              => $faker->randomElement(['Ready to Deploy', 'Archived', 'Pending']),
+            'tag'                 => Str::random(),
+            'warrantyInMonths'    => rand(1, 12),
+        ];
+    }
+}
diff --git a/tests/Support/Importing/CategoriesImportFileBuilder.php b/tests/Support/Importing/CategoriesImportFileBuilder.php
new file mode 100644
index 0000000000..42cfdff164
--- /dev/null
+++ b/tests/Support/Importing/CategoriesImportFileBuilder.php
@@ -0,0 +1,56 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Tests\Support\Importing;
+
+use Illuminate\Support\Str;
+
+/**
+ * Build a users import file at runtime for testing.
+ *
+ * @template Row of array{
+ *  companyName?: string,
+ *  email?: string,
+ *  employeeNumber?: int,
+ *  firstName?: string,
+ *  lastName?: string,
+ *  location?: string,
+ *  phoneNumber?: string,
+ *  position?: string,
+ *  username?: string,
+ * }
+ *
+ * @extends FileBuilder<Row>
+ */
+class CategoriesImportFileBuilder extends FileBuilder
+{
+    /**
+     * @inheritdoc
+     */
+    protected function getDictionary(): array
+    {
+        return [
+            'name'           => 'name',
+            'notes'             => 'notes',
+
+        ];
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function definition(): array
+    {
+        $faker = fake();
+
+        return [
+            'name'    => $faker->company,
+            'notes'   => $faker->sentence,
+            'category_type'   => 'asset',
+            'require_acceptance' => 1,
+            'use_default_eula'  => 1,
+            'checkin_email'  => 1,
+        ];
+    }
+}
diff --git a/tests/Support/Importing/CleansUpImportFiles.php b/tests/Support/Importing/CleansUpImportFiles.php
new file mode 100644
index 0000000000..8e0cbc3108
--- /dev/null
+++ b/tests/Support/Importing/CleansUpImportFiles.php
@@ -0,0 +1,20 @@
+<?php
+
+namespace Tests\Support\Importing;
+
+use App\Models\Import;
+use Illuminate\Support\Facades\Storage;
+
+trait CleansUpImportFiles
+{
+    public function setUp(): void
+    {
+        parent::setUp();
+
+        Import::created(function (Import $import) {
+            $this->beforeApplicationDestroyed(function () use ($import) {
+                Storage::delete('private_uploads/imports/' . $import->file_path);
+            });
+        });
+    }
+}
diff --git a/tests/Support/Importing/ComponentsImportFileBuilder.php b/tests/Support/Importing/ComponentsImportFileBuilder.php
new file mode 100644
index 0000000000..6d0b163419
--- /dev/null
+++ b/tests/Support/Importing/ComponentsImportFileBuilder.php
@@ -0,0 +1,65 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Tests\Support\Importing;
+
+use Illuminate\Support\Str;
+
+/**
+ * Build a components import file at runtime for testing.
+ *
+ * @template Row of array{
+ *  category?: string,
+ *  companyName?: string,
+ *  itemName?: string,
+ *  location?: string,
+ *  orderNumber?: string,
+ *  purchaseCost?: int,
+ *  purchaseDate?: string,
+ *  quantity?: int,
+ *  serialNumber?: string,
+ * }
+ *
+ * @extends FileBuilder<Row>
+ */
+class ComponentsImportFileBuilder extends FileBuilder
+{
+    /**
+     * @inheritdoc
+     */
+    protected function getDictionary(): array
+    {
+        return [
+            'category'     => 'Category',
+            'companyName'  => 'Company',
+            'itemName'     => 'item Name',
+            'location'     => 'Location',
+            'orderNumber'  => 'Order Number',
+            'purchaseCost' => 'Purchase Cost',
+            'purchaseDate' => 'Purchase Date',
+            'quantity'     => 'Quantity',
+            'serialNumber' => 'Serial number',
+        ];
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function definition(): array
+    {
+        $faker = fake();
+
+        return [
+            'category'     => Str::random(),
+            'companyName'  => Str::random() . " {$faker->companySuffix}",
+            'itemName'     => Str::random(),
+            'location'     => "{$faker->city}, {$faker->country}",
+            'orderNumber'  => "ON:COM:{$faker->uuid}",
+            'purchaseCost' => rand(1, 100_000),
+            'purchaseDate' => $faker->date,
+            'quantity'     => rand(1, 100_000),
+            'serialNumber' => 'SN:COM:' . Str::random(),
+        ];
+    }
+}
diff --git a/tests/Support/Importing/ConsumablesImportFileBuilder.php b/tests/Support/Importing/ConsumablesImportFileBuilder.php
new file mode 100644
index 0000000000..16722a2f05
--- /dev/null
+++ b/tests/Support/Importing/ConsumablesImportFileBuilder.php
@@ -0,0 +1,65 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Tests\Support\Importing;
+
+use Illuminate\Support\Str;
+
+/**
+ * Build a consumables import file at runtime for testing.
+ *
+ * @template Row of array{
+ *  category?: string,
+ *  companyName?: string,
+ *  itemName?: string,
+ *  location?: string,
+ *  orderNumber?: string,
+ *  purchaseCost?: int,
+ *  purchaseDate?: string,
+ *  quantity?: int,
+ *  supplier?: string,
+ * }
+ *
+ * @extends FileBuilder<Row>
+ */
+class ConsumablesImportFileBuilder extends FileBuilder
+{
+    /**
+     * @inheritdoc
+     */
+    protected function getDictionary(): array
+    {
+        return [
+            'category'     => 'Category',
+            'companyName'  => 'Company',
+            'itemName'     => 'item Name',
+            'location'     => 'Location',
+            'orderNumber'  => 'Order Number',
+            'purchaseCost' => 'Purchase Cost',
+            'purchaseDate' => 'Purchase Date',
+            'quantity'     => 'Quantity',
+            'supplier'     => 'Supplier',
+        ];
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function definition(): array
+    {
+        $faker = fake();
+
+        return [
+            'category'     => Str::random(),
+            'companyName'  => Str::random() . " {$faker->companySuffix}",
+            'itemName'     => Str::random(),
+            'location'     => "{$faker->city}, {$faker->country}",
+            'orderNumber'  => "ON:CON:{$faker->uuid}",
+            'purchaseCost' => rand(1, 100_000),
+            'purchaseDate' => $faker->date,
+            'quantity'     => rand(1, 100_000),
+            'supplier'     => Str::random() . " {$faker->companySuffix}",
+        ];
+    }
+}
diff --git a/tests/Support/Importing/FileBuilder.php b/tests/Support/Importing/FileBuilder.php
new file mode 100644
index 0000000000..bf08dc96d1
--- /dev/null
+++ b/tests/Support/Importing/FileBuilder.php
@@ -0,0 +1,255 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Tests\Support\Importing;
+
+use Illuminate\Support\Str;
+use Illuminate\Support\Collection;
+use League\Csv\Reader;
+use OutOfBoundsException;
+
+/**
+ * @template Row of array
+ */
+abstract class FileBuilder
+{
+    /**
+     * The import file rows.
+     *
+     * @var Collection<Row>
+     */
+    protected Collection $rows;
+
+    /**
+     * Define the builders default row.
+     *
+     * @return Row
+     */
+    abstract public function definition();
+
+    /**
+     * @param array<Row> $rows
+     */
+    public function __construct(array $rows = [])
+    {
+        $this->rows = new Collection($rows);
+    }
+
+    /**
+     * Get a new file builder instance.
+     *
+     * @param Row $attributes
+     *
+     * @return static
+     */
+    public static function new(array $attributes = [])
+    {
+        $instance = new static;
+
+        return $instance->push($instance->definition())->replace($attributes);
+    }
+
+    /**
+     * Get a new file builder instance from an import file.
+     *
+     * @return static
+     */
+    public static function fromFile(string $filepath)
+    {
+        $instance = new static;
+
+        $reader = Reader::createFromPath($filepath);
+        $importFileHeaders = $reader->first();
+        $dictionary = array_flip($instance->getDictionary());
+
+        foreach ($reader->getRecords() as $key => $record) {
+            $row = [];
+
+            //Skip header.
+            if ($key === 0) {
+                continue;
+            }
+
+            foreach ($record as $index => $value) {
+                $columnNameInImportFile = $importFileHeaders[$index];
+
+                //Try to map the value to a dictionary  or use the file's
+                //column if the key is not defined in the dictionary.
+                $row[$dictionary[$columnNameInImportFile] ?? $columnNameInImportFile] = $value;
+            }
+
+            $instance->push($row);
+        }
+
+        return $instance;
+    }
+
+    /**
+     * Get a new builder instance for the given number of rows.
+     *
+     * @return static
+     */
+    public static function times(int $amountOfRows = 1)
+    {
+        $instance = new static;
+
+        for ($i = 1; $i <= $amountOfRows; $i++) {
+            $instance->push($instance->definition());
+        }
+
+        return $instance;
+    }
+
+    /**
+     * The the dictionary for mapping row keys to the corresponding import file headers.
+     *
+     * @return array<string,string>
+     */
+    protected function getDictionary(): array
+    {
+        return [];
+    }
+
+    /**
+     * Add a new row.
+     *
+     * @param Row $row
+     *
+     * @return $this
+     */
+    public function push(array $row)
+    {
+        if (!empty($row)) {
+            $this->rows->push($row);
+        }
+
+        return $this;
+    }
+
+    /**
+     * Pluck an array of values from the rows.
+     */
+    public function pluck(string $key): array
+    {
+        return $this->rows->pluck($key)->all();
+    }
+
+    /**
+     * Replace the keys in each row with the values of the given replacement if they exist.
+     *
+     * @param array<Row> $replacement
+     *
+     * @return $this
+     */
+    public function replace(array $replacement)
+    {
+        $this->rows = $this->rows->map(function (array $row) use ($replacement) {
+            foreach ($replacement as $key => $value) {
+                if (!array_key_exists($key, $row)) {
+                    continue;
+                }
+
+                $row[$key] = $value;
+            }
+
+            return $row;
+        });
+
+        return $this;
+    }
+
+    /**
+     * Remove the the given keys from all rows.
+     *
+     * @param string|array<string> $keys
+     *
+     * @return $this
+     */
+    public function forget(array|string $keys)
+    {
+        $keys = (array) $keys;
+
+        $this->rows = $this->rows->map(function (array $row) use ($keys) {
+            foreach ($keys as $key) {
+                unset($row[$key]);
+            }
+
+            return $row;
+        });
+
+        return $this;
+    }
+
+    public function toCsv(): array
+    {
+        if ($this->rows->isEmpty()) {
+            return [];
+        }
+
+        $headers = [];
+        $rows = $this->rows;
+        $dictionary = $this->getDictionary();
+
+        foreach (array_keys($rows->first()) as $key) {
+            $headers[] = $dictionary[$key] ?? $key;
+        }
+
+        return $rows
+            ->map(fn (array $row) => array_values(array_combine($headers, $row)))
+            ->prepend($headers)
+            ->all();
+    }
+
+    /**
+     * Save the rows to the imports folder as a csv file.
+     *
+     * @return string The filename.
+     */
+    public function saveToImportsDirectory(?string $filename = null, ?string $locale = null): string
+    {
+        $filename ??= Str::random(40) . '.csv';
+
+        try {
+            $stream = fopen(config('app.private_uploads') . "/imports/{$filename}", 'w');
+
+            foreach ($this->toCsv() as $row) {
+                if ($locale) {
+                    $newrow = [];
+                    foreach ($row as $index => $cell) {
+                        $newrow[$index] = iconv('utf-8', $locale, (string) $cell);
+                    }
+                    $row = $newrow;
+                }
+                fputcsv($stream, $row);
+            }
+            return $filename;
+        } finally {
+            if (is_resource($stream)) {
+                fclose($stream);
+            }
+        }
+    }
+
+    /**
+     * Get the first row of the import file.
+     *
+     * @throws OutOfBoundsException
+     *
+     * @return Row
+     */
+    public function firstRow(): array
+    {
+        return $this->rows->first(null, fn () => throw new OutOfBoundsException('Could not retrieve row from collection.'));
+    }
+
+    /**
+     * Get the all the rows of the import file.
+     *
+     * @return array<Row>
+     */
+    public function all(): array
+    {
+        return $this->rows->all();
+    }
+}
diff --git a/tests/Support/Importing/LicensesImportFileBuilder.php b/tests/Support/Importing/LicensesImportFileBuilder.php
new file mode 100644
index 0000000000..2b5e5c01ee
--- /dev/null
+++ b/tests/Support/Importing/LicensesImportFileBuilder.php
@@ -0,0 +1,86 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Tests\Support\Importing;
+
+use Illuminate\Support\Str;
+
+/**
+ * Build a consumables import file at runtime for testing.
+ *
+ * @template Row of array{
+ * category?: string,
+ * companyName?: string,
+ * expirationDate?: string,
+ * isMaintained?: bool,
+ * isReassignAble?: bool,
+ * licensedToName?: string,
+ * licensedToEmail?: email,
+ * licenseName?: string,
+ * manufacturerName?: string,
+ * notes?: string,
+ * orderNumber?: string,
+ * purchaseCost?: int,
+ * purchaseDate?: string,
+ * seats?: int,
+ * serialNumber?: string,
+ * supplierName?: string
+ * }
+ *
+ * @extends FileBuilder<Row>
+ */
+class LicensesImportFileBuilder extends FileBuilder
+{
+    /**
+     * @inheritdoc
+     */
+    protected function getDictionary(): array
+    {
+        return [
+            'category'         => 'Category',
+            'companyName'      => 'Company',
+            'expirationDate'   => 'expiration date',
+            'isMaintained'     => 'maintained',
+            'isReassignAble'   => 'reassignable',
+            'licensedToName'   => 'Licensed To Name',
+            'licensedToEmail'  => 'Licensed to Email',
+            'licenseName'      => 'Item name',
+            'manufacturerName' => 'manufacturer',
+            'notes'            => 'notes',
+            'orderNumber'      => 'Order Number',
+            'purchaseCost'     => 'Purchase Cost',
+            'purchaseDate'     => 'Purchase Date',
+            'seats'            => 'seats',
+            'serialNumber'     => 'Serial number',
+            'supplierName'     => 'supplier',
+        ];
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function definition(): array
+    {
+        $faker = fake();
+
+        return [
+            'category'         => Str::random(),
+            'companyName'      => Str::random() . " {$faker->companySuffix}",
+            'expirationDate'   => $faker->date,
+            'isMaintained'     => $faker->randomElement(['TRUE', 'FALSE']),
+            'isReassignAble'   => $faker->randomElement(['TRUE', 'FALSE']),
+            'licensedToName'   => $faker->name,
+            'licensedToEmail'  => $faker->email,
+            'licenseName'      => $faker->company,
+            'manufacturerName' => $faker->company,
+            'notes'            => $faker->sentence,
+            'orderNumber'      => "ON:LIC:{$faker->uuid}",
+            'purchaseCost'     => rand(1, 100_000),
+            'purchaseDate'     => $faker->date,
+            'seats'            => rand(1, 10),
+            'serialNumber'     => 'SN:LIC:' . Str::random(),
+            'supplierName'     => $faker->company,
+        ];
+    }
+}
diff --git a/tests/Support/Importing/LocationsImportFileBuilder.php b/tests/Support/Importing/LocationsImportFileBuilder.php
new file mode 100644
index 0000000000..59b7dcc416
--- /dev/null
+++ b/tests/Support/Importing/LocationsImportFileBuilder.php
@@ -0,0 +1,58 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Tests\Support\Importing;
+
+use Illuminate\Support\Str;
+
+/**
+ * Build a users import file at runtime for testing.
+ *
+ * @template Row of array{
+ *  companyName?: string,
+ *  email?: string,
+ *  employeeNumber?: int,
+ *  firstName?: string,
+ *  lastName?: string,
+ *  location?: string,
+ *  phoneNumber?: string,
+ *  position?: string,
+ *  username?: string,
+ * }
+ *
+ * @extends FileBuilder<Row>
+ */
+class LocationsImportFileBuilder extends FileBuilder
+{
+    /**
+     * @inheritdoc
+     */
+    protected function getDictionary(): array
+    {
+        return [
+            'name'           => 'name',
+            'phone'          => 'Phone',
+            'address'             => 'address',
+            'address2'             => 'address2',
+            'city'             => 'city',
+            'state'             => 'state',
+            'country'             => 'country',
+            'zip'             => 'zip',
+            'notes'             => 'notes',
+        ];
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function definition(): array
+    {
+        $faker = fake();
+
+        return [
+            'name'    => $faker->company,
+            'phone'    => $faker->phoneNumber,
+        ];
+    }
+}
diff --git a/tests/Support/Importing/ManufacturersImportFileBuilder.php b/tests/Support/Importing/ManufacturersImportFileBuilder.php
new file mode 100644
index 0000000000..4b5f4546e4
--- /dev/null
+++ b/tests/Support/Importing/ManufacturersImportFileBuilder.php
@@ -0,0 +1,58 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Tests\Support\Importing;
+
+use Illuminate\Support\Str;
+
+/**
+ * Build a users import file at runtime for testing.
+ *
+ * @template Row of array{
+ *  companyName?: string,
+ *  email?: string,
+ *  employeeNumber?: int,
+ *  firstName?: string,
+ *  lastName?: string,
+ *  location?: string,
+ *  phoneNumber?: string,
+ *  position?: string,
+ *  username?: string,
+ * }
+ *
+ * @extends FileBuilder<Row>
+ */
+class ManufacturersImportFileBuilder extends FileBuilder
+{
+    /**
+     * @inheritdoc
+     */
+    protected function getDictionary(): array
+    {
+        return [
+            'name'           => 'name',
+            'support_email'          => 'support_email',
+            'support_phone'          => 'Support Phone',
+            'notes'             => 'notes',
+            'support_fax'             => 'support_fax',
+            'support_url'             => 'support_url',
+        ];
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function definition(): array
+    {
+        $faker = fake();
+
+        return [
+            'name'    => $faker->company,
+            'support_email'          => Str::random(32) . "@{$faker->freeEmailDomain}",
+            'support_phone'    => $faker->phoneNumber,
+            'support_fax'    => $faker->phoneNumber,
+            'support_url'    => $faker->url(),
+        ];
+    }
+}
diff --git a/tests/Support/Importing/SuppliersImportFileBuilder.php b/tests/Support/Importing/SuppliersImportFileBuilder.php
new file mode 100644
index 0000000000..7666174993
--- /dev/null
+++ b/tests/Support/Importing/SuppliersImportFileBuilder.php
@@ -0,0 +1,66 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Tests\Support\Importing;
+
+use Illuminate\Support\Str;
+
+/**
+ * Build a users import file at runtime for testing.
+ *
+ * @template Row of array{
+ *  companyName?: string,
+ *  email?: string,
+ *  employeeNumber?: int,
+ *  firstName?: string,
+ *  lastName?: string,
+ *  location?: string,
+ *  phoneNumber?: string,
+ *  position?: string,
+ *  username?: string,
+ * }
+ *
+ * @extends FileBuilder<Row>
+ */
+class SuppliersImportFileBuilder extends FileBuilder
+{
+    /**
+     * @inheritdoc
+     */
+    protected function getDictionary(): array
+    {
+        return [
+            'name'           => 'name',
+            'email'          => 'email',
+            'contact'          => 'contact',
+            'phone'          => 'Phone',
+            'address'             => 'address',
+            'address2'             => 'address2',
+            'city'             => 'city',
+            'state'             => 'state',
+            'country'             => 'country',
+            'zip'             => 'zip',
+            'notes'             => 'notes',
+            'fax'             => 'fax',
+            'url'             => 'url',
+        ];
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function definition(): array
+    {
+        $faker = fake();
+
+        return [
+            'name'    => $faker->company,
+            'email'          => Str::random(32) . "@{$faker->freeEmailDomain}",
+            'contact'       => $faker->firstName,
+            'phone'    => $faker->phoneNumber,
+            'fax'    => $faker->phoneNumber,
+            'url'    => $faker->url(),
+        ];
+    }
+}
diff --git a/tests/Support/Importing/UsersImportFileBuilder.php b/tests/Support/Importing/UsersImportFileBuilder.php
new file mode 100644
index 0000000000..0a00c995c2
--- /dev/null
+++ b/tests/Support/Importing/UsersImportFileBuilder.php
@@ -0,0 +1,65 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Tests\Support\Importing;
+
+use Illuminate\Support\Str;
+
+/**
+ * Build a users import file at runtime for testing.
+ *
+ * @template Row of array{
+ *  companyName?: string,
+ *  email?: string,
+ *  employeeNumber?: int,
+ *  firstName?: string,
+ *  lastName?: string,
+ *  location?: string,
+ *  phoneNumber?: string,
+ *  position?: string,
+ *  username?: string,
+ * }
+ *
+ * @extends FileBuilder<Row>
+ */
+class UsersImportFileBuilder extends FileBuilder
+{
+    /**
+     * @inheritdoc
+     */
+    protected function getDictionary(): array
+    {
+        return [
+            'companyName'    => 'Company',
+            'email'          => 'email',
+            'employeeNumber' => 'Employee Number',
+            'firstName'       => 'First Name',
+            'lastName'       => 'Last Name',
+            'location'       => 'Location',
+            'phoneNumber'    => 'Phone Number',
+            'position'       => 'Job Title',
+            'username'       => 'Username',
+        ];
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function definition(): array
+    {
+        $faker = fake();
+
+        return [
+            'companyName'    => $faker->company,
+            'email'          => Str::random(32) . "@{$faker->freeEmailDomain}",
+            'employeeNumber' => $faker->uuid,
+            'firstName'       => $faker->firstName,
+            'lastName'       => $faker->lastName,
+            'location'       => "{$faker->city}, {$faker->country}",
+            'phoneNumber'    => $faker->phoneNumber,
+            'position'       => $faker->jobTitle,
+            'username'       => Str::random(),
+        ];
+    }
+}
diff --git a/tests/Support/ProvidesDataForFullMultipleCompanySupportTesting.php b/tests/Support/ProvidesDataForFullMultipleCompanySupportTesting.php
new file mode 100644
index 0000000000..d247b98161
--- /dev/null
+++ b/tests/Support/ProvidesDataForFullMultipleCompanySupportTesting.php
@@ -0,0 +1,70 @@
+<?php
+
+namespace Tests\Support;
+
+use App\Models\Company;
+use App\Models\User;
+use Generator;
+
+trait ProvidesDataForFullMultipleCompanySupportTesting
+{
+    public static function dataForFullMultipleCompanySupportTesting(): Generator
+    {
+        yield "User in a company should result in user's company_id being used" => [
+            function () {
+                $jedi = Company::factory()->create();
+                $sith = Company::factory()->create();
+                $luke = User::factory()->for($jedi)
+                    ->createAccessories()
+                    ->createAssets()
+                    ->createComponents()
+                    ->createConsumables()
+                    ->createLicenses()
+                    ->create();
+
+                return [
+                    'actor' => $luke,
+                    'company_attempting_to_associate' => $sith,
+                    'assertions' => function ($model) use ($jedi) {
+                        self::assertEquals($jedi->id, $model->company_id);
+                    },
+                ];
+            }
+        ];
+
+        yield "User without a company should result in company_id being null" => [
+            function () {
+                $userInNoCompany = User::factory()
+                    ->createAccessories()
+                    ->createAssets()
+                    ->createComponents()
+                    ->createConsumables()
+                    ->createLicenses()
+                    ->create(['company_id' => null]);
+
+                return [
+                    'actor' => $userInNoCompany,
+                    'company_attempting_to_associate' => Company::factory()->create(),
+                    'assertions' => function ($model) {
+                        self::assertNull($model->company_id);
+                    },
+                ];
+            }
+        ];
+
+        yield "Super-User assigning across companies should result in company_id being set to what was provided" => [
+            function () {
+                $superUser = User::factory()->superuser()->create(['company_id' => null]);
+                $company = Company::factory()->create();
+
+                return [
+                    'actor' => $superUser,
+                    'company_attempting_to_associate' => $company,
+                    'assertions' => function ($model) use ($company) {
+                        self::assertEquals($model->company_id, $company->id);
+                    },
+                ];
+            }
+        ];
+    }
+}
diff --git a/tests/Support/Settings.php b/tests/Support/Settings.php
index 2d499838c2..8ff8ba6945 100644
--- a/tests/Support/Settings.php
+++ b/tests/Support/Settings.php
@@ -21,12 +21,57 @@ class Settings
 
     public function enableAlertEmail(string $email = 'notifications@afcrichmond.com'): Settings
     {
-        return $this->update(['alert_email' => $email]);
+        return $this->update([
+            'alert_email' => $email,
+            'alerts_enabled' => 1,
+        ]);
+    }
+    public function setAlertInterval(int $days): Settings
+    {
+        return $this->update([
+            'alert_threshold' => $days,
+        ]);
+    }
+    public function setAuditWarningDays(int $days): Settings
+    {
+        return $this->update([
+            'audit_warning_days' => $days,
+        ]);
     }
-
     public function disableAlertEmail(): Settings
     {
-        return $this->update(['alert_email' => null]);
+        return $this->update([
+            'alert_email' => null,
+            'alerts_enabled' => 0,
+        ]);
+    }
+
+    public function enableAdminCC(string $email = 'cc@example.co'): Settings
+    {
+        return $this->update([
+            'admin_cc_email' => $email,
+        ]);
+    }
+
+    public function disableAdminCC(): Settings
+    {
+        return $this->update([
+            'admin_cc_email' => null,
+        ]);
+    }
+
+    public function enableAdminCCAlways(): Settings
+    {
+        return $this->update([
+            'admin_cc_always' => 1,
+        ]);
+    }
+
+    public function disableAdminCCAlways(): Settings
+    {
+        return $this->update([
+            'admin_cc_always' => 0,
+        ]);
     }
 
     public function enableMultipleFullCompanySupport(): Settings
@@ -121,6 +166,10 @@ class Settings
             'ldap_basedn' => 'CN=Users,DC=ad,DC=example,Dc=com'
         ]);
     }
+    public function setEula($text = 'Default EULA text')
+    {
+        return $this->update(['default_eula_text' => $text]);
+    }
 
     /**
      * @param array $attributes Attributes to modify in the application's settings.
diff --git a/tests/Unit/AssetTest.php b/tests/Unit/AssetTest.php
index ef0da1a1b8..cda91c9c1e 100644
--- a/tests/Unit/AssetTest.php
+++ b/tests/Unit/AssetTest.php
@@ -1,9 +1,12 @@
 <?php
 namespace Tests\Unit;
 
+use App\Http\Controllers\Assets\BulkAssetsController;
 use App\Models\Asset;
 use App\Models\AssetModel;
 use App\Models\Category;
+use App\Models\Statuslabel;
+use App\Models\User;
 use Carbon\Carbon;
 use Tests\TestCase;
 use App\Models\Setting;
@@ -146,10 +149,8 @@ class AssetTest extends TestCase
 
         $this->assertTrue($a->save());
         $this->assertTrue($b->save());
-        \Log::error("A asset tag is: " . $a->asset_tag);
         $matches = [];
         preg_match('/\d+/', $a->asset_tag, $matches);
-        \Log::error("digits are: " . $matches[0]);
         $this->assertEquals(Setting::getSettings()->next_auto_tag_base, $matches[0] + 1, "Next auto increment number should be the last normally-saved one plus one, but isn't");
     }
 
@@ -191,4 +192,100 @@ class AssetTest extends TestCase
         $this->assertEquals(Carbon::createFromDate(2019, 1, 1)->format('Y-m-d'), $asset->warranty_expires->format('Y-m-d'));
 
     }
+
+    public function testAssignedTypeWithoutAssignTo()
+    {
+        $user = User::factory()->create();
+        $asset = Asset::factory()->create([
+            'assigned_to' => $user->id
+        ]);
+        $this->assertModelMissing($asset);
+    }
+
+    public function testGetImageUrlMethod()
+    {
+        $urlBase = config('filesystems.disks.public.url');
+
+        $category = Category::factory()->create(['image' => 'category-image.jpg']);
+        $model = AssetModel::factory()->for($category)->create(['image' => 'asset-model-image.jpg']);
+        $asset = Asset::factory()->for($model, 'model')->create(['image' => 'asset-image.jpg']);
+
+        $this->assertEquals(
+            "{$urlBase}/assets/asset-image.jpg",
+            $asset->getImageUrl()
+        );
+
+        $asset->update(['image' => null]);
+
+        $this->assertEquals(
+            "{$urlBase}/models/asset-model-image.jpg",
+            $asset->refresh()->getImageUrl()
+        );
+
+        $model->update(['image' => null]);
+
+        $this->assertEquals(
+            "{$urlBase}/categories/category-image.jpg",
+            $asset->refresh()->getImageUrl()
+        );
+
+        $category->image = null;
+        $category->save();
+
+        $this->assertFalse($asset->refresh()->getImageUrl());
+
+        // handles case where model does not exist
+        $asset->model_id = 9999999;
+        $asset->forceSave();
+
+        $this->assertFalse($asset->refresh()->getImageUrl());
+    }
+    public function testUndeployableStatusReturnsFalseifAssetIsDeployable()
+    {
+        $assets = Asset::factory()->count(3)->create();
+        $asset_ids = $assets->pluck('id')->toArray();
+
+        $bulk_assets = new BulkAssetsController();
+
+        $result = $bulk_assets->hasUndeployableStatus($asset_ids);
+
+        $this->assertFalse($result);
+    }
+    public function testUndeployableStatusReturnsTrueandTagsIfAssetIsUnDeployable()
+    {
+        $deployable = Asset::factory()->create();
+        $undeployableStatus = Statuslabel::factory()->create(['deployable' => 0]);
+        $undeployable = Asset::factory()->create(
+            [
+                'status_id' => $undeployableStatus->id
+            ]);
+
+        $bulk_assets = new BulkAssetsController();
+
+        $result = $bulk_assets->hasUndeployableStatus([$deployable->id, $undeployable->id]);
+
+        $this->assertIsArray($result);
+        $this->assertTrue($result['status']);
+        $this->assertEquals($undeployable->id, $result['tags'][0]['id']);
+        $this->assertEquals($undeployable->asset_tag, $result['tags'][0]['asset_tag']);
+    }
+
+    public function testUndeployableStatusCheckFiltersOutUndeployableIds()
+    {
+        $deployable = Asset::factory()->create();
+        $undeployableStatus = Statuslabel::factory()->create(['deployable' => 0]);
+        $undeployable = Asset::factory()->create(
+            [
+                'status_id' => $undeployableStatus->id
+            ]);
+
+        $bulk_assets = new BulkAssetsController();
+
+        $result = $bulk_assets->hasUndeployableStatus([$deployable->id, $undeployable->id]);
+
+        $undeployableIds = array_column($result['tags'], 'id');
+        $filtered = array_diff([$deployable->id, $undeployable->id], $undeployableIds);
+
+        $this->assertEquals([$deployable->id], array_values($filtered));
+    }
 }
diff --git a/tests/Unit/BladeComponents/IconComponentTest.php b/tests/Unit/BladeComponents/IconComponentTest.php
new file mode 100644
index 0000000000..b418b38384
--- /dev/null
+++ b/tests/Unit/BladeComponents/IconComponentTest.php
@@ -0,0 +1,20 @@
+<?php
+
+namespace Tests\Unit\BladeComponents;
+
+use Illuminate\Support\Facades\View;
+use Illuminate\Support\Str;
+use Tests\TestCase;
+
+class IconComponentTest extends TestCase
+{
+    public function testIconComponentDoesNotEndInNewline()
+    {
+        $renderedTemplateString = View::make('blade.icon', ['type' => 'checkout'])->render();
+
+        $this->assertFalse(
+            Str::endsWith($renderedTemplateString, PHP_EOL),
+            'Newline found at end of icon component. Bootstrap tables will not render if there is a newline at the end of the file.'
+        );
+    }
+}
diff --git a/tests/Unit/BladeComponents/UserFullNameTest.php b/tests/Unit/BladeComponents/UserFullNameTest.php
new file mode 100644
index 0000000000..bbd74c7fa1
--- /dev/null
+++ b/tests/Unit/BladeComponents/UserFullNameTest.php
@@ -0,0 +1,91 @@
+<?php
+
+namespace Tests\Unit\BladeComponents;
+
+use App\Models\User;
+use Generator;
+use Illuminate\Support\Facades\View;
+use PHPUnit\Framework\Assert;
+use PHPUnit\Framework\Attributes\DataProvider;
+use Tests\TestCase;
+
+class UserFullNameTest extends TestCase
+{
+    public static function provider(): Generator
+    {
+        yield 'Renders link to user if they exist and the authenticated user can view them' => [
+            function () {
+                return [
+                    'actor' => User::factory()->viewUsers()->create(),
+                    'user' => User::factory()->create(['first_name' => 'Jim', 'last_name' => 'Bagg']),
+                    'assertions' => function ($rendered) {
+                        Assert::assertStringContainsString('<a ', $rendered);
+                        Assert::assertStringContainsString('Jim Bagg', $rendered);
+                    },
+                ];
+            }
+        ];
+
+        yield 'Renders struck-through link to user if they are deleted and the authenticated user can view them' => [
+            function () {
+                return [
+                    'actor' => User::factory()->viewUsers()->create(),
+                    'user' => User::factory()->deleted()->create(['first_name' => 'Jim', 'last_name' => 'Bagg']),
+                    'assertions' => function ($rendered) {
+                        Assert::assertStringContainsString('<s><a ', $rendered);
+                        Assert::assertStringContainsString('Jim Bagg', $rendered);
+                    },
+                ];
+            }
+        ];
+
+        yield 'Renders name without link if the authenticated user cannot view them' => [
+            function () {
+                return [
+                    'actor' => User::factory()->create(),
+                    'user' => User::factory()->create(['first_name' => 'Jim', 'last_name' => 'Bagg']),
+                    'assertions' => function ($rendered) {
+                        Assert::assertStringContainsString('<span>Jim Bagg', $rendered);
+                        Assert::assertStringNotContainsString('<a ', $rendered);
+                    },
+                ];
+            }
+        ];
+
+        yield 'Renders struck-through name without link if the user is deleted and the authenticated user cannot view them' => [
+            function () {
+                return [
+                    'actor' => User::factory()->create(),
+                    'user' => User::factory()->deleted()->create(['first_name' => 'Jim', 'last_name' => 'Bagg']),
+                    'assertions' => function ($rendered) {
+                        Assert::assertStringContainsString('<s><span>Jim Bagg', $rendered);
+                    },
+                ];
+            }
+        ];
+
+        yield 'Renders nothing if the provided user is null' => [
+            function () {
+                return [
+                    'actor' => User::factory()->create(),
+                    'user' => null,
+                    'assertions' => function ($rendered) {
+                        Assert::assertEmpty($rendered);
+                    },
+                ];
+            }
+        ];
+    }
+
+    #[DataProvider('provider')]
+    public function testComponent($provided)
+    {
+        ['actor' => $actor, 'user' => $user, 'assertions' => $assertions] = $provided();
+
+        $this->actingAs($actor);
+
+        $renderedTemplateString = View::make('blade.full-user-name', ['user' => $user])->render();
+
+        $assertions($renderedTemplateString);
+    }
+}
diff --git a/tests/Unit/CategoryTest.php b/tests/Unit/CategoryTest.php
index 391e291552..8b1b16ee9f 100644
--- a/tests/Unit/CategoryTest.php
+++ b/tests/Unit/CategoryTest.php
@@ -30,7 +30,6 @@ class CategoryTest extends TestCase
 
        // Generate 5 models via factory
        $models =  AssetModel::factory()
-            ->mbp13Model()
             ->count(5)
             ->create(
                 [
diff --git a/tests/Unit/CompanyScopingTest.php b/tests/Unit/CompanyScopingTest.php
index 3923dd9f7d..ff55e83056 100644
--- a/tests/Unit/CompanyScopingTest.php
+++ b/tests/Unit/CompanyScopingTest.php
@@ -2,6 +2,7 @@
 
 namespace Tests\Unit;
 
+use PHPUnit\Framework\Attributes\DataProvider;
 use App\Models\Accessory;
 use App\Models\Asset;
 use App\Models\AssetMaintenance;
@@ -16,7 +17,7 @@ use Tests\TestCase;
 
 class CompanyScopingTest extends TestCase
 {
-    public function models(): array
+    public static function models(): array
     {
         return [
             'Accessories' => [Accessory::class],
@@ -27,7 +28,7 @@ class CompanyScopingTest extends TestCase
         ];
     }
 
-    /** @dataProvider models */
+    #[DataProvider('models')]
     public function testCompanyScoping($model)
     {
         [$companyA, $companyB] = Company::factory()->count(2)->create();
diff --git a/tests/Unit/ComponentTest.php b/tests/Unit/ComponentTest.php
index df8f64771f..6abbffd82d 100644
--- a/tests/Unit/ComponentTest.php
+++ b/tests/Unit/ComponentTest.php
@@ -1,10 +1,12 @@
 <?php
 namespace Tests\Unit;
 
+use App\Models\Asset;
 use App\Models\Category;
 use App\Models\Company;
 use App\Models\Component;
 use App\Models\Location;
+use App\Models\User;
 use Tests\TestCase;
 
 class ComponentTest extends TestCase
@@ -41,4 +43,58 @@ class ComponentTest extends TestCase
         $this->assertInstanceOf(Category::class, $component->category);
         $this->assertEquals('component', $component->category->category_type);
     }
+
+    public function test_num_checked_out_takes_does_not_scope_by_company()
+    {
+        $this->settings->enableMultipleFullCompanySupport();
+
+        [$companyA, $companyB] = Company::factory()->count(2)->create();
+
+        $componentForCompanyA = Component::factory()->for($companyA)->create(['qty' => 5]);
+        $assetForCompanyB = Asset::factory()->for($companyB)->create();
+
+        // Ideally, we shouldn't have a component attached to an
+        // asset from a different company but alas...
+        $componentForCompanyA->assets()->attach($componentForCompanyA->id, [
+            'component_id' => $componentForCompanyA->id,
+            'assigned_qty' => 4,
+            'asset_id' => $assetForCompanyB->id,
+        ]);
+
+        $this->actingAs(User::factory()->superuser()->create());
+        $this->assertEquals(4, $componentForCompanyA->fresh()->numCheckedOut());
+
+        $this->actingAs(User::factory()->admin()->create());
+        $this->assertEquals(4, $componentForCompanyA->fresh()->numCheckedOut());
+
+        $this->actingAs(User::factory()->for($companyA)->create());
+        $this->assertEquals(4, $componentForCompanyA->fresh()->numCheckedOut());
+    }
+
+    public function test_num_remaining_takes_company_scoping_into_account()
+    {
+        $this->settings->enableMultipleFullCompanySupport();
+
+        [$companyA, $companyB] = Company::factory()->count(2)->create();
+
+        $componentForCompanyA = Component::factory()->for($companyA)->create(['qty' => 5]);
+        $assetForCompanyB = Asset::factory()->for($companyB)->create();
+
+        // Ideally, we shouldn't have a component attached to an
+        // asset from a different company but alas...
+        $componentForCompanyA->assets()->attach($componentForCompanyA->id, [
+            'component_id' => $componentForCompanyA->id,
+            'assigned_qty' => 4,
+            'asset_id' => $assetForCompanyB->id,
+        ]);
+
+        $this->actingAs(User::factory()->superuser()->create());
+        $this->assertEquals(1, $componentForCompanyA->fresh()->numRemaining());
+
+        $this->actingAs(User::factory()->admin()->create());
+        $this->assertEquals(1, $componentForCompanyA->fresh()->numRemaining());
+
+        $this->actingAs(User::factory()->for($companyA)->create());
+        $this->assertEquals(1, $componentForCompanyA->fresh()->numRemaining());
+    }
 }
diff --git a/tests/Unit/DepreciationTest.php b/tests/Unit/DepreciationTest.php
index 4dd8422276..c170ac0e1d 100644
--- a/tests/Unit/DepreciationTest.php
+++ b/tests/Unit/DepreciationTest.php
@@ -1,10 +1,13 @@
 <?php
 namespace Tests\Unit;
 
+use App\Models\Asset;
+use App\Models\Depreciable;
 use App\Models\Depreciation;
 use App\Models\Category;
 use App\Models\License;
 use App\Models\AssetModel;
+use Illuminate\Validation\ValidationException;
 use Tests\TestCase;
 
 class DepreciationTest extends TestCase
@@ -14,17 +17,63 @@ class DepreciationTest extends TestCase
         $depreciation = Depreciation::factory()->create();
 
         AssetModel::factory()
-                    ->mbp13Model()
                     ->count(5)
                     ->create(
                         [
                             'category_id' => Category::factory()->assetLaptopCategory()->create(),
                             'depreciation_id' => $depreciation->id               
                         ]);
-
-
+        
         $this->assertEquals(5, $depreciation->models->count());
     }
+    public function testDepreciationAmount()
+    {
+        $depreciation = Depreciation::factory()->create([
+            'depreciation_type' => 'amount',
+            'depreciation_min' => 1000,
+            'months'=> 36,
+        ]);
+
+        $asset = Asset::factory()
+            ->laptopMbp()
+            ->create(
+                [
+                    'category_id' => Category::factory()->assetLaptopCategory()->create(),
+                    'purchase_date' => now()->subDecade(),
+                    'purchase_cost' => 4000,
+                ]);
+        $asset->model->update([
+            'depreciation_id' => $depreciation->id,
+        ]);
+
+        $asset->getLinearDepreciatedValue();
+
+        $this->assertEquals($depreciation->depreciation_min, $asset->getLinearDepreciatedValue());
+    }
+    public function testDepreciationPercentage()
+    {
+        $depreciation = Depreciation::factory()->create([
+            'depreciation_type' => 'percent',
+            'depreciation_min' => 50,
+            'months'=> 36,
+        ]);
+
+        $asset = Asset::factory()
+            ->laptopMbp()
+            ->create(
+                [
+                    'category_id' => Category::factory()->assetLaptopCategory()->create(),
+                    'purchase_date' => now()->subDecade(),
+                    'purchase_cost' => 4000,
+                ]);
+        $asset->model->update([
+            'depreciation_id' => $depreciation->id,
+        ]);
+
+        $asset->getLinearDepreciatedValue();
+
+        $this->assertEquals(2000, $asset->getLinearDepreciatedValue());
+    }
 
     public function testADepreciationHasLicenses()
     {
diff --git a/tests/Unit/Helpers/HelperTest.php b/tests/Unit/Helpers/HelperTest.php
index 3ef114b798..2fb1c58e26 100644
--- a/tests/Unit/Helpers/HelperTest.php
+++ b/tests/Unit/Helpers/HelperTest.php
@@ -31,46 +31,135 @@ class HelperTest extends TestCase
     public function testGetRedirectOptionMethod()
     {
         $test_data = [
-            'Option 2: redirect for user assigned to ' => [
+            'Option target: redirect for user assigned to ' => [
                 'request' =>(object) ['assigned_user' => 22],
                 'id' => 1,
                 'checkout_to_type' => 'user',
-                'redirect_option' => 2,
+                'redirect_option' => 'target',
                 'table' => 'Assets',
                 'route' => route('users.show', 22),
             ],
-            'Option 2: redirect location assigned to ' => [
+            'Option target: redirect location assigned to ' => [
                 'request' =>(object) ['assigned_location' => 10],
                 'id' => 2,
                 'checkout_to_type' => 'location',
-                'redirect_option' => 2,
+                'redirect_option' => 'target',
                 'table' => 'Locations',
                 'route' => route('locations.show', 10),
             ],
-            'Option 2: redirect back to asset assigned to ' => [
+            'Option target: redirect back to asset assigned to ' => [
                 'request' =>(object) ['assigned_asset' => 101],
                 'id' => 3,
                 'checkout_to_type' => 'asset',
-                'redirect_option' => 2,
+                'redirect_option' => 'target',
                 'table' => 'Assets',
                 'route' => route('hardware.show', 101),
             ],
-            'Option 1: redirect back to asset ' => [
+            'Option item: redirect back to asset ' => [
                 'request' =>(object) ['assigned_asset' => null],
                 'id' => 999,
                 'checkout_to_type' => null,
-                'redirect_option' => 1,
+                'redirect_option' => 'item',
                 'table' => 'Assets',
                 'route' => route('hardware.show', 999),
             ],
-            'Option 0: redirect back to index ' => [
+            'Option index: redirect back to asset index ' => [
                 'request' =>(object) ['assigned_asset' => null],
                 'id' => null,
                 'checkout_to_type' => null,
-                'redirect_option' => 0,
+                'redirect_option' => 'index',
                 'table' => 'Assets',
                 'route' => route('hardware.index'),
             ],
+
+            'Option item: redirect back to user ' => [
+                'request' =>(object) ['assigned_asset' => null],
+                'id' => 999,
+                'checkout_to_type' => null,
+                'redirect_option' => 'item',
+                'table' => 'Users',
+                'route' => route('users.show', 999),
+            ],
+
+            'Option index: redirect back to user index ' => [
+                'request' =>(object) ['assigned_asset' => null],
+                'id' => null,
+                'checkout_to_type' => null,
+                'redirect_option' => 'index',
+                'table' => 'Users',
+                'route' => route('users.index'),
+            ],
+
+            'Option item: redirect back to license ' => [
+                'request' =>(object) ['assigned_asset' => null],
+                'id' => 999,
+                'checkout_to_type' => null,
+                'redirect_option' => 'item',
+                'table' => 'Licenses',
+                'route' => route('licenses.show', 999),
+            ],
+
+            'Option index: redirect back to license index ' => [
+                'request' =>(object) ['assigned_asset' => null],
+                'id' => null,
+                'checkout_to_type' => null,
+                'redirect_option' => 'index',
+                'table' => 'Licenses',
+                'route' => route('licenses.index'),
+            ],
+
+            'Option item: redirect back to accessory list ' => [
+                'request' =>(object) ['assigned_asset' => null],
+                'id' => 999,
+                'checkout_to_type' => null,
+                'redirect_option' => 'item',
+                'table' => 'Accessories',
+                'route' => route('accessories.show', 999),
+            ],
+
+            'Option index: redirect back to accessory index ' => [
+                'request' =>(object) ['assigned_asset' => null],
+                'id' => null,
+                'checkout_to_type' => null,
+                'redirect_option' => 'index',
+                'table' => 'Accessories',
+                'route' => route('accessories.index'),
+            ],
+            'Option item: redirect back to consumable ' => [
+                'request' =>(object) ['assigned_asset' => null],
+                'id' => 999,
+                'checkout_to_type' => null,
+                'redirect_option' => 'item',
+                'table' => 'Consumables',
+                'route' => route('consumables.show', 999),
+            ],
+
+            'Option index: redirect back to consumables index ' => [
+                'request' =>(object) ['assigned_asset' => null],
+                'id' => null,
+                'checkout_to_type' => null,
+                'redirect_option' => 'index',
+                'table' => 'Consumables',
+                'route' => route('consumables.index'),
+            ],
+
+            'Option item: redirect back to component ' => [
+                'request' =>(object) ['assigned_asset' => null],
+                'id' => 999,
+                'checkout_to_type' => null,
+                'redirect_option' => 'item',
+                'table' => 'Components',
+                'route' => route('components.show', 999),
+            ],
+
+            'Option index: redirect back to component index ' => [
+                'request' =>(object) ['assigned_asset' => null],
+                'id' => null,
+                'checkout_to_type' => null,
+                'redirect_option' => 'index',
+                'table' => 'Components',
+                'route' => route('components.index'),
+            ],
         ];
 
         foreach ($test_data as $scenario => $data ) {
@@ -78,7 +167,7 @@ class HelperTest extends TestCase
             Session::put('redirect_option', $data['redirect_option']);
             Session::put('checkout_to_type', $data['checkout_to_type']);
 
-            $redirect = Helper::getRedirectOption($data['request'],$data['id'], $data['table']);
+            $redirect = redirect()->to(Helper::getRedirectOption($data['request'],$data['id'], $data['table']));
 
             $this->assertInstanceOf(RedirectResponse::class, $redirect);
             $this->assertEquals($data['route'], $redirect->getTargetUrl(), $scenario.'failed.');
diff --git a/tests/Unit/Importer/AssetImportTest.php b/tests/Unit/Importer/AssetImportTest.php
new file mode 100644
index 0000000000..09e594c1be
--- /dev/null
+++ b/tests/Unit/Importer/AssetImportTest.php
@@ -0,0 +1,56 @@
+<?php
+
+namespace Tests\Unit\Importer;
+
+use App\Importer\AssetImporter;
+use App\Models\Statuslabel;
+use Tests\TestCase;
+use function Livewire\invade;
+
+class AssetImportTest extends TestCase
+{
+    public function test_uses_first_deployable_status_label_as_default_if_one_exists()
+    {
+        Statuslabel::truncate();
+
+        $pendingStatusLabel = Statuslabel::factory()->pending()->create();
+        $readyToDeployStatusLabel = Statuslabel::factory()->readyToDeploy()->create();
+
+        $importer = new AssetImporter('assets.csv');
+
+        $this->assertEquals(
+            $readyToDeployStatusLabel->id,
+            invade($importer)->defaultStatusLabelId
+        );
+    }
+
+    public function test_uses_first_status_label_as_default_if_deployable_status_label_does_not_exist()
+    {
+        Statuslabel::truncate();
+
+        $statusLabel = Statuslabel::factory()->pending()->create();
+
+        $importer = new AssetImporter('assets.csv');
+
+        $this->assertEquals(
+            $statusLabel->id,
+            invade($importer)->defaultStatusLabelId
+        );
+    }
+
+    public function test_creates_default_status_label_if_one_does_not_exist()
+    {
+        Statuslabel::truncate();
+
+        $this->assertEquals(0, Statuslabel::count());
+
+        $importer = new AssetImporter('assets.csv');
+
+        $this->assertEquals(1, Statuslabel::count());
+
+        $this->assertEquals(
+            Statuslabel::first()->id,
+            invade($importer)->defaultStatusLabelId
+        );
+    }
+}
diff --git a/tests/Unit/Labels/LabelTest.php b/tests/Unit/Labels/LabelTest.php
new file mode 100644
index 0000000000..29bbecd74d
--- /dev/null
+++ b/tests/Unit/Labels/LabelTest.php
@@ -0,0 +1,43 @@
+<?php
+
+namespace Tests\Unit\Labels;
+
+use App\Models\Asset;
+use App\Models\Location;
+use App\Models\Setting;
+use App\View\Label;
+use Tests\TestCase;
+use function Livewire\invade;
+
+class LabelTest extends TestCase
+{
+    /**
+     * @link https://app.shortcut.com/grokability/story/29302
+     */
+    public function test_handles_location_not_being_set_on_asset_gracefully()
+    {
+        $this->settings->set([
+            'label2_enable' => 1,
+            'label2_2d_type' => 'QRCODE',
+            'label2_2d_target' => 'location',
+        ]);
+
+        $location = Location::factory()->create();
+        $assets = Asset::factory()->count(2)->create(['location_id' => $location->id]);
+        $assets->first()->update(['location_id' => null]);
+
+        // pulled from BulkAssetsController@edit method
+        $label = (new Label)
+            ->with('assets', $assets)
+            ->with('settings', Setting::getSettings())
+            ->with('bulkedit', true)
+            ->with('count', 0);
+
+        // a simple way to avoid flooding test output with PDF characters.
+        invade($label)->destination = 'S';
+
+        $label->render();
+
+        $this->assertTrue(true, 'Label rendering should not throw an error when location is not set on an asset.');
+    }
+}
diff --git a/tests/Unit/LdapTest.php b/tests/Unit/LdapTest.php
index 6beb0d2118..a492b1efbc 100644
--- a/tests/Unit/LdapTest.php
+++ b/tests/Unit/LdapTest.php
@@ -2,12 +2,12 @@
 
 namespace Tests\Unit;
 
+use App\Models\Setting;
+use PHPUnit\Framework\Attributes\Group;
 use App\Models\Ldap;
 use Tests\TestCase;
 
-/**
- * @group ldap
- */
+#[Group('ldap')]
 class LdapTest extends TestCase
 {
     use \phpmock\phpunit\PHPMock;
@@ -97,7 +97,7 @@ class LdapTest extends TestCase
                 "count" => 1,
                 0 => [
                     'sn' => 'Surname',
-                    'firstName' => 'FirstName'
+                    'firstname' => 'FirstName'
                 ]
             ]
         );
@@ -207,4 +207,30 @@ class LdapTest extends TestCase
         $this->assertEqualsCanonicalizing(["count" => 2], $results);
     }
 
+    public function testNonexistentTLSFile()
+    {
+        $this->settings->enableLdap()->set(['ldap_client_tls_cert' => 'SAMPLE CERT TEXT']);
+        $certfile = Setting::get_client_side_cert_path();
+        $this->assertStringEqualsFile($certfile, 'SAMPLE CERT TEXT');
+    }
+
+    public function testStaleTLSFile()
+    {
+        file_put_contents(Setting::get_client_side_cert_path(), 'STALE CERT FILE');
+        sleep(1); // FIXME - this is going to slow down tests
+        $this->settings->enableLdap()->set(['ldap_client_tls_cert' => 'SAMPLE CERT TEXT']);
+        $certfile = Setting::get_client_side_cert_path();
+        $this->assertStringEqualsFile($certfile, 'SAMPLE CERT TEXT');
+    }
+
+    public function testFreshTLSFile()
+    {
+        $this->settings->enableLdap()->set(['ldap_client_tls_cert' => 'SAMPLE CERT TEXT']);
+        $client_side_cert_path = Setting::get_client_side_cert_path();
+        file_put_contents($client_side_cert_path, 'WEIRDLY UPDATED CERT FILE');
+        //the system should respect our cache-file, since the settings haven't been updated
+        $possibly_recached_cert_file = Setting::get_client_side_cert_path(); //this should *NOT* re-cache from the Settings
+        $this->assertStringEqualsFile($possibly_recached_cert_file, 'WEIRDLY UPDATED CERT FILE');
+    }
+
 }
diff --git a/tests/Unit/Listeners/LogListenerTest.php b/tests/Unit/Listeners/LogListenerTest.php
index 011a5c51a4..64dd2a3d67 100644
--- a/tests/Unit/Listeners/LogListenerTest.php
+++ b/tests/Unit/Listeners/LogListenerTest.php
@@ -16,7 +16,7 @@ class LogListenerTest extends TestCase
         $checkedOutTo = User::factory()->create();
         $checkedOutBy = User::factory()->create();
 
-        // Simply to ensure `user_id` is set in the action log
+        // Simply to ensure `created_by` is set in the action log
         $this->actingAs($checkedOutBy);
 
         (new LogListener())->onCheckoutableCheckedOut(new CheckoutableCheckedOut(
@@ -28,7 +28,7 @@ class LogListenerTest extends TestCase
 
         $this->assertDatabaseHas('action_logs', [
             'action_type' => 'checkout',
-            'user_id' => $checkedOutBy->id,
+            'created_by' => $checkedOutBy->id,
             'target_id' => $checkedOutTo->id,
             'target_type' => User::class,
             'item_id' => $asset->id,
@@ -36,4 +36,5 @@ class LogListenerTest extends TestCase
             'note' => 'A simple note...',
         ]);
     }
+
 }
diff --git a/tests/Unit/Mail/CheckoutAssetMailTest.php b/tests/Unit/Mail/CheckoutAssetMailTest.php
new file mode 100644
index 0000000000..af198b2cd1
--- /dev/null
+++ b/tests/Unit/Mail/CheckoutAssetMailTest.php
@@ -0,0 +1,75 @@
+<?php
+
+namespace Tests\Unit\Mail;
+
+use App\Mail\CheckoutAssetMail;
+use App\Models\Asset;
+use App\Models\CheckoutAcceptance;
+use App\Models\User;
+use PHPUnit\Framework\Attributes\DataProvider;
+use Tests\TestCase;
+
+class CheckoutAssetMailTest extends TestCase
+{
+    public static function data()
+    {
+        yield 'Asset requiring acceptance' => [
+            function () {
+                $asset = Asset::factory()->requiresAcceptance()->create();
+                return [
+                    'asset' => $asset,
+                    'acceptance' => CheckoutAcceptance::factory()->for($asset, 'checkoutable')->create(),
+                    'first_time_sending' => true,
+                    'expected_subject' => 'Asset checked out',
+                    'expected_opening' => 'A new item has been checked out under your name that requires acceptance, details are below.'
+                ];
+            }
+        ];
+
+        yield 'Asset not requiring acceptance' => [
+            function () {
+                return [
+                    'asset' => Asset::factory()->doesNotRequireAcceptance()->create(),
+                    'acceptance' => null,
+                    'first_time_sending' => true,
+                    'expected_subject' => 'Asset checked out',
+                    'expected_opening' => 'A new item has been checked out under your name, details are below.'
+                ];
+            }
+        ];
+
+        yield 'Reminder' => [
+            function () {
+                return [
+                    'asset' => Asset::factory()->requiresAcceptance()->create(),
+                    'acceptance' => CheckoutAcceptance::factory()->create(),
+                    'first_time_sending' => false,
+                    'expected_subject' => 'Reminder: You have Unaccepted Assets.',
+                    'expected_opening' => 'An item was recently checked out under your name that requires acceptance, details are below.'
+                ];
+            }
+        ];
+    }
+
+    #[DataProvider('data')]
+    public function testSubjectLineAndOpening($data)
+    {
+        [
+            'asset' => $asset,
+            'acceptance' => $acceptance,
+            'first_time_sending' => $firstTimeSending,
+            'expected_subject' => $expectedSubject,
+            'expected_opening' => $expectedOpening,
+        ] = $data();
+
+        (new CheckoutAssetMail(
+            $asset,
+            User::factory()->create(),
+            User::factory()->create(),
+            $acceptance,
+            'A note goes here',
+            $firstTimeSending,
+        ))->assertHasSubject($expectedSubject)
+            ->assertSeeInText($expectedOpening);
+    }
+}
diff --git a/tests/Unit/Models/Company/GetIdForCurrentUserTest.php b/tests/Unit/Models/Company/GetIdForCurrentUserTest.php
index 6d77c88731..c21c4f36a3 100644
--- a/tests/Unit/Models/Company/GetIdForCurrentUserTest.php
+++ b/tests/Unit/Models/Company/GetIdForCurrentUserTest.php
@@ -32,11 +32,11 @@ class GetIdForCurrentUserTest extends TestCase
         $this->assertEquals(2000, Company::getIdForCurrentUser(1000));
     }
 
-    public function testReturnsProvidedValueForNonSuperUserWithoutCompanyIdWhenFullCompanySupportEnabled()
+    public function testReturnsNullForNonSuperUserWithoutCompanyIdWhenFullCompanySupportEnabled()
     {
         $this->settings->enableMultipleFullCompanySupport();
 
         $this->actingAs(User::factory()->create(['company_id' => null]));
-        $this->assertEquals(1000, Company::getIdForCurrentUser(1000));
+        $this->assertNull(Company::getIdForCurrentUser(1000));
     }
 }
diff --git a/tests/Unit/Models/Labels/DefaultLabelTest.php b/tests/Unit/Models/Labels/DefaultLabelTest.php
new file mode 100644
index 0000000000..db7abf5a35
--- /dev/null
+++ b/tests/Unit/Models/Labels/DefaultLabelTest.php
@@ -0,0 +1,38 @@
+<?php
+
+namespace Tests\Unit\Models\Labels;
+
+use App\Models\Labels\DefaultLabel;
+use Exception;
+use Tests\TestCase;
+
+class DefaultLabelTest extends TestCase
+{
+    /**
+     * @link https://app.shortcut.com/grokability/story/29281
+     */
+    public function test_handles_zero_values_for_columns_gracefully()
+    {
+        $this->settings->set([
+            'labels_width' => 0.00000,
+            'labels_display_sgutter' => 0.00000,
+        ]);
+
+        // simply ensuring constructor didn't throw exception...
+        $this->assertInstanceOf(DefaultLabel::class, new DefaultLabel());
+    }
+
+    /**
+     * @link https://app.shortcut.com/grokability/story/29281
+     */
+    public function test_handles_zero_values_for_rows_gracefully()
+    {
+        $this->settings->set([
+            'labels_height' => 0.00000,
+            'labels_display_bgutter' => 0.00000,
+        ]);
+
+        // simply ensuring constructor didn't throw exception...
+        $this->assertInstanceOf(DefaultLabel::class, new DefaultLabel());
+    }
+}
diff --git a/tests/Unit/Models/ReportTemplates/ReportTemplateParsingValuesTest.php b/tests/Unit/Models/ReportTemplates/ReportTemplateParsingValuesTest.php
new file mode 100644
index 0000000000..91bd8979d0
--- /dev/null
+++ b/tests/Unit/Models/ReportTemplates/ReportTemplateParsingValuesTest.php
@@ -0,0 +1,209 @@
+<?php
+
+namespace Tests\Unit\Models\ReportTemplates;
+
+use App\Models\Department;
+use App\Models\Location;
+use App\Models\ReportTemplate;
+use PHPUnit\Framework\Attributes\Group;
+use Tests\TestCase;
+
+#[Group('custom-reporting')]
+class ReportTemplateParsingValuesTest extends TestCase
+{
+    public function testParsingValuesOnNonExistentReportTemplate()
+    {
+        $unsavedTemplate = new ReportTemplate;
+
+        // checkmarkValue() should be "checked" (1) by default
+        $this->assertEquals('1', $unsavedTemplate->checkmarkValue('is_a_checkbox_field'));
+
+        // radioValue() defaults to false but can be overridden
+        $this->assertFalse($unsavedTemplate->radioValue('value_on_unsaved_template', 'can_be_anything'));
+        $this->assertTrue($unsavedTemplate->radioValue('value_on_unsaved_template', 'can_be_anything', true));
+
+        // selectValue() should be null by default
+        $this->assertNull($unsavedTemplate->selectValue('value_on_unsaved_template'));
+        $this->assertNull($unsavedTemplate->selectValue('value_on_unsaved_template'), Location::class);
+
+        // selectValues() should be an empty array by default
+        $this->assertIsArray($unsavedTemplate->selectValues('value_on_unsaved_template'));
+        $this->assertEmpty($unsavedTemplate->selectValues('value_on_unsaved_template'));
+        $this->assertEmpty($unsavedTemplate->selectValues('value_on_unsaved_template'), Location::class);
+
+        // textValue() should be an empty string by default
+        $this->assertEquals('', $unsavedTemplate->selectValue('value_on_unsaved_template'));
+    }
+
+    public function testParsingCheckmarkValue()
+    {
+        $template = ReportTemplate::factory()->create([
+            'options' => [
+                'is_a_checkbox_field' => '1',
+                // This shouldn't happen since unchecked inputs are
+                // not submitted, but we should handle it anyway
+                'is_checkbox_field_with_zero' => '0',
+            ],
+        ]);
+
+        $this->assertEquals('1', $template->checkmarkValue('is_a_checkbox_field'));
+        $this->assertEquals('0', $template->checkmarkValue('non_existent_key'));
+        $this->assertEquals('0', $template->checkmarkValue('is_checkbox_field_with_zero'));
+        $this->assertEquals('0', (new ReportTemplate)->checkmarkValue('non_existent_key_that_is_overwritten_to_default_to_zero', '0'));
+    }
+
+    public function testParsingTextValue()
+    {
+        $template = ReportTemplate::factory()->create([
+            'options' => [
+                'is_a_text_field' => 'some text',
+            ],
+        ]);
+
+        $this->assertEquals('some text', $template->textValue('is_a_text_field'));
+        $this->assertEquals('', $template->textValue('non_existent_key'));
+
+        $this->assertEquals('', (new ReportTemplate)->textValue('is_a_text_field'));
+        $this->assertEquals('my fallback', (new ReportTemplate)->textValue('non_existent_key', 'my fallback'));
+    }
+
+    public function testParsingRadioValue()
+    {
+        $template = ReportTemplate::factory()->create([
+            'options' => ['property_that_exists' => '1'],
+        ]);
+
+        $this->assertTrue($template->radioValue('property_that_exists', '1'));
+
+        // check non-existent key returns false
+        $this->assertFalse($template->radioValue('non_existent_property', 'doesnt_matter'));
+
+        // check can return fallback value
+        $this->assertTrue($template->radioValue('non_existent_property', 'doesnt_matter', true));
+    }
+
+    public function testParsingSelectValue()
+    {
+        $template = ReportTemplate::factory()->create([
+            'options' => [
+                'is_a_text_field_as_well' => '4',
+                'contains_a_null_value' => null,
+            ],
+        ]);
+
+        $this->assertEquals('4', $template->selectValue('is_a_text_field_as_well'));
+        $this->assertEquals('', $template->selectValue('non_existent_key'));
+        $this->assertNull($template->selectValue('contains_a_null_value'));
+    }
+
+    public function testParsingSelectValues()
+    {
+        $template = ReportTemplate::factory()->create([
+            'options' => [
+                'an_array' => ['2', '3', '4'],
+                'an_empty_array' => [],
+                'an_array_containing_null' => [null],
+            ],
+        ]);
+
+        $this->assertEquals(['2', '3', '4'], $template->selectValues('an_array'));
+        $this->assertEquals([], $template->selectValues('an_empty_array'));
+        $this->assertEquals([null], $template->selectValues('an_array_containing_null'));
+        $this->assertEquals([], $template->selectValues('non_existent_key'));
+    }
+
+    public function testSelectValueDoesNotIncludeDeletedOrNonExistentModels()
+    {
+        [$locationA, $locationB] = Location::factory()->count(2)->create();
+        $invalidId = 10000;
+
+        $templateWithValidId = ReportTemplate::factory()->create([
+            'options' => ['single_value' => $locationA->id],
+        ]);
+
+        $templateWithDeletedId = ReportTemplate::factory()->create([
+            'options' => ['single_value' => $locationB->id],
+        ]);
+        $locationB->delete();
+
+        $templateWithInvalidId = ReportTemplate::factory()->create([
+            'options' => ['single_value' => $invalidId],
+        ]);
+
+        $this->assertEquals(
+            $locationA->id,
+            $templateWithValidId->selectValue('single_value', Location::class)
+        );
+
+        $this->assertNull($templateWithDeletedId->selectValue('single_value', Location::class));
+        $this->assertNull($templateWithInvalidId->selectValue('single_value', Location::class));
+        $this->assertNull((new ReportTemplate)->selectValue('value_on_unsaved_template', Location::class));
+    }
+
+    public function testSelectValuesDoNotIncludeDeletedOrNonExistentModels()
+    {
+        [$locationA, $locationB] = Location::factory()->count(2)->create();
+        $invalidId = 10000;
+
+        $template = ReportTemplate::factory()->create([
+            'options' => [
+                'array_of_ids' => [
+                    $locationA->id,
+                    $locationB->id,
+                    $invalidId,
+                ],
+            ],
+        ]);
+
+        $locationB->delete();
+
+        $parsedValues = $template->selectValues('array_of_ids', Location::class);
+
+        $this->assertContains($locationA->id, $parsedValues);
+        $this->assertNotContains($locationB->id, $parsedValues);
+        $this->assertNotContains($invalidId, $parsedValues);
+    }
+
+    public function testGracefullyHandlesSingleSelectBecomingMultiSelect()
+    {
+        $department = Department::factory()->create();
+
+        $templateWithValue = ReportTemplate::factory()->create([
+            'options' => ['single_value' => 'a string'],
+        ]);
+
+        $templateWithModelId = ReportTemplate::factory()->create([
+            'options' => ['by_dept_id' => $department->id],
+        ]);
+
+        // If nothing is selected for a single select then it is stored
+        // as null and should be returned as an empty array.
+        $templateWithNull = ReportTemplate::factory()->create([
+            'options' => ['by_dept_id' => null],
+        ]);
+
+        $this->assertEquals(['a string'], $templateWithValue->selectValues('single_value'));
+        $this->assertContains($department->id, $templateWithModelId->selectValues('by_dept_id', Department::class));
+        $this->assertEquals([], $templateWithNull->selectValues('by_dept_id'));
+    }
+
+    public function testGracefullyHandlesMultiSelectBecomingSingleSelectBySelectingTheFirstValue()
+    {
+        [$departmentA, $departmentB] = Department::factory()->count(2)->create();
+
+        // Given report templates saved with a property that is an array of values
+        $templateWithValuesInArray = ReportTemplate::factory()->create([
+            'options' => ['array_of_values' => [3, 'a string']],
+        ]);
+
+        $templateWithModelIdsInArray = ReportTemplate::factory()->create([
+            'options' => ['array_of_model_ids' => [$departmentA->id, $departmentB->id]],
+        ]);
+
+        $this->assertEquals(3, $templateWithValuesInArray->selectValue('array_of_values'));
+        $this->assertEquals(
+            $departmentA->id,
+            $templateWithModelIdsInArray->selectValue('array_of_model_ids', Department::class)
+        );
+    }
+}
diff --git a/tests/Unit/NotificationTest.php b/tests/Unit/NotificationTest.php
index 8005759a1e..5b420a6753 100644
--- a/tests/Unit/NotificationTest.php
+++ b/tests/Unit/NotificationTest.php
@@ -1,13 +1,13 @@
 <?php
 namespace Tests\Unit;
 
+use App\Mail\CheckoutAssetMail;
 use App\Models\User;
 use App\Models\Asset;
 use App\Models\AssetModel;
 use App\Models\Category;
 use Carbon\Carbon;
-use App\Notifications\CheckoutAssetNotification;
-use Illuminate\Support\Facades\Notification;
+use Illuminate\Support\Facades\Mail;
 use Tests\TestCase;
 
 class NotificationTest extends TestCase
@@ -29,8 +29,34 @@ class NotificationTest extends TestCase
                 'purchase_date' =>   Carbon::createFromDate(2017, 1, 1)->hour(0)->minute(0)->second(0)->format('Y-m-d')
             ]);
 
-        Notification::fake();
+        Mail::fake();
         $asset->checkOut($user, $admin->id);
-        Notification::assertSentTo($user, CheckoutAssetNotification::class);
+        Mail::assertSent(CheckoutAssetMail::class, function (CheckoutAssetMail $mail) use ($user) {
+            return $mail->hasTo($user->email) && $mail->hasSubject(trans('mail.Asset_Checkout_Notification'));
+        });
+    }
+    public function testDefaultEulaIsSentWhenSetInCategory()
+    {
+        Mail::fake();
+
+        $this->settings->setEula('My Custom EULA Text');
+
+        $user = User::factory()->create();
+
+        $category = Category::factory()->create([
+            'use_default_eula' => 1,
+            'eula_text' => 'EULA Text that should not be used',
+        ]);
+
+        $model = AssetModel::factory()->for($category)->create();
+        $asset = Asset::factory()->for($model, 'model')->create();
+
+        $asset->checkOut($user, User::factory()->superuser()->create()->id);
+
+        Mail::assertSent(CheckoutAssetMail::class, function ($mail) use ($user) {
+            return $mail->hasTo($user->email) &&
+                str_contains($mail->render(), 'My Custom EULA Text') &&
+                !str_contains($mail->render(), 'EULA Text that should not be used');
+        });
     }
 }
diff --git a/tests/Unit/SnipeTranslatorTest.php b/tests/Unit/SnipeTranslatorTest.php
index e492bdbf63..d374bf9134 100644
--- a/tests/Unit/SnipeTranslatorTest.php
+++ b/tests/Unit/SnipeTranslatorTest.php
@@ -34,7 +34,7 @@ class SnipeTranslatorTest extends TestCase
     {
         $this->assertEquals(
             'Ingen sikkerhetskopier ble gjort ennå',
-            trans('backup::notifications.no_backups_info',[],'no-NO'),
+            trans('backup::notifications.no_backups_info',[],'nb-NO'),
             "Norwegian 'no backups info' message should be here"
         );
     }
diff --git a/tests/Unit/Transformers/DepreciationReportTransformerTest.php b/tests/Unit/Transformers/DepreciationReportTransformerTest.php
new file mode 100644
index 0000000000..7a0017196a
--- /dev/null
+++ b/tests/Unit/Transformers/DepreciationReportTransformerTest.php
@@ -0,0 +1,24 @@
+<?php
+
+namespace Tests\Unit\Transformers;
+
+use App\Http\Transformers\DepreciationReportTransformer;
+use App\Models\Asset;
+use App\Models\Depreciation;
+use Tests\TestCase;
+
+class DepreciationReportTransformerTest extends TestCase
+{
+    public function testHandlesModelDepreciationMonthsBeingZero()
+    {
+        $asset = Asset::factory()->create();
+        $depreciation = Depreciation::factory()->create(['months' => 0]);
+        $asset->model->depreciation()->associate($depreciation);
+
+        $transformer = new DepreciationReportTransformer;
+
+        $result = $transformer->transformAsset($asset);
+
+        $this->assertIsArray($result);
+    }
+}
diff --git a/tests/Unit/UserTest.php b/tests/Unit/UserTest.php
index e089fc4023..f54969a5da 100644
--- a/tests/Unit/UserTest.php
+++ b/tests/Unit/UserTest.php
@@ -24,6 +24,30 @@ class UserTest extends TestCase
         $this->assertEquals($expected_username, $user['username']);
     }
 
+    public function testFirstNameEmail()
+    {
+        $fullname = "Natalia Allanovna Romanova-O'Shostakova";
+        $expected_email = 'natalia@example.com';
+        $user = User::generateFormattedNameFromFullName($fullname, 'firstname');
+        $this->assertEquals($expected_email, $user['username'] . '@example.com');
+    }
+
+    public function testLastName()
+    {
+        $fullname = "Natalia Allanovna Romanova-O'Shostakova";
+        $expected_username = 'allanovna-romanova-oshostakova';
+        $user = User::generateFormattedNameFromFullName($fullname, 'lastname');
+        $this->assertEquals($expected_username, $user['username']);
+    }
+
+    public function testLastNameEmail()
+    {
+        $fullname = "Natalia Allanovna Romanova-O'Shostakova";
+        $expected_username = 'allanovna-romanova-oshostakova@example.com';
+        $user = User::generateFormattedNameFromFullName($fullname, 'lastname');
+        $this->assertEquals($expected_username, $user['username'] . '@example.com');
+    }
+
     public function testFirstNameDotLastName()
     {
         $fullname = "Natalia Allanovna Romanova-O'Shostakova";
@@ -32,6 +56,14 @@ class UserTest extends TestCase
         $this->assertEquals($expected_username, $user['username']);
     }
 
+    public function testFirstNameDotLastNameEmail()
+    {
+        $fullname = "Natalia Allanovna Romanova-O'Shostakova";
+        $expected_email = 'natalia.allanovna-romanova-oshostakova@example.com';
+        $user = User::generateFormattedNameFromFullName($fullname, 'firstname.lastname');
+        $this->assertEquals($expected_email, $user['username'] . '@example.com');
+    }
+
     public function testLastNameFirstInitial()
     {
         $fullname = "Natalia Allanovna Romanova-O'Shostakova";
@@ -40,6 +72,14 @@ class UserTest extends TestCase
         $this->assertEquals($expected_username, $user['username']);
     }
 
+    public function testLastNameFirstInitialEmail()
+    {
+        $fullname = "Natalia Allanovna Romanova-O'Shostakova";
+        $expected_email = 'allanovna-romanova-oshostakovan@example.com';
+        $user = User::generateFormattedNameFromFullName($fullname, 'lastnamefirstinitial');
+        $this->assertEquals($expected_email, $user['username'] . '@example.com');
+    }
+
     public function testFirstInitialLastName()
     {
         $fullname = "Natalia Allanovna Romanova-O'Shostakova";
@@ -48,6 +88,14 @@ class UserTest extends TestCase
         $this->assertEquals($expected_username, $user['username']);
     }
 
+    public function testFirstInitialLastNameEmail()
+    {
+        $fullname = "Natalia Allanovna Romanova-O'Shostakova";
+        $expected_email = 'nallanovna-romanova-oshostakova@example.com';
+        $user = User::generateFormattedNameFromFullName($fullname, 'filastname');
+        $this->assertEquals($expected_email, $user['username'] . '@example.com');
+    }
+
     public function testFirstInitialUnderscoreLastName()
     {
         $fullname = "Natalia Allanovna Romanova-O'Shostakova";
@@ -56,6 +104,14 @@ class UserTest extends TestCase
         $this->assertEquals($expected_username, $user['username']);
     }
 
+    public function testFirstInitialUnderscoreLastNameEmail()
+    {
+        $fullname = "Natalia Allanovna Romanova-O'Shostakova";
+        $expected_email = 'nallanovna-romanova-oshostakova@example.com';
+        $user = User::generateFormattedNameFromFullName($fullname, 'firstinitial_lastname');
+        $this->assertEquals($expected_email, $user['username'] . '@example.com');
+    }
+
     public function testSingleName()
     {
         $fullname = 'Natalia';
@@ -64,35 +120,91 @@ class UserTest extends TestCase
         $this->assertEquals($expected_username, $user['username']);
     }
 
-    public function firstInitialDotLastname()
+    public function testSingleNameEmail()
+    {
+        $fullname = 'Natalia';
+        $expected_email = 'natalia@example.com';
+        $user = User::generateFormattedNameFromFullName($fullname, 'firstname_lastname',);
+        $this->assertEquals($expected_email, $user['username'] . '@example.com');
+    }
+
+    public function testFirstInitialDotLastname()
     {
         $fullname = "Natalia Allanovna Romanova-O'Shostakova";
-        $expected_username = 'n.allanovnaromanovaoshostakova';
+        $expected_username = 'nallanovna-romanova-oshostakova';
         $user = User::generateFormattedNameFromFullName($fullname, 'firstinitial.lastname');
         $this->assertEquals($expected_username, $user['username']);
     }
 
-    public function lastNameUnderscoreFirstInitial()
+    public function testFirstInitialDotLastnameEmail()
     {
         $fullname = "Natalia Allanovna Romanova-O'Shostakova";
-        $expected_username = 'allanovnaromanovaoshostakova_n';
+        $expected_email = 'nallanovna-romanova-oshostakova@example.com';
+        $user = User::generateFormattedNameFromFullName($fullname, 'firstinitial.lastname');
+        $this->assertEquals($expected_email, $user['username'] . '@example.com');
+    }
+
+    public function testLastNameDotFirstInitial()
+    {
+        $fullname = "Natalia Allanovna Romanova-O'Shostakova";
+        $expected_username = 'allanovna-romanova-oshostakova.n';
+        $user = User::generateFormattedNameFromFullName($fullname, 'lastname.firstinitial');
+        $this->assertEquals($expected_username, $user['username']);
+    }
+
+    public function testLastNameDotFirstInitialEmail()
+    {
+        $fullname = "Natalia Allanovna Romanova-O'Shostakova";
+        $expected_email = 'allanovna-romanova-oshostakova.n@example.com';
+        $user = User::generateFormattedNameFromFullName($fullname, 'lastname.firstinitial');
+        $this->assertEquals($expected_email, $user['username'] . '@example.com');
+    }
+
+    public function testLastNameUnderscoreFirstInitial()
+    {
+        $fullname = "Natalia Allanovna Romanova-O'Shostakova";
+        $expected_username = 'allanovna-romanova-oshostakova_n';
         $user = User::generateFormattedNameFromFullName($fullname, 'lastname_firstinitial');
         $this->assertEquals($expected_username, $user['username']);
     }
 
-    public function firstNameLastName()
+    public function testLastNameUnderscoreFirstInitialEmail()
     {
         $fullname = "Natalia Allanovna Romanova-O'Shostakova";
-        $expected_username = 'nataliaallanovnaromanovaoshostakova';
+        $expected_email = 'allanovna-romanova-oshostakova_n@example.com';
+        $user = User::generateFormattedNameFromFullName($fullname, 'lastname_firstinitial');
+        $this->assertEquals($expected_email, $user['username'] . '@example.com');
+    }
+
+    public function testFirstNameLastName()
+    {
+        $fullname = "Natalia Allanovna Romanova-O'Shostakova";
+        $expected_username = 'nataliaallanovna-romanova-oshostakova';
         $user = User::generateFormattedNameFromFullName($fullname, 'firstnamelastname');
         $this->assertEquals($expected_username, $user['username']);
     }
 
-    public function firstNameLastInitial()
+    public function testFirstNameLastNameEmail()
+    {
+        $fullname = "Natalia Allanovna Romanova-O'Shostakova";
+        $expected_email = 'nataliaallanovna-romanova-oshostakova@example.com';
+        $user = User::generateFormattedNameFromFullName($fullname, 'firstnamelastname');
+        $this->assertEquals($expected_email, $user['username'] . '@example.com');
+    }
+
+    public function testFirstNameLastInitial()
     {
         $fullname = "Natalia Allanovna Romanova-O'Shostakova";
         $expected_username = 'nataliaa';
         $user = User::generateFormattedNameFromFullName($fullname, 'firstnamelastinitial');
         $this->assertEquals($expected_username, $user['username']);
     }
+
+    public function testFirstNameLastInitialEmail()
+    {
+        $fullname = "Natalia Allanovna Romanova-O'Shostakova";
+        $expected_email = 'nataliaa@example.com';
+        $user = User::generateFormattedNameFromFullName($fullname, 'firstnamelastinitial');
+        $this->assertEquals($expected_email, $user['username'] . '@example.com');
+    }
 }
diff --git a/tests/pa11y/.gitignore b/tests/pa11y/.gitignore
new file mode 100755
index 0000000000..c96a04f008
--- /dev/null
+++ b/tests/pa11y/.gitignore
@@ -0,0 +1,2 @@
+*
+!.gitignore
\ No newline at end of file
diff --git a/tests/pa11y/.gitkeep b/tests/pa11y/.gitkeep
new file mode 100755
index 0000000000..e69de29bb2
diff --git a/upgrade.php b/upgrade.php
index 798d9d3c8f..b98162ed96 100644
--- a/upgrade.php
+++ b/upgrade.php
@@ -1,17 +1,40 @@
 <?php
+
+$error_icon = "\e[91m✘\e[0m";
+$success_icon = "\e[92m√\e[0m";
+$info_icon = "\e[93mⓘ\e[0m";
+
 (PHP_SAPI !== 'cli' || isset($_SERVER['HTTP_USER_AGENT'])) && die('Access denied.');
 
-// We define this because we can't reliable use file_get_contents because some
+// We define this because we can't reliably use file_get_contents because some
 // machines don't allow URL access via allow_url_fopen being set to off
 function url_get_contents ($Url) {
+    $results = file_get_contents($Url);
+    if ($results) {
+        return $results;
+    }
+    print("file_get_contents() failed, trying curl instead.\n");
     if (!function_exists('curl_init')){
         die("cURL is not installed!\nThis is required for Snipe-IT as well as the upgrade script, so you will need to fix this before continuing.\nAborting upgrade...\n");
     }
     $ch = curl_init();
     curl_setopt($ch, CURLOPT_URL, $Url);
     curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
+    // If we're on windows, make sure we can load intermediate certificates in
+    // weird corporate environments.
+    // See:  https://github.com/curl/curl/commit/2d6333101a71129a6a802eb93f84a5ac89e34479
+    // this will _probably_ only work if your libcurl has been linked to Schannel, the native Windows SSL implementation
+    if (PHP_OS == "WINNT" && defined("CURLOPT_SSL_OPTIONS") && defined("CURLSSLOPT_NATIVE_CA")) {
+        curl_setopt($ch, CURLOPT_SSL_OPTIONS, CURLSSLOPT_NATIVE_CA);
+    }
     $output = curl_exec($ch);
     curl_close($ch);
+    if ($output === false) {
+        print("\e[91mError retrieving PHP requirements!\e[39m\n");
+        print("Error was: " . curl_error($ch) . "\n");
+        print("Try enabling allow_url_fopen in php.ini, or fixing your curl/OpenSSL setup, or try rerunning with --skip-php-compatibility-checks");
+        return '{}';
+    }
     return $output;
 }
 
@@ -20,6 +43,7 @@ $skip_php_checks = false;
 $branch = 'master';
 $branch_override = false;
 $no_interactive = false;
+$skip_backup = false;
 
 // Check for branch or other overrides
 if ($argc > 1){
@@ -28,6 +52,9 @@ if ($argc > 1){
             case '--skip-php-compatibility-checks':
                 $skip_php_checks = true;
                 break;
+            case '--skip-backup':
+                $skip_backup = true;
+                break;
             case '--branch':
                 $arg++;
                 $branch = $argv[$arg];
@@ -44,7 +71,7 @@ if ($argc > 1){
     }
 }
 
-echo "--------------------------------------------------------\n";
+echo "\e[95m--------------------------------------------------------\n";
 echo "WELCOME TO THE SNIPE-IT UPGRADER! \n";
 echo "--------------------------------------------------------\n\n";
 echo "This script will attempt to: \n\n";
@@ -53,31 +80,40 @@ echo "- check your PHP version and extension requirements \n";
 echo "- check directory permissions \n";
 echo "- do a git pull to bring you to the latest version \n";
 echo "- run composer install to get your vendors up to date \n";
+echo "- run a backup \n";
 echo "- run migrations to get your schema up to date \n";
-echo "- clear out old cache settings\n\n";
+echo "- clear out old cache settings\e[39m\n\n";
 
 
-// Fetching most current upgrade requirements from github. Read more here: https://github.com/snipe/snipe-it/pull/14127
-$remote_requirements_file = "https://raw.githubusercontent.com/snipe/snipe-it/$branch/.upgrade_requirements.json";
-$upgrade_requirements = json_decode(url_get_contents($remote_requirements_file), true);
-
+// Fetching most current upgrade requirements from github. Read more here: https://github.com/grokability/snipe-it/pull/14127
+$remote_requirements_file = "https://raw.githubusercontent.com/grokability/snipe-it/$branch/.upgrade_requirements.json";
+$upgrade_requirements_raw = url_get_contents($remote_requirements_file);
+$upgrade_requirements = json_decode($upgrade_requirements_raw, true);
 if (! $upgrade_requirements) {
     if(!$skip_php_checks){
-        echo "\nERROR: Failed to retrieve remote requirements from $remote_requirements_file\n\n";
+        echo "\n\e[91mERROR: Failed to retrieve remote requirements from $remote_requirements_file \e[39m\n\n";
         if ($branch_override){
-            echo "NOTE: You passed a custom branch: $branch\n";
-            echo "   If the above URL doesn't work, that may be why. Please check you branch spelling/extistance\n\n";
+            echo "\e[93mNOTE: You passed a custom branch: $branch\n";
+            echo "If the above URL doesn't work, that may be why. Please check the branch spelling/existence\e[39m\n\n";
         }
-        echo "We suggest correcting this, but if you can't,  please verify that your requirements conform to those at that url.\n\n";
-        echo " -- DANGER -- DO AT YOUR OWN RISK --\n";
-        echo "      IF YOU ARE SURE, re-run this script with --skip-php-compatibility-checks to skip this check.\n";
-        echo " -- DANGER -- THIS COULD BREAK YOUR INSTALLATION";
-        die("Exiting.\n\n");
+
+        if (json_last_error()) {
+            print "\e[91mJSON DECODE ERROR DETECTED:\n";
+            print json_last_error_msg() . "\n\n";
+            print "Raw curl output:\n";
+            print $upgrade_requirements_raw . "\e[39m\n\n";
+        }
+
+        echo "\e[93mWe suggest correcting this, but if you can't,  please verify that your requirements conform to those at that url.\n\n";
+        echo "\e[91m-- DANGER -- DO AT YOUR OWN RISK --\n";
+        echo "IF YOU ARE SURE, re-run this script with --skip-php-compatibility-checks to skip this check.\n";
+        echo "-- DANGER -- THIS COULD BREAK YOUR INSTALLATION\e[39m\n\n";
+        die("Aborting upgrade.\n\n");
     }
-    echo "NOTICE: Unable to fetch upgrade requirements, but continuing because you passed --skip-php-compatibility-checks...\n";
+    echo "\e[93mNOTICE: Unable to fetch upgrade requirements, but continuing because you passed --skip-php-compatibility-checks...e[39m\n";
 }
 
-echo "Launching using branch: $branch\n";
+echo "Launching using branch: $branch\e[39m\n";
 
 if($upgrade_requirements){
     $php_min_works = $upgrade_requirements['php_min_version'];
@@ -107,27 +143,26 @@ if ((strtoupper(substr(PHP_OS, 0, 3)) === 'WIN') || (!function_exists('posix_get
 	$username = $pwu_data['name'];
 
 	if (($username=='root') || ($username=='admin')) {
-		die("\nERROR: This script should not be run as root/admin. Exiting.\n\n");
+		die("\n".$error_icon."ERROR: This script should not be run as root/admin. Exiting.\n\n");
 	}
 }
 
 
 
-echo "--------------------------------------------------------\n";
+echo "\e[95m--------------------------------------------------------\n";
 echo "STEP 1: Checking .env file: \n";
-echo "- Your .env is located at ".getcwd()."/.env \n";
-echo "--------------------------------------------------------\n\n";
+echo "--------------------------------------------------------\e[39m\n\n";
 
 
 // Check the .env looks ok
 $env = file('.env');
 if (! $env){
-    echo "\n!!!!!!!!!!!!!!!!!!!!!!!!!! .ENV FILE ERROR !!!!!!!!!!!!!!!!!!!!!!!!!!\n";
+    echo "\n\e[91m!!!!!!!!!!!!!!!!!!!!!!!!!! .ENV FILE ERROR !!!!!!!!!!!!!!!!!!!!!!!!!!\n";
     echo "Your .env file doesn't seem to exist in this directory or isn't readable! Please look into that.\n";
     exit(1);
 }
 
-$env_good = '';
+$env_good = $success_icon.' Your .env file is located at '.getcwd()."/.env \n";
 $env_bad = '';
 
 // Loop through each line of the .env
@@ -135,7 +170,11 @@ foreach ($env as $line_num => $line) {
 
     if ((strlen($line) > 1) && (strpos($line, "#") !== 0)) {
 
-        list ($env_key, $env_value) = $env_line = explode('=', $line);
+        $env_line = explode('=', $line, 2);
+        if (count($env_line) != 2) {
+            continue;
+        }
+        list ($env_key, $env_value) = $env_line;
 
         // The array starts at 0
         $show_line_num = $line_num+1;
@@ -168,32 +207,32 @@ foreach ($env as $line_num => $line) {
 
         if ($env_key == 'APP_KEY') {
             if (($env_value=='')  || (strlen($env_value) < 20)) {
-                $env_bad .= "✘ APP_KEY ERROR in your .env on line #'.{$show_line_num}.': Your APP_KEY should not be blank. Run `php artisan key:generate` to generate one.\n";
+                $env_bad .= $error_icon." APP_KEY ERROR in your .env on line #'.{$show_line_num}.': Your APP_KEY should not be blank. Run `php artisan key:generate` to generate one.\n";
             } else {
-                $env_good .= "√ Your APP_KEY is not blank. \n";
+                $env_good .= $success_icon." Your APP_KEY is not blank. \n";
             }
         }
 
         if ($env_key == 'APP_URL') {
 
             if (($env_value!="null") && ($env_value!="")) {
-                $env_good .= '√ Your APP_URL is not null or blank. It is set to '.$env_value."\n";
+                $env_good .= $success_icon.' Your APP_URL is not null or blank. It is set to '.$env_value."\n";
 
                 if (!str_begins(trim($env_value), 'http://') && (!str_begins($env_value, 'https://'))) {
-                    $env_bad .= '✘ APP_URL ERROR in your .env on line #'.$show_line_num.': Your APP_URL should start with https:// or http://!! It is currently set to: '.$env_value;
+                    $env_bad .= $error_icon.' APP_URL ERROR in your .env on line #'.$show_line_num.': Your APP_URL should start with https:// or http://!! It is currently set to: '.$env_value;
                 } else {
-                    $env_good .= '√ Your APP_URL is set to '.$env_value.' and starts with the protocol (https:// or http://)'."\n";
+                    $env_good .= $success_icon.' Your APP_URL is set to '.$env_value.' and starts with the protocol (https:// or http://)'."\n";
                 }
 
                 if (str_ends(trim($env_value), "/")) {
-                    $env_bad .= '✘ APP_URL ERROR in your .env on line #'.$show_line_num.': Your APP_URL should NOT end with a trailing slash. It is currently set to: '.$env_value;
+                    $env_bad .= $error_icon.' APP_URL ERROR in your .env on line #'.$show_line_num.': Your APP_URL should NOT end with a trailing slash. It is currently set to: '.$env_value;
                 } else {
-                    $env_good .= '√ Your APP_URL ('.$env_value.') does not have a trailing slash.'."\n";
+                    $env_good .= $success_icon.' Your APP_URL ('.$env_value.') does not have a trailing slash.'."\n";
                 }
 
 
             } else {
-                $env_bad .= "✘ APP_URL ERROR in your .env on line #".$show_line_num.": Your APP_URL CANNOT be set to null or left blank.\n";
+                $env_bad .= $error_icon." APP_URL ERROR in your .env on line #".$show_line_num.": Your APP_URL CANNOT be set to null or left blank.\n";
             }
 
         }
@@ -207,34 +246,34 @@ echo $env_good;
 
 if ($env_bad !='') {
 
-    echo "!!!!!!!!!!!!!!!!!!!!!!!!!! .ENV FILE ERROR !!!!!!!!!!!!!!!!!!!!!!!!!!\n";
-    echo "Your .env file is misconfigured. Upgrade cannot continue.\n";
+    echo "\e[91m!!!!!!!!!!!!!!!!!!!!!!!!!! .ENV FILE ERROR !!!!!!!!!!!!!!!!!!!!!!!!!!\n";
+    echo "\e[91mYour .env file is misconfigured. Upgrade cannot continue.\n";
     echo "--------------------------------------------------------\n\n";
     echo $env_bad;
     echo "\n\n--------------------------------------------------------\n";
-    echo "!!!!!!!!!!!!!!!!!!!!!!!!! ABORTING THE UPGRADER !!!!!!!!!!!!!!!!!!!!!!\n";
-    echo "Please correct the issues above in ".getcwd()."/.env and try again.\n";
-    echo "--------------------------------------------------------\n";
+    echo "\e[91m!!!!!!!!!!!!!!!!!!!!!!!!! ABORTING THE UPGRADER !!!!!!!!!!!!!!!!!!!!!!\n";
+    echo "\e[91mPlease correct the issues above in ".getcwd()."/.env and try again.\n";
+    echo "\e[91m--------------------------------------------------------\n";
     exit(1);
 }
 
 
 if(!$skip_php_checks){
-    echo "\n--------------------------------------------------------\n";
-    echo "STEP 2: Checking PHP requirements: (Required PHP >=". $php_min_works. " - <".$php_max_wontwork.") \n";
-    echo "--------------------------------------------------------\n\n";
+    echo "\n\e[95m--------------------------------------------------------\n";
+    echo "STEP 2: Checking PHP requirements: (Required PHP >=". $php_min_works. " - <".$php_max_wontwork.")\n";
+    echo "--------------------------------------------------------\e[39m\n\n";
 
     if ((version_compare(phpversion(), $php_min_works, '>=')) && (version_compare(phpversion(), $php_max_wontwork, '<'))) {
 
-        echo "√ Current PHP version: (" . phpversion() . ") is at least " . $php_min_works . " and less than ".$php_max_wontwork."! Continuing... \n";
+        echo $success_icon." Current PHP version: (" . phpversion() . ") is at least " . $php_min_works . " and less than ".$php_max_wontwork."! Continuing... \n";
         echo sprintf("FYI: The php.ini used by this PHP is: %s\n\n", get_cfg_var('cfg_file_path'));
 
     } else {
-        echo "!!!!!!!!!!!!!!!!!!!!!!!!! PHP VERSION ERROR !!!!!!!!!!!!!!!!!!!!!!!!!\n";
+        echo "\e[91m!!!!!!!!!!!!!!!!!!!!!!!!! PHP VERSION ERROR !!!!!!!!!!!!!!!!!!!!!!!!!\n";
         echo "This version of PHP (".phpversion().") is NOT compatible with Snipe-IT.\n";
         echo "Snipe-IT requires PHP versions between ".$php_min_works." and ".$php_max_wontwork.".\n";
         echo "Please install a compatible version of PHP and re-run this script again. \n";
-        echo "!!!!!!!!!!!!!!!!!!!!!!!!! ABORTING THE UPGRADER !!!!!!!!!!!!!!!!!!!!!!\n";
+        echo "\e[91m!!!!!!!!!!!!!!!!!!!!!!!!! ABORTING THE UPGRADER !!!!!!!!!!!!!!!!!!!!!!\n";
         exit(1);
     }
 }
@@ -282,29 +321,34 @@ foreach ($required_exts_array as $required_ext) {
             // Split the either/ors by their pipe and put them into an array
             $require_either = explode("|", $required_ext);
 
+            $has_one_required_ext = false;
+
             // Now loop through the either/or array and see whether any of the options match
             foreach ($require_either as $require_either_value) {
 
                 if (in_array($require_either_value, $loaded_exts_array)) {
-                    $ext_installed .=  '√ '.$require_either_value." is installed!\n";
-                    break;
-                // If no match, add it to the string for errors
-                } else {
-                    $ext_missing .=  '✘ MISSING PHP EXTENSION: '.str_replace("|", " OR ", $required_ext)."\n";
+                    $ext_installed .=  $success_icon.' '.$require_either_value." is installed!\n";
+                    $has_one_required_ext = true;
                     break;
                 }
             }
 
+            // If no match, add it to the string for errors
+            if (!$has_one_required_ext) {
+                $ext_missing .= $error_icon.' MISSING PHP EXTENSION: '.str_replace("|", " OR ", $required_ext)."\n";
+                break;
+            }
+
         // If this isn't an either/or option, just add it to the string of errors conventionally
         } elseif (!in_array($required_ext, $recommended_exts_array)){
-            $ext_missing .=  '✘ MISSING PHP EXTENSION: '.$required_ext."\n";
+            $ext_missing .=  $error_icon.' MISSING PHP EXTENSION: '.$required_ext."\n";
         } else {
             $ext_installed .= '- '.$required_ext." is *NOT* installed, but is recommended...\n";
         }
 
     // The required extension string was found in the array of installed extensions - yay!
     } else {
-        $ext_installed .=  '√ '.$required_ext." is installed!\n";
+        $ext_installed .=  $success_icon.' '.$required_ext." is installed!\n";
     }
 }
 
@@ -315,15 +359,15 @@ if ($ext_missing!='') {
     echo "--------------------------------------------------------\n";
 
     foreach ($loaded_exts_array as $loaded_ext) {
-       echo "- ".$loaded_ext."\n";
+       echo $success_icon.' '.$loaded_ext."\n";
     }
 
-    echo "--------------------- !! ERROR !! ----------------------\n";
+    echo "\e[91m--------------------- !! ERROR !! ----------------------\n";
     echo $ext_missing;
-    echo "--------------------------------------------------------\n";
-    echo "ABORTING THE INSTALLER  \n";
-    echo "Please install the extensions above and re-run this script.\n";
-    echo "--------------------------------------------------------\n";
+    echo "\e[91m--------------------------------------------------------\n";
+    echo "\e[91mABORTING THE INSTALLER  \n";
+    echo "\e[91mPlease install the extensions above and re-run this script.\n";
+    echo "\e[91m--------------------------------------------------------\n";
     exit(1);
 } else {
     echo $ext_installed."\n";
@@ -332,9 +376,9 @@ if ($ext_missing!='') {
 
 
 
-echo "--------------------------------------------------------\n";
+echo "\e[95m--------------------------------------------------------\n";
 echo "STEP 3: Checking directory permissions: \n";
-echo "--------------------------------------------------------\n\n";
+echo "--------------------------------------------------------\e[39m\n\n";
 
 
 $writable_dirs_array =
@@ -360,9 +404,9 @@ $dirs_not_writable = '';
 // Loop through the directories that need to be writable
 foreach ($writable_dirs_array as $writable_dir) {
     if (is_writable($writable_dir)) {
-        $dirs_writable .= '√ '.getcwd().'/'.$writable_dir." is writable \n";
+        $dirs_writable .= $success_icon.' '.getcwd().'/'.$writable_dir." is writable \n";
     } else {
-        $dirs_not_writable .= '✘ PERMISSIONS ERROR: '.getcwd().'/'.$writable_dir." is NOT writable\n";
+        $dirs_not_writable .= $error_icon.' PERMISSIONS ERROR: '.getcwd().'/'.$writable_dir." is NOT writable\n";
     }
 }
 
@@ -370,44 +414,24 @@ echo $dirs_writable."\n";
 
 // Print out a useful error message
 if ($dirs_not_writable!='') {
-    echo "--------------------------------------------------------\n";
-    echo "The following directories/files do not seem writable: \n";
-    echo "--------------------------------------------------------\n";
+    echo "\e[91m--------------------------------------------------------\n";
+    echo "\eThe following directories/files do not seem writable: \n";
+    echo "\e--------------------------------------------------------\e[39m\n";
 
     echo $dirs_not_writable;
 
-    echo "--------------------- !! ERROR !! ----------------------\n";
-    echo "Please check the permissions on the directories above and re-run this script.\n";
-    echo "------------------------- :( ---------------------------\n\n";
+    echo "\e[91m--------------------- !! ERROR !! ----------------------\n";
+    echo "\ePlease check the permissions on the directories above and re-run this script.\n";
+    echo "\e------------------------- :( ---------------------------\e[39m\n\n";
     exit(1);
 }
 
 
 
-echo "--------------------------------------------------------\n";
-echo "STEP 4: Backing up database: \n";
-echo "--------------------------------------------------------\n\n";
-$backup = exec('php artisan snipeit:backup', $backup_results, $return_code);
-echo '-- ' . implode("\n", $backup_results) . "\n\n";
-if ($return_code > 0) {
-    die("Something went wrong with your backup. Aborting!\n\n");
-}
-unset($return_code);
 
-echo "--------------------------------------------------------\n";
-echo "STEP 5: Putting application into maintenance mode: \n";
-echo "--------------------------------------------------------\n\n";
-exec('php artisan down',  $down_results, $return_code);
-echo '-- ' . implode("\n", $down_results) . "\n";
-if ($return_code > 0) {
-    die("Something went wrong with downing you site. This can't be good. Please investigate the error. Aborting!n\n");
-}
-unset($return_code);
-
-
-echo "--------------------------------------------------------\n";
-echo "STEP 6: Pulling latest from Git (".$branch." branch): \n";
-echo "--------------------------------------------------------\n\n";
+echo "\e[95m--------------------------------------------------------\n";
+echo "STEP 4: Pulling latest from Git (".$branch." branch): \n";
+echo "--------------------------------------------------------\e[39m\n\n";
 $git_version = shell_exec('git --version');
 
 if ((strpos('git version', $git_version)) === false) {
@@ -431,9 +455,9 @@ if ((strpos('git version', $git_version)) === false) {
 }
 
 
-echo "--------------------------------------------------------\n";
-echo "STEP 7: Cleaning up old cached files:\n";
-echo "--------------------------------------------------------\n\n";
+echo "\e[95m--------------------------------------------------------\n";
+echo "STEP 5: Cleaning up old cached files:\n";
+echo "--------------------------------------------------------\e[39m\n\n";
 
 // Build an array of the files we generally want to delete because they
 // can cause issues with funky caching
@@ -446,39 +470,28 @@ $unused_files = [
 
 foreach ($unused_files as $unused_file) {
     if (file_exists($unused_file)) {
-        echo "√ Deleting ".$unused_file.". It is no longer used.\n";
+        echo $success_icon." Deleting ".$unused_file.". It is no longer used.\n";
         @unlink($unused_file);
     } else {
-        echo "√ No ".$unused_file.", so nothing to delete.\n";
+        echo $success_icon." No ".$unused_file.", so nothing to delete.\n";
     }
 }
 echo "\n";
 
-$config_clear = shell_exec('php artisan config:clear');
-$cache_clear = shell_exec('php artisan cache:clear');
-$route_clear = shell_exec('php artisan route:clear');
-$view_clear = shell_exec('php artisan view:clear');
-echo '-- '.$config_clear;
-echo '-- '.$cache_clear;
-echo '-- '.$route_clear;
-echo '-- '.$view_clear;
-echo "\n";
 
-echo "--------------------------------------------------------\n";
-echo "STEP 8: Updating composer dependencies:\n";
+echo "\e[95m--------------------------------------------------------\n";
+echo "STEP 6: Updating composer dependencies:\n";
 echo "(This may take a moment.)\n";
-echo "--------------------------------------------------------\n\n";
+echo "--------------------------------------------------------\e[39m\n\n";
 echo "-- Running the app in ".$app_environment." mode.\n";
 
 // Composer install
 if (file_exists('composer.phar')) {
-    echo "√ Local composer.phar detected, so we'll use that.\n\n";
+    echo $success_icon." Local composer.phar detected, so we'll use that.\n\n";
     echo "-- Updating local composer.phar\n\n";
     $composer_update = shell_exec('php composer.phar self-update');
     echo $composer_update."\n\n";
 
-
-
     // Use --no-dev only if we are in production mode.
     // This will cause errors otherwise, if the user is in develop or local for their APP_ENV
     if ($app_environment == 'production') {
@@ -486,10 +499,9 @@ if (file_exists('composer.phar')) {
     } else {
         $composer = shell_exec('php composer.phar install --prefer-source');
     }
+
     $composer_dump = shell_exec('php composer.phar dump');
 
-
-
 } else {
 
     echo "-- We couldn't find a local composer.phar. No worries, trying globally.\n";
@@ -506,48 +518,87 @@ if (file_exists('composer.phar')) {
     $composer_dump = shell_exec('composer dump');
 
 
-
 }
 
 echo $composer_dump."\n";
 echo $composer;
 
+$config_clear = shell_exec('php artisan config:clear');
+$cache_clear = shell_exec('php artisan cache:clear');
+$route_clear = shell_exec('php artisan route:clear');
+$view_clear = shell_exec('php artisan view:clear');
+echo $success_icon.' '.trim($config_clear)."\n";
+echo $success_icon.' '.trim($cache_clear)."\n";
+echo $success_icon.' '.trim($route_clear)."\n";
+echo $success_icon.' '.trim($view_clear)."\n";
+echo "\n";
 
-echo "--------------------------------------------------------\n";
+echo "\e[95m--------------------------------------------------------\n";
+echo "STEP 7: Putting application into maintenance mode: \n";
+echo "--------------------------------------------------------\e[39m\n\n";
+exec('php artisan down',  $down_results, $return_code);
+echo '-- ' . implode("\n", $down_results) . "\n";
+if ($return_code > 0) {
+    die("Something went wrong with downing your site. This can't be good. Please investigate the error. Aborting!\n\n");
+}
+unset($return_code);
+
+
+echo "\e[95m--------------------------------------------------------\n";
+echo "STEP 8: Backing up database: \n";
+echo "--------------------------------------------------------\e[39m\n\n";
+
+if (!$skip_backup) {
+    $backup = exec('php artisan snipeit:backup', $backup_results, $return_code);
+
+    if ($return_code > 0) {
+        die($error_icon." Something went wrong with your backup. Aborting!\n\n");
+    } else {
+        echo '-- ' . implode("\n", $backup_results) . "\n\n";
+    }
+    unset($return_code);
+} else {
+    echo "Upgrade was run with --skip-backup, so no backup will be run.\n\n";
+}
+
+
+
+
+echo "\e[95m--------------------------------------------------------\n";
 echo "STEP 9: Migrating database:\n";
-echo "--------------------------------------------------------\n\n";
+echo "--------------------------------------------------------\e[39m\n\n";
 
 $migrations = shell_exec('php artisan migrate --force');
 echo $migrations."\n";
 
 
-echo "--------------------------------------------------------\n";
+echo "\e[95m--------------------------------------------------------\n";
 echo "STEP 10: Checking for OAuth keys:\n";
-echo "--------------------------------------------------------\n\n";
+echo "--------------------------------------------------------\e[39m\n\n";
 
 
 if ((!file_exists('storage/oauth-public.key')) || (!file_exists('storage/oauth-private.key'))) {
-    echo "- No OAuth keys detected. Running passport install now.\n\n";
-    $passport = shell_exec('php artisan passport:install');
+    echo $info_icon." No OAuth keys detected. Running passport install now.\n\n";
+    $passport = shell_exec('php artisan passport:install --no-interaction');
     echo $passport;
 } else {
-    echo "√ OAuth keys detected. Skipping passport install.\n\n";
+    echo $success_icon." OAuth keys detected. Skipping passport install.\n\n";
 }
 
 
-echo "--------------------------------------------------------\n";
+echo "\e[95m--------------------------------------------------------\n";
 echo "STEP 11: Taking application out of maintenance mode:\n";
-echo "--------------------------------------------------------\n\n";
+echo "--------------------------------------------------------\e[39m\n\n";
 
 $up = shell_exec('php artisan up');
-echo '-- '.$up."\n";
+echo $success_icon.' '.trim($up)."\n\n";
 
 
 
-echo "---------------------- FINISHED! -----------------------\n";
+echo "\e[92m---------------------- FINISHED! -----------------------\n";
 echo "All done! Clear your browser cookies and re-login to use \n";
 echo "your upgraded Snipe-IT!\n";
-echo "--------------------------------------------------------\n\n";
+echo "--------------------------------------------------------\e[39m\n\n";
 
 
 function str_begins($haystack, $needle) {
@@ -557,6 +608,3 @@ function str_begins($haystack, $needle) {
 function str_ends($haystack,  $needle) {
     return (substr_compare($haystack, $needle, -strlen($needle)) === 0);
 }
-
-
-
diff --git a/webpack.mix.js b/webpack.mix.js
index 469e26e584..3894a1b674 100644
--- a/webpack.mix.js
+++ b/webpack.mix.js
@@ -1,4 +1,5 @@
 const mix = require("laravel-mix");
+const fs = require("node:fs");
 
 // This generates a file called app.css, which we use
 // later on to build all.css
@@ -40,82 +41,59 @@ mix
   .minify("./public/css/dist/signature-pad.css");
 
 /**
- * Copy, minify and version signature-pad.css
+ * Copy and version select2
+ */
+mix
+    .copy("./node_modules/select2/dist/js/i18n", "./public/js/select2/i18n")
+
+/**
+ * Copy and version fontawesome
  */
 mix
     .copy("./node_modules/@fortawesome/fontawesome-free/webfonts", "./public/css/webfonts")
 
+/**
+ * Copy BS tables js file
+ */
+mix
+    .copy( './node_modules/bootstrap-table/dist/bootstrap-table-locale-all.min.js', 'public/js/dist' )
+    .copy( './node_modules/bootstrap-table/dist/locale/bootstrap-table-en-US.min.js', 'public/js/dist' )
+
 // Combine main SnipeIT JS files
 mix
   .js(
     [
       "./resources/assets/js/snipeit.js", //this is the actual Snipe-IT JS - require()s bootstrap.js
       "./resources/assets/js/snipeit_modals.js",
+      "./node_modules/canvas-confetti/dist/confetti.browser.js",
     ],
     "./public/js/build/app.js" //because of compiling - this does not work very well :(
   )
 
+var skins = fs.readdirSync("resources/assets/less/skins");
+
 // Convert the skins to CSS
-mix.less(
-  "./resources/assets/less/skins/skin-blue.less",
-  "css/dist/skins",
-);
-mix.less(
-  "./resources/assets/less/skins/skin-red.less",
-  "css/dist/skins",
-);
-mix.less(
-  "./resources/assets/less/skins/skin-contrast.less",
-  "css/dist/skins",
-);
-mix.less(
-  "./resources/assets/less/skins/skin-green.less",
-  "css/dist/skins",
-);
-mix.less(
-  "./resources/assets/less/skins/skin-green-dark.less",
-  "css/dist/skins",
-);
-mix.less(
-  "./resources/assets/less/skins/skin-black.less",
-  "css/dist/skins",
-);
-mix.less(
-  "./resources/assets/less/skins/skin-black-dark.less",
-  "css/dist/skins",
-);
-mix.less(
-  "./resources/assets/less/skins/skin-red-dark.less",
-  "css/dist/skins",
-);
-mix.less(
-  "./resources/assets/less/skins/skin-purple.less",
-  "css/dist/skins",
-);
-mix.less(
-  "./resources/assets/less/skins/skin-purple-dark.less",
-  "css/dist/skins",
-);
-mix.less(
-  "./resources/assets/less/skins/skin-yellow.less",
-  "css/dist/skins",
-);
-mix.less(
-  "./resources/assets/less/skins/skin-yellow-dark.less",
-  "css/dist/skins",
-);
-mix.less(
-  "./resources/assets/less/skins/skin-blue-dark.less",
-  "css/dist/skins",
-);
-mix.less(
-  "./resources/assets/less/skins/skin-orange-dark.less",
-  "css/dist/skins",
-);
-mix.less(
-  "./resources/assets/less/skins/skin-orange.less",
-  "css/dist/skins",
-);
+for (var i in skins) {
+    mix.less(
+        "resources/assets/less/skins/" + skins[i],
+        "css/dist/skins"
+    )
+}
+
+var css_skins = fs.readdirSync("public/css/dist/skins");
+for (var i in css_skins) {
+    if (css_skins[i].endsWith(".min.css")) {
+        //don't minify already minified skinns
+        continue;
+    }
+    if (css_skins[i].endsWith(".css")) {
+        // only minify files ending with '.css'
+        mix.minify("public/css/dist/skins/" + css_skins[i]).version();
+    }
+    //TODO - if we only ever use the minified versions, this could be simplified down to one line (above)
+    // but it stays like this so we have the minified and non-minified versions of the skins
+    // right now the code seems to use the un-minified skins
+}
 
 /**
  * Combine bootstrap table css
@@ -150,7 +128,7 @@ mix.combine(
     "./node_modules/ekko-lightbox/dist/ekko-lightbox.js",
     "./resources/assets/js/extensions/pGenerator.jquery.js",
     "./node_modules/chart.js/dist/Chart.js",
-    "./resources/assets/js/signature_pad.js",
+      "./resources/assets/js/signature_pad.js", //dupe?
     "./node_modules/jquery-validation/dist/jquery.validate.js",
     "./node_modules/list.js/dist/list.js",
     "./node_modules/clipboard/dist/clipboard.js",
@@ -171,6 +149,7 @@ mix
             './node_modules/bootstrap-table/dist/extensions/cookie/bootstrap-table-cookie.js',
             './node_modules/bootstrap-table/dist/extensions/sticky-header/bootstrap-table-sticky-header.js',
             './node_modules/bootstrap-table/dist/extensions/addrbar/bootstrap-table-addrbar.js',
+            './node_modules/bootstrap-table/dist/extensions/print/bootstrap-table-print.min.js',
             './resources/assets/js/extensions/jquery.base64.js',
             './node_modules/tableexport.jquery.plugin/tableExport.min.js',
             './node_modules/tableexport.jquery.plugin/libs/jsPDF/jspdf.umd.min.js',
@@ -187,27 +166,4 @@ mix
     ["./public/js/build/vendor.js", "./public/js/build/app.js"],
     "./public/js/dist/all.js"
   )
-  .version();
-
-/**
- * Copy, minify and version skins
- */
-mix
-  .minify([
-    "./public/css/dist/skins/skin-green.css",
-    "./public/css/dist/skins/skin-green-dark.css",
-    "./public/css/dist/skins/skin-black.css",
-    "./public/css/dist/skins/skin-black-dark.css",
-    "./public/css/dist/skins/skin-blue.css",
-    "./public/css/dist/skins/skin-blue-dark.css",
-    "./public/css/dist/skins/skin-yellow.css",
-    "./public/css/dist/skins/skin-yellow-dark.css",
-    "./public/css/dist/skins/skin-red.css",
-    "./public/css/dist/skins/skin-red-dark.css",
-    "./public/css/dist/skins/skin-purple.css",
-    "./public/css/dist/skins/skin-purple-dark.css",
-    "./public/css/dist/skins/skin-orange.css",
-    "./public/css/dist/skins/skin-orange-dark.css",
-    "./public/css/dist/skins/skin-contrast.css",
-  ])
-  .version();
+  .version();
\ No newline at end of file